From 499f2eb9c7e58d30cb5a11ce5d88589a44a4df7b Mon Sep 17 00:00:00 2001
From: Fengting Chen <fengting.chen@oracle.com>
Date: Fri, 19 Oct 2018 11:35:28 -0700
Subject: [PATCH 001/488] Fix the issue by freeing the temporary lobs created
 by readCLob() and writeCLOB(). Put the temporary lob release together with
 OCIDescriptorFree().

---
 gdal/frmts/georaster/georaster_wrapper.cpp | 16 +++---
 gdal/frmts/georaster/oci_wrapper.cpp       | 62 +++++++++++++++++++---
 gdal/frmts/georaster/oci_wrapper.h         |  1 +
 3 files changed, 65 insertions(+), 14 deletions(-)

diff --git a/gdal/frmts/georaster/georaster_wrapper.cpp b/gdal/frmts/georaster/georaster_wrapper.cpp
index 0594e700fc8a..201670513f37 100644
--- a/gdal/frmts/georaster/georaster_wrapper.cpp
+++ b/gdal/frmts/georaster/georaster_wrapper.cpp
@@ -526,7 +526,7 @@ GeoRasterWrapper* GeoRasterWrapper::Open( const char* pszStringId, bool bUpdate
     //  Clean up
     //  -------------------------------------------------------------------
 
-    OCIDescriptorFree( phLocator, OCI_DTYPE_LOB );
+    poStmt->FreeLob(phLocator);
     CPLFree( pszXML );
     delete poStmt;
 
@@ -966,7 +966,7 @@ bool GeoRasterWrapper::Create( char* pszDescription,
         sDataTable = szBindRDT;
         nRasterId  = nBindRID;
 
-        OCIDescriptorFree( phLocator, OCI_DTYPE_LOB );
+        poStmt->FreeLob(phLocator);
 
         delete poStmt;
 
@@ -3185,13 +3185,13 @@ bool GeoRasterWrapper::SetNoData( int nLayer, const char* pszValue )
 
     if( ! poStmt->Execute() )
     {
-        OCIDescriptorFree( phLocatorR, OCI_DTYPE_LOB );
-        OCIDescriptorFree( phLocatorW, OCI_DTYPE_LOB );
+        poStmt->FreeLob(phLocatorR);
+        poStmt->FreeLob(phLocatorW);
         delete poStmt;
         return false;
     }
 
-    OCIDescriptorFree( phLocatorW, OCI_DTYPE_LOB );
+    poStmt->FreeLob(phLocatorW);
 
     // ------------------------------------------------------------
     //  Read the XML metadata from db to memory with nodata updates
@@ -3206,7 +3206,7 @@ bool GeoRasterWrapper::SetNoData( int nLayer, const char* pszValue )
         CPLFree( pszXML );
     }
 
-    OCIDescriptorFree( phLocatorR, OCI_DTYPE_LOB );
+    poStmt->FreeLob(phLocatorR);
 
     bFlushMetadata = true;
     delete poStmt;
@@ -3596,12 +3596,12 @@ bool GeoRasterWrapper::FlushMetadata()
 
     if( ! poStmt->Execute() )
     {
-        OCIDescriptorFree( phLocator, OCI_DTYPE_LOB );
+        poStmt->FreeLob(phLocator);
         delete poStmt;
         return false;
     }
 
-    OCIDescriptorFree( phLocator, OCI_DTYPE_LOB );
+    poStmt->FreeLob(phLocator);
 
     delete poStmt;
 
diff --git a/gdal/frmts/georaster/oci_wrapper.cpp b/gdal/frmts/georaster/oci_wrapper.cpp
index da47d888e472..c83daa2709ef 100644
--- a/gdal/frmts/georaster/oci_wrapper.cpp
+++ b/gdal/frmts/georaster/oci_wrapper.cpp
@@ -1117,15 +1117,19 @@ void OWStatement::WriteCLob( OCILobLocator** pphLocator, char* pszData )
 {
     nNextCol++;
 
-    CheckError( OCIDescriptorAlloc(
+    if (CheckError( OCIDescriptorAlloc(
         poConnection->hEnv,
         (void**) pphLocator,
         OCI_DTYPE_LOB,
         (size_t) 0,
         (dvoid **) nullptr),
-        hError );
+        hError ))
+    {
+        CPLDebug("OCI", "Error in WriteCLob");
+        return;
+    }
 
-    CheckError( OCILobCreateTemporary(
+    if (CheckError( OCILobCreateTemporary(
         poConnection->hSvcCtx,
         poConnection->hError,
         (OCILobLocator*) *pphLocator,
@@ -1134,11 +1138,15 @@ void OWStatement::WriteCLob( OCILobLocator** pphLocator, char* pszData )
         (ub1) OCI_TEMP_CLOB,
         false,
         OCI_DURATION_SESSION ),
-        hError );
+        hError ))
+    {
+        CPLDebug("OCI", "Error in WriteCLob creating temporary lob");
+        return;
+    }
 
     ub4 nAmont = (ub4) strlen(pszData);
 
-    CheckError( OCILobWrite(
+    if (CheckError( OCILobWrite(
         poConnection->hSvcCtx,
         hError,
         *pphLocator,
@@ -1151,7 +1159,11 @@ void OWStatement::WriteCLob( OCILobLocator** pphLocator, char* pszData )
         nullptr,
         (ub2) 0,
         (ub1) SQLCS_IMPLICIT ),
-        hError );
+        hError ))
+    {
+        CPLDebug("OCI", "Error in WriteCLob writing the lob");
+        return;
+    }
 }
 
 void OWStatement::Define( OCIArray** pphData )
@@ -1583,6 +1595,44 @@ char* OWStatement::ReadCLob( OCILobLocator* phLocator )
     return pszBuffer;
 }
 
+// Free OCIDescriptor for the LOB, if it is temporary lob, it is freed too.
+void OWStatement::FreeLob(OCILobLocator* phLocator)
+{
+    boolean        is_temporary;
+
+    if (phLocator == nullptr)
+        return;
+
+    if( CheckError( OCILobIsTemporary(
+        poConnection->hEnv,
+        hError,
+        phLocator,
+        &is_temporary), 
+        hError))
+    {
+        CPLDebug("OCI", "OCILobIsTemporary failed");
+        OCIDescriptorFree( phLocator, OCI_DTYPE_LOB );
+        return;
+    }
+
+    if(is_temporary)
+    {
+      if( CheckError( OCILobFreeTemporary(
+        poConnection->hSvcCtx,
+        hError,
+        phLocator),
+        hError))
+      {
+        CPLDebug("OCI", "OCILobFreeTemporary failed");
+        OCIDescriptorFree( phLocator, OCI_DTYPE_LOB );
+        return;
+      }
+
+    }
+
+    OCIDescriptorFree( phLocator, OCI_DTYPE_LOB );
+}
+
 void OWStatement::BindName( const char* pszName, int* pnData )
 {
     OCIBind* hBind = nullptr;
diff --git a/gdal/frmts/georaster/oci_wrapper.h b/gdal/frmts/georaster/oci_wrapper.h
index cdb519ae6e9f..03314fb40ff4 100644
--- a/gdal/frmts/georaster/oci_wrapper.h
+++ b/gdal/frmts/georaster/oci_wrapper.h
@@ -417,6 +417,7 @@ class OWStatement
     unsigned long       ReadBlob( OCILobLocator* phLocator,
                             void* pBuffer, unsigned long nOffset, 
                                            unsigned long nSize );
+    void                FreeLob(OCILobLocator* phLocator);
     char*               ReadCLob( OCILobLocator* phLocator );
     void                WriteCLob( OCILobLocator** pphLocator, char* pszData );
     bool                WriteBlob( OCILobLocator* phLocator,

From b10430acb1303d18052fc20ebc36de01e01398fd Mon Sep 17 00:00:00 2001
From: Sander Jansen <s.jansen@gmail.com>
Date: Thu, 25 Oct 2018 14:49:58 -0500
Subject: [PATCH 002/488] VRT: Fix issue #1048 opening VRT with large number of
 bands

---
 gdal/frmts/vrt/vrtdataset.cpp | 59 +++++++++++++++++++++++++++++++++++
 gdal/frmts/vrt/vrtdataset.h   |  2 ++
 gdal/frmts/vrt/vrtsources.cpp | 10 ++++--
 gdal/gcore/gdal_proxy.h       |  5 +++
 gdal/gcore/gdalproxypool.cpp  | 10 ++++++
 5 files changed, 84 insertions(+), 2 deletions(-)

diff --git a/gdal/frmts/vrt/vrtdataset.cpp b/gdal/frmts/vrt/vrtdataset.cpp
index 0a6207976fbd..219978c5f9b8 100644
--- a/gdal/frmts/vrt/vrtdataset.cpp
+++ b/gdal/frmts/vrt/vrtdataset.cpp
@@ -36,6 +36,8 @@
 
 #include <algorithm>
 #include <typeinfo>
+#include "gdal_proxy.h"
+
 
 /*! @cond Doxygen_Suppress */
 
@@ -1384,6 +1386,59 @@ int VRTDataset::CheckCompatibleForDatasetIO()
     return nSources != 0;
 }
 
+
+/************************************************************************/
+/*                      ExpandProxyBands()                              */
+/************************************************************************/
+/* In ProxyPoolDatasets, by default only one band is initialized. When using
+ * VRTDataset::IRasterIO and CheckCompatibleForDatasetIO is True, we need to have
+ * all bands initialized (but only for the last band in the VRTDataset). This function
+ * assumes CheckCompatibleForDatasetIO() has already been run and returned succesfull.
+ */
+void VRTDataset::ExpandProxyBands()
+{
+    VRTSourcedRasterBand * poLastBand = reinterpret_cast<VRTSourcedRasterBand*>(papoBands[nBands - 1]);
+
+    CPLAssert(poLastBand != nullptr); // CheckCompatibleForDatasetIO()
+
+    int nSources = poLastBand->nSources;
+
+    for (int iSource = 0; iSource < nSources; iSource++)
+    {
+        VRTSimpleSource* poSource = reinterpret_cast<VRTSimpleSource *>(poLastBand->papoSources[iSource]);
+
+        CPLAssert(poSource != nullptr); // CheckCompatibleForDatasetIO()
+
+        GDALProxyPoolDataset * dataset = dynamic_cast<GDALProxyPoolDataset *>(poSource->GetBand()->GetDataset());
+
+        if (dataset == nullptr)
+        {
+            continue; // only GDALProxyPoolDataset needs to be expanded
+        }
+
+        if (dataset->GetBands()[0] != nullptr)
+        {
+            continue; // first band already set, so just assume all the others are set as well
+        }
+
+        for (int iBand = 1; iBand <= nBands - 1; iBand++ )
+        {
+            VRTSourcedRasterBand * srcband = reinterpret_cast<VRTSourcedRasterBand *>(papoBands[iBand - 1]);
+            VRTSimpleSource* src = reinterpret_cast<VRTSimpleSource *>(srcband->papoSources[iSource]);
+            GDALRasterBand * rasterband = src->GetBand();
+
+            int nBlockXSize, nBlockYSize;
+
+            rasterband->GetBlockSize(&nBlockXSize, &nBlockYSize);
+
+            dataset->AddSrcBand(iBand, rasterband->GetRasterDataType(), nBlockXSize, nBlockYSize);
+        }
+    }
+}
+
+
+
+
 /************************************************************************/
 /*                         GetSingleSimpleSource()                      */
 /*                                                                      */
@@ -1593,6 +1648,10 @@ CPLErr VRTDataset::IRasterIO( GDALRWFlag eRWFlag,
 
     if( bLocalCompatibleForDatasetIO && eRWFlag == GF_Read )
     {
+
+        // Make sure the expand the last band before using them below
+        ExpandProxyBands();
+
         for(int iBandIndex=0; iBandIndex<nBandCount; iBandIndex++)
         {
             VRTSourcedRasterBand* poBand
diff --git a/gdal/frmts/vrt/vrtdataset.h b/gdal/frmts/vrt/vrtdataset.h
index fc89227b3104..c01ca321d138 100644
--- a/gdal/frmts/vrt/vrtdataset.h
+++ b/gdal/frmts/vrt/vrtdataset.h
@@ -176,6 +176,8 @@ class CPL_DLL VRTDataset : public GDALDataset
 
     int            m_bCompatibleForDatasetIO;
     int            CheckCompatibleForDatasetIO();
+    void           ExpandProxyBands();
+
     std::vector<GDALDataset*> m_apoOverviews;
     std::vector<GDALDataset*> m_apoOverviewsBak;
     char         **m_papszXMLVRTMetadata;
diff --git a/gdal/frmts/vrt/vrtsources.cpp b/gdal/frmts/vrt/vrtsources.cpp
index d4f7a02a73ed..5475ec28a0c5 100644
--- a/gdal/frmts/vrt/vrtsources.cpp
+++ b/gdal/frmts/vrt/vrtsources.cpp
@@ -691,8 +691,14 @@ CPLErr VRTSimpleSource::XMLInit( CPLXMLNode *psSrc, const char *pszVRTPath,
 
         // Only the information of rasterBand nSrcBand will be accurate
         // but that's OK since we only use that band afterwards.
-        for( int i = 1; i <= nSrcBand; i++ )
-            proxyDS->AddSrcBandDescription(eDataType, nBlockXSize, nBlockYSize);
+        //
+        // Previously this added a src band for every band <= nSrcBand, but this becomes
+        // prohibitely expensive for files with a large number of bands. This optimization
+        // only adds the desired band and the rest of the bands will simply be initialized with a nullptr.
+        // This assumes no other code here accesses any of the lower bands in the GDALProxyPoolDataset.
+        // It has been suggested that in addition, we should to try share GDALProxyPoolDataset between multiple
+        // Simple Sources, which would save on memory for papoBands. For now, that's not implemented.
+        proxyDS->AddSrcBand(nSrcBand, eDataType, nBlockXSize, nBlockYSize);
 
         if( bGetMaskBand )
         {
diff --git a/gdal/gcore/gdal_proxy.h b/gdal/gcore/gdal_proxy.h
index 1d96fe1c5828..d1a8fae689ad 100644
--- a/gdal/gcore/gdal_proxy.h
+++ b/gdal/gcore/gdal_proxy.h
@@ -245,6 +245,11 @@ class CPL_DLL GDALProxyPoolDataset : public GDALProxyDataset
     void AddSrcBandDescription( GDALDataType eDataType, int nBlockXSize,
                                 int nBlockYSize );
 
+    // Used by VRT SimpleSource to add a single GDALProxyPoolRasterBand while
+    // keeping all other bands initialized to a nullptr. This is under the assumption,
+    // VRT SimpleSource will not have to access any other bands than the one added.
+    void AddSrcBand(int nBand, GDALDataType eDataType, int nBlockXSize,
+                                int nBlockYSize );
     void FlushCache() override;
 
     const char *GetProjectionRef() override;
diff --git a/gdal/gcore/gdalproxypool.cpp b/gdal/gcore/gdalproxypool.cpp
index 7180b60533be..19d1cf16a936 100644
--- a/gdal/gcore/gdalproxypool.cpp
+++ b/gdal/gcore/gdalproxypool.cpp
@@ -693,6 +693,16 @@ void GDALProxyPoolDataset::AddSrcBandDescription( GDALDataType eDataType, int nB
     SetBand(nBands + 1, new GDALProxyPoolRasterBand(this, nBands + 1, eDataType, nBlockXSize, nBlockYSize));
 }
 
+/************************************************************************/
+/*                    AddSrcBand()                                      */
+/************************************************************************/
+
+void GDALProxyPoolDataset::AddSrcBand(int nBand, GDALDataType eDataType, int nBlockXSize, int nBlockYSize)
+{
+    SetBand(nBand, new GDALProxyPoolRasterBand(this, nBand, eDataType, nBlockXSize, nBlockYSize));
+}
+
+
 /************************************************************************/
 /*                    RefUnderlyingDataset()                            */
 /************************************************************************/

From d2b9ec539a395c7d64b8cbdf3d8b8892f957522d Mon Sep 17 00:00:00 2001
From: Tamas Szekeres <szekerest@gmail.com>
Date: Fri, 26 Oct 2018 21:32:32 +0200
Subject: [PATCH 003/488] MSSQLSpatial: Fix geometry parser with M values
 (#1051)

---
 .../mssqlspatial/ogrmssqlgeometryparser.cpp   | 99 ++++++++++++++++---
 1 file changed, 83 insertions(+), 16 deletions(-)

diff --git a/gdal/ogr/ogrsf_frmts/mssqlspatial/ogrmssqlgeometryparser.cpp b/gdal/ogr/ogrsf_frmts/mssqlspatial/ogrmssqlgeometryparser.cpp
index 16271610c318..bd70c0fb1e28 100644
--- a/gdal/ogr/ogrsf_frmts/mssqlspatial/ogrmssqlgeometryparser.cpp
+++ b/gdal/ogr/ogrsf_frmts/mssqlspatial/ogrmssqlgeometryparser.cpp
@@ -139,15 +139,31 @@ OGRPoint* OGRMSSQLGeometryParser::ReadPoint(int iShape)
         {
             if (nColType == MSSQLCOLTYPE_GEOGRAPHY)
             {
-                if ( chProps & SP_HASZVALUES )
+                if ( (chProps & SP_HASZVALUES) && (chProps & SP_HASMVALUES) )
+                    return new OGRPoint(ReadY(iPoint), ReadX(iPoint), ReadZ(iPoint), ReadM(iPoint) );
+                else if ( chProps & SP_HASZVALUES )
                     return new OGRPoint( ReadY(iPoint), ReadX(iPoint), ReadZ(iPoint) );
+                else if ( chProps & SP_HASMVALUES )
+                {
+                    OGRPoint* poPoint = new OGRPoint( ReadY(iPoint), ReadX(iPoint) );
+                    poPoint->setM( ReadZ(iPoint) );
+                    return poPoint;
+                }
                 else
                     return new OGRPoint( ReadY(iPoint), ReadX(iPoint) );
             }
             else
             {
-                if ( chProps & SP_HASZVALUES )
+                if ( (chProps & SP_HASZVALUES) && (chProps & SP_HASMVALUES) )
+                    return new OGRPoint( ReadX(iPoint), ReadY(iPoint), ReadZ(iPoint), ReadM(iPoint) );
+                else if ( chProps & SP_HASZVALUES )
                     return new OGRPoint( ReadX(iPoint), ReadY(iPoint), ReadZ(iPoint) );
+                else if ( chProps & SP_HASMVALUES )
+                {
+                    OGRPoint* poPoint = new OGRPoint( ReadX(iPoint), ReadY(iPoint) );
+                    poPoint->setM( ReadZ(iPoint) );
+                    return poPoint;
+                }
                 else
                     return new OGRPoint( ReadX(iPoint), ReadY(iPoint) );
             }
@@ -199,15 +215,23 @@ OGRLineString* OGRMSSQLGeometryParser::ReadLineString(int iShape)
     {
         if (nColType == MSSQLCOLTYPE_GEOGRAPHY)
         {
-            if ( chProps & SP_HASZVALUES )
+            if ( (chProps & SP_HASZVALUES) && (chProps & SP_HASMVALUES) )
+                poLineString->setPoint(i, ReadY(iPoint), ReadX(iPoint), ReadZ(iPoint), ReadM(iPoint) );
+            else if ( chProps & SP_HASZVALUES )
                 poLineString->setPoint(i, ReadY(iPoint), ReadX(iPoint), ReadZ(iPoint) );
+            else if ( chProps & SP_HASMVALUES )
+                poLineString->setPointM(i, ReadY(iPoint), ReadX(iPoint), ReadZ(iPoint) );
             else
                 poLineString->setPoint(i, ReadY(iPoint), ReadX(iPoint) );
         }
         else
         {
-            if ( chProps & SP_HASZVALUES )
+            if ( (chProps & SP_HASZVALUES) && (chProps & SP_HASMVALUES) )
+                poLineString->setPoint(i, ReadX(iPoint), ReadY(iPoint), ReadZ(iPoint), ReadM(iPoint) );
+            else if ( chProps & SP_HASZVALUES )
                 poLineString->setPoint(i, ReadX(iPoint), ReadY(iPoint), ReadZ(iPoint) );
+            else if ( chProps & SP_HASMVALUES )
+                poLineString->setPointM(i, ReadX(iPoint), ReadY(iPoint), ReadZ(iPoint) );
             else
                 poLineString->setPoint(i, ReadX(iPoint), ReadY(iPoint) );
         }
@@ -265,15 +289,23 @@ OGRPolygon* OGRMSSQLGeometryParser::ReadPolygon(int iShape)
         {
             if (nColType == MSSQLCOLTYPE_GEOGRAPHY)
             {
-                if ( chProps & SP_HASZVALUES )
+                if ( (chProps & SP_HASZVALUES) && (chProps & SP_HASMVALUES) )
+                    poRing->setPoint(i, ReadY(iPoint), ReadX(iPoint), ReadZ(iPoint), ReadM(iPoint) );
+                else if ( chProps & SP_HASZVALUES )
                     poRing->setPoint(i, ReadY(iPoint), ReadX(iPoint), ReadZ(iPoint) );
+                else if (chProps & SP_HASMVALUES)
+                    poRing->setPointM(i, ReadY(iPoint), ReadX(iPoint), ReadZ(iPoint) );
                 else
                     poRing->setPoint(i, ReadY(iPoint), ReadX(iPoint) );
             }
             else
             {
-                if ( chProps & SP_HASZVALUES )
+                if ( (chProps & SP_HASZVALUES) && (chProps & SP_HASMVALUES) )
+                    poRing->setPoint(i, ReadX(iPoint), ReadY(iPoint), ReadZ(iPoint), ReadM(iPoint) );
+                else if ( chProps & SP_HASZVALUES )
                     poRing->setPoint(i, ReadX(iPoint), ReadY(iPoint), ReadZ(iPoint) );
+                else if ( chProps & SP_HASMVALUES )
+                    poRing->setPointM(i, ReadX(iPoint), ReadY(iPoint), ReadZ(iPoint) );
                 else
                     poRing->setPoint(i, ReadX(iPoint), ReadY(iPoint) );
             }
@@ -380,12 +412,13 @@ OGRErr OGRMSSQLGeometryParser::ParseSqlGeometry(unsigned char* pszInput,
 
     chProps = ReadByte(5);
 
-    if ( chProps & SP_HASMVALUES )
-        nPointSize = 32;
-    else if ( chProps & SP_HASZVALUES )
-        nPointSize = 24;
-    else
-        nPointSize = 16;
+    nPointSize = 16;
+
+    if (chProps & SP_HASZVALUES)
+        nPointSize += 8;
+
+    if (chProps & SP_HASMVALUES)
+        nPointSize += 8;
 
     if ( chProps & SP_ISSINGLEPOINT )
     {
@@ -400,15 +433,29 @@ OGRErr OGRMSSQLGeometryParser::ParseSqlGeometry(unsigned char* pszInput,
 
         if (nColType == MSSQLCOLTYPE_GEOGRAPHY)
         {
-            if (chProps & SP_HASZVALUES)
+            if ((chProps & SP_HASZVALUES) && (chProps & SP_HASMVALUES))
+                *poGeom = new OGRPoint(ReadY(0), ReadX(0), ReadZ(0), ReadM(0));
+            else if (chProps & SP_HASZVALUES)
                 *poGeom = new OGRPoint(ReadY(0), ReadX(0), ReadZ(0));
+            else if (chProps & SP_HASMVALUES)
+            {
+                *poGeom = new OGRPoint(ReadY(0), ReadX(0));
+                ((OGRPoint*)(*poGeom))->setM(ReadZ(0));
+            }
             else
                 *poGeom = new OGRPoint(ReadY(0), ReadX(0));
         }
         else
         {
-            if (chProps & SP_HASZVALUES)
+            if ((chProps & SP_HASZVALUES) && (chProps & SP_HASMVALUES))
+                *poGeom = new OGRPoint(ReadX(0), ReadY(0), ReadZ(0), ReadM(0));
+            else if (chProps & SP_HASZVALUES)
                 *poGeom = new OGRPoint(ReadX(0), ReadY(0), ReadZ(0));
+            else if (chProps & SP_HASMVALUES)
+            {
+                *poGeom = new OGRPoint(ReadX(0), ReadY(0));
+                ((OGRPoint*)(*poGeom))->setM(ReadZ(0));
+            }
             else
                 *poGeom = new OGRPoint(ReadX(0), ReadY(0));
         }
@@ -429,11 +476,21 @@ OGRErr OGRMSSQLGeometryParser::ParseSqlGeometry(unsigned char* pszInput,
 
         if (nColType == MSSQLCOLTYPE_GEOGRAPHY)
         {
-            if ( chProps & SP_HASZVALUES )
+            if ( (chProps & SP_HASZVALUES) && (chProps & SP_HASMVALUES) )
+            {
+                line->setPoint(0, ReadY(0), ReadX(0), ReadZ(0), ReadM(0));
+                line->setPoint(1, ReadY(1), ReadX(1), ReadZ(1), ReadM(1));
+            }
+            else if ( chProps & SP_HASZVALUES )
             {
                 line->setPoint(0, ReadY(0), ReadX(0), ReadZ(0));
                 line->setPoint(1, ReadY(1), ReadX(1), ReadZ(1));
             }
+            else if ( chProps & SP_HASMVALUES )
+            {
+                line->setPointM(0, ReadY(0), ReadX(0), ReadZ(0));
+                line->setPointM(1, ReadY(1), ReadX(1), ReadZ(1));
+            }
             else
             {
                 line->setPoint(0, ReadY(0), ReadX(0));
@@ -442,11 +499,21 @@ OGRErr OGRMSSQLGeometryParser::ParseSqlGeometry(unsigned char* pszInput,
         }
         else
         {
-            if ( chProps & SP_HASZVALUES )
+            if ( (chProps & SP_HASZVALUES) && (chProps & SP_HASMVALUES) )
+            {
+                line->setPoint(0, ReadX(0), ReadY(0), ReadZ(0), ReadM(0));
+                line->setPoint(1, ReadX(1), ReadY(1), ReadZ(1), ReadM(1));
+            }
+            else if ( chProps & SP_HASZVALUES )
             {
                 line->setPoint(0, ReadX(0), ReadY(0), ReadZ(0));
                 line->setPoint(1, ReadX(1), ReadY(1), ReadZ(1));
             }
+            else if ( chProps & SP_HASMVALUES )
+            {
+                line->setPointM(0, ReadX(0), ReadY(0), ReadZ(0));
+                line->setPointM(1, ReadX(1), ReadY(1), ReadZ(1));
+            }
             else
             {
                 line->setPoint(0, ReadX(0), ReadY(0));

From 4b906b2dfd49c259e2bd3c53aece4b5a6139e2c9 Mon Sep 17 00:00:00 2001
From: Jerry Faust <jerryfaust1@gmail.com>
Date: Sun, 28 Oct 2018 10:08:53 -0700
Subject: [PATCH 004/488] MSSQLSpatial: driver does not assign new ID following
 an INSERT (fixes #1052) (#1053)

---
 autotest/ogr/ogr_mssqlspatial.py              |  8 ++++++++
 .../ogrmssqlspatialtablelayer.cpp             | 20 +++++++++++++++++--
 2 files changed, 26 insertions(+), 2 deletions(-)

diff --git a/autotest/ogr/ogr_mssqlspatial.py b/autotest/ogr/ogr_mssqlspatial.py
index a403b196cb65..733c1e70e07b 100755
--- a/autotest/ogr/ogr_mssqlspatial.py
+++ b/autotest/ogr/ogr_mssqlspatial.py
@@ -225,6 +225,14 @@ def ogr_mssqlspatial_4():
                                  'from file "' + wkt_filename + '"')
             return 'fail'
 
+        ######################################################################
+        # Before reading back the record, verify that the newly added feature 
+        # is returned from the CreateFeature method with a newly assigned FID.
+        
+        if dst_feat.GetFID() == -1:
+            gdaltest.post_reason('Assigned FID was not returned in the new feature')
+            return 'fail'
+
         ######################################################################
         # Read back the feature and get the geometry.
 
diff --git a/gdal/ogr/ogrsf_frmts/mssqlspatial/ogrmssqlspatialtablelayer.cpp b/gdal/ogr/ogrsf_frmts/mssqlspatial/ogrmssqlspatialtablelayer.cpp
index ce93c58e8129..0cbf181929cd 100644
--- a/gdal/ogr/ogrsf_frmts/mssqlspatial/ogrmssqlspatialtablelayer.cpp
+++ b/gdal/ogr/ogrsf_frmts/mssqlspatial/ogrmssqlspatialtablelayer.cpp
@@ -2060,11 +2060,18 @@ OGRErr OGRMSSQLSpatialTableLayer::ICreateFeature( OGRFeature *poFeature )
     if (oStatement.GetCommand()[strlen(oStatement.GetCommand()) - 1] != ']')
     {
         /* no fields were added */
-        oStatement.Appendf( "DEFAULT VALUES;" );
+        if (nFID == OGRNullFID && pszFIDColumn != nullptr && bIsIdentityFid)
+            oStatement.Appendf(" OUTPUT INSERTED.[%s] DEFAULT VALUES;", GetFIDColumn());
+        else
+            oStatement.Appendf( "DEFAULT VALUES;" );
     }
     else
     {
-        oStatement.Appendf( ") VALUES (" );
+        /* prepend VALUES section */
+        if (nFID == OGRNullFID && pszFIDColumn != nullptr && bIsIdentityFid)
+            oStatement.Appendf(") OUTPUT INSERTED.[%s] VALUES (", GetFIDColumn());
+        else
+            oStatement.Appendf( ") VALUES (" );
 
         /* Set the geometry */
         bNeedComma = FALSE;
@@ -2259,6 +2266,15 @@ OGRErr OGRMSSQLSpatialTableLayer::ICreateFeature( OGRFeature *poFeature )
 
         return OGRERR_FAILURE;
     }
+    else if(nFID == OGRNullFID && pszFIDColumn != nullptr && bIsIdentityFid)
+    {
+        // fetch new ID and set it into the feature
+        if (oStatement.Fetch())
+        {
+            GIntBig newID = atoll(oStatement.GetColData(0));
+            poFeature->SetFID(newID);
+        }
+    }
 
     for( i = 0; i < bind_num; i++ )
             CPLFree(bind_buffer[i]);

From 59411f1decb8a12fb34a595470e51df735b0692e Mon Sep 17 00:00:00 2001
From: Hiroshi Miura <miurahr@linux.com>
Date: Mon, 29 Oct 2018 14:18:11 +0900
Subject: [PATCH 005/488] autotest: gdriver_loslas: see inside jar file for
 downloaded data

Fix loslas test failure not to found test data.

Downloaded file NADCON.zip has nadcon.jar for grids data.
Test script try to unzip NADCON.zip and nadcon.jar to extract test data.

Signed-off-by: Hiroshi Miura <miurahr@linux.com>
---
 autotest/gdrivers/loslas.py | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/autotest/gdrivers/loslas.py b/autotest/gdrivers/loslas.py
index 0eea8f932533..f0e7d19e5dea 100755
--- a/autotest/gdrivers/loslas.py
+++ b/autotest/gdrivers/loslas.py
@@ -48,7 +48,15 @@ def loslas_online_1():
     except OSError:
         return 'skip'
 
-    tst = gdaltest.GDALTest('LOSLAS', '/vsizip/tmp/cache/NADCON.zip/wyhpgn.los', 1, 0, filename_absolute=1)
+    try:
+        gdaltest.unzip('tmp/cache/NADCON', 'tmp/cache/NADCON.zip')
+        os.stat('tmp/cache/NADCON/nadcon.jar')
+        gdaltest.unzip('tmp/cache/NADCON', 'tmp/cache/NADCON/nadcon.jar')
+        os.stat('tmp/cache/NADCON/grids/wyhpgn.los')
+    except OSError:
+        return 'skip'
+
+    tst = gdaltest.GDALTest('LOSLAS', 'tmp/cache/NADCON/grids/wyhpgn.los', 1, 0, filename_absolute=1)
     gt = (-111.625, 0.25, 0.0, 45.625, 0.0, -0.25)
     stats = (-0.0080000003799796, 0.031125999987125001, 0.0093017323318172005, 0.0075646520354096004)
     return tst.testOpen(check_gt=gt, check_stat=stats, check_prj='WGS84')

From d998b440f368dd43bde5db99445542c31604eb41 Mon Sep 17 00:00:00 2001
From: Hiroshi Miura <miurahr@linux.com>
Date: Mon, 29 Oct 2018 09:21:32 +0900
Subject: [PATCH 006/488] autotest: update environment variable requirements

- Require GDAL_DONWLOAD_TEST_DATA=YES if want to enable it.
  It also accept NO for explicitly disable download.
  it is consistent behavior with GDAL_RUN_SLOW_TESTS
- Update message when GDAL_RUN_SLOW_TESTS and/or GDAL_DOWNLOAD_TEST_DATA
  is set to NO or undefined as it is so.
- introduce gdaltest.download_test_data() for consistent env detection
- update netcdf test notice for environment variable

Signed-off-by: Hiroshi Miura <miurahr@linux.com>
---
 autotest/gdrivers/netcdf_cf.py |  4 ++--
 autotest/pymod/gdaltest.py     | 26 +++++++++++++++++---------
 2 files changed, 19 insertions(+), 11 deletions(-)

diff --git a/autotest/gdrivers/netcdf_cf.py b/autotest/gdrivers/netcdf_cf.py
index 686be05b51fd..87276857a1e8 100755
--- a/autotest/gdrivers/netcdf_cf.py
+++ b/autotest/gdrivers/netcdf_cf.py
@@ -102,9 +102,9 @@ def netcdf_cf_setup():
             return 'success'
 
     # skip http method if GDAL_DOWNLOAD_TEST_DATA and GDAL_RUN_SLOW_TESTS are not defined
-    if 'GDAL_DOWNLOAD_TEST_DATA' not in os.environ:
+    if not gdaltest.download_test_data():
         print('NOTICE: skipping netcdf CF compliance checks')
-        print('to enable remote http checker script, define GDAL_DOWNLOAD_TEST_DATA')
+        print('to enable remote http checker script, define GDAL_DOWNLOAD_TEST_DATA=YES')
         return 'success'
 
     if not gdaltest.run_slow_tests():
diff --git a/autotest/pymod/gdaltest.py b/autotest/pymod/gdaltest.py
index 72b078d37bc0..4f78f1b146de 100644
--- a/autotest/pymod/gdaltest.py
+++ b/autotest/pymod/gdaltest.py
@@ -247,9 +247,9 @@ def summarize():
         else:
             print('Duration:  %02.2fs' % duration)
     if count_skipped_tests_download != 0:
-        print('As GDAL_DOWNLOAD_TEST_DATA environment variable is not defined, %d tests relying on data to downloaded from the Web have been skipped' % count_skipped_tests_download)
+        print('As GDAL_DOWNLOAD_TEST_DATA environment variable is not defined or set to NO, %d tests relying on data to downloaded from the Web have been skipped' % count_skipped_tests_download)
     if count_skipped_tests_slow != 0:
-        print('As GDAL_RUN_SLOW_TESTS environment variable is not defined, %d "slow" tests have been skipped' % count_skipped_tests_slow)
+        print('As GDAL_RUN_SLOW_TESTS environment variable is not defined or set to NO, %d "slow" tests have been skipped' % count_skipped_tests_slow)
     print('')
 
     sys.path.append('gcore')
@@ -1318,12 +1318,11 @@ def download_file(url, filename=None, download_size=-1, force_download=False, ma
     elif filename.startswith(base_dir + '/'):
         filename = filename[len(base_dir + '/'):]
 
-    global count_skipped_tests_download
     try:
         os.stat(base_dir + '/' + filename)
         return True
     except OSError:
-        if 'GDAL_DOWNLOAD_TEST_DATA' in os.environ or force_download:
+        if force_download or download_test_data():
             val = None
             start_time = time.time()
             try:
@@ -1390,9 +1389,6 @@ def download_file(url, filename=None, download_size=-1, force_download=False, ma
                 print('Cannot write %s' % (filename))
                 return False
         else:
-            if count_skipped_tests_download == 0:
-                print('As GDAL_DOWNLOAD_TEST_DATA environment variable is not defined, some tests relying on data to downloaded from the Web will be skipped')
-            count_skipped_tests_download = count_skipped_tests_download + 1
             return False
 
 
@@ -1659,16 +1655,28 @@ def neginf():
         return -1e400
 
 ###############################################################################
-# Has the user requested to run the slow tests
+# Has the user requested to dowload test data
+def download_test_data():
+    global count_skipped_tests_download
+    val = gdal.GetConfigOption('GDAL_DOWNLOAD_TEST_DATA', None)
+    if val != 'yes' and val != 'YES':
 
+        if count_skipped_tests_download == 0:
+            print('As GDAL_DOWNLOAD_TEST_DATA environment variable is not defined or set to NO, some tests relying on data to downloaded from the Web will be skipped')
+        count_skipped_tests_download = count_skipped_tests_download + 1
 
+        return False
+    return True
+
+###############################################################################
+# Has the user requested to run the slow tests
 def run_slow_tests():
     global count_skipped_tests_slow
     val = gdal.GetConfigOption('GDAL_RUN_SLOW_TESTS', None)
     if val != 'yes' and val != 'YES':
 
         if count_skipped_tests_slow == 0:
-            print('As GDAL_RUN_SLOW_TESTS environment variable is not defined, some "slow" tests will be skipped')
+            print('As GDAL_RUN_SLOW_TESTS environment variable is not defined or set to NO, some "slow" tests will be skipped')
         count_skipped_tests_slow = count_skipped_tests_slow + 1
 
         return False

From 98906f740473968e60649eaf73b0138d814062bb Mon Sep 17 00:00:00 2001
From: Hugo Mercier <hugo.mercier@oslandia.com>
Date: Mon, 29 Oct 2018 13:53:48 +0100
Subject: [PATCH 007/488] Fix an off-by-one

---
 autotest/cpp/test_marching_squares_contour.cpp | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/autotest/cpp/test_marching_squares_contour.cpp b/autotest/cpp/test_marching_squares_contour.cpp
index ee53dfccbb97..a682e4d49459 100644
--- a/autotest/cpp/test_marching_squares_contour.cpp
+++ b/autotest/cpp/test_marching_squares_contour.cpp
@@ -113,11 +113,11 @@ class TestRingAppender
         // we represent them with a vector, we need to find a common "first" point
         Point pfirst = aRing[0];
         size_t offset = 0;
-        for ( ; pfirst != bRing[offset]; offset++ ) {
-            if ( offset >= bRing.size() ) {
-                // can't find a common point
-                return false;
-            }
+        while ( offset < bRing.size() && pfirst != bRing[offset] )
+            offset++;
+        if ( offset >= bRing.size() ) {
+            // can't find a common point
+            return false;
         }
         // now compare each point of the two rings
         for ( size_t i = 0; i < aRing.size(); i++ ) {

From 03663aa9cc098380fe5420faa4f424c3dac45a08 Mon Sep 17 00:00:00 2001
From: Even Rouault <even.rouault@spatialys.com>
Date: Mon, 29 Oct 2018 23:18:12 +0100
Subject: [PATCH 008/488] GeoJSON: add partial support for field names
 differing by case (fixes #1057)

- Should work on the reading and writing side of the GeoJSON driver itself
- Some support on the writing side of ogr2ogr, sufficient for GeoJSON->GeoJSON
  conversion case
- ... but a lot/most other places in GDAL assume case insensitivity
---
 autotest/ogr/ogr_geojson.py                   | 22 +++++++++++++
 gdal/apps/ogr2ogr_lib.cpp                     | 22 +++++++++----
 gdal/ogr/ogr_feature.h                        |  1 +
 gdal/ogr/ogrfeaturedefn.cpp                   | 31 +++++++++++++++++++
 .../ogrsf_frmts/geojson/ogrgeojsonreader.cpp  | 24 +++++++-------
 .../geojson/ogrgeojsonwritelayer.cpp          |  2 +-
 .../ogrsf_frmts/geojson/ogrgeojsonwriter.cpp  |  6 ++--
 7 files changed, 87 insertions(+), 21 deletions(-)

diff --git a/autotest/ogr/ogr_geojson.py b/autotest/ogr/ogr_geojson.py
index 0615b49d832e..2116d0db7596 100755
--- a/autotest/ogr/ogr_geojson.py
+++ b/autotest/ogr/ogr_geojson.py
@@ -4187,6 +4187,27 @@ def ogr_esrijson_without_geometryType():
 
     return 'success'
 
+
+###############################################################################
+
+
+def ogr_geojson_read_fields_with_different_case():
+
+    ds = ogr.Open("""{
+"type": "FeatureCollection",
+"features": [
+{ "type": "Feature", "id": "my_id", "geometry": null, "properties":
+                                { "ID": "MY_ID", "x": "foo", "X": "FOO"} }
+]}""")
+
+    lyr = ds.GetLayer(0)
+    f = lyr.GetNextFeature()
+    if f.GetField(0) != 'my_id' or f.GetField(1) != 'MY_ID' or f.GetField(2) != 'foo' or f.GetField(3) != 'FOO':
+        f.DumpReadable()
+        return 'fail'
+
+    return 'success'
+
 ###############################################################################
 
 
@@ -4300,6 +4321,7 @@ def ogr_geojson_cleanup():
     ogr_geojson_append_flush,
     ogr_geojson_empty_geometrycollection,
     ogr_esrijson_without_geometryType,
+    ogr_geojson_read_fields_with_different_case,
     ogr_geojson_cleanup]
 
 if __name__ == '__main__':
diff --git a/gdal/apps/ogr2ogr_lib.cpp b/gdal/apps/ogr2ogr_lib.cpp
index 7726989d8f2d..cb357f5802db 100644
--- a/gdal/apps/ogr2ogr_lib.cpp
+++ b/gdal/apps/ogr2ogr_lib.cpp
@@ -3930,6 +3930,16 @@ TargetLayerInfo* SetupTargetLayer::Setup(OGRLayer* poSrcLayer,
     {
         int nDstFieldCount = poDstFDefn ? poDstFDefn->GetFieldCount() : 0;
 
+        const bool caseInsensitive =
+            !EQUAL(m_poDstDS->GetDriver()->GetDescription(), "GeoJSON");
+        auto formatName = [caseInsensitive](const char* name) {
+            if( caseInsensitive ) {
+                return CPLString(name).toupper();
+            } else {
+                return CPLString(name);
+            }
+        };
+
         /* Save the map of existing fields, before creating new ones */
         /* This helps when converting a source layer that has duplicated field names */
         /* which is a bad idea */
@@ -3938,7 +3948,7 @@ TargetLayerInfo* SetupTargetLayer::Setup(OGRLayer* poSrcLayer,
         for( int iField = 0; iField < nDstFieldCount; iField++ )
         {
             const char* pszFieldName = poDstFDefn->GetFieldDefn(iField)->GetNameRef();
-            CPLString osUpperFieldName(CPLString(pszFieldName).toupper());
+            CPLString osUpperFieldName(formatName(pszFieldName));
             oSetDstFieldNames.insert(osUpperFieldName);
             if( oMapPreExistingFields.find(osUpperFieldName) ==
                                             oMapPreExistingFields.end() )
@@ -3976,7 +3986,7 @@ TargetLayerInfo* SetupTargetLayer::Setup(OGRLayer* poSrcLayer,
         for( int i = 0; i < poSrcFDefn->GetFieldCount(); i++ )
         {
             oSetSrcFieldNames.insert(
-                CPLString(poSrcFDefn->GetFieldDefn(i)->GetNameRef()).toupper());
+                formatName(poSrcFDefn->GetFieldDefn(i)->GetNameRef()));
         }
 
         for( size_t i = 0; i < anSrcFieldIndices.size(); i++ )
@@ -4003,7 +4013,7 @@ TargetLayerInfo* SetupTargetLayer::Setup(OGRLayer* poSrcLayer,
 
             /* The field may have been already created at layer creation */
             std::map<CPLString, int>::iterator oIter =
-                oMapPreExistingFields.find(CPLString(oFieldDefn.GetNameRef()).toupper());
+                oMapPreExistingFields.find(formatName(oFieldDefn.GetNameRef()));
             if( oIter != oMapPreExistingFields.end() )
             {
                 panMap[iField] = oIter->second;
@@ -4014,12 +4024,12 @@ TargetLayerInfo* SetupTargetLayer::Setup(OGRLayer* poSrcLayer,
             /* In case the field name already exists in the target layer, */
             /* build a unique field name */
             if( oSetDstFieldNames.find(
-                    CPLString(oFieldDefn.GetNameRef()).toupper()) !=
+                    formatName(oFieldDefn.GetNameRef())) !=
                                                     oSetDstFieldNames.end() )
             {
                 int nTry = 1;
                 CPLString osTmpNameRaddixUC(oFieldDefn.GetNameRef());
-                osTmpNameRaddixUC.toupper();
+                osTmpNameRaddixUC = formatName(osTmpNameRaddixUC);
                 CPLString osTmpNameUC = osTmpNameRaddixUC;
                 osTmpNameUC.reserve(osTmpNameUC.size() + 10);
                 while( true )
@@ -4069,7 +4079,7 @@ TargetLayerInfo* SetupTargetLayer::Setup(OGRLayer* poSrcLayer,
                                     "Field '%s' already exists. Renaming it as '%s'",
                                     poSrcFieldDefn->GetNameRef(), pszNewFieldName);
                         }
-                        oSetDstFieldNames.insert(CPLString(pszNewFieldName).toupper());
+                        oSetDstFieldNames.insert(formatName(pszNewFieldName));
                     }
 
                     panMap[iField] = nDstFieldCount;
diff --git a/gdal/ogr/ogr_feature.h b/gdal/ogr/ogr_feature.h
index be3f7856d34a..572a5cff487a 100644
--- a/gdal/ogr/ogr_feature.h
+++ b/gdal/ogr/ogr_feature.h
@@ -284,6 +284,7 @@ class CPL_DLL OGRFeatureDefn
     virtual OGRFieldDefn *GetFieldDefn( int i );
     virtual const OGRFieldDefn *GetFieldDefn( int i ) const;
     virtual int         GetFieldIndex( const char * ) const;
+    int                 GetFieldIndexCaseSensitive( const char * ) const;
 
     virtual void        AddFieldDefn( OGRFieldDefn * );
     virtual OGRErr      DeleteFieldDefn( int iField );
diff --git a/gdal/ogr/ogrfeaturedefn.cpp b/gdal/ogr/ogrfeaturedefn.cpp
index 2b926bae15c4..ea0f9423c955 100644
--- a/gdal/ogr/ogrfeaturedefn.cpp
+++ b/gdal/ogr/ogrfeaturedefn.cpp
@@ -1228,6 +1228,37 @@ int OGRFeatureDefn::GetFieldIndex( const char * pszFieldName ) const
     return -1;
 }
 
+/************************************************************************/
+/*                      GetFieldIndexCaseSensitive()                    */
+/************************************************************************/
+
+/**
+ * \brief Find field by name, in a case sensitive way.
+ *
+ * The field index of the first field matching the passed field name is returned.
+ *
+ * @param pszFieldName the field name to search for.
+ *
+ * @return the field index, or -1 if no match found.
+ */
+
+int OGRFeatureDefn::GetFieldIndexCaseSensitive( const char * pszFieldName ) const
+
+{
+    GetFieldCount();
+    for( int i = 0; i < nFieldCount; i++ )
+    {
+        const OGRFieldDefn* poFDefn = GetFieldDefn(i);
+        if( poFDefn != nullptr &&
+            strcmp(pszFieldName, poFDefn->GetNameRef() ) == 0 )
+        {
+            return i;
+        }
+    }
+
+    return -1;
+}
+
 /************************************************************************/
 /*                        OGR_FD_GetFieldIndex()                        */
 /************************************************************************/
diff --git a/gdal/ogr/ogrsf_frmts/geojson/ogrgeojsonreader.cpp b/gdal/ogr/ogrsf_frmts/geojson/ogrgeojsonreader.cpp
index cb8c62d23d06..1ff9234711b8 100644
--- a/gdal/ogr/ogrsf_frmts/geojson/ogrgeojsonreader.cpp
+++ b/gdal/ogr/ogrsf_frmts/geojson/ogrgeojsonreader.cpp
@@ -1476,7 +1476,7 @@ void OGRGeoJSONBaseReader::FinalizeLayerDefn(OGRLayer* poLayer,
 
     if( !bFeatureLevelIdAsFID_ )
     {
-        const int idx = poLayerDefn->GetFieldIndex( "id" );
+        const int idx = poLayerDefn->GetFieldIndexCaseSensitive( "id" );
         if( idx >= 0 )
         {
             OGRFieldDefn* poFDefn = poLayerDefn->GetFieldDefn(idx);
@@ -1535,7 +1535,7 @@ void OGRGeoJSONReaderAddOrUpdateField(
         return;
     }
 
-    int nIndex = poDefn->GetFieldIndex(pszKey);
+    int nIndex = poDefn->GetFieldIndexCaseSensitive(pszKey);
     if( nIndex < 0 )
     {
         OGRFieldSubType eSubType;
@@ -1787,7 +1787,7 @@ bool OGRGeoJSONBaseReader::GenerateFeatureDefn( OGRLayer* poLayer,
     json_object* poObjId = OGRGeoJSONFindMemberByName( poObj, "id" );
     if( poObjId )
     {
-        const int nIdx = poDefn->GetFieldIndex( "id" );
+        const int nIdx = poDefn->GetFieldIndexCaseSensitive( "id" );
         if( nIdx < 0 )
         {
             if( json_object_get_type(poObjId) == json_type_int )
@@ -1937,7 +1937,7 @@ bool OGRGeoJSONBaseReader::GenerateFeatureDefn( OGRLayer* poLayer,
         it.entry = nullptr;
         json_object_object_foreachC( poObjProps, it )
         {
-            int nFldIndex = poDefn->GetFieldIndex( it.key );
+            int nFldIndex = poDefn->GetFieldIndexCaseSensitive( it.key );
             if( -1 == nFldIndex && !bIsGeocouchSpatiallistFormat )
             {
                 // Detect the special kind of GeoJSON output by a spatiallist of
@@ -1970,7 +1970,7 @@ bool OGRGeoJSONBaseReader::GenerateFeatureDefn( OGRLayer* poLayer,
                                                "TRUE"));
                     if( bFlattenGeocouchSpatiallistFormat )
                     {
-                        poDefn->DeleteFieldDefn(poDefn->GetFieldIndex("type"));
+                        poDefn->DeleteFieldDefn(poDefn->GetFieldIndexCaseSensitive("type"));
                         bIsGeocouchSpatiallistFormat = true;
                         return GenerateFeatureDefn(poLayer, poObj);
                     }
@@ -2008,7 +2008,7 @@ bool OGRGeoJSONBaseReader::GenerateFeatureDefn( OGRLayer* poLayer,
                 strcmp(it.key, "bbox") != 0 &&
                 strcmp(it.key, "center") != 0 )
             {
-                int nFldIndex = poDefn->GetFieldIndex( it.key );
+                int nFldIndex = poDefn->GetFieldIndexCaseSensitive( it.key );
                 if( -1 == nFldIndex )
                 {
                     OGRGeoJSONReaderAddOrUpdateField(poDefn, it.key, it.val,
@@ -2124,7 +2124,8 @@ static void OGRGeoJSONReaderSetFieldNestedAttribute( OGRLayer* poLayer,
         }
         else
         {
-            const int nField = poFeature->GetFieldIndex(osAttrName);
+            const int nField = poFeature->GetDefnRef()->
+                GetFieldIndexCaseSensitive(osAttrName);
             OGRGeoJSONReaderSetField(poLayer, poFeature, nField,
                                         osAttrName, it.val, false, 0);
         }
@@ -2292,7 +2293,8 @@ OGRFeature* OGRGeoJSONBaseReader::ReadFeature( OGRLayer* poLayer,
 {
     CPLAssert( nullptr != poObj );
 
-    OGRFeature* poFeature = new OGRFeature( poLayer->GetLayerDefn() );
+    OGRFeatureDefn* poFDefn = poLayer->GetLayerDefn();
+    OGRFeature* poFeature = new OGRFeature( poFDefn );
 
     if( bStoreNativeData_ )
     {
@@ -2337,7 +2339,7 @@ OGRFeature* OGRGeoJSONBaseReader::ReadFeature( OGRLayer* poLayer,
         it.entry = nullptr;
         json_object_object_foreachC( poObjProps, it )
         {
-            const int nField = poFeature->GetFieldIndex(it.key);
+            const int nField = poFDefn->GetFieldIndexCaseSensitive(it.key);
             if( nField < 0 &&
                 !( bFlattenNestedAttributes_ && it.val != nullptr &&
                    json_object_get_type(it.val) == json_type_object) )
@@ -2362,7 +2364,7 @@ OGRFeature* OGRGeoJSONBaseReader::ReadFeature( OGRLayer* poLayer,
         it.entry = nullptr;
         json_object_object_foreachC( poObj, it )
         {
-            const int nFldIndex = poFeature->GetFieldIndex(it.key);
+            const int nFldIndex = poFDefn->GetFieldIndexCaseSensitive(it.key);
             if( nFldIndex >= 0 )
             {
                 if( it.val )
@@ -2390,7 +2392,7 @@ OGRFeature* OGRGeoJSONBaseReader::ReadFeature( OGRLayer* poLayer,
 /* -------------------------------------------------------------------- */
     else if( nullptr != poObjId )
     {
-        const int nIdx = poLayer->GetLayerDefn()->GetFieldIndex( "id" );
+        const int nIdx = poFDefn->GetFieldIndexCaseSensitive( "id" );
         if( nIdx >= 0 && !poFeature->IsFieldSet(nIdx) )
         {
             poFeature->SetField(nIdx, json_object_get_string(poObjId));
diff --git a/gdal/ogr/ogrsf_frmts/geojson/ogrgeojsonwritelayer.cpp b/gdal/ogr/ogrsf_frmts/geojson/ogrgeojsonwritelayer.cpp
index ea2525d5e5a3..8dcd788e8e1c 100644
--- a/gdal/ogr/ogrsf_frmts/geojson/ogrgeojsonwritelayer.cpp
+++ b/gdal/ogr/ogrsf_frmts/geojson/ogrgeojsonwritelayer.cpp
@@ -290,7 +290,7 @@ OGRErr OGRGeoJSONWriteLayer::ICreateFeature( OGRFeature* poFeature )
 OGRErr OGRGeoJSONWriteLayer::CreateField( OGRFieldDefn* poField,
                                           int /* bApproxOK */  )
 {
-    if( poFeatureDefn_->GetFieldIndex(poField->GetNameRef()) >= 0 )
+    if( poFeatureDefn_->GetFieldIndexCaseSensitive(poField->GetNameRef()) >= 0 )
     {
         CPLDebug( "GeoJSON", "Field '%s' already present in schema",
                     poField->GetNameRef() );
diff --git a/gdal/ogr/ogrsf_frmts/geojson/ogrgeojsonwriter.cpp b/gdal/ogr/ogrsf_frmts/geojson/ogrgeojsonwriter.cpp
index 8ea788192411..89e3d12f0bb8 100644
--- a/gdal/ogr/ogrsf_frmts/geojson/ogrgeojsonwriter.cpp
+++ b/gdal/ogr/ogrsf_frmts/geojson/ogrgeojsonwriter.cpp
@@ -636,7 +636,7 @@ json_object* OGRGeoJSONWriteFeature( OGRFeature* poFeature,
 
                     if( it.val != nullptr )
                     {
-                        int nIdx = poFeature->GetFieldIndex("id");
+                        int nIdx = poFeature->GetDefnRef()->GetFieldIndexCaseSensitive("id");
                         if( eType == json_type_string &&
                             nIdx >= 0 &&
                             poFeature->GetFieldDefnRef(nIdx)->GetType() == OFTString &&
@@ -678,7 +678,7 @@ json_object* OGRGeoJSONWriteFeature( OGRFeature* poFeature,
 /* -------------------------------------------------------------------- */
     if( !oOptions.osIDField.empty() )
     {
-        int nIdx = poFeature->GetFieldIndex(oOptions.osIDField);
+        int nIdx = poFeature->GetDefnRef()->GetFieldIndexCaseSensitive(oOptions.osIDField);
         if( nIdx >= 0 )
         {
             if( (oOptions.bForceIDFieldType &&
@@ -797,7 +797,7 @@ json_object* OGRGeoJSONWriteAttributes( OGRFeature* poFeature,
     OGRFeatureDefn* poDefn = poFeature->GetDefnRef();
 
     const int nIDField = !oOptions.osIDField.empty() ?
-        poFeature->GetFieldIndex(oOptions.osIDField) : -1;
+        poDefn->GetFieldIndexCaseSensitive(oOptions.osIDField) : -1;
 
     const int nFieldCount = poDefn->GetFieldCount();
     for( int nField = 0; nField < nFieldCount; ++nField )

From e6e6ac477f8cbb8c817135caaf1154c3c6989b0c Mon Sep 17 00:00:00 2001
From: Hiroshi Miura <miurahr@linux.com>
Date: Tue, 30 Oct 2018 21:33:31 +0900
Subject: [PATCH 009/488] autotest: fix UnicodeEncodeError when test fails in
 python2

When calling ogr_gmlas.py test and its test fails,
python warns UnicodeEncodeError instead of showing
test result.

Signed-off-by: Hiroshi Miura <miurahr@linux.com>
---
 autotest/ogr/ogr_gmlas.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/autotest/ogr/ogr_gmlas.py b/autotest/ogr/ogr_gmlas.py
index d5dc2acf00e9..de19582f2890 100755
--- a/autotest/ogr/ogr_gmlas.py
+++ b/autotest/ogr/ogr_gmlas.py
@@ -75,7 +75,7 @@ def compare_ogrinfo_output(gmlfile, reffile, options=''):
     if ret != expected:
         gdaltest.post_reason('fail')
         print('Got:')
-        print(ret)
+        print(ret.encode('utf-8'))
         open(tmpfilename, 'wb').write(ret.encode('utf-8'))
         print('Diff:')
         os.system('diff -u ' + reffile + ' ' + tmpfilename)

From 5ed09343b361b78ca5dc2fb55ec882be926e515e Mon Sep 17 00:00:00 2001
From: Even Rouault <even.rouault@spatialys.com>
Date: Tue, 30 Oct 2018 18:29:51 +0100
Subject: [PATCH 010/488] Shape: avoid being dependent on correctness of file
 size field in .shp. Fixes
 https://lists.osgeo.org/pipermail/gdal-dev/2018-October/049218.html

---
 gdal/ogr/ogrsf_frmts/shape/shpopen.c | 52 +++++++++++++++-------------
 1 file changed, 27 insertions(+), 25 deletions(-)

diff --git a/gdal/ogr/ogrsf_frmts/shape/shpopen.c b/gdal/ogr/ogrsf_frmts/shape/shpopen.c
index 81b245e57cd0..b2d0f5c2f2fc 100644
--- a/gdal/ogr/ogrsf_frmts/shape/shpopen.c
+++ b/gdal/ogr/ogrsf_frmts/shape/shpopen.c
@@ -2151,33 +2151,35 @@ SHPReadObject( SHPHandle psSHP, int hEntity )
         /* Before allocating too much memory, check that the file is big enough */
         /* and do not trust the file size in the header the first time we */
         /* need to allocate more than 10 MB */
-        if( nNewBufSize >= 10 * 1024 * 1024 &&
-            psSHP->nBufSize < 10 * 1024 * 1024 )
-        {
-            SAOffset nFileSize;
-            psSHP->sHooks.FSeek( psSHP->fpSHP, 0, 2 );
-            nFileSize = psSHP->sHooks.FTell(psSHP->fpSHP);
-            if( nFileSize >= UINT_MAX )
-                psSHP->nFileSize = UINT_MAX;
-            else
-                psSHP->nFileSize = STATIC_CAST(unsigned int, nFileSize);
-        }
-
-        if( psSHP->panRecOffset[hEntity] >= psSHP->nFileSize ||
-            /* We should normally use nEntitySize instead of*/
-            /* psSHP->panRecSize[hEntity] in the below test, but because of */
-            /* the case of non conformant .shx files detailed a bit below, */
-            /* let be more tolerant */
-            psSHP->panRecSize[hEntity] > psSHP->nFileSize - psSHP->panRecOffset[hEntity] )
+        if( nNewBufSize >= 10 * 1024 * 1024 )
         {
-            char str[128];
-            snprintf( str, sizeof(str),
-                        "Error in fread() reading object of size %d at offset %u from .shp file",
-                        nEntitySize, psSHP->panRecOffset[hEntity] );
-            str[sizeof(str)-1] = '\0';
+            if( psSHP->nBufSize < 10 * 1024 * 1024 )
+            {
+                SAOffset nFileSize;
+                psSHP->sHooks.FSeek( psSHP->fpSHP, 0, 2 );
+                nFileSize = psSHP->sHooks.FTell(psSHP->fpSHP);
+                if( nFileSize >= UINT_MAX )
+                    psSHP->nFileSize = UINT_MAX;
+                else
+                    psSHP->nFileSize = STATIC_CAST(unsigned int, nFileSize);
+            }
 
-            psSHP->sHooks.Error( str );
-            return SHPLIB_NULLPTR;
+            if( psSHP->panRecOffset[hEntity] >= psSHP->nFileSize ||
+                /* We should normally use nEntitySize instead of*/
+                /* psSHP->panRecSize[hEntity] in the below test, but because of */
+                /* the case of non conformant .shx files detailed a bit below, */
+                /* let be more tolerant */
+                psSHP->panRecSize[hEntity] > psSHP->nFileSize - psSHP->panRecOffset[hEntity] )
+            {
+                char str[128];
+                snprintf( str, sizeof(str),
+                            "Error in fread() reading object of size %d at offset %u from .shp file",
+                            nEntitySize, psSHP->panRecOffset[hEntity] );
+                str[sizeof(str)-1] = '\0';
+
+                psSHP->sHooks.Error( str );
+                return SHPLIB_NULLPTR;
+            }
         }
 
         pabyRecNew = STATIC_CAST(uchar *, SfRealloc(psSHP->pabyRec,nNewBufSize));

From a91aa00823f19d395f52296b58196459100b616a Mon Sep 17 00:00:00 2001
From: Hiroshi Miura <miurahr@linux.com>
Date: Wed, 31 Oct 2018 02:53:45 +0900
Subject: [PATCH 011/488] Vagrant: work around for #1058 (#1059)

---
 Vagrantfile                        | 2 +-
 gdal/scripts/vagrant/gdal-mingw.sh | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/Vagrantfile b/Vagrantfile
index caf03c057318..5c185a2cbbc0 100644
--- a/Vagrantfile
+++ b/Vagrantfile
@@ -151,7 +151,7 @@ Vagrant.configure(VAGRANTFILE_API_VERSION) do |config|
     "mingw-w64-tools",
     "gdb-mingw-w64-target",
     "libgeos-mingw-w64-dev",
-    "libproj-mingw-w64-dev",
+    #"libproj-mingw-w64-dev",
     "cmake3-curses-gui",
     "gdb",
     "gdbserver",
diff --git a/gdal/scripts/vagrant/gdal-mingw.sh b/gdal/scripts/vagrant/gdal-mingw.sh
index 9719fb113787..791bd921b310 100755
--- a/gdal/scripts/vagrant/gdal-mingw.sh
+++ b/gdal/scripts/vagrant/gdal-mingw.sh
@@ -33,7 +33,7 @@ ln -sf /usr/x86_64-w64-mingw32/lib/libgeos-3-5-0.dll "$HOME/.wine/drive_c/window
 
 (cd /home/vagrant/gnumake-build-mingw-w64
     CC="ccache x86_64-w64-mingw32-gcc" CXX="ccache x86_64-w64-mingw32-g++" LD=x86_64-w64-mingw32-ld \
-    ./configure --prefix=/usr/x86_64-w64-mingw32  --host=x86_64-w64-mingw32  --with-geos --with-proj-static
+    ./configure --prefix=/usr/x86_64-w64-mingw32  --host=x86_64-w64-mingw32  --with-geos #--with-proj
     ln -sf "$PWD/.libs/libgdal-20.dll" "$HOME/.wine/drive_c/windows"
 
     # Python bindings

From 87f2ab2a6813231ec87acf5e47dca60f4ca95c08 Mon Sep 17 00:00:00 2001
From: Even Rouault <even.rouault@spatialys.com>
Date: Tue, 30 Oct 2018 19:01:32 +0100
Subject: [PATCH 012/488] CONTRIBUTING.md: enhance backporting section [ci
 skip]

---
 CONTRIBUTING.md | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index 5a78b50f1f22..22d516b84436 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -103,7 +103,10 @@ Backporting bugfixes from master to a stable branch
 git checkout master
 With git log, identify the sha1sum of the commit you want to backport
 git checkout 2.2 (if you want to backport to 2.2)
+git pull origin 2.2
+(git checkout -b branh_name: if you intend to submit the backport as a pull request)
 git cherry-pick the_sha1_sum
+git push ...
 ```
 If changes are needed, do them and ```git commit -a --amend```
 

From 48e64636d25ecb2b76fdbe1985a19ce78bc50bcc Mon Sep 17 00:00:00 2001
From: Even Rouault <even.rouault@spatialys.com>
Date: Tue, 30 Oct 2018 19:10:16 +0100
Subject: [PATCH 013/488] Spatialite: read table name in its original case
 (fixes #1060, from suggestion by @aledonati)

---
 .../ogrsf_frmts/sqlite/ogrsqlitedatasource.cpp   | 16 ++++++++++------
 1 file changed, 10 insertions(+), 6 deletions(-)

diff --git a/gdal/ogr/ogrsf_frmts/sqlite/ogrsqlitedatasource.cpp b/gdal/ogr/ogrsf_frmts/sqlite/ogrsqlitedatasource.cpp
index 5f034fa3cc10..09b06d54eb8e 100644
--- a/gdal/ogr/ogrsf_frmts/sqlite/ogrsqlitedatasource.cpp
+++ b/gdal/ogr/ogrsf_frmts/sqlite/ogrsqlitedatasource.cpp
@@ -1653,9 +1653,11 @@ int OGRSQLiteDataSource::Open( GDALOpenInfo* poOpenInfo)
 /* -------------------------------------------------------------------- */
     sqlite3_free( pszErrMsg );
     rc = sqlite3_get_table( hDB,
-                            "SELECT f_table_name, f_geometry_column, "
-                            "type, coord_dimension, srid, "
-                            "spatial_index_enabled FROM geometry_columns "
+                            "SELECT sm.name, gc.f_geometry_column, "
+                            "gc.type, gc.coord_dimension, gc.srid, "
+                            "gc.spatial_index_enabled FROM geometry_columns gc "
+                            "JOIN sqlite_master sm ON "
+                            "LOWER(gc.f_table_name)=LOWER(sm.name) "
                             "LIMIT 10000",
                             &papszResult, &nRowCount,
                             &nColCount, &pszErrMsg );
@@ -1664,9 +1666,11 @@ int OGRSQLiteDataSource::Open( GDALOpenInfo* poOpenInfo)
         /* Test with SpatiaLite 4.0 schema */
         sqlite3_free( pszErrMsg );
         rc = sqlite3_get_table( hDB,
-                                "SELECT f_table_name, f_geometry_column, "
-                                "geometry_type, coord_dimension, srid, "
-                                "spatial_index_enabled FROM geometry_columns "
+                                "SELECT sm.name, gc.f_geometry_column, "
+                                "gc.geometry_type, gc.coord_dimension, gc.srid, "
+                                "gc.spatial_index_enabled FROM geometry_columns gc "
+                                "JOIN sqlite_master sm ON "
+                                "LOWER(gc.f_table_name)=LOWER(sm.name) "
                                 "LIMIT 10000",
                                 &papszResult, &nRowCount,
                                 &nColCount, &pszErrMsg );

From bb795227fc4177d5c7424a6c411f6b802fdfc22a Mon Sep 17 00:00:00 2001
From: Sander Jansen <s.jansen@gmail.com>
Date: Tue, 30 Oct 2018 13:56:23 -0500
Subject: [PATCH 014/488] grib: interpret missing data values correctly for
 complex packing when original data is integer

---
 gdal/frmts/grib/gribdataset.cpp | 45 +++++++++++++++++++++++----------
 1 file changed, 31 insertions(+), 14 deletions(-)

diff --git a/gdal/frmts/grib/gribdataset.cpp b/gdal/frmts/grib/gribdataset.cpp
index 221dfcbf5c0e..632185eb2b2e 100644
--- a/gdal/frmts/grib/gribdataset.cpp
+++ b/gdal/frmts/grib/gribdataset.cpp
@@ -516,22 +516,39 @@ void GRIBRasterBand::FindNoDataGrib2(bool bSeekToStart)
                 const int nMiss = pabyBody[23-1];
                 if( nMiss == 1 || nMiss == 2 )
                 {
-                    float fTemp;
-                    memcpy(&fTemp, &pabyBody[24-1], 4);
-                    CPL_MSBPTR32(&fTemp);
-                    m_dfNoData = fTemp;
-                    m_bHasNoData = true;
-
-                    if( nMiss == 2 )
+                    const int original_field_type = pabyBody[21-1];
+                    if ( original_field_type == 0 ) // Floating Point
                     {
-                        memcpy(&fTemp, &pabyBody[28-1], 4);
+                        float fTemp;
+                        memcpy(&fTemp, &pabyBody[24-1], 4);
                         CPL_MSBPTR32(&fTemp);
-                        double dfSecondaryNoData = fTemp;
-
-                        // What TODO?
-                        CPLDebug("GRIB",
-                                 "Secondary missing value also set for band %d : %f",
-                                 nBand, dfSecondaryNoData);
+                        m_dfNoData = fTemp;
+                        m_bHasNoData = true;
+                        if( nMiss == 2 )
+                        {
+                            memcpy(&fTemp, &pabyBody[28-1], 4);
+                            CPL_MSBPTR32(&fTemp);
+                            CPLDebug("GRIB","Secondary missing value also set for band %d : %f", nBand, fTemp);
+                        }
+                    }
+                    else if ( original_field_type == 1 ) // Integer
+                    {
+                        int iTemp;
+                        memcpy(&iTemp, &pabyBody[24-1], 4);
+                        CPL_MSBPTR32(&iTemp);
+                        m_dfNoData = iTemp;
+                        m_bHasNoData = true;
+                        if( nMiss == 2 )
+                        {
+                            memcpy(&iTemp, &pabyBody[28-1], 4);
+                            CPL_MSBPTR32(&iTemp);
+                            CPLDebug("GRIB","Secondary missing value also set for band %d : %d", nBand, iTemp);
+                        }
+                    }
+                    else
+                    {
+                        // FIXME What to do? Blindly convert to float?
+                        CPLDebug("GRIB","Complex Packing - Type of Original Field Values for band %d:  %u", nBand, original_field_type);
                     }
                 }
             }

From 3ab3b331094aadf2a4dbf9aae9cc378406f31112 Mon Sep 17 00:00:00 2001
From: Even Rouault <even.rouault@spatialys.com>
Date: Wed, 31 Oct 2018 00:13:11 +0100
Subject: [PATCH 015/488] GRIB: fix writing of nodata value for complex value
 when original data is integer (refs #1063)

---
 autotest/gdrivers/grib.py          | 31 ++++++++++++++++++++++++
 gdal/frmts/grib/gribcreatecopy.cpp | 39 ++++++++++++++++++++++++------
 2 files changed, 62 insertions(+), 8 deletions(-)

diff --git a/autotest/gdrivers/grib.py b/autotest/gdrivers/grib.py
index eaa6bbabe68a..d55f31298fe8 100755
--- a/autotest/gdrivers/grib.py
+++ b/autotest/gdrivers/grib.py
@@ -1532,6 +1532,36 @@ def grib_grib2_write_temperatures():
     return 'success'
 
 ###############################################################################
+
+
+def grib_grib2_write_nodata():
+
+    if gdaltest.grib_drv is None:
+        return 'skip'
+
+    for src_type in [ gdal.GDT_Byte, gdal.GDT_Float32 ]:
+        src_ds = gdal.GetDriverByName('MEM').Create('', 2, 2, 1, src_type)
+        src_ds.SetGeoTransform([2, 1, 0, 49, 0, -1])
+        sr = osr.SpatialReference()
+        sr.SetFromUserInput('WGS84')
+        src_ds.SetProjection(sr.ExportToWkt())
+        src_ds.GetRasterBand(1).SetNoDataValue(123)
+        tmpfilename = '/vsimem/out.grb2'
+        options = [
+            'DATA_ENCODING=COMPLEX_PACKING'
+        ]
+        gdaltest.grib_drv.CreateCopy(tmpfilename, src_ds, options=options)
+
+        ds = gdal.Open(tmpfilename)
+        if ds.GetRasterBand(1).GetNoDataValue() != 123:
+            gdaltest.post_reason('fail')
+            return 'fail'
+        ds = None
+        gdal.Unlink(tmpfilename)
+
+    return 'success'
+
+###############################################################################
 # Test GRIB2 file with JPEG2000 codestream on a single line (#6719)
 
 
@@ -1600,6 +1630,7 @@ def grib_online_grib2_jpeg2000_single_line():
     grib_grib2_write_data_encodings,
     grib_grib2_write_data_encodings_warnings_and_errors,
     grib_grib2_write_temperatures,
+    grib_grib2_write_nodata,
     grib_online_grib2_jpeg2000_single_line
 ]
 
diff --git a/gdal/frmts/grib/gribcreatecopy.cpp b/gdal/frmts/grib/gribcreatecopy.cpp
index 8d7aca6e90be..ac7184b591ca 100644
--- a/gdal/frmts/grib/gribcreatecopy.cpp
+++ b/gdal/frmts/grib/gribcreatecopy.cpp
@@ -33,6 +33,7 @@
 
 #include "cpl_port.h"
 #include "gribdataset.h"
+#include "gdal_priv_templates.hpp"
 
 #include <limits>
 
@@ -700,6 +701,7 @@ class GRIB2Section567Writer
         bool Write(float fValOffset,
                    char** papszOptions,
                    GDALProgressFunc pfnProgress, void * pProgressData);
+        void WriteComplexPackingNoData();
 };
 
 /************************************************************************/
@@ -926,6 +928,33 @@ bool GRIB2Section567Writer::WriteSimplePacking()
     return true;
 }
 
+/************************************************************************/
+/*                      WriteComplexPackingNoData()                     */
+/************************************************************************/
+
+void GRIB2Section567Writer::WriteComplexPackingNoData()
+{
+    if( !m_bHasNoData )
+    {
+        WriteUInt32(m_fp, GRIB2MISSING_u4);
+    }
+    else if( GDALDataTypeIsFloating(m_eDT) )
+    {
+        WriteFloat32(m_fp, static_cast<float>(m_dfNoData));
+    }
+    else
+    {
+        if( GDALIsValueInRange<int>(m_dfNoData) )
+        {
+            WriteInt32(m_fp, static_cast<int>(m_dfNoData));
+        }
+        else
+        {
+            WriteUInt32(m_fp, GRIB2MISSING_u4);
+        }
+    }
+}
+
 /************************************************************************/
 /*                       WriteComplexPacking()                          */
 /************************************************************************/
@@ -965,10 +994,7 @@ bool GRIB2Section567Writer::WriteComplexPacking(int nSpatialDifferencingOrder)
         WriteByte(m_fp, GDALDataTypeIsFloating(m_eDT) ? 0 : 1);
         WriteByte(m_fp, 0);
         WriteByte(m_fp, m_bHasNoData ? 1 : 0); // 1 missing value
-        if( !m_bHasNoData )
-            WriteUInt32(m_fp, GRIB2MISSING_u4);
-        else
-            WriteFloat32(m_fp, fNoData);
+        WriteComplexPackingNoData();
         WriteUInt32(m_fp, GRIB2MISSING_u4);
         WriteUInt32(m_fp, 0);
         WriteByte(m_fp, 0);
@@ -1092,10 +1118,7 @@ bool GRIB2Section567Writer::WriteComplexPacking(int nSpatialDifferencingOrder)
     WriteByte(m_fp, GDALDataTypeIsFloating(m_eDT) ? 0 : 1);
     WriteByte(m_fp, idrstmpl[TMPL5_GROUP_SPLITTING_IDX]);
     WriteByte(m_fp, idrstmpl[TMPL5_MISSING_VALUE_MGNT_IDX]);
-    if( !m_bHasNoData )
-        WriteUInt32(m_fp, GRIB2MISSING_u4);
-    else
-        WriteFloat32(m_fp, fNoData);
+    WriteComplexPackingNoData();
     WriteUInt32(m_fp, GRIB2MISSING_u4);
     WriteUInt32(m_fp, idrstmpl[TMPL5_NG_IDX]);
     WriteByte(m_fp, idrstmpl[TMPL5_REF_GROUP_WIDTHS_IDX]);

From 5bd506d5691e5c68da5bb7ab451fa0e99b5e91cf Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Mateusz=20=C5=81oskot?= <mateusz@loskot.net>
Date: Wed, 31 Oct 2018 09:58:44 +0100
Subject: [PATCH 016/488] Remove support for pre-VS2013 from
 generate_vcxproj.bat [ci skip]

---
 gdal/generate_vcxproj.bat | 13 +++----------
 1 file changed, 3 insertions(+), 10 deletions(-)

diff --git a/gdal/generate_vcxproj.bat b/gdal/generate_vcxproj.bat
index 3e4686309f0c..9bc120c59277 100644
--- a/gdal/generate_vcxproj.bat
+++ b/gdal/generate_vcxproj.bat
@@ -5,7 +5,7 @@
 :: 
 ::  Name:     generate_vcxproj.bat
 ::  Project:  GDAL 
-::  Purpose:  Generate MS Visual C++ => 10.0 project files    
+::  Purpose:  Generate MS Visual C++ => 12.0 project files
 ::  Author:   Ivan Lucena, [ivan lucena at outlook dot com]
 :: 
 :: ****************************************************************************
@@ -61,12 +61,6 @@ if "%_vcver_%"=="15.0" (
 ) else ( if "%_vcver_%"=="12.0" (
 	set _clver_=1800
 	set _vstoolset_=v120
-) else ( if "%_vcver_%"=="11.0" (
-	set _clver_=1700
-	set _vstoolset_=v110
-) else ( if "%_vcver_%"=="10.0" (
-	set _clver_=1600
-	set _vstoolset_=v100
 ) else (
     echo Wrong value for parameter 1. See usage:
 	goto :usage
@@ -102,15 +96,14 @@ goto :continue
 
 echo Usage: generate_vcxproj ^<Visual C++ version^> [32^|64] ^<^(*^) project file name^>
 echo Parameters:
-echo    1 : Visual C++ version is not the same as Visual Studio version ^( =^> 10.0 ^)
+echo    1 : Visual C++ version is not the same as Visual Studio version ^( =^> 14.0 ^)
 echo    2 : Windows platform 32 for Win32 and 64 for Win64
 echo    3 : Base file name, with no path and no extension ^(*^)
 echo Examples:
-echo    generate_vcxproj 10.1 32 gdal_vs2010
-echo    generate_vcxproj 11.0 64 gdal_vs2012
 echo    generate_vcxproj 12.0 64 gdal_vs2013
 echo    generate_vcxproj 14.0 64 gdal_vs2015
 echo    generate_vcxproj 15.0 64 gdal_vs2017
+echo WARNING: GDAL requires C++11. It is not guaranteed to build with VS2013.
 
 goto :end
 

From a3c0caeab77354c23a237905cc451dfc89f7f06f Mon Sep 17 00:00:00 2001
From: Even Rouault <even.rouault@spatialys.com>
Date: Thu, 1 Nov 2018 14:28:43 +0100
Subject: [PATCH 017/488] ogr_merge.py: fix issue with non-ASCII characters
 (fixes #1067)

---
 autotest/pyscripts/test_ogrmerge.py  | 29 +++++++++++++++++-
 gdal/swig/python/scripts/ogrmerge.py | 45 ++++++++++++++++++----------
 2 files changed, 58 insertions(+), 16 deletions(-)

diff --git a/autotest/pyscripts/test_ogrmerge.py b/autotest/pyscripts/test_ogrmerge.py
index 7b27f061bc27..6b728af940b4 100755
--- a/autotest/pyscripts/test_ogrmerge.py
+++ b/autotest/pyscripts/test_ogrmerge.py
@@ -404,6 +404,32 @@ def test_ogrmerge_11():
 
     return 'success'
 
+###############################################################################
+# Test layer names with accents
+
+
+def test_ogrmerge_12():
+    script_path = test_py_scripts.get_py_script('ogrmerge')
+    if script_path is None:
+        return 'skip'
+
+    with open('tmp/tmp.json', 'wt') as f:
+        f.write("""{ "type": "FeatureCollection", "name": "\xc3\xa9ven", "features": [ { "type": "Feature", "properties": {}, "geometry": null} ]}""")
+
+    test_py_scripts.run_py_script(script_path, 'ogrmerge',
+                                  '-f VRT -o /vsimem/out.vrt tmp/tmp.json')
+
+    ds = ogr.Open('/vsimem/out.vrt')
+    if ds is None:
+        gdaltest.post_reason('fail')
+        return 'fail'
+    ds = None
+
+    gdal.Unlink('tmp/tmp.json')
+    gdal.Unlink('/vsimem/out.vrt')
+
+    return 'success'
+
 
 gdaltest_list = [
     test_ogrmerge_1,
@@ -416,7 +442,8 @@ def test_ogrmerge_11():
     test_ogrmerge_8,
     test_ogrmerge_9,
     test_ogrmerge_10,
-    test_ogrmerge_11
+    test_ogrmerge_11,
+    test_ogrmerge_12
 ]
 
 
diff --git a/gdal/swig/python/scripts/ogrmerge.py b/gdal/swig/python/scripts/ogrmerge.py
index 85bb31e3d2ad..c5af21de9647 100755
--- a/gdal/swig/python/scripts/ogrmerge.py
+++ b/gdal/swig/python/scripts/ogrmerge.py
@@ -163,8 +163,10 @@ def open_element(self, name, attrs=None):
         xml_attrs = ''
         if attrs is not None:
             for key in attrs:
-                xml_attrs = xml_attrs + ' %s=\"%s\"' % (key, _Esc(attrs[key]))
-        _VSIFPrintfL(self.f, '%s<%s%s>\n' % (self._indent(), name, xml_attrs))
+                xml_attrs = xml_attrs + ' %s=\"%s\"' % (key, _Esc(attrs[key].encode('utf-8')))
+        x = '%s<%s%s>\n' % (self._indent(), name, xml_attrs)
+        x = x.encode('utf-8')
+        _VSIFPrintfL(self.f, x)
         self.inc = self.inc + 1
         self.elements.append(name)
 
@@ -172,10 +174,11 @@ def write_element_value(self, name, value, attrs=None):
         xml_attrs = ''
         if attrs is not None:
             for key in attrs:
-                xml_attrs = xml_attrs + ' %s=\"%s\"' % (key, _Esc(attrs[key]))
-        _VSIFPrintfL(self.f, '%s<%s%s>%s</%s>\n' %
-                     (self._indent(), name, xml_attrs,
-                      _Esc(value), name))
+                xml_attrs = xml_attrs + ' %s=\"%s\"' % (key, _Esc(attrs[key].encode('utf-8')))
+        x = '%s<%s%s>%s</%s>\n' % (self._indent(), name, xml_attrs,
+                      _Esc(value.encode('utf-8')), name)
+        x = x.encode('utf-8')
+        _VSIFPrintfL(self.f, x)
 
     def close_element(self, closing_name=None):
         self.inc = self.inc - 1
@@ -406,21 +409,27 @@ def process(argv, progress=None, progress_arg=None):
 
                 layer_name = src_layer_field_content
 
+                src_lyr_name = src_lyr.GetName()
+                try:
+                    src_lyr_name = src_lyr_name.decode('utf-8')
+                except AttributeError:
+                    pass
+
                 basename = None
                 if os.path.exists(src_dsname):
                     basename = os.path.basename(src_dsname)
                     if basename.find('.') >= 0:
                         basename = '.'.join(basename.split(".")[0:-1])
 
-                if basename == src_lyr.GetName():
+                if basename == src_lyr_name:
                     layer_name = layer_name.replace('{AUTO_NAME}', basename)
                 elif basename is None:
                     layer_name = layer_name.replace(
                         '{AUTO_NAME}',
-                        'Dataset%d_%s' % (src_ds_idx, src_lyr.GetName()))
+                        'Dataset%d_%s' % (src_ds_idx, src_lyr_name))
                 else:
                     layer_name = layer_name.replace(
-                        '{AUTO_NAME}', basename + '_' + src_lyr.GetName())
+                        '{AUTO_NAME}', basename + '_' + src_lyr_name)
 
                 if basename is not None:
                     layer_name = layer_name.replace('{DS_BASENAME}', basename)
@@ -432,7 +441,7 @@ def process(argv, progress=None, progress_arg=None):
                 layer_name = layer_name.replace('{DS_INDEX}', '%d' %
                                                 src_ds_idx)
                 layer_name = layer_name.replace('{LAYER_NAME}',
-                                                src_lyr.GetName())
+                                                src_lyr_name)
                 layer_name = layer_name.replace('{LAYER_INDEX}', '%d' %
                                                 src_lyr_idx)
 
@@ -485,6 +494,12 @@ def process(argv, progress=None, progress_arg=None):
                     if gt not in src_geom_types:
                         continue
 
+                src_lyr_name = src_lyr.GetName()
+                try:
+                    src_lyr_name = src_lyr_name.decode('utf-8')
+                except AttributeError:
+                    pass
+
                 layer_name = layer_name_template
                 basename = None
                 if os.path.exists(src_dsname):
@@ -492,15 +507,15 @@ def process(argv, progress=None, progress_arg=None):
                     if basename.find('.') >= 0:
                         basename = '.'.join(basename.split(".")[0:-1])
 
-                if basename == src_lyr.GetName():
+                if basename == src_lyr_name:
                     layer_name = layer_name.replace('{AUTO_NAME}', basename)
                 elif basename is None:
                     layer_name = layer_name.replace(
                         '{AUTO_NAME}',
-                        'Dataset%d_%s' % (src_ds_idx, src_lyr.GetName()))
+                        'Dataset%d_%s' % (src_ds_idx, src_lyr_name))
                 else:
                     layer_name = layer_name.replace(
-                        '{AUTO_NAME}', basename + '_' + src_lyr.GetName())
+                        '{AUTO_NAME}', basename + '_' + src_lyr_name)
 
                 if basename is not None:
                     layer_name = layer_name.replace('{DS_BASENAME}', basename)
@@ -523,7 +538,7 @@ def process(argv, progress=None, progress_arg=None):
                 layer_name = layer_name.replace('{DS_INDEX}', '%d' %
                                                 src_ds_idx)
                 layer_name = layer_name.replace('{LAYER_NAME}',
-                                                src_lyr.GetName())
+                                                src_lyr_name)
                 layer_name = layer_name.replace('{LAYER_INDEX}', '%d' %
                                                 src_lyr_idx)
 
@@ -541,7 +556,7 @@ def process(argv, progress=None, progress_arg=None):
                     attrs = {'relativeToVRT': '1'}
                 writer.write_element_value('SrcDataSource', src_dsname,
                                            attrs=attrs)
-                writer.write_element_value('SrcLayer', src_lyr.GetName())
+                writer.write_element_value('SrcLayer', src_lyr_name)
 
                 if a_srs is not None:
                     writer.write_element_value('LayerSRS', a_srs)

From 81816bf316a03f75fba348d84daac1416f7c218d Mon Sep 17 00:00:00 2001
From: Even Rouault <even.rouault@spatialys.com>
Date: Thu, 1 Nov 2018 18:42:21 +0100
Subject: [PATCH 018/488] ogr_merge.py: fix issue with non-ASCII filenames on
 Windows (fixes #1067, derived from fix by @tobwen)

---
 gdal/swig/python/scripts/ogrmerge.py | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/gdal/swig/python/scripts/ogrmerge.py b/gdal/swig/python/scripts/ogrmerge.py
index c5af21de9647..5859c46098e2 100755
--- a/gdal/swig/python/scripts/ogrmerge.py
+++ b/gdal/swig/python/scripts/ogrmerge.py
@@ -288,7 +288,10 @@ def process(argv, progress=None, progress_arg=None):
             return Usage()
         else:
             if '*' in arg:
-                src_datasets += glob.glob(arg)
+                if sys.version_info < (3,0,0):
+                    src_datasets += [unicode(fn, sys.getfilesystemencoding()) for fn in glob.glob(arg)]
+                else:
+                    src_datasets += glob.glob(arg)
             else:
                 src_datasets.append(arg)
         i = i + 1
@@ -601,7 +604,10 @@ def process(argv, progress=None, progress_arg=None):
 
 
 def main():
-    argv = ogr.GeneralCmdLineProcessor(sys.argv)
+    argv = sys.argv
+    if sys.version_info < (3,0,0):
+        argv = [unicode(fn, sys.getfilesystemencoding()) for fn in argv]
+    argv = ogr.GeneralCmdLineProcessor(argv)
     if argv is None:
         return 1
     return process(argv[1:])

From ef65d88251a15e9f28d01a98a666238a761159c2 Mon Sep 17 00:00:00 2001
From: Even Rouault <even.rouault@spatialys.com>
Date: Thu, 1 Nov 2018 19:28:00 +0100
Subject: [PATCH 019/488] ogrmerge.py: make pyflakes3 happy (refs #1067)

---
 gdal/swig/python/scripts/ogrmerge.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/gdal/swig/python/scripts/ogrmerge.py b/gdal/swig/python/scripts/ogrmerge.py
index 5859c46098e2..06762e15ee9c 100755
--- a/gdal/swig/python/scripts/ogrmerge.py
+++ b/gdal/swig/python/scripts/ogrmerge.py
@@ -289,7 +289,7 @@ def process(argv, progress=None, progress_arg=None):
         else:
             if '*' in arg:
                 if sys.version_info < (3,0,0):
-                    src_datasets += [unicode(fn, sys.getfilesystemencoding()) for fn in glob.glob(arg)]
+                    src_datasets += [fn.decode(sys.getfilesystemencoding()) for fn in glob.glob(arg)]
                 else:
                     src_datasets += glob.glob(arg)
             else:
@@ -606,7 +606,7 @@ def process(argv, progress=None, progress_arg=None):
 def main():
     argv = sys.argv
     if sys.version_info < (3,0,0):
-        argv = [unicode(fn, sys.getfilesystemencoding()) for fn in argv]
+        argv = [fn.decode(sys.getfilesystemencoding()) for fn in argv]
     argv = ogr.GeneralCmdLineProcessor(argv)
     if argv is None:
         return 1

From 93bd2427dbca537cfa6aa37319ec9e1e0b193934 Mon Sep 17 00:00:00 2001
From: Even Rouault <even.rouault@spatialys.com>
Date: Thu, 1 Nov 2018 19:37:07 +0100
Subject: [PATCH 020/488] GeoJSON RFC7946 writer: clip and offset geometries
 outside [-180,180] (fixes #1068)

---
 autotest/ogr/ogr_geojson.py     | 46 +++++++++++++++++++++++++++++++++
 gdal/ogr/ogrgeometryfactory.cpp | 10 ++++---
 2 files changed, 52 insertions(+), 4 deletions(-)

diff --git a/autotest/ogr/ogr_geojson.py b/autotest/ogr/ogr_geojson.py
index 2116d0db7596..17937a380135 100755
--- a/autotest/ogr/ogr_geojson.py
+++ b/autotest/ogr/ogr_geojson.py
@@ -4208,6 +4208,51 @@ def ogr_geojson_read_fields_with_different_case():
 
     return 'success'
 
+###############################################################################
+# Test bugfix for https://github.com/OSGeo/gdal/issues/1068
+
+
+def ogr_geojson_clip_geometries_rfc7946():
+
+    if not ogrtest.have_geos():
+        return 'skip'
+
+    tmpfilename = '/vsimem/out.json'
+    gdal.VectorTranslate(tmpfilename, """{
+  "type": "FeatureCollection",
+  "features": [
+      { "type": "Feature", "geometry": {"type":"Polygon","coordinates":[[[-220,-20],[-220,30],[16,30],[16,-20],[-220,-20]]]} },
+      { "type": "Feature", "geometry": {"type":"Polygon","coordinates":[[[220,40],[220,70],[-16,70],[-16,40],[220,40]]]} },
+      { "type": "Feature", "geometry": {"type":"Polygon","coordinates":[[[170,-40],[170,-70],[-16,70],[-16,-40],[170,-40]]]} }
+  ]
+}""", options='-f GeoJSON -lco RFC7946=YES')
+
+    ds = ogr.Open(tmpfilename)
+    lyr = ds.GetLayer(0)
+
+    f = lyr.GetNextFeature()
+    ref_geom = ogr.CreateGeometryFromWkt('MULTIPOLYGON (((-180 30,-180 -20,16 -20,16 30,-180 30)),((140 -20,180 -20,180 30,140 30,140 -20)))')
+    if ogrtest.check_feature_geometry(f, ref_geom) != 0:
+        f.DumpReadable()
+        return 'fail'
+
+    f = lyr.GetNextFeature()
+    ref_geom = ogr.CreateGeometryFromWkt('MULTIPOLYGON (((180 40,180 70,-16 70,-16 40,180 40)),((-180 70,-180 40,-140 40,-140 70,-180 70)))')
+    if ogrtest.check_feature_geometry(f, ref_geom) != 0:
+        f.DumpReadable()
+        return 'fail'
+
+    f = lyr.GetNextFeature()
+    ref_geom = ogr.CreateGeometryFromWkt('POLYGON ((170 -40,-16 -40,-16 70,170 -70,170 -40))')
+    if ogrtest.check_feature_geometry(f, ref_geom) != 0:
+        f.DumpReadable()
+        return 'fail'
+    ds = None
+
+    gdal.Unlink(tmpfilename)
+    return 'success'
+
+
 ###############################################################################
 
 
@@ -4322,6 +4367,7 @@ def ogr_geojson_cleanup():
     ogr_geojson_empty_geometrycollection,
     ogr_esrijson_without_geometryType,
     ogr_geojson_read_fields_with_different_case,
+    ogr_geojson_clip_geometries_rfc7946,
     ogr_geojson_cleanup]
 
 if __name__ == '__main__':
diff --git a/gdal/ogr/ogrgeometryfactory.cpp b/gdal/ogr/ogrgeometryfactory.cpp
index c57edd70bc16..8cfa48ee7d7b 100644
--- a/gdal/ogr/ogrgeometryfactory.cpp
+++ b/gdal/ogr/ogrgeometryfactory.cpp
@@ -2801,8 +2801,10 @@ static void CutGeometryOnDateLineAndAddToMulti( OGRGeometryCollection* poMulti,
             const double dfDiffSpace = 360 - dfDateLineOffset;
 
             const double dfXOffset = (bAroundMinus180) ? 360.0 : 0.0;
-            if( oEnvelope.MinX + dfXOffset > dfLeftBorderX &&
-                oEnvelope.MaxX + dfXOffset > 180 )
+            if( oEnvelope.MinX < -180 ||
+                oEnvelope.MaxX > 180 ||
+                (oEnvelope.MinX + dfXOffset > dfLeftBorderX &&
+                 oEnvelope.MaxX + dfXOffset > 180) )
             {
 #ifndef HAVE_GEOS
                 CPLError( CE_Failure, CPLE_NotSupported,
@@ -2869,8 +2871,8 @@ static void CutGeometryOnDateLineAndAddToMulti( OGRGeometryCollection* poMulti,
                 OGRGeometry* poRectangle1 = nullptr;
                 OGRGeometry* poRectangle2 = nullptr;
                 const char* pszWKT1 = !bAroundMinus180 ?
-                    "POLYGON((0 90,180 90,180 -90,0 -90,0 90))" :
-                    "POLYGON((0 90,-180 90,-180 -90,0 -90,0 90))";
+                    "POLYGON((-180 90,180 90,180 -90,-180 -90,-180 90))" :
+                    "POLYGON((180 90,-180 90,-180 -90,180 -90,180 90))";
                 const char* pszWKT2 = !bAroundMinus180 ?
                     "POLYGON((180 90,360 90,360 -90,180 -90,180 90))" :
                     "POLYGON((-180 90,-360 90,-360 -90,-180 -90,-180 90))";

From f679c3ce6939206a5ce7ed264d2d6ffbdc027869 Mon Sep 17 00:00:00 2001
From: drons <drons@list.ru>
Date: Wed, 31 Oct 2018 23:06:46 +0300
Subject: [PATCH 021/488] DBF: Add CP1251 codepage name synonym (ANSI 1251) for
 DBF files. This synonym is found in the Russian-language OS Windows.

---
 gdal/ogr/ogrsf_frmts/shape/ogrshapelayer.cpp | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/gdal/ogr/ogrsf_frmts/shape/ogrshapelayer.cpp b/gdal/ogr/ogrsf_frmts/shape/ogrshapelayer.cpp
index 99781665db72..6702ba3a8c27 100644
--- a/gdal/ogr/ogrsf_frmts/shape/ogrshapelayer.cpp
+++ b/gdal/ogr/ogrsf_frmts/shape/ogrshapelayer.cpp
@@ -445,6 +445,8 @@ CPLString OGRShapeLayer::ConvertCodePage( const char *pszCodePage )
     }
     if( STARTS_WITH_CI(pszCodePage, "UTF-8") )
         return CPL_ENC_UTF8;
+    if( STARTS_WITH_CI(pszCodePage, "ANSI 1251") )
+        return "CP1251";
 
     // Try just using the CPG value directly.  Works for stuff like Big5.
     return pszCodePage;

From 301268d2142ba741de1814540d044a45f1f597f4 Mon Sep 17 00:00:00 2001
From: Even Rouault <even.rouault@spatialys.com>
Date: Fri, 2 Nov 2018 09:48:05 +0100
Subject: [PATCH 022/488] SIGDEM: avoid floating point division by zero. Fixes
 https://bugs.chromium.org/p/oss-fuzz/issues/detail?id=11220. Credit to OSS
 Fuzz

---
 gdal/frmts/sigdem/sigdemdataset.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/gdal/frmts/sigdem/sigdemdataset.cpp b/gdal/frmts/sigdem/sigdemdataset.cpp
index 0d8b4d769872..d188ac9323e6 100644
--- a/gdal/frmts/sigdem/sigdemdataset.cpp
+++ b/gdal/frmts/sigdem/sigdemdataset.cpp
@@ -520,14 +520,14 @@ CPLErr SIGDEMRasterBand::IReadBlock(
     const int32_t* pnSourceValues = pBlockBuffer;
     double* padfDestValues = static_cast<double*>(pImage);
     double dfOffset = this->dfOffsetZ;
-    double dfScaleFactor = this->dfScaleFactorZ;
+    const double dfInvScaleFactor = dfScaleFactorZ ? 1.0 / dfScaleFactorZ : 0.0;
     int nCellCount = this->nRasterXSize;
     for (int i = 0; i < nCellCount; i++) {
         int32_t nValue = CPL_MSBWORD32(*pnSourceValues);
         if (nValue == NO_DATA) {
             *padfDestValues = -9999;
         } else {
-            *padfDestValues = dfOffset + nValue / dfScaleFactor;
+            *padfDestValues = dfOffset + nValue * dfInvScaleFactor;
         }
 
         pnSourceValues++;

From 2ace03ec48c36dae8ba74089d85617c095643428 Mon Sep 17 00:00:00 2001
From: Even Rouault <even.rouault@spatialys.com>
Date: Fri, 2 Nov 2018 18:02:33 +0100
Subject: [PATCH 023/488] SDTS: avoid long processing time on corrupted
 dataset. Fixes https://bugs.chromium.org/p/oss-fuzz/issues/detail?id=11219.
 Credit to OSS Fuzz

---
 gdal/frmts/sdts/sdts_al.h        |  1 +
 gdal/frmts/sdts/sdtscatd.cpp     | 13 +++++++++++++
 gdal/frmts/sdts/sdtstransfer.cpp | 12 ++++++------
 3 files changed, 20 insertions(+), 6 deletions(-)

diff --git a/gdal/frmts/sdts/sdts_al.h b/gdal/frmts/sdts/sdts_al.h
index dbb621699d88..df0d8d03848f 100644
--- a/gdal/frmts/sdts/sdts_al.h
+++ b/gdal/frmts/sdts/sdts_al.h
@@ -149,6 +149,7 @@ class SDTS_CATD
     const char * GetEntryTypeDesc(int) const;
     const char * GetEntryFilePath(int) const;
     SDTSLayerType GetEntryType(int) const;
+    void          SetEntryTypeUnknown(int);
 };
 
 /************************************************************************/
diff --git a/gdal/frmts/sdts/sdtscatd.cpp b/gdal/frmts/sdts/sdtscatd.cpp
index 19c9a4578eb2..093814936e1b 100644
--- a/gdal/frmts/sdts/sdtscatd.cpp
+++ b/gdal/frmts/sdts/sdtscatd.cpp
@@ -302,6 +302,19 @@ SDTSLayerType SDTS_CATD::GetEntryType( int iEntry ) const
         return SLTUnknown;
 }
 
+/************************************************************************/
+/*                       SetEntryTypeUnknown()                          */
+/************************************************************************/
+
+void SDTS_CATD::SetEntryTypeUnknown(int iEntry)
+{
+    if( iEntry >= 0 && iEntry < nEntries )
+    {
+        CPLFree(papoEntries[iEntry]->pszType);
+        papoEntries[iEntry]->pszType = CPLStrdup("Unknown");
+    }
+}
+
 /************************************************************************/
 /*                          GetEntryFilePath()                          */
 /************************************************************************/
diff --git a/gdal/frmts/sdts/sdtstransfer.cpp b/gdal/frmts/sdts/sdtstransfer.cpp
index e176e954e237..606817e36655 100644
--- a/gdal/frmts/sdts/sdtstransfer.cpp
+++ b/gdal/frmts/sdts/sdtstransfer.cpp
@@ -238,7 +238,7 @@ SDTSLineReader *SDTSTransfer::GetLayerLineReader( int iEntry )
     if( !poLineReader->Open(
                         oCATD.GetEntryFilePath( panLayerCATDEntry[iEntry] ) ) )
     {
-        panLayerCATDEntry[iEntry] = SLTUnknown; // to prevent further attempt
+        oCATD.SetEntryTypeUnknown(iEntry) ; // to prevent further attempt
         delete poLineReader;
         return nullptr;
     }
@@ -265,7 +265,7 @@ SDTSPointReader *SDTSTransfer::GetLayerPointReader( int iEntry )
     if( !poPointReader->Open(
                         oCATD.GetEntryFilePath( panLayerCATDEntry[iEntry] ) ) )
     {
-        panLayerCATDEntry[iEntry] = SLTUnknown; // to prevent further attempt
+        oCATD.SetEntryTypeUnknown(iEntry) ; // to prevent further attempt
         delete poPointReader;
         return nullptr;
     }
@@ -292,7 +292,7 @@ SDTSPolygonReader *SDTSTransfer::GetLayerPolygonReader( int iEntry )
     if( !poPolyReader->Open(
                         oCATD.GetEntryFilePath( panLayerCATDEntry[iEntry] ) ) )
     {
-        panLayerCATDEntry[iEntry] = SLTUnknown; // to prevent further attempt
+        oCATD.SetEntryTypeUnknown(iEntry) ; // to prevent further attempt
         delete poPolyReader;
         return nullptr;
     }
@@ -319,7 +319,7 @@ SDTSAttrReader *SDTSTransfer::GetLayerAttrReader( int iEntry )
     if( !poAttrReader->Open(
                         oCATD.GetEntryFilePath( panLayerCATDEntry[iEntry] ) ) )
     {
-        panLayerCATDEntry[iEntry] = SLTUnknown; // to prevent further attempt
+        oCATD.SetEntryTypeUnknown(iEntry) ; // to prevent further attempt
         delete poAttrReader;
         return nullptr;
     }
@@ -361,7 +361,7 @@ SDTSRasterReader *SDTSTransfer::GetLayerRasterReader( int iEntry )
     if( !poRasterReader->Open( &oCATD, &oIREF,
                          oCATD.GetEntryModule(panLayerCATDEntry[iEntry] ) ) )
     {
-        panLayerCATDEntry[iEntry] = SLTUnknown; // to prevent further attempt
+        oCATD.SetEntryTypeUnknown(iEntry) ; // to prevent further attempt
         delete poRasterReader;
         return nullptr;
     }
@@ -386,7 +386,7 @@ DDFModule *SDTSTransfer::GetLayerModuleReader( int iEntry )
     if( !poModuleReader->Open(
                         oCATD.GetEntryFilePath( panLayerCATDEntry[iEntry] ) ) )
     {
-        panLayerCATDEntry[iEntry] = SLTUnknown; // to prevent further attempt
+        oCATD.SetEntryTypeUnknown(iEntry) ; // to prevent further attempt
         delete poModuleReader;
         return nullptr;
     }

From 3f206c1e3684ee1ba033e58791b37608f418b00c Mon Sep 17 00:00:00 2001
From: Even Rouault <even.rouault@spatialys.com>
Date: Fri, 2 Nov 2018 18:13:44 +0100
Subject: [PATCH 024/488] Fix warning

---
 gdal/frmts/sigdem/sigdemdataset.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/gdal/frmts/sigdem/sigdemdataset.cpp b/gdal/frmts/sigdem/sigdemdataset.cpp
index d188ac9323e6..5ffc6e6ec61b 100644
--- a/gdal/frmts/sigdem/sigdemdataset.cpp
+++ b/gdal/frmts/sigdem/sigdemdataset.cpp
@@ -520,7 +520,7 @@ CPLErr SIGDEMRasterBand::IReadBlock(
     const int32_t* pnSourceValues = pBlockBuffer;
     double* padfDestValues = static_cast<double*>(pImage);
     double dfOffset = this->dfOffsetZ;
-    const double dfInvScaleFactor = dfScaleFactorZ ? 1.0 / dfScaleFactorZ : 0.0;
+    const double dfInvScaleFactor = dfScaleFactorZ != 0.0 ? 1.0 / dfScaleFactorZ : 0.0;
     int nCellCount = this->nRasterXSize;
     for (int i = 0; i < nCellCount; i++) {
         int32_t nValue = CPL_MSBWORD32(*pnSourceValues);

From e5e7b313540f0ff913fadfe6a273fb7c356a22cb Mon Sep 17 00:00:00 2001
From: Even Rouault <even.rouault@spatialys.com>
Date: Fri, 2 Nov 2018 22:54:20 +0100
Subject: [PATCH 025/488] VRT: deal with serialized nodata value that is
 slightly outside Float32 validity range (fixes #1071)

---
 .../minfloat_nodata_slightly_out_of_float.vrt | 11 +++++
 autotest/gcore/vrt_read.py                    | 42 +++++++++++++++++++
 gdal/frmts/vrt/vrtrasterband.cpp              | 22 ++++++++++
 gdal/frmts/vrt/vrtsources.cpp                 | 26 ++++++++++--
 gdal/gcore/gdal_misc.cpp                      | 14 +++++++
 gdal/gcore/gdal_priv.h                        |  2 +
 6 files changed, 114 insertions(+), 3 deletions(-)
 create mode 100644 autotest/gcore/data/minfloat_nodata_slightly_out_of_float.vrt

diff --git a/autotest/gcore/data/minfloat_nodata_slightly_out_of_float.vrt b/autotest/gcore/data/minfloat_nodata_slightly_out_of_float.vrt
new file mode 100644
index 000000000000..d238f08bc7d8
--- /dev/null
+++ b/autotest/gcore/data/minfloat_nodata_slightly_out_of_float.vrt
@@ -0,0 +1,11 @@
+<VRTDataset rasterXSize="4" rasterYSize="1">
+  <VRTRasterBand dataType="Float32" band="1">
+    <NoDataValue>-3.402823466385289e+38</NoDataValue>
+    <ColorInterp>Gray</ColorInterp>
+    <ComplexSource>
+      <SourceFilename relativeToVRT="1">minfloat.tif</SourceFilename>
+      <SourceBand>1</SourceBand>
+      <NODATA>-3.402823466385289e+38</NODATA>
+    </ComplexSource>
+  </VRTRasterBand>
+</VRTDataset>
diff --git a/autotest/gcore/vrt_read.py b/autotest/gcore/vrt_read.py
index 476e6432dedc..495f342179d6 100755
--- a/autotest/gcore/vrt_read.py
+++ b/autotest/gcore/vrt_read.py
@@ -1385,6 +1385,47 @@ def vrt_read_31():
     return 'success'
 
 
+###############################################################################
+# Test reading a VRT where the NODATA & NoDataValue are slighly below the
+# minimum float value (https://github.com/OSGeo/gdal/issues/1071)
+
+def vrt_float32_with_nodata_slightly_below_float_min():
+
+    shutil.copyfile('data/minfloat.tif', 'tmp/minfloat.tif')
+    shutil.copyfile('data/minfloat_nodata_slightly_out_of_float.vrt',
+                    'tmp/minfloat_nodata_slightly_out_of_float.vrt')
+    gdal.Unlink('tmp/minfloat_nodata_slightly_out_of_float.vrt.aux.xml')
+
+    ds = gdal.Open('tmp/minfloat_nodata_slightly_out_of_float.vrt')
+    nodata = ds.GetRasterBand(1).GetNoDataValue()
+    stats = ds.GetRasterBand(1).ComputeStatistics(False)
+    ds = None
+
+    vrt_content = open('tmp/minfloat_nodata_slightly_out_of_float.vrt', 'rt').read()
+
+    gdal.Unlink('tmp/minfloat.tif')
+    gdal.Unlink('tmp/minfloat_nodata_slightly_out_of_float.vrt')
+
+    # Check that the values were 'normalized' when regenerating the VRT
+    if vrt_content.find('-3.402823466385289') >= 0:
+        gdaltest.post_reason('did not get expected nodata in rewritten VRT')
+        print(vrt_content)
+        return 'fail'
+
+    if nodata != -3.4028234663852886e+38:
+        gdaltest.post_reason('did not get expected nodata')
+        print("%.18g" % nodata)
+        return 'fail'
+
+    if stats != [-3.0, 5.0, 1.0, 4.0]:
+        gdaltest.post_reason('did not get expected stats')
+        print(stats)
+        return 'fail'
+
+    return 'success'
+
+
+
 for item in init_list:
     ut = gdaltest.GDALTest('VRT', item[0], item[1], item[2])
     if ut is None:
@@ -1423,6 +1464,7 @@ def vrt_read_31():
 gdaltest_list.append(vrt_read_29)
 gdaltest_list.append(vrt_read_30)
 gdaltest_list.append(vrt_read_31)
+gdaltest_list.append(vrt_float32_with_nodata_slightly_below_float_min)
 
 if __name__ == '__main__':
 
diff --git a/gdal/frmts/vrt/vrtrasterband.cpp b/gdal/frmts/vrt/vrtrasterband.cpp
index 826216481ba7..489a1ffba2d1 100644
--- a/gdal/frmts/vrt/vrtrasterband.cpp
+++ b/gdal/frmts/vrt/vrtrasterband.cpp
@@ -33,6 +33,7 @@
 #include <cstdlib>
 #include <cstring>
 #include <algorithm>
+#include <limits>
 #include <memory>
 #include <vector>
 
@@ -620,10 +621,26 @@ CPLXMLNode *VRTRasterBand::SerializeToXML( const char *pszVRTPath )
     if( m_bNoDataValueSet )
     {
         if (CPLIsNan(m_dfNoDataValue))
+        {
             CPLSetXMLValue( psTree, "NoDataValue", "nan");
+        }
+        else if( eDataType == GDT_Float32 &&
+                 m_dfNoDataValue == -std::numeric_limits<float>::max() )
+        {
+            // To avoid rounding out of the range of float
+            CPLSetXMLValue( psTree, "NoDataValue", "-3.4028234663852886e+38");
+        }
+        else if( eDataType == GDT_Float32 &&
+                 m_dfNoDataValue == std::numeric_limits<float>::max() )
+        {
+            // To avoid rounding out of the range of float
+            CPLSetXMLValue( psTree, "NoDataValue", "3.4028234663852886e+38");
+        }
         else
+        {
             CPLSetXMLValue( psTree, "NoDataValue",
                             CPLSPrintf( "%.16g", m_dfNoDataValue ) );
+        }
     }
 
     if( m_bHideNoDataValue )
@@ -775,6 +792,11 @@ CPLXMLNode *VRTRasterBand::SerializeToXML( const char *pszVRTPath )
 CPLErr VRTRasterBand::SetNoDataValue( double dfNewValue )
 
 {
+    if( eDataType == GDT_Float32 )
+    {
+        dfNewValue = GDALAdjustNoDataCloseToFloatMax(dfNewValue);
+    }
+
     m_bNoDataValueSet = TRUE;
     m_dfNoDataValue = dfNewValue;
 
diff --git a/gdal/frmts/vrt/vrtsources.cpp b/gdal/frmts/vrt/vrtsources.cpp
index 5475ec28a0c5..53dc86c46903 100644
--- a/gdal/frmts/vrt/vrtsources.cpp
+++ b/gdal/frmts/vrt/vrtsources.cpp
@@ -38,6 +38,7 @@
 #include <cstdlib>
 #include <cstring>
 #include <algorithm>
+#include <limits>
 #include <string>
 
 #include "cpl_conv.h"
@@ -2097,9 +2098,23 @@ CPLXMLNode *VRTComplexSource::SerializeToXML( const char *pszVRTPath )
     {
         if( CPLIsNan(m_dfNoDataValue) )
             CPLSetXMLValue( psSrc, "NODATA", "nan");
+        else if( m_poRasterBand->GetRasterDataType() == GDT_Float32 &&
+                 m_dfNoDataValue == -std::numeric_limits<float>::max() )
+        {
+            // To avoid rounding out of the range of float
+            CPLSetXMLValue( psSrc, "NODATA", "-3.4028234663852886e+38");
+        }
+        else if( m_poRasterBand->GetRasterDataType() == GDT_Float32 &&
+                 m_dfNoDataValue == std::numeric_limits<float>::max() )
+        {
+            // To avoid rounding out of the range of float
+            CPLSetXMLValue( psSrc, "NODATA", "3.4028234663852886e+38");
+        }
         else
+        {
             CPLSetXMLValue( psSrc, "NODATA",
                             CPLSPrintf("%.16g", m_dfNoDataValue) );
+        }
     }
 
     switch( m_eScalingType )
@@ -2235,6 +2250,10 @@ CPLErr VRTComplexSource::XMLInit( CPLXMLNode *psSrc, const char *pszVRTPath,
     {
         m_bNoDataSet = TRUE;
         m_dfNoDataValue = CPLAtofM( CPLGetXMLValue(psSrc, "NODATA", "0") );
+        if( m_poRasterBand->GetRasterDataType() == GDT_Float32 )
+        {
+            m_dfNoDataValue = GDALAdjustNoDataCloseToFloatMax(m_dfNoDataValue);
+        }
     }
 
     if( CPLGetXMLValue(psSrc, "LUT", nullptr) != nullptr )
@@ -2506,7 +2525,9 @@ CPLErr VRTComplexSource::RasterIOInternal( int nReqXOff, int nReqYOff,
     const bool bIsComplex = CPL_TO_BOOL( GDALDataTypeIsComplex(eBufType) );
     const int nWordSize = GDALGetDataTypeSizeBytes(eWrkDataType);
     const bool bNoDataSetIsNan = m_bNoDataSet && CPLIsNan(m_dfNoDataValue);
-    const bool bNoDataSetAndNotNan = m_bNoDataSet && !CPLIsNan(m_dfNoDataValue);
+    const bool bNoDataSetAndNotNan = m_bNoDataSet && !CPLIsNan(m_dfNoDataValue) &&
+                                GDALIsValueInRange<WorkingDT>(m_dfNoDataValue);
+    const auto fWorkingDataTypeNoData = static_cast<WorkingDT>(m_dfNoDataValue);
 
     WorkingDT *pafData = nullptr;
     if( m_eScalingType == VRT_SCALING_LINEAR &&
@@ -2588,8 +2609,7 @@ CPLErr VRTComplexSource::RasterIOInternal( int nReqXOff, int nReqYOff,
                 if( bNoDataSetIsNan && CPLIsNan(fResult) )
                     continue;
                 if( bNoDataSetAndNotNan &&
-                    GDALIsValueInRange<WorkingDT>(m_dfNoDataValue) &&
-                    ARE_REAL_EQUAL(fResult, static_cast<WorkingDT>(m_dfNoDataValue)) )
+                    ARE_REAL_EQUAL(fResult, fWorkingDataTypeNoData) )
                     continue;
 
                 if( m_nColorTableComponent )
diff --git a/gdal/gcore/gdal_misc.cpp b/gdal/gcore/gdal_misc.cpp
index 109d4d3b3207..602bf350bb75 100644
--- a/gdal/gcore/gdal_misc.cpp
+++ b/gdal/gcore/gdal_misc.cpp
@@ -4019,3 +4019,17 @@ int GDALCanFileAcceptSidecarFile(const char* pszFilename)
         return FALSE;
     return TRUE;
 }
+
+/************************************************************************/
+/*                    GDALAdjustNoDataCloseToFloatMax()                 */
+/************************************************************************/
+
+double GDALAdjustNoDataCloseToFloatMax(double dfVal)
+{
+    const auto kMaxFloat = std::numeric_limits<float>::max();
+    if( std::fabs(dfVal - -kMaxFloat) < 1e-10 * kMaxFloat )
+        return -kMaxFloat;
+    if( std::fabs(dfVal - kMaxFloat) < 1e-10 * kMaxFloat )
+        return kMaxFloat;
+    return dfVal;
+}
diff --git a/gdal/gcore/gdal_priv.h b/gdal/gcore/gdal_priv.h
index 1d54d58e305e..c22a1b6bd4ba 100644
--- a/gdal/gcore/gdal_priv.h
+++ b/gdal/gcore/gdal_priv.h
@@ -1819,6 +1819,8 @@ template<class T> inline bool ARE_REAL_EQUAL(T fVal1, T fVal2, int ulp = 2)
            std::abs(fVal1 - fVal2) < std::numeric_limits<float>::epsilon() * std::abs(fVal1+fVal2) * ulp;
 }
 
+double GDALAdjustNoDataCloseToFloatMax(double dfVal);
+
 #define DIV_ROUND_UP(a, b) ( ((a) % (b)) == 0 ? ((a) / (b)) : (((a) / (b)) + 1) )
 
 // Number of data samples that will be used to compute approximate statistics

From 22eb92683f1db950c59a7f2f703f9a007ea9244f Mon Sep 17 00:00:00 2001
From: Even Rouault <even.rouault@spatialys.com>
Date: Fri, 2 Nov 2018 22:54:59 +0100
Subject: [PATCH 026/488] GTiff and GDALRasterBand: use
 GDALAdjustNoDataCloseToFloatMax()

---
 gdal/frmts/gtiff/geotiff.cpp  | 11 +----------
 gdal/gcore/gdalrasterband.cpp | 15 +--------------
 2 files changed, 2 insertions(+), 24 deletions(-)

diff --git a/gdal/frmts/gtiff/geotiff.cpp b/gdal/frmts/gtiff/geotiff.cpp
index 11b2fd170565..50ed54dca595 100644
--- a/gdal/frmts/gtiff/geotiff.cpp
+++ b/gdal/frmts/gtiff/geotiff.cpp
@@ -13889,16 +13889,7 @@ CPLErr GTiffDataset::OpenOffset( TIFF *hTIFFIn,
         dfNoDataValue = CPLAtofM( pszText );
         if( nBitsPerSample == 32 && nSampleFormat == SAMPLEFORMAT_IEEEFP )
         {
-            if( fabs(dfNoDataValue - std::numeric_limits<float>::max()) <
-                         1e-10 * std::numeric_limits<float>::max() )
-            {
-                dfNoDataValue = std::numeric_limits<float>::max();
-            }
-            else if( fabs(dfNoDataValue - (-std::numeric_limits<float>::max())) <
-                            1e-10 * std::numeric_limits<float>::max() )
-            {
-                dfNoDataValue = -std::numeric_limits<float>::max();
-            }
+            dfNoDataValue = GDALAdjustNoDataCloseToFloatMax(dfNoDataValue);
         }
     }
 
diff --git a/gdal/gcore/gdalrasterband.cpp b/gdal/gcore/gdalrasterband.cpp
index 02303ad029df..ff0874bdf9b0 100644
--- a/gdal/gcore/gdalrasterband.cpp
+++ b/gdal/gcore/gdalrasterband.cpp
@@ -2860,26 +2860,13 @@ static inline void ComputeFloatNoDataValue( GDALDataType eDataType,
 {
     if( eDataType == GDT_Float32 && bGotNoDataValue )
     {
+        dfNoDataValue = GDALAdjustNoDataCloseToFloatMax(dfNoDataValue);
         if (GDALIsValueInRange<float>(dfNoDataValue) )
         {
             fNoDataValue = static_cast<float>(dfNoDataValue);
             bGotFloatNoDataValue = true;
             bGotNoDataValue = false;
         }
-        else if( fabs(dfNoDataValue - std::numeric_limits<float>::max()) <
-                         1e-10 * std::numeric_limits<float>::max() )
-        {
-            fNoDataValue = std::numeric_limits<float>::max();
-            bGotFloatNoDataValue = true;
-            bGotNoDataValue = false;
-        }
-        else if( fabs(dfNoDataValue - (-std::numeric_limits<float>::max())) <
-                         1e-10 * std::numeric_limits<float>::max() )
-        {
-            fNoDataValue = -std::numeric_limits<float>::max();
-            bGotFloatNoDataValue = true;
-            bGotNoDataValue = false;
-        }
     }
 }
 

From 22058ee3036cda03e00e0a6c73fb6802c46dab14 Mon Sep 17 00:00:00 2001
From: Even Rouault <even.rouault@spatialys.com>
Date: Sat, 3 Nov 2018 19:46:30 +0100
Subject: [PATCH 027/488] Internal libtiff: resync with upstream

---
 gdal/frmts/gtiff/libtiff/tif_config.h | 2 ++
 gdal/frmts/gtiff/libtiff/tif_dir.h    | 4 ++++
 gdal/frmts/gtiff/libtiff/tif_webp.c   | 5 +++--
 gdal/frmts/gtiff/libtiff/tiffio.h     | 2 +-
 gdal/frmts/gtiff/libtiff/tiffiop.h    | 1 +
 5 files changed, 11 insertions(+), 3 deletions(-)

diff --git a/gdal/frmts/gtiff/libtiff/tif_config.h b/gdal/frmts/gtiff/libtiff/tif_config.h
index 938d785e7bad..8f2cb37c0135 100644
--- a/gdal/frmts/gtiff/libtiff/tif_config.h
+++ b/gdal/frmts/gtiff/libtiff/tif_config.h
@@ -62,9 +62,11 @@
 #ifdef _WIN64
 #  define TIFF_SSIZE_T GIntBig
 #  define TIFF_SSIZE_FORMAT CPL_FRMT_GIB
+#  define TIFF_SIZE_FORMAT CPL_FRMT_GUIB
 #else
 #  define TIFF_SSIZE_T signed long
 #  define TIFF_SSIZE_FORMAT "%ld"
+#  define TIFF_SIZE_FORMAT "%lu"
 #endif
 
 /* Unsigned 16-bit type */
diff --git a/gdal/frmts/gtiff/libtiff/tif_dir.h b/gdal/frmts/gtiff/libtiff/tif_dir.h
index bb508addb401..b2f5e694883b 100644
--- a/gdal/frmts/gtiff/libtiff/tif_dir.h
+++ b/gdal/frmts/gtiff/libtiff/tif_dir.h
@@ -24,6 +24,10 @@
 
 #ifndef _TIFFDIR_
 #define	_TIFFDIR_
+
+#include "tiff.h"
+#include "tiffio.h"
+
 /*
  * ``Library-private'' Directory-related Definitions.
  */
diff --git a/gdal/frmts/gtiff/libtiff/tif_webp.c b/gdal/frmts/gtiff/libtiff/tif_webp.c
index 0753c00f709e..a002f481daa6 100644
--- a/gdal/frmts/gtiff/libtiff/tif_webp.c
+++ b/gdal/frmts/gtiff/libtiff/tif_webp.c
@@ -79,8 +79,8 @@ int TWebPDatasetWriter(const uint8_t* data, size_t data_size,
   
   if ( (tif->tif_rawcc + (tmsize_t)data_size) > tif->tif_rawdatasize ) {
     TIFFErrorExt(tif->tif_clientdata, module,
-                 "Buffer too small by %lu bytes.",
-                 tif->tif_rawcc + data_size - tif->tif_rawdatasize);
+                 "Buffer too small by " TIFF_SIZE_FORMAT " bytes.",
+                 (size_t) (tif->tif_rawcc + data_size - tif->tif_rawdatasize));
     return 0;
   } else {
     _TIFFmemcpy(tif->tif_rawcp, data, data_size);
@@ -594,6 +594,7 @@ TWebPVGetField(TIFF* tif, uint32 tag, va_list ap)
     break;
   case TIFFTAG_WEBP_LOSSLESS:
     *va_arg(ap, int*) = sp->lossless;
+    break;
   default:
     return (*sp->vgetparent)(tif, tag, ap);
   }
diff --git a/gdal/frmts/gtiff/libtiff/tiffio.h b/gdal/frmts/gtiff/libtiff/tiffio.h
index 670cd426c9cb..31c2e676e759 100644
--- a/gdal/frmts/gtiff/libtiff/tiffio.h
+++ b/gdal/frmts/gtiff/libtiff/tiffio.h
@@ -50,7 +50,7 @@ typedef struct tiff TIFF;
  *     promoted type (i.e. one of int, unsigned int, pointer,
  *     or double) and because we defined pseudo-tags that are
  *     outside the range of legal Aldus-assigned tags.
- * NB: tsize_t is int32 and not uint32 because some functions
+ * NB: tsize_t is signed and not unsigned because some functions
  *     return -1.
  * NB: toff_t is not off_t for many reasons; TIFFs max out at
  *     32-bit file offsets, and BigTIFF maxes out at 64-bit
diff --git a/gdal/frmts/gtiff/libtiff/tiffiop.h b/gdal/frmts/gtiff/libtiff/tiffiop.h
index 9e96d36e5cae..186c291f5d7a 100644
--- a/gdal/frmts/gtiff/libtiff/tiffiop.h
+++ b/gdal/frmts/gtiff/libtiff/tiffiop.h
@@ -70,6 +70,7 @@ extern int snprintf(char* str, size_t size, const char* format, ...);
 #endif
 
 #define    streq(a,b)      (strcmp(a,b) == 0)
+#define    strneq(a,b,n)   (strncmp(a,b,n) == 0)
 
 #ifndef TRUE
 #define	TRUE	1

From 01b286eda6e94da5f5b3fb14d16583ad282690e8 Mon Sep 17 00:00:00 2001
From: Even Rouault <even.rouault@spatialys.com>
Date: Sat, 3 Nov 2018 20:31:46 +0100
Subject: [PATCH 028/488] Fix warning on trusty_32bit

---
 gdal/frmts/gtiff/libtiff/tif_config.h | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/gdal/frmts/gtiff/libtiff/tif_config.h b/gdal/frmts/gtiff/libtiff/tif_config.h
index 8f2cb37c0135..b691b5bf36bb 100644
--- a/gdal/frmts/gtiff/libtiff/tif_config.h
+++ b/gdal/frmts/gtiff/libtiff/tif_config.h
@@ -66,7 +66,11 @@
 #else
 #  define TIFF_SSIZE_T signed long
 #  define TIFF_SSIZE_FORMAT "%ld"
-#  define TIFF_SIZE_FORMAT "%lu"
+#  if SIZEOF_VOIDP == 8
+#    define TIFF_SIZE_FORMAT "%lu"
+#  else
+#    define TIFF_SIZE_FORMAT "%u"
+#  endif
 #endif
 
 /* Unsigned 16-bit type */

From fd6cf3bad9192247dff77dbf055eb387a05c321e Mon Sep 17 00:00:00 2001
From: jratike80 <jukka.rahkonen@maanmittauslaitos.fi>
Date: Mon, 5 Nov 2018 11:54:16 +0200
Subject: [PATCH 029/488] Fix wrong doublequote charactes in OCI manual

---
 gdal/ogr/ogrsf_frmts/oci/drv_oci.html | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/gdal/ogr/ogrsf_frmts/oci/drv_oci.html b/gdal/ogr/ogrsf_frmts/oci/drv_oci.html
index 432e25fc95a9..27a903079152 100644
--- a/gdal/ogr/ogrsf_frmts/oci/drv_oci.html
+++ b/gdal/ogr/ogrsf_frmts/oci/drv_oci.html
@@ -102,11 +102,11 @@ <h3>Layer Creation Options</h3>
 
 <li> <b>OVERWRITE</b>: This may be "YES" to force an existing layer (=table) of the
 same desired name to be destroyed before creating the requested layer.
-The default value is “NO"<p>
+The default value is "NO"<p>
 
 <li> <b>TRUNCATE</b>: This may be "YES" to force the existing table to
 be reused, but to first truncate all records in the table, preserving
-indexes or dependencies. The default value is “NO".<p>
+indexes or dependencies. The default value is "NO".<p>
 
 <li> <b>LAUNDER</b>: This may be "YES" to force new fields created on this
 layer to have their field names "laundered" into a form more compatible with

From b6fd449f8a8f3ec96180eb81ded783e0e8309361 Mon Sep 17 00:00:00 2001
From: Even Rouault <even.rouault@spatialys.com>
Date: Mon, 5 Nov 2018 23:20:04 +0100
Subject: [PATCH 030/488] ESRIJson driver doc: mention orderByFields option for
 paged requests (fixes #1073) [ci skip]

---
 gdal/ogr/ogrsf_frmts/geojson/drv_esrijson.html | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/gdal/ogr/ogrsf_frmts/geojson/drv_esrijson.html b/gdal/ogr/ogrsf_frmts/geojson/drv_esrijson.html
index 0c46b69252d0..89ef82ef5050 100644
--- a/gdal/ogr/ogrsf_frmts/geojson/drv_esrijson.html
+++ b/gdal/ogr/ogrsf_frmts/geojson/drv_esrijson.html
@@ -21,6 +21,10 @@ <h1>ESRIJSON / FeatureService driver</h1>
 is subject to a server limit). If it is not set, OGR will set it to the maximum
 value allowed by the server.</p>
 
+<p>Note: for paged requests to work properly, it is generally necessary to add
+a sort clause on a field, typically the OBJECTID with a "&amp;orderByFields=OBJECTID+ASC"
+parameter in the URL, so that the server returns the results in a reliable way.</p>
+
 <h2>Datasource</h2>
 
 <p>The driver accepts three types of sources of data:</p>

From ac89f261c4031e692a82501e47f87f2d9578e198 Mon Sep 17 00:00:00 2001
From: drons <drons@list.ru>
Date: Tue, 6 Nov 2018 22:18:22 +0300
Subject: [PATCH 031/488] PRF: Fix Photomod x-dem files georeference

---
 gdal/frmts/prf/phprfdataset.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/gdal/frmts/prf/phprfdataset.cpp b/gdal/frmts/prf/phprfdataset.cpp
index a3c8e4d45f1c..656d47989e49 100644
--- a/gdal/frmts/prf/phprfdataset.cpp
+++ b/gdal/frmts/prf/phprfdataset.cpp
@@ -608,11 +608,11 @@ GDALDataset* PhPrfDataset::Open( GDALOpenInfo* poOpenInfo )
             abDemMetadataOk[2] && abDemMetadataOk[3] )
         {
             adfGeoTrans[0] = adfDemMetadata[0];
-            adfGeoTrans[1] = (adfDemMetadata[1] - adfDemMetadata[0])/nSizeX;
+            adfGeoTrans[1] = (adfDemMetadata[1] - adfDemMetadata[0])/(nSizeX - 1);
             adfGeoTrans[2] = 0;
             adfGeoTrans[3] = adfDemMetadata[3];
             adfGeoTrans[4] = 0;
-            adfGeoTrans[5] = (adfDemMetadata[2] - adfDemMetadata[3])/nSizeY;
+            adfGeoTrans[5] = (adfDemMetadata[2] - adfDemMetadata[3])/(nSizeY - 1);
 
             if( bDemShiftOk )
             {

From 71d76bef344fbf58e14e5817d80230acefc78e30 Mon Sep 17 00:00:00 2001
From: Even Rouault <even.rouault@spatialys.com>
Date: Wed, 7 Nov 2018 03:00:41 +0100
Subject: [PATCH 032/488] MRF: add static qualifier

---
 gdal/frmts/mrf/JPEG_band.cpp     | 4 ++--
 gdal/frmts/mrf/marfa_dataset.cpp | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/gdal/frmts/mrf/JPEG_band.cpp b/gdal/frmts/mrf/JPEG_band.cpp
index 03b6b053aaf6..7f65dda97840 100644
--- a/gdal/frmts/mrf/JPEG_band.cpp
+++ b/gdal/frmts/mrf/JPEG_band.cpp
@@ -164,7 +164,7 @@ static boolean empty_output_buffer(j_compress_ptr /*cinfo*/) {
 }
 
 // Returns the number of zero pixels in the page, as well as clearing those bits in the mask
-template<typename T> int update_mask(BitMask &mask, T *src, int nc) {
+template<typename T> static int update_mask(BitMask &mask, T *src, int nc) {
     int zeros = 0;
     int h = mask.getHeight();
     int w = mask.getWidth();
@@ -379,7 +379,7 @@ static void ProgressMonitor(j_common_ptr cinfo)
 }
 
 // Returns the number of zero pixels, as well as clearing those bits int the mask
-template<typename T> void apply_mask(MRFJPEGStruct &sJ, T *s, int nc) {
+template<typename T> static void apply_mask(MRFJPEGStruct &sJ, T *s, int nc) {
     if (NO_MASK == sJ.mask_state)
         return;
 
diff --git a/gdal/frmts/mrf/marfa_dataset.cpp b/gdal/frmts/mrf/marfa_dataset.cpp
index 234d7092fe64..72f86b923b13 100644
--- a/gdal/frmts/mrf/marfa_dataset.cpp
+++ b/gdal/frmts/mrf/marfa_dataset.cpp
@@ -1676,7 +1676,7 @@ GDALDataset *GDALMRFDataset::CreateCopy(const char *pszFilename,
 
 // Prepares the data so it is suitable for Zen JPEG encoding, based on input mask
 // If bFBO is set, only the values of the first band are set non-zero when needed
-template<typename T> void ZenFilter(T* buffer, GByte *mask, int nPixels, int nBands, bool bFBO) {
+template<typename T> static void ZenFilter(T* buffer, GByte *mask, int nPixels, int nBands, bool bFBO) {
     for (int i = 0; i < nPixels; i++) {
         if (mask[i] == 0) { // enforce zero values
             for (int b = 0; b < nBands; b++)

From 6ec3bfea7e6d0311e4ddfd7ad1a00b4c6fea471d Mon Sep 17 00:00:00 2001
From: Even Rouault <even.rouault@spatialys.com>
Date: Wed, 7 Nov 2018 03:12:02 +0100
Subject: [PATCH 033/488] Fix linking with ICC

---
 gdal/port/cpl_safemaths.hpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/gdal/port/cpl_safemaths.hpp b/gdal/port/cpl_safemaths.hpp
index 27391c81ce74..3bc8f063a2f9 100644
--- a/gdal/port/cpl_safemaths.hpp
+++ b/gdal/port/cpl_safemaths.hpp
@@ -37,7 +37,7 @@
 #define __has_builtin(x) 0
 #endif
 
-#if __GNUC__ >= 5 || __has_builtin(__builtin_sadd_overflow)
+#if (__GNUC__ >= 5 && !defined( __INTEL_COMPILER)) || __has_builtin(__builtin_sadd_overflow)
 #  define BUILTIN_OVERFLOW_CHECK_AVAILABLE
 
 #elif defined(_MSC_VER)

From 64b8571e6604ecfd9ea94489057b9d37e7addf28 Mon Sep 17 00:00:00 2001
From: Even Rouault <even.rouault@spatialys.com>
Date: Thu, 8 Nov 2018 10:05:05 +0100
Subject: [PATCH 034/488] GDALNoDataMaskBand: improve performance in
 downsampling cases

---
 autotest/gcore/nodatamaskband.py  | 127 ++++++++++++
 gdal/gcore/gdalnodatamaskband.cpp | 334 ++++++++++++++++++------------
 2 files changed, 328 insertions(+), 133 deletions(-)
 create mode 100755 autotest/gcore/nodatamaskband.py

diff --git a/autotest/gcore/nodatamaskband.py b/autotest/gcore/nodatamaskband.py
new file mode 100755
index 000000000000..6a26923eccb4
--- /dev/null
+++ b/autotest/gcore/nodatamaskband.py
@@ -0,0 +1,127 @@
+#!/usr/bin/env python
+# -*- coding: utf-8 -*-
+###############################################################################
+# $Id$
+#
+# Project:  GDAL/OGR Test Suite
+# Purpose:  Test GDALNoDataMaskBand
+# Author:   Even Rouault <even.rouault at spatialys.com>
+#
+###############################################################################
+# Copyright (c) 2018, Even Rouault <even.rouault at spatialys.com>
+#
+# Permission is hereby granted, free of charge, to any person obtaining a
+# copy of this software and associated documentation files (the "Software"),
+# to deal in the Software without restriction, including without limitation
+# the rights to use, copy, modify, merge, publish, distribute, sublicense,
+# and/or sell copies of the Software, and to permit persons to whom the
+# Software is furnished to do so, subject to the following conditions:
+#
+# The above copyright notice and this permission notice shall be included
+# in all copies or substantial portions of the Software.
+#
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+# OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
+# THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+# FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
+# DEALINGS IN THE SOFTWARE.
+###############################################################################
+
+import struct
+import sys
+
+sys.path.append('../pymod')
+
+import gdaltest
+from osgeo import gdal
+
+
+def nodatamaskband_1():
+
+    for (dt, struct_type, v) in [(gdal.GDT_Byte, 'B', 255),
+                                 (gdal.GDT_Int16, 'h', 32767),
+                                 (gdal.GDT_UInt16, 'H', 65535),
+                                 (gdal.GDT_Int32, 'i', 0x7FFFFFFF),
+                                 (gdal.GDT_UInt32, 'I', 0xFFFFFFFF),
+                                 (gdal.GDT_Float32, 'f', 1.25),
+                                 (gdal.GDT_Float32, 'f', float('nan')),
+                                 (gdal.GDT_Float64, 'd', 1.2345678),
+                                 (gdal.GDT_Float64, 'd', float('nan'))]:
+
+        ds = gdal.GetDriverByName('MEM').Create('', 6, 4, 1, dt)
+        ds.GetRasterBand(1).SetNoDataValue(v)
+        ds.GetRasterBand(1).WriteRaster(0, 0, 6, 4,
+                                        struct.pack(struct_type * 6 * 4,
+                                                    v, 1, 1, v, v, 0,
+                                                    v, 1, 1, v, v, 0,
+                                                    v, 1, 1, v, v, 0,
+                                                    0, v, v, 0, 0, 0))
+
+        data = ds.GetRasterBand(1).GetMaskBand().ReadRaster()
+        data_ar = struct.unpack('B' * 6 * 4, data)
+        expected_ar = (0, 255, 255, 0, 0, 255,
+                       0, 255, 255, 0, 0, 255,
+                       0, 255, 255, 0, 0, 255,
+                       255, 0, 0, 255, 255, 255)
+        if data_ar != expected_ar:
+            gdaltest.post_reason('fail')
+            print(dt)
+            print(data_ar)
+            return 'fail'
+
+        data = ds.GetRasterBand(1).GetMaskBand().ReadBlock(0, 0)
+        data_ar = struct.unpack('B' * 6 * 1, data)
+        expected_ar = (0, 255, 255, 0, 0, 255)
+        if data_ar != expected_ar:
+            gdaltest.post_reason('fail')
+            print(dt)
+            print(data_ar)
+            return 'fail'
+
+        data = ds.GetRasterBand(1).GetMaskBand().ReadBlock(0, 3)
+        data_ar = struct.unpack('B' * 6 * 1, data)
+        expected_ar = (255, 0, 0, 255, 255, 255)
+        if data_ar != expected_ar:
+            gdaltest.post_reason('fail')
+            print(dt)
+            print(data_ar)
+            return 'fail'
+
+        data = ds.GetRasterBand(1).GetMaskBand().ReadRaster(
+            buf_xsize=3, buf_ysize=2)
+        data_ar = struct.unpack('B' * 3 * 2, data)
+        expected_ar = (255, 0, 255,
+                       0, 255, 255)
+        if data_ar != expected_ar:
+            gdaltest.post_reason('fail')
+            print(dt)
+            print(data_ar)
+            return 'fail'
+
+        data = ds.GetRasterBand(1).GetMaskBand().ReadRaster(
+            buf_type=gdal.GDT_UInt16, buf_xsize=3, buf_ysize=2)
+        data_ar = struct.unpack('H' * 3 * 2, data)
+        expected_ar = (255, 0, 255,
+                       0, 255, 255)
+        if data_ar != expected_ar:
+            gdaltest.post_reason('fail')
+            print(dt)
+            print(data_ar)
+            return 'fail'
+
+    return 'success'
+
+
+gdaltest_list = [
+    nodatamaskband_1,
+]
+
+if __name__ == '__main__':
+
+    gdaltest.setup_run('nodatamaskband')
+
+    gdaltest.run_tests(gdaltest_list)
+
+    sys.exit(gdaltest.summarize())
diff --git a/gdal/gcore/gdalnodatamaskband.cpp b/gdal/gcore/gdalnodatamaskband.cpp
index b97cf8a5119f..10a87cab048a 100644
--- a/gdal/gcore/gdalnodatamaskband.cpp
+++ b/gdal/gcore/gdalnodatamaskband.cpp
@@ -31,6 +31,7 @@
 #include "cpl_port.h"
 #include "gdal_priv.h"
 
+#include <algorithm>
 #include <cstring>
 
 #include "cpl_conv.h"
@@ -160,132 +161,21 @@ CPLErr GDALNoDataMaskBand::IReadBlock( int nXBlockOff, int nYBlockOff,
                                        void * pImage )
 
 {
-    GDALDataType eWrkDT = GetWorkDataType( poParent->GetRasterDataType() );
+    const int nXOff = nXBlockOff * nBlockXSize;
+    const int nXSizeRequest = std::min(nBlockXSize, nRasterXSize - nXOff);
+    const int nYOff = nYBlockOff * nBlockYSize;
+    const int nYSizeRequest = std::min(nBlockYSize, nRasterYSize - nYOff);
 
-/* -------------------------------------------------------------------- */
-/*      Read the image data.                                            */
-/* -------------------------------------------------------------------- */
-    // TODO(schwehr): pabySrc would probably be better as a void ptr.
-    GByte *pabySrc = static_cast<GByte *>(
-        VSI_MALLOC3_VERBOSE( GDALGetDataTypeSizeBytes(eWrkDT),
-                             nBlockXSize, nBlockYSize ) );
-    if (pabySrc == nullptr)
-    {
-        return CE_Failure;
-    }
-
-    int nXSizeRequest = nBlockXSize;
-    if (nXBlockOff * nBlockXSize + nBlockXSize > nRasterXSize)
-        nXSizeRequest = nRasterXSize - nXBlockOff * nBlockXSize;
-    int nYSizeRequest = nBlockYSize;
-    if (nYBlockOff * nBlockYSize + nBlockYSize > nRasterYSize)
-        nYSizeRequest = nRasterYSize - nYBlockOff * nBlockYSize;
-
-    if (nXSizeRequest != nBlockXSize || nYSizeRequest != nBlockYSize)
-    {
-        // memset the whole buffer to avoid Valgrind warnings in case RasterIO
-        // fetches a partial block.
-        memset( pabySrc, 0,
-                GDALGetDataTypeSizeBytes(eWrkDT) * nBlockXSize * nBlockYSize );
-    }
-
-    CPLErr eErr =
-        poParent->RasterIO( GF_Read,
-                            nXBlockOff * nBlockXSize,
-                            nYBlockOff * nBlockYSize,
-                            nXSizeRequest, nYSizeRequest,
-                            pabySrc, nXSizeRequest, nYSizeRequest,
-                            eWrkDT, 0,
-                            nBlockXSize * GDALGetDataTypeSizeBytes(eWrkDT),
-                            nullptr );
-    if( eErr != CE_None )
+    if( nBlockXSize != nXSizeRequest || nBlockYSize != nYSizeRequest )
     {
-        CPLFree(pabySrc);
-        return eErr;
+        memset(pImage, 0, nBlockXSize * nBlockYSize);
     }
 
-    const bool bIsNoDataNan = CPLIsNan(dfNoDataValue) != 0;
-
-/* -------------------------------------------------------------------- */
-/*      Process different cases.                                        */
-/* -------------------------------------------------------------------- */
-    switch( eWrkDT )
-    {
-      case GDT_Byte:
-      {
-        GByte byNoData = static_cast<GByte>( dfNoDataValue );
-
-        for( int i = 0; i < nBlockXSize * nBlockYSize; i++ )
-        {
-            static_cast<GByte *>(pImage)[i] = pabySrc[i] == byNoData ? 0: 255;
-        }
-      }
-      break;
-
-      case GDT_UInt32:
-      {
-        GUInt32 nNoData = static_cast<GUInt32>( dfNoDataValue );
-
-        for( int i = 0; i < nBlockXSize * nBlockYSize; i++ )
-        {
-            static_cast<GByte *>(pImage)[i] =
-                reinterpret_cast<GUInt32 *>(pabySrc)[i] == nNoData ? 0 : 255;
-        }
-      }
-      break;
-
-      case GDT_Int32:
-      {
-        GInt32 nNoData = static_cast<GInt32>( dfNoDataValue );
-
-        for( int i = 0; i < nBlockXSize * nBlockYSize; i++ )
-        {
-            static_cast<GByte *>(pImage)[i] =
-                reinterpret_cast<GInt32 *>(pabySrc)[i] == nNoData ? 0 : 255;
-        }
-      }
-      break;
-
-      case GDT_Float32:
-      {
-        float fNoData = static_cast<float>( dfNoDataValue );
-
-        for( int i = 0; i < nBlockXSize * nBlockYSize; i++ )
-        {
-            const float fVal = reinterpret_cast<float *>(pabySrc)[i];
-            if( bIsNoDataNan && CPLIsNan(fVal))
-                static_cast<GByte *>(pImage)[i] = 0;
-            else if( ARE_REAL_EQUAL(fVal, fNoData) )
-                static_cast<GByte *>(pImage)[i] = 0;
-            else
-                static_cast<GByte *>(pImage)[i] = 255;
-        }
-      }
-      break;
-
-      case GDT_Float64:
-      {
-          for( int i = 0; i < nBlockXSize * nBlockYSize; i++ )
-          {
-              const double dfVal = reinterpret_cast<double *>(pabySrc)[i];
-              if( bIsNoDataNan && CPLIsNan(dfVal))
-                  static_cast<GByte *>(pImage)[i] = 0;
-              else if( ARE_REAL_EQUAL(dfVal, dfNoDataValue) )
-                  static_cast<GByte *>(pImage)[i] = 0;
-              else
-                  static_cast<GByte *>(pImage)[i] = 255;
-          }
-      }
-      break;
-
-      default:
-        CPLAssert( false );
-        break;
-    }
-
-    CPLFree( pabySrc );
-
-    return CE_None;
+    GDALRasterIOExtraArg sExtraArg;
+    INIT_RASTERIO_EXTRA_ARG(sExtraArg);
+    return IRasterIO(GF_Read, nXOff, nYOff, nXSizeRequest, nYSizeRequest,
+                     pImage, nXSizeRequest, nYSizeRequest,
+                     GDT_Byte, 1, nBlockXSize, &sExtraArg);
 }
 
 /************************************************************************/
@@ -301,13 +191,17 @@ CPLErr GDALNoDataMaskBand::IRasterIO( GDALRWFlag eRWFlag,
                                       GSpacing nPixelSpace, GSpacing nLineSpace,
                                       GDALRasterIOExtraArg* psExtraArg )
 {
+    if( eRWFlag != GF_Read )
+    {
+        return CE_Failure;
+    }
+
+    const GDALDataType eWrkDT = GetWorkDataType( poParent->GetRasterDataType() );
+
     // Optimization in common use case (#4488).
     // This avoids triggering the block cache on this band, which helps
     // reducing the global block cache consumption.
-    if (eRWFlag == GF_Read && eBufType == GDT_Byte &&
-        poParent->GetRasterDataType() == GDT_Byte &&
-        nXSize == nBufXSize && nYSize == nBufYSize &&
-        nPixelSpace == 1 && nLineSpace == nBufXSize)
+    if (eBufType == GDT_Byte && eWrkDT == GDT_Byte)
     {
         const CPLErr eErr =
             poParent->RasterIO( GF_Read, nXOff, nYOff, nXSize, nYSize,
@@ -318,18 +212,192 @@ CPLErr GDALNoDataMaskBand::IRasterIO( GDALRWFlag eRWFlag,
             return eErr;
 
         GByte* pabyData = static_cast<GByte*>( pData );
-        GByte byNoData = static_cast<GByte>( dfNoDataValue );
+        const GByte byNoData = static_cast<GByte>( dfNoDataValue );
 
-        for( int i = nBufXSize * nBufYSize - 1; i >= 0; --i )
+        if( nPixelSpace == 1 && nLineSpace == nBufXSize )
+        {
+            const size_t nBufSize = static_cast<size_t>(nBufXSize) * nBufYSize;
+            for( size_t i = 0; i < nBufSize; ++i )
+            {
+                pabyData[i] = pabyData[i] == byNoData ? 0 : 255;
+            }
+        }
+        else
         {
-            pabyData[i] = pabyData[i] == byNoData ? 0 : 255;
+            for( int iY = 0; iY < nBufYSize; iY++ )
+            {
+                GByte* pabyLine = pabyData + iY * nLineSpace;
+                for( int iX = 0; iX < nBufXSize; iX++ )
+                {
+                    *pabyLine = *pabyLine == byNoData ? 0 : 255;
+                    pabyLine += nPixelSpace;
+                }
+            }
         }
         return CE_None;
     }
 
-    return GDALRasterBand::IRasterIO( eRWFlag, nXOff, nYOff, nXSize, nYSize,
-                                      pData, nBufXSize, nBufYSize,
-                                      eBufType,
-                                      nPixelSpace, nLineSpace, psExtraArg );
+    if( eBufType == GDT_Byte )
+    {
+        const int nWrkDTSize = GDALGetDataTypeSizeBytes(eWrkDT);
+        void *pTemp =
+            VSI_MALLOC3_VERBOSE( nWrkDTSize, nBufXSize, nBufYSize );
+        if (pTemp == nullptr)
+        {
+            return GDALRasterBand::IRasterIO(
+                                      eRWFlag, nXOff, nYOff, nXSize, nYSize,
+                                      pTemp, nBufXSize, nBufYSize,
+                                      eWrkDT,
+                                      nWrkDTSize, nBufXSize * nWrkDTSize,
+                                      psExtraArg );
+        }
+
+        const CPLErr eErr =
+            poParent->RasterIO( GF_Read, nXOff, nYOff, nXSize, nYSize,
+                                pTemp, nBufXSize, nBufYSize,
+                                eWrkDT,
+                                nWrkDTSize, nBufXSize * nWrkDTSize, psExtraArg );
+        if (eErr != CE_None)
+        {
+            VSIFree(pTemp);
+            return eErr;
+        }
+
+        const bool bIsNoDataNan = CPLIsNan(dfNoDataValue) != 0;
+        GByte* pabyDest = static_cast<GByte*>(pData);
+
+/* -------------------------------------------------------------------- */
+/*      Process different cases.                                        */
+/* -------------------------------------------------------------------- */
+        switch( eWrkDT )
+        {
+            case GDT_UInt32:
+            {
+                const GUInt32 nNoData = static_cast<GUInt32>( dfNoDataValue );
+                const GUInt32* panSrc = static_cast<const GUInt32 *>(pTemp);
+
+                size_t i = 0;
+                for( int iY = 0; iY < nBufYSize; iY++ )
+                {
+                    GByte* pabyLineDest = pabyDest + iY * nLineSpace;
+                    for( int iX = 0; iX < nBufXSize; iX++ )
+                    {
+                        *pabyLineDest = panSrc[i] == nNoData ? 0 : 255;
+                        ++i;
+                        pabyLineDest += nPixelSpace;
+                    }
+                }
+            }
+            break;
+
+            case GDT_Int32:
+            {
+                const GInt32 nNoData = static_cast<GInt32>( dfNoDataValue );
+                const GInt32* panSrc = static_cast<const GInt32 *>(pTemp);
+
+                size_t i = 0;
+                for( int iY = 0; iY < nBufYSize; iY++ )
+                {
+                    GByte* pabyLineDest = pabyDest + iY * nLineSpace;
+                    for( int iX = 0; iX < nBufXSize; iX++ )
+                    {
+                        *pabyLineDest = panSrc[i] == nNoData ? 0 : 255;
+                        ++i;
+                        pabyLineDest += nPixelSpace;
+                    }
+                }
+            }
+            break;
+
+            case GDT_Float32:
+            {
+                const float fNoData = static_cast<float>( dfNoDataValue );
+                const float* pafSrc = static_cast<const float *>(pTemp);
+
+                size_t i = 0;
+                for( int iY = 0; iY < nBufYSize; iY++ )
+                {
+                    GByte* pabyLineDest = pabyDest + iY * nLineSpace;
+                    for( int iX = 0; iX < nBufXSize; iX++ )
+                    {
+                        const float fVal = pafSrc[i];
+                        if( bIsNoDataNan && CPLIsNan(fVal))
+                            *pabyLineDest = 0;
+                        else if( ARE_REAL_EQUAL(fVal, fNoData) )
+                            *pabyLineDest = 0;
+                        else
+                            *pabyLineDest = 255;
+                        ++i;
+                        pabyLineDest += nPixelSpace;
+                    }
+                }
+            }
+            break;
+
+            case GDT_Float64:
+            {
+                const double* padfSrc = static_cast<const double *>(pTemp);
+
+                size_t i = 0;
+                for( int iY = 0; iY < nBufYSize; iY++ )
+                {
+                    GByte* pabyLineDest = pabyDest + iY * nLineSpace;
+                    for( int iX = 0; iX < nBufXSize; iX++ )
+                    {
+                        const double dfVal = padfSrc[i];
+                        if( bIsNoDataNan && CPLIsNan(dfVal))
+                            *pabyLineDest = 0;
+                        else if( ARE_REAL_EQUAL(dfVal, dfNoDataValue) )
+                            *pabyLineDest = 0;
+                        else
+                            *pabyLineDest = 255;
+                        ++i;
+                        pabyLineDest += nPixelSpace;
+                    }
+                }
+            }
+            break;
+
+            default:
+                CPLAssert( false );
+                break;
+        }
+
+        VSIFree(pTemp);
+        return CE_None;
+    }
+
+    // Output buffer is non-Byte. Ask for Byte and expand to user requested
+    // type
+    GByte* pabyBuf = static_cast<GByte*>(
+        VSI_MALLOC2_VERBOSE( nBufXSize, nBufYSize ));
+    if( pabyBuf == nullptr )
+    {
+        return GDALRasterBand::IRasterIO( eRWFlag, nXOff, nYOff, nXSize, nYSize,
+                                        pData, nBufXSize, nBufYSize,
+                                        eBufType,
+                                        nPixelSpace, nLineSpace, psExtraArg );
+    }
+    const CPLErr eErr = IRasterIO( eRWFlag, nXOff, nYOff, nXSize, nYSize,
+                                   pabyBuf, nBufXSize, nBufYSize,
+                                   GDT_Byte,
+                                   1, nBufXSize, psExtraArg );
+    if( eErr != CE_None )
+    {
+        VSIFree(pabyBuf);
+        return eErr;
+    }
+
+    for( int iY = 0; iY < nBufYSize; iY++ )
+    {
+        GDALCopyWords( pabyBuf + static_cast<size_t>(iY) * nBufXSize,
+                       GDT_Byte, 1,
+                       static_cast<GByte*>(pData) +
+                            iY * nLineSpace, eBufType,
+                       static_cast<int>(nPixelSpace),
+                       nBufXSize );
+    }
+    VSIFree(pabyBuf);
+    return CE_None;
 }
 //! @endcond

From beade9d55838ac41f7a798dceb5fce56213a0336 Mon Sep 17 00:00:00 2001
From: Even Rouault <even.rouault@spatialys.com>
Date: Thu, 8 Nov 2018 11:23:07 +0100
Subject: [PATCH 035/488] /vsicurl/ and derived: implement a LRU cache for file
 properties (instead of ever growing cache)

---
 gdal/port/cpl_vsil_az.cpp       |  12 +-
 gdal/port/cpl_vsil_curl.cpp     | 316 +++++++++++++++-----------------
 gdal/port/cpl_vsil_curl_class.h |  36 ++--
 gdal/port/cpl_vsil_s3.cpp       |  39 ++--
 gdal/port/cpl_vsil_swift.cpp    |  30 +--
 gdal/port/cpl_vsil_webhdfs.cpp  |  58 +++---
 6 files changed, 235 insertions(+), 256 deletions(-)

diff --git a/gdal/port/cpl_vsil_az.cpp b/gdal/port/cpl_vsil_az.cpp
index a2121ba0c5aa..4ca7e9bd8f16 100644
--- a/gdal/port/cpl_vsil_az.cpp
+++ b/gdal/port/cpl_vsil_az.cpp
@@ -83,7 +83,7 @@ void VSICurlFilesystemHandler::AnalyseAzureFileList(
         return;
     CPLXMLNode* psEnumerationResults = CPLGetXMLNode(psTree, "=EnumerationResults");
 
-    std::vector< std::pair<CPLString, CachedFileProp> > aoProps;
+    std::vector< std::pair<CPLString, FileProp> > aoProps;
     // Count the number of occurrences of a path. Can be 1 or 2. 2 in the case
     // that both a filename and directory exist
     std::map<CPLString, int> aoNameCount;
@@ -115,7 +115,7 @@ void VSICurlFilesystemHandler::AnalyseAzureFileList(
                 {
                     bNonEmpty = true;
 
-                    CachedFileProp prop;
+                    FileProp prop;
                     prop.eExists = EXIST_YES;
                     prop.bHasComputedFileSize = true;
                     prop.fileSize = static_cast<GUIntBig>(
@@ -148,7 +148,7 @@ void VSICurlFilesystemHandler::AnalyseAzureFileList(
                     }
 
                     aoProps.push_back(
-                        std::pair<CPLString, CachedFileProp>
+                        std::pair<CPLString, FileProp>
                             (pszKey + osPrefix.size(), prop));
                     aoNameCount[pszKey + osPrefix.size()] ++;
                 }
@@ -166,7 +166,7 @@ void VSICurlFilesystemHandler::AnalyseAzureFileList(
                         osKey.resize(osKey.size()-1);
                     if( osKey.size() > osPrefix.size() )
                     {
-                        CachedFileProp prop;
+                        FileProp prop;
                         prop.eExists = EXIST_YES;
                         prop.bIsDirectory = true;
                         prop.bHasComputedFileSize = true;
@@ -174,7 +174,7 @@ void VSICurlFilesystemHandler::AnalyseAzureFileList(
                         prop.mTime = 0;
 
                         aoProps.push_back(
-                            std::pair<CPLString, CachedFileProp>
+                            std::pair<CPLString, FileProp>
                                 (osKey.c_str() + osPrefix.size(), prop));
                         aoNameCount[osKey.c_str() + osPrefix.size()] ++;
                     }
@@ -211,7 +211,7 @@ void VSICurlFilesystemHandler::AnalyseAzureFileList(
 #if DEBUG_VERBOSE
                 CPLDebug("AZURE", "Cache %s", osCachedFilename.c_str());
 #endif
-                *GetCachedFileProp(osCachedFilename) = aoProps[i].second;
+                SetCachedFileProp(osCachedFilename, aoProps[i].second);
             }
             osFileList.AddString( (aoProps[i].first + osSuffix).c_str() );
         }
diff --git a/gdal/port/cpl_vsil_curl.cpp b/gdal/port/cpl_vsil_curl.cpp
index a1d7fdb3d330..e4af0455e10d 100644
--- a/gdal/port/cpl_vsil_curl.cpp
+++ b/gdal/port/cpl_vsil_curl.cpp
@@ -325,12 +325,7 @@ VSICurlHandle::VSICurlHandle( VSICurlFilesystemHandler* poFSIn,
     }
 
     m_bCached = poFSIn->AllowCachedDataFor(pszFilename);
-    CachedFileProp* cachedFileProp = poFS->GetCachedFileProp(m_pszURL);
-    eExists = cachedFileProp->eExists;
-    fileSize = cachedFileProp->fileSize;
-    bHasComputedFileSize = cachedFileProp->bHasComputedFileSize;
-    bIsDirectory = cachedFileProp->bIsDirectory;
-    mTime = cachedFileProp->mTime;
+    poFS->GetCachedFileProp(m_pszURL, oFileProp);
 }
 
 /************************************************************************/
@@ -710,10 +705,10 @@ void VSICURLResetHeaderAndWriterFunctions(CURL* hCurlHandle)
 
 vsi_l_offset VSICurlHandle::GetFileSize( bool bSetError )
 {
-    if( bHasComputedFileSize )
-        return fileSize;
+    if( oFileProp.bHasComputedFileSize )
+        return oFileProp.fileSize;
 
-    bHasComputedFileSize = true;
+    oFileProp.bHasComputedFileSize = true;
 
     CURLM* hCurlMultiHandle = poFS->GetCurlMultiHandleFor(m_pszURL);
 
@@ -800,7 +795,7 @@ vsi_l_offset VSICurlHandle::GetFileSize( bool bSetError )
 
     curl_slist_free_all(headers);
 
-    eExists = EXIST_UNKNOWN;
+    oFileProp.eExists = EXIST_UNKNOWN;
 
     long mtime = 0;
     curl_easy_getinfo(hCurlHandle, CURLINFO_FILETIME, &mtime);
@@ -814,19 +809,19 @@ vsi_l_offset VSICurlHandle::GetFileSize( bool bSetError )
             if( pszContentLength )
             {
                 pszContentLength += strlen("Content-Length: ");
-                eExists = EXIST_YES;
-                fileSize = CPLScanUIntBig(
+                oFileProp.eExists = EXIST_YES;
+                oFileProp.fileSize = CPLScanUIntBig(
                     pszContentLength,
                     static_cast<int>(strlen(pszContentLength)));
                 if( ENABLE_DEBUG )
                     CPLDebug("VSICURL", "GetFileSize(%s)=" CPL_FRMT_GUIB,
-                            osURL.c_str(), fileSize);
+                            osURL.c_str(), oFileProp.fileSize);
             }
         }
     }
 
     double dfSize = 0;
-    if( eExists != EXIST_YES )
+    if( oFileProp.eExists != EXIST_YES )
     {
         long response_code = 0;
         curl_easy_getinfo(hCurlHandle, CURLINFO_HTTP_CODE, &response_code);
@@ -894,14 +889,10 @@ vsi_l_offset VSICurlHandle::GetFileSize( bool bSetError )
                          nValidity);
                 // As our local clock might not be in sync with server clock,
                 // figure out the expiration timestamp in local time
-                m_bS3LikeRedirect = true;
-                m_nExpireTimestampLocal = time(nullptr) + nValidity;
-                m_osRedirectURL = osEffectiveURL;
-                CachedFileProp* cachedFileProp =
-                    poFS->GetCachedFileProp(m_pszURL);
-                cachedFileProp->bS3LikeRedirect = m_bS3LikeRedirect;
-                cachedFileProp->nExpireTimestampLocal = m_nExpireTimestampLocal;
-                cachedFileProp->osRedirectURL = m_osRedirectURL;
+                oFileProp.bS3LikeRedirect = true;
+                oFileProp.nExpireTimestampLocal = time(nullptr) + nValidity;
+                oFileProp.osRedirectURL = osEffectiveURL;
+                poFS->SetCachedFileProp(m_pszURL, oFileProp);
             }
         }
 
@@ -910,17 +901,17 @@ vsi_l_offset VSICurlHandle::GetFileSize( bool bSetError )
                               &dfSize );
         if( code == 0 )
         {
-            eExists = EXIST_YES;
+            oFileProp.eExists = EXIST_YES;
             if( dfSize < 0 )
-                fileSize = 0;
+                oFileProp.fileSize = 0;
             else
-                fileSize = static_cast<GUIntBig>(dfSize);
+                oFileProp.fileSize = static_cast<GUIntBig>(dfSize);
         }
 
         if( UseLimitRangeGetInsteadOfHead() && response_code == 206 )
         {
-            eExists = EXIST_NO;
-            fileSize = 0;
+            oFileProp.eExists = EXIST_NO;
+            oFileProp.fileSize = 0;
             if( sWriteFuncHeaderData.pBuffer != nullptr )
             {
                 const char* pszContentRange =
@@ -933,8 +924,8 @@ vsi_l_offset VSICurlHandle::GetFileSize( bool bSetError )
                     pszContentRange = strchr(pszContentRange, '/');
                 if( pszContentRange )
                 {
-                    eExists = EXIST_YES;
-                    fileSize = static_cast<GUIntBig>(
+                    oFileProp.eExists = EXIST_YES;
+                    oFileProp.fileSize = static_cast<GUIntBig>(
                         CPLAtoGIntBig(pszContentRange + 1));
                 }
 
@@ -956,9 +947,9 @@ vsi_l_offset VSICurlHandle::GetFileSize( bool bSetError )
         else if ( IsDirectoryFromExists(osVerb,
                                         static_cast<int>(response_code)) )
         {
-            eExists = EXIST_YES;
-            fileSize = 0;
-            bIsDirectory = true;
+            oFileProp.eExists = EXIST_YES;
+            oFileProp.fileSize = 0;
+            oFileProp.bIsDirectory = true;
         }
         // 405 = Method not allowed
         else if (response_code == 405 && !bRetryWithGet && osVerb == "HEAD" )
@@ -972,8 +963,8 @@ vsi_l_offset VSICurlHandle::GetFileSize( bool bSetError )
         }
         else if( response_code == 416 )
         {
-            eExists = EXIST_YES;
-            fileSize = 0;
+            oFileProp.eExists = EXIST_YES;
+            oFileProp.fileSize = 0;
         }
         else if( response_code != 200 )
         {
@@ -1005,7 +996,7 @@ vsi_l_offset VSICurlHandle::GetFileSize( bool bSetError )
                                   sWriteFuncHeaderData.pBuffer,
                                   bSetError) )
             {
-                bHasComputedFileSize = false;
+                oFileProp.bHasComputedFileSize = false;
                 CPLFree(sWriteFuncData.pBuffer);
                 CPLFree(sWriteFuncHeaderData.pBuffer);
                 curl_easy_cleanup(hCurlHandle);
@@ -1047,8 +1038,8 @@ vsi_l_offset VSICurlHandle::GetFileSize( bool bSetError )
                 // else a CPLDebug() is emitted below
             }
 
-            eExists = EXIST_NO;
-            fileSize = 0;
+            oFileProp.eExists = EXIST_NO;
+            oFileProp.fileSize = 0;
         }
         else if( sWriteFuncData.pBuffer != nullptr )
         {
@@ -1061,20 +1052,20 @@ vsi_l_offset VSICurlHandle::GetFileSize( bool bSetError )
             strncmp(osURL, osEffectiveURL, osURL.size()) == 0 &&
             osEffectiveURL[osURL.size()] == '/' )
         {
-            eExists = EXIST_YES;
-            fileSize = 0;
-            bIsDirectory = true;
+            oFileProp.eExists = EXIST_YES;
+            oFileProp.fileSize = 0;
+            oFileProp.bIsDirectory = true;
         }
         else if( osURL.back() == '/' )
         {
-            bIsDirectory = true;
+            oFileProp.bIsDirectory = true;
         }
 
         if( ENABLE_DEBUG && szCurlErrBuf[0] == '\0' )
         {
             CPLDebug("VSICURL", "GetFileSize(%s)=" CPL_FRMT_GUIB
                      "  response_code=%d",
-                     osURL.c_str(), fileSize,
+                     osURL.c_str(), oFileProp.fileSize,
                      static_cast<int>(response_code));
         }
     }
@@ -1083,15 +1074,12 @@ vsi_l_offset VSICurlHandle::GetFileSize( bool bSetError )
     CPLFree(sWriteFuncHeaderData.pBuffer);
     curl_easy_cleanup(hCurlHandle);
 
-    CachedFileProp* cachedFileProp = poFS->GetCachedFileProp(m_pszURL);
-    cachedFileProp->bHasComputedFileSize = true;
-    cachedFileProp->fileSize = fileSize;
-    cachedFileProp->eExists = eExists;
-    cachedFileProp->bIsDirectory = bIsDirectory;
+    oFileProp.bHasComputedFileSize = true;
     if( mtime != 0 )
-        cachedFileProp->mTime = mtime;
+        oFileProp.mTime = mtime;
+    poFS->SetCachedFileProp(m_pszURL, oFileProp);
 
-    return fileSize;
+    return oFileProp.fileSize;
 }
 
 /************************************************************************/
@@ -1100,11 +1088,11 @@ vsi_l_offset VSICurlHandle::GetFileSize( bool bSetError )
 
 bool VSICurlHandle::Exists( bool bSetError )
 {
-    if( eExists == EXIST_UNKNOWN )
+    if( oFileProp.eExists == EXIST_UNKNOWN )
     {
         GetFileSize(bSetError);
     }
-    return eExists == EXIST_YES;
+    return oFileProp.eExists == EXIST_YES;
 }
 
 /************************************************************************/
@@ -1120,33 +1108,27 @@ vsi_l_offset VSICurlHandle::Tell()
 /*                       GetRedirectURLIfValid()                        */
 /************************************************************************/
 
-CPLString VSICurlHandle::GetRedirectURLIfValid(CachedFileProp* cachedFileProp,
-                                               bool& bHasExpired)
+CPLString VSICurlHandle::GetRedirectURLIfValid(bool& bHasExpired)
 {
     bHasExpired = false;
-    if( cachedFileProp->bS3LikeRedirect )
-    {
-        m_bS3LikeRedirect = cachedFileProp->bS3LikeRedirect;
-        m_nExpireTimestampLocal = cachedFileProp->nExpireTimestampLocal;
-        m_osRedirectURL = cachedFileProp->osRedirectURL;
-    }
+    poFS->GetCachedFileProp(m_pszURL, oFileProp);
 
     CPLString osURL(m_pszURL);
-    if( m_bS3LikeRedirect )
+    if( oFileProp.bS3LikeRedirect )
     {
-        if( time(nullptr) + 1 < m_nExpireTimestampLocal )
+        if( time(nullptr) + 1 < oFileProp.nExpireTimestampLocal )
         {
             CPLDebug("VSICURL",
                      "Using redirect URL as it looks to be still valid "
                      "(%d seconds left)",
-                     static_cast<int>(m_nExpireTimestampLocal - time(nullptr)));
-            osURL = m_osRedirectURL;
+                     static_cast<int>(oFileProp.nExpireTimestampLocal - time(nullptr)));
+            osURL = oFileProp.osRedirectURL;
         }
         else
         {
             CPLDebug("VSICURL", "Redirect URL has expired. Using original URL");
-            m_bS3LikeRedirect = false;
-            cachedFileProp->bS3LikeRedirect = false;
+            oFileProp.bS3LikeRedirect = false;
+            poFS->SetCachedFileProp(m_pszURL, oFileProp);
             bHasExpired = true;
         }
     }
@@ -1163,14 +1145,13 @@ bool VSICurlHandle::DownloadRegion( const vsi_l_offset startOffset,
     if( bInterrupted && bStopOnInterruptUntilUninstall )
         return false;
 
-    CachedFileProp* cachedFileProp = poFS->GetCachedFileProp(m_pszURL);
-    if( cachedFileProp->eExists == EXIST_NO )
+    if( oFileProp.eExists == EXIST_NO )
         return false;
 
     CURLM* hCurlMultiHandle = poFS->GetCurlMultiHandleFor(m_pszURL);
 
     bool bHasExpired = false;
-    CPLString osURL(GetRedirectURLIfValid(cachedFileProp, bHasExpired));
+    CPLString osURL(GetRedirectURLIfValid(bHasExpired));
     bool bUsedRedirect = osURL != m_pszURL;
 
     WriteFuncStruct sWriteFuncData;
@@ -1202,10 +1183,10 @@ bool VSICurlHandle::DownloadRegion( const vsi_l_offset startOffset,
     sWriteFuncHeaderData.nEndOffset =
         startOffset + nBlocks * DOWNLOAD_CHUNK_SIZE - 1;
     // Some servers don't like we try to read after end-of-file (#5786).
-    if( cachedFileProp->bHasComputedFileSize &&
-        sWriteFuncHeaderData.nEndOffset >= cachedFileProp->fileSize )
+    if( oFileProp.bHasComputedFileSize &&
+        sWriteFuncHeaderData.nEndOffset >= oFileProp.fileSize )
     {
-        sWriteFuncHeaderData.nEndOffset = cachedFileProp->fileSize - 1;
+        sWriteFuncHeaderData.nEndOffset = oFileProp.fileSize - 1;
     }
 
     char rangeStr[512] = {};
@@ -1267,7 +1248,10 @@ bool VSICurlHandle::DownloadRegion( const vsi_l_offset startOffset,
     long mtime = 0;
     curl_easy_getinfo(hCurlHandle, CURLINFO_FILETIME, &mtime);
     if( mtime != 0 )
-        cachedFileProp->mTime = mtime;
+    {
+        oFileProp.mTime = mtime;
+        poFS->SetCachedFileProp(m_pszURL, oFileProp);
+    }
 
     if( ENABLE_DEBUG )
         CPLDebug("VSICURL", "Got response_code=%ld", response_code);
@@ -1276,8 +1260,8 @@ bool VSICurlHandle::DownloadRegion( const vsi_l_offset startOffset,
     {
         CPLDebug("VSICURL",
                  "Got an error with redirect URL. Retrying with original one");
-        m_bS3LikeRedirect = false;
-        cachedFileProp->bS3LikeRedirect = false;
+        oFileProp.bS3LikeRedirect = false;
+        poFS->SetCachedFileProp(m_pszURL, oFileProp);
         bUsedRedirect = false;
         osURL = m_pszURL;
         CPLFree(sWriteFuncData.pBuffer);
@@ -1294,7 +1278,7 @@ bool VSICurlHandle::DownloadRegion( const vsi_l_offset startOffset,
             osEffectiveURL = pszEffectiveURL;
     }
 
-    if( !m_bS3LikeRedirect && !osEffectiveURL.empty() &&
+    if( !oFileProp.bS3LikeRedirect && !osEffectiveURL.empty() &&
         strstr(osEffectiveURL, m_pszURL) == nullptr )
     {
         CPLDebug("VSICURL", "Effective URL: %s", osEffectiveURL.c_str());
@@ -1317,12 +1301,10 @@ bool VSICurlHandle::DownloadRegion( const vsi_l_offset startOffset,
                          nValidity);
                 // As our local clock might not be in sync with server clock,
                 // figure out the expiration timestamp in local time.
-                m_bS3LikeRedirect = true;
-                m_nExpireTimestampLocal = time(nullptr) + nValidity;
-                m_osRedirectURL = osEffectiveURL;
-                cachedFileProp->bS3LikeRedirect = m_bS3LikeRedirect;
-                cachedFileProp->nExpireTimestampLocal = m_nExpireTimestampLocal;
-                cachedFileProp->osRedirectURL = m_osRedirectURL;
+                oFileProp.bS3LikeRedirect = true;
+                oFileProp.nExpireTimestampLocal = time(nullptr) + nValidity;
+                oFileProp.osRedirectURL = osEffectiveURL;
+                poFS->SetCachedFileProp(m_pszURL, oFileProp);
             }
         }
     }
@@ -1375,11 +1357,12 @@ bool VSICurlHandle::DownloadRegion( const vsi_l_offset startOffset,
                 CPLError(CE_Failure, CPLE_AppDefined, "%d: %s",
                          static_cast<int>(response_code), szCurlErrBuf);
         }
-        if( !bHasComputedFileSize && startOffset == 0 )
+        if( !oFileProp.bHasComputedFileSize && startOffset == 0 )
         {
-            cachedFileProp->bHasComputedFileSize = bHasComputedFileSize = true;
-            cachedFileProp->fileSize = fileSize = 0;
-            cachedFileProp->eExists = eExists = EXIST_NO;
+            oFileProp.bHasComputedFileSize = true;
+            oFileProp.fileSize = 0;
+            oFileProp.eExists = EXIST_NO;
+            poFS->SetCachedFileProp(m_pszURL, oFileProp);
         }
         CPLFree(sWriteFuncData.pBuffer);
         CPLFree(sWriteFuncHeaderData.pBuffer);
@@ -1387,7 +1370,7 @@ bool VSICurlHandle::DownloadRegion( const vsi_l_offset startOffset,
         return false;
     }
 
-    if( !bHasComputedFileSize && sWriteFuncHeaderData.pBuffer )
+    if( !oFileProp.bHasComputedFileSize && sWriteFuncHeaderData.pBuffer )
     {
         // Try to retrieve the filesize from the HTTP headers
         // if in the form: "Content-Range: bytes x-y/filesize".
@@ -1409,7 +1392,7 @@ bool VSICurlHandle::DownloadRegion( const vsi_l_offset startOffset,
                 if( pszSlash )
                 {
                     pszSlash++;
-                    fileSize =
+                    oFileProp.fileSize =
                         CPLScanUIntBig(pszSlash,
                                        static_cast<int>(strlen(pszSlash)));
                 }
@@ -1430,25 +1413,24 @@ bool VSICurlHandle::DownloadRegion( const vsi_l_offset startOffset,
                     if( pszEOL )
                         *pszEOL = 0;
 
-                    fileSize =
+                    oFileProp.fileSize =
                         CPLScanUIntBig(pszSize,
                                        static_cast<int>(strlen(pszSize)));
                 }
             }
         }
 
-        if( fileSize != 0 )
+        if( oFileProp.fileSize != 0 )
         {
-            eExists = EXIST_YES;
+            oFileProp.eExists = EXIST_YES;
 
             if( ENABLE_DEBUG )
                 CPLDebug("VSICURL", "GetFileSize(%s)=" CPL_FRMT_GUIB
                          "  response_code=%d",
-                         m_pszURL, fileSize, static_cast<int>(response_code));
+                         m_pszURL, oFileProp.fileSize, static_cast<int>(response_code));
 
-            bHasComputedFileSize = cachedFileProp->bHasComputedFileSize = true;
-            cachedFileProp->fileSize = fileSize;
-            cachedFileProp->eExists = eExists;
+            oFileProp.bHasComputedFileSize = true;
+            poFS->SetCachedFileProp(m_pszURL, oFileProp);
         }
     }
 
@@ -1527,9 +1509,9 @@ size_t VSICurlHandle::Read( void * const pBufferIn, size_t const nSize,
     while( nBufferRequestSize )
     {
         // Don't try to read after end of file.
-        CachedFileProp* cachedFileProp = poFS->GetCachedFileProp(m_pszURL);
-        if( cachedFileProp->bHasComputedFileSize &&
-            iterOffset >= cachedFileProp->fileSize )
+        poFS->GetCachedFileProp(m_pszURL, oFileProp);
+        if( oFileProp.bHasComputedFileSize &&
+            iterOffset >= oFileProp.fileSize )
         {
             if( iterOffset == curOffset )
             {
@@ -1637,8 +1619,8 @@ int VSICurlHandle::ReadMultiRange( int const nRanges, void ** const ppData,
     if( bInterrupted && bStopOnInterruptUntilUninstall )
         return FALSE;
 
-    CachedFileProp* cachedFileProp = poFS->GetCachedFileProp(m_pszURL);
-    if( cachedFileProp->eExists == EXIST_NO )
+    poFS->GetCachedFileProp(m_pszURL, oFileProp);
+    if( oFileProp.eExists == EXIST_NO )
         return -1;
 
     const char* pszMultiRangeStrategy =
@@ -1656,7 +1638,7 @@ int VSICurlHandle::ReadMultiRange( int const nRanges, void ** const ppData,
     }
 
     bool bHasExpired = false;
-    CPLString osURL(GetRedirectURLIfValid(cachedFileProp, bHasExpired));
+    CPLString osURL(GetRedirectURLIfValid(bHasExpired));
     if( bHasExpired )
     {
         return VSIVirtualHandle::ReadMultiRange(
@@ -2300,7 +2282,8 @@ int       VSICurlHandle::Close()
 /************************************************************************/
 
 VSICurlFilesystemHandler::VSICurlFilesystemHandler():
-    oRegionCache{static_cast<size_t>(N_MAX_REGIONS)}
+    oRegionCache{static_cast<size_t>(N_MAX_REGIONS)},
+    oCacheFileProp{1024}
 {
 }
 
@@ -2405,19 +2388,26 @@ void VSICurlFilesystemHandler::AddRegion( const char* pszURL,
 /*                         GetCachedFileProp()                          */
 /************************************************************************/
 
-CachedFileProp *
-VSICurlFilesystemHandler::GetCachedFileProp( const char* pszURL )
+bool
+VSICurlFilesystemHandler::GetCachedFileProp( const char* pszURL,
+                                             FileProp& oFileProp )
 {
     CPLMutexHolder oHolder( &hMutex );
 
-    CachedFileProp* cachedFileProp = cacheFileSize[pszURL];
-    if( cachedFileProp == nullptr )
-    {
-        cachedFileProp = new CachedFileProp;
-        cacheFileSize[pszURL] = cachedFileProp;
-    }
+    return oCacheFileProp.tryGet(std::string(pszURL), oFileProp);
+}
+
+/************************************************************************/
+/*                         SetCachedFileProp()                          */
+/************************************************************************/
+
+void
+VSICurlFilesystemHandler::SetCachedFileProp( const char* pszURL,
+                                             const FileProp& oFileProp )
+{
+    CPLMutexHolder oHolder( &hMutex );
 
-    return cachedFileProp;
+    oCacheFileProp.insert(std::string(pszURL), oFileProp);
 }
 
 /************************************************************************/
@@ -2428,13 +2418,7 @@ void VSICurlFilesystemHandler::InvalidateCachedData( const char* pszURL )
 {
     CPLMutexHolder oHolder( &hMutex );
 
-    std::map<CPLString, CachedFileProp*>::iterator oIter =
-        cacheFileSize.find(pszURL);
-    if( oIter != cacheFileSize.end() )
-    {
-        delete oIter->second;
-        cacheFileSize.erase(oIter);
-    }
+    oCacheFileProp.remove(std::string(pszURL));
 
     // Invalidate all cached regions for this URL
     std::list<FilenameOffsetPair> keysToRemove;
@@ -2461,14 +2445,7 @@ void VSICurlFilesystemHandler::ClearCache()
 
     oRegionCache.clear();
 
-    std::map<CPLString, CachedFileProp*>::const_iterator iterCacheFileSize;
-    for( iterCacheFileSize = cacheFileSize.begin();
-         iterCacheFileSize != cacheFileSize.end();
-         ++iterCacheFileSize )
-    {
-        delete iterCacheFileSize->second;
-    }
-    cacheFileSize.clear();
+    oCacheFileProp.clear();
 
     std::map<CPLString, CachedDirList*>::const_iterator iterCacheDirList;
     for( iterCacheDirList = cacheDirList.begin();
@@ -2500,29 +2477,31 @@ void VSICurlFilesystemHandler::PartialClearCache(const char* pszFilenamePrefix)
     CPLMutexHolder oHolder( &hMutex );
 
     CPLString osURL = GetURLFromFilename(pszFilenamePrefix);
-    std::list<FilenameOffsetPair> keysToRemove;
-    auto lambda = [&keysToRemove, &osURL](
-        const lru11::KeyValuePair<FilenameOffsetPair,
-                                            std::shared_ptr<std::string>>& kv)
     {
-        if( strncmp(kv.key.filename_.c_str(), osURL, osURL.size()) == 0 )
-            keysToRemove.push_back(kv.key);
-    };
-    oRegionCache.cwalk(lambda);
-    for( auto& key: keysToRemove )
-        oRegionCache.remove(key);
+        std::list<FilenameOffsetPair> keysToRemove;
+        auto lambda = [&keysToRemove, &osURL](
+            const lru11::KeyValuePair<FilenameOffsetPair,
+                                                std::shared_ptr<std::string>>& kv)
+        {
+            if( strncmp(kv.key.filename_.c_str(), osURL, osURL.size()) == 0 )
+                keysToRemove.push_back(kv.key);
+        };
+        oRegionCache.cwalk(lambda);
+        for( auto& key: keysToRemove )
+            oRegionCache.remove(key);
+    }
 
-    auto iterCacheFileSize = cacheFileSize.begin();
-    while( iterCacheFileSize != cacheFileSize.end() )
     {
-        auto iter = iterCacheFileSize;
-        auto nextiter = ++iterCacheFileSize;
-        if( strncmp(iter->first.c_str(), osURL, osURL.size()) == 0 )
+        std::list<std::string> keysToRemove;
+        auto lambda = [&keysToRemove, &osURL](
+            const lru11::KeyValuePair<std::string, FileProp>& kv)
         {
-            delete iter->second;
-            cacheFileSize.erase(iter);
-        }
-        iterCacheFileSize = nextiter;
+            if( strncmp(kv.key.c_str(), osURL, osURL.size()) == 0 )
+                keysToRemove.push_back(kv.key);
+        };
+        oCacheFileProp.cwalk(lambda);
+        for( auto& key: keysToRemove )
+            oCacheFileProp.remove(key);
     }
 
     auto iterCacheDirList = cacheDirList.begin();
@@ -2720,9 +2699,9 @@ VSIVirtualHandle* VSICurlFilesystemHandler::Open( const char *pszFilename,
     CPLString osFilename(pszFilename);
     bool bGotFileList = true;
     bool bForceExistsCheck = false;
-    CachedFileProp* cachedFileProp =
-        GetCachedFileProp(osFilename + strlen(GetFSPrefix()));
-    if( !(cachedFileProp != nullptr && cachedFileProp->eExists == EXIST_YES) &&
+    FileProp cachedFileProp;
+    if( !(GetCachedFileProp(osFilename + strlen(GetFSPrefix()), cachedFileProp) &&
+          cachedFileProp.eExists == EXIST_YES) &&
         strchr(CPLGetFilename(osFilename), '.') != nullptr &&
         !STARTS_WITH(CPLGetExtension(osFilename), "zip") && !bSkipReadDir)
     {
@@ -3125,13 +3104,15 @@ char** VSICurlFilesystemHandler::ParseHTMLFileList( const char* pszFilename,
                     CPLString osCachedFilename =
                         CPLSPrintf("%s/%s", osURL.c_str(),
                                    beginFilename);
-                    CachedFileProp* cachedFileProp =
-                        GetCachedFileProp(osCachedFilename);
-                    cachedFileProp->eExists = EXIST_YES;
-                    cachedFileProp->bIsDirectory = bIsDirectory;
-                    cachedFileProp->mTime = static_cast<time_t>(mTime);
-                    cachedFileProp->bHasComputedFileSize = nFileSize > 0;
-                    cachedFileProp->fileSize = nFileSize;
+
+                    FileProp cachedFileProp;
+                    GetCachedFileProp(osCachedFilename, cachedFileProp);
+                    cachedFileProp.eExists = EXIST_YES;
+                    cachedFileProp.bIsDirectory = bIsDirectory;
+                    cachedFileProp.mTime = static_cast<time_t>(mTime);
+                    cachedFileProp.bHasComputedFileSize = nFileSize > 0;
+                    cachedFileProp.fileSize = nFileSize;
+                    SetCachedFileProp(osCachedFilename, cachedFileProp);
 
                     oFileList.AddString( beginFilename );
                     if( ENABLE_DEBUG_VERBOSE )
@@ -3457,13 +3438,15 @@ char** VSICurlFilesystemHandler::GetFileList(const char *pszDirname,
                             CPLSPrintf("%s/%s",
                                        osURL.c_str(),
                                        pszFilename);
-                        CachedFileProp* cachedFileProp =
-                            GetCachedFileProp(osCachedFilename);
-                        cachedFileProp->eExists = EXIST_YES;
-                        cachedFileProp->bHasComputedFileSize = bSizeValid;
-                        cachedFileProp->fileSize = nFileSize;
-                        cachedFileProp->bIsDirectory = bIsDirectory;
-                        cachedFileProp->mTime = static_cast<time_t>(mUnixTime);
+
+                        FileProp cachedFileProp;
+                        GetCachedFileProp(osCachedFilename, cachedFileProp);
+                        cachedFileProp.eExists = EXIST_YES;
+                        cachedFileProp.bIsDirectory = bIsDirectory;
+                        cachedFileProp.mTime = static_cast<time_t>(mUnixTime);
+                        cachedFileProp.bHasComputedFileSize = bSizeValid;
+                        cachedFileProp.fileSize = nFileSize;
+                        SetCachedFileProp(osCachedFilename, cachedFileProp);
 
                         oFileList.AddString(pszFilename);
                         if( ENABLE_DEBUG_VERBOSE )
@@ -3782,15 +3765,14 @@ char** VSICurlFilesystemHandler::ReadDirInternal( const char *pszDirname,
 
     // If we know the file exists and is not a directory,
     // then don't try to list its content.
-    CachedFileProp* cachedFileProp =
-        GetCachedFileProp(GetURLFromFilename(osDirname));
-    if( cachedFileProp->eExists == EXIST_YES && !cachedFileProp->bIsDirectory )
+    FileProp cachedFileProp;
+    if( GetCachedFileProp(GetURLFromFilename(osDirname), cachedFileProp) &&
+        cachedFileProp.eExists == EXIST_YES && !cachedFileProp.bIsDirectory )
     {
         if( osDirnameOri != osDirname )
         {
-            cachedFileProp =
-                    GetCachedFileProp((GetURLFromFilename(osDirname) + "/").c_str());
-            if( cachedFileProp->eExists == EXIST_YES && !cachedFileProp->bIsDirectory )
+            if( GetCachedFileProp((GetURLFromFilename(osDirname) + "/").c_str(), cachedFileProp) &&
+                cachedFileProp.eExists == EXIST_YES && !cachedFileProp.bIsDirectory )
             {
                 if( pbGotFileList )
                     *pbGotFileList = true;
diff --git a/gdal/port/cpl_vsil_curl_class.h b/gdal/port/cpl_vsil_curl_class.h
index e05386693443..e65e03698333 100644
--- a/gdal/port/cpl_vsil_curl_class.h
+++ b/gdal/port/cpl_vsil_curl_class.h
@@ -66,7 +66,7 @@ typedef enum
     EXIST_YES,
 } ExistStatus;
 
-class CachedFileProp
+class FileProp
 {
   public:
     ExistStatus     eExists = EXIST_UNKNOWN;
@@ -147,7 +147,7 @@ class VSICurlFilesystemHandler : public VSIFilesystemHandler
         }
     };
 
-    using CacheType =
+    using RegionCacheType =
         lru11::Cache<FilenameOffsetPair, std::shared_ptr<std::string>,
             lru11::NullLock,
             std::unordered_map<
@@ -156,9 +156,10 @@ class VSICurlFilesystemHandler : public VSIFilesystemHandler
                     std::shared_ptr<std::string>>>::iterator,
                     FilenameOffsetPairHasher>>;
 
-    CacheType oRegionCache;
+    RegionCacheType oRegionCache;
+
+    lru11::Cache<std::string, FileProp>  oCacheFileProp;
 
-    std::map<CPLString, CachedFileProp*>   cacheFileSize{};
     std::map<CPLString, CachedDirList*>        cacheDirList{};
 
     // Per-thread Curl connection cache.
@@ -248,7 +249,10 @@ class VSICurlFilesystemHandler : public VSIFilesystemHandler
                                    size_t nSize,
                                    const char *pData );
 
-    CachedFileProp*     GetCachedFileProp( const char* pszURL );
+    bool                GetCachedFileProp( const char* pszURL,
+                                           FileProp& oFileProp );
+    void                SetCachedFileProp( const char* pszURL,
+                                           const FileProp& oFileProp );
     void                InvalidateCachedData( const char* pszURL );
 
     CURLM              *GetCurlMultiHandleFor( const CPLString& osURL );
@@ -284,11 +288,8 @@ class VSICurlHandle : public VSIVirtualHandle
 
     bool            m_bCached = true;
 
-    vsi_l_offset    fileSize = 0;
-    bool            bHasComputedFileSize = false;
-    ExistStatus     eExists = EXIST_UNKNOWN;
-    bool            bIsDirectory = false;
-    time_t          mTime = 0;
+    FileProp  oFileProp{};
+
     CPLString       m_osFilename{}; // e.g "/vsicurl/http://example.com/foo"
     char*           m_pszURL = nullptr;     // e.g "http://example.com/foo"
 
@@ -318,17 +319,12 @@ class VSICurlHandle : public VSIVirtualHandle
 
     virtual bool            DownloadRegion(vsi_l_offset startOffset, int nBlocks);
 
-    bool                m_bS3LikeRedirect = false;
-    time_t              m_nExpireTimestampLocal = 0;
-    CPLString           m_osRedirectURL{};
-
     bool                m_bUseHead = false;
 
     int          ReadMultiRangeSingleGet( int nRanges, void ** ppData,
                                          const vsi_l_offset* panOffsets,
                                          const size_t* panSizes );
-    CPLString    GetRedirectURLIfValid(CachedFileProp* cachedFileProp,
-                                               bool& bHasExpired);
+    CPLString    GetRedirectURLIfValid(bool& bHasExpired);
 
   protected:
     virtual struct curl_slist* GetCurlHeaders( const CPLString& /*osVerb*/,
@@ -359,12 +355,12 @@ class VSICurlHandle : public VSIVirtualHandle
     int Flush() override;
     int Close() override;
 
-    bool IsKnownFileSize() const { return bHasComputedFileSize; }
+    bool IsKnownFileSize() const { return oFileProp.bHasComputedFileSize; }
     vsi_l_offset         GetFileSize() { return GetFileSize(false); }
     virtual vsi_l_offset GetFileSize( bool bSetError );
     bool                 Exists( bool bSetError );
-    bool                 IsDirectory() const { return bIsDirectory; }
-    time_t               GetMTime() const { return mTime; }
+    bool                 IsDirectory() const { return oFileProp.bIsDirectory; }
+    time_t               GetMTime() const { return oFileProp.mTime; }
 
     int                  InstallReadCbk( VSICurlReadCbkFunc pfnReadCbk,
                                          void* pfnUserData,
@@ -426,7 +422,7 @@ class IVSIS3LikeHandle:  public VSICurlHandle
         }
     void ProcessGetFileSizeResult( const char* pszContent ) override
         {
-            bIsDirectory = strstr(pszContent, "ListBucketResult") != nullptr;
+            oFileProp.bIsDirectory = strstr(pszContent, "ListBucketResult") != nullptr;
         }
 
   public:
diff --git a/gdal/port/cpl_vsil_s3.cpp b/gdal/port/cpl_vsil_s3.cpp
index 1dd96c7f92bf..9c96a777f7d8 100644
--- a/gdal/port/cpl_vsil_s3.cpp
+++ b/gdal/port/cpl_vsil_s3.cpp
@@ -84,7 +84,7 @@ void VSICurlFilesystemHandler::AnalyseS3FileList(
         (psListBucketResult != nullptr ) ? nullptr :
         CPLGetXMLNode(psTree, "=ListAllMyBucketsResult.Buckets");
 
-    std::vector< std::pair<CPLString, CachedFileProp> > aoProps;
+    std::vector< std::pair<CPLString, FileProp> > aoProps;
     // Count the number of occurrences of a path. Can be 1 or 2. 2 in the case
     // that both a filename and directory exist
     std::map<CPLString, int> aoNameCount;
@@ -104,7 +104,7 @@ void VSICurlFilesystemHandler::AnalyseS3FileList(
                 const char* pszKey = CPLGetXMLValue(psIter, "Key", nullptr);
                 if( pszKey && strlen(pszKey) > osPrefix.size() )
                 {
-                    CachedFileProp prop;
+                    FileProp prop;
                     prop.eExists = EXIST_YES;
                     prop.bHasComputedFileSize = true;
                     prop.fileSize = static_cast<GUIntBig>(
@@ -136,7 +136,7 @@ void VSICurlFilesystemHandler::AnalyseS3FileList(
                     }
 
                     aoProps.push_back(
-                        std::pair<CPLString, CachedFileProp>
+                        std::pair<CPLString, FileProp>
                             (pszKey + osPrefix.size(), prop));
                     aoNameCount[pszKey + osPrefix.size()] ++;
                 }
@@ -151,7 +151,7 @@ void VSICurlFilesystemHandler::AnalyseS3FileList(
                         osKey.resize(osKey.size()-1);
                     if( osKey.size() > osPrefix.size() )
                     {
-                        CachedFileProp prop;
+                        FileProp prop;
                         prop.eExists = EXIST_YES;
                         prop.bIsDirectory = true;
                         prop.bHasComputedFileSize = true;
@@ -159,7 +159,7 @@ void VSICurlFilesystemHandler::AnalyseS3FileList(
                         prop.mTime = 0;
 
                         aoProps.push_back(
-                            std::pair<CPLString, CachedFileProp>
+                            std::pair<CPLString, FileProp>
                                 (osKey.c_str() + osPrefix.size(), prop));
                         aoNameCount[osKey.c_str() + osPrefix.size()] ++;
                     }
@@ -196,7 +196,7 @@ void VSICurlFilesystemHandler::AnalyseS3FileList(
 #if DEBUG_VERBOSE
                 CPLDebug("S3", "Cache %s", osCachedFilename.c_str());
 #endif
-                *GetCachedFileProp(osCachedFilename) = aoProps[i].second;
+                SetCachedFileProp(osCachedFilename, aoProps[i].second);
             }
             osFileList.AddString( (aoProps[i].first + osSuffix).c_str() );
         }
@@ -223,7 +223,7 @@ void VSICurlFilesystemHandler::AnalyseS3FileList(
                 const char* pszName = CPLGetXMLValue(psIter, "Name", nullptr);
                 if( pszName )
                 {
-                    CachedFileProp prop;
+                    FileProp prop;
                     prop.eExists = EXIST_YES;
                     prop.bIsDirectory = true;
                     prop.bHasComputedFileSize = true;
@@ -234,7 +234,7 @@ void VSICurlFilesystemHandler::AnalyseS3FileList(
 #if DEBUG_VERBOSE
                     CPLDebug("S3", "Cache %s", osCachedFilename.c_str());
 #endif
-                    *GetCachedFileProp(osCachedFilename) = prop;
+                    SetCachedFileProp(osCachedFilename, prop);
 
                     osFileList.AddString( pszName );
                 }
@@ -1334,11 +1334,12 @@ int IVSIS3LikeFSHandler::Mkdir( const char * pszDirname, long /* nMode */ )
 
             InvalidateDirContent( CPLGetDirname(osDirnameWithoutEndSlash) );
 
-            CachedFileProp* cachedFileProp =
-                GetCachedFileProp(GetURLFromFilename(osDirname));
-            cachedFileProp->eExists = EXIST_YES;
-            cachedFileProp->bIsDirectory = true;
-            cachedFileProp->bHasComputedFileSize = true;
+            FileProp cachedFileProp;
+            GetCachedFileProp(GetURLFromFilename(osDirname), cachedFileProp);
+            cachedFileProp.eExists = EXIST_YES;
+            cachedFileProp.bIsDirectory = true;
+            cachedFileProp.bHasComputedFileSize = true;
+            SetCachedFileProp(GetURLFromFilename(osDirname), cachedFileProp);
 
             RegisterEmptyDir(osDirnameWithoutEndSlash);
             RegisterEmptyDir(osDirname);
@@ -1433,11 +1434,13 @@ int IVSIS3LikeFSHandler::Stat( const char *pszFilename, VSIStatBufL *pStatBuf,
         pStatBuf->st_mtime = 0;
         pStatBuf->st_size = 0;
         pStatBuf->st_mode = S_IFDIR;
-        CachedFileProp* cachedFileProp =
-            GetCachedFileProp(GetURLFromFilename(osFilename));
-        cachedFileProp->eExists = EXIST_YES;
-        cachedFileProp->bIsDirectory = true;
-        cachedFileProp->bHasComputedFileSize = true;
+
+        FileProp cachedFileProp;
+        GetCachedFileProp(GetURLFromFilename(osFilename), cachedFileProp);
+        cachedFileProp.eExists = EXIST_YES;
+        cachedFileProp.bIsDirectory = true;
+        cachedFileProp.bHasComputedFileSize = true;
+        SetCachedFileProp(GetURLFromFilename(osFilename), cachedFileProp);
     }
     CSLDestroy(papszRet);
     return nRet;
diff --git a/gdal/port/cpl_vsil_swift.cpp b/gdal/port/cpl_vsil_swift.cpp
index 6d430a5ead58..60e3e038b1e5 100644
--- a/gdal/port/cpl_vsil_swift.cpp
+++ b/gdal/port/cpl_vsil_swift.cpp
@@ -82,7 +82,7 @@ void VSICurlFilesystemHandler::AnalyseSwiftFileList(
     if( !oDoc.LoadMemory(reinterpret_cast<const GByte*>(pszJson)) )
         return;
 
-    std::vector< std::pair<CPLString, CachedFileProp> > aoProps;
+    std::vector< std::pair<CPLString, FileProp> > aoProps;
     // Count the number of occurrences of a path. Can be 1 or 2. 2 in the case
     // that both a filename and directory exist
     std::map<CPLString, int> aoNameCount;
@@ -104,7 +104,7 @@ void VSICurlFilesystemHandler::AnalyseSwiftFileList(
                 if( bHasCount )
                 {
                     // Case when listing /vsiswift/
-                    CachedFileProp prop;
+                    FileProp prop;
                     prop.eExists = EXIST_YES;
                     prop.bIsDirectory = true;
                     prop.bHasComputedFileSize = true;
@@ -112,13 +112,13 @@ void VSICurlFilesystemHandler::AnalyseSwiftFileList(
                     prop.mTime = 0;
 
                     aoProps.push_back(
-                        std::pair<CPLString, CachedFileProp>
+                        std::pair<CPLString, FileProp>
                             (osName, prop));
                     aoNameCount[ osName ] ++;
                 }
                 else
                 {
-                    CachedFileProp prop;
+                    FileProp prop;
                     prop.eExists = EXIST_YES;
                     prop.bHasComputedFileSize = true;
                     prop.fileSize = static_cast<GUIntBig>(nSize);
@@ -143,7 +143,7 @@ void VSICurlFilesystemHandler::AnalyseSwiftFileList(
                     }
 
                     aoProps.push_back(
-                        std::pair<CPLString, CachedFileProp>
+                        std::pair<CPLString, FileProp>
                             (osName.substr(osPrefix.size()), prop));
                     aoNameCount[ osName.substr(osPrefix.size()) ] ++;
                 }
@@ -157,7 +157,7 @@ void VSICurlFilesystemHandler::AnalyseSwiftFileList(
             if( osSubdir.find(osPrefix) == 0 )
             {
 
-                CachedFileProp prop;
+                FileProp prop;
                 prop.eExists = EXIST_YES;
                 prop.bIsDirectory = true;
                 prop.bHasComputedFileSize = true;
@@ -165,7 +165,7 @@ void VSICurlFilesystemHandler::AnalyseSwiftFileList(
                 prop.mTime = 0;
 
                 aoProps.push_back(
-                    std::pair<CPLString, CachedFileProp>
+                    std::pair<CPLString, FileProp>
                         (osSubdir.substr(osPrefix.size()), prop));
                 aoNameCount[ osSubdir.substr(osPrefix.size()) ] ++;
             }
@@ -201,7 +201,7 @@ void VSICurlFilesystemHandler::AnalyseSwiftFileList(
 #if DEBUG_VERBOSE
             CPLDebug("SWIFT", "Cache %s", osCachedFilename.c_str());
 #endif
-            *GetCachedFileProp(osCachedFilename) = aoProps[i].second;
+            SetCachedFileProp(osCachedFilename, aoProps[i].second);
         }
         osFileList.AddString( (aoProps[i].first + osSuffix).c_str() );
     }
@@ -438,13 +438,13 @@ int VSISwiftFSHandler::Stat( const char *pszFilename, VSIStatBufL *pStatBuf,
             CPLString osURL(poS3HandleHelper->GetURL());
             delete poS3HandleHelper;
 
-            CPLMutexHolder oHolder( &hMutex );
-            CachedFileProp* cachedFileProp = GetCachedFileProp(osURL);
-            cachedFileProp->eExists = EXIST_YES;
-            cachedFileProp->bHasComputedFileSize = false;
-            cachedFileProp->fileSize = 0;
-            cachedFileProp->bIsDirectory = true;
-            cachedFileProp->mTime = 0;
+            FileProp cachedFileProp;
+            cachedFileProp.eExists = EXIST_YES;
+            cachedFileProp.bHasComputedFileSize = false;
+            cachedFileProp.fileSize = 0;
+            cachedFileProp.bIsDirectory = true;
+            cachedFileProp.mTime = 0;
+            SetCachedFileProp(osURL, cachedFileProp);
 
             pStatBuf->st_size = 0;
             pStatBuf->st_mode = S_IFDIR;
diff --git a/gdal/port/cpl_vsil_webhdfs.cpp b/gdal/port/cpl_vsil_webhdfs.cpp
index 3f56b686e1fd..4df0307cb61b 100644
--- a/gdal/port/cpl_vsil_webhdfs.cpp
+++ b/gdal/port/cpl_vsil_webhdfs.cpp
@@ -647,7 +647,7 @@ char** VSIWebHDFSFSHandler::GetFileList( const char *pszDirname,
                 {
                     aosList.AddString(osName);
 
-                    CachedFileProp prop;
+                    FileProp prop;
                     prop.eExists = EXIST_YES;
                     prop.bIsDirectory = bIsDirectory;
                     prop.bHasComputedFileSize = true;
@@ -657,7 +657,7 @@ char** VSIWebHDFSFSHandler::GetFileList( const char *pszDirname,
 #if DEBUG_VERBOSE
                     CPLDebug("WEBHDFS", "Cache %s", osCachedFilename.c_str());
 #endif
-                    *GetCachedFileProp(osCachedFilename) = prop;
+                    SetCachedFileProp(osCachedFilename, prop);
                 }
             }
         }
@@ -845,11 +845,11 @@ int VSIWebHDFSFSHandler::Mkdir( const char *pszDirname, long nMode )
     {
         InvalidateDirContent( CPLGetDirname(osDirnameWithoutEndSlash) );
 
-        CachedFileProp* cachedFileProp =
-            GetCachedFileProp(GetURLFromFilename(osDirnameWithoutEndSlash));
-        cachedFileProp->eExists = EXIST_YES;
-        cachedFileProp->bIsDirectory = true;
-        cachedFileProp->bHasComputedFileSize = true;
+        FileProp cachedFileProp;
+        cachedFileProp.eExists = EXIST_YES;
+        cachedFileProp.bIsDirectory = true;
+        cachedFileProp.bHasComputedFileSize = true;
+        SetCachedFileProp(GetURLFromFilename(osDirnameWithoutEndSlash), cachedFileProp);
 
         RegisterEmptyDir(osDirnameWithoutEndSlash);
     }
@@ -892,10 +892,10 @@ VSIWebHDFSHandle::VSIWebHDFSHandle( VSIWebHDFSFSHandler* poFSIn,
 
 vsi_l_offset VSIWebHDFSHandle::GetFileSize( bool bSetError )
 {
-    if( bHasComputedFileSize )
-        return fileSize;
+    if( oFileProp.bHasComputedFileSize )
+        return oFileProp.fileSize;
 
-    bHasComputedFileSize = true;
+    oFileProp.bHasComputedFileSize = true;
 
     CURLM* hCurlMultiHandle = poFS->GetCurlMultiHandleFor(m_pszURL);
 
@@ -938,18 +938,18 @@ vsi_l_offset VSIWebHDFSHandle::GetFileSize( bool bSetError )
     long response_code = 0;
     curl_easy_getinfo(hCurlHandle, CURLINFO_HTTP_CODE, &response_code);
 
-    eExists = EXIST_NO;
+    oFileProp.eExists = EXIST_NO;
     if( response_code == 200 && sWriteFuncData.pBuffer )
     {
         CPLJSONDocument oDoc;
         if( oDoc.LoadMemory(reinterpret_cast<const GByte*>(sWriteFuncData.pBuffer )) )
         {
             CPLJSONObject oFileStatus = oDoc.GetRoot().GetObj("FileStatus");
-            fileSize = oFileStatus.GetLong("length");
-            mTime = static_cast<size_t>(
+            oFileProp.fileSize = oFileStatus.GetLong("length");
+            oFileProp.mTime = static_cast<size_t>(
                 oFileStatus.GetLong("modificationTime") / 1000);
-            bIsDirectory = oFileStatus.GetString("type") == "DIRECTORY";
-            eExists = EXIST_YES;
+            oFileProp.bIsDirectory = oFileStatus.GetString("type") == "DIRECTORY";
+            oFileProp.eExists = EXIST_YES;
         }
     }
 
@@ -981,20 +981,16 @@ vsi_l_offset VSIWebHDFSHandle::GetFileSize( bool bSetError )
     if( ENABLE_DEBUG )
         CPLDebug("WEBHDFS", "GetFileSize(%s)=" CPL_FRMT_GUIB
                     "  response_code=%d",
-                    osURL.c_str(), fileSize,
+                    osURL.c_str(), oFileProp.fileSize,
                     static_cast<int>(response_code));
 
     CPLFree(sWriteFuncData.pBuffer);
     curl_easy_cleanup(hCurlHandle);
 
-    CachedFileProp* cachedFileProp = poFS->GetCachedFileProp(m_pszURL);
-    cachedFileProp->bHasComputedFileSize = true;
-    cachedFileProp->fileSize = fileSize;
-    cachedFileProp->eExists = eExists;
-    cachedFileProp->bIsDirectory = bIsDirectory;
-    cachedFileProp->mTime = mTime;
+    oFileProp.bHasComputedFileSize = true;
+    poFS->SetCachedFileProp(m_pszURL, oFileProp);
 
-    return fileSize;
+    return oFileProp.fileSize;
 }
 
 /************************************************************************/
@@ -1007,8 +1003,8 @@ bool VSIWebHDFSHandle::DownloadRegion( const vsi_l_offset startOffset,
     if( bInterrupted && bStopOnInterruptUntilUninstall )
         return false;
 
-    CachedFileProp* cachedFileProp = poFS->GetCachedFileProp(m_pszURL);
-    if( cachedFileProp->eExists == EXIST_NO )
+    poFS->GetCachedFileProp(m_pszURL, oFileProp);
+    if( oFileProp.eExists == EXIST_NO )
         return false;
 
     CURLM* hCurlMultiHandle = poFS->GetCurlMultiHandleFor(m_pszURL);
@@ -1142,18 +1138,20 @@ bool VSIWebHDFSHandle::DownloadRegion( const vsi_l_offset startOffset,
             CPLError(CE_Failure, CPLE_AppDefined, "%d: %s",
                         static_cast<int>(response_code), szCurlErrBuf);
         }
-        if( !bHasComputedFileSize && startOffset == 0 )
+        if( !oFileProp.bHasComputedFileSize && startOffset == 0 )
         {
-            cachedFileProp->bHasComputedFileSize = bHasComputedFileSize = true;
-            cachedFileProp->fileSize = fileSize = 0;
-            cachedFileProp->eExists = eExists = EXIST_NO;
+            oFileProp.bHasComputedFileSize = true;
+            oFileProp.fileSize = 0;
+            oFileProp.eExists = EXIST_NO;
+            poFS->SetCachedFileProp(m_pszURL, oFileProp);
         }
         CPLFree(sWriteFuncData.pBuffer);
         curl_easy_cleanup(hCurlHandle);
         return false;
     }
 
-    cachedFileProp->eExists = eExists = EXIST_YES;
+    oFileProp.eExists = EXIST_YES;
+    poFS->SetCachedFileProp(m_pszURL, oFileProp);
 
     DownloadRegionPostProcess(startOffset, nBlocks,
                               sWriteFuncData.pBuffer,

From cb821a92861d602e5d9883b77a54e1c954362ac8 Mon Sep 17 00:00:00 2001
From: Even Rouault <even.rouault@spatialys.com>
Date: Thu, 8 Nov 2018 12:03:45 +0100
Subject: [PATCH 036/488] /vsicurl/ and derived: implement a LRU cache for
 directory content listing

---
 gdal/port/cpl_mem_cache.h       |  10 +++
 gdal/port/cpl_vsil_curl.cpp     | 144 ++++++++++++++++++++++----------
 gdal/port/cpl_vsil_curl_class.h |  25 +++---
 3 files changed, 121 insertions(+), 58 deletions(-)

diff --git a/gdal/port/cpl_mem_cache.h b/gdal/port/cpl_mem_cache.h
index 264eb6650c08..3721fd224070 100644
--- a/gdal/port/cpl_mem_cache.h
+++ b/gdal/port/cpl_mem_cache.h
@@ -172,6 +172,16 @@ class Cache {
     return cache_.find(k) != cache_.end();
   }
 
+  bool getOldestEntry(Key& kOut, Value& vOut) {
+    Guard g(lock_);
+    if( keys_.empty() ) {
+        return false;
+    }
+    kOut = keys_.back().key;
+    vOut = keys_.back().value;
+    return true;
+  }
+
   size_t getMaxSize() const { return maxSize_; }
   size_t getElasticity() const { return elasticity_; }
   size_t getMaxAllowedSize() const { return maxSize_ + elasticity_; }
diff --git a/gdal/port/cpl_vsil_curl.cpp b/gdal/port/cpl_vsil_curl.cpp
index e4af0455e10d..0987d064cc61 100644
--- a/gdal/port/cpl_vsil_curl.cpp
+++ b/gdal/port/cpl_vsil_curl.cpp
@@ -2283,7 +2283,8 @@ int       VSICurlHandle::Close()
 
 VSICurlFilesystemHandler::VSICurlFilesystemHandler():
     oRegionCache{static_cast<size_t>(N_MAX_REGIONS)},
-    oCacheFileProp{1024}
+    oCacheFileProp{1024},
+    oCacheDirList{1024, 0}
 {
 }
 
@@ -2410,6 +2411,73 @@ VSICurlFilesystemHandler::SetCachedFileProp( const char* pszURL,
     oCacheFileProp.insert(std::string(pszURL), oFileProp);
 }
 
+/************************************************************************/
+/*                         GetCachedDirList()                           */
+/************************************************************************/
+
+bool
+VSICurlFilesystemHandler::GetCachedDirList( const char* pszURL,
+                                            CachedDirList& oCachedDirList )
+{
+    CPLMutexHolder oHolder( &hMutex );
+
+    return oCacheDirList.tryGet(std::string(pszURL), oCachedDirList);
+}
+
+/************************************************************************/
+/*                         SetCachedDirList()                           */
+/************************************************************************/
+
+void
+VSICurlFilesystemHandler::SetCachedDirList( const char* pszURL,
+                                            const CachedDirList& oCachedDirList )
+{
+    CPLMutexHolder oHolder( &hMutex );
+
+    std::string key(pszURL);
+    CachedDirList oldValue;
+    if( oCacheDirList.tryGet(key, oldValue) )
+    {
+        nCachedFilesInDirList -= oldValue.oFileList.size();
+        oCacheDirList.remove(key);
+    }
+
+    while( (!oCacheDirList.empty() &&
+            nCachedFilesInDirList + oCachedDirList.oFileList.size() > 1024 * 1024) ||
+            oCacheDirList.size() == oCacheDirList.getMaxAllowedSize() )
+    {
+        std::string oldestKey;
+        oCacheDirList.getOldestEntry(oldestKey, oldValue);
+        nCachedFilesInDirList -= oldValue.oFileList.size();
+        oCacheDirList.remove(oldestKey);
+    }
+
+    nCachedFilesInDirList += oCachedDirList.oFileList.size();
+    oCacheDirList.insert(key, oCachedDirList);
+}
+
+/************************************************************************/
+/*                        ExistsInCacheDirList()                        */
+/************************************************************************/
+
+bool VSICurlFilesystemHandler::ExistsInCacheDirList(
+                            const CPLString& osDirname, bool *pbIsDir )
+{
+    CachedDirList cachedDirList;
+    if( GetCachedDirList(osDirname, cachedDirList) )
+    {
+        if( pbIsDir )
+            *pbIsDir = !cachedDirList.oFileList.empty();
+        return false;
+    }
+    else
+    {
+        if( pbIsDir )
+            *pbIsDir = false;
+        return false;
+    }
+}
+
 /************************************************************************/
 /*                        InvalidateCachedData()                        */
 /************************************************************************/
@@ -2447,15 +2515,8 @@ void VSICurlFilesystemHandler::ClearCache()
 
     oCacheFileProp.clear();
 
-    std::map<CPLString, CachedDirList*>::const_iterator iterCacheDirList;
-    for( iterCacheDirList = cacheDirList.begin();
-         iterCacheDirList != cacheDirList.end();
-         ++iterCacheDirList )
-    {
-        CSLDestroy(iterCacheDirList->second->papszFileList);
-        CPLFree(iterCacheDirList->second);
-    }
-    cacheDirList.clear();
+    oCacheDirList.clear();
+    nCachedFilesInDirList = 0;
 
     std::map<GIntBig, CachedConnection*>::const_iterator iterConnections;
     for( iterConnections = mapConnections.begin();
@@ -2504,19 +2565,21 @@ void VSICurlFilesystemHandler::PartialClearCache(const char* pszFilenamePrefix)
             oCacheFileProp.remove(key);
     }
 
-    auto iterCacheDirList = cacheDirList.begin();
-    const size_t nLen = strlen(pszFilenamePrefix);
-    while( iterCacheDirList != cacheDirList.end() )
     {
-        auto iter = iterCacheDirList;
-        auto nextiter = ++iterCacheDirList;
-        if( strncmp(iter->first.c_str(), pszFilenamePrefix, nLen) == 0 )
+        const size_t nLen = strlen(pszFilenamePrefix);
+        std::list<std::string> keysToRemove;
+        auto lambda = [this, &keysToRemove, pszFilenamePrefix, nLen](
+            const lru11::KeyValuePair<std::string, CachedDirList>& kv)
         {
-            CSLDestroy(iter->second->papszFileList);
-            CPLFree(iter->second);
-            cacheDirList.erase(iter);
-        }
-        iterCacheDirList = nextiter;
+            if( strncmp(kv.key.c_str(), pszFilenamePrefix, nLen) == 0 )
+            {
+                keysToRemove.push_back(kv.key);
+                nCachedFilesInDirList -= kv.value.oFileList.size();
+            }
+        };
+        oCacheDirList.cwalk(lambda);
+        for( auto& key: keysToRemove )
+            oCacheDirList.remove(key);
     }
 }
 
@@ -3305,14 +3368,12 @@ VSICurlFilesystemHandler::GetURLFromFilename( const CPLString& osFilename )
 
 void VSICurlFilesystemHandler::RegisterEmptyDir( const CPLString& osDirname )
 {
-    CPLMutexHolder oHolder( &hMutex );
-    CachedDirList* psCachedDirList = cacheDirList[osDirname];
-    if( psCachedDirList == nullptr )
+    CachedDirList cachedDirList;
+    if( !GetCachedDirList(osDirname, cachedDirList) )
     {
-        psCachedDirList =
-            static_cast<CachedDirList *>(CPLMalloc(sizeof(CachedDirList)));
-        psCachedDirList->papszFileList = CSLAddString(nullptr, ".");
-        cacheDirList[osDirname] = psCachedDirList;
+        cachedDirList.bGotFileList = true;
+        cachedDirList.oFileList.AddString(".");
+        SetCachedDirList(osDirname, cachedDirList);
     }
 }
 
@@ -3787,21 +3848,19 @@ char** VSICurlFilesystemHandler::ReadDirInternal( const char *pszDirname,
         }
     }
 
-    CachedDirList* psCachedDirList = cacheDirList[osDirname];
-    if( psCachedDirList == nullptr )
+    CachedDirList cachedDirList;
+    if( !GetCachedDirList(osDirname, cachedDirList) )
     {
-        psCachedDirList =
-            static_cast<CachedDirList *>(CPLMalloc(sizeof(CachedDirList)));
-        psCachedDirList->papszFileList =
+        cachedDirList.oFileList.Assign(
             GetFileList(osDirname, nMaxFiles,
-                        &psCachedDirList->bGotFileList);
-        cacheDirList[osDirname] = psCachedDirList;
+                        &cachedDirList.bGotFileList), true);
+        SetCachedDirList(osDirname, cachedDirList);
     }
 
     if( pbGotFileList )
-        *pbGotFileList = psCachedDirList->bGotFileList;
+        *pbGotFileList = cachedDirList.bGotFileList;
 
-    return CSLDuplicate(psCachedDirList->papszFileList);
+    return CSLDuplicate(cachedDirList.oFileList.List());
 }
 
 /************************************************************************/
@@ -3811,13 +3870,12 @@ char** VSICurlFilesystemHandler::ReadDirInternal( const char *pszDirname,
 void VSICurlFilesystemHandler::InvalidateDirContent( const char *pszDirname )
 {
     CPLMutexHolder oHolder( &hMutex );
-    std::map<CPLString, CachedDirList*>::iterator oIter =
-        cacheDirList.find(pszDirname);
-    if( oIter != cacheDirList.end() )
+
+    CachedDirList oCachedDirList;
+    if( oCacheDirList.tryGet(std::string(pszDirname), oCachedDirList) )
     {
-        CSLDestroy( oIter->second->papszFileList );
-        CPLFree( oIter->second );
-        cacheDirList.erase(oIter);
+        nCachedFilesInDirList -= oCachedDirList.oFileList.size();
+        oCacheDirList.remove(std::string(pszDirname));
     }
 }
 
diff --git a/gdal/port/cpl_vsil_curl_class.h b/gdal/port/cpl_vsil_curl_class.h
index e65e03698333..94570bb51deb 100644
--- a/gdal/port/cpl_vsil_curl_class.h
+++ b/gdal/port/cpl_vsil_curl_class.h
@@ -81,8 +81,8 @@ class FileProp
 
 typedef struct
 {
-    bool            bGotFileList;
-    char**          papszFileList; /* only file name without path */
+    bool            bGotFileList = false;
+    CPLStringList   oFileList{}; /* only file name without path */
 } CachedDirList;
 
 typedef struct
@@ -160,7 +160,8 @@ class VSICurlFilesystemHandler : public VSIFilesystemHandler
 
     lru11::Cache<std::string, FileProp>  oCacheFileProp;
 
-    std::map<CPLString, CachedDirList*>        cacheDirList{};
+    int                                       nCachedFilesInDirList = 0;
+    lru11::Cache<std::string, CachedDirList>  oCacheDirList;
 
     // Per-thread Curl connection cache.
     std::map<GIntBig, CachedConnection*> mapConnections{};
@@ -260,18 +261,12 @@ class VSICurlFilesystemHandler : public VSIFilesystemHandler
     virtual void        ClearCache();
     virtual void        PartialClearCache(const char* pszFilename);
 
-    bool ExistsInCacheDirList( const CPLString& osDirname, bool *pbIsDir )
-    {
-        CPLMutexHolder oHolder( &hMutex );
-        std::map<CPLString, CachedDirList*>::const_iterator oIter =
-            cacheDirList.find(osDirname);
-        if( pbIsDir )
-        {
-            *pbIsDir = oIter != cacheDirList.end() &&
-                       oIter->second->papszFileList != nullptr;
-        }
-        return oIter != cacheDirList.end();
-    }
+
+    bool                GetCachedDirList( const char* pszURL,
+                                          CachedDirList& oCachedDirList );
+    void                SetCachedDirList( const char* pszURL,
+                                          const CachedDirList& oCachedDirList );
+    bool ExistsInCacheDirList( const CPLString& osDirname, bool *pbIsDir );
 
 };
 

From 17716b33ff9646d0da3c7d7d81194dfbd26ad526 Mon Sep 17 00:00:00 2001
From: Even Rouault <even.rouault@spatialys.com>
Date: Thu, 8 Nov 2018 12:34:08 +0100
Subject: [PATCH 037/488] Windows build: add support for JPEGLS driver (derived
 from contribution by @arturredzko, fixes #1078)

---
 gdal/frmts/jpegls/makefile.vc | 15 +++++++++++++++
 gdal/frmts/makefile.vc        |  4 ++++
 gdal/nmake.opt                |  8 +++++++-
 3 files changed, 26 insertions(+), 1 deletion(-)
 create mode 100644 gdal/frmts/jpegls/makefile.vc

diff --git a/gdal/frmts/jpegls/makefile.vc b/gdal/frmts/jpegls/makefile.vc
new file mode 100644
index 000000000000..aa1f7eeaff81
--- /dev/null
+++ b/gdal/frmts/jpegls/makefile.vc
@@ -0,0 +1,15 @@
+GDAL_ROOT = ..\..
+
+!INCLUDE $(GDAL_ROOT)\nmake.opt
+
+OBJ	= jpeglsdataset.obj
+
+EXTRAFLAGS = -I.. -I..\.. $(CHARLS_INC) $(CHARLS_FLAGS)
+
+default:	$(OBJ)
+	xcopy /D  /Y *.obj ..\o
+	cd ..
+	
+clean:
+	-del *.obj
+	cd ..
diff --git a/gdal/frmts/makefile.vc b/gdal/frmts/makefile.vc
index 37e559923853..3e6544caf4ee 100644
--- a/gdal/frmts/makefile.vc
+++ b/gdal/frmts/makefile.vc
@@ -199,6 +199,10 @@ PLUGINFLAGS	=	$(PLUGINFLAGS) -DFRMT_kea
 EXTRAFLAGS	=	$(EXTRAFLAGS) -DFRMT_mrf
 !ENDIF
 
+!IFDEF CHARLS_LIB
+EXTRAFLAGS	=	$(EXTRAFLAGS) -DFRMT_jpegls
+!ENDIF
+
 default:	o\gdalallregister.obj subdirs
 
 list:
diff --git a/gdal/nmake.opt b/gdal/nmake.opt
index 1eb049038c8f..1d3038336020 100644
--- a/gdal/nmake.opt
+++ b/gdal/nmake.opt
@@ -785,6 +785,12 @@ ADD_LIBS	=
 HAVE_LERC=1
 !ENDIF
 
+# Comment out the following if you want to build JPEGLS with CHARLS support
+#CHARLS_INC=-IE:\work\GIS\gdal\supportlibs\charls\include\
+#CHARLS_LIB=e:\work\GIS\gdal\supportlibs\charls\bin\Release\x86\CharLS.lib
+# Comment out for API 2.x:
+#CHARLS_FLAGS = -DCHARLS_2
+
 ########### END OF STUFF THAT NORMALLY NEEDS TO BE UPDATED ##################
 
 
@@ -979,5 +985,5 @@ EXTERNAL_LIBS =	$(OGDILIB) $(XERCES_LIB) $(EXPAT_LIB) $(OCI_LIB) $(PG_LIB) \
 	$(ODBCLIB) $(JASPER_LIB) $(PNG_LIB) $(ZLIB_LIB) $(ADD_LIBS) $(OPENJPEG_LIB) \
 	$(MRSID_LIDAR_LIB) $(LIBKML_LIBS) $(SOSI_LIBS) $(PDF_LIB_LINK) $(LZMA_LIBS) $(ZSTD_LIBS) \
 	$(LIBICONV_LIBRARY) $(WEBP_LIBS) $(FGDB_LIB_LINK) $(FREEXL_LIBS) $(GTA_LIBS) \
-	$(INGRES_LIB) $(LIBXML2_LIB) $(PCRE_LIB) $(MONGODB_LIB_LINK) $(CRYPTOPP_LIB) $(OPENSSL_LIB) ws2_32.lib \
+	$(INGRES_LIB) $(LIBXML2_LIB) $(PCRE_LIB) $(MONGODB_LIB_LINK) $(CRYPTOPP_LIB) $(OPENSSL_LIB) $(CHARLS_LIB) ws2_32.lib \
     kernel32.lib psapi.lib

From ce2f3d8c7412aeb9186edf42bc8677a3f60633de Mon Sep 17 00:00:00 2001
From: Even Rouault <even.rouault@spatialys.com>
Date: Thu, 8 Nov 2018 14:27:56 +0100
Subject: [PATCH 038/488] /vsis3/: ignores files with GLACIER storage class in
 directory listing, unless CPL_VSIL_CURL_IGNORE_GLACIER_STORAGE=NO

---
 autotest/gcore/vsis3.py                | 37 ++++++++++++++++++++++++++
 gdal/doc/gdal_virtual_file_systems.dox |  4 +++
 gdal/port/cpl_vsil_curl.cpp            |  8 +++++-
 gdal/port/cpl_vsil_curl_class.h        |  1 +
 gdal/port/cpl_vsil_s3.cpp              | 20 ++++++++++----
 5 files changed, 64 insertions(+), 6 deletions(-)

diff --git a/autotest/gcore/vsis3.py b/autotest/gcore/vsis3.py
index 74dfa3cedf8c..49019076ed9f 100755
--- a/autotest/gcore/vsis3.py
+++ b/autotest/gcore/vsis3.py
@@ -735,6 +735,12 @@ def method(request):
                     <LastModified>2015-10-16T12:34:56.000Z</LastModified>
                     <Size>456789</Size>
                 </Contents>
+                <Contents>
+                    <Key>a_dir/i_am_a_glacier_file</Key>
+                    <LastModified>2015-10-16T12:34:56.000Z</LastModified>
+                    <Size>456789</Size>
+                     <StorageClass>GLACIER</StorageClass>
+                </Contents>
                 <CommonPrefixes>
                     <Prefix>a_dir/subdir/</Prefix>
                 </CommonPrefixes>
@@ -764,6 +770,7 @@ def method(request):
         gdaltest.post_reason('fail')
         print(dir_contents)
         return 'fail'
+
     if gdal.VSIStatL('/vsis3/s3_fake_bucket2/a_dir/resource3.bin').size != 123456:
         gdaltest.post_reason('fail')
         return 'fail'
@@ -825,6 +832,36 @@ def method(request):
         print(dir_contents)
         return 'fail'
 
+    gdal.VSICurlClearCache()
+    handler = webserver.SequentialHandler()
+    handler.add('GET', '/s3_fake_bucket2/?delimiter=%2F&prefix=a_dir%2F', 200, {},
+        """<?xml version="1.0" encoding="UTF-8"?>
+            <ListBucketResult>
+                <Prefix>a_dir/</Prefix>
+                <Contents>
+                    <Key>a_dir/resource4.bin</Key>
+                    <LastModified>2015-10-16T12:34:56.000Z</LastModified>
+                    <Size>456789</Size>
+                </Contents>
+                <Contents>
+                    <Key>a_dir/i_am_a_glacier_file</Key>
+                    <LastModified>2015-10-16T12:34:56.000Z</LastModified>
+                    <Size>456789</Size>
+                     <StorageClass>GLACIER</StorageClass>
+                </Contents>
+                <CommonPrefixes>
+                    <Prefix>a_dir/subdir/</Prefix>
+                </CommonPrefixes>
+            </ListBucketResult>
+        """)
+    with gdaltest.config_option('CPL_VSIL_CURL_IGNORE_GLACIER_STORAGE', 'NO'):
+        with webserver.install_http_handler(handler):
+            dir_contents = gdal.ReadDir('/vsis3/s3_fake_bucket2/a_dir')
+    if dir_contents != ['resource4.bin', 'i_am_a_glacier_file', 'subdir']:
+        gdaltest.post_reason('fail')
+        print(dir_contents)
+        return 'fail'
+
 
     # Test CPL_VSIL_CURL_NON_CACHED
     for config_option_value in ['/vsis3/s3_non_cached/test.txt',
diff --git a/gdal/doc/gdal_virtual_file_systems.dox b/gdal/doc/gdal_virtual_file_systems.dox
index a78ca6a5b18f..c8b40f743545 100644
--- a/gdal/doc/gdal_virtual_file_systems.dox
+++ b/gdal/doc/gdal_virtual_file_systems.dox
@@ -439,6 +439,10 @@ storage. You'll have to abort yourself with other means such "ghost" uploads
 files smaller than the chunk size, a simple PUT request is used instead of
 the multipart upload API.
 
+Since GDAL 2.4, when listing a directory, files with GLACIER storage class are
+ignored unless the CPL_VSIL_CURL_IGNORE_GLACIER_STORAGE configuration option
+is set to NO.
+
 @since GDAL 2.1
 
 \subsection gdal_virtual_file_systems_vsis3_streaming /vsis3_streaming/ (AWS S3 files: streaming)
diff --git a/gdal/port/cpl_vsil_curl.cpp b/gdal/port/cpl_vsil_curl.cpp
index a1d7fdb3d330..ea9677ab3a63 100644
--- a/gdal/port/cpl_vsil_curl.cpp
+++ b/gdal/port/cpl_vsil_curl.cpp
@@ -2614,7 +2614,10 @@ const char* VSICurlFilesystemHandler::GetActualURL(const char* pszFilename)
         "file' default='16384' min='1024' max='10485760'/>" \
     "  <Option name='CPL_VSIL_CURL_CACHE_SIZE' type='integer' " \
         "description='Size in bytes of the global /vsicurl/ cache' " \
-        "default='16384000'/>"
+        "default='16384000'/>" \
+    "  <Option name='CPL_VSIL_CURL_IGNORE_GLACIER_STORAGE' type='boolean' " \
+        "description='Whether to skip files with Glacier storage class in " \
+        "directory listing.' default='YES'/>"
 
 const char* VSICurlFilesystemHandler::GetOptionsStatic()
 {
@@ -3584,10 +3587,13 @@ char** VSICurlFilesystemHandler::GetFileList(const char *pszDirname,
             CPLString osBaseURL(pszDirname);
             osBaseURL += "/";
             bool bIsTruncated = true;
+            const bool bIgnoreGlacier = CPLTestBool(
+                CPLGetConfigOption("CPL_VSIL_CURL_IGNORE_GLACIER_STORAGE", "YES"));
             AnalyseS3FileList( osBaseURL,
                                sWriteFuncData.pBuffer,
                                osFileList,
                                nMaxFiles,
+                               bIgnoreGlacier,
                                bIsTruncated,
                                osNextMarker );
             // If the list is truncated, then don't report it.
diff --git a/gdal/port/cpl_vsil_curl_class.h b/gdal/port/cpl_vsil_curl_class.h
index e05386693443..edd87651b0c5 100644
--- a/gdal/port/cpl_vsil_curl_class.h
+++ b/gdal/port/cpl_vsil_curl_class.h
@@ -184,6 +184,7 @@ class VSICurlFilesystemHandler : public VSIFilesystemHandler
                             const char* pszXML,
                             CPLStringList& osFileList,
                             int nMaxFiles,
+                            bool bIgnoreGlacierStorageClass,
                             bool& bIsTruncated,
                             CPLString& osNextMarker );
 
diff --git a/gdal/port/cpl_vsil_s3.cpp b/gdal/port/cpl_vsil_s3.cpp
index 1dd96c7f92bf..2755f1e8f4e9 100644
--- a/gdal/port/cpl_vsil_s3.cpp
+++ b/gdal/port/cpl_vsil_s3.cpp
@@ -68,8 +68,9 @@ void VSICurlFilesystemHandler::AnalyseS3FileList(
     const char* pszXML,
     CPLStringList& osFileList,
     int nMaxFiles,
+    bool bIgnoreGlacierStorageClass,
     bool& bIsTruncated,
-    CPLString& osNextMarker )
+    CPLString& osNextMarker)
 {
 #if DEBUG_VERBOSE
     CPLDebug("S3", "%s", pszXML);
@@ -135,10 +136,16 @@ void VSICurlFilesystemHandler::AnalyseS3FileList(
                                 CPLYMDHMSToUnixTime(&brokendowntime));
                     }
 
-                    aoProps.push_back(
-                        std::pair<CPLString, CachedFileProp>
-                            (pszKey + osPrefix.size(), prop));
-                    aoNameCount[pszKey + osPrefix.size()] ++;
+                    const char* pszStorageClass = CPLGetXMLValue(psIter,
+                        "StorageClass", "");
+                    if( !bIgnoreGlacierStorageClass ||
+                        !EQUAL(pszStorageClass, "GLACIER") )
+                    {
+                        aoProps.push_back(
+                            std::pair<CPLString, CachedFileProp>
+                                (pszKey + osPrefix.size(), prop));
+                        aoNameCount[pszKey + osPrefix.size()] ++;
+                    }
                 }
             }
             else if( strcmp(psIter->pszValue, "CommonPrefixes") == 0 )
@@ -1765,10 +1772,13 @@ char** IVSIS3LikeFSHandler::GetFileList( const char *pszDirname,
         {
             *pbGotFileList = true;
             bool bIsTruncated;
+            const bool bIgnoreGlacier = CPLTestBool(
+                CPLGetConfigOption("CPL_VSIL_CURL_IGNORE_GLACIER_STORAGE", "YES"));
             AnalyseS3FileList( osBaseURL,
                                sWriteFuncData.pBuffer,
                                osFileList,
                                nMaxFiles,
+                               bIgnoreGlacier,
                                bIsTruncated,
                                osNextMarker );
 

From 76350672fc9a56831de6959565db30e097b70453 Mon Sep 17 00:00:00 2001
From: Even Rouault <even.rouault@spatialys.com>
Date: Thu, 8 Nov 2018 15:48:13 +0100
Subject: [PATCH 039/488] Add link to HTML coverage output [ci skip]

---
 README.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/README.md b/README.md
index 54a01ae3a520..faa05cbb494b 100644
--- a/README.md
+++ b/README.md
@@ -4,6 +4,7 @@ GDAL - Geospatial Data Abstraction Library
 [![Build Status](https://travis-ci.com/OSGeo/gdal.svg?branch=master)](https://travis-ci.com/OSGeo/gdal)
 [![Build status](https://ci.appveyor.com/api/projects/status/jtwx0pcr0y01i17p/branch/master?svg=true)](https://ci.appveyor.com/project/OSGeo/gdal)
 [![Build Status](https://scan.coverity.com/projects/749/badge.svg?flat=1)](https://scan.coverity.com/projects/gdal)
+[gdalautotest coverage](https://gdalautotest-coverage-results.github.io/coverage_html/index.html)
 
 | Tested configurations    |
 | ------------------------ |

From bff80e11c18245431aae31d647d16a3f18831b8e Mon Sep 17 00:00:00 2001
From: Even Rouault <even.rouault@spatialys.com>
Date: Thu, 8 Nov 2018 12:28:46 +0100
Subject: [PATCH 040/488] /vsicurl/: make GetCurlMultiHandleFor() more
 thread-safe

---
 gdal/port/cpl_vsil_curl.cpp     | 59 ++++++++++++++++++++++-----------
 gdal/port/cpl_vsil_curl_class.h |  8 -----
 2 files changed, 40 insertions(+), 27 deletions(-)

diff --git a/gdal/port/cpl_vsil_curl.cpp b/gdal/port/cpl_vsil_curl.cpp
index 0987d064cc61..c4cccdbf7cf8 100644
--- a/gdal/port/cpl_vsil_curl.cpp
+++ b/gdal/port/cpl_vsil_curl.cpp
@@ -2288,13 +2288,47 @@ VSICurlFilesystemHandler::VSICurlFilesystemHandler():
 {
 }
 
+/************************************************************************/
+/*                           CachedConnection                           */
+/************************************************************************/
+
+struct CachedConnection
+{
+    CURLM          *hCurlMultiHandle = nullptr;
+    void            clear();
+
+    ~CachedConnection() { clear(); }
+};
+
+// Per-thread and per-filesystem Curl connection cache.
+static thread_local std::map<VSICurlFilesystemHandler*, CachedConnection> cachedConnection;
+
+/************************************************************************/
+/*                              clear()                                 */
+/************************************************************************/
+
+void CachedConnection::clear()
+{
+    if( hCurlMultiHandle )
+    {
+        curl_multi_cleanup(hCurlMultiHandle);
+        hCurlMultiHandle = nullptr;
+    }
+}
+
 /************************************************************************/
 /*                  ~VSICurlFilesystemHandler()                         */
 /************************************************************************/
 
+extern "C" int CPL_DLL GDALIsInGlobalDestructor();
+
 VSICurlFilesystemHandler::~VSICurlFilesystemHandler()
 {
     VSICurlFilesystemHandler::ClearCache();
+    if( !GDALIsInGlobalDestructor() )
+    {
+        cachedConnection.erase(this);
+    }
 
     if( hMutex != nullptr )
         CPLDestroyMutex( hMutex );
@@ -2328,20 +2362,12 @@ bool VSICurlFilesystemHandler::AllowCachedDataFor(const char* pszFilename)
 
 CURLM* VSICurlFilesystemHandler::GetCurlMultiHandleFor(const CPLString& /*osURL*/)
 {
-    CPLMutexHolder oHolder( &hMutex );
-
-    std::map<GIntBig, CachedConnection*>::const_iterator iterConnections =
-        mapConnections.find(CPLGetPID());
-    if( iterConnections == mapConnections.end() )
+    auto& conn = cachedConnection[this];
+    if( conn.hCurlMultiHandle == nullptr )
     {
-        CURLM* hCurlMultiHandle = curl_multi_init();
-        CachedConnection* psCachedConnection = new CachedConnection;
-        psCachedConnection->hCurlMultiHandle = hCurlMultiHandle;
-        mapConnections[CPLGetPID()] = psCachedConnection;
-        return hCurlMultiHandle;
+        conn.hCurlMultiHandle = curl_multi_init();
     }
-
-    return iterConnections->second->hCurlMultiHandle;
+    return conn.hCurlMultiHandle;
 }
 
 /************************************************************************/
@@ -2518,15 +2544,10 @@ void VSICurlFilesystemHandler::ClearCache()
     oCacheDirList.clear();
     nCachedFilesInDirList = 0;
 
-    std::map<GIntBig, CachedConnection*>::const_iterator iterConnections;
-    for( iterConnections = mapConnections.begin();
-         iterConnections != mapConnections.end();
-         ++iterConnections )
+    if( !GDALIsInGlobalDestructor() )
     {
-        curl_multi_cleanup(iterConnections->second->hCurlMultiHandle);
-        delete iterConnections->second;
+        cachedConnection[this].clear();
     }
-    mapConnections.clear();
 }
 
 /************************************************************************/
diff --git a/gdal/port/cpl_vsil_curl_class.h b/gdal/port/cpl_vsil_curl_class.h
index 94570bb51deb..7662bb5854fd 100644
--- a/gdal/port/cpl_vsil_curl_class.h
+++ b/gdal/port/cpl_vsil_curl_class.h
@@ -112,11 +112,6 @@ typedef struct
 /*                     VSICurlFilesystemHandler                         */
 /************************************************************************/
 
-typedef struct
-{
-    CURLM          *hCurlMultiHandle;
-} CachedConnection;
-
 class VSICurlHandle;
 
 class VSICurlFilesystemHandler : public VSIFilesystemHandler
@@ -163,9 +158,6 @@ class VSICurlFilesystemHandler : public VSIFilesystemHandler
     int                                       nCachedFilesInDirList = 0;
     lru11::Cache<std::string, CachedDirList>  oCacheDirList;
 
-    // Per-thread Curl connection cache.
-    std::map<GIntBig, CachedConnection*> mapConnections{};
-
     char**              ParseHTMLFileList(const char* pszFilename,
                                           int nMaxFiles,
                                           char* pszData,

From d461b1b94c52c479b0ae1f68b1674b90703fcf8f Mon Sep 17 00:00:00 2001
From: Even Rouault <even.rouault@spatialys.com>
Date: Thu, 8 Nov 2018 13:25:52 +0100
Subject: [PATCH 041/488] /vsicurl/: increase file property cache to 100K
 entries

---
 gdal/port/cpl_vsil_curl.cpp     | 2 +-
 gdal/port/cpl_vsil_curl_class.h | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/gdal/port/cpl_vsil_curl.cpp b/gdal/port/cpl_vsil_curl.cpp
index c4cccdbf7cf8..90f73420f2b1 100644
--- a/gdal/port/cpl_vsil_curl.cpp
+++ b/gdal/port/cpl_vsil_curl.cpp
@@ -2283,7 +2283,7 @@ int       VSICurlHandle::Close()
 
 VSICurlFilesystemHandler::VSICurlFilesystemHandler():
     oRegionCache{static_cast<size_t>(N_MAX_REGIONS)},
-    oCacheFileProp{1024},
+    oCacheFileProp{100 * 1024},
     oCacheDirList{1024, 0}
 {
 }
diff --git a/gdal/port/cpl_vsil_curl_class.h b/gdal/port/cpl_vsil_curl_class.h
index 7662bb5854fd..1640fc72c038 100644
--- a/gdal/port/cpl_vsil_curl_class.h
+++ b/gdal/port/cpl_vsil_curl_class.h
@@ -70,13 +70,13 @@ class FileProp
 {
   public:
     ExistStatus     eExists = EXIST_UNKNOWN;
-    bool            bHasComputedFileSize = false;
     vsi_l_offset    fileSize = 0;
-    bool            bIsDirectory = false;
     time_t          mTime = 0;
-    bool            bS3LikeRedirect = false;
     time_t          nExpireTimestampLocal = 0;
     CPLString       osRedirectURL{};
+    bool            bHasComputedFileSize = false;
+    bool            bIsDirectory = false;
+    bool            bS3LikeRedirect = false;
 };
 
 typedef struct

From e4661ea5eea29da9f65b82f2125bb843c8a635bb Mon Sep 17 00:00:00 2001
From: drons <drons@list.ru>
Date: Thu, 8 Nov 2018 21:04:58 +0300
Subject: [PATCH 042/488] PRF: Add raster size check to prevent division by
 zero

---
 gdal/frmts/prf/phprfdataset.cpp | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/gdal/frmts/prf/phprfdataset.cpp b/gdal/frmts/prf/phprfdataset.cpp
index 656d47989e49..445a02a0f112 100644
--- a/gdal/frmts/prf/phprfdataset.cpp
+++ b/gdal/frmts/prf/phprfdataset.cpp
@@ -605,7 +605,8 @@ GDALDataset* PhPrfDataset::Open( GDALOpenInfo* poOpenInfo )
         }
 
         if( abDemMetadataOk[0] && abDemMetadataOk[1] &&
-            abDemMetadataOk[2] && abDemMetadataOk[3] )
+            abDemMetadataOk[2] && abDemMetadataOk[3] &&
+            nSizeX > 1 && nSizeY > 1)
         {
             adfGeoTrans[0] = adfDemMetadata[0];
             adfGeoTrans[1] = (adfDemMetadata[1] - adfDemMetadata[0])/(nSizeX - 1);

From 6f53541c320a1be7e180f28cf2583182b90e8c3d Mon Sep 17 00:00:00 2001
From: Craig de Stigter <craig.destigter@koordinates.com>
Date: Fri, 9 Nov 2018 10:43:35 +1300
Subject: [PATCH 043/488] CI tweaks (ubuntu_1804 environment)

* The `docker` package in ubuntu isn't actually docker. Docker is preinstalled in travis.
* It was pulling one version of the docker containers for mariadb/mysql,
  and then implicitly running ':latest' (which implicitly pulled again).
  I removed the pull command since it was unnecessary.
* Consolidate some apt-get installs to save a couple seconds
---
 gdal/ci/travis/ubuntu_1804/before_install.sh | 13 ++++---------
 1 file changed, 4 insertions(+), 9 deletions(-)

diff --git a/gdal/ci/travis/ubuntu_1804/before_install.sh b/gdal/ci/travis/ubuntu_1804/before_install.sh
index 11d1236ee478..4ae4b85668e1 100755
--- a/gdal/ci/travis/ubuntu_1804/before_install.sh
+++ b/gdal/ci/travis/ubuntu_1804/before_install.sh
@@ -5,7 +5,7 @@ set -e
 export chroot="$PWD"/bionic
 mkdir -p "$chroot$PWD"
 sudo apt-get update
-sudo apt-get install -y debootstrap libcap2-bin dpkg docker
+sudo apt-get install -y debootstrap libcap2-bin dpkg
 
 # MSSQL: server side
 docker pull microsoft/mssql-server-linux:2017-latest
@@ -14,12 +14,10 @@ sleep 10
 docker exec -it sql1 /opt/mssql-tools/bin/sqlcmd -l 30 -S localhost -U SA -P DummyPassw0rd -Q "CREATE DATABASE TestDB;"
 
 # MySQL 8
-docker pull mysql/mysql-server:8.0.1
-docker run --name mysql1 -e MYSQL_ROOT_PASSWORD=passwd -e "MYSQL_ROOT_HOST=%" -p 33060:3306 -d mysql/mysql-server mysqld --default-authentication-plugin=mysql_native_password
+docker run --name mysql1 -e MYSQL_ROOT_PASSWORD=passwd -e "MYSQL_ROOT_HOST=%" -p 33060:3306 -d mysql/mysql-server:8.0.1 mysqld --default-authentication-plugin=mysql_native_password
 
 # MariaDB 10.3.9
-docker pull mariadb:10.3.9
-docker run --name mariadb -e MYSQL_ROOT_PASSWORD=passwd -e "MYSQL_ROOT_HOST=%" -p 33061:3306 -d mariadb
+docker run --name mariadb -e MYSQL_ROOT_PASSWORD=passwd -e "MYSQL_ROOT_HOST=%" -p 33061:3306 -d mariadb:10.3.9
 
 # PostGIS
 docker run -v /home:/home --name "postgis" -p 25432:5432 -e ALLOW_IP_RANGE=0.0.0.0/0 -d -t kartoza/postgis
@@ -46,10 +44,7 @@ sudo chroot "$chroot" apt-get update
 # postgis postgresql-9.1 postgresql-client-9.1 postgresql-9.1-postgis-2.1 postgresql-9.1-postgis-2.1-scripts libpq-dev
 sudo chroot "$chroot" apt-get install -y --allow-unauthenticated python-numpy libpng-dev libjpeg-dev libgif-dev liblzma-dev libgeos-dev libcurl4-gnutls-dev libproj-dev libxml2-dev libexpat-dev libxerces-c-dev libnetcdf-dev netcdf-bin libpoppler-dev libpoppler-private-dev libspatialite-dev gpsbabel swig libhdf4-alt-dev libhdf5-serial-dev poppler-utils libfreexl-dev unixodbc-dev libwebp-dev libepsilon-dev liblcms2-2 libpcre3-dev libcrypto++-dev libdap-dev libfyba-dev libkml-dev libmysqlclient-dev mysql-client-core-5.7 libogdi3.2-dev libcfitsio-dev openjdk-8-jdk libzstd1-dev ccache bash zip curl libpq-dev postgresql-client postgis
 # libpodofo-dev : FIXME incompatibilities at runtime with that version
-sudo chroot "$chroot" apt-get install -y doxygen texlive-latex-base
-sudo chroot "$chroot" apt-get install -y make
-sudo chroot "$chroot" apt-get install -y python-dev
-sudo chroot "$chroot" apt-get install -y g++
+sudo chroot "$chroot" apt-get install -y doxygen texlive-latex-base make python-dev g++
 #sudo chroot "$chroot" apt-get install -y --allow-unauthenticated libsfcgal-dev
 sudo chroot "$chroot" apt-get install -y --allow-unauthenticated fossil libgeotiff-dev libcharls-dev libopenjp2-7-dev libcairo2-dev
 

From 059d26ed41d7de47a6b83c2849109ddff9f83d6b Mon Sep 17 00:00:00 2001
From: Even Rouault <even.rouault@spatialys.com>
Date: Thu, 8 Nov 2018 21:17:56 +0100
Subject: [PATCH 044/488] /vsis3/: optimizations regarding stat'ing a directory

---
 autotest/gcore/vsioss.py     |  7 ++++---
 autotest/gcore/vsis3.py      | 17 ++++++++++-------
 autotest/gcore/vsiswift.py   |  4 ++--
 gdal/port/cpl_vsil_curl.cpp  | 31 ++++++++++++++++++++++++-------
 gdal/port/cpl_vsil_s3.cpp    | 27 +++++++++++++++++++++------
 gdal/port/cpl_vsil_swift.cpp |  2 +-
 6 files changed, 62 insertions(+), 26 deletions(-)

diff --git a/autotest/gcore/vsioss.py b/autotest/gcore/vsioss.py
index 3f264ea0ed8e..db5362d67164 100755
--- a/autotest/gcore/vsioss.py
+++ b/autotest/gcore/vsioss.py
@@ -852,7 +852,7 @@ def visoss_5():
 
     handler = webserver.SequentialHandler()
     handler.add('GET', '/oss_delete_bucket/delete_file', 404, {'Connection': 'close'}, 'foo')
-    handler.add('GET', '/oss_delete_bucket/?delimiter=%2F&max-keys=1&prefix=delete_file%2F', 404, {'Connection': 'close'}, 'foo')
+    handler.add('GET', '/oss_delete_bucket/?delimiter=%2F&max-keys=100&prefix=delete_file%2F', 404, {'Connection': 'close'}, 'foo')
     with webserver.install_http_handler(handler):
         if gdal.VSIStatL('/vsioss/oss_delete_bucket/delete_file') is not None:
             gdaltest.post_reason('fail')
@@ -1105,7 +1105,7 @@ def visoss_7():
 
     handler = webserver.SequentialHandler()
     handler.add('GET', '/oss_bucket_test_mkdir/dir/', 404, {'Connection': 'close'})
-    handler.add('GET', '/oss_bucket_test_mkdir/?delimiter=%2F&max-keys=1&prefix=dir%2F', 404, {'Connection': 'close'})
+    handler.add('GET', '/oss_bucket_test_mkdir/?delimiter=%2F&max-keys=100&prefix=dir%2F', 404, {'Connection': 'close'})
     handler.add('PUT', '/oss_bucket_test_mkdir/dir/', 200)
     with webserver.install_http_handler(handler):
         ret = gdal.Mkdir('/vsioss/oss_bucket_test_mkdir/dir', 0)
@@ -1133,6 +1133,7 @@ def visoss_7():
     # Try deleting already deleted directory
     handler = webserver.SequentialHandler()
     handler.add('GET', '/oss_bucket_test_mkdir/dir/', 404)
+    handler.add('GET', '/oss_bucket_test_mkdir/?delimiter=%2F&max-keys=100&prefix=dir%2F', 404, {'Connection': 'close'})
     with webserver.install_http_handler(handler):
         ret = gdal.Rmdir('/vsioss/oss_bucket_test_mkdir/dir')
     if ret == 0:
@@ -1142,7 +1143,7 @@ def visoss_7():
     # Try deleting non-empty directory
     handler = webserver.SequentialHandler()
     handler.add('GET', '/oss_bucket_test_mkdir/dir_nonempty/', 416)
-    handler.add('GET', '/oss_bucket_test_mkdir/?delimiter=%2F&max-keys=1&prefix=dir_nonempty%2F', 200,
+    handler.add('GET', '/oss_bucket_test_mkdir/?delimiter=%2F&max-keys=100&prefix=dir_nonempty%2F', 200,
                 {'Content-type': 'application/xml'},
                 """<?xml version="1.0" encoding="UTF-8"?>
                     <ListBucketResult>
diff --git a/autotest/gcore/vsis3.py b/autotest/gcore/vsis3.py
index 49019076ed9f..80651d9b267b 100755
--- a/autotest/gcore/vsis3.py
+++ b/autotest/gcore/vsis3.py
@@ -809,7 +809,7 @@ def method(request):
 
     handler = webserver.SequentialHandler()
     handler.add('GET', '/s3_fake_bucket2/a_dir/resource3.bin', 400)
-    handler.add('GET', '/s3_fake_bucket2/?delimiter=%2F&max-keys=1&prefix=a_dir%2Fresource3.bin%2F', 400)
+    handler.add('GET', '/s3_fake_bucket2/?delimiter=%2F&max-keys=100&prefix=a_dir%2Fresource3.bin%2F', 400)
     with webserver.install_http_handler(handler):
         gdal.VSIStatL('/vsis3/s3_fake_bucket2/a_dir/resource3.bin')
 
@@ -1354,7 +1354,7 @@ def vsis3_5():
 
     handler = webserver.SequentialHandler()
     handler.add('GET', '/s3_delete_bucket/delete_file', 404, {'Connection': 'close'})
-    handler.add('GET', '/s3_delete_bucket/?delimiter=%2F&max-keys=1&prefix=delete_file%2F', 404, {'Connection': 'close'})
+    handler.add('GET', '/s3_delete_bucket/?delimiter=%2F&max-keys=100&prefix=delete_file%2F', 404, {'Connection': 'close'})
     with webserver.install_http_handler(handler):
         if gdal.VSIStatL('/vsis3/s3_delete_bucket/delete_file') is not None:
             gdaltest.post_reason('fail')
@@ -1655,7 +1655,7 @@ def vsis3_7():
 
     handler = webserver.SequentialHandler()
     handler.add('GET', '/s3_bucket_test_mkdir/dir/', 404, {'Connection': 'close'})
-    handler.add('GET', '/s3_bucket_test_mkdir/?delimiter=%2F&max-keys=1&prefix=dir%2F', 404, {'Connection': 'close'})
+    handler.add('GET', '/s3_bucket_test_mkdir/?delimiter=%2F&max-keys=100&prefix=dir%2F', 404, {'Connection': 'close'})
     handler.add('PUT', '/s3_bucket_test_mkdir/dir/', 200)
     with webserver.install_http_handler(handler):
         ret = gdal.Mkdir('/vsis3/s3_bucket_test_mkdir/dir', 0)
@@ -1667,8 +1667,10 @@ def vsis3_7():
         gdaltest.post_reason('fail')
         return 'fail'
 
-    if gdal.ReadDir('/vsis3/s3_bucket_test_mkdir/dir') is not None:
+    dir_content = gdal.ReadDir('/vsis3/s3_bucket_test_mkdir/dir')
+    if dir_content != ['.']:
         gdaltest.post_reason('fail')
+        print(dir_content)
         return 'fail'
 
     # Try creating already existing directory
@@ -1691,6 +1693,7 @@ def vsis3_7():
     # Try deleting already deleted directory
     handler = webserver.SequentialHandler()
     handler.add('GET', '/s3_bucket_test_mkdir/dir/', 404)
+    handler.add('GET', '/s3_bucket_test_mkdir/?delimiter=%2F&max-keys=100&prefix=dir%2F', 404, {'Connection': 'close'})
     with webserver.install_http_handler(handler):
         ret = gdal.Rmdir('/vsis3/s3_bucket_test_mkdir/dir')
     if ret == 0:
@@ -1700,7 +1703,7 @@ def vsis3_7():
     # Try deleting non-empty directory
     handler = webserver.SequentialHandler()
     handler.add('GET', '/s3_bucket_test_mkdir/dir_nonempty/', 416)
-    handler.add('GET', '/s3_bucket_test_mkdir/?delimiter=%2F&max-keys=1&prefix=dir_nonempty%2F', 200,
+    handler.add('GET', '/s3_bucket_test_mkdir/?delimiter=%2F&max-keys=100&prefix=dir_nonempty%2F', 200,
                 {'Content-type': 'application/xml'},
                 """<?xml version="1.0" encoding="UTF-8"?>
                     <ListBucketResult>
@@ -1721,7 +1724,7 @@ def vsis3_7():
     # Try stat'ing a directory not ending with slash
     handler = webserver.SequentialHandler()
     handler.add('GET', '/s3_bucket_test_dir_stat/test_dir_stat', 400)
-    handler.add('GET', '/s3_bucket_test_dir_stat/?delimiter=%2F&max-keys=1&prefix=test_dir_stat%2F', 200,
+    handler.add('GET', '/s3_bucket_test_dir_stat/?delimiter=%2F&max-keys=100&prefix=test_dir_stat%2F', 200,
                 {'Content-type': 'application/xml'},
                 """<?xml version="1.0" encoding="UTF-8"?>
                     <ListBucketResult>
@@ -1760,7 +1763,7 @@ def vsis3_7():
     # Try stat'ing a directory ending with slash
     handler = webserver.SequentialHandler()
     handler.add('GET', '/s3_bucket_test_dir_stat_2/test_dir_stat/', 400)
-    handler.add('GET', '/s3_bucket_test_dir_stat_2/?delimiter=%2F&max-keys=1&prefix=test_dir_stat%2F', 200,
+    handler.add('GET', '/s3_bucket_test_dir_stat_2/?delimiter=%2F&max-keys=100&prefix=test_dir_stat%2F', 200,
                 {'Content-type': 'application/xml'},
                 """<?xml version="1.0" encoding="UTF-8"?>
                     <ListBucketResult>
diff --git a/autotest/gcore/vsiswift.py b/autotest/gcore/vsiswift.py
index 39e8650f4d4b..de3ac7be99c9 100644
--- a/autotest/gcore/vsiswift.py
+++ b/autotest/gcore/vsiswift.py
@@ -638,7 +638,7 @@ def vsiswift_fake_mkdir_rmdir():
     # Valid
     handler = webserver.SequentialHandler()
     handler.add('GET', '/v1/AUTH_something/foo/dir/', 200)
-    handler.add('GET', '/v1/AUTH_something/foo?delimiter=%2F&limit=2&prefix=dir%2F',
+    handler.add('GET', '/v1/AUTH_something/foo?delimiter=%2F&limit=101&prefix=dir%2F',
                 200,
                 {'Connection': 'close', 'Content-type': 'application/json'},
                 """[]
@@ -669,7 +669,7 @@ def vsiswift_fake_mkdir_rmdir():
                 200,
                 {'Connection': 'close', 'Content-type': 'application/json'},
                 """[ { "subdir": "dir_nonempty/" } ]""")
-    handler.add('GET', '/v1/AUTH_something/foo?delimiter=%2F&limit=2&prefix=dir_nonempty%2F',
+    handler.add('GET', '/v1/AUTH_something/foo?delimiter=%2F&limit=101&prefix=dir_nonempty%2F',
                 200,
                 {'Connection': 'close', 'Content-type': 'application/json'},
                 """[ { "name": "dir_nonempty/some_file", "bytes": 0, "last_modified": "1970-01-01T00:00:01" } ]""")
diff --git a/gdal/port/cpl_vsil_curl.cpp b/gdal/port/cpl_vsil_curl.cpp
index 851ccdde3d68..53c67aa3d58e 100644
--- a/gdal/port/cpl_vsil_curl.cpp
+++ b/gdal/port/cpl_vsil_curl.cpp
@@ -908,6 +908,22 @@ vsi_l_offset VSICurlHandle::GetFileSize( bool bSetError )
                 oFileProp.fileSize = static_cast<GUIntBig>(dfSize);
         }
 
+        if( sWriteFuncHeaderData.pBuffer != nullptr &&
+            (response_code == 200 || response_code == 206 ) )
+        {
+            const char* pzETag = strstr(
+                sWriteFuncHeaderData.pBuffer, "ETag: \"");
+            if( pzETag )
+            {
+                pzETag += strlen("ETag: \"");
+                const char* pszEndOfETag = strchr(pzETag, '"');
+                if( pszEndOfETag )
+                {
+                    oFileProp.ETag.assign(pzETag, pszEndOfETag - pzETag);
+                }
+            }
+        }
+
         if( UseLimitRangeGetInsteadOfHead() && response_code == 206 )
         {
             oFileProp.eExists = EXIST_NO;
@@ -3393,12 +3409,9 @@ VSICurlFilesystemHandler::GetURLFromFilename( const CPLString& osFilename )
 void VSICurlFilesystemHandler::RegisterEmptyDir( const CPLString& osDirname )
 {
     CachedDirList cachedDirList;
-    if( !GetCachedDirList(osDirname, cachedDirList) )
-    {
-        cachedDirList.bGotFileList = true;
-        cachedDirList.oFileList.AddString(".");
-        SetCachedDirList(osDirname, cachedDirList);
-    }
+    cachedDirList.bGotFileList = true;
+    cachedDirList.oFileList.AddString(".");
+    SetCachedDirList(osDirname, cachedDirList);
 }
 
 /************************************************************************/
@@ -3881,7 +3894,11 @@ char** VSICurlFilesystemHandler::ReadDirInternal( const char *pszDirname,
         cachedDirList.oFileList.Assign(
             GetFileList(osDirname, nMaxFiles,
                         &cachedDirList.bGotFileList), true);
-        SetCachedDirList(osDirname, cachedDirList);
+        if( nMaxFiles <= 0 || cachedDirList.oFileList.size() < nMaxFiles )
+        {
+            // Only cache content if we didn't hit the limitation
+            SetCachedDirList(osDirname, cachedDirList);
+        }
     }
 
     if( pbGotFileList )
diff --git a/gdal/port/cpl_vsil_s3.cpp b/gdal/port/cpl_vsil_s3.cpp
index 03453c124c03..61792d1096a6 100644
--- a/gdal/port/cpl_vsil_s3.cpp
+++ b/gdal/port/cpl_vsil_s3.cpp
@@ -173,11 +173,11 @@ void VSICurlFilesystemHandler::AnalyseS3FileList(
                 }
             }
 
-            if( nMaxFiles > 0 && aoProps.size() > static_cast<unsigned>(nMaxFiles) )
+            if( nMaxFiles > 0 && aoProps.size() >= static_cast<unsigned>(nMaxFiles) )
                 break;
         }
 
-        if( !(nMaxFiles > 0 && aoProps.size() > static_cast<unsigned>(nMaxFiles)) )
+        if( !(nMaxFiles > 0 && aoProps.size() >= static_cast<unsigned>(nMaxFiles)) )
         {
             osNextMarker = CPLGetXMLValue(psListBucketResult, "NextMarker", "");
             bIsTruncated =
@@ -1386,7 +1386,7 @@ int IVSIS3LikeFSHandler::Rmdir( const char * pszDirname )
         return -1;
     }
 
-    char** papszFileList = ReadDirEx(osDirname, 1);
+    char** papszFileList = ReadDirEx(osDirname, 100);
     bool bEmptyDir = papszFileList == nullptr ||
                      (EQUAL(papszFileList[0], ".") &&
                       papszFileList[1] == nullptr);
@@ -1409,7 +1409,12 @@ int IVSIS3LikeFSHandler::Rmdir( const char * pszDirname )
         return -1;
     }
 
-    return DeleteObject(osDirname);
+    int ret = DeleteObject(osDirname);
+    if( ret == 0 )
+    {
+        InvalidateDirContent(osDirnameWithoutEndSlash);
+    }
+    return ret;
 }
 
 /************************************************************************/
@@ -1434,7 +1439,7 @@ int IVSIS3LikeFSHandler::Stat( const char *pszFilename, VSIStatBufL *pStatBuf,
         return 0;
     }
 
-    char** papszRet = ReadDirInternal( osFilename, 1, nullptr );
+    char** papszRet = ReadDirInternal( osFilename, 100, nullptr );
     int nRet = papszRet ? 0 : -1;
     if( nRet == 0 )
     {
@@ -1678,7 +1683,7 @@ char** IVSIS3LikeFSHandler::GetFileList( const char *pszDirname,
     CPLString osNextMarker; // must be left in this scope !
 
     CPLString osMaxKeys = CPLGetConfigOption("AWS_MAX_KEYS", "");
-    if( nMaxFiles > 0 && nMaxFiles < 100 &&
+    if( nMaxFiles > 0 && nMaxFiles <= 100 &&
         (osMaxKeys.empty() || nMaxFiles < atoi(osMaxKeys)) )
     {
         osMaxKeys.Printf("%d", nMaxFiles);
@@ -1790,6 +1795,16 @@ char** IVSIS3LikeFSHandler::GetFileList( const char *pszDirname,
 
             if( osNextMarker.empty() )
             {
+                if( !osFileList.empty() )
+                {
+                    FileProp cachedFileProp;
+                    GetCachedFileProp(GetURLFromFilename(pszDirname), cachedFileProp);
+                    cachedFileProp.eExists = EXIST_YES;
+                    cachedFileProp.bIsDirectory = true;
+                    cachedFileProp.bHasComputedFileSize = true;
+                    SetCachedFileProp(GetURLFromFilename(pszDirname), cachedFileProp);
+                }
+
                 delete poS3HandleHelper;
                 curl_easy_cleanup(hCurlHandle);
                 return osFileList.StealList();
diff --git a/gdal/port/cpl_vsil_swift.cpp b/gdal/port/cpl_vsil_swift.cpp
index 60e3e038b1e5..9e0f5c5cdeba 100644
--- a/gdal/port/cpl_vsil_swift.cpp
+++ b/gdal/port/cpl_vsil_swift.cpp
@@ -510,7 +510,7 @@ char** VSISwiftFSHandler::GetFileList( const char *pszDirname,
 
     CPLString osMaxKeys = CPLGetConfigOption("SWIFT_MAX_KEYS", "10000");
     int nMaxFilesThisQuery = atoi(osMaxKeys);
-    if( nMaxFiles > 0 && nMaxFiles < 100 && nMaxFiles < nMaxFilesThisQuery )
+    if( nMaxFiles > 0 && nMaxFiles <= 100 && nMaxFiles < nMaxFilesThisQuery )
     {
         nMaxFilesThisQuery = nMaxFiles+1;
     }

From cc40f285204d363d762804d7b9b4cd136384e85a Mon Sep 17 00:00:00 2001
From: Even Rouault <even.rouault@spatialys.com>
Date: Thu, 8 Nov 2018 23:36:59 +0100
Subject: [PATCH 045/488] Add VSISync() to synchronize source and target
 files/directories

---
 autotest/gcore/vsifile.py                 |  89 +++++-
 autotest/gcore/vsis3.py                   | 245 ++++++++++++++-
 gdal/port/cpl_vsi.h                       |   7 +
 gdal/port/cpl_vsi_mem.cpp                 |   2 +-
 gdal/port/cpl_vsi_virtual.h               |   5 +
 gdal/port/cpl_vsil.cpp                    | 266 ++++++++++++++++
 gdal/port/cpl_vsil_curl.cpp               |   8 +-
 gdal/port/cpl_vsil_curl_class.h           |   9 +-
 gdal/port/cpl_vsil_s3.cpp                 | 359 ++++++++++++++++++++++
 gdal/swig/include/cpl.i                   |  23 ++
 gdal/swig/python/extensions/gdal_wrap.cpp | 242 ++++++++++++++-
 gdal/swig/python/osgeo/gdal.py            |   4 +
 12 files changed, 1243 insertions(+), 16 deletions(-)

diff --git a/autotest/gcore/vsifile.py b/autotest/gcore/vsifile.py
index 284e4e8eb13f..1dfd307fb4ef 100755
--- a/autotest/gcore/vsifile.py
+++ b/autotest/gcore/vsifile.py
@@ -733,7 +733,7 @@ def vsifile_16():
     old_val = gdal.GetUseExceptions()
     gdal.UseExceptions()
     try:
-        gdal.Rename('/tmp/i_dont_exist_vsifile_16.tif', '/tmp/me_neither.tif')
+        gdal.Rename('/tmp/i_do_not_exist_vsifile_16.tif', '/tmp/me_neither.tif')
         ret = 'fail'
     except RuntimeError:
         ret = 'success'
@@ -916,6 +916,90 @@ def vsigzip_multi_thread():
 
     return 'success'
 
+###############################################################################
+# Test vsisync()
+
+
+def vsisync():
+
+    with gdaltest.error_handler():
+        if gdal.Sync('/i_do/not/exist', '/vsimem/'):
+            gdaltest.post_reason('fail')
+            return 'fail'
+
+    with gdaltest.error_handler():
+        if gdal.Sync('vsifile.py', '/i_do/not/exist'):
+            gdaltest.post_reason('fail')
+            return 'fail'
+
+    # Test copying a file
+    for i in range(2):
+        if not gdal.Sync('vsifile.py', '/vsimem/'):
+            gdaltest.post_reason('fail')
+            return 'fail'
+        if gdal.VSIStatL('/vsimem/vsifile.py').size != gdal.VSIStatL('vsifile.py').size:
+            gdaltest.post_reason('fail')
+            return 'fail'
+    gdal.Unlink('/vsimem/vsifile.py')
+
+    # Test copying the content of a directory
+    gdal.Mkdir('/vsimem/test_sync', 0)
+    gdal.FileFromMemBuffer('/vsimem/test_sync/foo.txt', 'bar')
+    gdal.Mkdir('/vsimem/test_sync/subdir', 0)
+    gdal.FileFromMemBuffer('/vsimem/test_sync/subdir/bar.txt', 'baz')
+
+    if sys.platform != 'win32':
+        with gdaltest.error_handler():
+            if gdal.Sync('/vsimem/test_sync/', '/i_do_not/exist'):
+                gdaltest.post_reason('fail')
+                return 'fail'
+
+    if not gdal.Sync('/vsimem/test_sync/', '/vsimem/out'):
+        gdaltest.post_reason('fail')
+        return 'fail'
+    if gdal.ReadDir('/vsimem/out') != [ 'foo.txt', 'subdir' ]:
+        gdaltest.post_reason('fail')
+        print(gdal.ReadDir('/vsimem/out'))
+        return 'fail'
+    if gdal.ReadDir('/vsimem/out/subdir') != [ 'bar.txt' ]:
+        gdaltest.post_reason('fail')
+        print(gdal.ReadDir('/vsimem/out/subdir'))
+        return 'fail'
+    # Again
+    if not gdal.Sync('/vsimem/test_sync/', '/vsimem/out'):
+        gdaltest.post_reason('fail')
+        return 'fail'
+
+    gdal.RmdirRecursive('/vsimem/out')
+
+    # Test copying a directory
+    pct_values = []
+    def my_progress(pct, message, user_data):
+        pct_values.append(pct)
+
+    if not gdal.Sync('/vsimem/test_sync', '/vsimem/out', callback = my_progress):
+        gdaltest.post_reason('fail')
+        return 'fail'
+
+    if pct_values != [0.5, 1.0]:
+        gdaltest.post_reason('fail')
+        print(pct_values)
+        return 'fail'
+
+    if gdal.ReadDir('/vsimem/out') != [ 'test_sync' ]:
+        gdaltest.post_reason('fail')
+        print(gdal.ReadDir('/vsimem/out'))
+        return 'fail'
+    if gdal.ReadDir('/vsimem/out/test_sync') != [ 'foo.txt', 'subdir' ]:
+        gdaltest.post_reason('fail')
+        print(gdal.ReadDir('/vsimem/out/test_sync'))
+        return 'fail'
+
+    gdal.RmdirRecursive('/vsimem/test_sync')
+    gdal.RmdirRecursive('/vsimem/out')
+
+    return 'success'
+
 gdaltest_list = [vsifile_1,
                  vsifile_2,
                  vsifile_3,
@@ -939,7 +1023,8 @@ def vsigzip_multi_thread():
                  vsifile_21,
                  vsifile_22,
                  vsitar_bug_675,
-                 vsigzip_multi_thread]
+                 vsigzip_multi_thread,
+                 vsisync]
 
 if __name__ == '__main__':
 
diff --git a/autotest/gcore/vsis3.py b/autotest/gcore/vsis3.py
index 80651d9b267b..7d74bf3c0179 100755
--- a/autotest/gcore/vsis3.py
+++ b/autotest/gcore/vsis3.py
@@ -1848,6 +1848,247 @@ def vsis3_8():
 
     return 'success'
 
+###############################################################################
+# Test vsisync() with SYNC_STRATEGY=ETAG
+
+
+def vsis3_sync_etag():
+
+    if gdaltest.webserver_port == 0:
+        return 'skip'
+
+    gdal.VSICurlClearCache()
+
+    options = ['SYNC_STRATEGY=ETAG']
+
+    with gdaltest.error_handler():
+        handler = webserver.SequentialHandler()
+        with webserver.install_http_handler(handler):
+            if gdal.Sync('/i_do/not/exist', '/vsis3/', options=options):
+                gdaltest.post_reason('fail')
+                return 'fail'
+
+    with gdaltest.error_handler():
+        handler = webserver.SequentialHandler()
+        handler.add('GET', '/do_not/exist', 404)
+        handler.add('GET', '/do_not/?delimiter=%2F&max-keys=100&prefix=exist%2F', 404)
+        handler.add('PUT', '/do_not/exist', 404)
+        with webserver.install_http_handler(handler):
+            if gdal.Sync('vsifile.py', '/vsis3/do_not/exist', options=options):
+                gdaltest.post_reason('fail')
+                return 'fail'
+
+    handler = webserver.SequentialHandler()
+    handler.add('GET', '/out/', 200)
+    handler.add('GET', '/out/testsync.txt', 404)
+    handler.add('GET', '/out/?delimiter=%2F&max-keys=100&prefix=testsync.txt%2F', 404)
+
+    def method(request):
+        if request.headers['Content-Length'] != '3':
+            sys.stderr.write('Did not get expected headers: %s\n' % str(request.headers))
+            request.send_response(400)
+            request.send_header('Content-Length', 0)
+            request.end_headers()
+            return
+
+        request.wfile.write('HTTP/1.1 100 Continue\r\n\r\n'.encode('ascii'))
+
+        content = request.rfile.read(3).decode('ascii')
+        if content != 'foo':
+            sys.stderr.write('Did not get expected content: %s\n' % content)
+            request.send_response(400)
+            request.send_header('Content-Length', 0)
+            request.end_headers()
+            return
+
+        request.send_response(200)
+        request.send_header('Content-Length', 0)
+        request.send_header('ETag', '"acbd18db4cc2f85cedef654fccc4a4d8"')
+        request.end_headers()
+
+    handler.add('PUT', '/out/testsync.txt', custom_method=method)
+
+    gdal.FileFromMemBuffer('/vsimem/testsync.txt', 'foo')
+    with webserver.install_http_handler(handler):
+        if not gdal.Sync('/vsimem/testsync.txt', '/vsis3/out', options=options):
+            gdaltest.post_reason('fail')
+            return 'fail'
+
+    # Re-try with cached ETag. Should generate no network access
+    handler = webserver.SequentialHandler()
+    with webserver.install_http_handler(handler):
+        if not gdal.Sync('/vsimem/testsync.txt', '/vsis3/out', options=options):
+            gdaltest.post_reason('fail')
+            return 'fail'
+
+    gdal.VSICurlClearCache()
+
+    # Other direction: S3 to /vsimem
+    handler = webserver.SequentialHandler()
+    handler.add('GET', '/out/testsync.txt', 206,
+                { 'Content-Length' : '3',
+                  'Content-Range': 'bytes 0-2/3',
+                  'ETag' : '"acbd18db4cc2f85cedef654fccc4a4d8"' }, "foo")
+    with webserver.install_http_handler(handler):
+        if not gdal.Sync( '/vsis3/out/testsync.txt', '/vsimem/', options=options):
+            gdaltest.post_reason('fail')
+            return 'fail'
+
+    # Shouldn't do any copy, but hard to verify
+    with webserver.install_http_handler(webserver.SequentialHandler()):
+        if not gdal.Sync( '/vsis3/out/testsync.txt', '/vsimem/', options=options):
+            gdaltest.post_reason('fail')
+            return 'fail'
+
+    # Modify target file, and redo synchronization
+    gdal.FileFromMemBuffer('/vsimem/testsync.txt', 'bar')
+
+    handler = webserver.SequentialHandler()
+    handler.add('GET', '/out/?delimiter=%2F', 200, {},
+                """<?xml version="1.0" encoding="UTF-8"?>
+                    <ListBucketResult>
+                        <Prefix></Prefix>
+                        <Contents>
+                            <Key>testsync.txt</Key>
+                            <LastModified>1970-01-01T00:00:01.000Z</LastModified>
+                            <Size>3</Size>
+                            <ETag>"acbd18db4cc2f85cedef654fccc4a4d8"</ETag>
+                        </Contents>
+                    </ListBucketResult>
+                """)
+    handler.add('GET', '/out/testsync.txt', 206,
+                { 'Content-Length' : '3',
+                  'Content-Range': 'bytes 0-2/3',
+                  'ETag' : '"acbd18db4cc2f85cedef654fccc4a4d8"' }, "foo")
+    with webserver.install_http_handler(handler):
+        if not gdal.Sync( '/vsis3/out/testsync.txt', '/vsimem/', options=options):
+            gdaltest.post_reason('fail')
+            return 'fail'
+
+    f = gdal.VSIFOpenL('/vsimem/testsync.txt', 'rb')
+    data = gdal.VSIFReadL(1, 3, f).decode('ascii')
+    gdal.VSIFCloseL(f)
+    if data != 'foo':
+        gdaltest.post_reason('fail')
+        return 'fail'
+
+    # /vsimem to S3, but after cleaning the cache
+    gdal.VSICurlClearCache()
+
+    handler = webserver.SequentialHandler()
+    handler.add('GET', '/out/', 200)
+    handler.add('GET', '/out/testsync.txt', 206,
+                { 'Content-Length' : '3',
+                  'Content-Range': 'bytes 0-2/3',
+                  'ETag' : '"acbd18db4cc2f85cedef654fccc4a4d8"' }, "foo")
+    with webserver.install_http_handler(handler):
+        if not gdal.Sync('/vsimem/testsync.txt', '/vsis3/out', options=options):
+            gdaltest.post_reason('fail')
+            return 'fail'
+
+    gdal.Unlink('/vsimem/testsync.txt')
+
+    # Directory copying
+    gdal.VSICurlClearCache()
+
+    gdal.Mkdir('/vsimem/subdir', 0)
+    gdal.FileFromMemBuffer('/vsimem/subdir/testsync.txt', 'foo')
+    handler = webserver.SequentialHandler()
+    handler.add('GET', '/out/?delimiter=%2F', 200, {},
+                """<?xml version="1.0" encoding="UTF-8"?>
+                    <ListBucketResult>
+                        <Prefix></Prefix>
+                        <Contents>
+                            <Key>testsync.txt</Key>
+                            <LastModified>1970-01-01T00:00:01.000Z</LastModified>
+                            <Size>3</Size>
+                            <ETag>"acbd18db4cc2f85cedef654fccc4a4d8"</ETag>
+                        </Contents>
+                    </ListBucketResult>
+                """)
+    with webserver.install_http_handler(handler):
+        if not gdal.Sync('/vsimem/subdir/', '/vsis3/out', options=options):
+            gdaltest.post_reason('fail')
+            return 'fail'
+    gdal.RmdirRecursive('/vsimem/subdir')
+
+    return 'success'
+
+###############################################################################
+# Test vsisync() with SYNC_STRATEGY=TIMESTAMP
+
+
+def vsis3_sync_timestamp():
+
+    if gdaltest.webserver_port == 0:
+        return 'skip'
+
+    options = ['SYNC_STRATEGY=TIMESTAMP']
+
+    gdal.FileFromMemBuffer('/vsimem/testsync.txt', 'foo')
+
+    # S3 to local: S3 file is older -> download
+    gdal.VSICurlClearCache()
+    handler = webserver.SequentialHandler()
+    handler.add('GET', '/out/testsync.txt', 206,
+                { 'Content-Length' : '3',
+                  'Content-Range': 'bytes 0-2/3',
+                  'Last-Modified': 'Mon, 01 Jan 1970 00:00:01 GMT' }, "foo")
+    handler.add('GET', '/out/?delimiter=%2F', 404)
+    handler.add('GET', '/out/testsync.txt', 206,
+                { 'Content-Length' : '3',
+                  'Content-Range': 'bytes 0-2/3',
+                  'Last-Modified': 'Mon, 01 Jan 1970 00:00:01 GMT' }, "foo")
+    with webserver.install_http_handler(handler):
+        if not gdal.Sync( '/vsis3/out/testsync.txt', '/vsimem/',
+                         options=options):
+            gdaltest.post_reason('fail')
+            return 'fail'
+
+    # S3 to local: S3 file is newer -> do nothing
+    gdal.VSICurlClearCache()
+    handler = webserver.SequentialHandler()
+    handler.add('GET', '/out/testsync.txt', 206,
+                { 'Content-Length' : '3',
+                  'Content-Range': 'bytes 0-2/3',
+                  'Last-Modified': 'Mon, 01 Jan 2037 00:00:01 GMT' }, "foo")
+    with webserver.install_http_handler(handler):
+        if not gdal.Sync( '/vsis3/out/testsync.txt', '/vsimem/',
+                         options=options):
+            gdaltest.post_reason('fail')
+            return 'fail'
+
+    # Local to S3: S3 file is older -> upload
+    gdal.VSICurlClearCache()
+    handler = webserver.SequentialHandler()
+    handler.add('GET', '/out/testsync.txt', 206,
+                { 'Content-Length' : '3',
+                  'Content-Range': 'bytes 0-2/3',
+                  'Last-Modified': 'Mon, 01 Jan 1970 00:00:01 GMT' }, "foo")
+    handler.add('PUT', '/out/testsync.txt', 200)
+    with webserver.install_http_handler(handler):
+        if not gdal.Sync( '/vsimem/testsync.txt', '/vsis3/out/testsync.txt',
+                         options=options):
+            gdaltest.post_reason('fail')
+            return 'fail'
+
+    # Local to S3: S3 file is newer -> do nothgin
+    gdal.VSICurlClearCache()
+    handler = webserver.SequentialHandler()
+    handler.add('GET', '/out/testsync.txt', 206,
+                { 'Content-Length' : '3',
+                  'Content-Range': 'bytes 0-2/3',
+                  'Last-Modified': 'Mon, 01 Jan 2037 00:00:01 GMT' }, "foo")
+    with webserver.install_http_handler(handler):
+        if not gdal.Sync( '/vsimem/testsync.txt', '/vsis3/out/testsync.txt',
+                         options=options):
+            gdaltest.post_reason('fail')
+            return 'fail'
+
+    gdal.Unlink('/vsimem/testsync.txt')
+
+    return 'success'
+
 ###############################################################################
 # Read credentials from simulated ~/.aws/credentials
 
@@ -2510,6 +2751,8 @@ def vsis3_cleanup():
                  vsis3_6,
                  vsis3_7,
                  vsis3_8,
+                 vsis3_sync_etag,
+                 vsis3_sync_timestamp,
                  vsis3_read_credentials_file,
                  vsis3_read_config_file,
                  vsis3_read_credentials_config_file,
@@ -2520,7 +2763,7 @@ def vsis3_cleanup():
                  vsis3_stop_webserver,
                  vsis3_cleanup]
 
-# gdaltest_list = [ vsis3_init, vsis3_start_webserver, vsis3_7, vsis3_stop_webserver, vsis3_cleanup ]
+# gdaltest_list = [ vsis3_init, vsis3_start_webserver, vsis3_sync_etag, vsis3_stop_webserver, vsis3_cleanup ]
 
 gdaltest_list_extra = [vsis3_extra_1]
 
diff --git a/gdal/port/cpl_vsi.h b/gdal/port/cpl_vsi.h
index 8b731ce6a7e8..759e9653c933 100644
--- a/gdal/port/cpl_vsi.h
+++ b/gdal/port/cpl_vsi.h
@@ -33,6 +33,7 @@
 #define CPL_VSI_H_INCLUDED
 
 #include "cpl_port.h"
+#include "cpl_progress.h"
 
 /**
  * \file cpl_vsi.h
@@ -307,6 +308,12 @@ int CPL_DLL VSIRmdir( const char * pszDirname );
 int CPL_DLL VSIRmdirRecursive( const char * pszDirname );
 int CPL_DLL VSIUnlink( const char * pszFilename );
 int CPL_DLL VSIRename( const char * oldpath, const char * newpath );
+int CPL_DLL VSISync( const char* pszSource, const char* pszTarget,
+                      const char* const * papszOptions,
+                      GDALProgressFunc pProgressFunc,
+                      void *pProgressData,
+                      char*** ppapszOutputs );
+
 char CPL_DLL *VSIStrerror( int );
 GIntBig CPL_DLL VSIGetDiskFreeSpace(const char *pszDirname);
 
diff --git a/gdal/port/cpl_vsi_mem.cpp b/gdal/port/cpl_vsi_mem.cpp
index 3083bd064ceb..ba025243f7c5 100644
--- a/gdal/port/cpl_vsi_mem.cpp
+++ b/gdal/port/cpl_vsi_mem.cpp
@@ -586,7 +586,7 @@ int VSIMemFilesystemHandler::Stat( const char * pszFilename,
 
     memset( pStatBuf, 0, sizeof(VSIStatBufL) );
 
-    if( osFilename == "/vsimem/" )
+    if( osFilename == "/vsimem" || osFilename == "/vsimem/" )
     {
         pStatBuf->st_size = 0;
         pStatBuf->st_mode = S_IFDIR;
diff --git a/gdal/port/cpl_vsi_virtual.h b/gdal/port/cpl_vsi_virtual.h
index 207bad6eb0e7..02c019521f07 100644
--- a/gdal/port/cpl_vsi_virtual.h
+++ b/gdal/port/cpl_vsi_virtual.h
@@ -113,6 +113,11 @@ class CPL_DLL VSIFilesystemHandler {
     virtual const char* GetActualURL(const char* /*pszFilename*/) { return nullptr; }
     virtual const char* GetOptions() { return nullptr; }
     virtual char* GetSignedURL(const char* /*pszFilename*/, CSLConstList /* papszOptions */) { return nullptr; }
+    virtual bool Sync( const char* pszSource, const char* pszTarget,
+                            const char* const * papszOptions,
+                            GDALProgressFunc pProgressFunc,
+                            void *pProgressData,
+                            char*** ppapszOutputs  );
 };
 #endif /* #ifndef DOXYGEN_SKIP */
 
diff --git a/gdal/port/cpl_vsil.cpp b/gdal/port/cpl_vsil.cpp
index 3144bb51b572..5bf78b40c2e3 100644
--- a/gdal/port/cpl_vsil.cpp
+++ b/gdal/port/cpl_vsil.cpp
@@ -445,6 +445,93 @@ int VSIRename( const char * oldpath, const char * newpath )
     return poFSHandler->Rename( oldpath, newpath );
 }
 
+/************************************************************************/
+/*                             VSISync()                                */
+/************************************************************************/
+
+/**
+ * \brief Synchronize a source file/directory with a target file/directory.
+ *
+ * This is a analog of the 'rsync' utility. In the current implementation,
+ * rsync would be more efficient for local file copying, but VSIRsync() main
+ * interest is when the source or target is a remote
+ * file system like /vsis3/ or /vsigs/, in which case it can take into account
+ * the timestamps of the files (or optionally the ETag/MD5Sum) to avoid
+ * unneeded copy operations.
+ *
+ * Note: current only implemented efficiently for local filesystem <--> /vsis3/
+ * and local filesystem <--> /vsigs/
+ *
+ * Similarly to rsync behaviour, if the source filename ends with a slash,
+ * it means that the content of the directory must be copied, but not the
+ * directory name. For example, assuming "/home/even/foo" contains a file "bar",
+ * VSISync("/home/even/foo/", "/mnt/media", ...) will create a "/mnt/media/bar"
+ * file. Whereas VSISync("/home/even/foo", "/mnt/media", ...) will create a
+ * "/mnt/media/foo" directory which contains a bar file.
+ *
+ * @param pszSource Source file or directory.  UTF-8 encoded.
+ * @param pszTarget Target file or direcotry.  UTF-8 encoded.
+ * @param papszOptions Null terminated list of options, or NULL.
+ * Currently accepted options are:
+ * <ul>
+ * <li>RECURSIVE=NO (the default is YES)</li>
+ * <li>SYNC_STRATEGY=TIMESTAMP/ETAG. Determines which criterion is used to
+ *     determine if a target file must be replaced when it already exists and
+ *     has the same file size as the source.
+ *     Only apply for a source being a network filesystem.
+ *
+ *     The default is TIMESTAMP (similarly to how 'aws s3 sync' works), that is
+ *     to say that for an upload operation, a remote file is
+ *     replaced if it has a different size or if it is older than the source.
+ *     For a download operation, a local file is  replaced if it has a different
+ *     size or if it is newer than the remote file.
+ *
+ *     The ETAG strategy assumes that the ETag metadata of the remote file is
+ *     the MD5Sum of the file content, which is only true in the case of /vsis3/
+ *     for files not using KMS server side encryption and uploaded in a single
+ *     PUT operation (so smaller than 50 MB given the default used by GDAL).
+ * </li>
+ * </ul>
+ * @param pProgressFunc Progress callback, or NULL.
+ * @param pProgressData User data of progress callback, or NULL.
+ * @param ppapszOutputs Unused. Should be set to NULL for now.
+ *
+ * @return TRUE on success or FALSE on an error.
+ * @since GDAL 2.4
+ */
+
+int VSISync( const char* pszSource, const char* pszTarget,
+              const char* const * papszOptions,
+              GDALProgressFunc pProgressFunc,
+              void *pProgressData,
+              char*** ppapszOutputs  )
+
+{
+    if( pszSource[0] == '\0' || pszTarget[0] == '\0' )
+    {
+        return FALSE;
+    }
+
+    VSIFilesystemHandler *poFSHandlerSource =
+        VSIFileManager::GetHandler( pszSource );
+    VSIFilesystemHandler *poFSHandlerTarget =
+        VSIFileManager::GetHandler( pszTarget );
+    VSIFilesystemHandler *poFSHandlerLocal =
+        VSIFileManager::GetHandler( "" );
+    VSIFilesystemHandler *poFSHandlerMem =
+        VSIFileManager::GetHandler( "/vsimem/" );
+    VSIFilesystemHandler* poFSHandler = poFSHandlerSource;
+    if( poFSHandlerTarget != poFSHandlerLocal &&
+        poFSHandlerTarget != poFSHandlerMem )
+    {
+        poFSHandler = poFSHandlerTarget;
+    }
+
+    return poFSHandler->Sync( pszSource, pszTarget, papszOptions,
+                               pProgressFunc, pProgressData, ppapszOutputs ) ?
+                TRUE : FALSE;
+}
+
 /************************************************************************/
 /*                              VSIRmdir()                              */
 /************************************************************************/
@@ -833,6 +920,185 @@ VSIVirtualHandle *VSIFilesystemHandler::Open( const char *pszFilename,
     return Open(pszFilename, pszAccess, false);
 }
 
+/************************************************************************/
+/*                               Sync()                                 */
+/************************************************************************/
+
+bool VSIFilesystemHandler::Sync( const char* pszSource, const char* pszTarget,
+                            const char* const * papszOptions,
+                            GDALProgressFunc pProgressFunc,
+                            void *pProgressData,
+                            char*** ppapszOutputs  )
+{
+    if( ppapszOutputs )
+    {
+        *ppapszOutputs = nullptr;
+    }
+
+    VSIStatBufL sSource;
+    CPLString osSource(pszSource);
+    CPLString osSourceWithoutSlash(pszSource);
+    if( osSourceWithoutSlash.back() == '/' )
+    {
+        osSourceWithoutSlash.resize(osSourceWithoutSlash.size()-1);
+    }
+    if( VSIStatL(osSourceWithoutSlash, &sSource) < 0 )
+    {
+        CPLError(CE_Failure, CPLE_FileIO, "%s does not exist", pszSource);
+        return false;
+    }
+
+    if( VSI_ISDIR(sSource.st_mode) )
+    {
+        CPLString osTargetDir(pszTarget);
+        if( osSource.back() != '/' )
+        {
+            osTargetDir = CPLFormFilename(osTargetDir,
+                                          CPLGetFilename(pszSource), nullptr);
+        }
+
+        VSIStatBufL sTarget;
+        bool ret = true;
+        if( VSIStatL(osTargetDir, &sTarget) < 0 )
+        {
+            if( VSIMkdirRecursive(osTargetDir, 0755) < 0 )
+            {
+                CPLError(CE_Failure, CPLE_FileIO,
+                         "Cannot create directory %s", osTargetDir.c_str());
+                return false;
+            }
+        }
+
+        if( !CPLFetchBool(papszOptions, "STOP_ON_DIR", false) )
+        {
+            CPLStringList aosChildOptions(CSLDuplicate(papszOptions));
+            if( !CPLFetchBool(papszOptions, "RECURSIVE", true) )
+            {
+                aosChildOptions.SetNameValue("RECURSIVE", nullptr);
+                aosChildOptions.AddString("STOP_ON_DIR=TRUE");
+            }
+
+            char** papszSrcFiles = VSIReadDir(osSourceWithoutSlash);
+            int nFileCount = 0;
+            for( auto iter = papszSrcFiles ; iter && *iter; ++iter )
+            {
+                if( strcmp(*iter, ".") != 0 && strcmp(*iter, "..") != 0 )
+                {
+                    nFileCount ++;
+                }
+            }
+            int iFile = 0;
+            for( auto iter = papszSrcFiles ; iter && *iter; ++iter, ++iFile )
+            {
+                if( strcmp(*iter, ".") == 0 || strcmp(*iter, "..") == 0 )
+                {
+                    continue;
+                }
+                CPLString osSubSource(
+                    CPLFormFilename(osSourceWithoutSlash, *iter, nullptr) );
+                CPLString osSubTarget(
+                    CPLFormFilename(osTargetDir, *iter, nullptr) );
+                void* pScaledProgress = GDALCreateScaledProgress(
+                    double(iFile) / nFileCount, double(iFile + 1) / nFileCount,
+                    pProgressFunc, pProgressData);
+                ret = Sync( (osSubSource + '/').c_str(), osSubTarget,
+                            aosChildOptions.List(),
+                            GDALScaledProgress, pScaledProgress,
+                            nullptr );
+                GDALDestroyScaledProgress(pScaledProgress);
+                if( !ret )
+                {
+                    break;
+                }
+            }
+            CSLDestroy(papszSrcFiles);
+        }
+        return ret;
+    }
+
+    VSIStatBufL sTarget;
+    CPLString osTarget(pszTarget);
+    if( VSIStatL(osTarget, &sTarget) == 0 )
+    {
+        bool bTargetIsFile = true;
+        if ( VSI_ISDIR(sTarget.st_mode) )
+        {
+            osTarget = CPLFormFilename(osTarget,
+                                       CPLGetFilename(pszSource), nullptr);
+            bTargetIsFile = VSIStatL(osTarget, &sTarget) == 0 && 
+                            !CPL_TO_BOOL(VSI_ISDIR(sTarget.st_mode));
+        }
+        if( bTargetIsFile )
+        {
+            if( sSource.st_size == sTarget.st_size &&
+                sSource.st_mtime == sTarget.st_mtime &&
+                sSource.st_mtime != 0 )
+            {
+                CPLDebug("VSI", "%s and %s have same size and modification "
+                         "date. Skipping copying",
+                         osSourceWithoutSlash.c_str(),
+                         osTarget.c_str());
+                return true;
+            }
+        }
+    }
+
+    VSILFILE* fpIn = VSIFOpenExL(osSourceWithoutSlash, "rb", TRUE);
+    if( fpIn == nullptr )
+    {
+        CPLError(CE_Failure, CPLE_FileIO, "Cannot open %s",
+                 osSourceWithoutSlash.c_str());
+        return false;
+    }
+
+    VSILFILE* fpOut = VSIFOpenExL(osTarget.c_str(), "wb", TRUE);
+    if( fpOut == nullptr )
+    {
+        CPLError(CE_Failure, CPLE_FileIO, "Cannot create %s", osTarget.c_str());
+        VSIFCloseL(fpIn);
+        return false;
+    }
+
+    bool ret = true;
+    constexpr size_t nBufferSize = 10 * 4096;
+    std::vector<GByte> abyBuffer(nBufferSize, 0);
+    GUIntBig nOffset = 0;
+    CPLString osMsg;
+    osMsg.Printf("Copying of %s", osSourceWithoutSlash.c_str());
+    while( true )
+    {
+        size_t nRead = VSIFReadL(&abyBuffer[0], 1, nBufferSize, fpIn);
+        size_t nWritten = VSIFWriteL(&abyBuffer[0], 1, nRead, fpOut);
+        if( nWritten != nRead )
+        {
+            CPLError(CE_Failure, CPLE_FileIO,
+                     "Copying of %s to %s failed",
+                     osSourceWithoutSlash.c_str(), osTarget.c_str());
+            ret = false;
+            break;
+        }
+        nOffset += nRead;
+        if( pProgressFunc && !pProgressFunc(
+                double(nOffset) / sSource.st_size, osMsg.c_str(),
+                pProgressData) )
+        {
+            ret = false;
+            break;
+        }
+        if( nRead < nBufferSize )
+        {
+            break;
+        }
+    }
+
+    VSIFCloseL(fpIn);
+    if( VSIFCloseL(fpOut) != 0 )
+    {
+        ret = false;
+    }
+    return ret;
+}
+
 #endif
 
 /************************************************************************/
diff --git a/gdal/port/cpl_vsil_curl.cpp b/gdal/port/cpl_vsil_curl.cpp
index 53c67aa3d58e..6f139ebe83f7 100644
--- a/gdal/port/cpl_vsil_curl.cpp
+++ b/gdal/port/cpl_vsil_curl.cpp
@@ -949,8 +949,8 @@ vsi_l_offset VSICurlHandle::GetFileSize( bool bSetError )
                 if( sWriteFuncData.pBuffer != nullptr )
                 {
                     for( size_t nOffset = 0;
-                         nOffset + DOWNLOAD_CHUNK_SIZE <= sWriteFuncData.nSize;
-                         nOffset += DOWNLOAD_CHUNK_SIZE )
+                            nOffset + DOWNLOAD_CHUNK_SIZE <= sWriteFuncData.nSize;
+                            nOffset += DOWNLOAD_CHUNK_SIZE )
                     {
                         poFS->AddRegion(m_pszURL,
                                         nOffset,
@@ -1091,7 +1091,7 @@ vsi_l_offset VSICurlHandle::GetFileSize( bool bSetError )
     curl_easy_cleanup(hCurlHandle);
 
     oFileProp.bHasComputedFileSize = true;
-    if( mtime != 0 )
+    if( mtime > 0 )
         oFileProp.mTime = mtime;
     poFS->SetCachedFileProp(m_pszURL, oFileProp);
 
@@ -1263,7 +1263,7 @@ bool VSICurlHandle::DownloadRegion( const vsi_l_offset startOffset,
 
     long mtime = 0;
     curl_easy_getinfo(hCurlHandle, CURLINFO_FILETIME, &mtime);
-    if( mtime != 0 )
+    if( mtime > 0 )
     {
         oFileProp.mTime = mtime;
         poFS->SetCachedFileProp(m_pszURL, oFileProp);
diff --git a/gdal/port/cpl_vsil_curl_class.h b/gdal/port/cpl_vsil_curl_class.h
index f3c3f9f03726..c534251cd54f 100644
--- a/gdal/port/cpl_vsil_curl_class.h
+++ b/gdal/port/cpl_vsil_curl_class.h
@@ -77,6 +77,7 @@ class FileProp
     bool            bHasComputedFileSize = false;
     bool            bIsDirectory = false;
     bool            bS3LikeRedirect = false;
+    CPLString       ETag{};
 };
 
 typedef struct
@@ -170,7 +171,6 @@ class VSICurlFilesystemHandler : public VSIFilesystemHandler
     virtual char** GetFileList(const char *pszFilename,
                                int nMaxFiles,
                                bool* pbGotFileList);
-    virtual CPLString GetURLFromFilename( const CPLString& osFilename );
 
     void RegisterEmptyDir( const CPLString& osDirname );
 
@@ -261,6 +261,7 @@ class VSICurlFilesystemHandler : public VSIFilesystemHandler
                                           const CachedDirList& oCachedDirList );
     bool ExistsInCacheDirList( const CPLString& osDirname, bool *pbIsDir );
 
+    virtual CPLString GetURLFromFilename( const CPLString& osFilename );
 };
 
 /************************************************************************/
@@ -389,6 +390,12 @@ class IVSIS3LikeFSHandler: public VSICurlFilesystemHandler
 
     virtual void UpdateMapFromHandle(IVSIS3LikeHandleHelper*) {}
     virtual void UpdateHandleFromMap( IVSIS3LikeHandleHelper * ) {}
+
+    bool Sync( const char* pszSource, const char* pszTarget,
+                const char* const * papszOptions,
+                GDALProgressFunc pProgressFunc,
+                void *pProgressData,
+                char*** ppapszOutputs  ) override;
 };
 
 /************************************************************************/
diff --git a/gdal/port/cpl_vsil_s3.cpp b/gdal/port/cpl_vsil_s3.cpp
index 61792d1096a6..b8f715eb9fa8 100644
--- a/gdal/port/cpl_vsil_s3.cpp
+++ b/gdal/port/cpl_vsil_s3.cpp
@@ -28,6 +28,7 @@
 
 #include "cpl_port.h"
 #include "cpl_http.h"
+#include "cpl_md5.h"
 #include "cpl_minixml.h"
 #include "cpl_time.h"
 #include "cpl_vsil_curl_priv.h"
@@ -112,6 +113,16 @@ void VSICurlFilesystemHandler::AnalyseS3FileList(
                         CPLAtoGIntBig(CPLGetXMLValue(psIter, "Size", "0")));
                     prop.bIsDirectory = false;
                     prop.mTime = 0;
+                    prop.ETag = CPLGetXMLValue(psIter, "ETag", "");
+                    if( prop.ETag.size() > 2 && prop.ETag[0] == '"' &&
+                        prop.ETag.back() == '"')
+                    {
+                        prop.ETag = prop.ETag.substr(1, prop.ETag.size()-2);
+#if DEBUG_VERBOSE
+                        CPLDebug("S3", "ETag for %s: %s",
+                                 pszKey, prop.ETag.c_str());
+#endif
+                    }
 
                     int nYear = 0;
                     int nMonth = 0;
@@ -984,6 +995,27 @@ bool VSIS3WriteHandle::DoSinglePartPUT()
             InvalidateParentDirectory();
         }
 
+        if( sWriteFuncHeaderData.pBuffer != nullptr )
+        {
+            const char* pzETag = strstr(
+                sWriteFuncHeaderData.pBuffer, "ETag: \"");
+            if( pzETag )
+            {
+                pzETag += strlen("ETag: \"");
+                const char* pszEndOfETag = strchr(pzETag, '"');
+                if( pszEndOfETag )
+                {
+                    FileProp oFileProp;
+                    oFileProp.eExists = EXIST_YES;
+                    oFileProp.fileSize = m_nBufferOff;
+                    oFileProp.bHasComputedFileSize = true;
+                    oFileProp.ETag.assign(pzETag, pszEndOfETag - pzETag);
+                    m_poFS->SetCachedFileProp(
+                        m_poFS->GetURLFromFilename(m_osFilename), oFileProp);
+                }
+            }
+        }
+
         CPLFree(sWriteFuncData.pBuffer);
         CPLFree(sWriteFuncHeaderData.pBuffer);
 
@@ -1815,6 +1847,333 @@ char** IVSIS3LikeFSHandler::GetFileList( const char *pszDirname,
     }
 }
 
+/************************************************************************/
+/*                       ComputeMD5OfLocalFile()                        */
+/************************************************************************/
+
+static CPLString ComputeMD5OfLocalFile(VSILFILE* fp)
+{
+    constexpr size_t nBufferSize = 10 * 4096;
+    std::vector<GByte> abyBuffer(nBufferSize, 0);
+
+    struct CPLMD5Context context;
+    CPLMD5Init(&context);
+
+    while( true )
+    {
+        size_t nRead = VSIFReadL(&abyBuffer[0], 1, nBufferSize, fp);
+        CPLMD5Update(&context, &abyBuffer[0], static_cast<int>(nRead));
+        if( nRead < nBufferSize )
+        {
+            break;
+        }
+    }
+
+    unsigned char hash[16];
+    CPLMD5Final(hash, &context);
+
+    constexpr char tohex[] = "0123456789abcdef";
+    char hhash[33];
+    for (int i = 0; i < 16; ++i)
+    {
+        hhash[i * 2] = tohex[(hash[i] >> 4) & 0xf];
+        hhash[i * 2 + 1] = tohex[hash[i] & 0xf];
+    }
+    hhash[32] = '\0';
+
+    VSIFSeekL(fp, 0, SEEK_SET);
+
+    return hhash;
+}
+
+/************************************************************************/
+/*                               Sync()                                 */
+/************************************************************************/
+
+bool IVSIS3LikeFSHandler::Sync( const char* pszSource, const char* pszTarget,
+                            const char* const * papszOptions,
+                            GDALProgressFunc pProgressFunc,
+                            void *pProgressData,
+                            char*** ppapszOutputs  )
+{
+    if( ppapszOutputs )
+    {
+        *ppapszOutputs = nullptr;
+    }
+
+    CPLString osSource(pszSource);
+    CPLString osSourceWithoutSlash(pszSource);
+    if( osSourceWithoutSlash.back() == '/' )
+    {
+        osSourceWithoutSlash.resize(osSourceWithoutSlash.size()-1);
+    }
+
+    // If the source is likely to be a directory, try to issue a ReadDir()
+    // if we haven't stat'ed it yet
+    if( STARTS_WITH(pszSource, GetFSPrefix()) && osSource.back() == '/' )
+    {
+        FileProp cachedFileProp;
+        if( !GetCachedFileProp(GetURLFromFilename(osSourceWithoutSlash),
+                                cachedFileProp) )
+        {
+            CSLDestroy( VSIReadDir(osSourceWithoutSlash) );
+        }
+    }
+
+    VSIStatBufL sSource;
+    if( VSIStatL(osSourceWithoutSlash, &sSource) < 0 )
+    {
+        CPLError(CE_Failure, CPLE_FileIO, "%s does not exist", pszSource);
+        return false;
+    }
+
+    if( VSI_ISDIR(sSource.st_mode) )
+    {
+        CPLString osTargetDir(pszTarget);
+        if( osSource.back() != '/' )
+        {
+            osTargetDir = CPLFormFilename(osTargetDir,
+                                          CPLGetFilename(pszSource), nullptr);
+        }
+
+        // Force caching of directory content to avoid less individual
+        // requests
+        char** papszFileList = VSIReadDir(osTargetDir);
+        const bool bTargetDirKnownExist = papszFileList != nullptr;
+        CSLDestroy(papszFileList);
+
+        VSIStatBufL sTarget;
+        bool ret = true;
+        if( !bTargetDirKnownExist && VSIStatL(osTargetDir, &sTarget) < 0 )
+        {
+            if( VSIMkdirRecursive(osTargetDir, 0755) < 0 )
+            {
+                CPLError(CE_Failure, CPLE_FileIO,
+                         "Cannot create directory %s", osTargetDir.c_str());
+                return false;
+            }
+        }
+
+        if( !CPLFetchBool(papszOptions, "STOP_ON_DIR", false) )
+        {
+            CPLStringList aosChildOptions(CSLDuplicate(papszOptions));
+            if( !CPLFetchBool(papszOptions, "RECURSIVE", true) )
+            {
+                aosChildOptions.SetNameValue("RECURSIVE", nullptr);
+                aosChildOptions.AddString("STOP_ON_DIR=TRUE");
+            }
+
+            char** papszSrcFiles = VSIReadDir(osSourceWithoutSlash);
+            int nFileCount = 0;
+            for( auto iter = papszSrcFiles ; iter && *iter; ++iter )
+            {
+                if( strcmp(*iter, ".") != 0 && strcmp(*iter, "..") != 0 )
+                {
+                    nFileCount ++;
+                }
+            }
+            int iFile = 0;
+            for( auto iter = papszSrcFiles ; iter && *iter; ++iter, ++iFile )
+            {
+                if( strcmp(*iter, ".") == 0 || strcmp(*iter, "..") == 0 )
+                {
+                    continue;
+                }
+                CPLString osSubSource(
+                    CPLFormFilename(osSourceWithoutSlash, *iter, nullptr) );
+                CPLString osSubTarget(
+                    CPLFormFilename(osTargetDir, *iter, nullptr) );
+                void* pScaledProgress = GDALCreateScaledProgress(
+                    double(iFile) / nFileCount, double(iFile + 1) / nFileCount,
+                    pProgressFunc, pProgressData);
+                ret = Sync( (osSubSource + '/').c_str(), osSubTarget,
+                            aosChildOptions.List(),
+                            GDALScaledProgress, pScaledProgress,
+                            nullptr );
+                GDALDestroyScaledProgress(pScaledProgress);
+                if( !ret )
+                {
+                    break;
+                }
+            }
+            CSLDestroy(papszSrcFiles);
+        }
+        return ret;
+    }
+
+    CPLString osMsg;
+    osMsg.Printf("Copying of %s", osSourceWithoutSlash.c_str());
+
+    VSIStatBufL sTarget;
+    CPLString osTarget(pszTarget);
+    bool bTargetIsFile = false;
+    if( VSIStatL(osTarget, &sTarget) == 0 )
+    {
+        bTargetIsFile = true;
+        if( VSI_ISDIR(sTarget.st_mode) )
+        {
+            osTarget = CPLFormFilename(osTarget, CPLGetFilename(pszSource), nullptr);
+            bTargetIsFile = VSIStatL(osTarget, &sTarget) == 0 && 
+                            !CPL_TO_BOOL(VSI_ISDIR(sTarget.st_mode));
+        }
+    }
+
+    const bool bETagStrategy = EQUAL(CSLFetchNameValueDef(
+        papszOptions, "SYNC_STRATEGY", "TIMESTAMP"), "ETAG");
+
+    // Download from network to local file system ?
+    if( (!STARTS_WITH(pszTarget, "/vsi") || STARTS_WITH(pszTarget, "/vsimem/")) &&
+        STARTS_WITH(pszSource, GetFSPrefix()) )
+    {
+        FileProp cachedFileProp;
+        if( bTargetIsFile && sSource.st_size == sTarget.st_size &&
+            GetCachedFileProp(GetURLFromFilename(osSourceWithoutSlash),
+                              cachedFileProp) )
+        {
+            if( bETagStrategy )
+            {
+                VSILFILE* fpOutAsIn = VSIFOpenExL(osTarget, "rb", TRUE);
+                if( fpOutAsIn )
+                {
+                    CPLString md5 = ComputeMD5OfLocalFile(fpOutAsIn);
+                    VSIFCloseL(fpOutAsIn);
+                    if( cachedFileProp.ETag == md5 )
+                    {
+                        CPLDebug(GetDebugKey(),
+                                 "%s has already same content as %s",
+                                osTarget.c_str(), osSourceWithoutSlash.c_str());
+                        if( pProgressFunc )
+                        {
+                            pProgressFunc(1.0, osMsg.c_str(), pProgressData);
+                        }
+                        return true;
+                    }
+                }
+            }
+            else
+            {
+                if( sTarget.st_mtime <= sSource.st_mtime )
+                {
+                    // Our local copy is older than the source, so
+                    // presumably the source was uploaded from it. Nothing to do
+                    CPLDebug(GetDebugKey(), "%s is older than %s. "
+                             "Do not replace %s assuming it was used to "
+                             "upload %s",
+                             osTarget.c_str(), osSourceWithoutSlash.c_str(),
+                             osTarget.c_str(), osSourceWithoutSlash.c_str());
+                    if( pProgressFunc )
+                    {
+                        pProgressFunc(1.0, osMsg.c_str(), pProgressData);
+                    }
+                    return true;
+                }
+            }
+        }
+    }
+
+    VSILFILE* fpIn = nullptr;
+
+    // Upload from local file system to network ?
+    if( (!STARTS_WITH(pszSource, "/vsi") || STARTS_WITH(pszSource, "/vsimem/")) &&
+        STARTS_WITH(pszTarget, GetFSPrefix()) )
+    {
+        FileProp cachedFileProp;
+        if( sSource.st_size == sTarget.st_size &&
+            GetCachedFileProp(GetURLFromFilename(osTarget), cachedFileProp) )
+        {
+            if( bETagStrategy )
+            {
+                fpIn = VSIFOpenExL(osSourceWithoutSlash, "rb", TRUE);
+                if( fpIn && cachedFileProp.ETag == ComputeMD5OfLocalFile(fpIn) )
+                {
+                    CPLDebug(GetDebugKey(), "%s has already same content as %s",
+                            osTarget.c_str(), osSourceWithoutSlash.c_str());
+                    VSIFCloseL(fpIn);
+                    if( pProgressFunc )
+                    {
+                        pProgressFunc(1.0, osMsg.c_str(), pProgressData);
+                    }
+                    return true;
+                }
+            }
+            else
+            {
+                if( sTarget.st_mtime >= sSource.st_mtime )
+                {
+                    // The remote copy is more recent than the source, so
+                    // presumably it was uploaded from the source. Nothing to do
+                    CPLDebug(GetDebugKey(), "%s is more recent than %s. "
+                             "Do not replace %s assuming it was uploaded from "
+                             "%s",
+                             osTarget.c_str(), osSourceWithoutSlash.c_str(),
+                             osTarget.c_str(), osSourceWithoutSlash.c_str());
+                    if( pProgressFunc )
+                    {
+                        pProgressFunc(1.0, osMsg.c_str(), pProgressData);
+                    }
+                    return true;
+                }
+            }
+        }
+    }
+
+    if( fpIn == nullptr )
+    {
+        fpIn = VSIFOpenExL(osSourceWithoutSlash, "rb", TRUE);
+    }
+    if( fpIn == nullptr )
+    {
+        CPLError(CE_Failure, CPLE_FileIO, "Cannot open %s",
+                 osSourceWithoutSlash.c_str());
+        return false;
+    }
+
+    VSILFILE* fpOut = VSIFOpenExL(osTarget.c_str(), "wb", TRUE);
+    if( fpOut == nullptr )
+    {
+        CPLError(CE_Failure, CPLE_FileIO, "Cannot create %s", osTarget.c_str());
+        VSIFCloseL(fpIn);
+        return false;
+    }
+
+    bool ret = true;
+    constexpr size_t nBufferSize = 10 * 4096;
+    std::vector<GByte> abyBuffer(nBufferSize, 0);
+    GUIntBig nOffset = 0;
+    while( true )
+    {
+        size_t nRead = VSIFReadL(&abyBuffer[0], 1, nBufferSize, fpIn);
+        size_t nWritten = VSIFWriteL(&abyBuffer[0], 1, nRead, fpOut);
+        if( nWritten != nRead )
+        {
+            CPLError(CE_Failure, CPLE_FileIO,
+                     "Copying of %s to %s failed",
+                     osSourceWithoutSlash.c_str(), osTarget.c_str());
+            ret = false;
+            break;
+        }
+        nOffset += nRead;
+        if( pProgressFunc && !pProgressFunc(
+                double(nOffset) / sSource.st_size, osMsg.c_str(),
+                pProgressData) )
+        {
+            ret = false;
+            break;
+        }
+        if( nRead < nBufferSize )
+        {
+            break;
+        }
+    }
+
+    VSIFCloseL(fpIn);
+    if( VSIFCloseL(fpOut) != 0 )
+    {
+        ret = false;
+    }
+    return ret;
+}
+
 /************************************************************************/
 /*                         UpdateMapFromHandle()                        */
 /************************************************************************/
diff --git a/gdal/swig/include/cpl.i b/gdal/swig/include/cpl.i
index 94dceebd783d..4bd2d194cfcb 100644
--- a/gdal/swig/include/cpl.i
+++ b/gdal/swig/include/cpl.i
@@ -434,6 +434,29 @@ VSI_RETVAL VSIRename(const char * pszOld, const char *pszNew );
 %clear (const char* pszOld);
 %clear (const char* pszNew);
 
+#if defined(SWIGPYTHON)
+%rename (Sync) wrapper_VSISync;
+
+%apply (const char* utf8_path) {(const char* pszSource)};
+%apply (const char* utf8_path) {(const char* pszTarget)};
+%feature( "kwargs" ) wrapper_VSISync;
+
+%inline {
+bool wrapper_VSISync(const char* pszSource,
+                     const char* pszTarget,
+                     char** options = NULL,
+                     GDALProgressFunc callback=NULL,
+                     void* callback_data=NULL)
+{
+    return VSISync( pszSource, pszTarget, options, callback, callback_data, nullptr );
+}
+}
+
+%clear (const char* pszSource);
+%clear (const char* pszTarget);
+
+#endif
+
 const char* VSIGetActualURL(const char * utf8_path);
 
 %inline {
diff --git a/gdal/swig/python/extensions/gdal_wrap.cpp b/gdal/swig/python/extensions/gdal_wrap.cpp
index 0d229020b814..87f5ba6fb95e 100644
--- a/gdal/swig/python/extensions/gdal_wrap.cpp
+++ b/gdal/swig/python/extensions/gdal_wrap.cpp
@@ -4091,6 +4091,23 @@ int wrapper_HasThreadSupport()
 }
 
 
+bool wrapper_VSISync(const char* pszSource,
+                     const char* pszTarget,
+                     char** options = NULL,
+                     GDALProgressFunc callback=NULL,
+                     void* callback_data=NULL)
+{
+    return VSISync( pszSource, pszTarget, options, callback, callback_data, nullptr );
+}
+
+
+SWIGINTERNINLINE PyObject*
+  SWIG_From_bool  (bool value)
+{
+  return PyBool_FromLong(value ? 1 : 0);
+}
+
+
 retStringAndCPLFree* wrapper_VSIGetSignedURL(const char * utf8_path, char** options = NULL )
 {
     return VSIGetSignedURL( utf8_path, options );
@@ -4944,13 +4961,6 @@ SWIGINTERN OGRFeatureShadow *GDALDatasetShadow_GetNextFeature(GDALDatasetShadow
 SWIGINTERN bool GDALDatasetShadow_TestCapability(GDALDatasetShadow *self,char const *cap){
     return (GDALDatasetTestCapability(self, cap) > 0);
   }
-
-SWIGINTERNINLINE PyObject*
-  SWIG_From_bool  (bool value)
-{
-  return PyBool_FromLong(value ? 1 : 0);
-}
-
 SWIGINTERN OGRLayerShadow *GDALDatasetShadow_ExecuteSQL(GDALDatasetShadow *self,char const *statement,OGRGeometryShadow *spatialFilter=NULL,char const *dialect=""){
     OGRLayerShadow* layer = (OGRLayerShadow*) GDALDatasetExecuteSQL(self,
                                                       statement,
@@ -9282,6 +9292,223 @@ SWIGINTERN PyObject *_wrap_Rename(PyObject *SWIGUNUSEDPARM(self), PyObject *args
 }
 
 
+SWIGINTERN PyObject *_wrap_Sync(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) {
+  PyObject *resultobj = 0; int bLocalUseExceptionsCode = bUseExceptions;
+  char *arg1 = (char *) 0 ;
+  char *arg2 = (char *) 0 ;
+  char **arg3 = (char **) NULL ;
+  GDALProgressFunc arg4 = (GDALProgressFunc) NULL ;
+  void *arg5 = (void *) NULL ;
+  int bToFree1 = 0 ;
+  int bToFree2 = 0 ;
+  PyObject * obj0 = 0 ;
+  PyObject * obj1 = 0 ;
+  PyObject * obj2 = 0 ;
+  PyObject * obj3 = 0 ;
+  PyObject * obj4 = 0 ;
+  char *  kwnames[] = {
+    (char *) "pszSource",(char *) "pszTarget",(char *) "options",(char *) "callback",(char *) "callback_data", NULL 
+  };
+  bool result;
+  
+  /* %typemap(arginit) ( const char* callback_data=NULL)  */
+  PyProgressData *psProgressInfo;
+  psProgressInfo = (PyProgressData *) CPLCalloc(1,sizeof(PyProgressData));
+  psProgressInfo->nLastReported = -1;
+  psProgressInfo->psPyCallback = NULL;
+  psProgressInfo->psPyCallbackData = NULL;
+  arg5 = psProgressInfo;
+  if (!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO|OOO:Sync",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4)) SWIG_fail;
+  {
+    /* %typemap(in) (const char *utf8_path) */
+    arg1 = GDALPythonObjectToCStr( obj0, &bToFree1 );
+    if (arg1 == NULL)
+    {
+      PyErr_SetString( PyExc_RuntimeError, "not a string" );
+      SWIG_fail;
+    }
+  }
+  {
+    /* %typemap(in) (const char *utf8_path) */
+    arg2 = GDALPythonObjectToCStr( obj1, &bToFree2 );
+    if (arg2 == NULL)
+    {
+      PyErr_SetString( PyExc_RuntimeError, "not a string" );
+      SWIG_fail;
+    }
+  }
+  if (obj2) {
+    {
+      /* %typemap(in) char **options */
+      /* Check if is a list (and reject strings, that are seen as sequence of characters)  */
+      if ( ! PySequence_Check(obj2) || PyUnicode_Check(obj2)
+  #if PY_VERSION_HEX < 0x03000000
+        || PyString_Check(obj2)
+  #endif
+        ) {
+        PyErr_SetString(PyExc_TypeError,"not a sequence");
+        SWIG_fail;
+      }
+      
+      Py_ssize_t size = PySequence_Size(obj2);
+      if( size != (int)size ) {
+        PyErr_SetString(PyExc_TypeError, "too big sequence");
+        SWIG_fail;
+      }
+      for (int i = 0; i < (int)size; i++) {
+        PyObject* pyObj = PySequence_GetItem(obj2,i);
+        if (PyUnicode_Check(pyObj))
+        {
+          char *pszStr;
+          Py_ssize_t nLen;
+          PyObject* pyUTF8Str = PyUnicode_AsUTF8String(pyObj);
+          if( !pyUTF8Str )
+          {
+            Py_DECREF(pyObj);
+            PyErr_SetString(PyExc_TypeError,"invalid Unicode sequence");
+            SWIG_fail;
+          }
+#if PY_VERSION_HEX >= 0x03000000
+          PyBytes_AsStringAndSize(pyUTF8Str, &pszStr, &nLen);
+#else
+          PyString_AsStringAndSize(pyUTF8Str, &pszStr, &nLen);
+#endif
+          arg3 = CSLAddString( arg3, pszStr );
+          Py_XDECREF(pyUTF8Str);
+        }
+#if PY_VERSION_HEX >= 0x03000000
+        else if (PyBytes_Check(pyObj))
+        arg3 = CSLAddString( arg3, PyBytes_AsString(pyObj) );
+#else
+        else if (PyString_Check(pyObj))
+        arg3 = CSLAddString( arg3, PyString_AsString(pyObj) );
+#endif
+        else
+        {
+          Py_DECREF(pyObj);
+          PyErr_SetString(PyExc_TypeError,"sequence must contain strings");
+          SWIG_fail;
+        }
+        Py_DECREF(pyObj);
+      }
+    }
+  }
+  if (obj3) {
+    {
+      /* %typemap(in) (GDALProgressFunc callback = NULL) */
+      /* callback_func typemap */
+      
+      /* In some cases 0 is passed instead of None. */
+      /* See https://github.com/OSGeo/gdal/pull/219 */
+      if ( PyLong_Check(obj3) || PyInt_Check(obj3) )
+      {
+        if( PyLong_AsLong(obj3) == 0 )
+        {
+          obj3 = Py_None;
+        }
+      }
+      
+      if (obj3 && obj3 != Py_None ) {
+        void* cbfunction = NULL;
+        CPL_IGNORE_RET_VAL(SWIG_ConvertPtr( obj3,
+            (void**)&cbfunction,
+            SWIGTYPE_p_f_double_p_q_const__char_p_void__int,
+            SWIG_POINTER_EXCEPTION | 0 ));
+        
+        if ( cbfunction == GDALTermProgress ) {
+          arg4 = GDALTermProgress;
+        } else {
+          if (!PyCallable_Check(obj3)) {
+            PyErr_SetString( PyExc_RuntimeError,
+              "Object given is not a Python function" );
+            SWIG_fail;
+          }
+          psProgressInfo->psPyCallback = obj3;
+          arg4 = PyProgressProxy;
+        }
+        
+      }
+      
+    }
+  }
+  if (obj4) {
+    {
+      /* %typemap(in) ( void* callback_data=NULL)  */
+      psProgressInfo->psPyCallbackData = obj4 ;
+    }
+  }
+  {
+    if (!arg1) {
+      SWIG_exception(SWIG_ValueError,"Received a NULL pointer.");
+    }
+  }
+  {
+    if (!arg2) {
+      SWIG_exception(SWIG_ValueError,"Received a NULL pointer.");
+    }
+  }
+  {
+    if ( bUseExceptions ) {
+      ClearErrorState();
+    }
+    {
+      SWIG_PYTHON_THREAD_BEGIN_ALLOW;
+      result = (bool)wrapper_VSISync((char const *)arg1,(char const *)arg2,arg3,arg4,arg5);
+      SWIG_PYTHON_THREAD_END_ALLOW;
+    }
+#ifndef SED_HACKS
+    if ( bUseExceptions ) {
+      CPLErr eclass = CPLGetLastErrorType();
+      if ( eclass == CE_Failure || eclass == CE_Fatal ) {
+        SWIG_exception( SWIG_RuntimeError, CPLGetLastErrorMsg() );
+      }
+    }
+#endif
+  }
+  resultobj = SWIG_From_bool(static_cast< bool >(result));
+  {
+    /* %typemap(freearg) (const char *utf8_path) */
+    GDALPythonFreeCStr(arg1, bToFree1);
+  }
+  {
+    /* %typemap(freearg) (const char *utf8_path) */
+    GDALPythonFreeCStr(arg2, bToFree2);
+  }
+  {
+    /* %typemap(freearg) char **options */
+    CSLDestroy( arg3 );
+  }
+  {
+    /* %typemap(freearg) ( void* callback_data=NULL)  */
+    
+    CPLFree(psProgressInfo);
+    
+  }
+  if ( ReturnSame(bLocalUseExceptionsCode) ) { CPLErr eclass = CPLGetLastErrorType(); if ( eclass == CE_Failure || eclass == CE_Fatal ) { Py_XDECREF(resultobj); SWIG_Error( SWIG_RuntimeError, CPLGetLastErrorMsg() ); return NULL; } }
+  return resultobj;
+fail:
+  {
+    /* %typemap(freearg) (const char *utf8_path) */
+    GDALPythonFreeCStr(arg1, bToFree1);
+  }
+  {
+    /* %typemap(freearg) (const char *utf8_path) */
+    GDALPythonFreeCStr(arg2, bToFree2);
+  }
+  {
+    /* %typemap(freearg) char **options */
+    CSLDestroy( arg3 );
+  }
+  {
+    /* %typemap(freearg) ( void* callback_data=NULL)  */
+    
+    CPLFree(psProgressInfo);
+    
+  }
+  return NULL;
+}
+
+
 SWIGINTERN PyObject *_wrap_GetActualURL(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0; int bLocalUseExceptionsCode = bUseExceptions;
   char *arg1 = (char *) 0 ;
@@ -34471,6 +34698,7 @@ static PyMethodDef SwigMethods[] = {
 	 { (char *)"MkdirRecursive", _wrap_MkdirRecursive, METH_VARARGS, (char *)"MkdirRecursive(char const * utf8_path, int mode) -> VSI_RETVAL"},
 	 { (char *)"RmdirRecursive", _wrap_RmdirRecursive, METH_VARARGS, (char *)"RmdirRecursive(char const * utf8_path) -> VSI_RETVAL"},
 	 { (char *)"Rename", _wrap_Rename, METH_VARARGS, (char *)"Rename(char const * pszOld, char const * pszNew) -> VSI_RETVAL"},
+	 { (char *)"Sync", (PyCFunction) _wrap_Sync, METH_VARARGS | METH_KEYWORDS, (char *)"Sync(char const * pszSource, char const * pszTarget, char ** options=None, GDALProgressFunc callback=0, void * callback_data=None) -> bool"},
 	 { (char *)"GetActualURL", _wrap_GetActualURL, METH_VARARGS, (char *)"GetActualURL(char const * utf8_path) -> char const *"},
 	 { (char *)"GetSignedURL", _wrap_GetSignedURL, METH_VARARGS, (char *)"GetSignedURL(char const * utf8_path, char ** options=None) -> retStringAndCPLFree *"},
 	 { (char *)"GetFileSystemsPrefixes", _wrap_GetFileSystemsPrefixes, METH_VARARGS, (char *)"GetFileSystemsPrefixes() -> char **"},
diff --git a/gdal/swig/python/osgeo/gdal.py b/gdal/swig/python/osgeo/gdal.py
index 405589191e2c..42702acd7976 100644
--- a/gdal/swig/python/osgeo/gdal.py
+++ b/gdal/swig/python/osgeo/gdal.py
@@ -1425,6 +1425,10 @@ def Rename(*args):
     """Rename(char const * pszOld, char const * pszNew) -> VSI_RETVAL"""
     return _gdal.Rename(*args)
 
+def Sync(*args, **kwargs):
+    """Sync(char const * pszSource, char const * pszTarget, char ** options=None, GDALProgressFunc callback=0, void * callback_data=None) -> bool"""
+    return _gdal.Sync(*args, **kwargs)
+
 def GetActualURL(*args):
     """GetActualURL(char const * utf8_path) -> char const *"""
     return _gdal.GetActualURL(*args)

From 509f13f8ec796f713d5d29479cbbb6e203878746 Mon Sep 17 00:00:00 2001
From: Even Rouault <even.rouault@spatialys.com>
Date: Fri, 9 Nov 2018 16:18:50 +0100
Subject: [PATCH 046/488] Doc adjustments [ci skip]

---
 gdal/port/cpl_azure.cpp |  2 +-
 gdal/port/cpl_vsil.cpp  | 10 ++++++----
 2 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/gdal/port/cpl_azure.cpp b/gdal/port/cpl_azure.cpp
index 4a7a221af416..093c44a77bec 100644
--- a/gdal/port/cpl_azure.cpp
+++ b/gdal/port/cpl_azure.cpp
@@ -200,9 +200,9 @@ CPLString AzureCSGetParameter(const CPLString& osStr, const char* pszKey,
     {
         const char* pszMsg = CPLSPrintf(
             "%s missing in AZURE_STORAGE_CONNECTION_STRING", pszKey);
-        CPLDebug("AZURE", "%s", pszMsg);
         if( bErrorIfMissing )
         {
+            CPLDebug("AZURE", "%s", pszMsg);
             VSIError(VSIE_AWSInvalidCredentials, "%s", pszMsg);
         }
         return CPLString();
diff --git a/gdal/port/cpl_vsil.cpp b/gdal/port/cpl_vsil.cpp
index 5bf78b40c2e3..e521867ed9ca 100644
--- a/gdal/port/cpl_vsil.cpp
+++ b/gdal/port/cpl_vsil.cpp
@@ -453,14 +453,14 @@ int VSIRename( const char * oldpath, const char * newpath )
  * \brief Synchronize a source file/directory with a target file/directory.
  *
  * This is a analog of the 'rsync' utility. In the current implementation,
- * rsync would be more efficient for local file copying, but VSIRsync() main
+ * rsync would be more efficient for local file copying, but VSISync() main
  * interest is when the source or target is a remote
  * file system like /vsis3/ or /vsigs/, in which case it can take into account
  * the timestamps of the files (or optionally the ETag/MD5Sum) to avoid
  * unneeded copy operations.
  *
- * Note: current only implemented efficiently for local filesystem <--> /vsis3/
- * and local filesystem <--> /vsigs/
+ * Note: currently only implemented efficiently for local filesystem <-->
+ * remote filesystem.
  *
  * Similarly to rsync behaviour, if the source filename ends with a slash,
  * it means that the content of the directory must be copied, but not the
@@ -478,7 +478,7 @@ int VSIRename( const char * oldpath, const char * newpath )
  * <li>SYNC_STRATEGY=TIMESTAMP/ETAG. Determines which criterion is used to
  *     determine if a target file must be replaced when it already exists and
  *     has the same file size as the source.
- *     Only apply for a source being a network filesystem.
+ *     Only applies for a source or target being a network filesystem.
  *
  *     The default is TIMESTAMP (similarly to how 'aws s3 sync' works), that is
  *     to say that for an upload operation, a remote file is
@@ -490,6 +490,8 @@ int VSIRename( const char * oldpath, const char * newpath )
  *     the MD5Sum of the file content, which is only true in the case of /vsis3/
  *     for files not using KMS server side encryption and uploaded in a single
  *     PUT operation (so smaller than 50 MB given the default used by GDAL).
+ *     Only to be used for /vsis3/, /vsigs/ or other filesystems using a
+ *     MD5Sum as ETAG.
  * </li>
  * </ul>
  * @param pProgressFunc Progress callback, or NULL.

From a5343ed6a8af2495681940a9d1cc57c074bddbf9 Mon Sep 17 00:00:00 2001
From: Even Rouault <even.rouault@spatialys.com>
Date: Sat, 10 Nov 2018 09:49:04 +0100
Subject: [PATCH 047/488] OpenFileGDB: fix potential crash on corrupted
 datasets. Fixes https://bugs.chromium.org/p/oss-fuzz/issues/detail?id=11313.
 Credit to OSS Fuzz

---
 .../openfilegdb/ogropenfilegdbdatasource.cpp  | 56 +++++++++++--------
 1 file changed, 32 insertions(+), 24 deletions(-)

diff --git a/gdal/ogr/ogrsf_frmts/openfilegdb/ogropenfilegdbdatasource.cpp b/gdal/ogr/ogrsf_frmts/openfilegdb/ogropenfilegdbdatasource.cpp
index f448cfe478be..ba1f7e557a23 100644
--- a/gdal/ogr/ogrsf_frmts/openfilegdb/ogropenfilegdbdatasource.cpp
+++ b/gdal/ogr/ogrsf_frmts/openfilegdb/ogropenfilegdbdatasource.cpp
@@ -183,6 +183,7 @@ int OGROpenFileGDBDataSource::Open( const char* pszFilename )
     }
 
     if( !(oTable.GetFieldCount() >= 2 &&
+          oTable.GetTotalRecordCount() < 100000 &&
           oTable.GetField(0)->GetName() == "Name" &&
           oTable.GetField(0)->GetType() == FGFT_STRING &&
           oTable.GetField(1)->GetName() == "FileFormat" &&
@@ -197,40 +198,47 @@ int OGROpenFileGDBDataSource::Open( const char* pszFilename )
     int iGDBObjectClasses = -1; /* V9.X */
 
     std::vector<std::string> aosTableNames;
-    for( int i=0;i<oTable.GetTotalRecordCount();i++)
+    try
     {
-        if( !oTable.SelectRow(i) )
-        {
-            if( oTable.HasGotError() )
-                break;
-            aosTableNames.push_back("");
-            continue;
-        }
-
-        const OGRField* psField = oTable.GetFieldValue(0);
-        if( psField != nullptr )
+        for( int i=0;i<oTable.GetTotalRecordCount();i++)
         {
-            aosTableNames.push_back(psField->String);
-
-            if( strcmp(psField->String, "GDB_Items") == 0 )
+            if( !oTable.SelectRow(i) )
             {
-                iGDBItems = i;
+                if( oTable.HasGotError() )
+                    break;
+                aosTableNames.push_back("");
+                continue;
             }
-            else if( strcmp(psField->String, "GDB_FeatureClasses") == 0 )
+
+            const OGRField* psField = oTable.GetFieldValue(0);
+            if( psField != nullptr )
             {
-                iGDBFeatureClasses = i;
+                aosTableNames.push_back(psField->String);
+
+                if( strcmp(psField->String, "GDB_Items") == 0 )
+                {
+                    iGDBItems = i;
+                }
+                else if( strcmp(psField->String, "GDB_FeatureClasses") == 0 )
+                {
+                    iGDBFeatureClasses = i;
+                }
+                else if( strcmp(psField->String, "GDB_ObjectClasses") == 0 )
+                {
+                    iGDBObjectClasses = i;
+                }
+                m_osMapNameToIdx[psField->String] = 1 + i;
             }
-            else if( strcmp(psField->String, "GDB_ObjectClasses") == 0 )
+            else
             {
-                iGDBObjectClasses = i;
+                aosTableNames.push_back("");
             }
-            m_osMapNameToIdx[psField->String] = 1 + i;
-        }
-        else
-        {
-            aosTableNames.push_back("");
         }
     }
+    catch( const std::exception& )
+    {
+        return FALSE;
+    }
 
     oTable.Close();
 

From c4b4dfe1b5b03622575bd88104977ea52d08ddb7 Mon Sep 17 00:00:00 2001
From: Even Rouault <even.rouault@spatialys.com>
Date: Sat, 10 Nov 2018 16:21:34 +0100
Subject: [PATCH 048/488] Internal libtiff: resync with change of value for
 COMPRESSION_ZSTD and COMPRESSION_WEBP (breaking change)

---
 autotest/gcore/data/byte_zstd.tif             | Bin 576 -> 576 bytes
 autotest/gcore/data/byte_zstd_corrupted.tif   | Bin 576 -> 576 bytes
 autotest/gcore/data/byte_zstd_corrupted2.tif  | Bin 576 -> 576 bytes
 autotest/gcore/data/tif_webp.tif              | Bin 1774 -> 1774 bytes
 .../gcore/data/tif_webp_huge_single_strip.tif | Bin 850 -> 850 bytes
 gdal/frmts/gtiff/gtiff.h                      |   4 ++--
 gdal/frmts/gtiff/libtiff/tiff.h               |   4 ++--
 7 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/autotest/gcore/data/byte_zstd.tif b/autotest/gcore/data/byte_zstd.tif
index ec19af8efa35301e347cc2a746fe20febfa275c0..ca5e1de3c270a326bd95a21603d8fb1a6d6b5f8f 100644
GIT binary patch
delta 13
UcmX@Wa)4!m8B@UFjTRhC03u)nR{#J2

delta 13
UcmX@Wa)4!m8B<=zMhgxm03q!JIsgCw

diff --git a/autotest/gcore/data/byte_zstd_corrupted.tif b/autotest/gcore/data/byte_zstd_corrupted.tif
index 980e88a26b7d921ade77bd3fb3118ea10c1d85b1..d2d7378ce249aa65ae78a09029df2bb77f9e6582 100644
GIT binary patch
delta 13
UcmX@Wa)4!m8B@UFjTRhC03u)nR{#J2

delta 13
UcmX@Wa)4!m8B<=zMhgxm03q!JIsgCw

diff --git a/autotest/gcore/data/byte_zstd_corrupted2.tif b/autotest/gcore/data/byte_zstd_corrupted2.tif
index 26de0a304cd8bff8ca2e45c34cd4d4a487ed5d46..d3a1c3c7eacc92bf629cfb83c28f65f4bfb89575 100644
GIT binary patch
delta 13
UcmX@Wa)4!m8B@UFjTRhC03u)nR{#J2

delta 13
UcmX@Wa)4!m8B<=zMhgxm03q!JIsgCw

diff --git a/autotest/gcore/data/tif_webp.tif b/autotest/gcore/data/tif_webp.tif
index 8ec4995a9392bfa60990cb9b7226a7da29726bad..ebefb014a53f301ead860c7aba32be9902d962b3 100644
GIT binary patch
delta 13
UcmaFI`;K>l8B^fljTYP304UrAcmMzZ

delta 13
UcmaFI`;K>l8B>18MvHB104Qk%TL1t6

diff --git a/autotest/gcore/data/tif_webp_huge_single_strip.tif b/autotest/gcore/data/tif_webp_huge_single_strip.tif
index 0ea6c28b7f48e8cce66b41026d155404211e18f0..297110aa1fae489ab69d399fa6553260d1d0bd23 100644
GIT binary patch
delta 13
Ucmcb_c8P6*8B^fljTTbO03>GwlK=n!

delta 13
Ucmcb_c8P6*8B>18Mhhus03-ASb^rhX

diff --git a/gdal/frmts/gtiff/gtiff.h b/gdal/frmts/gtiff/gtiff.h
index ad75610bd267..ce0f8ed39ceb 100644
--- a/gdal/frmts/gtiff/gtiff.h
+++ b/gdal/frmts/gtiff/gtiff.h
@@ -97,7 +97,7 @@ uint16 GTiffGetAlphaValue(const char* pszValue, uint16 nDefault);
 #endif
 
 #if !defined(COMPRESSION_ZSTD)
-#define     COMPRESSION_ZSTD        34926   /* ZSTD */
+#define     COMPRESSION_ZSTD        50000   /* ZSTD */
 #endif
 
 #if !defined(TIFFTAG_ZSTD_LEVEL)
@@ -109,7 +109,7 @@ uint16 GTiffGetAlphaValue(const char* pszValue, uint16 nDefault);
 #endif
 
 #if !defined(COMPRESSION_WEBP)
-#define     COMPRESSION_WEBP        34927   /* WebP */
+#define     COMPRESSION_WEBP        50001   /* WebP */
 #endif
 
 #if !defined(TIFFTAG_WEBP_LEVEL)
diff --git a/gdal/frmts/gtiff/libtiff/tiff.h b/gdal/frmts/gtiff/libtiff/tiff.h
index 116ac34effe4..5b0a0c90f67a 100644
--- a/gdal/frmts/gtiff/libtiff/tiff.h
+++ b/gdal/frmts/gtiff/libtiff/tiff.h
@@ -190,8 +190,8 @@ typedef enum {
 #define     COMPRESSION_LERC            34887   /* ESRI Lerc codec: https://github.com/Esri/lerc */
 /* compression codes 34887-34889 are reserved for ESRI */
 #define	    COMPRESSION_LZMA		34925	/* LZMA2 */
-#define	    COMPRESSION_ZSTD		34926	/* ZSTD: WARNING not registered in Adobe-maintained registry */
-#define	    COMPRESSION_WEBP		34927	/* WEBP: WARNING not registered in Adobe-maintained registry */
+#define	    COMPRESSION_ZSTD		50000	/* ZSTD: WARNING not registered in Adobe-maintained registry */
+#define	    COMPRESSION_WEBP		50001	/* WEBP: WARNING not registered in Adobe-maintained registry */
 #define	TIFFTAG_PHOTOMETRIC		262	/* photometric interpretation */
 #define	    PHOTOMETRIC_MINISWHITE	0	/* min value is white */
 #define	    PHOTOMETRIC_MINISBLACK	1	/* min value is black */

From ca7aa5677aab8221ad4251ae7aa044a3b761a79c Mon Sep 17 00:00:00 2001
From: Even Rouault <even.rouault@spatialys.com>
Date: Mon, 12 Nov 2018 08:53:03 +0100
Subject: [PATCH 049/488] Internal libtiff: now at v4.0.10

---
 gdal/frmts/gtiff/libtiff/tiffvers.h | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/gdal/frmts/gtiff/libtiff/tiffvers.h b/gdal/frmts/gtiff/libtiff/tiffvers.h
index 7c415740f655..403d61be04b5 100644
--- a/gdal/frmts/gtiff/libtiff/tiffvers.h
+++ b/gdal/frmts/gtiff/libtiff/tiffvers.h
@@ -1,4 +1,4 @@
-#define TIFFLIB_VERSION_STR "LIBTIFF, Version 4.0.9\nCopyright (c) 1988-1996 Sam Leffler\nCopyright (c) 1991-1996 Silicon Graphics, Inc."
+#define TIFFLIB_VERSION_STR "LIBTIFF, Version 4.0.10\nCopyright (c) 1988-1996 Sam Leffler\nCopyright (c) 1991-1996 Silicon Graphics, Inc."
 /*
  * This define can be used in code that requires
  * compilation-related definitions specific to a
@@ -6,4 +6,4 @@
  * version checking should be done based on the
  * string returned by TIFFGetVersion.
  */
-#define TIFFLIB_VERSION 20171118
+#define TIFFLIB_VERSION 20181110

From 76b0e9fd8e1149b8a412c07a964167c19100271b Mon Sep 17 00:00:00 2001
From: drons <drons@list.ru>
Date: Mon, 12 Nov 2018 22:43:36 +0300
Subject: [PATCH 050/488] PRF: Add georeference shift from pixel's center to
 top-left

---
 gdal/frmts/prf/phprfdataset.cpp | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/gdal/frmts/prf/phprfdataset.cpp b/gdal/frmts/prf/phprfdataset.cpp
index 445a02a0f112..58a8498acea5 100644
--- a/gdal/frmts/prf/phprfdataset.cpp
+++ b/gdal/frmts/prf/phprfdataset.cpp
@@ -615,6 +615,9 @@ GDALDataset* PhPrfDataset::Open( GDALOpenInfo* poOpenInfo )
             adfGeoTrans[4] = 0;
             adfGeoTrans[5] = (adfDemMetadata[2] - adfDemMetadata[3])/(nSizeY - 1);
 
+            adfGeoTrans[0] -= 0.5 * adfGeoTrans[1];
+            adfGeoTrans[3] -= 0.5 * adfGeoTrans[5];
+
             if( bDemShiftOk )
             {
                 adfGeoTrans[0] += adfDemShift[0];

From f358ef36ce3adb7ed85ec59a6cbad99f78de3463 Mon Sep 17 00:00:00 2001
From: drons <drons@list.ru>
Date: Mon, 12 Nov 2018 23:00:30 +0300
Subject: [PATCH 051/488] PRF: Add georeference test for x-dem files

---
 autotest/gdrivers/data/PRF/dem.x-dem |  8 ++++----
 autotest/gdrivers/prf.py             | 10 +++++++++-
 2 files changed, 13 insertions(+), 5 deletions(-)

diff --git a/autotest/gdrivers/data/PRF/dem.x-dem b/autotest/gdrivers/data/PRF/dem.x-dem
index 03588b00d8b8..9b3d7711b05f 100644
--- a/autotest/gdrivers/data/PRF/dem.x-dem
+++ b/autotest/gdrivers/data/PRF/dem.x-dem
@@ -18,10 +18,10 @@
     <i n="bytes_ps" v="4"/>
     <s n="channels" v="#Z"/>
   </x>
-  <d n="XR_0" v="1"/>
-  <d n="XR_1" v="2"/>
-  <d n="YR_0" v="3"/>
-  <d n="YR_1" v="4"/>
+  <d n="XR_0" v="2"/>
+  <d n="XR_1" v="4331"/>
+  <d n="YR_0" v="4"/>
+  <d n="YR_1" v="9328"/>
   <d n="ZR_0" v="5"/>
   <d n="ZR_1" v="6"/>
   <d n="BadZ" v="-1.1111110000000000e+006"/>
diff --git a/autotest/gdrivers/prf.py b/autotest/gdrivers/prf.py
index cbe21c4509e5..03338af0339c 100755
--- a/autotest/gdrivers/prf.py
+++ b/autotest/gdrivers/prf.py
@@ -98,13 +98,21 @@ def prf_3():
 
     return 'success'
 
+
+def prf_4():
+
+    tst = gdaltest.GDALTest('prf', './PRF/dem.x-dem', 1, 0)
+    return tst.testOpen(check_gt=(1.5, 1.0, 0.0, 9329.0, 0.0, -2.0))
+
+
 ###############################################################################
 
 
 gdaltest_list = [
     prf_1,
     prf_2,
-    prf_3
+    prf_3,
+    prf_4
 ]
 
 if __name__ == '__main__':

From e8c9bea5dbe8e90d01d575f94a040fcaee27c24f Mon Sep 17 00:00:00 2001
From: Even Rouault <even.rouault@spatialys.com>
Date: Tue, 13 Nov 2018 12:13:41 +0100
Subject: [PATCH 052/488] GDALDestroy(): no longer call it automatically on
 GCC/CLang (non-MSVC) builds

Experiments have shown that a __attribute__((destructor )) function is called
*AFTER* the destructor of static C++ objects. Which is prone to crash is
code called by this destructor function then uses those C++ objects.
There could have been a solution by making the destructor function a C++
object itself and playing with gcc __attribute__((init_priority(XXXX))),
unfortunately the destructor of static C++ objects in functions/methods
is always called before the destructor of objects with explicit priority,
so there is no workaround.

With MSVC, apparently according to
https://stackoverflow.com/questions/4496233/which-is-called-first-dllmain-or-global-static-object-constructor
DllMain(DLL_PROCESS_DETACH) is called before C++ object destruction,
so it seems safe to keep it.
---
 gdal/gcore/gdaldllmain.cpp | 24 +++++++-----------------
 1 file changed, 7 insertions(+), 17 deletions(-)

diff --git a/gdal/gcore/gdaldllmain.cpp b/gdal/gcore/gdaldllmain.cpp
index 9e0383e43a71..fac9b6da54da 100644
--- a/gdal/gcore/gdaldllmain.cpp
+++ b/gdal/gcore/gdaldllmain.cpp
@@ -56,10 +56,15 @@ void CPLFinalizeTLS();
  * This function calls GDALDestroyDriverManager() and OGRCleanupAll() and
  * finalize Thread Local Storage variables.
  *
- * This function should *not* usually be explicitly called by application code
- * if GDAL is dynamically linked, since it is automatically called through
+ * Prior to GDAL 2.4.0, this function should normally be explicitly called by
+ * application code if GDAL is dynamically linked (but that does not hurt),
+ * since it was automatically called through
  * the unregistration mechanisms of dynamic library loading.
  *
+ * Since GDAL 2.4.0, this function may be called by application code, since
+ * it is no longer called automatically, on non-MSVC builds, due to ordering
+ * problems with respect to automatic destruction of global C++ objects.
+ *
  * Note: no GDAL/OGR code should be called after this call!
  *
  * @since GDAL 2.0
@@ -100,7 +105,6 @@ void GDALDestroy(void)
 #ifdef __GNUC__
 
 static void GDALInitialize() __attribute__ ((constructor)) ;
-static void GDALDestructor() __attribute__ ((destructor)) ;
 
 /************************************************************************/
 /* Called when GDAL is loaded by loader or by dlopen(),                 */
@@ -118,20 +122,6 @@ static void GDALInitialize()
 #endif
 }
 
-/************************************************************************/
-/* Called when GDAL is unloaded by loader or by dlclose(),              */
-/* and before dlclose() returns.                                        */
-/************************************************************************/
-
-static void GDALDestructor()
-{
-    if( bGDALDestroyAlreadyCalled )
-        return;
-    if( !CPLTestBool(CPLGetConfigOption("GDAL_DESTROY", "YES")) )
-        return;
-    GDALDestroy();
-}
-
 #endif // __GNUC__
 
 /************************************************************************/

From 41babc2c7cb61ab76c6a3772735b20e6610eca52 Mon Sep 17 00:00:00 2001
From: Even Rouault <even.rouault@spatialys.com>
Date: Wed, 14 Nov 2018 00:15:52 +0100
Subject: [PATCH 053/488] Overview / RasterIO resampling: do not use nodata
 value as a valid output value

---
 autotest/gcore/rasterio.py         |  81 +++++++++++++
 autotest/gdrivers/vrtpansharpen.py |   4 +-
 gdal/gcore/overview.cpp            | 180 ++++++++++++++++++++++++++---
 3 files changed, 249 insertions(+), 16 deletions(-)

diff --git a/autotest/gcore/rasterio.py b/autotest/gcore/rasterio.py
index 273badb3303a..76e15a805188 100755
--- a/autotest/gcore/rasterio.py
+++ b/autotest/gcore/rasterio.py
@@ -1127,6 +1127,86 @@ def rasterio_lanczos_nodata():
 
     return 'success'
 
+###############################################################################
+
+
+def rasterio_resampled_value_is_nodata():
+
+    gdal.FileFromMemBuffer('/vsimem/in.asc',
+"""ncols        4
+nrows        4
+xllcorner    440720.000000000000
+yllcorner    3750120.000000000000
+cellsize     60.000000000000
+nodata_value 0
+ -1.1 -1.1 1.1 1.1
+ -1.1 -1.1 1.1 1.1
+ -1.1 -1.1 1.1 1.1
+ -1.1 -1.1 1.1 1.1""")
+
+    ds = gdal.Open('/vsimem/in.asc')
+
+    data = ds.GetRasterBand(1).ReadRaster(buf_xsize=1,
+                                          buf_ysize=1,
+                                          resample_alg=gdal.GRIORA_Lanczos)
+    data_ar = struct.unpack('f' * 1, data)
+    expected_ar = (1.1754943508222875e-38, )
+    if data_ar != expected_ar:
+        gdaltest.post_reason('fail')
+        print(data_ar)
+        return 'fail'
+
+    data = ds.GetRasterBand(1).ReadRaster(buf_xsize=1,
+                                          buf_ysize=1,
+                                          resample_alg=gdal.GRIORA_Average)
+    data_ar = struct.unpack('f' * 1, data)
+    expected_ar = (1.1754943508222875e-38, )
+    if data_ar != expected_ar:
+        gdaltest.post_reason('fail')
+        print(data_ar)
+        return 'fail'
+
+    gdal.Unlink('/vsimem/in.asc')
+
+
+    gdal.FileFromMemBuffer('/vsimem/in.asc',
+"""ncols        4
+nrows        4
+xllcorner    440720.000000000000
+yllcorner    3750120.000000000000
+cellsize     60.000000000000
+nodata_value 0
+ -1 -1 1 1
+ -1 -1 1 1
+ -1 -1 1 1
+ -1 -1 1 1""")
+
+    ds = gdal.Open('/vsimem/in.asc')
+
+    data = ds.GetRasterBand(1).ReadRaster(buf_xsize=1,
+                                          buf_ysize=1,
+                                          resample_alg=gdal.GRIORA_Lanczos)
+    data_ar = struct.unpack('I' * 1, data)
+    expected_ar = (1, )
+    if data_ar != expected_ar:
+        gdaltest.post_reason('fail')
+        print(data_ar)
+        return 'fail'
+
+    data = ds.GetRasterBand(1).ReadRaster(buf_xsize=1,
+                                          buf_ysize=1,
+                                          resample_alg=gdal.GRIORA_Average)
+    data_ar = struct.unpack('I' * 1, data)
+    expected_ar = (1, )
+    if data_ar != expected_ar:
+        gdaltest.post_reason('fail')
+        print(data_ar)
+        return 'fail'
+
+    gdal.Unlink('/vsimem/in.asc')
+
+    return 'success'
+
 gdaltest_list = [
     rasterio_1,
     rasterio_2,
@@ -1145,6 +1225,7 @@ def rasterio_lanczos_nodata():
     rasterio_15,
     rasterio_16,
     rasterio_lanczos_nodata,
+    rasterio_resampled_value_is_nodata,
 ]
 
 # gdaltest_list = [ rasterio_16 ]
diff --git a/autotest/gdrivers/vrtpansharpen.py b/autotest/gdrivers/vrtpansharpen.py
index 185a192dd72e..677c0ec86843 100755
--- a/autotest/gdrivers/vrtpansharpen.py
+++ b/autotest/gdrivers/vrtpansharpen.py
@@ -1681,7 +1681,7 @@ def vrtpansharpen_9():
         gdaltest.post_reason('fail')
         return 'fail'
     cs = [vrt_ds.GetRasterBand(i + 1).Checksum() for i in range(vrt_ds.RasterCount)]
-    if cs not in([4179, 8767, 52257], [4175, 8758, 52249]):
+    if cs not in ([4640, 9158, 54450],):
         gdaltest.post_reason('fail')
         print(cs)
         return 'fail'
@@ -1723,7 +1723,7 @@ def vrtpansharpen_9():
         gdaltest.post_reason('fail')
         return 'fail'
     cs = [vrt_ds.GetRasterBand(i + 1).Checksum() for i in range(vrt_ds.RasterCount)]
-    if cs not in([4179, 8767, 52257], [4175, 8758, 52249]):
+    if cs not in ([4640, 9158, 54450],):
         gdaltest.post_reason('fail')
         print(cs)
         return 'fail'
diff --git a/gdal/gcore/overview.cpp b/gdal/gcore/overview.cpp
index 62b46e3c2d56..cc0c2b6636e5 100644
--- a/gdal/gcore/overview.cpp
+++ b/gdal/gcore/overview.cpp
@@ -249,6 +249,100 @@ static bool ReadColorTableAsArray( const GDALColorTable* poColorTable,
     return true;
 }
 
+/************************************************************************/
+/*                    GetReplacementValueIfNoData()                     */
+/************************************************************************/
+
+static float GetReplacementValueIfNoData(GDALDataType dt, int bHasNoData,
+                                         float fNoDataValue)
+{
+    float fReplacementVal = 0.0f;
+    if( bHasNoData )
+    {
+        if( dt == GDT_Byte )
+        {
+            if( fNoDataValue == std::numeric_limits<unsigned char>::max() )
+                fReplacementVal = static_cast<float>(
+                    std::numeric_limits<unsigned char>::max() - 1);
+            else
+                fReplacementVal = fNoDataValue + 1;
+        }
+        else if( dt == GDT_UInt16 )
+        {
+            if( fNoDataValue == std::numeric_limits<GUInt16>::max() )
+                fReplacementVal = static_cast<float>(
+                    std::numeric_limits<GUInt16>::max() - 1);
+            else
+                fReplacementVal = fNoDataValue + 1;
+        }
+        else if( dt == GDT_Int16 )
+        {
+            if( fNoDataValue == std::numeric_limits<GInt16>::max() )
+                fReplacementVal = static_cast<float>(
+                    std::numeric_limits<GInt16>::max() - 1);
+            else
+                fReplacementVal = fNoDataValue + 1;
+        }
+        else if( dt == GDT_UInt32 )
+        {
+            // Be careful to limited precision of float
+            fReplacementVal = fNoDataValue + 1;
+            double dfVal = fNoDataValue;
+            if( fReplacementVal >= static_cast<double>(std::numeric_limits<GUInt32>::max() - 128) )
+            {
+                while( fReplacementVal == fNoDataValue )
+                {
+                    dfVal -= 1.0;
+                    fReplacementVal = static_cast<float>(dfVal);
+                }
+            }
+            else
+            {
+                while( fReplacementVal == fNoDataValue )
+                {
+                    dfVal += 1.0;
+                    fReplacementVal = static_cast<float>(dfVal);
+                }
+            }
+        }
+        else if( dt == GDT_Int32 )
+        {
+            // Be careful to limited precision of float
+            fReplacementVal = fNoDataValue + 1;
+            double dfVal = fNoDataValue;
+            if( fReplacementVal >= static_cast<double>(std::numeric_limits<GInt32>::max() - 64) )
+            {
+                while( fReplacementVal == fNoDataValue )
+                {
+                    dfVal -= 1.0;
+                    fReplacementVal = static_cast<float>(dfVal);
+                }
+            }
+            else
+            {
+                while( fReplacementVal == fNoDataValue )
+                {
+                    dfVal += 1.0;
+                    fReplacementVal = static_cast<float>(dfVal);
+                }
+            }
+        }
+        else if( dt == GDT_Float32 || dt == GDT_Float64 )
+        {
+            if( fNoDataValue == 0 )
+            {
+                fReplacementVal = std::numeric_limits<float>::min();
+            }
+            else
+            {
+                fReplacementVal = static_cast<float>(
+                    fNoDataValue + 1e-7 * fNoDataValue);
+            }
+        }
+    }
+    return fReplacementVal;
+}
+
 /************************************************************************/
 /*                    GDALResampleChunk32R_Average()                    */
 /************************************************************************/
@@ -284,6 +378,8 @@ GDALResampleChunk32R_AverageT( double dfXRatioDstToSrc,
         tNoDataValue = 0;
     else
         tNoDataValue = static_cast<T>(fNoDataValue);
+    const T tReplacementVal = static_cast<T>(GetReplacementValueIfNoData(
+        poOverview->GetRasterDataType(), bHasNoData, fNoDataValue));
 
     int nChunkRightXOff = nChunkXOff + nChunkXSize;
     int nChunkBottomYOff = nChunkYOff + nChunkYSize;
@@ -441,7 +537,10 @@ GDALResampleChunk32R_AverageT( double dfXRatioDstToSrc,
                         + pSrcScanlineShifted[nChunkXSize]
                         + pSrcScanlineShifted[1+nChunkXSize];
 
-                    pDstScanline[iDstPixel] = static_cast<T>((nTotal + 2) / 4);
+                    auto nVal = static_cast<T>((nTotal + 2) / 4);
+                    if( bHasNoData && nVal == tNoDataValue )
+                        nVal = tReplacementVal;
+                    pDstScanline[iDstPixel] = nVal;
                     pSrcScanlineShifted += 2;
                 }
             }
@@ -480,11 +579,19 @@ GDALResampleChunk32R_AverageT( double dfXRatioDstToSrc,
                     }
                     else if( eWrkDataType == GDT_Byte ||
                              eWrkDataType == GDT_UInt16)
-                        pDstScanline[iDstPixel] =
-                            static_cast<T>((dfTotal + nCount / 2) / nCount);
+                    {
+                        auto nVal = static_cast<T>((dfTotal + nCount / 2) / nCount);
+                        if( bHasNoData && nVal == tNoDataValue )
+                            nVal = tReplacementVal;
+                        pDstScanline[iDstPixel] = nVal;
+                    }
                     else
-                        pDstScanline[iDstPixel] =
-                            static_cast<T>(dfTotal / nCount);
+                    {
+                        auto nVal = static_cast<T>(dfTotal / nCount);
+                        if( bHasNoData && nVal == tNoDataValue )
+                            nVal = tReplacementVal;
+                        pDstScanline[iDstPixel] = nVal;
+                    }
                 }
             }
         }
@@ -1772,6 +1879,33 @@ GDALResampleChunk32R_ConvolutionT( double dfXRatioDstToSrc,
 {
     if( !bHasNoData )
         fNoDataValue = 0.0f;
+    const float fReplacementVal = GetReplacementValueIfNoData(
+        papoDstBands[0]->GetRasterDataType(), bHasNoData, fNoDataValue);
+    // cppcheck-suppress unreadVariable
+    const int isIntegerDT = GDALDataTypeIsInteger(papoDstBands[0]->GetRasterDataType());
+    const auto nNodataValueInt64 = static_cast<GInt64>(fNoDataValue);
+
+    auto replaceValIfNodata =
+        [bHasNoData, isIntegerDT, nNodataValueInt64, fNoDataValue, fReplacementVal](float fVal)
+    {
+        if( bHasNoData )
+        {
+            if( isIntegerDT )
+            {
+                if( nNodataValueInt64 == static_cast<GInt64>(fVal) )
+                {
+                    // Do not use the nodata value
+                    return fReplacementVal;
+                }
+            }
+            else if( fNoDataValue == fVal )
+            {
+                // Do not use the nodata value
+                return fReplacementVal;
+            }
+        }
+        return fVal;
+    };
 
 /* -------------------------------------------------------------------- */
 /*      Allocate work buffers.                                          */
@@ -2098,6 +2232,14 @@ GDALResampleChunk32R_ConvolutionT( double dfXRatioDstToSrc,
                 GDALResampleConvolutionVertical_16cols(
                     padfHorizontalFilteredBand + j, nDstXSize, padfWeights,
                     nSrcLineCount, pafDstScanline + iFilteredPixelOff );
+                if( bHasNoData )
+                {
+                    for( int k = 0; k < 16; k++ )
+                    {
+                        pafDstScanline[iFilteredPixelOff + k] =
+                            replaceValIfNodata(pafDstScanline[iFilteredPixelOff + k]);
+                    }
+                }
             }
 #else
             for( ;
@@ -2107,16 +2249,24 @@ GDALResampleChunk32R_ConvolutionT( double dfXRatioDstToSrc,
                 GDALResampleConvolutionVertical_8cols(
                     padfHorizontalFilteredBand + j, nDstXSize, padfWeights,
                     nSrcLineCount, pafDstScanline + iFilteredPixelOff );
+                if( bHasNoData )
+                {
+                    for( int k = 0; k < 8; k++ )
+                    {
+                        pafDstScanline[iFilteredPixelOff + k] =
+                            replaceValIfNodata(pafDstScanline[iFilteredPixelOff + k]);
+                    }
+                }
             }
 #endif
 
             for( ; iFilteredPixelOff < nDstXSize; iFilteredPixelOff++, j++ )
             {
-                const double dfVal =
+                const float fVal = static_cast<float>(
                     GDALResampleConvolutionVertical(
                         padfHorizontalFilteredBand + j,
-                        nDstXSize, padfWeights, nSrcLineCount );
-                pafDstScanline[iFilteredPixelOff] = static_cast<float>(dfVal);
+                        nDstXSize, padfWeights, nSrcLineCount ));
+                pafDstScanline[iFilteredPixelOff] = replaceValIfNodata(fVal);
             }
 #else
             for( ;
@@ -2128,9 +2278,10 @@ GDALResampleChunk32R_ConvolutionT( double dfXRatioDstToSrc,
                 GDALResampleConvolutionVertical_2cols(
                     padfHorizontalFilteredBand + j, nDstXSize, padfWeights,
                     nSrcLineCount, dfVal1, dfVal2 );
-                pafDstScanline[iFilteredPixelOff] = static_cast<float>(dfVal1);
-                pafDstScanline[iFilteredPixelOff+1] =
-                    static_cast<float>(dfVal2);
+                pafDstScanline[iFilteredPixelOff] = replaceValIfNodata(
+                    static_cast<float>(dfVal1));
+                pafDstScanline[iFilteredPixelOff+1] = replaceValIfNodata(
+                    static_cast<float>(dfVal2));
             }
             if( iFilteredPixelOff < nDstXSize )
             {
@@ -2138,7 +2289,8 @@ GDALResampleChunk32R_ConvolutionT( double dfXRatioDstToSrc,
                     GDALResampleConvolutionVertical(
                         padfHorizontalFilteredBand + j,
                         nDstXSize, padfWeights, nSrcLineCount );
-                pafDstScanline[iFilteredPixelOff] = static_cast<float>(dfVal);
+                pafDstScanline[iFilteredPixelOff] = replaceValIfNodata(
+                    static_cast<float>(dfVal));
             }
 #endif
         }
@@ -2195,8 +2347,8 @@ GDALResampleChunk32R_ConvolutionT( double dfXRatioDstToSrc,
                 }
                 if( dfWeightSum > 0.0 )
                 {
-                    pafDstScanline[iFilteredPixelOff] =
-                        static_cast<float>(dfVal / dfWeightSum);
+                    pafDstScanline[iFilteredPixelOff] = replaceValIfNodata(
+                        static_cast<float>(dfVal / dfWeightSum));
                 }
                 else
                 {

From 86c49036793495ff504eedd6d8bb5046181c2e8f Mon Sep 17 00:00:00 2001
From: Michael Entin <mentin@users.noreply.github.com>
Date: Wed, 14 Nov 2018 07:49:57 -0800
Subject: [PATCH 054/488] CSV Documentation: describe producing CSV with
 GeoJSON formatted geometries (#1094)

* CSV Documentation: describe using ogr2ogr to create CSV with GeoJSON geometry fields

* Fix accidental edit
---
 gdal/ogr/ogrsf_frmts/csv/drv_csv.html | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/gdal/ogr/ogrsf_frmts/csv/drv_csv.html b/gdal/ogr/ogrsf_frmts/csv/drv_csv.html
index ff6a9a888b7a..1e8607c0635b 100644
--- a/gdal/ogr/ogrsf_frmts/csv/drv_csv.html
+++ b/gdal/ogr/ogrsf_frmts/csv/drv_csv.html
@@ -290,7 +290,9 @@ <h2>Creation Issues</h2>
 file is discarded. It is possible to export the geometry in its WKT representation by specifying
 GEOMETRY=<b>AS_WKT</b>. It is also possible to export point geometries into their X,Y,Z components (different
 columns in the csv file) by specifying GEOMETRY=<b>AS_XYZ</b>, GEOMETRY=<b>AS_XY</b> or GEOMETRY=<b>AS_YX</b>.
-The geometry column(s) will be prepended to the columns with the attributes values.</li><p>
+The geometry column(s) will be prepended to the columns with the attributes values.
+It is also possible to export geometries in GeoJSON representation using SQLite SQL dialect query,
+see example below.</li><p>
 <li><b>CREATE_CSVT</b>=YES/NO (Starting with GDAL 1.7.0): Create the associated .csvt file (see above paragraph)
 to describe the type of each column of the layer and its optional width and precision. Default value : NO</li><p>
 <li><b>SEPARATOR</b>=COMMA/SEMICOLON/TAB/SPACE (Starting with GDAL 1.7.0): Field separator character. Default value : COMMA</li><p>
@@ -324,6 +326,9 @@ <h3>Examples</h3>
 <li> This example shows using ogr2ogr to transform a shapefile with point geometry into a .csv file with the X,Y,Z coordinates of the points as first columns in the .csv file
 <pre>ogr2ogr -f CSV output.csv input.shp -lco GEOMETRY=AS_XYZ</pre>
 </li>
+<li> This example shows using ogr2ogr to transform a shapefile into a .csv file with geography field formatted using GeoJSON format.
+<pre>ogr2ogr -f CSV -dialect sqlite -sql "select AsGeoJSON(geometry) AS geom, * from input" output.csv input.shp</pre>
+</li>
 </ul>
 
 <h2>Particular datasources</h2>

From 5a9d61933f5494f590ea1a1c746f4ffd3b693242 Mon Sep 17 00:00:00 2001
From: Even Rouault <even.rouault@spatialys.com>
Date: Wed, 14 Nov 2018 17:49:45 +0100
Subject: [PATCH 055/488] CONTRIBUTING.md: add alternative for squashing all
 commits [ci skip]

---
 CONTRIBUTING.md | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index 22d516b84436..076a35c1a505 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -83,7 +83,15 @@ git rebase origin/master
 
 # At end of your work, make sure history is reasonable by folding non
 # significant commits into a consistent set
-git rebase -i master (use fixup for example to merge several commits together)
+git rebase -i master (use 'fixup' for example to merge several commits together,
+and 'reword' to modify commit messages)
+
+# or alternatively, in case there is a big number of commits and marking
+# all them as 'fixup' is tedious
+git fetch origin
+git rebase origin/master
+git reset --soft origin/master
+git commit -a -m "Put here the synthetic commit message"
 
 # push your branch
 git push my_user_name my_new_feature_branch

From a83a6243ec59e14acdcc6c149b47f956ef6c89a1 Mon Sep 17 00:00:00 2001
From: Even Rouault <even.rouault@spatialys.com>
Date: Thu, 15 Nov 2018 10:13:51 +0100
Subject: [PATCH 056/488] MVT doc: fix copy & paste error pointed by @velix [ci
 skip]

---
 gdal/ogr/ogrsf_frmts/mvt/drv_mvt.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/gdal/ogr/ogrsf_frmts/mvt/drv_mvt.html b/gdal/ogr/ogrsf_frmts/mvt/drv_mvt.html
index 66f117155053..3071c2b7bffd 100644
--- a/gdal/ogr/ogrsf_frmts/mvt/drv_mvt.html
+++ b/gdal/ogr/ogrsf_frmts/mvt/drv_mvt.html
@@ -194,7 +194,7 @@ <h2>Dataset creation options</h2>
 extension of tiles. Defaults to pbf.</li>
 <li><b>MINZOOM</b>=integer: Minimum zoom level at which tiles are generated. Defaults
 to 0.</li>
-<li><b>MAXZOOM</b>=integer: Minimum zoom level at which tiles are generated. Defaults
+<li><b>MAXZOOM</b>=integer: Maximum zoom level at which tiles are generated. Defaults
 to 5. Maximum supported value is 22</li>
 <li><b>CONF</b>=string: Layer configuration as a JSon serialized string.</li>
 <li><b>SIMPLIFICATION</b>=float: Simplification factor for linear or polygonal

From 094243ec5954391bc73d0b9c2e7e940d57003b63 Mon Sep 17 00:00:00 2001
From: Even Rouault <even.rouault@spatialys.com>
Date: Fri, 16 Nov 2018 00:01:37 +0100
Subject: [PATCH 057/488] VSIGZipWriteHandleMT::ProcessCompletedJobs(): fix
 potential dead-lock (refs #1099, master only)

---
 gdal/port/cpl_vsil_gzip.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/gdal/port/cpl_vsil_gzip.cpp b/gdal/port/cpl_vsil_gzip.cpp
index 37115248da71..411c98fd8475 100644
--- a/gdal/port/cpl_vsil_gzip.cpp
+++ b/gdal/port/cpl_vsil_gzip.cpp
@@ -1547,17 +1547,17 @@ bool VSIGZipWriteHandleMT::ProcessCompletedJobs()
                 if( !psJob->bInCRCComputation_ )
                 {
                     psJob->bInCRCComputation_ = true;
+                    sMutex_.unlock();
                     if( poPool_ )
                     {
-                        sMutex_.unlock();
                         poPool_->SubmitJob( VSIGZipWriteHandleMT::CRCCompute,
                                             psJob );
-                        sMutex_.lock();
                     }
                     else
                     {
                         CRCCompute(psJob);
                     }
+                    sMutex_.lock();
                 }
             }
         }

From adcdba21d66ab34cf1a63055f2260f7ea5478759 Mon Sep 17 00:00:00 2001
From: Even Rouault <even.rouault@spatialys.com>
Date: Fri, 16 Nov 2018 00:16:43 +0100
Subject: [PATCH 058/488] Test /vsizip/ parallel compression below the treshold
 (refs #1099)

---
 autotest/gcore/vsizip.py | 27 +++++++++++++++++++++++++++
 1 file changed, 27 insertions(+)

diff --git a/autotest/gcore/vsizip.py b/autotest/gcore/vsizip.py
index 5b2c2d33e77b..82cb1e4e2218 100755
--- a/autotest/gcore/vsizip.py
+++ b/autotest/gcore/vsizip.py
@@ -696,6 +696,32 @@ def vsizip_multi_thread():
 
     return 'success'
 
+###############################################################################
+# Test multithreaded compression, below the threshold where it triggers
+
+
+def vsizip_multi_thread_below_threshold():
+
+    with gdaltest.config_options({'GDAL_NUM_THREADS': 'ALL_CPUS'}):
+        fmain = gdal.VSIFOpenL('/vsizip//vsimem/vsizip_multi_thread.zip', 'wb')
+        f = gdal.VSIFOpenL('/vsizip//vsimem/vsizip_multi_thread.zip/test', 'wb')
+        gdal.VSIFWriteL('hello', 1, 5, f)
+        gdal.VSIFCloseL(f)
+        gdal.VSIFCloseL(fmain)
+
+    f = gdal.VSIFOpenL('/vsizip//vsimem/vsizip_multi_thread.zip/test', 'rb')
+    data = gdal.VSIFReadL(1, 5, f).decode('ascii')
+    gdal.VSIFCloseL(f)
+
+    gdal.Unlink('/vsimem/vsizip_multi_thread.zip')
+
+    if data != 'hello':
+        gdaltest.post_reason('fail')
+        print(data)
+        return 'fail'
+
+    return 'success'
+
 ###############################################################################
 # Test creating ZIP64 file: uncompressed larger than 4GB, but compressed
 # data stream < 4 GB
@@ -811,6 +837,7 @@ def vsizip_byte_zip64_local_header_zeroed():
                  vsizip_13,
                  vsizip_14,
                  vsizip_multi_thread,
+                 vsizip_multi_thread_below_threshold,
                  vsizip_create_zip64,
                  vsizip_create_zip64_stream_larger_than_4G,
                  vsizip_byte_zip64_local_header_zeroed,

From 29ce66da1a40eae07b3343f9788092b571a7e22a Mon Sep 17 00:00:00 2001
From: Even Rouault <even.rouault@spatialys.com>
Date: Fri, 16 Nov 2018 00:26:20 +0100
Subject: [PATCH 059/488] MVT: make it possible to output to /vsizip/output.zip
 out-of-the-box

---
 gdal/ogr/ogrsf_frmts/mvt/ogrmvtdataset.cpp | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/gdal/ogr/ogrsf_frmts/mvt/ogrmvtdataset.cpp b/gdal/ogr/ogrsf_frmts/mvt/ogrmvtdataset.cpp
index 1fd1cb596d65..b72c09041620 100644
--- a/gdal/ogr/ogrsf_frmts/mvt/ogrmvtdataset.cpp
+++ b/gdal/ogr/ogrsf_frmts/mvt/ogrmvtdataset.cpp
@@ -5982,9 +5982,14 @@ GDALDataset* OGRMVTWriterDataset::Create( const char * pszFilename,
     poDS->m_pMyVFS = OGRSQLiteCreateVFS(nullptr, poDS);
     sqlite3_vfs_register(poDS->m_pMyVFS, 0);
 
+    CPLString osTempDBDefault = CPLString(pszFilename) + ".temp.db";
+    if( STARTS_WITH(osTempDBDefault, "/vsizip/") )
+    {
+        osTempDBDefault = CPLString(pszFilename + strlen("/vsizip/")) + ".temp.db";
+    }
     CPLString osTempDB =
         CSLFetchNameValueDef(papszOptions, "TEMPORARY_DB",
-            (CPLString(pszFilename) + ".temp.db").c_str());
+                             osTempDBDefault.c_str());
     if( !bReuseTempFile )
         VSIUnlink(osTempDB);
 

From e0eaa5283568fd0ee25d3e709b2e3cf96c6612c9 Mon Sep 17 00:00:00 2001
From: Even Rouault <even.rouault@spatialys.com>
Date: Sat, 17 Nov 2018 14:02:49 +0100
Subject: [PATCH 060/488] NGSGEOID: report a CRS that conforms to the official
 publications for GEOID2012 and USGG2012 datasets (fixes #1103)

---
 gdal/frmts/ngsgeoid/ngsgeoiddataset.cpp | 57 +++++++++++++++++++++++++
 1 file changed, 57 insertions(+)

diff --git a/gdal/frmts/ngsgeoid/ngsgeoiddataset.cpp b/gdal/frmts/ngsgeoid/ngsgeoiddataset.cpp
index d5d09a6d7b71..4622a564c111 100644
--- a/gdal/frmts/ngsgeoid/ngsgeoiddataset.cpp
+++ b/gdal/frmts/ngsgeoid/ngsgeoiddataset.cpp
@@ -51,6 +51,7 @@ class NGSGEOIDDataset : public GDALPamDataset
     VSILFILE   *fp;
     double      adfGeoTransform[6];
     int         bIsLittleEndian;
+    CPLString   osProjection{};
 
     static int   GetHeaderInfo( const GByte* pBuffer,
                                 double* padfGeoTransform,
@@ -388,6 +389,62 @@ CPLErr NGSGEOIDDataset::GetGeoTransform( double * padfTransform )
 
 const char* NGSGEOIDDataset::GetProjectionRef()
 {
+    if( !osProjection.empty() )
+    {
+        return osProjection.c_str();
+    }
+
+    CPLString osFilename(CPLGetBasename(GetDescription()));
+    osFilename.tolower();
+
+    // See https://www.ngs.noaa.gov/GEOID/GEOID12B/faq_2012B.shtml
+
+    // GEOID2012 files ?
+    if( STARTS_WITH(osFilename, "g2012") && osFilename.size() >= 7 )
+    {
+        OGRSpatialReference oSRS;
+        if( osFilename[6] == 'h' /* Hawai */ ||
+            osFilename[6] == 's' /* Samoa */ )
+        {
+            // NAD83 (PA11)
+            oSRS.importFromEPSG(6322);
+        }
+        else if( osFilename[6] == 'g' /* Guam */ )
+        {
+            // NAD83 (MA11)
+            oSRS.importFromEPSG(6325);
+        }
+        else
+        {
+            // NAD83 (2011)
+            oSRS.importFromEPSG(6318);
+        }
+
+        char* pszProjection = nullptr;
+        oSRS.exportToWkt(&pszProjection);
+        if( pszProjection )
+            osProjection = pszProjection;
+        CPLFree(pszProjection);
+        return osProjection.c_str();
+    }
+
+    // USGG2012 files ? We should return IGS08, but there is only a
+    // geocentric CRS in EPSG, so manually forge a geographic one from it
+    if(  STARTS_WITH(osFilename, "s2012") )
+    {
+        osProjection =
+"GEOGCS[\"IGS08\",\n"
+"    DATUM[\"IGS08\",\n"
+"        SPHEROID[\"GRS 1980\",6378137,298.257222101,\n"
+"            AUTHORITY[\"EPSG\",\"7019\"]],\n"
+"        AUTHORITY[\"EPSG\",\"1141\"]],\n"
+"    PRIMEM[\"Greenwich\",0,\n"
+"        AUTHORITY[\"EPSG\",\"8901\"]],\n"
+"    UNIT[\"degree\",0.0174532925199433,\n"
+"        AUTHORITY[\"EPSG\",\"9122\"]]]";
+        return osProjection.c_str();
+    }
+
     return SRS_WKT_WGS84;
 }
 

From 6cea3aec0032165dba72fc4e3f82b7e5379f7b16 Mon Sep 17 00:00:00 2001
From: Even Rouault <even.rouault@spatialys.com>
Date: Sat, 17 Nov 2018 18:26:06 +0100
Subject: [PATCH 061/488] PDS4: add UNIT[] node to SRS on reading, so that is
 valid

---
 gdal/frmts/pds/pds4dataset.cpp | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/gdal/frmts/pds/pds4dataset.cpp b/gdal/frmts/pds/pds4dataset.cpp
index 677d5cdeba73..b7a33840c5fa 100644
--- a/gdal/frmts/pds/pds4dataset.cpp
+++ b/gdal/frmts/pds/pds4dataset.cpp
@@ -1302,6 +1302,11 @@ void PDS4Dataset::ReadGeoreferencing(CPLXMLNode* psProduct)
                  "Planar.Map_Projection not found");
     }
 
+    if( oSRS.IsProjected() )
+    {
+        oSRS.SetLinearUnits("Metre", 1.0);
+    }
+
     CPLXMLNode* psGeodeticModel = CPLGetXMLNode(psSR, "Geodetic_Model");
     if( psGeodeticModel != nullptr )
     {

From 34aa9f038dc8664ede976beaf1fcc4beb00a8e57 Mon Sep 17 00:00:00 2001
From: Even Rouault <even.rouault@spatialys.com>
Date: Sat, 17 Nov 2018 22:33:18 +0100
Subject: [PATCH 062/488] GRIB: add UNIT[] node to SRS on reading, so that is
 valid

---
 autotest/gdrivers/grib.py       | 14 +++++++-------
 gdal/frmts/grib/gribdataset.cpp |  5 +++++
 2 files changed, 12 insertions(+), 7 deletions(-)

diff --git a/autotest/gdrivers/grib.py b/autotest/gdrivers/grib.py
index d55f31298fe8..a0d84451b6c7 100755
--- a/autotest/gdrivers/grib.py
+++ b/autotest/gdrivers/grib.py
@@ -440,7 +440,7 @@ def grib_grib2_read_transverse_mercator():
     ds = gdal.Open('data/grib/transverse_mercator.grb2')
 
     projection = ds.GetProjectionRef()
-    expected_projection = """PROJCS["unnamed",GEOGCS["Coordinate System imported from GRIB file",DATUM["unknown",SPHEROID["Sphere",6367470,0]],PRIMEM["Greenwich",0],UNIT["degree",0.0174532925199433]],PROJECTION["Transverse_Mercator"],PARAMETER["latitude_of_origin",0],PARAMETER["central_meridian",-117],PARAMETER["scale_factor",0.9996],PARAMETER["false_easting",500000],PARAMETER["false_northing",0]]"""
+    expected_projection = """PROJCS["unnamed",GEOGCS["Coordinate System imported from GRIB file",DATUM["unknown",SPHEROID["Sphere",6367470,0]],PRIMEM["Greenwich",0],UNIT["degree",0.0174532925199433]],PROJECTION["Transverse_Mercator"],PARAMETER["latitude_of_origin",0],PARAMETER["central_meridian",-117],PARAMETER["scale_factor",0.9996],PARAMETER["false_easting",500000],PARAMETER["false_northing",0],UNIT["Metre",1]]"""
     if projection != expected_projection:
         gdaltest.post_reason('Did not get expected projection')
         print(projection)
@@ -470,7 +470,7 @@ def grib_grib2_read_mercator():
     ds = gdal.Open('data/grib/mercator.grb2')
 
     projection = ds.GetProjectionRef()
-    expected_projection = """PROJCS["unnamed",GEOGCS["Coordinate System imported from GRIB file",DATUM["WGS_1984",SPHEROID["WGS 84",6378137,298.257223563]],PRIMEM["Greenwich",0],UNIT["degree",0.0174532925199433]],PROJECTION["Mercator_1SP"],PARAMETER["central_meridian",0],PARAMETER["scale_factor",1],PARAMETER["false_easting",0],PARAMETER["false_northing",0]]"""
+    expected_projection = """PROJCS["unnamed",GEOGCS["Coordinate System imported from GRIB file",DATUM["WGS_1984",SPHEROID["WGS 84",6378137,298.257223563]],PRIMEM["Greenwich",0],UNIT["degree",0.0174532925199433]],PROJECTION["Mercator_1SP"],PARAMETER["central_meridian",0],PARAMETER["scale_factor",1],PARAMETER["false_easting",0],PARAMETER["false_northing",0],UNIT["Metre",1]]"""
     if projection != expected_projection:
         gdaltest.post_reason('Did not get expected projection')
         print(projection)
@@ -500,7 +500,7 @@ def grib_grib2_read_mercator_2sp():
     ds = gdal.Open('data/grib/mercator_2sp.grb2')
 
     projection = ds.GetProjectionRef()
-    expected_projection = """PROJCS["unnamed",GEOGCS["Coordinate System imported from GRIB file",DATUM["WGS_1984",SPHEROID["WGS 84",6378137,298.257223563]],PRIMEM["Greenwich",0],UNIT["degree",0.0174532925199433]],PROJECTION["Mercator_2SP"],PARAMETER["standard_parallel_1",33.5],PARAMETER["central_meridian",0],PARAMETER["false_easting",0],PARAMETER["false_northing",0]]"""
+    expected_projection = """PROJCS["unnamed",GEOGCS["Coordinate System imported from GRIB file",DATUM["WGS_1984",SPHEROID["WGS 84",6378137,298.257223563]],PRIMEM["Greenwich",0],UNIT["degree",0.0174532925199433]],PROJECTION["Mercator_2SP"],PARAMETER["standard_parallel_1",33.5],PARAMETER["central_meridian",0],PARAMETER["false_easting",0],PARAMETER["false_northing",0],UNIT["Metre",1]]"""
     if projection != expected_projection:
         gdaltest.post_reason('Did not get expected projection')
         print(projection)
@@ -530,7 +530,7 @@ def grib_grib2_read_lcc():
     ds = gdal.Open('data/grib/lambert_conformal_conic.grb2')
 
     projection = ds.GetProjectionRef()
-    expected_projection = """PROJCS["unnamed",GEOGCS["Coordinate System imported from GRIB file",DATUM["WGS_1984",SPHEROID["WGS 84",6378137,298.257223563]],PRIMEM["Greenwich",0],UNIT["degree",0.0174532925199433]],PROJECTION["Lambert_Conformal_Conic_2SP"],PARAMETER["standard_parallel_1",33],PARAMETER["standard_parallel_2",34],PARAMETER["latitude_of_origin",33.5],PARAMETER["central_meridian",117],PARAMETER["false_easting",0],PARAMETER["false_northing",0]]"""
+    expected_projection = """PROJCS["unnamed",GEOGCS["Coordinate System imported from GRIB file",DATUM["WGS_1984",SPHEROID["WGS 84",6378137,298.257223563]],PRIMEM["Greenwich",0],UNIT["degree",0.0174532925199433]],PROJECTION["Lambert_Conformal_Conic_2SP"],PARAMETER["standard_parallel_1",33],PARAMETER["standard_parallel_2",34],PARAMETER["latitude_of_origin",33.5],PARAMETER["central_meridian",117],PARAMETER["false_easting",0],PARAMETER["false_northing",0],UNIT["Metre",1]]"""
     if projection != expected_projection:
         gdaltest.post_reason('Did not get expected projection')
         print(projection)
@@ -560,7 +560,7 @@ def grib_grib2_read_polar_stereo():
     ds = gdal.Open('data/grib/polar_stereographic.grb2')
 
     projection = ds.GetProjectionRef()
-    expected_projection = """PROJCS["unnamed",GEOGCS["Coordinate System imported from GRIB file",DATUM["WGS_1984",SPHEROID["WGS 84",6378137,298.257223563]],PRIMEM["Greenwich",0],UNIT["degree",0.0174532925199433]],PROJECTION["Polar_Stereographic"],PARAMETER["latitude_of_origin",60],PARAMETER["central_meridian",0],PARAMETER["scale_factor",1],PARAMETER["false_easting",0],PARAMETER["false_northing",0]]"""
+    expected_projection = """PROJCS["unnamed",GEOGCS["Coordinate System imported from GRIB file",DATUM["WGS_1984",SPHEROID["WGS 84",6378137,298.257223563]],PRIMEM["Greenwich",0],UNIT["degree",0.0174532925199433]],PROJECTION["Polar_Stereographic"],PARAMETER["latitude_of_origin",60],PARAMETER["central_meridian",0],PARAMETER["scale_factor",1],PARAMETER["false_easting",0],PARAMETER["false_northing",0],UNIT["Metre",1]]"""
     if projection != expected_projection:
         gdaltest.post_reason('Did not get expected projection')
         print(projection)
@@ -590,7 +590,7 @@ def grib_grib2_read_aea():
     ds = gdal.Open('data/grib/albers_equal_area.grb2')
 
     projection = ds.GetProjectionRef()
-    expected_projection = """PROJCS["unnamed",GEOGCS["Coordinate System imported from GRIB file",DATUM["WGS_1984",SPHEROID["WGS 84",6378137,298.257223563]],PRIMEM["Greenwich",0],UNIT["degree",0.0174532925199433]],PROJECTION["Albers_Conic_Equal_Area"],PARAMETER["standard_parallel_1",33],PARAMETER["standard_parallel_2",34],PARAMETER["latitude_of_center",33.5],PARAMETER["longitude_of_center",117],PARAMETER["false_easting",0],PARAMETER["false_northing",0]]"""
+    expected_projection = """PROJCS["unnamed",GEOGCS["Coordinate System imported from GRIB file",DATUM["WGS_1984",SPHEROID["WGS 84",6378137,298.257223563]],PRIMEM["Greenwich",0],UNIT["degree",0.0174532925199433]],PROJECTION["Albers_Conic_Equal_Area"],PARAMETER["standard_parallel_1",33],PARAMETER["standard_parallel_2",34],PARAMETER["latitude_of_center",33.5],PARAMETER["longitude_of_center",117],PARAMETER["false_easting",0],PARAMETER["false_northing",0],UNIT["Metre",1]]"""
     if projection != expected_projection:
         gdaltest.post_reason('Did not get expected projection')
         print(projection)
@@ -620,7 +620,7 @@ def grib_grib2_read_laea():
     ds = gdal.Open('data/grib/lambert_azimuthal_equal_area.grb2')
 
     projection = ds.GetProjectionRef()
-    expected_projection = """PROJCS["unnamed",GEOGCS["Coordinate System imported from GRIB file",DATUM["WGS_1984",SPHEROID["WGS 84",6378137,298.257223563]],PRIMEM["Greenwich",0],UNIT["degree",0.0174532925199433]],PROJECTION["Lambert_Azimuthal_Equal_Area"],PARAMETER["latitude_of_center",33.5],PARAMETER["longitude_of_center",243],PARAMETER["false_easting",0],PARAMETER["false_northing",0]]"""
+    expected_projection = """PROJCS["unnamed",GEOGCS["Coordinate System imported from GRIB file",DATUM["WGS_1984",SPHEROID["WGS 84",6378137,298.257223563]],PRIMEM["Greenwich",0],UNIT["degree",0.0174532925199433]],PROJECTION["Lambert_Azimuthal_Equal_Area"],PARAMETER["latitude_of_center",33.5],PARAMETER["longitude_of_center",243],PARAMETER["false_easting",0],PARAMETER["false_northing",0],UNIT["Metre",1]]"""
     if projection != expected_projection:
         gdaltest.post_reason('Did not get expected projection')
         print(projection)
diff --git a/gdal/frmts/grib/gribdataset.cpp b/gdal/frmts/grib/gribdataset.cpp
index 632185eb2b2e..76a3d7a3c327 100644
--- a/gdal/frmts/grib/gribdataset.cpp
+++ b/gdal/frmts/grib/gribdataset.cpp
@@ -1207,6 +1207,11 @@ void GRIBDataset::SetGribMetaData(grib_MetaData *meta)
         break;
     }
 
+    if( oSRS.IsProjected() )
+    {
+        oSRS.SetLinearUnits("Metre", 1.0);
+    }
+
     const bool bHaveEarthModel =
         meta->gds.majEarth != 0.0 || meta->gds.minEarth != 0.0;
     // In meters.

From 38da35099ddca0ea7a8aa61a2be6462926dc4154 Mon Sep 17 00:00:00 2001
From: Even Rouault <even.rouault@spatialys.com>
Date: Sat, 17 Nov 2018 22:33:22 +0100
Subject: [PATCH 063/488] IRIS: add UNIT[] node to SRS on reading, so that is
 valid

---
 gdal/frmts/iris/irisdataset.cpp | 1 +
 1 file changed, 1 insertion(+)

diff --git a/gdal/frmts/iris/irisdataset.cpp b/gdal/frmts/iris/irisdataset.cpp
index 3a9d315ff1ef..cea77c458ec9 100644
--- a/gdal/frmts/iris/irisdataset.cpp
+++ b/gdal/frmts/iris/irisdataset.cpp
@@ -508,6 +508,7 @@ void IRISDataset::LoadProjection()
             "degree", 0.0174532925199433);
 
         oSRSOut.SetMercator(fProjRefLat, fProjRefLon, 1.0, 0.0, 0.0);
+        oSRSOut.SetLinearUnits("Metre", 1.0);
         oSRSOut.exportToWkt(&pszSRS_WKT);
 
         // The center coordinates are given in LatLon on the defined

From 805bf6906b8af247eab8dee060e215d6b8e5c7ae Mon Sep 17 00:00:00 2001
From: Even Rouault <even.rouault@spatialys.com>
Date: Sun, 18 Nov 2018 12:25:32 +0100
Subject: [PATCH 064/488] Code doc: update link [ci skip]

---
 gdal/alg/gdalwarpkernel.cpp | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/gdal/alg/gdalwarpkernel.cpp b/gdal/alg/gdalwarpkernel.cpp
index 2a4b946632aa..fc59a2fc0c7a 100644
--- a/gdal/alg/gdalwarpkernel.cpp
+++ b/gdal/alg/gdalwarpkernel.cpp
@@ -3092,7 +3092,7 @@ static double GWKCubic( double dfX )
 {
     // http://en.wikipedia.org/wiki/Bicubic_interpolation#Bicubic_convolution_algorithm
     // W(x) formula with a = -0.5 (cubic hermite spline )
-    // or http://www.cs.utexas.edu/users/fussell/courses/cs384g/lectures/mitchell/Mitchell.pdf
+    // or https://www.cs.utexas.edu/~fussell/courses/cs384g-fall2013/lectures/mitchell/Mitchell.pdf
     // k(x) (formula 8) with (B,C)=(0,0.5) the Catmull-Rom spline
     double dfAbsX = fabs(dfX);
     if( dfAbsX <= 1.0 )
@@ -3155,10 +3155,10 @@ static double GWKCubic4Values( double* padfValues )
 /*                           GWKBSpline()                               */
 /************************************************************************/
 
-// http://www.cs.utexas.edu/users/fussell/courses/cs384g/lectures/mitchell/Mitchell.pdf
-// with (B,C)=(1,0)
+// https://www.cs.utexas.edu/~fussell/courses/cs384g-fall2013/lectures/mitchell/Mitchell.pdf
+// Equation 8 with (B,C)=(1,0)
 // 1/6 * ( 3 * |x|^3 -  6 * |x|^2 + 4) |x| < 1
-// 1/6 * ( -|x|^3 + 6 |x|^2  - 12|x| + 8) |x| > 1
+// 1/6 * ( -|x|^3 + 6 |x|^2  - 12|x| + 8) |x| >= 1 and |x| < 2
 
 static double GWKBSpline( double x )
 {

From b1eecf60a04ac462985fd2c7298d38780248497a Mon Sep 17 00:00:00 2001
From: Simon South <simon@simonsouth.ca>
Date: Sat, 27 Oct 2018 15:20:25 -0400
Subject: [PATCH 065/488] SQLite: Leverage common date-parsing functionality

Use OGRParseDate() in place of the driver-specific
OGRSQLITEStringToDateTimeField() to parse date and time values, effectively
adding time-zone support to the driver.

Refactor the remaining functionality of OGRSQLITEStringToDateTimeField() into a
new function, OGRGetDateTimeFieldType(), that returns the simplest appropriate
field type for storing a given date or time string.
---
 .../ogr/data/gmlas/gmlas_test1_generated.xml  |   2 +-
 gdal/ogr/ogrsf_frmts/sqlite/ogr_sqlite.h      |   3 -
 .../ogr/ogrsf_frmts/sqlite/ogrsqlitelayer.cpp | 145 ++++++++----------
 .../sqlite/ogrsqlitevirtualogr.cpp            |   4 +-
 4 files changed, 63 insertions(+), 91 deletions(-)

diff --git a/autotest/ogr/data/gmlas/gmlas_test1_generated.xml b/autotest/ogr/data/gmlas/gmlas_test1_generated.xml
index 88598c577c93..1104f4c070d2 100644
--- a/autotest/ogr/data/gmlas/gmlas_test1_generated.xml
+++ b/autotest/ogr/data/gmlas/gmlas_test1_generated.xml
@@ -32,7 +32,7 @@
       <myns:dt_array>2012-01-01T12:34:56Z</myns:dt_array>
       <myns:dt_array>2012-01-02T12:34:56Z</myns:dt_array>
       <myns:date>2012-01-01</myns:date>
-      <myns:time>12:34:56Z</myns:time>
+      <myns:time>12:34:56</myns:time>
       <myns:boolean>true</myns:boolean>
       <myns:boolean_array>true</myns:boolean_array>
       <myns:boolean_array>false</myns:boolean_array>
diff --git a/gdal/ogr/ogrsf_frmts/sqlite/ogr_sqlite.h b/gdal/ogr/ogrsf_frmts/sqlite/ogr_sqlite.h
index 60a50a357d96..c7afa0914b49 100644
--- a/gdal/ogr/ogrsf_frmts/sqlite/ogr_sqlite.h
+++ b/gdal/ogr/ogrsf_frmts/sqlite/ogr_sqlite.h
@@ -950,9 +950,6 @@ class RL2RasterBand final: public GDALPamRasterBand
 CPLString OGRSQLiteFieldDefnToSQliteFieldDefn( OGRFieldDefn* poFieldDefn,
                                                int bSQLiteDialectInternalUse );
 
-int OGRSQLITEStringToDateTimeField( OGRFeature* poFeature, int iField,
-                                    const char* pszValue );
-
 typedef void (*pfnNotifyFileOpenedType)(void* pfnUserData, const char* pszFilename, VSILFILE* fp);
 sqlite3_vfs* OGRSQLiteCreateVFS(pfnNotifyFileOpenedType pfn, void* pfnUserData);
 
diff --git a/gdal/ogr/ogrsf_frmts/sqlite/ogrsqlitelayer.cpp b/gdal/ogr/ogrsf_frmts/sqlite/ogrsqlitelayer.cpp
index 230526249772..68564e65f341 100644
--- a/gdal/ogr/ogrsf_frmts/sqlite/ogrsqlitelayer.cpp
+++ b/gdal/ogr/ogrsf_frmts/sqlite/ogrsqlitelayer.cpp
@@ -129,6 +129,53 @@ void OGRSQLiteLayer::Finalize()
     papszCompressedColumns = nullptr;
 }
 
+/************************************************************************/
+/*                      OGRGetDateTimeFieldType()                       */
+/************************************************************************/
+
+static
+bool OGRGetDateTimeFieldType( const char* pszValue,
+                              OGRFieldType* pFieldType )
+{
+    bool bSuccess = FALSE;
+    size_t nValueLength = strnlen( pszValue, 16 );
+
+    if( nValueLength >= 5 )
+    {
+        unsigned int nYear;
+        unsigned int nMonth;
+        unsigned int nDay;
+        unsigned int nHour;
+        unsigned int nMinute;
+
+        if( nValueLength >= 10 )
+        {
+            int nItemsMatched = sscanf( pszValue, "%04u-%02u-%02u",
+                                        &nYear, &nMonth, &nDay );
+            if( nItemsMatched == 1 )
+                nItemsMatched = sscanf( pszValue, "%04u/%02u/%02u",
+                                        &nYear, &nMonth, &nDay );
+
+            if( (nItemsMatched == 3) && (nValueLength >= 16) )
+                nItemsMatched += sscanf( &pszValue[11], "%02u:%02u",
+                                         &nHour, &nMinute );
+
+            if( nItemsMatched >= 3 )
+            {
+                *pFieldType = (nItemsMatched == 5) ? OFTDateTime : OFTDate;
+                bSuccess = TRUE;
+            }
+        }
+        else if( sscanf(pszValue, "%02u:%02u", &nHour, &nMinute) == 2 )
+        {
+            *pFieldType = OFTTime;
+            bSuccess = TRUE;
+        }
+    }
+
+    return bSuccess;
+}
+
 /************************************************************************/
 /*                          OGRIsBinaryGeomCol()                        */
 /************************************************************************/
@@ -398,13 +445,17 @@ void OGRSQLiteLayer::BuildFeatureDefn( const char *pszLayerName,
         }
         else if( nColType == SQLITE_TEXT &&
                  (STARTS_WITH_CI(oField.GetNameRef(), "MIN(") ||
-                  STARTS_WITH_CI(oField.GetNameRef(), "MAX(")) &&
-                 sqlite3_column_text( hStmtIn, iCol ) != nullptr )
+                  STARTS_WITH_CI(oField.GetNameRef(), "MAX(")))
         {
-            int nRet = OGRSQLITEStringToDateTimeField(nullptr, 0,
-                              (const char*)sqlite3_column_text( hStmtIn, iCol ));
-            if( nRet > 0 )
-                eFieldType = (OGRFieldType) nRet;
+            const char* pszText = reinterpret_cast<const char*>(
+                sqlite3_column_text( hStmtIn, iCol ));
+            if( pszText != nullptr )
+            {
+                OGRField oScratchField;
+
+                if( OGRParseDate( pszText, &oScratchField, 0 ) == TRUE )
+                    OGRGetDateTimeFieldType( pszText, &eFieldType );
+            }
         }
 
         // Recognise some common geometry column names.
@@ -819,7 +870,8 @@ OGRFeature *OGRSQLiteLayer::GetNextRawFeature()
             {
                 const char* pszValue = (const char *)
                     sqlite3_column_text( hStmt, iRawField );
-                OGRSQLITEStringToDateTimeField( poFeature, iField, pszValue );
+                if( !OGRParseDate( pszValue, poFeature->GetRawFieldRef(iField), 0 ) )
+                    poFeature->UnsetField( iField );
             }
             else if( sqlite3_column_type( hStmt, iRawField ) == SQLITE_FLOAT )
             {
@@ -831,7 +883,8 @@ OGRFeature *OGRSQLiteLayer::GetNextRawFeature()
                                    &papszResult, nullptr, nullptr, nullptr );
                 if( papszResult && papszResult[0] && papszResult[1] )
                 {
-                    OGRSQLITEStringToDateTimeField( poFeature, iField,  papszResult[1] );
+                    if( !OGRParseDate( papszResult[1], poFeature->GetRawFieldRef(iField), 0 ) )
+                        poFeature->UnsetField( iField );
                 }
                 sqlite3_free_table(papszResult);
             }
@@ -3322,82 +3375,6 @@ void OGRSQLiteLayer::ClearStatement()
     }
 }
 
-/************************************************************************/
-/*                    OGRSQLITEStringToDateTimeField()                  */
-/************************************************************************/
-
-int OGRSQLITEStringToDateTimeField( OGRFeature* poFeature, int iField,
-                                    const char* pszValue )
-{
-    int nYear = 0;
-    int nMonth = 0;
-    int nDay = 0;
-    int nHour = 0;
-    int nMinute = 0;
-    float fSecond = 0.0f;
-
-    /* YYYY-MM-DD HH:MM:SS.SSS */
-    if( sscanf(pszValue, "%04d-%02d-%02d %02d:%02d:%f",
-                &nYear, &nMonth, &nDay, &nHour, &nMinute, &fSecond) == 6 ||
-        sscanf(pszValue, "%04d/%02d/%02d %02d:%02d:%f",
-                &nYear, &nMonth, &nDay, &nHour, &nMinute, &fSecond) == 6 ||
-        sscanf(pszValue, "%04d-%02d-%02dT%02d:%02d:%f",
-                &nYear, &nMonth, &nDay, &nHour, &nMinute, &fSecond) == 6 )
-    {
-        if( poFeature )
-            poFeature->SetField( iField, nYear, nMonth,
-                                 nDay, nHour, nMinute, fSecond, 0);
-        return OFTDateTime;
-    }
-
-    /* YYYY-MM-DD HH:MM */
-    if( sscanf(pszValue, "%04d-%02d-%02d %02d:%02d",
-                &nYear, &nMonth, &nDay, &nHour, &nMinute) == 5 ||
-        sscanf(pszValue, "%04d/%02d/%02d %02d:%02d",
-                &nYear, &nMonth, &nDay, &nHour, &nMinute) == 5 ||
-        sscanf(pszValue, "%04d-%02d-%02dT%02d:%02d",
-                &nYear, &nMonth, &nDay, &nHour, &nMinute) == 5 )
-    {
-        if( poFeature )
-            poFeature->SetField( iField, nYear, nMonth,
-                                 nDay, nHour, nMinute, 0, 0);
-        return OFTDateTime;
-    }
-
-    /* YYYY-MM-DD */
-    if( sscanf(pszValue, "%04d-%02d-%02d",
-                &nYear, &nMonth, &nDay) == 3 ||
-        sscanf(pszValue, "%04d/%02d/%02d",
-                &nYear, &nMonth, &nDay) == 3 )
-    {
-        if( poFeature )
-            poFeature->SetField( iField, nYear, nMonth, nDay,
-                                 0, 0, 0, 0 );
-        return OFTDate;
-    }
-
-    /*  HH:MM:SS.SSS */
-    if( sscanf(pszValue, "%02d:%02d:%f",
-        &nHour, &nMinute, &fSecond) == 3 )
-    {
-        if( poFeature )
-            poFeature->SetField( iField, 0, 0, 0,
-                                 nHour, nMinute, fSecond, 0 );
-        return OFTTime;
-    }
-
-    /*  HH:MM */
-    if( sscanf(pszValue, "%02d:%02d", &nHour, &nMinute) == 2 )
-    {
-        if( poFeature )
-            poFeature->SetField( iField, 0, 0, 0,
-                                 nHour, nMinute, 0, 0 );
-        return OFTTime;
-    }
-
-    return FALSE;
-}
-
 /************************************************************************/
 /*                     FormatSpatialFilterFromRTree()                   */
 /************************************************************************/
diff --git a/gdal/ogr/ogrsf_frmts/sqlite/ogrsqlitevirtualogr.cpp b/gdal/ogr/ogrsf_frmts/sqlite/ogrsqlitevirtualogr.cpp
index b97d9b43e10c..d53098418245 100644
--- a/gdal/ogr/ogrsf_frmts/sqlite/ogrsqlitevirtualogr.cpp
+++ b/gdal/ogr/ogrsf_frmts/sqlite/ogrsqlitevirtualogr.cpp
@@ -1554,11 +1554,9 @@ static OGRFeature* OGR2SQLITE_FeatureFromArgs(OGRLayer* poLayer,
                     case OFTDate:
                     case OFTTime:
                     case OFTDateTime:
-                    {
-                        if( !OGRSQLITEStringToDateTimeField( poFeature, i, pszValue ) )
+                        if( !OGRParseDate( pszValue, poFeature->GetRawFieldRef(i), 0 ) )
                             poFeature->SetField(i, pszValue);
                         break;
-                    }
 
                     default:
                         poFeature->SetField(i, pszValue);

From 81c82782567ed5b57930efd3ff8d67ac8f58bf45 Mon Sep 17 00:00:00 2001
From: Simon South <simon@simonsouth.ca>
Date: Wed, 10 Oct 2018 10:00:28 -0400
Subject: [PATCH 066/488] OGRGetXMLDateTime(): Interpret TZFlag correctly
 (fixes #996)

---
 autotest/cpp/test_ogr.cpp | 115 ++++++++++++++++++++++++++++++++++++++
 autotest/ogr/ogr_mvt.py   |   6 +-
 gdal/ogr/ogrutils.cpp     |  67 ++++++++++++----------
 3 files changed, 154 insertions(+), 34 deletions(-)

diff --git a/autotest/cpp/test_ogr.cpp b/autotest/cpp/test_ogr.cpp
index cdd72d3362d9..efb1ff4746a2 100644
--- a/autotest/cpp/test_ogr.cpp
+++ b/autotest/cpp/test_ogr.cpp
@@ -25,6 +25,7 @@
 
 #include "gdal_unit_test.h"
 
+#include "ogr_p.h"
 #include "ogrsf_frmts.h"
 #include "../../gdal/ogr/ogrsf_frmts/osm/gpb.h"
 
@@ -1355,4 +1356,118 @@ namespace tut
         poFeatureDefn->Release();
     }
 
+    // Test OGRGetXMLDateTime()
+    template<>
+    template<>
+    void object::test<15>()
+    {
+        OGRField sField;
+        char *pszDateTime;
+
+        sField.Date.Year = 2001;
+        sField.Date.Month = 2;
+        sField.Date.Day = 3;
+        sField.Date.Hour = 4;
+        sField.Date.Minute = 5;
+
+        // Unknown time zone (TZFlag = 0), no millisecond count
+        sField.Date.TZFlag = 0;
+        sField.Date.Second = 6.0f;
+        pszDateTime = OGRGetXMLDateTime(&sField);
+        ensure(nullptr != pszDateTime);
+        ensure("OGRGetXMLDateTime formats date/time field with "
+               "unknown time zone, no millisecond count",
+               strcmp("2001-02-03T04:05:06", pszDateTime) == 0);
+        CPLFree(pszDateTime);
+
+        // Unknown time zone (TZFlag = 0), millisecond count
+        sField.Date.TZFlag = 0;
+        sField.Date.Second = 6.789f;
+        pszDateTime = OGRGetXMLDateTime(&sField);
+        ensure(nullptr != pszDateTime);
+        ensure("OGRGetXMLDateTime formats date/time field with "
+               "unknown time zone, millisecond count",
+               strcmp("2001-02-03T04:05:06.789", pszDateTime) == 0);
+        CPLFree(pszDateTime);
+
+        // Local time zone (TZFlag = 1), no millisecond count
+        sField.Date.TZFlag = 1;
+        sField.Date.Second = 6.0f;
+        pszDateTime = OGRGetXMLDateTime(&sField);
+        ensure(nullptr != pszDateTime);
+        ensure("OGRGetXMLDateTime formats date/time field with "
+               "local time zone, no millisecond count",
+               strcmp("2001-02-03T04:05:06", pszDateTime) == 0);
+        CPLFree(pszDateTime);
+
+        // Local time zone (TZFlag = 1), millisecond count
+        sField.Date.TZFlag = 1;
+        sField.Date.Second = 6.789f;
+        pszDateTime = OGRGetXMLDateTime(&sField);
+        ensure(nullptr != pszDateTime);
+        ensure("OGRGetXMLDateTime formats date/time field with "
+               "local time zone, millisecond count",
+               strcmp("2001-02-03T04:05:06.789", pszDateTime) == 0);
+        CPLFree(pszDateTime);
+
+        // GMT time zone (TZFlag = 100), no millisecond count
+        sField.Date.TZFlag = 100;
+        sField.Date.Second = 6.0f;
+        pszDateTime = OGRGetXMLDateTime(&sField);
+        ensure(nullptr != pszDateTime);
+        ensure("OGRGetXMLDateTime formats date/time field with "
+               "GMT time zone, no millisecond count",
+               strcmp("2001-02-03T04:05:06Z", pszDateTime) == 0);
+        CPLFree(pszDateTime);
+
+        // GMT time zone (TZFlag = 100), millisecond count
+        sField.Date.TZFlag = 100;
+        sField.Date.Second = 6.789f;
+        pszDateTime = OGRGetXMLDateTime(&sField);
+        ensure(nullptr != pszDateTime);
+        ensure("OGRGetXMLDateTime formats date/time field with "
+               "GMT time zone, millisecond count",
+               strcmp("2001-02-03T04:05:06.789Z", pszDateTime) == 0);
+        CPLFree(pszDateTime);
+
+        // Positive time-zone offset, no millisecond count
+        sField.Date.TZFlag = 111;
+        sField.Date.Second = 6.0f;
+        pszDateTime = OGRGetXMLDateTime(&sField);
+        ensure(nullptr != pszDateTime);
+        ensure("OGRGetXMLDateTime formats date/time field with "
+               "positive time-zone offset, no millisecond count",
+               strcmp("2001-02-03T04:05:06+02:45", pszDateTime) == 0);
+        CPLFree(pszDateTime);
+
+        // Positive time-zone offset, millisecond count
+        sField.Date.TZFlag = 111;
+        sField.Date.Second = 6.789f;
+        pszDateTime = OGRGetXMLDateTime(&sField);
+        ensure(nullptr != pszDateTime);
+        ensure("OGRGetXMLDateTime formats date/time field with "
+               "positive time-zone offset, millisecond count",
+               strcmp("2001-02-03T04:05:06.789+02:45", pszDateTime) == 0);
+        CPLFree(pszDateTime);
+
+        // Negative time-zone offset, no millisecond count
+        sField.Date.TZFlag = 88;
+        sField.Date.Second = 6.0f;
+        pszDateTime = OGRGetXMLDateTime(&sField);
+        ensure(nullptr != pszDateTime);
+        ensure("OGRGetXMLDateTime formats date/time field with "
+               "negative time-zone offset, no millisecond count",
+               strcmp("2001-02-03T04:05:06-03:00", pszDateTime) == 0);
+        CPLFree(pszDateTime);
+
+        // Negative time-zone offset, millisecond count
+        sField.Date.TZFlag = 88;
+        sField.Date.Second = 6.789f;
+        pszDateTime = OGRGetXMLDateTime(&sField);
+        ensure(nullptr != pszDateTime);
+        ensure("OGRGetXMLDateTime formats date/time field with "
+               "negative time-zone offset, millisecond count",
+               strcmp("2001-02-03T04:05:06.789-03:00", pszDateTime) == 0);
+        CPLFree(pszDateTime);
+    }
 } // namespace tut
diff --git a/autotest/ogr/ogr_mvt.py b/autotest/ogr/ogr_mvt.py
index fefa6cf9fd04..133ab7a472d7 100644
--- a/autotest/ogr/ogr_mvt.py
+++ b/autotest/ogr/ogr_mvt.py
@@ -998,7 +998,7 @@ def ogr_mvt_write_one_layer():
        out_f['int64field'] != 123456789012345 or \
        out_f['realfield'] != 1.25 or \
        out_f['datefield'] != '2018-02-01' or \
-       out_f['datetimefield'] != '2018-02-01T12:34:56Z' or \
+       out_f['datetimefield'] != '2018-02-01T12:34:56' or \
        out_f['boolfield'] is False or \
        ogrtest.check_feature_geometry(out_f, 'POINT (498980.920645632 997961.84129126)') != 0:
         gdaltest.post_reason('fail')
@@ -1011,7 +1011,7 @@ def ogr_mvt_write_one_layer():
        out_f['int64field'] != 123456789012345 or \
        out_f['realfield'] != 1.25 or \
        out_f['datefield'] != '2018-02-01' or \
-       out_f['datetimefield'] != '2018-02-01T12:34:56Z' or \
+       out_f['datetimefield'] != '2018-02-01T12:34:56' or \
        out_f['boolfield'] is False or \
        ogrtest.check_feature_geometry(out_f, 'MULTILINESTRING ((498980.920645632 997961.84129126,508764.860266134 1007745.78091176,518548.799886636 1017529.72053226))') != 0:
         gdaltest.post_reason('fail')
@@ -1181,7 +1181,7 @@ def ogr_mvt_write_one_layer():
                             "count": 1,
                             "type": "string",
                             "values": [
-                                "2018-02-01T12:34:56Z"
+                                "2018-02-01T12:34:56"
                             ]
                         },
                         {
diff --git a/gdal/ogr/ogrutils.cpp b/gdal/ogr/ogrutils.cpp
index 01b262afd07e..1190aef6b00c 100644
--- a/gdal/ogr/ogrutils.cpp
+++ b/gdal/ogr/ogrutils.cpp
@@ -1377,44 +1377,49 @@ char* OGRGetRFC822DateTime( const OGRField* psField )
 
 char* OGRGetXMLDateTime(const OGRField* psField)
 {
-    const int year = psField->Date.Year;
-    const int month = psField->Date.Month;
-    const int day = psField->Date.Day;
-    const int hour = psField->Date.Hour;
-    const int minute = psField->Date.Minute;
+    const GInt16 year = psField->Date.Year;
+    const GByte month = psField->Date.Month;
+    const GByte day = psField->Date.Day;
+    const GByte hour = psField->Date.Hour;
+    const GByte minute = psField->Date.Minute;
     const float second = psField->Date.Second;
-    const int TZFlag = psField->Date.TZFlag;
+    const GByte TZFlag = psField->Date.TZFlag;
 
+    char szTimeZone[7];
     char* pszRet = nullptr;
 
-    if( TZFlag == 0 || TZFlag == 100 )
+    switch( TZFlag )
     {
-        if( OGR_GET_MS(second) )
-            pszRet = CPLStrdup(CPLSPrintf(
-                "%04d-%02d-%02dT%02d:%02d:%06.3fZ",
-                year, month, day, hour, minute, second));
-        else
-            pszRet = CPLStrdup(CPLSPrintf(
-                "%04d-%02d-%02dT%02d:%02d:%02dZ",
-                year, month, day, hour, minute, static_cast<int>(second)));
+        case 0:    // Unknown time zone
+        case 1:    // Local time zone (not specified)
+            szTimeZone[0] = 0;
+            break;
+
+        case 100:  // GMT
+            szTimeZone[0] = 'Z';
+            szTimeZone[1] = 0;
+            break;
+
+        default:   // Offset (in quarter-hour units) from GMT
+            const int TZOffset = std::abs(TZFlag - 100) * 15;
+            const int TZHour = TZOffset / 60;
+            const int TZMinute = TZOffset % 60;
+
+            snprintf(szTimeZone, 7, "%c%02d:%02d",
+                     (TZFlag > 100) ? '+' : '-', TZHour, TZMinute);
     }
+
+    if( OGR_GET_MS(second) )
+        pszRet = CPLStrdup(CPLSPrintf(
+                               "%04d-%02u-%02uT%02u:%02u:%06.3f%s",
+                               year, month, day, hour, minute, second,
+                               szTimeZone));
     else
-    {
-        const int TZOffset = std::abs(TZFlag - 100) * 15;
-        const int TZHour = TZOffset / 60;
-        const int TZMinute = TZOffset - TZHour * 60;
-        if( OGR_GET_MS(second) )
-            pszRet = CPLStrdup(CPLSPrintf(
-                "%04d-%02d-%02dT%02d:%02d:%06.3f%c%02d:%02d",
-                year, month, day, hour, minute, second,
-                (TZFlag > 100) ? '+' : '-', TZHour, TZMinute));
-        else
-            pszRet = CPLStrdup(
-                CPLSPrintf("%04d-%02d-%02dT%02d:%02d:%02d%c%02d:%02d",
-                           year, month, day, hour, minute,
-                           static_cast<int>(second),
-                           TZFlag > 100 ? '+' : '-', TZHour, TZMinute));
-    }
+        pszRet = CPLStrdup(CPLSPrintf(
+                               "%04d-%02u-%02uT%02u:%02u:%02u%s",
+                               year, month, day, hour, minute,
+                               static_cast<GByte>(second), szTimeZone));
+
     return pszRet;
 }
 

From b468e2f410c61622eb363d0d847096b1124e97cf Mon Sep 17 00:00:00 2001
From: Even Rouault <even.rouault@spatialys.com>
Date: Mon, 19 Nov 2018 20:59:38 +0100
Subject: [PATCH 067/488] IGNFHeightASCIIGrid: add support for .gra format

---
 .../gdrivers/data/ignfheightasciigrid.gra     |   9 +
 autotest/gdrivers/ignfheightasciigrid.py      |  38 +++
 gdal/frmts/frmt_various.html                  |   2 +-
 .../ignfheightasciigrid.cpp                   | 249 ++++++++++++++++--
 gdal/frmts/xyz/xyzdataset.cpp                 |   5 +
 5 files changed, 273 insertions(+), 30 deletions(-)
 create mode 100644 autotest/gdrivers/data/ignfheightasciigrid.gra

diff --git a/autotest/gdrivers/data/ignfheightasciigrid.gra b/autotest/gdrivers/data/ignfheightasciigrid.gra
new file mode 100644
index 000000000000..8142f11d9347
--- /dev/null
+++ b/autotest/gdrivers/data/ignfheightasciigrid.gra
@@ -0,0 +1,9 @@
+-16.75 -16.5
+-152 -151.5
+0.25 0.25
+1
+4
+2
+5
+3
+6
diff --git a/autotest/gdrivers/ignfheightasciigrid.py b/autotest/gdrivers/ignfheightasciigrid.py
index 04dc17be3749..e2596b4b7db9 100755
--- a/autotest/gdrivers/ignfheightasciigrid.py
+++ b/autotest/gdrivers/ignfheightasciigrid.py
@@ -176,6 +176,42 @@ def ignfheightasciigrid_huge():
     return 'success'
 
 
+def ignfheightasciigrid_gra():
+
+    tst = gdaltest.GDALTest(
+        'IGNFHeightASCIIGrid', 'ignfheightasciigrid.gra', 1, 21)
+    gt = (-152.125, 0.25, 0.0, -16.375, 0.0, -0.25)
+    if tst.testOpen(check_gt=gt, check_prj='WGS84') != 'success':
+        return 'fail'
+
+    ds = gdal.OpenEx('data/ignfheightasciigrid.gra', gdal.OF_RASTER)
+    if ds.GetRasterBand(1).GetNoDataValue() != 9999:
+        gdaltest.post_reason('fail')
+        return 'fail'
+    return 'success'
+
+
+def ignfheightasciigrid_gra_invalid():
+
+    contents = ['49 50\r\n2\r\n',  # missing values
+                '49 50\r\n2 3\r\n',  # missing line
+                '49 50\r\n2 3\r\nx 1\r\n',  # non numeric value
+                '-200 50\r\n2 3\r\n1 1\r\n',  # invalid value
+                ]
+
+    filename = '/vsimem/ignfheightasciigrid_invalid.gra'
+    for content in contents:
+        gdal.FileFromMemBuffer(filename, content)
+        with gdaltest.error_handler():
+            if gdal.OpenEx(filename, gdal.OF_RASTER):
+                gdaltest.post_reason('fail')
+                print(content)
+                return 'fail'
+        gdal.Unlink(filename)
+    return 'success'
+
+
+
 gdaltest_list = [
     ignfheightasciigrid_1,
     ignfheightasciigrid_2,
@@ -187,6 +223,8 @@ def ignfheightasciigrid_huge():
     ignfheightasciigrid_description_multiword,
     ignfheightasciigrid_invalid,
     ignfheightasciigrid_huge,
+    ignfheightasciigrid_gra,
+    ignfheightasciigrid_gra_invalid,
 ]
 
 
diff --git a/gdal/frmts/frmt_various.html b/gdal/frmts/frmt_various.html
index c7b6035c8bad..9aa4652914e9 100644
--- a/gdal/frmts/frmt_various.html
+++ b/gdal/frmts/frmt_various.html
@@ -633,7 +633,7 @@ <h2><a name="IGNFHeightASCIIGrid">IGNFHeightASCIIGrid -- IGN-France height corre
 
 <p> (GDAL &gt;= 2.4.0)</p>
 
-<p>Supports reading IGN-France height correction ASCII grids.</p>
+<p>Supports reading IGN-France height correction ASCII grids (.txt, .mnt, .gra).</p>
 
 <p>See also:
 <ul>
diff --git a/gdal/frmts/ignfheightasciigrid/ignfheightasciigrid.cpp b/gdal/frmts/ignfheightasciigrid/ignfheightasciigrid.cpp
index 9f5c2a85f621..223a450d4394 100644
--- a/gdal/frmts/ignfheightasciigrid/ignfheightasciigrid.cpp
+++ b/gdal/frmts/ignfheightasciigrid/ignfheightasciigrid.cpp
@@ -40,14 +40,23 @@
 /* ==================================================================== */
 /************************************************************************/
 
-class IGNFHeightASCIIGridDataset: public GDALPamDataset
+class IGNFHeightASCIIGridDataset final: public GDALPamDataset
 {
         double adfGeoTransform[6]{0,1,0,0,0,1};
         int m_nArrangementOrder = 0;
 
         size_t getSampleIndex( size_t nBufferCount );
 
-        static bool ParseHeader(GDALOpenInfo* poOpenInfo,
+        static bool CheckExtentAndComputeRasterSize( double dfLongMin,
+                                                     double dfLongMax,
+                                                     double dfLatMin,
+                                                     double dfLatMax,
+                                                     double dfStepLong,
+                                                     double dfStepLat,
+                                                     double& dfRasterXSize,
+                                                     double& dfRasterYSize );
+
+        static bool ParseHeaderMNT(GDALOpenInfo* poOpenInfo,
                                 double& dfLongMin,
                                 double& dfLongMax,
                                 double& dfLatMin,
@@ -61,12 +70,24 @@ class IGNFHeightASCIIGridDataset: public GDALPamDataset
                                 int& nPrecisionCode,
                                 CPLString& osDesc);
 
+        static bool ParseHeaderGRA(GDALOpenInfo* poOpenInfo,
+                                double& dfLongMin,
+                                double& dfLongMax,
+                                double& dfLatMin,
+                                double& dfLatMax,
+                                double& dfStepLong,
+                                double& dfStepLat,
+                                double& dfRasterXSize,
+                                double& dfRasterYSize);
+
     public:
         IGNFHeightASCIIGridDataset() = default;
 
         CPLErr GetGeoTransform(double* padfGeoTransform) override;
         const char* GetProjectionRef() override { return SRS_WKT_WGS84; }
 
+        static int IdentifyMNT(GDALOpenInfo* poOpenInfo);
+        static int IdentifyGRA(GDALOpenInfo* poOpenInfo);
         static int Identify(GDALOpenInfo* poOpenInfo);
         static GDALDataset* Open(GDALOpenInfo* poOpenInfo);
 };
@@ -77,9 +98,13 @@ class IGNFHeightASCIIGridDataset: public GDALPamDataset
 /* ==================================================================== */
 /************************************************************************/
 
-class IGNFHeightASCIIGridRasterBand: public GDALPamRasterBand
+class IGNFHeightASCIIGridRasterBand final: public GDALPamRasterBand
 {
+        friend class IGNFHeightASCIIGridDataset;
+
         std::vector<double> adfBuffer;
+        double m_dfNoDataValue = 0.0;
+        bool m_bHasNoDataValue = false;
 
     public:
         explicit IGNFHeightASCIIGridRasterBand(GDALDataset* poDS,
@@ -87,6 +112,7 @@ class IGNFHeightASCIIGridRasterBand: public GDALPamRasterBand
         CPLErr IReadBlock(int, int, void*) override;
 
         const char* GetUnitType() override { return "m"; }
+        double GetNoDataValue(int* pbHasNoDataValue) override;
 };
 
 /************************************************************************/
@@ -117,6 +143,16 @@ CPLErr IGNFHeightASCIIGridRasterBand:: IReadBlock(int, int nBlockYOff,
     return CE_None;
 }
 
+/************************************************************************/
+/*                          GetNoDataValue()                            */
+/************************************************************************/
+
+double IGNFHeightASCIIGridRasterBand::GetNoDataValue(int* pbHasNoDataValue)
+{
+    if( pbHasNoDataValue )
+        *pbHasNoDataValue = m_bHasNoDataValue;
+    return m_dfNoDataValue;
+}
 
 /************************************************************************/
 /*                           GetGeoTransform()                          */
@@ -129,10 +165,10 @@ CPLErr IGNFHeightASCIIGridDataset::GetGeoTransform(double* padfGeoTransform)
 }
 
 /************************************************************************/
-/*                             Identify()                               */
+/*                            IdentifyMNT()                             */
 /************************************************************************/
 
-int IGNFHeightASCIIGridDataset::Identify(GDALOpenInfo* poOpenInfo)
+int IGNFHeightASCIIGridDataset::IdentifyMNT(GDALOpenInfo* poOpenInfo)
 {
     const GByte* pabyHeader = poOpenInfo->pabyHeader;
     int iPosFirstNewLine = -1;
@@ -201,17 +237,115 @@ int IGNFHeightASCIIGridDataset::Identify(GDALOpenInfo* poOpenInfo)
     int nCoordinatesAtNode = 0;
     int nPrecisionCode = 0;
     CPLString osDesc;
-    return ParseHeader(poOpenInfo, dfLongMin, dfLongMax, dfLatMin, dfLatMax,
+    return ParseHeaderMNT(poOpenInfo, dfLongMin, dfLongMax, dfLatMin, dfLatMax,
                        dfStepLong, dfStepLat, dfRasterXSize, dfRasterYSize,
                        nArrangementOrder, nCoordinatesAtNode, nPrecisionCode,
                        osDesc);
 }
 
 /************************************************************************/
-/*                           ParseHeader()                              */
+/*                            IdentifyGRA()                             */
+/************************************************************************/
+
+int IGNFHeightASCIIGridDataset::IdentifyGRA(GDALOpenInfo* poOpenInfo)
+{
+    if( !EQUAL(CPLGetExtension(poOpenInfo->pszFilename), "GRA") )
+        return FALSE;
+
+    const GByte* pabyHeader = poOpenInfo->pabyHeader;
+    int nCountFields = 0;
+    int nLine = 1;
+    for(int i = 0; i < poOpenInfo->nHeaderBytes; i++ )
+    {
+        const GByte ch = pabyHeader[i];
+        if( ch == ' ' || ch == '\r' )
+        {
+            continue;
+        }
+        if( ch == '\n' )
+        {
+            if( nCountFields != 2 )
+                return FALSE;
+            if( nLine == 3 )
+            {
+                double dfLongMin = 0.0;
+                double dfLongMax = 0.0;
+                double dfLatMin = 0.0;
+                double dfLatMax = 0.0;
+                double dfStepLong = 0.0;
+                double dfStepLat = 0.0;
+                double dfRasterXSize = 0.0;
+                double dfRasterYSize = 0.0;
+                return ParseHeaderGRA(poOpenInfo,
+                    dfLongMin, dfLongMax, dfLatMin, dfLatMax,
+                    dfStepLong, dfStepLat, dfRasterXSize, dfRasterYSize);
+            }
+            nCountFields = 0;
+            nLine ++;
+            continue;
+        }
+        if( i == 0 || pabyHeader[i-1] == ' ' || pabyHeader[i-1] == '\n' )
+        {
+            nCountFields ++;
+        }
+        if( !((ch >= '0' && ch <= '9') || ch == '-' || ch == '.') )
+        {
+            return FALSE;
+        }
+    }
+
+    return FALSE;
+}
+
+/************************************************************************/
+/*                             Identify()                               */
+/************************************************************************/
+
+int IGNFHeightASCIIGridDataset::Identify(GDALOpenInfo* poOpenInfo)
+{
+    return (IdentifyMNT(poOpenInfo) == TRUE) ||
+           (IdentifyGRA(poOpenInfo) == TRUE);
+}
+
+/************************************************************************/
+/*                    CheckExtentAndComputeRasterSize()                 */
+/************************************************************************/
+
+bool IGNFHeightASCIIGridDataset::CheckExtentAndComputeRasterSize(
+                                                        double dfLongMin,
+                                                        double dfLongMax,
+                                                        double dfLatMin,
+                                                        double dfLatMax,
+                                                        double dfStepLong,
+                                                        double dfStepLat,
+                                                        double& dfRasterXSize,
+                                                        double& dfRasterYSize)
+{
+    if( !(dfLongMin >= -180.0 && dfLongMax <= 180.0 && dfLongMin < dfLongMax &&
+          dfLatMin >= -90.0 && dfLatMax <= 90.0 && dfLatMin < dfLatMax) )
+    {
+        return false;
+    }
+    if( !(dfStepLong > 0 && dfStepLong < 360 &&
+          dfStepLat > 0 && dfStepLat < 180) )
+    {
+        return false;
+    }
+    dfRasterXSize = (dfLongMax - dfLongMin) / dfStepLong;
+    dfRasterYSize = (dfLatMax - dfLatMin) / dfStepLat;
+    if( dfRasterXSize > 10000 || dfRasterYSize > 10000 ||
+        dfRasterXSize * dfRasterYSize > 10e6 )
+    {
+        return false;
+    }
+    return true;
+}
+
+/************************************************************************/
+/*                         ParseHeaderMNT()                             */
 /************************************************************************/
 
-bool IGNFHeightASCIIGridDataset::ParseHeader(GDALOpenInfo* poOpenInfo,
+bool IGNFHeightASCIIGridDataset::ParseHeaderMNT(GDALOpenInfo* poOpenInfo,
                                             double& dfLongMin,
                                             double& dfLongMax,
                                             double& dfLatMin,
@@ -237,25 +371,15 @@ bool IGNFHeightASCIIGridDataset::ParseHeader(GDALOpenInfo* poOpenInfo,
     dfLongMax = CPLAtof(aosTokens[1]);
     dfLatMin = CPLAtof(aosTokens[2]);
     dfLatMax = CPLAtof(aosTokens[3]);
-    if( !(dfLongMin >= -180.0 && dfLongMax <= 180.0 && dfLongMin < dfLongMax &&
-          dfLatMin >= -90.0 && dfLatMax <= 90.0 && dfLatMin < dfLatMax) )
-    {
-        return false;
-    }
     dfStepLong = CPLAtof(aosTokens[4]);
     dfStepLat = CPLAtof(aosTokens[5]);
-    if( !(dfStepLong > 0 && dfStepLong < 360 &&
-          dfStepLat > 0 && dfStepLat < 180) )
-    {
-        return false;
-    }
-    dfRasterXSize = (dfLongMax - dfLongMin) / dfStepLong;
-    dfRasterYSize = (dfLatMax - dfLatMin) / dfStepLat;
-    if( dfRasterXSize > 10000 || dfRasterYSize > 10000 ||
-        dfRasterXSize * dfRasterYSize > 10e6 )
+    if( !CheckExtentAndComputeRasterSize(
+            dfLongMin, dfLongMax, dfLatMin, dfLatMax,
+            dfStepLong, dfStepLat, dfRasterXSize, dfRasterYSize) )
     {
         return false;
     }
+
     nArrangementOrder = atoi(aosTokens[6]);
 #ifdef DEBUG_VERBOSE
     CPLDebug("IGNFHeightASCIIGrid", "nArrangementOrder = %d", nArrangementOrder);
@@ -308,6 +432,36 @@ bool IGNFHeightASCIIGridDataset::ParseHeader(GDALOpenInfo* poOpenInfo,
     return true;
 }
 
+/************************************************************************/
+/*                         ParseHeaderGRA()                             */
+/************************************************************************/
+
+bool IGNFHeightASCIIGridDataset::ParseHeaderGRA(GDALOpenInfo* poOpenInfo,
+                                            double& dfLongMin,
+                                            double& dfLongMax,
+                                            double& dfLatMin,
+                                            double& dfLatMax,
+                                            double& dfStepLong,
+                                            double& dfStepLat,
+                                            double& dfRasterXSize,
+                                            double& dfRasterYSize)
+{
+    std::string osHeader;
+    osHeader.assign(reinterpret_cast<const char*>(poOpenInfo->pabyHeader),
+                    poOpenInfo->nHeaderBytes);
+    CPLStringList aosTokens(CSLTokenizeString2(osHeader.c_str(), " \r\n", 0));
+    CPLAssert( aosTokens.size() >= 6 ); // from Identify
+    dfLatMin = CPLAtof(aosTokens[0]);
+    dfLatMax = CPLAtof(aosTokens[1]);
+    dfLongMin = CPLAtof(aosTokens[2]);
+    dfLongMax = CPLAtof(aosTokens[3]);
+    dfStepLat = CPLAtof(aosTokens[4]);
+    dfStepLong = CPLAtof(aosTokens[5]);
+    return CheckExtentAndComputeRasterSize(
+            dfLongMin, dfLongMax, dfLatMin, dfLatMax,
+            dfStepLong, dfStepLat, dfRasterXSize, dfRasterYSize);
+}
+
 /************************************************************************/
 /*                          getSampleIndex()                            */
 /************************************************************************/
@@ -341,7 +495,7 @@ size_t IGNFHeightASCIIGridDataset::getSampleIndex( size_t nBufferCount )
 
 GDALDataset* IGNFHeightASCIIGridDataset::Open(GDALOpenInfo* poOpenInfo)
 {
-    if( !Identify(poOpenInfo) || poOpenInfo->fpL == nullptr ||
+    if( poOpenInfo->fpL == nullptr ||
         poOpenInfo->eAccess == GA_Update )
     {
         return nullptr;
@@ -359,10 +513,26 @@ GDALDataset* IGNFHeightASCIIGridDataset::Open(GDALOpenInfo* poOpenInfo)
     int nCoordinatesAtNode = 0;
     int nPrecisionCode = 0;
     CPLString osDesc;
-    ParseHeader(poOpenInfo, dfLongMin, dfLongMax, dfLatMin, dfLatMax,
+
+    bool isMNTFormat = false;
+    if( IdentifyMNT(poOpenInfo) )
+    {
+        isMNTFormat = true;
+        ParseHeaderMNT(poOpenInfo, dfLongMin, dfLongMax, dfLatMin, dfLatMax,
                        dfStepLong, dfStepLat, dfRasterXSize, dfRasterYSize,
                        nArrangementOrder, nCoordinatesAtNode, nPrecisionCode,
                        osDesc);
+    }
+    else if( IdentifyGRA(poOpenInfo) )
+    {
+        ParseHeaderGRA(poOpenInfo, dfLongMin, dfLongMax, dfLatMin, dfLatMax,
+                       dfStepLong, dfStepLat, dfRasterXSize, dfRasterYSize);
+        nArrangementOrder = 2;
+    }
+    else
+    {
+        return nullptr;
+    }
 
     // Check file size
     VSIFSeekL( poOpenInfo->fpL, 0, SEEK_END );
@@ -389,13 +559,28 @@ GDALDataset* IGNFHeightASCIIGridDataset::Open(GDALOpenInfo* poOpenInfo)
     poDS->adfGeoTransform[5] = -dfStepLat;
     poDS->nRasterXSize = static_cast<int>( dfRasterXSize + 0.5 + 1 );
     poDS->nRasterYSize = static_cast<int>( dfRasterYSize + 0.5 + 1 );
-    poDS->GDALDataset::SetMetadataItem("DESCRIPTION", osDesc);
+    if( !osDesc.empty() )
+    {
+        poDS->GDALDataset::SetMetadataItem("DESCRIPTION", osDesc);
+    }
 
     // Parse values
     std::vector<double> adfBuffer;
     adfBuffer.resize( poDS->nRasterXSize * poDS->nRasterYSize );
     size_t nBufferCount = 0;
-    const size_t nHeaderSize = osBuffer.find('\r');
+    size_t nHeaderSize;
+    if( isMNTFormat )
+    {
+        nHeaderSize = osBuffer.find('\r');
+    }
+    else
+    {
+        nHeaderSize = osBuffer.find('\n');
+        CPLAssert(nHeaderSize != std::string::npos);
+        nHeaderSize = osBuffer.find('\n', nHeaderSize + 1);
+        CPLAssert(nHeaderSize != std::string::npos);
+        nHeaderSize = osBuffer.find('\n', nHeaderSize + 1);
+    }
     CPLAssert(nHeaderSize != std::string::npos);
     size_t nLastPos = nHeaderSize + 1;
     int iValuePerNode = 0;
@@ -476,8 +661,14 @@ GDALDataset* IGNFHeightASCIIGridDataset::Open(GDALOpenInfo* poOpenInfo)
         return nullptr;
     }
 
-    poDS->SetBand(1, new IGNFHeightASCIIGridRasterBand(poDS,
-                                                       std::move(adfBuffer)));
+    auto poBand = new IGNFHeightASCIIGridRasterBand(poDS,
+                                                       std::move(adfBuffer));
+    if( !isMNTFormat )
+    {
+        poBand->m_bHasNoDataValue = true;
+        poBand->m_dfNoDataValue = 9999;
+    }
+    poDS->SetBand(1, poBand);
 
 /* -------------------------------------------------------------------- */
 /*      Initialize any PAM information.                                 */
@@ -511,7 +702,7 @@ void GDALRegister_IGNFHeightASCIIGrid()
                               "IGN France height correction ASCII Grid");
     poDriver->SetMetadataItem(GDAL_DMD_HELPTOPIC,
                               "frmt_various.html#IGNFHeightASCIIGrid");
-    poDriver->SetMetadataItem(GDAL_DMD_EXTENSION, "mnt");
+    poDriver->SetMetadataItem(GDAL_DMD_EXTENSIONS, "mnt txt gra");
 
     poDriver->SetMetadataItem(GDAL_DCAP_VIRTUALIO, "YES");
 
diff --git a/gdal/frmts/xyz/xyzdataset.cpp b/gdal/frmts/xyz/xyzdataset.cpp
index 247565ee05fd..03304f6ecfda 100644
--- a/gdal/frmts/xyz/xyzdataset.cpp
+++ b/gdal/frmts/xyz/xyzdataset.cpp
@@ -526,6 +526,11 @@ int XYZDataset::IdentifyEx( GDALOpenInfo * poOpenInfo,
     nCommentLineCount = 0;
 
     CPLString osFilename(poOpenInfo->pszFilename);
+    if( EQUAL(CPLGetExtension(osFilename), "GRA") )
+    {
+        // IGNFHeightASCIIGRID .GRA
+        return FALSE;
+    }
 
     GDALOpenInfo* poOpenInfoToDelete = nullptr;
     /*  GZipped .xyz files are common, so automagically open them */

From 6bc220ef217363b682d933ac36002bc9b6fe79a0 Mon Sep 17 00:00:00 2001
From: Even Rouault <even.rouault@spatialys.com>
Date: Mon, 19 Nov 2018 23:28:06 +0100
Subject: [PATCH 068/488] XLSX / ODS: avoid harmless warning in some cases when
 guessing column data types

---
 gdal/ogr/ogrsf_frmts/ods/ogrodsdatasource.cpp   | 1 +
 gdal/ogr/ogrsf_frmts/xlsx/ogrxlsxdatasource.cpp | 1 +
 2 files changed, 2 insertions(+)

diff --git a/gdal/ogr/ogrsf_frmts/ods/ogrodsdatasource.cpp b/gdal/ogr/ogrsf_frmts/ods/ogrodsdatasource.cpp
index 9b9f027e00fe..5af35698d1a5 100644
--- a/gdal/ogr/ogrsf_frmts/ods/ogrodsdatasource.cpp
+++ b/gdal/ogr/ogrsf_frmts/ods/ogrodsdatasource.cpp
@@ -1072,6 +1072,7 @@ void OGRODSDataSource::endElementRow( CPL_UNUSED /*in non-DEBUG*/ const char * p
                             OGRFieldDefn oNewFieldDefn(
                                 poCurLayer->GetLayerDefn()->GetFieldDefn(
                                     static_cast<int>(i)));
+                            oNewFieldDefn.SetSubType(OFSTNone);
                             if( ( eFieldType == OFTDate ||
                                   eFieldType == OFTTime) &&
                                 eValType == OFTDateTime )
diff --git a/gdal/ogr/ogrsf_frmts/xlsx/ogrxlsxdatasource.cpp b/gdal/ogr/ogrsf_frmts/xlsx/ogrxlsxdatasource.cpp
index 5e2cb41b55fb..f99fb9f44d17 100644
--- a/gdal/ogr/ogrsf_frmts/xlsx/ogrxlsxdatasource.cpp
+++ b/gdal/ogr/ogrsf_frmts/xlsx/ogrxlsxdatasource.cpp
@@ -1001,6 +1001,7 @@ void OGRXLSXDataSource::endElementRow(CPL_UNUSED const char *pszNameIn)
                         else if (eFieldType != OFTString && eValType != eFieldType)
                         {
                             OGRFieldDefn oNewFieldDefn(poFieldDefn);
+                            oNewFieldDefn.SetSubType(OFSTNone);
                             if ((eFieldType == OFTDate || eFieldType == OFTTime) &&
                                    eValType == OFTDateTime)
                                 oNewFieldDefn.SetType(OFTDateTime);

From b6ed2f66324771094846624cb05b3307660a5229 Mon Sep 17 00:00:00 2001
From: Norman Barker <norman.barker@mapbox.com>
Date: Mon, 19 Nov 2018 14:29:11 -0600
Subject: [PATCH 069/488] enable lossless compression for webp in tiff

---
 autotest/gcore/tiff_write.py        | 24 +++++++++---------------
 gdal/frmts/gtiff/libtiff/tif_webp.c | 25 ++++++++++++++++---------
 2 files changed, 25 insertions(+), 24 deletions(-)

diff --git a/autotest/gcore/tiff_write.py b/autotest/gcore/tiff_write.py
index bde604acb73c..a61191658485 100755
--- a/autotest/gcore/tiff_write.py
+++ b/autotest/gcore/tiff_write.py
@@ -8044,8 +8044,7 @@ def tiff_write_webp():
         return 'skip'
 
     ut = gdaltest.GDALTest('GTiff', 'md_ge_rgb_0010000.tif', 0, None,
-                           options=['COMPRESS=WEBP',
-                                    'WEBP_LOSSLESS=true'])
+                           options=['COMPRESS=WEBP'])
     return ut.testCreateCopy()
 
 ###############################################################################
@@ -8058,6 +8057,9 @@ def tiff_write_tiled_webp():
     if md['DMD_CREATIONOPTIONLIST'].find('WEBP') == -1:
         return 'skip'
 
+    if md['DMD_CREATIONOPTIONLIST'].find('WEBP_LOSSLESS') == -1:
+        return 'skip'
+
     filename = '/vsimem/tiff_write_tiled_webp.tif'
     src_ds = gdal.Open('data/md_ge_rgb_0010000.tif')
     gdaltest.tiff_drv.CreateCopy(filename, src_ds,
@@ -8065,19 +8067,11 @@ def tiff_write_tiled_webp():
                                           'WEBP_LOSSLESS=true',
                                           'TILED=true'])
     ds = gdal.Open(filename)
-    original_stats = [src_ds.GetRasterBand(i + 1).ComputeStatistics(True) for i in range(3)]
-    got_stats = [ds.GetRasterBand(i + 1).ComputeStatistics(True) for i in range(3)]
-    ds = None
-    src_ds = None
-
-    for i in range(3):
-        for j in range(4):
-            if abs(original_stats[i][j] - got_stats[i][j]) > 1e-1 * abs(original_stats[i][j]):
-                gdaltest.post_reason('did not get expected statistics')
-                print(i, j)
-                print(original_stats)
-                print(got_stats)
-                return 'fail'
+    cs = [ds.GetRasterBand(i+1).Checksum() for i in range(3)]
+    if cs != [21212, 21053, 21349]:
+        gdaltest.post_reason('fail')
+        print(cs)
+        return 'fail'
 
     gdaltest.tiff_drv.Delete(filename)
     gdal.Unlink('data/md_ge_rgb_0010000.tif.aux.xml')
diff --git a/gdal/frmts/gtiff/libtiff/tif_webp.c b/gdal/frmts/gtiff/libtiff/tif_webp.c
index a002f481daa6..ee0a0649e673 100644
--- a/gdal/frmts/gtiff/libtiff/tif_webp.c
+++ b/gdal/frmts/gtiff/libtiff/tif_webp.c
@@ -349,6 +349,12 @@ TWebPSetupEncode(TIFF* tif)
 
   sp->state |= LSTATE_INIT_ENCODE;
 
+  if (!WebPPictureInit(&sp->sPicture)) {
+    TIFFErrorExt(tif->tif_clientdata, module,
+        "Error initializing WebP picture.");
+    return 0;
+  }
+
   if (!WebPConfigInitInternal(&sp->sEncoderConfig, WEBP_PRESET_DEFAULT,
                               sp->quality_level,
                               WEBP_ENCODER_ABI_VERSION)) {
@@ -357,9 +363,13 @@ TWebPSetupEncode(TIFF* tif)
     return 0;
   }
 
-#if WEBP_ENCODER_ABI_VERSION >= 0x0100
-  sp->sEncoderConfig.lossless = sp->lossless;
-#endif
+  // WebPConfigInitInternal above sets lossless to false
+  #if WEBP_ENCODER_ABI_VERSION >= 0x0100
+    sp->sEncoderConfig.lossless = sp->lossless;
+    if (sp->lossless) {
+      sp->sPicture.use_argb = 1;
+    }
+  #endif
 
   if (!WebPValidateConfig(&sp->sEncoderConfig)) {
     TIFFErrorExt(tif->tif_clientdata, module,
@@ -367,12 +377,6 @@ TWebPSetupEncode(TIFF* tif)
     return 0;
   }
 
-  if (!WebPPictureInit(&sp->sPicture)) {
-    TIFFErrorExt(tif->tif_clientdata, module,
-        "Error initializing WebP picture.");
-    return 0;
-  }
-
   return 1;
 }
 
@@ -570,6 +574,9 @@ TWebPVSetField(TIFF* tif, uint32 tag, va_list ap)
   case TIFFTAG_WEBP_LOSSLESS:
     #if WEBP_ENCODER_ABI_VERSION >= 0x0100
     sp->lossless = va_arg(ap, int);
+    if (sp->lossless){
+      sp->quality_level = 100.0f;      
+    }
     return 1;
     #else
       TIFFErrorExt(tif->tif_clientdata, module,

From 76bc4fed0662a4be6d6e7e17b6dfd6f8329ce47c Mon Sep 17 00:00:00 2001
From: Even Rouault <even.rouault@spatialys.com>
Date: Wed, 21 Nov 2018 19:28:32 +0100
Subject: [PATCH 070/488] Add JSON field subtype for String fields

---
 gdal/ogr/ogr_core.h                      |  6 +++++-
 gdal/ogr/ogrfielddefn.cpp                |  5 +++++
 gdal/swig/include/ogr.i                  |  8 +++++++-
 gdal/swig/python/extensions/ogr_wrap.cpp | 13 +++++++++++++
 gdal/swig/python/osgeo/ogr.py            |  3 +++
 5 files changed, 33 insertions(+), 2 deletions(-)

diff --git a/gdal/ogr/ogr_core.h b/gdal/ogr/ogr_core.h
index 6114dff2a737..adcbb14c25d7 100644
--- a/gdal/ogr/ogr_core.h
+++ b/gdal/ogr/ogr_core.h
@@ -628,7 +628,11 @@ typedef enum
                                                         OFSTInt16 = 2,
     /** Single precision (32 bit) floating point. Only valid for OFTReal and OFTRealList. */
                                                         OFSTFloat32 = 3,
-                                                        OFSTMaxSubType = 3
+    /** JSON content. Only valid for OFTString.
+     * @since GDAL 2.4
+     */
+                                                        OFSTJSON = 4,
+                                                        OFSTMaxSubType = 4
 } OGRFieldSubType;
 
 /**
diff --git a/gdal/ogr/ogrfielddefn.cpp b/gdal/ogr/ogrfielddefn.cpp
index 34110ee23fdb..7b0b41de0eb2 100644
--- a/gdal/ogr/ogrfielddefn.cpp
+++ b/gdal/ogr/ogrfielddefn.cpp
@@ -720,6 +720,9 @@ const char * OGRFieldDefn::GetFieldSubTypeName( OGRFieldSubType eSubType )
       case OFSTFloat32:
         return "Float32";
 
+      case OFSTJSON:
+        return "JSON";
+
       default:
         return "(unknown)";
     }
@@ -767,6 +770,8 @@ int OGR_AreTypeSubTypeCompatible( OGRFieldType eType, OGRFieldSubType eSubType )
         return eType == OFTInteger || eType == OFTIntegerList;
     if( eSubType == OFSTFloat32 )
         return eType == OFTReal || eType == OFTRealList;
+    if( eSubType == OFSTJSON )
+        return eType == OFTString;
     return FALSE;
 }
 
diff --git a/gdal/swig/include/ogr.i b/gdal/swig/include/ogr.i
index 58ea5f951581..54a69f08f466 100644
--- a/gdal/swig/include/ogr.i
+++ b/gdal/swig/include/ogr.i
@@ -195,7 +195,11 @@ typedef enum
     /** Signed 16-bit integer. Only valid for OFTInteger and OFTIntegerList. */
                                                         OFSTInt16 = 2,
     /** Single precision (32 bit) floating point. Only valid for OFTReal and OFTRealList. */
-                                                        OFSTFloat32 = 3
+                                                        OFSTFloat32 = 3,
+    /** JSON content. Only valid for OFTString.
+     * @since GDAL 2.4
+     */
+                                                        OFSTJSON = 4,
 } OGRFieldSubType;
 
 
@@ -370,6 +374,7 @@ typedef void retGetPoints;
 %constant OFSTBoolean = 1;
 %constant OFSTInt16 = 2;
 %constant OFSTFloat32 = 3;
+%constant OFSTJSON = 4;
 
 %constant OJUndefined = 0;
 %constant OJLeft = 1;
@@ -2154,6 +2159,7 @@ public:
             case OFSTBoolean:
             case OFSTInt16:
             case OFSTFloat32:
+            case OFSTJSON:
                 return TRUE;
             default:
                 CPLError(CE_Failure, CPLE_IllegalArg, "Illegal field subtype value");
diff --git a/gdal/swig/python/extensions/ogr_wrap.cpp b/gdal/swig/python/extensions/ogr_wrap.cpp
index 28fede3de55e..ae4bf8ece43f 100644
--- a/gdal/swig/python/extensions/ogr_wrap.cpp
+++ b/gdal/swig/python/extensions/ogr_wrap.cpp
@@ -4760,6 +4760,7 @@ SWIGINTERN int OGRFeatureDefnShadow_IsSame(OGRFeatureDefnShadow *self,OGRFeature
             case OFSTBoolean:
             case OFSTInt16:
             case OFSTFloat32:
+            case OFSTJSON:
                 return TRUE;
             default:
                 CPLError(CE_Failure, CPLE_IllegalArg, "Illegal field subtype value");
@@ -6458,6 +6459,17 @@ SWIGINTERN PyObject *OFSTFloat32_swigconstant(PyObject *SWIGUNUSEDPARM(self), Py
 }
 
 
+SWIGINTERN PyObject *OFSTJSON_swigconstant(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *module;
+  PyObject *d;
+  if (!PyArg_ParseTuple(args,(char*)"O:swigconstant", &module)) return NULL;
+  d = PyModule_GetDict(module);
+  if (!d) return NULL;
+  SWIG_Python_SetConstant(d, "OFSTJSON",SWIG_From_int(static_cast< int >(4)));
+  return SWIG_Py_Void();
+}
+
+
 SWIGINTERN PyObject *OJUndefined_swigconstant(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *module;
   PyObject *d;
@@ -30732,6 +30744,7 @@ static PyMethodDef SwigMethods[] = {
 	 { (char *)"OFSTBoolean_swigconstant", OFSTBoolean_swigconstant, METH_VARARGS, NULL},
 	 { (char *)"OFSTInt16_swigconstant", OFSTInt16_swigconstant, METH_VARARGS, NULL},
 	 { (char *)"OFSTFloat32_swigconstant", OFSTFloat32_swigconstant, METH_VARARGS, NULL},
+	 { (char *)"OFSTJSON_swigconstant", OFSTJSON_swigconstant, METH_VARARGS, NULL},
 	 { (char *)"OJUndefined_swigconstant", OJUndefined_swigconstant, METH_VARARGS, NULL},
 	 { (char *)"OJLeft_swigconstant", OJLeft_swigconstant, METH_VARARGS, NULL},
 	 { (char *)"OJRight_swigconstant", OJRight_swigconstant, METH_VARARGS, NULL},
diff --git a/gdal/swig/python/osgeo/ogr.py b/gdal/swig/python/osgeo/ogr.py
index 810fc827027d..22ffd90a34eb 100644
--- a/gdal/swig/python/osgeo/ogr.py
+++ b/gdal/swig/python/osgeo/ogr.py
@@ -364,6 +364,9 @@ class _object:
 _ogr.OFSTFloat32_swigconstant(_ogr)
 OFSTFloat32 = _ogr.OFSTFloat32
 
+_ogr.OFSTJSON_swigconstant(_ogr)
+OFSTJSON = _ogr.OFSTJSON
+
 _ogr.OJUndefined_swigconstant(_ogr)
 OJUndefined = _ogr.OJUndefined
 

From 14787d4dc99b60b85c305b08e4424a51abb27f9a Mon Sep 17 00:00:00 2001
From: Even Rouault <even.rouault@spatialys.com>
Date: Wed, 21 Nov 2018 19:44:02 +0100
Subject: [PATCH 071/488] GPKG: add read/write support for JSON field subtype

---
 autotest/ogr/ogr_gpkg.py                      |  92 +++++++
 gdal/ogr/ogrsf_frmts/gpkg/ogr_geopackage.h    |   8 +-
 .../gpkg/ogrgeopackagedatasource.cpp          |  45 +--
 .../gpkg/ogrgeopackagetablelayer.cpp          | 260 +++++++++++-------
 gdal/swig/python/samples/validate_gpkg.py     |  64 ++++-
 5 files changed, 356 insertions(+), 113 deletions(-)

diff --git a/autotest/ogr/ogr_gpkg.py b/autotest/ogr/ogr_gpkg.py
index ed2834be6ea8..f1a81379ddb5 100755
--- a/autotest/ogr/ogr_gpkg.py
+++ b/autotest/ogr/ogr_gpkg.py
@@ -4759,6 +4759,97 @@ def ogr_gpkg_wal():
 
     return 'success'
 
+###############################################################################
+# Test JSon subtype support
+
+
+def ogr_gpkg_json():
+
+    if gdaltest.gpkg_dr is None:
+        return 'skip'
+
+    filename = '/vsimem/ogr_gpkg_json.gpkg'
+    ds = gdaltest.gpkg_dr.CreateDataSource(filename)
+    lyr = ds.CreateLayer('test')
+
+    fld_defn = ogr.FieldDefn('test_json', ogr.OFTString)
+    fld_defn.SetSubType(ogr.OFSTJSON)
+    lyr.CreateField(fld_defn)
+    if lyr.GetLayerDefn().GetFieldDefn(0).GetSubType() != ogr.OFSTJSON:
+        gdaltest.post_reason('fail')
+        return 'fail'
+
+    ds.ReleaseResultSet(ds.ExecuteSQL('SELECT 1 FROM test')) # will crystalize
+
+    fld_defn = ogr.FieldDefn('test2_json', ogr.OFTString)
+    fld_defn.SetSubType(ogr.OFSTJSON)
+    lyr.CreateField(fld_defn)
+    if lyr.GetLayerDefn().GetFieldDefn(1).GetSubType() != ogr.OFSTJSON:
+        gdaltest.post_reason('fail')
+        return 'fail'
+
+    fld_defn = ogr.FieldDefn('test_string', ogr.OFTString)
+    lyr.CreateField(fld_defn)
+
+    ds = None
+
+    ds = ogr.Open(filename, update = 1)
+    lyr = ds.GetLayer(0)
+    if lyr.GetLayerDefn().GetFieldDefn(0).GetSubType() != ogr.OFSTJSON:
+        gdaltest.post_reason('fail')
+        return 'fail'
+    if lyr.GetLayerDefn().GetFieldDefn(1).GetSubType() != ogr.OFSTJSON:
+        gdaltest.post_reason('fail')
+        return 'fail'
+
+    # Demote field from JSON
+    new_defn = ogr.FieldDefn('test_was_json_now_string', ogr.OFTString)
+    if lyr.AlterFieldDefn(lyr.GetLayerDefn().GetFieldIndex('test2_json'), new_defn, ogr.ALTER_ALL_FLAG) != 0:
+        gdaltest.post_reason('fail')
+        return 'fail'
+
+    # Alter field to JSON
+    new_defn = ogr.FieldDefn('test_was_string_now_json', ogr.OFTString)
+    new_defn.SetSubType(ogr.OFSTJSON)
+    if lyr.AlterFieldDefn(lyr.GetLayerDefn().GetFieldIndex('test_string'), new_defn, ogr.ALTER_ALL_FLAG) != 0:
+        gdaltest.post_reason('fail')
+        return 'fail'
+
+    # Delete JSON field
+    if lyr.DeleteField(lyr.GetLayerDefn().GetFieldIndex('test_json')) != 0:
+        gdaltest.post_reason('fail')
+        return 'fail'
+
+    ds = None
+
+    if not validate(filename):
+        gdaltest.post_reason('validation failed')
+        return 'fail'
+
+    ds = ogr.Open(filename)
+    lyr = ds.GetLayer(0)
+    if lyr.GetLayerDefn().GetFieldDefn(
+        lyr.GetLayerDefn().GetFieldIndex('test_was_json_now_string')).GetSubType() != ogr.OFSTNone:
+        gdaltest.post_reason('fail')
+        return 'fail'
+    if lyr.GetLayerDefn().GetFieldDefn(
+        lyr.GetLayerDefn().GetFieldIndex('test_was_string_now_json')).GetSubType() != ogr.OFSTJSON:
+        gdaltest.post_reason('fail')
+        return 'fail'
+
+    sql_lyr = ds.ExecuteSQL("SELECT 1 FROM gpkg_data_columns WHERE table_name = 'test'")
+    fc = sql_lyr.GetFeatureCount()
+    ds.ReleaseResultSet(sql_lyr)
+    if fc != 1: # only test_was_string_now_json remaining
+        gdaltest.post_reason('fail')
+        return 'fail'
+
+    ds = None
+
+    gdal.Unlink(filename)
+
+    return 'success'
+
 ###############################################################################
 # Remove the test db from the tmp directory
 
@@ -4847,6 +4938,7 @@ def ogr_gpkg_cleanup():
     ogr_gpkg_59,
     ogr_gpkg_savepoint,
     ogr_gpkg_wal,
+    ogr_gpkg_json,
     ogr_gpkg_test_ogrsf,
     ogr_gpkg_cleanup,
 ]
diff --git a/gdal/ogr/ogrsf_frmts/gpkg/ogr_geopackage.h b/gdal/ogr/ogrsf_frmts/gpkg/ogr_geopackage.h
index 9750be5056a8..c3ccbdf9ecbb 100644
--- a/gdal/ogr/ogrsf_frmts/gpkg/ogr_geopackage.h
+++ b/gdal/ogr/ogrsf_frmts/gpkg/ogr_geopackage.h
@@ -205,7 +205,7 @@ class GDALGeoPackageDataset final : public OGRSQLiteBaseDataSource, public GDALG
         bool                    m_bMapTableToExtensionsBuilt;
         std::map< CPLString, std::vector<GPKGExtensionDesc> > m_oMapTableToExtensions;
         const std::map< CPLString, std::vector<GPKGExtensionDesc> > &
-                                        GetExtensions();
+                                        GetUnknownExtensionsTableSpecific();
 
         bool                    m_bMapTableToContentsBuilt;
         std::map< CPLString, GPKGContentsDesc > m_oMapTableToContents;
@@ -276,9 +276,11 @@ class GDALGeoPackageDataset final : public OGRSQLiteBaseDataSource, public GDALG
         OGRErr              CreateExtensionsTableIfNecessary();
         bool                HasExtensionsTable();
         OGRErr              CreateGDALAspatialExtension();
-        bool                HasDataColumnsTable();
         void                SetMetadataDirty() { m_bMetadataDirty = true; }
 
+        bool                    HasDataColumnsTable();
+        bool                    HasDataColumnConstraintsTable();
+
         const char*         GetGeometryTypeString(OGRwkbGeometryType eType);
 
         void                ResetReadingAllLayers();
@@ -450,6 +452,8 @@ class OGRGeoPackageTableLayer final : public OGRGeoPackageLayer
     OGRErr              ReadTableDefinition();
     void                InitView();
 
+    bool                DoSpecialProcessingForColumnCreation(OGRFieldDefn* poField);
+
     public:
                         OGRGeoPackageTableLayer( GDALGeoPackageDataset *poDS,
                                                  const char * pszTableName );
diff --git a/gdal/ogr/ogrsf_frmts/gpkg/ogrgeopackagedatasource.cpp b/gdal/ogr/ogrsf_frmts/gpkg/ogrgeopackagedatasource.cpp
index 3befa85aeab2..362467c1d9e0 100644
--- a/gdal/ogr/ogrsf_frmts/gpkg/ogrgeopackagedatasource.cpp
+++ b/gdal/ogr/ogrsf_frmts/gpkg/ogrgeopackagedatasource.cpp
@@ -669,11 +669,11 @@ void GDALGeoPackageDataset::RemoveTableFromSQLiteMasterCache(
 }
 
 /************************************************************************/
-/*                          GetExtensions()                             */
+/*                  GetUnknownExtensionsTableSpecific()                 */
 /************************************************************************/
 
 const std::map< CPLString, std::vector<GPKGExtensionDesc> > &
-                        GDALGeoPackageDataset::GetExtensions()
+                    GDALGeoPackageDataset::GetUnknownExtensionsTableSpecific()
 {
     if( m_bMapTableToExtensionsBuilt )
         return m_oMapTableToExtensions;
@@ -693,7 +693,7 @@ const std::map< CPLString, std::vector<GPKGExtensionDesc> > &
             "'gpkg_geom_MULTISURFACE', 'gpkg_geom_CURVE', 'gpkg_geom_SURFACE', "
             "'gpkg_geom_POLYHEDRALSURFACE', 'gpkg_geom_TIN', 'gpkg_geom_TRIANGLE', "
             "'gpkg_rtree_index', 'gpkg_geometry_type_trigger', 'gpkg_srs_id_trigger', "
-            "'gpkg_crs_wkt')");
+            "'gpkg_crs_wkt', 'gpkg_schema')");
     const int nTableLimit =
                 atoi(CPLGetConfigOption("OGR_TABLE_LIMIT", "10000"));
     if( nTableLimit > 0 )
@@ -2745,6 +2745,30 @@ bool GDALGeoPackageDataset::HasMetadataTables()
     return nCount == 2;
 }
 
+/************************************************************************/
+/*                         HasDataColumnsTable()                        */
+/************************************************************************/
+
+bool GDALGeoPackageDataset::HasDataColumnsTable()
+{
+    const int nCount = SQLGetInteger(hDB,
+                "SELECT 1 FROM sqlite_master WHERE name = 'gpkg_data_columns'"
+                "AND type IN ('table', 'view')", nullptr);
+    return nCount == 1;
+}
+
+/************************************************************************/
+/*                    HasDataColumnConstraintsTable()                   */
+/************************************************************************/
+
+bool GDALGeoPackageDataset::HasDataColumnConstraintsTable()
+{
+    const int nCount = SQLGetInteger(hDB,
+    "SELECT 1 FROM sqlite_master WHERE name = 'gpkg_data_column_constraints'"
+    "AND type IN ('table', 'view')", nullptr);
+    return nCount == 1;
+}
+
 /************************************************************************/
 /*                            GetMetadata()                             */
 /************************************************************************/
@@ -5776,21 +5800,6 @@ OGRErr GDALGeoPackageDataset::CreateExtensionsTableIfNecessary()
     return SQLCommand(hDB, pszCreateGpkgExtensions);
 }
 
-/************************************************************************/
-/*                         HasDataColumnsTable()                        */
-/************************************************************************/
-
-bool GDALGeoPackageDataset::HasDataColumnsTable()
-{
-    SQLResult oResultTable;
-    OGRErr err = SQLQuery(hDB,
-        "SELECT * FROM sqlite_master WHERE name = 'gpkg_data_columns' "
-        "AND type IN ('table', 'view')", &oResultTable);
-    bool bHasExtensionsTable = ( err == OGRERR_NONE && oResultTable.nRowCount == 1 );
-    SQLResultFree(&oResultTable);
-    return bHasExtensionsTable;
-}
-
 /************************************************************************/
 /*                     OGRGeoPackageGetHeader()                         */
 /************************************************************************/
diff --git a/gdal/ogr/ogrsf_frmts/gpkg/ogrgeopackagetablelayer.cpp b/gdal/ogr/ogrsf_frmts/gpkg/ogrgeopackagetablelayer.cpp
index 62df354e5853..21491fd35f68 100644
--- a/gdal/ogr/ogrsf_frmts/gpkg/ogrgeopackagetablelayer.cpp
+++ b/gdal/ogr/ogrsf_frmts/gpkg/ogrgeopackagetablelayer.cpp
@@ -661,96 +661,6 @@ OGRErr OGRGeoPackageTableLayer::ReadTableDefinition()
     }
 #endif
 
-#if 0
-    {
-        SQLResult oResult;
-        char* pszSQL;
-#ifdef ENABLE_GPKG_OGR_CONTENTS
-        if( m_poDS->m_bHasGPKGOGRContents )
-        {
-            pszSQL = sqlite3_mprintf(
-                "SELECT name, type FROM sqlite_master WHERE name IN ('%q', "
-                "'trigger_insert_feature_count_%q', "
-                "'trigger_delete_feature_count_%q')",
-                m_pszTableName,
-                m_pszTableName,
-                m_pszTableName);
-        }
-        else
-#endif
-        {
-            pszSQL = sqlite3_mprintf(
-                "SELECT name, type FROM sqlite_master WHERE name = '%q' AND "
-                "type IN ('view', 'table')",
-                m_pszTableName);
-        }
-        err = SQLQuery(poDb, pszSQL, &oResult);
-        sqlite3_free(pszSQL);
-        if ( err == OGRERR_NONE && oResult.nRowCount == 0 )
-        {
-            SQLResultFree(&oResult);
-            pszSQL = sqlite3_mprintf(
-                "SELECT name, type FROM sqlite_master WHERE "
-                "lower(name) = lower('%q') AND type "
-                "IN ('view', 'table')",
-                m_pszTableName);
-            err = SQLQuery(poDb, pszSQL, &oResult);
-            sqlite3_free(pszSQL);
-        }
-
-        m_bIsTable = false;
-        bool bIsView = false;
-        if ( err == OGRERR_NONE && oResult.nRowCount >= 1 )
-        {
-#ifdef ENABLE_GPKG_OGR_CONTENTS
-            int nTriggerCount = 0;
-#endif
-            for( int i = 0; i < oResult.nRowCount; i++ )
-            {
-                const char* pszName = SQLResultGetValue(&oResult, 0, i);
-                const char* pszType = SQLResultGetValue(&oResult, 1, i);
-                if( EQUAL(pszName, m_pszTableName) )
-                {
-                    if( EQUAL(pszType, "table") )
-                        m_bIsTable = true;
-                    else if( EQUAL(pszType, "view") )
-                        bIsView = true;
-                }
-#ifdef ENABLE_GPKG_OGR_CONTENTS
-                else if( STARTS_WITH(pszName, "trigger_") )
-                {
-                    nTriggerCount++;
-                }
-#endif
-            }
-
-#ifdef ENABLE_GPKG_OGR_CONTENTS
-            if( m_poDS->m_bHasGPKGOGRContents )
-            {
-                if( nTriggerCount == 2 )
-                {
-                    m_bOGRFeatureCountTriggersEnabled = true;
-                }
-                else if( m_bIsTable )
-                {
-                    CPLDebug("GPKG", "Insert/delete feature_count triggers "
-                            "missing on %s", m_pszTableName);
-                }
-            }
-#endif
-        }
-
-        SQLResultFree(&oResult);
-        if( !m_bIsTable && !bIsView )
-        {
-            CPLError( CE_Failure, CPLE_AppDefined,
-                      "Table or view '%s' does not exist",
-                      m_pszTableName );
-            return OGRERR_FAILURE;
-        }
-    }
-#endif
-
     if( m_bIsInGpkgContents )
     {
         /* Check that the table name is registered in gpkg_contents */
@@ -1107,6 +1017,38 @@ OGRErr OGRGeoPackageTableLayer::ReadTableDefinition()
 
     SQLResultFree(&oResultTable);
 
+    // Look for sub-types such as JSON
+    if( m_poDS->HasDataColumnsTable() )
+    {
+        pszSQL = sqlite3_mprintf(
+            "SELECT column_name, mime_type FROM gpkg_data_columns "
+            "WHERE table_name = '%q'",
+            m_pszTableName);
+        err = SQLQuery(poDb, pszSQL, &oResultTable);
+        sqlite3_free(pszSQL);
+        if( err == OGRERR_NONE )
+        {
+            for ( int iRecord = 0; iRecord < oResultTable.nRowCount; iRecord++ )
+            {
+                const char *pszColumn =
+                    SQLResultGetValue(&oResultTable, 0, iRecord);
+                const char *pszMimeType =
+                    SQLResultGetValue(&oResultTable, 1, iRecord);
+                if( pszColumn && pszMimeType &&
+                    EQUAL(pszMimeType, "application/json") )
+                {
+                    int iIdx = m_poFeatureDefn->GetFieldIndex(pszColumn);
+                    if( iIdx >= 0 &&
+                        m_poFeatureDefn->GetFieldDefn(iIdx)->GetType() == OFTString)
+                    {
+                        m_poFeatureDefn->GetFieldDefn(iIdx)->SetSubType(OFSTJSON);
+                    }
+                }
+            }
+            SQLResultFree(&oResultTable);
+        }
+    }
+
     /* Update the columns string */
     BuildColumns();
 
@@ -1325,7 +1267,7 @@ bool OGRGeoPackageTableLayer::CheckUpdatableTable(const char* pszOperation)
 /************************************************************************/
 
 OGRErr OGRGeoPackageTableLayer::CreateField( OGRFieldDefn *poField,
-                                             CPL_UNUSED int bApproxOK )
+                                             int /* bApproxOK */ )
 {
     if( !m_bFeatureDefnCompleted )
         GetLayerDefn();
@@ -1401,6 +1343,11 @@ OGRErr OGRGeoPackageTableLayer::CreateField( OGRFieldDefn *poField,
 
         if ( err != OGRERR_NONE )
             return err;
+
+        if( !DoSpecialProcessingForColumnCreation(poField) )
+        {
+            return OGRERR_FAILURE;
+        }
     }
 
     m_poFeatureDefn->AddFieldDefn( &oFieldDefn );
@@ -1419,6 +1366,102 @@ OGRErr OGRGeoPackageTableLayer::CreateField( OGRFieldDefn *poField,
     return OGRERR_NONE;
 }
 
+/************************************************************************/
+/*                DoSpecialProcessingForColumnCreation()                */
+/************************************************************************/
+
+bool OGRGeoPackageTableLayer::DoSpecialProcessingForColumnCreation(
+                                                    OGRFieldDefn* poField)
+{
+
+    if( poField->GetType() == OFTString && poField->GetSubType() == OFSTJSON )
+    {
+        /* A lot of one time setup ! */
+
+        if( !m_poDS->HasDataColumnsTable() )
+        {
+            if( OGRERR_NONE != SQLCommand(m_poDS->GetDB(),
+                "CREATE TABLE gpkg_data_columns ("
+                "table_name TEXT NOT NULL,"
+                "column_name TEXT NOT NULL,"
+                "name TEXT UNIQUE,"
+                "title TEXT,"
+                "description TEXT,"
+                "mime_type TEXT,"
+                "constraint_name TEXT,"
+                "CONSTRAINT pk_gdc PRIMARY KEY (table_name, column_name),"
+                "CONSTRAINT fk_gdc_tn FOREIGN KEY (table_name) "
+                "REFERENCES gpkg_contents(table_name));") )
+            {
+                return false;
+            }
+        }
+        if( !m_poDS->HasDataColumnConstraintsTable() )
+        {
+            if( OGRERR_NONE != SQLCommand(m_poDS->GetDB(),
+                "CREATE TABLE gpkg_data_column_constraints ("
+                "constraint_name TEXT NOT NULL,"
+                "constraint_type TEXT NOT NULL,"
+                "value TEXT,"
+                "min NUMERIC,"
+                "min_is_inclusive BOOLEAN,"
+                "max NUMERIC,"
+                "max_is_inclusive BOOLEAN,"
+                "description TEXT,"
+                "CONSTRAINT gdcc_ntv UNIQUE (constraint_name, "
+                "constraint_type, value));") )
+            {
+                return false;
+            }
+        }
+        if( m_poDS->CreateExtensionsTableIfNecessary() != OGRERR_NONE )
+        {
+            return false;
+        }
+        if( SQLGetInteger(m_poDS->GetDB(),
+            "SELECT 1 FROM gpkg_extensions WHERE "
+            "table_name = 'gpkg_data_columns'", nullptr) != 1 )
+        {
+            if( OGRERR_NONE != SQLCommand(m_poDS->GetDB(),
+                "INSERT INTO gpkg_extensions "
+                "(table_name,column_name,extension_name,definition,scope) "
+                "VALUES ('gpkg_data_columns', NULL, 'gpkg_schema', "
+                "'http://www.geopackage.org/spec121/#extension_schema', "
+                "'read-write')") )
+            {
+                return false;
+            }
+        }
+        if( SQLGetInteger(m_poDS->GetDB(),
+            "SELECT 1 FROM gpkg_extensions WHERE "
+            "table_name = 'gpkg_data_column_constraints'", nullptr) != 1 )
+        {
+            if( OGRERR_NONE != SQLCommand(m_poDS->GetDB(),
+                "INSERT INTO gpkg_extensions "
+                "(table_name,column_name,extension_name,definition,scope) "
+                "VALUES ('gpkg_data_column_constraints', NULL, 'gpkg_schema', "
+                "'http://www.geopackage.org/spec121/#extension_schema', "
+                "'read-write')") )
+            {
+                return false;
+            }
+        }
+
+        /* Now let's register our column. */
+        char* pszSQL = sqlite3_mprintf(
+            "INSERT INTO gpkg_data_columns (table_name, column_name, name, "
+            "title, description, mime_type, constraint_name) VALUES ("
+            "'%q', '%q', NULL, NULL, NULL, 'application/json', NULL)",
+            m_pszTableName, poField->GetNameRef());
+        bool ok = SQLCommand(m_poDS->GetDB(), pszSQL) == OGRERR_NONE;
+        sqlite3_free(pszSQL);
+        return ok;
+
+    }
+    return true;
+}
+
+
 /************************************************************************/
 /*                           CreateGeomField()                          */
 /************************************************************************/
@@ -3001,7 +3044,7 @@ CPLString OGRGeoPackageTableLayer::ReturnSQLCreateSpatialIndexTriggers(
 void OGRGeoPackageTableLayer::CheckUnknownExtensions()
 {
     const std::map< CPLString, std::vector<GPKGExtensionDesc> >& oMap =
-                                                    m_poDS->GetExtensions();
+                                 m_poDS->GetUnknownExtensionsTableSpecific();
     std::map< CPLString, std::vector<GPKGExtensionDesc> >::const_iterator
         oIter = oMap.find( CPLString(m_pszTableName).toupper() );
     if( oIter != oMap.end() )
@@ -3767,6 +3810,14 @@ OGRErr OGRGeoPackageTableLayer::RunDeferredCreationIfNecessary()
     if ( OGRERR_NONE != err )
         return OGRERR_FAILURE;
 
+    for( auto& poField: apoFields )
+    {
+        if( !DoSpecialProcessingForColumnCreation(poField) )
+        {
+            return OGRERR_FAILURE;
+        }
+    }
+
     /* Update gpkg_contents with the table info */
     const OGRwkbGeometryType eGType = GetGeomType();
     const bool bIsSpatial = (eGType != wkbNone);
@@ -4575,8 +4626,28 @@ OGRErr OGRGeoPackageTableLayer::AlterFieldDefn( int iFieldToAlter,
             OGRFieldDefn* poFieldDefn =
                 m_poFeatureDefn->GetFieldDefn(iFieldToAlter);
 
+            bool bRunDoSpecialProcessingForColumnCreation = false;
             if (nFlagsIn & ALTER_TYPE_FLAG)
             {
+                if( poFieldDefn->GetSubType() == OFSTJSON &&
+                    poNewFieldDefn->GetSubType() == OFSTNone )
+                {
+                    char* pszSQL = sqlite3_mprintf(
+                        "DELETE FROM gpkg_data_columns WHERE "
+                        "lower(table_name) = lower('%q') AND "
+                        "lower(column_name) = lower('%q')",
+                        m_pszTableName,
+                        poNewFieldDefn->GetNameRef() );
+                    eErr = SQLCommand( m_poDS->GetDB(), pszSQL );
+                    sqlite3_free(pszSQL);
+                }
+                else if ( poFieldDefn->GetSubType() == OFSTNone &&
+                          poNewFieldDefn->GetType() == OFTString &&
+                          poNewFieldDefn->GetSubType() == OFSTJSON )
+                {
+                    bRunDoSpecialProcessingForColumnCreation = true;
+                }
+
                 poFieldDefn->SetSubType(OFSTNone);
                 poFieldDefn->SetType(poNewFieldDefn->GetType());
                 poFieldDefn->SetSubType(poNewFieldDefn->GetSubType());
@@ -4595,6 +4666,11 @@ OGRErr OGRGeoPackageTableLayer::AlterFieldDefn( int iFieldToAlter,
             if (nFlagsIn & ALTER_DEFAULT_FLAG)
                 poFieldDefn->SetDefault(poNewFieldDefn->GetDefault());
 
+            if( bRunDoSpecialProcessingForColumnCreation )
+            {
+                DoSpecialProcessingForColumnCreation(poFieldDefn);
+            }
+
             ResetReading();
         }
     }
diff --git a/gdal/swig/python/samples/validate_gpkg.py b/gdal/swig/python/samples/validate_gpkg.py
index 6c37de28508c..d1fb37d8baf3 100755
--- a/gdal/swig/python/samples/validate_gpkg.py
+++ b/gdal/swig/python/samples/validate_gpkg.py
@@ -1493,6 +1493,67 @@ def _check_metadata(self, c):
                          "Row with md_file_id = md_parent_id = %s " %
                          str(md_file_id))
 
+    def _check_schema(self, c):
+
+        # Partial: doesn't check gpkg_data_column_constraints
+
+        self._log('Checking gpkg_schema (partial)')
+
+        must_have_gpkg_schema = False
+        c.execute("SELECT 1 FROM sqlite_master WHERE name = 'gpkg_extensions'")
+        if c.fetchone() is not None:
+            c.execute("SELECT scope FROM gpkg_extensions WHERE "
+                      "extension_name = 'gpkg_schema'")
+            row = c.fetchone()
+            if row is not None:
+                must_have_gpkg_schema = True
+                (scope, ) = row
+                self._assert(scope == 'read-write', 141,
+                             "Wrong scope for gpkg_schema in "
+                             "gpkg_extensions")
+
+        c.execute("SELECT 1 FROM sqlite_master WHERE name = 'gpkg_data_columns'")
+        if c.fetchone() is None:
+            if must_have_gpkg_schema:
+                self._log("gpkg_data_columns table missing. Not forbidden by requirements, but odd")
+            else:
+                self._log('... No schema')
+            return
+
+        c.execute("PRAGMA table_info(gpkg_data_columns)")
+        columns = c.fetchall()
+        expected_columns = [
+            (0, 'table_name', 'TEXT', 1, None, 1),
+            (1, 'column_name', 'TEXT', 1, None, 2),
+            (2, 'name', 'TEXT', 0, None, 0),
+            (3, 'title', 'TEXT', 0, None, 0),
+            (4, 'description', 'TEXT', 0, None, 0),
+            (5, 'mime_type', 'TEXT', 0, None, 0),
+            (6, 'constraint_name', 'TEXT', 0, None, 0)
+        ]
+        self._check_structure(columns, expected_columns, 107,
+                              'gpkg_data_columns')
+
+        c.execute("SELECT table_name, column_name FROM gpkg_data_columns")
+        rows = c.fetchall()
+        for (table_name, column_name) in rows:
+            c.execute("SELECT 1 FROM gpkg_contents WHERE table_name = ?",
+                      (table_name,))
+            self._assert(c.fetchone(), 104,
+                         ("table_name = %s " % table_name +
+                          "in gpkg_data_columns refer to non-existing " +
+                          "table/view in gpkg_contents"))
+
+            try:
+                c.execute("SELECT %s FROM %s" % (_esc_id(column_name),
+                                                 _esc_id(table_name)))
+            except sqlite3.OperationalError:
+                self._assert(False, 105,
+                             ("table_name = %s, " % table_name +
+                              "column_name = %s " % column_name +
+                              "in gpkg_data_columns refer to non-existing " +
+                              "column"))
+
     def check(self):
         self._assert(os.path.exists(self.filename), None,
                      "%s does not exist" % self.filename)
@@ -1564,7 +1625,8 @@ def check(self):
 
             self._check_metadata(c)
 
-            # TODO: check gpkg_schema
+            self._check_schema(c)
+
         finally:
             c.close()
             conn.close()

From e57c8627b2925254b5d0b35d42d987891eb3bcd0 Mon Sep 17 00:00:00 2001
From: Even Rouault <even.rouault@spatialys.com>
Date: Wed, 21 Nov 2018 20:25:46 +0100
Subject: [PATCH 072/488] PG: add read/write support for JSON field subtype

---
 autotest/ogr/ogr_pg.py                        | 40 ++++++++++++-
 gdal/ogr/ogrsf_frmts/pg/ogr_pg.h              |  2 +
 gdal/ogr/ogrsf_frmts/pg/ogrpglayer.cpp        |  5 ++
 .../ogr/ogrsf_frmts/pgdump/ogrpgdumplayer.cpp | 60 ++++++++++---------
 4 files changed, 79 insertions(+), 28 deletions(-)

diff --git a/autotest/ogr/ogr_pg.py b/autotest/ogr/ogr_pg.py
index e7f53c8472a5..96eb0ebddb4d 100755
--- a/autotest/ogr/ogr_pg.py
+++ b/autotest/ogr/ogr_pg.py
@@ -5545,6 +5545,42 @@ def ogr_pg_87():
 
     return 'success'
 
+###############################################################################
+# Test JSON subtype
+
+
+def ogr_pg_json():
+
+    if gdaltest.pg_ds is None or gdaltest.ogr_pg_second_run:
+        return 'skip'
+
+    lyr = gdaltest.pg_ds.CreateLayer('ogr_pg_json')
+    fld_defn = ogr.FieldDefn('test_json', ogr.OFTString)
+    fld_defn.SetSubType(ogr.OFSTJSON)
+    lyr.CreateField(fld_defn)
+    f = ogr.Feature(lyr.GetLayerDefn())
+    f['test_json'] = '{"a": "b"}'
+    lyr.CreateFeature(f)
+
+    gdaltest.pg_ds = ogr.Open('PG:' + gdaltest.pg_connection_string, update=1)
+    lyr = gdaltest.pg_ds.GetLayer('ogr_pg_json')
+    if lyr.GetLayerDefn().GetFieldDefn(0).GetSubType() != ogr.OFSTJSON:
+        gdaltest.post_reason('fail')
+        return 'fail'
+    f = lyr.GetNextFeature()
+    if f.GetField(0) != '{"a": "b"}':
+        gdaltest.post_reason('fail')
+        f.DumpReadable()
+        return 'fail'
+
+    sql_lyr = gdaltest.pg_ds.ExecuteSQL('SELECT * FROM ogr_pg_json')
+    if sql_lyr.GetLayerDefn().GetFieldDefn(0).GetSubType() != ogr.OFSTJSON:
+        gdaltest.post_reason('fail')
+        return 'fail'
+    gdaltest.pg_ds.ReleaseResultSet(sql_lyr)
+
+    return 'success'
+
 ###############################################################################
 #
 
@@ -5614,6 +5650,7 @@ def ogr_pg_table_cleanup():
     gdaltest.pg_ds.ExecuteSQL('DELLAYER:ogr_pg_85_2')
     gdaltest.pg_ds.ExecuteSQL('DELLAYER:ogr_pg_86')
     gdaltest.pg_ds.ExecuteSQL('DELLAYER:ogr_pg_87')
+    gdaltest.pg_ds.ExecuteSQL('DELLAYER:ogr_pg_json')
 
     # Drop second 'tpoly' from schema 'AutoTest-schema' (do NOT quote names here)
     gdaltest.pg_ds.ExecuteSQL('DELLAYER:AutoTest-schema.tpoly')
@@ -5737,12 +5774,13 @@ def ogr_pg_cleanup():
     ogr_pg_85,
     ogr_pg_86,
     ogr_pg_87,
+    ogr_pg_json,
     ogr_pg_cleanup
 ]
 
 disabled_gdaltest_list_internal = [
     ogr_pg_table_cleanup,
-    ogr_pg_86,
+    ogr_pg_json,
     ogr_pg_cleanup]
 
 ###############################################################################
diff --git a/gdal/ogr/ogrsf_frmts/pg/ogr_pg.h b/gdal/ogr/ogrsf_frmts/pg/ogr_pg.h
index 62dc48df7bdd..c34c217b4c7b 100644
--- a/gdal/ogr/ogrsf_frmts/pg/ogr_pg.h
+++ b/gdal/ogr/ogrsf_frmts/pg/ogr_pg.h
@@ -56,6 +56,7 @@
 #define XIDOID                  28
 #define CIDOID                  29
 #define OIDVECTOROID            30
+#define JSONOID                 114
 #define FLOAT4OID               700
 #define FLOAT8OID               701
 #define BOOLARRAYOID            1000
@@ -75,6 +76,7 @@
 #define TIMESTAMPTZOID          1184
 #define NUMERICOID              1700
 #define NUMERICARRAYOID         1231
+#define JSONBOID                3802
 
 CPLString OGRPGEscapeString(void *hPGConn,
                             const char* pszStrValue, int nMaxLength = -1,
diff --git a/gdal/ogr/ogrsf_frmts/pg/ogrpglayer.cpp b/gdal/ogr/ogrsf_frmts/pg/ogrpglayer.cpp
index 82b0d5f7ac34..ac6a46bfa840 100644
--- a/gdal/ogr/ogrsf_frmts/pg/ogrpglayer.cpp
+++ b/gdal/ogr/ogrsf_frmts/pg/ogrpglayer.cpp
@@ -2187,6 +2187,11 @@ int OGRPGLayer::ReadResultDefinition(PGresult *hInitialResultIn)
 
             oField.SetType( OFTDateTime );
         }
+        else if ( nTypeOID == JSONOID || nTypeOID == JSONBOID )
+        {
+            oField.SetType( OFTString );
+            oField.SetSubType( OFSTJSON );
+        }
         else /* unknown type */
         {
             CPLDebug("PG", "Unhandled OID (%d) for column %s. Defaulting to String.",
diff --git a/gdal/ogr/ogrsf_frmts/pgdump/ogrpgdumplayer.cpp b/gdal/ogr/ogrsf_frmts/pgdump/ogrpgdumplayer.cpp
index d3450e7045b3..c8b14a921917 100644
--- a/gdal/ogr/ogrsf_frmts/pgdump/ogrpgdumplayer.cpp
+++ b/gdal/ogr/ogrsf_frmts/pgdump/ogrpgdumplayer.cpp
@@ -1179,7 +1179,7 @@ CPLString OGRPGCommonLayerGetType( OGRFieldDefn& oField,
                                    bool bPreservePrecision,
                                    bool bApproxOK )
 {
-    char szFieldType[256];
+    const char* pszFieldType = "";
 
 /* -------------------------------------------------------------------- */
 /*      Work out the PostgreSQL type.                                   */
@@ -1187,79 +1187,81 @@ CPLString OGRPGCommonLayerGetType( OGRFieldDefn& oField,
     if( oField.GetType() == OFTInteger )
     {
         if( oField.GetSubType() == OFSTBoolean )
-            strcpy( szFieldType, "BOOLEAN" );
+            pszFieldType = "BOOLEAN";
         else if( oField.GetSubType() == OFSTInt16 )
-            strcpy( szFieldType, "SMALLINT" );
+            pszFieldType = "SMALLINT";
         else if( oField.GetWidth() > 0 && bPreservePrecision )
-            snprintf( szFieldType, sizeof(szFieldType), "NUMERIC(%d,0)", oField.GetWidth() );
+            pszFieldType = CPLSPrintf( "NUMERIC(%d,0)", oField.GetWidth() );
         else
-            strcpy( szFieldType, "INTEGER" );
+            pszFieldType = "INTEGER";
     }
     else if( oField.GetType() == OFTInteger64 )
     {
         if( oField.GetWidth() > 0 && bPreservePrecision )
-            snprintf( szFieldType, sizeof(szFieldType), "NUMERIC(%d,0)", oField.GetWidth() );
+            pszFieldType = CPLSPrintf( "NUMERIC(%d,0)", oField.GetWidth() );
         else
-            strcpy( szFieldType, "INT8" );
+            pszFieldType = "INT8";
     }
     else if( oField.GetType() == OFTReal )
     {
         if( oField.GetSubType() == OFSTFloat32 )
-            strcpy( szFieldType, "REAL" );
+            pszFieldType = "REAL";
         else if( oField.GetWidth() > 0 &&
                  oField.GetPrecision() > 0 &&
                  bPreservePrecision )
-            snprintf( szFieldType, sizeof(szFieldType), "NUMERIC(%d,%d)",
+            pszFieldType = CPLSPrintf( "NUMERIC(%d,%d)",
                      oField.GetWidth(), oField.GetPrecision() );
         else
-            strcpy( szFieldType, "FLOAT8" );
+            pszFieldType = "FLOAT8";
     }
     else if( oField.GetType() == OFTString )
     {
-        if (oField.GetWidth() > 0 &&  bPreservePrecision )
-            snprintf( szFieldType, sizeof(szFieldType), "VARCHAR(%d)",  oField.GetWidth() );
+        if (oField.GetSubType() == OFSTJSON )
+            pszFieldType = CPLGetConfigOption("OGR_PG_JSON_TYPE", "JSON");
+        else if (oField.GetWidth() > 0 &&  bPreservePrecision )
+            pszFieldType = CPLSPrintf( "VARCHAR(%d)",  oField.GetWidth() );
         else
-            strcpy( szFieldType, "VARCHAR");
+            pszFieldType = CPLGetConfigOption("OGR_PG_STRING_TYPE", "VARCHAR");
     }
     else if( oField.GetType() == OFTIntegerList )
     {
         if( oField.GetSubType() == OFSTBoolean )
-            strcpy( szFieldType, "BOOLEAN[]" );
+            pszFieldType = "BOOLEAN[]";
         else if( oField.GetSubType() == OFSTInt16 )
-            strcpy( szFieldType, "INT2[]" );
+            pszFieldType = "INT2[]";
         else
-            strcpy( szFieldType, "INTEGER[]" );
+            pszFieldType = "INTEGER[]";
     }
     else if( oField.GetType() == OFTInteger64List )
     {
-        strcpy( szFieldType, "INT8[]" );
+        pszFieldType = "INT8[]";
     }
     else if( oField.GetType() == OFTRealList )
     {
         if( oField.GetSubType() == OFSTFloat32 )
-            strcpy( szFieldType, "REAL[]" );
+            pszFieldType = "REAL[]";
         else
-            strcpy( szFieldType, "FLOAT8[]" );
+            pszFieldType = "FLOAT8[]";
     }
     else if( oField.GetType() == OFTStringList )
     {
-        strcpy( szFieldType, "varchar[]" );
+        pszFieldType = "varchar[]";
     }
     else if( oField.GetType() == OFTDate )
     {
-        strcpy( szFieldType, "date" );
+        pszFieldType = "date";
     }
     else if( oField.GetType() == OFTTime )
     {
-        strcpy( szFieldType, "time" );
+        pszFieldType = "time";
     }
     else if( oField.GetType() == OFTDateTime )
     {
-        strcpy( szFieldType, "timestamp with time zone" );
+        pszFieldType = "timestamp with time zone";
     }
     else if( oField.GetType() == OFTBinary )
     {
-        strcpy( szFieldType, "bytea" );
+        pszFieldType = "bytea";
     }
     else if( bApproxOK )
     {
@@ -1267,7 +1269,7 @@ CPLString OGRPGCommonLayerGetType( OGRFieldDefn& oField,
                   "Can't create field %s with type %s on PostgreSQL layers.  Creating as VARCHAR.",
                   oField.GetNameRef(),
                   OGRFieldDefn::GetFieldTypeName(oField.GetType()) );
-        strcpy( szFieldType, "VARCHAR" );
+        pszFieldType = "VARCHAR";
     }
     else
     {
@@ -1275,10 +1277,9 @@ CPLString OGRPGCommonLayerGetType( OGRFieldDefn& oField,
                   "Can't create field %s with type %s on PostgreSQL layers.",
                   oField.GetNameRef(),
                   OGRFieldDefn::GetFieldTypeName(oField.GetType()) );
-        strcpy( szFieldType, "");
     }
 
-    return szFieldType;
+    return pszFieldType;
 }
 
 /************************************************************************/
@@ -1443,6 +1444,11 @@ bool OGRPGCommonLayerSetType( OGRFieldDefn& oField,
     {
         oField.SetType( OFTBinary );
     }
+    else if( EQUAL(pszType,"json") || EQUAL(pszType, "jsonb") )
+    {
+        oField.SetType( OFTString );
+        oField.SetSubType( OFSTJSON );
+    }
     else
     {
         CPLDebug( "PGCommon", "Field %s is of unknown format type %s (type=%s).",

From 9f0bbc321e11d7f88ee59af5ccdfb58204ec04f6 Mon Sep 17 00:00:00 2001
From: Even Rouault <even.rouault@spatialys.com>
Date: Thu, 22 Nov 2018 11:25:14 +0100
Subject: [PATCH 073/488] GDALPansharpenOperation: fix inverted arguments in
 error message (spotted by @sotex, fixes #1110)

---
 gdal/alg/gdalpansharpen.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/gdal/alg/gdalpansharpen.cpp b/gdal/alg/gdalpansharpen.cpp
index 4369114e92f7..98ace11c53e0 100644
--- a/gdal/alg/gdalpansharpen.cpp
+++ b/gdal/alg/gdalpansharpen.cpp
@@ -254,7 +254,7 @@ GDALPansharpenOperation::Initialize( const GDALPansharpenOptions* psOptionsIn )
         {
             CPLError(CE_Failure, CPLE_AppDefined,
                      "Invalid value panOutPansharpenedBands[%d] = %d",
-                     psOptionsIn->panOutPansharpenedBands[i], i);
+                     i, psOptionsIn->panOutPansharpenedBands[i]);
             return CE_Failure;
         }
     }

From a965bda62acdb21b5ac3e5291f84cdadcbeb4b05 Mon Sep 17 00:00:00 2001
From: Even Rouault <even.rouault@spatialys.com>
Date: Thu, 22 Nov 2018 12:39:10 +0100
Subject: [PATCH 074/488] GeoJSON: no longer write NaN/Infinity values by
 default (fixes #1109)

But allow to write them if WRITE_NON_FINITE_VALUES layer creation option
is set to YES.
---
 autotest/cpp/test_cpl.cpp                     |  69 +++
 autotest/ogr/ogr_geojson.py                   |  77 +++
 gdal/ogr/ogrsf_frmts/geojson/drv_geojson.html |   4 +
 .../geojson/libjson/json_tokener.c            | 443 +++++++++++++-----
 .../geojson/libjson/json_tokener.h            |  36 +-
 .../geojson/libjson/symbol_renames.h          |   1 -
 .../ogrsf_frmts/geojson/ogrgeojsondriver.cpp  |   1 +
 .../ogrsf_frmts/geojson/ogrgeojsonreader.cpp  |  15 +
 .../geojson/ogrgeojsonwritelayer.cpp          |   2 +
 .../ogrsf_frmts/geojson/ogrgeojsonwriter.cpp  |  17 +-
 .../ogrsf_frmts/geojson/ogrgeojsonwriter.h    |   1 +
 gdal/port/cpl_json_streaming_parser.cpp       |  77 ++-
 .../detect_suspicious_char_digit_zero.sh      |   2 +-
 13 files changed, 598 insertions(+), 147 deletions(-)

diff --git a/autotest/cpp/test_cpl.cpp b/autotest/cpp/test_cpl.cpp
index c76dd1e7f7ab..a5d109e5ceae 100644
--- a/autotest/cpp/test_cpl.cpp
+++ b/autotest/cpp/test_cpl.cpp
@@ -1635,6 +1635,39 @@ namespace tut
                 ensure( oParser.Parse( sText + i, 1, sText[i+1] == 0 ) );
             ensure_equals( oParser.GetSerialized(), sExpected );
         }
+        {
+            CPLJSonStreamingParserDump oParser;
+            const char sText[] = "infinity";
+            ensure( oParser.Parse( sText, strlen(sText), true ) );
+            ensure_equals( oParser.GetSerialized(), sText );
+
+            oParser.Reset();
+            for( size_t i = 0; sText[i]; i++ )
+                ensure( oParser.Parse( sText + i, 1, sText[i+1] == 0 ) );
+            ensure_equals( oParser.GetSerialized(), sText );
+        }
+        {
+            CPLJSonStreamingParserDump oParser;
+            const char sText[] = "-infinity";
+            ensure( oParser.Parse( sText, strlen(sText), true ) );
+            ensure_equals( oParser.GetSerialized(), sText );
+
+            oParser.Reset();
+            for( size_t i = 0; sText[i]; i++ )
+                ensure( oParser.Parse( sText + i, 1, sText[i+1] == 0 ) );
+            ensure_equals( oParser.GetSerialized(), sText );
+        }
+        {
+            CPLJSonStreamingParserDump oParser;
+            const char sText[] = "nan";
+            ensure( oParser.Parse( sText, strlen(sText), true ) );
+            ensure_equals( oParser.GetSerialized(), sText );
+
+            oParser.Reset();
+            for( size_t i = 0; sText[i]; i++ )
+                ensure( oParser.Parse( sText + i, 1, sText[i+1] == 0 ) );
+            ensure_equals( oParser.GetSerialized(), sText );
+        }
 
         // errors
         {
@@ -1697,6 +1730,42 @@ namespace tut
             ensure( !oParser.Parse( sText, strlen(sText), true ) );
             ensure( !oParser.GetException().empty() );
         }
+        {
+            CPLJSonStreamingParserDump oParser;
+            const char sText[] = "na";
+            ensure( !oParser.Parse( sText, strlen(sText), true ) );
+            ensure( !oParser.GetException().empty() );
+        }
+        {
+            CPLJSonStreamingParserDump oParser;
+            const char sText[] = "nanx";
+            ensure( !oParser.Parse( sText, strlen(sText), true ) );
+            ensure( !oParser.GetException().empty() );
+        }
+        {
+            CPLJSonStreamingParserDump oParser;
+            const char sText[] = "infinit";
+            ensure( !oParser.Parse( sText, strlen(sText), true ) );
+            ensure( !oParser.GetException().empty() );
+        }
+        {
+            CPLJSonStreamingParserDump oParser;
+            const char sText[] = "infinityx";
+            ensure( !oParser.Parse( sText, strlen(sText), true ) );
+            ensure( !oParser.GetException().empty() );
+        }
+        {
+            CPLJSonStreamingParserDump oParser;
+            const char sText[] = "-infinit";
+            ensure( !oParser.Parse( sText, strlen(sText), true ) );
+            ensure( !oParser.GetException().empty() );
+        }
+        {
+            CPLJSonStreamingParserDump oParser;
+            const char sText[] = "-infinityx";
+            ensure( !oParser.Parse( sText, strlen(sText), true ) );
+            ensure( !oParser.GetException().empty() );
+        }
         {
             CPLJSonStreamingParserDump oParser;
             const char sText[] = "true false";
diff --git a/autotest/ogr/ogr_geojson.py b/autotest/ogr/ogr_geojson.py
index 17937a380135..6ed3b96a0798 100755
--- a/autotest/ogr/ogr_geojson.py
+++ b/autotest/ogr/ogr_geojson.py
@@ -29,6 +29,7 @@
 ###############################################################################
 
 import json
+import math
 import os
 import sys
 
@@ -4252,6 +4253,81 @@ def ogr_geojson_clip_geometries_rfc7946():
     gdal.Unlink(tmpfilename)
     return 'success'
 
+###############################################################################
+# Test bugfix for https://github.com/OSGeo/gdal/issues/1109
+
+
+def ogr_geojson_non_finite():
+
+    json_content = """{
+  "type": "FeatureCollection",
+  "features": [
+      { "type": "Feature", "properties": { "inf_prop": infinity, "minus_inf_prop": -infinity, "nan_prop": nan }, "geometry": null }
+  ]
+}"""
+    with gdaltest.error_handler():
+        ds = ogr.Open(json_content)
+    if ds is None:
+        # Might fail with older libjson-c versions
+        return 'skip'
+    lyr = ds.GetLayer(0)
+    f = lyr.GetNextFeature()
+    for i in range(3):
+        if lyr.GetLayerDefn().GetFieldDefn(i).GetType() != ogr.OFTReal:
+            gdaltest.post_reason('fail')
+            print(i)
+            return 'fail'
+
+    if f['inf_prop'] != float('inf'):
+        gdaltest.post_reason('fail')
+        f.DumpReadable()
+        return 'fail'
+    if f['minus_inf_prop'] != float('-inf'):
+        gdaltest.post_reason('fail')
+        f.DumpReadable()
+        return 'fail'
+    if not math.isnan(f['nan_prop']):
+        gdaltest.post_reason('fail')
+        print(str(f['nan_prop']))
+        f.DumpReadable()
+        return 'fail'
+    ds = None
+
+    tmpfilename = '/vsimem/out.json'
+
+    with gdaltest.error_handler():
+        gdal.VectorTranslate(tmpfilename, json_content, options='-f GeoJSON')
+    ds = ogr.Open(tmpfilename)
+    lyr = ds.GetLayer(0)
+    if lyr.GetLayerDefn().GetFieldCount() != 0:
+        gdaltest.post_reason('fail')
+        return 'fail'
+    ds = None
+
+    gdal.VectorTranslate(tmpfilename, json_content, options='-f GeoJSON -lco WRITE_NON_FINITE_VALUES=YES')
+    ds = ogr.Open(tmpfilename)
+    lyr = ds.GetLayer(0)
+    if lyr.GetLayerDefn().GetFieldCount() != 3:
+        gdaltest.post_reason('fail')
+        return 'fail'
+    f = lyr.GetNextFeature()
+    if f['inf_prop'] != float('inf'):
+        gdaltest.post_reason('fail')
+        f.DumpReadable()
+        return 'fail'
+    if f['minus_inf_prop'] != float('-inf'):
+        gdaltest.post_reason('fail')
+        f.DumpReadable()
+        return 'fail'
+    if not math.isnan(f['nan_prop']):
+        gdaltest.post_reason('fail')
+        print(str(f['nan_prop']))
+        f.DumpReadable()
+        return 'fail'
+    ds = None
+
+    gdal.Unlink(tmpfilename)
+    return 'success'
 
 ###############################################################################
 
@@ -4368,6 +4444,7 @@ def ogr_geojson_cleanup():
     ogr_esrijson_without_geometryType,
     ogr_geojson_read_fields_with_different_case,
     ogr_geojson_clip_geometries_rfc7946,
+    ogr_geojson_non_finite,
     ogr_geojson_cleanup]
 
 if __name__ == '__main__':
diff --git a/gdal/ogr/ogrsf_frmts/geojson/drv_geojson.html b/gdal/ogr/ogrsf_frmts/geojson/drv_geojson.html
index 609b88a35b52..52d988a559e7 100644
--- a/gdal/ogr/ogrsf_frmts/geojson/drv_geojson.html
+++ b/gdal/ogr/ogrsf_frmts/geojson/drv_geojson.html
@@ -191,6 +191,10 @@ <h2>Layer creation options</h2>
 written as the 'id' member of Feature objects.</li>
 <li><b>ID_TYPE</b>=AUTO/String/Integer. (OGR &gt;= 2.3) Type of the 'id'
 memer of Feature objects.</li>
+<li><b>WRITE_NON_FINITE_VALUES</b>=YES/NO. (OGR &gt;= 2.4) Whether to write NaN / Infinity values.
+Such values are not allowed in strict JSon mode, but some JSon parsers
+(libjson-c &gt;= 0.12 for exampl) can understand them as they are allowed by ECMAScript.
+Defaults to NO</li>
 </ul>
 
 <h2>VSI Virtual File System API support</h2>
diff --git a/gdal/ogr/ogrsf_frmts/geojson/libjson/json_tokener.c b/gdal/ogr/ogrsf_frmts/geojson/libjson/json_tokener.c
index 42c1a45cd749..51b4fa1e3978 100644
--- a/gdal/ogr/ogrsf_frmts/geojson/libjson/json_tokener.c
+++ b/gdal/ogr/ogrsf_frmts/geojson/libjson/json_tokener.c
@@ -13,6 +13,10 @@
  * (http://www.opensource.org/licenses/mit-license.php)
  */
 
+// For uselocale
+#undef _XOPEN_SOURCE
+#define _XOPEN_SOURCE 700
+
 #include "config.h"
 
 #include "cpl_conv.h"
@@ -30,19 +34,18 @@
 #include "arraylist.h"
 #include "json_inttypes.h"
 #include "json_object.h"
+#include "json_object_private.h"
 #include "json_tokener.h"
 #include "json_util.h"
 
-#ifdef HAVE_LOCALE_H
+#if defined(HAVE_LOCALE_H) || defined(HAVE_USELOCALE)
 #include <locale.h>
 #endif /* HAVE_LOCALE_H */
+#ifdef HAVE_XLOCALE_H
+#include <xlocale.h>
+#endif
 
-#if !HAVE_STRDUP && defined(_MSC_VER)
-  /* MSC has the version as _strdup */
-# define strdup _strdup
-#elif !HAVE_STRDUP
-# error You do not have strdup on your system.
-#endif /* HAVE_STRDUP */
+#define jt_hexdigit(x) (((x) <= '9') ? (x) - '0' : ((x) & 7) + 9)
 
 #if !HAVE_STRNCASECMP && defined(_MSC_VER)
   /* MSC has the version as _strnicmp */
@@ -51,12 +54,24 @@
 # error You do not have strncasecmp on your system.
 #endif /* HAVE_STRNCASECMP */
 
-static const char* json_null_str = "null";
-static const char* json_true_str = "true";
-static const char* json_false_str = "false";
-
-// XXX after v0.10 this array will become static:
-const char* json_tokener_errors[] = {
+/* Use C99 NAN by default; if not available, nan("") should work too. */
+#ifndef NAN
+#define NAN nan("")
+#endif /* !NAN */
+
+static const char json_null_str[] = "null";
+static const int json_null_str_len = sizeof(json_null_str) - 1;
+static const char json_inf_str[] = "Infinity";
+static const char json_inf_str_lower[] = "infinity";
+static const unsigned int json_inf_str_len = sizeof(json_inf_str) - 1;
+static const char json_nan_str[] = "NaN";
+static const int json_nan_str_len = sizeof(json_nan_str) - 1;
+static const char json_true_str[] = "true";
+static const int json_true_str_len = sizeof(json_true_str) - 1;
+static const char json_false_str[] = "false";
+static const int json_false_str_len = sizeof(json_false_str) - 1;
+
+static const char* json_tokener_errors[] = {
   "success",
   "continue",
   "nesting too deep",
@@ -71,17 +86,20 @@ const char* json_tokener_errors[] = {
   "object value separator ',' expected",
   "invalid string sequence",
   "expected comment",
+  "buffer size overflow"
 };
 
 const char *json_tokener_error_desc(enum json_tokener_error jerr)
 {
-	int jerr_int = (int)jerr;
-	if (jerr_int < 0 || jerr_int >= (int)(sizeof(json_tokener_errors) / sizeof(json_tokener_errors[0])))
-		return "Unknown error, invalid json_tokener_error value passed to json_tokener_error_desc()";
+	int jerr_int = (int) jerr;
+	if (jerr_int < 0 ||
+	    jerr_int >= (int)(sizeof(json_tokener_errors) / sizeof(json_tokener_errors[0])))
+		return "Unknown error, "
+		       "invalid json_tokener_error value passed to json_tokener_error_desc()";
 	return json_tokener_errors[jerr];
 }
 
-enum json_tokener_error json_tokener_get_error(json_tokener *tok)
+enum json_tokener_error json_tokener_get_error(struct json_tokener *tok)
 {
 	return tok->err;
 }
@@ -98,7 +116,8 @@ struct json_tokener* json_tokener_new_ex(int depth)
 
   tok = (struct json_tokener*)calloc(1, sizeof(struct json_tokener));
   if (!tok) return NULL;
-  tok->stack = (struct json_tokener_srec *)calloc(depth, sizeof(struct json_tokener_srec));
+  tok->stack = (struct json_tokener_srec *) calloc(depth,
+						   sizeof(struct json_tokener_srec));
   if (!tok->stack) {
     free(tok);
     return NULL;
@@ -118,7 +137,7 @@ void json_tokener_free(struct json_tokener *tok)
 {
   json_tokener_reset(tok);
   if (tok->pb) printbuf_free(tok->pb);
-  if (tok->stack) free(tok->stack);
+  free(tok->stack);
   free(tok);
 }
 
@@ -152,7 +171,8 @@ struct json_object* json_tokener_parse(const char *str)
     return obj;
 }
 
-struct json_object* json_tokener_parse_verbose(const char *str, enum json_tokener_error *error)
+struct json_object* json_tokener_parse_verbose(const char *str,
+					       enum json_tokener_error *error)
 {
     struct json_tokener* tok;
     struct json_object* obj;
@@ -195,14 +215,17 @@ struct json_object* json_tokener_parse_verbose(const char *str, enum json_tokene
  *   Returns 1 on success, sets tok->err and returns 0 if no more chars.
  *   Implicit inputs:  str, len vars
  */
-#define PEEK_CHAR(dest, tok)                                                  \
-  (((tok)->char_offset == len) ?                                          \
-   (((tok)->depth == 0 && state == json_tokener_state_eatws && saved_state == json_tokener_state_finish) ? \
-    (((tok)->err = json_tokener_success), 0)                              \
-    :                                                                   \
-    (((tok)->err = json_tokener_continue), 0)                             \
-    ) :                                                                 \
-   (((dest) = *str), 1)                                                 \
+#define PEEK_CHAR(dest, tok)			\
+  (((tok)->char_offset == len) ?		\
+   (((tok)->depth == 0 &&			\
+     state == json_tokener_state_eatws &&	\
+     saved_state == json_tokener_state_finish	\
+     ) ?					\
+    (((tok)->err = json_tokener_success), 0)	\
+    :						\
+    (((tok)->err = json_tokener_continue), 0)	\
+    ) :						\
+   (((dest) = *str), 1)				\
    )
 
 /* ADVANCE_CHAR() macro:
@@ -222,17 +245,53 @@ struct json_object* json_tokener_parse_ex(struct json_tokener *tok,
 {
   struct json_object *obj = NULL;
   char c = '\1';
-#ifdef HAVE_SETLOCALE
-  char *oldlocale=NULL, *tmplocale;
-
-  tmplocale = setlocale(LC_NUMERIC, NULL);
-  if (tmplocale) oldlocale = strdup(tmplocale);
-  setlocale(LC_NUMERIC, "C");
+#ifdef HAVE_USELOCALE
+  locale_t oldlocale = uselocale(NULL);
+  locale_t newloc;
+#elif defined(HAVE_SETLOCALE)
+  char *oldlocale = NULL;
 #endif
 
   tok->char_offset = 0;
   tok->err = json_tokener_success;
 
+  /* this interface is presently not 64-bit clean due to the int len argument
+     and the internal printbuf interface that takes 32-bit int len arguments
+     so the function limits the maximum string size to INT32_MAX (2GB).
+     If the function is called with len == -1 then strlen is called to check
+     the string length is less than INT32_MAX (2GB) */
+  if ((len < -1) || (len == -1 && strlen(str) > INT32_MAX)) {
+    tok->err = json_tokener_error_size;
+    return NULL;
+  }
+
+#ifdef HAVE_USELOCALE
+  {
+    locale_t duploc = duplocale(oldlocale);
+    newloc = newlocale(LC_NUMERIC, "C", duploc);
+    // XXX at least Debian 8.4 has a bug in newlocale where it doesn't
+    //  change the decimal separator unless you set LC_TIME!
+    if (newloc)
+    {
+      duploc = newloc; // original duploc has been freed by newlocale()
+      newloc = newlocale(LC_TIME, "C", duploc);
+    }
+    if (newloc == NULL)
+    {
+      freelocale(duploc);
+      return NULL;
+    }
+    uselocale(newloc);
+  }
+#elif defined(HAVE_SETLOCALE)
+  {
+    char *tmplocale;
+    tmplocale = setlocale(LC_NUMERIC, NULL);
+    if (tmplocale) oldlocale = strdup(tmplocale);
+    setlocale(LC_NUMERIC, "C");
+  }
+#endif
+
   while (PEEK_CHAR(c, tok)) {
 
   redo_char:
@@ -240,11 +299,11 @@ struct json_object* json_tokener_parse_ex(struct json_tokener *tok,
 
     case json_tokener_state_eatws:
       /* Advance until we change state */
-      while (isspace((int)c)) {
+      while (isspace((unsigned char)c)) {
 	if ((!ADVANCE_CHAR(str, tok)) || (!PEEK_CHAR(c, tok)))
 	  goto out;
       }
-      if(c == '/') {
+      if(c == '/' && !(tok->flags & JSON_TOKENER_STRICT)) {
 	printbuf_reset(tok->pb);
 	printbuf_memappend_fast(tok->pb, &c, 1);
 	state = json_tokener_state_comment_start;
@@ -260,24 +319,36 @@ struct json_object* json_tokener_parse_ex(struct json_tokener *tok,
 	state = json_tokener_state_eatws;
 	saved_state = json_tokener_state_object_field_start;
 	current = json_object_new_object();
-        if( current == NULL )
-            goto out;
+	if(current == NULL)
+		goto out;
 	break;
       case '[':
 	state = json_tokener_state_eatws;
 	saved_state = json_tokener_state_array;
 	current = json_object_new_array();
-        if( current == NULL )
-            goto out;
+	if(current == NULL)
+		goto out;
 	break;
+      case 'I':
+      case 'i':
+	state = json_tokener_state_inf;
+	printbuf_reset(tok->pb);
+	tok->st_pos = 0;
+	goto redo_char;
       case 'N':
       case 'n':
-	state = json_tokener_state_null;
+	state = json_tokener_state_null; // or NaN
 	printbuf_reset(tok->pb);
 	tok->st_pos = 0;
 	goto redo_char;
-      case '"':
       case '\'':
+        if (tok->flags & JSON_TOKENER_STRICT) {
+            /* in STRICT mode only double-quote are allowed */
+            tok->err = json_tokener_error_parse_unexpected;
+            goto out;
+        }
+	/* FALLTHRU */
+      case '"':
 	state = json_tokener_state_string;
 	printbuf_reset(tok->pb);
 	tok->quote_char = c;
@@ -290,10 +361,7 @@ struct json_object* json_tokener_parse_ex(struct json_tokener *tok,
 	printbuf_reset(tok->pb);
 	tok->st_pos = 0;
 	goto redo_char;
-#if defined(__GNUC__)
-	  case '0' ... '9':
-#else
-	  case '0':
+      case '0':
       case '1':
       case '2':
       case '3':
@@ -303,7 +371,6 @@ struct json_object* json_tokener_parse_ex(struct json_tokener *tok,
       case '7':
       case '8':
       case '9':
-#endif
       case '-':
 	state = json_tokener_state_number;
 	printbuf_reset(tok->pb);
@@ -322,21 +389,95 @@ struct json_object* json_tokener_parse_ex(struct json_tokener *tok,
       tok->depth--;
       goto redo_char;
 
-    case json_tokener_state_null:
-      printbuf_memappend_fast(tok->pb, &c, 1);
-      if(strncasecmp(json_null_str, tok->pb->buf,
-		     json_min(tok->st_pos+1, (int)strlen(json_null_str))) == 0) {
-	if(tok->st_pos == (int)strlen(json_null_str)) {
-	  current = NULL;
-	  saved_state = json_tokener_state_finish;
-	  state = json_tokener_state_eatws;
-	  goto redo_char;
+    case json_tokener_state_inf: /* aka starts with 'i' (or 'I', or "-i", or "-I") */
+      {
+	/* If we were guaranteed to have len set, then we could (usually) handle
+	 * the entire "Infinity" check in a single strncmp (strncasecmp), but
+	 * since len might be -1 (i.e. "read until \0"), we need to check it
+	 * a character at a time.
+	 * Trying to handle it both ways would make this code considerably more
+	 * complicated with likely little performance benefit.
+	 */
+	int is_negative = 0;
+	const char *_json_inf_str = json_inf_str;
+	if (!(tok->flags & JSON_TOKENER_STRICT))
+		_json_inf_str = json_inf_str_lower;
+
+	/* Note: tok->st_pos must be 0 when state is set to json_tokener_state_inf */
+	while (tok->st_pos < (int)json_inf_str_len)
+	{
+		char inf_char = *str;
+		if (!(tok->flags & JSON_TOKENER_STRICT))
+			inf_char = tolower((int)*str);
+		if (inf_char != _json_inf_str[tok->st_pos])
+		{
+			tok->err = json_tokener_error_parse_unexpected;
+			goto out;
+		}
+		tok->st_pos++;
+		(void)ADVANCE_CHAR(str, tok);
+		if (!PEEK_CHAR(c, tok))
+		{
+			/* out of input chars, for now at least */
+			goto out;
+		}
 	}
-      } else {
-	tok->err = json_tokener_error_parse_null;
-	goto out;
+	/* We checked the full length of "Infinity", so create the object.
+	 * When handling -Infinity, the number parsing code will have dropped
+	 * the "-" into tok->pb for us, so check it now.
+	 */
+	if (printbuf_length(tok->pb) > 0 && *(tok->pb->buf) == '-')
+	{
+		is_negative = 1;
+	}
+	current = json_object_new_double(is_negative
+					 ? -INFINITY : INFINITY);
+	if (current == NULL)
+		goto out;
+	saved_state = json_tokener_state_finish;
+	state = json_tokener_state_eatws;
+	goto redo_char;
+	 
+      }
+      break;
+    case json_tokener_state_null: /* aka starts with 'n' */
+      {
+	int size;
+	int size_nan;
+	printbuf_memappend_fast(tok->pb, &c, 1);
+	size = json_min(tok->st_pos+1, json_null_str_len);
+	size_nan = json_min(tok->st_pos+1, json_nan_str_len);
+	if((!(tok->flags & JSON_TOKENER_STRICT) &&
+	  strncasecmp(json_null_str, tok->pb->buf, size) == 0)
+	  || (strncmp(json_null_str, tok->pb->buf, size) == 0)
+	  ) {
+	  if (tok->st_pos == json_null_str_len) {
+	    current = NULL;
+	    saved_state = json_tokener_state_finish;
+	    state = json_tokener_state_eatws;
+	    goto redo_char;
+	  }
+	}
+	else if ((!(tok->flags & JSON_TOKENER_STRICT) &&
+	          strncasecmp(json_nan_str, tok->pb->buf, size_nan) == 0) ||
+	         (strncmp(json_nan_str, tok->pb->buf, size_nan) == 0)
+	        )
+	{
+		if (tok->st_pos == json_nan_str_len)
+		{
+			current = json_object_new_double(NAN);
+			if (current == NULL)
+			    goto out;
+			saved_state = json_tokener_state_finish;
+			state = json_tokener_state_eatws;
+			goto redo_char;
+		}
+	} else {
+	  tok->err = json_tokener_error_parse_null;
+	  goto out;
+	}
+	tok->st_pos++;
       }
-      tok->st_pos++;
       break;
 
     case json_tokener_state_comment_start:
@@ -400,8 +541,8 @@ struct json_object* json_tokener_parse_ex(struct json_tokener *tok,
 	  if(c == tok->quote_char) {
 	    printbuf_memappend_fast(tok->pb, case_start, str-case_start);
 	    current = json_object_new_string_len(tok->pb->buf, tok->pb->bpos);
-            if( current == NULL )
-                goto out;
+	    if(current == NULL)
+		goto out;
 	    saved_state = json_tokener_state_finish;
 	    state = json_tokener_state_eatws;
 	    break;
@@ -456,21 +597,21 @@ struct json_object* json_tokener_parse_ex(struct json_tokener *tok,
 
 	  /* Handle a 4-byte sequence, or two sequences if a surrogate pair */
 	  while(1) {
-	    if(strchr(json_hex_chars, c)) {
-	      tok->ucs_char += ((unsigned int)hexdigit(c) << ((3-tok->st_pos++)*4));
+	    if (c && strchr(json_hex_chars, c)) {
+	      tok->ucs_char += ((unsigned int)jt_hexdigit(c) << ((3-tok->st_pos++)*4));
 	      if(tok->st_pos == 4) {
 		unsigned char unescaped_utf[4];
 
                 if (got_hi_surrogate) {
 		  if (IS_LOW_SURROGATE(tok->ucs_char)) {
-                    /* Recalculate the ucs_char, then fall through to process normally */
+                    /* Recalculate the ucs_char, then fall thru to process normally */
                     tok->ucs_char = DECODE_SURROGATE_PAIR(got_hi_surrogate, tok->ucs_char);
                   } else {
                     /* Hi surrogate was not followed by a low surrogate */
                     /* Replace the hi and process the rest normally */
 		    printbuf_memappend_fast(tok->pb, (char*)utf8_replacement_char, 3);
                   }
-                  /*got_hi_surrogate = 0;*/
+                  got_hi_surrogate = 0;
                 }
 
 		if (tok->ucs_char < 0x80) {
@@ -487,8 +628,8 @@ struct json_object* json_tokener_parse_ex(struct json_tokener *tok,
                    */
                   got_hi_surrogate = tok->ucs_char;
                   /* Not at end, and the next two chars should be "\u" */
-                  if ((tok->char_offset+1 != len) &&
-                      (tok->char_offset+2 != len) &&
+                  if ((len == -1 || len > (tok->char_offset + 2)) &&
+                      // str[0] != '0' &&  // implied by json_hex_chars, above.
                       (str[1] == '\\') &&
                       (str[2] == 'u'))
                   {
@@ -497,13 +638,15 @@ struct json_object* json_tokener_parse_ex(struct json_tokener *tok,
                  * characters.
                  */
 	            if( !ADVANCE_CHAR(str, tok) || !ADVANCE_CHAR(str, tok) ) {
-                    printbuf_memappend_fast(tok->pb, (char*)utf8_replacement_char, 3);
-                }
+                    printbuf_memappend_fast(tok->pb,
+					    (char*) utf8_replacement_char, 3);
+		    }
                     /* Advance to the first char of the next sequence and
                      * continue processing with the next sequence.
                      */
 	            if (!ADVANCE_CHAR(str, tok) || !PEEK_CHAR(c, tok)) {
-	              printbuf_memappend_fast(tok->pb, (char*)utf8_replacement_char, 3);
+	              printbuf_memappend_fast(tok->pb,
+					      (char*) utf8_replacement_char, 3);
 	              goto out;
                     }
 	            tok->ucs_char = 0;
@@ -514,7 +657,8 @@ struct json_object* json_tokener_parse_ex(struct json_tokener *tok,
                      * it.  Put a replacement char in for the hi surrogate
                      * and pretend we finished.
                      */
-		    printbuf_memappend_fast(tok->pb, (char*)utf8_replacement_char, 3);
+		    printbuf_memappend_fast(tok->pb,
+					    (char*) utf8_replacement_char, 3);
                   }
 		} else if (IS_LOW_SURROGATE(tok->ucs_char)) {
                   /* Got a low surrogate not preceded by a high */
@@ -551,32 +695,40 @@ struct json_object* json_tokener_parse_ex(struct json_tokener *tok,
       break;
 
     case json_tokener_state_boolean:
-      printbuf_memappend_fast(tok->pb, &c, 1);
-      if(strncasecmp(json_true_str, tok->pb->buf,
-		     json_min(tok->st_pos+1, (int)strlen(json_true_str))) == 0) {
-	if(tok->st_pos == (int)strlen(json_true_str)) {
-	  current = json_object_new_boolean(1);
-          if( current == NULL )
-              goto out;
-	  saved_state = json_tokener_state_finish;
-	  state = json_tokener_state_eatws;
-	  goto redo_char;
-	}
-      } else if(strncasecmp(json_false_str, tok->pb->buf,
-			    json_min(tok->st_pos+1, (int)strlen(json_false_str))) == 0) {
-	if(tok->st_pos == (int)strlen(json_false_str)) {
-	  current = json_object_new_boolean(0);
-          if( current == NULL )
-              goto out;
-	  saved_state = json_tokener_state_finish;
-	  state = json_tokener_state_eatws;
-	  goto redo_char;
+      {
+	int size1, size2;
+	printbuf_memappend_fast(tok->pb, &c, 1);
+	size1 = json_min(tok->st_pos+1, json_true_str_len);
+	size2 = json_min(tok->st_pos+1, json_false_str_len);
+	if((!(tok->flags & JSON_TOKENER_STRICT) &&
+	  strncasecmp(json_true_str, tok->pb->buf, size1) == 0)
+	  || (strncmp(json_true_str, tok->pb->buf, size1) == 0)
+	  ) {
+	  if(tok->st_pos == json_true_str_len) {
+	    current = json_object_new_boolean(1);
+	    if(current == NULL)
+		goto out;
+	    saved_state = json_tokener_state_finish;
+	    state = json_tokener_state_eatws;
+	    goto redo_char;
+	  }
+	} else if((!(tok->flags & JSON_TOKENER_STRICT) &&
+	  strncasecmp(json_false_str, tok->pb->buf, size2) == 0)
+	  || (strncmp(json_false_str, tok->pb->buf, size2) == 0)) {
+	  if(tok->st_pos == json_false_str_len) {
+	    current = json_object_new_boolean(0);
+	    if(current == NULL)
+		goto out;
+	    saved_state = json_tokener_state_finish;
+	    state = json_tokener_state_eatws;
+	    goto redo_char;
+	  }
+	} else {
+	  tok->err = json_tokener_error_parse_boolean;
+	  goto out;
 	}
-      } else {
-	tok->err = json_tokener_error_parse_boolean;
-	goto out;
+	tok->st_pos++;
       }
-      tok->st_pos++;
       break;
 
     case json_tokener_state_number:
@@ -584,10 +736,45 @@ struct json_object* json_tokener_parse_ex(struct json_tokener *tok,
 	/* Advance until we change state */
 	const char *case_start = str;
 	int case_len=0;
+	int is_exponent=0;
+	int negativesign_next_possible_location=1;
 	while(c && strchr(json_number_chars, c)) {
 	  ++case_len;
-	  if(c == '.' || c == 'e' || c == 'E')
+
+	  /* non-digit characters checks */
+	  /* note: since the main loop condition to get here was
+	           an input starting with 0-9 or '-', we are
+	           protected from input starting with '.' or
+	           e/E. */
+	  if (c == '.') {
+	    if (tok->is_double != 0) {
+	      /* '.' can only be found once, and out of the exponent part.
+	         Thus, if the input is already flagged as double, it
+	         is invalid. */
+	      tok->err = json_tokener_error_parse_number;
+	      goto out;
+	    }
+	    tok->is_double = 1;
+	  }
+	  if (c == 'e' || c == 'E') {
+	    if (is_exponent != 0) {
+	      /* only one exponent possible */
+	      tok->err = json_tokener_error_parse_number;
+	      goto out;
+	    }
+	    is_exponent = 1;
 	    tok->is_double = 1;
+	    /* the exponent part can begin with a negative sign */
+	    negativesign_next_possible_location = case_len + 1;
+	  }
+	  if (c == '-' && case_len != negativesign_next_possible_location) {
+	    /* If the negative sign is not where expected (ie
+	       start of input or start of exponent part), the
+	       input is invalid. */
+	    tok->err = json_tokener_error_parse_number;
+	    goto out;
+	  }
+
 	  if (!ADVANCE_CHAR(str, tok) || !PEEK_CHAR(c, tok)) {
 	    printbuf_memappend_fast(tok->pb, case_start, case_len);
 	    goto out;
@@ -595,18 +782,35 @@ struct json_object* json_tokener_parse_ex(struct json_tokener *tok,
 	}
         if (case_len>0)
           printbuf_memappend_fast(tok->pb, case_start, case_len);
+
+	// Check for -Infinity
+	if (tok->pb->buf[0] == '-' && case_len <= 1 &&
+	    (c == 'i' || c == 'I'))
+	{
+		state = json_tokener_state_inf;
+		tok->st_pos = 0;
+		goto redo_char;
+	}
       }
       {
 	int64_t num64;
 	double  numd;
 	if (!tok->is_double && json_parse_int64(tok->pb->buf, &num64) == 0) {
-            current = json_object_new_int64(num64);
-            if( current == NULL )
-              goto out;
-	} else if(tok->is_double && json_parse_double(tok->pb->buf, &numd) == 0) {
+		if (num64 && tok->pb->buf[0]=='0' &&
+		    (tok->flags & JSON_TOKENER_STRICT)) {
+			/* in strict mode, number must not start with 0 */
+			tok->err = json_tokener_error_parse_number;
+			goto out;
+		}
+		current = json_object_new_int64(num64);
+		if(current == NULL)
+		    goto out;
+	}
+	else if(tok->is_double && json_parse_double(tok->pb->buf, &numd) == 0)
+	{
           current = json_object_new_double(numd);
-          if( current == NULL )
-              goto out;
+	  if(current == NULL)
+		goto out;
         } else {
           tok->err = json_tokener_error_parse_number;
           goto out;
@@ -620,12 +824,12 @@ struct json_object* json_tokener_parse_ex(struct json_tokener *tok,
     case json_tokener_state_array_after_sep:
     case json_tokener_state_array:
       if(c == ']') {
-		if (state == json_tokener_state_array_after_sep &&
-			(tok->flags & JSON_TOKENER_STRICT))
-		{
-			tok->err = json_tokener_error_parse_unexpected;
-			goto out;
-		}
+	if (state == json_tokener_state_array_after_sep &&
+	    (tok->flags & JSON_TOKENER_STRICT))
+	  {
+	    tok->err = json_tokener_error_parse_unexpected;
+	    goto out;
+	  }
 	saved_state = json_tokener_state_finish;
 	state = json_tokener_state_eatws;
       } else {
@@ -642,9 +846,7 @@ struct json_object* json_tokener_parse_ex(struct json_tokener *tok,
 
     case json_tokener_state_array_add:
       if( json_object_array_add(current, obj) != 0 )
-      {
-          goto out;
-      }
+        goto out;
       saved_state = json_tokener_state_array_sep;
       state = json_tokener_state_eatws;
       goto redo_char;
@@ -737,6 +939,7 @@ struct json_object* json_tokener_parse_ex(struct json_tokener *tok,
       goto redo_char;
 
     case json_tokener_state_object_sep:
+      /* { */
       if(c == '}') {
 	saved_state = json_tokener_state_finish;
 	state = json_tokener_state_eatws;
@@ -752,18 +955,28 @@ struct json_object* json_tokener_parse_ex(struct json_tokener *tok,
     }
     if (!ADVANCE_CHAR(str, tok))
       goto out;
-  } /* while(POP_CHAR) */
+  } /* while(PEEK_CHAR) */
 
  out:
+  if (c &&
+     (state == json_tokener_state_finish) &&
+     (tok->depth == 0) &&
+     (tok->flags & JSON_TOKENER_STRICT)) {
+      /* unexpected char after JSON data */
+      tok->err = json_tokener_error_parse_unexpected;
+  }
   if (!c) { /* We hit an eof char (0) */
     if(state != json_tokener_state_finish &&
        saved_state != json_tokener_state_finish)
       tok->err = json_tokener_error_parse_eof;
   }
 
-#ifdef HAVE_SETLOCALE
+#ifdef HAVE_USELOCALE
+  uselocale(oldlocale);
+  freelocale(newloc); 
+#elif defined(HAVE_SETLOCALE)
   setlocale(LC_NUMERIC, oldlocale);
-  if (oldlocale) free(oldlocale);
+  free(oldlocale);
 #endif
 
   if (tok->err == json_tokener_success)
diff --git a/gdal/ogr/ogrsf_frmts/geojson/libjson/json_tokener.h b/gdal/ogr/ogrsf_frmts/geojson/libjson/json_tokener.h
index 247ae01f0616..c3862162b45b 100644
--- a/gdal/ogr/ogrsf_frmts/geojson/libjson/json_tokener.h
+++ b/gdal/ogr/ogrsf_frmts/geojson/libjson/json_tokener.h
@@ -33,7 +33,8 @@ enum json_tokener_error {
   json_tokener_error_parse_object_key_sep,
   json_tokener_error_parse_object_value_sep,
   json_tokener_error_parse_string,
-  json_tokener_error_parse_comment
+  json_tokener_error_parse_comment,
+  json_tokener_error_size
 };
 
 enum json_tokener_state {
@@ -60,7 +61,8 @@ enum json_tokener_state {
   json_tokener_state_object_value_add,
   json_tokener_state_object_sep,
   json_tokener_state_array_after_sep,
-  json_tokener_state_object_field_start_after_sep
+  json_tokener_state_object_field_start_after_sep,
+  json_tokener_state_inf
 };
 
 struct json_tokener_srec
@@ -105,14 +107,6 @@ struct json_tokener
  */
 const char *json_tokener_error_desc(enum json_tokener_error jerr);
 
-/**
- * @b XXX do not use json_tokener_errors directly.
- * After v0.10 this will be removed.
- *
- * See json_tokener_error_desc() instead.
- */
-extern const char* json_tokener_errors[];
-
 /**
  * Retrieve the error caused by the last call to json_tokener_parse_ex(),
  * or json_tokener_success if there is no error.
@@ -142,26 +136,27 @@ extern void json_tokener_set_flags(struct json_tokener *tok, int flags);
  * it can also be a string, number or boolean value.
  *
  * A partial JSON string can be parsed.  If the parsing is incomplete,
- * NULL will be returned and json_tokener_get_error() will be return
+ * NULL will be returned and json_tokener_get_error() will return
  * json_tokener_continue.
  * json_tokener_parse_ex() can then be called with additional bytes in str
  * to continue the parsing.
  *
- * If json_tokener_parse_ex() returns NULL and the error anything other than
+ * If json_tokener_parse_ex() returns NULL and the error is anything other than
  * json_tokener_continue, a fatal error has occurred and parsing must be
- * halted.  Then tok object must not be re-used until json_tokener_reset() is
+ * halted.  Then, the tok object must not be reused until json_tokener_reset() is
  * called.
  *
  * When a valid JSON value is parsed, a non-NULL json_object will be
- * returned.  Also, json_tokener_get_error() will return json_tokener_success.
- * Be sure to check the type with json_object_is_type() or
- * json_object_get_type() before using the object.
+ * returned, with a reference count of one which belongs to the caller.  Also,
+ * json_tokener_get_error() will return json_tokener_success. Be sure to check
+ * the type with json_object_is_type() or json_object_get_type() before using
+ * the object.
  *
- * @b XXX this should not use internal fields:
+ * @b XXX this shouldn't use internal fields:
  * Trailing characters after the parsed value do not automatically cause an
  * error.  It is up to the caller to decide whether to treat this as an
  * error or to handle the additional characters, perhaps by parsing another
- * JSON value starting from that point.
+ * json value starting from that point.
  *
  * Extra characters can be detected by comparing the tok->char_offset against
  * the length of the last len parameter passed in.
@@ -170,6 +165,11 @@ extern void json_tokener_set_flags(struct json_tokener *tok, int flags);
  * responsible for calling json_tokener_parse_ex with an appropriate str
  * parameter starting with the extra characters.
  *
+ * This interface is presently not 64-bit clean due to the int len argument
+ * so the function limits the maximum string size to INT32_MAX (2GB).
+ * If the function is called with len == -1 then strlen is called to check
+ * the string length is less than INT32_MAX (2GB)
+ *
  * Example:
  * @code
 json_object *jobj = NULL;
diff --git a/gdal/ogr/ogrsf_frmts/geojson/libjson/symbol_renames.h b/gdal/ogr/ogrsf_frmts/geojson/libjson/symbol_renames.h
index 28d209a08b30..64fb27acfc52 100644
--- a/gdal/ogr/ogrsf_frmts/geojson/libjson/symbol_renames.h
+++ b/gdal/ogr/ogrsf_frmts/geojson/libjson/symbol_renames.h
@@ -83,7 +83,6 @@
 #define json_false_str gdal_json_false_str
 #define json_null_str gdal_json_null_str
 #define json_true_str gdal_json_true_str
-#define json_tokener_errors gdal_json_tokener_errors
 #define json_object_iter_begin gdal_json_object_iter_begin
 #define json_object_iter_end gdal_json_object_iter_end
 #define json_object_iter_equal gdal_json_object_iter_equal
diff --git a/gdal/ogr/ogrsf_frmts/geojson/ogrgeojsondriver.cpp b/gdal/ogr/ogrsf_frmts/geojson/ogrgeojsondriver.cpp
index c7323ca1b113..a57d8f77f48e 100644
--- a/gdal/ogr/ogrsf_frmts/geojson/ogrgeojsondriver.cpp
+++ b/gdal/ogr/ogrsf_frmts/geojson/ogrgeojsondriver.cpp
@@ -662,6 +662,7 @@ void RegisterOGRGeoJSON()
 "    <Value>String</Value>"
 "    <Value>Integer</Value>"
 "  </Option>"
+"  <Option name='WRITE_NON_FINITE_VALUES' type='boolean' description='Whether to write NaN / Infinity values' default='NO'/>"
 "</LayerCreationOptionList>");
 
     poDriver->SetMetadataItem( GDAL_DCAP_VIRTUALIO, "YES" );
diff --git a/gdal/ogr/ogrsf_frmts/geojson/ogrgeojsonreader.cpp b/gdal/ogr/ogrsf_frmts/geojson/ogrgeojsonreader.cpp
index 1ff9234711b8..def16422f9fb 100644
--- a/gdal/ogr/ogrsf_frmts/geojson/ogrgeojsonreader.cpp
+++ b/gdal/ogr/ogrsf_frmts/geojson/ogrgeojsonreader.cpp
@@ -712,6 +712,21 @@ void OGRGeoJSONReaderStreamingParser::Number(const char* pszValue, size_t nLen)
         {
             AppendObject(json_object_new_double(CPLAtof(pszValue)));
         }
+        else if( nLen == strlen("Infinity") && EQUAL(pszValue, "Infinity") )
+        {
+            AppendObject(json_object_new_double(
+                std::numeric_limits<double>::infinity()));
+        }
+        else if( nLen == strlen("-Infinity") && EQUAL(pszValue, "-Infinity") )
+        {
+            AppendObject(json_object_new_double(
+                -std::numeric_limits<double>::infinity()));
+        }
+        else if( nLen == strlen("NaN") && EQUAL(pszValue, "NaN") )
+        {
+            AppendObject(json_object_new_double(
+                std::numeric_limits<double>::quiet_NaN()));
+        }
         else
         {
             AppendObject(json_object_new_int64(CPLAtoGIntBig(pszValue)));
diff --git a/gdal/ogr/ogrsf_frmts/geojson/ogrgeojsonwritelayer.cpp b/gdal/ogr/ogrsf_frmts/geojson/ogrgeojsonwritelayer.cpp
index 8dcd788e8e1c..d758f83fbdd0 100644
--- a/gdal/ogr/ogrsf_frmts/geojson/ogrgeojsonwritelayer.cpp
+++ b/gdal/ogr/ogrsf_frmts/geojson/ogrgeojsonwritelayer.cpp
@@ -72,6 +72,8 @@ OGRGeoJSONWriteLayer::OGRGeoJSONWriteLayer( const char* pszName,
         oWriteOptions_.SetRFC7946Settings();
     }
     oWriteOptions_.SetIDOptions(papszOptions);
+    oWriteOptions_.bAllowNonFiniteValues = CPLTestBool(
+        CSLFetchNameValueDef(papszOptions, "WRITE_NON_FINITE_VALUES", "FALSE"));
 }
 
 /************************************************************************/
diff --git a/gdal/ogr/ogrsf_frmts/geojson/ogrgeojsonwriter.cpp b/gdal/ogr/ogrsf_frmts/geojson/ogrgeojsonwriter.cpp
index 89e3d12f0bb8..156400805640 100644
--- a/gdal/ogr/ogrsf_frmts/geojson/ogrgeojsonwriter.cpp
+++ b/gdal/ogr/ogrsf_frmts/geojson/ogrgeojsonwriter.cpp
@@ -844,8 +844,23 @@ json_object* OGRGeoJSONWriteAttributes( OGRFeature* poFeature,
         }
         else if( OFTReal == eType )
         {
+            const double val = poFeature->GetFieldAsDouble(nField);
+            if( !CPLIsFinite(val) )
+            {
+                if( !oOptions.bAllowNonFiniteValues )
+                {
+                    static bool bHasWarned = false;
+                    if( !bHasWarned )
+                    {
+                        bHasWarned = true;
+                        CPLError(CE_Warning, CPLE_AppDefined,
+                                 "NaN of Infinity value found. Skipped");
+                    }
+                    continue;
+                }
+            }
             poObjProp = json_object_new_double_with_significant_figures(
-                poFeature->GetFieldAsDouble(nField),
+                val,
                 oOptions.nSignificantFigures );
         }
         else if( OFTString == eType )
diff --git a/gdal/ogr/ogrsf_frmts/geojson/ogrgeojsonwriter.h b/gdal/ogr/ogrsf_frmts/geojson/ogrgeojsonwriter.h
index 1a42d4e43b30..c899a7b7aa13 100644
--- a/gdal/ogr/ogrsf_frmts/geojson/ogrgeojsonwriter.h
+++ b/gdal/ogr/ogrsf_frmts/geojson/ogrgeojsonwriter.h
@@ -81,6 +81,7 @@ class OGRGeoJSONWriteOptions
         CPLString osIDField{};
         bool bForceIDFieldType = false;
         OGRFieldType eForcedIDFieldType = OFTString;
+        bool bAllowNonFiniteValues = false;
 
         void SetRFC7946Settings();
         void SetIDOptions(CSLConstList papszOptions);
diff --git a/gdal/port/cpl_json_streaming_parser.cpp b/gdal/port/cpl_json_streaming_parser.cpp
index e0a511447c6f..f2cc7356a67f 100644
--- a/gdal/port/cpl_json_streaming_parser.cpp
+++ b/gdal/port/cpl_json_streaming_parser.cpp
@@ -172,7 +172,8 @@ bool CPLJSonStreamingParser::EmitUnexpectedChar(char ch,
 static bool IsValidNewToken(char ch)
 {
     return ch == '[' || ch == '{' || ch == '"' || ch == '-' ||
-           ch == '.' || isdigit(ch) || ch == 't' || ch == 'f' || ch == 'n';
+           ch == '.' || isdigit(ch) || ch == 't' || ch == 'f' || ch == 'n' ||
+           ch == 'i' || ch == 'I' || ch == 'N';
 }
 
 /************************************************************************/
@@ -209,7 +210,8 @@ bool CPLJSonStreamingParser::StartNewToken(const char*& pStr, size_t& nLength)
         m_aState.push_back(ARRAY);
         AdvanceChar(pStr, nLength);
     }
-    else if( ch == '-' || ch == '.' || isdigit(ch) )
+    else if( ch == '-' || ch == '.' || isdigit(ch) ||
+             ch == 'i' || ch == 'I' || ch == 'N' )
     {
         m_aState.push_back(NUMBER);
     }
@@ -223,7 +225,7 @@ bool CPLJSonStreamingParser::StartNewToken(const char*& pStr, size_t& nLength)
     }
     else if( ch == 'n' )
     {
-        m_aState.push_back(STATE_NULL);
+        m_aState.push_back(STATE_NULL); /* might be nan */
     }
     else
     {
@@ -475,25 +477,68 @@ bool CPLJSonStreamingParser::Parse(const char* pStr, size_t nLength,
                 }
                 else
                 {
-                    return EmitUnexpectedChar(ch);
+                    CPLString extendedToken(m_osToken + ch);
+                    if( (STARTS_WITH_CI("Infinity", extendedToken) &&
+                          m_osToken.size() + 1 <= strlen("Infinity")) ||
+                         (STARTS_WITH_CI("-Infinity", extendedToken) &&
+                          m_osToken.size() + 1 <= strlen("-Infinity")) ||
+                         (STARTS_WITH_CI("NaN", extendedToken) &&
+                          m_osToken.size() + 1 <= strlen("NaN")) )
+                    {
+                        m_osToken += ch;
+                    }
+                    else
+                    {
+                        return EmitUnexpectedChar(ch);
+                    }
                 }
                 AdvanceChar(pStr, nLength);
             }
+
+            if( nLength != 0 || bFinished )
+            {
+                const char firstCh = m_osToken[0];
+                if( firstCh == 'i' || firstCh == 'I' )
+                {
+                    if( !EQUAL(m_osToken.c_str(), "Infinity") )
+                    {
+                        return EmitException("Invalid number");
+                    }
+                }
+                else if( firstCh == '-' )
+                {
+                    if( m_osToken[1] == 'i' || m_osToken[1] == 'I' )
+                    {
+                        if( !EQUAL(m_osToken.c_str(), "-Infinity") )
+                        {
+                            return EmitException("Invalid number");
+                        }
+                    }
+                }
+                else if( firstCh == 'n' || firstCh == 'N' )
+                {
+                    if( m_osToken[1] == 'a' || m_osToken[1] == 'A' )
+                    {
+                        if( !EQUAL(m_osToken.c_str(), "NaN") )
+                        {
+                            return EmitException("Invalid number");
+                        }
+                    }
+                }
+
+                Number(m_osToken.c_str(), m_osToken.size());
+                m_osToken.clear();
+                m_aState.pop_back();
+            }
+
             if( nLength == 0 )
             {
                 if( bFinished )
                 {
-                    Number(m_osToken.c_str(), m_osToken.size());
-                    m_osToken.clear();
-                    m_aState.pop_back();
                     return CheckStackEmpty();
                 }
                 return true;
             }
-
-            Number(m_osToken.c_str(), m_osToken.size());
-            m_osToken.clear();
-            m_aState.pop_back();
         }
         else if( eCurState == STRING )
         {
@@ -790,6 +835,12 @@ bool CPLJSonStreamingParser::Parse(const char* pStr, size_t nLength,
             while(nLength)
             {
                 char ch = *pStr;
+                if( eCurState == STATE_NULL && (ch == 'a' || ch == 'A') &&
+                    m_osToken.size() == 1 )
+                {
+                    m_aState.back() = NUMBER;
+                    break;
+                }
                 if( isalpha(ch) )
                 {
                     m_osToken += ch;
@@ -826,6 +877,10 @@ bool CPLJSonStreamingParser::Parse(const char* pStr, size_t nLength,
                 }
                 AdvanceChar(pStr, nLength);
             }
+            if( m_aState.back() == NUMBER )
+            {
+                continue;
+            }
             if( nLength == 0 )
             {
                 if( bFinished )
diff --git a/gdal/scripts/detect_suspicious_char_digit_zero.sh b/gdal/scripts/detect_suspicious_char_digit_zero.sh
index 10aba0dd6d2e..7fd9b96ce4bf 100755
--- a/gdal/scripts/detect_suspicious_char_digit_zero.sh
+++ b/gdal/scripts/detect_suspicious_char_digit_zero.sh
@@ -5,7 +5,7 @@ ret_code=0
 echo "Checking for suspicious comparisons to '0'..."
 
 # Detect comparisons where we'd likely want to check against nul terminating byte in the condition of a for/while loop
-if grep -r --include="*.c*" "!= '0'" alg gnm port ogr gcore frmts apps ; then
+if grep -r --include="*.c*" "!= '0'" alg gnm port ogr gcore frmts apps | grep -v libjson ; then
     ret_code=1
 fi
 if grep -r --include="*.c*" "!='0'" alg gnm port ogr gcore frmts apps | grep -v libjson ; then

From 1f9a66b4f5f617ca082094fcc6e35439eaa611f0 Mon Sep 17 00:00:00 2001
From: Alan Thomas <athomas@thinkspatial.com.au>
Date: Sun, 25 Nov 2018 17:16:25 +1100
Subject: [PATCH 075/488] DXF: Correctly handle non-uniformly-weighted spline
 HATCH boundaries (fixes #1011)

Also fix the processing of hatches which have a spline segment as the last
segment of the boundary. Previously the processor would fail to detect
the end of these hatches, and parts of the entity after the HATCH would
be eaten.
---
 autotest/ogr/data/additional-entities.dxf | 158 ++++++++++++++++++++++
 autotest/ogr/ogr_dxf.py                   |   9 +-
 gdal/ogr/ogrsf_frmts/dxf/ogrdxf_hatch.cpp |  28 ++--
 3 files changed, 183 insertions(+), 12 deletions(-)

diff --git a/autotest/ogr/data/additional-entities.dxf b/autotest/ogr/data/additional-entities.dxf
index dfbfe4d158cc..52acc01dc762 100755
--- a/autotest/ogr/data/additional-entities.dxf
+++ b/autotest/ogr/data/additional-entities.dxf
@@ -961,6 +961,164 @@ SOLID
 421
  16776960
 470
+LINEAR
+  0
+HATCH
+  5
+EF077
+330
+EEEEE
+100
+AcDbEntity
+  8
+0
+  6
+Continuous
+ 62
+     4
+100
+AcDbHatch
+ 10
+0.0
+ 20
+0.0
+ 30
+0.0
+210
+0.0
+220
+0.0
+230
+1.0
+  2
+_SOLID
+ 70
+     1
+ 71
+     0
+ 91
+        1
+ 92
+        1
+ 93
+        1
+ 72
+     4
+ 94
+        3
+ 73
+     1
+ 74
+     0
+ 95
+       11
+ 96
+        7
+ 40
+0.0
+ 40
+0.0
+ 40
+0.0
+ 40
+0.0
+ 40
+20.94600890510247
+ 40
+48.82577770828017
+ 40
+65.41802406807341
+ 40
+82.5482354761489
+ 40
+82.5482354761489
+ 40
+82.5482354761489
+ 40
+82.5482354761489
+ 10
+77.24099480934673
+ 20
+172.430072843974
+ 42
+1.210771479263352
+ 10
+66.10730220891221
+ 20
+168.4798309518848
+ 42
+1.0
+ 10
+52.05758392371472
+ 20
+148.2061680972096
+ 42
+1.0
+ 10
+94.42286298422361
+ 20
+145.1350796615255
+ 42
+0.65
+ 10
+94.11793457416115
+ 20
+174.100096163338
+ 42
+2.0
+ 10
+83.82412757509678
+ 20
+174.7657729360923
+ 42
+1.383146083653713
+ 10
+77.24099480934673
+ 20
+172.430072843974
+ 42
+1.210771479263352
+ 97
+        0
+ 97
+        0
+ 75
+     1
+ 76
+     1
+ 98
+        1
+ 10
+0.0
+ 20
+0.0
+450
+        0
+451
+        0
+460
+0.0
+461
+0.0
+452
+        0
+462
+0.0
+453
+        2
+463
+0.0
+ 63
+     5
+421
+      255
+463
+1.0
+ 63
+     2
+421
+ 16776960
+470
 LINEAR
   0
 MLINE
diff --git a/autotest/ogr/ogr_dxf.py b/autotest/ogr/ogr_dxf.py
index 182c96080c69..853a05b8f80b 100644
--- a/autotest/ogr/ogr_dxf.py
+++ b/autotest/ogr/ogr_dxf.py
@@ -3777,7 +3777,14 @@ def ogr_dxf_52():
     # HATCH with a spline boundary path (and OCS as well, just for fun)
     f = lyr.GetNextFeature()
     if ogrtest.check_feature_geometry(f, 'POLYGON Z ((47.6969600708475 60.0 15,47.6969600708475 0.0 15,46.1103652823066 -0.466958240734954 14.5010390223444,44.5309994192688 -0.919910449553494 14.0043514365868,42.9660914072371 -1.34485059453921 13.5122106346236,41.4228701717145 -1.72777264377568 13.0268900083519,39.9085646382042 -2.0546705653465 12.5506629496691,38.4304037322091 -2.31153832733525 12.0858028504722,36.9956163792324 -2.48436989782552 11.6345831026584,35.6114315047771 -2.55915924490089 11.1992770981251,34.2850780343463 -2.52190033664495 10.7821582287693,33.0237848934429 -2.3585871411413 10.3854998864882,31.8347810075701 -2.0552136264735 10.011575463179,30.725295302231 -1.59777376072516 9.66265835073903,29.7025567029285 -0.972261511979859 9.34102194106535,28.7737941351658 -0.164670848321179 9.04893962605519,27.9445456607789 0.835923776643351 8.78815304558283,27.2086691364137 2.01916842728349 8.55673058492536,26.5550905172208 3.36572402537053 8.35118961809371,25.9727183005027 4.85621968724478 8.1680420288596,25.450460983562 6.47128452924656 8.00379970099481,24.9772270637013 8.19154766771616 7.85497451827107,24.5419250382231 9.99763821899391 7.71807836446012,24.1334634044299 11.8701852994201 7.58962312333373,23.7407506596245 13.7898180253351 7.46612067866363,23.3526953011092 15.7371655130791 7.34408291422158,22.9582058261868 17.6928568789925 7.22002171377933,22.5461907321598 19.6375212394157 7.09044896110861,22.1055585163308 21.5517877106888 6.95187653998118,21.6252176760022 23.4162854091522 6.80081633416879,21.0940767084768 25.2116434511463 6.63378022744318,20.501044111057 26.9184909530113 6.44728010357611,19.8350283810455 28.5174570310876 6.23782784633932,19.0849380157448 29.9891708017154 6.00193533950455,18.2425220975445 31.3190096857923 5.73700778952582,17.3111586046656 32.5117898949509 5.44410752140743,16.2972009340528 33.5773013324584 5.12523258605305,15.2070024839932 34.5253339038266 4.7823810347885,14.046916652774 35.3656775145671 4.41755091893963,12.8232968386826 36.1081220701913 4.0327402898323,11.5424964400062 36.7624574762111 3.62994719879235,10.2108688550319 37.338473638138 3.21116969714562,8.834767482047 37.8459604614835 2.77840583621797,7.42054571933875 38.2947078517594 2.33365366733523,5.97455696519436 38.6945057144772 1.87891124182326,4.50315461790106 39.0551439551486 1.41617661100791,3.01269207574607 39.3864124792851 0.947447826215011,1.50952273701662 39.6981011923983 0.474722938770421,0 40 0,-0.0 40.0 -2.12999999999989e-15,47.6969600708475 60.0 15))') != 0:
-        gdaltest.post_reason('Wrong geometry on HATCH')
+        gdaltest.post_reason('Wrong geometry on HATCH 1')
+        f.DumpReadable()
+        return 'fail'
+
+    # Another HATCH with a spline boundary path
+    f = lyr.GetNextFeature()
+    if ogrtest.check_feature_geometry(f, 'POLYGON ((77.2409948093467 172.430072843974,75.261065049518 171.643815908613,73.2981627172517 170.696359298076,71.3875263981659 169.604375316261,69.5631545040892 168.388782317518,67.8563613292361 167.073645833116,66.2946346031063 165.684923719356,64.9008927779373 164.249191641798,63.6931834376534 162.792474868402,62.6848095284188 161.339284018754,61.8848281190297 159.911914493846,61.298843085132 158.530030785262,60.9300095654357 157.21052494952,60.7801817312349 155.967617443343,60.8511622391671 154.813159397702,61.1453506194465 153.756315627339,61.664528568996 152.803726831033,62.4105189258065 151.964301284269,63.3843801494824 151.249807149788,64.5850174245011 150.674379748575,66.0076885629501 150.253830592488,67.6424701411086 150.004704104407,69.4728079995063 149.943055679116,71.4743351228068 150.082969908572,73.6141841756299 150.434899728198,75.8510314766708 151.003978292885,78.1360638882735 151.788519596984,80.41494916904 152.778958906121,82.6307223520159 153.957467932202,84.7273090430607 155.298400731333,86.6532441052495 156.769592674546,88.3650659486779 158.334376895018,89.8299059955281 159.954044613131,91.0272387483612 161.589690168686,91.957368361883 163.189390065386,92.6421956980388 164.701128484532,93.1110835351921 166.094608264522,93.3942229550992 167.356341648662,93.5189493216415 168.483994478151,93.5079031853763 169.481912548033,93.3782987206629 170.357905428604,93.1417233193846 171.121075154443,92.8040593119231 171.78040251468,92.3652285565357 172.343822183981,91.8186752047856 172.817679470437,91.1571081487304 173.20986823606,90.3766844995721 173.528608818345,89.4716123962251 173.777329886712,88.4346297478537 173.955199520934,87.2580461173156 174.057607166253,85.9350751682361 174.076420167619,84.4616595153474 174.000186427787,82.8389797200317 173.814465060529,81.0767853391384 173.502507153586,79.1975328516125 173.04655812613,77.2409948093467 172.430072843974))') != 0:
+        gdaltest.post_reason('Wrong geometry on HATCH 2')
         f.DumpReadable()
         return 'fail'
 
diff --git a/gdal/ogr/ogrsf_frmts/dxf/ogrdxf_hatch.cpp b/gdal/ogr/ogrsf_frmts/dxf/ogrdxf_hatch.cpp
index 6d25431185c5..ba53e4e3813e 100644
--- a/gdal/ogr/ogrsf_frmts/dxf/ogrdxf_hatch.cpp
+++ b/gdal/ogr/ogrsf_frmts/dxf/ogrdxf_hatch.cpp
@@ -476,6 +476,7 @@ OGRErr OGRDXFLayer::CollectBoundaryPath( OGRGeometryCollection *poGC,
             }
 
             std::vector<double> adfControlPoints( 1, 0.0 );
+            std::vector<double> adfWeights( 1, 0.0 );
 
             if( nCode != 10 )
                 break;
@@ -485,25 +486,30 @@ OGRErr OGRDXFLayer::CollectBoundaryPath( OGRGeometryCollection *poGC,
                 adfControlPoints.push_back( CPLAtof(szLineBuf) );
 
                 if( (nCode = poDS->ReadValue(szLineBuf, sizeof(szLineBuf))) == 20 )
+                {
                     adfControlPoints.push_back( CPLAtof(szLineBuf) );
+                }
                 else
                     break;
 
                 adfControlPoints.push_back( 0.0 ); // Z coordinate
-                nCode = poDS->ReadValue(szLineBuf, sizeof(szLineBuf));
-            }
-
-            std::vector<double> adfWeights( 1, 0.0 );
 
-            // 42 (weights) are optional
-            while( nCode == 42 )
-            {
-                adfWeights.push_back( CPLAtof(szLineBuf) );
-                nCode = poDS->ReadValue(szLineBuf, sizeof(szLineBuf));
+                // 42 (weights) are optional
+                if( (nCode = poDS->ReadValue(szLineBuf, sizeof(szLineBuf))) == 42 )
+                {
+                    adfWeights.push_back( CPLAtof(szLineBuf) );
+                    nCode = poDS->ReadValue(szLineBuf, sizeof(szLineBuf));
+                }
             }
 
-            // Eat the rest of this section, if present
-            while( nCode > 0 && nCode != 72 )
+            // Skip past the number of fit points
+            if( nCode != 97 )
+                break;
+
+            // Eat the rest of this section, if present, until the next
+            // boundary segment (72) or the conclusion of the boundary data (97)
+            nCode = poDS->ReadValue(szLineBuf, sizeof(szLineBuf));
+            while( nCode > 0 && nCode != 72 && nCode != 97 )
                 nCode = poDS->ReadValue(szLineBuf, sizeof(szLineBuf));
             if( nCode > 0 )
                 poDS->UnreadValue();

From 0f65047e480bf148a10fbe20dd4c2baacc97e5de Mon Sep 17 00:00:00 2001
From: Markus Metz <33666869+metzm@users.noreply.github.com>
Date: Sun, 25 Nov 2018 21:44:07 +0100
Subject: [PATCH 076/488] NetCDF: fix west > east if west should be < east
 (#1114)

---
 autotest/gdrivers/data/nc_lonwrap.nc | Bin 0 -> 776 bytes
 autotest/gdrivers/netcdf.py          |  30 +++++++++++++++++++++++++++
 gdal/frmts/netcdf/netcdfdataset.cpp  |  27 ++++++++++++++++++++++++
 3 files changed, 57 insertions(+)
 create mode 100644 autotest/gdrivers/data/nc_lonwrap.nc

diff --git a/autotest/gdrivers/data/nc_lonwrap.nc b/autotest/gdrivers/data/nc_lonwrap.nc
new file mode 100644
index 0000000000000000000000000000000000000000..38c31115dd4d2ef248546ee6bffc92c141fb7e53
GIT binary patch
literal 776
zcmaJ<y-EW?5Z*nLnBO<BP;6BQC^kwGF9xxQC}_KExb<AP?3uewTJr?y^$n~AD+{~$
z9{K=U3WCn;-f40W2Zo*b=6`10c83y6Wq2ImQV=R%>Y*nrz64J(;5vm+uL9?ROCugg
zkM*Sj1qd<PTD!f2x1dF=Sr1`?HE2>OhdAh1YZ+z80V1i{ToG5kU=k5Ra=_?^^bK5b
zLp2gg%TUFLp{?L{HtSnEsFDgW_LrR@oe}%S7-MIO_mdfav2;lA$q$v(rizWJdcu!{
zh?(G~f1DNaIdAaJ?#Ik(Z3}D7`e*CZ(mE=P^c5rmN^8BNe881gH?YY+J6jRpGV917
zxZuIi4rlsFoJ#Cm#nM;8`-{)%$av1}zh~_j=1}|@nfoMr!Cm9-@HTVt3+^}Plk`x)
z9F3>J%jf;$VKe-gt_-Fd*?gA(0O1~-{nyE^do$Ss`M>{%z2kkp+=nq~JQLC!6Vh4*
UJ_5cbq`SR-de%Pfo={4E07uV>wg3PC

literal 0
HcmV?d00001

diff --git a/autotest/gdrivers/netcdf.py b/autotest/gdrivers/netcdf.py
index ce1d313be866..347f3bce23af 100755
--- a/autotest/gdrivers/netcdf.py
+++ b/autotest/gdrivers/netcdf.py
@@ -1451,6 +1451,35 @@ def netcdf_36():
 
     return 'success'
 
+
+###############################################################################
+# test for correct geotransform with longitude wrap
+
+
+def netcdf_36_lonwrap():
+
+    if gdaltest.netcdf_drv is None:
+        return 'skip'
+
+    ifile = 'data/nc_lonwrap.nc'
+
+    ds = gdal.Open(ifile)
+    if ds is None:
+        gdaltest.post_reason('open failed')
+        return 'fail'
+
+    gt = ds.GetGeoTransform()
+    if gt is None:
+        gdaltest.post_reason('got no GeoTransform')
+        return 'fail'
+    gt_expected = (-2.25, 2.5, 0.0, 16.25, 0.0, -2.5)
+    if gt != gt_expected:
+        gdaltest.post_reason('got GeoTransform %s, expected %s' % (str(gt), str(gt_expected)))
+        return 'fail'
+
+    return 'success'
+
+
 ###############################################################################
 # test for reading gaussian grid (bugs #4513 and #5118)
 
@@ -3365,6 +3394,7 @@ def netcdf_postcheck():
     netcdf_34,
     netcdf_35,
     netcdf_36,
+    netcdf_36_lonwrap,
     netcdf_37,
     netcdf_38,
     netcdf_39,
diff --git a/gdal/frmts/netcdf/netcdfdataset.cpp b/gdal/frmts/netcdf/netcdfdataset.cpp
index 581d68bb34ba..ac6955e8b3b9 100644
--- a/gdal/frmts/netcdf/netcdfdataset.cpp
+++ b/gdal/frmts/netcdf/netcdfdataset.cpp
@@ -3122,6 +3122,33 @@ void netCDFDataset::SetProjectionFromVar( int nVarId, bool bReadSRSOnly )
         }
         else
         {
+            bool nWestIsLeft = (pdfXCoord[0] < pdfXCoord[xdim - 1]);
+
+            // fix longitudes if longitudes should increase from 
+            // west to east, but west > east
+            if (!nWestIsLeft)
+            {
+                size_t ndecreases = 0;
+
+                // there is lon wrap if longitudes increase 
+                // with one single decrease 
+                for( size_t i = 1; i < xdim; i++ )
+                {
+                    if (pdfXCoord[i] < pdfXCoord[i - 1])
+                        ndecreases++;
+                }
+
+                if (ndecreases == 1)
+                {
+                    CPLDebug("GDAL_netCDF", "longitude wrap detected");
+                    for( size_t i = 0; i < xdim; i++ )
+                    {
+                        if (pdfXCoord[i] > pdfXCoord[xdim - 1])
+                            pdfXCoord[i] -= 360;
+                    }
+                }
+            }
+
             nSpacingBegin = static_cast<int>(
                 poDS->rint((pdfXCoord[1] - pdfXCoord[0]) * 1000));
 

From bbdacf7309ca3abd4cc833701ebd3019108e8456 Mon Sep 17 00:00:00 2001
From: Even Rouault <even.rouault@spatialys.com>
Date: Mon, 26 Nov 2018 11:37:03 +0100
Subject: [PATCH 077/488] WMTS: fix issue with inappropriate zoom level being
 selected causing integer overflow in raster dimension computation

---
 autotest/gdrivers/wmts.py       | 278 ++++++++++++++++++++++++++++++++
 gdal/frmts/wmts/wmtsdataset.cpp |  84 +++++-----
 2 files changed, 316 insertions(+), 46 deletions(-)

diff --git a/autotest/gdrivers/wmts.py b/autotest/gdrivers/wmts.py
index b3ba03cbf061..c874230600e3 100755
--- a/autotest/gdrivers/wmts.py
+++ b/autotest/gdrivers/wmts.py
@@ -1811,6 +1811,283 @@ def wmts_invalid_global_to_tm_reprojection():
 #
 
 
+def wmts_check_no_overflow_zoom_level():
+
+    if gdaltest.wmts_drv is None:
+        return 'skip'
+
+    inputXml = '/vsimem/wmts_check_no_overflow_zoom_level.xml'
+    gdal.FileFromMemBuffer(inputXml, """<?xml version="1.0"?>
+<Capabilities xmlns="http://www.opengis.net/wmts/1.0"
+xmlns:ows="http://www.opengis.net/ows/1.1"
+xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="1.0.0">
+  <Contents>
+    <Layer>
+      <ows:Title>foo</ows:Title>
+      <ows:Abstract></ows:Abstract>
+      <ows:WGS84BoundingBox crs="urn:ogc:def:crs:OGC:2:84">
+        <ows:LowerCorner>-179.99999000000003 -85.00000000000003</ows:LowerCorner>
+        <ows:UpperCorner>179.99999000000003 85.0</ows:UpperCorner>
+      </ows:WGS84BoundingBox>
+      <ows:Identifier>foo</ows:Identifier>
+      <Style>
+        <ows:Identifier>default</ows:Identifier>
+      </Style>
+      <Format>image/png</Format>
+      <TileMatrixSetLink>
+        <TileMatrixSet>default</TileMatrixSet>
+      </TileMatrixSetLink>
+      <ResourceURL
+          format="image/png"
+          resourceType="tile"
+          template="https://example.com/{TileMatrixSet}/{TileMatrix}/{TileCol}/{TileRow}.png"
+      />
+    </Layer>
+    <TileMatrixSet>
+    <ows:Identifier>default</ows:Identifier>
+    <ows:SupportedCRS>urn:ogc:def:crs:EPSG::3857</ows:SupportedCRS>
+    <TileMatrix>
+    <ows:Identifier>0</ows:Identifier>
+    <ScaleDenominator>5.590822640285016E8</ScaleDenominator>
+    <TopLeftCorner>-2.0037508342787E7 2.0037508342787E7</TopLeftCorner>
+    <TileWidth>256</TileWidth>
+    <TileHeight>256</TileHeight>
+    <MatrixWidth>1</MatrixWidth>
+    <MatrixHeight>1</MatrixHeight>
+    </TileMatrix>
+    <TileMatrix>
+    <ows:Identifier>1</ows:Identifier>
+    <ScaleDenominator>2.7954113201425034E8</ScaleDenominator>
+    <TopLeftCorner>-2.0037508342787E7 2.0037508342787E7</TopLeftCorner>
+    <TileWidth>256</TileWidth>
+    <TileHeight>256</TileHeight>
+    <MatrixWidth>2</MatrixWidth>
+    <MatrixHeight>2</MatrixHeight>
+    </TileMatrix>
+    <TileMatrix>
+    <ows:Identifier>2</ows:Identifier>
+    <ScaleDenominator>1.3977056600712562E8</ScaleDenominator>
+    <TopLeftCorner>-2.0037508342787E7 2.0037508342787E7</TopLeftCorner>
+    <TileWidth>256</TileWidth>
+    <TileHeight>256</TileHeight>
+    <MatrixWidth>4</MatrixWidth>
+    <MatrixHeight>4</MatrixHeight>
+    </TileMatrix>
+    <TileMatrix>
+    <ows:Identifier>3</ows:Identifier>
+    <ScaleDenominator>6.988528300356235E7</ScaleDenominator>
+    <TopLeftCorner>-2.0037508342787E7 2.0037508342787E7</TopLeftCorner>
+    <TileWidth>256</TileWidth>
+    <TileHeight>256</TileHeight>
+    <MatrixWidth>8</MatrixWidth>
+    <MatrixHeight>8</MatrixHeight>
+    </TileMatrix>
+    <TileMatrix>
+    <ows:Identifier>4</ows:Identifier>
+    <ScaleDenominator>3.494264150178117E7</ScaleDenominator>
+    <TopLeftCorner>-2.0037508342787E7 2.0037508342787E7</TopLeftCorner>
+    <TileWidth>256</TileWidth>
+    <TileHeight>256</TileHeight>
+    <MatrixWidth>16</MatrixWidth>
+    <MatrixHeight>16</MatrixHeight>
+    </TileMatrix>
+    <TileMatrix>
+    <ows:Identifier>5</ows:Identifier>
+    <ScaleDenominator>1.7471320750890587E7</ScaleDenominator>
+    <TopLeftCorner>-2.0037508342787E7 2.0037508342787E7</TopLeftCorner>
+    <TileWidth>256</TileWidth>
+    <TileHeight>256</TileHeight>
+    <MatrixWidth>32</MatrixWidth>
+    <MatrixHeight>32</MatrixHeight>
+    </TileMatrix>
+    <TileMatrix>
+    <ows:Identifier>6</ows:Identifier>
+    <ScaleDenominator>8735660.375445293</ScaleDenominator>
+    <TopLeftCorner>-2.0037508342787E7 2.0037508342787E7</TopLeftCorner>
+    <TileWidth>256</TileWidth>
+    <TileHeight>256</TileHeight>
+    <MatrixWidth>64</MatrixWidth>
+    <MatrixHeight>64</MatrixHeight>
+    </TileMatrix>
+    <TileMatrix>
+    <ows:Identifier>7</ows:Identifier>
+    <ScaleDenominator>4367830.187722647</ScaleDenominator>
+    <TopLeftCorner>-2.0037508342787E7 2.0037508342787E7</TopLeftCorner>
+    <TileWidth>256</TileWidth>
+    <TileHeight>256</TileHeight>
+    <MatrixWidth>128</MatrixWidth>
+    <MatrixHeight>128</MatrixHeight>
+    </TileMatrix>
+    <TileMatrix>
+    <ows:Identifier>8</ows:Identifier>
+    <ScaleDenominator>2183915.0938617955</ScaleDenominator>
+    <TopLeftCorner>-2.0037508342787E7 2.0037508342787E7</TopLeftCorner>
+    <TileWidth>256</TileWidth>
+    <TileHeight>256</TileHeight>
+    <MatrixWidth>256</MatrixWidth>
+    <MatrixHeight>256</MatrixHeight>
+    </TileMatrix>
+    <TileMatrix>
+    <ows:Identifier>9</ows:Identifier>
+    <ScaleDenominator>1091957.5469304253</ScaleDenominator>
+    <TopLeftCorner>-2.0037508342787E7 2.0037508342787E7</TopLeftCorner>
+    <TileWidth>256</TileWidth>
+    <TileHeight>256</TileHeight>
+    <MatrixWidth>512</MatrixWidth>
+    <MatrixHeight>512</MatrixHeight>
+    </TileMatrix>
+    <TileMatrix>
+    <ows:Identifier>10</ows:Identifier>
+    <ScaleDenominator>545978.7734656851</ScaleDenominator>
+    <TopLeftCorner>-2.0037508342787E7 2.0037508342787E7</TopLeftCorner>
+    <TileWidth>256</TileWidth>
+    <TileHeight>256</TileHeight>
+    <MatrixWidth>1024</MatrixWidth>
+    <MatrixHeight>1023</MatrixHeight>
+    </TileMatrix>
+    <TileMatrix>
+    <ows:Identifier>11</ows:Identifier>
+    <ScaleDenominator>272989.38673237007</ScaleDenominator>
+    <TopLeftCorner>-2.0037508342787E7 2.0037508342787E7</TopLeftCorner>
+    <TileWidth>256</TileWidth>
+    <TileHeight>256</TileHeight>
+    <MatrixWidth>2048</MatrixWidth>
+    <MatrixHeight>2045</MatrixHeight>
+    </TileMatrix>
+    <TileMatrix>
+    <ows:Identifier>12</ows:Identifier>
+    <ScaleDenominator>136494.69336618503</ScaleDenominator>
+    <TopLeftCorner>-2.0037508342787E7 2.0037508342787E7</TopLeftCorner>
+    <TileWidth>256</TileWidth>
+    <TileHeight>256</TileHeight>
+    <MatrixWidth>4096</MatrixWidth>
+    <MatrixHeight>4090</MatrixHeight>
+    </TileMatrix>
+    <TileMatrix>
+    <ows:Identifier>13</ows:Identifier>
+    <ScaleDenominator>68247.34668309252</ScaleDenominator>
+    <TopLeftCorner>-2.0037508342787E7 2.0037508342787E7</TopLeftCorner>
+    <TileWidth>256</TileWidth>
+    <TileHeight>256</TileHeight>
+    <MatrixWidth>8192</MatrixWidth>
+    <MatrixHeight>8179</MatrixHeight>
+    </TileMatrix>
+    <TileMatrix>
+    <ows:Identifier>14</ows:Identifier>
+    <ScaleDenominator>34123.67334154626</ScaleDenominator>
+    <TopLeftCorner>-2.0037508342787E7 2.0037508342787E7</TopLeftCorner>
+    <TileWidth>256</TileWidth>
+    <TileHeight>256</TileHeight>
+    <MatrixWidth>16384</MatrixWidth>
+    <MatrixHeight>16358</MatrixHeight>
+    </TileMatrix>
+    <TileMatrix>
+    <ows:Identifier>15</ows:Identifier>
+    <ScaleDenominator>17061.836671245605</ScaleDenominator>
+    <TopLeftCorner>-2.0037508342787E7 2.0037508342787E7</TopLeftCorner>
+    <TileWidth>256</TileWidth>
+    <TileHeight>256</TileHeight>
+    <MatrixWidth>32768</MatrixWidth>
+    <MatrixHeight>32715</MatrixHeight>
+    </TileMatrix>
+    <TileMatrix>
+    <ows:Identifier>16</ows:Identifier>
+    <ScaleDenominator>8530.918335622802</ScaleDenominator>
+    <TopLeftCorner>-2.0037508342787E7 2.0037508342787E7</TopLeftCorner>
+    <TileWidth>256</TileWidth>
+    <TileHeight>256</TileHeight>
+    <MatrixWidth>65536</MatrixWidth>
+    <MatrixHeight>65429</MatrixHeight>
+    </TileMatrix>
+    <TileMatrix>
+    <ows:Identifier>17</ows:Identifier>
+    <ScaleDenominator>4265.459167338929</ScaleDenominator>
+    <TopLeftCorner>-2.0037508342787E7 2.0037508342787E7</TopLeftCorner>
+    <TileWidth>256</TileWidth>
+    <TileHeight>256</TileHeight>
+    <MatrixWidth>131072</MatrixWidth>
+    <MatrixHeight>130858</MatrixHeight>
+    </TileMatrix>
+    <TileMatrix>
+    <ows:Identifier>18</ows:Identifier>
+    <ScaleDenominator>2132.729584141936</ScaleDenominator>
+    <TopLeftCorner>-2.0037508342787E7 2.0037508342787E7</TopLeftCorner>
+    <TileWidth>256</TileWidth>
+    <TileHeight>256</TileHeight>
+    <MatrixWidth>262144</MatrixWidth>
+    <MatrixHeight>261715</MatrixHeight>
+    </TileMatrix>
+    <TileMatrix>
+    <ows:Identifier>19</ows:Identifier>
+    <ScaleDenominator>1066.3647915984968</ScaleDenominator>
+    <TopLeftCorner>-2.0037508342787E7 2.0037508342787E7</TopLeftCorner>
+    <TileWidth>256</TileWidth>
+    <TileHeight>256</TileHeight>
+    <MatrixWidth>524288</MatrixWidth>
+    <MatrixHeight>523430</MatrixHeight>
+    </TileMatrix>
+    <TileMatrix>
+    <ows:Identifier>20</ows:Identifier>
+    <ScaleDenominator>533.1823957992484</ScaleDenominator>
+    <TopLeftCorner>-2.0037508342787E7 2.0037508342787E7</TopLeftCorner>
+    <TileWidth>256</TileWidth>
+    <TileHeight>256</TileHeight>
+    <MatrixWidth>1048576</MatrixWidth>
+    <MatrixHeight>1046859</MatrixHeight>
+    </TileMatrix>
+    <TileMatrix>
+    <ows:Identifier>21</ows:Identifier>
+    <ScaleDenominator>266.5911978996242</ScaleDenominator>
+    <TopLeftCorner>-2.0037508342787E7 2.0037508342787E7</TopLeftCorner>
+    <TileWidth>256</TileWidth>
+    <TileHeight>256</TileHeight>
+    <MatrixWidth>2097152</MatrixWidth>
+    <MatrixHeight>2093718</MatrixHeight>
+    </TileMatrix>
+    <TileMatrix>
+    <ows:Identifier>22</ows:Identifier>
+    <ScaleDenominator>133.2955989498121</ScaleDenominator>
+    <TopLeftCorner>-2.0037508342787E7 2.0037508342787E7</TopLeftCorner>
+    <TileWidth>256</TileWidth>
+    <TileHeight>256</TileHeight>
+    <MatrixWidth>4194304</MatrixWidth>
+    <MatrixHeight>4187435</MatrixHeight>
+    </TileMatrix>
+    <TileMatrix>
+    <ows:Identifier>23</ows:Identifier>
+    <ScaleDenominator>66.64779947490605</ScaleDenominator>
+    <TopLeftCorner>-2.0037508342787E7 2.0037508342787E7</TopLeftCorner>
+    <TileWidth>256</TileWidth>
+    <TileHeight>256</TileHeight>
+    <MatrixWidth>8388608</MatrixWidth>
+    <MatrixHeight>8374869</MatrixHeight>
+    </TileMatrix>
+    </TileMatrixSet>
+  </Contents>
+</Capabilities>""")
+
+    ds = gdal.Open(inputXml)
+    if ds.RasterXSize != 1073741766 or ds.RasterYSize != 1070224430:
+        gdaltest.post_reason('fail')
+        print(ds.RasterXSize, ds.RasterYSize)
+        return 'fail'
+    count_levels = 1 + ds.GetRasterBand(1).GetOverviewCount()
+    if count_levels != 23: # there are 24 in total, but we discard the one labelled 23
+        gdaltest.post_reason('fail')
+        print(count_levels)
+        return 'fail'
+    ds = None
+
+    gdal.Unlink(inputXml)
+
+    return 'success'
+
+
+
+###############################################################################
+#
+
+
 def wmts_CleanCache():
     hexstr = '012346789abcdef'
     for i in range(len(hexstr)):
@@ -1877,6 +2154,7 @@ def wmts_cleanup():
     wmts_23_rgb,
     wmts_23_rgba,
     wmts_invalid_global_to_tm_reprojection,
+    wmts_check_no_overflow_zoom_level,
     wmts_cleanup]
 
 if __name__ == '__main__':
diff --git a/gdal/frmts/wmts/wmtsdataset.cpp b/gdal/frmts/wmts/wmtsdataset.cpp
index 18b9186cfc55..803c121c59c3 100644
--- a/gdal/frmts/wmts/wmtsdataset.cpp
+++ b/gdal/frmts/wmts/wmtsdataset.cpp
@@ -1824,49 +1824,6 @@ GDALDataset* WMTSDataset::Open(GDALOpenInfo* poOpenInfo)
             }
         }
 
-        // Establish raster dimension and extent
-        int nMaxZoomLevel = (int)oTMS.aoTM.size()-1;
-        while(nMaxZoomLevel >= 0)
-        {
-            const WMTSTileMatrix& oTM = oTMS.aoTM[nMaxZoomLevel];
-            double dfRasterXSize = (sAOI.MaxX - sAOI.MinX) / oTM.dfPixelSize;
-            double dfRasterYSize = (sAOI.MaxY - sAOI.MinY) / oTM.dfPixelSize;
-            if( dfRasterXSize < INT_MAX && dfRasterYSize < INT_MAX )
-            {
-                if( nMaxZoomLevel != (int)oTMS.aoTM.size()-1 )
-                {
-                    CPLDebug("WMTS", "Using zoom level %s instead of %s to avoid int overflow",
-                             oTMS.aoTM[nMaxZoomLevel].osIdentifier.c_str(),
-                             oTMS.aoTM.back().osIdentifier.c_str());
-                }
-
-                // Align AOI on pixel boundaries with respect to TopLeftCorner of
-                // this tile matrix
-                poDS->adfGT[0] = oTM.dfTLX + floor((sAOI.MinX - oTM.dfTLX) / oTM.dfPixelSize+1e-10) * oTM.dfPixelSize;
-                poDS->adfGT[1] = oTM.dfPixelSize;
-                poDS->adfGT[2] = 0.0;
-                poDS->adfGT[3] = oTM.dfTLY + ceil((sAOI.MaxY - oTM.dfTLY) / oTM.dfPixelSize-1e-10) * oTM.dfPixelSize;
-                poDS->adfGT[4] = 0.0;
-                poDS->adfGT[5] = -oTM.dfPixelSize;
-                poDS->nRasterXSize = int(0.5 + (sAOI.MaxX - poDS->adfGT[0]) / oTM.dfPixelSize);
-                poDS->nRasterYSize = int(0.5 + (poDS->adfGT[3] - sAOI.MinY) / oTM.dfPixelSize);
-                break;
-            }
-            nMaxZoomLevel --;
-        }
-        if( nMaxZoomLevel < 0 )
-        {
-            CPLError(CE_Failure, CPLE_AppDefined,
-                     "No zoom level in tile matrix set found");
-            CPLDestroyXMLNode(psXML);
-            delete poDS;
-            return nullptr;
-        }
-        CPLDebug("WMTS", "Using tilematrix=%s (zoom level %d)",
-                 oTMS.aoTM[nMaxZoomLevel].osIdentifier.c_str(), nMaxZoomLevel);
-        oTMS.aoTM.resize(1 + nMaxZoomLevel);
-        poDS->oTMS = oTMS;
-
         if( !osProjection.empty() )
         {
             OGRSpatialReference oSRS;
@@ -1986,9 +1943,30 @@ GDALDataset* WMTSDataset::Open(GDALOpenInfo* poOpenInfo)
         poDS->osURLFeatureInfoTemplate = osURLFeatureInfoTemplate;
 
         // Build all TMS datasets, wrapped in VRT datasets
-        for(int i=nMaxZoomLevel;i>=0;i--)
+        for(int i=static_cast<int>(oTMS.aoTM.size()-1);i>=0;i--)
         {
             const WMTSTileMatrix& oTM = oTMS.aoTM[i];
+            double dfRasterXSize = (sAOI.MaxX - sAOI.MinX) / oTM.dfPixelSize;
+            double dfRasterYSize = (sAOI.MaxY - sAOI.MinY) / oTM.dfPixelSize;
+            if( dfRasterXSize > INT_MAX || dfRasterYSize > INT_MAX )
+            {
+                continue;
+            }
+
+            if( poDS->apoDatasets.empty() )
+            {
+                // Align AOI on pixel boundaries with respect to TopLeftCorner of
+                // this tile matrix
+                poDS->adfGT[0] = oTM.dfTLX + floor((sAOI.MinX - oTM.dfTLX) / oTM.dfPixelSize+1e-10) * oTM.dfPixelSize;
+                poDS->adfGT[1] = oTM.dfPixelSize;
+                poDS->adfGT[2] = 0.0;
+                poDS->adfGT[3] = oTM.dfTLY + ceil((sAOI.MaxY - oTM.dfTLY) / oTM.dfPixelSize-1e-10) * oTM.dfPixelSize;
+                poDS->adfGT[4] = 0.0;
+                poDS->adfGT[5] = -oTM.dfPixelSize;
+                poDS->nRasterXSize = int(0.5 + (sAOI.MaxX - poDS->adfGT[0]) / oTM.dfPixelSize);
+                poDS->nRasterYSize = int(0.5 + (poDS->adfGT[3] - sAOI.MinY) / oTM.dfPixelSize);
+            }
+
             int nRasterXSize = int(0.5 + poDS->nRasterXSize / oTM.dfPixelSize * poDS->adfGT[1]);
             int nRasterYSize = int(0.5 + poDS->nRasterYSize / oTM.dfPixelSize * poDS->adfGT[1]);
             if( !poDS->apoDatasets.empty() &&
@@ -2014,8 +1992,22 @@ GDALDataset* WMTSDataset::Open(GDALOpenInfo* poOpenInfo)
             dfLRX = dfULX + ceil((dfLRX - dfULX) / dfTileWidthUnits - 1e-10) * dfTileWidthUnits;
             dfLRY = dfULY + floor((dfLRY - dfULY) / dfTileHeightUnits + 1e-10) * dfTileHeightUnits;
 
-            int nSizeX = int(0.5+(dfLRX - dfULX) / oTM.dfPixelSize);
-            int nSizeY = int(0.5+(dfULY - dfLRY) / oTM.dfPixelSize);
+            double dfSizeX = 0.5+(dfLRX - dfULX) / oTM.dfPixelSize;
+            double dfSizeY = 0.5+(dfULY - dfLRY) / oTM.dfPixelSize;
+            if( dfSizeX > INT_MAX || dfSizeY > INT_MAX )
+            {
+                continue;
+            }
+            if( poDS->apoDatasets.empty() )
+            {
+                CPLDebug("WMTS", "Using tilematrix=%s (zoom level %d)",
+                        oTMS.aoTM[i].osIdentifier.c_str(), i);
+                oTMS.aoTM.resize(1 + i);
+                poDS->oTMS = oTMS;
+            }
+
+            int nSizeX = static_cast<int>(dfSizeX);
+            int nSizeY = static_cast<int>(dfSizeY);
 
             double dfDateLineX = oTM.dfTLX + oTM.nMatrixWidth * dfTileWidthUnits;
             int nSizeX1 = int(0.5+(dfDateLineX - dfULX) / oTM.dfPixelSize);

From f56afe87c7c487dd85eff46eec1d16a229693466 Mon Sep 17 00:00:00 2001
From: Even Rouault <even.rouault@spatialys.com>
Date: Mon, 26 Nov 2018 12:36:59 +0100
Subject: [PATCH 078/488] WMTS: fix potential off-by-one pixel when compositing
 the underlying WMS/TMS source into the final raster

---
 gdal/frmts/wmts/wmtsdataset.cpp | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/gdal/frmts/wmts/wmtsdataset.cpp b/gdal/frmts/wmts/wmtsdataset.cpp
index 803c121c59c3..642187d20441 100644
--- a/gdal/frmts/wmts/wmtsdataset.cpp
+++ b/gdal/frmts/wmts/wmtsdataset.cpp
@@ -35,6 +35,7 @@
 #include "../vrt/gdal_vrt.h"
 
 #include <algorithm>
+#include <cmath>
 #include <map>
 #include <set>
 #include <vector>
@@ -2065,17 +2066,17 @@ GDALDataset* WMTSDataset::Open(GDALOpenInfo* poOpenInfo)
             int nSrcXOff, nSrcYOff, nDstXOff, nDstYOff;
 
             nSrcXOff = 0;
-            nDstXOff = (int)(0.5 + (dfULX - poDS->adfGT[0]) / oTM.dfPixelSize);
+            nDstXOff = static_cast<int>(std::round((dfULX - poDS->adfGT[0]) / oTM.dfPixelSize));
 
             nSrcYOff = 0;
-            nDstYOff = (int)(0.5 + (poDS->adfGT[3] - dfULY) / oTM.dfPixelSize);
+            nDstYOff = static_cast<int>(std::round((poDS->adfGT[3] - dfULY) / oTM.dfPixelSize));
 
             if( bExtendBeyondDateLine )
             {
                 int nSrcXOff2, nDstXOff2;
 
                 nSrcXOff2 = 0;
-                nDstXOff2 = (int)(0.5 + (dfDateLineX - poDS->adfGT[0]) / oTM.dfPixelSize);
+                nDstXOff2 = static_cast<int>(std::round((dfDateLineX - poDS->adfGT[0]) / oTM.dfPixelSize));
 
                 osStr = CPLSPrintf( WMS_TMS_TEMPLATE,
                     WMTSEscapeXML(osURL).c_str(),

From 02b80647937d999cd5830bb898eb5fd2df74cc15 Mon Sep 17 00:00:00 2001
From: Even Rouault <even.rouault@spatialys.com>
Date: Mon, 26 Nov 2018 13:08:08 +0100
Subject: [PATCH 079/488] DXF: fix memory leak in case of attempt to write
 GeometryCollection of unsupported type. Fixes
 https://bugs.chromium.org/p/oss-fuzz/issues/detail?id=11516. Credit to OSS
 Fuzz

---
 autotest/ogr/ogr_dxf.py                       | 22 +++++++++++++++++++
 .../ogr/ogrsf_frmts/dxf/ogrdxfwriterlayer.cpp |  3 +++
 2 files changed, 25 insertions(+)

diff --git a/autotest/ogr/ogr_dxf.py b/autotest/ogr/ogr_dxf.py
index 853a05b8f80b..b25a89dcc1d6 100644
--- a/autotest/ogr/ogr_dxf.py
+++ b/autotest/ogr/ogr_dxf.py
@@ -3891,6 +3891,27 @@ def ogr_dxf_insert_too_many_errors():
 
     return 'success'
 
+
+###############################################################################
+
+
+def ogr_dxf_write_geometry_collection_of_unsupported_type():
+
+
+    tmpfile = '/vsimem/ogr_dxf_write_geometry_collection_of_unsupported_type.dxf'
+    ds = ogr.GetDriverByName('DXF').CreateDataSource(tmpfile)
+    lyr = ds.CreateLayer('test')
+    f = ogr.Feature(lyr.GetLayerDefn())
+    f.SetGeometryDirectly(ogr.CreateGeometryFromWkt('GEOMETRYCOLLECTION(TIN EMPTY)'))
+    with gdaltest.error_handler():
+        ret = lyr.CreateFeature(f)
+    if ret == 0:
+        return 'fail'
+    ds = None
+    gdal.Unlink(tmpfile)
+
+    return 'success'
+
 ###############################################################################
 # cleanup
 
@@ -3960,6 +3981,7 @@ def ogr_dxf_cleanup():
     ogr_dxf_52,
     ogr_dxf_53,
     ogr_dxf_insert_too_many_errors,
+    ogr_dxf_write_geometry_collection_of_unsupported_type,
     ogr_dxf_cleanup]
 
 if __name__ == '__main__':
diff --git a/gdal/ogr/ogrsf_frmts/dxf/ogrdxfwriterlayer.cpp b/gdal/ogr/ogrsf_frmts/dxf/ogrdxfwriterlayer.cpp
index 8e32056c0cf9..d1b10af8af17 100644
--- a/gdal/ogr/ogrsf_frmts/dxf/ogrdxfwriterlayer.cpp
+++ b/gdal/ogr/ogrsf_frmts/dxf/ogrdxfwriterlayer.cpp
@@ -1307,7 +1307,10 @@ OGRErr OGRDXFWriterLayer::ICreateFeature( OGRFeature *poFeature )
             OGRErr eErr = CreateFeature( poFeature );
 
             if( eErr != OGRERR_NONE )
+            {
+                delete poGC;
                 return eErr;
+            }
         }
 
         poFeature->SetGeometryDirectly( poGC );

From e3d047c0a3c786293dfd79610345e00c05554207 Mon Sep 17 00:00:00 2001
From: Sean Gillies <sean.gillies@gmail.com>
Date: Tue, 27 Nov 2018 14:14:51 -0700
Subject: [PATCH 080/488] Upload python sdist with twine

Twine is the state of the art. More efficient and much more secure. https://pypi.org/project/twine/
---
 gdal/HOWTO-RELEASE | 16 ++++++++++------
 1 file changed, 10 insertions(+), 6 deletions(-)

diff --git a/gdal/HOWTO-RELEASE b/gdal/HOWTO-RELEASE
index 06b7ae518474..88387169b314 100644
--- a/gdal/HOWTO-RELEASE
+++ b/gdal/HOWTO-RELEASE
@@ -140,7 +140,9 @@ http://trac.osgeo.org/gdal/wiki/NewsAndStatus .
 the GDAL package by one of the current owners : HowardB/FrankW/EvenR)
 ( procedure taken from http://peterdowns.com/posts/first-time-with-pypi.html )
 
-a) Create a $HOME/.pypirc file :
+a) Install twine https://pypi.org/project/twine/
+
+b) Create a $HOME/.pypirc file :
 
 [distutils] # this tells distutils what package indexes you can push to
 index-servers = pypi
@@ -156,13 +158,15 @@ repository: https://test.pypi.org/legacy/
 username: yourlogin
 password: yourpassword
 
-b) cd swig/python
+c) cd swig/python
+
+d) python setup.py sdist
 
-c) For trial :
-    python setup.py sdist upload -r pypitest
+e) For trial :
+    twine upload dist/GDAL*.gz -r pypitest
 
-d) For real :
-    python setup.py sdist upload -r pypi
+f) For real :
+    twine upload dist/GDAL*.gz
 
 21) Build and bundle the java bindings.
 

From 49f2075cf4be6b103a5ab0b5a64f1ed3e2e7f46b Mon Sep 17 00:00:00 2001
From: Robert Coup <robert@coup.net.nz>
Date: Tue, 27 Nov 2018 21:21:53 +0000
Subject: [PATCH 081/488] CPL: Propagate error handler user data correctly
 (fixes #1098) (#1117)

---
 gdal/port/cpl_error.cpp   | 140 ++++++++++++++++++++++----------------
 gdal/port/cpl_multiproc.h |   1 +
 2 files changed, 81 insertions(+), 60 deletions(-)

diff --git a/gdal/port/cpl_error.cpp b/gdal/port/cpl_error.cpp
index c29af7bdaa5a..3cf383b652af 100644
--- a/gdal/port/cpl_error.cpp
+++ b/gdal/port/cpl_error.cpp
@@ -185,6 +185,20 @@ static CPLErrorContext *CPLGetErrorContext()
 
 void* CPL_STDCALL CPLGetErrorHandlerUserData(void)
 {
+    int bError = FALSE;
+
+    // check if there is an active error being propagated through the handlers
+    void **pActiveUserData = reinterpret_cast<void **>(
+            CPLGetTLSEx( CTLS_ERRORHANDLERACTIVEDATA, &bError ) );
+    if( bError )
+        return nullptr;
+
+    if ( pActiveUserData != nullptr)
+    {
+        return *pActiveUserData;
+    }
+
+    // get the current threadlocal or global error context user data
     CPLErrorContext *psCtx = CPLGetErrorContext();
     if( psCtx == nullptr || IS_PREFEFINED_ERROR_CTX(psCtx) )
         abort();
@@ -193,6 +207,69 @@ void* CPL_STDCALL CPLGetErrorHandlerUserData(void)
         psCtx->psHandlerStack->pUserData : pErrorHandlerUserData );
 }
 
+
+static void ApplyErrorHandler( CPLErrorContext *psCtx, CPLErr eErrClass,
+                        CPLErrorNum err_no, const char *pszMessage)
+{
+    void **pActiveUserData;
+    bool bProcessed = false;
+
+    // CTLS_ERRORHANDLERACTIVEDATA holds the active error handler userData
+
+    if( psCtx->psHandlerStack != nullptr )
+    {
+        // iterate through the threadlocal handler stack
+        if( (eErrClass != CE_Debug) || psCtx->psHandlerStack->bCatchDebug )
+        {
+            // call the error handler
+            pActiveUserData = &(psCtx->psHandlerStack->pUserData);
+            CPLSetTLS( CTLS_ERRORHANDLERACTIVEDATA, pActiveUserData, false );
+            psCtx->psHandlerStack->pfnHandler(eErrClass, err_no, pszMessage);
+            bProcessed = true;
+        }
+        else
+        {
+            // need to iterate to a parent handler for debug messages
+            CPLErrorHandlerNode *psNode = psCtx->psHandlerStack->psNext;
+            while( psNode != nullptr )
+            {
+                if( psNode->bCatchDebug )
+                {
+                    pActiveUserData = &(psNode->pUserData);
+                    CPLSetTLS( CTLS_ERRORHANDLERACTIVEDATA, pActiveUserData, false );
+                    psNode->pfnHandler( eErrClass, err_no, pszMessage );
+                    bProcessed = true;
+                    break;
+                }
+                psNode = psNode->psNext;
+            }
+        }
+    }
+
+    if( !bProcessed )
+    {
+        // hit the global error handler
+        CPLMutexHolderD( &hErrorMutex );
+        if( (eErrClass != CE_Debug) || gbCatchDebug )
+        {
+            if( pfnErrorHandler != nullptr )
+            {
+                pActiveUserData = &pErrorHandlerUserData;
+                CPLSetTLS( CTLS_ERRORHANDLERACTIVEDATA, pActiveUserData, false );
+                pfnErrorHandler(eErrClass, err_no, pszMessage);
+            }
+        }
+        else if( eErrClass == CE_Debug )
+        {
+            // for CPLDebug messages we propagate to the default error handler
+            pActiveUserData = nullptr;
+            CPLSetTLS( CTLS_ERRORHANDLERACTIVEDATA, pActiveUserData, false );
+            CPLDefaultErrorHandler(eErrClass, err_no, pszMessage);
+        }
+    }
+    CPLSetTLS( CTLS_ERRORHANDLERACTIVEDATA, nullptr, false );
+}
+
 /**********************************************************************
  *                          CPLError()
  **********************************************************************/
@@ -384,17 +461,7 @@ void CPLErrorV( CPLErr eErrClass, CPLErrorNum err_no, const char *fmt,
 /* -------------------------------------------------------------------- */
 /*      Invoke the current error handler.                               */
 /* -------------------------------------------------------------------- */
-    if( psCtx->psHandlerStack != nullptr )
-    {
-        psCtx->psHandlerStack->pfnHandler(eErrClass, err_no,
-                                          psCtx->szLastErrMsg);
-    }
-    else
-    {
-        CPLMutexHolderD( &hErrorMutex );
-        if( pfnErrorHandler != nullptr )
-            pfnErrorHandler(eErrClass, err_no, psCtx->szLastErrMsg);
-    }
+    ApplyErrorHandler(psCtx, eErrClass, err_no, psCtx->szLastErrMsg);
 
     if( eErrClass == CE_Fatal )
         abort();
@@ -432,15 +499,7 @@ void CPLEmergencyError( const char *pszMessage )
         CPLErrorContext *psCtx =
             static_cast<CPLErrorContext *>(CPLGetTLS( CTLS_ERRORCONTEXT ));
 
-        if( psCtx != nullptr && psCtx->psHandlerStack != nullptr )
-        {
-            psCtx->psHandlerStack->pfnHandler( CE_Fatal, CPLE_AppDefined,
-                                               pszMessage );
-        }
-        else if( pfnErrorHandler != nullptr )
-        {
-            pfnErrorHandler( CE_Fatal, CPLE_AppDefined, pszMessage );
-        }
+        ApplyErrorHandler(psCtx, CE_Fatal, CPLE_AppDefined, pszMessage);
     }
 
     // Ultimate fallback.
@@ -651,46 +710,7 @@ void CPLDebug( const char * pszCategory,
 /* -------------------------------------------------------------------- */
 /*      Invoke the current error handler.                               */
 /* -------------------------------------------------------------------- */
-    bool bDebugProcessed = false;
-    if( psCtx->psHandlerStack != nullptr )
-    {
-        if( psCtx->psHandlerStack->bCatchDebug )
-        {
-            bDebugProcessed = true;
-            psCtx->psHandlerStack->pfnHandler( CE_Debug, CPLE_None,
-                                               pszMessage );
-        }
-        else
-        {
-            CPLErrorHandlerNode *psNode = psCtx->psHandlerStack->psNext;
-            while( psNode != nullptr )
-            {
-                if( psNode->bCatchDebug )
-                {
-                    bDebugProcessed = true;
-                    psNode->pfnHandler( CE_Debug, CPLE_None, pszMessage );
-                    break;
-                }
-                psNode = psNode->psNext;
-            }
-        }
-    }
-
-    if( !bDebugProcessed )
-    {
-        CPLMutexHolderD( &hErrorMutex );
-        if( gbCatchDebug )
-        {
-            if( pfnErrorHandler != nullptr )
-            {
-                pfnErrorHandler( CE_Debug, CPLE_None, pszMessage );
-            }
-        }
-        else
-        {
-            CPLDefaultErrorHandler( CE_Debug, CPLE_None, pszMessage );
-        }
-    }
+    ApplyErrorHandler(psCtx, CE_Debug, CPLE_None, pszMessage);
 
     VSIFree( pszMessage );
 }
diff --git a/gdal/port/cpl_multiproc.h b/gdal/port/cpl_multiproc.h
index cf214f208205..b2524fd422cf 100644
--- a/gdal/port/cpl_multiproc.h
+++ b/gdal/port/cpl_multiproc.h
@@ -218,6 +218,7 @@ class CPL_DLL CPLLockHolder
 #define CTLS_CONFIGOPTIONS              14         /* cpl_conv.cpp */
 #define CTLS_FINDFILE                   15         /* cpl_findfile.cpp */
 #define CTLS_VSIERRORCONTEXT            16         /* cpl_vsi_error.cpp */
+#define CTLS_ERRORHANDLERACTIVEDATA     17         /* cpl_error.cpp */
 
 #define CTLS_MAX                        32
 

From 7b937306fdeb31f6adefa6675d83ccd60f99e619 Mon Sep 17 00:00:00 2001
From: Even Rouault <even.rouault@spatialys.com>
Date: Sun, 25 Nov 2018 23:10:44 +0100
Subject: [PATCH 082/488] Add VSIOpenDir/VSIGetNextDirEntry/VSICloseDir and
 provide efficient recursive implementation for /vsis3/, /vsigs/, /vsioss/ and
 /vsiaz/

---
 autotest/gcore/vsifile.py                 | 127 ++++
 autotest/gcore/vsis3.py                   | 241 ++++++-
 gdal/port/cpl_vsi.h                       |  41 ++
 gdal/port/cpl_vsi_virtual.h               |  19 +
 gdal/port/cpl_vsil.cpp                    | 276 ++++++++
 gdal/port/cpl_vsil_az.cpp                 | 563 +++++++++------
 gdal/port/cpl_vsil_curl.cpp               |  17 +-
 gdal/port/cpl_vsil_curl_class.h           |  16 +-
 gdal/port/cpl_vsil_s3.cpp                 | 685 ++++++++++++-------
 gdal/port/cpl_vsil_swift.cpp              |  13 +-
 gdal/port/vsipreload.cpp                  |  54 +-
 gdal/swig/include/cpl.i                   |  98 +++
 gdal/swig/include/python/gdal_python.i    |  17 +
 gdal/swig/python/extensions/gdal_wrap.cpp | 795 ++++++++++++++++++++--
 gdal/swig/python/osgeo/gdal.py            |  79 +++
 15 files changed, 2494 insertions(+), 547 deletions(-)

diff --git a/autotest/gcore/vsifile.py b/autotest/gcore/vsifile.py
index 1dfd307fb4ef..62e46fe7ed94 100755
--- a/autotest/gcore/vsifile.py
+++ b/autotest/gcore/vsifile.py
@@ -1000,6 +1000,132 @@ def my_progress(pct, message, user_data):
 
     return 'success'
 
+###############################################################################
+# Test gdal.OpenDir()
+
+def vsifile_opendir():
+
+    # Non existing dir
+    d = gdal.OpenDir('/vsimem/i_dont_exist')
+    if d:
+        gdaltest.post_reason('fail')
+        return 'fail'
+
+    gdal.Mkdir('/vsimem/vsifile_opendir', 0o755)
+
+    # Empty dir
+    d = gdal.OpenDir('/vsimem/vsifile_opendir')
+    if not d:
+        gdaltest.post_reason('fail')
+        return 'fail'
+    entry = gdal.GetNextDirEntry(d)
+    if entry:
+        gdaltest.post_reason('fail')
+        return 'fail'
+    gdal.CloseDir(d)
+
+    gdal.FileFromMemBuffer('/vsimem/vsifile_opendir/test', 'foo')
+    gdal.Mkdir('/vsimem/vsifile_opendir/subdir', 0o755)
+    gdal.Mkdir('/vsimem/vsifile_opendir/subdir/subdir2', 0o755)
+    gdal.FileFromMemBuffer('/vsimem/vsifile_opendir/subdir/subdir2/test2', 'bar')
+
+    # Unlimited depth
+    d = gdal.OpenDir('/vsimem/vsifile_opendir')
+
+    entry = gdal.GetNextDirEntry(d)
+    if entry.name != 'subdir':
+        gdaltest.post_reason('fail')
+        print(entry.name)
+        return 'fail'
+    if entry.mode != 16384:
+        gdaltest.post_reason('fail')
+        print(entry.mode)
+        return 'fail'
+
+    entry = gdal.GetNextDirEntry(d)
+    if entry.name != 'subdir/subdir2':
+        gdaltest.post_reason('fail')
+        print(entry.name)
+        return 'fail'
+    if entry.mode != 16384:
+        gdaltest.post_reason('fail')
+        print(entry.mode)
+        return 'fail'
+
+    entry = gdal.GetNextDirEntry(d)
+    if entry.name != 'subdir/subdir2/test2':
+        gdaltest.post_reason('fail')
+        print(entry.name)
+        return 'fail'
+    if entry.mode != 32768:
+        gdaltest.post_reason('fail')
+        print(entry.mode)
+        return 'fail'
+
+    entry = gdal.GetNextDirEntry(d)
+    if entry.name != 'test':
+        gdaltest.post_reason('fail')
+        print(entry.name)
+        return 'fail'
+    if entry.mode != 32768:
+        gdaltest.post_reason('fail')
+        print(entry.mode)
+        return 'fail'
+    if not entry.modeKnown:
+        gdaltest.post_reason('fail')
+        return 'fail'
+    if entry.size != 3:
+        gdaltest.post_reason('fail')
+        return 'fail'
+    if not entry.sizeKnown:
+        gdaltest.post_reason('fail')
+        return 'fail'
+    if entry.mtime == 0:
+        gdaltest.post_reason('fail')
+        return 'fail'
+    if not entry.mtimeKnown:
+        gdaltest.post_reason('fail')
+        return 'fail'
+    if entry.extra:
+        gdaltest.post_reason('fail')
+        return 'fail'
+
+    entry = gdal.GetNextDirEntry(d)
+    if entry:
+        gdaltest.post_reason('fail')
+        return 'fail'
+    gdal.CloseDir(d)
+
+    # Only top level
+    d = gdal.OpenDir('/vsimem/vsifile_opendir', 0)
+    entry = gdal.GetNextDirEntry(d)
+    if entry.name != 'subdir':
+        gdaltest.post_reason('fail')
+        print(entry.name)
+        return 'fail'
+    entry = gdal.GetNextDirEntry(d)
+    if entry.name != 'test':
+        gdaltest.post_reason('fail')
+        print(entry.name)
+        return 'fail'
+    entry = gdal.GetNextDirEntry(d)
+    if entry:
+        gdaltest.post_reason('fail')
+        return 'fail'
+    gdal.CloseDir(d)
+
+    # Depth 1
+    files = [l_entry.name for l_entry in gdal.listdir('/vsimem/vsifile_opendir', 1)]
+    if files != ['subdir', 'subdir/subdir2', 'test']:
+        gdaltest.post_reason('fail')
+        print(files)
+        return 'fail'
+
+    gdal.RmdirRecursive('/vsimem/vsifile_opendir')
+
+    return 'success'
+
+
 gdaltest_list = [vsifile_1,
                  vsifile_2,
                  vsifile_3,
@@ -1024,6 +1150,7 @@ def my_progress(pct, message, user_data):
                  vsifile_22,
                  vsitar_bug_675,
                  vsigzip_multi_thread,
+                 vsifile_opendir,
                  vsisync]
 
 if __name__ == '__main__':
diff --git a/autotest/gcore/vsis3.py b/autotest/gcore/vsis3.py
index 7d74bf3c0179..d187199ec2d8 100755
--- a/autotest/gcore/vsis3.py
+++ b/autotest/gcore/vsis3.py
@@ -663,7 +663,7 @@ def method_req_2(self, request):
 # Test ReadDir() with a fake AWS server
 
 
-def vsis3_3():
+def vsis3_readdir():
 
     if gdaltest.webserver_port == 0:
         return 'skip'
@@ -937,14 +937,14 @@ def method(request):
                 handler.add('GET', '/s3_non_cached/?delimiter=%2F', 200, {'Content-type': 'application/xml'},
                             """<?xml version="1.0" encoding="UTF-8"?>
                         <ListBucketResult>
-                            <Prefix>/</Prefix>
+                            <Prefix></Prefix>
                             <Contents>
-                                <Key>/test.txt</Key>
+                                <Key>test.txt</Key>
                                 <LastModified>1970-01-01T00:00:01.000Z</LastModified>
                                 <Size>40</Size>
                             </Contents>
                             <Contents>
-                                <Key>/test2.txt</Key>
+                                <Key>test2.txt</Key>
                                 <LastModified>1970-01-01T00:00:01.000Z</LastModified>
                                 <Size>40</Size>
                             </Contents>
@@ -1061,9 +1061,9 @@ def method_req_2(self, request):
 
     h = HandlerClass("""<?xml version="1.0" encoding="UTF-8"?>
                 <ListBucketResult>
-                    <Prefix>/</Prefix>
+                    <Prefix></Prefix>
                     <CommonPrefixes>
-                        <Prefix>/test</Prefix>
+                        <Prefix>test</Prefix>
                     </CommonPrefixes>
                 </ListBucketResult>
             """)
@@ -1082,9 +1082,9 @@ def method_req_2(self, request):
 
     h = HandlerClass("""<?xml version="1.0" encoding="UTF-8"?>
             <ListBucketResult>
-                <Prefix>/test/</Prefix>
+                <Prefix>test/</Prefix>
                 <CommonPrefixes>
-                    <Prefix>/test/test2</Prefix>
+                    <Prefix>test/test2</Prefix>
                 </CommonPrefixes>
             </ListBucketResult>
         """)
@@ -1098,6 +1098,226 @@ def method_req_2(self, request):
         print(dir_contents)
         return 'fail'
 
+    return 'success'
+
+###############################################################################
+# Test OpenDir() with a fake AWS server
+
+
+def vsis3_opendir():
+
+    if gdaltest.webserver_port == 0:
+        return 'skip'
+
+    # Unlimited depth
+    handler = webserver.SequentialHandler()
+    handler.add('GET', '/vsis3_opendir/', 200, {'Content-type': 'application/xml'},
+                """<?xml version="1.0" encoding="UTF-8"?>
+            <ListBucketResult>
+                <Prefix/>
+                <Marker/>
+                <Contents>
+                    <Key>test.txt</Key>
+                    <LastModified>1970-01-01T00:00:01.000Z</LastModified>
+                    <Size>40</Size>
+                </Contents>
+                <Contents>
+                    <Key>subdir/</Key>
+                    <LastModified>1970-01-01T00:00:01.000Z</LastModified>
+                    <Size>0</Size>
+                </Contents>
+                <Contents>
+                    <Key>subdir/test.txt</Key>
+                    <LastModified>1970-01-01T00:00:01.000Z</LastModified>
+                    <Size>5</Size>
+                </Contents>
+            </ListBucketResult>
+        """)
+    with webserver.install_http_handler(handler):
+        d = gdal.OpenDir('/vsis3/vsis3_opendir')
+    if d is None:
+        gdaltest.post_reason('fail')
+        return 'fail'
+
+    entry = gdal.GetNextDirEntry(d)
+    if entry.name != 'test.txt':
+        gdaltest.post_reason('fail')
+        print(entry.name)
+        return 'fail'
+    if entry.size != 40:
+        gdaltest.post_reason('fail')
+        print(entry.size)
+        return 'fail'
+    if entry.mode != 32768:
+        gdaltest.post_reason('fail')
+        print(entry.mode)
+        return 'fail'
+    if entry.mtime != 1:
+        gdaltest.post_reason('fail')
+        print(entry.mtime)
+        return 'fail'
+
+    entry = gdal.GetNextDirEntry(d)
+    if entry.name != 'subdir':
+        gdaltest.post_reason('fail')
+        print(entry.name)
+        return 'fail'
+    if entry.mode != 16384:
+        gdaltest.post_reason('fail')
+        print(entry.mode)
+        return 'fail'
+
+    entry = gdal.GetNextDirEntry(d)
+    if entry.name != 'subdir/test.txt':
+        gdaltest.post_reason('fail')
+        print(entry.name)
+        return 'fail'
+
+    entry = gdal.GetNextDirEntry(d)
+    if entry is not None:
+        gdaltest.post_reason('fail')
+        return 'fail'
+
+    gdal.CloseDir(d)
+
+    # Depth = 0
+    handler = webserver.SequentialHandler()
+    handler.add('GET', '/vsis3_opendir/?delimiter=%2F', 200, {'Content-type': 'application/xml'},
+                """<?xml version="1.0" encoding="UTF-8"?>
+            <ListBucketResult>
+                <Prefix/>
+                <Marker/>
+                <Contents>
+                    <Key>test.txt</Key>
+                    <LastModified>1970-01-01T00:00:01.000Z</LastModified>
+                    <Size>40</Size>
+                </Contents>
+                <CommonPrefixes>
+                    <Prefix>subdir/</Prefix>
+                </CommonPrefixes>
+            </ListBucketResult>
+        """)
+    with webserver.install_http_handler(handler):
+        d = gdal.OpenDir('/vsis3/vsis3_opendir', 0)
+    if d is None:
+        gdaltest.post_reason('fail')
+        return 'fail'
+
+    entry = gdal.GetNextDirEntry(d)
+    if entry.name != 'test.txt':
+        gdaltest.post_reason('fail')
+        print(entry.name)
+        return 'fail'
+    if entry.size != 40:
+        gdaltest.post_reason('fail')
+        print(entry.size)
+        return 'fail'
+    if entry.mode != 32768:
+        gdaltest.post_reason('fail')
+        print(entry.mode)
+        return 'fail'
+    if entry.mtime != 1:
+        gdaltest.post_reason('fail')
+        print(entry.mtime)
+        return 'fail'
+
+    entry = gdal.GetNextDirEntry(d)
+    if entry.name != 'subdir':
+        gdaltest.post_reason('fail')
+        print(entry.name)
+        return 'fail'
+    if entry.mode != 16384:
+        gdaltest.post_reason('fail')
+        print(entry.mode)
+        return 'fail'
+
+    entry = gdal.GetNextDirEntry(d)
+    if entry is not None:
+        gdaltest.post_reason('fail')
+        return 'fail'
+
+    gdal.CloseDir(d)
+
+    # Depth = 1
+    handler = webserver.SequentialHandler()
+    handler.add('GET', '/vsis3_opendir/?delimiter=%2F', 200, {'Content-type': 'application/xml'},
+                """<?xml version="1.0" encoding="UTF-8"?>
+            <ListBucketResult>
+                <Prefix/>
+                <Marker/>
+                <Contents>
+                    <Key>test.txt</Key>
+                    <LastModified>1970-01-01T00:00:01.000Z</LastModified>
+                    <Size>40</Size>
+                </Contents>
+                <CommonPrefixes>
+                    <Prefix>subdir/</Prefix>
+                </CommonPrefixes>
+            </ListBucketResult>
+        """)
+    with webserver.install_http_handler(handler):
+        d = gdal.OpenDir('/vsis3/vsis3_opendir', 1)
+        if d is None:
+            gdaltest.post_reason('fail')
+            return 'fail'
+
+    entry = gdal.GetNextDirEntry(d)
+    if entry.name != 'test.txt':
+        gdaltest.post_reason('fail')
+        print(entry.name)
+        return 'fail'
+    if entry.size != 40:
+        gdaltest.post_reason('fail')
+        print(entry.size)
+        return 'fail'
+    if entry.mode != 32768:
+        gdaltest.post_reason('fail')
+        print(entry.mode)
+        return 'fail'
+    if entry.mtime != 1:
+        gdaltest.post_reason('fail')
+        print(entry.mtime)
+        return 'fail'
+
+    entry = gdal.GetNextDirEntry(d)
+    if entry.name != 'subdir':
+        gdaltest.post_reason('fail')
+        print(entry.name)
+        return 'fail'
+    if entry.mode != 16384:
+        gdaltest.post_reason('fail')
+        print(entry.mode)
+        return 'fail'
+
+    handler = webserver.SequentialHandler()
+    handler.add('GET', '/vsis3_opendir/?delimiter=%2F&prefix=subdir%2F', 200, {'Content-type': 'application/xml'},
+                """<?xml version="1.0" encoding="UTF-8"?>
+            <ListBucketResult>
+                <Prefix>subdir/</Prefix>
+                <Marker/>
+                <Contents>
+                    <Key>subdir/test.txt</Key>
+                    <LastModified>1970-01-01T00:00:01.000Z</LastModified>
+                    <Size>5</Size>
+                </Contents>
+            </ListBucketResult>
+        """)
+    with webserver.install_http_handler(handler):
+        entry = gdal.GetNextDirEntry(d)
+        if entry.name != 'subdir/test.txt':
+            gdaltest.post_reason('fail')
+            print(entry.name)
+            return 'fail'
+
+    entry = gdal.GetNextDirEntry(d)
+    if entry is not None:
+        gdaltest.post_reason('fail')
+        return 'fail'
+
+    gdal.CloseDir(d)
+
+
+
     return 'success'
 
 ###############################################################################
@@ -2745,7 +2965,8 @@ def vsis3_cleanup():
                  vsis3_1,
                  vsis3_start_webserver,
                  vsis3_2,
-                 vsis3_3,
+                 vsis3_readdir,
+                 vsis3_opendir,
                  vsis3_4,
                  vsis3_5,
                  vsis3_6,
@@ -2763,7 +2984,7 @@ def vsis3_cleanup():
                  vsis3_stop_webserver,
                  vsis3_cleanup]
 
-# gdaltest_list = [ vsis3_init, vsis3_start_webserver, vsis3_sync_etag, vsis3_stop_webserver, vsis3_cleanup ]
+# gdaltest_list = [ vsis3_init, vsis3_start_webserver, vsis3_opendir, vsis3_stop_webserver, vsis3_cleanup ]
 
 gdaltest_list_extra = [vsis3_extra_1]
 
diff --git a/gdal/port/cpl_vsi.h b/gdal/port/cpl_vsi.h
index 759e9653c933..af6027fcc81d 100644
--- a/gdal/port/cpl_vsi.h
+++ b/gdal/port/cpl_vsi.h
@@ -302,6 +302,47 @@ GIntBig CPL_DLL CPLGetUsablePhysicalRAM(void);
 char CPL_DLL **VSIReadDir( const char * );
 char CPL_DLL **VSIReadDirRecursive( const char *pszPath );
 char CPL_DLL **VSIReadDirEx( const char *pszPath, int nMaxFiles );
+
+/** Opaque type for a directory iterator */
+typedef struct VSIDIR VSIDIR;
+
+VSIDIR CPL_DLL *VSIOpenDir( const char *pszPath,
+                            int nRecurseDepth,
+                            const char* const *papszOptions);
+
+/** Directory entry. */
+typedef struct VSIDIREntry
+{
+    /** Filename */
+    char*        pszName;
+    /** File mode. See VSI_ISREG() / VSI_ISDIR() */
+    int          nMode;
+    /** File size */
+    vsi_l_offset nSize;
+    /** Last modification time (seconds since 1970/01/01) */
+    GIntBig      nMTime;
+    /** Whether nMode is known: 0 = unknown, 1 = known. */
+    char         bModeKnown;
+    /** Whether nSize is known: 0 = unknown, 1 = known. */
+    char         bSizeKnown;
+    /** Whether nMTime is known: 0 = unknown, 1 = known. */
+    char         bMTimeKnown;
+    /** NULL-terminated list of extra properties. */
+    char**       papszExtra;
+
+#ifdef __cplusplus
+/*! @cond Doxygen_Suppress */
+    VSIDIREntry();
+    ~VSIDIREntry();
+    VSIDIREntry(const VSIDIREntry&) = delete;
+    VSIDIREntry& operator=(VSIDIREntry&) = delete;
+/*! @endcond */
+#endif
+} VSIDIREntry;
+
+const VSIDIREntry CPL_DLL *VSIGetNextDirEntry(VSIDIR* dir);
+void CPL_DLL VSICloseDir(VSIDIR* dir);
+
 int CPL_DLL VSIMkdir( const char * pszPathname, long mode );
 int CPL_DLL VSIMkdirRecursive( const char * pszPathname, long mode );
 int CPL_DLL VSIRmdir( const char * pszDirname );
diff --git a/gdal/port/cpl_vsi_virtual.h b/gdal/port/cpl_vsi_virtual.h
index 02c019521f07..3d29fa645b63 100644
--- a/gdal/port/cpl_vsi_virtual.h
+++ b/gdal/port/cpl_vsi_virtual.h
@@ -118,6 +118,9 @@ class CPL_DLL VSIFilesystemHandler {
                             GDALProgressFunc pProgressFunc,
                             void *pProgressData,
                             char*** ppapszOutputs  );
+
+    virtual VSIDIR* OpenDir( const char *pszPath, int nRecurseDepth,
+                             const char* const *papszOptions);
 };
 #endif /* #ifndef DOXYGEN_SKIP */
 
@@ -232,6 +235,22 @@ class VSIArchiveFilesystemHandler : public VSIFilesystemHandler
     virtual int FindFileInArchive(const char* archiveFilename, const char* fileInArchiveName, const VSIArchiveEntry** archiveEntry);
 };
 
+/************************************************************************/
+/*                              VSIDIR                                  */
+/************************************************************************/
+
+struct CPL_DLL VSIDIR
+{
+    VSIDIR() = default;
+    virtual ~VSIDIR();
+
+    virtual const VSIDIREntry* NextDirEntry() = 0;
+
+  private:
+    VSIDIR(const VSIDIR&) = delete;
+    VSIDIR& operator=(const VSIDIR&) = delete;
+};
+
 #endif /* #ifndef DOXYGEN_SKIP */
 
 VSIVirtualHandle CPL_DLL *VSICreateBufferedReaderHandle(VSIVirtualHandle* poBaseHandle);
diff --git a/gdal/port/cpl_vsil.cpp b/gdal/port/cpl_vsil.cpp
index e521867ed9ca..d9bb795945bd 100644
--- a/gdal/port/cpl_vsil.cpp
+++ b/gdal/port/cpl_vsil.cpp
@@ -310,6 +310,96 @@ char **CPLReadDir( const char *pszPath )
     return VSIReadDir( pszPath );
 }
 
+/************************************************************************/
+/*                             VSIOpenDir()                             */
+/************************************************************************/
+
+/**
+ * \brief Open a directory to read its entries.
+ *
+ * This function is close to the POSIX opendir() function.
+ *
+ * For /vsis3/, /vsigs/, /vsioss/ and /vsiaz/, this funtion has an efficient
+ * implementation, minimizing the number of network requests, when invoked with
+ * nRecurseDepth <= 0.
+ *
+ * Entries are read by calling VSIGetNextDirEntry() on the handled returned by
+ * that function, until it returns NULL. VSICloseDir() must be called once done
+ * with the returned directory handle.
+ *
+ * @param pszPath the relative, or absolute path of a directory to read.
+ * UTF-8 encoded.
+ * @param nRecurseDepth 0 means do not recurse in subdirectories, 1 means
+ * recurse only in the first level of subdirectories, etc. -1 means unlimited
+ * recursion level
+ * @param papszOptions NULL terminated list of options, or NULL.
+ *
+ * @return a handle, or NULL in case of error
+ * @since GDAL 2.4
+ *
+ */
+
+VSIDIR *VSIOpenDir( const char *pszPath,
+                    int nRecurseDepth,
+                    const char* const *papszOptions)
+{
+    VSIFilesystemHandler *poFSHandler =
+        VSIFileManager::GetHandler( pszPath );
+
+    return poFSHandler->OpenDir( pszPath, nRecurseDepth, papszOptions );
+}
+
+/************************************************************************/
+/*                          VSIGetNextDirEntry()                        */
+/************************************************************************/
+
+/**
+ * \brief Return the next entry of the directory
+ *
+ * This function is close to the POSIX readdir() function. It actually returns
+ * more information (file size, last modification time), which on 'real' file
+ * systems involve one 'stat' call per file.
+ *
+ * For filesystems that can have both a regular file and a directory name of
+ * the same name (typically /vsis3/), when this situation of duplicate happens,
+ * the directory name will be suffixed by a slash character. Otherwise directory
+ * names are not suffixed by slash.
+ *
+ * The returned entry remains valid until the next call to VSINextDirEntry()
+ * or VSICloseDir() with the same handle.
+ *
+ * @param dir Directory handled returned by VSIOpenDir(). Must not be NULL.
+ *
+ * @return a entry, or NULL if there is no more entry in the directory. This
+ * return value must not be freed.
+ * @since GDAL 2.4
+ *
+ */
+
+const VSIDIREntry *VSIGetNextDirEntry(VSIDIR* dir)
+{
+    return dir->NextDirEntry();
+}
+
+/************************************************************************/
+/*                             VSICloseDir()                            */
+/************************************************************************/
+
+/**
+ * \brief Close a directory
+ *
+ * This function is close to the POSIX closedir() function.
+ *
+ * @param dir Directory handled returned by VSIOpenDir().
+ *
+ * @since GDAL 2.4
+ */
+
+void VSICloseDir(VSIDIR* dir)
+{
+    delete dir;
+}
+
 /************************************************************************/
 /*                              VSIMkdir()                              */
 /************************************************************************/
@@ -1101,6 +1191,192 @@ bool VSIFilesystemHandler::Sync( const char* pszSource, const char* pszTarget,
     return ret;
 }
 
+/************************************************************************/
+/*                            VSIDIREntry()                             */
+/************************************************************************/
+
+VSIDIREntry::VSIDIREntry(): pszName(nullptr), nMode(0), nSize(0), nMTime(0),
+                   bModeKnown(false), bSizeKnown(false), bMTimeKnown(false),
+                   papszExtra(nullptr)
+{
+}
+
+/************************************************************************/
+/*                           ~VSIDIREntry()                             */
+/************************************************************************/
+
+VSIDIREntry::~VSIDIREntry()
+{
+    CPLFree(pszName);
+    CSLDestroy(papszExtra);
+}
+
+/************************************************************************/
+/*                              ~VSIDIR()                               */
+/************************************************************************/
+
+VSIDIR::~VSIDIR()
+{
+}
+
+/************************************************************************/
+/*                            VSIDIRGeneric                             */
+/************************************************************************/
+
+namespace {
+struct VSIDIRGeneric: public VSIDIR
+{
+    CPLString osRootPath{};
+    CPLString osBasePath{};
+    char** papszContent = nullptr;
+    int nRecurseDepth = 0;
+    int nPos = 0;
+    VSIDIREntry entry{};
+    std::vector<VSIDIRGeneric*> aoStackSubDir{};
+    VSIFilesystemHandler* poFS = nullptr;
+
+    explicit VSIDIRGeneric(VSIFilesystemHandler* poFSIn): poFS(poFSIn) {}
+    ~VSIDIRGeneric();
+
+    const VSIDIREntry* NextDirEntry() override;
+
+    VSIDIRGeneric(const VSIDIRGeneric&) = delete;
+    VSIDIRGeneric& operator=(const VSIDIRGeneric&) = delete;
+};
+
+/************************************************************************/
+/*                         ~VSIDIRGeneric()                             */
+/************************************************************************/
+
+VSIDIRGeneric::~VSIDIRGeneric()
+{
+    while( !aoStackSubDir.empty() )
+    {
+        delete aoStackSubDir.back();
+        aoStackSubDir.pop_back();
+    }
+    CSLDestroy(papszContent);
+}
+
+}
+
+/************************************************************************/
+/*                            OpenDir()                                 */
+/************************************************************************/
+
+VSIDIR* VSIFilesystemHandler::OpenDir( const char *pszPath,
+                                       int nRecurseDepth,
+                                       const char* const *)
+{
+    char** papszContent = VSIReadDir(pszPath);
+    VSIStatBufL sStatL;
+    if( papszContent == nullptr &&
+        (VSIStatL(pszPath, &sStatL) != 0 || !VSI_ISDIR(sStatL.st_mode)) )
+    {
+        return nullptr;
+    }
+    VSIDIRGeneric* dir = new VSIDIRGeneric(this);
+    dir->osRootPath = pszPath;
+    dir->nRecurseDepth = nRecurseDepth;
+    dir->papszContent = papszContent;
+    return dir;
+}
+
+/************************************************************************/
+/*                           NextDirEntry()                             */
+/************************************************************************/
+
+const VSIDIREntry* VSIDIRGeneric::NextDirEntry()
+{
+    if( VSI_ISDIR(entry.nMode) && nRecurseDepth != 0 )
+    {
+        CPLString osCurFile(osRootPath);
+        if( !osCurFile.empty() )
+            osCurFile += '/';
+        osCurFile += entry.pszName;
+        auto subdir = static_cast<VSIDIRGeneric*>(
+            poFS->VSIFilesystemHandler::OpenDir(osCurFile,
+                nRecurseDepth - 1, nullptr));
+        if( subdir )
+        {
+            subdir->osRootPath = osRootPath;
+            subdir->osBasePath = entry.pszName;
+            aoStackSubDir.push_back(subdir);
+        }
+        entry.nMode = 0;
+    }
+
+    while( !aoStackSubDir.empty() )
+    {
+        auto l_entry = aoStackSubDir.back()->NextDirEntry();
+        if( l_entry )
+        {
+            return l_entry;
+        }
+        delete aoStackSubDir.back();
+        aoStackSubDir.pop_back();
+    }
+
+    if( papszContent == nullptr )
+    {
+        return nullptr;
+    }
+
+    while( true )
+    {
+        if( !papszContent[nPos] )
+        {
+            return nullptr;
+        }
+        // Skip . and ..entries
+        if( papszContent[nPos][0] == '.' &&
+            (papszContent[nPos][1] == '\0' ||
+             (papszContent[nPos][1] == '.' &&
+              papszContent[nPos][2] == '\0')) )
+        {
+            nPos ++;
+        }
+        else
+        {
+            break;
+        }
+    }
+
+    CPLFree(entry.pszName);
+    CPLString osName(osBasePath);
+    if( !osName.empty() )
+        osName += '/';
+    osName += papszContent[nPos];
+    entry.pszName = CPLStrdup(osName);
+    VSIStatBufL sStatL;
+    CPLString osCurFile(osRootPath);
+    if( !osCurFile.empty() )
+        osCurFile += '/';
+    osCurFile += entry.pszName;
+    if( VSIStatL(osCurFile, &sStatL) == 0 )
+    {
+        entry.nMode = sStatL.st_mode;
+        entry.nSize = sStatL.st_size;
+        entry.nMTime = sStatL.st_mtime;
+        entry.bModeKnown = true;
+        entry.bSizeKnown = true;
+        entry.bMTimeKnown = true;
+    }
+    else
+    {
+        entry.nMode = 0;
+        entry.nSize = 0;
+        entry.nMTime = 0;
+        entry.bModeKnown = false;
+        entry.bSizeKnown = false;
+        entry.bMTimeKnown = false;
+    }
+    nPos ++;
+
+    return &(entry);
+}
+
+
 #endif
 
 /************************************************************************/
diff --git a/gdal/port/cpl_vsil_az.cpp b/gdal/port/cpl_vsil_az.cpp
index 4ca7e9bd8f16..e5e16df67867 100644
--- a/gdal/port/cpl_vsil_az.cpp
+++ b/gdal/port/cpl_vsil_az.cpp
@@ -61,36 +61,73 @@ namespace cpl {
 const char GDAL_MARKER_FOR_DIR[] = ".gdal_marker_for_dir";
 
 /************************************************************************/
-/*                         AnalyseAzureFileList()                       */
+/*                             VSIDIRAz                                 */
 /************************************************************************/
 
-void VSICurlFilesystemHandler::AnalyseAzureFileList(
+struct VSIDIRAz: public VSIDIR
+{
+    CPLString osRootPath{};
+    int nRecurseDepth = 0;
+
+    CPLString osNextMarker{};
+    std::vector<std::unique_ptr<VSIDIREntry>> aoEntries{};
+    int nPos = 0;
+
+    CPLString osBucket{};
+    CPLString osObjectKey{};
+    IVSIS3LikeFSHandler* poFS = nullptr;
+    IVSIS3LikeHandleHelper* poHandleHelper = nullptr;
+    int nMaxFiles = 0;
+    bool bCacheResults = true;
+
+    VSIDIRAz(IVSIS3LikeFSHandler *poFSIn): poFS(poFSIn) {}
+    ~VSIDIRAz()
+    {
+        delete poHandleHelper;
+    }
+
+    VSIDIRAz(const VSIDIRAz&) = delete;
+    VSIDIRAz& operator=(const VSIDIRAz&) = delete;
+
+    const VSIDIREntry* NextDirEntry() override;
+
+    bool IssueListDir();
+    bool AnalyseAzureFileList( const CPLString& osBaseURL,
+                               const char* pszXML );
+    void clear();
+};
+
+/************************************************************************/
+/*                                clear()                               */
+/************************************************************************/
+
+void VSIDIRAz::clear()
+{
+    osNextMarker.clear();
+    nPos = 0;
+    aoEntries.clear();
+}
+
+/************************************************************************/
+/*                        AnalyseAzureFileList()                        */
+/************************************************************************/
+
+bool VSIDIRAz::AnalyseAzureFileList(
     const CPLString& osBaseURL,
-    bool bCacheResults,
-    const char* pszXML,
-    CPLStringList& osFileList,
-    int nMaxFiles,
-    bool& bIsTruncated,
-    CPLString& osNextMarker )
+    const char* pszXML)
 {
 #if DEBUG_VERBOSE
     CPLDebug("AZURE", "%s", pszXML);
 #endif
-    osNextMarker = "";
-    bIsTruncated = false;
+
     CPLXMLNode* psTree = CPLParseXMLString(pszXML);
     if( psTree == nullptr )
-        return;
+        return false;
     CPLXMLNode* psEnumerationResults = CPLGetXMLNode(psTree, "=EnumerationResults");
 
-    std::vector< std::pair<CPLString, FileProp> > aoProps;
-    // Count the number of occurrences of a path. Can be 1 or 2. 2 in the case
-    // that both a filename and directory exist
-    std::map<CPLString, int> aoNameCount;
-
+    bool bNonEmpty = false;
     if( psEnumerationResults )
     {
-        bool bNonEmpty = false;
         CPLString osPrefix = CPLGetXMLValue(psEnumerationResults, "Prefix", "");
         CPLXMLNode* psBlobs = CPLGetXMLNode(psEnumerationResults, "Blobs");
         if( psBlobs == nullptr )
@@ -99,8 +136,12 @@ void VSICurlFilesystemHandler::AnalyseAzureFileList(
             if( psBlobs != nullptr )
                 bNonEmpty = true;
         }
-        CPLXMLNode* psIter = psBlobs ? psBlobs->psChild : nullptr;
-        for( ; psIter != nullptr; psIter = psIter->psNext )
+
+        // Count the number of occurrences of a path. Can be 1 or 2. 2 in the case
+        // that both a filename and directory exist
+        std::map<CPLString, int> aoNameCount;
+        for(CPLXMLNode* psIter = psBlobs ? psBlobs->psChild : nullptr;
+            psIter != nullptr; psIter = psIter->psNext )
         {
             if( psIter->eType != CXT_Element )
                 continue;
@@ -114,14 +155,69 @@ void VSICurlFilesystemHandler::AnalyseAzureFileList(
                 else if( pszKey && strlen(pszKey) > osPrefix.size() )
                 {
                     bNonEmpty = true;
+                    aoNameCount[pszKey + osPrefix.size()] ++;
+                }
+            }
+            else if( strcmp(psIter->pszValue, "BlobPrefix") == 0 ||
+                     strcmp(psIter->pszValue, "Container") == 0 )
+            {
+                bNonEmpty = true;
+
+                const char* pszKey = CPLGetXMLValue(psIter, "Name", nullptr);
+                if( pszKey && strncmp(pszKey, osPrefix, osPrefix.size()) == 0 )
+                {
+                    CPLString osKey = pszKey;
+                    if( !osKey.empty() && osKey.back() == '/' )
+                        osKey.resize(osKey.size()-1);
+                    if( osKey.size() > osPrefix.size() )
+                    {
+                        aoNameCount[osKey.c_str() + osPrefix.size()] ++;
+                    }
+                }
+            }
+        }
 
-                    FileProp prop;
-                    prop.eExists = EXIST_YES;
-                    prop.bHasComputedFileSize = true;
-                    prop.fileSize = static_cast<GUIntBig>(
+        for(CPLXMLNode* psIter = psBlobs ? psBlobs->psChild : nullptr;
+            psIter != nullptr; psIter = psIter->psNext )
+        {
+            if( psIter->eType != CXT_Element )
+                continue;
+            if( strcmp(psIter->pszValue, "Blob") == 0 )
+            {
+                const char* pszKey = CPLGetXMLValue(psIter, "Name", nullptr);
+                if( pszKey && strstr(pszKey, GDAL_MARKER_FOR_DIR) != nullptr )
+                {
+                    if( nRecurseDepth < 0 )
+                    {
+                        aoEntries.push_back(
+                            std::unique_ptr<VSIDIREntry>(new VSIDIREntry()));
+                        auto& entry = aoEntries.back();
+                        entry->pszName = CPLStrdup(pszKey + osPrefix.size());
+                        char* pszMarker = strstr(entry->pszName, GDAL_MARKER_FOR_DIR);
+                        if( pszMarker )
+                            *pszMarker = '\0';
+                        entry->nMode = S_IFDIR;
+                        entry->bModeKnown = true;
+                    }
+                }
+                else if( pszKey && strlen(pszKey) > osPrefix.size() )
+                {
+                    aoEntries.push_back(
+                        std::unique_ptr<VSIDIREntry>(new VSIDIREntry()));
+                    auto& entry = aoEntries.back();
+                    entry->pszName = CPLStrdup(pszKey + osPrefix.size());
+                    entry->nSize = static_cast<GUIntBig>(
                         CPLAtoGIntBig(CPLGetXMLValue(psIter, "Properties.Content-Length", "0")));
-                    prop.bIsDirectory = false;
-                    prop.mTime = 0;
+                    entry->bSizeKnown = true;
+                    entry->nMode = S_IFDIR;
+                    entry->bModeKnown = true;
+
+                    CPLString ETag = CPLGetXMLValue(psIter, "Etag", "");
+                    if( !ETag.empty() )
+                    {
+                        entry->papszExtra = CSLSetNameValue(
+                            entry->papszExtra, "ETag", ETag.c_str());
+                    }
 
                     int nYear, nMonth, nDay, nHour, nMinute, nSecond;
                     if( CPLParseRFC822DateTime(
@@ -142,22 +238,33 @@ void VSICurlFilesystemHandler::AnalyseAzureFileList(
                         brokendowntime.tm_hour = nHour;
                         brokendowntime.tm_min = nMinute;
                         brokendowntime.tm_sec = nSecond < 0 ? 0 : nSecond;
-                        prop.mTime =
-                            static_cast<time_t>(
-                                CPLYMDHMSToUnixTime(&brokendowntime));
+                        entry->nMTime =
+                                CPLYMDHMSToUnixTime(&brokendowntime);
+                        entry->bMTimeKnown = true;
                     }
 
-                    aoProps.push_back(
-                        std::pair<CPLString, FileProp>
-                            (pszKey + osPrefix.size(), prop));
-                    aoNameCount[pszKey + osPrefix.size()] ++;
+                    if( bCacheResults )
+                    {
+                        FileProp prop;
+                        prop.eExists = EXIST_YES;
+                        prop.bHasComputedFileSize = true;
+                        prop.fileSize = entry->nSize;
+                        prop.bIsDirectory = false;
+                        prop.mTime = static_cast<time_t>(entry->nMTime);
+                        prop.ETag = ETag;
+
+                        CPLString osCachedFilename =
+                            osBaseURL + "/" + osPrefix + entry->pszName;
+#if DEBUG_VERBOSE
+                        CPLDebug("AZURE", "Cache %s", osCachedFilename.c_str());
+#endif
+                        poFS->SetCachedFileProp(osCachedFilename, prop);
+                    }
                 }
             }
             else if( strcmp(psIter->pszValue, "BlobPrefix") == 0 ||
                      strcmp(psIter->pszValue, "Container") == 0 )
             {
-                bNonEmpty = true;
-
                 const char* pszKey = CPLGetXMLValue(psIter, "Name", nullptr);
                 if( pszKey && strncmp(pszKey, osPrefix, osPrefix.size()) == 0 )
                 {
@@ -166,63 +273,168 @@ void VSICurlFilesystemHandler::AnalyseAzureFileList(
                         osKey.resize(osKey.size()-1);
                     if( osKey.size() > osPrefix.size() )
                     {
-                        FileProp prop;
-                        prop.eExists = EXIST_YES;
-                        prop.bIsDirectory = true;
-                        prop.bHasComputedFileSize = true;
-                        prop.fileSize = 0;
-                        prop.mTime = 0;
-
-                        aoProps.push_back(
-                            std::pair<CPLString, FileProp>
-                                (osKey.c_str() + osPrefix.size(), prop));
-                        aoNameCount[osKey.c_str() + osPrefix.size()] ++;
+                        aoEntries.push_back(
+                            std::unique_ptr<VSIDIREntry>(new VSIDIREntry()));
+                        auto& entry = aoEntries.back();
+                        entry->pszName = CPLStrdup(osKey.c_str() + osPrefix.size());
+                        if( aoNameCount[entry->pszName] == 2 )
+                        {
+                            // Add a / suffix to disambiguish the situation
+                            // Normally we don't suffix directories with /, but
+                            // we have no alternative here
+                            CPLString osTemp(entry->pszName);
+                            osTemp += '/';
+                            CPLFree(entry->pszName);
+                            entry->pszName = CPLStrdup(osTemp);
+                        }
+                        entry->nMode = S_IFDIR;
+                        entry->bModeKnown = true;
+
+                        if( bCacheResults )
+                        {
+                            FileProp prop;
+                            prop.eExists = EXIST_YES;
+                            prop.bIsDirectory = true;
+                            prop.bHasComputedFileSize = true;
+                            prop.fileSize = 0;
+                            prop.mTime = 0;
+
+                            CPLString osCachedFilename =
+                                osBaseURL + "/" + osPrefix + entry->pszName;
+#if DEBUG_VERBOSE
+                            CPLDebug("AZURE", "Cache %s", osCachedFilename.c_str());
+#endif
+                            poFS->SetCachedFileProp(osCachedFilename, prop);
+                        }
                     }
                 }
             }
 
-            if( nMaxFiles > 0 && aoProps.size() > static_cast<unsigned>(nMaxFiles) )
+            if( nMaxFiles > 0 && aoEntries.size() > static_cast<unsigned>(nMaxFiles) )
                 break;
         }
 
-        if( !(nMaxFiles > 0 && aoProps.size() > static_cast<unsigned>(nMaxFiles)) )
+        osNextMarker = CPLGetXMLValue(psEnumerationResults, "NextMarker", "");
+    }
+    CPLDestroyXMLNode(psTree);
+
+    return bNonEmpty;
+}
+
+/************************************************************************/
+/*                          IssueListDir()                              */
+/************************************************************************/
+
+bool VSIDIRAz::IssueListDir()
+{
+    WriteFuncStruct sWriteFuncData;
+    const CPLString l_osNextMarker(osNextMarker);
+    clear();
+
+    CPLString osMaxKeys = CPLGetConfigOption("AZURE_MAX_RESULTS", "");
+    const int AZURE_SERVER_LIMIT_SINGLE_REQUEST = 5000;
+    if( nMaxFiles > 0 && nMaxFiles < AZURE_SERVER_LIMIT_SINGLE_REQUEST &&
+        (osMaxKeys.empty() || nMaxFiles < atoi(osMaxKeys)) )
+    {
+        osMaxKeys.Printf("%d", nMaxFiles);
+    }
+
+    poHandleHelper->ResetQueryParameters();
+    CPLString osBaseURL(poHandleHelper->GetURL());
+
+    CURLM* hCurlMultiHandle = poFS->GetCurlMultiHandleFor(osBaseURL);
+    CURL* hCurlHandle = curl_easy_init();
+
+    poHandleHelper->AddQueryParameter("comp", "list");
+    if( !l_osNextMarker.empty() )
+        poHandleHelper->AddQueryParameter("marker", l_osNextMarker);
+    if( !osMaxKeys.empty() )
+            poHandleHelper->AddQueryParameter("maxresults", osMaxKeys);
+
+    if( !osBucket.empty() )
+    {
+        poHandleHelper->AddQueryParameter("restype", "container");
+
+        if( nRecurseDepth == 0 )
+            poHandleHelper->AddQueryParameter("delimiter", "/");
+        if( !osObjectKey.empty() )
+            poHandleHelper->AddQueryParameter("prefix", osObjectKey + "/");
+    }
+
+    struct curl_slist* headers =
+        VSICurlSetOptions(hCurlHandle, poHandleHelper->GetURL(), nullptr);
+
+    curl_easy_setopt(hCurlHandle, CURLOPT_RANGE, nullptr);
+
+    VSICURLInitWriteFuncStruct(&sWriteFuncData, nullptr, nullptr, nullptr);
+    curl_easy_setopt(hCurlHandle, CURLOPT_WRITEDATA, &sWriteFuncData);
+    curl_easy_setopt(hCurlHandle, CURLOPT_WRITEFUNCTION,
+                        VSICurlHandleWriteFunc);
+
+    char szCurlErrBuf[CURL_ERROR_SIZE+1] = {};
+    curl_easy_setopt(hCurlHandle, CURLOPT_ERRORBUFFER, szCurlErrBuf );
+
+    headers = VSICurlMergeHeaders(headers,
+                            poHandleHelper->GetCurlHeaders("GET", headers));
+    curl_easy_setopt(hCurlHandle, CURLOPT_HTTPHEADER, headers);
+
+    MultiPerform(hCurlMultiHandle, hCurlHandle);
+
+    if( headers != nullptr )
+        curl_slist_free_all(headers);
+
+    if( sWriteFuncData.pBuffer == nullptr)
+    {
+        curl_easy_cleanup(hCurlHandle);
+        return false;
+    }
+
+    long response_code = 0;
+    curl_easy_getinfo(hCurlHandle, CURLINFO_HTTP_CODE, &response_code);
+    if( response_code != 200 )
+    {
+        CPLDebug("AZURE", "%s",
+                    sWriteFuncData.pBuffer
+                    ? sWriteFuncData.pBuffer : "(null)");
+        CPLFree(sWriteFuncData.pBuffer);
+        curl_easy_cleanup(hCurlHandle);
+        return false;
+    }
+    else
+    {
+        bool ret = AnalyseAzureFileList( osBaseURL,
+                                sWriteFuncData.pBuffer );
+
+        CPLFree(sWriteFuncData.pBuffer);
+
+        curl_easy_cleanup(hCurlHandle);
+        return ret;
+    }
+}
+
+/************************************************************************/
+/*                           NextDirEntry()                             */
+/************************************************************************/
+
+const VSIDIREntry* VSIDIRAz::NextDirEntry()
+{
+    while( true )
+    {
+        if( nPos < static_cast<int>(aoEntries.size()) )
         {
-            osNextMarker = CPLGetXMLValue(psEnumerationResults, "NextMarker", "");
-            bIsTruncated =
-                CPLTestBool(CPLGetXMLValue(psEnumerationResults,
-                                           "IsTruncated", "false"));
+            auto& entry = aoEntries[nPos];
+            nPos ++;
+            return entry.get();
         }
-
-        for( size_t i = 0; i < aoProps.size(); i++ )
+        if( osNextMarker.empty() )
         {
-            CPLString osSuffix;
-            if( aoNameCount[aoProps[i].first] == 2 &&
-                    aoProps[i].second.bIsDirectory )
-            {
-                // Add a / suffix to disambiguish the situation
-                // Normally we don't suffix directories with /, but we have
-                // no alternative here
-                osSuffix = "/";
-            }
-            if( bCacheResults )
-            {
-                CPLString osCachedFilename =
-                        osBaseURL + "/" + osPrefix + aoProps[i].first + osSuffix;
-#if DEBUG_VERBOSE
-                CPLDebug("AZURE", "Cache %s", osCachedFilename.c_str());
-#endif
-                SetCachedFileProp(osCachedFilename, aoProps[i].second);
-            }
-            osFileList.AddString( (aoProps[i].first + osSuffix).c_str() );
+            return nullptr;
         }
-
-        if( osFileList.size() == 0 && (bNonEmpty || osPrefix.empty()) )
+        if( !IssueListDir() )
         {
-            // To avoid an error to be reported
-            osFileList.AddString(".");
+            return nullptr;
         }
     }
-    CPLDestroyXMLNode(psTree);
 }
 
 /************************************************************************/
@@ -271,6 +483,10 @@ class VSIAzureFSHandler final : public IVSIS3LikeFSHandler
                         int nMaxFiles,
                         bool bCacheResults,
                         bool* pbGotFileList );
+
+    VSIDIR* OpenDir( const char *pszPath, int nRecurseDepth,
+                            const char* const *papszOptions) override;
+
 };
 
 /************************************************************************/
@@ -751,133 +967,38 @@ char** VSIAzureFSHandler::GetFileList( const char *pszDirname,
 {
     if( ENABLE_DEBUG )
         CPLDebug(GetDebugKey(), "GetFileList(%s)" , pszDirname);
-    *pbGotFileList = false;
-    CPLString osDirnameWithoutPrefix = pszDirname + GetFSPrefix().size();
-    if( !osDirnameWithoutPrefix.empty() &&
-                                osDirnameWithoutPrefix.back() == '/' )
-    {
-        osDirnameWithoutPrefix.resize(osDirnameWithoutPrefix.size()-1);
-    }
 
-    CPLString osBucket(osDirnameWithoutPrefix);
-    CPLString osObjectKey;
-    size_t nSlashPos = osDirnameWithoutPrefix.find('/');
-    if( nSlashPos != std::string::npos )
-    {
-        osBucket = osDirnameWithoutPrefix.substr(0, nSlashPos);
-        osObjectKey = osDirnameWithoutPrefix.substr(nSlashPos+1);
-    }
+    *pbGotFileList = false;
 
-    IVSIS3LikeHandleHelper* poHandleHelper =
-        CreateHandleHelper(osBucket, true);
-    if( poHandleHelper == nullptr )
+    char** papszOptions = CSLSetNameValue(nullptr,
+                                "MAXFILES", CPLSPrintf("%d", nMaxFiles));
+    papszOptions = CSLSetNameValue(papszOptions,
+                            "CACHE_RESULTS", bCacheResults ? "YES" : "NO");
+    auto dir = OpenDir(pszDirname, 0, papszOptions);
+    CSLDestroy(papszOptions);
+    if( !dir )
     {
         return nullptr;
     }
-
-    WriteFuncStruct sWriteFuncData;
-
-    CPLStringList osFileList; // must be left in this scope !
-    CPLString osNextMarker; // must be left in this scope !
-
-    CPLString osMaxKeys = CPLGetConfigOption("AZURE_MAX_RESULTS", "");
-    const int AZURE_SERVER_LIMIT_SINGLE_REQUEST = 5000;
-    if( nMaxFiles > 0 && nMaxFiles < AZURE_SERVER_LIMIT_SINGLE_REQUEST &&
-        (osMaxKeys.empty() || nMaxFiles < atoi(osMaxKeys)) )
-    {
-        osMaxKeys.Printf("%d", nMaxFiles);
-    }
-
+    CPLStringList aosFileList;
     while( true )
     {
-        poHandleHelper->ResetQueryParameters();
-        CPLString osBaseURL(poHandleHelper->GetURL());
-
-        CURLM* hCurlMultiHandle = GetCurlMultiHandleFor(osBaseURL);
-        CURL* hCurlHandle = curl_easy_init();
-
-        poHandleHelper->AddQueryParameter("comp", "list");
-        if( !osNextMarker.empty() )
-            poHandleHelper->AddQueryParameter("marker", osNextMarker);
-        if( !osMaxKeys.empty() )
-             poHandleHelper->AddQueryParameter("maxresults", osMaxKeys);
-
-        if( !osDirnameWithoutPrefix.empty() )
+        auto entry = dir->NextDirEntry();
+        if( !entry )
         {
-            poHandleHelper->AddQueryParameter("restype", "container");
-
-            poHandleHelper->AddQueryParameter("delimiter", "/");
-            if( !osObjectKey.empty() )
-                poHandleHelper->AddQueryParameter("prefix", osObjectKey + "/");
-        }
-
-        struct curl_slist* headers =
-            VSICurlSetOptions(hCurlHandle, poHandleHelper->GetURL(), nullptr);
-
-        curl_easy_setopt(hCurlHandle, CURLOPT_RANGE, nullptr);
-
-        VSICURLInitWriteFuncStruct(&sWriteFuncData, nullptr, nullptr, nullptr);
-        curl_easy_setopt(hCurlHandle, CURLOPT_WRITEDATA, &sWriteFuncData);
-        curl_easy_setopt(hCurlHandle, CURLOPT_WRITEFUNCTION,
-                         VSICurlHandleWriteFunc);
-
-        char szCurlErrBuf[CURL_ERROR_SIZE+1] = {};
-        curl_easy_setopt(hCurlHandle, CURLOPT_ERRORBUFFER, szCurlErrBuf );
-
-        headers = VSICurlMergeHeaders(headers,
-                               poHandleHelper->GetCurlHeaders("GET", headers));
-        curl_easy_setopt(hCurlHandle, CURLOPT_HTTPHEADER, headers);
-
-        MultiPerform(hCurlMultiHandle, hCurlHandle);
-
-        if( headers != nullptr )
-            curl_slist_free_all(headers);
-
-        if( sWriteFuncData.pBuffer == nullptr)
-        {
-            delete poHandleHelper;
-            curl_easy_cleanup(hCurlHandle);
-            return nullptr;
-        }
-
-        long response_code = 0;
-        curl_easy_getinfo(hCurlHandle, CURLINFO_HTTP_CODE, &response_code);
-        if( response_code != 200 )
-        {
-            CPLDebug(GetDebugKey(), "%s",
-                        sWriteFuncData.pBuffer
-                        ? sWriteFuncData.pBuffer : "(null)");
-            CPLFree(sWriteFuncData.pBuffer);
-            delete poHandleHelper;
-            curl_easy_cleanup(hCurlHandle);
-            return nullptr;
-        }
-        else
-        {
-            *pbGotFileList = true;
-            bool bIsTruncated;
-            AnalyseAzureFileList( osBaseURL,
-                                  bCacheResults,
-                                  sWriteFuncData.pBuffer,
-                                  osFileList,
-                                  nMaxFiles,
-                                  bIsTruncated,
-                                  osNextMarker );
-
-            CPLFree(sWriteFuncData.pBuffer);
-
-            if( osNextMarker.empty() )
-            {
-                delete poHandleHelper;
-                curl_easy_cleanup(hCurlHandle);
-                return osFileList.StealList();
-            }
+            break;
         }
+        aosFileList.AddString(entry->pszName);
 
-        curl_easy_cleanup(hCurlHandle);
+        if( nMaxFiles > 0 && aosFileList.size() >= nMaxFiles )
+            break;
     }
+    delete dir;
+    *pbGotFileList = true;
+    return aosFileList.StealList();
 }
 
+
 /************************************************************************/
 /*                           GetOptions()                               */
 /************************************************************************/
@@ -925,6 +1046,63 @@ char* VSIAzureFSHandler::GetSignedURL(const char* pszFilename, CSLConstList paps
     return CPLStrdup(osRet);
 }
 
+/************************************************************************/
+/*                            OpenDir()                                 */
+/************************************************************************/
+
+VSIDIR* VSIAzureFSHandler::OpenDir( const char *pszPath,
+                                      int nRecurseDepth,
+                                      const char* const *papszOptions)
+{
+    if( nRecurseDepth > 0)
+    {
+        return VSIFilesystemHandler::OpenDir(pszPath, nRecurseDepth, papszOptions);
+    }
+
+    if( !STARTS_WITH_CI(pszPath, GetFSPrefix()) )
+        return nullptr;
+
+    CPLString osDirnameWithoutPrefix = pszPath + GetFSPrefix().size();
+    if( !osDirnameWithoutPrefix.empty() &&
+                                osDirnameWithoutPrefix.back() == '/' )
+    {
+        osDirnameWithoutPrefix.resize(osDirnameWithoutPrefix.size()-1);
+    }
+
+    CPLString osBucket(osDirnameWithoutPrefix);
+    CPLString osObjectKey;
+    size_t nSlashPos = osDirnameWithoutPrefix.find('/');
+    if( nSlashPos != std::string::npos )
+    {
+        osBucket = osDirnameWithoutPrefix.substr(0, nSlashPos);
+        osObjectKey = osDirnameWithoutPrefix.substr(nSlashPos+1);
+    }
+
+    IVSIS3LikeHandleHelper* poHandleHelper =
+        CreateHandleHelper(osBucket, true);
+    if( poHandleHelper == nullptr )
+    {
+        return nullptr;
+    }
+
+    VSIDIRAz* dir = new VSIDIRAz(this);
+    dir->nRecurseDepth = nRecurseDepth;
+    dir->poFS = this;
+    dir->poHandleHelper = poHandleHelper;
+    dir->osBucket = osBucket;
+    dir->osObjectKey = osObjectKey;
+    dir->nMaxFiles = atoi(CSLFetchNameValueDef(papszOptions, "MAXFILES", "0"));
+    dir->bCacheResults = CPLTestBool(
+        CSLFetchNameValueDef(papszOptions, "CACHE_RESULTS", "YES"));
+    if( !dir->IssueListDir() )
+    {
+        delete dir;
+        return nullptr;
+    }
+
+    return dir;
+}
+
 /************************************************************************/
 /*                           VSIAzureHandle()                           */
 /************************************************************************/
@@ -977,9 +1155,8 @@ bool VSIAzureHandle::IsDirectoryFromExists( const char* /*pszVerb*/,
     bool bGotFileList = false;
     char** papszDirContent = reinterpret_cast<VSIAzureFSHandler*>(poFS)
                         ->GetFileList( osDirname, 1, false, &bGotFileList );
-    bIsDir = papszDirContent != nullptr && papszDirContent[0] != nullptr;
     CSLDestroy(papszDirContent);
-    return bIsDir;
+    return bGotFileList;
 }
 
 } /* end of namespace cpl */
diff --git a/gdal/port/cpl_vsil_curl.cpp b/gdal/port/cpl_vsil_curl.cpp
index 6f139ebe83f7..ae23242e52c4 100644
--- a/gdal/port/cpl_vsil_curl.cpp
+++ b/gdal/port/cpl_vsil_curl.cpp
@@ -3667,16 +3667,20 @@ char** VSICurlFilesystemHandler::GetFileList(const char *pszDirname,
             bool bIsTruncated = true;
             const bool bIgnoreGlacier = CPLTestBool(
                 CPLGetConfigOption("CPL_VSIL_CURL_IGNORE_GLACIER_STORAGE", "YES"));
-            AnalyseS3FileList( osBaseURL,
+            bool ret = AnalyseS3FileList( osBaseURL,
                                sWriteFuncData.pBuffer,
                                osFileList,
                                nMaxFiles,
                                bIgnoreGlacier,
-                               bIsTruncated,
-                               osNextMarker );
+                               bIsTruncated );
             // If the list is truncated, then don't report it.
-            if( !bIsTruncated )
+            if( ret && !bIsTruncated )
             {
+                if( osFileList.empty() )
+                {
+                    // To avoid an error to be reported
+                    osFileList.AddString(".");
+                }
                 papszFileList = osFileList.StealList();
                 *pbGotFileList = true;
             }
@@ -3894,6 +3898,11 @@ char** VSICurlFilesystemHandler::ReadDirInternal( const char *pszDirname,
         cachedDirList.oFileList.Assign(
             GetFileList(osDirname, nMaxFiles,
                         &cachedDirList.bGotFileList), true);
+        if( cachedDirList.bGotFileList && cachedDirList.oFileList.empty() )
+        {
+            // To avoid an error to be reported
+            cachedDirList.oFileList.AddString(".");
+        }
         if( nMaxFiles <= 0 || cachedDirList.oFileList.size() < nMaxFiles )
         {
             // Only cache content if we didn't hit the limitation
diff --git a/gdal/port/cpl_vsil_curl_class.h b/gdal/port/cpl_vsil_curl_class.h
index c534251cd54f..6ccf86214f2f 100644
--- a/gdal/port/cpl_vsil_curl_class.h
+++ b/gdal/port/cpl_vsil_curl_class.h
@@ -174,21 +174,12 @@ class VSICurlFilesystemHandler : public VSIFilesystemHandler
 
     void RegisterEmptyDir( const CPLString& osDirname );
 
-    void AnalyseS3FileList( const CPLString& osBaseURL,
+    bool AnalyseS3FileList( const CPLString& osBaseURL,
                             const char* pszXML,
                             CPLStringList& osFileList,
                             int nMaxFiles,
                             bool bIgnoreGlacierStorageClass,
-                            bool& bIsTruncated,
-                            CPLString& osNextMarker );
-
-    void AnalyseAzureFileList( const CPLString& osBaseURL,
-                               bool bCacheResults,
-                            const char* pszXML,
-                            CPLStringList& osFileList,
-                            int nMaxFiles,
-                            bool& bIsTruncated,
-                            CPLString& osNextMarker );
+                            bool& bIsTruncated );
 
     void AnalyseSwiftFileList( const CPLString& osBaseURL,
                                const CPLString& osPrefix,
@@ -396,6 +387,9 @@ class IVSIS3LikeFSHandler: public VSICurlFilesystemHandler
                 GDALProgressFunc pProgressFunc,
                 void *pProgressData,
                 char*** ppapszOutputs  ) override;
+
+    VSIDIR* OpenDir( const char *pszPath, int nRecurseDepth,
+                             const char* const *papszOptions) override;
 };
 
 /************************************************************************/
diff --git a/gdal/port/cpl_vsil_s3.cpp b/gdal/port/cpl_vsil_s3.cpp
index b8f715eb9fa8..7d429e843895 100644
--- a/gdal/port/cpl_vsil_s3.cpp
+++ b/gdal/port/cpl_vsil_s3.cpp
@@ -61,67 +61,171 @@ void VSIInstallS3FileHandler( void )
 namespace cpl {
 
 /************************************************************************/
-/*                          AnalyseS3FileList()                         */
+/*                             VSIDIRS3                                 */
+/************************************************************************/
+
+struct VSIDIRS3: public VSIDIR
+{
+    int nRecurseDepth = 0;
+
+    CPLString osNextMarker{};
+    std::vector<std::unique_ptr<VSIDIREntry>> aoEntries{};
+    int nPos = 0;
+
+    CPLString osBucket{};
+    CPLString osObjectKey{};
+    VSICurlFilesystemHandler* poFS = nullptr;
+    IVSIS3LikeFSHandler* poS3FS = nullptr;
+    IVSIS3LikeHandleHelper* poS3HandleHelper = nullptr;
+    int nMaxFiles = 0;
+
+    explicit VSIDIRS3(IVSIS3LikeFSHandler *poFSIn): poFS(poFSIn), poS3FS(poFSIn) {}
+    explicit VSIDIRS3(VSICurlFilesystemHandler *poFSIn): poFS(poFSIn) {}
+    ~VSIDIRS3()
+    {
+        delete poS3HandleHelper;
+    }
+
+    VSIDIRS3(const VSIDIRS3&) = delete;
+    VSIDIRS3& operator=(const VSIDIRS3&) = delete;
+
+    const VSIDIREntry* NextDirEntry() override;
+
+    bool IssueListDir();
+    bool AnalyseS3FileList( const CPLString& osBaseURL,
+                            const char* pszXML,
+                            bool bIgnoreGlacierStorageClass,
+                            bool& bIsTruncated );
+    void clear();
+};
+
+/************************************************************************/
+/*                                clear()                               */
+/************************************************************************/
+
+void VSIDIRS3::clear()
+{
+    osNextMarker.clear();
+    nPos = 0;
+    aoEntries.clear();
+}
+
+/************************************************************************/
+/*                        AnalyseS3FileList()                           */
 /************************************************************************/
 
-void VSICurlFilesystemHandler::AnalyseS3FileList(
+bool VSIDIRS3::AnalyseS3FileList(
     const CPLString& osBaseURL,
     const char* pszXML,
-    CPLStringList& osFileList,
-    int nMaxFiles,
     bool bIgnoreGlacierStorageClass,
-    bool& bIsTruncated,
-    CPLString& osNextMarker)
+    bool &bIsTruncated)
 {
 #if DEBUG_VERBOSE
-    CPLDebug("S3", "%s", pszXML);
+    const char *pszDebugPrefix = poS3FS ? poS3FS->GetDebugKey() : "S3";
+    CPLDebug(pszDebugPrefix, "%s", pszXML);
 #endif
-    osNextMarker = "";
-    bIsTruncated = false;
+
     CPLXMLNode* psTree = CPLParseXMLString(pszXML);
     if( psTree == nullptr )
-        return;
+        return false;
     CPLXMLNode* psListBucketResult = CPLGetXMLNode(psTree, "=ListBucketResult");
     CPLXMLNode* psListAllMyBucketsResultBuckets =
         (psListBucketResult != nullptr ) ? nullptr :
         CPLGetXMLNode(psTree, "=ListAllMyBucketsResult.Buckets");
 
-    std::vector< std::pair<CPLString, FileProp> > aoProps;
-    // Count the number of occurrences of a path. Can be 1 or 2. 2 in the case
-    // that both a filename and directory exist
-    std::map<CPLString, int> aoNameCount;
+    bool ret = true;
 
+    bIsTruncated = false;
     if( psListBucketResult )
     {
+        ret = false;
         CPLString osPrefix = CPLGetXMLValue(psListBucketResult, "Prefix", "");
-        CPLXMLNode* psIter = psListBucketResult->psChild;
-        bool bNonEmpty = false;
-        for( ; psIter != nullptr; psIter = psIter->psNext )
+        if( osPrefix.empty() )
+        {
+            // in the case of an empty bucket
+            ret = true;
+        }
+        bIsTruncated = CPLTestBool(
+            CPLGetXMLValue(psListBucketResult, "IsTruncated", "false"));
+
+        // Count the number of occurrences of a path. Can be 1 or 2. 2 in the
+        // case that both a filename and directory exist
+        std::map<CPLString, int> aoNameCount;
+        for( CPLXMLNode* psIter = psListBucketResult->psChild;
+             psIter != nullptr; psIter = psIter->psNext )
+        {
+            if( psIter->eType != CXT_Element )
+                continue;
+            if( strcmp(psIter->pszValue, "Contents") == 0 )
+            {
+                ret = true;
+                const char* pszKey = CPLGetXMLValue(psIter, "Key", nullptr);
+                if( pszKey && strlen(pszKey) > osPrefix.size() )
+                {
+                    aoNameCount[pszKey + osPrefix.size()] ++;
+                }
+            }
+            else if( strcmp(psIter->pszValue, "CommonPrefixes") == 0 )
+            {
+                const char* pszKey = CPLGetXMLValue(psIter, "Prefix", nullptr);
+                if( pszKey && strncmp(pszKey, osPrefix, osPrefix.size()) == 0 )
+                {
+                    CPLString osKey = pszKey;
+                    if( !osKey.empty() && osKey.back() == '/' )
+                        osKey.resize(osKey.size()-1);
+                    if( osKey.size() > osPrefix.size() )
+                    {
+                        ret = true;
+                        aoNameCount[osKey.c_str() + osPrefix.size()] ++;
+                    }
+                }
+            }
+        }
+
+        for( CPLXMLNode* psIter = psListBucketResult->psChild;
+             psIter != nullptr; psIter = psIter->psNext )
         {
             if( psIter->eType != CXT_Element )
                 continue;
             if( strcmp(psIter->pszValue, "Contents") == 0 )
             {
-                bNonEmpty = true;
                 const char* pszKey = CPLGetXMLValue(psIter, "Key", nullptr);
+                if( bIsTruncated && nRecurseDepth < 0 && pszKey )
+                {
+                    osNextMarker = pszKey;
+                }
                 if( pszKey && strlen(pszKey) > osPrefix.size() )
                 {
-                    FileProp prop;
-                    prop.eExists = EXIST_YES;
-                    prop.bHasComputedFileSize = true;
-                    prop.fileSize = static_cast<GUIntBig>(
+                    const char* pszStorageClass = CPLGetXMLValue(psIter,
+                        "StorageClass", "");
+                    if( bIgnoreGlacierStorageClass &&
+                        EQUAL(pszStorageClass, "GLACIER") )
+                    {
+                        continue;
+                    }
+
+                    aoEntries.push_back(
+                        std::unique_ptr<VSIDIREntry>(new VSIDIREntry()));
+                    auto& entry = aoEntries.back();
+                    entry->pszName = CPLStrdup(pszKey + osPrefix.size());
+                    entry->nSize = static_cast<GUIntBig>(
                         CPLAtoGIntBig(CPLGetXMLValue(psIter, "Size", "0")));
-                    prop.bIsDirectory = false;
-                    prop.mTime = 0;
-                    prop.ETag = CPLGetXMLValue(psIter, "ETag", "");
-                    if( prop.ETag.size() > 2 && prop.ETag[0] == '"' &&
-                        prop.ETag.back() == '"')
+                    entry->bSizeKnown = true;
+                    entry->nMode = entry->pszName[0] != 0 &&
+                        entry->pszName[strlen(entry->pszName) - 1] == '/' ? S_IFDIR : S_IFREG;
+                    if( entry->nMode == S_IFDIR && aoNameCount[entry->pszName] < 2 )
                     {
-                        prop.ETag = prop.ETag.substr(1, prop.ETag.size()-2);
-#if DEBUG_VERBOSE
-                        CPLDebug("S3", "ETag for %s: %s",
-                                 pszKey, prop.ETag.c_str());
-#endif
+                        entry->pszName[strlen(entry->pszName) - 1] = 0;
+                    }
+                    entry->bModeKnown = true;
+
+                    CPLString ETag = CPLGetXMLValue(psIter, "ETag", "");
+                    if( ETag.size() > 2 && ETag[0] == '"' &&
+                        ETag.back() == '"')
+                    {
+                        ETag = ETag.substr(1, ETag.size()-2);
+                        entry->papszExtra = CSLSetNameValue(
+                            entry->papszExtra, "ETag", ETag.c_str());
                     }
 
                     int nYear = 0;
@@ -142,21 +246,32 @@ void VSICurlFilesystemHandler::AnalyseS3FileList(
                         brokendowntime.tm_hour = nHour;
                         brokendowntime.tm_min = nMin;
                         brokendowntime.tm_sec = nSec;
-                        prop.mTime =
-                            static_cast<time_t>(
-                                CPLYMDHMSToUnixTime(&brokendowntime));
+                        entry->nMTime =
+                                CPLYMDHMSToUnixTime(&brokendowntime);
+                        entry->bMTimeKnown = true;
                     }
 
-                    const char* pszStorageClass = CPLGetXMLValue(psIter,
-                        "StorageClass", "");
-                    if( !bIgnoreGlacierStorageClass ||
-                        !EQUAL(pszStorageClass, "GLACIER") )
+                    if( nMaxFiles != 1 )
                     {
-                        aoProps.push_back(
-                            std::pair<CPLString, FileProp>
-                                (pszKey + osPrefix.size(), prop));
-                        aoNameCount[pszKey + osPrefix.size()] ++;
+                        FileProp prop;
+                        prop.eExists = EXIST_YES;
+                        prop.bHasComputedFileSize = true;
+                        prop.fileSize = entry->nSize;
+                        prop.bIsDirectory = (entry->nMode == S_IFDIR);
+                        prop.mTime = static_cast<time_t>(entry->nMTime);
+                        prop.ETag = ETag;
+
+                        CPLString osCachedFilename =
+                            osBaseURL + CPLAWSURLEncode(osPrefix,false) +
+                            CPLAWSURLEncode(entry->pszName,false);
+#if DEBUG_VERBOSE
+                        CPLDebug(pszDebugPrefix, "Cache %s", osCachedFilename.c_str());
+#endif
+                        poFS->SetCachedFileProp(osCachedFilename, prop);
                     }
+
+                    if( nMaxFiles > 0 && aoEntries.size() >= static_cast<unsigned>(nMaxFiles) )
+                        break;
                 }
             }
             else if( strcmp(psIter->pszValue, "CommonPrefixes") == 0 )
@@ -169,64 +284,51 @@ void VSICurlFilesystemHandler::AnalyseS3FileList(
                         osKey.resize(osKey.size()-1);
                     if( osKey.size() > osPrefix.size() )
                     {
-                        FileProp prop;
-                        prop.eExists = EXIST_YES;
-                        prop.bIsDirectory = true;
-                        prop.bHasComputedFileSize = true;
-                        prop.fileSize = 0;
-                        prop.mTime = 0;
+                        aoEntries.push_back(
+                            std::unique_ptr<VSIDIREntry>(new VSIDIREntry()));
+                        auto& entry = aoEntries.back();
+                        entry->pszName = CPLStrdup(osKey.c_str() + osPrefix.size());
+                        if( aoNameCount[entry->pszName] == 2 )
+                        {
+                            // Add a / suffix to disambiguish the situation
+                            // Normally we don't suffix directories with /, but
+                            // we have no alternative here
+                            CPLString osTemp(entry->pszName);
+                            osTemp += '/';
+                            CPLFree(entry->pszName);
+                            entry->pszName = CPLStrdup(osTemp);
+                        }
+                        entry->nMode = S_IFDIR;
+                        entry->bModeKnown = true;
 
-                        aoProps.push_back(
-                            std::pair<CPLString, FileProp>
-                                (osKey.c_str() + osPrefix.size(), prop));
-                        aoNameCount[osKey.c_str() + osPrefix.size()] ++;
+                        if( nMaxFiles != 1 )
+                        {
+                            FileProp prop;
+                            prop.eExists = EXIST_YES;
+                            prop.bIsDirectory = true;
+                            prop.bHasComputedFileSize = true;
+                            prop.fileSize = 0;
+                            prop.mTime = 0;
+
+                            CPLString osCachedFilename =
+                                osBaseURL + CPLAWSURLEncode(osPrefix,false) +
+                                CPLAWSURLEncode(entry->pszName,false);
+#if DEBUG_VERBOSE
+                            CPLDebug(pszDebugPrefix, "Cache %s", osCachedFilename.c_str());
+#endif
+                            poFS->SetCachedFileProp(osCachedFilename, prop);
+                        }
+
+                        if( nMaxFiles > 0 && aoEntries.size() >= static_cast<unsigned>(nMaxFiles) )
+                            break;
                     }
                 }
             }
-
-            if( nMaxFiles > 0 && aoProps.size() >= static_cast<unsigned>(nMaxFiles) )
-                break;
         }
 
-        if( !(nMaxFiles > 0 && aoProps.size() >= static_cast<unsigned>(nMaxFiles)) )
+        if( nRecurseDepth == 0 )
         {
             osNextMarker = CPLGetXMLValue(psListBucketResult, "NextMarker", "");
-            bIsTruncated =
-                CPLTestBool(CPLGetXMLValue(psListBucketResult,
-                                           "IsTruncated", "false"));
-        }
-
-        for( size_t i = 0; i < aoProps.size(); i++ )
-        {
-            CPLString osSuffix;
-            if( aoNameCount[aoProps[i].first] == 2 &&
-                    aoProps[i].second.bIsDirectory )
-            {
-                // Add a / suffix to disambiguish the situation
-                // Normally we don't suffix directories with /, but we have
-                // no alternative here
-                osSuffix = "/";
-            }
-            if( nMaxFiles != 1 )
-            {
-                CPLString osCachedFilename =
-                        osBaseURL + CPLAWSURLEncode(osPrefix,false) + CPLAWSURLEncode(aoProps[i].first,false) + osSuffix;
-#if DEBUG_VERBOSE
-                CPLDebug("S3", "Cache %s", osCachedFilename.c_str());
-#endif
-                SetCachedFileProp(osCachedFilename, aoProps[i].second);
-            }
-            osFileList.AddString( (aoProps[i].first + osSuffix).c_str() );
-        }
-
-        // In the case of an empty directory, bNonEmpty will be set since
-        // there will be a <Contents> entry with the directory entry
-        // In the case of an empty bucket, then we should get an empty
-        // Prefix element.
-        if( osFileList.size() == 0 && (bNonEmpty || osPrefix.empty()) )
-        {
-            // To avoid an error to be reported
-            osFileList.AddString(".");
         }
     }
     else if( psListAllMyBucketsResultBuckets != nullptr )
@@ -241,32 +343,208 @@ void VSICurlFilesystemHandler::AnalyseS3FileList(
                 const char* pszName = CPLGetXMLValue(psIter, "Name", nullptr);
                 if( pszName )
                 {
-                    FileProp prop;
-                    prop.eExists = EXIST_YES;
-                    prop.bIsDirectory = true;
-                    prop.bHasComputedFileSize = true;
-                    prop.fileSize = 0;
-                    prop.mTime = 0;
-
-                    CPLString osCachedFilename = osBaseURL + CPLAWSURLEncode(pszName, false);
+                    aoEntries.push_back(
+                        std::unique_ptr<VSIDIREntry>(new VSIDIREntry()));
+                    auto& entry = aoEntries.back();
+                    entry->pszName = CPLStrdup(pszName);
+                    entry->nMode = S_IFDIR;
+                    entry->bModeKnown = true;
+
+                    if( nMaxFiles != 1 )
+                    {
+                        FileProp prop;
+                        prop.eExists = EXIST_YES;
+                        prop.bIsDirectory = true;
+                        prop.bHasComputedFileSize = true;
+                        prop.fileSize = 0;
+                        prop.mTime = 0;
+
+                        CPLString osCachedFilename = osBaseURL + CPLAWSURLEncode(pszName, false);
 #if DEBUG_VERBOSE
-                    CPLDebug("S3", "Cache %s", osCachedFilename.c_str());
+                        CPLDebug(pszDebugPrefix, "Cache %s", osCachedFilename.c_str());
 #endif
-                    SetCachedFileProp(osCachedFilename, prop);
+                        poFS->SetCachedFileProp(osCachedFilename, prop);
+                    }
+                }
+            }
+        }
+    }
+
+    CPLDestroyXMLNode(psTree);
+    return ret;
+}
+
+/************************************************************************/
+/*                          IssueListDir()                              */
+/************************************************************************/
+
+bool VSIDIRS3::IssueListDir()
+{
+    WriteFuncStruct sWriteFuncData;
+    CPLString osMaxKeys = CPLGetConfigOption("AWS_MAX_KEYS", "");
+    if( nMaxFiles > 0 && nMaxFiles <= 100 &&
+        (osMaxKeys.empty() || nMaxFiles < atoi(osMaxKeys)) )
+    {
+        osMaxKeys.Printf("%d", nMaxFiles);
+    }
+
+    const CPLString l_osNextMarker(osNextMarker);
+    clear();
+
+    while( true )
+    {
+        poS3HandleHelper->ResetQueryParameters();
+        CPLString osBaseURL(poS3HandleHelper->GetURL());
+
+        CURLM* hCurlMultiHandle = poFS->GetCurlMultiHandleFor(osBaseURL);
+        CURL* hCurlHandle = curl_easy_init();
+
+        if( !osBucket.empty() )
+        {
+            if( nRecurseDepth == 0 )
+                poS3HandleHelper->AddQueryParameter("delimiter", "/");
+            if( !l_osNextMarker.empty() )
+                poS3HandleHelper->AddQueryParameter("marker", l_osNextMarker);
+            if( !osMaxKeys.empty() )
+                poS3HandleHelper->AddQueryParameter("max-keys", osMaxKeys);
+            if( !osObjectKey.empty() )
+                poS3HandleHelper->AddQueryParameter("prefix", osObjectKey + "/");
+        }
+
+        struct curl_slist* headers =
+            VSICurlSetOptions(hCurlHandle, poS3HandleHelper->GetURL(), nullptr);
+        // Disable automatic redirection
+        curl_easy_setopt(hCurlHandle, CURLOPT_FOLLOWLOCATION, 0 );
+
+        curl_easy_setopt(hCurlHandle, CURLOPT_RANGE, nullptr);
+
+        VSICURLInitWriteFuncStruct(&sWriteFuncData, nullptr, nullptr, nullptr);
+        curl_easy_setopt(hCurlHandle, CURLOPT_WRITEDATA, &sWriteFuncData);
+        curl_easy_setopt(hCurlHandle, CURLOPT_WRITEFUNCTION,
+                         VSICurlHandleWriteFunc);
+
+        WriteFuncStruct sWriteFuncHeaderData;
+        VSICURLInitWriteFuncStruct(&sWriteFuncHeaderData, nullptr, nullptr, nullptr);
+        curl_easy_setopt(hCurlHandle, CURLOPT_HEADERDATA, &sWriteFuncHeaderData);
+        curl_easy_setopt(hCurlHandle, CURLOPT_HEADERFUNCTION,
+                         VSICurlHandleWriteFunc);
+
+        char szCurlErrBuf[CURL_ERROR_SIZE+1] = {};
+        curl_easy_setopt(hCurlHandle, CURLOPT_ERRORBUFFER, szCurlErrBuf );
+
+        headers = VSICurlMergeHeaders(headers,
+                               poS3HandleHelper->GetCurlHeaders("GET", headers));
+        curl_easy_setopt(hCurlHandle, CURLOPT_HTTPHEADER, headers);
+
+        MultiPerform(hCurlMultiHandle, hCurlHandle);
+
+        VSICURLResetHeaderAndWriterFunctions(hCurlHandle);
 
-                    osFileList.AddString( pszName );
+        curl_slist_free_all(headers);
+
+        if( sWriteFuncData.pBuffer == nullptr)
+        {
+            curl_easy_cleanup(hCurlHandle);
+            CPLFree(sWriteFuncHeaderData.pBuffer);
+            return false;
+        }
+
+        long response_code = 0;
+        curl_easy_getinfo(hCurlHandle, CURLINFO_HTTP_CODE, &response_code);
+        if( response_code != 200 )
+        {
+            bool bUpdateMap = true;
+            if( sWriteFuncData.pBuffer != nullptr &&
+                poS3HandleHelper->CanRestartOnError(sWriteFuncData.pBuffer,
+                                                    sWriteFuncHeaderData.pBuffer,
+                                                    false, &bUpdateMap) )
+            {
+                if( bUpdateMap )
+                {
+                    poS3FS->UpdateMapFromHandle(poS3HandleHelper);
                 }
+                CPLFree(sWriteFuncData.pBuffer);
+                CPLFree(sWriteFuncHeaderData.pBuffer);
+            }
+            else
+            {
+                CPLDebug(poS3FS->GetDebugKey(), "%s",
+                         sWriteFuncData.pBuffer
+                         ? sWriteFuncData.pBuffer : "(null)");
+                CPLFree(sWriteFuncData.pBuffer);
+                CPLFree(sWriteFuncHeaderData.pBuffer);
+                curl_easy_cleanup(hCurlHandle);
+                return false;
             }
         }
+        else
+        {
+            const bool bIgnoreGlacier = CPLTestBool(
+                CPLGetConfigOption("CPL_VSIL_CURL_IGNORE_GLACIER_STORAGE", "YES"));
+            bool bIsTruncated;
+            bool ret = AnalyseS3FileList( osBaseURL,
+                                          sWriteFuncData.pBuffer,
+                                          bIgnoreGlacier,
+                                          bIsTruncated );
+
+            CPLFree(sWriteFuncData.pBuffer);
+            CPLFree(sWriteFuncHeaderData.pBuffer);
+
+            curl_easy_cleanup(hCurlHandle);
+            return ret;
+        }
+
+        curl_easy_cleanup(hCurlHandle);
+    }
+}
+
+/************************************************************************/
+/*                           NextDirEntry()                             */
+/************************************************************************/
 
-        if( osFileList.size() == 0 )
+const VSIDIREntry* VSIDIRS3::NextDirEntry()
+{
+    while( true )
+    {
+        if( nPos < static_cast<int>(aoEntries.size()) )
+        {
+            auto& entry = aoEntries[nPos];
+            nPos ++;
+            return entry.get();
+        }
+        if( osNextMarker.empty() )
         {
-            // To avoid an error to be reported
-            osFileList.AddString(".");
+            return nullptr;
+        }
+        if( !IssueListDir() )
+        {
+            return nullptr;
         }
     }
+}
 
-    CPLDestroyXMLNode(psTree);
+/************************************************************************/
+/*                          AnalyseS3FileList()                         */
+/************************************************************************/
+
+bool VSICurlFilesystemHandler::AnalyseS3FileList(
+    const CPLString& osBaseURL,
+    const char* pszXML,
+    CPLStringList& osFileList,
+    int nMaxFiles,
+    bool bIgnoreGlacierStorageClass,
+    bool& bIsTruncated )
+{
+    VSIDIRS3 oDir(this);
+    oDir.nMaxFiles = nMaxFiles;
+    bool ret =
+        oDir.AnalyseS3FileList(osBaseURL, pszXML,
+                               bIgnoreGlacierStorageClass, bIsTruncated);
+    for(const auto &entry: oDir.aoEntries )
+    {
+        osFileList.AddString(entry->pszName);
+    }
+    return ret;
 }
 
 /************************************************************************/
@@ -1683,9 +1961,52 @@ char** IVSIS3LikeFSHandler::GetFileList( const char *pszDirname,
 {
     if( ENABLE_DEBUG )
         CPLDebug(GetDebugKey(), "GetFileList(%s)" , pszDirname);
+
     *pbGotFileList = false;
-    CPLAssert( strlen(pszDirname) >= GetFSPrefix().size() );
-    CPLString osDirnameWithoutPrefix = pszDirname + GetFSPrefix().size();
+
+    char** papszOptions = CSLSetNameValue(nullptr,
+                                "MAXFILES", CPLSPrintf("%d", nMaxFiles));
+    auto dir = OpenDir(pszDirname, 0, papszOptions);
+    CSLDestroy(papszOptions);
+    if( !dir )
+    {
+        return nullptr;
+    }
+    CPLStringList aosFileList;
+    while( true )
+    {
+        auto entry = dir->NextDirEntry();
+        if( !entry )
+        {
+            break;
+        }
+        aosFileList.AddString(entry->pszName);
+
+        if( nMaxFiles > 0 && aosFileList.size() >= nMaxFiles )
+            break;
+    }
+    delete dir;
+    *pbGotFileList = true;
+    return aosFileList.StealList();
+}
+
+/************************************************************************/
+/*                            OpenDir()                                 */
+/************************************************************************/
+
+VSIDIR* IVSIS3LikeFSHandler::OpenDir( const char *pszPath,
+                                      int nRecurseDepth,
+                                      const char* const *papszOptions)
+{
+    if( nRecurseDepth > 0)
+    {
+        return VSIFilesystemHandler::OpenDir(pszPath, nRecurseDepth, papszOptions);
+    }
+
+    if( !STARTS_WITH_CI(pszPath, GetFSPrefix()) )
+        return nullptr;
+
+    CPLString osDirnameWithoutPrefix = pszPath + GetFSPrefix().size();
     if( !osDirnameWithoutPrefix.empty() &&
                                 osDirnameWithoutPrefix.back() == '/' )
     {
@@ -1709,142 +2030,20 @@ char** IVSIS3LikeFSHandler::GetFileList( const char *pszDirname,
     }
     UpdateHandleFromMap(poS3HandleHelper);
 
-    WriteFuncStruct sWriteFuncData;
-
-    CPLStringList osFileList; // must be left in this scope !
-    CPLString osNextMarker; // must be left in this scope !
-
-    CPLString osMaxKeys = CPLGetConfigOption("AWS_MAX_KEYS", "");
-    if( nMaxFiles > 0 && nMaxFiles <= 100 &&
-        (osMaxKeys.empty() || nMaxFiles < atoi(osMaxKeys)) )
+    VSIDIRS3* dir = new VSIDIRS3(this);
+    dir->nRecurseDepth = nRecurseDepth;
+    dir->poFS = this;
+    dir->poS3HandleHelper = poS3HandleHelper;
+    dir->osBucket = osBucket;
+    dir->osObjectKey = osObjectKey;
+    dir->nMaxFiles = atoi(CSLFetchNameValueDef(papszOptions, "MAXFILES", "0"));
+    if( !dir->IssueListDir() )
     {
-        osMaxKeys.Printf("%d", nMaxFiles);
+        delete dir;
+        return nullptr;
     }
 
-    while( true )
-    {
-        poS3HandleHelper->ResetQueryParameters();
-        CPLString osBaseURL(poS3HandleHelper->GetURL());
-
-        CURLM* hCurlMultiHandle = GetCurlMultiHandleFor(osBaseURL);
-        CURL* hCurlHandle = curl_easy_init();
-
-        if( !osBucket.empty() )
-        {
-            poS3HandleHelper->AddQueryParameter("delimiter", "/");
-            if( !osNextMarker.empty() )
-                poS3HandleHelper->AddQueryParameter("marker", osNextMarker);
-            if( !osMaxKeys.empty() )
-                poS3HandleHelper->AddQueryParameter("max-keys", osMaxKeys);
-            if( !osObjectKey.empty() )
-                poS3HandleHelper->AddQueryParameter("prefix", osObjectKey + "/");
-        }
-
-        struct curl_slist* headers =
-            VSICurlSetOptions(hCurlHandle, poS3HandleHelper->GetURL(), nullptr);
-        // Disable automatic redirection
-        curl_easy_setopt(hCurlHandle, CURLOPT_FOLLOWLOCATION, 0 );
-
-        curl_easy_setopt(hCurlHandle, CURLOPT_RANGE, nullptr);
-
-        VSICURLInitWriteFuncStruct(&sWriteFuncData, nullptr, nullptr, nullptr);
-        curl_easy_setopt(hCurlHandle, CURLOPT_WRITEDATA, &sWriteFuncData);
-        curl_easy_setopt(hCurlHandle, CURLOPT_WRITEFUNCTION,
-                         VSICurlHandleWriteFunc);
-
-        WriteFuncStruct sWriteFuncHeaderData;
-        VSICURLInitWriteFuncStruct(&sWriteFuncHeaderData, nullptr, nullptr, nullptr);
-        curl_easy_setopt(hCurlHandle, CURLOPT_HEADERDATA, &sWriteFuncHeaderData);
-        curl_easy_setopt(hCurlHandle, CURLOPT_HEADERFUNCTION,
-                         VSICurlHandleWriteFunc);
-
-        char szCurlErrBuf[CURL_ERROR_SIZE+1] = {};
-        curl_easy_setopt(hCurlHandle, CURLOPT_ERRORBUFFER, szCurlErrBuf );
-
-        headers = VSICurlMergeHeaders(headers,
-                               poS3HandleHelper->GetCurlHeaders("GET", headers));
-        curl_easy_setopt(hCurlHandle, CURLOPT_HTTPHEADER, headers);
-
-        MultiPerform(hCurlMultiHandle, hCurlHandle);
-
-        VSICURLResetHeaderAndWriterFunctions(hCurlHandle);
-
-        curl_slist_free_all(headers);
-
-        if( sWriteFuncData.pBuffer == nullptr)
-        {
-            delete poS3HandleHelper;
-            curl_easy_cleanup(hCurlHandle);
-            CPLFree(sWriteFuncHeaderData.pBuffer);
-            return nullptr;
-        }
-
-        long response_code = 0;
-        curl_easy_getinfo(hCurlHandle, CURLINFO_HTTP_CODE, &response_code);
-        if( response_code != 200 )
-        {
-            bool bUpdateMap = true;
-            if( sWriteFuncData.pBuffer != nullptr &&
-                poS3HandleHelper->CanRestartOnError(sWriteFuncData.pBuffer,
-                                                    sWriteFuncHeaderData.pBuffer,
-                                                    false, &bUpdateMap) )
-            {
-                if( bUpdateMap )
-                {
-                    UpdateMapFromHandle(poS3HandleHelper);
-                }
-                CPLFree(sWriteFuncData.pBuffer);
-                CPLFree(sWriteFuncHeaderData.pBuffer);
-            }
-            else
-            {
-                CPLDebug(GetDebugKey(), "%s",
-                         sWriteFuncData.pBuffer
-                         ? sWriteFuncData.pBuffer : "(null)");
-                CPLFree(sWriteFuncData.pBuffer);
-                CPLFree(sWriteFuncHeaderData.pBuffer);
-                delete poS3HandleHelper;
-                curl_easy_cleanup(hCurlHandle);
-                return nullptr;
-            }
-        }
-        else
-        {
-            *pbGotFileList = true;
-            bool bIsTruncated;
-            const bool bIgnoreGlacier = CPLTestBool(
-                CPLGetConfigOption("CPL_VSIL_CURL_IGNORE_GLACIER_STORAGE", "YES"));
-            AnalyseS3FileList( osBaseURL,
-                               sWriteFuncData.pBuffer,
-                               osFileList,
-                               nMaxFiles,
-                               bIgnoreGlacier,
-                               bIsTruncated,
-                               osNextMarker );
-
-            CPLFree(sWriteFuncData.pBuffer);
-            CPLFree(sWriteFuncHeaderData.pBuffer);
-
-            if( osNextMarker.empty() )
-            {
-                if( !osFileList.empty() )
-                {
-                    FileProp cachedFileProp;
-                    GetCachedFileProp(GetURLFromFilename(pszDirname), cachedFileProp);
-                    cachedFileProp.eExists = EXIST_YES;
-                    cachedFileProp.bIsDirectory = true;
-                    cachedFileProp.bHasComputedFileSize = true;
-                    SetCachedFileProp(GetURLFromFilename(pszDirname), cachedFileProp);
-                }
-
-                delete poS3HandleHelper;
-                curl_easy_cleanup(hCurlHandle);
-                return osFileList.StealList();
-            }
-        }
-
-        curl_easy_cleanup(hCurlHandle);
-    }
+    return dir;
 }
 
 /************************************************************************/
diff --git a/gdal/port/cpl_vsil_swift.cpp b/gdal/port/cpl_vsil_swift.cpp
index 9e0f5c5cdeba..6f5cd419d7db 100644
--- a/gdal/port/cpl_vsil_swift.cpp
+++ b/gdal/port/cpl_vsil_swift.cpp
@@ -205,12 +205,6 @@ void VSICurlFilesystemHandler::AnalyseSwiftFileList(
         }
         osFileList.AddString( (aoProps[i].first + osSuffix).c_str() );
     }
-
-    if( osFileList.size() == 0 )
-    {
-        // To avoid an error to be reported
-        osFileList.AddString(".");
-    }
 }
 
 /************************************************************************/
@@ -249,6 +243,13 @@ class VSISwiftFSHandler final : public IVSIS3LikeFSHandler
         int Stat( const char *pszFilename, VSIStatBufL *pStatBuf,
                 int nFlags ) override;
 
+        VSIDIR* OpenDir( const char *pszPath, int nRecurseDepth,
+                                const char* const *papszOptions) override
+        {
+            return VSICurlFilesystemHandler::OpenDir(pszPath, nRecurseDepth,
+                                                     papszOptions);
+        }
+
         const char* GetOptions() override;
 };
 
diff --git a/gdal/port/vsipreload.cpp b/gdal/port/vsipreload.cpp
index e528ee311b30..ec8e50d72a64 100644
--- a/gdal/port/vsipreload.cpp
+++ b/gdal/port/vsipreload.cpp
@@ -145,14 +145,14 @@ typedef struct
     struct dirent ent;
     struct dirent64 ent64;
     int    fd;
-} VSIDIR;
+} VSIDIRPreload;
 
 std::set<VSILFILE*> oSetFiles;
 std::map<int, VSILFILE*> oMapfdToVSI;
 std::map<VSILFILE*, int> oMapVSITofd;
 std::map<VSILFILE*, std::string> oMapVSIToString;
-std::set<VSIDIR*> oSetVSIDIR;
-std::map<int, VSIDIR*> oMapfdToVSIDIR;
+std::set<VSIDIRPreload*> oSetVSIDIRPreload;
+std::map<int, VSIDIRPreload*> oMapfdToVSIDIRPreload;
 std::map<int, std::string> oMapDirFdToName;
 std::string osCurDir;
 
@@ -366,13 +366,13 @@ static bool GET_DEBUG_VSIPRELOAD_COND(VSILFILE* fpVSIL)
     return DEBUG_VSIPRELOAD && (!DEBUG_VSIPRELOAD_ONLY_VSIL || fpVSIL != nullptr);
 }
 
-static bool GET_DEBUG_VSIPRELOAD_COND(VSIDIR* dirP)
+static bool GET_DEBUG_VSIPRELOAD_COND(VSIDIRPreload* dirP)
 {
     return
         DEBUG_VSIPRELOAD &&
     // cppcheck-suppress knownConditionTrueFalse
         (!DEBUG_VSIPRELOAD_ONLY_VSIL ||
-         oSetVSIDIR.find(dirP) != oSetVSIDIR.end());
+         oSetVSIDIRPreload.find(dirP) != oSetVSIDIRPreload.end());
 }
 
 /************************************************************************/
@@ -1081,7 +1081,7 @@ int CPL_DLL close( int fd )
     int DEBUG_VSIPRELOAD_COND = GET_DEBUG_VSIPRELOAD_COND(fpVSIL);
     {
         CPLLockHolderD(&hLock, LOCK_RECURSIVE_MUTEX);
-        assert( oMapfdToVSIDIR.find(fd) == oMapfdToVSIDIR.end() );
+        assert( oMapfdToVSIDIRPreload.find(fd) == oMapfdToVSIDIRPreload.end() );
 
         // cppcheck-suppress redundantIfRemove
         if( oMapDirFdToName.find(fd) != oMapDirFdToName.end())
@@ -1456,14 +1456,14 @@ DIR CPL_DLL *opendir( const char *name )
             ret = nullptr;
         else
         {
-            VSIDIR* mydir = static_cast<VSIDIR *>(malloc(sizeof(VSIDIR)));
+            VSIDIRPreload* mydir = static_cast<VSIDIRPreload *>(malloc(sizeof(VSIDIRPreload)));
             mydir->pszDirname = CPLStrdup(name);
             mydir->papszDir = papszDir;
             mydir->nIter = 0;
             mydir->fd = -1;
             ret = (DIR*)mydir;
             CPLLockHolderD(&hLock, LOCK_RECURSIVE_MUTEX);
-            oSetVSIDIR.insert(mydir);
+            oSetVSIDIRPreload.insert(mydir);
         }
     }
     else
@@ -1479,7 +1479,7 @@ DIR CPL_DLL *opendir( const char *name )
 /*                             filldir()                                */
 /************************************************************************/
 
-static bool filldir( VSIDIR* mydir )
+static bool filldir( VSIDIRPreload* mydir )
 {
     int DEBUG_VSIPRELOAD_COND = GET_DEBUG_VSIPRELOAD_COND(mydir);
     char* pszName = mydir->papszDir[mydir->nIter++];
@@ -1515,11 +1515,11 @@ static bool filldir( VSIDIR* mydir )
 struct dirent CPL_DLL *readdir( DIR *dirp )
 {
     myinit();
-    int DEBUG_VSIPRELOAD_COND = GET_DEBUG_VSIPRELOAD_COND((VSIDIR*)dirp);
+    int DEBUG_VSIPRELOAD_COND = GET_DEBUG_VSIPRELOAD_COND((VSIDIRPreload*)dirp);
     if( DEBUG_VSIPRELOAD_COND ) fprintf(stderr, "readdir(%p)\n", dirp);
-    if( oSetVSIDIR.find((VSIDIR*)dirp) != oSetVSIDIR.end() )
+    if( oSetVSIDIRPreload.find((VSIDIRPreload*)dirp) != oSetVSIDIRPreload.end() )
     {
-        VSIDIR* mydir = (VSIDIR*)dirp;
+        VSIDIRPreload* mydir = (VSIDIRPreload*)dirp;
         if( !filldir(mydir) )
             return nullptr;
 
@@ -1536,11 +1536,11 @@ struct dirent CPL_DLL *readdir( DIR *dirp )
 struct dirent64 CPL_DLL *readdir64( DIR *dirp )
 {
     myinit();
-    int DEBUG_VSIPRELOAD_COND = GET_DEBUG_VSIPRELOAD_COND((VSIDIR*)dirp);
+    int DEBUG_VSIPRELOAD_COND = GET_DEBUG_VSIPRELOAD_COND((VSIDIRPreload*)dirp);
     if( DEBUG_VSIPRELOAD_COND ) fprintf(stderr, "readdir64(%p)\n", dirp);
-    if( oSetVSIDIR.find((VSIDIR*)dirp) != oSetVSIDIR.end() )
+    if( oSetVSIDIRPreload.find((VSIDIRPreload*)dirp) != oSetVSIDIRPreload.end() )
     {
-        VSIDIR* mydir = (VSIDIR*)dirp;
+        VSIDIRPreload* mydir = (VSIDIRPreload*)dirp;
         if( !filldir(mydir) )
             return nullptr;
 
@@ -1557,20 +1557,20 @@ struct dirent64 CPL_DLL *readdir64( DIR *dirp )
 int CPL_DLL closedir( DIR *dirp )
 {
     myinit();
-    int DEBUG_VSIPRELOAD_COND = GET_DEBUG_VSIPRELOAD_COND((VSIDIR*)dirp);
+    int DEBUG_VSIPRELOAD_COND = GET_DEBUG_VSIPRELOAD_COND((VSIDIRPreload*)dirp);
     if( DEBUG_VSIPRELOAD_COND ) fprintf(stderr, "closedir(%p)\n", dirp);
-    if( oSetVSIDIR.find((VSIDIR*)dirp) != oSetVSIDIR.end() )
+    if( oSetVSIDIRPreload.find((VSIDIRPreload*)dirp) != oSetVSIDIRPreload.end() )
     {
-        VSIDIR* mydir = (VSIDIR*)dirp;
+        VSIDIRPreload* mydir = (VSIDIRPreload*)dirp;
         CPLFree(mydir->pszDirname);
         CSLDestroy(mydir->papszDir);
         CPLLockHolderD(&hLock, LOCK_RECURSIVE_MUTEX);
         if( mydir->fd >= 0 )
         {
-            oMapfdToVSIDIR.erase(mydir->fd);
+            oMapfdToVSIDIRPreload.erase(mydir->fd);
             close(mydir->fd);
         }
-        oSetVSIDIR.erase(mydir);
+        oSetVSIDIRPreload.erase(mydir);
         free(mydir);
         return 0;
     }
@@ -1585,17 +1585,17 @@ int CPL_DLL closedir( DIR *dirp )
 int CPL_DLL dirfd( DIR *dirp )
 {
     myinit();
-    int DEBUG_VSIPRELOAD_COND = GET_DEBUG_VSIPRELOAD_COND((VSIDIR*)dirp);
+    int DEBUG_VSIPRELOAD_COND = GET_DEBUG_VSIPRELOAD_COND((VSIDIRPreload*)dirp);
     if( DEBUG_VSIPRELOAD_COND ) fprintf(stderr, "dirfd(%p)\n", dirp);
     int ret = 0;
-    if( oSetVSIDIR.find((VSIDIR*)dirp) != oSetVSIDIR.end() )
+    if( oSetVSIDIRPreload.find((VSIDIRPreload*)dirp) != oSetVSIDIRPreload.end() )
     {
-        VSIDIR* mydir = (VSIDIR*)dirp;
+        VSIDIRPreload* mydir = (VSIDIRPreload*)dirp;
         if( mydir->fd < 0 )
         {
             mydir->fd = open("/dev/zero", O_RDONLY);
             CPLLockHolderD(&hLock, LOCK_RECURSIVE_MUTEX);
-            oMapfdToVSIDIR[mydir->fd] = mydir;
+            oMapfdToVSIDIRPreload[mydir->fd] = mydir;
         }
         ret = mydir->fd;
     }
@@ -1611,11 +1611,11 @@ int CPL_DLL dirfd( DIR *dirp )
 
 int CPL_DLL fchdir( int fd )
 {
-    VSIDIR* mydir = nullptr;
+    VSIDIRPreload* mydir = nullptr;
     {
         CPLLockHolderD(&hLock, LOCK_RECURSIVE_MUTEX);
-        if( oMapfdToVSIDIR.find(fd) != oMapfdToVSIDIR.end() )
-            mydir = oMapfdToVSIDIR[fd];
+        if( oMapfdToVSIDIRPreload.find(fd) != oMapfdToVSIDIRPreload.end() )
+            mydir = oMapfdToVSIDIRPreload[fd];
     }
     int DEBUG_VSIPRELOAD_COND = GET_DEBUG_VSIPRELOAD_COND(mydir);
     std::string name;
diff --git a/gdal/swig/include/cpl.i b/gdal/swig/include/cpl.i
index 4bd2d194cfcb..57cc06e82793 100644
--- a/gdal/swig/include/cpl.i
+++ b/gdal/swig/include/cpl.i
@@ -334,6 +334,104 @@ char **wrapper_VSIReadDirEx( const char * utf8_path, int nMaxFiles = 0 )
 char **VSIReadDirRecursive( const char * utf8_path );
 %clear char **;
 
+#ifdef SWIGPYTHON
+%rename (OpenDir) wrapper_VSIOpenDir;
+%inline {
+VSIDIR* wrapper_VSIOpenDir( const char * utf8_path,
+                            int nRecurseDepth = -1,
+                            char** options = NULL )
+{
+    return VSIOpenDir(utf8_path, nRecurseDepth, options);
+}
+}
+
+%{
+typedef struct
+{
+    char*        name;
+    int          mode;
+    GIntBig      size;
+    GIntBig      mtime;
+    bool         modeKnown;
+    bool         sizeKnown;
+    bool         mtimeKnown;
+    char**       extra;
+} DirEntry;
+%}
+
+struct DirEntry
+{
+%immutable;
+    char*        name;
+    int          mode;
+    GIntBig      size;
+    GIntBig      mtime;
+    bool         modeKnown;
+    bool         sizeKnown;
+    bool         mtimeKnown;
+
+%apply (char **dict) {char **};
+    char**       extra;
+%clear char **;
+%mutable;
+
+%extend {
+  DirEntry( const DirEntry *entryIn ) {
+    DirEntry *self = (DirEntry*) CPLMalloc( sizeof( DirEntry ) );
+    self->name = CPLStrdup(entryIn->name);
+    self->mode = entryIn->mode;
+    self->size = entryIn->size;
+    self->mtime = entryIn->mtime;
+    self->modeKnown = entryIn->modeKnown;
+    self->sizeKnown = entryIn->sizeKnown;
+    self->mtimeKnown = entryIn->mtimeKnown;
+    self->extra = CSLDuplicate(entryIn->extra);
+    return self;
+  }
+
+  ~DirEntry() {
+    CPLFree(self->name);
+    CSLDestroy(self->extra);
+    CPLFree(self);
+  }
+
+  bool IsDirectory()
+  {
+     return (self->mode & S_IFDIR) != 0;
+  }
+
+} /* extend */
+} /* DirEntry */ ;
+
+%rename (GetNextDirEntry) wrapper_VSIGetNextDirEntry;
+%newobject wrapper_VSIGetNextDirEntry;
+%apply Pointer NONNULL {VSIDIR* dir};
+%inline {
+DirEntry* wrapper_VSIGetNextDirEntry(VSIDIR* dir)
+{
+    const VSIDIREntry* vsiEntry = VSIGetNextDirEntry(dir);
+    if( vsiEntry == nullptr )
+    {
+        return nullptr;
+    }
+    DirEntry* entry = (DirEntry*) CPLMalloc( sizeof( DirEntry ) );
+    entry->name = CPLStrdup(vsiEntry->pszName);
+    entry->mode = vsiEntry->nMode;
+    entry->size = vsiEntry->nSize;
+    entry->mtime = vsiEntry->nMTime;
+    entry->modeKnown = vsiEntry->bModeKnown == TRUE;
+    entry->sizeKnown = vsiEntry->bSizeKnown == TRUE;
+    entry->mtimeKnown = vsiEntry->bMTimeKnown == TRUE;
+    entry->extra = CSLDuplicate(vsiEntry->papszExtra);
+    return entry;
+}
+}
+
+%rename (CloseDir) VSICloseDir;
+void VSICloseDir(VSIDIR* dir);
+
+#endif
+
 %apply Pointer NONNULL {const char * pszKey};
 void CPLSetConfigOption( const char * pszKey, const char * pszValue );
 
diff --git a/gdal/swig/include/python/gdal_python.i b/gdal/swig/include/python/gdal_python.i
index 3014812bbd59..28f41b7825d2 100644
--- a/gdal/swig/include/python/gdal_python.i
+++ b/gdal/swig/include/python/gdal_python.i
@@ -127,6 +127,23 @@ static void update_buffer_size(void* obj, char* data, char* data_aligned, size_t
     src_ds = None
 
     return 0
+
+  def listdir(path, recursionLevel = -1, options = []):
+    """ Iterate over a directory.
+
+        recursionLevel = -1 means unlimited level of recursion.
+    """
+    dir = OpenDir(path, recursionLevel, options)
+    if not dir:
+        raise OSError(path + ' does not exist')
+    try:
+        while True:
+            entry = GetNextDirEntry(dir)
+            if not entry:
+                break
+            yield entry
+    finally:
+        CloseDir(dir)
 %}
 
 %{
diff --git a/gdal/swig/python/extensions/gdal_wrap.cpp b/gdal/swig/python/extensions/gdal_wrap.cpp
index 87f5ba6fb95e..7a0d1ca6ec8f 100644
--- a/gdal/swig/python/extensions/gdal_wrap.cpp
+++ b/gdal/swig/python/extensions/gdal_wrap.cpp
@@ -3014,52 +3014,54 @@ SWIG_Python_NonDynamicSetAttr(PyObject *obj, PyObject *name, PyObject *value) {
 #define SWIGTYPE_p_CPLErrorHandler swig_types[0]
 #define SWIGTYPE_p_CPLVirtualMemShadow swig_types[1]
 #define SWIGTYPE_p_CPLXMLNode swig_types[2]
-#define SWIGTYPE_p_GByte swig_types[3]
-#define SWIGTYPE_p_GDALAsyncReaderShadow swig_types[4]
-#define SWIGTYPE_p_GDALBuildVRTOptions swig_types[5]
-#define SWIGTYPE_p_GDALColorEntry swig_types[6]
-#define SWIGTYPE_p_GDALColorTableShadow swig_types[7]
-#define SWIGTYPE_p_GDALDEMProcessingOptions swig_types[8]
-#define SWIGTYPE_p_GDALDatasetShadow swig_types[9]
-#define SWIGTYPE_p_GDALDriverShadow swig_types[10]
-#define SWIGTYPE_p_GDALGridOptions swig_types[11]
-#define SWIGTYPE_p_GDALInfoOptions swig_types[12]
-#define SWIGTYPE_p_GDALMajorObjectShadow swig_types[13]
-#define SWIGTYPE_p_GDALNearblackOptions swig_types[14]
-#define SWIGTYPE_p_GDALProgressFunc swig_types[15]
-#define SWIGTYPE_p_GDALRasterAttributeTableShadow swig_types[16]
-#define SWIGTYPE_p_GDALRasterBandShadow swig_types[17]
-#define SWIGTYPE_p_GDALRasterizeOptions swig_types[18]
-#define SWIGTYPE_p_GDALTransformerInfoShadow swig_types[19]
-#define SWIGTYPE_p_GDALTranslateOptions swig_types[20]
-#define SWIGTYPE_p_GDALVectorTranslateOptions swig_types[21]
-#define SWIGTYPE_p_GDALWarpAppOptions swig_types[22]
-#define SWIGTYPE_p_GDAL_GCP swig_types[23]
-#define SWIGTYPE_p_GIntBig swig_types[24]
-#define SWIGTYPE_p_GUIntBig swig_types[25]
-#define SWIGTYPE_p_OGRFeatureShadow swig_types[26]
-#define SWIGTYPE_p_OGRGeometryShadow swig_types[27]
-#define SWIGTYPE_p_OGRLayerShadow swig_types[28]
-#define SWIGTYPE_p_OGRStyleTableShadow swig_types[29]
-#define SWIGTYPE_p_OSRSpatialReferenceShadow swig_types[30]
-#define SWIGTYPE_p_StatBuf swig_types[31]
-#define SWIGTYPE_p_VSILFILE swig_types[32]
-#define SWIGTYPE_p_char swig_types[33]
-#define SWIGTYPE_p_double swig_types[34]
-#define SWIGTYPE_p_f_double_p_q_const__char_p_void__int swig_types[35]
-#define SWIGTYPE_p_int swig_types[36]
-#define SWIGTYPE_p_p_GByte swig_types[37]
-#define SWIGTYPE_p_p_GDALDatasetShadow swig_types[38]
-#define SWIGTYPE_p_p_GDALRasterBandShadow swig_types[39]
-#define SWIGTYPE_p_p_GDAL_GCP swig_types[40]
-#define SWIGTYPE_p_p_GUIntBig swig_types[41]
-#define SWIGTYPE_p_p_OGRLayerShadow swig_types[42]
-#define SWIGTYPE_p_p_char swig_types[43]
-#define SWIGTYPE_p_p_void swig_types[44]
-#define SWIGTYPE_p_size_t swig_types[45]
-#define SWIGTYPE_p_vsi_l_offset swig_types[46]
-static swig_type_info *swig_types[48];
-static swig_module_info swig_module = {swig_types, 47, 0, 0, 0, 0};
+#define SWIGTYPE_p_DirEntry swig_types[3]
+#define SWIGTYPE_p_GByte swig_types[4]
+#define SWIGTYPE_p_GDALAsyncReaderShadow swig_types[5]
+#define SWIGTYPE_p_GDALBuildVRTOptions swig_types[6]
+#define SWIGTYPE_p_GDALColorEntry swig_types[7]
+#define SWIGTYPE_p_GDALColorTableShadow swig_types[8]
+#define SWIGTYPE_p_GDALDEMProcessingOptions swig_types[9]
+#define SWIGTYPE_p_GDALDatasetShadow swig_types[10]
+#define SWIGTYPE_p_GDALDriverShadow swig_types[11]
+#define SWIGTYPE_p_GDALGridOptions swig_types[12]
+#define SWIGTYPE_p_GDALInfoOptions swig_types[13]
+#define SWIGTYPE_p_GDALMajorObjectShadow swig_types[14]
+#define SWIGTYPE_p_GDALNearblackOptions swig_types[15]
+#define SWIGTYPE_p_GDALProgressFunc swig_types[16]
+#define SWIGTYPE_p_GDALRasterAttributeTableShadow swig_types[17]
+#define SWIGTYPE_p_GDALRasterBandShadow swig_types[18]
+#define SWIGTYPE_p_GDALRasterizeOptions swig_types[19]
+#define SWIGTYPE_p_GDALTransformerInfoShadow swig_types[20]
+#define SWIGTYPE_p_GDALTranslateOptions swig_types[21]
+#define SWIGTYPE_p_GDALVectorTranslateOptions swig_types[22]
+#define SWIGTYPE_p_GDALWarpAppOptions swig_types[23]
+#define SWIGTYPE_p_GDAL_GCP swig_types[24]
+#define SWIGTYPE_p_GIntBig swig_types[25]
+#define SWIGTYPE_p_GUIntBig swig_types[26]
+#define SWIGTYPE_p_OGRFeatureShadow swig_types[27]
+#define SWIGTYPE_p_OGRGeometryShadow swig_types[28]
+#define SWIGTYPE_p_OGRLayerShadow swig_types[29]
+#define SWIGTYPE_p_OGRStyleTableShadow swig_types[30]
+#define SWIGTYPE_p_OSRSpatialReferenceShadow swig_types[31]
+#define SWIGTYPE_p_StatBuf swig_types[32]
+#define SWIGTYPE_p_VSIDIR swig_types[33]
+#define SWIGTYPE_p_VSILFILE swig_types[34]
+#define SWIGTYPE_p_char swig_types[35]
+#define SWIGTYPE_p_double swig_types[36]
+#define SWIGTYPE_p_f_double_p_q_const__char_p_void__int swig_types[37]
+#define SWIGTYPE_p_int swig_types[38]
+#define SWIGTYPE_p_p_GByte swig_types[39]
+#define SWIGTYPE_p_p_GDALDatasetShadow swig_types[40]
+#define SWIGTYPE_p_p_GDALRasterBandShadow swig_types[41]
+#define SWIGTYPE_p_p_GDAL_GCP swig_types[42]
+#define SWIGTYPE_p_p_GUIntBig swig_types[43]
+#define SWIGTYPE_p_p_OGRLayerShadow swig_types[44]
+#define SWIGTYPE_p_p_char swig_types[45]
+#define SWIGTYPE_p_p_void swig_types[46]
+#define SWIGTYPE_p_size_t swig_types[47]
+#define SWIGTYPE_p_vsi_l_offset swig_types[48]
+static swig_type_info *swig_types[50];
+static swig_module_info swig_module = {swig_types, 49, 0, 0, 0, 0};
 #define SWIG_TypeQuery(name) SWIG_TypeQueryModule(&swig_module, &swig_module, name)
 #define SWIG_MangledTypeQuery(name) SWIG_MangledTypeQueryModule(&swig_module, &swig_module, name)
 
@@ -4068,6 +4070,74 @@ char **wrapper_VSIReadDirEx( const char * utf8_path, int nMaxFiles = 0 )
 }
 
 
+VSIDIR* wrapper_VSIOpenDir( const char * utf8_path,
+                            int nRecurseDepth = -1,
+                            char** options = NULL )
+{
+    return VSIOpenDir(utf8_path, nRecurseDepth, options);
+}
+
+
+typedef struct
+{
+    char*        name;
+    int          mode;
+    GIntBig      size;
+    GIntBig      mtime;
+    bool         modeKnown;
+    bool         sizeKnown;
+    bool         mtimeKnown;
+    char**       extra;
+} DirEntry;
+
+
+SWIGINTERNINLINE PyObject*
+  SWIG_From_bool  (bool value)
+{
+  return PyBool_FromLong(value ? 1 : 0);
+}
+
+SWIGINTERN DirEntry *new_DirEntry(DirEntry const *entryIn){
+    DirEntry *self = (DirEntry*) CPLMalloc( sizeof( DirEntry ) );
+    self->name = CPLStrdup(entryIn->name);
+    self->mode = entryIn->mode;
+    self->size = entryIn->size;
+    self->mtime = entryIn->mtime;
+    self->modeKnown = entryIn->modeKnown;
+    self->sizeKnown = entryIn->sizeKnown;
+    self->mtimeKnown = entryIn->mtimeKnown;
+    self->extra = CSLDuplicate(entryIn->extra);
+    return self;
+  }
+SWIGINTERN void delete_DirEntry(DirEntry *self){
+    CPLFree(self->name);
+    CSLDestroy(self->extra);
+    CPLFree(self);
+  }
+SWIGINTERN bool DirEntry_IsDirectory(DirEntry *self){
+     return (self->mode & S_IFDIR) != 0;
+  }
+
+DirEntry* wrapper_VSIGetNextDirEntry(VSIDIR* dir)
+{
+    const VSIDIREntry* vsiEntry = VSIGetNextDirEntry(dir);
+    if( vsiEntry == nullptr )
+    {
+        return nullptr;
+    }
+    DirEntry* entry = (DirEntry*) CPLMalloc( sizeof( DirEntry ) );
+    entry->name = CPLStrdup(vsiEntry->pszName);
+    entry->mode = vsiEntry->nMode;
+    entry->size = vsiEntry->nSize;
+    entry->mtime = vsiEntry->nMTime;
+    entry->modeKnown = vsiEntry->bModeKnown == TRUE;
+    entry->sizeKnown = vsiEntry->bSizeKnown == TRUE;
+    entry->mtimeKnown = vsiEntry->bMTimeKnown == TRUE;
+    entry->extra = CSLDuplicate(vsiEntry->papszExtra);
+    return entry;
+}
+
+
 const char *wrapper_CPLGetConfigOption( const char * pszKey, const char * pszDefault = NULL )
 {
     return CPLGetConfigOption( pszKey, pszDefault );
@@ -4101,13 +4171,6 @@ bool wrapper_VSISync(const char* pszSource,
 }
 
 
-SWIGINTERNINLINE PyObject*
-  SWIG_From_bool  (bool value)
-{
-  return PyBool_FromLong(value ? 1 : 0);
-}
-
-
 retStringAndCPLFree* wrapper_VSIGetSignedURL(const char * utf8_path, char** options = NULL )
 {
     return VSIGetSignedURL( utf8_path, options );
@@ -8391,6 +8454,609 @@ SWIGINTERN PyObject *_wrap_ReadDirRecursive(PyObject *SWIGUNUSEDPARM(self), PyOb
 }
 
 
+SWIGINTERN PyObject *_wrap_OpenDir(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0; int bLocalUseExceptionsCode = bUseExceptions;
+  char *arg1 = (char *) 0 ;
+  int arg2 = (int) -1 ;
+  char **arg3 = (char **) NULL ;
+  int bToFree1 = 0 ;
+  int val2 ;
+  int ecode2 = 0 ;
+  PyObject * obj0 = 0 ;
+  PyObject * obj1 = 0 ;
+  PyObject * obj2 = 0 ;
+  VSIDIR *result = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"O|OO:OpenDir",&obj0,&obj1,&obj2)) SWIG_fail;
+  {
+    /* %typemap(in) (const char *utf8_path) */
+    arg1 = GDALPythonObjectToCStr( obj0, &bToFree1 );
+    if (arg1 == NULL)
+    {
+      PyErr_SetString( PyExc_RuntimeError, "not a string" );
+      SWIG_fail;
+    }
+  }
+  if (obj1) {
+    ecode2 = SWIG_AsVal_int(obj1, &val2);
+    if (!SWIG_IsOK(ecode2)) {
+      SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "OpenDir" "', argument " "2"" of type '" "int""'");
+    } 
+    arg2 = static_cast< int >(val2);
+  }
+  if (obj2) {
+    {
+      /* %typemap(in) char **options */
+      /* Check if is a list (and reject strings, that are seen as sequence of characters)  */
+      if ( ! PySequence_Check(obj2) || PyUnicode_Check(obj2)
+  #if PY_VERSION_HEX < 0x03000000
+        || PyString_Check(obj2)
+  #endif
+        ) {
+        PyErr_SetString(PyExc_TypeError,"not a sequence");
+        SWIG_fail;
+      }
+      
+      Py_ssize_t size = PySequence_Size(obj2);
+      if( size != (int)size ) {
+        PyErr_SetString(PyExc_TypeError, "too big sequence");
+        SWIG_fail;
+      }
+      for (int i = 0; i < (int)size; i++) {
+        PyObject* pyObj = PySequence_GetItem(obj2,i);
+        if (PyUnicode_Check(pyObj))
+        {
+          char *pszStr;
+          Py_ssize_t nLen;
+          PyObject* pyUTF8Str = PyUnicode_AsUTF8String(pyObj);
+          if( !pyUTF8Str )
+          {
+            Py_DECREF(pyObj);
+            PyErr_SetString(PyExc_TypeError,"invalid Unicode sequence");
+            SWIG_fail;
+          }
+#if PY_VERSION_HEX >= 0x03000000
+          PyBytes_AsStringAndSize(pyUTF8Str, &pszStr, &nLen);
+#else
+          PyString_AsStringAndSize(pyUTF8Str, &pszStr, &nLen);
+#endif
+          arg3 = CSLAddString( arg3, pszStr );
+          Py_XDECREF(pyUTF8Str);
+        }
+#if PY_VERSION_HEX >= 0x03000000
+        else if (PyBytes_Check(pyObj))
+        arg3 = CSLAddString( arg3, PyBytes_AsString(pyObj) );
+#else
+        else if (PyString_Check(pyObj))
+        arg3 = CSLAddString( arg3, PyString_AsString(pyObj) );
+#endif
+        else
+        {
+          Py_DECREF(pyObj);
+          PyErr_SetString(PyExc_TypeError,"sequence must contain strings");
+          SWIG_fail;
+        }
+        Py_DECREF(pyObj);
+      }
+    }
+  }
+  {
+    if (!arg1) {
+      SWIG_exception(SWIG_ValueError,"Received a NULL pointer.");
+    }
+  }
+  {
+    if ( bUseExceptions ) {
+      ClearErrorState();
+    }
+    {
+      SWIG_PYTHON_THREAD_BEGIN_ALLOW;
+      result = (VSIDIR *)wrapper_VSIOpenDir((char const *)arg1,arg2,arg3);
+      SWIG_PYTHON_THREAD_END_ALLOW;
+    }
+#ifndef SED_HACKS
+    if ( bUseExceptions ) {
+      CPLErr eclass = CPLGetLastErrorType();
+      if ( eclass == CE_Failure || eclass == CE_Fatal ) {
+        SWIG_exception( SWIG_RuntimeError, CPLGetLastErrorMsg() );
+      }
+    }
+#endif
+  }
+  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_VSIDIR, 0 |  0 );
+  {
+    /* %typemap(freearg) (const char *utf8_path) */
+    GDALPythonFreeCStr(arg1, bToFree1);
+  }
+  {
+    /* %typemap(freearg) char **options */
+    CSLDestroy( arg3 );
+  }
+  if ( ReturnSame(bLocalUseExceptionsCode) ) { CPLErr eclass = CPLGetLastErrorType(); if ( eclass == CE_Failure || eclass == CE_Fatal ) { Py_XDECREF(resultobj); SWIG_Error( SWIG_RuntimeError, CPLGetLastErrorMsg() ); return NULL; } }
+  return resultobj;
+fail:
+  {
+    /* %typemap(freearg) (const char *utf8_path) */
+    GDALPythonFreeCStr(arg1, bToFree1);
+  }
+  {
+    /* %typemap(freearg) char **options */
+    CSLDestroy( arg3 );
+  }
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_DirEntry_name_get(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0; int bLocalUseExceptionsCode = bUseExceptions;
+  DirEntry *arg1 = (DirEntry *) 0 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  PyObject * obj0 = 0 ;
+  char *result = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"O:DirEntry_name_get",&obj0)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_DirEntry, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "DirEntry_name_get" "', argument " "1"" of type '" "DirEntry *""'"); 
+  }
+  arg1 = reinterpret_cast< DirEntry * >(argp1);
+  {
+    SWIG_PYTHON_THREAD_BEGIN_ALLOW;
+    result = (char *) ((arg1)->name);
+    SWIG_PYTHON_THREAD_END_ALLOW;
+  }
+  resultobj = SWIG_FromCharPtr((const char *)result);
+  if ( ReturnSame(bLocalUseExceptionsCode) ) { CPLErr eclass = CPLGetLastErrorType(); if ( eclass == CE_Failure || eclass == CE_Fatal ) { Py_XDECREF(resultobj); SWIG_Error( SWIG_RuntimeError, CPLGetLastErrorMsg() ); return NULL; } }
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_DirEntry_mode_get(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0; int bLocalUseExceptionsCode = bUseExceptions;
+  DirEntry *arg1 = (DirEntry *) 0 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  PyObject * obj0 = 0 ;
+  int result;
+  
+  if (!PyArg_ParseTuple(args,(char *)"O:DirEntry_mode_get",&obj0)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_DirEntry, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "DirEntry_mode_get" "', argument " "1"" of type '" "DirEntry *""'"); 
+  }
+  arg1 = reinterpret_cast< DirEntry * >(argp1);
+  {
+    SWIG_PYTHON_THREAD_BEGIN_ALLOW;
+    result = (int) ((arg1)->mode);
+    SWIG_PYTHON_THREAD_END_ALLOW;
+  }
+  resultobj = SWIG_From_int(static_cast< int >(result));
+  if ( ReturnSame(bLocalUseExceptionsCode) ) { CPLErr eclass = CPLGetLastErrorType(); if ( eclass == CE_Failure || eclass == CE_Fatal ) { Py_XDECREF(resultobj); SWIG_Error( SWIG_RuntimeError, CPLGetLastErrorMsg() ); return NULL; } }
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_DirEntry_size_get(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0; int bLocalUseExceptionsCode = bUseExceptions;
+  DirEntry *arg1 = (DirEntry *) 0 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  PyObject * obj0 = 0 ;
+  GIntBig result;
+  
+  if (!PyArg_ParseTuple(args,(char *)"O:DirEntry_size_get",&obj0)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_DirEntry, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "DirEntry_size_get" "', argument " "1"" of type '" "DirEntry *""'"); 
+  }
+  arg1 = reinterpret_cast< DirEntry * >(argp1);
+  {
+    SWIG_PYTHON_THREAD_BEGIN_ALLOW;
+    result =  ((arg1)->size);
+    SWIG_PYTHON_THREAD_END_ALLOW;
+  }
+  {
+    char szTmp[32];
+    sprintf(szTmp, CPL_FRMT_GIB, result);
+#if PY_VERSION_HEX>=0x03000000
+    resultobj = PyLong_FromString(szTmp, NULL, 10);
+#else
+    resultobj = PyInt_FromString(szTmp, NULL, 10);
+#endif
+  }
+  if ( ReturnSame(bLocalUseExceptionsCode) ) { CPLErr eclass = CPLGetLastErrorType(); if ( eclass == CE_Failure || eclass == CE_Fatal ) { Py_XDECREF(resultobj); SWIG_Error( SWIG_RuntimeError, CPLGetLastErrorMsg() ); return NULL; } }
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_DirEntry_mtime_get(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0; int bLocalUseExceptionsCode = bUseExceptions;
+  DirEntry *arg1 = (DirEntry *) 0 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  PyObject * obj0 = 0 ;
+  GIntBig result;
+  
+  if (!PyArg_ParseTuple(args,(char *)"O:DirEntry_mtime_get",&obj0)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_DirEntry, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "DirEntry_mtime_get" "', argument " "1"" of type '" "DirEntry *""'"); 
+  }
+  arg1 = reinterpret_cast< DirEntry * >(argp1);
+  {
+    SWIG_PYTHON_THREAD_BEGIN_ALLOW;
+    result =  ((arg1)->mtime);
+    SWIG_PYTHON_THREAD_END_ALLOW;
+  }
+  {
+    char szTmp[32];
+    sprintf(szTmp, CPL_FRMT_GIB, result);
+#if PY_VERSION_HEX>=0x03000000
+    resultobj = PyLong_FromString(szTmp, NULL, 10);
+#else
+    resultobj = PyInt_FromString(szTmp, NULL, 10);
+#endif
+  }
+  if ( ReturnSame(bLocalUseExceptionsCode) ) { CPLErr eclass = CPLGetLastErrorType(); if ( eclass == CE_Failure || eclass == CE_Fatal ) { Py_XDECREF(resultobj); SWIG_Error( SWIG_RuntimeError, CPLGetLastErrorMsg() ); return NULL; } }
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_DirEntry_modeKnown_get(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0; int bLocalUseExceptionsCode = bUseExceptions;
+  DirEntry *arg1 = (DirEntry *) 0 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  PyObject * obj0 = 0 ;
+  bool result;
+  
+  if (!PyArg_ParseTuple(args,(char *)"O:DirEntry_modeKnown_get",&obj0)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_DirEntry, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "DirEntry_modeKnown_get" "', argument " "1"" of type '" "DirEntry *""'"); 
+  }
+  arg1 = reinterpret_cast< DirEntry * >(argp1);
+  {
+    SWIG_PYTHON_THREAD_BEGIN_ALLOW;
+    result = (bool) ((arg1)->modeKnown);
+    SWIG_PYTHON_THREAD_END_ALLOW;
+  }
+  resultobj = SWIG_From_bool(static_cast< bool >(result));
+  if ( ReturnSame(bLocalUseExceptionsCode) ) { CPLErr eclass = CPLGetLastErrorType(); if ( eclass == CE_Failure || eclass == CE_Fatal ) { Py_XDECREF(resultobj); SWIG_Error( SWIG_RuntimeError, CPLGetLastErrorMsg() ); return NULL; } }
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_DirEntry_sizeKnown_get(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0; int bLocalUseExceptionsCode = bUseExceptions;
+  DirEntry *arg1 = (DirEntry *) 0 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  PyObject * obj0 = 0 ;
+  bool result;
+  
+  if (!PyArg_ParseTuple(args,(char *)"O:DirEntry_sizeKnown_get",&obj0)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_DirEntry, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "DirEntry_sizeKnown_get" "', argument " "1"" of type '" "DirEntry *""'"); 
+  }
+  arg1 = reinterpret_cast< DirEntry * >(argp1);
+  {
+    SWIG_PYTHON_THREAD_BEGIN_ALLOW;
+    result = (bool) ((arg1)->sizeKnown);
+    SWIG_PYTHON_THREAD_END_ALLOW;
+  }
+  resultobj = SWIG_From_bool(static_cast< bool >(result));
+  if ( ReturnSame(bLocalUseExceptionsCode) ) { CPLErr eclass = CPLGetLastErrorType(); if ( eclass == CE_Failure || eclass == CE_Fatal ) { Py_XDECREF(resultobj); SWIG_Error( SWIG_RuntimeError, CPLGetLastErrorMsg() ); return NULL; } }
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_DirEntry_mtimeKnown_get(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0; int bLocalUseExceptionsCode = bUseExceptions;
+  DirEntry *arg1 = (DirEntry *) 0 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  PyObject * obj0 = 0 ;
+  bool result;
+  
+  if (!PyArg_ParseTuple(args,(char *)"O:DirEntry_mtimeKnown_get",&obj0)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_DirEntry, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "DirEntry_mtimeKnown_get" "', argument " "1"" of type '" "DirEntry *""'"); 
+  }
+  arg1 = reinterpret_cast< DirEntry * >(argp1);
+  {
+    SWIG_PYTHON_THREAD_BEGIN_ALLOW;
+    result = (bool) ((arg1)->mtimeKnown);
+    SWIG_PYTHON_THREAD_END_ALLOW;
+  }
+  resultobj = SWIG_From_bool(static_cast< bool >(result));
+  if ( ReturnSame(bLocalUseExceptionsCode) ) { CPLErr eclass = CPLGetLastErrorType(); if ( eclass == CE_Failure || eclass == CE_Fatal ) { Py_XDECREF(resultobj); SWIG_Error( SWIG_RuntimeError, CPLGetLastErrorMsg() ); return NULL; } }
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_DirEntry_extra_get(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0; int bLocalUseExceptionsCode = bUseExceptions;
+  DirEntry *arg1 = (DirEntry *) 0 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  PyObject * obj0 = 0 ;
+  char **result = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"O:DirEntry_extra_get",&obj0)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_DirEntry, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "DirEntry_extra_get" "', argument " "1"" of type '" "DirEntry *""'"); 
+  }
+  arg1 = reinterpret_cast< DirEntry * >(argp1);
+  {
+    SWIG_PYTHON_THREAD_BEGIN_ALLOW;
+    result = (char **) ((arg1)->extra);
+    SWIG_PYTHON_THREAD_END_ALLOW;
+  }
+  {
+    /* %typemap(out) char **dict */
+    char **stringarray = result;
+    resultobj = PyDict_New();
+    if ( stringarray != NULL ) {
+      while (*stringarray != NULL ) {
+        char const *valptr;
+        char *keyptr;
+        const char* pszSep = strchr( *stringarray, '=' );
+        if ( pszSep != NULL) {
+          keyptr = CPLStrdup(*stringarray);
+          keyptr[pszSep - *stringarray] = '\0';
+          valptr = pszSep + 1;
+          PyObject *nm = GDALPythonObjectFromCStr( keyptr );
+          PyObject *val = GDALPythonObjectFromCStr( valptr );
+          PyDict_SetItem(resultobj, nm, val );
+          Py_DECREF(nm);
+          Py_DECREF(val);
+          CPLFree( keyptr );
+        }
+        stringarray++;
+      }
+    }
+  }
+  if ( ReturnSame(bLocalUseExceptionsCode) ) { CPLErr eclass = CPLGetLastErrorType(); if ( eclass == CE_Failure || eclass == CE_Fatal ) { Py_XDECREF(resultobj); SWIG_Error( SWIG_RuntimeError, CPLGetLastErrorMsg() ); return NULL; } }
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_new_DirEntry(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0; int bLocalUseExceptionsCode = bUseExceptions;
+  DirEntry *arg1 = (DirEntry *) 0 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  PyObject * obj0 = 0 ;
+  DirEntry *result = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"O:new_DirEntry",&obj0)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_DirEntry, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "new_DirEntry" "', argument " "1"" of type '" "DirEntry const *""'"); 
+  }
+  arg1 = reinterpret_cast< DirEntry * >(argp1);
+  {
+    if ( bUseExceptions ) {
+      ClearErrorState();
+    }
+    {
+      SWIG_PYTHON_THREAD_BEGIN_ALLOW;
+      result = (DirEntry *)new_DirEntry((DirEntry const *)arg1);
+      SWIG_PYTHON_THREAD_END_ALLOW;
+    }
+#ifndef SED_HACKS
+    if ( bUseExceptions ) {
+      CPLErr eclass = CPLGetLastErrorType();
+      if ( eclass == CE_Failure || eclass == CE_Fatal ) {
+        SWIG_exception( SWIG_RuntimeError, CPLGetLastErrorMsg() );
+      }
+    }
+#endif
+  }
+  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_DirEntry, SWIG_POINTER_NEW |  0 );
+  if ( ReturnSame(bLocalUseExceptionsCode) ) { CPLErr eclass = CPLGetLastErrorType(); if ( eclass == CE_Failure || eclass == CE_Fatal ) { Py_XDECREF(resultobj); SWIG_Error( SWIG_RuntimeError, CPLGetLastErrorMsg() ); return NULL; } }
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_delete_DirEntry(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0; int bLocalUseExceptionsCode = bUseExceptions;
+  DirEntry *arg1 = (DirEntry *) 0 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  PyObject * obj0 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"O:delete_DirEntry",&obj0)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_DirEntry, SWIG_POINTER_DISOWN |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "delete_DirEntry" "', argument " "1"" of type '" "DirEntry *""'"); 
+  }
+  arg1 = reinterpret_cast< DirEntry * >(argp1);
+  {
+    if ( bUseExceptions ) {
+      ClearErrorState();
+    }
+    {
+      SWIG_PYTHON_THREAD_BEGIN_ALLOW;
+      delete_DirEntry(arg1);
+      SWIG_PYTHON_THREAD_END_ALLOW;
+    }
+#ifndef SED_HACKS
+    if ( bUseExceptions ) {
+      CPLErr eclass = CPLGetLastErrorType();
+      if ( eclass == CE_Failure || eclass == CE_Fatal ) {
+        SWIG_exception( SWIG_RuntimeError, CPLGetLastErrorMsg() );
+      }
+    }
+#endif
+  }
+  resultobj = SWIG_Py_Void();
+  if ( ReturnSame(bLocalUseExceptionsCode) ) { CPLErr eclass = CPLGetLastErrorType(); if ( eclass == CE_Failure || eclass == CE_Fatal ) { Py_XDECREF(resultobj); SWIG_Error( SWIG_RuntimeError, CPLGetLastErrorMsg() ); return NULL; } }
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_DirEntry_IsDirectory(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0; int bLocalUseExceptionsCode = bUseExceptions;
+  DirEntry *arg1 = (DirEntry *) 0 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  PyObject * obj0 = 0 ;
+  bool result;
+  
+  if (!PyArg_ParseTuple(args,(char *)"O:DirEntry_IsDirectory",&obj0)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_DirEntry, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "DirEntry_IsDirectory" "', argument " "1"" of type '" "DirEntry *""'"); 
+  }
+  arg1 = reinterpret_cast< DirEntry * >(argp1);
+  {
+    if ( bUseExceptions ) {
+      ClearErrorState();
+    }
+    {
+      SWIG_PYTHON_THREAD_BEGIN_ALLOW;
+      result = (bool)DirEntry_IsDirectory(arg1);
+      SWIG_PYTHON_THREAD_END_ALLOW;
+    }
+#ifndef SED_HACKS
+    if ( bUseExceptions ) {
+      CPLErr eclass = CPLGetLastErrorType();
+      if ( eclass == CE_Failure || eclass == CE_Fatal ) {
+        SWIG_exception( SWIG_RuntimeError, CPLGetLastErrorMsg() );
+      }
+    }
+#endif
+  }
+  resultobj = SWIG_From_bool(static_cast< bool >(result));
+  if ( ReturnSame(bLocalUseExceptionsCode) ) { CPLErr eclass = CPLGetLastErrorType(); if ( eclass == CE_Failure || eclass == CE_Fatal ) { Py_XDECREF(resultobj); SWIG_Error( SWIG_RuntimeError, CPLGetLastErrorMsg() ); return NULL; } }
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *DirEntry_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *obj;
+  if (!PyArg_ParseTuple(args,(char*)"O:swigregister", &obj)) return NULL;
+  SWIG_TypeNewClientData(SWIGTYPE_p_DirEntry, SWIG_NewClientData(obj));
+  return SWIG_Py_Void();
+}
+
+SWIGINTERN PyObject *_wrap_GetNextDirEntry(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0; int bLocalUseExceptionsCode = bUseExceptions;
+  VSIDIR *arg1 = (VSIDIR *) 0 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  PyObject * obj0 = 0 ;
+  DirEntry *result = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"O:GetNextDirEntry",&obj0)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_VSIDIR, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "GetNextDirEntry" "', argument " "1"" of type '" "VSIDIR *""'"); 
+  }
+  arg1 = reinterpret_cast< VSIDIR * >(argp1);
+  {
+    if (!arg1) {
+      SWIG_exception(SWIG_ValueError,"Received a NULL pointer.");
+    }
+  }
+  {
+    if ( bUseExceptions ) {
+      ClearErrorState();
+    }
+    {
+      SWIG_PYTHON_THREAD_BEGIN_ALLOW;
+      result = (DirEntry *)wrapper_VSIGetNextDirEntry(arg1);
+      SWIG_PYTHON_THREAD_END_ALLOW;
+    }
+#ifndef SED_HACKS
+    if ( bUseExceptions ) {
+      CPLErr eclass = CPLGetLastErrorType();
+      if ( eclass == CE_Failure || eclass == CE_Fatal ) {
+        SWIG_exception( SWIG_RuntimeError, CPLGetLastErrorMsg() );
+      }
+    }
+#endif
+  }
+  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_DirEntry, SWIG_POINTER_OWN |  0 );
+  if ( ReturnSame(bLocalUseExceptionsCode) ) { CPLErr eclass = CPLGetLastErrorType(); if ( eclass == CE_Failure || eclass == CE_Fatal ) { Py_XDECREF(resultobj); SWIG_Error( SWIG_RuntimeError, CPLGetLastErrorMsg() ); return NULL; } }
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_CloseDir(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0; int bLocalUseExceptionsCode = bUseExceptions;
+  VSIDIR *arg1 = (VSIDIR *) 0 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  PyObject * obj0 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"O:CloseDir",&obj0)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_VSIDIR, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "CloseDir" "', argument " "1"" of type '" "VSIDIR *""'"); 
+  }
+  arg1 = reinterpret_cast< VSIDIR * >(argp1);
+  {
+    if (!arg1) {
+      SWIG_exception(SWIG_ValueError,"Received a NULL pointer.");
+    }
+  }
+  {
+    if ( bUseExceptions ) {
+      ClearErrorState();
+    }
+    {
+      SWIG_PYTHON_THREAD_BEGIN_ALLOW;
+      VSICloseDir(arg1);
+      SWIG_PYTHON_THREAD_END_ALLOW;
+    }
+#ifndef SED_HACKS
+    if ( bUseExceptions ) {
+      CPLErr eclass = CPLGetLastErrorType();
+      if ( eclass == CE_Failure || eclass == CE_Fatal ) {
+        SWIG_exception( SWIG_RuntimeError, CPLGetLastErrorMsg() );
+      }
+    }
+#endif
+  }
+  resultobj = SWIG_Py_Void();
+  if ( ReturnSame(bLocalUseExceptionsCode) ) { CPLErr eclass = CPLGetLastErrorType(); if ( eclass == CE_Failure || eclass == CE_Fatal ) { Py_XDECREF(resultobj); SWIG_Error( SWIG_RuntimeError, CPLGetLastErrorMsg() ); return NULL; } }
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
 SWIGINTERN PyObject *_wrap_SetConfigOption(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0; int bLocalUseExceptionsCode = bUseExceptions;
   char *arg1 = (char *) 0 ;
@@ -34686,6 +35352,21 @@ static PyMethodDef SwigMethods[] = {
 	 { (char *)"FindFile", _wrap_FindFile, METH_VARARGS, (char *)"FindFile(char const * pszClass, char const * utf8_path) -> char const *"},
 	 { (char *)"ReadDir", _wrap_ReadDir, METH_VARARGS, (char *)"ReadDir(char const * utf8_path, int nMaxFiles=0) -> char **"},
 	 { (char *)"ReadDirRecursive", _wrap_ReadDirRecursive, METH_VARARGS, (char *)"ReadDirRecursive(char const * utf8_path) -> char **"},
+	 { (char *)"OpenDir", _wrap_OpenDir, METH_VARARGS, (char *)"OpenDir(char const * utf8_path, int nRecurseDepth=-1, char ** options=None) -> VSIDIR *"},
+	 { (char *)"DirEntry_name_get", _wrap_DirEntry_name_get, METH_VARARGS, (char *)"DirEntry_name_get(DirEntry self) -> char *"},
+	 { (char *)"DirEntry_mode_get", _wrap_DirEntry_mode_get, METH_VARARGS, (char *)"DirEntry_mode_get(DirEntry self) -> int"},
+	 { (char *)"DirEntry_size_get", _wrap_DirEntry_size_get, METH_VARARGS, (char *)"DirEntry_size_get(DirEntry self) -> GIntBig"},
+	 { (char *)"DirEntry_mtime_get", _wrap_DirEntry_mtime_get, METH_VARARGS, (char *)"DirEntry_mtime_get(DirEntry self) -> GIntBig"},
+	 { (char *)"DirEntry_modeKnown_get", _wrap_DirEntry_modeKnown_get, METH_VARARGS, (char *)"DirEntry_modeKnown_get(DirEntry self) -> bool"},
+	 { (char *)"DirEntry_sizeKnown_get", _wrap_DirEntry_sizeKnown_get, METH_VARARGS, (char *)"DirEntry_sizeKnown_get(DirEntry self) -> bool"},
+	 { (char *)"DirEntry_mtimeKnown_get", _wrap_DirEntry_mtimeKnown_get, METH_VARARGS, (char *)"DirEntry_mtimeKnown_get(DirEntry self) -> bool"},
+	 { (char *)"DirEntry_extra_get", _wrap_DirEntry_extra_get, METH_VARARGS, (char *)"DirEntry_extra_get(DirEntry self) -> char **"},
+	 { (char *)"new_DirEntry", _wrap_new_DirEntry, METH_VARARGS, (char *)"new_DirEntry(DirEntry entryIn) -> DirEntry"},
+	 { (char *)"delete_DirEntry", _wrap_delete_DirEntry, METH_VARARGS, (char *)"delete_DirEntry(DirEntry self)"},
+	 { (char *)"DirEntry_IsDirectory", _wrap_DirEntry_IsDirectory, METH_VARARGS, (char *)"DirEntry_IsDirectory(DirEntry self) -> bool"},
+	 { (char *)"DirEntry_swigregister", DirEntry_swigregister, METH_VARARGS, NULL},
+	 { (char *)"GetNextDirEntry", _wrap_GetNextDirEntry, METH_VARARGS, (char *)"GetNextDirEntry(VSIDIR * dir) -> DirEntry"},
+	 { (char *)"CloseDir", _wrap_CloseDir, METH_VARARGS, (char *)"CloseDir(VSIDIR * dir)"},
 	 { (char *)"SetConfigOption", _wrap_SetConfigOption, METH_VARARGS, (char *)"SetConfigOption(char const * pszKey, char const * pszValue)"},
 	 { (char *)"GetConfigOption", _wrap_GetConfigOption, METH_VARARGS, (char *)"GetConfigOption(char const * pszKey, char const * pszDefault=None) -> char const *"},
 	 { (char *)"CPLBinaryToHex", _wrap_CPLBinaryToHex, METH_VARARGS, (char *)"CPLBinaryToHex(int nBytes) -> retStringAndCPLFree *"},
@@ -35062,6 +35743,7 @@ static void *_p_GDALRasterBandShadowTo_p_GDALMajorObjectShadow(void *x, int *SWI
 static swig_type_info _swigt__p_CPLErrorHandler = {"_p_CPLErrorHandler", "CPLErrorHandler *", 0, 0, (void*)0, 0};
 static swig_type_info _swigt__p_CPLVirtualMemShadow = {"_p_CPLVirtualMemShadow", "CPLVirtualMemShadow *", 0, 0, (void*)0, 0};
 static swig_type_info _swigt__p_CPLXMLNode = {"_p_CPLXMLNode", "CPLXMLNode *", 0, 0, (void*)0, 0};
+static swig_type_info _swigt__p_DirEntry = {"_p_DirEntry", "DirEntry *", 0, 0, (void*)0, 0};
 static swig_type_info _swigt__p_GByte = {"_p_GByte", "GByte *", 0, 0, (void*)0, 0};
 static swig_type_info _swigt__p_GDALAsyncReaderShadow = {"_p_GDALAsyncReaderShadow", "GDALAsyncReaderShadow *", 0, 0, (void*)0, 0};
 static swig_type_info _swigt__p_GDALBuildVRTOptions = {"_p_GDALBuildVRTOptions", "GDALBuildVRTOptions *", 0, 0, (void*)0, 0};
@@ -35091,6 +35773,7 @@ static swig_type_info _swigt__p_OGRLayerShadow = {"_p_OGRLayerShadow", "OGRLayer
 static swig_type_info _swigt__p_OGRStyleTableShadow = {"_p_OGRStyleTableShadow", "OGRStyleTableShadow *", 0, 0, (void*)0, 0};
 static swig_type_info _swigt__p_OSRSpatialReferenceShadow = {"_p_OSRSpatialReferenceShadow", "OSRSpatialReferenceShadow *", 0, 0, (void*)0, 0};
 static swig_type_info _swigt__p_StatBuf = {"_p_StatBuf", "StatBuf *", 0, 0, (void*)0, 0};
+static swig_type_info _swigt__p_VSIDIR = {"_p_VSIDIR", "VSIDIR *", 0, 0, (void*)0, 0};
 static swig_type_info _swigt__p_VSILFILE = {"_p_VSILFILE", "VSILFILE *", 0, 0, (void*)0, 0};
 static swig_type_info _swigt__p_char = {"_p_char", "char *|retStringAndCPLFree *", 0, 0, (void*)0, 0};
 static swig_type_info _swigt__p_double = {"_p_double", "double *", 0, 0, (void*)0, 0};
@@ -35111,6 +35794,7 @@ static swig_type_info *swig_type_initial[] = {
   &_swigt__p_CPLErrorHandler,
   &_swigt__p_CPLVirtualMemShadow,
   &_swigt__p_CPLXMLNode,
+  &_swigt__p_DirEntry,
   &_swigt__p_GByte,
   &_swigt__p_GDALAsyncReaderShadow,
   &_swigt__p_GDALBuildVRTOptions,
@@ -35140,6 +35824,7 @@ static swig_type_info *swig_type_initial[] = {
   &_swigt__p_OGRStyleTableShadow,
   &_swigt__p_OSRSpatialReferenceShadow,
   &_swigt__p_StatBuf,
+  &_swigt__p_VSIDIR,
   &_swigt__p_VSILFILE,
   &_swigt__p_char,
   &_swigt__p_double,
@@ -35160,6 +35845,7 @@ static swig_type_info *swig_type_initial[] = {
 static swig_cast_info _swigc__p_CPLErrorHandler[] = {  {&_swigt__p_CPLErrorHandler, 0, 0, 0},{0, 0, 0, 0}};
 static swig_cast_info _swigc__p_CPLVirtualMemShadow[] = {  {&_swigt__p_CPLVirtualMemShadow, 0, 0, 0},{0, 0, 0, 0}};
 static swig_cast_info _swigc__p_CPLXMLNode[] = {  {&_swigt__p_CPLXMLNode, 0, 0, 0},{0, 0, 0, 0}};
+static swig_cast_info _swigc__p_DirEntry[] = {  {&_swigt__p_DirEntry, 0, 0, 0},{0, 0, 0, 0}};
 static swig_cast_info _swigc__p_GByte[] = {  {&_swigt__p_GByte, 0, 0, 0},{0, 0, 0, 0}};
 static swig_cast_info _swigc__p_GDALAsyncReaderShadow[] = {  {&_swigt__p_GDALAsyncReaderShadow, 0, 0, 0},{0, 0, 0, 0}};
 static swig_cast_info _swigc__p_GDALBuildVRTOptions[] = {  {&_swigt__p_GDALBuildVRTOptions, 0, 0, 0},{0, 0, 0, 0}};
@@ -35189,6 +35875,7 @@ static swig_cast_info _swigc__p_OGRLayerShadow[] = {  {&_swigt__p_OGRLayerShadow
 static swig_cast_info _swigc__p_OGRStyleTableShadow[] = {  {&_swigt__p_OGRStyleTableShadow, 0, 0, 0},{0, 0, 0, 0}};
 static swig_cast_info _swigc__p_OSRSpatialReferenceShadow[] = {  {&_swigt__p_OSRSpatialReferenceShadow, 0, 0, 0},{0, 0, 0, 0}};
 static swig_cast_info _swigc__p_StatBuf[] = {  {&_swigt__p_StatBuf, 0, 0, 0},{0, 0, 0, 0}};
+static swig_cast_info _swigc__p_VSIDIR[] = {  {&_swigt__p_VSIDIR, 0, 0, 0},{0, 0, 0, 0}};
 static swig_cast_info _swigc__p_VSILFILE[] = {  {&_swigt__p_VSILFILE, 0, 0, 0},{0, 0, 0, 0}};
 static swig_cast_info _swigc__p_char[] = {  {&_swigt__p_char, 0, 0, 0},{0, 0, 0, 0}};
 static swig_cast_info _swigc__p_double[] = {  {&_swigt__p_double, 0, 0, 0},{0, 0, 0, 0}};
@@ -35209,6 +35896,7 @@ static swig_cast_info *swig_cast_initial[] = {
   _swigc__p_CPLErrorHandler,
   _swigc__p_CPLVirtualMemShadow,
   _swigc__p_CPLXMLNode,
+  _swigc__p_DirEntry,
   _swigc__p_GByte,
   _swigc__p_GDALAsyncReaderShadow,
   _swigc__p_GDALBuildVRTOptions,
@@ -35238,6 +35926,7 @@ static swig_cast_info *swig_cast_initial[] = {
   _swigc__p_OGRStyleTableShadow,
   _swigc__p_OSRSpatialReferenceShadow,
   _swigc__p_StatBuf,
+  _swigc__p_VSIDIR,
   _swigc__p_VSILFILE,
   _swigc__p_char,
   _swigc__p_double,
diff --git a/gdal/swig/python/osgeo/gdal.py b/gdal/swig/python/osgeo/gdal.py
index 42702acd7976..cd4b8361c9c9 100644
--- a/gdal/swig/python/osgeo/gdal.py
+++ b/gdal/swig/python/osgeo/gdal.py
@@ -156,6 +156,23 @@ def RGBFile2PCTFile( src_filename, dst_filename ):
 
   return 0
 
+def listdir(path, recursionLevel = -1, options = []):
+  """ Iterate over a directory.
+
+      recursionLevel = -1 means unlimited level of recursion.
+  """
+  dir = OpenDir(path, recursionLevel, options)
+  if not dir:
+      raise OSError(path + ' does not exist')
+  try:
+      while True:
+          entry = GetNextDirEntry(dir)
+          if not entry:
+              break
+          yield entry
+  finally:
+      CloseDir(dir)
+
 
 def GetUseExceptions(*args):
     """GetUseExceptions() -> int"""
@@ -1377,6 +1394,68 @@ def ReadDirRecursive(*args):
     """ReadDirRecursive(char const * utf8_path) -> char **"""
     return _gdal.ReadDirRecursive(*args)
 
+def OpenDir(*args):
+    """OpenDir(char const * utf8_path, int nRecurseDepth=-1, char ** options=None) -> VSIDIR *"""
+    return _gdal.OpenDir(*args)
+class DirEntry(_object):
+    """Proxy of C++ DirEntry class."""
+
+    __swig_setmethods__ = {}
+    __setattr__ = lambda self, name, value: _swig_setattr(self, DirEntry, name, value)
+    __swig_getmethods__ = {}
+    __getattr__ = lambda self, name: _swig_getattr(self, DirEntry, name)
+    __repr__ = _swig_repr
+    __swig_getmethods__["name"] = _gdal.DirEntry_name_get
+    if _newclass:
+        name = _swig_property(_gdal.DirEntry_name_get)
+    __swig_getmethods__["mode"] = _gdal.DirEntry_mode_get
+    if _newclass:
+        mode = _swig_property(_gdal.DirEntry_mode_get)
+    __swig_getmethods__["size"] = _gdal.DirEntry_size_get
+    if _newclass:
+        size = _swig_property(_gdal.DirEntry_size_get)
+    __swig_getmethods__["mtime"] = _gdal.DirEntry_mtime_get
+    if _newclass:
+        mtime = _swig_property(_gdal.DirEntry_mtime_get)
+    __swig_getmethods__["modeKnown"] = _gdal.DirEntry_modeKnown_get
+    if _newclass:
+        modeKnown = _swig_property(_gdal.DirEntry_modeKnown_get)
+    __swig_getmethods__["sizeKnown"] = _gdal.DirEntry_sizeKnown_get
+    if _newclass:
+        sizeKnown = _swig_property(_gdal.DirEntry_sizeKnown_get)
+    __swig_getmethods__["mtimeKnown"] = _gdal.DirEntry_mtimeKnown_get
+    if _newclass:
+        mtimeKnown = _swig_property(_gdal.DirEntry_mtimeKnown_get)
+    __swig_getmethods__["extra"] = _gdal.DirEntry_extra_get
+    if _newclass:
+        extra = _swig_property(_gdal.DirEntry_extra_get)
+
+    def __init__(self, *args):
+        """__init__(DirEntry self, DirEntry entryIn) -> DirEntry"""
+        this = _gdal.new_DirEntry(*args)
+        try:
+            self.this.append(this)
+        except Exception:
+            self.this = this
+    __swig_destroy__ = _gdal.delete_DirEntry
+    __del__ = lambda self: None
+
+    def IsDirectory(self, *args):
+        """IsDirectory(DirEntry self) -> bool"""
+        return _gdal.DirEntry_IsDirectory(self, *args)
+
+DirEntry_swigregister = _gdal.DirEntry_swigregister
+DirEntry_swigregister(DirEntry)
+
+
+def GetNextDirEntry(*args):
+    """GetNextDirEntry(VSIDIR * dir) -> DirEntry"""
+    return _gdal.GetNextDirEntry(*args)
+
+def CloseDir(*args):
+    """CloseDir(VSIDIR * dir)"""
+    return _gdal.CloseDir(*args)
+
 def SetConfigOption(*args):
     """SetConfigOption(char const * pszKey, char const * pszValue)"""
     return _gdal.SetConfigOption(*args)

From 5f772a9aa076ed1c954f409f3dfb3b2b971ea2a9 Mon Sep 17 00:00:00 2001
From: Even Rouault <even.rouault@spatialys.com>
Date: Wed, 28 Nov 2018 10:23:01 +0100
Subject: [PATCH 083/488] generate_vcxproj.bat: remove extraneous parentheses
 (master only, patch by @joyerf, fixes #1116)

---
 gdal/generate_vcxproj.bat | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/gdal/generate_vcxproj.bat b/gdal/generate_vcxproj.bat
index 9bc120c59277..686b26cd2e8c 100644
--- a/gdal/generate_vcxproj.bat
+++ b/gdal/generate_vcxproj.bat
@@ -64,7 +64,7 @@ if "%_vcver_%"=="15.0" (
 ) else (
     echo Wrong value for parameter 1. See usage:
 	goto :usage
-))))
+))
 
 ::  *********************
 ::  Get Platform

From 5a215e5c6b75f6d1d51dc4dea40c33d9e0e41dcd Mon Sep 17 00:00:00 2001
From: Even Rouault <even.rouault@spatialys.com>
Date: Wed, 28 Nov 2018 11:59:15 +0100
Subject: [PATCH 084/488] Add support for Poppler 0.71.0 (fixes #1121)

---
 gdal/frmts/pdf/pdfdataset.cpp | 23 ++++++++++++++---------
 gdal/frmts/pdf/pdfio.h        |  9 +++++++++
 2 files changed, 23 insertions(+), 9 deletions(-)

diff --git a/gdal/frmts/pdf/pdfdataset.cpp b/gdal/frmts/pdf/pdfdataset.cpp
index 1a56f57ee06b..6e8223e4708d 100644
--- a/gdal/frmts/pdf/pdfdataset.cpp
+++ b/gdal/frmts/pdf/pdfdataset.cpp
@@ -2593,18 +2593,25 @@ static void PDFDatasetErrorFunctionCommon(const CPLString& osError)
 }
 
 #ifdef POPPLER_0_20_OR_LATER
-static void PDFDatasetErrorFunction(CPL_UNUSED void* userData, CPL_UNUSED ErrorCategory eErrCategory,
+
+static void PDFDatasetErrorFunction(void* /* userData*/,
+                                    ErrorCategory /* eErrCategory */,
 #ifdef POPPLER_0_23_OR_LATER
                                     Goffset nPos,
 #else
                                     int nPos,
 #endif
-                                    char *pszMsg)
+#ifdef POPPLER_0_71_OR_LATER
+                                    const char *pszMsg
+#else
+                                    char *pszMsg
+#endif
+                                   )
 {
     CPLString osError;
 
     if (nPos >= 0)
-        osError.Printf("Pos = %d, ", (int)nPos);
+        osError.Printf("Pos = " CPL_FRMT_GUIB ", ", static_cast<GUIntBig>(nPos));
     osError += pszMsg;
     PDFDatasetErrorFunctionCommon(osError);
 }
@@ -4442,7 +4449,7 @@ GDALDataset *PDFDataset::Open( GDALOpenInfo * poOpenInfo )
 #ifdef HAVE_POPPLER
     if (bUseLib.test(PDFLIB_POPPLER))
     {
-        PDFRectangle* psMediaBox = poPagePoppler->getMediaBox();
+        const auto* psMediaBox = poPagePoppler->getMediaBox();
         dfX1 = psMediaBox->x1;
         dfY1 = psMediaBox->y1;
         dfX2 = psMediaBox->x2;
@@ -4780,14 +4787,12 @@ GDALDataset *PDFDataset::Open( GDALOpenInfo * poOpenInfo )
     GooString* poMetadata = poCatalogPoppler->readMetadata();
     if (poMetadata)
     {
-        char* pszContent = poMetadata->getCString();
+        const char* pszContent = poMetadata->getCString();
         if (pszContent != nullptr &&
             STARTS_WITH(pszContent, "<?xpacket begin="))
         {
-            char *apszMDList[2];
-            apszMDList[0] = pszContent;
-            apszMDList[1] = nullptr;
-            poDS->SetMetadata(apszMDList, "xml:XMP");
+            const char * const apszMDList[2] = { pszContent, nullptr };
+            poDS->SetMetadata(const_cast<char**>(apszMDList), "xml:XMP");
         }
         delete poMetadata;
     }
diff --git a/gdal/frmts/pdf/pdfio.h b/gdal/frmts/pdf/pdfio.h
index fef95954e90d..2d58059e8014 100644
--- a/gdal/frmts/pdf/pdfio.h
+++ b/gdal/frmts/pdf/pdfio.h
@@ -58,6 +58,15 @@
 #define makeSubStream_object_type Object*
 #endif
 
+// Detect Poppler 0.71 that no longer defines GBool
+#ifdef POPPLER_0_69_OR_LATER
+#ifndef initObj
+#define POPPLER_0_71_OR_LATER
+#define GBool bool
+#define gFalse false
+#endif
+#endif
+
 class VSIPDFFileStream final: public BaseStream
 {
     public:

From 893af09aa137159ed33855117baeca33387353ba Mon Sep 17 00:00:00 2001
From: Even Rouault <even.rouault@spatialys.com>
Date: Wed, 28 Nov 2018 17:48:49 +0100
Subject: [PATCH 085/488] VRT doc: update link to schema [ci skip]

---
 gdal/frmts/vrt/vrt_tutorial.dox | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/gdal/frmts/vrt/vrt_tutorial.dox b/gdal/frmts/vrt/vrt_tutorial.dox
index 4c55ec3e010b..b5de290561b0 100644
--- a/gdal/frmts/vrt/vrt_tutorial.dox
+++ b/gdal/frmts/vrt/vrt_tutorial.dox
@@ -65,7 +65,7 @@ for developers.<p>
 
 \section gdal_vrttut_format .vrt Format
 
-A <a href="http://svn.osgeo.org/gdal/trunk/gdal/data/gdalvrt.xsd">XML schema of the GDAL VRT format</a>
+A <a href="https://raw.githubusercontent.com/OSGeo/gdal/master/gdal/data/gdalvrt.xsd">XML schema of the GDAL VRT format</a>
 is available.<p>
 
 Virtual files stored on disk are kept in an XML format with the following

From c5fbfaa0ef4888fe4f1e1799cd3c32ff42eb36c8 Mon Sep 17 00:00:00 2001
From: Norman Barker <norman.barker@mapbox.com>
Date: Wed, 28 Nov 2018 14:49:02 -0600
Subject: [PATCH 086/488] fix memory leak with tiff webp encoding

---
 gdal/frmts/gtiff/libtiff/tif_webp.c | 14 ++++++++++----
 1 file changed, 10 insertions(+), 4 deletions(-)

diff --git a/gdal/frmts/gtiff/libtiff/tif_webp.c b/gdal/frmts/gtiff/libtiff/tif_webp.c
index ee0a0649e673..53c3b214b2ac 100644
--- a/gdal/frmts/gtiff/libtiff/tif_webp.c
+++ b/gdal/frmts/gtiff/libtiff/tif_webp.c
@@ -419,6 +419,12 @@ TWebPPreEncode(TIFF* tif, uint16 s)
   /* set up buffer for raw data */
   /* given above check and that nSamples <= 4, buffer_size is <= 1 GB */
   sp->buffer_size = segment_width * segment_height * sp->nSamples;
+  
+  if (sp->pBuffer != NULL) {
+      _TIFFfree(sp->pBuffer);
+      sp->pBuffer = NULL;    
+  }
+  
   sp->pBuffer = _TIFFmalloc(sp->buffer_size);
   if( !sp->pBuffer) {
       TIFFErrorExt(tif->tif_clientdata, module, "Cannot allocate buffer");
@@ -464,7 +470,7 @@ TWebPPostEncode(TIFF* tif)
                     "WebPPictureImportRGB() failed");
       return 0;
   }
-
+  
   if (!WebPEncode(&sp->sEncoderConfig, &sp->sPicture)) {
 
 #if WEBP_ENCODER_ABI_VERSION >= 0x0100
@@ -544,10 +550,10 @@ TWebPCleanup(TIFF* tif)
   }
   
   if (sp->pBuffer != NULL) {
-    _TIFFfree(sp->pBuffer);
-    sp->pBuffer = NULL;
+      _TIFFfree(sp->pBuffer);
+      sp->pBuffer = NULL;    
   }
-
+  
   if (tif->tif_data) {
     _TIFFfree(tif->tif_data);
     tif->tif_data = NULL;

From 371ebe3983688f29e551259497b1781d429ce00b Mon Sep 17 00:00:00 2001
From: jratike80 <jukka.rahkonen@maanmittauslaitos.fi>
Date: Thu, 29 Nov 2018 12:32:42 +0200
Subject: [PATCH 087/488] Validate_gpkg.py: change "type" into "typ"

---
 gdal/swig/python/samples/validate_gpkg.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/gdal/swig/python/samples/validate_gpkg.py b/gdal/swig/python/samples/validate_gpkg.py
index d1fb37d8baf3..cef05c590193 100755
--- a/gdal/swig/python/samples/validate_gpkg.py
+++ b/gdal/swig/python/samples/validate_gpkg.py
@@ -56,7 +56,7 @@ def _is_valid_data_type(typ):
     return typ in ('BOOLEAN', 'TINYINT', 'SMALLINT', 'MEDIUMINT',
                    'INT', 'INTEGER', 'FLOAT', 'DOUBLE', 'REAL',
                    'TEXT', 'BLOB', 'DATE', 'DATETIME') or \
-        type.startswith('TEXT(') or type.startswith('BLOB(')
+        typ.startswith('TEXT(') or typ.startswith('BLOB(')
 
 
 class GPKGCheckException(Exception):

From 6e4b50c32e72fe2f68d3c69ba85e91f9a6379242 Mon Sep 17 00:00:00 2001
From: Even Rouault <even.rouault@spatialys.com>
Date: Thu, 29 Nov 2018 11:56:33 +0100
Subject: [PATCH 088/488] SQLite: do not run spatial index creation in rollback
 code

---
 gdal/ogr/ogrsf_frmts/sqlite/ogrsqlitedatasource.cpp | 2 --
 1 file changed, 2 deletions(-)

diff --git a/gdal/ogr/ogrsf_frmts/sqlite/ogrsqlitedatasource.cpp b/gdal/ogr/ogrsf_frmts/sqlite/ogrsqlitedatasource.cpp
index 09b06d54eb8e..7eab34e63196 100644
--- a/gdal/ogr/ogrsf_frmts/sqlite/ogrsqlitedatasource.cpp
+++ b/gdal/ogr/ogrsf_frmts/sqlite/ogrsqlitedatasource.cpp
@@ -2915,7 +2915,6 @@ OGRErr OGRSQLiteDataSource::CommitTransaction()
             {
                 OGRSQLiteTableLayer* poLayer = (OGRSQLiteTableLayer*) papoLayers[iLayer];
                 poLayer->RunDeferredCreationIfNecessary();
-                //poLayer->CreateSpatialIndexIfNecessary();
             }
         }
     }
@@ -2953,7 +2952,6 @@ OGRErr OGRSQLiteDataSource::RollbackTransaction()
             {
                 OGRSQLiteTableLayer* poLayer = (OGRSQLiteTableLayer*) papoLayers[iLayer];
                 poLayer->RunDeferredCreationIfNecessary();
-                poLayer->CreateSpatialIndexIfNecessary();
             }
         }
 

From 37c175741c6a8ce9733cb1c66421ece6e7a32d57 Mon Sep 17 00:00:00 2001
From: Mathijs Dumon <mathijs.dumon@gmail.com>
Date: Thu, 29 Nov 2018 11:59:49 +0100
Subject: [PATCH 089/488] MSSQLSPATIAL: Adding configuration option
 MSSQLSPATIAL_ALWAYS_OUTPUT_FID (#1101)

Adding configuration option to always output the OGR_FID column for inserted entities. Makes sure views or sequence generated ID fields are supported
---
 gdal/ogr/ogrsf_frmts/mssqlspatial/drv_mssqlspatial.html    | 1 +
 gdal/ogr/ogrsf_frmts/mssqlspatial/ogr_mssqlspatial.h       | 2 ++
 .../ogrsf_frmts/mssqlspatial/ogrmssqlspatialdatasource.cpp | 1 +
 .../ogrsf_frmts/mssqlspatial/ogrmssqlspatialtablelayer.cpp | 7 ++++---
 4 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/gdal/ogr/ogrsf_frmts/mssqlspatial/drv_mssqlspatial.html b/gdal/ogr/ogrsf_frmts/mssqlspatial/drv_mssqlspatial.html
index d70cdf89270e..71c62b41e840 100644
--- a/gdal/ogr/ogrsf_frmts/mssqlspatial/drv_mssqlspatial.html
+++ b/gdal/ogr/ogrsf_frmts/mssqlspatial/drv_mssqlspatial.html
@@ -133,6 +133,7 @@ <h2>Configuration options</h2>
     this parameter is TRUE, otherwise the parameter is ignored by the driver.</li>
 <li><b>MSSQLSPATIAL_BCP_SIZE</b>: (From GDAL 2.1.0) Specifies the bulk insert batch size. The larger value makes the insert faster, but consumes more memory. Default = 1000.</li>
 <li><b>MSSQLSPATIAL_OGR_FID</b>: Override FID column name. Default = ogr_fid.</li>
+<li><b>MSSQLSPATIAL_ALWAYS_OUTPUT_FID</b>: Always return the OGR_FID column - even if it is not a true IDENTITY column - when creating features. Default = "NO".</li>
 <li><b>MSSQLSPATIAL_USE_GEOMETRY_COLUMNS</b>: Use/create geometry_columns metadata table in the database. Default = "YES".</li>
 <li><b>MSSQLSPATIAL_LIST_ALL_TABLES</b>: Use mssql catalog to list available layers. Default = "NO".</li>
 </ul>
diff --git a/gdal/ogr/ogrsf_frmts/mssqlspatial/ogr_mssqlspatial.h b/gdal/ogr/ogrsf_frmts/mssqlspatial/ogr_mssqlspatial.h
index 8612c97ae0c3..071e1a5e3fe1 100644
--- a/gdal/ogr/ogrsf_frmts/mssqlspatial/ogr_mssqlspatial.h
+++ b/gdal/ogr/ogrsf_frmts/mssqlspatial/ogr_mssqlspatial.h
@@ -449,6 +449,7 @@ class OGRMSSQLSpatialDataSource final: public OGRDataSource
     int                 nGeometryFormat;
 
     int                 bUseGeometryColumns;
+    bool                bAlwaysOutputFid;
 
     int                 bListAllTables;
 
@@ -487,6 +488,7 @@ class OGRMSSQLSpatialDataSource final: public OGRDataSource
 
     int                 GetGeometryFormat() { return nGeometryFormat; }
     int                 UseGeometryColumns() { return bUseGeometryColumns; }
+    bool                AlwaysOutputFid() { return bAlwaysOutputFid; }
 
     virtual OGRErr       DeleteLayer( int iLayer ) override;
     virtual OGRLayer    *ICreateLayer( const char *,
diff --git a/gdal/ogr/ogrsf_frmts/mssqlspatial/ogrmssqlspatialdatasource.cpp b/gdal/ogr/ogrsf_frmts/mssqlspatial/ogrmssqlspatialdatasource.cpp
index 629afc156ae0..b8c5c5333f05 100644
--- a/gdal/ogr/ogrsf_frmts/mssqlspatial/ogrmssqlspatialdatasource.cpp
+++ b/gdal/ogr/ogrsf_frmts/mssqlspatial/ogrmssqlspatialdatasource.cpp
@@ -53,6 +53,7 @@ OGRMSSQLSpatialDataSource::OGRMSSQLSpatialDataSource() :
     pszConnection = nullptr;
 
     bUseGeometryColumns = CPLTestBool(CPLGetConfigOption("MSSQLSPATIAL_USE_GEOMETRY_COLUMNS", "YES"));
+    bAlwaysOutputFid = CPLTestBool(CPLGetConfigOption("MSSQLSPATIAL_ALWAYS_OUTPUT_FID", "NO"));
     bListAllTables = CPLTestBool(CPLGetConfigOption("MSSQLSPATIAL_LIST_ALL_TABLES", "NO"));
 
     const char* nBCPSizeParam = CPLGetConfigOption("MSSQLSPATIAL_BCP_SIZE", nullptr);
diff --git a/gdal/ogr/ogrsf_frmts/mssqlspatial/ogrmssqlspatialtablelayer.cpp b/gdal/ogr/ogrsf_frmts/mssqlspatial/ogrmssqlspatialtablelayer.cpp
index 0cbf181929cd..81fcf1c51985 100644
--- a/gdal/ogr/ogrsf_frmts/mssqlspatial/ogrmssqlspatialtablelayer.cpp
+++ b/gdal/ogr/ogrsf_frmts/mssqlspatial/ogrmssqlspatialtablelayer.cpp
@@ -2060,7 +2060,8 @@ OGRErr OGRMSSQLSpatialTableLayer::ICreateFeature( OGRFeature *poFeature )
     if (oStatement.GetCommand()[strlen(oStatement.GetCommand()) - 1] != ']')
     {
         /* no fields were added */
-        if (nFID == OGRNullFID && pszFIDColumn != nullptr && bIsIdentityFid)
+
+        if (nFID == OGRNullFID && pszFIDColumn != nullptr && (bIsIdentityFid || poDS->AlwaysOutputFid() ))
             oStatement.Appendf(" OUTPUT INSERTED.[%s] DEFAULT VALUES;", GetFIDColumn());
         else
             oStatement.Appendf( "DEFAULT VALUES;" );
@@ -2068,7 +2069,7 @@ OGRErr OGRMSSQLSpatialTableLayer::ICreateFeature( OGRFeature *poFeature )
     else
     {
         /* prepend VALUES section */
-        if (nFID == OGRNullFID && pszFIDColumn != nullptr && bIsIdentityFid)
+        if (nFID == OGRNullFID && pszFIDColumn != nullptr && (bIsIdentityFid || poDS->AlwaysOutputFid() ))
             oStatement.Appendf(") OUTPUT INSERTED.[%s] VALUES (", GetFIDColumn());
         else
             oStatement.Appendf( ") VALUES (" );
@@ -2266,7 +2267,7 @@ OGRErr OGRMSSQLSpatialTableLayer::ICreateFeature( OGRFeature *poFeature )
 
         return OGRERR_FAILURE;
     }
-    else if(nFID == OGRNullFID && pszFIDColumn != nullptr && bIsIdentityFid)
+    else if(nFID == OGRNullFID && pszFIDColumn != nullptr && (bIsIdentityFid || poDS->AlwaysOutputFid() ))
     {
         // fetch new ID and set it into the feature
         if (oStatement.Fetch())

From 330939d525652662c1e4b664dd205be1ecf92783 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?M=C4=81ris=20Narti=C5=A1s?= <mn@sungis.lv>
Date: Thu, 29 Nov 2018 13:05:02 +0200
Subject: [PATCH 090/488] SENTINEL2: Add support of S2x_MSIL2A files (#1069)

S2xMSIL2A files have two product types (S2MSI2A and S2MSI2Ap).
This change allows to open both of them either compressed or uncompressed.

Tested on following files:
S2A_MSIL2A_20170823T094031_N0205_R036_T34VFJ_20170823T094252.zip
S2B_MSIL2A_20180823T094029_N0208_R036_T34VFJ_20180823T122014.zip
S2A_MSIL2A_20180818T094031_N0208_R036_T34VFJ_20180818T120345.zip
---
 .../R10m/T34VFJ_20180818T094031_AOT_10m.jp2   | Bin 0 -> 446 bytes
 .../R10m/T34VFJ_20180818T094031_B02_10m.jp2   | Bin 0 -> 446 bytes
 .../R10m/T34VFJ_20180818T094031_B03_10m.jp2   | Bin 0 -> 446 bytes
 .../R10m/T34VFJ_20180818T094031_B04_10m.jp2   | Bin 0 -> 446 bytes
 .../R10m/T34VFJ_20180818T094031_B08_10m.jp2   | Bin 0 -> 446 bytes
 .../R10m/T34VFJ_20180818T094031_TCI_10m.jp2   | Bin 0 -> 446 bytes
 .../R10m/T34VFJ_20180818T094031_WVP_10m.jp2   | Bin 0 -> 446 bytes
 .../R20m/T34VFJ_20180818T094031_AOT_20m.jp2   | Bin 0 -> 446 bytes
 .../R20m/T34VFJ_20180818T094031_B02_20m.jp2   | Bin 0 -> 446 bytes
 .../R20m/T34VFJ_20180818T094031_B03_20m.jp2   | Bin 0 -> 446 bytes
 .../R20m/T34VFJ_20180818T094031_B04_20m.jp2   | Bin 0 -> 446 bytes
 .../R20m/T34VFJ_20180818T094031_B05_20m.jp2   | Bin 0 -> 446 bytes
 .../R20m/T34VFJ_20180818T094031_B06_20m.jp2   | Bin 0 -> 446 bytes
 .../R20m/T34VFJ_20180818T094031_B07_20m.jp2   | Bin 0 -> 446 bytes
 .../R20m/T34VFJ_20180818T094031_B11_20m.jp2   | Bin 0 -> 446 bytes
 .../R20m/T34VFJ_20180818T094031_B12_20m.jp2   | Bin 0 -> 446 bytes
 .../R20m/T34VFJ_20180818T094031_B8A_20m.jp2   | Bin 0 -> 446 bytes
 .../R20m/T34VFJ_20180818T094031_SCL_20m.jp2   | Bin 0 -> 446 bytes
 .../R20m/T34VFJ_20180818T094031_TCI_20m.jp2   | Bin 0 -> 446 bytes
 .../R20m/T34VFJ_20180818T094031_WVP_20m.jp2   | Bin 0 -> 446 bytes
 .../R60m/T34VFJ_20180818T094031_AOT_60m.jp2   | Bin 0 -> 446 bytes
 .../R60m/T34VFJ_20180818T094031_B01_60m.jp2   | Bin 0 -> 446 bytes
 .../R60m/T34VFJ_20180818T094031_B02_60m.jp2   | Bin 0 -> 446 bytes
 .../R60m/T34VFJ_20180818T094031_B03_60m.jp2   | Bin 0 -> 446 bytes
 .../R60m/T34VFJ_20180818T094031_B04_60m.jp2   | Bin 0 -> 446 bytes
 .../R60m/T34VFJ_20180818T094031_B05_60m.jp2   | Bin 0 -> 446 bytes
 .../R60m/T34VFJ_20180818T094031_B06_60m.jp2   | Bin 0 -> 446 bytes
 .../R60m/T34VFJ_20180818T094031_B07_60m.jp2   | Bin 0 -> 446 bytes
 .../R60m/T34VFJ_20180818T094031_B09_60m.jp2   | Bin 0 -> 446 bytes
 .../R60m/T34VFJ_20180818T094031_B11_60m.jp2   | Bin 0 -> 446 bytes
 .../R60m/T34VFJ_20180818T094031_B12_60m.jp2   | Bin 0 -> 446 bytes
 .../R60m/T34VFJ_20180818T094031_B8A_60m.jp2   | Bin 0 -> 446 bytes
 .../R60m/T34VFJ_20180818T094031_SCL_60m.jp2   | Bin 0 -> 446 bytes
 .../R60m/T34VFJ_20180818T094031_TCI_60m.jp2   | Bin 0 -> 446 bytes
 .../R60m/T34VFJ_20180818T094031_WVP_60m.jp2   | Bin 0 -> 446 bytes
 .../MTD_TL.xml                                |  71 +++
 .../MTD_MSIL2A.xml                            | 206 +++++++
 .../L2A_T34VFJ_20170823T094031_AOT_10m.jp2    | Bin 0 -> 446 bytes
 .../L2A_T34VFJ_20170823T094031_B02_10m.jp2    | Bin 0 -> 446 bytes
 .../L2A_T34VFJ_20170823T094031_B03_10m.jp2    | Bin 0 -> 446 bytes
 .../L2A_T34VFJ_20170823T094031_B04_10m.jp2    | Bin 0 -> 446 bytes
 .../L2A_T34VFJ_20170823T094031_B08_10m.jp2    | Bin 0 -> 446 bytes
 .../L2A_T34VFJ_20170823T094031_TCI_10m.jp2    | Bin 0 -> 446 bytes
 .../L2A_T34VFJ_20170823T094031_WVP_10m.jp2    | Bin 0 -> 446 bytes
 .../L2A_T34VFJ_20170823T094031_AOT_20m.jp2    | Bin 0 -> 446 bytes
 .../L2A_T34VFJ_20170823T094031_B02_20m.jp2    | Bin 0 -> 446 bytes
 .../L2A_T34VFJ_20170823T094031_B03_20m.jp2    | Bin 0 -> 446 bytes
 .../L2A_T34VFJ_20170823T094031_B04_20m.jp2    | Bin 0 -> 446 bytes
 .../L2A_T34VFJ_20170823T094031_B05_20m.jp2    | Bin 0 -> 446 bytes
 .../L2A_T34VFJ_20170823T094031_B06_20m.jp2    | Bin 0 -> 446 bytes
 .../L2A_T34VFJ_20170823T094031_B07_20m.jp2    | Bin 0 -> 446 bytes
 .../L2A_T34VFJ_20170823T094031_B11_20m.jp2    | Bin 0 -> 446 bytes
 .../L2A_T34VFJ_20170823T094031_B12_20m.jp2    | Bin 0 -> 446 bytes
 .../L2A_T34VFJ_20170823T094031_B8A_20m.jp2    | Bin 0 -> 446 bytes
 .../L2A_T34VFJ_20170823T094031_SCL_20m.jp2    | Bin 0 -> 446 bytes
 .../L2A_T34VFJ_20170823T094031_TCI_20m.jp2    | Bin 0 -> 446 bytes
 .../L2A_T34VFJ_20170823T094031_VIS_20m.jp2    | Bin 0 -> 446 bytes
 .../L2A_T34VFJ_20170823T094031_WVP_20m.jp2    | Bin 0 -> 446 bytes
 .../L2A_T34VFJ_20170823T094031_AOT_60m.jp2    | Bin 0 -> 446 bytes
 .../L2A_T34VFJ_20170823T094031_B01_60m.jp2    | Bin 0 -> 446 bytes
 .../L2A_T34VFJ_20170823T094031_B02_60m.jp2    | Bin 0 -> 446 bytes
 .../L2A_T34VFJ_20170823T094031_B03_60m.jp2    | Bin 0 -> 446 bytes
 .../L2A_T34VFJ_20170823T094031_B04_60m.jp2    | Bin 0 -> 446 bytes
 .../L2A_T34VFJ_20170823T094031_B05_60m.jp2    | Bin 0 -> 446 bytes
 .../L2A_T34VFJ_20170823T094031_B06_60m.jp2    | Bin 0 -> 446 bytes
 .../L2A_T34VFJ_20170823T094031_B07_60m.jp2    | Bin 0 -> 446 bytes
 .../L2A_T34VFJ_20170823T094031_B09_60m.jp2    | Bin 0 -> 446 bytes
 .../L2A_T34VFJ_20170823T094031_B11_60m.jp2    | Bin 0 -> 446 bytes
 .../L2A_T34VFJ_20170823T094031_B12_60m.jp2    | Bin 0 -> 446 bytes
 .../L2A_T34VFJ_20170823T094031_B8A_60m.jp2    | Bin 0 -> 446 bytes
 .../L2A_T34VFJ_20170823T094031_SCL_60m.jp2    | Bin 0 -> 446 bytes
 .../L2A_T34VFJ_20170823T094031_TCI_60m.jp2    | Bin 0 -> 446 bytes
 .../L2A_T34VFJ_20170823T094031_WVP_60m.jp2    | Bin 0 -> 446 bytes
 .../MTD_TL.xml                                |  78 +++
 .../MTD_MSIL2A.xml                            | 250 +++++++++
 autotest/gdrivers/sentinel2.py                | 513 ++++++++++++++++++
 gdal/frmts/sentinel2/frmt_sentinel2.html      |   5 -
 gdal/frmts/sentinel2/sentinel2dataset.cpp     | 449 +++++++++++++--
 78 files changed, 1520 insertions(+), 52 deletions(-)
 create mode 100644 autotest/gdrivers/data/fake_sentinel2_l2a_MSIL2A/S2A_MSIL2A_20180818T094031_N0208_R036_T34VFJ_20180818T120345.SAFE/GRANULE/L2A_T34VFJ_A016478_20180818T094030/IMG_DATA/R10m/T34VFJ_20180818T094031_AOT_10m.jp2
 create mode 100644 autotest/gdrivers/data/fake_sentinel2_l2a_MSIL2A/S2A_MSIL2A_20180818T094031_N0208_R036_T34VFJ_20180818T120345.SAFE/GRANULE/L2A_T34VFJ_A016478_20180818T094030/IMG_DATA/R10m/T34VFJ_20180818T094031_B02_10m.jp2
 create mode 100644 autotest/gdrivers/data/fake_sentinel2_l2a_MSIL2A/S2A_MSIL2A_20180818T094031_N0208_R036_T34VFJ_20180818T120345.SAFE/GRANULE/L2A_T34VFJ_A016478_20180818T094030/IMG_DATA/R10m/T34VFJ_20180818T094031_B03_10m.jp2
 create mode 100644 autotest/gdrivers/data/fake_sentinel2_l2a_MSIL2A/S2A_MSIL2A_20180818T094031_N0208_R036_T34VFJ_20180818T120345.SAFE/GRANULE/L2A_T34VFJ_A016478_20180818T094030/IMG_DATA/R10m/T34VFJ_20180818T094031_B04_10m.jp2
 create mode 100644 autotest/gdrivers/data/fake_sentinel2_l2a_MSIL2A/S2A_MSIL2A_20180818T094031_N0208_R036_T34VFJ_20180818T120345.SAFE/GRANULE/L2A_T34VFJ_A016478_20180818T094030/IMG_DATA/R10m/T34VFJ_20180818T094031_B08_10m.jp2
 create mode 100644 autotest/gdrivers/data/fake_sentinel2_l2a_MSIL2A/S2A_MSIL2A_20180818T094031_N0208_R036_T34VFJ_20180818T120345.SAFE/GRANULE/L2A_T34VFJ_A016478_20180818T094030/IMG_DATA/R10m/T34VFJ_20180818T094031_TCI_10m.jp2
 create mode 100644 autotest/gdrivers/data/fake_sentinel2_l2a_MSIL2A/S2A_MSIL2A_20180818T094031_N0208_R036_T34VFJ_20180818T120345.SAFE/GRANULE/L2A_T34VFJ_A016478_20180818T094030/IMG_DATA/R10m/T34VFJ_20180818T094031_WVP_10m.jp2
 create mode 100644 autotest/gdrivers/data/fake_sentinel2_l2a_MSIL2A/S2A_MSIL2A_20180818T094031_N0208_R036_T34VFJ_20180818T120345.SAFE/GRANULE/L2A_T34VFJ_A016478_20180818T094030/IMG_DATA/R20m/T34VFJ_20180818T094031_AOT_20m.jp2
 create mode 100644 autotest/gdrivers/data/fake_sentinel2_l2a_MSIL2A/S2A_MSIL2A_20180818T094031_N0208_R036_T34VFJ_20180818T120345.SAFE/GRANULE/L2A_T34VFJ_A016478_20180818T094030/IMG_DATA/R20m/T34VFJ_20180818T094031_B02_20m.jp2
 create mode 100644 autotest/gdrivers/data/fake_sentinel2_l2a_MSIL2A/S2A_MSIL2A_20180818T094031_N0208_R036_T34VFJ_20180818T120345.SAFE/GRANULE/L2A_T34VFJ_A016478_20180818T094030/IMG_DATA/R20m/T34VFJ_20180818T094031_B03_20m.jp2
 create mode 100644 autotest/gdrivers/data/fake_sentinel2_l2a_MSIL2A/S2A_MSIL2A_20180818T094031_N0208_R036_T34VFJ_20180818T120345.SAFE/GRANULE/L2A_T34VFJ_A016478_20180818T094030/IMG_DATA/R20m/T34VFJ_20180818T094031_B04_20m.jp2
 create mode 100644 autotest/gdrivers/data/fake_sentinel2_l2a_MSIL2A/S2A_MSIL2A_20180818T094031_N0208_R036_T34VFJ_20180818T120345.SAFE/GRANULE/L2A_T34VFJ_A016478_20180818T094030/IMG_DATA/R20m/T34VFJ_20180818T094031_B05_20m.jp2
 create mode 100644 autotest/gdrivers/data/fake_sentinel2_l2a_MSIL2A/S2A_MSIL2A_20180818T094031_N0208_R036_T34VFJ_20180818T120345.SAFE/GRANULE/L2A_T34VFJ_A016478_20180818T094030/IMG_DATA/R20m/T34VFJ_20180818T094031_B06_20m.jp2
 create mode 100644 autotest/gdrivers/data/fake_sentinel2_l2a_MSIL2A/S2A_MSIL2A_20180818T094031_N0208_R036_T34VFJ_20180818T120345.SAFE/GRANULE/L2A_T34VFJ_A016478_20180818T094030/IMG_DATA/R20m/T34VFJ_20180818T094031_B07_20m.jp2
 create mode 100644 autotest/gdrivers/data/fake_sentinel2_l2a_MSIL2A/S2A_MSIL2A_20180818T094031_N0208_R036_T34VFJ_20180818T120345.SAFE/GRANULE/L2A_T34VFJ_A016478_20180818T094030/IMG_DATA/R20m/T34VFJ_20180818T094031_B11_20m.jp2
 create mode 100644 autotest/gdrivers/data/fake_sentinel2_l2a_MSIL2A/S2A_MSIL2A_20180818T094031_N0208_R036_T34VFJ_20180818T120345.SAFE/GRANULE/L2A_T34VFJ_A016478_20180818T094030/IMG_DATA/R20m/T34VFJ_20180818T094031_B12_20m.jp2
 create mode 100644 autotest/gdrivers/data/fake_sentinel2_l2a_MSIL2A/S2A_MSIL2A_20180818T094031_N0208_R036_T34VFJ_20180818T120345.SAFE/GRANULE/L2A_T34VFJ_A016478_20180818T094030/IMG_DATA/R20m/T34VFJ_20180818T094031_B8A_20m.jp2
 create mode 100644 autotest/gdrivers/data/fake_sentinel2_l2a_MSIL2A/S2A_MSIL2A_20180818T094031_N0208_R036_T34VFJ_20180818T120345.SAFE/GRANULE/L2A_T34VFJ_A016478_20180818T094030/IMG_DATA/R20m/T34VFJ_20180818T094031_SCL_20m.jp2
 create mode 100644 autotest/gdrivers/data/fake_sentinel2_l2a_MSIL2A/S2A_MSIL2A_20180818T094031_N0208_R036_T34VFJ_20180818T120345.SAFE/GRANULE/L2A_T34VFJ_A016478_20180818T094030/IMG_DATA/R20m/T34VFJ_20180818T094031_TCI_20m.jp2
 create mode 100644 autotest/gdrivers/data/fake_sentinel2_l2a_MSIL2A/S2A_MSIL2A_20180818T094031_N0208_R036_T34VFJ_20180818T120345.SAFE/GRANULE/L2A_T34VFJ_A016478_20180818T094030/IMG_DATA/R20m/T34VFJ_20180818T094031_WVP_20m.jp2
 create mode 100644 autotest/gdrivers/data/fake_sentinel2_l2a_MSIL2A/S2A_MSIL2A_20180818T094031_N0208_R036_T34VFJ_20180818T120345.SAFE/GRANULE/L2A_T34VFJ_A016478_20180818T094030/IMG_DATA/R60m/T34VFJ_20180818T094031_AOT_60m.jp2
 create mode 100644 autotest/gdrivers/data/fake_sentinel2_l2a_MSIL2A/S2A_MSIL2A_20180818T094031_N0208_R036_T34VFJ_20180818T120345.SAFE/GRANULE/L2A_T34VFJ_A016478_20180818T094030/IMG_DATA/R60m/T34VFJ_20180818T094031_B01_60m.jp2
 create mode 100644 autotest/gdrivers/data/fake_sentinel2_l2a_MSIL2A/S2A_MSIL2A_20180818T094031_N0208_R036_T34VFJ_20180818T120345.SAFE/GRANULE/L2A_T34VFJ_A016478_20180818T094030/IMG_DATA/R60m/T34VFJ_20180818T094031_B02_60m.jp2
 create mode 100644 autotest/gdrivers/data/fake_sentinel2_l2a_MSIL2A/S2A_MSIL2A_20180818T094031_N0208_R036_T34VFJ_20180818T120345.SAFE/GRANULE/L2A_T34VFJ_A016478_20180818T094030/IMG_DATA/R60m/T34VFJ_20180818T094031_B03_60m.jp2
 create mode 100644 autotest/gdrivers/data/fake_sentinel2_l2a_MSIL2A/S2A_MSIL2A_20180818T094031_N0208_R036_T34VFJ_20180818T120345.SAFE/GRANULE/L2A_T34VFJ_A016478_20180818T094030/IMG_DATA/R60m/T34VFJ_20180818T094031_B04_60m.jp2
 create mode 100644 autotest/gdrivers/data/fake_sentinel2_l2a_MSIL2A/S2A_MSIL2A_20180818T094031_N0208_R036_T34VFJ_20180818T120345.SAFE/GRANULE/L2A_T34VFJ_A016478_20180818T094030/IMG_DATA/R60m/T34VFJ_20180818T094031_B05_60m.jp2
 create mode 100644 autotest/gdrivers/data/fake_sentinel2_l2a_MSIL2A/S2A_MSIL2A_20180818T094031_N0208_R036_T34VFJ_20180818T120345.SAFE/GRANULE/L2A_T34VFJ_A016478_20180818T094030/IMG_DATA/R60m/T34VFJ_20180818T094031_B06_60m.jp2
 create mode 100644 autotest/gdrivers/data/fake_sentinel2_l2a_MSIL2A/S2A_MSIL2A_20180818T094031_N0208_R036_T34VFJ_20180818T120345.SAFE/GRANULE/L2A_T34VFJ_A016478_20180818T094030/IMG_DATA/R60m/T34VFJ_20180818T094031_B07_60m.jp2
 create mode 100644 autotest/gdrivers/data/fake_sentinel2_l2a_MSIL2A/S2A_MSIL2A_20180818T094031_N0208_R036_T34VFJ_20180818T120345.SAFE/GRANULE/L2A_T34VFJ_A016478_20180818T094030/IMG_DATA/R60m/T34VFJ_20180818T094031_B09_60m.jp2
 create mode 100644 autotest/gdrivers/data/fake_sentinel2_l2a_MSIL2A/S2A_MSIL2A_20180818T094031_N0208_R036_T34VFJ_20180818T120345.SAFE/GRANULE/L2A_T34VFJ_A016478_20180818T094030/IMG_DATA/R60m/T34VFJ_20180818T094031_B11_60m.jp2
 create mode 100644 autotest/gdrivers/data/fake_sentinel2_l2a_MSIL2A/S2A_MSIL2A_20180818T094031_N0208_R036_T34VFJ_20180818T120345.SAFE/GRANULE/L2A_T34VFJ_A016478_20180818T094030/IMG_DATA/R60m/T34VFJ_20180818T094031_B12_60m.jp2
 create mode 100644 autotest/gdrivers/data/fake_sentinel2_l2a_MSIL2A/S2A_MSIL2A_20180818T094031_N0208_R036_T34VFJ_20180818T120345.SAFE/GRANULE/L2A_T34VFJ_A016478_20180818T094030/IMG_DATA/R60m/T34VFJ_20180818T094031_B8A_60m.jp2
 create mode 100644 autotest/gdrivers/data/fake_sentinel2_l2a_MSIL2A/S2A_MSIL2A_20180818T094031_N0208_R036_T34VFJ_20180818T120345.SAFE/GRANULE/L2A_T34VFJ_A016478_20180818T094030/IMG_DATA/R60m/T34VFJ_20180818T094031_SCL_60m.jp2
 create mode 100644 autotest/gdrivers/data/fake_sentinel2_l2a_MSIL2A/S2A_MSIL2A_20180818T094031_N0208_R036_T34VFJ_20180818T120345.SAFE/GRANULE/L2A_T34VFJ_A016478_20180818T094030/IMG_DATA/R60m/T34VFJ_20180818T094031_TCI_60m.jp2
 create mode 100644 autotest/gdrivers/data/fake_sentinel2_l2a_MSIL2A/S2A_MSIL2A_20180818T094031_N0208_R036_T34VFJ_20180818T120345.SAFE/GRANULE/L2A_T34VFJ_A016478_20180818T094030/IMG_DATA/R60m/T34VFJ_20180818T094031_WVP_60m.jp2
 create mode 100644 autotest/gdrivers/data/fake_sentinel2_l2a_MSIL2A/S2A_MSIL2A_20180818T094031_N0208_R036_T34VFJ_20180818T120345.SAFE/GRANULE/L2A_T34VFJ_A016478_20180818T094030/MTD_TL.xml
 create mode 100644 autotest/gdrivers/data/fake_sentinel2_l2a_MSIL2A/S2A_MSIL2A_20180818T094031_N0208_R036_T34VFJ_20180818T120345.SAFE/MTD_MSIL2A.xml
 create mode 100644 autotest/gdrivers/data/fake_sentinel2_l2a_MSIL2Ap/S2A_MSIL2A_20170823T094031_N0205_R036_T34VFJ_20170823T094252.SAFE/GRANULE/L2A_T34VFJ_A011330_20170823T094252/IMG_DATA/R10m/L2A_T34VFJ_20170823T094031_AOT_10m.jp2
 create mode 100644 autotest/gdrivers/data/fake_sentinel2_l2a_MSIL2Ap/S2A_MSIL2A_20170823T094031_N0205_R036_T34VFJ_20170823T094252.SAFE/GRANULE/L2A_T34VFJ_A011330_20170823T094252/IMG_DATA/R10m/L2A_T34VFJ_20170823T094031_B02_10m.jp2
 create mode 100644 autotest/gdrivers/data/fake_sentinel2_l2a_MSIL2Ap/S2A_MSIL2A_20170823T094031_N0205_R036_T34VFJ_20170823T094252.SAFE/GRANULE/L2A_T34VFJ_A011330_20170823T094252/IMG_DATA/R10m/L2A_T34VFJ_20170823T094031_B03_10m.jp2
 create mode 100644 autotest/gdrivers/data/fake_sentinel2_l2a_MSIL2Ap/S2A_MSIL2A_20170823T094031_N0205_R036_T34VFJ_20170823T094252.SAFE/GRANULE/L2A_T34VFJ_A011330_20170823T094252/IMG_DATA/R10m/L2A_T34VFJ_20170823T094031_B04_10m.jp2
 create mode 100644 autotest/gdrivers/data/fake_sentinel2_l2a_MSIL2Ap/S2A_MSIL2A_20170823T094031_N0205_R036_T34VFJ_20170823T094252.SAFE/GRANULE/L2A_T34VFJ_A011330_20170823T094252/IMG_DATA/R10m/L2A_T34VFJ_20170823T094031_B08_10m.jp2
 create mode 100644 autotest/gdrivers/data/fake_sentinel2_l2a_MSIL2Ap/S2A_MSIL2A_20170823T094031_N0205_R036_T34VFJ_20170823T094252.SAFE/GRANULE/L2A_T34VFJ_A011330_20170823T094252/IMG_DATA/R10m/L2A_T34VFJ_20170823T094031_TCI_10m.jp2
 create mode 100644 autotest/gdrivers/data/fake_sentinel2_l2a_MSIL2Ap/S2A_MSIL2A_20170823T094031_N0205_R036_T34VFJ_20170823T094252.SAFE/GRANULE/L2A_T34VFJ_A011330_20170823T094252/IMG_DATA/R10m/L2A_T34VFJ_20170823T094031_WVP_10m.jp2
 create mode 100644 autotest/gdrivers/data/fake_sentinel2_l2a_MSIL2Ap/S2A_MSIL2A_20170823T094031_N0205_R036_T34VFJ_20170823T094252.SAFE/GRANULE/L2A_T34VFJ_A011330_20170823T094252/IMG_DATA/R20m/L2A_T34VFJ_20170823T094031_AOT_20m.jp2
 create mode 100644 autotest/gdrivers/data/fake_sentinel2_l2a_MSIL2Ap/S2A_MSIL2A_20170823T094031_N0205_R036_T34VFJ_20170823T094252.SAFE/GRANULE/L2A_T34VFJ_A011330_20170823T094252/IMG_DATA/R20m/L2A_T34VFJ_20170823T094031_B02_20m.jp2
 create mode 100644 autotest/gdrivers/data/fake_sentinel2_l2a_MSIL2Ap/S2A_MSIL2A_20170823T094031_N0205_R036_T34VFJ_20170823T094252.SAFE/GRANULE/L2A_T34VFJ_A011330_20170823T094252/IMG_DATA/R20m/L2A_T34VFJ_20170823T094031_B03_20m.jp2
 create mode 100644 autotest/gdrivers/data/fake_sentinel2_l2a_MSIL2Ap/S2A_MSIL2A_20170823T094031_N0205_R036_T34VFJ_20170823T094252.SAFE/GRANULE/L2A_T34VFJ_A011330_20170823T094252/IMG_DATA/R20m/L2A_T34VFJ_20170823T094031_B04_20m.jp2
 create mode 100644 autotest/gdrivers/data/fake_sentinel2_l2a_MSIL2Ap/S2A_MSIL2A_20170823T094031_N0205_R036_T34VFJ_20170823T094252.SAFE/GRANULE/L2A_T34VFJ_A011330_20170823T094252/IMG_DATA/R20m/L2A_T34VFJ_20170823T094031_B05_20m.jp2
 create mode 100644 autotest/gdrivers/data/fake_sentinel2_l2a_MSIL2Ap/S2A_MSIL2A_20170823T094031_N0205_R036_T34VFJ_20170823T094252.SAFE/GRANULE/L2A_T34VFJ_A011330_20170823T094252/IMG_DATA/R20m/L2A_T34VFJ_20170823T094031_B06_20m.jp2
 create mode 100644 autotest/gdrivers/data/fake_sentinel2_l2a_MSIL2Ap/S2A_MSIL2A_20170823T094031_N0205_R036_T34VFJ_20170823T094252.SAFE/GRANULE/L2A_T34VFJ_A011330_20170823T094252/IMG_DATA/R20m/L2A_T34VFJ_20170823T094031_B07_20m.jp2
 create mode 100644 autotest/gdrivers/data/fake_sentinel2_l2a_MSIL2Ap/S2A_MSIL2A_20170823T094031_N0205_R036_T34VFJ_20170823T094252.SAFE/GRANULE/L2A_T34VFJ_A011330_20170823T094252/IMG_DATA/R20m/L2A_T34VFJ_20170823T094031_B11_20m.jp2
 create mode 100644 autotest/gdrivers/data/fake_sentinel2_l2a_MSIL2Ap/S2A_MSIL2A_20170823T094031_N0205_R036_T34VFJ_20170823T094252.SAFE/GRANULE/L2A_T34VFJ_A011330_20170823T094252/IMG_DATA/R20m/L2A_T34VFJ_20170823T094031_B12_20m.jp2
 create mode 100644 autotest/gdrivers/data/fake_sentinel2_l2a_MSIL2Ap/S2A_MSIL2A_20170823T094031_N0205_R036_T34VFJ_20170823T094252.SAFE/GRANULE/L2A_T34VFJ_A011330_20170823T094252/IMG_DATA/R20m/L2A_T34VFJ_20170823T094031_B8A_20m.jp2
 create mode 100644 autotest/gdrivers/data/fake_sentinel2_l2a_MSIL2Ap/S2A_MSIL2A_20170823T094031_N0205_R036_T34VFJ_20170823T094252.SAFE/GRANULE/L2A_T34VFJ_A011330_20170823T094252/IMG_DATA/R20m/L2A_T34VFJ_20170823T094031_SCL_20m.jp2
 create mode 100644 autotest/gdrivers/data/fake_sentinel2_l2a_MSIL2Ap/S2A_MSIL2A_20170823T094031_N0205_R036_T34VFJ_20170823T094252.SAFE/GRANULE/L2A_T34VFJ_A011330_20170823T094252/IMG_DATA/R20m/L2A_T34VFJ_20170823T094031_TCI_20m.jp2
 create mode 100644 autotest/gdrivers/data/fake_sentinel2_l2a_MSIL2Ap/S2A_MSIL2A_20170823T094031_N0205_R036_T34VFJ_20170823T094252.SAFE/GRANULE/L2A_T34VFJ_A011330_20170823T094252/IMG_DATA/R20m/L2A_T34VFJ_20170823T094031_VIS_20m.jp2
 create mode 100644 autotest/gdrivers/data/fake_sentinel2_l2a_MSIL2Ap/S2A_MSIL2A_20170823T094031_N0205_R036_T34VFJ_20170823T094252.SAFE/GRANULE/L2A_T34VFJ_A011330_20170823T094252/IMG_DATA/R20m/L2A_T34VFJ_20170823T094031_WVP_20m.jp2
 create mode 100644 autotest/gdrivers/data/fake_sentinel2_l2a_MSIL2Ap/S2A_MSIL2A_20170823T094031_N0205_R036_T34VFJ_20170823T094252.SAFE/GRANULE/L2A_T34VFJ_A011330_20170823T094252/IMG_DATA/R60m/L2A_T34VFJ_20170823T094031_AOT_60m.jp2
 create mode 100644 autotest/gdrivers/data/fake_sentinel2_l2a_MSIL2Ap/S2A_MSIL2A_20170823T094031_N0205_R036_T34VFJ_20170823T094252.SAFE/GRANULE/L2A_T34VFJ_A011330_20170823T094252/IMG_DATA/R60m/L2A_T34VFJ_20170823T094031_B01_60m.jp2
 create mode 100644 autotest/gdrivers/data/fake_sentinel2_l2a_MSIL2Ap/S2A_MSIL2A_20170823T094031_N0205_R036_T34VFJ_20170823T094252.SAFE/GRANULE/L2A_T34VFJ_A011330_20170823T094252/IMG_DATA/R60m/L2A_T34VFJ_20170823T094031_B02_60m.jp2
 create mode 100644 autotest/gdrivers/data/fake_sentinel2_l2a_MSIL2Ap/S2A_MSIL2A_20170823T094031_N0205_R036_T34VFJ_20170823T094252.SAFE/GRANULE/L2A_T34VFJ_A011330_20170823T094252/IMG_DATA/R60m/L2A_T34VFJ_20170823T094031_B03_60m.jp2
 create mode 100644 autotest/gdrivers/data/fake_sentinel2_l2a_MSIL2Ap/S2A_MSIL2A_20170823T094031_N0205_R036_T34VFJ_20170823T094252.SAFE/GRANULE/L2A_T34VFJ_A011330_20170823T094252/IMG_DATA/R60m/L2A_T34VFJ_20170823T094031_B04_60m.jp2
 create mode 100644 autotest/gdrivers/data/fake_sentinel2_l2a_MSIL2Ap/S2A_MSIL2A_20170823T094031_N0205_R036_T34VFJ_20170823T094252.SAFE/GRANULE/L2A_T34VFJ_A011330_20170823T094252/IMG_DATA/R60m/L2A_T34VFJ_20170823T094031_B05_60m.jp2
 create mode 100644 autotest/gdrivers/data/fake_sentinel2_l2a_MSIL2Ap/S2A_MSIL2A_20170823T094031_N0205_R036_T34VFJ_20170823T094252.SAFE/GRANULE/L2A_T34VFJ_A011330_20170823T094252/IMG_DATA/R60m/L2A_T34VFJ_20170823T094031_B06_60m.jp2
 create mode 100644 autotest/gdrivers/data/fake_sentinel2_l2a_MSIL2Ap/S2A_MSIL2A_20170823T094031_N0205_R036_T34VFJ_20170823T094252.SAFE/GRANULE/L2A_T34VFJ_A011330_20170823T094252/IMG_DATA/R60m/L2A_T34VFJ_20170823T094031_B07_60m.jp2
 create mode 100644 autotest/gdrivers/data/fake_sentinel2_l2a_MSIL2Ap/S2A_MSIL2A_20170823T094031_N0205_R036_T34VFJ_20170823T094252.SAFE/GRANULE/L2A_T34VFJ_A011330_20170823T094252/IMG_DATA/R60m/L2A_T34VFJ_20170823T094031_B09_60m.jp2
 create mode 100644 autotest/gdrivers/data/fake_sentinel2_l2a_MSIL2Ap/S2A_MSIL2A_20170823T094031_N0205_R036_T34VFJ_20170823T094252.SAFE/GRANULE/L2A_T34VFJ_A011330_20170823T094252/IMG_DATA/R60m/L2A_T34VFJ_20170823T094031_B11_60m.jp2
 create mode 100644 autotest/gdrivers/data/fake_sentinel2_l2a_MSIL2Ap/S2A_MSIL2A_20170823T094031_N0205_R036_T34VFJ_20170823T094252.SAFE/GRANULE/L2A_T34VFJ_A011330_20170823T094252/IMG_DATA/R60m/L2A_T34VFJ_20170823T094031_B12_60m.jp2
 create mode 100644 autotest/gdrivers/data/fake_sentinel2_l2a_MSIL2Ap/S2A_MSIL2A_20170823T094031_N0205_R036_T34VFJ_20170823T094252.SAFE/GRANULE/L2A_T34VFJ_A011330_20170823T094252/IMG_DATA/R60m/L2A_T34VFJ_20170823T094031_B8A_60m.jp2
 create mode 100644 autotest/gdrivers/data/fake_sentinel2_l2a_MSIL2Ap/S2A_MSIL2A_20170823T094031_N0205_R036_T34VFJ_20170823T094252.SAFE/GRANULE/L2A_T34VFJ_A011330_20170823T094252/IMG_DATA/R60m/L2A_T34VFJ_20170823T094031_SCL_60m.jp2
 create mode 100644 autotest/gdrivers/data/fake_sentinel2_l2a_MSIL2Ap/S2A_MSIL2A_20170823T094031_N0205_R036_T34VFJ_20170823T094252.SAFE/GRANULE/L2A_T34VFJ_A011330_20170823T094252/IMG_DATA/R60m/L2A_T34VFJ_20170823T094031_TCI_60m.jp2
 create mode 100644 autotest/gdrivers/data/fake_sentinel2_l2a_MSIL2Ap/S2A_MSIL2A_20170823T094031_N0205_R036_T34VFJ_20170823T094252.SAFE/GRANULE/L2A_T34VFJ_A011330_20170823T094252/IMG_DATA/R60m/L2A_T34VFJ_20170823T094031_WVP_60m.jp2
 create mode 100755 autotest/gdrivers/data/fake_sentinel2_l2a_MSIL2Ap/S2A_MSIL2A_20170823T094031_N0205_R036_T34VFJ_20170823T094252.SAFE/GRANULE/L2A_T34VFJ_A011330_20170823T094252/MTD_TL.xml
 create mode 100644 autotest/gdrivers/data/fake_sentinel2_l2a_MSIL2Ap/S2A_MSIL2A_20170823T094031_N0205_R036_T34VFJ_20170823T094252.SAFE/MTD_MSIL2A.xml

diff --git a/autotest/gdrivers/data/fake_sentinel2_l2a_MSIL2A/S2A_MSIL2A_20180818T094031_N0208_R036_T34VFJ_20180818T120345.SAFE/GRANULE/L2A_T34VFJ_A016478_20180818T094030/IMG_DATA/R10m/T34VFJ_20180818T094031_AOT_10m.jp2 b/autotest/gdrivers/data/fake_sentinel2_l2a_MSIL2A/S2A_MSIL2A_20180818T094031_N0208_R036_T34VFJ_20180818T120345.SAFE/GRANULE/L2A_T34VFJ_A016478_20180818T094030/IMG_DATA/R10m/T34VFJ_20180818T094031_AOT_10m.jp2
new file mode 100644
index 0000000000000000000000000000000000000000..a8b7386a5f7082b09868597a801c71a3f6945bfe
GIT binary patch
literal 446
zcmebD)MDUZU|`^3U|?isU<9(%*nvzWHWQQ$RKdUuWrNhQA+be~*fL0LCny_ag)<V{
dg^`6p1!%@BAa;eawSa~OBk2W7jRFE8008b~1Tz2t

literal 0
HcmV?d00001

diff --git a/autotest/gdrivers/data/fake_sentinel2_l2a_MSIL2A/S2A_MSIL2A_20180818T094031_N0208_R036_T34VFJ_20180818T120345.SAFE/GRANULE/L2A_T34VFJ_A016478_20180818T094030/IMG_DATA/R10m/T34VFJ_20180818T094031_B02_10m.jp2 b/autotest/gdrivers/data/fake_sentinel2_l2a_MSIL2A/S2A_MSIL2A_20180818T094031_N0208_R036_T34VFJ_20180818T120345.SAFE/GRANULE/L2A_T34VFJ_A016478_20180818T094030/IMG_DATA/R10m/T34VFJ_20180818T094031_B02_10m.jp2
new file mode 100644
index 0000000000000000000000000000000000000000..a8b7386a5f7082b09868597a801c71a3f6945bfe
GIT binary patch
literal 446
zcmebD)MDUZU|`^3U|?isU<9(%*nvzWHWQQ$RKdUuWrNhQA+be~*fL0LCny_ag)<V{
dg^`6p1!%@BAa;eawSa~OBk2W7jRFE8008b~1Tz2t

literal 0
HcmV?d00001

diff --git a/autotest/gdrivers/data/fake_sentinel2_l2a_MSIL2A/S2A_MSIL2A_20180818T094031_N0208_R036_T34VFJ_20180818T120345.SAFE/GRANULE/L2A_T34VFJ_A016478_20180818T094030/IMG_DATA/R10m/T34VFJ_20180818T094031_B03_10m.jp2 b/autotest/gdrivers/data/fake_sentinel2_l2a_MSIL2A/S2A_MSIL2A_20180818T094031_N0208_R036_T34VFJ_20180818T120345.SAFE/GRANULE/L2A_T34VFJ_A016478_20180818T094030/IMG_DATA/R10m/T34VFJ_20180818T094031_B03_10m.jp2
new file mode 100644
index 0000000000000000000000000000000000000000..a8b7386a5f7082b09868597a801c71a3f6945bfe
GIT binary patch
literal 446
zcmebD)MDUZU|`^3U|?isU<9(%*nvzWHWQQ$RKdUuWrNhQA+be~*fL0LCny_ag)<V{
dg^`6p1!%@BAa;eawSa~OBk2W7jRFE8008b~1Tz2t

literal 0
HcmV?d00001

diff --git a/autotest/gdrivers/data/fake_sentinel2_l2a_MSIL2A/S2A_MSIL2A_20180818T094031_N0208_R036_T34VFJ_20180818T120345.SAFE/GRANULE/L2A_T34VFJ_A016478_20180818T094030/IMG_DATA/R10m/T34VFJ_20180818T094031_B04_10m.jp2 b/autotest/gdrivers/data/fake_sentinel2_l2a_MSIL2A/S2A_MSIL2A_20180818T094031_N0208_R036_T34VFJ_20180818T120345.SAFE/GRANULE/L2A_T34VFJ_A016478_20180818T094030/IMG_DATA/R10m/T34VFJ_20180818T094031_B04_10m.jp2
new file mode 100644
index 0000000000000000000000000000000000000000..a8b7386a5f7082b09868597a801c71a3f6945bfe
GIT binary patch
literal 446
zcmebD)MDUZU|`^3U|?isU<9(%*nvzWHWQQ$RKdUuWrNhQA+be~*fL0LCny_ag)<V{
dg^`6p1!%@BAa;eawSa~OBk2W7jRFE8008b~1Tz2t

literal 0
HcmV?d00001

diff --git a/autotest/gdrivers/data/fake_sentinel2_l2a_MSIL2A/S2A_MSIL2A_20180818T094031_N0208_R036_T34VFJ_20180818T120345.SAFE/GRANULE/L2A_T34VFJ_A016478_20180818T094030/IMG_DATA/R10m/T34VFJ_20180818T094031_B08_10m.jp2 b/autotest/gdrivers/data/fake_sentinel2_l2a_MSIL2A/S2A_MSIL2A_20180818T094031_N0208_R036_T34VFJ_20180818T120345.SAFE/GRANULE/L2A_T34VFJ_A016478_20180818T094030/IMG_DATA/R10m/T34VFJ_20180818T094031_B08_10m.jp2
new file mode 100644
index 0000000000000000000000000000000000000000..a8b7386a5f7082b09868597a801c71a3f6945bfe
GIT binary patch
literal 446
zcmebD)MDUZU|`^3U|?isU<9(%*nvzWHWQQ$RKdUuWrNhQA+be~*fL0LCny_ag)<V{
dg^`6p1!%@BAa;eawSa~OBk2W7jRFE8008b~1Tz2t

literal 0
HcmV?d00001

diff --git a/autotest/gdrivers/data/fake_sentinel2_l2a_MSIL2A/S2A_MSIL2A_20180818T094031_N0208_R036_T34VFJ_20180818T120345.SAFE/GRANULE/L2A_T34VFJ_A016478_20180818T094030/IMG_DATA/R10m/T34VFJ_20180818T094031_TCI_10m.jp2 b/autotest/gdrivers/data/fake_sentinel2_l2a_MSIL2A/S2A_MSIL2A_20180818T094031_N0208_R036_T34VFJ_20180818T120345.SAFE/GRANULE/L2A_T34VFJ_A016478_20180818T094030/IMG_DATA/R10m/T34VFJ_20180818T094031_TCI_10m.jp2
new file mode 100644
index 0000000000000000000000000000000000000000..a8b7386a5f7082b09868597a801c71a3f6945bfe
GIT binary patch
literal 446
zcmebD)MDUZU|`^3U|?isU<9(%*nvzWHWQQ$RKdUuWrNhQA+be~*fL0LCny_ag)<V{
dg^`6p1!%@BAa;eawSa~OBk2W7jRFE8008b~1Tz2t

literal 0
HcmV?d00001

diff --git a/autotest/gdrivers/data/fake_sentinel2_l2a_MSIL2A/S2A_MSIL2A_20180818T094031_N0208_R036_T34VFJ_20180818T120345.SAFE/GRANULE/L2A_T34VFJ_A016478_20180818T094030/IMG_DATA/R10m/T34VFJ_20180818T094031_WVP_10m.jp2 b/autotest/gdrivers/data/fake_sentinel2_l2a_MSIL2A/S2A_MSIL2A_20180818T094031_N0208_R036_T34VFJ_20180818T120345.SAFE/GRANULE/L2A_T34VFJ_A016478_20180818T094030/IMG_DATA/R10m/T34VFJ_20180818T094031_WVP_10m.jp2
new file mode 100644
index 0000000000000000000000000000000000000000..a8b7386a5f7082b09868597a801c71a3f6945bfe
GIT binary patch
literal 446
zcmebD)MDUZU|`^3U|?isU<9(%*nvzWHWQQ$RKdUuWrNhQA+be~*fL0LCny_ag)<V{
dg^`6p1!%@BAa;eawSa~OBk2W7jRFE8008b~1Tz2t

literal 0
HcmV?d00001

diff --git a/autotest/gdrivers/data/fake_sentinel2_l2a_MSIL2A/S2A_MSIL2A_20180818T094031_N0208_R036_T34VFJ_20180818T120345.SAFE/GRANULE/L2A_T34VFJ_A016478_20180818T094030/IMG_DATA/R20m/T34VFJ_20180818T094031_AOT_20m.jp2 b/autotest/gdrivers/data/fake_sentinel2_l2a_MSIL2A/S2A_MSIL2A_20180818T094031_N0208_R036_T34VFJ_20180818T120345.SAFE/GRANULE/L2A_T34VFJ_A016478_20180818T094030/IMG_DATA/R20m/T34VFJ_20180818T094031_AOT_20m.jp2
new file mode 100644
index 0000000000000000000000000000000000000000..a8b7386a5f7082b09868597a801c71a3f6945bfe
GIT binary patch
literal 446
zcmebD)MDUZU|`^3U|?isU<9(%*nvzWHWQQ$RKdUuWrNhQA+be~*fL0LCny_ag)<V{
dg^`6p1!%@BAa;eawSa~OBk2W7jRFE8008b~1Tz2t

literal 0
HcmV?d00001

diff --git a/autotest/gdrivers/data/fake_sentinel2_l2a_MSIL2A/S2A_MSIL2A_20180818T094031_N0208_R036_T34VFJ_20180818T120345.SAFE/GRANULE/L2A_T34VFJ_A016478_20180818T094030/IMG_DATA/R20m/T34VFJ_20180818T094031_B02_20m.jp2 b/autotest/gdrivers/data/fake_sentinel2_l2a_MSIL2A/S2A_MSIL2A_20180818T094031_N0208_R036_T34VFJ_20180818T120345.SAFE/GRANULE/L2A_T34VFJ_A016478_20180818T094030/IMG_DATA/R20m/T34VFJ_20180818T094031_B02_20m.jp2
new file mode 100644
index 0000000000000000000000000000000000000000..a8b7386a5f7082b09868597a801c71a3f6945bfe
GIT binary patch
literal 446
zcmebD)MDUZU|`^3U|?isU<9(%*nvzWHWQQ$RKdUuWrNhQA+be~*fL0LCny_ag)<V{
dg^`6p1!%@BAa;eawSa~OBk2W7jRFE8008b~1Tz2t

literal 0
HcmV?d00001

diff --git a/autotest/gdrivers/data/fake_sentinel2_l2a_MSIL2A/S2A_MSIL2A_20180818T094031_N0208_R036_T34VFJ_20180818T120345.SAFE/GRANULE/L2A_T34VFJ_A016478_20180818T094030/IMG_DATA/R20m/T34VFJ_20180818T094031_B03_20m.jp2 b/autotest/gdrivers/data/fake_sentinel2_l2a_MSIL2A/S2A_MSIL2A_20180818T094031_N0208_R036_T34VFJ_20180818T120345.SAFE/GRANULE/L2A_T34VFJ_A016478_20180818T094030/IMG_DATA/R20m/T34VFJ_20180818T094031_B03_20m.jp2
new file mode 100644
index 0000000000000000000000000000000000000000..a8b7386a5f7082b09868597a801c71a3f6945bfe
GIT binary patch
literal 446
zcmebD)MDUZU|`^3U|?isU<9(%*nvzWHWQQ$RKdUuWrNhQA+be~*fL0LCny_ag)<V{
dg^`6p1!%@BAa;eawSa~OBk2W7jRFE8008b~1Tz2t

literal 0
HcmV?d00001

diff --git a/autotest/gdrivers/data/fake_sentinel2_l2a_MSIL2A/S2A_MSIL2A_20180818T094031_N0208_R036_T34VFJ_20180818T120345.SAFE/GRANULE/L2A_T34VFJ_A016478_20180818T094030/IMG_DATA/R20m/T34VFJ_20180818T094031_B04_20m.jp2 b/autotest/gdrivers/data/fake_sentinel2_l2a_MSIL2A/S2A_MSIL2A_20180818T094031_N0208_R036_T34VFJ_20180818T120345.SAFE/GRANULE/L2A_T34VFJ_A016478_20180818T094030/IMG_DATA/R20m/T34VFJ_20180818T094031_B04_20m.jp2
new file mode 100644
index 0000000000000000000000000000000000000000..a8b7386a5f7082b09868597a801c71a3f6945bfe
GIT binary patch
literal 446
zcmebD)MDUZU|`^3U|?isU<9(%*nvzWHWQQ$RKdUuWrNhQA+be~*fL0LCny_ag)<V{
dg^`6p1!%@BAa;eawSa~OBk2W7jRFE8008b~1Tz2t

literal 0
HcmV?d00001

diff --git a/autotest/gdrivers/data/fake_sentinel2_l2a_MSIL2A/S2A_MSIL2A_20180818T094031_N0208_R036_T34VFJ_20180818T120345.SAFE/GRANULE/L2A_T34VFJ_A016478_20180818T094030/IMG_DATA/R20m/T34VFJ_20180818T094031_B05_20m.jp2 b/autotest/gdrivers/data/fake_sentinel2_l2a_MSIL2A/S2A_MSIL2A_20180818T094031_N0208_R036_T34VFJ_20180818T120345.SAFE/GRANULE/L2A_T34VFJ_A016478_20180818T094030/IMG_DATA/R20m/T34VFJ_20180818T094031_B05_20m.jp2
new file mode 100644
index 0000000000000000000000000000000000000000..a8b7386a5f7082b09868597a801c71a3f6945bfe
GIT binary patch
literal 446
zcmebD)MDUZU|`^3U|?isU<9(%*nvzWHWQQ$RKdUuWrNhQA+be~*fL0LCny_ag)<V{
dg^`6p1!%@BAa;eawSa~OBk2W7jRFE8008b~1Tz2t

literal 0
HcmV?d00001

diff --git a/autotest/gdrivers/data/fake_sentinel2_l2a_MSIL2A/S2A_MSIL2A_20180818T094031_N0208_R036_T34VFJ_20180818T120345.SAFE/GRANULE/L2A_T34VFJ_A016478_20180818T094030/IMG_DATA/R20m/T34VFJ_20180818T094031_B06_20m.jp2 b/autotest/gdrivers/data/fake_sentinel2_l2a_MSIL2A/S2A_MSIL2A_20180818T094031_N0208_R036_T34VFJ_20180818T120345.SAFE/GRANULE/L2A_T34VFJ_A016478_20180818T094030/IMG_DATA/R20m/T34VFJ_20180818T094031_B06_20m.jp2
new file mode 100644
index 0000000000000000000000000000000000000000..a8b7386a5f7082b09868597a801c71a3f6945bfe
GIT binary patch
literal 446
zcmebD)MDUZU|`^3U|?isU<9(%*nvzWHWQQ$RKdUuWrNhQA+be~*fL0LCny_ag)<V{
dg^`6p1!%@BAa;eawSa~OBk2W7jRFE8008b~1Tz2t

literal 0
HcmV?d00001

diff --git a/autotest/gdrivers/data/fake_sentinel2_l2a_MSIL2A/S2A_MSIL2A_20180818T094031_N0208_R036_T34VFJ_20180818T120345.SAFE/GRANULE/L2A_T34VFJ_A016478_20180818T094030/IMG_DATA/R20m/T34VFJ_20180818T094031_B07_20m.jp2 b/autotest/gdrivers/data/fake_sentinel2_l2a_MSIL2A/S2A_MSIL2A_20180818T094031_N0208_R036_T34VFJ_20180818T120345.SAFE/GRANULE/L2A_T34VFJ_A016478_20180818T094030/IMG_DATA/R20m/T34VFJ_20180818T094031_B07_20m.jp2
new file mode 100644
index 0000000000000000000000000000000000000000..a8b7386a5f7082b09868597a801c71a3f6945bfe
GIT binary patch
literal 446
zcmebD)MDUZU|`^3U|?isU<9(%*nvzWHWQQ$RKdUuWrNhQA+be~*fL0LCny_ag)<V{
dg^`6p1!%@BAa;eawSa~OBk2W7jRFE8008b~1Tz2t

literal 0
HcmV?d00001

diff --git a/autotest/gdrivers/data/fake_sentinel2_l2a_MSIL2A/S2A_MSIL2A_20180818T094031_N0208_R036_T34VFJ_20180818T120345.SAFE/GRANULE/L2A_T34VFJ_A016478_20180818T094030/IMG_DATA/R20m/T34VFJ_20180818T094031_B11_20m.jp2 b/autotest/gdrivers/data/fake_sentinel2_l2a_MSIL2A/S2A_MSIL2A_20180818T094031_N0208_R036_T34VFJ_20180818T120345.SAFE/GRANULE/L2A_T34VFJ_A016478_20180818T094030/IMG_DATA/R20m/T34VFJ_20180818T094031_B11_20m.jp2
new file mode 100644
index 0000000000000000000000000000000000000000..a8b7386a5f7082b09868597a801c71a3f6945bfe
GIT binary patch
literal 446
zcmebD)MDUZU|`^3U|?isU<9(%*nvzWHWQQ$RKdUuWrNhQA+be~*fL0LCny_ag)<V{
dg^`6p1!%@BAa;eawSa~OBk2W7jRFE8008b~1Tz2t

literal 0
HcmV?d00001

diff --git a/autotest/gdrivers/data/fake_sentinel2_l2a_MSIL2A/S2A_MSIL2A_20180818T094031_N0208_R036_T34VFJ_20180818T120345.SAFE/GRANULE/L2A_T34VFJ_A016478_20180818T094030/IMG_DATA/R20m/T34VFJ_20180818T094031_B12_20m.jp2 b/autotest/gdrivers/data/fake_sentinel2_l2a_MSIL2A/S2A_MSIL2A_20180818T094031_N0208_R036_T34VFJ_20180818T120345.SAFE/GRANULE/L2A_T34VFJ_A016478_20180818T094030/IMG_DATA/R20m/T34VFJ_20180818T094031_B12_20m.jp2
new file mode 100644
index 0000000000000000000000000000000000000000..a8b7386a5f7082b09868597a801c71a3f6945bfe
GIT binary patch
literal 446
zcmebD)MDUZU|`^3U|?isU<9(%*nvzWHWQQ$RKdUuWrNhQA+be~*fL0LCny_ag)<V{
dg^`6p1!%@BAa;eawSa~OBk2W7jRFE8008b~1Tz2t

literal 0
HcmV?d00001

diff --git a/autotest/gdrivers/data/fake_sentinel2_l2a_MSIL2A/S2A_MSIL2A_20180818T094031_N0208_R036_T34VFJ_20180818T120345.SAFE/GRANULE/L2A_T34VFJ_A016478_20180818T094030/IMG_DATA/R20m/T34VFJ_20180818T094031_B8A_20m.jp2 b/autotest/gdrivers/data/fake_sentinel2_l2a_MSIL2A/S2A_MSIL2A_20180818T094031_N0208_R036_T34VFJ_20180818T120345.SAFE/GRANULE/L2A_T34VFJ_A016478_20180818T094030/IMG_DATA/R20m/T34VFJ_20180818T094031_B8A_20m.jp2
new file mode 100644
index 0000000000000000000000000000000000000000..a8b7386a5f7082b09868597a801c71a3f6945bfe
GIT binary patch
literal 446
zcmebD)MDUZU|`^3U|?isU<9(%*nvzWHWQQ$RKdUuWrNhQA+be~*fL0LCny_ag)<V{
dg^`6p1!%@BAa;eawSa~OBk2W7jRFE8008b~1Tz2t

literal 0
HcmV?d00001

diff --git a/autotest/gdrivers/data/fake_sentinel2_l2a_MSIL2A/S2A_MSIL2A_20180818T094031_N0208_R036_T34VFJ_20180818T120345.SAFE/GRANULE/L2A_T34VFJ_A016478_20180818T094030/IMG_DATA/R20m/T34VFJ_20180818T094031_SCL_20m.jp2 b/autotest/gdrivers/data/fake_sentinel2_l2a_MSIL2A/S2A_MSIL2A_20180818T094031_N0208_R036_T34VFJ_20180818T120345.SAFE/GRANULE/L2A_T34VFJ_A016478_20180818T094030/IMG_DATA/R20m/T34VFJ_20180818T094031_SCL_20m.jp2
new file mode 100644
index 0000000000000000000000000000000000000000..a8b7386a5f7082b09868597a801c71a3f6945bfe
GIT binary patch
literal 446
zcmebD)MDUZU|`^3U|?isU<9(%*nvzWHWQQ$RKdUuWrNhQA+be~*fL0LCny_ag)<V{
dg^`6p1!%@BAa;eawSa~OBk2W7jRFE8008b~1Tz2t

literal 0
HcmV?d00001

diff --git a/autotest/gdrivers/data/fake_sentinel2_l2a_MSIL2A/S2A_MSIL2A_20180818T094031_N0208_R036_T34VFJ_20180818T120345.SAFE/GRANULE/L2A_T34VFJ_A016478_20180818T094030/IMG_DATA/R20m/T34VFJ_20180818T094031_TCI_20m.jp2 b/autotest/gdrivers/data/fake_sentinel2_l2a_MSIL2A/S2A_MSIL2A_20180818T094031_N0208_R036_T34VFJ_20180818T120345.SAFE/GRANULE/L2A_T34VFJ_A016478_20180818T094030/IMG_DATA/R20m/T34VFJ_20180818T094031_TCI_20m.jp2
new file mode 100644
index 0000000000000000000000000000000000000000..a8b7386a5f7082b09868597a801c71a3f6945bfe
GIT binary patch
literal 446
zcmebD)MDUZU|`^3U|?isU<9(%*nvzWHWQQ$RKdUuWrNhQA+be~*fL0LCny_ag)<V{
dg^`6p1!%@BAa;eawSa~OBk2W7jRFE8008b~1Tz2t

literal 0
HcmV?d00001

diff --git a/autotest/gdrivers/data/fake_sentinel2_l2a_MSIL2A/S2A_MSIL2A_20180818T094031_N0208_R036_T34VFJ_20180818T120345.SAFE/GRANULE/L2A_T34VFJ_A016478_20180818T094030/IMG_DATA/R20m/T34VFJ_20180818T094031_WVP_20m.jp2 b/autotest/gdrivers/data/fake_sentinel2_l2a_MSIL2A/S2A_MSIL2A_20180818T094031_N0208_R036_T34VFJ_20180818T120345.SAFE/GRANULE/L2A_T34VFJ_A016478_20180818T094030/IMG_DATA/R20m/T34VFJ_20180818T094031_WVP_20m.jp2
new file mode 100644
index 0000000000000000000000000000000000000000..a8b7386a5f7082b09868597a801c71a3f6945bfe
GIT binary patch
literal 446
zcmebD)MDUZU|`^3U|?isU<9(%*nvzWHWQQ$RKdUuWrNhQA+be~*fL0LCny_ag)<V{
dg^`6p1!%@BAa;eawSa~OBk2W7jRFE8008b~1Tz2t

literal 0
HcmV?d00001

diff --git a/autotest/gdrivers/data/fake_sentinel2_l2a_MSIL2A/S2A_MSIL2A_20180818T094031_N0208_R036_T34VFJ_20180818T120345.SAFE/GRANULE/L2A_T34VFJ_A016478_20180818T094030/IMG_DATA/R60m/T34VFJ_20180818T094031_AOT_60m.jp2 b/autotest/gdrivers/data/fake_sentinel2_l2a_MSIL2A/S2A_MSIL2A_20180818T094031_N0208_R036_T34VFJ_20180818T120345.SAFE/GRANULE/L2A_T34VFJ_A016478_20180818T094030/IMG_DATA/R60m/T34VFJ_20180818T094031_AOT_60m.jp2
new file mode 100644
index 0000000000000000000000000000000000000000..a8b7386a5f7082b09868597a801c71a3f6945bfe
GIT binary patch
literal 446
zcmebD)MDUZU|`^3U|?isU<9(%*nvzWHWQQ$RKdUuWrNhQA+be~*fL0LCny_ag)<V{
dg^`6p1!%@BAa;eawSa~OBk2W7jRFE8008b~1Tz2t

literal 0
HcmV?d00001

diff --git a/autotest/gdrivers/data/fake_sentinel2_l2a_MSIL2A/S2A_MSIL2A_20180818T094031_N0208_R036_T34VFJ_20180818T120345.SAFE/GRANULE/L2A_T34VFJ_A016478_20180818T094030/IMG_DATA/R60m/T34VFJ_20180818T094031_B01_60m.jp2 b/autotest/gdrivers/data/fake_sentinel2_l2a_MSIL2A/S2A_MSIL2A_20180818T094031_N0208_R036_T34VFJ_20180818T120345.SAFE/GRANULE/L2A_T34VFJ_A016478_20180818T094030/IMG_DATA/R60m/T34VFJ_20180818T094031_B01_60m.jp2
new file mode 100644
index 0000000000000000000000000000000000000000..a8b7386a5f7082b09868597a801c71a3f6945bfe
GIT binary patch
literal 446
zcmebD)MDUZU|`^3U|?isU<9(%*nvzWHWQQ$RKdUuWrNhQA+be~*fL0LCny_ag)<V{
dg^`6p1!%@BAa;eawSa~OBk2W7jRFE8008b~1Tz2t

literal 0
HcmV?d00001

diff --git a/autotest/gdrivers/data/fake_sentinel2_l2a_MSIL2A/S2A_MSIL2A_20180818T094031_N0208_R036_T34VFJ_20180818T120345.SAFE/GRANULE/L2A_T34VFJ_A016478_20180818T094030/IMG_DATA/R60m/T34VFJ_20180818T094031_B02_60m.jp2 b/autotest/gdrivers/data/fake_sentinel2_l2a_MSIL2A/S2A_MSIL2A_20180818T094031_N0208_R036_T34VFJ_20180818T120345.SAFE/GRANULE/L2A_T34VFJ_A016478_20180818T094030/IMG_DATA/R60m/T34VFJ_20180818T094031_B02_60m.jp2
new file mode 100644
index 0000000000000000000000000000000000000000..a8b7386a5f7082b09868597a801c71a3f6945bfe
GIT binary patch
literal 446
zcmebD)MDUZU|`^3U|?isU<9(%*nvzWHWQQ$RKdUuWrNhQA+be~*fL0LCny_ag)<V{
dg^`6p1!%@BAa;eawSa~OBk2W7jRFE8008b~1Tz2t

literal 0
HcmV?d00001

diff --git a/autotest/gdrivers/data/fake_sentinel2_l2a_MSIL2A/S2A_MSIL2A_20180818T094031_N0208_R036_T34VFJ_20180818T120345.SAFE/GRANULE/L2A_T34VFJ_A016478_20180818T094030/IMG_DATA/R60m/T34VFJ_20180818T094031_B03_60m.jp2 b/autotest/gdrivers/data/fake_sentinel2_l2a_MSIL2A/S2A_MSIL2A_20180818T094031_N0208_R036_T34VFJ_20180818T120345.SAFE/GRANULE/L2A_T34VFJ_A016478_20180818T094030/IMG_DATA/R60m/T34VFJ_20180818T094031_B03_60m.jp2
new file mode 100644
index 0000000000000000000000000000000000000000..a8b7386a5f7082b09868597a801c71a3f6945bfe
GIT binary patch
literal 446
zcmebD)MDUZU|`^3U|?isU<9(%*nvzWHWQQ$RKdUuWrNhQA+be~*fL0LCny_ag)<V{
dg^`6p1!%@BAa;eawSa~OBk2W7jRFE8008b~1Tz2t

literal 0
HcmV?d00001

diff --git a/autotest/gdrivers/data/fake_sentinel2_l2a_MSIL2A/S2A_MSIL2A_20180818T094031_N0208_R036_T34VFJ_20180818T120345.SAFE/GRANULE/L2A_T34VFJ_A016478_20180818T094030/IMG_DATA/R60m/T34VFJ_20180818T094031_B04_60m.jp2 b/autotest/gdrivers/data/fake_sentinel2_l2a_MSIL2A/S2A_MSIL2A_20180818T094031_N0208_R036_T34VFJ_20180818T120345.SAFE/GRANULE/L2A_T34VFJ_A016478_20180818T094030/IMG_DATA/R60m/T34VFJ_20180818T094031_B04_60m.jp2
new file mode 100644
index 0000000000000000000000000000000000000000..a8b7386a5f7082b09868597a801c71a3f6945bfe
GIT binary patch
literal 446
zcmebD)MDUZU|`^3U|?isU<9(%*nvzWHWQQ$RKdUuWrNhQA+be~*fL0LCny_ag)<V{
dg^`6p1!%@BAa;eawSa~OBk2W7jRFE8008b~1Tz2t

literal 0
HcmV?d00001

diff --git a/autotest/gdrivers/data/fake_sentinel2_l2a_MSIL2A/S2A_MSIL2A_20180818T094031_N0208_R036_T34VFJ_20180818T120345.SAFE/GRANULE/L2A_T34VFJ_A016478_20180818T094030/IMG_DATA/R60m/T34VFJ_20180818T094031_B05_60m.jp2 b/autotest/gdrivers/data/fake_sentinel2_l2a_MSIL2A/S2A_MSIL2A_20180818T094031_N0208_R036_T34VFJ_20180818T120345.SAFE/GRANULE/L2A_T34VFJ_A016478_20180818T094030/IMG_DATA/R60m/T34VFJ_20180818T094031_B05_60m.jp2
new file mode 100644
index 0000000000000000000000000000000000000000..a8b7386a5f7082b09868597a801c71a3f6945bfe
GIT binary patch
literal 446
zcmebD)MDUZU|`^3U|?isU<9(%*nvzWHWQQ$RKdUuWrNhQA+be~*fL0LCny_ag)<V{
dg^`6p1!%@BAa;eawSa~OBk2W7jRFE8008b~1Tz2t

literal 0
HcmV?d00001

diff --git a/autotest/gdrivers/data/fake_sentinel2_l2a_MSIL2A/S2A_MSIL2A_20180818T094031_N0208_R036_T34VFJ_20180818T120345.SAFE/GRANULE/L2A_T34VFJ_A016478_20180818T094030/IMG_DATA/R60m/T34VFJ_20180818T094031_B06_60m.jp2 b/autotest/gdrivers/data/fake_sentinel2_l2a_MSIL2A/S2A_MSIL2A_20180818T094031_N0208_R036_T34VFJ_20180818T120345.SAFE/GRANULE/L2A_T34VFJ_A016478_20180818T094030/IMG_DATA/R60m/T34VFJ_20180818T094031_B06_60m.jp2
new file mode 100644
index 0000000000000000000000000000000000000000..a8b7386a5f7082b09868597a801c71a3f6945bfe
GIT binary patch
literal 446
zcmebD)MDUZU|`^3U|?isU<9(%*nvzWHWQQ$RKdUuWrNhQA+be~*fL0LCny_ag)<V{
dg^`6p1!%@BAa;eawSa~OBk2W7jRFE8008b~1Tz2t

literal 0
HcmV?d00001

diff --git a/autotest/gdrivers/data/fake_sentinel2_l2a_MSIL2A/S2A_MSIL2A_20180818T094031_N0208_R036_T34VFJ_20180818T120345.SAFE/GRANULE/L2A_T34VFJ_A016478_20180818T094030/IMG_DATA/R60m/T34VFJ_20180818T094031_B07_60m.jp2 b/autotest/gdrivers/data/fake_sentinel2_l2a_MSIL2A/S2A_MSIL2A_20180818T094031_N0208_R036_T34VFJ_20180818T120345.SAFE/GRANULE/L2A_T34VFJ_A016478_20180818T094030/IMG_DATA/R60m/T34VFJ_20180818T094031_B07_60m.jp2
new file mode 100644
index 0000000000000000000000000000000000000000..a8b7386a5f7082b09868597a801c71a3f6945bfe
GIT binary patch
literal 446
zcmebD)MDUZU|`^3U|?isU<9(%*nvzWHWQQ$RKdUuWrNhQA+be~*fL0LCny_ag)<V{
dg^`6p1!%@BAa;eawSa~OBk2W7jRFE8008b~1Tz2t

literal 0
HcmV?d00001

diff --git a/autotest/gdrivers/data/fake_sentinel2_l2a_MSIL2A/S2A_MSIL2A_20180818T094031_N0208_R036_T34VFJ_20180818T120345.SAFE/GRANULE/L2A_T34VFJ_A016478_20180818T094030/IMG_DATA/R60m/T34VFJ_20180818T094031_B09_60m.jp2 b/autotest/gdrivers/data/fake_sentinel2_l2a_MSIL2A/S2A_MSIL2A_20180818T094031_N0208_R036_T34VFJ_20180818T120345.SAFE/GRANULE/L2A_T34VFJ_A016478_20180818T094030/IMG_DATA/R60m/T34VFJ_20180818T094031_B09_60m.jp2
new file mode 100644
index 0000000000000000000000000000000000000000..a8b7386a5f7082b09868597a801c71a3f6945bfe
GIT binary patch
literal 446
zcmebD)MDUZU|`^3U|?isU<9(%*nvzWHWQQ$RKdUuWrNhQA+be~*fL0LCny_ag)<V{
dg^`6p1!%@BAa;eawSa~OBk2W7jRFE8008b~1Tz2t

literal 0
HcmV?d00001

diff --git a/autotest/gdrivers/data/fake_sentinel2_l2a_MSIL2A/S2A_MSIL2A_20180818T094031_N0208_R036_T34VFJ_20180818T120345.SAFE/GRANULE/L2A_T34VFJ_A016478_20180818T094030/IMG_DATA/R60m/T34VFJ_20180818T094031_B11_60m.jp2 b/autotest/gdrivers/data/fake_sentinel2_l2a_MSIL2A/S2A_MSIL2A_20180818T094031_N0208_R036_T34VFJ_20180818T120345.SAFE/GRANULE/L2A_T34VFJ_A016478_20180818T094030/IMG_DATA/R60m/T34VFJ_20180818T094031_B11_60m.jp2
new file mode 100644
index 0000000000000000000000000000000000000000..a8b7386a5f7082b09868597a801c71a3f6945bfe
GIT binary patch
literal 446
zcmebD)MDUZU|`^3U|?isU<9(%*nvzWHWQQ$RKdUuWrNhQA+be~*fL0LCny_ag)<V{
dg^`6p1!%@BAa;eawSa~OBk2W7jRFE8008b~1Tz2t

literal 0
HcmV?d00001

diff --git a/autotest/gdrivers/data/fake_sentinel2_l2a_MSIL2A/S2A_MSIL2A_20180818T094031_N0208_R036_T34VFJ_20180818T120345.SAFE/GRANULE/L2A_T34VFJ_A016478_20180818T094030/IMG_DATA/R60m/T34VFJ_20180818T094031_B12_60m.jp2 b/autotest/gdrivers/data/fake_sentinel2_l2a_MSIL2A/S2A_MSIL2A_20180818T094031_N0208_R036_T34VFJ_20180818T120345.SAFE/GRANULE/L2A_T34VFJ_A016478_20180818T094030/IMG_DATA/R60m/T34VFJ_20180818T094031_B12_60m.jp2
new file mode 100644
index 0000000000000000000000000000000000000000..a8b7386a5f7082b09868597a801c71a3f6945bfe
GIT binary patch
literal 446
zcmebD)MDUZU|`^3U|?isU<9(%*nvzWHWQQ$RKdUuWrNhQA+be~*fL0LCny_ag)<V{
dg^`6p1!%@BAa;eawSa~OBk2W7jRFE8008b~1Tz2t

literal 0
HcmV?d00001

diff --git a/autotest/gdrivers/data/fake_sentinel2_l2a_MSIL2A/S2A_MSIL2A_20180818T094031_N0208_R036_T34VFJ_20180818T120345.SAFE/GRANULE/L2A_T34VFJ_A016478_20180818T094030/IMG_DATA/R60m/T34VFJ_20180818T094031_B8A_60m.jp2 b/autotest/gdrivers/data/fake_sentinel2_l2a_MSIL2A/S2A_MSIL2A_20180818T094031_N0208_R036_T34VFJ_20180818T120345.SAFE/GRANULE/L2A_T34VFJ_A016478_20180818T094030/IMG_DATA/R60m/T34VFJ_20180818T094031_B8A_60m.jp2
new file mode 100644
index 0000000000000000000000000000000000000000..a8b7386a5f7082b09868597a801c71a3f6945bfe
GIT binary patch
literal 446
zcmebD)MDUZU|`^3U|?isU<9(%*nvzWHWQQ$RKdUuWrNhQA+be~*fL0LCny_ag)<V{
dg^`6p1!%@BAa;eawSa~OBk2W7jRFE8008b~1Tz2t

literal 0
HcmV?d00001

diff --git a/autotest/gdrivers/data/fake_sentinel2_l2a_MSIL2A/S2A_MSIL2A_20180818T094031_N0208_R036_T34VFJ_20180818T120345.SAFE/GRANULE/L2A_T34VFJ_A016478_20180818T094030/IMG_DATA/R60m/T34VFJ_20180818T094031_SCL_60m.jp2 b/autotest/gdrivers/data/fake_sentinel2_l2a_MSIL2A/S2A_MSIL2A_20180818T094031_N0208_R036_T34VFJ_20180818T120345.SAFE/GRANULE/L2A_T34VFJ_A016478_20180818T094030/IMG_DATA/R60m/T34VFJ_20180818T094031_SCL_60m.jp2
new file mode 100644
index 0000000000000000000000000000000000000000..a8b7386a5f7082b09868597a801c71a3f6945bfe
GIT binary patch
literal 446
zcmebD)MDUZU|`^3U|?isU<9(%*nvzWHWQQ$RKdUuWrNhQA+be~*fL0LCny_ag)<V{
dg^`6p1!%@BAa;eawSa~OBk2W7jRFE8008b~1Tz2t

literal 0
HcmV?d00001

diff --git a/autotest/gdrivers/data/fake_sentinel2_l2a_MSIL2A/S2A_MSIL2A_20180818T094031_N0208_R036_T34VFJ_20180818T120345.SAFE/GRANULE/L2A_T34VFJ_A016478_20180818T094030/IMG_DATA/R60m/T34VFJ_20180818T094031_TCI_60m.jp2 b/autotest/gdrivers/data/fake_sentinel2_l2a_MSIL2A/S2A_MSIL2A_20180818T094031_N0208_R036_T34VFJ_20180818T120345.SAFE/GRANULE/L2A_T34VFJ_A016478_20180818T094030/IMG_DATA/R60m/T34VFJ_20180818T094031_TCI_60m.jp2
new file mode 100644
index 0000000000000000000000000000000000000000..a8b7386a5f7082b09868597a801c71a3f6945bfe
GIT binary patch
literal 446
zcmebD)MDUZU|`^3U|?isU<9(%*nvzWHWQQ$RKdUuWrNhQA+be~*fL0LCny_ag)<V{
dg^`6p1!%@BAa;eawSa~OBk2W7jRFE8008b~1Tz2t

literal 0
HcmV?d00001

diff --git a/autotest/gdrivers/data/fake_sentinel2_l2a_MSIL2A/S2A_MSIL2A_20180818T094031_N0208_R036_T34VFJ_20180818T120345.SAFE/GRANULE/L2A_T34VFJ_A016478_20180818T094030/IMG_DATA/R60m/T34VFJ_20180818T094031_WVP_60m.jp2 b/autotest/gdrivers/data/fake_sentinel2_l2a_MSIL2A/S2A_MSIL2A_20180818T094031_N0208_R036_T34VFJ_20180818T120345.SAFE/GRANULE/L2A_T34VFJ_A016478_20180818T094030/IMG_DATA/R60m/T34VFJ_20180818T094031_WVP_60m.jp2
new file mode 100644
index 0000000000000000000000000000000000000000..a8b7386a5f7082b09868597a801c71a3f6945bfe
GIT binary patch
literal 446
zcmebD)MDUZU|`^3U|?isU<9(%*nvzWHWQQ$RKdUuWrNhQA+be~*fL0LCny_ag)<V{
dg^`6p1!%@BAa;eawSa~OBk2W7jRFE8008b~1Tz2t

literal 0
HcmV?d00001

diff --git a/autotest/gdrivers/data/fake_sentinel2_l2a_MSIL2A/S2A_MSIL2A_20180818T094031_N0208_R036_T34VFJ_20180818T120345.SAFE/GRANULE/L2A_T34VFJ_A016478_20180818T094030/MTD_TL.xml b/autotest/gdrivers/data/fake_sentinel2_l2a_MSIL2A/S2A_MSIL2A_20180818T094031_N0208_R036_T34VFJ_20180818T120345.SAFE/GRANULE/L2A_T34VFJ_A016478_20180818T094030/MTD_TL.xml
new file mode 100644
index 000000000000..8f3a4d647ee2
--- /dev/null
+++ b/autotest/gdrivers/data/fake_sentinel2_l2a_MSIL2A/S2A_MSIL2A_20180818T094031_N0208_R036_T34VFJ_20180818T120345.SAFE/GRANULE/L2A_T34VFJ_A016478_20180818T094030/MTD_TL.xml
@@ -0,0 +1,71 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<n1:Level-2A_Tile_ID xmlns:n1="https://psd-14.sentinel2.eo.esa.int/PSD/S2_PDI_Level-2A_Tile_Metadata.xsd" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="https://psd-14.sentinel2.eo.esa.int/PSD/S2_PDI_Level-2A_Tile_Metadata.xsd /dpc/app/s2ipf/FORMAT_METADATA_TILE_L1C/02.11.02/scripts/../../../schemas/02.13.02/PSD/S2_PDI_Level-2A_Tile_Metadata.xsd">
+  <n1:General_Info>
+    <L1C_TILE_ID metadataLevel="Brief">S2A_OPER_MSI_L1C_TL_MTI__20180818T101348_A016478_T34VFJ_N02.06</L1C_TILE_ID>
+    <TILE_ID metadataLevel="Brief">S2A_OPER_MSI_L2A_TL_MTI__20180818T120345_A016478_T34VFJ_N02.08</TILE_ID>
+    <DATASTRIP_ID metadataLevel="Standard">S2A_OPER_MSI_L2A_DS_MTI__20180818T120345_S20180818T094030_N02.08</DATASTRIP_ID>
+    <DOWNLINK_PRIORITY metadataLevel="Standard">NOMINAL</DOWNLINK_PRIORITY>
+    <SENSING_TIME metadataLevel="Standard">2018-08-18T09:40:30.459Z</SENSING_TIME>
+    <Archiving_Info metadataLevel="Expertise">
+      <ARCHIVING_CENTRE>MTI_</ARCHIVING_CENTRE>
+      <ARCHIVING_TIME>2018-08-18T15:07:55.560Z</ARCHIVING_TIME>
+    </Archiving_Info>
+  </n1:General_Info>
+  <n1:Geometric_Info>
+    <Tile_Geocoding metadataLevel="Brief">
+      <HORIZONTAL_CS_NAME>WGS84 / UTM zone 34N</HORIZONTAL_CS_NAME>
+      <HORIZONTAL_CS_CODE>EPSG:32634</HORIZONTAL_CS_CODE>
+      <Size resolution="10">
+        <NROWS>10980</NROWS>
+        <NCOLS>10980</NCOLS>
+      </Size>
+      <Size resolution="20">
+        <NROWS>5490</NROWS>
+        <NCOLS>5490</NCOLS>
+      </Size>
+      <Size resolution="60">
+        <NROWS>1830</NROWS>
+        <NCOLS>1830</NCOLS>
+      </Size>
+      <Geoposition resolution="10">
+        <ULX>600000</ULX>
+        <ULY>6400020</ULY>
+        <XDIM>10</XDIM>
+        <YDIM>-10</YDIM>
+      </Geoposition>
+      <Geoposition resolution="20">
+        <ULX>600000</ULX>
+        <ULY>6400020</ULY>
+        <XDIM>20</XDIM>
+        <YDIM>-20</YDIM>
+      </Geoposition>
+      <Geoposition resolution="60">
+        <ULX>600000</ULX>
+        <ULY>6400020</ULY>
+        <XDIM>60</XDIM>
+        <YDIM>-60</YDIM>
+      </Geoposition>
+    </Tile_Geocoding>
+  </n1:Geometric_Info>
+  <n1:Quality_Indicators_Info metadataLevel="Standard">
+    <Image_Content_QI>
+      <CLOUDY_PIXEL_PERCENTAGE>54.416476</CLOUDY_PIXEL_PERCENTAGE>
+      <DEGRADED_MSI_DATA_PERCENTAGE>0</DEGRADED_MSI_DATA_PERCENTAGE>
+      <NODATA_PIXEL_PERCENTAGE>0.000000</NODATA_PIXEL_PERCENTAGE>
+      <SATURATED_DEFECTIVE_PIXEL_PERCENTAGE>0.000000</SATURATED_DEFECTIVE_PIXEL_PERCENTAGE>
+      <DARK_FEATURES_PERCENTAGE>1.566982</DARK_FEATURES_PERCENTAGE>
+      <CLOUD_SHADOW_PERCENTAGE>1.521106</CLOUD_SHADOW_PERCENTAGE>
+      <VEGETATION_PERCENTAGE>14.057219</VEGETATION_PERCENTAGE>
+      <NOT_VEGETATED_PERCENTAGE>3.544726</NOT_VEGETATED_PERCENTAGE>
+      <WATER_PERCENTAGE>18.739088</WATER_PERCENTAGE>
+      <UNCLASSIFIED_PERCENTAGE>5.750781</UNCLASSIFIED_PERCENTAGE>
+      <MEDIUM_PROBA_CLOUDS_PERCENTAGE>24.111301</MEDIUM_PROBA_CLOUDS_PERCENTAGE>
+      <HIGH_PROBA_CLOUDS_PERCENTAGE>15.382876</HIGH_PROBA_CLOUDS_PERCENTAGE>
+      <THIN_CIRRUS_PERCENTAGE>14.922300</THIN_CIRRUS_PERCENTAGE>
+      <SNOW_ICE_PERCENTAGE>0.403622</SNOW_ICE_PERCENTAGE>
+      <RADIATIVE_TRANSFER_ACCURACY>0.0</RADIATIVE_TRANSFER_ACCURACY>
+      <WATER_VAPOUR_RETRIEVAL_ACCURACY>0.0</WATER_VAPOUR_RETRIEVAL_ACCURACY>
+      <AOT_RETRIEVAL_ACCURACY>0.0</AOT_RETRIEVAL_ACCURACY>
+    </Image_Content_QI>
+  </n1:Quality_Indicators_Info>
+</n1:Level-2A_Tile_ID>
diff --git a/autotest/gdrivers/data/fake_sentinel2_l2a_MSIL2A/S2A_MSIL2A_20180818T094031_N0208_R036_T34VFJ_20180818T120345.SAFE/MTD_MSIL2A.xml b/autotest/gdrivers/data/fake_sentinel2_l2a_MSIL2A/S2A_MSIL2A_20180818T094031_N0208_R036_T34VFJ_20180818T120345.SAFE/MTD_MSIL2A.xml
new file mode 100644
index 000000000000..d259eb721e05
--- /dev/null
+++ b/autotest/gdrivers/data/fake_sentinel2_l2a_MSIL2A/S2A_MSIL2A_20180818T094031_N0208_R036_T34VFJ_20180818T120345.SAFE/MTD_MSIL2A.xml
@@ -0,0 +1,206 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<n1:Level-2A_User_Product xmlns:n1="https://psd-14.sentinel2.eo.esa.int/PSD/User_Product_Level-2A.xsd" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="https://psd-14.sentinel2.eo.esa.int/PSD/User_Product_Level-2A.xsd">
+    <n1:General_Info>
+        <Product_Info>
+            <PRODUCT_START_TIME>2018-08-18T09:40:31.024Z</PRODUCT_START_TIME>
+            <PRODUCT_STOP_TIME>2018-08-18T09:40:31.024Z</PRODUCT_STOP_TIME>
+            <PRODUCT_URI>S2A_MSIL2A_20180818T094031_N0208_R036_T34VFJ_20180818T120345.SAFE</PRODUCT_URI>
+            <PROCESSING_LEVEL>Level-2A</PROCESSING_LEVEL>
+            <PRODUCT_TYPE>S2MSI2A</PRODUCT_TYPE>
+            <PROCESSING_BASELINE>02.08</PROCESSING_BASELINE>
+            <GENERATION_TIME>2018-08-18T12:03:45.000000Z</GENERATION_TIME>
+            <PREVIEW_IMAGE_URL>Not applicable</PREVIEW_IMAGE_URL>
+            <PREVIEW_GEO_INFO>Not applicable</PREVIEW_GEO_INFO>
+            <Datatake datatakeIdentifier="GS2A_20180818T094031_016478_N02.08">
+      <SPACECRAFT_NAME>Sentinel-2A</SPACECRAFT_NAME>
+      <DATATAKE_TYPE>INS-NOBS</DATATAKE_TYPE>
+      <DATATAKE_SENSING_START>2018-08-18T09:40:31.024Z</DATATAKE_SENSING_START>
+      <SENSING_ORBIT_NUMBER>36</SENSING_ORBIT_NUMBER>
+      <SENSING_ORBIT_DIRECTION>DESCENDING</SENSING_ORBIT_DIRECTION>
+    </Datatake>
+<Query_Options completeSingleTile="true">
+<PRODUCT_FORMAT>SAFE_COMPACT</PRODUCT_FORMAT>
+</Query_Options>
+<Product_Organisation>
+                <Granule_List>
+                    <Granule datastripIdentifier="S2A_OPER_MSI_L2A_DS_MTI__20180818T120345_S20180818T094030_N02.08" granuleIdentifier="S2A_OPER_MSI_L2A_TL_MTI__20180818T120345_A016478_T34VFJ_N02.08" imageFormat="JPEG2000">
+                        <IMAGE_FILE>GRANULE/L2A_T34VFJ_A016478_20180818T094030/IMG_DATA/R10m/T34VFJ_20180818T094031_B02_10m</IMAGE_FILE>
+                        <IMAGE_FILE>GRANULE/L2A_T34VFJ_A016478_20180818T094030/IMG_DATA/R10m/T34VFJ_20180818T094031_B03_10m</IMAGE_FILE>
+                        <IMAGE_FILE>GRANULE/L2A_T34VFJ_A016478_20180818T094030/IMG_DATA/R10m/T34VFJ_20180818T094031_B04_10m</IMAGE_FILE>
+                        <IMAGE_FILE>GRANULE/L2A_T34VFJ_A016478_20180818T094030/IMG_DATA/R10m/T34VFJ_20180818T094031_B08_10m</IMAGE_FILE>
+                        <IMAGE_FILE>GRANULE/L2A_T34VFJ_A016478_20180818T094030/IMG_DATA/R10m/T34VFJ_20180818T094031_TCI_10m</IMAGE_FILE>
+                        <IMAGE_FILE>GRANULE/L2A_T34VFJ_A016478_20180818T094030/IMG_DATA/R10m/T34VFJ_20180818T094031_AOT_10m</IMAGE_FILE>
+                        <IMAGE_FILE>GRANULE/L2A_T34VFJ_A016478_20180818T094030/IMG_DATA/R10m/T34VFJ_20180818T094031_WVP_10m</IMAGE_FILE>
+                        <IMAGE_FILE>GRANULE/L2A_T34VFJ_A016478_20180818T094030/IMG_DATA/R20m/T34VFJ_20180818T094031_B02_20m</IMAGE_FILE>
+                        <IMAGE_FILE>GRANULE/L2A_T34VFJ_A016478_20180818T094030/IMG_DATA/R20m/T34VFJ_20180818T094031_B03_20m</IMAGE_FILE>
+                        <IMAGE_FILE>GRANULE/L2A_T34VFJ_A016478_20180818T094030/IMG_DATA/R20m/T34VFJ_20180818T094031_B04_20m</IMAGE_FILE>
+                        <IMAGE_FILE>GRANULE/L2A_T34VFJ_A016478_20180818T094030/IMG_DATA/R20m/T34VFJ_20180818T094031_B05_20m</IMAGE_FILE>
+                        <IMAGE_FILE>GRANULE/L2A_T34VFJ_A016478_20180818T094030/IMG_DATA/R20m/T34VFJ_20180818T094031_B06_20m</IMAGE_FILE>
+                        <IMAGE_FILE>GRANULE/L2A_T34VFJ_A016478_20180818T094030/IMG_DATA/R20m/T34VFJ_20180818T094031_B07_20m</IMAGE_FILE>
+                        <IMAGE_FILE>GRANULE/L2A_T34VFJ_A016478_20180818T094030/IMG_DATA/R20m/T34VFJ_20180818T094031_B8A_20m</IMAGE_FILE>
+                        <IMAGE_FILE>GRANULE/L2A_T34VFJ_A016478_20180818T094030/IMG_DATA/R20m/T34VFJ_20180818T094031_B11_20m</IMAGE_FILE>
+                        <IMAGE_FILE>GRANULE/L2A_T34VFJ_A016478_20180818T094030/IMG_DATA/R20m/T34VFJ_20180818T094031_B12_20m</IMAGE_FILE>
+                        <IMAGE_FILE>GRANULE/L2A_T34VFJ_A016478_20180818T094030/IMG_DATA/R20m/T34VFJ_20180818T094031_TCI_20m</IMAGE_FILE>
+                        <IMAGE_FILE>GRANULE/L2A_T34VFJ_A016478_20180818T094030/IMG_DATA/R20m/T34VFJ_20180818T094031_AOT_20m</IMAGE_FILE>
+                        <IMAGE_FILE>GRANULE/L2A_T34VFJ_A016478_20180818T094030/IMG_DATA/R20m/T34VFJ_20180818T094031_WVP_20m</IMAGE_FILE>
+                        <IMAGE_FILE>GRANULE/L2A_T34VFJ_A016478_20180818T094030/IMG_DATA/R20m/T34VFJ_20180818T094031_SCL_20m</IMAGE_FILE>
+                        <IMAGE_FILE>GRANULE/L2A_T34VFJ_A016478_20180818T094030/IMG_DATA/R60m/T34VFJ_20180818T094031_B01_60m</IMAGE_FILE>
+                        <IMAGE_FILE>GRANULE/L2A_T34VFJ_A016478_20180818T094030/IMG_DATA/R60m/T34VFJ_20180818T094031_B02_60m</IMAGE_FILE>
+                        <IMAGE_FILE>GRANULE/L2A_T34VFJ_A016478_20180818T094030/IMG_DATA/R60m/T34VFJ_20180818T094031_B03_60m</IMAGE_FILE>
+                        <IMAGE_FILE>GRANULE/L2A_T34VFJ_A016478_20180818T094030/IMG_DATA/R60m/T34VFJ_20180818T094031_B04_60m</IMAGE_FILE>
+                        <IMAGE_FILE>GRANULE/L2A_T34VFJ_A016478_20180818T094030/IMG_DATA/R60m/T34VFJ_20180818T094031_B05_60m</IMAGE_FILE>
+                        <IMAGE_FILE>GRANULE/L2A_T34VFJ_A016478_20180818T094030/IMG_DATA/R60m/T34VFJ_20180818T094031_B06_60m</IMAGE_FILE>
+                        <IMAGE_FILE>GRANULE/L2A_T34VFJ_A016478_20180818T094030/IMG_DATA/R60m/T34VFJ_20180818T094031_B07_60m</IMAGE_FILE>
+                        <IMAGE_FILE>GRANULE/L2A_T34VFJ_A016478_20180818T094030/IMG_DATA/R60m/T34VFJ_20180818T094031_B8A_60m</IMAGE_FILE>
+                        <IMAGE_FILE>GRANULE/L2A_T34VFJ_A016478_20180818T094030/IMG_DATA/R60m/T34VFJ_20180818T094031_B09_60m</IMAGE_FILE>
+                        <IMAGE_FILE>GRANULE/L2A_T34VFJ_A016478_20180818T094030/IMG_DATA/R60m/T34VFJ_20180818T094031_B11_60m</IMAGE_FILE>
+                        <IMAGE_FILE>GRANULE/L2A_T34VFJ_A016478_20180818T094030/IMG_DATA/R60m/T34VFJ_20180818T094031_B12_60m</IMAGE_FILE>
+                        <IMAGE_FILE>GRANULE/L2A_T34VFJ_A016478_20180818T094030/IMG_DATA/R60m/T34VFJ_20180818T094031_TCI_60m</IMAGE_FILE>
+                        <IMAGE_FILE>GRANULE/L2A_T34VFJ_A016478_20180818T094030/IMG_DATA/R60m/T34VFJ_20180818T094031_AOT_60m</IMAGE_FILE>
+                        <IMAGE_FILE>GRANULE/L2A_T34VFJ_A016478_20180818T094030/IMG_DATA/R60m/T34VFJ_20180818T094031_WVP_60m</IMAGE_FILE>
+                        <IMAGE_FILE>GRANULE/L2A_T34VFJ_A016478_20180818T094030/IMG_DATA/R60m/T34VFJ_20180818T094031_SCL_60m</IMAGE_FILE>
+                    </Granule>
+                </Granule_List>
+</Product_Organisation>
+        </Product_Info>
+        <Product_Image_Characteristics>
+            <Special_Values>
+                <SPECIAL_VALUE_TEXT>NODATA</SPECIAL_VALUE_TEXT>
+                <SPECIAL_VALUE_INDEX>0</SPECIAL_VALUE_INDEX>
+            </Special_Values>
+            <Special_Values>
+                <SPECIAL_VALUE_TEXT>SATURATED</SPECIAL_VALUE_TEXT>
+                <SPECIAL_VALUE_INDEX>6</SPECIAL_VALUE_INDEX>
+            </Special_Values>
+            <Image_Display_Order>
+                <RED_CHANNEL>3</RED_CHANNEL>
+                <GREEN_CHANNEL>2</GREEN_CHANNEL>
+                <BLUE_CHANNEL>1</BLUE_CHANNEL>
+            </Image_Display_Order>
+            <QUANTIFICATION_VALUES_LIST>
+                <BOA_QUANTIFICATION_VALUE unit="none">10000</BOA_QUANTIFICATION_VALUE>
+                <AOT_QUANTIFICATION_VALUE unit="none">1000.0</AOT_QUANTIFICATION_VALUE>
+                <WVP_QUANTIFICATION_VALUE unit="cm">1000.0</WVP_QUANTIFICATION_VALUE>
+            </QUANTIFICATION_VALUES_LIST>
+            <Reflectance_Conversion>
+        <U>0.97</U>
+        <Solar_Irradiance_List>
+          <SOLAR_IRRADIANCE bandId="0" unit="W/m²/µm">1884.69</SOLAR_IRRADIANCE>
+          <SOLAR_IRRADIANCE bandId="1" unit="W/m²/µm">1959.72</SOLAR_IRRADIANCE>
+          <SOLAR_IRRADIANCE bandId="2" unit="W/m²/µm">1823.24</SOLAR_IRRADIANCE>
+          <SOLAR_IRRADIANCE bandId="3" unit="W/m²/µm">1512.06</SOLAR_IRRADIANCE>
+          <SOLAR_IRRADIANCE bandId="4" unit="W/m²/µm">1424.64</SOLAR_IRRADIANCE>
+          <SOLAR_IRRADIANCE bandId="5" unit="W/m²/µm">1287.61</SOLAR_IRRADIANCE>
+          <SOLAR_IRRADIANCE bandId="6" unit="W/m²/µm">1162.08</SOLAR_IRRADIANCE>
+          <SOLAR_IRRADIANCE bandId="7" unit="W/m²/µm">1041.63</SOLAR_IRRADIANCE>
+          <SOLAR_IRRADIANCE bandId="8" unit="W/m²/µm">955.32</SOLAR_IRRADIANCE>
+          <SOLAR_IRRADIANCE bandId="9" unit="W/m²/µm">812.92</SOLAR_IRRADIANCE>
+          <SOLAR_IRRADIANCE bandId="10" unit="W/m²/µm">367.15</SOLAR_IRRADIANCE>
+          <SOLAR_IRRADIANCE bandId="11" unit="W/m²/µm">245.59</SOLAR_IRRADIANCE>
+          <SOLAR_IRRADIANCE bandId="12" unit="W/m²/µm">85.25</SOLAR_IRRADIANCE>
+        </Solar_Irradiance_List>
+      </Reflectance_Conversion>
+            
+            <Scene_Classification_List>
+                <Scene_Classification_ID>
+                    <SCENE_CLASSIFICATION_TEXT>SC_NODATA</SCENE_CLASSIFICATION_TEXT>
+                    <SCENE_CLASSIFICATION_INDEX>0</SCENE_CLASSIFICATION_INDEX>
+                </Scene_Classification_ID>
+                <Scene_Classification_ID>
+                    <SCENE_CLASSIFICATION_TEXT>SC_SATURATED_DEFECTIVE</SCENE_CLASSIFICATION_TEXT>
+                    <SCENE_CLASSIFICATION_INDEX>1</SCENE_CLASSIFICATION_INDEX>
+                </Scene_Classification_ID>
+                <Scene_Classification_ID>
+                    <SCENE_CLASSIFICATION_TEXT>SC_DARK_FEATURE_SHADOW</SCENE_CLASSIFICATION_TEXT>
+                    <SCENE_CLASSIFICATION_INDEX>2</SCENE_CLASSIFICATION_INDEX>
+                </Scene_Classification_ID>
+                <Scene_Classification_ID>
+                    <SCENE_CLASSIFICATION_TEXT>SC_CLOUD_SHADOW</SCENE_CLASSIFICATION_TEXT>
+                    <SCENE_CLASSIFICATION_INDEX>3</SCENE_CLASSIFICATION_INDEX>
+                </Scene_Classification_ID>
+                <Scene_Classification_ID>
+                    <SCENE_CLASSIFICATION_TEXT>SC_VEGETATION</SCENE_CLASSIFICATION_TEXT>
+                    <SCENE_CLASSIFICATION_INDEX>4</SCENE_CLASSIFICATION_INDEX>
+                </Scene_Classification_ID>
+                <Scene_Classification_ID>
+                    <SCENE_CLASSIFICATION_TEXT>SC_NOT_VEGETATED</SCENE_CLASSIFICATION_TEXT>
+                    <SCENE_CLASSIFICATION_INDEX>5</SCENE_CLASSIFICATION_INDEX>
+                </Scene_Classification_ID>
+                <Scene_Classification_ID>
+                    <SCENE_CLASSIFICATION_TEXT>SC_WATER</SCENE_CLASSIFICATION_TEXT>
+                    <SCENE_CLASSIFICATION_INDEX>6</SCENE_CLASSIFICATION_INDEX>
+                </Scene_Classification_ID>
+                <Scene_Classification_ID>
+                    <SCENE_CLASSIFICATION_TEXT>SC_UNCLASSIFIED</SCENE_CLASSIFICATION_TEXT>
+                    <SCENE_CLASSIFICATION_INDEX>7</SCENE_CLASSIFICATION_INDEX>
+                </Scene_Classification_ID>
+                <Scene_Classification_ID>
+                    <SCENE_CLASSIFICATION_TEXT>SC_CLOUD_MEDIUM_PROBA</SCENE_CLASSIFICATION_TEXT>
+                    <SCENE_CLASSIFICATION_INDEX>8</SCENE_CLASSIFICATION_INDEX>
+                </Scene_Classification_ID>
+                <Scene_Classification_ID>
+                    <SCENE_CLASSIFICATION_TEXT>SC_CLOUD_HIGH_PROBA</SCENE_CLASSIFICATION_TEXT>
+                    <SCENE_CLASSIFICATION_INDEX>9</SCENE_CLASSIFICATION_INDEX>
+                </Scene_Classification_ID>
+                <Scene_Classification_ID>
+                    <SCENE_CLASSIFICATION_TEXT>SC_THIN_CIRRUS</SCENE_CLASSIFICATION_TEXT>
+                    <SCENE_CLASSIFICATION_INDEX>10</SCENE_CLASSIFICATION_INDEX>
+                </Scene_Classification_ID>
+                <Scene_Classification_ID>
+                    <SCENE_CLASSIFICATION_TEXT>SC_SNOW_ICE</SCENE_CLASSIFICATION_TEXT>
+                    <SCENE_CLASSIFICATION_INDEX>11</SCENE_CLASSIFICATION_INDEX>
+                </Scene_Classification_ID>
+            </Scene_Classification_List>
+        </Product_Image_Characteristics>
+    </n1:General_Info>
+    <n1:Geometric_Info>
+        <Product_Footprint>
+            <Product_Footprint>
+                <Global_Footprint>
+                    <EXT_POS_LIST>57.7 22.6 57.6 24.5 56.7 24.4 56.7 22.6 57.7 22.6 </EXT_POS_LIST>
+                </Global_Footprint>
+            </Product_Footprint>
+            <RASTER_CS_TYPE>POINT</RASTER_CS_TYPE>
+            <PIXEL_ORIGIN>1</PIXEL_ORIGIN>
+        </Product_Footprint>
+        <Coordinate_Reference_System>
+            <GEO_TABLES version="1">EPSG</GEO_TABLES>
+            <HORIZONTAL_CS_TYPE>GEOGRAPHIC</HORIZONTAL_CS_TYPE>
+        </Coordinate_Reference_System>
+    </n1:Geometric_Info>
+
+    <n1:Quality_Indicators_Info>
+        <Cloud_Coverage_Assessment>54.4</Cloud_Coverage_Assessment>
+        <Technical_Quality_Assessment>
+            <DEGRADED_ANC_DATA_PERCENTAGE>0.0</DEGRADED_ANC_DATA_PERCENTAGE>
+            <DEGRADED_MSI_DATA_PERCENTAGE>0</DEGRADED_MSI_DATA_PERCENTAGE>
+        </Technical_Quality_Assessment>
+        <Quality_Control_Checks>
+            <Quality_Inspections>
+                <quality_check checkType="FORMAT_CORRECTNESS">PASSED</quality_check>
+                <quality_check checkType="GENERAL_QUALITY">PASSED</quality_check>
+                <quality_check checkType="GEOMETRIC_QUALITY">PASSED</quality_check>
+                <quality_check checkType="RADIOMETRIC_QUALITY">PASSED</quality_check>
+                <quality_check checkType="SENSOR_QUALITY">PASSED</quality_check>
+            </Quality_Inspections>
+            <Failed_Inspections/>
+        </Quality_Control_Checks>
+        <Image_Content_QI>
+            <NODATA_PIXEL_PERCENTAGE>0.0</NODATA_PIXEL_PERCENTAGE>
+            <SATURATED_DEFECTIVE_PIXEL_PERCENTAGE>0.0</SATURATED_DEFECTIVE_PIXEL_PERCENTAGE>
+            <DARK_FEATURES_PERCENTAGE>1.5</DARK_FEATURES_PERCENTAGE>
+            <CLOUD_SHADOW_PERCENTAGE>1.5</CLOUD_SHADOW_PERCENTAGE>
+            <VEGETATION_PERCENTAGE>14.0</VEGETATION_PERCENTAGE>
+            <NOT_VEGETATED_PERCENTAGE>3.5</NOT_VEGETATED_PERCENTAGE>
+            <WATER_PERCENTAGE>18.7</WATER_PERCENTAGE>
+            <UNCLASSIFIED_PERCENTAGE>5.7</UNCLASSIFIED_PERCENTAGE>
+            <MEDIUM_PROBA_CLOUDS_PERCENTAGE>24.1</MEDIUM_PROBA_CLOUDS_PERCENTAGE>
+            <HIGH_PROBA_CLOUDS_PERCENTAGE>15.3</HIGH_PROBA_CLOUDS_PERCENTAGE>
+            <THIN_CIRRUS_PERCENTAGE>14.9</THIN_CIRRUS_PERCENTAGE>
+            <SNOW_ICE_PERCENTAGE>0.4</SNOW_ICE_PERCENTAGE>
+            <RADIATIVE_TRANSFER_ACCURACY>0.0</RADIATIVE_TRANSFER_ACCURACY>
+            <WATER_VAPOUR_RETRIEVAL_ACCURACY>0.0</WATER_VAPOUR_RETRIEVAL_ACCURACY>
+            <AOT_RETRIEVAL_ACCURACY>0.0</AOT_RETRIEVAL_ACCURACY>
+        </Image_Content_QI>
+    </n1:Quality_Indicators_Info>
+</n1:Level-2A_User_Product>
diff --git a/autotest/gdrivers/data/fake_sentinel2_l2a_MSIL2Ap/S2A_MSIL2A_20170823T094031_N0205_R036_T34VFJ_20170823T094252.SAFE/GRANULE/L2A_T34VFJ_A011330_20170823T094252/IMG_DATA/R10m/L2A_T34VFJ_20170823T094031_AOT_10m.jp2 b/autotest/gdrivers/data/fake_sentinel2_l2a_MSIL2Ap/S2A_MSIL2A_20170823T094031_N0205_R036_T34VFJ_20170823T094252.SAFE/GRANULE/L2A_T34VFJ_A011330_20170823T094252/IMG_DATA/R10m/L2A_T34VFJ_20170823T094031_AOT_10m.jp2
new file mode 100644
index 0000000000000000000000000000000000000000..a8b7386a5f7082b09868597a801c71a3f6945bfe
GIT binary patch
literal 446
zcmebD)MDUZU|`^3U|?isU<9(%*nvzWHWQQ$RKdUuWrNhQA+be~*fL0LCny_ag)<V{
dg^`6p1!%@BAa;eawSa~OBk2W7jRFE8008b~1Tz2t

literal 0
HcmV?d00001

diff --git a/autotest/gdrivers/data/fake_sentinel2_l2a_MSIL2Ap/S2A_MSIL2A_20170823T094031_N0205_R036_T34VFJ_20170823T094252.SAFE/GRANULE/L2A_T34VFJ_A011330_20170823T094252/IMG_DATA/R10m/L2A_T34VFJ_20170823T094031_B02_10m.jp2 b/autotest/gdrivers/data/fake_sentinel2_l2a_MSIL2Ap/S2A_MSIL2A_20170823T094031_N0205_R036_T34VFJ_20170823T094252.SAFE/GRANULE/L2A_T34VFJ_A011330_20170823T094252/IMG_DATA/R10m/L2A_T34VFJ_20170823T094031_B02_10m.jp2
new file mode 100644
index 0000000000000000000000000000000000000000..a8b7386a5f7082b09868597a801c71a3f6945bfe
GIT binary patch
literal 446
zcmebD)MDUZU|`^3U|?isU<9(%*nvzWHWQQ$RKdUuWrNhQA+be~*fL0LCny_ag)<V{
dg^`6p1!%@BAa;eawSa~OBk2W7jRFE8008b~1Tz2t

literal 0
HcmV?d00001

diff --git a/autotest/gdrivers/data/fake_sentinel2_l2a_MSIL2Ap/S2A_MSIL2A_20170823T094031_N0205_R036_T34VFJ_20170823T094252.SAFE/GRANULE/L2A_T34VFJ_A011330_20170823T094252/IMG_DATA/R10m/L2A_T34VFJ_20170823T094031_B03_10m.jp2 b/autotest/gdrivers/data/fake_sentinel2_l2a_MSIL2Ap/S2A_MSIL2A_20170823T094031_N0205_R036_T34VFJ_20170823T094252.SAFE/GRANULE/L2A_T34VFJ_A011330_20170823T094252/IMG_DATA/R10m/L2A_T34VFJ_20170823T094031_B03_10m.jp2
new file mode 100644
index 0000000000000000000000000000000000000000..a8b7386a5f7082b09868597a801c71a3f6945bfe
GIT binary patch
literal 446
zcmebD)MDUZU|`^3U|?isU<9(%*nvzWHWQQ$RKdUuWrNhQA+be~*fL0LCny_ag)<V{
dg^`6p1!%@BAa;eawSa~OBk2W7jRFE8008b~1Tz2t

literal 0
HcmV?d00001

diff --git a/autotest/gdrivers/data/fake_sentinel2_l2a_MSIL2Ap/S2A_MSIL2A_20170823T094031_N0205_R036_T34VFJ_20170823T094252.SAFE/GRANULE/L2A_T34VFJ_A011330_20170823T094252/IMG_DATA/R10m/L2A_T34VFJ_20170823T094031_B04_10m.jp2 b/autotest/gdrivers/data/fake_sentinel2_l2a_MSIL2Ap/S2A_MSIL2A_20170823T094031_N0205_R036_T34VFJ_20170823T094252.SAFE/GRANULE/L2A_T34VFJ_A011330_20170823T094252/IMG_DATA/R10m/L2A_T34VFJ_20170823T094031_B04_10m.jp2
new file mode 100644
index 0000000000000000000000000000000000000000..a8b7386a5f7082b09868597a801c71a3f6945bfe
GIT binary patch
literal 446
zcmebD)MDUZU|`^3U|?isU<9(%*nvzWHWQQ$RKdUuWrNhQA+be~*fL0LCny_ag)<V{
dg^`6p1!%@BAa;eawSa~OBk2W7jRFE8008b~1Tz2t

literal 0
HcmV?d00001

diff --git a/autotest/gdrivers/data/fake_sentinel2_l2a_MSIL2Ap/S2A_MSIL2A_20170823T094031_N0205_R036_T34VFJ_20170823T094252.SAFE/GRANULE/L2A_T34VFJ_A011330_20170823T094252/IMG_DATA/R10m/L2A_T34VFJ_20170823T094031_B08_10m.jp2 b/autotest/gdrivers/data/fake_sentinel2_l2a_MSIL2Ap/S2A_MSIL2A_20170823T094031_N0205_R036_T34VFJ_20170823T094252.SAFE/GRANULE/L2A_T34VFJ_A011330_20170823T094252/IMG_DATA/R10m/L2A_T34VFJ_20170823T094031_B08_10m.jp2
new file mode 100644
index 0000000000000000000000000000000000000000..a8b7386a5f7082b09868597a801c71a3f6945bfe
GIT binary patch
literal 446
zcmebD)MDUZU|`^3U|?isU<9(%*nvzWHWQQ$RKdUuWrNhQA+be~*fL0LCny_ag)<V{
dg^`6p1!%@BAa;eawSa~OBk2W7jRFE8008b~1Tz2t

literal 0
HcmV?d00001

diff --git a/autotest/gdrivers/data/fake_sentinel2_l2a_MSIL2Ap/S2A_MSIL2A_20170823T094031_N0205_R036_T34VFJ_20170823T094252.SAFE/GRANULE/L2A_T34VFJ_A011330_20170823T094252/IMG_DATA/R10m/L2A_T34VFJ_20170823T094031_TCI_10m.jp2 b/autotest/gdrivers/data/fake_sentinel2_l2a_MSIL2Ap/S2A_MSIL2A_20170823T094031_N0205_R036_T34VFJ_20170823T094252.SAFE/GRANULE/L2A_T34VFJ_A011330_20170823T094252/IMG_DATA/R10m/L2A_T34VFJ_20170823T094031_TCI_10m.jp2
new file mode 100644
index 0000000000000000000000000000000000000000..a8b7386a5f7082b09868597a801c71a3f6945bfe
GIT binary patch
literal 446
zcmebD)MDUZU|`^3U|?isU<9(%*nvzWHWQQ$RKdUuWrNhQA+be~*fL0LCny_ag)<V{
dg^`6p1!%@BAa;eawSa~OBk2W7jRFE8008b~1Tz2t

literal 0
HcmV?d00001

diff --git a/autotest/gdrivers/data/fake_sentinel2_l2a_MSIL2Ap/S2A_MSIL2A_20170823T094031_N0205_R036_T34VFJ_20170823T094252.SAFE/GRANULE/L2A_T34VFJ_A011330_20170823T094252/IMG_DATA/R10m/L2A_T34VFJ_20170823T094031_WVP_10m.jp2 b/autotest/gdrivers/data/fake_sentinel2_l2a_MSIL2Ap/S2A_MSIL2A_20170823T094031_N0205_R036_T34VFJ_20170823T094252.SAFE/GRANULE/L2A_T34VFJ_A011330_20170823T094252/IMG_DATA/R10m/L2A_T34VFJ_20170823T094031_WVP_10m.jp2
new file mode 100644
index 0000000000000000000000000000000000000000..a8b7386a5f7082b09868597a801c71a3f6945bfe
GIT binary patch
literal 446
zcmebD)MDUZU|`^3U|?isU<9(%*nvzWHWQQ$RKdUuWrNhQA+be~*fL0LCny_ag)<V{
dg^`6p1!%@BAa;eawSa~OBk2W7jRFE8008b~1Tz2t

literal 0
HcmV?d00001

diff --git a/autotest/gdrivers/data/fake_sentinel2_l2a_MSIL2Ap/S2A_MSIL2A_20170823T094031_N0205_R036_T34VFJ_20170823T094252.SAFE/GRANULE/L2A_T34VFJ_A011330_20170823T094252/IMG_DATA/R20m/L2A_T34VFJ_20170823T094031_AOT_20m.jp2 b/autotest/gdrivers/data/fake_sentinel2_l2a_MSIL2Ap/S2A_MSIL2A_20170823T094031_N0205_R036_T34VFJ_20170823T094252.SAFE/GRANULE/L2A_T34VFJ_A011330_20170823T094252/IMG_DATA/R20m/L2A_T34VFJ_20170823T094031_AOT_20m.jp2
new file mode 100644
index 0000000000000000000000000000000000000000..a8b7386a5f7082b09868597a801c71a3f6945bfe
GIT binary patch
literal 446
zcmebD)MDUZU|`^3U|?isU<9(%*nvzWHWQQ$RKdUuWrNhQA+be~*fL0LCny_ag)<V{
dg^`6p1!%@BAa;eawSa~OBk2W7jRFE8008b~1Tz2t

literal 0
HcmV?d00001

diff --git a/autotest/gdrivers/data/fake_sentinel2_l2a_MSIL2Ap/S2A_MSIL2A_20170823T094031_N0205_R036_T34VFJ_20170823T094252.SAFE/GRANULE/L2A_T34VFJ_A011330_20170823T094252/IMG_DATA/R20m/L2A_T34VFJ_20170823T094031_B02_20m.jp2 b/autotest/gdrivers/data/fake_sentinel2_l2a_MSIL2Ap/S2A_MSIL2A_20170823T094031_N0205_R036_T34VFJ_20170823T094252.SAFE/GRANULE/L2A_T34VFJ_A011330_20170823T094252/IMG_DATA/R20m/L2A_T34VFJ_20170823T094031_B02_20m.jp2
new file mode 100644
index 0000000000000000000000000000000000000000..a8b7386a5f7082b09868597a801c71a3f6945bfe
GIT binary patch
literal 446
zcmebD)MDUZU|`^3U|?isU<9(%*nvzWHWQQ$RKdUuWrNhQA+be~*fL0LCny_ag)<V{
dg^`6p1!%@BAa;eawSa~OBk2W7jRFE8008b~1Tz2t

literal 0
HcmV?d00001

diff --git a/autotest/gdrivers/data/fake_sentinel2_l2a_MSIL2Ap/S2A_MSIL2A_20170823T094031_N0205_R036_T34VFJ_20170823T094252.SAFE/GRANULE/L2A_T34VFJ_A011330_20170823T094252/IMG_DATA/R20m/L2A_T34VFJ_20170823T094031_B03_20m.jp2 b/autotest/gdrivers/data/fake_sentinel2_l2a_MSIL2Ap/S2A_MSIL2A_20170823T094031_N0205_R036_T34VFJ_20170823T094252.SAFE/GRANULE/L2A_T34VFJ_A011330_20170823T094252/IMG_DATA/R20m/L2A_T34VFJ_20170823T094031_B03_20m.jp2
new file mode 100644
index 0000000000000000000000000000000000000000..a8b7386a5f7082b09868597a801c71a3f6945bfe
GIT binary patch
literal 446
zcmebD)MDUZU|`^3U|?isU<9(%*nvzWHWQQ$RKdUuWrNhQA+be~*fL0LCny_ag)<V{
dg^`6p1!%@BAa;eawSa~OBk2W7jRFE8008b~1Tz2t

literal 0
HcmV?d00001

diff --git a/autotest/gdrivers/data/fake_sentinel2_l2a_MSIL2Ap/S2A_MSIL2A_20170823T094031_N0205_R036_T34VFJ_20170823T094252.SAFE/GRANULE/L2A_T34VFJ_A011330_20170823T094252/IMG_DATA/R20m/L2A_T34VFJ_20170823T094031_B04_20m.jp2 b/autotest/gdrivers/data/fake_sentinel2_l2a_MSIL2Ap/S2A_MSIL2A_20170823T094031_N0205_R036_T34VFJ_20170823T094252.SAFE/GRANULE/L2A_T34VFJ_A011330_20170823T094252/IMG_DATA/R20m/L2A_T34VFJ_20170823T094031_B04_20m.jp2
new file mode 100644
index 0000000000000000000000000000000000000000..a8b7386a5f7082b09868597a801c71a3f6945bfe
GIT binary patch
literal 446
zcmebD)MDUZU|`^3U|?isU<9(%*nvzWHWQQ$RKdUuWrNhQA+be~*fL0LCny_ag)<V{
dg^`6p1!%@BAa;eawSa~OBk2W7jRFE8008b~1Tz2t

literal 0
HcmV?d00001

diff --git a/autotest/gdrivers/data/fake_sentinel2_l2a_MSIL2Ap/S2A_MSIL2A_20170823T094031_N0205_R036_T34VFJ_20170823T094252.SAFE/GRANULE/L2A_T34VFJ_A011330_20170823T094252/IMG_DATA/R20m/L2A_T34VFJ_20170823T094031_B05_20m.jp2 b/autotest/gdrivers/data/fake_sentinel2_l2a_MSIL2Ap/S2A_MSIL2A_20170823T094031_N0205_R036_T34VFJ_20170823T094252.SAFE/GRANULE/L2A_T34VFJ_A011330_20170823T094252/IMG_DATA/R20m/L2A_T34VFJ_20170823T094031_B05_20m.jp2
new file mode 100644
index 0000000000000000000000000000000000000000..a8b7386a5f7082b09868597a801c71a3f6945bfe
GIT binary patch
literal 446
zcmebD)MDUZU|`^3U|?isU<9(%*nvzWHWQQ$RKdUuWrNhQA+be~*fL0LCny_ag)<V{
dg^`6p1!%@BAa;eawSa~OBk2W7jRFE8008b~1Tz2t

literal 0
HcmV?d00001

diff --git a/autotest/gdrivers/data/fake_sentinel2_l2a_MSIL2Ap/S2A_MSIL2A_20170823T094031_N0205_R036_T34VFJ_20170823T094252.SAFE/GRANULE/L2A_T34VFJ_A011330_20170823T094252/IMG_DATA/R20m/L2A_T34VFJ_20170823T094031_B06_20m.jp2 b/autotest/gdrivers/data/fake_sentinel2_l2a_MSIL2Ap/S2A_MSIL2A_20170823T094031_N0205_R036_T34VFJ_20170823T094252.SAFE/GRANULE/L2A_T34VFJ_A011330_20170823T094252/IMG_DATA/R20m/L2A_T34VFJ_20170823T094031_B06_20m.jp2
new file mode 100644
index 0000000000000000000000000000000000000000..a8b7386a5f7082b09868597a801c71a3f6945bfe
GIT binary patch
literal 446
zcmebD)MDUZU|`^3U|?isU<9(%*nvzWHWQQ$RKdUuWrNhQA+be~*fL0LCny_ag)<V{
dg^`6p1!%@BAa;eawSa~OBk2W7jRFE8008b~1Tz2t

literal 0
HcmV?d00001

diff --git a/autotest/gdrivers/data/fake_sentinel2_l2a_MSIL2Ap/S2A_MSIL2A_20170823T094031_N0205_R036_T34VFJ_20170823T094252.SAFE/GRANULE/L2A_T34VFJ_A011330_20170823T094252/IMG_DATA/R20m/L2A_T34VFJ_20170823T094031_B07_20m.jp2 b/autotest/gdrivers/data/fake_sentinel2_l2a_MSIL2Ap/S2A_MSIL2A_20170823T094031_N0205_R036_T34VFJ_20170823T094252.SAFE/GRANULE/L2A_T34VFJ_A011330_20170823T094252/IMG_DATA/R20m/L2A_T34VFJ_20170823T094031_B07_20m.jp2
new file mode 100644
index 0000000000000000000000000000000000000000..a8b7386a5f7082b09868597a801c71a3f6945bfe
GIT binary patch
literal 446
zcmebD)MDUZU|`^3U|?isU<9(%*nvzWHWQQ$RKdUuWrNhQA+be~*fL0LCny_ag)<V{
dg^`6p1!%@BAa;eawSa~OBk2W7jRFE8008b~1Tz2t

literal 0
HcmV?d00001

diff --git a/autotest/gdrivers/data/fake_sentinel2_l2a_MSIL2Ap/S2A_MSIL2A_20170823T094031_N0205_R036_T34VFJ_20170823T094252.SAFE/GRANULE/L2A_T34VFJ_A011330_20170823T094252/IMG_DATA/R20m/L2A_T34VFJ_20170823T094031_B11_20m.jp2 b/autotest/gdrivers/data/fake_sentinel2_l2a_MSIL2Ap/S2A_MSIL2A_20170823T094031_N0205_R036_T34VFJ_20170823T094252.SAFE/GRANULE/L2A_T34VFJ_A011330_20170823T094252/IMG_DATA/R20m/L2A_T34VFJ_20170823T094031_B11_20m.jp2
new file mode 100644
index 0000000000000000000000000000000000000000..a8b7386a5f7082b09868597a801c71a3f6945bfe
GIT binary patch
literal 446
zcmebD)MDUZU|`^3U|?isU<9(%*nvzWHWQQ$RKdUuWrNhQA+be~*fL0LCny_ag)<V{
dg^`6p1!%@BAa;eawSa~OBk2W7jRFE8008b~1Tz2t

literal 0
HcmV?d00001

diff --git a/autotest/gdrivers/data/fake_sentinel2_l2a_MSIL2Ap/S2A_MSIL2A_20170823T094031_N0205_R036_T34VFJ_20170823T094252.SAFE/GRANULE/L2A_T34VFJ_A011330_20170823T094252/IMG_DATA/R20m/L2A_T34VFJ_20170823T094031_B12_20m.jp2 b/autotest/gdrivers/data/fake_sentinel2_l2a_MSIL2Ap/S2A_MSIL2A_20170823T094031_N0205_R036_T34VFJ_20170823T094252.SAFE/GRANULE/L2A_T34VFJ_A011330_20170823T094252/IMG_DATA/R20m/L2A_T34VFJ_20170823T094031_B12_20m.jp2
new file mode 100644
index 0000000000000000000000000000000000000000..a8b7386a5f7082b09868597a801c71a3f6945bfe
GIT binary patch
literal 446
zcmebD)MDUZU|`^3U|?isU<9(%*nvzWHWQQ$RKdUuWrNhQA+be~*fL0LCny_ag)<V{
dg^`6p1!%@BAa;eawSa~OBk2W7jRFE8008b~1Tz2t

literal 0
HcmV?d00001

diff --git a/autotest/gdrivers/data/fake_sentinel2_l2a_MSIL2Ap/S2A_MSIL2A_20170823T094031_N0205_R036_T34VFJ_20170823T094252.SAFE/GRANULE/L2A_T34VFJ_A011330_20170823T094252/IMG_DATA/R20m/L2A_T34VFJ_20170823T094031_B8A_20m.jp2 b/autotest/gdrivers/data/fake_sentinel2_l2a_MSIL2Ap/S2A_MSIL2A_20170823T094031_N0205_R036_T34VFJ_20170823T094252.SAFE/GRANULE/L2A_T34VFJ_A011330_20170823T094252/IMG_DATA/R20m/L2A_T34VFJ_20170823T094031_B8A_20m.jp2
new file mode 100644
index 0000000000000000000000000000000000000000..a8b7386a5f7082b09868597a801c71a3f6945bfe
GIT binary patch
literal 446
zcmebD)MDUZU|`^3U|?isU<9(%*nvzWHWQQ$RKdUuWrNhQA+be~*fL0LCny_ag)<V{
dg^`6p1!%@BAa;eawSa~OBk2W7jRFE8008b~1Tz2t

literal 0
HcmV?d00001

diff --git a/autotest/gdrivers/data/fake_sentinel2_l2a_MSIL2Ap/S2A_MSIL2A_20170823T094031_N0205_R036_T34VFJ_20170823T094252.SAFE/GRANULE/L2A_T34VFJ_A011330_20170823T094252/IMG_DATA/R20m/L2A_T34VFJ_20170823T094031_SCL_20m.jp2 b/autotest/gdrivers/data/fake_sentinel2_l2a_MSIL2Ap/S2A_MSIL2A_20170823T094031_N0205_R036_T34VFJ_20170823T094252.SAFE/GRANULE/L2A_T34VFJ_A011330_20170823T094252/IMG_DATA/R20m/L2A_T34VFJ_20170823T094031_SCL_20m.jp2
new file mode 100644
index 0000000000000000000000000000000000000000..a8b7386a5f7082b09868597a801c71a3f6945bfe
GIT binary patch
literal 446
zcmebD)MDUZU|`^3U|?isU<9(%*nvzWHWQQ$RKdUuWrNhQA+be~*fL0LCny_ag)<V{
dg^`6p1!%@BAa;eawSa~OBk2W7jRFE8008b~1Tz2t

literal 0
HcmV?d00001

diff --git a/autotest/gdrivers/data/fake_sentinel2_l2a_MSIL2Ap/S2A_MSIL2A_20170823T094031_N0205_R036_T34VFJ_20170823T094252.SAFE/GRANULE/L2A_T34VFJ_A011330_20170823T094252/IMG_DATA/R20m/L2A_T34VFJ_20170823T094031_TCI_20m.jp2 b/autotest/gdrivers/data/fake_sentinel2_l2a_MSIL2Ap/S2A_MSIL2A_20170823T094031_N0205_R036_T34VFJ_20170823T094252.SAFE/GRANULE/L2A_T34VFJ_A011330_20170823T094252/IMG_DATA/R20m/L2A_T34VFJ_20170823T094031_TCI_20m.jp2
new file mode 100644
index 0000000000000000000000000000000000000000..a8b7386a5f7082b09868597a801c71a3f6945bfe
GIT binary patch
literal 446
zcmebD)MDUZU|`^3U|?isU<9(%*nvzWHWQQ$RKdUuWrNhQA+be~*fL0LCny_ag)<V{
dg^`6p1!%@BAa;eawSa~OBk2W7jRFE8008b~1Tz2t

literal 0
HcmV?d00001

diff --git a/autotest/gdrivers/data/fake_sentinel2_l2a_MSIL2Ap/S2A_MSIL2A_20170823T094031_N0205_R036_T34VFJ_20170823T094252.SAFE/GRANULE/L2A_T34VFJ_A011330_20170823T094252/IMG_DATA/R20m/L2A_T34VFJ_20170823T094031_VIS_20m.jp2 b/autotest/gdrivers/data/fake_sentinel2_l2a_MSIL2Ap/S2A_MSIL2A_20170823T094031_N0205_R036_T34VFJ_20170823T094252.SAFE/GRANULE/L2A_T34VFJ_A011330_20170823T094252/IMG_DATA/R20m/L2A_T34VFJ_20170823T094031_VIS_20m.jp2
new file mode 100644
index 0000000000000000000000000000000000000000..a8b7386a5f7082b09868597a801c71a3f6945bfe
GIT binary patch
literal 446
zcmebD)MDUZU|`^3U|?isU<9(%*nvzWHWQQ$RKdUuWrNhQA+be~*fL0LCny_ag)<V{
dg^`6p1!%@BAa;eawSa~OBk2W7jRFE8008b~1Tz2t

literal 0
HcmV?d00001

diff --git a/autotest/gdrivers/data/fake_sentinel2_l2a_MSIL2Ap/S2A_MSIL2A_20170823T094031_N0205_R036_T34VFJ_20170823T094252.SAFE/GRANULE/L2A_T34VFJ_A011330_20170823T094252/IMG_DATA/R20m/L2A_T34VFJ_20170823T094031_WVP_20m.jp2 b/autotest/gdrivers/data/fake_sentinel2_l2a_MSIL2Ap/S2A_MSIL2A_20170823T094031_N0205_R036_T34VFJ_20170823T094252.SAFE/GRANULE/L2A_T34VFJ_A011330_20170823T094252/IMG_DATA/R20m/L2A_T34VFJ_20170823T094031_WVP_20m.jp2
new file mode 100644
index 0000000000000000000000000000000000000000..a8b7386a5f7082b09868597a801c71a3f6945bfe
GIT binary patch
literal 446
zcmebD)MDUZU|`^3U|?isU<9(%*nvzWHWQQ$RKdUuWrNhQA+be~*fL0LCny_ag)<V{
dg^`6p1!%@BAa;eawSa~OBk2W7jRFE8008b~1Tz2t

literal 0
HcmV?d00001

diff --git a/autotest/gdrivers/data/fake_sentinel2_l2a_MSIL2Ap/S2A_MSIL2A_20170823T094031_N0205_R036_T34VFJ_20170823T094252.SAFE/GRANULE/L2A_T34VFJ_A011330_20170823T094252/IMG_DATA/R60m/L2A_T34VFJ_20170823T094031_AOT_60m.jp2 b/autotest/gdrivers/data/fake_sentinel2_l2a_MSIL2Ap/S2A_MSIL2A_20170823T094031_N0205_R036_T34VFJ_20170823T094252.SAFE/GRANULE/L2A_T34VFJ_A011330_20170823T094252/IMG_DATA/R60m/L2A_T34VFJ_20170823T094031_AOT_60m.jp2
new file mode 100644
index 0000000000000000000000000000000000000000..a8b7386a5f7082b09868597a801c71a3f6945bfe
GIT binary patch
literal 446
zcmebD)MDUZU|`^3U|?isU<9(%*nvzWHWQQ$RKdUuWrNhQA+be~*fL0LCny_ag)<V{
dg^`6p1!%@BAa;eawSa~OBk2W7jRFE8008b~1Tz2t

literal 0
HcmV?d00001

diff --git a/autotest/gdrivers/data/fake_sentinel2_l2a_MSIL2Ap/S2A_MSIL2A_20170823T094031_N0205_R036_T34VFJ_20170823T094252.SAFE/GRANULE/L2A_T34VFJ_A011330_20170823T094252/IMG_DATA/R60m/L2A_T34VFJ_20170823T094031_B01_60m.jp2 b/autotest/gdrivers/data/fake_sentinel2_l2a_MSIL2Ap/S2A_MSIL2A_20170823T094031_N0205_R036_T34VFJ_20170823T094252.SAFE/GRANULE/L2A_T34VFJ_A011330_20170823T094252/IMG_DATA/R60m/L2A_T34VFJ_20170823T094031_B01_60m.jp2
new file mode 100644
index 0000000000000000000000000000000000000000..a8b7386a5f7082b09868597a801c71a3f6945bfe
GIT binary patch
literal 446
zcmebD)MDUZU|`^3U|?isU<9(%*nvzWHWQQ$RKdUuWrNhQA+be~*fL0LCny_ag)<V{
dg^`6p1!%@BAa;eawSa~OBk2W7jRFE8008b~1Tz2t

literal 0
HcmV?d00001

diff --git a/autotest/gdrivers/data/fake_sentinel2_l2a_MSIL2Ap/S2A_MSIL2A_20170823T094031_N0205_R036_T34VFJ_20170823T094252.SAFE/GRANULE/L2A_T34VFJ_A011330_20170823T094252/IMG_DATA/R60m/L2A_T34VFJ_20170823T094031_B02_60m.jp2 b/autotest/gdrivers/data/fake_sentinel2_l2a_MSIL2Ap/S2A_MSIL2A_20170823T094031_N0205_R036_T34VFJ_20170823T094252.SAFE/GRANULE/L2A_T34VFJ_A011330_20170823T094252/IMG_DATA/R60m/L2A_T34VFJ_20170823T094031_B02_60m.jp2
new file mode 100644
index 0000000000000000000000000000000000000000..a8b7386a5f7082b09868597a801c71a3f6945bfe
GIT binary patch
literal 446
zcmebD)MDUZU|`^3U|?isU<9(%*nvzWHWQQ$RKdUuWrNhQA+be~*fL0LCny_ag)<V{
dg^`6p1!%@BAa;eawSa~OBk2W7jRFE8008b~1Tz2t

literal 0
HcmV?d00001

diff --git a/autotest/gdrivers/data/fake_sentinel2_l2a_MSIL2Ap/S2A_MSIL2A_20170823T094031_N0205_R036_T34VFJ_20170823T094252.SAFE/GRANULE/L2A_T34VFJ_A011330_20170823T094252/IMG_DATA/R60m/L2A_T34VFJ_20170823T094031_B03_60m.jp2 b/autotest/gdrivers/data/fake_sentinel2_l2a_MSIL2Ap/S2A_MSIL2A_20170823T094031_N0205_R036_T34VFJ_20170823T094252.SAFE/GRANULE/L2A_T34VFJ_A011330_20170823T094252/IMG_DATA/R60m/L2A_T34VFJ_20170823T094031_B03_60m.jp2
new file mode 100644
index 0000000000000000000000000000000000000000..a8b7386a5f7082b09868597a801c71a3f6945bfe
GIT binary patch
literal 446
zcmebD)MDUZU|`^3U|?isU<9(%*nvzWHWQQ$RKdUuWrNhQA+be~*fL0LCny_ag)<V{
dg^`6p1!%@BAa;eawSa~OBk2W7jRFE8008b~1Tz2t

literal 0
HcmV?d00001

diff --git a/autotest/gdrivers/data/fake_sentinel2_l2a_MSIL2Ap/S2A_MSIL2A_20170823T094031_N0205_R036_T34VFJ_20170823T094252.SAFE/GRANULE/L2A_T34VFJ_A011330_20170823T094252/IMG_DATA/R60m/L2A_T34VFJ_20170823T094031_B04_60m.jp2 b/autotest/gdrivers/data/fake_sentinel2_l2a_MSIL2Ap/S2A_MSIL2A_20170823T094031_N0205_R036_T34VFJ_20170823T094252.SAFE/GRANULE/L2A_T34VFJ_A011330_20170823T094252/IMG_DATA/R60m/L2A_T34VFJ_20170823T094031_B04_60m.jp2
new file mode 100644
index 0000000000000000000000000000000000000000..a8b7386a5f7082b09868597a801c71a3f6945bfe
GIT binary patch
literal 446
zcmebD)MDUZU|`^3U|?isU<9(%*nvzWHWQQ$RKdUuWrNhQA+be~*fL0LCny_ag)<V{
dg^`6p1!%@BAa;eawSa~OBk2W7jRFE8008b~1Tz2t

literal 0
HcmV?d00001

diff --git a/autotest/gdrivers/data/fake_sentinel2_l2a_MSIL2Ap/S2A_MSIL2A_20170823T094031_N0205_R036_T34VFJ_20170823T094252.SAFE/GRANULE/L2A_T34VFJ_A011330_20170823T094252/IMG_DATA/R60m/L2A_T34VFJ_20170823T094031_B05_60m.jp2 b/autotest/gdrivers/data/fake_sentinel2_l2a_MSIL2Ap/S2A_MSIL2A_20170823T094031_N0205_R036_T34VFJ_20170823T094252.SAFE/GRANULE/L2A_T34VFJ_A011330_20170823T094252/IMG_DATA/R60m/L2A_T34VFJ_20170823T094031_B05_60m.jp2
new file mode 100644
index 0000000000000000000000000000000000000000..a8b7386a5f7082b09868597a801c71a3f6945bfe
GIT binary patch
literal 446
zcmebD)MDUZU|`^3U|?isU<9(%*nvzWHWQQ$RKdUuWrNhQA+be~*fL0LCny_ag)<V{
dg^`6p1!%@BAa;eawSa~OBk2W7jRFE8008b~1Tz2t

literal 0
HcmV?d00001

diff --git a/autotest/gdrivers/data/fake_sentinel2_l2a_MSIL2Ap/S2A_MSIL2A_20170823T094031_N0205_R036_T34VFJ_20170823T094252.SAFE/GRANULE/L2A_T34VFJ_A011330_20170823T094252/IMG_DATA/R60m/L2A_T34VFJ_20170823T094031_B06_60m.jp2 b/autotest/gdrivers/data/fake_sentinel2_l2a_MSIL2Ap/S2A_MSIL2A_20170823T094031_N0205_R036_T34VFJ_20170823T094252.SAFE/GRANULE/L2A_T34VFJ_A011330_20170823T094252/IMG_DATA/R60m/L2A_T34VFJ_20170823T094031_B06_60m.jp2
new file mode 100644
index 0000000000000000000000000000000000000000..a8b7386a5f7082b09868597a801c71a3f6945bfe
GIT binary patch
literal 446
zcmebD)MDUZU|`^3U|?isU<9(%*nvzWHWQQ$RKdUuWrNhQA+be~*fL0LCny_ag)<V{
dg^`6p1!%@BAa;eawSa~OBk2W7jRFE8008b~1Tz2t

literal 0
HcmV?d00001

diff --git a/autotest/gdrivers/data/fake_sentinel2_l2a_MSIL2Ap/S2A_MSIL2A_20170823T094031_N0205_R036_T34VFJ_20170823T094252.SAFE/GRANULE/L2A_T34VFJ_A011330_20170823T094252/IMG_DATA/R60m/L2A_T34VFJ_20170823T094031_B07_60m.jp2 b/autotest/gdrivers/data/fake_sentinel2_l2a_MSIL2Ap/S2A_MSIL2A_20170823T094031_N0205_R036_T34VFJ_20170823T094252.SAFE/GRANULE/L2A_T34VFJ_A011330_20170823T094252/IMG_DATA/R60m/L2A_T34VFJ_20170823T094031_B07_60m.jp2
new file mode 100644
index 0000000000000000000000000000000000000000..a8b7386a5f7082b09868597a801c71a3f6945bfe
GIT binary patch
literal 446
zcmebD)MDUZU|`^3U|?isU<9(%*nvzWHWQQ$RKdUuWrNhQA+be~*fL0LCny_ag)<V{
dg^`6p1!%@BAa;eawSa~OBk2W7jRFE8008b~1Tz2t

literal 0
HcmV?d00001

diff --git a/autotest/gdrivers/data/fake_sentinel2_l2a_MSIL2Ap/S2A_MSIL2A_20170823T094031_N0205_R036_T34VFJ_20170823T094252.SAFE/GRANULE/L2A_T34VFJ_A011330_20170823T094252/IMG_DATA/R60m/L2A_T34VFJ_20170823T094031_B09_60m.jp2 b/autotest/gdrivers/data/fake_sentinel2_l2a_MSIL2Ap/S2A_MSIL2A_20170823T094031_N0205_R036_T34VFJ_20170823T094252.SAFE/GRANULE/L2A_T34VFJ_A011330_20170823T094252/IMG_DATA/R60m/L2A_T34VFJ_20170823T094031_B09_60m.jp2
new file mode 100644
index 0000000000000000000000000000000000000000..a8b7386a5f7082b09868597a801c71a3f6945bfe
GIT binary patch
literal 446
zcmebD)MDUZU|`^3U|?isU<9(%*nvzWHWQQ$RKdUuWrNhQA+be~*fL0LCny_ag)<V{
dg^`6p1!%@BAa;eawSa~OBk2W7jRFE8008b~1Tz2t

literal 0
HcmV?d00001

diff --git a/autotest/gdrivers/data/fake_sentinel2_l2a_MSIL2Ap/S2A_MSIL2A_20170823T094031_N0205_R036_T34VFJ_20170823T094252.SAFE/GRANULE/L2A_T34VFJ_A011330_20170823T094252/IMG_DATA/R60m/L2A_T34VFJ_20170823T094031_B11_60m.jp2 b/autotest/gdrivers/data/fake_sentinel2_l2a_MSIL2Ap/S2A_MSIL2A_20170823T094031_N0205_R036_T34VFJ_20170823T094252.SAFE/GRANULE/L2A_T34VFJ_A011330_20170823T094252/IMG_DATA/R60m/L2A_T34VFJ_20170823T094031_B11_60m.jp2
new file mode 100644
index 0000000000000000000000000000000000000000..a8b7386a5f7082b09868597a801c71a3f6945bfe
GIT binary patch
literal 446
zcmebD)MDUZU|`^3U|?isU<9(%*nvzWHWQQ$RKdUuWrNhQA+be~*fL0LCny_ag)<V{
dg^`6p1!%@BAa;eawSa~OBk2W7jRFE8008b~1Tz2t

literal 0
HcmV?d00001

diff --git a/autotest/gdrivers/data/fake_sentinel2_l2a_MSIL2Ap/S2A_MSIL2A_20170823T094031_N0205_R036_T34VFJ_20170823T094252.SAFE/GRANULE/L2A_T34VFJ_A011330_20170823T094252/IMG_DATA/R60m/L2A_T34VFJ_20170823T094031_B12_60m.jp2 b/autotest/gdrivers/data/fake_sentinel2_l2a_MSIL2Ap/S2A_MSIL2A_20170823T094031_N0205_R036_T34VFJ_20170823T094252.SAFE/GRANULE/L2A_T34VFJ_A011330_20170823T094252/IMG_DATA/R60m/L2A_T34VFJ_20170823T094031_B12_60m.jp2
new file mode 100644
index 0000000000000000000000000000000000000000..a8b7386a5f7082b09868597a801c71a3f6945bfe
GIT binary patch
literal 446
zcmebD)MDUZU|`^3U|?isU<9(%*nvzWHWQQ$RKdUuWrNhQA+be~*fL0LCny_ag)<V{
dg^`6p1!%@BAa;eawSa~OBk2W7jRFE8008b~1Tz2t

literal 0
HcmV?d00001

diff --git a/autotest/gdrivers/data/fake_sentinel2_l2a_MSIL2Ap/S2A_MSIL2A_20170823T094031_N0205_R036_T34VFJ_20170823T094252.SAFE/GRANULE/L2A_T34VFJ_A011330_20170823T094252/IMG_DATA/R60m/L2A_T34VFJ_20170823T094031_B8A_60m.jp2 b/autotest/gdrivers/data/fake_sentinel2_l2a_MSIL2Ap/S2A_MSIL2A_20170823T094031_N0205_R036_T34VFJ_20170823T094252.SAFE/GRANULE/L2A_T34VFJ_A011330_20170823T094252/IMG_DATA/R60m/L2A_T34VFJ_20170823T094031_B8A_60m.jp2
new file mode 100644
index 0000000000000000000000000000000000000000..a8b7386a5f7082b09868597a801c71a3f6945bfe
GIT binary patch
literal 446
zcmebD)MDUZU|`^3U|?isU<9(%*nvzWHWQQ$RKdUuWrNhQA+be~*fL0LCny_ag)<V{
dg^`6p1!%@BAa;eawSa~OBk2W7jRFE8008b~1Tz2t

literal 0
HcmV?d00001

diff --git a/autotest/gdrivers/data/fake_sentinel2_l2a_MSIL2Ap/S2A_MSIL2A_20170823T094031_N0205_R036_T34VFJ_20170823T094252.SAFE/GRANULE/L2A_T34VFJ_A011330_20170823T094252/IMG_DATA/R60m/L2A_T34VFJ_20170823T094031_SCL_60m.jp2 b/autotest/gdrivers/data/fake_sentinel2_l2a_MSIL2Ap/S2A_MSIL2A_20170823T094031_N0205_R036_T34VFJ_20170823T094252.SAFE/GRANULE/L2A_T34VFJ_A011330_20170823T094252/IMG_DATA/R60m/L2A_T34VFJ_20170823T094031_SCL_60m.jp2
new file mode 100644
index 0000000000000000000000000000000000000000..a8b7386a5f7082b09868597a801c71a3f6945bfe
GIT binary patch
literal 446
zcmebD)MDUZU|`^3U|?isU<9(%*nvzWHWQQ$RKdUuWrNhQA+be~*fL0LCny_ag)<V{
dg^`6p1!%@BAa;eawSa~OBk2W7jRFE8008b~1Tz2t

literal 0
HcmV?d00001

diff --git a/autotest/gdrivers/data/fake_sentinel2_l2a_MSIL2Ap/S2A_MSIL2A_20170823T094031_N0205_R036_T34VFJ_20170823T094252.SAFE/GRANULE/L2A_T34VFJ_A011330_20170823T094252/IMG_DATA/R60m/L2A_T34VFJ_20170823T094031_TCI_60m.jp2 b/autotest/gdrivers/data/fake_sentinel2_l2a_MSIL2Ap/S2A_MSIL2A_20170823T094031_N0205_R036_T34VFJ_20170823T094252.SAFE/GRANULE/L2A_T34VFJ_A011330_20170823T094252/IMG_DATA/R60m/L2A_T34VFJ_20170823T094031_TCI_60m.jp2
new file mode 100644
index 0000000000000000000000000000000000000000..a8b7386a5f7082b09868597a801c71a3f6945bfe
GIT binary patch
literal 446
zcmebD)MDUZU|`^3U|?isU<9(%*nvzWHWQQ$RKdUuWrNhQA+be~*fL0LCny_ag)<V{
dg^`6p1!%@BAa;eawSa~OBk2W7jRFE8008b~1Tz2t

literal 0
HcmV?d00001

diff --git a/autotest/gdrivers/data/fake_sentinel2_l2a_MSIL2Ap/S2A_MSIL2A_20170823T094031_N0205_R036_T34VFJ_20170823T094252.SAFE/GRANULE/L2A_T34VFJ_A011330_20170823T094252/IMG_DATA/R60m/L2A_T34VFJ_20170823T094031_WVP_60m.jp2 b/autotest/gdrivers/data/fake_sentinel2_l2a_MSIL2Ap/S2A_MSIL2A_20170823T094031_N0205_R036_T34VFJ_20170823T094252.SAFE/GRANULE/L2A_T34VFJ_A011330_20170823T094252/IMG_DATA/R60m/L2A_T34VFJ_20170823T094031_WVP_60m.jp2
new file mode 100644
index 0000000000000000000000000000000000000000..a8b7386a5f7082b09868597a801c71a3f6945bfe
GIT binary patch
literal 446
zcmebD)MDUZU|`^3U|?isU<9(%*nvzWHWQQ$RKdUuWrNhQA+be~*fL0LCny_ag)<V{
dg^`6p1!%@BAa;eawSa~OBk2W7jRFE8008b~1Tz2t

literal 0
HcmV?d00001

diff --git a/autotest/gdrivers/data/fake_sentinel2_l2a_MSIL2Ap/S2A_MSIL2A_20170823T094031_N0205_R036_T34VFJ_20170823T094252.SAFE/GRANULE/L2A_T34VFJ_A011330_20170823T094252/MTD_TL.xml b/autotest/gdrivers/data/fake_sentinel2_l2a_MSIL2Ap/S2A_MSIL2A_20170823T094031_N0205_R036_T34VFJ_20170823T094252.SAFE/GRANULE/L2A_T34VFJ_A011330_20170823T094252/MTD_TL.xml
new file mode 100755
index 000000000000..1919380b261a
--- /dev/null
+++ b/autotest/gdrivers/data/fake_sentinel2_l2a_MSIL2Ap/S2A_MSIL2A_20170823T094031_N0205_R036_T34VFJ_20170823T094252.SAFE/GRANULE/L2A_T34VFJ_A011330_20170823T094252/MTD_TL.xml
@@ -0,0 +1,78 @@
+<?xml version="1.0"  encoding="UTF-8"?>
+<n1:Level-2A_Tile_ID xmlns:n1="https://psd-12.sentinel2.eo.esa.int/PSD/S2_PDI_Level-2A_Tile_Metadata.xsd" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="https://psd-12.sentinel2.eo.esa.int/PSD/S2_PDI_Level-2A_Tile_Metadata.xsd /dpc/app/s2ipf/FORMAT_METADATA_TILE_L1C/02.10.03/scripts/../../../schemas/02.12.06/PSD/S2_PDI_Level-2A_Tile_Metadata.xsd">
+  <n1:General_Info>
+    <TILE_ID_2A metadataLevel="Brief">S2A_USER_MSI_L2A_TL_SGS__20170823T133142_A011330_T34VFJ_N02.05</TILE_ID_2A>
+    <DATASTRIP_ID_2A metadataLevel="Standard">S2A_USER_MSI_L2A_DS_SGS__20170823T133142_S20170823T094252_N02.05</DATASTRIP_ID_2A>
+    <DOWNLINK_PRIORITY metadataLevel="Standard">NOMINAL</DOWNLINK_PRIORITY>
+    <SENSING_TIME metadataLevel="Standard">2017-08-23T09:42:52.161Z</SENSING_TIME>
+    <Archiving_Info metadataLevel="Expertise">
+      <ARCHIVING_CENTRE>SGS_</ARCHIVING_CENTRE>
+      <ARCHIVING_TIME>2017-08-23T14:08:32.325838Z</ARCHIVING_TIME>
+    </Archiving_Info>
+  </n1:General_Info>
+  <n1:Geometric_Info>
+    <Tile_Geocoding metadataLevel="Brief">
+      <HORIZONTAL_CS_NAME>WGS84 / UTM zone 34N</HORIZONTAL_CS_NAME>
+      <HORIZONTAL_CS_CODE>EPSG:32634</HORIZONTAL_CS_CODE>
+      <Size resolution="10">
+        <NROWS>10980</NROWS>
+        <NCOLS>10980</NCOLS>
+      </Size>
+      <Size resolution="20">
+        <NROWS>5490</NROWS>
+        <NCOLS>5490</NCOLS>
+      </Size>
+      <Size resolution="60">
+        <NROWS>1830</NROWS>
+        <NCOLS>1830</NCOLS>
+      </Size>
+      <Geoposition resolution="10">
+        <ULX>600000</ULX>
+        <ULY>6400020</ULY>
+        <XDIM>10</XDIM>
+        <YDIM>-10</YDIM>
+      </Geoposition>
+      <Geoposition resolution="20">
+        <ULX>600000</ULX>
+        <ULY>6400020</ULY>
+        <XDIM>20</XDIM>
+        <YDIM>-20</YDIM>
+      </Geoposition>
+      <Geoposition resolution="60">
+        <ULX>600000</ULX>
+        <ULY>6400020</ULY>
+        <XDIM>60</XDIM>
+        <YDIM>-60</YDIM>
+      </Geoposition>
+    </Tile_Geocoding>
+  </n1:Geometric_Info>
+  <n1:Quality_Indicators_Info metadataLevel="Standard">
+    <L1C_Image_Content_QI>
+      <CLOUDY_PIXEL_PERCENTAGE>86.3421</CLOUDY_PIXEL_PERCENTAGE>
+      <DEGRADED_MSI_DATA_PERCENTAGE>0</DEGRADED_MSI_DATA_PERCENTAGE>
+    </L1C_Image_Content_QI>
+    <L2A_Image_Content_QI>
+      <NODATA_PIXEL_PERCENTAGE>0.000000</NODATA_PIXEL_PERCENTAGE>
+      <SATURATED_DEFECTIVE_PIXEL_PERCENTAGE>0.000000</SATURATED_DEFECTIVE_PIXEL_PERCENTAGE>
+      <DARK_FEATURES_PERCENTAGE>1.058892</DARK_FEATURES_PERCENTAGE>
+      <CLOUD_SHADOW_PERCENTAGE>4.194147</CLOUD_SHADOW_PERCENTAGE>
+      <VEGETATION_PERCENTAGE>5.036503</VEGETATION_PERCENTAGE>
+      <BARE_SOILS_PERCENTAGE>0.448578</BARE_SOILS_PERCENTAGE>
+      <WATER_PERCENTAGE>2.938666</WATER_PERCENTAGE>
+      <LOW_PROBA_CLOUDS_PERCENTAGE>1.662363</LOW_PROBA_CLOUDS_PERCENTAGE>
+      <MEDIUM_PROBA_CLOUDS_PERCENTAGE>28.919381</MEDIUM_PROBA_CLOUDS_PERCENTAGE>
+      <HIGH_PROBA_CLOUDS_PERCENTAGE>36.154309</HIGH_PROBA_CLOUDS_PERCENTAGE>
+      <THIN_CIRRUS_PERCENTAGE>19.373934</THIN_CIRRUS_PERCENTAGE>
+      <CLOUD_COVERAGE_PERCENTAGE>84.447624</CLOUD_COVERAGE_PERCENTAGE>
+      <SNOW_ICE_PERCENTAGE>0.213228</SNOW_ICE_PERCENTAGE>
+      <RADIATIVE_TRANSFER_ACCURAY>0.0</RADIATIVE_TRANSFER_ACCURAY>
+      <WATER_VAPOUR_RETRIEVAL_ACCURACY>0.0</WATER_VAPOUR_RETRIEVAL_ACCURACY>
+      <AOT_RETRIEVAL_ACCURACY>0.0</AOT_RETRIEVAL_ACCURACY>
+    </L2A_Image_Content_QI>
+    <L2A_Pixel_Level_QI>
+      <CLOUD_CONFIDENCE_MASK>L2A_T34VFJ_20170823T094031_CLD</CLOUD_CONFIDENCE_MASK>
+      <SNOW_ICE_CONFIDENCE_MASK>L2A_T34VFJ_20170823T094031_SNW</SNOW_ICE_CONFIDENCE_MASK>
+    </L2A_Pixel_Level_QI>
+    <PVI_FILENAME>L2A_T34VFJ_20170823T094031_PVI</PVI_FILENAME>
+  </n1:Quality_Indicators_Info>
+</n1:Level-2A_Tile_ID>
diff --git a/autotest/gdrivers/data/fake_sentinel2_l2a_MSIL2Ap/S2A_MSIL2A_20170823T094031_N0205_R036_T34VFJ_20170823T094252.SAFE/MTD_MSIL2A.xml b/autotest/gdrivers/data/fake_sentinel2_l2a_MSIL2Ap/S2A_MSIL2A_20170823T094031_N0205_R036_T34VFJ_20170823T094252.SAFE/MTD_MSIL2A.xml
new file mode 100644
index 000000000000..bbb37ca823ba
--- /dev/null
+++ b/autotest/gdrivers/data/fake_sentinel2_l2a_MSIL2Ap/S2A_MSIL2A_20170823T094031_N0205_R036_T34VFJ_20170823T094252.SAFE/MTD_MSIL2A.xml
@@ -0,0 +1,250 @@
+<?xml version="1.0"  encoding="UTF-8"?>
+<n1:Level-2A_User_Product xmlns:n1="https://psd-14.sentinel2.eo.esa.int/PSD/User_Product_Level-2A.xsd" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="https://psd-14.sentinel2.eo.esa.int/PSD/User_Product_Level-2A.xsd">
+  <n1:General_Info>
+    <L2A_Product_Info>
+      <PRODUCT_START_TIME>2017-08-23T09:40:31.026Z</PRODUCT_START_TIME>
+      <PRODUCT_STOP_TIME>2017-08-23T09:40:31.026Z</PRODUCT_STOP_TIME>
+      <PRODUCT_URI_1C>S2A_MSIL1C_20170823T094031_N0205_R036_T34VFJ_20170823T094252.SAFE</PRODUCT_URI_1C>
+      <PRODUCT_URI_2A>S2A_MSIL2A_20170823T094031_N0205_R036_T34VFJ_20170823T094252.SAFE</PRODUCT_URI_2A>
+      <PROCESSING_LEVEL>Level-2Ap</PROCESSING_LEVEL>
+      <PRODUCT_TYPE>S2MSI2Ap</PRODUCT_TYPE>
+      <PROCESSING_BASELINE>02.05</PROCESSING_BASELINE>
+      <GENERATION_TIME>2017-08-25T08:50:10Z</GENERATION_TIME>
+      <PREVIEW_IMAGE_URL>Not applicable</PREVIEW_IMAGE_URL>
+      <PREVIEW_GEO_INFO>Not applicable</PREVIEW_GEO_INFO>
+      <Datatake datatakeIdentifier="GS2A_20170823T094031_011330_N02.05">
+        <SPACECRAFT_NAME>Sentinel-2A</SPACECRAFT_NAME>
+        <DATATAKE_TYPE>INS-NOBS</DATATAKE_TYPE>
+        <DATATAKE_SENSING_START>2017-08-23T09:40:31.026Z</DATATAKE_SENSING_START>
+        <SENSING_ORBIT_NUMBER>36</SENSING_ORBIT_NUMBER>
+        <SENSING_ORBIT_DIRECTION>DESCENDING</SENSING_ORBIT_DIRECTION>
+      </Datatake>
+      <Query_Options completeSingleTile="true">
+        <PRODUCT_FORMAT>SAFE_COMPACT</PRODUCT_FORMAT>
+      </Query_Options>
+      <L2A_Product_Organisation>
+        <Granule_List>
+          <Granule granuleIdentifier="S2A_USER_MSI_L2A_TL_SGS__20170823T133142_A011330_T34VFJ_N02.05" datastripIdentifier="S2A_USER_MSI_L2A_DS_SGS__20170823T133142_S20170823T094252_N02.05" imageFormat="JPEG2000">
+            <IMAGE_FILE_2A>GRANULE/L2A_T34VFJ_A011330_20170823T094252/IMG_DATA/R60m/L2A_T34VFJ_20170823T094031_B01_60m</IMAGE_FILE_2A>
+            <IMAGE_FILE_2A>GRANULE/L2A_T34VFJ_A011330_20170823T094252/IMG_DATA/R60m/L2A_T34VFJ_20170823T094031_B02_60m</IMAGE_FILE_2A>
+            <IMAGE_FILE_2A>GRANULE/L2A_T34VFJ_A011330_20170823T094252/IMG_DATA/R60m/L2A_T34VFJ_20170823T094031_B03_60m</IMAGE_FILE_2A>
+            <IMAGE_FILE_2A>GRANULE/L2A_T34VFJ_A011330_20170823T094252/IMG_DATA/R60m/L2A_T34VFJ_20170823T094031_B04_60m</IMAGE_FILE_2A>
+            <IMAGE_FILE_2A>GRANULE/L2A_T34VFJ_A011330_20170823T094252/IMG_DATA/R60m/L2A_T34VFJ_20170823T094031_B05_60m</IMAGE_FILE_2A>
+            <IMAGE_FILE_2A>GRANULE/L2A_T34VFJ_A011330_20170823T094252/IMG_DATA/R60m/L2A_T34VFJ_20170823T094031_B06_60m</IMAGE_FILE_2A>
+            <IMAGE_FILE_2A>GRANULE/L2A_T34VFJ_A011330_20170823T094252/IMG_DATA/R60m/L2A_T34VFJ_20170823T094031_B07_60m</IMAGE_FILE_2A>
+            <IMAGE_FILE_2A>GRANULE/L2A_T34VFJ_A011330_20170823T094252/IMG_DATA/R60m/L2A_T34VFJ_20170823T094031_B8A_60m</IMAGE_FILE_2A>
+            <IMAGE_FILE_2A>GRANULE/L2A_T34VFJ_A011330_20170823T094252/IMG_DATA/R60m/L2A_T34VFJ_20170823T094031_B09_60m</IMAGE_FILE_2A>
+            <IMAGE_FILE_2A>GRANULE/L2A_T34VFJ_A011330_20170823T094252/IMG_DATA/R60m/L2A_T34VFJ_20170823T094031_B11_60m</IMAGE_FILE_2A>
+            <IMAGE_FILE_2A>GRANULE/L2A_T34VFJ_A011330_20170823T094252/IMG_DATA/R60m/L2A_T34VFJ_20170823T094031_B12_60m</IMAGE_FILE_2A>
+            <IMAGE_FILE_2A>GRANULE/L2A_T34VFJ_A011330_20170823T094252/AUX_DATA/L2A_T34VFJ_20170823T094031_DEM_60m</IMAGE_FILE_2A>
+            <IMAGE_FILE_2A>GRANULE/L2A_T34VFJ_A011330_20170823T094252/IMG_DATA/R60m/L2A_T34VFJ_20170823T094031_SCL_60m</IMAGE_FILE_2A>
+            <IMAGE_FILE_2A>GRANULE/L2A_T34VFJ_A011330_20170823T094252/QI_DATA/L2A_T34VFJ_20170823T094031_SNW_60m</IMAGE_FILE_2A>
+            <IMAGE_FILE_2A>GRANULE/L2A_T34VFJ_A011330_20170823T094252/QI_DATA/L2A_T34VFJ_20170823T094031_CLD_60m</IMAGE_FILE_2A>
+            <IMAGE_FILE_2A>GRANULE/L2A_T34VFJ_A011330_20170823T094252/IMG_DATA/R60m/L2A_T34VFJ_20170823T094031_AOT_60m</IMAGE_FILE_2A>
+            <IMAGE_FILE_2A>GRANULE/L2A_T34VFJ_A011330_20170823T094252/IMG_DATA/R60m/L2A_T34VFJ_20170823T094031_WVP_60m</IMAGE_FILE_2A>
+            <IMAGE_FILE_2A>GRANULE/L2A_T34VFJ_A011330_20170823T094252/IMG_DATA/R60m/L2A_T34VFJ_20170823T094031_TCI_60m</IMAGE_FILE_2A>
+          </Granule>
+        </Granule_List>
+        <Granule_List>
+          <Granule granuleIdentifier="S2A_USER_MSI_L2A_TL_SGS__20170823T133142_A011330_T34VFJ_N02.05" datastripIdentifier="S2A_USER_MSI_L2A_DS_SGS__20170823T133142_S20170823T094252_N02.05" imageFormat="JPEG2000">
+            <IMAGE_FILE_2A>GRANULE/L2A_T34VFJ_A011330_20170823T094252/IMG_DATA/R20m/L2A_T34VFJ_20170823T094031_B02_20m</IMAGE_FILE_2A>
+            <IMAGE_FILE_2A>GRANULE/L2A_T34VFJ_A011330_20170823T094252/IMG_DATA/R20m/L2A_T34VFJ_20170823T094031_B03_20m</IMAGE_FILE_2A>
+            <IMAGE_FILE_2A>GRANULE/L2A_T34VFJ_A011330_20170823T094252/IMG_DATA/R20m/L2A_T34VFJ_20170823T094031_B04_20m</IMAGE_FILE_2A>
+            <IMAGE_FILE_2A>GRANULE/L2A_T34VFJ_A011330_20170823T094252/IMG_DATA/R20m/L2A_T34VFJ_20170823T094031_B05_20m</IMAGE_FILE_2A>
+            <IMAGE_FILE_2A>GRANULE/L2A_T34VFJ_A011330_20170823T094252/IMG_DATA/R20m/L2A_T34VFJ_20170823T094031_B06_20m</IMAGE_FILE_2A>
+            <IMAGE_FILE_2A>GRANULE/L2A_T34VFJ_A011330_20170823T094252/IMG_DATA/R20m/L2A_T34VFJ_20170823T094031_B07_20m</IMAGE_FILE_2A>
+            <IMAGE_FILE_2A>GRANULE/L2A_T34VFJ_A011330_20170823T094252/IMG_DATA/R20m/L2A_T34VFJ_20170823T094031_B8A_20m</IMAGE_FILE_2A>
+            <IMAGE_FILE_2A>GRANULE/L2A_T34VFJ_A011330_20170823T094252/IMG_DATA/R20m/L2A_T34VFJ_20170823T094031_B11_20m</IMAGE_FILE_2A>
+            <IMAGE_FILE_2A>GRANULE/L2A_T34VFJ_A011330_20170823T094252/IMG_DATA/R20m/L2A_T34VFJ_20170823T094031_B12_20m</IMAGE_FILE_2A>
+            <IMAGE_FILE_2A>GRANULE/L2A_T34VFJ_A011330_20170823T094252/AUX_DATA/L2A_T34VFJ_20170823T094031_DEM_20m</IMAGE_FILE_2A>
+            <IMAGE_FILE_2A>GRANULE/L2A_T34VFJ_A011330_20170823T094252/IMG_DATA/R20m/L2A_T34VFJ_20170823T094031_SCL_20m</IMAGE_FILE_2A>
+            <IMAGE_FILE_2A>GRANULE/L2A_T34VFJ_A011330_20170823T094252/QI_DATA/L2A_T34VFJ_20170823T094031_SNW_20m</IMAGE_FILE_2A>
+            <IMAGE_FILE_2A>GRANULE/L2A_T34VFJ_A011330_20170823T094252/QI_DATA/L2A_T34VFJ_20170823T094031_CLD_20m</IMAGE_FILE_2A>
+            <IMAGE_FILE_2A>GRANULE/L2A_T34VFJ_A011330_20170823T094252/IMG_DATA/R20m/L2A_T34VFJ_20170823T094031_AOT_20m</IMAGE_FILE_2A>
+            <IMAGE_FILE_2A>GRANULE/L2A_T34VFJ_A011330_20170823T094252/IMG_DATA/R20m/L2A_T34VFJ_20170823T094031_WVP_20m</IMAGE_FILE_2A>
+            <IMAGE_FILE_2A>GRANULE/L2A_T34VFJ_A011330_20170823T094252/IMG_DATA/R20m/L2A_T34VFJ_20170823T094031_TCI_20m</IMAGE_FILE_2A>
+          </Granule>
+        </Granule_List>
+        <Granule_List>
+          <Granule granuleIdentifier="S2A_USER_MSI_L2A_TL_SGS__20170823T133142_A011330_T34VFJ_N02.05" datastripIdentifier="S2A_USER_MSI_L2A_DS_SGS__20170823T133142_S20170823T094252_N02.05" imageFormat="JPEG2000">
+            <IMAGE_FILE_2A>GRANULE/L2A_T34VFJ_A011330_20170823T094252/IMG_DATA/R10m/L2A_T34VFJ_20170823T094031_B02_10m</IMAGE_FILE_2A>
+            <IMAGE_FILE_2A>GRANULE/L2A_T34VFJ_A011330_20170823T094252/IMG_DATA/R10m/L2A_T34VFJ_20170823T094031_B03_10m</IMAGE_FILE_2A>
+            <IMAGE_FILE_2A>GRANULE/L2A_T34VFJ_A011330_20170823T094252/IMG_DATA/R10m/L2A_T34VFJ_20170823T094031_B04_10m</IMAGE_FILE_2A>
+            <IMAGE_FILE_2A>GRANULE/L2A_T34VFJ_A011330_20170823T094252/IMG_DATA/R10m/L2A_T34VFJ_20170823T094031_B08_10m</IMAGE_FILE_2A>
+            <IMAGE_FILE_2A>GRANULE/L2A_T34VFJ_A011330_20170823T094252/AUX_DATA/L2A_T34VFJ_20170823T094031_DEM_10m</IMAGE_FILE_2A>
+            <IMAGE_FILE_2A>GRANULE/L2A_T34VFJ_A011330_20170823T094252/IMG_DATA/R10m/L2A_T34VFJ_20170823T094031_AOT_10m</IMAGE_FILE_2A>
+            <IMAGE_FILE_2A>GRANULE/L2A_T34VFJ_A011330_20170823T094252/IMG_DATA/R10m/L2A_T34VFJ_20170823T094031_WVP_10m</IMAGE_FILE_2A>
+            <IMAGE_FILE_2A>GRANULE/L2A_T34VFJ_A011330_20170823T094252/IMG_DATA/R10m/L2A_T34VFJ_20170823T094031_TCI_10m</IMAGE_FILE_2A>
+          </Granule>
+        </Granule_List>
+      </L2A_Product_Organisation>
+    </L2A_Product_Info>
+    <L2A_Product_Image_Characteristics>
+      <Special_Values>
+        <SPECIAL_VALUE_TEXT>NODATA</SPECIAL_VALUE_TEXT>
+        <SPECIAL_VALUE_INDEX>0</SPECIAL_VALUE_INDEX>
+      </Special_Values>
+      <Special_Values>
+        <SPECIAL_VALUE_TEXT>SATURATED</SPECIAL_VALUE_TEXT>
+        <SPECIAL_VALUE_INDEX>6</SPECIAL_VALUE_INDEX>
+      </Special_Values>
+      <Image_Display_Order>
+        <RED_CHANNEL>3</RED_CHANNEL>
+        <GREEN_CHANNEL>2</GREEN_CHANNEL>
+        <BLUE_CHANNEL>1</BLUE_CHANNEL>
+      </Image_Display_Order>
+      <L1C_L2A_Quantification_Values_List>
+        <L1C_TOA_QUANTIFICATION_VALUE unit="none">10000</L1C_TOA_QUANTIFICATION_VALUE>
+        <L2A_BOA_QUANTIFICATION_VALUE unit="none">10000</L2A_BOA_QUANTIFICATION_VALUE>
+        <L2A_AOT_QUANTIFICATION_VALUE unit="none">1000.0</L2A_AOT_QUANTIFICATION_VALUE>
+        <L2A_WVP_QUANTIFICATION_VALUE unit="cm">1000.0</L2A_WVP_QUANTIFICATION_VALUE>
+      </L1C_L2A_Quantification_Values_List>
+      <Reflectance_Conversion>
+        <U>0.97</U>
+        <Solar_Irradiance_List>
+          <SOLAR_IRRADIANCE bandId="0" unit="W/m&#178;/&#181;m">1913.57</SOLAR_IRRADIANCE>
+          <SOLAR_IRRADIANCE bandId="1" unit="W/m&#178;/&#181;m">1941.63</SOLAR_IRRADIANCE>
+          <SOLAR_IRRADIANCE bandId="2" unit="W/m&#178;/&#181;m">1822.61</SOLAR_IRRADIANCE>
+          <SOLAR_IRRADIANCE bandId="3" unit="W/m&#178;/&#181;m">1512.79</SOLAR_IRRADIANCE>
+          <SOLAR_IRRADIANCE bandId="4" unit="W/m&#178;/&#181;m">1425.56</SOLAR_IRRADIANCE>
+          <SOLAR_IRRADIANCE bandId="5" unit="W/m&#178;/&#181;m">1288.32</SOLAR_IRRADIANCE>
+          <SOLAR_IRRADIANCE bandId="6" unit="W/m&#178;/&#181;m">1163.19</SOLAR_IRRADIANCE>
+          <SOLAR_IRRADIANCE bandId="7" unit="W/m&#178;/&#181;m">1036.39</SOLAR_IRRADIANCE>
+          <SOLAR_IRRADIANCE bandId="8" unit="W/m&#178;/&#181;m">955.19</SOLAR_IRRADIANCE>
+          <SOLAR_IRRADIANCE bandId="9" unit="W/m&#178;/&#181;m">813.04</SOLAR_IRRADIANCE>
+          <SOLAR_IRRADIANCE bandId="10" unit="W/m&#178;/&#181;m">367.15</SOLAR_IRRADIANCE>
+          <SOLAR_IRRADIANCE bandId="11" unit="W/m&#178;/&#181;m">245.59</SOLAR_IRRADIANCE>
+          <SOLAR_IRRADIANCE bandId="12" unit="W/m&#178;/&#181;m">85.25</SOLAR_IRRADIANCE>
+        </Solar_Irradiance_List>
+      </Reflectance_Conversion>
+      <PHYSICAL_GAINS bandId="0">4.05258688</PHYSICAL_GAINS>
+      <PHYSICAL_GAINS bandId="1">3.79421934</PHYSICAL_GAINS>
+      <PHYSICAL_GAINS bandId="2">4.19056789</PHYSICAL_GAINS>
+      <PHYSICAL_GAINS bandId="3">4.516256</PHYSICAL_GAINS>
+      <PHYSICAL_GAINS bandId="4">5.19904998</PHYSICAL_GAINS>
+      <PHYSICAL_GAINS bandId="5">4.86711284</PHYSICAL_GAINS>
+      <PHYSICAL_GAINS bandId="6">4.52865796</PHYSICAL_GAINS>
+      <PHYSICAL_GAINS bandId="7">6.19052531</PHYSICAL_GAINS>
+      <PHYSICAL_GAINS bandId="8">5.13233152</PHYSICAL_GAINS>
+      <PHYSICAL_GAINS bandId="9">8.52613546</PHYSICAL_GAINS>
+      <PHYSICAL_GAINS bandId="10">55.22178219</PHYSICAL_GAINS>
+      <PHYSICAL_GAINS bandId="11">35.32963486</PHYSICAL_GAINS>
+      <PHYSICAL_GAINS bandId="12">106.39533241</PHYSICAL_GAINS>
+      <REFERENCE_BAND>0</REFERENCE_BAND>
+      <L2A_Scene_Classification_List>
+        <L2A_Scene_Classification_ID>
+          <L2A_SCENE_CLASSIFICATION_TEXT>SC_NODATA</L2A_SCENE_CLASSIFICATION_TEXT>
+          <L2A_SCENE_CLASSIFICATION_INDEX>0</L2A_SCENE_CLASSIFICATION_INDEX>
+        </L2A_Scene_Classification_ID>
+        <L2A_Scene_Classification_ID>
+          <L2A_SCENE_CLASSIFICATION_TEXT>SC_SATURATED_DEFECTIVE</L2A_SCENE_CLASSIFICATION_TEXT>
+          <L2A_SCENE_CLASSIFICATION_INDEX>1</L2A_SCENE_CLASSIFICATION_INDEX>
+        </L2A_Scene_Classification_ID>
+        <L2A_Scene_Classification_ID>
+          <L2A_SCENE_CLASSIFICATION_TEXT>SC_DARK_FEATURE_SHADOW</L2A_SCENE_CLASSIFICATION_TEXT>
+          <L2A_SCENE_CLASSIFICATION_INDEX>2</L2A_SCENE_CLASSIFICATION_INDEX>
+        </L2A_Scene_Classification_ID>
+        <L2A_Scene_Classification_ID>
+          <L2A_SCENE_CLASSIFICATION_TEXT>SC_CLOUD_SHADOW</L2A_SCENE_CLASSIFICATION_TEXT>
+          <L2A_SCENE_CLASSIFICATION_INDEX>3</L2A_SCENE_CLASSIFICATION_INDEX>
+        </L2A_Scene_Classification_ID>
+        <L2A_Scene_Classification_ID>
+          <L2A_SCENE_CLASSIFICATION_TEXT>SC_VEGETATION</L2A_SCENE_CLASSIFICATION_TEXT>
+          <L2A_SCENE_CLASSIFICATION_INDEX>4</L2A_SCENE_CLASSIFICATION_INDEX>
+        </L2A_Scene_Classification_ID>
+        <L2A_Scene_Classification_ID>
+          <L2A_SCENE_CLASSIFICATION_TEXT>SC_BARE_SOIL_DESERT</L2A_SCENE_CLASSIFICATION_TEXT>
+          <L2A_SCENE_CLASSIFICATION_INDEX>5</L2A_SCENE_CLASSIFICATION_INDEX>
+        </L2A_Scene_Classification_ID>
+        <L2A_Scene_Classification_ID>
+          <L2A_SCENE_CLASSIFICATION_TEXT>SC_WATER</L2A_SCENE_CLASSIFICATION_TEXT>
+          <L2A_SCENE_CLASSIFICATION_INDEX>6</L2A_SCENE_CLASSIFICATION_INDEX>
+        </L2A_Scene_Classification_ID>
+        <L2A_Scene_Classification_ID>
+          <L2A_SCENE_CLASSIFICATION_TEXT>SC_CLOUD_LOW_PROBA</L2A_SCENE_CLASSIFICATION_TEXT>
+          <L2A_SCENE_CLASSIFICATION_INDEX>7</L2A_SCENE_CLASSIFICATION_INDEX>
+        </L2A_Scene_Classification_ID>
+        <L2A_Scene_Classification_ID>
+          <L2A_SCENE_CLASSIFICATION_TEXT>SC_CLOUD_MEDIUM_PROBA</L2A_SCENE_CLASSIFICATION_TEXT>
+          <L2A_SCENE_CLASSIFICATION_INDEX>8</L2A_SCENE_CLASSIFICATION_INDEX>
+        </L2A_Scene_Classification_ID>
+        <L2A_Scene_Classification_ID>
+          <L2A_SCENE_CLASSIFICATION_TEXT>SC_CLOUD_HIGH_PROBA</L2A_SCENE_CLASSIFICATION_TEXT>
+          <L2A_SCENE_CLASSIFICATION_INDEX>9</L2A_SCENE_CLASSIFICATION_INDEX>
+        </L2A_Scene_Classification_ID>
+        <L2A_Scene_Classification_ID>
+          <L2A_SCENE_CLASSIFICATION_TEXT>SC_THIN_CIRRUS</L2A_SCENE_CLASSIFICATION_TEXT>
+          <L2A_SCENE_CLASSIFICATION_INDEX>10</L2A_SCENE_CLASSIFICATION_INDEX>
+        </L2A_Scene_Classification_ID>
+        <L2A_Scene_Classification_ID>
+          <L2A_SCENE_CLASSIFICATION_TEXT>SC_SNOW_ICE</L2A_SCENE_CLASSIFICATION_TEXT>
+          <L2A_SCENE_CLASSIFICATION_INDEX>11</L2A_SCENE_CLASSIFICATION_INDEX>
+        </L2A_Scene_Classification_ID>
+      </L2A_Scene_Classification_List>
+    </L2A_Product_Image_Characteristics>
+  </n1:General_Info>
+  <n1:Geometric_Info>
+    <Product_Footprint>
+      <Product_Footprint>
+        <Global_Footprint>
+          <EXT_POS_LIST>57.7 22.6 57.6 24.5 56.7 24.4 56.7 22.6 57.7 22.6 </EXT_POS_LIST>
+        </Global_Footprint>
+      </Product_Footprint>
+      <RASTER_CS_TYPE>POINT</RASTER_CS_TYPE>
+      <PIXEL_ORIGIN>1</PIXEL_ORIGIN>
+    </Product_Footprint>
+    <Coordinate_Reference_System>
+      <GEO_TABLES version="1">EPSG</GEO_TABLES>
+      <HORIZONTAL_CS_TYPE>GEOGRAPHIC</HORIZONTAL_CS_TYPE>
+    </Coordinate_Reference_System>
+  </n1:Geometric_Info>
+  <n1:L2A_Auxiliary_Data_Info>
+    <Aux_Data>
+      <L2A_GIPP_List>
+        <GIPP_FILENAME type="GIP_Level-2Ap" version="2.3.1">L2A_T34VFJ_A011330_20170823T094252</GIPP_FILENAME>
+        <GIPP_FILENAME type="GIP_Level-2Ap" version="2.3.1">L2A_T34VFJ_A011330_20170823T094252</GIPP_FILENAME>
+        <GIPP_FILENAME type="GIP_Level-2Ap" version="2.3.1">L2A_T34VFJ_A011330_20170823T094252</GIPP_FILENAME>
+      </L2A_GIPP_List>
+      <L2A_PRODUCTION_DEM_TYPE>http://data_public:GDdci@data.cgiar-csi.org/srtm/tiles/GeoTIFF/</L2A_PRODUCTION_DEM_TYPE>
+      <L2A_LIBRADTRAN_LUTS/>
+      <L2A_SNOW_CLIMATOLOGY>GlobalSnowMap.tiff</L2A_SNOW_CLIMATOLOGY>
+    </Aux_Data>
+  </n1:L2A_Auxiliary_Data_Info>
+  <n1:Quality_Indicators_Info>
+    <Cloud_Coverage_Assessment>86.3</Cloud_Coverage_Assessment>
+    <Technical_Quality_Assessment>
+      <DEGRADED_ANC_DATA_PERCENTAGE>0</DEGRADED_ANC_DATA_PERCENTAGE>
+      <DEGRADED_MSI_DATA_PERCENTAGE>0</DEGRADED_MSI_DATA_PERCENTAGE>
+    </Technical_Quality_Assessment>
+    <Quality_Control_Checks>
+      <Quality_Inspections>
+        <SENSOR_QUALITY_FLAG>PASSED</SENSOR_QUALITY_FLAG>
+        <GEOMETRIC_QUALITY_FLAG>PASSED</GEOMETRIC_QUALITY_FLAG>
+        <GENERAL_QUALITY_FLAG>PASSED</GENERAL_QUALITY_FLAG>
+        <FORMAT_CORRECTNESS_FLAG>PASSED</FORMAT_CORRECTNESS_FLAG>
+        <RADIOMETRIC_QUALITY_FLAG>PASSED</RADIOMETRIC_QUALITY_FLAG>
+      </Quality_Inspections>
+      <Failed_Inspections/>
+    </Quality_Control_Checks>
+  </n1:Quality_Indicators_Info>
+  <n1:L2A_Quality_Indicators_Info>
+    <Image_Content_QI>
+      <NODATA_PIXEL_PERCENTAGE>0.0</NODATA_PIXEL_PERCENTAGE>
+      <SATURATED_DEFECTIVE_PIXEL_PERCENTAGE>0.0</SATURATED_DEFECTIVE_PIXEL_PERCENTAGE>
+      <DARK_FEATURES_PERCENTAGE>1.0</DARK_FEATURES_PERCENTAGE>
+      <CLOUD_SHADOW_PERCENTAGE>4.1</CLOUD_SHADOW_PERCENTAGE>
+      <VEGETATION_PERCENTAGE>5.0</VEGETATION_PERCENTAGE>
+      <BARE_SOILS_PERCENTAGE>0.4</BARE_SOILS_PERCENTAGE>
+      <WATER_PERCENTAGE>2.9</WATER_PERCENTAGE>
+      <LOW_PROBA_CLOUDS_PERCENTAGE>1.6</LOW_PROBA_CLOUDS_PERCENTAGE>
+      <MEDIUM_PROBA_CLOUDS_PERCENTAGE>28.9</MEDIUM_PROBA_CLOUDS_PERCENTAGE>
+      <HIGH_PROBA_CLOUDS_PERCENTAGE>36.1</HIGH_PROBA_CLOUDS_PERCENTAGE>
+      <THIN_CIRRUS_PERCENTAGE>19.3</THIN_CIRRUS_PERCENTAGE>
+      <CLOUD_COVERAGE_PERCENTAGE>84.4</CLOUD_COVERAGE_PERCENTAGE>
+      <SNOW_ICE_PERCENTAGE>0.2</SNOW_ICE_PERCENTAGE>
+      <RADIATIVE_TRANSFER_ACCURAY>0.0</RADIATIVE_TRANSFER_ACCURAY>
+      <WATER_VAPOUR_RETRIEVAL_ACCURACY>0.0</WATER_VAPOUR_RETRIEVAL_ACCURACY>
+      <AOT_RETRIEVAL_ACCURACY>0.0</AOT_RETRIEVAL_ACCURACY>
+    </Image_Content_QI>
+  </n1:L2A_Quality_Indicators_Info>
+</n1:Level-2A_User_Product>
diff --git a/autotest/gdrivers/sentinel2.py b/autotest/gdrivers/sentinel2.py
index 244f0563c93f..6602278729b4 100755
--- a/autotest/gdrivers/sentinel2.py
+++ b/autotest/gdrivers/sentinel2.py
@@ -2110,6 +2110,515 @@ def sentinel2_l2a_3():
 
     return 'success'
 
+###############################################################################
+# Test opening a L2A MSIL2A product
+
+
+def sentinel2_l2a_4():
+
+    filename_xml = 'data/fake_sentinel2_l2a_MSIL2A/S2A_MSIL2A_20180818T094031_N0208_R036_T34VFJ_20180818T120345.SAFE/MTD_MSIL2A.xml'
+    gdal.ErrorReset()
+    ds = gdal.Open(filename_xml)
+    if ds is None or gdal.GetLastErrorMsg() != '':
+        gdaltest.post_reason('fail')
+        return 'fail'
+
+    expected_md = {
+                    'AOT_QUANTIFICATION_VALUE': '1000.0',
+                    'AOT_QUANTIFICATION_VALUE_UNIT': 'none',
+                    'AOT_RETRIEVAL_ACCURACY': '0.0',
+                    'BOA_QUANTIFICATION_VALUE': '10000',
+                    'BOA_QUANTIFICATION_VALUE_UNIT': 'none',
+                    'CLOUD_COVERAGE_ASSESSMENT': '54.4',
+                    'CLOUD_SHADOW_PERCENTAGE': '1.5',
+                    'DARK_FEATURES_PERCENTAGE': '1.5',
+                    'DATATAKE_1_DATATAKE_SENSING_START': '2018-08-18T09:40:31.024Z',
+                    'DATATAKE_1_DATATAKE_TYPE': 'INS-NOBS',
+                    'DATATAKE_1_ID': 'GS2A_20180818T094031_016478_N02.08',
+                    'DATATAKE_1_SENSING_ORBIT_DIRECTION': 'DESCENDING',
+                    'DATATAKE_1_SENSING_ORBIT_NUMBER': '36',
+                    'DATATAKE_1_SPACECRAFT_NAME': 'Sentinel-2A',
+                    'DEGRADED_ANC_DATA_PERCENTAGE': '0.0',
+                    'DEGRADED_MSI_DATA_PERCENTAGE': '0',
+                    'FOOTPRINT': 'POLYGON((22.6 57.7, 24.5 57.6, 24.4 56.7, 22.6 56.7, 22.6 57.7))',
+                    'FORMAT_CORRECTNESS': 'PASSED',
+                    'GENERAL_QUALITY': 'PASSED',
+                    'GENERATION_TIME': '2018-08-18T12:03:45.000000Z',
+                    'GEOMETRIC_QUALITY': 'PASSED',
+                    'HIGH_PROBA_CLOUDS_PERCENTAGE': '15.3',
+                    'MEDIUM_PROBA_CLOUDS_PERCENTAGE': '24.1',
+                    'NODATA_PIXEL_PERCENTAGE': '0.0',
+                    'NOT_VEGETATED_PERCENTAGE': '3.5',
+                    'PREVIEW_GEO_INFO': 'Not applicable',
+                    'PREVIEW_IMAGE_URL': 'Not applicable',
+                    'PROCESSING_BASELINE': '02.08',
+                    'PROCESSING_LEVEL': 'Level-2A',
+                    'PRODUCT_START_TIME': '2018-08-18T09:40:31.024Z',
+                    'PRODUCT_STOP_TIME': '2018-08-18T09:40:31.024Z',
+                    'PRODUCT_TYPE': 'S2MSI2A',
+                    'PRODUCT_URI': 'S2A_MSIL2A_20180818T094031_N0208_R036_T34VFJ_20180818T120345.SAFE',
+                    'RADIATIVE_TRANSFER_ACCURACY': '0.0',
+                    'RADIOMETRIC_QUALITY': 'PASSED',
+                    'REFLECTANCE_CONVERSION_U': '0.97',
+                    'SATURATED_DEFECTIVE_PIXEL_PERCENTAGE': '0.0',
+                    'SENSOR_QUALITY': 'PASSED',
+                    'SNOW_ICE_PERCENTAGE': '0.4',
+                    'SPECIAL_VALUE_NODATA': '0',
+                    'SPECIAL_VALUE_SATURATED': '6',
+                    'THIN_CIRRUS_PERCENTAGE': '14.9',
+                    'UNCLASSIFIED_PERCENTAGE': '5.7',
+                    'VEGETATION_PERCENTAGE': '14.0',
+                    'WATER_PERCENTAGE': '18.7',
+                    'WATER_VAPOUR_RETRIEVAL_ACCURACY': '0.0',
+                    'WVP_QUANTIFICATION_VALUE': '1000.0',
+                    'WVP_QUANTIFICATION_VALUE_UNIT': 'cm'}
+    got_md = ds.GetMetadata()
+    if got_md != expected_md:
+        gdaltest.post_reason('fail')
+        import pprint
+        pprint.pprint(got_md)
+        return 'fail'
+
+    expected_md = {
+                    'SUBDATASET_1_DESC':
+                    'Bands B2, B3, B4, B8 with 10m resolution, UTM 34N',
+                    'SUBDATASET_1_NAME':
+                    'SENTINEL2_L2A:data/fake_sentinel2_l2a_MSIL2A/S2A_MSIL2A_20180818T094031_N0208_R036_T34VFJ_20180818T120345.SAFE/MTD_MSIL2A.xml:10m:EPSG_32634',
+                    'SUBDATASET_2_DESC':
+                    'Bands B5, B6, B7, B8A, B11, B12 with 20m resolution, UTM 34N',
+                    'SUBDATASET_2_NAME':
+                    'SENTINEL2_L2A:data/fake_sentinel2_l2a_MSIL2A/S2A_MSIL2A_20180818T094031_N0208_R036_T34VFJ_20180818T120345.SAFE/MTD_MSIL2A.xml:20m:EPSG_32634',
+                    'SUBDATASET_3_DESC':
+                    'Bands B1, B9 with 60m resolution, UTM 34N',
+                    'SUBDATASET_3_NAME':
+                    'SENTINEL2_L2A:data/fake_sentinel2_l2a_MSIL2A/S2A_MSIL2A_20180818T094031_N0208_R036_T34VFJ_20180818T120345.SAFE/MTD_MSIL2A.xml:60m:EPSG_32634',
+                    'SUBDATASET_4_DESC':
+                    'True color image, UTM 34N',
+                    'SUBDATASET_4_NAME':
+                    'SENTINEL2_L2A:data/fake_sentinel2_l2a_MSIL2A/S2A_MSIL2A_20180818T094031_N0208_R036_T34VFJ_20180818T120345.SAFE/MTD_MSIL2A.xml:TCI:EPSG_32634'}
+    got_md = ds.GetMetadata('SUBDATASETS')
+    if got_md != expected_md:
+        gdaltest.post_reason('fail')
+        import pprint
+        pprint.pprint(got_md)
+        return 'fail'
+
+    # Try opening the 4 subdatasets
+    for i in range(2):
+        gdal.ErrorReset()
+        ds = gdal.Open(got_md['SUBDATASET_%d_NAME' % (i + 1)])
+        if ds is None or gdal.GetLastErrorMsg() != '':
+            gdaltest.post_reason('fail')
+            print(got_md['SUBDATASET_%d_NAME' % (i + 1)])
+            return 'fail'
+
+    # Try various invalid subdataset names
+    for name in ['SENTINEL2_L2A:',
+                 'SENTINEL2_L2A:foo.xml:10m:EPSG_32632',
+                 'SENTINEL2_L2A:%s' % filename_xml,
+                 'SENTINEL2_L2A:%s:' % filename_xml,
+                 'SENTINEL2_L2A:%s:10m' % filename_xml,
+                 'SENTINEL2_L2A:%s:10m:' % filename_xml,
+                 'SENTINEL2_L2A:%s:10m:EPSG_' % filename_xml,
+                 'SENTINEL2_L2A:%s:50m:EPSG_32632' % filename_xml,
+                 'SENTINEL2_L2A:%s:10m:EPSG_32633' % filename_xml]:
+        with gdaltest.error_handler():
+            ds = gdal.Open(name)
+        if ds is not None:
+            gdaltest.post_reason('fail')
+            print(name)
+            return 'fail'
+
+    return 'success'
+
+
+###############################################################################
+# Test opening a L2A MSIL2A subdataset on the 60m bands
+
+
+def sentinel2_l2a_5():
+
+    filename_xml = 'data/fake_sentinel2_l2a_MSIL2A/S2A_MSIL2A_20180818T094031_N0208_R036_T34VFJ_20180818T120345.SAFE/MTD_MSIL2A.xml'
+    gdal.ErrorReset()
+    ds = gdal.Open('SENTINEL2_L2A:%s:60m:EPSG_32634' % filename_xml)
+    if ds is None or gdal.GetLastErrorMsg() != '':
+        gdaltest.post_reason('fail')
+        return 'fail'
+
+    expected_md = {
+                    'AOT_QUANTIFICATION_VALUE': '1000.0',
+                    'AOT_QUANTIFICATION_VALUE_UNIT': 'none',
+                    'AOT_RETRIEVAL_ACCURACY': '0.0',
+                    'BOA_QUANTIFICATION_VALUE': '10000',
+                    'BOA_QUANTIFICATION_VALUE_UNIT': 'none',
+                    'CLOUD_COVERAGE_ASSESSMENT': '54.4',
+                    'CLOUD_SHADOW_PERCENTAGE': '1.5',
+                    'DARK_FEATURES_PERCENTAGE': '1.5',
+                    'DATATAKE_1_DATATAKE_SENSING_START': '2018-08-18T09:40:31.024Z',
+                    'DATATAKE_1_DATATAKE_TYPE': 'INS-NOBS',
+                    'DATATAKE_1_ID': 'GS2A_20180818T094031_016478_N02.08',
+                    'DATATAKE_1_SENSING_ORBIT_DIRECTION': 'DESCENDING',
+                    'DATATAKE_1_SENSING_ORBIT_NUMBER': '36',
+                    'DATATAKE_1_SPACECRAFT_NAME': 'Sentinel-2A',
+                    'DEGRADED_ANC_DATA_PERCENTAGE': '0.0',
+                    'DEGRADED_MSI_DATA_PERCENTAGE': '0',
+                    'FORMAT_CORRECTNESS': 'PASSED',
+                    'GENERAL_QUALITY': 'PASSED',
+                    'GENERATION_TIME': '2018-08-18T12:03:45.000000Z',
+                    'GEOMETRIC_QUALITY': 'PASSED',
+                    'HIGH_PROBA_CLOUDS_PERCENTAGE': '15.3',
+                    'MEDIUM_PROBA_CLOUDS_PERCENTAGE': '24.1',
+                    'NODATA_PIXEL_PERCENTAGE': '0.0',
+                    'NOT_VEGETATED_PERCENTAGE': '3.5',
+                    'PREVIEW_GEO_INFO': 'Not applicable',
+                    'PREVIEW_IMAGE_URL': 'Not applicable',
+                    'PROCESSING_BASELINE': '02.08',
+                    'PROCESSING_LEVEL': 'Level-2A',
+                    'PRODUCT_START_TIME': '2018-08-18T09:40:31.024Z',
+                    'PRODUCT_STOP_TIME': '2018-08-18T09:40:31.024Z',
+                    'PRODUCT_TYPE': 'S2MSI2A',
+                    'PRODUCT_URI': 'S2A_MSIL2A_20180818T094031_N0208_R036_T34VFJ_20180818T120345.SAFE',
+                    'RADIATIVE_TRANSFER_ACCURACY': '0.0',
+                    'RADIOMETRIC_QUALITY': 'PASSED',
+                    'REFLECTANCE_CONVERSION_U': '0.97',
+                    'SATURATED_DEFECTIVE_PIXEL_PERCENTAGE': '0.0',
+                    'SENSOR_QUALITY': 'PASSED',
+                    'SNOW_ICE_PERCENTAGE': '0.4',
+                    'SPECIAL_VALUE_NODATA': '0',
+                    'SPECIAL_VALUE_SATURATED': '6',
+                    'THIN_CIRRUS_PERCENTAGE': '14.9',
+                    'UNCLASSIFIED_PERCENTAGE': '5.7',
+                    'VEGETATION_PERCENTAGE': '14.0',
+                    'WATER_PERCENTAGE': '18.7',
+                    'WATER_VAPOUR_RETRIEVAL_ACCURACY': '0.0',
+                    'WVP_QUANTIFICATION_VALUE': '1000.0',
+                    'WVP_QUANTIFICATION_VALUE_UNIT': 'cm'}
+    got_md = ds.GetMetadata()
+    if got_md != expected_md:
+        gdaltest.post_reason('fail')
+        import pprint
+        pprint.pprint(got_md)
+        return 'fail'
+
+    if ds.RasterXSize != 1830 or ds.RasterYSize != 1830:
+        gdaltest.post_reason('fail')
+        print(ds.RasterXSize)
+        print(ds.RasterYSize)
+        return 'fail'
+
+    if ds.GetProjectionRef().find('32634') < 0:
+        gdaltest.post_reason('fail')
+        return 'fail'
+
+    got_gt = ds.GetGeoTransform()
+    if got_gt != (600000.0, 60.0, 0.0, 6400020.0, 0.0, -60.0):
+        gdaltest.post_reason('fail')
+        print(got_gt)
+        return 'fail'
+
+    if ds.RasterCount != 2:
+        gdaltest.post_reason('fail')
+        print(ds.RasterCount)
+        return 'fail'
+
+    vrt = ds.GetMetadata('xml:VRT')[0]
+    placement_vrt = """<SimpleSource>
+      <SourceFilename relativeToVRT="0">data/fake_sentinel2_l2a_MSIL2A/S2A_MSIL2A_20180818T094031_N0208_R036_T34VFJ_20180818T120345.SAFE/GRANULE/L2A_T34VFJ_A016478_20180818T094030/IMG_DATA/R60m/T34VFJ_20180818T094031_B01_60m.jp2</SourceFilename>
+      <SourceBand>1</SourceBand>
+      <SourceProperties RasterXSize="1830" RasterYSize="1830" DataType="UInt16" BlockXSize="128" BlockYSize="128" />
+      <SrcRect xOff="0" yOff="0" xSize="1830" ySize="1830" />
+      <DstRect xOff="0" yOff="0" xSize="1830" ySize="1830" />
+    </SimpleSource>"""
+    if vrt.find(placement_vrt) < 0:
+        gdaltest.post_reason('fail')
+        print(vrt)
+        return 'fail'
+
+    if ds.GetMetadata('xml:SENTINEL2') is None:
+        gdaltest.post_reason('fail')
+        return 'fail'
+
+    band = ds.GetRasterBand(1)
+    got_md = band.GetMetadata()
+    expected_md = {'BANDNAME': 'B1',
+                   'BANDWIDTH': '20',
+                   'BANDWIDTH_UNIT': 'nm',
+                   'SOLAR_IRRADIANCE': '1884.69',
+                   'SOLAR_IRRADIANCE_UNIT': 'W/m2/um',
+                   'WAVELENGTH': '443',
+                   'WAVELENGTH_UNIT': 'nm'}
+    if got_md != expected_md:
+        gdaltest.post_reason('fail')
+        import pprint
+        pprint.pprint(got_md)
+        return 'fail'
+
+    if band.DataType != gdal.GDT_UInt16:
+        gdaltest.post_reason('fail')
+        return 'fail'
+
+    return 'success'
+
+###############################################################################
+# Test opening a L2A MSIL2Ap product
+
+
+def sentinel2_l2a_6():
+
+    filename_xml = 'data/fake_sentinel2_l2a_MSIL2Ap/S2A_MSIL2A_20170823T094031_N0205_R036_T34VFJ_20170823T094252.SAFE/MTD_MSIL2A.xml'
+    gdal.ErrorReset()
+    ds = gdal.Open(filename_xml)
+    if ds is None or gdal.GetLastErrorMsg() != '':
+        gdaltest.post_reason('fail')
+        return 'fail'
+
+    expected_md = {
+                    'AOT_RETRIEVAL_ACCURACY': '0.0',
+                    'BARE_SOILS_PERCENTAGE': '0.4',
+                    'CLOUD_COVERAGE_ASSESSMENT': '86.3',
+                    'CLOUD_COVERAGE_PERCENTAGE': '84.4',
+                    'CLOUD_SHADOW_PERCENTAGE': '4.1',
+                    'DARK_FEATURES_PERCENTAGE': '1.0',
+                    'DATATAKE_1_DATATAKE_SENSING_START': '2017-08-23T09:40:31.026Z',
+                    'DATATAKE_1_DATATAKE_TYPE': 'INS-NOBS',
+                    'DATATAKE_1_ID': 'GS2A_20170823T094031_011330_N02.05',
+                    'DATATAKE_1_SENSING_ORBIT_DIRECTION': 'DESCENDING',
+                    'DATATAKE_1_SENSING_ORBIT_NUMBER': '36',
+                    'DATATAKE_1_SPACECRAFT_NAME': 'Sentinel-2A',
+                    'DEGRADED_ANC_DATA_PERCENTAGE': '0',
+                    'DEGRADED_MSI_DATA_PERCENTAGE': '0',
+                    'FOOTPRINT': 'POLYGON((22.6 57.7, 24.5 57.6, 24.4 56.7, 22.6 56.7, 22.6 57.7))',
+                    'FORMAT_CORRECTNESS_FLAG': 'PASSED',
+                    'GENERAL_QUALITY_FLAG': 'PASSED',
+                    'GENERATION_TIME': '2017-08-25T08:50:10Z',
+                    'GEOMETRIC_QUALITY_FLAG': 'PASSED',
+                    'HIGH_PROBA_CLOUDS_PERCENTAGE': '36.1',
+                    'MEDIUM_PROBA_CLOUDS_PERCENTAGE': '28.9',
+                    'L1C_TOA_QUANTIFICATION_VALUE': '10000',
+                    'L1C_TOA_QUANTIFICATION_VALUE_UNIT': 'none',
+                    'L2A_AOT_QUANTIFICATION_VALUE': '1000.0',
+                    'L2A_AOT_QUANTIFICATION_VALUE_UNIT': 'none',
+                    'L2A_BOA_QUANTIFICATION_VALUE': '10000',
+                    'L2A_BOA_QUANTIFICATION_VALUE_UNIT': 'none',
+                    'L2A_WVP_QUANTIFICATION_VALUE': '1000.0',
+                    'L2A_WVP_QUANTIFICATION_VALUE_UNIT': 'cm',
+                    'LOW_PROBA_CLOUDS_PERCENTAGE': '1.6',
+                    'NODATA_PIXEL_PERCENTAGE': '0.0',
+                    'PREVIEW_GEO_INFO': 'Not applicable',
+                    'PREVIEW_IMAGE_URL': 'Not applicable',
+                    'PROCESSING_BASELINE': '02.05',
+                    'PROCESSING_LEVEL': 'Level-2Ap',
+                    'PRODUCT_START_TIME': '2017-08-23T09:40:31.026Z',
+                    'PRODUCT_STOP_TIME': '2017-08-23T09:40:31.026Z',
+                    'PRODUCT_TYPE': 'S2MSI2Ap',
+                    'PRODUCT_URI_1C': 'S2A_MSIL1C_20170823T094031_N0205_R036_T34VFJ_20170823T094252.SAFE',
+                    'PRODUCT_URI_2A': 'S2A_MSIL2A_20170823T094031_N0205_R036_T34VFJ_20170823T094252.SAFE',
+                    'RADIATIVE_TRANSFER_ACCURAY': '0.0',
+                    'RADIOMETRIC_QUALITY_FLAG': 'PASSED',
+                    'REFERENCE_BAND': 'B1',
+                    'REFLECTANCE_CONVERSION_U': '0.97',
+                    'SATURATED_DEFECTIVE_PIXEL_PERCENTAGE': '0.0',
+                    'SENSOR_QUALITY_FLAG': 'PASSED',
+                    'SNOW_ICE_PERCENTAGE': '0.2',
+                    'SPECIAL_VALUE_NODATA': '0',
+                    'SPECIAL_VALUE_SATURATED': '6',
+                    'THIN_CIRRUS_PERCENTAGE': '19.3',
+                    'VEGETATION_PERCENTAGE': '5.0',
+                    'WATER_PERCENTAGE': '2.9',
+                    'WATER_VAPOUR_RETRIEVAL_ACCURACY': '0.0'}
+    got_md = ds.GetMetadata()
+    if got_md != expected_md:
+        gdaltest.post_reason('fail')
+        import pprint
+        pprint.pprint(got_md)
+        return 'fail'
+
+    expected_md = {
+                    'SUBDATASET_1_DESC':
+                    'Bands B2, B3, B4, B8 with 10m resolution, UTM 34N',
+                    'SUBDATASET_1_NAME':
+                    'SENTINEL2_L2A:data/fake_sentinel2_l2a_MSIL2Ap/S2A_MSIL2A_20170823T094031_N0205_R036_T34VFJ_20170823T094252.SAFE/MTD_MSIL2A.xml:10m:EPSG_32634',
+                    'SUBDATASET_2_DESC':
+                    'Bands B5, B6, B7, B8A, B11, B12 with 20m resolution, UTM 34N',
+                    'SUBDATASET_2_NAME':
+                    'SENTINEL2_L2A:data/fake_sentinel2_l2a_MSIL2Ap/S2A_MSIL2A_20170823T094031_N0205_R036_T34VFJ_20170823T094252.SAFE/MTD_MSIL2A.xml:20m:EPSG_32634',
+                    'SUBDATASET_3_DESC':
+                    'Bands B1, B9 with 60m resolution, UTM 34N',
+                    'SUBDATASET_3_NAME':
+                    'SENTINEL2_L2A:data/fake_sentinel2_l2a_MSIL2Ap/S2A_MSIL2A_20170823T094031_N0205_R036_T34VFJ_20170823T094252.SAFE/MTD_MSIL2A.xml:60m:EPSG_32634',
+                    'SUBDATASET_4_DESC':
+                    'True color image, UTM 34N',
+                    'SUBDATASET_4_NAME':
+                    'SENTINEL2_L2A:data/fake_sentinel2_l2a_MSIL2Ap/S2A_MSIL2A_20170823T094031_N0205_R036_T34VFJ_20170823T094252.SAFE/MTD_MSIL2A.xml:TCI:EPSG_32634'}
+    got_md = ds.GetMetadata('SUBDATASETS')
+    if got_md != expected_md:
+        gdaltest.post_reason('fail')
+        import pprint
+        pprint.pprint(got_md)
+        return 'fail'
+
+    # Try opening the 4 subdatasets
+    for i in range(2):
+        gdal.ErrorReset()
+        ds = gdal.Open(got_md['SUBDATASET_%d_NAME' % (i + 1)])
+        if ds is None or gdal.GetLastErrorMsg() != '':
+            gdaltest.post_reason('fail')
+            print(got_md['SUBDATASET_%d_NAME' % (i + 1)])
+            return 'fail'
+
+    # Try various invalid subdataset names
+    for name in ['SENTINEL2_L2A:',
+                 'SENTINEL2_L2A:foo.xml:10m:EPSG_32632',
+                 'SENTINEL2_L2A:%s' % filename_xml,
+                 'SENTINEL2_L2A:%s:' % filename_xml,
+                 'SENTINEL2_L2A:%s:10m' % filename_xml,
+                 'SENTINEL2_L2A:%s:10m:' % filename_xml,
+                 'SENTINEL2_L2A:%s:10m:EPSG_' % filename_xml,
+                 'SENTINEL2_L2A:%s:50m:EPSG_32632' % filename_xml,
+                 'SENTINEL2_L2A:%s:10m:EPSG_32633' % filename_xml]:
+        with gdaltest.error_handler():
+            ds = gdal.Open(name)
+        if ds is not None:
+            gdaltest.post_reason('fail')
+            print(name)
+            return 'fail'
+
+    return 'success'
+
+
+###############################################################################
+# Test opening a L2A MSIL2Ap subdataset on the 60m bands
+
+
+def sentinel2_l2a_7():
+
+    filename_xml = 'data/fake_sentinel2_l2a_MSIL2Ap/S2A_MSIL2A_20170823T094031_N0205_R036_T34VFJ_20170823T094252.SAFE/MTD_MSIL2A.xml'
+    gdal.ErrorReset()
+    ds = gdal.Open('SENTINEL2_L2A:%s:60m:EPSG_32634' % filename_xml)
+    if ds is None or gdal.GetLastErrorMsg() != '':
+        gdaltest.post_reason('fail')
+        return 'fail'
+
+    expected_md = {
+                    'AOT_RETRIEVAL_ACCURACY': '0.0',
+                    'BARE_SOILS_PERCENTAGE': '0.4',
+                    'CLOUD_COVERAGE_ASSESSMENT': '86.3',
+                    'CLOUD_COVERAGE_PERCENTAGE': '84.4',
+                    'CLOUD_SHADOW_PERCENTAGE': '4.1',
+                    'DARK_FEATURES_PERCENTAGE': '1.0',
+                    'DATATAKE_1_DATATAKE_SENSING_START': '2017-08-23T09:40:31.026Z',
+                    'DATATAKE_1_DATATAKE_TYPE': 'INS-NOBS',
+                    'DATATAKE_1_ID': 'GS2A_20170823T094031_011330_N02.05',
+                    'DATATAKE_1_SENSING_ORBIT_DIRECTION': 'DESCENDING',
+                    'DATATAKE_1_SENSING_ORBIT_NUMBER': '36',
+                    'DATATAKE_1_SPACECRAFT_NAME': 'Sentinel-2A',
+                    'DEGRADED_ANC_DATA_PERCENTAGE': '0',
+                    'DEGRADED_MSI_DATA_PERCENTAGE': '0',
+                    'FORMAT_CORRECTNESS_FLAG': 'PASSED',
+                    'GENERAL_QUALITY_FLAG': 'PASSED',
+                    'GENERATION_TIME': '2017-08-25T08:50:10Z',
+                    'GEOMETRIC_QUALITY_FLAG': 'PASSED',
+                    'HIGH_PROBA_CLOUDS_PERCENTAGE': '36.1',
+                    'MEDIUM_PROBA_CLOUDS_PERCENTAGE': '28.9',
+                    'L1C_TOA_QUANTIFICATION_VALUE': '10000',
+                    'L1C_TOA_QUANTIFICATION_VALUE_UNIT': 'none',
+                    'L2A_AOT_QUANTIFICATION_VALUE': '1000.0',
+                    'L2A_AOT_QUANTIFICATION_VALUE_UNIT': 'none',
+                    'L2A_BOA_QUANTIFICATION_VALUE': '10000',
+                    'L2A_BOA_QUANTIFICATION_VALUE_UNIT': 'none',
+                    'L2A_WVP_QUANTIFICATION_VALUE': '1000.0',
+                    'L2A_WVP_QUANTIFICATION_VALUE_UNIT': 'cm',
+                    'LOW_PROBA_CLOUDS_PERCENTAGE': '1.6',
+                    'NODATA_PIXEL_PERCENTAGE': '0.0',
+                    'PREVIEW_GEO_INFO': 'Not applicable',
+                    'PREVIEW_IMAGE_URL': 'Not applicable',
+                    'PROCESSING_BASELINE': '02.05',
+                    'PROCESSING_LEVEL': 'Level-2Ap',
+                    'PRODUCT_START_TIME': '2017-08-23T09:40:31.026Z',
+                    'PRODUCT_STOP_TIME': '2017-08-23T09:40:31.026Z',
+                    'PRODUCT_TYPE': 'S2MSI2Ap',
+                    'PRODUCT_URI_1C': 'S2A_MSIL1C_20170823T094031_N0205_R036_T34VFJ_20170823T094252.SAFE',
+                    'PRODUCT_URI_2A': 'S2A_MSIL2A_20170823T094031_N0205_R036_T34VFJ_20170823T094252.SAFE',
+                    'RADIATIVE_TRANSFER_ACCURAY': '0.0',
+                    'RADIOMETRIC_QUALITY_FLAG': 'PASSED',
+                    'REFERENCE_BAND': 'B1',
+                    'REFLECTANCE_CONVERSION_U': '0.97',
+                    'SATURATED_DEFECTIVE_PIXEL_PERCENTAGE': '0.0',
+                    'SENSOR_QUALITY_FLAG': 'PASSED',
+                    'SNOW_ICE_PERCENTAGE': '0.2',
+                    'SPECIAL_VALUE_NODATA': '0',
+                    'SPECIAL_VALUE_SATURATED': '6',
+                    'THIN_CIRRUS_PERCENTAGE': '19.3',
+                    'VEGETATION_PERCENTAGE': '5.0',
+                    'WATER_PERCENTAGE': '2.9',
+                    'WATER_VAPOUR_RETRIEVAL_ACCURACY': '0.0'}
+    got_md = ds.GetMetadata()
+    if got_md != expected_md:
+        gdaltest.post_reason('fail')
+        import pprint
+        pprint.pprint(got_md)
+        return 'fail'
+
+    if ds.RasterXSize != 1830 or ds.RasterYSize != 1830:
+        gdaltest.post_reason('fail')
+        print(ds.RasterXSize)
+        print(ds.RasterYSize)
+        return 'fail'
+
+    if ds.GetProjectionRef().find('32634') < 0:
+        gdaltest.post_reason('fail')
+        return 'fail'
+
+    got_gt = ds.GetGeoTransform()
+    if got_gt != (600000.0, 60.0, 0.0, 6400020.0, 0.0, -60.0):
+        gdaltest.post_reason('fail')
+        print(got_gt)
+        return 'fail'
+
+    if ds.RasterCount != 2:
+        gdaltest.post_reason('fail')
+        print(ds.RasterCount)
+        return 'fail'
+
+    vrt = ds.GetMetadata('xml:VRT')[0]
+    placement_vrt = """<SimpleSource>
+      <SourceFilename relativeToVRT="0">data/fake_sentinel2_l2a_MSIL2Ap/S2A_MSIL2A_20170823T094031_N0205_R036_T34VFJ_20170823T094252.SAFE/GRANULE/L2A_T34VFJ_A011330_20170823T094252/IMG_DATA/R60m/L2A_T34VFJ_20170823T094031_B01_60m.jp2</SourceFilename>
+      <SourceBand>1</SourceBand>
+      <SourceProperties RasterXSize="1830" RasterYSize="1830" DataType="UInt16" BlockXSize="128" BlockYSize="128" />
+      <SrcRect xOff="0" yOff="0" xSize="1830" ySize="1830" />
+      <DstRect xOff="0" yOff="0" xSize="1830" ySize="1830" />
+    </SimpleSource>"""
+    if vrt.find(placement_vrt) < 0:
+        gdaltest.post_reason('fail')
+        print(vrt)
+        return 'fail'
+
+    if ds.GetMetadata('xml:SENTINEL2') is None:
+        gdaltest.post_reason('fail')
+        return 'fail'
+
+    band = ds.GetRasterBand(1)
+    got_md = band.GetMetadata()
+    expected_md = {'BANDNAME': 'B1',
+                   'BANDWIDTH': '20',
+                   'BANDWIDTH_UNIT': 'nm',
+                   'SOLAR_IRRADIANCE': '1913.57',
+                   'SOLAR_IRRADIANCE_UNIT': 'W/m2/um',
+                   'WAVELENGTH': '443',
+                   'WAVELENGTH_UNIT': 'nm'}
+    if got_md != expected_md:
+        gdaltest.post_reason('fail')
+        import pprint
+        pprint.pprint(got_md)
+        return 'fail'
+
+    if band.DataType != gdal.GDT_UInt16:
+        gdaltest.post_reason('fail')
+        return 'fail'
+
+    return 'success'
+
+
 ###############################################################################
 # Test opening a L1C Safe Compact product
 
@@ -2403,6 +2912,10 @@ def sentinel2_l1c_safe_compact_3():
     sentinel2_l2a_1,
     sentinel2_l2a_2,
     sentinel2_l2a_3,
+    sentinel2_l2a_4,
+    sentinel2_l2a_5,
+    sentinel2_l2a_6,
+    sentinel2_l2a_7,
     sentinel2_l1c_safe_compact_1,
     sentinel2_l1c_safe_compact_2,
     sentinel2_l1c_safe_compact_3
diff --git a/gdal/frmts/sentinel2/frmt_sentinel2.html b/gdal/frmts/sentinel2/frmt_sentinel2.html
index 940b43ba3fb7..976e6f70d9bc 100644
--- a/gdal/frmts/sentinel2/frmt_sentinel2.html
+++ b/gdal/frmts/sentinel2/frmt_sentinel2.html
@@ -124,11 +124,6 @@ <h2>Level-2A</h2>
 If a product spans over several UTM zones,
 they will be exposed as separate subdatasets.</p>
 
-<p>Note: at the time of writing (December 2015), the exact format of Level-2A
-has not been yet decided by ESA. The driver is based on the output of the
-<a href="https://github.com/umwilm/SEN2COR">sen2cor</a> v2.0.5 (Sentinel 2 Level 2A
-Prototype Processor) software that processes Level-1C datasets into Level-2A.</p>
-
 <h2>Metadata</h2>
 
 <p>Metadata of the main metadata .xml file is available in the general metadata
diff --git a/gdal/frmts/sentinel2/sentinel2dataset.cpp b/gdal/frmts/sentinel2/sentinel2dataset.cpp
index 8634df92f927..3ddaad42209f 100644
--- a/gdal/frmts/sentinel2/sentinel2dataset.cpp
+++ b/gdal/frmts/sentinel2/sentinel2dataset.cpp
@@ -66,6 +66,12 @@ typedef enum
     SENTINEL2_L2A
 } SENTINEL2Level;
 
+typedef enum
+{
+    MSI2Ap,
+    MSI2A
+} SENTINEL2ProductType;
+
 typedef struct
 {
     const char* pszBandName;
@@ -168,6 +174,7 @@ class SENTINEL2Dataset : public VRTDataset
 
         static SENTINEL2Dataset *CreateL1CL2ADataset(
                 SENTINEL2Level eLevel,
+                SENTINEL2ProductType pType,
                 bool bIsSafeCompact,
                 const std::vector<CPLString>& aosGranuleList,
                 const std::vector<L1CSafeCompatGranuleDescription>& aoL1CSafeCompactGranuleList,
@@ -179,8 +186,8 @@ class SENTINEL2Dataset : public VRTDataset
                 bool bAlpha,
                 const std::vector<CPLString>& aosBands,
                 int nSaturatedVal,
-                int nNodataVal);
-
+                int nNodataVal,
+                const CPLString& osProductURI);
     public:
                     SENTINEL2Dataset(int nXSize, int nYSize);
         virtual ~SENTINEL2Dataset();
@@ -384,6 +391,8 @@ int SENTINEL2Dataset::Identify( GDALOpenInfo *poOpenInfo )
     /* Accept directly .zip as provided by https://scihub.esa.int/ */
     if( (STARTS_WITH_CI(pszJustFilename, "S2A_MSIL1C_") ||
          STARTS_WITH_CI(pszJustFilename, "S2B_MSIL1C_") ||
+         STARTS_WITH_CI(pszJustFilename, "S2A_MSIL2A_") ||
+         STARTS_WITH_CI(pszJustFilename, "S2B_MSIL2A_") ||
          STARTS_WITH_CI(pszJustFilename, "S2A_OPER_PRD_MSI") ||
          STARTS_WITH_CI(pszJustFilename, "S2B_OPER_PRD_MSI") ||
          STARTS_WITH_CI(pszJustFilename, "S2A_USER_PRD_MSI") ||
@@ -451,16 +460,28 @@ GDALDataset *SENTINEL2Dataset::Open( GDALOpenInfo * poOpenInfo )
     }
 
     if( STARTS_WITH_CI(poOpenInfo->pszFilename, "SENTINEL2_L1B:") )
+    {
+        CPLDebug("SENTINEL2", "Trying OpenL1BSubdataset");
         return OpenL1BSubdataset(poOpenInfo);
+    }
 
     if( STARTS_WITH_CI(poOpenInfo->pszFilename, "SENTINEL2_L1C:") )
+    {
+        CPLDebug("SENTINEL2", "Trying OpenL1C_L2ASubdataset");
         return OpenL1C_L2ASubdataset(poOpenInfo, SENTINEL2_L1C);
+    }
 
     if( STARTS_WITH_CI(poOpenInfo->pszFilename, "SENTINEL2_L1C_TILE:") )
+    {
+        CPLDebug("SENTINEL2", "Trying OpenL1CTileSubdataset");
         return OpenL1CTileSubdataset(poOpenInfo);
+    }
 
     if( STARTS_WITH_CI(poOpenInfo->pszFilename, "SENTINEL2_L2A:") )
+    {
+        CPLDebug("SENTINEL2", "Trying OpenL1C_L2ASubdataset");
         return OpenL1C_L2ASubdataset(poOpenInfo, SENTINEL2_L2A);
+    }
 
     const char* pszJustFilename = CPLGetFilename(poOpenInfo->pszFilename);
     if( (STARTS_WITH_CI(pszJustFilename, "S2A_OPER_PRD_MSI") ||
@@ -494,7 +515,7 @@ GDALDataset *SENTINEL2Dataset::Open( GDALOpenInfo * poOpenInfo )
         CPLString osFilename(poOpenInfo->pszFilename);
         CPLString osSAFE(osBasename);
         // S2B_MSIL1C_20171004T233419_N0206_R001_T54DWM_20171005T001811.SAFE.zip
-        // has .SAFE.zip extension, but other products have just a .zip 
+        // has .SAFE.zip extension, but other products have just a .zip
         // extension. So for the subdir in the zip only add .SAFE when needed
         if( !EQUAL(CPLGetExtension(osSAFE), "SAFE") )
             osSAFE += ".SAFE";
@@ -505,34 +526,62 @@ GDALDataset *SENTINEL2Dataset::Open( GDALOpenInfo * poOpenInfo )
         GDALOpenInfo oOpenInfo(osFilename, GA_ReadOnly);
         return Open(&oOpenInfo);
     }
+    else if( (STARTS_WITH_CI(pszJustFilename, "S2A_MSIL2A_") ||
+              STARTS_WITH_CI(pszJustFilename, "S2B_MSIL2A_") ) &&
+         EQUAL(CPLGetExtension(pszJustFilename), "zip") )
+    {
+        CPLString osBasename(CPLGetBasename(pszJustFilename));
+        CPLString osFilename(poOpenInfo->pszFilename);
+        CPLString osSAFE(osBasename);
+        // S2B_MSIL1C_20171004T233419_N0206_R001_T54DWM_20171005T001811.SAFE.zip
+        // has .SAFE.zip extension, but other products have just a .zip
+        // extension. So for the subdir in the zip only add .SAFE when needed
+        if( !EQUAL(CPLGetExtension(osSAFE), "SAFE") )
+            osSAFE += ".SAFE";
+        osFilename = osFilename + "/" + osSAFE + "/MTD_MSIL2A.xml";
+        if( strncmp(osFilename, "/vsizip/", strlen("/vsizip/")) != 0 )
+            osFilename = "/vsizip/" + osFilename;
+        CPLDebug("SENTINEL2", "Trying %s", osFilename.c_str());
+        GDALOpenInfo oOpenInfo(osFilename, GA_ReadOnly);
+        return Open(&oOpenInfo);
+    }
 
     const char* pszHeader = reinterpret_cast<const char*>(poOpenInfo->pabyHeader);
 
     if( strstr(pszHeader,  "<n1:Level-1B_User_Product" ) != nullptr &&
         strstr(pszHeader, "User_Product_Level-1B.xsd" ) != nullptr )
     {
+        CPLDebug("SENTINEL2", "Trying OpenL1BUserProduct");
         return OpenL1BUserProduct(poOpenInfo);
     }
 
     if( strstr(pszHeader,  "<n1:Level-1B_Granule_ID" ) != nullptr &&
         strstr(pszHeader, "S2_PDI_Level-1B_Granule_Metadata.xsd" ) != nullptr )
     {
+        CPLDebug("SENTINEL2", "Trying OpenL1BGranule");
         return OpenL1BGranule(poOpenInfo->pszFilename);
     }
 
     if( strstr(pszHeader,  "<n1:Level-1C_User_Product" ) != nullptr &&
         strstr(pszHeader, "User_Product_Level-1C.xsd" ) != nullptr )
     {
+        CPLDebug("SENTINEL2", "Trying OpenL1C_L2A");
         return OpenL1C_L2A(poOpenInfo->pszFilename, SENTINEL2_L1C);
     }
 
     if( strstr(pszHeader,  "<n1:Level-1C_Tile_ID" ) != nullptr &&
         strstr(pszHeader, "S2_PDI_Level-1C_Tile_Metadata.xsd" ) != nullptr )
+    {
+        CPLDebug("SENTINEL2", "Trying OpenL1CTile");
         return OpenL1CTile(poOpenInfo->pszFilename);
+    }
 
     if( strstr(pszHeader,  "<n1:Level-2A_User_Product" ) != nullptr &&
         strstr(pszHeader, "User_Product_Level-2A" ) != nullptr )
+    {
+        CPLDebug("SENTINEL2", "Trying OpenL1C_L2A");
         return OpenL1C_L2A(poOpenInfo->pszFilename, SENTINEL2_L2A);
+    }
 
     return nullptr;
 }
@@ -595,7 +644,7 @@ static bool SENTINEL2GetGranuleInfo(SENTINEL2Level eLevel,
         {
             if( fp )
                 VSIFCloseL(fp);
-            CPLError(CE_Failure, CPLE_AppDefined, "Cannot read %s",
+            CPLError(CE_Failure, CPLE_AppDefined, "SENTINEL2GetGranuleInfo: Cannot read %s",
                      osGranuleMTDPath.c_str());
             return false;
         }
@@ -776,19 +825,28 @@ static bool SENTINEL2GetGranuleList(CPLXMLNode* psMainMTD,
         CPLError(CE_Failure, CPLE_AppDefined, "Cannot find =%s", pszNodePath);
         return false;
     }
-    pszNodePath = (eLevel == SENTINEL2_L2A) ?
-            "General_Info.L2A_Product_Info" : "General_Info.Product_Info";
+    pszNodePath = "General_Info.Product_Info";
     CPLXMLNode* psProductInfo = CPLGetXMLNode(psRoot, pszNodePath);
+    if( psProductInfo == nullptr && eLevel == SENTINEL2_L2A )
+    {
+        pszNodePath = "General_Info.L2A_Product_Info";
+        psProductInfo = CPLGetXMLNode(psRoot, pszNodePath);
+    }
     if( psProductInfo == nullptr )
     {
         CPLError(CE_Failure, CPLE_AppDefined, "Cannot find %s", pszNodePath);
         return false;
     }
 
-    pszNodePath = (eLevel == SENTINEL2_L2A) ?
-            "L2A_Product_Organisation" : "Product_Organisation";
+    pszNodePath = "Product_Organisation";
     CPLXMLNode* psProductOrganisation =
                         CPLGetXMLNode(psProductInfo, pszNodePath);
+    if( psProductOrganisation == nullptr && eLevel == SENTINEL2_L2A )
+    {
+        pszNodePath = "L2A_Product_Organisation";
+        psProductOrganisation =
+                        CPLGetXMLNode(psProductInfo, pszNodePath);
+    }
     if( psProductOrganisation == nullptr )
     {
         CPLError(CE_Failure, CPLE_AppDefined, "Cannot find %s", pszNodePath);
@@ -809,6 +867,11 @@ static bool SENTINEL2GetGranuleList(CPLXMLNode* psMainMTD,
     }
 #endif
 
+    const bool bIsMSI2Ap = EQUAL(CPLGetXMLValue(psProductInfo, "PRODUCT_TYPE", ""),
+                                "S2MSI2Ap");
+    const bool bIsCompact = EQUAL(CPLGetXMLValue(psProductInfo, "PRODUCT_FORMAT", ""),
+                                "SAFE_COMPACT");
+    CPLString oGranuleId("L2A_");
     std::set<CPLString> aoSetGranuleId;
     for(CPLXMLNode* psIter = psProductOrganisation->psChild; psIter != nullptr;
                                                     psIter = psIter->psNext )
@@ -822,7 +885,8 @@ static bool SENTINEL2GetGranuleList(CPLXMLNode* psMainMTD,
                                                      psIter2 = psIter2->psNext )
         {
             if( psIter2->eType != CXT_Element ||
-                !EQUAL(psIter2->pszValue, "Granules") )
+                (!EQUAL(psIter2->pszValue, "Granule") &&
+                 !EQUAL(psIter2->pszValue, "Granules")) )
             {
                 continue;
             }
@@ -839,12 +903,15 @@ static bool SENTINEL2GetGranuleList(CPLXMLNode* psMainMTD,
                                                      psIter3 = psIter3->psNext )
                 {
                     if( psIter3->eType != CXT_Element ||
-                        !EQUAL(psIter3->pszValue, "IMAGE_ID_2A") )
+                        ( !EQUAL(psIter3->pszValue, "IMAGE_ID_2A") &&
+                          !EQUAL(psIter3->pszValue, "IMAGE_FILE") &&
+                          !EQUAL(psIter3->pszValue, "IMAGE_FILE_2A") ) )
                     {
                         continue;
                     }
                     const char* pszTileName = CPLGetXMLValue(psIter3, nullptr, "");
                     size_t nLen = strlen(pszTileName);
+                    // If granule name ends with resolution: _60m
                     if( nLen > 4 && pszTileName[nLen-4] == '_' &&
                         pszTileName[nLen-1] == 'm' )
                     {
@@ -881,17 +948,42 @@ static bool SENTINEL2GetGranuleList(CPLXMLNode* psMainMTD,
 
             /* S2A_OPER_MSI_L1C_TL_SGS__20151024T023555_A001758_T53JLJ_N01.04 --> */
             /* S2A_OPER_MTD_L1C_TL_SGS__20151024T023555_A001758_T53JLJ */
+            // S2B_OPER_MSI_L2A_TL_MPS__20180823T122014_A007641_T34VFJ_N02.08
             CPLString osGranuleMTD = pszGranuleId;
-            if( osGranuleMTD.size() > strlen("S2A_OPER_MSI_") &&
+            if( bIsCompact == 0 &&
+                osGranuleMTD.size() > strlen("S2A_OPER_MSI_") &&
                 osGranuleMTD[8] == '_' && osGranuleMTD[12] == '_' &&
                 osGranuleMTD[osGranuleMTD.size()-7] == '_' &&
-                osGranuleMTD[osGranuleMTD.size()-6] == 'N' )
+                osGranuleMTD[osGranuleMTD.size()-6] == 'N' &&
+                osGranuleMTD[7] == 'R' )
             {
                 osGranuleMTD[9] = 'M';
                 osGranuleMTD[10] = 'T';
                 osGranuleMTD[11] = 'D';
                 osGranuleMTD.resize(osGranuleMTD.size()-7);
             }
+            else if( bIsMSI2Ap )
+            {
+                osGranuleMTD = "MTD_TL";
+                oGranuleId = "L2A_";
+                // S2A_MSIL2A_20170823T094031_N0205_R036_T34VFJ_20170823T094252.SAFE
+                // S2A_USER_MSI_L2A_TL_SGS__20170823T133142_A011330_T34VFJ_N02.05 -->
+                // L2A_T34VFJ_A011330_20170823T094252
+                const char* pszProductURI = CPLGetXMLValue(psProductInfo, "PRODUCT_URI_2A", nullptr);
+                if( pszProductURI != nullptr )
+                {
+                    CPLString psProductURI(pszProductURI);
+                    if( psProductURI.size() < 60 )
+                    {
+                        CPLDebug("SENTINEL2", "Invalid PRODUCT_URI_2A");
+                        continue;
+                    }
+                    oGranuleId += psProductURI.substr(38, 7);
+                    oGranuleId += CPLString(pszGranuleId).substr(41, 8).c_str();
+                    oGranuleId += psProductURI.substr(45, 15);
+                    pszGranuleId = oGranuleId.c_str();
+                }
+            }
             else
             {
                 CPLDebug("SENTINEL2", "Invalid granule ID: %s", pszGranuleId);
@@ -931,9 +1023,19 @@ char** SENTINEL2GetUserProductMetadata( CPLXMLNode* psMainMTD,
         CPLError(CE_Failure, CPLE_AppDefined, "Cannot find =%s", pszRootNode);
         return nullptr;
     }
-    CPLXMLNode* psProductInfo = CPLGetXMLNode(psRoot,
-        EQUAL(pszRootNode, "Level-2A_User_Product") ?
-            "General_Info.L2A_Product_Info" : "General_Info.Product_Info");
+    const char* psPIPath = "General_Info.Product_Info";
+    CPLXMLNode* psProductInfo = CPLGetXMLNode(psRoot, psPIPath);
+    if( psProductInfo == nullptr &&
+        EQUAL(pszRootNode, "Level-2A_User_Product"))
+    {
+        psPIPath = "General_Info.L2A_Product_Info";
+        psProductInfo = CPLGetXMLNode(psRoot, psPIPath);
+    }
+    if( psProductInfo == nullptr )
+    {
+        CPLError(CE_Failure, CPLE_AppDefined, "Cannot find =%s", psPIPath);
+        return nullptr;
+    }
     int nDataTakeCounter = 1;
     for( CPLXMLNode* psIter = (psProductInfo ? psProductInfo->psChild : nullptr);
                      psIter != nullptr;
@@ -968,10 +1070,13 @@ char** SENTINEL2GetUserProductMetadata( CPLXMLNode* psMainMTD,
         }
     }
 
-    CPLXMLNode* psIC = CPLGetXMLNode(psRoot,
-            EQUAL(pszRootNode, "Level-2A_User_Product") ?
-                "General_Info.L2A_Product_Image_Characteristics" :
-                "General_Info.Product_Image_Characteristics");
+    const char* psICPath = "General_Info.Product_Image_Characteristics";
+    CPLXMLNode* psIC = CPLGetXMLNode(psRoot, psICPath);
+    if( psIC == nullptr )
+    {
+        psICPath = "General_Info.L2A_Product_Image_Characteristics";
+        psIC = CPLGetXMLNode(psRoot, psICPath);
+    }
     if( psIC != nullptr )
     {
         for( CPLXMLNode* psIter = psIC->psChild; psIter != nullptr;
@@ -1003,6 +1108,10 @@ char** SENTINEL2GetUserProductMetadata( CPLXMLNode* psMainMTD,
 
         // L2A specific
         CPLXMLNode* psQVL = CPLGetXMLNode(psIC, "L1C_L2A_Quantification_Values_List");
+        if( psQVL == nullptr )
+        {
+            psQVL = CPLGetXMLNode(psIC, "Quantification_Values_List");
+        }
         for( CPLXMLNode* psIter = psQVL ? psQVL->psChild : nullptr; psIter != nullptr;
                                                  psIter = psIter->psNext )
         {
@@ -1051,6 +1160,18 @@ char** SENTINEL2GetUserProductMetadata( CPLXMLNode* psMainMTD,
                      psIter != nullptr;
                      psIter = psIter->psNext )
         {
+            // MSIL2A approach
+            if( psIter->psChild != nullptr &&
+                psIter->psChild->psChild != nullptr &&
+                psIter->psChild->psNext != nullptr &&
+                psIter->psChild->psChild->eType == CXT_Text &&
+                psIter->psChild->psNext->eType == CXT_Text )
+            {
+                aosList.AddNameValue( psIter->psChild->psChild->pszValue,
+                                      psIter->psChild->psNext->pszValue);
+                continue;
+            }
+
             if( psIter->eType != CXT_Element )
                 continue;
             if( psIter->psChild != nullptr && psIter->psChild->eType == CXT_Text )
@@ -1059,22 +1180,29 @@ char** SENTINEL2GetUserProductMetadata( CPLXMLNode* psMainMTD,
                                     psIter->psChild->pszValue );
             }
         }
-    }
 
-    CPLXMLNode* psL2A_QII = CPLGetXMLNode(psRoot, "L2A_Quality_Indicators_Info");
-    if( psL2A_QII != nullptr )
-    {
-        CPLXMLNode* psICCQI = CPLGetXMLNode(psL2A_QII, "Image_Content_QI");
-        for( CPLXMLNode* psIter = (psICCQI ? psICCQI->psChild : nullptr);
-                    psIter != nullptr;
-                    psIter = psIter->psNext )
+        CPLXMLNode* psICCQI = CPLGetXMLNode(psQII, "Image_Content_QI");
+        if( psICCQI == nullptr )
         {
-            if( psIter->eType != CXT_Element )
-                continue;
-            if( psIter->psChild != nullptr && psIter->psChild->eType == CXT_Text )
+            CPLXMLNode* psL2A_QII = CPLGetXMLNode(psRoot, "L2A_Quality_Indicators_Info");
+            if( psL2A_QII != nullptr )
             {
-                aosList.AddNameValue( psIter->pszValue,
-                                    psIter->psChild->pszValue );
+                psICCQI = CPLGetXMLNode(psL2A_QII, "Image_Content_QI");
+            }
+        }
+        if( psICCQI != nullptr )
+        {
+            for( CPLXMLNode* psIter = (psICCQI ? psICCQI->psChild : nullptr);
+                psIter != nullptr;
+                psIter = psIter->psNext )
+            {
+                if( psIter->eType != CXT_Element )
+                    continue;
+                if( psIter->psChild != nullptr && psIter->psChild->eType == CXT_Text )
+                {
+                    aosList.AddNameValue( psIter->pszValue,
+                                        psIter->psChild->pszValue );
+                }
             }
         }
     }
@@ -1203,7 +1331,10 @@ GDALDataset *SENTINEL2Dataset::OpenL1BUserProduct( GDALOpenInfo * poOpenInfo )
 {
     CPLXMLNode *psRoot = CPLParseXMLFile( poOpenInfo->pszFilename );
     if( psRoot == nullptr )
+    {
+        CPLDebug("SENTINEL2", "Cannot XML parse %s", poOpenInfo->pszFilename);
         return nullptr;
+    }
 
     char* pszOriginalXML = CPLSerializeXMLTree(psRoot);
     CPLString osOriginalXML;
@@ -1229,6 +1360,7 @@ GDALDataset *SENTINEL2Dataset::OpenL1BUserProduct( GDALOpenInfo * poOpenInfo )
                                    oSetResolutions,
                                    oMapResolutionsToBands) )
     {
+        CPLDebug("SENTINEL2", "Failed to get resolution set");
         return nullptr;
     }
 
@@ -1238,6 +1370,7 @@ GDALDataset *SENTINEL2Dataset::OpenL1BUserProduct( GDALOpenInfo * poOpenInfo )
                                  poOpenInfo->pszFilename,
                                  aosGranuleList) )
     {
+        CPLDebug("SENTINEL2", "Failed to get granule list");
         return nullptr;
     }
 
@@ -1386,9 +1519,11 @@ char** SENTINEL2GetL1BGranuleMetadata( CPLXMLNode* psMainMTD )
 static CPLString SENTINEL2GetTilename(const CPLString& osGranulePath,
                                       const CPLString& osGranuleName,
                                       const CPLString& osBandName,
+                                      const CPLString& osProductURI = CPLString(),
                                       bool bIsPreview = false,
                                       int nPrecisionL2A = 0)
 {
+    bool granuleNameMatchTilename = true;
     CPLString osJPEG2000Name(osGranuleName);
     if( osJPEG2000Name.size() > 7 &&
         osJPEG2000Name[osJPEG2000Name.size()-7] == '_' &&
@@ -1460,12 +1595,20 @@ static CPLString SENTINEL2GetTilename(const CPLString& osGranulePath,
                 osJPEG2000Name[11] = osBandName[2];
             }
         }
+        else if( osProductURI.size() > 44 &&
+                 osProductURI.substr(3, 8) == "_MSIL2A_" )
+        {
+            osTile += osProductURI.substr(38, 6);
+            osTile += osProductURI.substr(10, 16);
+            granuleNameMatchTilename = false;
+        }
         else
         {
             CPLDebug("SENTINEL2", "Invalid granule path: %s",
                      osGranulePath.c_str());
         }
-        osTile += osJPEG2000Name;
+        if( granuleNameMatchTilename )
+            osTile += osJPEG2000Name;
         if( atoi(osBandName) > 0 )
         {
             osTile += "_B";
@@ -1604,7 +1747,10 @@ GDALDataset *SENTINEL2Dataset::OpenL1BGranule( const char* pszFilename,
 {
     CPLXMLNode *psRoot = CPLParseXMLFile( pszFilename );
     if( psRoot == nullptr )
+    {
+        CPLDebug("SENTINEL2", "Cannot XML parse %s", pszFilename);
         return nullptr;
+    }
 
     char* pszOriginalXML = CPLSerializeXMLTree(psRoot);
     CPLString osOriginalXML;
@@ -1776,7 +1922,10 @@ GDALDataset *SENTINEL2Dataset::OpenL1BSubdataset( GDALOpenInfo * poOpenInfo )
     GDALDataset* poTmpDS = OpenL1BGranule( osFilename, &psRoot,
                                            nSubDSPrecision, &oSetBands);
     if( poTmpDS == nullptr )
+    {
+        CPLDebug("SENTINEL2", "Failed to open L1B granule %s", osFilename.c_str());
         return nullptr;
+    }
 
     SENTINEL2_CPLXMLNodeHolder oXMLHolder(psRoot);
 
@@ -2155,6 +2304,110 @@ static bool SENTINEL2GetGranuleList_L1CSafeCompact(CPLXMLNode* psMainMTD,
     return true;
 }
 
+/************************************************************************/
+/*                 SENTINEL2GetGranuleList_L2ASafeCompact()             */
+/************************************************************************/
+
+static bool SENTINEL2GetGranuleList_L2ASafeCompact(CPLXMLNode* psMainMTD,
+                                    const char* pszFilename,
+                                    std::vector<L1CSafeCompatGranuleDescription>& osList)
+{
+    const char* pszNodePath = "=Level-2A_User_Product.General_Info.Product_Info";
+    CPLXMLNode* psProductInfo = CPLGetXMLNode(psMainMTD, pszNodePath);
+    if( psProductInfo == nullptr )
+    {
+        pszNodePath = "=Level-2A_User_Product.General_Info.L2A_Product_Info";
+        psProductInfo = CPLGetXMLNode(psMainMTD, pszNodePath);
+    }
+    if( psProductInfo == nullptr )
+    {
+        CPLError(CE_Failure, CPLE_AppDefined, "Cannot find %s",
+                        pszNodePath);
+        return false;
+    }
+
+    CPLXMLNode* psProductOrganisation =
+                        CPLGetXMLNode(psProductInfo, "Product_Organisation");
+    if( psProductOrganisation == nullptr )
+    {
+        psProductOrganisation =
+                        CPLGetXMLNode(psProductInfo, "L2A_Product_Organisation");
+        if( psProductOrganisation == nullptr )
+        {
+            CPLError(CE_Failure, CPLE_AppDefined, "Cannot find %s", "Product_Organisation");
+            return false;
+        }
+    }
+
+    CPLString osDirname( CPLGetDirname(pszFilename) );
+#ifdef HAVE_READLINK
+    char szPointerFilename[2048];
+    int nBytes = static_cast<int>(readlink(pszFilename, szPointerFilename,
+                                           sizeof(szPointerFilename)));
+    if (nBytes != -1)
+    {
+        const int nOffset =
+            std::min(nBytes, static_cast<int>(sizeof(szPointerFilename)-1));
+        szPointerFilename[nOffset] = '\0';
+        osDirname = CPLGetDirname(szPointerFilename);
+    }
+#endif
+
+    const char chSeparator = SENTINEL2GetPathSeparator(osDirname);
+    for(CPLXMLNode* psIter = psProductOrganisation->psChild; psIter != nullptr;
+                                                    psIter = psIter->psNext )
+    {
+        if( psIter->eType != CXT_Element ||
+            !EQUAL(psIter->pszValue, "Granule_List") )
+        {
+            continue;
+        }
+        for(CPLXMLNode* psIter2 = psIter->psChild; psIter2 != nullptr;
+                                                     psIter2 = psIter2->psNext )
+        {
+            if( psIter2->eType != CXT_Element ||
+                !EQUAL(psIter2->pszValue, "Granule") )
+            {
+                continue;
+            }
+
+            const char* pszImageFile = CPLGetXMLValue(psIter2, "IMAGE_FILE", nullptr);
+            if( pszImageFile == nullptr )
+            {
+                pszImageFile = CPLGetXMLValue(psIter2, "IMAGE_FILE_2A", nullptr);
+                if( pszImageFile == nullptr || strlen(pszImageFile) < 3 )
+                {
+                    CPLDebug("SENTINEL2", "Missing IMAGE_FILE element");
+                    continue;
+                }
+            }
+            L1CSafeCompatGranuleDescription oDesc;
+            oDesc.osBandPrefixPath = osDirname + chSeparator + pszImageFile;
+            if( oDesc.osBandPrefixPath.size() < 36 )
+            {
+                CPLDebug("SENTINEL2", "Band prefix path too short");
+                continue;
+            }
+            oDesc.osBandPrefixPath.resize( oDesc.osBandPrefixPath.size() - 36 );
+            // GRANULE/L1C_T30TXT_A007999_20170102T111441/IMG_DATA/T30TXT_20170102T111442_B12_60m -->
+            // GRANULE/L1C_T30TXT_A007999_20170102T111441/MTD_TL.xml
+            oDesc.osMTDTLPath = osDirname + chSeparator +
+                                CPLGetDirname(CPLGetDirname(pszImageFile));
+            if( oDesc.osMTDTLPath.size() < 9 )
+            {
+                CPLDebug("SENTINEL2", "MTDTL path too short");
+                continue;
+            }
+            oDesc.osMTDTLPath.resize( oDesc.osMTDTLPath.size() - 9 );
+            oDesc.osMTDTLPath = oDesc.osMTDTLPath +
+                                chSeparator + "MTD_TL.xml";
+            osList.push_back(oDesc);
+        }
+    }
+
+    return true;
+}
+
 /************************************************************************/
 /*                           OpenL1C_L2A()                              */
 /************************************************************************/
@@ -2164,7 +2417,10 @@ GDALDataset *SENTINEL2Dataset::OpenL1C_L2A( const char* pszFilename,
 {
     CPLXMLNode *psRoot = CPLParseXMLFile( pszFilename );
     if( psRoot == nullptr )
+    {
+        CPLDebug("SENTINEL2", "Cannot XML parse %s", pszFilename);
         return nullptr;
+    }
 
     char* pszOriginalXML = CPLSerializeXMLTree(psRoot);
     CPLString osOriginalXML;
@@ -2177,15 +2433,20 @@ GDALDataset *SENTINEL2Dataset::OpenL1C_L2A( const char* pszFilename,
 
     const char* pszNodePath = (eLevel == SENTINEL2_L1C ) ?
                 "=Level-1C_User_Product.General_Info.Product_Info" :
-                "=Level-2A_User_Product.General_Info.L2A_Product_Info";
+                "=Level-2A_User_Product.General_Info.Product_Info";
     CPLXMLNode* psProductInfo = CPLGetXMLNode(psRoot, pszNodePath);
+    if( psProductInfo == nullptr && eLevel == SENTINEL2_L2A )
+    {
+        pszNodePath = "=Level-2A_User_Product.General_Info.L2A_Product_Info";
+        psProductInfo = CPLGetXMLNode(psRoot, pszNodePath);
+    }
     if( psProductInfo == nullptr )
     {
         CPLError(CE_Failure, CPLE_AppDefined, "Cannot find %s", pszNodePath);
         return nullptr;
     }
 
-    const bool bIsSafeCompact = eLevel == SENTINEL2_L1C &&
+    const bool bIsSafeCompact =
         EQUAL(CPLGetXMLValue(psProductInfo, "Query_Options.PRODUCT_FORMAT", ""),
               "SAFE_COMPACT");
 
@@ -2195,6 +2456,9 @@ GDALDataset *SENTINEL2Dataset::OpenL1C_L2A( const char* pszFilename,
     {
         for(unsigned int i = 0; i < NB_BANDS; ++i)
         {
+            // L2 does not contain B10
+            if( i == 10 && eLevel == SENTINEL2_L2A )
+                continue;
             const SENTINEL2BandDescription * psBandDesc = &asBandDesc[i];
             oSetResolutions.insert( psBandDesc->nResolution );
             CPLString osName = psBandDesc->pszBandName + 1; /* skip B character */
@@ -2208,6 +2472,7 @@ GDALDataset *SENTINEL2Dataset::OpenL1C_L2A( const char* pszFilename,
                                    oSetResolutions,
                                    oMapResolutionsToBands) )
     {
+        CPLDebug("SENTINEL2", "Failed to get resolution set");
         return nullptr;
     }
 
@@ -2215,9 +2480,18 @@ GDALDataset *SENTINEL2Dataset::OpenL1C_L2A( const char* pszFilename,
     if( bIsSafeCompact )
     {
         std::vector<L1CSafeCompatGranuleDescription> aoL1CSafeCompactGranuleList;
-        if( !SENTINEL2GetGranuleList_L1CSafeCompact(psRoot, pszFilename,
+        if( eLevel == SENTINEL2_L1C &&
+            !SENTINEL2GetGranuleList_L1CSafeCompact(psRoot, pszFilename,
                                                     aoL1CSafeCompactGranuleList) )
         {
+            CPLDebug("SENTINEL2", "Failed to get granule list");
+            return nullptr;
+        }
+        else if ( eLevel == SENTINEL2_L2A &&
+            !SENTINEL2GetGranuleList_L2ASafeCompact(psRoot, pszFilename,
+                                                    aoL1CSafeCompactGranuleList) )
+        {
+            CPLDebug("SENTINEL2", "Failed to get granule list");
             return nullptr;
         }
         for(size_t i=0;i<aoL1CSafeCompactGranuleList.size();++i)
@@ -2235,10 +2509,12 @@ GDALDataset *SENTINEL2Dataset::OpenL1C_L2A( const char* pszFilename,
                                  (eLevel == SENTINEL2_L1C) ? nullptr :
                                                     &oMapResolutionsToBands) )
     {
+        CPLDebug("SENTINEL2", "Failed to get granule list");
         return nullptr;
     }
     if( oSetResolutions.empty() )
     {
+        CPLDebug("SENTINEL2", "Resolution set is empty");
         return nullptr;
     }
 
@@ -2449,7 +2725,10 @@ GDALDataset *SENTINEL2Dataset::OpenL1CTile( const char* pszFilename,
 {
     CPLXMLNode *psRoot = CPLParseXMLFile( pszFilename );
     if( psRoot == nullptr )
+    {
+        CPLDebug("SENTINEL2", "Cannot XML parse %s", pszFilename);
         return nullptr;
+    }
 
     char* pszOriginalXML = CPLSerializeXMLTree(psRoot);
     CPLString osOriginalXML;
@@ -2752,7 +3031,10 @@ GDALDataset *SENTINEL2Dataset::OpenL1C_L2ASubdataset( GDALOpenInfo * poOpenInfo,
 
     CPLXMLNode *psRoot = CPLParseXMLFile( osFilename );
     if( psRoot == nullptr )
+    {
+        CPLDebug("SENTINEL2", "Cannot XML parse %s", osFilename.c_str());
         return nullptr;
+    }
 
     char* pszOriginalXML = CPLSerializeXMLTree(psRoot);
     CPLString osOriginalXML;
@@ -2763,10 +3045,34 @@ GDALDataset *SENTINEL2Dataset::OpenL1C_L2ASubdataset( GDALOpenInfo * poOpenInfo,
     SENTINEL2_CPLXMLNodeHolder oXMLHolder(psRoot);
     CPLStripXMLNamespace(psRoot, nullptr, TRUE);
 
-    const bool bIsSafeCompact = eLevel == SENTINEL2_L1C &&
-        EQUAL(CPLGetXMLValue(psRoot,
-                "=Level-1C_User_Product.General_Info.Product_Info.Query_Options.PRODUCT_FORMAT", ""),
-              "SAFE_COMPACT");
+    CPLXMLNode* psProductInfo = eLevel == SENTINEL2_L1C ?
+        CPLGetXMLNode(psRoot, "=Level-1C_User_Product.General_Info.Product_Info") :
+        CPLGetXMLNode(psRoot, "=Level-2A_User_Product.General_Info.Product_Info");
+    if( psProductInfo == nullptr && eLevel == SENTINEL2_L2A )
+    {
+        psProductInfo = CPLGetXMLNode(psRoot, "=Level-2A_User_Product.General_Info.L2A_Product_Info");
+    }
+    if( psProductInfo == nullptr )
+    {
+        CPLDebug("SENTINEL2", "Product Info not found");
+        return nullptr;
+    }
+
+    const bool bIsSafeCompact = EQUAL(CPLGetXMLValue(psProductInfo,
+                                    "Query_Options.PRODUCT_FORMAT", ""),
+                                    "SAFE_COMPACT");
+
+    const char* pszProductURI = CPLGetXMLValue(psProductInfo,
+                                    "PRODUCT_URI", nullptr);
+    SENTINEL2ProductType pType = MSI2A;
+    if( pszProductURI == nullptr )
+    {
+        pszProductURI = CPLGetXMLValue(psProductInfo,
+                            "PRODUCT_URI_2A", nullptr);
+        pType = MSI2Ap;
+    }
+    if( pszProductURI == nullptr )
+        pszProductURI = "";
 
     std::vector<CPLString> aosGranuleList;
     std::map<int, std::set<CPLString> > oMapResolutionsToBands;
@@ -2775,15 +3081,27 @@ GDALDataset *SENTINEL2Dataset::OpenL1C_L2ASubdataset( GDALOpenInfo * poOpenInfo,
     {
         for(unsigned int i = 0; i < NB_BANDS; ++i)
         {
+            // L2 does not contain B10
+            if( i == 10 && eLevel == SENTINEL2_L2A )
+                continue;
             const SENTINEL2BandDescription * psBandDesc = &asBandDesc[i];
             CPLString osName = psBandDesc->pszBandName + 1; /* skip B character */
             if( atoi(osName) < 10 )
                 osName = "0" + osName;
             oMapResolutionsToBands[psBandDesc->nResolution].insert(osName);
         }
-        if( !SENTINEL2GetGranuleList_L1CSafeCompact(psRoot, osFilename,
+        if( eLevel == SENTINEL2_L1C &&
+            !SENTINEL2GetGranuleList_L1CSafeCompact(psRoot, osFilename,
+                                                    aoL1CSafeCompactGranuleList) )
+        {
+            CPLDebug("SENTINEL2", "Failed to get granule list");
+            return nullptr;
+        }
+        if( eLevel == SENTINEL2_L2A &&
+            !SENTINEL2GetGranuleList_L2ASafeCompact(psRoot, osFilename,
                                                     aoL1CSafeCompactGranuleList) )
         {
+            CPLDebug("SENTINEL2", "Failed to get granule list");
             return nullptr;
         }
         for(size_t i=0;i<aoL1CSafeCompactGranuleList.size();++i)
@@ -2800,6 +3118,7 @@ GDALDataset *SENTINEL2Dataset::OpenL1C_L2ASubdataset( GDALOpenInfo * poOpenInfo,
                                  (eLevel == SENTINEL2_L1C) ? nullptr :
                                                     &oMapResolutionsToBands) )
     {
+        CPLDebug("SENTINEL2", "Failed to get granule list");
         return nullptr;
     }
 
@@ -2844,7 +3163,10 @@ GDALDataset *SENTINEL2Dataset::OpenL1C_L2ASubdataset( GDALOpenInfo * poOpenInfo,
             oSetBands.insert(osName);
         }
         if( oSetBands.empty() )
+        {
+            CPLDebug("SENTINEL2", "Band set is empty");
             return nullptr;
+        }
     }
     else
     {
@@ -2886,6 +3208,7 @@ GDALDataset *SENTINEL2Dataset::OpenL1C_L2ASubdataset( GDALOpenInfo * poOpenInfo,
         CPLTestBool(SENTINEL2GetOption(poOpenInfo, "ALPHA", "FALSE"));
 
     SENTINEL2Dataset* poDS = CreateL1CL2ADataset(eLevel,
+                                                 pType,
                                                  bIsSafeCompact,
                                                  aosGranuleList,
                                                  aoL1CSafeCompactGranuleList,
@@ -2897,7 +3220,8 @@ GDALDataset *SENTINEL2Dataset::OpenL1C_L2ASubdataset( GDALOpenInfo * poOpenInfo,
                                                  bAlpha,
                                                  aosBands,
                                                  nSaturatedVal,
-                                                 nNodataVal);
+                                                 nNodataVal,
+                                                 CPLString(pszProductURI));
     if( poDS == nullptr )
     {
         CSLDestroy(papszMD);
@@ -2952,7 +3276,11 @@ void SENTINEL2Dataset::AddL1CL2ABandMetadata(SENTINEL2Level eLevel,
     CPLXMLNode* psIC = CPLGetXMLNode(psRoot,
         (eLevel == SENTINEL2_L1C) ?
             "=Level-1C_User_Product.General_Info.Product_Image_Characteristics" :
-            "=Level-2A_User_Product.General_Info.L2A_Product_Image_Characteristics");
+            "=Level-2A_User_Product.General_Info.Product_Image_Characteristics");
+    if( psIC == nullptr )
+    {
+        psIC = CPLGetXMLNode(psRoot, "=Level-2A_User_Product.General_Info.L2A_Product_Image_Characteristics");
+    }
     if( psIC != nullptr )
     {
         CPLXMLNode* psSIL = CPLGetXMLNode(psIC,
@@ -3001,8 +3329,14 @@ void SENTINEL2Dataset::AddL1CL2ABandMetadata(SENTINEL2Level eLevel,
 /*      Add Scene Classification category values (L2A)                  */
 /* -------------------------------------------------------------------- */
     CPLXMLNode* psSCL = CPLGetXMLNode(psRoot,
+            "=Level-2A_User_Product.General_Info."
+            "Product_Image_Characteristics.Scene_Classification_List");
+    if( psSCL == nullptr)
+    {
+        psSCL = CPLGetXMLNode(psRoot,
             "=Level-2A_User_Product.General_Info."
             "L2A_Product_Image_Characteristics.L2A_Scene_Classification_List");
+    }
     int nSCLBand = 0;
     for(int nBand=1;nBand<=static_cast<int>(aosBands.size());nBand++)
     {
@@ -3019,13 +3353,20 @@ void SENTINEL2Dataset::AddL1CL2ABandMetadata(SENTINEL2Level eLevel,
                                                      psIter = psIter->psNext )
         {
             if( psIter->eType != CXT_Element ||
-                !EQUAL(psIter->pszValue, "L2A_Scene_Classification_ID") )
+                (!EQUAL(psIter->pszValue, "L2A_Scene_Classification_ID") &&
+                 !EQUAL(psIter->pszValue, "Scene_Classification_ID") ) )
             {
                 continue;
             }
             const char* pszText = CPLGetXMLValue(psIter,
+                                        "SCENE_CLASSIFICATION_TEXT", nullptr);
+            if( pszText == nullptr)
+                pszText = CPLGetXMLValue(psIter,
                                         "L2A_SCENE_CLASSIFICATION_TEXT", nullptr);
             const char* pszIdx = CPLGetXMLValue(psIter,
+                                        "SCENE_CLASSIFICATION_INDEX", nullptr);
+            if( pszIdx == nullptr )
+                pszIdx = CPLGetXMLValue(psIter,
                                         "L2A_SCENE_CLASSIFICATION_INDEX", nullptr);
             if( pszText && pszIdx && atoi(pszIdx) >= 0 && atoi(pszIdx) < 100 )
             {
@@ -3053,6 +3394,7 @@ void SENTINEL2Dataset::AddL1CL2ABandMetadata(SENTINEL2Level eLevel,
 
 SENTINEL2Dataset* SENTINEL2Dataset::CreateL1CL2ADataset(
                 SENTINEL2Level eLevel,
+                SENTINEL2ProductType pType,
                 bool bIsSafeCompact,
                 const std::vector<CPLString>& aosGranuleList,
                 const std::vector<L1CSafeCompatGranuleDescription>& aoL1CSafeCompactGranuleList,
@@ -3064,7 +3406,8 @@ SENTINEL2Dataset* SENTINEL2Dataset::CreateL1CL2ADataset(
                 bool bAlpha,
                 const std::vector<CPLString>& aosBands,
                 int nSaturatedVal,
-                int nNodataVal)
+                int nNodataVal,
+                const CPLString& osProductURI)
 {
 
     /* Iterate over granule metadata to know the layer extent */
@@ -3212,7 +3555,7 @@ SENTINEL2Dataset* SENTINEL2Dataset::CreateL1CL2ADataset(
             const SENTINEL2GranuleInfo& oGranuleInfo = aosGranuleInfoList[iSrc];
             CPLString osTile;
 
-            if( bIsSafeCompact )
+            if( bIsSafeCompact && eLevel != SENTINEL2_L2A )
             {
                 if( bIsTCI )
                 {
@@ -3236,8 +3579,18 @@ SENTINEL2Dataset* SENTINEL2Dataset::CreateL1CL2ADataset(
                         oGranuleInfo.osPath,
                         CPLGetFilename(oGranuleInfo.osPath),
                         osBandName,
+                        osProductURI,
                         bIsPreview,
                         (eLevel == SENTINEL2_L1C) ? 0 : nSubDSPrecision);
+                if( bIsSafeCompact && eLevel == SENTINEL2_L2A &&
+                    pType == MSI2Ap && osTile.size() >= 34 )
+                {
+                    osTile.insert(osTile.size() - 34, "L2A_");
+                }
+                if( bIsTCI && osTile.size() >= 14 )
+                {
+                    osTile.replace(osTile.size() - 11, 3, "TCI");
+                }
             }
 
             bool bTileFound = false;
@@ -3416,6 +3769,7 @@ GDALDataset* SENTINEL2Dataset::OpenL1CTileSubdataset( GDALOpenInfo * poOpenInfo
 
     std::vector<CPLString> aosNonJP2Files;
     SENTINEL2Dataset* poDS = CreateL1CL2ADataset(SENTINEL2_L1C,
+                                                 MSI2A,
                                                  false, // bIsSafeCompact
                                                  aosGranuleList,
                                                  std::vector<L1CSafeCompatGranuleDescription>(),
@@ -3427,7 +3781,8 @@ GDALDataset* SENTINEL2Dataset::OpenL1CTileSubdataset( GDALOpenInfo * poOpenInfo
                                                  bAlpha,
                                                  aosBands,
                                                  nSaturatedVal,
-                                                 nNodataVal);
+                                                 nNodataVal,
+                                                 CPLString());
     if( poDS == nullptr )
     {
         delete poTmpDS;

From 1f32f6fdbfd2fd352047db41d316d8afbe3c3319 Mon Sep 17 00:00:00 2001
From: Even Rouault <even.rouault@spatialys.com>
Date: Fri, 30 Nov 2018 01:05:06 +0100
Subject: [PATCH 091/488] gdal2tiles: rename 'tilesize' and 'tileSize'
 variables to 'tile_size' to have uniform spelling, and fix exception
 (suggested by @psusmars, fixes #1127)

---
 gdal/swig/python/scripts/gdal2tiles.py | 160 ++++++++++++-------------
 1 file changed, 80 insertions(+), 80 deletions(-)

diff --git a/gdal/swig/python/scripts/gdal2tiles.py b/gdal/swig/python/scripts/gdal2tiles.py
index 668abeda1f6c..37eb380ff1f8 100755
--- a/gdal/swig/python/scripts/gdal2tiles.py
+++ b/gdal/swig/python/scripts/gdal2tiles.py
@@ -207,11 +207,11 @@ class GlobalMercator(object):
                  AUTHORITY["EPSG","9001"]]]
     """
 
-    def __init__(self, tileSize=256):
+    def __init__(self, tile_size=256):
         "Initialize the TMS Global Mercator pyramid"
-        self.tileSize = tileSize
-        self.initialResolution = 2 * math.pi * 6378137 / self.tileSize
-        # 156543.03392804062 for tileSize 256 pixels
+        self.tile_size = tile_size
+        self.initialResolution = 2 * math.pi * 6378137 / self.tile_size
+        # 156543.03392804062 for tile_size 256 pixels
         self.originShift = 2 * math.pi * 6378137 / 2.0
         # 20037508.342789244
 
@@ -252,14 +252,14 @@ def MetersToPixels(self, mx, my, zoom):
     def PixelsToTile(self, px, py):
         "Returns a tile covering region in given pixel coordinates"
 
-        tx = int(math.ceil(px / float(self.tileSize)) - 1)
-        ty = int(math.ceil(py / float(self.tileSize)) - 1)
+        tx = int(math.ceil(px / float(self.tile_size)) - 1)
+        ty = int(math.ceil(py / float(self.tile_size)) - 1)
         return tx, ty
 
     def PixelsToRaster(self, px, py, zoom):
         "Move the origin of pixel coordinates to top-left corner"
 
-        mapSize = self.tileSize << zoom
+        mapSize = self.tile_size << zoom
         return px, mapSize - py
 
     def MetersToTile(self, mx, my, zoom):
@@ -271,8 +271,8 @@ def MetersToTile(self, mx, my, zoom):
     def TileBounds(self, tx, ty, zoom):
         "Returns bounds of the given tile in EPSG:3857 coordinates"
 
-        minx, miny = self.PixelsToMeters(tx * self.tileSize, ty * self.tileSize, zoom)
-        maxx, maxy = self.PixelsToMeters((tx + 1) * self.tileSize, (ty + 1) * self.tileSize, zoom)
+        minx, miny = self.PixelsToMeters(tx * self.tile_size, ty * self.tile_size, zoom)
+        maxx, maxy = self.PixelsToMeters((tx + 1) * self.tile_size, (ty + 1) * self.tile_size, zoom)
         return (minx, miny, maxx, maxy)
 
     def TileLatLonBounds(self, tx, ty, zoom):
@@ -287,7 +287,7 @@ def TileLatLonBounds(self, tx, ty, zoom):
     def Resolution(self, zoom):
         "Resolution (meters/pixel) for given zoom level (measured at Equator)"
 
-        # return (2 * math.pi * 6378137) / (self.tileSize * 2**zoom)
+        # return (2 * math.pi * 6378137) / (self.tile_size * 2**zoom)
         return self.initialResolution / (2**zoom)
 
     def ZoomForPixelSize(self, pixelSize):
@@ -356,17 +356,17 @@ class GlobalGeodetic(object):
        WMS, KML    Web Clients, Google Earth  TileMapService
     """
 
-    def __init__(self, tmscompatible, tileSize=256):
-        self.tileSize = tileSize
+    def __init__(self, tmscompatible, tile_size=256):
+        self.tile_size = tile_size
         if tmscompatible is not None:
             # Defaults the resolution factor to 0.703125 (2 tiles @ level 0)
             # Adhers to OSGeo TMS spec
             # http://wiki.osgeo.org/wiki/Tile_Map_Service_Specification#global-geodetic
-            self.resFact = 180.0 / self.tileSize
+            self.resFact = 180.0 / self.tile_size
         else:
             # Defaults the resolution factor to 1.40625 (1 tile @ level 0)
             # Adheres OpenLayers, MapProxy, etc default resolution for WMTS
-            self.resFact = 360.0 / self.tileSize
+            self.resFact = 360.0 / self.tile_size
 
     def LonLatToPixels(self, lon, lat, zoom):
         "Converts lon/lat to pixel coordinates in given zoom of the EPSG:4326 pyramid"
@@ -379,8 +379,8 @@ def LonLatToPixels(self, lon, lat, zoom):
     def PixelsToTile(self, px, py):
         "Returns coordinates of the tile covering region in pixel coordinates"
 
-        tx = int(math.ceil(px / float(self.tileSize)) - 1)
-        ty = int(math.ceil(py / float(self.tileSize)) - 1)
+        tx = int(math.ceil(px / float(self.tile_size)) - 1)
+        ty = int(math.ceil(py / float(self.tile_size)) - 1)
         return tx, ty
 
     def LonLatToTile(self, lon, lat, zoom):
@@ -406,10 +406,10 @@ def TileBounds(self, tx, ty, zoom):
         "Returns bounds of the given tile"
         res = self.resFact / 2**zoom
         return (
-            tx * self.tileSize * res - 180,
-            ty * self.tileSize * res - 90,
-            (tx + 1) * self.tileSize * res - 180,
-            (ty + 1) * self.tileSize * res - 90
+            tx * self.tile_size * res - 180,
+            ty * self.tile_size * res - 90,
+            (tx + 1) * self.tile_size * res - 180,
+            (ty + 1) * self.tile_size * res - 90
         )
 
     def TileLatLonBounds(self, tx, ty, zoom):
@@ -424,13 +424,13 @@ class Zoomify(object):
     ----------------------------------------
     """
 
-    def __init__(self, width, height, tilesize=256, tileformat='jpg'):
+    def __init__(self, width, height, tile_size=256, tileformat='jpg'):
         """Initialization of the Zoomify tile tree"""
 
-        self.tilesize = tilesize
+        self.tile_size = tile_size
         self.tileformat = tileformat
         imagesize = (width, height)
-        tiles = (math.ceil(width / tilesize), math.ceil(height / tilesize))
+        tiles = (math.ceil(width / tile_size), math.ceil(height / tile_size))
 
         # Size (in tiles) for each tier of pyramid.
         self.tierSizeInTiles = []
@@ -440,9 +440,9 @@ def __init__(self, width, height, tilesize=256, tileformat='jpg'):
         self.tierImageSize = []
         self.tierImageSize.append(imagesize)
 
-        while (imagesize[0] > tilesize or imagesize[1] > tilesize):
+        while (imagesize[0] > tile_size or imagesize[1] > tile_size):
             imagesize = (math.floor(imagesize[0] / 2), math.floor(imagesize[1] / 2))
-            tiles = (math.ceil(imagesize[0] / tilesize), math.ceil(imagesize[1] / tilesize))
+            tiles = (math.ceil(imagesize[0] / tile_size), math.ceil(imagesize[1] / tile_size))
             self.tierSizeInTiles.append(tiles)
             self.tierImageSize.append(imagesize)
 
@@ -484,7 +484,7 @@ def exit_with_error(message, details=""):
     sys.exit(2)
 
 
-def generate_kml(tx, ty, tz, tileext, tilesize, tileswne, options, children=None, **args):
+def generate_kml(tx, ty, tz, tileext, tile_size, tileswne, options, children=None, **args):
     """
     Template for the KML. Returns filled string.
     """
@@ -493,13 +493,13 @@ def generate_kml(tx, ty, tz, tileext, tilesize, tileswne, options, children=None
 
     args['tx'], args['ty'], args['tz'] = tx, ty, tz
     args['tileformat'] = tileext
-    if 'tilesize' not in args:
-        args['tilesize'] = tilesize
+    if 'tile_size' not in args:
+        args['tile_size'] = tile_size
 
     if 'minlodpixels' not in args:
-        args['minlodpixels'] = int(args['tilesize'] / 2)
+        args['minlodpixels'] = int(args['tile_size'] / 2)
     if 'maxlodpixels' not in args:
-        args['maxlodpixels'] = int(args['tilesize'] * 8)
+        args['maxlodpixels'] = int(args['tile_size'] * 8)
     if children == []:
         args['maxlodpixels'] = -1
 
@@ -599,7 +599,7 @@ def scale_query_to_tile(dsquery, dstile, tiledriver, options, tilefilename=''):
     """Scales down query dataset to the tile dataset"""
 
     querysize = dsquery.RasterXSize
-    tilesize = dstile.RasterXSize
+    tile_size = dstile.RasterXSize
     tilebands = dstile.RasterCount
 
     if options.resampling == 'average':
@@ -621,7 +621,7 @@ def scale_query_to_tile(dsquery, dstile, tiledriver, options, tilefilename=''):
             array[:, :, i] = gdalarray.BandReadAsArray(dsquery.GetRasterBand(i + 1),
                                                        0, 0, querysize, querysize)
         im = Image.fromarray(array, 'RGBA')     # Always four bands
-        im1 = im.resize((tilesize, tilesize), Image.ANTIALIAS)
+        im1 = im.resize((tile_size, tile_size), Image.ANTIALIAS)
         if os.path.exists(tilefilename):
             im0 = Image.open(tilefilename)
             im1 = Image.composite(im1, im0, im1)
@@ -645,8 +645,8 @@ def scale_query_to_tile(dsquery, dstile, tiledriver, options, tilefilename=''):
             gdal_resampling = gdal.GRA_Lanczos
 
         # Other algorithms are implemented by gdal.ReprojectImage().
-        dsquery.SetGeoTransform((0.0, tilesize / float(querysize), 0.0, 0.0, 0.0,
-                                 tilesize / float(querysize)))
+        dsquery.SetGeoTransform((0.0, tile_size / float(querysize), 0.0, 0.0, 0.0,
+                                 tile_size / float(querysize)))
         dstile.SetGeoTransform((0.0, 1.0, 0.0, 0.0, 0.0, 1.0))
 
         res = gdal.ReprojectImage(dsquery, dstile, None, None, gdal_resampling)
@@ -897,7 +897,7 @@ def create_base_tile(tile_job_info, tile_detail, queue=None):
     dataBandsCount = tile_job_info.nb_data_bands
     output = tile_job_info.output_file_path
     tileext = tile_job_info.tile_extension
-    tilesize = tile_job_info.tile_size
+    tile_size = tile_job_info.tile_size
     options = tile_job_info.options
 
     tilebands = dataBandsCount + 1
@@ -929,7 +929,7 @@ def create_base_tile(tile_job_info, tile_detail, queue=None):
     # Tile dataset in memory
     tilefilename = os.path.join(
         output, str(tz), str(tx), "%s.%s" % (ty, tileext))
-    dstile = mem_drv.Create('', tilesize, tilesize, tilebands)
+    dstile = mem_drv.Create('', tile_size, tile_size, tilebands)
 
     data = alpha = None
 
@@ -937,8 +937,8 @@ def create_base_tile(tile_job_info, tile_detail, queue=None):
         print("\tReadRaster Extent: ",
               (rx, ry, rxsize, rysize), (wx, wy, wxsize, wysize))
 
-    # Query is in 'nearest neighbour' but can be bigger in then the tilesize
-    # We scale down the query to the tilesize by supplied algorithm.
+    # Query is in 'nearest neighbour' but can be bigger in then the tile_size
+    # We scale down the query to the tile_size by supplied algorithm.
 
     if rxsize != 0 and rysize != 0 and wxsize != 0 and wysize != 0:
         alpha = alphaband.ReadRaster(rx, ry, rxsize, rysize, wxsize, wysize)
@@ -953,7 +953,7 @@ def create_base_tile(tile_job_info, tile_detail, queue=None):
     # The tile in memory is a transparent file by default. Write pixel values into it if
     # any
     if data:
-        if tilesize == querysize:
+        if tile_size == querysize:
             # Use the ReadRaster result directly in tiles ('nearest neighbour' query)
             dstile.WriteRaster(wx, wy, wxsize, wysize, data,
                                band_list=list(range(1, dataBandsCount + 1)))
@@ -964,7 +964,7 @@ def create_base_tile(tile_job_info, tile_detail, queue=None):
             # nearest neighbour)
             # TODO: Use directly 'near' for WaveLet files
         else:
-            # Big ReadRaster query in memory scaled to the tilesize - all but 'near'
+            # Big ReadRaster query in memory scaled to the tile_size - all but 'near'
             # algo
             dsquery = mem_drv.Create('', querysize, querysize, tilebands)
             # TODO: fill the null value in case a tile without alpha is produced (now
@@ -1365,7 +1365,7 @@ def __init__(self, input_file, output_folder, options):
         self.in_srs_wkt = None
 
         # Tile format
-        self.tilesize = 256
+        self.tile_size = 256
         self.tiledriver = 'PNG'
         self.tileext = 'png'
         self.tmp_dir = tempfile.mkdtemp()
@@ -1379,7 +1379,7 @@ def __init__(self, input_file, output_folder, options):
         self.scaledquery = True
         # How big should be query window be for scaling down
         # Later on reset according the chosen resampling algorightm
-        self.querysize = 4 * self.tilesize
+        self.querysize = 4 * self.tile_size
 
         # Should we use Read on the input file for generating overview tiles?
         # Note: Modified later by open_input()
@@ -1391,10 +1391,10 @@ def __init__(self, input_file, output_folder, options):
         self.options = options
 
         if self.options.resampling == 'near':
-            self.querysize = self.tilesize
+            self.querysize = self.tile_size
 
         elif self.options.resampling == 'bilinear':
-            self.querysize = self.tilesize * 2
+            self.querysize = self.tile_size * 2
 
         # User specified zoom levels
         self.tminz = None
@@ -1574,7 +1574,7 @@ def open_input(self):
                     self.out_gt[1] *
                     max(self.warped_input_dataset.RasterXSize,
                         self.warped_input_dataset.RasterYSize) /
-                    float(self.tilesize))
+                    float(self.tile_size))
 
             # Get the maximal zoom level
             # (closest possible zoom level up on the resolution of raster)
@@ -1618,7 +1618,7 @@ def open_input(self):
                     self.out_gt[1] *
                     max(self.warped_input_dataset.RasterXSize,
                         self.warped_input_dataset.RasterYSize) /
-                    float(self.tilesize))
+                    float(self.tile_size))
 
             # Get the maximal zoom level
             # (closest possible zoom level up on the resolution of raster)
@@ -1634,8 +1634,8 @@ def log2(x):
                 return math.log10(x) / math.log10(2)
 
             self.nativezoom = int(
-                max(math.ceil(log2(self.warped_input_dataset.RasterXSize / float(self.tilesize))),
-                    math.ceil(log2(self.warped_input_dataset.RasterYSize / float(self.tilesize)))))
+                max(math.ceil(log2(self.warped_input_dataset.RasterXSize / float(self.tile_size))),
+                    math.ceil(log2(self.warped_input_dataset.RasterYSize / float(self.tile_size)))))
 
             if self.options.verbose:
                 print("Native zoom of the raster:", self.nativezoom)
@@ -1652,7 +1652,7 @@ def log2(x):
             self.tminmax = list(range(0, self.tmaxz + 1))
             self.tsize = list(range(0, self.tmaxz + 1))
             for tz in range(0, self.tmaxz + 1):
-                tsize = 2.0**(self.nativezoom - tz) * self.tilesize
+                tsize = 2.0**(self.nativezoom - tz) * self.tile_size
                 tminx, tminy = 0, 0
                 tmaxx = int(math.ceil(self.warped_input_dataset.RasterXSize / tsize)) - 1
                 tmaxy = int(math.ceil(self.warped_input_dataset.RasterYSize / tsize)) - 1
@@ -1665,10 +1665,10 @@ def log2(x):
 
                 def rastertileswne(x, y, z):
                     pixelsizex = (2**(self.tmaxz - z) * self.out_gt[1])       # X-pixel size in level
-                    west = self.out_gt[0] + x * self.tilesize * pixelsizex
-                    east = west + self.tilesize * pixelsizex
-                    south = self.ominy + y * self.tilesize * pixelsizex
-                    north = south + self.tilesize * pixelsizex
+                    west = self.out_gt[0] + x * self.tile_size * pixelsizex
+                    east = west + self.tile_size * pixelsizex
+                    south = self.ominy + y * self.tile_size * pixelsizex
+                    north = south + self.tile_size * pixelsizex
                     if not self.isepsg4326:
                         # Transformation to EPSG:4326 (WGS84 datum)
                         west, south = ct.TransformPoint(west, south)[:2]
@@ -1765,7 +1765,7 @@ def generate_metadata(self):
                         os.path.exists(os.path.join(self.output_folder, 'doc.kml'))):
                     with open(os.path.join(self.output_folder, 'doc.kml'), 'wb') as f:
                         f.write(generate_kml(
-                            None, None, None, self.tileext, self.tilesize, self.tileswne,
+                            None, None, None, self.tileext, self.tile_size, self.tileswne,
                             self.options, children
                         ).encode('utf-8'))
 
@@ -1843,11 +1843,11 @@ def generate_base_tiles(self):
 
                 else:     # 'raster' profile:
 
-                    tsize = int(self.tsize[tz])   # tilesize in raster coordinates for actual zoom
+                    tsize = int(self.tsize[tz])   # tile_size in raster coordinates for actual zoom
                     xsize = self.warped_input_dataset.RasterXSize     # size of the raster in pixels
                     ysize = self.warped_input_dataset.RasterYSize
                     if tz >= self.nativezoom:
-                        querysize = self.tilesize
+                        querysize = self.tile_size
 
                     rx = (tx) * tsize
                     rxsize = 0
@@ -1864,10 +1864,10 @@ def generate_base_tiles(self):
                     ry = ysize - (ty * tsize) - rysize
 
                     wx, wy = 0, 0
-                    wxsize = int(rxsize / float(tsize) * self.tilesize)
-                    wysize = int(rysize / float(tsize) * self.tilesize)
-                    if wysize != self.tilesize:
-                        wy = self.tilesize - wysize
+                    wxsize = int(rxsize / float(tsize) * self.tile_size)
+                    wysize = int(rysize / float(tsize) * self.tile_size)
+                    if wysize != self.tile_size:
+                        wy = self.tile_size - wysize
 
                 # Read the source raster if anything is going inside the tile as per the computed
                 # geo_query
@@ -1884,7 +1884,7 @@ def generate_base_tiles(self):
             output_file_path=self.output_folder,
             tile_extension=self.tileext,
             tile_driver=self.tiledriver,
-            tile_size=self.tilesize,
+            tile_size=self.tile_size,
             kml=self.kml,
             tminmax=self.tminmax,
             tminz=self.tminz,
@@ -1947,13 +1947,13 @@ def generate_tilemapresource(self):
         """
         Template for tilemapresource.xml. Returns filled string. Expected variables:
           title, north, south, east, west, isepsg4326, projection, publishurl,
-          zoompixels, tilesize, tileformat, profile
+          zoompixels, tile_size, tileformat, profile
         """
 
         args = {}
         args['title'] = self.options.title
         args['south'], args['west'], args['north'], args['east'] = self.swne
-        args['tilesize'] = self.tilesize
+        args['tile_size'] = self.tile_size
         args['tileformat'] = self.tileext
         args['publishurl'] = self.options.url
         args['profile'] = self.options.profile
@@ -1976,7 +1976,7 @@ def generate_tilemapresource(self):
       <SRS>%(srs)s</SRS>
       <BoundingBox minx="%(west).14f" miny="%(south).14f" maxx="%(east).14f" maxy="%(north).14f"/>
       <Origin x="%(west).14f" y="%(south).14f"/>
-      <TileFormat width="%(tilesize)d" height="%(tilesize)d" mime-type="image/%(tileformat)s" extension="%(tileformat)s"/>
+      <TileFormat width="%(tile_size)d" height="%(tile_size)d" mime-type="image/%(tileformat)s" extension="%(tileformat)s"/>
       <TileSets profile="%(profile)s">
 """ % args    # noqa
         for z in range(self.tminz, self.tmaxz + 1):
@@ -1998,7 +1998,7 @@ def generate_googlemaps(self):
         """
         Template for googlemaps.html implementing Overlay of tiles for 'mercator' profile.
         It returns filled string. Expected variables:
-        title, googlemapskey, north, south, east, west, minzoom, maxzoom, tilesize, tileformat,
+        title, googlemapskey, north, south, east, west, minzoom, maxzoom, tile_size, tileformat,
         publishurl
         """
         args = {}
@@ -2007,7 +2007,7 @@ def generate_googlemaps(self):
         args['south'], args['west'], args['north'], args['east'] = self.swne
         args['minzoom'] = self.tminz
         args['maxzoom'] = self.tmaxz
-        args['tilesize'] = self.tilesize
+        args['tile_size'] = self.tile_size
         args['tileformat'] = self.tileext
         args['publishurl'] = self.options.url
         args['copyright'] = self.options.copyright
@@ -2295,7 +2295,7 @@ def generate_leaflet(self):
         """
         Template for leaflet.html implementing overlay of tiles for 'mercator' profile.
         It returns filled string. Expected variables:
-        title, north, south, east, west, minzoom, maxzoom, tilesize, tileformat, publishurl
+        title, north, south, east, west, minzoom, maxzoom, tile_size, tileformat, publishurl
         """
 
         args = {}
@@ -2307,7 +2307,7 @@ def generate_leaflet(self):
         args['minzoom'] = self.tminz
         args['maxzoom'] = self.tmaxz
         args['beginzoom'] = self.tmaxz
-        args['tilesize'] = self.tilesize  # not used
+        args['tile_size'] = self.tile_size  # not used
         args['tileformat'] = self.tileext
         args['publishurl'] = self.options.url  # not used
         args['copyright'] = self.options.copyright.replace('"', '\\"')
@@ -2427,7 +2427,7 @@ def generate_openlayers(self):
         Template for openlayers.html implementing overlay of available Spherical Mercator layers.
 
         It returns filled string. Expected variables:
-        title, bingkey, north, south, east, west, minzoom, maxzoom, tilesize, tileformat, publishurl
+        title, bingkey, north, south, east, west, minzoom, maxzoom, tile_size, tileformat, publishurl
         """
 
         args = {}
@@ -2436,7 +2436,7 @@ def generate_openlayers(self):
         args['south'], args['west'], args['north'], args['east'] = self.swne
         args['minzoom'] = self.tminz
         args['maxzoom'] = self.tmaxz
-        args['tilesize'] = self.tilesize
+        args['tile_size'] = self.tile_size
         args['tileformat'] = self.tileext
         args['publishurl'] = self.options.url
         args['copyright'] = self.options.copyright
@@ -2638,8 +2638,8 @@ def generate_openlayers(self):
               function getURL(bounds) {
                   bounds = this.adjustBounds(bounds);
                   var res = this.getServerResolution();
-                  var x = Math.round((bounds.left - this.tileOrigin.lon) / (res * this.tileSize.w));
-                  var y = Math.round((bounds.bottom - this.tileOrigin.lat) / (res * this.tileSize.h));
+                  var x = Math.round((bounds.left - this.tileOrigin.lon) / (res * this.tile_size.w));
+                  var y = Math.round((bounds.bottom - this.tileOrigin.lat) / (res * this.tile_size.h));
                   var z = this.getServerZoom();
                   if (this.map.baseLayer.CLASS_NAME === 'OpenLayers.Layer.Bing') {
                       z+=1;
@@ -2662,8 +2662,8 @@ def generate_openlayers(self):
               function getURL(bounds) {
                   bounds = this.adjustBounds(bounds);
                   var res = this.getServerResolution();
-                  var x = Math.round((bounds.left - this.tileOrigin.lon) / (res * this.tileSize.w));
-                  var y = Math.round((bounds.bottom - this.tileOrigin.lat) / (res * this.tileSize.h));
+                  var x = Math.round((bounds.left - this.tileOrigin.lon) / (res * this.tile_size.w));
+                  var y = Math.round((bounds.bottom - this.tileOrigin.lat) / (res * this.tile_size.h));
                   var z = this.getServerZoom()%(tmsoffset)s;
                   var path = this.serviceVersion + "/" + this.layername + "/" + z + "/" + x + "/" + y + "." + this.type;
                   var url = this.url;
@@ -2683,8 +2683,8 @@ def generate_openlayers(self):
               function getURL(bounds) {
                   bounds = this.adjustBounds(bounds);
                   var res = this.getServerResolution();
-                  var x = Math.round((bounds.left - this.tileOrigin.lon) / (res * this.tileSize.w));
-                  var y = Math.round((bounds.bottom - this.tileOrigin.lat) / (res * this.tileSize.h));
+                  var x = Math.round((bounds.left - this.tileOrigin.lon) / (res * this.tile_size.w));
+                  var y = Math.round((bounds.bottom - this.tileOrigin.lat) / (res * this.tile_size.h));
                   var z = this.getServerZoom();
                   var path = this.serviceVersion + "/" + this.layername + "/" + z + "/" + x + "/" + y + "." + this.type;
                   var url = this.url;
@@ -2815,10 +2815,10 @@ def get_tile_swne(tile_job_info, options):
 
             def rastertileswne(x, y, z):
                 pixelsizex = (2 ** (tile_job_info.tmaxz - z) * tile_job_info.out_geo_trans[1])
-                west = tile_job_info.out_geo_trans[0] + x * tile_job_info.tilesize * pixelsizex
-                east = west + tile_job_info.tilesize * pixelsizex
-                south = tile_job_info.ominy + y * tile_job_info.tilesize * pixelsizex
-                north = south + tile_job_info.tilesize * pixelsizex
+                west = tile_job_info.out_geo_trans[0] + x * tile_job_info.tile_size * pixelsizex
+                east = west + tile_job_info.tile_size * pixelsizex
+                south = tile_job_info.ominy + y * tile_job_info.tile_size * pixelsizex
+                north = south + tile_job_info.tile_size * pixelsizex
                 if not tile_job_info.is_epsg_4326:
                     # Transformation to EPSG:4326 (WGS84 datum)
                     west, south = ct.TransformPoint(west, south)[:2]

From 444c9ae25b192a87ac1bf81747a6d75acff36a32 Mon Sep 17 00:00:00 2001
From: Even Rouault <even.rouault@spatialys.com>
Date: Sat, 1 Dec 2018 14:11:29 +0100
Subject: [PATCH 092/488] Overview / RasterIO resampling: do not use nodata
 value as a valid output value (complementary fix to
 41babc2c7cb61ab76c6a3772735b20e6610eca52)

---
 autotest/gdrivers/vrtpansharpen.py |  4 +-
 gdal/gcore/gdaldataset.cpp         | 14 +++++++
 gdal/gcore/overview.cpp            | 66 +++++++++++++++++++++++-------
 3 files changed, 68 insertions(+), 16 deletions(-)

diff --git a/autotest/gdrivers/vrtpansharpen.py b/autotest/gdrivers/vrtpansharpen.py
index 677c0ec86843..b7f7f6195e61 100755
--- a/autotest/gdrivers/vrtpansharpen.py
+++ b/autotest/gdrivers/vrtpansharpen.py
@@ -1681,7 +1681,7 @@ def vrtpansharpen_9():
         gdaltest.post_reason('fail')
         return 'fail'
     cs = [vrt_ds.GetRasterBand(i + 1).Checksum() for i in range(vrt_ds.RasterCount)]
-    if cs not in ([4640, 9158, 54450],):
+    if cs not in ([6950, 11745, 8965],):
         gdaltest.post_reason('fail')
         print(cs)
         return 'fail'
@@ -1723,7 +1723,7 @@ def vrtpansharpen_9():
         gdaltest.post_reason('fail')
         return 'fail'
     cs = [vrt_ds.GetRasterBand(i + 1).Checksum() for i in range(vrt_ds.RasterCount)]
-    if cs not in ([4640, 9158, 54450],):
+    if cs not in ([6950, 11745, 8965],):
         gdaltest.post_reason('fail')
         print(cs)
         return 'fail'
diff --git a/gdal/gcore/gdaldataset.cpp b/gdal/gcore/gdaldataset.cpp
index b6a8b629def6..5af8f4ddc7e9 100644
--- a/gdal/gcore/gdaldataset.cpp
+++ b/gdal/gcore/gdaldataset.cpp
@@ -1588,6 +1588,8 @@ CPLErr GDALDataset::IRasterIO( GDALRWFlag eRWFlag,
         int nFirstMaskFlags = 0;
         GDALRasterBand *poFirstMaskBand = nullptr;
         int nOKBands = 0;
+
+        // Check if bands share the same mask band
         for( int i = 0; i < nBandCount; ++i )
         {
             GDALRasterBand *poBand = GetRasterBand(panBandMap[i]);
@@ -1610,6 +1612,12 @@ CPLErr GDALDataset::IRasterIO( GDALRWFlag eRWFlag,
             {
                 eFirstBandDT = eDT;
                 nFirstMaskFlags = poBand->GetMaskFlags();
+                if( nFirstMaskFlags == GMF_NODATA)
+                {
+                    // The dataset-level resampling code is not ready for nodata
+                    // Fallback to band-level resampling
+                    break;
+                }
                 poFirstMaskBand = poBand->GetMaskBand();
             }
             else
@@ -1619,6 +1627,12 @@ CPLErr GDALDataset::IRasterIO( GDALRWFlag eRWFlag,
                     break;
                 }
                 int nMaskFlags = poBand->GetMaskFlags();
+                if( nMaskFlags == GMF_NODATA)
+                {
+                    // The dataset-level resampling code is not ready for nodata
+                    // Fallback to band-level resampling
+                    break;
+                }
                 GDALRasterBand *poMaskBand = poBand->GetMaskBand();
                 if( nFirstMaskFlags == GMF_ALL_VALID &&
                     nMaskFlags == GMF_ALL_VALID )
diff --git a/gdal/gcore/overview.cpp b/gdal/gcore/overview.cpp
index cc0c2b6636e5..8c7b83d9a8c3 100644
--- a/gdal/gcore/overview.cpp
+++ b/gdal/gcore/overview.cpp
@@ -1879,32 +1879,70 @@ GDALResampleChunk32R_ConvolutionT( double dfXRatioDstToSrc,
 {
     if( !bHasNoData )
         fNoDataValue = 0.0f;
+    const auto dstDataType = papoDstBands[0]->GetRasterDataType();
     const float fReplacementVal = GetReplacementValueIfNoData(
-        papoDstBands[0]->GetRasterDataType(), bHasNoData, fNoDataValue);
+        dstDataType, bHasNoData, fNoDataValue);
     // cppcheck-suppress unreadVariable
-    const int isIntegerDT = GDALDataTypeIsInteger(papoDstBands[0]->GetRasterDataType());
+    const int isIntegerDT = GDALDataTypeIsInteger(dstDataType);
     const auto nNodataValueInt64 = static_cast<GInt64>(fNoDataValue);
 
+    // TODO: we should have some generic function to do this.
+    float fDstMin = -std::numeric_limits<float>::max();
+    float fDstMax = std::numeric_limits<float>::max();
+    if( dstDataType == GDT_Byte )
+    {
+        fDstMin = std::numeric_limits<GByte>::min();
+        fDstMax = std::numeric_limits<GByte>::max();
+    }
+    else if( dstDataType == GDT_UInt16 )
+    {
+        fDstMin = std::numeric_limits<GUInt16>::min();
+        fDstMax = std::numeric_limits<GUInt16>::max();
+    }
+    else if( dstDataType == GDT_Int16 )
+    {
+        fDstMin = std::numeric_limits<GInt16>::min();
+        fDstMax = std::numeric_limits<GInt16>::max();
+    }
+    else if( dstDataType == GDT_UInt32 )
+    {
+        fDstMin = static_cast<float>(std::numeric_limits<GUInt32>::min());
+        fDstMax = static_cast<float>(std::numeric_limits<GUInt32>::max());
+    }
+    else if( dstDataType == GDT_Int32 )
+    {
+        fDstMin = static_cast<float>(std::numeric_limits<GInt32>::min());
+        fDstMax = static_cast<float>(std::numeric_limits<GInt32>::max());
+    }
+
     auto replaceValIfNodata =
-        [bHasNoData, isIntegerDT, nNodataValueInt64, fNoDataValue, fReplacementVal](float fVal)
+        [bHasNoData, isIntegerDT, fDstMin, fDstMax, nNodataValueInt64,
+         fNoDataValue, fReplacementVal](float fVal)
     {
-        if( bHasNoData )
+        if( !bHasNoData )
+            return fVal;
+
+        // Clamp value before comparing to nodata: this is only needed for
+        // kernels with negative weights (Lanczos)
+        float fClamped = fVal;
+        if( fClamped < fDstMin )
+            fClamped = fDstMin;
+        else if( fClamped > fDstMax )
+            fClamped = fDstMax;
+        if( isIntegerDT )
         {
-            if( isIntegerDT )
-            {
-                if( nNodataValueInt64 == static_cast<GInt64>(fVal) )
-                {
-                    // Do not use the nodata value
-                    return fReplacementVal;
-                }
-            }
-            else if( fNoDataValue == fVal )
+            if( nNodataValueInt64 == static_cast<GInt64>(std::round(fClamped)) )
             {
                 // Do not use the nodata value
                 return fReplacementVal;
             }
         }
-        return fVal;
+        else if( fNoDataValue == fClamped )
+        {
+            // Do not use the nodata value
+            return fReplacementVal;
+        }
+        return fClamped;
     };
 
 /* -------------------------------------------------------------------- */

From 06f3b061a9a2f0a89c71e4806817fd2680e3537d Mon Sep 17 00:00:00 2001
From: Even Rouault <even.rouault@spatialys.com>
Date: Sat, 1 Dec 2018 14:51:42 +0100
Subject: [PATCH 093/488] Fix spelling (and unintended profanity) [ci skip]

---
 gdal/frmts/gtiff/gt_wkt_srs.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/gdal/frmts/gtiff/gt_wkt_srs.cpp b/gdal/frmts/gtiff/gt_wkt_srs.cpp
index d03e7cd3552e..9f5e7d71a15a 100644
--- a/gdal/frmts/gtiff/gt_wkt_srs.cpp
+++ b/gdal/frmts/gtiff/gt_wkt_srs.cpp
@@ -2333,7 +2333,7 @@ int GTIFSetFromOGISDefnEx( GTIF * psGTIF, const char *pszOGCWKT,
     {
         // Anything we can't map, store as an ESRI PE string with a citation key.
         char *pszPEString = nullptr;
-        // We shit a bit, but if we have a custom_proj4, do not morph to ESRI
+        // We cheat a bit, but if we have a custom_proj4, do not morph to ESRI
         // so as to keep the EXTENSION PROJ4 node
         if( !(bUnknownProjection &&
               poSRS->GetExtension("PROJCS", "PROJ4", nullptr) != nullptr) )

From a4cdcbd7fdd8249962485d15c4fb3c86d9e83260 Mon Sep 17 00:00:00 2001
From: Even Rouault <even.rouault@spatialys.com>
Date: Sat, 1 Dec 2018 15:08:36 +0100
Subject: [PATCH 094/488] fix cppcheck false positive

---
 gdal/gcore/overview.cpp | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/gdal/gcore/overview.cpp b/gdal/gcore/overview.cpp
index 8c7b83d9a8c3..eeeb1b16bcea 100644
--- a/gdal/gcore/overview.cpp
+++ b/gdal/gcore/overview.cpp
@@ -1911,7 +1911,9 @@ GDALResampleChunk32R_ConvolutionT( double dfXRatioDstToSrc,
     }
     else if( dstDataType == GDT_Int32 )
     {
+        // cppcheck-suppress unreadVariable
         fDstMin = static_cast<float>(std::numeric_limits<GInt32>::min());
+        // cppcheck-suppress unreadVariable
         fDstMax = static_cast<float>(std::numeric_limits<GInt32>::max());
     }
 

From 1e082b59d067cf2edf5713e15101c0b369d37e9a Mon Sep 17 00:00:00 2001
From: drons <drons@list.ru>
Date: Sun, 2 Dec 2018 22:16:23 +0300
Subject: [PATCH 095/488] OGR: Restore font field at OGRStyleSymbol Partial
 revert b98fd4b51bda2f5de0b8c5876b704e5a2fa3ca95

---
 gdal/ogr/ogr_core.h          | 2 +-
 gdal/ogr/ogr_featurestyle.h  | 4 ++++
 gdal/ogr/ogrfeaturestyle.cpp | 2 +-
 3 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/gdal/ogr/ogr_core.h b/gdal/ogr/ogr_core.h
index adcbb14c25d7..fe2b53e3007b 100644
--- a/gdal/ogr/ogr_core.h
+++ b/gdal/ogr/ogr_core.h
@@ -873,7 +873,7 @@ typedef enum ogr_style_tool_param_symbol_id
     OGRSTSymbolPerp     = 7, /**< Perpendicular */
     OGRSTSymbolOffset   = 8, /**< Offset */
     OGRSTSymbolPriority = 9, /**< Priority */
-    OGRSTSymbolFontName = 10, /**< OBSOLETE; do not use */
+    OGRSTSymbolFontName = 10, /**< Font name */
     OGRSTSymbolOColor   = 11, /**< Outline color */
 #ifndef DOXYGEN_SKIP
     OGRSTSymbolLast     = 12
diff --git a/gdal/ogr/ogr_featurestyle.h b/gdal/ogr/ogr_featurestyle.h
index fd6bdc3750ac..2cf653c3b91a 100644
--- a/gdal/ogr/ogr_featurestyle.h
+++ b/gdal/ogr/ogr_featurestyle.h
@@ -399,6 +399,10 @@ class CPL_DLL OGRStyleSymbol : public OGRStyleTool
     void SetPerp(double dfPerp){SetParamDbl(OGRSTSymbolPerp,dfPerp  );}
     int  Priority(GBool &bDefault){return GetParamNum(OGRSTSymbolPriority,bDefault);}
     void SetPriority(int nPriority){SetParamNum(OGRSTSymbolPriority,nPriority);}
+    const char *FontName(GBool &bDefault)
+        {return GetParamStr(OGRSTSymbolFontName,bDefault);}
+    void SetFontName(const char *pszFontName)
+        {SetParamStr(OGRSTSymbolFontName,pszFontName);}
     const char *OColor(GBool &bDefault){return GetParamStr(OGRSTSymbolOColor,bDefault);}
     void SetOColor(const char *pszColor){SetParamStr(OGRSTSymbolOColor,pszColor);}
 
diff --git a/gdal/ogr/ogrfeaturestyle.cpp b/gdal/ogr/ogrfeaturestyle.cpp
index b2e2bb063e9f..b46c238f132e 100644
--- a/gdal/ogr/ogrfeaturestyle.cpp
+++ b/gdal/ogr/ogrfeaturestyle.cpp
@@ -89,7 +89,7 @@ static const OGRStyleParamId asStyleSymbol[] =
     {OGRSTSymbolPerp, "dp", TRUE, OGRSTypeDouble},
     {OGRSTSymbolOffset, "di", TRUE, OGRSTypeDouble},
     {OGRSTSymbolPriority, "l", FALSE, OGRSTypeInteger},
-    {-1, nullptr, FALSE, OGRSTypeUnused}, // was OGRSTSymbolFontName
+    {OGRSTSymbolFontName, "f", FALSE, OGRSTypeString},
     {OGRSTSymbolOColor, "o", FALSE, OGRSTypeString}
 };
 

From 387984b9f4eab1a3ac4e729ee944b36191997a88 Mon Sep 17 00:00:00 2001
From: drons <drons@list.ru>
Date: Sun, 2 Dec 2018 22:21:35 +0300
Subject: [PATCH 096/488] MITAB: Expose symbol's font family to restored
 OGRStyleSymbol 'f' field

---
 autotest/ogr/data/all_geoms.mif.golden.csv   | 2 +-
 gdal/ogr/ogrsf_frmts/mitab/mitab_feature.cpp | 3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/autotest/ogr/data/all_geoms.mif.golden.csv b/autotest/ogr/data/all_geoms.mif.golden.csv
index d9f3297ab009..1a621a580706 100644
--- a/autotest/ogr/data/all_geoms.mif.golden.csv
+++ b/autotest/ogr/data/all_geoms.mif.golden.csv
@@ -1,7 +1,7 @@
 WKT,ogr_style
 "POINT (0 1)","SYMBOL(a:0,c:#000000,s:12pt,id:""mapinfo-sym-35,ogr-sym-10"")"
 "POINT (2 3)","SYMBOL(a:0,c:#000000,s:1pt,id:""mapinfo-sym-35,ogr-sym-10"")"
-"POINT (4 5)","SYMBOL(a:30,c:#000001,s:2pt,id:""mapinfo-sym-99,ogr-sym-1"")"
+"POINT (4 5)","SYMBOL(a:30,c:#000001,s:2pt,id:""mapinfo-sym-99,ogr-sym-1"",f:foo)"
 "LINESTRING (0 1,2 3)","PEN(w:1px,c:#000000,id:""mapinfo-pen-2,ogr-pen-0"")"
 "LINESTRING (0 1,2 3)","PEN(w:1px,c:#000000,id:""mapinfo-pen-2,ogr-pen-0"")"
 "LINESTRING (0 1,2 3)","PEN(w:1px,c:#000000,id:""mapinfo-pen-2,ogr-pen-0"")"
diff --git a/gdal/ogr/ogrsf_frmts/mitab/mitab_feature.cpp b/gdal/ogr/ogrsf_frmts/mitab/mitab_feature.cpp
index 7f9c02fd20b7..4a65c485ca10 100644
--- a/gdal/ogr/ogrsf_frmts/mitab/mitab_feature.cpp
+++ b/gdal/ogr/ogrsf_frmts/mitab/mitab_feature.cpp
@@ -1538,7 +1538,8 @@ const char *TABFontPoint::GetStyleString() const
             outlineColor = "";
 
         m_pszStyleString =
-            CPLStrdup(CPLSPrintf("%s%s)", pszSymbolStyleString, outlineColor));
+            CPLStrdup(CPLSPrintf("%s%s,f:%s)", pszSymbolStyleString,
+            outlineColor, GetFontNameRef()));
         CPLFree(pszSymbolStyleString);
     }
 

From 20063634f94e16873499dd62646bcf2259a85743 Mon Sep 17 00:00:00 2001
From: drons <drons@list.ru>
Date: Mon, 3 Dec 2018 21:16:42 +0300
Subject: [PATCH 097/488] MITAB: Add double quotes around symbol font name

---
 autotest/ogr/data/all_geoms.mif.golden.csv   | 2 +-
 gdal/ogr/ogrsf_frmts/mitab/mitab_feature.cpp | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/autotest/ogr/data/all_geoms.mif.golden.csv b/autotest/ogr/data/all_geoms.mif.golden.csv
index 1a621a580706..ed61f26b4b77 100644
--- a/autotest/ogr/data/all_geoms.mif.golden.csv
+++ b/autotest/ogr/data/all_geoms.mif.golden.csv
@@ -1,7 +1,7 @@
 WKT,ogr_style
 "POINT (0 1)","SYMBOL(a:0,c:#000000,s:12pt,id:""mapinfo-sym-35,ogr-sym-10"")"
 "POINT (2 3)","SYMBOL(a:0,c:#000000,s:1pt,id:""mapinfo-sym-35,ogr-sym-10"")"
-"POINT (4 5)","SYMBOL(a:30,c:#000001,s:2pt,id:""mapinfo-sym-99,ogr-sym-1"",f:foo)"
+"POINT (4 5)","SYMBOL(a:30,c:#000001,s:2pt,id:""mapinfo-sym-99,ogr-sym-1"",f:""foo"")"
 "LINESTRING (0 1,2 3)","PEN(w:1px,c:#000000,id:""mapinfo-pen-2,ogr-pen-0"")"
 "LINESTRING (0 1,2 3)","PEN(w:1px,c:#000000,id:""mapinfo-pen-2,ogr-pen-0"")"
 "LINESTRING (0 1,2 3)","PEN(w:1px,c:#000000,id:""mapinfo-pen-2,ogr-pen-0"")"
diff --git a/gdal/ogr/ogrsf_frmts/mitab/mitab_feature.cpp b/gdal/ogr/ogrsf_frmts/mitab/mitab_feature.cpp
index 4a65c485ca10..1844469a05f7 100644
--- a/gdal/ogr/ogrsf_frmts/mitab/mitab_feature.cpp
+++ b/gdal/ogr/ogrsf_frmts/mitab/mitab_feature.cpp
@@ -1538,7 +1538,7 @@ const char *TABFontPoint::GetStyleString() const
             outlineColor = "";
 
         m_pszStyleString =
-            CPLStrdup(CPLSPrintf("%s%s,f:%s)", pszSymbolStyleString,
+            CPLStrdup(CPLSPrintf("%s%s,f:\"%s\")", pszSymbolStyleString,
             outlineColor, GetFontNameRef()));
         CPLFree(pszSymbolStyleString);
     }

From 76c48879ddcedfda840401c9fe30c5d087df6eed Mon Sep 17 00:00:00 2001
From: drons <drons@list.ru>
Date: Mon, 3 Dec 2018 21:29:09 +0300
Subject: [PATCH 098/488] OGR: Update feature style documentation related to
 point symbols

---
 gdal/ogr/ogr_feature_style.html | 16 +++++++++++++++-
 1 file changed, 15 insertions(+), 1 deletion(-)

diff --git a/gdal/ogr/ogr_feature_style.html b/gdal/ogr/ogr_feature_style.html
index 030de8410838..572a51148847 100644
--- a/gdal/ogr/ogr_feature_style.html
+++ b/gdal/ogr/ogr_feature_style.html
@@ -10,12 +10,14 @@ <H1>
 GDAL - Feature Style Specification</H1></CENTER>
 
 <CENTER>
-  <H2>Version 0.015 - 2018-01-08</H2>
+  <H2>Version 0.016 - 2018-12-03</H2>
 </CENTER>
 
 <HR WIDTH=50%>
 <H2>REVISION HISTORY</H2>
 <UL>
+<LI><B>Version 0.016 - 2018-12-03 - Andrew Sudorgin</B><BR>
+    Restored and documented font property for point symbols
 <LI><B>Version 0.015 - 2018-01-08 - Alan Thomas</B><BR>
     Update outdated material; minor changes to BRUSH 'id' and LABEL 't', 'bo', 'it', 'un', 'st'; clarify BRUSH 'fc', 'bc', SYMBOL 'o' and LABEL 's', 'w', 'p'
 <LI><B>Version 0.014 - 2011-07-24 - Even Rouault</B><BR>
@@ -686,6 +688,18 @@ <H3>
 higher priority ones are drawn on top.
 <BR>If priority level is unspecified, the default is 1.</TD>
 </TR>
+
+  <TR>
+    <TD ALIGN=CENTER>f</TD>
+    <TD><B>Font Name</B> -
+      Comma-delimited list of fonts names.  Works like the CSS font-family
+property: the list of font names is scanned until a known font name is encountered.
+<BR>
+      Example: SYMBOL(c:#00FF00,s:12pt,id:"mapinfo-sym-75",f:"MapInfo_Cartographic")
+
+    </TD>
+  </TR>
+
 </TABLE>
 
 <H3>

From 71134e6ee371423d833364de9410e82107efd88d Mon Sep 17 00:00:00 2001
From: Even Rouault <even.rouault@spatialys.com>
Date: Mon, 3 Dec 2018 22:31:05 +0100
Subject: [PATCH 099/488] GPKG: improve warning message (fixes #1131)

---
 gdal/ogr/ogrsf_frmts/gpkg/ogrgeopackagetablelayer.cpp | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/gdal/ogr/ogrsf_frmts/gpkg/ogrgeopackagetablelayer.cpp b/gdal/ogr/ogrsf_frmts/gpkg/ogrgeopackagetablelayer.cpp
index 21491fd35f68..c280005b9e36 100644
--- a/gdal/ogr/ogrsf_frmts/gpkg/ogrgeopackagetablelayer.cpp
+++ b/gdal/ogr/ogrsf_frmts/gpkg/ogrgeopackagetablelayer.cpp
@@ -1664,7 +1664,12 @@ void OGRGeoPackageTableLayer::CheckGeometryType( OGRFeature *poFeature )
             {
                 CPLError(CE_Warning, CPLE_AppDefined,
                          "A geometry of type %s is inserted into layer %s "
-                         "of geometry type %s, which is not allowed. "
+                         "of geometry type %s, which is not normally allowed "
+                         "by the GeoPackage specification, but the driver will "
+                         "however do it. "
+                         "To create a conformant GeoPackage, if using ogr2ogr, "
+                         "the -nlt option can be used to override the layer "
+                         "geometry type. "
                          "This warning will no longer be emitted for this "
                          "combination of layer and feature geometry type.",
                          OGRToOGCGeomType(eGeomType),

From 207e408ac146becd6f9907c547e070fc49fd6fa9 Mon Sep 17 00:00:00 2001
From: drons <drons@list.ru>
Date: Tue, 4 Dec 2018 21:41:22 +0300
Subject: [PATCH 100/488] MITAB: Add "font-sym-%d" symbol style for a font
 based symbols

---
 autotest/ogr/data/all_geoms.mif.golden.csv   |  2 +-
 gdal/ogr/ogr_feature_style.html              |  4 +-
 gdal/ogr/ogrsf_frmts/mitab/mitab.h           |  3 +-
 gdal/ogr/ogrsf_frmts/mitab/mitab_feature.cpp | 50 ++++++++++++--------
 4 files changed, 37 insertions(+), 22 deletions(-)

diff --git a/autotest/ogr/data/all_geoms.mif.golden.csv b/autotest/ogr/data/all_geoms.mif.golden.csv
index ed61f26b4b77..70d7f8aed78b 100644
--- a/autotest/ogr/data/all_geoms.mif.golden.csv
+++ b/autotest/ogr/data/all_geoms.mif.golden.csv
@@ -1,7 +1,7 @@
 WKT,ogr_style
 "POINT (0 1)","SYMBOL(a:0,c:#000000,s:12pt,id:""mapinfo-sym-35,ogr-sym-10"")"
 "POINT (2 3)","SYMBOL(a:0,c:#000000,s:1pt,id:""mapinfo-sym-35,ogr-sym-10"")"
-"POINT (4 5)","SYMBOL(a:30,c:#000001,s:2pt,id:""mapinfo-sym-99,ogr-sym-1"",f:""foo"")"
+"POINT (4 5)","SYMBOL(a:30,c:#000001,s:2pt,id:""font-sym-99,ogr-sym-9"",f:""foo"")"
 "LINESTRING (0 1,2 3)","PEN(w:1px,c:#000000,id:""mapinfo-pen-2,ogr-pen-0"")"
 "LINESTRING (0 1,2 3)","PEN(w:1px,c:#000000,id:""mapinfo-pen-2,ogr-pen-0"")"
 "LINESTRING (0 1,2 3)","PEN(w:1px,c:#000000,id:""mapinfo-pen-2,ogr-pen-0"")"
diff --git a/gdal/ogr/ogr_feature_style.html b/gdal/ogr/ogr_feature_style.html
index 572a51148847..e138e31afc29 100644
--- a/gdal/ogr/ogr_feature_style.html
+++ b/gdal/ogr/ogr_feature_style.html
@@ -608,7 +608,9 @@ <H3>
       <P>The following conventions will be used for common system-specific symbol ids:</P>
       <UL>
         <LI>&quot;bmp-filename.bmp&quot; for Windows BMP symbols
-
+        <LI>&quot;font-sym-%d&quot; for a font symbols,
+            where %d is a glyph number inside a font,
+            font family is defined by <B>f</B> style field.
       </UL>
       <P>Other conventions may be added in the future (such as vector symbols, WMF, etc).
       </TD>
diff --git a/gdal/ogr/ogrsf_frmts/mitab/mitab.h b/gdal/ogr/ogrsf_frmts/mitab/mitab.h
index 88a5934d8d14..6643941cd936 100644
--- a/gdal/ogr/ogrsf_frmts/mitab/mitab.h
+++ b/gdal/ogr/ogrsf_frmts/mitab/mitab.h
@@ -954,7 +954,7 @@ class ITABFeatureSymbol
     void        SetSymbolSize(GInt16 val)   { m_sSymbolDef.nPointSize = val;}
     void        SetSymbolColor(GInt32 clr)  { m_sSymbolDef.rgbColor = clr;}
 
-    const char *GetSymbolStyleString(double dfAngle = 0.0) const;
+    virtual const char *GetSymbolStyleString(double dfAngle = 0.0) const;
     void        SetSymbolFromStyleString(const char *pszStyleString);
 
     void        DumpSymbolDef(FILE *fpOut = nullptr);
@@ -1155,6 +1155,7 @@ class TABFontPoint final : public TABPoint,
     virtual int ReadGeometryFromMIFFile(MIDDATAFile *fp) override;
     virtual int WriteGeometryToMIFFile(MIDDATAFile *fp) override;
 
+    virtual const char *GetSymbolStyleString(double dfAngle = 0.0) const override;
     virtual const char *GetStyleString() const override;
 
     GBool       QueryFontStyle(TABFontStyle eStyleToQuery);
diff --git a/gdal/ogr/ogrsf_frmts/mitab/mitab_feature.cpp b/gdal/ogr/ogrsf_frmts/mitab/mitab_feature.cpp
index 1844469a05f7..6fbdc73dd070 100644
--- a/gdal/ogr/ogrsf_frmts/mitab/mitab_feature.cpp
+++ b/gdal/ogr/ogrsf_frmts/mitab/mitab_feature.cpp
@@ -1511,6 +1511,36 @@ void TABFontPoint::SetSymbolAngle(double dAngle)
     m_dAngle = dAngle;
 }
 
+/**********************************************************************
+ *                   TABFontPoint::GetSymbolStyleString()
+ *
+ *  Return a Symbol() string. All representations info for the Symbol are here.
+ **********************************************************************/
+const char* TABFontPoint::GetSymbolStyleString(double dfAngle) const
+{
+    /* Get the SymbolStyleString, and add the outline Color
+       (halo/border in MapInfo Symbol terminology) */
+    const char *outlineColor = nullptr;
+    if (m_nFontStyle & 16)
+        outlineColor = ",o:#000000";
+    else if (m_nFontStyle & 512)
+        outlineColor = ",o:#ffffff";
+    else
+        outlineColor = "";
+
+    int         nAngle = static_cast<int>(dfAngle);
+    const char* pszStyle;
+
+    pszStyle=CPLSPrintf("SYMBOL(a:%d,c:#%6.6x,s:%dpt,id:\"font-sym-%d,ogr-sym-9\"%s,f:\"%s\")",
+                        nAngle,
+                        m_sSymbolDef.rgbColor,
+                        m_sSymbolDef.nPointSize,
+                        m_sSymbolDef.nSymbolNo,
+                        outlineColor,
+                        GetFontNameRef());
+    return pszStyle;
+}
+
 /**********************************************************************
  *                   TABFontPoint::GetStyleString() const
  *
@@ -1522,25 +1552,7 @@ const char *TABFontPoint::GetStyleString() const
 {
     if (m_pszStyleString == nullptr)
     {
-        /* Get the SymbolStyleString, and add the outline Color
-           (halo/border in MapInfo Symbol terminology) */
-        char *pszSymbolStyleString =
-            CPLStrdup(GetSymbolStyleString(GetSymbolAngle()));
-        int nStyleStringlen = static_cast<int>(strlen(pszSymbolStyleString));
-        pszSymbolStyleString[nStyleStringlen - 1] = '\0';
-
-        const char *outlineColor = nullptr;
-        if (m_nFontStyle & 16)
-            outlineColor = ",o:#000000";
-        else if (m_nFontStyle & 512)
-            outlineColor = ",o:#ffffff";
-        else
-            outlineColor = "";
-
-        m_pszStyleString =
-            CPLStrdup(CPLSPrintf("%s%s,f:\"%s\")", pszSymbolStyleString,
-            outlineColor, GetFontNameRef()));
-        CPLFree(pszSymbolStyleString);
+        m_pszStyleString = CPLStrdup(GetSymbolStyleString(GetSymbolAngle()));
     }
 
     return m_pszStyleString;

From ad25ca25caa01bbc7d125b216c1119939330bc90 Mon Sep 17 00:00:00 2001
From: drons <drons@list.ru>
Date: Tue, 4 Dec 2018 22:17:28 +0300
Subject: [PATCH 101/488] MITAB: Add symbol font setup from style string

---
 gdal/ogr/ogrsf_frmts/mitab/mitab.h           |   2 +
 gdal/ogr/ogrsf_frmts/mitab/mitab_feature.cpp | 123 ++++++++++++-------
 2 files changed, 79 insertions(+), 46 deletions(-)

diff --git a/gdal/ogr/ogrsf_frmts/mitab/mitab.h b/gdal/ogr/ogrsf_frmts/mitab/mitab.h
index 6643941cd936..bc36a67a006b 100644
--- a/gdal/ogr/ogrsf_frmts/mitab/mitab.h
+++ b/gdal/ogr/ogrsf_frmts/mitab/mitab.h
@@ -956,6 +956,7 @@ class ITABFeatureSymbol
 
     virtual const char *GetSymbolStyleString(double dfAngle = 0.0) const;
     void        SetSymbolFromStyleString(const char *pszStyleString);
+    virtual void SetSymbolFromStyle(OGRStyleSymbol* poSymbolStyle);
 
     void        DumpSymbolDef(FILE *fpOut = nullptr);
 };
@@ -1157,6 +1158,7 @@ class TABFontPoint final : public TABPoint,
 
     virtual const char *GetSymbolStyleString(double dfAngle = 0.0) const override;
     virtual const char *GetStyleString() const override;
+    virtual void SetSymbolFromStyle(OGRStyleSymbol* poSymbolStyle) override;
 
     GBool       QueryFontStyle(TABFontStyle eStyleToQuery);
     void        ToggleFontStyle(TABFontStyle eStyleToToggle, GBool bStatus);
diff --git a/gdal/ogr/ogrsf_frmts/mitab/mitab_feature.cpp b/gdal/ogr/ogrsf_frmts/mitab/mitab_feature.cpp
index 6fbdc73dd070..7f69caf5895a 100644
--- a/gdal/ogr/ogrsf_frmts/mitab/mitab_feature.cpp
+++ b/gdal/ogr/ogrsf_frmts/mitab/mitab_feature.cpp
@@ -1558,6 +1558,27 @@ const char *TABFontPoint::GetStyleString() const
     return m_pszStyleString;
 }
 
+void TABFontPoint::SetSymbolFromStyle(OGRStyleSymbol* poSymbolStyle)
+{
+    ITABFeatureSymbol::SetSymbolFromStyle(poSymbolStyle);
+
+    GBool bIsNull = 0;
+
+    // Try to set font glyph number
+    const char* pszSymbolId = poSymbolStyle->Id(bIsNull);
+    if((!bIsNull) && pszSymbolId && strstr(pszSymbolId, "font-sym-"))
+    {
+        const int nSymbolId = atoi(pszSymbolId+9);
+        SetSymbolNo(static_cast<GInt16>(nSymbolId));
+    }
+
+    const char* pszFontName = poSymbolStyle->FontName(bIsNull);
+    if((!bIsNull) && pszFontName)
+    {
+        SetFontName(pszFontName);
+    }
+}
+
 /*=====================================================================
  *                      class TABCustomPoint
  *====================================================================*/
@@ -8871,56 +8892,12 @@ const char *ITABFeatureSymbol::GetSymbolStyleString(double dfAngle) const
 /**********************************************************************
  *                   ITABFeatureSymbol::SetSymbolFromStyleString()
  *
- *  Set all Symbol var from a StyleString. Use StyleMgr to do so.
+ *  Set all Symbol var from a OGRStyleSymbol.
  **********************************************************************/
-void ITABFeatureSymbol::SetSymbolFromStyleString(const char *pszStyleString)
+void ITABFeatureSymbol::SetSymbolFromStyle(OGRStyleSymbol* poSymbolStyle)
 {
     GBool bIsNull = 0;
 
-    // Use the Style Manager to retrieve all the information we need.
-    OGRStyleMgr *poStyleMgr = new OGRStyleMgr(nullptr);
-    OGRStyleTool *poStylePart = nullptr;
-
-    // Init the StyleMgr with the StyleString.
-    poStyleMgr->InitStyleString(pszStyleString);
-
-    // Retrieve the Symbol info.
-    const int numParts = poStyleMgr->GetPartCount();
-    for( int i = 0; i < numParts; i++ )
-    {
-        poStylePart = poStyleMgr->GetPart(i);
-        if( poStylePart == nullptr )
-            continue;
-
-        if(poStylePart->GetType() == OGRSTCSymbol)
-        {
-            break;
-        }
-        else
-        {
-            delete poStylePart;
-            poStylePart = nullptr;
-        }
-    }
-
-    // If the no Symbol found, do nothing.
-    if(poStylePart == nullptr)
-    {
-        delete poStyleMgr;
-        return;
-    }
-
-    OGRStyleSymbol *poSymbolStyle = cpl::down_cast<OGRStyleSymbol*>(poStylePart);
-
-    // With Symbol, we always want to output points
-    //
-    // It's very important to set the output unit of the feature.
-    // The default value is meter. If we don't do it all numerical values
-    // will be assumed to be converted from the input unit to meter when we
-    // will get them via GetParam...() functions.
-    // See OGRStyleTool::Parse() for more details.
-    poSymbolStyle->SetUnit(OGRSTUPoints, (72.0 * 39.37));
-
     // Set the Symbol Id (SymbolNo)
     const char *pszSymbolId = poSymbolStyle->Id(bIsNull);
     if(bIsNull) pszSymbolId = nullptr;
@@ -8995,6 +8972,60 @@ void ITABFeatureSymbol::SetSymbolFromStyleString(const char *pszStyleString)
         int nSymbolColor = static_cast<int>(strtol(pszSymbolColor, nullptr, 16));
         SetSymbolColor(static_cast<GInt32>(nSymbolColor));
     }
+}
+
+/**********************************************************************
+ *                   ITABFeatureSymbol::SetSymbolFromStyleString()
+ *
+ *  Set all Symbol var from a StyleString. Use StyleMgr to do so.
+ **********************************************************************/
+void ITABFeatureSymbol::SetSymbolFromStyleString(const char *pszStyleString)
+{
+    // Use the Style Manager to retrieve all the information we need.
+    OGRStyleMgr *poStyleMgr = new OGRStyleMgr(nullptr);
+    OGRStyleTool *poStylePart = nullptr;
+
+    // Init the StyleMgr with the StyleString.
+    poStyleMgr->InitStyleString(pszStyleString);
+
+    // Retrieve the Symbol info.
+    const int numParts = poStyleMgr->GetPartCount();
+    for( int i = 0; i < numParts; i++ )
+    {
+        poStylePart = poStyleMgr->GetPart(i);
+        if( poStylePart == nullptr )
+            continue;
+
+        if(poStylePart->GetType() == OGRSTCSymbol)
+        {
+            break;
+        }
+        else
+        {
+            delete poStylePart;
+            poStylePart = nullptr;
+        }
+    }
+
+    // If the no Symbol found, do nothing.
+    if(poStylePart == nullptr)
+    {
+        delete poStyleMgr;
+        return;
+    }
+
+    OGRStyleSymbol *poSymbolStyle = cpl::down_cast<OGRStyleSymbol*>(poStylePart);
+
+    // With Symbol, we always want to output points
+    //
+    // It's very important to set the output unit of the feature.
+    // The default value is meter. If we don't do it all numerical values
+    // will be assumed to be converted from the input unit to meter when we
+    // will get them via GetParam...() functions.
+    // See OGRStyleTool::Parse() for more details.
+    poSymbolStyle->SetUnit(OGRSTUPoints, (72.0 * 39.37));
+
+    SetSymbolFromStyle(poSymbolStyle);
 
     delete poStyleMgr;
     delete poStylePart;

From 3cd611b1a20b629b8ab1e8d4a272ab4aaffd04d3 Mon Sep 17 00:00:00 2001
From: Even Rouault <even.rouault@spatialys.com>
Date: Tue, 4 Dec 2018 20:19:15 +0100
Subject: [PATCH 102/488] CPLOpenSSLCleanup(): reset callbacks to nullptr to
 avoid potential segfault

---
 gdal/port/cpl_http.cpp | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/gdal/port/cpl_http.cpp b/gdal/port/cpl_http.cpp
index dbedc291da2b..6a7feb1117f3 100644
--- a/gdal/port/cpl_http.cpp
+++ b/gdal/port/cpl_http.cpp
@@ -145,6 +145,8 @@ static void CPLOpenSSLCleanup()
         }
         CPLFree(pahSSLMutex);
         pahSSLMutex = nullptr;
+        CRYPTO_set_id_callback(nullptr);
+        CRYPTO_set_locking_callback(nullptr);
     }
 }
 

From a108bbcedcbd624f915301259d47551d03402376 Mon Sep 17 00:00:00 2001
From: drons <drons@list.ru>
Date: Tue, 4 Dec 2018 23:54:55 +0300
Subject: [PATCH 103/488] OGR: Update feature style documentation

---
 gdal/ogr/ogr_feature_style.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/gdal/ogr/ogr_feature_style.html b/gdal/ogr/ogr_feature_style.html
index e138e31afc29..0d9281b539ff 100644
--- a/gdal/ogr/ogr_feature_style.html
+++ b/gdal/ogr/ogr_feature_style.html
@@ -697,7 +697,7 @@ <H3>
       Comma-delimited list of fonts names.  Works like the CSS font-family
 property: the list of font names is scanned until a known font name is encountered.
 <BR>
-      Example: SYMBOL(c:#00FF00,s:12pt,id:"mapinfo-sym-75",f:"MapInfo_Cartographic")
+      Example: SYMBOL(c:#00FF00,s:12pt,id:"font-sym-75,ogr-sym-9",f:"MapInfo_Cartographic")
 
     </TD>
   </TR>

From c4da0061d84a3cf6008b02d033565b5a0a416c13 Mon Sep 17 00:00:00 2001
From: Sai Cheemalapati <saicheems@google.com>
Date: Fri, 30 Nov 2018 14:51:49 -0800
Subject: [PATCH 104/488] EEDA: Replace usage of deprecated paths/fields

---
 autotest/gdrivers/eedai.py       |  18 ++--
 autotest/ogr/ogr_eeda.py         | 164 +++++++++++++++++++++++++------
 gdal/frmts/eeda/drv_eeda.html    |  16 +--
 gdal/frmts/eeda/eeda.h           |   1 +
 gdal/frmts/eeda/eedacommon.cpp   |  45 ++++++++-
 gdal/frmts/eeda/eedadataset.cpp  |  77 ++++++++++-----
 gdal/frmts/eeda/eedaidataset.cpp |  16 +--
 gdal/frmts/eeda/frmt_eedai.html  |   7 +-
 8 files changed, 261 insertions(+), 83 deletions(-)

diff --git a/autotest/gdrivers/eedai.py b/autotest/gdrivers/eedai.py
index 6873636fe103..458880d9bab9 100644
--- a/autotest/gdrivers/eedai.py
+++ b/autotest/gdrivers/eedai.py
@@ -72,7 +72,7 @@ def eedai_2():
     if gdaltest.eedai_drv is None:
         return 'skip'
 
-    gdal.FileFromMemBuffer('/vsimem/ee/assets/image', json.dumps({
+    gdal.FileFromMemBuffer('/vsimem/ee/projects/earthengine-public/assets/image', json.dumps({
         'type': 'IMAGE',
         'properties':
         {
@@ -320,7 +320,7 @@ def eedai_2():
     npy_serialized += ''.encode('ascii').join(val for i in range(38 * 39))
 
     gdal.FileFromMemBuffer(
-        '/vsimem/ee/assets:getPixels&CUSTOMREQUEST=POST&POSTFIELDS={ "path": "image", "fileFormat": "NPY", "bandIds": [ "B1", "B9" ], "grid": { "affineTransform": { "translateX": 607500.0, "translateY": 4092480.0, "scaleX": 60.0, "scaleY": -60.0, "shearX": 0.0, "shearY": 0.0 }, "dimensions": { "width": 38, "height": 39 } } }', npy_serialized)
+        '/vsimem/ee/projects/earthengine-public/assets/image:getPixels&CUSTOMREQUEST=POST&POSTFIELDS={ "fileFormat": "NPY", "bandIds": [ "B1", "B9" ], "grid": { "affineTransform": { "translateX": 607500.0, "translateY": 4092480.0, "scaleX": 60.0, "scaleY": -60.0, "shearX": 0.0, "shearY": 0.0 }, "dimensions": { "width": 38, "height": 39 } } }', npy_serialized)
     got_data = ds.GetRasterBand(1).ReadRaster(1800, 1810, 1, 1)
     got_data = struct.unpack('h', got_data)[0]
     if got_data != 12345:
@@ -552,7 +552,7 @@ def eedai_4():
     if gdaltest.eedai_drv is None:
         return 'skip'
 
-    gdal.FileFromMemBuffer('/vsimem/ee/assets/image', json.dumps({
+    gdal.FileFromMemBuffer('/vsimem/ee/projects/earthengine-public/assets/image', json.dumps({
         'type': 'IMAGE',
         'bands':
         [
@@ -641,7 +641,7 @@ def eedai_4():
     gdal.Unlink('/vsimem/out.png')
 
     gdal.FileFromMemBuffer(
-        '/vsimem/ee/assets:getPixels&CUSTOMREQUEST=POST&POSTFIELDS={ "path": "image", "fileFormat": "PNG", "bandIds": [ "B1", "B2", "B3" ], "grid": { "affineTransform": { "translateX": 499980.0, "translateY": 4200000.0, "scaleX": 60.0, "scaleY": -60.0, "shearX": 0.0, "shearY": 0.0 }, "dimensions": { "width": 256, "height": 256 } } }', png_data)
+        '/vsimem/ee/projects/earthengine-public/assets/image:getPixels&CUSTOMREQUEST=POST&POSTFIELDS={ "fileFormat": "PNG", "bandIds": [ "B1", "B2", "B3" ], "grid": { "affineTransform": { "translateX": 499980.0, "translateY": 4200000.0, "scaleX": 60.0, "scaleY": -60.0, "shearX": 0.0, "shearY": 0.0 }, "dimensions": { "width": 256, "height": 256 } } }', png_data)
     got_data = ds.GetRasterBand(1).ReadRaster(0, 0, 1, 1)
     got_data = struct.unpack('B', got_data)[0]
     if got_data != 127:
@@ -668,7 +668,7 @@ def eedai_4():
 
     # Sub-sampled query
     gdal.FileFromMemBuffer(
-        '/vsimem/ee/assets:getPixels&CUSTOMREQUEST=POST&POSTFIELDS={ "path": "image", "fileFormat": "PNG", "bandIds": [ "B1", "B2", "B3" ], "grid": { "affineTransform": { "translateX": 499980.0, "translateY": 4200000.0, "scaleX": 120.0, "scaleY": -120.06557377049181, "shearX": 0.0, "shearY": 0.0 }, "dimensions": { "width": 256, "height": 256 } } }', png_data)
+        '/vsimem/ee/projects/earthengine-public/assets/image:getPixels&CUSTOMREQUEST=POST&POSTFIELDS={ "fileFormat": "PNG", "bandIds": [ "B1", "B2", "B3" ], "grid": { "affineTransform": { "translateX": 499980.0, "translateY": 4200000.0, "scaleX": 120.0, "scaleY": -120.06557377049181, "shearX": 0.0, "shearY": 0.0 }, "dimensions": { "width": 256, "height": 256 } } }', png_data)
     got_data = ds.GetRasterBand(1).ReadRaster(
         0, 0, 2, 2, buf_xsize=1, buf_ysize=1)
     got_data = struct.unpack('B', got_data)[0]
@@ -701,7 +701,7 @@ def eedai_geotiff():
     if gdaltest.eedai_drv is None:
         return 'skip'
 
-    gdal.FileFromMemBuffer('/vsimem/ee/assets/image', json.dumps({
+    gdal.FileFromMemBuffer('/vsimem/ee/projects/earthengine-public/assets/image', json.dumps({
         'type': 'IMAGE',
         'bands':
         [
@@ -744,7 +744,7 @@ def eedai_geotiff():
     gdal.Unlink('/vsimem/out.tif')
 
     gdal.FileFromMemBuffer(
-        '/vsimem/ee/assets:getPixels&CUSTOMREQUEST=POST&POSTFIELDS={ "path": "image", "fileFormat": "GEO_TIFF", "bandIds": [ "B1" ], "grid": { "affineTransform": { "translateX": 499980.0, "translateY": 4200000.0, "scaleX": 60.0, "scaleY": -60.0, "shearX": 0.0, "shearY": 0.0 }, "dimensions": { "width": 256, "height": 256 } } }', data)
+        '/vsimem/ee/projects/earthengine-public/assets/image:getPixels&CUSTOMREQUEST=POST&POSTFIELDS={ "fileFormat": "GEO_TIFF", "bandIds": [ "B1" ], "grid": { "affineTransform": { "translateX": 499980.0, "translateY": 4200000.0, "scaleX": 60.0, "scaleY": -60.0, "shearX": 0.0, "shearY": 0.0 }, "dimensions": { "width": 256, "height": 256 } } }', data)
     got_data = ds.GetRasterBand(1).ReadRaster(0, 0, 1, 1)
     got_data = struct.unpack('H', got_data)[0]
     if got_data != 12345:
@@ -782,7 +782,7 @@ def eedai_real_service():
         gdaltest.post_reason('fail')
         return 'fail'
     res = gdal.Info(ds, format='json')
-    expected = {'files': [], 'cornerCoordinates': {'upperRight': [415016.0, 4435536.0], 'lowerLeft': [408970.0, 4427936.0], 'lowerRight': [415016.0, 4427936.0], 'upperLeft': [408970.0, 4435536.0], 'center': [411993.0, 4431736.0]}, 'wgs84Extent': {'type': 'Polygon', 'coordinates': [[[-100.067433, 40.0651671], [-100.0663662, 39.9967049], [-99.9955511, 39.9973349], [-99.9965471, 40.0657986], [-100.067433, 40.0651671]]]}, 'description': 'EEDAI:USDA/NAIP/DOQQ/n_4010064_se_14_2_20070725', 'driverShortName': 'EEDAI', 'driverLongName': 'Earth Engine Data API Image', 'bands': [{'description': 'R', 'band': 1, 'colorInterpretation': 'Red', 'overviews': [{'size': [1511, 1900]}, {'size': [755, 950]}, {'size': [377, 475]}, {'size': [188, 237]}], 'type': 'Byte', 'block': [256, 256], 'metadata': {}}, {'description': 'G', 'band': 2, 'colorInterpretation': 'Green', 'overviews': [{'size': [1511, 1900]}, {'size': [755, 950]}, {'size': [377, 475]}, {'size': [188, 237]}], 'type': 'Byte', 'block': [256, 256], 'metadata': {}}, {'description': 'B', 'band': 3, 'colorInterpretation': 'Blue', 'overviews': [{'size': [1511, 1900]}, {'size': [755, 950]}, {'size': [377, 475]}, {'size': [188, 237]}], 'type': 'Byte', 'block': [256, 256], 'metadata': {}}], 'coordinateSystem': {'wkt': 'PROJCS["NAD83 / UTM zone 14N",\n    GEOGCS["NAD83",\n        DATUM["North_American_Datum_1983",\n            SPHEROID["GRS 1980",6378137,298.257222101,\n                AUTHORITY["EPSG","7019"]],\n            TOWGS84[0,0,0,0,0,0,0],\n            AUTHORITY["EPSG","6269"]],\n        PRIMEM["Greenwich",0,\n            AUTHORITY["EPSG","8901"]],\n        UNIT["degree",0.0174532925199433,\n            AUTHORITY["EPSG","9122"]],\n        AUTHORITY["EPSG","4269"]],\n    PROJECTION["Transverse_Mercator"],\n    PARAMETER["latitude_of_origin",0],\n    PARAMETER["central_meridian",-99],\n    PARAMETER["scale_factor",0.9996],\n    PARAMETER["false_easting",500000],\n    PARAMETER["false_northing",0],\n    UNIT["metre",1,\n        AUTHORITY["EPSG","9001"]],\n    AXIS["Easting",EAST],\n    AXIS["Northing",NORTH],\n    AUTHORITY["EPSG","26914"]]'}, 'geoTransform': [408970.0, 2.0, 0.0, 4435536.0, 0.0, -2.0], 'metadata': {'IMAGE_STRUCTURE': {'INTERLEAVE': 'PIXEL'}}, 'size': [3023, 3800]}
+    expected = {'files': [], 'cornerCoordinates': {'upperRight': [415016.0, 4435536.0], 'lowerLeft': [408970.0, 4427936.0], 'lowerRight': [415016.0, 4427936.0], 'upperLeft': [408970.0, 4435536.0], 'center': [411993.0, 4431736.0]}, 'wgs84Extent': {'type': 'Polygon', 'coordinates': [[]]}, 'description': 'EEDAI:USDA/NAIP/DOQQ/n_4010064_se_14_2_20070725', 'driverShortName': 'EEDAI', 'driverLongName': 'Earth Engine Data API Image', 'bands': [{'description': 'R', 'band': 1, 'colorInterpretation': 'Red', 'overviews': [{'size': [1511, 1900]}, {'size': [755, 950]}, {'size': [377, 475]}, {'size': [188, 237]}], 'type': 'Byte', 'block': [256, 256], 'metadata': {}}, {'description': 'G', 'band': 2, 'colorInterpretation': 'Green', 'overviews': [{'size': [1511, 1900]}, {'size': [755, 950]}, {'size': [377, 475]}, {'size': [188, 237]}], 'type': 'Byte', 'block': [256, 256], 'metadata': {}}, {'description': 'B', 'band': 3, 'colorInterpretation': 'Blue', 'overviews': [{'size': [1511, 1900]}, {'size': [755, 950]}, {'size': [377, 475]}, {'size': [188, 237]}], 'type': 'Byte', 'block': [256, 256], 'metadata': {}}], 'coordinateSystem': {'wkt': 'PROJCS["NAD83 / UTM zone 14N",\n    GEOGCS["NAD83",\n        DATUM["North_American_Datum_1983",\n            SPHEROID["GRS 1980",6378137,298.257222101,\n                AUTHORITY["EPSG","7019"]],\n            TOWGS84[0,0,0,0,0,0,0],\n            AUTHORITY["EPSG","6269"]],\n        PRIMEM["Greenwich",0,\n            AUTHORITY["EPSG","8901"]],\n        UNIT["degree",0.0174532925199433,\n            AUTHORITY["EPSG","9122"]],\n        AUTHORITY["EPSG","4269"]],\n    PROJECTION["Transverse_Mercator"],\n    PARAMETER["latitude_of_origin",0],\n    PARAMETER["central_meridian",-99],\n    PARAMETER["scale_factor",0.9996],\n    PARAMETER["false_easting",500000],\n    PARAMETER["false_northing",0],\n    UNIT["metre",1,\n        AUTHORITY["EPSG","9001"]],\n    AXIS["Easting",EAST],\n    AXIS["Northing",NORTH],\n    AUTHORITY["EPSG","26914"]]'}, 'geoTransform': [408970.0, 2.0, 0.0, 4435536.0, 0.0, -2.0], 'metadata': {'IMAGE_STRUCTURE': {'INTERLEAVE': 'PIXEL'}}, 'size': [3023, 3800]}
     if expected != res:
         gdaltest.post_reason('fail')
         print(res)
@@ -825,7 +825,7 @@ def eedai_cleanup():
     gdal.SetConfigOption('GOA2_NOW', None)
     gdal.SetConfigOption('GOOGLE_APPLICATION_CREDENTIALS', gdaltest.GOOGLE_APPLICATION_CREDENTIALS)
 
-    gdal.Unlink('/vsimem/ee/assets/image')
+    gdal.Unlink('/vsimem/ee/projects/earthengine-public/assets/image')
     gdal.RmdirRecursive('/vsimem/ee/')
 
     return 'success'
diff --git a/autotest/ogr/ogr_eeda.py b/autotest/ogr/ogr_eeda.py
index 516890e63855..0e7cc177c1a1 100644
--- a/autotest/ogr/ogr_eeda.py
+++ b/autotest/ogr/ogr_eeda.py
@@ -63,7 +63,7 @@ def eeda_2():
     if ogrtest.eeda_drv is None:
         return 'skip'
 
-    gdal.FileFromMemBuffer('/vsimem/ee/assets:listImages?parentPath=collection&pageSize=1', json.dumps({
+    gdal.FileFromMemBuffer('/vsimem/ee/projects/earthengine-public/assets/collection:listImages?pageSize=1', json.dumps({
         'assets': [
             {
                 'properties':
@@ -95,7 +95,7 @@ def eeda_2():
         gdaltest.post_reason('fail')
         return 'fail'
 
-    if lyr.GetLayerDefn().GetFieldCount() != 6 + 7 + 4:
+    if lyr.GetLayerDefn().GetFieldCount() != 8 + 7 + 4:
         gdaltest.post_reason('fail')
         print(lyr.GetLayerDefn().GetFieldCount())
         return 'fail'
@@ -110,10 +110,12 @@ def eeda_2():
         print(lyr.GetFeatureCount())
         return 'fail'
 
-    gdal.FileFromMemBuffer('/vsimem/ee/assets:listImages?parentPath=collection', json.dumps({
+    gdal.FileFromMemBuffer('/vsimem/ee/projects/earthengine-public/assets/collection:listImages', json.dumps({
         'assets': [
             {
-                'path': 'first_feature',
+                'name': 'projects/earthengine-public/assets/collection/first_feature',
+                'id': 'collection/first_feature',
+                'path': 'collection/first_feature',
                 'time': '2017-01-02T12:34:56.789Z',
                 'updateTime': '2017-01-03T12:34:56.789Z',
                 'sizeBytes': 1,
@@ -152,15 +154,17 @@ def eeda_2():
                 ]
             },
             {
-                'path': 'second_feature'
+                'name': 'projects/earthengine-public/assets/collection/second_feature'
             }
         ],
         'nextPageToken': 'myToken'
     }))
 
     f = lyr.GetNextFeature()
-    if f.GetField('path') != 'first_feature' or \
-       f.GetField('gdal_dataset') != 'EEDAI:first_feature' or \
+    if f.GetField('name') != 'projects/earthengine-public/assets/collection/first_feature' or \
+       f.GetField('id') != 'collection/first_feature' or \
+       f.GetField('path') != 'collection/first_feature' or \
+       f.GetField('gdal_dataset') != 'EEDAI:projects/earthengine-public/assets/collection/first_feature' or \
        f.GetField('time') != '2017/01/02 12:34:56.789+00' or \
        f.GetField('updateTime') != '2017/01/03 12:34:56.789+00' or \
        f.GetField('sizeBytes') != 1 or \
@@ -182,21 +186,21 @@ def eeda_2():
         return 'fail'
 
     f = lyr.GetNextFeature()
-    if f.GetField('path') != 'second_feature':
+    if f.GetField('name') != 'projects/earthengine-public/assets/collection/second_feature':
         gdaltest.post_reason('fail')
         f.DumpReadable()
         return 'fail'
 
-    gdal.FileFromMemBuffer('/vsimem/ee/assets:listImages?parentPath=collection&pageToken=myToken', json.dumps({
+    gdal.FileFromMemBuffer('/vsimem/ee/projects/earthengine-public/assets/collection:listImages?pageToken=myToken', json.dumps({
         'assets': [
             {
-                'path': 'third_feature'
+                'name': 'projects/earthengine-public/assets/collection/third_feature'
             }
         ]
     }))
 
     f = lyr.GetNextFeature()
-    if f.GetField('path') != 'third_feature':
+    if f.GetField('name') != 'projects/earthengine-public/assets/collection/third_feature':
         gdaltest.post_reason('fail')
         f.DumpReadable()
         return 'fail'
@@ -209,23 +213,23 @@ def eeda_2():
     lyr.ResetReading()
 
     f = lyr.GetNextFeature()
-    if f.GetField('path') != 'first_feature':
+    if f.GetField('name') != 'projects/earthengine-public/assets/collection/first_feature':
         gdaltest.post_reason('fail')
         f.DumpReadable()
         return 'fail'
 
     lyr.SetAttributeFilter('EEDA:raw_filter')
 
-    gdal.FileFromMemBuffer('/vsimem/ee/assets:listImages?parentPath=collection&filter=raw%5Ffilter', json.dumps({
+    gdal.FileFromMemBuffer('/vsimem/ee/projects/earthengine-public/assets/collection:listImages?filter=raw%5Ffilter', json.dumps({
         'assets': [
             {
-                'path': 'raw_filter'
+                'name': 'projects/earthengine-public/assets/collection/raw_filter'
             }
         ]
     }))
 
     f = lyr.GetNextFeature()
-    if f.GetField('path') != 'raw_filter':
+    if f.GetField('name') != 'projects/earthengine-public/assets/collection/raw_filter':
         gdaltest.post_reason('fail')
         return 'fail'
 
@@ -241,11 +245,11 @@ def eeda_2():
                            "string_field IN ('bar', 'baz') AND " +
                            "NOT( int_field IN (0) OR double_field IN (3.5) )")
 
-    ogrtest.eeda_drv_tmpfile = '/vsimem/ee/assets:listImages?parentPath=collection&region=%7B%20%22type%22%3A%20%22Polygon%22%2C%20%22coordinates%22%3A%20%5B%20%5B%20%5B%20%2D180%2E0%2C%20%2D90%2E0%20%5D%2C%20%5B%20%2D180%2E0%2C%2090%2E0%20%5D%2C%20%5B%20180%2E0%2C%2090%2E0%20%5D%2C%20%5B%20180%2E0%2C%20%2D90%2E0%20%5D%2C%20%5B%20%2D180%2E0%2C%20%2D90%2E0%20%5D%20%5D%20%5D%20%7D&filter=%28%28%28%28%28%28%28string%5Ffield%20%3D%20%22bar%22%20AND%20int%5Ffield%20%3E%200%29%20AND%20int%5Ffield%20%3C%202%29%20AND%20int64%5Ffield%20%3E%3D%200%29%20AND%20int64%5Ffield%20%3C%3D%209999999999999%29%20AND%20double%5Ffield%20%21%3D%203%2E5%29%20AND%20string%5Ffield%20%3D%20%22bar%22%20OR%20string%5Ffield%20%3D%20%22baz%22%29%20AND%20%28NOT%20%28int%5Ffield%20%3D%200%20OR%20double%5Ffield%20%3D%203%2E5%29%29%29&startTime=1980%2D01%2D01T00%3A00%3A00Z&endTime=2100%2D01%2D01T00%3A00%3A00Z'
+    ogrtest.eeda_drv_tmpfile = '/vsimem/ee/projects/earthengine-public/assets/collection:listImages?region=%7B%20%22type%22%3A%20%22Polygon%22%2C%20%22coordinates%22%3A%20%5B%20%5B%20%5B%20%2D180%2E0%2C%20%2D90%2E0%20%5D%2C%20%5B%20%2D180%2E0%2C%2090%2E0%20%5D%2C%20%5B%20180%2E0%2C%2090%2E0%20%5D%2C%20%5B%20180%2E0%2C%20%2D90%2E0%20%5D%2C%20%5B%20%2D180%2E0%2C%20%2D90%2E0%20%5D%20%5D%20%5D%20%7D&filter=%28%28%28%28%28%28%28string%5Ffield%20%3D%20%22bar%22%20AND%20int%5Ffield%20%3E%200%29%20AND%20int%5Ffield%20%3C%202%29%20AND%20int64%5Ffield%20%3E%3D%200%29%20AND%20int64%5Ffield%20%3C%3D%209999999999999%29%20AND%20double%5Ffield%20%21%3D%203%2E5%29%20AND%20string%5Ffield%20%3D%20%22bar%22%20OR%20string%5Ffield%20%3D%20%22baz%22%29%20AND%20%28NOT%20%28int%5Ffield%20%3D%200%20OR%20double%5Ffield%20%3D%203%2E5%29%29%29&startTime=1980%2D01%2D01T00%3A00%3A00Z&endTime=2100%2D01%2D01T00%3A00%3A00Z'
     gdal.FileFromMemBuffer(ogrtest.eeda_drv_tmpfile, json.dumps({
         'assets': [
             {
-                'path': 'filtered_feature',
+                'name': 'projects/earthengine-public/assets/collection/filtered_feature',
                 'time': '2017-01-02T12:34:56.789Z',
                 'updateTime': '2017-01-03T12:34:56.789Z',
                 'sizeBytes': 1,
@@ -260,7 +264,7 @@ def eeda_2():
                 }
             },
             {
-                'path': 'second_feature'
+                'name': 'projects/earthengine-public/assets/collection/second_feature'
             }
         ]
     }))
@@ -270,7 +274,7 @@ def eeda_2():
     f = lyr.GetNextFeature()
     gdal.Unlink(ogrtest.eeda_drv_tmpfile)
 
-    if f.GetField('path') != 'filtered_feature':
+    if f.GetField('name') != 'projects/earthengine-public/assets/collection/filtered_feature':
         gdaltest.post_reason('fail')
         return 'fail'
 
@@ -279,15 +283,15 @@ def eeda_2():
     # Test time equality with second granularity
     lyr.SetAttributeFilter("time = '1980-01-01T00:00:00Z'")
 
-    ogrtest.eeda_drv_tmpfile = '/vsimem/ee/assets:listImages?parentPath=collection&startTime=1980%2D01%2D01T00%3A00%3A00Z&endTime=1980%2D01%2D01T00%3A00%3A01Z'
+    ogrtest.eeda_drv_tmpfile = '/vsimem/ee/projects/earthengine-public/assets/collection:listImages?startTime=1980%2D01%2D01T00%3A00%3A00Z&endTime=1980%2D01%2D01T00%3A00%3A01Z'
     gdal.FileFromMemBuffer(ogrtest.eeda_drv_tmpfile, json.dumps({
         'assets': [
             {
-                'path': 'filtered_feature',
-                'time': '1980-01-01T00:00:00Z',
+                'name': 'projects/earthengine-public/assets/collection/filtered_feature',
+                'time': '1980-01-01T00:00:00Z'
             },
             {
-                'path': 'second_feature'
+                'name': 'projects/earthengine-public/assets/collection/second_feature'
             }
         ]
     }))
@@ -295,22 +299,22 @@ def eeda_2():
     f = lyr.GetNextFeature()
     gdal.Unlink(ogrtest.eeda_drv_tmpfile)
 
-    if f.GetField('path') != 'filtered_feature':
+    if f.GetField('name') != 'projects/earthengine-public/assets/collection/filtered_feature':
         gdaltest.post_reason('fail')
         return 'fail'
 
     # Test time equality with day granularity
     lyr.SetAttributeFilter("time = '1980-01-01'")
 
-    ogrtest.eeda_drv_tmpfile = '/vsimem/ee/assets:listImages?parentPath=collection&startTime=1980%2D01%2D01T00%3A00%3A00Z&endTime=1980%2D01%2D01T23%3A59%3A59Z'
+    ogrtest.eeda_drv_tmpfile = '/vsimem/ee/projects/earthengine-public/assets/collection:listImages?startTime=1980%2D01%2D01T00%3A00%3A00Z&endTime=1980%2D01%2D01T23%3A59%3A59Z'
     gdal.FileFromMemBuffer(ogrtest.eeda_drv_tmpfile, json.dumps({
         'assets': [
             {
-                'path': 'filtered_feature',
+                'name': 'projects/earthengine-public/assets/collection/filtered_feature',
                 'time': '1980-01-01T12:00:00Z',
             },
             {
-                'path': 'second_feature'
+                'name': 'projects/earthengine-public/assets/collection/second_feature'
             }
         ]
     }))
@@ -318,7 +322,7 @@ def eeda_2():
     f = lyr.GetNextFeature()
     gdal.Unlink(ogrtest.eeda_drv_tmpfile)
 
-    if f.GetField('path') != 'filtered_feature':
+    if f.GetField('name') != 'projects/earthengine-public/assets/collection/filtered_feature':
         gdaltest.post_reason('fail')
         return 'fail'
 
@@ -344,7 +348,7 @@ def eeda_3():
 
     lyr = ds.GetLayer(0)
 
-    if lyr.GetLayerDefn().GetFieldCount() != 6 + 7 + 4:
+    if lyr.GetLayerDefn().GetFieldCount() != 8 + 7 + 4:
         gdaltest.post_reason('fail')
         print(lyr.GetLayerDefn().GetFieldCount())
         return 'fail'
@@ -354,6 +358,101 @@ def eeda_3():
 
     return 'success'
 
+###############################################################################
+# Test that name and id variants are handled correctly.
+
+
+def eeda_4():
+
+    if ogrtest.eeda_drv is None:
+        return 'skip'
+
+    gdal.SetConfigOption('EEDA_BEARER', 'mybearer')
+    gdal.SetConfigOption('EEDA_URL', '/vsimem/ee/')
+
+    # User asset ID ("users/**").
+    ogrtest.eeda_drv_tmpfile = '/vsimem/ee/projects/earthengine-legacy/assets/users/foo:listImages?pageSize=1'
+    gdal.FileFromMemBuffer(ogrtest.eeda_drv_tmpfile, json.dumps({
+        'assets': [
+            {
+                'name': 'projects/earthengine-legacy/assets/users/foo/bar'
+            }
+        ]
+    }))
+    if not ogr.Open('EEDA:users/foo').GetLayer(0):
+        gdaltest.post_reason('fail')
+        return 'fail'
+    gdal.Unlink(ogrtest.eeda_drv_tmpfile)
+
+    # Project asset ID ("projects/**").
+    ogrtest.eeda_drv_tmpfile = '/vsimem/ee/projects/earthengine-legacy/assets/projects/foo:listImages?pageSize=1'
+    gdal.FileFromMemBuffer(ogrtest.eeda_drv_tmpfile, json.dumps({
+        'assets': [
+            {
+                'name': 'projects/earthengine-legacy/assets/projects/foo/bar'
+            }
+        ]
+    }))
+    ds = ogr.Open('EEDA:projects/foo')
+    if not ds.GetLayer(0):
+        gdaltest.post_reason('fail')
+        return 'fail'
+    gdal.Unlink(ogrtest.eeda_drv_tmpfile)
+    ds = None
+
+    # Multi-folder project asset ID ("projects/foo/bar/baz").
+    ogrtest.eeda_drv_tmpfile = '/vsimem/ee/projects/earthengine-legacy/assets/projects/foo/bar/baz:listImages?pageSize=1'
+    gdal.FileFromMemBuffer(ogrtest.eeda_drv_tmpfile, json.dumps({
+        'assets': [
+            {
+                'name': 'projects/earthengine-legacy/assets/projects/foo/bar/baz/qux'
+            }
+        ]
+    }))
+    ds = ogr.Open('EEDA:projects/foo/bar/baz')
+    if not ds.GetLayer(0):
+        gdaltest.post_reason('fail')
+        return 'fail'
+    gdal.Unlink(ogrtest.eeda_drv_tmpfile)
+    ds = None
+
+    # Public-catalog asset ID (e.g. "LANDSAT").
+    ogrtest.eeda_drv_tmpfile = '/vsimem/ee/projects/earthengine-public/assets/foo:listImages?pageSize=1'
+    gdal.FileFromMemBuffer(ogrtest.eeda_drv_tmpfile, json.dumps({
+        'assets': [
+            {
+                'name': 'projects/earthengine-public/assets/foo/bar'
+            }
+        ]
+    }))
+    ds = ogr.Open('EEDA:foo')
+    if not ds.GetLayer(0):
+        gdaltest.post_reason('fail')
+        return 'fail'
+    gdal.Unlink(ogrtest.eeda_drv_tmpfile)
+    ds = None
+
+    # Asset name ("projects/*/assets/**").
+    ogrtest.eeda_drv_tmpfile = '/vsimem/ee/projects/foo/assets/bar:listImages?pageSize=1'
+    gdal.FileFromMemBuffer(ogrtest.eeda_drv_tmpfile, json.dumps({
+        'assets': [
+            {
+                'name': 'projects/foo/assets/bar/baz'
+            }
+        ]
+    }))
+    ds = ogr.Open('EEDA:projects/foo/assets/bar')
+    if not ds.GetLayer(0):
+        gdaltest.post_reason('fail')
+        return 'fail'
+    gdal.Unlink(ogrtest.eeda_drv_tmpfile)
+    ds = None
+
+    gdal.SetConfigOption('EEDA_BEARER', None)
+    gdal.SetConfigOption('EEDA_URL', None)
+
+    return 'success'
+
 ###############################################################################
 #
 
@@ -372,9 +471,9 @@ def eeda_cleanup():
     gdal.SetConfigOption('GOA2_NOW', None)
 
     gdal.Unlink('/vsimem/ee/')
-    gdal.Unlink('/vsimem/ee/assets:listImages?parentPath=collection&pageSize=1')
-    gdal.Unlink('/vsimem/ee/assets:listImages?parentPath=collection&pageToken=myToken')
-    gdal.Unlink('/vsimem/ee/assets:listImages?parentPath=collection&filter=raw%5Ffilter')
+    gdal.Unlink('/vsimem/ee/projects/earthengine-public/assets/collection:listImages?pageSize=1')
+    gdal.Unlink('/vsimem/ee/projects/earthengine-public/assets/collection:listImages?pageToken=myToken')
+    gdal.Unlink('/vsimem/ee/projects/earthengine-public/assets/collection:listImages?filter=raw%5Ffilter')
 
     return 'success'
 
@@ -383,6 +482,7 @@ def eeda_cleanup():
     eeda_1,
     eeda_2,
     eeda_3,
+    eeda_4,
     eeda_cleanup]
 
 if __name__ == '__main__':
diff --git a/gdal/frmts/eeda/drv_eeda.html b/gdal/frmts/eeda/drv_eeda.html
index 1ab358df6d84..8cf3ccc84e68 100644
--- a/gdal/frmts/eeda/drv_eeda.html
+++ b/gdal/frmts/eeda/drv_eeda.html
@@ -16,7 +16,7 @@ <h2>Dataset name syntax</h2>
 
 The minimal syntax to open a datasource is : <pre>EEDA:[collection]</pre><p>
 
-where collection is something like COPERNICUS/S2.
+where collection is something like projects/earthengine-public/assets/COPERNICUS/S2.
 
 <h2>Open options</h2>
 
@@ -85,8 +85,10 @@ <h2>Attributes</h2>
 <th>Server-side filter compatible</th>
 </tr>
 
-<tr><td>path</td><td>String</td><td>Image path (e.g. COPERNICUS/S2/20170430T190351_20170430T190351_T10SEG)</td><td>No</td></tr>
-<tr><td>gdal_dataset</td><td>String</td><td>GDAL dataset name (e.g. EEDAI:COPERNICUS/S2/20170430T190351_20170430T190351_T10SEG)<br/>hat can be opened with the <a href="frmt_eedai.html">Google Earth Engine Data API Image driver</a></td><td>No</td></tr>
+<tr><td>name</td><td>String</td><td>Image name (e.g. projects/earthengine-public/assets/COPERNICUS/S2/20170430T190351_20170430T190351_T10SEG)</td><td>No</td></tr>
+<tr><td>id</td><td>String</td><td>Image ID; equivalent to name without the "projects/*/assets/" prefix (e.g. users/USER/ASSET)</td><td>No</td></tr>
+<tr><td>path</td><td>String</td><td>(Deprecated) Image path; equivalent to id</td><td>No</td></tr>
+<tr><td>gdal_dataset</td><td>String</td><td>GDAL dataset name (e.g. EEDAI:projects/earthengine-public/assets/COPERNICUS/S2/20170430T190351_20170430T190351_T10SEG)<br/>hat can be opened with the <a href="frmt_eedai.html">Google Earth Engine Data API Image driver</a></td><td>No</td></tr>
 <tr><td>time</td><td>DateTime</td><td>Acquisition date</td><td><b>Yes</b></td></tr>
 <tr><td>updateTime</td><td>DateTime</td><td>Update date</td><td>No</td></tr>
 <tr><td>sizeBytes</td><td>Integer64</td><td>File size in bytes</td><td>No</td></tr>
@@ -134,25 +136,25 @@ <h3>Examples</h3>
 <li>
 Listing all images available:
 <pre>
-ogrinfo -ro -al "EEDA:" -oo COLLECTION=COPERNICUS/S2 --config EEDA_CLIENT_EMAIL "my@email" --config EEDA_PRIVATE_KEY_FILE my.pem
+ogrinfo -ro -al "EEDA:" -oo COLLECTION=projects/earthengine-public/assets/COPERNICUS/S2 --config EEDA_CLIENT_EMAIL "my@email" --config EEDA_PRIVATE_KEY_FILE my.pem
 </pre>
 or
 <pre>
-ogrinfo -ro -al "EEDA:COPERNICUS/S2" --config EEDA_CLIENT_EMAIL "my@email" --config EEDA_PRIVATE_KEY_FILE my.pem
+ogrinfo -ro -al "EEDA:projects/earthengine-public/assets/COPERNICUS/S2" --config EEDA_CLIENT_EMAIL "my@email" --config EEDA_PRIVATE_KEY_FILE my.pem
 </pre>
 <p>
 
 <li>
 Listing all images under a point of (lat,lon)=(40,-100) :
 <pre>
-ogrinfo -ro -al "EEDA:COPERNICUS/S2" -spat -100 40 -100 40 --config EEDA_CLIENT_EMAIL "my@email" --config EEDA_PRIVATE_KEY_FILE my.pem
+ogrinfo -ro -al "EEDA:projects/earthengine-public/assets/COPERNICUS/S2" -spat -100 40 -100 40 --config EEDA_CLIENT_EMAIL "my@email" --config EEDA_PRIVATE_KEY_FILE my.pem
 </pre>
 <p>
 
 <li>
 Listing all images available matching criteria :
 <pre>
-ogrinfo -ro -al "EEDA:COPERNICUS/S2" -where "time &gt;= '2015/03/26 00:00:00' AND CLOUDY_PIXEL_PERCENTAGE &lt; 10" --config EEDA_CLIENT_EMAIL "my@email" --config EEDA_PRIVATE_KEY_FILE my.pem
+ogrinfo -ro -al "EEDA:projects/earthengine-public/assets/COPERNICUS/S2" -where "time &gt;= '2015/03/26 00:00:00' AND CLOUDY_PIXEL_PERCENTAGE &lt; 10" --config EEDA_CLIENT_EMAIL "my@email" --config EEDA_PRIVATE_KEY_FILE my.pem
 </pre>
 <p>
 
diff --git a/gdal/frmts/eeda/eeda.h b/gdal/frmts/eeda/eeda.h
index 98cef6d8ade1..c68c15ae0889 100644
--- a/gdal/frmts/eeda/eeda.h
+++ b/gdal/frmts/eeda/eeda.h
@@ -85,6 +85,7 @@ class GDALEEDABaseDataset: public GDALDataset
             GIntBig     m_nExpirationTime;
 
             char      **GetBaseHTTPOptions();
+            static CPLString ConvertPathToName(const CPLString& path);
 
     public:
                 GDALEEDABaseDataset();
diff --git a/gdal/frmts/eeda/eedacommon.cpp b/gdal/frmts/eeda/eedacommon.cpp
index 061ff67ba6c4..0ce5bdd8ef6f 100644
--- a/gdal/frmts/eeda/eedacommon.cpp
+++ b/gdal/frmts/eeda/eedacommon.cpp
@@ -276,6 +276,47 @@ GDALEEDABaseDataset::~GDALEEDABaseDataset()
     }
 }
 
+/************************************************************************/
+/*                          ConvertPathToName()                        */
+/************************************************************************/
+
+CPLString GDALEEDABaseDataset::ConvertPathToName(const CPLString& path) {
+    size_t end = path.find('/');
+    CPLString folder = path.substr(0, end);
+
+    if ( folder == "users" )
+    {
+        return "projects/earthengine-legacy/assets/" + path;
+    }
+    else if ( folder != "projects" )
+    {
+        return "projects/earthengine-public/assets/" + path;
+    }
+
+    // Find the start and end positions of the third segment, if it exists.
+    int segment = 1;
+    size_t start = 0;
+    while ( end != std::string::npos && segment < 3 )
+    {
+        segment++;
+        start = end + 1;
+        end = path.find('/', start);
+    }
+
+    end = (end == std::string::npos) ? path.size() : end;
+    // segment is 3 if path has at least 3 segments.
+    if ( folder == "projects" && segment == 3 )
+    {
+        // If the first segment is "projects" and the third segment is "assets",
+        // path is a name, so return as-is.
+        if ( path.substr(start, end - start) == "assets" )
+        {
+            return path;
+        }
+    }
+    return "projects/earthengine-legacy/assets/" + path;
+}
+
 /************************************************************************/
 /*                          GetBaseHTTPOptions()                        */
 /************************************************************************/
@@ -470,7 +511,7 @@ CPLHTTPResult* EEDAHTTPFetch(const char* pszURL, char** papszOptions)
                  (nHTTPStatus >= 502 && nHTTPStatus <= 504)) &&
                  i < RETRY_COUNT )
             {
-                CPLError( CE_Warning, CPLE_FileIO, 
+                CPLError( CE_Warning, CPLE_FileIO,
                           "GET error when downloading %s, HTTP status=%d, retrying in %.2fs : %s",
                           pszURL, nHTTPStatus, dfRetryDelay, pszErrorText);
                 CPLHTTPDestroyResult(psResult);
@@ -487,4 +528,4 @@ CPLHTTPResult* EEDAHTTPFetch(const char* pszURL, char** papszOptions)
     }
 
     return psResult;
-}
\ No newline at end of file
+}
diff --git a/gdal/frmts/eeda/eedadataset.cpp b/gdal/frmts/eeda/eedadataset.cpp
index 075f4591ee34..6bc2d0c78a6f 100644
--- a/gdal/frmts/eeda/eedadataset.cpp
+++ b/gdal/frmts/eeda/eedadataset.cpp
@@ -110,6 +110,7 @@ class GDALEEDALayer: public OGRLayer
 
                 GDALEEDADataset* m_poDS;
                 CPLString        m_osCollection{};
+                CPLString        m_osCollectionName{};
                 OGRFeatureDefn*  m_poFeatureDefn;
                 json_object*     m_poCurPageObj;
                 json_object*     m_poCurPageAssets;
@@ -129,6 +130,7 @@ class GDALEEDALayer: public OGRLayer
     public:
         GDALEEDALayer(GDALEEDADataset* poDS,
                       const CPLString& osCollection,
+                      const CPLString& osCollectionName,
                       json_object* poAsset,
                       json_object* poLayerConf);
         virtual ~GDALEEDALayer();
@@ -159,10 +161,12 @@ class GDALEEDALayer: public OGRLayer
 
 GDALEEDALayer::GDALEEDALayer(GDALEEDADataset* poDS,
                              const CPLString& osCollection,
+                             const CPLString& osCollectionName,
                              json_object* poAsset,
                              json_object* poLayerConf) :
     m_poDS(poDS),
     m_osCollection(osCollection),
+    m_osCollectionName(osCollectionName),
     m_poFeatureDefn(nullptr),
     m_poCurPageObj(nullptr),
     m_poCurPageAssets(nullptr),
@@ -187,6 +191,14 @@ GDALEEDALayer::GDALEEDALayer(GDALEEDADataset* poDS,
     m_poFeatureDefn->GetGeomFieldDefn(0)->SetSpatialRef(poSRS);
     poSRS->Release();
 
+    {
+        OGRFieldDefn oFieldDefn("name", OFTString);
+        m_poFeatureDefn->AddFieldDefn(&oFieldDefn);
+    }
+    {
+        OGRFieldDefn oFieldDefn("id", OFTString);
+        m_poFeatureDefn->AddFieldDefn(&oFieldDefn);
+    }
     {
         OGRFieldDefn oFieldDefn("path", OFTString);
         m_poFeatureDefn->AddFieldDefn(&oFieldDefn);
@@ -385,41 +397,45 @@ OGRFeature* GDALEEDALayer::GetNextRawFeature()
 
     if( m_poCurPageObj == nullptr )
     {
-        CPLString osURL(m_poDS->GetBaseURL() + "assets:listImages?parentPath=" +
-                       CPLEscapeURLQueryParameter(m_osCollection));
+        CPLString osURL(m_poDS->GetBaseURL() + m_osCollectionName +
+                    ":listImages");
+        CPLString query = "";
         if( !osNextPageToken.empty() )
         {
-            osURL += "&pageToken=" +
+            query += "&pageToken=" +
                         CPLEscapeURLQueryParameter(osNextPageToken);
         }
         const char *pszPageSize = CPLGetConfigOption("EEDA_PAGE_SIZE", nullptr);
         if( pszPageSize )
         {
-            osURL += "&pageSize=";
-            osURL += pszPageSize;
+            query += "&pageSize=";
+            query += pszPageSize;
         }
         if( m_poFilterGeom != nullptr )
         {
             char* pszGeoJSON = OGR_G_ExportToJson(
                 reinterpret_cast<OGRGeometryH>(m_poFilterGeom) );
-            osURL += "&region=";
-            osURL += CPLEscapeURLQueryParameter(pszGeoJSON);
+            query += "&region=";
+            query += CPLEscapeURLQueryParameter(pszGeoJSON);
             CPLFree(pszGeoJSON);
         }
         if( !m_osAttributeFilter.empty() )
         {
-            osURL += "&filter=";
-            osURL += CPLEscapeURLQueryParameter(m_osAttributeFilter);
+            query += "&filter=";
+            query += CPLEscapeURLQueryParameter(m_osAttributeFilter);
         }
         if( !m_osStartTime.empty() )
         {
-            osURL += "&startTime=";
-            osURL += CPLEscapeURLQueryParameter(m_osStartTime);
+            query += "&startTime=";
+            query += CPLEscapeURLQueryParameter(m_osStartTime);
         }
         if( !m_osEndTime.empty() )
         {
-            osURL += "&endTime=";
-            osURL += CPLEscapeURLQueryParameter(m_osEndTime);
+            query += "&endTime=";
+            query += CPLEscapeURLQueryParameter(m_osEndTime);
+        }
+        if (query.size() > 0) {
+          osURL = osURL + "?" + query.substr(1);
         }
         m_poCurPageObj = m_poDS->RunRequest(osURL);
         if( m_poCurPageObj == nullptr )
@@ -471,13 +487,27 @@ OGRFeature* GDALEEDALayer::GetNextRawFeature()
         }
     }
 
+    const char* pszName =
+        json_object_get_string(CPL_json_object_object_get(poAsset, "name"));
+    if( pszName )
+    {
+        poFeature->SetField("name", pszName);
+        poFeature->SetField("gdal_dataset",
+                    ("EEDAI:" + CPLString(pszName)).c_str());
+    }
+
+    const char* pszId =
+        json_object_get_string(CPL_json_object_object_get(poAsset, "id"));
+    if ( pszId )
+    {
+        poFeature->SetField("id", pszId);
+    }
+
     const char* pszPath =
         json_object_get_string(CPL_json_object_object_get(poAsset, "path"));
-    if( pszPath )
+    if ( pszPath )
     {
-        poFeature->SetField("path", pszPath);
-        poFeature->SetField("gdal_dataset",
-                    ("EEDAI:" + CPLString(pszPath)).c_str());
+        poFeature->SetField("path", pszId);
     }
 
     const char* const apszBaseProps[] =
@@ -1109,6 +1139,7 @@ bool GDALEEDADataset::Open(GDALOpenInfo* poOpenInfo)
         osCollection = papszTokens[1];
         CSLDestroy(papszTokens);
     }
+    CPLString osCollectionName = ConvertPathToName(osCollection);
 
     json_object* poRootConf = GDALEEDADatasetGetConf();
     if( poRootConf )
@@ -1118,7 +1149,7 @@ bool GDALEEDADataset::Open(GDALOpenInfo* poOpenInfo)
         if( poLayerConf != nullptr &&
             json_object_get_type(poLayerConf) == json_type_object )
         {
-            m_poLayer = new GDALEEDALayer(this, osCollection,
+            m_poLayer = new GDALEEDALayer(this, osCollection, osCollectionName,
                                           nullptr, poLayerConf);
             json_object_put(poRootConf);
             return true;
@@ -1127,9 +1158,8 @@ bool GDALEEDADataset::Open(GDALOpenInfo* poOpenInfo)
     }
 
     // Issue request to get layer schema
-    json_object* poRootAsset = RunRequest(m_osBaseURL + "assets:listImages?parentPath=" +
-                CPLEscapeURLQueryParameter(osCollection) +
-                "&pageSize=1");
+    json_object* poRootAsset = RunRequest(m_osBaseURL + osCollectionName +
+                ":listImages?pageSize=1");
     if( poRootAsset == nullptr )
         return false;
 
@@ -1150,7 +1180,8 @@ bool GDALEEDADataset::Open(GDALOpenInfo* poOpenInfo)
         return false;
     }
 
-    m_poLayer = new GDALEEDALayer(this, osCollection, poAsset, nullptr);
+    m_poLayer = new GDALEEDALayer(this, osCollection, osCollectionName, poAsset,
+                                  nullptr);
     json_object_put(poRootAsset);
 
     return true;
@@ -1204,7 +1235,7 @@ void GDALRegister_EEDA()
     poDriver->SetMetadataItem( GDAL_DMD_CONNECTION_PREFIX, "EEDA:" );
     poDriver->SetMetadataItem( GDAL_DMD_OPENOPTIONLIST,
 "<OpenOptionList>"
-"  <Option name='COLLECTION' type='string' description='Collection path'/>"
+"  <Option name='COLLECTION' type='string' description='Collection name'/>"
 "</OpenOptionList>");
 
     poDriver->pfnOpen = GDALEEDAOpen;
diff --git a/gdal/frmts/eeda/eedaidataset.cpp b/gdal/frmts/eeda/eedaidataset.cpp
index f72da8ef848a..76162e341017 100644
--- a/gdal/frmts/eeda/eedaidataset.cpp
+++ b/gdal/frmts/eeda/eedaidataset.cpp
@@ -62,6 +62,7 @@ class GDALEEDAIDataset: public GDALEEDABaseDataset
 
             int         m_nBlockSize;
             CPLString   m_osAsset{};
+            CPLString   m_osAssetName{};
             GDALEEDAIDataset* m_poParentDS;
 #ifdef DEBUG_VERBOSE
             int         m_iOvrLevel;
@@ -185,6 +186,7 @@ GDALEEDAIDataset::GDALEEDAIDataset(GDALEEDAIDataset* poParentDS,
                                    int iOvrLevel ) :
     m_nBlockSize(poParentDS->m_nBlockSize),
     m_osAsset(poParentDS->m_osAsset),
+    m_osAssetName(poParentDS->m_osAssetName),
     m_poParentDS(poParentDS),
 #ifdef DEBUG_VERBOSE
     m_iOvrLevel(iOvrLevel),
@@ -573,8 +575,6 @@ CPLErr GDALEEDAIRasterBand::GetBlocks(int nBlockXOff, int nBlockYOff,
 
     // Build request content
     json_object* poReq = json_object_new_object();
-    json_object_object_add(poReq, "path",
-                           json_object_new_string(poGDS->m_osAsset));
     json_object_object_add(poReq, "fileFormat",
                            json_object_new_string(poGDS->m_osPixelEncoding));
     json_object* poBands = json_object_new_array();
@@ -648,7 +648,7 @@ CPLErr GDALEEDAIRasterBand::GetBlocks(int nBlockXOff, int nBlockYOff,
     papszOptions = CSLSetNameValue(papszOptions, "HEADERS", osHeaders);
     papszOptions = CSLSetNameValue(papszOptions, "POSTFIELDS", osPostContent);
     CPLHTTPResult* psResult = EEDAHTTPFetch(
-        (poGDS->m_osBaseURL + "assets:getPixels").c_str(),
+        (poGDS->m_osBaseURL + poGDS->m_osAssetName + ":getPixels").c_str(),
         papszOptions);
     CSLDestroy(papszOptions);
     if( psResult == nullptr )
@@ -1276,6 +1276,8 @@ bool GDALEEDAIDataset::Open(GDALOpenInfo* poOpenInfo)
         m_osAsset = papszTokens[1];
         CSLDestroy(papszTokens);
     }
+    m_osAssetName = ConvertPathToName(m_osAsset);
+
     m_osPixelEncoding =
         CSLFetchNameValueDef(poOpenInfo->papszOpenOptions,
                              "PIXEL_ENCODING", "AUTO");
@@ -1301,7 +1303,7 @@ bool GDALEEDAIDataset::Open(GDALOpenInfo* poOpenInfo)
     if( papszOptions == nullptr )
         return false;
     CPLHTTPResult* psResult = EEDAHTTPFetch(
-                (m_osBaseURL + "assets/" + m_osAsset).c_str(), papszOptions);
+                (m_osBaseURL + m_osAssetName).c_str(), papszOptions);
     CSLDestroy(papszOptions);
     if( psResult == nullptr )
         return false;
@@ -1506,11 +1508,11 @@ bool GDALEEDAIDataset::Open(GDALOpenInfo* poOpenInfo)
                 osSubDSSuffix += aoBandDesc[oIter->second[i]].osName;
             }
             aoSubDSList.AddNameValue(
-                CPLSPrintf("SUBDATASET_%d_NAME", aoSubDSList.size() / 2 + 1), 
+                CPLSPrintf("SUBDATASET_%d_NAME", aoSubDSList.size() / 2 + 1),
                 CPLSPrintf("EEDAI:%s:%s",
                            m_osAsset.c_str(), osSubDSSuffix.c_str()) );
             aoSubDSList.AddNameValue(
-                CPLSPrintf("SUBDATASET_%d_DESC", aoSubDSList.size() / 2 + 1), 
+                CPLSPrintf("SUBDATASET_%d_DESC", aoSubDSList.size() / 2 + 1),
                 CPLSPrintf("Band%s %s of %s",
                            oIter->second.size() > 1 ? "s" : "",
                            osSubDSSuffix.c_str(), m_osAsset.c_str()) );
@@ -1644,7 +1646,7 @@ void GDALRegister_EEDAI()
     poDriver->SetMetadataItem( GDAL_DMD_CONNECTION_PREFIX, "EEDAI:" );
     poDriver->SetMetadataItem( GDAL_DMD_OPENOPTIONLIST,
 "<OpenOptionList>"
-"  <Option name='ASSET' type='string' description='Asset path'/>"
+"  <Option name='ASSET' type='string' description='Asset name'/>"
 "  <Option name='BANDS' type='string' "
                         "description='Comma separated list of band names'/>"
 "  <Option name='PIXEL_ENCODING' type='string-select' "
diff --git a/gdal/frmts/eeda/frmt_eedai.html b/gdal/frmts/eeda/frmt_eedai.html
index a9f96c670b80..df5631a4852c 100644
--- a/gdal/frmts/eeda/frmt_eedai.html
+++ b/gdal/frmts/eeda/frmt_eedai.html
@@ -16,7 +16,8 @@ <h2>Dataset name syntax</h2>
 
 The minimal syntax to open a datasource is : <pre>EEDAI:[asset][:band_names]</pre><p>
 
-where asset is something like COPERNICUS/S2/20170430T190351_20170430T190351_T10SEG,
+where asset is something like
+projects/earthengine-public/assets/COPERNICUS/S2/20170430T190351_20170430T190351_T10SEG,
 and band_names a comma separated list of band names (typically indicated by
 subdatasets on the main image)
 
@@ -101,11 +102,11 @@ <h3>Examples</h3>
 <li>
 Get metadata on an image:
 <pre>
-gdalinfo "EEDAI:" -oo ASSET=COPERNICUS/S2/20170430T190351_20170430T190351_T10SEG --config EEDA_CLIENT_EMAIL "my@email" --config EEDA_PRIVATE_KEY_FILE my.pem
+gdalinfo "EEDAI:" -oo ASSET=projects/earthengine-public/assets/COPERNICUS/S2/20170430T190351_20170430T190351_T10SEG --config EEDA_CLIENT_EMAIL "my@email" --config EEDA_PRIVATE_KEY_FILE my.pem
 </pre>
 or
 <pre>
-gdalinfo "EEDAI:COPERNICUS/S2/20170430T190351_20170430T190351_T10SEG" --config EEDA_CLIENT_EMAIL "my@email" --config EEDA_PRIVATE_KEY_FILE my.pem
+gdalinfo "EEDAI:projects/earthengine-public/assets/COPERNICUS/S2/20170430T190351_20170430T190351_T10SEG" --config EEDA_CLIENT_EMAIL "my@email" --config EEDA_PRIVATE_KEY_FILE my.pem
 </pre>
 <p>
 

From 52efc6ddb9cde38e0ef658ff7cdcfa4ca266e689 Mon Sep 17 00:00:00 2001
From: Even Rouault <even.rouault@spatialys.com>
Date: Wed, 5 Dec 2018 17:48:32 +0100
Subject: [PATCH 105/488] VRT: fix source window computation that caused
 sub-pixel shift with non-nearest resampling

Addresses issue raised in https://lists.osgeo.org/pipermail/gdal-dev/2018-December/049415.html
---
 .../gcore/data/left_vrt_subpixel_offset.tif   | Bin 0 -> 558 bytes
 .../data/right_bottom_vrt_subpixel_offset.tif | Bin 0 -> 458 bytes
 .../data/right_top_vrt_subpixel_offset.tif    | Bin 0 -> 458 bytes
 autotest/gcore/data/vrt_subpixel_offset.vrt   |  28 +++++++++
 autotest/gcore/vrt_read.py                    |  14 +++++
 gdal/frmts/gtiff/geotiff.cpp                  |   8 +--
 gdal/frmts/vrt/vrtsources.cpp                 |  55 ++++++++++++++----
 gdal/gcore/rasterio.cpp                       |  19 ++----
 8 files changed, 95 insertions(+), 29 deletions(-)
 create mode 100644 autotest/gcore/data/left_vrt_subpixel_offset.tif
 create mode 100644 autotest/gcore/data/right_bottom_vrt_subpixel_offset.tif
 create mode 100644 autotest/gcore/data/right_top_vrt_subpixel_offset.tif
 create mode 100644 autotest/gcore/data/vrt_subpixel_offset.vrt

diff --git a/autotest/gcore/data/left_vrt_subpixel_offset.tif b/autotest/gcore/data/left_vrt_subpixel_offset.tif
new file mode 100644
index 0000000000000000000000000000000000000000..e1dad6177102d16cffcf96d752fcbe1e879b2b7c
GIT binary patch
literal 558
zcmZvYu}T9$5QgV+#~DIU1fw7+4pM0&v9V3S#-M3bgliW?SkPiRCzTFdvsi6;*ri+~
z#g%CU!9sihAHY|z)Y;1!uJB;^zuo_z+1)!j+Jz<ntN{ce1VSyTpyCbTM#VlAR_t?e
zjn{*y?7b4BQ`_IH*w5LjGH=4&TIRIIs}F4m#eb2y=QhNmpHk0R2#IJ*=FhSQbcIL$
z63cHqSm2*7jelYAwLSF4`_pl$o`doQD*(}g<+|lwBbsF$?>A>z3>}E&M+ETLgSOX;
z>!{S7-gtPpe~|1Y=VvF$-R;d~((jKa<>mx5F)|xw5lt4SXf(>2L=9Rd5}S}X_aQ{2
zxpUT{CC#tS8pBF#E1i}MX_UBxeUCB9D3q9%;Up<-6%lD8BQbS;p-JhvWjR<WR4gZ^
p8g;5@YID+Bqfv8b%oI6Qm>0$o%fylU{`p{;W4S1Do9B7K_7@QCfQ|qF

literal 0
HcmV?d00001

diff --git a/autotest/gcore/data/right_bottom_vrt_subpixel_offset.tif b/autotest/gcore/data/right_bottom_vrt_subpixel_offset.tif
new file mode 100644
index 0000000000000000000000000000000000000000..0dccee37af2748d00ac5a4b905bc81c8630ce56b
GIT binary patch
literal 458
zcmebD)MDUZU|`^9U|?isU<9(bfS3`9%>-qGR53%@Aa!g=Y(YjAu--JFgea1@7?ce%
zQyi)$1;~~`QWK2C=4<9*U<S$`0^+6?9tJibeG7=!w=**+0BJ6u`5W7r7-WEKFOVbP
zz|R4~gwb#btPG9!QjQ>r^>cl|G>FXz_5nKs0}F%=bS_woiDhHEC`g`TV>=szC<7ZX
zAQ&0?lo@zHba(~}nATMGb96B>SI}1o4e?c|%FjzxFf{b50SneJWEYfAm{3_*USAW_
z+S}HYn^jR)I%#5UW@dVRSx48r#**6l)Uw*{X+<S9^{qA4txZjZ1(|szZA~SGr5VYI
qDQV^9ad~xd38|%ZO>K>>brpRbeN(zxyP8USCUn(RmF5@b=K=uhxJhvU

literal 0
HcmV?d00001

diff --git a/autotest/gcore/data/right_top_vrt_subpixel_offset.tif b/autotest/gcore/data/right_top_vrt_subpixel_offset.tif
new file mode 100644
index 0000000000000000000000000000000000000000..1a69b1730baa0850708c35564947e877831cd072
GIT binary patch
literal 458
zcmebD)MDUZU|`^9U|?isU<9(bfS3`9%>-qGR53%@Aa!g=Y(YjAu--JFgea1@7?ce%
zQyi)$1;~~`QWK2C=4<9*U<S$`0^+6?9tJibeG7=!w=**+0BJ6u`5W7r7-WEKFOVbP
zz|R4~gwb#btPG9!QjQ>rGxL1FG>FXz_5nKs0}F%=bS_woiDhHEC`g`TV>=szC<7ZX
zAQ&0?lo@zHba(~}nATMGb96B>SI}1o4e?c|%FjzxFf{b50SneJQ~*IsMR9q@jKaFy
z;>P;cwt|N0ro!^}nxg#t{PK$8oc6}-riPlXwuzJKDl*EZ^wd;NZOAFFZdgCJp{uR1
nsIg|w^zz!;+=8rv><JUotD1_lvU8h&y7Th$${QOC3maPiGlEJ;

literal 0
HcmV?d00001

diff --git a/autotest/gcore/data/vrt_subpixel_offset.vrt b/autotest/gcore/data/vrt_subpixel_offset.vrt
new file mode 100644
index 000000000000..2aa023773fcb
--- /dev/null
+++ b/autotest/gcore/data/vrt_subpixel_offset.vrt
@@ -0,0 +1,28 @@
+<VRTDataset rasterXSize="20" rasterYSize="20">
+  <SRS>PROJCS["NAD27 / UTM zone 11N",GEOGCS["NAD27",DATUM["North_American_Datum_1927",SPHEROID["Clarke 1866",6378206.4,294.9786982138982,AUTHORITY["EPSG","7008"]],AUTHORITY["EPSG","6267"]],PRIMEM["Greenwich",0,AUTHORITY["EPSG","8901"]],UNIT["degree",0.0174532925199433,AUTHORITY["EPSG","9122"]],AUTHORITY["EPSG","4267"]],PROJECTION["Transverse_Mercator"],PARAMETER["latitude_of_origin",0],PARAMETER["central_meridian",-117],PARAMETER["scale_factor",0.9996],PARAMETER["false_easting",500000],PARAMETER["false_northing",0],UNIT["metre",1,AUTHORITY["EPSG","9001"]],AXIS["Easting",EAST],AXIS["Northing",NORTH],AUTHORITY["EPSG","26711"]]</SRS>
+  <GeoTransform>  4.4072000000000000e+05,  6.0000000000000000e+01,  0.0000000000000000e+00,  3.7513200000000000e+06,  0.0000000000000000e+00, -6.0000000000000000e+01</GeoTransform>
+  <VRTRasterBand dataType="Byte" band="1">
+    <ColorInterp>Gray</ColorInterp>
+    <SimpleSource resampling="cubic">
+      <SourceFilename relativeToVRT="1">left_vrt_subpixel_offset.tif</SourceFilename>
+      <SourceBand>1</SourceBand>
+      <SourceProperties RasterXSize="10" RasterYSize="20" DataType="Byte" BlockXSize="10" BlockYSize="20" />
+      <SrcRect xOff="0" yOff="0" xSize="10" ySize="20" />
+      <DstRect xOff="0" yOff="0" xSize="10" ySize="20" />
+    </SimpleSource>
+    <SimpleSource resampling="cubic">
+      <SourceFilename relativeToVRT="1">right_top_vrt_subpixel_offset.tif</SourceFilename>
+      <SourceBand>1</SourceBand>
+      <SourceProperties RasterXSize="10" RasterYSize="10" DataType="Byte" BlockXSize="10" BlockYSize="10" />
+      <SrcRect xOff="0" yOff="0" xSize="10" ySize="10" />
+      <DstRect xOff="9.5" yOff="0" xSize="10" ySize="10" />
+    </SimpleSource>
+    <SimpleSource resampling="cubic">
+      <SourceFilename relativeToVRT="1">right_bottom_vrt_subpixel_offset.tif</SourceFilename>
+      <SourceBand>1</SourceBand>
+      <SourceProperties RasterXSize="10" RasterYSize="10" DataType="Byte" BlockXSize="10" BlockYSize="10" />
+      <SrcRect xOff="0" yOff="0" xSize="10" ySize="10" />
+      <DstRect xOff="9.5" yOff="9.5" xSize="10" ySize="10" />
+    </SimpleSource>
+  </VRTRasterBand>
+</VRTDataset>
diff --git a/autotest/gcore/vrt_read.py b/autotest/gcore/vrt_read.py
index 495f342179d6..cefb86372c59 100755
--- a/autotest/gcore/vrt_read.py
+++ b/autotest/gcore/vrt_read.py
@@ -1425,6 +1425,19 @@ def vrt_float32_with_nodata_slightly_below_float_min():
     return 'success'
 
 
+###############################################################################
+# Fix issue raised in https://lists.osgeo.org/pipermail/gdal-dev/2018-December/049415.html
+
+def vrt_subpixel_offset():
+
+    ds = gdal.Open('data/vrt_subpixel_offset.vrt')
+    cs = ds.GetRasterBand(1).Checksum()
+    if cs != 4849:
+        gdaltest.post_reason('fail')
+        print(cs)
+        return 'fail'
+
+    return 'success'
 
 for item in init_list:
     ut = gdaltest.GDALTest('VRT', item[0], item[1], item[2])
@@ -1465,6 +1478,7 @@ def vrt_float32_with_nodata_slightly_below_float_min():
 gdaltest_list.append(vrt_read_30)
 gdaltest_list.append(vrt_read_31)
 gdaltest_list.append(vrt_float32_with_nodata_slightly_below_float_min)
+gdaltest_list.append(vrt_subpixel_offset)
 
 if __name__ == '__main__':
 
diff --git a/gdal/frmts/gtiff/geotiff.cpp b/gdal/frmts/gtiff/geotiff.cpp
index 50ed54dca595..1c358e28756a 100644
--- a/gdal/frmts/gtiff/geotiff.cpp
+++ b/gdal/frmts/gtiff/geotiff.cpp
@@ -4043,10 +4043,10 @@ void* GTiffRasterBand::CacheMultiRange( int nXOff, int nYOff,
     const double dfSrcXInc = dfXSize / static_cast<double>( nBufXSize );
     const double dfSrcYInc = dfYSize / static_cast<double>( nBufYSize );
     const double EPS = 1e-10;
-    const int nBlockX1 = static_cast<int>((0+0.5) * dfSrcXInc + dfXOff + EPS) / nBlockXSize;
-    const int nBlockY1 = static_cast<int>((0+0.5) * dfSrcYInc + dfYOff + EPS) / nBlockYSize;
-    const int nBlockX2 = static_cast<int>((nBufXSize-1+0.5) * dfSrcXInc + dfXOff + EPS) / nBlockXSize;
-    const int nBlockY2 = static_cast<int>((nBufYSize-1+0.5) * dfSrcYInc + dfYOff + EPS) / nBlockYSize;
+    const int nBlockX1 = static_cast<int>(std::max(0.0, (0+0.5) * dfSrcXInc + dfXOff + EPS)) / nBlockXSize;
+    const int nBlockY1 = static_cast<int>(std::max(0.0, (0+0.5) * dfSrcYInc + dfYOff + EPS)) / nBlockYSize;
+    const int nBlockX2 = static_cast<int>(std::min(static_cast<double>(nRasterXSize), (nBufXSize-1+0.5) * dfSrcXInc + dfXOff + EPS)) / nBlockXSize;
+    const int nBlockY2 = static_cast<int>(std::min(static_cast<double>(nRasterYSize), (nBufYSize-1+0.5) * dfSrcYInc + dfYOff + EPS)) / nBlockYSize;
 
     thandle_t th = TIFFClientdata( poGDS->hTIFF );
     if( poGDS->SetDirectory() && !VSI_TIFFHasCachedRanges(th) )
diff --git a/gdal/frmts/vrt/vrtsources.cpp b/gdal/frmts/vrt/vrtsources.cpp
index 53dc86c46903..350347dc637e 100644
--- a/gdal/frmts/vrt/vrtsources.cpp
+++ b/gdal/frmts/vrt/vrtsources.cpp
@@ -1120,24 +1120,41 @@ VRTSimpleSource::GetSrcDstWindow( int nXOff, int nYOff, int nXSize, int nYSize,
         const double dfScaleWinToBufX =
             nBufXSize / static_cast<double>( nXSize );
 
-        const double dfOutXOff = (dfDstULX - nXOff) * dfScaleWinToBufX+0.001;
+        const double dfOutXOff = (dfDstULX - nXOff) * dfScaleWinToBufX;
         if( dfOutXOff <= 0 )
             *pnOutXOff = 0;
         else if( dfOutXOff > INT_MAX )
             *pnOutXOff = INT_MAX;
         else
-            *pnOutXOff = (int) (dfOutXOff);
-        double dfOutRightXOff = (dfDstLRX - nXOff) * dfScaleWinToBufX-0.001;
+            *pnOutXOff = (int) (dfOutXOff+0.001);
+
+        // Apply correction on floating-point source window
+        {
+            double dfDstDeltaX = (dfOutXOff - *pnOutXOff) / dfScaleWinToBufX;
+            double dfSrcDeltaX = dfDstDeltaX / m_dfDstXSize * m_dfSrcXSize;
+            *pdfReqXOff -= dfSrcDeltaX;
+            *pdfReqXSize = std::min( *pdfReqXSize + dfSrcDeltaX,
+                                     static_cast<double>(INT_MAX) );
+        }
+
+        double dfOutRightXOff = (dfDstLRX - nXOff) * dfScaleWinToBufX;
         if( dfOutRightXOff < dfOutXOff )
             return FALSE;
         if( dfOutRightXOff > INT_MAX )
             dfOutRightXOff = INT_MAX;
-        *pnOutXSize = (int) ceil(dfOutRightXOff) - *pnOutXOff;
+        *pnOutXSize = (int) ceil(dfOutRightXOff-0.001) - *pnOutXOff;
 
-        *pnOutXOff = std::max(0, *pnOutXOff);
         if( *pnOutXSize > INT_MAX - *pnOutXOff ||
             *pnOutXOff + *pnOutXSize > nBufXSize )
             *pnOutXSize = nBufXSize - *pnOutXOff;
+
+        // Apply correction on floating-point source window
+        {
+            double dfDstDeltaX = (ceil(dfOutRightXOff) - dfOutRightXOff) / dfScaleWinToBufX;
+            double dfSrcDeltaX = dfDstDeltaX / m_dfDstXSize * m_dfSrcXSize;
+            *pdfReqXSize = std::min( *pdfReqXSize + dfSrcDeltaX,
+                                     static_cast<double>(INT_MAX) );
+        }
     }
 
     if( bModifiedY )
@@ -1145,25 +1162,41 @@ VRTSimpleSource::GetSrcDstWindow( int nXOff, int nYOff, int nXSize, int nYSize,
         const double dfScaleWinToBufY =
             nBufYSize / static_cast<double>( nYSize );
 
-        const double dfOutYOff = (dfDstULY - nYOff) * dfScaleWinToBufY+0.001;
+        const double dfOutYOff = (dfDstULY - nYOff) * dfScaleWinToBufY;
         if( dfOutYOff <= 0 )
             *pnOutYOff = 0;
         else if( dfOutYOff > INT_MAX )
             *pnOutYOff = INT_MAX;
         else
-            *pnOutYOff = static_cast<int>(dfOutYOff);
-        *pnOutYOff = (int) (dfOutYOff);
-        double dfOutTopYOff = (dfDstLRY - nYOff) * dfScaleWinToBufY-0.001;
+            *pnOutYOff = static_cast<int>(dfOutYOff+0.001);
+
+        // Apply correction on floating-point source window
+        {
+            double dfDstDeltaY = (dfOutYOff - *pnOutYOff) / dfScaleWinToBufY;
+            double dfSrcDeltaY = dfDstDeltaY / m_dfDstYSize * m_dfSrcYSize;
+            *pdfReqYOff -= dfSrcDeltaY;
+            *pdfReqYSize = std::min( *pdfReqYSize + dfSrcDeltaY,
+                                     static_cast<double>(INT_MAX) );
+        }
+
+        double dfOutTopYOff = (dfDstLRY - nYOff) * dfScaleWinToBufY;
         if( dfOutTopYOff < dfOutYOff )
             return FALSE;
         if( dfOutTopYOff > INT_MAX )
             dfOutTopYOff = INT_MAX;
-        *pnOutYSize = static_cast<int>( ceil(dfOutTopYOff) ) - *pnOutYOff;
+        *pnOutYSize = static_cast<int>( ceil(dfOutTopYOff-0.001) ) - *pnOutYOff;
 
-        *pnOutYOff = std::max(0, *pnOutYOff);
         if( *pnOutYSize > INT_MAX - *pnOutYOff ||
             *pnOutYOff + *pnOutYSize > nBufYSize )
             *pnOutYSize = nBufYSize - *pnOutYOff;
+
+        // Apply correction on floating-point source window
+        {
+            double dfDstDeltaY = (ceil(dfOutTopYOff) - dfOutTopYOff) / dfScaleWinToBufY;
+            double dfSrcDeltaY = dfDstDeltaY / m_dfDstYSize * m_dfSrcYSize;
+            *pdfReqYSize = std::min( *pdfReqYSize + dfSrcDeltaY,
+                                     static_cast<double>(INT_MAX) );
+        }
     }
 
     if( *pnOutXSize < 1 || *pnOutYSize < 1 )
diff --git a/gdal/gcore/rasterio.cpp b/gdal/gcore/rasterio.cpp
index 1544be7ffd16..70825c7f4fcf 100644
--- a/gdal/gcore/rasterio.cpp
+++ b/gdal/gcore/rasterio.cpp
@@ -470,10 +470,6 @@ CPLErr GDALRasterBand::IRasterIO( GDALRWFlag eRWFlag,
         dfYOff = psExtraArg->dfYOff;
         dfXSize = psExtraArg->dfXSize;
         dfYSize = psExtraArg->dfYSize;
-        CPLAssert(dfXOff - nXOff < 1.0);
-        CPLAssert(dfYOff - nYOff < 1.0);
-        CPLAssert(nXSize - dfXSize < 1.0);
-        CPLAssert(nYSize - dfYSize < 1.0);
     }
 
 /* -------------------------------------------------------------------- */
@@ -657,7 +653,8 @@ CPLErr GDALRasterBand::IRasterIO( GDALRWFlag eRWFlag,
             // Add small epsilon to avoid some numeric precision issues.
             dfSrcY = (iBufYOff+0.5) * dfSrcYInc + dfYOff + EPS;
             dfSrcX = 0.5 * dfSrcXInc + dfXOff + EPS;
-            iSrcY = static_cast<int>(dfSrcY);
+            iSrcY = static_cast<int>(std::min(std::max(0.0, dfSrcY),
+                                              static_cast<double>(nRasterYSize)));
 
             GPtrDiff_t iBufOffset =
                 static_cast<GPtrDiff_t>(iBufYOff)
@@ -690,7 +687,9 @@ CPLErr GDALRasterBand::IRasterIO( GDALRWFlag eRWFlag,
                  iBufXOff < nBufXSize;
                  iBufXOff++, dfSrcX += dfSrcXInc )
             {
-                iSrcX = static_cast<int>( dfSrcX );
+                // TODO?: try to avoid the clamping for most iterations
+                iSrcX = static_cast<int>(std::min(std::max(0.0, dfSrcX),
+                                            static_cast<double>(nRasterXSize)));
 
     /* -------------------------------------------------------------------- */
     /*      Ensure we have the appropriate block loaded.                    */
@@ -842,10 +841,6 @@ CPLErr GDALRasterBand::RasterIOResampled(
         dfYOff = psExtraArg->dfYOff;
         dfXSize = psExtraArg->dfXSize;
         dfYSize = psExtraArg->dfYSize;
-        CPLAssert(dfXOff - nXOff < 1.0);
-        CPLAssert(dfYOff - nYOff < 1.0);
-        CPLAssert(nXSize - dfXSize < 1.0);
-        CPLAssert(nYSize - dfYSize < 1.0);
     }
 
     const double dfXRatioDstToSrc = dfXSize / nBufXSize;
@@ -1338,10 +1333,6 @@ CPLErr GDALDataset::RasterIOResampled(
         dfYOff = psExtraArg->dfYOff;
         dfXSize = psExtraArg->dfXSize;
         dfYSize = psExtraArg->dfYSize;
-        CPLAssert(dfXOff - nXOff < 1.0);
-        CPLAssert(dfYOff - nYOff < 1.0);
-        CPLAssert(nXSize - dfXSize < 1.0);
-        CPLAssert(nYSize - dfYSize < 1.0);
     }
 
     const double dfXRatioDstToSrc = dfXSize / nBufXSize;

From 6f609bb956b7c0e0de7608f912fdebec5540a1e6 Mon Sep 17 00:00:00 2001
From: Ubuntu <ubuntu@ip-172-31-47-17.ec2.internal>
Date: Wed, 5 Dec 2018 16:55:58 +0000
Subject: [PATCH 106/488] cURL: added curl cookiefile and cookiejar variables
 (fixes #1000)

Committer: Scott Henderson (scottyhq@gmail.com)
---
 gdal/port/cpl_http.cpp | 13 +++++++++++++
 1 file changed, 13 insertions(+)

diff --git a/gdal/port/cpl_http.cpp b/gdal/port/cpl_http.cpp
index 6a7feb1117f3..46f5df0a817e 100644
--- a/gdal/port/cpl_http.cpp
+++ b/gdal/port/cpl_http.cpp
@@ -1776,6 +1776,19 @@ void *CPLHTTPSetOptions(void *pcurl, const char* pszURL,
         pszCookie = CPLGetConfigOption("GDAL_HTTP_COOKIE", nullptr);
     if( pszCookie != nullptr )
         curl_easy_setopt(http_handle, CURLOPT_COOKIE, pszCookie);
+        
+    const char* pszCookieFile = CSLFetchNameValue(papszOptions, "COOKIEFILE");
+    if( pszCookieFile == nullptr )
+        pszCookieFile = CPLGetConfigOption("GDAL_HTTP_COOKIEFILE", nullptr);
+    if( pszCookieFile != nullptr )
+        curl_easy_setopt(http_handle, CURLOPT_COOKIEFILE, pszCookieFile);
+
+    const char* pszCookieJar = CSLFetchNameValue(papszOptions, "COOKIEJAR");
+    if( pszCookieJar == nullptr )
+        pszCookieJar = CPLGetConfigOption("GDAL_HTTP_COOKIEJAR", nullptr);
+    if( pszCookieJar != nullptr )
+        curl_easy_setopt(http_handle, CURLOPT_COOKIEJAR, pszCookieJar);
+
 
     struct curl_slist* headers = nullptr;
     const char *pszHeaderFile = CSLFetchNameValue( papszOptions, "HEADER_FILE" );

From 7ad910793a73592b64bc03575dbeee5643c4eee6 Mon Sep 17 00:00:00 2001
From: Scott Henderson <scottyhq@gmail.com>
Date: Wed, 5 Dec 2018 17:32:34 +0000
Subject: [PATCH 107/488] documented new cookie options in Doxygen section of
 CPLHTTPFetch()

---
 gdal/port/cpl_http.cpp | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/gdal/port/cpl_http.cpp b/gdal/port/cpl_http.cpp
index 46f5df0a817e..635f5ddc593a 100644
--- a/gdal/port/cpl_http.cpp
+++ b/gdal/port/cpl_http.cpp
@@ -586,6 +586,8 @@ static void CPLHTTPEmitFetchDebug(const char* pszURL,
  * <li>NETRC=[YES/NO] to enable or disable use of $HOME/.netrc, default YES.</li>
  * <li>CUSTOMREQUEST=val, where val is GET, PUT, POST, DELETE, etc.. (GDAL >= 1.9.0)</li>
  * <li>COOKIE=val, where val is formatted as COOKIE1=VALUE1; COOKIE2=VALUE2; ...</li>
+ * <li>COOKIEFILE=val, where val is file name to read cookies from (GDAL >= 2.4)</li>
+ * <li>COOKIEJAR=val, where val is file name to store cookies to (GDAL >= 2.4)</li>
  * <li>MAX_RETRY=val, where val is the maximum number of retry attempts if a 429, 502, 503 or
  *               504 HTTP error occurs. Default is 0. (GDAL >= 2.0)</li>
  * <li>RETRY_DELAY=val, where val is the number of seconds between retry attempts.

From 7f866d27311cb7c38456fb300c50588045bed782 Mon Sep 17 00:00:00 2001
From: drons <drons@list.ru>
Date: Wed, 5 Dec 2018 21:47:12 +0300
Subject: [PATCH 108/488] MITAB: Made symbol ID checks more stringent - replace
 strstr by STARTS_WITH

---
 gdal/ogr/ogrsf_frmts/mitab/mitab_feature.cpp | 10 ++++------
 1 file changed, 4 insertions(+), 6 deletions(-)

diff --git a/gdal/ogr/ogrsf_frmts/mitab/mitab_feature.cpp b/gdal/ogr/ogrsf_frmts/mitab/mitab_feature.cpp
index 7f69caf5895a..756f8219b388 100644
--- a/gdal/ogr/ogrsf_frmts/mitab/mitab_feature.cpp
+++ b/gdal/ogr/ogrsf_frmts/mitab/mitab_feature.cpp
@@ -1566,7 +1566,7 @@ void TABFontPoint::SetSymbolFromStyle(OGRStyleSymbol* poSymbolStyle)
 
     // Try to set font glyph number
     const char* pszSymbolId = poSymbolStyle->Id(bIsNull);
-    if((!bIsNull) && pszSymbolId && strstr(pszSymbolId, "font-sym-"))
+    if((!bIsNull) && pszSymbolId && STARTS_WITH(pszSymbolId, "font-sym-"))
     {
         const int nSymbolId = atoi(pszSymbolId+9);
         SetSymbolNo(static_cast<GInt16>(nSymbolId));
@@ -8902,16 +8902,14 @@ void ITABFeatureSymbol::SetSymbolFromStyle(OGRStyleSymbol* poSymbolStyle)
     const char *pszSymbolId = poSymbolStyle->Id(bIsNull);
     if(bIsNull) pszSymbolId = nullptr;
 
-    if(pszSymbolId &&
-       (strstr(pszSymbolId, "mapinfo-sym-") ||
-        strstr(pszSymbolId, "ogr-sym-")) )
+    if(pszSymbolId)
     {
-        if(strstr(pszSymbolId, "mapinfo-sym-"))
+        if(STARTS_WITH(pszSymbolId, "mapinfo-sym-"))
         {
             const int nSymbolId = atoi(pszSymbolId+12);
             SetSymbolNo(static_cast<GByte>(nSymbolId));
         }
-        else if(strstr(pszSymbolId, "ogr-sym-"))
+        else if(STARTS_WITH(pszSymbolId, "ogr-sym-"))
         {
             const int nSymbolId = atoi(pszSymbolId+8);
 

From 241ddd6210cbfad84dd2e83fa061c64ae0a8560d Mon Sep 17 00:00:00 2001
From: Even Rouault <even.rouault@spatialys.com>
Date: Fri, 7 Dec 2018 11:58:04 +0100
Subject: [PATCH 109/488] gdal_grid: fix -clipsrc from a vector datasource
 (broken at least since GDAL 2.1)

---
 autotest/utilities/test_gdal_grid.py | 36 ++++++++++++++++++++++++++++
 gdal/apps/gdal_grid_lib.cpp          |  3 ++-
 2 files changed, 38 insertions(+), 1 deletion(-)

diff --git a/autotest/utilities/test_gdal_grid.py b/autotest/utilities/test_gdal_grid.py
index de53732b35f1..20708faca2df 100755
--- a/autotest/utilities/test_gdal_grid.py
+++ b/autotest/utilities/test_gdal_grid.py
@@ -919,6 +919,41 @@ def test_gdal_grid_12():
 
     return 'success'
 
+###############################################################################
+# Test -clipsrc
+
+
+def test_gdal_grid_clipsrc():
+    if gdal_grid is None:
+        return 'skip'
+
+    #################
+    outfiles.append('tmp/grid_clipsrc.tif')
+    try:
+        os.remove(outfiles[-1])
+    except OSError:
+        pass
+
+    open('tmp/clip.csv', 'wt').write(
+        'id,WKT\n1,"POLYGON((440750 3751340,440750 3750100,441900 3750100,441900 3751340,440750 3751340))"\n')
+
+    # Create a GDAL dataset from the values of "grid.csv".
+    # Grid nodes are located exactly in raster nodes.
+    gdaltest.runexternal_out_and_err(gdal_grid + ' -clipsrc tmp/clip.csv -txe 440720.0 441920.0 -tye 3751320.0 3750120.0 -outsize 20 20 -ot Byte -l grid -a nearest:radius1=0.0:radius2=0.0:angle=0.0:nodata=0.0 data/grid.vrt ' + outfiles[-1])
+
+    os.unlink('tmp/clip.csv')
+
+    # We should get the same values as in "gcore/data/byte.tif"
+    ds = gdal.Open(outfiles[-1])
+    cs = ds.GetRasterBand(1).Checksum()
+    if cs == 0 or cs == 4672:
+        gdaltest.post_reason('bad checksum')
+        print(cs)
+        return 'fail'
+    ds = None
+
+    return 'success'
+
 ###############################################################################
 # Cleanup
 
@@ -946,6 +981,7 @@ def test_gdal_grid_cleanup():
     test_gdal_grid_10,
     test_gdal_grid_11,
     test_gdal_grid_12,
+    test_gdal_grid_clipsrc,
     test_gdal_grid_cleanup
 ]
 
diff --git a/gdal/apps/gdal_grid_lib.cpp b/gdal/apps/gdal_grid_lib.cpp
index e63cff254b5f..a7bc0ed53374 100644
--- a/gdal/apps/gdal_grid_lib.cpp
+++ b/gdal/apps/gdal_grid_lib.cpp
@@ -625,7 +625,8 @@ static OGRGeometryCollection* LoadGeometry( const char* pszDS,
                                             const char* pszLyr,
                                             const char* pszWhere )
 {
-    GDALDataset *poDS = static_cast<GDALDataset*>(GDALOpen(pszDS, GA_ReadOnly));
+    GDALDataset *poDS = static_cast<GDALDataset*>(
+        GDALOpenEx(pszDS, GDAL_OF_VECTOR, nullptr, nullptr, nullptr));
     if ( poDS == nullptr )
         return nullptr;
 

From c4f363669c762fc82d3d044894635b2f6f89ae8b Mon Sep 17 00:00:00 2001
From: Even Rouault <even.rouault@spatialys.com>
Date: Fri, 7 Dec 2018 20:18:55 +0100
Subject: [PATCH 110/488] Skip test_gdal_grid_clipsrc if GEOS not available

---
 autotest/utilities/test_gdal_grid.py | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/autotest/utilities/test_gdal_grid.py b/autotest/utilities/test_gdal_grid.py
index 20708faca2df..df09f584749b 100755
--- a/autotest/utilities/test_gdal_grid.py
+++ b/autotest/utilities/test_gdal_grid.py
@@ -40,6 +40,7 @@
 from osgeo import ogr
 
 import gdaltest
+import ogrtest
 import test_cli_utilities
 
 # List of output TIFF files that will be created by tests and later deleted
@@ -927,6 +928,9 @@ def test_gdal_grid_clipsrc():
     if gdal_grid is None:
         return 'skip'
 
+    if not ogrtest.have_geos():
+        return 'skip'
+
     #################
     outfiles.append('tmp/grid_clipsrc.tif')
     try:

From 6b5bc8879996c446736147f8e7968693f05e9cf3 Mon Sep 17 00:00:00 2001
From: Even Rouault <even.rouault@spatialys.com>
Date: Sun, 9 Dec 2018 14:31:55 +0100
Subject: [PATCH 111/488] VRT: fix bug due to
 52efc6ddb9cde38e0ef658ff7cdcfa4ca266e689 (master only)

---
 .../gcore/data/dstsize_larger_than_source.tif  | Bin 0 -> 977 bytes
 .../gcore/data/dstsize_larger_than_source.vrt  |  14 ++++++++++++++
 autotest/gcore/vrt_read.py                     |  17 +++++++++++++++++
 gdal/frmts/gtiff/geotiff.cpp                   |   4 ++--
 gdal/gcore/rasterio.cpp                        |   4 ++--
 5 files changed, 35 insertions(+), 4 deletions(-)
 create mode 100644 autotest/gcore/data/dstsize_larger_than_source.tif
 create mode 100644 autotest/gcore/data/dstsize_larger_than_source.vrt

diff --git a/autotest/gcore/data/dstsize_larger_than_source.tif b/autotest/gcore/data/dstsize_larger_than_source.tif
new file mode 100644
index 0000000000000000000000000000000000000000..1f6128a44a6b996f3d1a2d9d816e685d41a60df4
GIT binary patch
literal 977
zcmebD)MDUZU|<knU|?isU<9$4fJ`Jd6O;{7#f-#egR((-1Q}TvxPkO9AQnXu7lX1*
zfa2m%HRphA86-8fNbF!FHeWLj12a&q8qk8K79IvRAlnYeUf<5lpa5j&0ofbdnHc1N
z>~%mk2pAHHrGe_s0QLL@Vm+XL<AHbr5FZ5MPe7~;v^WHaTY-2R5Q|$2%+6->bb!$y
zyYK<AA1NiP<}f&(UAF9&>M0*bm|8|~2(vRVumHmt1fet&%f@ywpdv<&jqU6VVhn7+
zz-DCVQ)b`+(aH5JU|Lf-+&x&q!bCw|AvDBSp(;NwRl(5EuLdGo!%#8j?Lk9ONE}-5
kZ)G~S{sNe_nDm46fK|7?k7^hep~Phmj_G}D(h>!Q0LLt)q5uE@

literal 0
HcmV?d00001

diff --git a/autotest/gcore/data/dstsize_larger_than_source.vrt b/autotest/gcore/data/dstsize_larger_than_source.vrt
new file mode 100644
index 000000000000..5038472c9766
--- /dev/null
+++ b/autotest/gcore/data/dstsize_larger_than_source.vrt
@@ -0,0 +1,14 @@
+<VRTDataset rasterXSize="3476" rasterYSize="5828">
+  <SRS>PROJCS["WGS 84 / UTM zone 11N",GEOGCS["WGS 84",DATUM["WGS_1984",SPHEROID["WGS 84",6378137,298.257223563,AUTHORITY["EPSG","7030"]],AUTHORITY["EPSG","6326"]],PRIMEM["Greenwich",0,AUTHORITY["EPSG","8901"]],UNIT["degree",0.0174532925199433,AUTHORITY["EPSG","9122"]],AUTHORITY["EPSG","4326"]],PROJECTION["Transverse_Mercator"],PARAMETER["latitude_of_origin",0],PARAMETER["central_meridian",-117],PARAMETER["scale_factor",0.9996],PARAMETER["false_easting",500000],PARAMETER["false_northing",0],UNIT["metre",1,AUTHORITY["EPSG","9001"]],AXIS["Easting",EAST],AXIS["Northing",NORTH],AUTHORITY["EPSG","32611"]]</SRS>
+  <GeoTransform>  1.3468857985001034e+05,  5.0009600968988252e+01,  0.0000000000000000e+00,  4.0103732789101200e+06,  0.0000000000000000e+00, -5.0009600968988252e+01</GeoTransform>
+  <VRTRasterBand dataType="Byte" band="1">
+    <ColorInterp>Gray</ColorInterp>
+    <ComplexSource>
+      <SourceFilename relativeToVRT="1">dstsize_larger_than_source.tif</SourceFilename>
+      <SourceBand>1</SourceBand>
+      <SourceProperties RasterXSize="528" RasterYSize="528" DataType="Byte" BlockXSize="528" BlockYSize="15" />
+      <SrcRect xOff="0" yOff="0" xSize="528" ySize="528" />
+      <DstRect xOff="27.9291767207669" yOff="4736.24196374206" xSize="528.428209166479" ySize="528.428209166479" />
+    </ComplexSource>
+  </VRTRasterBand>
+</VRTDataset>
diff --git a/autotest/gcore/vrt_read.py b/autotest/gcore/vrt_read.py
index cefb86372c59..c43d32ab3aa7 100755
--- a/autotest/gcore/vrt_read.py
+++ b/autotest/gcore/vrt_read.py
@@ -1439,6 +1439,22 @@ def vrt_subpixel_offset():
 
     return 'success'
 
+
+###############################################################################
+# Check bug fix of bug fix of
+# https://lists.osgeo.org/pipermail/gdal-dev/2018-December/049415.html
+
+def vrt_dstsize_larger_than_source():
+
+    ds = gdal.Open('data/dstsize_larger_than_source.vrt')
+    cs = ds.GetRasterBand(1).Checksum()
+    if cs != 33273:
+        gdaltest.post_reason('fail')
+        print(cs)
+        return 'fail'
+
+    return 'success'
+
 for item in init_list:
     ut = gdaltest.GDALTest('VRT', item[0], item[1], item[2])
     if ut is None:
@@ -1479,6 +1495,7 @@ def vrt_subpixel_offset():
 gdaltest_list.append(vrt_read_31)
 gdaltest_list.append(vrt_float32_with_nodata_slightly_below_float_min)
 gdaltest_list.append(vrt_subpixel_offset)
+gdaltest_list.append(vrt_dstsize_larger_than_source)
 
 if __name__ == '__main__':
 
diff --git a/gdal/frmts/gtiff/geotiff.cpp b/gdal/frmts/gtiff/geotiff.cpp
index 1c358e28756a..50bff7d34e9d 100644
--- a/gdal/frmts/gtiff/geotiff.cpp
+++ b/gdal/frmts/gtiff/geotiff.cpp
@@ -4045,8 +4045,8 @@ void* GTiffRasterBand::CacheMultiRange( int nXOff, int nYOff,
     const double EPS = 1e-10;
     const int nBlockX1 = static_cast<int>(std::max(0.0, (0+0.5) * dfSrcXInc + dfXOff + EPS)) / nBlockXSize;
     const int nBlockY1 = static_cast<int>(std::max(0.0, (0+0.5) * dfSrcYInc + dfYOff + EPS)) / nBlockYSize;
-    const int nBlockX2 = static_cast<int>(std::min(static_cast<double>(nRasterXSize), (nBufXSize-1+0.5) * dfSrcXInc + dfXOff + EPS)) / nBlockXSize;
-    const int nBlockY2 = static_cast<int>(std::min(static_cast<double>(nRasterYSize), (nBufYSize-1+0.5) * dfSrcYInc + dfYOff + EPS)) / nBlockYSize;
+    const int nBlockX2 = static_cast<int>(std::min(static_cast<double>(nRasterXSize - 1), (nBufXSize-1+0.5) * dfSrcXInc + dfXOff + EPS)) / nBlockXSize;
+    const int nBlockY2 = static_cast<int>(std::min(static_cast<double>(nRasterYSize - 1), (nBufYSize-1+0.5) * dfSrcYInc + dfYOff + EPS)) / nBlockYSize;
 
     thandle_t th = TIFFClientdata( poGDS->hTIFF );
     if( poGDS->SetDirectory() && !VSI_TIFFHasCachedRanges(th) )
diff --git a/gdal/gcore/rasterio.cpp b/gdal/gcore/rasterio.cpp
index 70825c7f4fcf..c1bfb28e8c08 100644
--- a/gdal/gcore/rasterio.cpp
+++ b/gdal/gcore/rasterio.cpp
@@ -654,7 +654,7 @@ CPLErr GDALRasterBand::IRasterIO( GDALRWFlag eRWFlag,
             dfSrcY = (iBufYOff+0.5) * dfSrcYInc + dfYOff + EPS;
             dfSrcX = 0.5 * dfSrcXInc + dfXOff + EPS;
             iSrcY = static_cast<int>(std::min(std::max(0.0, dfSrcY),
-                                              static_cast<double>(nRasterYSize)));
+                                        static_cast<double>(nRasterYSize - 1)));
 
             GPtrDiff_t iBufOffset =
                 static_cast<GPtrDiff_t>(iBufYOff)
@@ -689,7 +689,7 @@ CPLErr GDALRasterBand::IRasterIO( GDALRWFlag eRWFlag,
             {
                 // TODO?: try to avoid the clamping for most iterations
                 iSrcX = static_cast<int>(std::min(std::max(0.0, dfSrcX),
-                                            static_cast<double>(nRasterXSize)));
+                                        static_cast<double>(nRasterXSize - 1)));
 
     /* -------------------------------------------------------------------- */
     /*      Ensure we have the appropriate block loaded.                    */

From fbfb0dc354235da8ad6daa0824f9e52cf8ef2a2c Mon Sep 17 00:00:00 2001
From: Even Rouault <even.rouault@spatialys.com>
Date: Sun, 9 Dec 2018 17:49:27 +0100
Subject: [PATCH 112/488] Internal libtiff: resync with upstream (Do not
 attempt to re-sync zip stream after reported data error from inflate())

---
 gdal/frmts/gtiff/libtiff/tif_pixarlog.c | 4 ++--
 gdal/frmts/gtiff/libtiff/tif_zip.c      | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/gdal/frmts/gtiff/libtiff/tif_pixarlog.c b/gdal/frmts/gtiff/libtiff/tif_pixarlog.c
index 7438d6921511..77620e3da64b 100644
--- a/gdal/frmts/gtiff/libtiff/tif_pixarlog.c
+++ b/gdal/frmts/gtiff/libtiff/tif_pixarlog.c
@@ -817,8 +817,8 @@ PixarLogDecode(TIFF* tif, uint8* op, tmsize_t occ, uint16 s)
 			TIFFErrorExt(tif->tif_clientdata, module,
 			    "Decoding error at scanline %lu, %s",
 			    (unsigned long) tif->tif_row, sp->stream.msg ? sp->stream.msg : "(null)");
-			if (inflateSync(&sp->stream) != Z_OK)
-				return (0);
+			/* if (inflateSync(&sp->stream) != Z_OK) */
+			return (0);
 			continue;
 		}
 		if (state != Z_OK) {
diff --git a/gdal/frmts/gtiff/libtiff/tif_zip.c b/gdal/frmts/gtiff/libtiff/tif_zip.c
index 9d4bceb179c4..b71c44e829b8 100644
--- a/gdal/frmts/gtiff/libtiff/tif_zip.c
+++ b/gdal/frmts/gtiff/libtiff/tif_zip.c
@@ -179,8 +179,8 @@ ZIPDecode(TIFF* tif, uint8* op, tmsize_t occ, uint16 s)
 			TIFFErrorExt(tif->tif_clientdata, module,
 			    "Decoding error at scanline %lu, %s",
 			     (unsigned long) tif->tif_row, SAFE_MSG(sp));
-			if (inflateSync(&sp->stream) != Z_OK)
-				return (0);
+			/* if (inflateSync(&sp->stream) != Z_OK) */
+			return (0);
 			continue;
 		}
 		if (state != Z_OK) {

From b21bb7a43d02a7aca72085bd501aeb5eca295367 Mon Sep 17 00:00:00 2001
From: Even Rouault <even.rouault@spatialys.com>
Date: Mon, 10 Dec 2018 15:51:24 +0100
Subject: [PATCH 113/488] typo fix [ci skip]

---
 gdal/ogr/ogrsf_frmts/gpkg/drv_geopackage_raster.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/gdal/ogr/ogrsf_frmts/gpkg/drv_geopackage_raster.html b/gdal/ogr/ogrsf_frmts/gpkg/drv_geopackage_raster.html
index e84db2459044..783fbbfbc0da 100644
--- a/gdal/ogr/ogrsf_frmts/gpkg/drv_geopackage_raster.html
+++ b/gdal/ogr/ogrsf_frmts/gpkg/drv_geopackage_raster.html
@@ -258,7 +258,7 @@ <h3><a>Nodata value</a></h3>
 datasets. For regular tiled rasters, the alpha band must rather be used.</p>
 
 <p>For Float32 datasets with TIFF tiles, the concepts of nodata in GDAL
-and null_value in the GeoPackage internasl perfectly match.</p>
+and null_value in the GeoPackage internals perfectly match.</p>
 
 <p>For Int16, UInt16 or Float32 with PNG tiles, GDAL will generally remap the
 input nodata value to another value.</p>

From 38d3e28ebb765b56749b67416f0c4113c5191478 Mon Sep 17 00:00:00 2001
From: Craig de Stigter <craig.destigter@koordinates.com>
Date: Tue, 2 Oct 2018 23:05:53 +1300
Subject: [PATCH 114/488] Ditch testing for shlex/subprocess modules

They've been around for ages
---
 autotest/pymod/gdaltest_python2.py | 38 +++++++-----------------------
 1 file changed, 8 insertions(+), 30 deletions(-)

diff --git a/autotest/pymod/gdaltest_python2.py b/autotest/pymod/gdaltest_python2.py
index fcd226224075..35c27fbcea77 100644
--- a/autotest/pymod/gdaltest_python2.py
+++ b/autotest/pymod/gdaltest_python2.py
@@ -32,6 +32,8 @@
 import urllib2
 import socket
 import os
+import subprocess
+import shlex
 import sys
 from sys import version_info
 from Queue import Queue
@@ -124,8 +126,6 @@ def warn_if_memleak(cmd, out_str):
 
 
 def spawn_async26(cmd):
-    import shlex
-    import subprocess
     command = shlex.split(cmd)
     try:
         process = subprocess.Popen(command, stdout=subprocess.PIPE)
@@ -157,8 +157,6 @@ def wait_process(process):
 
 def _runexternal_subprocess(cmd, strin=None, check_memleak=True, display_live_on_parent_stdout=False, encoding=None):
     # pylint: disable=unused-argument
-    import subprocess
-    import shlex
     command = shlex.split(cmd)
     command = [elt.replace('\x00', '') for elt in command]
     if strin is None:
@@ -196,20 +194,11 @@ def _runexternal_subprocess(cmd, strin=None, check_memleak=True, display_live_on
 def runexternal(cmd, strin=None, check_memleak=True, display_live_on_parent_stdout=False, encoding=None):
     from gdaltest import is_travis_branch
     if not is_travis_branch('mingw'):
-        has_subprocess = False
-        try:
-            import subprocess
-            import shlex
-            if hasattr(subprocess, 'Popen') and hasattr(shlex, 'split'):
-                has_subprocess = True
-        except (ImportError, AttributeError):
-            pass
-        if has_subprocess:
-            return _runexternal_subprocess(cmd,
-                                           strin=strin,
-                                           check_memleak=check_memleak,
-                                           display_live_on_parent_stdout=display_live_on_parent_stdout,
-                                           encoding=encoding)
+        return _runexternal_subprocess(cmd,
+                                       strin=strin,
+                                       check_memleak=check_memleak,
+                                       display_live_on_parent_stdout=display_live_on_parent_stdout,
+                                       encoding=encoding)
 
     if strin is None:
         ret_stdout = os.popen(cmd)
@@ -248,8 +237,6 @@ def read_in_thread(f, q):
 
 def _runexternal_out_and_err_subprocess(cmd, check_memleak=True):
     # pylint: disable=unused-argument
-    import subprocess
-    import shlex
     command = shlex.split(cmd)
     command = [elt.replace('\x00', '') for elt in command]
     p = subprocess.Popen(command, stdout=subprocess.PIPE, stderr=subprocess.PIPE)
@@ -285,16 +272,7 @@ def _runexternal_out_and_err_subprocess(cmd, check_memleak=True):
 def runexternal_out_and_err(cmd, check_memleak=True):
     from gdaltest import is_travis_branch
     if not is_travis_branch('mingw'):
-        has_subprocess = False
-        try:
-            import subprocess
-            import shlex
-            if hasattr(subprocess, 'Popen') and hasattr(shlex, 'split'):
-                has_subprocess = True
-        except ImportError:
-            pass
-        if has_subprocess:
-            return _runexternal_out_and_err_subprocess(cmd, check_memleak=check_memleak)
+        return _runexternal_out_and_err_subprocess(cmd, check_memleak=check_memleak)
 
     (ret_stdin, ret_stdout, ret_stderr) = os.popen3(cmd)
     ret_stdin.close()

From caa6a31f96193e511536de11b3a4d0dd3ce396a1 Mon Sep 17 00:00:00 2001
From: Craig de Stigter <craig.destigter@koordinates.com>
Date: Tue, 2 Oct 2018 23:40:21 +1300
Subject: [PATCH 115/488] WIP: refactor some dynamic tests to use pytest
 parametrization

---
 autotest/gcore/hfa_srs.py    | 146 +++++++++++++----------------------
 autotest/ogr/ogr_wktempty.py |  62 +++++----------
 2 files changed, 74 insertions(+), 134 deletions(-)

diff --git a/autotest/gcore/hfa_srs.py b/autotest/gcore/hfa_srs.py
index 6140d3d33eb7..47f23f910e8d 100755
--- a/autotest/gcore/hfa_srs.py
+++ b/autotest/gcore/hfa_srs.py
@@ -30,105 +30,65 @@
 
 import sys
 
+import pytest
+
 from osgeo import gdal
 from osgeo import osr
 
 sys.path.append('../pymod')
 
-import gdaltest
-
 
 ###############################################################################
 # Write a HFA/Imagine and read it back to check its SRS
 
-class TestHFASRS(object):
-    def __init__(self, epsg_code, use_epsg_code, expected_fail):
-        self.epsg_code = epsg_code
-        self.use_epsg_code = use_epsg_code
-        self.expected_fail = expected_fail
-
-    def test(self):
-        sr = osr.SpatialReference()
-        sr.ImportFromEPSG(self.epsg_code)
-        if self.use_epsg_code == 0:
-            proj4str = sr.ExportToProj4()
-            # print(proj4str)
-            sr.SetFromUserInput(proj4str)
-
-        ds = gdal.GetDriverByName('HFA').Create('/vsimem/TestHFASRS.img', 1, 1)
-        ds.SetProjection(sr.ExportToWkt())
-        ds = None
-
-        ds = gdal.Open('/vsimem/TestHFASRS.img')
-        wkt = ds.GetProjectionRef()
-        sr2 = osr.SpatialReference()
-        sr2.SetFromUserInput(wkt)
-        ds = None
-
-        gdal.Unlink('/vsimem/TestHFASRS.img')
-
-        # For EPSG:2065. Those 2 datums are translated into D_S_JTSK in ESRI WKT... So for the purpose of
-        # comparison, substitute one for another
-        if sr.ExportToWkt().find('"System_Jednotne_Trigonometricke_Site_Katastralni_Ferro"') != -1 and \
-           sr2.ExportToWkt().find('"System_Jednotne_Trigonometricke_Site_Katastralni"') != -1:
-            wkt2 = sr2.ExportToWkt().replace('"System_Jednotne_Trigonometricke_Site_Katastralni"', '"System_Jednotne_Trigonometricke_Site_Katastralni_Ferro"')
-            sr2.SetFromUserInput(wkt2)
-
-        if (self.epsg_code == 4326 and sr2.GetAuthorityCode(None) != '4326') or sr.IsSame(sr2) != 1:
-            if self.expected_fail:
-                print('did not get expected SRS. known to be broken currently. FIXME!')
-                # print(sr)
-                # print(sr2)
-                return 'expected_fail'
-
-            gdaltest.post_reason('did not get expected SRS')
-            print(sr)
-            print(sr2)
-            return 'fail'
-
-        return 'success'
-
-
-gdaltest_list = []
-
-hfa_srs_list = [2758,  # tmerc
-                [2036, True],  # sterea   # failure caused by revert done in r22803
-                2046,  # tmerc
-                [3031, True],  # stere
-                [32661, True],  # stere
-                3035,  # laea
-                2062,  # lcc
-                2065,  # krovak
-                2066,  # cass
-                2964,  # aea
-                [3410, True],  # cea
-                [3786, True],  # eqc
-                [2934, True],  # merc
-                27200,  # nzmg
-                [2057, True],  # omerc
-                29100,  # poly
-                2056,  # somerc
-                2027,  # utm
-                4326,  # longlat
-               ]
-
-for item in hfa_srs_list:
-    try:
-        epsg_code = item[0]
-        epsg_broken = item[1]
-    except TypeError:
-        epsg_code = item
-        epsg_broken = False
-
-    ut = TestHFASRS(epsg_code, 1, epsg_broken)
-    gdaltest_list.append((ut.test, "hfa_srs_epsg_%d" % epsg_code))
-    # ut = TestHFASRS( epsg_code, 0, epsg_proj4_broken )
-    # gdaltest_list.append( (ut.test, "hfa_srs_proj4_of_epsg_%d" % epsg_code) )
-
-if __name__ == '__main__':
-
-    gdaltest.setup_run('hfa_srs')
-
-    gdaltest.run_tests(gdaltest_list)
-
-    sys.exit(gdaltest.summarize())
+@pytest.mark.parametrize('epsg_code,epsg_broken', [
+    [2758, False],  # tmerc
+    [2036, True],  # sterea   # failure caused by revert done in r22803
+    [2046, False],  # tmerc
+    [3031, True],  # stere
+    [32661, True],  # stere
+    [3035, False],  # laea
+    [2062, False],  # lcc
+    [2065, False],  # krovak
+    [2066, False],  # cass
+    [2964, False],  # aea
+    [3410, True],  # cea
+    [3786, True],  # eqc
+    [2934, True],  # merc
+    [27200, False],  # nzmg
+    [2057, True],  # omerc
+    [29100, False],  # poly
+    [2056, False],  # somerc
+    [2027, False],  # utm
+    [4326, False],  # longlat
+])
+def test_hfa_srs(epsg_code, epsg_broken):
+    sr = osr.SpatialReference()
+    sr.ImportFromEPSG(epsg_code)
+
+    ds = gdal.GetDriverByName('HFA').Create('/vsimem/TestHFASRS.img', 1, 1)
+    ds.SetProjection(sr.ExportToWkt())
+    ds = None
+
+    ds = gdal.Open('/vsimem/TestHFASRS.img')
+    wkt = ds.GetProjectionRef()
+    sr2 = osr.SpatialReference()
+    sr2.SetFromUserInput(wkt)
+    ds = None
+
+    gdal.Unlink('/vsimem/TestHFASRS.img')
+
+    # For EPSG:2065. Those 2 datums are translated into D_S_JTSK in ESRI WKT... So for the purpose of
+    # comparison, substitute one for another
+    if sr.ExportToWkt().find('"System_Jednotne_Trigonometricke_Site_Katastralni_Ferro"') != -1 and \
+       sr2.ExportToWkt().find('"System_Jednotne_Trigonometricke_Site_Katastralni"') != -1:
+        wkt2 = sr2.ExportToWkt().replace('"System_Jednotne_Trigonometricke_Site_Katastralni"', '"System_Jednotne_Trigonometricke_Site_Katastralni_Ferro"')
+        sr2.SetFromUserInput(wkt2)
+
+    if (epsg_code == 4326 and sr2.GetAuthorityCode(None) != '4326') or sr.IsSame(sr2) != 1:
+        if epsg_broken:
+            pytest.xfail('did not get expected SRS. known to be broken currently. FIXME!')
+
+        print(sr)
+        print(sr2)
+        assert False, 'did not get expected SRS'
diff --git a/autotest/ogr/ogr_wktempty.py b/autotest/ogr/ogr_wktempty.py
index a683e93c485d..3e37eede4d19 100755
--- a/autotest/ogr/ogr_wktempty.py
+++ b/autotest/ogr/ogr_wktempty.py
@@ -28,48 +28,13 @@
 
 import sys
 
-sys.path.append('../pymod')
+import pytest
 
 import gdaltest
 from osgeo import ogr
 
 
-class TestWktEmpty(object):
-    def __init__(self, inString, expectedOutString):
-        self.inString = inString
-        self.expectedOutString = expectedOutString
-
-    def isEmpty(self, geom):
-        try:
-            ogr.Geometry.IsEmpty
-        except AttributeError:
-            return 'skip'
-
-        if not geom.IsEmpty():
-            geom.Destroy()
-            gdaltest.post_reason("IsEmpty returning false for an empty geometry")
-            return 'fail'
-
-        return 'success'
-
-    def CheckIsEmpty(self):
-        geom = ogr.CreateGeometryFromWkt(self.inString)
-        wkt = geom.ExportToWkt()
-
-        if self.expectedOutString != 'POINT EMPTY':
-            if ogr.CreateGeometryFromWkb(geom.ExportToWkb()).ExportToWkt() != wkt:
-                return 'fail'
-
-        if wkt == self.expectedOutString:
-            if self.isEmpty(geom) == 'fail':
-                return 'fail'
-            return 'success'
-        else:
-            gdaltest.post_reason('WKT is wrong: ' + wkt + '. Expected value is: ' + self.expectedOutString)
-            return 'fail'
-
-
-empty_wkt_list = [
+@pytest.mark.parametrize("test_input,expected", [
     ('GEOMETRYCOLLECTION(EMPTY)', 'GEOMETRYCOLLECTION EMPTY'),
     ('MULTIPOLYGON( EMPTY )', 'MULTIPOLYGON EMPTY'),
     ('MULTILINESTRING(EMPTY)', 'MULTILINESTRING EMPTY'),
@@ -85,7 +50,25 @@ def CheckIsEmpty(self):
     ('POINT EMPTY', 'POINT EMPTY'),
     ('LINESTRING EMPTY', 'LINESTRING EMPTY'),
     ('POLYGON EMPTY', 'POLYGON EMPTY')
-]
+])
+def test_empty_wkt(test_input, expected):
+    geom = ogr.CreateGeometryFromWkt(test_input)
+    wkt = geom.ExportToWkt()
+
+    if expected != 'POINT EMPTY':
+        assert ogr.CreateGeometryFromWkb(geom.ExportToWkb()).ExportToWkt() == wkt
+
+    assert wkt == expected
+
+    try:
+        ogr.Geometry.IsEmpty
+    except AttributeError:
+        pytest.skip()
+
+    try:
+        assert geom.IsEmpty(), "IsEmpty returning false for an empty geometry"
+    finally:
+        geom.Destroy()
 
 
 def ogr_wktempty_test_partial_empty_geoms():
@@ -169,9 +152,6 @@ def ogr_wktempty_test_partial_empty_geoms():
 
 gdaltest_list = []
 
-for item in empty_wkt_list:
-    ut = TestWktEmpty(item[0], item[1])
-    gdaltest_list.append((ut.CheckIsEmpty, item[0]))
 gdaltest_list.append(ogr_wktempty_test_partial_empty_geoms)
 
 if __name__ == '__main__':

From 4452a3b41e08c626b90c57c06e58de337c42c9b2 Mon Sep 17 00:00:00 2001
From: Craig de Stigter <craig.destigter@koordinates.com>
Date: Tue, 2 Oct 2018 23:41:09 +1300
Subject: [PATCH 116/488] Pytest config

---
 autotest/GNUmakefile | 14 +++++++-------
 autotest/conftest.py | 23 +++++++++++++++++++++++
 autotest/pytest.ini  |  3 +++
 3 files changed, 33 insertions(+), 7 deletions(-)
 create mode 100644 autotest/conftest.py
 create mode 100644 autotest/pytest.ini

diff --git a/autotest/GNUmakefile b/autotest/GNUmakefile
index c0fa6c8c7ea8..61e42ea9a772 100644
--- a/autotest/GNUmakefile
+++ b/autotest/GNUmakefile
@@ -2,25 +2,25 @@ all:
 	@echo "Run 'make -j test'"
 
 gcore-test:
-	python run_all.py gcore
+	pytest gcore
 
 gdrivers-test:
-	python run_all.py gdrivers
+	pytest gdrivers
 
 alg-test:
-	python run_all.py alg
+	pytest alg
 
 osr-test:
-	python run_all.py osr
+	pytest osr
 
 ogr-test:
-	python run_all.py ogr
+	pytest ogr
 
 utilities-test:
-	python run_all.py utilities
+	pytest utilities
 
 pyscripts-test:
-	python run_all.py pyscripts
+	pytest pyscripts
 
 test check:
 	@$(MAKE) $(MFLAGS) gcore-test gdrivers-test alg-test ogr-test osr-test utilities-test pyscripts-test
diff --git a/autotest/conftest.py b/autotest/conftest.py
new file mode 100644
index 000000000000..5706d8cff2e7
--- /dev/null
+++ b/autotest/conftest.py
@@ -0,0 +1,23 @@
+# coding: utf-8
+from __future__ import absolute_import, division, print_function, unicode_literals
+
+import os
+import sys
+
+import pytest
+
+sys.path.insert(0, "pymod")
+sys.path.insert(0, ".")
+
+
+@pytest.fixture(scope="module", autouse=True)
+def chdir_to_test_file(request):
+    """
+    Changes to the same directory as the test file.
+    Tests have grown to expect this.
+    """
+    old = os.getcwd()
+
+    os.chdir(os.path.dirname(request.module.__file__))
+    yield
+    os.chdir(old)
diff --git a/autotest/pytest.ini b/autotest/pytest.ini
new file mode 100644
index 000000000000..c25ef5fa7e75
--- /dev/null
+++ b/autotest/pytest.ini
@@ -0,0 +1,3 @@
+[pytest]
+python_files = *.py
+testpaths = ogr gcore gdrivers osr alg gnm utilities pyscripts

From 9151d45b87df8ef85d40adbdda91199966b5bcc7 Mon Sep 17 00:00:00 2001
From: Craig de Stigter <craig.destigter@koordinates.com>
Date: Tue, 2 Oct 2018 23:42:01 +1300
Subject: [PATCH 117/488] Remove hacky method to run scripts as imported

The *need* for this hack is unclear. Docstring states it's so the interpreter
doesn't need to guess it's own name, but the `_as_external_script` variant is
alive and well and being used in other parts of the codebase, so it works fine.

This hack seems to play weirdly with pytest (maybe something to do with the output
capturing?) and it seemed best to just remove it.
---
 autotest/pymod/test_py_scripts.py | 91 +------------------------------
 1 file changed, 2 insertions(+), 89 deletions(-)

diff --git a/autotest/pymod/test_py_scripts.py b/autotest/pymod/test_py_scripts.py
index 056a1e9fafd0..930dc69eb538 100644
--- a/autotest/pymod/test_py_scripts.py
+++ b/autotest/pymod/test_py_scripts.py
@@ -61,27 +61,12 @@ def get_py_script(script_name):
     return None
 
 
-###############################################################################
-# Utility function of run_py_script_as_py_module()
-#
-has_main = False
-
-
-def find_main_in_module(names):
-    global has_main
-    has_main = 'main' in names
-
-
 ###############################################################################
 # Runs a Python script
+# Alias of run_py_script_as_external_script()
 #
 def run_py_script(script_path, script_name, concatenated_argv):
-
-    run_as_external_script = gdal.GetConfigOption('RUN_AS_EXTERNAL_SCRIPT', 'NO')
-
-    if run_as_external_script == 'yes' or run_as_external_script == 'YES':
-        return run_py_script_as_external_script(script_path, script_name, concatenated_argv)
-    return run_py_script_as_py_module(script_path, script_name, concatenated_argv)
+    return run_py_script_as_external_script(script_path, script_name, concatenated_argv)
 
 
 ###############################################################################
@@ -99,75 +84,3 @@ def run_py_script_as_external_script(script_path, script_name, concatenated_argv
         script_file_path = script_file_path.replace('\\', '/')
 
     return gdaltest.runexternal(python_exe + ' ' + script_file_path + ' ' + concatenated_argv, display_live_on_parent_stdout=display_live_on_parent_stdout)
-
-###############################################################################
-# Runs a Python script as a py module
-#
-# This function is an interesting concentrate of dirty hacks to run python
-# scripts without forking a new process. This way we don't need to know the
-# name and path of the python interpreter.
-#
-
-
-def run_py_script_as_py_module(script_path, script_name, concatenated_argv):
-
-    # Save original sys variables
-    saved_syspath = sys.path
-    saved_sysargv = sys.argv
-
-    sys.path.append(script_path)
-
-    # Replace argv by user provided one
-    # Add first a fake first arg that we set to be the script
-    # name but which could be any arbitrary name
-    sys.argv = [script_name + '.py']
-
-    import shlex
-    sys.argv.extend(shlex.split(concatenated_argv))
-
-    has_imported_module = False
-
-    ret = None
-
-    if os.path.exists('tmp'):
-        tmp_stdout = 'tmp/stdout.txt'
-    else:
-        tmp_stdout = 'stdout.txt'
-
-    try:
-        # Redirect stdout to file
-        fout = open(tmp_stdout, 'wt')
-        ori_stdout = sys.stdout
-        sys.stdout = fout
-
-        exec('import ' + script_name)
-        has_imported_module = True
-
-        # Detect if the script has a main() function
-        exec('find_main_in_module(dir(' + script_name + '))')
-
-        # If so, run it (otherwise the import has already run the script)
-        if has_main:
-            exec(script_name + '.main()')
-    finally:
-        # Restore original stdout
-        fout.close()
-        sys.stdout = ori_stdout
-
-    fout = open(tmp_stdout, 'rt')
-    ret = fout.read()
-    fout.close()
-
-    os.remove(tmp_stdout)
-
-    # Restore original sys variables
-    sys.path = saved_syspath
-    sys.argv = saved_sysargv
-
-    if has_imported_module:
-        # Unload the module so that it gets imported again next time
-        # (useful if wanting to run a script without main() function
-        # several time)
-        del sys.modules[script_name]
-
-    return ret

From bb0f12e2b98086c3fa33175dfe91cf1097d3751d Mon Sep 17 00:00:00 2001
From: Craig de Stigter <craig.destigter@koordinates.com>
Date: Wed, 3 Oct 2018 10:16:14 +1300
Subject: [PATCH 118/488] Minimal changes to fix test collection-time errors
 with pytest

---
 autotest/conftest.py            |  17 +++-
 autotest/gdrivers/envisat.py    |  61 +++-----------
 autotest/gdrivers/mrf.py        | 137 +++++++++++++-------------------
 autotest/ogr/ogr_gml_geom.py    |   2 +-
 autotest/ogr/ogr_gpkg.py        |   4 +-
 autotest/ogr/ogr_wkbwkt_geom.py |   2 +-
 autotest/osr/osr_metacrs.py     |   3 +-
 7 files changed, 91 insertions(+), 135 deletions(-)

diff --git a/autotest/conftest.py b/autotest/conftest.py
index 5706d8cff2e7..8c885b42ae73 100644
--- a/autotest/conftest.py
+++ b/autotest/conftest.py
@@ -6,18 +6,31 @@
 
 import pytest
 
-sys.path.insert(0, "pymod")
-sys.path.insert(0, ".")
+# Put the pymod dir on the path, so modules can `import gdaltest`
+sys.path.insert(0, os.path.join(os.path.dirname(__file__), "pymod"))
+
+# These files may be non-importable, and don't contain tests anyway.
+# So we skip searching them during test collection.
+collect_ignore = ["gdrivers/netcdf_cfchecks.py"]
 
 
 @pytest.fixture(scope="module", autouse=True)
 def chdir_to_test_file(request):
     """
     Changes to the same directory as the test file.
+    Also puts that directory at the start of sys.path,
+    so that imports of other files in the same directory are easy.
+
     Tests have grown to expect this.
+
+    NOTE: This happens when the test is *run*, not during collection.
+    So test modules must not rely on it at module level.
     """
     old = os.getcwd()
 
     os.chdir(os.path.dirname(request.module.__file__))
+    sys.path.insert(0, ".")
     yield
+    if sys.path and sys.path[0] == ".":
+        sys.path.pop(0)
     os.chdir(old)
diff --git a/autotest/gdrivers/envisat.py b/autotest/gdrivers/envisat.py
index 0cdeb4c62587..5ebc48a1f3a0 100755
--- a/autotest/gdrivers/envisat.py
+++ b/autotest/gdrivers/envisat.py
@@ -31,7 +31,6 @@
 ###############################################################################
 
 import os
-import sys
 import gzip
 from osgeo import gdal
 
@@ -75,15 +74,9 @@ def _get_mds_num(filename):
 #
 
 
-class TestEnvisat(object):
+class EnvisatTestBase(object):
     # Just a base class
 
-    def __init__(self, downloadURL, fileName, size, checksum):
-        self.downloadURL = downloadURL
-        self.fileName = fileName
-        self.size = size
-        self.checksum = checksum
-
     def download_file(self):
         # download and decompress
         if not gdaltest.download_file(self.downloadURL, os.path.basename(self.downloadURL), -1):
@@ -193,7 +186,12 @@ def test_envisat_5(self):
 #
 
 
-class TestEnvisatASAR(TestEnvisat):
+class TestEnvisatASAR(EnvisatTestBase):
+    downloadURL = 'http://earth.esa.int/services/sample_products/asar/DS1/WS/ASA_WS__BPXPDE20020714_100425_000001202007_00380_01937_0053.N1.gz'
+    fileName = 'ASA_WS__BPXPDE20020714_100425_000001202007_00380_01937_0053.N1'
+    size = (524, 945)
+    checksum = 44998
+
     def test_envisat_asar_1(self):
         # test sensor ID
 
@@ -261,7 +259,12 @@ def test_envisat_asar_2(self):
 #
 
 
-class TestEnvisatMERIS(TestEnvisat):
+class TestEnvisatMERIS(EnvisatTestBase):
+    downloadURL = 'http://earth.esa.int/services/sample_products/meris/RRC/L2/MER_RRC_2PTGMV20000620_104318_00000104X000_00000_00000_0001.N1.gz'
+    fileName = 'MER_RRC_2PTGMV20000620_104318_00000104X000_00000_00000_0001.N1'
+    size = (1121, 593)
+    checksum = 55146
+
     def test_envisat_meris_1(self):
         # test sensor ID
 
@@ -406,41 +409,3 @@ def test_envisat_meris_4(self):
                     return 'fail'
 
         return 'success'
-
-
-ut1 = TestEnvisatASAR(
-    'http://earth.esa.int/services/sample_products/asar/DS1/WS/ASA_WS__BPXPDE20020714_100425_000001202007_00380_01937_0053.N1.gz',
-    'ASA_WS__BPXPDE20020714_100425_000001202007_00380_01937_0053.N1',
-    (524, 945),
-    44998)
-ut2 = TestEnvisatMERIS(
-    'http://earth.esa.int/services/sample_products/meris/RRC/L2/MER_RRC_2PTGMV20000620_104318_00000104X000_00000_00000_0001.N1.gz',
-    'MER_RRC_2PTGMV20000620_104318_00000104X000_00000_00000_0001.N1',
-    (1121, 593),
-    55146)
-
-gdaltest_list = [
-    ut1.test_envisat_1,
-    ut1.test_envisat_2,
-    ut1.test_envisat_3,
-    ut1.test_envisat_4,
-    ut1.test_envisat_asar_1,
-    ut1.test_envisat_asar_2,
-    ut2.test_envisat_1,
-    ut2.test_envisat_2,
-    ut2.test_envisat_3,
-    ut2.test_envisat_4,
-    ut2.test_envisat_meris_1,
-    ut2.test_envisat_meris_2,
-    ut2.test_envisat_meris_3,
-    ut2.test_envisat_meris_4,
-]
-
-
-if __name__ == '__main__':
-
-    gdaltest.setup_run('envisat')
-
-    gdaltest.run_tests(gdaltest_list)
-
-    sys.exit(gdaltest.summarize())
diff --git a/autotest/gdrivers/mrf.py b/autotest/gdrivers/mrf.py
index be480ae7f85e..d9f2fc72ad60 100755
--- a/autotest/gdrivers/mrf.py
+++ b/autotest/gdrivers/mrf.py
@@ -31,48 +31,69 @@
 import sys
 import glob
 
+import pytest
+
 sys.path.append('../pymod')
 
 from osgeo import gdal
 
 import gdaltest
 
-init_list = [
-    ('byte.tif', 1, 4672, None),
-    ('byte.tif', 1, 4672, ['COMPRESS=DEFLATE']),
-    ('byte.tif', 1, 4672, ['COMPRESS=NONE']),
-    ('byte.tif', 1, 4672, ['COMPRESS=LERC']),
-    ('byte.tif', 1, [4672, 5015], ['COMPRESS=LERC', 'OPTIONS:LERC_PREC=10']),
-    ('byte.tif', 1, 4672, ['COMPRESS=LERC', 'OPTIONS=V1:YES']),
-    ('int16.tif', 1, 4672, None),
-    ('int16.tif', 1, 4672, ['COMPRESS=LERC']),
-    ('int16.tif', 1, 4672, ['COMPRESS=LERC', 'OPTIONS=V1:YES']),
-    ('../../gcore/data/uint16.tif', 1, 4672, None),
-    ('../../gcore/data/uint16.tif', 1, 4672, ['COMPRESS=LERC']),
-    ('../../gcore/data/uint16.tif', 1, 4672, ['COMPRESS=LERC', 'OPTIONS=V1:YES']),
-    ('../../gcore/data/int32.tif', 1, 4672, ['COMPRESS=TIF']),
-    ('../../gcore/data/int32.tif', 1, 4672, ['COMPRESS=LERC']),
-    ('../../gcore/data/int32.tif', 1, 4672, ['COMPRESS=LERC', 'OPTIONS=V1:YES']),
-    ('../../gcore/data/uint32.tif', 1, 4672, ['COMPRESS=TIF']),
-    ('../../gcore/data/uint32.tif', 1, 4672, ['COMPRESS=LERC']),
-    ('../../gcore/data/uint32.tif', 1, 4672, ['COMPRESS=LERC', 'OPTIONS=V1:YES']),
-    ('../../gcore/data/float32.tif', 1, 4672, ['COMPRESS=TIF']),
-    ('../../gcore/data/float32.tif', 1, 4672, ['COMPRESS=LERC']),
-    ('../../gcore/data/float32.tif', 1, 4672, ['COMPRESS=LERC', 'OPTIONS=V1:YES']),
-    ('../../gcore/data/float64.tif', 1, 4672, ['COMPRESS=TIF']),
-    ('../../gcore/data/float64.tif', 1, 4672, ['COMPRESS=LERC']),
-    ('../../gcore/data/float64.tif', 1, [4672, 5015], ['COMPRESS=LERC', 'OPTIONS:LERC_PREC=10']),
-    ('../../gcore/data/float64.tif', 1, 4672, ['COMPRESS=LERC', 'OPTIONS=V1:YES']),
-    ('../../gcore/data/utmsmall.tif', 1, 50054, None),
-    ('small_world_pct.tif', 1, 14890, ['COMPRESS=PPNG']),
-    ('byte.tif', 1, [4672, [4603, 4652]], ['COMPRESS=JPEG', 'QUALITY=99']),
+
+@pytest.mark.parametrize('src_filename,chksum,chksum_after_reopening,options', [
+    ('byte.tif', 4672, [4672], []),
+    ('byte.tif', 4672, [4672], ['COMPRESS=DEFLATE']),
+    ('byte.tif', 4672, [4672], ['COMPRESS=NONE']),
+    ('byte.tif', 4672, [4672], ['COMPRESS=LERC']),
+    ('byte.tif', 4672, [5015], ['COMPRESS=LERC', 'OPTIONS:LERC_PREC=10']),
+    ('byte.tif', 4672, [4672], ['COMPRESS=LERC', 'OPTIONS=V1:YES']),
+    ('int16.tif', 4672, [4672], []),
+    ('int16.tif', 4672, [4672], ['COMPRESS=LERC']),
+    ('int16.tif', 4672, [4672], ['COMPRESS=LERC', 'OPTIONS=V1:YES']),
+    ('../../gcore/data/uint16.tif', 4672, [4672], []),
+    ('../../gcore/data/uint16.tif', 4672, [4672], ['COMPRESS=LERC']),
+    ('../../gcore/data/uint16.tif', 4672, [4672], ['COMPRESS=LERC', 'OPTIONS=V1:YES']),
+    ('../../gcore/data/int32.tif', 4672, [4672], ['COMPRESS=TIF']),
+    ('../../gcore/data/int32.tif', 4672, [4672], ['COMPRESS=LERC']),
+    ('../../gcore/data/int32.tif', 4672, [4672], ['COMPRESS=LERC', 'OPTIONS=V1:YES']),
+    ('../../gcore/data/uint32.tif', 4672, [4672], ['COMPRESS=TIF']),
+    ('../../gcore/data/uint32.tif', 4672, [4672], ['COMPRESS=LERC']),
+    ('../../gcore/data/uint32.tif', 4672, [4672], ['COMPRESS=LERC', 'OPTIONS=V1:YES']),
+    ('../../gcore/data/float32.tif', 4672, [4672], ['COMPRESS=TIF']),
+    ('../../gcore/data/float32.tif', 4672, [4672], ['COMPRESS=LERC']),
+    ('../../gcore/data/float32.tif', 4672, [4672], ['COMPRESS=LERC', 'OPTIONS=V1:YES']),
+    ('../../gcore/data/float64.tif', 4672, [4672], ['COMPRESS=TIF']),
+    ('../../gcore/data/float64.tif', 4672, [4672], ['COMPRESS=LERC']),
+    ('../../gcore/data/float64.tif', 4672, [5015], ['COMPRESS=LERC', 'OPTIONS:LERC_PREC=10']),
+    ('../../gcore/data/float64.tif', 4672, [4672], ['COMPRESS=LERC', 'OPTIONS=V1:YES']),
+    ('../../gcore/data/utmsmall.tif', 50054, [50054], []),
+    ('small_world_pct.tif', 14890, [14890], ['COMPRESS=PPNG']),
+    ('byte.tif', 4672, [4603, 4652], ['COMPRESS=JPEG', 'QUALITY=99']),
     # following expected checksums are for: gcc 4.4 debug, mingw/vc9 32-bit, mingw-w64/vc12 64bit, MacOSX
-    ('rgbsmall.tif', 1, [21212, [21162, 21110, 21155, 21116]], ['COMPRESS=JPEG', 'QUALITY=99']),
-    ('rgbsmall.tif', 1, [21212, [21266, 21369, 21256, 21495]], ['INTERLEAVE=PIXEL', 'COMPRESS=JPEG', 'QUALITY=99']),
-    ('rgbsmall.tif', 1, [21212, [21261, 21209, 21254, 21215]], ['INTERLEAVE=PIXEL', 'COMPRESS=JPEG', 'QUALITY=99', 'PHOTOMETRIC=RGB']),
-    ('rgbsmall.tif', 1, [21212, [21283, 21127, 21278, 21124]], ['INTERLEAVE=PIXEL', 'COMPRESS=JPEG', 'QUALITY=99', 'PHOTOMETRIC=YCC']),
-    ('12bit_rose_extract.jpg', 1, [30075, [29650, 29680, 29680, 29650]], ['COMPRESS=JPEG']),
-]
+    ('rgbsmall.tif', 21212, [21162, 21110, 21155, 21116], ['COMPRESS=JPEG', 'QUALITY=99']),
+    ('rgbsmall.tif', 21212, [21266, 21369, 21256, 21495], ['INTERLEAVE=PIXEL', 'COMPRESS=JPEG', 'QUALITY=99']),
+    ('rgbsmall.tif', 21212, [21261, 21209, 21254, 21215], ['INTERLEAVE=PIXEL', 'COMPRESS=JPEG', 'QUALITY=99', 'PHOTOMETRIC=RGB']),
+    ('rgbsmall.tif', 21212, [21283, 21127, 21278, 21124], ['INTERLEAVE=PIXEL', 'COMPRESS=JPEG', 'QUALITY=99', 'PHOTOMETRIC=YCC']),
+    ('12bit_rose_extract.jpg', 30075, [29650, 29680, 29680, 29650], ['COMPRESS=JPEG']),
+])
+def test_mrf(src_filename, chksum, chksum_after_reopening, options):
+    if src_filename == '12bit_rose_extract.jpg':
+        import jpeg
+        jpeg.jpeg_1()
+        pytest.skipif(gdaltest.jpeg_version == '9b')
+
+    with gdaltest.error_handler():
+        ds = gdal.Open('data/' + src_filename)
+    pytest.skipif(ds is None)
+
+    ds = None
+    ut = gdaltest.GDALTest('MRF', src_filename, 1, chksum, options=options, chksum_after_reopening=chksum_after_reopening)
+
+    check_minmax = 'COMPRESS=JPEG' not in ut.options
+    for x in ut.options:
+        if x.find('OPTIONS:LERC_PREC=') >= 0:
+            check_minmax = False
+    return ut.testCreateCopy(check_minmax=check_minmax)
 
 
 def mrf_zen_test():
@@ -730,52 +751,6 @@ def mrf_cleanup():
 gdaltest_list = []
 
 
-class myTestCreateCopyWrapper(object):
-
-    def __init__(self, ut):
-        self.ut = ut
-
-    def myTestCreateCopy(self):
-        check_minmax = 'COMPRESS=JPEG' not in self.ut.options
-        for x in self.ut.options:
-            if x.find('OPTIONS:LERC_PREC=') >= 0:
-                check_minmax = False
-        return self.ut.testCreateCopy(check_minmax=check_minmax)
-
-
-for item in init_list:
-    src_filename = item[0]
-
-    if src_filename == '12bit_rose_extract.jpg':
-        import jpeg
-        jpeg.jpeg_1()
-        if gdaltest.jpeg_version == '9b':
-            continue
-
-    with gdaltest.error_handler():
-        ds = gdal.Open('data/' + src_filename)
-    if ds is None:
-        continue
-    ds = None
-    options = []
-    if item[3]:
-        options = item[3]
-    chksum_param = item[2]
-    if isinstance(chksum_param, list):
-        chksum = chksum_param[0]
-        chksum_after_reopening = chksum_param[1]
-    else:
-        chksum = chksum_param
-        chksum_after_reopening = chksum_param
-
-    ut = gdaltest.GDALTest('MRF', src_filename, item[1], chksum, options=options, chksum_after_reopening=chksum_after_reopening)
-    if ut is None:
-        print('MRF tests skipped')
-
-    ut = myTestCreateCopyWrapper(ut)
-
-    gdaltest_list.append((ut.myTestCreateCopy, item[0] + ' ' + str(options)))
-
 gdaltest_list += [mrf_overview_near_fact_2]
 gdaltest_list += [mrf_overview_near_with_nodata_fact_2]
 gdaltest_list += [mrf_overview_avg_fact_2]
diff --git a/autotest/ogr/ogr_gml_geom.py b/autotest/ogr/ogr_gml_geom.py
index cc605e73798c..c4dc4471193f 100755
--- a/autotest/ogr/ogr_gml_geom.py
+++ b/autotest/ogr/ogr_gml_geom.py
@@ -2441,7 +2441,7 @@ def gml_write_gml_ns():
 
 gdaltest_list = []
 
-files = os.listdir('data/wkb_wkt')
+files = os.listdir(os.path.join(os.path.dirname(__file__), 'data/wkb_wkt'))
 for filename in files:
     if filename[-4:] == '.wkt':
         ut = gml_geom_unit(filename[:-4])
diff --git a/autotest/ogr/ogr_gpkg.py b/autotest/ogr/ogr_gpkg.py
index f1a81379ddb5..5d6ad075818b 100755
--- a/autotest/ogr/ogr_gpkg.py
+++ b/autotest/ogr/ogr_gpkg.py
@@ -46,8 +46,10 @@
 from osgeo import ogr
 from osgeo import osr
 import gdaltest
-sys.path.append('../osr')
+
+sys.path.append(os.path.normpath(os.path.join(os.path.dirname(__file__), '../osr')))
 import osr_proj4
+sys.path.pop()
 
 ###############################################################################
 # Validate a geopackage
diff --git a/autotest/ogr/ogr_wkbwkt_geom.py b/autotest/ogr/ogr_wkbwkt_geom.py
index 456ed2e2e75b..27f5f8e3e1db 100755
--- a/autotest/ogr/ogr_wkbwkt_geom.py
+++ b/autotest/ogr/ogr_wkbwkt_geom.py
@@ -679,7 +679,7 @@ def ogr_wkt_multipolygon_corrupted():
 
 gdaltest_list = []
 
-files = os.listdir('data/wkb_wkt')
+files = os.listdir(os.path.join(os.path.dirname(__file__), 'data/wkb_wkt'))
 for filename in files:
     if filename[-4:] == '.wkb':
         ut = wkb_wkt_unit(filename[:-4])
diff --git a/autotest/osr/osr_metacrs.py b/autotest/osr/osr_metacrs.py
index 01d889570df5..97bcee50cf05 100755
--- a/autotest/osr/osr_metacrs.py
+++ b/autotest/osr/osr_metacrs.py
@@ -30,6 +30,7 @@
 # DEALINGS IN THE SOFTWARE.
 ###############################################################################
 
+import os
 import sys
 import csv
 
@@ -169,7 +170,7 @@ def testMetaCRS(self):
 
 gdaltest_list = []
 
-csv_reader = csv.DictReader(open('data/Test_Data_File.csv', 'rt'))
+csv_reader = csv.DictReader(open(os.path.join(os.path.dirname(__file__), 'data/Test_Data_File.csv'), 'rt'))
 
 for test in csv_reader:
     ut = MetaCRSTest(test)

From 064263b099bc57d2bc46516931187498d0c9320c Mon Sep 17 00:00:00 2001
From: Craig de Stigter <craig.destigter@koordinates.com>
Date: Wed, 3 Oct 2018 11:04:10 +1300
Subject: [PATCH 119/488] Remove extra sys.path entries when running tests

pytest runs all tests in the same process, which means we can append
this to the path *once* rather than in each module.
See conftest.py where this gets added once.
---
 autotest/alg/applyverticalshiftgrid.py        | 1 -
 autotest/alg/contour.py                       | 1 -
 autotest/alg/cutline.py                       | 1 -
 autotest/alg/dither.py                        | 1 -
 autotest/alg/polygonize.py                    | 1 -
 autotest/alg/proximity.py                     | 1 -
 autotest/alg/rasterize.py                     | 1 -
 autotest/alg/reproject.py                     | 1 -
 autotest/alg/sieve.py                         | 1 -
 autotest/alg/tps.py                           | 1 -
 autotest/alg/transformgeoloc.py               | 1 -
 autotest/alg/warp.py                          | 1 -
 autotest/gcore/aaigrid_read.py                | 1 -
 autotest/gcore/aaigrid_write.py               | 1 -
 autotest/gcore/asyncreader.py                 | 1 -
 autotest/gcore/basic_test.py                  | 1 -
 autotest/gcore/bmp_read.py                    | 1 -
 autotest/gcore/bmp_write.py                   | 1 -
 autotest/gcore/colortable.py                  | 1 -
 autotest/gcore/envi_read.py                   | 1 -
 autotest/gcore/gcps2geotransform.py           | 1 -
 autotest/gcore/gdal_api_proxy.py              | 1 -
 autotest/gcore/gdal_stats.py                  | 1 -
 autotest/gcore/geoloc.py                      | 1 -
 autotest/gcore/gtiff_write.py                 | 1 -
 autotest/gcore/hdf4_read.py                   | 1 -
 autotest/gcore/hdf4_write.py                  | 1 -
 autotest/gcore/hfa_read.py                    | 1 -
 autotest/gcore/hfa_rfc40.py                   | 1 -
 autotest/gcore/hfa_srs.py                     | 1 -
 autotest/gcore/hfa_write.py                   | 1 -
 autotest/gcore/histogram.py                   | 1 -
 autotest/gcore/identify.py                    | 1 -
 autotest/gcore/mask.py                        | 1 -
 autotest/gcore/minixml.py                     | 1 -
 autotest/gcore/misc.py                        | 1 -
 autotest/gcore/numpy_rw.py                    | 1 -
 autotest/gcore/overviewds.py                  | 1 -
 autotest/gcore/pam.py                         | 1 -
 autotest/gcore/pixfun.py                      | 1 -
 autotest/gcore/pnm_read.py                    | 1 -
 autotest/gcore/pnm_write.py                   | 1 -
 autotest/gcore/rasterio.py                    | 1 -
 autotest/gcore/rat.py                         | 1 -
 autotest/gcore/rfc30.py                       | 1 -
 autotest/gcore/testnonboundtoswig.py          | 1 -
 autotest/gcore/thread_test.py                 | 1 -
 autotest/gcore/tiff_ovr.py                    | 1 -
 autotest/gcore/tiff_read.py                   | 1 -
 autotest/gcore/tiff_srs.py                    | 1 -
 autotest/gcore/tiff_write.py                  | 1 -
 autotest/gcore/transformer.py                 | 1 -
 autotest/gcore/virtualmem.py                  | 1 -
 autotest/gcore/vrt_read.py                    | 1 -
 autotest/gcore/vrtmisc.py                     | 1 -
 autotest/gcore/vsiaz.py                       | 1 -
 autotest/gcore/vsicrypt.py                    | 1 -
 autotest/gcore/vsicurl.py                     | 1 -
 autotest/gcore/vsicurl_streaming.py           | 1 -
 autotest/gcore/vsifile.py                     | 1 -
 autotest/gcore/vsigs.py                       | 1 -
 autotest/gcore/vsihdfs.py                     | 1 -
 autotest/gcore/vsioss.py                      | 1 -
 autotest/gcore/vsis3.py                       | 1 -
 autotest/gcore/vsistdin.py                    | 1 -
 autotest/gcore/vsiswift.py                    | 1 -
 autotest/gcore/vsiwebhdfs.py                  | 1 -
 autotest/gcore/vsizip.py                      | 1 -
 autotest/gdrivers/aaigrid.py                  | 1 -
 autotest/gdrivers/ace2.py                     | 1 -
 autotest/gdrivers/adrg.py                     | 1 -
 autotest/gdrivers/aigrid.py                   | 1 -
 autotest/gdrivers/arg.py                      | 1 -
 autotest/gdrivers/bag.py                      | 1 -
 autotest/gdrivers/blx.py                      | 1 -
 autotest/gdrivers/bsb.py                      | 1 -
 autotest/gdrivers/bt.py                       | 1 -
 autotest/gdrivers/byn.py                      | 1 -
 autotest/gdrivers/cals.py                     | 1 -
 autotest/gdrivers/ceos.py                     | 1 -
 autotest/gdrivers/cpg.py                      | 1 -
 autotest/gdrivers/ctg.py                      | 1 -
 autotest/gdrivers/db2.py                      | 1 -
 autotest/gdrivers/derived.py                  | 1 -
 autotest/gdrivers/dimap.py                    | 1 -
 autotest/gdrivers/dipex.py                    | 1 -
 autotest/gdrivers/dods.py                     | 1 -
 autotest/gdrivers/doq1.py                     | 1 -
 autotest/gdrivers/doq2.py                     | 1 -
 autotest/gdrivers/dted.py                     | 1 -
 autotest/gdrivers/e00grid.py                  | 1 -
 autotest/gdrivers/ecrgtoc.py                  | 1 -
 autotest/gdrivers/ecw.py                      | 1 -
 autotest/gdrivers/eedai.py                    | 1 -
 autotest/gdrivers/ehdr.py                     | 1 -
 autotest/gdrivers/eir.py                      | 1 -
 autotest/gdrivers/elas.py                     | 1 -
 autotest/gdrivers/envi.py                     | 1 -
 autotest/gdrivers/envisat.py                  | 1 -
 autotest/gdrivers/ers.py                      | 1 -
 autotest/gdrivers/fast.py                     | 1 -
 autotest/gdrivers/fit.py                      | 1 -
 autotest/gdrivers/fits.py                     | 1 -
 autotest/gdrivers/fujibas.py                  | 1 -
 autotest/gdrivers/gdalhttp.py                 | 1 -
 autotest/gdrivers/genbin.py                   | 1 -
 autotest/gdrivers/georaster.py                | 1 -
 autotest/gdrivers/gff.py                      | 1 -
 autotest/gdrivers/gif.py                      | 1 -
 autotest/gdrivers/gmt.py                      | 1 -
 autotest/gdrivers/gpkg.py                     | 1 -
 autotest/gdrivers/grass.py                    | 1 -
 autotest/gdrivers/grassasciigrid.py           | 1 -
 autotest/gdrivers/grib.py                     | 1 -
 autotest/gdrivers/gsc.py                      | 1 -
 autotest/gdrivers/gsg.py                      | 1 -
 autotest/gdrivers/gta.py                      | 1 -
 autotest/gdrivers/gtx.py                      | 1 -
 autotest/gdrivers/gxf.py                      | 1 -
 autotest/gdrivers/hdf5.py                     | 1 -
 autotest/gdrivers/hf2.py                      | 1 -
 autotest/gdrivers/hfa.py                      | 1 -
 autotest/gdrivers/ida.py                      | 1 -
 autotest/gdrivers/idrisi.py                   | 1 -
 autotest/gdrivers/ilwis.py                    | 1 -
 autotest/gdrivers/ingr.py                     | 1 -
 autotest/gdrivers/iris.py                     | 1 -
 autotest/gdrivers/isce.py                     | 1 -
 autotest/gdrivers/isis.py                     | 1 -
 autotest/gdrivers/isis2.py                    | 1 -
 autotest/gdrivers/jdem.py                     | 1 -
 autotest/gdrivers/jp2kak.py                   | 1 -
 autotest/gdrivers/jp2lura.py                  | 1 -
 autotest/gdrivers/jp2metadata.py              | 1 -
 autotest/gdrivers/jp2openjpeg.py              | 1 -
 autotest/gdrivers/jpeg.py                     | 1 -
 autotest/gdrivers/jpeg2000.py                 | 1 -
 autotest/gdrivers/jpeg_profile.py             | 1 -
 autotest/gdrivers/jpegls.py                   | 1 -
 autotest/gdrivers/jpipkak.py                  | 1 -
 autotest/gdrivers/kea.py                      | 1 -
 autotest/gdrivers/kmlsuperoverlay.py          | 1 -
 autotest/gdrivers/kro.py                      | 1 -
 autotest/gdrivers/l1b.py                      | 1 -
 autotest/gdrivers/lan.py                      | 1 -
 autotest/gdrivers/lcp.py                      | 1 -
 autotest/gdrivers/leveller.py                 | 1 -
 autotest/gdrivers/loslas.py                   | 1 -
 autotest/gdrivers/mbtiles.py                  | 1 -
 autotest/gdrivers/mem.py                      | 1 -
 autotest/gdrivers/mff.py                      | 1 -
 autotest/gdrivers/mff2.py                     | 1 -
 autotest/gdrivers/mg4lidar.py                 | 1 -
 autotest/gdrivers/mrf.py                      | 1 -
 autotest/gdrivers/mrsid.py                    | 1 -
 autotest/gdrivers/ndf.py                      | 1 -
 autotest/gdrivers/netcdf.py                   | 1 -
 autotest/gdrivers/netcdf_cf.py                | 1 -
 autotest/gdrivers/ngsgeoid.py                 | 1 -
 autotest/gdrivers/nitf.py                     | 1 -
 autotest/gdrivers/ntv2.py                     | 1 -
 autotest/gdrivers/nwt_grc.py                  | 1 -
 autotest/gdrivers/nwt_grd.py                  | 1 -
 autotest/gdrivers/ozi.py                      | 1 -
 autotest/gdrivers/paux.py                     | 1 -
 autotest/gdrivers/pcidsk.py                   | 1 -
 autotest/gdrivers/pcraster.py                 | 1 -
 autotest/gdrivers/pdf.py                      | 1 -
 autotest/gdrivers/pds.py                      | 1 -
 autotest/gdrivers/pds4.py                     | 1 -
 autotest/gdrivers/plmosaic.py                 | 1 -
 autotest/gdrivers/png.py                      | 1 -
 autotest/gdrivers/png_profile.py              | 1 -
 autotest/gdrivers/pnm.py                      | 1 -
 autotest/gdrivers/postgisraster.py            | 1 -
 autotest/gdrivers/prf.py                      | 1 -
 autotest/gdrivers/r.py                        | 1 -
 autotest/gdrivers/rasdaman.py                 | 1 -
 autotest/gdrivers/rasterlite.py               | 1 -
 autotest/gdrivers/rda.py                      | 1 -
 autotest/gdrivers/rik.py                      | 1 -
 autotest/gdrivers/rl2.py                      | 1 -
 autotest/gdrivers/rmf.py                      | 1 -
 autotest/gdrivers/roipac.py                   | 1 -
 autotest/gdrivers/rpftoc.py                   | 1 -
 autotest/gdrivers/rraster.py                  | 1 -
 autotest/gdrivers/rs2.py                      | 1 -
 autotest/gdrivers/safe.py                     | 1 -
 autotest/gdrivers/saga.py                     | 1 -
 autotest/gdrivers/sar_ceos.py                 | 1 -
 autotest/gdrivers/sdts.py                     | 1 -
 autotest/gdrivers/sentinel2.py                | 1 -
 autotest/gdrivers/sgi.py                      | 1 -
 autotest/gdrivers/sigdem.py                   | 1 -
 autotest/gdrivers/snodas.py                   | 1 -
 autotest/gdrivers/srp.py                      | 1 -
 autotest/gdrivers/srtmhgt.py                  | 1 -
 autotest/gdrivers/terragen.py                 | 1 -
 autotest/gdrivers/test_validate_jp2.py        | 1 -
 autotest/gdrivers/tiff_profile.py             | 1 -
 autotest/gdrivers/til.py                      | 1 -
 autotest/gdrivers/usgsdem.py                  | 1 -
 autotest/gdrivers/vicar.py                    | 1 -
 autotest/gdrivers/vrtderived.py               | 1 -
 autotest/gdrivers/vrtfilt.py                  | 1 -
 autotest/gdrivers/vrtlut.py                   | 1 -
 autotest/gdrivers/vrtmask.py                  | 1 -
 autotest/gdrivers/vrtovr.py                   | 1 -
 autotest/gdrivers/vrtpansharpen.py            | 1 -
 autotest/gdrivers/vrtrawlink.py               | 1 -
 autotest/gdrivers/vrtwarp.py                  | 1 -
 autotest/gdrivers/wcs.py                      | 1 -
 autotest/gdrivers/webp.py                     | 1 -
 autotest/gdrivers/wms.py                      | 1 -
 autotest/gdrivers/wmts.py                     | 1 -
 autotest/gdrivers/xmp.py                      | 1 -
 autotest/gdrivers/xpm.py                      | 1 -
 autotest/gdrivers/xyz.py                      | 1 -
 autotest/gdrivers/zmap.py                     | 1 -
 autotest/gnm/gnm_test.py                      | 1 -
 autotest/ogr/ogr_arcgen.py                    | 1 -
 autotest/ogr/ogr_avc.py                       | 1 -
 autotest/ogr/ogr_basic_test.py                | 1 -
 autotest/ogr/ogr_bna.py                       | 1 -
 autotest/ogr/ogr_cad.py                       | 1 -
 autotest/ogr/ogr_carto.py                     | 3 +--
 autotest/ogr/ogr_cloudant.py                  | 1 -
 autotest/ogr/ogr_couchdb.py                   | 1 -
 autotest/ogr/ogr_csv.py                       | 1 -
 autotest/ogr/ogr_csw.py                       | 1 -
 autotest/ogr/ogr_db2.py                       | 1 -
 autotest/ogr/ogr_db2_hack.py                  | 1 -
 autotest/ogr/ogr_dgn.py                       | 1 -
 autotest/ogr/ogr_dgnv8.py                     | 1 -
 autotest/ogr/ogr_dods.py                      | 1 -
 autotest/ogr/ogr_dxf.py                       | 1 -
 autotest/ogr/ogr_edigeo.py                    | 1 -
 autotest/ogr/ogr_eeda.py                      | 1 -
 autotest/ogr/ogr_elasticsearch.py             | 1 -
 autotest/ogr/ogr_factory.py                   | 1 -
 autotest/ogr/ogr_feature.py                   | 1 -
 autotest/ogr/ogr_fgdb.py                      | 1 -
 autotest/ogr/ogr_fgdb_stress_test.py          | 1 -
 autotest/ogr/ogr_geoconcept.py                | 1 -
 autotest/ogr/ogr_geojson.py                   | 1 -
 autotest/ogr/ogr_geojsonseq.py                | 1 -
 autotest/ogr/ogr_geom.py                      | 1 -
 autotest/ogr/ogr_georss.py                    | 1 -
 autotest/ogr/ogr_geos.py                      | 1 -
 autotest/ogr/ogr_gft.py                       | 1 -
 autotest/ogr/ogr_gml_fgd_read.py              | 1 -
 autotest/ogr/ogr_gml_geom.py                  | 1 -
 autotest/ogr/ogr_gml_read.py                  | 1 -
 autotest/ogr/ogr_gmlas.py                     | 1 -
 autotest/ogr/ogr_gmt.py                       | 1 -
 autotest/ogr/ogr_gpkg.py                      | 1 -
 autotest/ogr/ogr_gpsbabel.py                  | 1 -
 autotest/ogr/ogr_gpx.py                       | 1 -
 autotest/ogr/ogr_grass.py                     | 1 -
 autotest/ogr/ogr_gtm.py                       | 1 -
 autotest/ogr/ogr_htf.py                       | 1 -
 autotest/ogr/ogr_idrisi.py                    | 1 -
 autotest/ogr/ogr_ili.py                       | 1 -
 autotest/ogr/ogr_index_test.py                | 1 -
 autotest/ogr/ogr_ingres.py                    | 1 -
 autotest/ogr/ogr_jml.py                       | 1 -
 autotest/ogr/ogr_join_test.py                 | 1 -
 autotest/ogr/ogr_kml.py                       | 1 -
 autotest/ogr/ogr_layer_algebra.py             | 1 -
 autotest/ogr/ogr_libkml.py                    | 1 -
 autotest/ogr/ogr_mem.py                       | 1 -
 autotest/ogr/ogr_mitab.py                     | 1 -
 autotest/ogr/ogr_mongodb.py                   | 1 -
 autotest/ogr/ogr_mssqlspatial.py              | 1 -
 autotest/ogr/ogr_mvt.py                       | 1 -
 autotest/ogr/ogr_mysql.py                     | 1 -
 autotest/ogr/ogr_nas.py                       | 1 -
 autotest/ogr/ogr_ntf.py                       | 1 -
 autotest/ogr/ogr_oci.py                       | 1 -
 autotest/ogr/ogr_odbc.py                      | 1 -
 autotest/ogr/ogr_ods.py                       | 1 -
 autotest/ogr/ogr_ogdi.py                      | 1 -
 autotest/ogr/ogr_openair.py                   | 1 -
 autotest/ogr/ogr_openfilegdb.py               | 1 -
 autotest/ogr/ogr_osm.py                       | 1 -
 autotest/ogr/ogr_pcidsk.py                    | 1 -
 autotest/ogr/ogr_pdf.py                       | 1 -
 autotest/ogr/ogr_pds.py                       | 1 -
 autotest/ogr/ogr_pg.py                        | 1 -
 autotest/ogr/ogr_pgdump.py                    | 1 -
 autotest/ogr/ogr_pgeo.py                      | 1 -
 autotest/ogr/ogr_plscenes.py                  | 1 -
 autotest/ogr/ogr_rec.py                       | 1 -
 autotest/ogr/ogr_refcount.py                  | 1 -
 autotest/ogr/ogr_rfc30.py                     | 1 -
 autotest/ogr/ogr_rfc35_mem.py                 | 1 -
 autotest/ogr/ogr_rfc35_mitab.py               | 1 -
 autotest/ogr/ogr_rfc35_shape.py               | 1 -
 autotest/ogr/ogr_rfc35_sqlite.py              | 1 -
 autotest/ogr/ogr_rfc41.py                     | 1 -
 autotest/ogr/ogr_s57.py                       | 1 -
 autotest/ogr/ogr_sde.py                       | 1 -
 autotest/ogr/ogr_sdts.py                      | 1 -
 autotest/ogr/ogr_segukooa.py                  | 1 -
 autotest/ogr/ogr_segy.py                      | 1 -
 autotest/ogr/ogr_selafin.py                   | 1 -
 autotest/ogr/ogr_shape.py                     | 1 -
 autotest/ogr/ogr_shape_qix.py                 | 1 -
 autotest/ogr/ogr_shape_sbn.py                 | 1 -
 autotest/ogr/ogr_sosi.py                      | 1 -
 autotest/ogr/ogr_sql_rfc28.py                 | 1 -
 autotest/ogr/ogr_sql_sqlite.py                | 1 -
 autotest/ogr/ogr_sql_test.py                  | 1 -
 autotest/ogr/ogr_sqlite.py                    | 1 -
 autotest/ogr/ogr_style.py                     | 1 -
 autotest/ogr/ogr_sua.py                       | 1 -
 autotest/ogr/ogr_svg.py                       | 1 -
 autotest/ogr/ogr_sxf.py                       | 1 -
 autotest/ogr/ogr_tiger.py                     | 1 -
 autotest/ogr/ogr_vdv.py                       | 1 -
 autotest/ogr/ogr_vfk.py                       | 1 -
 autotest/ogr/ogr_virtualogr.py                | 1 -
 autotest/ogr/ogr_vrt.py                       | 1 -
 autotest/ogr/ogr_wasp.py                      | 1 -
 autotest/ogr/ogr_wfs.py                       | 1 -
 autotest/ogr/ogr_wfs3.py                      | 1 -
 autotest/ogr/ogr_wkbwkt_geom.py               | 1 -
 autotest/ogr/ogr_xls.py                       | 1 -
 autotest/ogr/ogr_xlsx.py                      | 1 -
 autotest/ogr/ogr_xplane.py                    | 1 -
 autotest/ogr/ograpispy.py                     | 1 -
 autotest/osr/osr_basic.py                     | 1 -
 autotest/osr/osr_compd.py                     | 1 -
 autotest/osr/osr_ct.py                        | 1 -
 autotest/osr/osr_ct_proj.py                   | 1 -
 autotest/osr/osr_epsg.py                      | 1 -
 autotest/osr/osr_erm.py                       | 1 -
 autotest/osr/osr_esri.py                      | 1 -
 autotest/osr/osr_getprojectionmethods.py      | 1 -
 autotest/osr/osr_metacrs.py                   | 1 -
 autotest/osr/osr_micoordsys.py                | 1 -
 autotest/osr/osr_ozi.py                       | 1 -
 autotest/osr/osr_pci.py                       | 1 -
 autotest/osr/osr_pm.py                        | 1 -
 autotest/osr/osr_proj4.py                     | 1 -
 autotest/osr/osr_url.py                       | 1 -
 autotest/osr/osr_usgs.py                      | 1 -
 autotest/osr/osr_validate.py                  | 1 -
 autotest/osr/osr_xml.py                       | 1 -
 autotest/pyscripts/test_gdal2tiles.py         | 1 -
 autotest/pyscripts/test_gdal_calc.py          | 1 -
 autotest/pyscripts/test_gdal_edit.py          | 5 ++---
 autotest/pyscripts/test_gdal_fillnodata.py    | 1 -
 autotest/pyscripts/test_gdal_ls_py.py         | 1 -
 autotest/pyscripts/test_gdal_merge.py         | 1 -
 autotest/pyscripts/test_gdal_pansharpen.py    | 1 -
 autotest/pyscripts/test_gdal_polygonize.py    | 1 -
 autotest/pyscripts/test_gdal_proximity.py     | 1 -
 autotest/pyscripts/test_gdal_retile.py        | 1 -
 autotest/pyscripts/test_gdal_sieve.py         | 1 -
 autotest/pyscripts/test_gdalinfo_py.py        | 1 -
 autotest/pyscripts/test_gdalmove.py           | 1 -
 autotest/pyscripts/test_ogr2ogr_py.py         | 1 -
 autotest/pyscripts/test_ogrinfo_py.py         | 1 -
 autotest/pyscripts/test_ogrmerge.py           | 1 -
 autotest/pyscripts/test_rgb2pct.py            | 1 -
 autotest/utilities/test_gdal_contour.py       | 1 -
 autotest/utilities/test_gdal_grid.py          | 1 -
 autotest/utilities/test_gdal_grid_lib.py      | 1 -
 autotest/utilities/test_gdal_rasterize.py     | 1 -
 autotest/utilities/test_gdal_rasterize_lib.py | 1 -
 autotest/utilities/test_gdal_translate.py     | 1 -
 autotest/utilities/test_gdal_translate_lib.py | 1 -
 autotest/utilities/test_gdaladdo.py           | 1 -
 autotest/utilities/test_gdalbuildvrt.py       | 1 -
 autotest/utilities/test_gdalbuildvrt_lib.py   | 1 -
 autotest/utilities/test_gdaldem.py            | 1 -
 autotest/utilities/test_gdaldem_lib.py        | 1 -
 autotest/utilities/test_gdalinfo.py           | 1 -
 autotest/utilities/test_gdalinfo_lib.py       | 1 -
 autotest/utilities/test_gdallocationinfo.py   | 1 -
 autotest/utilities/test_gdalsrsinfo.py        | 1 -
 autotest/utilities/test_gdaltindex.py         | 1 -
 autotest/utilities/test_gdaltransform.py      | 1 -
 autotest/utilities/test_gdalwarp.py           | 1 -
 autotest/utilities/test_gdalwarp_lib.py       | 1 -
 autotest/utilities/test_gnmutils.py           | 1 -
 autotest/utilities/test_nearblack.py          | 1 -
 autotest/utilities/test_nearblack_lib.py      | 1 -
 autotest/utilities/test_ogr2ogr.py            | 1 -
 autotest/utilities/test_ogr2ogr_lib.py        | 1 -
 autotest/utilities/test_ogrinfo.py            | 1 -
 autotest/utilities/test_ogrlineref.py         | 1 -
 autotest/utilities/test_ogrtindex.py          | 1 -
 394 files changed, 3 insertions(+), 397 deletions(-)

diff --git a/autotest/alg/applyverticalshiftgrid.py b/autotest/alg/applyverticalshiftgrid.py
index 63e7c8504e50..8aa3b39b0b07 100755
--- a/autotest/alg/applyverticalshiftgrid.py
+++ b/autotest/alg/applyverticalshiftgrid.py
@@ -31,7 +31,6 @@
 
 import sys
 
-sys.path.append('../pymod')
 
 import gdaltest
 from osgeo import gdal, osr
diff --git a/autotest/alg/contour.py b/autotest/alg/contour.py
index d208fc54a86d..3a7f8ce958e1 100755
--- a/autotest/alg/contour.py
+++ b/autotest/alg/contour.py
@@ -32,7 +32,6 @@
 import os
 import sys
 
-sys.path.append('../pymod')
 
 from osgeo import gdal
 from osgeo import ogr
diff --git a/autotest/alg/cutline.py b/autotest/alg/cutline.py
index ffacaa73d128..5fb297351126 100755
--- a/autotest/alg/cutline.py
+++ b/autotest/alg/cutline.py
@@ -32,7 +32,6 @@
 
 import sys
 
-sys.path.append('../pymod')
 
 from osgeo import gdal
 import ogrtest
diff --git a/autotest/alg/dither.py b/autotest/alg/dither.py
index 72b301fac490..372f8df50018 100755
--- a/autotest/alg/dither.py
+++ b/autotest/alg/dither.py
@@ -31,7 +31,6 @@
 
 import sys
 
-sys.path.append('../pymod')
 
 import gdaltest
 
diff --git a/autotest/alg/polygonize.py b/autotest/alg/polygonize.py
index 84e98c9ed094..29fda58e8302 100755
--- a/autotest/alg/polygonize.py
+++ b/autotest/alg/polygonize.py
@@ -31,7 +31,6 @@
 
 import sys
 
-sys.path.append('../pymod')
 
 import gdaltest
 import ogrtest
diff --git a/autotest/alg/proximity.py b/autotest/alg/proximity.py
index 8276b165c75a..d92f06acf975 100755
--- a/autotest/alg/proximity.py
+++ b/autotest/alg/proximity.py
@@ -30,7 +30,6 @@
 
 import sys
 
-sys.path.append('../pymod')
 
 import gdaltest
 
diff --git a/autotest/alg/rasterize.py b/autotest/alg/rasterize.py
index 66ba514800c5..b0c2fb1bf54e 100755
--- a/autotest/alg/rasterize.py
+++ b/autotest/alg/rasterize.py
@@ -31,7 +31,6 @@
 import struct
 import sys
 
-sys.path.append('../pymod')
 
 import gdaltest
 import ogrtest
diff --git a/autotest/alg/reproject.py b/autotest/alg/reproject.py
index cde70c0dbbb6..4cc7ca0473ee 100755
--- a/autotest/alg/reproject.py
+++ b/autotest/alg/reproject.py
@@ -31,7 +31,6 @@
 
 import sys
 
-sys.path.append('../pymod')
 
 import gdaltest
 
diff --git a/autotest/alg/sieve.py b/autotest/alg/sieve.py
index 0486e0409600..889c54d39444 100755
--- a/autotest/alg/sieve.py
+++ b/autotest/alg/sieve.py
@@ -31,7 +31,6 @@
 
 import sys
 
-sys.path.append('../pymod')
 
 import gdaltest
 
diff --git a/autotest/alg/tps.py b/autotest/alg/tps.py
index 2823496f0e59..5875c11b7921 100755
--- a/autotest/alg/tps.py
+++ b/autotest/alg/tps.py
@@ -31,7 +31,6 @@
 
 import sys
 
-sys.path.append('../pymod')
 
 import gdaltest
 from osgeo import gdal, osr
diff --git a/autotest/alg/transformgeoloc.py b/autotest/alg/transformgeoloc.py
index 0c0d6a01f233..d1dc9836dfc3 100755
--- a/autotest/alg/transformgeoloc.py
+++ b/autotest/alg/transformgeoloc.py
@@ -32,7 +32,6 @@
 
 import sys
 
-sys.path.append('../pymod')
 
 import gdaltest
 from osgeo import gdal
diff --git a/autotest/alg/warp.py b/autotest/alg/warp.py
index 7f0657c7fde2..db2eedae5358 100755
--- a/autotest/alg/warp.py
+++ b/autotest/alg/warp.py
@@ -36,7 +36,6 @@
 import sys
 import shutil
 
-sys.path.append('../pymod')
 
 from osgeo import gdal
 from osgeo import osr
diff --git a/autotest/gcore/aaigrid_read.py b/autotest/gcore/aaigrid_read.py
index 01df8465a4e6..cda5cd771321 100755
--- a/autotest/gcore/aaigrid_read.py
+++ b/autotest/gcore/aaigrid_read.py
@@ -27,7 +27,6 @@
 
 import sys
 
-sys.path.append('../pymod')
 
 import gdaltest
 
diff --git a/autotest/gcore/aaigrid_write.py b/autotest/gcore/aaigrid_write.py
index c9931850ddd8..ad78630a7a0d 100755
--- a/autotest/gcore/aaigrid_write.py
+++ b/autotest/gcore/aaigrid_write.py
@@ -28,7 +28,6 @@
 
 import sys
 
-sys.path.append('../pymod')
 
 import gdaltest
 
diff --git a/autotest/gcore/asyncreader.py b/autotest/gcore/asyncreader.py
index 5abd0c7b3553..24f4c59daeb8 100755
--- a/autotest/gcore/asyncreader.py
+++ b/autotest/gcore/asyncreader.py
@@ -30,7 +30,6 @@
 
 import sys
 
-sys.path.append('../pymod')
 
 import gdaltest
 from osgeo import gdal
diff --git a/autotest/gcore/basic_test.py b/autotest/gcore/basic_test.py
index 46ffdb2e0242..5f5a6f32c699 100755
--- a/autotest/gcore/basic_test.py
+++ b/autotest/gcore/basic_test.py
@@ -32,7 +32,6 @@
 import os
 import sys
 
-sys.path.append('../pymod')
 
 import gdaltest
 from osgeo import gdal
diff --git a/autotest/gcore/bmp_read.py b/autotest/gcore/bmp_read.py
index b9a0c640c65f..074b9ce9397e 100755
--- a/autotest/gcore/bmp_read.py
+++ b/autotest/gcore/bmp_read.py
@@ -28,7 +28,6 @@
 
 import sys
 
-sys.path.append('../pymod')
 
 import gdaltest
 
diff --git a/autotest/gcore/bmp_write.py b/autotest/gcore/bmp_write.py
index c54230384835..b2d842d29ec7 100755
--- a/autotest/gcore/bmp_write.py
+++ b/autotest/gcore/bmp_write.py
@@ -29,7 +29,6 @@
 
 import sys
 
-sys.path.append('../pymod')
 
 import gdaltest
 
diff --git a/autotest/gcore/colortable.py b/autotest/gcore/colortable.py
index 1bbbb8dc06b9..4f8dc3ea3413 100755
--- a/autotest/gcore/colortable.py
+++ b/autotest/gcore/colortable.py
@@ -32,7 +32,6 @@
 
 import sys
 
-sys.path.append('../pymod')
 
 import gdaltest
 from osgeo import gdal
diff --git a/autotest/gcore/envi_read.py b/autotest/gcore/envi_read.py
index c365e6ef5121..99ac328eabea 100755
--- a/autotest/gcore/envi_read.py
+++ b/autotest/gcore/envi_read.py
@@ -29,7 +29,6 @@
 
 import sys
 
-sys.path.append('../pymod')
 
 from osgeo import gdal
 import gdaltest
diff --git a/autotest/gcore/gcps2geotransform.py b/autotest/gcore/gcps2geotransform.py
index a5123fa70684..8f5d87cafd15 100755
--- a/autotest/gcore/gcps2geotransform.py
+++ b/autotest/gcore/gcps2geotransform.py
@@ -32,7 +32,6 @@
 import sys
 from osgeo import gdal
 
-sys.path.append('../pymod')
 
 import gdaltest
 
diff --git a/autotest/gcore/gdal_api_proxy.py b/autotest/gcore/gdal_api_proxy.py
index 6aa16ca2e0f7..7b3e656e3366 100755
--- a/autotest/gcore/gdal_api_proxy.py
+++ b/autotest/gcore/gdal_api_proxy.py
@@ -34,7 +34,6 @@
 import time
 from osgeo import gdal
 
-sys.path.append('../pymod')
 
 import gdaltest
 
diff --git a/autotest/gcore/gdal_stats.py b/autotest/gcore/gdal_stats.py
index 25b031db1277..9325410b586a 100755
--- a/autotest/gcore/gdal_stats.py
+++ b/autotest/gcore/gdal_stats.py
@@ -32,7 +32,6 @@
 import struct
 import shutil
 
-sys.path.append('../pymod')
 
 import gdaltest
 from osgeo import gdal
diff --git a/autotest/gcore/geoloc.py b/autotest/gcore/geoloc.py
index 221d016dbd9c..2ad2e6e5b730 100755
--- a/autotest/gcore/geoloc.py
+++ b/autotest/gcore/geoloc.py
@@ -31,7 +31,6 @@
 
 import sys
 
-sys.path.append('../pymod')
 
 import gdaltest
 
diff --git a/autotest/gcore/gtiff_write.py b/autotest/gcore/gtiff_write.py
index 14e202385509..0997de9bdcfa 100755
--- a/autotest/gcore/gtiff_write.py
+++ b/autotest/gcore/gtiff_write.py
@@ -27,7 +27,6 @@
 
 import sys
 
-sys.path.append('../pymod')
 
 import gdaltest
 
diff --git a/autotest/gcore/hdf4_read.py b/autotest/gcore/hdf4_read.py
index b93989d8fcc2..ed37cdd94538 100755
--- a/autotest/gcore/hdf4_read.py
+++ b/autotest/gcore/hdf4_read.py
@@ -28,7 +28,6 @@
 
 import sys
 
-sys.path.append('../pymod')
 
 import gdaltest
 from osgeo import gdal
diff --git a/autotest/gcore/hdf4_write.py b/autotest/gcore/hdf4_write.py
index 7aa13e9571c1..a75f68c3ffbf 100755
--- a/autotest/gcore/hdf4_write.py
+++ b/autotest/gcore/hdf4_write.py
@@ -27,7 +27,6 @@
 
 import sys
 
-sys.path.append('../pymod')
 
 import gdaltest
 
diff --git a/autotest/gcore/hfa_read.py b/autotest/gcore/hfa_read.py
index aa49e1a57bd4..d904e5da6b27 100755
--- a/autotest/gcore/hfa_read.py
+++ b/autotest/gcore/hfa_read.py
@@ -30,7 +30,6 @@
 
 import sys
 
-sys.path.append('../pymod')
 
 from osgeo import gdal
 import gdaltest
diff --git a/autotest/gcore/hfa_rfc40.py b/autotest/gcore/hfa_rfc40.py
index a4cf03ee3027..0042476918d0 100755
--- a/autotest/gcore/hfa_rfc40.py
+++ b/autotest/gcore/hfa_rfc40.py
@@ -34,7 +34,6 @@
 import numpy
 from osgeo import gdal
 
-sys.path.append('../pymod')
 
 import gdaltest
 
diff --git a/autotest/gcore/hfa_srs.py b/autotest/gcore/hfa_srs.py
index 47f23f910e8d..9f82bae3fe12 100755
--- a/autotest/gcore/hfa_srs.py
+++ b/autotest/gcore/hfa_srs.py
@@ -35,7 +35,6 @@
 from osgeo import gdal
 from osgeo import osr
 
-sys.path.append('../pymod')
 
 
 ###############################################################################
diff --git a/autotest/gcore/hfa_write.py b/autotest/gcore/hfa_write.py
index 134a6a60d521..5b63ccb3ab19 100755
--- a/autotest/gcore/hfa_write.py
+++ b/autotest/gcore/hfa_write.py
@@ -35,7 +35,6 @@
 import shutil
 from osgeo import gdal
 
-sys.path.append('../pymod')
 
 import gdaltest
 
diff --git a/autotest/gcore/histogram.py b/autotest/gcore/histogram.py
index 21705be9d839..5ef38cde8dc4 100755
--- a/autotest/gcore/histogram.py
+++ b/autotest/gcore/histogram.py
@@ -33,7 +33,6 @@
 import sys
 import shutil
 
-sys.path.append('../pymod')
 
 from osgeo import gdal
 
diff --git a/autotest/gcore/identify.py b/autotest/gcore/identify.py
index b2b2ee56f8d0..799b2a0c7642 100755
--- a/autotest/gcore/identify.py
+++ b/autotest/gcore/identify.py
@@ -30,7 +30,6 @@
 
 import sys
 
-sys.path.append('../pymod')
 
 import gdaltest
 from osgeo import gdal
diff --git a/autotest/gcore/mask.py b/autotest/gcore/mask.py
index d7abdf9581a1..acfbe6efa5b3 100755
--- a/autotest/gcore/mask.py
+++ b/autotest/gcore/mask.py
@@ -32,7 +32,6 @@
 import os
 import sys
 
-sys.path.append('../pymod')
 
 import gdaltest
 from osgeo import gdal
diff --git a/autotest/gcore/minixml.py b/autotest/gcore/minixml.py
index d3e0880a8471..86937f4001c6 100755
--- a/autotest/gcore/minixml.py
+++ b/autotest/gcore/minixml.py
@@ -31,7 +31,6 @@
 
 import sys
 
-sys.path.append('../pymod')
 
 import gdaltest
 from osgeo import gdal
diff --git a/autotest/gcore/misc.py b/autotest/gcore/misc.py
index b05d58eee910..35d0a9e073c2 100755
--- a/autotest/gcore/misc.py
+++ b/autotest/gcore/misc.py
@@ -34,7 +34,6 @@
 import shutil
 from osgeo import gdal
 
-sys.path.append('../pymod')
 
 import gdaltest
 
diff --git a/autotest/gcore/numpy_rw.py b/autotest/gcore/numpy_rw.py
index 21e7dddb018d..3d70b42e9e7b 100755
--- a/autotest/gcore/numpy_rw.py
+++ b/autotest/gcore/numpy_rw.py
@@ -31,7 +31,6 @@
 
 import sys
 
-sys.path.append('../pymod')
 
 import gdaltest
 from osgeo import gdal
diff --git a/autotest/gcore/overviewds.py b/autotest/gcore/overviewds.py
index 369fb47ea030..b100105d82a1 100755
--- a/autotest/gcore/overviewds.py
+++ b/autotest/gcore/overviewds.py
@@ -33,7 +33,6 @@
 import sys
 import shutil
 
-sys.path.append('../pymod')
 
 import gdaltest
 from osgeo import gdal
diff --git a/autotest/gcore/pam.py b/autotest/gcore/pam.py
index 5f537e4e5795..b48848e6bef1 100755
--- a/autotest/gcore/pam.py
+++ b/autotest/gcore/pam.py
@@ -35,7 +35,6 @@
 import shutil
 import stat
 
-sys.path.append('../pymod')
 
 import gdaltest
 from osgeo import gdal
diff --git a/autotest/gcore/pixfun.py b/autotest/gcore/pixfun.py
index 66d20f8bf882..a277636b50f2 100755
--- a/autotest/gcore/pixfun.py
+++ b/autotest/gcore/pixfun.py
@@ -38,7 +38,6 @@
 
 from osgeo import gdal
 
-sys.path.append('../pymod')
 
 import gdaltest
 
diff --git a/autotest/gcore/pnm_read.py b/autotest/gcore/pnm_read.py
index ffb469312486..7857312ab410 100755
--- a/autotest/gcore/pnm_read.py
+++ b/autotest/gcore/pnm_read.py
@@ -30,7 +30,6 @@
 
 import sys
 
-sys.path.append('../pymod')
 
 import gdaltest
 
diff --git a/autotest/gcore/pnm_write.py b/autotest/gcore/pnm_write.py
index 38bb96bde533..3086f303a330 100755
--- a/autotest/gcore/pnm_write.py
+++ b/autotest/gcore/pnm_write.py
@@ -27,7 +27,6 @@
 
 import sys
 
-sys.path.append('../pymod')
 
 import gdaltest
 
diff --git a/autotest/gcore/rasterio.py b/autotest/gcore/rasterio.py
index 76e15a805188..5d7a9f2bdae7 100755
--- a/autotest/gcore/rasterio.py
+++ b/autotest/gcore/rasterio.py
@@ -32,7 +32,6 @@
 import struct
 import sys
 
-sys.path.append('../pymod')
 
 import gdaltest
 from osgeo import gdal
diff --git a/autotest/gcore/rat.py b/autotest/gcore/rat.py
index 0aa3cd020eb1..752380dcb07a 100755
--- a/autotest/gcore/rat.py
+++ b/autotest/gcore/rat.py
@@ -32,7 +32,6 @@
 
 import sys
 
-sys.path.append('../pymod')
 
 import gdaltest
 from osgeo import gdal
diff --git a/autotest/gcore/rfc30.py b/autotest/gcore/rfc30.py
index c83d846e20f8..d11fa0f6df57 100755
--- a/autotest/gcore/rfc30.py
+++ b/autotest/gcore/rfc30.py
@@ -33,7 +33,6 @@
 from sys import version_info
 from osgeo import gdal
 
-sys.path.append('../pymod')
 
 import gdaltest
 
diff --git a/autotest/gcore/testnonboundtoswig.py b/autotest/gcore/testnonboundtoswig.py
index 189466bd314c..3751c9de9f86 100755
--- a/autotest/gcore/testnonboundtoswig.py
+++ b/autotest/gcore/testnonboundtoswig.py
@@ -33,7 +33,6 @@
 from sys import version_info
 from osgeo import gdal
 
-sys.path.append('../pymod')
 
 try:
     import ctypes
diff --git a/autotest/gcore/thread_test.py b/autotest/gcore/thread_test.py
index c7f3ce5460fa..24ad6b8a37de 100755
--- a/autotest/gcore/thread_test.py
+++ b/autotest/gcore/thread_test.py
@@ -32,7 +32,6 @@
 import sys
 import threading
 
-sys.path.append('../pymod')
 
 import gdaltest
 from osgeo import gdal
diff --git a/autotest/gcore/tiff_ovr.py b/autotest/gcore/tiff_ovr.py
index 5f4e303146b4..1f606648d7b8 100755
--- a/autotest/gcore/tiff_ovr.py
+++ b/autotest/gcore/tiff_ovr.py
@@ -38,7 +38,6 @@
 from osgeo import osr
 from osgeo import gdal
 
-sys.path.append('../pymod')
 
 import gdaltest
 
diff --git a/autotest/gcore/tiff_read.py b/autotest/gcore/tiff_read.py
index b6411ef7fff6..9312e50a9c62 100755
--- a/autotest/gcore/tiff_read.py
+++ b/autotest/gcore/tiff_read.py
@@ -31,7 +31,6 @@
 import sys
 import shutil
 
-sys.path.append('../pymod')
 
 import gdaltest
 from osgeo import gdal, osr
diff --git a/autotest/gcore/tiff_srs.py b/autotest/gcore/tiff_srs.py
index 6f39bd6a9021..c21da49a5b20 100755
--- a/autotest/gcore/tiff_srs.py
+++ b/autotest/gcore/tiff_srs.py
@@ -33,7 +33,6 @@
 from osgeo import gdal
 from osgeo import osr
 
-sys.path.append('../pymod')
 
 import gdaltest
 
diff --git a/autotest/gcore/tiff_write.py b/autotest/gcore/tiff_write.py
index a61191658485..5d4039f4e644 100755
--- a/autotest/gcore/tiff_write.py
+++ b/autotest/gcore/tiff_write.py
@@ -35,7 +35,6 @@
 from osgeo import gdal
 from osgeo import osr
 
-sys.path.append('../pymod')
 sys.path.append('../../gdal/swig/python/samples')
 
 import gdaltest
diff --git a/autotest/gcore/transformer.py b/autotest/gcore/transformer.py
index 80d6d289a991..119da9099ef9 100755
--- a/autotest/gcore/transformer.py
+++ b/autotest/gcore/transformer.py
@@ -32,7 +32,6 @@
 
 import sys
 
-sys.path.append('../pymod')
 
 import gdaltest
 from osgeo import gdal
diff --git a/autotest/gcore/virtualmem.py b/autotest/gcore/virtualmem.py
index 5a2ca46ad4aa..c2e13340fa01 100755
--- a/autotest/gcore/virtualmem.py
+++ b/autotest/gcore/virtualmem.py
@@ -31,7 +31,6 @@
 
 import sys
 
-sys.path.append('../pymod')
 
 import gdaltest
 from osgeo import gdal
diff --git a/autotest/gcore/vrt_read.py b/autotest/gcore/vrt_read.py
index c43d32ab3aa7..0894e5c66d4a 100755
--- a/autotest/gcore/vrt_read.py
+++ b/autotest/gcore/vrt_read.py
@@ -35,7 +35,6 @@
 import shutil
 import struct
 
-sys.path.append('../pymod')
 
 import gdaltest
 from osgeo import gdal
diff --git a/autotest/gcore/vrtmisc.py b/autotest/gcore/vrtmisc.py
index 3666f74602fd..8ec5cdf31d85 100755
--- a/autotest/gcore/vrtmisc.py
+++ b/autotest/gcore/vrtmisc.py
@@ -32,7 +32,6 @@
 import sys
 from osgeo import gdal
 
-sys.path.append('../pymod')
 
 import gdaltest
 
diff --git a/autotest/gcore/vsiaz.py b/autotest/gcore/vsiaz.py
index a42b6b7a61a2..209e6a22a7c5 100755
--- a/autotest/gcore/vsiaz.py
+++ b/autotest/gcore/vsiaz.py
@@ -32,7 +32,6 @@
 import sys
 from osgeo import gdal
 
-sys.path.append('../pymod')
 
 import gdaltest
 import webserver
diff --git a/autotest/gcore/vsicrypt.py b/autotest/gcore/vsicrypt.py
index 812ed88de0cd..0d5344f8ad07 100755
--- a/autotest/gcore/vsicrypt.py
+++ b/autotest/gcore/vsicrypt.py
@@ -33,7 +33,6 @@
 import sys
 from osgeo import gdal
 
-sys.path.append('../pymod')
 
 import gdaltest
 
diff --git a/autotest/gcore/vsicurl.py b/autotest/gcore/vsicurl.py
index ddb82878fc43..7f5ff0ea4ee2 100755
--- a/autotest/gcore/vsicurl.py
+++ b/autotest/gcore/vsicurl.py
@@ -34,7 +34,6 @@
 from osgeo import gdal
 from osgeo import ogr
 
-sys.path.append('../pymod')
 
 import gdaltest
 import webserver
diff --git a/autotest/gcore/vsicurl_streaming.py b/autotest/gcore/vsicurl_streaming.py
index f5e2c0a759f4..9b37675b5eca 100755
--- a/autotest/gcore/vsicurl_streaming.py
+++ b/autotest/gcore/vsicurl_streaming.py
@@ -32,7 +32,6 @@
 import time
 from osgeo import gdal
 
-sys.path.append('../pymod')
 
 import gdaltest
 
diff --git a/autotest/gcore/vsifile.py b/autotest/gcore/vsifile.py
index 62e46fe7ed94..8639cb1de51c 100755
--- a/autotest/gcore/vsifile.py
+++ b/autotest/gcore/vsifile.py
@@ -33,7 +33,6 @@
 import time
 from osgeo import gdal
 
-sys.path.append('../pymod')
 
 import gdaltest
 
diff --git a/autotest/gcore/vsigs.py b/autotest/gcore/vsigs.py
index 2580f3142702..cbc9dfd3675a 100755
--- a/autotest/gcore/vsigs.py
+++ b/autotest/gcore/vsigs.py
@@ -32,7 +32,6 @@
 import sys
 from osgeo import gdal
 
-sys.path.append('../pymod')
 
 import gdaltest
 import webserver
diff --git a/autotest/gcore/vsihdfs.py b/autotest/gcore/vsihdfs.py
index 7c938f7681a2..141b0b475e7c 100755
--- a/autotest/gcore/vsihdfs.py
+++ b/autotest/gcore/vsihdfs.py
@@ -34,7 +34,6 @@
 import os
 from osgeo import gdal
 
-sys.path.append('../pymod')
 
 import gdaltest
 
diff --git a/autotest/gcore/vsioss.py b/autotest/gcore/vsioss.py
index db5362d67164..bbc1c5885d28 100755
--- a/autotest/gcore/vsioss.py
+++ b/autotest/gcore/vsioss.py
@@ -32,7 +32,6 @@
 import sys
 from osgeo import gdal
 
-sys.path.append('../pymod')
 
 import gdaltest
 import webserver
diff --git a/autotest/gcore/vsis3.py b/autotest/gcore/vsis3.py
index d187199ec2d8..87ae1faf9fc8 100755
--- a/autotest/gcore/vsis3.py
+++ b/autotest/gcore/vsis3.py
@@ -33,7 +33,6 @@
 import sys
 from osgeo import gdal
 
-sys.path.append('../pymod')
 
 import gdaltest
 import webserver
diff --git a/autotest/gcore/vsistdin.py b/autotest/gcore/vsistdin.py
index 3e8ca62cf16b..87c7c3db39e4 100755
--- a/autotest/gcore/vsistdin.py
+++ b/autotest/gcore/vsistdin.py
@@ -31,7 +31,6 @@
 import os
 import sys
 
-sys.path.append('../pymod')
 
 import gdaltest
 from osgeo import gdal
diff --git a/autotest/gcore/vsiswift.py b/autotest/gcore/vsiswift.py
index de3ac7be99c9..8c9ff60823f8 100644
--- a/autotest/gcore/vsiswift.py
+++ b/autotest/gcore/vsiswift.py
@@ -32,7 +32,6 @@
 import sys
 from osgeo import gdal
 
-sys.path.append('../pymod')
 
 import gdaltest
 import webserver
diff --git a/autotest/gcore/vsiwebhdfs.py b/autotest/gcore/vsiwebhdfs.py
index 55a2c2cb2533..64b6fb9a58fa 100644
--- a/autotest/gcore/vsiwebhdfs.py
+++ b/autotest/gcore/vsiwebhdfs.py
@@ -32,7 +32,6 @@
 import sys
 from osgeo import gdal
 
-sys.path.append('../pymod')
 
 import gdaltest
 import webserver
diff --git a/autotest/gcore/vsizip.py b/autotest/gcore/vsizip.py
index 82cb1e4e2218..a96ae08942e9 100755
--- a/autotest/gcore/vsizip.py
+++ b/autotest/gcore/vsizip.py
@@ -32,7 +32,6 @@
 import random
 import sys
 
-sys.path.append('../pymod')
 
 import gdaltest
 from osgeo import gdal
diff --git a/autotest/gdrivers/aaigrid.py b/autotest/gdrivers/aaigrid.py
index 6061156549ef..01e9271ff88b 100755
--- a/autotest/gdrivers/aaigrid.py
+++ b/autotest/gdrivers/aaigrid.py
@@ -35,7 +35,6 @@
 import sys
 from osgeo import gdal
 
-sys.path.append('../pymod')
 
 import gdaltest
 
diff --git a/autotest/gdrivers/ace2.py b/autotest/gdrivers/ace2.py
index abd1301dd9b9..59689598d8c7 100755
--- a/autotest/gdrivers/ace2.py
+++ b/autotest/gdrivers/ace2.py
@@ -31,7 +31,6 @@
 import sys
 from osgeo import gdal
 
-sys.path.append('../pymod')
 
 import gdaltest
 
diff --git a/autotest/gdrivers/adrg.py b/autotest/gdrivers/adrg.py
index 801e17cd4398..56ee3499b10a 100755
--- a/autotest/gdrivers/adrg.py
+++ b/autotest/gdrivers/adrg.py
@@ -34,7 +34,6 @@
 import shutil
 from osgeo import gdal
 
-sys.path.append('../pymod')
 
 import gdaltest
 
diff --git a/autotest/gdrivers/aigrid.py b/autotest/gdrivers/aigrid.py
index 4563f388f36d..4fa1f4cc0290 100755
--- a/autotest/gdrivers/aigrid.py
+++ b/autotest/gdrivers/aigrid.py
@@ -33,7 +33,6 @@
 import sys
 from osgeo import gdal
 
-sys.path.append('../pymod')
 
 import gdaltest
 
diff --git a/autotest/gdrivers/arg.py b/autotest/gdrivers/arg.py
index b12a11023deb..1c48d3569b1c 100755
--- a/autotest/gdrivers/arg.py
+++ b/autotest/gdrivers/arg.py
@@ -34,7 +34,6 @@
 from copy import copy
 from osgeo import gdal
 
-sys.path.append('../pymod')
 
 import gdaltest
 
diff --git a/autotest/gdrivers/bag.py b/autotest/gdrivers/bag.py
index 8bf4a746a007..d0493710b682 100755
--- a/autotest/gdrivers/bag.py
+++ b/autotest/gdrivers/bag.py
@@ -33,7 +33,6 @@
 import sys
 from osgeo import gdal
 
-sys.path.append('../pymod')
 
 import gdaltest
 
diff --git a/autotest/gdrivers/blx.py b/autotest/gdrivers/blx.py
index 83093afb106d..6a15d171ce64 100755
--- a/autotest/gdrivers/blx.py
+++ b/autotest/gdrivers/blx.py
@@ -31,7 +31,6 @@
 import sys
 from osgeo import gdal
 
-sys.path.append('../pymod')
 
 import gdaltest
 
diff --git a/autotest/gdrivers/bsb.py b/autotest/gdrivers/bsb.py
index 24440c42886f..793fc2e3162a 100755
--- a/autotest/gdrivers/bsb.py
+++ b/autotest/gdrivers/bsb.py
@@ -31,7 +31,6 @@
 import sys
 from osgeo import gdal
 
-sys.path.append('../pymod')
 
 import gdaltest
 
diff --git a/autotest/gdrivers/bt.py b/autotest/gdrivers/bt.py
index 91ee51cdf5e7..3c9afe74beae 100755
--- a/autotest/gdrivers/bt.py
+++ b/autotest/gdrivers/bt.py
@@ -31,7 +31,6 @@
 import sys
 from osgeo import osr
 
-sys.path.append('../pymod')
 
 from osgeo import gdal
 import gdaltest
diff --git a/autotest/gdrivers/byn.py b/autotest/gdrivers/byn.py
index 7d85011aee2c..af67c11cf1b5 100755
--- a/autotest/gdrivers/byn.py
+++ b/autotest/gdrivers/byn.py
@@ -32,7 +32,6 @@
 
 import sys
 
-sys.path.append('../pymod')
 
 import gdaltest
 
diff --git a/autotest/gdrivers/cals.py b/autotest/gdrivers/cals.py
index e9cf612f9a13..3c9999ab072e 100755
--- a/autotest/gdrivers/cals.py
+++ b/autotest/gdrivers/cals.py
@@ -30,7 +30,6 @@
 
 import sys
 
-sys.path.append('../pymod')
 
 from osgeo import gdal
 import gdaltest
diff --git a/autotest/gdrivers/ceos.py b/autotest/gdrivers/ceos.py
index fc5660d1214c..d7bf9afcbc4a 100755
--- a/autotest/gdrivers/ceos.py
+++ b/autotest/gdrivers/ceos.py
@@ -30,7 +30,6 @@
 
 import sys
 
-sys.path.append('../pymod')
 
 import gdaltest
 
diff --git a/autotest/gdrivers/cpg.py b/autotest/gdrivers/cpg.py
index de3f50b8a233..cf6ab753275b 100755
--- a/autotest/gdrivers/cpg.py
+++ b/autotest/gdrivers/cpg.py
@@ -30,7 +30,6 @@
 
 import sys
 
-sys.path.append('../pymod')
 
 import gdaltest
 
diff --git a/autotest/gdrivers/ctg.py b/autotest/gdrivers/ctg.py
index ac8b4e948a4e..dddff6accde4 100755
--- a/autotest/gdrivers/ctg.py
+++ b/autotest/gdrivers/ctg.py
@@ -31,7 +31,6 @@
 import sys
 from osgeo import gdal
 
-sys.path.append('../pymod')
 
 import gdaltest
 
diff --git a/autotest/gdrivers/db2.py b/autotest/gdrivers/db2.py
index 6c6881811471..34999b5e16c8 100755
--- a/autotest/gdrivers/db2.py
+++ b/autotest/gdrivers/db2.py
@@ -37,7 +37,6 @@
     if os.path.dirname(sys.argv[0]) != '':
         os.chdir(os.path.dirname(sys.argv[0]))
 
-sys.path.append('../pymod')
 
 from osgeo import gdal
 import gdaltest
diff --git a/autotest/gdrivers/derived.py b/autotest/gdrivers/derived.py
index 94bb573fc92a..410d0f95cdc0 100755
--- a/autotest/gdrivers/derived.py
+++ b/autotest/gdrivers/derived.py
@@ -31,7 +31,6 @@
 import sys
 from osgeo import gdal
 
-sys.path.append('../pymod')
 
 import gdaltest
 
diff --git a/autotest/gdrivers/dimap.py b/autotest/gdrivers/dimap.py
index 543f85f71e1f..a0724364cab0 100755
--- a/autotest/gdrivers/dimap.py
+++ b/autotest/gdrivers/dimap.py
@@ -33,7 +33,6 @@
 import shutil
 from osgeo import gdal
 
-sys.path.append('../pymod')
 
 import gdaltest
 
diff --git a/autotest/gdrivers/dipex.py b/autotest/gdrivers/dipex.py
index 169ab5e8ad1a..cec4ad8283cf 100755
--- a/autotest/gdrivers/dipex.py
+++ b/autotest/gdrivers/dipex.py
@@ -30,7 +30,6 @@
 
 import sys
 
-sys.path.append('../pymod')
 
 import gdaltest
 
diff --git a/autotest/gdrivers/dods.py b/autotest/gdrivers/dods.py
index a895ae870978..93f1efba24e2 100755
--- a/autotest/gdrivers/dods.py
+++ b/autotest/gdrivers/dods.py
@@ -31,7 +31,6 @@
 import sys
 from osgeo import gdal
 
-sys.path.append('../pymod')
 
 import gdaltest
 
diff --git a/autotest/gdrivers/doq1.py b/autotest/gdrivers/doq1.py
index 4eb590abaa64..4e1c3bd297da 100755
--- a/autotest/gdrivers/doq1.py
+++ b/autotest/gdrivers/doq1.py
@@ -31,7 +31,6 @@
 import sys
 from osgeo import gdal
 
-sys.path.append('../pymod')
 
 import gdaltest
 
diff --git a/autotest/gdrivers/doq2.py b/autotest/gdrivers/doq2.py
index c55146969869..23b540ec868c 100755
--- a/autotest/gdrivers/doq2.py
+++ b/autotest/gdrivers/doq2.py
@@ -31,7 +31,6 @@
 import sys
 from osgeo import gdal
 
-sys.path.append('../pymod')
 
 import gdaltest
 
diff --git a/autotest/gdrivers/dted.py b/autotest/gdrivers/dted.py
index d7d37441bdbc..fd036bc00347 100755
--- a/autotest/gdrivers/dted.py
+++ b/autotest/gdrivers/dted.py
@@ -34,7 +34,6 @@
 import sys
 from osgeo import gdal
 
-sys.path.append('../pymod')
 
 import gdaltest
 
diff --git a/autotest/gdrivers/e00grid.py b/autotest/gdrivers/e00grid.py
index 7f34a7b0ed9b..2983daa516bc 100755
--- a/autotest/gdrivers/e00grid.py
+++ b/autotest/gdrivers/e00grid.py
@@ -31,7 +31,6 @@
 import sys
 from osgeo import gdal
 
-sys.path.append('../pymod')
 
 import gdaltest
 
diff --git a/autotest/gdrivers/ecrgtoc.py b/autotest/gdrivers/ecrgtoc.py
index dd01513dd01a..8e5cde8aff4e 100755
--- a/autotest/gdrivers/ecrgtoc.py
+++ b/autotest/gdrivers/ecrgtoc.py
@@ -32,7 +32,6 @@
 import sys
 from osgeo import gdal
 
-sys.path.append('../pymod')
 
 import gdaltest
 
diff --git a/autotest/gdrivers/ecw.py b/autotest/gdrivers/ecw.py
index d20ce05f75d3..45d58965d84d 100755
--- a/autotest/gdrivers/ecw.py
+++ b/autotest/gdrivers/ecw.py
@@ -39,7 +39,6 @@
 from osgeo import gdal
 from osgeo import osr
 
-sys.path.append('../pymod')
 
 import gdaltest
 
diff --git a/autotest/gdrivers/eedai.py b/autotest/gdrivers/eedai.py
index 458880d9bab9..6778ec4f5944 100644
--- a/autotest/gdrivers/eedai.py
+++ b/autotest/gdrivers/eedai.py
@@ -33,7 +33,6 @@
 import struct
 import sys
 
-sys.path.append('../pymod')
 
 from osgeo import gdal
 
diff --git a/autotest/gdrivers/ehdr.py b/autotest/gdrivers/ehdr.py
index 160ee300b853..a49bb466449d 100755
--- a/autotest/gdrivers/ehdr.py
+++ b/autotest/gdrivers/ehdr.py
@@ -36,7 +36,6 @@
 
 from osgeo import gdal
 
-sys.path.append('../pymod')
 
 import gdaltest
 
diff --git a/autotest/gdrivers/eir.py b/autotest/gdrivers/eir.py
index 1f27fb2277b1..69a8fca98f27 100755
--- a/autotest/gdrivers/eir.py
+++ b/autotest/gdrivers/eir.py
@@ -30,7 +30,6 @@
 
 import sys
 
-sys.path.append('../pymod')
 
 import gdaltest
 
diff --git a/autotest/gdrivers/elas.py b/autotest/gdrivers/elas.py
index 6a86a29b7718..c6daf36ff873 100755
--- a/autotest/gdrivers/elas.py
+++ b/autotest/gdrivers/elas.py
@@ -30,7 +30,6 @@
 
 import sys
 
-sys.path.append('../pymod')
 
 import gdaltest
 
diff --git a/autotest/gdrivers/envi.py b/autotest/gdrivers/envi.py
index ac0c971cdb2a..91dc4ed218d4 100755
--- a/autotest/gdrivers/envi.py
+++ b/autotest/gdrivers/envi.py
@@ -35,7 +35,6 @@
 import sys
 from osgeo import gdal
 
-sys.path.append('../pymod')
 
 import gdaltest
 
diff --git a/autotest/gdrivers/envisat.py b/autotest/gdrivers/envisat.py
index 5ebc48a1f3a0..a2e6c07420c2 100755
--- a/autotest/gdrivers/envisat.py
+++ b/autotest/gdrivers/envisat.py
@@ -34,7 +34,6 @@
 import gzip
 from osgeo import gdal
 
-sys.path.append('../pymod')
 
 import gdaltest
 
diff --git a/autotest/gdrivers/ers.py b/autotest/gdrivers/ers.py
index a4407ef385ec..285f7dc217e2 100755
--- a/autotest/gdrivers/ers.py
+++ b/autotest/gdrivers/ers.py
@@ -34,7 +34,6 @@
 from osgeo import gdal
 from osgeo import osr
 
-sys.path.append('../pymod')
 
 import gdaltest
 
diff --git a/autotest/gdrivers/fast.py b/autotest/gdrivers/fast.py
index 17d5d1266450..ffc6355ea226 100755
--- a/autotest/gdrivers/fast.py
+++ b/autotest/gdrivers/fast.py
@@ -32,7 +32,6 @@
 import sys
 from osgeo import gdal
 
-sys.path.append('../pymod')
 
 import gdaltest
 
diff --git a/autotest/gdrivers/fit.py b/autotest/gdrivers/fit.py
index 3f280e011de9..05a0896eda2d 100755
--- a/autotest/gdrivers/fit.py
+++ b/autotest/gdrivers/fit.py
@@ -31,7 +31,6 @@
 import sys
 from osgeo import gdal
 
-sys.path.append('../pymod')
 
 import gdaltest
 
diff --git a/autotest/gdrivers/fits.py b/autotest/gdrivers/fits.py
index 11816a78e7a4..63110d721abd 100755
--- a/autotest/gdrivers/fits.py
+++ b/autotest/gdrivers/fits.py
@@ -31,7 +31,6 @@
 import sys
 from osgeo import gdal
 
-sys.path.append('../pymod')
 
 import gdaltest
 
diff --git a/autotest/gdrivers/fujibas.py b/autotest/gdrivers/fujibas.py
index cc45c4506c74..6153a36e8bb7 100755
--- a/autotest/gdrivers/fujibas.py
+++ b/autotest/gdrivers/fujibas.py
@@ -30,7 +30,6 @@
 
 import sys
 
-sys.path.append('../pymod')
 
 import gdaltest
 
diff --git a/autotest/gdrivers/gdalhttp.py b/autotest/gdrivers/gdalhttp.py
index 9ab7bd90c9c1..29a42d3e5397 100755
--- a/autotest/gdrivers/gdalhttp.py
+++ b/autotest/gdrivers/gdalhttp.py
@@ -35,7 +35,6 @@
 from osgeo import gdal
 from osgeo import ogr
 
-sys.path.append('../pymod')
 
 import gdaltest
 
diff --git a/autotest/gdrivers/genbin.py b/autotest/gdrivers/genbin.py
index 3886f44ef85a..96f22e01294e 100755
--- a/autotest/gdrivers/genbin.py
+++ b/autotest/gdrivers/genbin.py
@@ -30,7 +30,6 @@
 
 import sys
 
-sys.path.append('../pymod')
 
 import gdaltest
 
diff --git a/autotest/gdrivers/georaster.py b/autotest/gdrivers/georaster.py
index bfc99f1748e8..524d7a6086ed 100755
--- a/autotest/gdrivers/georaster.py
+++ b/autotest/gdrivers/georaster.py
@@ -33,7 +33,6 @@
 from osgeo import gdal
 from osgeo import ogr
 
-sys.path.append('../pymod')
 
 import gdaltest
 
diff --git a/autotest/gdrivers/gff.py b/autotest/gdrivers/gff.py
index be72bd1eae96..774d40c2da4c 100755
--- a/autotest/gdrivers/gff.py
+++ b/autotest/gdrivers/gff.py
@@ -31,7 +31,6 @@
 import sys
 from osgeo import gdal
 
-sys.path.append('../pymod')
 
 import gdaltest
 
diff --git a/autotest/gdrivers/gif.py b/autotest/gdrivers/gif.py
index 876d8a02ce51..fdb7b10d2d74 100755
--- a/autotest/gdrivers/gif.py
+++ b/autotest/gdrivers/gif.py
@@ -32,7 +32,6 @@
 import sys
 from osgeo import gdal
 
-sys.path.append('../pymod')
 
 import gdaltest
 
diff --git a/autotest/gdrivers/gmt.py b/autotest/gdrivers/gmt.py
index d6edb163701a..9efbd9613549 100755
--- a/autotest/gdrivers/gmt.py
+++ b/autotest/gdrivers/gmt.py
@@ -31,7 +31,6 @@
 import sys
 from osgeo import gdal
 
-sys.path.append('../pymod')
 
 import gdaltest
 
diff --git a/autotest/gdrivers/gpkg.py b/autotest/gdrivers/gpkg.py
index 5320e4db8cc7..413aafe3018d 100755
--- a/autotest/gdrivers/gpkg.py
+++ b/autotest/gdrivers/gpkg.py
@@ -37,7 +37,6 @@
     if os.path.dirname(sys.argv[0]) != '':
         os.chdir(os.path.dirname(sys.argv[0]))
 
-sys.path.append('../pymod')
 sys.path.append('../../gdal/swig/python/samples')
 
 from osgeo import osr, gdal, ogr
diff --git a/autotest/gdrivers/grass.py b/autotest/gdrivers/grass.py
index cde00a6cd07e..ce69be146b5f 100755
--- a/autotest/gdrivers/grass.py
+++ b/autotest/gdrivers/grass.py
@@ -31,7 +31,6 @@
 import sys
 from osgeo import gdal
 
-sys.path.append('../pymod')
 
 import gdaltest
 
diff --git a/autotest/gdrivers/grassasciigrid.py b/autotest/gdrivers/grassasciigrid.py
index 12dde9da0c54..c4f80dd0f8d6 100755
--- a/autotest/gdrivers/grassasciigrid.py
+++ b/autotest/gdrivers/grassasciigrid.py
@@ -30,7 +30,6 @@
 
 import sys
 
-sys.path.append('../pymod')
 
 import gdaltest
 
diff --git a/autotest/gdrivers/grib.py b/autotest/gdrivers/grib.py
index a0d84451b6c7..7892d815c2a7 100755
--- a/autotest/gdrivers/grib.py
+++ b/autotest/gdrivers/grib.py
@@ -37,7 +37,6 @@
 from osgeo import gdal
 from osgeo import osr
 
-sys.path.append('../pymod')
 sys.path.append('../osr')
 
 import gdaltest
diff --git a/autotest/gdrivers/gsc.py b/autotest/gdrivers/gsc.py
index 877ad8492cb0..58bb8e78d267 100755
--- a/autotest/gdrivers/gsc.py
+++ b/autotest/gdrivers/gsc.py
@@ -30,7 +30,6 @@
 
 import sys
 
-sys.path.append('../pymod')
 
 import gdaltest
 
diff --git a/autotest/gdrivers/gsg.py b/autotest/gdrivers/gsg.py
index ee8fa74ec64e..1254a43856b6 100755
--- a/autotest/gdrivers/gsg.py
+++ b/autotest/gdrivers/gsg.py
@@ -30,7 +30,6 @@
 
 import sys
 
-sys.path.append('../pymod')
 
 import gdaltest
 
diff --git a/autotest/gdrivers/gta.py b/autotest/gdrivers/gta.py
index 5b9dc1062461..3fe6e417d65a 100755
--- a/autotest/gdrivers/gta.py
+++ b/autotest/gdrivers/gta.py
@@ -30,7 +30,6 @@
 
 import sys
 
-sys.path.append('../pymod')
 
 import gdaltest
 from osgeo import gdal
diff --git a/autotest/gdrivers/gtx.py b/autotest/gdrivers/gtx.py
index 6aa48f680f21..620f6db4734a 100755
--- a/autotest/gdrivers/gtx.py
+++ b/autotest/gdrivers/gtx.py
@@ -30,7 +30,6 @@
 
 import sys
 
-sys.path.append('../pymod')
 
 import gdaltest
 
diff --git a/autotest/gdrivers/gxf.py b/autotest/gdrivers/gxf.py
index 6355ea150f8e..05c63232ad30 100755
--- a/autotest/gdrivers/gxf.py
+++ b/autotest/gdrivers/gxf.py
@@ -32,7 +32,6 @@
 import sys
 from osgeo import gdal
 
-sys.path.append('../pymod')
 
 import gdaltest
 
diff --git a/autotest/gdrivers/hdf5.py b/autotest/gdrivers/hdf5.py
index 8f87a30502db..d0229f214808 100755
--- a/autotest/gdrivers/hdf5.py
+++ b/autotest/gdrivers/hdf5.py
@@ -34,7 +34,6 @@
 
 from osgeo import gdal
 
-sys.path.append('../pymod')
 
 import gdaltest
 
diff --git a/autotest/gdrivers/hf2.py b/autotest/gdrivers/hf2.py
index 2dc0fa0fb256..a899006089ac 100755
--- a/autotest/gdrivers/hf2.py
+++ b/autotest/gdrivers/hf2.py
@@ -31,7 +31,6 @@
 import os
 import sys
 
-sys.path.append('../pymod')
 
 import gdaltest
 
diff --git a/autotest/gdrivers/hfa.py b/autotest/gdrivers/hfa.py
index 4fd1824b6a01..7df7b3f43760 100755
--- a/autotest/gdrivers/hfa.py
+++ b/autotest/gdrivers/hfa.py
@@ -34,7 +34,6 @@
 import array
 from osgeo import gdal
 
-sys.path.append('../pymod')
 
 import gdaltest
 
diff --git a/autotest/gdrivers/ida.py b/autotest/gdrivers/ida.py
index 5f828838581a..f6c5125fc1f0 100755
--- a/autotest/gdrivers/ida.py
+++ b/autotest/gdrivers/ida.py
@@ -31,7 +31,6 @@
 import sys
 from osgeo import gdal
 
-sys.path.append('../pymod')
 
 import gdaltest
 
diff --git a/autotest/gdrivers/idrisi.py b/autotest/gdrivers/idrisi.py
index a7184d8a3c07..4f8a7795f3a9 100755
--- a/autotest/gdrivers/idrisi.py
+++ b/autotest/gdrivers/idrisi.py
@@ -32,7 +32,6 @@
 import os
 import sys
 
-sys.path.append('../pymod')
 
 import gdaltest
 
diff --git a/autotest/gdrivers/ilwis.py b/autotest/gdrivers/ilwis.py
index 6bc4239a14f3..46c40b2b7cab 100755
--- a/autotest/gdrivers/ilwis.py
+++ b/autotest/gdrivers/ilwis.py
@@ -30,7 +30,6 @@
 
 import sys
 
-sys.path.append('../pymod')
 
 import gdaltest
 
diff --git a/autotest/gdrivers/ingr.py b/autotest/gdrivers/ingr.py
index eb985bacf87e..787a2eb3f295 100755
--- a/autotest/gdrivers/ingr.py
+++ b/autotest/gdrivers/ingr.py
@@ -34,7 +34,6 @@
 import sys
 from osgeo import gdal
 
-sys.path.append('../pymod')
 
 import gdaltest
 
diff --git a/autotest/gdrivers/iris.py b/autotest/gdrivers/iris.py
index 8ed2af1a3d91..0f24d35adbfd 100755
--- a/autotest/gdrivers/iris.py
+++ b/autotest/gdrivers/iris.py
@@ -32,7 +32,6 @@
 import sys
 from osgeo import gdal
 
-sys.path.append('../pymod')
 
 import gdaltest
 
diff --git a/autotest/gdrivers/isce.py b/autotest/gdrivers/isce.py
index 2279d8b301f7..e671e710d6d7 100755
--- a/autotest/gdrivers/isce.py
+++ b/autotest/gdrivers/isce.py
@@ -32,7 +32,6 @@
 import sys
 from osgeo import gdal
 
-sys.path.append('../pymod')
 
 import gdaltest
 
diff --git a/autotest/gdrivers/isis.py b/autotest/gdrivers/isis.py
index 2b4c9920d07e..fdd1a46ac82f 100755
--- a/autotest/gdrivers/isis.py
+++ b/autotest/gdrivers/isis.py
@@ -33,7 +33,6 @@
 import struct
 import sys
 
-sys.path.append('../pymod')
 
 from osgeo import gdal
 from osgeo import osr
diff --git a/autotest/gdrivers/isis2.py b/autotest/gdrivers/isis2.py
index cae8302053ad..61326c66a52f 100755
--- a/autotest/gdrivers/isis2.py
+++ b/autotest/gdrivers/isis2.py
@@ -30,7 +30,6 @@
 
 import sys
 
-sys.path.append('../pymod')
 
 import gdaltest
 
diff --git a/autotest/gdrivers/jdem.py b/autotest/gdrivers/jdem.py
index 70ca710954f3..219ae6e3c73a 100755
--- a/autotest/gdrivers/jdem.py
+++ b/autotest/gdrivers/jdem.py
@@ -30,7 +30,6 @@
 
 import sys
 
-sys.path.append('../pymod')
 
 import gdaltest
 
diff --git a/autotest/gdrivers/jp2kak.py b/autotest/gdrivers/jp2kak.py
index fc724d4a177f..8a9007cb673e 100755
--- a/autotest/gdrivers/jp2kak.py
+++ b/autotest/gdrivers/jp2kak.py
@@ -33,7 +33,6 @@
 import sys
 from osgeo import gdal
 
-sys.path.append('../pymod')
 
 import gdaltest
 
diff --git a/autotest/gdrivers/jp2lura.py b/autotest/gdrivers/jp2lura.py
index 1fccd804103b..f9c18b29b529 100755
--- a/autotest/gdrivers/jp2lura.py
+++ b/autotest/gdrivers/jp2lura.py
@@ -37,7 +37,6 @@
 from osgeo import ogr
 from osgeo import osr
 
-sys.path.append('../pymod')
 sys.path.append('../../gdal/swig/python/samples')
 
 import gdaltest
diff --git a/autotest/gdrivers/jp2metadata.py b/autotest/gdrivers/jp2metadata.py
index 2d9de1bd5c14..0d59f5cbc269 100755
--- a/autotest/gdrivers/jp2metadata.py
+++ b/autotest/gdrivers/jp2metadata.py
@@ -31,7 +31,6 @@
 import sys
 import os
 
-sys.path.append('../pymod')
 
 from osgeo import gdal
 
diff --git a/autotest/gdrivers/jp2openjpeg.py b/autotest/gdrivers/jp2openjpeg.py
index ef1d831fe280..f380d2cc148f 100755
--- a/autotest/gdrivers/jp2openjpeg.py
+++ b/autotest/gdrivers/jp2openjpeg.py
@@ -36,7 +36,6 @@
 from osgeo import ogr
 from osgeo import osr
 
-sys.path.append('../pymod')
 sys.path.append('../ogr')
 sys.path.append('../../gdal/swig/python/samples')
 
diff --git a/autotest/gdrivers/jpeg.py b/autotest/gdrivers/jpeg.py
index bc4b3e05b7a6..f9d1d42e0d35 100755
--- a/autotest/gdrivers/jpeg.py
+++ b/autotest/gdrivers/jpeg.py
@@ -35,7 +35,6 @@
 import shutil
 import struct
 
-sys.path.append('../pymod')
 import gdaltest
 
 from osgeo import gdal
diff --git a/autotest/gdrivers/jpeg2000.py b/autotest/gdrivers/jpeg2000.py
index 3f2ec599568d..129d9a31b1f2 100755
--- a/autotest/gdrivers/jpeg2000.py
+++ b/autotest/gdrivers/jpeg2000.py
@@ -31,7 +31,6 @@
 import sys
 from osgeo import gdal
 
-sys.path.append('../pymod')
 
 import gdaltest
 
diff --git a/autotest/gdrivers/jpeg_profile.py b/autotest/gdrivers/jpeg_profile.py
index b7b715641bcf..8a75bb843ff2 100755
--- a/autotest/gdrivers/jpeg_profile.py
+++ b/autotest/gdrivers/jpeg_profile.py
@@ -34,7 +34,6 @@
 import sys
 import base64
 
-sys.path.append('../pymod')
 
 import gdaltest
 from osgeo import gdal
diff --git a/autotest/gdrivers/jpegls.py b/autotest/gdrivers/jpegls.py
index e518e928da24..e1f06cc3ad06 100755
--- a/autotest/gdrivers/jpegls.py
+++ b/autotest/gdrivers/jpegls.py
@@ -31,7 +31,6 @@
 import sys
 from osgeo import gdal
 
-sys.path.append('../pymod')
 
 import gdaltest
 
diff --git a/autotest/gdrivers/jpipkak.py b/autotest/gdrivers/jpipkak.py
index c9c6a3d7cf53..ff2faa332765 100755
--- a/autotest/gdrivers/jpipkak.py
+++ b/autotest/gdrivers/jpipkak.py
@@ -31,7 +31,6 @@
 import sys
 from osgeo import gdal
 
-sys.path.append('../pymod')
 
 import gdaltest
 
diff --git a/autotest/gdrivers/kea.py b/autotest/gdrivers/kea.py
index d0045a46c1f3..2c885e70dfb1 100755
--- a/autotest/gdrivers/kea.py
+++ b/autotest/gdrivers/kea.py
@@ -32,7 +32,6 @@
 import sys
 from osgeo import gdal
 
-sys.path.append('../pymod')
 
 import gdaltest
 
diff --git a/autotest/gdrivers/kmlsuperoverlay.py b/autotest/gdrivers/kmlsuperoverlay.py
index df16a2f062f4..d1d81084f5e4 100755
--- a/autotest/gdrivers/kmlsuperoverlay.py
+++ b/autotest/gdrivers/kmlsuperoverlay.py
@@ -34,7 +34,6 @@
 import shutil
 from osgeo import gdal
 
-sys.path.append('../pymod')
 
 import gdaltest
 
diff --git a/autotest/gdrivers/kro.py b/autotest/gdrivers/kro.py
index 7400cf6af9f1..3a4d8bdba2d6 100755
--- a/autotest/gdrivers/kro.py
+++ b/autotest/gdrivers/kro.py
@@ -32,7 +32,6 @@
 import sys
 from osgeo import gdal
 
-sys.path.append('../pymod')
 
 import gdaltest
 
diff --git a/autotest/gdrivers/l1b.py b/autotest/gdrivers/l1b.py
index 3f76d86f95d0..6a80a525c2bd 100755
--- a/autotest/gdrivers/l1b.py
+++ b/autotest/gdrivers/l1b.py
@@ -33,7 +33,6 @@
 import sys
 from osgeo import gdal
 
-sys.path.append('../pymod')
 
 import gdaltest
 
diff --git a/autotest/gdrivers/lan.py b/autotest/gdrivers/lan.py
index f27a7d996908..89b33e8d72d8 100755
--- a/autotest/gdrivers/lan.py
+++ b/autotest/gdrivers/lan.py
@@ -30,7 +30,6 @@
 
 import sys
 
-sys.path.append('../pymod')
 
 import gdaltest
 
diff --git a/autotest/gdrivers/lcp.py b/autotest/gdrivers/lcp.py
index 6ba72b135565..5bbbb0cd1429 100755
--- a/autotest/gdrivers/lcp.py
+++ b/autotest/gdrivers/lcp.py
@@ -33,7 +33,6 @@
 import sys
 from osgeo import gdal
 
-sys.path.append('../pymod')
 
 import gdaltest
 
diff --git a/autotest/gdrivers/leveller.py b/autotest/gdrivers/leveller.py
index 215e9b90b2bf..6489da027acc 100755
--- a/autotest/gdrivers/leveller.py
+++ b/autotest/gdrivers/leveller.py
@@ -30,7 +30,6 @@
 
 import sys
 
-sys.path.append('../pymod')
 
 import gdaltest
 
diff --git a/autotest/gdrivers/loslas.py b/autotest/gdrivers/loslas.py
index f0e7d19e5dea..20de8dbf8034 100755
--- a/autotest/gdrivers/loslas.py
+++ b/autotest/gdrivers/loslas.py
@@ -31,7 +31,6 @@
 import os
 import sys
 
-sys.path.append('../pymod')
 
 import gdaltest
 
diff --git a/autotest/gdrivers/mbtiles.py b/autotest/gdrivers/mbtiles.py
index 52560bc635d0..94e67197ecab 100755
--- a/autotest/gdrivers/mbtiles.py
+++ b/autotest/gdrivers/mbtiles.py
@@ -33,7 +33,6 @@
 from osgeo import gdal
 from osgeo import ogr
 
-sys.path.append('../pymod')
 
 import gdaltest
 import webserver
diff --git a/autotest/gdrivers/mem.py b/autotest/gdrivers/mem.py
index 724c874e9ec9..b3839e4cae88 100755
--- a/autotest/gdrivers/mem.py
+++ b/autotest/gdrivers/mem.py
@@ -33,7 +33,6 @@
 import array
 from osgeo import gdal
 
-sys.path.append('../pymod')
 
 import gdaltest
 
diff --git a/autotest/gdrivers/mff.py b/autotest/gdrivers/mff.py
index b928e8454cbf..19e4821ad32a 100755
--- a/autotest/gdrivers/mff.py
+++ b/autotest/gdrivers/mff.py
@@ -30,7 +30,6 @@
 
 import sys
 
-sys.path.append('../pymod')
 
 import gdaltest
 
diff --git a/autotest/gdrivers/mff2.py b/autotest/gdrivers/mff2.py
index d01771b3a750..5d6f59b864c7 100755
--- a/autotest/gdrivers/mff2.py
+++ b/autotest/gdrivers/mff2.py
@@ -30,7 +30,6 @@
 
 import sys
 
-sys.path.append('../pymod')
 
 import gdaltest
 
diff --git a/autotest/gdrivers/mg4lidar.py b/autotest/gdrivers/mg4lidar.py
index 51c432f169d5..b7a2b01d66db 100755
--- a/autotest/gdrivers/mg4lidar.py
+++ b/autotest/gdrivers/mg4lidar.py
@@ -31,7 +31,6 @@
 import os
 import sys
 
-sys.path.append('../pymod')
 
 import gdaltest
 from osgeo import gdal
diff --git a/autotest/gdrivers/mrf.py b/autotest/gdrivers/mrf.py
index d9f2fc72ad60..35dcc67f7e20 100755
--- a/autotest/gdrivers/mrf.py
+++ b/autotest/gdrivers/mrf.py
@@ -33,7 +33,6 @@
 
 import pytest
 
-sys.path.append('../pymod')
 
 from osgeo import gdal
 
diff --git a/autotest/gdrivers/mrsid.py b/autotest/gdrivers/mrsid.py
index 576d90932a75..624b26a6ac60 100755
--- a/autotest/gdrivers/mrsid.py
+++ b/autotest/gdrivers/mrsid.py
@@ -34,7 +34,6 @@
 import shutil
 from osgeo import gdal
 
-sys.path.append('../pymod')
 
 import gdaltest
 
diff --git a/autotest/gdrivers/ndf.py b/autotest/gdrivers/ndf.py
index aebd0e026d45..c27e6ba09198 100755
--- a/autotest/gdrivers/ndf.py
+++ b/autotest/gdrivers/ndf.py
@@ -30,7 +30,6 @@
 
 import sys
 
-sys.path.append('../pymod')
 
 import gdaltest
 
diff --git a/autotest/gdrivers/netcdf.py b/autotest/gdrivers/netcdf.py
index 347f3bce23af..9e2c842cd411 100755
--- a/autotest/gdrivers/netcdf.py
+++ b/autotest/gdrivers/netcdf.py
@@ -39,7 +39,6 @@
 from osgeo import ogr
 from osgeo import osr
 
-sys.path.append('../pymod')
 
 import gdaltest
 
diff --git a/autotest/gdrivers/netcdf_cf.py b/autotest/gdrivers/netcdf_cf.py
index 87276857a1e8..ed271c43bc81 100755
--- a/autotest/gdrivers/netcdf_cf.py
+++ b/autotest/gdrivers/netcdf_cf.py
@@ -36,7 +36,6 @@
 from osgeo import gdal
 from osgeo import osr
 
-sys.path.append('../pymod')
 
 import gdaltest
 
diff --git a/autotest/gdrivers/ngsgeoid.py b/autotest/gdrivers/ngsgeoid.py
index d56e02b5ebd7..ea6e2c6041c6 100755
--- a/autotest/gdrivers/ngsgeoid.py
+++ b/autotest/gdrivers/ngsgeoid.py
@@ -30,7 +30,6 @@
 
 import sys
 
-sys.path.append('../pymod')
 
 import gdaltest
 
diff --git a/autotest/gdrivers/nitf.py b/autotest/gdrivers/nitf.py
index bc298f89ded1..08c292c7e9ae 100755
--- a/autotest/gdrivers/nitf.py
+++ b/autotest/gdrivers/nitf.py
@@ -39,7 +39,6 @@
 from osgeo import gdal
 from osgeo import osr
 
-sys.path.append('../pymod')
 
 import gdaltest
 
diff --git a/autotest/gdrivers/ntv2.py b/autotest/gdrivers/ntv2.py
index f69080ea5717..c5d7a4829fe4 100755
--- a/autotest/gdrivers/ntv2.py
+++ b/autotest/gdrivers/ntv2.py
@@ -31,7 +31,6 @@
 import os
 import sys
 
-sys.path.append('../pymod')
 
 from osgeo import gdal
 import gdaltest
diff --git a/autotest/gdrivers/nwt_grc.py b/autotest/gdrivers/nwt_grc.py
index e7121c1956d1..2ce7b8d87fc4 100755
--- a/autotest/gdrivers/nwt_grc.py
+++ b/autotest/gdrivers/nwt_grc.py
@@ -30,7 +30,6 @@
 
 import sys
 
-sys.path.append('../pymod')
 
 import gdaltest
 
diff --git a/autotest/gdrivers/nwt_grd.py b/autotest/gdrivers/nwt_grd.py
index db951d68d14c..e22a766b8c5c 100755
--- a/autotest/gdrivers/nwt_grd.py
+++ b/autotest/gdrivers/nwt_grd.py
@@ -31,7 +31,6 @@
 import sys
 import shutil
 
-sys.path.append('../pymod')
 
 from osgeo import gdal
 import gdaltest
diff --git a/autotest/gdrivers/ozi.py b/autotest/gdrivers/ozi.py
index c509f4243cac..0969b9c03795 100755
--- a/autotest/gdrivers/ozi.py
+++ b/autotest/gdrivers/ozi.py
@@ -32,7 +32,6 @@
 import sys
 from osgeo import gdal
 
-sys.path.append('../pymod')
 
 import gdaltest
 
diff --git a/autotest/gdrivers/paux.py b/autotest/gdrivers/paux.py
index 865507441bd3..25c6fa7b04d9 100755
--- a/autotest/gdrivers/paux.py
+++ b/autotest/gdrivers/paux.py
@@ -30,7 +30,6 @@
 
 import sys
 
-sys.path.append('../pymod')
 
 from osgeo import gdal
 import gdaltest
diff --git a/autotest/gdrivers/pcidsk.py b/autotest/gdrivers/pcidsk.py
index 9247c1cf3a8b..c933a14a1088 100755
--- a/autotest/gdrivers/pcidsk.py
+++ b/autotest/gdrivers/pcidsk.py
@@ -34,7 +34,6 @@
 from osgeo import gdal
 from osgeo import ogr
 
-sys.path.append('../pymod')
 
 import gdaltest
 
diff --git a/autotest/gdrivers/pcraster.py b/autotest/gdrivers/pcraster.py
index 0b11c8067f11..e4ec4dcb6530 100755
--- a/autotest/gdrivers/pcraster.py
+++ b/autotest/gdrivers/pcraster.py
@@ -31,7 +31,6 @@
 import sys
 from osgeo import gdal
 
-sys.path.append('../pymod')
 
 import gdaltest
 
diff --git a/autotest/gdrivers/pdf.py b/autotest/gdrivers/pdf.py
index 7292fa72a9b6..6dc85cc05360 100755
--- a/autotest/gdrivers/pdf.py
+++ b/autotest/gdrivers/pdf.py
@@ -35,7 +35,6 @@
 from osgeo import ogr
 from osgeo import osr
 
-sys.path.append('../pymod')
 sys.path.append('../osr')
 
 import gdaltest
diff --git a/autotest/gdrivers/pds.py b/autotest/gdrivers/pds.py
index cafaf8e92775..6e95a7fdb223 100755
--- a/autotest/gdrivers/pds.py
+++ b/autotest/gdrivers/pds.py
@@ -33,7 +33,6 @@
 import sys
 from osgeo import gdal
 
-sys.path.append('../pymod')
 
 import gdaltest
 
diff --git a/autotest/gdrivers/pds4.py b/autotest/gdrivers/pds4.py
index 415bf4365ea4..323826e1fe62 100755
--- a/autotest/gdrivers/pds4.py
+++ b/autotest/gdrivers/pds4.py
@@ -33,7 +33,6 @@
 import struct
 import sys
 
-sys.path.append('../pymod')
 
 from osgeo import gdal
 from osgeo import ogr
diff --git a/autotest/gdrivers/plmosaic.py b/autotest/gdrivers/plmosaic.py
index c9f5c28a35b9..883e54a77469 100755
--- a/autotest/gdrivers/plmosaic.py
+++ b/autotest/gdrivers/plmosaic.py
@@ -34,7 +34,6 @@
 import shutil
 import struct
 
-sys.path.append('../pymod')
 
 from osgeo import gdal
 
diff --git a/autotest/gdrivers/png.py b/autotest/gdrivers/png.py
index 338d9148f4f4..f37e28efee42 100755
--- a/autotest/gdrivers/png.py
+++ b/autotest/gdrivers/png.py
@@ -33,7 +33,6 @@
 import sys
 from osgeo import gdal
 
-sys.path.append('../pymod')
 
 import gdaltest
 
diff --git a/autotest/gdrivers/png_profile.py b/autotest/gdrivers/png_profile.py
index 806e04a44c4c..6ec7dd3a9a2d 100755
--- a/autotest/gdrivers/png_profile.py
+++ b/autotest/gdrivers/png_profile.py
@@ -34,7 +34,6 @@
 import sys
 import base64
 
-sys.path.append('../pymod')
 
 import gdaltest
 from osgeo import gdal
diff --git a/autotest/gdrivers/pnm.py b/autotest/gdrivers/pnm.py
index 5c24a6870985..e40c9a68e05c 100755
--- a/autotest/gdrivers/pnm.py
+++ b/autotest/gdrivers/pnm.py
@@ -30,7 +30,6 @@
 
 import sys
 
-sys.path.append('../pymod')
 
 import gdaltest
 
diff --git a/autotest/gdrivers/postgisraster.py b/autotest/gdrivers/postgisraster.py
index 01f402e7a70b..841458516fc2 100755
--- a/autotest/gdrivers/postgisraster.py
+++ b/autotest/gdrivers/postgisraster.py
@@ -36,7 +36,6 @@
 from osgeo import ogr
 from osgeo import osr
 
-sys.path.append('../pymod')
 
 import gdaltest
 
diff --git a/autotest/gdrivers/prf.py b/autotest/gdrivers/prf.py
index 03338af0339c..35b2440ffa07 100755
--- a/autotest/gdrivers/prf.py
+++ b/autotest/gdrivers/prf.py
@@ -26,7 +26,6 @@
 
 import sys
 
-sys.path.append('../pymod')
 
 import gdaltest
 from osgeo import gdal
diff --git a/autotest/gdrivers/r.py b/autotest/gdrivers/r.py
index a5f1b5e168bf..829f797d05d4 100755
--- a/autotest/gdrivers/r.py
+++ b/autotest/gdrivers/r.py
@@ -30,7 +30,6 @@
 
 import sys
 
-sys.path.append('../pymod')
 
 import gdaltest
 
diff --git a/autotest/gdrivers/rasdaman.py b/autotest/gdrivers/rasdaman.py
index 5b32473bd5f4..b0a0c7da5624 100755
--- a/autotest/gdrivers/rasdaman.py
+++ b/autotest/gdrivers/rasdaman.py
@@ -31,7 +31,6 @@
 import sys
 from osgeo import gdal
 
-sys.path.append('../pymod')
 
 import gdaltest
 
diff --git a/autotest/gdrivers/rasterlite.py b/autotest/gdrivers/rasterlite.py
index de6f39c269d3..2931fde8f872 100755
--- a/autotest/gdrivers/rasterlite.py
+++ b/autotest/gdrivers/rasterlite.py
@@ -34,7 +34,6 @@
 from osgeo import gdal
 from osgeo import ogr
 
-sys.path.append('../pymod')
 
 import gdaltest
 
diff --git a/autotest/gdrivers/rda.py b/autotest/gdrivers/rda.py
index 4a857ff71619..96f8788004c5 100755
--- a/autotest/gdrivers/rda.py
+++ b/autotest/gdrivers/rda.py
@@ -34,7 +34,6 @@
 import sys
 import json
 
-sys.path.append('../pymod')
 
 from osgeo import gdal
 
diff --git a/autotest/gdrivers/rik.py b/autotest/gdrivers/rik.py
index a44f5f8bf94b..21401baceb42 100755
--- a/autotest/gdrivers/rik.py
+++ b/autotest/gdrivers/rik.py
@@ -32,7 +32,6 @@
 import sys
 from osgeo import gdal
 
-sys.path.append('../pymod')
 
 import gdaltest
 
diff --git a/autotest/gdrivers/rl2.py b/autotest/gdrivers/rl2.py
index 34bcc334e875..499f4726c3d0 100755
--- a/autotest/gdrivers/rl2.py
+++ b/autotest/gdrivers/rl2.py
@@ -32,7 +32,6 @@
 import sys
 from osgeo import gdal, ogr
 
-sys.path.append('../pymod')
 
 import gdaltest
 
diff --git a/autotest/gdrivers/rmf.py b/autotest/gdrivers/rmf.py
index 5fc6bbda1edf..c545036e80ee 100755
--- a/autotest/gdrivers/rmf.py
+++ b/autotest/gdrivers/rmf.py
@@ -31,7 +31,6 @@
 import os
 import sys
 
-sys.path.append('../pymod')
 
 import gdaltest
 from osgeo import gdal
diff --git a/autotest/gdrivers/roipac.py b/autotest/gdrivers/roipac.py
index 835aa0309308..4bee985a9bc5 100755
--- a/autotest/gdrivers/roipac.py
+++ b/autotest/gdrivers/roipac.py
@@ -32,7 +32,6 @@
 import sys
 from osgeo import gdal
 
-sys.path.append('../pymod')
 
 import gdaltest
 
diff --git a/autotest/gdrivers/rpftoc.py b/autotest/gdrivers/rpftoc.py
index a6417d31fa65..05ec9c22389a 100755
--- a/autotest/gdrivers/rpftoc.py
+++ b/autotest/gdrivers/rpftoc.py
@@ -33,7 +33,6 @@
 import shutil
 from osgeo import gdal
 
-sys.path.append('../pymod')
 
 import gdaltest
 
diff --git a/autotest/gdrivers/rraster.py b/autotest/gdrivers/rraster.py
index f79091e0c50d..36ab5efa17d1 100755
--- a/autotest/gdrivers/rraster.py
+++ b/autotest/gdrivers/rraster.py
@@ -34,7 +34,6 @@
 from osgeo import gdal
 from osgeo import osr
 
-sys.path.append('../pymod')
 
 import gdaltest
 
diff --git a/autotest/gdrivers/rs2.py b/autotest/gdrivers/rs2.py
index d1c5bf40c9be..40379a95167a 100755
--- a/autotest/gdrivers/rs2.py
+++ b/autotest/gdrivers/rs2.py
@@ -30,7 +30,6 @@
 
 import sys
 
-sys.path.append('../pymod')
 
 from osgeo import gdal
 import gdaltest
diff --git a/autotest/gdrivers/safe.py b/autotest/gdrivers/safe.py
index 1102a8b8c53e..f20ce6a57188 100755
--- a/autotest/gdrivers/safe.py
+++ b/autotest/gdrivers/safe.py
@@ -30,7 +30,6 @@
 
 import sys
 
-sys.path.append('../pymod')
 
 import gdaltest
 
diff --git a/autotest/gdrivers/saga.py b/autotest/gdrivers/saga.py
index 271ae7042048..2c426ae2efa0 100755
--- a/autotest/gdrivers/saga.py
+++ b/autotest/gdrivers/saga.py
@@ -33,7 +33,6 @@
 import sys
 from osgeo import gdal
 
-sys.path.append('../pymod')
 
 import gdaltest
 
diff --git a/autotest/gdrivers/sar_ceos.py b/autotest/gdrivers/sar_ceos.py
index 3c83fcaf1f2a..94669b3d999e 100755
--- a/autotest/gdrivers/sar_ceos.py
+++ b/autotest/gdrivers/sar_ceos.py
@@ -30,7 +30,6 @@
 
 import sys
 
-sys.path.append('../pymod')
 
 import gdaltest
 
diff --git a/autotest/gdrivers/sdts.py b/autotest/gdrivers/sdts.py
index f80f92ffcfa9..dcf63a9875b2 100755
--- a/autotest/gdrivers/sdts.py
+++ b/autotest/gdrivers/sdts.py
@@ -32,7 +32,6 @@
 from osgeo import gdal
 from osgeo import osr
 
-sys.path.append('../pymod')
 
 import gdaltest
 
diff --git a/autotest/gdrivers/sentinel2.py b/autotest/gdrivers/sentinel2.py
index 6602278729b4..3625e405b0e6 100755
--- a/autotest/gdrivers/sentinel2.py
+++ b/autotest/gdrivers/sentinel2.py
@@ -33,7 +33,6 @@
 import sys
 from osgeo import gdal
 
-sys.path.append('../pymod')
 
 import gdaltest
 
diff --git a/autotest/gdrivers/sgi.py b/autotest/gdrivers/sgi.py
index 3871df5c6904..ccdb45fcf40b 100755
--- a/autotest/gdrivers/sgi.py
+++ b/autotest/gdrivers/sgi.py
@@ -30,7 +30,6 @@
 
 import sys
 
-sys.path.append('../pymod')
 
 import gdaltest
 
diff --git a/autotest/gdrivers/sigdem.py b/autotest/gdrivers/sigdem.py
index 1c695a2c000f..b3cac67a20d2 100755
--- a/autotest/gdrivers/sigdem.py
+++ b/autotest/gdrivers/sigdem.py
@@ -31,7 +31,6 @@
 
 import sys
 
-sys.path.append('../pymod')
 
 import gdaltest
 
diff --git a/autotest/gdrivers/snodas.py b/autotest/gdrivers/snodas.py
index 58cb7ae41b43..2a0d3b68c753 100755
--- a/autotest/gdrivers/snodas.py
+++ b/autotest/gdrivers/snodas.py
@@ -31,7 +31,6 @@
 import sys
 from osgeo import gdal
 
-sys.path.append('../pymod')
 
 import gdaltest
 
diff --git a/autotest/gdrivers/srp.py b/autotest/gdrivers/srp.py
index 80c910fc5547..dabb996f103d 100755
--- a/autotest/gdrivers/srp.py
+++ b/autotest/gdrivers/srp.py
@@ -34,7 +34,6 @@
 from osgeo import gdal
 from osgeo import osr
 
-sys.path.append('../pymod')
 
 import gdaltest
 
diff --git a/autotest/gdrivers/srtmhgt.py b/autotest/gdrivers/srtmhgt.py
index 0006f20b8a88..f858358c298b 100755
--- a/autotest/gdrivers/srtmhgt.py
+++ b/autotest/gdrivers/srtmhgt.py
@@ -33,7 +33,6 @@
 import sys
 from osgeo import gdal
 
-sys.path.append('../pymod')
 
 import gdaltest
 
diff --git a/autotest/gdrivers/terragen.py b/autotest/gdrivers/terragen.py
index 90fdd74a72cb..5133f5126335 100755
--- a/autotest/gdrivers/terragen.py
+++ b/autotest/gdrivers/terragen.py
@@ -29,7 +29,6 @@
 
 import sys
 
-sys.path.append('../pymod')
 
 from osgeo import gdal
 import gdaltest
diff --git a/autotest/gdrivers/test_validate_jp2.py b/autotest/gdrivers/test_validate_jp2.py
index 94ce46b7de37..ce42759dda6a 100755
--- a/autotest/gdrivers/test_validate_jp2.py
+++ b/autotest/gdrivers/test_validate_jp2.py
@@ -33,7 +33,6 @@
 import sys
 from osgeo import gdal
 
-sys.path.append('../pymod')
 sys.path.append('../../gdal/swig/python/samples')
 
 import gdaltest
diff --git a/autotest/gdrivers/tiff_profile.py b/autotest/gdrivers/tiff_profile.py
index 9847f64daee4..2e41363e960f 100755
--- a/autotest/gdrivers/tiff_profile.py
+++ b/autotest/gdrivers/tiff_profile.py
@@ -34,7 +34,6 @@
 import sys
 import base64
 
-sys.path.append('../pymod')
 
 import gdaltest
 from osgeo import gdal
diff --git a/autotest/gdrivers/til.py b/autotest/gdrivers/til.py
index 58f5fd0b70c1..9c0be4774454 100755
--- a/autotest/gdrivers/til.py
+++ b/autotest/gdrivers/til.py
@@ -31,7 +31,6 @@
 import os
 import sys
 
-sys.path.append('../pymod')
 
 import gdaltest
 from osgeo import gdal
diff --git a/autotest/gdrivers/usgsdem.py b/autotest/gdrivers/usgsdem.py
index d0853c02e123..988fb715b0ca 100755
--- a/autotest/gdrivers/usgsdem.py
+++ b/autotest/gdrivers/usgsdem.py
@@ -33,7 +33,6 @@
 from osgeo import gdal
 from osgeo import osr
 
-sys.path.append('../pymod')
 
 import gdaltest
 
diff --git a/autotest/gdrivers/vicar.py b/autotest/gdrivers/vicar.py
index 436e6af88a33..103134941074 100755
--- a/autotest/gdrivers/vicar.py
+++ b/autotest/gdrivers/vicar.py
@@ -32,7 +32,6 @@
 import sys
 from osgeo import gdal
 
-sys.path.append('../pymod')
 
 import gdaltest
 
diff --git a/autotest/gdrivers/vrtderived.py b/autotest/gdrivers/vrtderived.py
index d4c9d827be35..37228a4b5a12 100755
--- a/autotest/gdrivers/vrtderived.py
+++ b/autotest/gdrivers/vrtderived.py
@@ -35,7 +35,6 @@
 import threading
 from osgeo import gdal
 
-sys.path.append('../pymod')
 
 import gdaltest
 
diff --git a/autotest/gdrivers/vrtfilt.py b/autotest/gdrivers/vrtfilt.py
index 1e17d5de7f0a..bfe86d07f35c 100755
--- a/autotest/gdrivers/vrtfilt.py
+++ b/autotest/gdrivers/vrtfilt.py
@@ -32,7 +32,6 @@
 import sys
 from osgeo import gdal
 
-sys.path.append('../pymod')
 
 import gdaltest
 
diff --git a/autotest/gdrivers/vrtlut.py b/autotest/gdrivers/vrtlut.py
index 81d6e7681f0d..b135a89de082 100755
--- a/autotest/gdrivers/vrtlut.py
+++ b/autotest/gdrivers/vrtlut.py
@@ -30,7 +30,6 @@
 
 import sys
 
-sys.path.append('../pymod')
 
 import gdaltest
 
diff --git a/autotest/gdrivers/vrtmask.py b/autotest/gdrivers/vrtmask.py
index 8c7c771ab208..b1134a131584 100755
--- a/autotest/gdrivers/vrtmask.py
+++ b/autotest/gdrivers/vrtmask.py
@@ -33,7 +33,6 @@
 import sys
 from osgeo import gdal
 
-sys.path.append('../pymod')
 
 import gdaltest
 
diff --git a/autotest/gdrivers/vrtovr.py b/autotest/gdrivers/vrtovr.py
index acaed92f7a26..c753ac4f4730 100755
--- a/autotest/gdrivers/vrtovr.py
+++ b/autotest/gdrivers/vrtovr.py
@@ -31,7 +31,6 @@
 import sys
 from osgeo import gdal
 
-sys.path.append('../pymod')
 
 import gdaltest
 
diff --git a/autotest/gdrivers/vrtpansharpen.py b/autotest/gdrivers/vrtpansharpen.py
index b7f7f6195e61..20398b25be5a 100755
--- a/autotest/gdrivers/vrtpansharpen.py
+++ b/autotest/gdrivers/vrtpansharpen.py
@@ -32,7 +32,6 @@
 import shutil
 from osgeo import gdal
 
-sys.path.append('../pymod')
 
 import gdaltest
 
diff --git a/autotest/gdrivers/vrtrawlink.py b/autotest/gdrivers/vrtrawlink.py
index 21d77b2e2645..e9ed17ea8d9f 100755
--- a/autotest/gdrivers/vrtrawlink.py
+++ b/autotest/gdrivers/vrtrawlink.py
@@ -34,7 +34,6 @@
 import sys
 from osgeo import gdal
 
-sys.path.append('../pymod')
 
 import gdaltest
 
diff --git a/autotest/gdrivers/vrtwarp.py b/autotest/gdrivers/vrtwarp.py
index 120ba806dfa1..ef1c7f07ac97 100755
--- a/autotest/gdrivers/vrtwarp.py
+++ b/autotest/gdrivers/vrtwarp.py
@@ -33,7 +33,6 @@
 import sys
 from osgeo import gdal
 
-sys.path.append('../pymod')
 
 import gdaltest
 
diff --git a/autotest/gdrivers/wcs.py b/autotest/gdrivers/wcs.py
index 7fcd40cb1f16..6e9baba60df4 100755
--- a/autotest/gdrivers/wcs.py
+++ b/autotest/gdrivers/wcs.py
@@ -43,7 +43,6 @@
 
 from osgeo import gdal
 
-sys.path.append('../pymod')
 
 import webserver
 import gdaltest
diff --git a/autotest/gdrivers/webp.py b/autotest/gdrivers/webp.py
index e1d7c9179f75..70d887369332 100755
--- a/autotest/gdrivers/webp.py
+++ b/autotest/gdrivers/webp.py
@@ -32,7 +32,6 @@
 import sys
 from osgeo import gdal
 
-sys.path.append('../pymod')
 
 import gdaltest
 
diff --git a/autotest/gdrivers/wms.py b/autotest/gdrivers/wms.py
index 0eac2ae7c629..7d513ed083cb 100755
--- a/autotest/gdrivers/wms.py
+++ b/autotest/gdrivers/wms.py
@@ -37,7 +37,6 @@
 import hashlib
 from osgeo import gdal
 
-sys.path.append('../pymod')
 
 import gdaltest
 
diff --git a/autotest/gdrivers/wmts.py b/autotest/gdrivers/wmts.py
index c874230600e3..21e60c9ab981 100755
--- a/autotest/gdrivers/wmts.py
+++ b/autotest/gdrivers/wmts.py
@@ -32,7 +32,6 @@
 import sys
 import shutil
 
-sys.path.append('../pymod')
 
 from osgeo import gdal
 
diff --git a/autotest/gdrivers/xmp.py b/autotest/gdrivers/xmp.py
index c1c559bf7daf..f0a7018150b3 100755
--- a/autotest/gdrivers/xmp.py
+++ b/autotest/gdrivers/xmp.py
@@ -33,7 +33,6 @@
 
 from osgeo import gdal
 
-sys.path.append('../pymod')
 
 import gdaltest
 
diff --git a/autotest/gdrivers/xpm.py b/autotest/gdrivers/xpm.py
index 929e763942a2..bc50e91be07d 100755
--- a/autotest/gdrivers/xpm.py
+++ b/autotest/gdrivers/xpm.py
@@ -31,7 +31,6 @@
 import sys
 from osgeo import gdal
 
-sys.path.append('../pymod')
 
 import gdaltest
 
diff --git a/autotest/gdrivers/xyz.py b/autotest/gdrivers/xyz.py
index e6ffad6874a4..bce66004cb07 100755
--- a/autotest/gdrivers/xyz.py
+++ b/autotest/gdrivers/xyz.py
@@ -33,7 +33,6 @@
 import struct
 from osgeo import gdal
 
-sys.path.append('../pymod')
 
 import gdaltest
 
diff --git a/autotest/gdrivers/zmap.py b/autotest/gdrivers/zmap.py
index 9fdeba5eeb4e..41dec9a52f31 100755
--- a/autotest/gdrivers/zmap.py
+++ b/autotest/gdrivers/zmap.py
@@ -30,7 +30,6 @@
 
 import sys
 
-sys.path.append('../pymod')
 
 import gdaltest
 
diff --git a/autotest/gnm/gnm_test.py b/autotest/gnm/gnm_test.py
index 09b18c007c70..50b41b220371 100755
--- a/autotest/gnm/gnm_test.py
+++ b/autotest/gnm/gnm_test.py
@@ -35,7 +35,6 @@
 import sys
 import shutil
 
-sys.path.append('../pymod')
 
 import gdaltest
 
diff --git a/autotest/ogr/ogr_arcgen.py b/autotest/ogr/ogr_arcgen.py
index 638634b7b8ce..2388b94446e1 100755
--- a/autotest/ogr/ogr_arcgen.py
+++ b/autotest/ogr/ogr_arcgen.py
@@ -30,7 +30,6 @@
 
 import sys
 
-sys.path.append('../pymod')
 
 import gdaltest
 import ogrtest
diff --git a/autotest/ogr/ogr_avc.py b/autotest/ogr/ogr_avc.py
index c51d622e95f3..a49ece921d34 100755
--- a/autotest/ogr/ogr_avc.py
+++ b/autotest/ogr/ogr_avc.py
@@ -30,7 +30,6 @@
 
 import sys
 
-sys.path.append('../pymod')
 
 import gdaltest
 import ogrtest
diff --git a/autotest/ogr/ogr_basic_test.py b/autotest/ogr/ogr_basic_test.py
index f3603d9ea5c1..32697f36f2ea 100755
--- a/autotest/ogr/ogr_basic_test.py
+++ b/autotest/ogr/ogr_basic_test.py
@@ -30,7 +30,6 @@
 import os
 import sys
 
-sys.path.append('../pymod')
 
 import gdaltest
 import ogrtest
diff --git a/autotest/ogr/ogr_bna.py b/autotest/ogr/ogr_bna.py
index 8afa02c8117c..9b07d9adf74c 100755
--- a/autotest/ogr/ogr_bna.py
+++ b/autotest/ogr/ogr_bna.py
@@ -32,7 +32,6 @@
 import os
 import sys
 
-sys.path.append('../pymod')
 
 import gdaltest
 import ogrtest
diff --git a/autotest/ogr/ogr_cad.py b/autotest/ogr/ogr_cad.py
index 8a1800971161..0cc3dfb83a7a 100755
--- a/autotest/ogr/ogr_cad.py
+++ b/autotest/ogr/ogr_cad.py
@@ -32,7 +32,6 @@
 ################################################################################
 import sys
 
-sys.path.append('../pymod')
 
 import gdaltest
 import ogrtest
diff --git a/autotest/ogr/ogr_carto.py b/autotest/ogr/ogr_carto.py
index 18517b4c3b25..67e41a8f80c3 100755
--- a/autotest/ogr/ogr_carto.py
+++ b/autotest/ogr/ogr_carto.py
@@ -32,7 +32,6 @@
 import sys
 import uuid
 
-sys.path.append('../pymod')
 
 import gdaltest
 import ogrtest
@@ -1038,7 +1037,7 @@ def ogr_carto_vsimem():
         gdaltest.post_reason('fail')
         return 'fail'
 
-        
+
 
 
     return 'success'
diff --git a/autotest/ogr/ogr_cloudant.py b/autotest/ogr/ogr_cloudant.py
index 9cd88cdcd5a2..443dd0ebc6f6 100755
--- a/autotest/ogr/ogr_cloudant.py
+++ b/autotest/ogr/ogr_cloudant.py
@@ -33,7 +33,6 @@
 import os
 import sys
 
-sys.path.append('../pymod')
 
 import gdaltest
 import ogrtest
diff --git a/autotest/ogr/ogr_couchdb.py b/autotest/ogr/ogr_couchdb.py
index f5c9158da5aa..990df5f0a182 100755
--- a/autotest/ogr/ogr_couchdb.py
+++ b/autotest/ogr/ogr_couchdb.py
@@ -33,7 +33,6 @@
 import sys
 import uuid
 
-sys.path.append('../pymod')
 
 import gdaltest
 import ogrtest
diff --git a/autotest/ogr/ogr_csv.py b/autotest/ogr/ogr_csv.py
index d6d34a317957..b69fb6bbaabf 100755
--- a/autotest/ogr/ogr_csv.py
+++ b/autotest/ogr/ogr_csv.py
@@ -30,7 +30,6 @@
 import os
 import sys
 
-sys.path.append('../pymod')
 
 import gdaltest
 import ogrtest
diff --git a/autotest/ogr/ogr_csw.py b/autotest/ogr/ogr_csw.py
index 1f39a06cd277..b86252f88cee 100755
--- a/autotest/ogr/ogr_csw.py
+++ b/autotest/ogr/ogr_csw.py
@@ -31,7 +31,6 @@
 
 import sys
 
-sys.path.append('../pymod')
 
 import gdaltest
 from osgeo import ogr
diff --git a/autotest/ogr/ogr_db2.py b/autotest/ogr/ogr_db2.py
index ed22919a79cd..89aeda7206a0 100755
--- a/autotest/ogr/ogr_db2.py
+++ b/autotest/ogr/ogr_db2.py
@@ -41,7 +41,6 @@
 import os
 import sys
 
-sys.path.append('../pymod')
 
 import gdaltest
 import ogrtest
diff --git a/autotest/ogr/ogr_db2_hack.py b/autotest/ogr/ogr_db2_hack.py
index 28ac0024f055..d8c8582d6779 100755
--- a/autotest/ogr/ogr_db2_hack.py
+++ b/autotest/ogr/ogr_db2_hack.py
@@ -29,7 +29,6 @@
 
 import sys
 
-sys.path.append('../pymod')
 
 import gdaltest
 from osgeo import ogr
diff --git a/autotest/ogr/ogr_dgn.py b/autotest/ogr/ogr_dgn.py
index 10be1f93f05d..8f15a639ec11 100755
--- a/autotest/ogr/ogr_dgn.py
+++ b/autotest/ogr/ogr_dgn.py
@@ -27,7 +27,6 @@
 
 import sys
 
-sys.path.append('../pymod')
 
 import gdaltest
 import ogrtest
diff --git a/autotest/ogr/ogr_dgnv8.py b/autotest/ogr/ogr_dgnv8.py
index 2243e96a582b..7d47fa8c5c93 100755
--- a/autotest/ogr/ogr_dgnv8.py
+++ b/autotest/ogr/ogr_dgnv8.py
@@ -32,7 +32,6 @@
 import shutil
 import sys
 
-sys.path.append('../pymod')
 
 import gdaltest
 import ogrtest
diff --git a/autotest/ogr/ogr_dods.py b/autotest/ogr/ogr_dods.py
index c4a3bd83dfa2..dc2f4678c288 100755
--- a/autotest/ogr/ogr_dods.py
+++ b/autotest/ogr/ogr_dods.py
@@ -28,7 +28,6 @@
 
 import sys
 
-sys.path.append('../pymod')
 
 import gdaltest
 import ogrtest
diff --git a/autotest/ogr/ogr_dxf.py b/autotest/ogr/ogr_dxf.py
index b25a89dcc1d6..4f77d0329964 100644
--- a/autotest/ogr/ogr_dxf.py
+++ b/autotest/ogr/ogr_dxf.py
@@ -34,7 +34,6 @@
 import sys
 from sys import version_info
 
-sys.path.append('../pymod')
 
 import ogrtest
 import gdaltest
diff --git a/autotest/ogr/ogr_edigeo.py b/autotest/ogr/ogr_edigeo.py
index 0dd39a6f2a04..9b35ef78d5f6 100755
--- a/autotest/ogr/ogr_edigeo.py
+++ b/autotest/ogr/ogr_edigeo.py
@@ -33,7 +33,6 @@
 import sys
 from osgeo import ogr
 
-sys.path.append('../pymod')
 
 import gdaltest
 import ogrtest
diff --git a/autotest/ogr/ogr_eeda.py b/autotest/ogr/ogr_eeda.py
index 0e7cc177c1a1..52b10cf5245f 100644
--- a/autotest/ogr/ogr_eeda.py
+++ b/autotest/ogr/ogr_eeda.py
@@ -32,7 +32,6 @@
 import json
 import sys
 
-sys.path.append('../pymod')
 
 from osgeo import gdal, ogr
 
diff --git a/autotest/ogr/ogr_elasticsearch.py b/autotest/ogr/ogr_elasticsearch.py
index 4c4b6514c729..6ffe25900d31 100755
--- a/autotest/ogr/ogr_elasticsearch.py
+++ b/autotest/ogr/ogr_elasticsearch.py
@@ -30,7 +30,6 @@
 
 import sys
 
-sys.path.append('../pymod')
 
 import ogrtest
 import gdaltest
diff --git a/autotest/ogr/ogr_factory.py b/autotest/ogr/ogr_factory.py
index 31e23c084b90..a9b36965fccd 100755
--- a/autotest/ogr/ogr_factory.py
+++ b/autotest/ogr/ogr_factory.py
@@ -32,7 +32,6 @@
 
 import sys
 
-sys.path.append('../pymod')
 
 import ogrtest
 import gdaltest
diff --git a/autotest/ogr/ogr_feature.py b/autotest/ogr/ogr_feature.py
index 5552e8f659be..05dae6d07ba4 100755
--- a/autotest/ogr/ogr_feature.py
+++ b/autotest/ogr/ogr_feature.py
@@ -31,7 +31,6 @@
 
 import sys
 
-sys.path.append('../pymod')
 
 from osgeo import gdal
 from osgeo import ogr
diff --git a/autotest/ogr/ogr_fgdb.py b/autotest/ogr/ogr_fgdb.py
index b854ec4cb126..3da90cb55f4a 100755
--- a/autotest/ogr/ogr_fgdb.py
+++ b/autotest/ogr/ogr_fgdb.py
@@ -33,7 +33,6 @@
 import sys
 import shutil
 
-sys.path.append('../pymod')
 
 import gdaltest
 import ogrtest
diff --git a/autotest/ogr/ogr_fgdb_stress_test.py b/autotest/ogr/ogr_fgdb_stress_test.py
index cd9f262ecfdd..3e37ce4c5ced 100755
--- a/autotest/ogr/ogr_fgdb_stress_test.py
+++ b/autotest/ogr/ogr_fgdb_stress_test.py
@@ -34,7 +34,6 @@
 import sys
 import shutil
 
-sys.path.append('../pymod')
 
 import gdaltest
 import ogrtest
diff --git a/autotest/ogr/ogr_geoconcept.py b/autotest/ogr/ogr_geoconcept.py
index 102ddacf7dc5..020752a2b22e 100755
--- a/autotest/ogr/ogr_geoconcept.py
+++ b/autotest/ogr/ogr_geoconcept.py
@@ -32,7 +32,6 @@
 import os
 import sys
 
-sys.path.append('../pymod')
 
 import gdaltest
 import ogrtest
diff --git a/autotest/ogr/ogr_geojson.py b/autotest/ogr/ogr_geojson.py
index 6ed3b96a0798..a702b95eb684 100755
--- a/autotest/ogr/ogr_geojson.py
+++ b/autotest/ogr/ogr_geojson.py
@@ -33,7 +33,6 @@
 import os
 import sys
 
-sys.path.append('../pymod')
 
 from osgeo import osr
 from osgeo import ogr
diff --git a/autotest/ogr/ogr_geojsonseq.py b/autotest/ogr/ogr_geojsonseq.py
index 11636e8585f1..6107c96ae2df 100755
--- a/autotest/ogr/ogr_geojsonseq.py
+++ b/autotest/ogr/ogr_geojsonseq.py
@@ -30,7 +30,6 @@
 
 import sys
 
-sys.path.append('../pymod')
 
 from osgeo import gdal
 from osgeo import osr
diff --git a/autotest/ogr/ogr_geom.py b/autotest/ogr/ogr_geom.py
index 8e92bbd24a66..2e11a421f336 100755
--- a/autotest/ogr/ogr_geom.py
+++ b/autotest/ogr/ogr_geom.py
@@ -32,7 +32,6 @@
 import random
 import sys
 
-sys.path.append('../pymod')
 
 import gdaltest
 import ogrtest
diff --git a/autotest/ogr/ogr_georss.py b/autotest/ogr/ogr_georss.py
index 040196010ad6..e81739b8da59 100755
--- a/autotest/ogr/ogr_georss.py
+++ b/autotest/ogr/ogr_georss.py
@@ -32,7 +32,6 @@
 import os
 import sys
 
-sys.path.append('../pymod')
 
 import gdaltest
 from osgeo import ogr
diff --git a/autotest/ogr/ogr_geos.py b/autotest/ogr/ogr_geos.py
index 460ad2b4e3a4..870dcc05b301 100755
--- a/autotest/ogr/ogr_geos.py
+++ b/autotest/ogr/ogr_geos.py
@@ -29,7 +29,6 @@
 
 import sys
 
-sys.path.append('../pymod')
 
 import gdaltest
 import ogrtest
diff --git a/autotest/ogr/ogr_gft.py b/autotest/ogr/ogr_gft.py
index e7449b572472..00890531e686 100755
--- a/autotest/ogr/ogr_gft.py
+++ b/autotest/ogr/ogr_gft.py
@@ -32,7 +32,6 @@
 import os
 import sys
 
-sys.path.append('../pymod')
 
 import gdaltest
 import ogrtest
diff --git a/autotest/ogr/ogr_gml_fgd_read.py b/autotest/ogr/ogr_gml_fgd_read.py
index 6badd173e37f..6c02156b73f8 100755
--- a/autotest/ogr/ogr_gml_fgd_read.py
+++ b/autotest/ogr/ogr_gml_fgd_read.py
@@ -31,7 +31,6 @@
 
 import sys
 
-sys.path.append('../pymod')
 
 import gdaltest
 import ogrtest
diff --git a/autotest/ogr/ogr_gml_geom.py b/autotest/ogr/ogr_gml_geom.py
index c4dc4471193f..7cf7b2fe68eb 100755
--- a/autotest/ogr/ogr_gml_geom.py
+++ b/autotest/ogr/ogr_gml_geom.py
@@ -30,7 +30,6 @@
 import os
 import sys
 
-sys.path.append('../pymod')
 
 import gdaltest
 import ogrtest
diff --git a/autotest/ogr/ogr_gml_read.py b/autotest/ogr/ogr_gml_read.py
index 97ae391b1fd0..7c21d54d450c 100755
--- a/autotest/ogr/ogr_gml_read.py
+++ b/autotest/ogr/ogr_gml_read.py
@@ -33,7 +33,6 @@
 import os
 import sys
 
-sys.path.append('../pymod')
 
 import shutil
 import gdaltest
diff --git a/autotest/ogr/ogr_gmlas.py b/autotest/ogr/ogr_gmlas.py
index de19582f2890..830825a320af 100755
--- a/autotest/ogr/ogr_gmlas.py
+++ b/autotest/ogr/ogr_gmlas.py
@@ -41,7 +41,6 @@
 import os.path
 import sys
 
-sys.path.append('../pymod')
 
 import gdaltest
 import ogrtest
diff --git a/autotest/ogr/ogr_gmt.py b/autotest/ogr/ogr_gmt.py
index 547d46646c11..18447411cbef 100755
--- a/autotest/ogr/ogr_gmt.py
+++ b/autotest/ogr/ogr_gmt.py
@@ -30,7 +30,6 @@
 
 import sys
 
-sys.path.append('../pymod')
 
 import gdaltest
 import ogrtest
diff --git a/autotest/ogr/ogr_gpkg.py b/autotest/ogr/ogr_gpkg.py
index 5d6ad075818b..54fd44c791a5 100755
--- a/autotest/ogr/ogr_gpkg.py
+++ b/autotest/ogr/ogr_gpkg.py
@@ -39,7 +39,6 @@
     if os.path.dirname(sys.argv[0]) != '':
         os.chdir(os.path.dirname(sys.argv[0]))
 
-sys.path.append('../pymod')
 sys.path.append('../../gdal/swig/python/samples')
 
 from osgeo import gdal
diff --git a/autotest/ogr/ogr_gpsbabel.py b/autotest/ogr/ogr_gpsbabel.py
index d21c0ed8eb35..52134ddb788d 100755
--- a/autotest/ogr/ogr_gpsbabel.py
+++ b/autotest/ogr/ogr_gpsbabel.py
@@ -30,7 +30,6 @@
 
 import sys
 
-sys.path.append('../pymod')
 
 import gdaltest
 import ogrtest
diff --git a/autotest/ogr/ogr_gpx.py b/autotest/ogr/ogr_gpx.py
index d04f0a5ebfaf..5431cdcfa934 100755
--- a/autotest/ogr/ogr_gpx.py
+++ b/autotest/ogr/ogr_gpx.py
@@ -31,7 +31,6 @@
 import os
 import sys
 
-sys.path.append('../pymod')
 
 import gdaltest
 import ogrtest
diff --git a/autotest/ogr/ogr_grass.py b/autotest/ogr/ogr_grass.py
index 96f999d24169..36ca14da4298 100755
--- a/autotest/ogr/ogr_grass.py
+++ b/autotest/ogr/ogr_grass.py
@@ -31,7 +31,6 @@
 import sys
 from osgeo import ogr
 
-sys.path.append('../pymod')
 
 import gdaltest
 
diff --git a/autotest/ogr/ogr_gtm.py b/autotest/ogr/ogr_gtm.py
index 8fabfd14051b..2d93ad7f7efe 100755
--- a/autotest/ogr/ogr_gtm.py
+++ b/autotest/ogr/ogr_gtm.py
@@ -32,7 +32,6 @@
 import os
 import sys
 
-sys.path.append('../pymod')
 
 import gdaltest
 import ogrtest
diff --git a/autotest/ogr/ogr_htf.py b/autotest/ogr/ogr_htf.py
index a364f1de5044..19b4cef56f7d 100755
--- a/autotest/ogr/ogr_htf.py
+++ b/autotest/ogr/ogr_htf.py
@@ -30,7 +30,6 @@
 
 import sys
 
-sys.path.append('../pymod')
 
 import gdaltest
 import ogrtest
diff --git a/autotest/ogr/ogr_idrisi.py b/autotest/ogr/ogr_idrisi.py
index 28b3014a211b..891c03424c75 100755
--- a/autotest/ogr/ogr_idrisi.py
+++ b/autotest/ogr/ogr_idrisi.py
@@ -31,7 +31,6 @@
 import sys
 from osgeo import ogr
 
-sys.path.append('../pymod')
 
 import gdaltest
 import ogrtest
diff --git a/autotest/ogr/ogr_ili.py b/autotest/ogr/ogr_ili.py
index 37e109da3224..54aea9615cfe 100755
--- a/autotest/ogr/ogr_ili.py
+++ b/autotest/ogr/ogr_ili.py
@@ -28,7 +28,6 @@
 
 import sys
 
-sys.path.append('../pymod')
 
 import gdaltest
 import ogrtest
diff --git a/autotest/ogr/ogr_index_test.py b/autotest/ogr/ogr_index_test.py
index c39233c47685..e4947d9c7d1b 100755
--- a/autotest/ogr/ogr_index_test.py
+++ b/autotest/ogr/ogr_index_test.py
@@ -29,7 +29,6 @@
 import os
 import sys
 
-sys.path.append('../pymod')
 
 import gdaltest
 from osgeo import ogr
diff --git a/autotest/ogr/ogr_ingres.py b/autotest/ogr/ogr_ingres.py
index c11fee5db32c..88928c3a7fc7 100755
--- a/autotest/ogr/ogr_ingres.py
+++ b/autotest/ogr/ogr_ingres.py
@@ -30,7 +30,6 @@
 
 import sys
 
-sys.path.append('../pymod')
 
 import gdaltest
 import ogrtest
diff --git a/autotest/ogr/ogr_jml.py b/autotest/ogr/ogr_jml.py
index 0abab1c5de10..c7cffd7e46e3 100755
--- a/autotest/ogr/ogr_jml.py
+++ b/autotest/ogr/ogr_jml.py
@@ -31,7 +31,6 @@
 
 import sys
 
-sys.path.append('../pymod')
 
 import gdaltest
 from osgeo import ogr
diff --git a/autotest/ogr/ogr_join_test.py b/autotest/ogr/ogr_join_test.py
index 6cd6afaee548..662638539980 100755
--- a/autotest/ogr/ogr_join_test.py
+++ b/autotest/ogr/ogr_join_test.py
@@ -29,7 +29,6 @@
 
 import sys
 
-sys.path.append('../pymod')
 
 import gdaltest
 from osgeo import gdal
diff --git a/autotest/ogr/ogr_kml.py b/autotest/ogr/ogr_kml.py
index ca3f859bcbab..fd04258ecd96 100755
--- a/autotest/ogr/ogr_kml.py
+++ b/autotest/ogr/ogr_kml.py
@@ -33,7 +33,6 @@
 import os
 import sys
 
-sys.path.append('../pymod')
 
 import gdaltest
 import ogrtest
diff --git a/autotest/ogr/ogr_layer_algebra.py b/autotest/ogr/ogr_layer_algebra.py
index 5bd338259694..032008f17149 100755
--- a/autotest/ogr/ogr_layer_algebra.py
+++ b/autotest/ogr/ogr_layer_algebra.py
@@ -31,7 +31,6 @@
 
 import sys
 
-sys.path.append('../pymod')
 
 import gdaltest
 import ogrtest
diff --git a/autotest/ogr/ogr_libkml.py b/autotest/ogr/ogr_libkml.py
index 64b830803e90..cf140360ecf2 100755
--- a/autotest/ogr/ogr_libkml.py
+++ b/autotest/ogr/ogr_libkml.py
@@ -31,7 +31,6 @@
 
 import sys
 
-sys.path.append('../pymod')
 
 import gdaltest
 import ogrtest
diff --git a/autotest/ogr/ogr_mem.py b/autotest/ogr/ogr_mem.py
index bfffe994df66..f3dbf18f27c1 100755
--- a/autotest/ogr/ogr_mem.py
+++ b/autotest/ogr/ogr_mem.py
@@ -31,7 +31,6 @@
 
 import sys
 
-sys.path.append('../pymod')
 
 import gdaltest
 import ogrtest
diff --git a/autotest/ogr/ogr_mitab.py b/autotest/ogr/ogr_mitab.py
index 4c45461c23ad..e1bcc0a7a42d 100755
--- a/autotest/ogr/ogr_mitab.py
+++ b/autotest/ogr/ogr_mitab.py
@@ -33,7 +33,6 @@
 import shutil
 import time
 
-sys.path.append('../pymod')
 
 import gdaltest
 import ogrtest
diff --git a/autotest/ogr/ogr_mongodb.py b/autotest/ogr/ogr_mongodb.py
index 7c2dfad0048c..3742d636fe3b 100755
--- a/autotest/ogr/ogr_mongodb.py
+++ b/autotest/ogr/ogr_mongodb.py
@@ -33,7 +33,6 @@
 import sys
 import uuid
 
-sys.path.append('../pymod')
 
 import gdaltest
 import ogrtest
diff --git a/autotest/ogr/ogr_mssqlspatial.py b/autotest/ogr/ogr_mssqlspatial.py
index 733c1e70e07b..e174aa1f8a85 100755
--- a/autotest/ogr/ogr_mssqlspatial.py
+++ b/autotest/ogr/ogr_mssqlspatial.py
@@ -31,7 +31,6 @@
 
 import sys
 
-sys.path.append('../pymod')
 
 import gdaltest
 import ogrtest
diff --git a/autotest/ogr/ogr_mvt.py b/autotest/ogr/ogr_mvt.py
index 133ab7a472d7..723357d8b7e2 100644
--- a/autotest/ogr/ogr_mvt.py
+++ b/autotest/ogr/ogr_mvt.py
@@ -31,7 +31,6 @@
 import json
 import sys
 
-sys.path.append('../pymod')
 
 import gdaltest
 import ogrtest
diff --git a/autotest/ogr/ogr_mysql.py b/autotest/ogr/ogr_mysql.py
index e3b95c700ac3..afb037367f05 100755
--- a/autotest/ogr/ogr_mysql.py
+++ b/autotest/ogr/ogr_mysql.py
@@ -29,7 +29,6 @@
 
 import sys
 
-sys.path.append('../pymod')
 
 import gdaltest
 import ogrtest
diff --git a/autotest/ogr/ogr_nas.py b/autotest/ogr/ogr_nas.py
index 4ac7070a8e75..cebee95920e2 100755
--- a/autotest/ogr/ogr_nas.py
+++ b/autotest/ogr/ogr_nas.py
@@ -31,7 +31,6 @@
 import os
 import sys
 
-sys.path.append('../pymod')
 
 import gdaltest
 import ogrtest
diff --git a/autotest/ogr/ogr_ntf.py b/autotest/ogr/ogr_ntf.py
index 7de31c0cf161..92f956ec10a4 100755
--- a/autotest/ogr/ogr_ntf.py
+++ b/autotest/ogr/ogr_ntf.py
@@ -80,7 +80,6 @@
 import sys
 from osgeo import ogr
 
-sys.path.append('../pymod')
 
 import gdaltest
 
diff --git a/autotest/ogr/ogr_oci.py b/autotest/ogr/ogr_oci.py
index 684f46aa12da..12dc80d6f638 100755
--- a/autotest/ogr/ogr_oci.py
+++ b/autotest/ogr/ogr_oci.py
@@ -29,7 +29,6 @@
 import os
 import sys
 
-sys.path.append('../pymod')
 
 import gdaltest
 import ogrtest
diff --git a/autotest/ogr/ogr_odbc.py b/autotest/ogr/ogr_odbc.py
index 26f7e097eb7f..abb632f2428f 100755
--- a/autotest/ogr/ogr_odbc.py
+++ b/autotest/ogr/ogr_odbc.py
@@ -33,7 +33,6 @@
 from osgeo import ogr
 from osgeo import gdal
 
-sys.path.append('../pymod')
 
 import gdaltest
 import ogrtest
diff --git a/autotest/ogr/ogr_ods.py b/autotest/ogr/ogr_ods.py
index 64eb13ddca6e..fc76f3f9a96d 100755
--- a/autotest/ogr/ogr_ods.py
+++ b/autotest/ogr/ogr_ods.py
@@ -32,7 +32,6 @@
 import sys
 import shutil
 
-sys.path.append('../pymod')
 
 import gdaltest
 from osgeo import gdal
diff --git a/autotest/ogr/ogr_ogdi.py b/autotest/ogr/ogr_ogdi.py
index 788879733076..a81f35844f13 100755
--- a/autotest/ogr/ogr_ogdi.py
+++ b/autotest/ogr/ogr_ogdi.py
@@ -32,7 +32,6 @@
 import sys
 from osgeo import ogr
 
-sys.path.append('../pymod')
 
 import gdaltest
 import ogrtest
diff --git a/autotest/ogr/ogr_openair.py b/autotest/ogr/ogr_openair.py
index 63957daafce9..53183dab4823 100755
--- a/autotest/ogr/ogr_openair.py
+++ b/autotest/ogr/ogr_openair.py
@@ -30,7 +30,6 @@
 
 import sys
 
-sys.path.append('../pymod')
 
 import gdaltest
 import ogrtest
diff --git a/autotest/ogr/ogr_openfilegdb.py b/autotest/ogr/ogr_openfilegdb.py
index b7aeca15d457..476cefe6306a 100755
--- a/autotest/ogr/ogr_openfilegdb.py
+++ b/autotest/ogr/ogr_openfilegdb.py
@@ -33,7 +33,6 @@
 import sys
 import shutil
 
-sys.path.append('../pymod')
 
 import gdaltest
 import ogrtest
diff --git a/autotest/ogr/ogr_osm.py b/autotest/ogr/ogr_osm.py
index 8f1ddb3cd307..481f3684b68b 100755
--- a/autotest/ogr/ogr_osm.py
+++ b/autotest/ogr/ogr_osm.py
@@ -34,7 +34,6 @@
 from osgeo import ogr
 from osgeo import gdal
 
-sys.path.append('../pymod')
 
 import gdaltest
 import ogrtest
diff --git a/autotest/ogr/ogr_pcidsk.py b/autotest/ogr/ogr_pcidsk.py
index d13ed311408e..98c21c35f507 100755
--- a/autotest/ogr/ogr_pcidsk.py
+++ b/autotest/ogr/ogr_pcidsk.py
@@ -30,7 +30,6 @@
 
 import sys
 
-sys.path.append('../pymod')
 
 import gdaltest
 import ogrtest
diff --git a/autotest/ogr/ogr_pdf.py b/autotest/ogr/ogr_pdf.py
index 56b7c4b39a78..6425cf17a6d9 100755
--- a/autotest/ogr/ogr_pdf.py
+++ b/autotest/ogr/ogr_pdf.py
@@ -31,7 +31,6 @@
 
 import sys
 
-sys.path.append('../pymod')
 
 import gdaltest
 import ogrtest
diff --git a/autotest/ogr/ogr_pds.py b/autotest/ogr/ogr_pds.py
index 4d55b8c2120b..e32ad1f7236e 100755
--- a/autotest/ogr/ogr_pds.py
+++ b/autotest/ogr/ogr_pds.py
@@ -30,7 +30,6 @@
 
 import sys
 
-sys.path.append('../pymod')
 
 import gdaltest
 import ogrtest
diff --git a/autotest/ogr/ogr_pg.py b/autotest/ogr/ogr_pg.py
index 96eb0ebddb4d..0aba6cc522e7 100755
--- a/autotest/ogr/ogr_pg.py
+++ b/autotest/ogr/ogr_pg.py
@@ -31,7 +31,6 @@
 import sys
 import shutil
 
-sys.path.append('../pymod')
 
 import gdaltest
 import ogrtest
diff --git a/autotest/ogr/ogr_pgdump.py b/autotest/ogr/ogr_pgdump.py
index 9a6f37d18fb2..56de8f87c00c 100755
--- a/autotest/ogr/ogr_pgdump.py
+++ b/autotest/ogr/ogr_pgdump.py
@@ -31,7 +31,6 @@
 import os
 import sys
 
-sys.path.append('../pymod')
 
 import gdaltest
 import ogrtest
diff --git a/autotest/ogr/ogr_pgeo.py b/autotest/ogr/ogr_pgeo.py
index 9d0f08e25c04..38af7371755a 100755
--- a/autotest/ogr/ogr_pgeo.py
+++ b/autotest/ogr/ogr_pgeo.py
@@ -33,7 +33,6 @@
 import sys
 from osgeo import ogr
 
-sys.path.append('../pymod')
 
 import gdaltest
 import ogrtest
diff --git a/autotest/ogr/ogr_plscenes.py b/autotest/ogr/ogr_plscenes.py
index 95d90b5f53a9..4dd8e2ca037d 100755
--- a/autotest/ogr/ogr_plscenes.py
+++ b/autotest/ogr/ogr_plscenes.py
@@ -31,7 +31,6 @@
 
 import sys
 
-sys.path.append('../pymod')
 
 from osgeo import ogr
 from osgeo import gdal
diff --git a/autotest/ogr/ogr_rec.py b/autotest/ogr/ogr_rec.py
index 199a45b4e7dd..7114732af9b3 100755
--- a/autotest/ogr/ogr_rec.py
+++ b/autotest/ogr/ogr_rec.py
@@ -31,7 +31,6 @@
 
 import sys
 
-sys.path.append('../pymod')
 
 import gdaltest
 
diff --git a/autotest/ogr/ogr_refcount.py b/autotest/ogr/ogr_refcount.py
index 2e492e51c6f5..f68fdf225645 100755
--- a/autotest/ogr/ogr_refcount.py
+++ b/autotest/ogr/ogr_refcount.py
@@ -28,7 +28,6 @@
 
 import sys
 
-sys.path.append('../pymod')
 
 import gdaltest
 from osgeo import ogr
diff --git a/autotest/ogr/ogr_rfc30.py b/autotest/ogr/ogr_rfc30.py
index f316404a90d0..5534c647b999 100755
--- a/autotest/ogr/ogr_rfc30.py
+++ b/autotest/ogr/ogr_rfc30.py
@@ -32,7 +32,6 @@
 from sys import version_info
 from osgeo import ogr
 
-sys.path.append('../pymod')
 
 import gdaltest
 
diff --git a/autotest/ogr/ogr_rfc35_mem.py b/autotest/ogr/ogr_rfc35_mem.py
index a5160f8b0a7e..e6dbe09ec6eb 100755
--- a/autotest/ogr/ogr_rfc35_mem.py
+++ b/autotest/ogr/ogr_rfc35_mem.py
@@ -30,7 +30,6 @@
 
 import sys
 
-sys.path.append('../pymod')
 
 import gdaltest
 from osgeo import ogr
diff --git a/autotest/ogr/ogr_rfc35_mitab.py b/autotest/ogr/ogr_rfc35_mitab.py
index d979eaef4ee2..6fc3fd024b0b 100755
--- a/autotest/ogr/ogr_rfc35_mitab.py
+++ b/autotest/ogr/ogr_rfc35_mitab.py
@@ -31,7 +31,6 @@
 
 import sys
 
-sys.path.append('../pymod')
 
 import gdaltest
 from osgeo import ogr
diff --git a/autotest/ogr/ogr_rfc35_shape.py b/autotest/ogr/ogr_rfc35_shape.py
index 9f140696a614..c3553329a79f 100755
--- a/autotest/ogr/ogr_rfc35_shape.py
+++ b/autotest/ogr/ogr_rfc35_shape.py
@@ -31,7 +31,6 @@
 
 import sys
 
-sys.path.append('../pymod')
 
 import gdaltest
 from osgeo import ogr
diff --git a/autotest/ogr/ogr_rfc35_sqlite.py b/autotest/ogr/ogr_rfc35_sqlite.py
index af24a67da84f..4a7ff5058078 100755
--- a/autotest/ogr/ogr_rfc35_sqlite.py
+++ b/autotest/ogr/ogr_rfc35_sqlite.py
@@ -30,7 +30,6 @@
 
 import sys
 
-sys.path.append('../pymod')
 
 import gdaltest
 from osgeo import ogr
diff --git a/autotest/ogr/ogr_rfc41.py b/autotest/ogr/ogr_rfc41.py
index 08669b2fdfb3..b5d652b3c8b6 100755
--- a/autotest/ogr/ogr_rfc41.py
+++ b/autotest/ogr/ogr_rfc41.py
@@ -31,7 +31,6 @@
 
 import sys
 
-sys.path.append('../pymod')
 
 import gdaltest
 from osgeo import ogr
diff --git a/autotest/ogr/ogr_s57.py b/autotest/ogr/ogr_s57.py
index d6c43ea3d7fe..52d9356833dd 100755
--- a/autotest/ogr/ogr_s57.py
+++ b/autotest/ogr/ogr_s57.py
@@ -34,7 +34,6 @@
 import sys
 import shutil
 
-sys.path.append('../pymod')
 
 import gdaltest
 import ogrtest
diff --git a/autotest/ogr/ogr_sde.py b/autotest/ogr/ogr_sde.py
index 7d4a4f204cba..6a2add8b484f 100755
--- a/autotest/ogr/ogr_sde.py
+++ b/autotest/ogr/ogr_sde.py
@@ -30,7 +30,6 @@
 
 import sys
 
-sys.path.append('../pymod')
 
 import gdaltest
 import ogrtest
diff --git a/autotest/ogr/ogr_sdts.py b/autotest/ogr/ogr_sdts.py
index 0973fa9c620a..2fff407e33c9 100755
--- a/autotest/ogr/ogr_sdts.py
+++ b/autotest/ogr/ogr_sdts.py
@@ -30,7 +30,6 @@
 
 import sys
 
-sys.path.append('../pymod')
 
 import gdaltest
 from osgeo import ogr
diff --git a/autotest/ogr/ogr_segukooa.py b/autotest/ogr/ogr_segukooa.py
index 37544bb1cfaa..93815daefa06 100755
--- a/autotest/ogr/ogr_segukooa.py
+++ b/autotest/ogr/ogr_segukooa.py
@@ -30,7 +30,6 @@
 
 import sys
 
-sys.path.append('../pymod')
 
 import gdaltest
 import ogrtest
diff --git a/autotest/ogr/ogr_segy.py b/autotest/ogr/ogr_segy.py
index 0c6ed2f2e576..7414dd76d4d0 100755
--- a/autotest/ogr/ogr_segy.py
+++ b/autotest/ogr/ogr_segy.py
@@ -30,7 +30,6 @@
 
 import sys
 
-sys.path.append('../pymod')
 
 import gdaltest
 import ogrtest
diff --git a/autotest/ogr/ogr_selafin.py b/autotest/ogr/ogr_selafin.py
index 2581b6ead55e..67b14d001e2c 100755
--- a/autotest/ogr/ogr_selafin.py
+++ b/autotest/ogr/ogr_selafin.py
@@ -32,7 +32,6 @@
 import sys
 import math
 
-sys.path.append('../pymod')
 
 import gdaltest
 import ogrtest
diff --git a/autotest/ogr/ogr_shape.py b/autotest/ogr/ogr_shape.py
index a11ec426796b..f62b0072fc94 100755
--- a/autotest/ogr/ogr_shape.py
+++ b/autotest/ogr/ogr_shape.py
@@ -32,7 +32,6 @@
 import struct
 import sys
 
-sys.path.append('../pymod')
 
 import gdaltest
 import ogrtest
diff --git a/autotest/ogr/ogr_shape_qix.py b/autotest/ogr/ogr_shape_qix.py
index 5a9a20203619..30eab6495492 100755
--- a/autotest/ogr/ogr_shape_qix.py
+++ b/autotest/ogr/ogr_shape_qix.py
@@ -32,7 +32,6 @@
 import sys
 import random
 
-sys.path.append('../pymod')
 
 import gdaltest
 from osgeo import ogr
diff --git a/autotest/ogr/ogr_shape_sbn.py b/autotest/ogr/ogr_shape_sbn.py
index b76eecdd2a1b..5414513fe509 100755
--- a/autotest/ogr/ogr_shape_sbn.py
+++ b/autotest/ogr/ogr_shape_sbn.py
@@ -32,7 +32,6 @@
 import sys
 import os
 
-sys.path.append('../pymod')
 
 import gdaltest
 from osgeo import ogr
diff --git a/autotest/ogr/ogr_sosi.py b/autotest/ogr/ogr_sosi.py
index a9dba25b82aa..84b7724d2187 100755
--- a/autotest/ogr/ogr_sosi.py
+++ b/autotest/ogr/ogr_sosi.py
@@ -32,7 +32,6 @@
 import sys
 from osgeo import ogr
 
-sys.path.append('../pymod')
 
 import gdaltest
 
diff --git a/autotest/ogr/ogr_sql_rfc28.py b/autotest/ogr/ogr_sql_rfc28.py
index 65f7318b3593..f14da9947cbf 100755
--- a/autotest/ogr/ogr_sql_rfc28.py
+++ b/autotest/ogr/ogr_sql_rfc28.py
@@ -32,7 +32,6 @@
 
 import sys
 
-sys.path.append('../pymod')
 
 from osgeo import gdal
 from osgeo import ogr
diff --git a/autotest/ogr/ogr_sql_sqlite.py b/autotest/ogr/ogr_sql_sqlite.py
index 7ff7c6973414..5e6e2c93f2b8 100755
--- a/autotest/ogr/ogr_sql_sqlite.py
+++ b/autotest/ogr/ogr_sql_sqlite.py
@@ -36,7 +36,6 @@
 
 import sys
 
-sys.path.append('../pymod')
 
 from osgeo import ogr
 from osgeo import osr
diff --git a/autotest/ogr/ogr_sql_test.py b/autotest/ogr/ogr_sql_test.py
index 9b26a5d080de..ae8b16074745 100755
--- a/autotest/ogr/ogr_sql_test.py
+++ b/autotest/ogr/ogr_sql_test.py
@@ -29,7 +29,6 @@
 
 import sys
 
-sys.path.append('../pymod')
 
 from osgeo import gdal
 from osgeo import ogr
diff --git a/autotest/ogr/ogr_sqlite.py b/autotest/ogr/ogr_sqlite.py
index 9ee84ebc2430..d2c32cfd3993 100755
--- a/autotest/ogr/ogr_sqlite.py
+++ b/autotest/ogr/ogr_sqlite.py
@@ -39,7 +39,6 @@
     if os.path.dirname(sys.argv[0]) != '':
         os.chdir(os.path.dirname(sys.argv[0]))
 
-sys.path.append('../pymod')
 
 from osgeo import gdal
 from osgeo import ogr
diff --git a/autotest/ogr/ogr_style.py b/autotest/ogr/ogr_style.py
index 2253db38a0f6..ed8eb2a30681 100755
--- a/autotest/ogr/ogr_style.py
+++ b/autotest/ogr/ogr_style.py
@@ -31,7 +31,6 @@
 
 import sys
 
-sys.path.append('../pymod')
 
 import gdaltest
 from osgeo import ogr
diff --git a/autotest/ogr/ogr_sua.py b/autotest/ogr/ogr_sua.py
index d93eb801b479..659e38e3d541 100755
--- a/autotest/ogr/ogr_sua.py
+++ b/autotest/ogr/ogr_sua.py
@@ -30,7 +30,6 @@
 
 import sys
 
-sys.path.append('../pymod')
 
 import gdaltest
 import ogrtest
diff --git a/autotest/ogr/ogr_svg.py b/autotest/ogr/ogr_svg.py
index 5fdf3f0c1cab..c12ce59819e2 100755
--- a/autotest/ogr/ogr_svg.py
+++ b/autotest/ogr/ogr_svg.py
@@ -30,7 +30,6 @@
 
 import sys
 
-sys.path.append('../pymod')
 
 import gdaltest
 import ogrtest
diff --git a/autotest/ogr/ogr_sxf.py b/autotest/ogr/ogr_sxf.py
index 121ed6beb3e8..1cdb3199a6f0 100755
--- a/autotest/ogr/ogr_sxf.py
+++ b/autotest/ogr/ogr_sxf.py
@@ -28,7 +28,6 @@
 
 import sys
 
-sys.path.append('../pymod')
 
 import gdaltest
 from osgeo import ogr
diff --git a/autotest/ogr/ogr_tiger.py b/autotest/ogr/ogr_tiger.py
index 8280944e63bc..5540eb78f41a 100755
--- a/autotest/ogr/ogr_tiger.py
+++ b/autotest/ogr/ogr_tiger.py
@@ -34,7 +34,6 @@
 from osgeo import gdal
 from osgeo import ogr
 
-sys.path.append('../pymod')
 
 import gdaltest
 import ogrtest
diff --git a/autotest/ogr/ogr_vdv.py b/autotest/ogr/ogr_vdv.py
index 4818e2ff3fe9..593404b58454 100755
--- a/autotest/ogr/ogr_vdv.py
+++ b/autotest/ogr/ogr_vdv.py
@@ -32,7 +32,6 @@
 import shutil
 import sys
 
-sys.path.append('../pymod')
 
 import gdaltest
 import ogrtest
diff --git a/autotest/ogr/ogr_vfk.py b/autotest/ogr/ogr_vfk.py
index efbca365f2b9..07537e2b30ae 100755
--- a/autotest/ogr/ogr_vfk.py
+++ b/autotest/ogr/ogr_vfk.py
@@ -33,7 +33,6 @@
 import os
 import sys
 
-sys.path.append('../pymod')
 
 import gdaltest
 from osgeo import gdal
diff --git a/autotest/ogr/ogr_virtualogr.py b/autotest/ogr/ogr_virtualogr.py
index 9cc9dbacf2b3..3ccf11aaf6e2 100755
--- a/autotest/ogr/ogr_virtualogr.py
+++ b/autotest/ogr/ogr_virtualogr.py
@@ -31,7 +31,6 @@
 
 import sys
 
-sys.path.append('../pymod')
 
 from osgeo import ogr
 from osgeo import gdal
diff --git a/autotest/ogr/ogr_vrt.py b/autotest/ogr/ogr_vrt.py
index 555e72073928..6a702b314da4 100755
--- a/autotest/ogr/ogr_vrt.py
+++ b/autotest/ogr/ogr_vrt.py
@@ -30,7 +30,6 @@
 import os
 import sys
 
-sys.path.append('../pymod')
 
 import gdaltest
 import ogrtest
diff --git a/autotest/ogr/ogr_wasp.py b/autotest/ogr/ogr_wasp.py
index ee7d06ea713b..22140cc7247d 100755
--- a/autotest/ogr/ogr_wasp.py
+++ b/autotest/ogr/ogr_wasp.py
@@ -32,7 +32,6 @@
 import sys
 import math
 
-sys.path.append('../pymod')
 
 import gdaltest
 import ogrtest
diff --git a/autotest/ogr/ogr_wfs.py b/autotest/ogr/ogr_wfs.py
index 3f2c72899aa1..748973331744 100755
--- a/autotest/ogr/ogr_wfs.py
+++ b/autotest/ogr/ogr_wfs.py
@@ -37,7 +37,6 @@
 import os
 import sys
 
-sys.path.append('../pymod')
 
 import gdaltest
 import ogrtest
diff --git a/autotest/ogr/ogr_wfs3.py b/autotest/ogr/ogr_wfs3.py
index 5153840f791f..db39eb065b7a 100755
--- a/autotest/ogr/ogr_wfs3.py
+++ b/autotest/ogr/ogr_wfs3.py
@@ -31,7 +31,6 @@
 
 import sys
 
-sys.path.append('../pymod')
 
 import gdaltest
 from osgeo import ogr
diff --git a/autotest/ogr/ogr_wkbwkt_geom.py b/autotest/ogr/ogr_wkbwkt_geom.py
index 27f5f8e3e1db..1daef0149608 100755
--- a/autotest/ogr/ogr_wkbwkt_geom.py
+++ b/autotest/ogr/ogr_wkbwkt_geom.py
@@ -30,7 +30,6 @@
 import os
 import sys
 
-sys.path.append('../pymod')
 
 import gdaltest
 from osgeo import ogr
diff --git a/autotest/ogr/ogr_xls.py b/autotest/ogr/ogr_xls.py
index 0a7cac642657..35d33aa5e126 100755
--- a/autotest/ogr/ogr_xls.py
+++ b/autotest/ogr/ogr_xls.py
@@ -31,7 +31,6 @@
 
 import sys
 
-sys.path.append('../pymod')
 
 import gdaltest
 from osgeo import gdal
diff --git a/autotest/ogr/ogr_xlsx.py b/autotest/ogr/ogr_xlsx.py
index 72e403e6e892..f6bcc643aaa7 100755
--- a/autotest/ogr/ogr_xlsx.py
+++ b/autotest/ogr/ogr_xlsx.py
@@ -32,7 +32,6 @@
 import sys
 import shutil
 
-sys.path.append('../pymod')
 
 import gdaltest
 from osgeo import gdal
diff --git a/autotest/ogr/ogr_xplane.py b/autotest/ogr/ogr_xplane.py
index fbdc087ca474..3ac8110cd552 100755
--- a/autotest/ogr/ogr_xplane.py
+++ b/autotest/ogr/ogr_xplane.py
@@ -30,7 +30,6 @@
 
 import sys
 
-sys.path.append('../pymod')
 
 import gdaltest
 from osgeo import ogr
diff --git a/autotest/ogr/ograpispy.py b/autotest/ogr/ograpispy.py
index 4e4f81fd5f52..38b440009f8c 100755
--- a/autotest/ogr/ograpispy.py
+++ b/autotest/ogr/ograpispy.py
@@ -34,7 +34,6 @@
 import shutil
 from difflib import unified_diff
 
-sys.path.append('../pymod')
 
 import gdaltest
 import ogrtest
diff --git a/autotest/osr/osr_basic.py b/autotest/osr/osr_basic.py
index 4c6b38997216..6ac462df2090 100755
--- a/autotest/osr/osr_basic.py
+++ b/autotest/osr/osr_basic.py
@@ -33,7 +33,6 @@
 
 import sys
 
-sys.path.append('../pymod')
 
 import gdaltest
 from osgeo import osr
diff --git a/autotest/osr/osr_compd.py b/autotest/osr/osr_compd.py
index 64876e1832ab..d2d00d82e099 100755
--- a/autotest/osr/osr_compd.py
+++ b/autotest/osr/osr_compd.py
@@ -33,7 +33,6 @@
 import sys
 import osr_proj4
 
-sys.path.append('../pymod')
 
 import gdaltest
 from osgeo import osr
diff --git a/autotest/osr/osr_ct.py b/autotest/osr/osr_ct.py
index 7597d8bf42ee..82b7874206fb 100755
--- a/autotest/osr/osr_ct.py
+++ b/autotest/osr/osr_ct.py
@@ -33,7 +33,6 @@
 
 import sys
 
-sys.path.append('../pymod')
 
 from osgeo import gdal
 from osgeo import osr
diff --git a/autotest/osr/osr_ct_proj.py b/autotest/osr/osr_ct_proj.py
index 46262a60ff90..21652be4e08b 100755
--- a/autotest/osr/osr_ct_proj.py
+++ b/autotest/osr/osr_ct_proj.py
@@ -33,7 +33,6 @@
 import os
 import sys
 
-sys.path.append('../pymod')
 
 import gdaltest
 from osgeo import osr, gdal
diff --git a/autotest/osr/osr_epsg.py b/autotest/osr/osr_epsg.py
index 706ff9d4129d..59aa99930bae 100755
--- a/autotest/osr/osr_epsg.py
+++ b/autotest/osr/osr_epsg.py
@@ -32,7 +32,6 @@
 
 import sys
 
-sys.path.append('../pymod')
 
 import gdaltest
 from osgeo import osr
diff --git a/autotest/osr/osr_erm.py b/autotest/osr/osr_erm.py
index ed4d504c659f..c51dfab5db7a 100755
--- a/autotest/osr/osr_erm.py
+++ b/autotest/osr/osr_erm.py
@@ -27,7 +27,6 @@
 
 import sys
 
-sys.path.append('../pymod')
 
 import gdaltest
 from osgeo import osr
diff --git a/autotest/osr/osr_esri.py b/autotest/osr/osr_esri.py
index 488cd0d885ac..f22a15d0f5e6 100755
--- a/autotest/osr/osr_esri.py
+++ b/autotest/osr/osr_esri.py
@@ -37,7 +37,6 @@
 import os
 import sys
 
-sys.path.append('../pymod')
 
 import gdaltest
 from osgeo import gdal
diff --git a/autotest/osr/osr_getprojectionmethods.py b/autotest/osr/osr_getprojectionmethods.py
index 6010febbcbea..52776e4d8a7e 100755
--- a/autotest/osr/osr_getprojectionmethods.py
+++ b/autotest/osr/osr_getprojectionmethods.py
@@ -30,7 +30,6 @@
 
 import sys
 
-sys.path.append('../pymod')
 
 import gdaltest
 from osgeo import osr
diff --git a/autotest/osr/osr_metacrs.py b/autotest/osr/osr_metacrs.py
index 97bcee50cf05..2f7d4fee1191 100755
--- a/autotest/osr/osr_metacrs.py
+++ b/autotest/osr/osr_metacrs.py
@@ -34,7 +34,6 @@
 import sys
 import csv
 
-sys.path.append('../pymod')
 
 import gdaltest
 
diff --git a/autotest/osr/osr_micoordsys.py b/autotest/osr/osr_micoordsys.py
index e89b24b54452..507d18ea313a 100755
--- a/autotest/osr/osr_micoordsys.py
+++ b/autotest/osr/osr_micoordsys.py
@@ -30,7 +30,6 @@
 
 import sys
 
-sys.path.append('../pymod')
 
 import gdaltest
 from osgeo import osr
diff --git a/autotest/osr/osr_ozi.py b/autotest/osr/osr_ozi.py
index 128008d0652a..39c48ba60520 100755
--- a/autotest/osr/osr_ozi.py
+++ b/autotest/osr/osr_ozi.py
@@ -30,7 +30,6 @@
 
 import sys
 
-sys.path.append('../pymod')
 
 import gdaltest
 from osgeo import osr
diff --git a/autotest/osr/osr_pci.py b/autotest/osr/osr_pci.py
index 6e36cd48cdee..3c62a2b66260 100755
--- a/autotest/osr/osr_pci.py
+++ b/autotest/osr/osr_pci.py
@@ -27,7 +27,6 @@
 
 import sys
 
-sys.path.append('../pymod')
 
 import gdaltest
 from osgeo import osr
diff --git a/autotest/osr/osr_pm.py b/autotest/osr/osr_pm.py
index dbf9f57f3ac0..90c6679dab25 100755
--- a/autotest/osr/osr_pm.py
+++ b/autotest/osr/osr_pm.py
@@ -31,7 +31,6 @@
 
 import sys
 
-sys.path.append('../pymod')
 
 import gdaltest
 from osgeo import osr
diff --git a/autotest/osr/osr_proj4.py b/autotest/osr/osr_proj4.py
index 26ab5f641f3d..6ccd98cd262f 100755
--- a/autotest/osr/osr_proj4.py
+++ b/autotest/osr/osr_proj4.py
@@ -34,7 +34,6 @@
 import os
 import sys
 
-sys.path.append('../pymod')
 
 from osgeo import gdal, osr
 import gdaltest
diff --git a/autotest/osr/osr_url.py b/autotest/osr/osr_url.py
index 82de82703d4e..486820ec9648 100755
--- a/autotest/osr/osr_url.py
+++ b/autotest/osr/osr_url.py
@@ -32,7 +32,6 @@
 import sys
 import socket
 
-sys.path.append('../pymod')
 
 import gdaltest
 from osgeo import osr
diff --git a/autotest/osr/osr_usgs.py b/autotest/osr/osr_usgs.py
index bb8d083d3486..d564d2e85fe2 100755
--- a/autotest/osr/osr_usgs.py
+++ b/autotest/osr/osr_usgs.py
@@ -30,7 +30,6 @@
 
 import sys
 
-sys.path.append('../pymod')
 
 import gdaltest
 from osgeo import gdal
diff --git a/autotest/osr/osr_validate.py b/autotest/osr/osr_validate.py
index 364dc53c6602..2923b6a13061 100755
--- a/autotest/osr/osr_validate.py
+++ b/autotest/osr/osr_validate.py
@@ -31,7 +31,6 @@
 
 import sys
 
-sys.path.append('../pymod')
 
 import gdaltest
 from osgeo import osr
diff --git a/autotest/osr/osr_xml.py b/autotest/osr/osr_xml.py
index de8f5e340ba8..e3e353342f4e 100755
--- a/autotest/osr/osr_xml.py
+++ b/autotest/osr/osr_xml.py
@@ -31,7 +31,6 @@
 import re
 import sys
 
-sys.path.append('../pymod')
 
 import gdaltest
 from osgeo import osr
diff --git a/autotest/pyscripts/test_gdal2tiles.py b/autotest/pyscripts/test_gdal2tiles.py
index 1ae3710bc303..4d81629116ba 100755
--- a/autotest/pyscripts/test_gdal2tiles.py
+++ b/autotest/pyscripts/test_gdal2tiles.py
@@ -33,7 +33,6 @@
 import sys
 import shutil
 
-sys.path.append('../pymod')
 
 from osgeo import gdal      # noqa
 import gdaltest             # noqa  # pylint: disable=E0401
diff --git a/autotest/pyscripts/test_gdal_calc.py b/autotest/pyscripts/test_gdal_calc.py
index 9d79d181a2ba..1a8682b3b2f0 100755
--- a/autotest/pyscripts/test_gdal_calc.py
+++ b/autotest/pyscripts/test_gdal_calc.py
@@ -34,7 +34,6 @@
 import os
 import shutil
 
-sys.path.append('../pymod')
 
 from osgeo import gdal
 import gdaltest
diff --git a/autotest/pyscripts/test_gdal_edit.py b/autotest/pyscripts/test_gdal_edit.py
index 26dbe66404e1..08709fdfc069 100755
--- a/autotest/pyscripts/test_gdal_edit.py
+++ b/autotest/pyscripts/test_gdal_edit.py
@@ -33,7 +33,6 @@
 import os
 import shutil
 
-sys.path.append('../pymod')
 
 from osgeo import gdal
 import gdaltest
@@ -313,7 +312,7 @@ def test_gdal_edit_py_6():
     if stat_stddev is None or abs(float(stat_stddev) - 22.928)>0.001:
         gdaltest.post_reason('fail')
         return 'fail'
-    
+
     ds = None
 
     test_py_scripts.run_py_script(script_path, 'gdal_edit', "tmp/test_gdal_edit_py.tif -setstats 22 217 100 30")
@@ -336,7 +335,7 @@ def test_gdal_edit_py_6():
         gdaltest.post_reason('fail')
         return 'fail'
     ds = None
-    
+
     return 'success'
 
 ###############################################################################
diff --git a/autotest/pyscripts/test_gdal_fillnodata.py b/autotest/pyscripts/test_gdal_fillnodata.py
index f22778b1aa6f..9db3808e74b0 100755
--- a/autotest/pyscripts/test_gdal_fillnodata.py
+++ b/autotest/pyscripts/test_gdal_fillnodata.py
@@ -32,7 +32,6 @@
 import sys
 import os
 
-sys.path.append('../pymod')
 
 from osgeo import gdal
 import gdaltest
diff --git a/autotest/pyscripts/test_gdal_ls_py.py b/autotest/pyscripts/test_gdal_ls_py.py
index 043e653a241d..8fb481cd8789 100755
--- a/autotest/pyscripts/test_gdal_ls_py.py
+++ b/autotest/pyscripts/test_gdal_ls_py.py
@@ -32,7 +32,6 @@
 import sys
 from osgeo import gdal
 
-sys.path.append('../pymod')
 
 import gdaltest
 import test_py_scripts
diff --git a/autotest/pyscripts/test_gdal_merge.py b/autotest/pyscripts/test_gdal_merge.py
index ad61fed31aa5..d3bbdd165303 100755
--- a/autotest/pyscripts/test_gdal_merge.py
+++ b/autotest/pyscripts/test_gdal_merge.py
@@ -32,7 +32,6 @@
 import sys
 import os
 
-sys.path.append('../pymod')
 
 from osgeo import gdal
 from osgeo import osr
diff --git a/autotest/pyscripts/test_gdal_pansharpen.py b/autotest/pyscripts/test_gdal_pansharpen.py
index e416044e0c63..d77073570689 100755
--- a/autotest/pyscripts/test_gdal_pansharpen.py
+++ b/autotest/pyscripts/test_gdal_pansharpen.py
@@ -31,7 +31,6 @@
 
 import sys
 
-sys.path.append('../pymod')
 
 from osgeo import gdal
 import gdaltest
diff --git a/autotest/pyscripts/test_gdal_polygonize.py b/autotest/pyscripts/test_gdal_polygonize.py
index a89f6fb5a738..c1fc6399c4e0 100755
--- a/autotest/pyscripts/test_gdal_polygonize.py
+++ b/autotest/pyscripts/test_gdal_polygonize.py
@@ -32,7 +32,6 @@
 import os
 import sys
 
-sys.path.append('../pymod')
 
 import gdaltest
 import ogrtest
diff --git a/autotest/pyscripts/test_gdal_proximity.py b/autotest/pyscripts/test_gdal_proximity.py
index 260e2967b9e1..8332f9adab44 100755
--- a/autotest/pyscripts/test_gdal_proximity.py
+++ b/autotest/pyscripts/test_gdal_proximity.py
@@ -32,7 +32,6 @@
 import os
 import sys
 
-sys.path.append('../pymod')
 
 import gdaltest
 import test_py_scripts
diff --git a/autotest/pyscripts/test_gdal_retile.py b/autotest/pyscripts/test_gdal_retile.py
index 2bb6fba219a5..eac1290e6940 100755
--- a/autotest/pyscripts/test_gdal_retile.py
+++ b/autotest/pyscripts/test_gdal_retile.py
@@ -32,7 +32,6 @@
 import sys
 import os
 
-sys.path.append('../pymod')
 
 from osgeo import gdal
 from osgeo import osr
diff --git a/autotest/pyscripts/test_gdal_sieve.py b/autotest/pyscripts/test_gdal_sieve.py
index 400782c21992..456a7d7570f3 100755
--- a/autotest/pyscripts/test_gdal_sieve.py
+++ b/autotest/pyscripts/test_gdal_sieve.py
@@ -31,7 +31,6 @@
 
 import sys
 
-sys.path.append('../pymod')
 
 import gdaltest
 import test_py_scripts
diff --git a/autotest/pyscripts/test_gdalinfo_py.py b/autotest/pyscripts/test_gdalinfo_py.py
index b6edffa4dd0f..a4e4d40fb7c8 100755
--- a/autotest/pyscripts/test_gdalinfo_py.py
+++ b/autotest/pyscripts/test_gdalinfo_py.py
@@ -31,7 +31,6 @@
 import sys
 import os
 
-sys.path.append('../pymod')
 
 import gdaltest
 import test_py_scripts
diff --git a/autotest/pyscripts/test_gdalmove.py b/autotest/pyscripts/test_gdalmove.py
index 43b230a824c2..57c7d1b8b7fa 100755
--- a/autotest/pyscripts/test_gdalmove.py
+++ b/autotest/pyscripts/test_gdalmove.py
@@ -32,7 +32,6 @@
 import shutil
 import sys
 
-sys.path.append('../pymod')
 
 from osgeo import gdal
 import gdaltest
diff --git a/autotest/pyscripts/test_ogr2ogr_py.py b/autotest/pyscripts/test_ogr2ogr_py.py
index e032281280b9..c1aee28f81f9 100755
--- a/autotest/pyscripts/test_ogr2ogr_py.py
+++ b/autotest/pyscripts/test_ogr2ogr_py.py
@@ -33,7 +33,6 @@
 import os
 import shutil
 
-sys.path.append('../pymod')
 sys.path.append('../ogr')
 
 from osgeo import gdal
diff --git a/autotest/pyscripts/test_ogrinfo_py.py b/autotest/pyscripts/test_ogrinfo_py.py
index 06f46ab884a2..953c7f6bf70f 100755
--- a/autotest/pyscripts/test_ogrinfo_py.py
+++ b/autotest/pyscripts/test_ogrinfo_py.py
@@ -31,7 +31,6 @@
 import sys
 import os
 
-sys.path.append('../pymod')
 
 import gdaltest
 import ogrtest
diff --git a/autotest/pyscripts/test_ogrmerge.py b/autotest/pyscripts/test_ogrmerge.py
index 6b728af940b4..742f143fe142 100755
--- a/autotest/pyscripts/test_ogrmerge.py
+++ b/autotest/pyscripts/test_ogrmerge.py
@@ -30,7 +30,6 @@
 
 import sys
 
-sys.path.append('../pymod')
 
 from osgeo import gdal
 from osgeo import ogr
diff --git a/autotest/pyscripts/test_rgb2pct.py b/autotest/pyscripts/test_rgb2pct.py
index 270aad56d194..9d6c1ba352e3 100755
--- a/autotest/pyscripts/test_rgb2pct.py
+++ b/autotest/pyscripts/test_rgb2pct.py
@@ -33,7 +33,6 @@
 import os
 import struct
 
-sys.path.append('../pymod')
 
 from osgeo import gdal
 import gdaltest
diff --git a/autotest/utilities/test_gdal_contour.py b/autotest/utilities/test_gdal_contour.py
index 1433e40c132e..4e91d48594a8 100755
--- a/autotest/utilities/test_gdal_contour.py
+++ b/autotest/utilities/test_gdal_contour.py
@@ -33,7 +33,6 @@
 import os
 import array
 
-sys.path.append('../pymod')
 
 from osgeo import gdal
 from osgeo import ogr
diff --git a/autotest/utilities/test_gdal_grid.py b/autotest/utilities/test_gdal_grid.py
index df09f584749b..9a0700e7dbaf 100755
--- a/autotest/utilities/test_gdal_grid.py
+++ b/autotest/utilities/test_gdal_grid.py
@@ -33,7 +33,6 @@
 import os
 import struct
 
-sys.path.append('../pymod')
 sys.path.append('../gcore')
 
 from osgeo import gdal
diff --git a/autotest/utilities/test_gdal_grid_lib.py b/autotest/utilities/test_gdal_grid_lib.py
index af3e8609f01d..f9e2ef0794b8 100755
--- a/autotest/utilities/test_gdal_grid_lib.py
+++ b/autotest/utilities/test_gdal_grid_lib.py
@@ -32,7 +32,6 @@
 import sys
 import struct
 
-sys.path.append('../pymod')
 
 from osgeo import gdal, ogr
 
diff --git a/autotest/utilities/test_gdal_rasterize.py b/autotest/utilities/test_gdal_rasterize.py
index 0cedad48708a..5cbceac04a75 100755
--- a/autotest/utilities/test_gdal_rasterize.py
+++ b/autotest/utilities/test_gdal_rasterize.py
@@ -33,7 +33,6 @@
 import sys
 import os
 
-sys.path.append('../pymod')
 sys.path.append('../gcore')
 
 from osgeo import gdal
diff --git a/autotest/utilities/test_gdal_rasterize_lib.py b/autotest/utilities/test_gdal_rasterize_lib.py
index 6d5467826de3..61b41356bf55 100755
--- a/autotest/utilities/test_gdal_rasterize_lib.py
+++ b/autotest/utilities/test_gdal_rasterize_lib.py
@@ -32,7 +32,6 @@
 
 import sys
 
-sys.path.append('../pymod')
 
 from osgeo import gdal, ogr, osr
 import gdaltest
diff --git a/autotest/utilities/test_gdal_translate.py b/autotest/utilities/test_gdal_translate.py
index c16c66a07c99..023af4d4ae6e 100755
--- a/autotest/utilities/test_gdal_translate.py
+++ b/autotest/utilities/test_gdal_translate.py
@@ -32,7 +32,6 @@
 import sys
 import os
 
-sys.path.append('../pymod')
 
 from osgeo import gdal
 import gdaltest
diff --git a/autotest/utilities/test_gdal_translate_lib.py b/autotest/utilities/test_gdal_translate_lib.py
index 1f8422e5ab8c..3a429f8ece29 100755
--- a/autotest/utilities/test_gdal_translate_lib.py
+++ b/autotest/utilities/test_gdal_translate_lib.py
@@ -32,7 +32,6 @@
 import sys
 import os
 
-sys.path.append('../pymod')
 
 from osgeo import gdal
 import gdaltest
diff --git a/autotest/utilities/test_gdaladdo.py b/autotest/utilities/test_gdaladdo.py
index 4e74fe1dae7d..4e9ac9e3a081 100755
--- a/autotest/utilities/test_gdaladdo.py
+++ b/autotest/utilities/test_gdaladdo.py
@@ -33,7 +33,6 @@
 import os
 import shutil
 
-sys.path.append('../pymod')
 sys.path.append('../gcore')
 
 from osgeo import gdal
diff --git a/autotest/utilities/test_gdalbuildvrt.py b/autotest/utilities/test_gdalbuildvrt.py
index 2133964b1874..86f70f691697 100755
--- a/autotest/utilities/test_gdalbuildvrt.py
+++ b/autotest/utilities/test_gdalbuildvrt.py
@@ -32,7 +32,6 @@
 import sys
 import os
 
-sys.path.append('../pymod')
 
 from osgeo import gdal
 from osgeo import ogr
diff --git a/autotest/utilities/test_gdalbuildvrt_lib.py b/autotest/utilities/test_gdalbuildvrt_lib.py
index 96d3267ce6d6..37f2815ad471 100755
--- a/autotest/utilities/test_gdalbuildvrt_lib.py
+++ b/autotest/utilities/test_gdalbuildvrt_lib.py
@@ -31,7 +31,6 @@
 
 import sys
 
-sys.path.append('../pymod')
 
 from osgeo import gdal
 import gdaltest
diff --git a/autotest/utilities/test_gdaldem.py b/autotest/utilities/test_gdaldem.py
index 24c53a864b02..d0d5bd74c4fa 100755
--- a/autotest/utilities/test_gdaldem.py
+++ b/autotest/utilities/test_gdaldem.py
@@ -32,7 +32,6 @@
 import sys
 import os
 
-sys.path.append('../pymod')
 
 from osgeo import gdal
 from osgeo import osr
diff --git a/autotest/utilities/test_gdaldem_lib.py b/autotest/utilities/test_gdaldem_lib.py
index 6cd723ebcfa4..68b394f04f05 100755
--- a/autotest/utilities/test_gdaldem_lib.py
+++ b/autotest/utilities/test_gdaldem_lib.py
@@ -32,7 +32,6 @@
 import struct
 import sys
 
-sys.path.append('../pymod')
 
 from osgeo import gdal
 from osgeo import osr
diff --git a/autotest/utilities/test_gdalinfo.py b/autotest/utilities/test_gdalinfo.py
index ad5824afa680..72b5d6e20cbc 100755
--- a/autotest/utilities/test_gdalinfo.py
+++ b/autotest/utilities/test_gdalinfo.py
@@ -33,7 +33,6 @@
 import os
 import json
 
-sys.path.append('../pymod')
 
 from osgeo import gdal
 import gdaltest
diff --git a/autotest/utilities/test_gdalinfo_lib.py b/autotest/utilities/test_gdalinfo_lib.py
index 351429e92a20..6d4ca74ee58d 100755
--- a/autotest/utilities/test_gdalinfo_lib.py
+++ b/autotest/utilities/test_gdalinfo_lib.py
@@ -31,7 +31,6 @@
 
 import sys
 
-sys.path.append('../pymod')
 
 from osgeo import gdal
 import gdaltest
diff --git a/autotest/utilities/test_gdallocationinfo.py b/autotest/utilities/test_gdallocationinfo.py
index 38c1f141037c..28c47852fba6 100755
--- a/autotest/utilities/test_gdallocationinfo.py
+++ b/autotest/utilities/test_gdallocationinfo.py
@@ -31,7 +31,6 @@
 
 import sys
 
-sys.path.append('../pymod')
 sys.path.append('../gcore')
 
 from osgeo import gdal
diff --git a/autotest/utilities/test_gdalsrsinfo.py b/autotest/utilities/test_gdalsrsinfo.py
index d9a45b43f97d..1c879d9df8d9 100755
--- a/autotest/utilities/test_gdalsrsinfo.py
+++ b/autotest/utilities/test_gdalsrsinfo.py
@@ -31,7 +31,6 @@
 
 import sys
 
-sys.path.append('../pymod')
 
 import gdaltest
 import test_cli_utilities
diff --git a/autotest/utilities/test_gdaltindex.py b/autotest/utilities/test_gdaltindex.py
index 6cf76a53d5b7..51d6573f46f6 100755
--- a/autotest/utilities/test_gdaltindex.py
+++ b/autotest/utilities/test_gdaltindex.py
@@ -32,7 +32,6 @@
 import sys
 import os
 
-sys.path.append('../pymod')
 
 from osgeo import gdal
 from osgeo import ogr
diff --git a/autotest/utilities/test_gdaltransform.py b/autotest/utilities/test_gdaltransform.py
index 71bfaafe043e..4889da5c3749 100755
--- a/autotest/utilities/test_gdaltransform.py
+++ b/autotest/utilities/test_gdaltransform.py
@@ -30,7 +30,6 @@
 
 import sys
 
-sys.path.append('../pymod')
 
 import gdaltest
 import test_cli_utilities
diff --git a/autotest/utilities/test_gdalwarp.py b/autotest/utilities/test_gdalwarp.py
index 23b98b253180..978bba0e385a 100755
--- a/autotest/utilities/test_gdalwarp.py
+++ b/autotest/utilities/test_gdalwarp.py
@@ -33,7 +33,6 @@
 import os
 import stat
 
-sys.path.append('../pymod')
 
 from osgeo import gdal
 import gdaltest
diff --git a/autotest/utilities/test_gdalwarp_lib.py b/autotest/utilities/test_gdalwarp_lib.py
index c69347c7f280..4c8602bd5386 100755
--- a/autotest/utilities/test_gdalwarp_lib.py
+++ b/autotest/utilities/test_gdalwarp_lib.py
@@ -34,7 +34,6 @@
 import sys
 import os
 
-sys.path.append('../pymod')
 
 from osgeo import gdal, ogr, osr
 import gdaltest
diff --git a/autotest/utilities/test_gnmutils.py b/autotest/utilities/test_gnmutils.py
index 1e8fa4a623a7..1c4cc05a7d72 100755
--- a/autotest/utilities/test_gnmutils.py
+++ b/autotest/utilities/test_gnmutils.py
@@ -34,7 +34,6 @@
 import sys
 import os
 
-sys.path.append('../pymod')
 
 import gdaltest
 import test_cli_utilities
diff --git a/autotest/utilities/test_nearblack.py b/autotest/utilities/test_nearblack.py
index 789b9ddabb54..f64c14a4cd90 100755
--- a/autotest/utilities/test_nearblack.py
+++ b/autotest/utilities/test_nearblack.py
@@ -33,7 +33,6 @@
 import os
 import shutil
 
-sys.path.append('../pymod')
 
 from osgeo import gdal
 import gdaltest
diff --git a/autotest/utilities/test_nearblack_lib.py b/autotest/utilities/test_nearblack_lib.py
index 156e3b09c207..e455722bd02e 100755
--- a/autotest/utilities/test_nearblack_lib.py
+++ b/autotest/utilities/test_nearblack_lib.py
@@ -31,7 +31,6 @@
 
 import sys
 
-sys.path.append('../pymod')
 
 from osgeo import gdal
 import gdaltest
diff --git a/autotest/utilities/test_ogr2ogr.py b/autotest/utilities/test_ogr2ogr.py
index 7bf485e0673e..f1ffec3add1d 100755
--- a/autotest/utilities/test_ogr2ogr.py
+++ b/autotest/utilities/test_ogr2ogr.py
@@ -33,7 +33,6 @@
 import os
 import shutil
 
-sys.path.append('../pymod')
 sys.path.append('../ogr')
 
 from osgeo import gdal, ogr, osr
diff --git a/autotest/utilities/test_ogr2ogr_lib.py b/autotest/utilities/test_ogr2ogr_lib.py
index 7b89605a5937..65d41994b42c 100755
--- a/autotest/utilities/test_ogr2ogr_lib.py
+++ b/autotest/utilities/test_ogr2ogr_lib.py
@@ -31,7 +31,6 @@
 
 import sys
 
-sys.path.append('../pymod')
 
 from osgeo import gdal, gdalconst, ogr
 import gdaltest
diff --git a/autotest/utilities/test_ogrinfo.py b/autotest/utilities/test_ogrinfo.py
index 201805f5af0d..8eb21a5e4738 100755
--- a/autotest/utilities/test_ogrinfo.py
+++ b/autotest/utilities/test_ogrinfo.py
@@ -32,7 +32,6 @@
 import sys
 import os
 
-sys.path.append('../pymod')
 
 from osgeo import gdal
 import gdaltest
diff --git a/autotest/utilities/test_ogrlineref.py b/autotest/utilities/test_ogrlineref.py
index 0fda9c04ec4b..011e37230c3d 100755
--- a/autotest/utilities/test_ogrlineref.py
+++ b/autotest/utilities/test_ogrlineref.py
@@ -31,7 +31,6 @@
 import sys
 import os
 
-sys.path.append('../pymod')
 sys.path.append('../ogr')
 
 from osgeo import ogr
diff --git a/autotest/utilities/test_ogrtindex.py b/autotest/utilities/test_ogrtindex.py
index 4344aaa3fdab..c7805766d23f 100755
--- a/autotest/utilities/test_ogrtindex.py
+++ b/autotest/utilities/test_ogrtindex.py
@@ -32,7 +32,6 @@
 import sys
 import os
 
-sys.path.append('../pymod')
 
 from osgeo import ogr
 from osgeo import osr

From 2508d8119049786bd96b61a1f4d3042526705a16 Mon Sep 17 00:00:00 2001
From: Craig de Stigter <craig.destigter@koordinates.com>
Date: Wed, 3 Oct 2018 22:21:54 +1300
Subject: [PATCH 120/488] Refactor more of the dynamic tests to use
 parametrization

---
 autotest/gcore/tiff_srs.py | 246 ++++++++++++++++++-------------------
 autotest/gdrivers/fit.py   |  55 ++-------
 autotest/gdrivers/fits.py  |  95 ++++----------
 autotest/gdrivers/gxf.py   |  50 ++++----
 autotest/gdrivers/hdf5.py  | 142 ++++++---------------
 autotest/gdrivers/l1b.py   |  95 +++++++-------
 autotest/gdrivers/xmp.py   | 156 ++++++++++-------------
 autotest/gdrivers/xpm.py   |  42 +++----
 8 files changed, 339 insertions(+), 542 deletions(-)

diff --git a/autotest/gcore/tiff_srs.py b/autotest/gcore/tiff_srs.py
index c21da49a5b20..3b2e15d9dfec 100755
--- a/autotest/gcore/tiff_srs.py
+++ b/autotest/gcore/tiff_srs.py
@@ -30,6 +30,8 @@
 
 import sys
 
+import pytest
+
 from osgeo import gdal
 from osgeo import osr
 
@@ -37,55 +39,6 @@
 import gdaltest
 
 
-###############################################################################
-# Write a geotiff and read it back to check its SRS
-
-class TestTiffSRS(object):
-    def __init__(self, epsg_code, use_epsg_code, expected_fail):
-        self.epsg_code = epsg_code
-        self.use_epsg_code = use_epsg_code
-        self.expected_fail = expected_fail
-
-    def test(self):
-        sr = osr.SpatialReference()
-        if isinstance(self.epsg_code, str):
-            sr.SetFromUserInput(self.epsg_code)
-        else:
-            sr.ImportFromEPSG(self.epsg_code)
-            if self.use_epsg_code == 0:
-                proj4str = sr.ExportToProj4()
-                # print(proj4str)
-                sr.SetFromUserInput(proj4str)
-
-        ds = gdal.GetDriverByName('GTiff').Create('/vsimem/TestTiffSRS.tif', 1, 1)
-        ds.SetProjection(sr.ExportToWkt())
-        ds = None
-
-        ds = gdal.Open('/vsimem/TestTiffSRS.tif')
-        wkt = ds.GetProjectionRef()
-        sr2 = osr.SpatialReference()
-        sr2.SetFromUserInput(wkt)
-        ds = None
-
-        gdal.Unlink('/vsimem/TestTiffSRS.tif')
-
-        if sr.IsSame(sr2) != 1:
-            if self.expected_fail:
-                print('did not get expected SRS. known to be broken currently. FIXME!')
-                # print(sr)
-                # print(sr2)
-                return 'expected_fail'
-
-            gdaltest.post_reason('did not get expected SRS')
-            print(sr)
-            print(sr2)
-            return 'fail'
-        else:
-            if self.expected_fail:
-                print('Succeeded but expected fail...')
-
-        return 'success'
-
 ###############################################################################
 # Test fix for #4677:
 
@@ -501,82 +454,125 @@ def tiff_srs_pcscitation():
     return 'success'
 
 
-gdaltest_list = []
-
-tiff_srs_list = [2758,  # tmerc
-                 2036,  # sterea
-                 2046,  # tmerc
-                 3031,  # polar stere (ticket #3220)
-                 3032,  # polar stere (ticket #3220)
-                 32661,  # stere
-                 3035,  # laea
-                 2062,  # lcc 1SP
-                 [2065, False, True],  # krovak
-                 2066,  # cass
-                 2964,  # aea
-                 3410,  # cea
-                 3786,  # eqc spherical, method=9823
-                 32663,  # eqc elliptical, method=9842
-                 4087,  # eqc WGS 84 / World Equidistant Cylindrical method=1028
-                 4088,  # eqc World Equidistant Cylindrical (Sphere) method=1029
-                 2934,  # merc
-                 27200,  # nzmg
-                 2057,  # omerc Hotine_Oblique_Mercator_Azimuth_Center
-                 3591,  # omerc Hotine_Oblique_Mercator
-                 29100,  # poly
-                 2056,  # somerc
-                 2027,  # utm
-                 4326,  # longlat
-                 26943,  # lcc 2SP,
-                 4328,  # geocentric
-                 3994,  # mercator 2SP
-                 26920,  # UTM NAD83 special case
-                 26720,  # UTM NAD27 special case
-                 32630,  # UTM WGS84 north special case
-                 32730,  # UTM WGS84 south special case
-                 22700,  # unknown datum 'Deir_ez_Zor'
-                 31491,  # Germany Zone projection
-                 [3857, False, True],  # Web Mercator
-                 [102113, False, True],  # ESRI WGS_1984_Web_Mercator
-                ]
-
-for item in tiff_srs_list:
-    try:
-        epsg_code = item[0]
-        epsg_broken = item[1]
-        epsg_proj4_broken = item[2]
-    except TypeError:
-        epsg_code = item
-        epsg_broken = False
-        epsg_proj4_broken = False
-
-    ut = TestTiffSRS(epsg_code, 1, epsg_broken)
-    gdaltest_list.append((ut.test, "tiff_srs_epsg_%d" % epsg_code))
-    ut = TestTiffSRS(epsg_code, 0, epsg_proj4_broken)
-    gdaltest_list.append((ut.test, "tiff_srs_proj4_of_epsg_%d" % epsg_code))
-
-tiff_srs_list_proj4 = [['eqdc', '+proj=eqdc +lat_0=%.16g +lon_0=%.16g +lat_1=%.16g +lat_2=%.16g" +x_0=%.16g +y_0=%.16g' % (1, 2, 3, 4, 5, 6)],
-                       ['mill', '+proj=mill +lat_0=%.16g +lon_0=%.16g +x_0=%.16g +y_0=%.16g +R_A' % (1, 2, 3, 4)],
-                       ['gnom', '+proj=gnom +lat_0=%.16g +lon_0=%.16g +x_0=%.16g +y_0=%.16g' % (1, 2, 3, 4)],
-                       ['robin', '+proj=robin +lon_0=%.16g +x_0=%.16g +y_0=%.16g' % (1, 2, 3)],
-                       ['sinu', '+proj=sinu +lon_0=%.16g +x_0=%.16g +y_0=%.16g' % (1, 2, 3)],
-                      ]
-for (title, proj4) in tiff_srs_list_proj4:
-    ut = TestTiffSRS(proj4, 0, False)
-    gdaltest_list.append((ut.test, "tiff_srs_proj4_%s" % title))
-
-gdaltest_list.append(tiff_srs_without_linear_units)
-gdaltest_list.append(tiff_srs_compd_cs)
-gdaltest_list.append(tiff_srs_weird_mercator_2sp)
-gdaltest_list.append(tiff_srs_WGS_1984_Web_Mercator_Auxiliary_Sphere)
-gdaltest_list.append(tiff_srs_angular_units)
-gdaltest_list.append(tiff_custom_datum_known_ellipsoid)
-gdaltest_list.append(tiff_srs_epsg_2853_with_us_feet)
-gdaltest_list.append(tiff_srs_PCSCitationGeoKey_LUnits)
-gdaltest_list.append(tiff_srs_projection_3856)
-gdaltest_list.append(tiff_srs_imagine_localcs_citation)
-gdaltest_list.append(tiff_srs_towgs84_override)
-gdaltest_list.append(tiff_srs_pcscitation)
+def _test_tiff_srs(sr, expect_fail):
+    """
+    This is not a test by itself; it gets called by the tests below.
+    """
+    ds = gdal.GetDriverByName('GTiff').Create('/vsimem/TestTiffSRS.tif', 1, 1)
+    ds.SetProjection(sr.ExportToWkt())
+    ds = None
+
+    ds = gdal.Open('/vsimem/TestTiffSRS.tif')
+    wkt = ds.GetProjectionRef()
+    sr2 = osr.SpatialReference()
+    sr2.SetFromUserInput(wkt)
+    ds = None
+
+    gdal.Unlink('/vsimem/TestTiffSRS.tif')
+
+    if sr.IsSame(sr2) != 1:
+        if expect_fail:
+            pytest.xfail('did not get expected SRS. known to be broken currently. FIXME!')
+
+        print(sr)
+        print(sr2)
+        assert False, 'did not get expected SRS'
+    else:
+        if expect_fail:
+            print('Succeeded but expected fail...')
+
+
+###############################################################################
+# Write a geotiff and read it back to check its SRS
+
+@pytest.mark.parametrize('use_epsg_code', [0, 1])
+@pytest.mark.parametrize('epsg_code,epsg_proj4_broken', [
+    [2758, False],  # tmerc
+    [2036, False],  # sterea
+    [2046, False],  # tmerc
+    [3031, False],  # polar stere (ticket #3220)
+    [3032, False],  # polar stere (ticket #3220)
+    [32661, False],  # stere
+    [3035, False],  # laea
+    [2062, False],  # lcc 1SP
+    [2065, True],  # krovak
+    [2066, False],  # cass
+    [2964, False],  # aea
+    [3410, False],  # cea
+    [3786, False],  # eqc spherical, method=9823
+    [32663, False],  # eqc elliptical, method=9842
+    [4087, False],  # eqc WGS 84 / World Equidistant Cylindrical method=1028
+    [4088, False],  # eqc World Equidistant Cylindrical (Sphere) method=1029
+    [2934, False],  # merc
+    [27200, False],  # nzmg
+    [2057, False],  # omerc Hotine_Oblique_Mercator_Azimuth_Center
+    [3591, False],  # omerc Hotine_Oblique_Mercator
+    [29100, False],  # poly
+    [2056, False],  # somerc
+    [2027, False],  # utm
+    [4326, False],  # longlat
+    [26943, False],  # lcc 2SP,
+    [4328, False],  # geocentric
+    [3994, False],  # mercator 2SP
+    [26920, False],  # UTM NAD83 special case
+    [26720, False],  # UTM NAD27 special case
+    [32630, False],  # UTM WGS84 north special case
+    [32730, False],  # UTM WGS84 south special case
+    [22700, False],  # unknown datum 'Deir_ez_Zor'
+    [31491, False],  # Germany Zone projection
+    [3857, True],  # Web Mercator
+    [102113, True],  # ESRI WGS_1984_Web_Mercator
+])
+def test_tiff_srs(use_epsg_code, epsg_code, epsg_proj4_broken):
+    sr = osr.SpatialReference()
+    sr.ImportFromEPSG(epsg_code)
+    expect_fail = False
+    if use_epsg_code == 0:
+        proj4str = sr.ExportToProj4()
+        # print(proj4str)
+        sr.SetFromUserInput(proj4str)
+        expect_fail = epsg_proj4_broken
+
+    _test_tiff_srs(sr, expect_fail)
+
+
+@pytest.mark.parametrize(
+    'proj4',
+    [
+        ['+proj=eqdc +lat_0=%.16g +lon_0=%.16g +lat_1=%.16g +lat_2=%.16g" +x_0=%.16g +y_0=%.16g' % (1, 2, 3, 4, 5, 6)],
+        ['+proj=mill +lat_0=%.16g +lon_0=%.16g +x_0=%.16g +y_0=%.16g +R_A' % (1, 2, 3, 4)],
+        ['+proj=gnom +lat_0=%.16g +lon_0=%.16g +x_0=%.16g +y_0=%.16g' % (1, 2, 3, 4)],
+        ['+proj=robin +lon_0=%.16g +x_0=%.16g +y_0=%.16g' % (1, 2, 3)],
+        ['+proj=sinu +lon_0=%.16g +x_0=%.16g +y_0=%.16g' % (1, 2, 3)],
+    ],
+    ids=[
+        'eqdc',
+        'mill',
+        'gnom',
+        'robin',
+        'sinu',
+    ]
+)
+def test_tiff_srs_proj4(proj4):
+    sr = osr.SpatialReference()
+    sr.SetFromUserInput(proj4)
+    _test_tiff_srs(sr, False)
+
+
+gdaltest_list = [
+    tiff_srs_without_linear_units,
+    tiff_srs_compd_cs,
+    tiff_srs_weird_mercator_2sp,
+    tiff_srs_WGS_1984_Web_Mercator_Auxiliary_Sphere,
+    tiff_srs_angular_units,
+    tiff_custom_datum_known_ellipsoid,
+    tiff_srs_epsg_2853_with_us_feet,
+    tiff_srs_PCSCitationGeoKey_LUnits,
+    tiff_srs_projection_3856,
+    tiff_srs_imagine_localcs_citation,
+    tiff_srs_towgs84_override,
+    tiff_srs_pcscitation,
+]
 
 if __name__ == '__main__':
 
diff --git a/autotest/gdrivers/fit.py b/autotest/gdrivers/fit.py
index 05a0896eda2d..7cbc6318ed14 100755
--- a/autotest/gdrivers/fit.py
+++ b/autotest/gdrivers/fit.py
@@ -28,51 +28,22 @@
 # DEALINGS IN THE SOFTWARE.
 ###############################################################################
 
-import sys
-from osgeo import gdal
-
-
-import gdaltest
-
-###############################################################################
-#
-
-
-class TestFIT(object):
-    def __init__(self, fileName):
-        self.fileName = fileName
-        self.fitDriver = gdal.GetDriverByName('FIT')
-
-    def test(self):
+import pytest
 
-        ds = gdal.Open('../gcore/data/' + self.fileName + '.tif')
-        self.fitDriver.CreateCopy('tmp/' + self.fileName + '.fit', ds, options=['PAGESIZE=2,2'])
-
-        ds2 = gdal.Open('tmp/' + self.fileName + '.fit')
-        if ds2.GetRasterBand(1).Checksum() != ds.GetRasterBand(1).Checksum():
-            return 'fail'
-
-        if ds2.GetRasterBand(1).DataType != ds.GetRasterBand(1).DataType:
-            return 'fail'
-
-        ds2 = None
-        self.fitDriver.Delete('tmp/' + self.fileName + '.fit')
-        return 'success'
-
-
-gdaltest_list = []
-
-fit_list = ['byte', 'int16', 'uint16', 'int32', 'uint32', 'float32', 'float64']
-
-for item in fit_list:
-    ut = TestFIT(item)
-    gdaltest_list.append((ut.test, item))
+from osgeo import gdal
 
 
-if __name__ == '__main__':
+@pytest.mark.parametrize('filename', [
+    'byte', 'int16', 'uint16', 'int32', 'uint32', 'float32', 'float64'
+])
+def test_fit(filename):
+    fitDriver = gdal.GetDriverByName('FIT')
 
-    gdaltest.setup_run('fit')
+    ds = gdal.Open('../gcore/data/' + filename + '.tif')
+    fitDriver.CreateCopy('tmp/' + filename + '.fit', ds, options=['PAGESIZE=2,2'])
 
-    gdaltest.run_tests(gdaltest_list)
+    ds2 = gdal.Open('tmp/' + filename + '.fit')
+    assert ds2.GetRasterBand(1).Checksum() == ds.GetRasterBand(1).Checksum()
 
-    sys.exit(gdaltest.summarize())
+    assert ds2.GetRasterBand(1).DataType == ds.GetRasterBand(1).DataType
+    ds2 = None
diff --git a/autotest/gdrivers/fits.py b/autotest/gdrivers/fits.py
index 63110d721abd..605e5506899d 100755
--- a/autotest/gdrivers/fits.py
+++ b/autotest/gdrivers/fits.py
@@ -28,59 +28,39 @@
 # DEALINGS IN THE SOFTWARE.
 ###############################################################################
 
-import sys
-from osgeo import gdal
-
-
-import gdaltest
-
-###############################################################################
-#
-
-
-def fits_init():
-    gdaltest.fitsDriver = gdal.GetDriverByName('FITS')
-    if gdaltest.fitsDriver is None:
-        return 'skip'
+import pytest
 
-    return 'success'
-
-###############################################################################
-#
-
-
-class TestFITS(object):
-    def __init__(self, fileName):
-        self.fileName = fileName
+from osgeo import gdal
 
-    def test(self):
-        if gdaltest.fitsDriver is None:
-            return 'skip'
 
-        ds = gdal.Open('../gcore/data/' + self.fileName + '.tif')
-        gdaltest.fitsDriver.CreateCopy('tmp/' + self.fileName + '.fits', ds, options=['PAGESIZE=2,2'])
+@pytest.fixture
+def driver():
+    driver = gdal.GetDriverByName('FITS')
+    if driver is None:
+        pytest.skip()
+    return driver
 
-        ds2 = gdal.Open('tmp/' + self.fileName + '.fits')
-        if ds2.GetRasterBand(1).Checksum() != ds.GetRasterBand(1).Checksum():
-            return 'fail'
 
-        if ds2.GetRasterBand(1).DataType != ds.GetRasterBand(1).DataType:
-            return 'fail'
+@pytest.mark.parametrize(
+    'filename',
+    ['byte', 'int16', 'int32', 'float32', 'float64']
+)
+def test_fits(driver, filename):
+    ds = gdal.Open('../gcore/data/' + filename + '.tif')
+    driver.CreateCopy('tmp/' + filename + '.fits', ds, options=['PAGESIZE=2,2'])
 
-        ds2 = None
-        gdaltest.fitsDriver.Delete('tmp/' + self.fileName + '.fits')
-        return 'success'
+    ds2 = gdal.Open('tmp/' + filename + '.fits')
+    assert ds2.GetRasterBand(1).Checksum() == ds.GetRasterBand(1).Checksum()
 
-###############################################################################
-#
+    assert ds2.GetRasterBand(1).DataType == ds.GetRasterBand(1).DataType
 
+    ds2 = None
+    driver.Delete('tmp/' + filename + '.fits')
 
-def fits_metadata():
-    if gdaltest.fitsDriver is None:
-        return 'skip'
 
+def fits_metadata(driver):
     ds = gdal.Open('../gcore/data/byte.tif')
-    ds2 = gdaltest.fitsDriver.CreateCopy('tmp/byte.fits', ds)
+    ds2 = driver.CreateCopy('tmp/byte.fits', ds)
     md = {'TEST': 'test_value'}
     ds2.SetMetadata(md)
     ds2 = None
@@ -90,8 +70,7 @@ def fits_metadata():
     md = ds2.GetMetadata()
     ds2 = None
 
-    if md['TEST'] != 'test_value':
-        return 'fail'
+    assert md['TEST'] == 'test_value'
 
     ds2 = gdal.Open('tmp/byte.fits', gdal.GA_Update)
     md = {'TEST2': 'test_value2'}
@@ -103,30 +82,4 @@ def fits_metadata():
     md = ds2.GetMetadata()
     ds2 = None
 
-    if md['TEST2'] != 'test_value2':
-        return 'fail'
-
-    gdaltest.fitsDriver.Delete('tmp/byte.fits')
-
-    return 'success'
-
-
-###############################################################################
-#
-gdaltest_list = [fits_init]
-
-fits_list = ['byte', 'int16', 'int32', 'float32', 'float64']
-
-for item in fits_list:
-    ut = TestFITS(item)
-    gdaltest_list.append((ut.test, item))
-
-gdaltest_list.append(fits_metadata)
-
-if __name__ == '__main__':
-
-    gdaltest.setup_run('fits')
-
-    gdaltest.run_tests(gdaltest_list)
-
-    sys.exit(gdaltest.summarize())
+    assert md['TEST2'] == 'test_value2'
diff --git a/autotest/gdrivers/gxf.py b/autotest/gdrivers/gxf.py
index 05c63232ad30..8b970146aaff 100755
--- a/autotest/gdrivers/gxf.py
+++ b/autotest/gdrivers/gxf.py
@@ -30,6 +30,9 @@
 ###############################################################################
 
 import sys
+
+import pytest
+
 from osgeo import gdal
 
 
@@ -68,44 +71,33 @@ def gxf_2():
 
     return tst.testOpen(check_prj=wkt)
 
-###############################################################################
-#
-
 
-class TestGXF(object):
-    def __init__(self, downloadURL, fileName, checksum, download_size):
-        self.downloadURL = downloadURL
-        self.fileName = fileName
-        self.checksum = checksum
-        self.download_size = download_size
+gxf_list = [
+    ('http://download.osgeo.org/gdal/data/gxf', 'SAMPLE.GXF', 24068, -1),
+    ('http://download.osgeo.org/gdal/data/gxf', 'gxf_compressed.gxf', 20120, -1),
+    ('http://download.osgeo.org/gdal/data/gxf', 'gxf_text.gxf', 20265, -1),
+    ('http://download.osgeo.org/gdal/data/gxf', 'gxf_ul_r.gxf', 19930, -1),
+    ('http://download.osgeo.org/gdal/data/gxf', 'latlong.gxf', 12243, -1),
+    ('http://download.osgeo.org/gdal/data/gxf', 'spif83.gxf', 28752, -1),
+]
 
-    def test(self):
-        if not gdaltest.download_file(self.downloadURL + '/' + self.fileName, self.fileName, self.download_size):
-            return 'skip'
 
-        ds = gdal.Open('tmp/cache/' + self.fileName)
+@pytest.mark.parametrize(
+    'downloadURL,fileName,checksum,download_size',
+    gxf_list,
+    ids=[tup[1] for tup in gxf_list],
+)
+def test_gxf(downloadURL, fileName, checksum, download_size):
+    if not gdaltest.download_file(downloadURL + '/' + fileName, fileName, download_size):
+        pytest.skip()
 
-        if ds.GetRasterBand(1).Checksum() != self.checksum:
-            gdaltest.post_reason('Bad checksum. Expected %d, got %d' % (self.checksum, ds.GetRasterBand(1).Checksum()))
-            return 'fail'
+    ds = gdal.Open('tmp/cache/' + fileName)
 
-        return 'success'
+    assert ds.GetRasterBand(1).Checksum() == checksum, 'Bad checksum. Expected %d, got %d' % (checksum, ds.GetRasterBand(1).Checksum())
 
 
 gdaltest_list = [gxf_1, gxf_2]
 
-gxf_list = [('http://download.osgeo.org/gdal/data/gxf', 'SAMPLE.GXF', 24068, -1),
-            ('http://download.osgeo.org/gdal/data/gxf', 'gxf_compressed.gxf', 20120, -1),
-            ('http://download.osgeo.org/gdal/data/gxf', 'gxf_text.gxf', 20265, -1),
-            ('http://download.osgeo.org/gdal/data/gxf', 'gxf_ul_r.gxf', 19930, -1),
-            ('http://download.osgeo.org/gdal/data/gxf', 'latlong.gxf', 12243, -1),
-            ('http://download.osgeo.org/gdal/data/gxf', 'spif83.gxf', 28752, -1)
-           ]
-
-for item in gxf_list:
-    ut = TestGXF(item[0], item[1], item[2], item[3])
-    gdaltest_list.append((ut.test, item[1]))
-
 
 if __name__ == '__main__':
 
diff --git a/autotest/gdrivers/hdf5.py b/autotest/gdrivers/hdf5.py
index d0229f214808..eec1d07133eb 100755
--- a/autotest/gdrivers/hdf5.py
+++ b/autotest/gdrivers/hdf5.py
@@ -32,6 +32,8 @@
 import sys
 import shutil
 
+import pytest
+
 from osgeo import gdal
 
 
@@ -43,25 +45,29 @@
 # Test if HDF5 driver is present
 
 
-def hdf5_1():
+@pytest.fixture
+def driver(autouse=True, scope='module'):
+    driver = gdal.GetDriverByName('HDF5')
+    if driver is None:
+        pytest.skip('No HDF5 driver')
+    return driver
 
-    gdaltest.hdf5_drv = gdal.GetDriverByName('HDF5')
-    if gdaltest.hdf5_drv is None:
-        return 'skip'
 
-    gdaltest.count_opened_files = len(gdaltest.get_opened_files())
+@pytest.fixture(autouse=True)
+def check_no_file_leaks():
+    num_files = len(gdaltest.get_opened_files())
+
+    yield
+
+    diff = len(gdaltest.get_opened_files()) - num_files
+    assert diff == 0, 'Leak of file handles: %d leaked' % diff
 
-    return 'success'
 
 ###############################################################################
 # Confirm expected subdataset information.
 
 
 def hdf5_2():
-
-    if gdaltest.hdf5_drv is None:
-        return 'skip'
-
     ds = gdal.Open('data/groups.h5')
 
     sds_list = ds.GetMetadata('SUBDATASETS')
@@ -92,9 +98,6 @@ def hdf5_2():
 
 def hdf5_3():
 
-    if gdaltest.hdf5_drv is None:
-        return 'skip'
-
     ds = gdal.Open('HDF5:"data/u8be.h5"://TestArray')
 
     cs = ds.GetRasterBand(1).Checksum()
@@ -116,9 +119,6 @@ def hdf5_3():
 
 def hdf5_4():
 
-    if gdaltest.hdf5_drv is None:
-        return 'skip'
-
     ds = gdal.Open('HDF5:"data/u8be.h5"://TestArray')
 
     cs = ds.GetRasterBand(1).Checksum()
@@ -134,9 +134,6 @@ def hdf5_4():
 
 def hdf5_5():
 
-    if gdaltest.hdf5_drv is None:
-        return 'skip'
-
     ds = gdal.Open('HDF5:"data/groups.h5"://MyGroup/dset1')
 
     cs = ds.GetRasterBand(1).Checksum()
@@ -152,9 +149,6 @@ def hdf5_5():
 
 def hdf5_6():
 
-    if gdaltest.hdf5_drv is None:
-        return 'skip'
-
     shutil.copyfile('data/groups.h5', 'tmp/groups.h5')
 
     ds = gdal.Open('HDF5:"tmp/groups.h5"://MyGroup/dset1')
@@ -194,9 +188,6 @@ def hdf5_6():
 
 def hdf5_7():
 
-    if gdaltest.hdf5_drv is None:
-        return 'skip'
-
     ds = gdal.Open('data/metadata.h5')
     metadata = ds.GetMetadata()
     metadataList = ds.GetMetadata_List()
@@ -225,9 +216,6 @@ def hdf5_7():
 
 def hdf5_8():
 
-    if gdaltest.hdf5_drv is None:
-        return 'skip'
-
     ds = gdal.Open('data/metadata.h5')
     metadata = ds.GetMetadata()
     ds = None
@@ -292,9 +280,6 @@ def scanMetadata(parts):
 
 def hdf5_9():
 
-    if gdaltest.hdf5_drv is None:
-        return 'skip'
-
     if int(gdal.VersionInfo('VERSION_NUM')) < 1900:
         gdaltest.post_reason('would crash')
         return 'skip'
@@ -340,9 +325,6 @@ def hdf5_9():
 
 def hdf5_10():
 
-    if gdaltest.hdf5_drv is None:
-        return 'skip'
-
     # Try opening the QLK subdataset to check that no error is generated
     gdal.ErrorReset()
     ds = gdal.Open('HDF5:"data/CSK_DGM.h5"://S01/QLK')
@@ -381,9 +363,6 @@ def hdf5_10():
 
 def hdf5_11():
 
-    if gdaltest.hdf5_drv is None:
-        return 'skip'
-
     # Try opening the QLK subdataset to check that no error is generated
     gdal.ErrorReset()
     ds = gdal.Open('HDF5:"data/CSK_GEC.h5"://S01/QLK')
@@ -421,9 +400,6 @@ def hdf5_11():
 
 def hdf5_12():
 
-    if gdaltest.hdf5_drv is None:
-        return 'skip'
-
     if not gdaltest.download_file('http://trac.osgeo.org/gdal/raw-attachment/ticket/5032/norsa.ss.ppi-00.5-dbz.aeqd-1000.20070601T000039Z.hdf', 'norsa.ss.ppi-00.5-dbz.aeqd-1000.20070601T000039Z.hdf'):
         return 'skip'
 
@@ -453,9 +429,6 @@ def hdf5_12():
 
 def hdf5_13():
 
-    if gdaltest.hdf5_drv is None:
-        return 'skip'
-
     if not gdaltest.download_file('http://oceandata.sci.gsfc.nasa.gov/cgi/getfile/A2016273115000.L2_LAC_OC.nc', 'A2016273115000.L2_LAC_OC.nc'):
         return 'skip'
 
@@ -480,9 +453,6 @@ def hdf5_13():
 
 def hdf5_14():
 
-    if gdaltest.hdf5_drv is None:
-        return 'skip'
-
     ds = gdal.Open('data/complex.h5')
     sds_list = ds.GetMetadata('SUBDATASETS')
 
@@ -513,9 +483,6 @@ def hdf5_14():
 
 def hdf5_15():
 
-    if gdaltest.hdf5_drv is None:
-        return 'skip'
-
     ds = gdal.Open('HDF5:"data/complex.h5"://f32')
 
     cs = ds.GetRasterBand(1).Checksum()
@@ -530,9 +497,6 @@ def hdf5_15():
 
 def hdf5_16():
 
-    if gdaltest.hdf5_drv is None:
-        return 'skip'
-
     ds = gdal.Open('HDF5:"data/complex.h5"://f64')
 
     cs = ds.GetRasterBand(1).Checksum()
@@ -547,9 +511,6 @@ def hdf5_16():
 
 def hdf5_17():
 
-    if gdaltest.hdf5_drv is None:
-        return 'skip'
-
     ds = gdal.Open('HDF5:"data/complex.h5"://f16')
 
     cs = ds.GetRasterBand(1).Checksum()
@@ -562,9 +523,6 @@ def hdf5_17():
 
 def hdf5_single_char_varname():
 
-    if gdaltest.hdf5_drv is None:
-        return 'skip'
-
     ds = gdal.Open('HDF5:"data/single_char_varname.h5"://e')
     if ds is None:
         return 'fail'
@@ -573,10 +531,6 @@ def hdf5_single_char_varname():
 
 
 def hdf5_virtual_file():
-
-    if gdaltest.hdf5_drv is None:
-        return 'skip'
-
     hdf5_files = [
         'CSK_GEC.h5',
         'vlstr_metadata.h5',
@@ -594,45 +548,32 @@ def hdf5_virtual_file():
     return 'success'
 
 
-class TestHDF5(object):
-    def __init__(self, downloadURL, fileName, subdatasetname, checksum, download_size):
-        self.downloadURL = downloadURL
-        self.fileName = fileName
-        self.subdatasetname = subdatasetname
-        self.checksum = checksum
-        self.download_size = download_size
-
-    def test(self):
-        if gdaltest.hdf5_drv is None:
-            return 'skip'
-
-        if not gdaltest.download_file(self.downloadURL + '/' + self.fileName, self.fileName, self.download_size):
-            return 'skip'
-
-        ds = gdal.Open('HDF5:"tmp/cache/' + self.fileName + '"://' + self.subdatasetname)
-
-        if ds.GetRasterBand(1).Checksum() != self.checksum:
-            gdaltest.post_reason('Bad checksum. Expected %d, got %d' % (self.checksum, ds.GetRasterBand(1).Checksum()))
-            return 'fail'
-
-        return 'success'
-
+# FIXME: This FTP server seems to have disappeared. Replace with something else?
+hdf5_list = [
+    ('ftp://ftp.hdfgroup.uiuc.edu/pub/outgoing/hdf_files/hdf5/samples/convert', 'C1979091.h5',
+        'HDF4_PALGROUP/HDF4_PALETTE_2', 7488, -1),
+    ('ftp://ftp.hdfgroup.uiuc.edu/pub/outgoing/hdf_files/hdf5/samples/convert', 'C1979091.h5',
+        'Raster_Image_#0', 3661, -1),
+    ('ftp://ftp.hdfgroup.uiuc.edu/pub/outgoing/hdf_files/hdf5/geospatial/DEM', 'half_moon_bay.grid',
+        'HDFEOS/GRIDS/DEMGRID/Data_Fields/Elevation', 30863, -1),
+]
 
 
-def hdf5_postcheck():
+@pytest.mark.parametrize(
+    'downloadURL,fileName,subdatasetname,checksum,download_size',
+    hdf5_list,
+    ids=['HDF5:"' + item[1] + '"://' + item[2] for item in hdf5_list],
+)
+def test_hdf5(driver, downloadURL, fileName, subdatasetname, checksum, download_size):
+    if not gdaltest.download_file(downloadURL + '/' + fileName, fileName, download_size):
+        pytest.skip('no download')
 
-    if gdaltest.hdf5_drv is None:
-        return 'skip'
+    ds = gdal.Open('HDF5:"tmp/cache/' + fileName + '"://' + subdatasetname)
 
-    diff = len(gdaltest.get_opened_files()) - gdaltest.count_opened_files
-    if diff != 0:
-        gdaltest.post_reason('Leak of file handles: %d leaked' % diff)
-        return 'fail'
+    assert ds.GetRasterBand(1).Checksum() == checksum, 'Bad checksum. Expected %d, got %d' % (checksum, ds.GetRasterBand(1).Checksum())
 
-    return 'success'
 
 gdaltest_list = [
-    hdf5_1,
     hdf5_2,
     hdf5_3,
     hdf5_4,
@@ -651,21 +592,8 @@ def hdf5_postcheck():
     hdf5_17,
     hdf5_single_char_varname,
     hdf5_virtual_file,
-    hdf5_postcheck,
 ]
 
-hdf5_list = [('ftp://ftp.hdfgroup.uiuc.edu/pub/outgoing/hdf_files/hdf5/samples/convert', 'C1979091.h5',
-              'HDF4_PALGROUP/HDF4_PALETTE_2', 7488, -1),
-             ('ftp://ftp.hdfgroup.uiuc.edu/pub/outgoing/hdf_files/hdf5/samples/convert', 'C1979091.h5',
-              'Raster_Image_#0', 3661, -1),
-             ('ftp://ftp.hdfgroup.uiuc.edu/pub/outgoing/hdf_files/hdf5/geospatial/DEM', 'half_moon_bay.grid',
-              'HDFEOS/GRIDS/DEMGRID/Data_Fields/Elevation', 30863, -1),
-            ]
-
-for item in hdf5_list:
-    ut = TestHDF5(item[0], item[1], item[2], item[3], item[4])
-    gdaltest_list.append((ut.test, 'HDF5:"' + item[1] + '"://' + item[2]))
-
 
 if __name__ == '__main__':
 
diff --git a/autotest/gdrivers/l1b.py b/autotest/gdrivers/l1b.py
index 6a80a525c2bd..988d0ddab31e 100755
--- a/autotest/gdrivers/l1b.py
+++ b/autotest/gdrivers/l1b.py
@@ -31,40 +31,49 @@
 
 import os
 import sys
-from osgeo import gdal
 
+import pytest
+
+from osgeo import gdal
 
 import gdaltest
 
 
 ###############################################################################
 #
-class TestL1B(object):
-    def __init__(self, downloadURL, fileName, checksum, download_size, gcpNumber):
-        self.downloadURL = downloadURL
-        self.fileName = fileName
-        self.checksum = checksum
-        self.download_size = download_size
-        self.gcpNumber = gcpNumber
-
-    def test(self):
-        if not gdaltest.download_file(self.downloadURL + '/' + self.fileName, self.fileName, self.download_size):
-            return 'skip'
-
-        ds = gdal.Open('tmp/cache/' + self.fileName)
-
-        if ds.GetRasterBand(1).Checksum() != self.checksum:
-            gdaltest.post_reason('Bad checksum. Expected %d, got %d' % (self.checksum, ds.GetRasterBand(1).Checksum()))
-            return 'fail'
 
-        if len(ds.GetGCPs()) != self.gcpNumber:
-            gdaltest.post_reason('Bad GCP number. Expected %d, got %d' % (self.gcpNumber, len(ds.GetGCPs())))
-            return 'fail'
 
-        return 'success'
+l1b_list = [
+    ('http://download.osgeo.org/gdal/data/l1b', 'n12gac8bit.l1b', 51754, -1, 1938),
+    ('http://download.osgeo.org/gdal/data/l1b', 'n12gac10bit.l1b', 46039, -1, 1887),
+    ('http://download.osgeo.org/gdal/data/l1b', 'n12gac10bit_ebcdic.l1b', 46039, -1, 1887),  # 2848
+    ('http://download.osgeo.org/gdal/data/l1b', 'n14gac16bit.l1b', 42286, -1, 2142),
+    ('http://download.osgeo.org/gdal/data/l1b', 'n15gac8bit.l1b', 55772, -1, 2091),
+    ('http://download.osgeo.org/gdal/data/l1b', 'n16gac10bit.l1b', 6749, -1, 2142),
+    ('http://download.osgeo.org/gdal/data/l1b', 'n17gac16bit.l1b', 61561, -1, 2040),
+    ('http://www.ncdc.noaa.gov/oa/pod-guide/ncdc/docs/podug/data/avhrr', 'frang.1b', 33700, 30000, 357),  # 10 bit guess
+    ('http://www.ncdc.noaa.gov/oa/pod-guide/ncdc/docs/podug/data/avhrr', 'franh.1b', 56702, 100000, 255),  # 10 bit guess
+    ('http://www.ncdc.noaa.gov/oa/pod-guide/ncdc/docs/podug/data/avhrr', 'calfirel.1b', 55071, 30000, 255),  # 16 bit guess
+    ('http://www.ncdc.noaa.gov/oa/pod-guide/ncdc/docs/podug/data/avhrr', 'rapnzg.1b', 58084, 30000, 612),  # 16 bit guess
+    ('http://www.sat.dundee.ac.uk/testdata/new_noaa/new_klm_format/', 'noaa18.n1b', 50229, 50000, 102),
+    ('http://www.sat.dundee.ac.uk/testdata/metop', 'noaa1b', 62411, 150000, 408)
+]
 
-###############################################################################
-#
+
+@pytest.mark.parametrize(
+    'downloadURL,fileName,checksum,download_size,gcpNumber',
+    l1b_list,
+    ids=[item[1] for item in l1b_list]
+)
+def test_l1b(downloadURL, fileName, checksum, download_size, gcpNumber):
+    if not gdaltest.download_file(downloadURL + '/' + fileName, fileName, download_size):
+        pytest.skip()
+
+    ds = gdal.Open('tmp/cache/' + fileName)
+
+    assert ds.GetRasterBand(1).Checksum() == checksum
+
+    assert len(ds.GetGCPs()) == gcpNumber
 
 
 def l1b_geoloc():
@@ -295,34 +304,16 @@ def l1b_little_endian():
     return 'success'
 
 
-gdaltest_list = []
-
-l1b_list = [('http://download.osgeo.org/gdal/data/l1b', 'n12gac8bit.l1b', 51754, -1, 1938),
-            ('http://download.osgeo.org/gdal/data/l1b', 'n12gac10bit.l1b', 46039, -1, 1887),
-            ('http://download.osgeo.org/gdal/data/l1b', 'n12gac10bit_ebcdic.l1b', 46039, -1, 1887),  # 2848
-            ('http://download.osgeo.org/gdal/data/l1b', 'n14gac16bit.l1b', 42286, -1, 2142),
-            ('http://download.osgeo.org/gdal/data/l1b', 'n15gac8bit.l1b', 55772, -1, 2091),
-            ('http://download.osgeo.org/gdal/data/l1b', 'n16gac10bit.l1b', 6749, -1, 2142),
-            ('http://download.osgeo.org/gdal/data/l1b', 'n17gac16bit.l1b', 61561, -1, 2040),
-            ('http://www.ncdc.noaa.gov/oa/pod-guide/ncdc/docs/podug/data/avhrr', 'frang.1b', 33700, 30000, 357),  # 10 bit guess
-            ('http://www.ncdc.noaa.gov/oa/pod-guide/ncdc/docs/podug/data/avhrr', 'franh.1b', 56702, 100000, 255),  # 10 bit guess
-            ('http://www.ncdc.noaa.gov/oa/pod-guide/ncdc/docs/podug/data/avhrr', 'calfirel.1b', 55071, 30000, 255),  # 16 bit guess
-            ('http://www.ncdc.noaa.gov/oa/pod-guide/ncdc/docs/podug/data/avhrr', 'rapnzg.1b', 58084, 30000, 612),  # 16 bit guess
-            ('http://www.sat.dundee.ac.uk/testdata/new_noaa/new_klm_format/', 'noaa18.n1b', 50229, 50000, 102),
-            ('http://www.sat.dundee.ac.uk/testdata/metop', 'noaa1b', 62411, 150000, 408)
-           ]
-
-for item in l1b_list:
-    ut = TestL1B(item[0], item[1], item[2], item[3], item[4])
-    gdaltest_list.append((ut.test, item[1]))
-
-gdaltest_list.append(l1b_geoloc)
-gdaltest_list.append(l1b_solar_zenith_angles_before_noaa_15)
-gdaltest_list.append(l1b_metadata_before_noaa_15)
-gdaltest_list.append(l1b_angles_after_noaa_15)
-gdaltest_list.append(l1b_clouds_after_noaa_15)
-gdaltest_list.append(l1b_metadata_after_noaa_15)
-gdaltest_list.append(l1b_little_endian)
+gdaltest_list = [
+    l1b_geoloc,
+    l1b_solar_zenith_angles_before_noaa_15,
+    l1b_metadata_before_noaa_15,
+    l1b_angles_after_noaa_15,
+    l1b_clouds_after_noaa_15,
+    l1b_metadata_after_noaa_15,
+    l1b_little_endian,
+]
+
 
 if __name__ == '__main__':
 
diff --git a/autotest/gdrivers/xmp.py b/autotest/gdrivers/xmp.py
index f0a7018150b3..8e956bc2c3a3 100755
--- a/autotest/gdrivers/xmp.py
+++ b/autotest/gdrivers/xmp.py
@@ -29,7 +29,7 @@
 # DEALINGS IN THE SOFTWARE.
 ###############################################################################
 
-import sys
+import pytest
 
 from osgeo import gdal
 
@@ -40,94 +40,72 @@
 #
 
 
-class TestXMPRead(object):
-    def __init__(self, drivername, filename, expect_xmp):
-        self.drivername = drivername
-        self.filename = filename
-        self.expect_xmp = expect_xmp
-
-    def test(self):
-        drv = gdal.GetDriverByName(self.drivername)
-        if drv is None:
-            return 'skip'
-
-        if self.drivername == 'PDF':
-            md = drv.GetMetadata()
-            if 'HAVE_POPPLER' not in md and 'HAVE_PODOFO' not in md:
-                return 'skip'
-
-        # we set ECW to not resolve projection and datum strings to get 3.x behavior.
-        gdal.SetConfigOption("ECW_DO_NOT_RESOLVE_DATUM_PROJECTION", "YES")
-
-        if self.filename.find('.jp2') >= 0:
-            gdaltest.deregister_all_jpeg2000_drivers_but(self.drivername)
-
-        ret = 'success'
-        ds = gdal.Open(self.filename)
-        if ds is None:
-            # Old libwebp don't support VP8X containers
-            if self.filename == 'data/rgbsmall_with_xmp.webp':
-                ret = 'skip'
-            else:
-                gdaltest.post_reason('open failed')
-                ret = 'failure'
+lst = [
+    ["GTiff", "data/byte_with_xmp.tif", True],
+    ["GTiff", "data/byte.tif", False],
+    ["GIF", "data/byte_with_xmp.gif", True],
+    ["BIGGIF", "data/fakebig.gif", False],
+    ["JPEG", "data/byte_with_xmp.jpg", True],
+    ["JPEG", "data/rgbsmall_rgb.jpg", False],
+    ["PNG", "data/byte_with_xmp.png", True],
+    ["PNG", "data/test.png", False],
+    ["JP2ECW", "data/byte_with_xmp.jp2", True],
+    ["JP2ECW", "data/byte.jp2", False],
+    ["JP2MrSID", "data/byte_with_xmp.jp2", True],
+    ["JP2MrSID", "data/byte.jp2", False],
+    ["JPEG2000", "data/byte_with_xmp.jp2", True],
+    ["JPEG2000", "data/byte.jp2", False],
+    ["JP2OpenJPEG", "data/byte_with_xmp.jp2", True],
+    ["JP2OpenJPEG", "data/byte.jp2", False],
+    ["JP2KAK", "data/byte_with_xmp.jp2", True],
+    ["JP2KAK", "data/byte.jp2", False],
+    ["PDF", "data/adobe_style_geospatial_with_xmp.pdf", True],
+    ["PDF", "data/adobe_style_geospatial.pdf", False],
+    ["WEBP", "data/rgbsmall_with_xmp.webp", True],
+    ["WEBP", "data/rgbsmall.webp", False],
+]
+
+
+@pytest.mark.parametrize(
+    'drivername,filename,expect_xmp',
+    lst,
+    ids=[
+        "xmp_read_%s_%s" % (drivername, str(expect_xmp))
+        for (drivername, filename, expect_xmp) in lst
+    ]
+)
+def test_xmp(drivername, filename, expect_xmp):
+    drv = gdal.GetDriverByName(drivername)
+    if drv is None:
+        pytest.skip()
+
+    if drivername == 'PDF':
+        md = drv.GetMetadata()
+        if 'HAVE_POPPLER' not in md and 'HAVE_PODOFO' not in md:
+            pytest.skip()
+
+    # we set ECW to not resolve projection and datum strings to get 3.x behavior.
+    gdal.SetConfigOption("ECW_DO_NOT_RESOLVE_DATUM_PROJECTION", "YES")
+
+    if filename.find('.jp2') >= 0:
+        gdaltest.deregister_all_jpeg2000_drivers_but(drivername)
+
+    try:
+        ds = gdal.Open(filename)
+        if filename == 'data/rgbsmall_with_xmp.webp':
+            if ds is None:
+                pytest.skip("Old libwebp don't support VP8X containers")
         else:
-            xmp_md = ds.GetMetadata('xml:XMP')
-            if ds.GetDriver().ShortName != self.drivername:
-                gdaltest.post_reason('opened with wrong driver')
-                print(ds.GetDriver().ShortName)
-                ret = 'failure'
-            elif self.expect_xmp and not xmp_md:
-                gdaltest.post_reason('did not find xml:XMP metadata')
-                ret = 'failure'
-            elif self.expect_xmp and 'xml:XMP' not in ds.GetMetadataDomainList():
-                gdaltest.post_reason('did not find xml:XMP metadata domain')
-                ret = 'failure'
-            elif (not self.expect_xmp) and xmp_md:
-                gdaltest.post_reason('found unexpected xml:XMP metadata')
-                ret = 'failure'
-        ds = None
+            assert ds is not None, 'open failed'
 
-        if self.filename.find('.jp2') >= 0:
-            gdaltest.reregister_all_jpeg2000_drivers()
+        xmp_md = ds.GetMetadata('xml:XMP')
+
+        assert ds.GetDriver().ShortName == drivername, 'opened with wrong driver'
+        assert not (expect_xmp and not xmp_md), 'did not find xml:XMP metadata'
+        assert not (expect_xmp and 'xml:XMP' not in ds.GetMetadataDomainList()), 'did not find xml:XMP metadata domain'
+        assert expect_xmp or not xmp_md, 'found unexpected xml:XMP metadata'
 
-        return ret
-
-
-gdaltest_list = []
-
-lst = [["GTiff", "data/byte_with_xmp.tif", True],
-       ["GTiff", "data/byte.tif", False],
-       ["GIF", "data/byte_with_xmp.gif", True],
-       ["BIGGIF", "data/fakebig.gif", False],
-       ["JPEG", "data/byte_with_xmp.jpg", True],
-       ["JPEG", "data/rgbsmall_rgb.jpg", False],
-       ["PNG", "data/byte_with_xmp.png", True],
-       ["PNG", "data/test.png", False],
-       ["JP2ECW", "data/byte_with_xmp.jp2", True],
-       ["JP2ECW", "data/byte.jp2", False],
-       ["JP2MrSID", "data/byte_with_xmp.jp2", True],
-       ["JP2MrSID", "data/byte.jp2", False],
-       ["JPEG2000", "data/byte_with_xmp.jp2", True],
-       ["JPEG2000", "data/byte.jp2", False],
-       ["JP2OpenJPEG", "data/byte_with_xmp.jp2", True],
-       ["JP2OpenJPEG", "data/byte.jp2", False],
-       ["JP2KAK", "data/byte_with_xmp.jp2", True],
-       ["JP2KAK", "data/byte.jp2", False],
-       ["PDF", "data/adobe_style_geospatial_with_xmp.pdf", True],
-       ["PDF", "data/adobe_style_geospatial.pdf", False],
-       ["WEBP", "data/rgbsmall_with_xmp.webp", True],
-       ["WEBP", "data/rgbsmall.webp", False],
-      ]
-
-for drivername, filename, expect_xmp in lst:
-    ut = TestXMPRead(drivername, filename, expect_xmp)
-    gdaltest_list.append((ut.test, "xmp_read_%s_%s" % (drivername, "true" if expect_xmp is True else "false")))
-
-if __name__ == '__main__':
-
-    gdaltest.setup_run('xmp')
-
-    gdaltest.run_tests(gdaltest_list)
-
-    sys.exit(gdaltest.summarize())
+        ds = None
+    finally:
+        if filename.find('.jp2') >= 0:
+            gdaltest.reregister_all_jpeg2000_drivers()
diff --git a/autotest/gdrivers/xpm.py b/autotest/gdrivers/xpm.py
index bc50e91be07d..05b288be4cfc 100755
--- a/autotest/gdrivers/xpm.py
+++ b/autotest/gdrivers/xpm.py
@@ -29,50 +29,38 @@
 ###############################################################################
 
 import sys
-from osgeo import gdal
 
+import pytest
+
+from osgeo import gdal
 
 import gdaltest
 
 
-###############################################################################
-#
-class TestXPM(object):
-    def __init__(self, downloadURL, fileName, checksum, download_size):
-        self.downloadURL = downloadURL
-        self.fileName = fileName
-        self.checksum = checksum
-        self.download_size = download_size
+xpm_list = [('http://download.osgeo.org/gdal/data/xpm', 'utm.xpm', 44206, -1)]
 
-    def test(self):
-        if not gdaltest.download_file(self.downloadURL + '/' + self.fileName, self.fileName, self.download_size):
-            return 'skip'
 
-        ds = gdal.Open('tmp/cache/' + self.fileName)
+@pytest.mark.parametrize(
+    'downloadURL,fileName,checksum,download_size',
+    xpm_list,
+    ids=[item[1] for item in xpm_list],
+)
+def test_xpm(downloadURL, fileName, checksum, download_size):
+    if not gdaltest.download_file(downloadURL + '/' + fileName, fileName, download_size):
+        pytest.skip()
 
-        if ds.GetRasterBand(1).Checksum() != self.checksum:
-            gdaltest.post_reason('Bad checksum. Expected %d, got %d' % (self.checksum, ds.GetRasterBand(1).Checksum()))
-            return 'fail'
+    ds = gdal.Open('tmp/cache/' + fileName)
 
-        return 'success'
+    assert ds.GetRasterBand(1).Checksum() == checksum, 'Bad checksum. Expected %d, got %d' % (checksum, ds.GetRasterBand(1).Checksum())
 
 
 def xpm_1():
-
     tst = gdaltest.GDALTest('XPM', 'byte.tif', 1, 4583)
     return tst.testCreateCopy(vsimem=1, check_minmax=False)
 
 
-gdaltest_list = []
-
-xpm_list = [('http://download.osgeo.org/gdal/data/xpm', 'utm.xpm', 44206, -1),
-            ]
-
-for item in xpm_list:
-    ut = TestXPM(item[0], item[1], item[2], item[3])
-    gdaltest_list.append((ut.test, item[1]))
+gdaltest_list = [xpm_1]
 
-gdaltest_list.append(xpm_1)
 
 if __name__ == '__main__':
 

From 9d6055e76a7c5144c72cca081655b570ba41c3e2 Mon Sep 17 00:00:00 2001
From: Craig de Stigter <craig.destigter@koordinates.com>
Date: Thu, 4 Oct 2018 08:50:53 +1300
Subject: [PATCH 121/488] Refactor leaked FD checks as pytest fixtures

---
 autotest/gdrivers/bag.py    | 30 ++++++++++++++----------------
 autotest/gdrivers/netcdf.py | 32 ++++++++++++--------------------
 2 files changed, 26 insertions(+), 36 deletions(-)

diff --git a/autotest/gdrivers/bag.py b/autotest/gdrivers/bag.py
index d0493710b682..72110d6db5b4 100755
--- a/autotest/gdrivers/bag.py
+++ b/autotest/gdrivers/bag.py
@@ -31,11 +31,24 @@
 ###############################################################################
 
 import sys
-from osgeo import gdal
 
+import pytest
+
+from osgeo import gdal
 
 import gdaltest
 
+
+@pytest.fixture(autouse=True)
+def check_no_file_leaks():
+    num_files = len(gdaltest.get_opened_files())
+
+    yield
+
+    diff = len(gdaltest.get_opened_files()) - num_files
+    assert diff == 0, 'Leak of file handles: %d leaked' % diff
+
+
 ###############################################################################
 # Test if BAG driver is present
 
@@ -46,8 +59,6 @@ def bag_1():
     if gdaltest.bag_drv is None:
         return 'skip'
 
-    gdaltest.count_opened_files = len(gdaltest.get_opened_files())
-
     return 'success'
 
 ###############################################################################
@@ -896,18 +907,6 @@ def bag_write_south_up():
     return 'success'
 
 
-def bag_postcheck():
-
-    if gdaltest.bag_drv is None:
-        return 'skip'
-
-    diff = len(gdaltest.get_opened_files()) - gdaltest.count_opened_files
-    if diff != 0:
-        gdaltest.post_reason('Leak of file handles: %d leaked' % diff)
-        return 'fail'
-
-    return 'success'
-
 gdaltest_list = [bag_1,
                  bag_2,
                  bag_3,
@@ -920,7 +919,6 @@ def bag_postcheck():
                  bag_write_single_band,
                  bag_write_two_bands,
                  bag_write_south_up,
-                 bag_postcheck,
                  ]
 
 if __name__ == '__main__':
diff --git a/autotest/gdrivers/netcdf.py b/autotest/gdrivers/netcdf.py
index 9e2c842cd411..d8563e357bcb 100755
--- a/autotest/gdrivers/netcdf.py
+++ b/autotest/gdrivers/netcdf.py
@@ -40,6 +40,8 @@
 from osgeo import osr
 
 
+import pytest
+
 import gdaltest
 
 import test_cli_utilities
@@ -54,6 +56,16 @@
 # Get netcdf version and test for supported files
 
 
+@pytest.fixture(autouse=True)
+def check_no_file_leaks():
+    num_files = len(gdaltest.get_opened_files())
+
+    yield
+
+    diff = len(gdaltest.get_opened_files()) - num_files
+    assert diff == 0, 'Leak of file handles: %d leaked' % diff
+
+
 def netcdf_setup():
 
     gdaltest.netcdf_drv_version = 'unknown'
@@ -97,8 +109,6 @@ def netcdf_setup():
           '  has_nc2: ' + str(gdaltest.netcdf_drv_has_nc2) + '  has_nc4: ' +
           str(gdaltest.netcdf_drv_has_nc4))
 
-    gdaltest.count_opened_files = len(gdaltest.get_opened_files())
-
     return 'success'
 
 ###############################################################################
@@ -3337,19 +3347,6 @@ def netcdf_uffd():
     return 'success'
 
 
-def netcdf_postcheck():
-
-    if gdaltest.netcdf_drv is None:
-        return 'skip'
-
-    diff = len(gdaltest.get_opened_files()) - gdaltest.count_opened_files
-    if diff != 0:
-        gdaltest.post_reason('Leak of file handles: %d leaked' % diff)
-        return 'fail'
-
-    return 'success'
-
-
 ###############################################################################
 
 ###############################################################################
@@ -3482,8 +3479,6 @@ def netcdf_postcheck():
     gdaltest_list.append((ut.testCreate, item[0]))
     gdaltest_list.append((ut.testSetNoDataValue, item[0]))
 
-gdaltest_list.append(netcdf_postcheck)
-
 ###############################################################################
 #  other tests
 
@@ -3493,7 +3488,4 @@ def netcdf_postcheck():
 
     gdaltest.run_tests(gdaltest_list)
 
-    # make sure we cleanup
-    gdaltest.clean_tmp()
-
     sys.exit(gdaltest.summarize())

From b3c4596330ca425aa5a2539ebb863ab4b9cd6e80 Mon Sep 17 00:00:00 2001
From: Craig de Stigter <craig.destigter@koordinates.com>
Date: Thu, 4 Oct 2018 09:39:59 +1300
Subject: [PATCH 122/488] Add a marker for drivers in tests

---
 autotest/conftest.py      | 21 +++++++++++++++++++++
 autotest/gdrivers/bag.py  | 20 +++++---------------
 autotest/gdrivers/fits.py | 15 +++++++--------
 autotest/gdrivers/hdf5.py |  9 ++-------
 autotest/pytest.ini       |  3 +++
 5 files changed, 38 insertions(+), 30 deletions(-)

diff --git a/autotest/conftest.py b/autotest/conftest.py
index 8c885b42ae73..75eebfef102e 100644
--- a/autotest/conftest.py
+++ b/autotest/conftest.py
@@ -6,6 +6,8 @@
 
 import pytest
 
+import gdal
+
 # Put the pymod dir on the path, so modules can `import gdaltest`
 sys.path.insert(0, os.path.join(os.path.dirname(__file__), "pymod"))
 
@@ -34,3 +36,22 @@ def chdir_to_test_file(request):
     if sys.path and sys.path[0] == ".":
         sys.path.pop(0)
     os.chdir(old)
+
+
+def pytest_collection_modifyitems(config, items):
+    # skip tests with @pytest.mark.require_driver(name) when the driver isn't available
+    skip = pytest.mark.skip("Driver not present")
+    import gdaltest
+
+    drivers_checked = {}
+    for item in items:
+        for mark in item.iter_markers('require_driver'):
+            driver_name = mark.args[0]
+            if driver_name not in drivers_checked:
+                driver = gdal.GetDriverByName(driver_name)
+                drivers_checked[driver_name] = bool(driver)
+                if driver:
+                    # Store the driver on gdaltest module so test functions can assume it's there.
+                    setattr(gdaltest, '%s_drv' % driver_name.lower(), driver)
+            if not drivers_checked[driver_name]:
+                item.add_marker(skip)
diff --git a/autotest/gdrivers/bag.py b/autotest/gdrivers/bag.py
index 72110d6db5b4..583f5b38bab6 100755
--- a/autotest/gdrivers/bag.py
+++ b/autotest/gdrivers/bag.py
@@ -39,6 +39,9 @@
 import gdaltest
 
 
+pytestmark = pytest.mark.require_driver('BAG')
+
+
 @pytest.fixture(autouse=True)
 def check_no_file_leaks():
     num_files = len(gdaltest.get_opened_files())
@@ -49,23 +52,11 @@ def check_no_file_leaks():
     assert diff == 0, 'Leak of file handles: %d leaked' % diff
 
 
-###############################################################################
-# Test if BAG driver is present
-
-
-def bag_1():
-
-    gdaltest.bag_drv = gdal.GetDriverByName('BAG')
-    if gdaltest.bag_drv is None:
-        return 'skip'
-
-    return 'success'
-
 ###############################################################################
 # Confirm various info on true_n_nominal 1.1 sample file.
 
 
-def bag_2():
+def test_bag_2():
 
     if gdaltest.bag_drv is None:
         return 'skip'
@@ -907,8 +898,7 @@ def bag_write_south_up():
     return 'success'
 
 
-gdaltest_list = [bag_1,
-                 bag_2,
+gdaltest_list = [test_bag_2,
                  bag_3,
                  bag_vr_normal,
                  bag_vr_list_supergrids,
diff --git a/autotest/gdrivers/fits.py b/autotest/gdrivers/fits.py
index 605e5506899d..2b33f76823d8 100755
--- a/autotest/gdrivers/fits.py
+++ b/autotest/gdrivers/fits.py
@@ -33,19 +33,16 @@
 from osgeo import gdal
 
 
-@pytest.fixture
-def driver():
-    driver = gdal.GetDriverByName('FITS')
-    if driver is None:
-        pytest.skip()
-    return driver
+pytestmark = pytest.mark.require_driver('FITS')
 
 
 @pytest.mark.parametrize(
     'filename',
     ['byte', 'int16', 'int32', 'float32', 'float64']
 )
-def test_fits(driver, filename):
+def test_fits(filename):
+    driver = gdal.GetDriverByName('FITS')
+
     ds = gdal.Open('../gcore/data/' + filename + '.tif')
     driver.CreateCopy('tmp/' + filename + '.fits', ds, options=['PAGESIZE=2,2'])
 
@@ -58,7 +55,9 @@ def test_fits(driver, filename):
     driver.Delete('tmp/' + filename + '.fits')
 
 
-def fits_metadata(driver):
+def fits_metadata():
+    driver = gdal.GetDriverByName('FITS')
+
     ds = gdal.Open('../gcore/data/byte.tif')
     ds2 = driver.CreateCopy('tmp/byte.fits', ds)
     md = {'TEST': 'test_value'}
diff --git a/autotest/gdrivers/hdf5.py b/autotest/gdrivers/hdf5.py
index eec1d07133eb..0b18b46ac952 100755
--- a/autotest/gdrivers/hdf5.py
+++ b/autotest/gdrivers/hdf5.py
@@ -45,12 +45,7 @@
 # Test if HDF5 driver is present
 
 
-@pytest.fixture
-def driver(autouse=True, scope='module'):
-    driver = gdal.GetDriverByName('HDF5')
-    if driver is None:
-        pytest.skip('No HDF5 driver')
-    return driver
+pytestmark = pytest.mark.require_driver('HDF5')
 
 
 @pytest.fixture(autouse=True)
@@ -564,7 +559,7 @@ def hdf5_virtual_file():
     hdf5_list,
     ids=['HDF5:"' + item[1] + '"://' + item[2] for item in hdf5_list],
 )
-def test_hdf5(driver, downloadURL, fileName, subdatasetname, checksum, download_size):
+def test_hdf5(downloadURL, fileName, subdatasetname, checksum, download_size):
     if not gdaltest.download_file(downloadURL + '/' + fileName, fileName, download_size):
         pytest.skip('no download')
 
diff --git a/autotest/pytest.ini b/autotest/pytest.ini
index c25ef5fa7e75..68ff57b77059 100644
--- a/autotest/pytest.ini
+++ b/autotest/pytest.ini
@@ -1,3 +1,6 @@
 [pytest]
 python_files = *.py
 testpaths = ogr gcore gdrivers osr alg gnm utilities pyscripts
+
+markers =
+    require_driver: Skip test(s) if driver isn't present

From 0ad0018c36fa531f67320e8352508e65826c4e5f Mon Sep 17 00:00:00 2001
From: Craig de Stigter <craig.destigter@koordinates.com>
Date: Thu, 4 Oct 2018 22:59:51 +1300
Subject: [PATCH 123/488] Fix skipif bug

---
 autotest/gdrivers/mrf.py | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/autotest/gdrivers/mrf.py b/autotest/gdrivers/mrf.py
index 35dcc67f7e20..e15fa7385d13 100755
--- a/autotest/gdrivers/mrf.py
+++ b/autotest/gdrivers/mrf.py
@@ -79,11 +79,13 @@ def test_mrf(src_filename, chksum, chksum_after_reopening, options):
     if src_filename == '12bit_rose_extract.jpg':
         import jpeg
         jpeg.jpeg_1()
-        pytest.skipif(gdaltest.jpeg_version == '9b')
+        if gdaltest.jpeg_version == '9b':
+            pytest.skip()
 
     with gdaltest.error_handler():
         ds = gdal.Open('data/' + src_filename)
-    pytest.skipif(ds is None)
+    if ds is None:
+        pytest.skip()
 
     ds = None
     ut = gdaltest.GDALTest('MRF', src_filename, 1, chksum, options=options, chksum_after_reopening=chksum_after_reopening)
@@ -124,8 +126,6 @@ def mrf_zen_test():
             result = 'fail'
         for f in glob.glob('tmp/masked.*'):
             gdal.Unlink(f)
-        if result != 'success':
-            return result
 
     return result
 

From 75c0dc375faabbe7d27d9d9a0eb4a98bd41cf44f Mon Sep 17 00:00:00 2001
From: Craig de Stigter <craig.destigter@koordinates.com>
Date: Thu, 4 Oct 2018 23:11:13 +1300
Subject: [PATCH 124/488] Use pytest in CI

---
 autotest/requirements.txt                     |  2 ++
 .../travis/gcc52_stdcpp14_sanitize/script.sh  | 26 +++++++++++--------
 gdal/ci/travis/mingw_w64/before_install.sh    | 16 +++++++-----
 gdal/ci/travis/mingw_w64/install.sh           |  4 +--
 gdal/ci/travis/mingw_w64/script.sh            | 15 ++++++++++-
 gdal/ci/travis/osx/script.sh                  | 10 +++++--
 gdal/ci/travis/python3/script.sh              | 19 +++++++++-----
 gdal/ci/travis/trusty_32bit/before_install.sh |  1 +
 gdal/ci/travis/trusty_32bit/script.sh         |  7 ++++-
 gdal/ci/travis/trusty_clang/script.sh         | 18 +++++++++----
 gdal/ci/travis/ubuntu_1604/before_install.sh  | 12 ++++++---
 gdal/ci/travis/ubuntu_1604/script.sh          | 10 ++++---
 gdal/ci/travis/ubuntu_1804/script.sh          | 20 +++++++++-----
 13 files changed, 110 insertions(+), 50 deletions(-)
 create mode 100644 autotest/requirements.txt

diff --git a/autotest/requirements.txt b/autotest/requirements.txt
new file mode 100644
index 000000000000..e2f6c9d29d3f
--- /dev/null
+++ b/autotest/requirements.txt
@@ -0,0 +1,2 @@
+pytest>=3,<3.10
+pytest-sugar
diff --git a/gdal/ci/travis/gcc52_stdcpp14_sanitize/script.sh b/gdal/ci/travis/gcc52_stdcpp14_sanitize/script.sh
index 6261ee566cf4..e0671307622c 100755
--- a/gdal/ci/travis/gcc52_stdcpp14_sanitize/script.sh
+++ b/gdal/ci/travis/gcc52_stdcpp14_sanitize/script.sh
@@ -7,6 +7,7 @@ export LD_LIBRARY_PATH=$PWD/install-gcc-5.2.0/lib64
 export PRELOAD=$PWD/install-gcc-5.2.0/lib64/libasan.so.2.0.0:$PWD/install-gcc-5.2.0/lib64/libubsan.so.0.0.0
 #export PRELOAD=$PWD/install-gcc-5.2.0/lib64/libubsan.so.0.0.0
 export ASAN_OPTIONS=allocator_may_return_null=1 
+export PYTEST="pytest -v -p no:sugar --color=no"
 
 cd gdal
 
@@ -33,24 +34,27 @@ cd ../autotest
 #wget http://download.osgeo.org/gdal/data/pgeo/PGeoTest.zip
 #unzip PGeoTest.zip
 #cd ../../..
-# Run ogr_fgdb.py in isolation from the rest
-(cd ogr
- mkdir disabled
- mv ogr_fgdb.* disabled
-)
-# Run ogr_pgeo.py in isolation from the rest
-(cd ogr && mv ogr_pgeo.* disabled)
+# Don't run these
+PYTESTARGS="--ignore ogr/ogr_fgdb.py --ignore ogr/ogr_pgeo.py"
 
 # Too old spatialite version
-(cd ogr && mv ogr_sqlite.* disabled)
-(cd gdrivers && mkdir disabled && mv rasterlite.* disabled)
+PYTESTARGS="$PYTESTARGS --ignore ogr/ogr_sqlite.py --ignore gdrivers/rasterlite.py"
+
+# install test dependencies
+# note: pip 9 is installed on the box, but it hits a strange error after upgrading setuptools.
+# so we install a newer pip first.
+sudo -H pip install -U pip
+sudo -H pip install -U -r ./requirements.txt
 
 # Run all the Python autotests
-SKIP_MEM_INTENSIVE_TEST=YES SKIP_VIRTUALMEM=YES LD_PRELOAD=$PRELOAD ASAN_OPTIONS=detect_leaks=0 GDALTEST_ASAN_OPTIONS=detect_leaks=1,print_suppressions=0,suppressions=$PWD/asan_suppressions.txt python run_all.py -run_as_external
+SKIP_MEM_INTENSIVE_TEST=YES SKIP_VIRTUALMEM=YES LD_PRELOAD=$PRELOAD ASAN_OPTIONS=detect_leaks=0 \
+    GDALTEST_ASAN_OPTIONS=detect_leaks=1,print_suppressions=0,suppressions=$PWD/asan_suppressions.txt \
+    $PYTEST $PYTESTARGS
+
 # A bit messy, but force testing with libspatialite 4.0dev (that has been patched a bit to remove any hard-coded SRS definition so it is very small)
 #cd ogr
 #wget http://s3.amazonaws.com/etc-data.koordinates.com/gdal-travisci/libspatialite4.0dev_ubuntu12.04-64bit_srs_stripped.tar.gz
 #tar xzf libspatialite4.0dev_ubuntu12.04-64bit_srs_stripped.tar.gz
 #ln -s install-libspatialite-4.0dev/lib/libspatialite.so.5.0.1 libspatialite.so.3
-#LD_PRELOAD=$PRELOAD LD_LIBRARY_PATH=$LD_LIBRARY_PATH:$PWD python ogr_sqlite.py
+#LD_PRELOAD=$PRELOAD LD_LIBRARY_PATH=$LD_LIBRARY_PATH:$PWD $PYTEST ogr_sqlite.py
 #cd ..
diff --git a/gdal/ci/travis/mingw_w64/before_install.sh b/gdal/ci/travis/mingw_w64/before_install.sh
index 2deb734238b2..8134a1b1b02f 100755
--- a/gdal/ci/travis/mingw_w64/before_install.sh
+++ b/gdal/ci/travis/mingw_w64/before_install.sh
@@ -5,10 +5,12 @@ set -e
 cat /etc/apt/sources.list
 ls -al /etc/apt/sources.list.d
 sudo apt-get update -qq
-sudo apt-get install ccache
-sudo apt-get install binutils-mingw-w64-x86-64
-sudo apt-get install gcc-mingw-w64-x86-64
-sudo apt-get install g++-mingw-w64-x86-64
-sudo apt-get install g++-mingw-w64
-sudo apt-get install mingw-w64-tools
-sudo apt-get install -y wine1.4-amd64
+sudo apt-get install -y \
+    ccache \
+    binutils-mingw-w64-x86-64 \
+    gcc-mingw-w64-x86-64 \
+    g++-mingw-w64-x86-64 \
+    g++-mingw-w64 \
+    mingw-w64-tools \
+    wine1.4-amd64 \
+    curl
diff --git a/gdal/ci/travis/mingw_w64/install.sh b/gdal/ci/travis/mingw_w64/install.sh
index 47f5a9395828..026c126db2ad 100755
--- a/gdal/ci/travis/mingw_w64/install.sh
+++ b/gdal/ci/travis/mingw_w64/install.sh
@@ -31,8 +31,8 @@ cd ..
 ln -sf $PWD/.libs/libgdal-20.dll $HOME/.wine/drive_c/windows
 ln -sf $PWD/../proj-4.9.2/src/.libs/libproj-9.dll $HOME/.wine/drive_c/windows
 # Python bindings
-wget http://www.python.org/ftp/python/2.7.3/python-2.7.3.amd64.msi
-wine64 msiexec /i python-2.7.3.amd64.msi
+wget https://www.python.org/ftp/python/2.7.15/python-2.7.15.amd64.msi
+wine64 msiexec /i python-2.7.15.amd64.msi
 cd swig/python
 gendef $HOME/.wine/drive_c/Python27/python27.dll
 x86_64-w64-mingw32-dlltool --dllname $HOME/.wine/drive_c/Python27/python27.dll --input-def python27.def --output-lib $HOME/.wine/drive_c/Python27/libs/libpython27.a
diff --git a/gdal/ci/travis/mingw_w64/script.sh b/gdal/ci/travis/mingw_w64/script.sh
index 9758e3046297..d8a42e41d1b0 100755
--- a/gdal/ci/travis/mingw_w64/script.sh
+++ b/gdal/ci/travis/mingw_w64/script.sh
@@ -13,5 +13,18 @@ rm gcore/rfc30.py
 # For some reason this crashes in the matrix .travis.yml but not in standalone branch
 rm pyscripts/test_gdal2tiles.py
 
+export PYTHON_DIR="$HOME/.wine/drive_c/Python27"
+
+# install test dependencies
+curl https://bootstrap.pypa.io/get-pip.py -o get-pip.py
+wine64 "$PYTHON_DIR/python.exe" get-pip.py
+rm get-pip.py
+wine64 "$PYTHON_DIR/Scripts/pip2.7.exe" install -U -r ./requirements.txt
+export PYTEST="wine64 $PYTHON_DIR/Scripts/pytest.exe -v -p no:sugar --color=no"
+
+
 # Run all the Python autotests
-GDAL_DATA=$PWD/../gdal/data PYTHONPATH=$PWD/../gdal/swig/python/build/lib.win-amd64-2.7 PATH=$PWD/../gdal:$PWD/../gdal/apps/.libs:$PWD:$PATH $HOME/.wine/drive_c/Python27/python.exe run_all.py
+GDAL_DATA=$PWD/../gdal/data \
+    PYTHONPATH=$PWD/../gdal/swig/python/build/lib.win-amd64-2.7 \
+    PATH=$PWD/../gdal:$PWD/../gdal/apps/.libs:$PWD:$PATH \
+    $PYTEST
diff --git a/gdal/ci/travis/osx/script.sh b/gdal/ci/travis/osx/script.sh
index 9f43d2014ef1..d18f90e9bd73 100755
--- a/gdal/ci/travis/osx/script.sh
+++ b/gdal/ci/travis/osx/script.sh
@@ -3,12 +3,18 @@
 set -e
 
 export PYTHONPATH=$PWD/gdal/swig/python/build/lib.macosx-10.12-intel-2.7:$PWD/gdal/swig/python/build/lib.macosx-10.11-x86_64-2.7
+export PYTEST="pytest -v -p no:sugar --color=no"
 
 # CPP unit tests
 (cd autotest/cpp && GDAL_SKIP=JP2ECW make quick_test)
 
+# install test dependencies
+sudo -H pip install -U -r autotest/requirements.txt
+
 # Run all the Python autotests
+cd autotest
+$PYTEST
 
 # For some reason, the tests crash at process exit
-(cd autotest; python run_all.py 2>&1 | tee /tmp/log.txt || /bin/true)
-tail /tmp/log.txt | grep "Failed:    0 (0 blew exceptions)"  >/dev/null
+# (cd autotest; $PYTEST 2>&1 | tee /tmp/log.txt || /bin/true)
+# tail /tmp/log.txt | grep "Failed:    0 (0 blew exceptionss)"  >/dev/null
diff --git a/gdal/ci/travis/python3/script.sh b/gdal/ci/travis/python3/script.sh
index 96585bb8c3f1..3d12b0ec5a45 100755
--- a/gdal/ci/travis/python3/script.sh
+++ b/gdal/ci/travis/python3/script.sh
@@ -31,20 +31,25 @@ cd ogr/tmp/cache/
 wget http://download.osgeo.org/gdal/data/pgeo/PGeoTest.zip
 unzip PGeoTest.zip
 cd ../../..
+
+# install test dependencies
+curl -sSL 'https://bootstrap.pypa.io/get-pip.py' | sudo python3
+sudo -H pip3 install -U -r ./requirements.txt
+
+PYTEST="python3 $(which pytest) -v -p no:sugar --color=no"
+
 # Run ogr_fgdb.py in isolation from the rest
+$PYTEST ogr/ogr_fgdb.py
+PYTESTARGS="--ignore ogr/ogr_fgdb.py"
 
-(cd ogr && python3 ogr_fgdb.py)
-(cd ogr && mkdir disabled && mv ogr_fgdb.* disabled)
 # Run ogr_pgeo.py in isolation from the rest
 # This crashes on Trusty since travis-ci upgraded their Trusty workers
 #python ogr_pgeo.py
-(cd ogr && mv ogr_pgeo.* disabled)
+PYTESTARGS="$PYTESTARGS --ignore ogr/ogr_pgeo.py"
 
 # Fails on test_validate_jp2_2 (erros not in expected order)
-(cd gdrivers && mkdir disabled && mv test_validate_jp2.* disabled)
+PYTESTARGS="$PYTESTARGS --ignore gdrivers/test_validate_jp2.py"
 
 # Run all the Python autotests
 
-# For some reason, the tests crash at process exit
-GDAL_SKIP="JP2ECW ECW" python3 run_all.py 2>&1 | tee /tmp/log.txt || /bin/true
-tail /tmp/log.txt | grep "Failed:    0 (0 blew exceptions)"  >/dev/null
+GDAL_SKIP="JP2ECW ECW" $PYTEST $PYTESTARGS
diff --git a/gdal/ci/travis/trusty_32bit/before_install.sh b/gdal/ci/travis/trusty_32bit/before_install.sh
index 6768a39ecb2b..0ad4485f9f57 100755
--- a/gdal/ci/travis/trusty_32bit/before_install.sh
+++ b/gdal/ci/travis/trusty_32bit/before_install.sh
@@ -31,3 +31,4 @@ sudo i386 chroot "$chroot" apt-get install -y --force-yes python-numpy libpng12-
 sudo i386 chroot "$chroot" apt-get install -y make
 sudo i386 chroot "$chroot" apt-get install -y python-dev
 sudo i386 chroot "$chroot" apt-get install -y g++
+sudo i386 chroot "$chroot" apt-get install -y --force-yes curl
diff --git a/gdal/ci/travis/trusty_32bit/script.sh b/gdal/ci/travis/trusty_32bit/script.sh
index a9014fe5a39c..35d99a2d371c 100755
--- a/gdal/ci/travis/trusty_32bit/script.sh
+++ b/gdal/ci/travis/trusty_32bit/script.sh
@@ -4,6 +4,7 @@ set -e
 
 export chroot="$PWD"/buildroot.i386
 export LC_ALL=en_US.utf8
+export PYTEST="pytest -v -p no:sugar --color=no"
 
 i386 chroot "$chroot" sh -c "cd $PWD/autotest/cpp && make quick_test"
 # Compile and test vsipreload
@@ -17,8 +18,12 @@ i386 chroot "$chroot" sh -c "cd $PWD/autotest/cpp && make vsipreload.so"
 
 mv autotest/gcore/vsigs.py autotest/gcore/vsigs.py.disabled
 
+# install pip and use it to install test dependencies
+sudo i386 chroot "$chroot" sh -c "curl -sSL 'https://bootstrap.pypa.io/get-pip.py' | python"
+sudo i386 chroot "$chroot" pip install -U -r "$PWD/autotest/requirements.txt"
+
 # Run all the Python autotests
-i386 chroot "$chroot" sh -c "cd $PWD/autotest && python run_all.py"
+i386 chroot "$chroot" sh -c "cd $PWD/autotest && $PYTEST"
 
 # Run Shellcheck
 shellcheck -e SC2086,SC2046 $(find $PWD/gdal -name '*.sh' -a -not -name ltmain.sh)
diff --git a/gdal/ci/travis/trusty_clang/script.sh b/gdal/ci/travis/trusty_clang/script.sh
index e6378efaca89..20ff2a564bea 100755
--- a/gdal/ci/travis/trusty_clang/script.sh
+++ b/gdal/ci/travis/trusty_clang/script.sh
@@ -6,6 +6,7 @@ set -e
 # Run it in isolation
 export JAVA_HOME=/usr/lib/jvm/java-8-openjdk-amd64
 export PATH=$JAVA_HOME/jre/bin:$PATH
+export PYTEST="pytest -v -p no:sugar --color=no"
 
 cd gdal
 # Perl unit tests
@@ -34,13 +35,20 @@ cd ogr/tmp/cache/
 wget http://download.osgeo.org/gdal/data/pgeo/PGeoTest.zip
 unzip PGeoTest.zip
 cd ../../..
-# Run ogr_fgdb.py in isolation from the rest
+
+# install test dependencies
+sudo -H pip install -U -r ./requirements.txt
+
 export PYTHONPATH=/usr/lib/python2.7/dist-packages
-(cd ogr && python ogr_fgdb.py)
-(cd ogr && mkdir disabled && mv ogr_fgdb.* disabled)
+
+# Run ogr_fgdb.py in isolation from the rest
+$PYTEST ogr/ogr_fgdb.py
+PYTESTARGS="--ignore ogr/ogr_fgdb.py"
+
 # Run ogr_pgeo.py in isolation from the rest
 # This crashes on Trusty since travis-ci upgraded their Trusty workers
 #python ogr_pgeo.py
-(cd ogr && mv ogr_pgeo.* disabled)
+PYTESTARGS="$PYTESTARGS --ignore ogr/ogr_pgeo.py"
+
 # Run all the Python autotests
-GDAL_SKIP="JP2ECW ECW" python run_all.py
+GDAL_SKIP="JP2ECW ECW" $PYTEST $PYTESTARGS
diff --git a/gdal/ci/travis/ubuntu_1604/before_install.sh b/gdal/ci/travis/ubuntu_1604/before_install.sh
index 4be2f75184bc..8673c063c453 100755
--- a/gdal/ci/travis/ubuntu_1604/before_install.sh
+++ b/gdal/ci/travis/ubuntu_1604/before_install.sh
@@ -55,9 +55,13 @@ tar xzf FileGDB_API_1_5_64gcc51.tar.gz
 sudo cp FileGDB_API-64gcc51/lib/* "$chroot/usr/lib"
 sudo chroot "$chroot" ldconfig
 
-sudo chroot "$chroot" apt-get install -y pyflakes3
-chroot "$chroot" sh -c "cd $PWD && pyflakes3 autotest"
-chroot "$chroot" sh -c "cd $PWD && pyflakes3 gdal/swig/python/scripts"
-chroot "$chroot" sh -c "cd $PWD && pyflakes3 gdal/swig/python/samples"
+sudo chroot "$chroot" sh -c "curl -sSL 'https://bootstrap.pypa.io/get-pip.py' | python"
+sudo chroot "$chroot" pip install flake8
+# flake8 codes to just emulate pyflakes (http://flake8.pycqa.org/en/latest/user/error-codes.html)
+FLAKE8="flake8 --select=F401,F402,F403,F404,F405,F406,F407,F601,F602,F621,F622,F631,F701,F702,F703,F704,F705,F706,F707,F721,F722,F811,F812,F821,F822,F823,F831,F841,F901"
+
+chroot "$chroot" sh -c "cd $PWD && $FLAKE8 autotest"
+chroot "$chroot" sh -c "cd $PWD && $FLAKE8 gdal/swig/python/scripts"
+chroot "$chroot" sh -c "cd $PWD && $FLAKE8 gdal/swig/python/samples"
 
 sudo chroot "$chroot" apt-get install -y cppcheck bash
diff --git a/gdal/ci/travis/ubuntu_1604/script.sh b/gdal/ci/travis/ubuntu_1604/script.sh
index 2e34f04cbc17..7a6ed17900ad 100755
--- a/gdal/ci/travis/ubuntu_1604/script.sh
+++ b/gdal/ci/travis/ubuntu_1604/script.sh
@@ -4,17 +4,21 @@ set -e
 
 export chroot="$PWD"/xenial
 export LC_ALL=en_US.utf8
+export PYTEST="pytest -v -p no:sugar --color=no"
 
 chroot "$chroot" sh -c "cd $PWD/autotest/cpp && make quick_test"
 # Compile and test vsipreload
 chroot "$chroot" sh -c "cd $PWD/autotest/cpp && make vsipreload.so"
+
+sudo chroot "$chroot" pip install -U -r "$PWD/autotest/requirements.txt"
+
 # Run all the Python autotests
 
 # Run ogr_fgdb test in isolation due to likely conflict with libxml2
-chroot "$chroot" sh -c "cd $PWD/autotest/ogr && python ogr_fgdb.py && cd ../../.."
+chroot "$chroot" sh -c "cd $PWD/autotest/ogr && $PYTEST ogr_fgdb.py && cd ../../.."
 rm autotest/ogr/ogr_fgdb.py
 
 # for some reason connection to the DB requires sudo chroot
-sudo chroot "$chroot" sh -c "cd $PWD/autotest/ogr && python ogr_mssqlspatial.py && cd ../../.."
+sudo chroot "$chroot" sh -c "cd $PWD/autotest/ogr && $PYTEST ogr_mssqlspatial.py && cd ../../.."
 
-chroot "$chroot" sh -c "cd $PWD/autotest && python run_all.py"
\ No newline at end of file
+chroot "$chroot" sh -c "cd $PWD/autotest && $PYTEST"
\ No newline at end of file
diff --git a/gdal/ci/travis/ubuntu_1804/script.sh b/gdal/ci/travis/ubuntu_1804/script.sh
index aa962a4c283b..ec960477bcab 100755
--- a/gdal/ci/travis/ubuntu_1804/script.sh
+++ b/gdal/ci/travis/ubuntu_1804/script.sh
@@ -4,31 +4,37 @@ set -e
 
 export chroot="$PWD"/bionic
 export LC_ALL=en_US.utf8
+export PYTEST="pytest -v -p no:sugar --color=no"
 
 chroot "$chroot" sh -c "cd $PWD/autotest/cpp && make quick_test"
 # Compile and test vsipreload
 chroot "$chroot" sh -c "cd $PWD/autotest/cpp && make vsipreload.so"
+
+# install pip and use it to install test dependencies
+sudo chroot "$chroot" sh -c "curl -sSL 'https://bootstrap.pypa.io/get-pip.py' | python"
+sudo chroot "$chroot" pip install -U -r "$PWD/autotest/requirements.txt"
+
 # Run all the Python autotests
 
 # Run ogr_fgdb test in isolation due to likely conflict with libxml2
-chroot "$chroot" sh -c "cd $PWD/autotest/ogr && python ogr_fgdb.py && cd ../../.."
+chroot "$chroot" sh -c "cd $PWD/autotest/ogr && $PYTEST ogr_fgdb.py && cd ../../.."
 rm autotest/ogr/ogr_fgdb.py
 
 # MySQL 8
-chroot "$chroot" sh -c "cd $PWD/autotest/ogr && OGR_MYSQL_CONNECTION_STRING=mysql:test,user=root,password=passwd,port=33060,host=127.0.0.1 python ogr_mysql.py"
+chroot "$chroot" sh -c "cd $PWD/autotest/ogr && OGR_MYSQL_CONNECTION_STRING=mysql:test,user=root,password=passwd,port=33060,host=127.0.0.1 $PYTEST ogr_mysql.py"
 # MariaDB 10.3.9
-chroot "$chroot" sh -c "cd $PWD/autotest/ogr && OGR_MYSQL_CONNECTION_STRING=mysql:test,user=root,password=passwd,port=33061,host=127.0.0.1 python ogr_mysql.py"
+chroot "$chroot" sh -c "cd $PWD/autotest/ogr && OGR_MYSQL_CONNECTION_STRING=mysql:test,user=root,password=passwd,port=33061,host=127.0.0.1 $PYTEST ogr_mysql.py"
 
 # PostGIS tests
-chroot "$chroot" sh -c "cd $PWD/autotest/ogr && OGR_PG_CONNECTION_STRING='host=127.0.0.1 port=25432 dbname=autotest user=docker password=docker' python ogr_pg.py"
-chroot "$chroot" sh -c "cd $PWD/autotest/gdrivers && PGHOST=127.0.0.1 PGPORT=25432 PGUSER=docker PGPASSWORD=docker python postgisraster.py"
+chroot "$chroot" sh -c "cd $PWD/autotest/ogr && OGR_PG_CONNECTION_STRING='host=127.0.0.1 port=25432 dbname=autotest user=docker password=docker' $PYTEST ogr_pg.py"
+chroot "$chroot" sh -c "cd $PWD/autotest/gdrivers && PGHOST=127.0.0.1 PGPORT=25432 PGUSER=docker PGPASSWORD=docker $PYTEST postgisraster.py"
 
 # for some reason connection to the DB requires sudo chroot
 # WARNING: unfortunately this doesn't even work from the ubuntu 18.04 chroot, but it
 # does from the ubuntu 16.04 one
-sudo chroot "$chroot" sh -c "cd $PWD/autotest/ogr && python ogr_mssqlspatial.py && cd ../../.."
+sudo chroot "$chroot" sh -c "cd $PWD/autotest/ogr && $PYTEST ogr_mssqlspatial.py && cd ../../.."
 
 # Fails with ERROR 1: OGDI DataSource Open Failed: Could not find the dynamic library "vrf"
 rm autotest/ogr/ogr_ogdi.py
 
-chroot "$chroot" sh -c "cd $PWD/autotest && python run_all.py"
\ No newline at end of file
+chroot "$chroot" sh -c "cd $PWD/autotest && $PYTEST"
\ No newline at end of file

From 1232bb6f7f57eb60440ae41648c96f1585d1d81a Mon Sep 17 00:00:00 2001
From: Craig de Stigter <craig.destigter@koordinates.com>
Date: Fri, 5 Oct 2018 15:49:32 +1300
Subject: [PATCH 125/488] Remove double-parenthesized things in
 gdaltest_list.append calls

Pointless, confuses the auto refactoring code
---
 autotest/gcore/hfa_read.py        |   2 +-
 autotest/gcore/tiff_read.py       | 250 +++++++++++++++---------------
 autotest/gdrivers/jpeg_profile.py |   6 +-
 autotest/gdrivers/png_profile.py  |  10 +-
 autotest/gdrivers/tiff_profile.py |  14 +-
 5 files changed, 141 insertions(+), 141 deletions(-)

diff --git a/autotest/gcore/hfa_read.py b/autotest/gcore/hfa_read.py
index d904e5da6b27..20ab0109a41d 100755
--- a/autotest/gcore/hfa_read.py
+++ b/autotest/gcore/hfa_read.py
@@ -69,7 +69,7 @@ def hfa_read_completedefn_recursion():
     gdaltest_list.append((ut.testOpen, item[0]))
 
 
-gdaltest_list.append((hfa_read_completedefn_recursion))
+gdaltest_list.append(hfa_read_completedefn_recursion)
 
 if __name__ == '__main__':
 
diff --git a/autotest/gcore/tiff_read.py b/autotest/gcore/tiff_read.py
index 9312e50a9c62..82eb4024b937 100755
--- a/autotest/gcore/tiff_read.py
+++ b/autotest/gcore/tiff_read.py
@@ -3860,131 +3860,131 @@ def tiff_read_overview_of_external_mask():
         print('GTiff tests skipped')
         sys.exit()
     gdaltest_list.append((ut.testOpen, item[0]))
-gdaltest_list.append((tiff_read_off))
-gdaltest_list.append((tiff_check_alpha))
-gdaltest_list.append((tiff_read_cmyk_rgba))
-gdaltest_list.append((tiff_read_cmyk_raw))
-gdaltest_list.append((tiff_read_ojpeg))
-gdaltest_list.append((tiff_read_gzip))
-gdaltest_list.append((tiff_read_zip_1))
-gdaltest_list.append((tiff_read_zip_2))
-gdaltest_list.append((tiff_read_zip_3))
-gdaltest_list.append((tiff_read_zip_4))
-gdaltest_list.append((tiff_read_zip_5))
-gdaltest_list.append((tiff_read_tar_1))
-gdaltest_list.append((tiff_read_tar_2))
-gdaltest_list.append((tiff_read_tgz_1))
-gdaltest_list.append((tiff_read_tgz_2))
-gdaltest_list.append((tiff_grads))
-gdaltest_list.append((tiff_citation))
-gdaltest_list.append((tiff_linearparmunits))
-gdaltest_list.append((tiff_linearparmunits2))
-gdaltest_list.append((tiff_g4_split))
-gdaltest_list.append((tiff_multi_images))
-gdaltest_list.append((tiff_vsimem))
-gdaltest_list.append((tiff_vsizip_and_mem))
-gdaltest_list.append((tiff_ProjectedCSTypeGeoKey_only))
-gdaltest_list.append((tiff_GTModelTypeGeoKey_only))
-gdaltest_list.append((tiff_12bitjpeg))
-gdaltest_list.append((tiff_read_stats_from_pam))
-gdaltest_list.append((tiff_read_from_tab))
-gdaltest_list.append((tiff_read_pixelispoint))
-gdaltest_list.append((tiff_read_geomatrix))
-gdaltest_list.append((tiff_read_corrupted_gtiff))
-gdaltest_list.append((tiff_read_tag_without_null_byte))
-gdaltest_list.append((tiff_read_buggy_packbits))
-gdaltest_list.append((tiff_read_rpc_txt))
-gdaltest_list.append((tiff_read_rpc_tif))
-gdaltest_list.append((tiff_small))
-gdaltest_list.append((tiff_dos_strip_chop))
-gdaltest_list.append((tiff_read_exif_and_gps))
-gdaltest_list.append((tiff_jpeg_rgba_pixel_interleaved))
-gdaltest_list.append((tiff_jpeg_rgba_band_interleaved))
-gdaltest_list.append((tiff_read_huge4GB))
-gdaltest_list.append((tiff_read_bigtiff))
-gdaltest_list.append((tiff_read_tiff_metadata))
-gdaltest_list.append((tiff_read_irregular_tile_size_jpeg_in_tiff))
-gdaltest_list.append((tiff_direct_and_virtual_mem_io))
-gdaltest_list.append((tiff_read_empty_nodata_tag))
-gdaltest_list.append((tiff_read_strace_check))
-gdaltest_list.append((tiff_read_readdir_limit_on_open))
-gdaltest_list.append((tiff_read_minisblack_as_rgba))
-gdaltest_list.append((tiff_read_colortable_as_rgba))
-gdaltest_list.append((tiff_read_logl_as_rgba))
-gdaltest_list.append((tiff_read_strip_separate_as_rgba))
-gdaltest_list.append((tiff_read_tiled_separate_as_rgba))
-gdaltest_list.append((tiff_read_scanline_more_than_2GB))
-gdaltest_list.append((tiff_read_wrong_number_extrasamples))
-gdaltest_list.append((tiff_read_one_strip_no_bytecount))
-
-gdaltest_list.append((tiff_read_md1))
-gdaltest_list.append((tiff_read_md2))
-gdaltest_list.append((tiff_read_md3))
-gdaltest_list.append((tiff_read_md4))
-gdaltest_list.append((tiff_read_md5))
-gdaltest_list.append((tiff_read_md6))
-gdaltest_list.append((tiff_read_md7))
-gdaltest_list.append((tiff_read_md8))
-gdaltest_list.append((tiff_read_md9))
-gdaltest_list.append((tiff_read_md10))
-gdaltest_list.append((tiff_read_md11))
-gdaltest_list.append((tiff_read_md12))
-
-gdaltest_list.append((tiff_read_nogeoref))
-gdaltest_list.append((tiff_read_inconsistent_georef))
-gdaltest_list.append((tiff_read_gcp_internal_and_auxxml))
-
-gdaltest_list.append((tiff_read_aux))
-
-gdaltest_list.append((tiff_read_one_band_from_two_bands))
-
-gdaltest_list.append((tiff_read_jpeg_cloud_optimized))
-gdaltest_list.append((tiff_read_corrupted_jpeg_cloud_optimized))
-
-gdaltest_list.append((tiff_read_ycbcr_lzw))
-gdaltest_list.append((tiff_read_ycbcr_int12))
-
-gdaltest_list.append((tiff_read_unit_from_srs))
-gdaltest_list.append((tiff_read_arcgis93_geodataxform_gcp))
-gdaltest_list.append((tiff_read_block_width_above_32bit))
-gdaltest_list.append((tiff_read_image_width_above_32bit))
-gdaltest_list.append((tiff_read_second_image_width_above_32bit))
-gdaltest_list.append((tiff_read_minimum_tiff_tags_no_warning))
-gdaltest_list.append((tiff_read_minimum_tiff_tags_with_warning))
-gdaltest_list.append((tiff_read_unknown_compression))
-gdaltest_list.append((tiff_read_leak_ZIPSetupDecode))
-gdaltest_list.append((tiff_read_excessive_memory_TIFFFillStrip))
-gdaltest_list.append((tiff_read_excessive_memory_TIFFFillStrip2))
-gdaltest_list.append((tiff_read_excessive_memory_TIFFFillTile))
-gdaltest_list.append((tiff_read_big_strip))
-gdaltest_list.append((tiff_read_big_strip_chunky_way))
-gdaltest_list.append((tiff_read_big_tile))
-gdaltest_list.append((tiff_read_huge_tile))
-gdaltest_list.append((tiff_read_huge_number_strips))
-gdaltest_list.append((tiff_read_huge_implied_number_strips))
-gdaltest_list.append((tiff_read_many_blocks))
-gdaltest_list.append((tiff_read_many_blocks_truncated))
-gdaltest_list.append((tiff_read_uint33))
-gdaltest_list.append((tiff_read_corrupted_deflate_singlestrip))
-gdaltest_list.append((tiff_read_packbits_not_enough_data))
-gdaltest_list.append((tiff_read_toomanyblocks))
-gdaltest_list.append((tiff_read_toomanyblocks_separate))
-gdaltest_list.append((tiff_read_size_of_stripbytecount_lower_than_stripcount))
-gdaltest_list.append((tiff_read_stripoffset_types))
-gdaltest_list.append((tiff_read_progressive_jpeg_denial_of_service))
-gdaltest_list.append((tiff_read_old_style_lzw))
-gdaltest_list.append((tiff_read_mmap_interface))
-gdaltest_list.append((tiff_read_jpeg_too_big_last_stripe))
-gdaltest_list.append((tiff_read_negative_scaley))
-gdaltest_list.append((tiff_read_zstd))
-gdaltest_list.append((tiff_read_zstd_corrupted))
-gdaltest_list.append((tiff_read_zstd_corrupted2))
-gdaltest_list.append((tiff_read_1bit_2bands))
-gdaltest_list.append((tiff_read_lerc))
-gdaltest_list.append((tiff_read_overview_of_external_mask))
-
-gdaltest_list.append((tiff_read_online_1))
-gdaltest_list.append((tiff_read_online_2))
+gdaltest_list.append(tiff_read_off)
+gdaltest_list.append(tiff_check_alpha)
+gdaltest_list.append(tiff_read_cmyk_rgba)
+gdaltest_list.append(tiff_read_cmyk_raw)
+gdaltest_list.append(tiff_read_ojpeg)
+gdaltest_list.append(tiff_read_gzip)
+gdaltest_list.append(tiff_read_zip_1)
+gdaltest_list.append(tiff_read_zip_2)
+gdaltest_list.append(tiff_read_zip_3)
+gdaltest_list.append(tiff_read_zip_4)
+gdaltest_list.append(tiff_read_zip_5)
+gdaltest_list.append(tiff_read_tar_1)
+gdaltest_list.append(tiff_read_tar_2)
+gdaltest_list.append(tiff_read_tgz_1)
+gdaltest_list.append(tiff_read_tgz_2)
+gdaltest_list.append(tiff_grads)
+gdaltest_list.append(tiff_citation)
+gdaltest_list.append(tiff_linearparmunits)
+gdaltest_list.append(tiff_linearparmunits2)
+gdaltest_list.append(tiff_g4_split)
+gdaltest_list.append(tiff_multi_images)
+gdaltest_list.append(tiff_vsimem)
+gdaltest_list.append(tiff_vsizip_and_mem)
+gdaltest_list.append(tiff_ProjectedCSTypeGeoKey_only)
+gdaltest_list.append(tiff_GTModelTypeGeoKey_only)
+gdaltest_list.append(tiff_12bitjpeg)
+gdaltest_list.append(tiff_read_stats_from_pam)
+gdaltest_list.append(tiff_read_from_tab)
+gdaltest_list.append(tiff_read_pixelispoint)
+gdaltest_list.append(tiff_read_geomatrix)
+gdaltest_list.append(tiff_read_corrupted_gtiff)
+gdaltest_list.append(tiff_read_tag_without_null_byte)
+gdaltest_list.append(tiff_read_buggy_packbits)
+gdaltest_list.append(tiff_read_rpc_txt)
+gdaltest_list.append(tiff_read_rpc_tif)
+gdaltest_list.append(tiff_small)
+gdaltest_list.append(tiff_dos_strip_chop)
+gdaltest_list.append(tiff_read_exif_and_gps)
+gdaltest_list.append(tiff_jpeg_rgba_pixel_interleaved)
+gdaltest_list.append(tiff_jpeg_rgba_band_interleaved)
+gdaltest_list.append(tiff_read_huge4GB)
+gdaltest_list.append(tiff_read_bigtiff)
+gdaltest_list.append(tiff_read_tiff_metadata)
+gdaltest_list.append(tiff_read_irregular_tile_size_jpeg_in_tiff)
+gdaltest_list.append(tiff_direct_and_virtual_mem_io)
+gdaltest_list.append(tiff_read_empty_nodata_tag)
+gdaltest_list.append(tiff_read_strace_check)
+gdaltest_list.append(tiff_read_readdir_limit_on_open)
+gdaltest_list.append(tiff_read_minisblack_as_rgba)
+gdaltest_list.append(tiff_read_colortable_as_rgba)
+gdaltest_list.append(tiff_read_logl_as_rgba)
+gdaltest_list.append(tiff_read_strip_separate_as_rgba)
+gdaltest_list.append(tiff_read_tiled_separate_as_rgba)
+gdaltest_list.append(tiff_read_scanline_more_than_2GB)
+gdaltest_list.append(tiff_read_wrong_number_extrasamples)
+gdaltest_list.append(tiff_read_one_strip_no_bytecount)
+
+gdaltest_list.append(tiff_read_md1)
+gdaltest_list.append(tiff_read_md2)
+gdaltest_list.append(tiff_read_md3)
+gdaltest_list.append(tiff_read_md4)
+gdaltest_list.append(tiff_read_md5)
+gdaltest_list.append(tiff_read_md6)
+gdaltest_list.append(tiff_read_md7)
+gdaltest_list.append(tiff_read_md8)
+gdaltest_list.append(tiff_read_md9)
+gdaltest_list.append(tiff_read_md10)
+gdaltest_list.append(tiff_read_md11)
+gdaltest_list.append(tiff_read_md12)
+
+gdaltest_list.append(tiff_read_nogeoref)
+gdaltest_list.append(tiff_read_inconsistent_georef)
+gdaltest_list.append(tiff_read_gcp_internal_and_auxxml)
+
+gdaltest_list.append(tiff_read_aux)
+
+gdaltest_list.append(tiff_read_one_band_from_two_bands)
+
+gdaltest_list.append(tiff_read_jpeg_cloud_optimized)
+gdaltest_list.append(tiff_read_corrupted_jpeg_cloud_optimized)
+
+gdaltest_list.append(tiff_read_ycbcr_lzw)
+gdaltest_list.append(tiff_read_ycbcr_int12)
+
+gdaltest_list.append(tiff_read_unit_from_srs)
+gdaltest_list.append(tiff_read_arcgis93_geodataxform_gcp)
+gdaltest_list.append(tiff_read_block_width_above_32bit)
+gdaltest_list.append(tiff_read_image_width_above_32bit)
+gdaltest_list.append(tiff_read_second_image_width_above_32bit)
+gdaltest_list.append(tiff_read_minimum_tiff_tags_no_warning)
+gdaltest_list.append(tiff_read_minimum_tiff_tags_with_warning)
+gdaltest_list.append(tiff_read_unknown_compression)
+gdaltest_list.append(tiff_read_leak_ZIPSetupDecode)
+gdaltest_list.append(tiff_read_excessive_memory_TIFFFillStrip)
+gdaltest_list.append(tiff_read_excessive_memory_TIFFFillStrip2)
+gdaltest_list.append(tiff_read_excessive_memory_TIFFFillTile)
+gdaltest_list.append(tiff_read_big_strip)
+gdaltest_list.append(tiff_read_big_strip_chunky_way)
+gdaltest_list.append(tiff_read_big_tile)
+gdaltest_list.append(tiff_read_huge_tile)
+gdaltest_list.append(tiff_read_huge_number_strips)
+gdaltest_list.append(tiff_read_huge_implied_number_strips)
+gdaltest_list.append(tiff_read_many_blocks)
+gdaltest_list.append(tiff_read_many_blocks_truncated)
+gdaltest_list.append(tiff_read_uint33)
+gdaltest_list.append(tiff_read_corrupted_deflate_singlestrip)
+gdaltest_list.append(tiff_read_packbits_not_enough_data)
+gdaltest_list.append(tiff_read_toomanyblocks)
+gdaltest_list.append(tiff_read_toomanyblocks_separate)
+gdaltest_list.append(tiff_read_size_of_stripbytecount_lower_than_stripcount)
+gdaltest_list.append(tiff_read_stripoffset_types)
+gdaltest_list.append(tiff_read_progressive_jpeg_denial_of_service)
+gdaltest_list.append(tiff_read_old_style_lzw)
+gdaltest_list.append(tiff_read_mmap_interface)
+gdaltest_list.append(tiff_read_jpeg_too_big_last_stripe)
+gdaltest_list.append(tiff_read_negative_scaley)
+gdaltest_list.append(tiff_read_zstd)
+gdaltest_list.append(tiff_read_zstd_corrupted)
+gdaltest_list.append(tiff_read_zstd_corrupted2)
+gdaltest_list.append(tiff_read_1bit_2bands)
+gdaltest_list.append(tiff_read_lerc)
+gdaltest_list.append(tiff_read_overview_of_external_mask)
+
+gdaltest_list.append(tiff_read_online_1)
+gdaltest_list.append(tiff_read_online_2)
 
 gdaltest_list.append((tiff_read_webp))
 gdaltest_list.append((tiff_read_webp_huge_single_strip))
diff --git a/autotest/gdrivers/jpeg_profile.py b/autotest/gdrivers/jpeg_profile.py
index 8a75bb843ff2..13fe6982d721 100755
--- a/autotest/gdrivers/jpeg_profile.py
+++ b/autotest/gdrivers/jpeg_profile.py
@@ -215,9 +215,9 @@ def jpeg_copy_icc_64K():
 ###############################################################################################
 
 
-gdaltest_list.append((jpeg_copy_icc))
-gdaltest_list.append((jpeg_copy_options_icc))
-gdaltest_list.append((jpeg_copy_icc_64K))
+gdaltest_list.append(jpeg_copy_icc)
+gdaltest_list.append(jpeg_copy_options_icc)
+gdaltest_list.append(jpeg_copy_icc_64K)
 
 if __name__ == '__main__':
 
diff --git a/autotest/gdrivers/png_profile.py b/autotest/gdrivers/png_profile.py
index 6ec7dd3a9a2d..30b64709e948 100755
--- a/autotest/gdrivers/png_profile.py
+++ b/autotest/gdrivers/png_profile.py
@@ -365,11 +365,11 @@ def png_sRGB():
 ############################################################################
 
 
-gdaltest_list.append((png_copy_icc))
-gdaltest_list.append((png_copy_options_icc))
-gdaltest_list.append((png_copy_options_colorimetric_data))
-gdaltest_list.append((png_copy_colorimetric_data))
-gdaltest_list.append((png_sRGB))
+gdaltest_list.append(png_copy_icc)
+gdaltest_list.append(png_copy_options_icc)
+gdaltest_list.append(png_copy_options_colorimetric_data)
+gdaltest_list.append(png_copy_colorimetric_data)
+gdaltest_list.append(png_sRGB)
 
 if __name__ == '__main__':
 
diff --git a/autotest/gdrivers/tiff_profile.py b/autotest/gdrivers/tiff_profile.py
index 2e41363e960f..5ec39e65ee60 100755
--- a/autotest/gdrivers/tiff_profile.py
+++ b/autotest/gdrivers/tiff_profile.py
@@ -519,13 +519,13 @@ def tiff_update_colorimetric():
 ############################################################################
 
 
-gdaltest_list.append((tiff_write_icc))
-gdaltest_list.append((tiff_copy_icc))
-gdaltest_list.append((tiff_copy_options_icc))
-gdaltest_list.append((tiff_copy_options_colorimetric_data))
-gdaltest_list.append((tiff_copy_colorimetric_data))
-gdaltest_list.append((tiff_update_icc))
-gdaltest_list.append((tiff_update_colorimetric))
+gdaltest_list.append(tiff_write_icc)
+gdaltest_list.append(tiff_copy_icc)
+gdaltest_list.append(tiff_copy_options_icc)
+gdaltest_list.append(tiff_copy_options_colorimetric_data)
+gdaltest_list.append(tiff_copy_colorimetric_data)
+gdaltest_list.append(tiff_update_icc)
+gdaltest_list.append(tiff_update_colorimetric)
 
 if __name__ == '__main__':
 

From 9b42234b08ad21614d1d77443d3616271f7f2032 Mon Sep 17 00:00:00 2001
From: Craig de Stigter <craig.destigter@koordinates.com>
Date: Fri, 5 Oct 2018 21:37:13 +1300
Subject: [PATCH 126/488] Use pytest parametrize for dynamically generated
 tests

---
 autotest/gcore/aaigrid_read.py  |  34 +++---
 autotest/gcore/aaigrid_write.py |  41 +++----
 autotest/gcore/bmp_read.py      |  27 +++--
 autotest/gcore/bmp_write.py     |  36 ++++--
 autotest/gcore/envi_read.py     |  40 ++++---
 autotest/gcore/gtiff_write.py   |  75 ++++++------
 autotest/gcore/hdf4_read.py     |  52 ++++----
 autotest/gcore/hdf4_write.py    |  77 +++++-------
 autotest/gcore/hfa_read.py      |  39 +++---
 autotest/gcore/hfa_write.py     | 117 +++++++++++-------
 autotest/gcore/pnm_read.py      |  35 +++---
 autotest/gcore/pnm_write.py     |  41 ++++---
 autotest/gcore/tiff_ovr.py      | 205 ++++++++++++--------------------
 autotest/gcore/tiff_read.py     |  74 +++++++-----
 autotest/gcore/vrt_read.py      | 127 +++++++++++---------
 autotest/gdrivers/gta.py        |  49 ++++----
 autotest/gdrivers/netcdf.py     |  58 +++++----
 autotest/ogr/ogr_gml_geom.py    |  53 ++++-----
 autotest/ogr/ogr_wkbwkt_geom.py | 124 ++++++++++---------
 autotest/osr/osr_ct_proj.py     | 197 ++++++++++++++----------------
 autotest/osr/osr_metacrs.py     | 128 +++++++++-----------
 21 files changed, 802 insertions(+), 827 deletions(-)

diff --git a/autotest/gcore/aaigrid_read.py b/autotest/gcore/aaigrid_read.py
index cda5cd771321..fe3adea4a01a 100755
--- a/autotest/gcore/aaigrid_read.py
+++ b/autotest/gcore/aaigrid_read.py
@@ -25,30 +25,24 @@
 # Boston, MA 02111-1307, USA.
 ###############################################################################
 
-import sys
-
+import pytest
 
 import gdaltest
 
 ###############################################################################
 # When imported build a list of units based on the files available.
 
-gdaltest_list = []
-
 init_list = [
-    ('byte.tif.grd', 1, 4672, None)]
-
-for item in init_list:
-    ut = gdaltest.GDALTest('AAIGrid', item[0], item[1], item[2])
-    if ut is None:
-        print('AAIGrid tests skipped')
-        sys.exit()
-    gdaltest_list.append((ut.testOpen, item[0]))
-
-if __name__ == '__main__':
-
-    gdaltest.setup_run('aaigrid_read')
-
-    gdaltest.run_tests(gdaltest_list)
-
-    sys.exit(gdaltest.summarize())
+    ('byte.tif.grd', 4672),
+]
+
+
+@pytest.mark.parametrize(
+    'filename,checksum',
+    init_list,
+    ids=[tup[0].split('.')[0] for tup in init_list],
+)
+@pytest.mark.require_driver('AAIGrid')
+def test_aaigrid_open(filename, checksum):
+    ut = gdaltest.GDALTest('AAIGrid', filename, 1, checksum)
+    ut.testOpen()
diff --git a/autotest/gcore/aaigrid_write.py b/autotest/gcore/aaigrid_write.py
index ad78630a7a0d..5a3b784cb83b 100755
--- a/autotest/gcore/aaigrid_write.py
+++ b/autotest/gcore/aaigrid_write.py
@@ -26,34 +26,27 @@
 # Boston, MA 02111-1307, USA.
 ###############################################################################
 
-import sys
-
+import pytest
 
 import gdaltest
 
 ###############################################################################
 # When imported build a list of units based on the files available.
 
-gdaltest_list = []
-
 init_list = [
-    ('byte.tif', 1, 4672, None),
-    ('int16.tif', 1, 4672, None),
-    ('uint16.tif', 1, 4672, None),
-    ('float32.tif', 1, 4672, None),
-    ('utmsmall.tif', 1, 50054, None)]
-
-for item in init_list:
-    ut = gdaltest.GDALTest('AAIGrid', item[0], item[1], item[2])
-    if ut is None:
-        print('AAIGrid tests skipped')
-        sys.exit()
-    gdaltest_list.append((ut.testCreateCopy, item[0]))
-
-if __name__ == '__main__':
-
-    gdaltest.setup_run('aaigrid_write')
-
-    gdaltest.run_tests(gdaltest_list)
-
-    sys.exit(gdaltest.summarize())
+    ('byte.tif', 4672),
+    ('int16.tif', 4672),
+    ('uint16.tif', 4672),
+    ('float32.tif', 4672),
+    ('utmsmall.tif', 50054)]
+
+
+@pytest.mark.parametrize(
+    'filename,checksum',
+    init_list,
+    ids=[tup[0].split('.')[0] for tup in init_list],
+)
+@pytest.mark.require_driver('AAIGrid')
+def test_aaigrid_create(filename, checksum):
+    ut = gdaltest.GDALTest('AAIGrid', filename, 1, checksum)
+    ut.testCreateCopy()
diff --git a/autotest/gcore/bmp_read.py b/autotest/gcore/bmp_read.py
index 074b9ce9397e..da95e519a692 100755
--- a/autotest/gcore/bmp_read.py
+++ b/autotest/gcore/bmp_read.py
@@ -28,6 +28,7 @@
 
 import sys
 
+import pytest
 
 import gdaltest
 
@@ -37,10 +38,21 @@
 gdaltest_list = []
 
 init_list = [
-    ('1bit.bmp', 1, 200, None),
-    ('4bit_pal.bmp', 1, 2587, None),
-    ('8bit_pal.bmp', 1, 4672, None),
-    ('byte_rle8.bmp', 1, 4672, None)]
+    ('1bit.bmp', 200),
+    ('4bit_pal.bmp', 2587),
+    ('8bit_pal.bmp', 4672),
+    ('byte_rle8.bmp', 4672)]
+
+
+@pytest.mark.parametrize(
+    'filename,checksum',
+    init_list,
+    ids=[tup[0].split('.')[0] for tup in init_list],
+)
+@pytest.mark.require_driver('BMP')
+def test_bmp_open(filename, checksum):
+    ut = gdaltest.GDALTest('BMP', filename, 1, checksum)
+    ut.testOpen()
 
 
 def bmp_online_1():
@@ -65,13 +77,6 @@ def bmp_online_2():
     return tst.testOpen()
 
 
-for item in init_list:
-    ut = gdaltest.GDALTest('BMP', item[0], item[1], item[2])
-    if ut is None:
-        print('BMP tests skipped')
-        sys.exit()
-    gdaltest_list.append((ut.testOpen, item[0]))
-
 gdaltest_list.append(bmp_online_1)
 gdaltest_list.append(bmp_online_2)
 
diff --git a/autotest/gcore/bmp_write.py b/autotest/gcore/bmp_write.py
index b2d842d29ec7..35da731b5319 100755
--- a/autotest/gcore/bmp_write.py
+++ b/autotest/gcore/bmp_write.py
@@ -29,6 +29,7 @@
 
 import sys
 
+import pytest
 
 import gdaltest
 
@@ -48,20 +49,29 @@ def bmp_vsimem():
 
 gdaltest_list = [bmp_vsimem]
 
+
 init_list = [
-    ('byte.tif', 1, 4672, None),
-    ('utmsmall.tif', 1, 50054, None),
-    ('8bit_pal.bmp', 1, 4672, None), ]
-
-for item in init_list:
-    ut = gdaltest.GDALTest('BMP', item[0], item[1], item[2])
-    if ut is None:
-        print('BMP tests skipped')
-        sys.exit()
-    gdaltest_list.append((ut.testCreateCopy, item[0]))
-    gdaltest_list.append((ut.testCreate, item[0]))
-
-gdaltest_list.append((gdaltest.clean_tmp, 'bmp_cleanup'))
+    ('byte.tif', 4672),
+    ('utmsmall.tif', 50054),
+    ('8bit_pal.bmp', 4672), ]
+
+
+@pytest.mark.parametrize(
+    'filename,checksum',
+    init_list,
+    ids=[tup[0].split('.')[0] for tup in init_list],
+)
+@pytest.mark.parametrize(
+    'testfunction', [
+        'testCreateCopy',
+        'testCreate',
+    ]
+)
+@pytest.mark.require_driver('BMP')
+def test_bmp_create(filename, checksum, testfunction):
+    ut = gdaltest.GDALTest('BMP', filename, 1, checksum)
+    getattr(ut, testfunction)()
+
 
 if __name__ == '__main__':
 
diff --git a/autotest/gcore/envi_read.py b/autotest/gcore/envi_read.py
index 99ac328eabea..ef620ff044f1 100755
--- a/autotest/gcore/envi_read.py
+++ b/autotest/gcore/envi_read.py
@@ -29,6 +29,7 @@
 
 import sys
 
+import pytest
 
 from osgeo import gdal
 import gdaltest
@@ -59,23 +60,28 @@ def envi_1():
 gdaltest_list = []
 
 init_list = [
-    ('byte.raw', 1, 4672, None),
-    ('int16.raw', 1, 4672, None),
-    ('uint16.raw', 1, 4672, None),
-    ('int32.raw', 1, 4672, None),
-    ('uint32.raw', 1, 4672, None),
-    ('float32.raw', 1, 4672, None),
-    ('float64.raw', 1, 4672, None)]
-#    ('cfloat32.raw', 1, 5028, None),
-#    ('cfloat64.raw', 1, 5028, None)]
-
-
-for item in init_list:
-    ut = gdaltest.GDALTest('ENVI', item[0], item[1], item[2])
-    if ut is None:
-        print('ENVI tests skipped')
-        sys.exit()
-    gdaltest_list.append((ut.testOpen, item[0]))
+    ('byte.raw', 4672),
+    ('int16.raw', 4672),
+    ('uint16.raw', 4672),
+    ('int32.raw', 4672),
+    ('uint32.raw', 4672),
+    ('float32.raw', 4672),
+    ('float64.raw', 4672),
+    # ('cfloat32.raw', 5028),
+    # ('cfloat64.raw', 5028),
+]
+
+
+@pytest.mark.parametrize(
+    'filename,checksum',
+    init_list,
+    ids=[tup[0].split('.')[0] for tup in init_list],
+)
+@pytest.mark.require_driver('ENVI')
+def test_envi_open(filename, checksum):
+    ut = gdaltest.GDALTest('ENVI', filename, 1, checksum)
+    ut.testOpen()
+
 
 gdaltest_list.append(envi_1)
 
diff --git a/autotest/gcore/gtiff_write.py b/autotest/gcore/gtiff_write.py
index 0997de9bdcfa..bf7f7a887229 100755
--- a/autotest/gcore/gtiff_write.py
+++ b/autotest/gcore/gtiff_write.py
@@ -25,47 +25,52 @@
 # Boston, MA 02111-1307, USA.
 ###############################################################################
 
-import sys
-
+import pytest
 
 import gdaltest
 
 init_list = [
-    ('byte.tif', 1, 4672, None),
-    ('int16.tif', 1, 4672, None),
-    ('uint16.tif', 1, 4672, None),
-    ('int32.tif', 1, 4672, None),
-    ('uint32.tif', 1, 4672, None),
-    ('float32.tif', 1, 4672, None),
-    ('float64.tif', 1, 4672, None),
-    ('cint16.tif', 1, 5028, None),
-    ('cint32.tif', 1, 5028, None),
-    ('cfloat32.tif', 1, 5028, None),
-    ('cfloat64.tif', 1, 5028, None)]
+    ('byte.tif', 4672),
+    ('int16.tif', 4672),
+    ('uint16.tif', 4672),
+    ('int32.tif', 4672),
+    ('uint32.tif', 4672),
+    ('float32.tif', 4672),
+    ('float64.tif', 4672),
+    ('cint16.tif', 5028),
+    ('cint32.tif', 5028),
+    ('cfloat32.tif', 5028),
+    ('cfloat64.tif', 5028)]
 
-gdaltest_list = []
 
 # Some tests we don't need to do for each type.
-item = init_list[0]
-ut = gdaltest.GDALTest('GTiff', item[0], item[1], item[2])
-gdaltest_list.append((ut.testSetGeoTransform, item[0]))
-gdaltest_list.append((ut.testSetProjection, item[0]))
-gdaltest_list.append((ut.testSetMetadata, item[0]))
-
-# Others we do for each pixel type.
-for item in init_list:
-    ut = gdaltest.GDALTest('GTiff', item[0], item[1], item[2])
-    if ut is None:
-        print('GTiff tests skipped')
-    gdaltest_list.append((ut.testCreateCopy, item[0]))
-    gdaltest_list.append((ut.testCreate, item[0]))
-    gdaltest_list.append((ut.testSetNoDataValue, item[0]))
-
+@pytest.mark.parametrize(
+    'testfunction', [
+        'testSetGeoTransform',
+        'testSetProjection',
+        'testSetMetadata',
+    ]
+)
+@pytest.mark.require_driver('GTiff')
+def test_gtiff_set(testfunction):
+    ut = gdaltest.GDALTest('GTiff', 'byte.tif', 1, 4672)
+    getattr(ut, testfunction)()
 
-if __name__ == '__main__':
 
-    gdaltest.setup_run('gtiff_write')
-
-    gdaltest.run_tests(gdaltest_list)
-
-    sys.exit(gdaltest.summarize())
+# Others we do for each pixel type.
+@pytest.mark.parametrize(
+    'filename,checksum',
+    init_list,
+    ids=[tup[0].split('.')[0] for tup in init_list],
+)
+@pytest.mark.parametrize(
+    'testfunction', [
+        'testCreateCopy',
+        'testCreate',
+        'testSetNoDataValue',
+    ]
+)
+@pytest.mark.require_driver('GTiff')
+def test_gtiff_create(filename, checksum, testfunction):
+    ut = gdaltest.GDALTest('GTiff', filename, 1, checksum)
+    getattr(ut, testfunction)()
diff --git a/autotest/gcore/hdf4_read.py b/autotest/gcore/hdf4_read.py
index ed37cdd94538..1ba71e4174c1 100755
--- a/autotest/gcore/hdf4_read.py
+++ b/autotest/gcore/hdf4_read.py
@@ -28,6 +28,7 @@
 
 import sys
 
+import pytest
 
 import gdaltest
 from osgeo import gdal
@@ -38,22 +39,34 @@
 gdaltest_list = []
 
 init_list = [
-    ('byte_3.hdf', 1, 4672, None),
-    ('int16_3.hdf', 1, 4672, None),
-    ('uint16_3.hdf', 1, 4672, None),
-    ('int32_3.hdf', 1, 4672, None),
-    ('uint32_3.hdf', 1, 4672, None),
-    ('float32_3.hdf', 1, 4672, None),
-    ('float64_3.hdf', 1, 4672, None),
-    ('utmsmall_3.hdf', 1, 50054, None),
-    ('byte_2.hdf', 1, 4672, None),
-    ('int16_2.hdf', 1, 4672, None),
-    ('uint16_2.hdf', 1, 4672, None),
-    ('int32_2.hdf', 1, 4672, None),
-    ('uint32_2.hdf', 1, 4672, None),
-    ('float32_2.hdf', 1, 4672, None),
-    ('float64_2.hdf', 1, 4672, None),
-    ('utmsmall_2.hdf', 1, 50054, None)]
+    ('byte_3.hdf', 4672),
+    ('int16_3.hdf', 4672),
+    ('uint16_3.hdf', 4672),
+    ('int32_3.hdf', 4672),
+    ('uint32_3.hdf', 4672),
+    ('float32_3.hdf', 4672),
+    ('float64_3.hdf', 4672),
+    ('utmsmall_3.hdf', 50054),
+    ('byte_2.hdf', 4672),
+    ('int16_2.hdf', 4672),
+    ('uint16_2.hdf', 4672),
+    ('int32_2.hdf', 4672),
+    ('uint32_2.hdf', 4672),
+    ('float32_2.hdf', 4672),
+    ('float64_2.hdf', 4672),
+    ('utmsmall_2.hdf', 50054)]
+
+
+@pytest.mark.parametrize(
+    'filename,checksum',
+    init_list,
+    ids=[tup[0].split('.')[0] for tup in init_list],
+)
+@pytest.mark.require_driver('HDF4Image')
+def test_hdf4_open(filename, checksum):
+    ut = gdaltest.GDALTest('HDF4Image', filename, 1, checksum)
+    ut.testOpen()
+
 
 ###############################################################################
 # Test HDF4_SDS with single subdataset
@@ -359,13 +372,6 @@ def hdf4_read_online_10():
     return 'success'
 
 
-for item in init_list:
-    ut = gdaltest.GDALTest('HDF4Image', item[0], item[1], item[2])
-    if ut is None:
-        print('HDF4 tests skipped')
-        sys.exit()
-    gdaltest_list.append((ut.testOpen, item[0]))
-
 gdaltest_list.append(hdf4_read_online_1)
 gdaltest_list.append(hdf4_read_online_2)
 gdaltest_list.append(hdf4_read_online_3)
diff --git a/autotest/gcore/hdf4_write.py b/autotest/gcore/hdf4_write.py
index a75f68c3ffbf..e46cfdc2bf8e 100755
--- a/autotest/gcore/hdf4_write.py
+++ b/autotest/gcore/hdf4_write.py
@@ -25,50 +25,39 @@
 # Boston, MA 02111-1307, USA.
 ###############################################################################
 
-import sys
-
-
+import pytest
 import gdaltest
 
 init_list = [
-    ('byte.tif', 1, 4672, None),
-    ('int16.tif', 1, 4672, None),
-    ('uint16.tif', 1, 4672, None),
-    ('int32.tif', 1, 4672, None),
-    ('uint32.tif', 1, 4672, None),
-    ('float32.tif', 1, 4672, None),
-    ('float64.tif', 1, 4672, None),
-    ('utmsmall.tif', 1, 50054, None)]
-
-gdaltest_list = []
-
-for item in init_list:
-    ut = gdaltest.GDALTest('HDF4Image', item[0], item[1], item[2],
-                           options=['RANK=3'])
-    if ut is None:
-        print('HDF4 tests skipped')
-    gdaltest_list.append((ut.testCreateCopy, item[0] + " rank=3"))
-    gdaltest_list.append((ut.testCreate, item[0] + " rank=3"))
-    gdaltest_list.append((ut.testSetGeoTransform, item[0] + " rank=3"))
-    gdaltest_list.append((ut.testSetProjection, item[0] + " rank=3"))
-    gdaltest_list.append((ut.testSetMetadata, item[0] + " rank=3"))
-    gdaltest_list.append((ut.testSetNoDataValue, item[0] + " rank=3"))
-    gdaltest_list.append((ut.testSetDescription, item[0] + " rank=3"))
-    ut = gdaltest.GDALTest('HDF4Image', item[0], item[1], item[2],
-                           options=['RANK=2'])
-    if ut is None:
-        print('HDF4 tests skipped')
-    gdaltest_list.append((ut.testCreateCopy, item[0] + " rank=2"))
-    gdaltest_list.append((ut.testSetGeoTransform, item[0] + " rank=2"))
-    gdaltest_list.append((ut.testSetProjection, item[0] + " rank=2"))
-    gdaltest_list.append((ut.testSetMetadata, item[0] + " rank=2"))
-    gdaltest_list.append((ut.testSetNoDataValue, item[0] + " rank=2"))
-    gdaltest_list.append((ut.testSetDescription, item[0] + " rank=2"))
-
-if __name__ == '__main__':
-
-    gdaltest.setup_run('hdf_write')
-
-    gdaltest.run_tests(gdaltest_list)
-
-    sys.exit(gdaltest.summarize())
+    ('byte.tif', 4672),
+    ('int16.tif', 4672),
+    ('uint16.tif', 4672),
+    ('int32.tif', 4672),
+    ('uint32.tif', 4672),
+    ('float32.tif', 4672),
+    ('float64.tif', 4672),
+    ('utmsmall.tif', 50054)
+]
+
+
+@pytest.mark.parametrize(
+    'rank', [2, 3], ids=lambda x: 'rank%d' % x
+)
+@pytest.mark.parametrize(
+    'filename,checksum', init_list, ids=[arg[0].split('.')[0] for arg in init_list]
+)
+@pytest.mark.parametrize(
+    'testfunction', [
+        'testCreateCopy',
+        'testCreate',
+        'testSetGeoTransform',
+        'testSetProjection',
+        'testSetMetadata',
+        'testSetNoDataValue',
+        'testSetDescription',
+    ]
+)
+@pytest.mark.require_driver('HDF4Image')
+def test_hdf4_write(filename, checksum, testfunction, rank):
+    ut = gdaltest.GDALTest('HDF4Image', filename, 1, checksum, options=['RANK=%d' % rank])
+    getattr(ut, testfunction)()
diff --git a/autotest/gcore/hfa_read.py b/autotest/gcore/hfa_read.py
index 20ab0109a41d..f572ddb5ca0d 100755
--- a/autotest/gcore/hfa_read.py
+++ b/autotest/gcore/hfa_read.py
@@ -30,6 +30,7 @@
 
 import sys
 
+import pytest
 
 from osgeo import gdal
 import gdaltest
@@ -40,16 +41,26 @@
 gdaltest_list = []
 
 init_list = [
-    ('byte.img', 1, 4672, None),
-    ('int16.img', 1, 4672, None),
-    ('uint16.img', 1, 4672, None),
-    ('int32.img', 1, 4672, None),
-    ('uint32.img', 1, 4672, None),
-    ('float32.img', 1, 4672, None),
-    ('float64.img', 1, 4672, None),
-    ('utmsmall.img', 1, 50054, None),
-    ('2bit_compressed.img', 1, 11918, None)]
-
+    ('byte.img', 4672),
+    ('int16.img', 4672),
+    ('uint16.img', 4672),
+    ('int32.img', 4672),
+    ('uint32.img', 4672),
+    ('float32.img', 4672),
+    ('float64.img', 4672),
+    ('utmsmall.img', 50054),
+    ('2bit_compressed.img', 11918)]
+
+
+@pytest.mark.parametrize(
+    'filename,checksum',
+    init_list,
+    ids=[tup[0].split('.')[0] for tup in init_list],
+)
+@pytest.mark.require_driver('HFA')
+def test_hfa_open(filename, checksum):
+    ut = gdaltest.GDALTest('HFA', filename, 1, checksum)
+    ut.testOpen()
 
 ###############################################################################
 # Test bugfix for https://oss-fuzz.com/v2/testcase-detail/6053338875428864
@@ -61,14 +72,6 @@ def hfa_read_completedefn_recursion():
     return 'success'
 
 
-for item in init_list:
-    ut = gdaltest.GDALTest('HFA', item[0], item[1], item[2])
-    if ut is None:
-        print('HFA tests skipped')
-        sys.exit()
-    gdaltest_list.append((ut.testOpen, item[0]))
-
-
 gdaltest_list.append(hfa_read_completedefn_recursion)
 
 if __name__ == '__main__':
diff --git a/autotest/gcore/hfa_write.py b/autotest/gcore/hfa_write.py
index 5b63ccb3ab19..2abc40331094 100755
--- a/autotest/gcore/hfa_write.py
+++ b/autotest/gcore/hfa_write.py
@@ -33,8 +33,10 @@
 import os
 import sys
 import shutil
-from osgeo import gdal
 
+import pytest
+
+from osgeo import gdal
 
 import gdaltest
 
@@ -402,16 +404,77 @@ def hfa_write_invalid_wkt():
 
 
 init_list = [
-    ('byte.tif', 1, 4672, None),
-    ('int16.tif', 1, 4672, None),
-    ('uint16.tif', 1, 4672, None),
-    ('int32.tif', 1, 4672, None),
-    ('uint32.tif', 1, 4672, None),
-    ('float32.tif', 1, 4672, None),
-    ('float64.tif', 1, 4672, None),
-    ('cfloat32.tif', 1, 5028, None),
-    ('cfloat64.tif', 1, 5028, None),
-    ('utmsmall.tif', 1, 50054, None)]
+    ('byte.tif', 4672),
+    ('int16.tif', 4672),
+    ('uint16.tif', 4672),
+    ('int32.tif', 4672),
+    ('uint32.tif', 4672),
+    ('float32.tif', 4672),
+    ('float64.tif', 4672),
+    ('cfloat32.tif', 5028),
+    ('cfloat64.tif', 5028),
+    ('utmsmall.tif', 50054)]
+
+# full set of tests for normal mode.
+
+@pytest.mark.parametrize(
+    'filename,checksum',
+    init_list,
+    ids=[tup[0].split('.')[0] for tup in init_list],
+)
+@pytest.mark.parametrize(
+    'testfunction', [
+        'testCreateCopy',
+        'testCreate',
+        'testSetGeoTransform',
+        'testSetMetadata',
+    ]
+)
+@pytest.mark.require_driver('HFA')
+def test_hfa_create_normal(filename, checksum, testfunction):
+    ut = gdaltest.GDALTest('HFA', filename, 1, checksum)
+    getattr(ut, testfunction)()
+
+
+# Just a few for spill file, and compressed support.
+short_list = [
+    ('byte.tif', 4672),
+    ('uint16.tif', 4672),
+    ('float64.tif', 4672)]
+
+@pytest.mark.parametrize(
+    'filename,checksum',
+    short_list,
+    ids=[tup[0].split('.')[0] for tup in short_list],
+)
+@pytest.mark.parametrize(
+    'testfunction', [
+        'testCreateCopy',
+        'testCreate',
+    ]
+)
+@pytest.mark.require_driver('HFA')
+def test_hfa_create_spill(filename, checksum, testfunction):
+    ut = gdaltest.GDALTest('HFA', filename, 1, checksum, options=['USE_SPILL=YES'])
+    getattr(ut, testfunction)()
+
+
+@pytest.mark.parametrize(
+    'filename,checksum',
+    short_list,
+    ids=[tup[0].split('.')[0] for tup in short_list],
+)
+@pytest.mark.parametrize(
+    'testfunction', [
+        # 'testCreateCopy',
+        'testCreate',
+    ]
+)
+@pytest.mark.require_driver('HFA')
+def test_hfa_create_compress(filename, checksum, testfunction):
+    ut = gdaltest.GDALTest('HFA', filename, 1, checksum, options=['COMPRESS=YES'])
+    getattr(ut, testfunction)()
+
 
 gdaltest_list = [hfa_write_desc,
                  hfa_write_4bit,
@@ -424,38 +487,6 @@ def hfa_write_invalid_wkt():
                  hfa_update_existing_aux_overviews,
                  hfa_write_invalid_wkt]
 
-# full set of tests for normal mode.
-
-for item in init_list:
-    ut1 = gdaltest.GDALTest('HFA', item[0], item[1], item[2])
-    if ut1 is None:
-        print('HFA tests skipped')
-    gdaltest_list.append((ut1.testCreateCopy, item[0]))
-    gdaltest_list.append((ut1.testCreate, item[0]))
-    gdaltest_list.append((ut1.testSetGeoTransform, item[0]))
-    gdaltest_list.append((ut1.testSetMetadata, item[0]))
-
-# Just a few for spill file, and compressed support.
-short_list = [
-    ('byte.tif', 1, 4672, None),
-    ('uint16.tif', 1, 4672, None),
-    ('float64.tif', 1, 4672, None)]
-
-for item in short_list:
-    ut2 = gdaltest.GDALTest('HFA', item[0], item[1], item[2],
-                            options=['USE_SPILL=YES'])
-    if ut2 is None:
-        print('HFA tests skipped')
-    gdaltest_list.append((ut2.testCreateCopy, item[0] + ' (spill)'))
-    gdaltest_list.append((ut2.testCreate, item[0] + ' (spill)'))
-
-    ut2 = gdaltest.GDALTest('HFA', item[0], item[1], item[2],
-                            options=['COMPRESS=YES'])
-    if ut2 is None:
-        print('HFA tests skipped')
-#    gdaltest_list.append( (ut2.testCreateCopy, item[0] + ' (compressed)') )
-    gdaltest_list.append((ut2.testCreate, item[0] + ' (compressed)'))
-
 
 if __name__ == '__main__':
 
diff --git a/autotest/gcore/pnm_read.py b/autotest/gcore/pnm_read.py
index 7857312ab410..c5d8ab41cb24 100755
--- a/autotest/gcore/pnm_read.py
+++ b/autotest/gcore/pnm_read.py
@@ -28,31 +28,24 @@
 # DEALINGS IN THE SOFTWARE.
 ###############################################################################
 
-import sys
-
+import pytest
 
 import gdaltest
 
 ###############################################################################
 # When imported build a list of units based on the files available.
 
-gdaltest_list = []
-
 init_list = [
-    ('byte.pnm', 1, 4672, None),
-    ('uint16.pnm', 1, 4672, None)]
-
-for item in init_list:
-    ut = gdaltest.GDALTest('PNM', item[0], item[1], item[2])
-    if ut is None:
-        print('PNM tests skipped')
-        sys.exit()
-    gdaltest_list.append((ut.testOpen, item[0]))
-
-if __name__ == '__main__':
-
-    gdaltest.setup_run('pnm_read')
-
-    gdaltest.run_tests(gdaltest_list)
-
-    sys.exit(gdaltest.summarize())
+    ('byte.pnm', 4672),
+    ('uint16.pnm', 4672)]
+
+
+@pytest.mark.parametrize(
+    'filename,checksum',
+    init_list,
+    ids=[tup[0].split('.')[0] for tup in init_list],
+)
+@pytest.mark.require_driver('PNM')
+def test_pnm_open(filename, checksum):
+    ut = gdaltest.GDALTest('PNM', filename, 1, checksum)
+    ut.testOpen()
diff --git a/autotest/gcore/pnm_write.py b/autotest/gcore/pnm_write.py
index 3086f303a330..3f8fb0e01f63 100755
--- a/autotest/gcore/pnm_write.py
+++ b/autotest/gcore/pnm_write.py
@@ -25,28 +25,27 @@
 # Boston, MA 02111-1307, USA.
 ###############################################################################
 
-import sys
-
+import pytest
 
 import gdaltest
 
 init_list = [
-    ('byte.tif', 1, 4672, None),
-    ('uint16.tif', 1, 4672, None)]
-
-gdaltest_list = []
-
-for item in init_list:
-    ut = gdaltest.GDALTest('PNM', item[0], item[1], item[2])
-    if ut is None:
-        print('PNM tests skipped')
-    gdaltest_list.append((ut.testCreateCopy, item[0]))
-    gdaltest_list.append((ut.testCreate, item[0]))
-
-if __name__ == '__main__':
-
-    gdaltest.setup_run('pnm_write')
-
-    gdaltest.run_tests(gdaltest_list)
-
-    sys.exit(gdaltest.summarize())
+    ('byte.tif', 4672),
+    ('uint16.tif', 4672)]
+
+
+@pytest.mark.parametrize(
+    'filename,checksum',
+    init_list,
+    ids=[tup[0].split('.')[0] for tup in init_list],
+)
+@pytest.mark.parametrize(
+    'testfunction', [
+        'testCreateCopy',
+        'testCreate',
+    ]
+)
+@pytest.mark.require_driver('PNM')
+def test_pnm_create(filename, checksum, testfunction):
+    ut = gdaltest.GDALTest('PNM', filename, 1, checksum)
+    getattr(ut, testfunction)()
diff --git a/autotest/gcore/tiff_ovr.py b/autotest/gcore/tiff_ovr.py
index 1f606648d7b8..bc2c458658b9 100755
--- a/autotest/gcore/tiff_ovr.py
+++ b/autotest/gcore/tiff_ovr.py
@@ -38,10 +38,25 @@
 from osgeo import osr
 from osgeo import gdal
 
+import pytest
 
 import gdaltest
 
 
+@pytest.fixture(params=['invert', 'dont-invert'])
+def both_endian(request):
+    """
+    Runs tests with both values of GDAL_TIFF_ENDIANNESS
+    """
+    if request.param == 'invert':
+        original = gdal.GetConfigOption('GDAL_TIFF_ENDIANNESS', "NATIVE")
+        gdal.SetConfigOption('GDAL_TIFF_ENDIANNESS', 'INVERTED')
+        yield
+        gdal.SetConfigOption('GDAL_TIFF_ENDIANNESS', original)
+    else:
+        yield
+
+
 ###############################################################################
 # Check the overviews
 
@@ -79,7 +94,7 @@ def tiff_ovr_check(src_ds):
 # later.  Build overviews on it.
 
 
-def tiff_ovr_1():
+def tiff_ovr_1(both_endian):
 
     gdaltest.tiff_drv = gdal.GetDriverByName('GTiff')
 
@@ -115,7 +130,7 @@ def tiff_ovr_1():
 ###############################################################################
 # Open file and verify some characteristics of the overviews.
 
-def tiff_ovr_2():
+def tiff_ovr_2(both_endian):
 
     src_ds = gdal.Open('tmp/mfloat32.tif')
 
@@ -133,7 +148,7 @@ def tiff_ovr_2():
 # Open target file in update mode, and create internal overviews.
 
 
-def tiff_ovr_3():
+def tiff_ovr_3(both_endian):
 
     os.unlink('tmp/mfloat32.tif.ovr')
 
@@ -158,14 +173,14 @@ def tiff_ovr_3():
 # Re-open target file and check overviews
 
 
-def tiff_ovr_3bis():
-    return tiff_ovr_2()
+def tiff_ovr_3bis(both_endian):
+    return tiff_ovr_2(both_endian)
 
 ###############################################################################
 # Test generation
 
 
-def tiff_ovr_4():
+def tiff_ovr_4(both_endian):
 
     shutil.copyfile('data/oddsize_1bit2b.tif', 'tmp/ovr4.tif')
 
@@ -241,7 +256,7 @@ def tiff_ovr_4():
 ###############################################################################
 # Test average overview generation with nodata.
 
-def tiff_ovr_5():
+def tiff_ovr_5(both_endian):
 
     shutil.copyfile('data/nodata_byte.tif', 'tmp/ovr5.tif')
 
@@ -267,7 +282,7 @@ def tiff_ovr_5():
 # Same as tiff_ovr_5 but with USE_RDD=YES to force external overview
 
 
-def tiff_ovr_6():
+def tiff_ovr_6(both_endian):
 
     shutil.copyfile('data/nodata_byte.tif', 'tmp/ovr6.tif')
 
@@ -304,7 +319,7 @@ def tiff_ovr_6():
 ###############################################################################
 # Check nearest resampling on a dataset with a raster band that has a color table
 
-def tiff_ovr_7():
+def tiff_ovr_7(both_endian):
 
     shutil.copyfile('data/test_average_palette.tif', 'tmp/test_average_palette.tif')
 
@@ -334,7 +349,7 @@ def tiff_ovr_7():
 # Check average resampling on a dataset with a raster band that has a color table
 
 
-def tiff_ovr_8():
+def tiff_ovr_8(both_endian):
 
     shutil.copyfile('data/test_average_palette.tif', 'tmp/test_average_palette.tif')
 
@@ -366,7 +381,7 @@ def tiff_ovr_8():
 # Will also check that pixel interleaving is automatically selected (#3064)
 
 
-def tiff_ovr_9():
+def tiff_ovr_9(both_endian):
 
     drv = gdal.GetDriverByName('GTiff')
     md = drv.GetMetadata()
@@ -418,7 +433,7 @@ def tiff_ovr_9():
 # Similar to tiff_ovr_9 but with internal overviews.
 
 
-def tiff_ovr_10():
+def tiff_ovr_10(both_endian):
 
     src_ds = gdal.Open('data/rgbsmall.tif', gdal.GA_ReadOnly)
 
@@ -458,7 +473,7 @@ def tiff_ovr_10():
 # Overview on a dataset with NODATA_VALUES
 
 
-def tiff_ovr_11():
+def tiff_ovr_11(both_endian):
 
     src_ds = gdal.Open('data/test_nodatavalues.tif', gdal.GA_ReadOnly)
 
@@ -505,7 +520,7 @@ def tiff_ovr_11():
 # code
 
 
-def tiff_ovr_12():
+def tiff_ovr_12(both_endian):
 
     src_ds = gdal.Open('data/test_nodatavalues.tif', gdal.GA_ReadOnly)
 
@@ -551,7 +566,7 @@ def tiff_ovr_12():
 ###############################################################################
 # Test gaussian resampling
 
-def tiff_ovr_13():
+def tiff_ovr_13(both_endian):
 
     gdaltest.tiff_drv = gdal.GetDriverByName('GTiff')
 
@@ -589,7 +604,7 @@ def tiff_ovr_13():
 # Check gauss resampling on a dataset with a raster band that has a color table
 
 
-def tiff_ovr_14():
+def tiff_ovr_14(both_endian):
 
     shutil.copyfile('data/test_average_palette.tif', 'tmp/test_gauss_palette.tif')
 
@@ -618,7 +633,7 @@ def tiff_ovr_14():
 # code
 
 
-def tiff_ovr_15():
+def tiff_ovr_15(both_endian):
 
     src_ds = gdal.Open('data/test_nodatavalues.tif', gdal.GA_ReadOnly)
 
@@ -664,7 +679,7 @@ def tiff_ovr_15():
 ###############################################################################
 # Test mode resampling on non-byte dataset
 
-def tiff_ovr_16():
+def tiff_ovr_16(both_endian):
 
     gdaltest.tiff_drv = gdal.GetDriverByName('GTiff')
 
@@ -705,7 +720,7 @@ def tiff_ovr_16():
 ###############################################################################
 # Test mode resampling on a byte dataset
 
-def tiff_ovr_17():
+def tiff_ovr_17(both_endian):
 
     shutil.copyfile('data/byte.tif', 'tmp/ovr17.tif')
 
@@ -736,7 +751,7 @@ def tiff_ovr_17():
 # Check mode resampling on a dataset with a raster band that has a color table
 
 
-def tiff_ovr_18():
+def tiff_ovr_18(both_endian):
 
     shutil.copyfile('data/test_average_palette.tif', 'tmp/ovr18.tif')
 
@@ -766,7 +781,7 @@ def tiff_ovr_18():
 # if BigTIFF is not supported (this is a sign of an older libtiff...)
 
 
-def tiff_ovr_19():
+def tiff_ovr_19(both_endian):
 
     drv = gdal.GetDriverByName('GTiff')
     md = drv.GetMetadata()
@@ -804,7 +819,7 @@ def tiff_ovr_19():
 ###############################################################################
 # Test BIGTIFF_OVERVIEW=YES option
 
-def tiff_ovr_20():
+def tiff_ovr_20(both_endian):
 
     drv = gdal.GetDriverByName('GTiff')
     md = drv.GetMetadata()
@@ -842,7 +857,7 @@ def tiff_ovr_20():
 ###############################################################################
 # Test BIGTIFF_OVERVIEW=IF_NEEDED option
 
-def tiff_ovr_21():
+def tiff_ovr_21(both_endian):
 
     drv = gdal.GetDriverByName('GTiff')
     md = drv.GetMetadata()
@@ -880,7 +895,7 @@ def tiff_ovr_21():
 # Test BIGTIFF_OVERVIEW=NO option when BigTIFF is really needed
 
 
-def tiff_ovr_22():
+def tiff_ovr_22(both_endian):
 
     drv = gdal.GetDriverByName('GTiff')
     md = drv.GetMetadata()
@@ -915,7 +930,7 @@ def tiff_ovr_22():
 # method for the overviews.
 
 
-def tiff_ovr_23():
+def tiff_ovr_23(both_endian):
 
     drv = gdal.GetDriverByName('GTiff')
     md = drv.GetMetadata()
@@ -955,7 +970,7 @@ def tiff_ovr_23():
 # Test BIGTIFF_OVERVIEW=IF_SAFER option
 
 
-def tiff_ovr_24():
+def tiff_ovr_24(both_endian):
 
     drv = gdal.GetDriverByName('GTiff')
     md = drv.GetMetadata()
@@ -996,7 +1011,7 @@ def tiff_ovr_24():
 # band and actually flushed
 
 
-def tiff_ovr_25():
+def tiff_ovr_25(both_endian):
 
     ds = gdaltest.tiff_drv.Create('tmp/ovr25.tif', 100, 100, 1)
     ds.GetRasterBand(1).Fill(1)
@@ -1023,7 +1038,7 @@ def tiff_ovr_25():
 # Test gdal.RegenerateOverview()
 
 
-def tiff_ovr_26():
+def tiff_ovr_26(both_endian):
 
     ds = gdaltest.tiff_drv.Create('tmp/ovr26.tif', 100, 100, 1)
     ds.GetRasterBand(1).Fill(1)
@@ -1046,7 +1061,7 @@ def tiff_ovr_26():
 # Test gdal.RegenerateOverviews()
 
 
-def tiff_ovr_27():
+def tiff_ovr_27(both_endian):
 
     ds = gdaltest.tiff_drv.Create('tmp/ovr27.tif', 100, 100, 1)
     ds.GetRasterBand(1).Fill(1)
@@ -1075,7 +1090,7 @@ def tiff_ovr_27():
 # Test cleaning overviews.
 
 
-def tiff_ovr_28():
+def tiff_ovr_28(both_endian):
 
     ds = gdal.Open('tmp/ovr25.tif', gdal.GA_Update)
     if ds.BuildOverviews(overviewlist=[]) != 0:
@@ -1099,7 +1114,7 @@ def tiff_ovr_28():
 # Test cleaning external overviews (ovr) on a non-TIFF format.
 
 
-def tiff_ovr_29():
+def tiff_ovr_29(both_endian):
 
     src_ds = gdal.Open('data/byte.tif')
     png_ds = gdal.GetDriverByName('PNG').CreateCopy('tmp/ovr29.png', src_ds)
@@ -1147,7 +1162,7 @@ def tiff_ovr_29():
 # Test fix for #2988.
 
 
-def tiff_ovr_30():
+def tiff_ovr_30(both_endian):
 
     ds = gdaltest.tiff_drv.Create('tmp/ovr30.tif', 20, 20, 1)
     ds.BuildOverviews(overviewlist=[2])
@@ -1177,7 +1192,7 @@ def tiff_ovr_30():
 # Test fix for #3033
 
 
-def tiff_ovr_31():
+def tiff_ovr_31(both_endian):
 
     ds = gdaltest.tiff_drv.Create('tmp/ovr31.tif', 100, 100, 4)
     ds.GetRasterBand(1).Fill(255)
@@ -1198,7 +1213,7 @@ def tiff_ovr_31():
 # Test Cubic sampling.
 
 
-def tiff_ovr_32():
+def tiff_ovr_32(both_endian):
 
     drv = gdal.GetDriverByName('GTiff')
     md = drv.GetMetadata()
@@ -1357,7 +1372,7 @@ def tiff_ovr_32():
 ###############################################################################
 # Test creation of overviews on a 1x1 dataset (fix for #3069)
 
-def tiff_ovr_33():
+def tiff_ovr_33(both_endian):
 
     try:
         os.remove('tmp/ovr33.tif.ovr')
@@ -1378,7 +1393,7 @@ def tiff_ovr_33():
 ###############################################################################
 # Confirm that overviews are used on a Band.RasterIO().
 
-def tiff_ovr_34():
+def tiff_ovr_34(both_endian):
 
     ds_in = gdal.Open('data/byte.tif')
     ds = gdaltest.tiff_drv.CreateCopy('tmp/ovr34.tif', ds_in)
@@ -1404,7 +1419,7 @@ def tiff_ovr_34():
 # Confirm that overviews are used on a Band.RasterIO().
 
 
-def tiff_ovr_35():
+def tiff_ovr_35(both_endian):
 
     ds_in = gdal.Open('data/byte.tif')
     ds = gdaltest.tiff_drv.CreateCopy('tmp/ovr35.tif', ds_in)
@@ -1430,12 +1445,12 @@ def tiff_ovr_35():
 # Confirm that overviews are used on a Band.RasterIO() when using BlockBasedRasterIO() (#3124)
 
 
-def tiff_ovr_36():
+def tiff_ovr_36(both_endian):
 
     oldval = gdal.GetConfigOption('GDAL_FORCE_CACHING', 'NO')
     gdal.SetConfigOption('GDAL_FORCE_CACHING', 'YES')
 
-    ret = tiff_ovr_35()
+    ret = tiff_ovr_35(both_endian)
 
     gdal.SetConfigOption('GDAL_FORCE_CACHING', oldval)
 
@@ -1445,7 +1460,7 @@ def tiff_ovr_36():
 # Test PREDICTOR_OVERVIEW=2 option. (#3414)
 
 
-def tiff_ovr_37():
+def tiff_ovr_37(both_endian):
 
     shutil.copy('../gdrivers/data/n43.dt0', 'tmp/ovr37.dt0')
 
@@ -1485,7 +1500,7 @@ def tiff_ovr_37():
 # Test that the predictor flag gets well propagated to internal overviews
 
 
-def tiff_ovr_38():
+def tiff_ovr_38(both_endian):
 
     # Skip with old libtiff (crash with 3.8.2)
     md = gdaltest.tiff_drv.GetMetadata()
@@ -1510,7 +1525,7 @@ def tiff_ovr_38():
 # Test external overviews on all datatypes
 
 
-def tiff_ovr_39():
+def tiff_ovr_39(both_endian):
 
     for datatype in [gdal.GDT_Byte,
                      gdal.GDT_Int16,
@@ -1562,7 +1577,7 @@ def tiff_ovr_39():
 # Test external overviews on 1 bit datasets with AVERAGE_BIT2GRAYSCALE (similar to tiff_ovr_4)
 
 
-def tiff_ovr_40():
+def tiff_ovr_40(both_endian):
 
     shutil.copyfile('data/oddsize_1bit2b.tif', 'tmp/ovr40.tif')
 
@@ -1638,7 +1653,7 @@ def tiff_ovr_40():
 # Test external overviews on 1 bit datasets with NEAREST
 
 
-def tiff_ovr_41():
+def tiff_ovr_41(both_endian):
 
     shutil.copyfile('data/oddsize_1bit2b.tif', 'tmp/ovr41.tif')
 
@@ -1666,7 +1681,7 @@ def tiff_ovr_41():
 # Test external overviews on dataset with color table
 
 
-def tiff_ovr_42():
+def tiff_ovr_42(both_endian):
 
     ct_data = [(255, 0, 0), (0, 255, 0), (0, 0, 255), (255, 255, 255)]
 
@@ -1702,7 +1717,7 @@ def tiff_ovr_42():
 # jpeg-in-tiff (#3539)
 
 
-def tiff_ovr_43():
+def tiff_ovr_43(both_endian):
 
     md = gdaltest.tiff_drv.GetMetadata()
     if md['DMD_CREATIONOPTIONLIST'].find('JPEG') == -1:
@@ -1766,7 +1781,7 @@ def tiff_ovr_43():
 # option
 
 
-def tiff_ovr_44():
+def tiff_ovr_44(both_endian):
 
     shutil.copyfile('data/byte.tif', 'tmp/ovr44.tif')
     gdal.SetConfigOption('GDAL_TIFF_OVR_BLOCKSIZE', '256')
@@ -1798,7 +1813,7 @@ def tiff_ovr_44():
 # Same as tiff_ovr_44, but with external overviews
 
 
-def tiff_ovr_45():
+def tiff_ovr_45(both_endian):
 
     shutil.copyfile('data/byte.tif', 'tmp/ovr45.tif')
     gdal.SetConfigOption('GDAL_TIFF_OVR_BLOCKSIZE', '256')
@@ -1927,7 +1942,7 @@ def tiff_ovr_46():
 # Test workaround with libtiff 3.X when creating interleaved overviews
 
 
-def tiff_ovr_47():
+def tiff_ovr_47(both_endian):
     mem_drv = gdal.GetDriverByName('MEM')
     mem_ds = mem_drv.Create('', 852, 549, 3)
 
@@ -1958,7 +1973,7 @@ def tiff_ovr_47():
 # Test that we don't average 0's in alpha band
 
 
-def tiff_ovr_48():
+def tiff_ovr_48(both_endian):
 
     shutil.copy('data/rgba_with_alpha_0_and_255.tif', 'tmp')
     ds = gdal.Open('tmp/rgba_with_alpha_0_and_255.tif')
@@ -1994,7 +2009,7 @@ def tiff_ovr_48():
 # Test possible stride computation issue in GDALRegenerateOverviewsMultiBand (#5653)
 
 
-def tiff_ovr_49():
+def tiff_ovr_49(both_endian):
 
     ds = gdal.GetDriverByName('GTiff').Create('/vsimem/tiff_ovr_49.tif', 1023, 1023, 1)
     ds.GetRasterBand(1).Fill(0)
@@ -2021,7 +2036,7 @@ def tiff_ovr_49():
 # Test overviews when X dimension is smaller than Y (#5794)
 
 
-def tiff_ovr_50():
+def tiff_ovr_50(both_endian):
 
     ds = gdal.GetDriverByName('GTiff').Create('/vsimem/tiff_ovr_50.tif', 6, 8192, 3,
                                               options=['COMPRESS=DEFLATE'])
@@ -2324,52 +2339,8 @@ def tiff_ovr_average_multiband_vs_singleband():
 
     return 'success'
 
-###############################################################################
-# Cleanup
-
-
-def tiff_ovr_cleanup():
-    gdaltest.tiff_drv.Delete('tmp/mfloat32.tif')
-    gdaltest.tiff_drv.Delete('tmp/ovr4.tif')
-    gdaltest.tiff_drv.Delete('tmp/ovr5.tif')
-    gdaltest.tiff_drv.Delete('tmp/ovr6.tif')
-    gdaltest.tiff_drv.Delete('tmp/test_average_palette.tif')
-    gdaltest.tiff_drv.Delete('tmp/ovr9.tif')
-    gdaltest.tiff_drv.Delete('tmp/ovr10.tif')
-    gdaltest.tiff_drv.Delete('tmp/ovr11.tif')
-    gdaltest.tiff_drv.Delete('tmp/ovr12.tif')
-    gdaltest.tiff_drv.Delete('tmp/test_gauss_palette.tif')
-    gdaltest.tiff_drv.Delete('tmp/ovr15.tif')
-    gdaltest.tiff_drv.Delete('tmp/ovr16.tif')
-    gdaltest.tiff_drv.Delete('tmp/ovr17.tif')
-    gdaltest.tiff_drv.Delete('tmp/ovr18.tif')
-    md = gdaltest.tiff_drv.GetMetadata()
-    if md['DMD_CREATIONOPTIONLIST'].find('BigTIFF') != -1:
-        gdaltest.tiff_drv.Delete('tmp/ovr19.tif')
-        gdaltest.tiff_drv.Delete('tmp/ovr20.tif')
-        gdaltest.tiff_drv.Delete('tmp/ovr21.tif')
-        gdaltest.tiff_drv.Delete('tmp/ovr22.tif')
-        gdaltest.tiff_drv.Delete('tmp/ovr23.tif')
-        gdaltest.tiff_drv.Delete('tmp/ovr24.tif')
-    gdaltest.tiff_drv.Delete('tmp/ovr25.tif')
-    gdaltest.tiff_drv.Delete('tmp/ovr26.tif')
-    gdaltest.tiff_drv.Delete('tmp/ovr27.tif')
-    gdaltest.tiff_drv.Delete('tmp/ovr30.tif')
-    gdaltest.tiff_drv.Delete('tmp/ovr31.tif')
-    gdaltest.tiff_drv.Delete('tmp/ovr37.dt0')
-    if md['DMD_CREATIONOPTIONLIST'].find('BigTIFF') != -1:
-        gdaltest.tiff_drv.Delete('tmp/ovr38.tif')
-    gdaltest.tiff_drv.Delete('tmp/ovr39.tif')
-    gdaltest.tiff_drv.Delete('tmp/ovr40.tif')
-    gdaltest.tiff_drv.Delete('tmp/ovr41.tif')
-    gdaltest.tiff_drv.Delete('tmp/ovr42.tif')
-    gdaltest.tiff_drv.Delete('tmp/rgba_with_alpha_0_and_255.tif')
-    gdaltest.tiff_drv = None
-
-    return 'success'
-
 
-gdaltest_list_internal = [
+gdaltest_list = [
     tiff_ovr_1,
     tiff_ovr_2,
     tiff_ovr_3,
@@ -2421,37 +2392,15 @@ def tiff_ovr_cleanup():
     tiff_ovr_48,
     tiff_ovr_49,
     tiff_ovr_50,
-    tiff_ovr_cleanup]
-
-
-def tiff_ovr_invert_endianness():
-    gdaltest.tiff_endianness = gdal.GetConfigOption('GDAL_TIFF_ENDIANNESS', "NATIVE")
-    gdal.SetConfigOption('GDAL_TIFF_ENDIANNESS', 'INVERTED')
-    return 'success'
-
-
-def tiff_ovr_restore_endianness():
-    gdal.SetConfigOption('GDAL_TIFF_ENDIANNESS', gdaltest.tiff_endianness)
-    return 'success'
-
-
-gdaltest_list = []
-for item in gdaltest_list_internal:
-    gdaltest_list.append(item)
-gdaltest_list.append(tiff_ovr_invert_endianness)
-for item in gdaltest_list_internal:
-    if item.__name__ != 'tiff_ovr_46':
-        gdaltest_list.append((item, item.__name__ + '_inverted'))
-gdaltest_list.append(tiff_ovr_restore_endianness)
-
-gdaltest_list += [tiff_ovr_51,
-                  tiff_ovr_52,
-                  tiff_ovr_53,
-                  tiff_ovr_54,
-                  tiff_ovr_too_many_levels_contig,
-                  tiff_ovr_too_many_levels_separate,
-                  tiff_ovr_too_many_levels_external,
-                  tiff_ovr_average_multiband_vs_singleband ]
+    tiff_ovr_51,
+    tiff_ovr_52,
+    tiff_ovr_53,
+    tiff_ovr_54,
+    tiff_ovr_too_many_levels_contig,
+    tiff_ovr_too_many_levels_separate,
+    tiff_ovr_too_many_levels_external,
+    tiff_ovr_average_multiband_vs_singleband
+]
 
 if __name__ == '__main__':
 
diff --git a/autotest/gcore/tiff_read.py b/autotest/gcore/tiff_read.py
index 82eb4024b937..0b3c64222925 100755
--- a/autotest/gcore/tiff_read.py
+++ b/autotest/gcore/tiff_read.py
@@ -31,6 +31,7 @@
 import sys
 import shutil
 
+import pytest
 
 import gdaltest
 from osgeo import gdal, osr
@@ -41,34 +42,47 @@
 gdaltest_list = []
 
 init_list = [
-    ('byte.tif', 1, 4672, None),
-    ('uint16_sgilog.tif', 1, 4672, None),
-    ('next_literalrow.tif', 1, 4, None),
-    ('next_literalspan.tif', 1, 4, None),
-    ('next_default_case.tif', 1, 4, None),
-    ('thunder.tif', 1, 3, None),
-    ('int10.tif', 1, 4672, None),
-    ('int12.tif', 1, 4672, None),
-    ('int16.tif', 1, 4672, None),
-    ('uint16.tif', 1, 4672, None),
-    ('int24.tif', 1, 4672, None),
-    ('int32.tif', 1, 4672, None),
-    ('uint32.tif', 1, 4672, None),
-    ('float16.tif', 1, 4672, None),
-    ('float24.tif', 1, 4672, None),
-    ('float32.tif', 1, 4672, None),
-    ('float32_minwhite.tif', 1, 1, None),
-    ('float64.tif', 1, 4672, None),
-    ('cint16.tif', 1, 5028, None),
-    ('cint32.tif', 1, 5028, None),
-    ('cfloat32.tif', 1, 5028, None),
-    ('cfloat64.tif', 1, 5028, None),
+    ('byte.tif', 1, 4672),
+    ('uint16_sgilog.tif', 1, 4672),
+    ('next_literalrow.tif', 1, 4),
+    ('next_literalspan.tif', 1, 4),
+    ('next_default_case.tif', 1, 4),
+    ('thunder.tif', 1, 3),
+    ('int10.tif', 1, 4672),
+    ('int12.tif', 1, 4672),
+    ('int16.tif', 1, 4672),
+    ('uint16.tif', 1, 4672),
+    ('int24.tif', 1, 4672),
+    ('int32.tif', 1, 4672),
+    ('uint32.tif', 1, 4672),
+    ('float16.tif', 1, 4672),
+    ('float24.tif', 1, 4672),
+    ('float32.tif', 1, 4672),
+    ('float32_minwhite.tif', 1, 1),
+    ('float64.tif', 1, 4672),
+    ('cint16.tif', 1, 5028),
+    ('cint32.tif', 1, 5028),
+    ('cfloat32.tif', 1, 5028),
+    ('cfloat64.tif', 1, 5028),
     # The following four related partial final strip/tiles (#1179)
-    ('separate_tiled.tif', 2, 15234, None),
-    ('seperate_strip.tif', 2, 15234, None),  # TODO: Spelling.
-    ('contig_tiled.tif', 2, 15234, None),
-    ('contig_strip.tif', 2, 15234, None),
-    ('empty1bit.tif', 1, 0, None)]
+    ('separate_tiled.tif', 2, 15234),
+    ('seperate_strip.tif', 2, 15234),  # TODO: Spelling.
+    ('contig_tiled.tif', 2, 15234),
+    ('contig_strip.tif', 2, 15234),
+    ('empty1bit.tif', 1, 0)
+]
+
+
+@pytest.mark.parametrize(
+    'filename,band,checksum',
+    init_list,
+    ids=[tup[0].split('.')[0] for tup in init_list],
+)
+@pytest.mark.require_driver('GTiff')
+def test_tiff_open(filename, band, checksum):
+    ut = gdaltest.GDALTest('GTiff', filename, band, checksum)
+    ut.testOpen()
+
 
 ###############################################################################
 # Test absolute/offset && index directory access
@@ -3854,12 +3868,6 @@ def tiff_read_overview_of_external_mask():
 ###############################################################################
 
 
-for item in init_list:
-    ut = gdaltest.GDALTest('GTiff', item[0], item[1], item[2])
-    if ut is None:
-        print('GTiff tests skipped')
-        sys.exit()
-    gdaltest_list.append((ut.testOpen, item[0]))
 gdaltest_list.append(tiff_read_off)
 gdaltest_list.append(tiff_check_alpha)
 gdaltest_list.append(tiff_read_cmyk_rgba)
diff --git a/autotest/gcore/vrt_read.py b/autotest/gcore/vrt_read.py
index 0894e5c66d4a..e1894cc73bc9 100755
--- a/autotest/gcore/vrt_read.py
+++ b/autotest/gcore/vrt_read.py
@@ -35,6 +35,7 @@
 import shutil
 import struct
 
+import pytest
 
 import gdaltest
 from osgeo import gdal
@@ -46,23 +47,36 @@
 gdaltest_list = []
 
 init_list = [
-    ('byte.vrt', 1, 4672, None),
-    ('int16.vrt', 1, 4672, None),
-    ('uint16.vrt', 1, 4672, None),
-    ('int32.vrt', 1, 4672, None),
-    ('uint32.vrt', 1, 4672, None),
-    ('float32.vrt', 1, 4672, None),
-    ('float64.vrt', 1, 4672, None),
-    ('cint16.vrt', 1, 5028, None),
-    ('cint32.vrt', 1, 5028, None),
-    ('cfloat32.vrt', 1, 5028, None),
-    ('cfloat64.vrt', 1, 5028, None),
-    ('msubwinbyte.vrt', 2, 2699, None),
-    ('utmsmall.vrt', 1, 50054, None),
-    ('byte_nearest_50pct.vrt', 1, 1192, None),
-    ('byte_averaged_50pct.vrt', 1, 1152, None),
-    ('byte_nearest_200pct.vrt', 1, 18784, None),
-    ('byte_averaged_200pct.vrt', 1, 18784, None)]
+    ('byte.vrt', 4672),
+    ('int16.vrt', 4672),
+    ('uint16.vrt', 4672),
+    ('int32.vrt', 4672),
+    ('uint32.vrt', 4672),
+    ('float32.vrt', 4672),
+    ('float64.vrt', 4672),
+    ('cint16.vrt', 5028),
+    ('cint32.vrt', 5028),
+    ('cfloat32.vrt', 5028),
+    ('cfloat64.vrt', 5028),
+    ('msubwinbyte.vrt', 2699),
+    ('utmsmall.vrt', 50054),
+    ('byte_nearest_50pct.vrt', 1192),
+    ('byte_averaged_50pct.vrt', 1152),
+    ('byte_nearest_200pct.vrt', 18784),
+    ('byte_averaged_200pct.vrt', 18784)
+]
+
+
+@pytest.mark.parametrize(
+    'filename,checksum',
+    init_list,
+    ids=[tup[0].split('.')[0] for tup in init_list],
+)
+@pytest.mark.require_driver('VRT')
+def test_vrt_open(filename, checksum):
+    ut = gdaltest.GDALTest('VRT', filename, 1, checksum)
+    ut.testOpen()
+
 
 ###############################################################################
 # The VRT references a non existing TIF file
@@ -1454,47 +1468,44 @@ def vrt_dstsize_larger_than_source():
 
     return 'success'
 
-for item in init_list:
-    ut = gdaltest.GDALTest('VRT', item[0], item[1], item[2])
-    if ut is None:
-        print('VRT tests skipped')
-        sys.exit()
-    gdaltest_list.append((ut.testOpen, item[0]))
-
-gdaltest_list.append(vrt_read_1)
-gdaltest_list.append(vrt_read_2)
-gdaltest_list.append(vrt_read_3)
-gdaltest_list.append(vrt_read_4)
-gdaltest_list.append(vrt_read_5)
-gdaltest_list.append(vrt_read_6)
-gdaltest_list.append(vrt_read_7)
-gdaltest_list.append(vrt_read_8)
-gdaltest_list.append(vrt_read_9)
-gdaltest_list.append(vrt_read_10)
-gdaltest_list.append(vrt_read_11)
-gdaltest_list.append(vrt_read_12)
-gdaltest_list.append(vrt_read_13)
-gdaltest_list.append(vrt_read_14)
-gdaltest_list.append(vrt_read_15)
-gdaltest_list.append(vrt_read_16)
-gdaltest_list.append(vrt_read_17)
-gdaltest_list.append(vrt_read_18)
-gdaltest_list.append(vrt_read_19)
-gdaltest_list.append(vrt_read_20)
-gdaltest_list.append(vrt_read_21)
-gdaltest_list.append(vrt_read_22)
-gdaltest_list.append(vrt_read_23)
-gdaltest_list.append(vrt_read_24)
-gdaltest_list.append(vrt_read_25)
-gdaltest_list.append(vrt_read_26)
-gdaltest_list.append(vrt_read_27)
-gdaltest_list.append(vrt_read_28)
-gdaltest_list.append(vrt_read_29)
-gdaltest_list.append(vrt_read_30)
-gdaltest_list.append(vrt_read_31)
-gdaltest_list.append(vrt_float32_with_nodata_slightly_below_float_min)
-gdaltest_list.append(vrt_subpixel_offset)
-gdaltest_list.append(vrt_dstsize_larger_than_source)
+
+gdaltest_list = [
+    vrt_read_1,
+    vrt_read_2,
+    vrt_read_3,
+    vrt_read_4,
+    vrt_read_5,
+    vrt_read_6,
+    vrt_read_7,
+    vrt_read_8,
+    vrt_read_9,
+    vrt_read_10,
+    vrt_read_11,
+    vrt_read_12,
+    vrt_read_13,
+    vrt_read_14,
+    vrt_read_15,
+    vrt_read_16,
+    vrt_read_17,
+    vrt_read_18,
+    vrt_read_19,
+    vrt_read_20,
+    vrt_read_21,
+    vrt_read_22,
+    vrt_read_23,
+    vrt_read_24,
+    vrt_read_25,
+    vrt_read_26,
+    vrt_read_27,
+    vrt_read_28,
+    vrt_read_29,
+    vrt_read_30,
+    vrt_read_31,
+    vrt_float32_with_nodata_slightly_below_float_min,
+    vrt_subpixel_offset,
+    vrt_dstsize_larger_than_source,
+]
+
 
 if __name__ == '__main__':
 
diff --git a/autotest/gdrivers/gta.py b/autotest/gdrivers/gta.py
index 3fe6e417d65a..d9685d522e4c 100755
--- a/autotest/gdrivers/gta.py
+++ b/autotest/gdrivers/gta.py
@@ -30,6 +30,7 @@
 
 import sys
 
+import pytest
 
 import gdaltest
 from osgeo import gdal
@@ -38,19 +39,19 @@
 gdaltest_list = []
 
 init_list = [
-    ('byte.tif', 1, 4672, []),
-    ('byte_signed.tif', 1, 4672, []),
-    ('int16.tif', 1, 4672, []),
-    ('uint16.tif', 1, 4672, []),
-    ('int32.tif', 1, 4672, []),
-    ('uint32.tif', 1, 4672, []),
-    ('float32.tif', 1, 4672, []),
-    ('float64.tif', 1, 4672, []),
-    ('cint16.tif', 1, 5028, []),
-    ('cint32.tif', 1, 5028, []),
-    ('cfloat32.tif', 1, 5028, []),
-    ('cfloat64.tif', 1, 5028, []),
-    ('rgbsmall.tif', 1, 21212, [])]
+    ('byte.tif', 4672),
+    ('byte_signed.tif', 4672),
+    ('int16.tif', 4672),
+    ('uint16.tif', 4672),
+    ('int32.tif', 4672),
+    ('uint32.tif', 4672),
+    ('float32.tif', 4672),
+    ('float64.tif', 4672),
+    ('cint16.tif', 5028),
+    ('cint32.tif', 5028),
+    ('cfloat32.tif', 5028),
+    ('cfloat64.tif', 5028),
+    ('rgbsmall.tif', 21212)]
 
 ###############################################################################
 # Verify we have the driver.
@@ -264,16 +265,18 @@ def gta_5():
     return 'success'
 
 
-for item in init_list:
-    if item[0] == 'byte_signed.tif':
-        filename = item[0]
-    else:
-        filename = '../../gcore/data/' + item[0]
-    ut = gdaltest.GDALTest('GTA', filename, item[1], item[2], options=item[3])
-    if ut is None:
-        print('GTA tests skipped')
-        sys.exit()
-    gdaltest_list.append((ut.testCreateCopy, item[0]))
+@pytest.mark.parametrize(
+    'filename,checksum',
+    init_list,
+    ids=[tup[0].split('.')[0] for tup in init_list],
+)
+@pytest.mark.require_driver('GTA')
+def test_gta_create(filename, checksum):
+    if filename != 'byte_signed.tif':
+        filename = '../../gcore/data/' + filename
+    ut = gdaltest.GDALTest('GTA', filename, 1, checksum, options=[])
+    ut.testCreateCopy()
+
 
 gdaltest_list.append(gta_1)
 gdaltest_list.append(gta_2)
diff --git a/autotest/gdrivers/netcdf.py b/autotest/gdrivers/netcdf.py
index d8563e357bcb..42db3b34edac 100755
--- a/autotest/gdrivers/netcdf.py
+++ b/autotest/gdrivers/netcdf.py
@@ -3449,35 +3449,49 @@ def netcdf_uffd():
 #  basic file creation tests
 
 init_list = [
-    ('byte.tif', 1, 4672, None, []),
-    ('byte_signed.tif', 1, 4672, None, ['PIXELTYPE=SIGNEDBYTE']),
-    ('int16.tif', 1, 4672, None, []),
-    ('int32.tif', 1, 4672, None, []),
-    ('float32.tif', 1, 4672, None, []),
-    ('float64.tif', 1, 4672, None, [])
+    ('byte.tif', 4672, []),
+    ('byte_signed.tif', 4672, ['PIXELTYPE=SIGNEDBYTE']),
+    ('int16.tif', 4672, []),
+    ('int32.tif', 4672, []),
+    ('float32.tif', 4672, []),
+    ('float64.tif', 4672, [])
 ]
 
-# Some tests we don't need to do for each type.
-item = init_list[0]
-ut = gdaltest.GDALTest('netcdf', item[0], item[1], item[2], options=item[4])
 
-# test geotransform and projection
-gdaltest_list.append((ut.testSetGeoTransform, item[0]))
-gdaltest_list.append((ut.testSetProjection, item[0]))
+# Some tests we don't need to do for each type.
 
-# SetMetadata() not supported
-# gdaltest_list.append( (ut.testSetMetadata, item[0]) )
+@pytest.mark.parametrize(
+    'testfunction', [
+        'testSetGeoTransform',
+        'testSetProjection',
+        # SetMetadata() not supported
+        # 'testSetMetadata'
+    ]
+)
+@pytest.mark.require_driver('netcdf')
+def test_netcdf_functions_1(testfunction):
+    ut = gdaltest.GDALTest('netcdf', 'byte.tif', 1, 4672, options=[])
+    getattr(ut, testfunction)()
 
-# gdaltest_list = [ netcdf_1, netcdf_82 ]
 
 # Others we do for each pixel type.
-for item in init_list:
-    ut = gdaltest.GDALTest('netcdf', item[0], item[1], item[2], options=item[4])
-    if ut is None:
-        print('GTiff tests skipped')
-    gdaltest_list.append((ut.testCreateCopy, item[0]))
-    gdaltest_list.append((ut.testCreate, item[0]))
-    gdaltest_list.append((ut.testSetNoDataValue, item[0]))
+
+@pytest.mark.parametrize(
+    'filename,checksum,options',
+    init_list,
+    ids=[tup[0].split('.')[0] for tup in init_list],
+)
+@pytest.mark.parametrize(
+    'testfunction', [
+        'testCreateCopy',
+        'testCreate',
+        'testSetNoDataValue'
+    ]
+)
+@pytest.mark.require_driver('netcdf')
+def test_netcdf_functions_2(filename, checksum, options, testfunction):
+    ut = gdaltest.GDALTest('netcdf', filename, 1, checksum, options=options)
+    getattr(ut, testfunction)()
 
 ###############################################################################
 #  other tests
diff --git a/autotest/ogr/ogr_gml_geom.py b/autotest/ogr/ogr_gml_geom.py
index 7cf7b2fe68eb..9f035f713827 100755
--- a/autotest/ogr/ogr_gml_geom.py
+++ b/autotest/ogr/ogr_gml_geom.py
@@ -30,6 +30,7 @@
 import os
 import sys
 
+import pytest
 
 import gdaltest
 import ogrtest
@@ -40,36 +41,39 @@
 ###############################################################################
 
 
-class gml_geom_unit(object):
-    def __init__(self, unit):
-        self.unit = unit
-
-    def gml_geom(self):
-        raw_wkt = open('data/wkb_wkt/' + self.unit + '.wkt').read()
+@pytest.mark.parametrize(
+    'unit',
+    [
+        f[:-4] for f in os.listdir(os.path.join(os.path.dirname(__file__), 'data/wkb_wkt'))
+        if f[-4:] == '.wkt'
+    ]
+)
+def test_gml_geom(unit):
+    raw_wkt = open('data/wkb_wkt/' + unit + '.wkt').read()
 
-        ######################################################################
-        # Convert WKT to GML.
+    ######################################################################
+    # Convert WKT to GML.
 
-        geom_wkt = ogr.CreateGeometryFromWkt(raw_wkt)
+    geom_wkt = ogr.CreateGeometryFromWkt(raw_wkt)
 
-        gml = geom_wkt.ExportToGML()
+    gml = geom_wkt.ExportToGML()
 
-        if gml is None or not gml:
-            gdaltest.post_reason('Conversion to GML failed.')
-            return 'fail'
+    if gml is None or not gml:
+        gdaltest.post_reason('Conversion to GML failed.')
+        return 'fail'
 
-        ######################################################################
-        # Create geometry from GML.
+    ######################################################################
+    # Create geometry from GML.
 
-        geom_gml = ogr.CreateGeometryFromGML(gml)
+    geom_gml = ogr.CreateGeometryFromGML(gml)
 
-        if ogrtest.check_feature_geometry(geom_wkt, geom_gml, 0.0000000000001) == 1:
-            clean_wkt = geom_wkt.ExportToWkt()
-            gml_wkt = geom_gml.ExportToWkt()
-            gdaltest.post_reason('WKT from GML (%s) does not match clean WKT (%s).\ngml was (%s)' % (gml_wkt, clean_wkt, gml))
-            return 'fail'
+    if ogrtest.check_feature_geometry(geom_wkt, geom_gml, 0.0000000000001) == 1:
+        clean_wkt = geom_wkt.ExportToWkt()
+        gml_wkt = geom_gml.ExportToWkt()
+        gdaltest.post_reason('WKT from GML (%s) does not match clean WKT (%s).\ngml was (%s)' % (gml_wkt, clean_wkt, gml))
+        return 'fail'
 
-        return 'success'
+    return 'success'
 
 ###############################################################################
 # Test geometries with extra spaces at the end, as sometimes are generated
@@ -2440,11 +2444,6 @@ def gml_write_gml_ns():
 
 gdaltest_list = []
 
-files = os.listdir(os.path.join(os.path.dirname(__file__), 'data/wkb_wkt'))
-for filename in files:
-    if filename[-4:] == '.wkt':
-        ut = gml_geom_unit(filename[:-4])
-        gdaltest_list.append((ut.gml_geom, ut.unit))
 
 gdaltest_list.append(gml_space_test)
 gdaltest_list.append(gml_pos_point)
diff --git a/autotest/ogr/ogr_wkbwkt_geom.py b/autotest/ogr/ogr_wkbwkt_geom.py
index 1daef0149608..a16fd49b7299 100755
--- a/autotest/ogr/ogr_wkbwkt_geom.py
+++ b/autotest/ogr/ogr_wkbwkt_geom.py
@@ -30,6 +30,7 @@
 import os
 import sys
 
+import pytest
 
 import gdaltest
 from osgeo import ogr
@@ -38,46 +39,49 @@
 ###############################################################################
 
 
-class wkb_wkt_unit(object):
-    def __init__(self, unit):
-        self.unit = unit
-
-    def wkbwkt_geom(self):
-        raw_wkb = open('data/wkb_wkt/' + self.unit + '.wkb', 'rb').read()
-        raw_wkt = open('data/wkb_wkt/' + self.unit + '.wkt').read()
-
-        ######################################################################
-        # Compare the WKT derived from the WKB file to the WKT provided
-        # but reformatted (normalized).
-
-        geom_wkb = ogr.CreateGeometryFromWkb(raw_wkb)
-        wkb_wkt = geom_wkb.ExportToWkt()
-
-        geom_wkt = ogr.CreateGeometryFromWkt(raw_wkt)
-        normal_wkt = geom_wkt.ExportToWkt()
-
-        # print(wkb_wkt)
-        # print(normal_wkt)
-        # print(raw_wkt)
-        if wkb_wkt != normal_wkt:
-            gdaltest.post_reason('WKT from WKB (%s) does not match clean WKT (%s).' % (wkb_wkt, normal_wkt))
-            return 'fail'
+@pytest.mark.parametrize(
+    'unit',
+    [
+        f[:-4] for f in os.listdir(os.path.join(os.path.dirname(__file__), 'data/wkb_wkt'))
+        if f[-4:] == '.wkb'
+    ]
+)
+def test_wkbwkt_geom(unit):
+    raw_wkb = open('data/wkb_wkt/' + unit + '.wkb', 'rb').read()
+    raw_wkt = open('data/wkb_wkt/' + unit + '.wkt').read()
+
+    ######################################################################
+    # Compare the WKT derived from the WKB file to the WKT provided
+    # but reformatted (normalized).
+
+    geom_wkb = ogr.CreateGeometryFromWkb(raw_wkb)
+    wkb_wkt = geom_wkb.ExportToWkt()
+
+    geom_wkt = ogr.CreateGeometryFromWkt(raw_wkt)
+    normal_wkt = geom_wkt.ExportToWkt()
+
+    # print(wkb_wkt)
+    # print(normal_wkt)
+    # print(raw_wkt)
+    if wkb_wkt != normal_wkt:
+        gdaltest.post_reason('WKT from WKB (%s) does not match clean WKT (%s).' % (wkb_wkt, normal_wkt))
+        return 'fail'
 
-        ######################################################################
-        # Verify that the geometries appear to be the same.   This is
-        # intended to catch problems with the encoding too WKT that might
-        # cause passes above but that are mistaken.
-        if geom_wkb.GetCoordinateDimension() != geom_wkt.GetCoordinateDimension():
-            gdaltest.post_reason('Coordinate dimension differs!')
-            return 'fail'
+    ######################################################################
+    # Verify that the geometries appear to be the same.   This is
+    # intended to catch problems with the encoding too WKT that might
+    # cause passes above but that are mistaken.
+    if geom_wkb.GetCoordinateDimension() != geom_wkt.GetCoordinateDimension():
+        gdaltest.post_reason('Coordinate dimension differs!')
+        return 'fail'
 
-        if geom_wkb.GetGeometryType() != geom_wkt.GetGeometryType():
-            gdaltest.post_reason('Geometry type differs!')
-            return 'fail'
+    if geom_wkb.GetGeometryType() != geom_wkt.GetGeometryType():
+        gdaltest.post_reason('Geometry type differs!')
+        return 'fail'
 
-        if geom_wkb.GetGeometryName() != geom_wkt.GetGeometryName():
-            gdaltest.post_reason('Geometry name differs!')
-            return 'fail'
+    if geom_wkb.GetGeometryName() != geom_wkt.GetGeometryName():
+        gdaltest.post_reason('Geometry name differs!')
+        return 'fail'
 
 # It turns out this test is too picky about coordinate precision. skip.
 #       if geom_wkb.Equal( geom_wkt ) == 0:
@@ -86,35 +90,35 @@ def wkbwkt_geom(self):
 #           print geom_wkt.ExportToWkt()
 #           return 'fail'
 
-        geom_wkb.Destroy()
+    geom_wkb.Destroy()
 
-        ######################################################################
-        # Convert geometry to WKB and back to verify that WKB encoding is
-        # working smoothly.
+    ######################################################################
+    # Convert geometry to WKB and back to verify that WKB encoding is
+    # working smoothly.
 
-        wkb_xdr = geom_wkt.ExportToWkb(ogr.wkbXDR)
-        geom_wkb = ogr.CreateGeometryFromWkb(wkb_xdr)
+    wkb_xdr = geom_wkt.ExportToWkb(ogr.wkbXDR)
+    geom_wkb = ogr.CreateGeometryFromWkb(wkb_xdr)
 
-        if str(geom_wkb) != str(geom_wkt):
-            print(geom_wkb)
-            print(geom_wkt)
-            gdaltest.post_reason('XDR WKB encoding/decoding failure.')
-            return 'fail'
+    if str(geom_wkb) != str(geom_wkt):
+        print(geom_wkb)
+        print(geom_wkt)
+        gdaltest.post_reason('XDR WKB encoding/decoding failure.')
+        return 'fail'
 
-        geom_wkb.Destroy()
+    geom_wkb.Destroy()
 
-        wkb_ndr = geom_wkt.ExportToWkb(ogr.wkbNDR)
-        geom_wkb = ogr.CreateGeometryFromWkb(wkb_ndr)
+    wkb_ndr = geom_wkt.ExportToWkb(ogr.wkbNDR)
+    geom_wkb = ogr.CreateGeometryFromWkb(wkb_ndr)
 
-        if str(geom_wkb) != str(geom_wkt):
-            gdaltest.post_reason('NDR WKB encoding/decoding failure.')
-            return 'fail'
+    if str(geom_wkb) != str(geom_wkt):
+        gdaltest.post_reason('NDR WKB encoding/decoding failure.')
+        return 'fail'
 
-        geom_wkb.Destroy()
+    geom_wkb.Destroy()
 
-        geom_wkt.Destroy()
+    geom_wkt.Destroy()
 
-        return 'success'
+    return 'success'
 
 ###############################################################################
 # Test geometry with very large exponents of coordinate values.
@@ -678,12 +682,6 @@ def ogr_wkt_multipolygon_corrupted():
 
 gdaltest_list = []
 
-files = os.listdir(os.path.join(os.path.dirname(__file__), 'data/wkb_wkt'))
-for filename in files:
-    if filename[-4:] == '.wkb':
-        ut = wkb_wkt_unit(filename[:-4])
-        gdaltest_list.append((ut.wkbwkt_geom, ut.unit))
-
 gdaltest_list.append(ogr_wkbwkt_geom_bigexponents)
 gdaltest_list.append(ogr_wkbwkt_test_broken_geom)
 gdaltest_list.append(ogr_wkbwkt_test_import_wkt_sf12)
diff --git a/autotest/osr/osr_ct_proj.py b/autotest/osr/osr_ct_proj.py
index 21652be4e08b..55f6eab7a37d 100755
--- a/autotest/osr/osr_ct_proj.py
+++ b/autotest/osr/osr_ct_proj.py
@@ -31,114 +31,14 @@
 ###############################################################################
 
 import os
-import sys
 
+import pytest
 
 import gdaltest
 from osgeo import osr, gdal
 
 bonne = 'PROJCS["bonne",GEOGCS["GCS_WGS_1984",DATUM["D_WGS_1984",SPHEROID["WGS_1984",6378137.0,298.257223563]],PRIMEM["Greenwich",0.0],UNIT["Degree",0.0174532925199433]],PROJECTION["bonne"],PARAMETER["False_Easting",0.0],PARAMETER["False_Northing",0.0],PARAMETER["Central_Meridian",0.0],PARAMETER["Standard_Parallel_1",60.0],UNIT["Meter",1.0]]'
 
-###############################################################################
-# Class to perform the tests.
-
-
-class ProjTest(object):
-    def __init__(self, src_srs, src_xyz, src_error,
-                 dst_srs, dst_xyz, dst_error, options, requirements):
-        self.src_srs = src_srs
-        self.src_xyz = src_xyz
-        self.src_error = src_error
-        self.dst_srs = dst_srs
-        self.dst_xyz = dst_xyz
-        self.dst_error = dst_error
-        self.options = options
-        self.requirements = requirements
-
-    def testProj(self):
-
-        import osr_ct
-        osr_ct.osr_ct_1()
-        if gdaltest.have_proj4 == 0:
-            return 'skip'
-
-        if self.requirements is not None and self.requirements[:5] == 'GRID:':
-            proj_lib = os.getenv('PROJ_LIB')
-            if proj_lib is None:
-                # print( 'PROJ_LIB unset, skipping test.' )
-                return 'skip'
-
-            try:
-                open(proj_lib + '/' + self.requirements[5:])
-            except IOError:
-                # print( 'Did not find GRID:%s' % self.requirements[5:] )
-                return 'skip'
-
-        src = osr.SpatialReference()
-        if src.SetFromUserInput(self.src_srs) != 0:
-            gdaltest.post_reason('SetFromUserInput(%s) failed.' % self.src_srs)
-            return 'fail'
-
-        dst = osr.SpatialReference()
-        if dst.SetFromUserInput(self.dst_srs) != 0:
-            gdaltest.post_reason('SetFromUserInput(%s) failed.' % self.dst_srs)
-            return 'fail'
-
-        if self.requirements is not None and self.requirements[0] != 'G':
-            additionnal_error_str = ' Check that proj version is >= %s ' % self.requirements
-        else:
-            additionnal_error_str = ''
-
-        try:
-            gdal.PushErrorHandler('CPLQuietErrorHandler')
-            ct = osr.CoordinateTransformation(src, dst)
-            gdal.PopErrorHandler()
-            if gdal.GetLastErrorMsg().find('Unable to load PROJ.4') != -1:
-                gdaltest.post_reason('PROJ.4 missing, transforms not available.')
-                return 'skip'
-        except ValueError:
-            gdal.PopErrorHandler()
-            if gdal.GetLastErrorMsg().find('Unable to load PROJ.4') != -1:
-                gdaltest.post_reason('PROJ.4 missing, transforms not available.')
-                return 'skip'
-            gdaltest.post_reason('failed to create coordinate transformation. %s' % gdal.GetLastErrorMsg())
-            return 'fail'
-        except:
-            gdal.PopErrorHandler()
-            gdaltest.post_reason('failed to create coordinate transformation. %s' % gdal.GetLastErrorMsg())
-            return 'fail'
-
-        ######################################################################
-        # Transform source point to destination SRS.
-
-        result = ct.TransformPoint(self.src_xyz[0], self.src_xyz[1], self.src_xyz[2])
-
-        error = abs(result[0] - self.dst_xyz[0]) \
-            + abs(result[1] - self.dst_xyz[1]) \
-            + abs(result[2] - self.dst_xyz[2])
-
-        if error > self.dst_error:
-            gdaltest.post_reason('Dest error is %g, got (%.15g,%.15g,%.15g)%s'
-                                 % (error, result[0], result[1], result[2], additionnal_error_str))
-            return 'fail'
-
-        ######################################################################
-        # Now transform back.
-
-        ct = osr.CoordinateTransformation(dst, src)
-
-        result = ct.TransformPoint(result[0], result[1], result[2])
-
-        error = abs(result[0] - self.src_xyz[0]) \
-            + abs(result[1] - self.src_xyz[1]) \
-            + abs(result[2] - self.src_xyz[2])
-
-        if error > self.src_error:
-            gdaltest.post_reason('Back to source error is %g.%s' % (error, additionnal_error_str))
-            return 'fail'
-
-        return 'success'
-
 ###############################################################################
 # Table of transformations, inputs and expected results (with a threshold)
 #
@@ -232,18 +132,93 @@ def testProj(self):
 ###############################################################################
 # When imported build a list of units based on the files available.
 
-gdaltest_list = []
 
-for item in transform_list:
-    ut = ProjTest(item[0], item[1], item[2],
-                  item[3], item[4], item[5],
-                  item[7], item[8])
-    gdaltest_list.append((ut.testProj, item[6]))
+@pytest.mark.parametrize(
+    'src_srs,src_xyz,src_error,dst_srs,dst_xyz,dst_error,unit_name,options,requirements',
+    transform_list,
+    ids=[row[6] for row in transform_list]
+)
+def test_proj(src_srs, src_xyz, src_error,
+             dst_srs, dst_xyz, dst_error, unit_name, options, requirements):
+
+    import osr_ct
+    osr_ct.osr_ct_1()
+    if gdaltest.have_proj4 == 0:
+        return 'skip'
+
+    if requirements is not None and requirements[:5] == 'GRID:':
+        proj_lib = os.getenv('PROJ_LIB')
+        if proj_lib is None:
+            # print( 'PROJ_LIB unset, skipping test.' )
+            return 'skip'
+
+        try:
+            open(proj_lib + '/' + requirements[5:])
+        except IOError:
+            # print( 'Did not find GRID:%s' % requirements[5:] )
+            return 'skip'
+
+    src = osr.SpatialReference()
+    if src.SetFromUserInput(src_srs) != 0:
+        gdaltest.post_reason('SetFromUserInput(%s) failed.' % src_srs)
+        return 'fail'
+
+    dst = osr.SpatialReference()
+    if dst.SetFromUserInput(dst_srs) != 0:
+        gdaltest.post_reason('SetFromUserInput(%s) failed.' % dst_srs)
+        return 'fail'
+
+    if requirements is not None and requirements[0] != 'G':
+        additionnal_error_str = ' Check that proj version is >= %s ' % requirements
+    else:
+        additionnal_error_str = ''
+
+    try:
+        gdal.PushErrorHandler('CPLQuietErrorHandler')
+        ct = osr.CoordinateTransformation(src, dst)
+        gdal.PopErrorHandler()
+        if gdal.GetLastErrorMsg().find('Unable to load PROJ.4') != -1:
+            gdaltest.post_reason('PROJ.4 missing, transforms not available.')
+            return 'skip'
+    except ValueError:
+        gdal.PopErrorHandler()
+        if gdal.GetLastErrorMsg().find('Unable to load PROJ.4') != -1:
+            gdaltest.post_reason('PROJ.4 missing, transforms not available.')
+            return 'skip'
+        gdaltest.post_reason('failed to create coordinate transformation. %s' % gdal.GetLastErrorMsg())
+        return 'fail'
+    except:
+        gdal.PopErrorHandler()
+        gdaltest.post_reason('failed to create coordinate transformation. %s' % gdal.GetLastErrorMsg())
+        return 'fail'
+
+    ######################################################################
+    # Transform source point to destination SRS.
+
+    result = ct.TransformPoint(src_xyz[0], src_xyz[1], src_xyz[2])
+
+    error = abs(result[0] - dst_xyz[0]) \
+        + abs(result[1] - dst_xyz[1]) \
+        + abs(result[2] - dst_xyz[2])
+
+    if error > dst_error:
+        gdaltest.post_reason('Dest error is %g, got (%.15g,%.15g,%.15g)%s'
+                             % (error, result[0], result[1], result[2], additionnal_error_str))
+        return 'fail'
+
+    ######################################################################
+    # Now transform back.
+
+    ct = osr.CoordinateTransformation(dst, src)
 
-if __name__ == '__main__':
+    result = ct.TransformPoint(result[0], result[1], result[2])
 
-    gdaltest.setup_run('osr_ct_proj')
+    error = abs(result[0] - src_xyz[0]) \
+        + abs(result[1] - src_xyz[1]) \
+        + abs(result[2] - src_xyz[2])
 
-    gdaltest.run_tests(gdaltest_list)
+    if error > src_error:
+        gdaltest.post_reason('Back to source error is %g.%s' % (error, additionnal_error_str))
+        return 'fail'
 
-    sys.exit(gdaltest.summarize())
+    return 'success'
diff --git a/autotest/osr/osr_metacrs.py b/autotest/osr/osr_metacrs.py
index 2f7d4fee1191..4f9638b99894 100755
--- a/autotest/osr/osr_metacrs.py
+++ b/autotest/osr/osr_metacrs.py
@@ -31,20 +31,26 @@
 ###############################################################################
 
 import os
-import sys
 import csv
 
+import pytest
 
 import gdaltest
 
 from osgeo import osr, gdal
 
+
 ###############################################################################
-# Class to perform the tests.
+# When imported build a list of units based on the files available.
 
+csv_rows = list(csv.DictReader(open(os.path.join(os.path.dirname(__file__), 'data/Test_Data_File.csv'), 'rt')))
 
-class MetaCRSTest(object):
-    def __init__(self, test_line):
+
+class TestMetaCRS(object):
+    @pytest.mark.parametrize(
+        'test_line', csv_rows, ids=[row['testName'] for row in csv_rows]
+    )
+    def test_metacrs(self, test_line):
         self.test_line = test_line
         self.src_xyz = None
         self.dst_xyz = None
@@ -52,59 +58,6 @@ def __init__(self, test_line):
         self.dst_srs = None
         self.dst_error = None
 
-    def parse_line(self):
-        test_line = self.test_line
-
-        self.src_srs = self.build_srs(test_line['srcCrsAuth'],
-                                      test_line['srcCrs'])
-        try:
-            self.dst_srs = self.build_srs(test_line['tgtCrsAuth'],
-                                          test_line['tgtCrs'])
-        except:
-            # Old style
-            self.dst_srs = self.build_srs(test_line['tgtCrsType'],
-                                          test_line['tgtCrs'])
-
-        if self.src_srs is None or self.dst_srs is None:
-            return 'fail'
-
-        try:
-            self.src_xyz = (float(test_line['srcOrd1']),
-                            float(test_line['srcOrd2']),
-                            float(test_line['srcOrd3']))
-        except:
-            self.src_xyz = (float(test_line['srcOrd1']),
-                            float(test_line['srcOrd2']),
-                            0.0)
-        try:
-            self.dst_xyz = (float(test_line['tgtOrd1']),
-                            float(test_line['tgtOrd2']),
-                            float(test_line['tgtOrd3']))
-        except:
-            self.dst_xyz = (float(test_line['tgtOrd1']),
-                            float(test_line['tgtOrd2']),
-                            0.0)
-        try:
-            self.dst_error = max(float(test_line['tolOrd1']),
-                                 float(test_line['tolOrd2']),
-                                 float(test_line['tolOrd3']))
-        except:
-            self.dst_error = max(float(test_line['tolOrd1']),
-                                 float(test_line['tolOrd2']))
-
-        return 'success'
-
-    def build_srs(self, typ, crstext):
-        if typ == 'EPSG':
-            srs = osr.SpatialReference()
-            if srs.ImportFromEPSGA(int(crstext)) == 0:
-                return srs
-            gdaltest.post_reason('failed to translate EPSG:' + crstext)
-            return None
-        gdaltest.post_reason('unsupported srs type: ' + typ)
-        return None
-
-    def testMetaCRS(self):
         result = self.parse_line()
         if result != 'success':
             return result
@@ -162,23 +115,54 @@ def testMetaCRS(self):
             return 'fail'
 
         return 'success'
+    def parse_line(self):
+        test_line = self.test_line
 
-###############################################################################
-# When imported build a list of units based on the files available.
-
-
-gdaltest_list = []
-
-csv_reader = csv.DictReader(open(os.path.join(os.path.dirname(__file__), 'data/Test_Data_File.csv'), 'rt'))
-
-for test in csv_reader:
-    ut = MetaCRSTest(test)
-    gdaltest_list.append((ut.testMetaCRS, test['testName']))
+        self.src_srs = self.build_srs(test_line['srcCrsAuth'],
+                                      test_line['srcCrs'])
+        try:
+            self.dst_srs = self.build_srs(test_line['tgtCrsAuth'],
+                                          test_line['tgtCrs'])
+        except:
+            # Old style
+            self.dst_srs = self.build_srs(test_line['tgtCrsType'],
+                                          test_line['tgtCrs'])
 
-if __name__ == '__main__':
+        if self.src_srs is None or self.dst_srs is None:
+            return 'fail'
 
-    gdaltest.setup_run('osr_metacrs')
+        try:
+            self.src_xyz = (float(test_line['srcOrd1']),
+                            float(test_line['srcOrd2']),
+                            float(test_line['srcOrd3']))
+        except:
+            self.src_xyz = (float(test_line['srcOrd1']),
+                            float(test_line['srcOrd2']),
+                            0.0)
+        try:
+            self.dst_xyz = (float(test_line['tgtOrd1']),
+                            float(test_line['tgtOrd2']),
+                            float(test_line['tgtOrd3']))
+        except:
+            self.dst_xyz = (float(test_line['tgtOrd1']),
+                            float(test_line['tgtOrd2']),
+                            0.0)
+        try:
+            self.dst_error = max(float(test_line['tolOrd1']),
+                                 float(test_line['tolOrd2']),
+                                 float(test_line['tolOrd3']))
+        except:
+            self.dst_error = max(float(test_line['tolOrd1']),
+                                 float(test_line['tolOrd2']))
 
-    gdaltest.run_tests(gdaltest_list)
+        return 'success'
 
-    sys.exit(gdaltest.summarize())
+    def build_srs(self, typ, crstext):
+        if typ == 'EPSG':
+            srs = osr.SpatialReference()
+            if srs.ImportFromEPSGA(int(crstext)) == 0:
+                return srs
+            gdaltest.post_reason('failed to translate EPSG:' + crstext)
+            return None
+        gdaltest.post_reason('unsupported srs type: ' + typ)
+        return None

From e45ca89ac191163af32f28756ad69907f5bd38c6 Mon Sep 17 00:00:00 2001
From: Craig de Stigter <craig.destigter@koordinates.com>
Date: Fri, 5 Oct 2018 22:08:41 +1300
Subject: [PATCH 127/488] Manual fixes for a strange syntax error in the
 automation

---
 autotest/ogr/ogr_dxf.py     | 2 +-
 autotest/osr/osr_metacrs.py | 3 ---
 2 files changed, 1 insertion(+), 4 deletions(-)

diff --git a/autotest/ogr/ogr_dxf.py b/autotest/ogr/ogr_dxf.py
index 4f77d0329964..c415d7aa9e22 100644
--- a/autotest/ogr/ogr_dxf.py
+++ b/autotest/ogr/ogr_dxf.py
@@ -2487,7 +2487,7 @@ def ogr_dxf_33():
 
     geom = feat.GetGeometryRef()
     if geom.GetGeometryType() != ogr.wkbPolyhedralSurfaceZ:
-        gdaltest.post_reason('did not get expected geometry type; got %s instead of wkbPolyhedralSurface', geom.GetGeometryType())
+        gdaltest.post_reason('did not get expected geometry type; got %s instead of wkbPolyhedralSurface' % geom.GetGeometryType())
         return 'fail'
 
     wkt_string = geom.ExportToIsoWkt()
diff --git a/autotest/osr/osr_metacrs.py b/autotest/osr/osr_metacrs.py
index 4f9638b99894..517cb4a32682 100755
--- a/autotest/osr/osr_metacrs.py
+++ b/autotest/osr/osr_metacrs.py
@@ -114,7 +114,6 @@ def test_metacrs(self, test_line):
 
             return 'fail'
 
-        return 'success'
     def parse_line(self):
         test_line = self.test_line
 
@@ -155,8 +154,6 @@ def parse_line(self):
             self.dst_error = max(float(test_line['tolOrd1']),
                                  float(test_line['tolOrd2']))
 
-        return 'success'
-
     def build_srs(self, typ, crstext):
         if typ == 'EPSG':
             srs = osr.SpatialReference()

From 06456cd5a1612b4ce4c4faac956fc033a39536e2 Mon Sep 17 00:00:00 2001
From: Craig de Stigter <craig.destigter@koordinates.com>
Date: Fri, 5 Oct 2018 22:39:18 +1300
Subject: [PATCH 128/488] Simplify gdaltest_list usage

Easier for the automation to handle
---
 autotest/gcore/bmp_read.py        |   7 +-
 autotest/gcore/envi_read.py       |   4 +-
 autotest/gcore/hdf4_read.py       |  26 ++-
 autotest/gcore/hfa_read.py        |   6 +-
 autotest/gcore/tiff_read.py       | 266 +++++++++++++++---------------
 autotest/gcore/vrt_read.py        |   1 -
 autotest/gdrivers/gta.py          |  14 +-
 autotest/gdrivers/jpeg_profile.py |  13 +-
 autotest/gdrivers/mrf.py          |  37 ++---
 autotest/gdrivers/png_profile.py  |  17 +-
 autotest/gdrivers/tiff_profile.py |  21 +--
 autotest/ogr/ogr_cloudant.py      |  19 +--
 autotest/ogr/ogr_gml_geom.py      | 126 +++++++-------
 autotest/ogr/ogr_wkbwkt_geom.py   |  26 +--
 autotest/ogr/ogr_wktempty.py      |   4 +-
 15 files changed, 277 insertions(+), 310 deletions(-)

diff --git a/autotest/gcore/bmp_read.py b/autotest/gcore/bmp_read.py
index da95e519a692..b73b81c5ea2b 100755
--- a/autotest/gcore/bmp_read.py
+++ b/autotest/gcore/bmp_read.py
@@ -32,10 +32,6 @@
 
 import gdaltest
 
-###############################################################################
-# When imported build a list of units based on the files available.
-
-gdaltest_list = []
 
 init_list = [
     ('1bit.bmp', 200),
@@ -77,8 +73,7 @@ def bmp_online_2():
     return tst.testOpen()
 
 
-gdaltest_list.append(bmp_online_1)
-gdaltest_list.append(bmp_online_2)
+gdaltest_list = [bmp_online_1, bmp_online_2]
 
 if __name__ == '__main__':
 
diff --git a/autotest/gcore/envi_read.py b/autotest/gcore/envi_read.py
index ef620ff044f1..51091916f214 100755
--- a/autotest/gcore/envi_read.py
+++ b/autotest/gcore/envi_read.py
@@ -57,8 +57,6 @@ def envi_1():
 # When imported build a list of units based on the files available.
 
 
-gdaltest_list = []
-
 init_list = [
     ('byte.raw', 4672),
     ('int16.raw', 4672),
@@ -83,7 +81,7 @@ def test_envi_open(filename, checksum):
     ut.testOpen()
 
 
-gdaltest_list.append(envi_1)
+gdaltest_list = [envi_1]
 
 if __name__ == '__main__':
 
diff --git a/autotest/gcore/hdf4_read.py b/autotest/gcore/hdf4_read.py
index 1ba71e4174c1..c6e3dcbf2737 100755
--- a/autotest/gcore/hdf4_read.py
+++ b/autotest/gcore/hdf4_read.py
@@ -33,10 +33,6 @@
 import gdaltest
 from osgeo import gdal
 
-###############################################################################
-# When imported build a list of units based on the files available.
-
-gdaltest_list = []
 
 init_list = [
     ('byte_3.hdf', 4672),
@@ -372,16 +368,18 @@ def hdf4_read_online_10():
     return 'success'
 
 
-gdaltest_list.append(hdf4_read_online_1)
-gdaltest_list.append(hdf4_read_online_2)
-gdaltest_list.append(hdf4_read_online_3)
-gdaltest_list.append(hdf4_read_online_4)
-gdaltest_list.append(hdf4_read_online_5)
-gdaltest_list.append(hdf4_read_online_6)
-gdaltest_list.append(hdf4_read_online_7)
-gdaltest_list.append(hdf4_read_online_8)
-gdaltest_list.append(hdf4_read_online_9)
-gdaltest_list.append(hdf4_read_online_10)
+gdaltest_list = [
+    hdf4_read_online_1,
+    hdf4_read_online_2,
+    hdf4_read_online_3,
+    hdf4_read_online_4,
+    hdf4_read_online_5,
+    hdf4_read_online_6,
+    hdf4_read_online_7,
+    hdf4_read_online_8,
+    hdf4_read_online_9,
+    hdf4_read_online_10,
+]
 
 if __name__ == '__main__':
 
diff --git a/autotest/gcore/hfa_read.py b/autotest/gcore/hfa_read.py
index f572ddb5ca0d..ebaafc433d58 100755
--- a/autotest/gcore/hfa_read.py
+++ b/autotest/gcore/hfa_read.py
@@ -35,10 +35,6 @@
 from osgeo import gdal
 import gdaltest
 
-###############################################################################
-# When imported build a list of units based on the files available.
-
-gdaltest_list = []
 
 init_list = [
     ('byte.img', 4672),
@@ -72,7 +68,7 @@ def hfa_read_completedefn_recursion():
     return 'success'
 
 
-gdaltest_list.append(hfa_read_completedefn_recursion)
+gdaltest_list = [hfa_read_completedefn_recursion]
 
 if __name__ == '__main__':
 
diff --git a/autotest/gcore/tiff_read.py b/autotest/gcore/tiff_read.py
index 0b3c64222925..d6704c8c51ad 100755
--- a/autotest/gcore/tiff_read.py
+++ b/autotest/gcore/tiff_read.py
@@ -36,11 +36,6 @@
 import gdaltest
 from osgeo import gdal, osr
 
-###############################################################################
-# When imported build a list of units based on the files available.
-
-gdaltest_list = []
-
 init_list = [
     ('byte.tif', 1, 4672),
     ('uint16_sgilog.tif', 1, 4672),
@@ -3868,136 +3863,137 @@ def tiff_read_overview_of_external_mask():
 ###############################################################################
 
 
-gdaltest_list.append(tiff_read_off)
-gdaltest_list.append(tiff_check_alpha)
-gdaltest_list.append(tiff_read_cmyk_rgba)
-gdaltest_list.append(tiff_read_cmyk_raw)
-gdaltest_list.append(tiff_read_ojpeg)
-gdaltest_list.append(tiff_read_gzip)
-gdaltest_list.append(tiff_read_zip_1)
-gdaltest_list.append(tiff_read_zip_2)
-gdaltest_list.append(tiff_read_zip_3)
-gdaltest_list.append(tiff_read_zip_4)
-gdaltest_list.append(tiff_read_zip_5)
-gdaltest_list.append(tiff_read_tar_1)
-gdaltest_list.append(tiff_read_tar_2)
-gdaltest_list.append(tiff_read_tgz_1)
-gdaltest_list.append(tiff_read_tgz_2)
-gdaltest_list.append(tiff_grads)
-gdaltest_list.append(tiff_citation)
-gdaltest_list.append(tiff_linearparmunits)
-gdaltest_list.append(tiff_linearparmunits2)
-gdaltest_list.append(tiff_g4_split)
-gdaltest_list.append(tiff_multi_images)
-gdaltest_list.append(tiff_vsimem)
-gdaltest_list.append(tiff_vsizip_and_mem)
-gdaltest_list.append(tiff_ProjectedCSTypeGeoKey_only)
-gdaltest_list.append(tiff_GTModelTypeGeoKey_only)
-gdaltest_list.append(tiff_12bitjpeg)
-gdaltest_list.append(tiff_read_stats_from_pam)
-gdaltest_list.append(tiff_read_from_tab)
-gdaltest_list.append(tiff_read_pixelispoint)
-gdaltest_list.append(tiff_read_geomatrix)
-gdaltest_list.append(tiff_read_corrupted_gtiff)
-gdaltest_list.append(tiff_read_tag_without_null_byte)
-gdaltest_list.append(tiff_read_buggy_packbits)
-gdaltest_list.append(tiff_read_rpc_txt)
-gdaltest_list.append(tiff_read_rpc_tif)
-gdaltest_list.append(tiff_small)
-gdaltest_list.append(tiff_dos_strip_chop)
-gdaltest_list.append(tiff_read_exif_and_gps)
-gdaltest_list.append(tiff_jpeg_rgba_pixel_interleaved)
-gdaltest_list.append(tiff_jpeg_rgba_band_interleaved)
-gdaltest_list.append(tiff_read_huge4GB)
-gdaltest_list.append(tiff_read_bigtiff)
-gdaltest_list.append(tiff_read_tiff_metadata)
-gdaltest_list.append(tiff_read_irregular_tile_size_jpeg_in_tiff)
-gdaltest_list.append(tiff_direct_and_virtual_mem_io)
-gdaltest_list.append(tiff_read_empty_nodata_tag)
-gdaltest_list.append(tiff_read_strace_check)
-gdaltest_list.append(tiff_read_readdir_limit_on_open)
-gdaltest_list.append(tiff_read_minisblack_as_rgba)
-gdaltest_list.append(tiff_read_colortable_as_rgba)
-gdaltest_list.append(tiff_read_logl_as_rgba)
-gdaltest_list.append(tiff_read_strip_separate_as_rgba)
-gdaltest_list.append(tiff_read_tiled_separate_as_rgba)
-gdaltest_list.append(tiff_read_scanline_more_than_2GB)
-gdaltest_list.append(tiff_read_wrong_number_extrasamples)
-gdaltest_list.append(tiff_read_one_strip_no_bytecount)
-
-gdaltest_list.append(tiff_read_md1)
-gdaltest_list.append(tiff_read_md2)
-gdaltest_list.append(tiff_read_md3)
-gdaltest_list.append(tiff_read_md4)
-gdaltest_list.append(tiff_read_md5)
-gdaltest_list.append(tiff_read_md6)
-gdaltest_list.append(tiff_read_md7)
-gdaltest_list.append(tiff_read_md8)
-gdaltest_list.append(tiff_read_md9)
-gdaltest_list.append(tiff_read_md10)
-gdaltest_list.append(tiff_read_md11)
-gdaltest_list.append(tiff_read_md12)
-
-gdaltest_list.append(tiff_read_nogeoref)
-gdaltest_list.append(tiff_read_inconsistent_georef)
-gdaltest_list.append(tiff_read_gcp_internal_and_auxxml)
-
-gdaltest_list.append(tiff_read_aux)
-
-gdaltest_list.append(tiff_read_one_band_from_two_bands)
-
-gdaltest_list.append(tiff_read_jpeg_cloud_optimized)
-gdaltest_list.append(tiff_read_corrupted_jpeg_cloud_optimized)
-
-gdaltest_list.append(tiff_read_ycbcr_lzw)
-gdaltest_list.append(tiff_read_ycbcr_int12)
-
-gdaltest_list.append(tiff_read_unit_from_srs)
-gdaltest_list.append(tiff_read_arcgis93_geodataxform_gcp)
-gdaltest_list.append(tiff_read_block_width_above_32bit)
-gdaltest_list.append(tiff_read_image_width_above_32bit)
-gdaltest_list.append(tiff_read_second_image_width_above_32bit)
-gdaltest_list.append(tiff_read_minimum_tiff_tags_no_warning)
-gdaltest_list.append(tiff_read_minimum_tiff_tags_with_warning)
-gdaltest_list.append(tiff_read_unknown_compression)
-gdaltest_list.append(tiff_read_leak_ZIPSetupDecode)
-gdaltest_list.append(tiff_read_excessive_memory_TIFFFillStrip)
-gdaltest_list.append(tiff_read_excessive_memory_TIFFFillStrip2)
-gdaltest_list.append(tiff_read_excessive_memory_TIFFFillTile)
-gdaltest_list.append(tiff_read_big_strip)
-gdaltest_list.append(tiff_read_big_strip_chunky_way)
-gdaltest_list.append(tiff_read_big_tile)
-gdaltest_list.append(tiff_read_huge_tile)
-gdaltest_list.append(tiff_read_huge_number_strips)
-gdaltest_list.append(tiff_read_huge_implied_number_strips)
-gdaltest_list.append(tiff_read_many_blocks)
-gdaltest_list.append(tiff_read_many_blocks_truncated)
-gdaltest_list.append(tiff_read_uint33)
-gdaltest_list.append(tiff_read_corrupted_deflate_singlestrip)
-gdaltest_list.append(tiff_read_packbits_not_enough_data)
-gdaltest_list.append(tiff_read_toomanyblocks)
-gdaltest_list.append(tiff_read_toomanyblocks_separate)
-gdaltest_list.append(tiff_read_size_of_stripbytecount_lower_than_stripcount)
-gdaltest_list.append(tiff_read_stripoffset_types)
-gdaltest_list.append(tiff_read_progressive_jpeg_denial_of_service)
-gdaltest_list.append(tiff_read_old_style_lzw)
-gdaltest_list.append(tiff_read_mmap_interface)
-gdaltest_list.append(tiff_read_jpeg_too_big_last_stripe)
-gdaltest_list.append(tiff_read_negative_scaley)
-gdaltest_list.append(tiff_read_zstd)
-gdaltest_list.append(tiff_read_zstd_corrupted)
-gdaltest_list.append(tiff_read_zstd_corrupted2)
-gdaltest_list.append(tiff_read_1bit_2bands)
-gdaltest_list.append(tiff_read_lerc)
-gdaltest_list.append(tiff_read_overview_of_external_mask)
-
-gdaltest_list.append(tiff_read_online_1)
-gdaltest_list.append(tiff_read_online_2)
-
-gdaltest_list.append((tiff_read_webp))
-gdaltest_list.append((tiff_read_webp_huge_single_strip))
-
-# gdaltest_list = [ tiff_read_mmap_interface ]
+gdaltest_list = [
+    tiff_read_off,
+    tiff_check_alpha,
+    tiff_read_cmyk_rgba,
+    tiff_read_cmyk_raw,
+    tiff_read_ojpeg,
+    tiff_read_gzip,
+    tiff_read_zip_1,
+    tiff_read_zip_2,
+    tiff_read_zip_3,
+    tiff_read_zip_4,
+    tiff_read_zip_5,
+    tiff_read_tar_1,
+    tiff_read_tar_2,
+    tiff_read_tgz_1,
+    tiff_read_tgz_2,
+    tiff_grads,
+    tiff_citation,
+    tiff_linearparmunits,
+    tiff_linearparmunits2,
+    tiff_g4_split,
+    tiff_multi_images,
+    tiff_vsimem,
+    tiff_vsizip_and_mem,
+    tiff_ProjectedCSTypeGeoKey_only,
+    tiff_GTModelTypeGeoKey_only,
+    tiff_12bitjpeg,
+    tiff_read_stats_from_pam,
+    tiff_read_from_tab,
+    tiff_read_pixelispoint,
+    tiff_read_geomatrix,
+    tiff_read_corrupted_gtiff,
+    tiff_read_tag_without_null_byte,
+    tiff_read_buggy_packbits,
+    tiff_read_rpc_txt,
+    tiff_read_rpc_tif,
+    tiff_small,
+    tiff_dos_strip_chop,
+    tiff_read_exif_and_gps,
+    tiff_jpeg_rgba_pixel_interleaved,
+    tiff_jpeg_rgba_band_interleaved,
+    tiff_read_huge4GB,
+    tiff_read_bigtiff,
+    tiff_read_tiff_metadata,
+    tiff_read_irregular_tile_size_jpeg_in_tiff,
+    tiff_direct_and_virtual_mem_io,
+    tiff_read_empty_nodata_tag,
+    tiff_read_strace_check,
+    tiff_read_readdir_limit_on_open,
+    tiff_read_minisblack_as_rgba,
+    tiff_read_colortable_as_rgba,
+    tiff_read_logl_as_rgba,
+    tiff_read_strip_separate_as_rgba,
+    tiff_read_tiled_separate_as_rgba,
+    tiff_read_scanline_more_than_2GB,
+    tiff_read_wrong_number_extrasamples,
+    tiff_read_one_strip_no_bytecount,
+
+    tiff_read_md1,
+    tiff_read_md2,
+    tiff_read_md3,
+    tiff_read_md4,
+    tiff_read_md5,
+    tiff_read_md6,
+    tiff_read_md7,
+    tiff_read_md8,
+    tiff_read_md9,
+    tiff_read_md10,
+    tiff_read_md11,
+    tiff_read_md12,
+
+    tiff_read_nogeoref,
+    tiff_read_inconsistent_georef,
+    tiff_read_gcp_internal_and_auxxml,
+
+    tiff_read_aux,
+
+    tiff_read_one_band_from_two_bands,
+
+    tiff_read_jpeg_cloud_optimized,
+    tiff_read_corrupted_jpeg_cloud_optimized,
+
+    tiff_read_ycbcr_lzw,
+    tiff_read_ycbcr_int12,
+
+    tiff_read_unit_from_srs,
+    tiff_read_arcgis93_geodataxform_gcp,
+    tiff_read_block_width_above_32bit,
+    tiff_read_image_width_above_32bit,
+    tiff_read_second_image_width_above_32bit,
+    tiff_read_minimum_tiff_tags_no_warning,
+    tiff_read_minimum_tiff_tags_with_warning,
+    tiff_read_unknown_compression,
+    tiff_read_leak_ZIPSetupDecode,
+    tiff_read_excessive_memory_TIFFFillStrip,
+    tiff_read_excessive_memory_TIFFFillStrip2,
+    tiff_read_excessive_memory_TIFFFillTile,
+    tiff_read_big_strip,
+    tiff_read_big_strip_chunky_way,
+    tiff_read_big_tile,
+    tiff_read_huge_tile,
+    tiff_read_huge_number_strips,
+    tiff_read_huge_implied_number_strips,
+    tiff_read_many_blocks,
+    tiff_read_many_blocks_truncated,
+    tiff_read_uint33,
+    tiff_read_corrupted_deflate_singlestrip,
+    tiff_read_packbits_not_enough_data,
+    tiff_read_toomanyblocks,
+    tiff_read_toomanyblocks_separate,
+    tiff_read_size_of_stripbytecount_lower_than_stripcount,
+    tiff_read_stripoffset_types,
+    tiff_read_progressive_jpeg_denial_of_service,
+    tiff_read_old_style_lzw,
+    tiff_read_mmap_interface,
+    tiff_read_jpeg_too_big_last_stripe,
+    tiff_read_negative_scaley,
+    tiff_read_zstd,
+    tiff_read_zstd_corrupted,
+    tiff_read_zstd_corrupted2,
+    tiff_read_1bit_2bands,
+    tiff_read_lerc,
+    tiff_read_overview_of_external_mask,
+
+    tiff_read_online_1,
+    tiff_read_online_2,
+
+    tiff_read_webp,
+    tiff_read_webp_huge_single_strip,
+]
+
 
 if __name__ == '__main__':
 
diff --git a/autotest/gcore/vrt_read.py b/autotest/gcore/vrt_read.py
index e1894cc73bc9..53b0cbc0b76f 100755
--- a/autotest/gcore/vrt_read.py
+++ b/autotest/gcore/vrt_read.py
@@ -44,7 +44,6 @@
 ###############################################################################
 # When imported build a list of units based on the files available.
 
-gdaltest_list = []
 
 init_list = [
     ('byte.vrt', 4672),
diff --git a/autotest/gdrivers/gta.py b/autotest/gdrivers/gta.py
index d9685d522e4c..1be1a356d050 100755
--- a/autotest/gdrivers/gta.py
+++ b/autotest/gdrivers/gta.py
@@ -36,8 +36,6 @@
 from osgeo import gdal
 
 
-gdaltest_list = []
-
 init_list = [
     ('byte.tif', 4672),
     ('byte_signed.tif', 4672),
@@ -278,11 +276,13 @@ def test_gta_create(filename, checksum):
     ut.testCreateCopy()
 
 
-gdaltest_list.append(gta_1)
-gdaltest_list.append(gta_2)
-gdaltest_list.append(gta_3)
-gdaltest_list.append(gta_4)
-gdaltest_list.append(gta_5)
+gdaltest_list = [
+    gta_1,
+    gta_2,
+    gta_3,
+    gta_4,
+    gta_5,
+]
 
 if __name__ == '__main__':
 
diff --git a/autotest/gdrivers/jpeg_profile.py b/autotest/gdrivers/jpeg_profile.py
index 13fe6982d721..c0bb8c7a77ba 100755
--- a/autotest/gdrivers/jpeg_profile.py
+++ b/autotest/gdrivers/jpeg_profile.py
@@ -38,11 +38,6 @@
 import gdaltest
 from osgeo import gdal
 
-###############################################################################
-# When imported build a list of units based on the files available.
-
-gdaltest_list = []
-
 
 ###############################################################################
 # Test writing and reading of ICC profile in CreateCopy()
@@ -215,9 +210,11 @@ def jpeg_copy_icc_64K():
 ###############################################################################################
 
 
-gdaltest_list.append(jpeg_copy_icc)
-gdaltest_list.append(jpeg_copy_options_icc)
-gdaltest_list.append(jpeg_copy_icc_64K)
+gdaltest_list = [
+    jpeg_copy_icc,
+    jpeg_copy_options_icc,
+    jpeg_copy_icc_64K,
+]
 
 if __name__ == '__main__':
 
diff --git a/autotest/gdrivers/mrf.py b/autotest/gdrivers/mrf.py
index e15fa7385d13..355a13087d58 100755
--- a/autotest/gdrivers/mrf.py
+++ b/autotest/gdrivers/mrf.py
@@ -747,25 +747,24 @@ def mrf_cleanup():
     return 'success'
 
 
-gdaltest_list = []
-
-
-gdaltest_list += [mrf_overview_near_fact_2]
-gdaltest_list += [mrf_overview_near_with_nodata_fact_2]
-gdaltest_list += [mrf_overview_avg_fact_2]
-gdaltest_list += [mrf_overview_avg_with_nodata_fact_2]
-gdaltest_list += [mrf_overview_near_fact_3]
-gdaltest_list += [mrf_overview_avg_fact_3]
-gdaltest_list += [mrf_overview_avg_with_nodata_fact_3]
-gdaltest_list += [mrf_overview_partial_block]
-gdaltest_list += [mrf_overview_near_implicit_level]
-gdaltest_list += [mrf_overview_external]
-gdaltest_list += [mrf_lerc_nodata]
-gdaltest_list += [mrf_lerc_with_huffman]
-gdaltest_list += [mrf_cached_source]
-gdaltest_list += [mrf_versioned]
-gdaltest_list += [mrf_zen_test]
-gdaltest_list += [mrf_cleanup]
+gdaltest_list = [
+    mrf_overview_near_fact_2,
+    mrf_overview_near_with_nodata_fact_2,
+    mrf_overview_avg_fact_2,
+    mrf_overview_avg_with_nodata_fact_2,
+    mrf_overview_near_fact_3,
+    mrf_overview_avg_fact_3,
+    mrf_overview_avg_with_nodata_fact_3,
+    mrf_overview_partial_block,
+    mrf_overview_near_implicit_level,
+    mrf_overview_external,
+    mrf_lerc_nodata,
+    mrf_lerc_with_huffman,
+    mrf_cached_source,
+    mrf_versioned,
+    mrf_zen_test,
+    mrf_cleanup,
+]
 
 if __name__ == '__main__':
 
diff --git a/autotest/gdrivers/png_profile.py b/autotest/gdrivers/png_profile.py
index 30b64709e948..eccbf8182c99 100755
--- a/autotest/gdrivers/png_profile.py
+++ b/autotest/gdrivers/png_profile.py
@@ -38,11 +38,6 @@
 import gdaltest
 from osgeo import gdal
 
-###############################################################################
-# When imported build a list of units based on the files available.
-
-gdaltest_list = []
-
 
 ###############################################################################
 # Test writing and reading of ICC profile in CreateCopy()
@@ -365,11 +360,13 @@ def png_sRGB():
 ############################################################################
 
 
-gdaltest_list.append(png_copy_icc)
-gdaltest_list.append(png_copy_options_icc)
-gdaltest_list.append(png_copy_options_colorimetric_data)
-gdaltest_list.append(png_copy_colorimetric_data)
-gdaltest_list.append(png_sRGB)
+gdaltest_list = [
+    png_copy_icc,
+    png_copy_options_icc,
+    png_copy_options_colorimetric_data,
+    png_copy_colorimetric_data,
+    png_sRGB,
+]
 
 if __name__ == '__main__':
 
diff --git a/autotest/gdrivers/tiff_profile.py b/autotest/gdrivers/tiff_profile.py
index 5ec39e65ee60..8279108ce530 100755
--- a/autotest/gdrivers/tiff_profile.py
+++ b/autotest/gdrivers/tiff_profile.py
@@ -38,11 +38,6 @@
 import gdaltest
 from osgeo import gdal
 
-###############################################################################
-# When imported build a list of units based on the files available.
-
-gdaltest_list = []
-
 
 ###############################################################################
 # Test writing and reading of ICC profile in Create() options
@@ -519,13 +514,15 @@ def tiff_update_colorimetric():
 ############################################################################
 
 
-gdaltest_list.append(tiff_write_icc)
-gdaltest_list.append(tiff_copy_icc)
-gdaltest_list.append(tiff_copy_options_icc)
-gdaltest_list.append(tiff_copy_options_colorimetric_data)
-gdaltest_list.append(tiff_copy_colorimetric_data)
-gdaltest_list.append(tiff_update_icc)
-gdaltest_list.append(tiff_update_colorimetric)
+gdaltest_list = [
+    tiff_write_icc,
+    tiff_copy_icc,
+    tiff_copy_options_icc,
+    tiff_copy_options_colorimetric_data,
+    tiff_copy_colorimetric_data,
+    tiff_update_icc,
+    tiff_update_colorimetric,
+]
 
 if __name__ == '__main__':
 
diff --git a/autotest/ogr/ogr_cloudant.py b/autotest/ogr/ogr_cloudant.py
index 443dd0ebc6f6..6b8eb8dced25 100755
--- a/autotest/ogr/ogr_cloudant.py
+++ b/autotest/ogr/ogr_cloudant.py
@@ -205,17 +205,14 @@ def ogr_cloudant_SetSpatialFilter():
     return 'success'
 
 
-if gdaltest.skip_on_travis():
-    gdaltest_list = []
-else:
-    gdaltest_list = [
-        ogr_cloudant_init,
-        ogr_cloudant_GetFeatureCount,
-        ogr_cloudant_GetNextFeature,
-        ogr_cloudant_GetSpatialRef,
-        ogr_cloudant_GetExtent,
-        ogr_cloudant_SetSpatialFilter
-    ]
+gdaltest_list = [
+    ogr_cloudant_init,
+    ogr_cloudant_GetFeatureCount,
+    ogr_cloudant_GetNextFeature,
+    ogr_cloudant_GetSpatialRef,
+    ogr_cloudant_GetExtent,
+    ogr_cloudant_SetSpatialFilter
+]
 
 if __name__ == '__main__':
 
diff --git a/autotest/ogr/ogr_gml_geom.py b/autotest/ogr/ogr_gml_geom.py
index 9f035f713827..43b68000ae6a 100755
--- a/autotest/ogr/ogr_gml_geom.py
+++ b/autotest/ogr/ogr_gml_geom.py
@@ -2442,69 +2442,69 @@ def gml_write_gml_ns():
 # sys.stdin.readline()
 
 
-gdaltest_list = []
-
-
-gdaltest_list.append(gml_space_test)
-gdaltest_list.append(gml_pos_point)
-gdaltest_list.append(gml_pos_polygon)
-gdaltest_list.append(gml_posList_line)
-gdaltest_list.append(gml_posList_line3d)
-gdaltest_list.append(gml_posList_line3d_2)
-gdaltest_list.append(gml_polygon)
-gdaltest_list.append(gml_out_point_srs)
-gdaltest_list.append(gml_out_point3d_srs)
-gdaltest_list.append(gml_out_linestring_srs)
-gdaltest_list.append(gml_out_polygon_srs)
-gdaltest_list.append(gml_out_multipoint_srs)
-gdaltest_list.append(gml_out_multilinestring_srs)
-gdaltest_list.append(gml_out_multipolygon_srs)
-gdaltest_list.append(gml_out_geometrycollection_srs)
-gdaltest_list.append(gml_Box)
-gdaltest_list.append(gml_Envelope)
-gdaltest_list.append(gml_Curve)
-gdaltest_list.append(gml_Curve_with_pointProperty)
-gdaltest_list.append(gml_MultiCurve)
-gdaltest_list.append(gml_MultiSurface)
-gdaltest_list.append(gml_MultiSurface_surfaceMembers)
-gdaltest_list.append(gml_MultiCurve_curveMembers)
-gdaltest_list.append(gml_MultiGeometry_geometryMembers)
-gdaltest_list.append(gml_CompositeCurve_curveMembers)
-gdaltest_list.append(gml_MultiCurve_pointMembers)
-gdaltest_list.append(gml_Solid)
-gdaltest_list.append(gml_OrientableSurface)
-gdaltest_list.append(gml_Triangle)
-gdaltest_list.append(gml_Rectangle)
-gdaltest_list.append(gml_Tin)
-gdaltest_list.append(gml_PolyhedralSurface)
-gdaltest_list.append(gml_ConcatenatedDeduplication)
-# gdaltest_list.append( gml_out_precision )
-gdaltest_list.append(gml_invalid_geoms)
-gdaltest_list.append(gml_write_gml3_geometries)
-gdaltest_list.append(gml_write_gml3_srs)
-gdaltest_list.append(gml_nested)
-gdaltest_list.append(gml_SimplePolygon)
-gdaltest_list.append(gml_SimpleRectangle)
-gdaltest_list.append(gml_SimpleTriangle)
-gdaltest_list.append(gml_SimpleMultiPoint)
-gdaltest_list.append(gml_CompositeCurveInRing)
-gdaltest_list.append(gml_CompositeSurface_in_surfaceMembers)
-gdaltest_list.append(gml_MultiSurfaceOfSurfaceOfPolygonPatchWithInteriorRing)
-gdaltest_list.append(gml_Coordinates_ts_cs_decimal)
-gdaltest_list.append(gml_with_xml_header_and_comments)
-gdaltest_list.append(gml_srsDimension_topgeometry)
-gdaltest_list.append(gml_Arc)
-gdaltest_list.append(gml_ArcByBulge)
-gdaltest_list.append(gml_ArcByCenterPoint)
-gdaltest_list.append(gml_CompoundCurve_of_ArcByCenterPoint)
-gdaltest_list.append(gml_CircleByCenterPoint)
-gdaltest_list.append(gml_Circle)
-gdaltest_list.append(gml_ArcString)
-gdaltest_list.append(gml_OGRCompoundCurve)
-gdaltest_list.append(gml_OGRCurvePolygon)
-gdaltest_list.append(gml_OGRMultiSurface)
-gdaltest_list.append(gml_OGRMultiCurve)
-gdaltest_list.append(gml_write_gml_ns)
+gdaltest_list = [
+    gml_space_test,
+    gml_pos_point,
+    gml_pos_polygon,
+    gml_posList_line,
+    gml_posList_line3d,
+    gml_posList_line3d_2,
+    gml_polygon,
+    gml_out_point_srs,
+    gml_out_point3d_srs,
+    gml_out_linestring_srs,
+    gml_out_polygon_srs,
+    gml_out_multipoint_srs,
+    gml_out_multilinestring_srs,
+    gml_out_multipolygon_srs,
+    gml_out_geometrycollection_srs,
+    gml_Box,
+    gml_Envelope,
+    gml_Curve,
+    gml_Curve_with_pointProperty,
+    gml_MultiCurve,
+    gml_MultiSurface,
+    gml_MultiSurface_surfaceMembers,
+    gml_MultiCurve_curveMembers,
+    gml_MultiGeometry_geometryMembers,
+    gml_CompositeCurve_curveMembers,
+    gml_MultiCurve_pointMembers,
+    gml_Solid,
+    gml_OrientableSurface,
+    gml_Triangle,
+    gml_Rectangle,
+    gml_Tin,
+    gml_PolyhedralSurface,
+    gml_ConcatenatedDeduplication,
+    # gml_out_precision,
+    gml_invalid_geoms,
+    gml_write_gml3_geometries,
+    gml_write_gml3_srs,
+    gml_nested,
+    gml_SimplePolygon,
+    gml_SimpleRectangle,
+    gml_SimpleTriangle,
+    gml_SimpleMultiPoint,
+    gml_CompositeCurveInRing,
+    gml_CompositeSurface_in_surfaceMembers,
+    gml_MultiSurfaceOfSurfaceOfPolygonPatchWithInteriorRing,
+    gml_Coordinates_ts_cs_decimal,
+    gml_with_xml_header_and_comments,
+    gml_srsDimension_topgeometry,
+    gml_Arc,
+    gml_ArcByBulge,
+    gml_ArcByCenterPoint,
+    gml_CompoundCurve_of_ArcByCenterPoint,
+    gml_CircleByCenterPoint,
+    gml_Circle,
+    gml_ArcString,
+    gml_OGRCompoundCurve,
+    gml_OGRCurvePolygon,
+    gml_OGRMultiSurface,
+    gml_OGRMultiCurve,
+    gml_write_gml_ns,
+]
+
 
 if __name__ == '__main__':
 
diff --git a/autotest/ogr/ogr_wkbwkt_geom.py b/autotest/ogr/ogr_wkbwkt_geom.py
index a16fd49b7299..763a70d1ff87 100755
--- a/autotest/ogr/ogr_wkbwkt_geom.py
+++ b/autotest/ogr/ogr_wkbwkt_geom.py
@@ -680,19 +680,19 @@ def ogr_wkt_multipolygon_corrupted():
 # sys.stdin.readline()
 
 
-gdaltest_list = []
-
-gdaltest_list.append(ogr_wkbwkt_geom_bigexponents)
-gdaltest_list.append(ogr_wkbwkt_test_broken_geom)
-gdaltest_list.append(ogr_wkbwkt_test_import_wkt_sf12)
-gdaltest_list.append(ogr_wkbwkt_test_import_bad_multipoint_wkb)
-gdaltest_list.append(ogr_wkbwkt_test_geometrycollection_wktwkb)
-gdaltest_list.append(ogr_wkbwkt_test_geometrycollection_wkt_recursion)
-gdaltest_list.append(ogr_wkbwkt_test_geometrycollection_wkb_recursion)
-gdaltest_list.append(ogr_wkbwkt_export_wkt_iso_multipoint)
-gdaltest_list.append(ogr_wkt_inf_nan)
-gdaltest_list.append(ogr_wkt_multicurve_compoundcurve_corrupted)
-gdaltest_list.append(ogr_wkt_multipolygon_corrupted)
+gdaltest_list = [
+    ogr_wkbwkt_geom_bigexponents,
+    ogr_wkbwkt_test_broken_geom,
+    ogr_wkbwkt_test_import_wkt_sf12,
+    ogr_wkbwkt_test_import_bad_multipoint_wkb,
+    ogr_wkbwkt_test_geometrycollection_wktwkb,
+    ogr_wkbwkt_test_geometrycollection_wkt_recursion,
+    ogr_wkbwkt_test_geometrycollection_wkb_recursion,
+    ogr_wkbwkt_export_wkt_iso_multipoint,
+    ogr_wkt_inf_nan,
+    ogr_wkt_multicurve_compoundcurve_corrupted,
+    ogr_wkt_multipolygon_corrupted,
+]
 
 if __name__ == '__main__':
 
diff --git a/autotest/ogr/ogr_wktempty.py b/autotest/ogr/ogr_wktempty.py
index 3e37eede4d19..4c429cd28122 100755
--- a/autotest/ogr/ogr_wktempty.py
+++ b/autotest/ogr/ogr_wktempty.py
@@ -150,9 +150,7 @@ def ogr_wktempty_test_partial_empty_geoms():
     return 'success'
 
 
-gdaltest_list = []
-
-gdaltest_list.append(ogr_wktempty_test_partial_empty_geoms)
+gdaltest_list = [ogr_wktempty_test_partial_empty_geoms]
 
 if __name__ == '__main__':
 

From 0c7b2b34e8e3655bf34cc2c8aded94bf711f4cbe Mon Sep 17 00:00:00 2001
From: Craig de Stigter <craig.destigter@koordinates.com>
Date: Wed, 17 Oct 2018 10:33:26 +1300
Subject: [PATCH 129/488] Remove some no-longer-necessary stuff from gdaltest
 module

---
 autotest/conftest.py       |   9 +-
 autotest/pymod/gdaltest.py | 192 +------------------------------------
 autotest/run_all.py        |  76 ---------------
 3 files changed, 13 insertions(+), 264 deletions(-)
 delete mode 100755 autotest/run_all.py

diff --git a/autotest/conftest.py b/autotest/conftest.py
index 75eebfef102e..15a7b9af9333 100644
--- a/autotest/conftest.py
+++ b/autotest/conftest.py
@@ -1,5 +1,5 @@
 # coding: utf-8
-from __future__ import absolute_import, division, print_function, unicode_literals
+from __future__ import absolute_import, division, print_function
 
 import os
 import sys
@@ -15,6 +15,13 @@
 # So we skip searching them during test collection.
 collect_ignore = ["gdrivers/netcdf_cfchecks.py"]
 
+# we set ECW to not resolve projection and datum strings to get 3.x behavior.
+gdal.SetConfigOption("ECW_DO_NOT_RESOLVE_DATUM_PROJECTION", "YES")
+
+if 'APPLY_LOCALE' in os.environ:
+    import locale
+    locale.setlocale(locale.LC_ALL, '')
+
 
 @pytest.fixture(scope="module", autouse=True)
 def chdir_to_test_file(request):
diff --git a/autotest/pymod/gdaltest.py b/autotest/pymod/gdaltest.py
index 4f78f1b146de..05f346c1da6d 100644
--- a/autotest/pymod/gdaltest.py
+++ b/autotest/pymod/gdaltest.py
@@ -30,6 +30,7 @@
 ###############################################################################
 
 import contextlib
+import math
 import os
 import os.path
 import stat
@@ -80,18 +81,6 @@
 ###############################################################################
 
 
-def setup_run(name):
-
-    if 'APPLY_LOCALE' in os.environ:
-        import locale
-        locale.setlocale(locale.LC_ALL, '')
-
-    global cur_name
-    cur_name = name
-
-###############################################################################
-
-
 def git_status():
 
     out, _ = runexternal_out_and_err('git status --porcelain .')
@@ -226,143 +215,6 @@ def post_reason(msg, frames=2):
 ###############################################################################
 
 
-def summarize():
-    global count_skipped_tests_download, count_skipped_tests_slow
-    global success_counter, failure_counter, blow_counter, skip_counter
-    global cur_name
-    global start_time, end_time
-
-    print('')
-    if cur_name is not None:
-        print('Test Script: %s' % cur_name)
-    print('Succeeded: %d' % success_counter)
-    print('Failed:    %d (%d blew exceptions)'
-          % (failure_counter + blow_counter, blow_counter))
-    print('Skipped:   %d' % skip_counter)
-    print('Expected fail:%d' % expected_failure_counter)
-    if start_time is not None:
-        duration = end_time - start_time
-        if duration >= 60:
-            print('Duration:  %02dm%02.1fs' % (duration / 60., duration % 60.))
-        else:
-            print('Duration:  %02.2fs' % duration)
-    if count_skipped_tests_download != 0:
-        print('As GDAL_DOWNLOAD_TEST_DATA environment variable is not defined or set to NO, %d tests relying on data to downloaded from the Web have been skipped' % count_skipped_tests_download)
-    if count_skipped_tests_slow != 0:
-        print('As GDAL_RUN_SLOW_TESTS environment variable is not defined or set to NO, %d "slow" tests have been skipped' % count_skipped_tests_slow)
-    print('')
-
-    sys.path.append('gcore')
-    sys.path.append('../gcore')
-    import testnonboundtoswig
-    # Do it twice to ensure that cleanup routines properly do their jobs
-    for _ in range(2):
-        testnonboundtoswig.OSRCleanup()
-        testnonboundtoswig.GDALDestroyDriverManager()
-        testnonboundtoswig.OGRCleanupAll()
-
-    return failure_counter + blow_counter
-
-###############################################################################
-
-
-def run_all(dirlist, run_as_external=False):
-
-    global start_time, end_time
-    global cur_name
-
-    start_time = time.time()
-
-    for dir_name in dirlist:
-        files = os.listdir(dir_name)
-
-        old_path = sys.path
-        # We prepend '.' rather than append it, so that "import rasterio"
-        # imports our rasterio.py and not another famous external package.
-        sys.path = ['.'] + sys.path
-
-        for filename in files:
-            if not filename.endswith('.py'):
-                continue
-
-            # Do not use rstrip here since 'test_ogr2ogr_py.py'.rstrip('.py') returns 'test_ogr2ogr_'
-            module = filename[0:-len('.py')]
-            try:
-                wd = os.getcwd()
-                os.chdir(dir_name)
-
-                # Even try to import as module in run_as_external case
-                # so as to be able to detect ImportError and skip them
-                exec("import " + module)
-
-                if run_as_external:
-
-                    exec("%s.gdaltest_list" % module)
-
-                    python_exe = sys.executable
-                    if sys.platform == 'win32':
-                        python_exe = python_exe.replace('\\', '/')
-
-                    print('Running %s/%s...' % (dir_name, filename))
-                    if 'GDALTEST_ASAN_OPTIONS' in os.environ:
-                        if 'ASAN_OPTIONS' in os.environ:
-                            backup_asan_options = os.environ['ASAN_OPTIONS']
-                        else:
-                            backup_asan_options = None
-                        os.environ['ASAN_OPTIONS'] = os.environ['GDALTEST_ASAN_OPTIONS']
-                    ret = runexternal(python_exe + """ -c "import %s; import sys; sys.path.append('../pymod'); import gdaltest; gdaltest.run_tests( %s.gdaltest_list ); gdaltest.summarize()" """ % (module, module), display_live_on_parent_stdout=True)
-                    if 'GDALTEST_ASAN_OPTIONS' in os.environ:
-                        if backup_asan_options is None:
-                            del os.environ['ASAN_OPTIONS']
-                        else:
-                            os.environ['ASAN_OPTIONS'] = backup_asan_options
-
-                    global success_counter, failure_counter, failure_summary
-                    if ret.find('Failed:    0') < 0:
-                        failure_counter += 1
-                        failure_summary.append(dir_name + '/' + filename)
-                    else:
-                        success_counter += 1
-                else:
-                    try:
-                        print('Running tests from %s/%s' % (dir_name, filename))
-                        setup_run('%s/%s' % (dir_name, filename))
-                        exec("run_tests( " + module + ".gdaltest_list)")
-                    except KeyboardInterrupt:
-                        raise
-                    except:
-                        # import traceback
-                        # traceback.print_exc(file=sys.stderr)
-                        pass
-
-                os.chdir(wd)
-
-            except KeyboardInterrupt:
-                raise
-            except:
-                os.chdir(wd)
-                print('... failed to load %s ... skipping.' % filename)
-
-                import traceback
-                traceback.print_exc()
-
-        # We only add the tool directory to the python path long enough
-        # to load the tool files.
-        sys.path = old_path
-
-    end_time = time.time()
-    cur_name = None
-
-    if failure_summary:
-        print('')
-        print(' ------------ Failures ------------')
-        for item in failure_summary:
-            print(item)
-        print(' ----------------------------------')
-
-###############################################################################
-
-
 def clean_tmp():
     all_files = os.listdir('tmp')
     for filename in all_files:
@@ -373,7 +225,6 @@ def clean_tmp():
             os.remove('tmp/' + filename)
         except OSError:
             pass
-    return 'success'
 
 ###############################################################################
 
@@ -776,8 +627,6 @@ def testCreateCopy(self, check_minmax=1, check_gt=0, check_srs=None,
         if gdal.GetConfigOption('CPL_DEBUG', 'OFF') != 'ON' and delete_copy == 1:
             self.driver.Delete(new_filename)
 
-        return 'success'
-
     def testCreate(self, vsimem=0, new_filename=None, out_bands=1,
                    check_minmax=1, dest_open_options=None):
         if self.testDriver() == 'fail':
@@ -864,8 +713,6 @@ def testCreate(self, vsimem=0, new_filename=None, out_bands=1,
         if gdal.GetConfigOption('CPL_DEBUG', 'OFF') != 'ON':
             self.driver.Delete(new_filename)
 
-        return 'success'
-
     def testSetGeoTransform(self):
         if self.testDriver() == 'fail':
             return 'skip'
@@ -919,8 +766,6 @@ def testSetGeoTransform(self):
         if gdal.GetConfigOption('CPL_DEBUG', 'OFF') != 'ON':
             self.driver.Delete(new_filename)
 
-        return 'success'
-
     def testSetProjection(self, prj=None, expected_prj=None):
         if self.testDriver() == 'fail':
             return 'skip'
@@ -984,8 +829,6 @@ def testSetProjection(self, prj=None, expected_prj=None):
         if gdal.GetConfigOption('CPL_DEBUG', 'OFF') != 'ON':
             self.driver.Delete(new_filename)
 
-        return 'success'
-
     def testSetMetadata(self):
         if self.testDriver() == 'fail':
             return 'skip'
@@ -1037,8 +880,6 @@ def testSetMetadata(self):
         if gdal.GetConfigOption('CPL_DEBUG', 'OFF') != 'ON':
             self.driver.Delete(new_filename)
 
-        return 'success'
-
     def testSetNoDataValue(self, delete=False):
         if self.testDriver() == 'fail':
             return 'skip'
@@ -1101,8 +942,6 @@ def testSetNoDataValue(self, delete=False):
         if gdal.GetConfigOption('CPL_DEBUG', 'OFF') != 'ON':
             self.driver.Delete(new_filename)
 
-        return 'success'
-
     def testSetNoDataValueAndDelete(self):
         return self.testSetNoDataValue(delete=True)
 
@@ -1147,8 +986,6 @@ def testSetDescription(self):
         if gdal.GetConfigOption('CPL_DEBUG', 'OFF') != 'ON':
             self.driver.Delete(new_filename)
 
-        return 'success'
-
     def testSetUnitType(self):
         if self.testDriver() == 'fail':
             return 'skip'
@@ -1196,8 +1033,6 @@ def testSetUnitType(self):
         if gdal.GetConfigOption('CPL_DEBUG', 'OFF') != 'ON':
             self.driver.Delete(new_filename)
 
-        return 'success'
-
 
 def approx_equal(a, b):
     a = float(a)
@@ -1614,45 +1449,28 @@ def unzip(target_dir, zipfilename, verbose=False):
 
     return
 
-###############################################################################
-# Return if a number is the NaN number
-
-
-def isnan(val):
-    return val != val
 
+isnan = math.isnan
 
 ###############################################################################
 # Return NaN
 
 def NaN():
-    try:
-        # Python >= 2.6
-        return float('nan')
-    except NameError:
-        return 1e400 / 1e400
+    return float('nan')
 
 ###############################################################################
 # Return positive infinity
 
 
 def posinf():
-    try:
-        # Python >= 2.6
-        return float('inf')
-    except NameError:
-        return 1e400
+    return float('inf')
 
 ###############################################################################
 # Return negative infinity
 
 
 def neginf():
-    try:
-        # Python >= 2.6
-        return float('-inf')
-    except NameError:
-        return -1e400
+    return float('-inf')
 
 ###############################################################################
 # Has the user requested to dowload test data
diff --git a/autotest/run_all.py b/autotest/run_all.py
deleted file mode 100755
index 3e3c8d8afe36..000000000000
--- a/autotest/run_all.py
+++ /dev/null
@@ -1,76 +0,0 @@
-#!/usr/bin/env python
-###############################################################################
-# $Id$
-#
-# Project:  GDAL/OGR Test Suite
-# Purpose:  High level test executive ... it runs sub test scripts.
-# Author:   Frank Warmerdam <warmerdam@pobox.com>
-#
-###############################################################################
-# Copyright (c) 2003, Frank Warmerdam <warmerdam@pobox.com>
-#
-# This library is free software; you can redistribute it and/or
-# modify it under the terms of the GNU Library General Public
-# License as published by the Free Software Foundation; either
-# version 2 of the License, or (at your option) any later version.
-#
-# This library is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-# Library General Public License for more details.
-#
-# You should have received a copy of the GNU Library General Public
-# License along with this library; if not, write to the
-# Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-# Boston, MA 02111-1307, USA.
-###############################################################################
-
-import sys
-import os
-
-# Make sure we run from the directory of the script
-if os.path.basename(sys.argv[0]) == os.path.basename(__file__):
-    if os.path.dirname(sys.argv[0]) != '':
-        os.chdir(os.path.dirname(sys.argv[0]))
-
-sys.path.append('pymod')
-import gdaltest
-from osgeo import gdal
-
-all_test_list = ['ogr', 'gcore', 'gdrivers', 'osr', 'alg', 'gnm', 'utilities', 'pyscripts']
-
-run_as_external = False
-
-test_list = []
-
-for arg in gdaltest.argv[1:]:
-    if arg == '-l':
-        print('List of GDAL Autotest modules')
-        for test in all_test_list:
-            print('* ' + test)
-        sys.exit(0)
-    elif arg == '-run_as_external':
-        run_as_external = True
-    elif arg == '-h' or arg[0] == '-':
-        print('Usage: ' + sys.argv[0] + ' [OPTION]')
-        print('\t<tests>          - list of test modules to run, run all if none specified')
-        print('\t-l               - list available test modules')
-        print('\t-h               - print this usage message')
-        print('\t-run_as_external - run each test script in a dedicated Python instance')
-        sys.exit(0)
-    else:
-        test_list.append(arg)
-
-if not test_list:
-    test_list = all_test_list
-
-# we set ECW to not resolve projection and datum strings to get 3.x behavior.
-gdal.SetConfigOption("ECW_DO_NOT_RESOLVE_DATUM_PROJECTION", "YES")
-
-gdaltest.setup_run('gdalautotest_all')
-
-gdaltest.run_all(test_list, run_as_external=run_as_external)
-
-errors = gdaltest.summarize()
-
-sys.exit(errors)

From 53a3850f4025a88dd9d4f71f281c8edfb8602705 Mon Sep 17 00:00:00 2001
From: Craig de Stigter <craig.destigter@koordinates.com>
Date: Fri, 19 Oct 2018 17:06:16 +1300
Subject: [PATCH 130/488] Add a script to setup virtualenv

---
 autotest/virtualenv-setup.sh | 25 +++++++++++++++++++++++++
 1 file changed, 25 insertions(+)
 create mode 100755 autotest/virtualenv-setup.sh

diff --git a/autotest/virtualenv-setup.sh b/autotest/virtualenv-setup.sh
new file mode 100755
index 000000000000..b3124df127b2
--- /dev/null
+++ b/autotest/virtualenv-setup.sh
@@ -0,0 +1,25 @@
+#!/bin/bash
+set -eu
+
+# install pip
+curl https://bootstrap.pypa.io/get-pip.py | sudo -H python
+
+# install virtualenv
+sudo -H pip install virtualenv
+
+virtualenv ~/venv
+rm -f ~/venv/lib/python2.7/no-global-site-packages.txt
+
+~/venv/bin/pip install -Ur /vagrant/autotest/requirements.txt
+
+# Set things up for gdb: https://stackoverflow.com/a/30430059/988527
+sudo apt-get install -y python2.7-dbg
+mkdir ~/venv/bin/.debug
+ln -s /usr/lib/debug/usr/bin/python2.7-gdb.py ~/venv/bin/.debug/python-gdb.py
+ln -s /usr/lib/debug/usr/bin/python2.7 ~/venv/bin/.debug/
+
+echo "
+
+created virtualenv in ~/venv. To activate it:
+    source ~/venv/bin/activate
+"

From 235004d3e412c44d7860a4f6ec3465f6f38d0bda Mon Sep 17 00:00:00 2001
From: Craig de Stigter <craig.destigter@koordinates.com>
Date: Fri, 26 Oct 2018 15:19:33 +1300
Subject: [PATCH 131/488] Fix weird comparison in tiff_ovr breaking condition
 inversion

---
 autotest/gcore/tiff_ovr.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/autotest/gcore/tiff_ovr.py b/autotest/gcore/tiff_ovr.py
index bc2c458658b9..4c404f22d4ec 100755
--- a/autotest/gcore/tiff_ovr.py
+++ b/autotest/gcore/tiff_ovr.py
@@ -797,7 +797,7 @@ def tiff_ovr_19(both_endian):
     ds.FlushCache()
     ds.BuildOverviews('NEAR', overviewlist=[2, 4])
 
-    if ds.GetRasterBand(1).GetOverviewCount() != 2 is None:
+    if ds.GetRasterBand(1).GetOverviewCount() != 2:
         print('Overview could not be generated')
         return 'fail'
 

From a56395f610fac4f1c7b9af90d2ef47272747fe69 Mon Sep 17 00:00:00 2001
From: Craig de Stigter <craig.destigter@koordinates.com>
Date: Mon, 29 Oct 2018 17:46:07 +1300
Subject: [PATCH 132/488] Update `with_and_without_postgis` to a pytest fixture
 in ogr_pg.py

---
 autotest/ogr/ogr_pg.py | 552 +++++++++++++++++------------------------
 1 file changed, 230 insertions(+), 322 deletions(-)

diff --git a/autotest/ogr/ogr_pg.py b/autotest/ogr/ogr_pg.py
index 0aba6cc522e7..7c7273963b77 100755
--- a/autotest/ogr/ogr_pg.py
+++ b/autotest/ogr/ogr_pg.py
@@ -31,6 +31,7 @@
 import sys
 import shutil
 
+import pytest
 
 import gdaltest
 import ogrtest
@@ -38,6 +39,10 @@
 from osgeo import osr
 from osgeo import gdal
 
+
+pytestmark = pytest.mark.require_driver('PostgreSQL')
+
+
 ###############################################################################
 # Return true if 'layer_name' is one of the reported layers of pg_ds
 
@@ -59,11 +64,33 @@ def ogr_pg_check_layer_in_list(ds, layer_name):
 #
 
 ###############################################################################
-# Open Database.
+# Run gdaltest_list_internal with PostGIS enabled and then with PostGIS disabled
+
+
+@pytest.fixture(
+    scope='module',
+    params=['postgis', 'no-postgis'],
+)
+def with_and_without_postgis(request):
+    test_ogr_pg_1()
+    if gdaltest.pg_ds is None:
+        return 'skip'
+
+    with_postgis = request.param == 'postgis'
+
+    if with_postgis and not gdaltest.pg_has_postgis:
+        pytest.skip()
+
+    gdal.SetConfigOption("PG_USE_POSTGIS", 'YES' if with_postgis else 'NO')
+    yield with_postgis
+    gdal.SetConfigOption("PG_USE_POSTGIS", "YES")
 
 
-def ogr_pg_1():
+###############################################################################
+# Open Database.
 
+
+def test_ogr_pg_1():
     gdaltest.pg_ds = None
     gdaltest.pg_use_copy = gdal.GetConfigOption('PG_USE_COPY', None)
     val = gdal.GetConfigOption('OGR_PG_CONNECTION_STRING', None)
@@ -80,10 +107,6 @@ def ogr_pg_1():
     # 7.4
     # gdaltest.pg_connection_string='dbname=autotest port=5436 user=postgres'
 
-    gdaltest.pg_dr = ogr.GetDriverByName('PostgreSQL')
-    if gdaltest.pg_dr is None:
-        return 'skip'
-
     try:
         gdal.PushErrorHandler('CPLQuietErrorHandler')
         gdaltest.pg_ds = ogr.Open('PG:' + gdaltest.pg_connection_string, update=1)
@@ -142,7 +165,7 @@ def ogr_pg_1():
 # Create table from data/poly.shp
 
 
-def ogr_pg_2():
+def ogr_pg_2(with_and_without_postgis):
 
     if gdaltest.pg_ds is None:
         return 'skip'
@@ -233,11 +256,81 @@ def ogr_pg_2():
 
     return 'success'
 
+
+###############################################################################
+# Test reading a layer extent
+
+
+def ogr_pg_19(with_and_without_postgis):
+
+    if gdaltest.pg_ds is None:
+        return 'skip'
+
+    layer = gdaltest.pg_ds.GetLayerByName('tpoly')
+    if layer is None:
+        gdaltest.post_reason('did not get tpoly layer')
+        return 'fail'
+
+    extent = layer.GetExtent()
+    expect = (478315.53125, 481645.3125, 4762880.5, 4765610.5)
+
+    minx = abs(extent[0] - expect[0])
+    maxx = abs(extent[1] - expect[1])
+    miny = abs(extent[2] - expect[2])
+    maxy = abs(extent[3] - expect[3])
+
+    if max(minx, maxx, miny, maxy) > 0.0001:
+        gdaltest.post_reason('Extents do not match')
+        print(extent)
+        return 'fail'
+
+    estimated_extent = layer.GetExtent(force=0)
+    if not gdaltest.pg_has_postgis:
+        # The OGRLayer default implementation in force = 0 returns error
+        if estimated_extent != (0, 0, 0, 0):
+            gdaltest.post_reason('Wrong estimated extent')
+            print(extent)
+            return 'fail'
+    else:
+        # Better testing needed ?
+        if estimated_extent == (0, 0, 0, 0):
+            gdaltest.post_reason('Wrong estimated extent')
+            print(extent)
+            return 'fail'
+
+    return 'success'
+
+###############################################################################
+# Test reading a SQL result layer extent
+
+
+def ogr_pg_19_2(with_and_without_postgis):
+
+    if gdaltest.pg_ds is None:
+        return 'skip'
+
+    sql_lyr = gdaltest.pg_ds.ExecuteSQL('select * from tpoly')
+
+    extent = sql_lyr.GetExtent()
+    expect = (478315.53125, 481645.3125, 4762880.5, 4765610.5)
+
+    minx = abs(extent[0] - expect[0])
+    maxx = abs(extent[1] - expect[1])
+    miny = abs(extent[2] - expect[2])
+    maxy = abs(extent[3] - expect[3])
+
+    if max(minx, maxx, miny, maxy) > 0.0001:
+        gdaltest.post_reason('Extents do not match')
+        return 'fail'
+
+    gdaltest.pg_ds.ReleaseResultSet(sql_lyr)
+
+
 ###############################################################################
 # Verify that stuff we just wrote is still OK.
 
 
-def ogr_pg_3():
+def ogr_pg_3(with_and_without_postgis):
     if gdaltest.pg_ds is None:
         return 'skip'
 
@@ -282,7 +375,7 @@ def ogr_pg_3():
 # geometries are still OK.
 
 
-def ogr_pg_4():
+def ogr_pg_4(with_and_without_postgis):
 
     if gdaltest.pg_ds is None:
         return 'skip'
@@ -327,7 +420,7 @@ def ogr_pg_4():
 # Test ExecuteSQL() results layers without geometry.
 
 
-def ogr_pg_5():
+def ogr_pg_5(with_and_without_postgis):
 
     if gdaltest.pg_ds is None:
         return 'skip'
@@ -350,7 +443,7 @@ def ogr_pg_5():
 # Test ExecuteSQL() results layers with geometry.
 
 
-def ogr_pg_6():
+def ogr_pg_6(with_and_without_postgis):
 
     if gdaltest.pg_ds is None:
         return 'skip'
@@ -388,7 +481,7 @@ def ogr_pg_6():
 # Test spatial filtering.
 
 
-def ogr_pg_7():
+def ogr_pg_7(with_and_without_postgis):
 
     if gdaltest.pg_ds is None:
         return 'skip'
@@ -428,7 +521,7 @@ def ogr_pg_7():
 # No geometry in this test.
 
 
-def ogr_pg_8():
+def ogr_pg_8(with_and_without_postgis):
 
     if gdaltest.pg_ds is None:
         return 'skip'
@@ -460,7 +553,7 @@ def ogr_pg_8():
 # Verify inplace update of a feature with SetFeature().
 
 
-def ogr_pg_9():
+def ogr_pg_9(with_and_without_postgis):
 
     if gdaltest.pg_ds is None:
         return 'skip'
@@ -536,7 +629,7 @@ def ogr_pg_9():
 # Verify that DeleteFeature() works properly.
 
 
-def ogr_pg_10():
+def ogr_pg_10(with_and_without_postgis):
 
     if gdaltest.pg_ds is None:
         return 'skip'
@@ -572,7 +665,7 @@ def ogr_pg_10():
 # Create table from data/poly.shp in INSERT mode.
 
 
-def ogr_pg_11():
+def ogr_pg_11(with_and_without_postgis):
 
     if gdaltest.pg_ds is None:
         return 'skip'
@@ -626,7 +719,7 @@ def ogr_pg_11():
 # Verify that stuff we just wrote is still OK.
 
 
-def ogr_pg_12():
+def ogr_pg_12(with_and_without_postgis):
     if gdaltest.pg_ds is None:
         return 'skip'
 
@@ -658,7 +751,7 @@ def ogr_pg_12():
 # Create a table with some date fields.
 
 
-def ogr_pg_13():
+def ogr_pg_13(with_and_without_postgis):
 
     if gdaltest.pg_ds is None:
         return 'skip'
@@ -695,7 +788,7 @@ def ogr_pg_13():
 # Fetch in several timezones to test our timezone processing.
 
 
-def ogr_pg_14():
+def ogr_pg_14(with_and_without_postgis):
     if gdaltest.pg_ds is None:
         return 'skip'
 
@@ -760,7 +853,7 @@ def ogr_pg_14():
 # Test very large query.
 
 
-def ogr_pg_15():
+def ogr_pg_15(with_and_without_postgis):
 
     if gdaltest.pg_ds is None:
         return 'skip'
@@ -783,7 +876,7 @@ def ogr_pg_15():
 ###############################################################################
 # Test very large statement.
 
-def ogr_pg_16():
+def ogr_pg_16(with_and_without_postgis):
 
     if gdaltest.pg_ds is None:
         return 'skip'
@@ -809,7 +902,7 @@ def ogr_pg_16():
 # Test requesting a non-existent table by name (bug 1480).
 
 
-def ogr_pg_17():
+def ogr_pg_17(with_and_without_postgis):
 
     if gdaltest.pg_ds is None:
         return 'skip'
@@ -834,7 +927,7 @@ def ogr_pg_17():
 # Test getting a layer by name that was not previously a layer.
 
 
-def ogr_pg_18():
+def ogr_pg_18(with_and_without_postgis):
 
     if gdaltest.pg_ds is None or not gdaltest.pg_has_postgis:
         return 'skip'
@@ -851,81 +944,12 @@ def ogr_pg_18():
 
     return 'success'
 
-###############################################################################
-# Test reading a layer extent
-
-
-def ogr_pg_19():
-
-    if gdaltest.pg_ds is None:
-        return 'skip'
-
-    layer = gdaltest.pg_ds.GetLayerByName('tpoly')
-    if layer is None:
-        gdaltest.post_reason('did not get tpoly layer')
-        return 'fail'
-
-    extent = layer.GetExtent()
-    expect = (478315.53125, 481645.3125, 4762880.5, 4765610.5)
-
-    minx = abs(extent[0] - expect[0])
-    maxx = abs(extent[1] - expect[1])
-    miny = abs(extent[2] - expect[2])
-    maxy = abs(extent[3] - expect[3])
-
-    if max(minx, maxx, miny, maxy) > 0.0001:
-        gdaltest.post_reason('Extents do not match')
-        print(extent)
-        return 'fail'
-
-    estimated_extent = layer.GetExtent(force=0)
-    if not gdaltest.pg_has_postgis:
-        # The OGRLayer default implementation in force = 0 returns error
-        if estimated_extent != (0, 0, 0, 0):
-            gdaltest.post_reason('Wrong estimated extent')
-            print(extent)
-            return 'fail'
-    else:
-        # Better testing needed ?
-        if estimated_extent == (0, 0, 0, 0):
-            gdaltest.post_reason('Wrong estimated extent')
-            print(extent)
-            return 'fail'
-
-    return 'success'
-
-###############################################################################
-# Test reading a SQL result layer extent
-
-
-def ogr_pg_19_2():
-
-    if gdaltest.pg_ds is None:
-        return 'skip'
-
-    sql_lyr = gdaltest.pg_ds.ExecuteSQL('select * from tpoly')
-
-    extent = sql_lyr.GetExtent()
-    expect = (478315.53125, 481645.3125, 4762880.5, 4765610.5)
-
-    minx = abs(extent[0] - expect[0])
-    maxx = abs(extent[1] - expect[1])
-    miny = abs(extent[2] - expect[2])
-    maxy = abs(extent[3] - expect[3])
-
-    if max(minx, maxx, miny, maxy) > 0.0001:
-        gdaltest.post_reason('Extents do not match')
-        return 'fail'
-
-    gdaltest.pg_ds.ReleaseResultSet(sql_lyr)
-
-    return 'success'
 
 ###############################################################################
 # Test reading 4-dim geometry in EWKT format
 
 
-def ogr_pg_20():
+def ogr_pg_20(with_and_without_postgis):
 
     if gdaltest.pg_ds is None or not gdaltest.pg_has_postgis:
         return 'skip'
@@ -1013,7 +1037,7 @@ def ogr_pg_20():
 # Test reading 4-dimension geometries in EWKB format
 
 
-def ogr_pg_21():
+def ogr_pg_21(with_and_without_postgis):
 
     if gdaltest.pg_ds is None or not gdaltest.pg_has_postgis:
         return 'skip'
@@ -1047,7 +1071,7 @@ def ogr_pg_21():
 # Check if the sub geometries of TIN and POLYHEDRALSURFACE are valid
 
 
-def ogr_pg_21_subgeoms():
+def ogr_pg_21_subgeoms(with_and_without_postgis):
 
     if gdaltest.pg_ds is None or not gdaltest.pg_has_postgis:
         return 'skip'
@@ -1094,7 +1118,7 @@ def ogr_pg_21_subgeoms():
 
 def ogr_pg_21_3d_geometries():
 
-    if gdaltest.pg_ds is None or gdaltest.ogr_pg_second_run:
+    if gdaltest.pg_ds is None:
         return 'skip'
 
     gdaltest.pg_ds = ogr.Open('PG:' + gdaltest.pg_connection_string, update=1)
@@ -1144,7 +1168,7 @@ def ogr_pg_21_3d_geometries():
 # This test checks if schema support and schema name quoting works well.
 
 
-def ogr_pg_22():
+def ogr_pg_22(with_and_without_postgis):
 
     if gdaltest.pg_ds is None:
         return 'skip'
@@ -1203,18 +1227,18 @@ def ogr_pg_22():
 # Create table with all data types
 
 
-def ogr_pg_23(layer_name='datatypetest', include_timestamptz=True):
+def ogr_pg_23(with_and_without_postgis):
 
     if gdaltest.pg_ds is None:
         return 'skip'
 
     gdal.PushErrorHandler('CPLQuietErrorHandler')
-    gdaltest.pg_ds.ExecuteSQL('DELLAYER:' + layer_name)
+    gdaltest.pg_ds.ExecuteSQL('DELLAYER:datatypetest')
     gdal.PopErrorHandler()
 
     ######################################################
     # Create Table
-    lyr = gdaltest.pg_ds.CreateLayer(layer_name)
+    lyr = gdaltest.pg_ds.CreateLayer('datatypetest')
 
     ######################################################
     # Setup Schema
@@ -1222,50 +1246,49 @@ def ogr_pg_23(layer_name='datatypetest', include_timestamptz=True):
 
     ######################################################
     # add some custom date fields.
-    gdaltest.pg_ds.ExecuteSQL('ALTER TABLE ' + layer_name + ' ADD COLUMN my_numeric numeric')
-    gdaltest.pg_ds.ExecuteSQL('ALTER TABLE ' + layer_name + ' ADD COLUMN my_numeric5 numeric(5)')
-    gdaltest.pg_ds.ExecuteSQL('ALTER TABLE ' + layer_name + ' ADD COLUMN my_numeric5_3 numeric(5,3)')
-    # gdaltest.pg_ds.ExecuteSQL( 'ALTER TABLE ' + layer_name + ' ADD COLUMN my_bool bool' )
+    gdaltest.pg_ds.ExecuteSQL('ALTER TABLE datatypetest ADD COLUMN my_numeric numeric')
+    gdaltest.pg_ds.ExecuteSQL('ALTER TABLE datatypetest ADD COLUMN my_numeric5 numeric(5)')
+    gdaltest.pg_ds.ExecuteSQL('ALTER TABLE datatypetest ADD COLUMN my_numeric5_3 numeric(5,3)')
+    # gdaltest.pg_ds.ExecuteSQL( 'ALTER TABLE datatypetest ADD COLUMN my_bool bool' )
     fld = ogr.FieldDefn('my_bool', ogr.OFTInteger)
     fld.SetSubType(ogr.OFSTBoolean)
     lyr.CreateField(fld)
-    # gdaltest.pg_ds.ExecuteSQL( 'ALTER TABLE ' + layer_name + ' ADD COLUMN my_int2 int2' )
+    # gdaltest.pg_ds.ExecuteSQL( 'ALTER TABLE datatypetest ADD COLUMN my_int2 int2' )
     fld = ogr.FieldDefn('my_int2', ogr.OFTInteger)
     fld.SetSubType(ogr.OFSTInt16)
     lyr.CreateField(fld)
-    gdaltest.pg_ds.ExecuteSQL('ALTER TABLE ' + layer_name + ' ADD COLUMN my_int4 int4')
+    gdaltest.pg_ds.ExecuteSQL('ALTER TABLE datatypetest ADD COLUMN my_int4 int4')
     lyr.CreateField(ogr.FieldDefn('my_int8', ogr.OFTInteger64))
-    # gdaltest.pg_ds.ExecuteSQL( 'ALTER TABLE ' + layer_name + ' ADD COLUMN my_float4 float4' )
+    # gdaltest.pg_ds.ExecuteSQL( 'ALTER TABLE datatypetest ADD COLUMN my_float4 float4' )
     fld = ogr.FieldDefn('my_float4', ogr.OFTReal)
     fld.SetSubType(ogr.OFSTFloat32)
     lyr.CreateField(fld)
-    gdaltest.pg_ds.ExecuteSQL('ALTER TABLE ' + layer_name + ' ADD COLUMN my_float8 float8')
-    gdaltest.pg_ds.ExecuteSQL('ALTER TABLE ' + layer_name + ' ADD COLUMN my_real real')
-    gdaltest.pg_ds.ExecuteSQL('ALTER TABLE ' + layer_name + ' ADD COLUMN my_char char')
-    gdaltest.pg_ds.ExecuteSQL('ALTER TABLE ' + layer_name + ' ADD COLUMN my_varchar character varying')
-    gdaltest.pg_ds.ExecuteSQL('ALTER TABLE ' + layer_name + ' ADD COLUMN my_varchar10 character varying(10)')
-    gdaltest.pg_ds.ExecuteSQL('ALTER TABLE ' + layer_name + ' ADD COLUMN my_text text')
-    gdaltest.pg_ds.ExecuteSQL('ALTER TABLE ' + layer_name + ' ADD COLUMN my_bytea bytea')
-    gdaltest.pg_ds.ExecuteSQL('ALTER TABLE ' + layer_name + ' ADD COLUMN my_time time')
-    gdaltest.pg_ds.ExecuteSQL('ALTER TABLE ' + layer_name + ' ADD COLUMN my_date date')
-    gdaltest.pg_ds.ExecuteSQL('ALTER TABLE ' + layer_name + ' ADD COLUMN my_timestamp timestamp without time zone')
-    if include_timestamptz:
-        gdaltest.pg_ds.ExecuteSQL('ALTER TABLE ' + layer_name + ' ADD COLUMN my_timestamptz timestamp with time zone')
-    gdaltest.pg_ds.ExecuteSQL('ALTER TABLE ' + layer_name + ' ADD COLUMN my_chararray char(1)[]')
-    gdaltest.pg_ds.ExecuteSQL('ALTER TABLE ' + layer_name + ' ADD COLUMN my_textarray text[]')
-    gdaltest.pg_ds.ExecuteSQL('ALTER TABLE ' + layer_name + ' ADD COLUMN my_varchararray character varying[]')
+    gdaltest.pg_ds.ExecuteSQL('ALTER TABLE datatypetest ADD COLUMN my_float8 float8')
+    gdaltest.pg_ds.ExecuteSQL('ALTER TABLE datatypetest ADD COLUMN my_real real')
+    gdaltest.pg_ds.ExecuteSQL('ALTER TABLE datatypetest ADD COLUMN my_char char')
+    gdaltest.pg_ds.ExecuteSQL('ALTER TABLE datatypetest ADD COLUMN my_varchar character varying')
+    gdaltest.pg_ds.ExecuteSQL('ALTER TABLE datatypetest ADD COLUMN my_varchar10 character varying(10)')
+    gdaltest.pg_ds.ExecuteSQL('ALTER TABLE datatypetest ADD COLUMN my_text text')
+    gdaltest.pg_ds.ExecuteSQL('ALTER TABLE datatypetest ADD COLUMN my_bytea bytea')
+    gdaltest.pg_ds.ExecuteSQL('ALTER TABLE datatypetest ADD COLUMN my_time time')
+    gdaltest.pg_ds.ExecuteSQL('ALTER TABLE datatypetest ADD COLUMN my_date date')
+    gdaltest.pg_ds.ExecuteSQL('ALTER TABLE datatypetest ADD COLUMN my_timestamp timestamp without time zone')
+    gdaltest.pg_ds.ExecuteSQL('ALTER TABLE datatypetest ADD COLUMN my_timestamptz timestamp with time zone')
+    gdaltest.pg_ds.ExecuteSQL('ALTER TABLE datatypetest ADD COLUMN my_chararray char(1)[]')
+    gdaltest.pg_ds.ExecuteSQL('ALTER TABLE datatypetest ADD COLUMN my_textarray text[]')
+    gdaltest.pg_ds.ExecuteSQL('ALTER TABLE datatypetest ADD COLUMN my_varchararray character varying[]')
     fld = ogr.FieldDefn('my_int2array', ogr.OFTIntegerList)
     fld.SetSubType(ogr.OFSTInt16)
     lyr.CreateField(fld)
-    gdaltest.pg_ds.ExecuteSQL('ALTER TABLE ' + layer_name + ' ADD COLUMN my_int4array int4[]')
+    gdaltest.pg_ds.ExecuteSQL('ALTER TABLE datatypetest ADD COLUMN my_int4array int4[]')
     lyr.CreateField(ogr.FieldDefn('my_int8array', ogr.OFTInteger64List))
     fld = ogr.FieldDefn('my_float4array', ogr.OFTRealList)
     fld.SetSubType(ogr.OFSTFloat32)
     lyr.CreateField(fld)
-    gdaltest.pg_ds.ExecuteSQL('ALTER TABLE ' + layer_name + ' ADD COLUMN my_float8array float8[]')
-    gdaltest.pg_ds.ExecuteSQL('ALTER TABLE ' + layer_name + ' ADD COLUMN my_numericarray numeric[]')
-    gdaltest.pg_ds.ExecuteSQL('ALTER TABLE ' + layer_name + ' ADD COLUMN my_numeric5array numeric(5)[]')
-    gdaltest.pg_ds.ExecuteSQL('ALTER TABLE ' + layer_name + ' ADD COLUMN my_numeric5_3array numeric(5,3)[]')
+    gdaltest.pg_ds.ExecuteSQL('ALTER TABLE datatypetest ADD COLUMN my_float8array float8[]')
+    gdaltest.pg_ds.ExecuteSQL('ALTER TABLE datatypetest ADD COLUMN my_numericarray numeric[]')
+    gdaltest.pg_ds.ExecuteSQL('ALTER TABLE datatypetest ADD COLUMN my_numeric5array numeric(5)[]')
+    gdaltest.pg_ds.ExecuteSQL('ALTER TABLE datatypetest ADD COLUMN my_numeric5_3array numeric(5,3)[]')
     fld = ogr.FieldDefn('my_boolarray', ogr.OFTIntegerList)
     fld.SetSubType(ogr.OFSTBoolean)
     lyr.CreateField(fld)
@@ -1278,18 +1301,14 @@ def ogr_pg_23(layer_name='datatypetest', include_timestamptz=True):
         geom_str = "'\\\\001\\\\001\\\\000\\\\000\\\\000\\\\000\\\\000\\\\000\\\\000\\\\000\\\\000$@\\\\000\\\\000\\\\000\\\\000\\\\000\\\\0004@'"
         if gdaltest.pg_quote_with_E:
             geom_str = "E" + geom_str
-    sql = "INSERT INTO " + layer_name + " ( my_numeric, my_numeric5, my_numeric5_3, my_bool, my_int2, "
+    sql = "INSERT INTO datatypetest ( my_numeric, my_numeric5, my_numeric5_3, my_bool, my_int2, "
     sql += "my_int4, my_int8, my_float4, my_float8, my_real, my_char, my_varchar, "
-    sql += "my_varchar10, my_text, my_bytea, my_time, my_date, my_timestamp, "
-    if include_timestamptz:
-        sql += "my_timestamptz, "
+    sql += "my_varchar10, my_text, my_bytea, my_time, my_date, my_timestamp, my_timestamptz, "
     sql += "my_chararray, my_textarray, my_varchararray, my_int2array, my_int4array, "
     sql += "my_int8array, my_float4array, my_float8array, my_numericarray, my_numeric5array, my_numeric5_3array, my_boolarray, wkb_geometry) "
     sql += "VALUES ( 1.2, 12345, 0.123, 'T', 12345, 12345678, 1234567901234, 0.123, "
     sql += "0.12345678, 0.876, 'a', 'ab', 'varchar10 ', 'abc', 'xyz', '12:34:56', "
-    sql += "'2000-01-01', '2000-01-01 00:00:00', "
-    if include_timestamptz:
-        sql += "'2000-01-01 00:00:00+00', "
+    sql += "'2000-01-01', '2000-01-01 00:00:00', '2000-01-01 00:00:00+00', "
     sql += "'{a,b}', "
     sql += "'{aa,bb}', '{cc,dd}', '{100,200}', '{100,200}', '{1234567901234}', "
     sql += "'{100.1,200.1}', '{100.12,200.12}', ARRAY[100.12,200.12], ARRAY[10,20], ARRAY[10.12,20.12], '{1,0}', " + geom_str + " )"
@@ -1300,7 +1319,7 @@ def ogr_pg_23(layer_name='datatypetest', include_timestamptz=True):
 ###############################################################################
 
 
-def test_val_test_23(layer_defn, feat):
+def check_value_23(layer_defn, feat):
 
     field_defn = layer_defn.GetFieldDefn(layer_defn.GetFieldIndex("my_numeric5"))
     if field_defn.GetWidth() != 5 or field_defn.GetPrecision() != 0 or field_defn.GetType() != ogr.OFTInteger:
@@ -1398,7 +1417,7 @@ def test_val_test_23(layer_defn, feat):
 # Test with PG: connection
 
 
-def ogr_pg_24():
+def ogr_pg_24(with_and_without_postgis):
 
     if gdaltest.pg_ds is None:
         return 'skip'
@@ -1410,7 +1429,7 @@ def ogr_pg_24():
     lyr = ds.GetLayerByName('datatypetest')
 
     feat = lyr.GetNextFeature()
-    if test_val_test_23(lyr.GetLayerDefn(), feat) != 'success':
+    if check_value_23(lyr.GetLayerDefn(), feat) != 'success':
         return 'fail'
 
     feat = None
@@ -1423,7 +1442,7 @@ def ogr_pg_24():
 # Test with PG: connection and SELECT query
 
 
-def ogr_pg_25():
+def ogr_pg_25(with_and_without_postgis):
 
     if gdaltest.pg_ds is None:
         return 'skip'
@@ -1435,7 +1454,7 @@ def ogr_pg_25():
     sql_lyr = ds.ExecuteSQL('select * from datatypetest')
 
     feat = sql_lyr.GetNextFeature()
-    if test_val_test_23(sql_lyr.GetLayerDefn(), feat) != 'success':
+    if check_value_23(sql_lyr.GetLayerDefn(), feat) != 'success':
         return 'fail'
 
     ds.ReleaseResultSet(sql_lyr)
@@ -1446,85 +1465,11 @@ def ogr_pg_25():
 
     return 'success'
 
-###############################################################################
-# Test with PGB: connection
-
-
-def ogr_pg_26_DISABLED_AS_BINARY_CURSOR_NO_LONGER_SUPPORTED():
-
-    if gdaltest.pg_ds is None:
-        return 'skip'
-
-    # The presence of timestamptz field currently disables binary cursor
-    if ogr_pg_23(layer_name='datatypetest_withouttimestamptz', include_timestamptz=False) != 'success':
-        return 'fail'
-
-    ds = ogr.Open('PGB:' + gdaltest.pg_connection_string, update=1)
-
-    ds.ExecuteSQL('set timezone to "UTC"')
-
-    lyr = ds.GetLayerByName('datatypetest')
-
-    feat = lyr.GetNextFeature()
-    if test_val_test_23(lyr.GetLayerDefn(), feat) != 'success':
-        return 'fail'
-
-    feat = None
-
-    lyr = ds.GetLayerByName('datatypetest_withouttimestamptz')
-
-    feat = lyr.GetNextFeature()
-    if test_val_test_23(lyr.GetLayerDefn(), feat) != 'success':
-        return 'fail'
-
-    feat = None
-
-    ds = None
-
-    return 'success'
-
-###############################################################################
-# Test with PGB: connection and SELECT query
-
-
-def ogr_pg_27_DISABLED_AS_BINARY_CURSOR_NO_LONGER_SUPPORTED():
-
-    if gdaltest.pg_ds is None:
-        return 'skip'
-
-    ds = ogr.Open('PGB:' + gdaltest.pg_connection_string, update=1)
-
-    ds.ExecuteSQL('set timezone to "UTC"')
-
-    sql_lyr = ds.ExecuteSQL('select * from datatypetest')
-
-    feat = sql_lyr.GetNextFeature()
-    if test_val_test_23(sql_lyr.GetLayerDefn(), feat) != 'success':
-        return 'fail'
-
-    ds.ReleaseResultSet(sql_lyr)
-
-    feat = None
-
-    sql_lyr = ds.ExecuteSQL('select * from datatypetest_withouttimestamptz')
-
-    feat = sql_lyr.GetNextFeature()
-    if test_val_test_23(sql_lyr.GetLayerDefn(), feat) != 'success':
-        return 'fail'
-
-    ds.ReleaseResultSet(sql_lyr)
-
-    feat = None
-
-    ds = None
-
-    return 'success'
-
 ###############################################################################
 # Duplicate all data types in INSERT mode
 
 
-def ogr_pg_28():
+def ogr_pg_28(with_and_without_postgis):
 
     if gdaltest.pg_ds is None:
         return 'skip'
@@ -1575,7 +1520,7 @@ def ogr_pg_28():
 # Test with PG: connection
 
 
-def ogr_pg_29():
+def ogr_pg_29(with_and_without_postgis):
 
     if gdaltest.pg_ds is None:
         return 'skip'
@@ -1588,7 +1533,7 @@ def ogr_pg_29():
 
     # my_timestamp has now a time zone...
     feat = lyr.GetNextFeature()
-    if test_val_test_23(lyr.GetLayerDefn(), feat) != 'success':
+    if check_value_23(lyr.GetLayerDefn(), feat) != 'success':
         return 'fail'
 
     geom = feat.GetGeometryRef()
@@ -1607,7 +1552,7 @@ def ogr_pg_29():
 # Duplicate all data types in PG_USE_COPY mode
 
 
-def ogr_pg_30():
+def ogr_pg_30(with_and_without_postgis):
 
     if gdaltest.pg_ds is None:
         return 'skip'
@@ -1655,7 +1600,7 @@ def ogr_pg_30():
 ###############################################################################
 # Test the tables= connection string option
 
-def ogr_pg_31():
+def ogr_pg_31(with_and_without_postgis):
 
     if gdaltest.pg_ds is None:
         return 'skip'
@@ -1696,7 +1641,7 @@ def ogr_pg_31():
 # Test approximate srtext (#2123, #3508)
 
 
-def ogr_pg_32():
+def ogr_pg_32(with_and_without_postgis):
 
     if gdaltest.pg_ds is None or not gdaltest.pg_has_postgis:
         return 'skip'
@@ -1837,7 +1782,7 @@ def ogr_pg_32():
 # Test encoding as UTF8
 
 
-def ogr_pg_33():
+def ogr_pg_33(with_and_without_postgis):
 
     if gdaltest.pg_ds is None:
         return 'skip'
@@ -1859,7 +1804,7 @@ def ogr_pg_33():
 # Test encoding as Latin1
 
 
-def ogr_pg_34():
+def ogr_pg_34(with_and_without_postgis):
 
     if gdaltest.pg_ds is None:
         return 'skip'
@@ -1868,14 +1813,14 @@ def ogr_pg_34():
     # is not guaranteed to have effects on system not supporting putenv
     if sys.platform.startswith('linux'):
         os.environ['PGCLIENTENCODING'] = 'LATIN1'
-        ogr_pg_1()
+        test_ogr_pg_1()
         del os.environ['PGCLIENTENCODING']
 
         # For some unknown reasons, some servers don't like forcing LATIN1
         # but prefer LATIN9 instead...
         if gdaltest.pg_ds is None:
             os.environ['PGCLIENTENCODING'] = 'LATIN9'
-            ogr_pg_1()
+            test_ogr_pg_1()
             del os.environ['PGCLIENTENCODING']
     else:
         gdaltest.pg_ds.ExecuteSQL('SET client_encoding = LATIN1')
@@ -1897,7 +1842,7 @@ def ogr_pg_34():
 ###############################################################################
 # Test for buffer overflows
 
-def ogr_pg_35():
+def ogr_pg_35(with_and_without_postgis):
 
     if gdaltest.pg_ds is None:
         return 'skip'
@@ -1929,7 +1874,7 @@ def ogr_pg_35():
 # Test support for inherited tables : tables inherited from a Postgis Table
 
 
-def ogr_pg_36():
+def ogr_pg_36(with_and_without_postgis):
 
     if gdaltest.pg_ds is None:
         return 'skip'
@@ -1984,7 +1929,7 @@ def ogr_pg_36():
     return 'success'
 
 
-def ogr_pg_36_bis():
+def ogr_pg_36_bis(with_and_without_postgis):
 
     if gdaltest.pg_ds is None:
         return 'skip'
@@ -2010,7 +1955,7 @@ def ogr_pg_36_bis():
 # Test support for inherited tables : Postgis table inherited from a non-Postgis table
 
 
-def ogr_pg_37():
+def ogr_pg_37(with_and_without_postgis):
 
     if gdaltest.pg_ds is None or not gdaltest.pg_has_postgis:
         return 'skip'
@@ -2041,7 +1986,7 @@ def ogr_pg_37():
 # Test support for multiple geometry columns (RFC 41)
 
 
-def ogr_pg_38():
+def ogr_pg_38(with_and_without_postgis):
     if gdaltest.pg_ds is None or not gdaltest.pg_has_postgis:
         return 'skip'
 
@@ -2129,7 +2074,7 @@ def ogr_pg_38():
 # Test support for named views
 
 
-def ogr_pg_39():
+def ogr_pg_39(with_and_without_postgis):
     if gdaltest.pg_ds is None:
         return 'skip'
 
@@ -2220,7 +2165,7 @@ def ogr_pg_39():
 # Test GetFeature() with an invalid id
 
 
-def ogr_pg_40():
+def ogr_pg_40(with_and_without_postgis):
     if gdaltest.pg_ds is None:
         return 'skip'
 
@@ -2234,7 +2179,7 @@ def ogr_pg_40():
 # Test active_schema= option
 
 
-def ogr_pg_41():
+def ogr_pg_41(with_and_without_postgis):
     if gdaltest.pg_ds is None:
         return 'skip'
 
@@ -2305,7 +2250,7 @@ def ogr_pg_41():
 # Test schemas= option
 
 
-def ogr_pg_42():
+def ogr_pg_42(with_and_without_postgis):
     if gdaltest.pg_ds is None:
         return 'skip'
 
@@ -2370,7 +2315,7 @@ def ogr_pg_42():
 ###############################################################################
 # Test schemas= option
 
-def ogr_pg_43():
+def ogr_pg_43(with_and_without_postgis):
     if gdaltest.pg_ds is None:
         return 'skip'
 
@@ -2407,7 +2352,7 @@ def ogr_pg_43():
 # Test for table and column names that need quoting (#2945)
 
 
-def ogr_pg_44():
+def ogr_pg_44(with_and_without_postgis):
 
     if gdaltest.pg_ds is None:
         return 'skip'
@@ -2455,7 +2400,7 @@ def ogr_pg_44():
 # Test SetNextByIndex (#3117)
 
 
-def ogr_pg_45():
+def ogr_pg_45(with_and_without_postgis):
 
     if gdaltest.pg_ds is None:
         return 'skip'
@@ -2489,7 +2434,7 @@ def ogr_pg_45():
 # with SetFeature()
 
 
-def ogr_pg_46():
+def ogr_pg_46(with_and_without_postgis):
 
     if gdaltest.pg_ds is None:
         return 'skip'
@@ -2551,7 +2496,7 @@ def ogr_pg_46():
 # Test that we can handle 'geography' column type introduced in PostGIS 1.5
 
 
-def ogr_pg_47():
+def ogr_pg_47(with_and_without_postgis):
 
     if gdaltest.pg_ds is None:
         return 'skip'
@@ -2668,7 +2613,7 @@ def ogr_pg_47():
 # PostGIS DB.
 
 
-def ogr_pg_48():
+def ogr_pg_48(with_and_without_postgis):
 
     if gdaltest.pg_ds is None:
         return 'skip'
@@ -2753,7 +2698,7 @@ def ogr_pg_48():
 # Go on with previous test but set PGSQL_OGR_FID this time
 
 
-def ogr_pg_49():
+def ogr_pg_49(with_and_without_postgis):
 
     if gdaltest.pg_ds is None:
         return 'skip'
@@ -2784,7 +2729,7 @@ def ogr_pg_49():
 # This tests writing using COPY and INSERT
 
 
-def ogr_pg_50():
+def ogr_pg_50(with_and_without_postgis):
 
     if gdaltest.pg_ds is None:
         return 'skip'
@@ -2853,7 +2798,7 @@ def ogr_pg_50():
 # Run test_ogrsf
 
 
-def ogr_pg_51():
+def ogr_pg_51(with_and_without_postgis):
 
     if gdaltest.pg_ds is None:
         return 'skip'
@@ -2874,7 +2819,7 @@ def ogr_pg_51():
 # Run test_ogrsf with -sql
 
 
-def ogr_pg_52():
+def ogr_pg_52(with_and_without_postgis):
 
     if gdaltest.pg_ds is None:
         return 'skip'
@@ -2895,7 +2840,7 @@ def ogr_pg_52():
 # Test creating a layer with explicitly wkbNone geometry type.
 
 
-def ogr_pg_53():
+def ogr_pg_53(with_and_without_postgis):
 
     if gdaltest.pg_ds is None:
         return 'skip'
@@ -2956,7 +2901,7 @@ def ogr_pg_53():
 # Check that we can overwrite a non-spatial geometry table (#4012)
 
 
-def ogr_pg_53_bis():
+def ogr_pg_53_bis(with_and_without_postgis):
     import test_cli_utilities
     if test_cli_utilities.get_ogr2ogr_path() is None:
         return 'skip'
@@ -2981,7 +2926,7 @@ def ogr_pg_53_bis():
 # Test reading AsEWKB()
 
 
-def ogr_pg_54():
+def ogr_pg_54(with_and_without_postgis):
 
     if gdaltest.pg_ds is None:
         return 'skip'
@@ -3006,7 +2951,7 @@ def ogr_pg_54():
 # Test reading geoms as Base64 encoded strings
 
 
-def ogr_pg_55():
+def ogr_pg_55(with_and_without_postgis):
 
     if gdaltest.pg_ds is None:
         return 'skip'
@@ -3039,7 +2984,7 @@ def ogr_pg_55():
 # non-spatial table and without FID in COPY mode (#4040)
 
 
-def ogr_pg_56():
+def ogr_pg_56(with_and_without_postgis):
 
     if gdaltest.pg_ds is None:
         return 'skip'
@@ -3128,7 +3073,7 @@ def ogr_pg_56():
 # Test inserting an empty feature
 
 
-def ogr_pg_57():
+def ogr_pg_57(with_and_without_postgis):
 
     if gdaltest.pg_ds is None:
         return 'skip'
@@ -3148,7 +3093,7 @@ def ogr_pg_57():
 # Test RFC35
 
 
-def ogr_pg_58():
+def ogr_pg_58(with_and_without_postgis):
 
     if gdaltest.pg_ds is None:
         return 'skip'
@@ -3209,7 +3154,7 @@ def ogr_pg_58():
 # but which is not the layer name.
 
 
-def ogr_pg_59():
+def ogr_pg_59(with_and_without_postgis):
 
     if gdaltest.pg_ds is None:
         return 'skip'
@@ -3239,7 +3184,7 @@ def ogr_pg_59():
 # non-incrementing PK.
 
 
-def ogr_pg_60():
+def ogr_pg_60(with_and_without_postgis):
 
     if gdaltest.pg_ds is None:
         return 'skip'
@@ -3277,7 +3222,7 @@ def ogr_pg_60():
 # Test insertion of features with FID set in COPY mode (#4495)
 
 
-def ogr_pg_61():
+def ogr_pg_61(with_and_without_postgis):
 
     if gdaltest.pg_ds is None:
         return 'skip'
@@ -3325,7 +3270,7 @@ def ogr_pg_61():
 # Test ExecuteSQL() and getting SRID of the request (#4699)
 
 
-def ogr_pg_62():
+def ogr_pg_62(with_and_without_postgis):
 
     if gdaltest.pg_ds is None:
         return 'skip'
@@ -3360,7 +3305,7 @@ def ogr_pg_62():
 # Test COLUMN_TYPES layer creation option (#4788)
 
 
-def ogr_pg_63():
+def ogr_pg_63(with_and_without_postgis):
 
     if gdaltest.pg_ds is None:
         return 'skip'
@@ -3405,7 +3350,7 @@ def ogr_pg_63():
 # Test OGR_TRUNCATE config. option (#5091)
 
 
-def ogr_pg_64():
+def ogr_pg_64(with_and_without_postgis):
 
     if gdaltest.pg_ds is None:
         return 'skip'
@@ -3448,7 +3393,7 @@ def ogr_pg_64():
 # Test RFC 41
 
 
-def ogr_pg_65():
+def ogr_pg_65(with_and_without_postgis):
 
     if gdaltest.pg_ds is None:
         return 'skip'
@@ -3610,7 +3555,7 @@ def ogr_pg_65():
 # Run test_ogrsf
 
 
-def ogr_pg_66():
+def ogr_pg_66(with_and_without_postgis):
 
     if gdaltest.pg_ds is None:
         return 'skip'
@@ -3634,7 +3579,7 @@ def ogr_pg_66():
 # Test retrieving SRID from values (#5131)
 
 
-def ogr_pg_67():
+def ogr_pg_67(with_and_without_postgis):
 
     if gdaltest.pg_ds is None:
         return 'skip'
@@ -3685,7 +3630,7 @@ def ogr_pg_67():
 # Test retrieving SRID from values even if we don't have select rights on geometry_columns (#5131)
 
 
-def ogr_pg_68():
+def ogr_pg_68(with_and_without_postgis):
 
     if gdaltest.pg_ds is None:
         return 'skip'
@@ -3743,7 +3688,7 @@ def has_run_load_tables(ds):
     return int(ds.GetMetadataItem("bHasLoadTables", "_DEBUG_"))
 
 
-def ogr_pg_69():
+def ogr_pg_69(with_and_without_postgis):
 
     if gdaltest.pg_ds is None:
         return 'skip'
@@ -3786,7 +3731,7 @@ def ogr_pg_69():
 # Test historical non-differed creation of tables (#5547)
 
 
-def ogr_pg_70():
+def ogr_pg_70(with_and_without_postgis):
 
     if gdaltest.pg_ds is None:
         return 'skip'
@@ -3848,7 +3793,7 @@ def ogr_pg_70():
 # Test interoperability of WKT/WKB with PostGIS.
 
 
-def ogr_pg_71():
+def ogr_pg_71(with_and_without_postgis):
 
     if gdaltest.pg_ds is None:
         return 'skip'
@@ -3985,7 +3930,7 @@ def ogr_pg_71():
 # Test 64 bit FID
 
 
-def ogr_pg_72():
+def ogr_pg_72(with_and_without_postgis):
 
     if gdaltest.pg_ds is None:
         return 'skip'
@@ -4054,7 +3999,7 @@ def ogr_pg_72():
 # Test not nullable fields
 
 
-def ogr_pg_73():
+def ogr_pg_73(with_and_without_postgis):
 
     if gdaltest.pg_ds is None:
         return 'skip'
@@ -4163,7 +4108,7 @@ def ogr_pg_73():
 # Test default values
 
 
-def ogr_pg_74():
+def ogr_pg_74(with_and_without_postgis):
 
     if gdaltest.pg_ds is None:
         return 'skip'
@@ -4335,7 +4280,7 @@ def ogr_pg_74():
 # Test creating a field with the fid name
 
 
-def ogr_pg_75():
+def ogr_pg_75(with_and_without_postgis):
 
     if gdaltest.pg_ds is None:
         return 'skip'
@@ -4456,7 +4401,7 @@ def ogr_pg_76_get_transaction_state(ds):
             int(ds.GetMetadataItem("bUserTransactionActive", "_DEBUG_")))
 
 
-def ogr_pg_76():
+def ogr_pg_76(with_and_without_postgis):
 
     if gdaltest.pg_ds is None:
         return 'skip'
@@ -4624,7 +4569,7 @@ def ogr_pg_76_scenario1(lyr1, lyr2):
 
 
 # Scenario 2 : a CreateFeature done in the middle of GetNextFeature(), themselves between a user transaction
-def ogr_pg_76_scenario2(lyr1, lyr2):
+def ogr_pg_76_scenario2(lyr1, lyr2with_and_without_postgis):
 
     if gdaltest.pg_ds.StartTransaction() != 0:
         gdaltest.post_reason('fail')
@@ -4758,7 +4703,7 @@ def ogr_pg_76_scenario2(lyr1, lyr2):
 # Scenario 3 : StartTransaction(), GetNextFeature(), CommitTransaction(), GetNextFeature()
 
 
-def ogr_pg_76_scenario3(lyr1, lyr2):
+def ogr_pg_76_scenario3(lyr1, lyr2with_and_without_postgis):
 
     if gdaltest.pg_ds.StartTransaction() != 0:
         gdaltest.post_reason('fail')
@@ -4823,7 +4768,7 @@ def ogr_pg_76_scenario3(lyr1, lyr2):
 # Scenario 4 : GetNextFeature(), StartTransaction(), CreateFeature(), CommitTransaction(), GetNextFeature(), ResetReading()
 
 
-def ogr_pg_76_scenario4(lyr1, lyr2):
+def ogr_pg_76_scenario4(lyr1, lyr2with_and_without_postgis):
 
     (lastcmd, level, savepoint, usertransac) = ogr_pg_76_get_transaction_state(gdaltest.pg_ds)
     if (lastcmd, level, savepoint, usertransac) != ('', 0, 0, 0):
@@ -4931,7 +4876,7 @@ def ogr_pg_76_scenario4(lyr1, lyr2):
 # Test ogr2ogr can insert multiple layers at once
 
 
-def ogr_pg_77():
+def ogr_pg_77(with_and_without_postgis):
     import test_cli_utilities
     if test_cli_utilities.get_ogr2ogr_path() is None:
         return 'skip'
@@ -4989,7 +4934,7 @@ def ogr_pg_77():
 # Test manually added geometry constraints
 
 
-def ogr_pg_78():
+def ogr_pg_78(with_and_without_postgis):
 
     if gdaltest.pg_ds is None or not gdaltest.pg_has_postgis_2:
         return 'skip'
@@ -5087,7 +5032,7 @@ def ogr_pg_78():
 # Test PRELUDE_STATEMENTS and CLOSING_STATEMENTS open options
 
 
-def ogr_pg_79():
+def ogr_pg_79(with_and_without_postgis):
 
     if gdaltest.pg_ds is None:
         return 'skip'
@@ -5173,7 +5118,7 @@ def ogr_pg_79():
 
 def ogr_pg_80():
 
-    if gdaltest.pg_ds is None or gdaltest.ogr_pg_second_run:
+    if gdaltest.pg_ds is None:
         return 'skip'
 
     gdal.ErrorReset()
@@ -5194,7 +5139,7 @@ def ogr_pg_80():
 
 def ogr_pg_81():
 
-    if gdaltest.pg_ds is None or gdaltest.ogr_pg_second_run:
+    if gdaltest.pg_ds is None:
         return 'skip'
 
     gdaltest.pg_ds.ReleaseResultSet(gdaltest.pg_ds.ExecuteSQL("create table ogr_pg_81_1(id varchar unique, foo varchar); SELECT AddGeometryColumn('ogr_pg_81_1','dummy',-1,'POINT',2);"))
@@ -5243,7 +5188,7 @@ def ogr_pg_81():
 
 def ogr_pg_82():
 
-    if gdaltest.pg_ds is None or not gdaltest.pg_has_postgis or gdaltest.ogr_pg_second_run:
+    if gdaltest.pg_ds is None or not gdaltest.pg_has_postgis:
         return 'skip'
 
     lyr = gdaltest.pg_ds.CreateLayer('ogr_pg_82', geom_type=ogr.wkbNone, options=['GEOMETRY_NAME=another_name'])
@@ -5261,7 +5206,7 @@ def ogr_pg_82():
 
 def ogr_pg_83():
 
-    if gdaltest.pg_ds is None or not gdaltest.pg_has_postgis or gdaltest.ogr_pg_second_run:
+    if gdaltest.pg_ds is None or not gdaltest.pg_has_postgis:
         return 'skip'
 
     tests = [[ogr.wkbUnknown, [], 'POINT ZM (1 2 3 4)', 'POINT (1 2)'],
@@ -5330,7 +5275,7 @@ def ogr_pg_83():
 
 def ogr_pg_84():
 
-    if gdaltest.pg_ds is None or gdaltest.ogr_pg_second_run:
+    if gdaltest.pg_ds is None:
         return 'skip'
 
     ds = ogr.Open('PG:' + gdaltest.pg_connection_string, update=1)
@@ -5411,7 +5356,7 @@ def ogr_pg_84():
 
 def ogr_pg_85():
 
-    if gdaltest.pg_ds is None or gdaltest.ogr_pg_second_run:
+    if gdaltest.pg_ds is None:
         return 'skip'
 
     gdaltest.pg_ds.CreateLayer('ogr_pg_85_1')
@@ -5472,7 +5417,7 @@ def ogr_pg_85():
 
 def ogr_pg_86():
 
-    if gdaltest.pg_ds is None or gdaltest.ogr_pg_second_run:
+    if gdaltest.pg_ds is None:
         return 'skip'
 
     old_val = gdal.GetConfigOption('PG_USE_COPY')
@@ -5515,7 +5460,7 @@ def ogr_pg_86():
 
 def ogr_pg_87():
 
-    if gdaltest.pg_ds is None or gdaltest.ogr_pg_second_run:
+    if gdaltest.pg_ds is None:
         return 'skip'
 
     lyr = gdaltest.pg_ds.CreateLayer('ogr_pg_87')
@@ -5550,7 +5495,7 @@ def ogr_pg_87():
 
 def ogr_pg_json():
 
-    if gdaltest.pg_ds is None or gdaltest.ogr_pg_second_run:
+    if gdaltest.pg_ds is None:
         return 'skip'
 
     lyr = gdaltest.pg_ds.CreateLayer('ogr_pg_json')
@@ -5584,7 +5529,7 @@ def ogr_pg_json():
 #
 
 
-def ogr_pg_table_cleanup():
+def ogr_pg_table_cleanup(with_and_without_postgis):
 
     if gdaltest.pg_ds is None:
         return 'skip'
@@ -5663,7 +5608,7 @@ def ogr_pg_table_cleanup():
     return 'success'
 
 
-def ogr_pg_cleanup():
+def ogr_pg_cleanup(with_and_without_postgis):
 
     if gdaltest.pg_ds is None:
         return 'skip'
@@ -5679,7 +5624,7 @@ def ogr_pg_cleanup():
 # NOTE: The ogr_pg_19 intentionally executed after ogr_pg_2
 
 
-gdaltest_list_internal = [
+gdaltest_list = [
     ogr_pg_table_cleanup,
     ogr_pg_2,
     ogr_pg_19,
@@ -5708,12 +5653,9 @@ def ogr_pg_cleanup():
     ogr_pg_23,
     ogr_pg_24,
     ogr_pg_25,
-    # ogr_pg_26,
-    # ogr_pg_27,
     ogr_pg_28,
     ogr_pg_29,
     ogr_pg_30,
-    ogr_pg_29,
     ogr_pg_31,
     ogr_pg_32,
     ogr_pg_33,
@@ -5777,40 +5719,6 @@ def ogr_pg_cleanup():
     ogr_pg_cleanup
 ]
 
-disabled_gdaltest_list_internal = [
-    ogr_pg_table_cleanup,
-    ogr_pg_json,
-    ogr_pg_cleanup]
-
-###############################################################################
-# Run gdaltest_list_internal with PostGIS enabled and then with PostGIS disabled
-
-
-def ogr_pg_with_and_without_postgis():
-
-    gdaltest.ogr_pg_second_run = False
-    gdaltest.run_tests([ogr_pg_1])
-    if gdaltest.pg_ds is None:
-        return 'skip'
-    # gdaltest.run_tests( [ ogr_pg_71 ] )
-    # gdaltest.run_tests( [ ogr_pg_cleanup ] )
-    if True:  # pylint: disable=using-constant-test
-        gdaltest.run_tests(gdaltest_list_internal)
-
-        if gdaltest.pg_has_postgis:
-            gdal.SetConfigOption("PG_USE_POSTGIS", "NO")
-            gdaltest.ogr_pg_second_run = True
-            gdaltest.run_tests([ogr_pg_1])
-            gdaltest.run_tests(gdaltest_list_internal)
-            gdal.SetConfigOption("PG_USE_POSTGIS", "YES")
-            gdaltest.ogr_pg_second_run = False
-
-    return 'success'
-
-
-gdaltest_list = [
-    ogr_pg_with_and_without_postgis
-]
 
 if __name__ == '__main__':
 

From 19b48ca2c3ee62677aefe8959559197cd6d26be1 Mon Sep 17 00:00:00 2001
From: Craig de Stigter <craig.destigter@koordinates.com>
Date: Tue, 6 Nov 2018 12:38:48 +1300
Subject: [PATCH 133/488] Fix builds on OSX

---
 autotest/gcore/hfa_rfc40.py          | 34 ++++++++++++++++++----------
 gdal/ci/travis/osx/before_install.sh |  3 +--
 gdal/ci/travis/osx/script.sh         |  3 ++-
 3 files changed, 25 insertions(+), 15 deletions(-)

diff --git a/autotest/gcore/hfa_rfc40.py b/autotest/gcore/hfa_rfc40.py
index 0042476918d0..2366b3c20ecd 100755
--- a/autotest/gcore/hfa_rfc40.py
+++ b/autotest/gcore/hfa_rfc40.py
@@ -31,23 +31,33 @@
 ###############################################################################
 
 import sys
-import numpy
 from osgeo import gdal
 
+import pytest
 
 import gdaltest
 
-INT_DATA = numpy.array([197, 83, 46, 29, 1, 78, 23, 90, 12, 45])
-DOUBLE_DATA = numpy.array([0.1, 43.2, 78.1, 9.9, 23.0, 0.92, 82.5, 0.0, 1.0, 99.0])
-STRING_DATA = numpy.array(["sddf", "wess", "grbgr", "dewd", "ddww", "qwsqw",
-                           "gbfgbf", "wwqw3", "e", ""])
-STRING_DATA_INTS = numpy.array(["197", "83", "46", "29", "1", "78",
-                                "23", "90", "12", "45"])
-STRING_DATA_DOUBLES = numpy.array(["0.1", "43.2", "78.1", "9.9", "23.0", "0.92",
-                                   "82.5", "0.0", "1.0", "99.0"])
-LONG_STRING_DATA = numpy.array(["sdfsdfsdfs", "sdweddw", "sdewdweee", "3423dedd",
-                                "jkejjjdjd", "edcdcdcdc", "fcdkmk4m534m", "edwededdd",
-                                "dedwedew", "wdedefrfrfrf"])
+try:
+    import numpy
+    array = numpy.array
+except ImportError:
+    numpy = None
+    array = list
+
+pytestmark = pytest.mark.skipif(numpy is None, reason="numpy not available")
+
+
+INT_DATA = array([197, 83, 46, 29, 1, 78, 23, 90, 12, 45])
+DOUBLE_DATA = array([0.1, 43.2, 78.1, 9.9, 23.0, 0.92, 82.5, 0.0, 1.0, 99.0])
+STRING_DATA = array(["sddf", "wess", "grbgr", "dewd", "ddww", "qwsqw",
+                     "gbfgbf", "wwqw3", "e", ""])
+STRING_DATA_INTS = array(["197", "83", "46", "29", "1", "78",
+                          "23", "90", "12", "45"])
+STRING_DATA_DOUBLES = array(["0.1", "43.2", "78.1", "9.9", "23.0", "0.92",
+                             "82.5", "0.0", "1.0", "99.0"])
+LONG_STRING_DATA = array(["sdfsdfsdfs", "sdweddw", "sdewdweee", "3423dedd",
+                          "jkejjjdjd", "edcdcdcdc", "fcdkmk4m534m", "edwededdd",
+                          "dedwedew", "wdedefrfrfrf"])
 
 
 class HFATestError(Exception):
diff --git a/gdal/ci/travis/osx/before_install.sh b/gdal/ci/travis/osx/before_install.sh
index 7ef1badf6851..bc0656647160 100755
--- a/gdal/ci/travis/osx/before_install.sh
+++ b/gdal/ci/travis/osx/before_install.sh
@@ -4,5 +4,4 @@ set -e
 
 brew update
 brew uninstall postgis gdal
-brew install sqlite3
-brew install ccache
+brew install sqlite3 ccache
diff --git a/gdal/ci/travis/osx/script.sh b/gdal/ci/travis/osx/script.sh
index d18f90e9bd73..df2adccaaf4d 100755
--- a/gdal/ci/travis/osx/script.sh
+++ b/gdal/ci/travis/osx/script.sh
@@ -5,9 +5,10 @@ set -e
 export PYTHONPATH=$PWD/gdal/swig/python/build/lib.macosx-10.12-intel-2.7:$PWD/gdal/swig/python/build/lib.macosx-10.11-x86_64-2.7
 export PYTEST="pytest -v -p no:sugar --color=no"
 
-# CPP unit tests
+echo 'Running CPP unit tests'
 (cd autotest/cpp && GDAL_SKIP=JP2ECW make quick_test)
 
+echo 'Running Python unit tests'
 # install test dependencies
 sudo -H pip install -U -r autotest/requirements.txt
 

From 1cdd430d2b6e6bf64a911f5e4a319aceaaf85a4b Mon Sep 17 00:00:00 2001
From: Craig de Stigter <craig.destigter@koordinates.com>
Date: Thu, 29 Nov 2018 16:36:41 +1300
Subject: [PATCH 134/488] Manual fixes for wfs/csw tests

---
 autotest/ogr/ogr_csw.py |  79 +-----
 autotest/ogr/ogr_wfs.py | 526 +++++++++++++---------------------------
 2 files changed, 171 insertions(+), 434 deletions(-)

diff --git a/autotest/ogr/ogr_csw.py b/autotest/ogr/ogr_csw.py
index b86252f88cee..4a1ff2cc8417 100755
--- a/autotest/ogr/ogr_csw.py
+++ b/autotest/ogr/ogr_csw.py
@@ -31,6 +31,7 @@
 
 import sys
 
+import pytest
 
 import gdaltest
 from osgeo import ogr
@@ -40,18 +41,12 @@
 # Test underlying OGR drivers
 #
 
+pytestmark = pytest.mark.require_driver('CSW')
 
-def ogr_csw_init():
-
-    gdaltest.csw_drv = None
-
-    try:
-        gdaltest.csw_drv = ogr.GetDriverByName('CSW')
-    except:
-        pass
 
-    if gdaltest.csw_drv is None:
-        return 'skip'
+@pytest.fixture(autouse=True, scope='module')
+def ogr_csw_init():
+    gdaltest.csw_drv = ogr.GetDriverByName('CSW')
 
     gml_ds = ogr.Open('data/ionic_wfs.gml')
     if gml_ds is None:
@@ -67,10 +62,8 @@ def ogr_csw_init():
 # Test reading a pyCSW server
 
 
-def ogr_csw_pycsw():
-    if gdaltest.csw_drv is None:
-        return 'skip'
-
+@pytest.mark.skip()
+def test_ogr_csw_pycsw():
     ds = ogr.Open('CSW:http://catalog.data.gov/csw')
     if ds is None:
         if gdaltest.gdalurlopen('http://catalog.data.gov/csw') is None:
@@ -90,10 +83,6 @@ def ogr_csw_pycsw():
 
 
 def ogr_csw_vsimem_fail_because_not_enabled():
-
-    if gdaltest.csw_drv is None:
-        return 'skip'
-
     gdal.PushErrorHandler()
     ds = ogr.Open('CSW:/vsimem/csw_endpoint')
     gdal.PopErrorHandler()
@@ -105,10 +94,6 @@ def ogr_csw_vsimem_fail_because_not_enabled():
 
 ###############################################################################
 def ogr_csw_vsimem_fail_because_no_get_capabilities():
-
-    if gdaltest.csw_drv is None:
-        return 'skip'
-
     gdal.SetConfigOption('CPL_CURL_ENABLE_VSIMEM', 'YES')
 
     gdal.PushErrorHandler()
@@ -123,10 +108,6 @@ def ogr_csw_vsimem_fail_because_no_get_capabilities():
 
 
 def ogr_csw_vsimem_fail_because_empty_response():
-
-    if gdaltest.csw_drv is None:
-        return 'skip'
-
     gdal.SetConfigOption('CPL_CURL_ENABLE_VSIMEM', 'YES')
 
     gdal.FileFromMemBuffer('/vsimem/csw_endpoint?SERVICE=CSW&REQUEST=GetCapabilities',
@@ -148,10 +129,6 @@ def ogr_csw_vsimem_fail_because_empty_response():
 
 
 def ogr_csw_vsimem_fail_because_no_CSW_Capabilities():
-
-    if gdaltest.csw_drv is None:
-        return 'skip'
-
     gdal.SetConfigOption('CPL_CURL_ENABLE_VSIMEM', 'YES')
 
     gdal.FileFromMemBuffer('/vsimem/csw_endpoint?SERVICE=CSW&REQUEST=GetCapabilities',
@@ -173,10 +150,6 @@ def ogr_csw_vsimem_fail_because_no_CSW_Capabilities():
 
 
 def ogr_csw_vsimem_fail_because_exception():
-
-    if gdaltest.csw_drv is None:
-        return 'skip'
-
     gdal.SetConfigOption('CPL_CURL_ENABLE_VSIMEM', 'YES')
 
     gdal.FileFromMemBuffer('/vsimem/csw_endpoint?SERVICE=CSW&REQUEST=GetCapabilities',
@@ -198,10 +171,6 @@ def ogr_csw_vsimem_fail_because_exception():
 
 
 def ogr_csw_vsimem_fail_because_invalid_xml_capabilities():
-
-    if gdaltest.csw_drv is None:
-        return 'skip'
-
     gdal.SetConfigOption('CPL_CURL_ENABLE_VSIMEM', 'YES')
 
     gdal.FileFromMemBuffer('/vsimem/csw_endpoint?SERVICE=CSW&REQUEST=GetCapabilities',
@@ -223,10 +192,6 @@ def ogr_csw_vsimem_fail_because_invalid_xml_capabilities():
 
 
 def ogr_csw_vsimem_fail_because_missing_version():
-
-    if gdaltest.csw_drv is None:
-        return 'skip'
-
     gdal.SetConfigOption('CPL_CURL_ENABLE_VSIMEM', 'YES')
 
     gdal.FileFromMemBuffer('/vsimem/csw_endpoint?SERVICE=CSW&REQUEST=GetCapabilities',
@@ -250,10 +215,6 @@ def ogr_csw_vsimem_fail_because_missing_version():
 
 
 def ogr_csw_vsimem_csw_minimal_instance():
-
-    if gdaltest.csw_drv is None:
-        return 'skip'
-
     gdal.SetConfigOption('CPL_CURL_ENABLE_VSIMEM', 'YES')
 
     # Invalid response, but enough for use
@@ -573,10 +534,6 @@ def ogr_csw_vsimem_csw_minimal_instance():
 
 
 def ogr_csw_vsimem_csw_output_schema_csw():
-
-    if gdaltest.csw_drv is None:
-        return 'skip'
-
     ds = gdal.OpenEx('CSW:/vsimem/csw_endpoint', open_options=['OUTPUT_SCHEMA=CSW'])
     lyr = ds.GetLayer(0)
 
@@ -638,10 +595,6 @@ def ogr_csw_vsimem_csw_output_schema_csw():
 
 
 def ogr_csw_vsimem_csw_output_schema_gmd():
-
-    if gdaltest.csw_drv is None:
-        return 'skip'
-
     ds = gdal.OpenEx('CSW:/vsimem/csw_endpoint', open_options=['OUTPUT_SCHEMA=GMD'])
     lyr = ds.GetLayer(0)
 
@@ -684,10 +637,6 @@ def ogr_csw_vsimem_csw_output_schema_gmd():
 
 
 def ogr_csw_vsimem_csw_output_schema_fgdc():
-
-    if gdaltest.csw_drv is None:
-        return 'skip'
-
     ds = gdal.OpenEx('CSW:/vsimem/csw_endpoint', open_options=['OUTPUT_SCHEMA=http://www.opengis.net/cat/csw/csdgm'])
     lyr = ds.GetLayer(0)
 
@@ -732,10 +681,6 @@ def ogr_csw_vsimem_csw_output_schema_fgdc():
 
 
 def ogr_csw_vsimem_cleanup():
-
-    if gdaltest.csw_drv is None:
-        return 'skip'
-
     gdal.SetConfigOption('CPL_CURL_ENABLE_VSIMEM', None)
 
     for f in gdal.ReadDir('/vsimem/'):
@@ -744,11 +689,7 @@ def ogr_csw_vsimem_cleanup():
     return 'success'
 
 
-gdaltest_live_list = [
-    ogr_csw_pycsw
-]
-
-gdaltest_vsimem_list = [
+gdaltest_list = [
     ogr_csw_vsimem_fail_because_not_enabled,
     ogr_csw_vsimem_fail_because_no_get_capabilities,
     ogr_csw_vsimem_fail_because_empty_response,
@@ -763,10 +704,6 @@ def ogr_csw_vsimem_cleanup():
     ogr_csw_vsimem_cleanup,
 ]
 
-gdaltest_list = [ogr_csw_init]
-gdaltest_list += gdaltest_vsimem_list
-# gdaltest_list += gdaltest_live_list
-
 if __name__ == '__main__':
 
     gdaltest.setup_run('ogr_csw')
diff --git a/autotest/ogr/ogr_wfs.py b/autotest/ogr/ogr_wfs.py
index 748973331744..4859ee5554c2 100755
--- a/autotest/ogr/ogr_wfs.py
+++ b/autotest/ogr/ogr_wfs.py
@@ -35,8 +35,8 @@
     from http.server import BaseHTTPRequestHandler
 
 import os
-import sys
 
+import pytest
 
 import gdaltest
 import ogrtest
@@ -44,19 +44,19 @@
 from osgeo import osr
 from osgeo import gdal
 import webserver
+from osr import osr_ct
 
 ###############################################################################
 # Test underlying OGR drivers
 #
 
 
-def ogr_wfs_init():
+pytestmark = pytest.mark.require_driver('WFS')
 
-    gdaltest.wfs_drv = None
 
+@pytest.fixture(autouse=True, scope='module')
+def ogr_wfs_init():
     gdaltest.wfs_drv = ogr.GetDriverByName('WFS')
-    if gdaltest.wfs_drv is None:
-        return 'skip'
 
     gdaltest.geoserver_wfs = None
     gdaltest.deegree_wfs = None
@@ -66,17 +66,22 @@ def ogr_wfs_init():
     if gml_ds is None:
         gdaltest.wfs_drv = None
         if gdal.GetLastErrorMsg().find('Xerces') != -1:
-            return 'skip'
-        gdaltest.post_reason('failed to open test file.')
-        return 'skip'
+            pytest.skip()
+        pytest.skip('failed to open test file.')
+
+
+@pytest.fixture(params=['NO', None], scope='module')
+def with_and_without_streaming(request):
+    with gdaltest.config_option('OGR_WFS_USE_STREAMING', request.param):
+        yield
 
-    return 'success'
 
 ###############################################################################
 # Test reading a MapServer WFS server
 
 
-def ogr_wfs_mapserver():
+@pytest.mark.skip()
+def test_ogr_wfs_mapserver():
     if gdaltest.wfs_drv is None:
         return 'skip'
 
@@ -128,7 +133,8 @@ def ogr_wfs_mapserver():
 ###############################################################################
 # Test reading a GeoServer WFS server
 
-def ogr_wfs_geoserver():
+@pytest.mark.skip('FIXME: re-enable after adapting test')
+def test_ogr_wfs_geoserver():
     if gdaltest.wfs_drv is None:
         return 'skip'
 
@@ -251,7 +257,8 @@ def ogr_wfs_geoserver():
 # Test reading a GeoServer WFS server with OUTPUTFORMAT=json
 
 
-def ogr_wfs_geoserver_json():
+@pytest.mark.skip('FIXME: re-enable after adapting test')
+def test_ogr_wfs_geoserver_json():
     if gdaltest.wfs_drv is None:
         return 'skip'
 
@@ -298,7 +305,8 @@ def ogr_wfs_geoserver_json():
 ###############################################################################
 # Test reading a GeoServer WFS server with OUTPUTFORMAT=SHAPE-ZIP
 
-def ogr_wfs_geoserver_shapezip():
+@pytest.mark.skip('FIXME: re-enable after adapting test')
+def test_ogr_wfs_geoserver_shapezip():
     if gdaltest.wfs_drv is None:
         return 'skip'
 
@@ -345,7 +353,8 @@ def ogr_wfs_geoserver_shapezip():
 # Test WFS paging
 
 
-def ogr_wfs_geoserver_paging():
+@pytest.mark.skip('FIXME: re-enable after adapting test')
+def test_ogr_wfs_geoserver_paging():
     if gdaltest.wfs_drv is None:
         return 'skip'
 
@@ -416,7 +425,8 @@ def ogr_wfs_geoserver_paging():
 # Test reading a Deegree WFS server
 
 
-def ogr_wfs_deegree():
+@pytest.mark.skip()
+def test_ogr_wfs_deegree():
     if gdaltest.wfs_drv is None:
         return 'skip'
 
@@ -481,7 +491,8 @@ def ogr_wfs_deegree():
 # Run test_ogrsf
 
 
-def ogr_wfs_test_ogrsf():
+@pytest.mark.skip()
+def test_ogr_wfs_test_ogrsf():
     if gdaltest.wfs_drv is None:
         return 'skip'
 
@@ -561,7 +572,7 @@ def do_GET(self):
 # Test reading a local fake WFS server
 
 
-def ogr_wfs_fake_wfs_server():
+def test_ogr_wfs_fake_wfs_server():
     if gdaltest.wfs_drv is None:
         return 'skip'
 
@@ -610,7 +621,8 @@ def ogr_wfs_fake_wfs_server():
 # Test CreateFeature() / UpdateFeature() / DeleteFeature() (WFS-T)
 
 
-def ogr_wfs_geoserver_wfst():
+@pytest.mark.skip('FIXME: re-enable after adapting test')
+def test_ogr_wfs_geoserver_wfst():
     if gdaltest.wfs_drv is None:
         return 'skip'
 
@@ -703,10 +715,8 @@ def ogr_wfs_geoserver_wfst():
 # Test CreateFeature() / UpdateFeature() / DeleteFeature() with expected
 # failure due to server not allowing insert & delete
 
-def ogr_wfs_deegree_wfst():
-
-    if gdaltest.wfs_drv is None:
-        return 'skip'
+@pytest.mark.skip()
+def test_ogr_wfs_deegree_wfst():
 
     if gdaltest.gdalurlopen('http://testing.deegree.org/deegree-wfs/services') is None:
         print('cannot open URL')
@@ -746,10 +756,8 @@ def ogr_wfs_deegree_wfst():
 # Test CreateFeature() / UpdateFeature() / DeleteFeature() on a WFS 1.0.0 server
 
 
-def ogr_wfs_ionic_wfst():
-
-    if gdaltest.wfs_drv is None:
-        return 'skip'
+@pytest.mark.skip()
+def test_ogr_wfs_ionic_wfst():
 
     if gdaltest.gdalurlopen('http://webservices.ionicsoft.com/ionicweb/wfs/BOSTON_ORA') is None:
         print('cannot open URL')
@@ -791,10 +799,8 @@ def ogr_wfs_ionic_wfst():
 # Test ExecuteSQL() where SQL should be turned into PROPERTYNAME and FILTER parameters
 
 
-def ogr_wfs_ionic_sql():
-
-    if gdaltest.wfs_drv is None:
-        return 'skip'
+@pytest.mark.skip()
+def test_ogr_wfs_ionic_sql():
 
     if not gdaltest.ionic_wfs:
         return 'skip'
@@ -818,10 +824,7 @@ def ogr_wfs_ionic_sql():
 # The following test should issue 0 WFS http request
 
 
-def ogr_wfs_xmldescriptionfile():
-
-    if gdaltest.wfs_drv is None:
-        return 'skip'
+def test_ogr_wfs_xmldescriptionfile():
 
     ds = ogr.Open('data/testwfs.xml')
     lyr = ds.GetLayer(0)
@@ -862,10 +865,8 @@ def ogr_wfs_xmldescriptionfile():
 # Test opening a datasource from a XML description file that has just the URL
 
 
-def ogr_wfs_xmldescriptionfile_to_be_updated():
-
-    if gdaltest.wfs_drv is None:
-        return 'skip'
+@pytest.mark.skip('FIXME: re-enable after adapting test')
+def test_ogr_wfs_xmldescriptionfile_to_be_updated():
 
     if not gdaltest.geoserver_wfs:
         return 'skip'
@@ -918,10 +919,7 @@ def ogr_wfs_xmldescriptionfile_to_be_updated():
 # The following test should issue 0 WFS http request
 
 
-def ogr_wfs_getcapabilitiesfile():
-
-    if gdaltest.wfs_drv is None:
-        return 'skip'
+def test_ogr_wfs_getcapabilitiesfile():
 
     ds = ogr.Open('data/getcapabilities_wfs.xml')
 
@@ -939,10 +937,8 @@ def ogr_wfs_getcapabilitiesfile():
 # Test opening a datastore which only support GML 3.2.1 output
 
 
-def ogr_wfs_deegree_gml321():
-
-    if gdaltest.wfs_drv is None:
-        return 'skip'
+@pytest.mark.skip()
+def test_ogr_wfs_deegree_gml321():
 
     ds = ogr.Open('WFS:http://demo.deegree.org:80/inspire-workspace/services/wfs?ACCEPTVERSIONS=1.1.0&MAXFEATURES=10')
     if ds is None:
@@ -965,10 +961,8 @@ def ogr_wfs_deegree_gml321():
 # Test WFS 2.0.0 support
 
 
-def ogr_wfs_deegree_wfs200():
-
-    if gdaltest.wfs_drv is None:
-        return 'skip'
+@pytest.mark.skip()
+def test_ogr_wfs_deegree_wfs200():
 
     ds = ogr.Open('WFS:http://demo.deegree.org:80/utah-workspace/services/wfs?ACCEPTVERSIONS=2.0.0')
     if ds is None:
@@ -1024,10 +1018,8 @@ def ogr_wfs_deegree_wfs200():
 # Test WFS SORTBY support
 
 
-def ogr_wfs_deegree_sortby():
-
-    if gdaltest.wfs_drv is None:
-        return 'skip'
+@pytest.mark.skip()
+def test_ogr_wfs_deegree_sortby():
 
     ds = ogr.Open('WFS:http://demo.deegree.org:80/utah-workspace/services/wfs?MAXFEATURES=10&VERSION=1.1.0')
     if ds is None:
@@ -1057,9 +1049,6 @@ def ogr_wfs_deegree_sortby():
 
 def ogr_wfs_get_multiple_layer_defn(url):
 
-    if gdaltest.wfs_drv is None:
-        return 'skip'
-
     if not gdaltest.run_slow_tests():
         return 'skip'
 
@@ -1081,71 +1070,57 @@ def ogr_wfs_get_multiple_layer_defn(url):
 # Test a ESRI server
 
 
-def ogr_wfs_esri():
+@pytest.mark.skip()
+def test_ogr_wfs_esri():
     return ogr_wfs_get_multiple_layer_defn('http://map.ngdc.noaa.gov/wfsconnector/com.esri.wfs.Esrimap/dart_atlantic_f')
 
 ###############################################################################
 # Test a ESRI server
 
 
-def ogr_wfs_esri_2():
+def test_ogr_wfs_esri_2():
     return ogr_wfs_get_multiple_layer_defn('http://sentinel.ga.gov.au/wfsconnector/com.esri.wfs.Esrimap')
 
 ###############################################################################
 # Test a CubeWerx server
 
 
-def ogr_wfs_cubewerx():
+def test_ogr_wfs_cubewerx():
     return ogr_wfs_get_multiple_layer_defn('http://portal.cubewerx.com/cubewerx/cubeserv/cubeserv.cgi?CONFIG=haiti_vgi&DATASTORE=vgi')
 
 ###############################################################################
 # Test a TinyOWS server
 
 
-def ogr_wfs_tinyows():
+def test_ogr_wfs_tinyows():
     return ogr_wfs_get_multiple_layer_defn('http://www.tinyows.org/cgi-bin/tinyows')
 
 ###############################################################################
 # Test a ERDAS Apollo server
 
 
-def ogr_wfs_erdas_apollo():
+def test_ogr_wfs_erdas_apollo():
     return ogr_wfs_get_multiple_layer_defn('http://apollo.erdas.com/erdas-apollo/vector/Cherokee')
 
 ###############################################################################
 # Test a Integraph server
 
 
-def ogr_wfs_intergraph():
+def test_ogr_wfs_intergraph():
     return ogr_wfs_get_multiple_layer_defn('http://ideg.xunta.es/WFS_POL/request.aspx')
 
 ###############################################################################
 # Test a MapInfo server
 
 
-def ogr_wfs_mapinfo():
+def test_ogr_wfs_mapinfo():
     return ogr_wfs_get_multiple_layer_defn('http://www.mapinfo.com/miwfs')
 
-###############################################################################
-# Test with OGR_WFS_USE_STREAMING=NO
-
-
-def ogr_wfs_turn_streaming_off():
-    gdal.SetConfigOption('OGR_WFS_USE_STREAMING', 'NO')
-    return 'success'
-
-
-def ogr_wfs_turn_streaming_on():
-    gdal.SetConfigOption('OGR_WFS_USE_STREAMING', None)
-    return 'success'
 
 ###############################################################################
 
 
-def ogr_wfs_vsimem_fail_because_not_enabled():
-
-    if gdaltest.wfs_drv is None:
-        return 'skip'
+def test_ogr_wfs_vsimem_fail_because_not_enabled(with_and_without_streaming):
 
     gdal.PushErrorHandler()
     ds = ogr.Open('WFS:/vsimem/wfs_endpoint')
@@ -1157,10 +1132,7 @@ def ogr_wfs_vsimem_fail_because_not_enabled():
 
 
 ###############################################################################
-def ogr_wfs_vsimem_fail_because_no_get_capabilities():
-
-    if gdaltest.wfs_drv is None:
-        return 'skip'
+def test_ogr_wfs_vsimem_fail_because_no_get_capabilities(with_and_without_streaming):
 
     gdal.SetConfigOption('CPL_CURL_ENABLE_VSIMEM', 'YES')
 
@@ -1175,10 +1147,7 @@ def ogr_wfs_vsimem_fail_because_no_get_capabilities():
 ###############################################################################
 
 
-def ogr_wfs_vsimem_fail_because_empty_response():
-
-    if gdaltest.wfs_drv is None:
-        return 'skip'
+def test_ogr_wfs_vsimem_fail_because_empty_response(with_and_without_streaming):
 
     gdal.SetConfigOption('CPL_CURL_ENABLE_VSIMEM', 'YES')
 
@@ -1200,10 +1169,7 @@ def ogr_wfs_vsimem_fail_because_empty_response():
 ###############################################################################
 
 
-def ogr_wfs_vsimem_fail_because_no_WFS_Capabilities():
-
-    if gdaltest.wfs_drv is None:
-        return 'skip'
+def test_ogr_wfs_vsimem_fail_because_no_WFS_Capabilities(with_and_without_streaming):
 
     gdal.SetConfigOption('CPL_CURL_ENABLE_VSIMEM', 'YES')
 
@@ -1225,10 +1191,7 @@ def ogr_wfs_vsimem_fail_because_no_WFS_Capabilities():
 ###############################################################################
 
 
-def ogr_wfs_vsimem_fail_because_exception():
-
-    if gdaltest.wfs_drv is None:
-        return 'skip'
+def test_ogr_wfs_vsimem_fail_because_exception(with_and_without_streaming):
 
     gdal.SetConfigOption('CPL_CURL_ENABLE_VSIMEM', 'YES')
 
@@ -1250,10 +1213,7 @@ def ogr_wfs_vsimem_fail_because_exception():
 ###############################################################################
 
 
-def ogr_wfs_vsimem_fail_because_invalid_xml_capabilities():
-
-    if gdaltest.wfs_drv is None:
-        return 'skip'
+def test_ogr_wfs_vsimem_fail_because_invalid_xml_capabilities(with_and_without_streaming):
 
     gdal.SetConfigOption('CPL_CURL_ENABLE_VSIMEM', 'YES')
 
@@ -1275,10 +1235,7 @@ def ogr_wfs_vsimem_fail_because_invalid_xml_capabilities():
 ###############################################################################
 
 
-def ogr_wfs_vsimem_fail_because_missing_featuretypelist():
-
-    if gdaltest.wfs_drv is None:
-        return 'skip'
+def test_ogr_wfs_vsimem_fail_because_missing_featuretypelist(with_and_without_streaming):
 
     gdal.SetConfigOption('CPL_CURL_ENABLE_VSIMEM', 'YES')
 
@@ -1302,10 +1259,7 @@ def ogr_wfs_vsimem_fail_because_missing_featuretypelist():
 ###############################################################################
 
 
-def ogr_wfs_vsimem_wfs110_open_getcapabilities_file():
-
-    if gdaltest.wfs_drv is None:
-        return 'skip'
+def test_ogr_wfs_vsimem_wfs110_open_getcapabilities_file(with_and_without_streaming):
 
     gdal.FileFromMemBuffer('/vsimem/caps.xml',
                            """<WFS_Capabilities
@@ -1391,10 +1345,7 @@ def ogr_wfs_vsimem_wfs110_open_getcapabilities_file():
 ###############################################################################
 
 
-def ogr_wfs_vsimem_wfs110_minimal_instance():
-
-    if gdaltest.wfs_drv is None:
-        return 'skip'
+def test_ogr_wfs_vsimem_wfs110_minimal_instance(with_and_without_streaming):
 
     gdal.SetConfigOption('CPL_CURL_ENABLE_VSIMEM', 'YES')
 
@@ -1439,10 +1390,7 @@ def ogr_wfs_vsimem_wfs110_minimal_instance():
 ###############################################################################
 
 
-def ogr_wfs_vsimem_wfs110_one_layer_missing_describefeaturetype():
-
-    if gdaltest.wfs_drv is None:
-        return 'skip'
+def test_ogr_wfs_vsimem_wfs110_one_layer_missing_describefeaturetype(with_and_without_streaming):
 
     gdal.SetConfigOption('CPL_CURL_ENABLE_VSIMEM', 'YES')
 
@@ -1488,10 +1436,7 @@ def ogr_wfs_vsimem_wfs110_one_layer_missing_describefeaturetype():
 ###############################################################################
 
 
-def ogr_wfs_vsimem_wfs110_one_layer_invalid_describefeaturetype():
-
-    if gdaltest.wfs_drv is None:
-        return 'skip'
+def test_ogr_wfs_vsimem_wfs110_one_layer_invalid_describefeaturetype(with_and_without_streaming):
 
     gdal.SetConfigOption('CPL_CURL_ENABLE_VSIMEM', 'YES')
 
@@ -1518,10 +1463,7 @@ def ogr_wfs_vsimem_wfs110_one_layer_invalid_describefeaturetype():
 ###############################################################################
 
 
-def ogr_wfs_vsimem_wfs110_one_layer_describefeaturetype_missing_schema():
-
-    if gdaltest.wfs_drv is None:
-        return 'skip'
+def test_ogr_wfs_vsimem_wfs110_one_layer_describefeaturetype_missing_schema(with_and_without_streaming):
 
     gdal.SetConfigOption('CPL_CURL_ENABLE_VSIMEM', 'YES')
 
@@ -1548,10 +1490,7 @@ def ogr_wfs_vsimem_wfs110_one_layer_describefeaturetype_missing_schema():
 ###############################################################################
 
 
-def ogr_wfs_vsimem_wfs110_one_layer_describefeaturetype():
-
-    if gdaltest.wfs_drv is None:
-        return 'skip'
+def test_ogr_wfs_vsimem_wfs110_one_layer_describefeaturetype(with_and_without_streaming):
 
     gdal.SetConfigOption('CPL_CURL_ENABLE_VSIMEM', 'YES')
 
@@ -1627,10 +1566,7 @@ def ogr_wfs_vsimem_wfs110_one_layer_describefeaturetype():
 
 
 ###############################################################################
-def ogr_wfs_vsimem_wfs110_one_layer_xmldescriptionfile_to_be_updated():
-
-    if gdaltest.wfs_drv is None:
-        return 'skip'
+def test_ogr_wfs_vsimem_wfs110_one_layer_xmldescriptionfile_to_be_updated(with_and_without_streaming):
 
     gdal.SetConfigOption('CPL_CURL_ENABLE_VSIMEM', 'YES')
 
@@ -1751,10 +1687,7 @@ def ogr_wfs_vsimem_wfs110_one_layer_xmldescriptionfile_to_be_updated():
 ###############################################################################
 
 
-def ogr_wfs_vsimem_wfs110_one_layer_missing_getfeaturecount_no_hits():
-
-    if gdaltest.wfs_drv is None:
-        return 'skip'
+def test_ogr_wfs_vsimem_wfs110_one_layer_missing_getfeaturecount_no_hits(with_and_without_streaming):
 
     gdal.SetConfigOption('CPL_CURL_ENABLE_VSIMEM', 'YES')
 
@@ -1778,10 +1711,7 @@ def ogr_wfs_vsimem_wfs110_one_layer_missing_getfeaturecount_no_hits():
 ###############################################################################
 
 
-def ogr_wfs_vsimem_wfs110_one_layer_missing_getfeaturecount_with_hits():
-
-    if gdaltest.wfs_drv is None:
-        return 'skip'
+def test_ogr_wfs_vsimem_wfs110_one_layer_missing_getfeaturecount_with_hits(with_and_without_streaming):
 
     gdal.SetConfigOption('CPL_CURL_ENABLE_VSIMEM', 'YES')
 
@@ -1828,10 +1758,7 @@ def ogr_wfs_vsimem_wfs110_one_layer_missing_getfeaturecount_with_hits():
 ###############################################################################
 
 
-def ogr_wfs_vsimem_wfs110_one_layer_invalid_getfeaturecount_with_hits():
-
-    if gdaltest.wfs_drv is None:
-        return 'skip'
+def test_ogr_wfs_vsimem_wfs110_one_layer_invalid_getfeaturecount_with_hits(with_and_without_streaming):
 
     gdal.SetConfigOption('CPL_CURL_ENABLE_VSIMEM', 'YES')
 
@@ -1858,10 +1785,7 @@ def ogr_wfs_vsimem_wfs110_one_layer_invalid_getfeaturecount_with_hits():
 ###############################################################################
 
 
-def ogr_wfs_vsimem_wfs110_one_layer_getfeaturecount_with_hits_missing_FeatureCollection():
-
-    if gdaltest.wfs_drv is None:
-        return 'skip'
+def test_ogr_wfs_vsimem_wfs110_one_layer_getfeaturecount_with_hits_missing_FeatureCollection(with_and_without_streaming):
 
     gdal.SetConfigOption('CPL_CURL_ENABLE_VSIMEM', 'YES')
 
@@ -1888,10 +1812,7 @@ def ogr_wfs_vsimem_wfs110_one_layer_getfeaturecount_with_hits_missing_FeatureCol
 ###############################################################################
 
 
-def ogr_wfs_vsimem_wfs110_one_layer_getfeaturecount_with_hits_invalid_xml():
-
-    if gdaltest.wfs_drv is None:
-        return 'skip'
+def test_ogr_wfs_vsimem_wfs110_one_layer_getfeaturecount_with_hits_invalid_xml(with_and_without_streaming):
 
     gdal.SetConfigOption('CPL_CURL_ENABLE_VSIMEM', 'YES')
 
@@ -1918,10 +1839,7 @@ def ogr_wfs_vsimem_wfs110_one_layer_getfeaturecount_with_hits_invalid_xml():
 ###############################################################################
 
 
-def ogr_wfs_vsimem_wfs110_one_layer_getfeaturecount_with_hits_ServiceExceptionReport():
-
-    if gdaltest.wfs_drv is None:
-        return 'skip'
+def test_ogr_wfs_vsimem_wfs110_one_layer_getfeaturecount_with_hits_ServiceExceptionReport(with_and_without_streaming):
 
     gdal.SetConfigOption('CPL_CURL_ENABLE_VSIMEM', 'YES')
 
@@ -1947,10 +1865,7 @@ def ogr_wfs_vsimem_wfs110_one_layer_getfeaturecount_with_hits_ServiceExceptionRe
 
 
 ###############################################################################
-def ogr_wfs_vsimem_wfs110_one_layer_getfeaturecount_with_hits_missing_numberOfFeatures():
-
-    if gdaltest.wfs_drv is None:
-        return 'skip'
+def test_ogr_wfs_vsimem_wfs110_one_layer_getfeaturecount_with_hits_missing_numberOfFeatures(with_and_without_streaming):
 
     gdal.SetConfigOption('CPL_CURL_ENABLE_VSIMEM', 'YES')
 
@@ -1977,10 +1892,7 @@ def ogr_wfs_vsimem_wfs110_one_layer_getfeaturecount_with_hits_missing_numberOfFe
 ###############################################################################
 
 
-def ogr_wfs_vsimem_wfs110_one_layer_getfeaturecount_with_hits():
-
-    if gdaltest.wfs_drv is None:
-        return 'skip'
+def test_ogr_wfs_vsimem_wfs110_one_layer_getfeaturecount_with_hits(with_and_without_streaming):
 
     gdal.SetConfigOption('CPL_CURL_ENABLE_VSIMEM', 'YES')
 
@@ -2013,10 +1925,7 @@ def ogr_wfs_vsimem_wfs110_one_layer_getfeaturecount_with_hits():
 ###############################################################################
 
 
-def ogr_wfs_vsimem_wfs110_one_layer_missing_getfeature():
-
-    if gdaltest.wfs_drv is None:
-        return 'skip'
+def test_ogr_wfs_vsimem_wfs110_one_layer_missing_getfeature(with_and_without_streaming):
 
     gdal.SetConfigOption('CPL_CURL_ENABLE_VSIMEM', 'YES')
 
@@ -2039,10 +1948,7 @@ def ogr_wfs_vsimem_wfs110_one_layer_missing_getfeature():
 ###############################################################################
 
 
-def ogr_wfs_vsimem_wfs110_one_layer_invalid_getfeature():
-
-    if gdaltest.wfs_drv is None:
-        return 'skip'
+def test_ogr_wfs_vsimem_wfs110_one_layer_invalid_getfeature(with_and_without_streaming):
 
     gdal.SetConfigOption('CPL_CURL_ENABLE_VSIMEM', 'YES')
 
@@ -2069,10 +1975,7 @@ def ogr_wfs_vsimem_wfs110_one_layer_invalid_getfeature():
 ###############################################################################
 
 
-def ogr_wfs_vsimem_wfs110_one_layer_exception_getfeature():
-
-    if gdaltest.wfs_drv is None:
-        return 'skip'
+def test_ogr_wfs_vsimem_wfs110_one_layer_exception_getfeature(with_and_without_streaming):
 
     gdal.SetConfigOption('CPL_CURL_ENABLE_VSIMEM', 'YES')
 
@@ -2100,10 +2003,7 @@ def ogr_wfs_vsimem_wfs110_one_layer_exception_getfeature():
 ###############################################################################
 
 
-def ogr_wfs_vsimem_wfs110_one_layer_getfeature():
-
-    if gdaltest.wfs_drv is None:
-        return 'skip'
+def test_ogr_wfs_vsimem_wfs110_one_layer_getfeature(with_and_without_streaming):
 
     gdal.SetConfigOption('CPL_CURL_ENABLE_VSIMEM', 'YES')
 
@@ -2177,10 +2077,7 @@ def ogr_wfs_vsimem_wfs110_one_layer_getfeature():
 ###############################################################################
 
 
-def ogr_wfs_vsimem_wfs110_one_layer_getextent():
-
-    if gdaltest.wfs_drv is None:
-        return 'skip'
+def test_ogr_wfs_vsimem_wfs110_one_layer_getextent(with_and_without_streaming):
 
     gdal.SetConfigOption('CPL_CURL_ENABLE_VSIMEM', 'YES')
 
@@ -2196,10 +2093,7 @@ def ogr_wfs_vsimem_wfs110_one_layer_getextent():
 ###############################################################################
 
 
-def ogr_wfs_vsimem_wfs110_one_layer_getextent_without_getfeature():
-
-    if gdaltest.wfs_drv is None:
-        return 'skip'
+def test_ogr_wfs_vsimem_wfs110_one_layer_getextent_without_getfeature(with_and_without_streaming):
 
     gdal.SetConfigOption('CPL_CURL_ENABLE_VSIMEM', 'YES')
 
@@ -2226,10 +2120,7 @@ def ogr_wfs_vsimem_wfs110_one_layer_getextent_without_getfeature():
 ###############################################################################
 
 
-def ogr_wfs_vsimem_wfs110_one_layer_getextent_optimized():
-
-    if gdaltest.wfs_drv is None:
-        return 'skip'
+def test_ogr_wfs_vsimem_wfs110_one_layer_getextent_optimized(with_and_without_streaming):
 
     gdal.SetConfigOption('CPL_CURL_ENABLE_VSIMEM', 'YES')
 
@@ -2307,9 +2198,7 @@ def ogr_wfs_vsimem_wfs110_one_layer_getextent_optimized():
         print(lyr.GetExtent())
         return 'fail'
 
-    sys.path.append('../osr')
-    import osr_ct
-    osr_ct.osr_ct_1()
+    osr_ct.test_osr_ct_1()
     if gdaltest.have_proj4 == 1:
 
         gdal.SetConfigOption('OGR_WFS_TRUST_CAPABILITIES_BOUNDS', 'YES')
@@ -2330,10 +2219,7 @@ def ogr_wfs_vsimem_wfs110_one_layer_getextent_optimized():
 ###############################################################################
 
 
-def ogr_wfs_vsimem_wfs110_one_layer_getfeature_ogr_getfeature():
-
-    if gdaltest.wfs_drv is None:
-        return 'skip'
+def test_ogr_wfs_vsimem_wfs110_one_layer_getfeature_ogr_getfeature(with_and_without_streaming):
 
     gdal.SetConfigOption('CPL_CURL_ENABLE_VSIMEM', 'YES')
 
@@ -2431,10 +2317,7 @@ def ogr_wfs_vsimem_wfs110_one_layer_getfeature_ogr_getfeature():
 ###############################################################################
 
 
-def ogr_wfs_vsimem_wfs110_one_layer_filter_gml_id_failed():
-
-    if gdaltest.wfs_drv is None:
-        return 'skip'
+def test_ogr_wfs_vsimem_wfs110_one_layer_filter_gml_id_failed(with_and_without_streaming):
 
     gdal.SetConfigOption('CPL_CURL_ENABLE_VSIMEM', 'YES')
 
@@ -2475,10 +2358,7 @@ def ogr_wfs_vsimem_wfs110_one_layer_filter_gml_id_failed():
 ###############################################################################
 
 
-def ogr_wfs_vsimem_wfs110_one_layer_filter_gml_id_success():
-
-    if gdaltest.wfs_drv is None:
-        return 'skip'
+def test_ogr_wfs_vsimem_wfs110_one_layer_filter_gml_id_success(with_and_without_streaming):
 
     gdal.SetConfigOption('CPL_CURL_ENABLE_VSIMEM', 'YES')
 
@@ -2529,10 +2409,7 @@ def ogr_wfs_vsimem_wfs110_one_layer_filter_gml_id_success():
 ###############################################################################
 
 
-def ogr_wfs_vsimem_wfs110_one_layer_filter():
-
-    if gdaltest.wfs_drv is None:
-        return 'skip'
+def test_ogr_wfs_vsimem_wfs110_one_layer_filter(with_and_without_streaming):
 
     gdal.SetConfigOption('CPL_CURL_ENABLE_VSIMEM', 'YES')
 
@@ -2583,10 +2460,7 @@ def ogr_wfs_vsimem_wfs110_one_layer_filter():
 ###############################################################################
 
 
-def ogr_wfs_vsimem_wfs110_one_layer_filter_spatial_ops():
-
-    if gdaltest.wfs_drv is None:
-        return 'skip'
+def test_ogr_wfs_vsimem_wfs110_one_layer_filter_spatial_ops(with_and_without_streaming):
 
     gdal.SetConfigOption('CPL_CURL_ENABLE_VSIMEM', 'YES')
 
@@ -2797,10 +2671,7 @@ def ogr_wfs_vsimem_wfs110_one_layer_filter_spatial_ops():
 ###############################################################################
 
 
-def ogr_wfs_vsimem_wfs110_one_layer_spatial_filter():
-
-    if gdaltest.wfs_drv is None:
-        return 'skip'
+def test_ogr_wfs_vsimem_wfs110_one_layer_spatial_filter(with_and_without_streaming):
 
     gdal.SetConfigOption('CPL_CURL_ENABLE_VSIMEM', 'YES')
 
@@ -2868,10 +2739,7 @@ def ogr_wfs_vsimem_wfs110_one_layer_spatial_filter():
 ###############################################################################
 
 
-def ogr_wfs_vsimem_wfs110_one_layer_spatial_filter_and_attribute_filter():
-
-    if gdaltest.wfs_drv is None:
-        return 'skip'
+def test_ogr_wfs_vsimem_wfs110_one_layer_spatial_filter_and_attribute_filter(with_and_without_streaming):
 
     gdal.SetConfigOption('CPL_CURL_ENABLE_VSIMEM', 'YES')
 
@@ -2923,10 +2791,7 @@ def ogr_wfs_vsimem_wfs110_one_layer_spatial_filter_and_attribute_filter():
 ###############################################################################
 
 
-def ogr_wfs_vsimem_wfs110_insertfeature():
-
-    if gdaltest.wfs_drv is None:
-        return 'skip'
+def test_ogr_wfs_vsimem_wfs110_insertfeature(with_and_without_streaming):
 
     wfs_insert_url = None
 
@@ -3428,10 +3293,7 @@ def ogr_wfs_vsimem_wfs110_insertfeature():
 ###############################################################################
 
 
-def ogr_wfs_vsimem_wfs110_updatefeature():
-
-    if gdaltest.wfs_drv is None:
-        return 'skip'
+def test_ogr_wfs_vsimem_wfs110_updatefeature(with_and_without_streaming):
 
     wfs_update_url = None
 
@@ -3620,10 +3482,7 @@ def ogr_wfs_vsimem_wfs110_updatefeature():
 ###############################################################################
 
 
-def ogr_wfs_vsimem_wfs110_deletefeature():
-
-    if gdaltest.wfs_drv is None:
-        return 'skip'
+def test_ogr_wfs_vsimem_wfs110_deletefeature(with_and_without_streaming):
 
     wfs_delete_url = None
 
@@ -3803,10 +3662,7 @@ def ogr_wfs_vsimem_wfs110_deletefeature():
 ###############################################################################
 
 
-def ogr_wfs_vsimem_wfs110_schema_not_understood():
-
-    if gdaltest.wfs_drv is None:
-        return 'skip'
+def test_ogr_wfs_vsimem_wfs110_schema_not_understood(with_and_without_streaming):
 
     gdal.SetConfigOption('CPL_CURL_ENABLE_VSIMEM', 'YES')
 
@@ -3911,10 +3767,7 @@ def ogr_wfs_vsimem_wfs110_schema_not_understood():
 ###############################################################################
 
 
-def ogr_wfs_vsimem_wfs110_multiple_layers():
-
-    if gdaltest.wfs_drv is None:
-        return 'skip'
+def test_ogr_wfs_vsimem_wfs110_multiple_layers(with_and_without_streaming):
 
     gdal.FileFromMemBuffer('/vsimem/wfs110_multiple_layers?SERVICE=WFS&REQUEST=GetCapabilities',
                            """<WFS_Capabilities version="1.1.0">
@@ -4076,10 +3929,7 @@ def ogr_wfs_vsimem_wfs110_multiple_layers():
 ###############################################################################
 
 
-def ogr_wfs_vsimem_wfs110_multiple_layers_same_name_different_ns():
-
-    if gdaltest.wfs_drv is None:
-        return 'skip'
+def test_ogr_wfs_vsimem_wfs110_multiple_layers_same_name_different_ns(with_and_without_streaming):
 
     gdal.FileFromMemBuffer('/vsimem/wfs110_multiple_layers_different_ns?SERVICE=WFS&REQUEST=GetCapabilities',
                            """<WFS_Capabilities version="1.1.0">
@@ -4182,10 +4032,7 @@ def ogr_wfs_vsimem_wfs110_multiple_layers_same_name_different_ns():
 ###############################################################################
 
 
-def ogr_wfs_vsimem_wfs200_paging():
-
-    if gdaltest.wfs_drv is None:
-        return 'skip'
+def test_ogr_wfs_vsimem_wfs200_paging(with_and_without_streaming):
 
     gdal.FileFromMemBuffer('/vsimem/wfs200_endpoint_paging?SERVICE=WFS&REQUEST=GetCapabilities',
                            """<WFS_Capabilities version="2.0.0">
@@ -4393,10 +4240,7 @@ def ogr_wfs_vsimem_wfs200_paging():
 
 
 ###############################################################################
-def ogr_wfs_vsimem_wfs200_json():
-
-    if gdaltest.wfs_drv is None:
-        return 'skip'
+def test_ogr_wfs_vsimem_wfs200_json(with_and_without_streaming):
 
     gdal.FileFromMemBuffer('/vsimem/wfs200_endpoint_json?SERVICE=WFS&REQUEST=GetCapabilities',
                            """<WFS_Capabilities version="2.0.0">
@@ -4534,10 +4378,7 @@ def ogr_wfs_vsimem_wfs200_json():
 
 
 ###############################################################################
-def ogr_wfs_vsimem_wfs200_multipart():
-
-    if gdaltest.wfs_drv is None:
-        return 'skip'
+def test_ogr_wfs_vsimem_wfs200_multipart(with_and_without_streaming):
 
     gdal.FileFromMemBuffer('/vsimem/wfs200_endpoint_multipart?SERVICE=WFS&REQUEST=GetCapabilities',
                            """<WFS_Capabilities version="2.0.0">
@@ -4671,10 +4512,7 @@ def ogr_wfs_vsimem_wfs200_multipart():
 ###############################################################################
 
 
-def ogr_wfs_vsimem_wfs200_join():
-
-    if gdaltest.wfs_drv is None:
-        return 'skip'
+def test_ogr_wfs_vsimem_wfs200_join(with_and_without_streaming):
 
     gdal.FileFromMemBuffer('/vsimem/wfs200_endpoint_join?SERVICE=WFS&REQUEST=GetCapabilities',
                            """<WFS_Capabilities version="2.0.0">
@@ -5167,10 +5005,7 @@ def ogr_wfs_vsimem_wfs200_join():
 ###############################################################################
 
 
-def ogr_wfs_vsimem_wfs200_join_layer_with_namespace_prefix():
-
-    if gdaltest.wfs_drv is None:
-        return 'skip'
+def test_ogr_wfs_vsimem_wfs200_join_layer_with_namespace_prefix(with_and_without_streaming):
 
     gdal.FileFromMemBuffer('/vsimem/wfs200_endpoint_join?SERVICE=WFS&REQUEST=GetCapabilities',
                            """<WFS_Capabilities version="2.0.0">
@@ -5287,10 +5122,7 @@ def ogr_wfs_vsimem_wfs200_join_layer_with_namespace_prefix():
 ###############################################################################
 
 
-def ogr_wfs_vsimem_wfs200_join_distinct():
-
-    if gdaltest.wfs_drv is None:
-        return 'skip'
+def test_ogr_wfs_vsimem_wfs200_join_distinct(with_and_without_streaming):
 
     gdal.FileFromMemBuffer('/vsimem/wfs200_endpoint_join?SERVICE=WFS&REQUEST=GetCapabilities',
                            """<WFS_Capabilities version="2.0.0">
@@ -5454,10 +5286,7 @@ def ogr_wfs_vsimem_wfs200_join_distinct():
 ###############################################################################
 
 
-def ogr_wfs_vsimem_cleanup():
-
-    if gdaltest.wfs_drv is None:
-        return 'skip'
+def test_ogr_wfs_vsimem_cleanup(with_and_without_streaming):
 
     gdal.SetConfigOption('CPL_CURL_ENABLE_VSIMEM', None)
 
@@ -5467,96 +5296,67 @@ def ogr_wfs_vsimem_cleanup():
     return 'success'
 
 
-gdaltest_live_list = [
-    # ogr_wfs_mapserver,
-    # ogr_wfs_geoserver, #FIXME: re-enable after adapting test
-    # ogr_wfs_geoserver_json, #FIXME: re-enable after adapting test
-    # ogr_wfs_geoserver_shapezip, #FIXME: re-enable after adapting test
-    # ogr_wfs_geoserver_paging, #FIXME: re-enable after adapting test
-    # ogr_wfs_deegree,
-    # ogr_wfs_test_ogrsf,
-    ogr_wfs_fake_wfs_server,
-    # ogr_wfs_geoserver_wfst, #FIXME: re-enable after adapting test
-    # ogr_wfs_deegree_wfst,
-    # ogr_wfs_ionic_wfst,
-    # ogr_wfs_ionic_sql,
-    ogr_wfs_xmldescriptionfile,
-    # ogr_wfs_xmldescriptionfile_to_be_updated, #FIXME: re-enable after adapting test
-    ogr_wfs_getcapabilitiesfile,
-    # ogr_wfs_deegree_gml321,
-    # ogr_wfs_deegree_wfs200,
-    # ogr_wfs_deegree_sortby,
-    # ogr_wfs_esri,
-    ogr_wfs_esri_2,
-    ogr_wfs_cubewerx,
-    ogr_wfs_tinyows,
-    ogr_wfs_erdas_apollo,
-    ogr_wfs_intergraph,
-    ogr_wfs_mapinfo,
-    ogr_wfs_turn_streaming_off,
-    # ogr_wfs_deegree,
-    # ogr_wfs_test_ogrsf,
+gdaltest_list = [
+    test_ogr_wfs_vsimem_fail_because_not_enabled,
+    test_ogr_wfs_vsimem_fail_because_no_get_capabilities,
+    test_ogr_wfs_vsimem_fail_because_empty_response,
+    test_ogr_wfs_vsimem_fail_because_no_WFS_Capabilities,
+    test_ogr_wfs_vsimem_fail_because_exception,
+    test_ogr_wfs_vsimem_fail_because_invalid_xml_capabilities,
+    test_ogr_wfs_vsimem_fail_because_missing_featuretypelist,
+    test_ogr_wfs_vsimem_wfs110_open_getcapabilities_file,
+    test_ogr_wfs_vsimem_wfs110_minimal_instance,
+    test_ogr_wfs_vsimem_wfs110_one_layer_missing_describefeaturetype,
+    test_ogr_wfs_vsimem_wfs110_one_layer_invalid_describefeaturetype,
+    test_ogr_wfs_vsimem_wfs110_one_layer_describefeaturetype_missing_schema,
+    test_ogr_wfs_vsimem_wfs110_one_layer_describefeaturetype,
+    test_ogr_wfs_vsimem_wfs110_one_layer_xmldescriptionfile_to_be_updated,
+    test_ogr_wfs_vsimem_wfs110_one_layer_missing_getfeaturecount_no_hits,
+    test_ogr_wfs_vsimem_wfs110_one_layer_missing_getfeaturecount_with_hits,
+    test_ogr_wfs_vsimem_wfs110_one_layer_invalid_getfeaturecount_with_hits,
+    test_ogr_wfs_vsimem_wfs110_one_layer_getfeaturecount_with_hits_missing_FeatureCollection,
+    test_ogr_wfs_vsimem_wfs110_one_layer_getfeaturecount_with_hits_invalid_xml,
+    test_ogr_wfs_vsimem_wfs110_one_layer_getfeaturecount_with_hits_ServiceExceptionReport,
+    test_ogr_wfs_vsimem_wfs110_one_layer_getfeaturecount_with_hits_missing_numberOfFeatures,
+    test_ogr_wfs_vsimem_wfs110_one_layer_getfeaturecount_with_hits,
+    test_ogr_wfs_vsimem_wfs110_one_layer_missing_getfeature,
+    test_ogr_wfs_vsimem_wfs110_one_layer_invalid_getfeature,
+    test_ogr_wfs_vsimem_wfs110_one_layer_exception_getfeature,
+    test_ogr_wfs_vsimem_wfs110_one_layer_getfeature,
+    test_ogr_wfs_vsimem_wfs110_one_layer_getextent,
+    test_ogr_wfs_vsimem_wfs110_one_layer_getextent_without_getfeature,
+    test_ogr_wfs_vsimem_wfs110_one_layer_getextent_optimized,
+    test_ogr_wfs_vsimem_wfs110_one_layer_getfeature_ogr_getfeature,
+    test_ogr_wfs_vsimem_wfs110_one_layer_filter_gml_id_failed,
+    test_ogr_wfs_vsimem_wfs110_one_layer_filter_gml_id_success,
+    test_ogr_wfs_vsimem_wfs110_one_layer_filter,
+    test_ogr_wfs_vsimem_wfs110_one_layer_filter_spatial_ops,
+    test_ogr_wfs_vsimem_wfs110_one_layer_spatial_filter,
+    test_ogr_wfs_vsimem_wfs110_one_layer_spatial_filter_and_attribute_filter,
+    test_ogr_wfs_vsimem_wfs110_insertfeature,
+    test_ogr_wfs_vsimem_wfs110_updatefeature,
+    test_ogr_wfs_vsimem_wfs110_deletefeature,
+    test_ogr_wfs_vsimem_wfs110_schema_not_understood,
+    test_ogr_wfs_vsimem_wfs110_multiple_layers,
+    test_ogr_wfs_vsimem_wfs110_multiple_layers_same_name_different_ns,
+    test_ogr_wfs_vsimem_wfs200_paging,
+    test_ogr_wfs_vsimem_wfs200_json,
+    test_ogr_wfs_vsimem_wfs200_multipart,
+    test_ogr_wfs_vsimem_wfs200_join,
+    test_ogr_wfs_vsimem_wfs200_join_layer_with_namespace_prefix,
+    test_ogr_wfs_vsimem_wfs200_join_distinct,
+    test_ogr_wfs_vsimem_cleanup,
+    test_ogr_wfs_fake_wfs_server,
+    test_ogr_wfs_xmldescriptionfile,
+    test_ogr_wfs_getcapabilitiesfile,
+    test_ogr_wfs_esri_2,
+    test_ogr_wfs_cubewerx,
+    test_ogr_wfs_tinyows,
+    test_ogr_wfs_erdas_apollo,
+    test_ogr_wfs_intergraph,
+    test_ogr_wfs_mapinfo,
 ]
 
-gdaltest_vsimem_list = [
-    ogr_wfs_vsimem_fail_because_not_enabled,
-    ogr_wfs_vsimem_fail_because_no_get_capabilities,
-    ogr_wfs_vsimem_fail_because_empty_response,
-    ogr_wfs_vsimem_fail_because_no_WFS_Capabilities,
-    ogr_wfs_vsimem_fail_because_exception,
-    ogr_wfs_vsimem_fail_because_invalid_xml_capabilities,
-    ogr_wfs_vsimem_fail_because_missing_featuretypelist,
-    ogr_wfs_vsimem_wfs110_open_getcapabilities_file,
-    ogr_wfs_vsimem_wfs110_minimal_instance,
-    ogr_wfs_vsimem_wfs110_one_layer_missing_describefeaturetype,
-    ogr_wfs_vsimem_wfs110_one_layer_invalid_describefeaturetype,
-    ogr_wfs_vsimem_wfs110_one_layer_describefeaturetype_missing_schema,
-    ogr_wfs_vsimem_wfs110_one_layer_describefeaturetype,
-    ogr_wfs_vsimem_wfs110_one_layer_xmldescriptionfile_to_be_updated,
-    ogr_wfs_vsimem_wfs110_one_layer_missing_getfeaturecount_no_hits,
-    ogr_wfs_vsimem_wfs110_one_layer_missing_getfeaturecount_with_hits,
-    ogr_wfs_vsimem_wfs110_one_layer_invalid_getfeaturecount_with_hits,
-    ogr_wfs_vsimem_wfs110_one_layer_getfeaturecount_with_hits_missing_FeatureCollection,
-    ogr_wfs_vsimem_wfs110_one_layer_getfeaturecount_with_hits_invalid_xml,
-    ogr_wfs_vsimem_wfs110_one_layer_getfeaturecount_with_hits_ServiceExceptionReport,
-    ogr_wfs_vsimem_wfs110_one_layer_getfeaturecount_with_hits_missing_numberOfFeatures,
-    ogr_wfs_vsimem_wfs110_one_layer_getfeaturecount_with_hits,
-    ogr_wfs_vsimem_wfs110_one_layer_missing_getfeature,
-    ogr_wfs_vsimem_wfs110_one_layer_invalid_getfeature,
-    ogr_wfs_vsimem_wfs110_one_layer_exception_getfeature,
-    ogr_wfs_vsimem_wfs110_one_layer_getfeature,
-    ogr_wfs_vsimem_wfs110_one_layer_getextent,
-    ogr_wfs_vsimem_wfs110_one_layer_getextent_without_getfeature,
-    ogr_wfs_vsimem_wfs110_one_layer_getextent_optimized,
-    ogr_wfs_vsimem_wfs110_one_layer_getfeature_ogr_getfeature,
-    ogr_wfs_vsimem_wfs110_one_layer_filter_gml_id_failed,
-    ogr_wfs_vsimem_wfs110_one_layer_filter_gml_id_success,
-    ogr_wfs_vsimem_wfs110_one_layer_filter,
-    ogr_wfs_vsimem_wfs110_one_layer_filter_spatial_ops,
-    ogr_wfs_vsimem_wfs110_one_layer_spatial_filter,
-    ogr_wfs_vsimem_wfs110_one_layer_spatial_filter_and_attribute_filter,
-    ogr_wfs_vsimem_wfs110_insertfeature,
-    ogr_wfs_vsimem_wfs110_updatefeature,
-    ogr_wfs_vsimem_wfs110_deletefeature,
-    ogr_wfs_vsimem_wfs110_schema_not_understood,
-    ogr_wfs_vsimem_wfs110_multiple_layers,
-    ogr_wfs_vsimem_wfs110_multiple_layers_same_name_different_ns,
-    ogr_wfs_vsimem_wfs200_paging,
-    ogr_wfs_vsimem_wfs200_json,
-    ogr_wfs_vsimem_wfs200_multipart,
-    ogr_wfs_vsimem_wfs200_join,
-    ogr_wfs_vsimem_wfs200_join_layer_with_namespace_prefix,
-    ogr_wfs_vsimem_wfs200_join_distinct,
-    ogr_wfs_vsimem_cleanup,
-]
-
-gdaltest_list = [ogr_wfs_init]
-gdaltest_list += gdaltest_vsimem_list
-gdaltest_list += [ogr_wfs_turn_streaming_off]
-gdaltest_list += gdaltest_vsimem_list
-gdaltest_list += [ogr_wfs_turn_streaming_on]
-gdaltest_list += gdaltest_live_list
-
 if __name__ == '__main__':
 
     gdaltest.setup_run('ogr_wfs')

From b195f511db1a22e3b2ac4acf4e63c704f842a710 Mon Sep 17 00:00:00 2001
From: Craig de Stigter <craig.destigter@koordinates.com>
Date: Mon, 10 Dec 2018 09:20:52 +1300
Subject: [PATCH 135/488] Automated: Rename all python tests to test_*

Pytest learns what tests are by what it's called.
This change was generated by looking at `gdaltest_list` in autotest/ modules,
and renaming all mentioned tests if they weren't already called `test_*`
---
 autotest/alg/applyverticalshiftgrid.py   |  28 +-
 autotest/alg/contour.py                  |  20 +-
 autotest/alg/cutline.py                  |  16 +-
 autotest/alg/dither.py                   |   4 +-
 autotest/alg/polygonize.py               |  22 +-
 autotest/alg/proximity.py                |  12 +-
 autotest/alg/rasterize.py                |  24 +-
 autotest/alg/reproject.py                |  16 +-
 autotest/alg/sieve.py                    |  32 +-
 autotest/alg/tps.py                      |   4 +-
 autotest/alg/transformgeoloc.py          |   4 +-
 autotest/alg/warp.py                     | 290 ++++----
 autotest/gcore/asyncreader.py            |   4 +-
 autotest/gcore/basic_test.py             |  72 +-
 autotest/gcore/bmp_read.py               |   6 +-
 autotest/gcore/bmp_write.py              |   4 +-
 autotest/gcore/colortable.py             |  16 +-
 autotest/gcore/envi_read.py              |   4 +-
 autotest/gcore/gcps2geotransform.py      |  32 +-
 autotest/gcore/gdal_api_proxy.py         |  28 +-
 autotest/gcore/gdal_stats.py             | 110 +--
 autotest/gcore/geoloc.py                 |   4 +-
 autotest/gcore/hdf4_read.py              |  40 +-
 autotest/gcore/hfa_read.py               |   4 +-
 autotest/gcore/hfa_rfc40.py              |  56 +-
 autotest/gcore/hfa_write.py              |  40 +-
 autotest/gcore/histogram.py              |  24 +-
 autotest/gcore/identify.py               |  16 +-
 autotest/gcore/mask.py                   | 124 ++--
 autotest/gcore/minixml.py                |  36 +-
 autotest/gcore/misc.py                   |  64 +-
 autotest/gcore/nodatamaskband.py         |   4 +-
 autotest/gcore/numpy_rw.py               |  76 +--
 autotest/gcore/overviewds.py             |  28 +-
 autotest/gcore/pam.py                    |  56 +-
 autotest/gcore/pixfun.py                 | 120 ++--
 autotest/gcore/rasterio.py               |  72 +-
 autotest/gcore/rat.py                    |  12 +-
 autotest/gcore/rfc30.py                  |   6 +-
 autotest/gcore/testnonboundtoswig.py     |  18 +-
 autotest/gcore/thread_test.py            |   4 +-
 autotest/gcore/tiff_ovr.py               | 240 +++----
 autotest/gcore/tiff_read.py              | 494 +++++++-------
 autotest/gcore/tiff_srs.py               |  48 +-
 autotest/gcore/tiff_write.py             | 818 +++++++++++------------
 autotest/gcore/transformer.py            |  70 +-
 autotest/gcore/virtualmem.py             |  16 +-
 autotest/gcore/vrt_read.py               | 136 ++--
 autotest/gcore/vrtmisc.py                |  88 +--
 autotest/gcore/vsiaz.py                  |  46 +-
 autotest/gcore/vsicrypt.py               |  24 +-
 autotest/gcore/vsicurl.py                |  56 +-
 autotest/gcore/vsicurl_streaming.py      |   4 +-
 autotest/gcore/vsifile.py                | 104 +--
 autotest/gcore/vsigs.py                  |  66 +-
 autotest/gcore/vsihdfs.py                |  28 +-
 autotest/gcore/vsioss.py                 |  54 +-
 autotest/gcore/vsis3.py                  |  94 +--
 autotest/gcore/vsistdin.py               |  10 +-
 autotest/gcore/vsiswift.py               |  50 +-
 autotest/gcore/vsiwebhdfs.py             |  42 +-
 autotest/gcore/vsizip.py                 |  76 +--
 autotest/gdrivers/aaigrid.py             |  68 +-
 autotest/gdrivers/ace2.py                |   4 +-
 autotest/gdrivers/adrg.py                |  32 +-
 autotest/gdrivers/aigrid.py              |  32 +-
 autotest/gdrivers/arg.py                 |  36 +-
 autotest/gdrivers/bag.py                 |  40 +-
 autotest/gdrivers/blx.py                 |  20 +-
 autotest/gdrivers/bsb.py                 |  28 +-
 autotest/gdrivers/bt.py                  |  28 +-
 autotest/gdrivers/byn.py                 |   8 +-
 autotest/gdrivers/cals.py                |  20 +-
 autotest/gdrivers/ceos.py                |   4 +-
 autotest/gdrivers/cpg.py                 |   4 +-
 autotest/gdrivers/ctg.py                 |   4 +-
 autotest/gdrivers/db2.py                 |   8 +-
 autotest/gdrivers/derived.py             |  12 +-
 autotest/gdrivers/dimap.py               |   8 +-
 autotest/gdrivers/dipex.py               |   4 +-
 autotest/gdrivers/doq1.py                |   4 +-
 autotest/gdrivers/doq2.py                |   4 +-
 autotest/gdrivers/dted.py                |  64 +-
 autotest/gdrivers/e00grid.py             |   8 +-
 autotest/gdrivers/ecrgtoc.py             |  20 +-
 autotest/gdrivers/ecw.py                 | 236 +++----
 autotest/gdrivers/eedai.py               |  36 +-
 autotest/gdrivers/ehdr.py                |  64 +-
 autotest/gdrivers/eir.py                 |   4 +-
 autotest/gdrivers/elas.py                |   8 +-
 autotest/gdrivers/envi.py                |  64 +-
 autotest/gdrivers/ers.py                 |  48 +-
 autotest/gdrivers/fast.py                |  36 +-
 autotest/gdrivers/fujibas.py             |   4 +-
 autotest/gdrivers/gdalhttp.py            |  42 +-
 autotest/gdrivers/genbin.py              |   4 +-
 autotest/gdrivers/georaster.py           |  60 +-
 autotest/gdrivers/gff.py                 |   4 +-
 autotest/gdrivers/gif.py                 |  44 +-
 autotest/gdrivers/gmt.py                 |   8 +-
 autotest/gdrivers/gpkg.py                | 238 +++----
 autotest/gdrivers/grass.py               |   8 +-
 autotest/gdrivers/grassasciigrid.py      |   4 +-
 autotest/gdrivers/grib.py                | 128 ++--
 autotest/gdrivers/gsc.py                 |   4 +-
 autotest/gdrivers/gsg.py                 |  32 +-
 autotest/gdrivers/gta.py                 |  20 +-
 autotest/gdrivers/gtx.py                 |   4 +-
 autotest/gdrivers/gxf.py                 |   6 +-
 autotest/gdrivers/hdf5.py                |  72 +-
 autotest/gdrivers/hf2.py                 |  20 +-
 autotest/gdrivers/hfa.py                 | 172 ++---
 autotest/gdrivers/ida.py                 |  28 +-
 autotest/gdrivers/idrisi.py              |  20 +-
 autotest/gdrivers/ignfheightasciigrid.py |  48 +-
 autotest/gdrivers/ilwis.py               |  24 +-
 autotest/gdrivers/ingr.py                |  76 +--
 autotest/gdrivers/iris.py                |   8 +-
 autotest/gdrivers/isce.py                |  16 +-
 autotest/gdrivers/isis.py                | 124 ++--
 autotest/gdrivers/isis2.py               |  12 +-
 autotest/gdrivers/jdem.py                |   4 +-
 autotest/gdrivers/jp2kak.py              |  84 +--
 autotest/gdrivers/jp2lura.py             | 212 +++---
 autotest/gdrivers/jp2metadata.py         |  20 +-
 autotest/gdrivers/jp2openjpeg.py         | 252 +++----
 autotest/gdrivers/jpeg.py                | 116 ++--
 autotest/gdrivers/jpeg2000.py            |  72 +-
 autotest/gdrivers/jpeg_profile.py        |  12 +-
 autotest/gdrivers/jpegls.py              |   8 +-
 autotest/gdrivers/jpipkak.py             |  20 +-
 autotest/gdrivers/kea.py                 |  60 +-
 autotest/gdrivers/kmlsuperoverlay.py     |  36 +-
 autotest/gdrivers/kro.py                 |  20 +-
 autotest/gdrivers/l1b.py                 |  28 +-
 autotest/gdrivers/lan.py                 |   8 +-
 autotest/gdrivers/lcp.py                 |  92 +--
 autotest/gdrivers/leveller.py            |   4 +-
 autotest/gdrivers/loslas.py              |   4 +-
 autotest/gdrivers/mbtiles.py             |  76 +--
 autotest/gdrivers/mem.py                 |  64 +-
 autotest/gdrivers/mff.py                 |  12 +-
 autotest/gdrivers/mff2.py                |   4 +-
 autotest/gdrivers/mg4lidar.py            |   4 +-
 autotest/gdrivers/mrf.py                 |  64 +-
 autotest/gdrivers/mrsid.py               |  64 +-
 autotest/gdrivers/ndf.py                 |   4 +-
 autotest/gdrivers/netcdf.py              | 356 +++++-----
 autotest/gdrivers/netcdf_cf.py           |  20 +-
 autotest/gdrivers/ngsgeoid.py            |   8 +-
 autotest/gdrivers/nitf.py                | 484 +++++++-------
 autotest/gdrivers/ntv1.py                |   4 +-
 autotest/gdrivers/ntv2.py                |  40 +-
 autotest/gdrivers/nwt_grc.py             |   4 +-
 autotest/gdrivers/nwt_grd.py             |   6 +-
 autotest/gdrivers/ozi.py                 |   4 +-
 autotest/gdrivers/paux.py                |  16 +-
 autotest/gdrivers/pcidsk.py              |  72 +-
 autotest/gdrivers/pcraster.py            |   8 +-
 autotest/gdrivers/pdf.py                 |   4 +-
 autotest/gdrivers/pds.py                 |  48 +-
 autotest/gdrivers/pds4.py                |  72 +-
 autotest/gdrivers/plmosaic.py            | 100 +--
 autotest/gdrivers/png.py                 |  56 +-
 autotest/gdrivers/png_profile.py         |  20 +-
 autotest/gdrivers/pnm.py                 |  16 +-
 autotest/gdrivers/postgisraster.py       |  96 +--
 autotest/gdrivers/prf.py                 |  16 +-
 autotest/gdrivers/r.py                   |  16 +-
 autotest/gdrivers/rasdaman.py            |  12 +-
 autotest/gdrivers/rasterlite.py          |  56 +-
 autotest/gdrivers/rda.py                 |  60 +-
 autotest/gdrivers/rik.py                 |   8 +-
 autotest/gdrivers/rl2.py                 | 100 +--
 autotest/gdrivers/rmf.py                 | 180 ++---
 autotest/gdrivers/roipac.py              |  24 +-
 autotest/gdrivers/rpftoc.py              |  16 +-
 autotest/gdrivers/rraster.py             |  70 +-
 autotest/gdrivers/rs2.py                 |  12 +-
 autotest/gdrivers/safe.py                |  20 +-
 autotest/gdrivers/saga.py                |  32 +-
 autotest/gdrivers/sar_ceos.py            |   4 +-
 autotest/gdrivers/sdts.py                |   4 +-
 autotest/gdrivers/sentinel2.py           | 112 ++--
 autotest/gdrivers/sgi.py                 |  12 +-
 autotest/gdrivers/sigdem.py              |  12 +-
 autotest/gdrivers/snodas.py              |   4 +-
 autotest/gdrivers/srp.py                 |  32 +-
 autotest/gdrivers/srtmhgt.py             |  20 +-
 autotest/gdrivers/terragen.py            |   8 +-
 autotest/gdrivers/tiff_profile.py        |  28 +-
 autotest/gdrivers/til.py                 |  12 +-
 autotest/gdrivers/usgsdem.py             |  48 +-
 autotest/gdrivers/vicar.py               |   4 +-
 autotest/gdrivers/vrtderived.py          |  64 +-
 autotest/gdrivers/vrtfilt.py             |  28 +-
 autotest/gdrivers/vrtlut.py              |   8 +-
 autotest/gdrivers/vrtmask.py             |  48 +-
 autotest/gdrivers/vrtovr.py              |  20 +-
 autotest/gdrivers/vrtpansharpen.py       |  48 +-
 autotest/gdrivers/vrtrawlink.py          |  44 +-
 autotest/gdrivers/vrtwarp.py             |  48 +-
 autotest/gdrivers/wcs.py                 |  20 +-
 autotest/gdrivers/webp.py                |  20 +-
 autotest/gdrivers/wms.py                 |  56 +-
 autotest/gdrivers/wmts.py                | 124 ++--
 autotest/gdrivers/xpm.py                 |   4 +-
 autotest/gdrivers/xyz.py                 |  36 +-
 autotest/gdrivers/zmap.py                |   4 +-
 autotest/gnm/gnm_test.py                 |  32 +-
 autotest/ogr/ogr_arcgen.py               |  24 +-
 autotest/ogr/ogr_avc.py                  |  20 +-
 autotest/ogr/ogr_basic_test.py           |  76 +--
 autotest/ogr/ogr_bna.py                  |  28 +-
 autotest/ogr/ogr_cad.py                  |  40 +-
 autotest/ogr/ogr_carto.py                |  16 +-
 autotest/ogr/ogr_cloudant.py             |  24 +-
 autotest/ogr/ogr_couchdb.py              |  16 +-
 autotest/ogr/ogr_csv.py                  | 222 +++---
 autotest/ogr/ogr_csw.py                  |  48 +-
 autotest/ogr/ogr_db2.py                  |  32 +-
 autotest/ogr/ogr_db2_hack.py             |  12 +-
 autotest/ogr/ogr_dgn.py                  |  40 +-
 autotest/ogr/ogr_dgnv8.py                |  24 +-
 autotest/ogr/ogr_dxf.py                  | 224 +++----
 autotest/ogr/ogr_edigeo.py               |   4 +-
 autotest/ogr/ogr_eeda.py                 |  20 +-
 autotest/ogr/ogr_elasticsearch.py        |  60 +-
 autotest/ogr/ogr_factory.py              |  32 +-
 autotest/ogr/ogr_feature.py              |  84 +--
 autotest/ogr/ogr_fgdb.py                 | 128 ++--
 autotest/ogr/ogr_geoconcept.py           |  32 +-
 autotest/ogr/ogr_geojson.py              | 312 ++++-----
 autotest/ogr/ogr_geojsonseq.py           |  36 +-
 autotest/ogr/ogr_geom.py                 | 276 ++++----
 autotest/ogr/ogr_georss.py               |  80 +--
 autotest/ogr/ogr_geos.py                 | 128 ++--
 autotest/ogr/ogr_gft.py                  |  20 +-
 autotest/ogr/ogr_gml_fgd_read.py         |   8 +-
 autotest/ogr/ogr_gml_geom.py             | 236 +++----
 autotest/ogr/ogr_gml_read.py             | 368 +++++-----
 autotest/ogr/ogr_gmlas.py                | 232 +++----
 autotest/ogr/ogr_gmt.py                  |  24 +-
 autotest/ogr/ogr_gpkg.py                 | 258 +++----
 autotest/ogr/ogr_gpsbabel.py             |  16 +-
 autotest/ogr/ogr_gpx.py                  |  50 +-
 autotest/ogr/ogr_grass.py                |   8 +-
 autotest/ogr/ogr_gtm.py                  |  24 +-
 autotest/ogr/ogr_htf.py                  |   8 +-
 autotest/ogr/ogr_idrisi.py               |  12 +-
 autotest/ogr/ogr_ili.py                  |  84 +--
 autotest/ogr/ogr_index_test.py           |  48 +-
 autotest/ogr/ogr_ingres.py               |  36 +-
 autotest/ogr/ogr_jml.py                  |  28 +-
 autotest/ogr/ogr_join_test.py            |  96 +--
 autotest/ogr/ogr_kml.py                  | 112 ++--
 autotest/ogr/ogr_layer_algebra.py        |  40 +-
 autotest/ogr/ogr_libkml.py               | 224 +++----
 autotest/ogr/ogr_mem.py                  |  72 +-
 autotest/ogr/ogr_mitab.py                | 218 +++---
 autotest/ogr/ogr_mongodb.py              |  20 +-
 autotest/ogr/ogr_mssqlspatial.py         |  28 +-
 autotest/ogr/ogr_mvt.py                  | 160 ++---
 autotest/ogr/ogr_mysql.py                |  96 +--
 autotest/ogr/ogr_nas.py                  |  20 +-
 autotest/ogr/ogr_ntf.py                  |   8 +-
 autotest/ogr/ogr_oci.py                  |  88 +--
 autotest/ogr/ogr_odbc.py                 |  12 +-
 autotest/ogr/ogr_ods.py                  |  44 +-
 autotest/ogr/ogr_ogdi.py                 |  24 +-
 autotest/ogr/ogr_openair.py              |   4 +-
 autotest/ogr/ogr_openfilegdb.py          | 116 ++--
 autotest/ogr/ogr_osm.py                  | 108 +--
 autotest/ogr/ogr_pcidsk.py               |  40 +-
 autotest/ogr/ogr_pdf.py                  |  42 +-
 autotest/ogr/ogr_pds.py                  |   8 +-
 autotest/ogr/ogr_pg.py                   | 370 +++++-----
 autotest/ogr/ogr_pgdump.py               |  70 +-
 autotest/ogr/ogr_pgeo.py                 |   4 +-
 autotest/ogr/ogr_plscenes.py             |  24 +-
 autotest/ogr/ogr_rec.py                  |   4 +-
 autotest/ogr/ogr_refcount.py             |  20 +-
 autotest/ogr/ogr_rfc30.py                |   6 +-
 autotest/ogr/ogr_rfc35_mem.py            |  24 +-
 autotest/ogr/ogr_rfc35_mitab.py          |  24 +-
 autotest/ogr/ogr_rfc35_shape.py          |  24 +-
 autotest/ogr/ogr_rfc35_sqlite.py         |  24 +-
 autotest/ogr/ogr_rfc41.py                |  32 +-
 autotest/ogr/ogr_s57.py                  |  74 +-
 autotest/ogr/ogr_sde.py                  |  38 +-
 autotest/ogr/ogr_sdts.py                 |   4 +-
 autotest/ogr/ogr_segukooa.py             |  16 +-
 autotest/ogr/ogr_segy.py                 |   8 +-
 autotest/ogr/ogr_selafin.py              |  22 +-
 autotest/ogr/ogr_shape.py                | 452 ++++++-------
 autotest/ogr/ogr_shape_qix.py            |  16 +-
 autotest/ogr/ogr_shape_sbn.py            |   8 +-
 autotest/ogr/ogr_sosi.py                 |   4 +-
 autotest/ogr/ogr_sql_rfc28.py            | 216 +++---
 autotest/ogr/ogr_sql_sqlite.py           | 150 ++---
 autotest/ogr/ogr_sql_test.py             | 200 +++---
 autotest/ogr/ogr_sqlite.py               | 256 +++----
 autotest/ogr/ogr_style.py                |   4 +-
 autotest/ogr/ogr_sua.py                  |   4 +-
 autotest/ogr/ogr_svg.py                  |  12 +-
 autotest/ogr/ogr_sxf.py                  |  12 +-
 autotest/ogr/ogr_tiger.py                |  20 +-
 autotest/ogr/ogr_vdv.py                  |  58 +-
 autotest/ogr/ogr_vfk.py                  |  48 +-
 autotest/ogr/ogr_virtualogr.py           |  20 +-
 autotest/ogr/ogr_vrt.py                  | 176 ++---
 autotest/ogr/ogr_wasp.py                 |  56 +-
 autotest/ogr/ogr_wfs3.py                 |  36 +-
 autotest/ogr/ogr_wkbwkt_geom.py          |  44 +-
 autotest/ogr/ogr_wktempty.py             |   4 +-
 autotest/ogr/ogr_xls.py                  |  16 +-
 autotest/ogr/ogr_xlsx.py                 |  64 +-
 autotest/ogr/ogr_xplane.py               |  20 +-
 autotest/ogr/ograpispy.py                |  12 +-
 autotest/osr/osr_basic.py                | 104 +--
 autotest/osr/osr_compd.py                |  32 +-
 autotest/osr/osr_ct.py                   |  36 +-
 autotest/osr/osr_epsg.py                 |  60 +-
 autotest/osr/osr_erm.py                  |   8 +-
 autotest/osr/osr_esri.py                 | 132 ++--
 autotest/osr/osr_getprojectionmethods.py |   4 +-
 autotest/osr/osr_micoordsys.py           |  12 +-
 autotest/osr/osr_ozi.py                  |  12 +-
 autotest/osr/osr_pci.py                  |  28 +-
 autotest/osr/osr_pm.py                   |  12 +-
 autotest/osr/osr_proj4.py                | 122 ++--
 autotest/osr/osr_url.py                  |   8 +-
 autotest/osr/osr_usgs.py                 |   8 +-
 autotest/osr/osr_validate.py             |  24 +-
 autotest/osr/osr_xml.py                  |   8 +-
 335 files changed, 9495 insertions(+), 9495 deletions(-)

diff --git a/autotest/alg/applyverticalshiftgrid.py b/autotest/alg/applyverticalshiftgrid.py
index 8aa3b39b0b07..82c459452881 100755
--- a/autotest/alg/applyverticalshiftgrid.py
+++ b/autotest/alg/applyverticalshiftgrid.py
@@ -39,7 +39,7 @@
 # Rather dummy test: grid = DEM
 
 
-def applyverticalshiftgrid_1():
+def test_applyverticalshiftgrid_1():
 
     src_ds = gdal.Open('../gcore/data/byte.tif')
     src_ds = gdal.Translate('', src_ds, format='MEM',
@@ -108,7 +108,7 @@ def applyverticalshiftgrid_1():
 # Error cases
 
 
-def applyverticalshiftgrid_2():
+def test_applyverticalshiftgrid_2():
 
     sr = osr.SpatialReference()
     sr.SetFromUserInput("WGS84")
@@ -209,7 +209,7 @@ def applyverticalshiftgrid_2():
 # Test with grid and src not in same projection
 
 
-def applyverticalshiftgrid_3():
+def test_applyverticalshiftgrid_3():
 
     src_ds = gdal.Open('../gcore/data/byte.tif')
     grid_ds = gdal.Warp('', src_ds, format='MEM', dstSRS='EPSG:4326',
@@ -260,7 +260,7 @@ def applyverticalshiftgrid_3():
 # Test nodata
 
 
-def applyverticalshiftgrid_4():
+def test_applyverticalshiftgrid_4():
 
     sr = osr.SpatialReference()
     sr.SetFromUserInput("WGS84")
@@ -346,7 +346,7 @@ def applyverticalshiftgrid_4():
 # Test scaling parameters
 
 
-def applyverticalshiftgrid_5():
+def test_applyverticalshiftgrid_5():
 
     src_ds = gdal.Open('../gcore/data/byte.tif')
     grid_ds = gdal.Translate('', src_ds, format='MEM')
@@ -380,7 +380,7 @@ def applyverticalshiftgrid_5():
 # Simulate EGM grids
 
 
-def applyverticalshiftgrid_6():
+def test_applyverticalshiftgrid_6():
 
     grid_ds = gdal.GetDriverByName('GTX').Create(
         '/vsimem/applyverticalshiftgrid_6.gtx', 1440, 721, 1, gdal.GDT_Float32)
@@ -404,7 +404,7 @@ def applyverticalshiftgrid_6():
 # Simulate USA geoid grids with long origin > 180
 
 
-def applyverticalshiftgrid_7():
+def test_applyverticalshiftgrid_7():
 
     grid_ds = gdal.GetDriverByName('GTX').Create(
         '/vsimem/applyverticalshiftgrid_7.gtx', 700, 721, 1, gdal.GDT_Float32)
@@ -426,13 +426,13 @@ def applyverticalshiftgrid_7():
 
 
 gdaltest_list = [
-    applyverticalshiftgrid_1,
-    applyverticalshiftgrid_2,
-    applyverticalshiftgrid_3,
-    applyverticalshiftgrid_4,
-    applyverticalshiftgrid_5,
-    applyverticalshiftgrid_6,
-    applyverticalshiftgrid_7
+    test_applyverticalshiftgrid_1,
+    test_applyverticalshiftgrid_2,
+    test_applyverticalshiftgrid_3,
+    test_applyverticalshiftgrid_4,
+    test_applyverticalshiftgrid_5,
+    test_applyverticalshiftgrid_6,
+    test_applyverticalshiftgrid_7
 ]
 
 if __name__ == '__main__':
diff --git a/autotest/alg/contour.py b/autotest/alg/contour.py
index 3a7f8ce958e1..fa8664e58298 100755
--- a/autotest/alg/contour.py
+++ b/autotest/alg/contour.py
@@ -42,7 +42,7 @@
 # Test with -a and -i options
 
 
-def contour_1():
+def test_contour_1():
 
     try:
         os.remove('tmp/contour.shp')
@@ -132,7 +132,7 @@ def contour_1():
 # Test with -fl option and -3d option
 
 
-def contour_2():
+def test_contour_2():
 
     try:
         os.remove('tmp/contour.shp')
@@ -201,7 +201,7 @@ def contour_2():
 #
 
 
-def contour_real_world_case():
+def test_contour_real_world_case():
 
     ogr_ds = ogr.GetDriverByName('Memory').CreateDataSource('')
     ogr_lyr = ogr_ds.CreateLayer('contour', geom_type=ogr.wkbLineString)
@@ -225,7 +225,7 @@ def contour_real_world_case():
 
 # Test with -p option (polygonize)
 
-def contour_3():
+def test_contour_3():
 
     try:
         os.remove('tmp/contour.shp')
@@ -303,7 +303,7 @@ def contour_3():
 # Cleanup
 
 
-def contour_cleanup():
+def test_contour_cleanup():
     ogr.GetDriverByName('ESRI Shapefile').DeleteDataSource('tmp/contour.shp')
     try:
         os.remove('tmp/gdal_contour.tif')
@@ -314,11 +314,11 @@ def contour_cleanup():
 
 
 gdaltest_list = [
-    contour_1,
-    contour_2,
-    contour_real_world_case,
-    contour_3,
-    contour_cleanup
+    test_contour_1,
+    test_contour_2,
+    test_contour_real_world_case,
+    test_contour_3,
+    test_contour_cleanup
 ]
 
 
diff --git a/autotest/alg/cutline.py b/autotest/alg/cutline.py
index 5fb297351126..ca0e60ae5054 100755
--- a/autotest/alg/cutline.py
+++ b/autotest/alg/cutline.py
@@ -40,7 +40,7 @@
 ###############################################################################
 
 
-def cutline_1():
+def test_cutline_1():
 
     tst = gdaltest.GDALTest('VRT', 'cutline_noblend.vrt', 1, 11409)
     return tst.testOpen()
@@ -48,7 +48,7 @@ def cutline_1():
 ###############################################################################
 
 
-def cutline_2():
+def test_cutline_2():
 
     if not ogrtest.have_geos():
         return 'skip'
@@ -59,7 +59,7 @@ def cutline_2():
 ###############################################################################
 
 
-def cutline_3():
+def test_cutline_3():
 
     if not ogrtest.have_geos():
         return 'skip'
@@ -70,7 +70,7 @@ def cutline_3():
 ###############################################################################
 
 
-def cutline_4():
+def test_cutline_4():
 
     if not ogrtest.have_geos():
         return 'skip'
@@ -124,10 +124,10 @@ def cutline_4():
 
 
 gdaltest_list = [
-    cutline_1,
-    cutline_2,
-    cutline_3,
-    cutline_4
+    test_cutline_1,
+    test_cutline_2,
+    test_cutline_3,
+    test_cutline_4
 ]
 
 if __name__ == '__main__':
diff --git a/autotest/alg/dither.py b/autotest/alg/dither.py
index 372f8df50018..79e4b824c230 100755
--- a/autotest/alg/dither.py
+++ b/autotest/alg/dither.py
@@ -40,7 +40,7 @@
 # Test
 
 
-def dither_1():
+def test_dither_1():
 
     drv = gdal.GetDriverByName('GTiff')
 
@@ -100,7 +100,7 @@ def dither_1():
 
 
 gdaltest_list = [
-    dither_1
+    test_dither_1
 ]
 
 
diff --git a/autotest/alg/polygonize.py b/autotest/alg/polygonize.py
index 29fda58e8302..f8375d255cce 100755
--- a/autotest/alg/polygonize.py
+++ b/autotest/alg/polygonize.py
@@ -41,7 +41,7 @@
 # Test a fairly simple case, with nodata masking.
 
 
-def polygonize_1(is_int_polygonize=True):
+def test_polygonize_1(is_int_polygonize=True):
 
     src_ds = gdal.Open('data/polygonize_in.grd')
     src_band = src_ds.GetRasterBand(1)
@@ -87,14 +87,14 @@ def polygonize_1(is_int_polygonize=True):
     return 'success' if tr else 'fail'
 
 
-def polygonize_1_float():
-    return polygonize_1(is_int_polygonize=False)
+def test_polygonize_1_float():
+    return test_polygonize_1(is_int_polygonize=False)
 
 ###############################################################################
 # Test a simple case without masking.
 
 
-def polygonize_2():
+def test_polygonize_2():
 
     src_ds = gdal.Open('data/polygonize_in.grd')
     src_band = src_ds.GetRasterBand(1)
@@ -132,7 +132,7 @@ def polygonize_2():
 # A more involved case with a complex looping.
 
 
-def polygonize_3():
+def test_polygonize_3():
 
     src_ds = gdal.Open('data/polygonize_in_2.grd')
     src_band = src_ds.GetRasterBand(1)
@@ -175,7 +175,7 @@ def polygonize_3():
 # Test a simple case without masking but with 8-connectedness.
 
 
-def polygonize_4():
+def test_polygonize_4():
 
     src_ds = gdal.Open('data/polygonize_in.grd')
     src_band = src_ds.GetRasterBand(1)
@@ -211,11 +211,11 @@ def polygonize_4():
 
 
 gdaltest_list = [
-    polygonize_1,
-    polygonize_1_float,
-    polygonize_2,
-    polygonize_3,
-    polygonize_4
+    test_polygonize_1,
+    test_polygonize_1_float,
+    test_polygonize_2,
+    test_polygonize_3,
+    test_polygonize_4
 ]
 
 if __name__ == '__main__':
diff --git a/autotest/alg/proximity.py b/autotest/alg/proximity.py
index d92f06acf975..bfc3dbdb232d 100755
--- a/autotest/alg/proximity.py
+++ b/autotest/alg/proximity.py
@@ -39,7 +39,7 @@
 # Test a fairly default case.
 
 
-def proximity_1():
+def test_proximity_1():
 
     drv = gdal.GetDriverByName('GTiff')
     src_ds = gdal.Open('data/pat.tif')
@@ -70,7 +70,7 @@ def proximity_1():
 # Try several options
 
 
-def proximity_2():
+def test_proximity_2():
 
     drv = gdal.GetDriverByName('GTiff')
     src_ds = gdal.Open('data/pat.tif')
@@ -105,7 +105,7 @@ def proximity_2():
 # Try input nodata option
 
 
-def proximity_3():
+def test_proximity_3():
 
     drv = gdal.GetDriverByName('GTiff')
     src_ds = gdal.Open('data/pat.tif')
@@ -138,9 +138,9 @@ def proximity_3():
 
 
 gdaltest_list = [
-    proximity_1,
-    proximity_2,
-    proximity_3
+    test_proximity_1,
+    test_proximity_2,
+    test_proximity_3
 ]
 
 if __name__ == '__main__':
diff --git a/autotest/alg/rasterize.py b/autotest/alg/rasterize.py
index b0c2fb1bf54e..2815e40f8927 100755
--- a/autotest/alg/rasterize.py
+++ b/autotest/alg/rasterize.py
@@ -41,7 +41,7 @@
 # Simple polygon rasterization.
 
 
-def rasterize_1():
+def test_rasterize_1():
 
     # Setup working spatial reference
     sr_wkt = 'LOCAL_CS["arbitrary"]'
@@ -105,7 +105,7 @@ def rasterize_1():
 # Test rasterization with ALL_TOUCHED.
 
 
-def rasterize_2():
+def test_rasterize_2():
 
     # Setup working spatial reference
     sr_wkt = 'LOCAL_CS["arbitrary"]'
@@ -151,7 +151,7 @@ def rasterize_2():
 # Rasterization with BURN_VALUE_FROM.
 
 
-def rasterize_3():
+def test_rasterize_3():
 
     # Setup working spatial reference
     sr_wkt = 'LOCAL_CS["arbitrary"]'
@@ -207,7 +207,7 @@ def rasterize_3():
 # Rasterization with ATTRIBUTE.
 
 
-def rasterize_4():
+def test_rasterize_4():
 
     # Setup working spatial reference
     sr_wkt = 'LOCAL_CS["arbitrary"]'
@@ -266,7 +266,7 @@ def rasterize_4():
 # Rasterization with MERGE_ALG=ADD.
 
 
-def rasterize_5():
+def test_rasterize_5():
 
     # Setup working spatial reference
     sr_wkt = 'LOCAL_CS["arbitrary"]'
@@ -337,7 +337,7 @@ def rasterize_5():
 ###############################################################################
 # Test bug fix for #5580 (used to hang)
 
-def rasterize_6():
+def test_rasterize_6():
 
     # Setup working spatial reference
     sr_wkt = 'LOCAL_CS["arbitrary"]'
@@ -361,12 +361,12 @@ def rasterize_6():
 
 
 gdaltest_list = [
-    rasterize_1,
-    rasterize_2,
-    rasterize_3,
-    rasterize_4,
-    rasterize_5,
-    rasterize_6
+    test_rasterize_1,
+    test_rasterize_2,
+    test_rasterize_3,
+    test_rasterize_4,
+    test_rasterize_5,
+    test_rasterize_6
 ]
 
 if __name__ == '__main__':
diff --git a/autotest/alg/reproject.py b/autotest/alg/reproject.py
index 4cc7ca0473ee..c01495cf058a 100755
--- a/autotest/alg/reproject.py
+++ b/autotest/alg/reproject.py
@@ -41,7 +41,7 @@
 # Test a trivial case.
 
 
-def reproject_1():
+def test_reproject_1():
 
     drv = gdal.GetDriverByName('GTiff')
     src_ds = gdal.Open('../gcore/data/byte.tif')
@@ -69,7 +69,7 @@ def reproject_1():
 # Test a real reprojection case.
 
 
-def reproject_2():
+def test_reproject_2():
 
     sr = osr.SpatialReference()
     sr.ImportFromEPSG(32611)
@@ -102,7 +102,7 @@ def reproject_2():
 # Test nodata values
 
 
-def reproject_3():
+def test_reproject_3():
 
     data = '\x02\x7f\x7f\x02\x02\x7f\x7f\x02\x02\x7f\x7f\x02'
     src_ds = gdal.GetDriverByName('MEM').Create('', 4, 3)
@@ -130,7 +130,7 @@ def reproject_3():
 # Test warp options
 
 
-def reproject_4():
+def test_reproject_4():
 
     data = '\x02\x7f\x7f\x02\x02\x7f\x7f\x02\x02\x7f\x7f\x02'
     src_ds = gdal.GetDriverByName('MEM').Create('', 4, 3)
@@ -155,10 +155,10 @@ def reproject_4():
 
 
 gdaltest_list = [
-    reproject_1,
-    reproject_2,
-    reproject_3,
-    reproject_4
+    test_reproject_1,
+    test_reproject_2,
+    test_reproject_3,
+    test_reproject_4
 ]
 
 if __name__ == '__main__':
diff --git a/autotest/alg/sieve.py b/autotest/alg/sieve.py
index 889c54d39444..e007c9227b4f 100755
--- a/autotest/alg/sieve.py
+++ b/autotest/alg/sieve.py
@@ -40,7 +40,7 @@
 # Test a fairly default case.
 
 
-def sieve_1():
+def test_sieve_1():
 
     drv = gdal.GetDriverByName('GTiff')
     src_ds = gdal.Open('data/sieve_src.grd')
@@ -71,7 +71,7 @@ def sieve_1():
 # Try eight connected.
 
 
-def sieve_2():
+def test_sieve_2():
 
     drv = gdal.GetDriverByName('GTiff')
     src_ds = gdal.Open('data/sieve_src.grd')
@@ -102,7 +102,7 @@ def sieve_2():
 # Do a sieve resulting in unmergable polygons.
 
 
-def sieve_3():
+def test_sieve_3():
 
     drv = gdal.GetDriverByName('GTiff')
     src_ds = gdal.Open('data/unmergable.grd')
@@ -134,7 +134,7 @@ def sieve_3():
 # Try the bug 2634 simplified data.
 
 
-def sieve_4():
+def test_sieve_4():
 
     drv = gdal.GetDriverByName('GTiff')
     src_ds = gdal.Open('data/sieve_2634.grd')
@@ -166,7 +166,7 @@ def sieve_4():
 # Same as sieve_1, but we provide a mask band
 # This should yield the same result as we use an opaque band
 
-def sieve_5():
+def test_sieve_5():
 
     drv = gdal.GetDriverByName('GTiff')
     src_ds = gdal.Open('data/sieve_src.grd')
@@ -198,7 +198,7 @@ def sieve_5():
 # should stay roughly linear with the number of pixels (i.e. size^2)
 
 
-def sieve_6():
+def test_sieve_6():
 
     try:
         import numpy
@@ -237,7 +237,7 @@ def sieve_6():
 # Test with nodata
 
 
-def sieve_7():
+def test_sieve_7():
 
     gdal.FileFromMemBuffer('/vsimem/sieve_7.asc', """ncols        7
 nrows        7
@@ -294,7 +294,7 @@ def sieve_7():
 # Test propagation in our search of biggest neighbour
 
 
-def sieve_8():
+def test_sieve_8():
 
     gdal.FileFromMemBuffer('/vsimem/sieve_8.asc',
                            """ncols        7
@@ -341,14 +341,14 @@ def sieve_8():
 
 
 gdaltest_list = [
-    sieve_1,
-    sieve_2,
-    sieve_3,
-    sieve_4,
-    sieve_5,
-    sieve_6,
-    sieve_7,
-    sieve_8
+    test_sieve_1,
+    test_sieve_2,
+    test_sieve_3,
+    test_sieve_4,
+    test_sieve_5,
+    test_sieve_6,
+    test_sieve_7,
+    test_sieve_8
 ]
 
 if __name__ == '__main__':
diff --git a/autotest/alg/tps.py b/autotest/alg/tps.py
index 5875c11b7921..c55e0b1b99eb 100755
--- a/autotest/alg/tps.py
+++ b/autotest/alg/tps.py
@@ -39,7 +39,7 @@
 # Test error case (#5586)
 
 
-def tps_1():
+def test_tps_1():
 
     drv = gdal.GetDriverByName('MEM')
     ds = drv.Create('foo', 2, 2)
@@ -64,7 +64,7 @@ def tps_1():
 
 
 gdaltest_list = [
-    tps_1,
+    test_tps_1,
 ]
 
 if __name__ == '__main__':
diff --git a/autotest/alg/transformgeoloc.py b/autotest/alg/transformgeoloc.py
index d1dc9836dfc3..0dac4d2af1c3 100755
--- a/autotest/alg/transformgeoloc.py
+++ b/autotest/alg/transformgeoloc.py
@@ -41,7 +41,7 @@
 # Test a fairly default case.
 
 
-def transformgeoloc_1():
+def test_transformgeoloc_1():
 
     try:
         import numpy
@@ -85,7 +85,7 @@ def transformgeoloc_1():
 
 
 gdaltest_list = [
-    transformgeoloc_1,
+    test_transformgeoloc_1,
 ]
 
 if __name__ == '__main__':
diff --git a/autotest/alg/warp.py b/autotest/alg/warp.py
index db2eedae5358..8100815ff267 100755
--- a/autotest/alg/warp.py
+++ b/autotest/alg/warp.py
@@ -49,7 +49,7 @@
 # Upsampling
 
 
-def warp_1():
+def test_warp_1():
 
     gdaltest.tiff_drv = gdal.GetDriverByName('GTiff')
     if gdaltest.tiff_drv is None:
@@ -68,7 +68,7 @@ def warp_1():
     return 'success'
 
 
-def warp_1_short():
+def test_warp_1_short():
 
     gdaltest.tiff_drv = gdal.GetDriverByName('GTiff')
     if gdaltest.tiff_drv is None:
@@ -87,7 +87,7 @@ def warp_1_short():
     return 'success'
 
 
-def warp_1_ushort():
+def test_warp_1_ushort():
 
     gdaltest.tiff_drv = gdal.GetDriverByName('GTiff')
     if gdaltest.tiff_drv is None:
@@ -106,7 +106,7 @@ def warp_1_ushort():
     return 'success'
 
 
-def warp_1_float():
+def test_warp_1_float():
 
     gdaltest.tiff_drv = gdal.GetDriverByName('GTiff')
     if gdaltest.tiff_drv is None:
@@ -125,7 +125,7 @@ def warp_1_float():
     return 'success'
 
 
-def warp_2():
+def test_warp_2():
 
     gdaltest.tiff_drv = gdal.GetDriverByName('GTiff')
     if gdaltest.tiff_drv is None:
@@ -144,7 +144,7 @@ def warp_2():
     return 'success'
 
 
-def warp_2_short():
+def test_warp_2_short():
 
     gdaltest.tiff_drv = gdal.GetDriverByName('GTiff')
     if gdaltest.tiff_drv is None:
@@ -163,7 +163,7 @@ def warp_2_short():
     return 'success'
 
 
-def warp_2_ushort():
+def test_warp_2_ushort():
 
     gdaltest.tiff_drv = gdal.GetDriverByName('GTiff')
     if gdaltest.tiff_drv is None:
@@ -182,7 +182,7 @@ def warp_2_ushort():
     return 'success'
 
 
-def warp_2_downsize():
+def test_warp_2_downsize():
 
     gdaltest.tiff_drv = gdal.GetDriverByName('GTiff')
     if gdaltest.tiff_drv is None:
@@ -201,7 +201,7 @@ def warp_2_downsize():
     return 'success'
 
 
-def warp_3():
+def test_warp_3():
 
     gdaltest.tiff_drv = gdal.GetDriverByName('GTiff')
     if gdaltest.tiff_drv is None:
@@ -220,7 +220,7 @@ def warp_3():
     return 'success'
 
 
-def warp_3_short():
+def test_warp_3_short():
 
     gdaltest.tiff_drv = gdal.GetDriverByName('GTiff')
     if gdaltest.tiff_drv is None:
@@ -239,7 +239,7 @@ def warp_3_short():
     return 'success'
 
 
-def warp_3_ushort():
+def test_warp_3_ushort():
 
     gdaltest.tiff_drv = gdal.GetDriverByName('GTiff')
     if gdaltest.tiff_drv is None:
@@ -258,7 +258,7 @@ def warp_3_ushort():
     return 'success'
 
 
-def warp_3_downsize():
+def test_warp_3_downsize():
 
     gdaltest.tiff_drv = gdal.GetDriverByName('GTiff')
     if gdaltest.tiff_drv is None:
@@ -277,7 +277,7 @@ def warp_3_downsize():
     return 'success'
 
 
-def warp_3_float_downsize():
+def test_warp_3_float_downsize():
 
     gdaltest.tiff_drv = gdal.GetDriverByName('GTiff')
     if gdaltest.tiff_drv is None:
@@ -296,7 +296,7 @@ def warp_3_float_downsize():
     return 'success'
 
 
-def warp_4():
+def test_warp_4():
 
     gdaltest.tiff_drv = gdal.GetDriverByName('GTiff')
     if gdaltest.tiff_drv is None:
@@ -315,7 +315,7 @@ def warp_4():
     return 'success'
 
 
-def warp_4_short():
+def test_warp_4_short():
 
     gdaltest.tiff_drv = gdal.GetDriverByName('GTiff')
     if gdaltest.tiff_drv is None:
@@ -334,7 +334,7 @@ def warp_4_short():
     return 'success'
 
 
-def warp_4_ushort():
+def test_warp_4_ushort():
 
     gdaltest.tiff_drv = gdal.GetDriverByName('GTiff')
     if gdaltest.tiff_drv is None:
@@ -353,7 +353,7 @@ def warp_4_ushort():
     return 'success'
 
 
-def warp_4_downsize():
+def test_warp_4_downsize():
 
     gdaltest.tiff_drv = gdal.GetDriverByName('GTiff')
     if gdaltest.tiff_drv is None:
@@ -372,7 +372,7 @@ def warp_4_downsize():
     return 'success'
 
 
-def warp_4_short_downsize():
+def test_warp_4_short_downsize():
 
     gdaltest.tiff_drv = gdal.GetDriverByName('GTiff')
     if gdaltest.tiff_drv is None:
@@ -391,7 +391,7 @@ def warp_4_short_downsize():
     return 'success'
 
 
-def warp_4_float_downsize():
+def test_warp_4_float_downsize():
 
     gdaltest.tiff_drv = gdal.GetDriverByName('GTiff')
     if gdaltest.tiff_drv is None:
@@ -410,7 +410,7 @@ def warp_4_float_downsize():
     return 'success'
 
 
-def warp_5():
+def test_warp_5():
 
     gdaltest.tiff_drv = gdal.GetDriverByName('GTiff')
     if gdaltest.tiff_drv is None:
@@ -429,7 +429,7 @@ def warp_5():
     return 'success'
 
 
-def warp_5_downsize():
+def test_warp_5_downsize():
 
     gdaltest.tiff_drv = gdal.GetDriverByName('GTiff')
     if gdaltest.tiff_drv is None:
@@ -450,7 +450,7 @@ def warp_5_downsize():
 # Downsampling
 
 
-def warp_6():
+def test_warp_6():
 
     gdaltest.tiff_drv = gdal.GetDriverByName('GTiff')
     if gdaltest.tiff_drv is None:
@@ -461,7 +461,7 @@ def warp_6():
     return tst.testOpen()
 
 
-def warp_7():
+def test_warp_7():
 
     gdaltest.tiff_drv = gdal.GetDriverByName('GTiff')
     if gdaltest.tiff_drv is None:
@@ -472,7 +472,7 @@ def warp_7():
     return tst.testOpen()
 
 
-def warp_8():
+def test_warp_8():
 
     gdaltest.tiff_drv = gdal.GetDriverByName('GTiff')
     if gdaltest.tiff_drv is None:
@@ -483,7 +483,7 @@ def warp_8():
     return tst.testOpen()
 
 
-def warp_9():
+def test_warp_9():
 
     gdaltest.tiff_drv = gdal.GetDriverByName('GTiff')
     if gdaltest.tiff_drv is None:
@@ -502,7 +502,7 @@ def warp_9():
     return 'success'
 
 
-def warp_10():
+def test_warp_10():
 
     gdaltest.tiff_drv = gdal.GetDriverByName('GTiff')
     if gdaltest.tiff_drv is None:
@@ -521,7 +521,7 @@ def warp_10():
     return 'success'
 
 
-def warp_11():
+def test_warp_11():
 
     gdaltest.tiff_drv = gdal.GetDriverByName('GTiff')
     if gdaltest.tiff_drv is None:
@@ -534,7 +534,7 @@ def warp_11():
 # Test warping an empty RGBA with bilinear resampling
 
 
-def warp_12():
+def test_warp_12():
 
     gdaltest.tiff_drv = gdal.GetDriverByName('GTiff')
     if gdaltest.tiff_drv is None:
@@ -559,7 +559,7 @@ def warp_12():
 # Test warping an empty RGBA with cubic resampling
 
 
-def warp_13():
+def test_warp_13():
 
     gdaltest.tiff_drv = gdal.GetDriverByName('GTiff')
     if gdaltest.tiff_drv is None:
@@ -584,7 +584,7 @@ def warp_13():
 # Test warping an empty RGBA with cubic spline resampling
 
 
-def warp_14():
+def test_warp_14():
 
     gdaltest.tiff_drv = gdal.GetDriverByName('GTiff')
     if gdaltest.tiff_drv is None:
@@ -609,7 +609,7 @@ def warp_14():
 # Test GWKNearestFloat with transparent source alpha band
 
 
-def warp_15():
+def test_warp_15():
 
     gdaltest.tiff_drv = gdal.GetDriverByName('GTiff')
     if gdaltest.tiff_drv is None:
@@ -634,7 +634,7 @@ def warp_15():
 # Test GWKNearestFloat with opaque source alpha band
 
 
-def warp_16():
+def test_warp_16():
 
     gdaltest.tiff_drv = gdal.GetDriverByName('GTiff')
     if gdaltest.tiff_drv is None:
@@ -659,7 +659,7 @@ def warp_16():
 # Test GWKNearestShort with transparent source alpha band
 
 
-def warp_17():
+def test_warp_17():
 
     gdaltest.tiff_drv = gdal.GetDriverByName('GTiff')
     if gdaltest.tiff_drv is None:
@@ -684,7 +684,7 @@ def warp_17():
 # Test GWKNearestShort with opaque source alpha band
 
 
-def warp_18():
+def test_warp_18():
 
     gdaltest.tiff_drv = gdal.GetDriverByName('GTiff')
     if gdaltest.tiff_drv is None:
@@ -738,7 +738,7 @@ def warp_19_internal(size, datatype, resampling_string):
 
 # Test all data types and resampling methods for very small images
 # to test edge behaviour
-def warp_19():
+def test_warp_19():
 
     gdaltest.tiff_drv = gdal.GetDriverByName('GTiff')
     if gdaltest.tiff_drv is None:
@@ -772,7 +772,7 @@ def warp_19():
 
 
 # Test fix for #2724 (initialization of destination area to nodata in warped VRT)
-def warp_20():
+def test_warp_20():
 
     gdaltest.tiff_drv = gdal.GetDriverByName('GTiff')
     if gdaltest.tiff_drv is None:
@@ -786,7 +786,7 @@ def warp_20():
 # Test overviews on warped VRT files
 
 
-def warp_21():
+def test_warp_21():
 
     shutil.copy('data/utmsmall_near.vrt', 'tmp/warp_21.vrt')
 
@@ -811,7 +811,7 @@ def warp_21():
 # Would have detected issue of #3458
 
 
-def warp_22():
+def test_warp_22():
 
     # Generate source image with non uniform data
     w = 1001
@@ -865,7 +865,7 @@ def warp_22():
 # Test warping with datasets where some RasterIO() requests involve nBufXSize == 0 (#3582)
 
 
-def warp_23():
+def test_warp_23():
 
     gcp1 = gdal.GCP()
     gcp1.GCPPixel = 3213
@@ -942,7 +942,7 @@ def warp_23():
 # left pixel being not set in GWKBilinearResample() case)
 
 
-def warp_24():
+def test_warp_24():
 
     ds_ref = gdal.Open('data/test3658.tif')
     cs_ref = ds_ref.GetRasterBand(1).Checksum()
@@ -959,7 +959,7 @@ def warp_24():
 # Test -refine_gcps (#4143)
 
 
-def warp_25():
+def test_warp_25():
 
     ds = gdal.Open('data/refine_gcps.vrt')
     cs = ds.GetRasterBand(1).Checksum()
@@ -975,7 +975,7 @@ def warp_25():
 # Test serializing and deserializing TPS transformer
 
 
-def warp_26():
+def test_warp_26():
 
     gdal.Translate('tmp/warp_25_gcp.vrt', '../gcore/data/byte.tif',
                    options='-of VRT -gcp 0 0 0 20 -gcp 0 20 0  0 '
@@ -1006,7 +1006,7 @@ def warp_27_progress_callback(pct, message, user_data):
     return 1  # 1 to continue, 0 to stop
 
 
-def warp_27():
+def test_warp_27():
 
     # Open source dataset
     src_ds = gdal.Open('../gcore/data/byte.tif')
@@ -1076,7 +1076,7 @@ def warp_27():
 # INIT_DEST setting
 
 
-def warp_28():
+def test_warp_28():
 
     ds = gdal.Open('data/utm_alpha_noinit.vrt')
     cs1 = ds.GetRasterBand(1).Checksum()
@@ -1094,7 +1094,7 @@ def warp_28():
 # Test multi-thread computations
 
 
-def warp_29():
+def test_warp_29():
 
     ds = gdal.Open('data/white_nodata.vrt')
     cs_monothread = ds.GetRasterBand(1).Checksum()
@@ -1167,7 +1167,7 @@ def warp_30_progress_callback(pct, message, user_data):
     return bool(pct <= 0.2)
 
 
-def warp_30():
+def test_warp_30():
 
     # Open source dataset
     src_ds = gdal.Open('../gcore/data/byte.tif')
@@ -1244,7 +1244,7 @@ def warp_30():
 # Average (Byte)
 
 
-def warp_31():
+def test_warp_31():
 
     gdaltest.tiff_drv = gdal.GetDriverByName('GTiff')
     if gdaltest.tiff_drv is None:
@@ -1265,7 +1265,7 @@ def warp_31():
 # Average (Float)
 
 
-def warp_32():
+def test_warp_32():
 
     gdaltest.tiff_drv = gdal.GetDriverByName('GTiff')
     if gdaltest.tiff_drv is None:
@@ -1286,7 +1286,7 @@ def warp_32():
 # Mode (Byte)
 
 
-def warp_33():
+def test_warp_33():
 
     gdaltest.tiff_drv = gdal.GetDriverByName('GTiff')
     if gdaltest.tiff_drv is None:
@@ -1307,7 +1307,7 @@ def warp_33():
 # Mode (Int16)
 
 
-def warp_34():
+def test_warp_34():
 
     gdaltest.tiff_drv = gdal.GetDriverByName('GTiff')
     if gdaltest.tiff_drv is None:
@@ -1328,7 +1328,7 @@ def warp_34():
 # Mode (Int16 - signed with negative values)
 
 
-def warp_35():
+def test_warp_35():
 
     gdaltest.tiff_drv = gdal.GetDriverByName('GTiff')
     if gdaltest.tiff_drv is None:
@@ -1349,7 +1349,7 @@ def warp_35():
 # Mode (Int32) - this uses algorithm 2 (inefficient)
 
 
-def warp_36():
+def test_warp_36():
 
     gdaltest.tiff_drv = gdal.GetDriverByName('GTiff')
     if gdaltest.tiff_drv is None:
@@ -1371,7 +1371,7 @@ def warp_36():
 # Test a few error cases
 
 
-def warp_37():
+def test_warp_37():
 
     # Open source dataset
     src_ds = gdal.Open('../gcore/data/byte.tif')
@@ -1409,7 +1409,7 @@ def warp_37():
 # Test a warp with GCPs on the *destination* image.
 
 
-def warp_38():
+def test_warp_38():
 
     # Create an output file with GCPs.
     out_file = 'tmp/warp_38.tif'
@@ -1445,7 +1445,7 @@ def warp_38():
 # Test a warp with GCPs for TPS on the *destination* image.
 
 
-def warp_39():
+def test_warp_39():
 
     # Create an output file with GCPs.
     out_file = 'tmp/warp_39.tif'
@@ -1481,7 +1481,7 @@ def warp_39():
 # test average (#5311)
 
 
-def warp_40():
+def test_warp_40():
 
     gdaltest.tiff_drv = gdal.GetDriverByName('GTiff')
     if gdaltest.tiff_drv is None:
@@ -1503,7 +1503,7 @@ def warp_40():
 # test GDALSuggestedWarpOutput (#5693)
 
 
-def warp_41():
+def test_warp_41():
 
     src_ds = gdal.Open("""<VRTDataset rasterXSize="67108864" rasterYSize="67108864">
   <GeoTransform> -2.0037508340000000e+07,  5.9716428339481353e-01,  0.0000000000000000e+00,  2.0037508340000000e+07,  0.0000000000000000e+00, -5.9716428339481353e-01</GeoTransform>
@@ -1539,7 +1539,7 @@ def warp_41():
 # Maximum
 
 
-def warp_42():
+def test_warp_42():
 
     gdaltest.tiff_drv = gdal.GetDriverByName('GTiff')
     if gdaltest.tiff_drv is None:
@@ -1560,7 +1560,7 @@ def warp_42():
 # Minimum
 
 
-def warp_43():
+def test_warp_43():
 
     gdaltest.tiff_drv = gdal.GetDriverByName('GTiff')
     if gdaltest.tiff_drv is None:
@@ -1581,7 +1581,7 @@ def warp_43():
 # Median
 
 
-def warp_44():
+def test_warp_44():
 
     gdaltest.tiff_drv = gdal.GetDriverByName('GTiff')
     if gdaltest.tiff_drv is None:
@@ -1602,7 +1602,7 @@ def warp_44():
 # Quartile 1
 
 
-def warp_45():
+def test_warp_45():
 
     gdaltest.tiff_drv = gdal.GetDriverByName('GTiff')
     if gdaltest.tiff_drv is None:
@@ -1623,7 +1623,7 @@ def warp_45():
 # Quartile 3
 
 
-def warp_46():
+def test_warp_46():
 
     gdaltest.tiff_drv = gdal.GetDriverByName('GTiff')
     if gdaltest.tiff_drv is None:
@@ -1644,7 +1644,7 @@ def warp_46():
 # Maximum (Int16 - signed with negative values)
 
 
-def warp_47():
+def test_warp_47():
 
     gdaltest.tiff_drv = gdal.GetDriverByName('GTiff')
     if gdaltest.tiff_drv is None:
@@ -1665,7 +1665,7 @@ def warp_47():
 # Minimum (Int16 - signed with negative values)
 
 
-def warp_48():
+def test_warp_48():
 
     gdaltest.tiff_drv = gdal.GetDriverByName('GTiff')
     if gdaltest.tiff_drv is None:
@@ -1686,7 +1686,7 @@ def warp_48():
 # Median (Int16 - signed with negative values)
 
 
-def warp_49():
+def test_warp_49():
 
     gdaltest.tiff_drv = gdal.GetDriverByName('GTiff')
     if gdaltest.tiff_drv is None:
@@ -1707,7 +1707,7 @@ def warp_49():
 # Quartile 1 (Int16 - signed with negative values)
 
 
-def warp_50():
+def test_warp_50():
 
     gdaltest.tiff_drv = gdal.GetDriverByName('GTiff')
     if gdaltest.tiff_drv is None:
@@ -1728,7 +1728,7 @@ def warp_50():
 # Quartile 3 (Int16 - signed with negative values)
 
 
-def warp_51():
+def test_warp_51():
 
     gdaltest.tiff_drv = gdal.GetDriverByName('GTiff')
     if gdaltest.tiff_drv is None:
@@ -1750,7 +1750,7 @@ def warp_51():
 # Test fix for #6182
 
 
-def warp_52():
+def test_warp_52():
 
     src_ds = gdal.GetDriverByName('MEM').Create('', 4096, 4096, 3, gdal.GDT_UInt16)
     rpc = [
@@ -1802,7 +1802,7 @@ def warp_52():
 # Test Grey+Alpha
 
 
-def warp_53():
+def test_warp_53():
 
     for typestr in ('Byte', 'UInt16', 'Int16'):
         src_ds = gdal.Translate('', '../gcore/data/byte.tif',
@@ -1843,7 +1843,7 @@ def warp_53():
 # Test Alpha on UInt16/Int16
 
 
-def warp_54():
+def test_warp_54():
 
     # UInt16
     src_ds = gdal.Translate('', '../gcore/data/stefan_full_rgba.tif',
@@ -1899,7 +1899,7 @@ def warp_54():
 # and subsampling (#6972)
 
 
-def warp_55():
+def test_warp_55():
 
     ds = gdal.Open('data/warpedvrt_with_ovr.vrt')
     cs = ds.GetRasterBand(1).GetOverview(0).Checksum()
@@ -1916,7 +1916,7 @@ def warp_55():
 # same size). This test crops a single pixel out of a 3-by-3 image.
 
 
-def warp_56():
+def test_warp_56():
 
     try:
         from osgeo import gdalnumeric
@@ -1948,79 +1948,79 @@ def warp_56():
 
 
 gdaltest_list = [
-    warp_1,
-    warp_1_short,
-    warp_1_ushort,
-    warp_1_float,
-    warp_2,
-    warp_2_short,
-    warp_2_ushort,
-    warp_2_downsize,
-    warp_3,
-    warp_3_short,
-    warp_3_ushort,
-    warp_3_downsize,
-    warp_3_float_downsize,
-    warp_4,
-    warp_4_short,
-    warp_4_ushort,
-    warp_4_downsize,
-    warp_4_short_downsize,
-    warp_4_float_downsize,
-    warp_5,
-    warp_5_downsize,
-    warp_6,
-    warp_7,
-    warp_8,
-    warp_9,
-    warp_10,
-    warp_11,
-    warp_12,
-    warp_13,
-    warp_14,
-    warp_15,
-    warp_16,
-    warp_17,
-    warp_18,
-    warp_19,
-    warp_20,
-    warp_21,
-    warp_22,
-    warp_23,
-    warp_24,
-    warp_25,
-    warp_26,
-    warp_27,
-    warp_28,
-    warp_29,
-    warp_30,
-    warp_31,
-    warp_32,
-    warp_33,
-    warp_34,
-    warp_35,
-    warp_36,
-    warp_37,
-    warp_38,
-    warp_39,
-    warp_39,
-    warp_40,
-    warp_41,
-    warp_42,
-    warp_43,
-    warp_44,
-    warp_45,
-    warp_46,
-    warp_47,
-    warp_48,
-    warp_49,
-    warp_50,
-    warp_51,
-    warp_52,
-    warp_53,
-    warp_54,
-    warp_55,
-    warp_56
+    test_warp_1,
+    test_warp_1_short,
+    test_warp_1_ushort,
+    test_warp_1_float,
+    test_warp_2,
+    test_warp_2_short,
+    test_warp_2_ushort,
+    test_warp_2_downsize,
+    test_warp_3,
+    test_warp_3_short,
+    test_warp_3_ushort,
+    test_warp_3_downsize,
+    test_warp_3_float_downsize,
+    test_warp_4,
+    test_warp_4_short,
+    test_warp_4_ushort,
+    test_warp_4_downsize,
+    test_warp_4_short_downsize,
+    test_warp_4_float_downsize,
+    test_warp_5,
+    test_warp_5_downsize,
+    test_warp_6,
+    test_warp_7,
+    test_warp_8,
+    test_warp_9,
+    test_warp_10,
+    test_warp_11,
+    test_warp_12,
+    test_warp_13,
+    test_warp_14,
+    test_warp_15,
+    test_warp_16,
+    test_warp_17,
+    test_warp_18,
+    test_warp_19,
+    test_warp_20,
+    test_warp_21,
+    test_warp_22,
+    test_warp_23,
+    test_warp_24,
+    test_warp_25,
+    test_warp_26,
+    test_warp_27,
+    test_warp_28,
+    test_warp_29,
+    test_warp_30,
+    test_warp_31,
+    test_warp_32,
+    test_warp_33,
+    test_warp_34,
+    test_warp_35,
+    test_warp_36,
+    test_warp_37,
+    test_warp_38,
+    test_warp_39,
+    test_warp_39,
+    test_warp_40,
+    test_warp_41,
+    test_warp_42,
+    test_warp_43,
+    test_warp_44,
+    test_warp_45,
+    test_warp_46,
+    test_warp_47,
+    test_warp_48,
+    test_warp_49,
+    test_warp_50,
+    test_warp_51,
+    test_warp_52,
+    test_warp_53,
+    test_warp_54,
+    test_warp_55,
+    test_warp_56
 ]
 # gdaltest_list = [ warp_55 ]
 
diff --git a/autotest/gcore/asyncreader.py b/autotest/gcore/asyncreader.py
index 24f4c59daeb8..c666a1be700f 100755
--- a/autotest/gcore/asyncreader.py
+++ b/autotest/gcore/asyncreader.py
@@ -38,7 +38,7 @@
 # Test AsyncReader interface on the default (synchronous) implementation
 
 
-def asyncreader_1():
+def test_asyncreader_1():
 
     ds = gdal.Open('data/rgbsmall.tif')
     asyncreader = ds.BeginAsyncReader(0, 0, ds.RasterXSize, ds.RasterYSize)
@@ -71,7 +71,7 @@ def asyncreader_1():
     return 'success'
 
 
-gdaltest_list = [asyncreader_1]
+gdaltest_list = [test_asyncreader_1]
 
 
 if __name__ == '__main__':
diff --git a/autotest/gcore/basic_test.py b/autotest/gcore/basic_test.py
index 5f5a6f32c699..0756ac2fdea0 100755
--- a/autotest/gcore/basic_test.py
+++ b/autotest/gcore/basic_test.py
@@ -47,7 +47,7 @@ def matches_non_existing_error_msg(msg):
     return m1 or m2 or m3
 
 
-def basic_test_1():
+def test_basic_test_1():
     gdal.PushErrorHandler('CPLQuietErrorHandler')
     ds = gdal.Open('non_existing_ds', gdal.GA_ReadOnly)
     gdal.PopErrorHandler()
@@ -57,7 +57,7 @@ def basic_test_1():
     return 'fail'
 
 
-def basic_test_strace_non_existing_file():
+def test_basic_test_strace_non_existing_file():
 
     if not sys.platform.startswith('linux'):
         return 'skip'
@@ -84,7 +84,7 @@ def basic_test_strace_non_existing_file():
 
     return 'success'
 
-def basic_test_2():
+def test_basic_test_2():
     gdal.PushErrorHandler('CPLQuietErrorHandler')
     ds = gdal.Open('non_existing_ds', gdal.GA_Update)
     gdal.PopErrorHandler()
@@ -94,7 +94,7 @@ def basic_test_2():
     return 'fail'
 
 
-def basic_test_3():
+def test_basic_test_3():
     gdal.PushErrorHandler('CPLQuietErrorHandler')
     ds = gdal.Open('', gdal.GA_ReadOnly)
     gdal.PopErrorHandler()
@@ -104,7 +104,7 @@ def basic_test_3():
     return 'fail'
 
 
-def basic_test_4():
+def test_basic_test_4():
     gdal.PushErrorHandler('CPLQuietErrorHandler')
     ds = gdal.Open('', gdal.GA_Update)
     gdal.PopErrorHandler()
@@ -114,7 +114,7 @@ def basic_test_4():
     return 'fail'
 
 
-def basic_test_5():
+def test_basic_test_5():
     gdal.PushErrorHandler('CPLQuietErrorHandler')
     ds = gdal.Open('data/doctype.xml', gdal.GA_ReadOnly)
     gdal.PopErrorHandler()
@@ -128,7 +128,7 @@ def basic_test_5():
 # Issue several AllRegister() to check that GDAL drivers are good citizens
 
 
-def basic_test_6():
+def test_basic_test_6():
     gdal.AllRegister()
     gdal.AllRegister()
     gdal.AllRegister()
@@ -165,7 +165,7 @@ def basic_test_7_internal():
         return 'success'
 
 
-def basic_test_7():
+def test_basic_test_7():
     old_use_exceptions_status = gdal.GetUseExceptions()
     gdal.UseExceptions()
     ret = basic_test_7_internal()
@@ -177,7 +177,7 @@ def basic_test_7():
 # Test gdal.VersionInfo('RELEASE_DATE') and gdal.VersionInfo('LICENSE')
 
 
-def basic_test_8():
+def test_basic_test_8():
 
     ret = gdal.VersionInfo('RELEASE_DATE')
     if len(ret) != 8:
@@ -217,7 +217,7 @@ def my_python_error_handler(eErrClass, err_no, msg):
     gdaltest.msg = msg
 
 
-def basic_test_9():
+def test_basic_test_9():
 
     gdaltest.eErrClass = 0
     gdaltest.err_no = 0
@@ -256,7 +256,7 @@ def handler(self, eErrClass, err_no, msg):
         self.msg = msg
 
 
-def basic_test_10():
+def test_basic_test_10():
 
     # Check that reference counting works OK
     gdal.PushErrorHandler(my_python_error_handler_class().handler)
@@ -286,7 +286,7 @@ def basic_test_10():
 # Test gdal.OpenEx()
 
 
-def basic_test_11():
+def test_basic_test_11():
 
     ds = gdal.OpenEx('data/byte.tif')
     if ds is None:
@@ -408,7 +408,7 @@ def basic_test_11():
 # Test GDAL layer API
 
 
-def basic_test_12():
+def test_basic_test_12():
 
     ds = gdal.GetDriverByName('MEMORY').Create('bar', 0, 0, 0)
     if ds.GetDescription() != 'bar':
@@ -466,7 +466,7 @@ def basic_test_12():
 # Test correct sorting of StringList / metadata (#5540, #5557)
 
 
-def basic_test_13():
+def test_basic_test_13():
 
     ds = gdal.GetDriverByName('MEM').Create('', 1, 1)
     for i in range(3):
@@ -514,7 +514,7 @@ def basic_test_13():
 # Test SetMetadata()
 
 
-def basic_test_14():
+def test_basic_test_14():
 
     ds = gdal.GetDriverByName('MEM').Create('', 1, 1)
 
@@ -617,7 +617,7 @@ def basic_test_15_cbk_bad_ret(a, b, c):
     return 'ok'
 
 
-def basic_test_15():
+def test_basic_test_15():
 
     try:
         with gdaltest.error_handler():
@@ -651,7 +651,7 @@ def basic_test_15():
 # Test unrecognized and recognized open options prefixed by @
 
 
-def basic_test_16():
+def test_basic_test_16():
 
     gdal.ErrorReset()
     gdal.OpenEx('data/byte.tif', open_options=['@UNRECOGNIZED=FOO'])
@@ -675,7 +675,7 @@ def basic_test_16():
 # Test mix of gdal/ogr.UseExceptions()/DontUseExceptions()
 
 
-def basic_test_17():
+def test_basic_test_17():
 
     from osgeo import ogr
 
@@ -723,24 +723,24 @@ def basic_test_17():
     return 'success'
 
 
-gdaltest_list = [basic_test_1,
-                 basic_test_strace_non_existing_file,
-                 basic_test_2,
-                 basic_test_3,
-                 basic_test_4,
-                 basic_test_5,
-                 basic_test_6,
-                 basic_test_7,
-                 basic_test_8,
-                 basic_test_9,
-                 basic_test_10,
-                 basic_test_11,
-                 basic_test_12,
-                 basic_test_13,
-                 basic_test_14,
-                 basic_test_15,
-                 basic_test_16,
-                 basic_test_17]
+gdaltest_list = [test_basic_test_1,
+                 test_basic_test_strace_non_existing_file,
+                 test_basic_test_2,
+                 test_basic_test_3,
+                 test_basic_test_4,
+                 test_basic_test_5,
+                 test_basic_test_6,
+                 test_basic_test_7,
+                 test_basic_test_8,
+                 test_basic_test_9,
+                 test_basic_test_10,
+                 test_basic_test_11,
+                 test_basic_test_12,
+                 test_basic_test_13,
+                 test_basic_test_14,
+                 test_basic_test_15,
+                 test_basic_test_16,
+                 test_basic_test_17]
 
 
 if __name__ == '__main__':
diff --git a/autotest/gcore/bmp_read.py b/autotest/gcore/bmp_read.py
index b73b81c5ea2b..d874c58692e1 100755
--- a/autotest/gcore/bmp_read.py
+++ b/autotest/gcore/bmp_read.py
@@ -51,7 +51,7 @@ def test_bmp_open(filename, checksum):
     ut.testOpen()
 
 
-def bmp_online_1():
+def test_bmp_online_1():
 
     if not gdaltest.download_file('http://download.osgeo.org/gdal/data/bmp/8bit_pal_rle.bmp', '8bit_pal_rle.bmp'):
         return 'skip'
@@ -61,7 +61,7 @@ def bmp_online_1():
     return tst.testOpen()
 
 
-def bmp_online_2():
+def test_bmp_online_2():
 
     if not gdaltest.download_file('http://download.osgeo.org/gdal/data/bmp/24bit.bmp', '24bit.bmp'):
         return 'skip'
@@ -73,7 +73,7 @@ def bmp_online_2():
     return tst.testOpen()
 
 
-gdaltest_list = [bmp_online_1, bmp_online_2]
+gdaltest_list = [test_bmp_online_1, test_bmp_online_2]
 
 if __name__ == '__main__':
 
diff --git a/autotest/gcore/bmp_write.py b/autotest/gcore/bmp_write.py
index 35da731b5319..a68e90c89288 100755
--- a/autotest/gcore/bmp_write.py
+++ b/autotest/gcore/bmp_write.py
@@ -37,7 +37,7 @@
 # Test creating an in memory copy.
 
 
-def bmp_vsimem():
+def test_bmp_vsimem():
 
     tst = gdaltest.GDALTest('BMP', 'byte.tif', 1, 4672)
 
@@ -47,7 +47,7 @@ def bmp_vsimem():
 ###############################################################################
 # When imported build a list of units based on the files available.
 
-gdaltest_list = [bmp_vsimem]
+gdaltest_list = [test_bmp_vsimem]
 
 
 init_list = [
diff --git a/autotest/gcore/colortable.py b/autotest/gcore/colortable.py
index 4f8dc3ea3413..158059c200c2 100755
--- a/autotest/gcore/colortable.py
+++ b/autotest/gcore/colortable.py
@@ -40,7 +40,7 @@
 # Create a color table.
 
 
-def colortable_1():
+def test_colortable_1():
 
     gdaltest.test_ct_data = [(255, 0, 0), (0, 255, 0), (0, 0, 255), (255, 255, 255, 0)]
 
@@ -54,7 +54,7 @@ def colortable_1():
 # verify contents.
 
 
-def colortable_2():
+def test_colortable_2():
 
     for i in range(len(gdaltest.test_ct_data)):
         g_data = gdaltest.test_ct.GetColorEntry(i)
@@ -76,7 +76,7 @@ def colortable_2():
 # Test CreateColorRamp()
 
 
-def colortable_3():
+def test_colortable_3():
 
     ct = gdal.ColorTable()
     try:
@@ -98,16 +98,16 @@ def colortable_3():
 # Cleanup.
 
 
-def colortable_cleanup():
+def test_colortable_cleanup():
     gdaltest.test_ct = None
     return 'success'
 
 
 gdaltest_list = [
-    colortable_1,
-    colortable_2,
-    colortable_3,
-    colortable_cleanup]
+    test_colortable_1,
+    test_colortable_2,
+    test_colortable_3,
+    test_colortable_cleanup]
 
 if __name__ == '__main__':
 
diff --git a/autotest/gcore/envi_read.py b/autotest/gcore/envi_read.py
index 51091916f214..37860ba43bfc 100755
--- a/autotest/gcore/envi_read.py
+++ b/autotest/gcore/envi_read.py
@@ -38,7 +38,7 @@
 # Test GDAL_READDIR_LIMIT_ON_OPEN
 
 
-def envi_1():
+def test_envi_1():
 
     gdal.SetConfigOption('GDAL_READDIR_LIMIT_ON_OPEN', '1')
 
@@ -81,7 +81,7 @@ def test_envi_open(filename, checksum):
     ut.testOpen()
 
 
-gdaltest_list = [envi_1]
+gdaltest_list = [test_envi_1]
 
 if __name__ == '__main__':
 
diff --git a/autotest/gcore/gcps2geotransform.py b/autotest/gcore/gcps2geotransform.py
index 8f5d87cafd15..17a9d00a4043 100755
--- a/autotest/gcore/gcps2geotransform.py
+++ b/autotest/gcore/gcps2geotransform.py
@@ -54,7 +54,7 @@ def _list2gcps(src_list):
 ###############################################################################
 # Test simple exact case of turning GCPs into a GeoTransform.
 
-def gcps2gt_1():
+def test_gcps2gt_1():
 
     gt = gdal.GCPsToGeoTransform(_list2gcps([
         (0.0, 0.0, 400000, 370000),
@@ -71,7 +71,7 @@ def gcps2gt_1():
 # Similar but non-exact.
 
 
-def gcps2gt_2():
+def test_gcps2gt_2():
 
     gt = gdal.GCPsToGeoTransform(_list2gcps([
         (0.0, 0.0, 400000, 370000),
@@ -89,7 +89,7 @@ def gcps2gt_2():
 # bApproxOK false, and no good solution.
 
 
-def gcps2gt_3():
+def test_gcps2gt_3():
 
     approx_ok = 0
     gt = gdal.GCPsToGeoTransform(_list2gcps([
@@ -108,7 +108,7 @@ def gcps2gt_3():
 # Single point - Should return None.
 
 
-def gcps2gt_4():
+def test_gcps2gt_4():
 
     gt = gdal.GCPsToGeoTransform(_list2gcps([
         (0.0, 0.0, 400000, 370000),
@@ -123,7 +123,7 @@ def gcps2gt_4():
 # Two points - simple offset and scale, no rotation.
 
 
-def gcps2gt_5():
+def test_gcps2gt_5():
 
     gt = gdal.GCPsToGeoTransform(_list2gcps([
         (0.0, 0.0, 400000, 370000),
@@ -139,7 +139,7 @@ def gcps2gt_5():
 # Special case for four points in a particular order.  Exact result.
 
 
-def gcps2gt_6():
+def test_gcps2gt_6():
 
     gt = gdal.GCPsToGeoTransform(_list2gcps([
         (400000, 370000, 400000, 370000),
@@ -157,7 +157,7 @@ def gcps2gt_6():
 # Try a case that is hard to do without normalization.
 
 
-def gcps2gt_7():
+def test_gcps2gt_7():
 
     gt = gdal.GCPsToGeoTransform(_list2gcps([
         (400000, 370000, 400000, 370000),
@@ -175,7 +175,7 @@ def gcps2gt_7():
 # A fairly messy real world case without a easy to predict result.
 
 
-def gcps2gt_8():
+def test_gcps2gt_8():
 
     gt = gdal.GCPsToGeoTransform(_list2gcps([
         (0.01, 0.04, -87.05528672907, 39.22759504228),
@@ -194,14 +194,14 @@ def gcps2gt_8():
 
 
 gdaltest_list = [
-    gcps2gt_1,
-    gcps2gt_2,
-    gcps2gt_3,
-    gcps2gt_4,
-    gcps2gt_5,
-    gcps2gt_6,
-    gcps2gt_7,
-    gcps2gt_8,
+    test_gcps2gt_1,
+    test_gcps2gt_2,
+    test_gcps2gt_3,
+    test_gcps2gt_4,
+    test_gcps2gt_5,
+    test_gcps2gt_6,
+    test_gcps2gt_7,
+    test_gcps2gt_8,
 ]
 
 if __name__ == '__main__':
diff --git a/autotest/gcore/gdal_api_proxy.py b/autotest/gcore/gdal_api_proxy.py
index 7b3e656e3366..9b886389d6cb 100755
--- a/autotest/gcore/gdal_api_proxy.py
+++ b/autotest/gcore/gdal_api_proxy.py
@@ -41,7 +41,7 @@
 # Test forked gdalserver
 
 
-def gdal_api_proxy_1():
+def test_gdal_api_proxy_1():
 
     import test_py_scripts
     import test_cli_utilities
@@ -60,7 +60,7 @@ def gdal_api_proxy_1():
 # Test connection to TCP server
 
 
-def gdal_api_proxy_2():
+def test_gdal_api_proxy_2():
 
     if sys.version_info < (2, 6, 0):
         return 'skip'
@@ -77,7 +77,7 @@ def gdal_api_proxy_2():
 # Test connection to Unix socket server
 
 
-def gdal_api_proxy_3():
+def test_gdal_api_proxy_3():
 
     if sys.version_info < (2, 6, 0):
         return 'skip'
@@ -101,7 +101,7 @@ def gdal_api_proxy_3():
 # Test -nofork mode
 
 
-def gdal_api_proxy_4():
+def test_gdal_api_proxy_4():
 
     if sys.version_info < (2, 6, 0):
         return 'skip'
@@ -125,7 +125,7 @@ def gdal_api_proxy_4():
 #
 
 
-def gdal_api_proxy_sub():
+def test_gdal_api_proxy_sub():
 
     src_ds = gdal.Open('data/byte.tif')
     src_cs = src_ds.GetRasterBand(1).Checksum()
@@ -601,7 +601,7 @@ def gdal_api_proxy_sub():
 #
 
 
-def gdal_api_proxy_sub_clean():
+def test_gdal_api_proxy_sub_clean():
     if gdaltest.api_proxy_server_p is not None:
         try:
             gdaltest.api_proxy_server_p.terminate()
@@ -613,10 +613,10 @@ def gdal_api_proxy_sub_clean():
     return 'success'
 
 
-gdaltest_list = [gdal_api_proxy_1,
-                 gdal_api_proxy_2,
-                 gdal_api_proxy_3,
-                 gdal_api_proxy_4]
+gdaltest_list = [test_gdal_api_proxy_1,
+                 test_gdal_api_proxy_2,
+                 test_gdal_api_proxy_3,
+                 test_gdal_api_proxy_4]
 
 if __name__ == '__main__':
 
@@ -628,7 +628,7 @@ def gdal_api_proxy_sub_clean():
             gdal.SetConfigOption('GDAL_API_PROXY_SERVER', gdalserver_path)
 
         gdaltest.api_proxy_server_p = None
-        gdaltest_list = [gdal_api_proxy_sub]
+        gdaltest_list = [test_gdal_api_proxy_sub]
 
     elif len(sys.argv) >= 3 and sys.argv[2] == '-2':
 
@@ -652,7 +652,7 @@ def gdal_api_proxy_sub_clean():
             gdal.SetConfigOption('GDAL_API_PROXY_SERVER', 'localhost:%d' % port)
             print('port = %d' % port)
             gdaltest.api_proxy_server_p = p
-            gdaltest_list = [gdal_api_proxy_sub, gdal_api_proxy_sub_clean]
+            gdaltest_list = [test_gdal_api_proxy_sub, test_gdal_api_proxy_sub_clean]
         else:
             gdaltest_list = []
 
@@ -666,7 +666,7 @@ def gdal_api_proxy_sub_clean():
             gdal.SetConfigOption('GDAL_API_PROXY', 'YES')
             gdal.SetConfigOption('GDAL_API_PROXY_SERVER', 'tmp/gdalapiproxysocket')
             gdaltest.api_proxy_server_p = p
-            gdaltest_list = [gdal_api_proxy_sub, gdal_api_proxy_sub_clean]
+            gdaltest_list = [test_gdal_api_proxy_sub, test_gdal_api_proxy_sub_clean]
         else:
             try:
                 p.terminate()
@@ -685,7 +685,7 @@ def gdal_api_proxy_sub_clean():
             gdal.SetConfigOption('GDAL_API_PROXY', 'YES')
             gdal.SetConfigOption('GDAL_API_PROXY_SERVER', 'tmp/gdalapiproxysocket')
             gdaltest.api_proxy_server_p = p
-            gdaltest_list = [gdal_api_proxy_sub, gdal_api_proxy_sub_clean]
+            gdaltest_list = [test_gdal_api_proxy_sub, test_gdal_api_proxy_sub_clean]
         else:
             try:
                 p.terminate()
diff --git a/autotest/gcore/gdal_stats.py b/autotest/gcore/gdal_stats.py
index 9325410b586a..75631c61072f 100755
--- a/autotest/gcore/gdal_stats.py
+++ b/autotest/gcore/gdal_stats.py
@@ -40,7 +40,7 @@
 # Test handling NaN with GDT_Float32 data
 
 
-def stats_nan_1():
+def test_stats_nan_1():
 
     gdaltest.gtiff_drv = gdal.GetDriverByName('GTiff')
     if gdaltest.gtiff_drv is None:
@@ -61,7 +61,7 @@ def stats_nan_1():
 # Test handling NaN with GDT_Float64 data
 
 
-def stats_nan_2():
+def test_stats_nan_2():
 
     if gdaltest.gtiff_drv is None:
         return 'skip'
@@ -81,7 +81,7 @@ def stats_nan_2():
 # Test stats on signed byte (#3151)
 
 
-def stats_signedbyte():
+def test_stats_signedbyte():
 
     if gdaltest.gtiff_drv is None:
         return 'skip'
@@ -102,7 +102,7 @@ def stats_signedbyte():
 # Test return of GetStatistics() when we don't have stats and don't
 # force their computation (#3572)
 
-def stats_dont_force():
+def test_stats_dont_force():
 
     gdal.Unlink('data/byte.tif.aux.xml')
     ds = gdal.Open('data/byte.tif')
@@ -119,7 +119,7 @@ def stats_dont_force():
 # Test statistics when stored nodata value doesn't accurately match the nodata
 # value used in the imagery (#3573)
 
-def stats_approx_nodata():
+def test_stats_approx_nodata():
 
     shutil.copyfile('data/minfloat.tif', 'tmp/minfloat.tif')
     try:
@@ -167,7 +167,7 @@ def stats_approx_nodata():
 ###############################################################################
 # Test read and copy of dataset with nan as nodata value (#3576)
 
-def stats_nan_3():
+def test_stats_nan_3():
 
     src_ds = gdal.Open('data/nan32_nodata.tif')
     nodata = src_ds.GetRasterBand(1).GetNoDataValue()
@@ -201,7 +201,7 @@ def stats_nan_3():
 # and complex source nodata (#3576)
 
 
-def stats_nan_4():
+def test_stats_nan_4():
 
     ds = gdal.Open('data/nan32_nodata.vrt')
     cs = ds.GetRasterBand(1).Checksum()
@@ -224,7 +224,7 @@ def stats_nan_4():
 # and complex source nodata (nan must be translated to 0 then) (#3576)
 
 
-def stats_nan_5():
+def test_stats_nan_5():
 
     ds = gdal.Open('data/nan32_nodata_nan_to_zero.vrt')
     cs = ds.GetRasterBand(1).Checksum()
@@ -246,7 +246,7 @@ def stats_nan_5():
 ###############################################################################
 # Test reading a warped VRT with nan as src nodata and dest nodata (#3576)
 
-def stats_nan_6():
+def test_stats_nan_6():
 
     ds = gdal.Open('data/nan32_nodata_warp.vrt')
     cs = ds.GetRasterBand(1).Checksum()
@@ -268,7 +268,7 @@ def stats_nan_6():
 # Test reading a warped VRT with nan as src nodata and 0 as dest nodata (#3576)
 
 
-def stats_nan_7():
+def test_stats_nan_7():
 
     ds = gdal.Open('data/nan32_nodata_warp_nan_to_zero.vrt')
     cs = ds.GetRasterBand(1).Checksum()
@@ -290,7 +290,7 @@ def stats_nan_7():
 ###############################################################################
 # Test reading a warped VRT with zero as src nodata and nan as dest nodata (#3576)
 
-def stats_nan_8():
+def test_stats_nan_8():
 
     ds = gdal.Open('data/nan32_nodata_warp_zero_to_nan.vrt')
     cs = ds.GetRasterBand(1).Checksum()
@@ -317,7 +317,7 @@ def stats_nodata_inf_progress_cbk(value, string, extra):
     extra[0] = value
 
 
-def stats_nodata_inf():
+def test_stats_nodata_inf():
 
     ds = gdal.GetDriverByName('HFA').Create('/vsimem/stats_nodata_inf.img', 3, 1, 1, gdal.GDT_Float32)
     ds.GetRasterBand(1).SetNoDataValue(gdaltest.neginf())
@@ -360,26 +360,26 @@ def stats_nodata_check(filename, expected_nodata):
     return 'success'
 
 
-def stats_nodata_neginf_linux():
+def test_stats_nodata_neginf_linux():
     return stats_nodata_check('data/stats_nodata_neginf.tif', gdaltest.neginf())
 
 
-def stats_nodata_neginf_msvc():
+def test_stats_nodata_neginf_msvc():
     return stats_nodata_check('data/stats_nodata_neginf_msvc.tif', gdaltest.neginf())
 
 
-def stats_nodata_posinf_linux():
+def test_stats_nodata_posinf_linux():
     return stats_nodata_check('data/stats_nodata_posinf.tif', gdaltest.posinf())
 
 
-def stats_nodata_posinf_msvc():
+def test_stats_nodata_posinf_msvc():
     return stats_nodata_check('data/stats_nodata_posinf_msvc.tif', gdaltest.posinf())
 
 ###############################################################################
 # Test standard deviation computation on huge values
 
 
-def stats_stddev_huge_values():
+def test_stats_stddev_huge_values():
 
     gdal.FileFromMemBuffer('/vsimem/stats_stddev_huge_values.asc',
                            """ncols        4
@@ -407,7 +407,7 @@ def stats_stddev_huge_values():
 # of blocks is nodata only
 
 
-def stats_square_shape():
+def test_stats_square_shape():
 
     ds = gdal.GetDriverByName('GTiff').Create('/vsimem/stats_square_shape.tif', 32, 32, options=['TILED=YES', 'BLOCKXSIZE=16', 'BLOCKYSIZE=16'])
     ds.GetRasterBand(1).SetNoDataValue(0)
@@ -438,7 +438,7 @@ def stats_square_shape():
 # Test when nodata = FLT_MIN (#6578)
 
 
-def stats_flt_min():
+def test_stats_flt_min():
 
     shutil.copyfile('data/flt_min.tif', 'tmp/flt_min.tif')
     try:
@@ -481,7 +481,7 @@ def stats_flt_min():
 # Test when nodata = DBL_MIN (#6578)
 
 
-def stats_dbl_min():
+def test_stats_dbl_min():
 
     shutil.copyfile('data/dbl_min.tif', 'tmp/dbl_min.tif')
     try:
@@ -524,7 +524,7 @@ def stats_dbl_min():
 # Test stats on a tiled Byte with partial tiles
 
 
-def stats_byte_partial_tiles():
+def test_stats_byte_partial_tiles():
 
     ds = gdal.Translate('/vsimem/stats_byte_tiled.tif', '../gdrivers/data/small_world.tif',
                         creationOptions=['TILED=YES', 'BLOCKXSIZE=64', 'BLOCKYSIZE=64'])
@@ -649,7 +649,7 @@ def stats_byte_partial_tiles():
 # Test stats on uint16
 
 
-def stats_uint16():
+def test_stats_uint16():
 
     ds = gdal.Translate('/vsimem/stats_uint16_tiled.tif', '../gdrivers/data/small_world.tif',
                         outputType=gdal.GDT_UInt16,
@@ -776,7 +776,7 @@ def stats_uint16():
 # Test a case where the nodata value is almost the maximum value of float32
 
 
-def stats_nodata_almost_max_float32():
+def test_stats_nodata_almost_max_float32():
 
     gdal.FileFromMemBuffer('/vsimem/float32_almost_nodata_max_float32.tif',
                            open('data/float32_almost_nodata_max_float32.tif', 'rb').read())
@@ -808,7 +808,7 @@ def stats_nodata_almost_max_float32():
 # Test STATISTICS_APPROXIMATE
 
 
-def stats_approx_stats_flag(dt=gdal.GDT_Byte, struct_frmt='B'):
+def test_stats_approx_stats_flag(dt=gdal.GDT_Byte, struct_frmt='B'):
 
     ds = gdal.GetDriverByName('MEM').Create('', 2000, 2000, 1, dt)
     ds.GetRasterBand(1).WriteRaster(1000, 1000, 1, 1, struct.pack(struct_frmt * 1, 20))
@@ -850,11 +850,11 @@ def stats_approx_stats_flag(dt=gdal.GDT_Byte, struct_frmt='B'):
     return 'success'
 
 
-def stats_approx_stats_flag_float():
-    return stats_approx_stats_flag(dt=gdal.GDT_Float32, struct_frmt='f')
+def test_stats_approx_stats_flag_float():
+    return test_stats_approx_stats_flag(dt=gdal.GDT_Float32, struct_frmt='f')
 
 
-def stats_all_nodata():
+def test_stats_all_nodata():
 
     ds = gdal.GetDriverByName('MEM').Create('', 2000, 2000)
     ds.GetRasterBand(1).SetNoDataValue(0)
@@ -882,7 +882,7 @@ def stats_all_nodata():
     return 'success'
 
 
-def stats_float32_with_nodata_slightly_above_float_max():
+def test_stats_float32_with_nodata_slightly_above_float_max():
 
     ds = gdal.Open('data/float32_with_nodata_slightly_above_float_max.tif')
     my_min, my_max = ds.GetRasterBand(1).ComputeRasterMinMax()
@@ -899,33 +899,33 @@ def stats_float32_with_nodata_slightly_above_float_max():
 
 
 gdaltest_list = [
-    stats_nan_1,
-    stats_nan_2,
-    stats_signedbyte,
-    stats_dont_force,
-    stats_approx_nodata,
-    stats_nan_3,
-    stats_nan_4,
-    stats_nan_5,
-    stats_nan_6,
-    stats_nan_7,
-    stats_nan_8,
-    stats_nodata_inf,
-    stats_nodata_neginf_linux,
-    stats_nodata_neginf_msvc,
-    stats_nodata_posinf_linux,
-    stats_nodata_posinf_msvc,
-    stats_stddev_huge_values,
-    stats_square_shape,
-    stats_flt_min,
-    stats_dbl_min,
-    stats_byte_partial_tiles,
-    stats_uint16,
-    stats_nodata_almost_max_float32,
-    stats_approx_stats_flag,
-    stats_approx_stats_flag_float,
-    stats_all_nodata,
-    stats_float32_with_nodata_slightly_above_float_max,
+    test_stats_nan_1,
+    test_stats_nan_2,
+    test_stats_signedbyte,
+    test_stats_dont_force,
+    test_stats_approx_nodata,
+    test_stats_nan_3,
+    test_stats_nan_4,
+    test_stats_nan_5,
+    test_stats_nan_6,
+    test_stats_nan_7,
+    test_stats_nan_8,
+    test_stats_nodata_inf,
+    test_stats_nodata_neginf_linux,
+    test_stats_nodata_neginf_msvc,
+    test_stats_nodata_posinf_linux,
+    test_stats_nodata_posinf_msvc,
+    test_stats_stddev_huge_values,
+    test_stats_square_shape,
+    test_stats_flt_min,
+    test_stats_dbl_min,
+    test_stats_byte_partial_tiles,
+    test_stats_uint16,
+    test_stats_nodata_almost_max_float32,
+    test_stats_approx_stats_flag,
+    test_stats_approx_stats_flag_float,
+    test_stats_all_nodata,
+    test_stats_float32_with_nodata_slightly_above_float_max,
 ]
 
 if __name__ == '__main__':
diff --git a/autotest/gcore/geoloc.py b/autotest/gcore/geoloc.py
index 2ad2e6e5b730..72649bb88aeb 100755
--- a/autotest/gcore/geoloc.py
+++ b/autotest/gcore/geoloc.py
@@ -38,14 +38,14 @@
 # Verify warped result.
 
 
-def geoloc_1():
+def test_geoloc_1():
 
     tst = gdaltest.GDALTest('VRT', 'warpsst.vrt', 1, 61818)
     return tst.testOpen(check_filelist=False)
 
 
 gdaltest_list = [
-    geoloc_1]
+    test_geoloc_1]
 
 if __name__ == '__main__':
 
diff --git a/autotest/gcore/hdf4_read.py b/autotest/gcore/hdf4_read.py
index c6e3dcbf2737..cb52da4dc9b3 100755
--- a/autotest/gcore/hdf4_read.py
+++ b/autotest/gcore/hdf4_read.py
@@ -68,7 +68,7 @@ def test_hdf4_open(filename, checksum):
 # Test HDF4_SDS with single subdataset
 
 
-def hdf4_read_online_1():
+def test_hdf4_read_online_1():
 
     gdaltest.hdf4_drv = gdal.GetDriverByName('HDF4')
 
@@ -86,7 +86,7 @@ def hdf4_read_online_1():
 # Test HDF4_SDS with GEOLOCATION info
 
 
-def hdf4_read_online_2():
+def test_hdf4_read_online_2():
 
     if gdaltest.hdf4_drv is None:
         return 'skip'
@@ -114,7 +114,7 @@ def hdf4_read_online_2():
 ###############################################################################
 # Test HDF4_EOS:EOS_GRID
 
-def hdf4_read_online_3():
+def test_hdf4_read_online_3():
 
     if gdaltest.hdf4_drv is None:
         return 'skip'
@@ -150,7 +150,7 @@ def hdf4_read_online_3():
 # Test HDF4_SDS:SEAWIFS_L1A
 
 
-def hdf4_read_online_4():
+def test_hdf4_read_online_4():
 
     if gdaltest.hdf4_drv is None:
         return 'skip'
@@ -177,7 +177,7 @@ def hdf4_read_online_4():
 # Test fix for #2208
 
 
-def hdf4_read_online_5():
+def test_hdf4_read_online_5():
 
     if gdaltest.hdf4_drv is None:
         return 'skip'
@@ -198,7 +198,7 @@ def hdf4_read_online_5():
 # Test fix for #3386 where block size is dataset size
 
 
-def hdf4_read_online_6():
+def test_hdf4_read_online_6():
 
     if gdaltest.hdf4_drv is None:
         return 'skip'
@@ -236,7 +236,7 @@ def hdf4_read_online_6():
 # Test fix for #3386 where block size is smaller than dataset size
 
 
-def hdf4_read_online_7():
+def test_hdf4_read_online_7():
 
     if gdaltest.hdf4_drv is None:
         return 'skip'
@@ -274,7 +274,7 @@ def hdf4_read_online_7():
 # Test reading a HDF4_EOS:EOS_GRID where preferred block height reported would be 1
 # but that will lead to very poor performance (#3386)
 
-def hdf4_read_online_8():
+def test_hdf4_read_online_8():
 
     if gdaltest.hdf4_drv is None:
         return 'skip'
@@ -312,7 +312,7 @@ def hdf4_read_online_8():
 # Test reading L1G MTL metadata metadata
 
 
-def hdf4_read_online_9():
+def test_hdf4_read_online_9():
 
     if gdaltest.hdf4_drv is None:
         return 'skip'
@@ -341,7 +341,7 @@ def hdf4_read_online_9():
 # Test that non-tiled access works (#4672)
 
 
-def hdf4_read_online_10():
+def test_hdf4_read_online_10():
 
     if gdaltest.hdf4_drv is None:
         return 'skip'
@@ -369,16 +369,16 @@ def hdf4_read_online_10():
 
 
 gdaltest_list = [
-    hdf4_read_online_1,
-    hdf4_read_online_2,
-    hdf4_read_online_3,
-    hdf4_read_online_4,
-    hdf4_read_online_5,
-    hdf4_read_online_6,
-    hdf4_read_online_7,
-    hdf4_read_online_8,
-    hdf4_read_online_9,
-    hdf4_read_online_10,
+    test_hdf4_read_online_1,
+    test_hdf4_read_online_2,
+    test_hdf4_read_online_3,
+    test_hdf4_read_online_4,
+    test_hdf4_read_online_5,
+    test_hdf4_read_online_6,
+    test_hdf4_read_online_7,
+    test_hdf4_read_online_8,
+    test_hdf4_read_online_9,
+    test_hdf4_read_online_10,
 ]
 
 if __name__ == '__main__':
diff --git a/autotest/gcore/hfa_read.py b/autotest/gcore/hfa_read.py
index ebaafc433d58..87f7d846ddaa 100755
--- a/autotest/gcore/hfa_read.py
+++ b/autotest/gcore/hfa_read.py
@@ -61,14 +61,14 @@ def test_hfa_open(filename, checksum):
 ###############################################################################
 # Test bugfix for https://oss-fuzz.com/v2/testcase-detail/6053338875428864
 
-def hfa_read_completedefn_recursion():
+def test_hfa_read_completedefn_recursion():
 
     with gdaltest.error_handler():
         gdal.Open('data/hfa_completedefn_recursion.img')
     return 'success'
 
 
-gdaltest_list = [hfa_read_completedefn_recursion]
+gdaltest_list = [test_hfa_read_completedefn_recursion]
 
 if __name__ == '__main__':
 
diff --git a/autotest/gcore/hfa_rfc40.py b/autotest/gcore/hfa_rfc40.py
index 2366b3c20ecd..6433f8b1a439 100755
--- a/autotest/gcore/hfa_rfc40.py
+++ b/autotest/gcore/hfa_rfc40.py
@@ -412,103 +412,103 @@ def CheckClone(fname):
 # basic tests
 
 
-def hfa_rfc40_1():
+def test_hfa_rfc40_1():
     return CreateAndWriteRAT("tmp/test.img")
 
 
-def hfa_rfc40_2():
+def test_hfa_rfc40_2():
     return ReadAndCheckValues("tmp/test.img", 10)
 
 # the older interface
 
 
-def hfa_rfc40_3():
+def test_hfa_rfc40_3():
     return CheckSetGetValues("tmp/test.img")
 
 # make sure original data not changed
 
 
-def hfa_rfc40_4():
+def test_hfa_rfc40_4():
     return ReadAndCheckValues("tmp/test.img", 10)
 
 # make it longer - data will be re-written
 
 
-def hfa_rfc40_5():
+def test_hfa_rfc40_5():
     return ExtendAndWrite("tmp/test.img")
 
 # make sure old data not changed
 
 
-def hfa_rfc40_6():
+def test_hfa_rfc40_6():
     return ReadAndCheckValues("tmp/test.img", 20)
 
 # new data at the end ok?
 
 
-def hfa_rfc40_7():
+def test_hfa_rfc40_7():
     return CheckExtension("tmp/test.img")
 
 # write some longer strings - string column will
 # have to be re-written
 
 
-def hfa_rfc40_8():
+def test_hfa_rfc40_8():
     return WriteLongStrings("tmp/test.img")
 
 # make sure old data not changed
 
 
-def hfa_rfc40_9():
+def test_hfa_rfc40_9():
     return ReadAndCheckValues("tmp/test.img", 20)
 
 # check new data ok
 
 
-def hfa_rfc40_10():
+def test_hfa_rfc40_10():
     return CheckLongStrings("tmp/test.img")
 
 # linear binning
 
 
-def hfa_rfc40_11():
+def test_hfa_rfc40_11():
     return SetLinearBinning("tmp/test.img")
 
 # linear binning
 
 
-def hfa_rfc40_12():
+def test_hfa_rfc40_12():
     return CheckLinearBinning("tmp/test.img")
 
 # clone
 
 
-def hfa_rfc40_13():
+def test_hfa_rfc40_13():
     return CheckClone("tmp/test.img")
 
 # serialize not available from Python...
 
 
-def hfa_rfc40_cleanup():
+def test_hfa_rfc40_cleanup():
     gdal.GetDriverByName('HFA').Delete("tmp/test.img")
     return 'success'
 
 
 gdaltest_list = [
-    hfa_rfc40_1,
-    hfa_rfc40_2,
-    hfa_rfc40_3,
-    hfa_rfc40_4,
-    hfa_rfc40_5,
-    hfa_rfc40_6,
-    hfa_rfc40_7,
-    hfa_rfc40_8,
-    hfa_rfc40_9,
-    hfa_rfc40_10,
-    hfa_rfc40_11,
-    hfa_rfc40_12,
-    hfa_rfc40_13,
-    hfa_rfc40_cleanup,
+    test_hfa_rfc40_1,
+    test_hfa_rfc40_2,
+    test_hfa_rfc40_3,
+    test_hfa_rfc40_4,
+    test_hfa_rfc40_5,
+    test_hfa_rfc40_6,
+    test_hfa_rfc40_7,
+    test_hfa_rfc40_8,
+    test_hfa_rfc40_9,
+    test_hfa_rfc40_10,
+    test_hfa_rfc40_11,
+    test_hfa_rfc40_12,
+    test_hfa_rfc40_13,
+    test_hfa_rfc40_cleanup,
 ]
 
 if __name__ == '__main__':
diff --git a/autotest/gcore/hfa_write.py b/autotest/gcore/hfa_write.py
index 2abc40331094..5e7524c6057b 100755
--- a/autotest/gcore/hfa_write.py
+++ b/autotest/gcore/hfa_write.py
@@ -44,7 +44,7 @@
 # test that we can write a small file with a custom layer name.
 
 
-def hfa_write_desc():
+def test_hfa_write_desc():
 
     src_ds = gdal.Open('data/byte.tif')
 
@@ -75,7 +75,7 @@ def hfa_write_desc():
 # test writing 4 bit files.
 
 
-def hfa_write_4bit():
+def test_hfa_write_4bit():
     drv = gdal.GetDriverByName('HFA')
     src_ds = gdal.Open('data/byte.tif')
     ds = drv.CreateCopy('tmp/4bit.img', src_ds, options=['NBITS=1'])
@@ -100,7 +100,7 @@ def hfa_write_4bit():
 # test writing 4 bit files compressed.
 
 
-def hfa_write_4bit_compressed():
+def test_hfa_write_4bit_compressed():
     drv = gdal.GetDriverByName('HFA')
     src_ds = gdal.Open('data/byte.tif')
     ds = drv.CreateCopy('tmp/4bitc.img', src_ds,
@@ -127,7 +127,7 @@ def hfa_write_4bit_compressed():
 # blocks and verifying they are the nodata value.  (#2427)
 
 
-def hfa_write_nd_invalid():
+def test_hfa_write_nd_invalid():
 
     drv = gdal.GetDriverByName('HFA')
     ds = drv.Create('tmp/ndinvalid.img', 512, 512, 1, gdal.GDT_Byte, [])
@@ -152,7 +152,7 @@ def hfa_write_nd_invalid():
 # Test updating .rrd overviews in place (#2524).
 
 
-def hfa_update_overviews():
+def test_hfa_update_overviews():
 
     shutil.copyfile('data/small_ov.img', 'tmp/small.img')
     shutil.copyfile('data/small_ov.rrd', 'tmp/small.rrd')
@@ -172,7 +172,7 @@ def hfa_update_overviews():
 # Test cleaning external overviews.
 
 
-def hfa_clean_external_overviews():
+def test_hfa_clean_external_overviews():
 
     ds = gdal.Open('tmp/small.img', gdal.GA_Update)
     result = ds.BuildOverviews(overviewlist=[])
@@ -207,7 +207,7 @@ def hfa_clean_external_overviews():
 # Test writing high frequency data (#2525).
 
 
-def hfa_bug_2525():
+def test_hfa_bug_2525():
     drv = gdal.GetDriverByName('HFA')
     ds = drv.Create('tmp/test_hfa.img', 64, 64, 1, gdal.GDT_UInt16, options=['COMPRESSED=YES'])
     import struct
@@ -224,7 +224,7 @@ def hfa_bug_2525():
 # Test building external overviews with HFA_USE_RRD=YES
 
 
-def hfa_use_rrd():
+def test_hfa_use_rrd():
 
     shutil.copyfile('data/small_ov.img', 'tmp/small.img')
 
@@ -262,7 +262,7 @@ def hfa_use_rrd():
 ###############################################################################
 # Test fix for #4831
 
-def hfa_update_existing_aux_overviews():
+def test_hfa_update_existing_aux_overviews():
 
     gdal.SetConfigOption('USE_RRD', 'YES')
 
@@ -343,7 +343,7 @@ def hfa_update_existing_aux_overviews():
 # Test writing invalid WKT (#5258)
 
 
-def hfa_write_invalid_wkt():
+def test_hfa_write_invalid_wkt():
 
     # No GEOGCS
     ds = gdal.GetDriverByName('HFA').Create('/vsimem/hfa_write_invalid_wkt.img', 1, 1)
@@ -476,16 +476,16 @@ def test_hfa_create_compress(filename, checksum, testfunction):
     getattr(ut, testfunction)()
 
 
-gdaltest_list = [hfa_write_desc,
-                 hfa_write_4bit,
-                 hfa_write_4bit_compressed,
-                 hfa_write_nd_invalid,
-                 hfa_update_overviews,
-                 hfa_clean_external_overviews,
-                 hfa_bug_2525,
-                 hfa_use_rrd,
-                 hfa_update_existing_aux_overviews,
-                 hfa_write_invalid_wkt]
+gdaltest_list = [test_hfa_write_desc,
+                 test_hfa_write_4bit,
+                 test_hfa_write_4bit_compressed,
+                 test_hfa_write_nd_invalid,
+                 test_hfa_update_overviews,
+                 test_hfa_clean_external_overviews,
+                 test_hfa_bug_2525,
+                 test_hfa_use_rrd,
+                 test_hfa_update_existing_aux_overviews,
+                 test_hfa_write_invalid_wkt]
 
 
 if __name__ == '__main__':
diff --git a/autotest/gcore/histogram.py b/autotest/gcore/histogram.py
index 5ef38cde8dc4..751ec3335229 100755
--- a/autotest/gcore/histogram.py
+++ b/autotest/gcore/histogram.py
@@ -42,7 +42,7 @@
 # Fetch simple histogram.
 
 
-def histogram_1():
+def test_histogram_1():
 
     ds = gdal.Open('data/utmsmall.tif')
     hist = ds.GetRasterBand(1).GetHistogram()
@@ -60,7 +60,7 @@ def histogram_1():
 # Fetch histogram with specified sampling, using keywords.
 
 
-def histogram_2():
+def test_histogram_2():
 
     ds = gdal.Open('data/utmsmall.tif')
     hist = ds.GetRasterBand(1).GetHistogram(buckets=16, max=255.5, min=-0.5)
@@ -78,7 +78,7 @@ def histogram_2():
 # try on a different data type with out of range values included.
 
 
-def histogram_3():
+def test_histogram_3():
 
     ds = gdal.Open('data/int32_withneg.grd')
     hist = ds.GetRasterBand(1).GetHistogram(buckets=21, max=100, min=-100,
@@ -98,7 +98,7 @@ def histogram_3():
 # try on a different data type without out of range values included.
 
 
-def histogram_4():
+def test_histogram_4():
 
     ds = gdal.Open('data/int32_withneg.grd')
     hist = ds.GetRasterBand(1).GetHistogram(buckets=21, max=100, min=-100,
@@ -122,7 +122,7 @@ def histogram_4():
 # Test GetDefaultHistogram() on the file.
 
 
-def histogram_5():
+def test_histogram_5():
 
     ds = gdal.Open('data/utmsmall.tif')
     hist = ds.GetRasterBand(1).GetDefaultHistogram(force=1)
@@ -144,7 +144,7 @@ def histogram_5():
 # Test GetDefaultHistogram( force = 0 ) on a JPG file (#3304)
 
 
-def histogram_6():
+def test_histogram_6():
 
     shutil.copy('../gdrivers/data/albania.jpg', 'tmp/albania.jpg')
     ds = gdal.Open('tmp/albania.jpg')
@@ -160,12 +160,12 @@ def histogram_6():
 
 
 gdaltest_list = [
-    histogram_1,
-    histogram_2,
-    histogram_3,
-    histogram_4,
-    histogram_5,
-    histogram_6
+    test_histogram_1,
+    test_histogram_2,
+    test_histogram_3,
+    test_histogram_4,
+    test_histogram_5,
+    test_histogram_6
 ]
 
 if __name__ == '__main__':
diff --git a/autotest/gcore/identify.py b/autotest/gcore/identify.py
index 799b2a0c7642..0890ae9c146c 100755
--- a/autotest/gcore/identify.py
+++ b/autotest/gcore/identify.py
@@ -38,7 +38,7 @@
 # Simple try of identify driver on a tiff file.
 
 
-def identify_1():
+def test_identify_1():
 
     file_list = gdal.ReadDir('data')
 
@@ -53,7 +53,7 @@ def identify_1():
 # Test a file that won't be recognised.
 
 
-def identify_2():
+def test_identify_2():
 
     file_list = gdal.ReadDir('data')
 
@@ -68,7 +68,7 @@ def identify_2():
 # Try identify on a directory.
 
 
-def identify_3():
+def test_identify_3():
 
     dr = gdal.IdentifyDriver('data')
     if dr is not None:
@@ -81,7 +81,7 @@ def identify_3():
 # Try IdentifyDriverEx
 
 
-def identify_4():
+def test_identify_4():
 
     dr = gdal.IdentifyDriverEx('data/byte.tif')
     if dr is None or dr.GetDescription() != 'GTiff':
@@ -117,10 +117,10 @@ def identify_4():
 
 
 gdaltest_list = [
-    identify_1,
-    identify_2,
-    identify_3,
-    identify_4]
+    test_identify_1,
+    test_identify_2,
+    test_identify_3,
+    test_identify_4]
 
 if __name__ == '__main__':
 
diff --git a/autotest/gcore/mask.py b/autotest/gcore/mask.py
index acfbe6efa5b3..91ce1c0526c2 100755
--- a/autotest/gcore/mask.py
+++ b/autotest/gcore/mask.py
@@ -40,7 +40,7 @@
 # Verify the checksum and flags for "all valid" case.
 
 
-def mask_1():
+def test_mask_1():
 
     ds = gdal.Open('data/byte.tif')
 
@@ -72,7 +72,7 @@ def mask_1():
 # Verify the checksum and flags for "nodata" case.
 
 
-def mask_2():
+def test_mask_2():
 
     ds = gdal.Open('data/byte.vrt')
 
@@ -98,7 +98,7 @@ def mask_2():
 # Verify the checksum and flags for "alpha" case.
 
 
-def mask_3():
+def test_mask_3():
 
     ds = gdal.Open('data/stefan_full_rgba.png')
 
@@ -151,7 +151,7 @@ def mask_3():
 # Copy a *real* masked dataset, and confirm masks copied properly.
 
 
-def mask_4():
+def test_mask_4():
 
     src_ds = gdal.Open('../gdrivers/data/masked.jpg')
 
@@ -190,7 +190,7 @@ def mask_4():
 # masks built for them.
 
 
-def mask_5():
+def test_mask_5():
 
     # This crashes with libtiff 3.8.2, so skip it
     md = gdal.GetDriverByName('GTiff').GetMetadata()
@@ -260,7 +260,7 @@ def mask_5():
 # Test a TIFF file with 1 band and an embedded mask of 1 bit
 
 
-def mask_6():
+def test_mask_6():
 
     gdal.SetConfigOption('GDAL_TIFF_INTERNAL_MASK_TO_8BIT', 'FALSE')
     ds = gdal.Open('data/test_with_mask_1bit.tif')
@@ -289,7 +289,7 @@ def mask_6():
 # Test a TIFF file with 3 bands and an embedded mask of 1 band of 1 bit
 
 
-def mask_7():
+def test_mask_7():
 
     gdal.SetConfigOption('GDAL_TIFF_INTERNAL_MASK_TO_8BIT', 'FALSE')
     ds = gdal.Open('data/test3_with_1mask_1bit.tif')
@@ -320,7 +320,7 @@ def mask_7():
 # Note : The TIFF6 specification, page 37, only allows 1 BitsPerSample && 1 SamplesPerPixel,
 
 
-def mask_8():
+def test_mask_8():
 
     ds = gdal.Open('data/test_with_mask_8bit.tif')
 
@@ -347,7 +347,7 @@ def mask_8():
 # Note : The TIFF6 specification, page 37, only allows 1 BitsPerSample && 1 SamplesPerPixel,
 
 
-def mask_9():
+def test_mask_9():
 
     ds = gdal.Open('data/test3_with_mask_1bit.tif')
 
@@ -375,7 +375,7 @@ def mask_9():
 # Note : The TIFF6 specification, page 37, only allows 1 BitsPerSample && 1 SamplesPerPixel,
 
 
-def mask_10():
+def test_mask_10():
 
     ds = gdal.Open('data/test3_with_mask_8bit.tif')
 
@@ -403,7 +403,7 @@ def mask_10():
 # mask for the overview
 
 
-def mask_11():
+def test_mask_11():
 
     gdal.SetConfigOption('GDAL_TIFF_INTERNAL_MASK_TO_8BIT', 'FALSE')
     ds = gdal.Open('data/test_with_mask_1bit_and_ovr.tif')
@@ -461,7 +461,7 @@ def mask_11():
 # Test a TIFF file with 3 bands, an overview, an embedded mask of 1 bit, and an embedded
 # mask for the overview
 
-def mask_12():
+def test_mask_12():
 
     gdal.SetConfigOption('GDAL_TIFF_INTERNAL_MASK_TO_8BIT', 'FALSE')
     ds = gdal.Open('data/test3_with_mask_1bit_and_ovr.tif')
@@ -519,7 +519,7 @@ def mask_12():
 # Test creation of external TIFF mask band
 
 
-def mask_13():
+def test_mask_13():
 
     gdal.SetConfigOption('GDAL_TIFF_INTERNAL_MASK', 'NO')
 
@@ -586,7 +586,7 @@ def mask_13():
 # Test creation of internal TIFF mask band
 
 
-def mask_14():
+def test_mask_14():
 
     src_ds = gdal.Open('data/byte.tif')
 
@@ -789,42 +789,42 @@ def mask_and_ovr(order, method):
     return 'success'
 
 
-def mask_15():
+def test_mask_15():
     return mask_and_ovr(1, 'NEAREST')
 
 
-def mask_16():
+def test_mask_16():
     return mask_and_ovr(2, 'NEAREST')
 
 
-def mask_17():
+def test_mask_17():
     return mask_and_ovr(3, 'NEAREST')
 
 
-def mask_18():
+def test_mask_18():
     return mask_and_ovr(4, 'NEAREST')
 
 
-def mask_15_avg():
+def test_mask_15_avg():
     return mask_and_ovr(1, 'AVERAGE')
 
 
-def mask_16_avg():
+def test_mask_16_avg():
     return mask_and_ovr(2, 'AVERAGE')
 
 
-def mask_17_avg():
+def test_mask_17_avg():
     return mask_and_ovr(3, 'AVERAGE')
 
 
-def mask_18_avg():
+def test_mask_18_avg():
     return mask_and_ovr(4, 'AVERAGE')
 
 ###############################################################################
 # Test NODATA_VALUES mask
 
 
-def mask_19():
+def test_mask_19():
 
     ds = gdal.Open('data/test_nodatavalues.tif')
 
@@ -855,7 +855,7 @@ def mask_19():
 # Extensive test of nodata mask for all data types
 
 
-def mask_20():
+def test_mask_20():
 
     types = [gdal.GDT_Byte, gdal.GDT_Int16, gdal.GDT_UInt16,
              gdal.GDT_Int32, gdal.GDT_UInt32, gdal.GDT_Float32, gdal.GDT_Float64,
@@ -888,7 +888,7 @@ def mask_20():
 # Extensive test of NODATA_VALUES mask for all data types
 
 
-def mask_21():
+def test_mask_21():
 
     types = [gdal.GDT_Byte, gdal.GDT_Int16, gdal.GDT_UInt16,
              gdal.GDT_Int32, gdal.GDT_UInt32, gdal.GDT_Float32, gdal.GDT_Float64,
@@ -925,7 +925,7 @@ def mask_21():
 # Test creation of external TIFF mask band just after Create()
 
 
-def mask_22():
+def test_mask_22():
 
     drv = gdal.GetDriverByName('GTiff')
     ds = drv.Create('tmp/mask_22.tif', 20, 20)
@@ -983,7 +983,7 @@ def mask_22():
 # internal mask (#3800)
 
 
-def mask_23():
+def test_mask_23():
 
     drv = gdal.GetDriverByName('GTiff')
     md = drv.GetMetadata()
@@ -1018,7 +1018,7 @@ def mask_23():
 # Test on a GDT_UInt16 RGBA (#5692)
 
 
-def mask_24():
+def test_mask_24():
 
     ds = gdal.GetDriverByName('GTiff').Create('/vsimem/mask_24.tif', 100, 100, 4,
                                               gdal.GDT_UInt16, options=['PHOTOMETRIC=RGB', 'ALPHA=YES'])
@@ -1064,7 +1064,7 @@ def mask_24():
 # Test various error conditions
 
 
-def mask_25():
+def test_mask_25():
 
     ds = gdal.GetDriverByName('GTiff').Create('/vsimem/mask_25.tif', 1, 1)
     if ds.GetRasterBand(1).GetMaskFlags() != gdal.GMF_ALL_VALID:
@@ -1140,7 +1140,7 @@ def mask_25():
 # Test on a GDT_UInt16 1band data
 
 
-def mask_26():
+def test_mask_26():
 
     ds = gdal.GetDriverByName('GTiff').Create('/vsimem/mask_26.tif', 100, 100, 2,
                                               gdal.GDT_UInt16, options=['ALPHA=YES'])
@@ -1173,7 +1173,7 @@ def mask_26():
 # Extensive test of nodata mask for all complex types using real part only
 
 
-def mask_27():
+def test_mask_27():
 
     types = [gdal.GDT_CFloat32, gdal.GDT_CFloat64]
 
@@ -1204,37 +1204,37 @@ def mask_27():
 # Extensive test of real NODATA_VALUES mask for all complex types
 
 gdaltest_list = [
-    mask_1,
-    mask_2,
-    mask_3,
-    mask_4,
-    mask_5,
-    mask_6,
-    mask_7,
-    mask_8,
-    mask_9,
-    mask_10,
-    mask_11,
-    mask_12,
-    mask_13,
-    mask_14,
-    mask_15,
-    mask_16,
-    mask_17,
-    mask_18,
-    mask_15_avg,
-    mask_16_avg,
-    mask_17_avg,
-    mask_18_avg,
-    mask_19,
-    mask_20,
-    mask_21,
-    mask_22,
-    mask_23,
-    mask_24,
-    mask_25,
-    mask_26,
-    mask_27]
+    test_mask_1,
+    test_mask_2,
+    test_mask_3,
+    test_mask_4,
+    test_mask_5,
+    test_mask_6,
+    test_mask_7,
+    test_mask_8,
+    test_mask_9,
+    test_mask_10,
+    test_mask_11,
+    test_mask_12,
+    test_mask_13,
+    test_mask_14,
+    test_mask_15,
+    test_mask_16,
+    test_mask_17,
+    test_mask_18,
+    test_mask_15_avg,
+    test_mask_16_avg,
+    test_mask_17_avg,
+    test_mask_18_avg,
+    test_mask_19,
+    test_mask_20,
+    test_mask_21,
+    test_mask_22,
+    test_mask_23,
+    test_mask_24,
+    test_mask_25,
+    test_mask_26,
+    test_mask_27]
 
 if __name__ == '__main__':
 
diff --git a/autotest/gcore/minixml.py b/autotest/gcore/minixml.py
index 86937f4001c6..eb642bf91b37 100755
--- a/autotest/gcore/minixml.py
+++ b/autotest/gcore/minixml.py
@@ -39,7 +39,7 @@
 # Parse a simple document into a tree of lists.
 
 
-def minixml_1():
+def test_minixml_1():
 
     tree = gdal.ParseXMLString('<TestDoc style="123"><sub1/><sub2>abc</sub2></TestDoc>')
 
@@ -114,7 +114,7 @@ def minixml_1():
 # Serialize an XML Tree
 
 
-def minixml_2():
+def test_minixml_2():
 
     tree = [0, 'TestDoc', [2, 'style', [1, '123']], [0, 'sub1'], [0, 'sub2', [1, 'abc']]]
     doc_target = '<TestDoc style="123">\n  <sub1 />\n  <sub2>abc</sub2>\n</TestDoc>\n'
@@ -129,7 +129,7 @@ def minixml_2():
 # Read XML document with complex DOCTYPE element.
 
 
-def minixml_3():
+def test_minixml_3():
 
     fp = open('data/doctype.xml', 'r')
     text = fp.read()
@@ -194,7 +194,7 @@ def minixml_3():
 # Parse and serialize an XML Tree with a <?xml> prolog
 
 
-def minixml_4():
+def test_minixml_4():
 
     xml = """<?xml encoding="utf-8"?>\n<foo />\n"""
     got_xml = gdal.SerializeXMLTree(gdal.ParseXMLString(xml))
@@ -209,7 +209,7 @@ def minixml_4():
 # Parse malformed XML.  Complains, but still makes a tree.
 
 
-def minixml_5():
+def test_minixml_5():
 
     test_pairs = (
         ('<a></A>', 'case'),
@@ -238,7 +238,7 @@ def minixml_5():
 # Parse malformed XML.
 
 
-def minixml_6():
+def test_minixml_6():
 
     test_pairs = (
         ('<', 'element token after open angle bracket'),
@@ -277,7 +277,7 @@ def minixml_6():
 # Parse malformed XML.  Pass without warning, but should not pass.
 
 
-def minixml_7():
+def test_minixml_7():
 
     test_strings = (
         '<1></1>',
@@ -305,7 +305,7 @@ def minixml_7():
 # Parse XML with too many nesting
 
 
-def minixml_8():
+def test_minixml_8():
 
     xml_str = '<a>' * 10001
     xml_str += '</a>' * 10001
@@ -326,20 +326,20 @@ def minixml_8():
 ###############################################################################
 # Cleanup
 
-def minixml_cleanup():
+def test_minixml_cleanup():
     return 'success'
 
 
 gdaltest_list = [
-    minixml_1,
-    minixml_2,
-    minixml_3,
-    minixml_4,
-    minixml_5,
-    minixml_6,
-    minixml_7,
-    minixml_8,
-    minixml_cleanup]
+    test_minixml_1,
+    test_minixml_2,
+    test_minixml_3,
+    test_minixml_4,
+    test_minixml_5,
+    test_minixml_6,
+    test_minixml_7,
+    test_minixml_8,
+    test_minixml_cleanup]
 
 if __name__ == '__main__':
 
diff --git a/autotest/gcore/misc.py b/autotest/gcore/misc.py
index 35d0a9e073c2..ec310958afb9 100755
--- a/autotest/gcore/misc.py
+++ b/autotest/gcore/misc.py
@@ -42,7 +42,7 @@
 # Test that the constructor of GDALDataset() behaves well with a big number of
 # opened/created datasets
 
-def misc_1():
+def test_misc_1():
 
     tab_ds = [None] * 5000
     drv = gdal.GetDriverByName('MEM')
@@ -59,7 +59,7 @@ def misc_1():
 # limit of maximum file descriptors opened at the same time
 
 
-def misc_2():
+def test_misc_2():
 
     tab_ds = [None for i in range(5000)]
     for i, _ in enumerate(tab_ds):
@@ -73,7 +73,7 @@ def misc_2():
 # Test OpenShared() with a dataset whose filename != description (#2797)
 
 
-def misc_3():
+def test_misc_3():
 
     with gdaltest.error_handler():
         ds = gdal.OpenShared('../gdrivers/data/small16.aux')
@@ -97,7 +97,7 @@ def misc_3():
 # Test Create() with invalid arguments
 
 
-def misc_4():
+def test_misc_4():
 
     gdal.PushErrorHandler('CPLQuietErrorHandler')
 
@@ -195,7 +195,7 @@ def misc_5_internal(drv, datatype, nBands):
     return 1
 
 
-def misc_5():
+def test_misc_5():
 
     gdal.PushErrorHandler('CPLQuietErrorHandler')
 
@@ -387,7 +387,7 @@ def misc_6_internal(datatype, nBands, setDriversDone):
     return 'success'
 
 
-def misc_6():
+def test_misc_6():
 
     gdal.PushErrorHandler('CPLQuietErrorHandler')
 
@@ -443,7 +443,7 @@ def misc_6():
 # Test gdal.InvGeoTransform()
 
 
-def misc_7():
+def test_misc_7():
 
     try:
         gdal.InvGeoTransform
@@ -464,7 +464,7 @@ def misc_7():
 # Test gdal.ApplyGeoTransform()
 
 
-def misc_8():
+def test_misc_8():
 
     try:
         gdal.ApplyGeoTransform
@@ -482,7 +482,7 @@ def misc_8():
 # Test setting and retrieving > 2 GB values for GDAL max cache (#3689)
 
 
-def misc_9():
+def test_misc_9():
 
     old_val = gdal.GetCacheMax()
     gdal.SetCacheMax(3000000000)
@@ -500,7 +500,7 @@ def misc_9():
 ###############################################################################
 # Test VSIBufferedReaderHandle (fix done in r21358)
 
-def misc_10():
+def test_misc_10():
 
     try:
         os.remove('data/byte.tif.gz.properties')
@@ -531,7 +531,7 @@ def misc_10():
 # Test that we can open a symlink whose pointed filename isn't a real
 # file, but a filename that GDAL recognizes
 
-def misc_11():
+def test_misc_11():
 
     if not gdaltest.support_symlink():
         return 'skip'
@@ -559,7 +559,7 @@ def misc_11():
 # Test CreateCopy() with a target filename in a non-existing dir
 
 
-def misc_12():
+def test_misc_12():
 
     if int(gdal.VersionInfo('VERSION_NUM')) < 1900:
         gdaltest.post_reason('would crash')
@@ -629,7 +629,7 @@ def misc_12():
 # Test CreateCopy() with incompatible driver types (#5912)
 
 
-def misc_13():
+def test_misc_13():
 
     # Raster-only -> vector-only
     ds = gdal.Open('data/byte.tif')
@@ -654,7 +654,7 @@ def misc_13():
 ###############################################################################
 # Test ConfigureLogging()
 
-def misc_14():
+def test_misc_14():
     import collections
     import logging
 
@@ -729,7 +729,7 @@ def emit(self, record):
 ###############################################################################
 # Test SetErrorHandler
 
-def misc_15():
+def test_misc_15():
     messages0 = []
     def handle0(ecls, ecode, emsg):
         messages0.append((ecls, ecode, emsg))
@@ -800,7 +800,7 @@ def handle1(ecls, ecode, emsg):
 ###############################################################################
 
 
-def misc_cleanup():
+def test_misc_cleanup():
 
     try:
         shutil.rmtree('tmp/tmp')
@@ -810,22 +810,22 @@ def misc_cleanup():
     return 'success'
 
 
-gdaltest_list = [misc_1,
-                 misc_2,
-                 misc_3,
-                 misc_4,
-                 misc_5,
-                 misc_6,
-                 misc_7,
-                 misc_8,
-                 misc_9,
-                 misc_10,
-                 misc_11,
-                 misc_12,
-                 misc_13,
-                 misc_14,
-                 misc_15,
-                 misc_cleanup]
+gdaltest_list = [test_misc_1,
+                 test_misc_2,
+                 test_misc_3,
+                 test_misc_4,
+                 test_misc_5,
+                 test_misc_6,
+                 test_misc_7,
+                 test_misc_8,
+                 test_misc_9,
+                 test_misc_10,
+                 test_misc_11,
+                 test_misc_12,
+                 test_misc_13,
+                 test_misc_14,
+                 test_misc_15,
+                 test_misc_cleanup]
 
 # gdaltest_list = [ misc_6 ]
 
diff --git a/autotest/gcore/nodatamaskband.py b/autotest/gcore/nodatamaskband.py
index 6a26923eccb4..8f76f08033d1 100755
--- a/autotest/gcore/nodatamaskband.py
+++ b/autotest/gcore/nodatamaskband.py
@@ -38,7 +38,7 @@
 from osgeo import gdal
 
 
-def nodatamaskband_1():
+def test_nodatamaskband_1():
 
     for (dt, struct_type, v) in [(gdal.GDT_Byte, 'B', 255),
                                  (gdal.GDT_Int16, 'h', 32767),
@@ -115,7 +115,7 @@ def nodatamaskband_1():
 
 
 gdaltest_list = [
-    nodatamaskband_1,
+    test_nodatamaskband_1,
 ]
 
 if __name__ == '__main__':
diff --git a/autotest/gcore/numpy_rw.py b/autotest/gcore/numpy_rw.py
index 3d70b42e9e7b..c03fe81983d2 100755
--- a/autotest/gcore/numpy_rw.py
+++ b/autotest/gcore/numpy_rw.py
@@ -39,7 +39,7 @@
 # verify that we can load Numeric python, and find the Numpy driver.
 
 
-def numpy_rw_1():
+def test_numpy_rw_1():
 
     gdaltest.numpy_drv = None
     try:
@@ -61,7 +61,7 @@ def numpy_rw_1():
 # Load a test file into a memory Numpy array, and verify the checksum.
 
 
-def numpy_rw_2():
+def test_numpy_rw_2():
 
     if gdaltest.numpy_drv is None:
         return 'skip'
@@ -90,7 +90,7 @@ def numpy_rw_2():
 # Test loading complex data.
 
 
-def numpy_rw_3():
+def test_numpy_rw_3():
 
     if gdaltest.numpy_drv is None:
         return 'skip'
@@ -109,7 +109,7 @@ def numpy_rw_3():
 # Test a band read with downsampling.
 
 
-def numpy_rw_4():
+def test_numpy_rw_4():
 
     if gdaltest.numpy_drv is None:
         return 'skip'
@@ -128,7 +128,7 @@ def numpy_rw_4():
 # Test reading a multi-band file.
 
 
-def numpy_rw_5():
+def test_numpy_rw_5():
 
     if gdaltest.numpy_drv is None:
         return 'skip'
@@ -177,7 +177,7 @@ def numpy_rw_5():
 # Check that Band.ReadAsArray() can accept an already allocated array (#2658, #3028)
 
 
-def numpy_rw_6():
+def test_numpy_rw_6():
 
     if gdaltest.numpy_drv is None:
         return 'skip'
@@ -202,7 +202,7 @@ def numpy_rw_6():
 # Check that Dataset.ReadAsArray() can accept an already allocated array (#2658, #3028)
 
 
-def numpy_rw_7():
+def test_numpy_rw_7():
 
     if gdaltest.numpy_drv is None:
         return 'skip'
@@ -250,7 +250,7 @@ def numpy_rw_7():
 # Check that Dataset.ReadAsArray() with multi-band data
 
 
-def numpy_rw_8():
+def test_numpy_rw_8():
 
     if gdaltest.numpy_drv is None:
         return 'skip'
@@ -273,7 +273,7 @@ def numpy_rw_8():
 # Test Band.WriteArray()
 
 
-def numpy_rw_9():
+def test_numpy_rw_9():
 
     if gdaltest.numpy_drv is None:
         return 'skip'
@@ -298,7 +298,7 @@ def numpy_rw_9():
 # Test signed byte handling
 
 
-def numpy_rw_10():
+def test_numpy_rw_10():
 
     if gdaltest.numpy_drv is None:
         return 'skip'
@@ -336,7 +336,7 @@ def numpy_rw_10():
 # Test all datatypes
 
 
-def numpy_rw_11():
+def test_numpy_rw_11():
 
     if gdaltest.numpy_drv is None:
         return 'skip'
@@ -411,7 +411,7 @@ def numpy_rw_11():
 # Test array with slices (#3542)
 
 
-def numpy_rw_12():
+def test_numpy_rw_12():
 
     if gdaltest.numpy_drv is None:
         return 'skip'
@@ -444,7 +444,7 @@ def numpy_rw_12():
 # Test expected errors
 
 
-def numpy_rw_13():
+def test_numpy_rw_13():
 
     if gdaltest.numpy_drv is None:
         return 'skip'
@@ -672,7 +672,7 @@ def numpy_rw_14_progress_callback_2(pct, message, user_data):
     return 1  # 1 to continue, 0 to stop
 
 
-def numpy_rw_14():
+def test_numpy_rw_14():
 
     if gdaltest.numpy_drv is None:
         return 'skip'
@@ -756,7 +756,7 @@ def numpy_rw_14():
 # Test NumPy GetGeoTransform/SetGeoTransform
 
 
-def numpy_rw_15():
+def test_numpy_rw_15():
 
     if gdaltest.numpy_drv is None:
         return 'skip'
@@ -782,7 +782,7 @@ def numpy_rw_15():
 # Test errors of OpenArray()
 
 
-def numpy_rw_16():
+def test_numpy_rw_16():
 
     if gdaltest.numpy_drv is None:
         return 'skip'
@@ -820,7 +820,7 @@ def numpy_rw_16():
 # Test old deprecated way with gdal_array.GetArrayFilename()
 
 
-def numpy_rw_17():
+def test_numpy_rw_17():
 
     if gdaltest.numpy_drv is None:
         return 'skip'
@@ -856,7 +856,7 @@ def numpy_rw_17():
 # Test the pixel interleave options
 
 
-def numpy_rw_18():
+def test_numpy_rw_18():
 
     if gdaltest.numpy_drv is None:
         return 'skip'
@@ -886,32 +886,32 @@ def numpy_rw_18():
     return 'success'
 
 
-def numpy_rw_cleanup():
+def test_numpy_rw_cleanup():
     gdaltest.numpy_drv = None
 
     return 'success'
 
 
 gdaltest_list = [
-    numpy_rw_1,
-    numpy_rw_2,
-    numpy_rw_3,
-    numpy_rw_4,
-    numpy_rw_5,
-    numpy_rw_6,
-    numpy_rw_7,
-    numpy_rw_8,
-    numpy_rw_9,
-    numpy_rw_10,
-    numpy_rw_11,
-    numpy_rw_12,
-    numpy_rw_13,
-    numpy_rw_14,
-    numpy_rw_15,
-    numpy_rw_16,
-    numpy_rw_17,
-    numpy_rw_18,
-    numpy_rw_cleanup]
+    test_numpy_rw_1,
+    test_numpy_rw_2,
+    test_numpy_rw_3,
+    test_numpy_rw_4,
+    test_numpy_rw_5,
+    test_numpy_rw_6,
+    test_numpy_rw_7,
+    test_numpy_rw_8,
+    test_numpy_rw_9,
+    test_numpy_rw_10,
+    test_numpy_rw_11,
+    test_numpy_rw_12,
+    test_numpy_rw_13,
+    test_numpy_rw_14,
+    test_numpy_rw_15,
+    test_numpy_rw_16,
+    test_numpy_rw_17,
+    test_numpy_rw_18,
+    test_numpy_rw_cleanup]
 
 if __name__ == '__main__':
 
diff --git a/autotest/gcore/overviewds.py b/autotest/gcore/overviewds.py
index b100105d82a1..a641a328f652 100755
--- a/autotest/gcore/overviewds.py
+++ b/autotest/gcore/overviewds.py
@@ -41,7 +41,7 @@
 # Error cases
 
 
-def overviewds_1():
+def test_overviewds_1():
     ds = gdal.OpenEx('data/byte.tif', open_options=['OVERVIEW_LEVEL=-1'])
     if ds is not None:
         return 'fail'
@@ -55,7 +55,7 @@ def overviewds_1():
 # Nominal cases
 
 
-def overviewds_2():
+def test_overviewds_2():
 
     shutil.copy('data/byte.tif', 'tmp')
     ds = gdal.Open('tmp/byte.tif')
@@ -130,7 +130,7 @@ def overviewds_2():
 # Test GCP
 
 
-def overviewds_3():
+def test_overviewds_3():
 
     src_ds = gdal.Open('data/byte.tif')
     ds = gdal.GetDriverByName('GTiff').CreateCopy('tmp/byte.tif', src_ds)
@@ -192,7 +192,7 @@ def myfloat(s):
     return float(s)
 
 
-def overviewds_4():
+def test_overviewds_4():
 
     shutil.copy('data/byte.tif', 'tmp/byte.tif')
     shutil.copy('data/test_rpc.txt', 'tmp/byte_rpc.txt')
@@ -250,7 +250,7 @@ def overviewds_4():
 # Test GEOLOCATION
 
 
-def overviewds_5():
+def test_overviewds_5():
 
     shutil.copy('data/sstgeo.tif', 'tmp/sstgeo.tif')
     shutil.copy('data/sstgeo.vrt', 'tmp/sstgeo.vrt')
@@ -311,7 +311,7 @@ def overviewds_5():
 # Test VRT
 
 
-def overviewds_6():
+def test_overviewds_6():
 
     shutil.copy('data/byte.tif', 'tmp')
     ds = gdal.Open('tmp/byte.tif')
@@ -340,7 +340,7 @@ def overviewds_6():
 # Cleanup
 
 
-def overviewds_cleanup():
+def test_overviewds_cleanup():
 
     gdal.GetDriverByName('GTiff').Delete('tmp/byte.tif')
     try:
@@ -361,13 +361,13 @@ def overviewds_cleanup():
     return 'success'
 
 
-gdaltest_list = [overviewds_1,
-                 overviewds_2,
-                 overviewds_3,
-                 overviewds_4,
-                 overviewds_5,
-                 overviewds_6,
-                 overviewds_cleanup]
+gdaltest_list = [test_overviewds_1,
+                 test_overviewds_2,
+                 test_overviewds_3,
+                 test_overviewds_4,
+                 test_overviewds_5,
+                 test_overviewds_6,
+                 test_overviewds_cleanup]
 
 if __name__ == '__main__':
 
diff --git a/autotest/gcore/pam.py b/autotest/gcore/pam.py
index b48848e6bef1..271ac4c22afa 100755
--- a/autotest/gcore/pam.py
+++ b/autotest/gcore/pam.py
@@ -43,7 +43,7 @@
 # Check that we can read PAM metadata for existing PNM file.
 
 
-def pam_1():
+def test_pam_1():
 
     gdaltest.pam_setting = gdal.GetConfigOption('GDAL_PAM_ENABLED', "NULL")
     gdal.SetConfigOption('GDAL_PAM_ENABLED', 'YES')
@@ -81,7 +81,7 @@ def pam_1():
 # Verify that we can write XML to a new file.
 
 
-def pam_2():
+def test_pam_2():
 
     driver = gdal.GetDriverByName('PNM')
     ds = driver.Create('tmp/pam.pnm', 10, 10)
@@ -105,7 +105,7 @@ def pam_2():
 # Check that we can read PAM metadata for existing PNM file.
 
 
-def pam_3():
+def test_pam_3():
 
     ds = gdal.Open("tmp/pam.pnm")
 
@@ -158,7 +158,7 @@ def pam_3():
 #
 
 
-def pam_4():
+def test_pam_4():
 
     # Copy test dataset to tmp directory so that the .aux.xml file
     # won't be rewritten with the statistics in the master dataset.
@@ -182,7 +182,7 @@ def pam_4():
 #
 
 
-def pam_5():
+def test_pam_5():
 
     ds = gdal.Open('data/sasha.tif')
     filelist = ds.GetFileList()
@@ -201,7 +201,7 @@ def pam_5():
 #
 
 
-def pam_6():
+def test_pam_6():
 
     ds = gdal.Open('data/f2r23.tif')
     if ds.GetRasterBand(1).GetNoDataValue() != 0:
@@ -220,7 +220,7 @@ def pam_6():
 #
 
 
-def pam_7():
+def test_pam_7():
 
     gdal.SetConfigOption('GDAL_PAM_ENABLED', 'NO')
 
@@ -246,7 +246,7 @@ def pam_7():
 #
 
 
-def pam_8():
+def test_pam_8():
 
     gdal.SetConfigOption('GDAL_PAM_ENABLED', 'YES')
 
@@ -271,7 +271,7 @@ def pam_8():
 #
 
 
-def pam_9():
+def test_pam_9():
 
     ds = gdal.GetDriverByName('GTiff').Create('/vsimem/pam_9.tif', 1, 1, 1)
     ds = None
@@ -308,7 +308,7 @@ def pam_9():
 # Test serializing and deserializing of various band metadata
 
 
-def pam_10():
+def test_pam_10():
 
     src_ds = gdal.Open('data/testserialization.asc')
     ds = gdal.GetDriverByName('AAIGRID').CreateCopy('/vsimem/pam_10.asc', src_ds)
@@ -391,7 +391,7 @@ def pam_10():
 # Test PamProxyDb mechanism
 
 
-def pam_11():
+def test_pam_11():
 
     # Create a read-only directory
     try:
@@ -456,7 +456,7 @@ def pam_11():
 # Test histogram with 64bit counts
 
 
-def pam_12():
+def test_pam_12():
 
     shutil.copy('data/byte.tif', 'tmp')
     open('tmp/byte.tif.aux.xml', 'wt').write("""<PAMDataset>
@@ -505,7 +505,7 @@ def pam_12():
 #
 
 
-def pam_13():
+def test_pam_13():
 
     gdal.SetConfigOption('GDAL_PAM_ENABLED', 'NO')
 
@@ -543,7 +543,7 @@ def pam_13():
 ###############################################################################
 # Cleanup.
 
-def pam_cleanup():
+def test_pam_cleanup():
     gdaltest.clean_tmp()
     if gdaltest.pam_setting != 'NULL':
         gdal.SetConfigOption('GDAL_PAM_ENABLED', gdaltest.pam_setting)
@@ -564,20 +564,20 @@ def pam_cleanup():
 
 
 gdaltest_list = [
-    pam_1,
-    pam_2,
-    pam_3,
-    pam_4,
-    pam_5,
-    pam_6,
-    pam_7,
-    pam_8,
-    pam_9,
-    pam_10,
-    pam_11,
-    pam_12,
-    pam_13,
-    pam_cleanup]
+    test_pam_1,
+    test_pam_2,
+    test_pam_3,
+    test_pam_4,
+    test_pam_5,
+    test_pam_6,
+    test_pam_7,
+    test_pam_8,
+    test_pam_9,
+    test_pam_10,
+    test_pam_11,
+    test_pam_12,
+    test_pam_13,
+    test_pam_cleanup]
 
 if __name__ == '__main__':
 
diff --git a/autotest/gcore/pixfun.py b/autotest/gcore/pixfun.py
index a277636b50f2..f721d310e5ff 100755
--- a/autotest/gcore/pixfun.py
+++ b/autotest/gcore/pixfun.py
@@ -45,7 +45,7 @@
 # Verify real part extraction from a complex dataset.
 
 
-def pixfun_real_c():
+def test_pixfun_real_c():
 
     if not numpy_available:
         return 'skip'
@@ -73,7 +73,7 @@ def pixfun_real_c():
 ###############################################################################
 # Verify real part extraction from a complex dataset.
 
-def pixfun_real_r():
+def test_pixfun_real_r():
 
     if not numpy_available:
         return 'skip'
@@ -101,7 +101,7 @@ def pixfun_real_r():
 ###############################################################################
 # Verify imaginary part extraction from a complex dataset.
 
-def pixfun_imag_c():
+def test_pixfun_imag_c():
 
     if not numpy_available:
         return 'skip'
@@ -139,7 +139,7 @@ def pixfun_imag_c():
 ###############################################################################
 # Verify imaginary part extraction from a real dataset.
 
-def pixfun_imag_r():
+def test_pixfun_imag_r():
 
     if not numpy_available:
         return 'skip'
@@ -160,7 +160,7 @@ def pixfun_imag_r():
 ###############################################################################
 # Verify imaginary part extraction from a real dataset.
 
-def pixfun_complex():
+def test_pixfun_complex():
 
     if not numpy_available:
         return 'skip'
@@ -188,7 +188,7 @@ def pixfun_complex():
 ###############################################################################
 # Verify modulus extraction from a complex (float) dataset.
 
-def pixfun_mod_c():
+def test_pixfun_mod_c():
 
     if not numpy_available:
         return 'skip'
@@ -216,7 +216,7 @@ def pixfun_mod_c():
 ###############################################################################
 # Verify modulus extraction from a real (integer type) dataset.
 
-def pixfun_mod_r():
+def test_pixfun_mod_r():
 
     if not numpy_available:
         return 'skip'
@@ -244,7 +244,7 @@ def pixfun_mod_r():
 ###############################################################################
 # Verify phase extraction from a complex dataset.
 
-def pixfun_phase_c():
+def test_pixfun_phase_c():
 
     if not numpy_available:
         return 'skip'
@@ -274,7 +274,7 @@ def pixfun_phase_c():
 ###############################################################################
 # Verify phase extraction from a real dataset.
 
-def pixfun_phase_r():
+def test_pixfun_phase_r():
 
     if not numpy_available:
         return 'skip'
@@ -302,7 +302,7 @@ def pixfun_phase_r():
 ###############################################################################
 # Verify cmplex conjugare computation on a complex dataset.
 
-def pixfun_conj_c():
+def test_pixfun_conj_c():
 
     if not numpy_available:
         return 'skip'
@@ -330,7 +330,7 @@ def pixfun_conj_c():
 ###############################################################################
 # Verify cmplex conjugare computation on a real dataset.
 
-def pixfun_conj_r():
+def test_pixfun_conj_r():
 
     if not numpy_available:
         return 'skip'
@@ -358,7 +358,7 @@ def pixfun_conj_r():
 ###############################################################################
 # Verify the sum of 3 (real) datasets.
 
-def pixfun_sum_r():
+def test_pixfun_sum_r():
 
     if not numpy_available:
         return 'skip'
@@ -389,7 +389,7 @@ def pixfun_sum_r():
 ###############################################################################
 # Verify the sum of 3 (two complex and one real) datasets.
 
-def pixfun_sum_c():
+def test_pixfun_sum_c():
 
     if not numpy_available:
         return 'skip'
@@ -420,7 +420,7 @@ def pixfun_sum_c():
 ###############################################################################
 # Verify the difference of 2 (real) datasets.
 
-def pixfun_diff_r():
+def test_pixfun_diff_r():
 
     if not numpy_available:
         return 'skip'
@@ -455,7 +455,7 @@ def pixfun_diff_r():
 ###############################################################################
 # Verify the difference of 2 (complex) datasets.
 
-def pixfun_diff_c():
+def test_pixfun_diff_c():
 
     if not numpy_available:
         return 'skip'
@@ -490,7 +490,7 @@ def pixfun_diff_c():
 ###############################################################################
 # Verify the product of 3 (real) datasets.
 
-def pixfun_mul_r():
+def test_pixfun_mul_r():
 
     if not numpy_available:
         return 'skip'
@@ -521,7 +521,7 @@ def pixfun_mul_r():
 ###############################################################################
 # Verify the product of 2 (complex) datasets.
 
-def pixfun_mul_c():
+def test_pixfun_mul_c():
 
     if not numpy_available:
         return 'skip'
@@ -549,7 +549,7 @@ def pixfun_mul_c():
 ###############################################################################
 # Verify the product with complex conjugate of a complex datasets.
 
-def pixfun_cmul_c():
+def test_pixfun_cmul_c():
 
     if not numpy_available:
         return 'skip'
@@ -577,7 +577,7 @@ def pixfun_cmul_c():
 ###############################################################################
 # Verify the product with complex conjugate of two real datasets.
 
-def pixfun_cmul_r():
+def test_pixfun_cmul_r():
 
     if not numpy_available:
         return 'skip'
@@ -614,7 +614,7 @@ def pixfun_cmul_r():
 ###############################################################################
 # Verify computation of the inverse of a real datasets.
 
-def pixfun_inv_r():
+def test_pixfun_inv_r():
 
     if not numpy_available:
         return 'skip'
@@ -643,7 +643,7 @@ def pixfun_inv_r():
 ###############################################################################
 # Verify computation of the inverse of a complex datasets.
 
-def pixfun_inv_c():
+def test_pixfun_inv_c():
 
     if not numpy_available:
         return 'skip'
@@ -675,7 +675,7 @@ def pixfun_inv_c():
 ###############################################################################
 # Verify intensity computation of a complex dataset.
 
-def pixfun_intensity_c():
+def test_pixfun_intensity_c():
 
     if not numpy_available:
         return 'skip'
@@ -703,7 +703,7 @@ def pixfun_intensity_c():
 ###############################################################################
 # Verify intensity computation of real dataset.
 
-def pixfun_intensity_r():
+def test_pixfun_intensity_r():
 
     if not numpy_available:
         return 'skip'
@@ -731,7 +731,7 @@ def pixfun_intensity_r():
 ###############################################################################
 # Verify square root computation.
 
-def pixfun_sqrt():
+def test_pixfun_sqrt():
 
     if not numpy_available:
         return 'skip'
@@ -759,7 +759,7 @@ def pixfun_sqrt():
 ###############################################################################
 # Verify logarithm computation of real dataset.
 
-def pixfun_log10_r():
+def test_pixfun_log10_r():
 
     if not numpy_available:
         return 'skip'
@@ -787,7 +787,7 @@ def pixfun_log10_r():
 ###############################################################################
 # Verify logarithm computation of imag dataset.
 
-def pixfun_log10_c():
+def test_pixfun_log10_c():
 
     if not numpy_available:
         return 'skip'
@@ -814,7 +814,7 @@ def pixfun_log10_c():
 ###############################################################################
 # Verify dB computation of real dataset.
 
-def pixfun_dB_r():
+def test_pixfun_dB_r():
 
     if not numpy_available:
         return 'skip'
@@ -842,7 +842,7 @@ def pixfun_dB_r():
 ###############################################################################
 # Verify dB computation of imag dataset.
 
-def pixfun_dB_c():
+def test_pixfun_dB_c():
 
     if not numpy_available:
         return 'skip'
@@ -869,7 +869,7 @@ def pixfun_dB_c():
 ###############################################################################
 # Verify conversion from dB to amplitude.
 
-def pixfun_dB2amp():
+def test_pixfun_dB2amp():
 
     if not numpy_available:
         return 'skip'
@@ -898,7 +898,7 @@ def pixfun_dB2amp():
 ###############################################################################
 # Verify conversion from dB to power.
 
-def pixfun_dB2pow():
+def test_pixfun_dB2pow():
 
     if not numpy_available:
         return 'skip'
@@ -927,36 +927,36 @@ def pixfun_dB2pow():
 ###############################################################################
 
 gdaltest_list = [
-    pixfun_real_c,
-    pixfun_real_r,
-    pixfun_imag_c,
-    pixfun_imag_r,
-    pixfun_complex,
-    pixfun_mod_c,
-    pixfun_mod_r,
-    pixfun_phase_c,
-    pixfun_phase_r,
-    pixfun_conj_c,
-    pixfun_conj_r,
-    pixfun_sum_r,
-    pixfun_sum_c,
-    pixfun_diff_r,
-    pixfun_diff_c,
-    pixfun_mul_r,
-    pixfun_mul_c,
-    pixfun_cmul_c,
-    pixfun_cmul_r,
-    pixfun_inv_r,
-    pixfun_inv_c,
-    pixfun_intensity_c,
-    pixfun_intensity_r,
-    pixfun_sqrt,
-    pixfun_log10_r,
-    pixfun_log10_c,
-    pixfun_dB_r,
-    pixfun_dB_c,
-    pixfun_dB2amp,
-    pixfun_dB2pow,
+    test_pixfun_real_c,
+    test_pixfun_real_r,
+    test_pixfun_imag_c,
+    test_pixfun_imag_r,
+    test_pixfun_complex,
+    test_pixfun_mod_c,
+    test_pixfun_mod_r,
+    test_pixfun_phase_c,
+    test_pixfun_phase_r,
+    test_pixfun_conj_c,
+    test_pixfun_conj_r,
+    test_pixfun_sum_r,
+    test_pixfun_sum_c,
+    test_pixfun_diff_r,
+    test_pixfun_diff_c,
+    test_pixfun_mul_r,
+    test_pixfun_mul_c,
+    test_pixfun_cmul_c,
+    test_pixfun_cmul_r,
+    test_pixfun_inv_r,
+    test_pixfun_inv_c,
+    test_pixfun_intensity_c,
+    test_pixfun_intensity_r,
+    test_pixfun_sqrt,
+    test_pixfun_log10_r,
+    test_pixfun_log10_c,
+    test_pixfun_dB_r,
+    test_pixfun_dB_c,
+    test_pixfun_dB2amp,
+    test_pixfun_dB2pow,
 ]
 
 
diff --git a/autotest/gcore/rasterio.py b/autotest/gcore/rasterio.py
index 5d7a9f2bdae7..d720c1816fae 100755
--- a/autotest/gcore/rasterio.py
+++ b/autotest/gcore/rasterio.py
@@ -40,7 +40,7 @@
 # Test writing a 1x1 buffer to a 10x6 raster and read it back
 
 
-def rasterio_1():
+def test_rasterio_1():
     data = 'A'.encode('ascii')
 
     drv = gdal.GetDriverByName('GTiff')
@@ -70,7 +70,7 @@ def rasterio_1():
 # Test writing a 5x4 buffer to a 10x6 raster and read it back
 
 
-def rasterio_2():
+def test_rasterio_2():
     data = 'AAAAAAAAAAAAAAAAAAAA'.encode('ascii')
 
     drv = gdal.GetDriverByName('GTiff')
@@ -100,7 +100,7 @@ def rasterio_2():
 # Test extensive read & writes into a non tiled raster
 
 
-def rasterio_3():
+def test_rasterio_3():
 
     data = [['' for i in range(4)] for i in range(5)]
     for xsize in range(5):
@@ -144,7 +144,7 @@ def rasterio_3():
 # Test extensive read & writes into a tiled raster
 
 
-def rasterio_4():
+def test_rasterio_4():
 
     data = ['' for i in range(5 * 4)]
     for size in range(5 * 4):
@@ -196,7 +196,7 @@ def rasterio_4():
 # Test error cases of ReadRaster()
 
 
-def rasterio_5():
+def test_rasterio_5():
 
     ds = gdal.Open('data/byte.tif')
 
@@ -282,7 +282,7 @@ def rasterio_5():
 # Test error cases of WriteRaster()
 
 
-def rasterio_6():
+def test_rasterio_6():
 
     ds = gdal.GetDriverByName('MEM').Create('', 2, 2)
 
@@ -332,7 +332,7 @@ def rasterio_6():
 # Test that default window reading works via ReadRaster()
 
 
-def rasterio_7():
+def test_rasterio_7():
 
     ds = gdal.Open('data/byte.tif')
 
@@ -378,7 +378,7 @@ def rasterio_8_progress_callback_2(pct, message, user_data):
     return 1  # 1 to continue, 0 to stop
 
 
-def rasterio_8():
+def test_rasterio_8():
 
     ds = gdal.Open('data/byte.tif')
 
@@ -529,7 +529,7 @@ def rasterio_9_checksum(data, buf_xsize, buf_ysize, data_type=gdal.GDT_Byte):
     return cs
 
 
-def rasterio_9():
+def test_rasterio_9():
     ds = gdal.Open('data/byte.tif')
 
     # Test RasterBand.ReadRaster, with Bilinear
@@ -806,7 +806,7 @@ def rasterio_9():
 # Test error when getting a block
 
 
-def rasterio_10():
+def test_rasterio_10():
     ds = gdal.Open('data/byte_truncated.tif')
 
     gdal.PushErrorHandler()
@@ -839,7 +839,7 @@ def rasterio_10():
 # Test cubic resampling and nbits
 
 
-def rasterio_11():
+def test_rasterio_11():
 
     try:
         from osgeo import gdalnumeric
@@ -882,7 +882,7 @@ def rasterio_12_progress_callback(pct, message, user_data):
     return 1  # 1 to continue, 0 to stop
 
 
-def rasterio_12():
+def test_rasterio_12():
 
     try:
         from osgeo import gdalnumeric
@@ -944,7 +944,7 @@ def rasterio_12():
 # Test cubic resampling with masking
 
 
-def rasterio_13():
+def test_rasterio_13():
 
     try:
         from osgeo import gdalnumeric
@@ -975,7 +975,7 @@ def rasterio_13():
 # Test average downsampling by a factor of 2 on exact boundaries
 
 
-def rasterio_14():
+def test_rasterio_14():
 
     gdal.FileFromMemBuffer('/vsimem/rasterio_14.asc',
                            """ncols        6
@@ -1039,7 +1039,7 @@ def rasterio_14():
 # Test average oversampling by an integer factor (should behave like nearest)
 
 
-def rasterio_15():
+def test_rasterio_15():
 
     gdal.FileFromMemBuffer('/vsimem/rasterio_15.asc',
                            """ncols        2
@@ -1071,7 +1071,7 @@ def rasterio_15():
 # Test mode downsampling by a factor of 2 on exact boundaries
 
 
-def rasterio_16():
+def test_rasterio_16():
 
     gdal.FileFromMemBuffer('/vsimem/rasterio_16.asc',
                            """ncols        6
@@ -1102,7 +1102,7 @@ def rasterio_16():
 ###############################################################################
 
 
-def rasterio_lanczos_nodata():
+def test_rasterio_lanczos_nodata():
 
     ds = gdal.Open('data/rasterio_lanczos_nodata.tif')
 
@@ -1129,7 +1129,7 @@ def rasterio_lanczos_nodata():
 ###############################################################################
 
 
-def rasterio_resampled_value_is_nodata():
+def test_rasterio_resampled_value_is_nodata():
 
     gdal.FileFromMemBuffer('/vsimem/in.asc',
 """ncols        4
@@ -1207,24 +1207,24 @@ def rasterio_resampled_value_is_nodata():
     return 'success'
 
 gdaltest_list = [
-    rasterio_1,
-    rasterio_2,
-    rasterio_3,
-    rasterio_4,
-    rasterio_5,
-    rasterio_6,
-    rasterio_7,
-    rasterio_8,
-    rasterio_9,
-    rasterio_10,
-    rasterio_11,
-    rasterio_12,
-    rasterio_13,
-    rasterio_14,
-    rasterio_15,
-    rasterio_16,
-    rasterio_lanczos_nodata,
-    rasterio_resampled_value_is_nodata,
+    test_rasterio_1,
+    test_rasterio_2,
+    test_rasterio_3,
+    test_rasterio_4,
+    test_rasterio_5,
+    test_rasterio_6,
+    test_rasterio_7,
+    test_rasterio_8,
+    test_rasterio_9,
+    test_rasterio_10,
+    test_rasterio_11,
+    test_rasterio_12,
+    test_rasterio_13,
+    test_rasterio_14,
+    test_rasterio_15,
+    test_rasterio_16,
+    test_rasterio_lanczos_nodata,
+    test_rasterio_resampled_value_is_nodata,
 ]
 
 # gdaltest_list = [ rasterio_16 ]
diff --git a/autotest/gcore/rat.py b/autotest/gcore/rat.py
index 752380dcb07a..288493c92180 100755
--- a/autotest/gcore/rat.py
+++ b/autotest/gcore/rat.py
@@ -40,7 +40,7 @@
 # Create a raster attribute table.
 
 
-def rat_1():
+def test_rat_1():
 
     gdaltest.saved_rat = None
 
@@ -98,7 +98,7 @@ def rat_1():
 # Save a RAT in a file, written to .aux.xml, read it back and check it.
 
 
-def rat_2():
+def test_rat_2():
 
     if gdaltest.saved_rat is None:
         return 'skip'
@@ -162,7 +162,7 @@ def rat_2():
 # Save an empty RAT (#5451)
 
 
-def rat_3():
+def test_rat_3():
 
     ds = gdal.GetDriverByName('GTiff').Create('/vsimem/rat_3.tif', 1, 1)
     ds.GetRasterBand(1).SetDefaultRAT(gdal.RasterAttributeTable())
@@ -175,9 +175,9 @@ def rat_3():
 
 
 gdaltest_list = [
-    rat_1,
-    rat_2,
-    rat_3,
+    test_rat_1,
+    test_rat_2,
+    test_rat_3,
     None]
 
 if __name__ == '__main__':
diff --git a/autotest/gcore/rfc30.py b/autotest/gcore/rfc30.py
index d11fa0f6df57..8b04388963db 100755
--- a/autotest/gcore/rfc30.py
+++ b/autotest/gcore/rfc30.py
@@ -40,7 +40,7 @@
 # Try opening a file with a Chinese name using the Python UTF-8 string.
 
 
-def rfc30_1():
+def test_rfc30_1():
 
     if version_info >= (3, 0, 0):
         filename = 'xx\u4E2D\u6587.\u4E2D\u6587'
@@ -76,7 +76,7 @@ def rfc30_1():
 # Try creating, then renaming a utf-8 named file.
 
 
-def rfc30_2():
+def test_rfc30_2():
 
     if version_info >= (3, 0, 0):
         filename = 'tmp/yy\u4E2D\u6587.\u4E2D\u6587'
@@ -133,7 +133,7 @@ def rfc30_2():
     return 'success'
 
 
-gdaltest_list = [rfc30_1, rfc30_2]
+gdaltest_list = [test_rfc30_1, test_rfc30_2]
 
 if __name__ == '__main__':
 
diff --git a/autotest/gcore/testnonboundtoswig.py b/autotest/gcore/testnonboundtoswig.py
index 3751c9de9f86..c230852740a4 100755
--- a/autotest/gcore/testnonboundtoswig.py
+++ b/autotest/gcore/testnonboundtoswig.py
@@ -56,7 +56,7 @@ def find_libgdal():
 # Init
 
 
-def testnonboundtoswig_init():
+def test_testnonboundtoswig_init():
 
     global gdal_handle_init, gdal_handle, gdal_handle_stdcall
 
@@ -114,7 +114,7 @@ def testnonboundtoswig_init():
 def GDALDestroyDriverManager():
 
     if gdal_handle is None:
-        testnonboundtoswig_init()
+        test_testnonboundtoswig_init()
 
     if gdal_handle is None:
         return 'skip'
@@ -133,7 +133,7 @@ def GDALDestroyDriverManager():
 def OGRCleanupAll():
 
     if gdal_handle is None:
-        testnonboundtoswig_init()
+        test_testnonboundtoswig_init()
 
     if gdal_handle is None:
         return 'skip'
@@ -152,7 +152,7 @@ def OGRCleanupAll():
 def OSRCleanup():
 
     if gdal_handle is None:
-        testnonboundtoswig_init()
+        test_testnonboundtoswig_init()
 
     if gdal_handle is None:
         return 'skip'
@@ -168,7 +168,7 @@ def OSRCleanup():
 # Test GDALSimpleImageWarp
 
 
-def testnonboundtoswig_GDALSimpleImageWarp():
+def test_testnonboundtoswig_GDALSimpleImageWarp():
 
     if gdal_handle is None:
         return 'skip'
@@ -307,7 +307,7 @@ def my_pyDerivedPixelFunc(papoSources, nSources, pData, nBufXSize, nBufYSize, eS
     return 0
 
 
-def testnonboundtoswig_VRTDerivedBands():
+def test_testnonboundtoswig_VRTDerivedBands():
 
     if gdal_handle is None:
         return 'skip'
@@ -376,9 +376,9 @@ def testnonboundtoswig_VRTDerivedBands():
     return 'success'
 
 
-gdaltest_list = [testnonboundtoswig_init,
-                 testnonboundtoswig_GDALSimpleImageWarp,
-                 testnonboundtoswig_VRTDerivedBands]
+gdaltest_list = [test_testnonboundtoswig_init,
+                 test_testnonboundtoswig_GDALSimpleImageWarp,
+                 test_testnonboundtoswig_VRTDerivedBands]
 
 if __name__ == '__main__':
 
diff --git a/autotest/gcore/thread_test.py b/autotest/gcore/thread_test.py
index 24ad6b8a37de..bfe07c8e0a6e 100755
--- a/autotest/gcore/thread_test.py
+++ b/autotest/gcore/thread_test.py
@@ -56,7 +56,7 @@ def thread_test_1_worker(args_dict):
         gdal.PopErrorHandler()
 
 
-def thread_test_1():
+def test_thread_test_1():
 
     try:
         from osgeo import gdalnumeric
@@ -82,7 +82,7 @@ def thread_test_1():
     return ret
 
 
-gdaltest_list = [thread_test_1]
+gdaltest_list = [test_thread_test_1]
 
 
 if __name__ == '__main__':
diff --git a/autotest/gcore/tiff_ovr.py b/autotest/gcore/tiff_ovr.py
index 4c404f22d4ec..9324d976606b 100755
--- a/autotest/gcore/tiff_ovr.py
+++ b/autotest/gcore/tiff_ovr.py
@@ -94,7 +94,7 @@ def tiff_ovr_check(src_ds):
 # later.  Build overviews on it.
 
 
-def tiff_ovr_1(both_endian):
+def test_tiff_ovr_1(both_endian):
 
     gdaltest.tiff_drv = gdal.GetDriverByName('GTiff')
 
@@ -130,7 +130,7 @@ def tiff_ovr_1(both_endian):
 ###############################################################################
 # Open file and verify some characteristics of the overviews.
 
-def tiff_ovr_2(both_endian):
+def test_tiff_ovr_2(both_endian):
 
     src_ds = gdal.Open('tmp/mfloat32.tif')
 
@@ -148,7 +148,7 @@ def tiff_ovr_2(both_endian):
 # Open target file in update mode, and create internal overviews.
 
 
-def tiff_ovr_3(both_endian):
+def test_tiff_ovr_3(both_endian):
 
     os.unlink('tmp/mfloat32.tif.ovr')
 
@@ -173,14 +173,14 @@ def tiff_ovr_3(both_endian):
 # Re-open target file and check overviews
 
 
-def tiff_ovr_3bis(both_endian):
-    return tiff_ovr_2(both_endian)
+def test_tiff_ovr_3bis(both_endian):
+    return test_tiff_ovr_2(both_endian)
 
 ###############################################################################
 # Test generation
 
 
-def tiff_ovr_4(both_endian):
+def test_tiff_ovr_4(both_endian):
 
     shutil.copyfile('data/oddsize_1bit2b.tif', 'tmp/ovr4.tif')
 
@@ -256,7 +256,7 @@ def tiff_ovr_4(both_endian):
 ###############################################################################
 # Test average overview generation with nodata.
 
-def tiff_ovr_5(both_endian):
+def test_tiff_ovr_5(both_endian):
 
     shutil.copyfile('data/nodata_byte.tif', 'tmp/ovr5.tif')
 
@@ -282,7 +282,7 @@ def tiff_ovr_5(both_endian):
 # Same as tiff_ovr_5 but with USE_RDD=YES to force external overview
 
 
-def tiff_ovr_6(both_endian):
+def test_tiff_ovr_6(both_endian):
 
     shutil.copyfile('data/nodata_byte.tif', 'tmp/ovr6.tif')
 
@@ -319,7 +319,7 @@ def tiff_ovr_6(both_endian):
 ###############################################################################
 # Check nearest resampling on a dataset with a raster band that has a color table
 
-def tiff_ovr_7(both_endian):
+def test_tiff_ovr_7(both_endian):
 
     shutil.copyfile('data/test_average_palette.tif', 'tmp/test_average_palette.tif')
 
@@ -349,7 +349,7 @@ def tiff_ovr_7(both_endian):
 # Check average resampling on a dataset with a raster band that has a color table
 
 
-def tiff_ovr_8(both_endian):
+def test_tiff_ovr_8(both_endian):
 
     shutil.copyfile('data/test_average_palette.tif', 'tmp/test_average_palette.tif')
 
@@ -381,7 +381,7 @@ def tiff_ovr_8(both_endian):
 # Will also check that pixel interleaving is automatically selected (#3064)
 
 
-def tiff_ovr_9(both_endian):
+def test_tiff_ovr_9(both_endian):
 
     drv = gdal.GetDriverByName('GTiff')
     md = drv.GetMetadata()
@@ -433,7 +433,7 @@ def tiff_ovr_9(both_endian):
 # Similar to tiff_ovr_9 but with internal overviews.
 
 
-def tiff_ovr_10(both_endian):
+def test_tiff_ovr_10(both_endian):
 
     src_ds = gdal.Open('data/rgbsmall.tif', gdal.GA_ReadOnly)
 
@@ -473,7 +473,7 @@ def tiff_ovr_10(both_endian):
 # Overview on a dataset with NODATA_VALUES
 
 
-def tiff_ovr_11(both_endian):
+def test_tiff_ovr_11(both_endian):
 
     src_ds = gdal.Open('data/test_nodatavalues.tif', gdal.GA_ReadOnly)
 
@@ -520,7 +520,7 @@ def tiff_ovr_11(both_endian):
 # code
 
 
-def tiff_ovr_12(both_endian):
+def test_tiff_ovr_12(both_endian):
 
     src_ds = gdal.Open('data/test_nodatavalues.tif', gdal.GA_ReadOnly)
 
@@ -566,7 +566,7 @@ def tiff_ovr_12(both_endian):
 ###############################################################################
 # Test gaussian resampling
 
-def tiff_ovr_13(both_endian):
+def test_tiff_ovr_13(both_endian):
 
     gdaltest.tiff_drv = gdal.GetDriverByName('GTiff')
 
@@ -604,7 +604,7 @@ def tiff_ovr_13(both_endian):
 # Check gauss resampling on a dataset with a raster band that has a color table
 
 
-def tiff_ovr_14(both_endian):
+def test_tiff_ovr_14(both_endian):
 
     shutil.copyfile('data/test_average_palette.tif', 'tmp/test_gauss_palette.tif')
 
@@ -633,7 +633,7 @@ def tiff_ovr_14(both_endian):
 # code
 
 
-def tiff_ovr_15(both_endian):
+def test_tiff_ovr_15(both_endian):
 
     src_ds = gdal.Open('data/test_nodatavalues.tif', gdal.GA_ReadOnly)
 
@@ -679,7 +679,7 @@ def tiff_ovr_15(both_endian):
 ###############################################################################
 # Test mode resampling on non-byte dataset
 
-def tiff_ovr_16(both_endian):
+def test_tiff_ovr_16(both_endian):
 
     gdaltest.tiff_drv = gdal.GetDriverByName('GTiff')
 
@@ -720,7 +720,7 @@ def tiff_ovr_16(both_endian):
 ###############################################################################
 # Test mode resampling on a byte dataset
 
-def tiff_ovr_17(both_endian):
+def test_tiff_ovr_17(both_endian):
 
     shutil.copyfile('data/byte.tif', 'tmp/ovr17.tif')
 
@@ -751,7 +751,7 @@ def tiff_ovr_17(both_endian):
 # Check mode resampling on a dataset with a raster band that has a color table
 
 
-def tiff_ovr_18(both_endian):
+def test_tiff_ovr_18(both_endian):
 
     shutil.copyfile('data/test_average_palette.tif', 'tmp/ovr18.tif')
 
@@ -781,7 +781,7 @@ def tiff_ovr_18(both_endian):
 # if BigTIFF is not supported (this is a sign of an older libtiff...)
 
 
-def tiff_ovr_19(both_endian):
+def test_tiff_ovr_19(both_endian):
 
     drv = gdal.GetDriverByName('GTiff')
     md = drv.GetMetadata()
@@ -819,7 +819,7 @@ def tiff_ovr_19(both_endian):
 ###############################################################################
 # Test BIGTIFF_OVERVIEW=YES option
 
-def tiff_ovr_20(both_endian):
+def test_tiff_ovr_20(both_endian):
 
     drv = gdal.GetDriverByName('GTiff')
     md = drv.GetMetadata()
@@ -857,7 +857,7 @@ def tiff_ovr_20(both_endian):
 ###############################################################################
 # Test BIGTIFF_OVERVIEW=IF_NEEDED option
 
-def tiff_ovr_21(both_endian):
+def test_tiff_ovr_21(both_endian):
 
     drv = gdal.GetDriverByName('GTiff')
     md = drv.GetMetadata()
@@ -895,7 +895,7 @@ def tiff_ovr_21(both_endian):
 # Test BIGTIFF_OVERVIEW=NO option when BigTIFF is really needed
 
 
-def tiff_ovr_22(both_endian):
+def test_tiff_ovr_22(both_endian):
 
     drv = gdal.GetDriverByName('GTiff')
     md = drv.GetMetadata()
@@ -930,7 +930,7 @@ def tiff_ovr_22(both_endian):
 # method for the overviews.
 
 
-def tiff_ovr_23(both_endian):
+def test_tiff_ovr_23(both_endian):
 
     drv = gdal.GetDriverByName('GTiff')
     md = drv.GetMetadata()
@@ -970,7 +970,7 @@ def tiff_ovr_23(both_endian):
 # Test BIGTIFF_OVERVIEW=IF_SAFER option
 
 
-def tiff_ovr_24(both_endian):
+def test_tiff_ovr_24(both_endian):
 
     drv = gdal.GetDriverByName('GTiff')
     md = drv.GetMetadata()
@@ -1011,7 +1011,7 @@ def tiff_ovr_24(both_endian):
 # band and actually flushed
 
 
-def tiff_ovr_25(both_endian):
+def test_tiff_ovr_25(both_endian):
 
     ds = gdaltest.tiff_drv.Create('tmp/ovr25.tif', 100, 100, 1)
     ds.GetRasterBand(1).Fill(1)
@@ -1038,7 +1038,7 @@ def tiff_ovr_25(both_endian):
 # Test gdal.RegenerateOverview()
 
 
-def tiff_ovr_26(both_endian):
+def test_tiff_ovr_26(both_endian):
 
     ds = gdaltest.tiff_drv.Create('tmp/ovr26.tif', 100, 100, 1)
     ds.GetRasterBand(1).Fill(1)
@@ -1061,7 +1061,7 @@ def tiff_ovr_26(both_endian):
 # Test gdal.RegenerateOverviews()
 
 
-def tiff_ovr_27(both_endian):
+def test_tiff_ovr_27(both_endian):
 
     ds = gdaltest.tiff_drv.Create('tmp/ovr27.tif', 100, 100, 1)
     ds.GetRasterBand(1).Fill(1)
@@ -1090,7 +1090,7 @@ def tiff_ovr_27(both_endian):
 # Test cleaning overviews.
 
 
-def tiff_ovr_28(both_endian):
+def test_tiff_ovr_28(both_endian):
 
     ds = gdal.Open('tmp/ovr25.tif', gdal.GA_Update)
     if ds.BuildOverviews(overviewlist=[]) != 0:
@@ -1114,7 +1114,7 @@ def tiff_ovr_28(both_endian):
 # Test cleaning external overviews (ovr) on a non-TIFF format.
 
 
-def tiff_ovr_29(both_endian):
+def test_tiff_ovr_29(both_endian):
 
     src_ds = gdal.Open('data/byte.tif')
     png_ds = gdal.GetDriverByName('PNG').CreateCopy('tmp/ovr29.png', src_ds)
@@ -1162,7 +1162,7 @@ def tiff_ovr_29(both_endian):
 # Test fix for #2988.
 
 
-def tiff_ovr_30(both_endian):
+def test_tiff_ovr_30(both_endian):
 
     ds = gdaltest.tiff_drv.Create('tmp/ovr30.tif', 20, 20, 1)
     ds.BuildOverviews(overviewlist=[2])
@@ -1192,7 +1192,7 @@ def tiff_ovr_30(both_endian):
 # Test fix for #3033
 
 
-def tiff_ovr_31(both_endian):
+def test_tiff_ovr_31(both_endian):
 
     ds = gdaltest.tiff_drv.Create('tmp/ovr31.tif', 100, 100, 4)
     ds.GetRasterBand(1).Fill(255)
@@ -1213,7 +1213,7 @@ def tiff_ovr_31(both_endian):
 # Test Cubic sampling.
 
 
-def tiff_ovr_32(both_endian):
+def test_tiff_ovr_32(both_endian):
 
     drv = gdal.GetDriverByName('GTiff')
     md = drv.GetMetadata()
@@ -1372,7 +1372,7 @@ def tiff_ovr_32(both_endian):
 ###############################################################################
 # Test creation of overviews on a 1x1 dataset (fix for #3069)
 
-def tiff_ovr_33(both_endian):
+def test_tiff_ovr_33(both_endian):
 
     try:
         os.remove('tmp/ovr33.tif.ovr')
@@ -1393,7 +1393,7 @@ def tiff_ovr_33(both_endian):
 ###############################################################################
 # Confirm that overviews are used on a Band.RasterIO().
 
-def tiff_ovr_34(both_endian):
+def test_tiff_ovr_34(both_endian):
 
     ds_in = gdal.Open('data/byte.tif')
     ds = gdaltest.tiff_drv.CreateCopy('tmp/ovr34.tif', ds_in)
@@ -1419,7 +1419,7 @@ def tiff_ovr_34(both_endian):
 # Confirm that overviews are used on a Band.RasterIO().
 
 
-def tiff_ovr_35(both_endian):
+def test_tiff_ovr_35(both_endian):
 
     ds_in = gdal.Open('data/byte.tif')
     ds = gdaltest.tiff_drv.CreateCopy('tmp/ovr35.tif', ds_in)
@@ -1445,12 +1445,12 @@ def tiff_ovr_35(both_endian):
 # Confirm that overviews are used on a Band.RasterIO() when using BlockBasedRasterIO() (#3124)
 
 
-def tiff_ovr_36(both_endian):
+def test_tiff_ovr_36(both_endian):
 
     oldval = gdal.GetConfigOption('GDAL_FORCE_CACHING', 'NO')
     gdal.SetConfigOption('GDAL_FORCE_CACHING', 'YES')
 
-    ret = tiff_ovr_35(both_endian)
+    ret = test_tiff_ovr_35(both_endian)
 
     gdal.SetConfigOption('GDAL_FORCE_CACHING', oldval)
 
@@ -1460,7 +1460,7 @@ def tiff_ovr_36(both_endian):
 # Test PREDICTOR_OVERVIEW=2 option. (#3414)
 
 
-def tiff_ovr_37(both_endian):
+def test_tiff_ovr_37(both_endian):
 
     shutil.copy('../gdrivers/data/n43.dt0', 'tmp/ovr37.dt0')
 
@@ -1500,7 +1500,7 @@ def tiff_ovr_37(both_endian):
 # Test that the predictor flag gets well propagated to internal overviews
 
 
-def tiff_ovr_38(both_endian):
+def test_tiff_ovr_38(both_endian):
 
     # Skip with old libtiff (crash with 3.8.2)
     md = gdaltest.tiff_drv.GetMetadata()
@@ -1525,7 +1525,7 @@ def tiff_ovr_38(both_endian):
 # Test external overviews on all datatypes
 
 
-def tiff_ovr_39(both_endian):
+def test_tiff_ovr_39(both_endian):
 
     for datatype in [gdal.GDT_Byte,
                      gdal.GDT_Int16,
@@ -1577,7 +1577,7 @@ def tiff_ovr_39(both_endian):
 # Test external overviews on 1 bit datasets with AVERAGE_BIT2GRAYSCALE (similar to tiff_ovr_4)
 
 
-def tiff_ovr_40(both_endian):
+def test_tiff_ovr_40(both_endian):
 
     shutil.copyfile('data/oddsize_1bit2b.tif', 'tmp/ovr40.tif')
 
@@ -1653,7 +1653,7 @@ def tiff_ovr_40(both_endian):
 # Test external overviews on 1 bit datasets with NEAREST
 
 
-def tiff_ovr_41(both_endian):
+def test_tiff_ovr_41(both_endian):
 
     shutil.copyfile('data/oddsize_1bit2b.tif', 'tmp/ovr41.tif')
 
@@ -1681,7 +1681,7 @@ def tiff_ovr_41(both_endian):
 # Test external overviews on dataset with color table
 
 
-def tiff_ovr_42(both_endian):
+def test_tiff_ovr_42(both_endian):
 
     ct_data = [(255, 0, 0), (0, 255, 0), (0, 0, 255), (255, 255, 255)]
 
@@ -1717,7 +1717,7 @@ def tiff_ovr_42(both_endian):
 # jpeg-in-tiff (#3539)
 
 
-def tiff_ovr_43(both_endian):
+def test_tiff_ovr_43(both_endian):
 
     md = gdaltest.tiff_drv.GetMetadata()
     if md['DMD_CREATIONOPTIONLIST'].find('JPEG') == -1:
@@ -1781,7 +1781,7 @@ def tiff_ovr_43(both_endian):
 # option
 
 
-def tiff_ovr_44(both_endian):
+def test_tiff_ovr_44(both_endian):
 
     shutil.copyfile('data/byte.tif', 'tmp/ovr44.tif')
     gdal.SetConfigOption('GDAL_TIFF_OVR_BLOCKSIZE', '256')
@@ -1813,7 +1813,7 @@ def tiff_ovr_44(both_endian):
 # Same as tiff_ovr_44, but with external overviews
 
 
-def tiff_ovr_45(both_endian):
+def test_tiff_ovr_45(both_endian):
 
     shutil.copyfile('data/byte.tif', 'tmp/ovr45.tif')
     gdal.SetConfigOption('GDAL_TIFF_OVR_BLOCKSIZE', '256')
@@ -1845,7 +1845,7 @@ def tiff_ovr_45(both_endian):
 # Test overview on a dataset where width * height > 2 billion
 
 
-def tiff_ovr_46():
+def test_tiff_ovr_46():
 
     md = gdaltest.tiff_drv.GetMetadata()
     if md['DMD_CREATIONOPTIONLIST'].find('BigTIFF') == -1:
@@ -1942,7 +1942,7 @@ def tiff_ovr_46():
 # Test workaround with libtiff 3.X when creating interleaved overviews
 
 
-def tiff_ovr_47(both_endian):
+def test_tiff_ovr_47(both_endian):
     mem_drv = gdal.GetDriverByName('MEM')
     mem_ds = mem_drv.Create('', 852, 549, 3)
 
@@ -1973,7 +1973,7 @@ def tiff_ovr_47(both_endian):
 # Test that we don't average 0's in alpha band
 
 
-def tiff_ovr_48(both_endian):
+def test_tiff_ovr_48(both_endian):
 
     shutil.copy('data/rgba_with_alpha_0_and_255.tif', 'tmp')
     ds = gdal.Open('tmp/rgba_with_alpha_0_and_255.tif')
@@ -2009,7 +2009,7 @@ def tiff_ovr_48(both_endian):
 # Test possible stride computation issue in GDALRegenerateOverviewsMultiBand (#5653)
 
 
-def tiff_ovr_49(both_endian):
+def test_tiff_ovr_49(both_endian):
 
     ds = gdal.GetDriverByName('GTiff').Create('/vsimem/tiff_ovr_49.tif', 1023, 1023, 1)
     ds.GetRasterBand(1).Fill(0)
@@ -2036,7 +2036,7 @@ def tiff_ovr_49(both_endian):
 # Test overviews when X dimension is smaller than Y (#5794)
 
 
-def tiff_ovr_50(both_endian):
+def test_tiff_ovr_50(both_endian):
 
     ds = gdal.GetDriverByName('GTiff').Create('/vsimem/tiff_ovr_50.tif', 6, 8192, 3,
                                               options=['COMPRESS=DEFLATE'])
@@ -2053,7 +2053,7 @@ def tiff_ovr_50(both_endian):
 # Test average overview on a color palette with nodata values (#6371)
 
 
-def tiff_ovr_51():
+def test_tiff_ovr_51():
 
     src_ds = gdal.Open('data/stefan_full_rgba_pct32.png')
     if src_ds is None:
@@ -2078,7 +2078,7 @@ def tiff_ovr_51():
 # Test unsorted external overview building (#6617)
 
 
-def tiff_ovr_52():
+def test_tiff_ovr_52():
 
     src_ds = gdal.Open('data/byte.tif')
     if src_ds is None:
@@ -2141,7 +2141,7 @@ def tiff_ovr_52():
 # Test external overviews building in several steps
 
 
-def tiff_ovr_53():
+def test_tiff_ovr_53():
 
     src_ds = gdal.Open('data/byte.tif')
     if src_ds is None:
@@ -2208,7 +2208,7 @@ def tiff_ovr_53():
 # Test external overviews building in several steps with jpeg compression
 
 
-def tiff_ovr_54():
+def test_tiff_ovr_54():
 
     drv = gdal.GetDriverByName('GTiff')
     md = drv.GetMetadata()
@@ -2248,7 +2248,7 @@ def tiff_ovr_54():
 ###############################################################################
 
 
-def tiff_ovr_too_many_levels_contig():
+def test_tiff_ovr_too_many_levels_contig():
 
     src_ds = gdal.Open('data/byte.tif')
     tmpfilename = '/vsimem/tiff_ovr_too_many_levels_contig.tif'
@@ -2270,7 +2270,7 @@ def tiff_ovr_too_many_levels_contig():
 ###############################################################################
 
 
-def tiff_ovr_too_many_levels_separate():
+def test_tiff_ovr_too_many_levels_separate():
 
     src_ds = gdal.Open('data/separate_tiled.tif')
     tmpfilename = '/vsimem/tiff_ovr_too_many_levels_separate.tif'
@@ -2292,7 +2292,7 @@ def tiff_ovr_too_many_levels_separate():
 ###############################################################################
 
 
-def tiff_ovr_too_many_levels_external():
+def test_tiff_ovr_too_many_levels_external():
 
     src_ds = gdal.Open('data/byte.tif')
     tmpfilename = '/vsimem/tiff_ovr_too_many_levels_contig.tif'
@@ -2314,7 +2314,7 @@ def tiff_ovr_too_many_levels_external():
 ###############################################################################
 
 
-def tiff_ovr_average_multiband_vs_singleband():
+def test_tiff_ovr_average_multiband_vs_singleband():
 
     gdal.Translate('/vsimem/tiff_ovr_average_multiband_band.tif', 'data/reproduce_average_issue.tif', creationOptions=['INTERLEAVE=BAND'])
     gdal.Translate('/vsimem/tiff_ovr_average_multiband_pixel.tif', 'data/reproduce_average_issue.tif', creationOptions=['INTERLEAVE=PIXEL'])
@@ -2341,65 +2341,65 @@ def tiff_ovr_average_multiband_vs_singleband():
 
 
 gdaltest_list = [
-    tiff_ovr_1,
-    tiff_ovr_2,
-    tiff_ovr_3,
-    tiff_ovr_3bis,
-    tiff_ovr_4,
-    tiff_ovr_5,
-    tiff_ovr_6,
-    tiff_ovr_7,
-    tiff_ovr_8,
-    tiff_ovr_9,
-    tiff_ovr_10,
-    tiff_ovr_11,
-    tiff_ovr_12,
-    tiff_ovr_13,
-    tiff_ovr_14,
-    tiff_ovr_15,
-    tiff_ovr_16,
-    tiff_ovr_17,
-    tiff_ovr_18,
-    tiff_ovr_19,
-    tiff_ovr_20,
-    tiff_ovr_21,
-    tiff_ovr_22,
-    tiff_ovr_23,
-    tiff_ovr_24,
-    tiff_ovr_25,
-    tiff_ovr_26,
-    tiff_ovr_27,
-    tiff_ovr_28,
-    tiff_ovr_29,
-    tiff_ovr_30,
-    tiff_ovr_31,
-    tiff_ovr_32,
-    tiff_ovr_33,
-    tiff_ovr_34,
-    tiff_ovr_35,
-    tiff_ovr_36,
-    tiff_ovr_37,
-    tiff_ovr_38,
-    tiff_ovr_39,
-    tiff_ovr_40,
-    tiff_ovr_41,
-    tiff_ovr_42,
-    tiff_ovr_43,
-    tiff_ovr_44,
-    tiff_ovr_45,
-    tiff_ovr_46,
-    tiff_ovr_47,
-    tiff_ovr_48,
-    tiff_ovr_49,
-    tiff_ovr_50,
-    tiff_ovr_51,
-    tiff_ovr_52,
-    tiff_ovr_53,
-    tiff_ovr_54,
-    tiff_ovr_too_many_levels_contig,
-    tiff_ovr_too_many_levels_separate,
-    tiff_ovr_too_many_levels_external,
-    tiff_ovr_average_multiband_vs_singleband
+    test_tiff_ovr_1,
+    test_tiff_ovr_2,
+    test_tiff_ovr_3,
+    test_tiff_ovr_3bis,
+    test_tiff_ovr_4,
+    test_tiff_ovr_5,
+    test_tiff_ovr_6,
+    test_tiff_ovr_7,
+    test_tiff_ovr_8,
+    test_tiff_ovr_9,
+    test_tiff_ovr_10,
+    test_tiff_ovr_11,
+    test_tiff_ovr_12,
+    test_tiff_ovr_13,
+    test_tiff_ovr_14,
+    test_tiff_ovr_15,
+    test_tiff_ovr_16,
+    test_tiff_ovr_17,
+    test_tiff_ovr_18,
+    test_tiff_ovr_19,
+    test_tiff_ovr_20,
+    test_tiff_ovr_21,
+    test_tiff_ovr_22,
+    test_tiff_ovr_23,
+    test_tiff_ovr_24,
+    test_tiff_ovr_25,
+    test_tiff_ovr_26,
+    test_tiff_ovr_27,
+    test_tiff_ovr_28,
+    test_tiff_ovr_29,
+    test_tiff_ovr_30,
+    test_tiff_ovr_31,
+    test_tiff_ovr_32,
+    test_tiff_ovr_33,
+    test_tiff_ovr_34,
+    test_tiff_ovr_35,
+    test_tiff_ovr_36,
+    test_tiff_ovr_37,
+    test_tiff_ovr_38,
+    test_tiff_ovr_39,
+    test_tiff_ovr_40,
+    test_tiff_ovr_41,
+    test_tiff_ovr_42,
+    test_tiff_ovr_43,
+    test_tiff_ovr_44,
+    test_tiff_ovr_45,
+    test_tiff_ovr_46,
+    test_tiff_ovr_47,
+    test_tiff_ovr_48,
+    test_tiff_ovr_49,
+    test_tiff_ovr_50,
+    test_tiff_ovr_51,
+    test_tiff_ovr_52,
+    test_tiff_ovr_53,
+    test_tiff_ovr_54,
+    test_tiff_ovr_too_many_levels_contig,
+    test_tiff_ovr_too_many_levels_separate,
+    test_tiff_ovr_too_many_levels_external,
+    test_tiff_ovr_average_multiband_vs_singleband
 ]
 
 if __name__ == '__main__':
diff --git a/autotest/gcore/tiff_read.py b/autotest/gcore/tiff_read.py
index d6704c8c51ad..fc56fe63006b 100755
--- a/autotest/gcore/tiff_read.py
+++ b/autotest/gcore/tiff_read.py
@@ -83,7 +83,7 @@ def test_tiff_open(filename, band, checksum):
 # Test absolute/offset && index directory access
 
 
-def tiff_read_off():
+def test_tiff_read_off():
 
     # Test absolute/offset directory access.
     ds = gdal.Open('GTIFF_DIR:off:408:data/byte.tif')
@@ -158,7 +158,7 @@ def tiff_read_off():
 # Confirm we interpret bands as alpha when we should, and not when we
 # should not.
 
-def tiff_check_alpha():
+def test_tiff_check_alpha():
 
     # Grey + alpha
 
@@ -236,7 +236,7 @@ def tiff_check_alpha():
 ###############################################################################
 # Test reading a CMYK tiff as RGBA image
 
-def tiff_read_cmyk_rgba():
+def test_tiff_read_cmyk_rgba():
 
     ds = gdal.Open('data/rgbsmall_cmyk.tif')
 
@@ -265,7 +265,7 @@ def tiff_read_cmyk_rgba():
 # Test reading a CMYK tiff as a raw image
 
 
-def tiff_read_cmyk_raw():
+def test_tiff_read_cmyk_raw():
 
     ds = gdal.Open('GTIFF_RAW:data/rgbsmall_cmyk.tif')
 
@@ -284,7 +284,7 @@ def tiff_read_cmyk_raw():
 # Test reading a OJPEG image
 
 
-def tiff_read_ojpeg():
+def test_tiff_read_ojpeg():
 
     md = gdal.GetDriverByName('GTiff').GetMetadata()
     if md['DMD_CREATIONOPTIONLIST'].find('JPEG') == -1:
@@ -321,7 +321,7 @@ def tiff_read_ojpeg():
 # Read a .tif.gz file
 
 
-def tiff_read_gzip():
+def test_tiff_read_gzip():
 
     try:
         os.remove('data/byte.tif.gz.properties')
@@ -345,7 +345,7 @@ def tiff_read_gzip():
 # Read a .tif.zip file (with explicit filename)
 
 
-def tiff_read_zip_1():
+def test_tiff_read_zip_1():
 
     ds = gdal.Open('/vsizip/./data/byte.tif.zip/byte.tif')
     if ds.GetRasterBand(1).Checksum() != 4672:
@@ -359,7 +359,7 @@ def tiff_read_zip_1():
 # Read a .tif.zip file (with implicit filename)
 
 
-def tiff_read_zip_2():
+def test_tiff_read_zip_2():
 
     ds = gdal.Open('/vsizip/./data/byte.tif.zip')
     if ds.GetRasterBand(1).Checksum() != 4672:
@@ -373,7 +373,7 @@ def tiff_read_zip_2():
 # Read a .tif.zip file with a single file in a subdirectory (with explicit filename)
 
 
-def tiff_read_zip_3():
+def test_tiff_read_zip_3():
 
     ds = gdal.Open('/vsizip/./data/onefileinsubdir.zip/onefileinsubdir/byte.tif')
     if ds.GetRasterBand(1).Checksum() != 4672:
@@ -387,7 +387,7 @@ def tiff_read_zip_3():
 # Read a .tif.zip file with a single file in a subdirectory(with implicit filename)
 
 
-def tiff_read_zip_4():
+def test_tiff_read_zip_4():
 
     ds = gdal.Open('/vsizip/./data/onefileinsubdir.zip')
     if ds.GetRasterBand(1).Checksum() != 4672:
@@ -401,7 +401,7 @@ def tiff_read_zip_4():
 # Read a .tif.zip file with 2 files in a subdirectory
 
 
-def tiff_read_zip_5():
+def test_tiff_read_zip_5():
 
     ds = gdal.Open('/vsizip/./data/twofileinsubdir.zip/twofileinsubdir/byte.tif')
     if ds.GetRasterBand(1).Checksum() != 4672:
@@ -415,7 +415,7 @@ def tiff_read_zip_5():
 # Read a .tar file (with explicit filename)
 
 
-def tiff_read_tar_1():
+def test_tiff_read_tar_1():
 
     ds = gdal.Open('/vsitar/./data/byte.tar/byte.tif')
     if ds.GetRasterBand(1).Checksum() != 4672:
@@ -429,7 +429,7 @@ def tiff_read_tar_1():
 # Read a .tar file (with implicit filename)
 
 
-def tiff_read_tar_2():
+def test_tiff_read_tar_2():
 
     ds = gdal.Open('/vsitar/./data/byte.tar')
     if ds.GetRasterBand(1).Checksum() != 4672:
@@ -443,7 +443,7 @@ def tiff_read_tar_2():
 # Read a .tgz file (with explicit filename)
 
 
-def tiff_read_tgz_1():
+def test_tiff_read_tgz_1():
 
     ds = gdal.Open('/vsitar/./data/byte.tgz/byte.tif')
     if ds.GetRasterBand(1).Checksum() != 4672:
@@ -459,7 +459,7 @@ def tiff_read_tgz_1():
 # Read a .tgz file (with implicit filename)
 
 
-def tiff_read_tgz_2():
+def test_tiff_read_tgz_2():
 
     ds = gdal.Open('/vsitar/./data/byte.tgz')
     if ds.GetRasterBand(1).Checksum() != 4672:
@@ -475,7 +475,7 @@ def tiff_read_tgz_2():
 # Check handling of non-degree angular units (#601)
 
 
-def tiff_grads():
+def test_tiff_grads():
 
     ds = gdal.Open('data/test_gf.tif')
     srs = ds.GetProjectionRef()
@@ -491,7 +491,7 @@ def tiff_grads():
 # Check Erdas Citation Parsing for coordinate system.
 
 
-def tiff_citation():
+def test_tiff_citation():
 
     build_info = gdal.VersionInfo('BUILD_INFO')
     if build_info.find('ESRI_BUILD=YES') == -1:
@@ -513,7 +513,7 @@ def tiff_citation():
 # Check that we can read linear projection parameters properly (#3901)
 
 
-def tiff_linearparmunits():
+def test_tiff_linearparmunits():
 
     # Test the file with the correct formulation.
 
@@ -560,7 +560,7 @@ def tiff_linearparmunits():
 # Check that the GTIFF_LINEAR_UNITS handling works properly (#3901)
 
 
-def tiff_linearparmunits2():
+def test_tiff_linearparmunits2():
 
     gdal.SetConfigOption('GTIFF_LINEAR_UNITS', 'BROKEN')
 
@@ -611,7 +611,7 @@ def tiff_linearparmunits2():
 # Test GTiffSplitBitmapBand to treat one row 1bit files as scanline blocks (#2622)
 
 
-def tiff_g4_split():
+def test_tiff_g4_split():
 
     if 'GetBlockSize' not in dir(gdal.Band):
         return 'skip'
@@ -636,7 +636,7 @@ def tiff_g4_split():
 # Test reading a tiff with multiple images in it
 
 
-def tiff_multi_images():
+def test_tiff_multi_images():
 
     # Implicitly get the content of the first image (backward compatibility).
     ds = gdal.Open('data/twoimages.tif')
@@ -673,7 +673,7 @@ def tiff_multi_images():
 # Test reading a tiff from a memory buffer (#2931)
 
 
-def tiff_vsimem():
+def test_tiff_vsimem():
 
     try:
         gdal.FileFromMemBuffer
@@ -714,7 +714,7 @@ def tiff_vsimem():
 # Test reading a tiff from inside a zip in a memory buffer !
 
 
-def tiff_vsizip_and_mem():
+def test_tiff_vsizip_and_mem():
 
     try:
         gdal.FileFromMemBuffer
@@ -740,7 +740,7 @@ def tiff_vsizip_and_mem():
 # Test reading a GeoTIFF with only ProjectedCSTypeGeoKey defined (ticket #3019)
 
 
-def tiff_ProjectedCSTypeGeoKey_only():
+def test_tiff_ProjectedCSTypeGeoKey_only():
 
     ds = gdal.Open('data/ticket3019.tif')
     if ds.GetProjectionRef().find('WGS 84 / UTM zone 31N') == -1:
@@ -754,7 +754,7 @@ def tiff_ProjectedCSTypeGeoKey_only():
 # Test reading a GeoTIFF with only GTModelTypeGeoKey defined
 
 
-def tiff_GTModelTypeGeoKey_only():
+def test_tiff_GTModelTypeGeoKey_only():
 
     ds = gdal.Open('data/GTModelTypeGeoKey_only.tif')
     if ds.GetProjectionRef().find('LOCAL_CS["unnamed",GEOGCS["unknown",DATUM["unknown",SPHEROID["unretrievable - using WGS84",6378137,298.257223563]],PRIMEM["Greenwich",0],UNIT[,0.0174532925199433]],UNIT["unknown",1]]') != 0:
@@ -768,7 +768,7 @@ def tiff_GTModelTypeGeoKey_only():
 # Test reading a 12bit jpeg compressed geotiff.
 
 
-def tiff_12bitjpeg():
+def test_tiff_12bitjpeg():
 
     old_accum = gdal.GetConfigOption('CPL_ACCUM_ERROR_MSG', 'OFF')
     gdal.SetConfigOption('CPL_ACCUM_ERROR_MSG', 'ON')
@@ -813,7 +813,7 @@ def tiff_12bitjpeg():
 # Test that statistics for TIFF files are stored and correctly read from .aux.xml
 
 
-def tiff_read_stats_from_pam():
+def test_tiff_read_stats_from_pam():
 
     try:
         os.remove('data/byte.tif.aux.xml')
@@ -858,7 +858,7 @@ def tiff_read_stats_from_pam():
 # Test extracting georeferencing from a .TAB file
 
 
-def tiff_read_from_tab():
+def test_tiff_read_from_tab():
 
     ds = gdal.GetDriverByName('GTiff').Create('tmp/tiff_read_from_tab.tif', 1, 1)
     ds = None
@@ -910,7 +910,7 @@ def tiff_read_from_tab():
 # Test reading PixelIsPoint file.
 
 
-def tiff_read_pixelispoint():
+def test_tiff_read_pixelispoint():
 
     gdal.SetConfigOption('GTIFF_POINT_GEO_IGNORE', 'FALSE')
 
@@ -946,7 +946,7 @@ def tiff_read_pixelispoint():
 # Test reading a GeoTIFF file with a geomatrix in PixelIsPoint format.
 
 
-def tiff_read_geomatrix():
+def test_tiff_read_geomatrix():
 
     gdal.SetConfigOption('GTIFF_POINT_GEO_IGNORE', 'FALSE')
 
@@ -982,7 +982,7 @@ def tiff_read_geomatrix():
 # Test that we don't crash when reading a TIFF with corrupted GeoTIFF tags
 
 
-def tiff_read_corrupted_gtiff():
+def test_tiff_read_corrupted_gtiff():
 
     gdal.PushErrorHandler('CPLQuietErrorHandler')
     ds = gdal.Open('data/corrupted_gtiff_tags.tif')
@@ -1002,7 +1002,7 @@ def tiff_read_corrupted_gtiff():
 # Test that we don't crash when reading a TIFF with corrupted GeoTIFF tags
 
 
-def tiff_read_tag_without_null_byte():
+def test_tiff_read_tag_without_null_byte():
 
     gdal.ErrorReset()
     oldval = gdal.GetConfigOption('CPL_DEBUG')
@@ -1020,7 +1020,7 @@ def tiff_read_tag_without_null_byte():
 ###############################################################################
 # Test the effect of the GTIFF_IGNORE_READ_ERRORS configuration option (#3994)
 
-def tiff_read_buggy_packbits():
+def test_tiff_read_buggy_packbits():
 
     old_val = gdal.GetConfigOption('GTIFF_IGNORE_READ_ERRORS')
     gdal.SetConfigOption('GTIFF_IGNORE_READ_ERRORS', None)
@@ -1051,7 +1051,7 @@ def tiff_read_buggy_packbits():
 ###############################################################################
 # Test reading a GeoEye _rpc.txt (#3639)
 
-def tiff_read_rpc_txt():
+def test_tiff_read_rpc_txt():
 
     shutil.copy('data/byte.tif', 'tmp/test.tif')
     shutil.copy('data/test_rpc.txt', 'tmp/test_rpc.txt')
@@ -1078,7 +1078,7 @@ def tiff_read_rpc_txt():
 #  http://geotiff.maptools.org/rpc_prop.html
 
 
-def tiff_read_rpc_tif():
+def test_tiff_read_rpc_tif():
 
     ds = gdal.Open('data/byte_rpc.tif')
     rpc_md = ds.GetMetadata('RPC')
@@ -1105,7 +1105,7 @@ def tiff_read_rpc_tif():
 # StripByteCounts (279) LONG (4) 1<1>
 
 
-def tiff_small():
+def test_tiff_small():
 
     content = '\x49\x49\x2A\x00\x08\x00\x00\x00\x04\x00\x00\x01\x03\x00\x01\x00\x00\x00\x01\x00\x00\x00\x01\x01\x03\x00\x01\x00\x00\x00\x01\x00\x00\x00\x11\x01\x04\x00\x01\x00\x00\x00\x00\x00\x00\x00\x17\x01\x04\x00\x01\x00\x00\x00\x01\x00\x00\x00'
 
@@ -1126,7 +1126,7 @@ def tiff_small():
 # Test that we can workaround a DoS with
 
 
-def tiff_dos_strip_chop():
+def test_tiff_dos_strip_chop():
 
     gdal.PushErrorHandler('CPLQuietErrorHandler')
     ds = gdal.Open('data/tiff_dos_strip_chop.tif')
@@ -1139,7 +1139,7 @@ def tiff_dos_strip_chop():
 # Test reading EXIF and GPS metadata
 
 
-def tiff_read_exif_and_gps():
+def test_tiff_read_exif_and_gps():
 
     ds = gdal.Open('data/exif_and_gps.tif')
     exif_md = ds.GetMetadata('EXIF')
@@ -1172,7 +1172,7 @@ def tiff_read_exif_and_gps():
 # Test reading a pixel interleaved RGBA JPEG-compressed TIFF
 
 
-def tiff_jpeg_rgba_pixel_interleaved():
+def test_tiff_jpeg_rgba_pixel_interleaved():
     md = gdal.GetDriverByName('GTiff').GetMetadata()
     if md['DMD_CREATIONOPTIONLIST'].find('JPEG') == -1:
         return 'skip'
@@ -1202,7 +1202,7 @@ def tiff_jpeg_rgba_pixel_interleaved():
 # Test reading a band interleaved RGBA JPEG-compressed TIFF
 
 
-def tiff_jpeg_rgba_band_interleaved():
+def test_tiff_jpeg_rgba_band_interleaved():
     md = gdal.GetDriverByName('GTiff').GetMetadata()
     if md['DMD_CREATIONOPTIONLIST'].find('JPEG') == -1:
         return 'skip'
@@ -1232,7 +1232,7 @@ def tiff_jpeg_rgba_band_interleaved():
 # Test reading a YCbCr JPEG all-in-one-strip multiband TIFF (#3259, #3894)
 
 
-def tiff_read_online_1():
+def test_tiff_read_online_1():
     md = gdal.GetDriverByName('GTiff').GetMetadata()
     if md['DMD_CREATIONOPTIONLIST'].find('JPEG') == -1:
         return 'skip'
@@ -1259,7 +1259,7 @@ def tiff_read_online_1():
 # support
 
 
-def tiff_read_online_2():
+def test_tiff_read_online_2():
 
     if gdal.GetDriverByName('HTTP') is None:
         return 'skip'
@@ -1301,7 +1301,7 @@ def tiff_read_online_2():
 # Test reading a TIFF made of a single-strip that is more than 2GB (#5403)
 
 
-def tiff_read_huge4GB():
+def test_tiff_read_huge4GB():
 
     # Need libtiff 4.X anyway
     md = gdal.GetDriverByName('GTiff').GetMetadata()
@@ -1331,7 +1331,7 @@ def tiff_read_huge4GB():
 # Test reading a (small) BigTIFF. Tests GTiffCacheOffsetOrCount8()
 
 
-def tiff_read_bigtiff():
+def test_tiff_read_bigtiff():
 
     md = gdal.GetDriverByName('GTiff').GetMetadata()
     if md['DMD_CREATIONOPTIONLIST'].find('BigTIFF') == -1:
@@ -1350,7 +1350,7 @@ def tiff_read_bigtiff():
 # Test reading in TIFF metadata domain
 
 
-def tiff_read_tiff_metadata():
+def test_tiff_read_tiff_metadata():
 
     md = gdal.GetDriverByName('GTiff').GetMetadata()
     if md['DMD_CREATIONOPTIONLIST'].find('JPEG') == -1:
@@ -1393,7 +1393,7 @@ def tiff_read_tiff_metadata():
 # Test reading a JPEG-in-TIFF with tiles of irregular size (corrupted image)
 
 
-def tiff_read_irregular_tile_size_jpeg_in_tiff():
+def test_tiff_read_irregular_tile_size_jpeg_in_tiff():
 
     md = gdal.GetDriverByName('GTiff').GetMetadata()
     if md['DMD_CREATIONOPTIONLIST'].find('JPEG') == -1:
@@ -1423,7 +1423,7 @@ def tiff_read_irregular_tile_size_jpeg_in_tiff():
 # Test GTIFF_DIRECT_IO and GTIFF_VIRTUAL_MEM_IO optimizations
 
 
-def tiff_direct_and_virtual_mem_io():
+def test_tiff_direct_and_virtual_mem_io():
 
     # Test with pixel-interleaved and band-interleaved datasets
     for dt in [gdal.GDT_Byte, gdal.GDT_Int16, gdal.GDT_CInt16]:
@@ -1857,7 +1857,7 @@ def tiff_direct_and_virtual_mem_io():
 # Check read Digital Globe metadata IMD & RPB format
 
 
-def tiff_read_md1():
+def test_tiff_read_md1():
 
     try:
         os.remove('data/md_dg.tif.aux.xml')
@@ -1907,7 +1907,7 @@ def tiff_read_md1():
 # Check read Digital Globe metadata XML format
 
 
-def tiff_read_md2():
+def test_tiff_read_md2():
 
     try:
         os.remove('data/md_dg_2.tif.aux.xml')
@@ -1957,7 +1957,7 @@ def tiff_read_md2():
 # Check read GeoEye metadata format
 
 
-def tiff_read_md3():
+def test_tiff_read_md3():
 
     try:
         os.remove('data/md_ge_rgb_0010000.tif.aux.xml')
@@ -2007,7 +2007,7 @@ def tiff_read_md3():
 # Check read OrbView metadata format
 
 
-def tiff_read_md4():
+def test_tiff_read_md4():
 
     try:
         os.remove('data/md_ov.tif.aux.xml')
@@ -2057,7 +2057,7 @@ def tiff_read_md4():
 # Check read Resurs-DK1 metadata format
 
 
-def tiff_read_md5():
+def test_tiff_read_md5():
 
     try:
         os.remove('data/md_rdk1.tif.aux.xml')
@@ -2107,7 +2107,7 @@ def tiff_read_md5():
 # Check read Landsat metadata format
 
 
-def tiff_read_md6():
+def test_tiff_read_md6():
 
     try:
         os.remove('data/md_ls_b1.tif.aux.xml')
@@ -2157,7 +2157,7 @@ def tiff_read_md6():
 # Check read Spot metadata format
 
 
-def tiff_read_md7():
+def test_tiff_read_md7():
 
     try:
         os.remove('data/spot/md_spot.tif.aux.xml')
@@ -2207,7 +2207,7 @@ def tiff_read_md7():
 # Check read RapidEye metadata format
 
 
-def tiff_read_md8():
+def test_tiff_read_md8():
 
     try:
         os.remove('data/md_re.tif.aux.xml')
@@ -2257,7 +2257,7 @@ def tiff_read_md8():
 # Check read Alos metadata format
 
 
-def tiff_read_md9():
+def test_tiff_read_md9():
 
     try:
         os.remove('data/alos/IMG-md_alos.tif.aux.xml')
@@ -2304,7 +2304,7 @@ def tiff_read_md9():
 # Check read Eros metadata format
 
 
-def tiff_read_md10():
+def test_tiff_read_md10():
 
     try:
         os.remove('data/md_eros.tif.aux.xml')
@@ -2354,7 +2354,7 @@ def tiff_read_md10():
 # Check read Kompsat metadata format
 
 
-def tiff_read_md11():
+def test_tiff_read_md11():
 
     try:
         os.remove('data/md_kompsat.tif.aux.xml')
@@ -2404,7 +2404,7 @@ def tiff_read_md11():
 # Check read Dimap metadata format
 
 
-def tiff_read_md12():
+def test_tiff_read_md12():
 
     ds = gdal.Open('../gdrivers/data/dimap2/IMG_foo_R2C1.TIF', gdal.GA_ReadOnly)
     filelist = ds.GetFileList()
@@ -2471,7 +2471,7 @@ def tiff_read_md12():
 # Test reading a TIFFTAG_GDAL_NODATA with empty text
 
 
-def tiff_read_empty_nodata_tag():
+def test_tiff_read_empty_nodata_tag():
 
     ds = gdal.Open('data/empty_nodata.tif')
     if ds.GetRasterBand(1).GetNoDataValue() is not None:
@@ -2486,7 +2486,7 @@ def tiff_read_empty_nodata_tag():
 # imagery and getting IMAGE_STRUCTURE metadata
 
 
-def tiff_read_strace_check():
+def test_tiff_read_strace_check():
 
     if not sys.platform.startswith('linux'):
         return 'skip'
@@ -2521,7 +2521,7 @@ def tiff_read_strace_check():
 # Test GDAL_READDIR_LIMIT_ON_OPEN
 
 
-def tiff_read_readdir_limit_on_open():
+def test_tiff_read_readdir_limit_on_open():
 
     gdal.SetConfigOption('GDAL_READDIR_LIMIT_ON_OPEN', '1')
 
@@ -2540,7 +2540,7 @@ def tiff_read_readdir_limit_on_open():
 #
 
 
-def tiff_read_minisblack_as_rgba():
+def test_tiff_read_minisblack_as_rgba():
 
     if not gdaltest.supports_force_rgba:
         return 'skip'
@@ -2561,7 +2561,7 @@ def tiff_read_minisblack_as_rgba():
 #
 
 
-def tiff_read_colortable_as_rgba():
+def test_tiff_read_colortable_as_rgba():
 
     if not gdaltest.supports_force_rgba:
         return 'skip'
@@ -2582,7 +2582,7 @@ def tiff_read_colortable_as_rgba():
 #
 
 
-def tiff_read_logl_as_rgba():
+def test_tiff_read_logl_as_rgba():
 
     if not gdaltest.supports_force_rgba:
         return 'skip'
@@ -2604,7 +2604,7 @@ def tiff_read_logl_as_rgba():
 #
 
 
-def tiff_read_strip_separate_as_rgba():
+def test_tiff_read_strip_separate_as_rgba():
 
     if not gdaltest.supports_force_rgba:
         return 'skip'
@@ -2648,7 +2648,7 @@ def tiff_read_strip_separate_as_rgba():
 #
 
 
-def tiff_read_tiled_separate_as_rgba():
+def test_tiff_read_tiled_separate_as_rgba():
 
     if not gdaltest.supports_force_rgba:
         return 'skip'
@@ -2691,7 +2691,7 @@ def tiff_read_tiled_separate_as_rgba():
 #
 
 
-def tiff_read_scanline_more_than_2GB():
+def test_tiff_read_scanline_more_than_2GB():
 
     with gdaltest.error_handler():
         ds = gdal.Open('data/scanline_more_than_2GB.tif')
@@ -2704,7 +2704,7 @@ def tiff_read_scanline_more_than_2GB():
 # about it
 
 
-def tiff_read_wrong_number_extrasamples():
+def test_tiff_read_wrong_number_extrasamples():
 
     gdal.ErrorReset()
     with gdaltest.error_handler():
@@ -2724,7 +2724,7 @@ def tiff_read_wrong_number_extrasamples():
 # Test that we can read a one-trip TIFF without StripByteCounts tag
 
 
-def tiff_read_one_strip_no_bytecount():
+def test_tiff_read_one_strip_no_bytecount():
 
     gdal.PushErrorHandler('CPLQuietErrorHandler')
     ds = gdal.Open('data/one_strip_nobytecount.tif')
@@ -2740,7 +2740,7 @@ def tiff_read_one_strip_no_bytecount():
 # Test GDAL_GEOREF_SOURCES
 
 
-def tiff_read_nogeoref():
+def test_tiff_read_nogeoref():
 
     tests = [(None, True, True, False, 'LOCAL_CS["PAM"]', (1.0, 2.0, 3.0, 4.0, 5.0, 6.0)),
              (None, True, True, True, 'LOCAL_CS["PAM"]', (1.0, 2.0, 3.0, 4.0, 5.0, 6.0)),
@@ -2809,7 +2809,7 @@ def tiff_read_nogeoref():
 # Test GDAL_GEOREF_SOURCES
 
 
-def tiff_read_inconsistent_georef():
+def test_tiff_read_inconsistent_georef():
 
     tests = [(None, True, True, True, 'LOCAL_CS["PAM"]', (1.0, 2.0, 3.0, 4.0, 5.0, 6.0)),
              (None, False, True, True, '26711', (440720.0, 60.0, 0.0, 3751320.0, 0.0, -60.0)),
@@ -2870,7 +2870,7 @@ def tiff_read_inconsistent_georef():
 # Test GDAL_GEOREF_SOURCES
 
 
-def tiff_read_gcp_internal_and_auxxml():
+def test_tiff_read_gcp_internal_and_auxxml():
 
     tests = [(None, True, 'LOCAL_CS["PAM"]', 1),
              (None, False, '4326', 2),
@@ -2931,7 +2931,7 @@ def handler(self, eErrClass, err_no, msg):
             self.msg = msg
 
 
-def tiff_read_aux():
+def test_tiff_read_aux():
 
     gdal.ErrorReset()
     ds = gdal.Open('data/f2r23.tif')
@@ -2946,7 +2946,7 @@ def tiff_read_aux():
     return 'success'
 
 
-def tiff_read_one_band_from_two_bands():
+def test_tiff_read_one_band_from_two_bands():
 
     gdal.Translate('/vsimem/tiff_read_one_band_from_two_bands.tif', 'data/byte.tif', options='-b 1 -b 1')
     gdal.Translate('/vsimem/tiff_read_one_band_from_two_bands_dst.tif', '/vsimem/tiff_read_one_band_from_two_bands.tif', options='-b 1')
@@ -2963,7 +2963,7 @@ def tiff_read_one_band_from_two_bands():
     return 'success'
 
 
-def tiff_read_jpeg_cloud_optimized():
+def test_tiff_read_jpeg_cloud_optimized():
 
     for i in range(4):
         ds = gdal.Open('data/byte_ovr_jpeg_tablesmode%d.tif' % i)
@@ -2985,7 +2985,7 @@ def tiff_read_jpeg_cloud_optimized():
 # error while jpeg-8 works fine
 
 
-def tiff_read_corrupted_jpeg_cloud_optimized():
+def test_tiff_read_corrupted_jpeg_cloud_optimized():
 
     ds = gdal.Open('data/byte_ovr_jpeg_tablesmode_not_correctly_set_on_ovr.tif')
     cs0 = ds.GetRasterBand(1).Checksum()
@@ -3009,7 +3009,7 @@ def tiff_read_corrupted_jpeg_cloud_optimized():
 # Test reading YCbCr images with LZW compression
 
 
-def tiff_read_ycbcr_lzw():
+def test_tiff_read_ycbcr_lzw():
 
     tests = [('ycbcr_11_lzw.tif', 13459, 12939, 12414),
              ('ycbcr_12_lzw.tif', 13565, 13105, 12660),
@@ -3043,7 +3043,7 @@ def tiff_read_ycbcr_lzw():
 # Test reading YCbCr images with nbits > 8
 
 
-def tiff_read_ycbcr_int12():
+def test_tiff_read_ycbcr_int12():
 
     with gdaltest.error_handler():
         ds = gdal.Open('data/int12_ycbcr_contig.tif')
@@ -3061,7 +3061,7 @@ def tiff_read_ycbcr_int12():
 # Test reading band unit from VERT_CS unit (#6675)
 
 
-def tiff_read_unit_from_srs():
+def test_tiff_read_unit_from_srs():
 
     ds = gdal.GetDriverByName('GTiff').Create('/vsimem/tiff_read_unit_from_srs.tif', 1, 1)
     sr = osr.SpatialReference()
@@ -3085,7 +3085,7 @@ def tiff_read_unit_from_srs():
 # Test reading ArcGIS 9.3 .aux.xml
 
 
-def tiff_read_arcgis93_geodataxform_gcp():
+def test_tiff_read_arcgis93_geodataxform_gcp():
 
     ds = gdal.Open('data/arcgis93_geodataxform_gcp.tif')
     if ds.GetGCPProjection().find('26712') < 0:
@@ -3108,7 +3108,7 @@ def tiff_read_arcgis93_geodataxform_gcp():
 # Test reading file with block size > signed int 32 bit
 
 
-def tiff_read_block_width_above_32bit():
+def test_tiff_read_block_width_above_32bit():
 
     with gdaltest.error_handler():
         ds = gdal.Open('data/block_width_above_32bit.tif')
@@ -3121,7 +3121,7 @@ def tiff_read_block_width_above_32bit():
 # Test reading file with image size > signed int 32 bit
 
 
-def tiff_read_image_width_above_32bit():
+def test_tiff_read_image_width_above_32bit():
 
     with gdaltest.error_handler():
         ds = gdal.Open('data/image_width_above_32bit.tif')
@@ -3134,7 +3134,7 @@ def tiff_read_image_width_above_32bit():
 # Test reading file with image size > signed int 32 bit
 
 
-def tiff_read_second_image_width_above_32bit():
+def test_tiff_read_second_image_width_above_32bit():
 
     ds = gdal.Open('data/second_image_width_above_32bit.tif')
     with gdaltest.error_handler():
@@ -3154,7 +3154,7 @@ def tiff_read_second_image_width_above_32bit():
 # Test reading file with minimal number of warnings without warning
 
 
-def tiff_read_minimum_tiff_tags_no_warning():
+def test_tiff_read_minimum_tiff_tags_no_warning():
 
     gdal.ErrorReset()
     ds = gdal.Open('data/minimum_tiff_tags_no_warning.tif')
@@ -3172,7 +3172,7 @@ def tiff_read_minimum_tiff_tags_no_warning():
 # Test reading file with minimal number of warnings but warning
 
 
-def tiff_read_minimum_tiff_tags_with_warning():
+def test_tiff_read_minimum_tiff_tags_with_warning():
 
     gdal.ErrorReset()
     with gdaltest.error_handler():
@@ -3217,7 +3217,7 @@ def check_libtiff_internal_or_at_least(expected_maj, expected_min, expected_micr
 ###############################################################################
 
 
-def tiff_read_unknown_compression():
+def test_tiff_read_unknown_compression():
 
     with gdaltest.error_handler():
         ds = gdal.Open('data/unknown_compression.tif')
@@ -3229,7 +3229,7 @@ def tiff_read_unknown_compression():
 ###############################################################################
 
 
-def tiff_read_leak_ZIPSetupDecode():
+def test_tiff_read_leak_ZIPSetupDecode():
 
     if not check_libtiff_internal_or_at_least(4, 0, 8):
         return 'skip'
@@ -3244,7 +3244,7 @@ def tiff_read_leak_ZIPSetupDecode():
 ###############################################################################
 
 
-def tiff_read_excessive_memory_TIFFFillStrip():
+def test_tiff_read_excessive_memory_TIFFFillStrip():
 
     if not check_libtiff_internal_or_at_least(4, 0, 8):
         return 'skip'
@@ -3259,7 +3259,7 @@ def tiff_read_excessive_memory_TIFFFillStrip():
 ###############################################################################
 
 
-def tiff_read_excessive_memory_TIFFFillStrip2():
+def test_tiff_read_excessive_memory_TIFFFillStrip2():
 
     if not check_libtiff_internal_or_at_least(4, 0, 8):
         return 'skip'
@@ -3273,7 +3273,7 @@ def tiff_read_excessive_memory_TIFFFillStrip2():
 ###############################################################################
 
 
-def tiff_read_excessive_memory_TIFFFillTile():
+def test_tiff_read_excessive_memory_TIFFFillTile():
 
     if not check_libtiff_internal_or_at_least(4, 0, 8):
         return 'skip'
@@ -3287,7 +3287,7 @@ def tiff_read_excessive_memory_TIFFFillTile():
 ###############################################################################
 
 
-def tiff_read_big_strip():
+def test_tiff_read_big_strip():
 
     if not check_libtiff_internal_or_at_least(4, 0, 8):
         return 'skip'
@@ -3307,7 +3307,7 @@ def tiff_read_big_strip():
 # (Potentially) test libtiff CHUNKY_STRIP_READ_SUPPORT
 
 
-def tiff_read_big_strip_chunky_way():
+def test_tiff_read_big_strip_chunky_way():
 
     gdal.Translate('/vsimem/test.tif', 'data/byte.tif', options='-co compress=lzw -outsize 1000 2001  -co blockysize=2001 -r bilinear')
     ds = gdal.Open('/vsimem/test.tif')
@@ -3323,7 +3323,7 @@ def tiff_read_big_strip_chunky_way():
 ###############################################################################
 
 
-def tiff_read_big_tile():
+def test_tiff_read_big_tile():
 
     if not check_libtiff_internal_or_at_least(4, 0, 8):
         return 'skip'
@@ -3342,7 +3342,7 @@ def tiff_read_big_tile():
 ###############################################################################
 
 
-def tiff_read_huge_tile():
+def test_tiff_read_huge_tile():
 
     with gdaltest.error_handler():
         ds = gdal.Open('data/hugeblocksize.tif')
@@ -3354,7 +3354,7 @@ def tiff_read_huge_tile():
 ###############################################################################
 
 
-def tiff_read_huge_number_strips():
+def test_tiff_read_huge_number_strips():
 
     md = gdal.GetDriverByName('GTiff').GetMetadata()
     if md['LIBTIFF'] != 'INTERNAL':
@@ -3369,7 +3369,7 @@ def tiff_read_huge_number_strips():
 ###############################################################################
 
 
-def tiff_read_huge_implied_number_strips():
+def test_tiff_read_huge_implied_number_strips():
 
     if not check_libtiff_internal_or_at_least(4, 0, 10):
         return 'skip'
@@ -3382,7 +3382,7 @@ def tiff_read_huge_implied_number_strips():
 ###############################################################################
 
 
-def tiff_read_many_blocks():
+def test_tiff_read_many_blocks():
 
     # Runs super slow on some Windows configs
     if sys.platform == 'win32':
@@ -3405,7 +3405,7 @@ def tiff_read_many_blocks():
 ###############################################################################
 
 
-def tiff_read_many_blocks_truncated():
+def test_tiff_read_many_blocks_truncated():
 
     md = gdal.GetDriverByName('GTiff').GetMetadata()
     if md['LIBTIFF'] != 'INTERNAL':
@@ -3424,7 +3424,7 @@ def tiff_read_many_blocks_truncated():
 # Test reading  images with nbits > 32
 
 
-def tiff_read_uint33():
+def test_tiff_read_uint33():
 
     with gdaltest.error_handler():
         ds = gdal.Open('data/uint33.tif')
@@ -3442,7 +3442,7 @@ def tiff_read_uint33():
 # Test fix for https://bugs.chromium.org/p/oss-fuzz/issues/detail?id=1545
 
 
-def tiff_read_corrupted_deflate_singlestrip():
+def test_tiff_read_corrupted_deflate_singlestrip():
 
     if not check_libtiff_internal_or_at_least(4, 0, 8):
         return 'skip'
@@ -3457,7 +3457,7 @@ def tiff_read_corrupted_deflate_singlestrip():
 # Test fix for https://bugs.chromium.org/p/oss-fuzz/issues/detail?id=1563
 
 
-def tiff_read_packbits_not_enough_data():
+def test_tiff_read_packbits_not_enough_data():
 
     if not check_libtiff_internal_or_at_least(4, 0, 8):
         return 'skip'
@@ -3472,7 +3472,7 @@ def tiff_read_packbits_not_enough_data():
 # Test reading images with more than 2billion blocks for a single band
 
 
-def tiff_read_toomanyblocks():
+def test_tiff_read_toomanyblocks():
 
     with gdaltest.error_handler():
         ds = gdal.Open('data/toomanyblocks.tif')
@@ -3486,7 +3486,7 @@ def tiff_read_toomanyblocks():
 ###############################################################################
 # Test reading images with more than 2billion blocks for all bands
 
-def tiff_read_toomanyblocks_separate():
+def test_tiff_read_toomanyblocks_separate():
 
     with gdaltest.error_handler():
         ds = gdal.Open('data/toomanyblocks_separate.tif')
@@ -3501,7 +3501,7 @@ def tiff_read_toomanyblocks_separate():
 # tag is lesser than the number of strips
 
 
-def tiff_read_size_of_stripbytecount_lower_than_stripcount():
+def test_tiff_read_size_of_stripbytecount_lower_than_stripcount():
 
     ds = gdal.Open('data/size_of_stripbytecount_lower_than_stripcount.tif')
     # There are 3 strips but StripByteCounts has just two elements;
@@ -3530,7 +3530,7 @@ def tiff_read_size_of_stripbytecount_lower_than_stripcount():
 ###############################################################################
 # Test different datatypes for StripOffsets tag with little/big, classic/bigtiff
 
-def tiff_read_stripoffset_types():
+def test_tiff_read_stripoffset_types():
 
     tests = [
         ('data/classictiff_one_block_byte.tif', []),  # unsupported
@@ -3583,7 +3583,7 @@ def tiff_read_stripoffset_types():
 # http://www.libjpeg-turbo.org/pmwiki/uploads/About/TwoIssueswiththeJPEGStandard.pdf
 
 
-def tiff_read_progressive_jpeg_denial_of_service():
+def test_tiff_read_progressive_jpeg_denial_of_service():
 
     if not check_libtiff_internal_or_at_least(4, 0, 9):
         return 'skip'
@@ -3617,7 +3617,7 @@ def tiff_read_progressive_jpeg_denial_of_service():
 ###############################################################################
 # Test reading old-style LZW
 
-def tiff_read_old_style_lzw():
+def test_tiff_read_old_style_lzw():
 
     if not check_libtiff_internal_or_at_least(4, 0, 8):
         return 'skip'
@@ -3637,7 +3637,7 @@ def tiff_read_old_style_lzw():
 # mmap emulation)
 
 
-def tiff_read_mmap_interface():
+def test_tiff_read_mmap_interface():
 
     src_ds = gdal.Open('data/byte.tif')
     tmpfile = '/vsimem/tiff_read_mmap_interface.tif'
@@ -3682,7 +3682,7 @@ def tiff_read_mmap_interface():
 # strip height, instead of just the number of lines needed to reach the
 # image height.
 
-def tiff_read_jpeg_too_big_last_stripe():
+def test_tiff_read_jpeg_too_big_last_stripe():
 
     if not check_libtiff_internal_or_at_least(4, 0, 9):
         return 'skip'
@@ -3709,7 +3709,7 @@ def tiff_read_jpeg_too_big_last_stripe():
 ###############################################################################
 # Test reading GeoTIFF file with negative ScaleY in GeoPixelScale tag
 
-def tiff_read_negative_scaley():
+def test_tiff_read_negative_scaley():
 
     ds = gdal.Open('data/negative_scaley.tif')
     with gdaltest.error_handler():
@@ -3735,7 +3735,7 @@ def tiff_read_negative_scaley():
 # Test ZSTD compression
 
 
-def tiff_read_zstd():
+def test_tiff_read_zstd():
 
     md = gdal.GetDriverByName('GTiff').GetMetadata()
     if md['DMD_CREATIONOPTIONLIST'].find('ZSTD') == -1:
@@ -3748,7 +3748,7 @@ def tiff_read_zstd():
 # Test ZSTD compression
 
 
-def tiff_read_zstd_corrupted():
+def test_tiff_read_zstd_corrupted():
 
     md = gdal.GetDriverByName('GTiff').GetMetadata()
     if md['DMD_CREATIONOPTIONLIST'].find('ZSTD') == -1:
@@ -3762,7 +3762,7 @@ def tiff_read_zstd_corrupted():
 # Test ZSTD compression
 
 
-def tiff_read_zstd_corrupted2():
+def test_tiff_read_zstd_corrupted2():
 
     md = gdal.GetDriverByName('GTiff').GetMetadata()
     if md['DMD_CREATIONOPTIONLIST'].find('ZSTD') == -1:
@@ -3777,7 +3777,7 @@ def tiff_read_zstd_corrupted2():
 # Test WEBP compression
 
 
-def tiff_read_webp():
+def test_tiff_read_webp():
 
     md = gdal.GetDriverByName('GTiff').GetMetadata()
     if md['DMD_CREATIONOPTIONLIST'].find('WEBP') == -1:
@@ -3792,7 +3792,7 @@ def tiff_read_webp():
 # Test WEBP compression
 
 
-def tiff_read_webp_huge_single_strip():
+def test_tiff_read_webp_huge_single_strip():
 
     md = gdal.GetDriverByName('GTiff').GetMetadata()
     if md['DMD_CREATIONOPTIONLIST'].find('WEBP') == -1:
@@ -3806,7 +3806,7 @@ def tiff_read_webp_huge_single_strip():
 ###############################################################################
 
 
-def tiff_read_1bit_2bands():
+def test_tiff_read_1bit_2bands():
     ds = gdal.Open('data/1bit_2bands.tif')
     cs = (ds.GetRasterBand(1).Checksum(), ds.GetRasterBand(2).Checksum())
     if cs != (200, 824):
@@ -3818,7 +3818,7 @@ def tiff_read_1bit_2bands():
 # Test LERC compression
 
 
-def tiff_read_lerc():
+def test_tiff_read_lerc():
 
     md = gdal.GetDriverByName('GTiff').GetMetadata()
     if md['DMD_CREATIONOPTIONLIST'].find('LERC') == -1:
@@ -3830,7 +3830,7 @@ def tiff_read_lerc():
 ###############################################################################
 
 
-def tiff_read_overview_of_external_mask():
+def test_tiff_read_overview_of_external_mask():
 
     filename = '/vsimem/tiff_read_overview_of_external_mask.tif'
     gdal.Translate(filename, 'data/byte.tif', options='-b 1 -mask 1')
@@ -3864,134 +3864,134 @@ def tiff_read_overview_of_external_mask():
 
 
 gdaltest_list = [
-    tiff_read_off,
-    tiff_check_alpha,
-    tiff_read_cmyk_rgba,
-    tiff_read_cmyk_raw,
-    tiff_read_ojpeg,
-    tiff_read_gzip,
-    tiff_read_zip_1,
-    tiff_read_zip_2,
-    tiff_read_zip_3,
-    tiff_read_zip_4,
-    tiff_read_zip_5,
-    tiff_read_tar_1,
-    tiff_read_tar_2,
-    tiff_read_tgz_1,
-    tiff_read_tgz_2,
-    tiff_grads,
-    tiff_citation,
-    tiff_linearparmunits,
-    tiff_linearparmunits2,
-    tiff_g4_split,
-    tiff_multi_images,
-    tiff_vsimem,
-    tiff_vsizip_and_mem,
-    tiff_ProjectedCSTypeGeoKey_only,
-    tiff_GTModelTypeGeoKey_only,
-    tiff_12bitjpeg,
-    tiff_read_stats_from_pam,
-    tiff_read_from_tab,
-    tiff_read_pixelispoint,
-    tiff_read_geomatrix,
-    tiff_read_corrupted_gtiff,
-    tiff_read_tag_without_null_byte,
-    tiff_read_buggy_packbits,
-    tiff_read_rpc_txt,
-    tiff_read_rpc_tif,
-    tiff_small,
-    tiff_dos_strip_chop,
-    tiff_read_exif_and_gps,
-    tiff_jpeg_rgba_pixel_interleaved,
-    tiff_jpeg_rgba_band_interleaved,
-    tiff_read_huge4GB,
-    tiff_read_bigtiff,
-    tiff_read_tiff_metadata,
-    tiff_read_irregular_tile_size_jpeg_in_tiff,
-    tiff_direct_and_virtual_mem_io,
-    tiff_read_empty_nodata_tag,
-    tiff_read_strace_check,
-    tiff_read_readdir_limit_on_open,
-    tiff_read_minisblack_as_rgba,
-    tiff_read_colortable_as_rgba,
-    tiff_read_logl_as_rgba,
-    tiff_read_strip_separate_as_rgba,
-    tiff_read_tiled_separate_as_rgba,
-    tiff_read_scanline_more_than_2GB,
-    tiff_read_wrong_number_extrasamples,
-    tiff_read_one_strip_no_bytecount,
-
-    tiff_read_md1,
-    tiff_read_md2,
-    tiff_read_md3,
-    tiff_read_md4,
-    tiff_read_md5,
-    tiff_read_md6,
-    tiff_read_md7,
-    tiff_read_md8,
-    tiff_read_md9,
-    tiff_read_md10,
-    tiff_read_md11,
-    tiff_read_md12,
-
-    tiff_read_nogeoref,
-    tiff_read_inconsistent_georef,
-    tiff_read_gcp_internal_and_auxxml,
-
-    tiff_read_aux,
-
-    tiff_read_one_band_from_two_bands,
-
-    tiff_read_jpeg_cloud_optimized,
-    tiff_read_corrupted_jpeg_cloud_optimized,
-
-    tiff_read_ycbcr_lzw,
-    tiff_read_ycbcr_int12,
-
-    tiff_read_unit_from_srs,
-    tiff_read_arcgis93_geodataxform_gcp,
-    tiff_read_block_width_above_32bit,
-    tiff_read_image_width_above_32bit,
-    tiff_read_second_image_width_above_32bit,
-    tiff_read_minimum_tiff_tags_no_warning,
-    tiff_read_minimum_tiff_tags_with_warning,
-    tiff_read_unknown_compression,
-    tiff_read_leak_ZIPSetupDecode,
-    tiff_read_excessive_memory_TIFFFillStrip,
-    tiff_read_excessive_memory_TIFFFillStrip2,
-    tiff_read_excessive_memory_TIFFFillTile,
-    tiff_read_big_strip,
-    tiff_read_big_strip_chunky_way,
-    tiff_read_big_tile,
-    tiff_read_huge_tile,
-    tiff_read_huge_number_strips,
-    tiff_read_huge_implied_number_strips,
-    tiff_read_many_blocks,
-    tiff_read_many_blocks_truncated,
-    tiff_read_uint33,
-    tiff_read_corrupted_deflate_singlestrip,
-    tiff_read_packbits_not_enough_data,
-    tiff_read_toomanyblocks,
-    tiff_read_toomanyblocks_separate,
-    tiff_read_size_of_stripbytecount_lower_than_stripcount,
-    tiff_read_stripoffset_types,
-    tiff_read_progressive_jpeg_denial_of_service,
-    tiff_read_old_style_lzw,
-    tiff_read_mmap_interface,
-    tiff_read_jpeg_too_big_last_stripe,
-    tiff_read_negative_scaley,
-    tiff_read_zstd,
-    tiff_read_zstd_corrupted,
-    tiff_read_zstd_corrupted2,
-    tiff_read_1bit_2bands,
-    tiff_read_lerc,
-    tiff_read_overview_of_external_mask,
-
-    tiff_read_online_1,
-    tiff_read_online_2,
-
-    tiff_read_webp,
-    tiff_read_webp_huge_single_strip,
+    test_tiff_read_off,
+    test_tiff_check_alpha,
+    test_tiff_read_cmyk_rgba,
+    test_tiff_read_cmyk_raw,
+    test_tiff_read_ojpeg,
+    test_tiff_read_gzip,
+    test_tiff_read_zip_1,
+    test_tiff_read_zip_2,
+    test_tiff_read_zip_3,
+    test_tiff_read_zip_4,
+    test_tiff_read_zip_5,
+    test_tiff_read_tar_1,
+    test_tiff_read_tar_2,
+    test_tiff_read_tgz_1,
+    test_tiff_read_tgz_2,
+    test_tiff_grads,
+    test_tiff_citation,
+    test_tiff_linearparmunits,
+    test_tiff_linearparmunits2,
+    test_tiff_g4_split,
+    test_tiff_multi_images,
+    test_tiff_vsimem,
+    test_tiff_vsizip_and_mem,
+    test_tiff_ProjectedCSTypeGeoKey_only,
+    test_tiff_GTModelTypeGeoKey_only,
+    test_tiff_12bitjpeg,
+    test_tiff_read_stats_from_pam,
+    test_tiff_read_from_tab,
+    test_tiff_read_pixelispoint,
+    test_tiff_read_geomatrix,
+    test_tiff_read_corrupted_gtiff,
+    test_tiff_read_tag_without_null_byte,
+    test_tiff_read_buggy_packbits,
+    test_tiff_read_rpc_txt,
+    test_tiff_read_rpc_tif,
+    test_tiff_small,
+    test_tiff_dos_strip_chop,
+    test_tiff_read_exif_and_gps,
+    test_tiff_jpeg_rgba_pixel_interleaved,
+    test_tiff_jpeg_rgba_band_interleaved,
+    test_tiff_read_huge4GB,
+    test_tiff_read_bigtiff,
+    test_tiff_read_tiff_metadata,
+    test_tiff_read_irregular_tile_size_jpeg_in_tiff,
+    test_tiff_direct_and_virtual_mem_io,
+    test_tiff_read_empty_nodata_tag,
+    test_tiff_read_strace_check,
+    test_tiff_read_readdir_limit_on_open,
+    test_tiff_read_minisblack_as_rgba,
+    test_tiff_read_colortable_as_rgba,
+    test_tiff_read_logl_as_rgba,
+    test_tiff_read_strip_separate_as_rgba,
+    test_tiff_read_tiled_separate_as_rgba,
+    test_tiff_read_scanline_more_than_2GB,
+    test_tiff_read_wrong_number_extrasamples,
+    test_tiff_read_one_strip_no_bytecount,
+
+    test_tiff_read_md1,
+    test_tiff_read_md2,
+    test_tiff_read_md3,
+    test_tiff_read_md4,
+    test_tiff_read_md5,
+    test_tiff_read_md6,
+    test_tiff_read_md7,
+    test_tiff_read_md8,
+    test_tiff_read_md9,
+    test_tiff_read_md10,
+    test_tiff_read_md11,
+    test_tiff_read_md12,
+
+    test_tiff_read_nogeoref,
+    test_tiff_read_inconsistent_georef,
+    test_tiff_read_gcp_internal_and_auxxml,
+
+    test_tiff_read_aux,
+
+    test_tiff_read_one_band_from_two_bands,
+
+    test_tiff_read_jpeg_cloud_optimized,
+    test_tiff_read_corrupted_jpeg_cloud_optimized,
+
+    test_tiff_read_ycbcr_lzw,
+    test_tiff_read_ycbcr_int12,
+
+    test_tiff_read_unit_from_srs,
+    test_tiff_read_arcgis93_geodataxform_gcp,
+    test_tiff_read_block_width_above_32bit,
+    test_tiff_read_image_width_above_32bit,
+    test_tiff_read_second_image_width_above_32bit,
+    test_tiff_read_minimum_tiff_tags_no_warning,
+    test_tiff_read_minimum_tiff_tags_with_warning,
+    test_tiff_read_unknown_compression,
+    test_tiff_read_leak_ZIPSetupDecode,
+    test_tiff_read_excessive_memory_TIFFFillStrip,
+    test_tiff_read_excessive_memory_TIFFFillStrip2,
+    test_tiff_read_excessive_memory_TIFFFillTile,
+    test_tiff_read_big_strip,
+    test_tiff_read_big_strip_chunky_way,
+    test_tiff_read_big_tile,
+    test_tiff_read_huge_tile,
+    test_tiff_read_huge_number_strips,
+    test_tiff_read_huge_implied_number_strips,
+    test_tiff_read_many_blocks,
+    test_tiff_read_many_blocks_truncated,
+    test_tiff_read_uint33,
+    test_tiff_read_corrupted_deflate_singlestrip,
+    test_tiff_read_packbits_not_enough_data,
+    test_tiff_read_toomanyblocks,
+    test_tiff_read_toomanyblocks_separate,
+    test_tiff_read_size_of_stripbytecount_lower_than_stripcount,
+    test_tiff_read_stripoffset_types,
+    test_tiff_read_progressive_jpeg_denial_of_service,
+    test_tiff_read_old_style_lzw,
+    test_tiff_read_mmap_interface,
+    test_tiff_read_jpeg_too_big_last_stripe,
+    test_tiff_read_negative_scaley,
+    test_tiff_read_zstd,
+    test_tiff_read_zstd_corrupted,
+    test_tiff_read_zstd_corrupted2,
+    test_tiff_read_1bit_2bands,
+    test_tiff_read_lerc,
+    test_tiff_read_overview_of_external_mask,
+
+    test_tiff_read_online_1,
+    test_tiff_read_online_2,
+
+    test_tiff_read_webp,
+    test_tiff_read_webp_huge_single_strip,
 ]
 
 
diff --git a/autotest/gcore/tiff_srs.py b/autotest/gcore/tiff_srs.py
index 3b2e15d9dfec..03fed36f28d6 100755
--- a/autotest/gcore/tiff_srs.py
+++ b/autotest/gcore/tiff_srs.py
@@ -43,7 +43,7 @@
 # Test fix for #4677:
 
 
-def tiff_srs_without_linear_units():
+def test_tiff_srs_without_linear_units():
 
     sr = osr.SpatialReference()
     sr.ImportFromProj4('+proj=vandg +datum=WGS84')
@@ -73,7 +73,7 @@ def tiff_srs_without_linear_units():
 # Test COMPDCS without VerticalCSType
 
 
-def tiff_srs_compd_cs():
+def test_tiff_srs_compd_cs():
 
     sr = osr.SpatialReference()
     # EPSG:7400 without the Authority
@@ -121,7 +121,7 @@ def tiff_srs_compd_cs():
 # Test reading a GeoTIFF with both StdParallel1 and ScaleAtNatOrigin defined (#5791)
 
 
-def tiff_srs_weird_mercator_2sp():
+def test_tiff_srs_weird_mercator_2sp():
 
     ds = gdal.Open('data/weird_mercator_2sp.tif')
     gdal.PushErrorHandler()
@@ -167,7 +167,7 @@ def tiff_srs_weird_mercator_2sp():
 # Test reading ESRI WGS_1984_Web_Mercator_Auxiliary_Sphere
 
 
-def tiff_srs_WGS_1984_Web_Mercator_Auxiliary_Sphere():
+def test_tiff_srs_WGS_1984_Web_Mercator_Auxiliary_Sphere():
 
     ds = gdal.Open('data/WGS_1984_Web_Mercator_Auxiliary_Sphere.tif')
     wkt = ds.GetProjectionRef()
@@ -200,7 +200,7 @@ def tiff_srs_WGS_1984_Web_Mercator_Auxiliary_Sphere():
 # Test writing and reading various angular units
 
 
-def tiff_srs_angular_units():
+def test_tiff_srs_angular_units():
 
     ds = gdal.GetDriverByName('GTiff').Create('/vsimem/tiff_srs_angular_units.tif', 1, 1)
     ds.SetProjection("""GEOGCS["WGS 84 (arc-second)",
@@ -301,7 +301,7 @@ def tiff_srs_angular_units():
 # Test writing and reading a unknown datum but with a known ellipsoid
 
 
-def tiff_custom_datum_known_ellipsoid():
+def test_tiff_custom_datum_known_ellipsoid():
 
     ds = gdal.GetDriverByName('GTiff').Create('/vsimem/tiff_custom_datum_known_ellipsoid.tif', 1, 1)
     ds.SetProjection("""GEOGCS["WGS 84 based",
@@ -327,7 +327,7 @@ def tiff_custom_datum_known_ellipsoid():
 # override to another unit (us-feet) ... (#6210)
 
 
-def tiff_srs_epsg_2853_with_us_feet():
+def test_tiff_srs_epsg_2853_with_us_feet():
 
     old_val = gdal.GetConfigOption('GTIFF_IMPORT_FROM_EPSG')
     gdal.SetConfigOption('GTIFF_IMPORT_FROM_EPSG', 'YES')
@@ -354,7 +354,7 @@ def tiff_srs_epsg_2853_with_us_feet():
 # Test reading a SRS with a PCSCitationGeoKey = "LUnits = ..."
 
 
-def tiff_srs_PCSCitationGeoKey_LUnits():
+def test_tiff_srs_PCSCitationGeoKey_LUnits():
 
     ds = gdal.GetDriverByName('GTiff').Create('/vsimem/tiff_srs_PCSCitationGeoKey_LUnits.tif', 1, 1)
     ds.SetProjection("""PROJCS["UTM Zone 32, Northern Hemisphere",
@@ -388,7 +388,7 @@ def tiff_srs_PCSCitationGeoKey_LUnits():
 # Test reading a geotiff key ProjectionGeoKey (Short,1): Unknown-3856
 
 
-def tiff_srs_projection_3856():
+def test_tiff_srs_projection_3856():
 
     ds = gdal.Open('data/projection_3856.tif')
     wkt = ds.GetProjectionRef()
@@ -405,7 +405,7 @@ def tiff_srs_projection_3856():
 # Test reading a geotiff with a LOCAL_CS and a Imagine citation
 
 
-def tiff_srs_imagine_localcs_citation():
+def test_tiff_srs_imagine_localcs_citation():
 
     ds = gdal.Open('data/imagine_localcs_citation.tif')
     wkt = ds.GetProjectionRef()
@@ -423,7 +423,7 @@ def tiff_srs_imagine_localcs_citation():
 # override the default coming from EPSG
 
 
-def tiff_srs_towgs84_override():
+def test_tiff_srs_towgs84_override():
 
     ds = gdal.Open('data/gtiff_towgs84_override.tif')
     wkt = ds.GetProjectionRef()
@@ -440,7 +440,7 @@ def tiff_srs_towgs84_override():
 # Test reading PCSCitationGeoKey (#7199)
 
 
-def tiff_srs_pcscitation():
+def test_tiff_srs_pcscitation():
 
     ds = gdal.Open('data/pcscitation.tif')
     wkt = ds.GetProjectionRef()
@@ -560,18 +560,18 @@ def test_tiff_srs_proj4(proj4):
 
 
 gdaltest_list = [
-    tiff_srs_without_linear_units,
-    tiff_srs_compd_cs,
-    tiff_srs_weird_mercator_2sp,
-    tiff_srs_WGS_1984_Web_Mercator_Auxiliary_Sphere,
-    tiff_srs_angular_units,
-    tiff_custom_datum_known_ellipsoid,
-    tiff_srs_epsg_2853_with_us_feet,
-    tiff_srs_PCSCitationGeoKey_LUnits,
-    tiff_srs_projection_3856,
-    tiff_srs_imagine_localcs_citation,
-    tiff_srs_towgs84_override,
-    tiff_srs_pcscitation,
+    test_tiff_srs_without_linear_units,
+    test_tiff_srs_compd_cs,
+    test_tiff_srs_weird_mercator_2sp,
+    test_tiff_srs_WGS_1984_Web_Mercator_Auxiliary_Sphere,
+    test_tiff_srs_angular_units,
+    test_tiff_custom_datum_known_ellipsoid,
+    test_tiff_srs_epsg_2853_with_us_feet,
+    test_tiff_srs_PCSCitationGeoKey_LUnits,
+    test_tiff_srs_projection_3856,
+    test_tiff_srs_imagine_localcs_citation,
+    test_tiff_srs_towgs84_override,
+    test_tiff_srs_pcscitation,
 ]
 
 if __name__ == '__main__':
diff --git a/autotest/gcore/tiff_write.py b/autotest/gcore/tiff_write.py
index 5d4039f4e644..787725d740ff 100755
--- a/autotest/gcore/tiff_write.py
+++ b/autotest/gcore/tiff_write.py
@@ -45,7 +45,7 @@
 # Get the GeoTIFF driver, and verify a few things about it.
 
 
-def tiff_write_1():
+def test_tiff_write_1():
 
     gdaltest.tiff_drv = gdal.GetDriverByName('GTiff')
     if gdaltest.tiff_drv is None:
@@ -63,7 +63,7 @@ def tiff_write_1():
 # Create a simple file by copying from an existing one.
 
 
-def tiff_write_2():
+def test_tiff_write_2():
 
     src_ds = gdal.Open('data/cfloat64.tif')
 
@@ -100,7 +100,7 @@ def tiff_write_2():
 # Create a simple file by copying from an existing one.
 
 
-def tiff_write_3():
+def test_tiff_write_3():
 
     src_ds = gdal.Open('data/utmsmall.tif')
 
@@ -125,7 +125,7 @@ def tiff_write_3():
 # Create a tiled file.
 
 
-def tiff_write_4():
+def test_tiff_write_4():
 
     try:
         from osgeo import gdalnumeric
@@ -218,7 +218,7 @@ def tiff_write_4():
 # Write a file with GCPs.
 
 
-def tiff_write_5():
+def test_tiff_write_5():
 
     src_ds = gdal.Open('data/gcps.vrt')
 
@@ -260,7 +260,7 @@ def tiff_write_5():
 # (this is a sign of an older libtiff...)
 
 
-def tiff_write_6():
+def test_tiff_write_6():
 
     md = gdaltest.tiff_drv.GetMetadata()
     if md['DMD_CREATIONOPTIONLIST'].find('BigTIFF') == -1:
@@ -298,7 +298,7 @@ def tiff_write_6():
 # if BigTIFF is not supported (this is a sign of an older libtiff...)
 
 
-def tiff_write_7():
+def test_tiff_write_7():
 
     md = gdaltest.tiff_drv.GetMetadata()
     if md['DMD_CREATIONOPTIONLIST'].find('BigTIFF') == -1:
@@ -331,7 +331,7 @@ def tiff_write_7():
 # Test a mixture of reading and writing on a PACKBITS compressed file.
 
 
-def tiff_write_8():
+def test_tiff_write_8():
 
     options = ['TILED=YES', 'BLOCKXSIZE=32', 'BLOCKYSIZE=32', 'COMPRESS=PACKBITS']
     ds = gdaltest.tiff_drv.Create('tmp/test_8.tif', 200, 200, 1,
@@ -361,7 +361,7 @@ def tiff_write_8():
 # Create a simple file by copying from an existing one.
 
 
-def tiff_write_9():
+def test_tiff_write_9():
 
     src_ds = gdal.Open('data/byte.tif')
     new_ds = gdaltest.tiff_drv.CreateCopy('tmp/test_9.tif', src_ds,
@@ -386,7 +386,7 @@ def tiff_write_9():
 # 1bit file but with band interleaving, and odd size (not multiple of 8) #1957
 
 
-def tiff_write_10():
+def test_tiff_write_10():
 
     ut = gdaltest.GDALTest('GTiff', 'oddsize_1bit2b.tif', 2, 5918,
                            options=['NBITS=1', 'INTERLEAVE=BAND'])
@@ -396,7 +396,7 @@ def tiff_write_10():
 # Simple 1 bit file, treated through the GTiffBitmapBand class.
 
 
-def tiff_write_11():
+def test_tiff_write_11():
 
     ut = gdaltest.GDALTest('GTiff', 'oddsize1bit.tif', 1, 5918,
                            options=['NBITS=1', 'COMPRESS=CCITTFAX4'])
@@ -406,7 +406,7 @@ def tiff_write_11():
 # Read JPEG Compressed YCbCr subsampled image.
 
 
-def tiff_write_12():
+def test_tiff_write_12():
 
     md = gdaltest.tiff_drv.GetMetadata()
     if md['DMD_CREATIONOPTIONLIST'].find('JPEG') == -1:
@@ -423,7 +423,7 @@ def tiff_write_12():
 # Write JPEG Compressed YCbCr subsampled image.
 
 
-def tiff_write_13():
+def test_tiff_write_13():
 
     md = gdaltest.tiff_drv.GetMetadata()
     if md['DMD_CREATIONOPTIONLIST'].find('JPEG') == -1:
@@ -461,7 +461,7 @@ def tiff_write_13():
 # Test creating an in memory copy.
 
 
-def tiff_write_14():
+def test_tiff_write_14():
 
     tst = gdaltest.GDALTest('GTiff', 'byte.tif', 1, 4672)
 
@@ -472,7 +472,7 @@ def tiff_write_14():
 # Test that we can restrict metadata and georeferencing in the output
 # file using the PROFILE creation option with CreateCopy()
 
-def tiff_write_15():
+def test_tiff_write_15():
 
     ds_in = gdal.Open('data/byte.vrt')
 
@@ -524,7 +524,7 @@ def tiff_write_15():
 # file using the PROFILE creation option with Create()
 
 
-def tiff_write_16():
+def test_tiff_write_16():
 
     ds_in = gdal.Open('data/byte.vrt')
 
@@ -590,7 +590,7 @@ def tiff_write_16():
 # Test writing a TIFF with an RPC tag.
 
 
-def tiff_write_17():
+def test_tiff_write_17():
 
     # Translate RPC controlled data to GeoTIFF.
 
@@ -657,10 +657,10 @@ def tiff_write_17():
 # case (#3996)
 
 
-def tiff_write_17_disable_readdir():
+def test_tiff_write_17_disable_readdir():
     oldval = gdal.GetConfigOption('GDAL_DISABLE_READDIR_ON_OPEN')
     gdal.SetConfigOption('GDAL_DISABLE_READDIR_ON_OPEN', 'TRUE')
-    ret = tiff_write_17()
+    ret = test_tiff_write_17()
     gdal.SetConfigOption('GDAL_DISABLE_READDIR_ON_OPEN', oldval)
     return ret
 
@@ -668,7 +668,7 @@ def tiff_write_17_disable_readdir():
 # Test writing a TIFF with an RPB file and IMD file.
 
 
-def tiff_write_18():
+def test_tiff_write_18():
 
     # Translate RPC controlled data to GeoTIFF.
 
@@ -753,10 +753,10 @@ def tiff_write_18():
 # case (#3996)
 
 
-def tiff_write_18_disable_readdir():
+def test_tiff_write_18_disable_readdir():
     oldval = gdal.GetConfigOption('GDAL_DISABLE_READDIR_ON_OPEN')
     gdal.SetConfigOption('GDAL_DISABLE_READDIR_ON_OPEN', 'TRUE')
-    ret = tiff_write_18()
+    ret = test_tiff_write_18()
     gdal.SetConfigOption('GDAL_DISABLE_READDIR_ON_OPEN', oldval)
     return ret
 
@@ -764,7 +764,7 @@ def tiff_write_18_disable_readdir():
 # Test writing a TIFF with an _RPC.TXT
 
 
-def tiff_write_rpc_txt():
+def test_tiff_write_rpc_txt():
 
     # Translate RPC controlled data to GeoTIFF.
 
@@ -829,7 +829,7 @@ def tiff_write_rpc_txt():
 # Test writing a TIFF with an RPC in .aux.xml
 
 
-def tiff_write_rpc_in_pam():
+def test_tiff_write_rpc_in_pam():
 
     ds_in = gdal.Open('data/rpc.vrt')
     rpc_md = ds_in.GetMetadata('RPC')
@@ -870,7 +870,7 @@ def tiff_write_rpc_in_pam():
 # Test the write of a pixel-interleaved image with NBITS = 7
 
 
-def tiff_write_19():
+def test_tiff_write_19():
 
     src_ds = gdal.Open('data/contig_strip.tif')
 
@@ -901,7 +901,7 @@ def tiff_write_19():
 # Also test unsetting those tags (#5619)
 
 
-def tiff_write_20():
+def test_tiff_write_20():
 
     new_ds = gdaltest.tiff_drv.Create('tmp/tags.tif', 1, 1, 1)
 
@@ -989,7 +989,7 @@ def tiff_write_20():
 # Test RGBA images with TIFFTAG_EXTRASAMPLES=EXTRASAMPLE_ASSOCALPHA
 
 
-def tiff_write_21():
+def test_tiff_write_21():
 
     src_ds = gdal.Open('data/stefan_full_rgba.tif')
 
@@ -1017,7 +1017,7 @@ def tiff_write_21():
 # Test RGBA images with TIFFTAG_EXTRASAMPLES=EXTRASAMPLE_UNSPECIFIED
 
 
-def tiff_write_22():
+def test_tiff_write_22():
 
     src_ds = gdal.Open('data/stefan_full_rgba_photometric_rgb.tif')
 
@@ -1045,7 +1045,7 @@ def tiff_write_22():
 # Test grey+alpha images with ALPHA=YES
 
 
-def tiff_write_23():
+def test_tiff_write_23():
 
     src_ds = gdal.Open('data/stefan_full_greyalpha.tif')
 
@@ -1073,7 +1073,7 @@ def tiff_write_23():
 # Test grey+alpha images without ALPHA=YES
 
 
-def tiff_write_24():
+def test_tiff_write_24():
 
     src_ds = gdal.Open('data/stefan_full_greyalpha.tif')
 
@@ -1101,7 +1101,7 @@ def tiff_write_24():
 # Read a CIELAB image to test the RGBA image TIFF interface
 
 
-def tiff_write_25():
+def test_tiff_write_25():
 
     src_ds = gdal.Open('data/cielab.tif')
     if src_ds.RasterCount != 4:
@@ -1130,7 +1130,7 @@ def tiff_write_25():
 ###############################################################################
 # Test color table in a 8 bit image
 
-def tiff_write_26():
+def test_tiff_write_26():
 
     ds = gdaltest.tiff_drv.Create('tmp/ct8.tif', 1, 1, 1, gdal.GDT_Byte)
 
@@ -1167,7 +1167,7 @@ def tiff_write_26():
 # Test color table in a 16 bit image
 
 
-def tiff_write_27():
+def test_tiff_write_27():
 
     ds = gdaltest.tiff_drv.Create('tmp/ct16.tif', 1, 1, 1, gdal.GDT_UInt16)
 
@@ -1210,7 +1210,7 @@ def tiff_write_27():
 # Test SetRasterColorInterpretation on a 2 channel image
 
 
-def tiff_write_28():
+def test_tiff_write_28():
 
     ds = gdaltest.tiff_drv.Create('tmp/greyalpha.tif', 1, 1, 2)
 
@@ -1238,7 +1238,7 @@ def tiff_write_28():
 # Test SetRasterColorInterpretation on a 4 channel image
 
 
-def tiff_write_29():
+def test_tiff_write_29():
 
     # When creating a 4 channel image with PHOTOMETRIC=RGB,
     # TIFFTAG_EXTRASAMPLES=EXTRASAMPLE_UNSPECIFIED
@@ -1321,7 +1321,7 @@ def tiff_write_29():
 ###############################################################################
 # Create a BigTIFF image with BigTIFF=YES
 
-def tiff_write_30():
+def test_tiff_write_30():
 
     md = gdaltest.tiff_drv.GetMetadata()
     if md['DMD_CREATIONOPTIONLIST'].find('BigTIFF') == -1:
@@ -1353,7 +1353,7 @@ def tiff_write_30():
 # Create a BigTIFF image implicitly (more than 4Gb).
 
 
-def tiff_write_31():
+def test_tiff_write_31():
 
     md = gdaltest.tiff_drv.GetMetadata()
     if md['DMD_CREATIONOPTIONLIST'].find('BigTIFF') == -1:
@@ -1386,7 +1386,7 @@ def tiff_write_31():
 # Create a rotated image
 
 
-def tiff_write_32():
+def test_tiff_write_32():
 
     ds_in = gdal.Open('data/byte.vrt')
 
@@ -1428,7 +1428,7 @@ def tiff_write_32():
 # (BASELINE is tested by tiff_write_15)
 
 
-def tiff_write_33():
+def test_tiff_write_33():
 
     ds_in = gdal.Open('data/byte.vrt')
 
@@ -1484,7 +1484,7 @@ def tiff_write_33():
 # (BASELINE is tested by tiff_write_16)
 
 
-def tiff_write_34():
+def test_tiff_write_34():
 
     ds = gdaltest.tiff_drv.Create('tmp/tw_34.tif', 1, 1, gdal.GDT_Byte,
                                   options=['PROFILE=GeoTIFF'])
@@ -1539,7 +1539,7 @@ def tiff_write_34():
 # when metadata is too big to fit into the GDALGeotiff tag
 
 
-def tiff_write_35():
+def test_tiff_write_35():
 
     # I've no idea why this works, and why this rolled in a
     # loop doesn't work... Python gurus please fix that !
@@ -1643,63 +1643,63 @@ def tiff_write_big_odd_bits(vrtfilename, tmpfilename, nbits, interleaving):
 ###############################################################################
 # Test copy with NBITS=9, INTERLEAVE=PIXEL
 
-def tiff_write_36():
+def test_tiff_write_36():
     return tiff_write_big_odd_bits('data/uint16_3band.vrt', 'tmp/tw_36.tif', 9, 'PIXEL')
 
 
 ###############################################################################
 # Test copy with NBITS=9, INTERLEAVE=BAND
 
-def tiff_write_37():
+def test_tiff_write_37():
     return tiff_write_big_odd_bits('data/uint16_3band.vrt', 'tmp/tw_37.tif', 9, 'BAND')
 
 ###############################################################################
 # Test copy with NBITS=12, INTERLEAVE=PIXEL
 
 
-def tiff_write_38():
+def test_tiff_write_38():
     return tiff_write_big_odd_bits('data/uint16_3band.vrt', 'tmp/tw_38.tif', 12, 'PIXEL')
 
 ###############################################################################
 # Test copy with NBITS=12, INTERLEAVE=BAND
 
 
-def tiff_write_39():
+def test_tiff_write_39():
     return tiff_write_big_odd_bits('data/uint16_3band.vrt', 'tmp/tw_39.tif', 12, 'BAND')
 
 ###############################################################################
 # Test copy with NBITS=17, INTERLEAVE=PIXEL
 
 
-def tiff_write_40():
+def test_tiff_write_40():
     return tiff_write_big_odd_bits('data/uint32_3band.vrt', 'tmp/tw_40tif', 17, 'PIXEL')
 
 ###############################################################################
 # Test copy with NBITS=17, INTERLEAVE=BAND
 
 
-def tiff_write_41():
+def test_tiff_write_41():
     return tiff_write_big_odd_bits('data/uint32_3band.vrt', 'tmp/tw_41.tif', 17, 'BAND')
 
 ###############################################################################
 # Test copy with NBITS=24, INTERLEAVE=PIXEL
 
 
-def tiff_write_42():
+def test_tiff_write_42():
     return tiff_write_big_odd_bits('data/uint32_3band.vrt', 'tmp/tw_42.tif', 24, 'PIXEL')
 
 ###############################################################################
 # Test copy with NBITS=24, INTERLEAVE=BAND
 
 
-def tiff_write_43():
+def test_tiff_write_43():
     return tiff_write_big_odd_bits('data/uint32_3band.vrt', 'tmp/tw_43.tif', 24, 'BAND')
 
 
 ###############################################################################
 # Test create with NBITS=9 and preservation through CreateCopy of NBITS
 
-def tiff_write_44():
+def test_tiff_write_44():
 
     ds = gdaltest.tiff_drv.Create('tmp/tw_44.tif', 1, 1, 1, gdal.GDT_UInt16, options=['NBITS=9'])
     ds = None
@@ -1734,7 +1734,7 @@ def tiff_write_44():
 # Test create with NBITS=17 and preservation through CreateCopy of NBITS
 
 
-def tiff_write_45():
+def test_tiff_write_45():
 
     ds = gdaltest.tiff_drv.Create('tmp/tw_45.tif', 1, 1, 1, gdal.GDT_UInt32, options=['NBITS=17'])
     ds = None
@@ -1769,7 +1769,7 @@ def tiff_write_45():
 ###############################################################################
 # Test correct round-tripping of ReadBlock/WriteBlock
 
-def tiff_write_46():
+def test_tiff_write_46():
     import struct
 
     with gdaltest.SetCacheMax(0):
@@ -1814,17 +1814,17 @@ def tiff_write_46():
 # Test #2457
 
 
-def tiff_write_47():
+def test_tiff_write_47():
 
     with gdaltest.SetCacheMax(0):
-        ret = tiff_write_3()
+        ret = test_tiff_write_3()
     return ret
 
 
 ###############################################################################
 # Test #2457 with nYOff of RasterIO not aligned on the block height
 
-def tiff_write_48():
+def test_tiff_write_48():
 
     with gdaltest.SetCacheMax(0):
 
@@ -1852,7 +1852,7 @@ def tiff_write_48():
 ###############################################################################
 # Test copying a CMYK TIFF into another CMYK TIFF
 
-def tiff_write_49():
+def test_tiff_write_49():
 
     # We open the source as RAW to get the CMYK bands
     src_ds = gdal.Open('GTIFF_RAW:data/rgbsmall_cmyk.tif')
@@ -1885,7 +1885,7 @@ def tiff_write_49():
 ###############################################################################
 # Test creating a CMYK TIFF from another CMYK TIFF
 
-def tiff_write_50():
+def test_tiff_write_50():
 
     # We open the source as RAW to get the CMYK bands
     src_ds = gdal.Open('GTIFF_RAW:data/rgbsmall_cmyk.tif')
@@ -1921,7 +1921,7 @@ def tiff_write_50():
 # Test proper clearing of existing GeoTIFF tags when updating the projection.
 # http://trac.osgeo.org/gdal/ticket/2546
 
-def tiff_write_51():
+def test_tiff_write_51():
     shutil.copyfile('data/utmsmall.tif', 'tmp/tiff_write_51.tif')
 
     ds = gdal.Open('tmp/tiff_write_51.tif', gdal.GA_Update)
@@ -1966,7 +1966,7 @@ def tiff_write_51():
 # Test the ability to update a paletted TIFF files color table.
 
 
-def tiff_write_52():
+def test_tiff_write_52():
     shutil.copyfile('data/test_average_palette.tif', 'tmp/tiff_write_52.tif')
 
     test_ct_data = [(255, 0, 0), (0, 255, 0), (0, 0, 255), (255, 255, 255, 0)]
@@ -1998,7 +1998,7 @@ def tiff_write_52():
 # Test the ability to create a paletted image and then update later.
 
 
-def tiff_write_53():
+def test_tiff_write_53():
     test_ct_data = [(255, 0, 0), (0, 255, 0), (0, 0, 255), (255, 255, 255, 0)]
 
     test_ct = gdal.ColorTable()
@@ -2035,7 +2035,7 @@ def tiff_write_53():
 # Same as before except we create an overview before reopening the file and
 # adding the color table
 
-def tiff_write_53_bis():
+def test_tiff_write_53_bis():
     test_ct_data = [(255, 0, 0), (0, 255, 0), (0, 0, 255), (255, 255, 255, 0)]
 
     test_ct = gdal.ColorTable()
@@ -2073,7 +2073,7 @@ def tiff_write_53_bis():
 # and write data into it without closing it and re-opening it (#2645)
 
 
-def tiff_write_54():
+def test_tiff_write_54():
 
     md = gdaltest.tiff_drv.GetMetadata()
     if md['DMD_CREATIONOPTIONLIST'].find('JPEG') == -1:
@@ -2103,7 +2103,7 @@ def tiff_write_54():
 ###############################################################################
 # Test creating and reading an equirectangular file with all parameters (#2706)
 
-def tiff_write_55():
+def test_tiff_write_55():
 
     ds = gdaltest.tiff_drv.Create('tmp/tiff_write_55.tif',
                                   256, 256, 1)
@@ -2131,7 +2131,7 @@ def tiff_write_55():
 # Test clearing the colormap from an existing paletted TIFF file.
 
 
-def tiff_write_56():
+def test_tiff_write_56():
 
     md = gdaltest.tiff_drv.GetMetadata()
     # Expected to fail with libtiff < 4.0 as it needs TIFFUnsetField, so skip it
@@ -2174,7 +2174,7 @@ def tiff_write_56():
 # Test replacing normal norm up georef with rotated georef (#2625)
 
 
-def tiff_write_57():
+def test_tiff_write_57():
 
     md = gdaltest.tiff_drv.GetMetadata()
     # Expected to fail with libtiff < 4.0 as it needs TIFFUnsetField, so skip it
@@ -2207,7 +2207,7 @@ def tiff_write_57():
 # Test writing partial end strips (#2748)
 
 
-def tiff_write_58():
+def test_tiff_write_58():
 
     md = gdaltest.tiff_drv.GetMetadata()
 
@@ -2234,7 +2234,7 @@ def tiff_write_58():
 # Test fix for #2759
 
 
-def tiff_write_59():
+def test_tiff_write_59():
     import struct
 
     ret = 'success'
@@ -2284,7 +2284,7 @@ def tiff_write_59():
 # Test fix for #2760
 
 
-def tiff_write_60():
+def test_tiff_write_60():
 
     tuples = [('TFW=YES', 'tmp/tiff_write_60.tfw'),
               ('WORLDFILE=YES', 'tmp/tiff_write_60.wld')]
@@ -2343,7 +2343,7 @@ def tiff_write_60():
 # Test BigTIFF=IF_NEEDED creation option
 
 
-def tiff_write_61():
+def test_tiff_write_61():
 
     md = gdaltest.tiff_drv.GetMetadata()
     if md['DMD_CREATIONOPTIONLIST'].find('BigTIFF') == -1:
@@ -2376,7 +2376,7 @@ def tiff_write_61():
 # Test BigTIFF=IF_SAFER creation option
 
 
-def tiff_write_62():
+def test_tiff_write_62():
 
     md = gdaltest.tiff_drv.GetMetadata()
     if md['DMD_CREATIONOPTIONLIST'].find('BigTIFF') == -1:
@@ -2409,7 +2409,7 @@ def tiff_write_62():
 # Test BigTIFF=NO creation option when creating a BigTIFF file would be required
 
 
-def tiff_write_63():
+def test_tiff_write_63():
 
     md = gdaltest.tiff_drv.GetMetadata()
     if md['DMD_CREATIONOPTIONLIST'].find('BigTIFF') == -1:
@@ -2431,7 +2431,7 @@ def tiff_write_63():
 # Test returned projection in WKT format for a WGS84 GeoTIFF (#2787)
 
 
-def tiff_write_64():
+def test_tiff_write_64():
 
     ds = gdaltest.tiff_drv.Create('tmp/tiff_write_64.tif', 1, 1, 1)
     srs = osr.SpatialReference()
@@ -2459,7 +2459,7 @@ def tiff_write_64():
 # Verify that we can write XML metadata.
 
 
-def tiff_write_65():
+def test_tiff_write_65():
 
     ds = gdaltest.tiff_drv.Create('tmp/tiff_write_65.tif', 10, 10)
 
@@ -2484,7 +2484,7 @@ def tiff_write_65():
 ###############################################################################
 # Verify that we can write and read a band-interleaved GeoTIFF with 65535 bands (#2838)
 
-def tiff_write_66():
+def test_tiff_write_66():
 
     if gdal.GetConfigOption('SKIP_MEM_INTENSIVE_TEST') is not None:
         return 'skip'
@@ -2512,7 +2512,7 @@ def tiff_write_66():
 ###############################################################################
 # Verify that we can write and read a pixel-interleaved GeoTIFF with 65535 bands (#2838)
 
-def tiff_write_67():
+def test_tiff_write_67():
 
     if gdal.GetConfigOption('SKIP_MEM_INTENSIVE_TEST') is not None:
         return 'skip'
@@ -2540,7 +2540,7 @@ def tiff_write_67():
 # Verify that we can set the color table after a Create() (scenario hit by map.tif in #2820)
 
 
-def tiff_write_68():
+def test_tiff_write_68():
 
     ds = gdaltest.tiff_drv.Create('tmp/tiff_write_68.tif', 151, 161, options=['COMPRESS=LZW'])
     ct = gdal.ColorTable()
@@ -2565,7 +2565,7 @@ def tiff_write_68():
 # Verify GTiffRasterBand::NullBlock() when reading empty block without any nodata value set
 
 
-def tiff_write_69():
+def test_tiff_write_69():
 
     ds = gdaltest.tiff_drv.Create('tmp/tiff_write_69.tif', 32, 32, 1, gdal.GDT_Int16, options=['SPARSE_OK=YES'])
     ds = None
@@ -2584,7 +2584,7 @@ def tiff_write_69():
 # Verify GTiffRasterBand::NullBlock() when reading empty block with nodata value set
 
 
-def tiff_write_70():
+def test_tiff_write_70():
 
     ref_ds = gdaltest.tiff_drv.Create('tmp/tiff_write_70_ref.tif', 32, 32, 1, gdal.GDT_Int16)
     ref_ds.GetRasterBand(1).Fill(-32768)
@@ -2645,7 +2645,7 @@ def tiff_write_70():
 ###############################################################################
 # Test reading in a real BigTIFF file (on filesystems supporting sparse files)
 
-def tiff_write_71():
+def test_tiff_write_71():
 
     import struct
 
@@ -2694,7 +2694,7 @@ def tiff_write_71():
 # and has not been rewritten later (#3021)
 
 
-def tiff_write_72():
+def test_tiff_write_72():
 
     shutil.copyfile('data/byte.tif', 'tmp/byte.tif')
     ds = gdal.Open('tmp/byte.tif', gdal.GA_Update)
@@ -2731,7 +2731,7 @@ def tiff_write_72():
 # and has not been rewritten later (#3021)
 
 
-def tiff_write_73():
+def test_tiff_write_73():
 
     out_ds = gdaltest.tiff_drv.Create('tmp/tiff_write_73.tif', 10, 10, options=['ENDIANNESS=LITTLE'])
     out_ds.SetGeoTransform([1, 0.01, 0, 1, 0, -0.01])
@@ -2782,7 +2782,7 @@ def tiff_write_73():
 # Verify we can write 12bit jpeg encoded tiff.
 
 
-def tiff_write_74():
+def test_tiff_write_74():
 
     md = gdaltest.tiff_drv.GetMetadata()
     if md['DMD_CREATIONOPTIONLIST'].find('JPEG') == -1:
@@ -2859,7 +2859,7 @@ def tiff_write_74():
 # Verify that FlushCache() alone doesn't cause crash (#3067 )
 
 
-def tiff_write_75():
+def test_tiff_write_75():
 
     ds = gdaltest.tiff_drv.Create('tmp/tiff_write_75.tif', 1, 1, 1)
     ds.FlushCache()
@@ -2873,7 +2873,7 @@ def tiff_write_75():
 # Test generating a G4 band to use the TIFFWriteScanline()
 
 
-def tiff_write_76():
+def test_tiff_write_76():
 
     src_ds = gdal.Open('data/slim_g4.tif')
     compression = src_ds.GetMetadata('IMAGE_STRUCTURE')['COMPRESSION']
@@ -2898,7 +2898,7 @@ def tiff_write_76():
 # Test generating & reading a 8bit all-in-one-strip multiband TIFF (#3904)
 
 
-def tiff_write_77():
+def test_tiff_write_77():
 
     src_ds = gdaltest.tiff_drv.Create('tmp/tiff_write_77_src.tif', 1, 5000, 3)
     src_ds.GetRasterBand(2).Fill(255)
@@ -2951,7 +2951,7 @@ def tiff_write_77():
 # Test generating & reading a YCbCr JPEG all-in-one-strip multiband TIFF (#3259)
 
 
-def tiff_write_78():
+def test_tiff_write_78():
 
     md = gdaltest.tiff_drv.GetMetadata()
     if md['DMD_CREATIONOPTIONLIST'].find('JPEG') == -1:
@@ -3021,7 +3021,7 @@ def tiff_write_78():
 # Test reading & updating GDALMD_AREA_OR_POINT (#3522)
 
 
-def tiff_write_79():
+def test_tiff_write_79():
 
     ds = gdaltest.tiff_drv.Create('tmp/tiff_write_79.tif', 1, 1)
     srs = osr.SpatialReference()
@@ -3132,7 +3132,7 @@ def tiff_write_79():
 # Test SetOffset() & SetScale()
 
 
-def tiff_write_80():
+def test_tiff_write_80():
 
     # First part : test storing and retrieving scale & offsets from internal metadata
     ds = gdaltest.tiff_drv.Create('tmp/tiff_write_80.tif', 1, 1)
@@ -3253,7 +3253,7 @@ def tiff_write_80():
 # Test retrieving GCP from PAM
 
 
-def tiff_write_81():
+def test_tiff_write_81():
 
     shutil.copyfile('data/byte.tif', 'tmp/tiff_write_81.tif')
     f = open('tmp/tiff_write_81.tif.aux.xml', 'wt')
@@ -3290,7 +3290,7 @@ def tiff_write_81():
 # Test writing & reading a signedbyte 8 bit geotiff
 
 
-def tiff_write_82():
+def test_tiff_write_82():
 
     src_ds = gdal.Open('data/byte.tif')
     ds = gdaltest.tiff_drv.CreateCopy('tmp/tiff_write_82.tif', src_ds, options=['PIXELTYPE=SIGNEDBYTE'])
@@ -3312,7 +3312,7 @@ def tiff_write_82():
 ###############################################################################
 # Test writing & reading an indexed GeoTIFF with an extra transparency band (#3547)
 
-def tiff_write_83():
+def test_tiff_write_83():
 
     # Test Create() method
     ds = gdaltest.tiff_drv.Create('tmp/tiff_write_83.tif', 1, 1, 2)
@@ -3355,7 +3355,7 @@ def tiff_write_83():
 # changes in the midst of encoding of tiles (#3539)
 
 
-def tiff_write_84():
+def test_tiff_write_84():
 
     md = gdaltest.tiff_drv.GetMetadata()
 
@@ -3397,7 +3397,7 @@ def tiff_write_84():
 # Test SetUnitType()
 
 
-def tiff_write_85():
+def test_tiff_write_85():
 
     # First part : test storing and retrieving unittype from internal metadata
     ds = gdaltest.tiff_drv.Create('tmp/tiff_write_85.tif', 1, 1)
@@ -3507,7 +3507,7 @@ def tiff_write_85():
 # properly with earlier versions of ArcGIS, requested by ESRI.
 
 
-def tiff_write_86():
+def test_tiff_write_86():
 
     gdal.SetConfigOption('ESRI_XML_PAM', 'YES')
 
@@ -3599,7 +3599,7 @@ def tiff_write_86():
 ###############################################################################
 # Test COPY_SRC_OVERVIEWS creation option
 
-def tiff_write_87():
+def test_tiff_write_87():
 
     gdal.Translate('tmp/tiff_write_87_src.tif', 'data/utmsmall.tif', options='-a_nodata 0')
 
@@ -3666,7 +3666,7 @@ def tiff_write_87():
 # on BIGTIFF creation
 
 
-def tiff_write_88():
+def test_tiff_write_88():
     md = gdaltest.tiff_drv.GetMetadata()
     if md['DMD_CREATIONOPTIONLIST'].find('BigTIFF') == -1:
         return 'skip'
@@ -3729,7 +3729,7 @@ def tiff_write_88():
 # Test JPEG_QUALITY propagation while creating a (default compressed) mask band
 
 
-def tiff_write_89():
+def test_tiff_write_89():
     md = gdaltest.tiff_drv.GetMetadata()
     if md['DMD_CREATIONOPTIONLIST'].find('BigTIFF') == -1:
         return 'skip'
@@ -3787,7 +3787,7 @@ def tiff_write_89():
 # Test JPEG_QUALITY propagation while creating (internal) overviews
 
 
-def tiff_write_90():
+def test_tiff_write_90():
     md = gdaltest.tiff_drv.GetMetadata()
     if md['DMD_CREATIONOPTIONLIST'].find('BigTIFF') == -1:
         return 'skip'
@@ -3835,7 +3835,7 @@ def tiff_write_90():
 ###############################################################################
 # Test JPEG_QUALITY propagation while creating (internal) overviews after re-opening
 
-def tiff_write_91():
+def test_tiff_write_91():
     md = gdaltest.tiff_drv.GetMetadata()
     if md['DMD_CREATIONOPTIONLIST'].find('BigTIFF') == -1:
         return 'skip'
@@ -3889,7 +3889,7 @@ def tiff_write_91():
 # Test the effect of JPEG_QUALITY_OVERVIEW while creating (internal) overviews after re-opening
 # This will test that we correctly guess the quality of the main dataset
 
-def tiff_write_92():
+def test_tiff_write_92():
     md = gdaltest.tiff_drv.GetMetadata()
     if md['DMD_CREATIONOPTIONLIST'].find('BigTIFF') == -1:
         return 'skip'
@@ -3950,7 +3950,7 @@ def tiff_write_92():
 # Test JPEG_QUALITY_OVERVIEW propagation while creating external overviews
 
 
-def tiff_write_93():
+def test_tiff_write_93():
     md = gdaltest.tiff_drv.GetMetadata()
     if md['DMD_CREATIONOPTIONLIST'].find('BigTIFF') == -1:
         return 'skip'
@@ -4018,7 +4018,7 @@ def tiff_write_93():
 # Test CreateCopy() of a dataset with a mask into a JPEG compressed dataset
 # and check JPEG_QUALITY propagation without warning
 
-def tiff_write_94():
+def test_tiff_write_94():
     md = gdaltest.tiff_drv.GetMetadata()
     if md['DMD_CREATIONOPTIONLIST'].find('BigTIFF') == -1:
         return 'skip'
@@ -4059,7 +4059,7 @@ def tiff_write_94():
 # overview levels from the overview size
 
 
-def tiff_write_95():
+def test_tiff_write_95():
 
     src_ds = gdaltest.tiff_drv.Create('tmp/tiff_write_95_src.tif', 7171, 6083, options=['SPARSE_OK=YES'])
     src_ds.BuildOverviews('NONE', overviewlist=[2, 4, 8, 16, 32, 64])
@@ -4082,7 +4082,7 @@ def tiff_write_95():
 # Test that COPY_SRC_OVERVIEWS combined with GDAL_TIFF_INTERNAL_MASK=YES work well
 
 
-def tiff_write_96():
+def test_tiff_write_96():
 
     gdal.SetConfigOption('GDAL_TIFF_INTERNAL_MASK', 'YES')
     src_ds = gdaltest.tiff_drv.Create('tmp/tiff_write_96_src.tif', 100, 100)
@@ -4132,7 +4132,7 @@ def tiff_write_96():
 # Create a simple file by copying from an existing one - PixelIsPoint
 
 
-def tiff_write_97():
+def test_tiff_write_97():
 
     gdal.SetConfigOption('GTIFF_POINT_GEO_IGNORE', 'FALSE')
 
@@ -4208,7 +4208,7 @@ def tiff_write_97():
 # Create a rotated geotiff file (uses a geomatrix) with - PixelIsPoint
 
 
-def tiff_write_98():
+def test_tiff_write_98():
 
     gdal.SetConfigOption('GTIFF_POINT_GEO_IGNORE', 'FALSE')
 
@@ -4262,7 +4262,7 @@ def tiff_write_98():
 # Create copy into a RGB JPEG-IN-TIFF (#3887)
 
 
-def tiff_write_99():
+def test_tiff_write_99():
 
     src_ds = gdal.Open('data/rgbsmall.tif')
     new_ds = gdaltest.tiff_drv.CreateCopy('tmp/test_99.tif', src_ds, options=['COMPRESS=JPEG'])
@@ -4287,7 +4287,7 @@ def tiff_write_99():
 # Create copy into a 2 band JPEG-IN-TIFF (#3887)
 
 
-def tiff_write_100():
+def test_tiff_write_100():
 
     src_ds = gdaltest.tiff_drv.Create('/vsimem/test_100_src.tif', 16, 16, 2)
     src_ds.GetRasterBand(1).Fill(255)
@@ -4315,7 +4315,7 @@ def tiff_write_100():
 # reloading. tiff_write_78 doesn't produce enough big data to trigger this...
 
 
-def tiff_write_101():
+def test_tiff_write_101():
 
     if not gdaltest.run_slow_tests():
         return 'skip'
@@ -4393,7 +4393,7 @@ def tiff_write_101():
 # Test writing and reading back COMPD_CS
 
 
-def tiff_write_102():
+def test_tiff_write_102():
 
     ds = gdaltest.tiff_drv.Create('/vsimem/tiff_write_102.tif', 1, 1)
     sr = osr.SpatialReference()
@@ -4439,7 +4439,7 @@ def tiff_write_102():
 # Test -co COPY_SRC_OVERVIEWS=YES on a multiband source with external overviews (#3938)
 
 
-def tiff_write_103():
+def test_tiff_write_103():
     import test_cli_utilities
     if test_cli_utilities.get_gdaladdo_path() is None:
         return 'skip'
@@ -4471,7 +4471,7 @@ def tiff_write_103():
 # Confirm as best we can that we can write geotiff files with detailed
 # projection parameters with the correct linear units set.  (#3901)
 
-def tiff_write_104():
+def test_tiff_write_104():
 
     src_ds = gdal.Open('data/spaf27_correct.tif')
     dst_ds = gdaltest.tiff_drv.CreateCopy('tmp/test_104.tif', src_ds)
@@ -4498,7 +4498,7 @@ def tiff_write_104():
 # projection parameters with the correct linear units set.  (#3901)
 
 
-def tiff_write_105():
+def test_tiff_write_105():
 
     # This hangs forever with libtiff 3.8.2, so skip it
     md = gdaltest.tiff_drv.GetMetadata()
@@ -4531,7 +4531,7 @@ def tiff_write_105():
 # Test the direct copy mechanism of JPEG source
 
 
-def tiff_write_106(filename='../gdrivers/data/byte_with_xmp.jpg', options=None, check_cs=True):
+def test_tiff_write_106(filename='../gdrivers/data/byte_with_xmp.jpg', options=None, check_cs=True):
 
     if options is None:
         options = ['COMPRESS=JPEG']
@@ -4573,54 +4573,54 @@ def tiff_write_106(filename='../gdrivers/data/byte_with_xmp.jpg', options=None,
     return 'success'
 
 
-def tiff_write_107():
-    return tiff_write_106(options=['COMPRESS=JPEG', 'BLOCKYSIZE=8'])
+def test_tiff_write_107():
+    return test_tiff_write_106(options=['COMPRESS=JPEG', 'BLOCKYSIZE=8'])
 
 
-def tiff_write_108():
-    return tiff_write_106(options=['COMPRESS=JPEG', 'BLOCKYSIZE=20'])
+def test_tiff_write_108():
+    return test_tiff_write_106(options=['COMPRESS=JPEG', 'BLOCKYSIZE=20'])
 
 
-def tiff_write_109():
-    return tiff_write_106(options=['COMPRESS=JPEG', 'TILED=YES', 'BLOCKYSIZE=16', 'BLOCKXSIZE=16'])
+def test_tiff_write_109():
+    return test_tiff_write_106(options=['COMPRESS=JPEG', 'TILED=YES', 'BLOCKYSIZE=16', 'BLOCKXSIZE=16'])
 
 # Strip organization of YCbCr does *NOT* give exact pixels w.r.t. original image
 
 
-def tiff_write_110():
-    return tiff_write_106(filename='../gdrivers/data/albania.jpg', check_cs=False)
+def test_tiff_write_110():
+    return test_tiff_write_106(filename='../gdrivers/data/albania.jpg', check_cs=False)
 
 # Whole copy of YCbCr *DOES* give exact pixels w.r.t. original image
 
 
-def tiff_write_111():
-    return tiff_write_106(filename='../gdrivers/data/albania.jpg', options=['COMPRESS=JPEG', 'BLOCKYSIZE=260'])
+def test_tiff_write_111():
+    return test_tiff_write_106(filename='../gdrivers/data/albania.jpg', options=['COMPRESS=JPEG', 'BLOCKYSIZE=260'])
 
 
-def tiff_write_111_bis():
-    return tiff_write_106(filename='../gdrivers/data/albania.jpg', options=['COMPRESS=JPEG', 'BLOCKYSIZE=260', 'INTERLEAVE=PIXEL'])
+def test_tiff_write_111_bis():
+    return test_tiff_write_106(filename='../gdrivers/data/albania.jpg', options=['COMPRESS=JPEG', 'BLOCKYSIZE=260', 'INTERLEAVE=PIXEL'])
 
 
-def tiff_write_111_ter():
-    return tiff_write_106(filename='../gdrivers/data/albania.jpg', options=['COMPRESS=JPEG', 'BLOCKYSIZE=260', 'INTERLEAVE=BAND'], check_cs=False)
+def test_tiff_write_111_ter():
+    return test_tiff_write_106(filename='../gdrivers/data/albania.jpg', options=['COMPRESS=JPEG', 'BLOCKYSIZE=260', 'INTERLEAVE=BAND'], check_cs=False)
 
 # Tiled organization of YCbCr does *NOT* give exact pixels w.r.t. original image
 
 
-def tiff_write_112():
-    return tiff_write_106(filename='../gdrivers/data/albania.jpg', options=['COMPRESS=JPEG', 'TILED=YES'], check_cs=False)
+def test_tiff_write_112():
+    return test_tiff_write_106(filename='../gdrivers/data/albania.jpg', options=['COMPRESS=JPEG', 'TILED=YES'], check_cs=False)
 
 # The source is a JPEG in RGB colorspace (usually it is YCbCr).
 
 
-def tiff_write_113():
-    return tiff_write_106(filename='../gdrivers/data/rgbsmall_rgb.jpg', options=['COMPRESS=JPEG', 'BLOCKYSIZE=8'])
+def test_tiff_write_113():
+    return test_tiff_write_106(filename='../gdrivers/data/rgbsmall_rgb.jpg', options=['COMPRESS=JPEG', 'BLOCKYSIZE=8'])
 
 ###############################################################################
 # Test CreateCopy() interruption
 
 
-def tiff_write_114():
+def test_tiff_write_114():
 
     tst = gdaltest.GDALTest('GTiff', 'byte.tif', 1, 4672)
 
@@ -4630,7 +4630,7 @@ def tiff_write_114():
 # Test writing a pixel interleaved RGBA JPEG-compressed TIFF
 
 
-def tiff_write_115():
+def test_tiff_write_115():
     md = gdaltest.tiff_drv.GetMetadata()
     if md['DMD_CREATIONOPTIONLIST'].find('JPEG') == -1:
         return 'skip'
@@ -4682,7 +4682,7 @@ def tiff_write_115():
 # Test writing a band interleaved RGBA JPEG-compressed TIFF
 
 
-def tiff_write_116():
+def test_tiff_write_116():
     md = gdaltest.tiff_drv.GetMetadata()
     if md['DMD_CREATIONOPTIONLIST'].find('JPEG') == -1:
         return 'skip'
@@ -4734,7 +4734,7 @@ def tiff_write_116():
 # Test bugfix for ticket #4771 (rewriting of a deflate compressed tile, libtiff bug)
 
 
-def tiff_write_117():
+def test_tiff_write_117():
     # This will also fail with a libtiff 4.x older than 2012-08-13
     # Might be good to be able to test internal libtiff presence
     md = gdaltest.tiff_drv.GetMetadata()
@@ -4787,7 +4787,7 @@ def tiff_write_117():
 # Test bugfix for ticket #4816
 
 
-def tiff_write_118():
+def test_tiff_write_118():
 
     ds = gdal.GetDriverByName('GTiff').Create('/vsimem/tiff_write_118.tif', 1, 1)
     # Should be rejected in a non-XML domain
@@ -4810,7 +4810,7 @@ def tiff_write_118():
 # Test bugfix for ticket #4816
 
 
-def tiff_write_119():
+def test_tiff_write_119():
 
     ds = gdal.GetDriverByName('GTiff').Create('/vsimem/tiff_write_119.tif', 1, 1)
     ds.SetMetadata('foo=bar', 'foo')
@@ -4832,7 +4832,7 @@ def tiff_write_119():
 # Test bugfix for ticket #4816
 
 
-def tiff_write_120():
+def test_tiff_write_120():
 
     ds = gdal.GetDriverByName('GTiff').Create('/vsimem/tiff_write_120.tif', 1, 1)
     ds.SetMetadata('<foo/>', 'xml:foo')
@@ -4857,7 +4857,7 @@ def tiff_write_120():
 # Test error cases of COPY_SRC_OVERVIEWS creation option
 
 
-def tiff_write_121():
+def test_tiff_write_121():
 
     # Test when the overview band is NULL
     src_ds = gdal.Open("""<VRTDataset rasterXSize="20" rasterYSize="20">
@@ -4946,7 +4946,7 @@ def tiff_write_121():
 # Expected to fail (properly) with older libtiff versions (<=3.8.2 for sure)
 
 
-def tiff_write_122():
+def test_tiff_write_122():
     new_ds = gdaltest.tiff_drv.Create('tmp/tags122.tif', 1, 1, 1)
 
     new_ds.SetMetadata({
@@ -4977,7 +4977,7 @@ def tiff_write_122():
 # Test implicit photometric interpretation
 
 
-def tiff_write_123():
+def test_tiff_write_123():
 
     src_ds = gdaltest.tiff_drv.Create('/vsimem/tiff_write_123_src.tif', 1, 1, 5, gdal.GDT_Int16)
     src_ds.GetRasterBand(2).SetColorInterpretation(gdal.GCI_GreenBand)
@@ -5261,7 +5261,7 @@ def tiff_write_123():
 # Test error cases with palette creation
 
 
-def tiff_write_124():
+def test_tiff_write_124():
 
     ds = gdaltest.tiff_drv.Create('/vsimem/tiff_write_124.tif', 1, 1, 3, gdal.GDT_Byte)
 
@@ -5304,7 +5304,7 @@ def tiff_write_124():
 # Test out-of-memory conditions with SplitBand and SplitBitmapBand
 
 
-def tiff_write_125():
+def test_tiff_write_125():
 
     if gdal.GetConfigOption('SKIP_MEM_INTENSIVE_TEST') is not None:
         return 'skip'
@@ -5337,7 +5337,7 @@ def tiff_write_125():
 # Test implicit JPEG-in-TIFF overviews
 
 
-def tiff_write_126():
+def test_tiff_write_126():
 
     md = gdaltest.tiff_drv.GetMetadata()
     if md['DMD_CREATIONOPTIONLIST'].find('JPEG') == -1:
@@ -5533,7 +5533,7 @@ def tiff_write_126():
 # Test setting/unsetting metadata in update mode (#5628)
 
 
-def tiff_write_127():
+def test_tiff_write_127():
 
     ds = gdaltest.tiff_drv.Create('/vsimem/tiff_write_127.tif', 1, 1)
     ds = None
@@ -5600,7 +5600,7 @@ def tiff_write_127():
 # Test lossless copying of a CMYK JPEG into JPEG-in-TIFF (#5712)
 
 
-def tiff_write_128():
+def test_tiff_write_128():
 
     md = gdaltest.tiff_drv.GetMetadata()
     if md['DMD_CREATIONOPTIONLIST'].find('JPEG') == -1:
@@ -5677,7 +5677,7 @@ def tiff_write_128():
 # Check effective guessing of existing JPEG quality
 
 
-def tiff_write_129():
+def test_tiff_write_129():
     md = gdaltest.tiff_drv.GetMetadata()
     if md['DMD_CREATIONOPTIONLIST'].find('BigTIFF') == -1:
         return 'skip'
@@ -5723,7 +5723,7 @@ def tiff_write_129():
 # Test cases where JPEG quality will fail
 
 
-def tiff_write_130():
+def test_tiff_write_130():
     md = gdaltest.tiff_drv.GetMetadata()
     if md['DMD_CREATIONOPTIONLIST'].find('BigTIFF') == -1:
         return 'skip'
@@ -5773,7 +5773,7 @@ def tiff_write_130():
 # Test LZMA compression
 
 
-def tiff_write_131(level=1):
+def test_tiff_write_131(level=1):
 
     md = gdaltest.tiff_drv.GetMetadata()
     if md['DMD_CREATIONOPTIONLIST'].find('LZMA') == -1:
@@ -5804,15 +5804,15 @@ def tiff_write_131(level=1):
     return 'success'
 
 
-def tiff_write_131_level_9():
-    return tiff_write_131(level=9)
+def test_tiff_write_131_level_9():
+    return test_tiff_write_131(level=9)
 
 
 ###############################################################################
 # Test that PAM metadata is cleared when internal metadata is set (#5807)
 
 
-def tiff_write_132():
+def test_tiff_write_132():
 
     for i in range(2):
 
@@ -5860,7 +5860,7 @@ def tiff_write_132():
 # Test streaming capabilities
 
 
-def tiff_write_133():
+def test_tiff_write_133():
 
     src_ds = gdaltest.tiff_drv.Create('/vsimem/tiff_write_133.tif', 1024, 1000, 3, options=['STREAMABLE_OUTPUT=YES'])
     src_ds.SetGeoTransform([1, 2, 0, 3, 0, -2])
@@ -6143,7 +6143,7 @@ def tiff_write_133():
 # Test DISCARD_LSB
 
 
-def tiff_write_134():
+def test_tiff_write_134():
 
     ds = gdaltest.tiff_drv.Create('/vsimem/tiff_write_134.tif', 1, 1, 3, options=['DISCARD_LSB=0,1,3'])
     ds.GetRasterBand(1).Fill(127)
@@ -6207,7 +6207,7 @@ def tiff_write_134():
 # Test clearing GCPs (#5945)
 
 
-def tiff_write_135():
+def test_tiff_write_135():
 
     # Simple clear
     src_ds = gdal.Open('data/gcps.vrt')
@@ -6279,7 +6279,7 @@ def tiff_write_135():
 # Test writing a single-strip mono-bit dataset
 
 
-def tiff_write_136():
+def test_tiff_write_136():
 
     src_ds = gdaltest.tiff_drv.Create('/vsimem/tiff_write_136_src.tif', 8, 2001)
     src_ds.GetRasterBand(1).Fill(1)
@@ -6305,7 +6305,7 @@ def tiff_write_136():
 # Test multi-threaded writing
 
 
-def tiff_write_137():
+def test_tiff_write_137():
 
     src_ds = gdaltest.tiff_drv.Create('/vsimem/tiff_write_137_src.tif', 4000, 4000)
     src_ds.GetRasterBand(1).Fill(1)
@@ -6393,7 +6393,7 @@ def tiff_write_137():
 # Test that pixel-interleaved writing generates optimal size
 
 
-def tiff_write_138():
+def test_tiff_write_138():
 
     # Test that consecutive IWriteBlock() calls for the same block but in
     # different bands only generate a single tile write, and not 3 rewrites
@@ -6446,7 +6446,7 @@ def tiff_write_138():
 # Test that pixel-interleaved writing generates optimal size
 
 
-def tiff_write_139():
+def test_tiff_write_139():
     import struct
 
     drv = gdal.GetDriverByName('GTiff')
@@ -6561,7 +6561,7 @@ def tiff_write_139():
 # Test setting a band to alpha
 
 
-def tiff_write_140():
+def test_tiff_write_140():
 
     # Nominal case: set alpha to last band
     ds = gdaltest.tiff_drv.Create('/vsimem/tiff_write_140.tif', 1, 1, 5)
@@ -6643,7 +6643,7 @@ def tiff_write_140():
 # Test GEOTIFF_KEYS_FLAVOR=ESRI_PE with EPSG:3857
 
 
-def tiff_write_141():
+def test_tiff_write_141():
 
     ds = gdaltest.tiff_drv.Create('/vsimem/tiff_write_141.tif', 1, 1, options=['GEOTIFF_KEYS_FLAVOR=ESRI_PE'])
     srs = osr.SpatialReference()
@@ -6673,7 +6673,7 @@ def tiff_write_141():
 ###############################################################################
 # Test PixelIsPoint without SRS (#6225)
 
-def tiff_write_142():
+def test_tiff_write_142():
 
     ds = gdaltest.tiff_drv.Create('/vsimem/tiff_write_142.tif', 1, 1)
     ds.SetMetadataItem('AREA_OR_POINT', 'Point')
@@ -6708,7 +6708,7 @@ def tiff_write_142():
 # Check that we detect that free space isn't sufficient
 
 
-def tiff_write_143():
+def test_tiff_write_143():
 
     with gdaltest.error_handler():
         ds = gdaltest.tiff_drv.Create('/vsimem/tiff_write_143.tif', 1000000000, 1000000000)
@@ -6722,7 +6722,7 @@ def tiff_write_143():
 # Test creating a real BigTIFF file > 4 GB with multiple directories (on filesystems supporting sparse files)
 
 
-def tiff_write_144():
+def test_tiff_write_144():
 
     md = gdaltest.tiff_drv.GetMetadata()
     if md['DMD_CREATIONOPTIONLIST'].find('BigTIFF') == -1:
@@ -6766,7 +6766,7 @@ def tiff_write_144():
 # Test various warnings / errors of Create()
 
 
-def tiff_write_145():
+def test_tiff_write_145():
 
     options_list = [{'bands': 65536, 'expected_failure': True},
                     {'creation_options': ['INTERLEAVE=foo'], 'expected_failure': True},
@@ -6827,7 +6827,7 @@ def tiff_write_145():
 # is a legal formulation since 4 bands should probably be seen as CMYK)
 
 
-def tiff_write_146():
+def test_tiff_write_146():
 
     md = gdaltest.tiff_drv.GetMetadata()
     if md['DMD_CREATIONOPTIONLIST'].find('JPEG') == -1:
@@ -6857,7 +6857,7 @@ def tiff_write_146():
 # to RGBA
 
 
-def tiff_write_147():
+def test_tiff_write_147():
 
     md = gdaltest.tiff_drv.GetMetadata()
     if md['DMD_CREATIONOPTIONLIST'].find('JPEG') == -1:
@@ -6881,7 +6881,7 @@ def tiff_write_147():
 # Test that we can use implicit JPEG-in-TIFF overviews with CMYK in raw mode
 
 
-def tiff_write_148():
+def test_tiff_write_148():
 
     md = gdaltest.tiff_drv.GetMetadata()
     if md['DMD_CREATIONOPTIONLIST'].find('JPEG') == -1:
@@ -6916,7 +6916,7 @@ def tiff_write_148():
 # Test filling missing blocks with nodata
 
 
-def tiff_write_149():
+def test_tiff_write_149():
 
     # Power-of-two bit depth
     ds = gdaltest.tiff_drv.Create('/vsimem/tiff_write_149.tif', 1, 1)
@@ -6980,7 +6980,7 @@ def tiff_write_149():
 # Test failure when loading block from disk in IWriteBlock()
 
 
-def tiff_write_150():
+def test_tiff_write_150():
 
     shutil.copy('data/tiled_bad_offset.tif', 'tmp/tiled_bad_offset.tif')
     ds = gdal.Open('tmp/tiled_bad_offset.tif', gdal.GA_Update)
@@ -7000,7 +7000,7 @@ def tiff_write_150():
 # Test IWriteBlock() with more than 10 bands
 
 
-def tiff_write_151():
+def test_tiff_write_151():
 
     ds = gdaltest.tiff_drv.Create('/vsimem/tiff_write_151.tif', 1, 1, 11)
     ds = None
@@ -7031,7 +7031,7 @@ def tiff_write_151():
 # Test flushing of blocks in a contig multi band file with Create()
 
 
-def tiff_write_152():
+def test_tiff_write_152():
 
     ds = gdaltest.tiff_drv.Create('/vsimem/tiff_write_152.tif', 1, 1, 2, options=['NBITS=2'])
     ds.GetRasterBand(2).SetNoDataValue(3)
@@ -7055,7 +7055,7 @@ def tiff_write_152():
 # Test that empty blocks are created in a filesystem sparse way
 
 
-def tiff_write_153():
+def test_tiff_write_153():
 
     target_dir = 'tmp'
 
@@ -7081,7 +7081,7 @@ def tiff_write_153():
 # Test empty block writing skipping and SPARSE_OK in CreateCopy() and Open()
 
 
-def tiff_write_154():
+def test_tiff_write_154():
 
     import struct
 
@@ -7230,7 +7230,7 @@ def tiff_write_154():
 # Test reading and writing band description
 
 
-def tiff_write_155():
+def test_tiff_write_155():
 
     ds = gdaltest.tiff_drv.Create('/vsimem/tiff_write_155.tif', 1, 1)
     ds.GetRasterBand(1).SetDescription('foo')
@@ -7268,7 +7268,7 @@ def tiff_write_155():
 # Test GetDataCoverageStatus()
 
 
-def tiff_write_156():
+def test_tiff_write_156():
 
     ds = gdaltest.tiff_drv.Create('/vsimem/tiff_write_156.tif', 64, 64, options=['SPARSE_OK=YES', 'TILED=YES', 'BLOCKXSIZE=32', 'BLOCKYSIZE=32'])
     ds.GetRasterBand(1).WriteRaster(0, 0, 1, 1, 'X')
@@ -7316,7 +7316,7 @@ def tiff_write_156():
 # Test Float16
 
 
-def tiff_write_157():
+def test_tiff_write_157():
 
     import struct
 
@@ -7464,7 +7464,7 @@ def tiff_write_157():
 # Test GetActualBlockSize() (perhaps not the best place for that...)
 
 
-def tiff_write_158():
+def test_tiff_write_158():
 
     ds = gdaltest.tiff_drv.Create('/vsimem/tiff_write_158.tif', 20, 40, 1, options=['TILED=YES', 'BLOCKXSIZE=16', 'BLOCKYSIZE=32'])
     (w, h) = ds.GetRasterBand(1).GetActualBlockSize(0, 0)
@@ -7504,7 +7504,7 @@ def tiff_write_158():
 # result in a https://trac.osgeo.org/gdal/wiki/CloudOptimizedGeoTIFF
 
 
-def tiff_write_159():
+def test_tiff_write_159():
 
     md = gdaltest.tiff_drv.GetMetadata()
     if md['DMD_CREATIONOPTIONLIST'].find('JPEG') == -1:
@@ -7589,7 +7589,7 @@ def tiff_write_159():
 ###############################################################################
 # Test the Create() interface with a BLOCKYSIZE > image height
 
-def tiff_write_160():
+def test_tiff_write_160():
 
     ds = gdaltest.tiff_drv.Create('/vsimem/tiff_write_160.tif', 10, 10, options=['BLOCKYSIZE=11'])
     ds.GetRasterBand(1).Fill(255)
@@ -7611,7 +7611,7 @@ def tiff_write_160():
 # Test setting GCPs on an image with already a geotransform and vice-versa (#6751)
 
 
-def tiff_write_161():
+def test_tiff_write_161():
 
     ds = gdaltest.tiff_drv.Create('/vsimem/tiff_write_161.tif', 1, 1)
     ds.SetGeoTransform([0, 1, 2, 3, 4, 5])
@@ -7664,7 +7664,7 @@ def tiff_write_161():
 # Test creating a JPEG compressed file with big tiles (#6757)
 
 
-def tiff_write_162():
+def test_tiff_write_162():
 
     src_ds = gdal.GetDriverByName('MEM').Create('', 512, 512, 3)
 
@@ -7684,7 +7684,7 @@ def tiff_write_162():
 # Test creating a file that would trigger strip chopping (#6924)
 
 
-def tiff_write_163():
+def test_tiff_write_163():
 
     # Was a libtiff 4.0.8 regression
     if gdaltest.tiff_drv.GetMetadataItem('LIBTIFF').find('4.0.8') >= 0:
@@ -7715,7 +7715,7 @@ def tiff_write_163():
 # Test that we handle [0,1,0,0,0,1] geotransform as a regular geotransform
 
 
-def tiff_write_164():
+def test_tiff_write_164():
 
     ds = gdaltest.tiff_drv.Create('/vsimem/test.tif', 1, 1)
     ds.SetGeoTransform([0, 1, 0, 0, 0, 1])
@@ -7752,7 +7752,7 @@ def tiff_write_164():
 # Test the current behaviour of per-band nodata vs per-dataset serialization
 
 
-def tiff_write_165():
+def test_tiff_write_165():
 
     ds = gdaltest.tiff_drv.Create('/vsimem/test.tif', 1, 1, 3)
     ret = ds.GetRasterBand(1).SetNoDataValue(100)
@@ -7800,7 +7800,7 @@ def tiff_write_165():
 # Test reading & writing Z dimension for ModelTiepointTag and ModelPixelScaleTag (#7093)
 
 
-def tiff_write_166():
+def test_tiff_write_166():
 
     ds = gdal.Open('data/tiff_vertcs_scale_offset.tif')
     if ds.GetRasterBand(1).GetScale() != 2.0:
@@ -7931,7 +7931,7 @@ def tiff_write_166():
 ###############################################################################
 
 
-def tiff_write_167_deflate_zlevel():
+def test_tiff_write_167_deflate_zlevel():
 
     src_ds = gdal.Open('data/byte.tif')
     gdal.GetDriverByName('GTiff').CreateCopy('/vsimem/out.tif', src_ds,
@@ -7973,7 +7973,7 @@ def tiff_write_167_deflate_zlevel():
 # Test CCITTFAX3
 
 
-def tiff_write_168_ccitfax3():
+def test_tiff_write_168_ccitfax3():
 
     ut = gdaltest.GDALTest('GTiff', 'oddsize1bit.tif', 1, 5918,
                            options=['NBITS=1', 'COMPRESS=CCITTFAX3'])
@@ -7983,7 +7983,7 @@ def tiff_write_168_ccitfax3():
 # Test CCITTRLE
 
 
-def tiff_write_169_ccitrle():
+def test_tiff_write_169_ccitrle():
 
     ut = gdaltest.GDALTest('GTiff', 'oddsize1bit.tif', 1, 5918,
                            options=['NBITS=1', 'COMPRESS=CCITTRLE'])
@@ -7993,7 +7993,7 @@ def tiff_write_169_ccitrle():
 # Test invalid compression method
 
 
-def tiff_write_170_invalid_compresion():
+def test_tiff_write_170_invalid_compresion():
 
     src_ds = gdal.Open('data/byte.tif')
     with gdaltest.error_handler():
@@ -8008,7 +8008,7 @@ def tiff_write_170_invalid_compresion():
 # Test ZSTD compression
 
 
-def tiff_write_171_zstd():
+def test_tiff_write_171_zstd():
 
     md = gdaltest.tiff_drv.GetMetadata()
     if md['DMD_CREATIONOPTIONLIST'].find('ZSTD') == -1:
@@ -8022,7 +8022,7 @@ def tiff_write_171_zstd():
 # Test ZSTD compression with PREDICTOR = 2
 
 
-def tiff_write_171_zstd_predictor():
+def test_tiff_write_171_zstd_predictor():
 
     md = gdaltest.tiff_drv.GetMetadata()
     if md['DMD_CREATIONOPTIONLIST'].find('ZSTD') == -1:
@@ -8036,7 +8036,7 @@ def tiff_write_171_zstd_predictor():
 # Test WEBP compression
 
 
-def tiff_write_webp():
+def test_tiff_write_webp():
 
     md = gdaltest.tiff_drv.GetMetadata()
     if md['DMD_CREATIONOPTIONLIST'].find('WEBP') == -1:
@@ -8050,7 +8050,7 @@ def tiff_write_webp():
 # Test WEBP compression with internal tiling
 
 
-def tiff_write_tiled_webp():
+def test_tiff_write_tiled_webp():
 
     md = gdaltest.tiff_drv.GetMetadata()
     if md['DMD_CREATIONOPTIONLIST'].find('WEBP') == -1:
@@ -8081,7 +8081,7 @@ def tiff_write_tiled_webp():
 # Test WEBP compression with huge single strip
 
 
-def tiff_write_webp_huge_single_strip():
+def test_tiff_write_webp_huge_single_strip():
 
     md = gdaltest.tiff_drv.GetMetadata()
     if md['DMD_CREATIONOPTIONLIST'].find('WEBP') == -1:
@@ -8117,7 +8117,7 @@ def tiff_write_webp_huge_single_strip():
 # GeoTIFF DGIWG tags
 
 
-def tiff_write_172_geometadata_tiff_rsid():
+def test_tiff_write_172_geometadata_tiff_rsid():
 
     tmpfilename = '/vsimem/tiff_write_172_geometadata_tiff_rsid.tiff'
     ds = gdal.GetDriverByName('GTiff').Create(tmpfilename, 1, 1)
@@ -8155,7 +8155,7 @@ def tiff_write_172_geometadata_tiff_rsid():
 # Test LERC compression
 
 
-def tiff_write_173_lerc():
+def test_tiff_write_173_lerc():
 
     md = gdaltest.tiff_drv.GetMetadata()
     if md['DMD_CREATIONOPTIONLIST'].find('LERC') == -1:
@@ -8169,7 +8169,7 @@ def tiff_write_173_lerc():
 # Test LERC_DEFLATE compression
 
 
-def tiff_write_174_lerc_deflate():
+def test_tiff_write_174_lerc_deflate():
 
     md = gdaltest.tiff_drv.GetMetadata()
     if md['DMD_CREATIONOPTIONLIST'].find('LERC_DEFLATE') == -1:
@@ -8183,7 +8183,7 @@ def tiff_write_174_lerc_deflate():
 # Test LERC_DEFLATE compression
 
 
-def tiff_write_174_lerc_deflate_with_level():
+def test_tiff_write_174_lerc_deflate_with_level():
 
     md = gdaltest.tiff_drv.GetMetadata()
     if md['DMD_CREATIONOPTIONLIST'].find('LERC_DEFLATE') == -1:
@@ -8197,7 +8197,7 @@ def tiff_write_174_lerc_deflate_with_level():
 # Test LERC_ZSTD compression
 
 
-def tiff_write_175_lerc_zstd():
+def test_tiff_write_175_lerc_zstd():
 
     md = gdaltest.tiff_drv.GetMetadata()
     if md['DMD_CREATIONOPTIONLIST'].find('LERC_ZSTD') == -1:
@@ -8211,7 +8211,7 @@ def tiff_write_175_lerc_zstd():
 # Test LERC_ZSTD compression
 
 
-def tiff_write_175_lerc_zstd_with_level():
+def test_tiff_write_175_lerc_zstd_with_level():
 
     md = gdaltest.tiff_drv.GetMetadata()
     if md['DMD_CREATIONOPTIONLIST'].find('LERC_ZSTD') == -1:
@@ -8225,7 +8225,7 @@ def tiff_write_175_lerc_zstd_with_level():
 # Test LERC compression with MAX_Z_ERROR
 
 
-def tiff_write_176_lerc_max_z_error():
+def test_tiff_write_176_lerc_max_z_error():
 
     md = gdaltest.tiff_drv.GetMetadata()
     if md['DMD_CREATIONOPTIONLIST'].find('LERC') == -1:
@@ -8239,7 +8239,7 @@ def tiff_write_176_lerc_max_z_error():
 # Test LERC compression with several bands and tiling
 
 
-def tiff_write_177_lerc_several_bands_tiling():
+def test_tiff_write_177_lerc_several_bands_tiling():
 
     md = gdaltest.tiff_drv.GetMetadata()
     if md['DMD_CREATIONOPTIONLIST'].find('LERC') == -1:
@@ -8263,7 +8263,7 @@ def tiff_write_177_lerc_several_bands_tiling():
 # Test LERC compression with alpha band
 
 
-def tiff_write_178_lerc_with_alpha():
+def test_tiff_write_178_lerc_with_alpha():
 
     md = gdaltest.tiff_drv.GetMetadata()
     if md['DMD_CREATIONOPTIONLIST'].find('LERC') == -1:
@@ -8287,7 +8287,7 @@ def tiff_write_178_lerc_with_alpha():
 # Test LERC compression with alpha band with only 0 and 255
 
 
-def tiff_write_178_lerc_with_alpha_0_and_255():
+def test_tiff_write_178_lerc_with_alpha_0_and_255():
 
     md = gdaltest.tiff_drv.GetMetadata()
     if md['DMD_CREATIONOPTIONLIST'].find('LERC') == -1:
@@ -8311,7 +8311,7 @@ def tiff_write_178_lerc_with_alpha_0_and_255():
 # Test LERC compression with different data types
 
 
-def tiff_write_179_lerc_data_types():
+def test_tiff_write_179_lerc_data_types():
 
     md = gdaltest.tiff_drv.GetMetadata()
     if md['DMD_CREATIONOPTIONLIST'].find('LERC') == -1:
@@ -8359,7 +8359,7 @@ def tiff_write_179_lerc_data_types():
 # Test LERC compression with several bands and separate
 
 
-def tiff_write_180_lerc_separate():
+def test_tiff_write_180_lerc_separate():
 
     md = gdaltest.tiff_drv.GetMetadata()
     if md['DMD_CREATIONOPTIONLIST'].find('LERC') == -1:
@@ -8383,7 +8383,7 @@ def tiff_write_180_lerc_separate():
 # Test set XMP metadata
 
 
-def tiff_write_181_xmp():
+def test_tiff_write_181_xmp():
 
     src_ds = gdal.Open('data/utmsmall.tif')
 
@@ -8417,7 +8417,7 @@ def tiff_write_181_xmp():
 # Test delete XMP from a dataset
 
 
-def tiff_write_182_xmp_delete():
+def test_tiff_write_182_xmp_delete():
 
     shutil.copyfile('../gdrivers/data/byte_with_xmp.tif', 'tmp/test_182.tif')
 
@@ -8460,212 +8460,212 @@ def tiff_write_api_proxy():
 ###############################################################################
 
 
-def tiff_write_cleanup():
+def test_tiff_write_cleanup():
     gdaltest.tiff_drv = None
 
     return 'success'
 
 
 gdaltest_list = [
-    tiff_write_1,
-    tiff_write_2,
-    tiff_write_3,
-    tiff_write_4,
-    tiff_write_5,
-    tiff_write_6,
-    tiff_write_7,
-    tiff_write_8,
-    tiff_write_9,
-    tiff_write_10,
-    tiff_write_11,
-    tiff_write_12,
-    tiff_write_13,
-    tiff_write_14,
-    tiff_write_15,
-    tiff_write_16,
-    tiff_write_17,
-    tiff_write_17_disable_readdir,
-    tiff_write_18,
-    tiff_write_18_disable_readdir,
-    tiff_write_rpc_txt,
-    tiff_write_rpc_in_pam,
-    tiff_write_19,
-    tiff_write_20,
-    tiff_write_21,
-    tiff_write_22,
-    tiff_write_23,
-    tiff_write_24,
-    tiff_write_25,
-    tiff_write_26,
-    tiff_write_27,
-    tiff_write_28,
-    tiff_write_29,
-    tiff_write_30,
-    tiff_write_31,
-    tiff_write_32,
-    tiff_write_33,
-    tiff_write_34,
-    tiff_write_35,
-    tiff_write_36,
-    tiff_write_37,
-    tiff_write_38,
-    tiff_write_39,
-    tiff_write_40,
-    tiff_write_41,
-    tiff_write_42,
-    tiff_write_43,
-    tiff_write_44,
-    tiff_write_45,
-    tiff_write_46,
-    tiff_write_47,
-    tiff_write_48,
-    tiff_write_49,
-    tiff_write_50,
-    tiff_write_51,
-    tiff_write_52,
-    tiff_write_53,
-    tiff_write_53_bis,
-    tiff_write_54,
-    tiff_write_55,
-    tiff_write_56,
-    tiff_write_57,
-    tiff_write_58,
-    tiff_write_59,
-    tiff_write_60,
-    tiff_write_61,
-    tiff_write_62,
-    tiff_write_63,
-    tiff_write_64,
-    tiff_write_65,
-    tiff_write_66,
-    tiff_write_67,
-    tiff_write_68,
-    tiff_write_69,
-    tiff_write_70,
-    tiff_write_71,
-    tiff_write_72,
-    tiff_write_73,
-    tiff_write_74,
-    tiff_write_75,
-    tiff_write_76,
-    tiff_write_77,
-    tiff_write_78,
-    tiff_write_79,
-    tiff_write_80,
-    tiff_write_81,
-    tiff_write_82,
-    tiff_write_83,
-    tiff_write_84,
-    tiff_write_85,
-    tiff_write_86,
-    tiff_write_87,
-    tiff_write_88,
-    tiff_write_89,  # leaks mem
-    tiff_write_90,  # leaks mem
-    tiff_write_91,  # leaks mem
-    tiff_write_92,  # leaks mem
-    tiff_write_93,  # leaks mem
-    tiff_write_94,  # leaks mem
-    tiff_write_95,
-    tiff_write_96,  # leaks mem
-    tiff_write_97,
-    tiff_write_98,
-    tiff_write_99,
-    tiff_write_100,
-    tiff_write_101,
-    tiff_write_102,
-    tiff_write_103,
-    tiff_write_104,
-    tiff_write_105,
-    tiff_write_106,
-    tiff_write_107,
-    tiff_write_108,
-    tiff_write_109,
-    tiff_write_110,
-    tiff_write_111,
-    tiff_write_111_bis,
-    tiff_write_111_ter,
-    tiff_write_112,
-    tiff_write_113,
-    tiff_write_114,
-    tiff_write_115,
-    tiff_write_116,
-    tiff_write_117,
-    tiff_write_118,
-    tiff_write_119,
-    tiff_write_120,
-    tiff_write_121,
-    tiff_write_122,
-    tiff_write_123,
-    tiff_write_124,
-    tiff_write_125,
-    tiff_write_126,
-    tiff_write_127,
-    tiff_write_128,
-    tiff_write_129,
-    tiff_write_130,
-    tiff_write_131,
-    tiff_write_131_level_9,
-    tiff_write_132,
-    tiff_write_133,
-    tiff_write_134,
-    tiff_write_135,
-    tiff_write_136,
-    tiff_write_137,
-    tiff_write_138,
-    tiff_write_139,
-    tiff_write_140,
-    tiff_write_141,
-    tiff_write_142,
-    tiff_write_143,
-    tiff_write_144,
-    tiff_write_145,
-    tiff_write_146,
-    tiff_write_147,
-    tiff_write_148,
-    tiff_write_149,
-    tiff_write_150,
-    tiff_write_151,
-    tiff_write_152,
-    tiff_write_153,
-    tiff_write_154,
-    tiff_write_155,
-    tiff_write_156,
-    tiff_write_157,
-    tiff_write_158,
-    tiff_write_159,
-    tiff_write_160,
-    tiff_write_161,
-    tiff_write_162,
-    tiff_write_163,
-    tiff_write_164,
-    tiff_write_165,
-    tiff_write_166,
-    tiff_write_167_deflate_zlevel,
-    tiff_write_168_ccitfax3,
-    tiff_write_169_ccitrle,
-    tiff_write_170_invalid_compresion,
-    tiff_write_171_zstd,
-    tiff_write_171_zstd_predictor,
-    tiff_write_172_geometadata_tiff_rsid,
-    tiff_write_173_lerc,
-    tiff_write_174_lerc_deflate,
-    tiff_write_174_lerc_deflate_with_level,
-    tiff_write_175_lerc_zstd,
-    tiff_write_175_lerc_zstd_with_level,
-    tiff_write_176_lerc_max_z_error,
-    tiff_write_177_lerc_several_bands_tiling,
-    tiff_write_178_lerc_with_alpha,
-    tiff_write_178_lerc_with_alpha_0_and_255,
-    tiff_write_179_lerc_data_types,
-    tiff_write_180_lerc_separate,
-    tiff_write_181_xmp,
-    tiff_write_182_xmp_delete,
+    test_tiff_write_1,
+    test_tiff_write_2,
+    test_tiff_write_3,
+    test_tiff_write_4,
+    test_tiff_write_5,
+    test_tiff_write_6,
+    test_tiff_write_7,
+    test_tiff_write_8,
+    test_tiff_write_9,
+    test_tiff_write_10,
+    test_tiff_write_11,
+    test_tiff_write_12,
+    test_tiff_write_13,
+    test_tiff_write_14,
+    test_tiff_write_15,
+    test_tiff_write_16,
+    test_tiff_write_17,
+    test_tiff_write_17_disable_readdir,
+    test_tiff_write_18,
+    test_tiff_write_18_disable_readdir,
+    test_tiff_write_rpc_txt,
+    test_tiff_write_rpc_in_pam,
+    test_tiff_write_19,
+    test_tiff_write_20,
+    test_tiff_write_21,
+    test_tiff_write_22,
+    test_tiff_write_23,
+    test_tiff_write_24,
+    test_tiff_write_25,
+    test_tiff_write_26,
+    test_tiff_write_27,
+    test_tiff_write_28,
+    test_tiff_write_29,
+    test_tiff_write_30,
+    test_tiff_write_31,
+    test_tiff_write_32,
+    test_tiff_write_33,
+    test_tiff_write_34,
+    test_tiff_write_35,
+    test_tiff_write_36,
+    test_tiff_write_37,
+    test_tiff_write_38,
+    test_tiff_write_39,
+    test_tiff_write_40,
+    test_tiff_write_41,
+    test_tiff_write_42,
+    test_tiff_write_43,
+    test_tiff_write_44,
+    test_tiff_write_45,
+    test_tiff_write_46,
+    test_tiff_write_47,
+    test_tiff_write_48,
+    test_tiff_write_49,
+    test_tiff_write_50,
+    test_tiff_write_51,
+    test_tiff_write_52,
+    test_tiff_write_53,
+    test_tiff_write_53_bis,
+    test_tiff_write_54,
+    test_tiff_write_55,
+    test_tiff_write_56,
+    test_tiff_write_57,
+    test_tiff_write_58,
+    test_tiff_write_59,
+    test_tiff_write_60,
+    test_tiff_write_61,
+    test_tiff_write_62,
+    test_tiff_write_63,
+    test_tiff_write_64,
+    test_tiff_write_65,
+    test_tiff_write_66,
+    test_tiff_write_67,
+    test_tiff_write_68,
+    test_tiff_write_69,
+    test_tiff_write_70,
+    test_tiff_write_71,
+    test_tiff_write_72,
+    test_tiff_write_73,
+    test_tiff_write_74,
+    test_tiff_write_75,
+    test_tiff_write_76,
+    test_tiff_write_77,
+    test_tiff_write_78,
+    test_tiff_write_79,
+    test_tiff_write_80,
+    test_tiff_write_81,
+    test_tiff_write_82,
+    test_tiff_write_83,
+    test_tiff_write_84,
+    test_tiff_write_85,
+    test_tiff_write_86,
+    test_tiff_write_87,
+    test_tiff_write_88,
+    test_tiff_write_89,  # leaks mem
+    test_tiff_write_90,  # leaks mem
+    test_tiff_write_91,  # leaks mem
+    test_tiff_write_92,  # leaks mem
+    test_tiff_write_93,  # leaks mem
+    test_tiff_write_94,  # leaks mem
+    test_tiff_write_95,
+    test_tiff_write_96,  # leaks mem
+    test_tiff_write_97,
+    test_tiff_write_98,
+    test_tiff_write_99,
+    test_tiff_write_100,
+    test_tiff_write_101,
+    test_tiff_write_102,
+    test_tiff_write_103,
+    test_tiff_write_104,
+    test_tiff_write_105,
+    test_tiff_write_106,
+    test_tiff_write_107,
+    test_tiff_write_108,
+    test_tiff_write_109,
+    test_tiff_write_110,
+    test_tiff_write_111,
+    test_tiff_write_111_bis,
+    test_tiff_write_111_ter,
+    test_tiff_write_112,
+    test_tiff_write_113,
+    test_tiff_write_114,
+    test_tiff_write_115,
+    test_tiff_write_116,
+    test_tiff_write_117,
+    test_tiff_write_118,
+    test_tiff_write_119,
+    test_tiff_write_120,
+    test_tiff_write_121,
+    test_tiff_write_122,
+    test_tiff_write_123,
+    test_tiff_write_124,
+    test_tiff_write_125,
+    test_tiff_write_126,
+    test_tiff_write_127,
+    test_tiff_write_128,
+    test_tiff_write_129,
+    test_tiff_write_130,
+    test_tiff_write_131,
+    test_tiff_write_131_level_9,
+    test_tiff_write_132,
+    test_tiff_write_133,
+    test_tiff_write_134,
+    test_tiff_write_135,
+    test_tiff_write_136,
+    test_tiff_write_137,
+    test_tiff_write_138,
+    test_tiff_write_139,
+    test_tiff_write_140,
+    test_tiff_write_141,
+    test_tiff_write_142,
+    test_tiff_write_143,
+    test_tiff_write_144,
+    test_tiff_write_145,
+    test_tiff_write_146,
+    test_tiff_write_147,
+    test_tiff_write_148,
+    test_tiff_write_149,
+    test_tiff_write_150,
+    test_tiff_write_151,
+    test_tiff_write_152,
+    test_tiff_write_153,
+    test_tiff_write_154,
+    test_tiff_write_155,
+    test_tiff_write_156,
+    test_tiff_write_157,
+    test_tiff_write_158,
+    test_tiff_write_159,
+    test_tiff_write_160,
+    test_tiff_write_161,
+    test_tiff_write_162,
+    test_tiff_write_163,
+    test_tiff_write_164,
+    test_tiff_write_165,
+    test_tiff_write_166,
+    test_tiff_write_167_deflate_zlevel,
+    test_tiff_write_168_ccitfax3,
+    test_tiff_write_169_ccitrle,
+    test_tiff_write_170_invalid_compresion,
+    test_tiff_write_171_zstd,
+    test_tiff_write_171_zstd_predictor,
+    test_tiff_write_172_geometadata_tiff_rsid,
+    test_tiff_write_173_lerc,
+    test_tiff_write_174_lerc_deflate,
+    test_tiff_write_174_lerc_deflate_with_level,
+    test_tiff_write_175_lerc_zstd,
+    test_tiff_write_175_lerc_zstd_with_level,
+    test_tiff_write_176_lerc_max_z_error,
+    test_tiff_write_177_lerc_several_bands_tiling,
+    test_tiff_write_178_lerc_with_alpha,
+    test_tiff_write_178_lerc_with_alpha_0_and_255,
+    test_tiff_write_179_lerc_data_types,
+    test_tiff_write_180_lerc_separate,
+    test_tiff_write_181_xmp,
+    test_tiff_write_182_xmp_delete,
     # tiff_write_api_proxy,
-    tiff_write_webp,
-    tiff_write_tiled_webp,
-    tiff_write_webp_huge_single_strip,
-    tiff_write_cleanup]
+    test_tiff_write_webp,
+    test_tiff_write_tiled_webp,
+    test_tiff_write_webp_huge_single_strip,
+    test_tiff_write_cleanup]
 
 
 # gdaltest_list = [ tiff_write_1, tiff_write_176_lerc_max_z_error ]
diff --git a/autotest/gcore/transformer.py b/autotest/gcore/transformer.py
index 119da9099ef9..32ec5d22bb1a 100755
--- a/autotest/gcore/transformer.py
+++ b/autotest/gcore/transformer.py
@@ -41,7 +41,7 @@
 # Test simple Geotransform based transformer.
 
 
-def transformer_1():
+def test_transformer_1():
 
     ds = gdal.Open('data/byte.tif')
     tr = gdal.Transformer(ds, None, [])
@@ -72,7 +72,7 @@ def transformer_1():
 # Test GCP based transformer with polynomials.
 
 
-def transformer_2():
+def test_transformer_2():
 
     ds = gdal.Open('data/gcps.vrt')
     tr = gdal.Transformer(ds, None, ['METHOD=GCP_POLYNOMIAL'])
@@ -103,7 +103,7 @@ def transformer_2():
 # Test GCP based transformer with thin plate splines.
 
 
-def transformer_3():
+def test_transformer_3():
 
     ds = gdal.Open('data/gcps.vrt')
     tr = gdal.Transformer(ds, None, ['METHOD=GCP_TPS'])
@@ -134,7 +134,7 @@ def transformer_3():
 # Test geolocation based transformer.
 
 
-def transformer_4():
+def test_transformer_4():
 
     ds = gdal.Open('data/sstgeo.vrt')
     tr = gdal.Transformer(ds, None, ['METHOD=GEOLOC_ARRAY'])
@@ -165,7 +165,7 @@ def transformer_4():
 # Test RPC based transformer.
 
 
-def transformer_5():
+def test_transformer_5():
 
     ds = gdal.Open('data/rpc.vrt')
     tr = gdal.Transformer(ds, None, ['METHOD=RPC', 'RPC_PIXEL_ERROR_THRESHOLD=0.05'])
@@ -363,7 +363,7 @@ def transformer_5():
 ###############################################################################
 # Test RPC convergence bug (bug # 5395)
 
-def transformer_6():
+def test_transformer_6():
 
     ds = gdal.Open('data/rpc_5395.vrt')
     tr = gdal.Transformer(ds, None, ['METHOD=RPC'])
@@ -384,7 +384,7 @@ def transformer_6():
 # Test Transformer.TransformPoints
 
 
-def transformer_7():
+def test_transformer_7():
 
     ds = gdal.Open('data/byte.tif')
     tr = gdal.Transformer(ds, None, [])
@@ -405,7 +405,7 @@ def transformer_7():
 # Test handling of nodata in RPC DEM (#5680)
 
 
-def transformer_8():
+def test_transformer_8():
 
     ds = gdal.Open('data/rpc.vrt')
 
@@ -444,7 +444,7 @@ def transformer_8():
 # Test RPC DEM line optimization
 
 
-def transformer_9():
+def test_transformer_9():
 
     ds = gdal.Open('data/rpc.vrt')
 
@@ -492,7 +492,7 @@ def transformer_9():
 # Test RPC DEM transform from geoid height to ellipsoidal height
 
 
-def transformer_10():
+def test_transformer_10():
 
     # Create fake vertical shift grid
     out_ds = gdal.GetDriverByName('GTX').Create('tmp/fake.gtx', 10, 10, 1, gdal.GDT_Float32)
@@ -580,7 +580,7 @@ def transformer_10():
 # Test failed inverse RPC transform (#6162)
 
 
-def transformer_11():
+def test_transformer_11():
 
     ds = gdal.GetDriverByName('MEM').Create('', 6600, 4400)
     rpc = [
@@ -620,7 +620,7 @@ def transformer_11():
 # Test degenerate cases of TPS transformer
 
 
-def transformer_12():
+def test_transformer_12():
 
     ds = gdal.Open("""
     <VRTDataset rasterXSize="20" rasterYSize="20">
@@ -698,7 +698,7 @@ def transformer_12():
 # Test inverse RPC transform at DEM edge (#6377)
 
 
-def transformer_13():
+def test_transformer_13():
 
     ds = gdal.GetDriverByName('MEM').Create('', 6600, 4400)
     rpc = [
@@ -731,7 +731,7 @@ def transformer_13():
 # Test inverse RPC transform when iterations do oscillations (#6377)
 
 
-def transformer_14():
+def test_transformer_14():
     ds = gdal.GetDriverByName('MEM').Create('', 4032, 2688)
     rpc = ["MIN_LAT=0",
            "MAX_LAT=0",
@@ -796,7 +796,7 @@ def transformer_14():
 # beyond
 
 
-def transformer_15():
+def test_transformer_15():
 
     ds = gdal.GetDriverByName('MEM').Create('', 6600, 4400)
     rpc = [
@@ -893,7 +893,7 @@ def transformer_15():
 # (we mostly test that the parameters are well recognized and serialized)
 
 
-def transformer_16():
+def test_transformer_16():
 
     gdal.Translate('/vsimem/transformer_16.tif', 'data/byte.tif', options="-gcp 0 0 440720.000 3751320.000 -gcp 0 20 440720.000 3750120.000 -gcp 20 0 441920.000 3751320.000 -gcp 20 20 441920.000 3750120.000 -a_srs EPSG:26711")
     gdal.Warp('/vsimem/transformer_16.vrt', '/vsimem/transformer_16.tif', options='-of VRT -t_srs EPSG:4326 -et 0 -to SRC_APPROX_ERROR_IN_SRS_UNIT=6.05 -to SRC_APPROX_ERROR_IN_PIXEL=0.1 -to REPROJECTION_APPROX_ERROR_IN_SRC_SRS_UNIT=6.1 -to REPROJECTION_APPROX_ERROR_IN_DST_SRS_UNIT=0.0001')
@@ -923,7 +923,7 @@ def transformer_16():
 ###############################################################################
 # Test RPC DEM with unexisting RPC DEM file
 
-def transformer_17():
+def test_transformer_17():
 
     ds = gdal.Open('data/rpc.vrt')
     with gdaltest.error_handler():
@@ -934,27 +934,27 @@ def transformer_17():
 
 
 gdaltest_list = [
-    transformer_1,
-    transformer_2,
-    transformer_3,
-    transformer_4,
-    transformer_5,
-    transformer_6,
-    transformer_7,
-    transformer_8,
-    transformer_9,
-    transformer_10,
-    transformer_11,
-    transformer_12,
-    transformer_13,
-    transformer_14,
-    transformer_15,
-    transformer_16,
-    transformer_17
+    test_transformer_1,
+    test_transformer_2,
+    test_transformer_3,
+    test_transformer_4,
+    test_transformer_5,
+    test_transformer_6,
+    test_transformer_7,
+    test_transformer_8,
+    test_transformer_9,
+    test_transformer_10,
+    test_transformer_11,
+    test_transformer_12,
+    test_transformer_13,
+    test_transformer_14,
+    test_transformer_15,
+    test_transformer_16,
+    test_transformer_17
 ]
 
 disabled_gdaltest_list = [
-    transformer_11
+    test_transformer_11
 ]
 
 
diff --git a/autotest/gcore/virtualmem.py b/autotest/gcore/virtualmem.py
index c2e13340fa01..b284d54aaa97 100755
--- a/autotest/gcore/virtualmem.py
+++ b/autotest/gcore/virtualmem.py
@@ -39,7 +39,7 @@
 # Test linear and tiled virtual mem interfaces in read-only mode
 
 
-def virtualmem_1():
+def test_virtualmem_1():
 
     if gdal.GetConfigOption('SKIP_VIRTUALMEM'):
         return 'skip'
@@ -127,7 +127,7 @@ def virtualmem_1():
 # Test write mode
 
 
-def virtualmem_2():
+def test_virtualmem_2():
 
     if gdal.GetConfigOption('SKIP_VIRTUALMEM'):
         return 'skip'
@@ -159,7 +159,7 @@ def virtualmem_2():
 # Test virtual mem auto with a raw driver
 
 
-def virtualmem_3():
+def test_virtualmem_3():
 
     if gdal.GetConfigOption('SKIP_VIRTUALMEM'):
         return 'skip'
@@ -210,7 +210,7 @@ def virtualmem_3():
 # Test virtual mem auto with GTiff
 
 
-def virtualmem_4():
+def test_virtualmem_4():
 
     if gdal.GetConfigOption('SKIP_VIRTUALMEM'):
         return 'skip'
@@ -280,10 +280,10 @@ def virtualmem_4():
     return 'success'
 
 
-gdaltest_list = [virtualmem_1,
-                 virtualmem_2,
-                 virtualmem_3,
-                 virtualmem_4]
+gdaltest_list = [test_virtualmem_1,
+                 test_virtualmem_2,
+                 test_virtualmem_3,
+                 test_virtualmem_4]
 
 
 if __name__ == '__main__':
diff --git a/autotest/gcore/vrt_read.py b/autotest/gcore/vrt_read.py
index 53b0cbc0b76f..dd03513e2b3b 100755
--- a/autotest/gcore/vrt_read.py
+++ b/autotest/gcore/vrt_read.py
@@ -81,7 +81,7 @@ def test_vrt_open(filename, checksum):
 # The VRT references a non existing TIF file
 
 
-def vrt_read_1():
+def test_vrt_read_1():
 
     gdal.PushErrorHandler('CPLQuietErrorHandler')
     ds = gdal.Open('data/idontexist.vrt')
@@ -96,7 +96,7 @@ def vrt_read_1():
 # The VRT references a non existing TIF file, but using the proxy pool dataset API (#2837)
 
 
-def vrt_read_2():
+def test_vrt_read_2():
 
     ds = gdal.Open('data/idontexist2.vrt')
     if ds is None:
@@ -120,7 +120,7 @@ def vrt_read_2():
 # Test init of band data in case of cascaded VRT (ticket #2867)
 
 
-def vrt_read_3():
+def test_vrt_read_3():
 
     driver_tif = gdal.GetDriverByName("GTIFF")
 
@@ -152,7 +152,7 @@ def vrt_read_3():
 ###############################################################################
 # Test complex source with complex data (#3977)
 
-def vrt_read_4():
+def test_vrt_read_4():
 
     try:
         import numpy as np
@@ -196,7 +196,7 @@ def vrt_read_4():
 # Test serializing and deserializing of various band metadata
 
 
-def vrt_read_5():
+def test_vrt_read_5():
 
     src_ds = gdal.Open('data/testserialization.asc')
     ds = gdal.GetDriverByName('VRT').CreateCopy('/vsimem/vrt_read_5.vrt', src_ds)
@@ -278,7 +278,7 @@ def vrt_read_5():
 # Test GetMinimum() and GetMaximum()
 
 
-def vrt_read_6():
+def test_vrt_read_6():
 
     gdal.Unlink('data/byte.tif.aux.xml')
     src_ds = gdal.Open('data/byte.tif')
@@ -318,7 +318,7 @@ def vrt_read_6():
 # Test GDALOpen() anti-recursion mechanism
 
 
-def vrt_read_7():
+def test_vrt_read_7():
 
     filename = "/vsimem/vrt_read_7.vrt"
 
@@ -354,7 +354,7 @@ def vrt_read_7():
 # Test ComputeRasterMinMax()
 
 
-def vrt_read_8():
+def test_vrt_read_8():
 
     src_ds = gdal.Open('data/byte.tif')
     mem_ds = gdal.GetDriverByName('GTiff').CreateCopy('/vsimem/vrt_read_8.tif', src_ds)
@@ -380,7 +380,7 @@ def vrt_read_8():
 # Test ComputeStatistics()
 
 
-def vrt_read_9():
+def test_vrt_read_9():
 
     src_ds = gdal.Open('data/byte.tif')
     mem_ds = gdal.GetDriverByName('GTiff').CreateCopy('/vsimem/vrt_read_9.tif', src_ds)
@@ -406,7 +406,7 @@ def vrt_read_9():
 # Test GetHistogram() & GetDefaultHistogram()
 
 
-def vrt_read_10():
+def test_vrt_read_10():
 
     src_ds = gdal.Open('data/byte.tif')
     mem_ds = gdal.GetDriverByName('GTiff').CreateCopy('/vsimem/vrt_read_10.tif', src_ds)
@@ -499,7 +499,7 @@ def vrt_read_10():
 # Test resolving files from a symlinked vrt using relativeToVRT with an absolute symlink
 
 
-def vrt_read_11():
+def test_vrt_read_11():
 
     if not gdaltest.support_symlink():
         return 'skip'
@@ -526,7 +526,7 @@ def vrt_read_11():
 # with a relative symlink pointing to a relative symlink
 
 
-def vrt_read_12():
+def test_vrt_read_12():
 
     if not gdaltest.support_symlink():
         return 'skip'
@@ -552,7 +552,7 @@ def vrt_read_12():
 # Test resolving files from a symlinked vrt using relativeToVRT with a relative symlink
 
 
-def vrt_read_13():
+def test_vrt_read_13():
 
     if not gdaltest.support_symlink():
         return 'skip'
@@ -585,7 +585,7 @@ def vrt_read_13():
 # Test ComputeStatistics() when the VRT is a subwindow of the source dataset (#5468)
 
 
-def vrt_read_14():
+def test_vrt_read_14():
 
     src_ds = gdal.Open('data/byte.tif')
     mem_ds = gdal.GetDriverByName('GTiff').CreateCopy('/vsimem/vrt_read_14.tif', src_ds)
@@ -620,7 +620,7 @@ def vrt_read_14():
 # Test RasterIO() with resampling on SimpleSource
 
 
-def vrt_read_15():
+def test_vrt_read_15():
 
     vrt_ds = gdal.Open("""<VRTDataset rasterXSize="9" rasterYSize="9">
   <VRTRasterBand dataType="Byte" band="1">
@@ -652,7 +652,7 @@ def vrt_read_15():
 # Test RasterIO() with resampling on ComplexSource
 
 
-def vrt_read_16():
+def test_vrt_read_16():
 
     vrt_ds = gdal.Open("""<VRTDataset rasterXSize="9" rasterYSize="9">
   <VRTRasterBand dataType="Byte" band="1">
@@ -684,7 +684,7 @@ def vrt_read_16():
 # Test RasterIO() with resampling on AveragedSource
 
 
-def vrt_read_17():
+def test_vrt_read_17():
 
     vrt_ds = gdal.Open("""<VRTDataset rasterXSize="9" rasterYSize="9">
   <VRTRasterBand dataType="Byte" band="1">
@@ -711,7 +711,7 @@ def vrt_read_17():
 # Test that relative path is correctly VRT-in-VRT
 
 
-def vrt_read_18():
+def test_vrt_read_18():
 
     vrt_ds = gdal.Open('data/vrtinvrt.vrt')
     cs = vrt_ds.GetRasterBand(1).Checksum()
@@ -725,7 +725,7 @@ def vrt_read_18():
 # Test shared="0"
 
 
-def vrt_read_19():
+def test_vrt_read_19():
 
     vrt_ds = gdal.Open("""<VRTDataset rasterXSize="20" rasterYSize="20">
   <VRTRasterBand dataType="Byte" band="1">
@@ -762,7 +762,7 @@ def vrt_read_19():
 ###############################################################################
 # Test 2 level of VRT with shared="0"
 
-def vrt_read_20():
+def test_vrt_read_20():
 
     if test_cli_utilities.get_gdalinfo_path() is None:
         return 'skip'
@@ -820,7 +820,7 @@ def vrt_read_20():
 # Test implicit virtual overviews
 
 
-def vrt_read_21():
+def test_vrt_read_21():
 
     ds = gdal.Open('data/byte.tif')
     data = ds.ReadRaster(0, 0, 20, 20, 400, 400)
@@ -940,7 +940,7 @@ def vrt_read_21():
 # Test that we honour NBITS with SimpleSource and ComplexSource
 
 
-def vrt_read_22():
+def test_vrt_read_22():
 
     ds = gdal.Open('data/byte.tif')
     data = ds.ReadRaster()
@@ -1052,7 +1052,7 @@ def vrt_read_22():
 # an underlying dataset without nodata
 
 
-def vrt_read_23():
+def test_vrt_read_23():
 
     try:
         from osgeo import gdalnumeric
@@ -1115,7 +1115,7 @@ def vrt_read_23():
 # Test floating point rounding issues when the VRT does a zoom-in
 
 
-def vrt_read_24():
+def test_vrt_read_24():
 
     ds = gdal.Open('data/zoom_in.vrt')
     data = ds.ReadRaster(34, 5, 66, 87)
@@ -1140,7 +1140,7 @@ def vrt_read_24():
 # Test GetDataCoverageStatus()
 
 
-def vrt_read_25():
+def test_vrt_read_25():
 
     import ogrtest
     if not ogrtest.have_geos():
@@ -1204,7 +1204,7 @@ def vrt_read_25():
 # Test consistency of RasterIO() with resampling, that is extracting different
 # sub-windows give consistent results
 
-def vrt_read_26():
+def test_vrt_read_26():
 
     vrt_ds = gdal.Open("""<VRTDataset rasterXSize="22" rasterYSize="22">
   <VRTRasterBand dataType="Byte" band="1">
@@ -1237,7 +1237,7 @@ def vrt_read_26():
 # Test fix for https://bugs.chromium.org/p/oss-fuzz/issues/detail?id=1553
 
 
-def vrt_read_27():
+def test_vrt_read_27():
 
     gdal.Open('data/empty_gcplist.vrt')
 
@@ -1247,7 +1247,7 @@ def vrt_read_27():
 # Test fix for https://bugs.chromium.org/p/oss-fuzz/issues/detail?id=1551
 
 
-def vrt_read_28():
+def test_vrt_read_28():
 
     with gdaltest.error_handler():
         ds = gdal.Open('<VRTDataset rasterXSize="1 "rasterYSize="1"><VRTRasterBand band="-2147483648"><SimpleSource></SimpleSource></VRTRasterBand></VRTDataset>')
@@ -1260,7 +1260,7 @@ def vrt_read_28():
 ###############################################################################
 # Check VRT source sharing and non-sharing situations (#6949)
 
-def vrt_read_29():
+def test_vrt_read_29():
 
     f = open('data/byte.tif')
     lst_before = gdaltest.get_opened_files()
@@ -1337,7 +1337,7 @@ def vrt_read_29():
 # Check VRT reading with DatasetRasterIO
 
 
-def vrt_read_30():
+def test_vrt_read_30():
 
     ds = gdal.Open("""<VRTDataset rasterXSize="2" rasterYSize="2">
   <VRTRasterBand dataType="Byte" band="1">
@@ -1362,7 +1362,7 @@ def vrt_read_30():
 # Check that we take into account intermediate data type demotion
 
 
-def vrt_read_31():
+def test_vrt_read_31():
 
     gdal.FileFromMemBuffer('/vsimem/in.asc',
                            """ncols        2
@@ -1401,7 +1401,7 @@ def vrt_read_31():
 # Test reading a VRT where the NODATA & NoDataValue are slighly below the
 # minimum float value (https://github.com/OSGeo/gdal/issues/1071)
 
-def vrt_float32_with_nodata_slightly_below_float_min():
+def test_vrt_float32_with_nodata_slightly_below_float_min():
 
     shutil.copyfile('data/minfloat.tif', 'tmp/minfloat.tif')
     shutil.copyfile('data/minfloat_nodata_slightly_out_of_float.vrt',
@@ -1440,7 +1440,7 @@ def vrt_float32_with_nodata_slightly_below_float_min():
 ###############################################################################
 # Fix issue raised in https://lists.osgeo.org/pipermail/gdal-dev/2018-December/049415.html
 
-def vrt_subpixel_offset():
+def test_vrt_subpixel_offset():
 
     ds = gdal.Open('data/vrt_subpixel_offset.vrt')
     cs = ds.GetRasterBand(1).Checksum()
@@ -1456,7 +1456,7 @@ def vrt_subpixel_offset():
 # Check bug fix of bug fix of
 # https://lists.osgeo.org/pipermail/gdal-dev/2018-December/049415.html
 
-def vrt_dstsize_larger_than_source():
+def test_vrt_dstsize_larger_than_source():
 
     ds = gdal.Open('data/dstsize_larger_than_source.vrt')
     cs = ds.GetRasterBand(1).Checksum()
@@ -1469,40 +1469,40 @@ def vrt_dstsize_larger_than_source():
 
 
 gdaltest_list = [
-    vrt_read_1,
-    vrt_read_2,
-    vrt_read_3,
-    vrt_read_4,
-    vrt_read_5,
-    vrt_read_6,
-    vrt_read_7,
-    vrt_read_8,
-    vrt_read_9,
-    vrt_read_10,
-    vrt_read_11,
-    vrt_read_12,
-    vrt_read_13,
-    vrt_read_14,
-    vrt_read_15,
-    vrt_read_16,
-    vrt_read_17,
-    vrt_read_18,
-    vrt_read_19,
-    vrt_read_20,
-    vrt_read_21,
-    vrt_read_22,
-    vrt_read_23,
-    vrt_read_24,
-    vrt_read_25,
-    vrt_read_26,
-    vrt_read_27,
-    vrt_read_28,
-    vrt_read_29,
-    vrt_read_30,
-    vrt_read_31,
-    vrt_float32_with_nodata_slightly_below_float_min,
-    vrt_subpixel_offset,
-    vrt_dstsize_larger_than_source,
+    test_vrt_read_1,
+    test_vrt_read_2,
+    test_vrt_read_3,
+    test_vrt_read_4,
+    test_vrt_read_5,
+    test_vrt_read_6,
+    test_vrt_read_7,
+    test_vrt_read_8,
+    test_vrt_read_9,
+    test_vrt_read_10,
+    test_vrt_read_11,
+    test_vrt_read_12,
+    test_vrt_read_13,
+    test_vrt_read_14,
+    test_vrt_read_15,
+    test_vrt_read_16,
+    test_vrt_read_17,
+    test_vrt_read_18,
+    test_vrt_read_19,
+    test_vrt_read_20,
+    test_vrt_read_21,
+    test_vrt_read_22,
+    test_vrt_read_23,
+    test_vrt_read_24,
+    test_vrt_read_25,
+    test_vrt_read_26,
+    test_vrt_read_27,
+    test_vrt_read_28,
+    test_vrt_read_29,
+    test_vrt_read_30,
+    test_vrt_read_31,
+    test_vrt_float32_with_nodata_slightly_below_float_min,
+    test_vrt_subpixel_offset,
+    test_vrt_dstsize_larger_than_source,
 ]
 
 
diff --git a/autotest/gcore/vrtmisc.py b/autotest/gcore/vrtmisc.py
index 8ec5cdf31d85..84d2482f816b 100755
--- a/autotest/gcore/vrtmisc.py
+++ b/autotest/gcore/vrtmisc.py
@@ -39,7 +39,7 @@
 # Test linear scaling
 
 
-def vrtmisc_1():
+def test_vrtmisc_1():
 
     ds = gdal.Translate('', 'data/byte.tif', options='-of MEM -scale 74 255 0 255')
     cs = ds.GetRasterBand(1).Checksum()
@@ -56,7 +56,7 @@ def vrtmisc_1():
 # Test power scaling
 
 
-def vrtmisc_2():
+def test_vrtmisc_2():
 
     ds = gdal.Translate('', 'data/byte.tif', options='-of MEM -scale 74 255 0 255 -exponent 2.2')
     cs = ds.GetRasterBand(1).Checksum()
@@ -73,7 +73,7 @@ def vrtmisc_2():
 # Test power scaling (not <SrcMin> <SrcMax> in VRT file)
 
 
-def vrtmisc_3():
+def test_vrtmisc_3():
 
     ds = gdal.Open("""<VRTDataset rasterXSize="20" rasterYSize="20">
   <VRTRasterBand dataType="Byte" band="1">
@@ -100,7 +100,7 @@ def vrtmisc_3():
 # Test multi-band linear scaling with a single -scale occurrence.
 
 
-def vrtmisc_4():
+def test_vrtmisc_4():
 
     # -scale specified once applies to all bands
     ds = gdal.Translate('', 'data/byte.tif', options='-of MEM -scale 74 255 0 255 -b 1 -b 1')
@@ -123,7 +123,7 @@ def vrtmisc_4():
 # Test multi-band linear scaling with -scale_XX syntax
 
 
-def vrtmisc_5():
+def test_vrtmisc_5():
 
     # -scale_2 applies to band 2 only
     ds = gdal.Translate('', 'data/byte.tif', options='-of MEM -scale_2 74 255 0 255 -b 1 -b 1')
@@ -146,7 +146,7 @@ def vrtmisc_5():
 # Test multi-band linear scaling with repeated -scale syntax
 
 
-def vrtmisc_6():
+def test_vrtmisc_6():
 
     # -scale repeated as many times as output band number
     ds = gdal.Translate('', 'data/byte.tif', options='-of MEM -scale 0 255 0 255 -scale 74 255 0 255 -b 1 -b 1')
@@ -169,7 +169,7 @@ def vrtmisc_6():
 # Test multi-band power scaling with a single -scale and -exponent occurrence.
 
 
-def vrtmisc_7():
+def test_vrtmisc_7():
 
     # -scale and -exponent, specified once, apply to all bands
     ds = gdal.Translate('', 'data/byte.tif', options='-of MEM -scale 74 255 0 255 -exponent 2.2 -b 1 -b 1')
@@ -192,7 +192,7 @@ def vrtmisc_7():
 # Test multi-band power scaling with -scale_XX and -exponent_XX syntax
 
 
-def vrtmisc_8():
+def test_vrtmisc_8():
 
     # -scale_2 and -exponent_2 apply to band 2 only
     ds = gdal.Translate('', 'data/byte.tif', options='-of MEM -scale_2 74 255 0 255 -exponent_2 2.2 -b 1 -b 1')
@@ -215,7 +215,7 @@ def vrtmisc_8():
 # Test multi-band linear scaling with repeated -scale and -exponent syntax
 
 
-def vrtmisc_9():
+def test_vrtmisc_9():
 
     # -scale and -exponent repeated as many times as output band number
     ds = gdal.Translate('', 'data/byte.tif', options='-of MEM -scale 0 255 0 255 -scale 74 255 0 255 -exponent 1 -exponent 2.2 -b 1 -b 1')
@@ -238,7 +238,7 @@ def vrtmisc_9():
 # Test metadata serialization (#5944)
 
 
-def vrtmisc_10():
+def test_vrtmisc_10():
 
     gdal.FileFromMemBuffer("/vsimem/vrtmisc_10.vrt",
                            """<VRTDataset rasterXSize="1" rasterYSize="1">
@@ -308,7 +308,7 @@ def vrtmisc_10():
 # Test relativeToVRT is preserved during re-serialization (#5985)
 
 
-def vrtmisc_11():
+def test_vrtmisc_11():
 
     f = open('tmp/vrtmisc_11.vrt', 'wt')
     f.write(
@@ -345,7 +345,7 @@ def vrtmisc_11():
 # Test set/delete nodata
 
 
-def vrtmisc_12():
+def test_vrtmisc_12():
 
     gdal.FileFromMemBuffer("/vsimem/vrtmisc_12.vrt",
                            """<VRTDataset rasterXSize="1" rasterYSize="1">
@@ -388,7 +388,7 @@ def vrtmisc_12():
 # Test CreateCopy() preserve NBITS
 
 
-def vrtmisc_13():
+def test_vrtmisc_13():
 
     ds = gdal.Open('data/oddsize1bit.tif')
     out_ds = gdal.GetDriverByName('VRT').CreateCopy('', ds)
@@ -402,7 +402,7 @@ def vrtmisc_13():
 # Test SrcRect/DstRect are serialized as integers
 
 
-def vrtmisc_14():
+def test_vrtmisc_14():
 
     src_ds = gdal.GetDriverByName('GTiff').Create('/vsimem/vrtmisc_14_src.tif', 123456789, 1, options=['SPARSE_OK=YES', 'TILED=YES'])
     gdal.GetDriverByName('VRT').CreateCopy('/vsimem/vrtmisc_14.vrt', src_ds)
@@ -442,7 +442,7 @@ def vrtmisc_14():
 # Test CreateCopy() preserve SIGNEDBYTE
 
 
-def vrtmisc_15():
+def test_vrtmisc_15():
 
     ds = gdal.GetDriverByName('GTiff').Create('/vsimem/vrtmisc_15.tif', 1, 1, options=['PIXELTYPE=SIGNEDBYTE'])
     out_ds = gdal.GetDriverByName('VRT').CreateCopy('', ds)
@@ -458,7 +458,7 @@ def vrtmisc_15():
 # Test rounding to closest int for coordinates
 
 
-def vrtmisc_16():
+def test_vrtmisc_16():
 
     gdal.BuildVRT('/vsimem/vrtmisc_16.vrt', ['data/vrtmisc16_tile1.tif', 'data/vrtmisc16_tile2.tif'])
     fp = gdal.VSIFOpenL('/vsimem/vrtmisc_16.vrt', 'rb')
@@ -529,7 +529,7 @@ def vrtmisc_16():
 # Check that the serialized xml:VRT doesn't include itself (#6767)
 
 
-def vrtmisc_17():
+def test_vrtmisc_17():
 
     ds = gdal.Open('data/byte.tif')
     vrt_ds = gdal.GetDriverByName('VRT').CreateCopy('/vsimem/vrtmisc_17.vrt', ds)
@@ -547,7 +547,7 @@ def vrtmisc_17():
 # Check GetMetadata('xml:VRT') behaviour on a in-memory VRT copied from a VRT
 
 
-def vrtmisc_18():
+def test_vrtmisc_18():
 
     ds = gdal.Open('data/byte.vrt')
     vrt_ds = gdal.GetDriverByName('VRT').CreateCopy('', ds)
@@ -569,7 +569,7 @@ def vrtmisc_18():
 # Check RAT support
 
 
-def vrtmisc_rat():
+def test_vrtmisc_rat():
 
     ds = gdal.Translate('/vsimem/vrtmisc_rat.tif', 'data/byte.tif', format='MEM')
     rat = gdal.RasterAttributeTable()
@@ -626,7 +626,7 @@ def vrtmisc_rat():
 # Check ColorTable support
 
 
-def vrtmisc_colortable():
+def test_vrtmisc_colortable():
 
     ds = gdal.Translate('', 'data/byte.tif', format='VRT')
     ct = gdal.ColorTable()
@@ -646,7 +646,7 @@ def vrtmisc_colortable():
 # Check histogram support
 
 
-def vrtmisc_histogram():
+def test_vrtmisc_histogram():
 
     tmpfile = '/vsimem/vrtmisc_histogram.vrt'
     ds = gdal.Translate(tmpfile, 'data/byte.tif', format='VRT')
@@ -668,33 +668,33 @@ def vrtmisc_histogram():
 # Cleanup.
 
 
-def vrtmisc_cleanup():
+def test_vrtmisc_cleanup():
     return 'success'
 
 
 gdaltest_list = [
-    vrtmisc_1,
-    vrtmisc_2,
-    vrtmisc_3,
-    vrtmisc_4,
-    vrtmisc_5,
-    vrtmisc_6,
-    vrtmisc_7,
-    vrtmisc_8,
-    vrtmisc_9,
-    vrtmisc_10,
-    vrtmisc_11,
-    vrtmisc_12,
-    vrtmisc_13,
-    vrtmisc_14,
-    vrtmisc_15,
-    vrtmisc_16,
-    vrtmisc_17,
-    vrtmisc_18,
-    vrtmisc_rat,
-    vrtmisc_colortable,
-    vrtmisc_histogram,
-    vrtmisc_cleanup]
+    test_vrtmisc_1,
+    test_vrtmisc_2,
+    test_vrtmisc_3,
+    test_vrtmisc_4,
+    test_vrtmisc_5,
+    test_vrtmisc_6,
+    test_vrtmisc_7,
+    test_vrtmisc_8,
+    test_vrtmisc_9,
+    test_vrtmisc_10,
+    test_vrtmisc_11,
+    test_vrtmisc_12,
+    test_vrtmisc_13,
+    test_vrtmisc_14,
+    test_vrtmisc_15,
+    test_vrtmisc_16,
+    test_vrtmisc_17,
+    test_vrtmisc_18,
+    test_vrtmisc_rat,
+    test_vrtmisc_colortable,
+    test_vrtmisc_histogram,
+    test_vrtmisc_cleanup]
 
 if __name__ == '__main__':
 
diff --git a/autotest/gcore/vsiaz.py b/autotest/gcore/vsiaz.py
index 209e6a22a7c5..96a2cc3064ff 100755
--- a/autotest/gcore/vsiaz.py
+++ b/autotest/gcore/vsiaz.py
@@ -46,7 +46,7 @@ def open_for_read(uri):
 ###############################################################################
 
 
-def vsiaz_init():
+def test_vsiaz_init():
 
     gdaltest.az_vars = {}
     for var in ('AZURE_STORAGE_CONNECTION_STRING', 'AZURE_STORAGE_ACCOUNT',
@@ -65,7 +65,7 @@ def vsiaz_init():
 # Error cases
 
 
-def vsiaz_real_server_errors():
+def test_vsiaz_real_server_errors():
 
     if not gdaltest.built_against_curl():
         return 'skip'
@@ -135,7 +135,7 @@ def vsiaz_real_server_errors():
 ###############################################################################
 
 
-def vsiaz_start_webserver():
+def test_vsiaz_start_webserver():
 
     gdaltest.webserver_process = None
     gdaltest.webserver_port = 0
@@ -159,7 +159,7 @@ def vsiaz_start_webserver():
 # Test with a fake Azure Blob server
 
 
-def vsiaz_fake_basic():
+def test_vsiaz_fake_basic():
 
     if gdaltest.webserver_port == 0:
         return 'skip'
@@ -268,7 +268,7 @@ def method(request):
 # Test ReadDir() with a fake Azure Blob server
 
 
-def vsiaz_fake_readdir():
+def test_vsiaz_fake_readdir():
 
     if gdaltest.webserver_port == 0:
         return 'skip'
@@ -405,7 +405,7 @@ def vsiaz_fake_readdir():
 # Test write
 
 
-def vsiaz_fake_write():
+def test_vsiaz_fake_write():
 
     if gdaltest.webserver_port == 0:
         return 'skip'
@@ -688,7 +688,7 @@ def method(request):
 # Test Unlink()
 
 
-def vsiaz_fake_unlink():
+def test_vsiaz_fake_unlink():
 
     if gdaltest.webserver_port == 0:
         return 'skip'
@@ -720,7 +720,7 @@ def vsiaz_fake_unlink():
 # Test Mkdir() / Rmdir()
 
 
-def vsiaz_fake_mkdir_rmdir():
+def test_vsiaz_fake_mkdir_rmdir():
 
     if gdaltest.webserver_port == 0:
         return 'skip'
@@ -858,7 +858,7 @@ def vsiaz_fake_mkdir_rmdir():
 ###############################################################################
 
 
-def vsiaz_fake_test_BlobEndpointInConnectionString():
+def test_vsiaz_fake_test_BlobEndpointInConnectionString():
 
     if gdaltest.webserver_port == 0:
         return 'skip'
@@ -878,7 +878,7 @@ def vsiaz_fake_test_BlobEndpointInConnectionString():
 ###############################################################################
 
 
-def vsiaz_stop_webserver():
+def test_vsiaz_stop_webserver():
 
     if gdaltest.webserver_port == 0:
         return 'skip'
@@ -1075,7 +1075,7 @@ def vsiaz_extra_1():
 ###############################################################################
 
 
-def vsiaz_cleanup():
+def test_vsiaz_cleanup():
 
     for var in gdaltest.az_vars:
         gdal.SetConfigOption(var, gdaltest.az_vars[var])
@@ -1083,17 +1083,17 @@ def vsiaz_cleanup():
     return 'success'
 
 
-gdaltest_list = [vsiaz_init,
-                 vsiaz_real_server_errors,
-                 vsiaz_start_webserver,
-                 vsiaz_fake_basic,
-                 vsiaz_fake_readdir,
-                 vsiaz_fake_write,
-                 vsiaz_fake_unlink,
-                 vsiaz_fake_mkdir_rmdir,
-                 vsiaz_fake_test_BlobEndpointInConnectionString,
-                 vsiaz_stop_webserver,
-                 vsiaz_cleanup]
+gdaltest_list = [test_vsiaz_init,
+                 test_vsiaz_real_server_errors,
+                 test_vsiaz_start_webserver,
+                 test_vsiaz_fake_basic,
+                 test_vsiaz_fake_readdir,
+                 test_vsiaz_fake_write,
+                 test_vsiaz_fake_unlink,
+                 test_vsiaz_fake_mkdir_rmdir,
+                 test_vsiaz_fake_test_BlobEndpointInConnectionString,
+                 test_vsiaz_stop_webserver,
+                 test_vsiaz_cleanup]
 
 # gdaltest_list = [ vsiaz_init, vsiaz_start_webserver, vsiaz_fake_mkdir_rmdir, vsiaz_stop_webserver, vsiaz_cleanup ]
 
@@ -1106,6 +1106,6 @@ def vsiaz_cleanup():
     if gdal.GetConfigOption('RUN_MANUAL_ONLY', None):
         gdaltest.run_tests(gdaltest_list_extra)
     else:
-        gdaltest.run_tests(gdaltest_list + gdaltest_list_extra + [vsiaz_cleanup])
+        gdaltest.run_tests(gdaltest_list + gdaltest_list_extra + [test_vsiaz_cleanup])
 
     sys.exit(gdaltest.summarize())
diff --git a/autotest/gcore/vsicrypt.py b/autotest/gcore/vsicrypt.py
index 0d5344f8ad07..efe79b9e9c75 100755
--- a/autotest/gcore/vsicrypt.py
+++ b/autotest/gcore/vsicrypt.py
@@ -40,7 +40,7 @@
 # Use common test for /vsicrypt
 
 
-def vsicrypt_1():
+def test_vsicrypt_1():
 
     gdaltest.has_vsicrypt = False
     fp = gdal.VSIFOpenL('/vsicrypt/key=DONT_USE_IN_PROD,file=/vsimem/file.bin', 'wb+')
@@ -57,7 +57,7 @@ def vsicrypt_1():
 # Test various error cases
 
 
-def vsicrypt_2():
+def test_vsicrypt_2():
 
     if not gdaltest.has_vsicrypt:
         return 'skip'
@@ -293,7 +293,7 @@ def vsicrypt_2():
 # Test various options
 
 
-def vsicrypt_3():
+def test_vsicrypt_3():
 
     if not gdaltest.has_vsicrypt:
         return 'skip'
@@ -414,7 +414,7 @@ def vsicrypt_3():
 # Test "random" operations against reference filesystem
 
 
-def vsicrypt_4():
+def test_vsicrypt_4():
 
     if not gdaltest.has_vsicrypt:
         return 'skip'
@@ -483,7 +483,7 @@ def vsicrypt_4():
 # Test random filling of last sector
 
 
-def vsicrypt_5():
+def test_vsicrypt_5():
 
     if not gdaltest.has_vsicrypt:
         return 'skip'
@@ -548,7 +548,7 @@ def vsicrypt_5():
 # Test VSISetCryptKey
 
 
-def vsicrypt_6():
+def test_vsicrypt_6():
 
     try:
         import ctypes
@@ -627,12 +627,12 @@ def vsicrypt_6():
     return 'success'
 
 
-gdaltest_list = [vsicrypt_1,
-                 vsicrypt_2,
-                 vsicrypt_3,
-                 vsicrypt_4,
-                 vsicrypt_5,
-                 vsicrypt_6]
+gdaltest_list = [test_vsicrypt_1,
+                 test_vsicrypt_2,
+                 test_vsicrypt_3,
+                 test_vsicrypt_4,
+                 test_vsicrypt_5,
+                 test_vsicrypt_6]
 
 if __name__ == '__main__':
 
diff --git a/autotest/gcore/vsicurl.py b/autotest/gcore/vsicurl.py
index 7f5ff0ea4ee2..65990dc262c2 100755
--- a/autotest/gcore/vsicurl.py
+++ b/autotest/gcore/vsicurl.py
@@ -42,7 +42,7 @@
 ###############################################################################
 #
 
-def vsicurl_1():
+def test_vsicurl_1():
     if not gdaltest.run_slow_tests():
         return 'skip'
 
@@ -93,7 +93,7 @@ def vsicurl_3():
 # This server doesn't support range downloading
 
 
-def vsicurl_4():
+def test_vsicurl_4():
     if not gdaltest.run_slow_tests():
         return 'skip'
 
@@ -110,7 +110,7 @@ def vsicurl_4():
 # Test URL unescaping when reading HTTP file list
 
 
-def vsicurl_5():
+def test_vsicurl_5():
     if not gdaltest.run_slow_tests():
         return 'skip'
 
@@ -144,7 +144,7 @@ def vsicurl_6_disabled():
 ###############################################################################
 # Test Microsoft-IIS/6.0 listing
 
-def vsicurl_7():
+def test_vsicurl_7():
     if not gdaltest.run_slow_tests():
         return 'skip'
 
@@ -181,7 +181,7 @@ def vsicurl_8():
 # returns escaped sequences instead of the Chinese characters.
 
 
-def vsicurl_9():
+def test_vsicurl_9():
     if not gdaltest.run_slow_tests():
         return 'skip'
 
@@ -204,7 +204,7 @@ def vsicurl_9():
 # Test reading a file with escaped Chinese characters.
 
 
-def vsicurl_10():
+def test_vsicurl_10():
     if not gdaltest.run_slow_tests():
         return 'skip'
 
@@ -221,7 +221,7 @@ def vsicurl_10():
 # Test ReadDir() after reading a file on the same server
 
 
-def vsicurl_11():
+def test_vsicurl_11():
     if not gdaltest.run_slow_tests():
         return 'skip'
 
@@ -244,7 +244,7 @@ def vsicurl_11():
 ###############################################################################
 
 
-def vsicurl_start_webserver():
+def test_vsicurl_start_webserver():
 
     gdaltest.webserver_process = None
     gdaltest.webserver_port = 0
@@ -261,7 +261,7 @@ def vsicurl_start_webserver():
 ###############################################################################
 
 
-def vsicurl_test_redirect():
+def test_vsicurl_test_redirect():
 
     if gdaltest.is_travis_branch('trusty'):
         print('Skipped on trusty branch, but should be investigated')
@@ -393,7 +393,7 @@ def method(request):
 # TODO: better testing
 
 
-def vsicurl_test_clear_cache():
+def test_vsicurl_test_clear_cache():
 
     gdal.VSICurlClearCache()
     gdal.VSICurlClearCache()
@@ -403,7 +403,7 @@ def vsicurl_test_clear_cache():
 ###############################################################################
 
 
-def vsicurl_test_retry():
+def test_vsicurl_test_retry():
 
     if gdaltest.webserver_port == 0:
         return 'skip'
@@ -455,7 +455,7 @@ def vsicurl_test_retry():
 ###############################################################################
 
 
-def vsicurl_test_fallback_from_head_to_get():
+def test_vsicurl_test_fallback_from_head_to_get():
 
     if gdaltest.webserver_port == 0:
         return 'skip'
@@ -477,7 +477,7 @@ def vsicurl_test_fallback_from_head_to_get():
 ###############################################################################
 
 
-def vsicurl_test_parse_html_filelist_apache():
+def test_vsicurl_test_parse_html_filelist_apache():
 
     if gdaltest.webserver_port == 0:
         return 'skip'
@@ -520,7 +520,7 @@ def vsicurl_test_parse_html_filelist_apache():
 ###############################################################################
 
 
-def vsicurl_stop_webserver():
+def test_vsicurl_stop_webserver():
 
     if gdaltest.webserver_port == 0:
         return 'skip'
@@ -534,24 +534,24 @@ def vsicurl_stop_webserver():
     return 'success'
 
 
-gdaltest_list = [vsicurl_1,
+gdaltest_list = [test_vsicurl_1,
                  # vsicurl_2,
                  # vsicurl_3,
-                 vsicurl_4,
-                 vsicurl_5,
+                 test_vsicurl_4,
+                 test_vsicurl_5,
                  #vsicurl_6_disabled,
-                 vsicurl_7,
+                 test_vsicurl_7,
                  # vsicurl_8,
-                 vsicurl_9,
-                 vsicurl_10,
-                 vsicurl_11,
-                 vsicurl_start_webserver,
-                 vsicurl_test_redirect,
-                 vsicurl_test_clear_cache,
-                 vsicurl_test_retry,
-                 vsicurl_test_fallback_from_head_to_get,
-                 vsicurl_test_parse_html_filelist_apache,
-                 vsicurl_stop_webserver]
+                 test_vsicurl_9,
+                 test_vsicurl_10,
+                 test_vsicurl_11,
+                 test_vsicurl_start_webserver,
+                 test_vsicurl_test_redirect,
+                 test_vsicurl_test_clear_cache,
+                 test_vsicurl_test_retry,
+                 test_vsicurl_test_fallback_from_head_to_get,
+                 test_vsicurl_test_parse_html_filelist_apache,
+                 test_vsicurl_stop_webserver]
 
 if __name__ == '__main__':
 
diff --git a/autotest/gcore/vsicurl_streaming.py b/autotest/gcore/vsicurl_streaming.py
index 9b37675b5eca..29f543692cbb 100755
--- a/autotest/gcore/vsicurl_streaming.py
+++ b/autotest/gcore/vsicurl_streaming.py
@@ -39,7 +39,7 @@
 #
 
 
-def vsicurl_streaming_1():
+def test_vsicurl_streaming_1():
     drv = gdal.GetDriverByName('HTTP')
 
     if drv is None:
@@ -139,7 +139,7 @@ def vsicurl_streaming_1():
     return 'success'
 
 
-gdaltest_list = [vsicurl_streaming_1]
+gdaltest_list = [test_vsicurl_streaming_1]
 
 if __name__ == '__main__':
 
diff --git a/autotest/gcore/vsifile.py b/autotest/gcore/vsifile.py
index 8639cb1de51c..e5419a4b1871 100755
--- a/autotest/gcore/vsifile.py
+++ b/autotest/gcore/vsifile.py
@@ -150,14 +150,14 @@ def vsifile_generic(filename):
 # Test /vsimem
 
 
-def vsifile_1():
+def test_vsifile_1():
     return vsifile_generic('/vsimem/vsifile_1.bin')
 
 ###############################################################################
 # Test regular file system
 
 
-def vsifile_2():
+def test_vsifile_2():
 
     ret = vsifile_generic('tmp/vsifile_2.bin')
     if ret != 'success' and gdaltest.skip_on_travis():
@@ -171,7 +171,7 @@ def vsifile_2():
 # Test ftruncate >= 32 bit
 
 
-def vsifile_3():
+def test_vsifile_3():
 
     if not gdaltest.filesystem_supports_sparse_files('tmp'):
         return 'skip'
@@ -214,7 +214,7 @@ def vsifile_3():
 # Test fix for #4583 (short reads)
 
 
-def vsifile_4():
+def test_vsifile_4():
 
     fp = gdal.VSIFOpenL('vsifile.py', 'rb')
     data = gdal.VSIFReadL(1000000, 1, fp)
@@ -231,7 +231,7 @@ def vsifile_4():
 # Test vsicache
 
 
-def vsifile_5():
+def test_vsifile_5():
 
     fp = gdal.VSIFOpenL('tmp/vsifile_5.bin', 'wb')
     ref_data = ''.join(['%08X' % i for i in range(5 * 32768)])
@@ -307,7 +307,7 @@ def vsifile_5():
 # Test vsicache above 2 GB
 
 
-def vsifile_6():
+def test_vsifile_6():
 
     if not gdaltest.filesystem_supports_sparse_files('tmp'):
         return 'skip'
@@ -350,7 +350,7 @@ def vsifile_6():
 # Test limit cases on /vsimem
 
 
-def vsifile_7():
+def test_vsifile_7():
 
     if gdal.GetConfigOption('SKIP_MEM_INTENSIVE_TEST') is not None:
         return 'skip'
@@ -401,7 +401,7 @@ def vsifile_7():
 # Test renaming directory in /vsimem
 
 
-def vsifile_8():
+def test_vsifile_8():
 
     # octal 0666 = decimal 438
     gdal.Mkdir('/vsimem/mydir', 438)
@@ -423,7 +423,7 @@ def vsifile_8():
 # Test ReadDir()
 
 
-def vsifile_9():
+def test_vsifile_9():
 
     lst = gdal.ReadDir('.')
     if len(lst) < 4:
@@ -460,7 +460,7 @@ def vsifile_9():
 # Test fuzzer friendly archive
 
 
-def vsifile_10():
+def test_vsifile_10():
 
     gdal.FileFromMemBuffer('/vsimem/vsifile_10.tar',
                            """FUZZER_FRIENDLY_ARCHIVE
@@ -565,7 +565,7 @@ def vsifile_10():
 # Test generic Truncate implementation for file extension
 
 
-def vsifile_11():
+def test_vsifile_11():
     f = gdal.VSIFOpenL('/vsimem/vsifile_11', 'wb')
     gdal.VSIFCloseL(f)
 
@@ -600,7 +600,7 @@ def vsifile_11():
 # Test regular file system sparse file support
 
 
-def vsifile_12():
+def test_vsifile_12():
 
     target_dir = 'tmp'
 
@@ -638,7 +638,7 @@ def vsifile_12():
 # Test reading filename with prefixes without terminating slash
 
 
-def vsifile_13():
+def test_vsifile_13():
 
     gdal.VSIFOpenL('/vsigzip', 'rb')
     gdal.VSIFOpenL('/vsizip', 'rb')
@@ -675,7 +675,7 @@ def vsifile_13():
 # Check performance issue (https://bugs.chromium.org/p/oss-fuzz/issues/detail?id=1673)
 
 
-def vsifile_14():
+def test_vsifile_14():
 
     with gdaltest.error_handler():
         gdal.VSIFOpenL('/vsitar//vsitar//vsitar//vsitar//vsitar//vsitar//vsitar//vsitar/a.tgzb.tgzc.tgzd.tgze.tgzf.tgz.h.tgz.i.tgz', 'rb')
@@ -685,7 +685,7 @@ def vsifile_14():
 # Test issue with Eof() not detecting end of corrupted gzip stream (#6944)
 
 
-def vsifile_15():
+def test_vsifile_15():
 
     fp = gdal.VSIFOpenL('/vsigzip/data/corrupted_z_buf_error.gz', 'rb')
     if fp is None:
@@ -727,7 +727,7 @@ def vsifile_15():
 # Test failed gdal.Rename() with exceptions enabled
 
 
-def vsifile_16():
+def test_vsifile_16():
 
     old_val = gdal.GetUseExceptions()
     gdal.UseExceptions()
@@ -744,7 +744,7 @@ def vsifile_16():
 # Test gdal.GetActualURL() on a non-network based filesystem
 
 
-def vsifile_17():
+def test_vsifile_17():
 
     if gdal.GetActualURL('foo') is not None:
         gdaltest.post_reason('fail')
@@ -760,7 +760,7 @@ def vsifile_17():
 # Test gdal.GetFileSystemsPrefixes()
 
 
-def vsifile_18():
+def test_vsifile_18():
 
     prefixes = gdal.GetFileSystemsPrefixes()
     if '/vsimem/' not in prefixes:
@@ -773,7 +773,7 @@ def vsifile_18():
 # Test gdal.GetFileSystemOptions()
 
 
-def vsifile_19():
+def test_vsifile_19():
 
     for prefix in gdal.GetFileSystemsPrefixes():
         options = gdal.GetFileSystemOptions(prefix)
@@ -791,7 +791,7 @@ def vsifile_19():
 # Test gdal.VSIFReadL with None fp
 
 
-def vsifile_20():
+def test_vsifile_20():
 
     try:
         gdal.VSIFReadL(1, 1, None)
@@ -804,7 +804,7 @@ def vsifile_20():
 # Test gdal.VSIGetMemFileBuffer_unsafe() and gdal.VSIFWriteL() reading buffers
 
 
-def vsifile_21():
+def test_vsifile_21():
 
     filename = '/vsimem/read.tif'
     filename_write = '/vsimem/write.tif'
@@ -838,7 +838,7 @@ def vsifile_21():
     return 'success'
 
 
-def vsifile_22():
+def test_vsifile_22():
     # VSIOpenL doesn't set errorno
     gdal.VSIErrorReset()
     if gdal.VSIGetLastErrorNo() != 0:
@@ -876,7 +876,7 @@ def vsifile_22():
 # Test bugfix for https://github.com/OSGeo/gdal/issues/675
 
 
-def vsitar_bug_675():
+def test_vsitar_bug_675():
 
     content = gdal.ReadDir('/vsitar/data/tar_with_star_base256_fields.tar')
     if len(content) != 1:
@@ -888,7 +888,7 @@ def vsitar_bug_675():
 # Test multithreaded compression
 
 
-def vsigzip_multi_thread():
+def test_vsigzip_multi_thread():
 
     with gdaltest.config_options({'GDAL_NUM_THREADS': 'ALL_CPUS',
                                   'CPL_VSIL_DEFLATE_CHUNK_SIZE': '32K'}):
@@ -919,7 +919,7 @@ def vsigzip_multi_thread():
 # Test vsisync()
 
 
-def vsisync():
+def test_vsisync():
 
     with gdaltest.error_handler():
         if gdal.Sync('/i_do/not/exist', '/vsimem/'):
@@ -1002,7 +1002,7 @@ def my_progress(pct, message, user_data):
 ###############################################################################
 # Test gdal.OpenDir()
 
-def vsifile_opendir():
+def test_vsifile_opendir():
 
     # Non existing dir
     d = gdal.OpenDir('/vsimem/i_dont_exist')
@@ -1125,32 +1125,32 @@ def vsifile_opendir():
     return 'success'
 
 
-gdaltest_list = [vsifile_1,
-                 vsifile_2,
-                 vsifile_3,
-                 vsifile_4,
-                 vsifile_5,
-                 vsifile_6,
-                 vsifile_7,
-                 vsifile_8,
-                 vsifile_9,
-                 vsifile_10,
-                 vsifile_11,
-                 vsifile_12,
-                 vsifile_13,
-                 vsifile_14,
-                 vsifile_15,
-                 vsifile_16,
-                 vsifile_17,
-                 vsifile_18,
-                 vsifile_19,
-                 vsifile_20,
-                 vsifile_21,
-                 vsifile_22,
-                 vsitar_bug_675,
-                 vsigzip_multi_thread,
-                 vsifile_opendir,
-                 vsisync]
+gdaltest_list = [test_vsifile_1,
+                 test_vsifile_2,
+                 test_vsifile_3,
+                 test_vsifile_4,
+                 test_vsifile_5,
+                 test_vsifile_6,
+                 test_vsifile_7,
+                 test_vsifile_8,
+                 test_vsifile_9,
+                 test_vsifile_10,
+                 test_vsifile_11,
+                 test_vsifile_12,
+                 test_vsifile_13,
+                 test_vsifile_14,
+                 test_vsifile_15,
+                 test_vsifile_16,
+                 test_vsifile_17,
+                 test_vsifile_18,
+                 test_vsifile_19,
+                 test_vsifile_20,
+                 test_vsifile_21,
+                 test_vsifile_22,
+                 test_vsitar_bug_675,
+                 test_vsigzip_multi_thread,
+                 test_vsifile_opendir,
+                 test_vsisync]
 
 if __name__ == '__main__':
 
diff --git a/autotest/gcore/vsigs.py b/autotest/gcore/vsigs.py
index cbc9dfd3675a..258e9acb08d3 100755
--- a/autotest/gcore/vsigs.py
+++ b/autotest/gcore/vsigs.py
@@ -46,7 +46,7 @@ def open_for_read(uri):
 ###############################################################################
 
 
-def vsigs_init():
+def test_vsigs_init():
 
     gdaltest.gs_vars = {}
     for var in ('GS_SECRET_ACCESS_KEY', 'GS_ACCESS_KEY_ID',
@@ -77,7 +77,7 @@ def vsigs_init():
 # Error cases
 
 
-def vsigs_1():
+def test_vsigs_1():
 
     if not gdaltest.built_against_curl():
         return 'skip'
@@ -165,7 +165,7 @@ def vsigs_1():
 ###############################################################################
 
 
-def vsigs_start_webserver():
+def test_vsigs_start_webserver():
 
     gdaltest.webserver_process = None
     gdaltest.webserver_port = 0
@@ -187,7 +187,7 @@ def vsigs_start_webserver():
 # Test with a fake Google Cloud Storage server
 
 
-def vsigs_2():
+def test_vsigs_2():
 
     if gdaltest.webserver_port == 0:
         return 'skip'
@@ -290,7 +290,7 @@ def vsigs_2():
 # Test ReadDir() with a fake Google Cloud Storage server
 
 
-def vsigs_readdir():
+def test_vsigs_readdir():
 
     if gdaltest.webserver_port == 0:
         return 'skip'
@@ -380,7 +380,7 @@ def vsigs_readdir():
 # Test write
 
 
-def vsigs_write():
+def test_vsigs_write():
 
     if gdaltest.webserver_port == 0:
         return 'skip'
@@ -492,7 +492,7 @@ def method(request):
 # Read credentials with OAuth2 refresh_token
 
 
-def vsigs_read_credentials_refresh_token_default_gdal_app():
+def test_vsigs_read_credentials_refresh_token_default_gdal_app():
 
     if gdaltest.webserver_port == 0:
         return 'skip'
@@ -574,7 +574,7 @@ def method(request):
 # Read credentials with OAuth2 refresh_token
 
 
-def vsigs_read_credentials_refresh_token_custom_app():
+def test_vsigs_read_credentials_refresh_token_custom_app():
 
     if gdaltest.webserver_port == 0:
         return 'skip'
@@ -655,7 +655,7 @@ def method(request):
 # Read credentials with OAuth2 service account
 
 
-def vsigs_read_credentials_oauth2_service_account():
+def test_vsigs_read_credentials_oauth2_service_account():
 
     if gdaltest.webserver_port == 0:
         return 'skip'
@@ -773,7 +773,7 @@ def method(request):
 # Read credentials with OAuth2 service account through a json configuration file
 
 
-def vsigs_read_credentials_oauth2_service_account_json_file():
+def test_vsigs_read_credentials_oauth2_service_account_json_file():
 
     if gdaltest.webserver_port == 0:
         return 'skip'
@@ -876,7 +876,7 @@ def method(request):
 # Read credentials from simulated ~/.boto
 
 
-def vsigs_read_credentials_file():
+def test_vsigs_read_credentials_file():
 
     if gdaltest.webserver_port == 0:
         return 'skip'
@@ -941,7 +941,7 @@ def method(request):
 # Read credentials from simulated ~/.boto
 
 
-def vsigs_read_credentials_file_refresh_token():
+def test_vsigs_read_credentials_file_refresh_token():
 
     if gdaltest.webserver_port == 0:
         return 'skip'
@@ -1026,7 +1026,7 @@ def method(request):
 # Read credentials from simulated GCE instance
 
 
-def vsigs_read_credentials_gce():
+def test_vsigs_read_credentials_gce():
 
     if gdaltest.webserver_port == 0:
         return 'skip'
@@ -1116,7 +1116,7 @@ def method(request):
 # cached credentials
 
 
-def vsigs_read_credentials_gce_expiration():
+def test_vsigs_read_credentials_gce_expiration():
 
     if gdaltest.webserver_port == 0:
         return 'skip'
@@ -1189,7 +1189,7 @@ def method(request):
 ###############################################################################
 
 
-def vsigs_stop_webserver():
+def test_vsigs_stop_webserver():
 
     if gdaltest.webserver_port == 0:
         return 'skip'
@@ -1393,7 +1393,7 @@ def vsigs_extra_1():
 ###############################################################################
 
 
-def vsigs_cleanup():
+def test_vsigs_cleanup():
 
     for var in gdaltest.gs_vars:
         gdal.SetConfigOption(var, gdaltest.gs_vars[var])
@@ -1401,22 +1401,22 @@ def vsigs_cleanup():
     return 'success'
 
 
-gdaltest_list = [vsigs_init,
-                 vsigs_1,
-                 vsigs_start_webserver,
-                 vsigs_2,
-                 vsigs_readdir,
-                 vsigs_write,
-                 vsigs_read_credentials_refresh_token_default_gdal_app,
-                 vsigs_read_credentials_refresh_token_custom_app,
-                 vsigs_read_credentials_oauth2_service_account,
-                 vsigs_read_credentials_oauth2_service_account_json_file,
-                 vsigs_read_credentials_file,
-                 vsigs_read_credentials_file_refresh_token,
-                 vsigs_read_credentials_gce,
-                 vsigs_read_credentials_gce_expiration,
-                 vsigs_stop_webserver,
-                 vsigs_cleanup]
+gdaltest_list = [test_vsigs_init,
+                 test_vsigs_1,
+                 test_vsigs_start_webserver,
+                 test_vsigs_2,
+                 test_vsigs_readdir,
+                 test_vsigs_write,
+                 test_vsigs_read_credentials_refresh_token_default_gdal_app,
+                 test_vsigs_read_credentials_refresh_token_custom_app,
+                 test_vsigs_read_credentials_oauth2_service_account,
+                 test_vsigs_read_credentials_oauth2_service_account_json_file,
+                 test_vsigs_read_credentials_file,
+                 test_vsigs_read_credentials_file_refresh_token,
+                 test_vsigs_read_credentials_gce,
+                 test_vsigs_read_credentials_gce_expiration,
+                 test_vsigs_stop_webserver,
+                 test_vsigs_cleanup]
 
 # gdaltest_list = [ vsigs_init, vsigs_start_webserver, vsigs_write, vsigs_stop_webserver, vsigs_cleanup ]
 
@@ -1429,6 +1429,6 @@ def vsigs_cleanup():
     if gdal.GetConfigOption('RUN_MANUAL_ONLY', None):
         gdaltest.run_tests(gdaltest_list_extra)
     else:
-        gdaltest.run_tests(gdaltest_list + gdaltest_list_extra + [vsigs_cleanup])
+        gdaltest.run_tests(gdaltest_list + gdaltest_list_extra + [test_vsigs_cleanup])
 
     sys.exit(gdaltest.summarize())
diff --git a/autotest/gcore/vsihdfs.py b/autotest/gcore/vsihdfs.py
index 141b0b475e7c..3e4be7a55b35 100755
--- a/autotest/gcore/vsihdfs.py
+++ b/autotest/gcore/vsihdfs.py
@@ -38,7 +38,7 @@
 import gdaltest
 
 # Read test
-def vsihdfs_1():
+def test_vsihdfs_1():
     filename = '/vsihdfs/file:' + os.getcwd() + '/data/text.txt'
     fp = gdal.VSIFOpenL(filename, 'rb')
     if fp is None:
@@ -59,7 +59,7 @@ def vsihdfs_1():
     return 'success'
 
 # Seek test
-def vsihdfs_2():
+def test_vsihdfs_2():
     if gdaltest.have_vsihdfs == False:
         return 'skip'
 
@@ -88,7 +88,7 @@ def vsihdfs_2():
     return 'success'
 
 # Tell test
-def vsihdfs_3():
+def test_vsihdfs_3():
     if gdaltest.have_vsihdfs == False:
         return 'skip'
 
@@ -109,11 +109,11 @@ def vsihdfs_3():
     return 'success'
 
 # Write test
-def vsihdfs_4():
+def test_vsihdfs_4():
     return 'skip'
 
 # EOF test
-def vsihdfs_5():
+def test_vsihdfs_5():
     if gdaltest.have_vsihdfs == False:
         return 'skip'
 
@@ -146,7 +146,7 @@ def vsihdfs_5():
     return 'success'
 
 # Stat test
-def vsihdfs_6():
+def test_vsihdfs_6():
     if gdaltest.have_vsihdfs == False:
         return 'skip'
 
@@ -163,7 +163,7 @@ def vsihdfs_6():
     return 'success'
 
 # ReadDir test
-def vsihdfs_7():
+def test_vsihdfs_7():
     if gdaltest.have_vsihdfs == False:
         return 'skip'
 
@@ -175,13 +175,13 @@ def vsihdfs_7():
     return 'success'
 
 
-gdaltest_list = [vsihdfs_1,
-                 vsihdfs_2,
-                 vsihdfs_3,
-                 vsihdfs_4,
-                 vsihdfs_5,
-                 vsihdfs_6,
-                 vsihdfs_7]
+gdaltest_list = [test_vsihdfs_1,
+                 test_vsihdfs_2,
+                 test_vsihdfs_3,
+                 test_vsihdfs_4,
+                 test_vsihdfs_5,
+                 test_vsihdfs_6,
+                 test_vsihdfs_7]
 
 if __name__ == '__main__':
 
diff --git a/autotest/gcore/vsioss.py b/autotest/gcore/vsioss.py
index bbc1c5885d28..a3311b4a7817 100755
--- a/autotest/gcore/vsioss.py
+++ b/autotest/gcore/vsioss.py
@@ -46,7 +46,7 @@ def open_for_read(uri):
 ###############################################################################
 
 
-def visoss_init():
+def test_visoss_init():
 
     gdaltest.oss_vars = {}
     for var in ('OSS_SECRET_ACCESS_KEY', 'OSS_ACCESS_KEY_ID', 'OSS_TIMESTAMP', 'OSS_HTTPS', 'OSS_VIRTUAL_HOSTING', 'OSS_ENDPOINT'):
@@ -64,7 +64,7 @@ def visoss_init():
 # Error cases
 
 
-def visoss_1():
+def test_visoss_1():
 
     if not gdaltest.built_against_curl():
         return 'skip'
@@ -102,7 +102,7 @@ def visoss_1():
     return 'success'
 
 
-def visoss_real_test():
+def test_visoss_real_test():
 
     if not gdaltest.built_against_curl():
         return 'skip'
@@ -136,7 +136,7 @@ def visoss_real_test():
 ###############################################################################
 
 
-def visoss_start_webserver():
+def test_visoss_start_webserver():
 
     gdaltest.webserver_process = None
     gdaltest.webserver_port = 0
@@ -184,7 +184,7 @@ def get_oss_fake_bucket_resource_method(request):
 # Test with a fake OSS server
 
 
-def visoss_2():
+def test_visoss_2():
 
     if gdaltest.webserver_port == 0:
         return 'skip'
@@ -414,7 +414,7 @@ def method(request):
 # Test ReadDir() with a fake OSS server
 
 
-def visoss_3():
+def test_visoss_3():
 
     if gdaltest.webserver_port == 0:
         return 'skip'
@@ -658,7 +658,7 @@ def method(request):
 # Test simple PUT support with a fake OSS server
 
 
-def visoss_4():
+def test_visoss_4():
 
     if gdaltest.webserver_port == 0:
         return 'skip'
@@ -817,7 +817,7 @@ def method(request):
 # Test simple DELETE support with a fake OSS server
 
 
-def visoss_5():
+def test_visoss_5():
 
     if gdaltest.webserver_port == 0:
         return 'skip'
@@ -873,7 +873,7 @@ def visoss_5():
 # Test multipart upload with a fake OSS server
 
 
-def visoss_6():
+def test_visoss_6():
 
     if gdaltest.webserver_port == 0:
         return 'skip'
@@ -1097,7 +1097,7 @@ def method(request):
 # Test Mkdir() / Rmdir()
 
 
-def visoss_7():
+def test_visoss_7():
 
     if gdaltest.webserver_port == 0:
         return 'skip'
@@ -1166,7 +1166,7 @@ def visoss_7():
 # Test handling of file and directory with same name
 
 
-def visoss_8():
+def test_visoss_8():
 
     if gdaltest.webserver_port == 0:
         return 'skip'
@@ -1212,7 +1212,7 @@ def visoss_8():
 ###############################################################################
 
 
-def visoss_stop_webserver():
+def test_visoss_stop_webserver():
 
     if gdaltest.webserver_port == 0:
         return 'skip'
@@ -1418,7 +1418,7 @@ def visoss_extra_1():
 ###############################################################################
 
 
-def visoss_cleanup():
+def test_visoss_cleanup():
 
     for var in gdaltest.oss_vars:
         gdal.SetConfigOption(var, gdaltest.oss_vars[var])
@@ -1426,19 +1426,19 @@ def visoss_cleanup():
     return 'success'
 
 
-gdaltest_list = [visoss_init,
-                 visoss_1,
-                 visoss_real_test,
-                 visoss_start_webserver,
-                 visoss_2,
-                 visoss_3,
-                 visoss_4,
-                 visoss_5,
-                 visoss_6,
-                 visoss_7,
-                 visoss_8,
-                 visoss_stop_webserver,
-                 visoss_cleanup]
+gdaltest_list = [test_visoss_init,
+                 test_visoss_1,
+                 test_visoss_real_test,
+                 test_visoss_start_webserver,
+                 test_visoss_2,
+                 test_visoss_3,
+                 test_visoss_4,
+                 test_visoss_5,
+                 test_visoss_6,
+                 test_visoss_7,
+                 test_visoss_8,
+                 test_visoss_stop_webserver,
+                 test_visoss_cleanup]
 
 # gdaltest_list = [ visoss_init, visoss_start_webserver, visoss_8, visoss_stop_webserver, visoss_cleanup ]
 
@@ -1451,6 +1451,6 @@ def visoss_cleanup():
     if gdal.GetConfigOption('RUN_MANUAL_ONLY', None):
         gdaltest.run_tests(gdaltest_list_extra)
     else:
-        gdaltest.run_tests(gdaltest_list + gdaltest_list_extra + [visoss_cleanup])
+        gdaltest.run_tests(gdaltest_list + gdaltest_list_extra + [test_visoss_cleanup])
 
     sys.exit(gdaltest.summarize())
diff --git a/autotest/gcore/vsis3.py b/autotest/gcore/vsis3.py
index 87ae1faf9fc8..1dff8c9d98b2 100755
--- a/autotest/gcore/vsis3.py
+++ b/autotest/gcore/vsis3.py
@@ -47,7 +47,7 @@ def open_for_read(uri):
 ###############################################################################
 
 
-def vsis3_init():
+def test_vsis3_init():
 
     gdaltest.aws_vars = {}
     for var in ('AWS_SECRET_ACCESS_KEY', 'AWS_ACCESS_KEY_ID', 'AWS_TIMESTAMP', 'AWS_HTTPS', 'AWS_VIRTUAL_HOSTING', 'AWS_S3_ENDPOINT', 'AWS_REQUEST_PAYER', 'AWS_DEFAULT_REGION', 'AWS_DEFAULT_PROFILE', 'AWS_NO_SIGN_REQUEST'):
@@ -71,7 +71,7 @@ def vsis3_init():
 # Test AWS_NO_SIGN_REQUEST=YES
 
 
-def vsis3_no_sign_request():
+def test_vsis3_no_sign_request():
 
     if not gdaltest.built_against_curl():
         return 'skip'
@@ -103,7 +103,7 @@ def vsis3_no_sign_request():
 # Error cases
 
 
-def vsis3_1():
+def test_vsis3_1():
 
     if not gdaltest.built_against_curl():
         return 'skip'
@@ -164,7 +164,7 @@ def vsis3_1():
 ###############################################################################
 
 
-def vsis3_start_webserver():
+def test_vsis3_start_webserver():
 
     gdaltest.webserver_process = None
     gdaltest.webserver_port = 0
@@ -211,7 +211,7 @@ def get_s3_fake_bucket_resource_method(request):
 # Test with a fake AWS server
 
 
-def vsis3_2():
+def test_vsis3_2():
 
     if gdaltest.webserver_port == 0:
         return 'skip'
@@ -662,7 +662,7 @@ def method_req_2(self, request):
 # Test ReadDir() with a fake AWS server
 
 
-def vsis3_readdir():
+def test_vsis3_readdir():
 
     if gdaltest.webserver_port == 0:
         return 'skip'
@@ -1103,7 +1103,7 @@ def method_req_2(self, request):
 # Test OpenDir() with a fake AWS server
 
 
-def vsis3_opendir():
+def test_vsis3_opendir():
 
     if gdaltest.webserver_port == 0:
         return 'skip'
@@ -1323,7 +1323,7 @@ def vsis3_opendir():
 # Test simple PUT support with a fake AWS server
 
 
-def vsis3_4():
+def test_vsis3_4():
 
     if gdaltest.webserver_port == 0:
         return 'skip'
@@ -1538,7 +1538,7 @@ def method(request):
 # Test simple DELETE support with a fake AWS server
 
 
-def vsis3_5():
+def test_vsis3_5():
 
     if gdaltest.webserver_port == 0:
         return 'skip'
@@ -1628,7 +1628,7 @@ def method(request):
 # Test multipart upload with a fake AWS server
 
 
-def vsis3_6():
+def test_vsis3_6():
 
     if gdaltest.webserver_port == 0:
         return 'skip'
@@ -1867,7 +1867,7 @@ def method(request):
 # Test Mkdir() / Rmdir()
 
 
-def vsis3_7():
+def test_vsis3_7():
 
     if gdaltest.webserver_port == 0:
         return 'skip'
@@ -2024,7 +2024,7 @@ def vsis3_7():
 # Test handling of file and directory with same name
 
 
-def vsis3_8():
+def test_vsis3_8():
 
     if gdaltest.webserver_port == 0:
         return 'skip'
@@ -2071,7 +2071,7 @@ def vsis3_8():
 # Test vsisync() with SYNC_STRATEGY=ETAG
 
 
-def vsis3_sync_etag():
+def test_vsis3_sync_etag():
 
     if gdaltest.webserver_port == 0:
         return 'skip'
@@ -2237,7 +2237,7 @@ def method(request):
 # Test vsisync() with SYNC_STRATEGY=TIMESTAMP
 
 
-def vsis3_sync_timestamp():
+def test_vsis3_sync_timestamp():
 
     if gdaltest.webserver_port == 0:
         return 'skip'
@@ -2312,7 +2312,7 @@ def vsis3_sync_timestamp():
 # Read credentials from simulated ~/.aws/credentials
 
 
-def vsis3_read_credentials_file():
+def test_vsis3_read_credentials_file():
 
     if gdaltest.webserver_port == 0:
         return 'skip'
@@ -2360,7 +2360,7 @@ def vsis3_read_credentials_file():
 # Read credentials from simulated  ~/.aws/config
 
 
-def vsis3_read_config_file():
+def test_vsis3_read_config_file():
 
     if gdaltest.webserver_port == 0:
         return 'skip'
@@ -2409,7 +2409,7 @@ def vsis3_read_config_file():
 # Read credentials from simulated ~/.aws/credentials and ~/.aws/config
 
 
-def vsis3_read_credentials_config_file():
+def test_vsis3_read_credentials_config_file():
 
     if gdaltest.webserver_port == 0:
         return 'skip'
@@ -2474,7 +2474,7 @@ def vsis3_read_credentials_config_file():
 # a non default profile
 
 
-def vsis3_read_credentials_config_file_non_default():
+def test_vsis3_read_credentials_config_file_non_default():
 
     if gdaltest.webserver_port == 0:
         return 'skip'
@@ -2538,7 +2538,7 @@ def vsis3_read_credentials_config_file_non_default():
 # Read credentials from simulated ~/.aws/credentials and ~/.aws/config
 
 
-def vsis3_read_credentials_config_file_inconsistent():
+def test_vsis3_read_credentials_config_file_inconsistent():
 
     if gdaltest.webserver_port == 0:
         return 'skip'
@@ -2608,7 +2608,7 @@ def vsis3_read_credentials_config_file_inconsistent():
 # Read credentials from simulated EC2 instance
 
 
-def vsis3_read_credentials_ec2():
+def test_vsis3_read_credentials_ec2():
 
     if gdaltest.webserver_port == 0:
         return 'skip'
@@ -2678,7 +2678,7 @@ def vsis3_read_credentials_ec2():
 # cached credentials
 
 
-def vsis3_read_credentials_ec2_expiration():
+def test_vsis3_read_credentials_ec2_expiration():
 
     if gdaltest.webserver_port == 0:
         return 'skip'
@@ -2737,7 +2737,7 @@ def vsis3_read_credentials_ec2_expiration():
 ###############################################################################
 
 
-def vsis3_stop_webserver():
+def test_vsis3_stop_webserver():
 
     if gdaltest.webserver_port == 0:
         return 'skip'
@@ -2947,7 +2947,7 @@ def vsis3_extra_1():
 ###############################################################################
 
 
-def vsis3_cleanup():
+def test_vsis3_cleanup():
 
     for var in gdaltest.aws_vars:
         gdal.SetConfigOption(var, gdaltest.aws_vars[var])
@@ -2959,29 +2959,29 @@ def vsis3_cleanup():
     return 'success'
 
 
-gdaltest_list = [vsis3_init,
-                 vsis3_no_sign_request,
-                 vsis3_1,
-                 vsis3_start_webserver,
-                 vsis3_2,
-                 vsis3_readdir,
-                 vsis3_opendir,
-                 vsis3_4,
-                 vsis3_5,
-                 vsis3_6,
-                 vsis3_7,
-                 vsis3_8,
-                 vsis3_sync_etag,
-                 vsis3_sync_timestamp,
-                 vsis3_read_credentials_file,
-                 vsis3_read_config_file,
-                 vsis3_read_credentials_config_file,
-                 vsis3_read_credentials_config_file_non_default,
-                 vsis3_read_credentials_config_file_inconsistent,
-                 vsis3_read_credentials_ec2,
-                 vsis3_read_credentials_ec2_expiration,
-                 vsis3_stop_webserver,
-                 vsis3_cleanup]
+gdaltest_list = [test_vsis3_init,
+                 test_vsis3_no_sign_request,
+                 test_vsis3_1,
+                 test_vsis3_start_webserver,
+                 test_vsis3_2,
+                 test_vsis3_readdir,
+                 test_vsis3_opendir,
+                 test_vsis3_4,
+                 test_vsis3_5,
+                 test_vsis3_6,
+                 test_vsis3_7,
+                 test_vsis3_8,
+                 test_vsis3_sync_etag,
+                 test_vsis3_sync_timestamp,
+                 test_vsis3_read_credentials_file,
+                 test_vsis3_read_config_file,
+                 test_vsis3_read_credentials_config_file,
+                 test_vsis3_read_credentials_config_file_non_default,
+                 test_vsis3_read_credentials_config_file_inconsistent,
+                 test_vsis3_read_credentials_ec2,
+                 test_vsis3_read_credentials_ec2_expiration,
+                 test_vsis3_stop_webserver,
+                 test_vsis3_cleanup]
 
 # gdaltest_list = [ vsis3_init, vsis3_start_webserver, vsis3_opendir, vsis3_stop_webserver, vsis3_cleanup ]
 
@@ -2994,6 +2994,6 @@ def vsis3_cleanup():
     if gdal.GetConfigOption('RUN_MANUAL_ONLY', None):
         gdaltest.run_tests(gdaltest_list_extra)
     else:
-        gdaltest.run_tests(gdaltest_list + gdaltest_list_extra + [vsis3_cleanup])
+        gdaltest.run_tests(gdaltest_list + gdaltest_list_extra + [test_vsis3_cleanup])
 
     sys.exit(gdaltest.summarize())
diff --git a/autotest/gcore/vsistdin.py b/autotest/gcore/vsistdin.py
index 87c7c3db39e4..6a9c0fe7ef59 100755
--- a/autotest/gcore/vsistdin.py
+++ b/autotest/gcore/vsistdin.py
@@ -40,7 +40,7 @@
 # Test on a small file
 
 
-def vsistdin_1():
+def test_vsistdin_1():
     if test_cli_utilities.get_gdal_translate_path() is None:
         return 'skip'
 
@@ -71,7 +71,7 @@ def vsistdin_1():
 # Test on a bigger file (> 1 MB)
 
 
-def vsistdin_2():
+def test_vsistdin_2():
     if test_cli_utilities.get_gdal_translate_path() is None:
         return 'skip'
 
@@ -96,7 +96,7 @@ def vsistdin_2():
 # Test opening /vsistdin/ in write mode (failure expected)
 
 
-def vsistdin_3():
+def test_vsistdin_3():
 
     gdal.PushErrorHandler('CPLQuietErrorHandler')
     f = gdal.VSIFOpenL('/vsistdin/', 'wb')
@@ -110,7 +110,7 @@ def vsistdin_3():
 # Test fix for #6061
 
 
-def vsistdin_4():
+def test_vsistdin_4():
     if test_cli_utilities.get_gdal_translate_path() is None:
         return 'skip'
 
@@ -144,7 +144,7 @@ def vsistdin_4():
     return 'success'
 
 
-gdaltest_list = [vsistdin_1, vsistdin_2, vsistdin_3, vsistdin_4]
+gdaltest_list = [test_vsistdin_1, test_vsistdin_2, test_vsistdin_3, test_vsistdin_4]
 
 
 if __name__ == '__main__':
diff --git a/autotest/gcore/vsiswift.py b/autotest/gcore/vsiswift.py
index 8c9ff60823f8..6c0cb2370f99 100644
--- a/autotest/gcore/vsiswift.py
+++ b/autotest/gcore/vsiswift.py
@@ -46,7 +46,7 @@ def open_for_read(uri):
 ###############################################################################
 
 
-def vsiswift_init():
+def test_vsiswift_init():
 
     gdaltest.swift_vars = {}
     for var in ('SWIFT_STORAGE_URL', 'SWIFT_AUTH_TOKEN',
@@ -61,7 +61,7 @@ def vsiswift_init():
 # Error cases
 
 
-def vsiswift_real_server_errors():
+def test_vsiswift_real_server_errors():
 
     if not gdaltest.built_against_curl():
         return 'skip'
@@ -119,7 +119,7 @@ def vsiswift_real_server_errors():
 ###############################################################################
 
 
-def vsiswift_start_webserver():
+def test_vsiswift_start_webserver():
 
     gdaltest.webserver_process = None
     gdaltest.webserver_port = 0
@@ -137,7 +137,7 @@ def vsiswift_start_webserver():
 # Test authentication with SWIFT_AUTH_V1_URL + SWIFT_USER + SWIFT_KEY
 
 
-def vsiswift_fake_auth_v1_url():
+def test_vsiswift_fake_auth_v1_url():
 
     if gdaltest.webserver_port == 0:
         return 'skip'
@@ -239,7 +239,7 @@ def method(request):
 # Test authentication with SWIFT_STORAGE_URL + SWIFT_AUTH_TOKEN
 
 
-def vsiswift_fake_auth_storage_url_and_auth_token():
+def test_vsiswift_fake_auth_storage_url_and_auth_token():
 
     if gdaltest.webserver_port == 0:
         return 'skip'
@@ -302,7 +302,7 @@ def method(request):
 # Test VSIStatL()
 
 
-def vsiswift_stat():
+def test_vsiswift_stat():
 
     if gdaltest.webserver_port == 0:
         return 'skip'
@@ -351,7 +351,7 @@ def vsiswift_stat():
 # Test ReadDir()
 
 
-def vsiswift_fake_readdir():
+def test_vsiswift_fake_readdir():
 
     if gdaltest.webserver_port == 0:
         return 'skip'
@@ -481,7 +481,7 @@ def vsiswift_fake_readdir():
 # Test write
 
 
-def vsiswift_fake_write():
+def test_vsiswift_fake_write():
 
     if gdaltest.webserver_port == 0:
         return 'skip'
@@ -541,7 +541,7 @@ def method(request):
 # Test Unlink()
 
 
-def vsiswift_fake_unlink():
+def test_vsiswift_fake_unlink():
 
     if gdaltest.webserver_port == 0:
         return 'skip'
@@ -577,7 +577,7 @@ def vsiswift_fake_unlink():
 # Test Mkdir() / Rmdir()
 
 
-def vsiswift_fake_mkdir_rmdir():
+def test_vsiswift_fake_mkdir_rmdir():
 
     if gdaltest.webserver_port == 0:
         return 'skip'
@@ -683,7 +683,7 @@ def vsiswift_fake_mkdir_rmdir():
 ###############################################################################
 
 
-def vsiswift_stop_webserver():
+def test_vsiswift_stop_webserver():
 
     if gdaltest.webserver_port == 0:
         return 'skip'
@@ -853,7 +853,7 @@ def vsiswift_extra_1():
 ###############################################################################
 
 
-def vsiswift_cleanup():
+def test_vsiswift_cleanup():
 
     for var in gdaltest.swift_vars:
         gdal.SetConfigOption(var, gdaltest.swift_vars[var])
@@ -861,18 +861,18 @@ def vsiswift_cleanup():
     return 'success'
 
 
-gdaltest_list = [vsiswift_init,
-                 vsiswift_real_server_errors,
-                 vsiswift_start_webserver,
-                 vsiswift_fake_auth_v1_url,
-                 vsiswift_fake_auth_storage_url_and_auth_token,
-                 vsiswift_stat,
-                 vsiswift_fake_readdir,
-                 vsiswift_fake_write,
-                 vsiswift_fake_unlink,
-                 vsiswift_fake_mkdir_rmdir,
-                 vsiswift_stop_webserver,
-                 vsiswift_cleanup]
+gdaltest_list = [test_vsiswift_init,
+                 test_vsiswift_real_server_errors,
+                 test_vsiswift_start_webserver,
+                 test_vsiswift_fake_auth_v1_url,
+                 test_vsiswift_fake_auth_storage_url_and_auth_token,
+                 test_vsiswift_stat,
+                 test_vsiswift_fake_readdir,
+                 test_vsiswift_fake_write,
+                 test_vsiswift_fake_unlink,
+                 test_vsiswift_fake_mkdir_rmdir,
+                 test_vsiswift_stop_webserver,
+                 test_vsiswift_cleanup]
 
 # gdaltest_list = [ vsiswift_init, vsiswift_start_webserver, vsiswift_fake_mkdir_rmdir, vsiswift_stop_webserver, vsiswift_cleanup ]
 
@@ -885,6 +885,6 @@ def vsiswift_cleanup():
     if gdal.GetConfigOption('RUN_MANUAL_ONLY', None):
         gdaltest.run_tests(gdaltest_list_extra)
     else:
-        gdaltest.run_tests(gdaltest_list + gdaltest_list_extra + [vsiswift_cleanup])
+        gdaltest.run_tests(gdaltest_list + gdaltest_list_extra + [test_vsiswift_cleanup])
 
     sys.exit(gdaltest.summarize())
diff --git a/autotest/gcore/vsiwebhdfs.py b/autotest/gcore/vsiwebhdfs.py
index 64b6fb9a58fa..ea79f7677366 100644
--- a/autotest/gcore/vsiwebhdfs.py
+++ b/autotest/gcore/vsiwebhdfs.py
@@ -46,7 +46,7 @@ def open_for_read(uri):
 ###############################################################################
 
 
-def vsiwebhdfs_init():
+def test_vsiwebhdfs_init():
 
     gdaltest.webhdfs_vars = {}
     for var in ('WEBHDFS_USERNAME', 'WEBHDFS_DELEGATION'):
@@ -59,7 +59,7 @@ def vsiwebhdfs_init():
 ###############################################################################
 
 
-def vsiwebhdfs_start_webserver():
+def test_vsiwebhdfs_start_webserver():
 
     gdaltest.webserver_process = None
     gdaltest.webserver_port = 0
@@ -83,7 +83,7 @@ def vsiwebhdfs_start_webserver():
 # Test VSIFOpenL()
 
 
-def vsiwebhdfs_open():
+def test_vsiwebhdfs_open():
 
     if gdaltest.webserver_port == 0:
         return 'skip'
@@ -156,7 +156,7 @@ def vsiwebhdfs_open():
 # Test VSIStatL()
 
 
-def vsiwebhdfs_stat():
+def test_vsiwebhdfs_stat():
 
     if gdaltest.webserver_port == 0:
         return 'skip'
@@ -199,7 +199,7 @@ def vsiwebhdfs_stat():
 # Test ReadDir()
 
 
-def vsiwebhdfs_readdir():
+def test_vsiwebhdfs_readdir():
 
     if gdaltest.webserver_port == 0:
         return 'skip'
@@ -248,7 +248,7 @@ def vsiwebhdfs_readdir():
 # Test write
 
 
-def vsiwebhdfs_write():
+def test_vsiwebhdfs_write():
 
     if gdaltest.webserver_port == 0:
         return 'skip'
@@ -399,7 +399,7 @@ def method(request):
 # Test Unlink()
 
 
-def vsiwebhdfs_unlink():
+def test_vsiwebhdfs_unlink():
 
     if gdaltest.webserver_port == 0:
         return 'skip'
@@ -464,7 +464,7 @@ def vsiwebhdfs_unlink():
 # Test Mkdir() / Rmdir()
 
 
-def vsiwebhdfs_mkdir_rmdir():
+def test_vsiwebhdfs_mkdir_rmdir():
 
     if gdaltest.webserver_port == 0:
         return 'skip'
@@ -547,7 +547,7 @@ def vsiwebhdfs_mkdir_rmdir():
 ###############################################################################
 
 
-def vsiwebhdfs_stop_webserver():
+def test_vsiwebhdfs_stop_webserver():
 
     if gdaltest.webserver_port == 0:
         return 'skip'
@@ -697,7 +697,7 @@ def vsiwebhdfs_extra_1():
 ###############################################################################
 
 
-def vsiwebhdfs_cleanup():
+def test_vsiwebhdfs_cleanup():
 
     for var in gdaltest.webhdfs_vars:
         gdal.SetConfigOption(var, gdaltest.webhdfs_vars[var])
@@ -705,16 +705,16 @@ def vsiwebhdfs_cleanup():
     return 'success'
 
 
-gdaltest_list = [vsiwebhdfs_init,
-                 vsiwebhdfs_start_webserver,
-                 vsiwebhdfs_open,
-                 vsiwebhdfs_stat,
-                 vsiwebhdfs_readdir,
-                 vsiwebhdfs_write,
-                 vsiwebhdfs_unlink,
-                 vsiwebhdfs_mkdir_rmdir,
-                 vsiwebhdfs_stop_webserver,
-                 vsiwebhdfs_cleanup]
+gdaltest_list = [test_vsiwebhdfs_init,
+                 test_vsiwebhdfs_start_webserver,
+                 test_vsiwebhdfs_open,
+                 test_vsiwebhdfs_stat,
+                 test_vsiwebhdfs_readdir,
+                 test_vsiwebhdfs_write,
+                 test_vsiwebhdfs_unlink,
+                 test_vsiwebhdfs_mkdir_rmdir,
+                 test_vsiwebhdfs_stop_webserver,
+                 test_vsiwebhdfs_cleanup]
 
 gdaltest_list_extra = [vsiwebhdfs_extra_1]
 
@@ -726,6 +726,6 @@ def vsiwebhdfs_cleanup():
         gdaltest.run_tests(gdaltest_list_extra)
     else:
         gdaltest.run_tests(
-            gdaltest_list + gdaltest_list_extra + [vsiwebhdfs_cleanup])
+            gdaltest_list + gdaltest_list_extra + [test_vsiwebhdfs_cleanup])
 
     sys.exit(gdaltest.summarize())
diff --git a/autotest/gcore/vsizip.py b/autotest/gcore/vsizip.py
index a96ae08942e9..81863b6cf737 100755
--- a/autotest/gcore/vsizip.py
+++ b/autotest/gcore/vsizip.py
@@ -40,7 +40,7 @@
 # Test writing a ZIP with multiple files and directories
 
 
-def vsizip_1():
+def test_vsizip_1():
 
     # We can keep the handle open during all the ZIP writing
     hZIP = gdal.VSIFOpenL("/vsizip/vsimem/test.zip", "wb")
@@ -222,7 +222,7 @@ def vsizip_1():
 # Test writing 2 files in the ZIP by closing it completely between the 2
 
 
-def vsizip_2():
+def test_vsizip_2():
 
     zip_name = '/vsimem/test2.zip'
 
@@ -297,7 +297,7 @@ def vsizip_2():
 ###############################################################################
 # Test opening in write mode a file inside a zip archive whose content has been listed before (testcase for fix of r22625)
 
-def vsizip_3():
+def test_vsizip_3():
 
     fmain = gdal.VSIFOpenL("/vsizip/vsimem/test3.zip", "wb")
 
@@ -330,7 +330,7 @@ def vsizip_3():
 # Test ReadRecursive on valid zip
 
 
-def vsizip_4():
+def test_vsizip_4():
 
     # read recursive and validate content
     res = gdal.ReadDirRecursive("/vsizip/data/testzip.zip")
@@ -350,7 +350,7 @@ def vsizip_4():
 # Test ReadRecursive on deep zip
 
 
-def vsizip_5():
+def test_vsizip_5():
 
     # make file in memory
     fmain = gdal.VSIFOpenL('/vsizip/vsimem/bigdepthzip.zip', 'wb')
@@ -386,7 +386,7 @@ def vsizip_5():
 # Test writing 2 files with same name in a ZIP (#4785)
 
 
-def vsizip_6():
+def test_vsizip_6():
 
     # Maintain ZIP file opened
     fmain = gdal.VSIFOpenL("/vsizip/vsimem/test6.zip", "wb")
@@ -435,7 +435,7 @@ def vsizip_6():
 # Test that we use the extended field for UTF-8 filenames (#5361).
 
 
-def vsizip_7():
+def test_vsizip_7():
 
     content = gdal.ReadDir("/vsizip/data/cp866_plus_utf8.zip")
     ok = 0
@@ -458,7 +458,7 @@ def vsizip_7():
 # Basic test for ZIP64 support (5 GB file that compresses in less than 4 GB)
 
 
-def vsizip_8():
+def test_vsizip_8():
 
     if gdal.VSIStatL('/vsizip/vsizip/data/zero.bin.zip.zip/zero.bin.zip').size != 5000 * 1000 * 1000 + 1:
         return 'fail'
@@ -469,7 +469,7 @@ def vsizip_8():
 # Basic test for ZIP64 support (5 GB file that is stored)
 
 
-def vsizip_9():
+def test_vsizip_9():
 
     if gdal.VSIStatL('/vsizip//vsisparse/data/zero_stored.bin.xml.zip/zero.bin').size != 5000 * 1000 * 1000 + 1:
         gdaltest.post_reason('fail')
@@ -501,7 +501,7 @@ def vsizip_9():
 # Test that we recode filenames in ZIP (#5361)
 
 
-def vsizip_10():
+def test_vsizip_10():
 
     gdal.SetConfigOption('CPL_ZIP_ENCODING', 'CP866')
     content = gdal.ReadDir("/vsizip/data/cp866.zip")
@@ -529,7 +529,7 @@ def vsizip_10():
 # Test that we don't do anything with ZIP with filenames in UTF-8 already (#5361)
 
 
-def vsizip_11():
+def test_vsizip_11():
 
     content = gdal.ReadDir("/vsizip/data/utf8.zip")
     ok = 0
@@ -552,7 +552,7 @@ def vsizip_11():
 # Test changing the content of a zip file (#6005)
 
 
-def vsizip_12():
+def test_vsizip_12():
 
     fmain = gdal.VSIFOpenL("/vsizip/vsimem/vsizip_12_src1.zip", "wb")
     f = gdal.VSIFOpenL("/vsizip/vsimem/vsizip_12_src1.zip/foo.bar", "wb")
@@ -605,7 +605,7 @@ def vsizip_12():
 # Test ReadDir() truncation
 
 
-def vsizip_13():
+def test_vsizip_13():
 
     fmain = gdal.VSIFOpenL("/vsizip/vsimem/vsizip_13.zip", "wb")
     for i in range(10):
@@ -631,7 +631,7 @@ def vsizip_13():
 # Test that we can recode filenames in ZIP when writing (#6631)
 
 
-def vsizip_14():
+def test_vsizip_14():
 
     fmain = gdal.VSIFOpenL('/vsizip//vsimem/vsizip_14.zip', 'wb')
     try:
@@ -666,7 +666,7 @@ def vsizip_14():
 # Test multithreaded compression
 
 
-def vsizip_multi_thread():
+def test_vsizip_multi_thread():
 
     with gdaltest.config_options({'GDAL_NUM_THREADS': 'ALL_CPUS',
                                   'CPL_VSIL_DEFLATE_CHUNK_SIZE': '32K'}):
@@ -699,7 +699,7 @@ def vsizip_multi_thread():
 # Test multithreaded compression, below the threshold where it triggers
 
 
-def vsizip_multi_thread_below_threshold():
+def test_vsizip_multi_thread_below_threshold():
 
     with gdaltest.config_options({'GDAL_NUM_THREADS': 'ALL_CPUS'}):
         fmain = gdal.VSIFOpenL('/vsizip//vsimem/vsizip_multi_thread.zip', 'wb')
@@ -726,7 +726,7 @@ def vsizip_multi_thread_below_threshold():
 # data stream < 4 GB
 
 
-def vsizip_create_zip64():
+def test_vsizip_create_zip64():
 
     if not gdaltest.run_slow_tests():
         return 'skip'
@@ -769,7 +769,7 @@ def vsizip_create_zip64():
 # Test creating ZIP64 file: compressed data stream > 4 GB
 
 
-def vsizip_create_zip64_stream_larger_than_4G():
+def test_vsizip_create_zip64_stream_larger_than_4G():
 
     if not gdaltest.run_slow_tests():
         return 'skip'
@@ -811,7 +811,7 @@ def vsizip_create_zip64_stream_larger_than_4G():
 
 
 ###############################################################################
-def vsizip_byte_zip64_local_header_zeroed():
+def test_vsizip_byte_zip64_local_header_zeroed():
 
     size = gdal.VSIStatL('/vsizip/data/byte_zip64_local_header_zeroed.zip/byte.tif').size
     if size != 736:
@@ -821,25 +821,25 @@ def vsizip_byte_zip64_local_header_zeroed():
 
     return 'success'
 
-gdaltest_list = [vsizip_1,
-                 vsizip_2,
-                 vsizip_3,
-                 vsizip_4,
-                 vsizip_5,
-                 vsizip_6,
-                 vsizip_7,
-                 vsizip_8,
-                 vsizip_9,
-                 vsizip_10,
-                 vsizip_11,
-                 vsizip_12,
-                 vsizip_13,
-                 vsizip_14,
-                 vsizip_multi_thread,
-                 vsizip_multi_thread_below_threshold,
-                 vsizip_create_zip64,
-                 vsizip_create_zip64_stream_larger_than_4G,
-                 vsizip_byte_zip64_local_header_zeroed,
+gdaltest_list = [test_vsizip_1,
+                 test_vsizip_2,
+                 test_vsizip_3,
+                 test_vsizip_4,
+                 test_vsizip_5,
+                 test_vsizip_6,
+                 test_vsizip_7,
+                 test_vsizip_8,
+                 test_vsizip_9,
+                 test_vsizip_10,
+                 test_vsizip_11,
+                 test_vsizip_12,
+                 test_vsizip_13,
+                 test_vsizip_14,
+                 test_vsizip_multi_thread,
+                 test_vsizip_multi_thread_below_threshold,
+                 test_vsizip_create_zip64,
+                 test_vsizip_create_zip64_stream_larger_than_4G,
+                 test_vsizip_byte_zip64_local_header_zeroed,
                  ]
 
 
diff --git a/autotest/gdrivers/aaigrid.py b/autotest/gdrivers/aaigrid.py
index 01e9271ff88b..89ee33e4c603 100755
--- a/autotest/gdrivers/aaigrid.py
+++ b/autotest/gdrivers/aaigrid.py
@@ -42,7 +42,7 @@
 # Perform simple read test.
 
 
-def aaigrid_1():
+def test_aaigrid_1():
 
     tst = gdaltest.GDALTest('aaigrid', 'pixel_per_line.asc', 1, 1123)
     return tst.testOpen()
@@ -51,7 +51,7 @@ def aaigrid_1():
 # Verify some auxiliary data.
 
 
-def aaigrid_2():
+def test_aaigrid_2():
 
     ds = gdal.Open('data/pixel_per_line.asc')
 
@@ -82,7 +82,7 @@ def aaigrid_2():
 ###############################################################################
 # Test reading a file where decimal separator is comma (#3668)
 
-def aaigrid_comma():
+def test_aaigrid_comma():
 
     ds = gdal.Open('data/pixel_per_line_comma.asc')
 
@@ -112,7 +112,7 @@ def aaigrid_comma():
 # Create simple copy and check.
 
 
-def aaigrid_3():
+def test_aaigrid_3():
 
     tst = gdaltest.GDALTest('AAIGRID', 'byte.tif', 1, 4672)
 
@@ -124,7 +124,7 @@ def aaigrid_3():
 # Read subwindow.  Tests the tail recursion problem.
 
 
-def aaigrid_4():
+def test_aaigrid_4():
 
     tst = gdaltest.GDALTest('aaigrid', 'pixel_per_line.asc', 1, 187,
                             5, 5, 5, 5)
@@ -134,7 +134,7 @@ def aaigrid_4():
 # Perform simple read test on mixed-case .PRJ filename
 
 
-def aaigrid_5():
+def test_aaigrid_5():
 
     # Mixed-case files pair used in the test:
     # - case_sensitive.ASC
@@ -170,7 +170,7 @@ def aaigrid_5():
 # Verify data type determination from type of nodata
 
 
-def aaigrid_6():
+def test_aaigrid_6():
 
     ds = gdal.Open('data/nodata_float.asc')
 
@@ -189,7 +189,7 @@ def aaigrid_6():
 # Verify data type determination from type of nodata
 
 
-def aaigrid_6bis():
+def test_aaigrid_6bis():
 
     ds = gdal.Open('data/nodata_int.asc')
 
@@ -208,7 +208,7 @@ def aaigrid_6bis():
 # Verify writing files with non-square pixels.
 
 
-def aaigrid_7():
+def test_aaigrid_7():
 
     tst = gdaltest.GDALTest('AAIGRID', 'nonsquare.vrt', 1, 12481)
 
@@ -218,7 +218,7 @@ def aaigrid_7():
 ###############################################################################
 # Test creating an in memory copy.
 
-def aaigrid_8():
+def test_aaigrid_8():
 
     tst = gdaltest.GDALTest('AAIGRID', 'byte.tif', 1, 4672)
 
@@ -228,7 +228,7 @@ def aaigrid_8():
 ###############################################################################
 # Test DECIMAL_PRECISION creation option
 
-def aaigrid_9():
+def test_aaigrid_9():
 
     ds = gdal.Open('data/float32.bil')
     ds2 = gdal.GetDriverByName('AAIGRID').CreateCopy('tmp/aaigrid.tmp', ds, options=['DECIMAL_PRECISION=2'])
@@ -245,7 +245,7 @@ def aaigrid_9():
 # Test AAIGRID_DATATYPE configuration option and DATATYPE open options
 
 
-def aaigrid_10():
+def test_aaigrid_10():
 
     # By default detected as 32bit float
     ds = gdal.Open('data/float64.asc')
@@ -295,7 +295,7 @@ def aaigrid_10():
 # Test SIGNIFICANT_DIGITS creation option (same as DECIMAL_PRECISION test)
 
 
-def aaigrid_11():
+def test_aaigrid_11():
 
     ds = gdal.Open('data/float32.bil')
     ds2 = gdal.GetDriverByName('AAIGRID').CreateCopy('tmp/aaigrid.tmp', ds, options=['SIGNIFICANT_DIGITS=2'])
@@ -312,7 +312,7 @@ def aaigrid_11():
 # Test no data is written to correct precision with DECIMAL_PRECISION.
 
 
-def aaigrid_12():
+def test_aaigrid_12():
 
     ds = gdal.Open('data/nodata_float.asc')
     ds2 = gdal.GetDriverByName('AAIGRID').CreateCopy('tmp/aaigrid.tmp', ds,
@@ -341,7 +341,7 @@ def aaigrid_12():
 # Test no data is written to correct precision WITH SIGNIFICANT_DIGITS.
 
 
-def aaigrid_13():
+def test_aaigrid_13():
 
     ds = gdal.Open('data/nodata_float.asc')
     ds2 = gdal.GetDriverByName('AAIGRID').CreateCopy('tmp/aaigrid.tmp', ds,
@@ -370,7 +370,7 @@ def aaigrid_13():
 # Test fix for #6060
 
 
-def aaigrid_14():
+def test_aaigrid_14():
 
     ds = gdal.Open('data/byte.tif')
     mem_ds = gdal.GetDriverByName('MEM').Create('', 20, 20, 1, gdal.GDT_Float32)
@@ -395,7 +395,7 @@ def aaigrid_14():
 # Test Float64 detection when nodata = DBL_MIN
 
 
-def aaigrid_15():
+def test_aaigrid_15():
 
     gdal.FileFromMemBuffer('/vsimem/aaigrid_15.asc', """ncols        4
 nrows        1
@@ -420,23 +420,23 @@ def aaigrid_15():
 
 
 gdaltest_list = [
-    aaigrid_1,
-    aaigrid_2,
-    aaigrid_comma,
-    aaigrid_3,
-    aaigrid_4,
-    aaigrid_5,
-    aaigrid_6,
-    aaigrid_6bis,
-    aaigrid_7,
-    aaigrid_8,
-    aaigrid_9,
-    aaigrid_10,
-    aaigrid_11,
-    aaigrid_12,
-    aaigrid_13,
-    aaigrid_14,
-    aaigrid_15]
+    test_aaigrid_1,
+    test_aaigrid_2,
+    test_aaigrid_comma,
+    test_aaigrid_3,
+    test_aaigrid_4,
+    test_aaigrid_5,
+    test_aaigrid_6,
+    test_aaigrid_6bis,
+    test_aaigrid_7,
+    test_aaigrid_8,
+    test_aaigrid_9,
+    test_aaigrid_10,
+    test_aaigrid_11,
+    test_aaigrid_12,
+    test_aaigrid_13,
+    test_aaigrid_14,
+    test_aaigrid_15]
 
 if __name__ == '__main__':
 
diff --git a/autotest/gdrivers/ace2.py b/autotest/gdrivers/ace2.py
index 59689598d8c7..be61f932cae4 100755
--- a/autotest/gdrivers/ace2.py
+++ b/autotest/gdrivers/ace2.py
@@ -38,7 +38,7 @@
 # Test a fake ACE2 dataset
 
 
-def ace2_1():
+def test_ace2_1():
 
     f = gdal.VSIFOpenL('/vsimem/45N015E_5M.ACE2', 'wb')
     gdal.VSIFSeekL(f, 180 * 180 * 4 - 1, 0)
@@ -66,7 +66,7 @@ def ace2_1():
 
 
 gdaltest_list = [
-    ace2_1]
+    test_ace2_1]
 
 if __name__ == '__main__':
 
diff --git a/autotest/gdrivers/adrg.py b/autotest/gdrivers/adrg.py
index 56ee3499b10a..e61f8017f0ef 100755
--- a/autotest/gdrivers/adrg.py
+++ b/autotest/gdrivers/adrg.py
@@ -41,7 +41,7 @@
 # Read test of simple byte reference data.
 
 
-def adrg_read_gen():
+def test_adrg_read_gen():
 
     tst = gdaltest.GDALTest('ADRG', 'SMALL_ADRG/ABCDEF01.GEN', 1, 62833)
     return tst.testOpen()
@@ -50,7 +50,7 @@ def adrg_read_gen():
 # Read test of simple byte reference data by the TRANSH01.THF file .
 
 
-def adrg_read_transh():
+def test_adrg_read_transh():
 
     tst = gdaltest.GDALTest('ADRG', 'SMALL_ADRG/TRANSH01.THF', 1, 62833)
     return tst.testOpen()
@@ -59,7 +59,7 @@ def adrg_read_transh():
 # Read test of simple byte reference data by a subdataset file
 
 
-def adrg_read_subdataset_img():
+def test_adrg_read_subdataset_img():
 
     tst = gdaltest.GDALTest('ADRG', 'ADRG:data/SMALL_ADRG/ABCDEF01.GEN,data/SMALL_ADRG/ABCDEF01.IMG', 1, 62833, filename_absolute=1)
     return tst.testOpen()
@@ -68,7 +68,7 @@ def adrg_read_subdataset_img():
 # Test copying.
 
 
-def adrg_copy():
+def test_adrg_copy():
 
     drv = gdal.GetDriverByName('ADRG')
     srcds = gdal.Open('data/SMALL_ADRG/ABCDEF01.GEN')
@@ -91,7 +91,7 @@ def adrg_copy():
 # Test creating a fake 2 subdataset image and reading it.
 
 
-def adrg_2subdatasets():
+def test_adrg_2subdatasets():
 
     drv = gdal.GetDriverByName('ADRG')
     srcds = gdal.Open('data/SMALL_ADRG/ABCDEF01.GEN')
@@ -135,7 +135,7 @@ def adrg_2subdatasets():
 # Test creating an in memory copy.
 
 
-def adrg_copy_vsimem():
+def test_adrg_copy_vsimem():
 
     drv = gdal.GetDriverByName('ADRG')
     srcds = gdal.Open('data/SMALL_ADRG/ABCDEF01.GEN')
@@ -169,7 +169,7 @@ def adrg_copy_vsimem():
 # Test reading a fake North Polar dataset (#6560)
 
 
-def adrg_zna_9():
+def test_adrg_zna_9():
 
     ds = gdal.Open('data/SMALL_ADRG_ZNA9/ABCDEF01.GEN')
     expected_gt = (-307675.73602473765, 100.09145391818853, 0.0, -179477.5051066006, 0.0, -100.09145391818853)
@@ -190,7 +190,7 @@ def adrg_zna_9():
 # Test reading a fake South Polar dataset (#6560)
 
 
-def adrg_zna_18():
+def test_adrg_zna_18():
 
     ds = gdal.Open('data/SMALL_ADRG_ZNA18/ABCDEF01.GEN')
     expected_gt = (-307675.73602473765, 100.09145391818853, 0.0, 179477.5051066006, 0.0, -100.09145391818853)
@@ -210,14 +210,14 @@ def adrg_zna_18():
 
 ###############################################################################
 gdaltest_list = [
-    adrg_read_gen,
-    adrg_read_transh,
-    adrg_read_subdataset_img,
-    adrg_copy,
-    adrg_2subdatasets,
-    adrg_copy_vsimem,
-    adrg_zna_9,
-    adrg_zna_18]
+    test_adrg_read_gen,
+    test_adrg_read_transh,
+    test_adrg_read_subdataset_img,
+    test_adrg_copy,
+    test_adrg_2subdatasets,
+    test_adrg_copy_vsimem,
+    test_adrg_zna_9,
+    test_adrg_zna_18]
 
 if __name__ == '__main__':
 
diff --git a/autotest/gdrivers/aigrid.py b/autotest/gdrivers/aigrid.py
index 4fa1f4cc0290..09ce6c564407 100755
--- a/autotest/gdrivers/aigrid.py
+++ b/autotest/gdrivers/aigrid.py
@@ -40,7 +40,7 @@
 # Read test of simple byte reference data.
 
 
-def aigrid_1():
+def test_aigrid_1():
 
     tst = gdaltest.GDALTest('AIG', 'abc3x1', 1, 3)
     return tst.testOpen()
@@ -49,7 +49,7 @@ def aigrid_1():
 # Verify some auxiliary data.
 
 
-def aigrid_2():
+def test_aigrid_2():
 
     ds = gdal.Open('data/abc3x1/prj.adf')
 
@@ -80,7 +80,7 @@ def aigrid_2():
 # Verify the colormap, and nodata setting for test file.
 
 
-def aigrid_3():
+def test_aigrid_3():
 
     ds = gdal.Open('data/abc3x1')
     cm = ds.GetRasterBand(1).GetRasterColorTable()
@@ -101,7 +101,7 @@ def aigrid_3():
 # Read test of simple byte reference data with data directory name in all uppercase
 
 
-def aigrid_4():
+def test_aigrid_4():
 
     tst = gdaltest.GDALTest('AIG', 'ABC3X1UC', 1, 3)
     return tst.testOpen()
@@ -110,7 +110,7 @@ def aigrid_4():
 # Verify the colormap, and nodata setting for test file with names of coverage directory and all files in it in all uppercase. Additionally also test for case where clr file resides in parent directory of coverage.
 
 
-def aigrid_5():
+def test_aigrid_5():
 
     ds = gdal.Open('data/ABC3X1UC')
     cm = ds.GetRasterBand(1).GetRasterColorTable()
@@ -132,7 +132,7 @@ def aigrid_5():
 # Verify dataset whose sta.adf is 24 bytes
 
 
-def aigrid_6():
+def test_aigrid_6():
 
     ds = gdal.Open('data/aigrid_sta_24bytes/teststa')
 
@@ -150,7 +150,7 @@ def aigrid_6():
 # Test on real dataset downloaded from http://download.osgeo.org/gdal/data/aig/nzdem
 
 
-def aigrid_online_1():
+def test_aigrid_online_1():
 
     list_files = ['info/arc.dir',
                   'info/arc0000.dat',
@@ -246,7 +246,7 @@ def aigrid_online_1():
 # Test on real dataset downloaded from http://download.osgeo.org/gdal/data/aig/nzdem
 
 
-def aigrid_online_2():
+def test_aigrid_online_2():
 
     if not gdaltest.download_file('http://download.osgeo.org/gdal/data/aig/ai_bug_6886.zip', 'ai_bug_6886.zip'):
         return 'skip'
@@ -270,14 +270,14 @@ def aigrid_online_2():
 
 
 gdaltest_list = [
-    aigrid_1,
-    aigrid_2,
-    aigrid_3,
-    aigrid_4,
-    aigrid_5,
-    aigrid_6,
-    aigrid_online_1,
-    aigrid_online_2]
+    test_aigrid_1,
+    test_aigrid_2,
+    test_aigrid_3,
+    test_aigrid_4,
+    test_aigrid_5,
+    test_aigrid_6,
+    test_aigrid_online_1,
+    test_aigrid_online_2]
 
 if __name__ == '__main__':
 
diff --git a/autotest/gdrivers/arg.py b/autotest/gdrivers/arg.py
index 1c48d3569b1c..60feb6b8dc86 100755
--- a/autotest/gdrivers/arg.py
+++ b/autotest/gdrivers/arg.py
@@ -56,7 +56,7 @@ def encode(fmt, nodata, values):
 #
 
 
-def arg_init():
+def test_arg_init():
     gdaltest.argDriver = gdal.GetDriverByName('ARG')
     if gdaltest.argDriver is None:
         return 'skip'
@@ -124,7 +124,7 @@ def arg_init():
     return 'success'
 
 
-def arg_unsupported():
+def test_arg_unsupported():
     if gdaltest.argDriver is None:
         return 'skip'
 
@@ -144,7 +144,7 @@ def arg_unsupported():
     return 'success'
 
 
-def arg_getrastercount():
+def test_arg_getrastercount():
     if gdaltest.argDriver is None:
         return 'skip'
 
@@ -161,7 +161,7 @@ def arg_getrastercount():
     return 'success'
 
 
-def arg_getgeotransform():
+def test_arg_getgeotransform():
     if gdaltest.argDriver is None:
         return 'skip'
 
@@ -185,7 +185,7 @@ def arg_getgeotransform():
     return 'success'
 
 
-def arg_blocksize():
+def test_arg_blocksize():
     if gdaltest.argDriver is None:
         return 'skip'
 
@@ -218,7 +218,7 @@ def arg_blocksize():
     return 'success'
 
 
-def arg_layername():
+def test_arg_layername():
     """
     The layer name of the ARG in the .json file need not be the name of
     the .arg file. The original driver enforced this constraint, but that
@@ -261,7 +261,7 @@ def arg_layername():
     return 'success'
 
 
-def arg_nodata():
+def test_arg_nodata():
     """
     Check that the NoData value for int8 images is 128, as per the
     ARG spec. See ticket #4610
@@ -277,7 +277,7 @@ def arg_nodata():
     return 'success'
 
 
-def arg_byteorder():
+def test_arg_byteorder():
     """
     Check that a roundtrip from ARG -> GTiff -> ARG has the same
     binary values. See ticket #4779
@@ -331,7 +331,7 @@ def arg_byteorder():
     return 'success'
 
 
-def arg_destroy():
+def test_arg_destroy():
     if gdaltest.argDriver is None:
         return 'skip'
 
@@ -344,15 +344,15 @@ def arg_destroy():
 
 
 gdaltest_list = [
-    arg_init,
-    arg_unsupported,
-    arg_getrastercount,
-    arg_getgeotransform,
-    arg_blocksize,
-    arg_layername,
-    arg_nodata,
-    arg_byteorder,
-    arg_destroy]
+    test_arg_init,
+    test_arg_unsupported,
+    test_arg_getrastercount,
+    test_arg_getgeotransform,
+    test_arg_blocksize,
+    test_arg_layername,
+    test_arg_nodata,
+    test_arg_byteorder,
+    test_arg_destroy]
 
 if __name__ == '__main__':
 
diff --git a/autotest/gdrivers/bag.py b/autotest/gdrivers/bag.py
index 583f5b38bab6..982455194738 100755
--- a/autotest/gdrivers/bag.py
+++ b/autotest/gdrivers/bag.py
@@ -123,7 +123,7 @@ def test_bag_2():
 # Test a southern hemisphere falseNorthing sample file.
 
 
-def bag_3():
+def test_bag_3():
 
     if gdaltest.bag_drv is None:
         return 'skip'
@@ -159,7 +159,7 @@ def bag_3():
 #
 
 
-def bag_vr_normal():
+def test_bag_vr_normal():
 
     if gdaltest.bag_drv is None:
         return 'skip'
@@ -231,7 +231,7 @@ def bag_vr_normal():
 #
 
 
-def bag_vr_list_supergrids():
+def test_bag_vr_list_supergrids():
 
     if gdaltest.bag_drv is None:
         return 'skip'
@@ -330,7 +330,7 @@ def bag_vr_list_supergrids():
 #
 
 
-def bag_vr_open_supergrids():
+def test_bag_vr_open_supergrids():
 
     if gdaltest.bag_drv is None:
         return 'skip'
@@ -413,7 +413,7 @@ def bag_vr_open_supergrids():
 #
 
 
-def bag_vr_resampled():
+def test_bag_vr_resampled():
 
     if gdaltest.bag_drv is None:
         return 'skip'
@@ -746,7 +746,7 @@ def bag_vr_resampled():
 #
 
 
-def bag_vr_resampled_mask():
+def test_bag_vr_resampled_mask():
 
     if gdaltest.bag_drv is None:
         return 'skip'
@@ -778,7 +778,7 @@ def bag_vr_resampled_mask():
 #
 
 
-def bag_vr_resampled_interpolated():
+def test_bag_vr_resampled_interpolated():
 
     if gdaltest.bag_drv is None:
         return 'skip'
@@ -817,7 +817,7 @@ def bag_vr_resampled_interpolated():
 #
 
 
-def bag_write_single_band():
+def test_bag_write_single_band():
 
     if gdaltest.bag_drv is None:
         return 'skip'
@@ -831,7 +831,7 @@ def bag_write_single_band():
 #
 
 
-def bag_write_two_bands():
+def test_bag_write_two_bands():
 
     if gdaltest.bag_drv is None:
         return 'skip'
@@ -865,7 +865,7 @@ def bag_write_two_bands():
 #
 
 
-def bag_write_south_up():
+def test_bag_write_south_up():
 
     if gdaltest.bag_drv is None:
         return 'skip'
@@ -899,16 +899,16 @@ def bag_write_south_up():
 
 
 gdaltest_list = [test_bag_2,
-                 bag_3,
-                 bag_vr_normal,
-                 bag_vr_list_supergrids,
-                 bag_vr_open_supergrids,
-                 bag_vr_resampled,
-                 bag_vr_resampled_mask,
-                 bag_vr_resampled_interpolated,
-                 bag_write_single_band,
-                 bag_write_two_bands,
-                 bag_write_south_up,
+                 test_bag_3,
+                 test_bag_vr_normal,
+                 test_bag_vr_list_supergrids,
+                 test_bag_vr_open_supergrids,
+                 test_bag_vr_resampled,
+                 test_bag_vr_resampled_mask,
+                 test_bag_vr_resampled_interpolated,
+                 test_bag_write_single_band,
+                 test_bag_write_two_bands,
+                 test_bag_write_south_up,
                  ]
 
 if __name__ == '__main__':
diff --git a/autotest/gdrivers/blx.py b/autotest/gdrivers/blx.py
index 6a15d171ce64..23d6a163d6c6 100755
--- a/autotest/gdrivers/blx.py
+++ b/autotest/gdrivers/blx.py
@@ -38,7 +38,7 @@
 ###############################################################################
 # Test reading a little-endian BLX
 
-def blx_1():
+def test_blx_1():
 
     prj = 'WGS84'
     gt = [20.0004166, 0.0008333, 0.0, 50.0004166, 0.0, -0.0008333]
@@ -49,7 +49,7 @@ def blx_1():
 ###############################################################################
 # Test reading a big-endian BLX
 
-def blx_2():
+def test_blx_2():
 
     prj = 'WGS84'
     gt = [20.0004166, 0.0008333, 0.0, 50.0004166, 0.0, -0.0008333]
@@ -60,7 +60,7 @@ def blx_2():
 ###############################################################################
 # Test writing a little-endian BLX
 
-def blx_3():
+def test_blx_3():
 
     tst = gdaltest.GDALTest('BLX', 's4103.xlb', 1, 47024)
     return tst.testCreateCopy(check_gt=1, check_srs=1)
@@ -69,7 +69,7 @@ def blx_3():
 ###############################################################################
 # Test writing a big-endian BLX
 
-def blx_4():
+def test_blx_4():
 
     tst = gdaltest.GDALTest('BLX', 's4103.blx', 1, 47024, options=['BIGENDIAN=YES'])
     return tst.testCreateCopy(check_gt=1, check_srs=1)
@@ -78,7 +78,7 @@ def blx_4():
 ###############################################################################
 # Test overviews
 
-def blx_5():
+def test_blx_5():
 
     ds = gdal.Open('data/s4103.blx')
 
@@ -111,11 +111,11 @@ def blx_5():
 
 
 gdaltest_list = [
-    blx_1,
-    blx_2,
-    blx_3,
-    blx_4,
-    blx_5
+    test_blx_1,
+    test_blx_2,
+    test_blx_3,
+    test_blx_4,
+    test_blx_5
 ]
 
 
diff --git a/autotest/gdrivers/bsb.py b/autotest/gdrivers/bsb.py
index 793fc2e3162a..f081e747cfe7 100755
--- a/autotest/gdrivers/bsb.py
+++ b/autotest/gdrivers/bsb.py
@@ -38,7 +38,7 @@
 # Test driver availability
 
 
-def bsb_0():
+def test_bsb_0():
     gdaltest.bsb_dr = gdal.GetDriverByName('BSB')
     if gdaltest.bsb_dr is None:
         return 'skip'
@@ -49,7 +49,7 @@ def bsb_0():
 # Test Read
 
 
-def bsb_1():
+def test_bsb_1():
     if gdaltest.bsb_dr is None:
         return 'skip'
 
@@ -61,7 +61,7 @@ def bsb_1():
 # Test CreateCopy
 
 
-def bsb_2():
+def test_bsb_2():
     if gdaltest.bsb_dr is None:
         return 'skip'
 
@@ -80,7 +80,7 @@ def bsb_2():
 # --> This is probably not a valid BSB file, but it proves that we can read the index table
 
 
-def bsb_3():
+def test_bsb_3():
     if gdaltest.bsb_dr is None:
         return 'skip'
 
@@ -94,7 +94,7 @@ def bsb_3():
 # adding a 0 character in the middle of line data
 
 
-def bsb_4():
+def test_bsb_4():
     if gdaltest.bsb_dr is None:
         return 'skip'
 
@@ -106,7 +106,7 @@ def bsb_4():
 # Read a truncated BSB (at the level of the written scanline number starting a new row)
 
 
-def bsb_5():
+def test_bsb_5():
     if gdaltest.bsb_dr is None:
         return 'skip'
 
@@ -122,7 +122,7 @@ def bsb_5():
 # Read another truncated BSB (in the middle of row data)
 
 
-def bsb_6():
+def test_bsb_6():
     if gdaltest.bsb_dr is None:
         return 'skip'
 
@@ -136,13 +136,13 @@ def bsb_6():
 
 
 gdaltest_list = [
-    bsb_0,
-    bsb_1,
-    bsb_2,
-    bsb_3,
-    bsb_4,
-    bsb_5,
-    bsb_6
+    test_bsb_0,
+    test_bsb_1,
+    test_bsb_2,
+    test_bsb_3,
+    test_bsb_4,
+    test_bsb_5,
+    test_bsb_6
 ]
 
 
diff --git a/autotest/gdrivers/bt.py b/autotest/gdrivers/bt.py
index 3c9afe74beae..4a84a5bbaa04 100755
--- a/autotest/gdrivers/bt.py
+++ b/autotest/gdrivers/bt.py
@@ -39,7 +39,7 @@
 # Test CreateCopy() of int16.tif
 
 
-def bt_1():
+def test_bt_1():
 
     tst = gdaltest.GDALTest('BT', 'int16.tif', 1, 4672)
     srs = osr.SpatialReference()
@@ -51,7 +51,7 @@ def bt_1():
 # Test CreateCopy() of int32.tif
 
 
-def bt_2():
+def test_bt_2():
 
     tst = gdaltest.GDALTest('BT', 'int32.tif', 1, 4672)
     srs = osr.SpatialReference()
@@ -63,7 +63,7 @@ def bt_2():
 # Test CreateCopy() of float32.tif
 
 
-def bt_3():
+def test_bt_3():
 
     tst = gdaltest.GDALTest('BT', 'float32.tif', 1, 4672)
     srs = osr.SpatialReference()
@@ -75,7 +75,7 @@ def bt_3():
 # Test Create() of float32.tif
 
 
-def bt_4():
+def test_bt_4():
 
     tst = gdaltest.GDALTest('BT', 'float32.tif', 1, 4672)
     return tst.testCreate(out_bands=1)
@@ -84,7 +84,7 @@ def bt_4():
 # Test testSetProjection() of float32.tif
 
 
-def bt_5():
+def test_bt_5():
 
     tst = gdaltest.GDALTest('BT', 'float32.tif', 1, 4672)
     return tst.testSetProjection()
@@ -93,7 +93,7 @@ def bt_5():
 # Test testSetGeoTransform() of float32.tif
 
 
-def bt_6():
+def test_bt_6():
 
     tst = gdaltest.GDALTest('BT', 'float32.tif', 1, 4672)
     return tst.testSetGeoTransform()
@@ -102,7 +102,7 @@ def bt_6():
 # Cleanup
 
 
-def bt_cleanup():
+def test_bt_cleanup():
 
     gdal.Unlink('/vsimem/int16.tif.prj')
     gdal.Unlink('tmp/int32.tif.prj')
@@ -112,13 +112,13 @@ def bt_cleanup():
 
 
 gdaltest_list = [
-    bt_1,
-    bt_2,
-    bt_3,
-    bt_4,
-    bt_5,
-    bt_6,
-    bt_cleanup]
+    test_bt_1,
+    test_bt_2,
+    test_bt_3,
+    test_bt_4,
+    test_bt_5,
+    test_bt_6,
+    test_bt_cleanup]
 
 if __name__ == '__main__':
 
diff --git a/autotest/gdrivers/byn.py b/autotest/gdrivers/byn.py
index af67c11cf1b5..c583427d8fa9 100755
--- a/autotest/gdrivers/byn.py
+++ b/autotest/gdrivers/byn.py
@@ -39,7 +39,7 @@
 # Read test of byte file.
 
 
-def byn_1():
+def test_byn_1():
 
     tst = gdaltest.GDALTest('BYN', 'cgg2013ai08_reduced.byn', 1, 64764)
     return tst.testOpen()
@@ -47,7 +47,7 @@ def byn_1():
 ###############################################################################
 #
 
-def byn_2():
+def test_byn_2():
 
     tst = gdaltest.GDALTest('BYN', 'cgg2013ai08_reduced.byn', 1, 64764)
     return tst.testCreateCopy(new_filename='tmp/byn_test_2.byn')
@@ -56,8 +56,8 @@ def byn_2():
 #
 
 gdaltest_list = [
-    byn_1,
-    byn_2]
+    test_byn_1,
+    test_byn_2]
 
 if __name__ == '__main__':
 
diff --git a/autotest/gdrivers/cals.py b/autotest/gdrivers/cals.py
index 3c9999ab072e..2c1790f30dbd 100755
--- a/autotest/gdrivers/cals.py
+++ b/autotest/gdrivers/cals.py
@@ -38,7 +38,7 @@
 # Source has no color table
 
 
-def cals_1():
+def test_cals_1():
 
     tst = gdaltest.GDALTest('CALS', 'small1bit.img', 1, 9907)
 
@@ -48,7 +48,7 @@ def cals_1():
 # Source has a color table (0,0,0),(255,255,255)
 
 
-def cals_2():
+def test_cals_2():
 
     # Has no color table
     tst = gdaltest.GDALTest('CALS', '../../gcore/data/oddsize1bit.tif', 1, 3883)
@@ -59,7 +59,7 @@ def cals_2():
 # Source has a color table (255,255,255),(0,0,0)
 
 
-def cals_3():
+def test_cals_3():
 
     src_ds = gdal.Open('../gcore/data/oddsize1bit.tif')
     tmp_ds = gdal.GetDriverByName('CALS').CreateCopy('/vsimem/cals_2_tmp.cal', src_ds)
@@ -93,7 +93,7 @@ def cals_3():
 # Test CreateCopy() error conditions
 
 
-def cals_4():
+def test_cals_4():
 
     # 0 band
     src_ds = gdal.GetDriverByName('MEM').Create('', 1, 1, 0)
@@ -148,7 +148,7 @@ def cals_4():
 # Test PIXEL_PATH & LINE_PROGRESSION metadata item
 
 
-def cals_5():
+def test_cals_5():
 
     src_ds = gdal.GetDriverByName('MEM').Create('', 1, 1, 1)
     src_ds.GetRasterBand(1).SetMetadataItem('NBITS', '1', 'IMAGE_STRUCTURE')
@@ -173,11 +173,11 @@ def cals_5():
 
 
 gdaltest_list = [
-    cals_1,
-    cals_2,
-    cals_3,
-    cals_4,
-    cals_5,
+    test_cals_1,
+    test_cals_2,
+    test_cals_3,
+    test_cals_4,
+    test_cals_5,
 ]
 
 
diff --git a/autotest/gdrivers/ceos.py b/autotest/gdrivers/ceos.py
index d7bf9afcbc4a..ae124654e242 100755
--- a/autotest/gdrivers/ceos.py
+++ b/autotest/gdrivers/ceos.py
@@ -38,7 +38,7 @@
 # contains 3 complete scanlines.  Bizarre little endian CEOS variant. (#1862)
 
 
-def ceos_1():
+def test_ceos_1():
 
     tst = gdaltest.GDALTest('CEOS', 'IMAGERY-75K.L-3', 4, 9956,
                             xoff=0, yoff=0, xsize=5932, ysize=3)
@@ -46,7 +46,7 @@ def ceos_1():
 
 
 gdaltest_list = [
-    ceos_1]
+    test_ceos_1]
 
 if __name__ == '__main__':
 
diff --git a/autotest/gdrivers/cpg.py b/autotest/gdrivers/cpg.py
index cf6ab753275b..34215b1d8e3e 100755
--- a/autotest/gdrivers/cpg.py
+++ b/autotest/gdrivers/cpg.py
@@ -37,14 +37,14 @@
 # Test a fake CPG dataset
 
 
-def cpg_1():
+def test_cpg_1():
 
     tst = gdaltest.GDALTest('CPG', 'fakecpgSIRC.hdr', 1, 0)
     return tst.testOpen()
 
 
 gdaltest_list = [
-    cpg_1]
+    test_cpg_1]
 
 if __name__ == '__main__':
 
diff --git a/autotest/gdrivers/ctg.py b/autotest/gdrivers/ctg.py
index dddff6accde4..4fad78d50419 100755
--- a/autotest/gdrivers/ctg.py
+++ b/autotest/gdrivers/ctg.py
@@ -38,7 +38,7 @@
 # Test a fake CTG dataset
 
 
-def ctg_1():
+def test_ctg_1():
 
     tst = gdaltest.GDALTest('CTG', 'fake_grid_cell', 1, 21)
     expected_gt = [421000.0, 200.0, 0.0, 5094400.0, 0.0, -200.0]
@@ -84,7 +84,7 @@ def ctg_1():
 
 
 gdaltest_list = [
-    ctg_1]
+    test_ctg_1]
 
 if __name__ == '__main__':
 
diff --git a/autotest/gdrivers/db2.py b/autotest/gdrivers/db2.py
index 34999b5e16c8..7648a34d109a 100755
--- a/autotest/gdrivers/db2.py
+++ b/autotest/gdrivers/db2.py
@@ -45,7 +45,7 @@
 # Test if DB2 and tile drivers are available
 
 
-def gpkg_init():
+def test_gpkg_init():
 
     gdaltest.db2_drv = None
 
@@ -169,7 +169,7 @@ def check_tile_format(out_ds, expected_format, expected_band_count, expected_ct,
 # Single band, PNG
 
 
-def gpkg_1():
+def test_gpkg_1():
 
     if gdaltest.db2_drv is None:
         return 'skip'
@@ -224,8 +224,8 @@ def gpkg_1():
 
 
 gdaltest_list = [
-    gpkg_init,
-    gpkg_1
+    test_gpkg_init,
+    test_gpkg_1
 ]
 # gdaltest_list = [ gpkg_init, gpkg_26, gpkg_cleanup ]
 if __name__ == '__main__':
diff --git a/autotest/gdrivers/derived.py b/autotest/gdrivers/derived.py
index 410d0f95cdc0..a98946daf964 100755
--- a/autotest/gdrivers/derived.py
+++ b/autotest/gdrivers/derived.py
@@ -35,7 +35,7 @@
 import gdaltest
 
 
-def derived_test1():
+def test_derived_test1():
     filename = "../gcore/data/cfloat64.tif"
     gdal.ErrorReset()
     ds = gdal.Open(filename)
@@ -88,7 +88,7 @@ def derived_test1():
     return 'success'
 
 
-def derived_test2():
+def test_derived_test2():
     filename = "../gcore/data/cint_sar.tif"
     gdal.ErrorReset()
     ds = gdal.Open(filename)
@@ -144,7 +144,7 @@ def derived_test2():
 # Error cases
 
 
-def derived_test3():
+def test_derived_test3():
 
     with gdaltest.error_handler():
         # Missing filename
@@ -183,9 +183,9 @@ def derived_test3():
 
 
 gdaltest_list = [
-    derived_test1,
-    derived_test2,
-    derived_test3
+    test_derived_test1,
+    test_derived_test2,
+    test_derived_test3
 ]
 
 if __name__ == '__main__':
diff --git a/autotest/gdrivers/dimap.py b/autotest/gdrivers/dimap.py
index a0724364cab0..60250ee54b60 100755
--- a/autotest/gdrivers/dimap.py
+++ b/autotest/gdrivers/dimap.py
@@ -40,7 +40,7 @@
 # Open and verify a the GCPs and metadata.
 
 
-def dimap_1():
+def test_dimap_1():
 
     shutil.copy('data/dimap/METADATA.DIM', 'tmp')
     shutil.copy('data/dimap/IMAGERY.TIF', 'tmp')
@@ -99,7 +99,7 @@ def dimap_1():
 # Open DIMAP 2
 
 
-def dimap_2():
+def test_dimap_2():
 
     for name in ['data/dimap2', 'data/dimap2/VOL_PHR.XML', 'data/dimap2/DIM_foo.XML']:
         ds = gdal.Open(name)
@@ -135,8 +135,8 @@ def dimap_2():
 
 
 gdaltest_list = [
-    dimap_1,
-    dimap_2]
+    test_dimap_1,
+    test_dimap_2]
 
 if __name__ == '__main__':
 
diff --git a/autotest/gdrivers/dipex.py b/autotest/gdrivers/dipex.py
index cec4ad8283cf..454b921faf66 100755
--- a/autotest/gdrivers/dipex.py
+++ b/autotest/gdrivers/dipex.py
@@ -37,14 +37,14 @@
 # Test a fake DIPex dataset
 
 
-def dipex_1():
+def test_dipex_1():
 
     tst = gdaltest.GDALTest('DIPEx', 'fakedipex.dat', 1, 1)
     return tst.testOpen()
 
 
 gdaltest_list = [
-    dipex_1]
+    test_dipex_1]
 
 if __name__ == '__main__':
 
diff --git a/autotest/gdrivers/doq1.py b/autotest/gdrivers/doq1.py
index 4e1c3bd297da..3dbd3416ddd7 100755
--- a/autotest/gdrivers/doq1.py
+++ b/autotest/gdrivers/doq1.py
@@ -38,7 +38,7 @@
 # Test a fake DOQ1 dataset
 
 
-def doq1_1():
+def test_doq1_1():
 
     tst = gdaltest.GDALTest('DOQ1', 'fakedoq1.doq', 1, 1)
     gdal.PushErrorHandler('CPLQuietErrorHandler')
@@ -48,7 +48,7 @@ def doq1_1():
 
 
 gdaltest_list = [
-    doq1_1]
+    test_doq1_1]
 
 if __name__ == '__main__':
 
diff --git a/autotest/gdrivers/doq2.py b/autotest/gdrivers/doq2.py
index 23b540ec868c..0184f86202f6 100755
--- a/autotest/gdrivers/doq2.py
+++ b/autotest/gdrivers/doq2.py
@@ -39,7 +39,7 @@
 # downloaded from http://edcftp.cr.usgs.gov/pub/data/samples/doq-clr-native.tar.gz
 
 
-def doq2_1():
+def test_doq2_1():
 
     ds = gdal.Open('data/C3607614_truncated.NWS')
 
@@ -76,7 +76,7 @@ def doq2_1():
 
 
 gdaltest_list = [
-    doq2_1]
+    test_doq2_1]
 
 if __name__ == '__main__':
 
diff --git a/autotest/gdrivers/dted.py b/autotest/gdrivers/dted.py
index fd036bc00347..3a32107f6d9c 100755
--- a/autotest/gdrivers/dted.py
+++ b/autotest/gdrivers/dted.py
@@ -41,7 +41,7 @@
 # Perform simple read test.
 
 
-def dted_1():
+def test_dted_1():
 
     tst = gdaltest.GDALTest('dted', 'n43.dt0', 1, 49187)
     return tst.testOpen()
@@ -50,7 +50,7 @@ def dted_1():
 # Verify some auxiliary data.
 
 
-def dted_2():
+def test_dted_2():
 
     ds = gdal.Open('data/n43.dt0')
 
@@ -84,7 +84,7 @@ def dted_2():
 # Create simple copy and check.
 
 
-def dted_3():
+def test_dted_3():
 
     tst = gdaltest.GDALTest('DTED', 'n43.dt0', 1, 49187)
 
@@ -96,7 +96,7 @@ def dted_3():
 # Read subwindow.  Tests the tail recursion problem.
 
 
-def dted_4():
+def test_dted_4():
 
     tst = gdaltest.GDALTest('dted', 'n43.dt0', 1, 305,
                             5, 5, 5, 5)
@@ -106,7 +106,7 @@ def dted_4():
 # Test a DTED Level 1 (made from a DTED Level 0)
 
 
-def dted_5():
+def test_dted_5():
 
     driver = gdal.GetDriverByName("GTiff")
     ds = driver.Create('tmp/n43.dt1.tif', 1201, 1201, 1, gdal.GDT_Int16)
@@ -130,7 +130,7 @@ def dted_5():
 # Test a DTED Level 2 (made from a DTED Level 0)
 
 
-def dted_6():
+def test_dted_6():
 
     driver = gdal.GetDriverByName("GTiff")
     ds = driver.Create('tmp/n43.dt2.tif', 3601, 3601, 1, gdal.GDT_Int16)
@@ -154,7 +154,7 @@ def dted_6():
 # Test a WGS72 georeferenced DTED
 
 
-def dted_7():
+def test_dted_7():
     ds = gdal.Open('data/n43_wgs72.dt0')
 
     # a warning is issued
@@ -176,7 +176,7 @@ def dted_7():
 # Test a file whose checksum is corrupted
 
 
-def dted_8():
+def test_dted_8():
     # this will enable DTED_VERIFY_CHECKSUM
     gdal.SetConfigOption('DTED_VERIFY_CHECKSUM', 'YES')
 
@@ -206,7 +206,7 @@ def dted_8():
 # Test a DTED Level 1 above latitude 50 (made from a DTED Level 0)
 
 
-def dted_9():
+def test_dted_9():
 
     ds = gdal.Open('data/n43.dt0')
 
@@ -245,7 +245,7 @@ def dted_9():
 # Test creating an in memory copy.
 
 
-def dted_10():
+def test_dted_10():
 
     tst = gdaltest.GDALTest('dted', 'n43.dt0', 1, 49187)
     return tst.testCreateCopy(vsimem=1)
@@ -257,7 +257,7 @@ def dted_10():
 # inverted.  This was fixed in MIL-D-89020 Amendment 1, but some products may
 # be affected.
 
-def dted_11():
+def test_dted_11():
 
     ds = gdal.Open('data/n43_coord_inverted.dt0')
 
@@ -291,7 +291,7 @@ def dted_11():
 # Test a DTED file that begins with a HDR record, and not directly the UHL record (#2951)
 
 
-def dted_12():
+def test_dted_12():
 
     ds = gdal.Open('data/w118n033_trunc.dt1')
     if ds is None:
@@ -304,7 +304,7 @@ def dted_12():
 # a real-world DTED file
 
 
-def dted_13():
+def test_dted_13():
 
     tst = gdaltest.GDALTest('dted', 'n43_partial_cols.dt0', 1, 56006)
     return tst.testOpen()
@@ -314,7 +314,7 @@ def dted_13():
 # case for now.
 
 
-def dted_14():
+def test_dted_14():
 
     tst = gdaltest.GDALTest('dted', 'n43_sparse_cols.dt0', 1, 56369)
     return tst.testOpen()
@@ -323,7 +323,7 @@ def dted_14():
 # Perform simple read test with GDAL_DTED_SINGLE_BLOCK = YES
 
 
-def dted_15():
+def test_dted_15():
 
     gdal.SetConfigOption('GDAL_DTED_SINGLE_BLOCK', 'YES')
     tst = gdaltest.GDALTest('dted', 'n43.dt0', 1, 49187)
@@ -335,7 +335,7 @@ def dted_15():
 # Cleanup.
 
 
-def dted_cleanup():
+def test_dted_cleanup():
     try:
         os.remove('tmp/n43.dt1.tif')
         os.remove('tmp/n43.dt1.aux.xml')
@@ -352,22 +352,22 @@ def dted_cleanup():
 
 
 gdaltest_list = [
-    dted_1,
-    dted_2,
-    dted_3,
-    dted_4,
-    dted_5,
-    dted_6,
-    dted_7,
-    dted_8,
-    dted_9,
-    dted_10,
-    dted_11,
-    dted_12,
-    dted_13,
-    dted_14,
-    dted_15,
-    dted_cleanup
+    test_dted_1,
+    test_dted_2,
+    test_dted_3,
+    test_dted_4,
+    test_dted_5,
+    test_dted_6,
+    test_dted_7,
+    test_dted_8,
+    test_dted_9,
+    test_dted_10,
+    test_dted_11,
+    test_dted_12,
+    test_dted_13,
+    test_dted_14,
+    test_dted_15,
+    test_dted_cleanup
 ]
 
 
diff --git a/autotest/gdrivers/e00grid.py b/autotest/gdrivers/e00grid.py
index 2983daa516bc..800550e75708 100755
--- a/autotest/gdrivers/e00grid.py
+++ b/autotest/gdrivers/e00grid.py
@@ -38,7 +38,7 @@
 # Test a fake E00GRID dataset
 
 
-def e00grid_1():
+def test_e00grid_1():
 
     tst = gdaltest.GDALTest('E00GRID', 'fake_e00grid.e00', 1, 65359)
     expected_gt = [500000.0, 1000.0, 0.0, 4000000.0, 0.0, -1000.0]
@@ -78,7 +78,7 @@ def e00grid_1():
 # Test a fake E00GRID dataset, compressed and with statistics
 
 
-def e00grid_2():
+def test_e00grid_2():
 
     tst = gdaltest.GDALTest('E00GRID', 'fake_e00grid_compressed.e00', 1, 65347)
     expected_gt = [500000.0, 1000.0, 0.0, 4000000.0, 0.0, -1000.0]
@@ -135,8 +135,8 @@ def e00grid_2():
 
 
 gdaltest_list = [
-    e00grid_1,
-    e00grid_2]
+    test_e00grid_1,
+    test_e00grid_2]
 
 if __name__ == '__main__':
 
diff --git a/autotest/gdrivers/ecrgtoc.py b/autotest/gdrivers/ecrgtoc.py
index 8e5cde8aff4e..ebd2e3929484 100755
--- a/autotest/gdrivers/ecrgtoc.py
+++ b/autotest/gdrivers/ecrgtoc.py
@@ -39,7 +39,7 @@
 ###############################################################################
 # Basic test
 
-def ecrgtoc_1():
+def test_ecrgtoc_1():
 
     toc_xml = """<Table_of_Contents>
   <file_header file_status="new">
@@ -130,7 +130,7 @@ def ecrgtoc_1():
 # Test overviews
 
 
-def ecrgtoc_2():
+def test_ecrgtoc_2():
 
     ds = gdal.Open('/vsimem/TOC.xml')
     ds.BuildOverviews('NEAR', [2])
@@ -152,7 +152,7 @@ def ecrgtoc_2():
 # Test opening subdataset
 
 
-def ecrgtoc_3():
+def test_ecrgtoc_3():
 
     # Try different errors
     for name in ['ECRG_TOC_ENTRY:',
@@ -199,7 +199,7 @@ def ecrgtoc_3():
 # Test dataset with 3 subdatasets
 
 
-def ecrgtoc_4():
+def test_ecrgtoc_4():
 
     toc_xml = """<Table_of_Contents>
   <file_header file_status="new">
@@ -320,7 +320,7 @@ def ecrgtoc_4():
 ###############################################################################
 
 
-def ecrgtoc_online_1():
+def test_ecrgtoc_online_1():
 
     if not gdaltest.download_file('http://www.falconview.org/trac/FalconView/downloads/17', 'ECRG_Sample.zip'):
         return 'skip'
@@ -357,11 +357,11 @@ def ecrgtoc_online_1():
 
 
 gdaltest_list = [
-    ecrgtoc_1,
-    ecrgtoc_2,
-    ecrgtoc_3,
-    ecrgtoc_4,
-    ecrgtoc_online_1]
+    test_ecrgtoc_1,
+    test_ecrgtoc_2,
+    test_ecrgtoc_3,
+    test_ecrgtoc_4,
+    test_ecrgtoc_online_1]
 
 if __name__ == '__main__':
 
diff --git a/autotest/gdrivers/ecw.py b/autotest/gdrivers/ecw.py
index 45d58965d84d..8e7a8801456d 100755
--- a/autotest/gdrivers/ecw.py
+++ b/autotest/gdrivers/ecw.py
@@ -49,9 +49,9 @@ def has_write_support():
     if hasattr(gdaltest, 'b_ecw_has_write_support'):
         return gdaltest.b_ecw_has_write_support
     gdaltest.b_ecw_has_write_support = False
-    if ecw_1() != 'success':
+    if test_ecw_1() != 'success':
         return False
-    if ecw_3() == 'success':
+    if test_ecw_3() == 'success':
         gdaltest.b_ecw_has_write_support = True
     try:
         os.remove('tmp/jrc_out.ecw')
@@ -63,7 +63,7 @@ def has_write_support():
 #
 
 
-def ecw_init():
+def test_ecw_init():
 
     gdaltest.deregister_all_jpeg2000_drivers_but('JP2ECW')
     return 'success'
@@ -72,7 +72,7 @@ def ecw_init():
 # Verify we have the driver.
 
 
-def ecw_1():
+def test_ecw_1():
 
     gdaltest.ecw_drv = gdal.GetDriverByName('ECW')
     gdaltest.jp2ecw_drv = gdal.GetDriverByName('JP2ECW')
@@ -108,7 +108,7 @@ def ecw_1():
 # Verify various information about our test image.
 
 
-def ecw_2():
+def test_ecw_2():
 
     if gdaltest.ecw_drv is None:
         return 'skip'
@@ -146,7 +146,7 @@ def ecw_2():
 # Verify that an write the imagery out to a new file.
 
 
-def ecw_3():
+def test_ecw_3():
     if gdaltest.ecw_drv is None or gdaltest.ecw_write == 0:
         return 'skip'
 
@@ -173,7 +173,7 @@ def ecw_3():
 # Verify various information about our generated image.
 
 
-def ecw_4():
+def test_ecw_4():
 
     if gdaltest.ecw_drv is None or gdaltest.ecw_write == 0:
         return 'skip'
@@ -219,7 +219,7 @@ def ecw_4():
 # Now try writing a JPEG2000 compressed version of the same with the ECW driver
 
 
-def ecw_5():
+def test_ecw_5():
     if gdaltest.jp2ecw_drv is None or gdaltest.ecw_write == 0:
         return 'skip'
 
@@ -239,7 +239,7 @@ def ecw_5():
 # Verify various information about our generated image.
 
 
-def ecw_6():
+def test_ecw_6():
 
     if gdaltest.jp2ecw_drv is None or gdaltest.ecw_write == 0:
         return 'skip'
@@ -296,7 +296,7 @@ def ecw_6():
 # Write the same image to NITF.
 
 
-def ecw_7():
+def test_ecw_7():
     if gdaltest.jp2ecw_drv is None or gdaltest.ecw_write == 0:
         return 'skip'
 
@@ -311,7 +311,7 @@ def ecw_7():
 # Verify various information about our generated image.
 
 
-def ecw_8():
+def test_ecw_8():
 
     if gdaltest.jp2ecw_drv is None or gdaltest.ecw_write == 0:
         return 'skip'
@@ -350,7 +350,7 @@ def ecw_8():
 # Try writing 16bit JP2 file directly using Create().
 
 
-def ecw_9():
+def test_ecw_9():
     if gdaltest.jp2ecw_drv is None or gdaltest.ecw_write == 0:
         return 'skip'
 
@@ -377,7 +377,7 @@ def ecw_9():
 # Verify previous 16bit file.
 
 
-def ecw_10():
+def test_ecw_10():
     if gdaltest.jp2ecw_drv is None or gdaltest.ecw_write == 0:
         return 'skip'
 
@@ -413,7 +413,7 @@ def ecw_10():
 # Test direct creation of an NITF/JPEG2000 file.
 
 
-def ecw_11():
+def test_ecw_11():
     if gdaltest.jp2ecw_drv is None or gdaltest.ecw_write == 0:
         return 'skip'
 
@@ -442,7 +442,7 @@ def ecw_11():
 # Verify previous file
 
 
-def ecw_12():
+def test_ecw_12():
     if gdaltest.jp2ecw_drv is None or gdaltest.ecw_write == 0:
         return 'skip'
 
@@ -482,7 +482,7 @@ def ecw_12():
 # type and select an altered band list.
 
 
-def ecw_13():
+def test_ecw_13():
     if gdaltest.jp2ecw_drv is None:
         return 'skip'
 
@@ -513,7 +513,7 @@ def ecw_13():
 # Write out image with GCPs.
 
 
-def ecw_14():
+def test_ecw_14():
     if gdaltest.jp2ecw_drv is None or gdaltest.ecw_write == 0:
         return 'skip'
 
@@ -526,7 +526,7 @@ def ecw_14():
 # Verify various information about our generated image.
 
 
-def ecw_15():
+def test_ecw_15():
 
     if gdaltest.jp2ecw_drv is None or gdaltest.ecw_write == 0:
         return 'skip'
@@ -560,7 +560,7 @@ def ecw_15():
 # Open byte.jp2
 
 
-def ecw_16():
+def test_ecw_16():
 
     if gdaltest.jp2ecw_drv is None:
         return 'skip'
@@ -593,7 +593,7 @@ def ecw_16():
 # Open int16.jp2
 
 
-def ecw_17():
+def test_ecw_17():
 
     if gdaltest.jp2ecw_drv is None:
         return 'skip'
@@ -621,7 +621,7 @@ def ecw_17():
 # Open byte.jp2.gz (test use of the VSIL API)
 
 
-def ecw_18():
+def test_ecw_18():
 
     if gdaltest.jp2ecw_drv is None:
         return 'skip'
@@ -654,7 +654,7 @@ def ecw_18():
 # Test a JPEG2000 with the 3 bands having 13bit depth and the 4th one 1 bit
 
 
-def ecw_19():
+def test_ecw_19():
 
     if gdaltest.jp2ecw_drv is None:
         return 'skip'
@@ -679,7 +679,7 @@ def ecw_19():
 # are as expected.
 
 
-def ecw_20():
+def test_ecw_20():
 
     if gdaltest.ecw_drv is None:
         return 'skip'
@@ -722,7 +722,7 @@ def ecw_20():
 # line by line.
 
 
-def ecw_21():
+def test_ecw_21():
 
     if gdaltest.ecw_drv is None:
         return 'skip'
@@ -752,7 +752,7 @@ def ecw_21():
 # ECW file.
 
 
-def ecw_22():
+def test_ecw_22():
 
     if gdaltest.ecw_drv is None:
         return 'skip'
@@ -774,7 +774,7 @@ def ecw_22():
 # preserving the ecw derived georeferencing.
 
 
-def ecw_23():
+def test_ecw_23():
 
     if gdaltest.ecw_drv is None:
         return 'skip'
@@ -811,7 +811,7 @@ def ecw_23():
 # Test that we can alter geotransform on existing ECW
 
 
-def ecw_24():
+def test_ecw_24():
 
     if gdaltest.ecw_drv is None:
         return 'skip'
@@ -861,7 +861,7 @@ def ecw_24():
 # Test that we can alter projection info on existing ECW (through SetProjection())
 
 
-def ecw_25():
+def test_ecw_25():
 
     if gdaltest.ecw_drv is None:
         return 'skip'
@@ -932,7 +932,7 @@ def ecw_25():
 # Test that we can alter projection info on existing ECW (through SetMetadataItem())
 
 
-def ecw_26():
+def test_ecw_26():
 
     if gdaltest.ecw_drv is None:
         return 'skip'
@@ -1006,7 +1006,7 @@ def ecw_26():
 # Check that we can use .j2w world files (#4651)
 
 
-def ecw_27():
+def test_ecw_27():
 
     if gdaltest.jp2ecw_drv is None or gdaltest.ecw_write == 0:
         return 'skip'
@@ -1032,7 +1032,7 @@ def ecw_27():
 # Check picking use case
 
 
-def ecw_28():
+def test_ecw_28():
 
     if gdaltest.ecw_drv is None:
         return 'skip'
@@ -1062,7 +1062,7 @@ def ecw_28():
 # Test supersampling
 
 
-def ecw_29():
+def test_ecw_29():
 
     if gdaltest.ecw_drv is None:
         return 'skip'
@@ -1133,7 +1133,7 @@ def ecw_29():
 # Test IReadBlock()
 
 
-def ecw_30():
+def test_ecw_30():
 
     if gdaltest.ecw_drv is None:
         return 'skip'
@@ -1153,7 +1153,7 @@ def ecw_30():
 # Test async reader interface ( SDK >= 4.x )
 
 
-def ecw_31():
+def test_ecw_31():
 
     if gdaltest.ecw_drv is None:
         return 'skip'
@@ -1203,7 +1203,7 @@ def ecw_31():
 # It ignores the content of panBandMap. (#4234)
 
 
-def ecw_32():
+def test_ecw_32():
 
     if gdaltest.ecw_drv is None:
         return 'skip'
@@ -1247,7 +1247,7 @@ def ecw_32():
 # Test heuristics that detect successive band reading pattern
 
 
-def ecw_33():
+def test_ecw_33():
 
     if gdaltest.ecw_drv is None:
         return 'skip'
@@ -1305,7 +1305,7 @@ def ecw_33():
 # Check bugfix for #5262
 
 
-def ecw_33_bis():
+def test_ecw_33_bis():
 
     if gdaltest.ecw_drv is None:
         return 'skip'
@@ -1348,7 +1348,7 @@ def ecw_33_bis():
 # Verify that an write the imagery out to a new ecw file. Source file is 16 bit.
 
 
-def ecw_34():
+def test_ecw_34():
 
     if gdaltest.ecw_drv is None or gdaltest.ecw_write == 0:
         return 'skip'
@@ -1380,7 +1380,7 @@ def ecw_34():
 # Verify that an write the imagery out to a new JP2 file. Source file is 16 bit.
 
 
-def ecw_35():
+def test_ecw_35():
     if gdaltest.jp2ecw_drv is None or gdaltest.ecw_write == 0:
         return 'skip'
 
@@ -1403,7 +1403,7 @@ def ecw_35():
 # Make sure that band descriptions are preserved for version 3 ECW files.
 
 
-def ecw_36():
+def test_ecw_36():
 
     if gdaltest.ecw_drv is None or gdaltest.ecw_write == 0:
         return 'skip'
@@ -1468,7 +1468,7 @@ def ecw_36():
 # color space set implicitly to sRGB.
 
 
-def ecw_37():
+def test_ecw_37():
 
     if gdaltest.ecw_drv is None or gdaltest.ecw_write == 0:
         return 'skip'
@@ -1511,7 +1511,7 @@ def ecw_37():
 # Check opening unicode files.
 
 
-def ecw_38():
+def test_ecw_38():
 
     if gdaltest.ecw_drv is None:
         return 'skip'
@@ -1548,7 +1548,7 @@ def ecw_38():
 ###############################################################################
 # Check writing histograms.
 
-def ecw_39():
+def test_ecw_39():
 
     if gdaltest.ecw_drv is None or gdaltest.ecw_write == 0:
         return 'skip'
@@ -1579,7 +1579,7 @@ def ecw_39():
 # Check reading a ECW v3 file
 
 
-def ecw_40():
+def test_ecw_40():
 
     if gdaltest.ecw_drv is None:
         return 'skip'
@@ -1636,7 +1636,7 @@ def ecw_40():
 # Check generating statistics & histogram for a ECW v3 file
 
 
-def ecw_41():
+def test_ecw_41():
 
     if gdaltest.ecw_drv is None or gdaltest.ecw_drv.major_version < 5:
         return 'skip'
@@ -1750,7 +1750,7 @@ def ecw_41():
 # Test setting/unsetting file metadata of a ECW v3 file
 
 
-def ecw_42():
+def test_ecw_42():
 
     if gdaltest.ecw_drv is None or gdaltest.ecw_drv.major_version < 5:
         return 'skip'
@@ -1837,7 +1837,7 @@ def ecw_42():
 # Note: only works on reversible files like this one
 
 
-def ecw_43():
+def test_ecw_43():
 
     if gdaltest.jp2ecw_drv is None:
         return 'skip'
@@ -1888,7 +1888,7 @@ def ecw_43():
 # Test metadata retrieval from JP2 file
 
 
-def ecw_44():
+def test_ecw_44():
 
     if gdaltest.jp2ecw_drv is None:
         return 'skip'
@@ -1941,7 +1941,7 @@ def RemoveDriverMetadata(md):
     return md
 
 
-def ecw_45():
+def test_ecw_45():
     if gdaltest.jp2ecw_drv is None or gdaltest.ecw_write == 0:
         return 'skip'
 
@@ -2043,7 +2043,7 @@ def ecw_45():
 # Test non nearest upsampling
 
 
-def ecw_46():
+def test_ecw_46():
 
     if gdaltest.jp2ecw_drv is None or gdaltest.ecw_write == 0:
         return 'skip'
@@ -2077,7 +2077,7 @@ def ecw_46():
 # /vsi reading with ECW (#6482)
 
 
-def ecw_47():
+def test_ecw_47():
 
     if gdaltest.ecw_drv is None:
         return 'skip'
@@ -2114,7 +2114,7 @@ def ecw_47():
 # Test "Upward" orientation is forced by default
 
 
-def ecw_48():
+def test_ecw_48():
 
     if gdaltest.ecw_drv is None:
         return 'skip'
@@ -2140,7 +2140,7 @@ def ecw_48():
 # Test "Upward" orientation can be overridden with ECW_ALWAYS_UPWARD=FALSE
 
 
-def ecw_49():
+def test_ecw_49():
 
     if gdaltest.ecw_drv is None:
         return 'skip'
@@ -2163,7 +2163,7 @@ def ecw_49():
 ###############################################################################
 
 
-def ecw_online_1():
+def test_ecw_online_1():
     if gdaltest.jp2ecw_drv is None:
         return 'skip'
 
@@ -2185,7 +2185,7 @@ def ecw_online_1():
 ###############################################################################
 
 
-def ecw_online_2():
+def test_ecw_online_2():
     if gdaltest.jp2ecw_drv is None:
         return 'skip'
 
@@ -2253,7 +2253,7 @@ def ecw_online_3():
 ###############################################################################
 
 
-def ecw_online_4():
+def test_ecw_online_4():
 
     if gdaltest.jp2ecw_drv is None:
         return 'skip'
@@ -2292,7 +2292,7 @@ def ecw_online_4():
 ###############################################################################
 
 
-def ecw_online_5():
+def test_ecw_online_5():
 
     if gdaltest.ecw_drv is None:
         return 'skip'
@@ -2326,7 +2326,7 @@ def ecw_online_5():
 # and in particular the .ecw extension, to make the ECW driver happy
 
 
-def ecw_online_6():
+def test_ecw_online_6():
 
     if gdaltest.ecw_drv is None:
         return 'skip'
@@ -2366,7 +2366,7 @@ def ecw_online_6():
 # ECWv2 file with alpha channel (#6028)
 
 
-def ecw_online_7():
+def test_ecw_online_7():
 
     if gdaltest.ecw_drv is None:
         return 'skip'
@@ -2388,7 +2388,7 @@ def ecw_online_7():
 ###############################################################################
 
 
-def ecw_cleanup():
+def test_ecw_cleanup():
 
     # gdaltest.clean_tmp()
 
@@ -2475,65 +2475,65 @@ def ecw_cleanup():
 
 
 gdaltest_list = [
-    ecw_init,
-    ecw_1,
-    ecw_2,
-    ecw_3,
-    ecw_4,
-    ecw_5,
-    ecw_6,
-    ecw_7,
-    ecw_8,
-    ecw_9,
-    ecw_10,
-    ecw_11,
-    ecw_12,
-    ecw_13,
-    ecw_14,
-    ecw_15,
-    ecw_16,
-    ecw_17,
-    ecw_18,
-    ecw_19,
-    ecw_20,
-    ecw_21,
-    ecw_22,
-    ecw_23,
-    ecw_24,
-    ecw_25,
-    ecw_26,
-    ecw_27,
-    ecw_28,
-    ecw_29,
-    ecw_30,
-    ecw_31,
-    ecw_32,
-    ecw_33,
-    ecw_33_bis,
-    ecw_34,
-    ecw_35,
-    ecw_36,
-    ecw_37,
-    ecw_38,
-    ecw_39,
-    ecw_40,
-    ecw_41,
-    ecw_42,
-    ecw_43,
-    ecw_44,
-    ecw_45,
-    ecw_46,
-    ecw_47,
-    ecw_48,
-    ecw_49,
-    ecw_online_1,
-    ecw_online_2,
+    test_ecw_init,
+    test_ecw_1,
+    test_ecw_2,
+    test_ecw_3,
+    test_ecw_4,
+    test_ecw_5,
+    test_ecw_6,
+    test_ecw_7,
+    test_ecw_8,
+    test_ecw_9,
+    test_ecw_10,
+    test_ecw_11,
+    test_ecw_12,
+    test_ecw_13,
+    test_ecw_14,
+    test_ecw_15,
+    test_ecw_16,
+    test_ecw_17,
+    test_ecw_18,
+    test_ecw_19,
+    test_ecw_20,
+    test_ecw_21,
+    test_ecw_22,
+    test_ecw_23,
+    test_ecw_24,
+    test_ecw_25,
+    test_ecw_26,
+    test_ecw_27,
+    test_ecw_28,
+    test_ecw_29,
+    test_ecw_30,
+    test_ecw_31,
+    test_ecw_32,
+    test_ecw_33,
+    test_ecw_33_bis,
+    test_ecw_34,
+    test_ecw_35,
+    test_ecw_36,
+    test_ecw_37,
+    test_ecw_38,
+    test_ecw_39,
+    test_ecw_40,
+    test_ecw_41,
+    test_ecw_42,
+    test_ecw_43,
+    test_ecw_44,
+    test_ecw_45,
+    test_ecw_46,
+    test_ecw_47,
+    test_ecw_48,
+    test_ecw_49,
+    test_ecw_online_1,
+    test_ecw_online_2,
     # JTO this test does not make sense. It tests difference between two files pixel by pixel but compression is lossy# ecw_online_3,
-    ecw_online_4,
-    ecw_online_5,
-    ecw_online_6,
-    ecw_online_7,
-    ecw_cleanup]
+    test_ecw_online_4,
+    test_ecw_online_5,
+    test_ecw_online_6,
+    test_ecw_online_7,
+    test_ecw_cleanup]
 
 if __name__ == '__main__':
 
diff --git a/autotest/gdrivers/eedai.py b/autotest/gdrivers/eedai.py
index 6778ec4f5944..d6fcf036cc96 100644
--- a/autotest/gdrivers/eedai.py
+++ b/autotest/gdrivers/eedai.py
@@ -44,7 +44,7 @@
 # Find EEDAI driver
 
 
-def eedai_1():
+def test_eedai_1():
 
     gdaltest.eedai_drv = gdal.GetDriverByName('EEDAI')
 
@@ -66,7 +66,7 @@ def eedai_1():
 # Nominal case
 
 
-def eedai_2():
+def test_eedai_2():
 
     if gdaltest.eedai_drv is None:
         return 'skip'
@@ -366,7 +366,7 @@ def eedai_2():
 # Test OAuth2 with ServiceAccount
 
 
-def eedai_3():
+def test_eedai_3():
 
     if gdaltest.eedai_drv is None:
         return 'skip'
@@ -419,7 +419,7 @@ def eedai_3():
 # Test OAuth2 with GOOGLE_APPLICATION_CREDENTIALS
 
 
-def eedai_GOOGLE_APPLICATION_CREDENTIALS():
+def test_eedai_GOOGLE_APPLICATION_CREDENTIALS():
 
     if gdaltest.eedai_drv is None:
         return 'skip'
@@ -477,7 +477,7 @@ def eedai_GOOGLE_APPLICATION_CREDENTIALS():
 # Read credentials from simulated GCE instance
 
 
-def eedai_gce_credentials():
+def test_eedai_gce_credentials():
 
     if gdaltest.eedai_drv is None:
         return 'skip'
@@ -546,7 +546,7 @@ def method(request):
 # Request in PNG mode
 
 
-def eedai_4():
+def test_eedai_4():
 
     if gdaltest.eedai_drv is None:
         return 'skip'
@@ -695,7 +695,7 @@ def eedai_4():
 # Request in AUTO GTIFF mode
 
 
-def eedai_geotiff():
+def test_eedai_geotiff():
 
     if gdaltest.eedai_drv is None:
         return 'skip'
@@ -761,7 +761,7 @@ def eedai_geotiff():
 #
 
 
-def eedai_real_service():
+def test_eedai_real_service():
 
     if gdaltest.eedai_drv is None:
         return 'skip'
@@ -810,7 +810,7 @@ def eedai_real_service():
 #
 
 
-def eedai_cleanup():
+def test_eedai_cleanup():
 
     if gdaltest.eedai_drv is None:
         return 'skip'
@@ -831,15 +831,15 @@ def eedai_cleanup():
 
 
 gdaltest_list = [
-    eedai_1,
-    eedai_2,
-    eedai_3,
-    eedai_GOOGLE_APPLICATION_CREDENTIALS,
-    eedai_gce_credentials,
-    eedai_4,
-    eedai_geotiff,
-    eedai_cleanup,
-    eedai_real_service,
+    test_eedai_1,
+    test_eedai_2,
+    test_eedai_3,
+    test_eedai_GOOGLE_APPLICATION_CREDENTIALS,
+    test_eedai_gce_credentials,
+    test_eedai_4,
+    test_eedai_geotiff,
+    test_eedai_cleanup,
+    test_eedai_real_service,
 ]
 
 if __name__ == '__main__':
diff --git a/autotest/gdrivers/ehdr.py b/autotest/gdrivers/ehdr.py
index a49bb466449d..1b797eb3fc10 100755
--- a/autotest/gdrivers/ehdr.py
+++ b/autotest/gdrivers/ehdr.py
@@ -43,7 +43,7 @@
 # 16bit image.
 
 
-def ehdr_1():
+def test_ehdr_1():
 
     tst = gdaltest.GDALTest('EHDR', 'rgba16.png', 2, 2042)
 
@@ -53,7 +53,7 @@ def ehdr_1():
 # 8bit with geotransform and projection check.
 
 
-def ehdr_2():
+def test_ehdr_2():
 
     tst = gdaltest.GDALTest('EHDR', 'byte.tif', 1, 4672)
 
@@ -63,7 +63,7 @@ def ehdr_2():
 # 32bit floating point (read, and createcopy).
 
 
-def ehdr_3():
+def test_ehdr_3():
 
     tst = gdaltest.GDALTest('EHDR', 'float32.bil', 1, 27)
 
@@ -73,7 +73,7 @@ def ehdr_3():
 # create dataset with a nodata value and a color table.
 
 
-def ehdr_4():
+def test_ehdr_4():
 
     drv = gdal.GetDriverByName('EHdr')
     ds = drv.Create('tmp/test_4.bil', 200, 100, 1, gdal.GDT_Byte)
@@ -106,7 +106,7 @@ def ehdr_4():
 # verify last dataset's colortable and nodata value.
 
 
-def ehdr_5():
+def test_ehdr_5():
     ds = gdal.Open('tmp/test_4.bil')
     band = ds.GetRasterBand(1)
 
@@ -136,7 +136,7 @@ def ehdr_5():
 # Test creating an in memory copy.
 
 
-def ehdr_6():
+def test_ehdr_6():
 
     tst = gdaltest.GDALTest('EHDR', 'float32.bil', 1, 27)
 
@@ -146,7 +146,7 @@ def ehdr_6():
 # 32bit integer (read, and createcopy).
 
 
-def ehdr_7():
+def test_ehdr_7():
 
     tst = gdaltest.GDALTest('EHDR', 'int32.tif', 1, 4672)
 
@@ -156,7 +156,7 @@ def ehdr_7():
 # Test signed 8bit integer support. (#2717)
 
 
-def ehdr_8():
+def test_ehdr_8():
 
     drv = gdal.GetDriverByName('EHDR')
     src_ds = gdal.Open('data/8s.vrt')
@@ -188,7 +188,7 @@ def ehdr_8():
 # value.
 
 
-def ehdr_9():
+def test_ehdr_9():
 
     ds = gdal.Open('data/wc_10m_CCCMA_A2a_2020_tmin_9.bil')
 
@@ -216,7 +216,7 @@ def ehdr_9():
 # Test detecting floating point file based on image file size (#3933)
 
 
-def ehdr_10():
+def test_ehdr_10():
     tst = gdaltest.GDALTest('EHDR', 'ehdr10.bil', 1, 8202)
     return tst.testOpen()
 
@@ -224,7 +224,7 @@ def ehdr_10():
 # Test detecting floating point file based on .flt extension (#3933)
 
 
-def ehdr_11():
+def test_ehdr_11():
     tst = gdaltest.GDALTest('EHDR', 'ehdr11.flt', 1, 8202)
     return tst.testOpen()
 
@@ -232,7 +232,7 @@ def ehdr_11():
 # Test CreateCopy with 1bit data
 
 
-def ehdr_12():
+def test_ehdr_12():
 
     src_ds = gdal.Open('../gcore/data/1bit.bmp')
     ds = gdal.GetDriverByName('EHDR').CreateCopy('/vsimem/1bit.bil', src_ds,
@@ -254,7 +254,7 @@ def ehdr_12():
 # Test statistics
 
 
-def ehdr_13():
+def test_ehdr_13():
 
     gdal.Unlink('data/byte.tif.aux.xml')
 
@@ -307,7 +307,7 @@ def ehdr_13():
 # Test optimized RasterIO() (#5438)
 
 
-def ehdr_14():
+def test_ehdr_14():
 
     src_ds = gdal.Open('data/byte.tif')
     ds = gdal.GetDriverByName('EHDR').CreateCopy('/vsimem/byte.bil', src_ds)
@@ -366,7 +366,7 @@ def ehdr_14():
 # Test support for RAT (#3253)
 
 
-def ehdr_rat():
+def test_ehdr_rat():
 
     tmpfile = '/vsimem/rat.bil'
     gdal.Translate(tmpfile, 'data/int16_rat.bil', format='EHdr')
@@ -423,7 +423,7 @@ def ehdr_rat():
 # Test STATISTICS_APPROXIMATE
 
 
-def ehdr_approx_stats_flag():
+def test_ehdr_approx_stats_flag():
 
     src_ds = gdal.GetDriverByName('MEM').Create('', 2000, 2000)
     src_ds.GetRasterBand(1).WriteRaster(1000, 1000, 1, 1, struct.pack('B' * 1, 20))
@@ -481,22 +481,22 @@ def ehdr_approx_stats_flag():
 
 
 gdaltest_list = [
-    ehdr_1,
-    ehdr_2,
-    ehdr_3,
-    ehdr_4,
-    ehdr_5,
-    ehdr_6,
-    ehdr_7,
-    ehdr_8,
-    ehdr_9,
-    ehdr_10,
-    ehdr_11,
-    ehdr_12,
-    ehdr_13,
-    ehdr_14,
-    ehdr_rat,
-    ehdr_approx_stats_flag]
+    test_ehdr_1,
+    test_ehdr_2,
+    test_ehdr_3,
+    test_ehdr_4,
+    test_ehdr_5,
+    test_ehdr_6,
+    test_ehdr_7,
+    test_ehdr_8,
+    test_ehdr_9,
+    test_ehdr_10,
+    test_ehdr_11,
+    test_ehdr_12,
+    test_ehdr_13,
+    test_ehdr_14,
+    test_ehdr_rat,
+    test_ehdr_approx_stats_flag]
 
 if __name__ == '__main__':
 
diff --git a/autotest/gdrivers/eir.py b/autotest/gdrivers/eir.py
index 69a8fca98f27..93957037ac36 100755
--- a/autotest/gdrivers/eir.py
+++ b/autotest/gdrivers/eir.py
@@ -37,14 +37,14 @@
 # Test a fake EIR dataset
 
 
-def eir_1():
+def test_eir_1():
 
     tst = gdaltest.GDALTest('EIR', 'fakeeir.hdr', 1, 1)
     return tst.testOpen()
 
 
 gdaltest_list = [
-    eir_1]
+    test_eir_1]
 
 if __name__ == '__main__':
 
diff --git a/autotest/gdrivers/elas.py b/autotest/gdrivers/elas.py
index c6daf36ff873..7284b5a729b4 100755
--- a/autotest/gdrivers/elas.py
+++ b/autotest/gdrivers/elas.py
@@ -37,7 +37,7 @@
 # Test a dataset generated by Create()
 
 
-def elas_1():
+def test_elas_1():
 
     tst = gdaltest.GDALTest('ELAS', 'byte_elas.bin', 1, 4672)
     return tst.testOpen()
@@ -46,15 +46,15 @@ def elas_1():
 # Test Create()
 
 
-def elas_2():
+def test_elas_2():
 
     tst = gdaltest.GDALTest('ELAS', 'byte_elas.bin', 1, 4672)
     return tst.testCreate()
 
 
 gdaltest_list = [
-    elas_1,
-    elas_2]
+    test_elas_1,
+    test_elas_2]
 
 if __name__ == '__main__':
 
diff --git a/autotest/gdrivers/envi.py b/autotest/gdrivers/envi.py
index 91dc4ed218d4..a3c489ad2df3 100755
--- a/autotest/gdrivers/envi.py
+++ b/autotest/gdrivers/envi.py
@@ -42,7 +42,7 @@
 # Perform simple read test.
 
 
-def envi_1():
+def test_envi_1():
 
     tst = gdaltest.GDALTest('envi', 'aea.dat', 1, 14823)
 
@@ -69,7 +69,7 @@ def envi_1():
 # Verify this can be exported losslessly.
 
 
-def envi_2():
+def test_envi_2():
 
     tst = gdaltest.GDALTest('envi', 'aea.dat', 1, 14823)
     return tst.testCreateCopy(check_gt=1)
@@ -78,7 +78,7 @@ def envi_2():
 # Try the Create interface with an RGB image.
 
 
-def envi_3():
+def test_envi_3():
 
     tst = gdaltest.GDALTest('envi', 'rgbsmall.tif', 2, 21053)
     return tst.testCreate()
@@ -87,7 +87,7 @@ def envi_3():
 # Test LCC Projection.
 
 
-def envi_4():
+def test_envi_4():
 
     tst = gdaltest.GDALTest('envi', 'aea.dat', 1, 24)
 
@@ -112,7 +112,7 @@ def envi_4():
 # Test TM Projection.
 
 
-def envi_5():
+def test_envi_5():
 
     tst = gdaltest.GDALTest('envi', 'aea.dat', 1, 24)
     prj = """PROJCS["OSGB 1936 / British National Grid",
@@ -158,7 +158,7 @@ def envi_5():
 # Test LAEA Projection.
 
 
-def envi_6():
+def test_envi_6():
 
     gdaltest.envi_tst = gdaltest.GDALTest('envi', 'aea.dat', 1, 24)
 
@@ -180,7 +180,7 @@ def envi_6():
 # Verify VSIF*L capacity
 
 
-def envi_7():
+def test_envi_7():
 
     tst = gdaltest.GDALTest('envi', 'aea.dat', 1, 14823)
     return tst.testCreateCopy(check_gt=1, vsimem=1)
@@ -189,7 +189,7 @@ def envi_7():
 # Test fix for #3751
 
 
-def envi_8():
+def test_envi_8():
 
     ds = gdal.GetDriverByName('ENVI').Create('/vsimem/foo.bsq', 10, 10, 1)
     set_gt = (50000, 1, 0, 4500000, 0, -1)
@@ -209,7 +209,7 @@ def envi_8():
 # Verify reading a compressed file
 
 
-def envi_9():
+def test_envi_9():
 
     tst = gdaltest.GDALTest('envi', 'aea_compressed.dat', 1, 14823)
     return tst.testCreateCopy(check_gt=1)
@@ -218,7 +218,7 @@ def envi_9():
 # Test RPC reading and writing
 
 
-def envi_10():
+def test_envi_10():
 
     src_ds = gdal.Open('data/envirpc.img')
     out_ds = gdal.GetDriverByName('ENVI').CreateCopy('/vsimem/envirpc.img', src_ds)
@@ -243,7 +243,7 @@ def envi_10():
 # Check .sta reading
 
 
-def envi_11():
+def test_envi_11():
 
     ds = gdal.Open('data/envistat')
     val = ds.GetRasterBand(1).GetStatistics(0, 0)
@@ -260,7 +260,7 @@ def envi_11():
 # Test category names reading and writing
 
 
-def envi_12():
+def test_envi_12():
 
     src_ds = gdal.Open('data/testenviclasses')
     out_ds = gdal.GetDriverByName('ENVI').CreateCopy('/vsimem/testenviclasses', src_ds)
@@ -297,7 +297,7 @@ def envi_12():
 # Test writing of metadata from the ENVI metadata domain and read it back (#4957)
 
 
-def envi_13():
+def test_envi_13():
 
     ds = gdal.GetDriverByName('ENVI').Create('/vsimem/envi_13.dat', 1, 1)
     ds.SetMetadata(['lines=100', 'sensor_type=Landsat TM', 'foo'], 'ENVI')
@@ -323,7 +323,7 @@ def envi_13():
 # Test that the image file is at the expected size on closing (#6662)
 
 
-def envi_14():
+def test_envi_14():
 
     gdal.GetDriverByName('ENVI').Create('/vsimem/envi_14.dat', 3, 4, 5, gdal.GDT_Int16)
 
@@ -340,7 +340,7 @@ def envi_14():
 # Test reading and writing geotransform matrix with rotation
 
 
-def envi_15():
+def test_envi_15():
 
     src_ds = gdal.Open('data/rotation.img')
     got_gt = src_ds.GetGeoTransform()
@@ -368,7 +368,7 @@ def envi_15():
 # Test reading a truncated ENVI dataset (see #915)
 
 
-def envi_truncated():
+def test_envi_truncated():
 
     gdal.GetDriverByName('ENVI').CreateCopy('/vsimem/envi_truncated.dat',
                                             gdal.Open('data/byte.tif'))
@@ -391,22 +391,22 @@ def envi_truncated():
 
 
 gdaltest_list = [
-    envi_1,
-    envi_2,
-    envi_3,
-    envi_4,
-    envi_5,
-    envi_6,
-    envi_7,
-    envi_8,
-    envi_9,
-    envi_10,
-    envi_11,
-    envi_12,
-    envi_13,
-    envi_14,
-    envi_15,
-    envi_truncated,
+    test_envi_1,
+    test_envi_2,
+    test_envi_3,
+    test_envi_4,
+    test_envi_5,
+    test_envi_6,
+    test_envi_7,
+    test_envi_8,
+    test_envi_9,
+    test_envi_10,
+    test_envi_11,
+    test_envi_12,
+    test_envi_13,
+    test_envi_14,
+    test_envi_15,
+    test_envi_truncated,
 ]
 
 
diff --git a/autotest/gdrivers/ers.py b/autotest/gdrivers/ers.py
index 285f7dc217e2..799df323a44c 100755
--- a/autotest/gdrivers/ers.py
+++ b/autotest/gdrivers/ers.py
@@ -41,7 +41,7 @@
 # Perform simple read test.
 
 
-def ers_1():
+def test_ers_1():
 
     tst = gdaltest.GDALTest('ERS', 'srtm.ers', 1, 64074)
     if tst.testOpen() != 'success':
@@ -59,7 +59,7 @@ def ers_1():
 # Create simple copy and check.
 
 
-def ers_2():
+def test_ers_2():
 
     tst = gdaltest.GDALTest('ERS', 'float32.bil', 1, 27)
     return tst.testCreateCopy(new_filename='tmp/float32.ers',
@@ -69,7 +69,7 @@ def ers_2():
 # Test multi-band file.
 
 
-def ers_3():
+def test_ers_3():
 
     tst = gdaltest.GDALTest('ERS', 'rgbsmall.tif', 2, 21053)
     return tst.testCreate(new_filename='tmp/rgbsmall.ers')
@@ -78,7 +78,7 @@ def ers_3():
 # Test HeaderOffset case.
 
 
-def ers_4():
+def test_ers_4():
 
     gt = (143.59625, 0.025, 0.0, -39.38125, 0.0, -0.025)
     srs = """GEOGCS["GEOCENTRIC DATUM of AUSTRALIA",
@@ -94,7 +94,7 @@ def ers_4():
 # Confirm we can recognised signed 8bit data.
 
 
-def ers_5():
+def test_ers_5():
 
     ds = gdal.Open('data/8s.ers')
     md = ds.GetRasterBand(1).GetMetadata('IMAGE_STRUCTURE')
@@ -111,7 +111,7 @@ def ers_5():
 # Confirm a copy preserves the signed byte info.
 
 
-def ers_6():
+def test_ers_6():
 
     drv = gdal.GetDriverByName('ERS')
 
@@ -135,7 +135,7 @@ def ers_6():
 # Test opening a file with everything in lower case.
 
 
-def ers_7():
+def test_ers_7():
 
     ds = gdal.Open('data/caseinsensitive.ers')
 
@@ -152,7 +152,7 @@ def ers_7():
 # Test GCP support
 
 
-def ers_8():
+def test_ers_8():
 
     src_ds = gdal.Open('../gcore/data/gcps.vrt')
     drv = gdal.GetDriverByName('ERS')
@@ -194,7 +194,7 @@ def ers_8():
 # Test NoData support (#4207)
 
 
-def ers_9():
+def test_ers_9():
 
     drv = gdal.GetDriverByName('ERS')
     ds = drv.Create('/vsimem/ers_9.ers', 1, 1)
@@ -225,7 +225,7 @@ def ers_9():
 # Test PROJ, DATUM, UNITS support (#4229)
 
 
-def ers_10():
+def test_ers_10():
 
     drv = gdal.GetDriverByName('ERS')
     ds = drv.Create('/vsimem/ers_10.ers', 1, 1, options=['DATUM=GDA94', 'PROJ=MGA55', 'UNITS=METERS'])
@@ -372,7 +372,7 @@ def ers_10():
 # Test fix for https://bugs.chromium.org/p/oss-fuzz/issues/detail?id=8744
 
 
-def ers_recursive_opening():
+def test_ers_recursive_opening():
     ds = gdal.Open('/vsitar/data/test_ers_recursive.tar/test.ers')
     ds.GetFileList()
     return 'success'
@@ -381,24 +381,24 @@ def ers_recursive_opening():
 # Cleanup
 
 
-def ers_cleanup():
+def test_ers_cleanup():
     gdaltest.clean_tmp()
     return 'success'
 
 
 gdaltest_list = [
-    ers_1,
-    ers_2,
-    ers_3,
-    ers_4,
-    ers_5,
-    ers_6,
-    ers_7,
-    ers_8,
-    ers_9,
-    ers_10,
-    ers_recursive_opening,
-    ers_cleanup
+    test_ers_1,
+    test_ers_2,
+    test_ers_3,
+    test_ers_4,
+    test_ers_5,
+    test_ers_6,
+    test_ers_7,
+    test_ers_8,
+    test_ers_9,
+    test_ers_10,
+    test_ers_recursive_opening,
+    test_ers_cleanup
 ]
 
 
diff --git a/autotest/gdrivers/fast.py b/autotest/gdrivers/fast.py
index ffc6355ea226..299d1513283d 100755
--- a/autotest/gdrivers/fast.py
+++ b/autotest/gdrivers/fast.py
@@ -39,7 +39,7 @@
 # Verify we have the driver.
 
 
-def fast_1():
+def test_fast_1():
 
     gdaltest.fast_drv = gdal.GetDriverByName('FAST')
     if gdaltest.fast_drv is None:
@@ -51,7 +51,7 @@ def fast_1():
 # Perform simple read test.
 
 
-def fast_2():
+def test_fast_2():
 
     if gdaltest.fast_drv is None:
         return 'skip'
@@ -67,7 +67,7 @@ def fast_2():
 # Verify metadata.
 
 
-def fast_3():
+def test_fast_3():
 
     if gdaltest.fast_drv is None:
         return 'skip'
@@ -114,7 +114,7 @@ def fast_3():
 # Test geotransform data.
 
 
-def fast_4():
+def test_fast_4():
 
     if gdaltest.fast_drv is None:
         return 'skip'
@@ -142,7 +142,7 @@ def fast_4():
 ###############################################################################
 # Test 2 bands dataset with checking projections and geotransform.
 
-def fast_5():
+def test_fast_5():
 
     if gdaltest.fast_drv is None:
         return 'skip'
@@ -182,7 +182,7 @@ def fast_5():
 ###############################################################################
 # Test Euromap LISS3 dataset
 
-def fast_6():
+def test_fast_6():
 
     if gdaltest.fast_drv is None:
         return 'skip'
@@ -203,7 +203,7 @@ def fast_6():
 ###############################################################################
 # Test Euromap PAN dataset
 
-def fast_7():
+def test_fast_7():
 
     if gdaltest.fast_drv is None:
         return 'skip'
@@ -235,7 +235,7 @@ def fast_7():
 # Test Euromap WIFS dataset
 
 
-def fast_8():
+def test_fast_8():
 
     if gdaltest.fast_drv is None:
         return 'skip'
@@ -269,7 +269,7 @@ def fast_8():
 # Check some metadata and opening for a RevB L7 file (#3306, #3307).
 
 
-def fast_9():
+def test_fast_9():
 
     if gdaltest.fast_drv is None:
         return 'skip'
@@ -290,15 +290,15 @@ def fast_9():
 
 
 gdaltest_list = [
-    fast_1,
-    fast_2,
-    fast_3,
-    fast_4,
-    fast_5,
-    fast_6,
-    fast_7,
-    fast_8,
-    fast_9]
+    test_fast_1,
+    test_fast_2,
+    test_fast_3,
+    test_fast_4,
+    test_fast_5,
+    test_fast_6,
+    test_fast_7,
+    test_fast_8,
+    test_fast_9]
 
 if __name__ == '__main__':
 
diff --git a/autotest/gdrivers/fujibas.py b/autotest/gdrivers/fujibas.py
index 6153a36e8bb7..4ea6859260c6 100755
--- a/autotest/gdrivers/fujibas.py
+++ b/autotest/gdrivers/fujibas.py
@@ -37,14 +37,14 @@
 # Test a fake - and certainly incorrect - FUJIBAS dataset
 
 
-def fujibas_1():
+def test_fujibas_1():
 
     tst = gdaltest.GDALTest('FujiBAS', 'fakefujibas.pcb', 1, 1)
     return tst.testOpen()
 
 
 gdaltest_list = [
-    fujibas_1]
+    test_fujibas_1]
 
 if __name__ == '__main__':
 
diff --git a/autotest/gdrivers/gdalhttp.py b/autotest/gdrivers/gdalhttp.py
index 29a42d3e5397..ec1d5b216c7a 100755
--- a/autotest/gdrivers/gdalhttp.py
+++ b/autotest/gdrivers/gdalhttp.py
@@ -42,7 +42,7 @@
 # Verify we have the driver.
 
 
-def http_1():
+def test_http_1():
 
     gdaltest.dods_drv = None
 
@@ -70,7 +70,7 @@ def http_1():
 # Verify /vsicurl (subversion file listing)
 
 
-def http_2():
+def test_http_2():
 
     drv = gdal.GetDriverByName('HTTP')
     if drv is None:
@@ -92,7 +92,7 @@ def http_2():
 # Verify /vsicurl (apache file listing)
 
 
-def http_3():
+def test_http_3():
 
     drv = gdal.GetDriverByName('HTTP')
     if drv is None:
@@ -148,7 +148,7 @@ def http_4_old():
 # Verify /vsicurl (ftp)
 
 
-def http_4():
+def test_http_4():
 
     # Too unreliable
     if gdaltest.skip_on_travis():
@@ -188,7 +188,7 @@ def http_4():
 # Test HTTP driver with non VSIL driver
 
 
-def http_5():
+def test_http_5():
 
     drv = gdal.GetDriverByName('HTTP')
     if drv is None:
@@ -224,7 +224,7 @@ def http_5():
 # Test HTTP driver with OGR driver
 
 
-def http_6():
+def test_http_6():
 
     drv = gdal.GetDriverByName('HTTP')
     if drv is None:
@@ -251,7 +251,7 @@ def http_6():
 
 ###############################################################################
 
-def http_test_ssl_verifystatus():
+def test_http_test_ssl_verifystatus():
 
     if gdal.GetDriverByName('HTTP') is None:
         return 'skip'
@@ -275,14 +275,14 @@ def http_test_ssl_verifystatus():
 ###############################################################################
 
 
-def http_test_use_capi_store():
+def test_http_test_use_capi_store():
 
     if gdal.GetDriverByName('HTTP') is None:
         return 'skip'
 
     if sys.platform != 'win32':
         with gdaltest.error_handler():
-            return http_test_use_capi_store_sub()
+            return test_http_test_use_capi_store_sub()
 
     import test_py_scripts
     ret = test_py_scripts.run_py_script_as_external_script('.', 'gdalhttp', ' -use_capi_store', display_live_on_parent_stdout=True)
@@ -293,7 +293,7 @@ def http_test_use_capi_store():
     return 'success'
 
 
-def http_test_use_capi_store_sub():
+def test_http_test_use_capi_store_sub():
 
     with gdaltest.config_option('GDAL_HTTP_USE_CAPI_STORE', 'YES'):
         gdal.OpenEx('https://google.com', allowed_drivers=['HTTP'])
@@ -304,7 +304,7 @@ def http_test_use_capi_store_sub():
 #
 
 
-def http_cleanup():
+def test_http_cleanup():
     if gdaltest.dods_drv is not None:
         gdaltest.dods_drv.Register()
     gdaltest.dods_drv = None
@@ -312,16 +312,16 @@ def http_cleanup():
     return 'success'
 
 
-gdaltest_list = [http_1,
-                 http_2,
-                 http_3,
+gdaltest_list = [test_http_1,
+                 test_http_2,
+                 test_http_3,
                  # http_4_old,
-                 http_4,
-                 http_5,
-                 http_6,
-                 http_test_ssl_verifystatus,
-                 http_test_use_capi_store,
-                 http_cleanup]
+                 test_http_4,
+                 test_http_5,
+                 test_http_6,
+                 test_http_test_ssl_verifystatus,
+                 test_http_test_use_capi_store,
+                 test_http_cleanup]
 
 # gdaltest_list = [ http_test_use_capi_store ]
 
@@ -330,7 +330,7 @@ def http_cleanup():
     gdaltest.setup_run('http')
 
     if len(sys.argv) == 2 and sys.argv[1] == '-use_capi_store':
-        gdaltest_list = [http_test_use_capi_store_sub]
+        gdaltest_list = [test_http_test_use_capi_store_sub]
 
     gdaltest.run_tests(gdaltest_list)
 
diff --git a/autotest/gdrivers/genbin.py b/autotest/gdrivers/genbin.py
index 96f22e01294e..75db02c423b8 100755
--- a/autotest/gdrivers/genbin.py
+++ b/autotest/gdrivers/genbin.py
@@ -37,7 +37,7 @@
 # Perform simple read test.
 
 
-def genbin_1():
+def test_genbin_1():
 
     tst = gdaltest.GDALTest('GenBin', 'tm4628_96.bil', 1, 5738,
                             0, 0, 500, 1)
@@ -73,7 +73,7 @@ def genbin_1():
 
 
 gdaltest_list = [
-    genbin_1
+    test_genbin_1
 ]
 
 
diff --git a/autotest/gdrivers/georaster.py b/autotest/gdrivers/georaster.py
index 524d7a6086ed..8001ba12ea3e 100755
--- a/autotest/gdrivers/georaster.py
+++ b/autotest/gdrivers/georaster.py
@@ -53,7 +53,7 @@ def get_connection_str():
 #
 
 
-def georaster_init():
+def test_georaster_init():
 
     gdaltest.oci_ds = None
 
@@ -92,7 +92,7 @@ def georaster_init():
 #
 
 
-def georaster_byte():
+def test_georaster_byte():
 
     if gdaltest.georasterDriver is None:
         return 'skip'
@@ -119,7 +119,7 @@ def georaster_byte():
 #
 
 
-def georaster_int16():
+def test_georaster_int16():
 
     if gdaltest.georasterDriver is None:
         return 'skip'
@@ -148,7 +148,7 @@ def georaster_int16():
 #
 
 
-def georaster_int32():
+def test_georaster_int32():
 
     if gdaltest.georasterDriver is None:
         return 'skip'
@@ -177,7 +177,7 @@ def georaster_int32():
 #
 
 
-def georaster_rgb_b1():
+def test_georaster_rgb_b1():
 
     if gdaltest.georasterDriver is None:
         return 'skip'
@@ -205,7 +205,7 @@ def georaster_rgb_b1():
 #
 
 
-def georaster_rgb_b2():
+def test_georaster_rgb_b2():
 
     if gdaltest.georasterDriver is None:
         return 'skip'
@@ -233,7 +233,7 @@ def georaster_rgb_b2():
 #
 
 
-def georaster_rgb_b3_bsq():
+def test_georaster_rgb_b3_bsq():
 
     if gdaltest.georasterDriver is None:
         return 'skip'
@@ -261,7 +261,7 @@ def georaster_rgb_b3_bsq():
 #
 
 
-def georaster_rgb_b3_bip():
+def test_georaster_rgb_b3_bip():
 
     if gdaltest.georasterDriver is None:
         return 'skip'
@@ -289,7 +289,7 @@ def georaster_rgb_b3_bip():
 #
 
 
-def georaster_rgb_b3_bil():
+def test_georaster_rgb_b3_bil():
 
     if gdaltest.georasterDriver is None:
         return 'skip'
@@ -317,7 +317,7 @@ def georaster_rgb_b3_bil():
 #
 
 
-def georaster_byte_deflate():
+def test_georaster_byte_deflate():
 
     if gdaltest.georasterDriver is None:
         return 'skip'
@@ -345,7 +345,7 @@ def georaster_byte_deflate():
 #
 
 
-def georaster_rgb_deflate_b3():
+def test_georaster_rgb_deflate_b3():
 
     if gdaltest.georasterDriver is None:
         return 'skip'
@@ -373,7 +373,7 @@ def georaster_rgb_deflate_b3():
 #
 
 
-def georaster_1bit():
+def test_georaster_1bit():
 
     if gdaltest.georasterDriver is None:
         return 'skip'
@@ -401,7 +401,7 @@ def georaster_1bit():
 #
 
 
-def georaster_2bit():
+def test_georaster_2bit():
 
     if gdaltest.georasterDriver is None:
         return 'skip'
@@ -429,7 +429,7 @@ def georaster_2bit():
 #
 
 
-def georaster_4bit():
+def test_georaster_4bit():
 
     if gdaltest.georasterDriver is None:
         return 'skip'
@@ -457,7 +457,7 @@ def georaster_4bit():
 #
 
 
-def georaster_cleanup():
+def test_georaster_cleanup():
 
     if gdaltest.georasterDriver is None:
         return 'skip'
@@ -478,21 +478,21 @@ def georaster_cleanup():
 
 
 gdaltest_list = [
-    georaster_init,
-    georaster_byte,
-    georaster_int16,
-    georaster_int32,
-    georaster_rgb_b1,
-    georaster_rgb_b2,
-    georaster_rgb_b3_bsq,
-    georaster_rgb_b3_bip,
-    georaster_rgb_b3_bil,
-    georaster_byte_deflate,
-    georaster_rgb_deflate_b3,
-    georaster_1bit,
-    georaster_2bit,
-    georaster_4bit,
-    georaster_cleanup
+    test_georaster_init,
+    test_georaster_byte,
+    test_georaster_int16,
+    test_georaster_int32,
+    test_georaster_rgb_b1,
+    test_georaster_rgb_b2,
+    test_georaster_rgb_b3_bsq,
+    test_georaster_rgb_b3_bip,
+    test_georaster_rgb_b3_bil,
+    test_georaster_byte_deflate,
+    test_georaster_rgb_deflate_b3,
+    test_georaster_1bit,
+    test_georaster_2bit,
+    test_georaster_4bit,
+    test_georaster_cleanup
 ]
 
 if __name__ == '__main__':
diff --git a/autotest/gdrivers/gff.py b/autotest/gdrivers/gff.py
index 774d40c2da4c..8dc33ec73660 100755
--- a/autotest/gdrivers/gff.py
+++ b/autotest/gdrivers/gff.py
@@ -38,7 +38,7 @@
 # Test an extract from a real dataset
 
 
-def gff_1():
+def test_gff_1():
     # 12088 = 2048 + 8 * 1255
     if not gdaltest.download_file('http://sandia.gov/RADAR/complex_data/MiniSAR20050519p0001image008.gff', 'MiniSAR20050519p0001image008.gff', 12088):
         return 'skip'
@@ -51,7 +51,7 @@ def gff_1():
 
 
 gdaltest_list = [
-    gff_1]
+    test_gff_1]
 
 if __name__ == '__main__':
 
diff --git a/autotest/gdrivers/gif.py b/autotest/gdrivers/gif.py
index fdb7b10d2d74..10c379ab38bc 100755
--- a/autotest/gdrivers/gif.py
+++ b/autotest/gdrivers/gif.py
@@ -39,7 +39,7 @@
 # Get the GIF driver, and verify a few things about it.
 
 
-def gif_1():
+def test_gif_1():
 
     gdaltest.gif_drv = gdal.GetDriverByName('GIF')
     if gdaltest.gif_drv is None:
@@ -62,7 +62,7 @@ def gif_1():
 # Read test of simple byte reference data.
 
 
-def gif_2():
+def test_gif_2():
 
     tst = gdaltest.GDALTest('GIF', 'bug407.gif', 1, 57921)
     return tst.testOpen()
@@ -71,7 +71,7 @@ def gif_2():
 # Test lossless copying.
 
 
-def gif_3():
+def test_gif_3():
 
     tst = gdaltest.GDALTest('GIF', 'bug407.gif', 1, 57921,
                             options=['INTERLACING=NO'])
@@ -82,7 +82,7 @@ def gif_3():
 # Verify the colormap, and nodata setting for test file.
 
 
-def gif_4():
+def test_gif_4():
 
     ds = gdal.Open('data/bug407.gif')
     cm = ds.GetRasterBand(1).GetRasterColorTable()
@@ -110,7 +110,7 @@ def gif_4():
 # Test creating an in memory copy.
 
 
-def gif_5():
+def test_gif_5():
 
     tst = gdaltest.GDALTest('GIF', 'byte.tif', 1, 4672)
 
@@ -120,7 +120,7 @@ def gif_5():
 # Verify nodata support
 
 
-def gif_6():
+def test_gif_6():
 
     src_ds = gdal.Open('../gcore/data/nodata_byte.tif')
 
@@ -162,7 +162,7 @@ def gif_6():
 ###############################################################################
 # Confirm reading with the BIGGIF driver.
 
-def gif_7():
+def test_gif_7():
 
     # Move the GIF driver after the BIGGIF driver.
     drv = gdal.GetDriverByName('GIF')
@@ -187,7 +187,7 @@ def gif_7():
 # Confirm that BIGGIF driver is selected for huge gifs
 
 
-def gif_8():
+def test_gif_8():
 
     # Move the BIGGIF driver after the GIF driver.
     drv = gdal.GetDriverByName('BIGGIF')
@@ -207,7 +207,7 @@ def gif_8():
 # Test writing to /vsistdout/
 
 
-def gif_9():
+def test_gif_9():
 
     src_ds = gdal.Open('data/byte.tif')
     ds = gdal.GetDriverByName('GIF').CreateCopy(
@@ -231,7 +231,7 @@ def gif_9():
 # Test interlacing
 
 
-def gif_10():
+def test_gif_10():
 
     tst = gdaltest.GDALTest('GIF', 'byte.tif', 1, 4672,
                             options=['INTERLACING=YES'])
@@ -242,23 +242,23 @@ def gif_10():
 # Cleanup.
 
 
-def gif_cleanup():
+def test_gif_cleanup():
     gdaltest.clean_tmp()
     return 'success'
 
 
 gdaltest_list = [
-    gif_1,
-    gif_2,
-    gif_3,
-    gif_4,
-    gif_5,
-    gif_6,
-    gif_7,
-    gif_8,
-    gif_9,
-    gif_10,
-    gif_cleanup]
+    test_gif_1,
+    test_gif_2,
+    test_gif_3,
+    test_gif_4,
+    test_gif_5,
+    test_gif_6,
+    test_gif_7,
+    test_gif_8,
+    test_gif_9,
+    test_gif_10,
+    test_gif_cleanup]
 
 if __name__ == '__main__':
 
diff --git a/autotest/gdrivers/gmt.py b/autotest/gdrivers/gmt.py
index 9efbd9613549..e54bc0f25116 100755
--- a/autotest/gdrivers/gmt.py
+++ b/autotest/gdrivers/gmt.py
@@ -38,7 +38,7 @@
 # Perform simple read test.
 
 
-def gmt_1():
+def test_gmt_1():
 
     gdaltest.gmt_drv = gdal.GetDriverByName('GMT')
 
@@ -56,7 +56,7 @@ def gmt_1():
 # Verify a simple createcopy operation with 16bit data.
 
 
-def gmt_2():
+def test_gmt_2():
 
     if gdaltest.gmt_drv is None:
         return 'skip'
@@ -68,8 +68,8 @@ def gmt_2():
 
 
 gdaltest_list = [
-    gmt_1,
-    gmt_2]
+    test_gmt_1,
+    test_gmt_2]
 
 
 if __name__ == '__main__':
diff --git a/autotest/gdrivers/gpkg.py b/autotest/gdrivers/gpkg.py
index 413aafe3018d..8ec3494198ed 100755
--- a/autotest/gdrivers/gpkg.py
+++ b/autotest/gdrivers/gpkg.py
@@ -79,7 +79,7 @@ def validate(filename, quiet=False):
 # Test if GPKG and tile drivers are available
 
 
-def gpkg_init():
+def test_gpkg_init():
 
     gdaltest.gpkg_dr = None
 
@@ -201,7 +201,7 @@ def check_tile_format(out_ds, expected_format, expected_band_count, expected_ct,
 # Single band, PNG
 
 
-def gpkg_1():
+def test_gpkg_1():
 
     if gdaltest.gpkg_dr is None:
         return 'skip'
@@ -319,7 +319,7 @@ def gpkg_1():
 # Single band, JPEG
 
 
-def gpkg_2():
+def test_gpkg_2():
 
     if gdaltest.gpkg_dr is None:
         return 'skip'
@@ -421,7 +421,7 @@ def gpkg_2():
 # Single band, WEBP
 
 
-def gpkg_3():
+def test_gpkg_3():
 
     if gdaltest.gpkg_dr is None:
         return 'skip'
@@ -544,7 +544,7 @@ def gpkg_3():
 # Three band, PNG
 
 
-def gpkg_4(tile_drv_name='PNG'):
+def test_gpkg_4(tile_drv_name='PNG'):
 
     if gdaltest.gpkg_dr is None:
         return 'skip'
@@ -623,15 +623,15 @@ def gpkg_4(tile_drv_name='PNG'):
 # Three band, JPEG
 
 
-def gpkg_5():
-    return gpkg_4(tile_drv_name='JPEG')
+def test_gpkg_5():
+    return test_gpkg_4(tile_drv_name='JPEG')
 
 ###############################################################################
 # Three band, WEBP
 
 
-def gpkg_6():
-    return gpkg_4(tile_drv_name='WEBP')
+def test_gpkg_6():
+    return test_gpkg_4(tile_drv_name='WEBP')
 
 ###############################################################################
 # 4 band, PNG
@@ -652,7 +652,7 @@ def get_georeferenced_rgba_ds(alpha_fully_transparent=False, alpha_fully_opaque=
     return tmp_ds
 
 
-def gpkg_7(tile_drv_name='PNG'):
+def test_gpkg_7(tile_drv_name='PNG'):
 
     if gdaltest.gpkg_dr is None:
         return 'skip'
@@ -743,15 +743,15 @@ def gpkg_7(tile_drv_name='PNG'):
 # 4 band, JPEG
 
 
-def gpkg_8():
-    return gpkg_7(tile_drv_name='JPEG')
+def test_gpkg_8():
+    return test_gpkg_7(tile_drv_name='JPEG')
 
 ###############################################################################
 # 4 band, WEBP
 
 
-def gpkg_9():
-    return gpkg_7(tile_drv_name='WEBP')
+def test_gpkg_9():
+    return test_gpkg_7(tile_drv_name='WEBP')
 
 ###############################################################################
 #
@@ -771,7 +771,7 @@ def get_georeferenced_ds_with_pct32():
 # Single band with 32 bit color table, PNG
 
 
-def gpkg_10():
+def test_gpkg_10():
 
     if gdaltest.gpkg_dr is None:
         return 'skip'
@@ -892,7 +892,7 @@ def gpkg_10():
 # Single band with 32 bit color table, JPEG
 
 
-def gpkg_11(tile_drv_name='JPEG'):
+def test_gpkg_11(tile_drv_name='JPEG'):
 
     if gdaltest.gpkg_dr is None:
         return 'skip'
@@ -948,14 +948,14 @@ def gpkg_11(tile_drv_name='JPEG'):
 # Single band with 32 bit color table, WEBP
 
 
-def gpkg_12():
-    return gpkg_11(tile_drv_name='WEBP')
+def test_gpkg_12():
+    return test_gpkg_11(tile_drv_name='WEBP')
 
 ###############################################################################
 # Single band with 24 bit color table, PNG
 
 
-def gpkg_13():
+def test_gpkg_13():
 
     if gdaltest.gpkg_dr is None:
         return 'skip'
@@ -1026,7 +1026,7 @@ def gpkg_13():
 # Test creation and opening options
 
 
-def gpkg_14():
+def test_gpkg_14():
 
     if gdaltest.gpkg_dr is None:
         return 'skip'
@@ -1440,7 +1440,7 @@ def gpkg_14():
 # Test error cases
 
 
-def gpkg_15():
+def test_gpkg_15():
 
     if gdaltest.gpkg_dr is None:
         return 'skip'
@@ -1605,7 +1605,7 @@ def gpkg_15():
 # Test block/tile caching
 
 
-def gpkg_16():
+def test_gpkg_16():
 
     if gdaltest.gpkg_dr is None:
         return 'skip'
@@ -1651,7 +1651,7 @@ def gpkg_16():
 # Test overviews with single band dataset
 
 
-def gpkg_17():
+def test_gpkg_17():
 
     if gdaltest.gpkg_dr is None:
         return 'skip'
@@ -1818,7 +1818,7 @@ def gpkg_17():
 # Test overviews with 3 band dataset
 
 
-def gpkg_18():
+def test_gpkg_18():
 
     if gdaltest.gpkg_dr is None:
         return 'skip'
@@ -1973,7 +1973,7 @@ def gpkg_18():
 # Test overviews with 24-bit color palette single band dataset
 
 
-def gpkg_19():
+def test_gpkg_19():
 
     if gdaltest.gpkg_dr is None:
         return 'skip'
@@ -2026,7 +2026,7 @@ def gpkg_19():
 # Test PNG8
 
 
-def gpkg_20():
+def test_gpkg_20():
 
     if gdaltest.gpkg_dr is None:
         return 'skip'
@@ -2129,7 +2129,7 @@ def gpkg_20():
 # Test metadata
 
 
-def gpkg_21():
+def test_gpkg_21():
 
     if gdaltest.gpkg_dr is None:
         return 'skip'
@@ -2426,7 +2426,7 @@ def get_georeferenced_greyalpha_ds():
     return tmp_ds
 
 
-def gpkg_22(tile_drv_name='PNG'):
+def test_gpkg_22(tile_drv_name='PNG'):
 
     if gdaltest.gpkg_dr is None:
         return 'skip'
@@ -2504,28 +2504,28 @@ def gpkg_22(tile_drv_name='PNG'):
 # Two band, JPEG
 
 
-def gpkg_23():
-    return gpkg_22(tile_drv_name='JPEG')
+def test_gpkg_23():
+    return test_gpkg_22(tile_drv_name='JPEG')
 
 ###############################################################################
 # Two band, WEBP
 
 
-def gpkg_24():
-    return gpkg_22(tile_drv_name='WEBP')
+def test_gpkg_24():
+    return test_gpkg_22(tile_drv_name='WEBP')
 
 ###############################################################################
 # Two band, mixed
 
 
-def gpkg_25():
-    return gpkg_22(tile_drv_name=None)
+def test_gpkg_25():
+    return test_gpkg_22(tile_drv_name=None)
 
 ###############################################################################
 # Test TILING_SCHEME
 
 
-def gpkg_26():
+def test_gpkg_26():
 
     if gdaltest.gpkg_dr is None:
         return 'skip'
@@ -2660,7 +2660,7 @@ def gpkg_26():
 # Test behaviour with low block cache max
 
 
-def gpkg_27():
+def test_gpkg_27():
 
     if gdaltest.gpkg_dr is None:
         return 'skip'
@@ -2689,7 +2689,7 @@ def gpkg_27():
 # block that would have gone through the GPKG in-memory cache
 
 
-def gpkg_28():
+def test_gpkg_28():
 
     if gdaltest.gpkg_dr is None:
         return 'skip'
@@ -2732,7 +2732,7 @@ def gpkg_28():
 # Variation of gpkg_28 with 2 blocks
 
 
-def gpkg_29(x=0):
+def test_gpkg_29(x=0):
 
     if gdaltest.gpkg_dr is None:
         return 'skip'
@@ -2777,15 +2777,15 @@ def gpkg_29(x=0):
 # Variation of gpkg_29 where the read is done in another block
 
 
-def gpkg_30():
+def test_gpkg_30():
 
-    return gpkg_29(x=200)
+    return test_gpkg_29(x=200)
 
 ###############################################################################
 # 1 band to RGBA
 
 
-def gpkg_31():
+def test_gpkg_31():
 
     if gdaltest.gpkg_dr is None:
         return 'skip'
@@ -2816,7 +2816,7 @@ def gpkg_31():
 # grey-alpha to RGBA
 
 
-def gpkg_32():
+def test_gpkg_32():
 
     if gdaltest.gpkg_dr is None:
         return 'skip'
@@ -2855,7 +2855,7 @@ def gpkg_32():
 # Single band with 32 bit color table -> RGBA
 
 
-def gpkg_33():
+def test_gpkg_33():
 
     if gdaltest.gpkg_dr is None:
         return 'skip'
@@ -2888,7 +2888,7 @@ def gpkg_33():
 # Test partial tiles with overviews (#6335)
 
 
-def gpkg_34():
+def test_gpkg_34():
 
     if gdaltest.gpkg_dr is None:
         return 'skip'
@@ -2917,7 +2917,7 @@ def gpkg_34():
 # Test dirty block flushing while reading block (#6365)
 
 
-def gpkg_35():
+def test_gpkg_35():
 
     if gdaltest.gpkg_dr is None:
         return 'skip'
@@ -2968,7 +2968,7 @@ def gpkg_35():
 # Single band with 24 bit color table, PNG, GoogleMapsCompatible
 
 
-def gpkg_36():
+def test_gpkg_36():
 
     if gdaltest.gpkg_dr is None:
         return 'skip'
@@ -3002,7 +3002,7 @@ def gpkg_36():
 # factors
 
 
-def gpkg_37():
+def test_gpkg_37():
 
     if gdaltest.gpkg_dr is None:
         return 'skip'
@@ -3025,7 +3025,7 @@ def gpkg_37():
 # Test generating more than 1000 tiles
 
 
-def gpkg_38():
+def test_gpkg_38():
 
     if gdaltest.gpkg_dr is None:
         return 'skip'
@@ -3068,7 +3068,7 @@ def gpkg_38():
 # Test tile gridded coverage data
 
 
-def gpkg_39():
+def test_gpkg_39():
 
     if gdaltest.gpkg_dr is None:
         return 'skip'
@@ -3569,7 +3569,7 @@ def gpkg_39():
 # Test VERSION
 
 
-def gpkg_40():
+def test_gpkg_40():
 
     if gdaltest.gpkg_dr is None:
         return 'skip'
@@ -3660,7 +3660,7 @@ def gpkg_40():
 # Robustness test
 
 
-def gpkg_41():
+def test_gpkg_41():
 
     if gdaltest.gpkg_dr is None or gdal.GetConfigOption('TRAVIS') is not None or \
        gdal.GetConfigOption('APPVEYOR') is not None:
@@ -3681,7 +3681,7 @@ def gpkg_41():
 # Test opening in vector mode a database without gpkg_geometry_columns
 
 
-def gpkg_42():
+def test_gpkg_42():
 
     if gdaltest.gpkg_dr is None:
         return 'skip'
@@ -3715,7 +3715,7 @@ def gpkg_42():
 # Test adding raster to a database without pre-existing raster support tables.
 
 
-def gpkg_43():
+def test_gpkg_43():
 
     if gdaltest.gpkg_dr is None:
         return 'skip'
@@ -3758,7 +3758,7 @@ def gpkg_43():
 # Test opening a .gpkg.sql file
 
 
-def gpkg_44():
+def test_gpkg_44():
 
     if gdaltest.gpkg_dr is None:
         return 'skip'
@@ -3776,7 +3776,7 @@ def gpkg_44():
 # Test opening a .gpkg file
 
 
-def gpkg_45():
+def test_gpkg_45():
 
     if gdaltest.gpkg_dr is None:
         return 'skip'
@@ -3791,7 +3791,7 @@ def gpkg_45():
 # Test fix for #6932
 
 
-def gpkg_46():
+def test_gpkg_46():
 
     if gdaltest.gpkg_dr is None:
         return 'skip'
@@ -3835,7 +3835,7 @@ def gpkg_46():
 # Test fix for #6976
 
 
-def gpkg_47():
+def test_gpkg_47():
 
     if gdaltest.gpkg_dr is None:
         return 'skip'
@@ -3860,7 +3860,7 @@ def gpkg_47():
 # subdatasets on Windows)
 
 
-def gpkg_48():
+def test_gpkg_48():
 
     if gdaltest.gpkg_dr is None:
         return 'skip'
@@ -3891,7 +3891,7 @@ def gpkg_48():
 ###############################################################################
 
 
-def gpkg_delete_raster_layer():
+def test_gpkg_delete_raster_layer():
 
     if gdaltest.gpkg_dr is None:
         return 'skip'
@@ -3929,7 +3929,7 @@ def gpkg_delete_raster_layer():
 ###############################################################################
 
 
-def gpkg_delete_gridded_coverage_raster_layer():
+def test_gpkg_delete_gridded_coverage_raster_layer():
 
     if gdaltest.gpkg_dr is None:
         return 'skip'
@@ -3957,7 +3957,7 @@ def gpkg_delete_gridded_coverage_raster_layer():
 
 
 ###############################################################################
-def gpkg_open_old_gpkg_elevation_tiles_extension():
+def test_gpkg_open_old_gpkg_elevation_tiles_extension():
 
     if gdaltest.gpkg_dr is None:
         return 'skip'
@@ -3977,7 +3977,7 @@ def gpkg_open_old_gpkg_elevation_tiles_extension():
 ###############################################################################
 
 
-def gpkg_GeneralCmdLineProcessor():
+def test_gpkg_GeneralCmdLineProcessor():
 
     if gdaltest.gpkg_dr is None:
         return 'skip'
@@ -3999,7 +3999,7 @@ def gpkg_GeneralCmdLineProcessor():
 ###############################################################################
 
 
-def gpkg_match_overview_factor():
+def test_gpkg_match_overview_factor():
 
     if gdaltest.gpkg_dr is None:
         return 'skip'
@@ -4021,7 +4021,7 @@ def gpkg_match_overview_factor():
 #
 
 
-def gpkg_cleanup():
+def test_gpkg_cleanup():
 
     if gdaltest.gpkg_dr is None:
         return 'skip'
@@ -4037,61 +4037,61 @@ def gpkg_cleanup():
 
 
 gdaltest_list = [
-    gpkg_init,
-    gpkg_1,
-    gpkg_2,
-    gpkg_3,
-    gpkg_4,
-    gpkg_5,
-    gpkg_6,
-    gpkg_7,
-    gpkg_8,
-    gpkg_9,
-    gpkg_10,
-    gpkg_11,
-    gpkg_12,
-    gpkg_13,
-    gpkg_14,
-    gpkg_15,
-    gpkg_16,
-    gpkg_17,
-    gpkg_18,
-    gpkg_19,
-    gpkg_20,
-    gpkg_21,
-    gpkg_22,
-    gpkg_23,
-    gpkg_24,
-    gpkg_25,
-    gpkg_26,
-    gpkg_27,
-    gpkg_28,
-    gpkg_29,
-    gpkg_30,
-    gpkg_31,
-    gpkg_32,
-    gpkg_33,
-    gpkg_34,
-    gpkg_35,
-    gpkg_36,
-    gpkg_37,
-    gpkg_38,
-    gpkg_39,
-    gpkg_40,
-    gpkg_41,
-    gpkg_42,
-    gpkg_43,
-    gpkg_44,
-    gpkg_45,
-    gpkg_46,
-    gpkg_47,
-    gpkg_48,
-    gpkg_delete_raster_layer,
-    gpkg_open_old_gpkg_elevation_tiles_extension,
-    gpkg_GeneralCmdLineProcessor,
-    gpkg_match_overview_factor,
-    gpkg_delete_gridded_coverage_raster_layer,
-    gpkg_cleanup,
+    test_gpkg_init,
+    test_gpkg_1,
+    test_gpkg_2,
+    test_gpkg_3,
+    test_gpkg_4,
+    test_gpkg_5,
+    test_gpkg_6,
+    test_gpkg_7,
+    test_gpkg_8,
+    test_gpkg_9,
+    test_gpkg_10,
+    test_gpkg_11,
+    test_gpkg_12,
+    test_gpkg_13,
+    test_gpkg_14,
+    test_gpkg_15,
+    test_gpkg_16,
+    test_gpkg_17,
+    test_gpkg_18,
+    test_gpkg_19,
+    test_gpkg_20,
+    test_gpkg_21,
+    test_gpkg_22,
+    test_gpkg_23,
+    test_gpkg_24,
+    test_gpkg_25,
+    test_gpkg_26,
+    test_gpkg_27,
+    test_gpkg_28,
+    test_gpkg_29,
+    test_gpkg_30,
+    test_gpkg_31,
+    test_gpkg_32,
+    test_gpkg_33,
+    test_gpkg_34,
+    test_gpkg_35,
+    test_gpkg_36,
+    test_gpkg_37,
+    test_gpkg_38,
+    test_gpkg_39,
+    test_gpkg_40,
+    test_gpkg_41,
+    test_gpkg_42,
+    test_gpkg_43,
+    test_gpkg_44,
+    test_gpkg_45,
+    test_gpkg_46,
+    test_gpkg_47,
+    test_gpkg_48,
+    test_gpkg_delete_raster_layer,
+    test_gpkg_open_old_gpkg_elevation_tiles_extension,
+    test_gpkg_GeneralCmdLineProcessor,
+    test_gpkg_match_overview_factor,
+    test_gpkg_delete_gridded_coverage_raster_layer,
+    test_gpkg_cleanup,
 ]
 # gdaltest_list = [ gpkg_init, gpkg_47, gpkg_cleanup ]
 if __name__ == '__main__':
diff --git a/autotest/gdrivers/grass.py b/autotest/gdrivers/grass.py
index ce69be146b5f..079bab0c90d1 100755
--- a/autotest/gdrivers/grass.py
+++ b/autotest/gdrivers/grass.py
@@ -38,7 +38,7 @@
 ###############################################################################
 # Test if GRASS driver is present
 
-def grass_1():
+def test_grass_1():
 
     gdaltest.grass_drv = gdal.GetDriverByName('GRASS')
     if gdaltest.grass_drv is None:
@@ -50,7 +50,7 @@ def grass_1():
 # Read existing simple 1 band GRASS dataset.
 
 
-def grass_2():
+def test_grass_2():
 
     if gdaltest.grass_drv is None:
         return 'skip'
@@ -79,8 +79,8 @@ def grass_2():
 
 
 gdaltest_list = [
-    grass_1,
-    grass_2
+    test_grass_1,
+    test_grass_2
 ]
 
 
diff --git a/autotest/gdrivers/grassasciigrid.py b/autotest/gdrivers/grassasciigrid.py
index c4f80dd0f8d6..0bd1d434ea9c 100755
--- a/autotest/gdrivers/grassasciigrid.py
+++ b/autotest/gdrivers/grassasciigrid.py
@@ -37,7 +37,7 @@
 # Perform simple read test.
 
 
-def grassasciigrid_1():
+def test_grassasciigrid_1():
 
     tst = gdaltest.GDALTest('GRASSASCIIGrid', 'grassascii.txt', 1, 212)
     expected_gt = [-100.0, 62.5, 0.0, 250.0, 0.0, -41.666666666666664]
@@ -47,7 +47,7 @@ def grassasciigrid_1():
 
 
 gdaltest_list = [
-    grassasciigrid_1
+    test_grassasciigrid_1
 ]
 
 if __name__ == '__main__':
diff --git a/autotest/gdrivers/grib.py b/autotest/gdrivers/grib.py
index 7892d815c2a7..3ae6b47dc364 100755
--- a/autotest/gdrivers/grib.py
+++ b/autotest/gdrivers/grib.py
@@ -52,7 +52,7 @@ def has_jp2kdrv():
 # Do a simple checksum on our test file
 
 
-def grib_1():
+def test_grib_1():
 
     gdaltest.grib_drv = gdal.GetDriverByName('GRIB')
     if gdaltest.grib_drv is None:
@@ -69,7 +69,7 @@ def grib_1():
 ###############################################################################
 # Test a small GRIB 1 sample file.
 
-def grib_2():
+def test_grib_2():
 
     if gdaltest.grib_drv is None:
         return 'skip'
@@ -82,7 +82,7 @@ def grib_2():
 # we sort-of-support per ticket Test a small GRIB 1 sample file.
 
 
-def grib_read_different_sizes_messages():
+def test_grib_read_different_sizes_messages():
 
     if gdaltest.grib_drv is None:
         return 'skip'
@@ -103,7 +103,7 @@ def grib_read_different_sizes_messages():
 # Check nodata
 
 
-def grib_grib2_read_nodata():
+def test_grib_grib2_read_nodata():
 
     if gdaltest.grib_drv is None:
         return 'skip'
@@ -127,7 +127,7 @@ def grib_grib2_read_nodata():
 # Check grib units (#3606)
 
 
-def grib_read_units():
+def test_grib_read_units():
 
     if gdaltest.grib_drv is None:
         return 'skip'
@@ -175,7 +175,7 @@ def grib_read_units():
 # ticket #5532
 
 
-def grib_read_geotransform_one_n_or_n_one():
+def test_grib_read_geotransform_one_n_or_n_one():
 
     if gdaltest.grib_drv is None:
         return 'skip'
@@ -196,7 +196,7 @@ def grib_read_geotransform_one_n_or_n_one():
 # case (#5530).
 
 
-def grib_read_vsizip():
+def test_grib_read_vsizip():
 
     if gdaltest.grib_drv is None:
         return 'skip'
@@ -211,7 +211,7 @@ def grib_read_vsizip():
 # Write PDS numbers to all bands
 
 
-def grib_grib2_test_grib_pds_all_bands():
+def test_grib_grib2_test_grib_pds_all_bands():
 
     if gdaltest.grib_drv is None:
         return 'skip'
@@ -242,7 +242,7 @@ def grib_grib2_test_grib_pds_all_bands():
 # Test support for template 4.15 (#5768)
 
 
-def grib_grib2_read_template_4_15():
+def test_grib_grib2_read_template_4_15():
 
     if gdaltest.grib_drv is None:
         return 'skip'
@@ -270,7 +270,7 @@ def grib_grib2_read_template_4_15():
 # Test support for PNG compressed
 
 
-def grib_grib2_read_png():
+def test_grib_grib2_read_png():
 
     if gdaltest.grib_drv is None:
         return 'skip'
@@ -291,7 +291,7 @@ def grib_grib2_read_png():
 # Test support for GRIB2 Section 4 Template 32, Analysis or forecast at a horizontal level or in a horizontal layer at a point in time for synthetic satellite data.
 
 
-def grib_grib2_read_template_4_32():
+def test_grib_grib2_read_template_4_32():
 
     if gdaltest.grib_drv is None:
         return 'skip'
@@ -317,7 +317,7 @@ def grib_grib2_read_template_4_32():
 # GRIB2 file with all 0 data
 
 
-def grib_grib2_read_all_zero_data():
+def test_grib_grib2_read_all_zero_data():
 
     if gdaltest.grib_drv is None:
         return 'skip'
@@ -343,7 +343,7 @@ def grib_grib2_read_all_zero_data():
 # GRIB1 file with rotate pole lonlat
 
 
-def grib_grib2_read_rotated_pole_lonlat():
+def test_grib_grib2_read_rotated_pole_lonlat():
 
     if gdaltest.grib_drv is None:
         return 'skip'
@@ -384,7 +384,7 @@ def grib_grib2_read_rotated_pole_lonlat():
 # Test support for GRIB2 Section 4 Template 40, Analysis or forecast at a horizontal level or in a horizontal layer at a point in time for atmospheric chemical constituents
 
 
-def grib_grib2_read_template_4_40():
+def test_grib_grib2_read_template_4_40():
 
     if gdaltest.grib_drv is None:
         return 'skip'
@@ -410,7 +410,7 @@ def grib_grib2_read_template_4_40():
 # Test support for a unhandled GRIB2 Section 4 Template
 
 
-def grib_grib2_read_template_4_unhandled():
+def test_grib_grib2_read_template_4_unhandled():
 
     if gdaltest.grib_drv is None:
         return 'skip'
@@ -431,7 +431,7 @@ def grib_grib2_read_template_4_unhandled():
 # Test reading GRIB2 Transverse Mercator grid
 
 
-def grib_grib2_read_transverse_mercator():
+def test_grib_grib2_read_transverse_mercator():
 
     if gdaltest.grib_drv is None:
         return 'skip'
@@ -458,7 +458,7 @@ def grib_grib2_read_transverse_mercator():
 # Test reading GRIB2 Mercator grid
 
 
-def grib_grib2_read_mercator():
+def test_grib_grib2_read_mercator():
 
     if gdaltest.grib_drv is None:
         return 'skip'
@@ -488,7 +488,7 @@ def grib_grib2_read_mercator():
 # Test reading GRIB2 Mercator grid
 
 
-def grib_grib2_read_mercator_2sp():
+def test_grib_grib2_read_mercator_2sp():
 
     if gdaltest.grib_drv is None:
         return 'skip'
@@ -518,7 +518,7 @@ def grib_grib2_read_mercator_2sp():
 # Test reading GRIB2 Lambert Conformal Conic grid
 
 
-def grib_grib2_read_lcc():
+def test_grib_grib2_read_lcc():
 
     if gdaltest.grib_drv is None:
         return 'skip'
@@ -548,7 +548,7 @@ def grib_grib2_read_lcc():
 # Test reading GRIB2 Polar Stereographic grid
 
 
-def grib_grib2_read_polar_stereo():
+def test_grib_grib2_read_polar_stereo():
 
     if gdaltest.grib_drv is None:
         return 'skip'
@@ -578,7 +578,7 @@ def grib_grib2_read_polar_stereo():
 # Test reading GRIB2 Albers Equal Area grid
 
 
-def grib_grib2_read_aea():
+def test_grib_grib2_read_aea():
 
     if gdaltest.grib_drv is None:
         return 'skip'
@@ -608,7 +608,7 @@ def grib_grib2_read_aea():
 # Test reading GRIB2 Lambert Azimuthal Equal Area grid
 
 
-def grib_grib2_read_laea():
+def test_grib_grib2_read_laea():
 
     if gdaltest.grib_drv is None:
         return 'skip'
@@ -638,7 +638,7 @@ def grib_grib2_read_laea():
 # Test reading GRIB2 with Grid point data - IEEE Floating Point Data (template 5.4)
 
 
-def grib_grib2_read_template_5_4_grid_point_ieee_floating_point():
+def test_grib_grib2_read_template_5_4_grid_point_ieee_floating_point():
 
     if gdaltest.grib_drv is None:
         return 'skip'
@@ -663,7 +663,7 @@ def grib_grib2_read_template_5_4_grid_point_ieee_floating_point():
 # Test reading GRIB2 with NBITS=0 and DECIMAL_SCALE !=0
 
 
-def grib_grib2_read_section_5_nbits_zero_decimal_scaled():
+def test_grib_grib2_read_section_5_nbits_zero_decimal_scaled():
 
     if gdaltest.grib_drv is None:
         return 'skip'
@@ -697,7 +697,7 @@ def grib_grib2_read_section_5_nbits_zero_decimal_scaled():
 # Test reading GRIB2 with complex packing and spatial differencing of order 1
 
 
-def grib_grib2_read_spatial_differencing_order_1():
+def test_grib_grib2_read_spatial_differencing_order_1():
 
     if gdaltest.grib_drv is None:
         return 'skip'
@@ -714,7 +714,7 @@ def grib_grib2_read_spatial_differencing_order_1():
 # Test GRIB2 creation options
 
 
-def grib_grib2_write_creation_options():
+def test_grib_grib2_write_creation_options():
 
     if gdaltest.grib_drv is None:
         return 'skip'
@@ -981,7 +981,7 @@ def grib_grib2_write_creation_options():
 # Test GRIB2 write support for projections
 
 
-def grib_grib2_write_projections():
+def test_grib_grib2_write_projections():
 
     if gdaltest.grib_drv is None:
         return 'skip'
@@ -1147,7 +1147,7 @@ def _grib_read_section(filename, sect_num_to_read):
 # Test GRIB2 write support for data encodings
 
 
-def grib_grib2_write_data_encodings():
+def test_grib_grib2_write_data_encodings():
 
     if gdaltest.grib_drv is None:
         return 'skip'
@@ -1400,7 +1400,7 @@ def grib_grib2_write_data_encodings():
 # Test GRIB2 write support with warnings/errors
 
 
-def grib_grib2_write_data_encodings_warnings_and_errors():
+def test_grib_grib2_write_data_encodings_warnings_and_errors():
 
     if gdaltest.grib_drv is None:
         return 'skip'
@@ -1486,7 +1486,7 @@ def grib_grib2_write_data_encodings_warnings_and_errors():
 # Test writing temperatures with automatic Celsius -> Kelvin conversion
 
 
-def grib_grib2_write_temperatures():
+def test_grib_grib2_write_temperatures():
 
     for (src_type, data_encoding, input_unit) in [
             (gdal.GDT_Float32, 'IEEE_FLOATING_POINT', None),
@@ -1533,7 +1533,7 @@ def grib_grib2_write_temperatures():
 ###############################################################################
 
 
-def grib_grib2_write_nodata():
+def test_grib_grib2_write_nodata():
 
     if gdaltest.grib_drv is None:
         return 'skip'
@@ -1564,7 +1564,7 @@ def grib_grib2_write_nodata():
 # Test GRIB2 file with JPEG2000 codestream on a single line (#6719)
 
 
-def grib_online_grib2_jpeg2000_single_line():
+def test_grib_online_grib2_jpeg2000_single_line():
 
     if gdaltest.grib_drv is None:
         return 'skip'
@@ -1599,38 +1599,38 @@ def grib_online_grib2_jpeg2000_single_line():
 
 
 gdaltest_list = [
-    grib_1,
-    grib_2,
-    grib_read_different_sizes_messages,
-    grib_grib2_read_nodata,
-    grib_read_units,
-    grib_read_geotransform_one_n_or_n_one,
-    grib_read_vsizip,
-    grib_grib2_test_grib_pds_all_bands,
-    grib_grib2_read_template_4_15,
-    grib_grib2_read_png,
-    grib_grib2_read_template_4_32,
-    grib_grib2_read_all_zero_data,
-    grib_grib2_read_rotated_pole_lonlat,
-    grib_grib2_read_template_4_40,
-    grib_grib2_read_template_4_unhandled,
-    grib_grib2_read_transverse_mercator,
-    grib_grib2_read_mercator,
-    grib_grib2_read_mercator_2sp,
-    grib_grib2_read_lcc,
-    grib_grib2_read_polar_stereo,
-    grib_grib2_read_aea,
-    grib_grib2_read_laea,
-    grib_grib2_read_template_5_4_grid_point_ieee_floating_point,
-    grib_grib2_read_section_5_nbits_zero_decimal_scaled,
-    grib_grib2_read_spatial_differencing_order_1,
-    grib_grib2_write_creation_options,
-    grib_grib2_write_projections,
-    grib_grib2_write_data_encodings,
-    grib_grib2_write_data_encodings_warnings_and_errors,
-    grib_grib2_write_temperatures,
-    grib_grib2_write_nodata,
-    grib_online_grib2_jpeg2000_single_line
+    test_grib_1,
+    test_grib_2,
+    test_grib_read_different_sizes_messages,
+    test_grib_grib2_read_nodata,
+    test_grib_read_units,
+    test_grib_read_geotransform_one_n_or_n_one,
+    test_grib_read_vsizip,
+    test_grib_grib2_test_grib_pds_all_bands,
+    test_grib_grib2_read_template_4_15,
+    test_grib_grib2_read_png,
+    test_grib_grib2_read_template_4_32,
+    test_grib_grib2_read_all_zero_data,
+    test_grib_grib2_read_rotated_pole_lonlat,
+    test_grib_grib2_read_template_4_40,
+    test_grib_grib2_read_template_4_unhandled,
+    test_grib_grib2_read_transverse_mercator,
+    test_grib_grib2_read_mercator,
+    test_grib_grib2_read_mercator_2sp,
+    test_grib_grib2_read_lcc,
+    test_grib_grib2_read_polar_stereo,
+    test_grib_grib2_read_aea,
+    test_grib_grib2_read_laea,
+    test_grib_grib2_read_template_5_4_grid_point_ieee_floating_point,
+    test_grib_grib2_read_section_5_nbits_zero_decimal_scaled,
+    test_grib_grib2_read_spatial_differencing_order_1,
+    test_grib_grib2_write_creation_options,
+    test_grib_grib2_write_projections,
+    test_grib_grib2_write_data_encodings,
+    test_grib_grib2_write_data_encodings_warnings_and_errors,
+    test_grib_grib2_write_temperatures,
+    test_grib_grib2_write_nodata,
+    test_grib_online_grib2_jpeg2000_single_line
 ]
 
 if __name__ == '__main__':
diff --git a/autotest/gdrivers/gsc.py b/autotest/gdrivers/gsc.py
index 58bb8e78d267..d49863368799 100755
--- a/autotest/gdrivers/gsc.py
+++ b/autotest/gdrivers/gsc.py
@@ -37,14 +37,14 @@
 # Test a fake - and certainly incorrect - GSC dataset
 
 
-def gsc_1():
+def test_gsc_1():
 
     tst = gdaltest.GDALTest('GSC', 'fakegsc.gsc', 1, 0)
     return tst.testOpen()
 
 
 gdaltest_list = [
-    gsc_1]
+    test_gsc_1]
 
 if __name__ == '__main__':
 
diff --git a/autotest/gdrivers/gsg.py b/autotest/gdrivers/gsg.py
index 1254a43856b6..5f352ffd00f8 100755
--- a/autotest/gdrivers/gsg.py
+++ b/autotest/gdrivers/gsg.py
@@ -37,19 +37,19 @@
 # Perform simple read tests.
 
 
-def gsg_1():
+def test_gsg_1():
 
     tst = gdaltest.GDALTest('gsbg', 'gsg_binary.grd', 1, 4672)
     return tst.testOpen(check_gt=(440720, 60, 0, 3751320, 0, -60))
 
 
-def gsg_2():
+def test_gsg_2():
 
     tst = gdaltest.GDALTest('gsag', 'gsg_ascii.grd', 1, 4672)
     return tst.testOpen(check_gt=(440720, 60, 0, 3751320, 0, -60))
 
 
-def gsg_3():
+def test_gsg_3():
 
     tst = gdaltest.GDALTest('gs7bg', 'gsg_7binary.grd', 1, 4672)
     return tst.testOpen(check_gt=(440720, 60, 0, 3751320, 0, -60))
@@ -58,35 +58,35 @@ def gsg_3():
 # Create simple copy and check.
 
 
-def gsg_4():
+def test_gsg_4():
 
     tst = gdaltest.GDALTest('gsbg', 'gsg_binary.grd', 1, 4672)
 
     return tst.testCreateCopy(check_gt=1)
 
 
-def gsg_5():
+def test_gsg_5():
 
     tst = gdaltest.GDALTest('gsag', 'gsg_ascii.grd', 1, 4672)
 
     return tst.testCreateCopy(check_gt=1)
 
 
-def gsg_6():
+def test_gsg_6():
 
     tst = gdaltest.GDALTest('gsbg', 'gsg_binary.grd', 1, 4672)
 
     return tst.testCreate(out_bands=1)
 
 
-def gsg_7():
+def test_gsg_7():
 
     tst = gdaltest.GDALTest('gs7bg', 'gsg_7binary.grd', 1, 4672)
 
     return tst.testCreate(out_bands=1)
 
 
-def gsg_8():
+def test_gsg_8():
 
     tst = gdaltest.GDALTest('gs7bg', 'gsg_7binary.grd', 1, 4672)
 
@@ -96,14 +96,14 @@ def gsg_8():
 
 
 gdaltest_list = [
-    gsg_1,
-    gsg_2,
-    gsg_3,
-    gsg_4,
-    gsg_5,
-    gsg_6,
-    gsg_7,
-    gsg_8
+    test_gsg_1,
+    test_gsg_2,
+    test_gsg_3,
+    test_gsg_4,
+    test_gsg_5,
+    test_gsg_6,
+    test_gsg_7,
+    test_gsg_8
 ]
 
 
diff --git a/autotest/gdrivers/gta.py b/autotest/gdrivers/gta.py
index 1be1a356d050..ed4eb58a2589 100755
--- a/autotest/gdrivers/gta.py
+++ b/autotest/gdrivers/gta.py
@@ -55,7 +55,7 @@
 # Verify we have the driver.
 
 
-def gta_1():
+def test_gta_1():
 
     gdaltest.gta_drv = gdal.GetDriverByName('GTA')
     if gdaltest.gta_drv is None:
@@ -67,7 +67,7 @@ def gta_1():
 # Test updating existing dataset, check srs, check gt
 
 
-def gta_2():
+def test_gta_2():
 
     if gdaltest.gta_drv is None:
         return 'skip'
@@ -119,7 +119,7 @@ def gta_2():
 # Test writing and readings GCPs
 
 
-def gta_3():
+def test_gta_3():
 
     if gdaltest.gta_drv is None:
         return 'skip'
@@ -159,7 +159,7 @@ def gta_3():
 # Test band metadata
 
 
-def gta_4():
+def test_gta_4():
 
     if gdaltest.gta_drv is None:
         return 'skip'
@@ -233,7 +233,7 @@ def gta_4():
 # Test compression algorithms
 
 
-def gta_5():
+def test_gta_5():
 
     if gdaltest.gta_drv is None:
         return 'skip'
@@ -277,11 +277,11 @@ def test_gta_create(filename, checksum):
 
 
 gdaltest_list = [
-    gta_1,
-    gta_2,
-    gta_3,
-    gta_4,
-    gta_5,
+    test_gta_1,
+    test_gta_2,
+    test_gta_3,
+    test_gta_4,
+    test_gta_5,
 ]
 
 if __name__ == '__main__':
diff --git a/autotest/gdrivers/gtx.py b/autotest/gdrivers/gtx.py
index 620f6db4734a..eaa51597c2bf 100755
--- a/autotest/gdrivers/gtx.py
+++ b/autotest/gdrivers/gtx.py
@@ -37,7 +37,7 @@
 # Test reading a small gtx file.
 
 
-def gtx_1():
+def test_gtx_1():
 
     tst = gdaltest.GDALTest('GTX', 'hydroc1.gtx', 1, 64183)
     gt = (276.725, 0.05, 0.0, 42.775, 0.0, -0.05)
@@ -45,7 +45,7 @@ def gtx_1():
 
 
 gdaltest_list = [
-    gtx_1]
+    test_gtx_1]
 
 if __name__ == '__main__':
 
diff --git a/autotest/gdrivers/gxf.py b/autotest/gdrivers/gxf.py
index 8b970146aaff..b45ff327ded8 100755
--- a/autotest/gdrivers/gxf.py
+++ b/autotest/gdrivers/gxf.py
@@ -42,7 +42,7 @@
 # Test a small GXF sample
 
 
-def gxf_1():
+def test_gxf_1():
 
     tst = gdaltest.GDALTest('GXF', 'small.gxf', 1, 90)
 
@@ -52,7 +52,7 @@ def gxf_1():
 # Test an other GXF sample (with continuous line)
 
 
-def gxf_2():
+def test_gxf_2():
 
     tst = gdaltest.GDALTest('GXF', 'small2.gxf', 1, 65042)
     wkt = """PROJCS["NAD27 / Ohio North",
@@ -96,7 +96,7 @@ def test_gxf(downloadURL, fileName, checksum, download_size):
     assert ds.GetRasterBand(1).Checksum() == checksum, 'Bad checksum. Expected %d, got %d' % (checksum, ds.GetRasterBand(1).Checksum())
 
 
-gdaltest_list = [gxf_1, gxf_2]
+gdaltest_list = [test_gxf_1, test_gxf_2]
 
 
 if __name__ == '__main__':
diff --git a/autotest/gdrivers/hdf5.py b/autotest/gdrivers/hdf5.py
index 0b18b46ac952..756ce5546898 100755
--- a/autotest/gdrivers/hdf5.py
+++ b/autotest/gdrivers/hdf5.py
@@ -62,7 +62,7 @@ def check_no_file_leaks():
 # Confirm expected subdataset information.
 
 
-def hdf5_2():
+def test_hdf5_2():
     ds = gdal.Open('data/groups.h5')
 
     sds_list = ds.GetMetadata('SUBDATASETS')
@@ -91,7 +91,7 @@ def hdf5_2():
 # subdataset stuff.
 
 
-def hdf5_3():
+def test_hdf5_3():
 
     ds = gdal.Open('HDF5:"data/u8be.h5"://TestArray')
 
@@ -112,7 +112,7 @@ def hdf5_3():
 # Confirm subdataset access, and checksum.
 
 
-def hdf5_4():
+def test_hdf5_4():
 
     ds = gdal.Open('HDF5:"data/u8be.h5"://TestArray')
 
@@ -127,7 +127,7 @@ def hdf5_4():
 # Similar check on a 16bit dataset.
 
 
-def hdf5_5():
+def test_hdf5_5():
 
     ds = gdal.Open('HDF5:"data/groups.h5"://MyGroup/dset1')
 
@@ -142,7 +142,7 @@ def hdf5_5():
 # Test generating an overview on a subdataset.
 
 
-def hdf5_6():
+def test_hdf5_6():
 
     shutil.copyfile('data/groups.h5', 'tmp/groups.h5')
 
@@ -181,7 +181,7 @@ def hdf5_6():
 # Coarse metadata check (regression test for #2412).
 
 
-def hdf5_7():
+def test_hdf5_7():
 
     ds = gdal.Open('data/metadata.h5')
     metadata = ds.GetMetadata()
@@ -209,7 +209,7 @@ def hdf5_7():
 # Test metadata names.
 
 
-def hdf5_8():
+def test_hdf5_8():
 
     ds = gdal.Open('data/metadata.h5')
     metadata = ds.GetMetadata()
@@ -273,7 +273,7 @@ def scanMetadata(parts):
 # Variable length string metadata check (regression test for #4228).
 
 
-def hdf5_9():
+def test_hdf5_9():
 
     if int(gdal.VersionInfo('VERSION_NUM')) < 1900:
         gdaltest.post_reason('would crash')
@@ -318,7 +318,7 @@ def hdf5_9():
 # Test CSK_DGM.h5 (#4160)
 
 
-def hdf5_10():
+def test_hdf5_10():
 
     # Try opening the QLK subdataset to check that no error is generated
     gdal.ErrorReset()
@@ -356,7 +356,7 @@ def hdf5_10():
 # Test CSK_GEC.h5 (#4160)
 
 
-def hdf5_11():
+def test_hdf5_11():
 
     # Try opening the QLK subdataset to check that no error is generated
     gdal.ErrorReset()
@@ -393,7 +393,7 @@ def hdf5_11():
 # Test ODIM_H5 (#5032)
 
 
-def hdf5_12():
+def test_hdf5_12():
 
     if not gdaltest.download_file('http://trac.osgeo.org/gdal/raw-attachment/ticket/5032/norsa.ss.ppi-00.5-dbz.aeqd-1000.20070601T000039Z.hdf', 'norsa.ss.ppi-00.5-dbz.aeqd-1000.20070601T000039Z.hdf'):
         return 'skip'
@@ -422,7 +422,7 @@ def hdf5_12():
 # Test MODIS L2 HDF5 GCPs (#6666)
 
 
-def hdf5_13():
+def test_hdf5_13():
 
     if not gdaltest.download_file('http://oceandata.sci.gsfc.nasa.gov/cgi/getfile/A2016273115000.L2_LAC_OC.nc', 'A2016273115000.L2_LAC_OC.nc'):
         return 'skip'
@@ -446,7 +446,7 @@ def hdf5_13():
 # Test complex data subsets
 
 
-def hdf5_14():
+def test_hdf5_14():
 
     ds = gdal.Open('data/complex.h5')
     sds_list = ds.GetMetadata('SUBDATASETS')
@@ -476,7 +476,7 @@ def hdf5_14():
 # Start with Float32
 
 
-def hdf5_15():
+def test_hdf5_15():
 
     ds = gdal.Open('HDF5:"data/complex.h5"://f32')
 
@@ -490,7 +490,7 @@ def hdf5_15():
 # Repeat for Float64
 
 
-def hdf5_16():
+def test_hdf5_16():
 
     ds = gdal.Open('HDF5:"data/complex.h5"://f64')
 
@@ -504,7 +504,7 @@ def hdf5_16():
 # Repeat for Float16
 
 
-def hdf5_17():
+def test_hdf5_17():
 
     ds = gdal.Open('HDF5:"data/complex.h5"://f16')
 
@@ -516,7 +516,7 @@ def hdf5_17():
     return 'success'
 
 
-def hdf5_single_char_varname():
+def test_hdf5_single_char_varname():
 
     ds = gdal.Open('HDF5:"data/single_char_varname.h5"://e')
     if ds is None:
@@ -525,7 +525,7 @@ def hdf5_single_char_varname():
     return 'success'
 
 
-def hdf5_virtual_file():
+def test_hdf5_virtual_file():
     hdf5_files = [
         'CSK_GEC.h5',
         'vlstr_metadata.h5',
@@ -569,24 +569,24 @@ def test_hdf5(downloadURL, fileName, subdatasetname, checksum, download_size):
 
 
 gdaltest_list = [
-    hdf5_2,
-    hdf5_3,
-    hdf5_4,
-    hdf5_5,
-    hdf5_6,
-    hdf5_7,
-    hdf5_8,
-    hdf5_9,
-    hdf5_10,
-    hdf5_11,
-    hdf5_12,
-    hdf5_13,
-    hdf5_14,
-    hdf5_15,
-    hdf5_16,
-    hdf5_17,
-    hdf5_single_char_varname,
-    hdf5_virtual_file,
+    test_hdf5_2,
+    test_hdf5_3,
+    test_hdf5_4,
+    test_hdf5_5,
+    test_hdf5_6,
+    test_hdf5_7,
+    test_hdf5_8,
+    test_hdf5_9,
+    test_hdf5_10,
+    test_hdf5_11,
+    test_hdf5_12,
+    test_hdf5_13,
+    test_hdf5_14,
+    test_hdf5_15,
+    test_hdf5_16,
+    test_hdf5_17,
+    test_hdf5_single_char_varname,
+    test_hdf5_virtual_file,
 ]
 
 
diff --git a/autotest/gdrivers/hf2.py b/autotest/gdrivers/hf2.py
index a899006089ac..12b96b6996f9 100755
--- a/autotest/gdrivers/hf2.py
+++ b/autotest/gdrivers/hf2.py
@@ -38,7 +38,7 @@
 # Test CreateCopy() of byte.tif
 
 
-def hf2_1():
+def test_hf2_1():
 
     tst = gdaltest.GDALTest('HF2', 'byte.tif', 1, 4672)
     return tst.testCreateCopy(vsimem=1, check_gt=(-67.00041667, 0.00083333, 0.0, 50.000416667, 0.0, -0.00083333))
@@ -47,7 +47,7 @@ def hf2_1():
 # Test CreateCopy() of byte.tif with options
 
 
-def hf2_2():
+def test_hf2_2():
 
     tst = gdaltest.GDALTest('HF2', 'byte.tif', 1, 4672, options=['COMPRESS=YES', 'BLOCKSIZE=10'])
     ret = tst.testCreateCopy(new_filename='tmp/hf2_2.hfz')
@@ -61,7 +61,7 @@ def hf2_2():
 # Test CreateCopy() of float.img
 
 
-def hf2_3():
+def test_hf2_3():
 
     tst = gdaltest.GDALTest('HF2', 'float.img', 1, 23529)
     return tst.testCreateCopy(check_minmax=0)
@@ -70,7 +70,7 @@ def hf2_3():
 # Test CreateCopy() of n43.dt0
 
 
-def hf2_4():
+def test_hf2_4():
 
     tst = gdaltest.GDALTest('HF2', 'n43.dt0', 1, 49187)
     return tst.testCreateCopy()
@@ -79,17 +79,17 @@ def hf2_4():
 # Cleanup
 
 
-def hf2_cleanup():
+def test_hf2_cleanup():
 
     return 'success'
 
 
 gdaltest_list = [
-    hf2_1,
-    hf2_2,
-    hf2_3,
-    hf2_4,
-    hf2_cleanup]
+    test_hf2_1,
+    test_hf2_2,
+    test_hf2_3,
+    test_hf2_4,
+    test_hf2_cleanup]
 
 if __name__ == '__main__':
 
diff --git a/autotest/gdrivers/hfa.py b/autotest/gdrivers/hfa.py
index 7df7b3f43760..224a34f7b92c 100755
--- a/autotest/gdrivers/hfa.py
+++ b/autotest/gdrivers/hfa.py
@@ -41,7 +41,7 @@
 # Verify we can read the special histogram metadata from a provided image.
 
 
-def hfa_histread():
+def test_hfa_histread():
 
     ds = gdal.Open('../gcore/data/utmsmall.img')
     md = ds.GetRasterBand(1).GetMetadata()
@@ -82,7 +82,7 @@ def hfa_histread():
 # info is preserved.
 
 
-def hfa_histwrite():
+def test_hfa_histwrite():
 
     drv = gdal.GetDriverByName('HFA')
     ds_src = gdal.Open('../gcore/data/utmsmall.img')
@@ -124,7 +124,7 @@ def hfa_histwrite():
 # histogram information, the new histogram can then be read back in.
 
 
-def hfa_histrewrite():
+def test_hfa_histrewrite():
 
     drv = gdal.GetDriverByName('HFA')
     ds_src = gdal.Open('../gcore/data/utmsmall.img')
@@ -165,7 +165,7 @@ def hfa_histrewrite():
 # Verify we can read metadata of int.img.
 
 
-def hfa_int_stats_1():
+def test_hfa_int_stats_1():
 
     ds = gdal.Open('data/int.img')
     md = ds.GetRasterBand(1).GetMetadata()
@@ -205,7 +205,7 @@ def hfa_int_stats_1():
 # Verify we can read band statistics of int.img.
 
 
-def hfa_int_stats_2():
+def test_hfa_int_stats_2():
 
     ds = gdal.Open('data/int.img')
     stats = ds.GetRasterBand(1).GetStatistics(False, True)
@@ -235,7 +235,7 @@ def hfa_int_stats_2():
 # Verify we can read metadata of float.img.
 
 
-def hfa_float_stats_1():
+def test_hfa_float_stats_1():
 
     ds = gdal.Open('data/float.img')
     md = ds.GetRasterBand(1).GetMetadata()
@@ -283,7 +283,7 @@ def hfa_float_stats_1():
 # Verify we can read band statistics of float.img.
 
 
-def hfa_float_stats_2():
+def test_hfa_float_stats_2():
 
     ds = gdal.Open('data/float.img')
     stats = ds.GetRasterBand(1).GetStatistics(False, True)
@@ -313,7 +313,7 @@ def hfa_float_stats_2():
 # Verify we can read image data.
 
 
-def hfa_int_read():
+def test_hfa_int_read():
 
     ds = gdal.Open('data/int.img')
     band = ds.GetRasterBand(1)
@@ -331,7 +331,7 @@ def hfa_int_read():
 # Verify we can read image data.
 
 
-def hfa_float_read():
+def test_hfa_float_read():
 
     ds = gdal.Open('data/float.img')
     band = ds.GetRasterBand(1)
@@ -357,7 +357,7 @@ def hfa_float_read():
 # verify we can read PE_STRING coordinate system.
 
 
-def hfa_pe_read():
+def test_hfa_pe_read():
 
     ds = gdal.Open('data/87test.img')
     wkt = ds.GetProjectionRef()
@@ -374,7 +374,7 @@ def hfa_pe_read():
 # Verify we can write PE_STRING nodes.
 
 
-def hfa_pe_write():
+def test_hfa_pe_write():
 
     drv = gdal.GetDriverByName('HFA')
     ds_src = gdal.Open('data/87test.img')
@@ -402,7 +402,7 @@ def hfa_pe_write():
 # Verify we can write and read large metadata items.
 
 
-def hfa_metadata_1():
+def test_hfa_metadata_1():
 
     drv = gdal.GetDriverByName('HFA')
     ds = drv.Create('tmp/md_1.img', 100, 150, 1, gdal.GDT_Byte)
@@ -428,7 +428,7 @@ def hfa_metadata_1():
 # nodes.
 
 
-def hfa_metadata_2():
+def test_hfa_metadata_2():
 
     ds = gdal.Open('tmp/md_1.img', gdal.GA_Update)
     md = ds.GetRasterBand(1).GetMetadata()
@@ -458,7 +458,7 @@ def hfa_metadata_2():
 # moving the HFAEntry to the end of the file.  (bug #1109)
 
 
-def hfa_grow_rrdlist():
+def test_hfa_grow_rrdlist():
 
     import shutil
 
@@ -490,7 +490,7 @@ def hfa_grow_rrdlist():
 # Make sure an old .ige file is deleted when creating a new dataset. (#1784)
 
 
-def hfa_clean_ige():
+def test_hfa_clean_ige():
 
     # Create an imagine file, forcing creation of an .ige file.
 
@@ -542,7 +542,7 @@ def hfa_clean_ige():
 # Verify that we can read this corrupt .aux file without hanging (#1907)
 
 
-def hfa_corrupt_aux():
+def test_hfa_corrupt_aux():
 
     # NOTE: we depend on being able to open .aux files as a weak sort of
     # dataset.
@@ -568,7 +568,7 @@ def hfa_corrupt_aux():
 # support MapInformation for units (#1967)
 
 
-def hfa_mapinformation_units():
+def test_hfa_mapinformation_units():
 
     # NOTE: we depend on being able to open .aux files as a weak sort of
     # dataset.
@@ -588,7 +588,7 @@ def hfa_mapinformation_units():
 # Write nodata value.
 
 
-def hfa_nodata_write():
+def test_hfa_nodata_write():
 
     drv = gdal.GetDriverByName('HFA')
     ds = drv.Create('tmp/nodata.img', 7, 7, 1, gdal.GDT_Byte)
@@ -611,7 +611,7 @@ def hfa_nodata_write():
 # Verify written nodata value.
 
 
-def hfa_nodata_read():
+def test_hfa_nodata_read():
 
     ds = gdal.Open('tmp/nodata.img')
     b = ds.GetRasterBand(1)
@@ -651,7 +651,7 @@ def hfa_nodata_read():
 # Verify we read simple affine geotransforms properly.
 
 
-def hfa_rotated_read():
+def test_hfa_rotated_read():
 
     ds = gdal.Open('data/fg118-91.aux')
 
@@ -676,7 +676,7 @@ def hfa_rotated_read():
 # Verify we can write affine geotransforms.
 
 
-def hfa_rotated_write():
+def test_hfa_rotated_write():
 
     # make sure we aren't preserving info in .aux.xml file
     try:
@@ -747,7 +747,7 @@ def hfa_rotated_write():
 ###############################################################################
 # Test creating an in memory copy.
 
-def hfa_vsimem():
+def test_hfa_vsimem():
 
     tst = gdaltest.GDALTest('HFA', 'byte.tif', 1, 4672)
 
@@ -758,7 +758,7 @@ def hfa_vsimem():
 # the .img file.  (#2422)
 
 
-def hfa_proName():
+def test_hfa_proName():
 
     drv = gdal.GetDriverByName('HFA')
     src_ds = gdal.Open('data/stateplane.vrt')
@@ -793,7 +793,7 @@ def hfa_proName():
 ###############################################################################
 # Read a compressed file where no block has been written (#2523)
 
-def hfa_read_empty_compressed():
+def test_hfa_read_empty_compressed():
 
     drv = gdal.GetDriverByName('HFA')
     ds = drv.Create('tmp/emptycompressed.img', 64, 64, 1, options=['COMPRESSED=YES'])
@@ -815,7 +815,7 @@ def hfa_read_empty_compressed():
 # Verify "unique values" based color table (#2419)
 
 
-def hfa_unique_values_color_table():
+def test_hfa_unique_values_color_table():
 
     ds = gdal.Open('data/i8u_c_i.img')
 
@@ -846,7 +846,7 @@ def hfa_unique_values_color_table():
 # Verify "unique values" based histogram.
 
 
-def hfa_unique_values_hist():
+def test_hfa_unique_values_hist():
 
     try:
         gdal.RasterAttributeTable()
@@ -897,7 +897,7 @@ def hfa_unique_values_hist():
 # Verify reading of 3rd order XFORM polynomials.
 
 
-def hfa_xforms_3rd():
+def test_hfa_xforms_3rd():
 
     ds = gdal.Open('data/42BW_420730_VT2.aux')
 
@@ -954,7 +954,7 @@ def hfa_xforms_3rd():
 # Verify that we can clear an existing color table
 
 
-def hfa_delete_colortable():
+def test_hfa_delete_colortable():
     # copy a file to tmp dir to modify.
     open('tmp/i8u.img', 'wb').write(open('data/i8u_c_i.img', 'rb').read())
 
@@ -990,7 +990,7 @@ def hfa_delete_colortable():
 # Verify that we can clear an existing color table (#2842)
 
 
-def hfa_delete_colortable2():
+def test_hfa_delete_colortable2():
 
     # copy a file to tmp dir to modify.
     src_ds = gdal.Open('../gcore/data/8bit_pal.bmp')
@@ -1030,7 +1030,7 @@ def hfa_delete_colortable2():
 # Verify we can read the special histogram metadata from a provided image.
 
 
-def hfa_excluded_values():
+def test_hfa_excluded_values():
 
     ds = gdal.Open('data/dem10.img')
     md = ds.GetRasterBand(1).GetMetadata()
@@ -1046,7 +1046,7 @@ def hfa_excluded_values():
 # verify that we propagate nodata to overviews in .img/.rrd format.
 
 
-def hfa_ov_nodata():
+def test_hfa_ov_nodata():
 
     drv = gdal.GetDriverByName('HFA')
     src_ds = gdal.Open('data/nodata_int.asc')
@@ -1088,7 +1088,7 @@ def hfa_ov_nodata():
 # Confirm that we can read 8bit grayscale overviews for 1bit images.
 
 
-def hfa_read_bit2grayscale():
+def test_hfa_read_bit2grayscale():
 
     ds = gdal.Open('data/small1bit.img')
     band = ds.GetRasterBand(1)
@@ -1110,7 +1110,7 @@ def hfa_read_bit2grayscale():
 # the bit2grayscale algorithm (#2914)
 
 
-def hfa_write_bit2grayscale():
+def test_hfa_write_bit2grayscale():
 
     import shutil
 
@@ -1151,7 +1151,7 @@ def hfa_write_bit2grayscale():
 # Verify handling of camera model metadata (#2675)
 
 
-def hfa_camera_md():
+def test_hfa_camera_md():
 
     ds = gdal.Open('/vsisparse/data/251_sparse.xml')
 
@@ -1205,7 +1205,7 @@ def hfa_verify_dataset_projection(dataset_path, exp_wkt):
 # Verify can read Transverse Mercator (South Orientated) projections
 
 
-def hfa_read_tmso_projection():
+def test_hfa_read_tmso_projection():
     exp_wkt = 'PROJCS["Transverse Mercator (South Orientated)",GEOGCS["Cape-1",DATUM["Cape-1",SPHEROID["Clarke 1880 Arc",6378249.145,293.4663077168331],TOWGS84[-136,-108,-292,0,0,0,0]],PRIMEM["Greenwich",0],UNIT["degree",0.0174532925199433]],PROJECTION["Transverse_Mercator_South_Orientated"],PARAMETER["latitude_of_origin",0],PARAMETER["central_meridian",21],PARAMETER["scale_factor",1],PARAMETER["false_easting",0],PARAMETER["false_northing",0],UNIT["meters",1]]'
     return hfa_verify_dataset_projection('../gcore/data/22281.aux', exp_wkt)
 
@@ -1213,7 +1213,7 @@ def hfa_read_tmso_projection():
 # Verify can write Transverse Mercator (South Orientated) projections to aux files
 
 
-def hfa_write_tmso_projection():
+def test_hfa_write_tmso_projection():
     dataset_path = 'tmp/tmso.img'
     out_ds = gdal.GetDriverByName('HFA').Create(dataset_path, 1, 1)
     gt = (0, 1, 0, 0, 0, 1)
@@ -1229,7 +1229,7 @@ def hfa_write_tmso_projection():
 # Verify can read Hotine Oblique Mercator (Variant A) projections
 
 
-def hfa_read_homva_projection():
+def test_hfa_read_homva_projection():
     exp_wkt = 'PROJCS["Hotine Oblique Mercator (Variant A)",GEOGCS["GDM 2000",DATUM["GDM 2000",SPHEROID["GRS 1980",6378137,298.2572220960422],TOWGS84[0,0,0,0,0,0,0]],PRIMEM["Greenwich",0],UNIT["degree",0.0174532925199433]],PROJECTION["Hotine_Oblique_Mercator"],PARAMETER["latitude_of_center",4],PARAMETER["longitude_of_center",115],PARAMETER["azimuth",53.31580995],PARAMETER["rectified_grid_angle",53.13010236111111],PARAMETER["scale_factor",0.99984],PARAMETER["false_easting",0],PARAMETER["false_northing",0],UNIT["meters",1]]'
     return hfa_verify_dataset_projection('../gcore/data/3376.tif', exp_wkt)
 
@@ -1237,7 +1237,7 @@ def hfa_read_homva_projection():
 # Verify can write Transverse Mercator (South Orientated) projections to aux files
 
 
-def hfa_write_homva_projection():
+def test_hfa_write_homva_projection():
     dataset_path = 'tmp/homva.img'
     out_ds = gdal.GetDriverByName('HFA').Create(dataset_path, 1, 1)
     gt = (0, 1, 0, 0, 0, 1)
@@ -1254,7 +1254,7 @@ def hfa_write_homva_projection():
 # and fetching actual overviews.
 
 
-def hfa_rde_overviews():
+def test_hfa_rde_overviews():
 
     # Create an imagine file, forcing creation of an .ige file.
 
@@ -1293,7 +1293,7 @@ def hfa_rde_overviews():
 # in the .img and .rrd seem to be updated properly.
 
 
-def hfa_copyfiles():
+def test_hfa_copyfiles():
 
     drv = gdal.GetDriverByName('HFA')
     drv.CopyFiles('tmp/newnamexxx_after_copy.img', 'data/spill.img')
@@ -1349,7 +1349,7 @@ def hfa_copyfiles():
 ###############################################################################
 # Test the ability to write a RAT (#999)
 
-def hfa_write_rat():
+def test_hfa_write_rat():
 
     drv = gdal.GetDriverByName('HFA')
 
@@ -1399,7 +1399,7 @@ def hfa_write_rat():
 # Test STATISTICS creation option
 
 
-def hfa_createcopy_statistics():
+def test_hfa_createcopy_statistics():
 
     tmpAuxXml = '../gcore/data/byte.tif.aux.xml'
     try:
@@ -1432,7 +1432,7 @@ def hfa_createcopy_statistics():
 # Test GetUnitType()
 
 
-def hfa_read_elevation_units():
+def test_hfa_read_elevation_units():
 
     ds = gdal.Open('../gcore/data/erdas_cm.img')
     unittype = ds.GetRasterBand(1).GetUnitType()
@@ -1465,49 +1465,49 @@ def hfa_read_elevation_units():
 
 
 gdaltest_list = [
-    hfa_histread,
-    hfa_histwrite,
-    hfa_histrewrite,
-    hfa_int_stats_1,
-    hfa_int_stats_2,
-    hfa_float_stats_1,
-    hfa_float_stats_2,
-    hfa_int_read,
-    hfa_float_read,
-    hfa_pe_read,
-    hfa_pe_write,
-    hfa_metadata_1,
-    hfa_metadata_2,
-    hfa_grow_rrdlist,
-    hfa_clean_ige,
-    hfa_corrupt_aux,
-    hfa_mapinformation_units,
-    hfa_nodata_write,
-    hfa_nodata_read,
-    hfa_rotated_read,
-    hfa_rotated_write,
-    hfa_vsimem,
-    hfa_proName,
-    hfa_read_empty_compressed,
-    hfa_unique_values_color_table,
-    hfa_unique_values_hist,
-    hfa_xforms_3rd,
-    hfa_delete_colortable,
-    hfa_delete_colortable2,
-    hfa_excluded_values,
-    hfa_ov_nodata,
-    hfa_read_bit2grayscale,
-    hfa_write_bit2grayscale,
-    hfa_camera_md,
-    hfa_rde_overviews,
-    hfa_copyfiles,
-    hfa_write_rat,
-    hfa_createcopy_statistics,
-    hfa_read_tmso_projection,
-    hfa_read_homva_projection,
-    hfa_write_tmso_projection,
-    hfa_write_homva_projection,
-    hfa_read_elevation_units]
+    test_hfa_histread,
+    test_hfa_histwrite,
+    test_hfa_histrewrite,
+    test_hfa_int_stats_1,
+    test_hfa_int_stats_2,
+    test_hfa_float_stats_1,
+    test_hfa_float_stats_2,
+    test_hfa_int_read,
+    test_hfa_float_read,
+    test_hfa_pe_read,
+    test_hfa_pe_write,
+    test_hfa_metadata_1,
+    test_hfa_metadata_2,
+    test_hfa_grow_rrdlist,
+    test_hfa_clean_ige,
+    test_hfa_corrupt_aux,
+    test_hfa_mapinformation_units,
+    test_hfa_nodata_write,
+    test_hfa_nodata_read,
+    test_hfa_rotated_read,
+    test_hfa_rotated_write,
+    test_hfa_vsimem,
+    test_hfa_proName,
+    test_hfa_read_empty_compressed,
+    test_hfa_unique_values_color_table,
+    test_hfa_unique_values_hist,
+    test_hfa_xforms_3rd,
+    test_hfa_delete_colortable,
+    test_hfa_delete_colortable2,
+    test_hfa_excluded_values,
+    test_hfa_ov_nodata,
+    test_hfa_read_bit2grayscale,
+    test_hfa_write_bit2grayscale,
+    test_hfa_camera_md,
+    test_hfa_rde_overviews,
+    test_hfa_copyfiles,
+    test_hfa_write_rat,
+    test_hfa_createcopy_statistics,
+    test_hfa_read_tmso_projection,
+    test_hfa_read_homva_projection,
+    test_hfa_write_tmso_projection,
+    test_hfa_write_homva_projection,
+    test_hfa_read_elevation_units]
 
 if __name__ == '__main__':
 
diff --git a/autotest/gdrivers/ida.py b/autotest/gdrivers/ida.py
index f6c5125fc1f0..05eb52281cef 100755
--- a/autotest/gdrivers/ida.py
+++ b/autotest/gdrivers/ida.py
@@ -38,7 +38,7 @@
 # Perform simple read test.
 
 
-def ida_1():
+def test_ida_1():
 
     tst = gdaltest.GDALTest('ida', 'DWI01012.AFC', 1, 4026)
     return tst.testOpen()
@@ -47,7 +47,7 @@ def ida_1():
 # Verify some auxiliary data.
 
 
-def ida_2():
+def test_ida_2():
 
     ds = gdal.Open('data/DWI01012.AFC')
 
@@ -79,7 +79,7 @@ def ida_2():
 # Create simple copy and check.
 
 
-def ida_3():
+def test_ida_3():
 
     tst = gdaltest.GDALTest('ida', 'DWI01012.AFC', 1, 4026)
 
@@ -91,7 +91,7 @@ def ida_3():
 # Test ACEA Projection.
 
 
-def ida_4():
+def test_ida_4():
 
     gdaltest.ida_tst = gdaltest.GDALTest('ida', 'DWI01012.AFC', 1, 4026)
 
@@ -115,7 +115,7 @@ def ida_4():
 # Test Goodes Projection.
 
 
-def ida_5():
+def test_ida_5():
 
     gdaltest.ida_tst = gdaltest.GDALTest('ida', 'DWI01012.AFC', 1, 4026)
 
@@ -136,7 +136,7 @@ def ida_5():
 # Test LCC Projection.
 
 
-def ida_6():
+def test_ida_6():
 
     gdaltest.ida_tst = gdaltest.GDALTest('ida', 'DWI01012.AFC', 1, 4026)
 
@@ -160,7 +160,7 @@ def ida_6():
 # Test LAEA Projection.
 
 
-def ida_7():
+def test_ida_7():
 
     gdaltest.ida_tst = gdaltest.GDALTest('ida', 'DWI01012.AFC', 1, 4026)
 
@@ -180,13 +180,13 @@ def ida_7():
 
 
 gdaltest_list = [
-    ida_1,
-    ida_2,
-    ida_3,
-    ida_4,
-    ida_5,
-    ida_6,
-    ida_7
+    test_ida_1,
+    test_ida_2,
+    test_ida_3,
+    test_ida_4,
+    test_ida_5,
+    test_ida_6,
+    test_ida_7
 ]
 
 
diff --git a/autotest/gdrivers/idrisi.py b/autotest/gdrivers/idrisi.py
index 4f8a7795f3a9..83f929fed1cc 100755
--- a/autotest/gdrivers/idrisi.py
+++ b/autotest/gdrivers/idrisi.py
@@ -39,7 +39,7 @@
 # Read test of byte file.
 
 
-def idrisi_1():
+def test_idrisi_1():
 
     tst = gdaltest.GDALTest('RST', 'byte.rst', 1, 5044)
     return tst.testOpen()
@@ -48,7 +48,7 @@ def idrisi_1():
 # Read test of byte file.
 
 
-def idrisi_2():
+def test_idrisi_2():
 
     tst = gdaltest.GDALTest('RST', 'real.rst', 1, 5275)
     return tst.testOpen()
@@ -57,7 +57,7 @@ def idrisi_2():
 #
 
 
-def idrisi_3():
+def test_idrisi_3():
 
     tst = gdaltest.GDALTest('RST', 'float32.bil', 1, 27)
 
@@ -67,7 +67,7 @@ def idrisi_3():
 #
 
 
-def idrisi_4():
+def test_idrisi_4():
 
     tst = gdaltest.GDALTest('RST', 'rgbsmall.tif', 2, 21053)
 
@@ -78,7 +78,7 @@ def idrisi_4():
 # Cleanup.
 
 
-def idrisi_cleanup():
+def test_idrisi_cleanup():
     gdaltest.clean_tmp()
     try:
         os.unlink('data/rgbsmall.tif.aux.xml')
@@ -92,11 +92,11 @@ def idrisi_cleanup():
 
 
 gdaltest_list = [
-    idrisi_1,
-    idrisi_2,
-    idrisi_3,
-    idrisi_4,
-    idrisi_cleanup]
+    test_idrisi_1,
+    test_idrisi_2,
+    test_idrisi_3,
+    test_idrisi_4,
+    test_idrisi_cleanup]
 
 if __name__ == '__main__':
 
diff --git a/autotest/gdrivers/ignfheightasciigrid.py b/autotest/gdrivers/ignfheightasciigrid.py
index e2596b4b7db9..afe0b67d31b8 100755
--- a/autotest/gdrivers/ignfheightasciigrid.py
+++ b/autotest/gdrivers/ignfheightasciigrid.py
@@ -36,7 +36,7 @@
 import gdaltest
 
 
-def ignfheightasciigrid_1():
+def test_ignfheightasciigrid_1():
 
     tst = gdaltest.GDALTest('IGNFHeightASCIIGrid',
                             'ignfheightasciigrid_ar1.mnt', 1, 21)
@@ -44,7 +44,7 @@ def ignfheightasciigrid_1():
     return tst.testOpen(check_gt=gt, check_prj='WGS84')
 
 
-def ignfheightasciigrid_2():
+def test_ignfheightasciigrid_2():
 
     tst = gdaltest.GDALTest('IGNFHeightASCIIGrid',
                             'ignfheightasciigrid_ar2.mnt', 1, 21)
@@ -52,7 +52,7 @@ def ignfheightasciigrid_2():
     return tst.testOpen(check_gt=gt, check_prj='WGS84')
 
 
-def ignfheightasciigrid_3():
+def test_ignfheightasciigrid_3():
 
     tst = gdaltest.GDALTest('IGNFHeightASCIIGrid',
                             'ignfheightasciigrid_ar3.mnt', 1, 21)
@@ -60,7 +60,7 @@ def ignfheightasciigrid_3():
     return tst.testOpen(check_gt=gt, check_prj='WGS84')
 
 
-def ignfheightasciigrid_4():
+def test_ignfheightasciigrid_4():
 
     tst = gdaltest.GDALTest('IGNFHeightASCIIGrid',
                             'ignfheightasciigrid_ar4.mnt', 1, 21)
@@ -68,7 +68,7 @@ def ignfheightasciigrid_4():
     return tst.testOpen(check_gt=gt, check_prj='WGS84')
 
 
-def ignfheightasciigrid_5():
+def test_ignfheightasciigrid_5():
 
     tst = gdaltest.GDALTest('IGNFHeightASCIIGrid',
                             'ignfheightasciigrid_ar1_nocoords.mnt', 1, 21)
@@ -76,7 +76,7 @@ def ignfheightasciigrid_5():
     return tst.testOpen(check_gt=gt, check_prj='WGS84')
 
 
-def ignfheightasciigrid_6():
+def test_ignfheightasciigrid_6():
 
     tst = gdaltest.GDALTest(
         'IGNFHeightASCIIGrid', 'ignfheightasciigrid_ar1_nocoords_noprec.mnt', 1, 21)
@@ -84,7 +84,7 @@ def ignfheightasciigrid_6():
     return tst.testOpen(check_gt=gt, check_prj='WGS84')
 
 
-def ignfheightasciigrid_7():
+def test_ignfheightasciigrid_7():
 
     tst = gdaltest.GDALTest(
         'IGNFHeightASCIIGrid', 'ignfheightasciigrid_ar1_noprec.mnt', 1, 21)
@@ -92,7 +92,7 @@ def ignfheightasciigrid_7():
     return tst.testOpen(check_gt=gt, check_prj='WGS84')
 
 
-def ignfheightasciigrid_description_multiword():
+def test_ignfheightasciigrid_description_multiword():
 
     filename = '/vsimem/ignfheightasciigrid_invalid'
     ok_content = '2 3 49 50 1 1 1 0 1 0 -0. MULTI WORD\r1 2 3 4'
@@ -105,7 +105,7 @@ def ignfheightasciigrid_description_multiword():
     return 'success'
 
 
-def ignfheightasciigrid_invalid():
+def test_ignfheightasciigrid_invalid():
 
     filename = '/vsimem/ignfheightasciigrid_invalid'
     ok_content = '2 3 49 50 1 1 1 0 1 0 -0. DESC\r1 2 3 4'
@@ -158,7 +158,7 @@ def ignfheightasciigrid_invalid():
     return 'success'
 
 
-def ignfheightasciigrid_huge():
+def test_ignfheightasciigrid_huge():
 
     filename = '/vsimem/ignfheightasciigrid_huge'
     ok_content = '2 3 49 50 1 1 1 0 1 0 -0. MULTI WORD\r1 2 3 4'
@@ -176,7 +176,7 @@ def ignfheightasciigrid_huge():
     return 'success'
 
 
-def ignfheightasciigrid_gra():
+def test_ignfheightasciigrid_gra():
 
     tst = gdaltest.GDALTest(
         'IGNFHeightASCIIGrid', 'ignfheightasciigrid.gra', 1, 21)
@@ -191,7 +191,7 @@ def ignfheightasciigrid_gra():
     return 'success'
 
 
-def ignfheightasciigrid_gra_invalid():
+def test_ignfheightasciigrid_gra_invalid():
 
     contents = ['49 50\r\n2\r\n',  # missing values
                 '49 50\r\n2 3\r\n',  # missing line
@@ -213,18 +213,18 @@ def ignfheightasciigrid_gra_invalid():
 
 
 gdaltest_list = [
-    ignfheightasciigrid_1,
-    ignfheightasciigrid_2,
-    ignfheightasciigrid_3,
-    ignfheightasciigrid_4,
-    ignfheightasciigrid_5,
-    ignfheightasciigrid_6,
-    ignfheightasciigrid_7,
-    ignfheightasciigrid_description_multiword,
-    ignfheightasciigrid_invalid,
-    ignfheightasciigrid_huge,
-    ignfheightasciigrid_gra,
-    ignfheightasciigrid_gra_invalid,
+    test_ignfheightasciigrid_1,
+    test_ignfheightasciigrid_2,
+    test_ignfheightasciigrid_3,
+    test_ignfheightasciigrid_4,
+    test_ignfheightasciigrid_5,
+    test_ignfheightasciigrid_6,
+    test_ignfheightasciigrid_7,
+    test_ignfheightasciigrid_description_multiword,
+    test_ignfheightasciigrid_invalid,
+    test_ignfheightasciigrid_huge,
+    test_ignfheightasciigrid_gra,
+    test_ignfheightasciigrid_gra_invalid,
 ]
 
 
diff --git a/autotest/gdrivers/ilwis.py b/autotest/gdrivers/ilwis.py
index 46c40b2b7cab..e0c8c96fedca 100755
--- a/autotest/gdrivers/ilwis.py
+++ b/autotest/gdrivers/ilwis.py
@@ -37,7 +37,7 @@
 # Perform simple read test.
 
 
-def ilwis_1():
+def test_ilwis_1():
 
     tst = gdaltest.GDALTest('ilwis', 'LanduseSmall.mpr', 1, 2351)
 
@@ -69,7 +69,7 @@ def ilwis_1():
 # copy byte data and verify.
 
 
-def ilwis_2():
+def test_ilwis_2():
 
     tst = gdaltest.GDALTest('ilwis', 'byte.tif', 1, 4672)
 
@@ -80,7 +80,7 @@ def ilwis_2():
 # copy floating point data and use Create interface.
 
 
-def ilwis_3():
+def test_ilwis_3():
 
     tst = gdaltest.GDALTest('ilwis', 'float.img', 1, 23529)
 
@@ -90,7 +90,7 @@ def ilwis_3():
 # Try multi band dataset.
 
 
-def ilwis_4():
+def test_ilwis_4():
 
     tst = gdaltest.GDALTest('ilwis', 'rgbsmall.tif', 2, 21053)
 
@@ -101,7 +101,7 @@ def ilwis_4():
 # Test vsi in-memory support.
 
 
-def ilwis_5():
+def test_ilwis_5():
 
     tst = gdaltest.GDALTest('ilwis', 'byte.tif', 1, 4672)
 
@@ -117,18 +117,18 @@ def ilwis_5():
 # properly. So we do the brute force approach...
 
 
-def ilwis_cleanup():
+def test_ilwis_cleanup():
     gdaltest.clean_tmp()
     return 'success'
 
 
 gdaltest_list = [
-    ilwis_1,
-    ilwis_2,
-    ilwis_3,
-    ilwis_4,
-    ilwis_5,
-    ilwis_cleanup]
+    test_ilwis_1,
+    test_ilwis_2,
+    test_ilwis_3,
+    test_ilwis_4,
+    test_ilwis_5,
+    test_ilwis_cleanup]
 
 if __name__ == '__main__':
 
diff --git a/autotest/gdrivers/ingr.py b/autotest/gdrivers/ingr.py
index 787a2eb3f295..5407420332a0 100755
--- a/autotest/gdrivers/ingr.py
+++ b/autotest/gdrivers/ingr.py
@@ -41,7 +41,7 @@
 # Read test of byte file.
 
 
-def ingr_1():
+def test_ingr_1():
 
     tst = gdaltest.GDALTest('INGR', '8bit_rgb.cot', 2, 4855)
     return tst.testOpen()
@@ -50,7 +50,7 @@ def ingr_1():
 # Read uint32 file.
 
 
-def ingr_2():
+def test_ingr_2():
 
     tst = gdaltest.GDALTest('INGR', 'uint32.cot', 1, 4672)
     return tst.testOpen()
@@ -59,7 +59,7 @@ def ingr_2():
 # Test paletted file, including checking the palette (format 02 I think).
 
 
-def ingr_3():
+def test_ingr_3():
 
     tst = gdaltest.GDALTest('INGR', '8bit_pal.cot', 1, 4855)
     result = tst.testOpen()
@@ -78,7 +78,7 @@ def ingr_3():
 # frmt02 is a plain byte format
 
 
-def ingr_4():
+def test_ingr_4():
 
     tst = gdaltest.GDALTest('INGR', 'frmt02.cot', 1, 26968)
     return tst.testOpen()
@@ -87,7 +87,7 @@ def ingr_4():
 # Test creation.
 
 
-def ingr_5():
+def test_ingr_5():
 
     tst = gdaltest.GDALTest('INGR', 'frmt02.cot', 1, 26968)
     return tst.testCreate()
@@ -96,7 +96,7 @@ def ingr_5():
 # Test createcopy.
 
 
-def ingr_6():
+def test_ingr_6():
 
     tst = gdaltest.GDALTest('INGR', 'frmt02.cot', 1, 26968)
     return tst.testCreate()
@@ -105,7 +105,7 @@ def ingr_6():
 # JPEG 8bit
 
 
-def ingr_7():
+def test_ingr_7():
 
     tst = gdaltest.GDALTest('INGR', 'frmt30.cot', 1, 29718)
     return tst.testOpen()
@@ -114,7 +114,7 @@ def ingr_7():
 # Read simple RLE
 
 
-def ingr_8():
+def test_ingr_8():
 
     tst = gdaltest.GDALTest('INGR', 'frmt09.cot', 1, 23035)
     return tst.testOpen()
@@ -123,7 +123,7 @@ def ingr_8():
 # Read Simple RLE Variable
 
 
-def ingr_9():
+def test_ingr_9():
 
     tst = gdaltest.GDALTest('INGR', 'frmt10.cot', 1, 47031)
     return tst.testOpen()
@@ -132,7 +132,7 @@ def ingr_9():
 # CCITT bitonal
 
 
-def ingr_10():
+def test_ingr_10():
 
     tst = gdaltest.GDALTest('INGR', 'frmt24.cit', 1, 23035)
     return tst.testOpen()
@@ -141,7 +141,7 @@ def ingr_10():
 # Adaptive RLE - 24 bit.
 
 
-def ingr_11():
+def test_ingr_11():
 
     tst = gdaltest.GDALTest('INGR', 'frmt27.cot', 2, 45616)
     return tst.testOpen()
@@ -150,7 +150,7 @@ def ingr_11():
 # Uncompressed RGB
 
 
-def ingr_12():
+def test_ingr_12():
 
     tst = gdaltest.GDALTest('INGR', 'frmt28.cot', 2, 45616)
     return tst.testOpen()
@@ -159,7 +159,7 @@ def ingr_12():
 # Adaptive RLE 8bit.
 
 
-def ingr_13():
+def test_ingr_13():
 
     tst = gdaltest.GDALTest('INGR', 'frmt29.cot', 1, 26968)
     return tst.testOpen()
@@ -168,7 +168,7 @@ def ingr_13():
 # JPEG RGB
 
 
-def ingr_14():
+def test_ingr_14():
 
     ds = gdal.Open('data/frmt31.cot')
     cs = ds.GetRasterBand(1).Checksum()
@@ -184,7 +184,7 @@ def ingr_14():
 # Same, but through vsimem all in memory.
 
 
-def ingr_15():
+def test_ingr_15():
 
     tst = gdaltest.GDALTest('INGR', 'frmt02.cot', 1, 26968)
     result = tst.testCreateCopy(vsimem=1)
@@ -200,7 +200,7 @@ def ingr_15():
 # Read simple RLE tiled
 
 
-def ingr_16():
+def test_ingr_16():
 
     tst = gdaltest.GDALTest('INGR', 'frmt09t.cot', 1, 3178)
     return tst.testOpen()
@@ -209,7 +209,7 @@ def ingr_16():
 # Test writing 9 RLE bitonal compression (#5030)
 
 
-def ingr_17():
+def test_ingr_17():
 
     src_ds = gdal.Open('data/frmt09.cot')
     out_ds = gdal.GetDriverByName('INGR').CreateCopy('/vsimem/ingr_17.rle', src_ds)
@@ -235,7 +235,7 @@ def ingr_17():
 # Test 'random access' in simple RLE
 
 
-def ingr_18():
+def test_ingr_18():
 
     ds = gdal.Open('data/frmt09.cot')
     for y in range(ds.RasterYSize):
@@ -263,32 +263,32 @@ def ingr_18():
     return 'success'
 
 
-def ingr_cleanup():
+def test_ingr_cleanup():
 
     gdal.Unlink('data/frmt09.cot.aux.xml')
     return 'success'
 
 
 gdaltest_list = [
-    ingr_1,
-    ingr_2,
-    ingr_3,
-    ingr_4,
-    ingr_5,
-    ingr_6,
-    ingr_7,
-    ingr_8,
-    ingr_9,
-    ingr_10,
-    ingr_11,
-    ingr_12,
-    ingr_13,
-    ingr_14,
-    ingr_15,
-    ingr_16,
-    ingr_17,
-    ingr_18,
-    ingr_cleanup]
+    test_ingr_1,
+    test_ingr_2,
+    test_ingr_3,
+    test_ingr_4,
+    test_ingr_5,
+    test_ingr_6,
+    test_ingr_7,
+    test_ingr_8,
+    test_ingr_9,
+    test_ingr_10,
+    test_ingr_11,
+    test_ingr_12,
+    test_ingr_13,
+    test_ingr_14,
+    test_ingr_15,
+    test_ingr_16,
+    test_ingr_17,
+    test_ingr_18,
+    test_ingr_cleanup]
 
 if __name__ == '__main__':
 
diff --git a/autotest/gdrivers/iris.py b/autotest/gdrivers/iris.py
index 0f24d35adbfd..ffc6647202a5 100755
--- a/autotest/gdrivers/iris.py
+++ b/autotest/gdrivers/iris.py
@@ -39,7 +39,7 @@
 # Test reading a - fake - IRIS dataset
 
 
-def iris_1():
+def test_iris_1():
 
     tst = gdaltest.GDALTest('IRIS', 'fakeiris.dat', 1, 65532)
     return tst.testOpen()
@@ -48,7 +48,7 @@ def iris_1():
 # Test reading a real world IRIS dataset.
 
 
-def iris_2():
+def test_iris_2():
 
     ds = gdal.Open('data/iristest.dat')
     if ds.GetRasterBand(1).Checksum() != 52872:
@@ -121,8 +121,8 @@ def iris_2():
 
 
 gdaltest_list = [
-    iris_1,
-    iris_2]
+    test_iris_1,
+    test_iris_2]
 
 if __name__ == '__main__':
 
diff --git a/autotest/gdrivers/isce.py b/autotest/gdrivers/isce.py
index e671e710d6d7..b546bfbabad8 100755
--- a/autotest/gdrivers/isce.py
+++ b/autotest/gdrivers/isce.py
@@ -39,7 +39,7 @@
 # Perform simple read test.
 
 
-def isce_1():
+def test_isce_1():
 
     tst = gdaltest.GDALTest('isce', 'isce.slc', 1, 350)
 
@@ -67,7 +67,7 @@ def isce_1():
 # Test reading of metadata from the ISCE metadata domain
 
 
-def isce_2():
+def test_isce_2():
 
     ds = gdal.Open('data/isce.slc')
     val = ds.GetMetadataItem('IMAGE_TYPE', 'ISCE')
@@ -80,7 +80,7 @@ def isce_2():
 # Verify this can be exported losslessly.
 
 
-def isce_3():
+def test_isce_3():
 
     tst = gdaltest.GDALTest('isce', 'isce.slc', 1, 350)
     return tst.testCreateCopy(check_gt=0, new_filename='isce.tst.slc')
@@ -89,17 +89,17 @@ def isce_3():
 # Verify VSIF*L capacity
 
 
-def isce_4():
+def test_isce_4():
 
     tst = gdaltest.GDALTest('isce', 'isce.slc', 1, 350)
     return tst.testCreateCopy(check_gt=0, new_filename='isce.tst.slc', vsimem=1)
 
 
 gdaltest_list = [
-    isce_1,
-    isce_2,
-    isce_3,
-    isce_4,
+    test_isce_1,
+    test_isce_2,
+    test_isce_3,
+    test_isce_4,
 ]
 
 
diff --git a/autotest/gdrivers/isis.py b/autotest/gdrivers/isis.py
index fdd1a46ac82f..5887ffdf8df2 100755
--- a/autotest/gdrivers/isis.py
+++ b/autotest/gdrivers/isis.py
@@ -42,7 +42,7 @@
 # Perform simple read test on isis3 detached dataset.
 
 
-def isis_1():
+def test_isis_1():
     srs = """PROJCS["Equirectangular Mars",
     GEOGCS["GCS_Mars",
         DATUM["D_Mars",
@@ -66,7 +66,7 @@ def isis_1():
 # Perform simple read test on isis3 detached dataset.
 
 
-def isis_2():
+def test_isis_2():
     srs = """PROJCS["Equirectangular mars",
     GEOGCS["GCS_mars",
         DATUM["D_mars",
@@ -90,7 +90,7 @@ def isis_2():
 # Perform simple read test on isis3 detached dataset with GeoTIFF image file
 
 
-def isis_3():
+def test_isis_3():
     srs = """PROJCS["Equirectangular Mars",
     GEOGCS["GCS_Mars",
         DATUM["D_Mars",
@@ -113,7 +113,7 @@ def isis_3():
 # ISIS3 -> ISIS3 conversion
 
 
-def isis_4():
+def test_isis_4():
 
     tst = gdaltest.GDALTest('ISIS3', 'isis3_detached.lbl', 1, 9978)
     ret = tst.testCreateCopy(new_filename='/vsimem/isis_tmp.lbl',
@@ -198,7 +198,7 @@ def isis_4():
 # Label+image creation + WRITE_BOUNDING_DEGREES=NO option
 
 
-def isis_5():
+def test_isis_5():
 
     tst = gdaltest.GDALTest('ISIS3', 'isis3_detached.lbl', 1, 9978,
                             options=['USE_SRC_LABEL=NO',
@@ -223,7 +223,7 @@ def isis_5():
 # Detached label creation and COMMENT option
 
 
-def isis_6():
+def test_isis_6():
 
     tst = gdaltest.GDALTest('ISIS3', 'isis3_detached.lbl', 1, 9978,
                             options=['DATA_LOCATION=EXTERNAL',
@@ -260,7 +260,7 @@ def isis_6():
 # Uncompressed GeoTIFF creation
 
 
-def isis_7():
+def test_isis_7():
 
     tst = gdaltest.GDALTest('ISIS3', 'isis3_detached.lbl', 1, 9978,
                             options=['DATA_LOCATION=GEOTIFF',
@@ -307,7 +307,7 @@ def isis_7():
 # Compressed GeoTIFF creation
 
 
-def isis_8():
+def test_isis_8():
 
     tst = gdaltest.GDALTest('ISIS3', 'isis3_detached.lbl', 1, 9978,
                             options=['DATA_LOCATION=GEOTIFF',
@@ -341,7 +341,7 @@ def isis_8():
 # Tiled creation + EXTERNAL_FILENAME
 
 
-def isis_9():
+def test_isis_9():
 
     tst = gdaltest.GDALTest('ISIS3', 'isis3_detached.lbl', 1, 9978,
                             options=['DATA_LOCATION=EXTERNAL',
@@ -372,7 +372,7 @@ def isis_9():
 # Tiled creation + regular GeoTIFF + EXTERNAL_FILENAME
 
 
-def isis_10():
+def test_isis_10():
 
     tst = gdaltest.GDALTest('ISIS3', 'isis3_detached.lbl', 1, 9978,
                             options=['USE_SRC_LABEL=NO',
@@ -399,7 +399,7 @@ def isis_10():
 # Tiled creation + compressed GeoTIFF
 
 
-def isis_11():
+def test_isis_11():
 
     tst = gdaltest.GDALTest('ISIS3', 'isis3_detached.lbl', 1, 9978,
                             options=['USE_SRC_LABEL=NO',
@@ -422,7 +422,7 @@ def isis_11():
 # Multiband
 
 
-def isis_12():
+def test_isis_12():
 
     src_ds = gdal.Open('../gcore/data/stefan_full_rgba.tif')
     gdal.Translate('/vsimem/isis_tmp.lbl', src_ds, format='ISIS3')
@@ -441,7 +441,7 @@ def isis_12():
 # Multiband tiled
 
 
-def isis_13():
+def test_isis_13():
 
     src_ds = gdal.Open('../gcore/data/stefan_full_rgba.tif')
     gdal.Translate('/vsimem/isis_tmp.lbl', src_ds, format='ISIS3',
@@ -462,7 +462,7 @@ def isis_13():
 # Multiband with uncompressed GeoTIFF
 
 
-def isis_14():
+def test_isis_14():
 
     src_ds = gdal.Open('../gcore/data/stefan_full_rgba.tif')
     gdal.Translate('/vsimem/isis_tmp.lbl', src_ds, format='ISIS3',
@@ -482,7 +482,7 @@ def isis_14():
 # Multiband with uncompressed tiled GeoTIFF
 
 
-def isis_15():
+def test_isis_15():
 
     src_ds = gdal.Open('../gcore/data/stefan_full_rgba.tif')
     gdal.Translate('/vsimem/isis_tmp.lbl', src_ds, format='ISIS3',
@@ -503,7 +503,7 @@ def isis_15():
 # Test Create() without anything else
 
 
-def isis_16():
+def test_isis_16():
 
     for read_before_write in [False, True]:
         for init_nd in [False, True]:
@@ -558,7 +558,7 @@ def isis_16():
 # Test create copy through Create()
 
 
-def isis_17():
+def test_isis_17():
 
     tst = gdaltest.GDALTest('ISIS3', 'isis3_detached.lbl', 1, 9978)
     return tst.testCreate(vsimem=1)
@@ -566,7 +566,7 @@ def isis_17():
 # Test SRS serialization and deserialization
 
 
-def isis_18():
+def test_isis_18():
 
     sr = osr.SpatialReference()
     sr.SetEquirectangular2(0, 1, 2, 0, 0)
@@ -798,7 +798,7 @@ def isis_18():
 # Test gdal.Info() with json:ISIS3 metadata domain
 
 
-def isis_19():
+def test_isis_19():
 
     ds = gdal.Open('data/isis3_detached.lbl')
     res = gdal.Info(ds, format='json', extraMDDomains=['json:ISIS3'])
@@ -819,7 +819,7 @@ def isis_19():
 # Test gdal.Translate() subsetting and label preservation
 
 
-def isis_20():
+def test_isis_20():
 
     with gdaltest.error_handler():
         gdal.Translate('/vsimem/isis_tmp.lbl', 'data/isis3_detached.lbl',
@@ -838,7 +838,7 @@ def isis_20():
 # Test gdal.Warp() and label preservation
 
 
-def isis_21():
+def test_isis_21():
 
     with gdaltest.error_handler():
         gdal.Warp('/vsimem/isis_tmp.lbl', 'data/isis3_detached.lbl',
@@ -861,7 +861,7 @@ def isis_21():
 # Test source JSon use
 
 
-def isis_22():
+def test_isis_22():
 
     ds = gdal.GetDriverByName('ISIS3').Create('/vsimem/isis_tmp.lbl', 1, 1)
     # Invalid Json
@@ -959,7 +959,7 @@ def isis_22():
 # Test nodata remapping
 
 
-def isis_23():
+def test_isis_23():
 
     mem_ds = gdal.Translate('', 'data/byte.tif', format='MEM')
     mem_ds.SetProjection('')
@@ -1018,7 +1018,7 @@ def cancel_cbk(pct, msg, user_data):
 # Test error cases
 
 
-def isis_24():
+def test_isis_24():
 
     # For DATA_LOCATION=EXTERNAL, the main filename should have a .lbl extension
     with gdaltest.error_handler():
@@ -1405,7 +1405,7 @@ def isis_24():
 # Test CreateCopy() and scale and offset
 
 
-def isis_25():
+def test_isis_25():
 
     mem_ds = gdal.GetDriverByName('MEM').Create('', 1, 1, 1)
     mem_ds.GetRasterBand(1).SetScale(10)
@@ -1426,7 +1426,7 @@ def isis_25():
 # Test objects with same name
 
 
-def isis_26():
+def test_isis_26():
     gdal.FileFromMemBuffer('/vsimem/in.lbl', """Object = IsisCube
   Object = Core
     StartByte = 1
@@ -1506,7 +1506,7 @@ def isis_26():
 # Test history
 
 
-def isis_27():
+def test_isis_27():
 
     for src_location in ['LABEL', 'EXTERNAL']:
         for dst_location in ['LABEL', 'EXTERNAL']:
@@ -1591,7 +1591,7 @@ def isis_27():
 # Test preservation of non-pixel sections
 
 
-def isis_28():
+def test_isis_28():
 
     gdal.FileFromMemBuffer('/vsimem/in_table', "FOO")
     gdal.FileFromMemBuffer('/vsimem/in.lbl', """Object = IsisCube
@@ -1698,7 +1698,7 @@ def isis_28():
 # Test complete removal of history
 
 
-def isis_29():
+def test_isis_29():
 
     with gdaltest.error_handler():
         gdal.Translate('/vsimem/in.lbl', 'data/byte.tif', format='ISIS3')
@@ -1740,7 +1740,7 @@ def isis_29():
 # Test Fill() on a GeoTIFF file
 
 
-def isis_30():
+def test_isis_30():
 
     ds = gdal.GetDriverByName('ISIS3').Create('/vsimem/test.lbl', 1, 1, options=['DATA_LOCATION=GEOTIFF'])
     ds.GetRasterBand(1).Fill(1)
@@ -1760,7 +1760,7 @@ def isis_30():
 # Test correct working of block caching with a GeoTIFF file
 
 
-def isis_31():
+def test_isis_31():
 
     gdal.SetConfigOption('GDAL_FORCE_CACHING', 'YES')
     ds = gdal.GetDriverByName('ISIS3').Create('/vsimem/test.lbl', 1, 1, options=['DATA_LOCATION=GEOTIFF'])
@@ -1781,37 +1781,37 @@ def isis_31():
 
 
 gdaltest_list = [
-    isis_1,
-    isis_2,
-    isis_3,
-    isis_4,
-    isis_5,
-    isis_6,
-    isis_7,
-    isis_8,
-    isis_9,
-    isis_10,
-    isis_11,
-    isis_12,
-    isis_13,
-    isis_14,
-    isis_15,
-    isis_16,
-    isis_17,
-    isis_18,
-    isis_19,
-    isis_20,
-    isis_21,
-    isis_22,
-    isis_23,
-    isis_24,
-    isis_25,
-    isis_26,
-    isis_27,
-    isis_28,
-    isis_29,
-    isis_30,
-    isis_31]
+    test_isis_1,
+    test_isis_2,
+    test_isis_3,
+    test_isis_4,
+    test_isis_5,
+    test_isis_6,
+    test_isis_7,
+    test_isis_8,
+    test_isis_9,
+    test_isis_10,
+    test_isis_11,
+    test_isis_12,
+    test_isis_13,
+    test_isis_14,
+    test_isis_15,
+    test_isis_16,
+    test_isis_17,
+    test_isis_18,
+    test_isis_19,
+    test_isis_20,
+    test_isis_21,
+    test_isis_22,
+    test_isis_23,
+    test_isis_24,
+    test_isis_25,
+    test_isis_26,
+    test_isis_27,
+    test_isis_28,
+    test_isis_29,
+    test_isis_30,
+    test_isis_31]
 
 
 if __name__ == '__main__':
diff --git a/autotest/gdrivers/isis2.py b/autotest/gdrivers/isis2.py
index 61326c66a52f..c4a6141aade1 100755
--- a/autotest/gdrivers/isis2.py
+++ b/autotest/gdrivers/isis2.py
@@ -38,7 +38,7 @@
 # ftp://ftpflag.wr.usgs.gov/dist/pigpen/venus/venustopo_download/ovda_dtm.zip
 
 
-def isis2_1():
+def test_isis2_1():
 
     tst = gdaltest.GDALTest('ISIS2', 'arvidson_original_truncated.cub', 1, 382)
     expected_prj = """PROJCS["SIMPLE_CYLINDRICAL VENUS",
@@ -61,7 +61,7 @@ def isis2_1():
 ###############################################################################
 # Test simple creation on disk.
 
-def isis2_2():
+def test_isis2_2():
 
     tst = gdaltest.GDALTest('ISIS2', 'byte.tif', 1, 4672)
 
@@ -71,7 +71,7 @@ def isis2_2():
 # Test a different data type with some options.
 
 
-def isis2_3():
+def test_isis2_3():
 
     tst = gdaltest.GDALTest('ISIS2', 'float32.tif', 1, 4672,
                             options=['LABELING_METHOD=DETACHED', 'IMAGE_EXTENSION=qub'])
@@ -80,9 +80,9 @@ def isis2_3():
 
 
 gdaltest_list = [
-    isis2_1,
-    isis2_2,
-    isis2_3]
+    test_isis2_1,
+    test_isis2_2,
+    test_isis2_3]
 
 if __name__ == '__main__':
 
diff --git a/autotest/gdrivers/jdem.py b/autotest/gdrivers/jdem.py
index 219ae6e3c73a..bce9c65185e8 100755
--- a/autotest/gdrivers/jdem.py
+++ b/autotest/gdrivers/jdem.py
@@ -37,14 +37,14 @@
 # Test reading a - fake - JDEM dataset
 
 
-def jdem_1():
+def test_jdem_1():
 
     tst = gdaltest.GDALTest('JDEM', 'fakejdem.mem', 1, 15)
     return tst.testOpen()
 
 
 gdaltest_list = [
-    jdem_1]
+    test_jdem_1]
 
 if __name__ == '__main__':
 
diff --git a/autotest/gdrivers/jp2kak.py b/autotest/gdrivers/jp2kak.py
index 8a9007cb673e..2b8bb446708f 100755
--- a/autotest/gdrivers/jp2kak.py
+++ b/autotest/gdrivers/jp2kak.py
@@ -40,7 +40,7 @@
 # Read test of simple byte reference data.
 
 
-def jp2kak_1():
+def test_jp2kak_1():
 
     gdaltest.jp2kak_drv = gdal.GetDriverByName('JP2KAK')
     if gdaltest.jp2kak_drv is None:
@@ -55,7 +55,7 @@ def jp2kak_1():
 # Read test of simple 16bit reference data.
 
 
-def jp2kak_2():
+def test_jp2kak_2():
 
     if gdaltest.jp2kak_drv is None:
         return 'skip'
@@ -67,7 +67,7 @@ def jp2kak_2():
 # Test lossless copying.
 
 
-def jp2kak_3():
+def test_jp2kak_3():
 
     if gdaltest.jp2kak_drv is None:
         return 'skip'
@@ -81,7 +81,7 @@ def jp2kak_3():
 # Test GeoJP2 production with geotransform.
 
 
-def jp2kak_4():
+def test_jp2kak_4():
 
     if gdaltest.jp2kak_drv is None:
         return 'skip'
@@ -95,7 +95,7 @@ def jp2kak_4():
 # Test GeoJP2 production with gcps.
 
 
-def jp2kak_5():
+def test_jp2kak_5():
 
     if gdaltest.jp2kak_drv is None:
         return 'skip'
@@ -110,7 +110,7 @@ def jp2kak_5():
 #
 
 
-def jp2kak_8():
+def test_jp2kak_8():
 
     if gdaltest.jp2kak_drv is None:
         return 'skip'
@@ -126,7 +126,7 @@ def jp2kak_8():
 #
 
 
-def jp2kak_9():
+def test_jp2kak_9():
 
     if gdaltest.jp2kak_drv is None:
         return 'skip'
@@ -140,7 +140,7 @@ def jp2kak_9():
 #
 
 
-def jp2kak_10():
+def test_jp2kak_10():
 
     if gdaltest.jp2kak_drv is None:
         return 'skip'
@@ -168,7 +168,7 @@ def jp2kak_10():
 #
 
 
-def jp2kak_11():
+def test_jp2kak_11():
 
     if gdaltest.jp2kak_drv is None:
         return 'skip'
@@ -186,7 +186,7 @@ def jp2kak_11():
 #
 
 
-def jp2kak_12():
+def test_jp2kak_12():
 
     if gdaltest.jp2kak_drv is None:
         return 'skip'
@@ -204,7 +204,7 @@ def jp2kak_12():
 # Test internal overviews.
 #
 
-def jp2kak_13():
+def test_jp2kak_13():
 
     if gdaltest.jp2kak_drv is None:
         return 'skip'
@@ -239,7 +239,7 @@ def jp2kak_13():
 #
 
 
-def jp2kak_14():
+def test_jp2kak_14():
 
     if gdaltest.jp2kak_drv is None:
         return 'skip'
@@ -285,7 +285,7 @@ def jp2kak_14():
 #
 
 
-def jp2kak_15():
+def test_jp2kak_15():
 
     if gdaltest.jp2kak_drv is None:
         return 'skip'
@@ -308,7 +308,7 @@ def jp2kak_15():
 #
 
 
-def jp2kak_16():
+def test_jp2kak_16():
 
     if gdaltest.jp2kak_drv is None:
         return 'skip'
@@ -341,7 +341,7 @@ def jp2kak_16():
 # This test case was adapted from the "jp2kak_7()" case above.
 
 
-def jp2kak_17():
+def test_jp2kak_17():
 
     if gdaltest.jp2kak_drv is None:
         return 'skip'
@@ -375,7 +375,7 @@ def jp2kak_17():
 # Test lossless copying of Int16
 
 
-def jp2kak_18():
+def test_jp2kak_18():
 
     if gdaltest.jp2kak_drv is None:
         return 'skip'
@@ -389,7 +389,7 @@ def jp2kak_18():
 # Test lossless copying of UInt16
 
 
-def jp2kak_19():
+def test_jp2kak_19():
 
     if gdaltest.jp2kak_drv is None:
         return 'skip'
@@ -403,7 +403,7 @@ def jp2kak_19():
 # Test auto-promotion of 1bit alpha band to 8bit
 
 
-def jp2kak_20():
+def test_jp2kak_20():
 
     if gdaltest.jp2kak_drv is None:
         return 'skip'
@@ -461,7 +461,7 @@ def jp2kak_20():
 # Test non nearest upsampling
 
 
-def jp2kak_21():
+def test_jp2kak_21():
 
     if gdaltest.jp2kak_drv is None:
         return 'skip'
@@ -499,7 +499,7 @@ def jp2kak_21():
 # Test RGBA datasets
 
 
-def jp2kak_22():
+def test_jp2kak_22():
 
     if gdaltest.jp2kak_drv is None:
         return 'skip'
@@ -530,7 +530,7 @@ def jp2kak_22():
 ###############################################################################
 # Cleanup.
 
-def jp2kak_cleanup():
+def test_jp2kak_cleanup():
 
     gdaltest.reregister_all_jpeg2000_drivers()
 
@@ -538,27 +538,27 @@ def jp2kak_cleanup():
 
 
 gdaltest_list = [
-    jp2kak_1,
-    jp2kak_2,
-    jp2kak_3,
-    jp2kak_4,
-    jp2kak_5,
-    jp2kak_8,
-    jp2kak_9,
-    jp2kak_10,
-    jp2kak_11,
-    jp2kak_12,
-    jp2kak_13,
-    jp2kak_14,
-    jp2kak_15,
-    jp2kak_16,
-    jp2kak_17,
-    jp2kak_18,
-    jp2kak_19,
-    jp2kak_20,
-    jp2kak_21,
-    jp2kak_22,
-    jp2kak_cleanup]
+    test_jp2kak_1,
+    test_jp2kak_2,
+    test_jp2kak_3,
+    test_jp2kak_4,
+    test_jp2kak_5,
+    test_jp2kak_8,
+    test_jp2kak_9,
+    test_jp2kak_10,
+    test_jp2kak_11,
+    test_jp2kak_12,
+    test_jp2kak_13,
+    test_jp2kak_14,
+    test_jp2kak_15,
+    test_jp2kak_16,
+    test_jp2kak_17,
+    test_jp2kak_18,
+    test_jp2kak_19,
+    test_jp2kak_20,
+    test_jp2kak_21,
+    test_jp2kak_22,
+    test_jp2kak_cleanup]
 
 if __name__ == '__main__':
 
diff --git a/autotest/gdrivers/jp2lura.py b/autotest/gdrivers/jp2lura.py
index f9c18b29b529..a584baf4295c 100755
--- a/autotest/gdrivers/jp2lura.py
+++ b/autotest/gdrivers/jp2lura.py
@@ -45,7 +45,7 @@
 # Verify we have the driver.
 
 
-def jp2lura_1():
+def test_jp2lura_1():
 
     gdaltest.jp2lura_drv = gdal.GetDriverByName('JP2Lura')
     if gdaltest.jp2lura_drv is None:
@@ -72,7 +72,7 @@ def jp2lura_1():
 #
 
 
-def jp2lura_missing_license_num():
+def test_jp2lura_missing_license_num():
 
     if gdaltest.jp2lura_drv is None:
         return 'skip'
@@ -95,7 +95,7 @@ def jp2lura_missing_license_num():
 #
 
 
-def jp2lura_invalid_license_num():
+def test_jp2lura_invalid_license_num():
 
     if gdaltest.jp2lura_drv is None:
         return 'skip'
@@ -151,7 +151,7 @@ def validate(filename, expected_gmljp2=True, return_error_count=False, oidoc=Non
 # Open byte.jp2
 
 
-def jp2lura_2():
+def test_jp2lura_2():
 
     if gdaltest.jp2lura_drv is None:
         return 'skip'
@@ -184,7 +184,7 @@ def jp2lura_2():
 # Open int16.jp2
 
 
-def jp2lura_3():
+def test_jp2lura_3():
 
     if gdaltest.jp2lura_drv is None:
         return 'skip'
@@ -215,7 +215,7 @@ def jp2lura_3():
 # Test copying byte.jp2
 
 
-def jp2lura_4(out_filename='tmp/jp2lura_4.jp2'):
+def test_jp2lura_4(out_filename='tmp/jp2lura_4.jp2'):
 
     if gdaltest.jp2lura_drv is None:
         return 'skip'
@@ -289,14 +289,14 @@ def jp2lura_4(out_filename='tmp/jp2lura_4.jp2'):
     return 'success'
 
 
-def jp2lura_4_vsimem():
-    return jp2lura_4('/vsimem/jp2lura_4.jp2')
+def test_jp2lura_4_vsimem():
+    return test_jp2lura_4('/vsimem/jp2lura_4.jp2')
 
 ###############################################################################
 # Test copying int16.jp2
 
 
-def jp2lura_5():
+def test_jp2lura_5():
 
     if gdaltest.jp2lura_drv is None:
         return 'skip'
@@ -308,7 +308,7 @@ def jp2lura_5():
 # Test reading ll.jp2
 
 
-def jp2lura_6():
+def test_jp2lura_6():
 
     if gdaltest.jp2lura_drv is None:
         return 'skip'
@@ -328,7 +328,7 @@ def jp2lura_6():
 # Open byte.jp2.gz (test use of the VSIL API)
 
 
-def jp2lura_7():
+def test_jp2lura_7():
 
     if gdaltest.jp2lura_drv is None:
         return 'skip'
@@ -340,7 +340,7 @@ def jp2lura_7():
 # Test a JP2Lura with the 3 bands having 13bit depth and the 4th one 1 bit
 
 
-def jp2lura_8():
+def test_jp2lura_8():
 
     if gdaltest.jp2lura_drv is None:
         return 'skip'
@@ -364,7 +364,7 @@ def jp2lura_8():
 # Check that we can use .j2w world files (#4651)
 
 
-def jp2lura_9():
+def test_jp2lura_9():
 
     if gdaltest.jp2lura_drv is None:
         return 'skip'
@@ -474,7 +474,7 @@ def DISABLED_jp2lura_11():
 # Check that PAM overrides internal georeferencing (#5279)
 
 
-def jp2lura_12():
+def test_jp2lura_12():
 
     if gdaltest.jp2lura_drv is None:
         return 'skip'
@@ -523,7 +523,7 @@ def jp2lura_12():
 # Check that PAM overrides internal GCPs (#5279)
 
 
-def jp2lura_13():
+def test_jp2lura_13():
 
     if gdaltest.jp2lura_drv is None:
         return 'skip'
@@ -587,7 +587,7 @@ def jp2lura_13():
 # Check that we get GCPs even there's no projection info
 
 
-def jp2lura_14():
+def test_jp2lura_14():
 
     if gdaltest.jp2lura_drv is None:
         return 'skip'
@@ -603,7 +603,7 @@ def jp2lura_14():
 # Test reading PixelIsPoint file (#5437)
 
 
-def jp2lura_16():
+def test_jp2lura_16():
 
     if gdaltest.jp2lura_drv is None:
         return 'skip'
@@ -643,7 +643,7 @@ def jp2lura_16():
 # Test writing PixelIsPoint file (#5437)
 
 
-def jp2lura_17():
+def test_jp2lura_17():
 
     if gdaltest.jp2lura_drv is None:
         return 'skip'
@@ -680,7 +680,7 @@ def jp2lura_17():
 # multiple of 1024 (#5480)
 
 
-def jp2lura_18():
+def test_jp2lura_18():
 
     if gdaltest.jp2lura_drv is None:
         return 'skip'
@@ -705,7 +705,7 @@ def jp2lura_18():
 # Test reading file where GMLJP2 has nul character instead of \n (#5760)
 
 
-def jp2lura_19():
+def test_jp2lura_19():
 
     if gdaltest.jp2lura_drv is None:
         return 'skip'
@@ -722,7 +722,7 @@ def jp2lura_19():
 # Validate GMLJP2 content against schema
 
 
-def jp2lura_20():
+def test_jp2lura_20():
 
     if gdaltest.jp2lura_drv is None:
         return 'skip'
@@ -794,7 +794,7 @@ def jp2lura_20():
 # Test RGBA support
 
 
-def jp2lura_22():
+def test_jp2lura_22():
 
     if gdaltest.jp2lura_drv is None:
         return 'skip'
@@ -1002,7 +1002,7 @@ def DISABLED_jp2lura_23():
 # Test Grey+alpha support
 
 
-def jp2lura_24():
+def test_jp2lura_24():
 
     if gdaltest.jp2lura_drv is None:
         return 'skip'
@@ -1073,7 +1073,7 @@ def jp2lura_24():
 # Test multiband support
 
 
-def jp2lura_25():
+def test_jp2lura_25():
 
     if gdaltest.jp2lura_drv is None:
         return 'skip'
@@ -1110,7 +1110,7 @@ def jp2lura_25():
 # Test CreateCopy() from a JPEG2000 with a 2048x2048 tiling
 
 
-def jp2lura_27():
+def test_jp2lura_27():
 
     if gdaltest.jp2lura_drv is None:
         return 'skip'
@@ -1196,7 +1196,7 @@ def jp2lura_test_codeblock(filename, codeblock_width, codeblock_height):
     return True
 
 
-def jp2lura_28():
+def test_jp2lura_28():
 
     if gdaltest.jp2lura_drv is None:
         return 'skip'
@@ -1235,7 +1235,7 @@ def jp2lura_28():
 # Test color table support
 
 
-def jp2lura_30():
+def test_jp2lura_30():
 
     if gdaltest.jp2lura_drv is None:
         return 'skip'
@@ -1347,7 +1347,7 @@ def DISABLED_jp2lura_33():
 # Test opening a file whose dimensions are > 2^31-1
 
 
-def jp2lura_34():
+def test_jp2lura_34():
 
     if gdaltest.jp2lura_drv is None:
         return 'skip'
@@ -1365,7 +1365,7 @@ def jp2lura_34():
 ###############################################################################
 # Test opening a truncated file
 
-def jp2lura_35():
+def test_jp2lura_35():
 
     if gdaltest.jp2lura_drv is None:
         return 'skip'
@@ -1383,7 +1383,7 @@ def jp2lura_35():
 # Test we cannot create files with more than 16384 bands
 
 
-def jp2lura_36():
+def test_jp2lura_36():
 
     if gdaltest.jp2lura_drv is None:
         return 'skip'
@@ -1402,7 +1402,7 @@ def jp2lura_36():
 # Test metadata reading & writing
 
 
-def jp2lura_37():
+def test_jp2lura_37():
 
     if gdaltest.jp2lura_drv is None:
         return 'skip'
@@ -1522,7 +1522,7 @@ def jp2lura_37():
 # Test non-EPSG SRS (so written with a GML dictionary)
 
 
-def jp2lura_38():
+def test_jp2lura_38():
 
     if gdaltest.jp2lura_drv is None:
         return 'skip'
@@ -1564,7 +1564,7 @@ def jp2lura_38():
 # Test GMLJP2OVERRIDE configuration option and DGIWG GMLJP2
 
 
-def jp2lura_39():
+def test_jp2lura_39():
 
     if gdaltest.jp2lura_drv is None:
         return 'skip'
@@ -1638,7 +1638,7 @@ def jp2lura_39():
 # Test we can parse GMLJP2 v2.0
 
 
-def jp2lura_40():
+def test_jp2lura_40():
 
     if gdaltest.jp2lura_drv is None:
         return 'skip'
@@ -1722,7 +1722,7 @@ def jp2lura_40():
 # Test USE_SRC_CODESTREAM=YES
 
 
-def jp2lura_41():
+def test_jp2lura_41():
 
     if gdaltest.jp2lura_drv is None:
         return 'skip'
@@ -1772,7 +1772,7 @@ def jp2lura_41():
 # Get structure of a JPEG2000 file
 
 
-def jp2lura_43():
+def test_jp2lura_43():
 
     ret = gdal.GetJPEG2000StructureAsString('data/byte.jp2', ['ALL=YES'])
     if ret is None:
@@ -1784,7 +1784,7 @@ def jp2lura_43():
 # Test GMLJP2v2
 
 
-def jp2lura_45():
+def test_jp2lura_45():
 
     if gdaltest.jp2lura_drv is None:
         return 'skip'
@@ -1877,7 +1877,7 @@ def jp2lura_45():
 # Test writing & reading RPC in GeoJP2 box
 
 
-def jp2lura_47():
+def test_jp2lura_47():
 
     if gdaltest.jp2lura_drv is None:
         return 'skip'
@@ -1903,7 +1903,7 @@ def jp2lura_47():
 # Test reading a dataset whose tile dimensions are larger than dataset ones
 
 
-def jp2lura_48():
+def test_jp2lura_48():
 
     if gdaltest.jp2lura_drv is None:
         return 'skip'
@@ -1924,7 +1924,7 @@ def jp2lura_48():
 ###############################################################################
 
 
-def jp2lura_online_1():
+def test_jp2lura_online_1():
 
     if gdaltest.jp2lura_drv is None:
         return 'skip'
@@ -1947,7 +1947,7 @@ def jp2lura_online_1():
 ###############################################################################
 
 
-def jp2lura_online_2():
+def test_jp2lura_online_2():
 
     if gdaltest.jp2lura_drv is None:
         return 'skip'
@@ -1979,7 +1979,7 @@ def jp2lura_online_2():
 ###############################################################################
 
 
-def jp2lura_online_3():
+def test_jp2lura_online_3():
 
     if gdaltest.jp2lura_drv is None:
         return 'skip'
@@ -2013,7 +2013,7 @@ def jp2lura_online_3():
 ###############################################################################
 
 
-def jp2lura_online_4():
+def test_jp2lura_online_4():
 
     if gdaltest.jp2lura_drv is None:
         return 'skip'
@@ -2048,7 +2048,7 @@ def jp2lura_online_4():
 # Try reading JP2Lura with color table
 
 
-def jp2lura_online_5():
+def test_jp2lura_online_5():
 
     if gdaltest.jp2lura_drv is None:
         return 'skip'
@@ -2073,7 +2073,7 @@ def jp2lura_online_5():
 # Try reading YCbCr JP2Lura as RGB
 
 
-def jp2lura_online_6():
+def test_jp2lura_online_6():
 
     if gdaltest.jp2lura_drv is None:
         return 'skip'
@@ -2099,7 +2099,7 @@ def jp2lura_online_6():
 # Test GDAL_GEOREF_SOURCES
 
 
-def jp2lura_49():
+def test_jp2lura_49():
 
     if gdaltest.jp2lura_drv is None:
         return 'skip'
@@ -2230,7 +2230,7 @@ def jp2lura_49():
 ###############################################################################
 # Test reading split IEEE-754 Float32
 
-def jp2lura_50():
+def test_jp2lura_50():
 
     if gdaltest.jp2lura_drv is None:
         return 'skip'
@@ -2242,7 +2242,7 @@ def jp2lura_50():
 # Test split IEEE-754 Float32
 
 
-def jp2lura_51():
+def test_jp2lura_51():
 
     if gdaltest.jp2lura_drv is None:
         return 'skip'
@@ -2324,7 +2324,7 @@ def jp2lura_51():
 # Test other data types
 
 
-def jp2lura_52():
+def test_jp2lura_52():
 
     if gdaltest.jp2lura_drv is None:
         return 'skip'
@@ -2365,7 +2365,7 @@ def jp2lura_52():
 # Test RATE and QUALITY
 
 
-def jp2lura_53():
+def test_jp2lura_53():
 
     if gdaltest.jp2lura_drv is None:
         return 'skip'
@@ -2424,7 +2424,7 @@ def jp2lura_53():
 # Test RasterIO edge cases
 
 
-def jp2lura_54():
+def test_jp2lura_54():
 
     if gdaltest.jp2lura_drv is None:
         return 'skip'
@@ -2461,7 +2461,7 @@ def jp2lura_54():
 
 
 ###############################################################################
-def jp2lura_cleanup():
+def test_jp2lura_cleanup():
 
     gdaltest.reregister_all_jpeg2000_drivers()
 
@@ -2469,74 +2469,74 @@ def jp2lura_cleanup():
 
 
 gdaltest_list = [
-    jp2lura_1,
-    jp2lura_missing_license_num,
-    jp2lura_invalid_license_num,
-    jp2lura_2,
-    jp2lura_3,
-    jp2lura_4,
-    jp2lura_4_vsimem,
-    jp2lura_5,
-    jp2lura_6,
-    jp2lura_7,
-    jp2lura_8,
-    jp2lura_9,
+    test_jp2lura_1,
+    test_jp2lura_missing_license_num,
+    test_jp2lura_invalid_license_num,
+    test_jp2lura_2,
+    test_jp2lura_3,
+    test_jp2lura_4,
+    test_jp2lura_4_vsimem,
+    test_jp2lura_5,
+    test_jp2lura_6,
+    test_jp2lura_7,
+    test_jp2lura_8,
+    test_jp2lura_9,
     # jp2lura_10,
     # jp2lura_11,
-    jp2lura_12,
-    jp2lura_13,
-    jp2lura_14,
-    jp2lura_16,
-    jp2lura_17,
-    jp2lura_18,
-    jp2lura_19,
-    jp2lura_20,
+    test_jp2lura_12,
+    test_jp2lura_13,
+    test_jp2lura_14,
+    test_jp2lura_16,
+    test_jp2lura_17,
+    test_jp2lura_18,
+    test_jp2lura_19,
+    test_jp2lura_20,
     # jp2lura_21,
-    jp2lura_22,
+    test_jp2lura_22,
     # jp2lura_23,
-    jp2lura_24,
-    jp2lura_25,
+    test_jp2lura_24,
+    test_jp2lura_25,
     # jp2lura_26,
-    jp2lura_27,
-    jp2lura_28,
+    test_jp2lura_27,
+    test_jp2lura_28,
     # jp2lura_29,
-    jp2lura_30,
+    test_jp2lura_30,
     # jp2lura_31,
     # jp2lura_32,
     # jp2lura_33,
-    jp2lura_34,
-    jp2lura_35,
-    jp2lura_36,
-    jp2lura_37,
-    jp2lura_38,
-    jp2lura_39,
-    jp2lura_40,
-    jp2lura_41,
+    test_jp2lura_34,
+    test_jp2lura_35,
+    test_jp2lura_36,
+    test_jp2lura_37,
+    test_jp2lura_38,
+    test_jp2lura_39,
+    test_jp2lura_40,
+    test_jp2lura_41,
     # jp2lura_42,
-    jp2lura_43,
+    test_jp2lura_43,
     # jp2lura_44,
-    jp2lura_45,
+    test_jp2lura_45,
     # jp2lura_46,
-    jp2lura_47,
-    jp2lura_48,
-    jp2lura_49,
-    jp2lura_50,
-    jp2lura_51,
-    jp2lura_52,
-    jp2lura_53,
-    jp2lura_54,
-    jp2lura_online_1,
-    jp2lura_online_2,
-    jp2lura_online_3,
-    jp2lura_online_4,
-    jp2lura_online_5,
-    jp2lura_online_6,
-    jp2lura_cleanup]
+    test_jp2lura_47,
+    test_jp2lura_48,
+    test_jp2lura_49,
+    test_jp2lura_50,
+    test_jp2lura_51,
+    test_jp2lura_52,
+    test_jp2lura_53,
+    test_jp2lura_54,
+    test_jp2lura_online_1,
+    test_jp2lura_online_2,
+    test_jp2lura_online_3,
+    test_jp2lura_online_4,
+    test_jp2lura_online_5,
+    test_jp2lura_online_6,
+    test_jp2lura_cleanup]
 
 disabled_gdaltest_list = [
-    jp2lura_1,
-    jp2lura_53,
-    jp2lura_cleanup]
+    test_jp2lura_1,
+    test_jp2lura_53,
+    test_jp2lura_cleanup]
 
 if __name__ == '__main__':
 
diff --git a/autotest/gdrivers/jp2metadata.py b/autotest/gdrivers/jp2metadata.py
index 0d59f5cbc269..db9fd6fa9dd6 100755
--- a/autotest/gdrivers/jp2metadata.py
+++ b/autotest/gdrivers/jp2metadata.py
@@ -40,7 +40,7 @@
 ###############################################################################
 # Test bugfix for #5249 (Irrelevant ERDAS GeoTIFF JP2Box read)
 
-def jp2metadata_1():
+def test_jp2metadata_1():
 
     ds = gdal.Open('data/erdas_foo.jp2')
     if ds is None:
@@ -62,7 +62,7 @@ def jp2metadata_1():
 # Test Pleiades imagery metadata
 
 
-def jp2metadata_2():
+def test_jp2metadata_2():
 
     # Pleiades product description http://www.cscrs.itu.edu.tr/assets/downloads/PleiadesUserGuide.pdf
     try:
@@ -114,7 +114,7 @@ def jp2metadata_2():
 # disabled.
 
 
-def jp2metadata_3():
+def test_jp2metadata_3():
 
     gdal.SetConfigOption('GDAL_IGNORE_AXIS_ORIENTATION', 'YES')
 
@@ -153,7 +153,7 @@ def jp2metadata_3():
 # axis order coordinate system (urn:...:EPSG::4326).
 
 
-def jp2metadata_4():
+def test_jp2metadata_4():
 
     exp_wkt = 'GEOGCS["WGS 84",DATUM["WGS_1984",SPHEROID["WGS 84",6378137,298.257223563,AUTHORITY["EPSG","7030"]],AUTHORITY["EPSG","6326"]],PRIMEM["Greenwich",0,AUTHORITY["EPSG","8901"]],UNIT["degree",0.0174532925199433,AUTHORITY["EPSG","9122"]],AUTHORITY["EPSG","4326"]]'
 
@@ -190,7 +190,7 @@ def jp2metadata_4():
 # but with explicit axisName being easting, northing (#5960)
 
 
-def jp2metadata_5():
+def test_jp2metadata_5():
 
     exp_wkt = 'PROJCS["ETRS89 / LAEA Europe",GEOGCS["ETRS89",DATUM["European_Terrestrial_Reference_System_1989",SPHEROID["GRS 1980",6378137,298.257222101,AUTHORITY["EPSG","7019"]],TOWGS84[0,0,0,0,0,0,0],AUTHORITY["EPSG","6258"]],PRIMEM["Greenwich",0,AUTHORITY["EPSG","8901"]],UNIT["degree",0.0174532925199433,AUTHORITY["EPSG","9122"]],AUTHORITY["EPSG","4258"]],PROJECTION["Lambert_Azimuthal_Equal_Area"],PARAMETER["latitude_of_center",52],PARAMETER["longitude_of_center",10],PARAMETER["false_easting",4321000],PARAMETER["false_northing",3210000],UNIT["metre",1,AUTHORITY["EPSG","9001"]],AUTHORITY["EPSG","3035"]]'
 
@@ -223,11 +223,11 @@ def jp2metadata_5():
 
 
 gdaltest_list = [
-    jp2metadata_1,
-    jp2metadata_2,
-    jp2metadata_3,
-    jp2metadata_4,
-    jp2metadata_5
+    test_jp2metadata_1,
+    test_jp2metadata_2,
+    test_jp2metadata_3,
+    test_jp2metadata_4,
+    test_jp2metadata_5
 ]
 
 
diff --git a/autotest/gdrivers/jp2openjpeg.py b/autotest/gdrivers/jp2openjpeg.py
index f380d2cc148f..b0e931fe03a9 100755
--- a/autotest/gdrivers/jp2openjpeg.py
+++ b/autotest/gdrivers/jp2openjpeg.py
@@ -45,7 +45,7 @@
 # Verify we have the driver.
 
 
-def jp2openjpeg_1():
+def test_jp2openjpeg_1():
 
     gdaltest.jp2openjpeg_drv = gdal.GetDriverByName('JP2OpenJPEG')
     if gdaltest.jp2openjpeg_drv is None:
@@ -59,7 +59,7 @@ def jp2openjpeg_1():
 # Open byte.jp2
 
 
-def jp2openjpeg_2():
+def test_jp2openjpeg_2():
 
     if gdaltest.jp2openjpeg_drv is None:
         return 'skip'
@@ -92,7 +92,7 @@ def jp2openjpeg_2():
 # Open int16.jp2
 
 
-def jp2openjpeg_3():
+def test_jp2openjpeg_3():
 
     if gdaltest.jp2openjpeg_drv is None:
         return 'skip'
@@ -123,7 +123,7 @@ def jp2openjpeg_3():
 # Test copying byte.jp2
 
 
-def jp2openjpeg_4(out_filename='tmp/jp2openjpeg_4.jp2'):
+def test_jp2openjpeg_4(out_filename='tmp/jp2openjpeg_4.jp2'):
 
     if gdaltest.jp2openjpeg_drv is None:
         return 'skip'
@@ -193,14 +193,14 @@ def jp2openjpeg_4(out_filename='tmp/jp2openjpeg_4.jp2'):
     return 'success'
 
 
-def jp2openjpeg_4_vsimem():
-    return jp2openjpeg_4('/vsimem/jp2openjpeg_4.jp2')
+def test_jp2openjpeg_4_vsimem():
+    return test_jp2openjpeg_4('/vsimem/jp2openjpeg_4.jp2')
 
 ###############################################################################
 # Test copying int16.jp2
 
 
-def jp2openjpeg_5():
+def test_jp2openjpeg_5():
 
     if gdaltest.jp2openjpeg_drv is None:
         return 'skip'
@@ -212,7 +212,7 @@ def jp2openjpeg_5():
 # Test reading ll.jp2
 
 
-def jp2openjpeg_6():
+def test_jp2openjpeg_6():
 
     if gdaltest.jp2openjpeg_drv is None:
         return 'skip'
@@ -232,7 +232,7 @@ def jp2openjpeg_6():
 # Open byte.jp2.gz (test use of the VSIL API)
 
 
-def jp2openjpeg_7():
+def test_jp2openjpeg_7():
 
     if gdaltest.jp2openjpeg_drv is None:
         return 'skip'
@@ -244,7 +244,7 @@ def jp2openjpeg_7():
 # Test a JP2OpenJPEG with the 3 bands having 13bit depth and the 4th one 1 bit
 
 
-def jp2openjpeg_8():
+def test_jp2openjpeg_8():
 
     if gdaltest.jp2openjpeg_drv is None:
         return 'skip'
@@ -268,7 +268,7 @@ def jp2openjpeg_8():
 # Check that we can use .j2w world files (#4651)
 
 
-def jp2openjpeg_9():
+def test_jp2openjpeg_9():
 
     if gdaltest.jp2openjpeg_drv is None:
         return 'skip'
@@ -294,7 +294,7 @@ def jp2openjpeg_9():
 # Test YCBCR420 creation option
 
 
-def jp2openjpeg_10():
+def test_jp2openjpeg_10():
 
     if gdaltest.jp2openjpeg_drv is None:
         return 'skip'
@@ -326,7 +326,7 @@ def jp2openjpeg_10():
 # Test auto-promotion of 1bit alpha band to 8bit
 
 
-def jp2openjpeg_11():
+def test_jp2openjpeg_11():
 
     if gdaltest.jp2openjpeg_drv is None:
         return 'skip'
@@ -378,7 +378,7 @@ def jp2openjpeg_11():
 # Check that PAM overrides internal georeferencing (#5279)
 
 
-def jp2openjpeg_12():
+def test_jp2openjpeg_12():
 
     if gdaltest.jp2openjpeg_drv is None:
         return 'skip'
@@ -427,7 +427,7 @@ def jp2openjpeg_12():
 # Check that PAM overrides internal GCPs (#5279)
 
 
-def jp2openjpeg_13():
+def test_jp2openjpeg_13():
 
     if gdaltest.jp2openjpeg_drv is None:
         return 'skip'
@@ -491,7 +491,7 @@ def jp2openjpeg_13():
 # Check that we get GCPs even there's no projection info
 
 
-def jp2openjpeg_14():
+def test_jp2openjpeg_14():
 
     if gdaltest.jp2openjpeg_drv is None:
         return 'skip'
@@ -507,7 +507,7 @@ def jp2openjpeg_14():
 # Test multi-threading reading
 
 
-def jp2openjpeg_15():
+def test_jp2openjpeg_15():
 
     if gdaltest.jp2openjpeg_drv is None:
         return 'skip'
@@ -529,7 +529,7 @@ def jp2openjpeg_15():
 # Test reading PixelIsPoint file (#5437)
 
 
-def jp2openjpeg_16():
+def test_jp2openjpeg_16():
 
     if gdaltest.jp2openjpeg_drv is None:
         return 'skip'
@@ -569,7 +569,7 @@ def jp2openjpeg_16():
 # Test writing PixelIsPoint file (#5437)
 
 
-def jp2openjpeg_17():
+def test_jp2openjpeg_17():
 
     if gdaltest.jp2openjpeg_drv is None:
         return 'skip'
@@ -606,7 +606,7 @@ def jp2openjpeg_17():
 # multiple of 1024 (#5480)
 
 
-def jp2openjpeg_18():
+def test_jp2openjpeg_18():
 
     if gdaltest.jp2openjpeg_drv is None:
         return 'skip'
@@ -631,7 +631,7 @@ def jp2openjpeg_18():
 # Test reading file where GMLJP2 has nul character instead of \n (#5760)
 
 
-def jp2openjpeg_19():
+def test_jp2openjpeg_19():
 
     if gdaltest.jp2openjpeg_drv is None:
         return 'skip'
@@ -648,7 +648,7 @@ def jp2openjpeg_19():
 # Validate GMLJP2 content against schema
 
 
-def jp2openjpeg_20():
+def test_jp2openjpeg_20():
 
     if gdaltest.jp2openjpeg_drv is None:
         return 'skip'
@@ -720,7 +720,7 @@ def jp2openjpeg_20():
 # Test YCC=NO creation option
 
 
-def jp2openjpeg_21():
+def test_jp2openjpeg_21():
 
     if gdaltest.jp2openjpeg_drv is None:
         return 'skip'
@@ -743,7 +743,7 @@ def jp2openjpeg_21():
 # Test RGBA support
 
 
-def jp2openjpeg_22():
+def test_jp2openjpeg_22():
 
     if gdaltest.jp2openjpeg_drv is None:
         return 'skip'
@@ -907,7 +907,7 @@ def jp2openjpeg_22():
 # Test NBITS support
 
 
-def jp2openjpeg_23():
+def test_jp2openjpeg_23():
 
     if gdaltest.jp2openjpeg_drv is None:
         return 'skip'
@@ -945,7 +945,7 @@ def jp2openjpeg_23():
 # Test Grey+alpha support
 
 
-def jp2openjpeg_24():
+def test_jp2openjpeg_24():
 
     if gdaltest.jp2openjpeg_drv is None:
         return 'skip'
@@ -1010,7 +1010,7 @@ def jp2openjpeg_24():
 # Test multiband support
 
 
-def jp2openjpeg_25():
+def test_jp2openjpeg_25():
 
     if gdaltest.jp2openjpeg_drv is None:
         return 'skip'
@@ -1080,7 +1080,7 @@ def validate(filename, expected_gmljp2=True, return_error_count=False, oidoc=Non
 # Test INSPIRE_TG support
 
 
-def jp2openjpeg_26():
+def test_jp2openjpeg_26():
 
     if gdaltest.jp2openjpeg_drv is None:
         return 'skip'
@@ -1290,7 +1290,7 @@ def jp2openjpeg_26():
 # Test CreateCopy() from a JPEG2000 with a 2048x2048 tiling
 
 
-def jp2openjpeg_27():
+def test_jp2openjpeg_27():
 
     if gdaltest.jp2openjpeg_drv is None:
         return 'skip'
@@ -1376,7 +1376,7 @@ def jp2openjpeg_test_codeblock(filename, codeblock_width, codeblock_height):
     return True
 
 
-def jp2openjpeg_28():
+def test_jp2openjpeg_28():
 
     if gdaltest.jp2openjpeg_drv is None:
         return 'skip'
@@ -1415,7 +1415,7 @@ def jp2openjpeg_28():
 # Test TILEPARTS option
 
 
-def jp2openjpeg_29():
+def test_jp2openjpeg_29():
 
     if gdaltest.jp2openjpeg_drv is None:
         return 'skip'
@@ -1453,7 +1453,7 @@ def jp2openjpeg_29():
 # Test color table support
 
 
-def jp2openjpeg_30():
+def test_jp2openjpeg_30():
 
     if gdaltest.jp2openjpeg_drv is None:
         return 'skip'
@@ -1555,7 +1555,7 @@ def jp2openjpeg_30():
 # Test unusual band color interpretation order
 
 
-def jp2openjpeg_31():
+def test_jp2openjpeg_31():
 
     if gdaltest.jp2openjpeg_drv is None:
         return 'skip'
@@ -1617,7 +1617,7 @@ def jp2openjpeg_31():
 # Test creation of "XLBoxes" for JP2C
 
 
-def jp2openjpeg_32():
+def test_jp2openjpeg_32():
 
     if gdaltest.jp2openjpeg_drv is None:
         return 'skip'
@@ -1638,7 +1638,7 @@ def jp2openjpeg_32():
 # Test crazy tile size
 
 
-def jp2openjpeg_33():
+def test_jp2openjpeg_33():
 
     if gdaltest.jp2openjpeg_drv is None:
         return 'skip'
@@ -1664,7 +1664,7 @@ def jp2openjpeg_33():
 # Test opening a file whose dimensions are > 2^31-1
 
 
-def jp2openjpeg_34():
+def test_jp2openjpeg_34():
 
     if gdaltest.jp2openjpeg_drv is None:
         return 'skip'
@@ -1682,7 +1682,7 @@ def jp2openjpeg_34():
 ###############################################################################
 # Test opening a truncated file
 
-def jp2openjpeg_35():
+def test_jp2openjpeg_35():
 
     if gdaltest.jp2openjpeg_drv is None:
         return 'skip'
@@ -1700,7 +1700,7 @@ def jp2openjpeg_35():
 # Test we cannot create files with more than 16384 bands
 
 
-def jp2openjpeg_36():
+def test_jp2openjpeg_36():
 
     if gdaltest.jp2openjpeg_drv is None:
         return 'skip'
@@ -1719,7 +1719,7 @@ def jp2openjpeg_36():
 # Test metadata reading & writing
 
 
-def jp2openjpeg_37():
+def test_jp2openjpeg_37():
 
     if gdaltest.jp2openjpeg_drv is None:
         return 'skip'
@@ -1850,7 +1850,7 @@ def jp2openjpeg_37():
 # Test non-EPSG SRS (so written with a GML dictionary)
 
 
-def jp2openjpeg_38():
+def test_jp2openjpeg_38():
 
     if gdaltest.jp2openjpeg_drv is None:
         return 'skip'
@@ -1893,7 +1893,7 @@ def jp2openjpeg_38():
 # Test GMLJP2OVERRIDE configuration option and DGIWG GMLJP2
 
 
-def jp2openjpeg_39():
+def test_jp2openjpeg_39():
 
     if gdaltest.jp2openjpeg_drv is None:
         return 'skip'
@@ -1967,7 +1967,7 @@ def jp2openjpeg_39():
 # Test we can parse GMLJP2 v2.0
 
 
-def jp2openjpeg_40():
+def test_jp2openjpeg_40():
 
     if gdaltest.jp2openjpeg_drv is None:
         return 'skip'
@@ -2051,7 +2051,7 @@ def jp2openjpeg_40():
 # Test USE_SRC_CODESTREAM=YES
 
 
-def jp2openjpeg_41():
+def test_jp2openjpeg_41():
 
     if gdaltest.jp2openjpeg_drv is None:
         return 'skip'
@@ -2101,7 +2101,7 @@ def jp2openjpeg_41():
 # Test update of existing file
 
 
-def jp2openjpeg_42():
+def test_jp2openjpeg_42():
 
     if gdaltest.jp2openjpeg_drv is None:
         return 'skip'
@@ -2314,7 +2314,7 @@ def jp2openjpeg_42():
 # Get structure of a JPEG2000 file
 
 
-def jp2openjpeg_43():
+def test_jp2openjpeg_43():
 
     ret = gdal.GetJPEG2000StructureAsString('data/byte.jp2', ['ALL=YES'])
     if ret is None:
@@ -2326,7 +2326,7 @@ def jp2openjpeg_43():
 # Check a file against a OrthoimageryCoverage document
 
 
-def jp2openjpeg_44():
+def test_jp2openjpeg_44():
 
     if gdaltest.jp2openjpeg_drv is None:
         return 'skip'
@@ -2344,7 +2344,7 @@ def jp2openjpeg_44():
 # Test GMLJP2v2
 
 
-def jp2openjpeg_45():
+def test_jp2openjpeg_45():
 
     if gdaltest.jp2openjpeg_drv is None:
         return 'skip'
@@ -3137,7 +3137,7 @@ def jp2openjpeg_45():
 # Test GMLJP2v2 metadata generator / XPath
 
 
-def jp2openjpeg_46():
+def test_jp2openjpeg_46():
 
     if gdaltest.jp2openjpeg_drv is None:
         return 'skip'
@@ -3307,7 +3307,7 @@ def jp2openjpeg_46():
 # Test writing & reading RPC in GeoJP2 box
 
 
-def jp2openjpeg_47():
+def test_jp2openjpeg_47():
 
     if gdaltest.jp2openjpeg_drv is None:
         return 'skip'
@@ -3333,7 +3333,7 @@ def jp2openjpeg_47():
 # Test reading a dataset whose tile dimensions are larger than dataset ones
 
 
-def jp2openjpeg_48():
+def test_jp2openjpeg_48():
 
     if gdaltest.jp2openjpeg_drv is None:
         return 'skip'
@@ -3354,7 +3354,7 @@ def jp2openjpeg_48():
 ###############################################################################
 
 
-def jp2openjpeg_online_1():
+def test_jp2openjpeg_online_1():
 
     if gdaltest.jp2openjpeg_drv is None:
         return 'skip'
@@ -3377,7 +3377,7 @@ def jp2openjpeg_online_1():
 ###############################################################################
 
 
-def jp2openjpeg_online_2():
+def test_jp2openjpeg_online_2():
 
     if gdaltest.jp2openjpeg_drv is None:
         return 'skip'
@@ -3409,7 +3409,7 @@ def jp2openjpeg_online_2():
 ###############################################################################
 
 
-def jp2openjpeg_online_3():
+def test_jp2openjpeg_online_3():
 
     if gdaltest.jp2openjpeg_drv is None:
         return 'skip'
@@ -3443,7 +3443,7 @@ def jp2openjpeg_online_3():
 ###############################################################################
 
 
-def jp2openjpeg_online_4():
+def test_jp2openjpeg_online_4():
 
     if gdaltest.jp2openjpeg_drv is None:
         return 'skip'
@@ -3478,7 +3478,7 @@ def jp2openjpeg_online_4():
 # Try reading JP2OpenJPEG with color table
 
 
-def jp2openjpeg_online_5():
+def test_jp2openjpeg_online_5():
 
     if gdaltest.jp2openjpeg_drv is None:
         return 'skip'
@@ -3503,7 +3503,7 @@ def jp2openjpeg_online_5():
 # Try reading YCbCr JP2OpenJPEG as RGB
 
 
-def jp2openjpeg_online_6():
+def test_jp2openjpeg_online_6():
 
     if gdaltest.jp2openjpeg_drv is None:
         return 'skip'
@@ -3528,7 +3528,7 @@ def jp2openjpeg_online_6():
 # Test GDAL_GEOREF_SOURCES
 
 
-def jp2openjpeg_49():
+def test_jp2openjpeg_49():
 
     if gdaltest.jp2openjpeg_drv is None:
         return 'skip'
@@ -3659,7 +3659,7 @@ def jp2openjpeg_49():
 # Test opening an image of small dimension with very small tiles (#7012)
 
 
-def jp2openjpeg_50():
+def test_jp2openjpeg_50():
 
     if gdaltest.jp2openjpeg_drv is None:
         return 'skip'
@@ -3682,7 +3682,7 @@ def jp2openjpeg_50():
 # Test CODEBLOCK_STYLE
 
 
-def jp2openjpeg_codeblock_style():
+def test_jp2openjpeg_codeblock_style():
 
     if gdaltest.jp2openjpeg_drv is None:
         return 'skip'
@@ -3729,7 +3729,7 @@ def jp2openjpeg_codeblock_style():
 # Test external overviews
 
 
-def jp2openjpeg_external_overviews_single_band():
+def test_jp2openjpeg_external_overviews_single_band():
 
     if gdaltest.jp2openjpeg_drv is None:
         return 'skip'
@@ -3758,7 +3758,7 @@ def jp2openjpeg_external_overviews_single_band():
 # Test external overviews
 
 
-def jp2openjpeg_external_overviews_multiple_band():
+def test_jp2openjpeg_external_overviews_multiple_band():
 
     if gdaltest.jp2openjpeg_drv is None:
         return 'skip'
@@ -3786,7 +3786,7 @@ def jp2openjpeg_external_overviews_multiple_band():
 ###############################################################################
 
 
-def jp2openjpeg_cleanup():
+def test_jp2openjpeg_cleanup():
 
     gdaltest.reregister_all_jpeg2000_drivers()
 
@@ -3794,72 +3794,72 @@ def jp2openjpeg_cleanup():
 
 
 gdaltest_list = [
-    jp2openjpeg_1,
-    jp2openjpeg_2,
-    jp2openjpeg_3,
-    jp2openjpeg_4,
-    jp2openjpeg_4_vsimem,
-    jp2openjpeg_5,
-    jp2openjpeg_6,
-    jp2openjpeg_7,
-    jp2openjpeg_8,
-    jp2openjpeg_9,
-    jp2openjpeg_10,
-    jp2openjpeg_11,
-    jp2openjpeg_12,
-    jp2openjpeg_13,
-    jp2openjpeg_14,
-    jp2openjpeg_15,
-    jp2openjpeg_16,
-    jp2openjpeg_17,
-    jp2openjpeg_18,
-    jp2openjpeg_19,
-    jp2openjpeg_20,
-    jp2openjpeg_21,
-    jp2openjpeg_22,
-    jp2openjpeg_23,
-    jp2openjpeg_24,
-    jp2openjpeg_25,
-    jp2openjpeg_26,
-    jp2openjpeg_27,
-    jp2openjpeg_28,
-    jp2openjpeg_29,
-    jp2openjpeg_30,
-    jp2openjpeg_31,
-    jp2openjpeg_32,
-    jp2openjpeg_33,
-    jp2openjpeg_34,
-    jp2openjpeg_35,
-    jp2openjpeg_36,
-    jp2openjpeg_37,
-    jp2openjpeg_38,
-    jp2openjpeg_39,
-    jp2openjpeg_40,
-    jp2openjpeg_41,
-    jp2openjpeg_42,
-    jp2openjpeg_43,
-    jp2openjpeg_44,
-    jp2openjpeg_45,
-    jp2openjpeg_46,
-    jp2openjpeg_47,
-    jp2openjpeg_48,
-    jp2openjpeg_49,
-    jp2openjpeg_50,
-    jp2openjpeg_codeblock_style,
-    jp2openjpeg_external_overviews_single_band,
-    jp2openjpeg_external_overviews_multiple_band,
-    jp2openjpeg_online_1,
-    jp2openjpeg_online_2,
-    jp2openjpeg_online_3,
-    jp2openjpeg_online_4,
-    jp2openjpeg_online_5,
-    jp2openjpeg_online_6,
-    jp2openjpeg_cleanup]
+    test_jp2openjpeg_1,
+    test_jp2openjpeg_2,
+    test_jp2openjpeg_3,
+    test_jp2openjpeg_4,
+    test_jp2openjpeg_4_vsimem,
+    test_jp2openjpeg_5,
+    test_jp2openjpeg_6,
+    test_jp2openjpeg_7,
+    test_jp2openjpeg_8,
+    test_jp2openjpeg_9,
+    test_jp2openjpeg_10,
+    test_jp2openjpeg_11,
+    test_jp2openjpeg_12,
+    test_jp2openjpeg_13,
+    test_jp2openjpeg_14,
+    test_jp2openjpeg_15,
+    test_jp2openjpeg_16,
+    test_jp2openjpeg_17,
+    test_jp2openjpeg_18,
+    test_jp2openjpeg_19,
+    test_jp2openjpeg_20,
+    test_jp2openjpeg_21,
+    test_jp2openjpeg_22,
+    test_jp2openjpeg_23,
+    test_jp2openjpeg_24,
+    test_jp2openjpeg_25,
+    test_jp2openjpeg_26,
+    test_jp2openjpeg_27,
+    test_jp2openjpeg_28,
+    test_jp2openjpeg_29,
+    test_jp2openjpeg_30,
+    test_jp2openjpeg_31,
+    test_jp2openjpeg_32,
+    test_jp2openjpeg_33,
+    test_jp2openjpeg_34,
+    test_jp2openjpeg_35,
+    test_jp2openjpeg_36,
+    test_jp2openjpeg_37,
+    test_jp2openjpeg_38,
+    test_jp2openjpeg_39,
+    test_jp2openjpeg_40,
+    test_jp2openjpeg_41,
+    test_jp2openjpeg_42,
+    test_jp2openjpeg_43,
+    test_jp2openjpeg_44,
+    test_jp2openjpeg_45,
+    test_jp2openjpeg_46,
+    test_jp2openjpeg_47,
+    test_jp2openjpeg_48,
+    test_jp2openjpeg_49,
+    test_jp2openjpeg_50,
+    test_jp2openjpeg_codeblock_style,
+    test_jp2openjpeg_external_overviews_single_band,
+    test_jp2openjpeg_external_overviews_multiple_band,
+    test_jp2openjpeg_online_1,
+    test_jp2openjpeg_online_2,
+    test_jp2openjpeg_online_3,
+    test_jp2openjpeg_online_4,
+    test_jp2openjpeg_online_5,
+    test_jp2openjpeg_online_6,
+    test_jp2openjpeg_cleanup]
 
 disabled_gdaltest_list = [
-    jp2openjpeg_1,
-    jp2openjpeg_45,
-    jp2openjpeg_cleanup]
+    test_jp2openjpeg_1,
+    test_jp2openjpeg_45,
+    test_jp2openjpeg_cleanup]
 
 if __name__ == '__main__':
 
diff --git a/autotest/gdrivers/jpeg.py b/autotest/gdrivers/jpeg.py
index f9d1d42e0d35..baa2a2732d48 100755
--- a/autotest/gdrivers/jpeg.py
+++ b/autotest/gdrivers/jpeg.py
@@ -44,7 +44,7 @@
 # Perform simple read test.
 
 
-def jpeg_1():
+def test_jpeg_1():
 
     ds = gdal.Open('data/albania.jpg')
     cs = ds.GetRasterBand(2).Checksum()
@@ -68,7 +68,7 @@ def jpeg_1():
 # Verify EXIF metadata, color interpretation and image_structure
 
 
-def jpeg_2():
+def test_jpeg_2():
 
     ds = gdal.Open('data/albania.jpg')
 
@@ -114,7 +114,7 @@ def jpeg_2():
 # Create simple copy and check (greyscale) using progressive option.
 
 
-def jpeg_3():
+def test_jpeg_3():
 
     ds = gdal.Open('data/byte.tif')
 
@@ -184,7 +184,7 @@ def jpeg_3():
 # Verify masked jpeg.
 
 
-def jpeg_4():
+def test_jpeg_4():
 
     try:
         gdalconst.GMF_ALL_VALID
@@ -211,7 +211,7 @@ def jpeg_4():
 # Verify CreateCopy() of masked jpeg.
 
 
-def jpeg_5():
+def test_jpeg_5():
 
     try:
         gdalconst.GMF_ALL_VALID
@@ -246,7 +246,7 @@ def jpeg_5():
 # not affect opening the file which just reads the header.
 
 
-def jpeg_6():
+def test_jpeg_6():
 
     ds = gdal.Open('data/vophead.jpg')
 
@@ -280,7 +280,7 @@ def jpeg_6():
 ###############################################################################
 # Test creating an in memory copy.
 
-def jpeg_7():
+def test_jpeg_7():
 
     ds = gdal.Open('data/byte.tif')
 
@@ -306,7 +306,7 @@ def jpeg_7():
 # Read a CMYK image as a RGB image
 
 
-def jpeg_8():
+def test_jpeg_8():
 
     ds = gdal.Open('data/rgb_ntf_cmyk.jpg')
 
@@ -358,7 +358,7 @@ def jpeg_8():
 # Read a CMYK image as a CMYK image
 
 
-def jpeg_9():
+def test_jpeg_9():
 
     gdal.SetConfigOption('GDAL_JPEG_TO_RGB', 'NO')
     ds = gdal.Open('data/rgb_ntf_cmyk.jpg')
@@ -418,7 +418,7 @@ def jpeg_9():
 # Check reading a 12-bit JPEG
 
 
-def jpeg_10():
+def test_jpeg_10():
 
     if gdaltest.jpeg_version == '9b':  # Fails for some reason
         return 'skip'
@@ -455,7 +455,7 @@ def jpeg_10():
 # Check creating a 12-bit JPEG
 
 
-def jpeg_11():
+def test_jpeg_11():
 
     if gdaltest.jpeg_version == '9b':  # Fails for some reason
         return 'skip'
@@ -488,7 +488,7 @@ def jpeg_11():
 # Test reading a stored JPEG in ZIP (#3908)
 
 
-def jpeg_12():
+def test_jpeg_12():
 
     ds = gdal.Open('/vsizip/data/byte_jpg.zip')
     if ds is None:
@@ -512,7 +512,7 @@ def jpeg_12():
 # Test writing to /vsistdout/
 
 
-def jpeg_13():
+def test_jpeg_13():
 
     src_ds = gdal.Open('data/byte.tif')
     ds = gdal.GetDriverByName('JPEG').CreateCopy(
@@ -535,7 +535,7 @@ def jpeg_13():
 # Test writing to /vsistdout/
 
 
-def jpeg_14():
+def test_jpeg_14():
 
     if gdaltest.jpeg_version == '9b':  # Fails for some reason
         return 'skip'
@@ -566,7 +566,7 @@ def jpeg_14():
 # Test CreateCopy() interruption
 
 
-def jpeg_15():
+def test_jpeg_15():
 
     tst = gdaltest.GDALTest('JPEG', 'albania.jpg', 2, 17016)
 
@@ -576,7 +576,7 @@ def jpeg_15():
 # Test overview support
 
 
-def jpeg_16():
+def test_jpeg_16():
 
     shutil.copy('data/albania.jpg', 'tmp/albania.jpg')
     gdal.Unlink('tmp/albania.jpg.ovr')
@@ -647,7 +647,7 @@ def jpeg_16():
 # Test bogus files
 
 
-def jpeg_17():
+def test_jpeg_17():
     gdal.ErrorReset()
     with gdaltest.error_handler('CPLQuietErrorHandler'):
         ds = gdal.Open('data/bogus.jpg')
@@ -701,7 +701,7 @@ def jpeg_17():
 # Test situation where we cause a restart and need to reset scale
 
 
-def jpeg_18():
+def test_jpeg_18():
     height = 1024
     width = 1024
     src_ds = gdal.GetDriverByName('GTiff').Create('/vsimem/jpeg_18.tif',
@@ -771,7 +771,7 @@ def jpeg_18():
 # Test MSB ordering of bits in mask (#5102)
 
 
-def jpeg_19():
+def test_jpeg_19():
 
     for width, height, iX in [(32, 32, 12), (25, 25, 8), (24, 25, 8)]:
         src_ds = gdal.GetDriverByName('GTiff').Create('/vsimem/jpeg_19.tif',
@@ -846,7 +846,7 @@ def jpeg_19():
 # Test correct GCP reading with PAM (#5352)
 
 
-def jpeg_20():
+def test_jpeg_20():
 
     src_ds = gdal.Open('data/rgb_gcp.vrt')
     ds = gdal.GetDriverByName('JPEG').CreateCopy('/vsimem/jpeg_20.jpg', src_ds)
@@ -873,7 +873,7 @@ def jpeg_20():
 # Test implicit and EXIF overviews
 
 
-def jpeg_21():
+def test_jpeg_21():
 
     ds = gdal.Open('data/black_with_white_exif_ovr.jpg')
     if ds.GetRasterBand(1).GetOverviewCount() != 3:
@@ -902,7 +902,7 @@ def jpeg_21():
 # Test generation of EXIF overviews
 
 
-def jpeg_22():
+def test_jpeg_22():
 
     src_ds = gdal.GetDriverByName('Mem').Create('', 4096, 2048)
     src_ds.GetRasterBand(1).Fill(255)
@@ -993,7 +993,7 @@ def jpeg_22():
 # Test optimized JPEG IRasterIO
 
 
-def jpeg_23():
+def test_jpeg_23():
     ds = gdal.Open('data/albania.jpg')
     cs = [ds.GetRasterBand(i + 1).Checksum() for i in range(3)]
 
@@ -1038,7 +1038,7 @@ def jpeg_23():
 # in CreateCopy())
 
 
-def jpeg_24():
+def test_jpeg_24():
 
     has_arithmetic = bool(gdal.GetDriverByName('JPEG').GetMetadataItem(
         'DMD_CREATIONOPTIONLIST').find('ARITHMETIC') >= 0)
@@ -1072,7 +1072,7 @@ def jpeg_24():
 # Test COMMENT
 
 
-def jpeg_25():
+def test_jpeg_25():
 
     src_ds = gdal.Open('data/byte.tif')
     ds = gdal.GetDriverByName('JPEG').CreateCopy(
@@ -1093,7 +1093,7 @@ def jpeg_25():
 # Test creation error
 
 
-def jpeg_26():
+def test_jpeg_26():
 
     src_ds = gdal.GetDriverByName('Mem').Create('', 70000, 1)
     with gdaltest.error_handler():
@@ -1111,7 +1111,7 @@ def jpeg_26():
 # http://www.libjpeg-jpeg_26.org/pmwiki/uploads/About/TwoIssueswiththeJPEGStandard.pdf
 
 
-def jpeg_27():
+def test_jpeg_27():
 
     # Should error out with 'Reading this strip would require
     # libjpeg to allocate at least...'
@@ -1142,7 +1142,7 @@ def jpeg_27():
 # Test writing of EXIF and GPS tags
 
 
-def jpeg_28():
+def test_jpeg_28():
 
     tmpfilename = '/vsimem/jpeg_28.jpg'
 
@@ -1320,42 +1320,42 @@ def jpeg_28():
 # Cleanup
 
 
-def jpeg_cleanup():
+def test_jpeg_cleanup():
     gdal.Unlink('tmp/albania.jpg')
     gdal.Unlink('tmp/albania.jpg.ovr')
     return 'success'
 
 
 gdaltest_list = [
-    jpeg_1,
-    jpeg_2,
-    jpeg_3,
-    jpeg_4,
-    jpeg_5,
-    jpeg_6,
-    jpeg_7,
-    jpeg_8,
-    jpeg_9,
-    jpeg_10,
-    jpeg_11,
-    jpeg_12,
-    jpeg_13,
-    jpeg_14,
-    jpeg_15,
-    jpeg_16,
-    jpeg_17,
-    jpeg_18,
-    jpeg_19,
-    jpeg_20,
-    jpeg_21,
-    jpeg_22,
-    jpeg_23,
-    jpeg_24,
-    jpeg_25,
-    jpeg_26,
-    jpeg_27,
-    jpeg_28,
-    jpeg_cleanup]
+    test_jpeg_1,
+    test_jpeg_2,
+    test_jpeg_3,
+    test_jpeg_4,
+    test_jpeg_5,
+    test_jpeg_6,
+    test_jpeg_7,
+    test_jpeg_8,
+    test_jpeg_9,
+    test_jpeg_10,
+    test_jpeg_11,
+    test_jpeg_12,
+    test_jpeg_13,
+    test_jpeg_14,
+    test_jpeg_15,
+    test_jpeg_16,
+    test_jpeg_17,
+    test_jpeg_18,
+    test_jpeg_19,
+    test_jpeg_20,
+    test_jpeg_21,
+    test_jpeg_22,
+    test_jpeg_23,
+    test_jpeg_24,
+    test_jpeg_25,
+    test_jpeg_26,
+    test_jpeg_27,
+    test_jpeg_28,
+    test_jpeg_cleanup]
 
 # gdaltest_list = [ jpeg_28 ]
 
diff --git a/autotest/gdrivers/jpeg2000.py b/autotest/gdrivers/jpeg2000.py
index 129d9a31b1f2..f357668eba81 100755
--- a/autotest/gdrivers/jpeg2000.py
+++ b/autotest/gdrivers/jpeg2000.py
@@ -63,7 +63,7 @@ def is_buggy_jasper():
 # Verify we have the driver.
 
 
-def jpeg2000_1():
+def test_jpeg2000_1():
 
     gdaltest.jpeg2000_drv = gdal.GetDriverByName('JPEG2000')
 
@@ -75,7 +75,7 @@ def jpeg2000_1():
 # Open byte.jp2
 
 
-def jpeg2000_2():
+def test_jpeg2000_2():
 
     if gdaltest.jpeg2000_drv is None:
         return 'skip'
@@ -108,7 +108,7 @@ def jpeg2000_2():
 # Open int16.jp2
 
 
-def jpeg2000_3():
+def test_jpeg2000_3():
 
     if gdaltest.jpeg2000_drv is None:
         return 'skip'
@@ -134,7 +134,7 @@ def jpeg2000_3():
 # Test copying byte.jp2
 
 
-def jpeg2000_4():
+def test_jpeg2000_4():
 
     if gdaltest.jpeg2000_drv is None:
         return 'skip'
@@ -154,7 +154,7 @@ def jpeg2000_4():
 # Test copying int16.jp2
 
 
-def jpeg2000_5():
+def test_jpeg2000_5():
 
     if gdaltest.jpeg2000_drv is None:
         return 'skip'
@@ -166,7 +166,7 @@ def jpeg2000_5():
 # Test reading ll.jp2
 
 
-def jpeg2000_6():
+def test_jpeg2000_6():
 
     if gdaltest.jpeg2000_drv is None:
         return 'skip'
@@ -186,7 +186,7 @@ def jpeg2000_6():
 # Open byte.jp2.gz (test use of the VSIL API)
 
 
-def jpeg2000_7():
+def test_jpeg2000_7():
 
     if gdaltest.jpeg2000_drv is None:
         return 'skip'
@@ -198,7 +198,7 @@ def jpeg2000_7():
 # Test a JPEG2000 with the 3 bands having 13bit depth and the 4th one 1 bit
 
 
-def jpeg2000_8():
+def test_jpeg2000_8():
 
     if gdaltest.jpeg2000_drv is None or is_buggy_jasper():
         return 'skip'
@@ -222,7 +222,7 @@ def jpeg2000_8():
 # Check that we can use .j2w world files (#4651)
 
 
-def jpeg2000_9():
+def test_jpeg2000_9():
 
     if gdaltest.jpeg2000_drv is None:
         return 'skip'
@@ -248,7 +248,7 @@ def jpeg2000_9():
 # Check writing a file with more than 4 bands (#4686)
 
 
-def jpeg2000_10():
+def test_jpeg2000_10():
 
     if gdaltest.jpeg2000_drv is None:
         return 'skip'
@@ -281,7 +281,7 @@ def jpeg2000_10():
 # Test auto-promotion of 1bit alpha band to 8bit
 
 
-def jpeg2000_11():
+def test_jpeg2000_11():
 
     if gdaltest.jpeg2000_drv is None or is_buggy_jasper():
         return 'skip'
@@ -331,7 +331,7 @@ def jpeg2000_11():
 ###############################################################################
 
 
-def jpeg2000_online_1():
+def test_jpeg2000_online_1():
 
     if gdaltest.jpeg2000_drv is None:
         return 'skip'
@@ -354,7 +354,7 @@ def jpeg2000_online_1():
 ###############################################################################
 
 
-def jpeg2000_online_2():
+def test_jpeg2000_online_2():
 
     if gdaltest.jpeg2000_drv is None:
         return 'skip'
@@ -386,7 +386,7 @@ def jpeg2000_online_2():
 ###############################################################################
 
 
-def jpeg2000_online_3():
+def test_jpeg2000_online_3():
 
     if gdaltest.jpeg2000_drv is None:
         return 'skip'
@@ -421,7 +421,7 @@ def jpeg2000_online_3():
 ###############################################################################
 
 
-def jpeg2000_online_4():
+def test_jpeg2000_online_4():
 
     if gdaltest.jpeg2000_drv is None:
         return 'skip'
@@ -459,7 +459,7 @@ def jpeg2000_online_4():
 # Try reading JPEG2000 with color table
 
 
-def jpeg2000_online_5():
+def test_jpeg2000_online_5():
 
     if gdaltest.jpeg2000_drv is None:
         return 'skip'
@@ -484,7 +484,7 @@ def jpeg2000_online_5():
 # Try reading YCbCr JPEG2000 as RGB
 
 
-def jpeg2000_online_6():
+def test_jpeg2000_online_6():
 
     if gdaltest.jpeg2000_drv is None:
         return 'skip'
@@ -508,7 +508,7 @@ def jpeg2000_online_6():
 ###############################################################################
 
 
-def jpeg2000_cleanup():
+def test_jpeg2000_cleanup():
 
     gdaltest.reregister_all_jpeg2000_drivers()
 
@@ -516,24 +516,24 @@ def jpeg2000_cleanup():
 
 
 gdaltest_list = [
-    jpeg2000_1,
-    jpeg2000_2,
-    jpeg2000_3,
-    jpeg2000_4,
-    jpeg2000_5,
-    jpeg2000_6,
-    jpeg2000_7,
-    jpeg2000_8,
-    jpeg2000_9,
-    jpeg2000_10,
-    jpeg2000_11,
-    jpeg2000_online_1,
-    jpeg2000_online_2,
-    jpeg2000_online_3,
-    jpeg2000_online_4,
-    jpeg2000_online_5,
-    jpeg2000_online_6,
-    jpeg2000_cleanup]
+    test_jpeg2000_1,
+    test_jpeg2000_2,
+    test_jpeg2000_3,
+    test_jpeg2000_4,
+    test_jpeg2000_5,
+    test_jpeg2000_6,
+    test_jpeg2000_7,
+    test_jpeg2000_8,
+    test_jpeg2000_9,
+    test_jpeg2000_10,
+    test_jpeg2000_11,
+    test_jpeg2000_online_1,
+    test_jpeg2000_online_2,
+    test_jpeg2000_online_3,
+    test_jpeg2000_online_4,
+    test_jpeg2000_online_5,
+    test_jpeg2000_online_6,
+    test_jpeg2000_cleanup]
 
 if __name__ == '__main__':
 
diff --git a/autotest/gdrivers/jpeg_profile.py b/autotest/gdrivers/jpeg_profile.py
index c0bb8c7a77ba..08eabc5ea909 100755
--- a/autotest/gdrivers/jpeg_profile.py
+++ b/autotest/gdrivers/jpeg_profile.py
@@ -42,7 +42,7 @@
 ###############################################################################
 # Test writing and reading of ICC profile in CreateCopy()
 
-def jpeg_copy_icc():
+def test_jpeg_copy_icc():
 
     f = open('data/sRGB.icc', 'rb')
     data = f.read()
@@ -85,7 +85,7 @@ def jpeg_copy_icc():
 # Test writing and reading of ICC profile in CreateCopy() options
 
 
-def jpeg_copy_options_icc():
+def test_jpeg_copy_options_icc():
 
     f = open('data/sRGB.icc', 'rb')
     data = f.read()
@@ -128,7 +128,7 @@ def jpeg_copy_options_icc():
 # Test writing and reading of 64K+ ICC profile in CreateCopy()
 
 
-def jpeg_copy_icc_64K():
+def test_jpeg_copy_icc_64K():
 
     # In JPEG, APP2 chunks can only be 64K, so they would be split up.
     # It will still work, but need to test that the segmented ICC profile
@@ -211,9 +211,9 @@ def jpeg_copy_icc_64K():
 
 
 gdaltest_list = [
-    jpeg_copy_icc,
-    jpeg_copy_options_icc,
-    jpeg_copy_icc_64K,
+    test_jpeg_copy_icc,
+    test_jpeg_copy_options_icc,
+    test_jpeg_copy_icc_64K,
 ]
 
 if __name__ == '__main__':
diff --git a/autotest/gdrivers/jpegls.py b/autotest/gdrivers/jpegls.py
index e1f06cc3ad06..75d7b5964790 100755
--- a/autotest/gdrivers/jpegls.py
+++ b/autotest/gdrivers/jpegls.py
@@ -37,7 +37,7 @@
 ###############################################################################
 
 
-def jpegls_1():
+def test_jpegls_1():
 
     if gdal.GetDriverByName('JPEGLS') is None:
         return 'skip'
@@ -48,7 +48,7 @@ def jpegls_1():
 ###############################################################################
 
 
-def jpegls_2():
+def test_jpegls_2():
 
     if gdal.GetDriverByName('JPEGLS') is None:
         return 'skip'
@@ -58,8 +58,8 @@ def jpegls_2():
 
 
 gdaltest_list = [
-    jpegls_1,
-    jpegls_2]
+    test_jpegls_1,
+    test_jpegls_2]
 
 
 if __name__ == '__main__':
diff --git a/autotest/gdrivers/jpipkak.py b/autotest/gdrivers/jpipkak.py
index ff2faa332765..d9775334b55b 100755
--- a/autotest/gdrivers/jpipkak.py
+++ b/autotest/gdrivers/jpipkak.py
@@ -38,7 +38,7 @@
 # Read test of simple byte reference data.
 
 
-def jpipkak_1():
+def test_jpipkak_1():
 
     return 'skip'
 
@@ -67,7 +67,7 @@ def jpipkak_1():
 #
 
 
-def jpipkak_2():
+def test_jpipkak_2():
 
     return 'skip'
 
@@ -101,7 +101,7 @@ def jpipkak_2():
 # Test an 11bit image.
 
 
-def jpipkak_3():
+def test_jpipkak_3():
 
     return 'skip'
 
@@ -129,7 +129,7 @@ def jpipkak_3():
 # Test a 20bit image, reduced to 16bit during processing.
 
 
-def jpipkak_4():
+def test_jpipkak_4():
 
     return 'skip'
 
@@ -157,7 +157,7 @@ def jpipkak_4():
 # Test an overview level that will result in multiple fetches with subwindows.
 
 
-def jpipkak_5():
+def test_jpipkak_5():
 
     return 'skip'
 
@@ -183,11 +183,11 @@ def jpipkak_5():
 
 
 gdaltest_list = [
-    jpipkak_1,
-    jpipkak_2,
-    jpipkak_3,
-    jpipkak_4,
-    jpipkak_5
+    test_jpipkak_1,
+    test_jpipkak_2,
+    test_jpipkak_3,
+    test_jpipkak_4,
+    test_jpipkak_5
 ]
 
 if __name__ == '__main__':
diff --git a/autotest/gdrivers/kea.py b/autotest/gdrivers/kea.py
index 2c885e70dfb1..25990fc5f6f8 100755
--- a/autotest/gdrivers/kea.py
+++ b/autotest/gdrivers/kea.py
@@ -38,7 +38,7 @@
 ###############################################################################
 
 
-def kea_init():
+def test_kea_init():
     gdaltest.kea_driver = gdal.GetDriverByName('KEA')
 
     return 'success'
@@ -47,7 +47,7 @@ def kea_init():
 # Test copying a reference sample with CreateCopy()
 
 
-def kea_1():
+def test_kea_1():
     if gdaltest.kea_driver is None:
         return 'skip'
 
@@ -58,7 +58,7 @@ def kea_1():
 # Test CreateCopy() for various data types
 
 
-def kea_2():
+def test_kea_2():
     if gdaltest.kea_driver is None:
         return 'skip'
 
@@ -82,7 +82,7 @@ def kea_2():
 # Test Create() for various data types
 
 
-def kea_3():
+def test_kea_3():
     if gdaltest.kea_driver is None:
         return 'skip'
 
@@ -106,7 +106,7 @@ def kea_3():
 # Test Create()/CreateCopy() error cases or limit cases
 
 
-def kea_4():
+def test_kea_4():
     if gdaltest.kea_driver is None:
         return 'skip'
 
@@ -216,7 +216,7 @@ def kea_4():
 # Test Create() creation options
 
 
-def kea_5():
+def test_kea_5():
     if gdaltest.kea_driver is None:
         return 'skip'
 
@@ -255,7 +255,7 @@ def kea_5():
 # Test metadata
 
 
-def kea_6():
+def test_kea_6():
     if gdaltest.kea_driver is None:
         return 'skip'
 
@@ -360,7 +360,7 @@ def kea_6():
 # Test georef
 
 
-def kea_7():
+def test_kea_7():
     if gdaltest.kea_driver is None:
         return 'skip'
 
@@ -437,7 +437,7 @@ def kea_7():
 # Test colortable
 
 
-def kea_8():
+def test_kea_8():
     if gdaltest.kea_driver is None:
         return 'skip'
 
@@ -485,7 +485,7 @@ def kea_8():
 # Test color interpretation
 
 
-def kea_9():
+def test_kea_9():
     if gdaltest.kea_driver is None:
         return 'skip'
 
@@ -518,7 +518,7 @@ def kea_9():
 # Test nodata
 
 
-def kea_10():
+def test_kea_10():
     if gdaltest.kea_driver is None:
         return 'skip'
 
@@ -583,7 +583,7 @@ def kea_10():
 # Test AddBand
 
 
-def kea_11():
+def test_kea_11():
     if gdaltest.kea_driver is None:
         return 'skip'
 
@@ -619,7 +619,7 @@ def kea_11():
 # Test RAT
 
 
-def kea_12():
+def test_kea_12():
     if gdaltest.kea_driver is None:
         return 'skip'
 
@@ -783,7 +783,7 @@ def kea_12():
 # Test overviews
 
 
-def kea_13():
+def test_kea_13():
     if gdaltest.kea_driver is None:
         return 'skip'
 
@@ -824,7 +824,7 @@ def kea_13():
 # Test mask bands
 
 
-def kea_14():
+def test_kea_14():
     if gdaltest.kea_driver is None:
         return 'skip'
 
@@ -870,21 +870,21 @@ def kea_14():
 
 
 gdaltest_list = [
-    kea_init,
-    kea_1,
-    kea_2,
-    kea_3,
-    kea_4,
-    kea_5,
-    kea_6,
-    kea_7,
-    kea_8,
-    kea_9,
-    kea_10,
-    kea_11,
-    kea_12,
-    kea_13,
-    kea_14
+    test_kea_init,
+    test_kea_1,
+    test_kea_2,
+    test_kea_3,
+    test_kea_4,
+    test_kea_5,
+    test_kea_6,
+    test_kea_7,
+    test_kea_8,
+    test_kea_9,
+    test_kea_10,
+    test_kea_11,
+    test_kea_12,
+    test_kea_13,
+    test_kea_14
 ]
 
 if __name__ == '__main__':
diff --git a/autotest/gdrivers/kmlsuperoverlay.py b/autotest/gdrivers/kmlsuperoverlay.py
index d1d81084f5e4..be22f66c7231 100755
--- a/autotest/gdrivers/kmlsuperoverlay.py
+++ b/autotest/gdrivers/kmlsuperoverlay.py
@@ -41,7 +41,7 @@
 # Test CreateCopy() to a KMZ file
 
 
-def kmlsuperoverlay_1():
+def test_kmlsuperoverlay_1():
 
     tst = gdaltest.GDALTest('KMLSUPEROVERLAY', 'small_world.tif', 1, 30111, options=['FORMAT=PNG'])
 
@@ -51,7 +51,7 @@ def kmlsuperoverlay_1():
 # Test CreateCopy() to a KML file
 
 
-def kmlsuperoverlay_2():
+def test_kmlsuperoverlay_2():
 
     tst = gdaltest.GDALTest('KMLSUPEROVERLAY', 'small_world.tif', 1, 30111, options=['FORMAT=PNG'])
 
@@ -61,7 +61,7 @@ def kmlsuperoverlay_2():
 # Test CreateCopy() to a KML file
 
 
-def kmlsuperoverlay_3():
+def test_kmlsuperoverlay_3():
 
     src_ds = gdal.Open('data/utm.tif')
     ds = gdal.GetDriverByName('KMLSUPEROVERLAY').CreateCopy('tmp/tmp.kml', src_ds)
@@ -95,7 +95,7 @@ def kmlsuperoverlay_3():
 # Test overviews
 
 
-def kmlsuperoverlay_4():
+def test_kmlsuperoverlay_4():
 
     vrt_xml = """<VRTDataset rasterXSize="800" rasterYSize="400">
   <SRS>GEOGCS["WGS 84",DATUM["WGS_1984",SPHEROID["WGS 84",6378137,298.257223563,AUTHORITY["EPSG","7030"]],AUTHORITY["EPSG","6326"]],PRIMEM["Greenwich",0],UNIT["degree",0.0174532925199433],AUTHORITY["EPSG","4326"]]</SRS>
@@ -198,7 +198,7 @@ def kmlsuperoverlay_4():
 # Test that a raster which crosses the anti-meridian will be able to be displayed correctly (#4528)
 
 
-def kmlsuperoverlay_5():
+def test_kmlsuperoverlay_5():
 
     try:
         from xml.etree import ElementTree
@@ -267,7 +267,7 @@ def kmlsuperoverlay_5():
 # Test raster KML with alternate structure (such as http://opentopo.sdsc.edu/files/Haiti/NGA_Haiti_LiDAR2.kmz))
 
 
-def kmlsuperoverlay_6():
+def test_kmlsuperoverlay_6():
 
     ds = gdal.Open('data/kmlimage.kmz')
     if ds.GetProjectionRef().find('WGS_1984') < 0:
@@ -304,7 +304,7 @@ def kmlsuperoverlay_6():
 # Test raster KML with single Overlay (such as https://trac.osgeo.org/gdal/ticket/6712)
 
 
-def kmlsuperoverlay_7():
+def test_kmlsuperoverlay_7():
 
     ds = gdal.Open('data/small_world.kml')
     if ds.GetProjectionRef().find('WGS_1984') < 0:
@@ -334,7 +334,7 @@ def kmlsuperoverlay_7():
 # KML/PNG files in transparent areas
 
 
-def kmlsuperoverlay_8():
+def test_kmlsuperoverlay_8():
 
     # a large raster with actual data on each end and blank space in between
     src_ds = gdal.Open("""<VRTDataset rasterXSize="2048" rasterYSize="512">
@@ -441,7 +441,7 @@ def kmlsuperoverlay_8():
 # Cleanup
 
 
-def kmlsuperoverlay_cleanup():
+def test_kmlsuperoverlay_cleanup():
 
     gdal.Unlink('/vsimem/0/0/0.png')
     gdal.Unlink('/vsimem/0/0/0.kml')
@@ -454,15 +454,15 @@ def kmlsuperoverlay_cleanup():
 
 
 gdaltest_list = [
-    kmlsuperoverlay_1,
-    kmlsuperoverlay_2,
-    kmlsuperoverlay_3,
-    kmlsuperoverlay_4,
-    kmlsuperoverlay_5,
-    kmlsuperoverlay_6,
-    kmlsuperoverlay_7,
-    kmlsuperoverlay_8,
-    kmlsuperoverlay_cleanup]
+    test_kmlsuperoverlay_1,
+    test_kmlsuperoverlay_2,
+    test_kmlsuperoverlay_3,
+    test_kmlsuperoverlay_4,
+    test_kmlsuperoverlay_5,
+    test_kmlsuperoverlay_6,
+    test_kmlsuperoverlay_7,
+    test_kmlsuperoverlay_8,
+    test_kmlsuperoverlay_cleanup]
 
 if __name__ == '__main__':
 
diff --git a/autotest/gdrivers/kro.py b/autotest/gdrivers/kro.py
index 3a4d8bdba2d6..e1cca0b76541 100755
--- a/autotest/gdrivers/kro.py
+++ b/autotest/gdrivers/kro.py
@@ -39,7 +39,7 @@
 # Create 3-band byte
 
 
-def kro_1():
+def test_kro_1():
 
     tst = gdaltest.GDALTest('KRO', 'rgbsmall.tif', 2, 21053)
 
@@ -49,7 +49,7 @@ def kro_1():
 # Create 1-band uint16
 
 
-def kro_2():
+def test_kro_2():
 
     tst = gdaltest.GDALTest('KRO', '../../gcore/data/uint16.tif', 1, 4672)
 
@@ -59,7 +59,7 @@ def kro_2():
 # Create 1-band float32
 
 
-def kro_3():
+def test_kro_3():
 
     tst = gdaltest.GDALTest('KRO', '../../gcore/data/float32.tif', 1, 4672)
 
@@ -69,7 +69,7 @@ def kro_3():
 # Create 4-band rgba uint16
 
 
-def kro_4():
+def test_kro_4():
 
     tst = gdaltest.GDALTest('KRO', 'rgba16.png', 1, 1886)
 
@@ -79,7 +79,7 @@ def kro_4():
 # Test optimized IO
 
 
-def kro_5():
+def test_kro_5():
 
     # Determine if the filesystem supports sparse files (we don't want to create a real 10 GB
     # file !
@@ -99,11 +99,11 @@ def kro_5():
 
 
 gdaltest_list = [
-    kro_1,
-    kro_2,
-    kro_3,
-    kro_4,
-    kro_5,
+    test_kro_1,
+    test_kro_2,
+    test_kro_3,
+    test_kro_4,
+    test_kro_5,
 ]
 
 
diff --git a/autotest/gdrivers/l1b.py b/autotest/gdrivers/l1b.py
index 988d0ddab31e..4a58a632eeb5 100755
--- a/autotest/gdrivers/l1b.py
+++ b/autotest/gdrivers/l1b.py
@@ -76,7 +76,7 @@ def test_l1b(downloadURL, fileName, checksum, download_size, gcpNumber):
     assert len(ds.GetGCPs()) == gcpNumber
 
 
-def l1b_geoloc():
+def test_l1b_geoloc():
     try:
         os.stat('tmp/cache/n12gac8bit.l1b')
     except OSError:
@@ -117,7 +117,7 @@ def l1b_geoloc():
 #
 
 
-def l1b_solar_zenith_angles_before_noaa_15():
+def test_l1b_solar_zenith_angles_before_noaa_15():
     try:
         os.stat('tmp/cache/n12gac10bit.l1b')
     except OSError:
@@ -148,7 +148,7 @@ def l1b_solar_zenith_angles_before_noaa_15():
 #
 
 
-def l1b_metadata_before_noaa_15():
+def test_l1b_metadata_before_noaa_15():
     try:
         os.stat('tmp/cache/n12gac10bit.l1b')
     except OSError:
@@ -180,7 +180,7 @@ def l1b_metadata_before_noaa_15():
 #
 
 
-def l1b_angles_after_noaa_15():
+def test_l1b_angles_after_noaa_15():
     try:
         os.stat('tmp/cache/n16gac10bit.l1b')
     except OSError:
@@ -221,7 +221,7 @@ def l1b_angles_after_noaa_15():
 #
 
 
-def l1b_clouds_after_noaa_15():
+def test_l1b_clouds_after_noaa_15():
     try:
         os.stat('tmp/cache/n16gac10bit.l1b')
     except OSError:
@@ -252,7 +252,7 @@ def l1b_clouds_after_noaa_15():
 #
 
 
-def l1b_metadata_after_noaa_15():
+def test_l1b_metadata_after_noaa_15():
     try:
         os.stat('tmp/cache/n16gac10bit.l1b')
     except OSError:
@@ -284,7 +284,7 @@ def l1b_metadata_after_noaa_15():
 #
 
 
-def l1b_little_endian():
+def test_l1b_little_endian():
 
     ds = gdal.Open('/vsizip/data/hrpt_little_endian.l1b.zip')
     if ds.GetGCPProjection().find('GRS80') < 0:
@@ -305,13 +305,13 @@ def l1b_little_endian():
 
 
 gdaltest_list = [
-    l1b_geoloc,
-    l1b_solar_zenith_angles_before_noaa_15,
-    l1b_metadata_before_noaa_15,
-    l1b_angles_after_noaa_15,
-    l1b_clouds_after_noaa_15,
-    l1b_metadata_after_noaa_15,
-    l1b_little_endian,
+    test_l1b_geoloc,
+    test_l1b_solar_zenith_angles_before_noaa_15,
+    test_l1b_metadata_before_noaa_15,
+    test_l1b_angles_after_noaa_15,
+    test_l1b_clouds_after_noaa_15,
+    test_l1b_metadata_after_noaa_15,
+    test_l1b_little_endian,
 ]
 
 
diff --git a/autotest/gdrivers/lan.py b/autotest/gdrivers/lan.py
index 89b33e8d72d8..9d1d5171ae61 100755
--- a/autotest/gdrivers/lan.py
+++ b/autotest/gdrivers/lan.py
@@ -37,7 +37,7 @@
 # Test reading a - fake - LAN 8 bit dataset
 
 
-def lan_1():
+def test_lan_1():
 
     tst = gdaltest.GDALTest('LAN', 'fakelan.lan', 1, 10)
     return tst.testOpen()
@@ -46,15 +46,15 @@ def lan_1():
 # Test reading a - fake - LAN 4 bit dataset
 
 
-def lan_2():
+def test_lan_2():
 
     tst = gdaltest.GDALTest('LAN', 'fakelan4bit.lan', 1, 10)
     return tst.testOpen()
 
 
 gdaltest_list = [
-    lan_1,
-    lan_2]
+    test_lan_1,
+    test_lan_2]
 
 if __name__ == '__main__':
 
diff --git a/autotest/gdrivers/lcp.py b/autotest/gdrivers/lcp.py
index 5bbbb0cd1429..b4f7595eb2c6 100755
--- a/autotest/gdrivers/lcp.py
+++ b/autotest/gdrivers/lcp.py
@@ -40,7 +40,7 @@
 #  Test test_FARSITE_UTM12.LCP
 
 
-def lcp_1():
+def test_lcp_1():
 
     ds = gdal.Open('data/test_FARSITE_UTM12.LCP')
     if ds.RasterCount != 8:
@@ -140,7 +140,7 @@ def lcp_1():
 # test test_USGS_LFNM_Alb83.lcp
 
 
-def lcp_2():
+def test_lcp_2():
 
     ds = gdal.Open('data/test_USGS_LFNM_Alb83.lcp')
     if ds.RasterCount != 8:
@@ -236,7 +236,7 @@ def lcp_2():
 #  Test for empty prj
 
 
-def lcp_3():
+def test_lcp_3():
 
     ds = gdal.Open('data/test_USGS_LFNM_Alb83.lcp')
     if ds is None:
@@ -251,7 +251,7 @@ def lcp_3():
 #  Test that the prj file isn't added to the sibling list if it isn't there.
 
 
-def lcp_4():
+def test_lcp_4():
 
     ds = gdal.Open('data/test_USGS_LFNM_Alb83.lcp')
     if ds is None:
@@ -266,7 +266,7 @@ def lcp_4():
 #  Test for valid prj
 
 
-def lcp_5():
+def test_lcp_5():
 
     ds = gdal.Open('data/test_FARSITE_UTM12.LCP')
     if ds is None:
@@ -281,7 +281,7 @@ def lcp_5():
 #  Test for valid sibling list
 
 
-def lcp_6():
+def test_lcp_6():
 
     retval = 'success'
     ds = gdal.Open('data/test_FARSITE_UTM12.LCP')
@@ -303,7 +303,7 @@ def lcp_6():
 #  Test create copy that copies data over
 
 
-def lcp_7():
+def test_lcp_7():
 
     mem_drv = gdal.GetDriverByName('MEM')
     if mem_drv is None:
@@ -339,7 +339,7 @@ def lcp_7():
 #  Test create copy with invalid bands
 
 
-def lcp_8():
+def test_lcp_8():
 
     mem_drv = gdal.GetDriverByName('MEM')
     if mem_drv is None:
@@ -375,7 +375,7 @@ def lcp_8():
 #  Test create copy
 
 
-def lcp_9():
+def test_lcp_9():
 
     mem_drv = gdal.GetDriverByName('MEM')
     if mem_drv is None:
@@ -403,7 +403,7 @@ def lcp_9():
 #  Test create copy and make sure all unit metadata co work
 
 
-def lcp_10():
+def test_lcp_10():
 
     mem_drv = gdal.GetDriverByName('MEM')
     if mem_drv is None:
@@ -443,7 +443,7 @@ def lcp_10():
 #  Test create copy and make sure all unit metadata co work
 
 
-def lcp_11():
+def test_lcp_11():
 
     mem_drv = gdal.GetDriverByName('MEM')
     if mem_drv is None:
@@ -483,7 +483,7 @@ def lcp_11():
 #  Test create copy and make sure all unit metadata co work
 
 
-def lcp_12():
+def test_lcp_12():
 
     mem_drv = gdal.GetDriverByName('MEM')
     if mem_drv is None:
@@ -522,7 +522,7 @@ def lcp_12():
 #  Test create copy and make sure all unit metadata co work
 
 
-def lcp_13():
+def test_lcp_13():
 
     mem_drv = gdal.GetDriverByName('MEM')
     if mem_drv is None:
@@ -562,7 +562,7 @@ def lcp_13():
 #  Test create copy and make sure all unit metadata co work
 
 
-def lcp_14():
+def test_lcp_14():
 
     mem_drv = gdal.GetDriverByName('MEM')
     if mem_drv is None:
@@ -602,7 +602,7 @@ def lcp_14():
 #  Test create copy and make sure all unit metadata co work
 
 
-def lcp_15():
+def test_lcp_15():
 
     mem_drv = gdal.GetDriverByName('MEM')
     if mem_drv is None:
@@ -642,7 +642,7 @@ def lcp_15():
 #  Test create copy and make sure all unit metadata co work
 
 
-def lcp_16():
+def test_lcp_16():
 
     mem_drv = gdal.GetDriverByName('MEM')
     if mem_drv is None:
@@ -688,7 +688,7 @@ def lcp_16():
 #  documentation.  Docs say mg/ha * 10 and tn/ac * 10, metadata is not * 10.
 
 
-def lcp_17():
+def test_lcp_17():
 
     mem_drv = gdal.GetDriverByName('MEM')
     if mem_drv is None:
@@ -729,7 +729,7 @@ def lcp_17():
 #  Test create copy and make sure creation options work.
 
 
-def lcp_18():
+def test_lcp_18():
 
     mem_drv = gdal.GetDriverByName('MEM')
     if mem_drv is None:
@@ -763,7 +763,7 @@ def lcp_18():
 #  Test create copy and make sure creation options work.
 
 
-def lcp_19():
+def test_lcp_19():
 
     mem_drv = gdal.GetDriverByName('MEM')
     if mem_drv is None:
@@ -798,7 +798,7 @@ def lcp_19():
 #  Test create copy and make sure DESCRIPTION co works
 
 
-def lcp_20():
+def test_lcp_20():
 
     mem_drv = gdal.GetDriverByName('MEM')
     if mem_drv is None:
@@ -833,7 +833,7 @@ def lcp_20():
 #  Test create copy and make data is copied over via checksums
 
 
-def lcp_21():
+def test_lcp_21():
     try:
         import random
         import struct
@@ -877,7 +877,7 @@ def lcp_21():
 #  Test create copy and make data is copied over via numpy comparison.
 
 
-def lcp_22():
+def test_lcp_22():
     try:
         import random
         import struct
@@ -924,7 +924,7 @@ def lcp_22():
 ###############################################################################
 #  Test create copy and make sure invalid creation options are caught.
 
-def lcp_23():
+def test_lcp_23():
 
     mem_drv = gdal.GetDriverByName('MEM')
     if mem_drv is None:
@@ -960,29 +960,29 @@ def lcp_23():
 
 
 gdaltest_list = [
-    lcp_1,
-    lcp_2,
-    lcp_3,
-    lcp_4,
-    lcp_5,
-    lcp_6,
-    lcp_7,
-    lcp_8,
-    lcp_9,
-    lcp_10,
-    lcp_11,
-    lcp_12,
-    lcp_13,
-    lcp_14,
-    lcp_15,
-    lcp_16,
-    lcp_17,
-    lcp_18,
-    lcp_19,
-    lcp_20,
-    lcp_21,
-    lcp_22,
-    lcp_23]
+    test_lcp_1,
+    test_lcp_2,
+    test_lcp_3,
+    test_lcp_4,
+    test_lcp_5,
+    test_lcp_6,
+    test_lcp_7,
+    test_lcp_8,
+    test_lcp_9,
+    test_lcp_10,
+    test_lcp_11,
+    test_lcp_12,
+    test_lcp_13,
+    test_lcp_14,
+    test_lcp_15,
+    test_lcp_16,
+    test_lcp_17,
+    test_lcp_18,
+    test_lcp_19,
+    test_lcp_20,
+    test_lcp_21,
+    test_lcp_22,
+    test_lcp_23]
 
 if __name__ == '__main__':
 
diff --git a/autotest/gdrivers/leveller.py b/autotest/gdrivers/leveller.py
index 6489da027acc..99c425064406 100755
--- a/autotest/gdrivers/leveller.py
+++ b/autotest/gdrivers/leveller.py
@@ -37,14 +37,14 @@
 # Perform simple read test.
 
 
-def leveller_1():
+def test_leveller_1():
 
     tst = gdaltest.GDALTest('Leveller', 'ter6test.ter', 1, 33441)
     return tst.testOpen()
 
 
 gdaltest_list = [
-    leveller_1]
+    test_leveller_1]
 
 
 if __name__ == '__main__':
diff --git a/autotest/gdrivers/loslas.py b/autotest/gdrivers/loslas.py
index 20de8dbf8034..7bc5ed77ce88 100755
--- a/autotest/gdrivers/loslas.py
+++ b/autotest/gdrivers/loslas.py
@@ -37,7 +37,7 @@
 ###############################################################################
 
 
-def loslas_online_1():
+def test_loslas_online_1():
 
     if not gdaltest.download_file('http://www.ngs.noaa.gov/PC_PROD/NADCON/NADCON.zip', 'NADCON.zip'):
         return 'skip'
@@ -62,7 +62,7 @@ def loslas_online_1():
 
 
 gdaltest_list = [
-    loslas_online_1,
+    test_loslas_online_1,
 ]
 
 
diff --git a/autotest/gdrivers/mbtiles.py b/autotest/gdrivers/mbtiles.py
index 94e67197ecab..afb2a9387778 100755
--- a/autotest/gdrivers/mbtiles.py
+++ b/autotest/gdrivers/mbtiles.py
@@ -41,7 +41,7 @@
 # Get the mbtiles driver
 
 
-def mbtiles_1():
+def test_mbtiles_1():
 
     gdaltest.mbtiles_drv = gdal.GetDriverByName('MBTiles')
 
@@ -51,7 +51,7 @@ def mbtiles_1():
 # Basic test
 
 
-def mbtiles_2():
+def test_mbtiles_2():
 
     if gdaltest.mbtiles_drv is None:
         return 'skip'
@@ -120,7 +120,7 @@ def mbtiles_2():
 # Open a /vsicurl/ DB
 
 
-def mbtiles_3():
+def test_mbtiles_3():
 
     if gdaltest.mbtiles_drv is None:
         return 'skip'
@@ -169,7 +169,7 @@ def mbtiles_3():
 #
 
 
-def mbtiles_start_webserver():
+def test_mbtiles_start_webserver():
 
     if gdaltest.mbtiles_drv is None:
         return 'skip'
@@ -187,7 +187,7 @@ def mbtiles_start_webserver():
 #
 
 
-def mbtiles_http_jpeg_three_bands():
+def test_mbtiles_http_jpeg_three_bands():
 
     if gdaltest.mbtiles_drv is None:
         return 'skip'
@@ -214,7 +214,7 @@ def mbtiles_http_jpeg_three_bands():
 #
 
 
-def mbtiles_http_jpeg_single_band():
+def test_mbtiles_http_jpeg_single_band():
 
     if gdaltest.mbtiles_drv is None:
         return 'skip'
@@ -241,7 +241,7 @@ def mbtiles_http_jpeg_single_band():
 #
 
 
-def mbtiles_http_png():
+def test_mbtiles_http_png():
 
     if gdaltest.mbtiles_drv is None:
         return 'skip'
@@ -268,7 +268,7 @@ def mbtiles_http_png():
 #
 
 
-def mbtiles_stop_webserver():
+def test_mbtiles_stop_webserver():
 
     if gdaltest.mbtiles_drv is None:
         return 'skip'
@@ -285,7 +285,7 @@ def mbtiles_stop_webserver():
 # Basic test without any option
 
 
-def mbtiles_4():
+def test_mbtiles_4():
 
     if gdaltest.mbtiles_drv is None:
         return 'skip'
@@ -328,7 +328,7 @@ def mbtiles_4():
 # Test write support of a single band dataset
 
 
-def mbtiles_5():
+def test_mbtiles_5():
 
     if gdaltest.mbtiles_drv is None:
         return 'skip'
@@ -389,7 +389,7 @@ def mbtiles_5():
 # Test write support with options
 
 
-def mbtiles_6():
+def test_mbtiles_6():
 
     if gdaltest.mbtiles_drv is None:
         return 'skip'
@@ -432,7 +432,7 @@ def mbtiles_6():
 # Test building overview
 
 
-def mbtiles_7():
+def test_mbtiles_7():
 
     if gdaltest.mbtiles_drv is None:
         return 'skip'
@@ -503,7 +503,7 @@ def mbtiles_7():
 # Single band with 24 bit color table, PNG
 
 
-def mbtiles_8():
+def test_mbtiles_8():
 
     if gdaltest.mbtiles_drv is None:
         return 'skip'
@@ -562,7 +562,7 @@ def mbtiles_8():
 # Test we are robust to invalid bounds
 
 
-def mbtiles_9():
+def test_mbtiles_9():
 
     if gdaltest.mbtiles_drv is None:
         return 'skip'
@@ -595,7 +595,7 @@ def mbtiles_9():
 # Test compaction of temporary database
 
 
-def mbtiles_10():
+def test_mbtiles_10():
 
     if gdaltest.mbtiles_drv is None:
         return 'skip'
@@ -624,7 +624,7 @@ def mbtiles_10():
 # Test opening a .mbtiles.sql file
 
 
-def mbtiles_11():
+def test_mbtiles_11():
 
     if gdaltest.mbtiles_drv is None:
         return 'skip'
@@ -644,7 +644,7 @@ def mbtiles_11():
 ###############################################################################
 
 
-def mbtiles_raster_open_in_vector_mode():
+def test_mbtiles_raster_open_in_vector_mode():
 
     if gdaltest.mbtiles_drv is None:
         return 'skip'
@@ -658,7 +658,7 @@ def mbtiles_raster_open_in_vector_mode():
 ###############################################################################
 
 
-def mbtiles_create():
+def test_mbtiles_create():
 
     if gdaltest.mbtiles_drv is None:
         return 'skip'
@@ -738,7 +738,7 @@ def mbtiles_create():
 ###############################################################################
 # Cleanup
 
-def mbtiles_cleanup():
+def test_mbtiles_cleanup():
 
     if gdaltest.mbtiles_drv is None:
         return 'skip'
@@ -747,25 +747,25 @@ def mbtiles_cleanup():
 
 
 gdaltest_list = [
-    mbtiles_1,
-    mbtiles_2,
-    mbtiles_3,
-    mbtiles_start_webserver,
-    mbtiles_http_jpeg_three_bands,
-    mbtiles_http_jpeg_single_band,
-    mbtiles_http_png,
-    mbtiles_stop_webserver,
-    mbtiles_4,
-    mbtiles_5,
-    mbtiles_6,
-    mbtiles_7,
-    mbtiles_8,
-    mbtiles_9,
-    mbtiles_10,
-    mbtiles_11,
-    mbtiles_raster_open_in_vector_mode,
-    mbtiles_create,
-    mbtiles_cleanup]
+    test_mbtiles_1,
+    test_mbtiles_2,
+    test_mbtiles_3,
+    test_mbtiles_start_webserver,
+    test_mbtiles_http_jpeg_three_bands,
+    test_mbtiles_http_jpeg_single_band,
+    test_mbtiles_http_png,
+    test_mbtiles_stop_webserver,
+    test_mbtiles_4,
+    test_mbtiles_5,
+    test_mbtiles_6,
+    test_mbtiles_7,
+    test_mbtiles_8,
+    test_mbtiles_9,
+    test_mbtiles_10,
+    test_mbtiles_11,
+    test_mbtiles_raster_open_in_vector_mode,
+    test_mbtiles_create,
+    test_mbtiles_cleanup]
 
 # gdaltest_list = [ mbtiles_1, mbtiles_create ]
 
diff --git a/autotest/gdrivers/mem.py b/autotest/gdrivers/mem.py
index b3839e4cae88..b2c2d6837f7a 100755
--- a/autotest/gdrivers/mem.py
+++ b/autotest/gdrivers/mem.py
@@ -40,7 +40,7 @@
 # Create a MEM dataset, and set some data, then test it.
 
 
-def mem_1():
+def test_mem_1():
 
     #######################################################
     # Setup dataset
@@ -126,7 +126,7 @@ def mem_1():
 # Open an in-memory array.
 
 
-def mem_2():
+def test_mem_2():
 
     gdal.PushErrorHandler('CPLQuietErrorHandler')
     ds = gdal.Open('MEM:::')
@@ -208,7 +208,7 @@ def mem_2():
 # Test creating a MEM dataset with the "MEM:::" name
 
 
-def mem_3():
+def test_mem_3():
 
     drv = gdal.GetDriverByName('MEM')
     ds = drv.Create('MEM:::', 1, 1, 1)
@@ -222,7 +222,7 @@ def mem_3():
 # Test creating a band interleaved multi-band MEM dataset
 
 
-def mem_4():
+def test_mem_4():
 
     drv = gdal.GetDriverByName('MEM')
 
@@ -252,7 +252,7 @@ def mem_4():
 # Test creating a pixel interleaved multi-band MEM dataset
 
 
-def mem_5():
+def test_mem_5():
 
     drv = gdal.GetDriverByName('MEM')
 
@@ -286,7 +286,7 @@ def mem_5():
 # Test out-of-memory situations
 
 
-def mem_6():
+def test_mem_6():
 
     if gdal.GetConfigOption('SKIP_MEM_INTENSIVE_TEST') is not None:
         return 'skip'
@@ -352,7 +352,7 @@ def mem_6():
 # Test AddBand()
 
 
-def mem_7():
+def test_mem_7():
 
     drv = gdal.GetDriverByName('MEM')
     ds = drv.Create('MEM:::', 1, 1, 1)
@@ -367,7 +367,7 @@ def mem_7():
 # Test SetDefaultHistogram() / GetDefaultHistogram()
 
 
-def mem_8():
+def test_mem_8():
 
     drv = gdal.GetDriverByName('MEM')
     ds = drv.Create('MEM:::', 1, 1, 1)
@@ -387,7 +387,7 @@ def mem_8():
 # Test RasterIO()
 
 
-def mem_9():
+def test_mem_9():
 
     # Test IRasterIO(GF_Read,)
     src_ds = gdal.Open('data/rgbsmall.tif')
@@ -510,7 +510,7 @@ def mem_9():
 # Test BuildOverviews()
 
 
-def mem_10():
+def test_mem_10():
 
     # Error case: building overview on a 0 band dataset
     ds = gdal.GetDriverByName('MEM').Create('', 1, 1, 0)
@@ -671,7 +671,7 @@ def mem_10():
 # Test CreateMaskBand()
 
 
-def mem_11():
+def test_mem_11():
 
     # Error case: building overview on a 0 band dataset
     ds = gdal.GetDriverByName('MEM').Create('', 1, 1, 0)
@@ -747,7 +747,7 @@ def mem_11():
 # Test CreateMaskBand() and overviews.
 
 
-def mem_12():
+def test_mem_12():
 
     # Test on per-band mask
     ds = gdal.GetDriverByName('MEM').Create('', 10, 10, 2)
@@ -789,7 +789,7 @@ def mem_12():
 # Check RAT support
 
 
-def mem_rat():
+def test_mem_rat():
 
     ds = gdal.GetDriverByName('MEM').Create('', 1, 1)
     ds.GetRasterBand(1).SetDefaultRAT(gdal.RasterAttributeTable())
@@ -807,7 +807,7 @@ def mem_rat():
 # Check CategoryNames support
 
 
-def mem_categorynames():
+def test_mem_categorynames():
 
     ds = gdal.GetDriverByName('MEM').Create('', 1, 1)
     ds.GetRasterBand(1).SetCategoryNames(['foo'])
@@ -825,7 +825,7 @@ def mem_categorynames():
 ###############################################################################
 # Check ColorTable support
 
-def mem_colortable():
+def test_mem_colortable():
 
     ds = gdal.GetDriverByName('MEM').Create('', 1, 1)
     ct = gdal.ColorTable()
@@ -845,28 +845,28 @@ def mem_colortable():
 ###############################################################################
 # cleanup
 
-def mem_cleanup():
+def test_mem_cleanup():
     gdaltest.mem_ds = None
     return 'success'
 
 
 gdaltest_list = [
-    mem_1,
-    mem_2,
-    mem_3,
-    mem_4,
-    mem_5,
-    mem_6,
-    mem_7,
-    mem_8,
-    mem_9,
-    mem_10,
-    mem_11,
-    mem_12,
-    mem_rat,
-    mem_categorynames,
-    mem_colortable,
-    mem_cleanup]
+    test_mem_1,
+    test_mem_2,
+    test_mem_3,
+    test_mem_4,
+    test_mem_5,
+    test_mem_6,
+    test_mem_7,
+    test_mem_8,
+    test_mem_9,
+    test_mem_10,
+    test_mem_11,
+    test_mem_12,
+    test_mem_rat,
+    test_mem_categorynames,
+    test_mem_colortable,
+    test_mem_cleanup]
 
 if __name__ == '__main__':
 
diff --git a/autotest/gdrivers/mff.py b/autotest/gdrivers/mff.py
index 19e4821ad32a..5455dbd5afd1 100755
--- a/autotest/gdrivers/mff.py
+++ b/autotest/gdrivers/mff.py
@@ -37,7 +37,7 @@
 # Test reading a - fake - MFF dataset
 
 
-def mff_1():
+def test_mff_1():
 
     tst = gdaltest.GDALTest('MFF', 'fakemff.hdr', 1, 1)
     return tst.testOpen()
@@ -46,7 +46,7 @@ def mff_1():
 # Test reading a - fake - tiled MFF dataset
 
 
-def mff_2():
+def test_mff_2():
 
     tst = gdaltest.GDALTest('MFF', 'fakemfftiled.hdr', 1, 1)
     return tst.testOpen()
@@ -55,16 +55,16 @@ def mff_2():
 ###############################################################################
 # Test reading a MFF file generated by CreateCopy()
 
-def mff_3():
+def test_mff_3():
 
     tst = gdaltest.GDALTest('MFF', 'bytemff.hdr', 1, 4672)
     return tst.testOpen()
 
 
 gdaltest_list = [
-    mff_1,
-    mff_2,
-    mff_3]
+    test_mff_1,
+    test_mff_2,
+    test_mff_3]
 
 if __name__ == '__main__':
 
diff --git a/autotest/gdrivers/mff2.py b/autotest/gdrivers/mff2.py
index 5d6f59b864c7..c2ff923ec224 100755
--- a/autotest/gdrivers/mff2.py
+++ b/autotest/gdrivers/mff2.py
@@ -37,14 +37,14 @@
 # Test reading a MFF2 file generated by CreateCopy()
 
 
-def mff2_1():
+def test_mff2_1():
 
     tst = gdaltest.GDALTest('MFF2', 'bytemff2', 1, 4672)
     return tst.testOpen()
 
 
 gdaltest_list = [
-    mff2_1]
+    test_mff2_1]
 
 if __name__ == '__main__':
 
diff --git a/autotest/gdrivers/mg4lidar.py b/autotest/gdrivers/mg4lidar.py
index b7a2b01d66db..3411d5ff4f6d 100755
--- a/autotest/gdrivers/mg4lidar.py
+++ b/autotest/gdrivers/mg4lidar.py
@@ -40,7 +40,7 @@
 #
 
 
-def mg4lidar_1():
+def test_mg4lidar_1():
 
     drv = gdal.GetDriverByName('MG4Lidar')
     if drv is None:
@@ -98,7 +98,7 @@ def mg4lidar_1():
 
 
 gdaltest_list = [
-    mg4lidar_1]
+    test_mg4lidar_1]
 
 if __name__ == '__main__':
 
diff --git a/autotest/gdrivers/mrf.py b/autotest/gdrivers/mrf.py
index 355a13087d58..7db5f2a9d7ec 100755
--- a/autotest/gdrivers/mrf.py
+++ b/autotest/gdrivers/mrf.py
@@ -97,7 +97,7 @@ def test_mrf(src_filename, chksum, chksum_after_reopening, options):
     return ut.testCreateCopy(check_minmax=check_minmax)
 
 
-def mrf_zen_test():
+def test_mrf_zen_test():
     result = 'success'
     expectedCS = 770
     testvrt = '''
@@ -130,7 +130,7 @@ def mrf_zen_test():
     return result
 
 
-def mrf_overview_near_fact_2():
+def test_mrf_overview_near_fact_2():
 
     ref_ds = gdal.Translate('/vsimem/out.tif', 'data/byte.tif')
     ref_ds.BuildOverviews('NEAR', [2])
@@ -168,7 +168,7 @@ def mrf_overview_near_fact_2():
     return 'success'
 
 
-def mrf_overview_near_with_nodata_fact_2():
+def test_mrf_overview_near_with_nodata_fact_2():
 
     for dt in [gdal.GDT_Byte, gdal.GDT_Int16, gdal.GDT_UInt16,
                gdal.GDT_Int32, gdal.GDT_UInt32,
@@ -202,7 +202,7 @@ def mrf_overview_near_with_nodata_fact_2():
     return 'success'
 
 
-def mrf_overview_avg_fact_2():
+def test_mrf_overview_avg_fact_2():
 
     for dt in [gdal.GDT_Byte, gdal.GDT_Int16, gdal.GDT_UInt16,
                gdal.GDT_Int32, gdal.GDT_UInt32,
@@ -236,7 +236,7 @@ def mrf_overview_avg_fact_2():
     return 'success'
 
 
-def mrf_overview_avg_with_nodata_fact_2():
+def test_mrf_overview_avg_with_nodata_fact_2():
 
     for dt in [gdal.GDT_Byte, gdal.GDT_Int16, gdal.GDT_UInt16,
                gdal.GDT_Int32, gdal.GDT_UInt32,
@@ -271,7 +271,7 @@ def mrf_overview_avg_with_nodata_fact_2():
     return 'success'
 
 
-def mrf_overview_near_fact_3():
+def test_mrf_overview_near_fact_3():
 
     out_ds = gdal.Translate('/vsimem/out.mrf', 'data/byte.tif',
                             format='MRF',
@@ -298,7 +298,7 @@ def mrf_overview_near_fact_3():
     return 'success'
 
 
-def mrf_overview_avg_fact_3():
+def test_mrf_overview_avg_fact_3():
 
     out_ds = gdal.Translate('/vsimem/out.mrf', 'data/byte.tif',
                             format='MRF',
@@ -325,7 +325,7 @@ def mrf_overview_avg_fact_3():
     return 'success'
 
 
-def mrf_overview_avg_with_nodata_fact_3():
+def test_mrf_overview_avg_with_nodata_fact_3():
 
     for dt in [gdal.GDT_Byte, gdal.GDT_Int16, gdal.GDT_UInt16,
                gdal.GDT_Int32, gdal.GDT_UInt32,
@@ -360,7 +360,7 @@ def mrf_overview_avg_with_nodata_fact_3():
     return 'success'
 
 
-def mrf_overview_partial_block():
+def test_mrf_overview_partial_block():
 
     out_ds = gdal.Translate('/vsimem/out.mrf', 'data/byte.tif', format='MRF',
                             creationOptions=['COMPRESS=NONE', 'BLOCKSIZE=8'])
@@ -384,7 +384,7 @@ def mrf_overview_partial_block():
     return 'success'
 
 
-def mrf_overview_near_implicit_level():
+def test_mrf_overview_near_implicit_level():
 
     # We ask only overview level 2, but MRF automatically creates 2 and 4
     # so check that 4 is properly initialized
@@ -424,7 +424,7 @@ def mrf_overview_near_implicit_level():
     return 'success'
 
 
-def mrf_overview_external():
+def test_mrf_overview_external():
 
     gdal.Translate('/vsimem/out.mrf', 'data/byte.tif', format='MRF')
     ds = gdal.Open('/vsimem/out.mrf')
@@ -451,7 +451,7 @@ def mrf_overview_external():
     return 'success'
 
 
-def mrf_lerc_nodata():
+def test_mrf_lerc_nodata():
 
     gdal.Translate('/vsimem/out.mrf', 'data/byte.tif', format='MRF',
                    noData=107, creationOptions=['COMPRESS=LERC'])
@@ -479,7 +479,7 @@ def mrf_lerc_nodata():
     return 'success'
 
 
-def mrf_lerc_with_huffman():
+def test_mrf_lerc_with_huffman():
 
     gdal.Translate('/vsimem/out.mrf', 'data/small_world.tif', format='MRF',
                    width=5000, height=5000, creationOptions=['COMPRESS=LERC'])
@@ -502,7 +502,7 @@ def mrf_lerc_with_huffman():
     return 'success'
 
 
-def mrf_cached_source():
+def test_mrf_cached_source():
 
     # Caching MRF
     gdal.Translate('/vsimem/out.mrf', 'data/byte.tif', format='MRF',
@@ -645,7 +645,7 @@ def mrf_cached_source():
     return 'success'
 
 
-def mrf_versioned():
+def test_mrf_versioned():
 
     gdal.Unlink('/vsimem/out.mrf')
     gdal.Unlink('/vsimem/out.mrf.aux.xml')
@@ -715,7 +715,7 @@ def mrf_versioned():
     return 'success'
 
 
-def mrf_cleanup():
+def test_mrf_cleanup():
 
     files = [
         '12bit_rose_extract.jpg.*',
@@ -748,22 +748,22 @@ def mrf_cleanup():
 
 
 gdaltest_list = [
-    mrf_overview_near_fact_2,
-    mrf_overview_near_with_nodata_fact_2,
-    mrf_overview_avg_fact_2,
-    mrf_overview_avg_with_nodata_fact_2,
-    mrf_overview_near_fact_3,
-    mrf_overview_avg_fact_3,
-    mrf_overview_avg_with_nodata_fact_3,
-    mrf_overview_partial_block,
-    mrf_overview_near_implicit_level,
-    mrf_overview_external,
-    mrf_lerc_nodata,
-    mrf_lerc_with_huffman,
-    mrf_cached_source,
-    mrf_versioned,
-    mrf_zen_test,
-    mrf_cleanup,
+    test_mrf_overview_near_fact_2,
+    test_mrf_overview_near_with_nodata_fact_2,
+    test_mrf_overview_avg_fact_2,
+    test_mrf_overview_avg_with_nodata_fact_2,
+    test_mrf_overview_near_fact_3,
+    test_mrf_overview_avg_fact_3,
+    test_mrf_overview_avg_with_nodata_fact_3,
+    test_mrf_overview_partial_block,
+    test_mrf_overview_near_implicit_level,
+    test_mrf_overview_external,
+    test_mrf_lerc_nodata,
+    test_mrf_lerc_with_huffman,
+    test_mrf_cached_source,
+    test_mrf_versioned,
+    test_mrf_zen_test,
+    test_mrf_cleanup,
 ]
 
 if __name__ == '__main__':
diff --git a/autotest/gdrivers/mrsid.py b/autotest/gdrivers/mrsid.py
index 624b26a6ac60..2b4b8e9459eb 100755
--- a/autotest/gdrivers/mrsid.py
+++ b/autotest/gdrivers/mrsid.py
@@ -41,7 +41,7 @@
 # Read a simple byte file, checking projections and geotransform.
 
 
-def mrsid_1():
+def test_mrsid_1():
 
     gdaltest.mrsid_drv = gdal.GetDriverByName('MrSID')
     if gdaltest.mrsid_drv is None:
@@ -139,7 +139,7 @@ def mrsid_1():
 # RasterIO implementation.
 
 
-def mrsid_2():
+def test_mrsid_2():
 
     if gdaltest.mrsid_drv is None:
         return 'skip'
@@ -176,7 +176,7 @@ def mrsid_2():
 # Test overview reading.
 
 
-def mrsid_3():
+def test_mrsid_3():
 
     if gdaltest.mrsid_drv is None:
         return 'skip'
@@ -207,7 +207,7 @@ def mrsid_3():
 # Check a new (V3) file which uses a different form for coordinate sys.
 
 
-def mrsid_4():
+def test_mrsid_4():
 
     if gdaltest.mrsid_drv is None:
         return 'skip'
@@ -253,7 +253,7 @@ def mrsid_4():
 # Test JP2MrSID driver
 
 
-def mrsid_5():
+def test_mrsid_5():
     gdaltest.jp2mrsid_drv = gdal.GetDriverByName('JP2MrSID')
     if gdaltest.jp2mrsid_drv is None:
         return 'skip'
@@ -266,7 +266,7 @@ def mrsid_5():
 # Open byte.jp2
 
 
-def mrsid_6():
+def test_mrsid_6():
 
     if gdaltest.jp2mrsid_drv is None:
         return 'skip'
@@ -299,7 +299,7 @@ def mrsid_6():
 ###############################################################################
 # Open int16.jp2
 
-def mrsid_7():
+def test_mrsid_7():
 
     if gdaltest.jp2mrsid_drv is None:
         return 'skip'
@@ -327,7 +327,7 @@ def mrsid_7():
 # Test PAM override for nodata, coordsys, and geotransform.
 
 
-def mrsid_8():
+def test_mrsid_8():
 
     if gdaltest.mrsid_drv is None:
         return 'skip'
@@ -373,7 +373,7 @@ def mrsid_8():
 # Test VSI*L IO with .sid
 
 
-def mrsid_9():
+def test_mrsid_9():
 
     if gdaltest.mrsid_drv is None:
         return 'skip'
@@ -398,7 +398,7 @@ def mrsid_9():
 # Test VSI*L IO with .jp2
 
 
-def mrsid_10():
+def test_mrsid_10():
 
     if gdaltest.jp2mrsid_drv is None:
         return 'skip'
@@ -423,7 +423,7 @@ def mrsid_10():
 # Check that we can use .j2w world files (#4651)
 
 
-def mrsid_11():
+def test_mrsid_11():
 
     if gdaltest.jp2mrsid_drv is None:
         return 'skip'
@@ -448,7 +448,7 @@ def mrsid_11():
 ###############################################################################
 
 
-def mrsid_online_1():
+def test_mrsid_online_1():
 
     if gdaltest.jp2mrsid_drv is None:
         return 'skip'
@@ -471,7 +471,7 @@ def mrsid_online_1():
 ###############################################################################
 
 
-def mrsid_online_2():
+def test_mrsid_online_2():
 
     if gdaltest.jp2mrsid_drv is None:
         return 'skip'
@@ -504,7 +504,7 @@ def mrsid_online_2():
 ###############################################################################
 
 
-def mrsid_online_3():
+def test_mrsid_online_3():
 
     if gdaltest.jp2mrsid_drv is None:
         return 'skip'
@@ -541,7 +541,7 @@ def mrsid_online_3():
 ###############################################################################
 
 
-def mrsid_online_4():
+def test_mrsid_online_4():
 
     if gdaltest.jp2mrsid_drv is None:
         return 'skip'
@@ -577,7 +577,7 @@ def mrsid_online_4():
 # Cleanup.
 
 
-def mrsid_cleanup():
+def test_mrsid_cleanup():
 
     try:
         os.remove('data/mercator.sid.aux.xml')
@@ -591,22 +591,22 @@ def mrsid_cleanup():
 
 
 gdaltest_list = [
-    mrsid_1,
-    mrsid_2,
-    mrsid_3,
-    mrsid_4,
-    mrsid_5,
-    mrsid_6,
-    mrsid_7,
-    mrsid_8,
-    mrsid_9,
-    mrsid_10,
-    mrsid_11,
-    mrsid_online_1,
-    mrsid_online_2,
-    mrsid_online_3,
-    mrsid_online_4,
-    mrsid_cleanup]
+    test_mrsid_1,
+    test_mrsid_2,
+    test_mrsid_3,
+    test_mrsid_4,
+    test_mrsid_5,
+    test_mrsid_6,
+    test_mrsid_7,
+    test_mrsid_8,
+    test_mrsid_9,
+    test_mrsid_10,
+    test_mrsid_11,
+    test_mrsid_online_1,
+    test_mrsid_online_2,
+    test_mrsid_online_3,
+    test_mrsid_online_4,
+    test_mrsid_cleanup]
 
 if __name__ == '__main__':
 
diff --git a/autotest/gdrivers/ndf.py b/autotest/gdrivers/ndf.py
index c27e6ba09198..cc513056e853 100755
--- a/autotest/gdrivers/ndf.py
+++ b/autotest/gdrivers/ndf.py
@@ -37,7 +37,7 @@
 # Simple image test of an NLAPS/NDF2 dataset.
 
 
-def ndf_1():
+def test_ndf_1():
 
     tst = gdaltest.GDALTest('NDF', 'LE7134052000500350.H3', 1, 6510,
                             xoff=0, yoff=0, xsize=15620, ysize=1)
@@ -71,7 +71,7 @@ def ndf_1():
 
 
 gdaltest_list = [
-    ndf_1]
+    test_ndf_1]
 
 if __name__ == '__main__':
 
diff --git a/autotest/gdrivers/netcdf.py b/autotest/gdrivers/netcdf.py
index 42db3b34edac..fac78514b745 100755
--- a/autotest/gdrivers/netcdf.py
+++ b/autotest/gdrivers/netcdf.py
@@ -275,7 +275,7 @@ def netcdf_check_vars(ifile, vals_global=None, vals_band=None):
 ###############################################################################
 # Perform simple read test.
 
-def netcdf_1():
+def test_netcdf_1():
 
     # setup netcdf environment
     netcdf_setup()
@@ -299,7 +299,7 @@ def netcdf_1():
 # operation because the new file will only be accessible via subdatasets.
 
 
-def netcdf_2():
+def test_netcdf_2():
 
     if gdaltest.netcdf_drv is None:
         return 'skip'
@@ -350,7 +350,7 @@ def netcdf_2():
 ###############################################################################
 
 
-def netcdf_3():
+def test_netcdf_3():
 
     if gdaltest.netcdf_drv is None:
         return 'skip'
@@ -372,7 +372,7 @@ def netcdf_3():
 # In #2582 5dimensional files were causing problems.  Verify use ok.
 
 
-def netcdf_4():
+def test_netcdf_4():
 
     if gdaltest.netcdf_drv is None:
         return 'skip'
@@ -395,7 +395,7 @@ def netcdf_4():
 # dimension - check handling now on band 7.
 
 
-def netcdf_5():
+def test_netcdf_5():
 
     if gdaltest.netcdf_drv is None:
         return 'skip'
@@ -418,7 +418,7 @@ def netcdf_5():
 # 1 standard parallel.
 
 
-def netcdf_6():
+def test_netcdf_6():
 
     if gdaltest.netcdf_drv is None:
         return 'skip'
@@ -444,7 +444,7 @@ def netcdf_6():
 # 2 standard parallels.
 
 
-def netcdf_7():
+def test_netcdf_7():
 
     if gdaltest.netcdf_drv is None:
         return 'skip'
@@ -473,7 +473,7 @@ def netcdf_7():
 # now just look for PROJECTION=Albers_Conic_Equal_Area and some parameters
 
 
-def netcdf_8():
+def test_netcdf_8():
 
     if gdaltest.netcdf_drv is None:
         return 'skip'
@@ -506,7 +506,7 @@ def netcdf_8():
 # check to see if projected systems default to wgs84 if no spheroid def
 
 
-def netcdf_9():
+def test_netcdf_9():
 
     if gdaltest.netcdf_drv is None:
         return 'skip'
@@ -533,7 +533,7 @@ def netcdf_9():
 # check if km pixel size makes it through to gt
 
 
-def netcdf_10():
+def test_netcdf_10():
 
     if gdaltest.netcdf_drv is None:
         return 'skip'
@@ -567,7 +567,7 @@ def netcdf_10():
 # check if ll gets caught in km pixel size check
 
 
-def netcdf_11():
+def test_netcdf_11():
 
     if gdaltest.netcdf_drv is None:
         return 'skip'
@@ -589,7 +589,7 @@ def netcdf_11():
 # check for scale/offset set/get.
 
 
-def netcdf_12():
+def test_netcdf_12():
 
     if gdaltest.netcdf_drv is None:
         return 'skip'
@@ -611,7 +611,7 @@ def netcdf_12():
 # check for scale/offset = None if no scale or offset is available
 
 
-def netcdf_13():
+def test_netcdf_13():
 
     if gdaltest.netcdf_drv is None:
         return 'skip'
@@ -633,7 +633,7 @@ def netcdf_13():
 # check for scale/offset for two variables
 
 
-def netcdf_14():
+def test_netcdf_14():
 
     if gdaltest.netcdf_drv is None:
         return 'skip'
@@ -668,7 +668,7 @@ def netcdf_14():
 # This test fails in 1.8.1, because the driver does not support NC2 (bug #3890)
 
 
-def netcdf_15():
+def test_netcdf_15():
 
     if gdaltest.netcdf_drv is None:
         return 'skip'
@@ -688,7 +688,7 @@ def netcdf_15():
 # check support for netcdf-4
 
 
-def netcdf_16():
+def test_netcdf_16():
 
     if gdaltest.netcdf_drv is None:
         return 'skip'
@@ -725,7 +725,7 @@ def netcdf_16():
 # check support for netcdf-4 - make sure hdf5 is not read by netcdf driver
 
 
-def netcdf_17():
+def test_netcdf_17():
 
     if gdaltest.netcdf_drv is None:
         return 'skip'
@@ -767,7 +767,7 @@ def netcdf_17():
 # check support for netcdf-4 classic (NC4C)
 
 
-def netcdf_18():
+def test_netcdf_18():
 
     if gdaltest.netcdf_drv is None:
         return 'skip'
@@ -801,7 +801,7 @@ def netcdf_18():
 # check support for reading with DEFLATE compression, requires NC4
 
 
-def netcdf_19():
+def test_netcdf_19():
 
     if gdaltest.netcdf_drv is None:
         return 'skip'
@@ -820,7 +820,7 @@ def netcdf_19():
 # check support for writing with DEFLATE compression, requires NC4
 
 
-def netcdf_20():
+def test_netcdf_20():
 
     if gdaltest.netcdf_drv is None:
         return 'skip'
@@ -835,7 +835,7 @@ def netcdf_20():
 ###############################################################################
 # check support for writing large file with DEFLATE compression
 # if chunking is not defined properly within the netcdf driver, this test can take 1h
-def netcdf_21():
+def test_netcdf_21():
 
     if gdaltest.netcdf_drv is None:
         return 'skip'
@@ -883,7 +883,7 @@ def netcdf_21():
 
 ###############################################################################
 # check support for hdf4
-def netcdf_22():
+def test_netcdf_22():
 
     if gdaltest.netcdf_drv is None:
         return 'skip'
@@ -910,7 +910,7 @@ def netcdf_22():
 # check support for hdf4 - make sure  hdf4 file is not read by netcdf driver
 
 
-def netcdf_23():
+def test_netcdf_23():
 
     # don't skip if netcdf is not enabled in GDAL
     # if gdaltest.netcdf_drv is None:
@@ -950,7 +950,7 @@ def netcdf_23():
 # check support for reading attributes (single values and array values)
 
 
-def netcdf_24():
+def test_netcdf_24():
 
     if gdaltest.netcdf_drv is None:
         return 'skip'
@@ -1007,7 +1007,7 @@ def netcdf_24_nc4():
 # check support for writing attributes (single values and array values)
 
 
-def netcdf_25():
+def test_netcdf_25():
 
     if gdaltest.netcdf_drv is None:
         return 'skip'
@@ -1074,7 +1074,7 @@ def netcdf_25_nc4():
 # depending on y-axis order
 
 
-def netcdf_26():
+def test_netcdf_26():
 
     if gdaltest.netcdf_drv is None:
         return 'skip'
@@ -1104,7 +1104,7 @@ def netcdf_26():
 # check support for GDAL_NETCDF_BOTTOMUP configuration option
 
 
-def netcdf_27():
+def test_netcdf_27():
 
     if gdaltest.netcdf_drv is None:
         return 'skip'
@@ -1193,7 +1193,7 @@ def netcdf_test_4dfile(ofile):
 # check support for writing multi-dimensional files using CreateCopy()
 
 
-def netcdf_28():
+def test_netcdf_28():
 
     if gdaltest.netcdf_drv is None:
         return 'skip'
@@ -1219,7 +1219,7 @@ def netcdf_28():
 # metadata to netcdf file with SetMetadata() and SetMetadataItem()).
 
 
-def netcdf_29():
+def test_netcdf_29():
 
     if gdaltest.netcdf_drv is None:
         return 'skip'
@@ -1261,7 +1261,7 @@ def netcdf_29():
 # check support for file with nan values (bug #4705)
 
 
-def netcdf_30():
+def test_netcdf_30():
 
     if gdaltest.netcdf_drv is None:
         return 'skip'
@@ -1281,7 +1281,7 @@ def netcdf_30():
 # 1 pixel (in width or height) still unsupported because we can't get the pixel dimensions
 
 
-def netcdf_31():
+def test_netcdf_31():
 
     if gdaltest.netcdf_drv is None:
         return 'skip'
@@ -1306,7 +1306,7 @@ def netcdf_31():
 # Test NC_UBYTE write/read - netcdf-4 (FORMAT=NC4) only (#5053)
 
 
-def netcdf_32():
+def test_netcdf_32():
 
     if gdaltest.netcdf_drv is None:
         return 'skip'
@@ -1333,7 +1333,7 @@ def netcdf_32():
 # TEST NC_UBYTE metadata read - netcdf-4 (FORMAT=NC4) only (#5053)
 
 
-def netcdf_33():
+def test_netcdf_33():
 
     if gdaltest.netcdf_drv is None:
         return 'skip'
@@ -1352,7 +1352,7 @@ def netcdf_33():
 # if chunking is not supported within the netcdf driver, this test can take very long
 
 
-def netcdf_34():
+def test_netcdf_34():
 
     filename = 'utm-big-chunks.nc'
     # this timeout is more than enough - on my system takes <1s with fix, about 25 seconds without
@@ -1401,7 +1401,7 @@ def netcdf_34():
 # test writing a long metadata > 8196 chars (bug #5113)
 
 
-def netcdf_35():
+def test_netcdf_35():
 
     if gdaltest.netcdf_drv is None:
         return 'skip'
@@ -1437,7 +1437,7 @@ def netcdf_35():
 # test for correct geotransform (bug #5114)
 
 
-def netcdf_36():
+def test_netcdf_36():
 
     if gdaltest.netcdf_drv is None:
         return 'skip'
@@ -1465,7 +1465,7 @@ def netcdf_36():
 # test for correct geotransform with longitude wrap
 
 
-def netcdf_36_lonwrap():
+def test_netcdf_36_lonwrap():
 
     if gdaltest.netcdf_drv is None:
         return 'skip'
@@ -1493,7 +1493,7 @@ def netcdf_36_lonwrap():
 # test for reading gaussian grid (bugs #4513 and #5118)
 
 
-def netcdf_37():
+def test_netcdf_37():
 
     if gdaltest.netcdf_drv is None:
         return 'skip'
@@ -1532,7 +1532,7 @@ def netcdf_37():
 # test for correct geotransform of projected data in km units (bug #5118)
 
 
-def netcdf_38():
+def test_netcdf_38():
 
     if gdaltest.netcdf_drv is None:
         return 'skip'
@@ -1561,7 +1561,7 @@ def netcdf_38():
 # Test VRT and NETCDF:
 
 
-def netcdf_39():
+def test_netcdf_39():
 
     if gdaltest.netcdf_drv is None:
         return 'skip'
@@ -1638,7 +1638,7 @@ def netcdf_39():
 # Check support of reading of chunked bottom-up files.
 
 
-def netcdf_40():
+def test_netcdf_40():
 
     if gdaltest.netcdf_drv is None or not gdaltest.netcdf_drv_has_nc4:
         return 'skip'
@@ -1649,7 +1649,7 @@ def netcdf_40():
 # Test support for georeferenced file without CF convention
 
 
-def netcdf_41():
+def test_netcdf_41():
 
     if gdaltest.netcdf_drv is None:
         return 'skip'
@@ -1671,7 +1671,7 @@ def netcdf_41():
 # Test writing & reading GEOLOCATION array
 
 
-def netcdf_42():
+def test_netcdf_42():
 
     if gdaltest.netcdf_drv is None:
         return 'skip'
@@ -1726,7 +1726,7 @@ def netcdf_42():
 # Test reading GEOLOCATION array from geotransform (non default)
 
 
-def netcdf_43():
+def test_netcdf_43():
 
     if gdaltest.netcdf_drv is None:
         return 'skip'
@@ -1755,7 +1755,7 @@ def netcdf_43():
 # Test NC_USHORT/UINT read/write - netcdf-4 only (#6337)
 
 
-def netcdf_44():
+def test_netcdf_44():
 
     if gdaltest.netcdf_drv is None:
         return 'skip'
@@ -1774,7 +1774,7 @@ def netcdf_44():
 # Test reading a vector NetCDF 3 file
 
 
-def netcdf_45():
+def test_netcdf_45():
 
     if gdaltest.netcdf_drv is None:
         return 'skip'
@@ -1830,7 +1830,7 @@ def netcdf_45():
 # Test reading a vector NetCDF 3 file
 
 
-def netcdf_46():
+def test_netcdf_46():
 
     if gdaltest.netcdf_drv is None:
         return 'skip'
@@ -1850,7 +1850,7 @@ def netcdf_46():
 # Test reading a vector NetCDF 4 file
 
 
-def netcdf_47():
+def test_netcdf_47():
 
     if gdaltest.netcdf_drv is None:
         return 'skip'
@@ -1904,7 +1904,7 @@ def netcdf_47():
 # Test reading a vector NetCDF 3 file without any geometry
 
 
-def netcdf_48():
+def test_netcdf_48():
 
     if gdaltest.netcdf_drv is None:
         return 'skip'
@@ -1926,7 +1926,7 @@ def netcdf_48():
 # Test reading a vector NetCDF 3 file with X,Y,Z vars as float
 
 
-def netcdf_49():
+def test_netcdf_49():
 
     if gdaltest.netcdf_drv is None:
         return 'skip'
@@ -1957,7 +1957,7 @@ def netcdf_49():
 # Test creating a vector NetCDF 3 file with WKT geometry field
 
 
-def netcdf_50():
+def test_netcdf_50():
 
     if gdaltest.netcdf_drv is None:
         return 'skip'
@@ -2006,7 +2006,7 @@ def netcdf_50():
 # Test creating a vector NetCDF 3 file with X,Y,Z fields
 
 
-def netcdf_51():
+def test_netcdf_51():
 
     if gdaltest.netcdf_drv is None:
         return 'skip'
@@ -2090,7 +2090,7 @@ def netcdf_51():
 # Test creating a vector NetCDF 3 file with X,Y,Z fields with WRITE_GDAL_TAGS=NO
 
 
-def netcdf_51_no_gdal_tags():
+def test_netcdf_51_no_gdal_tags():
 
     if gdaltest.netcdf_drv is None:
         return 'skip'
@@ -2141,7 +2141,7 @@ def netcdf_51_no_gdal_tags():
 # Test creating a vector NetCDF 4 file with X,Y,Z fields
 
 
-def netcdf_52():
+def test_netcdf_52():
 
     if gdaltest.netcdf_drv is None:
         return 'skip'
@@ -2225,7 +2225,7 @@ def netcdf_52():
 # Test creating a vector NetCDF 4 file with WKT geometry field
 
 
-def netcdf_53():
+def test_netcdf_53():
 
     if gdaltest.netcdf_drv is None:
         return 'skip'
@@ -2277,7 +2277,7 @@ def netcdf_53():
 # Test appending to a vector NetCDF 4 file with unusual types (ubyte, ushort...)
 
 
-def netcdf_54():
+def test_netcdf_54():
 
     if gdaltest.netcdf_drv is None:
         return 'skip'
@@ -2324,7 +2324,7 @@ def netcdf_54():
 # Test auto-grow of bidimensional char variables in a vector NetCDF 4 file
 
 
-def netcdf_55():
+def test_netcdf_55():
 
     if gdaltest.netcdf_drv is None:
         return 'skip'
@@ -2371,7 +2371,7 @@ def netcdf_55():
 # Test truncation of bidimensional char variables and WKT in a vector NetCDF 3 file
 
 
-def netcdf_56():
+def test_netcdf_56():
 
     if gdaltest.netcdf_drv is None:
         return 'skip'
@@ -2407,7 +2407,7 @@ def netcdf_56():
 # Test one layer per file creation
 
 
-def netcdf_57():
+def test_netcdf_57():
 
     if gdaltest.netcdf_drv is None:
         return 'skip'
@@ -2459,7 +2459,7 @@ def netcdf_57():
 # Test one layer per group (NC4)
 
 
-def netcdf_58():
+def test_netcdf_58():
 
     if gdaltest.netcdf_drv is None:
         return 'skip'
@@ -2494,7 +2494,7 @@ def netcdf_58():
 # check for UnitType set/get.
 
 
-def netcdf_59():
+def test_netcdf_59():
 
     if gdaltest.netcdf_drv is None:
         return 'skip'
@@ -2520,7 +2520,7 @@ def netcdf_59():
 # http://cfconventions.org/cf-conventions/v1.6.0/cf-conventions.html#_indexed_ragged_array_representation_of_profiles
 
 
-def netcdf_60():
+def test_netcdf_60():
 
     if gdaltest.netcdf_drv is None:
         return 'skip'
@@ -2562,7 +2562,7 @@ def netcdf_60():
 # Test appending to a "Indexed ragged array representation of profiles" v1.6.0 H3.5
 
 
-def netcdf_61():
+def test_netcdf_61():
 
     if gdaltest.netcdf_drv is None:
         return 'skip'
@@ -2599,7 +2599,7 @@ def netcdf_61():
 # Test creating a "Indexed ragged array representation of profiles" v1.6.0 H3.5
 
 
-def netcdf_62():
+def test_netcdf_62():
 
     if gdaltest.netcdf_drv is None:
         return 'skip'
@@ -2628,7 +2628,7 @@ def netcdf_62():
     return 'success'
 
 
-def netcdf_62_ncdump_check():
+def test_netcdf_62_ncdump_check():
 
     if gdaltest.netcdf_drv is None:
         return 'skip'
@@ -2656,7 +2656,7 @@ def netcdf_62_ncdump_check():
     return 'success'
 
 
-def netcdf_62_cf_check():
+def test_netcdf_62_cf_check():
 
     if gdaltest.netcdf_drv is None:
         return 'skip'
@@ -2677,7 +2677,7 @@ def netcdf_62_cf_check():
 # Test creating a NC4 "Indexed ragged array representation of profiles" v1.6.0 H3.5
 
 
-def netcdf_63():
+def test_netcdf_63():
 
     if gdaltest.netcdf_drv is None:
         return 'skip'
@@ -2710,7 +2710,7 @@ def netcdf_63():
     return 'success'
 
 
-def netcdf_63_ncdump_check():
+def test_netcdf_63_ncdump_check():
 
     if gdaltest.netcdf_drv is None:
         return 'skip'
@@ -2747,7 +2747,7 @@ def netcdf_63_ncdump_check():
 # but without a profile field.
 
 
-def netcdf_64():
+def test_netcdf_64():
 
     if gdaltest.netcdf_drv is None:
         return 'skip'
@@ -2781,7 +2781,7 @@ def netcdf_64():
 # (they must be filled as empty strings to avoid crashes in netcdf lib)
 
 
-def netcdf_65():
+def test_netcdf_65():
 
     if gdaltest.netcdf_drv is None:
         return 'skip'
@@ -2814,7 +2814,7 @@ def netcdf_65():
 # from a config file
 
 
-def netcdf_66():
+def test_netcdf_66():
 
     if gdaltest.netcdf_drv is None:
         return 'skip'
@@ -2917,7 +2917,7 @@ def netcdf_66():
     return 'success'
 
 
-def netcdf_66_ncdump_check():
+def test_netcdf_66_ncdump_check():
 
     if gdaltest.netcdf_drv is None:
         return 'skip'
@@ -2953,7 +2953,7 @@ def netcdf_66_ncdump_check():
 # blocks in the x axischeck for partial block reading.
 
 
-def netcdf_67():
+def test_netcdf_67():
 
     if gdaltest.netcdf_drv is None:
         return 'skip'
@@ -2988,7 +2988,7 @@ def netcdf_67():
 ###############################################################################
 # Test reading SRS from srid attribute (#6613)
 
-def netcdf_68():
+def test_netcdf_68():
 
     if gdaltest.netcdf_drv is None:
         return 'skip'
@@ -3006,7 +3006,7 @@ def netcdf_68():
 # Test opening a dataset with a 1D variable with 0 record (#6645)
 
 
-def netcdf_69():
+def test_netcdf_69():
 
     if gdaltest.netcdf_drv is None:
         return 'skip'
@@ -3021,7 +3021,7 @@ def netcdf_69():
 # Test that we don't erroneously identify non-longitude axis as longitude (#6759)
 
 
-def netcdf_70():
+def test_netcdf_70():
 
     if gdaltest.netcdf_drv is None:
         return 'skip'
@@ -3040,7 +3040,7 @@ def netcdf_70():
 # (https://github.com/OSGeo/gdal/pull/200)
 
 
-def netcdf_71():
+def test_netcdf_71():
 
     if gdaltest.netcdf_drv is None:
         return 'skip'
@@ -3058,7 +3058,7 @@ def netcdf_71():
 # test int64 attributes / dim
 
 
-def netcdf_72():
+def test_netcdf_72():
 
     if gdaltest.netcdf_drv is None:
         return 'skip'
@@ -3078,7 +3078,7 @@ def netcdf_72():
 # test geostationary with radian units (https://github.com/OSGeo/gdal/pull/220)
 
 
-def netcdf_73():
+def test_netcdf_73():
 
     if gdaltest.netcdf_drv is None:
         return 'skip'
@@ -3096,7 +3096,7 @@ def netcdf_73():
 # test geostationary with microradian units (https://github.com/OSGeo/gdal/pull/220)
 
 
-def netcdf_74():
+def test_netcdf_74():
 
     if gdaltest.netcdf_drv is None:
         return 'skip'
@@ -3114,7 +3114,7 @@ def netcdf_74():
 # test opening a ncdump file
 
 
-def netcdf_75():
+def test_netcdf_75():
 
     if gdaltest.netcdf_drv is None:
         return 'skip'
@@ -3150,7 +3150,7 @@ def netcdf_75():
 # test opening a vector ncdump file
 
 
-def netcdf_76():
+def test_netcdf_76():
 
     if gdaltest.netcdf_drv is None:
         return 'skip'
@@ -3171,7 +3171,7 @@ def netcdf_76():
 # test opening a raster file that used to be confused with a vector file (#6974)
 
 
-def netcdf_77():
+def test_netcdf_77():
 
     if gdaltest.netcdf_drv is None:
         return 'skip'
@@ -3195,7 +3195,7 @@ def netcdf_77():
 # test we handle correctly valid_range={0,255} for a byte dataset with
 # negative nodata value
 
-def netcdf_78():
+def test_netcdf_78():
 
     if gdaltest.netcdf_drv is None:
         return 'skip'
@@ -3218,7 +3218,7 @@ def netcdf_78():
 # negative nodata value
 
 
-def netcdf_79():
+def test_netcdf_79():
 
     if gdaltest.netcdf_drv is None:
         return 'skip'
@@ -3240,7 +3240,7 @@ def netcdf_79():
 # Test creating and opening with accent
 
 
-def netcdf_80():
+def test_netcdf_80():
 
     if gdaltest.netcdf_drv is None:
         return 'skip'
@@ -3252,7 +3252,7 @@ def netcdf_80():
 # netCDF file in rotated_pole projection
 
 
-def netcdf_81():
+def test_netcdf_81():
 
     if gdaltest.netcdf_drv is None:
         return 'skip'
@@ -3287,7 +3287,7 @@ def netcdf_81():
 # 1D variable, several corresponding variables)
 
 
-def netcdf_82():
+def test_netcdf_82():
 
     if gdaltest.netcdf_drv is None:
         return 'skip'
@@ -3324,7 +3324,7 @@ def netcdf_82():
 
 
 ###############################################################################
-def netcdf_uffd():
+def test_netcdf_uffd():
 
     if gdaltest.netcdf_drv is None:
         return 'skip'
@@ -3354,95 +3354,95 @@ def netcdf_uffd():
 
 
 gdaltest_list = [
-    netcdf_1,
-    netcdf_2,
-    netcdf_3,
-    netcdf_4,
-    netcdf_5,
-    netcdf_6,
-    netcdf_7,
-    netcdf_8,
-    netcdf_9,
-    netcdf_10,
-    netcdf_11,
-    netcdf_12,
-    netcdf_13,
-    netcdf_14,
-    netcdf_15,
-    netcdf_16,
-    netcdf_17,
-    netcdf_18,
-    netcdf_19,
-    netcdf_20,
-    netcdf_21,
-    netcdf_22,
-    netcdf_23,
-    netcdf_24,
-    netcdf_25,
-    netcdf_26,
-    netcdf_27,
-    netcdf_28,
-    netcdf_29,
-    netcdf_30,
-    netcdf_31,
-    netcdf_32,
-    netcdf_33,
-    netcdf_34,
-    netcdf_35,
-    netcdf_36,
-    netcdf_36_lonwrap,
-    netcdf_37,
-    netcdf_38,
-    netcdf_39,
-    netcdf_40,
-    netcdf_41,
-    netcdf_42,
-    netcdf_43,
-    netcdf_44,
-    netcdf_45,
-    netcdf_46,
-    netcdf_47,
-    netcdf_48,
-    netcdf_49,
-    netcdf_50,
-    netcdf_51,
-    netcdf_51_no_gdal_tags,
-    netcdf_52,
-    netcdf_53,
-    netcdf_54,
-    netcdf_55,
-    netcdf_56,
-    netcdf_57,
-    netcdf_58,
-    netcdf_59,
-    netcdf_60,
-    netcdf_61,
-    netcdf_62,
-    netcdf_62_ncdump_check,
-    netcdf_62_cf_check,
-    netcdf_63,
-    netcdf_63_ncdump_check,
-    netcdf_64,
-    netcdf_65,
-    netcdf_66,
-    netcdf_66_ncdump_check,
-    netcdf_67,
-    netcdf_68,
-    netcdf_69,
-    netcdf_70,
-    netcdf_71,
-    netcdf_72,
-    netcdf_73,
-    netcdf_74,
-    netcdf_75,
-    netcdf_76,
-    netcdf_77,
-    netcdf_78,
-    netcdf_79,
-    netcdf_80,
-    netcdf_81,
-    netcdf_82,
-    netcdf_uffd,
+    test_netcdf_1,
+    test_netcdf_2,
+    test_netcdf_3,
+    test_netcdf_4,
+    test_netcdf_5,
+    test_netcdf_6,
+    test_netcdf_7,
+    test_netcdf_8,
+    test_netcdf_9,
+    test_netcdf_10,
+    test_netcdf_11,
+    test_netcdf_12,
+    test_netcdf_13,
+    test_netcdf_14,
+    test_netcdf_15,
+    test_netcdf_16,
+    test_netcdf_17,
+    test_netcdf_18,
+    test_netcdf_19,
+    test_netcdf_20,
+    test_netcdf_21,
+    test_netcdf_22,
+    test_netcdf_23,
+    test_netcdf_24,
+    test_netcdf_25,
+    test_netcdf_26,
+    test_netcdf_27,
+    test_netcdf_28,
+    test_netcdf_29,
+    test_netcdf_30,
+    test_netcdf_31,
+    test_netcdf_32,
+    test_netcdf_33,
+    test_netcdf_34,
+    test_netcdf_35,
+    test_netcdf_36,
+    test_netcdf_36_lonwrap,
+    test_netcdf_37,
+    test_netcdf_38,
+    test_netcdf_39,
+    test_netcdf_40,
+    test_netcdf_41,
+    test_netcdf_42,
+    test_netcdf_43,
+    test_netcdf_44,
+    test_netcdf_45,
+    test_netcdf_46,
+    test_netcdf_47,
+    test_netcdf_48,
+    test_netcdf_49,
+    test_netcdf_50,
+    test_netcdf_51,
+    test_netcdf_51_no_gdal_tags,
+    test_netcdf_52,
+    test_netcdf_53,
+    test_netcdf_54,
+    test_netcdf_55,
+    test_netcdf_56,
+    test_netcdf_57,
+    test_netcdf_58,
+    test_netcdf_59,
+    test_netcdf_60,
+    test_netcdf_61,
+    test_netcdf_62,
+    test_netcdf_62_ncdump_check,
+    test_netcdf_62_cf_check,
+    test_netcdf_63,
+    test_netcdf_63_ncdump_check,
+    test_netcdf_64,
+    test_netcdf_65,
+    test_netcdf_66,
+    test_netcdf_66_ncdump_check,
+    test_netcdf_67,
+    test_netcdf_68,
+    test_netcdf_69,
+    test_netcdf_70,
+    test_netcdf_71,
+    test_netcdf_72,
+    test_netcdf_73,
+    test_netcdf_74,
+    test_netcdf_75,
+    test_netcdf_76,
+    test_netcdf_77,
+    test_netcdf_78,
+    test_netcdf_79,
+    test_netcdf_80,
+    test_netcdf_81,
+    test_netcdf_82,
+    test_netcdf_uffd,
 ]
 
 ###############################################################################
diff --git a/autotest/gdrivers/netcdf_cf.py b/autotest/gdrivers/netcdf_cf.py
index ed271c43bc81..a1a3b26347d1 100755
--- a/autotest/gdrivers/netcdf_cf.py
+++ b/autotest/gdrivers/netcdf_cf.py
@@ -556,7 +556,7 @@ def netcdf_cfproj_test_cf(proj, projNc):
 
 ###############################################################################
 # test copy and CF compliance for lat/lon (no datum, no GEOGCS) file, tif->nc->tif
-def netcdf_cf_1():
+def test_netcdf_cf_1():
 
     # setup netcdf and netcdf_cf environment
     netcdf_setup()
@@ -584,7 +584,7 @@ def netcdf_cf_1():
 
 ###############################################################################
 # test copy and CF compliance for lat/lon (no datum, no GEOGCS) file, nc->nc
-def netcdf_cf_2():
+def test_netcdf_cf_2():
 
     if gdaltest.netcdf_drv is None:
         return 'skip'
@@ -603,7 +603,7 @@ def netcdf_cf_2():
 ###############################################################################
 # test copy and CF compliance for lat/lon (W*S84) file, tif->nc->tif
 # note: this test fails in trunk (before r23246)
-def netcdf_cf_3():
+def test_netcdf_cf_3():
 
     if gdaltest.netcdf_drv is None:
         return 'skip'
@@ -630,7 +630,7 @@ def netcdf_cf_3():
 # test support for various CF projections
 
 
-def netcdf_cf_4():
+def test_netcdf_cf_4():
 
     if gdaltest.netcdf_drv is None:
         return 'skip'
@@ -647,7 +647,7 @@ def netcdf_cf_4():
 # test support for PS variants (bug #2893)
 
 
-def netcdf_cf_5():
+def test_netcdf_cf_5():
 
     if gdaltest.netcdf_drv is None:
         return 'skip'
@@ -671,11 +671,11 @@ def netcdf_cf_5():
 
 
 gdaltest_list = [
-    netcdf_cf_1,
-    netcdf_cf_2,
-    netcdf_cf_3,
-    netcdf_cf_4,
-    netcdf_cf_5,
+    test_netcdf_cf_1,
+    test_netcdf_cf_2,
+    test_netcdf_cf_3,
+    test_netcdf_cf_4,
+    test_netcdf_cf_5,
     None]
 
 if __name__ == '__main__':
diff --git a/autotest/gdrivers/ngsgeoid.py b/autotest/gdrivers/ngsgeoid.py
index ea6e2c6041c6..e7af8efaf01e 100755
--- a/autotest/gdrivers/ngsgeoid.py
+++ b/autotest/gdrivers/ngsgeoid.py
@@ -37,7 +37,7 @@
 # Test opening a little endian file
 
 
-def ngsgeoid_1():
+def test_ngsgeoid_1():
 
     tst = gdaltest.GDALTest('NGSGEOID', 'g2009u01_le_truncated.bin', 1, 65534)
     return tst.testOpen(check_gt=(229.99166666666667, 0.016666666666670001, 0.0, 40.00833333333334, 0.0, -0.016666666666670001), check_prj='WGS84')
@@ -46,15 +46,15 @@ def ngsgeoid_1():
 # Test opening a big endian file
 
 
-def ngsgeoid_2():
+def test_ngsgeoid_2():
 
     tst = gdaltest.GDALTest('NGSGEOID', 'g2009u01_be_truncated.bin', 1, 65534)
     return tst.testOpen(check_gt=(229.99166666666667, 0.016666666666670001, 0.0, 40.00833333333334, 0.0, -0.016666666666670001), check_prj='WGS84')
 
 
 gdaltest_list = [
-    ngsgeoid_1,
-    ngsgeoid_2
+    test_ngsgeoid_1,
+    test_ngsgeoid_2
 ]
 
 if __name__ == '__main__':
diff --git a/autotest/gdrivers/nitf.py b/autotest/gdrivers/nitf.py
index 08c292c7e9ae..7fe2659b61ab 100755
--- a/autotest/gdrivers/nitf.py
+++ b/autotest/gdrivers/nitf.py
@@ -46,7 +46,7 @@
 # Write/Read test of simple byte reference data.
 
 
-def nitf_1():
+def test_nitf_1():
 
     tst = gdaltest.GDALTest('NITF', 'byte.tif', 1, 4672)
     return tst.testCreateCopy()
@@ -55,7 +55,7 @@ def nitf_1():
 # Write/Read test of simple 16bit reference data.
 
 
-def nitf_2():
+def test_nitf_2():
 
     tst = gdaltest.GDALTest('NITF', 'int16.tif', 1, 4672)
     return tst.testCreateCopy()
@@ -64,7 +64,7 @@ def nitf_2():
 # Write/Read RGB image with lat/long georeferencing, and verify.
 
 
-def nitf_3():
+def test_nitf_3():
 
     tst = gdaltest.GDALTest('NITF', 'rgbsmall.tif', 3, 21349)
     return tst.testCreateCopy()
@@ -118,7 +118,7 @@ def nitf_create(creation_options, set_inverted_color_interp=True, createcopy=Fal
 # Test direction creation of an non-compressed NITF file.
 
 
-def nitf_4():
+def test_nitf_4():
 
     return nitf_create(['ICORDS=G'])
 
@@ -182,7 +182,7 @@ def nitf_check_created_file(checksum1, checksum2, checksum3, set_inverted_color_
 # Verify file created by nitf_4()
 
 
-def nitf_5():
+def test_nitf_5():
 
     return nitf_check_created_file(32498, 42602, 38982)
 
@@ -190,7 +190,7 @@ def nitf_5():
 # Read existing NITF file.  Verifies the new adjusted IGEOLO interp.
 
 
-def nitf_6():
+def test_nitf_6():
 
     tst = gdaltest.GDALTest('NITF', 'rgb.ntf', 3, 21349)
     return tst.testOpen(check_prj='WGS84',
@@ -201,7 +201,7 @@ def nitf_6():
 # NITF in-memory.
 
 
-def nitf_7():
+def test_nitf_7():
 
     tst = gdaltest.GDALTest('NITF', 'rgbsmall.tif', 3, 21349)
     return tst.testCreateCopy(vsimem=1)
@@ -210,7 +210,7 @@ def nitf_7():
 # Verify we can open an NSIF file, and get metadata including BLOCKA.
 
 
-def nitf_8():
+def test_nitf_8():
 
     ds = gdal.Open('data/fake_nsif.ntf')
 
@@ -245,7 +245,7 @@ def nitf_8():
 # Create and read a JPEG encoded NITF file.
 
 
-def nitf_9():
+def test_nitf_9():
 
     src_ds = gdal.Open('data/rgbsmall.tif')
     ds = gdal.GetDriverByName('NITF').CreateCopy('tmp/nitf9.ntf', src_ds,
@@ -275,7 +275,7 @@ def nitf_9():
 # tricky.  Verify this is working.
 
 
-def nitf_10():
+def test_nitf_10():
 
     src_ds = gdal.Open('tmp/nitf9.ntf')
     expected_cs = src_ds.GetRasterBand(2).Checksum()
@@ -291,7 +291,7 @@ def nitf_10():
 # Test 1bit file ... conveniently very small and easy to include! (#1854)
 
 
-def nitf_11():
+def test_nitf_11():
 
     # From http://www.gwg.nga.mil/ntb/baseline/software/testfile/Nitfv2_1/i_3034c.ntf
     tst = gdaltest.GDALTest('NITF', 'i_3034c.ntf', 1, 170)
@@ -301,7 +301,7 @@ def nitf_11():
 # Verify that TRE and CGM access via the metadata domain works.
 
 
-def nitf_12():
+def test_nitf_12():
 
     ds = gdal.Open('data/fake_nsif.ntf')
 
@@ -345,7 +345,7 @@ def nitf_12():
 ###############################################################################
 # Test creation of an NITF file in UTM Zone 11, Southern Hemisphere.
 
-def nitf_13():
+def test_nitf_13():
     drv = gdal.GetDriverByName('NITF')
     ds = drv.Create('tmp/test_13.ntf', 200, 100, 1, gdal.GDT_Byte,
                     ['ICORDS=S'])
@@ -368,7 +368,7 @@ def nitf_13():
 # Verify previous file
 
 
-def nitf_14():
+def test_nitf_14():
     ds = gdal.Open('tmp/test_13.ntf')
 
     chksum = ds.GetRasterBand(1).Checksum()
@@ -403,7 +403,7 @@ def nitf_14():
 # Test creating an in memory copy.
 
 
-def nitf_15():
+def test_nitf_15():
 
     tst = gdaltest.GDALTest('NITF', 'byte.tif', 1, 4672)
 
@@ -413,7 +413,7 @@ def nitf_15():
 # Checks a 1-bit mono with mask table having (0x00) black as transparent with white arrow.
 
 
-def nitf_16():
+def test_nitf_16():
 
     # From http://www.gwg.nga.mil/ntb/baseline/software/testfile/Nitfv2_1/ns3034d.nsf
     tst = gdaltest.GDALTest('NITF', 'ns3034d.nsf', 1, 170)
@@ -424,7 +424,7 @@ def nitf_16():
 # Checks a 1-bit RGB/LUT (green arrow) with a mask table (pad pixels having value of 0x00)
 # and a transparent pixel value of 1 being mapped to green by the LUT
 
-def nitf_17():
+def test_nitf_17():
 
     # From http://www.gwg.nga.mil/ntb/baseline/software/testfile/Nitfv2_1/i_3034f.ntf
     tst = gdaltest.GDALTest('NITF', 'i_3034f.ntf', 1, 170)
@@ -434,7 +434,7 @@ def nitf_17():
 # Test NITF file without image segment
 
 
-def nitf_18():
+def test_nitf_18():
 
     # Shut up the warning about missing image segment
     gdal.PushErrorHandler('CPLQuietErrorHandler')
@@ -451,7 +451,7 @@ def nitf_18():
 # Test BILEVEL (C1) decompression
 
 
-def nitf_19():
+def test_nitf_19():
 
     # From http://www.gwg.nga.mil/ntb/baseline/software/testfile/Nitfv2_0/U_1050A.NTF
     tst = gdaltest.GDALTest('NITF', 'U_1050A.NTF', 1, 65024)
@@ -462,7 +462,7 @@ def nitf_19():
 ###############################################################################
 # Test NITF file consisting only of an header
 
-def nitf_20():
+def test_nitf_20():
 
     # Shut up the warning about file either corrupt or empty
     gdal.PushErrorHandler('CPLQuietErrorHandler')
@@ -481,7 +481,7 @@ def nitf_20():
 #
 # See also nitf_35 for writing TEXT segments.
 
-def nitf_21():
+def test_nitf_21():
 
     # Shut up the warning about missing image segment
     gdal.PushErrorHandler('CPLQuietErrorHandler')
@@ -511,7 +511,7 @@ def nitf_21():
 ###############################################################################
 # Write/Read test of simple int32 reference data.
 
-def nitf_22():
+def test_nitf_22():
 
     tst = gdaltest.GDALTest('NITF', '../../gcore/data/int32.tif', 1, 4672)
     return tst.testCreateCopy()
@@ -520,7 +520,7 @@ def nitf_22():
 # Write/Read test of simple float32 reference data.
 
 
-def nitf_23():
+def test_nitf_23():
 
     tst = gdaltest.GDALTest('NITF', '../../gcore/data/float32.tif', 1, 4672)
     return tst.testCreateCopy()
@@ -529,7 +529,7 @@ def nitf_23():
 # Write/Read test of simple float64 reference data.
 
 
-def nitf_24():
+def test_nitf_24():
 
     tst = gdaltest.GDALTest('NITF', '../../gcore/data/float64.tif', 1, 4672)
     return tst.testCreateCopy()
@@ -538,7 +538,7 @@ def nitf_24():
 # Write/Read test of simple uint16 reference data.
 
 
-def nitf_25():
+def test_nitf_25():
 
     tst = gdaltest.GDALTest('NITF', '../../gcore/data/uint16.tif', 1, 4672)
     return tst.testCreateCopy()
@@ -547,7 +547,7 @@ def nitf_25():
 # Write/Read test of simple uint32 reference data.
 
 
-def nitf_26():
+def test_nitf_26():
 
     tst = gdaltest.GDALTest('NITF', '../../gcore/data/uint32.tif', 1, 4672)
     return tst.testCreateCopy()
@@ -556,7 +556,7 @@ def nitf_26():
 # Test Create() with IC=NC compression, and multi-blocks
 
 
-def nitf_27():
+def test_nitf_27():
 
     if nitf_create(['ICORDS=G', 'IC=NC', 'BLOCKXSIZE=10', 'BLOCKYSIZE=10']) != 'success':
         return 'fail'
@@ -567,7 +567,7 @@ def nitf_27():
 ###############################################################################
 # Test Create() with IC=C8 compression with the JP2ECW driver
 
-def nitf_28_jp2ecw():
+def test_nitf_28_jp2ecw():
 
     gdaltest.nitf_28_jp2ecw_is_ok = False
     if gdal.GetDriverByName('JP2ECW') is None:
@@ -607,7 +607,7 @@ def nitf_28_jp2ecw():
 # Test reading the previously create file with the JP2MrSID driver
 
 
-def nitf_28_jp2mrsid():
+def test_nitf_28_jp2mrsid():
     if not gdaltest.nitf_28_jp2ecw_is_ok:
         return 'skip'
 
@@ -628,7 +628,7 @@ def nitf_28_jp2mrsid():
 ###############################################################################
 # Test reading the previously create file with the JP2KAK driver
 
-def nitf_28_jp2kak():
+def test_nitf_28_jp2kak():
     if not gdaltest.nitf_28_jp2ecw_is_ok:
         return 'skip'
 
@@ -649,7 +649,7 @@ def nitf_28_jp2kak():
 # Test reading the previously create file with the JP2KAK driver
 
 
-def nitf_28_jp2openjpeg():
+def test_nitf_28_jp2openjpeg():
     if not gdaltest.nitf_28_jp2ecw_is_ok:
         return 'skip'
 
@@ -670,7 +670,7 @@ def nitf_28_jp2openjpeg():
 # Test Create() with IC=C8 compression with the JP2OpenJPEG driver
 
 
-def nitf_28_jp2openjpeg_bis():
+def test_nitf_28_jp2openjpeg_bis():
     drv = gdal.GetDriverByName('JP2OpenJPEG')
     if drv is None:
         return 'skip'
@@ -703,7 +703,7 @@ def nitf_28_jp2openjpeg_bis():
 # Test Create() with a LUT
 
 
-def nitf_29():
+def test_nitf_29():
 
     drv = gdal.GetDriverByName('NITF')
 
@@ -754,7 +754,7 @@ def nitf_29():
 # Verify we can write a file with BLOCKA TRE and read it back properly.
 
 
-def nitf_30():
+def test_nitf_30():
 
     src_ds = gdal.Open('data/fake_nsif.ntf')
     ds = gdal.GetDriverByName('NITF').CreateCopy('tmp/nitf30.ntf', src_ds)
@@ -870,7 +870,7 @@ def nitf_30():
 # Verify we can write a file with a custom TRE and read it back properly.
 
 
-def nitf_31():
+def test_nitf_31():
 
     if nitf_create(['TRE=CUSTOM= Test TRE1\\0MORE',
                     'TRE=TOTEST=SecondTRE',
@@ -907,7 +907,7 @@ def nitf_31():
 ###############################################################################
 # Test Create() with ICORDS=D
 
-def nitf_32():
+def test_nitf_32():
 
     if nitf_create(['ICORDS=D']) != 'success':
         return 'fail'
@@ -918,7 +918,7 @@ def nitf_32():
 ###############################################################################
 # Test Create() with ICORDS=D and a consistent BLOCKA
 
-def nitf_33():
+def test_nitf_33():
 
     if nitf_create(['ICORDS=D',
                     'BLOCKA_BLOCK_COUNT=01',
@@ -936,7 +936,7 @@ def nitf_33():
 ###############################################################################
 # Test CreateCopy() of a 16bit image with tiling
 
-def nitf_34():
+def test_nitf_34():
 
     tst = gdaltest.GDALTest('NITF', 'n43.dt0', 1, 49187, options=['BLOCKSIZE=64'])
     return tst.testCreateCopy()
@@ -945,7 +945,7 @@ def nitf_34():
 # Test CreateCopy() writing file with a text segment.
 
 
-def nitf_35():
+def test_nitf_35():
 
     src_ds = gdal.Open('data/text_md.vrt')
     ds = gdal.GetDriverByName('NITF').CreateCopy('tmp/nitf_35.ntf', src_ds)
@@ -981,7 +981,7 @@ def nitf_35():
 # Check that statistics are persisted (#3985)
 
 
-def nitf_36():
+def test_nitf_36():
 
     src_ds = gdal.Open('data/rgbsmall.tif')
     ds = gdal.GetDriverByName('NITF').CreateCopy('tmp/nitf36.ntf', src_ds,
@@ -1036,7 +1036,7 @@ def nitf_36():
 # Create and read a NITF file with 69999 bands
 
 
-def nitf_37():
+def test_nitf_37():
     try:
         if int(gdal.VersionInfo('VERSION_NUM')) < 1700:
             return 'skip'
@@ -1058,7 +1058,7 @@ def nitf_37():
 # Create and read a NITF file with 999 images
 
 
-def nitf_38():
+def test_nitf_38():
 
     ds = gdal.Open('data/byte.tif')
     nXSize = ds.RasterXSize
@@ -1146,7 +1146,7 @@ def nitf_38():
 # Create and read a JPEG encoded NITF file (M3) with several blocks
 
 
-def nitf_39():
+def test_nitf_39():
 
     src_ds = gdal.Open('data/rgbsmall.tif')
     ds = gdal.GetDriverByName('NITF').CreateCopy('tmp/nitf39.ntf', src_ds,
@@ -1177,7 +1177,7 @@ def nitf_39():
 # Create a 10 GB NITF file
 
 
-def nitf_40():
+def test_nitf_40():
 
     # Determine if the filesystem supports sparse files (we don't want to create a real 10 GB
     # file !
@@ -1234,7 +1234,7 @@ def nitf_40():
 ###############################################################################
 # Check reading a 12-bit JPEG compressed NITF
 
-def nitf_41():
+def test_nitf_41():
 
     import jpeg
     jpeg.jpeg_1()
@@ -1273,7 +1273,7 @@ def nitf_41():
 # Check creating a 12-bit JPEG compressed NITF
 
 
-def nitf_42():
+def test_nitf_42():
 
     if gdaltest.jpeg_version == '9b':
         return 'skip'
@@ -1340,25 +1340,25 @@ def nitf_43(driver_to_test, options):
     return ret
 
 
-def nitf_43_jasper():
+def test_nitf_43_jasper():
     return nitf_43('JPEG2000', ['IC=C8'])
 
 
-def nitf_43_jp2ecw():
+def test_nitf_43_jp2ecw():
     import ecw
     if not ecw.has_write_support():
         return 'skip'
     return nitf_43('JP2ECW', ['IC=C8', 'TARGET=0'])
 
 
-def nitf_43_jp2kak():
+def test_nitf_43_jp2kak():
     return nitf_43('JP2KAK', ['IC=C8', 'QUALITY=100'])
 
 ###############################################################################
 # Check creating a monoblock 10000x1 image (ticket #3263)
 
 
-def nitf_44():
+def test_nitf_44():
 
     out_ds = gdal.GetDriverByName('NITF').Create('tmp/nitf44.ntf', 10000, 1)
     out_ds.GetRasterBand(1).Fill(255)
@@ -1381,7 +1381,7 @@ def nitf_44():
 # Check overviews on a JPEG compressed subdataset
 
 
-def nitf_45():
+def test_nitf_45():
 
     try:
         os.remove('tmp/nitf45.ntf.aux.xml')
@@ -1468,7 +1468,7 @@ def nitf_46_jp2kak():
     return nitf_46('JP2KAK')
 
 
-def nitf_46_jasper():
+def test_nitf_46_jasper():
     return nitf_46('JPEG2000')
 
 
@@ -1479,7 +1479,7 @@ def nitf_46_openjpeg():
 # Check reading of rsets.
 
 
-def nitf_47():
+def test_nitf_47():
 
     ds = gdal.Open('data/rset.ntf.r0')
 
@@ -1502,7 +1502,7 @@ def nitf_47():
 # Check building of standard overviews in place of rset overviews.
 
 
-def nitf_48():
+def test_nitf_48():
 
     try:
         os.remove('tmp/rset.ntf.r0')
@@ -1547,7 +1547,7 @@ def nitf_48():
 # Test TEXT and CGM creation options with CreateCopy() (#3376)
 
 
-def nitf_49():
+def test_nitf_49():
 
     options = ["TEXT=DATA_0=COUCOU",
                "TEXT=HEADER_0=ABC",  # This content is invalid but who cares here
@@ -1591,7 +1591,7 @@ def nitf_49():
 # Test TEXT and CGM creation options with Create() (#3376)
 
 
-def nitf_50():
+def test_nitf_50():
 
     options = [  # "IC=C8",
         "TEXT=DATA_0=COUCOU",
@@ -1647,7 +1647,7 @@ def nitf_50():
 # Test reading very small images with NBPP < 8 or NBPP == 12
 
 
-def nitf_51():
+def test_nitf_51():
     for xsize in range(1, 9):
         for nbpp in [1, 2, 3, 4, 5, 6, 7, 12]:
             ds = gdal.GetDriverByName('NITF').Create('tmp/nitf51.ntf', xsize, 1)
@@ -1689,7 +1689,7 @@ def nitf_51():
 # Test reading GeoSDE TREs
 
 
-def nitf_52():
+def test_nitf_52():
 
     # Create a fake NITF file with GeoSDE TREs (probably not conformant, but enough to test GDAL code)
     ds = gdal.GetDriverByName('NITF').Create('tmp/nitf52.ntf', 1, 1, options=['FILE_TRE=GEOPSB=01234567890123456789012345678901234567890123456789012345678901234567890123456789012345EURM                                                                                                                                                                                                                                                                                                                                                                 ',
@@ -1718,7 +1718,7 @@ def nitf_52():
 # Test reading UTM MGRS
 
 
-def nitf_53():
+def test_nitf_53():
 
     ds = gdal.GetDriverByName('NITF').Create('tmp/nitf53.ntf', 2, 2, options=['ICORDS=N'])
     ds = None
@@ -1756,7 +1756,7 @@ def nitf_53():
 # Test reading RPC00B
 
 
-def nitf_54():
+def test_nitf_54():
 
     # Create a fake NITF file with RPC00B TRE (probably not conformant, but enough to test GDAL code)
     RPC00B = '100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000'
@@ -1778,7 +1778,7 @@ def nitf_54():
 # Test reading ICHIPB
 
 
-def nitf_55():
+def test_nitf_55():
 
     # Create a fake NITF file with ICHIPB TRE (probably not conformant, but enough to test GDAL code)
     ICHIPB = '00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000'
@@ -1800,7 +1800,7 @@ def nitf_55():
 # Test reading USE00A
 
 
-def nitf_56():
+def test_nitf_56():
 
     # Create a fake NITF file with USE00A TRE (probably not conformant, but enough to test GDAL code)
     USE00A = '00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000'
@@ -1822,7 +1822,7 @@ def nitf_56():
 # Test reading GEOLOB
 
 
-def nitf_57():
+def test_nitf_57():
 
     # Create a fake NITF file with GEOLOB TRE
     GEOLOB = '000000360000000360-180.000000000090.000000000000'
@@ -1845,7 +1845,7 @@ def nitf_57():
 # Test reading STDIDC
 
 
-def nitf_58():
+def test_nitf_58():
 
     # Create a fake NITF file with STDIDC TRE (probably not conformant, but enough to test GDAL code)
     STDIDC = '00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000'
@@ -1867,7 +1867,7 @@ def nitf_58():
 # Test reading IMRFCA and IMASDA
 
 
-def nitf_read_IMRFCA_IMASDA():
+def test_nitf_read_IMRFCA_IMASDA():
 
     # Create a fake NITF file with fake IMRFCA and IMASDA TRE
     IMRFCA = '0' * 1760
@@ -1936,7 +1936,7 @@ def nitf_read_IMRFCA_IMASDA():
 # Test georeferencing through .nfw and .hdr files
 
 
-def nitf_59():
+def test_nitf_59():
 
     shutil.copyfile('data/nitf59.nfw', 'tmp/nitf59.nfw')
     shutil.copyfile('data/nitf59.hdr', 'tmp/nitf59.hdr')
@@ -1964,7 +1964,7 @@ def nitf_59():
 # Test reading CADRG polar tile georeferencing (#2940)
 
 
-def nitf_60():
+def test_nitf_60():
 
     # Shut down errors because the file is truncated
     gdal.PushErrorHandler('CPLQuietErrorHandler')
@@ -1992,7 +1992,7 @@ def nitf_60():
 # Test reading TRE from DE segment
 
 
-def nitf_61():
+def test_nitf_61():
 
     # Derived from http://www.gwg.nga.mil/ntb/baseline/software/testfile/rsm/SampleFiles/FrameSet1/NITF_Files/i_6130a.zip
     # but hand edited to have just 1x1 imagery
@@ -2016,7 +2016,7 @@ def nitf_61():
 # Test creating & reading image comments
 
 
-def nitf_62():
+def test_nitf_62():
 
     # 80+1 characters
     comments = '012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678ZA'
@@ -2040,7 +2040,7 @@ def nitf_62():
 # Test NITFReadImageLine() and NITFWriteImageLine() when nCols < nBlockWidth (#3551)
 
 
-def nitf_63():
+def test_nitf_63():
 
     ds = gdal.GetDriverByName('NITF').Create('tmp/nitf63.ntf', 50, 25, 3, gdal.GDT_Int16, options=['BLOCKXSIZE=256'])
     ds = None
@@ -2082,7 +2082,7 @@ def nitf_63():
 # Test SDE_TRE creation option
 
 
-def nitf_64():
+def test_nitf_64():
 
     src_ds = gdal.GetDriverByName('GTiff').Create('/vsimem/nitf_64.tif', 256, 256, 1)
     src_ds.SetGeoTransform([2.123456789, 0.123456789, 0, 49.123456789, 0, -0.123456789])
@@ -2142,7 +2142,7 @@ def nitf_64():
 # Test creating an image with block_width = image_width > 8192 (#3922)
 
 
-def nitf_65():
+def test_nitf_65():
 
     ds = gdal.GetDriverByName('NITF').Create('/vsimem/nitf_65.ntf', 10000, 100, options=['BLOCKXSIZE=10000'])
     ds = None
@@ -2164,7 +2164,7 @@ def nitf_65():
 # Test creating an image with block_height = image_height > 8192 (#3922)
 
 
-def nitf_66():
+def test_nitf_66():
 
     ds = gdal.GetDriverByName('NITF').Create('/vsimem/nitf_66.ntf', 100, 10000, options=['BLOCKYSIZE=10000', 'BLOCKXSIZE=50'])
     ds = None
@@ -2186,7 +2186,7 @@ def nitf_66():
 # Test that we don't use scanline access in illegal cases (#3926)
 
 
-def nitf_67():
+def test_nitf_67():
 
     src_ds = gdal.Open('data/byte.tif')
     gdal.PushErrorHandler('CPLQuietErrorHandler')
@@ -2212,7 +2212,7 @@ def nitf_67():
 # Test reading NITF_METADATA domain
 
 
-def nitf_68():
+def test_nitf_68():
 
     ds = gdal.Open('data/rgb.ntf')
     if len(ds.GetMetadata('NITF_METADATA')) != 2:
@@ -2232,7 +2232,7 @@ def nitf_68():
 # Test SetGCPs() support
 
 
-def nitf_69():
+def test_nitf_69():
 
     vrt_txt = """<VRTDataset rasterXSize="20" rasterYSize="20">
     <GCPList Projection='GEOGCS["WGS 84",DATUM["WGS_1984",SPHEROID["WGS 84",6378137,298.257223563,AUTHORITY["EPSG","7030"]],AUTHORITY["EPSG","6326"]],PRIMEM["Greenwich",0,AUTHORITY["EPSG","8901"]],UNIT["degree",0.0174532925199433,AUTHORITY["EPSG","9122"]],AUTHORITY["EPSG","4326"]]'>
@@ -2311,7 +2311,7 @@ def nitf_69():
 # Create and read a JPEG encoded NITF file with NITF dimensions != JPEG dimensions
 
 
-def nitf_70():
+def test_nitf_70():
 
     src_ds = gdal.Open('data/rgbsmall.tif')
 
@@ -2347,7 +2347,7 @@ def nitf_70():
 # Test reading ENGRDA TRE (#6285)
 
 
-def nitf_71():
+def test_nitf_71():
 
     ds = gdal.GetDriverByName('NITF').Create('/vsimem/nitf_71.ntf', 1, 1, options=['TRE=ENGRDA=0123456789012345678900210012345678901230123X01200000002XY01X01230123X01200000001X'])
     ds = None
@@ -2424,7 +2424,7 @@ def compare_rpc(src_md, md):
     return 'success'
 
 
-def nitf_72():
+def test_nitf_72():
 
     src_ds = gdal.GetDriverByName('MEM').Create('', 1, 1)
     # Use full precision
@@ -2740,7 +2740,7 @@ def nitf_72():
 # Test case for https://bugs.chromium.org/p/oss-fuzz/issues/detail?id=1525
 
 
-def nitf_73():
+def test_nitf_73():
 
     with gdaltest.error_handler():
         gdal.Open('data/oss_fuzz_1525.ntf')
@@ -2752,7 +2752,7 @@ def nitf_73():
 #  - Simple case
 
 
-def nitf_74():
+def test_nitf_74():
 
     ds = gdal.GetDriverByName('NITF').Create('/vsimem/nitf_74.ntf', 1, 1, options=['FILE_TRE=CCINFA=0012AS 17ge:GENC:3:3-5:AUS00000'])
     ds = None
@@ -2788,7 +2788,7 @@ def nitf_74():
 #  - TABLE AG.2 case
 
 
-def nitf_75():
+def test_nitf_75():
 
     listing_AG1 = """<?xml version="1.0" encoding="UTF-8"?>
 <genc:GeopoliticalEntityEntry 
@@ -2987,7 +2987,7 @@ def nitf_75():
 # Test reading C4 compressed file
 
 
-def nitf_read_C4():
+def test_nitf_read_C4():
 
     ds = gdal.Open('data/RPFTOC01.ON2')
     cs = ds.GetRasterBand(1).Checksum()
@@ -3001,7 +3001,7 @@ def nitf_read_C4():
 # Test NITF21_CGM_ANNO_Uncompressed_unmasked.ntf for bug #1313 and #1714
 
 
-def nitf_online_1():
+def test_nitf_online_1():
 
     if not gdaltest.download_file('http://download.osgeo.org/gdal/data/nitf/bugs/NITF21_CGM_ANNO_Uncompressed_unmasked.ntf', 'NITF21_CGM_ANNO_Uncompressed_unmasked.ntf'):
         return 'skip'
@@ -3019,7 +3019,7 @@ def nitf_online_1():
 # Test NITF file with multiple images
 
 
-def nitf_online_2():
+def test_nitf_online_2():
 
     if not gdaltest.download_file('http://download.osgeo.org/gdal/data/nitf/nitf1.1/U_0001a.ntf', 'U_0001a.ntf'):
         return 'skip'
@@ -3038,7 +3038,7 @@ def nitf_online_2():
 # Test ARIDPCM (C2) image
 
 
-def nitf_online_3():
+def test_nitf_online_3():
 
     if not gdaltest.download_file('http://download.osgeo.org/gdal/data/nitf/nitf1.1/U_0001a.ntf', 'U_0001a.ntf'):
         return 'skip'
@@ -3051,7 +3051,7 @@ def nitf_online_3():
 # Test Vector Quantization (VQ) (C4) file
 
 
-def nitf_online_4():
+def test_nitf_online_4():
 
     if not gdaltest.download_file('http://download.osgeo.org/gdal/data/nitf/cadrg/001zc013.on1', '001zc013.on1'):
         return 'skip'
@@ -3075,7 +3075,7 @@ def nitf_online_4():
 # Test Vector Quantization (VQ) (M4) file
 
 
-def nitf_online_5():
+def test_nitf_online_5():
 
     if not gdaltest.download_file('http://download.osgeo.org/gdal/data/nitf/cadrg/overview.ovr', 'overview.ovr'):
         return 'skip'
@@ -3088,7 +3088,7 @@ def nitf_online_5():
 # Test a JPEG compressed, single blocked 2048x2048 mono image
 
 
-def nitf_online_6():
+def test_nitf_online_6():
 
     if not gdaltest.download_file('http://download.osgeo.org/gdal/data/nitf/nitf2.0/U_4001b.ntf', 'U_4001b.ntf'):
         return 'skip'
@@ -3101,7 +3101,7 @@ def nitf_online_6():
 ###############################################################################
 # Test all combinations of IMODE (S,P,B,R) for an image with 6 bands whose 3 are RGB
 
-def nitf_online_7():
+def test_nitf_online_7():
 
     for filename in ['ns3228b.nsf', 'i_3228c.ntf', 'ns3228d.nsf', 'i_3228e.ntf']:
         if not gdaltest.download_file('http://www.gwg.nga.mil/ntb/baseline/software/testfile/Nitfv2_1/' + filename, filename):
@@ -3133,7 +3133,7 @@ def nitf_online_7():
 # Test JPEG-compressed multi-block mono-band image with a data mask subheader (IC=M3, IMODE=B)
 
 
-def nitf_online_8():
+def test_nitf_online_8():
 
     if not gdaltest.download_file('http://www.gwg.nga.mil/ntb/baseline/software/testfile/Nitfv2_1/ns3301j.nsf', 'ns3301j.nsf'):
         return 'skip'
@@ -3146,7 +3146,7 @@ def nitf_online_8():
 ###############################################################################
 # Test JPEG-compressed multi-block mono-band image without a data mask subheader (IC=C3, IMODE=B)
 
-def nitf_online_9():
+def test_nitf_online_9():
 
     if not gdaltest.download_file('http://www.gwg.nga.mil/ntb/baseline/software/testfile/Nitfv2_1/ns3304a.nsf', 'ns3304a.nsf'):
         return 'skip'
@@ -3159,7 +3159,7 @@ def nitf_online_9():
 ###############################################################################
 # Verify that CGM access on a file with 8 CGM segments
 
-def nitf_online_10():
+def test_nitf_online_10():
 
     if not gdaltest.download_file('http://www.gwg.nga.mil/ntb/baseline/software/testfile/Nitfv2_1/ns3119b.nsf', 'ns3119b.nsf'):
         return 'skip'
@@ -3215,7 +3215,7 @@ def nitf_online_10():
 # 5 text files
 
 
-def nitf_online_11():
+def test_nitf_online_11():
 
     if not gdaltest.download_file('http://download.osgeo.org/gdal/data/nitf/nitf2.0/U_1122a.ntf', 'U_1122a.ntf'):
         return 'skip'
@@ -3248,7 +3248,7 @@ def nitf_online_11():
 ###############################################################################
 # Test 12 bit uncompressed image.
 
-def nitf_online_12():
+def test_nitf_online_12():
 
     if not gdaltest.download_file('http://download.osgeo.org/gdal/data/nitf/bugs/i_3430a.ntf', 'i_3430a.ntf'):
         return 'skip'
@@ -3262,7 +3262,7 @@ def nitf_online_12():
 ###############################################################################
 # Test complex relative graphic/image attachment.
 
-def nitf_online_13():
+def test_nitf_online_13():
 
     if not gdaltest.download_file('http://download.osgeo.org/gdal/data/nitf/u_3054a.ntf', 'u_3054a.ntf'):
         return 'skip'
@@ -3314,7 +3314,7 @@ def nitf_online_13():
 ###############################################################################
 # Check reading a 12-bit JPEG compressed NITF (multi-block)
 
-def nitf_online_14():
+def test_nitf_online_14():
 
     if not gdaltest.download_file('http://download.osgeo.org/gdal/data/nitf/nitf2.0/U_4020h.ntf', 'U_4020h.ntf'):
         return 'skip'
@@ -3379,23 +3379,23 @@ def nitf_online_15(driver_to_test, expected_cs=1054):
     return ret
 
 
-def nitf_online_15_jp2ecw():
+def test_nitf_online_15_jp2ecw():
     return nitf_online_15('JP2ECW')
 
 
-def nitf_online_15_jp2mrsid():
+def test_nitf_online_15_jp2mrsid():
     return nitf_online_15('JP2MrSID')
 
 
-def nitf_online_15_jp2kak():
+def test_nitf_online_15_jp2kak():
     return nitf_online_15('JP2KAK')
 
 
-def nitf_online_15_jasper():
+def test_nitf_online_15_jasper():
     return nitf_online_15('JPEG2000')
 
 
-def nitf_online_15_openjpeg():
+def test_nitf_online_15_openjpeg():
     return nitf_online_15('JP2OpenJPEG')
 
 ###############################################################################
@@ -3440,23 +3440,23 @@ def nitf_online_16(driver_to_test):
     return ret
 
 
-def nitf_online_16_jp2ecw():
+def test_nitf_online_16_jp2ecw():
     return nitf_online_16('JP2ECW')
 
 
-def nitf_online_16_jp2mrsid():
+def test_nitf_online_16_jp2mrsid():
     return nitf_online_16('JP2MrSID')
 
 
-def nitf_online_16_jp2kak():
+def test_nitf_online_16_jp2kak():
     return nitf_online_16('JP2KAK')
 
 
-def nitf_online_16_jasper():
+def test_nitf_online_16_jasper():
     return nitf_online_16('JPEG2000')
 
 
-def nitf_online_16_openjpeg():
+def test_nitf_online_16_openjpeg():
     return nitf_online_16('JP2OpenJPEG')
 
 ###############################################################################
@@ -3494,30 +3494,30 @@ def nitf_online_17(driver_to_test):
     return ret
 
 
-def nitf_online_17_jp2ecw():
+def test_nitf_online_17_jp2ecw():
     return nitf_online_17('JP2ECW')
 
 
-def nitf_online_17_jp2mrsid():
+def test_nitf_online_17_jp2mrsid():
     return nitf_online_17('JP2MrSID')
 
 
-def nitf_online_17_jp2kak():
+def test_nitf_online_17_jp2kak():
     return nitf_online_17('JP2KAK')
 
 
-def nitf_online_17_jasper():
+def test_nitf_online_17_jasper():
     return nitf_online_17('JPEG2000')
 
 
-def nitf_online_17_openjpeg():
+def test_nitf_online_17_openjpeg():
     return nitf_online_17('JP2OpenJPEG')
 
 ###############################################################################
 # Test polar stereographic CADRG tile.
 
 
-def nitf_online_18():
+def test_nitf_online_18():
     if not gdaltest.download_file('http://download.osgeo.org/gdal/data/nitf/bugs/bug3337.ntf', 'bug3337.ntf'):
         return 'skip'
 
@@ -3566,7 +3566,7 @@ def nitf_online_18():
 # Test CADRG tile crossing dateline (#3383)
 
 
-def nitf_online_19():
+def test_nitf_online_19():
 
     if not gdaltest.download_file('http://download.osgeo.org/gdal/data/nitf/0000M033.GN3', '0000M033.GN3'):
         return 'skip'
@@ -3583,7 +3583,7 @@ def nitf_online_19():
 # smaller than really available
 
 
-def nitf_online_20():
+def test_nitf_online_20():
 
     if not gdaltest.download_file('http://download.osgeo.org/gdal/data/nitf/0000M033.GN3', '0000M033.GN3'):
         return 'skip'
@@ -3606,7 +3606,7 @@ def nitf_online_20():
 # segment when header at beginning of file is incomplete
 
 
-def nitf_online_21():
+def test_nitf_online_21():
 
     if not gdaltest.download_file('http://www.gwg.nga.mil/ntb/baseline/software/testfile/Nitfv2_1/ns3321a.nsf', 'ns3321a.nsf'):
         return 'skip'
@@ -3628,7 +3628,7 @@ def nitf_online_21():
 #
 
 
-def nitf_online_22():
+def test_nitf_online_22():
 
     if not gdaltest.download_file('http://www.gwg.nga.mil/ntb/baseline/software/testfile/Nitfv1_1/U_0001C.NTF', 'U_0001C.NTF'):
         return 'skip'
@@ -3715,7 +3715,7 @@ def nitf_online_22():
 # Test reading a M4 compressed file (fixed for #3848)
 
 
-def nitf_online_23():
+def test_nitf_online_23():
 
     if not gdaltest.download_file('http://download.osgeo.org/gdal/data/nitf/nitf2.0/U_3058b.ntf', 'U_3058b.ntf'):
         return 'skip'
@@ -3728,7 +3728,7 @@ def nitf_online_23():
 # Test reading ECRG frames
 
 
-def nitf_online_24():
+def test_nitf_online_24():
 
     if not gdaltest.download_file('http://www.falconview.org/trac/FalconView/downloads/17', 'ECRG_Sample.zip'):
         return 'skip'
@@ -3763,7 +3763,7 @@ def nitf_online_24():
 # Test reading a HRE file
 
 
-def nitf_online_25():
+def test_nitf_online_25():
 
     if not gdaltest.download_file('http://www.gwg.nga.mil/ntb/baseline/docs/HRE_spec/Case1_HRE10G324642N1170747W_Uxx.hr5', 'Case1_HRE10G324642N1170747W_Uxx.hr5'):
         return 'skip'
@@ -3789,7 +3789,7 @@ def nitf_online_25():
 # Cleanup.
 
 
-def nitf_cleanup():
+def test_nitf_cleanup():
     try:
         gdal.GetDriverByName('NITF').Delete('tmp/test_create.ntf')
     except RuntimeError:
@@ -3941,131 +3941,131 @@ def nitf_cleanup():
 
 
 gdaltest_list = [
-    nitf_1,
-    nitf_2,
-    nitf_3,
-    nitf_4,
-    nitf_5,
-    nitf_6,
-    nitf_7,
-    nitf_8,
-    nitf_9,
-    nitf_10,
-    nitf_11,
-    nitf_12,
-    nitf_13,
-    nitf_14,
-    nitf_15,
-    nitf_16,
-    nitf_17,
-    nitf_18,
-    nitf_19,
-    nitf_20,
-    nitf_21,
-    nitf_22,
-    nitf_23,
-    nitf_24,
-    nitf_25,
-    nitf_26,
-    nitf_27,
-    nitf_28_jp2ecw,
-    nitf_28_jp2mrsid,
-    nitf_28_jp2kak,
-    nitf_28_jp2openjpeg,
-    nitf_28_jp2openjpeg_bis,
-    nitf_29,
-    nitf_30,
-    nitf_31,
-    nitf_32,
-    nitf_33,
-    nitf_34,
-    nitf_35,
-    nitf_36,
-    nitf_37,
-    nitf_38,
-    nitf_39,
-    nitf_40,
-    nitf_41,
-    nitf_42,
-    nitf_43_jasper,
-    nitf_43_jp2ecw,
-    nitf_43_jp2kak,
-    nitf_44,
-    nitf_45,
+    test_nitf_1,
+    test_nitf_2,
+    test_nitf_3,
+    test_nitf_4,
+    test_nitf_5,
+    test_nitf_6,
+    test_nitf_7,
+    test_nitf_8,
+    test_nitf_9,
+    test_nitf_10,
+    test_nitf_11,
+    test_nitf_12,
+    test_nitf_13,
+    test_nitf_14,
+    test_nitf_15,
+    test_nitf_16,
+    test_nitf_17,
+    test_nitf_18,
+    test_nitf_19,
+    test_nitf_20,
+    test_nitf_21,
+    test_nitf_22,
+    test_nitf_23,
+    test_nitf_24,
+    test_nitf_25,
+    test_nitf_26,
+    test_nitf_27,
+    test_nitf_28_jp2ecw,
+    test_nitf_28_jp2mrsid,
+    test_nitf_28_jp2kak,
+    test_nitf_28_jp2openjpeg,
+    test_nitf_28_jp2openjpeg_bis,
+    test_nitf_29,
+    test_nitf_30,
+    test_nitf_31,
+    test_nitf_32,
+    test_nitf_33,
+    test_nitf_34,
+    test_nitf_35,
+    test_nitf_36,
+    test_nitf_37,
+    test_nitf_38,
+    test_nitf_39,
+    test_nitf_40,
+    test_nitf_41,
+    test_nitf_42,
+    test_nitf_43_jasper,
+    test_nitf_43_jp2ecw,
+    test_nitf_43_jp2kak,
+    test_nitf_44,
+    test_nitf_45,
     # nitf_46_jp2ecw,
     # nitf_46_jp2mrsid,
     # nitf_46_jp2kak,
-    nitf_46_jasper,
+    test_nitf_46_jasper,
     # nitf_46_openjpeg,
-    nitf_47,
-    nitf_48,
-    nitf_49,
-    nitf_50,
-    nitf_51,
-    nitf_52,
-    nitf_53,
-    nitf_54,
-    nitf_55,
-    nitf_56,
-    nitf_57,
-    nitf_58,
-    nitf_read_IMRFCA_IMASDA,
-    nitf_59,
-    nitf_60,
-    nitf_61,
-    nitf_62,
-    nitf_63,
-    nitf_64,
-    nitf_65,
-    nitf_66,
-    nitf_67,
-    nitf_68,
-    nitf_69,
-    nitf_70,
-    nitf_71,
-    nitf_72,
-    nitf_73,
-    nitf_74,
-    nitf_75,
-    nitf_read_C4,
-    nitf_online_1,
-    nitf_online_2,
-    nitf_online_3,
-    nitf_online_4,
-    nitf_online_5,
-    nitf_online_6,
-    nitf_online_7,
-    nitf_online_8,
-    nitf_online_9,
-    nitf_online_10,
-    nitf_online_11,
-    nitf_online_12,
-    nitf_online_13,
-    nitf_online_14,
-    nitf_online_15_jp2ecw,
-    nitf_online_15_jp2mrsid,
-    nitf_online_15_jp2kak,
-    nitf_online_15_jasper,
-    nitf_online_15_openjpeg,
-    nitf_online_16_jp2ecw,
-    nitf_online_16_jp2mrsid,
-    nitf_online_16_jp2kak,
-    nitf_online_16_jasper,
-    nitf_online_16_openjpeg,
-    nitf_online_17_jp2ecw,
-    nitf_online_17_jp2mrsid,
-    nitf_online_17_jp2kak,
-    nitf_online_17_jasper,
-    nitf_online_17_openjpeg,
-    nitf_online_18,
-    nitf_online_19,
-    nitf_online_20,
-    nitf_online_21,
-    nitf_online_22,
-    nitf_online_23,
-    nitf_online_24,
-    nitf_online_25,
-    nitf_cleanup]
+    test_nitf_47,
+    test_nitf_48,
+    test_nitf_49,
+    test_nitf_50,
+    test_nitf_51,
+    test_nitf_52,
+    test_nitf_53,
+    test_nitf_54,
+    test_nitf_55,
+    test_nitf_56,
+    test_nitf_57,
+    test_nitf_58,
+    test_nitf_read_IMRFCA_IMASDA,
+    test_nitf_59,
+    test_nitf_60,
+    test_nitf_61,
+    test_nitf_62,
+    test_nitf_63,
+    test_nitf_64,
+    test_nitf_65,
+    test_nitf_66,
+    test_nitf_67,
+    test_nitf_68,
+    test_nitf_69,
+    test_nitf_70,
+    test_nitf_71,
+    test_nitf_72,
+    test_nitf_73,
+    test_nitf_74,
+    test_nitf_75,
+    test_nitf_read_C4,
+    test_nitf_online_1,
+    test_nitf_online_2,
+    test_nitf_online_3,
+    test_nitf_online_4,
+    test_nitf_online_5,
+    test_nitf_online_6,
+    test_nitf_online_7,
+    test_nitf_online_8,
+    test_nitf_online_9,
+    test_nitf_online_10,
+    test_nitf_online_11,
+    test_nitf_online_12,
+    test_nitf_online_13,
+    test_nitf_online_14,
+    test_nitf_online_15_jp2ecw,
+    test_nitf_online_15_jp2mrsid,
+    test_nitf_online_15_jp2kak,
+    test_nitf_online_15_jasper,
+    test_nitf_online_15_openjpeg,
+    test_nitf_online_16_jp2ecw,
+    test_nitf_online_16_jp2mrsid,
+    test_nitf_online_16_jp2kak,
+    test_nitf_online_16_jasper,
+    test_nitf_online_16_openjpeg,
+    test_nitf_online_17_jp2ecw,
+    test_nitf_online_17_jp2mrsid,
+    test_nitf_online_17_jp2kak,
+    test_nitf_online_17_jasper,
+    test_nitf_online_17_openjpeg,
+    test_nitf_online_18,
+    test_nitf_online_19,
+    test_nitf_online_20,
+    test_nitf_online_21,
+    test_nitf_online_22,
+    test_nitf_online_23,
+    test_nitf_online_24,
+    test_nitf_online_25,
+    test_nitf_cleanup]
 
 # gdaltest_list = [ nitf_72 ]
 
diff --git a/autotest/gdrivers/ntv1.py b/autotest/gdrivers/ntv1.py
index 5491ea21eb3f..7e42d3f5d508 100755
--- a/autotest/gdrivers/ntv1.py
+++ b/autotest/gdrivers/ntv1.py
@@ -38,7 +38,7 @@
 # Open a little-endian NTv2 grid
 
 
-def ntv1_1():
+def test_ntv1_1():
 
     tst = gdaltest.GDALTest('NTV1', 'ntv1_can_truncated.dat', 1, 65532)
     gt = (-44.375, 0.25, 0.0, 40.375, 0.0, -0.25)
@@ -46,7 +46,7 @@ def ntv1_1():
 
 
 gdaltest_list = [
-    ntv1_1,
+    test_ntv1_1,
 ]
 
 
diff --git a/autotest/gdrivers/ntv2.py b/autotest/gdrivers/ntv2.py
index c5d7a4829fe4..4e7b1ab05827 100755
--- a/autotest/gdrivers/ntv2.py
+++ b/autotest/gdrivers/ntv2.py
@@ -39,7 +39,7 @@
 # Open a little-endian NTv2 grid
 
 
-def ntv2_1():
+def test_ntv2_1():
 
     tst = gdaltest.GDALTest('NTV2', 'test_ntv2_le.gsb', 2, 10)
     gt = (-5.52, 7.8, 0.0, 52.05, 0.0, -5.55)
@@ -49,7 +49,7 @@ def ntv2_1():
 # Open a big-endian NTv2 grid
 
 
-def ntv2_2():
+def test_ntv2_2():
 
     tst = gdaltest.GDALTest('NTV2', 'test_ntv2_be.gsb', 2, 10)
     gt = (-5.52, 7.8, 0.0, 52.05, 0.0, -5.55)
@@ -59,7 +59,7 @@ def ntv2_2():
 # Test creating a little-endian NTv2 grid
 
 
-def ntv2_3():
+def test_ntv2_3():
 
     tst = gdaltest.GDALTest('NTV2', 'test_ntv2_le.gsb', 2, 10, options=['ENDIANNESS=LE'])
     return tst.testCreateCopy(vsimem=1)
@@ -68,7 +68,7 @@ def ntv2_3():
 # Test creating a big-endian NTv2 grid
 
 
-def ntv2_4():
+def test_ntv2_4():
 
     tst = gdaltest.GDALTest('NTV2', 'test_ntv2_le.gsb', 2, 10, options=['ENDIANNESS=BE'])
     return tst.testCreateCopy(vsimem=1)
@@ -77,7 +77,7 @@ def ntv2_4():
 # Test appending to a little-endian NTv2 grid
 
 
-def ntv2_5():
+def test_ntv2_5():
 
     src_ds = gdal.Open('data/test_ntv2_le.gsb')
     gdal.GetDriverByName('NTv2').Create('/vsimem/ntv2_5.gsb', 1, 1, 4, gdal.GDT_Float32, options=['ENDIANNESS=LE'])
@@ -101,7 +101,7 @@ def ntv2_5():
 # Test appending to a big-endian NTv2 grid
 
 
-def ntv2_6():
+def test_ntv2_6():
 
     src_ds = gdal.Open('data/test_ntv2_le.gsb')
     gdal.GetDriverByName('NTv2').Create('/vsimem/ntv2_6.gsb', 1, 1, 4, gdal.GDT_Float32, options=['ENDIANNESS=BE'])
@@ -125,7 +125,7 @@ def ntv2_6():
 # Test creating a file with invalid filename
 
 
-def ntv2_7():
+def test_ntv2_7():
 
     with gdaltest.error_handler():
         ds = gdal.GetDriverByName('NTv2').Create('/does/not/exist.gsb', 1, 1, 4, gdal.GDT_Float32)
@@ -142,7 +142,7 @@ def ntv2_7():
 ###############################################################################
 
 
-def ntv2_online_1():
+def test_ntv2_online_1():
 
     if not gdaltest.download_file('http://download.osgeo.org/proj/nzgd2kgrid0005.gsb', 'nzgd2kgrid0005.gsb'):
         return 'skip'
@@ -159,7 +159,7 @@ def ntv2_online_1():
 ###############################################################################
 
 
-def ntv2_online_2():
+def test_ntv2_online_2():
 
     try:
         os.stat('tmp/cache/nzgd2kgrid0005.gsb')
@@ -172,7 +172,7 @@ def ntv2_online_2():
 ###############################################################################
 
 
-def ntv2_online_3():
+def test_ntv2_online_3():
 
     try:
         os.stat('tmp/cache/nzgd2kgrid0005.gsb')
@@ -184,16 +184,16 @@ def ntv2_online_3():
 
 
 gdaltest_list = [
-    ntv2_1,
-    ntv2_2,
-    ntv2_3,
-    ntv2_4,
-    ntv2_5,
-    ntv2_6,
-    ntv2_7,
-    ntv2_online_1,
-    ntv2_online_2,
-    ntv2_online_3,
+    test_ntv2_1,
+    test_ntv2_2,
+    test_ntv2_3,
+    test_ntv2_4,
+    test_ntv2_5,
+    test_ntv2_6,
+    test_ntv2_7,
+    test_ntv2_online_1,
+    test_ntv2_online_2,
+    test_ntv2_online_3,
 ]
 
 
diff --git a/autotest/gdrivers/nwt_grc.py b/autotest/gdrivers/nwt_grc.py
index 2ce7b8d87fc4..425342b9b71d 100755
--- a/autotest/gdrivers/nwt_grc.py
+++ b/autotest/gdrivers/nwt_grc.py
@@ -37,14 +37,14 @@
 # Test a GRC dataset
 
 
-def nwt_grc_1():
+def test_nwt_grc_1():
 
     tst = gdaltest.GDALTest('NWT_GRC', 'nwt_grc.grc', 1, 46760)
     return tst.testOpen()
 
 
 gdaltest_list = [
-    nwt_grc_1]
+    test_nwt_grc_1]
 
 if __name__ == '__main__':
 
diff --git a/autotest/gdrivers/nwt_grd.py b/autotest/gdrivers/nwt_grd.py
index e22a766b8c5c..236852ceed18 100755
--- a/autotest/gdrivers/nwt_grd.py
+++ b/autotest/gdrivers/nwt_grd.py
@@ -39,7 +39,7 @@
 # Test a GRD dataset with three bands + Z
 
 
-def nwt_grd_1():
+def test_nwt_grd_1():
 
     tst1 = gdaltest.GDALTest('NWT_GRD', 'nwt_grd.grd', 1, 28093)
     status1 = tst1.testOpen()
@@ -54,7 +54,7 @@ def nwt_grd_1():
     return 'fail'
 
 
-def nwt_grd_2():
+def test_nwt_grd_2():
     """
     Test writing a GRD via CreateCopy
     """
@@ -67,7 +67,7 @@ def nwt_grd_2():
 
 
 gdaltest_list = [
-    nwt_grd_1, nwt_grd_2]
+    test_nwt_grd_1, test_nwt_grd_2]
 
 if __name__ == '__main__':
 
diff --git a/autotest/gdrivers/ozi.py b/autotest/gdrivers/ozi.py
index 0969b9c03795..9eb4e8beba3b 100755
--- a/autotest/gdrivers/ozi.py
+++ b/autotest/gdrivers/ozi.py
@@ -39,7 +39,7 @@
 # Test reading OZF2 file
 
 
-def ozi_online_1():
+def test_ozi_online_1():
 
     if not gdaltest.download_file('http://www.oziexplorer2.com/maps/Europe2001_setup.exe', 'Europe2001_setup.exe'):
         return 'skip'
@@ -106,7 +106,7 @@ def ozi_online_1():
 
 
 gdaltest_list = [
-    ozi_online_1]
+    test_ozi_online_1]
 
 if __name__ == '__main__':
 
diff --git a/autotest/gdrivers/paux.py b/autotest/gdrivers/paux.py
index 25c6fa7b04d9..d982da877ea9 100755
--- a/autotest/gdrivers/paux.py
+++ b/autotest/gdrivers/paux.py
@@ -38,7 +38,7 @@
 # Read test of simple byte reference data.
 
 
-def paux_1():
+def test_paux_1():
 
     tst = gdaltest.GDALTest('PAux', 'small16.raw', 2, 12816)
     return tst.testOpen()
@@ -47,7 +47,7 @@ def paux_1():
 # Test copying.
 
 
-def paux_2():
+def test_paux_2():
 
     tst = gdaltest.GDALTest('PAux', 'byte.tif', 1, 4672)
 
@@ -57,7 +57,7 @@ def paux_2():
 # Test /vsimem based.
 
 
-def paux_3():
+def test_paux_3():
 
     tst = gdaltest.GDALTest('PAux', 'byte.tif', 1, 4672)
 
@@ -67,17 +67,17 @@ def paux_3():
 # Cleanup.
 
 
-def paux_cleanup():
+def test_paux_cleanup():
     gdaltest.clean_tmp()
     gdal.Unlink('/vsimem/byte.tif.tst.aux.xml')
     return 'success'
 
 
 gdaltest_list = [
-    paux_1,
-    paux_2,
-    paux_3,
-    paux_cleanup]
+    test_paux_1,
+    test_paux_2,
+    test_paux_3,
+    test_paux_cleanup]
 
 if __name__ == '__main__':
 
diff --git a/autotest/gdrivers/pcidsk.py b/autotest/gdrivers/pcidsk.py
index c933a14a1088..19d7ae63478a 100755
--- a/autotest/gdrivers/pcidsk.py
+++ b/autotest/gdrivers/pcidsk.py
@@ -41,7 +41,7 @@
 # Read test of floating point reference data.
 
 
-def pcidsk_1():
+def test_pcidsk_1():
 
     tst = gdaltest.GDALTest('PCIDSK', 'utm.pix', 1, 39576)
     return tst.testOpen()
@@ -50,7 +50,7 @@ def pcidsk_1():
 # Test lossless copying (16, multiband) via Create().
 
 
-def pcidsk_2():
+def test_pcidsk_2():
 
     tst = gdaltest.GDALTest('PCIDSK', 'rgba16.png', 2, 2042)
 
@@ -60,7 +60,7 @@ def pcidsk_2():
 # Test copying of georeferencing and projection.
 
 
-def pcidsk_3():
+def test_pcidsk_3():
 
     tst = gdaltest.GDALTest('PCIDSK', 'utm.pix', 1, 39576)
 
@@ -70,7 +70,7 @@ def pcidsk_3():
 # Test overview reading.
 
 
-def pcidsk_4():
+def test_pcidsk_4():
 
     ds = gdal.Open('data/utm.pix')
 
@@ -90,7 +90,7 @@ def pcidsk_4():
 # Test writing metadata to a newly created file.
 
 
-def pcidsk_5():
+def test_pcidsk_5():
 
     # Are we using the new PCIDSK SDK based driver?
     driver = gdal.GetDriverByName('PCIDSK')
@@ -137,7 +137,7 @@ def pcidsk_5():
 # Test writing metadata to a band.
 
 
-def pcidsk_6():
+def test_pcidsk_6():
 
     if gdaltest.pcidsk_new == 0:
         return 'skip'
@@ -173,7 +173,7 @@ def pcidsk_6():
 # Test creating a color table and reading it back.
 
 
-def pcidsk_7():
+def test_pcidsk_7():
 
     if gdaltest.pcidsk_new == 0:
         return 'skip'
@@ -237,7 +237,7 @@ def pcidsk_7():
 # Test FILE interleaving.
 
 
-def pcidsk_8():
+def test_pcidsk_8():
 
     tst = gdaltest.GDALTest('PCIDSK', 'rgba16.png', 2, 2042,
                             options=['INTERLEAVING=FILE'])
@@ -277,7 +277,7 @@ def pcidsk_9():
 # Test overview creation.
 
 
-def pcidsk_10():
+def test_pcidsk_10():
     if gdaltest.pcidsk_new == 0:
         return 'skip'
 
@@ -310,7 +310,7 @@ def pcidsk_10():
 # Test INTERLEAVING=TILED interleaving.
 
 
-def pcidsk_11():
+def test_pcidsk_11():
     if gdaltest.pcidsk_new == 0:
         return 'skip'
 
@@ -323,7 +323,7 @@ def pcidsk_11():
 # Test INTERLEAVING=TILED interleaving and COMPRESSION=RLE
 
 
-def pcidsk_12():
+def test_pcidsk_12():
     if gdaltest.pcidsk_new == 0:
         return 'skip'
 
@@ -336,7 +336,7 @@ def pcidsk_12():
 # Test INTERLEAVING=TILED interleaving and COMPRESSION=JPEG
 
 
-def pcidsk_13():
+def test_pcidsk_13():
     if gdaltest.pcidsk_new == 0:
         return 'skip'
 
@@ -369,7 +369,7 @@ def pcidsk_13():
 # Test SetDescription()
 
 
-def pcidsk_14():
+def test_pcidsk_14():
     if gdaltest.pcidsk_new == 0:
         return 'skip'
 
@@ -398,7 +398,7 @@ def pcidsk_14():
 # Test mixed raster and vector
 
 
-def pcidsk_15():
+def test_pcidsk_15():
     if gdaltest.pcidsk_new == 0:
         return 'skip'
 
@@ -487,7 +487,7 @@ def pcidsk_15():
 ###############################################################################
 
 
-def pcidsk_external_ovr():
+def test_pcidsk_external_ovr():
 
     gdal.Translate('/vsimem/test.pix', 'data/byte.tif', format='PCIDSK')
     ds = gdal.Open('/vsimem/test.pix')
@@ -509,7 +509,7 @@ def pcidsk_external_ovr():
 ###############################################################################
 
 
-def pcidsk_external_ovr_rrd():
+def test_pcidsk_external_ovr_rrd():
 
     gdal.Translate('/vsimem/test.pix', 'data/byte.tif', format='PCIDSK')
     ds = gdal.Open('/vsimem/test.pix', gdal.GA_Update)
@@ -532,7 +532,7 @@ def pcidsk_external_ovr_rrd():
 # Check various items from a modern irvine.pix
 
 
-def pcidsk_online_1():
+def test_pcidsk_online_1():
     if gdaltest.pcidsk_new == 0:
         return 'skip'
 
@@ -575,32 +575,32 @@ def pcidsk_online_1():
 # Cleanup.
 
 
-def pcidsk_cleanup():
+def test_pcidsk_cleanup():
     gdaltest.pcidsk_ds = None
     gdaltest.clean_tmp()
     return 'success'
 
 
 gdaltest_list = [
-    pcidsk_1,
-    pcidsk_2,
-    pcidsk_3,
-    pcidsk_4,
-    pcidsk_5,
-    pcidsk_6,
-    pcidsk_7,
-    pcidsk_8,
+    test_pcidsk_1,
+    test_pcidsk_2,
+    test_pcidsk_3,
+    test_pcidsk_4,
+    test_pcidsk_5,
+    test_pcidsk_6,
+    test_pcidsk_7,
+    test_pcidsk_8,
     # pcidsk_9,
-    pcidsk_10,
-    pcidsk_11,
-    pcidsk_12,
-    pcidsk_13,
-    pcidsk_14,
-    pcidsk_15,
-    pcidsk_external_ovr,
-    pcidsk_external_ovr_rrd,
-    pcidsk_online_1,
-    pcidsk_cleanup]
+    test_pcidsk_10,
+    test_pcidsk_11,
+    test_pcidsk_12,
+    test_pcidsk_13,
+    test_pcidsk_14,
+    test_pcidsk_15,
+    test_pcidsk_external_ovr,
+    test_pcidsk_external_ovr_rrd,
+    test_pcidsk_online_1,
+    test_pcidsk_cleanup]
 
 if __name__ == '__main__':
 
diff --git a/autotest/gdrivers/pcraster.py b/autotest/gdrivers/pcraster.py
index e4ec4dcb6530..0f42a5bb65d9 100755
--- a/autotest/gdrivers/pcraster.py
+++ b/autotest/gdrivers/pcraster.py
@@ -38,7 +38,7 @@
 # Perform simple read test.
 
 
-def pcraster_1():
+def test_pcraster_1():
 
     gdaltest.pcraster_drv = gdal.GetDriverByName('PCRaster')
 
@@ -52,7 +52,7 @@ def pcraster_1():
 # Verify some auxiliary data.
 
 
-def pcraster_2():
+def test_pcraster_2():
 
     if gdaltest.pcraster_drv is None:
         return 'skip'
@@ -75,8 +75,8 @@ def pcraster_2():
 
 
 gdaltest_list = [
-    pcraster_1,
-    pcraster_2]
+    test_pcraster_1,
+    test_pcraster_2]
 
 
 if __name__ == '__main__':
diff --git a/autotest/gdrivers/pdf.py b/autotest/gdrivers/pdf.py
index 6dc85cc05360..a6de15b96be4 100755
--- a/autotest/gdrivers/pdf.py
+++ b/autotest/gdrivers/pdf.py
@@ -2179,7 +2179,7 @@ def pdf_pam_georef():
 ]
 
 
-def pdf_run_all():
+def test_pdf_run_all():
     gdaltest.run_tests([pdf_init])
 
     if gdaltest.pdf_drv is not None:
@@ -2213,7 +2213,7 @@ def pdf_run_all():
     return 'success'
 
 
-gdaltest_list = [pdf_run_all]
+gdaltest_list = [test_pdf_run_all]
 # gdaltest_list = [ pdf_init, pdf_metadata ]
 
 if __name__ == '__main__':
diff --git a/autotest/gdrivers/pds.py b/autotest/gdrivers/pds.py
index 6e95a7fdb223..62637acf5b26 100755
--- a/autotest/gdrivers/pds.py
+++ b/autotest/gdrivers/pds.py
@@ -40,7 +40,7 @@
 # Read a truncated and modified version of http://download.osgeo.org/gdal/data/pds/mc02.img
 
 
-def pds_1():
+def test_pds_1():
 
     tst = gdaltest.GDALTest('PDS', 'mc02_truncated.img', 1, 47151)
     expected_prj = """PROJCS["SIMPLE_CYLINDRICAL "MARS"",GEOGCS["GCS_"MARS"",DATUM["D_"MARS"",SPHEROID[""MARS"",3396000,0]],PRIMEM["Reference_Meridian",0],UNIT["degree",0.0174532925199433]],PROJECTION["Equirectangular"],PARAMETER["latitude_of_origin",0],PARAMETER["central_meridian",0],PARAMETER["false_easting",0],PARAMETER["false_northing",0],PARAMETER["pseudo_standard_parallel_1",0]]"""
@@ -57,7 +57,7 @@ def pds_1():
 ###############################################################################
 # Read a truncated and modified version of ftp://pdsimage2.wr.usgs.gov/cdroms/magellan/mg_1103/fl78n018/fl73n003.img
 
-def pds_2():
+def test_pds_2():
 
     tst = gdaltest.GDALTest('PDS', 'fl73n003_truncated.img', 1, 34962)
     expected_prj = """PROJCS["SINUSOIDAL VENUS",
@@ -100,7 +100,7 @@ def pds_2():
 # 16bits image
 
 
-def pds_3():
+def test_pds_3():
 
     # Shut down warning about missing projection
     gdal.PushErrorHandler('CPLQuietErrorHandler')
@@ -123,7 +123,7 @@ def pds_3():
 # Read a hacked example of reading a detached file with an offset #3177.
 
 
-def pds_4():
+def test_pds_4():
 
     tst = gdaltest.GDALTest('PDS', 'pds_3177.lbl', 1, 3418)
     gt_expected = (6119184.3590369327, 1.0113804322107001, 0.0, -549696.39009125973, 0.0, -1.0113804322107001)
@@ -138,7 +138,7 @@ def pds_4():
 # Read a hacked example of reading a detached file with an offset #3355.
 
 
-def pds_5():
+def test_pds_5():
 
     tst = gdaltest.GDALTest('PDS', 'pds_3355.lbl', 1, 2748)
     return tst.testOpen()
@@ -148,7 +148,7 @@ def pds_5():
 # driver mostly intended to support jpeg2000 files with PDS labels.
 
 
-def pds_6():
+def test_pds_6():
 
     if os.path.exists('data/byte.tif.aux.xml'):
         os.unlink('data/byte.tif.aux.xml')
@@ -186,7 +186,7 @@ def pds_6():
 # Read an uncompressed image via the PDS label. (#3943)
 
 
-def pds_7():
+def test_pds_7():
 
     tst = gdaltest.GDALTest('PDS', 'LDEM_4.LBL', 1, 50938,
                             0, 0, 1440, 2)
@@ -220,7 +220,7 @@ def pds_7():
 # geotransform (#3940)
 
 
-def pds_8():
+def test_pds_8():
 
     # values for MAGELLAN FMAP data.
     gdal.SetConfigOption('PDS_SampleProjOffset_Shift', '1.5')
@@ -247,7 +247,7 @@ def pds_8():
 # an hexadecimal floating point value (#3939)
 
 
-def pds_9():
+def test_pds_9():
 
     # Derived from http://pdsimage.wr.usgs.gov/data/co-v_e_j_s-radar-3-sbdr-v1.0/CORADR_0035/DATA/BIDR/BIEQI49N071_D035_T00AS01_V02.LBL
     tst = gdaltest.GDALTest('PDS', 'PDS_WITH_ZIP_IMG.LBL', 1, 0)
@@ -273,7 +273,7 @@ def pds_9():
 # Test PDS label with nested arrays (#6970)
 
 
-def pds_10():
+def test_pds_10():
 
     gdal.FileFromMemBuffer('/vsimem/pds_10',
                            """PDS_VERSION_ID                       = "PDS3"
@@ -338,7 +338,7 @@ def pds_10():
 # https://github.com/OSGeo/gdal/issues/955
 
 
-def pds_line_offset_not_multiple_of_record():
+def test_pds_line_offset_not_multiple_of_record():
 
     tst = gdaltest.GDALTest('PDS', 'pds/map_000_038_truncated.lbl', 1, 14019)
     return tst.testOpen()
@@ -349,25 +349,25 @@ def pds_line_offset_not_multiple_of_record():
 # Test ability of using OBJECT = FILE section to support CRISM
 # as well as BAND_STORAGE_TYPE = LINE_INTERLEAVED
 
-def pds_band_storage_type_line_interleaved():
+def test_pds_band_storage_type_line_interleaved():
 
     tst = gdaltest.GDALTest('PDS', 'pds/hsp00017ba0_01_ra218s_trr3_truncated.lbl', 1, 364)
     return tst.testOpen()
 
 
 gdaltest_list = [
-    pds_1,
-    pds_2,
-    pds_3,
-    pds_4,
-    pds_5,
-    pds_6,
-    pds_7,
-    pds_8,
-    pds_9,
-    pds_10,
-    pds_line_offset_not_multiple_of_record,
-    pds_band_storage_type_line_interleaved]
+    test_pds_1,
+    test_pds_2,
+    test_pds_3,
+    test_pds_4,
+    test_pds_5,
+    test_pds_6,
+    test_pds_7,
+    test_pds_8,
+    test_pds_9,
+    test_pds_10,
+    test_pds_line_offset_not_multiple_of_record,
+    test_pds_band_storage_type_line_interleaved]
 
 if __name__ == '__main__':
 
diff --git a/autotest/gdrivers/pds4.py b/autotest/gdrivers/pds4.py
index 323826e1fe62..385e5c7db4c1 100755
--- a/autotest/gdrivers/pds4.py
+++ b/autotest/gdrivers/pds4.py
@@ -80,7 +80,7 @@ def validate_xml(filename):
 # Perform simple read test on PDS4 dataset.
 
 
-def pds4_1():
+def test_pds4_1():
     srs = """PROJCS["Transverse Mercator Earth",
     GEOGCS["GCS_Earth",
         DATUM["D_North_American_Datum_1927",
@@ -121,7 +121,7 @@ def hide_substitution_warnings_error_handler():
 # Test CreateCopy() with defaults
 
 
-def pds4_2():
+def test_pds4_2():
 
     tst = gdaltest.GDALTest('PDS4', 'rgbsmall.tif', 2, 21053)
     with hide_substitution_warnings_error_handler():
@@ -132,7 +132,7 @@ def pds4_2():
 # Test CreateCopy() with explicit INTERLEAVE=BSQ
 
 
-def pds4_3():
+def test_pds4_3():
 
     tst = gdaltest.GDALTest('PDS4', 'rgbsmall.tif', 2, 21053, options=['INTERLEAVE=BSQ'])
     with hide_substitution_warnings_error_handler():
@@ -143,7 +143,7 @@ def pds4_3():
 # Test CreateCopy() with explicit INTERLEAVE=BIP
 
 
-def pds4_4():
+def test_pds4_4():
 
     tst = gdaltest.GDALTest('PDS4', 'rgbsmall.tif', 2, 21053, options=['INTERLEAVE=BIP'])
     with hide_substitution_warnings_error_handler():
@@ -154,7 +154,7 @@ def pds4_4():
 # Test CreateCopy() with explicit INTERLEAVE=BIL
 
 
-def pds4_5():
+def test_pds4_5():
 
     tst = gdaltest.GDALTest('PDS4', 'rgbsmall.tif', 2, 21053, options=['INTERLEAVE=BIL'])
     with hide_substitution_warnings_error_handler():
@@ -165,7 +165,7 @@ def pds4_5():
 # Test CreateCopy() with explicit INTERLEAVE=BSQ and IMAGE_FORMAT=GEOTIFF
 
 
-def pds4_6():
+def test_pds4_6():
 
     tst = gdaltest.GDALTest('PDS4', 'rgbsmall.tif', 2, 21053, options=['INTERLEAVE=BSQ', 'IMAGE_FORMAT=GEOTIFF'])
     with hide_substitution_warnings_error_handler():
@@ -176,7 +176,7 @@ def pds4_6():
 # Test CreateCopy() with explicit INTERLEAVE=BIP and IMAGE_FORMAT=GEOTIFF
 
 
-def pds4_7():
+def test_pds4_7():
 
     tst = gdaltest.GDALTest('PDS4', 'rgbsmall.tif', 2, 21053, options=['INTERLEAVE=BIP', 'IMAGE_FORMAT=GEOTIFF'])
     with hide_substitution_warnings_error_handler():
@@ -187,7 +187,7 @@ def pds4_7():
 # Test SRS support
 
 
-def pds4_8():
+def test_pds4_8():
 
     filename = '/vsimem/out.xml'
     for proj4 in ['+proj=eqc +lat_ts=43.75 +lat_0=10 +lon_0=-112.5 +x_0=0 +y_0=0 +a=2439400 +b=2439400 +units=m +no_defs',
@@ -262,7 +262,7 @@ def pds4_8():
 # Test nodata / mask
 
 
-def pds4_9():
+def test_pds4_9():
 
     ds = gdal.Open('data/byte_pds4.xml')
     ndv = ds.GetRasterBand(1).GetNoDataValue()
@@ -535,7 +535,7 @@ def pds4_9():
 # Test scale / offset
 
 
-def pds4_10():
+def test_pds4_10():
 
     filename = '/vsimem/out.xml'
     filename2 = '/vsimem/out2.xml'
@@ -570,7 +570,7 @@ def pds4_10():
 # Test various data types
 
 
-def pds4_11():
+def test_pds4_11():
 
     filename = '/vsimem/out.xml'
     for (dt, data) in [(gdal.GDT_Byte, struct.pack('B', 255)),
@@ -615,7 +615,7 @@ def pds4_11():
 # Test various creation options
 
 
-def pds4_12():
+def test_pds4_12():
 
     filename = '/vsimem/out.xml'
     ds = gdal.GetDriverByName('PDS4').Create(filename, 1, 1,
@@ -681,7 +681,7 @@ def pds4_12():
 # Test subdatasets
 
 
-def pds4_13():
+def test_pds4_13():
 
     ds = gdal.Open('data/byte_pds4_multi_sds.xml')
     subds = ds.GetSubDatasets()
@@ -760,7 +760,7 @@ def pds4_13():
 # Test error cases
 
 
-def pds4_14():
+def test_pds4_14():
 
     filename = '/vsimem/test.xml'
 
@@ -1090,7 +1090,7 @@ def pds4_14():
 # Test Create() without geospatial info but from a geospatial enabled template
 
 
-def pds4_15():
+def test_pds4_15():
 
     filename = '/vsimem/out.xml'
     with hide_substitution_warnings_error_handler():
@@ -1119,7 +1119,7 @@ def pds4_15():
 # Test Create() with geospatial info but from a template without Discipline_Area
 
 
-def pds4_16():
+def test_pds4_16():
 
     template = '/vsimem/template.xml'
     filename = '/vsimem/out.xml'
@@ -1207,7 +1207,7 @@ def pds4_16():
 # Test ARRAY_TYPE creation option
 
 
-def pds4_17():
+def test_pds4_17():
 
     filename = '/vsimem/out.xml'
 
@@ -1265,7 +1265,7 @@ def pds4_17():
 # Test RADII creation option
 
 
-def pds4_18():
+def test_pds4_18():
 
     filename = '/vsimem/out.xml'
 
@@ -1294,24 +1294,24 @@ def pds4_18():
 
 
 gdaltest_list = [
-    pds4_1,
-    pds4_2,
-    pds4_3,
-    pds4_4,
-    pds4_5,
-    pds4_6,
-    pds4_7,
-    pds4_8,
-    pds4_9,
-    pds4_10,
-    pds4_11,
-    pds4_12,
-    pds4_13,
-    pds4_14,
-    pds4_15,
-    pds4_16,
-    pds4_17,
-    pds4_18]
+    test_pds4_1,
+    test_pds4_2,
+    test_pds4_3,
+    test_pds4_4,
+    test_pds4_5,
+    test_pds4_6,
+    test_pds4_7,
+    test_pds4_8,
+    test_pds4_9,
+    test_pds4_10,
+    test_pds4_11,
+    test_pds4_12,
+    test_pds4_13,
+    test_pds4_14,
+    test_pds4_15,
+    test_pds4_16,
+    test_pds4_17,
+    test_pds4_18]
 
 if __name__ == '__main__':
 
diff --git a/autotest/gdrivers/plmosaic.py b/autotest/gdrivers/plmosaic.py
index 883e54a77469..e52c2cafc067 100755
--- a/autotest/gdrivers/plmosaic.py
+++ b/autotest/gdrivers/plmosaic.py
@@ -43,7 +43,7 @@
 # Find PLMosaic driver
 
 
-def plmosaic_1():
+def test_plmosaic_1():
 
     gdaltest.plmosaic_drv = gdal.GetDriverByName('PLMosaic')
 
@@ -55,7 +55,7 @@ def plmosaic_1():
 # Error: no API_KEY
 
 
-def plmosaic_2():
+def test_plmosaic_2():
 
     if gdaltest.plmosaic_drv is None:
         return 'skip'
@@ -75,7 +75,7 @@ def plmosaic_2():
 # Error case: invalid root URL
 
 
-def plmosaic_3():
+def test_plmosaic_3():
 
     if gdaltest.plmosaic_drv is None:
         return 'skip'
@@ -95,7 +95,7 @@ def plmosaic_3():
 # Error case: invalid JSON
 
 
-def plmosaic_4():
+def test_plmosaic_4():
 
     if gdaltest.plmosaic_drv is None:
         return 'skip'
@@ -117,7 +117,7 @@ def plmosaic_4():
 # Error case: not a JSON dictionary
 
 
-def plmosaic_5():
+def test_plmosaic_5():
 
     if gdaltest.plmosaic_drv is None:
         return 'skip'
@@ -139,7 +139,7 @@ def plmosaic_5():
 # Error case: missing "mosaics" element
 
 
-def plmosaic_6():
+def test_plmosaic_6():
 
     if gdaltest.plmosaic_drv is None:
         return 'skip'
@@ -161,7 +161,7 @@ def plmosaic_6():
 # Valid root but no mosaics
 
 
-def plmosaic_7():
+def test_plmosaic_7():
 
     if gdaltest.plmosaic_drv is None:
         return 'skip'
@@ -184,7 +184,7 @@ def plmosaic_7():
 # Valid root with 2 mosaics
 
 
-def plmosaic_8():
+def test_plmosaic_8():
 
     if gdaltest.plmosaic_drv is None:
         return 'skip'
@@ -242,7 +242,7 @@ def plmosaic_8():
 # Error case: invalid mosaic
 
 
-def plmosaic_9():
+def test_plmosaic_9():
 
     if gdaltest.plmosaic_drv is None:
         return 'skip'
@@ -263,7 +263,7 @@ def plmosaic_9():
 # Invalid mosaic definition: invalid JSON
 
 
-def plmosaic_9bis():
+def test_plmosaic_9bis():
 
     if gdaltest.plmosaic_drv is None:
         return 'skip'
@@ -285,7 +285,7 @@ def plmosaic_9bis():
 # Invalid mosaic definition: JSON without mosaics array
 
 
-def plmosaic_9ter():
+def test_plmosaic_9ter():
 
     if gdaltest.plmosaic_drv is None:
         return 'skip'
@@ -307,7 +307,7 @@ def plmosaic_9ter():
 # Invalid mosaic definition: missing parameters
 
 
-def plmosaic_10():
+def test_plmosaic_10():
 
     if gdaltest.plmosaic_drv is None:
         return 'skip'
@@ -334,7 +334,7 @@ def plmosaic_10():
 # Invalid mosaic definition: unsupported projection
 
 
-def plmosaic_11():
+def test_plmosaic_11():
 
     if gdaltest.plmosaic_drv is None:
         return 'skip'
@@ -367,7 +367,7 @@ def plmosaic_11():
 # Invalid mosaic definition: unsupported datatype
 
 
-def plmosaic_12():
+def test_plmosaic_12():
 
     if gdaltest.plmosaic_drv is None:
         return 'skip'
@@ -400,7 +400,7 @@ def plmosaic_12():
 # Invalid mosaic definition: unsupported resolution
 
 
-def plmosaic_13():
+def test_plmosaic_13():
 
     if gdaltest.plmosaic_drv is None:
         return 'skip'
@@ -433,7 +433,7 @@ def plmosaic_13():
 # Invalid mosaic definition: unsupported quad_size
 
 
-def plmosaic_14():
+def test_plmosaic_14():
 
     if gdaltest.plmosaic_drv is None:
         return 'skip'
@@ -466,7 +466,7 @@ def plmosaic_14():
 # Nearly valid mosaic definition. Warning about invalid links.tiles
 
 
-def plmosaic_15():
+def test_plmosaic_15():
 
     if gdaltest.plmosaic_drv is None:
         return 'skip'
@@ -513,7 +513,7 @@ def plmosaic_15():
 # Valid mosaic definition
 
 
-def plmosaic_16():
+def test_plmosaic_16():
 
     if gdaltest.plmosaic_drv is None:
         return 'skip'
@@ -586,7 +586,7 @@ def plmosaic_16():
 # Open with explicit MOSAIC dataset open option
 
 
-def plmosaic_17():
+def test_plmosaic_17():
 
     if gdaltest.plmosaic_drv is None:
         return 'skip'
@@ -756,7 +756,7 @@ def plmosaic_17():
 # Test location info
 
 
-def plmosaic_18():
+def test_plmosaic_18():
 
     if gdaltest.plmosaic_drv is None:
         return 'skip'
@@ -808,7 +808,7 @@ def plmosaic_18():
 # Try error in saving in cache
 
 
-def plmosaic_19():
+def test_plmosaic_19():
 
     if gdaltest.plmosaic_drv is None:
         return 'skip'
@@ -839,7 +839,7 @@ def plmosaic_19():
 # Try disabling cache
 
 
-def plmosaic_20():
+def test_plmosaic_20():
 
     if gdaltest.plmosaic_drv is None:
         return 'skip'
@@ -868,7 +868,7 @@ def plmosaic_20():
 # Try use_tiles
 
 
-def plmosaic_21():
+def test_plmosaic_21():
 
     if gdaltest.plmosaic_drv is None:
         return 'skip'
@@ -966,7 +966,7 @@ def plmosaic_21():
 # Valid mosaic definition with bbox
 
 
-def plmosaic_with_bbox():
+def test_plmosaic_with_bbox():
 
     if gdaltest.plmosaic_drv is None:
         return 'skip'
@@ -1072,7 +1072,7 @@ def plmosaic_with_bbox():
 #
 
 
-def plmosaic_cleanup():
+def test_plmosaic_cleanup():
 
     if gdaltest.plmosaic_drv is None:
         return 'skip'
@@ -1100,31 +1100,31 @@ def plmosaic_cleanup():
 
 
 gdaltest_list = [
-    plmosaic_1,
-    plmosaic_2,
-    plmosaic_3,
-    plmosaic_4,
-    plmosaic_5,
-    plmosaic_6,
-    plmosaic_7,
-    plmosaic_8,
-    plmosaic_9,
-    plmosaic_9bis,
-    plmosaic_9ter,
-    plmosaic_10,
-    plmosaic_11,
-    plmosaic_12,
-    plmosaic_13,
-    plmosaic_14,
-    plmosaic_15,
-    plmosaic_16,
-    plmosaic_17,
-    plmosaic_18,
-    plmosaic_19,
-    plmosaic_20,
-    plmosaic_21,
-    plmosaic_with_bbox,
-    plmosaic_cleanup]
+    test_plmosaic_1,
+    test_plmosaic_2,
+    test_plmosaic_3,
+    test_plmosaic_4,
+    test_plmosaic_5,
+    test_plmosaic_6,
+    test_plmosaic_7,
+    test_plmosaic_8,
+    test_plmosaic_9,
+    test_plmosaic_9bis,
+    test_plmosaic_9ter,
+    test_plmosaic_10,
+    test_plmosaic_11,
+    test_plmosaic_12,
+    test_plmosaic_13,
+    test_plmosaic_14,
+    test_plmosaic_15,
+    test_plmosaic_16,
+    test_plmosaic_17,
+    test_plmosaic_18,
+    test_plmosaic_19,
+    test_plmosaic_20,
+    test_plmosaic_21,
+    test_plmosaic_with_bbox,
+    test_plmosaic_cleanup]
 
 if __name__ == '__main__':
 
diff --git a/autotest/gdrivers/png.py b/autotest/gdrivers/png.py
index f37e28efee42..6d629524dc3e 100755
--- a/autotest/gdrivers/png.py
+++ b/autotest/gdrivers/png.py
@@ -40,7 +40,7 @@
 # Read test of simple byte reference data.
 
 
-def png_1():
+def test_png_1():
 
     tst = gdaltest.GDALTest('PNG', 'test.png', 1, 57921)
     return tst.testOpen()
@@ -49,7 +49,7 @@ def png_1():
 # Test lossless copying.
 
 
-def png_2():
+def test_png_2():
 
     tst = gdaltest.GDALTest('PNG', 'test.png', 1, 57921)
 
@@ -59,7 +59,7 @@ def png_2():
 # Verify the geotransform, colormap, and nodata setting for test file.
 
 
-def png_3():
+def test_png_3():
 
     ds = gdal.Open('data/test.png')
     cm = ds.GetRasterBand(1).GetRasterColorTable()
@@ -96,7 +96,7 @@ def png_3():
 # Test RGB mode creation and reading.
 
 
-def png_4():
+def test_png_4():
 
     tst = gdaltest.GDALTest('PNG', 'rgb.ntf', 3, 21349)
 
@@ -106,7 +106,7 @@ def png_4():
 # Test RGBA 16bit read support.
 
 
-def png_5():
+def test_png_5():
 
     tst = gdaltest.GDALTest('PNG', 'rgba16.png', 3, 1815)
     return tst.testOpen()
@@ -115,7 +115,7 @@ def png_5():
 # Test RGBA 16bit mode creation and reading.
 
 
-def png_6():
+def test_png_6():
 
     tst = gdaltest.GDALTest('PNG', 'rgba16.png', 4, 4873)
 
@@ -126,7 +126,7 @@ def png_6():
 # This is handled via the tRNS block in PNG.
 
 
-def png_7():
+def test_png_7():
 
     drv = gdal.GetDriverByName('PNG')
     srcds = gdal.Open('data/tbbn2c16.png')
@@ -153,7 +153,7 @@ def png_7():
 # recovery from errors caused by reading broken file..
 
 
-def png_8():
+def test_png_8():
 
     drv = gdal.GetDriverByName('PNG')
     ds_src = gdal.Open('data/idat_broken.png')
@@ -206,7 +206,7 @@ def png_8():
 ###############################################################################
 # Test creating an in memory copy.
 
-def png_9():
+def test_png_9():
 
     tst = gdaltest.GDALTest('PNG', 'byte.tif', 1, 4672)
 
@@ -216,7 +216,7 @@ def png_9():
 # Test writing to /vsistdout/
 
 
-def png_10():
+def test_png_10():
 
     src_ds = gdal.Open('data/byte.tif')
     ds = gdal.GetDriverByName('PNG').CreateCopy('/vsistdout_redirect//vsimem/tmp.png', src_ds)
@@ -239,7 +239,7 @@ def png_10():
 # Test CreateCopy() interruption
 
 
-def png_11():
+def test_png_11():
 
     tst = gdaltest.GDALTest('PNG', 'byte.tif', 1, 4672)
 
@@ -251,7 +251,7 @@ def png_11():
 # Test optimized IRasterIO
 
 
-def png_12():
+def test_png_12():
     ds = gdal.Open('../gcore/data/stefan_full_rgba.png')
     cs = [ds.GetRasterBand(i + 1).Checksum() for i in range(ds.RasterCount)]
 
@@ -288,7 +288,7 @@ def png_12():
 # Test metadata
 
 
-def png_13():
+def test_png_13():
 
     src_ds = gdal.GetDriverByName('MEM').Create('', 1, 1)
     src_ds.SetMetadataItem('foo', 'bar')
@@ -312,7 +312,7 @@ def png_13():
 # Test support for nbits < 8
 
 
-def png_14():
+def test_png_14():
 
     src_ds = gdal.Open('../gcore/data/oddsize1bit.tif')
     expected_cs = src_ds.GetRasterBand(1).Checksum()
@@ -362,20 +362,20 @@ def png_14():
 
 
 gdaltest_list = [
-    png_1,
-    png_2,
-    png_3,
-    png_4,
-    png_5,
-    png_6,
-    png_7,
-    png_8,
-    png_9,
-    png_10,
-    png_11,
-    png_12,
-    png_13,
-    png_14
+    test_png_1,
+    test_png_2,
+    test_png_3,
+    test_png_4,
+    test_png_5,
+    test_png_6,
+    test_png_7,
+    test_png_8,
+    test_png_9,
+    test_png_10,
+    test_png_11,
+    test_png_12,
+    test_png_13,
+    test_png_14
 ]
 
 if __name__ == '__main__':
diff --git a/autotest/gdrivers/png_profile.py b/autotest/gdrivers/png_profile.py
index eccbf8182c99..7c8b00d9a527 100755
--- a/autotest/gdrivers/png_profile.py
+++ b/autotest/gdrivers/png_profile.py
@@ -42,7 +42,7 @@
 ###############################################################################
 # Test writing and reading of ICC profile in CreateCopy()
 
-def png_copy_icc():
+def test_png_copy_icc():
 
     f = open('data/sRGB.icc', 'rb')
     data = f.read()
@@ -118,7 +118,7 @@ def cvtTuple2String(t):
 # Test writing and reading of ICC profile in CreateCopy() options
 
 
-def png_copy_options_icc():
+def test_png_copy_options_icc():
 
     f = open('data/sRGB.icc', 'rb')
     data = f.read()
@@ -161,7 +161,7 @@ def png_copy_options_icc():
 # Test writing and reading of ICC colorimetric data from options
 
 
-def png_copy_options_colorimetric_data():
+def test_png_copy_options_colorimetric_data():
     # sRGB values
     source_primaries = [(0.64, 0.33, 1.0), (0.3, 0.6, 1.0), (0.15, 0.06, 1.0)]
     source_whitepoint = (0.31271, 0.32902, 1.0)
@@ -241,7 +241,7 @@ def png_copy_options_colorimetric_data():
 # Test writing and reading of ICC colorimetric data in the file
 
 
-def png_copy_colorimetric_data():
+def test_png_copy_colorimetric_data():
     # sRGB values
     source_primaries = [(0.64, 0.33, 1.0), (0.3, 0.6, 1.0), (0.15, 0.06, 1.0)]
     source_whitepoint = (0.31271, 0.32902, 1.0)
@@ -324,7 +324,7 @@ def png_copy_colorimetric_data():
 # Test sRGB
 
 
-def png_sRGB():
+def test_png_sRGB():
     # Create dummy file
     options = ['SOURCE_ICC_PROFILE_NAME=sRGB']
 
@@ -361,11 +361,11 @@ def png_sRGB():
 
 
 gdaltest_list = [
-    png_copy_icc,
-    png_copy_options_icc,
-    png_copy_options_colorimetric_data,
-    png_copy_colorimetric_data,
-    png_sRGB,
+    test_png_copy_icc,
+    test_png_copy_options_icc,
+    test_png_copy_options_colorimetric_data,
+    test_png_copy_colorimetric_data,
+    test_png_sRGB,
 ]
 
 if __name__ == '__main__':
diff --git a/autotest/gdrivers/pnm.py b/autotest/gdrivers/pnm.py
index e40c9a68e05c..3b6be6c058a0 100755
--- a/autotest/gdrivers/pnm.py
+++ b/autotest/gdrivers/pnm.py
@@ -37,7 +37,7 @@
 # Read Test grayscale (PGM)
 
 
-def pnm_1():
+def test_pnm_1():
 
     tst = gdaltest.GDALTest('PNM', 'byte.pgm', 1, 4672)
 
@@ -47,7 +47,7 @@ def pnm_1():
 # Write Test grayscale (PGM)
 
 
-def pnm_2():
+def test_pnm_2():
 
     tst = gdaltest.GDALTest('PNM', 'byte.pgm', 1, 4672)
 
@@ -57,7 +57,7 @@ def pnm_2():
 # Read Test RGB (PPM)
 
 
-def pnm_3():
+def test_pnm_3():
 
     tst = gdaltest.GDALTest('PNM', 'rgbsmall.ppm', 2, 21053)
 
@@ -67,7 +67,7 @@ def pnm_3():
 # Write Test RGB (PPM)
 
 
-def pnm_4():
+def test_pnm_4():
 
     tst = gdaltest.GDALTest('PNM', 'rgbsmall.ppm', 2, 21053)
 
@@ -75,10 +75,10 @@ def pnm_4():
 
 
 gdaltest_list = [
-    pnm_1,
-    pnm_2,
-    pnm_3,
-    pnm_4
+    test_pnm_1,
+    test_pnm_2,
+    test_pnm_3,
+    test_pnm_4
 ]
 
 
diff --git a/autotest/gdrivers/postgisraster.py b/autotest/gdrivers/postgisraster.py
index 841458516fc2..b7348a30cf17 100755
--- a/autotest/gdrivers/postgisraster.py
+++ b/autotest/gdrivers/postgisraster.py
@@ -48,7 +48,7 @@
 #
 
 
-def postgisraster_init():
+def test_postgisraster_init():
     gdaltest.postgisrasterDriver = gdal.GetDriverByName('PostGISRaster')
     if gdaltest.postgisrasterDriver is None:
         return 'skip'
@@ -108,7 +108,7 @@ def postgisraster_init():
 #
 
 
-def postgisraster_test_open_error1():
+def test_postgisraster_test_open_error1():
     if gdaltest.postgisrasterDriver is None:
         return 'skip'
 
@@ -123,7 +123,7 @@ def postgisraster_test_open_error1():
 #
 
 
-def postgisraster_test_open_error2():
+def test_postgisraster_test_open_error2():
     if gdaltest.postgisrasterDriver is None:
         return 'skip'
 
@@ -138,7 +138,7 @@ def postgisraster_test_open_error2():
 #
 
 
-def postgisraster_compare_utm():
+def test_postgisraster_compare_utm():
     if gdaltest.postgisrasterDriver is None:
         return 'skip'
 
@@ -156,7 +156,7 @@ def postgisraster_compare_utm():
 #
 
 
-def postgisraster_compare_small_world():
+def test_postgisraster_compare_small_world():
     if gdaltest.postgisrasterDriver is None:
         return 'skip'
 
@@ -174,7 +174,7 @@ def postgisraster_compare_small_world():
 #
 
 
-def postgisraster_test_utm_open():
+def test_postgisraster_test_utm_open():
     if gdaltest.postgisrasterDriver is None:
         return 'skip'
 
@@ -199,7 +199,7 @@ def postgisraster_test_utm_open():
 #
 
 
-def postgisraster_test_small_world_open_b1():
+def test_postgisraster_test_small_world_open_b1():
     if gdaltest.postgisrasterDriver is None:
         return 'skip'
 
@@ -224,7 +224,7 @@ def postgisraster_test_small_world_open_b1():
 #
 
 
-def postgisraster_test_small_world_open_b2():
+def test_postgisraster_test_small_world_open_b2():
     if gdaltest.postgisrasterDriver is None:
         return 'skip'
 
@@ -249,7 +249,7 @@ def postgisraster_test_small_world_open_b2():
 #
 
 
-def postgisraster_test_small_world_open_b3():
+def test_postgisraster_test_small_world_open_b3():
     if gdaltest.postgisrasterDriver is None:
         return 'skip'
 
@@ -272,7 +272,7 @@ def postgisraster_test_small_world_open_b3():
         return tst.testOpen(check_prj=prj, check_gt=gt, skip_checksum=True)
 
 
-def postgisraster_test_create_copy_bad_conn_string():
+def test_postgisraster_test_create_copy_bad_conn_string():
     if gdaltest.postgisrasterDriver is None:
         return 'skip'
 
@@ -284,7 +284,7 @@ def postgisraster_test_create_copy_bad_conn_string():
         return 'success' if new_ds is None else 'fail'
 
 
-def postgisraster_test_create_copy_no_dbname():
+def test_postgisraster_test_create_copy_no_dbname():
     if gdaltest.postgisrasterDriver is None:
         return 'skip'
 
@@ -300,7 +300,7 @@ def postgisraster_test_create_copy_no_dbname():
         return 'success' if new_ds is None else 'fail'
 
 
-def postgisraster_test_create_copy_no_tablename():
+def test_postgisraster_test_create_copy_no_tablename():
     if gdaltest.postgisrasterDriver is None:
         return 'skip'
 
@@ -316,7 +316,7 @@ def postgisraster_test_create_copy_no_tablename():
         return 'success' if new_ds is None else 'fail'
 
 
-def postgisraster_test_create_copy_and_delete():
+def test_postgisraster_test_create_copy_and_delete():
     """
     Test the "CreateCopy" implementation. What to do when we're done?
     Why, test "Delete", of course!
@@ -337,7 +337,7 @@ def postgisraster_test_create_copy_and_delete():
     return 'fail' if deleted else 'success'
 
 
-def postgisraster_test_create_copy_and_delete_phases():
+def test_postgisraster_test_create_copy_and_delete_phases():
     """
     Create a copy of the dataset, then delete it in phases.
     """
@@ -428,7 +428,7 @@ def postgisraster_test_create_copy_and_delete_phases():
     return 'success'
 
 
-def postgisraster_test_norid():
+def test_postgisraster_test_norid():
     """
     Test the ability to connect to a data source if it has no 'rid' column.
     """
@@ -460,7 +460,7 @@ def postgisraster_test_norid():
     return 'success'
 
 
-def postgisraster_test_serial():
+def test_postgisraster_test_serial():
     """
     Test the ability to connect to a data source if it has no primary key,
     but uses a sequence instead.
@@ -495,7 +495,7 @@ def postgisraster_test_serial():
     return 'success'
 
 
-def postgisraster_test_unique():
+def test_postgisraster_test_unique():
     """
     Test the ability to connect to a data source if it has no primary key,
     but uses a unique constraint instead.
@@ -530,7 +530,7 @@ def postgisraster_test_unique():
     return 'success'
 
 
-def postgisraster_test_constraint():
+def test_postgisraster_test_constraint():
 
     if gdaltest.postgisrasterDriver is None:
         return 'skip'
@@ -544,7 +544,7 @@ def postgisraster_test_constraint():
     return 'success'
 
 
-def postgisraster_test_constraint_with_spi():
+def test_postgisraster_test_constraint_with_spi():
 
     if gdaltest.postgisrasterDriver is None:
         return 'skip'
@@ -558,7 +558,7 @@ def postgisraster_test_constraint_with_spi():
     return 'success'
 
 
-def postgisraster_test_outdb():
+def test_postgisraster_test_outdb():
 
     if gdaltest.postgisrasterDriver is None:
         return 'skip'
@@ -586,7 +586,7 @@ def postgisraster_test_outdb():
     return 'success'
 
 
-def postgisraster_test_outdb_client_side():
+def test_postgisraster_test_outdb_client_side():
 
     if gdaltest.postgisrasterDriver is None:
         return 'skip'
@@ -600,7 +600,7 @@ def postgisraster_test_outdb_client_side():
     return 'success'
 
 
-def postgisraster_test_outdb_client_side_force_ireadblock():
+def test_postgisraster_test_outdb_client_side_force_ireadblock():
 
     if gdaltest.postgisrasterDriver is None:
         return 'skip'
@@ -615,7 +615,7 @@ def postgisraster_test_outdb_client_side_force_ireadblock():
     return 'success'
 
 
-def postgisraster_test_outdb_client_side_if_possible():
+def test_postgisraster_test_outdb_client_side_if_possible():
 
     if gdaltest.postgisrasterDriver is None:
         return 'skip'
@@ -629,7 +629,7 @@ def postgisraster_test_outdb_client_side_if_possible():
     return 'success'
 
 
-def postgisraster_cleanup():
+def test_postgisraster_cleanup():
 
     gdal.Unlink('data/small_world.tif.aux.xml')
     gdal.Unlink('data/utm.tif.aux.xml')
@@ -638,30 +638,30 @@ def postgisraster_cleanup():
 
 
 gdaltest_list = [
-    postgisraster_init,
-    postgisraster_test_open_error1,
-    postgisraster_test_open_error2,
-    postgisraster_compare_utm,
-    postgisraster_compare_small_world,
-    postgisraster_test_utm_open,
-    postgisraster_test_small_world_open_b1,
-    postgisraster_test_small_world_open_b2,
-    postgisraster_test_small_world_open_b3,
-    postgisraster_test_create_copy_bad_conn_string,
-    postgisraster_test_create_copy_no_dbname,
-    postgisraster_test_create_copy_no_tablename,
-    postgisraster_test_create_copy_and_delete,
-    postgisraster_test_create_copy_and_delete_phases,
-    postgisraster_test_norid,
-    postgisraster_test_serial,
-    postgisraster_test_unique,
-    postgisraster_test_constraint,
-    postgisraster_test_constraint_with_spi,
-    postgisraster_test_outdb,
-    postgisraster_test_outdb_client_side,
-    postgisraster_test_outdb_client_side_force_ireadblock,
-    postgisraster_test_outdb_client_side_if_possible,
-    postgisraster_cleanup]
+    test_postgisraster_init,
+    test_postgisraster_test_open_error1,
+    test_postgisraster_test_open_error2,
+    test_postgisraster_compare_utm,
+    test_postgisraster_compare_small_world,
+    test_postgisraster_test_utm_open,
+    test_postgisraster_test_small_world_open_b1,
+    test_postgisraster_test_small_world_open_b2,
+    test_postgisraster_test_small_world_open_b3,
+    test_postgisraster_test_create_copy_bad_conn_string,
+    test_postgisraster_test_create_copy_no_dbname,
+    test_postgisraster_test_create_copy_no_tablename,
+    test_postgisraster_test_create_copy_and_delete,
+    test_postgisraster_test_create_copy_and_delete_phases,
+    test_postgisraster_test_norid,
+    test_postgisraster_test_serial,
+    test_postgisraster_test_unique,
+    test_postgisraster_test_constraint,
+    test_postgisraster_test_constraint_with_spi,
+    test_postgisraster_test_outdb,
+    test_postgisraster_test_outdb_client_side,
+    test_postgisraster_test_outdb_client_side_force_ireadblock,
+    test_postgisraster_test_outdb_client_side_if_possible,
+    test_postgisraster_cleanup]
 
 if __name__ == '__main__':
 
diff --git a/autotest/gdrivers/prf.py b/autotest/gdrivers/prf.py
index 35b2440ffa07..1f57769678d9 100755
--- a/autotest/gdrivers/prf.py
+++ b/autotest/gdrivers/prf.py
@@ -33,13 +33,13 @@
 ###############################################################################
 
 
-def prf_1():
+def test_prf_1():
 
     tst = gdaltest.GDALTest('prf', './PRF/ph.prf', 1, 43190)
     return tst.testOpen(check_gt=(1, 2, 3, -7, 5, 6))
 
 
-def prf_2():
+def test_prf_2():
 
     ds = gdal.Open('./data/PRF/dem.x-dem')
 
@@ -82,7 +82,7 @@ def prf_2():
     return 'success'
 
 
-def prf_3():
+def test_prf_3():
 
     ds = gdal.Open('./data/PRF/ph.prf')
 
@@ -98,7 +98,7 @@ def prf_3():
     return 'success'
 
 
-def prf_4():
+def test_prf_4():
 
     tst = gdaltest.GDALTest('prf', './PRF/dem.x-dem', 1, 0)
     return tst.testOpen(check_gt=(1.5, 1.0, 0.0, 9329.0, 0.0, -2.0))
@@ -108,10 +108,10 @@ def prf_4():
 
 
 gdaltest_list = [
-    prf_1,
-    prf_2,
-    prf_3,
-    prf_4
+    test_prf_1,
+    test_prf_2,
+    test_prf_3,
+    test_prf_4
 ]
 
 if __name__ == '__main__':
diff --git a/autotest/gdrivers/r.py b/autotest/gdrivers/r.py
index 829f797d05d4..9fa2492de4c2 100755
--- a/autotest/gdrivers/r.py
+++ b/autotest/gdrivers/r.py
@@ -37,7 +37,7 @@
 # Perform simple read test on an ascii file.
 
 
-def r_1():
+def test_r_1():
 
     tst = gdaltest.GDALTest('R', 'r_test.asc', 2, 202)
 
@@ -47,7 +47,7 @@ def r_1():
 # Perform a simple read test on a binary (uncompressed) file.
 
 
-def r_2():
+def test_r_2():
 
     tst = gdaltest.GDALTest('R', 'r_test.rdb', 1, 202)
     return tst.testOpen()
@@ -56,7 +56,7 @@ def r_2():
 # Verify a simple createcopy operation with 16bit data.
 
 
-def r_3():
+def test_r_3():
 
     tst = gdaltest.GDALTest('R', 'byte.tif', 1, 4672,
                             options=['ASCII=YES'])
@@ -66,7 +66,7 @@ def r_3():
 # Test creating a compressed binary stream and reading it back.
 
 
-def r_4():
+def test_r_4():
 
     tst = gdaltest.GDALTest('R', 'byte.tif', 1, 4672)
     return tst.testCreateCopy(new_filename='tmp/r_4.rda')
@@ -75,10 +75,10 @@ def r_4():
 
 
 gdaltest_list = [
-    r_1,
-    r_2,
-    r_3,
-    r_4]
+    test_r_1,
+    test_r_2,
+    test_r_3,
+    test_r_4]
 
 if __name__ == '__main__':
 
diff --git a/autotest/gdrivers/rasdaman.py b/autotest/gdrivers/rasdaman.py
index b0a0c7da5624..dc06f83e0c17 100755
--- a/autotest/gdrivers/rasdaman.py
+++ b/autotest/gdrivers/rasdaman.py
@@ -45,7 +45,7 @@
 #
 
 
-def rasdaman_1():
+def test_rasdaman_1():
     gdaltest.rasdamanDriver = gdal.GetDriverByName('RASDAMAN')
     if gdaltest.rasdamanDriver is None:
         return 'skip'
@@ -72,7 +72,7 @@ def rasdaman_1():
 # Test opening a non existing collection
 
 
-def rasdaman_2():
+def test_rasdaman_2():
     if gdaltest.rasdamanDriver is None:
         return 'skip'
 
@@ -83,7 +83,7 @@ def rasdaman_2():
 # Test syntax error
 
 
-def rasdaman_3():
+def test_rasdaman_3():
     if gdaltest.rasdamanDriver is None:
         return 'skip'
 
@@ -93,9 +93,9 @@ def rasdaman_3():
 
 
 gdaltest_list = [
-    rasdaman_1,
-    rasdaman_2,
-    rasdaman_3]
+    test_rasdaman_1,
+    test_rasdaman_2,
+    test_rasdaman_3]
 
 if __name__ == '__main__':
 
diff --git a/autotest/gdrivers/rasterlite.py b/autotest/gdrivers/rasterlite.py
index 2931fde8f872..a6025571f444 100755
--- a/autotest/gdrivers/rasterlite.py
+++ b/autotest/gdrivers/rasterlite.py
@@ -41,7 +41,7 @@
 # Get the rasterlite driver
 
 
-def rasterlite_1():
+def test_rasterlite_1():
 
     gdaltest.rasterlite_drv = gdal.GetDriverByName('RASTERLITE')
     gdaltest.epsilon_drv = gdal.GetDriverByName('EPSILON')
@@ -57,7 +57,7 @@ def rasterlite_1():
 # Test opening a rasterlite DB without overviews
 
 
-def rasterlite_2():
+def test_rasterlite_2():
 
     if gdaltest.rasterlite_drv is None:
         return 'skip'
@@ -135,7 +135,7 @@ def rasterlite_2():
 # Test opening a rasterlite DB with overviews
 
 
-def rasterlite_3():
+def test_rasterlite_3():
 
     if gdaltest.rasterlite_drv is None:
         return 'skip'
@@ -176,7 +176,7 @@ def rasterlite_3():
 # Test opening a rasterlite DB with color table and user-defined spatial extent
 
 
-def rasterlite_4():
+def test_rasterlite_4():
 
     if gdaltest.rasterlite_drv is None:
         return 'skip'
@@ -211,7 +211,7 @@ def rasterlite_4():
 # Test opening a rasterlite DB with color table and do color table expansion
 
 
-def rasterlite_5():
+def test_rasterlite_5():
 
     if gdaltest.rasterlite_drv is None:
         return 'skip'
@@ -253,7 +253,7 @@ def rasterlite_5():
 # Test CreateCopy()
 
 
-def rasterlite_6():
+def test_rasterlite_6():
 
     if gdaltest.rasterlite_drv is None:
         return 'skip'
@@ -306,7 +306,7 @@ def rasterlite_6():
 # Test BuildOverviews()
 
 
-def rasterlite_7():
+def test_rasterlite_7():
 
     if gdaltest.rasterlite_drv is None:
         return 'skip'
@@ -349,7 +349,7 @@ def rasterlite_7():
 # Test CleanOverviews()
 
 
-def rasterlite_8():
+def test_rasterlite_8():
 
     if gdaltest.rasterlite_drv is None:
         return 'skip'
@@ -370,7 +370,7 @@ def rasterlite_8():
 # Create a rasterlite dataset with EPSILON tiles
 
 
-def rasterlite_9():
+def test_rasterlite_9():
 
     if gdaltest.rasterlite_drv is None:
         return 'skip'
@@ -389,7 +389,7 @@ def rasterlite_9():
 # Create a rasterlite dataset with EPSILON tiles
 
 
-def rasterlite_10():
+def test_rasterlite_10():
 
     if gdaltest.rasterlite_drv is None:
         return 'skip'
@@ -408,7 +408,7 @@ def rasterlite_10():
 # Test BuildOverviews() with AVERAGE resampling
 
 
-def rasterlite_11():
+def test_rasterlite_11():
 
     if gdaltest.rasterlite_drv is None:
         return 'skip'
@@ -443,7 +443,7 @@ def rasterlite_11():
 # Test opening a .rasterlite file
 
 
-def rasterlite_12():
+def test_rasterlite_12():
 
     if gdaltest.rasterlite_drv is None:
         return 'skip'
@@ -461,7 +461,7 @@ def rasterlite_12():
 # Test opening a .rasterlite.sql file
 
 
-def rasterlite_13():
+def test_rasterlite_13():
 
     if gdaltest.rasterlite_drv is None:
         return 'skip'
@@ -482,7 +482,7 @@ def rasterlite_13():
 # Cleanup
 
 
-def rasterlite_cleanup():
+def test_rasterlite_cleanup():
 
     if gdaltest.rasterlite_drv is None:
         return 'skip'
@@ -511,20 +511,20 @@ def rasterlite_cleanup():
 
 
 gdaltest_list = [
-    rasterlite_1,
-    rasterlite_2,
-    rasterlite_3,
-    rasterlite_4,
-    rasterlite_5,
-    rasterlite_6,
-    rasterlite_7,
-    rasterlite_8,
-    rasterlite_9,
-    rasterlite_10,
-    rasterlite_11,
-    rasterlite_12,
-    rasterlite_13,
-    rasterlite_cleanup]
+    test_rasterlite_1,
+    test_rasterlite_2,
+    test_rasterlite_3,
+    test_rasterlite_4,
+    test_rasterlite_5,
+    test_rasterlite_6,
+    test_rasterlite_7,
+    test_rasterlite_8,
+    test_rasterlite_9,
+    test_rasterlite_10,
+    test_rasterlite_11,
+    test_rasterlite_12,
+    test_rasterlite_13,
+    test_rasterlite_cleanup]
 
 if __name__ == '__main__':
 
diff --git a/autotest/gdrivers/rda.py b/autotest/gdrivers/rda.py
index 96f8788004c5..5281e6c7630b 100755
--- a/autotest/gdrivers/rda.py
+++ b/autotest/gdrivers/rda.py
@@ -44,7 +44,7 @@
 # Find RDA driver
 
 
-def rda_test_presence():
+def test_rda_test_presence():
 
     gdaltest.rda_drv = gdal.GetDriverByName('RDA')
 
@@ -63,7 +63,7 @@ def rda_test_presence():
 ###############################################################################
 
 
-def rda_bad_connection_string():
+def test_rda_bad_connection_string():
 
     if gdaltest.rda_drv is None:
         return 'skip'
@@ -94,7 +94,7 @@ def rda_bad_connection_string():
 ###############################################################################
 
 
-def rda_missing_credentials():
+def test_rda_missing_credentials():
 
     if gdaltest.rda_drv is None:
         return 'skip'
@@ -110,7 +110,7 @@ def rda_missing_credentials():
 ###############################################################################
 
 
-def rda_failed_authentication():
+def test_rda_failed_authentication():
 
     if gdaltest.rda_drv is None:
         return 'skip'
@@ -182,7 +182,7 @@ def rda_failed_authentication():
 ###############################################################################
 
 
-def rda_error_metadata():
+def test_rda_error_metadata():
 
     if gdaltest.rda_drv is None:
         return 'skip'
@@ -367,7 +367,7 @@ def rda_error_metadata():
 ###############################################################################
 
 
-def rda_graph_nominal():
+def test_rda_graph_nominal():
 
     if gdaltest.rda_drv is None:
         return 'skip'
@@ -766,7 +766,7 @@ def rda_graph_nominal():
 ###############################################################################
 
 
-def rda_template_nominal():
+def test_rda_template_nominal():
 
     if gdaltest.rda_drv is None:
         return 'skip'
@@ -1006,7 +1006,7 @@ def rda_template_nominal():
 
 ###############################################################################
 
-def rda_template_image_reference_nominal():
+def test_rda_template_image_reference_nominal():
 
     if gdaltest.rda_drv is None:
         return 'skip'
@@ -1213,7 +1213,7 @@ def rda_template_image_reference_nominal():
     return 'success'
 
 
-def rda_read_gbdx_config():
+def test_rda_read_gbdx_config():
 
     if gdaltest.rda_drv is None:
         return 'skip'
@@ -1272,7 +1272,7 @@ def rda_read_gbdx_config():
 ###############################################################################
 
 
-def rda_download_queue():
+def test_rda_download_queue():
 
     if gdaltest.rda_drv is None:
         return 'skip'
@@ -1351,7 +1351,7 @@ def rda_download_queue():
 ###############################################################################
 
 
-def rda_rpc():
+def test_rda_rpc():
 
     if gdaltest.rda_drv is None:
         return 'skip'
@@ -1457,7 +1457,7 @@ def rda_rpc():
 ###############################################################################
 
 
-def rda_real_cache_dir():
+def test_rda_real_cache_dir():
 
     if gdaltest.rda_drv is None:
         return 'skip'
@@ -1551,7 +1551,7 @@ def rda_real_cache_dir():
 ###############################################################################
 
 
-def rda_real_expired_authentication():
+def test_rda_real_expired_authentication():
 
     if gdaltest.rda_drv is None:
         return 'skip'
@@ -1612,7 +1612,7 @@ def rda_real_expired_authentication():
 ###############################################################################
 
 
-def rda_bad_tile():
+def test_rda_bad_tile():
 
     if gdaltest.rda_drv is None:
         return 'skip'
@@ -1730,7 +1730,7 @@ def rda_bad_tile():
 #
 
 
-def rda_cleanup():
+def test_rda_cleanup():
 
     if gdaltest.rda_drv is None:
         return 'skip'
@@ -1744,21 +1744,21 @@ def rda_cleanup():
 
 
 gdaltest_list = [
-    rda_test_presence,
-    rda_bad_connection_string,
-    rda_missing_credentials,
-    rda_failed_authentication,
-    rda_error_metadata,
-    rda_graph_nominal,
-    rda_template_nominal,
-    rda_template_image_reference_nominal,
-    rda_read_gbdx_config,
-    rda_download_queue,
-    rda_rpc,
-    rda_real_cache_dir,
-    rda_real_expired_authentication,
-    rda_bad_tile,
-    rda_cleanup]
+    test_rda_test_presence,
+    test_rda_bad_connection_string,
+    test_rda_missing_credentials,
+    test_rda_failed_authentication,
+    test_rda_error_metadata,
+    test_rda_graph_nominal,
+    test_rda_template_nominal,
+    test_rda_template_image_reference_nominal,
+    test_rda_read_gbdx_config,
+    test_rda_download_queue,
+    test_rda_rpc,
+    test_rda_real_cache_dir,
+    test_rda_real_expired_authentication,
+    test_rda_bad_tile,
+    test_rda_cleanup]
 
 if __name__ == '__main__':
 
diff --git a/autotest/gdrivers/rik.py b/autotest/gdrivers/rik.py
index 21401baceb42..e2f01f8c2c70 100755
--- a/autotest/gdrivers/rik.py
+++ b/autotest/gdrivers/rik.py
@@ -40,7 +40,7 @@
 # Data downloaded from : http://www.lantmateriet.se/upload/filer/kartor/programvaror/sverige500_swe99.zip
 
 
-def rik_online_1():
+def test_rik_online_1():
 
     if gdal.GetDriverByName('RIK') is None:
         return 'skip'
@@ -70,7 +70,7 @@ def rik_online_1():
 # Test a LZW compressed RIK dataset
 
 
-def rik_online_2():
+def test_rik_online_2():
 
     if gdal.GetDriverByName('RIK') is None:
         return 'skip'
@@ -83,8 +83,8 @@ def rik_online_2():
 
 
 gdaltest_list = [
-    rik_online_1,
-    rik_online_2
+    test_rik_online_1,
+    test_rik_online_2
 ]
 
 
diff --git a/autotest/gdrivers/rl2.py b/autotest/gdrivers/rl2.py
index 499f4726c3d0..59ec832cf174 100755
--- a/autotest/gdrivers/rl2.py
+++ b/autotest/gdrivers/rl2.py
@@ -39,7 +39,7 @@
 # Get the rl2 driver
 
 
-def rl2_1():
+def test_rl2_1():
 
     gdaltest.rl2_drv = gdal.GetDriverByName('SQLite')
     if gdaltest.rl2_drv is None:
@@ -54,7 +54,7 @@ def rl2_1():
 # Test opening a rl2 DB gray level
 
 
-def rl2_2():
+def test_rl2_2():
 
     if gdaltest.rl2_drv is None:
         return 'skip'
@@ -126,7 +126,7 @@ def rl2_2():
 # Test opening a rl2 DB gray level
 
 
-def rl2_3():
+def test_rl2_3():
 
     if gdaltest.rl2_drv is None:
         return 'skip'
@@ -192,7 +192,7 @@ def rl2_3():
 # Test opening a rl2 DB paletted
 
 
-def rl2_4():
+def test_rl2_4():
 
     if gdaltest.rl2_drv is None:
         return 'skip'
@@ -235,7 +235,7 @@ def rl2_4():
 # Test opening a rl2 DB with various data types
 
 
-def rl2_5():
+def test_rl2_5():
 
     if gdaltest.rl2_drv is None:
         return 'skip'
@@ -281,7 +281,7 @@ def rl2_5():
 # Test CreateCopy() on a grayscale uint8
 
 
-def rl2_6():
+def test_rl2_6():
 
     if gdaltest.rl2_drv is None:
         return 'skip'
@@ -293,7 +293,7 @@ def rl2_6():
 # Test CreateCopy() on a RGB
 
 
-def rl2_7():
+def test_rl2_7():
 
     if gdaltest.rl2_drv is None:
         return 'skip'
@@ -305,7 +305,7 @@ def rl2_7():
 # Test CreateCopy() on a paletted dataset
 
 
-def rl2_8():
+def test_rl2_8():
 
     if gdaltest.rl2_drv is None:
         return 'skip'
@@ -317,7 +317,7 @@ def rl2_8():
 # Test CreateCopy() on a DATAGRID uint16
 
 
-def rl2_9():
+def test_rl2_9():
 
     if gdaltest.rl2_drv is None:
         return 'skip'
@@ -329,7 +329,7 @@ def rl2_9():
 # Test CreateCopy() on a DATAGRID int16
 
 
-def rl2_10():
+def test_rl2_10():
 
     if gdaltest.rl2_drv is None:
         return 'skip'
@@ -341,7 +341,7 @@ def rl2_10():
 # Test CreateCopy() on a DATAGRID uint32
 
 
-def rl2_11():
+def test_rl2_11():
 
     if gdaltest.rl2_drv is None:
         return 'skip'
@@ -353,7 +353,7 @@ def rl2_11():
 # Test CreateCopy() on a DATAGRID int32
 
 
-def rl2_12():
+def test_rl2_12():
 
     if gdaltest.rl2_drv is None:
         return 'skip'
@@ -365,7 +365,7 @@ def rl2_12():
 # Test CreateCopy() on a DATAGRID float
 
 
-def rl2_13():
+def test_rl2_13():
 
     if gdaltest.rl2_drv is None:
         return 'skip'
@@ -377,7 +377,7 @@ def rl2_13():
 # Test CreateCopy() on a DATAGRID double
 
 
-def rl2_14():
+def test_rl2_14():
 
     if gdaltest.rl2_drv is None:
         return 'skip'
@@ -389,7 +389,7 @@ def rl2_14():
 # Test CreateCopy() on a 1 bit paletted
 
 
-def rl2_15():
+def test_rl2_15():
 
     if gdaltest.rl2_drv is None:
         return 'skip'
@@ -401,7 +401,7 @@ def rl2_15():
 # Test CreateCopy() on a forced 1 bit
 
 
-def rl2_16():
+def test_rl2_16():
 
     if gdaltest.rl2_drv is None:
         return 'skip'
@@ -413,7 +413,7 @@ def rl2_16():
 # Test CreateCopy() on a forced 2 bit
 
 
-def rl2_17():
+def test_rl2_17():
 
     if gdaltest.rl2_drv is None:
         return 'skip'
@@ -425,7 +425,7 @@ def rl2_17():
 # Test CreateCopy() on a forced 4 bit
 
 
-def rl2_18():
+def test_rl2_18():
 
     if gdaltest.rl2_drv is None:
         return 'skip'
@@ -437,7 +437,7 @@ def rl2_18():
 # Test CreateCopy() with forced monochrome
 
 
-def rl2_19():
+def test_rl2_19():
 
     if gdaltest.rl2_drv is None:
         return 'skip'
@@ -450,7 +450,7 @@ def rl2_19():
 # Se https://www.gaia-gis.it/fossil/librasterlite2/wiki?name=reference_table
 
 
-def rl2_20():
+def test_rl2_20():
 
     if gdaltest.rl2_drv is None:
         return 'skip'
@@ -500,7 +500,7 @@ def rl2_20():
 # Test compression methods
 
 
-def rl2_21():
+def test_rl2_21():
 
     if gdaltest.rl2_drv is None:
         return 'skip'
@@ -545,7 +545,7 @@ def rl2_21():
 # Test APPEND_SUBDATASET
 
 
-def rl2_22():
+def test_rl2_22():
 
     if gdaltest.rl2_drv is None:
         return 'skip'
@@ -595,7 +595,7 @@ def rl2_22():
 # Test BuildOverviews
 
 
-def rl2_23():
+def test_rl2_23():
 
     if gdaltest.rl2_drv is None:
         return 'skip'
@@ -635,7 +635,7 @@ def rl2_23():
 # Test opening a .rl2.sql file
 
 
-def rl2_24():
+def test_rl2_24():
 
     if gdaltest.rl2_drv is None:
         return 'skip'
@@ -653,7 +653,7 @@ def rl2_24():
 # Test Create()
 
 
-def rl2_error_create():
+def test_rl2_error_create():
 
     if gdaltest.rl2_drv is None:
         return 'skip'
@@ -665,31 +665,31 @@ def rl2_error_create():
 
 
 gdaltest_list = [
-    rl2_1,
-    rl2_2,
-    rl2_3,
-    rl2_4,
-    rl2_5,
-    rl2_6,
-    rl2_7,
-    rl2_8,
-    rl2_9,
-    rl2_10,
-    rl2_11,
-    rl2_12,
-    rl2_13,
-    rl2_14,
-    rl2_15,
-    rl2_16,
-    rl2_17,
-    rl2_18,
-    rl2_19,
-    rl2_20,
-    rl2_21,
-    rl2_22,
-    rl2_23,
-    rl2_24,
-    rl2_error_create,
+    test_rl2_1,
+    test_rl2_2,
+    test_rl2_3,
+    test_rl2_4,
+    test_rl2_5,
+    test_rl2_6,
+    test_rl2_7,
+    test_rl2_8,
+    test_rl2_9,
+    test_rl2_10,
+    test_rl2_11,
+    test_rl2_12,
+    test_rl2_13,
+    test_rl2_14,
+    test_rl2_15,
+    test_rl2_16,
+    test_rl2_17,
+    test_rl2_18,
+    test_rl2_19,
+    test_rl2_20,
+    test_rl2_21,
+    test_rl2_22,
+    test_rl2_23,
+    test_rl2_24,
+    test_rl2_error_create,
 ]
 
 if __name__ == '__main__':
diff --git a/autotest/gdrivers/rmf.py b/autotest/gdrivers/rmf.py
index c545036e80ee..4922b2f26d25 100755
--- a/autotest/gdrivers/rmf.py
+++ b/autotest/gdrivers/rmf.py
@@ -40,27 +40,27 @@
 # Perform simple read tests.
 
 
-def rmf_1():
+def test_rmf_1():
 
     tst = gdaltest.GDALTest('rmf', 'byte.rsw', 1, 4672)
     return tst.testOpen(check_gt=(440720, 60, 0, 3751320, 0, -60))
 
 
-def rmf_2():
+def test_rmf_2():
 
     tst = gdaltest.GDALTest('rmf', 'byte-lzw.rsw', 1, 40503)
     with gdaltest.error_handler():
         return tst.testOpen()
 
 
-def rmf_3():
+def test_rmf_3():
 
     tst = gdaltest.GDALTest('rmf', 'float64.mtw', 1, 4672)
     with gdaltest.error_handler():
         return tst.testOpen(check_gt=(440720, 60, 0, 3751320, 0, -60))
 
 
-def rmf_4():
+def test_rmf_4():
 
     tst = gdaltest.GDALTest('rmf', 'rgbsmall.rsw', 1, 21212)
     ret = tst.testOpen(check_gt=(-44.840320, 0.003432, 0,
@@ -79,7 +79,7 @@ def rmf_4():
                                   -22.932584, 0, -0.003432))
 
 
-def rmf_5():
+def test_rmf_5():
 
     tst = gdaltest.GDALTest('rmf', 'rgbsmall-lzw.rsw', 1, 40503)
     with gdaltest.error_handler():
@@ -100,7 +100,7 @@ def rmf_5():
         return tst.testOpen()
 
 
-def rmf_6():
+def test_rmf_6():
 
     tst = gdaltest.GDALTest('rmf', 'big-endian.rsw', 1, 7782)
     with gdaltest.error_handler():
@@ -122,14 +122,14 @@ def rmf_6():
 # Create simple copy and check.
 
 
-def rmf_7():
+def test_rmf_7():
 
     tst = gdaltest.GDALTest('rmf', 'byte.rsw', 1, 4672)
 
     return tst.testCreateCopy(check_srs=1, check_gt=1, vsimem=1)
 
 
-def rmf_8():
+def test_rmf_8():
 
     tst = gdaltest.GDALTest('rmf', 'rgbsmall.rsw', 2, 21053)
 
@@ -139,7 +139,7 @@ def rmf_8():
 # Create RMFHUGE=YES
 
 
-def rmf_9():
+def test_rmf_9():
 
     tst = gdaltest.GDALTest('rmf', 'byte.rsw', 1, 4672, options=['RMFHUGE=YES'])
 
@@ -149,7 +149,7 @@ def rmf_9():
 # Compressed DEM
 
 
-def rmf_10():
+def test_rmf_10():
 
     tst = gdaltest.GDALTest('rmf', 't100.mtw', 1, 6388)
 
@@ -160,7 +160,7 @@ def rmf_10():
 # Overviews
 
 
-def rmf_11():
+def test_rmf_11():
 
     test_fn = '/vsigzip/data/overviews.rsw.gz'
     src_ds = gdal.Open(test_fn)
@@ -199,7 +199,7 @@ def rmf_11():
 # Check file open with cucled header offsets .
 
 
-def rmf_12a():
+def test_rmf_12a():
 
     tst = gdaltest.GDALTest('rmf', 'cucled-1.rsw', 1, 4672)
     with gdaltest.error_handler():
@@ -209,7 +209,7 @@ def rmf_12a():
 # Check file open with cucled header offsets .
 
 
-def rmf_12b():
+def test_rmf_12b():
 
     tst = gdaltest.GDALTest('rmf', 'cucled-2.rsw', 1, 4672)
     with gdaltest.error_handler():
@@ -219,7 +219,7 @@ def rmf_12b():
 # Check file open with invalid subheader marker.
 
 
-def rmf_12c():
+def test_rmf_12c():
 
     tst = gdaltest.GDALTest('rmf', 'invalid-subheader.rsw', 1, 4672)
     with gdaltest.error_handler():
@@ -229,7 +229,7 @@ def rmf_12c():
 # Check file open with corrupted subheader.
 
 
-def rmf_12d():
+def test_rmf_12d():
 
     tst = gdaltest.GDALTest('rmf', 'corrupted-subheader.rsw', 1, 4672)
     return tst.testOpen(check_gt=(440720, 60, 0, 3751320, 0, -60))
@@ -306,7 +306,7 @@ def rmf_build_ov(source, testid, options, ov_sizes, crs, reopen=False, pass_coun
 # Build overviews on newly created RSW file
 
 
-def rmf_13():
+def test_rmf_13():
     return rmf_build_ov(source='byte.rsw',
                         testid='13',
                         options=['RMFHUGE=NO'],
@@ -318,7 +318,7 @@ def rmf_13():
 # Build overviews on newly created huge RSW file
 
 
-def rmf_14():
+def test_rmf_14():
     return rmf_build_ov(source='byte.rsw',
                         testid='14',
                         options=['RMFHUGE=YES'],
@@ -330,7 +330,7 @@ def rmf_14():
 # Build overviews on closed and reopened RSW file
 
 
-def rmf_15():
+def test_rmf_15():
     return rmf_build_ov(source='byte.rsw',
                         testid='15',
                         options=['RMFHUGE=NO'],
@@ -342,7 +342,7 @@ def rmf_15():
 # Build overviews on closed and reopened huge RSW file
 
 
-def rmf_16():
+def test_rmf_16():
     return rmf_build_ov(source='byte.rsw',
                         testid='16',
                         options=['RMFHUGE=YES'],
@@ -354,7 +354,7 @@ def rmf_16():
 # Build overviews on newly created MTW file
 
 
-def rmf_17():
+def test_rmf_17():
     return rmf_build_ov(source='float64.mtw',
                         testid='17',
                         options=['RMFHUGE=NO', 'MTW=YES'],
@@ -366,7 +366,7 @@ def rmf_17():
 # Build overviews on newly created MTW file
 
 
-def rmf_18():
+def test_rmf_18():
     return rmf_build_ov(source='float64.mtw',
                         testid='18',
                         options=['RMFHUGE=YES', 'MTW=YES'],
@@ -378,7 +378,7 @@ def rmf_18():
 # Build overviews on closed and reopened MTW file
 
 
-def rmf_19():
+def test_rmf_19():
     return rmf_build_ov(source='float64.mtw',
                         testid='19',
                         options=['RMFHUGE=NO', 'MTW=YES'],
@@ -390,7 +390,7 @@ def rmf_19():
 # Build overviews on closed and reopened huge MTW file
 
 
-def rmf_20():
+def test_rmf_20():
     return rmf_build_ov(source='float64.mtw',
                         testid='20',
                         options=['RMFHUGE=YES', 'MTW=YES'],
@@ -402,7 +402,7 @@ def rmf_20():
 # Recreate overviews on newly created MTW file
 
 
-def rmf_21():
+def test_rmf_21():
     return rmf_build_ov(source='float64.mtw',
                         testid='21',
                         options=['RMFHUGE=NO', 'MTW=YES'],
@@ -415,7 +415,7 @@ def rmf_21():
 # Recreate overviews on newly created huge MTW file
 
 
-def rmf_22():
+def test_rmf_22():
     return rmf_build_ov(source='float64.mtw',
                         testid='22',
                         options=['RMFHUGE=YES', 'MTW=YES'],
@@ -428,7 +428,7 @@ def rmf_22():
 ###############################################################################
 # Recreate overviews on closed and reopened MTW file
 
-def rmf_23():
+def test_rmf_23():
     return rmf_build_ov(source='float64.mtw',
                         testid='23',
                         options=['RMFHUGE=NO', 'MTW=YES'],
@@ -441,7 +441,7 @@ def rmf_23():
 # Recreate overviews on closed and reopened huge MTW file
 
 
-def rmf_24():
+def test_rmf_24():
     return rmf_build_ov(source='float64.mtw',
                         testid='24',
                         options=['RMFHUGE=YES', 'MTW=YES'],
@@ -454,7 +454,7 @@ def rmf_24():
 # Nodata write test
 
 
-def rmf_25():
+def test_rmf_25():
     rmf_drv = gdal.GetDriverByName('RMF')
     if rmf_drv is None:
         gdaltest.post_reason('RMF driver not found.')
@@ -507,7 +507,7 @@ def rmf_25():
 # Unit write test
 
 
-def rmf_26():
+def test_rmf_26():
     rmf_drv = gdal.GetDriverByName('RMF')
     if rmf_drv is None:
         gdaltest.post_reason('RMF driver not found.')
@@ -567,7 +567,7 @@ def rmf_26():
 # Test read JPEG compressed RMF dataset
 
 
-def rmf_27():
+def test_rmf_27():
 
     if gdal.GetDriverByName('JPEG') is None:
         return 'skip'
@@ -603,7 +603,7 @@ def rmf_27():
 # Check compression metadata
 
 
-def rmf_28a():
+def test_rmf_28a():
 
     ds = gdal.Open('data/byte-lzw.rsw', gdal.GA_ReadOnly)
     if ds is None:
@@ -619,7 +619,7 @@ def rmf_28a():
     return 'success'
 
 
-def rmf_28b():
+def test_rmf_28b():
 
     ds = gdal.Open('data/t100.mtw', gdal.GA_ReadOnly)
     if ds is None:
@@ -638,7 +638,7 @@ def rmf_28b():
 ###############################################################################
 # Check EPSG code
 
-def rmf_29():
+def test_rmf_29():
 
     rmf_drv = gdal.GetDriverByName('RMF')
     if rmf_drv is None:
@@ -681,7 +681,7 @@ def rmf_29():
 ###############################################################################
 # Check interleaved access
 
-def rmf_30():
+def test_rmf_30():
 
     ds_name = 'tmp/interleaved.tif'
     gdal.Translate(ds_name, 'data/rgbsmall-lzw.rsw',
@@ -706,7 +706,7 @@ def rmf_30():
 # Check compressed write
 
 
-def rmf_31a():
+def test_rmf_31a():
 
     tst = gdaltest.GDALTest('rmf', 'small_world.tif', 1,
                             30111, options=['COMPRESS=NONE'])
@@ -714,7 +714,7 @@ def rmf_31a():
     return tst.testCreateCopy(check_minmax=0, check_srs=1, check_gt=1)
 
 
-def rmf_31b():
+def test_rmf_31b():
 
     tst = gdaltest.GDALTest('rmf', 'small_world.tif', 1,
                             30111, options=['COMPRESS=LZW'])
@@ -722,7 +722,7 @@ def rmf_31b():
     return tst.testCreateCopy(check_minmax=0, check_srs=1, check_gt=1)
 
 
-def rmf_31c():
+def test_rmf_31c():
 
     ds_name = 'tmp/rmf_31c.rsw'
     gdal.Translate(ds_name, 'data/small_world.tif',
@@ -745,7 +745,7 @@ def rmf_31c():
     return 'success'
 
 
-def rmf_31d():
+def test_rmf_31d():
 
     tst = gdaltest.GDALTest('rmf', 't100.mtw', 1,
                             6388, options=['MTW=YES', 'COMPRESS=RMF_DEM'])
@@ -753,7 +753,7 @@ def rmf_31d():
     return tst.testCreateCopy(check_minmax=0, check_srs=1, check_gt=1)
 
 
-def rmf_31e():
+def test_rmf_31e():
     try:
         import numpy
     except ImportError:
@@ -818,7 +818,7 @@ def rmf_31e():
 ###############################################################################
 # Check parallel compression
 
-def rmf_32a():
+def test_rmf_32a():
 
     ds_name = 'tmp/rmf_32a.rsw'
     gdal.Translate(ds_name, 'data/small_world.tif', format='RMF',
@@ -831,7 +831,7 @@ def rmf_32a():
     return res
 
 
-def rmf_32b():
+def test_rmf_32b():
 
     ds_name = 'tmp/rmf_32b.rsw'
     gdal.Translate(ds_name, 'data/small_world.tif', format='RMF',
@@ -848,7 +848,7 @@ def rmf_32b():
 # Parallel build overviews on newly created RSW file
 
 
-def rmf_32c():
+def test_rmf_32c():
     ds_name = 'tmp/rmf_32c.rsw'
     gdal.Translate(ds_name, 'data/small_world.tif', format='RMF',
                    options='-outsize 400% 400% -co COMPRESS=LZW -co NUM_THREADS=4')
@@ -868,19 +868,19 @@ def rmf_32c():
 # Read 1-bit & 4-bit files
 
 
-def rmf_33a():
+def test_rmf_33a():
 
     tst = gdaltest.GDALTest('rmf', '1bit.rsw', 1, 34325)
     return tst.testOpen()
 
 
-def rmf_33b():
+def test_rmf_33b():
 
     tst = gdaltest.GDALTest('rmf', '4bit.rsw', 1, 55221)
     return tst.testOpen()
 
 
-def rmf_33c():
+def test_rmf_33c():
 
     tst = gdaltest.GDALTest('rmf', '4bit-lzw.rsw', 1, 55221)
     return tst.testOpen()
@@ -890,51 +890,51 @@ def rmf_33c():
 
 
 gdaltest_list = [
-    rmf_1,
-    rmf_2,
-    rmf_3,
-    rmf_4,
-    rmf_5,
-    rmf_6,
-    rmf_7,
-    rmf_8,
-    rmf_9,
-    rmf_10,
-    rmf_11,
-    rmf_12a,
-    rmf_12b,
-    rmf_12c,
-    rmf_12d,
-    rmf_13,
-    rmf_14,
-    rmf_15,
-    rmf_16,
-    rmf_17,
-    rmf_18,
-    rmf_19,
-    rmf_20,
-    rmf_21,
-    rmf_22,
-    rmf_23,
-    rmf_24,
-    rmf_25,
-    rmf_26,
-    rmf_27,
-    rmf_28a,
-    rmf_28b,
-    rmf_29,
-    rmf_30,
-    rmf_31a,
-    rmf_31b,
-    rmf_31c,
-    rmf_31d,
-    rmf_31e,
-    rmf_32a,
-    rmf_32b,
-    rmf_32c,
-    rmf_33a,
-    rmf_33b,
-    rmf_33c,
+    test_rmf_1,
+    test_rmf_2,
+    test_rmf_3,
+    test_rmf_4,
+    test_rmf_5,
+    test_rmf_6,
+    test_rmf_7,
+    test_rmf_8,
+    test_rmf_9,
+    test_rmf_10,
+    test_rmf_11,
+    test_rmf_12a,
+    test_rmf_12b,
+    test_rmf_12c,
+    test_rmf_12d,
+    test_rmf_13,
+    test_rmf_14,
+    test_rmf_15,
+    test_rmf_16,
+    test_rmf_17,
+    test_rmf_18,
+    test_rmf_19,
+    test_rmf_20,
+    test_rmf_21,
+    test_rmf_22,
+    test_rmf_23,
+    test_rmf_24,
+    test_rmf_25,
+    test_rmf_26,
+    test_rmf_27,
+    test_rmf_28a,
+    test_rmf_28b,
+    test_rmf_29,
+    test_rmf_30,
+    test_rmf_31a,
+    test_rmf_31b,
+    test_rmf_31c,
+    test_rmf_31d,
+    test_rmf_31e,
+    test_rmf_32a,
+    test_rmf_32b,
+    test_rmf_32c,
+    test_rmf_33a,
+    test_rmf_33b,
+    test_rmf_33c,
 ]
 
 if __name__ == '__main__':
diff --git a/autotest/gdrivers/roipac.py b/autotest/gdrivers/roipac.py
index 4bee985a9bc5..7ff1b4697406 100755
--- a/autotest/gdrivers/roipac.py
+++ b/autotest/gdrivers/roipac.py
@@ -39,7 +39,7 @@
 # Perform simple read test.
 
 
-def roipac_1():
+def test_roipac_1():
 
     tst = gdaltest.GDALTest('roi_pac', 'srtm.dem', 1, 64074)
 
@@ -63,7 +63,7 @@ def roipac_1():
 # Test reading of metadata from the ROI_PAC metadata domain
 
 
-def roipac_2():
+def test_roipac_2():
 
     ds = gdal.Open('data/srtm.dem')
     val = ds.GetMetadataItem('YMAX', 'ROI_PAC')
@@ -76,7 +76,7 @@ def roipac_2():
 # Verify this can be exported losslessly.
 
 
-def roipac_3():
+def test_roipac_3():
 
     tst = gdaltest.GDALTest('roi_pac', 'srtm.dem', 1, 64074)
     return tst.testCreateCopy(check_gt=1, new_filename='strm.tst.dem')
@@ -85,7 +85,7 @@ def roipac_3():
 # Verify VSIF*L capacity
 
 
-def roipac_4():
+def test_roipac_4():
 
     tst = gdaltest.GDALTest('roi_pac', 'srtm.dem', 1, 64074)
     return tst.testCreateCopy(check_gt=1, new_filename='strm.tst.dem', vsimem=1)
@@ -94,7 +94,7 @@ def roipac_4():
 # Verify offset/scale metadata reading
 
 
-def roipac_5():
+def test_roipac_5():
 
     ds = gdal.Open('data/srtm.dem')
     band = ds.GetRasterBand(1)
@@ -111,7 +111,7 @@ def roipac_5():
 # Test .flg
 
 
-def roipac_6():
+def test_roipac_6():
 
     tst = gdaltest.GDALTest('roi_pac', 'byte.tif', 1, 4672)
     with gdaltest.error_handler():
@@ -120,12 +120,12 @@ def roipac_6():
 
 
 gdaltest_list = [
-    roipac_1,
-    roipac_2,
-    roipac_3,
-    roipac_4,
-    roipac_5,
-    roipac_6,
+    test_roipac_1,
+    test_roipac_2,
+    test_roipac_3,
+    test_roipac_4,
+    test_roipac_5,
+    test_roipac_6,
 ]
 
 
diff --git a/autotest/gdrivers/rpftoc.py b/autotest/gdrivers/rpftoc.py
index 05ec9c22389a..1c135869c05d 100755
--- a/autotest/gdrivers/rpftoc.py
+++ b/autotest/gdrivers/rpftoc.py
@@ -41,7 +41,7 @@
 # whose content is fully empty.
 
 
-def rpftoc_1():
+def test_rpftoc_1():
     tst = gdaltest.GDALTest('RPFTOC', 'NITF_TOC_ENTRY:CADRG_ONC_1,000,000_2_0:data/A.TOC', 1, 53599, filename_absolute=1)
     gt = (1.9999416000000001, 0.0017833876302083334, 0.0, 36.000117500000002, 0.0, -0.0013461816406249993)
     return tst.testOpen(check_gt=gt)
@@ -50,7 +50,7 @@ def rpftoc_1():
 # Same test as rpftoc_1, but the dataset is forced to be opened in RGBA mode
 
 
-def rpftoc_2():
+def test_rpftoc_2():
     gdal.SetConfigOption('RPFTOC_FORCE_RGBA', 'YES')
     tst = gdaltest.GDALTest('RPFTOC', 'NITF_TOC_ENTRY:CADRG_ONC_1,000,000_2_0:data/A.TOC', 1, 0, filename_absolute=1)
     res = tst.testOpen()
@@ -61,7 +61,7 @@ def rpftoc_2():
 # Test reading the metadata
 
 
-def rpftoc_3():
+def test_rpftoc_3():
     ds = gdal.Open('data/A.TOC')
     md = ds.GetMetadata('SUBDATASETS')
     if 'SUBDATASET_1_NAME' not in md or md['SUBDATASET_1_NAME'] != 'NITF_TOC_ENTRY:CADRG_ONC_1,000,000_2_0:data/A.TOC':
@@ -80,7 +80,7 @@ def rpftoc_3():
 # Add an overview
 
 
-def rpftoc_4():
+def test_rpftoc_4():
     gdal.SetConfigOption('RPFTOC_FORCE_RGBA', 'YES')
 
     shutil.copyfile('data/A.TOC', 'tmp/A.TOC')
@@ -115,10 +115,10 @@ def rpftoc_4():
 
 
 gdaltest_list = [
-    rpftoc_1,
-    rpftoc_2,
-    rpftoc_3,
-    rpftoc_4]
+    test_rpftoc_1,
+    test_rpftoc_2,
+    test_rpftoc_3,
+    test_rpftoc_4]
 
 if __name__ == '__main__':
 
diff --git a/autotest/gdrivers/rraster.py b/autotest/gdrivers/rraster.py
index 36ab5efa17d1..01669dd662db 100755
--- a/autotest/gdrivers/rraster.py
+++ b/autotest/gdrivers/rraster.py
@@ -41,7 +41,7 @@
 # Perform simple read test.
 
 
-def rraster_1(filename='data/byte_rraster.grd', check_prj=None):
+def test_rraster_1(filename='data/byte_rraster.grd', check_prj=None):
 
     tst = gdaltest.GDALTest('RRASTER', filename, 1, 4672, filename_absolute=True)
     ref_ds = gdal.Open('data/byte.tif')
@@ -68,7 +68,7 @@ def rraster_1(filename='data/byte_rraster.grd', check_prj=None):
 ###############################################################################
 
 
-def rraster_1_copy():
+def test_rraster_1_copy():
 
     filename = '/vsimem/byte_rraster.grd'
     gdal.Translate(filename, 'data/byte_rraster.grd', format='RRASTER')
@@ -77,7 +77,7 @@ def rraster_1_copy():
         return 'fail'
     sr = osr.SpatialReference()
     sr.SetFromUserInput('+proj=utm +zone=11 +ellps=clrk66 +nadgrids=@conus,@alaska,@ntv2_0.gsb,@ntv1_can.dat +units=m +no_defs')
-    ret = rraster_1(filename, check_prj=sr.ExportToWkt())
+    ret = test_rraster_1(filename, check_prj=sr.ExportToWkt())
     gdal.GetDriverByName('RRASTER').Delete(filename)
 
     return ret
@@ -121,7 +121,7 @@ def _is_dict_included_in_dict(got, expected, key_name='', to_print=None):
 ###############################################################################
 
 
-def rraster_rgba(filename='data/rgba_rraster.grd'):
+def test_rraster_rgba(filename='data/rgba_rraster.grd'):
 
     ds = gdal.Open(filename)
     info = gdal.Info(ds, computeChecksum=True, format='json')
@@ -155,7 +155,7 @@ def rraster_rgba(filename='data/rgba_rraster.grd'):
 ###############################################################################
 
 
-def rraster_rgba_copy():
+def test_rraster_rgba_copy():
 
     filename = '/vsimem/rgba_rraster.grd'
 
@@ -165,7 +165,7 @@ def rraster_rgba_copy():
         if gdal.VSIStatL(filename + '.aux.xml'):
             gdaltest.post_reason('did not expect .aux.xml')
             return 'fail'
-        ret = rraster_rgba(filename)
+        ret = test_rraster_rgba(filename)
         gdal.GetDriverByName('RRASTER').Delete(filename)
         if ret != 'success':
             print(creationOptions)
@@ -176,7 +176,7 @@ def rraster_rgba_copy():
 ###############################################################################
 
 
-def rraster_ct_rgb(filename='data/byte_rraster_ct_rgb.grd'):
+def test_rraster_ct_rgb(filename='data/byte_rraster_ct_rgb.grd'):
 
     ds = gdal.Open(filename)
     info = gdal.Info(ds, format='json')
@@ -197,14 +197,14 @@ def rraster_ct_rgb(filename='data/byte_rraster_ct_rgb.grd'):
 ###############################################################################
 
 
-def rraster_ct_rgb_copy():
+def test_rraster_ct_rgb_copy():
 
     filename = '/vsimem/byte_rraster_ct_rgb.grd'
     gdal.Translate(filename, 'data/byte_rraster_ct_rgb.grd', format='RRASTER')
     if gdal.VSIStatL(filename + '.aux.xml'):
         gdaltest.post_reason('did not expect .aux.xml')
         return 'fail'
-    ret = rraster_ct_rgb(filename)
+    ret = test_rraster_ct_rgb(filename)
     gdal.GetDriverByName('RRASTER').Delete(filename)
 
     return ret
@@ -212,7 +212,7 @@ def rraster_ct_rgb_copy():
 ###############################################################################
 
 
-def rraster_ct_rgba(filename='data/byte_rraster_ct_rgba.grd'):
+def test_rraster_ct_rgba(filename='data/byte_rraster_ct_rgba.grd'):
 
     ds = gdal.Open(filename)
     info = gdal.Info(ds, format='json')
@@ -233,14 +233,14 @@ def rraster_ct_rgba(filename='data/byte_rraster_ct_rgba.grd'):
 ###############################################################################
 
 
-def rraster_ct_rgba_copy():
+def test_rraster_ct_rgba_copy():
 
     filename = '/vsimem/byte_rraster_ct_rgba.grd'
     gdal.Translate(filename, 'data/byte_rraster_ct_rgba.grd', format='RRASTER')
     if gdal.VSIStatL(filename + '.aux.xml'):
         gdaltest.post_reason('did not expect .aux.xml')
         return 'fail'
-    ret = rraster_ct_rgba(filename)
+    ret = test_rraster_ct_rgba(filename)
     gdal.GetDriverByName('RRASTER').Delete(filename)
 
     return ret
@@ -248,7 +248,7 @@ def rraster_ct_rgba_copy():
 ###############################################################################
 
 
-def rraster_rat(filename='data/byte_rraster_rat.grd'):
+def test_rraster_rat(filename='data/byte_rraster_rat.grd'):
 
     ds = gdal.Open(filename)
     info = gdal.Info(ds, format='json')
@@ -329,14 +329,14 @@ def rraster_rat(filename='data/byte_rraster_rat.grd'):
 ###############################################################################
 
 
-def rraster_rat_copy():
+def test_rraster_rat_copy():
 
     filename = '/vsimem/byte_rraster_rat.grd'
     gdal.Translate(filename, 'data/byte_rraster_rat.grd', format='RRASTER')
     if gdal.VSIStatL(filename + '.aux.xml'):
         gdaltest.post_reason('did not expect .aux.xml')
         return 'fail'
-    ret = rraster_rat(filename)
+    ret = test_rraster_rat(filename)
     gdal.GetDriverByName('RRASTER').Delete(filename)
 
     return ret
@@ -344,7 +344,7 @@ def rraster_rat_copy():
 ###############################################################################
 
 
-def rraster_signedbyte():
+def test_rraster_signedbyte():
 
     filename = '/vsimem/rraster_signedbyte.grd'
     filename2 = '/vsimem/rraster_signedbyte2.grd'
@@ -369,7 +369,7 @@ def rraster_signedbyte():
 ###############################################################################
 
 
-def rraster_datatypes():
+def test_rraster_datatypes():
 
     filename = '/vsimem/temp.grd'
 
@@ -398,7 +398,7 @@ def rraster_datatypes():
 ###############################################################################
 
 
-def rraster_nodata_and_metadata():
+def test_rraster_nodata_and_metadata():
 
     filename = '/vsimem/temp.grd'
     ds = gdal.GetDriverByName('RRASTER').Create(filename, 1, 1)
@@ -424,7 +424,7 @@ def rraster_nodata_and_metadata():
 ###############################################################################
 
 
-def rraster_update():
+def test_rraster_update():
 
     filename = '/vsimem/temp.grd'
     gdal.Translate(filename, 'data/byte_rraster.grd', format='RRASTER')
@@ -448,7 +448,7 @@ def rraster_update():
 ###############################################################################
 
 
-def rraster_colorinterpretation():
+def test_rraster_colorinterpretation():
 
     filename = '/vsimem/temp.grd'
     ds = gdal.GetDriverByName('RRASTER').Create(filename, 1, 1, 4)
@@ -478,21 +478,21 @@ def rraster_colorinterpretation():
 
 
 gdaltest_list = [
-    rraster_1,
-    rraster_1_copy,
-    rraster_rgba,
-    rraster_rgba_copy,
-    rraster_ct_rgb,
-    rraster_ct_rgb_copy,
-    rraster_ct_rgba,
-    rraster_ct_rgba_copy,
-    rraster_rat,
-    rraster_rat_copy,
-    rraster_signedbyte,
-    rraster_datatypes,
-    rraster_nodata_and_metadata,
-    rraster_update,
-    rraster_colorinterpretation,
+    test_rraster_1,
+    test_rraster_1_copy,
+    test_rraster_rgba,
+    test_rraster_rgba_copy,
+    test_rraster_ct_rgb,
+    test_rraster_ct_rgb_copy,
+    test_rraster_ct_rgba,
+    test_rraster_ct_rgba_copy,
+    test_rraster_rat,
+    test_rraster_rat_copy,
+    test_rraster_signedbyte,
+    test_rraster_datatypes,
+    test_rraster_nodata_and_metadata,
+    test_rraster_update,
+    test_rraster_colorinterpretation,
 ]
 
 
diff --git a/autotest/gdrivers/rs2.py b/autotest/gdrivers/rs2.py
index 40379a95167a..af83ace77396 100755
--- a/autotest/gdrivers/rs2.py
+++ b/autotest/gdrivers/rs2.py
@@ -40,19 +40,19 @@
 # evolves, this might break the test legitimately !
 
 
-def rs2_1():
+def test_rs2_1():
     tst = gdaltest.GDALTest('RS2', 'product.xml', 1, 4672)
     return tst.testOpen()
 
 
-def rs2_2():
+def test_rs2_2():
     tst = gdaltest.GDALTest('RS2', 'RADARSAT_2_CALIB:BETA0:data/product.xml', 1, 4848, filename_absolute=1)
     return tst.testOpen()
 
 # Test reading our dummy RPC
 
 
-def rs2_3():
+def test_rs2_3():
     ds = gdal.Open('data/product.xml')
     got_rpc = ds.GetMetadata('RPC')
     expected_rpc = {'ERR_BIAS': 'biasError',
@@ -79,9 +79,9 @@ def rs2_3():
 
 
 gdaltest_list = [
-    rs2_1,
-    rs2_2,
-    rs2_3]
+    test_rs2_1,
+    test_rs2_2,
+    test_rs2_3]
 
 if __name__ == '__main__':
 
diff --git a/autotest/gdrivers/safe.py b/autotest/gdrivers/safe.py
index f20ce6a57188..88e069b3dff8 100755
--- a/autotest/gdrivers/safe.py
+++ b/autotest/gdrivers/safe.py
@@ -38,7 +38,7 @@
 # reduced to 1% of their initial size and metadata stripped
 
 
-def safe_1():
+def test_safe_1():
 
     tst = gdaltest.GDALTest(
         'SAFE',
@@ -46,14 +46,14 @@ def safe_1():
     return tst.testOpen()
 
 
-def safe_2():
+def test_safe_2():
 
     tst = gdaltest.GDALTest(
         'SAFE', 'SAFE_FAKE/test.SAFE/manifest.safe', 2, 3732)
     return tst.testOpen()
 
 
-def safe_3():
+def test_safe_3():
 
     tst = gdaltest.GDALTest(
         'SAFE',
@@ -61,7 +61,7 @@ def safe_3():
     return tst.testOpen()
 
 
-def safe_4():
+def test_safe_4():
 
     tst = gdaltest.GDALTest(
         'SAFE',
@@ -69,7 +69,7 @@ def safe_4():
     return tst.testOpen()
 
 
-def safe_5():
+def test_safe_5():
 
     tst = gdaltest.GDALTest(
         'SAFE',
@@ -78,11 +78,11 @@ def safe_5():
 
 
 gdaltest_list = [
-    safe_1,
-    safe_2,
-    safe_3,
-    safe_4,
-    safe_5]
+    test_safe_1,
+    test_safe_2,
+    test_safe_3,
+    test_safe_4,
+    test_safe_5]
 
 if __name__ == '__main__':
 
diff --git a/autotest/gdrivers/saga.py b/autotest/gdrivers/saga.py
index 2c426ae2efa0..979c953b9885 100755
--- a/autotest/gdrivers/saga.py
+++ b/autotest/gdrivers/saga.py
@@ -40,7 +40,7 @@
 # Test opening
 
 
-def saga_1():
+def test_saga_1():
 
     tst = gdaltest.GDALTest('SAGA', '4byteFloat.sdat', 1, 108)
     return tst.testOpen(check_prj="""PROJCS["NAD_1927_UTM_Zone_11N",
@@ -61,7 +61,7 @@ def saga_1():
 # Test copying a reference sample with CreateCopy()
 
 
-def saga_2():
+def test_saga_2():
 
     tst = gdaltest.GDALTest('SAGA', '4byteFloat.sdat', 1, 108)
     return tst.testCreateCopy(new_filename='tmp/createcopy.sdat', check_srs=True)
@@ -70,7 +70,7 @@ def saga_2():
 # Test copying a reference sample with Create()
 
 
-def saga_3():
+def test_saga_3():
 
     tst = gdaltest.GDALTest('SAGA', '4byteFloat.sdat', 1, 108)
     return tst.testCreate(new_filename='tmp/copy.sdat', out_bands=1)
@@ -79,7 +79,7 @@ def saga_3():
 # Test CreateCopy() for various data types
 
 
-def saga_4():
+def test_saga_4():
 
     src_files = ['byte.tif',
                  'int16.tif',
@@ -105,7 +105,7 @@ def saga_4():
 # Test Create() for various data types
 
 
-def saga_5():
+def test_saga_5():
 
     src_files = ['byte.tif',
                  'int16.tif',
@@ -131,7 +131,7 @@ def saga_5():
 # Test creating empty datasets and check that nodata values are properly written
 
 
-def saga_6():
+def test_saga_6():
 
     gdal_types = [gdal.GDT_Byte,
                   gdal.GDT_Int16,
@@ -180,7 +180,7 @@ def saga_6():
 # Test /vsimem
 
 
-def saga_7():
+def test_saga_7():
 
     tst = gdaltest.GDALTest('SAGA', '4byteFloat.sdat', 1, 108)
     return tst.testCreateCopy(new_filename='/vsimem/createcopy.sdat')
@@ -189,7 +189,7 @@ def saga_7():
 ###############################################################################
 # Test zipped saga grid (.sg-grd-z)
 
-def saga_8():
+def test_saga_8():
     tst = gdaltest.GDALTest('SAGA', '4byteFloat.sg-grd-z', 1, 108)
     return tst.testOpen(check_prj="""PROJCS["NAD_1927_UTM_Zone_11N",
     GEOGCS["GCS_North_American_1927",
@@ -207,14 +207,14 @@ def saga_8():
 
 
 gdaltest_list = [
-    saga_1,
-    saga_2,
-    saga_3,
-    saga_4,
-    saga_5,
-    saga_6,
-    saga_7,
-    saga_8]
+    test_saga_1,
+    test_saga_2,
+    test_saga_3,
+    test_saga_4,
+    test_saga_5,
+    test_saga_6,
+    test_saga_7,
+    test_saga_8]
 
 if __name__ == '__main__':
 
diff --git a/autotest/gdrivers/sar_ceos.py b/autotest/gdrivers/sar_ceos.py
index 94669b3d999e..67e22f007720 100755
--- a/autotest/gdrivers/sar_ceos.py
+++ b/autotest/gdrivers/sar_ceos.py
@@ -36,7 +36,7 @@
 ###############################################################################
 
 
-def sar_ceos_online_1():
+def test_sar_ceos_online_1():
     list_files = ['ottawa_patch.img',
                   'ottawa_patch.led',
                   'ottawa_patch.nul',
@@ -52,7 +52,7 @@ def sar_ceos_online_1():
 
 
 gdaltest_list = [
-    sar_ceos_online_1]
+    test_sar_ceos_online_1]
 
 if __name__ == '__main__':
 
diff --git a/autotest/gdrivers/sdts.py b/autotest/gdrivers/sdts.py
index dcf63a9875b2..0c11b17f6c18 100755
--- a/autotest/gdrivers/sdts.py
+++ b/autotest/gdrivers/sdts.py
@@ -40,7 +40,7 @@
 # http://thor-f5.er.usgs.gov/sdts/datasets/raster/dem/dem_oct_2001/1107834.dem.sdts.tar.gz
 
 
-def sdts_1():
+def test_sdts_1():
 
     tst = gdaltest.GDALTest('SDTS', 'STDS_1107834_truncated/1107CATD.DDF', 1, 61672)
     srs = osr.SpatialReference()
@@ -60,7 +60,7 @@ def sdts_1():
     return 'success'
 
 
-gdaltest_list = [sdts_1]
+gdaltest_list = [test_sdts_1]
 
 if __name__ == '__main__':
 
diff --git a/autotest/gdrivers/sentinel2.py b/autotest/gdrivers/sentinel2.py
index 3625e405b0e6..7f29ccf547c4 100755
--- a/autotest/gdrivers/sentinel2.py
+++ b/autotest/gdrivers/sentinel2.py
@@ -40,7 +40,7 @@
 # Test opening a L1C product
 
 
-def sentinel2_l1c_1():
+def test_sentinel2_l1c_1():
 
     filename_xml = 'data/fake_sentinel2_l1c/S2A_OPER_PRD_MSIL1C.SAFE/S2A_OPER_MTD_SAFL1C.xml'
     gdal.ErrorReset()
@@ -141,7 +141,7 @@ def sentinel2_l1c_1():
 # Test opening a L1C subdataset on the 10m bands
 
 
-def sentinel2_l1c_2():
+def test_sentinel2_l1c_2():
 
     filename_xml = 'data/fake_sentinel2_l1c/S2A_OPER_PRD_MSIL1C.SAFE/S2A_OPER_MTD_SAFL1C.xml'
     gdal.ErrorReset()
@@ -281,7 +281,7 @@ def sentinel2_l1c_2():
 # Test opening a L1C subdataset on the 60m bands and enabling alpha band
 
 
-def sentinel2_l1c_3():
+def test_sentinel2_l1c_3():
 
     filename_xml = 'data/fake_sentinel2_l1c/S2A_OPER_PRD_MSIL1C.SAFE/S2A_OPER_MTD_SAFL1C.xml'
     ds = gdal.OpenEx('SENTINEL2_L1C:%s:60m:EPSG_32632' % filename_xml, open_options=['ALPHA=YES'])
@@ -313,7 +313,7 @@ def sentinel2_l1c_3():
 # Test opening a L1C subdataset on the PREVIEW bands
 
 
-def sentinel2_l1c_4():
+def test_sentinel2_l1c_4():
 
     filename_xml = 'data/fake_sentinel2_l1c/S2A_OPER_PRD_MSIL1C.SAFE/S2A_OPER_MTD_SAFL1C.xml'
     ds = gdal.OpenEx('SENTINEL2_L1C:%s:PREVIEW:EPSG_32632' % filename_xml)
@@ -348,7 +348,7 @@ def sentinel2_l1c_4():
 # Test opening invalid XML files
 
 
-def sentinel2_l1c_5():
+def test_sentinel2_l1c_5():
 
     # Invalid XML
     gdal.FileFromMemBuffer('/vsimem/test.xml',
@@ -541,7 +541,7 @@ def sentinel2_l1c_5():
 # Windows specific test to test support for long filenames
 
 
-def sentinel2_l1c_6():
+def test_sentinel2_l1c_6():
 
     if sys.platform != 'win32':
         return 'skip'
@@ -568,7 +568,7 @@ def sentinel2_l1c_6():
 # Test with a real JP2 tile
 
 
-def sentinel2_l1c_7():
+def test_sentinel2_l1c_7():
 
     gdal.FileFromMemBuffer('/vsimem/test.xml',
                            """<n1:Level-1C_User_Product xmlns:n1="https://psd-13.sentinel2.eo.esa.int/PSD/User_Product_Level-1C.xsd" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://pdgs.s2.esa.int/PSD/User_Product_Level-1C.xsd S2_User_Product_Level-1C_Metadata.xsd">
@@ -643,7 +643,7 @@ def sentinel2_l1c_7():
 # Test opening a L1C tile
 
 
-def sentinel2_l1c_tile_1():
+def test_sentinel2_l1c_tile_1():
 
     filename_xml = 'data/fake_sentinel2_l1c/S2A_OPER_PRD_MSIL1C.SAFE/GRANULE/S2A_OPER_MSI_L1C_T32TQR_N01.03/S2A_OPER_MTD_L1C_T32TQR.xml'
     gdal.ErrorReset()
@@ -732,7 +732,7 @@ def sentinel2_l1c_tile_1():
 # Test opening a L1C tile without main MTD file
 
 
-def sentinel2_l1c_tile_2():
+def test_sentinel2_l1c_tile_2():
 
     filename_xml = 'data/fake_sentinel2_l1c/S2A_OPER_PRD_MSIL1C.SAFE/GRANULE/S2A_OPER_MSI_L1C_T32TQR_N01.03/S2A_OPER_MTD_L1C_T32TQR.xml'
     gdal.ErrorReset()
@@ -777,7 +777,7 @@ def sentinel2_l1c_tile_2():
 # Test opening a L1C tile subdataset on the 10m bands
 
 
-def sentinel2_l1c_tile_3():
+def test_sentinel2_l1c_tile_3():
 
     filename_xml = 'data/fake_sentinel2_l1c/S2A_OPER_PRD_MSIL1C.SAFE/GRANULE/S2A_OPER_MSI_L1C_T32TQR_N01.03/S2A_OPER_MTD_L1C_T32TQR.xml'
     gdal.ErrorReset()
@@ -914,7 +914,7 @@ def sentinel2_l1c_tile_3():
 # Test opening a L1C tile subdataset on the 10m bands without main MTD file
 
 
-def sentinel2_l1c_tile_4():
+def test_sentinel2_l1c_tile_4():
 
     filename_xml = 'data/fake_sentinel2_l1c/S2A_OPER_PRD_MSIL1C.SAFE/GRANULE/S2A_OPER_MSI_L1C_T32TQR_N01.03/S2A_OPER_MTD_L1C_T32TQR.xml'
     gdal.ErrorReset()
@@ -1012,7 +1012,7 @@ def sentinel2_l1c_tile_4():
 # Test opening a L1C tile subdataset on the preview bands
 
 
-def sentinel2_l1c_tile_5():
+def test_sentinel2_l1c_tile_5():
 
     filename_xml = 'data/fake_sentinel2_l1c/S2A_OPER_PRD_MSIL1C.SAFE/GRANULE/S2A_OPER_MSI_L1C_T32TQR_N01.03/S2A_OPER_MTD_L1C_T32TQR.xml'
     gdal.ErrorReset()
@@ -1060,7 +1060,7 @@ def sentinel2_l1c_tile_5():
 # Test opening invalid XML files
 
 
-def sentinel2_l1c_tile_6():
+def test_sentinel2_l1c_tile_6():
 
     # Invalid XML
     gdal.FileFromMemBuffer('/vsimem/test.xml',
@@ -1122,7 +1122,7 @@ def sentinel2_l1c_tile_6():
 # Test opening a L1B product
 
 
-def sentinel2_l1b_1():
+def test_sentinel2_l1b_1():
 
     filename_xml = 'data/fake_sentinel2_l1b/S2B_OPER_PRD_MSIL1B.SAFE/S2B_OPER_MTD_SAFL1B.xml'
     gdal.ErrorReset()
@@ -1204,7 +1204,7 @@ def sentinel2_l1b_1():
 # Test opening a L1B granule
 
 
-def sentinel2_l1b_2():
+def test_sentinel2_l1b_2():
 
     filename_xml = 'data/fake_sentinel2_l1b/S2B_OPER_PRD_MSIL1B.SAFE/GRANULE/S2B_OPER_MSI_L1B_N01.03/S2B_OPER_MTD_L1B.xml'
     gdal.ErrorReset()
@@ -1290,7 +1290,7 @@ def sentinel2_l1b_2():
 # Test opening a L1B subdataset
 
 
-def sentinel2_l1b_3():
+def test_sentinel2_l1b_3():
 
     gdal.ErrorReset()
     ds = gdal.Open('SENTINEL2_L1B:data/fake_sentinel2_l1b/S2B_OPER_PRD_MSIL1B.SAFE/GRANULE/S2B_OPER_MSI_L1B_N01.03/S2B_OPER_MTD_L1B.xml:60m')
@@ -1448,7 +1448,7 @@ def sentinel2_l1b_3():
 # Test opening a L1B granule (with missing tile, without any ../../main_mtd.xml)
 
 
-def sentinel2_l1b_4():
+def test_sentinel2_l1b_4():
 
     gdal.FileFromMemBuffer('/vsimem/foo/S2B_PROD_MTD_foo.xml',
                            """<n1:Level-1B_User_Product xmlns:n1="https://psd-13.sentinel2.eo.esa.int/PSD/User_Product_Level-1B.xsd" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://pdgs.s2.esa.int/PSD/User_Product_Level-1B.xsd S2_User_Product_Level-1B_Metadata.xsd">
@@ -1560,7 +1560,7 @@ def sentinel2_l1b_4():
 # Test opening invalid XML files
 
 
-def sentinel2_l1b_5():
+def test_sentinel2_l1b_5():
 
     # Invalid XML
     gdal.FileFromMemBuffer('/vsimem/test.xml',
@@ -1755,7 +1755,7 @@ def sentinel2_l1b_5():
 # Test opening a L2A product
 
 
-def sentinel2_l2a_1():
+def test_sentinel2_l2a_1():
 
     filename_xml = 'data/fake_sentinel2_l2a/S2A_USER_PRD_MSIL2A.SAFE/S2A_USER_MTD_SAFL2A.xml'
     gdal.ErrorReset()
@@ -1864,7 +1864,7 @@ def sentinel2_l2a_1():
 # Test opening a L21 subdataset on the 60m bands
 
 
-def sentinel2_l2a_2():
+def test_sentinel2_l2a_2():
 
     filename_xml = 'data/fake_sentinel2_l2a/S2A_USER_PRD_MSIL2A.SAFE/S2A_USER_MTD_SAFL2A.xml'
     gdal.ErrorReset()
@@ -2033,7 +2033,7 @@ def sentinel2_l2a_2():
 # Test opening invalid XML files
 
 
-def sentinel2_l2a_3():
+def test_sentinel2_l2a_3():
 
     # Invalid XML
     gdal.FileFromMemBuffer('/vsimem/test.xml',
@@ -2113,7 +2113,7 @@ def sentinel2_l2a_3():
 # Test opening a L2A MSIL2A product
 
 
-def sentinel2_l2a_4():
+def test_sentinel2_l2a_4():
 
     filename_xml = 'data/fake_sentinel2_l2a_MSIL2A/S2A_MSIL2A_20180818T094031_N0208_R036_T34VFJ_20180818T120345.SAFE/MTD_MSIL2A.xml'
     gdal.ErrorReset()
@@ -2235,7 +2235,7 @@ def sentinel2_l2a_4():
 # Test opening a L2A MSIL2A subdataset on the 60m bands
 
 
-def sentinel2_l2a_5():
+def test_sentinel2_l2a_5():
 
     filename_xml = 'data/fake_sentinel2_l2a_MSIL2A/S2A_MSIL2A_20180818T094031_N0208_R036_T34VFJ_20180818T120345.SAFE/MTD_MSIL2A.xml'
     gdal.ErrorReset()
@@ -2362,7 +2362,7 @@ def sentinel2_l2a_5():
 # Test opening a L2A MSIL2Ap product
 
 
-def sentinel2_l2a_6():
+def test_sentinel2_l2a_6():
 
     filename_xml = 'data/fake_sentinel2_l2a_MSIL2Ap/S2A_MSIL2A_20170823T094031_N0205_R036_T34VFJ_20170823T094252.SAFE/MTD_MSIL2A.xml'
     gdal.ErrorReset()
@@ -2489,7 +2489,7 @@ def sentinel2_l2a_6():
 # Test opening a L2A MSIL2Ap subdataset on the 60m bands
 
 
-def sentinel2_l2a_7():
+def test_sentinel2_l2a_7():
 
     filename_xml = 'data/fake_sentinel2_l2a_MSIL2Ap/S2A_MSIL2A_20170823T094031_N0205_R036_T34VFJ_20170823T094252.SAFE/MTD_MSIL2A.xml'
     gdal.ErrorReset()
@@ -2622,7 +2622,7 @@ def sentinel2_l2a_7():
 # Test opening a L1C Safe Compact product
 
 
-def sentinel2_l1c_safe_compact_1():
+def test_sentinel2_l1c_safe_compact_1():
 
     filename_xml = 'data/fake_sentinel2_l1c_safecompact/S2A_MSIL1C_test.SAFE/MTD_MSIL1C.xml'
     gdal.ErrorReset()
@@ -2723,7 +2723,7 @@ def sentinel2_l1c_safe_compact_1():
 # Test opening a L1C Safe Compact subdataset on the 10m bands
 
 
-def sentinel2_l1c_safe_compact_2():
+def test_sentinel2_l1c_safe_compact_2():
 
     filename_xml = 'data/fake_sentinel2_l1c_safecompact/S2A_MSIL1C_test.SAFE/MTD_MSIL1C.xml'
     gdal.ErrorReset()
@@ -2857,7 +2857,7 @@ def sentinel2_l1c_safe_compact_2():
 # Test opening a L1C subdataset on the TCI bands
 
 
-def sentinel2_l1c_safe_compact_3():
+def test_sentinel2_l1c_safe_compact_3():
 
     filename_xml = 'data/fake_sentinel2_l1c_safecompact/S2A_MSIL1C_test.SAFE/MTD_MSIL1C.xml'
     ds = gdal.OpenEx('SENTINEL2_L1C:%s:TCI:EPSG_32632' % filename_xml)
@@ -2890,34 +2890,34 @@ def sentinel2_l1c_safe_compact_3():
 
 
 gdaltest_list = [
-    sentinel2_l1c_1,
-    sentinel2_l1c_2,
-    sentinel2_l1c_3,
-    sentinel2_l1c_4,
-    sentinel2_l1c_5,
-    sentinel2_l1c_6,
-    sentinel2_l1c_7,
-    sentinel2_l1c_tile_1,
-    sentinel2_l1c_tile_2,
-    sentinel2_l1c_tile_3,
-    sentinel2_l1c_tile_4,
-    sentinel2_l1c_tile_5,
-    sentinel2_l1c_tile_6,
-    sentinel2_l1b_1,
-    sentinel2_l1b_2,
-    sentinel2_l1b_3,
-    sentinel2_l1b_4,
-    sentinel2_l1b_5,
-    sentinel2_l2a_1,
-    sentinel2_l2a_2,
-    sentinel2_l2a_3,
-    sentinel2_l2a_4,
-    sentinel2_l2a_5,
-    sentinel2_l2a_6,
-    sentinel2_l2a_7,
-    sentinel2_l1c_safe_compact_1,
-    sentinel2_l1c_safe_compact_2,
-    sentinel2_l1c_safe_compact_3
+    test_sentinel2_l1c_1,
+    test_sentinel2_l1c_2,
+    test_sentinel2_l1c_3,
+    test_sentinel2_l1c_4,
+    test_sentinel2_l1c_5,
+    test_sentinel2_l1c_6,
+    test_sentinel2_l1c_7,
+    test_sentinel2_l1c_tile_1,
+    test_sentinel2_l1c_tile_2,
+    test_sentinel2_l1c_tile_3,
+    test_sentinel2_l1c_tile_4,
+    test_sentinel2_l1c_tile_5,
+    test_sentinel2_l1c_tile_6,
+    test_sentinel2_l1b_1,
+    test_sentinel2_l1b_2,
+    test_sentinel2_l1b_3,
+    test_sentinel2_l1b_4,
+    test_sentinel2_l1b_5,
+    test_sentinel2_l2a_1,
+    test_sentinel2_l2a_2,
+    test_sentinel2_l2a_3,
+    test_sentinel2_l2a_4,
+    test_sentinel2_l2a_5,
+    test_sentinel2_l2a_6,
+    test_sentinel2_l2a_7,
+    test_sentinel2_l1c_safe_compact_1,
+    test_sentinel2_l1c_safe_compact_2,
+    test_sentinel2_l1c_safe_compact_3
 ]
 
 if __name__ == '__main__':
diff --git a/autotest/gdrivers/sgi.py b/autotest/gdrivers/sgi.py
index ccdb45fcf40b..fa58c02f93e7 100755
--- a/autotest/gdrivers/sgi.py
+++ b/autotest/gdrivers/sgi.py
@@ -37,7 +37,7 @@
 # Read existing simple 1 band SGI file.
 
 
-def sgi_1():
+def test_sgi_1():
 
     tst = gdaltest.GDALTest('SGI', 'byte.sgi', 1, 4672)
 
@@ -47,7 +47,7 @@ def sgi_1():
 # Write Test grayscale
 
 
-def sgi_2():
+def test_sgi_2():
 
     tst = gdaltest.GDALTest('SGI', 'byte.tif', 1, 4672)
 
@@ -57,7 +57,7 @@ def sgi_2():
 # Write Test rgb
 
 
-def sgi_3():
+def test_sgi_3():
 
     tst = gdaltest.GDALTest('SGI', 'rgbsmall.tif', 2, 21053)
 
@@ -65,9 +65,9 @@ def sgi_3():
 
 
 gdaltest_list = [
-    sgi_1,
-    sgi_2,
-    sgi_3,
+    test_sgi_1,
+    test_sgi_2,
+    test_sgi_3,
 ]
 
 
diff --git a/autotest/gdrivers/sigdem.py b/autotest/gdrivers/sigdem.py
index b3cac67a20d2..2f8ecc40bc7f 100755
--- a/autotest/gdrivers/sigdem.py
+++ b/autotest/gdrivers/sigdem.py
@@ -38,7 +38,7 @@
 # Create simple copy and check.
 
 
-def sigdem_copy_check_prj():
+def test_sigdem_copy_check_prj():
 
     tst = gdaltest.GDALTest('SIGDEM', 'byte.tif', 1, 4672)
 
@@ -49,7 +49,7 @@ def sigdem_copy_check_prj():
 ###############################################################################
 # Verify writing files with non-square pixels.
 
-def sigdem_non_square():
+def test_sigdem_non_square():
 
     tst = gdaltest.GDALTest('SIGDEM', 'nonsquare_nad27_utm11.vrt', 1, 12481)
 
@@ -60,7 +60,7 @@ def sigdem_non_square():
 ###############################################################################
 # Test creating an in memory copy.
 
-def sigdem_in_memory():
+def test_sigdem_in_memory():
 
     tst = gdaltest.GDALTest('SIGDEM', 'byte.tif', 1, 4672)
 
@@ -71,9 +71,9 @@ def sigdem_in_memory():
 
 
 gdaltest_list = [
-    sigdem_copy_check_prj,
-    sigdem_non_square,
-    sigdem_in_memory
+    test_sigdem_copy_check_prj,
+    test_sigdem_non_square,
+    test_sigdem_in_memory
 ]
 
 if __name__ == '__main__':
diff --git a/autotest/gdrivers/snodas.py b/autotest/gdrivers/snodas.py
index 2a0d3b68c753..f86916f5450f 100755
--- a/autotest/gdrivers/snodas.py
+++ b/autotest/gdrivers/snodas.py
@@ -38,7 +38,7 @@
 # Test a fake SNODAS dataset
 
 
-def snodas_1():
+def test_snodas_1():
 
     tst = gdaltest.GDALTest('SNODAS', 'fake_snodas.hdr', 1, 0)
     expected_gt = [-124.733749999995, 0.0083333333333330643, 0.0, 52.874583333331302, 0.0, -0.0083333333333330054]
@@ -72,7 +72,7 @@ def snodas_1():
 
 
 gdaltest_list = [
-    snodas_1]
+    test_snodas_1]
 
 if __name__ == '__main__':
 
diff --git a/autotest/gdrivers/srp.py b/autotest/gdrivers/srp.py
index dabb996f103d..e0b94cb2297a 100755
--- a/autotest/gdrivers/srp.py
+++ b/autotest/gdrivers/srp.py
@@ -41,7 +41,7 @@
 # Read USRP dataset with PCB=0
 
 
-def srp_1(filename='USRP_PCB0/FKUSRP01.IMG'):
+def test_srp_1(filename='USRP_PCB0/FKUSRP01.IMG'):
 
     srs = osr.SpatialReference()
     srs.ImportFromEPSG(32600 + 17)
@@ -94,21 +94,21 @@ def srp_1(filename='USRP_PCB0/FKUSRP01.IMG'):
 # Read USRP dataset with PCB=4
 
 
-def srp_2():
-    return srp_1('USRP_PCB4/FKUSRP01.IMG')
+def test_srp_2():
+    return test_srp_1('USRP_PCB4/FKUSRP01.IMG')
 
 ###############################################################################
 # Read USRP dataset with PCB=8
 
 
-def srp_3():
-    return srp_1('USRP_PCB8/FKUSRP01.IMG')
+def test_srp_3():
+    return test_srp_1('USRP_PCB8/FKUSRP01.IMG')
 
 ###############################################################################
 # Read from TRANSH01.THF file.
 
 
-def srp_4():
+def test_srp_4():
 
     tst = gdaltest.GDALTest('SRP', 'USRP_PCB0/TRANSH01.THF', 1, 24576)
     ret = tst.testOpen()
@@ -118,7 +118,7 @@ def srp_4():
 # Read from TRANSH01.THF file (without "optimization" for single GEN in THF)
 
 
-def srp_5():
+def test_srp_5():
 
     gdal.SetConfigOption('SRP_SINGLE_GEN_IN_THF_AS_DATASET', 'FALSE')
     ds = gdal.Open('data/USRP_PCB0/TRANSH01.THF')
@@ -154,7 +154,7 @@ def srp_5():
 # Read with subdataset syntax
 
 
-def srp_6():
+def test_srp_6():
 
     tst = gdaltest.GDALTest('SRP', 'SRP:data/USRP_PCB4/FKUSRP01.GEN,data/USRP_PCB4/FKUSRP01.IMG', 1, 24576, filename_absolute=1)
     return tst.testOpen()
@@ -163,7 +163,7 @@ def srp_6():
 ###############################################################################
 # Cleanup
 
-def srp_cleanup():
+def test_srp_cleanup():
 
     # FIXME ?
     os.unlink('data/USRP_PCB0/TRANSH01.THF.aux.xml')
@@ -173,13 +173,13 @@ def srp_cleanup():
 
 
 gdaltest_list = [
-    srp_1,
-    srp_2,
-    srp_3,
-    srp_4,
-    srp_5,
-    srp_6,
-    srp_cleanup
+    test_srp_1,
+    test_srp_2,
+    test_srp_3,
+    test_srp_4,
+    test_srp_5,
+    test_srp_6,
+    test_srp_cleanup
 ]
 
 if __name__ == '__main__':
diff --git a/autotest/gdrivers/srtmhgt.py b/autotest/gdrivers/srtmhgt.py
index f858358c298b..1042ff145e8d 100755
--- a/autotest/gdrivers/srtmhgt.py
+++ b/autotest/gdrivers/srtmhgt.py
@@ -40,7 +40,7 @@
 ###############################################################################
 # Test a SRTMHGT Level 1 (made from a DTED Level 0)
 
-def srtmhgt_1():
+def test_srtmhgt_1():
 
     ds = gdal.Open('data/n43.dt0')
 
@@ -79,7 +79,7 @@ def srtmhgt_1():
 ###############################################################################
 # Test creating an in memory copy.
 
-def srtmhgt_2():
+def test_srtmhgt_2():
 
     ds = gdal.Open('tmp/n43w080.hgt')
     driver = gdal.GetDriverByName("SRTMHGT")
@@ -110,7 +110,7 @@ def srtmhgt_2():
 # Test reading from a .hgt.zip file
 
 
-def srtmhgt_3():
+def test_srtmhgt_3():
 
     ds = gdal.Open('tmp/n43w080.hgt')
     driver = gdal.GetDriverByName("SRTMHGT")
@@ -131,7 +131,7 @@ def srtmhgt_3():
 # Test reading from a .SRTMSWBD.raw.zip file (GRASS #3246)
 
 
-def srtmhgt_4():
+def test_srtmhgt_4():
 
     f = gdal.VSIFOpenL('/vsizip//vsimem/N43W080.SRTMSWBD.raw.zip/N43W080.raw', 'wb')
     if f is None:
@@ -157,7 +157,7 @@ def srtmhgt_4():
 # Cleanup.
 
 
-def srtmhgt_cleanup():
+def test_srtmhgt_cleanup():
     try:
         gdal.GetDriverByName("SRTMHGT").Delete('tmp/n43w080.hgt')
         gdal.GetDriverByName("SRTMHGT").Delete('/vsimem/n43w080.hgt')
@@ -169,11 +169,11 @@ def srtmhgt_cleanup():
 
 
 gdaltest_list = [
-    srtmhgt_1,
-    srtmhgt_2,
-    srtmhgt_3,
-    srtmhgt_4,
-    srtmhgt_cleanup
+    test_srtmhgt_1,
+    test_srtmhgt_2,
+    test_srtmhgt_3,
+    test_srtmhgt_4,
+    test_srtmhgt_cleanup
 ]
 
 
diff --git a/autotest/gdrivers/terragen.py b/autotest/gdrivers/terragen.py
index 5133f5126335..d2c737735730 100755
--- a/autotest/gdrivers/terragen.py
+++ b/autotest/gdrivers/terragen.py
@@ -36,7 +36,7 @@
 ###############################################################################
 
 
-def terragen_1():
+def test_terragen_1():
 
     tst = gdaltest.GDALTest('terragen', 'float32.ter', 1, 1128)
 
@@ -46,7 +46,7 @@ def terragen_1():
 # Write
 
 
-def terragen_2():
+def test_terragen_2():
 
     gdal.Translate('/vsimem/out.ter', 'data/float32.tif', options='-of TERRAGEN -co MINUSERPIXELVALUE=74 -co MAXUSERPIXELVALUE=255')
     gdal.Translate('/vsimem/out.tif', '/vsimem/out.ter', options='-unscale')
@@ -60,8 +60,8 @@ def terragen_2():
 
 
 gdaltest_list = [
-    terragen_1,
-    terragen_2
+    test_terragen_1,
+    test_terragen_2
 ]
 
 
diff --git a/autotest/gdrivers/tiff_profile.py b/autotest/gdrivers/tiff_profile.py
index 8279108ce530..983aed76ffcd 100755
--- a/autotest/gdrivers/tiff_profile.py
+++ b/autotest/gdrivers/tiff_profile.py
@@ -42,7 +42,7 @@
 ###############################################################################
 # Test writing and reading of ICC profile in Create() options
 
-def tiff_write_icc():
+def test_tiff_write_icc():
 
     f = open('data/sRGB.icc', 'rb')
     data = f.read()
@@ -110,7 +110,7 @@ def tiff_write_icc():
 # Test writing and reading of ICC profile in CreateCopy()
 
 
-def tiff_copy_icc():
+def test_tiff_copy_icc():
 
     f = open('data/sRGB.icc', 'rb')
     data = f.read()
@@ -152,7 +152,7 @@ def tiff_copy_icc():
 # Test writing and reading of ICC profile in CreateCopy() options
 
 
-def tiff_copy_options_icc():
+def test_tiff_copy_options_icc():
 
     f = open('data/sRGB.icc', 'rb')
     data = f.read()
@@ -198,7 +198,7 @@ def cvtTuple2String(t):
 # Test writing and reading of ICC colorimetric data from options
 
 
-def tiff_copy_options_colorimetric_data():
+def test_tiff_copy_options_colorimetric_data():
     # sRGB values
     source_primaries = [(0.64, 0.33, 1.0), (0.3, 0.6, 1.0), (0.15, 0.06, 1.0)]
     source_whitepoint = (0.31271, 0.32902, 1.0)
@@ -290,7 +290,7 @@ def tiff_copy_options_colorimetric_data():
 # Test writing and reading of ICC colorimetric data in the file
 
 
-def tiff_copy_colorimetric_data():
+def test_tiff_copy_colorimetric_data():
     # sRGB values
     source_primaries = [(0.64, 0.33, 1.0), (0.3, 0.6, 1.0), (0.15, 0.06, 1.0)]
     source_whitepoint = (0.31271, 0.32902, 1.0)
@@ -385,7 +385,7 @@ def tiff_copy_colorimetric_data():
 # Test updating ICC profile
 
 
-def tiff_update_icc():
+def test_tiff_update_icc():
 
     f = open('data/sRGB.icc', 'rb')
     data = f.read()
@@ -426,7 +426,7 @@ def tiff_update_icc():
 # Test updating colorimetric options
 
 
-def tiff_update_colorimetric():
+def test_tiff_update_colorimetric():
     source_primaries = [(0.234, 0.555, 1.0), (0.2, 0, 1), (2, 3.5, 1)]
     source_whitepoint = (0.31271, 0.32902, 1.0)
     tifftag_transferfunction = (list(range(1, 256 * 4, 4)), list(range(2, 256 * 4 + 1, 4)), list(range(3, 256 * 4 + 2, 4)))
@@ -515,13 +515,13 @@ def tiff_update_colorimetric():
 
 
 gdaltest_list = [
-    tiff_write_icc,
-    tiff_copy_icc,
-    tiff_copy_options_icc,
-    tiff_copy_options_colorimetric_data,
-    tiff_copy_colorimetric_data,
-    tiff_update_icc,
-    tiff_update_colorimetric,
+    test_tiff_write_icc,
+    test_tiff_copy_icc,
+    test_tiff_copy_options_icc,
+    test_tiff_copy_options_colorimetric_data,
+    test_tiff_copy_colorimetric_data,
+    test_tiff_update_icc,
+    test_tiff_update_colorimetric,
 ]
 
 if __name__ == '__main__':
diff --git a/autotest/gdrivers/til.py b/autotest/gdrivers/til.py
index 9c0be4774454..549863473f71 100755
--- a/autotest/gdrivers/til.py
+++ b/autotest/gdrivers/til.py
@@ -39,7 +39,7 @@
 # Test a fake TIL dataset
 
 
-def til_1():
+def test_til_1():
 
     tst = gdaltest.GDALTest('TIL', 'testtil.til', 1, 4672)
     return tst.testOpen()
@@ -48,7 +48,7 @@ def til_1():
 # Check GetFileList() result (#4018) & IMD
 
 
-def til_2():
+def test_til_2():
 
     try:
         os.remove('data/testtil.til.aux.xml')
@@ -88,7 +88,7 @@ def til_2():
 # Check GetFileList() & XML
 
 
-def til_3():
+def test_til_3():
 
     try:
         os.remove('data/testtil.til.aux.xml')
@@ -126,9 +126,9 @@ def til_3():
 
 
 gdaltest_list = [
-    til_1,
-    til_2,
-    til_3]
+    test_til_1,
+    test_til_2,
+    test_til_3]
 
 if __name__ == '__main__':
 
diff --git a/autotest/gdrivers/usgsdem.py b/autotest/gdrivers/usgsdem.py
index 988fb715b0ca..b95cf3317e71 100755
--- a/autotest/gdrivers/usgsdem.py
+++ b/autotest/gdrivers/usgsdem.py
@@ -40,7 +40,7 @@
 # Test truncated version of http://download.osgeo.org/gdal/data/usgsdem/022gdeme
 
 
-def usgsdem_1():
+def test_usgsdem_1():
 
     tst = gdaltest.GDALTest('USGSDEM', '022gdeme_truncated', 1, 1583)
     srs = osr.SpatialReference()
@@ -52,7 +52,7 @@ def usgsdem_1():
 # Test truncated version of http://download.osgeo.org/gdal/data/usgsdem/114p01_0100_deme.dem
 
 
-def usgsdem_2():
+def test_usgsdem_2():
 
     tst = gdaltest.GDALTest('USGSDEM', '114p01_0100_deme_truncated.dem', 1, 53864)
     srs = osr.SpatialReference()
@@ -64,7 +64,7 @@ def usgsdem_2():
 # Test truncated version of file that triggered bug #2348
 
 
-def usgsdem_3():
+def test_usgsdem_3():
 
     tst = gdaltest.GDALTest('USGSDEM', '39079G6_truncated.dem', 1, 61424)
     srs = osr.SpatialReference()
@@ -77,7 +77,7 @@ def usgsdem_3():
 # Test CreateCopy()
 
 
-def usgsdem_4():
+def test_usgsdem_4():
 
     tst = gdaltest.GDALTest('USGSDEM', '39079G6_truncated.dem', 1, 61424,
                             options=['RESAMPLE=Nearest'])
@@ -87,7 +87,7 @@ def usgsdem_4():
 ###############################################################################
 # Test CreateCopy() without any creation options
 
-def usgsdem_5():
+def test_usgsdem_5():
 
     ds = gdal.Open('data/n43.dt0')
     ds2 = gdal.GetDriverByName('USGSDEM').CreateCopy('tmp/n43.dem', ds,
@@ -126,7 +126,7 @@ def usgsdem_5():
 # creation option and check that both files are binary identical.
 
 
-def usgsdem_6():
+def test_usgsdem_6():
 
     ds = gdal.Open('data/n43.dt0')
     ds2 = gdal.GetDriverByName('USGSDEM').CreateCopy('tmp/file_1.dem', ds,
@@ -161,7 +161,7 @@ def usgsdem_6():
 # Test CreateCopy() with CDED50K profile
 
 
-def usgsdem_7():
+def test_usgsdem_7():
 
     ds = gdal.Open('data/n43.dt0')
 
@@ -202,7 +202,7 @@ def usgsdem_7():
 # Undocumented format
 
 
-def usgsdem_8():
+def test_usgsdem_8():
 
     tst = gdaltest.GDALTest('USGSDEM', '39109h1_truncated.dem', 1, 39443)
     srs = osr.SpatialReference()
@@ -216,7 +216,7 @@ def usgsdem_8():
 # Old format
 
 
-def usgsdem_9():
+def test_usgsdem_9():
 
     tst = gdaltest.GDALTest('USGSDEM', '4619old_truncated.dem', 1, 10659)
     srs = osr.SpatialReference()
@@ -228,7 +228,7 @@ def usgsdem_9():
 # https://github.com/OSGeo/gdal/issues/583
 
 
-def usgsdem_with_extra_values_at_end_of_profile():
+def test_usgsdem_with_extra_values_at_end_of_profile():
 
     tst = gdaltest.GDALTest('USGSDEM', 'usgsdem_with_extra_values_at_end_of_profile.dem', 1, 56679)
     return tst.testOpen()
@@ -237,7 +237,7 @@ def usgsdem_with_extra_values_at_end_of_profile():
 # Like Novato.dem of https://trac.osgeo.org/gdal/ticket/4901
 
 
-def usgsdem_with_spaces_after_byte_864():
+def test_usgsdem_with_spaces_after_byte_864():
 
     tst = gdaltest.GDALTest('USGSDEM', 'usgsdem_with_spaces_after_byte_864.dem', 1, 61078)
     return tst.testOpen()
@@ -246,7 +246,7 @@ def usgsdem_with_spaces_after_byte_864():
 # Cleanup
 
 
-def usgsdem_cleanup():
+def test_usgsdem_cleanup():
 
     try:
         os.remove('tmp/n43.dem')
@@ -266,18 +266,18 @@ def usgsdem_cleanup():
 
 
 gdaltest_list = [
-    usgsdem_1,
-    usgsdem_2,
-    usgsdem_3,
-    usgsdem_4,
-    usgsdem_5,
-    usgsdem_6,
-    usgsdem_7,
-    usgsdem_8,
-    usgsdem_9,
-    usgsdem_with_extra_values_at_end_of_profile,
-    usgsdem_with_spaces_after_byte_864,
-    usgsdem_cleanup]
+    test_usgsdem_1,
+    test_usgsdem_2,
+    test_usgsdem_3,
+    test_usgsdem_4,
+    test_usgsdem_5,
+    test_usgsdem_6,
+    test_usgsdem_7,
+    test_usgsdem_8,
+    test_usgsdem_9,
+    test_usgsdem_with_extra_values_at_end_of_profile,
+    test_usgsdem_with_spaces_after_byte_864,
+    test_usgsdem_cleanup]
 
 if __name__ == '__main__':
 
diff --git a/autotest/gdrivers/vicar.py b/autotest/gdrivers/vicar.py
index 103134941074..cc7fc73027c2 100755
--- a/autotest/gdrivers/vicar.py
+++ b/autotest/gdrivers/vicar.py
@@ -39,7 +39,7 @@
 # Read truncated VICAR file
 
 
-def vicar_1():
+def test_vicar_1():
 
     tst = gdaltest.GDALTest('VICAR', 'test_vicar_truncated.bin', 1, 0)
     expected_prj = """PROJCS["SINUSOIDAL MARS",
@@ -97,7 +97,7 @@ def vicar_1():
 
 
 gdaltest_list = [
-    vicar_1]
+    test_vicar_1]
 
 if __name__ == '__main__':
 
diff --git a/autotest/gdrivers/vrtderived.py b/autotest/gdrivers/vrtderived.py
index 37228a4b5a12..c0918c6e8636 100755
--- a/autotest/gdrivers/vrtderived.py
+++ b/autotest/gdrivers/vrtderived.py
@@ -48,7 +48,7 @@ def _xmlsearch(root, nodetype, name):
 # Verify raster band subClass
 
 
-def vrtderived_1():
+def test_vrtderived_1():
     filename = 'tmp/derived.vrt'
     vrt_ds = gdal.GetDriverByName('VRT').Create(filename, 50, 50, 0)
 
@@ -98,7 +98,7 @@ def vrtderived_1():
 # Verify derived raster band pixel function type
 
 
-def vrtderived_2():
+def test_vrtderived_2():
     filename = 'tmp/derived.vrt'
     vrt_ds = gdal.GetDriverByName('VRT').Create(filename, 50, 50, 0)
 
@@ -152,7 +152,7 @@ def vrtderived_2():
 # Verify derived raster band transfer type
 
 
-def vrtderived_3():
+def test_vrtderived_3():
     filename = 'tmp/derived.vrt'
     vrt_ds = gdal.GetDriverByName('VRT').Create(filename, 50, 50, 0)
 
@@ -191,7 +191,7 @@ def vrtderived_3():
 # Check handling of invalid derived raster band transfer type
 
 
-def vrtderived_4():
+def test_vrtderived_4():
     filename = 'tmp/derived.vrt'
     vrt_ds = gdal.GetDriverByName('VRT').Create(filename, 50, 50, 0)
 
@@ -213,7 +213,7 @@ def vrtderived_4():
 # Check Python derived function with BufferRadius=1
 
 
-def vrtderived_5():
+def test_vrtderived_5():
 
     try:
         import numpy
@@ -236,7 +236,7 @@ def vrtderived_5():
 # Check Python derived function with BufferRadius=0 and no source
 
 
-def vrtderived_6():
+def test_vrtderived_6():
 
     try:
         import numpy
@@ -259,7 +259,7 @@ def vrtderived_6():
 # Check Python derived function with no started Python interpreter
 
 
-def vrtderived_7():
+def test_vrtderived_7():
 
     import test_cli_utilities
     if test_cli_utilities.get_gdalinfo_path() is None:
@@ -329,7 +329,7 @@ def vrtderived_7():
 # Check that GDAL_VRT_ENABLE_PYTHON=NO or undefined is honored
 
 
-def vrtderived_8():
+def test_vrtderived_8():
 
     try:
         import numpy
@@ -361,7 +361,7 @@ def vrtderived_8():
 # Check various failure modes with Python functions
 
 
-def vrtderived_9():
+def test_vrtderived_9():
 
     try:
         import numpy
@@ -681,7 +681,7 @@ def one_pix_func(in_ar, out_ar, xoff, yoff, xsize, ysize, raster_xsize, raster_y
     out_ar.fill(1)
 
 
-def vrtderived_10():
+def test_vrtderived_10():
 
     try:
         import numpy
@@ -757,7 +757,7 @@ def vrtderived_10():
 # Test serializing with python code
 
 
-def vrtderived_11():
+def test_vrtderived_11():
 
     try:
         import numpy
@@ -790,7 +790,7 @@ def vrtderived_11():
 # Test all data types with python code
 
 
-def vrtderived_12():
+def test_vrtderived_12():
 
     try:
         import numpy
@@ -853,7 +853,7 @@ def vrtderived_12():
 # Test translating a Python derived VRT
 
 
-def vrtderived_13():
+def test_vrtderived_13():
 
     try:
         import numpy
@@ -880,7 +880,7 @@ def vrtderived_13():
 # Test statistics functions
 
 
-def vrtderived_14():
+def test_vrtderived_14():
 
     try:
         import numpy
@@ -938,7 +938,7 @@ def vrtderived_15_worker(args_dict):
         ds.FlushCache()
 
 
-def vrtderived_15():
+def test_vrtderived_15():
 
     try:
         import numpy
@@ -971,7 +971,7 @@ def vrtderived_15():
 ###############################################################################
 # Cleanup.
 
-def vrtderived_cleanup():
+def test_vrtderived_cleanup():
     try:
         os.remove('tmp/derived.vrt')
     except OSError:
@@ -980,22 +980,22 @@ def vrtderived_cleanup():
 
 
 gdaltest_list = [
-    vrtderived_1,
-    vrtderived_2,
-    vrtderived_3,
-    vrtderived_4,
-    vrtderived_5,
-    vrtderived_6,
-    vrtderived_7,
-    vrtderived_8,
-    vrtderived_9,
-    vrtderived_10,
-    vrtderived_11,
-    vrtderived_12,
-    vrtderived_13,
-    vrtderived_14,
-    vrtderived_15,
-    vrtderived_cleanup,
+    test_vrtderived_1,
+    test_vrtderived_2,
+    test_vrtderived_3,
+    test_vrtderived_4,
+    test_vrtderived_5,
+    test_vrtderived_6,
+    test_vrtderived_7,
+    test_vrtderived_8,
+    test_vrtderived_9,
+    test_vrtderived_10,
+    test_vrtderived_11,
+    test_vrtderived_12,
+    test_vrtderived_13,
+    test_vrtderived_14,
+    test_vrtderived_15,
+    test_vrtderived_cleanup,
 ]
 
 if __name__ == '__main__':
diff --git a/autotest/gdrivers/vrtfilt.py b/autotest/gdrivers/vrtfilt.py
index bfe86d07f35c..5231015bd481 100755
--- a/autotest/gdrivers/vrtfilt.py
+++ b/autotest/gdrivers/vrtfilt.py
@@ -39,7 +39,7 @@
 # Verify simple 3x3 averaging filter.
 
 
-def vrtfilt_1():
+def test_vrtfilt_1():
 
     tst = gdaltest.GDALTest('VRT', 'avfilt.vrt', 1, 21890)
     return tst.testOpen()
@@ -48,7 +48,7 @@ def vrtfilt_1():
 # Verify simple 3x3 averaging filter (normalized) on a dataset with nodata
 
 
-def vrtfilt_2():
+def test_vrtfilt_2():
 
     ds = gdal.Open('data/test_vrt_filter_nodata.tif')
     checksum = ds.GetRasterBand(1).Checksum()
@@ -64,7 +64,7 @@ def vrtfilt_2():
 # Same result expected as for vrtfilt_1
 
 
-def vrtfilt_3():
+def test_vrtfilt_3():
 
     ds = gdal.OpenShared('data/rgbsmall.tif')
     vrt_ds = gdal.GetDriverByName('VRT').CreateCopy('', ds)
@@ -96,7 +96,7 @@ def vrtfilt_3():
 # Variant for SetMetadataItem('source_0', xml, 'vrt_sources')
 
 
-def vrtfilt_4():
+def test_vrtfilt_4():
 
     vrt_ds = gdal.GetDriverByName('VRT').Create('', 50, 50, 1)
 
@@ -126,7 +126,7 @@ def vrtfilt_4():
 # Variant for SetMetadata(md, 'vrt_sources')
 
 
-def vrtfilt_5():
+def test_vrtfilt_5():
 
     vrt_ds = gdal.GetDriverByName('VRT').Create('', 50, 50, 1)
 
@@ -154,7 +154,7 @@ def vrtfilt_5():
 # Verify separable Gaussian blur filter.
 
 
-def vrtfilt_6():
+def test_vrtfilt_6():
 
     tst = gdaltest.GDALTest('VRT', 'avfilt_1d.vrt', 1, 22377)
     return tst.testOpen()
@@ -163,18 +163,18 @@ def vrtfilt_6():
 # Cleanup.
 
 
-def vrtfilt_cleanup():
+def test_vrtfilt_cleanup():
     return 'success'
 
 
 gdaltest_list = [
-    vrtfilt_1,
-    vrtfilt_2,
-    vrtfilt_3,
-    vrtfilt_4,
-    vrtfilt_5,
-    vrtfilt_6,
-    vrtfilt_cleanup]
+    test_vrtfilt_1,
+    test_vrtfilt_2,
+    test_vrtfilt_3,
+    test_vrtfilt_4,
+    test_vrtfilt_5,
+    test_vrtfilt_6,
+    test_vrtfilt_cleanup]
 
 if __name__ == '__main__':
 
diff --git a/autotest/gdrivers/vrtlut.py b/autotest/gdrivers/vrtlut.py
index b135a89de082..269505fa6524 100755
--- a/autotest/gdrivers/vrtlut.py
+++ b/autotest/gdrivers/vrtlut.py
@@ -37,7 +37,7 @@
 # Simple test
 
 
-def vrtlut_1():
+def test_vrtlut_1():
 
     tst = gdaltest.GDALTest('VRT', 'byte_lut.vrt', 1, 4655)
     return tst.testOpen()
@@ -46,13 +46,13 @@ def vrtlut_1():
 ###############################################################################
 # Cleanup.
 
-def vrtlut_cleanup():
+def test_vrtlut_cleanup():
     return 'success'
 
 
 gdaltest_list = [
-    vrtlut_1,
-    vrtlut_cleanup]
+    test_vrtlut_1,
+    test_vrtlut_cleanup]
 
 if __name__ == '__main__':
 
diff --git a/autotest/gdrivers/vrtmask.py b/autotest/gdrivers/vrtmask.py
index b1134a131584..3187043fd0ac 100755
--- a/autotest/gdrivers/vrtmask.py
+++ b/autotest/gdrivers/vrtmask.py
@@ -40,7 +40,7 @@
 # Test with a global dataset mask band
 
 
-def vrtmask_1():
+def test_vrtmask_1():
 
     vrt_string = """<VRTDataset rasterXSize="20" rasterYSize="20">
   <VRTRasterBand dataType="Byte" band="1">
@@ -86,7 +86,7 @@ def vrtmask_1():
 ###############################################################################
 # Test with a per band mask band
 
-def vrtmask_2():
+def test_vrtmask_2():
 
     vrt_string = """<VRTDataset rasterXSize="20" rasterYSize="20">
   <VRTRasterBand dataType="Byte" band="1">
@@ -132,7 +132,7 @@ def vrtmask_2():
 # Translate a RGB dataset with a mask into a VRT
 
 
-def vrtmask_3():
+def test_vrtmask_3():
 
     gtiff_drv = gdal.GetDriverByName('GTiff')
     md = gtiff_drv.GetMetadata()
@@ -167,7 +167,7 @@ def vrtmask_3():
 # Same with gdalbuildvrt
 
 
-def vrtmask_4():
+def test_vrtmask_4():
     import test_cli_utilities
     if test_cli_utilities.get_gdalbuildvrt_path() is None:
         return 'skip'
@@ -201,7 +201,7 @@ def vrtmask_4():
 # Same with gdal_translate
 
 
-def vrtmask_5():
+def test_vrtmask_5():
 
     gtiff_drv = gdal.GetDriverByName('GTiff')
     md = gtiff_drv.GetMetadata()
@@ -232,7 +232,7 @@ def vrtmask_5():
 # Same with gdal_translate with explicit -b and -mask arguments
 
 
-def vrtmask_6():
+def test_vrtmask_6():
 
     gtiff_drv = gdal.GetDriverByName('GTiff')
     md = gtiff_drv.GetMetadata()
@@ -264,7 +264,7 @@ def vrtmask_6():
 # gdal_translate with RGBmask -> RGBA and then RGBA->RGBmask
 
 
-def vrtmask_7():
+def test_vrtmask_7():
 
     gtiff_drv = gdal.GetDriverByName('GTiff')
     md = gtiff_drv.GetMetadata()
@@ -321,7 +321,7 @@ def vrtmask_7():
 # gdal_translate with RGBmask -> RGB
 
 
-def vrtmask_8():
+def test_vrtmask_8():
 
     gtiff_drv = gdal.GetDriverByName('GTiff')
     md = gtiff_drv.GetMetadata()
@@ -347,7 +347,7 @@ def vrtmask_8():
 # gdal_translate with RGBA -> RGB
 
 
-def vrtmask_9():
+def test_vrtmask_9():
     import test_cli_utilities
     if test_cli_utilities.get_gdal_translate_path() is None:
         return 'skip'
@@ -378,7 +378,7 @@ def vrtmask_9():
 # Test fix for #5120 (VRTSourcedRasterBand::AddMaskBandSource() ignores specified window)
 
 
-def vrtmask_10():
+def test_vrtmask_10():
 
     gdal.Translate('tmp/vrtmask_10_ref.tif', '../gcore/data/stefan_full_rgba.tif', options='-srcwin 40 40 100 100')
     gdal.Translate('tmp/vrtmask_10.vrt', '../gcore/data/stefan_full_rgba.tif', options='-of VRT -b 1 -b 2 -b 3 -mask 4 -srcwin 30 30 120 120')
@@ -405,7 +405,7 @@ def vrtmask_10():
 ###############################################################################
 
 
-def vrtmask_11():
+def test_vrtmask_11():
 
     # Cannot create mask band at raster band level when a dataset mask band already exists
     ds = gdal.Translate('', 'data/byte.tif', format='VRT')
@@ -446,23 +446,23 @@ def vrtmask_11():
 # Cleanup.
 
 
-def vrtmask_cleanup():
+def test_vrtmask_cleanup():
     return 'success'
 
 
 gdaltest_list = [
-    vrtmask_1,
-    vrtmask_2,
-    vrtmask_3,
-    vrtmask_4,
-    vrtmask_5,
-    vrtmask_6,
-    vrtmask_7,
-    vrtmask_8,
-    vrtmask_9,
-    vrtmask_10,
-    vrtmask_11,
-    vrtmask_cleanup]
+    test_vrtmask_1,
+    test_vrtmask_2,
+    test_vrtmask_3,
+    test_vrtmask_4,
+    test_vrtmask_5,
+    test_vrtmask_6,
+    test_vrtmask_7,
+    test_vrtmask_8,
+    test_vrtmask_9,
+    test_vrtmask_10,
+    test_vrtmask_11,
+    test_vrtmask_cleanup]
 
 if __name__ == '__main__':
 
diff --git a/autotest/gdrivers/vrtovr.py b/autotest/gdrivers/vrtovr.py
index c753ac4f4730..37fbb96e2fd6 100755
--- a/autotest/gdrivers/vrtovr.py
+++ b/autotest/gdrivers/vrtovr.py
@@ -38,7 +38,7 @@
 # Simple test
 
 
-def vrtovr_1():
+def test_vrtovr_1():
 
     vrt_string = """<VRTDataset rasterXSize="20" rasterYSize="20">
   <VRTRasterBand dataType="Byte" band="1">
@@ -83,7 +83,7 @@ def vrtovr_1():
 # Test serialization
 
 
-def vrtovr_2():
+def test_vrtovr_2():
 
     vrt_string = """<VRTDataset rasterXSize="20" rasterYSize="20">
   <VRTRasterBand dataType="Byte" band="1">
@@ -132,7 +132,7 @@ def vrtovr_2():
 #
 
 
-def vrtovr_none():
+def test_vrtovr_none():
 
     vrt_string = """<VRTDataset rasterXSize="20" rasterYSize="20">
   <VRTRasterBand dataType="Byte" band="1">
@@ -163,7 +163,7 @@ def vrtovr_none():
 #
 
 
-def vrtovr_errors():
+def test_vrtovr_errors():
 
     vrt_string = """<VRTDataset rasterXSize="20" rasterYSize="20">
   <VRTRasterBand dataType="Byte" band="1">
@@ -207,16 +207,16 @@ def vrtovr_errors():
 ###############################################################################
 # Cleanup.
 
-def vrtovr_cleanup():
+def test_vrtovr_cleanup():
     return 'success'
 
 
 gdaltest_list = [
-    vrtovr_1,
-    vrtovr_2,
-    vrtovr_none,
-    vrtovr_errors,
-    vrtovr_cleanup]
+    test_vrtovr_1,
+    test_vrtovr_2,
+    test_vrtovr_none,
+    test_vrtovr_errors,
+    test_vrtovr_cleanup]
 
 if __name__ == '__main__':
 
diff --git a/autotest/gdrivers/vrtpansharpen.py b/autotest/gdrivers/vrtpansharpen.py
index 20398b25be5a..31ceb3738140 100755
--- a/autotest/gdrivers/vrtpansharpen.py
+++ b/autotest/gdrivers/vrtpansharpen.py
@@ -39,7 +39,7 @@
 # Error cases
 
 
-def vrtpansharpen_1():
+def test_vrtpansharpen_1():
 
     src_ds = gdal.Open('data/small_world.tif')
     src_data = src_ds.GetRasterBand(1).ReadRaster()
@@ -879,7 +879,7 @@ def vrtpansharpen_1():
 # Nominal cases
 
 
-def vrtpansharpen_2():
+def test_vrtpansharpen_2():
 
     shutil.copy('data/small_world.tif', 'tmp/small_world.tif')
 
@@ -1111,7 +1111,7 @@ def vrtpansharpen_2():
 # Test with overviews
 
 
-def vrtpansharpen_3():
+def test_vrtpansharpen_3():
 
     ds = gdal.Open('tmp/small_world_pan.tif')
     ds.BuildOverviews('CUBIC', [2])
@@ -1199,7 +1199,7 @@ def vrtpansharpen_3():
 # Test RasterIO() with various buffer datatypes
 
 
-def vrtpansharpen_4():
+def test_vrtpansharpen_4():
 
     xml = """<VRTDataset subClass="VRTPansharpenedDataset">
     <PansharpeningOptions>
@@ -1244,7 +1244,7 @@ def vrtpansharpen_4():
 # Test RasterIO() with various band datatypes
 
 
-def vrtpansharpen_5():
+def test_vrtpansharpen_5():
 
     for dt in [gdal.GDT_Int16, gdal.GDT_UInt16, gdal.GDT_Int32, gdal.GDT_UInt32, gdal.GDT_Float32, gdal.GDT_Float64, gdal.GDT_CFloat64]:
 
@@ -1328,7 +1328,7 @@ def vrtpansharpen_5():
 # Test BitDepth limitations
 
 
-def vrtpansharpen_6():
+def test_vrtpansharpen_6():
 
     try:
         from osgeo import gdalnumeric
@@ -1417,7 +1417,7 @@ def vrtpansharpen_6():
 # Test bands with different extents
 
 
-def vrtpansharpen_7():
+def test_vrtpansharpen_7():
 
     ds = gdal.GetDriverByName('GTiff').Create('/vsimem/vrtpansharpen_7_pan.tif', 20, 40)
     ds.SetGeoTransform([120, 1, 0, 80, 0, -1])
@@ -1595,7 +1595,7 @@ def vrtpansharpen_7():
 # Test SerializeToXML()
 
 
-def vrtpansharpen_8():
+def test_vrtpansharpen_8():
 
     xml = """<VRTDataset subClass="VRTPansharpenedDataset">
     <VRTRasterBand dataType="Byte" band="1" subClass="VRTPansharpenedRasterBand">
@@ -1652,7 +1652,7 @@ def vrtpansharpen_8():
 # Test NoData support
 
 
-def vrtpansharpen_9():
+def test_vrtpansharpen_9():
 
     # Explicit nodata
     vrt_ds = gdal.Open("""<VRTDataset subClass="VRTPansharpenedDataset">
@@ -1736,7 +1736,7 @@ def vrtpansharpen_9():
 # Test UInt16 optimizations
 
 
-def vrtpansharpen_10():
+def test_vrtpansharpen_10():
 
     ds = gdal.GetDriverByName('GTiff').Create('/vsimem/pan.tif', 1023, 1023, 1, gdal.GDT_UInt16)
     ds.GetRasterBand(1).Fill(1000)
@@ -1877,7 +1877,7 @@ def vrtpansharpen_10():
 # Test gdal.CreatePansharpenedVRT()
 
 
-def vrtpansharpen_11():
+def test_vrtpansharpen_11():
 
     pan_ds = gdal.Open('tmp/small_world_pan.tif')
     ms_ds = gdal.Open('data/small_world.tif')
@@ -1999,7 +1999,7 @@ def vrtpansharpen_11():
 # Cleanup
 
 
-def vrtpansharpen_cleanup():
+def test_vrtpansharpen_cleanup():
 
     gdal.GetDriverByName('GTiff').Delete('tmp/small_world_pan.tif')
     gdal.GetDriverByName('GTiff').Delete('tmp/small_world.tif')
@@ -2010,18 +2010,18 @@ def vrtpansharpen_cleanup():
 
 
 gdaltest_list = [
-    vrtpansharpen_1,
-    vrtpansharpen_2,
-    vrtpansharpen_3,
-    vrtpansharpen_4,
-    vrtpansharpen_5,
-    vrtpansharpen_6,
-    vrtpansharpen_7,
-    vrtpansharpen_8,
-    vrtpansharpen_9,
-    vrtpansharpen_10,
-    vrtpansharpen_11,
-    vrtpansharpen_cleanup,
+    test_vrtpansharpen_1,
+    test_vrtpansharpen_2,
+    test_vrtpansharpen_3,
+    test_vrtpansharpen_4,
+    test_vrtpansharpen_5,
+    test_vrtpansharpen_6,
+    test_vrtpansharpen_7,
+    test_vrtpansharpen_8,
+    test_vrtpansharpen_9,
+    test_vrtpansharpen_10,
+    test_vrtpansharpen_11,
+    test_vrtpansharpen_cleanup,
 ]
 
 # gdaltest_list= [ vrtpansharpen_1, vrtpansharpen_8 ]
diff --git a/autotest/gdrivers/vrtrawlink.py b/autotest/gdrivers/vrtrawlink.py
index e9ed17ea8d9f..fffeb6810081 100755
--- a/autotest/gdrivers/vrtrawlink.py
+++ b/autotest/gdrivers/vrtrawlink.py
@@ -47,7 +47,7 @@ def _xmlsearch(root, nodetype, name):
 # Verify reading from simple existing raw definition.
 
 
-def vrtrawlink_1():
+def test_vrtrawlink_1():
 
     tst = gdaltest.GDALTest('VRT', 'small.vrt', 2, 12816)
     return tst.testOpen()
@@ -56,7 +56,7 @@ def vrtrawlink_1():
 # Create a new VRT raw link via the AddBand() method.
 
 
-def vrtrawlink_2():
+def test_vrtrawlink_2():
 
     driver = gdal.GetDriverByName("VRT")
     ds = driver.Create('tmp/rawlink.vrt', 31, 35, 0)
@@ -87,7 +87,7 @@ def vrtrawlink_2():
 # Confirm that the newly written file is was saved properly
 
 
-def vrtrawlink_3():
+def test_vrtrawlink_3():
 
     gdaltest.rawlink_ds = gdal.Open('tmp/rawlink.vrt', gdal.GA_Update)
     filelist = gdaltest.rawlink_ds.GetFileList()
@@ -109,7 +109,7 @@ def vrtrawlink_3():
 # Add a new band, and we will test if we can write to it.
 
 
-def vrtrawlink_4():
+def test_vrtrawlink_4():
 
     # force creation of the file.
     open('tmp/rawlink.dat', 'w').write(chr(0))
@@ -172,7 +172,7 @@ def vrtrawlink_4():
 # Add a new band, and check the relativeToVRT property.
 
 
-def vrtrawlink_5():
+def test_vrtrawlink_5():
 
     driver = gdal.GetDriverByName("VRT")
     ds = driver.Create('tmp/rawlink.vrt', 31, 35, 0)
@@ -221,7 +221,7 @@ def vrtrawlink_5():
 # Add a new band with relativeToVRT=1, and re-open the dataset.
 
 
-def vrtrawlink_6():
+def test_vrtrawlink_6():
 
     driver = gdal.GetDriverByName("VRT")
     ds = driver.Create('tmp/rawlink.vrt', 31, 35, 0)
@@ -268,7 +268,7 @@ def vrtrawlink_6():
 # Add a new band with relativeToVRT=1, change directory and re-open the dataset.
 
 
-def vrtrawlink_7():
+def test_vrtrawlink_7():
 
     driver = gdal.GetDriverByName("VRT")
     ds = driver.Create('tmp/rawlink.vrt', 31, 35, 0)
@@ -314,7 +314,7 @@ def vrtrawlink_7():
 # Test error case (too much memory allocation)
 
 
-def vrtrawlink_8():
+def test_vrtrawlink_8():
 
     for _ in range(2):
         with gdaltest.error_handler():
@@ -337,7 +337,7 @@ def vrtrawlink_8():
 # Test error case (inexisting file)
 
 
-def vrtrawlink_9():
+def test_vrtrawlink_9():
 
     with gdaltest.error_handler():
         ds = gdal.Open("""<VRTDataset rasterXSize="1" rasterYSize="1">
@@ -355,7 +355,7 @@ def vrtrawlink_9():
 # Test error case (invalid byte order)
 
 
-def vrtrawlink_10():
+def test_vrtrawlink_10():
 
     with gdaltest.error_handler():
         ds = gdal.Open("""<VRTDataset rasterXSize="1" rasterYSize="1">
@@ -374,7 +374,7 @@ def vrtrawlink_10():
 # Cleanup.
 
 
-def vrtrawlink_cleanup():
+def test_vrtrawlink_cleanup():
     gdaltest.rawlink_ds = None
 
     try:
@@ -389,17 +389,17 @@ def vrtrawlink_cleanup():
 
 
 gdaltest_list = [
-    vrtrawlink_1,
-    vrtrawlink_2,
-    vrtrawlink_3,
-    vrtrawlink_4,
-    vrtrawlink_5,
-    vrtrawlink_6,
-    vrtrawlink_7,
-    vrtrawlink_8,
-    vrtrawlink_9,
-    vrtrawlink_10,
-    vrtrawlink_cleanup]
+    test_vrtrawlink_1,
+    test_vrtrawlink_2,
+    test_vrtrawlink_3,
+    test_vrtrawlink_4,
+    test_vrtrawlink_5,
+    test_vrtrawlink_6,
+    test_vrtrawlink_7,
+    test_vrtrawlink_8,
+    test_vrtrawlink_9,
+    test_vrtrawlink_10,
+    test_vrtrawlink_cleanup]
 
 if __name__ == '__main__':
 
diff --git a/autotest/gdrivers/vrtwarp.py b/autotest/gdrivers/vrtwarp.py
index ef1c7f07ac97..00133cd951af 100755
--- a/autotest/gdrivers/vrtwarp.py
+++ b/autotest/gdrivers/vrtwarp.py
@@ -40,7 +40,7 @@
 # Verify reading from simple existing warp definition.
 
 
-def vrtwarp_1():
+def test_vrtwarp_1():
 
     tst = gdaltest.GDALTest('VRT', 'rgb_warp.vrt', 2, 21504)
     return tst.testOpen(check_filelist=False)
@@ -49,7 +49,7 @@ def vrtwarp_1():
 # Create a new VRT warp in the temp directory.
 
 
-def vrtwarp_2():
+def test_vrtwarp_2():
 
     try:
         os.remove('tmp/warp.vrt')
@@ -76,7 +76,7 @@ def vrtwarp_2():
 # verify checksum.
 
 
-def vrtwarp_3():
+def test_vrtwarp_3():
 
     gdaltest.vrtwarp_ds.SetDescription('tmp/warp.vrt')
     gdaltest.vrtwarp_ds = None
@@ -100,7 +100,7 @@ def vrtwarp_3():
 # Test implicit overviews with default source overview level strategy (AUTO)
 
 
-def vrtwarp_4():
+def test_vrtwarp_4():
 
     src_ds = gdal.Open('../gcore/data/byte.tif')
     tmp_ds = gdal.GetDriverByName('GTiff').CreateCopy('tmp/vrtwarp_4.tif', src_ds)
@@ -176,7 +176,7 @@ def vrtwarp_4():
 # Test implicit overviews with selection of the upper source overview level
 
 
-def vrtwarp_5():
+def test_vrtwarp_5():
 
     src_ds = gdal.Open('../gcore/data/byte.tif')
     tmp_ds = gdal.GetDriverByName('GTiff').CreateCopy('tmp/vrtwarp_5.tif', src_ds)
@@ -223,7 +223,7 @@ def vrtwarp_5():
 # Test implicit overviews with GCP
 
 
-def vrtwarp_6():
+def test_vrtwarp_6():
 
     src_ds = gdal.Open('../gcore/data/byte.tif')
     tmp_ds = gdal.GetDriverByName('GTiff').CreateCopy('tmp/vrtwarp_6.tif', src_ds)
@@ -279,7 +279,7 @@ def vrtwarp_6():
 # Test implicit overviews with GCP (TPS)
 
 
-def vrtwarp_7():
+def test_vrtwarp_7():
 
     src_ds = gdal.Open('../gcore/data/byte.tif')
     tmp_ds = gdal.GetDriverByName('GTiff').CreateCopy('tmp/vrtwarp_7.tif', src_ds)
@@ -331,7 +331,7 @@ def vrtwarp_7():
 # Test implicit overviews with RPC
 
 
-def vrtwarp_8():
+def test_vrtwarp_8():
 
     shutil.copy('../gcore/data/byte.tif', 'tmp/vrtwarp_8.tif')
     shutil.copy('../gcore/data/test_rpc.txt', 'tmp/vrtwarp_8_rpc.txt')
@@ -368,7 +368,7 @@ def vrtwarp_8():
 # Test implicit overviews with GEOLOCATION
 
 
-def vrtwarp_9():
+def test_vrtwarp_9():
 
     shutil.copy('../gcore/data/sstgeo.tif', 'tmp/sstgeo.tif')
 
@@ -432,7 +432,7 @@ def vrtwarp_9():
 # Test implicit overviews with selection of the full resolution level
 
 
-def vrtwarp_10():
+def test_vrtwarp_10():
 
     src_ds = gdal.Open('../gcore/data/byte.tif')
     tmp_ds = gdal.GetDriverByName('GTiff').CreateCopy('tmp/vrtwarp_10.tif', src_ds)
@@ -478,7 +478,7 @@ def vrtwarp_10():
 # Test implicit overviews with dest alpha band (#6081)
 
 
-def vrtwarp_11():
+def test_vrtwarp_11():
 
     ds = gdal.Open('data/bug6581.vrt')
     cs1 = ds.GetRasterBand(1).Checksum()
@@ -499,7 +499,7 @@ def vrtwarp_11():
 # Test reading a regular VRT whose source is a warped VRT inlined
 
 
-def vrtwarp_read_vrt_of_warped_vrt():
+def test_vrtwarp_read_vrt_of_warped_vrt():
 
     ds = gdal.Open('data/vrt_of_warped_vrt.vrt')
     cs = ds.GetRasterBand(1).Checksum()
@@ -514,18 +514,18 @@ def vrtwarp_read_vrt_of_warped_vrt():
 
 
 gdaltest_list = [
-    vrtwarp_1,
-    vrtwarp_2,
-    vrtwarp_3,
-    vrtwarp_4,
-    vrtwarp_5,
-    vrtwarp_6,
-    vrtwarp_7,
-    vrtwarp_8,
-    vrtwarp_9,
-    vrtwarp_10,
-    vrtwarp_11,
-    vrtwarp_read_vrt_of_warped_vrt
+    test_vrtwarp_1,
+    test_vrtwarp_2,
+    test_vrtwarp_3,
+    test_vrtwarp_4,
+    test_vrtwarp_5,
+    test_vrtwarp_6,
+    test_vrtwarp_7,
+    test_vrtwarp_8,
+    test_vrtwarp_9,
+    test_vrtwarp_10,
+    test_vrtwarp_11,
+    test_vrtwarp_read_vrt_of_warped_vrt
 ]
 
 
diff --git a/autotest/gdrivers/wcs.py b/autotest/gdrivers/wcs.py
index 6e9baba60df4..293ba6da31d3 100755
--- a/autotest/gdrivers/wcs.py
+++ b/autotest/gdrivers/wcs.py
@@ -51,7 +51,7 @@
 # Verify we have the driver.
 
 
-def wcs_1():
+def test_wcs_1():
 
     # Disable wcs tests till we have a more reliable test server.
     gdaltest.wcs_drv = gdal.GetDriverByName('WCS')
@@ -92,7 +92,7 @@ def wcs_2():
 # Check various things about the configuration.
 
 
-def wcs_3():
+def test_wcs_3():
 
     if gdaltest.wcs_drv is None or gdaltest.wcs_ds is None:
         return 'skip'
@@ -133,7 +133,7 @@ def wcs_3():
 # Check checksum
 
 
-def wcs_4():
+def test_wcs_4():
 
     if gdaltest.wcs_drv is None or gdaltest.wcs_ds is None:
         return 'skip'
@@ -478,7 +478,7 @@ def setupFct():
 ###############################################################################
 
 
-def wcs_6():
+def test_wcs_6():
     driver = gdal.GetDriverByName('WCS')
     if driver is None:
         return 'skip'
@@ -577,7 +577,7 @@ def wcs_6():
 ###############################################################################
 
 
-def wcs_cleanup():
+def test_wcs_cleanup():
 
     gdaltest.wcs_drv = None
     gdaltest.wcs_ds = None
@@ -596,13 +596,13 @@ def wcs_cleanup():
 
 
 gdaltest_list = [
-    wcs_1,
+    test_wcs_1,
     # wcs_2, #FIXME: re-enable after adapting test
-    wcs_3,
-    wcs_4,
+    test_wcs_3,
+    test_wcs_4,
     # wcs_5, #FIXME: re-enable after adapting test
-    wcs_6,
-    wcs_cleanup]
+    test_wcs_6,
+    test_wcs_cleanup]
 
 
 if __name__ == '__main__':
diff --git a/autotest/gdrivers/webp.py b/autotest/gdrivers/webp.py
index 70d887369332..3e2e0f8b9682 100755
--- a/autotest/gdrivers/webp.py
+++ b/autotest/gdrivers/webp.py
@@ -39,7 +39,7 @@
 # Test if WEBP driver is present
 
 
-def webp_1():
+def test_webp_1():
 
     gdaltest.webp_drv = gdal.GetDriverByName('WEBP')
     if gdaltest.webp_drv is None:
@@ -51,7 +51,7 @@ def webp_1():
 # Open() test
 
 
-def webp_2():
+def test_webp_2():
 
     if gdaltest.webp_drv is None:
         return 'skip'
@@ -69,7 +69,7 @@ def webp_2():
 # CreateCopy() test
 
 
-def webp_3():
+def test_webp_3():
 
     if gdaltest.webp_drv is None:
         return 'skip'
@@ -94,7 +94,7 @@ def webp_3():
 # CreateCopy() on RGBA
 
 
-def webp_4():
+def test_webp_4():
 
     if gdaltest.webp_drv is None:
         return 'skip'
@@ -128,7 +128,7 @@ def webp_4():
 # CreateCopy() on RGBA with lossless compression
 
 
-def webp_5():
+def test_webp_5():
 
     if gdaltest.webp_drv is None:
         return 'skip'
@@ -159,11 +159,11 @@ def webp_5():
 
 
 gdaltest_list = [
-    webp_1,
-    webp_2,
-    webp_3,
-    webp_4,
-    webp_5]
+    test_webp_1,
+    test_webp_2,
+    test_webp_3,
+    test_webp_4,
+    test_webp_5]
 
 if __name__ == '__main__':
 
diff --git a/autotest/gdrivers/wms.py b/autotest/gdrivers/wms.py
index 7d513ed083cb..a01219d304b2 100755
--- a/autotest/gdrivers/wms.py
+++ b/autotest/gdrivers/wms.py
@@ -44,7 +44,7 @@
 # Verify we have the driver.
 
 
-def wms_1():
+def test_wms_1():
 
     gdaltest.wms_drv = gdal.GetDriverByName('WMS')
     if gdaltest.wms_drv is None:
@@ -158,7 +158,7 @@ def wms_4():
 # Open the WMS service using XML as filename.
 
 
-def wms_5():
+def test_wms_5():
 
     if gdaltest.wms_drv is None:
         return 'skip'
@@ -188,7 +188,7 @@ def wms_5():
 # Test TileService
 
 
-def wms_6():
+def test_wms_6():
 
     if gdaltest.wms_drv is None:
         return 'skip'
@@ -218,7 +218,7 @@ def wms_6():
 # Test TMS
 
 
-def wms_7():
+def test_wms_7():
 
     if gdaltest.wms_drv is None:
         return 'skip'
@@ -280,7 +280,7 @@ def wms_7():
 ###############################################################################
 # Test TMS with cache
 
-def wms_8():
+def test_wms_8():
 
     if gdaltest.wms_drv is None:
         return 'skip'
@@ -582,7 +582,7 @@ def wms_10():
 # Test getting subdatasets from GetTileService
 
 
-def wms_11():
+def test_wms_11():
 
     if gdaltest.wms_drv is None:
         return 'skip'
@@ -622,7 +622,7 @@ def wms_11():
 # Test getting subdatasets from a TMS server
 
 
-def wms_12():
+def test_wms_12():
 
     if gdaltest.wms_drv is None:
         return 'skip'
@@ -664,7 +664,7 @@ def wms_12():
 # Test reading WMS through VRT (test effect of r21866)
 
 
-def wms_13():
+def test_wms_13():
 
     if gdaltest.wms_drv is None:
         return 'skip'
@@ -683,7 +683,7 @@ def wms_13():
 ###############################################################################
 # Test reading Virtual Earth layer
 
-def wms_14():
+def test_wms_14():
 
     if gdaltest.wms_drv is None:
         return 'skip'
@@ -734,7 +734,7 @@ def wms_14():
 # Test reading ArcGIS MapServer JSon definition and CreateCopy()
 
 
-def wms_15():
+def test_wms_15():
 
     if gdaltest.wms_drv is None:
         return 'skip'
@@ -792,7 +792,7 @@ def wms_15():
 # Test getting subdatasets from WMS-C Capabilities
 
 
-def wms_16():
+def test_wms_16():
 
     if gdaltest.wms_drv is None:
         return 'skip'
@@ -916,7 +916,7 @@ def wms_17():
 # Test a ArcGIS Server
 
 
-def wms_18():
+def test_wms_18():
 
     if gdaltest.wms_drv is None:
         return 'skip'
@@ -959,7 +959,7 @@ def wms_18():
 # Test a IIP server
 
 
-def wms_19():
+def test_wms_19():
 
     if gdaltest.wms_drv is None:
         return 'skip'
@@ -991,7 +991,7 @@ def wms_19():
 ###############################################################################
 
 
-def wms_cleanup():
+def test_wms_cleanup():
 
     gdaltest.wms_ds = None
     gdaltest.clean_tmp()
@@ -1005,26 +1005,26 @@ def wms_cleanup():
 
 
 gdaltest_list = [
-    wms_1,
+    test_wms_1,
     # wms_2,
     # wms_3,
     # wms_4,
-    wms_5,
-    wms_6,
-    wms_7,
-    wms_8,
+    test_wms_5,
+    test_wms_6,
+    test_wms_7,
+    test_wms_8,
     # wms_9,
     # wms_10,
-    wms_11,
-    wms_12,
-    wms_13,
-    wms_14,
-    wms_15,
-    wms_16,
+    test_wms_11,
+    test_wms_12,
+    test_wms_13,
+    test_wms_14,
+    test_wms_15,
+    test_wms_16,
     # wms_17,
-    wms_18,
-    wms_19,
-    wms_cleanup]
+    test_wms_18,
+    test_wms_19,
+    test_wms_cleanup]
 
 
 if __name__ == '__main__':
diff --git a/autotest/gdrivers/wmts.py b/autotest/gdrivers/wmts.py
index 21e60c9ab981..24a1d0200302 100755
--- a/autotest/gdrivers/wmts.py
+++ b/autotest/gdrivers/wmts.py
@@ -41,7 +41,7 @@
 # Find WMTS driver
 
 
-def wmts_1():
+def test_wmts_1():
 
     gdaltest.wmts_drv = gdal.GetDriverByName('WMTS')
 
@@ -61,7 +61,7 @@ def wmts_1():
 # Error: no URL and invalid GDAL_WMTS service file documents
 
 
-def wmts_2():
+def test_wmts_2():
 
     if gdaltest.wmts_drv is None:
         return 'skip'
@@ -100,7 +100,7 @@ def wmts_2():
 # Error: invalid URL
 
 
-def wmts_3():
+def test_wmts_3():
 
     if gdaltest.wmts_drv is None:
         return 'skip'
@@ -118,7 +118,7 @@ def wmts_3():
 # Error: invalid URL
 
 
-def wmts_4():
+def test_wmts_4():
 
     if gdaltest.wmts_drv is None:
         return 'skip'
@@ -136,7 +136,7 @@ def wmts_4():
 # Error: invalid XML in GetCapabilities response
 
 
-def wmts_5():
+def test_wmts_5():
 
     if gdaltest.wmts_drv is None:
         return 'skip'
@@ -156,7 +156,7 @@ def wmts_5():
 # Error: invalid content in GetCapabilities response
 
 
-def wmts_6():
+def test_wmts_6():
 
     if gdaltest.wmts_drv is None:
         return 'skip'
@@ -176,7 +176,7 @@ def wmts_6():
 # Error: no layers
 
 
-def wmts_7():
+def test_wmts_7():
 
     if gdaltest.wmts_drv is None:
         return 'skip'
@@ -196,7 +196,7 @@ def wmts_7():
 # Error: missing TileMatrixSetLink and Style
 
 
-def wmts_8():
+def test_wmts_8():
 
     if gdaltest.wmts_drv is None:
         return 'skip'
@@ -222,7 +222,7 @@ def wmts_8():
 # Error: missing TileMatrixSet
 
 
-def wmts_9():
+def test_wmts_9():
 
     if gdaltest.wmts_drv is None:
         return 'skip'
@@ -255,7 +255,7 @@ def wmts_9():
 # Error: Missing SupportedCRS
 
 
-def wmts_10():
+def test_wmts_10():
 
     if gdaltest.wmts_drv is None:
         return 'skip'
@@ -291,7 +291,7 @@ def wmts_10():
 # Error: Cannot find TileMatrix in TileMatrixSet
 
 
-def wmts_11():
+def test_wmts_11():
 
     if gdaltest.wmts_drv is None:
         return 'skip'
@@ -328,7 +328,7 @@ def wmts_11():
 # Error: Missing required element in TileMatrix element
 
 
-def wmts_12():
+def test_wmts_12():
 
     if gdaltest.wmts_drv is None:
         return 'skip'
@@ -366,7 +366,7 @@ def wmts_12():
 # Error: Missing ResourceURL
 
 
-def wmts_12bis():
+def test_wmts_12bis():
 
     if gdaltest.wmts_drv is None:
         return 'skip'
@@ -411,7 +411,7 @@ def wmts_12bis():
 # Minimal
 
 
-def wmts_13():
+def test_wmts_13():
 
     if gdaltest.wmts_drv is None:
         return 'skip'
@@ -553,7 +553,7 @@ def wmts_13():
 # Nominal RESTful
 
 
-def wmts_14():
+def test_wmts_14():
 
     if gdaltest.wmts_drv is None:
         return 'skip'
@@ -850,7 +850,7 @@ def wmts_14():
 # Nominal KVP
 
 
-def wmts_15():
+def test_wmts_15():
 
     if gdaltest.wmts_drv is None:
         return 'skip'
@@ -1012,7 +1012,7 @@ def wmts_15():
 # AOI from layer WGS84BoundingBox
 
 
-def wmts_16():
+def test_wmts_16():
 
     if gdaltest.wmts_drv is None:
         return 'skip'
@@ -1102,7 +1102,7 @@ def wmts_16():
 # AOI from layer BoundingBox
 
 
-def wmts_17():
+def test_wmts_17():
 
     if gdaltest.wmts_drv is None:
         return 'skip'
@@ -1192,7 +1192,7 @@ def wmts_17():
 # AOI from TileMatrixSet BoundingBox
 
 
-def wmts_18():
+def test_wmts_18():
 
     if gdaltest.wmts_drv is None:
         return 'skip'
@@ -1282,7 +1282,7 @@ def wmts_18():
 # AOI from TileMatrixSetLimits
 
 
-def wmts_19():
+def test_wmts_19():
 
     if gdaltest.wmts_drv is None:
         return 'skip'
@@ -1377,7 +1377,7 @@ def wmts_19():
 # AOI from layer BoundingBox but restricted with TileMatrixSetLimits
 
 
-def wmts_20():
+def test_wmts_20():
 
     if gdaltest.wmts_drv is None:
         return 'skip'
@@ -1476,7 +1476,7 @@ def wmts_20():
 # Test ExtendBeyondDateLine
 
 
-def wmts_21():
+def test_wmts_21():
 
     if gdaltest.wmts_drv is None:
         return 'skip'
@@ -1589,7 +1589,7 @@ def wmts_21():
 # Test when WGS84BoundingBox is a densified reprojection of the tile matrix bbox
 
 
-def wmts_22():
+def test_wmts_22():
 
     if gdaltest.wmts_drv is None:
         return 'skip'
@@ -1729,27 +1729,27 @@ def wmts_23(imagetype, expected_cs):
     return 'success'
 
 
-def wmts_23_gray():
+def test_wmts_23_gray():
     return wmts_23('gray', [60137, 60137, 60137, 4428])
 
 
-def wmts_23_grayalpha():
+def test_wmts_23_grayalpha():
     return wmts_23('gray+alpha', [39910, 39910, 39910, 63180])
 
 
-def wmts_23_pal():
+def test_wmts_23_pal():
     return wmts_23('pal', [62950, 59100, 63864, 453])
 
 
-def wmts_23_rgb():
+def test_wmts_23_rgb():
     return wmts_23('rgb', [1020, 3665, 6180, 4428])
 
 
-def wmts_23_rgba():
+def test_wmts_23_rgba():
     return wmts_23('rgba', [65530, 51449, 1361, 59291])
 
 
-def wmts_invalid_global_to_tm_reprojection():
+def test_wmts_invalid_global_to_tm_reprojection():
 
     if gdaltest.wmts_drv is None:
         return 'skip'
@@ -1810,7 +1810,7 @@ def wmts_invalid_global_to_tm_reprojection():
 #
 
 
-def wmts_check_no_overflow_zoom_level():
+def test_wmts_check_no_overflow_zoom_level():
 
     if gdaltest.wmts_drv is None:
         return 'skip'
@@ -2100,7 +2100,7 @@ def wmts_CleanCache():
 #
 
 
-def wmts_cleanup():
+def test_wmts_cleanup():
 
     if gdaltest.wmts_drv is None:
         return 'skip'
@@ -2124,37 +2124,37 @@ def wmts_cleanup():
 
 
 gdaltest_list = [
-    wmts_1,
-    wmts_2,
-    wmts_3,
-    wmts_4,
-    wmts_5,
-    wmts_6,
-    wmts_7,
-    wmts_8,
-    wmts_9,
-    wmts_10,
-    wmts_11,
-    wmts_12,
-    wmts_12bis,
-    wmts_13,
-    wmts_14,
-    wmts_15,
-    wmts_16,
-    wmts_17,
-    wmts_18,
-    wmts_19,
-    wmts_20,
-    wmts_21,
-    wmts_22,
-    wmts_23_gray,
-    wmts_23_grayalpha,
-    wmts_23_pal,
-    wmts_23_rgb,
-    wmts_23_rgba,
-    wmts_invalid_global_to_tm_reprojection,
-    wmts_check_no_overflow_zoom_level,
-    wmts_cleanup]
+    test_wmts_1,
+    test_wmts_2,
+    test_wmts_3,
+    test_wmts_4,
+    test_wmts_5,
+    test_wmts_6,
+    test_wmts_7,
+    test_wmts_8,
+    test_wmts_9,
+    test_wmts_10,
+    test_wmts_11,
+    test_wmts_12,
+    test_wmts_12bis,
+    test_wmts_13,
+    test_wmts_14,
+    test_wmts_15,
+    test_wmts_16,
+    test_wmts_17,
+    test_wmts_18,
+    test_wmts_19,
+    test_wmts_20,
+    test_wmts_21,
+    test_wmts_22,
+    test_wmts_23_gray,
+    test_wmts_23_grayalpha,
+    test_wmts_23_pal,
+    test_wmts_23_rgb,
+    test_wmts_23_rgba,
+    test_wmts_invalid_global_to_tm_reprojection,
+    test_wmts_check_no_overflow_zoom_level,
+    test_wmts_cleanup]
 
 if __name__ == '__main__':
 
diff --git a/autotest/gdrivers/xpm.py b/autotest/gdrivers/xpm.py
index 05b288be4cfc..deca08c9570c 100755
--- a/autotest/gdrivers/xpm.py
+++ b/autotest/gdrivers/xpm.py
@@ -54,12 +54,12 @@ def test_xpm(downloadURL, fileName, checksum, download_size):
     assert ds.GetRasterBand(1).Checksum() == checksum, 'Bad checksum. Expected %d, got %d' % (checksum, ds.GetRasterBand(1).Checksum())
 
 
-def xpm_1():
+def test_xpm_1():
     tst = gdaltest.GDALTest('XPM', 'byte.tif', 1, 4583)
     return tst.testCreateCopy(vsimem=1, check_minmax=False)
 
 
-gdaltest_list = [xpm_1]
+gdaltest_list = [test_xpm_1]
 
 
 if __name__ == '__main__':
diff --git a/autotest/gdrivers/xyz.py b/autotest/gdrivers/xyz.py
index bce66004cb07..c9cb545bac3c 100755
--- a/autotest/gdrivers/xyz.py
+++ b/autotest/gdrivers/xyz.py
@@ -40,7 +40,7 @@
 # Test CreateCopy() of byte.tif
 
 
-def xyz_1():
+def test_xyz_1():
 
     tst = gdaltest.GDALTest('XYZ', 'byte.tif', 1, 4672)
     return tst.testCreateCopy(vsimem=1, check_gt=(-67.00041667, 0.00083333, 0.0, 50.000416667, 0.0, -0.00083333))
@@ -49,7 +49,7 @@ def xyz_1():
 # Test CreateCopy() of float.img
 
 
-def xyz_2():
+def test_xyz_2():
 
     src_ds = gdal.Open('data/float.img')
     ds = gdal.GetDriverByName('XYZ').CreateCopy('tmp/float.xyz', src_ds, options=['COLUMN_SEPARATOR=,', 'ADD_HEADER_LINE=YES'])
@@ -66,7 +66,7 @@ def xyz_2():
 # Test random access to lines of imagery
 
 
-def xyz_3():
+def test_xyz_3():
 
     content = """Y X Z
 0 0 65
@@ -114,7 +114,7 @@ def xyz_4_checkline(ds, i, expected_bytes):
     return struct.unpack('B' * ds.RasterXSize, buf) == expected_bytes
 
 
-def xyz_4():
+def test_xyz_4():
 
     content = """
 440750.001 3751290 1
@@ -160,7 +160,7 @@ def xyz_4():
 ###############################################################################
 # Test XYZ with only integral values and comma field separator
 
-def xyz_5():
+def test_xyz_5():
 
     content = """0,1,100
 0.5,1,100
@@ -193,7 +193,7 @@ def xyz_5():
 ###############################################################################
 # Test XYZ with comma decimal separator and semi-colon field separator
 
-def xyz_6():
+def test_xyz_6():
 
     content = """0;1;100
 0,5;1;100
@@ -226,7 +226,7 @@ def xyz_6():
 ###############################################################################
 # Test XYZ with not completely equal stepX and stepY
 
-def xyz_7():
+def test_xyz_7():
 
     content = """y x z
    51.500000  354.483333     54.721
@@ -275,7 +275,7 @@ def xyz_7():
 # Test particular case of XYZ file with missed samples (#6934)
 
 
-def xyz_8():
+def test_xyz_8():
 
     content = """0 500 50
 750 500 100
@@ -304,21 +304,21 @@ def xyz_8():
 ###############################################################################
 # Cleanup
 
-def xyz_cleanup():
+def test_xyz_cleanup():
 
     return 'success'
 
 
 gdaltest_list = [
-    xyz_1,
-    xyz_2,
-    xyz_3,
-    xyz_4,
-    xyz_5,
-    xyz_6,
-    xyz_7,
-    xyz_8,
-    xyz_cleanup]
+    test_xyz_1,
+    test_xyz_2,
+    test_xyz_3,
+    test_xyz_4,
+    test_xyz_5,
+    test_xyz_6,
+    test_xyz_7,
+    test_xyz_8,
+    test_xyz_cleanup]
 
 if __name__ == '__main__':
 
diff --git a/autotest/gdrivers/zmap.py b/autotest/gdrivers/zmap.py
index 41dec9a52f31..aceb5bb4dd68 100755
--- a/autotest/gdrivers/zmap.py
+++ b/autotest/gdrivers/zmap.py
@@ -37,14 +37,14 @@
 # Test CreateCopy() of byte.tif
 
 
-def zmap_1():
+def test_zmap_1():
 
     tst = gdaltest.GDALTest('ZMap', 'byte.tif', 1, 4672)
     return tst.testCreateCopy(vsimem=1, check_gt=(-67.00041667, 0.00083333, 0.0, 50.000416667, 0.0, -0.00083333))
 
 
 gdaltest_list = [
-    zmap_1
+    test_zmap_1
 ]
 
 if __name__ == '__main__':
diff --git a/autotest/gnm/gnm_test.py b/autotest/gnm/gnm_test.py
index 50b41b220371..5e01cfac4791 100755
--- a/autotest/gnm/gnm_test.py
+++ b/autotest/gnm/gnm_test.py
@@ -45,7 +45,7 @@
 # Create file base network
 
 
-def gnm_filenetwork_create():
+def test_gnm_filenetwork_create():
 
     try:
         shutil.rmtree('tmp/test_gnm')
@@ -84,7 +84,7 @@ def gnm_filenetwork_create():
 # Open file base network
 
 
-def gnm_filenetwork_open():
+def test_gnm_filenetwork_open():
 
     if not ogrtest.have_gnm:
         return 'skip'
@@ -112,7 +112,7 @@ def gnm_filenetwork_open():
 # Import layers into file base network
 
 
-def gnm_import():
+def test_gnm_import():
 
     if not ogrtest.have_gnm:
         return 'skip'
@@ -150,7 +150,7 @@ def gnm_import():
 # autoconnect
 
 
-def gnm_autoconnect():
+def test_gnm_autoconnect():
 
     if not ogrtest.have_gnm:
         return 'skip'
@@ -173,7 +173,7 @@ def gnm_autoconnect():
 # Dijkstra shortest path
 
 
-def gnm_graph_dijkstra():
+def test_gnm_graph_dijkstra():
 
     if not ogrtest.have_gnm:
         return 'skip'
@@ -204,7 +204,7 @@ def gnm_graph_dijkstra():
 # KShortest Paths
 
 
-def gnm_graph_kshortest():
+def test_gnm_graph_kshortest():
 
     if not ogrtest.have_gnm:
         return 'skip'
@@ -233,7 +233,7 @@ def gnm_graph_kshortest():
 # ConnectedComponents
 
 
-def gnm_graph_connectedcomponents():
+def test_gnm_graph_connectedcomponents():
 
     if not ogrtest.have_gnm:
         return 'skip'
@@ -262,7 +262,7 @@ def gnm_graph_connectedcomponents():
 # Network deleting
 
 
-def gnm_delete():
+def test_gnm_delete():
 
     if not ogrtest.have_gnm:
         return 'skip'
@@ -280,14 +280,14 @@ def gnm_delete():
 
 
 gdaltest_list = [
-    gnm_filenetwork_create,
-    gnm_filenetwork_open,
-    gnm_import,
-    gnm_autoconnect,
-    gnm_graph_dijkstra,
-    gnm_graph_kshortest,
-    gnm_graph_connectedcomponents,
-    gnm_delete
+    test_gnm_filenetwork_create,
+    test_gnm_filenetwork_open,
+    test_gnm_import,
+    test_gnm_autoconnect,
+    test_gnm_graph_dijkstra,
+    test_gnm_graph_kshortest,
+    test_gnm_graph_connectedcomponents,
+    test_gnm_delete
 ]
 
 if __name__ == '__main__':
diff --git a/autotest/ogr/ogr_arcgen.py b/autotest/ogr/ogr_arcgen.py
index 2388b94446e1..95183d8b90d0 100755
--- a/autotest/ogr/ogr_arcgen.py
+++ b/autotest/ogr/ogr_arcgen.py
@@ -39,7 +39,7 @@
 # Read points
 
 
-def ogr_arcgen_points():
+def test_ogr_arcgen_points():
 
     ds = ogr.Open('data/points.gen')
     if ds is None:
@@ -76,7 +76,7 @@ def ogr_arcgen_points():
 # Read points25d
 
 
-def ogr_arcgen_points25d():
+def test_ogr_arcgen_points25d():
 
     ds = ogr.Open('data/points25d.gen')
     if ds is None:
@@ -113,7 +113,7 @@ def ogr_arcgen_points25d():
 # Read lines
 
 
-def ogr_arcgen_lines():
+def test_ogr_arcgen_lines():
 
     ds = ogr.Open('data/lines.gen')
     if ds is None:
@@ -146,7 +146,7 @@ def ogr_arcgen_lines():
 # Read lines25d
 
 
-def ogr_arcgen_lines25d():
+def test_ogr_arcgen_lines25d():
 
     ds = ogr.Open('data/lines25d.gen')
     if ds is None:
@@ -179,7 +179,7 @@ def ogr_arcgen_lines25d():
 # Read polygons
 
 
-def ogr_arcgen_polygons():
+def test_ogr_arcgen_polygons():
 
     ds = ogr.Open('data/polygons.gen')
     if ds is None:
@@ -212,7 +212,7 @@ def ogr_arcgen_polygons():
 # Read polygons25d
 
 
-def ogr_arcgen_polygons25d():
+def test_ogr_arcgen_polygons25d():
 
     ds = ogr.Open('data/polygons25d.gen')
     if ds is None:
@@ -243,12 +243,12 @@ def ogr_arcgen_polygons25d():
 
 
 gdaltest_list = [
-    ogr_arcgen_points,
-    ogr_arcgen_points25d,
-    ogr_arcgen_lines,
-    ogr_arcgen_lines25d,
-    ogr_arcgen_polygons,
-    ogr_arcgen_polygons25d]
+    test_ogr_arcgen_points,
+    test_ogr_arcgen_points25d,
+    test_ogr_arcgen_lines,
+    test_ogr_arcgen_lines25d,
+    test_ogr_arcgen_polygons,
+    test_ogr_arcgen_polygons25d]
 
 
 if __name__ == '__main__':
diff --git a/autotest/ogr/ogr_avc.py b/autotest/ogr/ogr_avc.py
index a49ece921d34..4d445a2ef260 100755
--- a/autotest/ogr/ogr_avc.py
+++ b/autotest/ogr/ogr_avc.py
@@ -62,7 +62,7 @@ def check_content(ds):
 # Open AVCE00 datasource.
 
 
-def ogr_avc_1():
+def test_ogr_avc_1():
 
     # Example given at Annex A of http://avce00.maptools.org/docs/v7_e00_cover.html
     avc_ds = ogr.Open('data/test.e00')
@@ -78,7 +78,7 @@ def ogr_avc_1():
 # Open AVCBin datasource.
 
 
-def ogr_avc_2():
+def test_ogr_avc_2():
 
     avc_ds = ogr.Open('data/testavc/testavc')
     if avc_ds.GetLayer(0).GetSpatialRef() is None:
@@ -93,7 +93,7 @@ def ogr_avc_2():
 # Try opening a compressed E00 (which is not supported)
 
 
-def ogr_avc_3():
+def test_ogr_avc_3():
 
     gdal.PushErrorHandler('CPLQuietErrorHandler')
     avc_ds = ogr.Open('data/compressed.e00')
@@ -114,7 +114,7 @@ def ogr_avc_3():
 # Open larger AVCBin datasource.
 
 
-def ogr_avc_4():
+def test_ogr_avc_4():
 
     for filename in ['data/testpointavc/testpointavc', 'data/testpoint.e00']:
         avc_ds = ogr.Open(filename)
@@ -156,7 +156,7 @@ def ogr_avc_4():
 # Open AVCBin datasource with polygon
 
 
-def ogr_avc_5():
+def test_ogr_avc_5():
 
     for filename in ['data/testpolyavc/testpolyavc', 'data/testpoly.e00']:
         avc_ds = ogr.Open(filename)
@@ -202,11 +202,11 @@ def ogr_avc_5():
 
 
 gdaltest_list = [
-    ogr_avc_1,
-    ogr_avc_2,
-    ogr_avc_3,
-    ogr_avc_4,
-    ogr_avc_5
+    test_ogr_avc_1,
+    test_ogr_avc_2,
+    test_ogr_avc_3,
+    test_ogr_avc_4,
+    test_ogr_avc_5
 ]
 
 if __name__ == '__main__':
diff --git a/autotest/ogr/ogr_basic_test.py b/autotest/ogr/ogr_basic_test.py
index 32697f36f2ea..b4f149415462 100755
--- a/autotest/ogr/ogr_basic_test.py
+++ b/autotest/ogr/ogr_basic_test.py
@@ -39,7 +39,7 @@
 ###############################################################################
 
 
-def ogr_basic_1():
+def test_ogr_basic_1():
 
     gdaltest.ds = ogr.Open('data/poly.shp')
 
@@ -53,7 +53,7 @@ def ogr_basic_1():
 # Test Feature counting.
 
 
-def ogr_basic_2():
+def test_ogr_basic_2():
 
     gdaltest.lyr = gdaltest.ds.GetLayerByName('poly')
 
@@ -91,7 +91,7 @@ def ogr_basic_2():
 # Test Spatial Query.
 
 
-def ogr_basic_3():
+def test_ogr_basic_3():
 
     minx = 479405
     miny = 4762826
@@ -139,7 +139,7 @@ def ogr_basic_3():
 # Test GetDriver().
 
 
-def ogr_basic_4():
+def test_ogr_basic_4():
     driver = gdaltest.ds.GetDriver()
     if driver is None:
         gdaltest.post_reason('GetDriver() returns None')
@@ -155,7 +155,7 @@ def ogr_basic_4():
 # Test attribute query on special field fid - per bug 1468.
 
 
-def ogr_basic_5():
+def test_ogr_basic_5():
 
     gdaltest.lyr.SetAttributeFilter('FID = 3')
     gdaltest.lyr.ResetReading()
@@ -178,7 +178,7 @@ def ogr_basic_5():
 
 ###############################################################################
 # Test opening a dataset with an empty string and a non existing dataset
-def ogr_basic_6():
+def test_ogr_basic_6():
 
     # Put inside try/except for OG python bindings
     if ogr.Open('') is not None:
@@ -193,7 +193,7 @@ def ogr_basic_6():
 # Test ogr.Feature.Equal()
 
 
-def ogr_basic_7():
+def test_ogr_basic_7():
 
     feat_defn = ogr.FeatureDefn()
     feat = ogr.Feature(feat_defn)
@@ -386,7 +386,7 @@ def ogr_basic_7():
 # Issue several RegisterAll() to check that OGR drivers are good citizens
 
 
-def ogr_basic_8():
+def test_ogr_basic_8():
 
     ogr.RegisterAll()
     ogr.RegisterAll()
@@ -398,7 +398,7 @@ def ogr_basic_8():
 # Test ogr.GeometryTypeToName (#4871)
 
 
-def ogr_basic_9():
+def test_ogr_basic_9():
 
     geom_type_tuples = [[ogr.wkbUnknown, "Unknown (any)"],
                         [ogr.wkbPoint, "Point"],
@@ -432,7 +432,7 @@ def ogr_basic_9():
 # Run test_ogrsf -all_drivers
 
 
-def ogr_basic_10():
+def test_ogr_basic_10():
 
     import test_cli_utilities
     if test_cli_utilities.get_test_ogrsf_path() is None:
@@ -450,7 +450,7 @@ def ogr_basic_10():
 # Test double call to UseExceptions() (#5704)
 
 
-def ogr_basic_11():
+def test_ogr_basic_11():
 
     if not ogrtest.have_geos():
         return 'skip'
@@ -470,7 +470,7 @@ def ogr_basic_11():
 # Test OFSTBoolean, OFSTInt16 and OFSTFloat32
 
 
-def ogr_basic_12():
+def test_ogr_basic_12():
 
     # boolean integer
     feat_def = ogr.FeatureDefn()
@@ -643,7 +643,7 @@ def ogr_basic_12():
 # Test OGRParseDate (#6452)
 
 
-def ogr_basic_13():
+def test_ogr_basic_13():
     feat_defn = ogr.FeatureDefn('test')
     field_defn = ogr.FieldDefn('date', ogr.OFTDateTime)
     feat_defn.AddFieldDefn(field_defn)
@@ -686,7 +686,7 @@ def ogr_basic_13():
 # Test ogr.Open(.) in an empty directory
 
 
-def ogr_basic_14():
+def test_ogr_basic_14():
 
     os.mkdir('tmp/ogr_basic_14')
     os.chdir('tmp/ogr_basic_14')
@@ -704,7 +704,7 @@ def ogr_basic_14():
 # Test exceptions with OGRErr return code
 
 
-def ogr_basic_15():
+def test_ogr_basic_15():
 
     ds = ogr.Open('data/poly.shp')
     lyr = ds.GetLayer(0)
@@ -742,7 +742,7 @@ def ogr_basic_16_gen_list(N):
         yield i
 
 
-def ogr_basic_16():
+def test_ogr_basic_16():
 
     if list(ogr_basic_16_gen_list(2)) != [0, 1]:
         return 'fail'
@@ -750,7 +750,7 @@ def ogr_basic_16():
     return 'success'
 
 
-def ogr_basic_invalid_unicode():
+def test_ogr_basic_invalid_unicode():
 
     if sys.version_info >= (3, 0, 0):
         val = '\udcfc'
@@ -774,7 +774,7 @@ def ogr_basic_invalid_unicode():
     return 'success'
 
 
-def ogr_basic_dataset_slice():
+def test_ogr_basic_dataset_slice():
 
     ds = ogr.GetDriverByName('Memory').CreateDataSource('')
     ds.CreateLayer('lyr1')
@@ -806,7 +806,7 @@ def ogr_basic_dataset_slice():
 # cleanup
 
 
-def ogr_basic_cleanup():
+def test_ogr_basic_cleanup():
     gdaltest.lyr = None
     gdaltest.ds = None
 
@@ -814,25 +814,25 @@ def ogr_basic_cleanup():
 
 
 gdaltest_list = [
-    ogr_basic_1,
-    ogr_basic_2,
-    ogr_basic_3,
-    ogr_basic_4,
-    ogr_basic_5,
-    ogr_basic_6,
-    ogr_basic_7,
-    ogr_basic_8,
-    ogr_basic_9,
-    ogr_basic_10,
-    ogr_basic_11,
-    ogr_basic_12,
-    ogr_basic_13,
-    ogr_basic_14,
-    ogr_basic_15,
-    ogr_basic_16,
-    ogr_basic_invalid_unicode,
-    ogr_basic_dataset_slice,
-    ogr_basic_cleanup]
+    test_ogr_basic_1,
+    test_ogr_basic_2,
+    test_ogr_basic_3,
+    test_ogr_basic_4,
+    test_ogr_basic_5,
+    test_ogr_basic_6,
+    test_ogr_basic_7,
+    test_ogr_basic_8,
+    test_ogr_basic_9,
+    test_ogr_basic_10,
+    test_ogr_basic_11,
+    test_ogr_basic_12,
+    test_ogr_basic_13,
+    test_ogr_basic_14,
+    test_ogr_basic_15,
+    test_ogr_basic_16,
+    test_ogr_basic_invalid_unicode,
+    test_ogr_basic_dataset_slice,
+    test_ogr_basic_cleanup]
 
 # gdaltest_list = [ ogr_basic_13 ]
 
diff --git a/autotest/ogr/ogr_bna.py b/autotest/ogr/ogr_bna.py
index 9b07d9adf74c..f13372efbd25 100755
--- a/autotest/ogr/ogr_bna.py
+++ b/autotest/ogr/ogr_bna.py
@@ -41,7 +41,7 @@
 # Test points bna layer.
 
 
-def ogr_bna_1():
+def test_ogr_bna_1():
 
     gdaltest.bna_ds = ogr.Open('data/test.bna')
 
@@ -70,7 +70,7 @@ def ogr_bna_1():
 # Test lines bna layer.
 
 
-def ogr_bna_2():
+def test_ogr_bna_2():
 
     gdaltest.bna_ds = ogr.Open('data/test.bna')
 
@@ -93,7 +93,7 @@ def ogr_bna_2():
 # Test polygons bna layer.
 
 
-def ogr_bna_3():
+def test_ogr_bna_3():
 
     gdaltest.bna_ds = ogr.Open('data/test.bna')
 
@@ -129,7 +129,7 @@ def ogr_bna_3():
 # Test ellipses bna layer.
 
 
-def ogr_bna_4():
+def test_ogr_bna_4():
 
     gdaltest.bna_ds = ogr.Open('data/test.bna')
 
@@ -211,12 +211,12 @@ def ogr_bna_write(creation_options):
     return 'success'
 
 
-def ogr_bna_5():
+def test_ogr_bna_5():
 
     return ogr_bna_write(['ELLIPSES_AS_ELLIPSES=YES'])
 
 
-def ogr_bna_6():
+def test_ogr_bna_6():
 
     try:
         os.remove('tmp/out.bna')
@@ -249,7 +249,7 @@ def ogr_bna_6():
 #
 
 
-def ogr_bna_cleanup():
+def test_ogr_bna_cleanup():
 
     gdaltest.bna_ds = None
 
@@ -262,13 +262,13 @@ def ogr_bna_cleanup():
 
 
 gdaltest_list = [
-    ogr_bna_1,
-    ogr_bna_2,
-    ogr_bna_3,
-    ogr_bna_4,
-    ogr_bna_5,
-    ogr_bna_6,
-    ogr_bna_cleanup]
+    test_ogr_bna_1,
+    test_ogr_bna_2,
+    test_ogr_bna_3,
+    test_ogr_bna_4,
+    test_ogr_bna_5,
+    test_ogr_bna_6,
+    test_ogr_bna_cleanup]
 
 if __name__ == '__main__':
 
diff --git a/autotest/ogr/ogr_cad.py b/autotest/ogr/ogr_cad.py
index 0cc3dfb83a7a..7503507541a4 100755
--- a/autotest/ogr/ogr_cad.py
+++ b/autotest/ogr/ogr_cad.py
@@ -42,7 +42,7 @@
 # Check driver existence.
 
 
-def ogr_cad_1():
+def test_ogr_cad_1():
 
     gdaltest.cad_ds = None
     gdaltest.cad_dr = None
@@ -57,7 +57,7 @@ def ogr_cad_1():
 # Check driver properly opens simple file, reads correct feature (ellipse).
 
 
-def ogr_cad_2():
+def test_ogr_cad_2():
     if gdaltest.cad_dr is None:
         return 'skip'
 
@@ -135,7 +135,7 @@ def ogr_cad_2():
 # Check proper read of 3 layers (one circle on each) with different parameters.
 
 
-def ogr_cad_3():
+def test_ogr_cad_3():
     if gdaltest.cad_dr is None:
         return 'skip'
 
@@ -296,7 +296,7 @@ def ogr_cad_3():
 # Check reading of a single point.
 
 
-def ogr_cad_4():
+def test_ogr_cad_4():
     if gdaltest.cad_dr is None:
         return 'skip'
 
@@ -325,7 +325,7 @@ def ogr_cad_4():
 # Check reading of a simple line.
 
 
-def ogr_cad_5():
+def test_ogr_cad_5():
     if gdaltest.cad_dr is None:
         return 'skip'
 
@@ -355,7 +355,7 @@ def ogr_cad_5():
 # OGR feature style string to LABEL.
 
 
-def ogr_cad_6():
+def test_ogr_cad_6():
     if gdaltest.cad_dr is None:
         return 'skip'
 
@@ -389,7 +389,7 @@ def ogr_cad_6():
 # Check MTEXT as TEXT geometry.
 
 
-def ogr_cad_7():
+def test_ogr_cad_7():
     if gdaltest.cad_dr is None:
         return 'skip'
 
@@ -410,7 +410,7 @@ def ogr_cad_7():
 # Check ATTDEF as TEXT geometry.
 
 
-def ogr_cad_8():
+def test_ogr_cad_8():
     if gdaltest.cad_dr is None:
         return 'skip'
 
@@ -431,7 +431,7 @@ def ogr_cad_8():
 # Open a not handled DWG version
 
 
-def ogr_cad_9():
+def test_ogr_cad_9():
     if gdaltest.cad_dr is None:
         return 'skip'
 
@@ -451,7 +451,7 @@ def ogr_cad_9():
 # Cleanup
 
 
-def ogr_cad_cleanup():
+def test_ogr_cad_cleanup():
     gdaltest.cad_layer = None
     gdaltest.cad_ds = None
 
@@ -459,16 +459,16 @@ def ogr_cad_cleanup():
 
 
 gdaltest_list = [
-    ogr_cad_1,
-    ogr_cad_2,
-    ogr_cad_3,
-    ogr_cad_4,
-    ogr_cad_5,
-    ogr_cad_6,
-    ogr_cad_7,
-    ogr_cad_8,
-    ogr_cad_9,
-    ogr_cad_cleanup]
+    test_ogr_cad_1,
+    test_ogr_cad_2,
+    test_ogr_cad_3,
+    test_ogr_cad_4,
+    test_ogr_cad_5,
+    test_ogr_cad_6,
+    test_ogr_cad_7,
+    test_ogr_cad_8,
+    test_ogr_cad_9,
+    test_ogr_cad_cleanup]
 
 if __name__ == '__main__':
 
diff --git a/autotest/ogr/ogr_carto.py b/autotest/ogr/ogr_carto.py
index 67e41a8f80c3..b7f974fed208 100755
--- a/autotest/ogr/ogr_carto.py
+++ b/autotest/ogr/ogr_carto.py
@@ -43,7 +43,7 @@
 # Test if driver is available
 
 
-def ogr_carto_init():
+def test_ogr_carto_init():
 
     ogrtest.carto_drv = None
 
@@ -57,7 +57,7 @@ def ogr_carto_init():
 ###############################################################################
 #
 
-def ogr_carto_vsimem():
+def test_ogr_carto_vsimem():
     if ogrtest.carto_drv is None:
         return 'skip'
 
@@ -1046,7 +1046,7 @@ def ogr_carto_vsimem():
 #
 
 
-def ogr_carto_vsimem_cleanup():
+def test_ogr_carto_vsimem_cleanup():
     if ogrtest.carto_drv is None:
         return 'skip'
 
@@ -1065,7 +1065,7 @@ def ogr_carto_vsimem_cleanup():
 #  Run test_ogrsf
 
 
-def ogr_carto_test_ogrsf():
+def test_ogr_carto_test_ogrsf():
     if ogrtest.carto_drv is None or gdal.GetConfigOption('SKIP_SLOW') is not None:
         return 'skip'
 
@@ -1299,10 +1299,10 @@ def ogr_carto_rw_1():
 
 
 gdaltest_list = [
-    ogr_carto_init,
-    ogr_carto_vsimem,
-    ogr_carto_vsimem_cleanup,
-    ogr_carto_test_ogrsf
+    test_ogr_carto_init,
+    test_ogr_carto_vsimem,
+    test_ogr_carto_vsimem_cleanup,
+    test_ogr_carto_test_ogrsf
 ]
 
 
diff --git a/autotest/ogr/ogr_cloudant.py b/autotest/ogr/ogr_cloudant.py
index 6b8eb8dced25..249dcfc899dc 100755
--- a/autotest/ogr/ogr_cloudant.py
+++ b/autotest/ogr/ogr_cloudant.py
@@ -42,7 +42,7 @@
 # Test if driver is available
 
 
-def ogr_cloudant_init():
+def test_ogr_cloudant_init():
 
     ogrtest.cloudant_drv = None
 
@@ -74,7 +74,7 @@ def ogr_cloudant_init():
 # Test GetFeatureCount()
 
 
-def ogr_cloudant_GetFeatureCount():
+def test_ogr_cloudant_GetFeatureCount():
     if ogrtest.cloudant_drv is None:
         return 'skip'
 
@@ -98,7 +98,7 @@ def ogr_cloudant_GetFeatureCount():
 # Test GetNextFeature()
 
 
-def ogr_cloudant_GetNextFeature():
+def test_ogr_cloudant_GetNextFeature():
     if ogrtest.cloudant_drv is None:
         return 'skip'
 
@@ -125,7 +125,7 @@ def ogr_cloudant_GetNextFeature():
 # Test GetSpatialRef()
 
 
-def ogr_cloudant_GetSpatialRef():
+def test_ogr_cloudant_GetSpatialRef():
     if ogrtest.cloudant_drv is None:
         return 'skip'
 
@@ -148,7 +148,7 @@ def ogr_cloudant_GetSpatialRef():
 # Test GetExtent()
 
 
-def ogr_cloudant_GetExtent():
+def test_ogr_cloudant_GetExtent():
     if ogrtest.cloudant_drv is None:
         return 'skip'
 
@@ -176,7 +176,7 @@ def ogr_cloudant_GetExtent():
 # Test SetSpatialFilter()
 
 
-def ogr_cloudant_SetSpatialFilter():
+def test_ogr_cloudant_SetSpatialFilter():
     if ogrtest.cloudant_drv is None:
         return 'skip'
 
@@ -206,12 +206,12 @@ def ogr_cloudant_SetSpatialFilter():
 
 
 gdaltest_list = [
-    ogr_cloudant_init,
-    ogr_cloudant_GetFeatureCount,
-    ogr_cloudant_GetNextFeature,
-    ogr_cloudant_GetSpatialRef,
-    ogr_cloudant_GetExtent,
-    ogr_cloudant_SetSpatialFilter
+    test_ogr_cloudant_init,
+    test_ogr_cloudant_GetFeatureCount,
+    test_ogr_cloudant_GetNextFeature,
+    test_ogr_cloudant_GetSpatialRef,
+    test_ogr_cloudant_GetExtent,
+    test_ogr_cloudant_SetSpatialFilter
 ]
 
 if __name__ == '__main__':
diff --git a/autotest/ogr/ogr_couchdb.py b/autotest/ogr/ogr_couchdb.py
index 990df5f0a182..83e00280e880 100755
--- a/autotest/ogr/ogr_couchdb.py
+++ b/autotest/ogr/ogr_couchdb.py
@@ -43,7 +43,7 @@
 # Test if driver is available
 
 
-def ogr_couchdb_init():
+def test_ogr_couchdb_init():
 
     ogrtest.couchdb_drv = None
 
@@ -68,7 +68,7 @@ def ogr_couchdb_init():
 # Basic test
 
 
-def ogr_couchdb_1():
+def test_ogr_couchdb_1():
     if ogrtest.couchdb_drv is None:
         return 'skip'
 
@@ -93,7 +93,7 @@ def ogr_couchdb_1():
 # Test null / unset
 
 
-def ogr_couchdb_2():
+def test_ogr_couchdb_2():
     if ogrtest.couchdb_drv is None:
         return 'skip'
 
@@ -138,7 +138,7 @@ def ogr_couchdb_2():
 ###############################################################################
 # Cleanup
 
-def ogr_couchdb_cleanup():
+def test_ogr_couchdb_cleanup():
     if ogrtest.couchdb_drv is None:
         return 'skip'
 
@@ -151,10 +151,10 @@ def ogr_couchdb_cleanup():
 
 
 gdaltest_list = [
-    ogr_couchdb_init,
-    ogr_couchdb_1,
-    ogr_couchdb_2,
-    ogr_couchdb_cleanup
+    test_ogr_couchdb_init,
+    test_ogr_couchdb_1,
+    test_ogr_couchdb_2,
+    test_ogr_couchdb_cleanup
 ]
 
 if __name__ == '__main__':
diff --git a/autotest/ogr/ogr_csv.py b/autotest/ogr/ogr_csv.py
index b69fb6bbaabf..43aed35ae336 100755
--- a/autotest/ogr/ogr_csv.py
+++ b/autotest/ogr/ogr_csv.py
@@ -41,7 +41,7 @@
 # Open CSV datasource.
 
 
-def ogr_csv_1():
+def test_ogr_csv_1():
 
     gdaltest.csv_ds = None
     gdaltest.csv_ds = ogr.Open('data/prime_meridian.csv')
@@ -84,7 +84,7 @@ def ogr_csv_check_layer(lyr, expect_code_as_numeric):
 #
 
 
-def ogr_csv_2():
+def test_ogr_csv_2():
     if gdaltest.csv_ds is None:
         return 'skip'
 
@@ -151,7 +151,7 @@ def ogr_csv_copy_layer(layer_name, options):
 # Copy prime_meridian.csv to a new subtree under the tmp directory.
 
 
-def ogr_csv_3():
+def test_ogr_csv_3():
     if gdaltest.csv_ds is None:
         return 'skip'
 
@@ -196,7 +196,7 @@ def ogr_csv_3():
 # NOTE: one weird thing is that in this pass the prime_meridian_code field
 # is typed as integer instead of string since it is created literally.
 
-def ogr_csv_4():
+def test_ogr_csv_4():
     if gdaltest.csv_ds is None:
         return 'skip'
 
@@ -206,7 +206,7 @@ def ogr_csv_4():
 # Copy prime_meridian.csv again, in CRLF mode.
 
 
-def ogr_csv_5():
+def test_ogr_csv_5():
     if gdaltest.csv_ds is None:
         return 'skip'
 
@@ -221,7 +221,7 @@ def ogr_csv_5():
 #
 
 
-def ogr_csv_6():
+def test_ogr_csv_6():
     if gdaltest.csv_ds is None:
         return 'skip'
 
@@ -232,7 +232,7 @@ def ogr_csv_6():
 #
 
 
-def ogr_csv_7():
+def test_ogr_csv_7():
     if gdaltest.csv_ds is None:
         return 'skip'
 
@@ -270,7 +270,7 @@ def ogr_csv_7():
 #
 
 
-def ogr_csv_8():
+def test_ogr_csv_8():
     if gdaltest.csv_ds is None:
         return 'skip'
 
@@ -294,7 +294,7 @@ def ogr_csv_8():
 #
 
 
-def ogr_csv_9():
+def test_ogr_csv_9():
     if gdaltest.csv_ds is None:
         return 'skip'
 
@@ -328,7 +328,7 @@ def ogr_csv_9():
 #
 
 
-def ogr_csv_10():
+def test_ogr_csv_10():
     if gdaltest.csv_ds is None:
         return 'skip'
 
@@ -479,7 +479,7 @@ def ogr_csv_check_testcsvt(lyr):
 # Verify handling of csvt with width and precision specified
 # Test NULL handling of non string columns too (#2756)
 
-def ogr_csv_11():
+def test_ogr_csv_11():
 
     if gdaltest.csv_ds is None:
         return 'skip'
@@ -498,7 +498,7 @@ def ogr_csv_11():
 # Verify CREATE_CSVT=YES option
 
 
-def ogr_csv_12():
+def test_ogr_csv_12():
 
     if gdaltest.csv_ds is None:
         return 'skip'
@@ -559,7 +559,7 @@ def ogr_csv_12():
 # Verify GEOMETRY=AS_WKT,AS_XY,AS_XYZ,AS_YX options
 
 
-def ogr_csv_13():
+def test_ogr_csv_13():
 
     if gdaltest.csv_ds is None:
         return 'skip'
@@ -729,7 +729,7 @@ def ogr_csv_13():
 # Copy prime_meridian.csv again, with SEMICOLON as separator
 
 
-def ogr_csv_14():
+def test_ogr_csv_14():
     if gdaltest.csv_ds is None:
         return 'skip'
 
@@ -748,7 +748,7 @@ def ogr_csv_14():
 #
 
 
-def ogr_csv_15():
+def test_ogr_csv_15():
     if gdaltest.csv_ds is None:
         return 'skip'
 
@@ -759,7 +759,7 @@ def ogr_csv_15():
 #
 
 
-def ogr_csv_16():
+def test_ogr_csv_16():
     if gdaltest.csv_ds is None:
         return 'skip'
 
@@ -774,7 +774,7 @@ def ogr_csv_16():
 #
 
 
-def ogr_csv_17():
+def test_ogr_csv_17():
     if gdaltest.csv_ds is None:
         return 'skip'
 
@@ -805,7 +805,7 @@ def ogr_csv_17():
 ###############################################################################
 # Write to /vsistdout/
 
-def ogr_csv_18():
+def test_ogr_csv_18():
 
     ds = ogr.GetDriverByName('CSV').CreateDataSource('/vsistdout/')
     lyr = ds.CreateLayer('foo', options=['GEOMETRY=AS_WKT'])
@@ -824,7 +824,7 @@ def ogr_csv_18():
 # Verify handling of non-numeric values in numeric columns
 
 
-def ogr_csv_19():
+def test_ogr_csv_19():
 
     if gdaltest.csv_ds is None:
         return 'skip'
@@ -860,7 +860,7 @@ def ogr_csv_19():
 ###############################################################################
 # Verify handling of column names with numbers
 
-def ogr_csv_20():
+def test_ogr_csv_20():
 
     if gdaltest.csv_ds is None:
         return 'skip'
@@ -913,7 +913,7 @@ def ogr_csv_20():
 # Verify handling of numeric column names with quotes (bug #4361)
 
 
-def ogr_csv_21():
+def test_ogr_csv_21():
 
     if gdaltest.csv_ds is None:
         return 'skip'
@@ -960,7 +960,7 @@ def ogr_csv_21():
 ###############################################################################
 # Test handling of UTF8 BOM (bug #4623)
 
-def ogr_csv_22():
+def test_ogr_csv_22():
 
     ds = ogr.Open('data/csv_with_utf8_bom.csv')
     lyr = ds.GetLayer(0)
@@ -974,7 +974,7 @@ def ogr_csv_22():
     return 'success'
 
 
-def ogr_csv_23():
+def test_ogr_csv_23():
     # create a CSV file with UTF8 BOM
     ds = ogr.Open('tmp/csvwrk', update=1)
     lyr = ds.CreateLayer('utf8', options=['WRITE_BOM=YES', 'GEOMETRY=AS_WKT'])
@@ -1028,7 +1028,7 @@ def ogr_csv_23():
 # Test single column CSV files
 
 
-def ogr_csv_24():
+def test_ogr_csv_24():
 
     # Create an invalid CSV file
     f = gdal.VSIFOpenL('/vsimem/invalid.csv', 'wb')
@@ -1071,7 +1071,7 @@ def ogr_csv_24():
 ###############################################################################
 # Test newline handling (#4452)
 
-def ogr_csv_25():
+def test_ogr_csv_25():
     ds = ogr.Open('tmp/csvwrk', update=1)
     lyr = ds.CreateLayer('newlines', options=['LINEFORMAT=LF'])  # just in case tests are run on windows...
     lyr.CreateField(ogr.FieldDefn('foo', ogr.OFTString))
@@ -1096,7 +1096,7 @@ def ogr_csv_25():
 ###############################################################################
 # Test number padding behaviour (#4469)
 
-def ogr_csv_26():
+def test_ogr_csv_26():
     ds = ogr.Open('tmp/csvwrk', update=1)
     lyr = ds.CreateLayer('num_padding', options=['LINEFORMAT=LF'])  # just in case tests are run on windows...
 
@@ -1129,7 +1129,7 @@ def ogr_csv_26():
 # Test Eurostat .TSV files
 
 
-def ogr_csv_27():
+def test_ogr_csv_27():
 
     ds = ogr.Open('data/test_eurostat.tsv')
     lyr = ds.GetLayer(0)
@@ -1180,7 +1180,7 @@ def ogr_csv_27():
 # Check that we don't rewrite erroneously a file that has no header (#5161).
 
 
-def ogr_csv_28():
+def test_ogr_csv_28():
 
     f = open('tmp/ogr_csv_28.csv', 'wb')
     f.write('1,2\n'.encode('ascii'))
@@ -1206,7 +1206,7 @@ def ogr_csv_28():
 # Check multi geometry field support
 
 
-def ogr_csv_29():
+def test_ogr_csv_29():
 
     ds = ogr.GetDriverByName('CSV').CreateDataSource('tmp/ogr_csv_29', options=['GEOMETRY=AS_WKT'])
     if ds.TestCapability(ogr.ODsCCurveGeometries) != 1:
@@ -1265,7 +1265,7 @@ def ogr_csv_29():
 # Run test_ogrsf
 
 
-def ogr_csv_30():
+def test_ogr_csv_30():
 
     import test_cli_utilities
     if test_cli_utilities.get_test_ogrsf_path() is None:
@@ -1283,7 +1283,7 @@ def ogr_csv_30():
 # Read geonames.org allCountries.txt
 
 
-def ogr_csv_31():
+def test_ogr_csv_31():
 
     ds = ogr.Open('data/allCountries.txt')
     lyr = ds.GetLayer(0)
@@ -1312,7 +1312,7 @@ def ogr_csv_31():
 # Test AUTODETECT_TYPE=YES
 
 
-def ogr_csv_32():
+def test_ogr_csv_32():
 
     # Without limit, everything will be detected as string
     ds = gdal.OpenEx('data/testtypeautodetect.csv', gdal.OF_VECTOR,
@@ -1525,7 +1525,7 @@ def ogr_csv_32():
 # Test Boolean, Int16 and Float32 support
 
 
-def ogr_csv_33():
+def test_ogr_csv_33():
 
     ds = gdal.OpenEx('data/testtypeautodetectboolean.csv', gdal.OF_VECTOR,
                      open_options=['AUTODETECT_TYPE=YES'])
@@ -1595,7 +1595,7 @@ def ogr_csv_33():
 # Test Integer64 support
 
 
-def ogr_csv_34():
+def test_ogr_csv_34():
 
     ds = gdal.OpenEx('data/testtypeautodetectinteger64.csv', gdal.OF_VECTOR,
                      open_options=['AUTODETECT_TYPE=YES'])
@@ -1646,7 +1646,7 @@ def ogr_csv_34():
 # Test comma separator
 
 
-def ogr_csv_35():
+def test_ogr_csv_35():
 
     gdal.FileFromMemBuffer('/vsimem/ogr_csv_35.csv',
                            """FIELD_1  "FIELD 2" FIELD_3
@@ -1692,7 +1692,7 @@ def ogr_csv_35():
 # Test GEOM_POSSIBLE_NAMES open option
 
 
-def ogr_csv_36():
+def test_ogr_csv_36():
 
     gdal.FileFromMemBuffer('/vsimem/ogr_csv_36.csv',
                            """id,mygeometry,format
@@ -1797,7 +1797,7 @@ def ogr_csv_36():
 # Test X_POSSIBLE_NAMES, Y_POSSIBLE_NAMES and Z_POSSIBLE_NAMES open options
 
 
-def ogr_csv_37():
+def test_ogr_csv_37():
 
     gdal.FileFromMemBuffer('/vsimem/ogr_csv_37.csv',
                            """id,y,other,x,z
@@ -1869,7 +1869,7 @@ def ogr_csv_37():
 # Test GeoCSV WKT type
 
 
-def ogr_csv_38():
+def test_ogr_csv_38():
 
     ds = ogr.GetDriverByName('CSV').CreateDataSource('/vsimem/ogr_csv_38.csv')
     srs = osr.SpatialReference()
@@ -1907,7 +1907,7 @@ def ogr_csv_38():
 # Test GeoCSV CoordX and CoordY types
 
 
-def ogr_csv_39():
+def test_ogr_csv_39():
 
     ds = ogr.GetDriverByName('CSV').CreateDataSource('/vsimem/ogr_csv_39.csv')
     lyr = ds.CreateLayer('ogr_csv_38', options=['GEOMETRY=AS_XY', 'CREATE_CSVT=YES'])
@@ -1936,7 +1936,7 @@ def ogr_csv_39():
 # Test X_POSSIBLE_NAMES, Y_POSSIBLE_NAMES, GEOM_POSSIBLE_NAMES and KEEP_GEOM_COLUMNS=NO together (#6137)
 
 
-def ogr_csv_40():
+def test_ogr_csv_40():
 
     gdal.FileFromMemBuffer('/vsimem/ogr_csv_40.csv',
                            """latitude,longitude,the_geom,id
@@ -1980,7 +1980,7 @@ def ogr_csv_40():
 # Test GEOM_POSSIBLE_NAMES and KEEP_GEOM_COLUMNS=NO together with empty content in geom column (#6152)
 
 
-def ogr_csv_41():
+def test_ogr_csv_41():
 
     gdal.FileFromMemBuffer('/vsimem/ogr_csv_41.csv',
                            """id,the_geom,foo
@@ -2005,7 +2005,7 @@ def ogr_csv_41():
 # Test writing field with empty content
 
 
-def ogr_csv_42():
+def test_ogr_csv_42():
 
     ds = ogr.GetDriverByName('CSV').CreateDataSource('/vsimem/ogr_csv_42.csv')
     lyr = ds.CreateLayer('ogr_csv_42')
@@ -2025,7 +2025,7 @@ def ogr_csv_42():
 # Test editing capabilities
 
 
-def ogr_csv_43():
+def test_ogr_csv_43():
 
     ds = ogr.GetDriverByName('CSV').CreateDataSource('/vsimem/ogr_csv_43.csv')
     lyr = ds.CreateLayer('ogr_csv_43', options=['GEOMETRY=AS_WKT', 'CREATE_CSVT=YES'])
@@ -2324,7 +2324,7 @@ def ogr_csv_43():
 # Test seeking back while creating
 
 
-def ogr_csv_44():
+def test_ogr_csv_44():
 
     ds = ogr.GetDriverByName('CSV').CreateDataSource('/vsimem/ogr_csv_44.csv')
     lyr = ds.CreateLayer('ogr_csv_44', options=['GEOMETRY=AS_WKT'])
@@ -2361,7 +2361,7 @@ def ogr_csv_44():
 # CreateField() on the main dataset and assuming that file is already serialized.
 
 
-def ogr_csv_45():
+def test_ogr_csv_45():
 
     ds = ogr.GetDriverByName('CSV').CreateDataSource('/vsimem/ogr_csv_45.csv')
     lyr = ds.CreateLayer('ogr_csv_45', options=['GEOMETRY=AS_WKT'])
@@ -2387,7 +2387,7 @@ def ogr_csv_45():
 # Test edition of CSV files with X_POSSIBLE_NAMES, Y_POSSIBLE_NAMES open options
 
 
-def ogr_csv_46():
+def test_ogr_csv_46():
 
     ds = ogr.GetDriverByName('CSV').CreateDataSource('/vsimem/ogr_csv_46.csv')
     lyr = ds.CreateLayer('ogr_csv_46')
@@ -2472,7 +2472,7 @@ def ogr_csv_46():
 # Test writing XYZM
 
 
-def ogr_csv_47():
+def test_ogr_csv_47():
 
     ds = ogr.GetDriverByName('CSV').CreateDataSource('/vsimem/ogr_csv_47.csv')
     if ds.TestCapability(ogr.ODsCMeasuredGeometries) != 1:
@@ -2507,7 +2507,7 @@ def ogr_csv_47():
 # Test reading/writing StringList, etc..
 
 
-def ogr_csv_48():
+def test_ogr_csv_48():
 
     gdal.FileFromMemBuffer('/vsimem/ogr_csv_48.csvt', 'JsonStringList,JsonIntegerList,JsonInteger64List,JsonRealList\n')
     gdal.FileFromMemBuffer('/vsimem/ogr_csv_48.csv',
@@ -2546,7 +2546,7 @@ def ogr_csv_48():
 # Test EMPTY_STRING_AS_NULL=ES
 
 
-def ogr_csv_49():
+def test_ogr_csv_49():
     gdal.FileFromMemBuffer('/vsimem/ogr_csv_49.csv',
                            """id,str
 1,
@@ -2568,7 +2568,7 @@ def ogr_csv_49():
 ###############################################################################
 
 
-def ogr_csv_more_than_100_geom_fields():
+def test_ogr_csv_more_than_100_geom_fields():
 
     with gdaltest.error_handler():
         ds = ogr.Open('data/more_than_100_geom_fields.csv')
@@ -2580,7 +2580,7 @@ def ogr_csv_more_than_100_geom_fields():
 ###############################################################################
 
 
-def ogr_csv_string_quoting_always():
+def test_ogr_csv_string_quoting_always():
 
     gdal.VectorTranslate('/vsimem/ogr_csv_string_quoting_always.csv',
                          'data/poly.shp', format='CSV',
@@ -2620,7 +2620,7 @@ def ogr_csv_string_quoting_always():
 ###############################################################################
 
 
-def ogr_csv_string_quoting_if_ambiguous():
+def test_ogr_csv_string_quoting_if_ambiguous():
 
     src_ds = gdal.GetDriverByName('Memory').Create('', 0, 0, 0, gdal.GDT_Unknown)
     lyr = src_ds.CreateLayer('layer')
@@ -2652,7 +2652,7 @@ def ogr_csv_string_quoting_if_ambiguous():
 ###############################################################################
 
 
-def ogr_csv_string_quoting_if_needed():
+def test_ogr_csv_string_quoting_if_needed():
 
     src_ds = gdal.GetDriverByName('Memory').Create('', 0, 0, 0, gdal.GDT_Unknown)
     lyr = src_ds.CreateLayer('layer')
@@ -2685,7 +2685,7 @@ def ogr_csv_string_quoting_if_needed():
 ###############################################################################
 
 
-def ogr_csv_iter_and_set_feature():
+def test_ogr_csv_iter_and_set_feature():
     gdal.FileFromMemBuffer('/vsimem/ogr_csv_iter_and_set_feature.csv',
                            """id,str
 1,
@@ -2713,7 +2713,7 @@ def ogr_csv_iter_and_set_feature():
 #
 
 
-def ogr_csv_cleanup():
+def test_ogr_csv_cleanup():
 
     if gdaltest.csv_ds is None:
         return 'skip'
@@ -2742,62 +2742,62 @@ def ogr_csv_cleanup():
 
 
 gdaltest_list = [
-    ogr_csv_1,
-    ogr_csv_2,
-    ogr_csv_3,
-    ogr_csv_4,
-    ogr_csv_5,
-    ogr_csv_6,
-    ogr_csv_6,
-    ogr_csv_7,
-    ogr_csv_8,
-    ogr_csv_9,
-    ogr_csv_10,
-    ogr_csv_11,
-    ogr_csv_12,
-    ogr_csv_13,
-    ogr_csv_14,
-    ogr_csv_15,
-    ogr_csv_16,
-    ogr_csv_17,
-    ogr_csv_18,
-    ogr_csv_19,
-    ogr_csv_20,
-    ogr_csv_21,
-    ogr_csv_22,
-    ogr_csv_23,
-    ogr_csv_24,
-    ogr_csv_25,
-    ogr_csv_26,
-    ogr_csv_27,
-    ogr_csv_28,
-    ogr_csv_29,
-    ogr_csv_30,
-    ogr_csv_31,
-    ogr_csv_32,
-    ogr_csv_33,
-    ogr_csv_34,
-    ogr_csv_35,
-    ogr_csv_36,
-    ogr_csv_37,
-    ogr_csv_38,
-    ogr_csv_39,
-    ogr_csv_40,
-    ogr_csv_41,
-    ogr_csv_42,
-    ogr_csv_43,
-    ogr_csv_44,
-    ogr_csv_45,
-    ogr_csv_46,
-    ogr_csv_47,
-    ogr_csv_48,
-    ogr_csv_49,
-    ogr_csv_more_than_100_geom_fields,
-    ogr_csv_string_quoting_always,
-    ogr_csv_string_quoting_if_ambiguous,
-    ogr_csv_string_quoting_if_needed,
-    ogr_csv_iter_and_set_feature,
-    ogr_csv_cleanup]
+    test_ogr_csv_1,
+    test_ogr_csv_2,
+    test_ogr_csv_3,
+    test_ogr_csv_4,
+    test_ogr_csv_5,
+    test_ogr_csv_6,
+    test_ogr_csv_6,
+    test_ogr_csv_7,
+    test_ogr_csv_8,
+    test_ogr_csv_9,
+    test_ogr_csv_10,
+    test_ogr_csv_11,
+    test_ogr_csv_12,
+    test_ogr_csv_13,
+    test_ogr_csv_14,
+    test_ogr_csv_15,
+    test_ogr_csv_16,
+    test_ogr_csv_17,
+    test_ogr_csv_18,
+    test_ogr_csv_19,
+    test_ogr_csv_20,
+    test_ogr_csv_21,
+    test_ogr_csv_22,
+    test_ogr_csv_23,
+    test_ogr_csv_24,
+    test_ogr_csv_25,
+    test_ogr_csv_26,
+    test_ogr_csv_27,
+    test_ogr_csv_28,
+    test_ogr_csv_29,
+    test_ogr_csv_30,
+    test_ogr_csv_31,
+    test_ogr_csv_32,
+    test_ogr_csv_33,
+    test_ogr_csv_34,
+    test_ogr_csv_35,
+    test_ogr_csv_36,
+    test_ogr_csv_37,
+    test_ogr_csv_38,
+    test_ogr_csv_39,
+    test_ogr_csv_40,
+    test_ogr_csv_41,
+    test_ogr_csv_42,
+    test_ogr_csv_43,
+    test_ogr_csv_44,
+    test_ogr_csv_45,
+    test_ogr_csv_46,
+    test_ogr_csv_47,
+    test_ogr_csv_48,
+    test_ogr_csv_49,
+    test_ogr_csv_more_than_100_geom_fields,
+    test_ogr_csv_string_quoting_always,
+    test_ogr_csv_string_quoting_if_ambiguous,
+    test_ogr_csv_string_quoting_if_needed,
+    test_ogr_csv_iter_and_set_feature,
+    test_ogr_csv_cleanup]
 
 if __name__ == '__main__':
 
diff --git a/autotest/ogr/ogr_csw.py b/autotest/ogr/ogr_csw.py
index 4a1ff2cc8417..7b8178072cb7 100755
--- a/autotest/ogr/ogr_csw.py
+++ b/autotest/ogr/ogr_csw.py
@@ -82,7 +82,7 @@ def test_ogr_csw_pycsw():
 ###############################################################################
 
 
-def ogr_csw_vsimem_fail_because_not_enabled():
+def test_ogr_csw_vsimem_fail_because_not_enabled():
     gdal.PushErrorHandler()
     ds = ogr.Open('CSW:/vsimem/csw_endpoint')
     gdal.PopErrorHandler()
@@ -93,7 +93,7 @@ def ogr_csw_vsimem_fail_because_not_enabled():
 
 
 ###############################################################################
-def ogr_csw_vsimem_fail_because_no_get_capabilities():
+def test_ogr_csw_vsimem_fail_because_no_get_capabilities():
     gdal.SetConfigOption('CPL_CURL_ENABLE_VSIMEM', 'YES')
 
     gdal.PushErrorHandler()
@@ -107,7 +107,7 @@ def ogr_csw_vsimem_fail_because_no_get_capabilities():
 ###############################################################################
 
 
-def ogr_csw_vsimem_fail_because_empty_response():
+def test_ogr_csw_vsimem_fail_because_empty_response():
     gdal.SetConfigOption('CPL_CURL_ENABLE_VSIMEM', 'YES')
 
     gdal.FileFromMemBuffer('/vsimem/csw_endpoint?SERVICE=CSW&REQUEST=GetCapabilities',
@@ -128,7 +128,7 @@ def ogr_csw_vsimem_fail_because_empty_response():
 ###############################################################################
 
 
-def ogr_csw_vsimem_fail_because_no_CSW_Capabilities():
+def test_ogr_csw_vsimem_fail_because_no_CSW_Capabilities():
     gdal.SetConfigOption('CPL_CURL_ENABLE_VSIMEM', 'YES')
 
     gdal.FileFromMemBuffer('/vsimem/csw_endpoint?SERVICE=CSW&REQUEST=GetCapabilities',
@@ -149,7 +149,7 @@ def ogr_csw_vsimem_fail_because_no_CSW_Capabilities():
 ###############################################################################
 
 
-def ogr_csw_vsimem_fail_because_exception():
+def test_ogr_csw_vsimem_fail_because_exception():
     gdal.SetConfigOption('CPL_CURL_ENABLE_VSIMEM', 'YES')
 
     gdal.FileFromMemBuffer('/vsimem/csw_endpoint?SERVICE=CSW&REQUEST=GetCapabilities',
@@ -170,7 +170,7 @@ def ogr_csw_vsimem_fail_because_exception():
 ###############################################################################
 
 
-def ogr_csw_vsimem_fail_because_invalid_xml_capabilities():
+def test_ogr_csw_vsimem_fail_because_invalid_xml_capabilities():
     gdal.SetConfigOption('CPL_CURL_ENABLE_VSIMEM', 'YES')
 
     gdal.FileFromMemBuffer('/vsimem/csw_endpoint?SERVICE=CSW&REQUEST=GetCapabilities',
@@ -191,7 +191,7 @@ def ogr_csw_vsimem_fail_because_invalid_xml_capabilities():
 ###############################################################################
 
 
-def ogr_csw_vsimem_fail_because_missing_version():
+def test_ogr_csw_vsimem_fail_because_missing_version():
     gdal.SetConfigOption('CPL_CURL_ENABLE_VSIMEM', 'YES')
 
     gdal.FileFromMemBuffer('/vsimem/csw_endpoint?SERVICE=CSW&REQUEST=GetCapabilities',
@@ -214,7 +214,7 @@ def ogr_csw_vsimem_fail_because_missing_version():
 ###############################################################################
 
 
-def ogr_csw_vsimem_csw_minimal_instance():
+def test_ogr_csw_vsimem_csw_minimal_instance():
     gdal.SetConfigOption('CPL_CURL_ENABLE_VSIMEM', 'YES')
 
     # Invalid response, but enough for use
@@ -533,7 +533,7 @@ def ogr_csw_vsimem_csw_minimal_instance():
 ###############################################################################
 
 
-def ogr_csw_vsimem_csw_output_schema_csw():
+def test_ogr_csw_vsimem_csw_output_schema_csw():
     ds = gdal.OpenEx('CSW:/vsimem/csw_endpoint', open_options=['OUTPUT_SCHEMA=CSW'])
     lyr = ds.GetLayer(0)
 
@@ -594,7 +594,7 @@ def ogr_csw_vsimem_csw_output_schema_csw():
 ###############################################################################
 
 
-def ogr_csw_vsimem_csw_output_schema_gmd():
+def test_ogr_csw_vsimem_csw_output_schema_gmd():
     ds = gdal.OpenEx('CSW:/vsimem/csw_endpoint', open_options=['OUTPUT_SCHEMA=GMD'])
     lyr = ds.GetLayer(0)
 
@@ -636,7 +636,7 @@ def ogr_csw_vsimem_csw_output_schema_gmd():
 ###############################################################################
 
 
-def ogr_csw_vsimem_csw_output_schema_fgdc():
+def test_ogr_csw_vsimem_csw_output_schema_fgdc():
     ds = gdal.OpenEx('CSW:/vsimem/csw_endpoint', open_options=['OUTPUT_SCHEMA=http://www.opengis.net/cat/csw/csdgm'])
     lyr = ds.GetLayer(0)
 
@@ -680,7 +680,7 @@ def ogr_csw_vsimem_csw_output_schema_fgdc():
 ###############################################################################
 
 
-def ogr_csw_vsimem_cleanup():
+def test_ogr_csw_vsimem_cleanup():
     gdal.SetConfigOption('CPL_CURL_ENABLE_VSIMEM', None)
 
     for f in gdal.ReadDir('/vsimem/'):
@@ -690,18 +690,18 @@ def ogr_csw_vsimem_cleanup():
 
 
 gdaltest_list = [
-    ogr_csw_vsimem_fail_because_not_enabled,
-    ogr_csw_vsimem_fail_because_no_get_capabilities,
-    ogr_csw_vsimem_fail_because_empty_response,
-    ogr_csw_vsimem_fail_because_no_CSW_Capabilities,
-    ogr_csw_vsimem_fail_because_exception,
-    ogr_csw_vsimem_fail_because_invalid_xml_capabilities,
-    ogr_csw_vsimem_fail_because_missing_version,
-    ogr_csw_vsimem_csw_minimal_instance,
-    ogr_csw_vsimem_csw_output_schema_csw,
-    ogr_csw_vsimem_csw_output_schema_gmd,
-    ogr_csw_vsimem_csw_output_schema_fgdc,
-    ogr_csw_vsimem_cleanup,
+    test_ogr_csw_vsimem_fail_because_not_enabled,
+    test_ogr_csw_vsimem_fail_because_no_get_capabilities,
+    test_ogr_csw_vsimem_fail_because_empty_response,
+    test_ogr_csw_vsimem_fail_because_no_CSW_Capabilities,
+    test_ogr_csw_vsimem_fail_because_exception,
+    test_ogr_csw_vsimem_fail_because_invalid_xml_capabilities,
+    test_ogr_csw_vsimem_fail_because_missing_version,
+    test_ogr_csw_vsimem_csw_minimal_instance,
+    test_ogr_csw_vsimem_csw_output_schema_csw,
+    test_ogr_csw_vsimem_csw_output_schema_gmd,
+    test_ogr_csw_vsimem_csw_output_schema_fgdc,
+    test_ogr_csw_vsimem_cleanup,
 ]
 
 if __name__ == '__main__':
diff --git a/autotest/ogr/ogr_db2.py b/autotest/ogr/ogr_db2.py
index 89aeda7206a0..e20cd2d56002 100755
--- a/autotest/ogr/ogr_db2.py
+++ b/autotest/ogr/ogr_db2.py
@@ -50,7 +50,7 @@
 # Test if driver is available
 
 
-def ogr_db2_check_driver():
+def test_ogr_db2_check_driver():
 
     ogrtest.db2_drv = None
 
@@ -65,7 +65,7 @@ def ogr_db2_check_driver():
 # Test if environment variable for DB2 connection is set and we can connect
 
 
-def ogr_db2_init():
+def test_ogr_db2_init():
 
     if ogrtest.db2_drv is None:
         return 'skip'
@@ -82,7 +82,7 @@ def ogr_db2_init():
 # Test GetFeatureCount()
 
 
-def ogr_db2_GetFeatureCount():
+def test_ogr_db2_GetFeatureCount():
 
     if ogrtest.db2_drv is None:
         return 'skip'
@@ -108,7 +108,7 @@ def ogr_db2_GetFeatureCount():
 # Test GetSpatialRef()
 
 
-def ogr_db2_GetSpatialRef():
+def test_ogr_db2_GetSpatialRef():
 
     if ogrtest.db2_drv is None:
         return 'skip'
@@ -141,7 +141,7 @@ def ogr_db2_GetSpatialRef():
 
 ###############################################################################
 # Test GetExtent()
-def ogr_db2_GetExtent():
+def test_ogr_db2_GetExtent():
 
     if ogrtest.db2_drv is None:
         return 'skip'
@@ -172,7 +172,7 @@ def ogr_db2_GetExtent():
 # Test GetFeature()
 
 
-def ogr_db2_GetFeature():
+def test_ogr_db2_GetFeature():
 
     if ogrtest.db2_drv is None:
         return 'skip'
@@ -203,7 +203,7 @@ def ogr_db2_GetFeature():
 # Test SetSpatialFilter()
 
 
-def ogr_db2_SetSpatialFilter():
+def test_ogr_db2_SetSpatialFilter():
 
     if ogrtest.db2_drv is None:
         return 'skip'
@@ -268,7 +268,7 @@ def ogr_db2_SetSpatialFilter():
 #
 
 
-def ogr_db2_capabilities():
+def test_ogr_db2_capabilities():
 
     if ogrtest.db2_drv is None:
         return 'skip'
@@ -323,15 +323,15 @@ def ogr_db2_listdrivers():
 
 
 gdaltest_list = [
-    ogr_db2_check_driver,
-    ogr_db2_init,
+    test_ogr_db2_check_driver,
+    test_ogr_db2_init,
     # ogr_db2_listdrivers,
-    ogr_db2_GetSpatialRef,
-    ogr_db2_GetExtent,
-    ogr_db2_GetFeature,
-    ogr_db2_SetSpatialFilter,
-    ogr_db2_capabilities,
-    ogr_db2_GetFeatureCount
+    test_ogr_db2_GetSpatialRef,
+    test_ogr_db2_GetExtent,
+    test_ogr_db2_GetFeature,
+    test_ogr_db2_SetSpatialFilter,
+    test_ogr_db2_capabilities,
+    test_ogr_db2_GetFeatureCount
 ]
 
 if __name__ == '__main__':
diff --git a/autotest/ogr/ogr_db2_hack.py b/autotest/ogr/ogr_db2_hack.py
index d8c8582d6779..c7e9ea7cffe7 100755
--- a/autotest/ogr/ogr_db2_hack.py
+++ b/autotest/ogr/ogr_db2_hack.py
@@ -37,7 +37,7 @@
 # Create a point in DB2 format, and verify the byte order flag.
 
 
-def ogr_db2_hack_1():
+def test_ogr_db2_hack_1():
 
     if ogr.SetGenerate_DB2_V72_BYTE_ORDER(1) != 0:
         return 'skip'
@@ -66,7 +66,7 @@ def ogr_db2_hack_1():
 # Verify that we can turn DB2 V7.2 mode back off!
 
 
-def ogr_db2_hack_2():
+def test_ogr_db2_hack_2():
 
     if ogr.SetGenerate_DB2_V72_BYTE_ORDER(0) != 0:
         gdaltest.post_reason('SetGenerate to turn off hack failed!')
@@ -96,7 +96,7 @@ def ogr_db2_hack_2():
 ###############################################################################
 # Try a more complex geometry, and verify we can read it back.
 
-def ogr_db2_hack_3():
+def test_ogr_db2_hack_3():
 
     if ogr.SetGenerate_DB2_V72_BYTE_ORDER(1) != 0:
         return 'skip'
@@ -131,9 +131,9 @@ def ogr_db2_hack_3():
 
 
 gdaltest_list = [
-    ogr_db2_hack_1,
-    ogr_db2_hack_2,
-    ogr_db2_hack_3
+    test_ogr_db2_hack_1,
+    test_ogr_db2_hack_2,
+    test_ogr_db2_hack_3
 ]
 
 if __name__ == '__main__':
diff --git a/autotest/ogr/ogr_dgn.py b/autotest/ogr/ogr_dgn.py
index 8f15a639ec11..e8c71e280254 100755
--- a/autotest/ogr/ogr_dgn.py
+++ b/autotest/ogr/ogr_dgn.py
@@ -36,7 +36,7 @@
 # Verify we can open the test file.
 
 
-def ogr_dgn_1():
+def test_ogr_dgn_1():
 
     gdaltest.dgn_ds = ogr.Open('data/smalltest.dgn')
     if gdaltest.dgn_ds is None:
@@ -51,7 +51,7 @@ def ogr_dgn_1():
 # Check first feature, a text element.
 
 
-def ogr_dgn_2():
+def test_ogr_dgn_2():
     if gdaltest.dgn_ds is None:
         return 'skip'
 
@@ -77,7 +77,7 @@ def ogr_dgn_2():
 # Check second feature, a circle.
 
 
-def ogr_dgn_3():
+def test_ogr_dgn_3():
     if gdaltest.dgn_ds is None:
         return 'skip'
 
@@ -113,7 +113,7 @@ def ogr_dgn_3():
 # Check third feature, a polygon with fill styling.
 
 
-def ogr_dgn_4():
+def test_ogr_dgn_4():
     if gdaltest.dgn_ds is None:
         return 'skip'
 
@@ -140,7 +140,7 @@ def ogr_dgn_4():
 # Use attribute query to pick just the type 15 level 2 object.
 
 
-def ogr_dgn_5():
+def test_ogr_dgn_5():
 
     if gdaltest.dgn_ds is None:
         return 'skip'
@@ -155,7 +155,7 @@ def ogr_dgn_5():
 # Use spatial filter to just pick the big circle.
 
 
-def ogr_dgn_6():
+def test_ogr_dgn_6():
 
     if gdaltest.dgn_ds is None:
         return 'skip'
@@ -173,7 +173,7 @@ def ogr_dgn_6():
 # Copy our small dgn file to a new dgn file.
 
 
-def ogr_dgn_7():
+def test_ogr_dgn_7():
 
     if gdaltest.dgn_ds is None:
         return 'skip'
@@ -212,7 +212,7 @@ def ogr_dgn_7():
 #
 
 
-def ogr_dgn_8():
+def test_ogr_dgn_8():
 
     if gdaltest.dgn_ds is None:
         return 'skip'
@@ -289,7 +289,7 @@ def ogr_dgn_8():
 # Test delta encoding (#6806)
 
 
-def ogr_dgn_online_1():
+def test_ogr_dgn_online_1():
 
     if not gdaltest.download_file('http://download.osgeo.org/gdal/data/dgn/DGNSample_v7.dgn', 'DGNSample_v7.dgn'):
         return 'skip'
@@ -310,7 +310,7 @@ def ogr_dgn_online_1():
 #  Cleanup
 
 
-def ogr_dgn_cleanup():
+def test_ogr_dgn_cleanup():
 
     if gdaltest.dgn_ds is not None:
         gdaltest.dgn_lyr = None
@@ -321,16 +321,16 @@ def ogr_dgn_cleanup():
 
 
 gdaltest_list = [
-    ogr_dgn_1,
-    ogr_dgn_2,
-    ogr_dgn_3,
-    ogr_dgn_4,
-    ogr_dgn_5,
-    ogr_dgn_6,
-    ogr_dgn_7,
-    ogr_dgn_8,
-    ogr_dgn_online_1,
-    ogr_dgn_cleanup]
+    test_ogr_dgn_1,
+    test_ogr_dgn_2,
+    test_ogr_dgn_3,
+    test_ogr_dgn_4,
+    test_ogr_dgn_5,
+    test_ogr_dgn_6,
+    test_ogr_dgn_7,
+    test_ogr_dgn_8,
+    test_ogr_dgn_online_1,
+    test_ogr_dgn_cleanup]
 
 if __name__ == '__main__':
 
diff --git a/autotest/ogr/ogr_dgnv8.py b/autotest/ogr/ogr_dgnv8.py
index 7d47fa8c5c93..9db0b393b787 100755
--- a/autotest/ogr/ogr_dgnv8.py
+++ b/autotest/ogr/ogr_dgnv8.py
@@ -41,7 +41,7 @@
 # Verify we can open the test file.
 
 
-def ogr_dgnv8_1():
+def test_ogr_dgnv8_1():
 
     gdaltest.dgnv8_drv = ogr.GetDriverByName('DGNv8')
     if gdaltest.dgnv8_drv is None:
@@ -58,7 +58,7 @@ def ogr_dgnv8_1():
 # Compare with a reference CSV dump
 
 
-def ogr_dgnv8_2():
+def test_ogr_dgnv8_2():
 
     if gdaltest.dgnv8_drv is None:
         return 'skip'
@@ -80,7 +80,7 @@ def ogr_dgnv8_2():
 # Run test_ogrsf
 
 
-def ogr_dgnv8_3():
+def test_ogr_dgnv8_3():
 
     if gdaltest.dgnv8_drv is None:
         return 'skip'
@@ -111,7 +111,7 @@ def ogr_dgnv8_3():
 # Test creation code
 
 
-def ogr_dgnv8_4():
+def test_ogr_dgnv8_4():
 
     if gdaltest.dgnv8_drv is None:
         return 'skip'
@@ -138,7 +138,7 @@ def ogr_dgnv8_4():
 # Test creation options
 
 
-def ogr_dgnv8_5():
+def test_ogr_dgnv8_5():
 
     if gdaltest.dgnv8_drv is None:
         return 'skip'
@@ -220,18 +220,18 @@ def ogr_dgnv8_5():
 ###############################################################################
 #  Cleanup
 
-def ogr_dgnv8_cleanup():
+def test_ogr_dgnv8_cleanup():
 
     return 'success'
 
 
 gdaltest_list = [
-    ogr_dgnv8_1,
-    ogr_dgnv8_2,
-    ogr_dgnv8_3,
-    ogr_dgnv8_4,
-    ogr_dgnv8_5,
-    ogr_dgnv8_cleanup]
+    test_ogr_dgnv8_1,
+    test_ogr_dgnv8_2,
+    test_ogr_dgnv8_3,
+    test_ogr_dgnv8_4,
+    test_ogr_dgnv8_5,
+    test_ogr_dgnv8_cleanup]
 
 if __name__ == '__main__':
 
diff --git a/autotest/ogr/ogr_dxf.py b/autotest/ogr/ogr_dxf.py
index c415d7aa9e22..d77abfd56af2 100644
--- a/autotest/ogr/ogr_dxf.py
+++ b/autotest/ogr/ogr_dxf.py
@@ -44,7 +44,7 @@
 # Check some general things to see if they meet expectations.
 
 
-def ogr_dxf_1():
+def test_ogr_dxf_1():
 
     gdaltest.dxf_ds = ogr.Open('data/assorted.dxf')
 
@@ -91,7 +91,7 @@ def ogr_dxf_1():
 # Read the first feature, an ellipse and see if it generally meets expectations.
 
 
-def ogr_dxf_2():
+def test_ogr_dxf_2():
 
     gdaltest.dxf_layer.ResetReading()
 
@@ -150,7 +150,7 @@ def ogr_dxf_2():
 # Second feature should be a partial ellipse.
 
 
-def ogr_dxf_3():
+def test_ogr_dxf_3():
 
     feat = gdaltest.dxf_layer.GetNextFeature()
 
@@ -175,7 +175,7 @@ def ogr_dxf_3():
 # Third feature: point.
 
 
-def ogr_dxf_4():
+def test_ogr_dxf_4():
 
     feat = gdaltest.dxf_layer.GetNextFeature()
 
@@ -188,7 +188,7 @@ def ogr_dxf_4():
 # Fourth feature: LINE
 
 
-def ogr_dxf_5():
+def test_ogr_dxf_5():
 
     feat = gdaltest.dxf_layer.GetNextFeature()
 
@@ -205,7 +205,7 @@ def ogr_dxf_5():
 # Fourth feature: MTEXT
 
 
-def ogr_dxf_6():
+def test_ogr_dxf_6():
 
     feat = gdaltest.dxf_layer.GetNextFeature()
 
@@ -227,7 +227,7 @@ def ogr_dxf_6():
 # Partial CIRCLE
 
 
-def ogr_dxf_7():
+def test_ogr_dxf_7():
 
     feat = gdaltest.dxf_layer.GetNextFeature()
 
@@ -253,7 +253,7 @@ def ogr_dxf_7():
 # PaperSpace and dimension
 
 
-def ogr_dxf_8():
+def test_ogr_dxf_8():
 
     # Check that this line is in PaperSpace
     feat = gdaltest.dxf_layer.GetNextFeature()
@@ -312,7 +312,7 @@ def ogr_dxf_8():
 # BLOCK (inlined)
 
 
-def ogr_dxf_9():
+def test_ogr_dxf_9():
 
     # Skip two dimensions each with a line, two arrowheads and text.
     for _ in range(8):
@@ -362,7 +362,7 @@ def ogr_dxf_9():
 # LWPOLYLINE in an Object Coordinate System.
 
 
-def ogr_dxf_10():
+def test_ogr_dxf_10():
 
     ocs_ds = ogr.Open('data/LWPOLYLINE-OCS.dxf')
     ocs_lyr = ocs_ds.GetLayer(0)
@@ -398,7 +398,7 @@ def ogr_dxf_10():
 # Test reading from an entities-only dxf file (#3412)
 
 
-def ogr_dxf_11():
+def test_ogr_dxf_11():
 
     eo_ds = ogr.Open('data/entities_only.dxf')
     eo_lyr = eo_ds.GetLayer(0)
@@ -426,7 +426,7 @@ def ogr_dxf_11():
 # Write a simple file with a polygon and a line, and read back.
 
 
-def ogr_dxf_12():
+def test_ogr_dxf_12():
 
     ds = ogr.GetDriverByName('DXF').CreateDataSource('tmp/dxf_11.dxf')
 
@@ -517,7 +517,7 @@ def ogr_dxf_12():
 ###############################################################################
 # Check smoothed polyline.
 
-def ogr_dxf_13():
+def test_ogr_dxf_13():
 
     ds = ogr.Open('data/polyline_smooth.dxf')
 
@@ -577,7 +577,7 @@ def ogr_dxf_13():
 ###############################################################################
 # Check smooth LWPOLYLINE entity.
 
-def ogr_dxf_14():
+def test_ogr_dxf_14():
 
     # This test is identical to the previous one except the
     # newer lwpolyline entity is used. See the comments in the
@@ -626,7 +626,7 @@ def ogr_dxf_14():
 # layer '0'.
 
 
-def ogr_dxf_15():
+def test_ogr_dxf_15():
 
     ds = ogr.GetDriverByName('DXF').CreateDataSource('tmp/dxf_14.dxf',
                                                      ['FIRST_ENTITY=80'])
@@ -720,7 +720,7 @@ def ogr_dxf_15():
 ###############################################################################
 # Test reading without DXF blocks inlined.
 
-def ogr_dxf_16():
+def test_ogr_dxf_16():
 
     gdal.SetConfigOption('DXF_INLINE_BLOCKS', 'FALSE')
 
@@ -820,7 +820,7 @@ def ogr_dxf_16():
 # Write a file with blocks defined from a source blocks layer.
 
 
-def ogr_dxf_17():
+def test_ogr_dxf_17():
 
     ds = ogr.GetDriverByName('DXF').CreateDataSource('tmp/dxf_17.dxf',
                                                      ['HEADER=data/header_extended.dxf'])
@@ -966,7 +966,7 @@ def ogr_dxf_17():
 # created.
 
 
-def ogr_dxf_18():
+def test_ogr_dxf_18():
 
     ds = ogr.GetDriverByName('DXF').CreateDataSource('tmp/dxf_18.dxf',
                                                      ['HEADER=data/header_extended.dxf'])
@@ -1092,7 +1092,7 @@ def ogr_dxf_18():
 # template - no blocks layer transferred.
 
 
-def ogr_dxf_19():
+def test_ogr_dxf_19():
 
     ds = ogr.GetDriverByName('DXF').CreateDataSource('tmp/dxf_19.dxf',
                                                      ['HEADER=data/header_extended.dxf'])
@@ -1136,7 +1136,7 @@ def ogr_dxf_19():
 # SPLINE
 
 
-def ogr_dxf_20():
+def test_ogr_dxf_20():
 
     ds = ogr.Open('data/spline_qcad.dxf')
     lyr = ds.GetLayer(0)
@@ -1153,7 +1153,7 @@ def ogr_dxf_20():
 # CIRCLE
 
 
-def ogr_dxf_21():
+def test_ogr_dxf_21():
 
     ds = ogr.Open('data/circle.dxf')
     lyr = ds.GetLayer(0)
@@ -1170,7 +1170,7 @@ def ogr_dxf_21():
 ###############################################################################
 # TEXT
 
-def ogr_dxf_22():
+def test_ogr_dxf_22():
 
     # Read MTEXT feature
     ds = ogr.Open('data/text.dxf')
@@ -1255,7 +1255,7 @@ def ogr_dxf_22():
 ###############################################################################
 # POLYGON with hole
 
-def ogr_dxf_23():
+def test_ogr_dxf_23():
 
     # Write polygon
     out_ds = ogr.GetDriverByName('DXF').CreateDataSource('/vsimem/ogr_dxf_23.dxf')
@@ -1295,7 +1295,7 @@ def ogr_dxf_23():
 # HATCH
 
 
-def ogr_dxf_24():
+def test_ogr_dxf_24():
 
     ds = ogr.Open('data/hatch.dxf')
     lyr = ds.GetLayer(0)
@@ -1323,7 +1323,7 @@ def ogr_dxf_24():
 # 3DFACE
 
 
-def ogr_dxf_25():
+def test_ogr_dxf_25():
 
     ds = ogr.Open('data/3dface.dxf')
     lyr = ds.GetLayer(0)
@@ -1346,7 +1346,7 @@ def ogr_dxf_25():
 # SOLID (#5380)
 
 
-def ogr_dxf_26():
+def test_ogr_dxf_26():
 
     ds = ogr.Open('data/solid.dxf')
     lyr = ds.GetLayer(0)
@@ -1364,7 +1364,7 @@ def ogr_dxf_26():
 # Test reading a DXF file without .dxf extensions (#5994)
 
 
-def ogr_dxf_27():
+def test_ogr_dxf_27():
 
     gdal.FileFromMemBuffer('/vsimem/a_dxf_without_extension', open('data/solid.dxf').read())
 
@@ -1380,7 +1380,7 @@ def ogr_dxf_27():
 # Test reading a ELLIPSE with Z extrusion axis value of -1.0 (#5075)
 
 
-def ogr_dxf_28():
+def test_ogr_dxf_28():
 
     ds = ogr.Open('data/ellipse_z_extrusion_minus_1.dxf')
     lyr = ds.GetLayer(0)
@@ -1403,7 +1403,7 @@ def ogr_dxf_28():
 # SPLINE with weights
 
 
-def ogr_dxf_29():
+def test_ogr_dxf_29():
 
     ds = ogr.Open('data/spline_weight.dxf')
     lyr = ds.GetLayer(0)
@@ -1434,7 +1434,7 @@ def ogr_dxf_29():
 # SPLINE closed
 
 
-def ogr_dxf_30():
+def test_ogr_dxf_30():
 
     ds = ogr.Open('data/spline_closed.dxf')
     lyr = ds.GetLayer(0)
@@ -1459,7 +1459,7 @@ def ogr_dxf_30():
 # OCS2WCS transformations 1
 
 
-def ogr_dxf_31():
+def test_ogr_dxf_31():
 
     ds = ogr.Open('data/ocs2wcs1.dxf')
     lyr = ds.GetLayer(0)
@@ -1899,7 +1899,7 @@ def ogr_dxf_31():
 # OCS2WCS transformations 2. Also test RawCodeValues
 
 
-def ogr_dxf_32():
+def test_ogr_dxf_32():
 
     gdal.SetConfigOption('DXF_INCLUDE_RAW_CODE_VALUES', 'TRUE')
     ds = ogr.Open('data/ocs2wcs2.dxf')
@@ -2472,7 +2472,7 @@ def ogr_dxf_32():
 # Test 3D entities (polyface mesh, cylinder, 3D solid)
 
 
-def ogr_dxf_33():
+def test_ogr_dxf_33():
 
     gdal.SetConfigOption('DXF_3D_EXTENSIBLE_MODE', 'TRUE')
     ds = ogr.Open('data/3d.dxf')
@@ -2567,7 +2567,7 @@ def ogr_dxf_33():
 # Writing Triangle geometry and checking if it is written properly
 
 
-def ogr_dxf_34():
+def test_ogr_dxf_34():
     ds = ogr.GetDriverByName('DXF').CreateDataSource('tmp/triangle_test.dxf')
     lyr = ds.CreateLayer('entities')
     dst_feat = ogr.Feature(feature_def=lyr.GetLayerDefn())
@@ -2602,7 +2602,7 @@ def ogr_dxf_34():
 # Test reading hatch with elliptical harts
 
 
-def ogr_dxf_35():
+def test_ogr_dxf_35():
 
     ds = ogr.Open('data/elliptical-arc-hatch-min.dxf')
     lyr = ds.GetLayer(0)
@@ -2710,7 +2710,7 @@ def ogr_dxf_35():
 # Test reading files with only INSERT content (#7006)
 
 
-def ogr_dxf_36():
+def test_ogr_dxf_36():
 
     gdal.SetConfigOption('DXF_MERGE_BLOCK_GEOMETRIES', 'FALSE')
     ds = ogr.Open('data/insert_only.dxf')
@@ -2725,7 +2725,7 @@ def ogr_dxf_36():
 # Create a blocks layer only
 
 
-def ogr_dxf_37():
+def test_ogr_dxf_37():
 
     ds = ogr.GetDriverByName('DXF').CreateDataSource('/vsimem/ogr_dxf_37.dxf')
 
@@ -2759,7 +2759,7 @@ def ogr_dxf_37():
 # Test degenerated cases of SOLID (#7038)
 
 
-def ogr_dxf_38():
+def test_ogr_dxf_38():
 
     ds = ogr.Open('data/solid-less-than-4-vertices.dxf')
     lyr = ds.GetLayer(0)
@@ -2783,7 +2783,7 @@ def ogr_dxf_38():
 # Test correct reordering of vertices in SOLID (#7038, #7089)
 
 
-def ogr_dxf_39():
+def test_ogr_dxf_39():
 
     ds = ogr.Open('data/solid-vertex-ordering.dxf')
     lyr = ds.GetLayer(0)
@@ -2806,7 +2806,7 @@ def ogr_dxf_39():
 # Test handing of OCS vs WCS for MTEXT (#7049)
 
 
-def ogr_dxf_40():
+def test_ogr_dxf_40():
 
     ds = ogr.Open('data/mtext-ocs-reduced.dxf')
     lyr = ds.GetLayer(0)
@@ -2822,7 +2822,7 @@ def ogr_dxf_40():
 # Test handing of OCS vs WCS for SOLID, HATCH and INSERT (#7077, #7098)
 
 
-def ogr_dxf_41():
+def test_ogr_dxf_41():
 
     ds = ogr.Open('data/ocs2wcs3.dxf')
     lyr = ds.GetLayer(0)
@@ -2923,7 +2923,7 @@ def ogr_dxf_41():
 # Test insertion of blocks within blocks (#7106)
 
 
-def ogr_dxf_42():
+def test_ogr_dxf_42():
 
     # Inlining, merging
     ds = ogr.Open('data/block-insert-order.dxf')
@@ -3006,7 +3006,7 @@ def ogr_dxf_42():
 # Ensure recursively-included blocks don't fail badly
 
 
-def ogr_dxf_43():
+def test_ogr_dxf_43():
 
     ds = ogr.Open('data/insert-recursive-pair.dxf')
     lyr = ds.GetLayer(0)
@@ -3019,7 +3019,7 @@ def ogr_dxf_43():
 # General tests of LEADER and MULTILEADER entities (#7111)
 
 
-def ogr_dxf_44():
+def test_ogr_dxf_44():
 
     with gdaltest.config_option('DXF_MAX_BSPLINE_CONTROL_POINTS', '1'):
         ds = ogr.Open('data/leader-mleader.dxf')
@@ -3274,7 +3274,7 @@ def ogr_dxf_44():
 # Test linetype scaling (#7129) and parsing of complex linetypes (#7134)
 
 
-def ogr_dxf_45():
+def test_ogr_dxf_45():
 
     ds = ogr.Open('data/linetypes.dxf')
     lyr = ds.GetLayer(0)
@@ -3325,7 +3325,7 @@ def ogr_dxf_45():
 # Test handling of DIMENSION anonymous block insertion (#7120)
 
 
-def ogr_dxf_46():
+def test_ogr_dxf_46():
 
     ds = ogr.Open('data/dimension.dxf')
     lyr = ds.GetLayer(0)
@@ -3383,7 +3383,7 @@ def ogr_dxf_46():
 # Test handling of DIMENSION fallback when there is no anonymous block (#7120)
 
 
-def ogr_dxf_47():
+def test_ogr_dxf_47():
 
     ds = ogr.Open('data/dimension-entities-only.dxf')
     lyr = ds.GetLayer(0)
@@ -3490,7 +3490,7 @@ def ogr_dxf_47():
 # Test ByLayer and ByBlock color values (#7130)
 
 
-def ogr_dxf_48():
+def test_ogr_dxf_48():
 
     gdal.SetConfigOption('DXF_MERGE_BLOCK_GEOMETRIES', 'FALSE')
     ds = ogr.Open('data/byblock-bylayer.dxf')
@@ -3593,7 +3593,7 @@ def ogr_dxf_48():
 # Test block attributes (ATTRIB entities) (#7139)
 
 
-def ogr_dxf_49():
+def test_ogr_dxf_49():
 
     # Inline blocks mode
     ds = ogr.Open('data/attrib.dxf')
@@ -3663,7 +3663,7 @@ def ogr_dxf_49():
 # Test extended text styling (#7151) and additional ByBlock/ByLayer tests (#7130)
 
 
-def ogr_dxf_50():
+def test_ogr_dxf_50():
 
     gdal.SetConfigOption('DXF_MERGE_BLOCK_GEOMETRIES', 'FALSE')
     ds = ogr.Open('data/text-fancy.dxf')
@@ -3722,7 +3722,7 @@ def ogr_dxf_50():
 # Test transformation of text inside blocks (ACAdjustText function)
 
 
-def ogr_dxf_51():
+def test_ogr_dxf_51():
 
     ds = ogr.Open('data/text-block-transform.dxf')
 
@@ -3750,7 +3750,7 @@ def ogr_dxf_51():
 # Test HELIX, TRACE, HATCH with spline boundary, MLINE, and INSERT with rows/columns
 
 
-def ogr_dxf_52():
+def test_ogr_dxf_52():
 
     ds = ogr.Open('data/additional-entities.dxf')
     lyr = ds.GetLayer(0)
@@ -3868,7 +3868,7 @@ def ogr_dxf_52():
 # Test block base points
 
 
-def ogr_dxf_53():
+def test_ogr_dxf_53():
 
     ds = ogr.Open('data/block-basepoint.dxf')
     lyr = ds.GetLayer(0)
@@ -3883,7 +3883,7 @@ def ogr_dxf_53():
 
 
 ###############################################################################
-def ogr_dxf_insert_too_many_errors():
+def test_ogr_dxf_insert_too_many_errors():
 
     with gdaltest.error_handler():
         ogr.Open('data/insert-too-many-errors.dxf')
@@ -3894,7 +3894,7 @@ def ogr_dxf_insert_too_many_errors():
 ###############################################################################
 
 
-def ogr_dxf_write_geometry_collection_of_unsupported_type():
+def test_ogr_dxf_write_geometry_collection_of_unsupported_type():
 
 
     tmpfile = '/vsimem/ogr_dxf_write_geometry_collection_of_unsupported_type.dxf'
@@ -3915,7 +3915,7 @@ def ogr_dxf_write_geometry_collection_of_unsupported_type():
 # cleanup
 
 
-def ogr_dxf_cleanup():
+def test_ogr_dxf_cleanup():
     gdaltest.dxf_layer = None
     gdaltest.dxf_ds = None
 
@@ -3926,62 +3926,62 @@ def ogr_dxf_cleanup():
 
 
 gdaltest_list = [
-    ogr_dxf_1,
-    ogr_dxf_2,
-    ogr_dxf_3,
-    ogr_dxf_4,
-    ogr_dxf_5,
-    ogr_dxf_6,
-    ogr_dxf_7,
-    ogr_dxf_8,
-    ogr_dxf_9,
-    ogr_dxf_10,
-    ogr_dxf_11,
-    ogr_dxf_12,
-    ogr_dxf_13,
-    ogr_dxf_14,
-    ogr_dxf_15,
-    ogr_dxf_16,
-    ogr_dxf_17,
-    ogr_dxf_18,
-    ogr_dxf_19,
-    ogr_dxf_20,
-    ogr_dxf_21,
-    ogr_dxf_22,
-    ogr_dxf_23,
-    ogr_dxf_24,
-    ogr_dxf_25,
-    ogr_dxf_26,
-    ogr_dxf_27,
-    ogr_dxf_28,
-    ogr_dxf_29,
-    ogr_dxf_30,
-    ogr_dxf_31,
-    ogr_dxf_32,
-    ogr_dxf_33,
-    ogr_dxf_34,
-    ogr_dxf_35,
-    ogr_dxf_36,
-    ogr_dxf_37,
-    ogr_dxf_38,
-    ogr_dxf_39,
-    ogr_dxf_40,
-    ogr_dxf_41,
-    ogr_dxf_42,
-    ogr_dxf_43,
-    ogr_dxf_44,
-    ogr_dxf_45,
-    ogr_dxf_46,
-    ogr_dxf_47,
-    ogr_dxf_48,
-    ogr_dxf_49,
-    ogr_dxf_50,
-    ogr_dxf_51,
-    ogr_dxf_52,
-    ogr_dxf_53,
-    ogr_dxf_insert_too_many_errors,
-    ogr_dxf_write_geometry_collection_of_unsupported_type,
-    ogr_dxf_cleanup]
+    test_ogr_dxf_1,
+    test_ogr_dxf_2,
+    test_ogr_dxf_3,
+    test_ogr_dxf_4,
+    test_ogr_dxf_5,
+    test_ogr_dxf_6,
+    test_ogr_dxf_7,
+    test_ogr_dxf_8,
+    test_ogr_dxf_9,
+    test_ogr_dxf_10,
+    test_ogr_dxf_11,
+    test_ogr_dxf_12,
+    test_ogr_dxf_13,
+    test_ogr_dxf_14,
+    test_ogr_dxf_15,
+    test_ogr_dxf_16,
+    test_ogr_dxf_17,
+    test_ogr_dxf_18,
+    test_ogr_dxf_19,
+    test_ogr_dxf_20,
+    test_ogr_dxf_21,
+    test_ogr_dxf_22,
+    test_ogr_dxf_23,
+    test_ogr_dxf_24,
+    test_ogr_dxf_25,
+    test_ogr_dxf_26,
+    test_ogr_dxf_27,
+    test_ogr_dxf_28,
+    test_ogr_dxf_29,
+    test_ogr_dxf_30,
+    test_ogr_dxf_31,
+    test_ogr_dxf_32,
+    test_ogr_dxf_33,
+    test_ogr_dxf_34,
+    test_ogr_dxf_35,
+    test_ogr_dxf_36,
+    test_ogr_dxf_37,
+    test_ogr_dxf_38,
+    test_ogr_dxf_39,
+    test_ogr_dxf_40,
+    test_ogr_dxf_41,
+    test_ogr_dxf_42,
+    test_ogr_dxf_43,
+    test_ogr_dxf_44,
+    test_ogr_dxf_45,
+    test_ogr_dxf_46,
+    test_ogr_dxf_47,
+    test_ogr_dxf_48,
+    test_ogr_dxf_49,
+    test_ogr_dxf_50,
+    test_ogr_dxf_51,
+    test_ogr_dxf_52,
+    test_ogr_dxf_53,
+    test_ogr_dxf_insert_too_many_errors,
+    test_ogr_dxf_write_geometry_collection_of_unsupported_type,
+    test_ogr_dxf_cleanup]
 
 if __name__ == '__main__':
 
diff --git a/autotest/ogr/ogr_edigeo.py b/autotest/ogr/ogr_edigeo.py
index 9b35ef78d5f6..5718f73f1df5 100755
--- a/autotest/ogr/ogr_edigeo.py
+++ b/autotest/ogr/ogr_edigeo.py
@@ -40,7 +40,7 @@
 ###############################################################################
 
 
-def ogr_edigeo_1():
+def test_ogr_edigeo_1():
 
     filelist = ['E000AB01.THF',
                 'EDAB01S1.VEC',
@@ -125,7 +125,7 @@ def ogr_edigeo_1():
 
 
 gdaltest_list = [
-    ogr_edigeo_1]
+    test_ogr_edigeo_1]
 
 if __name__ == '__main__':
 
diff --git a/autotest/ogr/ogr_eeda.py b/autotest/ogr/ogr_eeda.py
index 52b10cf5245f..32b9ab125a62 100644
--- a/autotest/ogr/ogr_eeda.py
+++ b/autotest/ogr/ogr_eeda.py
@@ -42,7 +42,7 @@
 # Find EEDA driver
 
 
-def eeda_1():
+def test_eeda_1():
 
     ogrtest.eeda_drv = ogr.GetDriverByName('EEDA')
 
@@ -57,7 +57,7 @@ def eeda_1():
 # Nominal case
 
 
-def eeda_2():
+def test_eeda_2():
 
     if ogrtest.eeda_drv is None:
         return 'skip'
@@ -335,7 +335,7 @@ def eeda_2():
 # Nominal case where collection is in eedaconf.json
 
 
-def eeda_3():
+def test_eeda_3():
 
     if ogrtest.eeda_drv is None:
         return 'skip'
@@ -361,7 +361,7 @@ def eeda_3():
 # Test that name and id variants are handled correctly.
 
 
-def eeda_4():
+def test_eeda_4():
 
     if ogrtest.eeda_drv is None:
         return 'skip'
@@ -456,7 +456,7 @@ def eeda_4():
 #
 
 
-def eeda_cleanup():
+def test_eeda_cleanup():
 
     if ogrtest.eeda_drv is None:
         return 'skip'
@@ -478,11 +478,11 @@ def eeda_cleanup():
 
 
 gdaltest_list = [
-    eeda_1,
-    eeda_2,
-    eeda_3,
-    eeda_4,
-    eeda_cleanup]
+    test_eeda_1,
+    test_eeda_2,
+    test_eeda_3,
+    test_eeda_4,
+    test_eeda_cleanup]
 
 if __name__ == '__main__':
 
diff --git a/autotest/ogr/ogr_elasticsearch.py b/autotest/ogr/ogr_elasticsearch.py
index 6ffe25900d31..e1eaaae5b696 100755
--- a/autotest/ogr/ogr_elasticsearch.py
+++ b/autotest/ogr/ogr_elasticsearch.py
@@ -42,7 +42,7 @@
 #
 
 
-def ogr_elasticsearch_init():
+def test_ogr_elasticsearch_init():
 
     ogrtest.elasticsearch_drv = None
     ogrtest.srs_wgs84 = osr.SpatialReference()
@@ -60,7 +60,7 @@ def ogr_elasticsearch_init():
 # Test writing into an nonexistent ElasticSearch datastore.
 
 
-def ogr_elasticsearch_nonexistent_server():
+def test_ogr_elasticsearch_nonexistent_server():
     if ogrtest.elasticsearch_drv is None:
         return 'skip'
 
@@ -122,7 +122,7 @@ def ogr_elasticsearch_nonexistent_server():
 # Simple test
 
 
-def ogr_elasticsearch_1():
+def test_ogr_elasticsearch_1():
     if ogrtest.elasticsearch_drv is None:
         return 'skip'
 
@@ -432,7 +432,7 @@ def ogr_elasticsearch_1():
 # Geo_shape geometries
 
 
-def ogr_elasticsearch_2():
+def test_ogr_elasticsearch_2():
     if ogrtest.elasticsearch_drv is None:
         return 'skip'
 
@@ -483,7 +483,7 @@ def ogr_elasticsearch_2():
 # Test bulk insert and layer name laundering
 
 
-def ogr_elasticsearch_3():
+def test_ogr_elasticsearch_3():
     if ogrtest.elasticsearch_drv is None:
         return 'skip'
 
@@ -537,7 +537,7 @@ def ogr_elasticsearch_3():
 # Test basic read functionality
 
 
-def ogr_elasticsearch_4():
+def test_ogr_elasticsearch_4():
     if ogrtest.elasticsearch_drv is None:
         return 'skip'
 
@@ -1158,7 +1158,7 @@ def ogr_elasticsearch_4():
 # Write documents with non geojson structure
 
 
-def ogr_elasticsearch_5():
+def test_ogr_elasticsearch_5():
     if ogrtest.elasticsearch_drv is None:
         return 'skip'
 
@@ -1411,7 +1411,7 @@ def ogr_elasticsearch_5():
 # Test reading circle and envelope geometries
 
 
-def ogr_elasticsearch_6():
+def test_ogr_elasticsearch_6():
     if ogrtest.elasticsearch_drv is None:
         return 'skip'
 
@@ -1512,7 +1512,7 @@ def ogr_elasticsearch_6():
 # Test WRITE_MAPPING option
 
 
-def ogr_elasticsearch_7():
+def test_ogr_elasticsearch_7():
     if ogrtest.elasticsearch_drv is None:
         return 'skip'
 
@@ -1550,7 +1550,7 @@ def ogr_elasticsearch_7():
 # Test SRS support
 
 
-def ogr_elasticsearch_8():
+def test_ogr_elasticsearch_8():
     if ogrtest.elasticsearch_drv is None:
         return 'skip'
 
@@ -1614,7 +1614,7 @@ def ogr_elasticsearch_8():
 # Test ElasticSearch 5.X
 
 
-def ogr_elasticsearch_9():
+def test_ogr_elasticsearch_9():
     if ogrtest.elasticsearch_drv is None:
         return 'skip'
 
@@ -1726,7 +1726,7 @@ def ogr_elasticsearch_9():
 # Test SQL
 
 
-def ogr_elasticsearch_10():
+def test_ogr_elasticsearch_10():
     if ogrtest.elasticsearch_drv is None:
         return 'skip'
 
@@ -2371,7 +2371,7 @@ def ogr_elasticsearch_10():
 # Test isnull and unset
 
 
-def ogr_elasticsearch_11():
+def test_ogr_elasticsearch_11():
     if ogrtest.elasticsearch_drv is None:
         return 'skip'
 
@@ -2511,7 +2511,7 @@ def ogr_elasticsearch_11():
 # Test authentication
 
 
-def ogr_elasticsearch_authentication():
+def test_ogr_elasticsearch_authentication():
     if ogrtest.elasticsearch_drv is None:
         return 'skip'
 
@@ -2583,7 +2583,7 @@ def ogr_elasticsearch_delete_files():
     gdal.Unlink('/vsimem/fakeelasticsearch&USERPWD=user:pwd')
 
 
-def ogr_elasticsearch_cleanup():
+def test_ogr_elasticsearch_cleanup():
     if ogrtest.elasticsearch_drv is None:
         return 'skip'
 
@@ -2595,21 +2595,21 @@ def ogr_elasticsearch_cleanup():
 
 
 gdaltest_list = [
-    ogr_elasticsearch_init,
-    ogr_elasticsearch_nonexistent_server,
-    ogr_elasticsearch_1,
-    ogr_elasticsearch_2,
-    ogr_elasticsearch_3,
-    ogr_elasticsearch_4,
-    ogr_elasticsearch_5,
-    ogr_elasticsearch_6,
-    ogr_elasticsearch_7,
-    ogr_elasticsearch_8,
-    ogr_elasticsearch_9,
-    ogr_elasticsearch_10,
-    ogr_elasticsearch_11,
-    ogr_elasticsearch_authentication,
-    ogr_elasticsearch_cleanup,
+    test_ogr_elasticsearch_init,
+    test_ogr_elasticsearch_nonexistent_server,
+    test_ogr_elasticsearch_1,
+    test_ogr_elasticsearch_2,
+    test_ogr_elasticsearch_3,
+    test_ogr_elasticsearch_4,
+    test_ogr_elasticsearch_5,
+    test_ogr_elasticsearch_6,
+    test_ogr_elasticsearch_7,
+    test_ogr_elasticsearch_8,
+    test_ogr_elasticsearch_9,
+    test_ogr_elasticsearch_10,
+    test_ogr_elasticsearch_11,
+    test_ogr_elasticsearch_authentication,
+    test_ogr_elasticsearch_cleanup,
 ]
 
 # gdaltest_list = [ ogr_elasticsearch_init, ogr_elasticsearch_10 ]
diff --git a/autotest/ogr/ogr_factory.py b/autotest/ogr/ogr_factory.py
index a9b36965fccd..0f23543f8c10 100755
--- a/autotest/ogr/ogr_factory.py
+++ b/autotest/ogr/ogr_factory.py
@@ -47,7 +47,7 @@ def save_as_csv(geom, filename):
 # 30 degree rotated ellipse, just one quarter.
 
 
-def ogr_factory_1():
+def test_ogr_factory_1():
 
     geom = ogr.ApproximateArcAngles(20, 30, 40, 7, 3.5, 30.0, 270.0, 360.0, 6.0)
 
@@ -61,7 +61,7 @@ def ogr_factory_1():
 # Test forceToPolygon()
 
 
-def ogr_factory_2():
+def test_ogr_factory_2():
 
     src_wkt = 'MULTIPOLYGON (((0 0,100 0,100 100,0 0)))'
     exp_wkt = 'POLYGON((0 0,100 0,100 100,0 0))'
@@ -109,7 +109,7 @@ def ogr_factory_2():
 # Test forceToMultiPolygon()
 
 
-def ogr_factory_3():
+def test_ogr_factory_3():
 
     src_wkt = 'POLYGON((0 0,100 0,100 100,0 0))'
     exp_wkt = 'MULTIPOLYGON (((0 0,100 0,100 100,0 0)))'
@@ -157,7 +157,7 @@ def ogr_factory_3():
 # Test forceToMultiPoint()
 
 
-def ogr_factory_4():
+def test_ogr_factory_4():
 
     src_wkt = 'POINT(2 5 3)'
     exp_wkt = 'MULTIPOINT(2 5 3)'
@@ -185,7 +185,7 @@ def ogr_factory_4():
 # Test forceToMultiLineString()
 
 
-def ogr_factory_5():
+def test_ogr_factory_5():
 
     src_wkt = 'LINESTRING(2 5,10 20)'
     exp_wkt = 'MULTILINESTRING((2 5,10 20))'
@@ -232,7 +232,7 @@ def ogr_factory_5():
 ###############################################################################
 # Test robustness of forceToXXX() primitives with various inputs (#3504)
 
-def ogr_factory_6():
+def test_ogr_factory_6():
 
     src_wkt_list = [None,
                     'POINT EMPTY',
@@ -299,7 +299,7 @@ def ogr_factory_6():
 # Test forceToLineString()
 
 
-def ogr_factory_7():
+def test_ogr_factory_7():
 
     src_wkt = 'LINESTRING(2 5,10 20)'
     exp_wkt = 'LINESTRING(2 5,10 20)'
@@ -427,7 +427,7 @@ def ogr_factory_7():
 # Test forceTo()
 
 
-def ogr_factory_8():
+def test_ogr_factory_8():
 
     tests = [('POINT(2 5)', 'MULTIPOINT (2 5)', ogr.wkbMultiPoint),
 
@@ -601,14 +601,14 @@ def ogr_factory_8():
 
 
 gdaltest_list = [
-    ogr_factory_1,
-    ogr_factory_2,
-    ogr_factory_3,
-    ogr_factory_4,
-    ogr_factory_5,
-    ogr_factory_6,
-    ogr_factory_7,
-    ogr_factory_8,
+    test_ogr_factory_1,
+    test_ogr_factory_2,
+    test_ogr_factory_3,
+    test_ogr_factory_4,
+    test_ogr_factory_5,
+    test_ogr_factory_6,
+    test_ogr_factory_7,
+    test_ogr_factory_8,
 ]
 
 if __name__ == '__main__':
diff --git a/autotest/ogr/ogr_feature.py b/autotest/ogr/ogr_feature.py
index 05dae6d07ba4..4af512d72cbd 100755
--- a/autotest/ogr/ogr_feature.py
+++ b/autotest/ogr/ogr_feature.py
@@ -138,7 +138,7 @@ def check(feat, fieldname, value):
 # Copy to Integer
 
 
-def ogr_feature_cp_integer():
+def test_ogr_feature_cp_integer():
     src_feature = mk_src_feature()
     src_feature.field_integerlist = [15]
     src_feature.field_reallist = [17.5]
@@ -199,7 +199,7 @@ def ogr_feature_cp_integer():
 # Copy to Integer64
 
 
-def ogr_feature_cp_integer64():
+def test_ogr_feature_cp_integer64():
     src_feature = mk_src_feature()
     src_feature.field_integerlist = [15]
     src_feature.field_reallist = [17.5]
@@ -256,7 +256,7 @@ def ogr_feature_cp_integer64():
 # Copy to Real
 
 
-def ogr_feature_cp_real():
+def test_ogr_feature_cp_real():
     src_feature = mk_src_feature()
     src_feature.field_integerlist = [15]
     src_feature.field_reallist = [17.5]
@@ -301,7 +301,7 @@ def ogr_feature_cp_real():
 # Copy to String
 
 
-def ogr_feature_cp_string():
+def test_ogr_feature_cp_string():
     src_feature = mk_src_feature()
 
     dst_feature = mk_dst_feature(src_feature, ogr.OFTString)
@@ -349,7 +349,7 @@ def ogr_feature_cp_string():
 # Copy to Binary
 
 
-def ogr_feature_cp_binary():
+def test_ogr_feature_cp_binary():
     src_feature = mk_src_feature()
 
     dst_feature = mk_dst_feature(src_feature, ogr.OFTBinary)
@@ -405,7 +405,7 @@ def ogr_feature_cp_binary():
 # Copy to date
 
 
-def ogr_feature_cp_date():
+def test_ogr_feature_cp_date():
     src_feature = mk_src_feature()
 
     dst_feature = mk_dst_feature(src_feature, ogr.OFTDate)
@@ -453,7 +453,7 @@ def ogr_feature_cp_date():
 # Copy to time
 
 
-def ogr_feature_cp_time():
+def test_ogr_feature_cp_time():
     src_feature = mk_src_feature()
 
     dst_feature = mk_dst_feature(src_feature, ogr.OFTTime)
@@ -501,7 +501,7 @@ def ogr_feature_cp_time():
 # Copy to datetime
 
 
-def ogr_feature_cp_datetime():
+def test_ogr_feature_cp_datetime():
     src_feature = mk_src_feature()
 
     dst_feature = mk_dst_feature(src_feature, ogr.OFTDateTime)
@@ -549,7 +549,7 @@ def ogr_feature_cp_datetime():
 # Copy to integerlist
 
 
-def ogr_feature_cp_integerlist():
+def test_ogr_feature_cp_integerlist():
     src_feature = mk_src_feature()
 
     dst_feature = mk_dst_feature(src_feature, ogr.OFTIntegerList)
@@ -599,7 +599,7 @@ def ogr_feature_cp_integerlist():
 # Copy to integer64list
 
 
-def ogr_feature_cp_integer64list():
+def test_ogr_feature_cp_integer64list():
     src_feature = mk_src_feature()
 
     dst_feature = mk_dst_feature(src_feature, ogr.OFTInteger64List)
@@ -647,7 +647,7 @@ def ogr_feature_cp_integer64list():
 # Copy to reallist
 
 
-def ogr_feature_cp_reallist():
+def test_ogr_feature_cp_reallist():
     src_feature = mk_src_feature()
 
     dst_feature = mk_dst_feature(src_feature, ogr.OFTRealList)
@@ -695,7 +695,7 @@ def ogr_feature_cp_reallist():
 # Copy to stringlist
 
 
-def ogr_feature_cp_stringlist():
+def test_ogr_feature_cp_stringlist():
     src_feature = mk_src_feature()
 
     dst_feature = mk_dst_feature(src_feature, ogr.OFTStringList)
@@ -743,7 +743,7 @@ def ogr_feature_cp_stringlist():
 ###############################################################################
 # Test SetField() / GetField() with unicode string
 
-def ogr_feature_unicode():
+def test_ogr_feature_unicode():
     if sys.version_info >= (3, 0, 0):
         return 'skip'
 
@@ -778,7 +778,7 @@ def ogr_feature_unicode():
 # Test 64bit FID
 
 
-def ogr_feature_64bit_fid():
+def test_ogr_feature_64bit_fid():
 
     feat_def = ogr.FeatureDefn('test')
     f = ogr.Feature(feat_def)
@@ -791,7 +791,7 @@ def ogr_feature_64bit_fid():
 # Test 64bit integer
 
 
-def ogr_feature_overflow_64bit_integer():
+def test_ogr_feature_overflow_64bit_integer():
 
     feat_def = ogr.FeatureDefn('test')
     feat_def.AddFieldDefn(ogr.FieldDefn('test', ogr.OFTInteger64))
@@ -816,7 +816,7 @@ def ogr_feature_overflow_64bit_integer():
 # Test SetNullable(), IsNullable() and Validate()
 
 
-def ogr_feature_nullable_validate():
+def test_ogr_feature_nullable_validate():
     # No fields
     feat_def = ogr.FeatureDefn('test')
     f = ogr.Feature(feat_def)
@@ -947,7 +947,7 @@ def ogr_feature_nullable_validate():
 # Test SetDefault(), GetDefault(), IsDefaultDriverSpecific() and FillUnsetWithDefault()
 
 
-def ogr_feature_default():
+def test_ogr_feature_default():
 
     feat_def = ogr.FeatureDefn('test')
     field_def = ogr.FieldDefn('field_string', ogr.OFTString)
@@ -1035,7 +1035,7 @@ def ogr_feature_default():
 # Test GetNativeData(), SetNativeData(), GetNativeMediaType(), SetNativeMediaType():
 
 
-def ogr_feature_native_data():
+def test_ogr_feature_native_data():
 
     feat_def = ogr.FeatureDefn('test')
     f = ogr.Feature(feat_def)
@@ -1127,7 +1127,7 @@ def ogr_feature_native_data():
 # Test assigning our geometry to ourselves
 
 
-def ogr_feature_set_geometry_self():
+def test_ogr_feature_set_geometry_self():
 
     feat_def = ogr.FeatureDefn('test')
     f = ogr.Feature(feat_def)
@@ -1146,7 +1146,7 @@ def ogr_feature_set_geometry_self():
 # Test SetFieldNull(), IsFieldNull()
 
 
-def ogr_feature_null_field():
+def test_ogr_feature_null_field():
 
     feat_def = ogr.FeatureDefn('test')
     field_def = ogr.FieldDefn('field_string', ogr.OFTString)
@@ -1242,7 +1242,7 @@ def ogr_feature_null_field():
     return 'success'
 
 
-def ogr_feature_cleanup():
+def test_ogr_feature_cleanup():
 
     gdaltest.src_feature = None
 
@@ -1250,27 +1250,27 @@ def ogr_feature_cleanup():
 
 
 gdaltest_list = [
-    ogr_feature_cp_integer,
-    ogr_feature_cp_integer64,
-    ogr_feature_cp_real,
-    ogr_feature_cp_string,
-    ogr_feature_cp_binary,
-    ogr_feature_cp_date,
-    ogr_feature_cp_time,
-    ogr_feature_cp_datetime,
-    ogr_feature_cp_integerlist,
-    ogr_feature_cp_integer64list,
-    ogr_feature_cp_reallist,
-    ogr_feature_cp_stringlist,
-    ogr_feature_unicode,
-    ogr_feature_64bit_fid,
-    ogr_feature_overflow_64bit_integer,
-    ogr_feature_nullable_validate,
-    ogr_feature_default,
-    ogr_feature_native_data,
-    ogr_feature_set_geometry_self,
-    ogr_feature_null_field,
-    ogr_feature_cleanup]
+    test_ogr_feature_cp_integer,
+    test_ogr_feature_cp_integer64,
+    test_ogr_feature_cp_real,
+    test_ogr_feature_cp_string,
+    test_ogr_feature_cp_binary,
+    test_ogr_feature_cp_date,
+    test_ogr_feature_cp_time,
+    test_ogr_feature_cp_datetime,
+    test_ogr_feature_cp_integerlist,
+    test_ogr_feature_cp_integer64list,
+    test_ogr_feature_cp_reallist,
+    test_ogr_feature_cp_stringlist,
+    test_ogr_feature_unicode,
+    test_ogr_feature_64bit_fid,
+    test_ogr_feature_overflow_64bit_integer,
+    test_ogr_feature_nullable_validate,
+    test_ogr_feature_default,
+    test_ogr_feature_native_data,
+    test_ogr_feature_set_geometry_self,
+    test_ogr_feature_null_field,
+    test_ogr_feature_cleanup]
 
 if __name__ == '__main__':
 
diff --git a/autotest/ogr/ogr_fgdb.py b/autotest/ogr/ogr_fgdb.py
index 3da90cb55f4a..c40a8cd9cb5b 100755
--- a/autotest/ogr/ogr_fgdb.py
+++ b/autotest/ogr/ogr_fgdb.py
@@ -44,7 +44,7 @@
 # Test if driver is available
 
 
-def ogr_fgdb_init():
+def test_ogr_fgdb_init():
 
     ogrtest.fgdb_drv = None
 
@@ -96,7 +96,7 @@ def ogr_fgdb_is_sdk_1_4_or_later():
 ###############################################################################
 # Write and read back various geometry types
 
-def ogr_fgdb_1():
+def test_ogr_fgdb_1():
     if ogrtest.fgdb_drv is None:
         return 'skip'
 
@@ -255,7 +255,7 @@ def ogr_fgdb_1():
 # Test DeleteField()
 
 
-def ogr_fgdb_DeleteField():
+def test_ogr_fgdb_DeleteField():
     if ogrtest.fgdb_drv is None:
         return 'skip'
 
@@ -331,7 +331,7 @@ def ogr_fgdb_DeleteField():
 # Run test_ogrsf
 
 
-def ogr_fgdb_2():
+def test_ogr_fgdb_2():
     if ogrtest.fgdb_drv is None:
         return 'skip'
 
@@ -351,7 +351,7 @@ def ogr_fgdb_2():
 # Run ogr2ogr
 
 
-def ogr_fgdb_3():
+def test_ogr_fgdb_3():
     if ogrtest.fgdb_drv is None:
         return 'skip'
 
@@ -388,7 +388,7 @@ def ogr_fgdb_3():
 # Test SQL support
 
 
-def ogr_fgdb_sql():
+def test_ogr_fgdb_sql():
     if ogrtest.fgdb_drv is None:
         return 'skip'
 
@@ -417,7 +417,7 @@ def ogr_fgdb_sql():
 # Test delete layer
 
 
-def ogr_fgdb_4():
+def test_ogr_fgdb_4():
     if ogrtest.fgdb_drv is None:
         return 'skip'
 
@@ -459,7 +459,7 @@ def ogr_fgdb_4():
 # Test DeleteDataSource()
 
 
-def ogr_fgdb_5():
+def test_ogr_fgdb_5():
     if ogrtest.fgdb_drv is None:
         return 'skip'
 
@@ -480,7 +480,7 @@ def ogr_fgdb_5():
 # Test adding a layer to an existing feature dataset
 
 
-def ogr_fgdb_6():
+def test_ogr_fgdb_6():
     if ogrtest.fgdb_drv is None:
         return 'skip'
 
@@ -503,7 +503,7 @@ def ogr_fgdb_6():
 # Test bulk loading (#4420)
 
 
-def ogr_fgdb_7():
+def test_ogr_fgdb_7():
     if ogrtest.fgdb_drv is None:
         return 'skip'
 
@@ -541,7 +541,7 @@ def ogr_fgdb_7():
 # Test field name laundering (#4458)
 
 
-def ogr_fgdb_8():
+def test_ogr_fgdb_8():
     if ogrtest.fgdb_drv is None:
         return 'skip'
 
@@ -580,7 +580,7 @@ def ogr_fgdb_8():
 # Test layer name laundering (#4466)
 
 
-def ogr_fgdb_9():
+def test_ogr_fgdb_9():
     if ogrtest.fgdb_drv is None:
         return 'skip'
 
@@ -628,7 +628,7 @@ def ogr_fgdb_9():
 # Test SRS support
 
 
-def ogr_fgdb_10():
+def test_ogr_fgdb_10():
     if ogrtest.fgdb_drv is None:
         return 'skip'
 
@@ -731,7 +731,7 @@ def ogr_fgdb_10():
 # Test all data types
 
 
-def ogr_fgdb_11():
+def test_ogr_fgdb_11():
     if ogrtest.fgdb_drv is None:
         return 'skip'
 
@@ -804,7 +804,7 @@ def ogr_fgdb_11():
 # Test failed Open()
 
 
-def ogr_fgdb_12():
+def test_ogr_fgdb_12():
     if ogrtest.fgdb_drv is None:
         return 'skip'
 
@@ -846,7 +846,7 @@ def ogr_fgdb_12():
 # Test failed CreateDataSource() and DeleteDataSource()
 
 
-def ogr_fgdb_13():
+def test_ogr_fgdb_13():
     if ogrtest.fgdb_drv is None:
         return 'skip'
 
@@ -896,7 +896,7 @@ def ogr_fgdb_13():
 # Test interleaved opening and closing of databases (#4270)
 
 
-def ogr_fgdb_14():
+def test_ogr_fgdb_14():
     if ogrtest.fgdb_drv is None:
         return 'skip'
 
@@ -918,7 +918,7 @@ def ogr_fgdb_14():
 # Test opening a FGDB with both SRID and LatestSRID set (#5638)
 
 
-def ogr_fgdb_15():
+def test_ogr_fgdb_15():
     if ogrtest.fgdb_drv is None:
         return 'skip'
 
@@ -946,7 +946,7 @@ def ogr_fgdb_15():
 # Test fix for #5674
 
 
-def ogr_fgdb_16():
+def test_ogr_fgdb_16():
     if ogrtest.fgdb_drv is None or ogrtest.openfilegdb_drv is None:
         return 'skip'
 
@@ -982,7 +982,7 @@ def ogr_fgdb_16():
 # Test not nullable fields
 
 
-def ogr_fgdb_17():
+def test_ogr_fgdb_17():
 
     if ogrtest.fgdb_drv is None:
         return 'skip'
@@ -1058,7 +1058,7 @@ def ogr_fgdb_17():
 # Test default values
 
 
-def ogr_fgdb_18():
+def test_ogr_fgdb_18():
 
     if ogrtest.fgdb_drv is None:
         return 'skip'
@@ -1173,7 +1173,7 @@ def ogr_fgdb_19_open_update(filename):
     return (bPerLayerCopyingForTransaction, ds)
 
 
-def ogr_fgdb_19():
+def test_ogr_fgdb_19():
 
     if ogrtest.fgdb_drv is None:
         return 'skip'
@@ -1846,7 +1846,7 @@ def ogr_fgdb_19():
 # this was what was tested in previous step)
 
 
-def ogr_fgdb_19bis():
+def test_ogr_fgdb_19bis():
 
     if ogrtest.fgdb_drv is None:
         return 'skip'
@@ -1860,7 +1860,7 @@ def ogr_fgdb_19bis():
         return 'skip'
 
     gdal.SetConfigOption('FGDB_PER_LAYER_COPYING_TRANSACTION', 'FALSE')
-    ret = ogr_fgdb_19()
+    ret = test_ogr_fgdb_19()
     gdal.SetConfigOption('FGDB_PER_LAYER_COPYING_TRANSACTION', None)
     return ret
 
@@ -1868,7 +1868,7 @@ def ogr_fgdb_19bis():
 # Test CreateFeature() with user defined FID
 
 
-def ogr_fgdb_20():
+def test_ogr_fgdb_20():
 
     if ogrtest.fgdb_drv is None:
         return 'skip'
@@ -2384,7 +2384,7 @@ def ogr_fgdb_20():
 # Test M support
 
 
-def ogr_fgdb_21():
+def test_ogr_fgdb_21():
 
     if ogrtest.fgdb_drv is None:
         return 'skip'
@@ -2473,7 +2473,7 @@ def ogr_fgdb_21():
 # Read curves
 
 
-def ogr_fgdb_22():
+def test_ogr_fgdb_22():
 
     if ogrtest.fgdb_drv is None:
         return 'skip'
@@ -2519,7 +2519,7 @@ def ogr_fgdb_22():
 # Test opening '.'
 
 
-def ogr_fgdb_23():
+def test_ogr_fgdb_23():
 
     if ogrtest.fgdb_drv is None:
         return 'skip'
@@ -2537,7 +2537,7 @@ def ogr_fgdb_23():
 # one of the starting point (#7017)
 
 
-def ogr_fgdb_24():
+def test_ogr_fgdb_24():
 
     ds = ogr.Open('data/filegdb_polygonzm_m_not_closing_with_curves.gdb')
     lyr = ds.GetLayer(0)
@@ -2569,7 +2569,7 @@ def ogr_fgdb_24():
 # Test selecting FID column with OGRSQL
 
 
-def ogr_fgdb_25():
+def test_ogr_fgdb_25():
 
     ds = ogr.Open('data/curves.gdb')
     sql_lyr = ds.ExecuteSQL('SELECT OBJECTID FROM polygon WHERE OBJECTID = 2')
@@ -2601,7 +2601,7 @@ def ogr_fgdb_25():
 # Cleanup
 
 
-def ogr_fgdb_cleanup():
+def test_ogr_fgdb_cleanup():
     if ogrtest.fgdb_drv is None:
         return 'skip'
 
@@ -2633,42 +2633,42 @@ def ogr_fgdb_cleanup():
 
 
 gdaltest_list = [
-    ogr_fgdb_init,
-    ogr_fgdb_1,
-    ogr_fgdb_DeleteField,
-    ogr_fgdb_2,
-    ogr_fgdb_3,
-    ogr_fgdb_sql,
-    ogr_fgdb_4,
-    ogr_fgdb_5,
-    ogr_fgdb_6,
-    ogr_fgdb_7,
-    ogr_fgdb_8,
-    ogr_fgdb_9,
-    ogr_fgdb_10,
-    ogr_fgdb_11,
-    ogr_fgdb_12,
-    ogr_fgdb_13,
-    ogr_fgdb_14,
-    ogr_fgdb_15,
-    ogr_fgdb_16,
-    ogr_fgdb_17,
-    ogr_fgdb_18,
-    ogr_fgdb_19,
-    ogr_fgdb_19bis,
-    ogr_fgdb_20,
-    ogr_fgdb_21,
-    ogr_fgdb_22,
-    ogr_fgdb_23,
-    ogr_fgdb_24,
-    ogr_fgdb_25,
-    ogr_fgdb_cleanup,
+    test_ogr_fgdb_init,
+    test_ogr_fgdb_1,
+    test_ogr_fgdb_DeleteField,
+    test_ogr_fgdb_2,
+    test_ogr_fgdb_3,
+    test_ogr_fgdb_sql,
+    test_ogr_fgdb_4,
+    test_ogr_fgdb_5,
+    test_ogr_fgdb_6,
+    test_ogr_fgdb_7,
+    test_ogr_fgdb_8,
+    test_ogr_fgdb_9,
+    test_ogr_fgdb_10,
+    test_ogr_fgdb_11,
+    test_ogr_fgdb_12,
+    test_ogr_fgdb_13,
+    test_ogr_fgdb_14,
+    test_ogr_fgdb_15,
+    test_ogr_fgdb_16,
+    test_ogr_fgdb_17,
+    test_ogr_fgdb_18,
+    test_ogr_fgdb_19,
+    test_ogr_fgdb_19bis,
+    test_ogr_fgdb_20,
+    test_ogr_fgdb_21,
+    test_ogr_fgdb_22,
+    test_ogr_fgdb_23,
+    test_ogr_fgdb_24,
+    test_ogr_fgdb_25,
+    test_ogr_fgdb_cleanup,
 ]
 
 disabled_gdaltest_list = [
-    ogr_fgdb_init,
-    ogr_fgdb_20,
-    ogr_fgdb_cleanup
+    test_ogr_fgdb_init,
+    test_ogr_fgdb_20,
+    test_ogr_fgdb_cleanup
 ]
 
 if __name__ == '__main__':
diff --git a/autotest/ogr/ogr_geoconcept.py b/autotest/ogr/ogr_geoconcept.py
index 020752a2b22e..c1602c7bb7a4 100755
--- a/autotest/ogr/ogr_geoconcept.py
+++ b/autotest/ogr/ogr_geoconcept.py
@@ -42,7 +42,7 @@
 # Simple read test of known file.
 
 
-def ogr_gxt_1():
+def test_ogr_gxt_1():
 
     gdaltest.gxt_ds = ogr.Open('data/expected_000_GRD.gxt')
 
@@ -99,7 +99,7 @@ def ogr_gxt_1():
 # Similar test than previous one with TAB separator.
 
 
-def ogr_gxt_2():
+def test_ogr_gxt_2():
 
     gdaltest.gxt_ds = ogr.Open('data/expected_000_GRD_TAB.txt')
 
@@ -144,7 +144,7 @@ def ogr_gxt_2():
 # Read a GXT file containing 2 points, duplicate it, and check the newly written file
 
 
-def ogr_gxt_3():
+def test_ogr_gxt_3():
 
     gdaltest.gxt_ds = None
 
@@ -234,7 +234,7 @@ def ogr_gxt_3():
 #
 
 
-def ogr_gxt_multipolygon_singlepart_nohole():
+def test_ogr_gxt_multipolygon_singlepart_nohole():
 
     ds = ogr.Open('data/geoconcept_multipolygon_singlepart_nohole.txt')
     lyr = ds.GetLayer(0)
@@ -251,7 +251,7 @@ def ogr_gxt_multipolygon_singlepart_nohole():
 #
 
 
-def ogr_gxt_multipolygon_singlepart_hole():
+def test_ogr_gxt_multipolygon_singlepart_hole():
 
     if not ogrtest.have_geos():
         return 'skip'
@@ -271,7 +271,7 @@ def ogr_gxt_multipolygon_singlepart_hole():
 #
 
 
-def ogr_gxt_multipolygon_twoparts_second_with_hole():
+def test_ogr_gxt_multipolygon_twoparts_second_with_hole():
 
     if not ogrtest.have_geos():
         return 'skip'
@@ -291,7 +291,7 @@ def ogr_gxt_multipolygon_twoparts_second_with_hole():
 #
 
 
-def ogr_gxt_line():
+def test_ogr_gxt_line():
 
     if not ogrtest.have_geos():
         return 'skip'
@@ -311,7 +311,7 @@ def ogr_gxt_line():
 #
 
 
-def ogr_gxt_cleanup():
+def test_ogr_gxt_cleanup():
 
     gdaltest.gxt_ds = None
     try:
@@ -322,14 +322,14 @@ def ogr_gxt_cleanup():
 
 
 gdaltest_list = [
-    ogr_gxt_1,
-    ogr_gxt_2,
-    ogr_gxt_3,
-    ogr_gxt_multipolygon_singlepart_nohole,
-    ogr_gxt_multipolygon_singlepart_hole,
-    ogr_gxt_multipolygon_twoparts_second_with_hole,
-    ogr_gxt_line,
-    ogr_gxt_cleanup,
+    test_ogr_gxt_1,
+    test_ogr_gxt_2,
+    test_ogr_gxt_3,
+    test_ogr_gxt_multipolygon_singlepart_nohole,
+    test_ogr_gxt_multipolygon_singlepart_hole,
+    test_ogr_gxt_multipolygon_twoparts_second_with_hole,
+    test_ogr_gxt_line,
+    test_ogr_gxt_cleanup,
     None]
 
 if __name__ == '__main__':
diff --git a/autotest/ogr/ogr_geojson.py b/autotest/ogr/ogr_geojson.py
index a702b95eb684..52520a8c2c24 100755
--- a/autotest/ogr/ogr_geojson.py
+++ b/autotest/ogr/ogr_geojson.py
@@ -203,7 +203,7 @@ def copy_shape_to_geojson(gjname, compress=None):
 # Find GeoJSON driver
 
 
-def ogr_geojson_1():
+def test_ogr_geojson_1():
 
     gdaltest.geojson_drv = ogr.GetDriverByName('GeoJSON')
 
@@ -215,7 +215,7 @@ def ogr_geojson_1():
 # Test file-based DS with standalone "Point" feature object.
 
 
-def ogr_geojson_2():
+def test_ogr_geojson_2():
 
     if gdaltest.geojson_drv is None:
         return 'skip'
@@ -248,7 +248,7 @@ def ogr_geojson_2():
 # Test file-based DS with standalone "LineString" feature object.
 
 
-def ogr_geojson_3():
+def test_ogr_geojson_3():
 
     if gdaltest.geojson_drv is None:
         return 'skip'
@@ -281,7 +281,7 @@ def ogr_geojson_3():
 # Test file-based DS with standalone "Polygon" feature object.
 
 
-def ogr_geojson_4():
+def test_ogr_geojson_4():
 
     if gdaltest.geojson_drv is None:
         return 'skip'
@@ -314,7 +314,7 @@ def ogr_geojson_4():
 # Test file-based DS with standalone "GeometryCollection" feature object.
 
 
-def ogr_geojson_5():
+def test_ogr_geojson_5():
 
     if gdaltest.geojson_drv is None:
         return 'skip'
@@ -347,7 +347,7 @@ def ogr_geojson_5():
 # Test file-based DS with standalone "MultiPoint" feature object.
 
 
-def ogr_geojson_6():
+def test_ogr_geojson_6():
 
     if gdaltest.geojson_drv is None:
         return 'skip'
@@ -380,7 +380,7 @@ def ogr_geojson_6():
 # Test file-based DS with standalone "MultiLineString" feature object.
 
 
-def ogr_geojson_7():
+def test_ogr_geojson_7():
 
     if gdaltest.geojson_drv is None:
         return 'skip'
@@ -413,7 +413,7 @@ def ogr_geojson_7():
 # Test file-based DS with standalone "MultiPolygon" feature object.
 
 
-def ogr_geojson_8():
+def test_ogr_geojson_8():
 
     if gdaltest.geojson_drv is None:
         return 'skip'
@@ -446,7 +446,7 @@ def ogr_geojson_8():
 # Test translation of data/gjpoint.shp to GeoJSON file
 
 
-def ogr_geojson_9():
+def test_ogr_geojson_9():
 
     if gdaltest.geojson_drv is None:
         return 'skip'
@@ -479,7 +479,7 @@ def ogr_geojson_9():
 # Test translation of data/gjpoint.shp to GZip compressed GeoJSON file
 
 
-def ogr_geojson_10():
+def test_ogr_geojson_10():
 
     if gdaltest.geojson_drv is None:
         return 'skip'
@@ -511,7 +511,7 @@ def ogr_geojson_10():
 ###############################################################################
 
 
-def ogr_geojson_11():
+def test_ogr_geojson_11():
 
     if gdaltest.geojson_drv is None:
         return 'skip'
@@ -559,7 +559,7 @@ def ogr_geojson_11():
 # Test DS passed as name with standalone "Point" feature object (#3377)
 
 
-def ogr_geojson_12():
+def test_ogr_geojson_12():
 
     if gdaltest.geojson_drv is None:
         return 'skip'
@@ -583,7 +583,7 @@ def ogr_geojson_12():
 ###############################################################################
 # Test writing to stdout (#3381)
 
-def ogr_geojson_13():
+def test_ogr_geojson_13():
 
     if gdaltest.geojson_drv is None:
         return 'skip'
@@ -601,7 +601,7 @@ def ogr_geojson_13():
 # Test reading & writing various degenerated geometries
 
 
-def ogr_geojson_14():
+def test_ogr_geojson_14():
 
     if gdaltest.geojson_drv is None:
         return 'skip'
@@ -633,7 +633,7 @@ def ogr_geojson_14():
 # Test Feature.ExportToJson (#3870)
 
 
-def ogr_geojson_15():
+def test_ogr_geojson_15():
 
     feature_defn = ogr.FeatureDefn()
     feature_defn.AddFieldDefn(ogr.FieldDefn("foo"))
@@ -678,7 +678,7 @@ def ogr_geojson_15():
 # Test reading ESRI point file
 
 
-def ogr_geojson_16():
+def test_ogr_geojson_16():
 
     if gdaltest.geojson_drv is None:
         return 'skip'
@@ -741,7 +741,7 @@ def ogr_geojson_16():
 # Test reading ESRI linestring file
 
 
-def ogr_geojson_17():
+def test_ogr_geojson_17():
 
     if gdaltest.geojson_drv is None:
         return 'skip'
@@ -800,7 +800,7 @@ def ogr_geojson_17():
 # Test reading ESRI polygon file
 
 
-def ogr_geojson_18():
+def test_ogr_geojson_18():
 
     if gdaltest.geojson_drv is None:
         return 'skip'
@@ -850,7 +850,7 @@ def ogr_geojson_18():
 # Test reading ESRI multipoint file
 
 
-def ogr_geojson_19():
+def test_ogr_geojson_19():
 
     if gdaltest.geojson_drv is None:
         return 'skip'
@@ -887,7 +887,7 @@ def ogr_geojson_19():
 # Test reading files with no extension (#4314)
 
 
-def ogr_geojson_20():
+def test_ogr_geojson_20():
 
     if gdaltest.geojson_drv is None:
         return 'skip'
@@ -923,7 +923,7 @@ def ogr_geojson_20():
 # Test reading output of geocouch spatiallist
 
 
-def ogr_geojson_21():
+def test_ogr_geojson_21():
 
     if gdaltest.geojson_drv is None:
         return 'skip'
@@ -957,7 +957,7 @@ def ogr_geojson_21():
 # Same as ogr_geojson_21 with several features
 
 
-def ogr_geojson_22():
+def test_ogr_geojson_22():
 
     if gdaltest.geojson_drv is None:
         return 'skip'
@@ -1005,7 +1005,7 @@ def ogr_geojson_22():
 # Write GeoJSON with bbox and test SRS writing&reading back
 
 
-def ogr_geojson_23():
+def test_ogr_geojson_23():
 
     if gdaltest.geojson_drv is None:
         return 'skip'
@@ -1055,7 +1055,7 @@ def ogr_geojson_23():
 # Test alternate form of geojson
 
 
-def ogr_geojson_24():
+def test_ogr_geojson_24():
 
     if gdaltest.geojson_drv is None:
         return 'skip'
@@ -1119,7 +1119,7 @@ def ogr_geojson_24():
 # Test TopoJSON
 
 
-def ogr_geojson_25():
+def test_ogr_geojson_25():
 
     if gdaltest.geojson_drv is None:
         return 'skip'
@@ -1233,7 +1233,7 @@ def ogr_geojson_25():
 # Test 64bit support
 
 
-def ogr_geojson_26():
+def test_ogr_geojson_26():
 
     if gdaltest.geojson_drv is None:
         return 'skip'
@@ -1315,7 +1315,7 @@ def ogr_geojson_26():
 # Test workaround for 64bit values (returned as strings)
 
 
-def ogr_geojson_27():
+def test_ogr_geojson_27():
 
     if gdaltest.geojson_drv is None:
         return 'skip'
@@ -1357,7 +1357,7 @@ def ogr_geojson_27():
 # Test reading ESRI point file with z value
 
 
-def ogr_geojson_28():
+def test_ogr_geojson_28():
 
     if gdaltest.geojson_drv is None:
         return 'skip'
@@ -1418,7 +1418,7 @@ def ogr_geojson_28():
 # Test reading ESRI linestring file with z
 
 
-def ogr_geojson_29():
+def test_ogr_geojson_29():
 
     if gdaltest.geojson_drv is None:
         return 'skip'
@@ -1456,7 +1456,7 @@ def ogr_geojson_29():
 # Test reading ESRI multipoint file with z
 
 
-def ogr_geojson_30():
+def test_ogr_geojson_30():
 
     if gdaltest.geojson_drv is None:
         return 'skip'
@@ -1494,7 +1494,7 @@ def ogr_geojson_30():
 # Test reading ESRI polygon file with z
 
 
-def ogr_geojson_31():
+def test_ogr_geojson_31():
 
     if gdaltest.geojson_drv is None:
         return 'skip'
@@ -1532,7 +1532,7 @@ def ogr_geojson_31():
 # Test reading ESRI multipoint file with m, but no z (hasM=true, hasZ omitted)
 
 
-def ogr_geojson_32():
+def test_ogr_geojson_32():
 
     if gdaltest.geojson_drv is None:
         return 'skip'
@@ -1569,7 +1569,7 @@ def ogr_geojson_32():
 # Test reading ESRI multipoint file with hasZ=true, but only 2 components.
 
 
-def ogr_geojson_33():
+def test_ogr_geojson_33():
 
     if gdaltest.geojson_drv is None:
         return 'skip'
@@ -1606,7 +1606,7 @@ def ogr_geojson_33():
 # Test reading ESRI multipoint file with z and m
 
 
-def ogr_geojson_34():
+def test_ogr_geojson_34():
 
     if gdaltest.geojson_drv is None:
         return 'skip'
@@ -1643,7 +1643,7 @@ def ogr_geojson_34():
 # Test handling of huge coordinates (#5377)
 
 
-def ogr_geojson_35():
+def test_ogr_geojson_35():
 
     if gdaltest.geojson_drv is None:
         return 'skip'
@@ -1747,7 +1747,7 @@ def ogr_geojson_35():
 # Test reading file with UTF-8 BOM (which is supposed to be illegal in JSON...) (#5630)
 
 
-def ogr_geojson_36():
+def test_ogr_geojson_36():
 
     if gdaltest.geojson_drv is None:
         return 'skip'
@@ -1764,7 +1764,7 @@ def ogr_geojson_36():
 # Test boolean type support
 
 
-def ogr_geojson_37():
+def test_ogr_geojson_37():
 
     if gdaltest.geojson_drv is None:
         return 'skip'
@@ -1822,7 +1822,7 @@ def ogr_geojson_37():
 # Test datetime/date/time type support
 
 
-def ogr_geojson_38():
+def test_ogr_geojson_38():
 
     if gdaltest.geojson_drv is None:
         return 'skip'
@@ -1871,7 +1871,7 @@ def ogr_geojson_38():
 # Test id top-object level
 
 
-def ogr_geojson_39():
+def test_ogr_geojson_39():
 
     if gdaltest.geojson_drv is None:
         return 'skip'
@@ -2066,7 +2066,7 @@ def ogr_geojson_39():
 # Test nested attributes
 
 
-def ogr_geojson_40():
+def test_ogr_geojson_40():
 
     if gdaltest.geojson_drv is None:
         return 'skip'
@@ -2120,7 +2120,7 @@ def ogr_geojson_40():
 # Test ogr.CreateGeometryFromJson()
 
 
-def ogr_geojson_41():
+def test_ogr_geojson_41():
 
     if gdaltest.geojson_drv is None:
         return 'skip'
@@ -2157,7 +2157,7 @@ def ogr_geojson_41():
 # Test ESRI FeatureService scrolling
 
 
-def ogr_geojson_42():
+def test_ogr_geojson_42():
 
     if gdaltest.geojson_drv is None:
         return 'skip'
@@ -2373,7 +2373,7 @@ def ogr_geojson_42():
 # Test Feature without geometry
 
 
-def ogr_geojson_43():
+def test_ogr_geojson_43():
     if gdaltest.geojson_drv is None:
         return 'skip'
 
@@ -2399,7 +2399,7 @@ def ogr_geojson_43():
 # Test null Feature (#6166)
 
 
-def ogr_geojson_44():
+def test_ogr_geojson_44():
     if gdaltest.geojson_drv is None:
         return 'skip'
 
@@ -2412,7 +2412,7 @@ def ogr_geojson_44():
 # Test native data support
 
 
-def ogr_geojson_45():
+def test_ogr_geojson_45():
     if gdaltest.geojson_drv is None:
         return 'skip'
 
@@ -2558,7 +2558,7 @@ def ogr_geojson_45():
 # Test that writing JSon content as value of a string field is serialized as it
 
 
-def ogr_geojson_46():
+def test_ogr_geojson_46():
     if gdaltest.geojson_drv is None:
         return 'skip'
 
@@ -2587,7 +2587,7 @@ def ogr_geojson_46():
 # Test update support
 
 
-def ogr_geojson_47():
+def test_ogr_geojson_47():
     if gdaltest.geojson_drv is None:
         return 'skip'
 
@@ -2769,7 +2769,7 @@ def ogr_geojson_47():
 # Test update support with file that has a single feature not in a FeatureCollection
 
 
-def ogr_geojson_48():
+def test_ogr_geojson_48():
     if gdaltest.geojson_drv is None:
         return 'skip'
 
@@ -2810,7 +2810,7 @@ def ogr_geojson_48():
 # Test ARRAY_AS_STRING
 
 
-def ogr_geojson_49():
+def test_ogr_geojson_49():
     if gdaltest.geojson_drv is None:
         return 'skip'
 
@@ -2838,7 +2838,7 @@ def ogr_geojson_49():
 # Test that we serialize floating point values with enough significant figures
 
 
-def ogr_geojson_50():
+def test_ogr_geojson_50():
     if gdaltest.geojson_drv is None:
         return 'skip'
 
@@ -2917,7 +2917,7 @@ def ogr_geojson_50():
 # Test writing empty geometries
 
 
-def ogr_geojson_51():
+def test_ogr_geojson_51():
     if gdaltest.geojson_drv is None:
         return 'skip'
 
@@ -3002,7 +3002,7 @@ def ogr_geojson_51():
 # Test NULL type detection
 
 
-def ogr_geojson_52():
+def test_ogr_geojson_52():
     if gdaltest.geojson_drv is None:
         return 'skip'
 
@@ -3042,7 +3042,7 @@ def ogr_geojson_52():
 # Test that M is ignored (this is a test of OGRLayer::CreateFeature() actually)
 
 
-def ogr_geojson_53():
+def test_ogr_geojson_53():
     if gdaltest.geojson_drv is None:
         return 'skip'
 
@@ -3070,7 +3070,7 @@ def ogr_geojson_53():
 # Test NULL type detection when first value is null
 
 
-def ogr_geojson_54():
+def test_ogr_geojson_54():
     if gdaltest.geojson_drv is None:
         return 'skip'
 
@@ -3130,7 +3130,7 @@ def read_file(filename):
     return content
 
 
-def ogr_geojson_55():
+def test_ogr_geojson_55():
     if gdaltest.geojson_drv is None:
         return 'skip'
 
@@ -3243,7 +3243,7 @@ def ogr_geojson_55():
 # Test RFC 7946 (that require geos)
 
 
-def ogr_geojson_56():
+def test_ogr_geojson_56():
     if gdaltest.geojson_drv is None:
         return 'skip'
     if not ogrtest.have_geos():
@@ -3319,7 +3319,7 @@ def ogr_geojson_56():
 # Test RFC 7946 and reprojection
 
 
-def ogr_geojson_57():
+def test_ogr_geojson_57():
     if gdaltest.geojson_drv is None:
         return 'skip'
     if not ogrtest.have_geos():
@@ -3564,7 +3564,7 @@ def ogr_geojson_57():
 # Test using the name member of FeatureCollection
 
 
-def ogr_geojson_58():
+def test_ogr_geojson_58():
     if gdaltest.geojson_drv is None:
         return 'skip'
 
@@ -3595,7 +3595,7 @@ def ogr_geojson_58():
 # Test using the description member of FeatureCollection
 
 
-def ogr_geojson_59():
+def test_ogr_geojson_59():
     if gdaltest.geojson_drv is None:
         return 'skip'
 
@@ -3627,7 +3627,7 @@ def ogr_geojson_59():
 # Test null vs unset field
 
 
-def ogr_geojson_60():
+def test_ogr_geojson_60():
     if gdaltest.geojson_drv is None:
         return 'skip'
 
@@ -3673,7 +3673,7 @@ def ogr_geojson_60():
 ###############################################################################
 # Test corner cases
 
-def ogr_geojson_61():
+def test_ogr_geojson_61():
 
     # Invalid JSon
     gdal.FileFromMemBuffer('/vsimem/ogr_geojson_61.json',
@@ -3710,7 +3710,7 @@ def ogr_geojson_61():
 # Test crs object
 
 
-def ogr_geojson_62():
+def test_ogr_geojson_62():
 
     # crs type=name tests
     gdal.OpenEx("""{ "type": "FeatureCollection", "crs": { "type":"name" }, "features":[] }""")
@@ -3797,7 +3797,7 @@ def ogr_geojson_62():
 # Extensive test of field tye promotion
 
 
-def ogr_geojson_63():
+def test_ogr_geojson_63():
 
     ds_ref = ogr.Open('data/test_type_promotion_ref.json')
     lyr_ref = ds_ref.GetLayer(0)
@@ -3809,7 +3809,7 @@ def ogr_geojson_63():
 # Test exporting XYM / XYZM (#6935)
 
 
-def ogr_geojson_64():
+def test_ogr_geojson_64():
 
     g = ogr.CreateGeometryFromWkt('POINT ZM(1 2 3 4)')
     if ogrtest.check_feature_geometry(ogr.CreateGeometryFromJson(g.ExportToJson()),
@@ -3838,7 +3838,7 @@ def ogr_geojson_64():
 # See https://github.com/r-spatial/sf/issues/449#issuecomment-319369945
 
 
-def ogr_geojson_65():
+def test_ogr_geojson_65():
 
     ds = ogr.Open("""{
 "type": "FeatureCollection",
@@ -3864,7 +3864,7 @@ def ogr_geojson_65():
 # Test features with properties not being a dictionary
 
 
-def ogr_geojson_66():
+def test_ogr_geojson_66():
 
     ds = ogr.Open("""{
 "type": "FeatureCollection",
@@ -3890,7 +3890,7 @@ def ogr_geojson_66():
 ###############################################################################
 # Test reading GeoJSON files starting with {"features":[{"geometry":.... (#7198)
 
-def ogr_geojson_67():
+def test_ogr_geojson_67():
 
     ds = ogr.Open('data/grenada.geojson')
     if ds is None:
@@ -3909,7 +3909,7 @@ def ogr_geojson_67():
 ###############################################################################
 # Test reading ESRIJSON files starting with {"features":[{"geometry":.... (#7198)
 
-def ogr_geojson_68():
+def test_ogr_geojson_68():
 
     ds = ogr.Open('data/esrijsonstartingwithfeaturesgeometry.json')
     if ds is None:
@@ -3927,7 +3927,7 @@ def ogr_geojson_68():
 ###############################################################################
 
 
-def ogr_geojson_id_field_and_id_type():
+def test_ogr_geojson_id_field_and_id_type():
 
     gdal.VectorTranslate('/vsimem/out.json', 'data/poly.shp', options='-f GeoJSON -lco ID_TYPE=String -preserve_fid -limit 1 -fid 2')
     got = read_file('/vsimem/out.json')
@@ -4042,7 +4042,7 @@ def ogr_geojson_id_field_and_id_type():
 ###############################################################################
 
 
-def ogr_geojson_geom_export_failure():
+def test_ogr_geojson_geom_export_failure():
 
     g = ogr.CreateGeometryFromWkt('POINT EMPTY')
     geojson = g.ExportToJson()
@@ -4092,7 +4092,7 @@ def ogr_geojson_geom_export_failure():
 ###############################################################################
 
 
-def ogr_geojson_starting_with_crs():
+def test_ogr_geojson_starting_with_crs():
 
     ds = ogr.Open("""{
 "crs": { "type": "name", "properties": { "name": "urn:ogc:def:crs:EPSG::32631" } },
@@ -4113,7 +4113,7 @@ def ogr_geojson_starting_with_crs():
 # Test we properly flush the file in SyncToDisk() in append situations
 
 
-def ogr_geojson_append_flush():
+def test_ogr_geojson_append_flush():
 
     tmpfilename = 'tmp/ogr_geojson_append_flush.json'
     f = gdal.VSIFOpenL(tmpfilename, 'wb')
@@ -4148,7 +4148,7 @@ def ogr_geojson_append_flush():
 ###############################################################################
 
 
-def ogr_geojson_empty_geometrycollection():
+def test_ogr_geojson_empty_geometrycollection():
 
     g = ogr.CreateGeometryFromJson('{"type": "GeometryCollection", "geometries": []}')
     if g.ExportToWkt() != 'GEOMETRYCOLLECTION EMPTY':
@@ -4160,7 +4160,7 @@ def ogr_geojson_empty_geometrycollection():
 ###############################################################################
 
 
-def ogr_esrijson_without_geometryType():
+def test_ogr_esrijson_without_geometryType():
 
     ds = ogr.Open("""{
   "spatialReference" : {
@@ -4191,7 +4191,7 @@ def ogr_esrijson_without_geometryType():
 ###############################################################################
 
 
-def ogr_geojson_read_fields_with_different_case():
+def test_ogr_geojson_read_fields_with_different_case():
 
     ds = ogr.Open("""{
 "type": "FeatureCollection",
@@ -4212,7 +4212,7 @@ def ogr_geojson_read_fields_with_different_case():
 # Test bugfix for https://github.com/OSGeo/gdal/issues/1068
 
 
-def ogr_geojson_clip_geometries_rfc7946():
+def test_ogr_geojson_clip_geometries_rfc7946():
 
     if not ogrtest.have_geos():
         return 'skip'
@@ -4256,7 +4256,7 @@ def ogr_geojson_clip_geometries_rfc7946():
 # Test bugfix for https://github.com/OSGeo/gdal/issues/1109
 
 
-def ogr_geojson_non_finite():
+def test_ogr_geojson_non_finite():
 
     json_content = """{
   "type": "FeatureCollection",
@@ -4331,7 +4331,7 @@ def ogr_geojson_non_finite():
 ###############################################################################
 
 
-def ogr_geojson_cleanup():
+def test_ogr_geojson_cleanup():
 
     gdal.SetConfigOption('CPL_CURL_ENABLE_VSIMEM', None)
 
@@ -4367,84 +4367,84 @@ def ogr_geojson_cleanup():
 
 
 gdaltest_list = [
-    ogr_geojson_1,
-    ogr_geojson_2,
-    ogr_geojson_3,
-    ogr_geojson_4,
-    ogr_geojson_5,
-    ogr_geojson_6,
-    ogr_geojson_7,
-    ogr_geojson_8,
-    ogr_geojson_9,
-    ogr_geojson_10,
-    ogr_geojson_11,
-    ogr_geojson_12,
-    ogr_geojson_13,
-    ogr_geojson_14,
-    ogr_geojson_15,
-    ogr_geojson_16,
-    ogr_geojson_17,
-    ogr_geojson_18,
-    ogr_geojson_19,
-    ogr_geojson_20,
-    ogr_geojson_21,
-    ogr_geojson_22,
-    ogr_geojson_23,
-    ogr_geojson_24,
-    ogr_geojson_25,
-    ogr_geojson_26,
-    ogr_geojson_27,
-    ogr_geojson_28,
-    ogr_geojson_29,
-    ogr_geojson_30,
-    ogr_geojson_31,
-    ogr_geojson_32,
-    ogr_geojson_33,
-    ogr_geojson_34,
-    ogr_geojson_35,
-    ogr_geojson_36,
-    ogr_geojson_37,
-    ogr_geojson_38,
-    ogr_geojson_39,
-    ogr_geojson_40,
-    ogr_geojson_41,
-    ogr_geojson_42,
-    ogr_geojson_43,
-    ogr_geojson_44,
-    ogr_geojson_45,
-    ogr_geojson_46,
-    ogr_geojson_47,
-    ogr_geojson_48,
-    ogr_geojson_49,
-    ogr_geojson_50,
-    ogr_geojson_51,
-    ogr_geojson_52,
-    ogr_geojson_53,
-    ogr_geojson_54,
-    ogr_geojson_55,
-    ogr_geojson_56,
-    ogr_geojson_57,
-    ogr_geojson_58,
-    ogr_geojson_59,
-    ogr_geojson_60,
-    ogr_geojson_61,
-    ogr_geojson_62,
-    ogr_geojson_63,
-    ogr_geojson_64,
-    ogr_geojson_65,
-    ogr_geojson_66,
-    ogr_geojson_67,
-    ogr_geojson_68,
-    ogr_geojson_id_field_and_id_type,
-    ogr_geojson_geom_export_failure,
-    ogr_geojson_starting_with_crs,
-    ogr_geojson_append_flush,
-    ogr_geojson_empty_geometrycollection,
-    ogr_esrijson_without_geometryType,
-    ogr_geojson_read_fields_with_different_case,
-    ogr_geojson_clip_geometries_rfc7946,
-    ogr_geojson_non_finite,
-    ogr_geojson_cleanup]
+    test_ogr_geojson_1,
+    test_ogr_geojson_2,
+    test_ogr_geojson_3,
+    test_ogr_geojson_4,
+    test_ogr_geojson_5,
+    test_ogr_geojson_6,
+    test_ogr_geojson_7,
+    test_ogr_geojson_8,
+    test_ogr_geojson_9,
+    test_ogr_geojson_10,
+    test_ogr_geojson_11,
+    test_ogr_geojson_12,
+    test_ogr_geojson_13,
+    test_ogr_geojson_14,
+    test_ogr_geojson_15,
+    test_ogr_geojson_16,
+    test_ogr_geojson_17,
+    test_ogr_geojson_18,
+    test_ogr_geojson_19,
+    test_ogr_geojson_20,
+    test_ogr_geojson_21,
+    test_ogr_geojson_22,
+    test_ogr_geojson_23,
+    test_ogr_geojson_24,
+    test_ogr_geojson_25,
+    test_ogr_geojson_26,
+    test_ogr_geojson_27,
+    test_ogr_geojson_28,
+    test_ogr_geojson_29,
+    test_ogr_geojson_30,
+    test_ogr_geojson_31,
+    test_ogr_geojson_32,
+    test_ogr_geojson_33,
+    test_ogr_geojson_34,
+    test_ogr_geojson_35,
+    test_ogr_geojson_36,
+    test_ogr_geojson_37,
+    test_ogr_geojson_38,
+    test_ogr_geojson_39,
+    test_ogr_geojson_40,
+    test_ogr_geojson_41,
+    test_ogr_geojson_42,
+    test_ogr_geojson_43,
+    test_ogr_geojson_44,
+    test_ogr_geojson_45,
+    test_ogr_geojson_46,
+    test_ogr_geojson_47,
+    test_ogr_geojson_48,
+    test_ogr_geojson_49,
+    test_ogr_geojson_50,
+    test_ogr_geojson_51,
+    test_ogr_geojson_52,
+    test_ogr_geojson_53,
+    test_ogr_geojson_54,
+    test_ogr_geojson_55,
+    test_ogr_geojson_56,
+    test_ogr_geojson_57,
+    test_ogr_geojson_58,
+    test_ogr_geojson_59,
+    test_ogr_geojson_60,
+    test_ogr_geojson_61,
+    test_ogr_geojson_62,
+    test_ogr_geojson_63,
+    test_ogr_geojson_64,
+    test_ogr_geojson_65,
+    test_ogr_geojson_66,
+    test_ogr_geojson_67,
+    test_ogr_geojson_68,
+    test_ogr_geojson_id_field_and_id_type,
+    test_ogr_geojson_geom_export_failure,
+    test_ogr_geojson_starting_with_crs,
+    test_ogr_geojson_append_flush,
+    test_ogr_geojson_empty_geometrycollection,
+    test_ogr_esrijson_without_geometryType,
+    test_ogr_geojson_read_fields_with_different_case,
+    test_ogr_geojson_clip_geometries_rfc7946,
+    test_ogr_geojson_non_finite,
+    test_ogr_geojson_cleanup]
 
 if __name__ == '__main__':
 
diff --git a/autotest/ogr/ogr_geojsonseq.py b/autotest/ogr/ogr_geojsonseq.py
index 6107c96ae2df..6b391aadfa27 100755
--- a/autotest/ogr/ogr_geojsonseq.py
+++ b/autotest/ogr/ogr_geojsonseq.py
@@ -102,19 +102,19 @@ def _ogr_geojsonseq_create(filename, lco, expect_rs):
     return 'success'
 
 
-def ogr_geojsonseq_lf():
+def test_ogr_geojsonseq_lf():
     return _ogr_geojsonseq_create('/vsimem/test', [], False)
 
 
-def ogr_geojsonseq_rs():
+def test_ogr_geojsonseq_rs():
     return _ogr_geojsonseq_create('/vsimem/test', ['RS=YES'], True)
 
 
-def ogr_geojsonseq_rs_auto():
+def test_ogr_geojsonseq_rs_auto():
     return _ogr_geojsonseq_create('/vsimem/test.geojsons', [], True)
 
 
-def ogr_geojsonseq_inline():
+def test_ogr_geojsonseq_inline():
 
     ds = ogr.Open("""{"type":"Feature","properties":{},"geometry":null}
 {"type":"Feature","properties":{},"geometry":null}""")
@@ -125,7 +125,7 @@ def ogr_geojsonseq_inline():
     return 'success'
 
 
-def ogr_geojsonseq_prefix():
+def test_ogr_geojsonseq_prefix():
 
     ds = ogr.Open("""GeoJSONSeq:data/test.geojsonl""")
     lyr = ds.GetLayer(0)
@@ -135,7 +135,7 @@ def ogr_geojsonseq_prefix():
     return 'success'
 
 
-def ogr_geojsonseq_seq_geometries():
+def test_ogr_geojsonseq_seq_geometries():
 
     with gdaltest.config_option('OGR_GEOJSONSEQ_CHUNK_SIZE', '10'):
         ds = ogr.Open("""{"type":"Point","coordinates":[2,49]}
@@ -153,7 +153,7 @@ def ogr_geojsonseq_seq_geometries():
     return 'success'
 
 
-def ogr_geojsonseq_reprojection():
+def test_ogr_geojsonseq_reprojection():
 
     filename = '/vsimem/ogr_geojsonseq_reprojection.geojsonl'
     ds = ogr.GetDriverByName('GeoJSONSeq').CreateDataSource(filename)
@@ -181,7 +181,7 @@ def ogr_geojsonseq_reprojection():
     return 'success'
 
 
-def ogr_geojsonseq_read_rs_json_pretty():
+def test_ogr_geojsonseq_read_rs_json_pretty():
 
     ds = ogr.Open('data/test.geojsons')
     lyr = ds.GetLayer(0)
@@ -202,7 +202,7 @@ def ogr_geojsonseq_read_rs_json_pretty():
     return 'success'
 
 
-def ogr_geojsonseq_test_ogrsf():
+def test_ogr_geojsonseq_test_ogrsf():
 
     import test_cli_utilities
     if test_cli_utilities.get_test_ogrsf_path() is None:
@@ -219,15 +219,15 @@ def ogr_geojsonseq_test_ogrsf():
 
 
 gdaltest_list = [
-    ogr_geojsonseq_lf,
-    ogr_geojsonseq_rs,
-    ogr_geojsonseq_rs_auto,
-    ogr_geojsonseq_inline,
-    ogr_geojsonseq_prefix,
-    ogr_geojsonseq_seq_geometries,
-    ogr_geojsonseq_reprojection,
-    ogr_geojsonseq_read_rs_json_pretty,
-    ogr_geojsonseq_test_ogrsf,
+    test_ogr_geojsonseq_lf,
+    test_ogr_geojsonseq_rs,
+    test_ogr_geojsonseq_rs_auto,
+    test_ogr_geojsonseq_inline,
+    test_ogr_geojsonseq_prefix,
+    test_ogr_geojsonseq_seq_geometries,
+    test_ogr_geojsonseq_reprojection,
+    test_ogr_geojsonseq_read_rs_json_pretty,
+    test_ogr_geojsonseq_test_ogrsf,
 ]
 
 if __name__ == '__main__':
diff --git a/autotest/ogr/ogr_geom.py b/autotest/ogr/ogr_geom.py
index 2e11a421f336..3fd3664f48ab 100755
--- a/autotest/ogr/ogr_geom.py
+++ b/autotest/ogr/ogr_geom.py
@@ -44,7 +44,7 @@
 # get_Area() methods as well).
 
 
-def ogr_geom_area():
+def test_ogr_geom_area():
 
     geom_wkt = 'MULTIPOLYGON( ((0 0,1 1,1 0,0 0)),((0 0,10 0, 10 10, 0 10),(1 1,1 2,2 2,2 1)) )'
     geom = ogr.CreateGeometryFromWkt(geom_wkt)
@@ -67,7 +67,7 @@ def ogr_geom_area():
 # getGeometryType value).
 
 
-def ogr_geom_area_linearring():
+def test_ogr_geom_area_linearring():
 
     geom = ogr.Geometry(type=ogr.wkbLinearRing)
     geom.AddPoint_2D(0, 0)
@@ -87,7 +87,7 @@ def ogr_geom_area_linearring():
 # Test Area calculation for a GeometryCollection
 
 
-def ogr_geom_area_geometrycollection():
+def test_ogr_geom_area_geometrycollection():
 
     # OGR >= 1.8.0
     geom_wkt = 'GEOMETRYCOLLECTION( POLYGON((0 0,1 1,1 0,0 0)), MULTIPOLYGON(((0 0,1 1,1 0,0 0))), LINESTRING(0 0,1 1), POINT(0 0), GEOMETRYCOLLECTION EMPTY )'
@@ -105,7 +105,7 @@ def ogr_geom_area_geometrycollection():
 # huge value With algorithm prior to #3556, this would return 0.
 
 
-def ogr_geom_area_linearring_big_offset():
+def test_ogr_geom_area_linearring_big_offset():
 
     geom = ogr.Geometry(type=ogr.wkbLinearRing)
     BIGOFFSET = 1.0e11
@@ -126,7 +126,7 @@ def ogr_geom_area_linearring_big_offset():
 # Test Area calculation for a Triangle
 
 
-def ogr_geom_area_triangle():
+def test_ogr_geom_area_triangle():
 
     geom_wkt = 'TRIANGLE((0 0,100 0,0 100,0 0))'
     geom = ogr.CreateGeometryFromWkt(geom_wkt)
@@ -145,7 +145,7 @@ def ogr_geom_area_triangle():
     return 'success'
 
 
-def ogr_geom_is_empty():
+def test_ogr_geom_is_empty():
 
     geom_wkt = 'LINESTRING EMPTY'
     geom = ogr.CreateGeometryFromWkt(geom_wkt)
@@ -169,7 +169,7 @@ def ogr_geom_is_empty():
 # Test if a Triangle is Empty
 
 
-def ogr_geom_is_empty_triangle():
+def test_ogr_geom_is_empty_triangle():
 
     geom_wkt = 'TRIANGLE EMPTY'
     geom = ogr.CreateGeometryFromWkt(geom_wkt)
@@ -197,7 +197,7 @@ def ogr_geom_is_empty_triangle():
     return 'success'
 
 
-def ogr_geom_pickle():
+def test_ogr_geom_pickle():
     geom_wkt = 'MULTIPOLYGON( ((0 0,1 1,1 0,0 0)),((0 0,10 0, 10 10, 0 10),(1 1,1 2,2 2,2 1)) )'
     geom = ogr.CreateGeometryFromWkt(geom_wkt)
     p = pickle.dumps(geom)
@@ -214,7 +214,7 @@ def ogr_geom_pickle():
 # Test suite for PolyhedralSurface
 
 
-def ogr_geom_polyhedral_surface():
+def test_ogr_geom_polyhedral_surface():
 
     wkt_original = 'POLYHEDRALSURFACE Z (((0 0 0,0 0 1,0 1 1,0 1 0,0 0 0)),\
 ((0 0 0,0 1 0,1 1 0,1 0 0,0 0 0)),\
@@ -325,7 +325,7 @@ def ogr_geom_polyhedral_surface():
 # Test suite for TIN
 
 
-def ogr_geom_tin():
+def test_ogr_geom_tin():
     poly1 = ogr.CreateGeometryFromWkt("TRIANGLE ((0 0 0,0 0 1,0 1 0,0 0 0))")
     poly2 = ogr.CreateGeometryFromWkt("TRIANGLE ((0 0 0,0 1 0,1 1 0,0 0 0))")
     tin = ogr.Geometry(ogr.wkbTIN)
@@ -458,7 +458,7 @@ def ogr_geom_tin():
 # Test OGRGeometry::getBoundary() result for point.
 
 
-def ogr_geom_boundary_point():
+def test_ogr_geom_boundary_point():
 
     if not ogrtest.have_geos():
         return 'skip'
@@ -482,7 +482,7 @@ def ogr_geom_boundary_point():
 # Test OGRGeometry::getBoundary() result for multipoint.
 
 
-def ogr_geom_boundary_multipoint():
+def test_ogr_geom_boundary_multipoint():
 
     if not ogrtest.have_geos():
         return 'skip'
@@ -501,7 +501,7 @@ def ogr_geom_boundary_multipoint():
 # Test OGRGeometry::getBoundary() result for linestring.
 
 
-def ogr_geom_boundary_linestring():
+def test_ogr_geom_boundary_linestring():
 
     if not ogrtest.have_geos():
         return 'skip'
@@ -537,7 +537,7 @@ def ogr_geom_boundary_linestring():
 # Test OGRGeometry::getBoundary() result for polygon.
 
 
-def ogr_geom_boundary_polygon():
+def test_ogr_geom_boundary_polygon():
 
     if not ogrtest.have_geos():
         return 'skip'
@@ -557,7 +557,7 @@ def ogr_geom_boundary_polygon():
 # Test OGRBuildPolygonFromEdges() on a geometry collection of line strings
 
 
-def ogr_geom_build_from_edges_1():
+def test_ogr_geom_build_from_edges_1():
 
     if not ogrtest.have_geos():
         return 'skip'
@@ -590,7 +590,7 @@ def ogr_geom_build_from_edges_1():
 # Test OGRBuildPolygonFromEdges() on a multilinestring
 
 
-def ogr_geom_build_from_edges_2():
+def test_ogr_geom_build_from_edges_2():
 
     if not ogrtest.have_geos():
         return 'skip'
@@ -622,7 +622,7 @@ def ogr_geom_build_from_edges_2():
 # Test OGRBuildPolygonFromEdges() on invalid geometries
 
 
-def ogr_geom_build_from_edges_3():
+def test_ogr_geom_build_from_edges_3():
 
     if not ogrtest.have_geos():
         return 'skip'
@@ -653,7 +653,7 @@ def ogr_geom_build_from_edges_3():
 # Test OGRBuildPolygonFromEdges() and identify exterior ring (#3610)
 
 
-def ogr_geom_build_from_edges_4():
+def test_ogr_geom_build_from_edges_4():
 
     if int(gdal.VersionInfo('VERSION_NUM')) < 1900:
         gdaltest.post_reason('would crash')
@@ -699,7 +699,7 @@ def ogr_geom_build_from_edges_4():
 # Test GetArea() on empty linear ring (#2792)
 
 
-def ogr_geom_area_empty_linearring():
+def test_ogr_geom_area_empty_linearring():
 
     geom = ogr.Geometry(type=ogr.wkbLinearRing)
 
@@ -713,7 +713,7 @@ def ogr_geom_area_empty_linearring():
 # Test TransformTo()
 
 
-def ogr_geom_transform_to():
+def test_ogr_geom_transform_to():
 
     # Somewhere in Paris suburbs...
     geom = ogr.CreateGeometryFromWkt('POINT(2 49)')
@@ -748,7 +748,7 @@ def ogr_geom_transform_to():
 # Test Transform()
 
 
-def ogr_geom_transform():
+def test_ogr_geom_transform():
 
     # Somewhere in Paris suburbs...
     geom = ogr.CreateGeometryFromWkt('POINT(2 49)')
@@ -775,7 +775,7 @@ def ogr_geom_transform():
 # Test CloseRings()
 
 
-def ogr_geom_closerings():
+def test_ogr_geom_closerings():
 
     geom = ogr.CreateGeometryFromWkt('POLYGON((0 0,0 1,1 1,1 0))')
     geom.CloseRings()
@@ -795,7 +795,7 @@ def ogr_geom_closerings():
 # Test Segmentize()
 
 
-def ogr_geom_segmentize():
+def test_ogr_geom_segmentize():
 
     geom = ogr.CreateGeometryFromWkt('LINESTRING(0 0,0 10)')
     geom.Segmentize(1.00001)
@@ -834,7 +834,7 @@ def ogr_geom_segmentize():
 # Test Value()
 
 
-def ogr_geom_value():
+def test_ogr_geom_value():
 
     geom = ogr.CreateGeometryFromWkt('LINESTRING(2 3,5 3,5 0)')
 
@@ -879,7 +879,7 @@ def ogr_geom_value():
 # Test FlattenTo2D(), GetDimension() and GetCoordinateDimension()
 
 
-def ogr_geom_flattenTo2D():
+def test_ogr_geom_flattenTo2D():
 
     geom = ogr.CreateGeometryFromWkt('POINT (1 2 3)')
 
@@ -911,7 +911,7 @@ def ogr_geom_flattenTo2D():
 # Test FlattenTo2D(), GetDimension() and GetCoordinateDimension() for Triangle
 
 
-def ogr_geom_flattenTo2D_triangle():
+def test_ogr_geom_flattenTo2D_triangle():
 
     geom = ogr.CreateGeometryFromWkt('TRIANGLE ((0 0 0,100 0 100,0 100 100,0 0 0))')
 
@@ -942,7 +942,7 @@ def ogr_geom_flattenTo2D_triangle():
 ###############################################################################
 
 
-def ogr_geom_linestring_limits():
+def test_ogr_geom_linestring_limits():
 
     geom = ogr.CreateGeometryFromWkt('LINESTRING EMPTY')
     if geom.Length() != 0:
@@ -1017,7 +1017,7 @@ def ogr_geom_linestring_limits():
 ###############################################################################
 
 
-def ogr_geom_coord_round():
+def test_ogr_geom_coord_round():
 
     geom = ogr.CreateGeometryFromWkt('POINT(370441.860 5591000.590)')
     wkt = geom.ExportToWkt()
@@ -1031,7 +1031,7 @@ def ogr_geom_coord_round():
 ###############################################################################
 
 
-def ogr_geom_coord_round_2():
+def test_ogr_geom_coord_round_2():
 
     geom = ogr.CreateGeometryFromWkt('POINT(1.0 169.600374)')
     wkt = geom.ExportToWkt()
@@ -1046,7 +1046,7 @@ def ogr_geom_coord_round_2():
 # Test Area calculation for a Point
 
 
-def ogr_geom_area_point():
+def test_ogr_geom_area_point():
 
     geom_wkt = 'POINT(0 0)'
     geom = ogr.CreateGeometryFromWkt(geom_wkt)
@@ -1063,7 +1063,7 @@ def ogr_geom_area_point():
 # Test Length calculation for a Point
 
 
-def ogr_geom_length_point():
+def test_ogr_geom_length_point():
 
     # OGR >= 1.8.0
     geom_wkt = 'POINT(0 0)'
@@ -1081,7 +1081,7 @@ def ogr_geom_length_point():
 # Test Length calculation for a MultiLineString
 
 
-def ogr_geom_length_multilinestring():
+def test_ogr_geom_length_multilinestring():
 
     # OGR >= 1.8.0
     geom_wkt = 'MULTILINESTRING((0 0,0 1),(0 0,0 1))'
@@ -1098,7 +1098,7 @@ def ogr_geom_length_multilinestring():
 # Test Length calculation for a GeometryCollection
 
 
-def ogr_geom_length_geometrycollection():
+def test_ogr_geom_length_geometrycollection():
 
     # OGR >= 1.8.0
     geom_wkt = 'GEOMETRYCOLLECTION( POLYGON((0 0,0 1,1 1,1 0,0 0)), MULTILINESTRING((0 0,0 1),(0 0,0 1)), LINESTRING(0 0,0 1), LINESTRING(0 0,0 1), POINT(0 0), GEOMETRYCOLLECTION EMPTY )'
@@ -1115,7 +1115,7 @@ def ogr_geom_length_geometrycollection():
 # Test Geometry.GetPoints() (#4016)
 
 
-def ogr_geom_getpoints():
+def test_ogr_geom_getpoints():
 
     geom = ogr.CreateGeometryFromWkt('LINESTRING(0 1,2 3)')
     points = geom.GetPoints()
@@ -1171,7 +1171,7 @@ def ogr_geom_getpoints():
 # Test OGRGeometry::empty()
 
 
-def ogr_geom_empty():
+def test_ogr_geom_empty():
 
     g1 = ogr.CreateGeometryFromWkt('POLYGON((0 0,1 1,1 2,1 1,0 0))')
     g1.Empty()
@@ -1186,7 +1186,7 @@ def ogr_geom_empty():
 # Test OGRGeometry::empty() for Triangle
 
 
-def ogr_geom_empty_triangle():
+def test_ogr_geom_empty_triangle():
 
     g1 = ogr.CreateGeometryFromWkt('TRIANGLE ((0 0,100 0,0 100,0 0))')
     g1.Empty()
@@ -1201,7 +1201,7 @@ def ogr_geom_empty_triangle():
 # Test parsing WKT made of 2D and 3D parts
 
 
-def ogr_geom_mixed_coordinate_dimension():
+def test_ogr_geom_mixed_coordinate_dimension():
 
     # first part is 3D, second part is 2D of same length
     wkt = 'MULTIPOLYGON (((1 2 -4,1 3 -3,2 3 -3,2 2 -3,1 2 -6)),((-1 -2,-1 -3,-2 -3,-2 -2,-1 -2,50 60)))'
@@ -1227,7 +1227,7 @@ def ogr_geom_mixed_coordinate_dimension():
 # Test GetEnvelope3D()
 
 
-def ogr_geom_getenvelope3d():
+def test_ogr_geom_getenvelope3d():
 
     g = ogr.CreateGeometryFromWkt('POINT EMPTY')
     envelope = g.GetEnvelope3D()
@@ -1307,7 +1307,7 @@ def ogr_geom_getenvelope3d():
 # Test importing/exporting XXX Z EMPTY
 
 
-def ogr_geom_z_empty():
+def test_ogr_geom_z_empty():
 
     for geom in ['POINT', 'LINESTRING', 'POLYGON', 'MULTIPOINT', 'MULTILINESTRING',
                  'MULTIPOLYGON', 'GEOMETRYCOLLECTION', 'CIRCULARSTRING', 'COMPOUNDCURVE',
@@ -1333,7 +1333,7 @@ def ogr_geom_z_empty():
 # Test HasCurveGeometry and GetLinearGeometry
 
 
-def ogr_geom_getlineargeometry():
+def test_ogr_geom_getlineargeometry():
 
     for geom in ['POINT', 'LINESTRING', 'POLYGON', 'MULTIPOINT', 'MULTILINESTRING',
                  'MULTIPOLYGON', 'GEOMETRYCOLLECTION',
@@ -1381,7 +1381,7 @@ def ogr_geom_getlineargeometry():
 # Test GetDimension()
 
 
-def ogr_geom_getdimension():
+def test_ogr_geom_getdimension():
     for (geom, dim) in [('POINT EMPTY', 0),
                         ('LINESTRING EMPTY', 1),
                         ('POLYGON EMPTY', 2),
@@ -1420,7 +1420,7 @@ def ogr_geom_getdimension():
 # Test triangle
 
 
-def ogr_geom_triangle():
+def test_ogr_geom_triangle():
 
     wkt_original = 'TRIANGLE ((0 0,0 1,1 1,0 0))'
     geom = ogr.CreateGeometryFromWkt(wkt_original)
@@ -1455,7 +1455,7 @@ def ogr_geom_triangle():
 # Test importing invalid triangle WKT
 
 
-def ogr_geom_triangle_invalid_wkt():
+def test_ogr_geom_triangle_invalid_wkt():
 
     geom_wkt = 'TRIANGLE (0 0)'
     with gdaltest.error_handler():
@@ -1502,7 +1502,7 @@ def ogr_geom_triangle_invalid_wkt():
 # Test OGRTriangle. Tests if the GEOS/SFCGAL methods are working
 
 
-def ogr_geom_triangle_sfcgal():
+def test_ogr_geom_triangle_sfcgal():
 
     if not ogrtest.have_sfcgal():
         return 'skip'
@@ -1527,7 +1527,7 @@ def ogr_geom_triangle_sfcgal():
 # Test OGRCircularString
 
 
-def ogr_geom_circularstring():
+def test_ogr_geom_circularstring():
 
     in_wkt = 'CIRCULARSTRING (0 0,1 1,1 -1)'
 
@@ -2064,7 +2064,7 @@ def ogr_geom_circularstring():
 # Test OGRCompoundCurve
 
 
-def ogr_geom_compoundcurve():
+def test_ogr_geom_compoundcurve():
 
     in_wkt = 'COMPOUNDCURVE (CIRCULARSTRING (0 0,1 1,1 -1))'
     g1 = ogr.CreateGeometryFromWkt(in_wkt)
@@ -2472,7 +2472,7 @@ def ogr_geom_compoundcurve():
 # Test OGRCurvePolygon
 
 
-def ogr_geom_curvepolygon():
+def test_ogr_geom_curvepolygon():
 
     in_wkt = 'CURVEPOLYGON (CIRCULARSTRING (0 0,1 0,0 0))'
     g1 = ogr.CreateGeometryFromWkt(in_wkt)
@@ -2861,7 +2861,7 @@ def ogr_geom_curvepolygon():
 # Test OGRMultiCurve
 
 
-def ogr_geom_multicurve():
+def test_ogr_geom_multicurve():
 
     # Simple test
     in_wkt = 'MULTICURVE (CIRCULARSTRING (0 0,1 0,0 0))'
@@ -2985,7 +2985,7 @@ def ogr_geom_multicurve():
 # Test OGRMultiSurface
 
 
-def ogr_geom_multisurface():
+def test_ogr_geom_multisurface():
 
     # Simple test
     in_wkt = 'MULTISURFACE (CURVEPOLYGON (CIRCULARSTRING (0 0,1 0,0 0)))'
@@ -3125,7 +3125,7 @@ def ogr_geom_multisurface():
 # Test GetCurveGeometry
 
 
-def ogr_geom_getcurvegeometry():
+def test_ogr_geom_getcurvegeometry():
 
     for geom in ['POINT', 'LINESTRING', 'POLYGON', 'MULTIPOINT', 'MULTILINESTRING',
                  'MULTIPOLYGON', 'GEOMETRYCOLLECTION',
@@ -3586,7 +3586,7 @@ def ogr_geom_getcurvegeometry():
 # Test OGR_GT_ functions
 
 
-def ogr_geom_gt_functions():
+def test_ogr_geom_gt_functions():
 
     # GT_HasZ
     tuples = [(ogr.wkbPoint, 0),
@@ -3844,7 +3844,7 @@ def ogr_geom_gt_functions():
 # Limit cases
 
 
-def ogr_geom_api_limit_tests():
+def test_ogr_geom_api_limit_tests():
 
     p = ogr.Geometry(ogr.wkbPoint)
     lyr = ogr.Geometry(ogr.wkbLineString)
@@ -3893,7 +3893,7 @@ def ogr_geom_api_limit_tests():
 # Test Equals
 
 
-def ogr_geom_equals():
+def test_ogr_geom_equals():
 
     p_empty = ogr.Geometry(ogr.wkbPoint)
     p_0 = ogr.CreateGeometryFromWkt('POINT (0 0)')
@@ -3964,7 +3964,7 @@ def ogr_geom_equals():
 # Test FlattenTo2D(), SetCoordinateDimension(2) and SetCoordinateDimension(3) with Measured geometries
 
 
-def ogr_geom_measured_geometries_to_2D_or_3D():
+def test_ogr_geom_measured_geometries_to_2D_or_3D():
 
     list_wkt = [['POINT M (1 2 3)', 'POINT (1 2)', 'POINT Z (1 2 0)'],
                 ['POINT ZM (1 2 3 4)', 'POINT (1 2)', 'POINT Z (1 2 3)'],
@@ -4071,7 +4071,7 @@ def ogr_geom_measured_geometries_to_2D_or_3D():
 # Test PostGIS EWKT with XYM
 
 
-def ogr_geom_postgis_ewkt_xym():
+def test_ogr_geom_postgis_ewkt_xym():
 
     list_wkt = [['POINTM(1 2 3)', 'POINT M (1 2 3)'],
                 ['GEOMETRYCOLLECTIONM(POINTM(1 2 3))', 'GEOMETRYCOLLECTION M (POINT M (1 2 3))'],
@@ -4091,7 +4091,7 @@ def ogr_geom_postgis_ewkt_xym():
 # Test ogr.wkbCurve / ogr.wkbSurface
 
 
-def ogr_geom_curve_surface():
+def test_ogr_geom_curve_surface():
 
     tests = [[ogr.wkbCurve, "Curve"],
              [ogr.wkbCurveZ, "3D Curve"],
@@ -4116,7 +4116,7 @@ def ogr_geom_curve_surface():
 # Test importing corrupted WKB
 
 
-def ogr_geom_import_corrupted_wkb():
+def test_ogr_geom_import_corrupted_wkb():
 
     list_wkt = ['POINT ZM (1 2 3 4)'
                 'LINESTRING ZM (1 2 3 4)'
@@ -4181,7 +4181,7 @@ def ogr_geom_import_corrupted_wkb():
 # Test conversions from/into triangle, TIN, PS
 
 
-def ogr_geom_triangle_ps_tin_conversion():
+def test_ogr_geom_triangle_ps_tin_conversion():
 
     wkts = ["TRIANGLE ((0 0,0 1,1 1,0 0))",
             "POLYGON ((0 0,0 1,1 1,0 0))",
@@ -4261,7 +4261,7 @@ def ogr_geom_triangle_ps_tin_conversion():
 ###############################################################################
 
 
-def ogr_geom_multipoint_envelope_bug():
+def test_ogr_geom_multipoint_envelope_bug():
 
     g = ogr.CreateGeometryFromWkt('MULTIPOINT(0 0,1 1)')
     minx, maxx, miny, maxy = g.GetEnvelope()
@@ -4282,7 +4282,7 @@ def ogr_geom_multipoint_envelope_bug():
 ###############################################################################
 
 
-def ogr_geom_polygon_empty_ring():
+def test_ogr_geom_polygon_empty_ring():
 
     g = ogr.Geometry(ogr.wkbPolygon)
     g2 = ogr.Geometry(ogr.wkbLinearRing)
@@ -4295,7 +4295,7 @@ def ogr_geom_polygon_empty_ring():
 ###############################################################################
 
 
-def ogr_geom_polygon_intersects_point():
+def test_ogr_geom_polygon_intersects_point():
 
     if not ogrtest.have_geos():
         return 'skip'
@@ -4316,7 +4316,7 @@ def ogr_geom_polygon_intersects_point():
 # Test fix for #7128
 
 
-def ogr_geom_geometrycollection():
+def test_ogr_geom_geometrycollection():
 
     wkt_list = ['GEOMETRYCOLLECTION (POINT EMPTY)',
                 'GEOMETRYCOLLECTION (LINESTRING EMPTY)',
@@ -4345,7 +4345,7 @@ def ogr_geom_geometrycollection():
 # Test fix for #7126
 
 
-def ogr_geom_assignspatialref():
+def test_ogr_geom_assignspatialref():
 
     g = ogr.CreateGeometryFromWkt('GEOMETRYCOLLECTION(POLYGON((0 0,0 1,1 1,0 0)),COMPOUNDCURVE(CIRCULARSTRING(0 0,1 1,2 0)),POLYHEDRALSURFACE(((0 0,0 1,1 1,0 0))))')
     sr = osr.SpatialReference()
@@ -4369,7 +4369,7 @@ def ogr_geom_assignspatialref():
 ###############################################################################
 
 
-def ogr_geom_swapxy():
+def test_ogr_geom_swapxy():
 
     g = ogr.CreateGeometryFromWkt('GEOMETRYCOLLECTION(POINT(1 2),LINESTRING(1 2,2 3),POLYGON((0 0,0 1,1 1,0 0)),COMPOUNDCURVE(CIRCULARSTRING(0 0,1 1,2 0)),POLYHEDRALSURFACE(((0 0,0 1,1 1,0 0))))')
     g.SwapXY()
@@ -4382,7 +4382,7 @@ def ogr_geom_swapxy():
 ###############################################################################
 
 
-def ogr_geom_remove_geometry():
+def test_ogr_geom_remove_geometry():
 
     # With GEOMETRYCOLLECTION
     g = ogr.CreateGeometryFromWkt('GEOMETRYCOLLECTION (POINT (1 2),LINESTRING (1 2,2 3),POINT (3 4))')
@@ -4496,7 +4496,7 @@ def ogr_geom_remove_geometry():
 ###############################################################################
 
 
-def ogr_geom_sfcgal():
+def test_ogr_geom_sfcgal():
 
     if not ogrtest.have_sfcgal():
         return 'skip'
@@ -4518,7 +4518,7 @@ def ogr_geom_sfcgal():
 ###############################################################################
 
 
-def ogr_geom_cannot_add_triangle_to_multisurface():
+def test_ogr_geom_cannot_add_triangle_to_multisurface():
 
     g = ogr.Geometry(ogr.wkbMultiSurface)
     if g.AddGeometry(ogr.Geometry(ogr.wkbTriangle)) == 0:
@@ -4528,7 +4528,7 @@ def ogr_geom_cannot_add_triangle_to_multisurface():
 ###############################################################################
 
 
-def ogr_geom_force_polygonzm_to_linestring():
+def test_ogr_geom_force_polygonzm_to_linestring():
     g = ogr.CreateGeometryFromWkt('POLYGON ZM ((0 0 10 20,0 1 30 40,1 1 50 60,0 0 10 70))')
     wkt = ogr.ForceToLineString(g).ExportToIsoWkt()
     if wkt != 'LINESTRING ZM (0 0 10 20,0 1 30 40,1 1 50 60,0 0 10 70)':
@@ -4540,80 +4540,80 @@ def ogr_geom_force_polygonzm_to_linestring():
 # cleanup
 
 
-def ogr_geom_cleanup():
+def test_ogr_geom_cleanup():
     return 'success'
 
 
 gdaltest_list = [
-    ogr_geom_area,
-    ogr_geom_polyhedral_surface,
-    ogr_geom_tin,
-    ogr_geom_area_triangle,
-    ogr_geom_area_linearring,
-    ogr_geom_area_linearring_big_offset,
-    ogr_geom_area_geometrycollection,
-    ogr_geom_is_empty,
-    ogr_geom_is_empty_triangle,
-    ogr_geom_pickle,
-    ogr_geom_boundary_point,
-    ogr_geom_boundary_multipoint,
-    ogr_geom_boundary_linestring,
-    ogr_geom_boundary_polygon,
-    ogr_geom_build_from_edges_1,
-    ogr_geom_build_from_edges_2,
-    ogr_geom_build_from_edges_3,
-    ogr_geom_build_from_edges_4,
-    ogr_geom_area_empty_linearring,
-    ogr_geom_transform_to,
-    ogr_geom_transform,
-    ogr_geom_closerings,
-    ogr_geom_segmentize,
-    ogr_geom_value,
-    ogr_geom_flattenTo2D,
-    ogr_geom_flattenTo2D_triangle,
-    ogr_geom_linestring_limits,
-    ogr_geom_coord_round,
-    ogr_geom_coord_round_2,
-    ogr_geom_area_point,
-    ogr_geom_length_point,
-    ogr_geom_length_multilinestring,
-    ogr_geom_length_geometrycollection,
-    ogr_geom_empty_triangle,
-    ogr_geom_triangle,
-    ogr_geom_triangle_invalid_wkt,
-    ogr_geom_triangle_sfcgal,
-    ogr_geom_empty,
-    ogr_geom_getpoints,
-    ogr_geom_mixed_coordinate_dimension,
-    ogr_geom_getenvelope3d,
-    ogr_geom_z_empty,
-    ogr_geom_getlineargeometry,
-    ogr_geom_getdimension,
-    ogr_geom_circularstring,
-    ogr_geom_compoundcurve,
-    ogr_geom_curvepolygon,
-    ogr_geom_multicurve,
-    ogr_geom_multisurface,
-    ogr_geom_getcurvegeometry,
-    ogr_geom_gt_functions,
-    ogr_geom_api_limit_tests,
-    ogr_geom_equals,
-    ogr_geom_measured_geometries_to_2D_or_3D,
-    ogr_geom_postgis_ewkt_xym,
-    ogr_geom_curve_surface,
-    ogr_geom_import_corrupted_wkb,
-    ogr_geom_triangle_ps_tin_conversion,
-    ogr_geom_multipoint_envelope_bug,
-    ogr_geom_polygon_empty_ring,
-    ogr_geom_polygon_intersects_point,
-    ogr_geom_geometrycollection,
-    ogr_geom_assignspatialref,
-    ogr_geom_swapxy,
-    ogr_geom_remove_geometry,
-    ogr_geom_sfcgal,
-    ogr_geom_cannot_add_triangle_to_multisurface,
-    ogr_geom_force_polygonzm_to_linestring,
-    ogr_geom_cleanup]
+    test_ogr_geom_area,
+    test_ogr_geom_polyhedral_surface,
+    test_ogr_geom_tin,
+    test_ogr_geom_area_triangle,
+    test_ogr_geom_area_linearring,
+    test_ogr_geom_area_linearring_big_offset,
+    test_ogr_geom_area_geometrycollection,
+    test_ogr_geom_is_empty,
+    test_ogr_geom_is_empty_triangle,
+    test_ogr_geom_pickle,
+    test_ogr_geom_boundary_point,
+    test_ogr_geom_boundary_multipoint,
+    test_ogr_geom_boundary_linestring,
+    test_ogr_geom_boundary_polygon,
+    test_ogr_geom_build_from_edges_1,
+    test_ogr_geom_build_from_edges_2,
+    test_ogr_geom_build_from_edges_3,
+    test_ogr_geom_build_from_edges_4,
+    test_ogr_geom_area_empty_linearring,
+    test_ogr_geom_transform_to,
+    test_ogr_geom_transform,
+    test_ogr_geom_closerings,
+    test_ogr_geom_segmentize,
+    test_ogr_geom_value,
+    test_ogr_geom_flattenTo2D,
+    test_ogr_geom_flattenTo2D_triangle,
+    test_ogr_geom_linestring_limits,
+    test_ogr_geom_coord_round,
+    test_ogr_geom_coord_round_2,
+    test_ogr_geom_area_point,
+    test_ogr_geom_length_point,
+    test_ogr_geom_length_multilinestring,
+    test_ogr_geom_length_geometrycollection,
+    test_ogr_geom_empty_triangle,
+    test_ogr_geom_triangle,
+    test_ogr_geom_triangle_invalid_wkt,
+    test_ogr_geom_triangle_sfcgal,
+    test_ogr_geom_empty,
+    test_ogr_geom_getpoints,
+    test_ogr_geom_mixed_coordinate_dimension,
+    test_ogr_geom_getenvelope3d,
+    test_ogr_geom_z_empty,
+    test_ogr_geom_getlineargeometry,
+    test_ogr_geom_getdimension,
+    test_ogr_geom_circularstring,
+    test_ogr_geom_compoundcurve,
+    test_ogr_geom_curvepolygon,
+    test_ogr_geom_multicurve,
+    test_ogr_geom_multisurface,
+    test_ogr_geom_getcurvegeometry,
+    test_ogr_geom_gt_functions,
+    test_ogr_geom_api_limit_tests,
+    test_ogr_geom_equals,
+    test_ogr_geom_measured_geometries_to_2D_or_3D,
+    test_ogr_geom_postgis_ewkt_xym,
+    test_ogr_geom_curve_surface,
+    test_ogr_geom_import_corrupted_wkb,
+    test_ogr_geom_triangle_ps_tin_conversion,
+    test_ogr_geom_multipoint_envelope_bug,
+    test_ogr_geom_polygon_empty_ring,
+    test_ogr_geom_polygon_intersects_point,
+    test_ogr_geom_geometrycollection,
+    test_ogr_geom_assignspatialref,
+    test_ogr_geom_swapxy,
+    test_ogr_geom_remove_geometry,
+    test_ogr_geom_sfcgal,
+    test_ogr_geom_cannot_add_triangle_to_multisurface,
+    test_ogr_geom_force_polygonzm_to_linestring,
+    test_ogr_geom_cleanup]
 
 # gdaltest_list = [ ogr_geom_triangle_ps_tin_conversion ]
 
diff --git a/autotest/ogr/ogr_georss.py b/autotest/ogr/ogr_georss.py
index e81739b8da59..08f6d4982b70 100755
--- a/autotest/ogr/ogr_georss.py
+++ b/autotest/ogr/ogr_georss.py
@@ -39,7 +39,7 @@
 from osgeo import gdal
 
 
-def ogr_georss_init():
+def test_ogr_georss_init():
 
     ds = ogr.Open('data/atom_rfc_sample.xml')
     if ds is None:
@@ -112,7 +112,7 @@ def ogr_georss_test_atom(filename):
 # Test reading an ATOM document without any geometry
 
 
-def ogr_georss_1():
+def test_ogr_georss_1():
 
     return ogr_georss_test_atom('data/atom_rfc_sample.xml')
 
@@ -120,7 +120,7 @@ def ogr_georss_1():
 # Test reading an ATOM document with atom: prefiw
 
 
-def ogr_georss_1_atom_ns():
+def test_ogr_georss_1_atom_ns():
 
     return ogr_georss_test_atom('data/atom_rfc_sample_atom_ns.xml')
 
@@ -128,7 +128,7 @@ def ogr_georss_1_atom_ns():
 # Test writing a Atom 1.0 document (doesn't need read support)
 
 
-def ogr_georss_1bis():
+def test_ogr_georss_1bis():
 
     try:
         os.remove('tmp/test_atom.xml')
@@ -159,7 +159,7 @@ def ogr_georss_1bis():
 ###############################################################################
 # Test reading document created at previous step
 
-def ogr_georss_1ter():
+def test_ogr_georss_1ter():
 
     return ogr_georss_test_atom('tmp/test_atom.xml')
 
@@ -242,7 +242,7 @@ def ogr_georss_test_rss(filename, only_first_feature):
 # Test reading a RSS 2.0 document with GeoRSS simple geometries
 
 
-def ogr_georss_2():
+def test_ogr_georss_2():
 
     return ogr_georss_test_rss('data/test_georss_simple.xml', False)
 
@@ -250,7 +250,7 @@ def ogr_georss_2():
 # Test reading a RSS 2.0 document with GeoRSS GML geometries
 
 
-def ogr_georss_3():
+def test_ogr_georss_3():
 
     if not gdaltest.have_gml_reader:
         return 'skip'
@@ -336,7 +336,7 @@ def ogr_georss_create(filename, options):
 # Test writing a RSS 2.0 document in Simple dialect (doesn't need read support)
 
 
-def ogr_georss_4():
+def test_ogr_georss_4():
 
     if ogr_georss_create('tmp/test_rss2.xml', []) != 'success':
         return 'fail'
@@ -352,7 +352,7 @@ def ogr_georss_4():
 # Test reading document created at previous step
 
 
-def ogr_georss_5():
+def test_ogr_georss_5():
 
     return ogr_georss_test_rss('tmp/test_rss2.xml', False)
 
@@ -360,7 +360,7 @@ def ogr_georss_5():
 # Test writing a RSS 2.0 document in GML dialect (doesn't need read support)
 
 
-def ogr_georss_6():
+def test_ogr_georss_6():
 
     if ogr_georss_create('tmp/test_rss2.xml', ['GEOM_DIALECT=GML']) != 'success':
         return 'fail'
@@ -376,7 +376,7 @@ def ogr_georss_6():
 # Test reading document created at previous step
 
 
-def ogr_georss_7():
+def test_ogr_georss_7():
     if not gdaltest.have_gml_reader:
         return 'skip'
 
@@ -386,7 +386,7 @@ def ogr_georss_7():
 # Test writing a RSS 2.0 document in W3C Geo dialect (doesn't need read support)
 
 
-def ogr_georss_8():
+def test_ogr_georss_8():
 
     if ogr_georss_create('tmp/test_rss2.xml', ['GEOM_DIALECT=W3C_GEO']) != 'success':
         return 'fail'
@@ -402,7 +402,7 @@ def ogr_georss_8():
 # Test reading document created at previous step
 
 
-def ogr_georss_9():
+def test_ogr_georss_9():
 
     return ogr_georss_test_rss('tmp/test_rss2.xml', True)
 
@@ -410,7 +410,7 @@ def ogr_georss_9():
 # Test writing a RSS 2.0 document in GML dialect with EPSG:32631
 
 
-def ogr_georss_10():
+def test_ogr_georss_10():
     try:
         os.remove('tmp/test32631.rss')
     except OSError:
@@ -460,7 +460,7 @@ def ogr_georss_10():
 # Test reading document created at previous step
 
 
-def ogr_georss_11():
+def test_ogr_georss_11():
 
     if not gdaltest.georss_read_support:
         return 'skip'
@@ -494,7 +494,7 @@ def ogr_georss_11():
 # Test various broken documents
 
 
-def ogr_georss_12():
+def test_ogr_georss_12():
 
     if not gdaltest.georss_read_support:
         return 'skip'
@@ -528,7 +528,7 @@ def ogr_georss_12():
 # Test writing non standard fields
 
 
-def ogr_georss_13():
+def test_ogr_georss_13():
     try:
         os.remove('tmp/nonstandard.rss')
     except OSError:
@@ -568,7 +568,7 @@ def ogr_georss_13():
 # Test reading document created at previous step
 
 
-def ogr_georss_14():
+def test_ogr_georss_14():
 
     if not gdaltest.georss_read_support:
         return 'skip'
@@ -594,7 +594,7 @@ def ogr_georss_14():
 # Test reading an in memory file (#2931)
 
 
-def ogr_georss_15():
+def test_ogr_georss_15():
 
     if not gdaltest.georss_read_support:
         return 'skip'
@@ -639,7 +639,7 @@ def ogr_georss_15():
 #
 
 
-def ogr_georss_cleanup():
+def test_ogr_georss_cleanup():
 
     list_files = ['tmp/test_rss2.xml', 'tmp/test_atom.xml', 'tmp/test32631.rss', 'tmp/broken.rss', 'tmp/nonstandard.rss']
     for filename in list_files:
@@ -657,26 +657,26 @@ def ogr_georss_cleanup():
 
 
 gdaltest_list = [
-    ogr_georss_init,
-    ogr_georss_1,
-    ogr_georss_1_atom_ns,
-    ogr_georss_1bis,
-    ogr_georss_1ter,
-    ogr_georss_2,
-    ogr_georss_3,
-    ogr_georss_4,
-    ogr_georss_5,
-    ogr_georss_6,
-    ogr_georss_7,
-    ogr_georss_8,
-    ogr_georss_9,
-    ogr_georss_10,
-    ogr_georss_11,
-    ogr_georss_12,
-    ogr_georss_13,
-    ogr_georss_14,
-    ogr_georss_15,
-    ogr_georss_cleanup]
+    test_ogr_georss_init,
+    test_ogr_georss_1,
+    test_ogr_georss_1_atom_ns,
+    test_ogr_georss_1bis,
+    test_ogr_georss_1ter,
+    test_ogr_georss_2,
+    test_ogr_georss_3,
+    test_ogr_georss_4,
+    test_ogr_georss_5,
+    test_ogr_georss_6,
+    test_ogr_georss_7,
+    test_ogr_georss_8,
+    test_ogr_georss_9,
+    test_ogr_georss_10,
+    test_ogr_georss_11,
+    test_ogr_georss_12,
+    test_ogr_georss_13,
+    test_ogr_georss_14,
+    test_ogr_georss_15,
+    test_ogr_georss_cleanup]
 
 if __name__ == '__main__':
 
diff --git a/autotest/ogr/ogr_geos.py b/autotest/ogr/ogr_geos.py
index 870dcc05b301..eba53c158d18 100755
--- a/autotest/ogr/ogr_geos.py
+++ b/autotest/ogr/ogr_geos.py
@@ -39,7 +39,7 @@
 # Establish whether we have GEOS support integrated, testing simple Union.
 
 
-def ogr_geos_union():
+def test_ogr_geos_union():
 
     if not ogrtest.have_geos():
         return 'skip'
@@ -58,7 +58,7 @@ def ogr_geos_union():
 # Test polygon intersection.
 
 
-def ogr_geos_intersection():
+def test_ogr_geos_intersection():
 
     if not ogrtest.have_geos():
         return 'skip'
@@ -78,7 +78,7 @@ def ogr_geos_intersection():
 # Test polygon difference.
 
 
-def ogr_geos_difference():
+def test_ogr_geos_difference():
 
     if not ogrtest.have_geos():
         return 'skip'
@@ -99,7 +99,7 @@ def ogr_geos_difference():
 # Test polygon symmetric difference.
 
 
-def ogr_geos_symmetric_difference():
+def test_ogr_geos_symmetric_difference():
 
     if not ogrtest.have_geos():
         return 'skip'
@@ -120,7 +120,7 @@ def ogr_geos_symmetric_difference():
 # Test polygon symmetric difference.
 
 
-def ogr_geos_sym_difference():
+def test_ogr_geos_sym_difference():
 
     if not ogrtest.have_geos():
         return 'skip'
@@ -141,7 +141,7 @@ def ogr_geos_sym_difference():
 # Test Intersect().
 
 
-def ogr_geos_intersect():
+def test_ogr_geos_intersect():
 
     if not ogrtest.have_geos():
         return 'skip'
@@ -170,7 +170,7 @@ def ogr_geos_intersect():
 # Test disjoint().
 
 
-def ogr_geos_disjoint():
+def test_ogr_geos_disjoint():
 
     if not ogrtest.have_geos():
         return 'skip'
@@ -199,7 +199,7 @@ def ogr_geos_disjoint():
 # Test touches.
 
 
-def ogr_geos_touches():
+def test_ogr_geos_touches():
 
     if not ogrtest.have_geos():
         return 'skip'
@@ -228,7 +228,7 @@ def ogr_geos_touches():
 # Test crosses.
 
 
-def ogr_geos_crosses():
+def test_ogr_geos_crosses():
 
     if not ogrtest.have_geos():
         return 'skip'
@@ -256,7 +256,7 @@ def ogr_geos_crosses():
 ###############################################################################
 
 
-def ogr_geos_within():
+def test_ogr_geos_within():
 
     if not ogrtest.have_geos():
         return 'skip'
@@ -281,7 +281,7 @@ def ogr_geos_within():
 ###############################################################################
 
 
-def ogr_geos_contains():
+def test_ogr_geos_contains():
 
     if not ogrtest.have_geos():
         return 'skip'
@@ -306,7 +306,7 @@ def ogr_geos_contains():
 ###############################################################################
 
 
-def ogr_geos_overlaps():
+def test_ogr_geos_overlaps():
 
     if not ogrtest.have_geos():
         return 'skip'
@@ -335,7 +335,7 @@ def ogr_geos_overlaps():
 ###############################################################################
 
 
-def ogr_geos_buffer():
+def test_ogr_geos_buffer():
 
     if not ogrtest.have_geos():
         return 'skip'
@@ -354,7 +354,7 @@ def ogr_geos_buffer():
 ###############################################################################
 
 
-def ogr_geos_centroid():
+def test_ogr_geos_centroid():
 
     if not ogrtest.have_geos():
         return 'skip'
@@ -382,7 +382,7 @@ def ogr_geos_centroid():
 ###############################################################################
 
 
-def ogr_geos_centroid_multipolygon():
+def test_ogr_geos_centroid_multipolygon():
 
     if not ogrtest.have_geos():
         return 'skip'
@@ -401,7 +401,7 @@ def ogr_geos_centroid_multipolygon():
 ###############################################################################
 
 
-def ogr_geos_centroid_point_empty():
+def test_ogr_geos_centroid_point_empty():
 
     if not ogrtest.have_geos():
         return 'skip'
@@ -419,7 +419,7 @@ def ogr_geos_centroid_point_empty():
 ###############################################################################
 
 
-def ogr_geos_simplify_linestring():
+def test_ogr_geos_simplify_linestring():
 
     if not ogrtest.have_geos():
         return 'skip'
@@ -438,7 +438,7 @@ def ogr_geos_simplify_linestring():
 ###############################################################################
 
 
-def ogr_geos_simplifypreservetopology_linestring():
+def test_ogr_geos_simplifypreservetopology_linestring():
 
     if not ogrtest.have_geos():
         return 'skip'
@@ -457,7 +457,7 @@ def ogr_geos_simplifypreservetopology_linestring():
 ###############################################################################
 
 
-def ogr_geos_unioncascaded():
+def test_ogr_geos_unioncascaded():
 
     if not ogrtest.have_geos():
         return 'skip'
@@ -476,7 +476,7 @@ def ogr_geos_unioncascaded():
 ###############################################################################
 
 
-def ogr_geos_convexhull():
+def test_ogr_geos_convexhull():
 
     if not ogrtest.have_geos():
         return 'skip'
@@ -494,7 +494,7 @@ def ogr_geos_convexhull():
 ###############################################################################
 
 
-def ogr_geos_distance():
+def test_ogr_geos_distance():
 
     if not ogrtest.have_geos():
         return 'skip'
@@ -513,7 +513,7 @@ def ogr_geos_distance():
 ###############################################################################
 
 
-def ogr_geos_isring():
+def test_ogr_geos_isring():
 
     if not ogrtest.have_geos():
         return 'skip'
@@ -530,7 +530,7 @@ def ogr_geos_isring():
 ###############################################################################
 
 
-def ogr_geos_issimple_true():
+def test_ogr_geos_issimple_true():
 
     if not ogrtest.have_geos():
         return 'skip'
@@ -547,7 +547,7 @@ def ogr_geos_issimple_true():
 ###############################################################################
 
 
-def ogr_geos_issimple_false():
+def test_ogr_geos_issimple_false():
 
     if not ogrtest.have_geos():
         return 'skip'
@@ -564,7 +564,7 @@ def ogr_geos_issimple_false():
 ###############################################################################
 
 
-def ogr_geos_isvalid_true():
+def test_ogr_geos_isvalid_true():
 
     if not ogrtest.have_geos():
         return 'skip'
@@ -581,7 +581,7 @@ def ogr_geos_isvalid_true():
 ###############################################################################
 
 
-def ogr_geos_isvalid_true_linestringM():
+def test_ogr_geos_isvalid_true_linestringM():
 
     if not ogrtest.have_geos():
         return 'skip'
@@ -598,7 +598,7 @@ def ogr_geos_isvalid_true_linestringM():
 ###############################################################################
 
 
-def ogr_geos_isvalid_true_circularStringM():
+def test_ogr_geos_isvalid_true_circularStringM():
 
     if not ogrtest.have_geos():
         return 'skip'
@@ -615,7 +615,7 @@ def ogr_geos_isvalid_true_circularStringM():
 ###############################################################################
 
 
-def ogr_geos_isvalid_true_triangle():
+def test_ogr_geos_isvalid_true_triangle():
 
     if not ogrtest.have_geos():
         return 'skip'
@@ -632,7 +632,7 @@ def ogr_geos_isvalid_true_triangle():
 ###############################################################################
 
 
-def ogr_geos_isvalid_false():
+def test_ogr_geos_isvalid_false():
 
     if not ogrtest.have_geos():
         return 'skip'
@@ -650,7 +650,7 @@ def ogr_geos_isvalid_false():
 ###############################################################################
 
 
-def ogr_geos_pointonsurface():
+def test_ogr_geos_pointonsurface():
 
     if not ogrtest.have_geos():
         return 'skip'
@@ -667,7 +667,7 @@ def ogr_geos_pointonsurface():
 ###############################################################################
 
 
-def ogr_geos_DelaunayTriangulation():
+def test_ogr_geos_DelaunayTriangulation():
 
     if not ogrtest.have_geos():
         return 'skip'
@@ -690,7 +690,7 @@ def ogr_geos_DelaunayTriangulation():
 ###############################################################################
 
 
-def ogr_geos_polygonize():
+def test_ogr_geos_polygonize():
 
     if not ogrtest.have_geos():
         return 'skip'
@@ -717,38 +717,38 @@ def ogr_geos_polygonize():
 
 
 gdaltest_list = [
-    ogr_geos_union,
-    ogr_geos_intersection,
-    ogr_geos_difference,
-    ogr_geos_symmetric_difference,
-    ogr_geos_sym_difference,
-    ogr_geos_intersect,
-    ogr_geos_disjoint,
-    ogr_geos_touches,
-    ogr_geos_crosses,
-    ogr_geos_within,
-    ogr_geos_contains,
-    ogr_geos_overlaps,
-    ogr_geos_buffer,
-    ogr_geos_centroid,
-    ogr_geos_centroid_multipolygon,
-    ogr_geos_centroid_point_empty,
-    ogr_geos_simplify_linestring,
-    ogr_geos_simplifypreservetopology_linestring,
-    ogr_geos_unioncascaded,
-    ogr_geos_convexhull,
-    ogr_geos_distance,
-    ogr_geos_isring,
-    ogr_geos_issimple_true,
-    ogr_geos_issimple_false,
-    ogr_geos_isvalid_true,
-    ogr_geos_isvalid_true_linestringM,
-    ogr_geos_isvalid_true_circularStringM,
-    ogr_geos_isvalid_true_triangle,
-    ogr_geos_isvalid_false,
-    ogr_geos_pointonsurface,
-    ogr_geos_DelaunayTriangulation,
-    ogr_geos_polygonize,
+    test_ogr_geos_union,
+    test_ogr_geos_intersection,
+    test_ogr_geos_difference,
+    test_ogr_geos_symmetric_difference,
+    test_ogr_geos_sym_difference,
+    test_ogr_geos_intersect,
+    test_ogr_geos_disjoint,
+    test_ogr_geos_touches,
+    test_ogr_geos_crosses,
+    test_ogr_geos_within,
+    test_ogr_geos_contains,
+    test_ogr_geos_overlaps,
+    test_ogr_geos_buffer,
+    test_ogr_geos_centroid,
+    test_ogr_geos_centroid_multipolygon,
+    test_ogr_geos_centroid_point_empty,
+    test_ogr_geos_simplify_linestring,
+    test_ogr_geos_simplifypreservetopology_linestring,
+    test_ogr_geos_unioncascaded,
+    test_ogr_geos_convexhull,
+    test_ogr_geos_distance,
+    test_ogr_geos_isring,
+    test_ogr_geos_issimple_true,
+    test_ogr_geos_issimple_false,
+    test_ogr_geos_isvalid_true,
+    test_ogr_geos_isvalid_true_linestringM,
+    test_ogr_geos_isvalid_true_circularStringM,
+    test_ogr_geos_isvalid_true_triangle,
+    test_ogr_geos_isvalid_false,
+    test_ogr_geos_pointonsurface,
+    test_ogr_geos_DelaunayTriangulation,
+    test_ogr_geos_polygonize,
 ]
 
 if __name__ == '__main__':
diff --git a/autotest/ogr/ogr_gft.py b/autotest/ogr/ogr_gft.py
index 00890531e686..f998a4580f4d 100755
--- a/autotest/ogr/ogr_gft.py
+++ b/autotest/ogr/ogr_gft.py
@@ -42,7 +42,7 @@
 # Test if driver is available
 
 
-def ogr_gft_init():
+def test_ogr_gft_init():
 
     ogrtest.gft_drv = None
 
@@ -64,7 +64,7 @@ def ogr_gft_init():
 # Read test on Wikileaks Afgan War Diary 2004-2010 table.
 
 
-def ogr_gft_read():
+def test_ogr_gft_read():
     if ogrtest.gft_drv is None:
         return 'skip'
 
@@ -116,7 +116,7 @@ def ogr_gft_read():
 # Write test
 
 
-def ogr_gft_write():
+def test_ogr_gft_write():
     if ogrtest.gft_drv is None:
         return 'skip'
 
@@ -191,7 +191,7 @@ def ogr_gft_write():
 # ogr2ogr test to create a non-spatial GFT table
 
 
-def ogr_gft_ogr2ogr_non_spatial():
+def test_ogr_gft_ogr2ogr_non_spatial():
     if ogrtest.gft_drv is None:
         return 'skip'
 
@@ -241,7 +241,7 @@ def ogr_gft_ogr2ogr_non_spatial():
 # ogr2ogr test to create a spatial GFT table
 
 
-def ogr_gft_ogr2ogr_spatial():
+def test_ogr_gft_ogr2ogr_spatial():
     if ogrtest.gft_drv is None:
         return 'skip'
 
@@ -325,11 +325,11 @@ def ogr_gft_ogr2ogr_spatial():
 
 
 gdaltest_list = [
-    ogr_gft_init,
-    ogr_gft_read,
-    ogr_gft_write,
-    ogr_gft_ogr2ogr_non_spatial,
-    ogr_gft_ogr2ogr_spatial,
+    test_ogr_gft_init,
+    test_ogr_gft_read,
+    test_ogr_gft_write,
+    test_ogr_gft_ogr2ogr_non_spatial,
+    test_ogr_gft_ogr2ogr_spatial,
 ]
 
 if __name__ == '__main__':
diff --git a/autotest/ogr/ogr_gml_fgd_read.py b/autotest/ogr/ogr_gml_fgd_read.py
index 6c02156b73f8..b1f0b1b6992a 100755
--- a/autotest/ogr/ogr_gml_fgd_read.py
+++ b/autotest/ogr/ogr_gml_fgd_read.py
@@ -49,7 +49,7 @@
 ###############################################################################
 # Test reading Japanese FGD GML (v4) ElevPt file
 
-def ogr_gml_fgd_1():
+def test_ogr_gml_fgd_1():
 
     gdaltest.have_gml_fgd_reader = 0
 
@@ -95,7 +95,7 @@ def ogr_gml_fgd_1():
 ###############################################################################
 # Test reading Japanese FGD GML (v4) BldA file
 
-def ogr_gml_fgd_2():
+def test_ogr_gml_fgd_2():
     if not gdaltest.have_gml_fgd_reader:
         return 'skip'
 
@@ -135,8 +135,8 @@ def ogr_gml_fgd_2():
 
 
 gdaltest_list = [
-    ogr_gml_fgd_1,
-    ogr_gml_fgd_2
+    test_ogr_gml_fgd_1,
+    test_ogr_gml_fgd_2
 ]
 
 
diff --git a/autotest/ogr/ogr_gml_geom.py b/autotest/ogr/ogr_gml_geom.py
index 43b68000ae6a..ef7e15d48914 100755
--- a/autotest/ogr/ogr_gml_geom.py
+++ b/autotest/ogr/ogr_gml_geom.py
@@ -80,7 +80,7 @@ def test_gml_geom(unit):
 # by ESRI WFS software.
 
 
-def gml_space_test():
+def test_gml_space_test():
     gml = '<gml:LineString xmlns:foo="http://bar"><gml:coordinates xmlns:foo="http://bar" decimal="." cs="," ts=" ">189999.99995605,624999.99998375 200000.00005735,624999.99998375 200000.00005735,612499.99997125 195791.3593843,612499.99997125 193327.3749823,612499.99997125 189999.99995605,612499.99997125 189999.99995605,619462.31247125 189999.99995605,624999.99998375 \n</gml:coordinates></gml:LineString>'
     geom = ogr.CreateGeometryFromGML(gml)
     if geom is None or geom.GetGeometryType() is not ogr.wkbLineString \
@@ -94,7 +94,7 @@ def gml_space_test():
 # Test GML 3.x "pos" element for a point.
 
 
-def gml_pos_point():
+def test_gml_pos_point():
 
     gml = '<gml:Point xmlns:foo="http://bar"><gml:pos>31 29 16</gml:pos></gml:Point>'
 
@@ -110,7 +110,7 @@ def gml_pos_point():
 # Test GML 3.1.1 "pos" element for a polygon. (ticket #3244)
 
 
-def gml_pos_polygon():
+def test_gml_pos_polygon():
 
     gml = '''<gml:Polygon xmlns:foo="http://bar">
                 <gml:exterior xmlns:foo="http://bar">
@@ -145,7 +145,7 @@ def gml_pos_polygon():
 # Test GML 3.x "posList" element for a linestring.
 
 
-def gml_posList_line():
+def test_gml_posList_line():
 
     gml = '<LineString xmlns:foo="http://bar"><posList xmlns:foo="http://bar">31 42 53 64 55 76</posList></LineString>'
 
@@ -161,7 +161,7 @@ def gml_posList_line():
 ###############################################################################
 # Test GML 3.x "posList" element for a 3D linestring.
 
-def gml_posList_line3d():
+def test_gml_posList_line3d():
 
     gml = '<LineString><posList xmlns:foo="http://bar" srsDimension="3">31 42 1 53 64 2 55 76 3</posList></LineString>'
 
@@ -178,7 +178,7 @@ def gml_posList_line3d():
 # set on LineString, not posList
 
 
-def gml_posList_line3d_2():
+def test_gml_posList_line3d_2():
 
     gml = '<LineString srsDimension="3"><posList>31 42 1 53 64 2 55 76 3</posList></LineString>'
 
@@ -194,7 +194,7 @@ def gml_posList_line3d_2():
 # Test GML 3.x "polygon" element for a point.
 
 
-def gml_polygon():
+def test_gml_polygon():
 
     gml = '<Polygon><exterior><LinearRing><posList>0 0 4 0 4 4 0 4 0 0</posList></LinearRing></exterior><interior xmlns:foo="http://bar"><LinearRing><posList xmlns:foo="http://bar">1 1 2 1 2 2 1 2 1 1</posList></LinearRing></interior></Polygon>'
     geom = ogr.CreateGeometryFromGML(gml)
@@ -233,7 +233,7 @@ def _CreateGMLWithSRSFromWkt(wkt, epsg):
 # Test of Point geometry with SRS assigned
 
 
-def gml_out_point_srs():
+def test_gml_out_point_srs():
 
     wkt = 'POINT(21.675 53.763)'
 
@@ -253,7 +253,7 @@ def gml_out_point_srs():
 # Test of Point 3D geometry with SRS assigned
 
 
-def gml_out_point3d_srs():
+def test_gml_out_point3d_srs():
 
     wkt = 'POINT(21.675 53.763 100)'
 
@@ -273,7 +273,7 @@ def gml_out_point3d_srs():
 # Test of LineString geometry with SRS assigned
 
 
-def gml_out_linestring_srs():
+def test_gml_out_linestring_srs():
 
     wkt = open('data/wkb_wkt/5.wkt').read()
 
@@ -293,7 +293,7 @@ def gml_out_linestring_srs():
 # Test of Polygon geometry with SRS assigned
 
 
-def gml_out_polygon_srs():
+def test_gml_out_polygon_srs():
 
     wkt = open('data/wkb_wkt/6.wkt').read()
 
@@ -313,7 +313,7 @@ def gml_out_polygon_srs():
 # Test of MultiPoint geometry with SRS assigned
 
 
-def gml_out_multipoint_srs():
+def test_gml_out_multipoint_srs():
 
     wkt = open('data/wkb_wkt/11.wkt').read()
 
@@ -333,7 +333,7 @@ def gml_out_multipoint_srs():
 # Test of MultiLineString geometry with SRS assigned
 
 
-def gml_out_multilinestring_srs():
+def test_gml_out_multilinestring_srs():
 
     wkt = open('data/wkb_wkt/2.wkt').read()
 
@@ -353,7 +353,7 @@ def gml_out_multilinestring_srs():
 # Test of MultiPolygon geometry with SRS assigned
 
 
-def gml_out_multipolygon_srs():
+def test_gml_out_multipolygon_srs():
 
     wkt = open('data/wkb_wkt/4.wkt').read()
 
@@ -380,7 +380,7 @@ def gml_out_multipolygon_srs():
 # Test of GeometryCollection with SRS assigned
 
 
-def gml_out_geometrycollection_srs():
+def test_gml_out_geometrycollection_srs():
 
     wkt = open('data/wkb_wkt/3.wkt').read()
 
@@ -401,7 +401,7 @@ def gml_out_geometrycollection_srs():
 # Test GML Box
 
 
-def gml_Box():
+def test_gml_Box():
 
     gml = """<gml:Box xmlns:gml="http://www.opengis.net/gml" srsName="foo">
   <gml:coord>
@@ -427,7 +427,7 @@ def gml_Box():
 # Test GML Envelope
 
 
-def gml_Envelope():
+def test_gml_Envelope():
 
     gml = """<gml:Envelope xmlns:gml="http://www.opengis.net/gml" srsName="foo">
     <gml:lowerCorner>1 2</gml:lowerCorner>
@@ -447,7 +447,7 @@ def gml_Envelope():
 # Test GML Curve
 
 
-def gml_Curve():
+def test_gml_Curve():
 
     gml = """<gml:Curve xmlns:gml="http://www.opengis.net/gml" srsName="foo">
     <gml:segments xmlns:foo="http://bar">
@@ -470,7 +470,7 @@ def gml_Curve():
 # Test GML Curve with pointProperty elements
 
 
-def gml_Curve_with_pointProperty():
+def test_gml_Curve_with_pointProperty():
 
     gml = """<gml:Curve xmlns:gml="http://www.opengis.net/gml" srsName="foo">
     <gml:segments>
@@ -498,7 +498,7 @@ def gml_Curve_with_pointProperty():
 # Test GML MultiCurve
 
 
-def gml_MultiCurve():
+def test_gml_MultiCurve():
 
     gml = """<gml:MultiCurve xmlns:foo="http://bar" xmlns:gml="http://www.opengis.net/gml" srsName="foo">
     <gml:curveMember xmlns:foo="http://bar">
@@ -526,7 +526,7 @@ def gml_MultiCurve():
 # Test GML MultiSurface with PolygonPatch
 
 
-def gml_MultiSurface():
+def test_gml_MultiSurface():
 
     gml = """<gml:MultiSurface xmlns:gml="http://www.opengis.net/gml" srsName="foo">
     <gml:surfaceMember xmlns:foo="http://bar" xlink:role="main">
@@ -609,7 +609,7 @@ def gml_MultiSurface():
 ###############################################################################
 # Test GML MultiSurface with surfaceMembers
 
-def gml_MultiSurface_surfaceMembers():
+def test_gml_MultiSurface_surfaceMembers():
 
     gml = """<gml:MultiSurface xmlns:foo="http://bar">
           <gml:surfaceMembers xmlns:foo="http://bar">
@@ -663,7 +663,7 @@ def gml_MultiSurface_surfaceMembers():
 ###############################################################################
 # Test GML MultiCurve with curveMembers
 
-def gml_MultiCurve_curveMembers():
+def test_gml_MultiCurve_curveMembers():
 
     gml = """<gml:MultiCurve xmlns:foo="http://bar">
           <gml:curveMembers xmlns:foo="http://bar">
@@ -685,7 +685,7 @@ def gml_MultiCurve_curveMembers():
 ###############################################################################
 # Test GML MultiGeometry with geometryMembers
 
-def gml_MultiGeometry_geometryMembers():
+def test_gml_MultiGeometry_geometryMembers():
 
     gml = """<gml:MultiGeometry xmlns:foo="http://bar">
           <gml:geometryMembers xmlns:foo="http://bar">
@@ -708,7 +708,7 @@ def gml_MultiGeometry_geometryMembers():
 # Test GML CompositeCurve with curveMembers
 
 
-def gml_CompositeCurve_curveMembers():
+def test_gml_CompositeCurve_curveMembers():
 
     gml = """<gml:CompositeCurve xmlns:foo="http://bar">
           <gml:curveMembers xmlns:foo="http://bar">
@@ -734,7 +734,7 @@ def gml_CompositeCurve_curveMembers():
 # Test GML MultiPoint with pointMembers
 
 
-def gml_MultiCurve_pointMembers():
+def test_gml_MultiCurve_pointMembers():
 
     gml = """<gml:MultiPoint xmlns:foo="http://bar">
           <gml:pointMembers xmlns:foo="http://bar">
@@ -759,7 +759,7 @@ def gml_MultiCurve_pointMembers():
 # Test GML Solid
 
 
-def gml_Solid():
+def test_gml_Solid():
 
     gml = """<gml:Solid xmlns:foo="http://bar" gml:id="UUID_cc5a9513-2d85-4f1a-869a-620400182e1f">
           <gml:exterior xmlns:foo="http://bar">
@@ -790,7 +790,7 @@ def gml_Solid():
 # Test GML OrientableSurface
 
 
-def gml_OrientableSurface():
+def test_gml_OrientableSurface():
 
     gml = """<gml:OrientableSurface xmlns:foo="http://bar" orientation="+">
                                             <gml:baseSurface xmlns:foo="http://bar">
@@ -819,7 +819,7 @@ def gml_OrientableSurface():
 # Test GML Triangle
 
 
-def gml_Triangle():
+def test_gml_Triangle():
 
     gml = """<gml:Triangle xmlns:foo="http://bar">
                 <gml:exterior>
@@ -853,7 +853,7 @@ def gml_Triangle():
 # Test GML Rectangle
 
 
-def gml_Rectangle():
+def test_gml_Rectangle():
 
     gml = """<gml:Rectangle xmlns:foo="http://bar">
                 <gml:exterior>
@@ -876,7 +876,7 @@ def gml_Rectangle():
 # Test GML PolyhedralSurface
 
 
-def gml_PolyhedralSurface():
+def test_gml_PolyhedralSurface():
 
     # Conversion from GML -> OGR
 
@@ -1060,7 +1060,7 @@ def gml_PolyhedralSurface():
 ###############################################################################
 # Test GML Tin
 
-def gml_Tin():
+def test_gml_Tin():
 
     gml = """<gml:Tin xmlns:foo="http://bar">
                 <gml:patches xmlns:foo="http://bar">
@@ -1155,7 +1155,7 @@ def gml_Tin():
 # Test concatenated sections (#4451)
 
 
-def gml_ConcatenatedDeduplication():
+def test_gml_ConcatenatedDeduplication():
 
     gml = """<gml:Surface>
        <gml:patches>
@@ -1223,7 +1223,7 @@ def gml_out_precision():
 # Test various error cases of gml2ogrgeometry.cpp
 
 
-def gml_invalid_geoms():
+def test_gml_invalid_geoms():
 
     gml_expected_wkt_list = [
         ('<?xml version="1.0" encoding="UTF-8"?>', None),
@@ -1400,7 +1400,7 @@ def gml_invalid_geoms():
 # Test write support for GML3
 
 
-def gml_write_gml3_geometries():
+def test_gml_write_gml3_geometries():
 
     gml_list = ['<gml:Point><gml:pos>2 3</gml:pos></gml:Point>',
                 '<gml:Point><gml:pos>2 3 4</gml:pos></gml:Point>',
@@ -1432,7 +1432,7 @@ def gml_write_gml3_geometries():
 # Test write support for GML3 SRS
 
 
-def gml_write_gml3_srs():
+def test_gml_write_gml3_srs():
 
     sr32631 = osr.SpatialReference()
     sr32631.SetFromUserInput("EPSG:32631")
@@ -1511,7 +1511,7 @@ def gml_write_gml3_srs():
 # Test that importing too nested GML doesn't cause stack overflows
 
 
-def gml_nested():
+def test_gml_nested():
 
     gml = '<gml:MultiGeometry><gml:geometryMember>' * 31
     gml += '<gml:MultiPolygon></gml:MultiPolygon>'
@@ -1539,7 +1539,7 @@ def gml_nested():
 # Test GML 3.3 SimplePolygon
 
 
-def gml_SimplePolygon():
+def test_gml_SimplePolygon():
 
     gml = """<gmlce:SimplePolygon><gml:posList>0 0 1 0 1 1 0 1</gml:posList></gmlce:SimplePolygon>"""
 
@@ -1556,7 +1556,7 @@ def gml_SimplePolygon():
 # Test GML 3.3 SimpleRectangle
 
 
-def gml_SimpleRectangle():
+def test_gml_SimpleRectangle():
 
     gml = """<gmlce:SimpleRectangle><gml:posList>0 0 1 0 1 1 0 1</gml:posList></gmlce:SimpleRectangle>"""
 
@@ -1573,7 +1573,7 @@ def gml_SimpleRectangle():
 # Test GML 3.3 SimpleTriangle
 
 
-def gml_SimpleTriangle():
+def test_gml_SimpleTriangle():
 
     gml = """<gmlce:SimpleTriangle><gml:posList>0 0 1 0 1 1</gml:posList></gmlce:SimpleTriangle>"""
 
@@ -1590,7 +1590,7 @@ def gml_SimpleTriangle():
 # Test GML 3.3 SimpleMultiPoint
 
 
-def gml_SimpleMultiPoint():
+def test_gml_SimpleMultiPoint():
 
     gml = """<gmlce:SimpleMultiPoint><gml:posList>0 1 2 3</gml:posList></gmlce:SimpleMultiPoint>"""
 
@@ -1607,7 +1607,7 @@ def gml_SimpleMultiPoint():
 # Test  gml:CompositeCurve> in <gml:Ring>
 
 
-def gml_CompositeCurveInRing():
+def test_gml_CompositeCurveInRing():
 
     gml = """<gml:Surface>
     <gml:patches>
@@ -1666,7 +1666,7 @@ def gml_CompositeCurveInRing():
 # Test <gml:CompositeSurface> in <gml:surfaceMembers> (#5369)
 
 
-def gml_CompositeSurface_in_surfaceMembers():
+def test_gml_CompositeSurface_in_surfaceMembers():
 
     gml = """<gml:MultiSurface>
           <gml:surfaceMembers>
@@ -1705,7 +1705,7 @@ def gml_CompositeSurface_in_surfaceMembers():
 # Test <gml:PolygonPatch> with only Interior ring (#5421)
 
 
-def gml_MultiSurfaceOfSurfaceOfPolygonPatchWithInteriorRing():
+def test_gml_MultiSurfaceOfSurfaceOfPolygonPatchWithInteriorRing():
 
     gml = """<gml:MultiSurface>
                <gml:surfaceMember>
@@ -1761,7 +1761,7 @@ def gml_MultiSurfaceOfSurfaceOfPolygonPatchWithInteriorRing():
 # Test ts, cs and decimal attributes of gml:coordinates
 
 
-def gml_Coordinates_ts_cs_decimal():
+def test_gml_Coordinates_ts_cs_decimal():
 
     gml_expected_wkt_list = [
         ('<gml:Point><gml:coordinates>1,2</gml:coordinates></gml:Point>', 'POINT (1 2)'),  # default values
@@ -1797,7 +1797,7 @@ def gml_Coordinates_ts_cs_decimal():
 # Test gml with XML header and comments
 
 
-def gml_with_xml_header_and_comments():
+def test_gml_with_xml_header_and_comments():
 
     gml_expected_wkt_list = [
         ('<?xml version="1.0" encoding="UTF-8"?><!-- comment --><gml:Point> <!-- comment --> <gml:coordinates>1,2</gml:coordinates></gml:Point>', 'POINT (1 2)'),
@@ -1841,7 +1841,7 @@ def gml_with_xml_header_and_comments():
 # Test srsDimension attribute on top-level geometry and not on posList (#5606)
 
 
-def gml_srsDimension_topgeometry():
+def test_gml_srsDimension_topgeometry():
 
     gml = """<gml:Surface srsName="EPSG:25832" srsDimension="3">
     <gml:patches>
@@ -1870,7 +1870,7 @@ def gml_srsDimension_topgeometry():
 # Test GML Arc
 
 
-def gml_Arc():
+def test_gml_Arc():
 
     gml = "<gml:Arc><gml:posList>1 0 0 1 -1 0</gml:posList></gml:Arc>"
     geom = ogr.CreateGeometryFromGML(gml)
@@ -1899,7 +1899,7 @@ def gml_Arc():
 # Test GML ArcByBulge
 
 
-def gml_ArcByBulge():
+def test_gml_ArcByBulge():
 
     gml = "<gml:ArcByBulge><gml:posList>2 0 -2 0</gml:posList><gml:bulge>2</gml:bulge><gml:normal>-1</gml:normal></gml:ArcByBulge>"
     geom = ogr.CreateGeometryFromGML(gml)
@@ -1915,7 +1915,7 @@ def gml_ArcByBulge():
 # Test GML ArcByCenterPoint
 
 
-def gml_ArcByCenterPoint():
+def test_gml_ArcByCenterPoint():
 
     gml = "<gml:ArcByCenterPoint><gml:pos>1 2</gml:pos><gml:radius>2</gml:radius><gml:startAngle>90</gml:startAngle><gml:endAngle>270</gml:endAngle></gml:ArcByCenterPoint>"
     geom = ogr.CreateGeometryFromGML(gml)
@@ -1932,7 +1932,7 @@ def gml_ArcByCenterPoint():
 # Test compound curve of ArcByCenterPoint whose ends don't exactly match
 # with ends of neighbouring curves, as found in some AIXM files
 
-def gml_CompoundCurve_of_ArcByCenterPoint():
+def test_gml_CompoundCurve_of_ArcByCenterPoint():
 
     gml = """
 <Surface gml:id="Surface1" srsDimension="2" srsName="URN:OGC:DEF:CRS:OGC:1.3:CRS84">
@@ -1994,7 +1994,7 @@ def gml_CompoundCurve_of_ArcByCenterPoint():
 # Test GML CircleByCenterPoint
 
 
-def gml_CircleByCenterPoint():
+def test_gml_CircleByCenterPoint():
 
     gml = "<gml:CircleByCenterPoint><gml:pos>1 2</gml:pos><gml:radius>2</gml:radius></gml:CircleByCenterPoint>"
     geom = ogr.CreateGeometryFromGML(gml)
@@ -2010,7 +2010,7 @@ def gml_CircleByCenterPoint():
 # Test GML Circle
 
 
-def gml_Circle():
+def test_gml_Circle():
 
     gml = """<gml:Curve><gml:segments><gml:Circle>
              <gml:posList>-1 0 0 1 -0.707106781186547 -0.707106781186548</gml:posList>
@@ -2074,7 +2074,7 @@ def gml_Circle():
 # Test ArcString
 
 
-def gml_ArcString():
+def test_gml_ArcString():
 
     gml = """<gml:ArcString><gml:posList srsDimension="2">-2 0 -1 -1 0 0</gml:posList></gml:ArcString>"""
     geom = ogr.CreateGeometryFromGML(gml)
@@ -2107,7 +2107,7 @@ def gml_ArcString():
 # Test OGRCompoundCurve
 
 
-def gml_OGRCompoundCurve():
+def test_gml_OGRCompoundCurve():
 
     wkt = 'COMPOUNDCURVE ((0 0,1 1,2 0))'
     geom = ogr.CreateGeometryFromWkt(wkt)
@@ -2193,7 +2193,7 @@ def gml_OGRCompoundCurve():
 # Test OGRCurvePolygon
 
 
-def gml_OGRCurvePolygon():
+def test_gml_OGRCurvePolygon():
 
     # Test one CircularString
     gml = """<gml:Polygon><gml:exterior><gml:Ring><gml:curveMember><gml:Arc><gml:posList>0 0 1 0 0 0</gml:posList></gml:Arc></gml:curveMember></gml:Ring></gml:exterior></gml:Polygon>"""
@@ -2244,7 +2244,7 @@ def gml_OGRCurvePolygon():
 # Test OGRMultiSurface
 
 
-def gml_OGRMultiSurface():
+def test_gml_OGRMultiSurface():
 
     # MultiSurface of CurvePolygon
     gml = """<gml:MultiSurface>
@@ -2329,7 +2329,7 @@ def gml_OGRMultiSurface():
 # Test OGRMultiCurve
 
 
-def gml_OGRMultiCurve():
+def test_gml_OGRMultiCurve():
 
     # MultiCurve of Arc
     gml = """<gml:MultiCurve><gml:curveMember><gml:Curve><gml:segments><gml:ArcString><gml:posList>0 0 1 1 1 -1</gml:posList></gml:ArcString></gml:segments></gml:Curve></gml:curveMember></gml:MultiCurve>"""
@@ -2410,7 +2410,7 @@ def gml_OGRMultiCurve():
 # Test write support for GML namespace declaration
 
 
-def gml_write_gml_ns():
+def test_gml_write_gml_ns():
 
     geom = ogr.CreateGeometryFromWkt('POINT(500000 4500000)')
     gml = geom.ExportToGML(options=['NAMESPACE_DECL=YES'])
@@ -2443,66 +2443,66 @@ def gml_write_gml_ns():
 
 
 gdaltest_list = [
-    gml_space_test,
-    gml_pos_point,
-    gml_pos_polygon,
-    gml_posList_line,
-    gml_posList_line3d,
-    gml_posList_line3d_2,
-    gml_polygon,
-    gml_out_point_srs,
-    gml_out_point3d_srs,
-    gml_out_linestring_srs,
-    gml_out_polygon_srs,
-    gml_out_multipoint_srs,
-    gml_out_multilinestring_srs,
-    gml_out_multipolygon_srs,
-    gml_out_geometrycollection_srs,
-    gml_Box,
-    gml_Envelope,
-    gml_Curve,
-    gml_Curve_with_pointProperty,
-    gml_MultiCurve,
-    gml_MultiSurface,
-    gml_MultiSurface_surfaceMembers,
-    gml_MultiCurve_curveMembers,
-    gml_MultiGeometry_geometryMembers,
-    gml_CompositeCurve_curveMembers,
-    gml_MultiCurve_pointMembers,
-    gml_Solid,
-    gml_OrientableSurface,
-    gml_Triangle,
-    gml_Rectangle,
-    gml_Tin,
-    gml_PolyhedralSurface,
-    gml_ConcatenatedDeduplication,
+    test_gml_space_test,
+    test_gml_pos_point,
+    test_gml_pos_polygon,
+    test_gml_posList_line,
+    test_gml_posList_line3d,
+    test_gml_posList_line3d_2,
+    test_gml_polygon,
+    test_gml_out_point_srs,
+    test_gml_out_point3d_srs,
+    test_gml_out_linestring_srs,
+    test_gml_out_polygon_srs,
+    test_gml_out_multipoint_srs,
+    test_gml_out_multilinestring_srs,
+    test_gml_out_multipolygon_srs,
+    test_gml_out_geometrycollection_srs,
+    test_gml_Box,
+    test_gml_Envelope,
+    test_gml_Curve,
+    test_gml_Curve_with_pointProperty,
+    test_gml_MultiCurve,
+    test_gml_MultiSurface,
+    test_gml_MultiSurface_surfaceMembers,
+    test_gml_MultiCurve_curveMembers,
+    test_gml_MultiGeometry_geometryMembers,
+    test_gml_CompositeCurve_curveMembers,
+    test_gml_MultiCurve_pointMembers,
+    test_gml_Solid,
+    test_gml_OrientableSurface,
+    test_gml_Triangle,
+    test_gml_Rectangle,
+    test_gml_Tin,
+    test_gml_PolyhedralSurface,
+    test_gml_ConcatenatedDeduplication,
     # gml_out_precision,
-    gml_invalid_geoms,
-    gml_write_gml3_geometries,
-    gml_write_gml3_srs,
-    gml_nested,
-    gml_SimplePolygon,
-    gml_SimpleRectangle,
-    gml_SimpleTriangle,
-    gml_SimpleMultiPoint,
-    gml_CompositeCurveInRing,
-    gml_CompositeSurface_in_surfaceMembers,
-    gml_MultiSurfaceOfSurfaceOfPolygonPatchWithInteriorRing,
-    gml_Coordinates_ts_cs_decimal,
-    gml_with_xml_header_and_comments,
-    gml_srsDimension_topgeometry,
-    gml_Arc,
-    gml_ArcByBulge,
-    gml_ArcByCenterPoint,
-    gml_CompoundCurve_of_ArcByCenterPoint,
-    gml_CircleByCenterPoint,
-    gml_Circle,
-    gml_ArcString,
-    gml_OGRCompoundCurve,
-    gml_OGRCurvePolygon,
-    gml_OGRMultiSurface,
-    gml_OGRMultiCurve,
-    gml_write_gml_ns,
+    test_gml_invalid_geoms,
+    test_gml_write_gml3_geometries,
+    test_gml_write_gml3_srs,
+    test_gml_nested,
+    test_gml_SimplePolygon,
+    test_gml_SimpleRectangle,
+    test_gml_SimpleTriangle,
+    test_gml_SimpleMultiPoint,
+    test_gml_CompositeCurveInRing,
+    test_gml_CompositeSurface_in_surfaceMembers,
+    test_gml_MultiSurfaceOfSurfaceOfPolygonPatchWithInteriorRing,
+    test_gml_Coordinates_ts_cs_decimal,
+    test_gml_with_xml_header_and_comments,
+    test_gml_srsDimension_topgeometry,
+    test_gml_Arc,
+    test_gml_ArcByBulge,
+    test_gml_ArcByCenterPoint,
+    test_gml_CompoundCurve_of_ArcByCenterPoint,
+    test_gml_CircleByCenterPoint,
+    test_gml_Circle,
+    test_gml_ArcString,
+    test_gml_OGRCompoundCurve,
+    test_gml_OGRCurvePolygon,
+    test_gml_OGRMultiSurface,
+    test_gml_OGRMultiCurve,
+    test_gml_write_gml_ns,
 ]
 
 
diff --git a/autotest/ogr/ogr_gml_read.py b/autotest/ogr/ogr_gml_read.py
index 7c21d54d450c..36acd7cf8a26 100755
--- a/autotest/ogr/ogr_gml_read.py
+++ b/autotest/ogr/ogr_gml_read.py
@@ -46,7 +46,7 @@
 #
 
 
-def ogr_gml_1():
+def test_ogr_gml_1():
 
     gdaltest.have_gml_reader = 0
 
@@ -86,7 +86,7 @@ def ogr_gml_1():
 # Do the same test somewhere without a .gfs file.
 
 
-def ogr_gml_2():
+def test_ogr_gml_2():
     if not gdaltest.have_gml_reader:
         return 'skip'
 
@@ -122,7 +122,7 @@ def ogr_gml_2():
 # Similar test for RNF style line data.
 
 
-def ogr_gml_3():
+def test_ogr_gml_3():
     if not gdaltest.have_gml_reader:
         return 'skip'
 
@@ -160,7 +160,7 @@ def ogr_gml_3():
 # Test also support for nested GML elements (#3680)
 
 
-def ogr_gml_4():
+def test_ogr_gml_4():
     if not gdaltest.have_gml_reader:
         return 'skip'
 
@@ -210,7 +210,7 @@ def ogr_gml_4():
 ###############################################################################
 # Test of read GML file that triggeered bug #2349
 
-def ogr_gml_5():
+def test_ogr_gml_5():
 
     if not gdaltest.have_gml_reader:
         return 'skip'
@@ -229,7 +229,7 @@ def ogr_gml_5():
 # Test of various FIDs (various prefixes and lengths) (Ticket#1017)
 
 
-def ogr_gml_6():
+def test_ogr_gml_6():
 
     if not gdaltest.have_gml_reader:
         return 'skip'
@@ -259,7 +259,7 @@ def ogr_gml_6():
 # Test of colon terminated prefixes for attribute values (Ticket#2493)
 
 
-def ogr_gml_7():
+def test_ogr_gml_7():
 
     if not gdaltest.have_gml_reader:
         return 'skip'
@@ -296,7 +296,7 @@ def ogr_gml_7():
 # Test a GML file with some non-ASCII UTF-8 content that triggered a bug (Ticket#2948)
 
 
-def ogr_gml_8():
+def test_ogr_gml_8():
 
     if not gdaltest.have_gml_reader:
         return 'skip'
@@ -319,7 +319,7 @@ def ogr_gml_8():
 # Test writing invalid UTF-8 content in a GML file (ticket #2971)
 
 
-def ogr_gml_9():
+def test_ogr_gml_9():
 
     if not gdaltest.have_gml_reader:
         return 'skip'
@@ -362,7 +362,7 @@ def ogr_gml_9():
 # TODO: Add test for other data types as they are added to the driver.
 
 
-def ogr_gml_10():
+def test_ogr_gml_10():
 
     if not gdaltest.have_gml_reader:
         return 'skip'
@@ -457,7 +457,7 @@ def ogr_gml_10():
 # Test reading a geometry element specified with <GeometryElementPath>
 
 
-def ogr_gml_11():
+def test_ogr_gml_11():
 
     if not gdaltest.have_gml_reader:
         return 'skip'
@@ -501,7 +501,7 @@ def ogr_gml_11():
 # Test reading a virtual GML file
 
 
-def ogr_gml_12():
+def test_ogr_gml_12():
 
     if not gdaltest.have_gml_reader:
         return 'skip'
@@ -530,7 +530,7 @@ def ogr_gml_12():
 # Test reading GML with StringList, IntegerList and RealList fields
 
 
-def ogr_gml_13():
+def test_ogr_gml_13():
 
     if not gdaltest.have_gml_reader:
         return 'skip'
@@ -560,7 +560,7 @@ def ogr_gml_13():
 # Test xlink resolution
 
 
-def ogr_gml_14():
+def test_ogr_gml_14():
 
     if not gdaltest.have_gml_reader:
         return 'skip'
@@ -628,7 +628,7 @@ def ogr_gml_14():
 # Run test_ogrsf
 
 
-def ogr_gml_15():
+def test_ogr_gml_15():
 
     if not gdaltest.have_gml_reader:
         return 'skip'
@@ -649,7 +649,7 @@ def ogr_gml_15():
 # Read CityGML generic attributes
 
 
-def ogr_gml_16():
+def test_ogr_gml_16():
 
     if not gdaltest.have_gml_reader:
         return 'skip'
@@ -671,7 +671,7 @@ def ogr_gml_16():
 # Read layer SRS for WFS 1.0.0 return
 
 
-def ogr_gml_17():
+def test_ogr_gml_17():
 
     if not gdaltest.have_gml_reader:
         return 'skip'
@@ -699,7 +699,7 @@ def ogr_gml_17():
 # Read layer SRS for WFS 1.1.0 return
 
 
-def ogr_gml_18():
+def test_ogr_gml_18():
 
     if not gdaltest.have_gml_reader:
         return 'skip'
@@ -728,7 +728,7 @@ def ogr_gml_18():
 # (long, lat) order. So we should get EPSGA:4326 and (lat, long) order
 
 
-def ogr_gml_19():
+def test_ogr_gml_19():
 
     if not gdaltest.have_gml_reader:
         return 'skip'
@@ -765,7 +765,7 @@ def ogr_gml_19():
 # Test parsing a .xsd where the type definition is before its reference
 
 
-def ogr_gml_20():
+def test_ogr_gml_20():
 
     if not gdaltest.have_gml_reader:
         return 'skip'
@@ -821,7 +821,7 @@ def ogr_gml_20():
 # Test writing GML3
 
 
-def ogr_gml_21(frmt='GML3'):
+def test_ogr_gml_21(frmt='GML3'):
 
     if not gdaltest.have_gml_reader:
         return 'skip'
@@ -906,18 +906,18 @@ def ogr_gml_21(frmt='GML3'):
     return 'success'
 
 
-def ogr_gml_21_deegree3():
-    return ogr_gml_21('GML3Deegree')
+def test_ogr_gml_21_deegree3():
+    return test_ogr_gml_21('GML3Deegree')
 
 
-def ogr_gml_21_gml32():
-    return ogr_gml_21('GML3.2')
+def test_ogr_gml_21_gml32():
+    return test_ogr_gml_21('GML3.2')
 
 ###############################################################################
 # Read a OpenLS DetermineRouteResponse document
 
 
-def ogr_gml_22():
+def test_ogr_gml_22():
 
     if not gdaltest.have_gml_reader:
         return 'skip'
@@ -945,7 +945,7 @@ def ogr_gml_22():
 # feature geometry
 
 
-def ogr_gml_23():
+def test_ogr_gml_23():
 
     if not gdaltest.have_gml_reader:
         return 'skip'
@@ -990,7 +990,7 @@ def ogr_gml_23():
 # feature geometry
 
 
-def ogr_gml_24():
+def test_ogr_gml_24():
 
     if not gdaltest.have_gml_reader:
         return 'skip'
@@ -1035,7 +1035,7 @@ def ogr_gml_24():
 # Test fixes for #3934 and #3935
 
 
-def ogr_gml_25():
+def test_ogr_gml_25():
 
     if not gdaltest.have_gml_reader:
         return 'skip'
@@ -1069,7 +1069,7 @@ def ogr_gml_25():
 # Test writing and reading 3D geoms (GML2)
 
 
-def ogr_gml_26():
+def test_ogr_gml_26():
 
     if not gdaltest.have_gml_reader:
         return 'skip'
@@ -1101,7 +1101,7 @@ def ogr_gml_26():
 # Test writing and reading 3D geoms (GML3)
 
 
-def ogr_gml_27():
+def test_ogr_gml_27():
 
     if not gdaltest.have_gml_reader:
         return 'skip'
@@ -1135,7 +1135,7 @@ def ogr_gml_27():
 # Test writing and reading layers of type wkbNone (#4154)
 
 
-def ogr_gml_28():
+def test_ogr_gml_28():
 
     if not gdaltest.have_gml_reader:
         return 'skip'
@@ -1177,7 +1177,7 @@ def ogr_gml_28():
 # Test reading FME GMLs
 
 
-def ogr_gml_29():
+def test_ogr_gml_29():
 
     if not gdaltest.have_gml_reader:
         return 'skip'
@@ -1211,7 +1211,7 @@ def ogr_gml_29():
 # Test reading a big field and a big geometry
 
 
-def ogr_gml_30():
+def test_ogr_gml_30():
 
     if not gdaltest.have_gml_reader:
         return 'skip'
@@ -1263,13 +1263,13 @@ def ogr_gml_30():
 # Test SEQUENTIAL_LAYERS
 
 
-def ogr_gml_31():
+def test_ogr_gml_31():
 
     if not gdaltest.have_gml_reader:
         return 'skip'
 
     gdal.SetConfigOption('GML_READ_MODE', 'SEQUENTIAL_LAYERS')
-    ret = ogr_gml_29()
+    ret = test_ogr_gml_29()
     gdal.SetConfigOption('GML_READ_MODE', None)
 
     if ret != 'success':
@@ -1300,7 +1300,7 @@ def ogr_gml_31():
 # Test SEQUENTIAL_LAYERS without a .gfs
 
 
-def ogr_gml_32():
+def test_ogr_gml_32():
 
     if not gdaltest.have_gml_reader:
         return 'skip'
@@ -1344,7 +1344,7 @@ def ogr_gml_32():
 # Test INTERLEAVED_LAYERS
 
 
-def ogr_gml_33():
+def test_ogr_gml_33():
 
     if not gdaltest.have_gml_reader:
         return 'skip'
@@ -1386,7 +1386,7 @@ def ogr_gml_33():
 # Test writing non-ASCII UTF-8 content (#4117, #4299)
 
 
-def ogr_gml_34():
+def test_ogr_gml_34():
 
     if not gdaltest.have_gml_reader:
         return 'skip'
@@ -1418,7 +1418,7 @@ def ogr_gml_34():
 # Test GML_SKIP_RESOLVE_ELEMS=HUGE (#4380)
 
 
-def ogr_gml_35():
+def test_ogr_gml_35():
 
     if not gdaltest.have_gml_reader:
         return 'skip'
@@ -1487,7 +1487,7 @@ def ogr_gml_35():
 # Test GML_SKIP_RESOLVE_ELEMS=NONE (and new GMLTopoSurface interpretation)
 
 
-def ogr_gml_36(GML_FACE_HOLE_NEGATIVE='NO'):
+def test_ogr_gml_36(GML_FACE_HOLE_NEGATIVE='NO'):
 
     if not gdaltest.have_gml_reader:
         return 'skip'
@@ -1545,14 +1545,14 @@ def ogr_gml_36(GML_FACE_HOLE_NEGATIVE='NO'):
 # Test GML_SKIP_RESOLVE_ELEMS=NONE with old GMLTopoSurface interpretation
 
 
-def ogr_gml_37():
-    return ogr_gml_36('YES')
+def test_ogr_gml_37():
+    return test_ogr_gml_36('YES')
 
 ###############################################################################
 # Test new GMLTopoSurface interpretation (#3934) with HUGE xlink resolver
 
 
-def ogr_gml_38(resolver='HUGE'):
+def test_ogr_gml_38(resolver='HUGE'):
 
     if not gdaltest.have_gml_reader:
         return 'skip'
@@ -1611,14 +1611,14 @@ def ogr_gml_38(resolver='HUGE'):
 # Test new GMLTopoSurface interpretation (#3934) with standard xlink resolver
 
 
-def ogr_gml_39():
-    return ogr_gml_38('NONE')
+def test_ogr_gml_39():
+    return test_ogr_gml_38('NONE')
 
 ###############################################################################
 # Test parsing XSD where simpleTypes not inlined, but defined elsewhere in the .xsd (#4328)
 
 
-def ogr_gml_40():
+def test_ogr_gml_40():
 
     if not gdaltest.have_gml_reader:
         return 'skip'
@@ -1635,7 +1635,7 @@ def ogr_gml_40():
 # Test validating against .xsd
 
 
-def ogr_gml_41():
+def test_ogr_gml_41():
 
     gdaltest.have_gml_validation = False
 
@@ -1670,7 +1670,7 @@ def ogr_gml_41():
 # Test validating against .xsd
 
 
-def ogr_gml_42():
+def test_ogr_gml_42():
 
     if not gdaltest.have_gml_validation:
         return 'skip'
@@ -1706,7 +1706,7 @@ def ogr_gml_42():
 # Test automated downloading of WFS schema
 
 
-def ogr_gml_43():
+def test_ogr_gml_43():
 
     # The service times out
     return 'skip'
@@ -1742,7 +1742,7 @@ def ogr_gml_43():
 # Test providing a custom XSD filename
 
 
-def ogr_gml_44():
+def test_ogr_gml_44():
 
     if not gdaltest.have_gml_reader:
         return 'skip'
@@ -1797,7 +1797,7 @@ def ogr_gml_44():
 # Test PREFIX and TARGET_NAMESPACE creation options
 
 
-def ogr_gml_45():
+def test_ogr_gml_45():
 
     if not gdaltest.have_gml_reader:
         return 'skip'
@@ -1851,7 +1851,7 @@ def ogr_gml_45():
 ###############################################################################
 # Validate different kinds of GML files
 
-def ogr_gml_46():
+def test_ogr_gml_46():
 
     if not gdaltest.have_gml_validation:
         return 'skip'
@@ -1965,7 +1965,7 @@ def ogr_gml_46():
 # Test validation of WFS GML documents
 
 
-def ogr_gml_47():
+def test_ogr_gml_47():
 
     if not gdaltest.have_gml_validation:
         return 'skip'
@@ -2007,7 +2007,7 @@ def ogr_gml_47():
 #    </xsd:element>
 
 
-def ogr_gml_48():
+def test_ogr_gml_48():
 
     if not gdaltest.have_gml_reader:
         return 'skip'
@@ -2033,7 +2033,7 @@ def ogr_gml_48():
 # Test a pseudo Inspire GML file
 
 
-def ogr_gml_49():
+def test_ogr_gml_49():
 
     if not gdaltest.have_gml_reader:
         return 'skip'
@@ -2076,7 +2076,7 @@ def ogr_gml_49():
 # Test support for StringList, IntegerList, RealList
 
 
-def ogr_gml_50():
+def test_ogr_gml_50():
 
     if not gdaltest.have_gml_reader:
         return 'skip'
@@ -2123,7 +2123,7 @@ def ogr_gml_50():
 # Test -dsco WRITE_FEATURE_BOUNDED_BY=no -dsco STRIP_PREFIX=YES
 
 
-def ogr_gml_51():
+def test_ogr_gml_51():
 
     if not gdaltest.have_gml_reader:
         return 'skip'
@@ -2175,7 +2175,7 @@ def ogr_gml_51():
 # Test reading MTKGML files
 
 
-def ogr_gml_52():
+def test_ogr_gml_52():
 
     if not gdaltest.have_gml_reader:
         return 'skip'
@@ -2248,7 +2248,7 @@ def ogr_gml_52():
 # Test that we don't recognize .xsd files themselves
 
 
-def ogr_gml_53():
+def test_ogr_gml_53():
 
     if not gdaltest.have_gml_reader:
         return 'skip'
@@ -2265,7 +2265,7 @@ def ogr_gml_53():
 # Test that we can open an empty GML datasource (#249, #5205)
 
 
-def ogr_gml_54():
+def test_ogr_gml_54():
 
     if not gdaltest.have_gml_reader:
         return 'skip'
@@ -2294,7 +2294,7 @@ def ogr_gml_54():
 # Necessary for Finnish NLS data
 
 
-def ogr_gml_55():
+def test_ogr_gml_55():
 
     if not gdaltest.have_gml_reader:
         return 'skip'
@@ -2318,7 +2318,7 @@ def ogr_gml_55():
 # Necessary for Finnish NLS data
 
 
-def ogr_gml_56():
+def test_ogr_gml_56():
 
     if not gdaltest.have_gml_reader:
         return 'skip'
@@ -2388,7 +2388,7 @@ def ogr_gml_56():
 # Test write support for multiple geometry field
 
 
-def ogr_gml_57():
+def test_ogr_gml_57():
 
     if not gdaltest.have_gml_reader:
         return 'skip'
@@ -2462,7 +2462,7 @@ def ogr_gml_57():
 # Test support for Inspire Cadastral schemas
 
 
-def ogr_gml_58():
+def test_ogr_gml_58():
 
     if not gdaltest.have_gml_reader:
         return 'skip'
@@ -2759,7 +2759,7 @@ def ogr_gml_58():
 # Test GFS conditions
 
 
-def ogr_gml_59():
+def test_ogr_gml_59():
 
     if not gdaltest.have_gml_reader:
         return 'skip'
@@ -2804,7 +2804,7 @@ def ogr_gml_59():
 # as a wfs:member of the top wfs:FeatureCollection
 
 
-def ogr_gml_60():
+def test_ogr_gml_60():
 
     if not gdaltest.have_gml_reader:
         return 'skip'
@@ -2840,7 +2840,7 @@ def ogr_gml_60():
 # Test reading a element specified with a full path in <ElementPath>
 
 
-def ogr_gml_61():
+def test_ogr_gml_61():
 
     if not gdaltest.have_gml_reader:
         return 'skip'
@@ -2895,7 +2895,7 @@ def ogr_gml_61():
 # Test GML_ATTRIBUTES_TO_OGR_FIELDS option
 
 
-def ogr_gml_62():
+def test_ogr_gml_62():
 
     if not gdaltest.have_gml_reader:
         return 'skip'
@@ -2963,7 +2963,7 @@ def ogr_gml_62():
 # Test reading RUIAN VFR files
 
 
-def ogr_gml_63():
+def test_ogr_gml_63():
 
     if not gdaltest.have_gml_reader:
         return 'skip'
@@ -3009,7 +3009,7 @@ def ogr_gml_63():
 # Test multiple instances of parsers (#5571)
 
 
-def ogr_gml_64():
+def test_ogr_gml_64():
 
     if not gdaltest.have_gml_reader:
         return 'skip'
@@ -3031,7 +3031,7 @@ def ogr_gml_64():
 # Test SRSDIMENSION_LOC=GEOMETRY option (#5606)
 
 
-def ogr_gml_65():
+def test_ogr_gml_65():
 
     if not gdaltest.have_gml_reader:
         return 'skip'
@@ -3076,7 +3076,7 @@ def ogr_gml_65():
 # Test curve geometries
 
 
-def ogr_gml_66():
+def test_ogr_gml_66():
 
     if not gdaltest.have_gml_reader:
         return 'skip'
@@ -3423,7 +3423,7 @@ def ogr_gml_66():
 # Test boolean, int16, integer64 type
 
 
-def ogr_gml_67():
+def test_ogr_gml_67():
 
     if not gdaltest.have_gml_reader:
         return 'skip'
@@ -3529,7 +3529,7 @@ def ogr_gml_67():
 # Test reading GML with xsd with a choice of geometry properites
 
 
-def ogr_gml_68():
+def test_ogr_gml_68():
 
     if not gdaltest.have_gml_reader:
         return 'skip'
@@ -3560,7 +3560,7 @@ def ogr_gml_68():
 # Test not nullable fields
 
 
-def ogr_gml_69():
+def test_ogr_gml_69():
 
     if not gdaltest.have_gml_reader:
         return 'skip'
@@ -3633,7 +3633,7 @@ def ogr_gml_69():
 # support not nullable fields)
 
 
-def ogr_gml_70():
+def test_ogr_gml_70():
 
     if not gdaltest.have_gml_reader:
         return 'skip'
@@ -3744,7 +3744,7 @@ def ogr_gml_71_helper(ds):
     return 'success'
 
 
-def ogr_gml_71():
+def test_ogr_gml_71():
 
     if not gdaltest.have_gml_reader:
         return 'skip'
@@ -3805,7 +3805,7 @@ def ogr_gml_71():
 # Test name and description
 
 
-def ogr_gml_72():
+def test_ogr_gml_72():
 
     if not gdaltest.have_gml_reader:
         return 'skip'
@@ -3846,7 +3846,7 @@ def ogr_gml_72():
 # Read a CSW GetRecordsResponse document
 
 
-def ogr_gml_73():
+def test_ogr_gml_73():
 
     if not gdaltest.have_gml_reader:
         return 'skip'
@@ -3887,7 +3887,7 @@ def ogr_gml_73():
 # Test FORCE_SRS_DETECTION open option
 
 
-def ogr_gml_74():
+def test_ogr_gml_74():
 
     if not gdaltest.have_gml_reader:
         return 'skip'
@@ -3939,7 +3939,7 @@ def ogr_gml_74():
 # Test we don't open a WMTS Capabilities doc
 
 
-def ogr_gml_75():
+def test_ogr_gml_75():
 
     if not gdaltest.have_gml_reader:
         return 'skip'
@@ -3983,7 +3983,7 @@ def ogr_gml_75():
 # Test we are robust to content of XML elements bigger than 2 GB
 
 
-def ogr_gml_76():
+def test_ogr_gml_76():
 
     if not gdaltest.have_gml_reader:
         return 'skip'
@@ -4008,7 +4008,7 @@ def ogr_gml_76():
 # Test interpretation of http://www.opengis.net/def/crs/EPSG/0/ URLs (#6678)
 
 
-def ogr_gml_77():
+def test_ogr_gml_77():
 
     if not gdaltest.have_gml_reader:
         return 'skip'
@@ -4064,7 +4064,7 @@ def ogr_gml_77():
 # Test effect of SWAP_COORDINATES (#6678)
 
 
-def ogr_gml_78():
+def test_ogr_gml_78():
 
     if not gdaltest.have_gml_reader:
         return 'skip'
@@ -4120,7 +4120,7 @@ def ogr_gml_78():
 # Test SRSNAME_FORMAT
 
 
-def ogr_gml_79():
+def test_ogr_gml_79():
 
     sr = osr.SpatialReference()
     sr.ImportFromEPSG(4326)
@@ -4160,7 +4160,7 @@ def ogr_gml_79():
 # Test null / unset
 
 
-def ogr_gml_80():
+def test_ogr_gml_80():
 
     if not gdaltest.have_gml_reader:
         return 'skip'
@@ -4213,7 +4213,7 @@ def ogr_gml_80():
 ###############################################################################
 # Test building a .gfs with a field with xsi:nil="true" (#7027)
 
-def ogr_gml_81():
+def test_ogr_gml_81():
 
     if not gdaltest.have_gml_reader:
         return 'skip'
@@ -4235,7 +4235,7 @@ def ogr_gml_81():
 # Test GML_FEATURE_COLLECTION=YES
 
 
-def ogr_gml_82():
+def test_ogr_gml_82():
 
     if not gdaltest.have_gml_reader:
         return 'skip'
@@ -4282,7 +4282,7 @@ def ogr_gml_82():
 ###############################################################################
 
 
-def ogr_gml_gml2_write_geometry_error():
+def test_ogr_gml_gml2_write_geometry_error():
 
     ds = ogr.GetDriverByName('GML').CreateDataSource('/vsimem/ogr_gml_83.gml')
     lyr = ds.CreateLayer('test')
@@ -4301,7 +4301,7 @@ def ogr_gml_gml2_write_geometry_error():
 #  Cleanup
 
 
-def ogr_gml_cleanup():
+def test_ogr_gml_cleanup():
     if not gdaltest.have_gml_reader:
         return 'skip'
 
@@ -4314,10 +4314,10 @@ def ogr_gml_cleanup():
     if fl is not None:
         print(fl)
 
-    return ogr_gml_clean_files()
+    return test_ogr_gml_clean_files()
 
 
-def ogr_gml_clean_files():
+def test_ogr_gml_clean_files():
     try:
         os.remove('data/bom.gfs')
     except OSError:
@@ -4433,99 +4433,99 @@ def ogr_gml_clean_files():
 
 
 gdaltest_list = [
-    ogr_gml_clean_files,
-    ogr_gml_1,
-    ogr_gml_2,
-    ogr_gml_3,
-    ogr_gml_4,
-    ogr_gml_5,
-    ogr_gml_6,
-    ogr_gml_7,
-    ogr_gml_8,
-    ogr_gml_9,
-    ogr_gml_10,
-    ogr_gml_11,
-    ogr_gml_12,
-    ogr_gml_13,
-    ogr_gml_14,
-    ogr_gml_15,
-    ogr_gml_16,
-    ogr_gml_17,
-    ogr_gml_18,
-    ogr_gml_19,
-    ogr_gml_20,
-    ogr_gml_21,
-    ogr_gml_21_deegree3,
-    ogr_gml_21_gml32,
-    ogr_gml_22,
-    ogr_gml_23,
-    ogr_gml_24,
-    ogr_gml_25,
-    ogr_gml_26,
-    ogr_gml_27,
-    ogr_gml_28,
-    ogr_gml_29,
-    ogr_gml_30,
-    ogr_gml_31,
-    ogr_gml_32,
-    ogr_gml_33,
-    ogr_gml_34,
-    ogr_gml_35,
-    ogr_gml_36,
-    ogr_gml_37,
-    ogr_gml_38,
-    ogr_gml_39,
-    ogr_gml_40,
-    ogr_gml_41,
-    ogr_gml_42,
-    ogr_gml_43,
-    ogr_gml_44,
-    ogr_gml_45,
-    ogr_gml_46,
-    ogr_gml_47,
-    ogr_gml_48,
-    ogr_gml_49,
-    ogr_gml_50,
-    ogr_gml_51,
-    ogr_gml_52,
-    ogr_gml_53,
-    ogr_gml_54,
-    ogr_gml_55,
-    ogr_gml_56,
-    ogr_gml_57,
-    ogr_gml_58,
-    ogr_gml_59,
-    ogr_gml_60,
-    ogr_gml_61,
-    ogr_gml_62,
-    ogr_gml_63,
-    ogr_gml_64,
-    ogr_gml_65,
-    ogr_gml_66,
-    ogr_gml_67,
-    ogr_gml_68,
-    ogr_gml_69,
-    ogr_gml_70,
-    ogr_gml_71,
-    ogr_gml_72,
-    ogr_gml_73,
-    ogr_gml_74,
-    ogr_gml_75,
-    ogr_gml_76,
-    ogr_gml_77,
-    ogr_gml_78,
-    ogr_gml_79,
-    ogr_gml_80,
-    ogr_gml_81,
-    ogr_gml_82,
-    ogr_gml_gml2_write_geometry_error,
-    ogr_gml_cleanup]
+    test_ogr_gml_clean_files,
+    test_ogr_gml_1,
+    test_ogr_gml_2,
+    test_ogr_gml_3,
+    test_ogr_gml_4,
+    test_ogr_gml_5,
+    test_ogr_gml_6,
+    test_ogr_gml_7,
+    test_ogr_gml_8,
+    test_ogr_gml_9,
+    test_ogr_gml_10,
+    test_ogr_gml_11,
+    test_ogr_gml_12,
+    test_ogr_gml_13,
+    test_ogr_gml_14,
+    test_ogr_gml_15,
+    test_ogr_gml_16,
+    test_ogr_gml_17,
+    test_ogr_gml_18,
+    test_ogr_gml_19,
+    test_ogr_gml_20,
+    test_ogr_gml_21,
+    test_ogr_gml_21_deegree3,
+    test_ogr_gml_21_gml32,
+    test_ogr_gml_22,
+    test_ogr_gml_23,
+    test_ogr_gml_24,
+    test_ogr_gml_25,
+    test_ogr_gml_26,
+    test_ogr_gml_27,
+    test_ogr_gml_28,
+    test_ogr_gml_29,
+    test_ogr_gml_30,
+    test_ogr_gml_31,
+    test_ogr_gml_32,
+    test_ogr_gml_33,
+    test_ogr_gml_34,
+    test_ogr_gml_35,
+    test_ogr_gml_36,
+    test_ogr_gml_37,
+    test_ogr_gml_38,
+    test_ogr_gml_39,
+    test_ogr_gml_40,
+    test_ogr_gml_41,
+    test_ogr_gml_42,
+    test_ogr_gml_43,
+    test_ogr_gml_44,
+    test_ogr_gml_45,
+    test_ogr_gml_46,
+    test_ogr_gml_47,
+    test_ogr_gml_48,
+    test_ogr_gml_49,
+    test_ogr_gml_50,
+    test_ogr_gml_51,
+    test_ogr_gml_52,
+    test_ogr_gml_53,
+    test_ogr_gml_54,
+    test_ogr_gml_55,
+    test_ogr_gml_56,
+    test_ogr_gml_57,
+    test_ogr_gml_58,
+    test_ogr_gml_59,
+    test_ogr_gml_60,
+    test_ogr_gml_61,
+    test_ogr_gml_62,
+    test_ogr_gml_63,
+    test_ogr_gml_64,
+    test_ogr_gml_65,
+    test_ogr_gml_66,
+    test_ogr_gml_67,
+    test_ogr_gml_68,
+    test_ogr_gml_69,
+    test_ogr_gml_70,
+    test_ogr_gml_71,
+    test_ogr_gml_72,
+    test_ogr_gml_73,
+    test_ogr_gml_74,
+    test_ogr_gml_75,
+    test_ogr_gml_76,
+    test_ogr_gml_77,
+    test_ogr_gml_78,
+    test_ogr_gml_79,
+    test_ogr_gml_80,
+    test_ogr_gml_81,
+    test_ogr_gml_82,
+    test_ogr_gml_gml2_write_geometry_error,
+    test_ogr_gml_cleanup]
 
 disabled_gdaltest_list = [
-    ogr_gml_clean_files,
-    ogr_gml_1,
-    ogr_gml_82,
-    ogr_gml_cleanup]
+    test_ogr_gml_clean_files,
+    test_ogr_gml_1,
+    test_ogr_gml_82,
+    test_ogr_gml_cleanup]
 
 if __name__ == '__main__':
 
diff --git a/autotest/ogr/ogr_gmlas.py b/autotest/ogr/ogr_gmlas.py
index 830825a320af..10a9b8affdae 100755
--- a/autotest/ogr/ogr_gmlas.py
+++ b/autotest/ogr/ogr_gmlas.py
@@ -86,7 +86,7 @@ def compare_ogrinfo_output(gmlfile, reffile, options=''):
 # Basic test
 
 
-def ogr_gmlas_basic():
+def test_ogr_gmlas_basic():
 
     if ogr.GetDriverByName('GMLAS') is None:
         return 'skip'
@@ -116,7 +116,7 @@ def ogr_gmlas_basic():
 # Run test_ogrsf
 
 
-def ogr_gmlas_test_ogrsf():
+def test_ogr_gmlas_test_ogrsf():
 
     if ogr.GetDriverByName('GMLAS') is None:
         return 'skip'
@@ -143,7 +143,7 @@ def ogr_gmlas_test_ogrsf():
 # Test virtual file support
 
 
-def ogr_gmlas_virtual_file():
+def test_ogr_gmlas_virtual_file():
 
     if ogr.GetDriverByName('GMLAS') is None:
         return 'skip'
@@ -175,7 +175,7 @@ def ogr_gmlas_virtual_file():
 # Test opening with XSD option
 
 
-def ogr_gmlas_datafile_with_xsd_option():
+def test_ogr_gmlas_datafile_with_xsd_option():
 
     if ogr.GetDriverByName('GMLAS') is None:
         return 'skip'
@@ -191,7 +191,7 @@ def ogr_gmlas_datafile_with_xsd_option():
 # Test opening with just XSD option
 
 
-def ogr_gmlas_no_datafile_with_xsd_option():
+def test_ogr_gmlas_no_datafile_with_xsd_option():
 
     if ogr.GetDriverByName('GMLAS') is None:
         return 'skip'
@@ -207,7 +207,7 @@ def ogr_gmlas_no_datafile_with_xsd_option():
 # Test opening with just XSD option but pointing to a non-xsd filename
 
 
-def ogr_gmlas_no_datafile_xsd_which_is_not_xsd():
+def test_ogr_gmlas_no_datafile_xsd_which_is_not_xsd():
 
     if ogr.GetDriverByName('GMLAS') is None:
         return 'skip'
@@ -228,7 +228,7 @@ def ogr_gmlas_no_datafile_xsd_which_is_not_xsd():
 # Test opening with nothing
 
 
-def ogr_gmlas_no_datafile_no_xsd():
+def test_ogr_gmlas_no_datafile_no_xsd():
 
     if ogr.GetDriverByName('GMLAS') is None:
         return 'skip'
@@ -249,7 +249,7 @@ def ogr_gmlas_no_datafile_no_xsd():
 # Test opening an inexisting GML file
 
 
-def ogr_gmlas_non_existing_gml():
+def test_ogr_gmlas_non_existing_gml():
 
     if ogr.GetDriverByName('GMLAS') is None:
         return 'skip'
@@ -270,7 +270,7 @@ def ogr_gmlas_non_existing_gml():
 # Test opening with just XSD option but pointing to a non existing file
 
 
-def ogr_gmlas_non_existing_xsd():
+def test_ogr_gmlas_non_existing_xsd():
 
     if ogr.GetDriverByName('GMLAS') is None:
         return 'skip'
@@ -291,7 +291,7 @@ def ogr_gmlas_non_existing_xsd():
 # Test opening a GML file without schemaLocation
 
 
-def ogr_gmlas_gml_without_schema_location():
+def test_ogr_gmlas_gml_without_schema_location():
 
     if ogr.GetDriverByName('GMLAS') is None:
         return 'skip'
@@ -317,7 +317,7 @@ def ogr_gmlas_gml_without_schema_location():
 # Test invalid schema
 
 
-def ogr_gmlas_invalid_schema():
+def test_ogr_gmlas_invalid_schema():
 
     if ogr.GetDriverByName('GMLAS') is None:
         return 'skip'
@@ -338,7 +338,7 @@ def ogr_gmlas_invalid_schema():
 # Test invalid XML
 
 
-def ogr_gmlas_invalid_xml():
+def test_ogr_gmlas_invalid_xml():
 
     if ogr.GetDriverByName('GMLAS') is None:
         return 'skip'
@@ -361,7 +361,7 @@ def ogr_gmlas_invalid_xml():
 # Test links with gml:ReferenceType
 
 
-def ogr_gmlas_gml_Reference():
+def test_ogr_gmlas_gml_Reference():
 
     if ogr.GetDriverByName('GMLAS') is None:
         return 'skip'
@@ -392,7 +392,7 @@ def ogr_gmlas_gml_Reference():
 # Test that we fix ambiguities in class names
 
 
-def ogr_gmlas_same_element_in_different_ns():
+def test_ogr_gmlas_same_element_in_different_ns():
 
     if ogr.GetDriverByName('GMLAS') is None:
         return 'skip'
@@ -433,7 +433,7 @@ def ogr_gmlas_same_element_in_different_ns():
 # Test a corner case of relative path resolution
 
 
-def ogr_gmlas_corner_case_relative_path():
+def test_ogr_gmlas_corner_case_relative_path():
 
     if ogr.GetDriverByName('GMLAS') is None:
         return 'skip'
@@ -449,7 +449,7 @@ def ogr_gmlas_corner_case_relative_path():
 # Test unexpected repeated element
 
 
-def ogr_gmlas_unexpected_repeated_element():
+def test_ogr_gmlas_unexpected_repeated_element():
 
     if ogr.GetDriverByName('GMLAS') is None:
         return 'skip'
@@ -478,7 +478,7 @@ def ogr_gmlas_unexpected_repeated_element():
 # Test unexpected repeated element
 
 
-def ogr_gmlas_unexpected_repeated_element_variant():
+def test_ogr_gmlas_unexpected_repeated_element_variant():
 
     if ogr.GetDriverByName('GMLAS') is None:
         return 'skip'
@@ -507,7 +507,7 @@ def ogr_gmlas_unexpected_repeated_element_variant():
 # Test reading geometries embedded in a geometry property element
 
 
-def ogr_gmlas_geometryproperty():
+def test_ogr_gmlas_geometryproperty():
 
     if ogr.GetDriverByName('GMLAS') is None:
         return 'skip'
@@ -668,7 +668,7 @@ def ogr_gmlas_geometryproperty():
 # Test reading geometries referenced by a AbstractGeometry element
 
 
-def ogr_gmlas_abstractgeometry():
+def test_ogr_gmlas_abstractgeometry():
 
     if ogr.GetDriverByName('GMLAS') is None:
         return 'skip'
@@ -718,7 +718,7 @@ def error_handler(self, err_type, err_no, err_msg):
             self.error_list.append((err_type, err_no, err_msg))
 
 
-def ogr_gmlas_validate():
+def test_ogr_gmlas_validate():
 
     if ogr.GetDriverByName('GMLAS') is None:
         return 'skip'
@@ -835,7 +835,7 @@ def ogr_gmlas_validate():
 # Test correct namespace prefix handling
 
 
-def ogr_gmlas_test_ns_prefix():
+def test_ogr_gmlas_test_ns_prefix():
 
     if ogr.GetDriverByName('GMLAS') is None:
         return 'skip'
@@ -856,7 +856,7 @@ def ogr_gmlas_test_ns_prefix():
 # Test parsing documents without namespace
 
 
-def ogr_gmlas_no_namespace():
+def test_ogr_gmlas_no_namespace():
 
     if ogr.GetDriverByName('GMLAS') is None:
         return 'skip'
@@ -875,7 +875,7 @@ def ogr_gmlas_no_namespace():
 # Test CONFIG_FILE
 
 
-def ogr_gmlas_conf():
+def test_ogr_gmlas_conf():
 
     if ogr.GetDriverByName('GMLAS') is None:
         return 'skip'
@@ -983,7 +983,7 @@ def ogr_gmlas_conf():
 # Test IgnoredXPaths aspect of config file
 
 
-def ogr_gmlas_conf_ignored_xpath():
+def test_ogr_gmlas_conf_ignored_xpath():
 
     if ogr.GetDriverByName('GMLAS') is None:
         return 'skip'
@@ -1170,7 +1170,7 @@ def do_GET(self):
 # Test schema caching
 
 
-def ogr_gmlas_cache():
+def test_ogr_gmlas_cache():
 
     if ogr.GetDriverByName('GMLAS') is None:
         return 'skip'
@@ -1323,7 +1323,7 @@ def ogr_gmlas_cache():
 ###############################################################################
 # Test good working of linking to a child through its id attribute
 
-def ogr_gmlas_link_nested_independant_child():
+def test_ogr_gmlas_link_nested_independant_child():
 
     if ogr.GetDriverByName('GMLAS') is None:
         return 'skip'
@@ -1342,7 +1342,7 @@ def ogr_gmlas_link_nested_independant_child():
 # Test some pattern found in geosciml schemas
 
 
-def ogr_gmlas_composition_compositionPart():
+def test_ogr_gmlas_composition_compositionPart():
 
     if ogr.GetDriverByName('GMLAS') is None:
         return 'skip'
@@ -1380,7 +1380,7 @@ def ogr_gmlas_composition_compositionPart():
 # from _Feature/AbstractFeature
 
 
-def ogr_gmlas_instantiate_only_gml_feature():
+def test_ogr_gmlas_instantiate_only_gml_feature():
 
     if ogr.GetDriverByName('GMLAS') is None:
         return 'skip'
@@ -1398,7 +1398,7 @@ def ogr_gmlas_instantiate_only_gml_feature():
 # Test that WFS style timeStamp are ignored for hash generation
 
 
-def ogr_gmlas_timestamp_ignored_for_hash():
+def test_ogr_gmlas_timestamp_ignored_for_hash():
 
     if ogr.GetDriverByName('GMLAS') is None:
         return 'skip'
@@ -1423,7 +1423,7 @@ def ogr_gmlas_timestamp_ignored_for_hash():
 # Test dataset GetNextFeature()
 
 
-def ogr_gmlas_dataset_getnextfeature():
+def test_ogr_gmlas_dataset_getnextfeature():
 
     if ogr.GetDriverByName('GMLAS') is None:
         return 'skip'
@@ -1591,7 +1591,7 @@ def ogr_gmlas_dataset_getnextfeature():
 # will inline it.
 
 
-def ogr_gmlas_inline_identifier():
+def test_ogr_gmlas_inline_identifier():
 
     if ogr.GetDriverByName('GMLAS') is None:
         return 'skip'
@@ -1614,7 +1614,7 @@ def ogr_gmlas_inline_identifier():
 #  Test that we can handle things like gml:name and au:name
 
 
-def ogr_gmlas_avoid_same_name_inlined_classes():
+def test_ogr_gmlas_avoid_same_name_inlined_classes():
 
     if ogr.GetDriverByName('GMLAS') is None:
         return 'skip'
@@ -1639,7 +1639,7 @@ def ogr_gmlas_avoid_same_name_inlined_classes():
 ###############################################################################
 #  Test validation with an optional fixed attribute that is ignored
 
-def ogr_gmlas_validate_ignored_fixed_attribute():
+def test_ogr_gmlas_validate_ignored_fixed_attribute():
 
     if ogr.GetDriverByName('GMLAS') is None:
         return 'skip'
@@ -1661,7 +1661,7 @@ def ogr_gmlas_validate_ignored_fixed_attribute():
 ###############################################################################
 #  Test REMOVE_UNUSED_LAYERS and REMOVE_UNUSED_FIELDS options
 
-def ogr_gmlas_remove_unused_layers_and_fields():
+def test_ogr_gmlas_remove_unused_layers_and_fields():
 
     if ogr.GetDriverByName('GMLAS') is None:
         return 'skip'
@@ -1710,7 +1710,7 @@ def ogr_gmlas_remove_unused_layers_and_fields():
 #  Test xlink resolution
 
 
-def ogr_gmlas_xlink_resolver():
+def test_ogr_gmlas_xlink_resolver():
 
     if ogr.GetDriverByName('GMLAS') is None:
         return 'skip'
@@ -2190,7 +2190,7 @@ def ogr_gmlas_xlink_resolver():
 # Test UTF-8 support
 
 
-def ogr_gmlas_recoding():
+def test_ogr_gmlas_recoding():
 
     if ogr.GetDriverByName('GMLAS') is None:
         return 'skip'
@@ -2215,7 +2215,7 @@ def ogr_gmlas_recoding():
 # Test schema without namespace prefix
 
 
-def ogr_gmlas_schema_without_namespace_prefix():
+def test_ogr_gmlas_schema_without_namespace_prefix():
 
     if ogr.GetDriverByName('GMLAS') is None:
         return 'skip'
@@ -2259,7 +2259,7 @@ def ogr_gmlas_schema_without_namespace_prefix():
 # Test parsing truncated XML
 
 
-def ogr_gmlas_truncated_xml():
+def test_ogr_gmlas_truncated_xml():
 
     if ogr.GetDriverByName('GMLAS') is None:
         return 'skip'
@@ -2279,7 +2279,7 @@ def ogr_gmlas_truncated_xml():
 # Test identifier truncation
 
 
-def ogr_gmlas_identifier_truncation():
+def test_ogr_gmlas_identifier_truncation():
 
     if ogr.GetDriverByName('GMLAS') is None:
         return 'skip'
@@ -2350,7 +2350,7 @@ def ogr_gmlas_identifier_truncation():
 # Test behaviour when identifiers have same case
 
 
-def ogr_gmlas_identifier_case_ambiguity():
+def test_ogr_gmlas_identifier_case_ambiguity():
 
     if ogr.GetDriverByName('GMLAS') is None:
         return 'skip'
@@ -2386,7 +2386,7 @@ def ogr_gmlas_identifier_case_ambiguity():
 # Test writing support
 
 
-def ogr_gmlas_writer():
+def test_ogr_gmlas_writer():
 
     if ogr.GetDriverByName('GMLAS') is None:
         return 'skip'
@@ -2413,7 +2413,7 @@ def ogr_gmlas_writer():
 # Check the generated .xml and .xsd
 
 
-def ogr_gmlas_writer_check_xml_xsd():
+def test_ogr_gmlas_writer_check_xml_xsd():
 
     if ogr.GetDriverByName('GMLAS') is None:
         return 'skip'
@@ -2478,7 +2478,7 @@ def ogr_gmlas_writer_check_xml_xsd():
 # as the original one.
 
 
-def ogr_gmlas_writer_check_xml_read_back():
+def test_ogr_gmlas_writer_check_xml_read_back():
 
     if ogr.GetDriverByName('GMLAS') is None:
         return 'skip'
@@ -2547,7 +2547,7 @@ def ogr_gmlas_writer_check_xml_read_back():
 # Test writing support with geometries
 
 
-def ogr_gmlas_writer_gml():
+def test_ogr_gmlas_writer_gml():
 
     if ogr.GetDriverByName('GMLAS') is None:
         return 'skip'
@@ -2609,7 +2609,7 @@ def ogr_gmlas_writer_gml():
 # Test writing support with geometries and -a_srs
 
 
-def ogr_gmlas_writer_gml_assign_srs():
+def test_ogr_gmlas_writer_gml_assign_srs():
 
     if ogr.GetDriverByName('GMLAS') is None:
         return 'skip'
@@ -2679,7 +2679,7 @@ def ogr_gmlas_writer_gml_assign_srs():
 # Test writing support with geometries with original XML content preserved
 
 
-def ogr_gmlas_writer_gml_original_xml():
+def test_ogr_gmlas_writer_gml_original_xml():
 
     if ogr.GetDriverByName('GMLAS') is None:
         return 'skip'
@@ -2735,7 +2735,7 @@ def ogr_gmlas_writer_gml_original_xml():
 # Test writing support with XSD, INDENT_SIZE, COMMENT, OUTPUT_XSD_FILENAME, TIMESTAMP options
 
 
-def ogr_gmlas_writer_options():
+def test_ogr_gmlas_writer_options():
 
     if ogr.GetDriverByName('GMLAS') is None:
         return 'skip'
@@ -2891,7 +2891,7 @@ def ogr_gmlas_writer_options():
 # Test writing support error handle
 
 
-def ogr_gmlas_writer_errors():
+def test_ogr_gmlas_writer_errors():
 
     if ogr.GetDriverByName('GMLAS') is None:
         return 'skip'
@@ -3031,7 +3031,7 @@ def ogr_gmlas_writer_errors():
 # crashes
 
 
-def ogr_gmlas_read_fake_gmljp2():
+def test_ogr_gmlas_read_fake_gmljp2():
 
     if ogr.GetDriverByName('GMLAS') is None:
         return 'skip'
@@ -3059,7 +3059,7 @@ def ogr_gmlas_read_fake_gmljp2():
 #  Test TypingConstraints
 
 
-def ogr_gmlas_typing_constraints():
+def test_ogr_gmlas_typing_constraints():
 
     if ogr.GetDriverByName('GMLAS') is None:
         return 'skip'
@@ -3166,7 +3166,7 @@ def ogr_gmlas_typing_constraints():
 #  Test swe:DataArray
 
 
-def ogr_gmlas_swe_dataarray():
+def test_ogr_gmlas_swe_dataarray():
 
     if ogr.GetDriverByName('GMLAS') is None:
         return 'skip'
@@ -3248,7 +3248,7 @@ def ogr_gmlas_swe_dataarray():
 ###############################################################################
 #  Test swe:DataRecord
 
-def ogr_gmlas_swe_datarecord():
+def test_ogr_gmlas_swe_datarecord():
 
     if ogr.GetDriverByName('GMLAS') is None:
         return 'skip'
@@ -3286,7 +3286,7 @@ def ogr_gmlas_swe_datarecord():
 #  Test a xs:any field at end of a type declaration
 
 
-def ogr_gmlas_any_field_at_end_of_declaration():
+def test_ogr_gmlas_any_field_at_end_of_declaration():
 
     if ogr.GetDriverByName('GMLAS') is None:
         return 'skip'
@@ -3318,7 +3318,7 @@ def ogr_gmlas_any_field_at_end_of_declaration():
 #  Test auxiliary schema without namespace prefix
 
 
-def ogr_gmlas_aux_schema_without_namespace_prefix():
+def test_ogr_gmlas_aux_schema_without_namespace_prefix():
 
     if ogr.GetDriverByName('GMLAS') is None:
         return 'skip'
@@ -3337,7 +3337,7 @@ def ogr_gmlas_aux_schema_without_namespace_prefix():
 # of another one (#6990)
 
 
-def ogr_gmlas_geometry_as_substitutiongroup():
+def test_ogr_gmlas_geometry_as_substitutiongroup():
 
     if ogr.GetDriverByName('GMLAS') is None:
         return 'skip'
@@ -3381,7 +3381,7 @@ def ogr_gmlas_extra_eureg():
 # Test a schema that has nothing interesting in it but imports another
 # schema
 
-def ogr_gmlas_no_element_in_first_choice_schema():
+def test_ogr_gmlas_no_element_in_first_choice_schema():
 
     if ogr.GetDriverByName('GMLAS') is None:
         return 'skip'
@@ -3400,7 +3400,7 @@ def ogr_gmlas_no_element_in_first_choice_schema():
 ###############################################################################
 # Test cross-layer links with xlink:href="#my_id"
 
-def ogr_gmlas_internal_xlink_href():
+def test_ogr_gmlas_internal_xlink_href():
 
     if ogr.GetDriverByName('GMLAS') is None:
         return 'skip'
@@ -3554,7 +3554,7 @@ def ogr_gmlas_internal_xlink_href():
 #  Cleanup
 
 
-def ogr_gmlas_cleanup():
+def test_ogr_gmlas_cleanup():
 
     if ogr.GetDriverByName('GMLAS') is None:
         return 'skip'
@@ -3570,64 +3570,64 @@ def ogr_gmlas_cleanup():
 
 
 gdaltest_list = [
-    ogr_gmlas_basic,
-    ogr_gmlas_test_ogrsf,
-    ogr_gmlas_virtual_file,
-    ogr_gmlas_datafile_with_xsd_option,
-    ogr_gmlas_no_datafile_with_xsd_option,
-    ogr_gmlas_no_datafile_xsd_which_is_not_xsd,
-    ogr_gmlas_no_datafile_no_xsd,
-    ogr_gmlas_non_existing_gml,
-    ogr_gmlas_non_existing_xsd,
-    ogr_gmlas_gml_without_schema_location,
-    ogr_gmlas_invalid_schema,
-    ogr_gmlas_invalid_xml,
-    ogr_gmlas_gml_Reference,
-    ogr_gmlas_same_element_in_different_ns,
-    ogr_gmlas_corner_case_relative_path,
-    ogr_gmlas_unexpected_repeated_element,
-    ogr_gmlas_unexpected_repeated_element_variant,
-    ogr_gmlas_geometryproperty,
-    ogr_gmlas_abstractgeometry,
-    ogr_gmlas_validate,
-    ogr_gmlas_test_ns_prefix,
-    ogr_gmlas_no_namespace,
-    ogr_gmlas_conf,
-    ogr_gmlas_conf_ignored_xpath,
-    ogr_gmlas_cache,
-    ogr_gmlas_link_nested_independant_child,
-    ogr_gmlas_composition_compositionPart,
-    ogr_gmlas_instantiate_only_gml_feature,
-    ogr_gmlas_timestamp_ignored_for_hash,
-    ogr_gmlas_dataset_getnextfeature,
-    ogr_gmlas_inline_identifier,
-    ogr_gmlas_avoid_same_name_inlined_classes,
-    ogr_gmlas_validate_ignored_fixed_attribute,
-    ogr_gmlas_remove_unused_layers_and_fields,
-    ogr_gmlas_xlink_resolver,
-    ogr_gmlas_recoding,
-    ogr_gmlas_schema_without_namespace_prefix,
-    ogr_gmlas_truncated_xml,
-    ogr_gmlas_identifier_truncation,
-    ogr_gmlas_identifier_case_ambiguity,
-    ogr_gmlas_writer,
-    ogr_gmlas_writer_check_xml_xsd,
-    ogr_gmlas_writer_check_xml_read_back,
-    ogr_gmlas_writer_gml,
-    ogr_gmlas_writer_gml_assign_srs,
-    ogr_gmlas_writer_gml_original_xml,
-    ogr_gmlas_writer_options,
-    ogr_gmlas_writer_errors,
-    ogr_gmlas_read_fake_gmljp2,
-    ogr_gmlas_typing_constraints,
-    ogr_gmlas_swe_dataarray,
-    ogr_gmlas_swe_datarecord,
-    ogr_gmlas_any_field_at_end_of_declaration,
-    ogr_gmlas_aux_schema_without_namespace_prefix,
-    ogr_gmlas_geometry_as_substitutiongroup,
-    ogr_gmlas_no_element_in_first_choice_schema,
-    ogr_gmlas_internal_xlink_href,
-    ogr_gmlas_cleanup]
+    test_ogr_gmlas_basic,
+    test_ogr_gmlas_test_ogrsf,
+    test_ogr_gmlas_virtual_file,
+    test_ogr_gmlas_datafile_with_xsd_option,
+    test_ogr_gmlas_no_datafile_with_xsd_option,
+    test_ogr_gmlas_no_datafile_xsd_which_is_not_xsd,
+    test_ogr_gmlas_no_datafile_no_xsd,
+    test_ogr_gmlas_non_existing_gml,
+    test_ogr_gmlas_non_existing_xsd,
+    test_ogr_gmlas_gml_without_schema_location,
+    test_ogr_gmlas_invalid_schema,
+    test_ogr_gmlas_invalid_xml,
+    test_ogr_gmlas_gml_Reference,
+    test_ogr_gmlas_same_element_in_different_ns,
+    test_ogr_gmlas_corner_case_relative_path,
+    test_ogr_gmlas_unexpected_repeated_element,
+    test_ogr_gmlas_unexpected_repeated_element_variant,
+    test_ogr_gmlas_geometryproperty,
+    test_ogr_gmlas_abstractgeometry,
+    test_ogr_gmlas_validate,
+    test_ogr_gmlas_test_ns_prefix,
+    test_ogr_gmlas_no_namespace,
+    test_ogr_gmlas_conf,
+    test_ogr_gmlas_conf_ignored_xpath,
+    test_ogr_gmlas_cache,
+    test_ogr_gmlas_link_nested_independant_child,
+    test_ogr_gmlas_composition_compositionPart,
+    test_ogr_gmlas_instantiate_only_gml_feature,
+    test_ogr_gmlas_timestamp_ignored_for_hash,
+    test_ogr_gmlas_dataset_getnextfeature,
+    test_ogr_gmlas_inline_identifier,
+    test_ogr_gmlas_avoid_same_name_inlined_classes,
+    test_ogr_gmlas_validate_ignored_fixed_attribute,
+    test_ogr_gmlas_remove_unused_layers_and_fields,
+    test_ogr_gmlas_xlink_resolver,
+    test_ogr_gmlas_recoding,
+    test_ogr_gmlas_schema_without_namespace_prefix,
+    test_ogr_gmlas_truncated_xml,
+    test_ogr_gmlas_identifier_truncation,
+    test_ogr_gmlas_identifier_case_ambiguity,
+    test_ogr_gmlas_writer,
+    test_ogr_gmlas_writer_check_xml_xsd,
+    test_ogr_gmlas_writer_check_xml_read_back,
+    test_ogr_gmlas_writer_gml,
+    test_ogr_gmlas_writer_gml_assign_srs,
+    test_ogr_gmlas_writer_gml_original_xml,
+    test_ogr_gmlas_writer_options,
+    test_ogr_gmlas_writer_errors,
+    test_ogr_gmlas_read_fake_gmljp2,
+    test_ogr_gmlas_typing_constraints,
+    test_ogr_gmlas_swe_dataarray,
+    test_ogr_gmlas_swe_datarecord,
+    test_ogr_gmlas_any_field_at_end_of_declaration,
+    test_ogr_gmlas_aux_schema_without_namespace_prefix,
+    test_ogr_gmlas_geometry_as_substitutiongroup,
+    test_ogr_gmlas_no_element_in_first_choice_schema,
+    test_ogr_gmlas_internal_xlink_href,
+    test_ogr_gmlas_cleanup]
 
 # gdaltest_list = [ ogr_gmlas_basic, ogr_gmlas_aux_schema_without_namespace_prefix, ogr_gmlas_cleanup ]
 
diff --git a/autotest/ogr/ogr_gmt.py b/autotest/ogr/ogr_gmt.py
index 18447411cbef..e996a58398ff 100755
--- a/autotest/ogr/ogr_gmt.py
+++ b/autotest/ogr/ogr_gmt.py
@@ -40,7 +40,7 @@
 # Open Memory datasource.
 
 
-def ogr_gmt_1():
+def test_ogr_gmt_1():
 
     gmt_drv = ogr.GetDriverByName('GMT')
     gdaltest.gmt_ds = gmt_drv.CreateDataSource('tmp/tpoly.gmt')
@@ -54,7 +54,7 @@ def ogr_gmt_1():
 # Create table from data/poly.shp
 
 
-def ogr_gmt_2():
+def test_ogr_gmt_2():
 
     #######################################################
     # Create gmtory Layer
@@ -97,7 +97,7 @@ def ogr_gmt_2():
 # Verify that stuff we just wrote is still OK.
 
 
-def ogr_gmt_3():
+def test_ogr_gmt_3():
 
     gdaltest.gmt_ds = ogr.Open('tmp/tpoly.gmt')
     gdaltest.gmt_lyr = gdaltest.gmt_ds.GetLayer(0)
@@ -133,7 +133,7 @@ def ogr_gmt_3():
 # Verify reading of multilinestring file. (#3802)
 
 
-def ogr_gmt_4():
+def test_ogr_gmt_4():
 
     ds = ogr.Open('data/test_multi.gmt')
     lyr = ds.GetLayer(0)
@@ -172,7 +172,7 @@ def ogr_gmt_4():
 # Write a multipolygon file and verify it.
 
 
-def ogr_gmt_5():
+def test_ogr_gmt_5():
 
     #######################################################
     # Create gmtory Layer
@@ -244,7 +244,7 @@ def ogr_gmt_5():
 ###############################################################################
 #
 
-def ogr_gmt_cleanup():
+def test_ogr_gmt_cleanup():
 
     if gdaltest.gmt_ds is not None:
         gdaltest.gmt_lyr = None
@@ -256,12 +256,12 @@ def ogr_gmt_cleanup():
 
 
 gdaltest_list = [
-    ogr_gmt_1,
-    ogr_gmt_2,
-    ogr_gmt_3,
-    ogr_gmt_4,
-    ogr_gmt_5,
-    ogr_gmt_cleanup]
+    test_ogr_gmt_1,
+    test_ogr_gmt_2,
+    test_ogr_gmt_3,
+    test_ogr_gmt_4,
+    test_ogr_gmt_5,
+    test_ogr_gmt_cleanup]
 
 if __name__ == '__main__':
 
diff --git a/autotest/ogr/ogr_gpkg.py b/autotest/ogr/ogr_gpkg.py
index 54fd44c791a5..86ebd1933cee 100755
--- a/autotest/ogr/ogr_gpkg.py
+++ b/autotest/ogr/ogr_gpkg.py
@@ -87,7 +87,7 @@ def validate(filename, quiet=False):
 # Create a fresh database.
 
 
-def ogr_gpkg_1():
+def test_ogr_gpkg_1():
 
     gdaltest.gpkg_ds = None
     gdaltest.gpkg_dr = None
@@ -123,7 +123,7 @@ def ogr_gpkg_1():
 # Re-open database to test validity
 
 
-def ogr_gpkg_2():
+def test_ogr_gpkg_2():
 
     if gdaltest.gpkg_dr is None:
         return 'skip'
@@ -160,7 +160,7 @@ def ogr_gpkg_2():
 ###############################################################################
 # Create a layer
 
-def ogr_gpkg_3():
+def test_ogr_gpkg_3():
 
     if gdaltest.gpkg_dr is None or gdaltest.gpkg_ds is None:
         return 'skip'
@@ -189,7 +189,7 @@ def ogr_gpkg_3():
 # Close and re-open to test the layer registration
 
 
-def ogr_gpkg_4():
+def test_ogr_gpkg_4():
 
     if gdaltest.gpkg_dr is None or gdaltest.gpkg_ds is None:
         return 'skip'
@@ -260,7 +260,7 @@ def ogr_gpkg_4():
 ###############################################################################
 # Delete a layer
 
-def ogr_gpkg_5():
+def test_ogr_gpkg_5():
 
     if gdaltest.gpkg_dr is None or gdaltest.gpkg_ds is None:
         return 'skip'
@@ -299,7 +299,7 @@ def ogr_gpkg_5():
 ###############################################################################
 # Add fields
 
-def ogr_gpkg_6():
+def test_ogr_gpkg_6():
 
     if gdaltest.gpkg_dr is None or gdaltest.gpkg_ds is None:
         return 'skip'
@@ -352,7 +352,7 @@ def ogr_gpkg_6():
 ###############################################################################
 # Add a feature / read a feature / delete a feature
 
-def ogr_gpkg_7():
+def test_ogr_gpkg_7():
 
     if gdaltest.gpkg_dr is None or gdaltest.gpkg_ds is None:
         return 'skip'
@@ -446,7 +446,7 @@ def ogr_gpkg_7():
 ###############################################################################
 # Test a variety of geometry feature types and attribute types
 
-def ogr_gpkg_8():
+def test_ogr_gpkg_8():
 
     # try:
     #     os.remove( 'tmp/gpkg_test.gpkg' )
@@ -590,7 +590,7 @@ def ogr_gpkg_8():
 # Test support for extents and counts
 
 
-def ogr_gpkg_9():
+def test_ogr_gpkg_9():
 
     if gdaltest.gpkg_dr is None or gdaltest.gpkg_ds is None:
         return 'skip'
@@ -614,7 +614,7 @@ def ogr_gpkg_9():
 # Test non-SELECT SQL commands
 
 
-def ogr_gpkg_11():
+def test_ogr_gpkg_11():
 
     if gdaltest.gpkg_dr is None:
         return 'skip'
@@ -640,7 +640,7 @@ def ogr_gpkg_11():
 # Test SELECT SQL commands
 
 
-def ogr_gpkg_12():
+def test_ogr_gpkg_12():
 
     if gdaltest.gpkg_dr is None:
         return 'skip'
@@ -780,7 +780,7 @@ def ogr_gpkg_12():
 # Test non-spatial tables
 
 
-def ogr_gpkg_13():
+def test_ogr_gpkg_13():
 
     if gdaltest.gpkg_dr is None:
         return 'skip'
@@ -843,7 +843,7 @@ def ogr_gpkg_13():
 # Add various geometries to test spatial filtering
 
 
-def ogr_gpkg_14():
+def test_ogr_gpkg_14():
 
     if gdaltest.gpkg_dr is None:
         return 'skip'
@@ -943,7 +943,7 @@ def ogr_gpkg_14():
 # Test SQL functions
 
 
-def ogr_gpkg_15():
+def test_ogr_gpkg_15():
 
     if gdaltest.gpkg_dr is None:
         return 'skip'
@@ -1350,7 +1350,7 @@ def ogr_gpkg_15():
 # Test unknown extensions
 
 
-def ogr_gpkg_16():
+def test_ogr_gpkg_16():
 
     if gdaltest.gpkg_dr is None:
         return 'skip'
@@ -1475,7 +1475,7 @@ def ogr_gpkg_16():
 # Run INDIRECT_SQLITE dialect
 
 
-def ogr_gpkg_17():
+def test_ogr_gpkg_17():
 
     if gdaltest.gpkg_dr is None:
         return 'skip'
@@ -1495,7 +1495,7 @@ def ogr_gpkg_17():
 # Test geometry type extension
 
 
-def ogr_gpkg_18():
+def test_ogr_gpkg_18():
 
     if gdaltest.gpkg_dr is None:
         return 'skip'
@@ -1616,7 +1616,7 @@ def ogr_gpkg_18():
 # Test metadata
 
 
-def ogr_gpkg_19():
+def test_ogr_gpkg_19():
 
     if gdaltest.gpkg_dr is None:
         return 'skip'
@@ -1747,7 +1747,7 @@ def ogr_gpkg_19():
 # Test spatial reference system
 
 
-def ogr_gpkg_20():
+def test_ogr_gpkg_20():
 
     if gdaltest.gpkg_dr is None:
         return 'skip'
@@ -1859,7 +1859,7 @@ def ogr_gpkg_20():
 # Test maximum width of text fields
 
 
-def ogr_gpkg_21():
+def test_ogr_gpkg_21():
 
     if gdaltest.gpkg_dr is None:
         return 'skip'
@@ -1954,7 +1954,7 @@ def ogr_gpkg_21():
 # Test FID64 support
 
 
-def ogr_gpkg_22():
+def test_ogr_gpkg_22():
 
     if gdaltest.gpkg_dr is None:
         return 'skip'
@@ -1990,7 +1990,7 @@ def ogr_gpkg_22():
 # Test not nullable fields
 
 
-def ogr_gpkg_23():
+def test_ogr_gpkg_23():
 
     if gdaltest.gpkg_dr is None:
         return 'skip'
@@ -2184,7 +2184,7 @@ def ogr_gpkg_23():
 # Test default values
 
 
-def ogr_gpkg_24():
+def test_ogr_gpkg_24():
 
     if gdaltest.gpkg_dr is None:
         return 'skip'
@@ -2317,7 +2317,7 @@ def ogr_gpkg_24():
 # Test creating a field with the fid name
 
 
-def ogr_gpkg_25():
+def test_ogr_gpkg_25():
 
     if gdaltest.gpkg_dr is None:
         return 'skip'
@@ -2420,7 +2420,7 @@ def ogr_gpkg_25():
 # Test dataset transactions
 
 
-def ogr_gpkg_26():
+def test_ogr_gpkg_26():
 
     if gdaltest.gpkg_dr is None:
         return 'skip'
@@ -2581,7 +2581,7 @@ def ogr_gpkg_26():
 # Test interface with Spatialite
 
 
-def ogr_gpkg_27():
+def test_ogr_gpkg_27():
 
     if gdaltest.gpkg_dr is None:
         return 'skip'
@@ -2618,7 +2618,7 @@ def ogr_gpkg_27():
 # but inc/dec its ref count, which can exhibit issues in GDALVectorTanslate())
 
 
-def ogr_gpkg_28():
+def test_ogr_gpkg_28():
 
     if gdaltest.gpkg_dr is None:
         return 'skip'
@@ -2637,7 +2637,7 @@ def ogr_gpkg_28():
 # Test XYM / XYZM support
 
 
-def ogr_gpkg_29():
+def test_ogr_gpkg_29():
 
     if gdaltest.gpkg_dr is None:
         return 'skip'
@@ -2725,7 +2725,7 @@ def ogr_gpkg_29():
 # Test non standard file extension (#6396)
 
 
-def ogr_gpkg_30():
+def test_ogr_gpkg_30():
 
     if gdaltest.gpkg_dr is None:
         return 'skip'
@@ -2759,7 +2759,7 @@ def ogr_gpkg_30():
 # Test CURVE and SURFACE types
 
 
-def ogr_gpkg_31():
+def test_ogr_gpkg_31():
 
     if gdaltest.gpkg_dr is None:
         return 'skip'
@@ -2805,7 +2805,7 @@ def ogr_gpkg_31():
 # read it back
 
 
-def ogr_gpkg_32():
+def test_ogr_gpkg_32():
 
     if gdaltest.gpkg_dr is None:
         return 'skip'
@@ -2847,7 +2847,7 @@ def ogr_gpkg_32():
 # Test OGR_CURRENT_DATE
 
 
-def ogr_gpkg_33():
+def test_ogr_gpkg_33():
 
     if gdaltest.gpkg_dr is None:
         return 'skip'
@@ -2874,7 +2874,7 @@ def ogr_gpkg_33():
 # Run test_ogrsf
 
 
-def ogr_gpkg_test_ogrsf():
+def test_ogr_gpkg_test_ogrsf():
 
     if gdaltest.gpkg_dr is None:
         return 'skip'
@@ -2913,7 +2913,7 @@ def ogr_gpkg_test_ogrsf():
 ###############################################################################
 # Test rename and delete a layer registered in extensions, metadata, spatial index etc
 
-def ogr_gpkg_34():
+def test_ogr_gpkg_34():
 
     if gdaltest.gpkg_dr is None:
         return 'skip'
@@ -3047,7 +3047,7 @@ def ogr_gpkg_34():
 # Test DeleteField()
 
 
-def ogr_gpkg_35():
+def test_ogr_gpkg_35():
 
     if gdaltest.gpkg_dr is None:
         return 'skip'
@@ -3166,7 +3166,7 @@ def ogr_gpkg_35():
 # Test AlterFieldDefn()
 
 
-def ogr_gpkg_36():
+def test_ogr_gpkg_36():
 
     if gdaltest.gpkg_dr is None:
         return 'skip'
@@ -3320,7 +3320,7 @@ def ogr_gpkg_36():
 # Test ReorderFields()
 
 
-def ogr_gpkg_37():
+def test_ogr_gpkg_37():
 
     if gdaltest.gpkg_dr is None:
         return 'skip'
@@ -3405,7 +3405,7 @@ def ogr_gpkg_37():
 # Test GetExtent() and RECOMPUTE EXTENT ON
 
 
-def ogr_gpkg_38(options=['SPATIAL_INDEX=YES']):
+def test_ogr_gpkg_38(options=['SPATIAL_INDEX=YES']):
 
     if gdaltest.gpkg_dr is None:
         return 'skip'
@@ -3506,15 +3506,15 @@ def ogr_gpkg_38(options=['SPATIAL_INDEX=YES']):
     return 'success'
 
 
-def ogr_gpkg_38_nospi():
-    return ogr_gpkg_38(options=['SPATIAL_INDEX=NO'])
+def test_ogr_gpkg_38_nospi():
+    return test_ogr_gpkg_38(options=['SPATIAL_INDEX=NO'])
 
 
 ###############################################################################
 # Test checking of IDENTIFIER unicity
 
 
-def ogr_gpkg_39():
+def test_ogr_gpkg_39():
 
     if gdaltest.gpkg_dr is None:
         return 'skip'
@@ -3564,7 +3564,7 @@ def ogr_gpkg_39():
 # read it back
 
 
-def ogr_gpkg_40():
+def test_ogr_gpkg_40():
 
     if gdaltest.gpkg_dr is None:
         return 'skip'
@@ -3606,7 +3606,7 @@ def ogr_gpkg_40():
 # Test tables without integer primary key (#6799), and unrecognized column type
 
 
-def ogr_gpkg_41():
+def test_ogr_gpkg_41():
 
     if gdaltest.gpkg_dr is None:
         return 'skip'
@@ -3664,7 +3664,7 @@ def get_feature_count_from_gpkg_contents(ds):
     return val
 
 
-def ogr_gpkg_42():
+def test_ogr_gpkg_42():
 
     if gdaltest.gpkg_dr is None:
         return 'skip'
@@ -3854,7 +3854,7 @@ def ogr_gpkg_42():
 ###############################################################################
 # Test limitations on number of tables
 
-def ogr_gpkg_43():
+def test_ogr_gpkg_43():
 
     if gdaltest.gpkg_dr is None:
         return 'skip'
@@ -3898,7 +3898,7 @@ def ogr_gpkg_43():
 ###############################################################################
 # Test GeoPackage without metadata table
 
-def ogr_gpkg_44():
+def test_ogr_gpkg_44():
 
     if gdaltest.gpkg_dr is None:
         return 'skip'
@@ -3952,7 +3952,7 @@ def ogr_gpkg_44():
 ###############################################################################
 # Test non conformant GeoPackage: table with non INTEGER PRIMARY KEY
 
-def ogr_gpkg_45():
+def test_ogr_gpkg_45():
 
     if gdaltest.gpkg_dr is None:
         return 'skip'
@@ -3979,7 +3979,7 @@ def ogr_gpkg_45():
 # Test spatial view and spatial index
 
 
-def ogr_gpkg_46():
+def test_ogr_gpkg_46():
 
     if gdaltest.gpkg_dr is None:
         return 'skip'
@@ -4099,7 +4099,7 @@ def ogr_gpkg_46():
 # Test corner case of Identify()
 
 
-def ogr_gpkg_47():
+def test_ogr_gpkg_47():
 
     if gdaltest.gpkg_dr is None:
         return 'skip'
@@ -4248,7 +4248,7 @@ def ogr_gpkg_47():
 # Test insertion of features with unset fields
 
 
-def ogr_gpkg_48():
+def test_ogr_gpkg_48():
 
     if gdaltest.gpkg_dr is None:
         return 'skip'
@@ -4313,7 +4313,7 @@ def ogr_gpkg_48():
 # Test CreateGeomField() on a attributes layer
 
 
-def ogr_gpkg_49():
+def test_ogr_gpkg_49():
 
     if gdaltest.gpkg_dr is None:
         return 'skip'
@@ -4341,7 +4341,7 @@ def ogr_gpkg_49():
 # Test minimalistic support of definition_12_063
 
 
-def ogr_gpkg_50():
+def test_ogr_gpkg_50():
 
     if gdaltest.gpkg_dr is None:
         return 'skip'
@@ -4393,7 +4393,7 @@ def ogr_gpkg_50():
 # Test opening a .gpkg.sql file
 
 
-def ogr_gpkg_51():
+def test_ogr_gpkg_51():
 
     if gdaltest.gpkg_dr is None:
         return 'skip'
@@ -4413,7 +4413,7 @@ def ogr_gpkg_51():
 # Test opening a .gpkg file
 
 
-def ogr_gpkg_52():
+def test_ogr_gpkg_52():
 
     if gdaltest.gpkg_dr is None:
         return 'skip'
@@ -4431,7 +4431,7 @@ def ogr_gpkg_52():
 # Test opening a .gpkg file with inconsistency regarding table case (#6916)
 
 
-def ogr_gpkg_53():
+def test_ogr_gpkg_53():
 
     if gdaltest.gpkg_dr is None:
         return 'skip'
@@ -4463,7 +4463,7 @@ def ogr_gpkg_53():
 # Test editing of a database with 2 layers (https://issues.qgis.org/issues/17034)
 
 
-def ogr_gpkg_54():
+def test_ogr_gpkg_54():
 
     if gdaltest.gpkg_dr is None:
         return 'skip'
@@ -4532,7 +4532,7 @@ def ogr_gpkg_54():
 # Test inserting geometries incompatible with declared layer geometry type
 
 
-def ogr_gpkg_55():
+def test_ogr_gpkg_55():
 
     if gdaltest.gpkg_dr is None:
         return 'skip'
@@ -4567,7 +4567,7 @@ def ogr_gpkg_55():
 # Test FID identification on SQL result layer
 
 
-def ogr_gpkg_56():
+def test_ogr_gpkg_56():
 
     if gdaltest.gpkg_dr is None:
         return 'skip'
@@ -4589,7 +4589,7 @@ def ogr_gpkg_56():
 # Test opening a corrupted gpkg with duplicated layer names
 
 
-def ogr_gpkg_57():
+def test_ogr_gpkg_57():
 
     if gdaltest.gpkg_dr is None:
         return 'skip'
@@ -4628,7 +4628,7 @@ def ogr_gpkg_57():
 # Test overwriting a layer
 
 
-def ogr_gpkg_58():
+def test_ogr_gpkg_58():
 
     if gdaltest.gpkg_dr is None:
         return 'skip'
@@ -4654,7 +4654,7 @@ def ogr_gpkg_58():
 # Test CreateSpatialIndex()
 
 
-def ogr_gpkg_59():
+def test_ogr_gpkg_59():
 
     if gdaltest.gpkg_dr is None:
         return 'skip'
@@ -4679,7 +4679,7 @@ def ogr_gpkg_59():
 # Test savepoints
 
 
-def ogr_gpkg_savepoint():
+def test_ogr_gpkg_savepoint():
 
     if gdaltest.gpkg_dr is None:
         return 'skip'
@@ -4720,7 +4720,7 @@ def ogr_gpkg_savepoint():
 # Test that we don't open file handles behind the back of sqlite3
 
 
-def ogr_gpkg_wal():
+def test_ogr_gpkg_wal():
 
     if gdaltest.gpkg_dr is None:
         return 'skip'
@@ -4764,7 +4764,7 @@ def ogr_gpkg_wal():
 # Test JSon subtype support
 
 
-def ogr_gpkg_json():
+def test_ogr_gpkg_json():
 
     if gdaltest.gpkg_dr is None:
         return 'skip'
@@ -4855,7 +4855,7 @@ def ogr_gpkg_json():
 # Remove the test db from the tmp directory
 
 
-def ogr_gpkg_cleanup():
+def test_ogr_gpkg_cleanup():
 
     if gdaltest.gpkg_dr is None:
         return 'skip'
@@ -4878,70 +4878,70 @@ def ogr_gpkg_cleanup():
 
 
 gdaltest_list = [
-    ogr_gpkg_1,
-    ogr_gpkg_2,
-    ogr_gpkg_3,
-    ogr_gpkg_4,
-    ogr_gpkg_5,
-    ogr_gpkg_6,
-    ogr_gpkg_7,
-    ogr_gpkg_8,
-    ogr_gpkg_9,
-    ogr_gpkg_11,
-    ogr_gpkg_12,
-    ogr_gpkg_13,
-    ogr_gpkg_14,
-    ogr_gpkg_15,
-    ogr_gpkg_16,
-    ogr_gpkg_17,
-    ogr_gpkg_18,
-    ogr_gpkg_19,
-    ogr_gpkg_20,
-    ogr_gpkg_21,
-    ogr_gpkg_22,
-    ogr_gpkg_23,
-    ogr_gpkg_24,
-    ogr_gpkg_25,
-    ogr_gpkg_26,
-    ogr_gpkg_27,
-    ogr_gpkg_28,
-    ogr_gpkg_29,
-    ogr_gpkg_30,
-    ogr_gpkg_31,
-    ogr_gpkg_32,
-    ogr_gpkg_33,
-    ogr_gpkg_34,
-    ogr_gpkg_35,
-    ogr_gpkg_36,
-    ogr_gpkg_37,
-    ogr_gpkg_38,
-    ogr_gpkg_38_nospi,
-    ogr_gpkg_39,
-    ogr_gpkg_40,
-    ogr_gpkg_41,
-    ogr_gpkg_42,
-    ogr_gpkg_43,
-    ogr_gpkg_44,
-    ogr_gpkg_45,
-    ogr_gpkg_46,
-    ogr_gpkg_47,
-    ogr_gpkg_48,
-    ogr_gpkg_49,
-    ogr_gpkg_50,
-    ogr_gpkg_51,
-    ogr_gpkg_52,
-    ogr_gpkg_53,
-    ogr_gpkg_54,
-    ogr_gpkg_55,
-    ogr_gpkg_56,
-    ogr_gpkg_57,
-    ogr_gpkg_58,
-    ogr_gpkg_59,
-    ogr_gpkg_savepoint,
-    ogr_gpkg_wal,
-    ogr_gpkg_json,
-    ogr_gpkg_test_ogrsf,
-    ogr_gpkg_cleanup,
+    test_ogr_gpkg_1,
+    test_ogr_gpkg_2,
+    test_ogr_gpkg_3,
+    test_ogr_gpkg_4,
+    test_ogr_gpkg_5,
+    test_ogr_gpkg_6,
+    test_ogr_gpkg_7,
+    test_ogr_gpkg_8,
+    test_ogr_gpkg_9,
+    test_ogr_gpkg_11,
+    test_ogr_gpkg_12,
+    test_ogr_gpkg_13,
+    test_ogr_gpkg_14,
+    test_ogr_gpkg_15,
+    test_ogr_gpkg_16,
+    test_ogr_gpkg_17,
+    test_ogr_gpkg_18,
+    test_ogr_gpkg_19,
+    test_ogr_gpkg_20,
+    test_ogr_gpkg_21,
+    test_ogr_gpkg_22,
+    test_ogr_gpkg_23,
+    test_ogr_gpkg_24,
+    test_ogr_gpkg_25,
+    test_ogr_gpkg_26,
+    test_ogr_gpkg_27,
+    test_ogr_gpkg_28,
+    test_ogr_gpkg_29,
+    test_ogr_gpkg_30,
+    test_ogr_gpkg_31,
+    test_ogr_gpkg_32,
+    test_ogr_gpkg_33,
+    test_ogr_gpkg_34,
+    test_ogr_gpkg_35,
+    test_ogr_gpkg_36,
+    test_ogr_gpkg_37,
+    test_ogr_gpkg_38,
+    test_ogr_gpkg_38_nospi,
+    test_ogr_gpkg_39,
+    test_ogr_gpkg_40,
+    test_ogr_gpkg_41,
+    test_ogr_gpkg_42,
+    test_ogr_gpkg_43,
+    test_ogr_gpkg_44,
+    test_ogr_gpkg_45,
+    test_ogr_gpkg_46,
+    test_ogr_gpkg_47,
+    test_ogr_gpkg_48,
+    test_ogr_gpkg_49,
+    test_ogr_gpkg_50,
+    test_ogr_gpkg_51,
+    test_ogr_gpkg_52,
+    test_ogr_gpkg_53,
+    test_ogr_gpkg_54,
+    test_ogr_gpkg_55,
+    test_ogr_gpkg_56,
+    test_ogr_gpkg_57,
+    test_ogr_gpkg_58,
+    test_ogr_gpkg_59,
+    test_ogr_gpkg_savepoint,
+    test_ogr_gpkg_wal,
+    test_ogr_gpkg_json,
+    test_ogr_gpkg_test_ogrsf,
+    test_ogr_gpkg_cleanup,
 ]
 
 # gdaltest_list = [ ogr_gpkg_1, ogr_gpkg_47, ogr_gpkg_cleanup ]
diff --git a/autotest/ogr/ogr_gpsbabel.py b/autotest/ogr/ogr_gpsbabel.py
index 52134ddb788d..fcddac8a5763 100755
--- a/autotest/ogr/ogr_gpsbabel.py
+++ b/autotest/ogr/ogr_gpsbabel.py
@@ -40,7 +40,7 @@
 # Check that dependencies are met
 
 
-def ogr_gpsbabel_init():
+def test_ogr_gpsbabel_init():
 
     # Test if the gpsbabel is accessible
     ogrtest.have_gpsbabel = False
@@ -68,7 +68,7 @@ def ogr_gpsbabel_init():
 # Test reading with explicit subdriver
 
 
-def ogr_gpsbabel_1():
+def test_ogr_gpsbabel_1():
 
     if not ogrtest.have_read_gpsbabel:
         return 'skip'
@@ -86,7 +86,7 @@ def ogr_gpsbabel_1():
 # Test reading with implicit subdriver
 
 
-def ogr_gpsbabel_2():
+def test_ogr_gpsbabel_2():
 
     if not ogrtest.have_read_gpsbabel:
         return 'skip'
@@ -104,7 +104,7 @@ def ogr_gpsbabel_2():
 # Test writing
 
 
-def ogr_gpsbabel_3():
+def test_ogr_gpsbabel_3():
 
     if not ogrtest.have_gpsbabel:
         return 'skip'
@@ -148,10 +148,10 @@ def ogr_gpsbabel_3():
 
 
 gdaltest_list = [
-    ogr_gpsbabel_init,
-    ogr_gpsbabel_1,
-    ogr_gpsbabel_2,
-    ogr_gpsbabel_3]
+    test_ogr_gpsbabel_init,
+    test_ogr_gpsbabel_1,
+    test_ogr_gpsbabel_2,
+    test_ogr_gpsbabel_3]
 
 
 if __name__ == '__main__':
diff --git a/autotest/ogr/ogr_gpx.py b/autotest/ogr/ogr_gpx.py
index 5431cdcfa934..8f872dfa5e4d 100755
--- a/autotest/ogr/ogr_gpx.py
+++ b/autotest/ogr/ogr_gpx.py
@@ -38,7 +38,7 @@
 from osgeo import gdal
 
 
-def ogr_gpx_init():
+def test_ogr_gpx_init():
     gdaltest.gpx_ds = None
 
     gdaltest.gpx_ds = ogr.Open('data/test.gpx')
@@ -60,7 +60,7 @@ def ogr_gpx_init():
 # Test waypoints gpx layer.
 
 
-def ogr_gpx_1():
+def test_ogr_gpx_1():
     if not gdaltest.have_gpx:
         return 'skip'
 
@@ -157,7 +157,7 @@ def ogr_gpx_1():
 # Test routes gpx layer.
 
 
-def ogr_gpx_2():
+def test_ogr_gpx_2():
     if not gdaltest.have_gpx:
         return 'skip'
 
@@ -181,7 +181,7 @@ def ogr_gpx_2():
 ###############################################################################
 # Test route_points gpx layer.
 
-def ogr_gpx_3():
+def test_ogr_gpx_3():
     if not gdaltest.have_gpx:
         return 'skip'
 
@@ -207,7 +207,7 @@ def ogr_gpx_3():
 # Test tracks gpx layer.
 
 
-def ogr_gpx_4():
+def test_ogr_gpx_4():
     if not gdaltest.have_gpx:
         return 'skip'
 
@@ -236,7 +236,7 @@ def ogr_gpx_4():
 # Test route_points gpx layer.
 
 
-def ogr_gpx_5():
+def test_ogr_gpx_5():
     if not gdaltest.have_gpx:
         return 'skip'
 
@@ -262,7 +262,7 @@ def ogr_gpx_5():
 # Copy our small gpx file to a new gpx file.
 
 
-def ogr_gpx_6():
+def test_ogr_gpx_6():
     if not gdaltest.have_gpx:
         return 'skip'
 
@@ -349,7 +349,7 @@ def ogr_gpx_6():
 # Output extra fields as <extensions>.
 
 
-def ogr_gpx_7():
+def test_ogr_gpx_7():
     if not gdaltest.have_gpx:
         return 'skip'
 
@@ -423,7 +423,7 @@ def ogr_gpx_7():
 # Output extra fields as <extensions>.
 
 
-def ogr_gpx_8():
+def test_ogr_gpx_8():
     if not gdaltest.have_gpx:
         return 'skip'
 
@@ -518,7 +518,7 @@ def ogr_gpx_8():
 # Parse file with a <time> extension at track level (#6237)
 
 
-def ogr_gpx_9():
+def test_ogr_gpx_9():
     if not gdaltest.have_gpx:
         return 'skip'
 
@@ -536,7 +536,7 @@ def ogr_gpx_9():
 #
 
 
-def ogr_gpx_cleanup():
+def test_ogr_gpx_cleanup():
 
     gdaltest.gpx_ds = None
     try:
@@ -547,21 +547,21 @@ def ogr_gpx_cleanup():
 
 
 gdaltest_list = [
-    ogr_gpx_init,
-    ogr_gpx_1,
-    ogr_gpx_2,
-    ogr_gpx_3,
-    ogr_gpx_4,
-    ogr_gpx_5,
-    ogr_gpx_6,
+    test_ogr_gpx_init,
+    test_ogr_gpx_1,
+    test_ogr_gpx_2,
+    test_ogr_gpx_3,
+    test_ogr_gpx_4,
+    test_ogr_gpx_5,
+    test_ogr_gpx_6,
     # Rerun test 1, 2 and 4 with generated tmp/tmp.gpx
-    ogr_gpx_1,
-    ogr_gpx_2,
-    ogr_gpx_4,
-    ogr_gpx_7,
-    ogr_gpx_8,
-    ogr_gpx_9,
-    ogr_gpx_cleanup]
+    test_ogr_gpx_1,
+    test_ogr_gpx_2,
+    test_ogr_gpx_4,
+    test_ogr_gpx_7,
+    test_ogr_gpx_8,
+    test_ogr_gpx_9,
+    test_ogr_gpx_cleanup]
 
 if __name__ == '__main__':
 
diff --git a/autotest/ogr/ogr_grass.py b/autotest/ogr/ogr_grass.py
index 36ca14da4298..eca1cb77aa34 100755
--- a/autotest/ogr/ogr_grass.py
+++ b/autotest/ogr/ogr_grass.py
@@ -38,7 +38,7 @@
 ###############################################################################
 # Test if GRASS driver is present
 
-def ogr_grass_1():
+def test_ogr_grass_1():
 
     gdaltest.ogr_grass_drv = ogr.GetDriverByName('GRASS')
     if gdaltest.ogr_grass_drv is None:
@@ -50,7 +50,7 @@ def ogr_grass_1():
 # Read 'point' datasource
 
 
-def ogr_grass_2():
+def test_ogr_grass_2():
 
     if gdaltest.ogr_grass_drv is None:
         return 'skip'
@@ -80,8 +80,8 @@ def ogr_grass_2():
 
 
 gdaltest_list = [
-    ogr_grass_1,
-    ogr_grass_2
+    test_ogr_grass_1,
+    test_ogr_grass_2
 ]
 
 
diff --git a/autotest/ogr/ogr_gtm.py b/autotest/ogr/ogr_gtm.py
index 2d93ad7f7efe..6ac241e85ed5 100755
--- a/autotest/ogr/ogr_gtm.py
+++ b/autotest/ogr/ogr_gtm.py
@@ -38,7 +38,7 @@
 from osgeo import ogr
 
 
-def ogr_gtm_init():
+def test_ogr_gtm_init():
     gdaltest.gtm_ds = None
 
     gdaltest.gtm_ds = ogr.Open('data/samplemap.gtm')
@@ -61,7 +61,7 @@ def ogr_gtm_init():
 # Test waypoints gtm layer.
 
 
-def ogr_gtm_read_1():
+def test_ogr_gtm_read_1():
     if not gdaltest.have_gtm:
         return 'skip'
 
@@ -152,7 +152,7 @@ def ogr_gtm_read_1():
 # Test tracks gtm layer.
 
 
-def ogr_gtm_read_2():
+def test_ogr_gtm_read_2():
     if not gdaltest.have_gtm:
         return 'skip'
 
@@ -257,7 +257,7 @@ def ogr_gtm_read_2():
 
 ###############################################################################
 # Waypoint write
-def ogr_gtm_write_1():
+def test_ogr_gtm_write_1():
 
     ds = ogr.GetDriverByName('GPSTrackMaker').CreateDataSource('tmp/gtm.gtm')
     lyr = ds.CreateLayer('gtm_waypoints', geom_type=ogr.wkbPoint)
@@ -319,7 +319,7 @@ def ogr_gtm_write_1():
 # Check previous test
 
 
-def ogr_gtm_check_write_1():
+def test_ogr_gtm_check_write_1():
     if not gdaltest.have_gtm:
         return 'skip'
 
@@ -471,7 +471,7 @@ def ogr_gtm_check_write_1():
 ###############################################################################
 #
 
-def ogr_gtm_cleanup():
+def test_ogr_gtm_cleanup():
 
     gdaltest.gtm_ds = None
     os.remove('tmp/gtm.gtm')
@@ -479,12 +479,12 @@ def ogr_gtm_cleanup():
 
 
 gdaltest_list = [
-    ogr_gtm_init,
-    ogr_gtm_read_1,
-    ogr_gtm_read_2,
-    ogr_gtm_write_1,
-    ogr_gtm_check_write_1,
-    ogr_gtm_cleanup]
+    test_ogr_gtm_init,
+    test_ogr_gtm_read_1,
+    test_ogr_gtm_read_2,
+    test_ogr_gtm_write_1,
+    test_ogr_gtm_check_write_1,
+    test_ogr_gtm_cleanup]
 
 if __name__ == '__main__':
 
diff --git a/autotest/ogr/ogr_htf.py b/autotest/ogr/ogr_htf.py
index 19b4cef56f7d..c4531c01bbb4 100755
--- a/autotest/ogr/ogr_htf.py
+++ b/autotest/ogr/ogr_htf.py
@@ -39,7 +39,7 @@
 # Basic test
 
 
-def ogr_htf_1():
+def test_ogr_htf_1():
 
     ds = ogr.Open('data/test.htf')
     if ds is None:
@@ -105,7 +105,7 @@ def ogr_htf_1():
 # Run test_ogrsf
 
 
-def ogr_htf_2():
+def test_ogr_htf_2():
 
     import test_cli_utilities
     if test_cli_utilities.get_test_ogrsf_path() is None:
@@ -127,8 +127,8 @@ def ogr_htf_2():
 
 
 gdaltest_list = [
-    ogr_htf_1,
-    ogr_htf_2]
+    test_ogr_htf_1,
+    test_ogr_htf_2]
 
 
 if __name__ == '__main__':
diff --git a/autotest/ogr/ogr_idrisi.py b/autotest/ogr/ogr_idrisi.py
index 891c03424c75..95c71b567e19 100755
--- a/autotest/ogr/ogr_idrisi.py
+++ b/autotest/ogr/ogr_idrisi.py
@@ -39,7 +39,7 @@
 # Test point layer
 
 
-def ogr_idrisi_1():
+def test_ogr_idrisi_1():
 
     ds = ogr.Open('data/points.vct')
     if ds is None:
@@ -142,7 +142,7 @@ def ogr_idrisi_1():
 # Test linestring layer
 
 
-def ogr_idrisi_2():
+def test_ogr_idrisi_2():
 
     ds = ogr.Open('data/lines.vct')
     if ds is None:
@@ -208,7 +208,7 @@ def ogr_idrisi_2():
 # Test polygon layer
 
 
-def ogr_idrisi_3():
+def test_ogr_idrisi_3():
 
     ds = ogr.Open('data/polygons.vct')
     if ds is None:
@@ -272,9 +272,9 @@ def ogr_idrisi_3():
 
 
 gdaltest_list = [
-    ogr_idrisi_1,
-    ogr_idrisi_2,
-    ogr_idrisi_3,
+    test_ogr_idrisi_1,
+    test_ogr_idrisi_2,
+    test_ogr_idrisi_3,
 ]
 
 if __name__ == '__main__':
diff --git a/autotest/ogr/ogr_ili.py b/autotest/ogr/ogr_ili.py
index 54aea9615cfe..b31cac532d04 100755
--- a/autotest/ogr/ogr_ili.py
+++ b/autotest/ogr/ogr_ili.py
@@ -47,7 +47,7 @@ def cpl_debug_reset():
 # Open Driver
 
 
-def ogr_interlis1_1():
+def test_ogr_interlis1_1():
 
     gdaltest.have_ili_reader = 0
     driver = ogr.GetDriverByName('Interlis 1')
@@ -62,7 +62,7 @@ def ogr_interlis1_1():
 # Check that Ili1 point layer is properly read.
 
 
-def ogr_interlis1_2():
+def test_ogr_interlis1_2():
 
     if not gdaltest.have_ili_reader:
         return 'skip'
@@ -127,7 +127,7 @@ def ogr_interlis1_2():
 # Ili1 FORMAT DEFAULT test.
 
 
-def ogr_interlis1_3():
+def test_ogr_interlis1_3():
 
     if not gdaltest.have_ili_reader:
         return 'skip'
@@ -171,7 +171,7 @@ def ogr_interlis1_3():
 # Ili1 FORMAT test.
 
 
-def ogr_interlis1_4():
+def test_ogr_interlis1_4():
 
     if not gdaltest.have_ili_reader:
         return 'skip'
@@ -215,7 +215,7 @@ def ogr_interlis1_4():
 # Write Ili1 transfer file without model.
 
 
-def ogr_interlis1_5():
+def test_ogr_interlis1_5():
 
     if not gdaltest.have_ili_reader:
         return 'skip'
@@ -264,7 +264,7 @@ def ogr_interlis1_5():
 # Write Ili1 transfer file.
 
 
-def ogr_interlis1_6():
+def test_ogr_interlis1_6():
 
     if not gdaltest.have_ili_reader:
         return 'skip'
@@ -310,7 +310,7 @@ def ogr_interlis1_6():
 # Ili1 character encoding test.
 
 
-def ogr_interlis1_7():
+def test_ogr_interlis1_7():
 
     if not gdaltest.have_ili_reader:
         return 'skip'
@@ -396,7 +396,7 @@ def ogr_interlis1_7():
 # Ili1 VRT rename
 
 
-def ogr_interlis1_9():
+def test_ogr_interlis1_9():
 
     if not gdaltest.have_ili_reader:
         return 'skip'
@@ -443,7 +443,7 @@ def ogr_interlis1_9():
 # Ili1 Area with polygonizing
 
 
-def ogr_interlis1_10():
+def test_ogr_interlis1_10():
 
     if not gdaltest.have_ili_reader:
         return 'skip'
@@ -479,7 +479,7 @@ def ogr_interlis1_10():
 # Ili1 multi-geom test (RFC41)
 
 
-def ogr_interlis1_11():
+def test_ogr_interlis1_11():
 
     if not gdaltest.have_ili_reader:
         return 'skip'
@@ -536,7 +536,7 @@ def ogr_interlis1_11():
 # Ili1 multi-geom test (RFC41)
 
 
-def ogr_interlis1_12():
+def test_ogr_interlis1_12():
 
     if not gdaltest.have_ili_reader:
         return 'skip'
@@ -585,7 +585,7 @@ def ogr_interlis1_12():
 # Ili1 Surface test.
 
 
-def ogr_interlis1_13():
+def test_ogr_interlis1_13():
 
     if not gdaltest.have_ili_reader:
         return 'skip'
@@ -841,7 +841,7 @@ def ogr_interlis1_13():
 # Ili1 Surface test with linear conversion.
 
 
-def ogr_interlis1_13_linear():
+def test_ogr_interlis1_13_linear():
 
     if not gdaltest.have_ili_reader:
         return 'skip'
@@ -1012,7 +1012,7 @@ def ogr_interlis1_13_linear():
 # Write Ili1 Arcs.
 
 
-def ogr_interlis1_14():
+def test_ogr_interlis1_14():
 
     if not gdaltest.have_ili_reader:
         return 'skip'
@@ -1064,7 +1064,7 @@ def ogr_interlis1_14():
 # Reading Ili2 without model
 
 
-def ogr_interlis2_1():
+def test_ogr_interlis2_1():
 
     if not gdaltest.have_ili_reader:
         return 'skip'
@@ -1094,7 +1094,7 @@ def ogr_interlis2_1():
 # Reading Ili2
 
 
-def ogr_interlis2_2():
+def test_ogr_interlis2_2():
 
     if not gdaltest.have_ili_reader:
         return 'skip'
@@ -1204,7 +1204,7 @@ def ogr_interlis2_2():
 ###############################################################################
 # Write Ili2 transfer file.
 
-def ogr_interlis2_3():
+def test_ogr_interlis2_3():
 
     if not gdaltest.have_ili_reader:
         return 'skip'
@@ -1301,7 +1301,7 @@ def ogr_interlis2_3():
 # Ili2 Oereb model
 
 
-def ogr_interlis2_4():
+def test_ogr_interlis2_4():
 
     if not gdaltest.have_ili_reader:
         return 'skip'
@@ -1394,7 +1394,7 @@ def ogr_interlis2_4():
 ###############################################################################
 # Check arc segmentation
 
-def ogr_interlis_arc1():
+def test_ogr_interlis_arc1():
 
     if not gdaltest.have_ili_reader:
         return 'skip'
@@ -1457,7 +1457,7 @@ def ogr_interlis_arc1():
 # Check polyline with arc
 
 
-def ogr_interlis_arc2():
+def test_ogr_interlis_arc2():
 
     if not gdaltest.have_ili_reader:
         return 'skip'
@@ -1489,7 +1489,7 @@ def ogr_interlis_arc2():
 #
 
 
-def ogr_interlis_cleanup():
+def test_ogr_interlis_cleanup():
 
     if not gdaltest.have_ili_reader:
         return 'skip'
@@ -1502,27 +1502,27 @@ def ogr_interlis_cleanup():
 
 
 gdaltest_list = [
-    ogr_interlis1_1,
-    ogr_interlis1_2,
-    ogr_interlis1_3,
-    ogr_interlis1_4,
-    ogr_interlis1_5,
-    ogr_interlis1_6,
-    ogr_interlis1_7,
-    ogr_interlis1_9,
-    ogr_interlis1_10,
-    ogr_interlis1_11,
-    ogr_interlis1_12,
-    ogr_interlis1_13,
-    ogr_interlis1_13_linear,
-    ogr_interlis1_14,
-    ogr_interlis2_1,
-    ogr_interlis2_2,
-    ogr_interlis2_3,
-    ogr_interlis2_4,
-    ogr_interlis_arc1,
-    ogr_interlis_arc2,
-    ogr_interlis_cleanup]
+    test_ogr_interlis1_1,
+    test_ogr_interlis1_2,
+    test_ogr_interlis1_3,
+    test_ogr_interlis1_4,
+    test_ogr_interlis1_5,
+    test_ogr_interlis1_6,
+    test_ogr_interlis1_7,
+    test_ogr_interlis1_9,
+    test_ogr_interlis1_10,
+    test_ogr_interlis1_11,
+    test_ogr_interlis1_12,
+    test_ogr_interlis1_13,
+    test_ogr_interlis1_13_linear,
+    test_ogr_interlis1_14,
+    test_ogr_interlis2_1,
+    test_ogr_interlis2_2,
+    test_ogr_interlis2_3,
+    test_ogr_interlis2_4,
+    test_ogr_interlis_arc1,
+    test_ogr_interlis_arc2,
+    test_ogr_interlis_cleanup]
 
 if __name__ == '__main__':
 
diff --git a/autotest/ogr/ogr_index_test.py b/autotest/ogr/ogr_index_test.py
index e4947d9c7d1b..f0559c54ec0e 100755
--- a/autotest/ogr/ogr_index_test.py
+++ b/autotest/ogr/ogr_index_test.py
@@ -38,7 +38,7 @@
 # Create a MIF file to be our primary table.
 
 
-def ogr_index_1():
+def test_ogr_index_1():
 
     from osgeo import gdal
     gdal.PushErrorHandler('CPLQuietErrorHandler')
@@ -84,7 +84,7 @@ def ogr_index_1():
 # Create a dbf file to be our secondary table.  Close it, and reopen shared.
 
 
-def ogr_index_2():
+def test_ogr_index_2():
 
     drv = ogr.GetDriverByName('ESRI Shapefile')
     gdaltest.s_ds = drv.CreateDataSource('join_t.dbf')
@@ -115,7 +115,7 @@ def ogr_index_2():
 # Verify a simple join without indexing.
 
 
-def ogr_index_3():
+def test_ogr_index_3():
 
     expect = ['Value 5', 'Value 10', 'Value 9', 'Value 4', 'Value 3',
               'Value 1']
@@ -134,7 +134,7 @@ def ogr_index_3():
 # Create an INDEX on the SKEY and VALUE field in the join table.
 
 
-def ogr_index_4():
+def test_ogr_index_4():
 
     gdaltest.s_ds.ExecuteSQL('CREATE INDEX ON join_t USING value')
     gdaltest.s_ds.ExecuteSQL('CREATE INDEX ON join_t USING skey')
@@ -145,7 +145,7 @@ def ogr_index_4():
 # Check that indexable single int lookup works.
 
 
-def ogr_index_5():
+def test_ogr_index_5():
 
     gdaltest.s_lyr.SetAttributeFilter('SKEY = 5')
 
@@ -161,7 +161,7 @@ def ogr_index_5():
 # work OK too.
 
 
-def ogr_index_6():
+def test_ogr_index_6():
 
     gdaltest.s_ds.Release()
     gdaltest.s_ds = ogr.OpenShared('join_t.dbf', update=1)
@@ -179,7 +179,7 @@ def ogr_index_6():
 # Check that range query that isn't currently implemented using index works.
 
 
-def ogr_index_7():
+def test_ogr_index_7():
 
     gdaltest.s_lyr.SetAttributeFilter('SKEY < 3')
 
@@ -193,7 +193,7 @@ def ogr_index_7():
 # Try join again.
 
 
-def ogr_index_8():
+def test_ogr_index_8():
 
     expect = ['Value 5', 'Value 10', 'Value 9', 'Value 4', 'Value 3',
               'Value 1']
@@ -213,7 +213,7 @@ def ogr_index_8():
 # work.
 
 
-def ogr_index_9():
+def test_ogr_index_9():
 
     gdaltest.s_ds.ExecuteSQL('DROP INDEX ON join_t USING value')
     gdaltest.s_ds.ExecuteSQL('DROP INDEX ON join_t USING skey')
@@ -284,7 +284,7 @@ def ogr_index_9():
 # Test fix for #4326
 
 
-def ogr_index_10():
+def test_ogr_index_10():
 
     ds = ogr.GetDriverByName('ESRI Shapefile').CreateDataSource('tmp/ogr_index_10.shp')
     lyr = ds.CreateLayer('ogr_index_10')
@@ -442,7 +442,7 @@ def ogr_index_11_check(lyr, expected_fids):
     return 'success'
 
 
-def ogr_index_11():
+def test_ogr_index_11():
 
     ds = ogr.GetDriverByName('ESRI Shapefile').CreateDataSource('tmp/ogr_index_11.dbf')
     lyr = ds.CreateLayer('ogr_index_11', geom_type=ogr.wkbNone)
@@ -490,7 +490,7 @@ def ogr_index_11():
 ###############################################################################
 
 
-def ogr_index_cleanup():
+def test_ogr_index_cleanup():
     try:
         gdaltest.p_ds.Release()
     except:
@@ -522,18 +522,18 @@ def ogr_index_cleanup():
 
 
 gdaltest_list = [
-    ogr_index_1,
-    ogr_index_2,
-    ogr_index_3,
-    ogr_index_4,
-    ogr_index_5,
-    ogr_index_6,
-    ogr_index_7,
-    ogr_index_8,
-    ogr_index_9,
-    ogr_index_10,
-    ogr_index_11,
-    ogr_index_cleanup]
+    test_ogr_index_1,
+    test_ogr_index_2,
+    test_ogr_index_3,
+    test_ogr_index_4,
+    test_ogr_index_5,
+    test_ogr_index_6,
+    test_ogr_index_7,
+    test_ogr_index_8,
+    test_ogr_index_9,
+    test_ogr_index_10,
+    test_ogr_index_11,
+    test_ogr_index_cleanup]
 
 if __name__ == '__main__':
 
diff --git a/autotest/ogr/ogr_ingres.py b/autotest/ogr/ogr_ingres.py
index 88928c3a7fc7..f3cd42e71198 100755
--- a/autotest/ogr/ogr_ingres.py
+++ b/autotest/ogr/ogr_ingres.py
@@ -39,7 +39,7 @@
 # Open INGRES test datasource.
 
 
-def ogr_ingres_1():
+def test_ogr_ingres_1():
 
     gdaltest.ingres_ds = None
 
@@ -57,7 +57,7 @@ def ogr_ingres_1():
 # Create table from data/poly.shp
 
 
-def ogr_ingres_2():
+def test_ogr_ingres_2():
 
     if gdaltest.ingres_ds is None:
         return 'skip'
@@ -102,7 +102,7 @@ def ogr_ingres_2():
 # Verify that stuff we just wrote is still OK.
 
 
-def ogr_ingres_3():
+def test_ogr_ingres_3():
     if gdaltest.ingres_ds is None:
         return 'skip'
 
@@ -139,7 +139,7 @@ def ogr_ingres_3():
 # Test ExecuteSQL() results layers without geometry.
 
 
-def ogr_ingres_4():
+def test_ogr_ingres_4():
 
     if gdaltest.ingres_ds is None:
         return 'skip'
@@ -162,7 +162,7 @@ def ogr_ingres_4():
 # so we disable this test.
 
 
-def ogr_ingres_5():
+def test_ogr_ingres_5():
 
     if gdaltest.ingres_ds is None:
         return 'skip'
@@ -190,7 +190,7 @@ def ogr_ingres_5():
 # Test spatial filtering.
 
 
-def ogr_ingres_6():
+def test_ogr_ingres_6():
 
     if gdaltest.ingres_ds is None:
         return 'skip'
@@ -213,7 +213,7 @@ def ogr_ingres_6():
 # Test adding a new field.
 
 
-def ogr_ingres_7():
+def test_ogr_ingres_7():
 
     if gdaltest.ingres_ds is None:
         return 'skip'
@@ -260,7 +260,7 @@ def ogr_ingres_7():
 # Test deleting a feature.
 
 
-def ogr_ingres_8():
+def test_ogr_ingres_8():
 
     if gdaltest.ingres_ds is None:
         return 'skip'
@@ -297,7 +297,7 @@ def ogr_ingres_8():
 #
 
 
-def ogr_ingres_cleanup():
+def test_ogr_ingres_cleanup():
 
     if gdaltest.ingres_ds is None:
         return 'skip'
@@ -309,15 +309,15 @@ def ogr_ingres_cleanup():
 
 
 gdaltest_list = [
-    ogr_ingres_1,
-    ogr_ingres_2,
-    ogr_ingres_3,
-    ogr_ingres_4,
-    ogr_ingres_5,
-    ogr_ingres_6,
-    ogr_ingres_7,
-    ogr_ingres_8,
-    ogr_ingres_cleanup]
+    test_ogr_ingres_1,
+    test_ogr_ingres_2,
+    test_ogr_ingres_3,
+    test_ogr_ingres_4,
+    test_ogr_ingres_5,
+    test_ogr_ingres_6,
+    test_ogr_ingres_7,
+    test_ogr_ingres_8,
+    test_ogr_ingres_cleanup]
 
 if __name__ == '__main__':
 
diff --git a/autotest/ogr/ogr_jml.py b/autotest/ogr/ogr_jml.py
index c7cffd7e46e3..04b7c464915d 100755
--- a/autotest/ogr/ogr_jml.py
+++ b/autotest/ogr/ogr_jml.py
@@ -38,7 +38,7 @@
 from osgeo import gdal
 
 
-def ogr_jml_init():
+def test_ogr_jml_init():
 
     ds = ogr.Open('data/test.jml')
 
@@ -54,7 +54,7 @@ def ogr_jml_init():
 # Test reading
 
 
-def ogr_jml_1():
+def test_ogr_jml_1():
 
     if not gdaltest.jml_read_support:
         return 'skip'
@@ -132,7 +132,7 @@ def ogr_jml_1():
 # Test creating a file
 
 
-def ogr_jml_2():
+def test_ogr_jml_2():
 
     # Invalid filename
     gdal.PushErrorHandler('CPLQuietErrorHandler')
@@ -445,7 +445,7 @@ def ogr_jml_2():
 # Run test_ogrsf
 
 
-def ogr_jml_3():
+def test_ogr_jml_3():
 
     if not gdaltest.jml_read_support:
         return 'skip'
@@ -466,7 +466,7 @@ def ogr_jml_3():
 # Test a few error cases
 
 
-def ogr_jml_4():
+def test_ogr_jml_4():
 
     if not gdaltest.jml_read_support:
         return 'skip'
@@ -657,7 +657,7 @@ def ogr_jml_4():
 # Test reading SRS
 
 
-def ogr_jml_read_srs():
+def test_ogr_jml_read_srs():
 
     if not gdaltest.jml_read_support:
         return 'skip'
@@ -678,7 +678,7 @@ def ogr_jml_read_srs():
 #
 
 
-def ogr_jml_cleanup():
+def test_ogr_jml_cleanup():
 
     gdal.Unlink('/vsimem/ogr_jml.jml')
 
@@ -686,13 +686,13 @@ def ogr_jml_cleanup():
 
 
 gdaltest_list = [
-    ogr_jml_init,
-    ogr_jml_1,
-    ogr_jml_2,
-    ogr_jml_3,
-    ogr_jml_4,
-    ogr_jml_read_srs,
-    ogr_jml_cleanup]
+    test_ogr_jml_init,
+    test_ogr_jml_1,
+    test_ogr_jml_2,
+    test_ogr_jml_3,
+    test_ogr_jml_4,
+    test_ogr_jml_read_srs,
+    test_ogr_jml_cleanup]
 
 if __name__ == '__main__':
 
diff --git a/autotest/ogr/ogr_join_test.py b/autotest/ogr/ogr_join_test.py
index 662638539980..9e4f065c5abe 100755
--- a/autotest/ogr/ogr_join_test.py
+++ b/autotest/ogr/ogr_join_test.py
@@ -39,7 +39,7 @@
 # Test a join.
 
 
-def ogr_join_1():
+def test_ogr_join_1():
     gdaltest.ds = ogr.Open('data')
 
     sql_lyr = gdaltest.ds.ExecuteSQL(
@@ -58,7 +58,7 @@ def ogr_join_1():
 # Check the values we are actually getting back (restricting the search a bit)
 
 
-def ogr_join_2():
+def test_ogr_join_2():
 
     expect = ['_166_', '_158_', '_165_']
 
@@ -77,7 +77,7 @@ def ogr_join_2():
 # Try various naming conversions for the selected fields.
 
 
-def ogr_join_3():
+def test_ogr_join_3():
 
     expect = ['_166_', '_158_', '_165_']
 
@@ -96,7 +96,7 @@ def ogr_join_3():
 # Verify that records for which a join can't be found work ok.
 
 
-def ogr_join_4():
+def test_ogr_join_4():
 
     expect = ['_179_', '_171_', None, None]
 
@@ -115,7 +115,7 @@ def ogr_join_4():
 # Verify that table aliases work
 
 
-def ogr_join_5():
+def test_ogr_join_5():
 
     expect = [179, 171, 173, 172]
 
@@ -134,7 +134,7 @@ def ogr_join_5():
 # Again, ordering by a primary field.
 
 
-def ogr_join_6():
+def test_ogr_join_6():
 
     expect = [171, 172, 173, 179]
 
@@ -153,7 +153,7 @@ def ogr_join_6():
 # Test joining to an external datasource.
 
 
-def ogr_join_7():
+def test_ogr_join_7():
 
     expect = [171, 172, 173, 179]
 
@@ -172,7 +172,7 @@ def ogr_join_7():
 # Test doing two joins at once.
 
 
-def ogr_join_8():
+def test_ogr_join_8():
 
     expect = [171, None, None, 179]
 
@@ -193,7 +193,7 @@ def ogr_join_8():
 # with join clauses)
 
 
-def ogr_join_9():
+def test_ogr_join_9():
 
     expect = [179, 171, 173, 172]
 
@@ -211,7 +211,7 @@ def ogr_join_9():
 ###############################################################################
 
 
-def ogr_join_10():
+def test_ogr_join_10():
 
     expect = [None, None, None, None, None, None, None, None, None, None]
 
@@ -229,7 +229,7 @@ def ogr_join_10():
 # Test join on string field
 
 
-def ogr_join_11():
+def test_ogr_join_11():
 
     expect = ['_168_', '_179_', '_171_', '_170_', '_165_', '_158_', '_166_']
 
@@ -246,7 +246,7 @@ def ogr_join_11():
 # Test fix for #4112 (join between 2 datasources)
 
 
-def ogr_join_12():
+def test_ogr_join_12():
     ds = ogr.Open('data/poly.shp')
 
     sql_lyr = ds.ExecuteSQL(
@@ -265,7 +265,7 @@ def ogr_join_12():
 # Test joining a float column with a string column (#4321)
 
 
-def ogr_join_13():
+def test_ogr_join_13():
 
     expect = ['_168_', '_179_', '_171_', None, None, None, '_166_', '_158_', '_165_', '_170_']
 
@@ -283,7 +283,7 @@ def ogr_join_13():
 # Test joining a string column with a float column (#4321, actually addressed by #4259)
 
 
-def ogr_join_14():
+def test_ogr_join_14():
 
     expect = [168, 179, 171, 170, 165, 158, 166]
 
@@ -301,7 +301,7 @@ def ogr_join_14():
 # Test multiple joins with expressions (#4521)
 
 
-def ogr_join_15():
+def test_ogr_join_15():
 
     ds = ogr.GetDriverByName('CSV').CreateDataSource('/vsimem/ogr_join_14')
     lyr = ds.CreateLayer('first')
@@ -345,7 +345,7 @@ def ogr_join_15():
 # Test non-support of a secondarytable.fieldname in a where clause
 
 
-def ogr_join_16():
+def test_ogr_join_16():
 
     gdal.ErrorReset()
     gdal.PushErrorHandler('CPLQuietErrorHandler')
@@ -366,7 +366,7 @@ def ogr_join_16():
 # Test non-support of a secondarytable.fieldname in a order by clause
 
 
-def ogr_join_17():
+def test_ogr_join_17():
 
     gdal.ErrorReset()
     gdal.PushErrorHandler('CPLQuietErrorHandler')
@@ -388,7 +388,7 @@ def ogr_join_17():
 # Test inverted order of fields in ON
 
 
-def ogr_join_18():
+def test_ogr_join_18():
 
     sql_lyr = gdaltest.ds.ExecuteSQL(
         'SELECT * FROM poly LEFT JOIN idlink ON idlink.eas_id = poly.eas_id')
@@ -406,7 +406,7 @@ def ogr_join_18():
 # Test unrecognized primary field
 
 
-def ogr_join_19():
+def test_ogr_join_19():
 
     gdal.ErrorReset()
     gdal.PushErrorHandler('CPLQuietErrorHandler')
@@ -426,7 +426,7 @@ def ogr_join_19():
 # Test unrecognized secondary field
 
 
-def ogr_join_20():
+def test_ogr_join_20():
 
     gdal.ErrorReset()
     gdal.PushErrorHandler('CPLQuietErrorHandler')
@@ -446,7 +446,7 @@ def ogr_join_20():
 # Test unexpected secondary table
 
 
-def ogr_join_21():
+def test_ogr_join_21():
 
     gdal.ErrorReset()
     gdal.PushErrorHandler('CPLQuietErrorHandler')
@@ -468,7 +468,7 @@ def ogr_join_21():
 # Test join with a complex expression as ON
 
 
-def ogr_join_22():
+def test_ogr_join_22():
 
     ds = ogr.GetDriverByName('Memory').CreateDataSource('')
     lyr = ds.CreateLayer('first')
@@ -499,7 +499,7 @@ def ogr_join_22():
 # Test join with NULL keys
 
 
-def ogr_join_23():
+def test_ogr_join_23():
 
     ds = ogr.GetDriverByName('Memory').CreateDataSource('')
     lyr = ds.CreateLayer('first')
@@ -532,7 +532,7 @@ def ogr_join_23():
 ###############################################################################
 
 
-def ogr_join_cleanup():
+def test_ogr_join_cleanup():
     gdaltest.lyr = None
     gdaltest.ds = None
 
@@ -540,30 +540,30 @@ def ogr_join_cleanup():
 
 
 gdaltest_list = [
-    ogr_join_1,
-    ogr_join_2,
-    ogr_join_3,
-    ogr_join_4,
-    ogr_join_5,
-    ogr_join_6,
-    ogr_join_7,
-    ogr_join_8,
-    ogr_join_9,
-    ogr_join_10,
-    ogr_join_11,
-    ogr_join_12,
-    ogr_join_13,
-    ogr_join_14,
-    ogr_join_15,
-    ogr_join_16,
-    ogr_join_17,
-    ogr_join_18,
-    ogr_join_19,
-    ogr_join_20,
-    ogr_join_21,
-    ogr_join_22,
-    ogr_join_23,
-    ogr_join_cleanup]
+    test_ogr_join_1,
+    test_ogr_join_2,
+    test_ogr_join_3,
+    test_ogr_join_4,
+    test_ogr_join_5,
+    test_ogr_join_6,
+    test_ogr_join_7,
+    test_ogr_join_8,
+    test_ogr_join_9,
+    test_ogr_join_10,
+    test_ogr_join_11,
+    test_ogr_join_12,
+    test_ogr_join_13,
+    test_ogr_join_14,
+    test_ogr_join_15,
+    test_ogr_join_16,
+    test_ogr_join_17,
+    test_ogr_join_18,
+    test_ogr_join_19,
+    test_ogr_join_20,
+    test_ogr_join_21,
+    test_ogr_join_22,
+    test_ogr_join_23,
+    test_ogr_join_cleanup]
 
 if __name__ == '__main__':
 
diff --git a/autotest/ogr/ogr_kml.py b/autotest/ogr/ogr_kml.py
index fd04258ecd96..ee3c3752dacc 100755
--- a/autotest/ogr/ogr_kml.py
+++ b/autotest/ogr/ogr_kml.py
@@ -45,7 +45,7 @@
 #
 
 
-def ogr_kml_datastore():
+def test_ogr_kml_datastore():
 
     ogrtest.kml_ds = None
     ogrtest.have_read_kml = 0
@@ -81,7 +81,7 @@ def ogr_kml_datastore():
 #
 
 
-def ogr_kml_attributes_1():
+def test_ogr_kml_attributes_1():
 
     if not ogrtest.have_read_kml:
         return 'skip'
@@ -137,7 +137,7 @@ def ogr_kml_attributes_1():
 #
 
 
-def ogr_kml_attributes_2():
+def test_ogr_kml_attributes_2():
 
     if not ogrtest.have_read_kml:
         return 'skip'
@@ -169,7 +169,7 @@ def ogr_kml_attributes_2():
 #
 
 
-def ogr_kml_attributes_3():
+def test_ogr_kml_attributes_3():
 
     if not ogrtest.have_read_kml:
         return 'skip'
@@ -214,7 +214,7 @@ def ogr_kml_attributes_3():
 #
 
 
-def ogr_kml_attributes_4():
+def test_ogr_kml_attributes_4():
 
     if not ogrtest.have_read_kml:
         return 'skip'
@@ -248,7 +248,7 @@ def ogr_kml_attributes_4():
 #
 
 
-def ogr_kml_point_read():
+def test_ogr_kml_point_read():
 
     if not ogrtest.have_read_kml:
         return 'skip'
@@ -293,7 +293,7 @@ def ogr_kml_point_read():
 #
 
 
-def ogr_kml_linestring_read():
+def test_ogr_kml_linestring_read():
 
     if not ogrtest.have_read_kml:
         return 'skip'
@@ -335,7 +335,7 @@ def ogr_kml_linestring_read():
 #
 
 
-def ogr_kml_polygon_read():
+def test_ogr_kml_polygon_read():
 
     if not ogrtest.have_read_kml:
         return 'skip'
@@ -385,7 +385,7 @@ def ogr_kml_polygon_read():
 # Write test
 
 
-def ogr_kml_write_1():
+def test_ogr_kml_write_1():
 
     if ogrtest.kml_drv is None:
         return 'skip'
@@ -465,7 +465,7 @@ def ogr_kml_write_1():
 ###############################################################################
 # Check previous test
 
-def ogr_kml_check_write_1():
+def test_ogr_kml_check_write_1():
 
     if not ogrtest.have_read_kml:
         return 'skip'
@@ -543,7 +543,7 @@ def ogr_kml_check_write_1():
 ###############################################################################
 # Test reading attributes with XML content in them
 #
-def ogr_kml_xml_attributes():
+def test_ogr_kml_xml_attributes():
 
     if not ogrtest.have_read_kml:
         return 'skip'
@@ -564,7 +564,7 @@ def ogr_kml_xml_attributes():
 # Test reading all geometry types (#3558)
 
 
-def ogr_kml_read_geometries():
+def test_ogr_kml_read_geometries():
 
     if not ogrtest.have_read_kml:
         return 'skip'
@@ -582,7 +582,7 @@ def ogr_kml_read_geometries():
 # Run test_ogrsf
 
 
-def ogr_kml_test_ogrsf():
+def test_ogr_kml_test_ogrsf():
 
     if not ogrtest.have_read_kml:
         return 'skip'
@@ -603,7 +603,7 @@ def ogr_kml_test_ogrsf():
 # Test fix for #2772
 
 
-def ogr_kml_interleaved_writing():
+def test_ogr_kml_interleaved_writing():
 
     ds = ogr.GetDriverByName('KML').CreateDataSource('/vsimem/ogr_kml_interleaved_writing.kml')
     lyr1 = ds.CreateLayer("lyr1")
@@ -625,7 +625,7 @@ def ogr_kml_interleaved_writing():
 # Test reading KML with only Placemark
 
 
-def ogr_kml_read_placemark():
+def test_ogr_kml_read_placemark():
 
     if not ogrtest.have_read_kml:
         return 'skip'
@@ -642,7 +642,7 @@ def ogr_kml_read_placemark():
 # Test reading KML without any layer
 
 
-def ogr_kml_read_empty():
+def test_ogr_kml_read_empty():
 
     if not ogrtest.have_read_kml:
         return 'skip'
@@ -659,7 +659,7 @@ def ogr_kml_read_empty():
 # Test reading KML with empty layers
 
 
-def ogr_kml_read_emptylayers():
+def test_ogr_kml_read_emptylayers():
 
     if not ogrtest.have_read_kml:
         return 'skip'
@@ -705,7 +705,7 @@ def compare_output(content, expected_content):
 # Test that we can write a schema
 
 
-def ogr_kml_write_schema():
+def test_ogr_kml_write_schema():
 
     ds = ogr.GetDriverByName('KML').CreateDataSource('/vsimem/ogr_kml_write_schema.kml')
     lyr = ds.CreateLayer("lyr")
@@ -750,7 +750,7 @@ def ogr_kml_write_schema():
 #
 
 
-def ogr_kml_empty_layer():
+def test_ogr_kml_empty_layer():
 
     ds = ogr.GetDriverByName('KML').CreateDataSource('/vsimem/ogr_kml_empty_layer.kml')
     ds.CreateLayer("empty")
@@ -775,7 +775,7 @@ def ogr_kml_empty_layer():
 # Empty layer followed by regular layer
 
 
-def ogr_kml_two_layers():
+def test_ogr_kml_two_layers():
 
     ds = ogr.GetDriverByName('KML').CreateDataSource('/vsimem/ogr_kml_two_layers.kml')
     ds.CreateLayer("empty")
@@ -816,7 +816,7 @@ def ogr_kml_two_layers():
 #  Cleanup
 
 
-def ogr_kml_cleanup():
+def test_ogr_kml_cleanup():
 
     os.remove('tmp/kml.kml')
 
@@ -837,7 +837,7 @@ def ogr_kml_cleanup():
 # Test reading KML with folder with empty subfolder and placemark
 
 
-def ogr_kml_read_folder_with_subfolder_placemark():
+def test_ogr_kml_read_folder_with_subfolder_placemark():
 
     if not ogrtest.have_read_kml:
         return 'skip'
@@ -859,7 +859,7 @@ def ogr_kml_read_folder_with_subfolder_placemark():
 # Test reading invalid KML (#6878)
 
 
-def ogr_kml_read_truncated():
+def test_ogr_kml_read_truncated():
 
     if not ogrtest.have_read_kml:
         return 'skip'
@@ -875,7 +875,7 @@ def ogr_kml_read_truncated():
 # Test fix for https://bugs.chromium.org/p/oss-fuzz/issues/detail?id=1591
 
 
-def ogr_kml_read_weird_empty_folders():
+def test_ogr_kml_read_weird_empty_folders():
 
     if not ogrtest.have_read_kml:
         return 'skip'
@@ -897,7 +897,7 @@ def ogr_kml_read_weird_empty_folders():
 # Test fix for https://bugs.chromium.org/p/oss-fuzz/issues/detail?id=1683
 
 
-def ogr_kml_read_junk_content_after_valid_doc():
+def test_ogr_kml_read_junk_content_after_valid_doc():
 
     if not ogrtest.have_read_kml:
         return 'skip'
@@ -913,7 +913,7 @@ def ogr_kml_read_junk_content_after_valid_doc():
 # Test reading KML with kml: prefix
 
 
-def ogr_kml_read_placemark_with_kml_prefix():
+def test_ogr_kml_read_placemark_with_kml_prefix():
 
     if not ogrtest.have_read_kml:
         return 'skip'
@@ -930,7 +930,7 @@ def ogr_kml_read_placemark_with_kml_prefix():
 # Test reading KML with duplicated folder name
 
 
-def ogr_kml_read_duplicate_folder_name():
+def test_ogr_kml_read_duplicate_folder_name():
 
     if not ogrtest.have_read_kml:
         return 'skip'
@@ -953,7 +953,7 @@ def ogr_kml_read_duplicate_folder_name():
 # Test reading KML with a placemark in root document, and a subfolder (#7221)
 
 
-def ogr_kml_read_placemark_in_root_and_subfolder():
+def test_ogr_kml_read_placemark_in_root_and_subfolder():
 
     if not ogrtest.have_read_kml:
         return 'skip'
@@ -982,34 +982,34 @@ def ogr_kml_read_placemark_in_root_and_subfolder():
 
 
 gdaltest_list = [
-    ogr_kml_datastore,
-    ogr_kml_attributes_1,
-    ogr_kml_attributes_2,
-    ogr_kml_attributes_3,
-    ogr_kml_attributes_4,
-    ogr_kml_point_read,
-    ogr_kml_linestring_read,
-    ogr_kml_polygon_read,
-    ogr_kml_write_1,
-    ogr_kml_check_write_1,
-    ogr_kml_xml_attributes,
-    ogr_kml_read_geometries,
-    ogr_kml_test_ogrsf,
-    ogr_kml_interleaved_writing,
-    ogr_kml_read_placemark,
-    ogr_kml_read_empty,
-    ogr_kml_read_emptylayers,
-    ogr_kml_write_schema,
-    ogr_kml_empty_layer,
-    ogr_kml_two_layers,
-    ogr_kml_read_folder_with_subfolder_placemark,
-    ogr_kml_read_truncated,
-    ogr_kml_read_weird_empty_folders,
-    ogr_kml_read_junk_content_after_valid_doc,
-    ogr_kml_read_placemark_with_kml_prefix,
-    ogr_kml_read_duplicate_folder_name,
-    ogr_kml_read_placemark_in_root_and_subfolder,
-    ogr_kml_cleanup]
+    test_ogr_kml_datastore,
+    test_ogr_kml_attributes_1,
+    test_ogr_kml_attributes_2,
+    test_ogr_kml_attributes_3,
+    test_ogr_kml_attributes_4,
+    test_ogr_kml_point_read,
+    test_ogr_kml_linestring_read,
+    test_ogr_kml_polygon_read,
+    test_ogr_kml_write_1,
+    test_ogr_kml_check_write_1,
+    test_ogr_kml_xml_attributes,
+    test_ogr_kml_read_geometries,
+    test_ogr_kml_test_ogrsf,
+    test_ogr_kml_interleaved_writing,
+    test_ogr_kml_read_placemark,
+    test_ogr_kml_read_empty,
+    test_ogr_kml_read_emptylayers,
+    test_ogr_kml_write_schema,
+    test_ogr_kml_empty_layer,
+    test_ogr_kml_two_layers,
+    test_ogr_kml_read_folder_with_subfolder_placemark,
+    test_ogr_kml_read_truncated,
+    test_ogr_kml_read_weird_empty_folders,
+    test_ogr_kml_read_junk_content_after_valid_doc,
+    test_ogr_kml_read_placemark_with_kml_prefix,
+    test_ogr_kml_read_duplicate_folder_name,
+    test_ogr_kml_read_placemark_in_root_and_subfolder,
+    test_ogr_kml_cleanup]
 
 if __name__ == '__main__':
 
diff --git a/autotest/ogr/ogr_layer_algebra.py b/autotest/ogr/ogr_layer_algebra.py
index 032008f17149..c87130b7a22b 100755
--- a/autotest/ogr/ogr_layer_algebra.py
+++ b/autotest/ogr/ogr_layer_algebra.py
@@ -84,7 +84,7 @@ def is_same(A, B):
             return False
 
 
-def algebra_setup():
+def test_algebra_setup():
 
     global ds, A, B, C, pointInB, D1, D2, empty
 
@@ -159,7 +159,7 @@ def algebra_setup():
     return 'success'
 
 
-def algebra_intersection():
+def test_algebra_intersection():
     if not ogrtest.have_geos():
         return 'skip'
 
@@ -267,7 +267,7 @@ def algebra_intersection():
     return 'success'
 
 
-def algebra_KEEP_LOWER_DIMENSION_GEOMETRIES():
+def test_algebra_KEEP_LOWER_DIMENSION_GEOMETRIES():
     if not ogrtest.have_geos():
         return 'skip'
 
@@ -339,7 +339,7 @@ def algebra_KEEP_LOWER_DIMENSION_GEOMETRIES():
     return 'success'
 
 
-def algebra_union():
+def test_algebra_union():
     if not ogrtest.have_geos():
         return 'skip'
 
@@ -404,7 +404,7 @@ def algebra_union():
     return 'success'
 
 
-def algebra_symdifference():
+def test_algebra_symdifference():
     if not ogrtest.have_geos():
         return 'skip'
 
@@ -454,7 +454,7 @@ def algebra_symdifference():
     return 'success'
 
 
-def algebra_identify():
+def test_algebra_identify():
     if not ogrtest.have_geos():
         return 'skip'
 
@@ -504,7 +504,7 @@ def algebra_identify():
     return 'success'
 
 
-def algebra_update():
+def test_algebra_update():
     if not ogrtest.have_geos():
         return 'skip'
 
@@ -554,7 +554,7 @@ def algebra_update():
     return 'success'
 
 
-def algebra_clip():
+def test_algebra_clip():
     if not ogrtest.have_geos():
         return 'skip'
 
@@ -604,7 +604,7 @@ def algebra_clip():
     return 'success'
 
 
-def algebra_erase():
+def test_algebra_erase():
     if not ogrtest.have_geos():
         return 'skip'
 
@@ -683,7 +683,7 @@ def algebra_erase():
     return 'success'
 
 
-def algebra_cleanup():
+def test_algebra_cleanup():
     if not ogrtest.have_geos():
         return 'skip'
 
@@ -702,16 +702,16 @@ def algebra_cleanup():
 
 
 gdaltest_list = [
-    algebra_setup,
-    algebra_intersection,
-    algebra_KEEP_LOWER_DIMENSION_GEOMETRIES,
-    algebra_union,
-    algebra_symdifference,
-    algebra_identify,
-    algebra_update,
-    algebra_clip,
-    algebra_erase,
-    algebra_cleanup,
+    test_algebra_setup,
+    test_algebra_intersection,
+    test_algebra_KEEP_LOWER_DIMENSION_GEOMETRIES,
+    test_algebra_union,
+    test_algebra_symdifference,
+    test_algebra_identify,
+    test_algebra_update,
+    test_algebra_clip,
+    test_algebra_erase,
+    test_algebra_cleanup,
 ]
 
 if __name__ == '__main__':
diff --git a/autotest/ogr/ogr_libkml.py b/autotest/ogr/ogr_libkml.py
index cf140360ecf2..8e40d0340920 100755
--- a/autotest/ogr/ogr_libkml.py
+++ b/autotest/ogr/ogr_libkml.py
@@ -43,7 +43,7 @@
 #
 
 
-def ogr_libkml_datastore():
+def test_ogr_libkml_datastore():
 
     ogrtest.kml_ds = None
     ogrtest.have_read_libkml = 0
@@ -80,7 +80,7 @@ def ogr_libkml_datastore():
 #
 
 
-def ogr_libkml_attributes_1():
+def test_ogr_libkml_attributes_1():
 
     if not ogrtest.have_read_libkml:
         return 'skip'
@@ -136,7 +136,7 @@ def ogr_libkml_attributes_1():
 #
 
 
-def ogr_libkml_attributes_2():
+def test_ogr_libkml_attributes_2():
 
     if not ogrtest.have_read_libkml:
         return 'skip'
@@ -169,7 +169,7 @@ def ogr_libkml_attributes_2():
 #
 
 
-def ogr_libkml_attributes_3():
+def test_ogr_libkml_attributes_3():
 
     if not ogrtest.have_read_libkml:
         return 'skip'
@@ -214,7 +214,7 @@ def ogr_libkml_attributes_3():
 #
 
 
-def ogr_libkml_attributes_4():
+def test_ogr_libkml_attributes_4():
 
     if not ogrtest.have_read_libkml:
         return 'skip'
@@ -248,7 +248,7 @@ def ogr_libkml_attributes_4():
 #
 
 
-def ogr_libkml_point_read():
+def test_ogr_libkml_point_read():
 
     if not ogrtest.have_read_libkml:
         return 'skip'
@@ -293,7 +293,7 @@ def ogr_libkml_point_read():
 #
 
 
-def ogr_libkml_linestring_read():
+def test_ogr_libkml_linestring_read():
 
     if not ogrtest.have_read_libkml:
         return 'skip'
@@ -335,7 +335,7 @@ def ogr_libkml_linestring_read():
 #
 
 
-def ogr_libkml_polygon_read():
+def test_ogr_libkml_polygon_read():
 
     if not ogrtest.have_read_libkml:
         return 'skip'
@@ -556,38 +556,38 @@ def ogr_libkml_check_write(filename):
 ###############################################################################
 
 
-def ogr_libkml_write_kml():
+def test_ogr_libkml_write_kml():
     return ogr_libkml_write('/vsimem/libkml.kml')
 
 
-def ogr_libkml_check_write_kml():
+def test_ogr_libkml_check_write_kml():
     return ogr_libkml_check_write('/vsimem/libkml.kml')
 
 
-def ogr_libkml_write_kmz():
+def test_ogr_libkml_write_kmz():
     return ogr_libkml_write('/vsimem/libkml.kmz')
 
 
-def ogr_libkml_check_write_kmz():
+def test_ogr_libkml_check_write_kmz():
     return ogr_libkml_check_write('/vsimem/libkml.kmz')
 
 
-def ogr_libkml_write_kmz_use_doc_off():
+def test_ogr_libkml_write_kmz_use_doc_off():
     gdal.SetConfigOption("LIBKML_USE_DOC.KML", "NO")
     ret = ogr_libkml_write('/vsimem/libkml_use_doc_off.kmz')
     gdal.SetConfigOption("LIBKML_USE_DOC.KML", None)
     return ret
 
 
-def ogr_libkml_check_write_kmz_use_doc_off():
+def test_ogr_libkml_check_write_kmz_use_doc_off():
     return ogr_libkml_check_write('/vsimem/libkml_use_doc_off.kmz')
 
 
-def ogr_libkml_write_dir():
+def test_ogr_libkml_write_dir():
     return ogr_libkml_write('/vsimem/libkmldir')
 
 
-def ogr_libkml_check_write_dir():
+def test_ogr_libkml_check_write_dir():
     if not ogrtest.have_read_libkml:
         return 'skip'
 
@@ -603,7 +603,7 @@ def ogr_libkml_check_write_dir():
 #
 
 
-def ogr_libkml_xml_attributes():
+def test_ogr_libkml_xml_attributes():
 
     if not ogrtest.have_read_libkml:
         return 'skip'
@@ -627,7 +627,7 @@ def ogr_libkml_xml_attributes():
 #
 
 
-def ogr_libkml_read_geometries():
+def test_ogr_libkml_read_geometries():
 
     if not ogrtest.have_read_libkml:
         return 'skip'
@@ -647,7 +647,7 @@ def ogr_libkml_read_geometries():
 # Run test_ogrsf
 
 
-def ogr_libkml_test_ogrsf():
+def test_ogr_libkml_test_ogrsf():
 
     if not ogrtest.have_read_libkml:
         return 'skip'
@@ -668,7 +668,7 @@ def ogr_libkml_test_ogrsf():
 # Test reading KML with only Placemark
 
 
-def ogr_libkml_read_placemark():
+def test_ogr_libkml_read_placemark():
 
     if not ogrtest.have_read_libkml:
         return 'skip'
@@ -687,7 +687,7 @@ def ogr_libkml_read_placemark():
 # Test reading KML without any layer
 
 
-def ogr_libkml_read_empty():
+def test_ogr_libkml_read_empty():
 
     if not ogrtest.have_read_libkml:
         return 'skip'
@@ -706,7 +706,7 @@ def ogr_libkml_read_empty():
 # Test reading KML with empty layers
 
 
-def ogr_libkml_read_emptylayers():
+def test_ogr_libkml_read_emptylayers():
 
     if not ogrtest.have_read_libkml:
         return 'skip'
@@ -739,7 +739,7 @@ def ogr_libkml_read_emptylayers():
 # Test reading KML with empty layers without folder
 
 
-def ogr_libkml_read_emptylayers_without_folder():
+def test_ogr_libkml_read_emptylayers_without_folder():
 
     if not ogrtest.have_read_libkml:
         return 'skip'
@@ -764,7 +764,7 @@ def ogr_libkml_read_emptylayers_without_folder():
 # Test reading KML with empty layers without_folder
 
 
-def ogr_libkml_read_schema():
+def test_ogr_libkml_read_schema():
 
     if not ogrtest.have_read_libkml:
         return 'skip'
@@ -808,7 +808,7 @@ def ogr_libkml_read_schema():
 # <ExtendedData> doesn't use a <SchemaData> (test changeset r22127)
 
 
-def ogr_libkml_extended_data_without_schema_data():
+def test_ogr_libkml_extended_data_without_schema_data():
 
     if not ogrtest.have_read_libkml:
         return 'skip'
@@ -843,7 +843,7 @@ def ogr_libkml_extended_data_without_schema_data():
 # Test reading KML with <gx:Track> element (#5095)
 
 
-def ogr_libkml_gxtrack():
+def test_ogr_libkml_gxtrack():
 
     if not ogrtest.have_read_libkml:
         return 'skip'
@@ -866,7 +866,7 @@ def ogr_libkml_gxtrack():
 # Test reading KML with <gx:MultiTrack> element
 
 
-def ogr_libkml_gxmultitrack():
+def test_ogr_libkml_gxmultitrack():
 
     if not ogrtest.have_read_libkml:
         return 'skip'
@@ -889,7 +889,7 @@ def ogr_libkml_gxmultitrack():
 # Test generating and reading KML with <Camera> element
 
 
-def ogr_libkml_camera():
+def test_ogr_libkml_camera():
 
     if not ogrtest.have_read_libkml:
         return 'skip'
@@ -961,7 +961,7 @@ def ogr_libkml_camera():
 # Test generating a LookAt element at Document level
 
 
-def ogr_libkml_write_layer_lookat():
+def test_ogr_libkml_write_layer_lookat():
 
     if not ogrtest.have_read_libkml:
         return 'skip'
@@ -1005,7 +1005,7 @@ def ogr_libkml_write_layer_lookat():
 ###############################################################################
 # Test generating a Camera element at Document level
 
-def ogr_libkml_write_layer_camera():
+def test_ogr_libkml_write_layer_camera():
 
     if not ogrtest.have_read_libkml:
         return 'skip'
@@ -1039,7 +1039,7 @@ def ogr_libkml_write_layer_camera():
 # Test writing MultiGeometry
 
 
-def ogr_libkml_write_multigeometry():
+def test_ogr_libkml_write_multigeometry():
 
     if not ogrtest.have_read_libkml:
         return 'skip'
@@ -1077,7 +1077,7 @@ def ogr_libkml_write_multigeometry():
 # Test writing <snippet>
 
 
-def ogr_libkml_write_snippet():
+def test_ogr_libkml_write_snippet():
 
     if not ogrtest.have_read_libkml:
         return 'skip'
@@ -1119,7 +1119,7 @@ def ogr_libkml_write_snippet():
 # Test writing <atom:author>
 
 
-def ogr_libkml_write_atom_author():
+def test_ogr_libkml_write_atom_author():
 
     if not ogrtest.have_read_libkml:
         return 'skip'
@@ -1151,7 +1151,7 @@ def ogr_libkml_write_atom_author():
 # Test writing <atom:link>
 
 
-def ogr_libkml_write_atom_link():
+def test_ogr_libkml_write_atom_link():
 
     if not ogrtest.have_read_libkml:
         return 'skip'
@@ -1181,7 +1181,7 @@ def ogr_libkml_write_atom_link():
 # Test writing <phoneNumber>
 
 
-def ogr_libkml_write_phonenumber():
+def test_ogr_libkml_write_phonenumber():
 
     if not ogrtest.have_read_libkml:
         return 'skip'
@@ -1210,7 +1210,7 @@ def ogr_libkml_write_phonenumber():
 # Test writing Region
 
 
-def ogr_libkml_write_region():
+def test_ogr_libkml_write_region():
 
     if not ogrtest.have_read_libkml:
         return 'skip'
@@ -1259,7 +1259,7 @@ def ogr_libkml_write_region():
 # Test writing ScreenOverlay
 
 
-def ogr_libkml_write_screenoverlay():
+def test_ogr_libkml_write_screenoverlay():
 
     if not ogrtest.have_read_libkml:
         return 'skip'
@@ -1309,7 +1309,7 @@ def ogr_libkml_write_screenoverlay():
 # Test writing Model
 
 
-def ogr_libkml_write_model():
+def test_ogr_libkml_write_model():
 
     if not ogrtest.have_read_libkml:
         return 'skip'
@@ -1384,7 +1384,7 @@ def ogr_libkml_write_model():
 # Test read / write of style
 
 
-def ogr_libkml_read_write_style():
+def test_ogr_libkml_read_write_style():
 
     if not ogrtest.have_read_libkml:
         return 'skip'
@@ -1638,7 +1638,7 @@ def ogr_libkml_read_write_style():
 # Test writing Update
 
 
-def ogr_libkml_write_update():
+def test_ogr_libkml_write_update():
 
     if not ogrtest.have_read_libkml:
         return 'skip'
@@ -1699,7 +1699,7 @@ def ogr_libkml_write_update():
 # Test writing NetworkLinkControl
 
 
-def ogr_libkml_write_networklinkcontrol():
+def test_ogr_libkml_write_networklinkcontrol():
 
     if not ogrtest.have_read_libkml:
         return 'skip'
@@ -1759,7 +1759,7 @@ def ogr_libkml_write_networklinkcontrol():
 # Test writing ListStyle
 
 
-def ogr_libkml_write_liststyle():
+def test_ogr_libkml_write_liststyle():
 
     if not ogrtest.have_read_libkml:
         return 'skip'
@@ -1800,7 +1800,7 @@ def ogr_libkml_write_liststyle():
 # Test writing NetworkLink
 
 
-def ogr_libkml_write_networklink():
+def test_ogr_libkml_write_networklink():
 
     if not ogrtest.have_read_libkml:
         return 'skip'
@@ -1871,7 +1871,7 @@ def ogr_libkml_write_networklink():
 # Test writing PhotoOverlay
 
 
-def ogr_libkml_write_photooverlay():
+def test_ogr_libkml_write_photooverlay():
 
     if not ogrtest.have_read_libkml:
         return 'skip'
@@ -1960,7 +1960,7 @@ def ogr_libkml_write_photooverlay():
 # Test writing and reading Data element
 
 
-def ogr_libkml_read_write_data():
+def test_ogr_libkml_read_write_data():
 
     if not ogrtest.have_read_libkml:
         return 'skip'
@@ -2000,7 +2000,7 @@ def ogr_libkml_read_write_data():
 # Test writing layer as Folder
 
 
-def ogr_libkml_write_folder():
+def test_ogr_libkml_write_folder():
 
     if not ogrtest.have_read_libkml:
         return 'skip'
@@ -2030,7 +2030,7 @@ def ogr_libkml_write_folder():
 # Test writing datasource and layer container propreties
 
 
-def ogr_libkml_write_container_properties():
+def test_ogr_libkml_write_container_properties():
 
     if not ogrtest.have_read_libkml:
         return 'skip'
@@ -2065,7 +2065,7 @@ def ogr_libkml_write_container_properties():
 # Test reading gx:TimeStamp and gx:TimeSpan
 
 
-def ogr_libkml_read_gx_timestamp():
+def test_ogr_libkml_read_gx_timestamp():
 
     if not ogrtest.have_read_libkml:
         return 'skip'
@@ -2089,7 +2089,7 @@ def ogr_libkml_read_gx_timestamp():
 # Test reading KML with kml: prefix
 
 
-def ogr_libkml_read_placemark_with_kml_prefix():
+def test_ogr_libkml_read_placemark_with_kml_prefix():
 
     if not ogrtest.have_read_libkml:
         return 'skip'
@@ -2106,7 +2106,7 @@ def ogr_libkml_read_placemark_with_kml_prefix():
 # Test reading KML with duplicated folder name
 
 
-def ogr_libkml_read_duplicate_folder_name():
+def test_ogr_libkml_read_duplicate_folder_name():
 
     if not ogrtest.have_read_libkml:
         return 'skip'
@@ -2129,7 +2129,7 @@ def ogr_libkml_read_duplicate_folder_name():
 # Test reading KML with a placemark in root document, and a subfolder (#7221)
 
 
-def ogr_libkml_read_placemark_in_root_and_subfolder():
+def test_ogr_libkml_read_placemark_in_root_and_subfolder():
 
     if not ogrtest.have_read_libkml:
         return 'skip'
@@ -2157,7 +2157,7 @@ def ogr_libkml_read_placemark_in_root_and_subfolder():
 # Test reading KML with coordinate tuples separated by tabulations (#7231)
 
 
-def ogr_libkml_read_tab_separated_coord_triplet():
+def test_ogr_libkml_read_tab_separated_coord_triplet():
 
     if not ogrtest.have_read_libkml:
         return 'skip'
@@ -2177,7 +2177,7 @@ def ogr_libkml_read_tab_separated_coord_triplet():
 # Test reading KML with coordinate with space only content (#7232)
 
 
-def ogr_libkml_read_kml_with_space_content_in_coordinates():
+def test_ogr_libkml_read_kml_with_space_content_in_coordinates():
 
     if not ogrtest.have_read_libkml:
         return 'skip'
@@ -2197,7 +2197,7 @@ def ogr_libkml_read_kml_with_space_content_in_coordinates():
 # Test reading a layer referring several schema (github #826)
 
 
-def ogr_libkml_read_several_schema():
+def test_ogr_libkml_read_several_schema():
 
     if not ogrtest.have_read_libkml:
         return 'skip'
@@ -2235,7 +2235,7 @@ def ogr_libkml_read_several_schema():
 ###############################################################################
 
 
-def ogr_libkml_update_existing_kml():
+def test_ogr_libkml_update_existing_kml():
 
     if not ogrtest.have_read_libkml:
         return 'skip'
@@ -2262,7 +2262,7 @@ def ogr_libkml_update_existing_kml():
 #  Cleanup
 
 
-def ogr_libkml_cleanup():
+def test_ogr_libkml_cleanup():
     if not ogrtest.have_read_libkml:
         return 'skip'
 
@@ -2312,62 +2312,62 @@ def ogr_libkml_cleanup():
 
 
 gdaltest_list = [
-    ogr_libkml_datastore,
-    ogr_libkml_attributes_1,
-    ogr_libkml_attributes_2,
-    ogr_libkml_attributes_3,
-    ogr_libkml_attributes_4,
-    ogr_libkml_point_read,
-    ogr_libkml_linestring_read,
-    ogr_libkml_polygon_read,
-    ogr_libkml_write_kml,
-    ogr_libkml_check_write_kml,
-    ogr_libkml_write_kmz,
-    ogr_libkml_check_write_kmz,
-    ogr_libkml_write_kmz_use_doc_off,
-    ogr_libkml_check_write_kmz_use_doc_off,
-    ogr_libkml_write_dir,
-    ogr_libkml_check_write_dir,
-    ogr_libkml_xml_attributes,
-    ogr_libkml_read_geometries,
-    ogr_libkml_test_ogrsf,
-    ogr_libkml_read_placemark,
-    ogr_libkml_read_empty,
-    ogr_libkml_read_emptylayers,
-    ogr_libkml_read_emptylayers_without_folder,
-    ogr_libkml_read_schema,
-    ogr_libkml_extended_data_without_schema_data,
-    ogr_libkml_gxtrack,
-    ogr_libkml_gxmultitrack,
-    ogr_libkml_camera,
-    ogr_libkml_write_layer_lookat,
-    ogr_libkml_write_layer_camera,
-    ogr_libkml_write_multigeometry,
-    ogr_libkml_write_snippet,
-    ogr_libkml_write_atom_author,
-    ogr_libkml_write_atom_link,
-    ogr_libkml_write_phonenumber,
-    ogr_libkml_write_region,
-    ogr_libkml_write_screenoverlay,
-    ogr_libkml_write_model,
-    ogr_libkml_read_write_style,
-    ogr_libkml_write_update,
-    ogr_libkml_write_networklinkcontrol,
-    ogr_libkml_write_liststyle,
-    ogr_libkml_write_networklink,
-    ogr_libkml_write_photooverlay,
-    ogr_libkml_read_write_data,
-    ogr_libkml_write_folder,
-    ogr_libkml_write_container_properties,
-    ogr_libkml_read_gx_timestamp,
-    ogr_libkml_read_placemark_with_kml_prefix,
-    ogr_libkml_read_duplicate_folder_name,
-    ogr_libkml_read_placemark_in_root_and_subfolder,
-    ogr_libkml_read_tab_separated_coord_triplet,
-    ogr_libkml_read_kml_with_space_content_in_coordinates,
-    ogr_libkml_read_several_schema,
-    ogr_libkml_update_existing_kml,
-    ogr_libkml_cleanup]
+    test_ogr_libkml_datastore,
+    test_ogr_libkml_attributes_1,
+    test_ogr_libkml_attributes_2,
+    test_ogr_libkml_attributes_3,
+    test_ogr_libkml_attributes_4,
+    test_ogr_libkml_point_read,
+    test_ogr_libkml_linestring_read,
+    test_ogr_libkml_polygon_read,
+    test_ogr_libkml_write_kml,
+    test_ogr_libkml_check_write_kml,
+    test_ogr_libkml_write_kmz,
+    test_ogr_libkml_check_write_kmz,
+    test_ogr_libkml_write_kmz_use_doc_off,
+    test_ogr_libkml_check_write_kmz_use_doc_off,
+    test_ogr_libkml_write_dir,
+    test_ogr_libkml_check_write_dir,
+    test_ogr_libkml_xml_attributes,
+    test_ogr_libkml_read_geometries,
+    test_ogr_libkml_test_ogrsf,
+    test_ogr_libkml_read_placemark,
+    test_ogr_libkml_read_empty,
+    test_ogr_libkml_read_emptylayers,
+    test_ogr_libkml_read_emptylayers_without_folder,
+    test_ogr_libkml_read_schema,
+    test_ogr_libkml_extended_data_without_schema_data,
+    test_ogr_libkml_gxtrack,
+    test_ogr_libkml_gxmultitrack,
+    test_ogr_libkml_camera,
+    test_ogr_libkml_write_layer_lookat,
+    test_ogr_libkml_write_layer_camera,
+    test_ogr_libkml_write_multigeometry,
+    test_ogr_libkml_write_snippet,
+    test_ogr_libkml_write_atom_author,
+    test_ogr_libkml_write_atom_link,
+    test_ogr_libkml_write_phonenumber,
+    test_ogr_libkml_write_region,
+    test_ogr_libkml_write_screenoverlay,
+    test_ogr_libkml_write_model,
+    test_ogr_libkml_read_write_style,
+    test_ogr_libkml_write_update,
+    test_ogr_libkml_write_networklinkcontrol,
+    test_ogr_libkml_write_liststyle,
+    test_ogr_libkml_write_networklink,
+    test_ogr_libkml_write_photooverlay,
+    test_ogr_libkml_read_write_data,
+    test_ogr_libkml_write_folder,
+    test_ogr_libkml_write_container_properties,
+    test_ogr_libkml_read_gx_timestamp,
+    test_ogr_libkml_read_placemark_with_kml_prefix,
+    test_ogr_libkml_read_duplicate_folder_name,
+    test_ogr_libkml_read_placemark_in_root_and_subfolder,
+    test_ogr_libkml_read_tab_separated_coord_triplet,
+    test_ogr_libkml_read_kml_with_space_content_in_coordinates,
+    test_ogr_libkml_read_several_schema,
+    test_ogr_libkml_update_existing_kml,
+    test_ogr_libkml_cleanup]
 
 if __name__ == '__main__':
 
diff --git a/autotest/ogr/ogr_mem.py b/autotest/ogr/ogr_mem.py
index f3dbf18f27c1..82fa9b554a9c 100755
--- a/autotest/ogr/ogr_mem.py
+++ b/autotest/ogr/ogr_mem.py
@@ -41,7 +41,7 @@
 # Open Memory datasource.
 
 
-def ogr_mem_1():
+def test_ogr_mem_1():
 
     mem_drv = ogr.GetDriverByName('Memory')
     gdaltest.mem_ds = mem_drv.CreateDataSource('wrk_in_memory')
@@ -55,7 +55,7 @@ def ogr_mem_1():
 # Create table from data/poly.shp
 
 
-def ogr_mem_2():
+def test_ogr_mem_2():
 
     if gdaltest.mem_ds is None:
         return 'skip'
@@ -106,7 +106,7 @@ def ogr_mem_2():
 # Verify that stuff we just wrote is still OK.
 
 
-def ogr_mem_3():
+def test_ogr_mem_3():
     if gdaltest.mem_ds is None:
         return 'skip'
 
@@ -140,7 +140,7 @@ def ogr_mem_3():
 # geometries are still OK.
 
 
-def ogr_mem_4():
+def test_ogr_mem_4():
 
     if gdaltest.mem_ds is None:
         return 'skip'
@@ -175,7 +175,7 @@ def ogr_mem_4():
 # Test ExecuteSQL() results layers without geometry.
 
 
-def ogr_mem_5():
+def test_ogr_mem_5():
 
     if gdaltest.mem_ds is None:
         return 'skip'
@@ -194,7 +194,7 @@ def ogr_mem_5():
 # Test ExecuteSQL() results layers with geometry.
 
 
-def ogr_mem_6():
+def test_ogr_mem_6():
 
     if gdaltest.mem_ds is None:
         return 'skip'
@@ -217,7 +217,7 @@ def ogr_mem_6():
 # Test spatial filtering.
 
 
-def ogr_mem_7():
+def test_ogr_mem_7():
 
     if gdaltest.mem_ds is None:
         return 'skip'
@@ -244,7 +244,7 @@ def ogr_mem_7():
 # Test adding a new field.
 
 
-def ogr_mem_8():
+def test_ogr_mem_8():
 
     ####################################################################
     # Add new string field.
@@ -285,7 +285,7 @@ def ogr_mem_8():
 # Test deleting a feature.
 
 
-def ogr_mem_9():
+def test_ogr_mem_9():
 
     if not gdaltest.mem_lyr.TestCapability(ogr.OLCDeleteFeature):
         gdaltest.post_reason('OLCDeleteFeature capability test failed.')
@@ -341,7 +341,7 @@ def ogr_mem_9():
 # Mostly we are verifying that this doesn't still cause a crash.
 
 
-def ogr_mem_10():
+def test_ogr_mem_10():
 
     d = ogr.GetDriverByName('Memory')
     ds = d.CreateDataSource('xxxxxx')
@@ -357,7 +357,7 @@ def ogr_mem_10():
 # Verify that we can delete layers properly
 
 
-def ogr_mem_11():
+def test_ogr_mem_11():
 
     if gdaltest.mem_ds.TestCapability('DeleteLayer') == 0:
         gdaltest.post_reason('Deletelayer TestCapability failed.')
@@ -401,7 +401,7 @@ def ogr_mem_11():
 # Test some date handling
 
 
-def ogr_mem_12():
+def test_ogr_mem_12():
 
     if gdaltest.mem_ds is None:
         return 'skip'
@@ -430,7 +430,7 @@ def ogr_mem_12():
 # Test Get/Set on StringList, IntegerList, RealList
 
 
-def ogr_mem_13():
+def test_ogr_mem_13():
 
     if gdaltest.mem_ds is None:
         return 'skip'
@@ -471,7 +471,7 @@ def ogr_mem_13():
 # Test SetNextByIndex
 
 
-def ogr_mem_14():
+def test_ogr_mem_14():
 
     if gdaltest.mem_ds is None:
         return 'skip'
@@ -529,7 +529,7 @@ def ogr_mem_14():
 # Test non-linear geometries
 
 
-def ogr_mem_15():
+def test_ogr_mem_15():
 
     lyr = gdaltest.mem_ds.CreateLayer('wkbCircularString', geom_type=ogr.wkbCircularString)
     f = ogr.Feature(lyr.GetLayerDefn())
@@ -585,7 +585,7 @@ def ogr_mem_15():
 # Test map implementation
 
 
-def ogr_mem_16():
+def test_ogr_mem_16():
 
     lyr = gdaltest.mem_ds.CreateLayer('ogr_mem_16')
     f = ogr.Feature(lyr.GetLayerDefn())
@@ -714,7 +714,7 @@ def ogr_mem_16():
 # Test Dataset.GetNextFeature() implementation
 
 
-def ogr_mem_17():
+def test_ogr_mem_17():
 
     ds = gdal.GetDriverByName('Memory').Create('', 0, 0, 0, gdal.GDT_Unknown)
     lyr = ds.CreateLayer('ogr_mem_1')
@@ -837,7 +837,7 @@ def ogr_mem_17():
     return 'success'
 
 
-def ogr_mem_cleanup():
+def test_ogr_mem_cleanup():
 
     if gdaltest.mem_ds is None:
         return 'skip'
@@ -849,24 +849,24 @@ def ogr_mem_cleanup():
 
 
 gdaltest_list = [
-    ogr_mem_1,
-    ogr_mem_2,
-    ogr_mem_3,
-    ogr_mem_4,
-    ogr_mem_5,
-    ogr_mem_6,
-    ogr_mem_7,
-    ogr_mem_8,
-    ogr_mem_9,
-    ogr_mem_10,
-    ogr_mem_11,
-    ogr_mem_12,
-    ogr_mem_13,
-    ogr_mem_14,
-    ogr_mem_15,
-    ogr_mem_16,
-    ogr_mem_17,
-    ogr_mem_cleanup]
+    test_ogr_mem_1,
+    test_ogr_mem_2,
+    test_ogr_mem_3,
+    test_ogr_mem_4,
+    test_ogr_mem_5,
+    test_ogr_mem_6,
+    test_ogr_mem_7,
+    test_ogr_mem_8,
+    test_ogr_mem_9,
+    test_ogr_mem_10,
+    test_ogr_mem_11,
+    test_ogr_mem_12,
+    test_ogr_mem_13,
+    test_ogr_mem_14,
+    test_ogr_mem_15,
+    test_ogr_mem_16,
+    test_ogr_mem_17,
+    test_ogr_mem_cleanup]
 
 if __name__ == '__main__':
 
diff --git a/autotest/ogr/ogr_mitab.py b/autotest/ogr/ogr_mitab.py
index e1bcc0a7a42d..4c31c4003434 100755
--- a/autotest/ogr/ogr_mitab.py
+++ b/autotest/ogr/ogr_mitab.py
@@ -45,7 +45,7 @@
 # Create TAB file.
 
 
-def ogr_mitab_1():
+def test_ogr_mitab_1():
 
     gdaltest.mapinfo_drv = ogr.GetDriverByName('MapInfo File')
     gdaltest.mapinfo_ds = gdaltest.mapinfo_drv.CreateDataSource('tmp')
@@ -58,7 +58,7 @@ def ogr_mitab_1():
 # Create table from data/poly.shp
 
 
-def ogr_mitab_2():
+def test_ogr_mitab_2():
 
     if gdaltest.mapinfo_ds is None:
         return 'skip'
@@ -114,7 +114,7 @@ def ogr_mitab_2():
 # coordinates are not stored with much precision in Mapinfo format.
 
 
-def ogr_mitab_3():
+def test_ogr_mitab_3():
     if gdaltest.mapinfo_drv is None:
         return 'skip'
 
@@ -152,7 +152,7 @@ def ogr_mitab_3():
 # Test ExecuteSQL() results layers with geometry.
 
 
-def ogr_mitab_4():
+def test_ogr_mitab_4():
 
     if gdaltest.mapinfo_ds is None:
         return 'skip'
@@ -175,7 +175,7 @@ def ogr_mitab_4():
 # Test spatial filtering.
 
 
-def ogr_mitab_5():
+def test_ogr_mitab_5():
 
     if gdaltest.mapinfo_ds is None:
         return 'skip'
@@ -196,7 +196,7 @@ def ogr_mitab_5():
 # Verify that Non-WGS84 datums are populated correctly
 
 
-def ogr_mitab_6():
+def test_ogr_mitab_6():
 
     if gdaltest.mapinfo_drv is None:
         return 'skip'
@@ -214,7 +214,7 @@ def ogr_mitab_6():
 # Create MIF file.
 
 
-def ogr_mitab_7():
+def test_ogr_mitab_7():
 
     gdaltest.mapinfo_ds = None
     gdaltest.mapinfo_drv.DeleteDataSource('tmp')
@@ -229,7 +229,7 @@ def ogr_mitab_7():
 # Create table from data/poly.shp
 
 
-def ogr_mitab_8():
+def test_ogr_mitab_8():
 
     if gdaltest.mapinfo_ds is None:
         return 'skip'
@@ -277,7 +277,7 @@ def ogr_mitab_8():
 # Verify that stuff we just wrote is still OK.
 
 
-def ogr_mitab_9():
+def test_ogr_mitab_9():
     if gdaltest.mapinfo_drv is None:
         return 'skip'
 
@@ -313,7 +313,7 @@ def ogr_mitab_9():
 # Read mif file with 2 character .mid delimiter and verify operation.
 
 
-def ogr_mitab_10():
+def test_ogr_mitab_10():
     if gdaltest.mapinfo_drv is None:
         return 'skip'
 
@@ -354,7 +354,7 @@ def ogr_mitab_10():
 #    http://trac.osgeo.org/gdal/ticket/1680
 
 
-def ogr_mitab_11():
+def test_ogr_mitab_11():
 
     if gdaltest.mapinfo_drv is None:
         return 'skip'
@@ -374,7 +374,7 @@ def ogr_mitab_11():
 # Verify that a newly created mif layer returns a non null layer definition
 
 
-def ogr_mitab_12():
+def test_ogr_mitab_12():
 
     if gdaltest.mapinfo_drv is None:
         return 'skip'
@@ -395,7 +395,7 @@ def ogr_mitab_12():
 # Verify that field widths and precisions are propagated correctly in TAB.
 
 
-def ogr_mitab_13():
+def test_ogr_mitab_13():
 
     if gdaltest.mapinfo_drv is None:
         return 'skip'
@@ -446,7 +446,7 @@ def ogr_mitab_13():
 # Verify that field widths and precisions are propagated correctly in MIF.
 
 
-def ogr_mitab_14():
+def test_ogr_mitab_14():
 
     if gdaltest.mapinfo_drv is None:
         return 'skip'
@@ -500,7 +500,7 @@ def ogr_mitab_14():
 # Test .mif without .mid (#5141)
 
 
-def ogr_mitab_15():
+def test_ogr_mitab_15():
 
     if gdaltest.mapinfo_drv is None:
         return 'skip'
@@ -538,7 +538,7 @@ def ogr_mitab_15():
 # Test empty .mif
 
 
-def ogr_mitab_16():
+def test_ogr_mitab_16():
 
     if gdaltest.mapinfo_drv is None:
         return 'skip'
@@ -559,7 +559,7 @@ def ogr_mitab_16():
 # Run test_ogrsf
 
 
-def ogr_mitab_17():
+def test_ogr_mitab_17():
 
     if gdaltest.mapinfo_drv is None:
         return 'skip'
@@ -588,7 +588,7 @@ def ogr_mitab_17():
 # (https://github.com/mapgears/mitab/issues/1)
 
 
-def ogr_mitab_18():
+def test_ogr_mitab_18():
 
     if gdaltest.mapinfo_drv is None:
         return 'skip'
@@ -627,7 +627,7 @@ def ogr_mitab_18():
 # (https://github.com/mapgears/mitab/issues/2)
 
 
-def ogr_mitab_19():
+def test_ogr_mitab_19():
 
     if gdaltest.mapinfo_drv is None:
         return 'skip'
@@ -648,7 +648,7 @@ def ogr_mitab_19():
 # (https://github.com/mapgears/mitab/issues/3)
 # Also test BOUNDS layer creation option (http://trac.osgeo.org/gdal/ticket/5642)
 
-def ogr_mitab_20():
+def test_ogr_mitab_20():
 
     if gdaltest.mapinfo_drv is None:
         return 'skip'
@@ -796,7 +796,7 @@ def ogr_mitab_20():
 # Create .tab without explicit field
 
 
-def ogr_mitab_21():
+def test_ogr_mitab_21():
 
     if gdaltest.mapinfo_drv is None:
         return 'skip'
@@ -826,7 +826,7 @@ def ogr_mitab_21():
 # Test append in update mode
 
 
-def ogr_mitab_22():
+def test_ogr_mitab_22():
 
     filename = '/vsimem/ogr_mitab_22.tab'
     for nb_features in (2, 1000):
@@ -885,7 +885,7 @@ def ogr_mitab_22():
 # Test creating features then reading
 
 
-def ogr_mitab_23():
+def test_ogr_mitab_23():
 
     filename = '/vsimem/ogr_mitab_23.tab'
 
@@ -921,7 +921,7 @@ def ogr_mitab_23():
 # Test creating features then reading then creating again then reading
 
 
-def ogr_mitab_24():
+def test_ogr_mitab_24():
 
     filename = '/vsimem/ogr_mitab_24.tab'
 
@@ -978,7 +978,7 @@ def ogr_mitab_24():
 # file
 
 
-def ogr_mitab_25():
+def test_ogr_mitab_25():
 
     filename = 'tmp/ogr_mitab_25.tab'
 
@@ -1053,7 +1053,7 @@ def ogr_mitab_25():
 # Test DeleteFeature()
 
 
-def ogr_mitab_26():
+def test_ogr_mitab_26():
 
     filename = '/vsimem/ogr_mitab_26.tab'
 
@@ -1144,7 +1144,7 @@ def ogr_mitab_26():
 # Test SetFeature()
 
 
-def ogr_mitab_27():
+def test_ogr_mitab_27():
 
     filename = '/vsimem/ogr_mitab_27.tab'
 
@@ -1310,7 +1310,7 @@ def generate_permutation(n):
 # Test updating object blocks with deleted objects
 
 
-def ogr_mitab_28():
+def test_ogr_mitab_28():
 
     filename = '/vsimem/ogr_mitab_28.tab'
 
@@ -1385,7 +1385,7 @@ def ogr_mitab_28():
 ###############################################################################
 # Test updating a file with compressed geometries.
 
-def ogr_mitab_29():
+def test_ogr_mitab_29():
     try:
         os.stat('tmp/cache/compr_symb_deleted_records.tab')
     except OSError:
@@ -1443,7 +1443,7 @@ def ogr_mitab_29():
 # Test SyncToDisk() in create mode
 
 
-def ogr_mitab_30(update=0):
+def test_ogr_mitab_30(update=0):
 
     filename = 'tmp/ogr_mitab_30.tab'
 
@@ -1550,15 +1550,15 @@ def ogr_mitab_30(update=0):
 # Test SyncToDisk() in update mode
 
 
-def ogr_mitab_31():
-    return ogr_mitab_30(update=1)
+def test_ogr_mitab_31():
+    return test_ogr_mitab_30(update=1)
 
 ###############################################################################
 # Check read support of non-spatial .tab/.data without .map or .id (#5718)
 # We only check read-only behaviour though.
 
 
-def ogr_mitab_32():
+def test_ogr_mitab_32():
 
     for update in (0, 1):
         ds = ogr.Open('data/aspatial-table.tab', update=update)
@@ -1586,7 +1586,7 @@ def ogr_mitab_32():
 # a single object block, without index block
 
 
-def ogr_mitab_33():
+def test_ogr_mitab_33():
 
     for update in (0, 1):
         ds = ogr.Open('data/single_point_mapinfo.tab', update=update)
@@ -1665,7 +1665,7 @@ def ogr_mitab_33():
 # Test updating a line that spans over several coordinate blocks
 
 
-def ogr_mitab_34():
+def test_ogr_mitab_34():
 
     filename = '/vsimem/ogr_mitab_34.tab'
     ds = ogr.GetDriverByName('MapInfo File').CreateDataSource(filename)
@@ -1770,7 +1770,7 @@ def get_coordsys_from_srs(srs):
     return data
 
 
-def ogr_mitab_35():
+def test_ogr_mitab_35():
 
     # Local/non-earth
     srs = osr.SpatialReference()
@@ -1997,7 +1997,7 @@ def ogr_mitab_35():
 # a single object block, without index block
 
 
-def ogr_mitab_36():
+def test_ogr_mitab_36():
 
     # Test modifying a new object
     shutil.copy('data/polygon_without_index.tab', 'tmp')
@@ -2040,7 +2040,7 @@ def ogr_mitab_36():
 # Simple testing of Seamless tables
 
 
-def ogr_mitab_37():
+def test_ogr_mitab_37():
 
     ds = ogr.Open('data/seamless.tab')
     lyr = ds.GetLayer(0)
@@ -2094,7 +2094,7 @@ def ogr_mitab_37():
 # Open MIF with MID with TAB delimiter and empty first field (#5405)
 
 
-def ogr_mitab_38():
+def test_ogr_mitab_38():
 
     ds = ogr.Open('data/empty_first_field_with_tab_delimiter.mif')
     lyr = ds.GetLayer(0)
@@ -2110,7 +2110,7 @@ def ogr_mitab_38():
 # Read various geometry types from .mif
 
 
-def ogr_mitab_39():
+def test_ogr_mitab_39():
 
     ds = ogr.Open('data/all_geoms.mif')
     lyr = ds.GetLayer(0)
@@ -2138,7 +2138,7 @@ def ogr_mitab_39():
 # Read various geometry types from .mif but potentially truncated
 
 
-def ogr_mitab_40():
+def test_ogr_mitab_40():
 
     content = open('data/all_geoms.mif', 'rt').read()
 
@@ -2159,7 +2159,7 @@ def ogr_mitab_40():
 # Read various geometry types from .tab
 
 
-def ogr_mitab_41():
+def test_ogr_mitab_41():
 
     ds = ogr.Open('data/all_geoms.tab')
     lyr = ds.GetLayer(0)
@@ -2187,7 +2187,7 @@ def ogr_mitab_41():
 # Read various geometry types from .tab with block size = 32256
 
 
-def ogr_mitab_42():
+def test_ogr_mitab_42():
 
     ds = ogr.Open('/vsizip/data/all_geoms_block_32256.zip')
     lyr = ds.GetLayer(0)
@@ -2215,7 +2215,7 @@ def ogr_mitab_42():
 # Test creating tab with block size = 32256
 
 
-def ogr_mitab_43():
+def test_ogr_mitab_43():
 
     src_ds = gdal.OpenEx('/vsizip/data/all_geoms_block_32256.zip')
     gdal.VectorTranslate('/vsimem/all_geoms_block_512.tab', src_ds, format='MapInfo File')
@@ -2270,7 +2270,7 @@ def ogr_mitab_43():
 # Test limitation on width and precision of numeric fields in creation (#6392)
 
 
-def ogr_mitab_44():
+def test_ogr_mitab_44():
 
     ds = gdaltest.mapinfo_drv.CreateDataSource('/vsimem/ogr_mitab_44.mif')
     lyr = ds.CreateLayer('test')
@@ -2298,7 +2298,7 @@ def ogr_mitab_44():
 # Test read/write MapInfo layers with encoding specified
 
 
-def ogr_mitab_45():
+def test_ogr_mitab_45():
 
     lyrNames = ['lyr1', 'lyr2']
     fldNames = ['field1', 'поле1']
@@ -2399,7 +2399,7 @@ def ogr_mitab_45():
 # Test read MapInfo layers with encoding specified
 
 
-def ogr_mitab_46():
+def test_ogr_mitab_46():
 
     dsNames = ['data/mitab/tab-win1251.TAB',
                'data/mitab/win1251.mif']
@@ -2460,7 +2460,7 @@ def ogr_mitab_46():
 # Test opening a dataset with a .ind file
 
 
-def ogr_mitab_47():
+def test_ogr_mitab_47():
 
     ds = ogr.Open('data/poly_indexed.tab')
     lyr = ds.GetLayer(0)
@@ -2486,7 +2486,7 @@ def ogr_mitab_47():
 # Test writing and reading LCC_1SP
 
 
-def ogr_mitab_48():
+def test_ogr_mitab_48():
 
     ds = ogr.GetDriverByName('MapInfo File').CreateDataSource('/vsimem/test.mif')
     sr = osr.SpatialReference()
@@ -2548,7 +2548,7 @@ def ogr_mitab_48():
 # Test reading an aspatial TAB file.
 
 
-def ogr_mitab_49_aspatial():
+def test_ogr_mitab_49_aspatial():
 
     ds = ogr.GetDriverByName('MapInfo File').Open('data/mitab/aspatial.tab')
     lyr = ds.GetLayer(0)
@@ -2572,7 +2572,7 @@ def ogr_mitab_49_aspatial():
 # Test creating an indexed field
 
 
-def ogr_mitab_tab_field_index_creation():
+def test_ogr_mitab_tab_field_index_creation():
 
     layername = 'ogr_mitab_tab_field_index_creation'
     filename = '/vsimem/' + layername + '.tab'
@@ -2615,7 +2615,7 @@ def ogr_mitab_tab_field_index_creation():
 # Test reading a tab_view file
 
 
-def ogr_mitab_tab_view():
+def test_ogr_mitab_tab_view():
 
     ds = ogr.Open('data/mitab/view_first_table_second_table.tab')
     lyr = ds.GetLayer(0)
@@ -2647,7 +2647,7 @@ def ogr_mitab_tab_view():
 ###############################################################################
 
 
-def ogr_mitab_style():
+def test_ogr_mitab_style():
 
     tmpfile = '/vsimem/ogr_mitab_style.tab'
     ds = ogr.GetDriverByName('MapInfo File').CreateDataSource(tmpfile)
@@ -2693,7 +2693,7 @@ def ogr_mitab_style():
 ###############################################################################
 
 
-def ogr_mitab_tab_write_field_name_with_dot():
+def test_ogr_mitab_tab_write_field_name_with_dot():
 
     tmpfile = '/vsimem/ogr_mitab_tab_write_field_name_with_dot.tab'
     ds = ogr.GetDriverByName('MapInfo File').CreateDataSource(tmpfile)
@@ -2721,7 +2721,7 @@ def ogr_mitab_tab_write_field_name_with_dot():
 #
 
 
-def ogr_mitab_cleanup():
+def test_ogr_mitab_cleanup():
 
     if gdaltest.mapinfo_ds is None:
         return 'skip'
@@ -2737,60 +2737,60 @@ def ogr_mitab_cleanup():
 
 
 gdaltest_list = [
-    ogr_mitab_1,
-    ogr_mitab_2,
-    ogr_mitab_3,
-    ogr_mitab_4,
-    ogr_mitab_5,
-    ogr_mitab_6,
-    ogr_mitab_7,
-    ogr_mitab_8,
-    ogr_mitab_9,
-    ogr_mitab_10,
-    ogr_mitab_11,
-    ogr_mitab_12,
-    ogr_mitab_13,
-    ogr_mitab_14,
-    ogr_mitab_15,
-    ogr_mitab_16,
-    ogr_mitab_17,
-    ogr_mitab_18,
-    ogr_mitab_19,
-    ogr_mitab_20,
-    ogr_mitab_21,
-    ogr_mitab_22,
-    ogr_mitab_23,
-    ogr_mitab_24,
-    ogr_mitab_25,
-    ogr_mitab_26,
-    ogr_mitab_27,
-    ogr_mitab_28,
-    ogr_mitab_29,
-    ogr_mitab_30,
-    ogr_mitab_31,
-    ogr_mitab_32,
-    ogr_mitab_33,
-    ogr_mitab_34,
-    ogr_mitab_35,
-    ogr_mitab_36,
-    ogr_mitab_37,
-    ogr_mitab_38,
-    ogr_mitab_39,
-    ogr_mitab_40,
-    ogr_mitab_41,
-    ogr_mitab_42,
-    ogr_mitab_43,
-    ogr_mitab_44,
-    ogr_mitab_45,
-    ogr_mitab_46,
-    ogr_mitab_47,
-    ogr_mitab_48,
-    ogr_mitab_49_aspatial,
-    ogr_mitab_tab_field_index_creation,
-    ogr_mitab_tab_view,
-    ogr_mitab_style,
-    ogr_mitab_tab_write_field_name_with_dot,
-    ogr_mitab_cleanup
+    test_ogr_mitab_1,
+    test_ogr_mitab_2,
+    test_ogr_mitab_3,
+    test_ogr_mitab_4,
+    test_ogr_mitab_5,
+    test_ogr_mitab_6,
+    test_ogr_mitab_7,
+    test_ogr_mitab_8,
+    test_ogr_mitab_9,
+    test_ogr_mitab_10,
+    test_ogr_mitab_11,
+    test_ogr_mitab_12,
+    test_ogr_mitab_13,
+    test_ogr_mitab_14,
+    test_ogr_mitab_15,
+    test_ogr_mitab_16,
+    test_ogr_mitab_17,
+    test_ogr_mitab_18,
+    test_ogr_mitab_19,
+    test_ogr_mitab_20,
+    test_ogr_mitab_21,
+    test_ogr_mitab_22,
+    test_ogr_mitab_23,
+    test_ogr_mitab_24,
+    test_ogr_mitab_25,
+    test_ogr_mitab_26,
+    test_ogr_mitab_27,
+    test_ogr_mitab_28,
+    test_ogr_mitab_29,
+    test_ogr_mitab_30,
+    test_ogr_mitab_31,
+    test_ogr_mitab_32,
+    test_ogr_mitab_33,
+    test_ogr_mitab_34,
+    test_ogr_mitab_35,
+    test_ogr_mitab_36,
+    test_ogr_mitab_37,
+    test_ogr_mitab_38,
+    test_ogr_mitab_39,
+    test_ogr_mitab_40,
+    test_ogr_mitab_41,
+    test_ogr_mitab_42,
+    test_ogr_mitab_43,
+    test_ogr_mitab_44,
+    test_ogr_mitab_45,
+    test_ogr_mitab_46,
+    test_ogr_mitab_47,
+    test_ogr_mitab_48,
+    test_ogr_mitab_49_aspatial,
+    test_ogr_mitab_tab_field_index_creation,
+    test_ogr_mitab_tab_view,
+    test_ogr_mitab_style,
+    test_ogr_mitab_tab_write_field_name_with_dot,
+    test_ogr_mitab_cleanup
 ]
 
 if __name__ == '__main__':
diff --git a/autotest/ogr/ogr_mongodb.py b/autotest/ogr/ogr_mongodb.py
index 3742d636fe3b..cdde25b5f286 100755
--- a/autotest/ogr/ogr_mongodb.py
+++ b/autotest/ogr/ogr_mongodb.py
@@ -44,7 +44,7 @@
 # Test if driver is available
 
 
-def ogr_mongodb_init():
+def test_ogr_mongodb_init():
 
     ogrtest.mongodb_drv = None
 
@@ -100,7 +100,7 @@ def ogr_mongodb_init():
 # Test various open methods
 
 
-def ogr_mongodb_1():
+def test_ogr_mongodb_1():
     if ogrtest.mongodb_drv is None:
         return 'skip'
 
@@ -272,7 +272,7 @@ def ogr_mongodb_1():
 # Basic tests
 
 
-def ogr_mongodb_2():
+def test_ogr_mongodb_2():
     if ogrtest.mongodb_drv is None:
         return 'skip'
 
@@ -919,7 +919,7 @@ def ogr_mongodb_2():
 # test_ogrsf
 
 
-def ogr_mongodb_3():
+def test_ogr_mongodb_3():
     if ogrtest.mongodb_drv is None:
         return 'skip'
 
@@ -938,7 +938,7 @@ def ogr_mongodb_3():
 # Cleanup
 
 
-def ogr_mongodb_cleanup():
+def test_ogr_mongodb_cleanup():
     if ogrtest.mongodb_drv is None:
         return 'skip'
 
@@ -964,11 +964,11 @@ def ogr_mongodb_cleanup():
 
 
 gdaltest_list = [
-    ogr_mongodb_init,
-    ogr_mongodb_1,
-    ogr_mongodb_2,
-    ogr_mongodb_3,
-    ogr_mongodb_cleanup,
+    test_ogr_mongodb_init,
+    test_ogr_mongodb_1,
+    test_ogr_mongodb_2,
+    test_ogr_mongodb_3,
+    test_ogr_mongodb_cleanup,
 ]
 
 if __name__ == '__main__':
diff --git a/autotest/ogr/ogr_mssqlspatial.py b/autotest/ogr/ogr_mssqlspatial.py
index e174aa1f8a85..b8ec21a8a2bb 100755
--- a/autotest/ogr/ogr_mssqlspatial.py
+++ b/autotest/ogr/ogr_mssqlspatial.py
@@ -42,7 +42,7 @@
 # Open Database.
 
 
-def ogr_mssqlspatial_1():
+def test_ogr_mssqlspatial_1():
 
     gdaltest.mssqlspatial_ds = None
 
@@ -81,7 +81,7 @@ def ogr_mssqlspatial_1():
 # Create table from data/poly.shp
 
 
-def ogr_mssqlspatial_2():
+def test_ogr_mssqlspatial_2():
 
     if gdaltest.mssqlspatial_ds is None:
         return 'skip'
@@ -139,7 +139,7 @@ def ogr_mssqlspatial_2():
 # Verify that stuff we just wrote is still OK.
 
 
-def ogr_mssqlspatial_3():
+def test_ogr_mssqlspatial_3():
     if gdaltest.mssqlspatial_ds is None:
         return 'skip'
 
@@ -195,7 +195,7 @@ def ogr_mssqlspatial_3():
 # geometries are still OK.
 
 
-def ogr_mssqlspatial_4():
+def test_ogr_mssqlspatial_4():
     if gdaltest.mssqlspatial_ds is None:
         return 'skip'
 
@@ -256,7 +256,7 @@ def ogr_mssqlspatial_4():
 # Run test_ogrsf
 
 
-def ogr_mssqlspatial_test_ogrsf():
+def test_ogr_mssqlspatial_test_ogrsf():
 
     if gdaltest.mssqlspatial_ds is None:
         return 'skip'
@@ -278,7 +278,7 @@ def ogr_mssqlspatial_test_ogrsf():
 # column but is not registered in the "geometry_columns" table.
 
 
-def ogr_mssqlspatial_create_feature_in_unregistered_table():
+def test_ogr_mssqlspatial_create_feature_in_unregistered_table():
     if gdaltest.mssqlspatial_ds is None:
         return 'skip'
 
@@ -358,7 +358,7 @@ def ogr_mssqlspatial_create_feature_in_unregistered_table():
 #
 
 
-def ogr_mssqlspatial_cleanup():
+def test_ogr_mssqlspatial_cleanup():
 
     if gdaltest.mssqlspatial_ds is None:
         return 'skip'
@@ -375,13 +375,13 @@ def ogr_mssqlspatial_cleanup():
 
 
 gdaltest_list = [
-    ogr_mssqlspatial_1,
-    ogr_mssqlspatial_2,
-    ogr_mssqlspatial_3,
-    ogr_mssqlspatial_4,
-    ogr_mssqlspatial_test_ogrsf,
-    ogr_mssqlspatial_create_feature_in_unregistered_table,
-    ogr_mssqlspatial_cleanup
+    test_ogr_mssqlspatial_1,
+    test_ogr_mssqlspatial_2,
+    test_ogr_mssqlspatial_3,
+    test_ogr_mssqlspatial_4,
+    test_ogr_mssqlspatial_test_ogrsf,
+    test_ogr_mssqlspatial_create_feature_in_unregistered_table,
+    test_ogr_mssqlspatial_cleanup
 ]
 
 if __name__ == '__main__':
diff --git a/autotest/ogr/ogr_mvt.py b/autotest/ogr/ogr_mvt.py
index 723357d8b7e2..5fbe9046fb9d 100644
--- a/autotest/ogr/ogr_mvt.py
+++ b/autotest/ogr/ogr_mvt.py
@@ -42,7 +42,7 @@
 ###############################################################################
 
 
-def ogr_mvt_datatypes():
+def test_ogr_mvt_datatypes():
 
     # With metadata.json
     ds = ogr.Open('data/mvt/datatypes/0/0/0.pbf')
@@ -132,7 +132,7 @@ def ogr_mvt_datatypes():
 ###############################################################################
 
 
-def ogr_mvt_datatype_promotion():
+def test_ogr_mvt_datatype_promotion():
 
     ds = ogr.Open('data/mvt/datatype_promotion.pbf')
     tab = [('int_to_int64', ogr.OFTInteger64),
@@ -159,7 +159,7 @@ def ogr_mvt_datatype_promotion():
 ###############################################################################
 
 
-def ogr_mvt_limit_cases():
+def test_ogr_mvt_limit_cases():
 
     with gdaltest.error_handler():
         ds = ogr.Open('data/mvt/limit_cases.pbf')
@@ -214,7 +214,7 @@ def ogr_mvt_limit_cases():
 ###############################################################################
 
 
-def ogr_mvt_with_extension_fields():
+def test_ogr_mvt_with_extension_fields():
 
     ds = ogr.Open('data/mvt/with_extension_fields.pbf')
     lyr = ds.GetLayer(0)
@@ -229,7 +229,7 @@ def ogr_mvt_with_extension_fields():
 ###############################################################################
 
 
-def ogr_mvt_mixed():
+def test_ogr_mvt_mixed():
 
     ds = ogr.Open('data/mvt/mixed/0/0/0.pbf')
     lyr = ds.GetLayer(0)
@@ -249,7 +249,7 @@ def ogr_mvt_mixed():
 ###############################################################################
 
 
-def ogr_mvt_linestring():
+def test_ogr_mvt_linestring():
 
     ds = ogr.Open('data/mvt/linestring/0/0/0.pbf')
     lyr = ds.GetLayer(0)
@@ -270,7 +270,7 @@ def ogr_mvt_linestring():
 ###############################################################################
 
 
-def ogr_mvt_multilinestring():
+def test_ogr_mvt_multilinestring():
 
     ds = ogr.Open('data/mvt/multilinestring/0/0/0.pbf')
     lyr = ds.GetLayer(0)
@@ -291,7 +291,7 @@ def ogr_mvt_multilinestring():
 
 ###############################################################################
 
-def ogr_mvt_polygon():
+def test_ogr_mvt_polygon():
 
     ds = ogr.Open('data/mvt/polygon/0/0/0.pbf')
     lyr = ds.GetLayer(0)
@@ -312,7 +312,7 @@ def ogr_mvt_polygon():
 ###############################################################################
 
 
-def ogr_mvt_point_polygon():
+def test_ogr_mvt_point_polygon():
 
     ds = ogr.Open('data/mvt/point_polygon/0')
     lyr = ds.GetLayer(0)
@@ -331,7 +331,7 @@ def ogr_mvt_point_polygon():
 ###############################################################################
 
 
-def ogr_mvt_point_polygon_clip():
+def test_ogr_mvt_point_polygon_clip():
 
     if not ogrtest.have_geos() or gdal.GetConfigOption('OGR_MVT_CLIP') is not None:
         return 'skip'
@@ -354,7 +354,7 @@ def ogr_mvt_point_polygon_clip():
 ###############################################################################
 
 
-def ogr_mvt_tileset_without_readdir():
+def test_ogr_mvt_tileset_without_readdir():
 
     with gdaltest.config_option('MVT_USE_READDIR', 'NO'):
         ds = gdal.OpenEx('data/mvt/linestring/0')
@@ -368,7 +368,7 @@ def ogr_mvt_tileset_without_readdir():
 ###############################################################################
 
 
-def ogr_mvt_tileset_tilegl():
+def test_ogr_mvt_tileset_tilegl():
 
     ds = ogr.Open('data/mvt/linestring_tilejson_gl/0')
     lyr = ds.GetLayer(0)
@@ -385,7 +385,7 @@ def ogr_mvt_tileset_tilegl():
 ###############################################################################
 
 
-def ogr_mvt_tileset_without_metadata_file():
+def test_ogr_mvt_tileset_without_metadata_file():
 
     ds = gdal.OpenEx('data/mvt/point_polygon/1',
                      open_options=['METADATA_FILE=', 'CLIP=NO'])
@@ -407,7 +407,7 @@ def ogr_mvt_tileset_without_metadata_file():
 ###############################################################################
 
 
-def ogr_mvt_tileset_json_field():
+def test_ogr_mvt_tileset_json_field():
 
     ds = gdal.OpenEx('data/mvt/datatypes/0',
                      open_options=['METADATA_FILE=', 'JSON_FIELD=YES', 'CLIP=NO'])
@@ -443,7 +443,7 @@ def ogr_mvt_tileset_json_field():
 ###############################################################################
 
 
-def ogr_mvt_open_variants():
+def test_ogr_mvt_open_variants():
 
     expected_geom = 'MULTILINESTRING ((215246.671651058 6281289.23636264,332653.947097085 6447616.20991119))'
 
@@ -484,7 +484,7 @@ def ogr_mvt_open_variants():
 ###############################################################################
 
 
-def ogr_mvt_xyz_options():
+def test_ogr_mvt_xyz_options():
 
     ds = gdal.OpenEx('data/mvt/datatypes/0/0/0.pbf',
                      open_options=['X=1', 'Y=2', 'Z=3'])
@@ -500,7 +500,7 @@ def ogr_mvt_xyz_options():
 ###############################################################################
 
 
-def ogr_mvt_test_ogrsf_pbf():
+def test_ogr_mvt_test_ogrsf_pbf():
 
     import test_cli_utilities
     if test_cli_utilities.get_test_ogrsf_path() is None:
@@ -518,7 +518,7 @@ def ogr_mvt_test_ogrsf_pbf():
 ###############################################################################
 
 
-def ogr_mvt_test_ogrsf_directory():
+def test_ogr_mvt_test_ogrsf_directory():
 
     import test_cli_utilities
     if test_cli_utilities.get_test_ogrsf_path() is None:
@@ -536,7 +536,7 @@ def ogr_mvt_test_ogrsf_directory():
 ###############################################################################
 
 
-def ogr_mvt_mbtiles():
+def test_ogr_mvt_mbtiles():
 
     if ogr.GetDriverByName('MBTILES') is None:
         return 'skip'
@@ -560,7 +560,7 @@ def ogr_mvt_mbtiles():
 ###############################################################################
 
 
-def ogr_mvt_mbtiles_json_field():
+def test_ogr_mvt_mbtiles_json_field():
 
     if ogr.GetDriverByName('MBTILES') is None:
         return 'skip'
@@ -591,7 +591,7 @@ def ogr_mvt_mbtiles_json_field():
 ###############################################################################
 
 
-def ogr_mvt_mbtiles_json_field_auto():
+def test_ogr_mvt_mbtiles_json_field_auto():
 
     if ogr.GetDriverByName('MBTILES') is None:
         return 'skip'
@@ -622,7 +622,7 @@ def ogr_mvt_mbtiles_json_field_auto():
 ###############################################################################
 
 
-def ogr_mvt_mbtiles_test_ogrsf():
+def test_ogr_mvt_mbtiles_test_ogrsf():
 
     import test_cli_utilities
     if test_cli_utilities.get_test_ogrsf_path() is None:
@@ -643,7 +643,7 @@ def ogr_mvt_mbtiles_test_ogrsf():
 ###############################################################################
 
 
-def ogr_mvt_mbtiles_open_vector_in_raster_mode():
+def test_ogr_mvt_mbtiles_open_vector_in_raster_mode():
 
     if ogr.GetDriverByName('MBTILES') is None:
         return 'skip'
@@ -657,7 +657,7 @@ def ogr_mvt_mbtiles_open_vector_in_raster_mode():
 ###############################################################################
 
 
-def ogr_mvt_x_y_z_filename_scheme():
+def test_ogr_mvt_x_y_z_filename_scheme():
 
     tmpfilename = '/vsimem/0-0-0.pbf'
     gdal.FileFromMemBuffer(tmpfilename,
@@ -676,7 +676,7 @@ def ogr_mvt_x_y_z_filename_scheme():
 ###############################################################################
 
 
-def ogr_mvt_polygon_larger_than_header():
+def test_ogr_mvt_polygon_larger_than_header():
 
     ds = gdal.OpenEx('data/mvt/polygon_larger_than_header.pbf',
                      open_options=['CLIP=NO'])
@@ -690,7 +690,7 @@ def ogr_mvt_polygon_larger_than_header():
 ###############################################################################
 
 
-def ogr_mvt_errors():
+def test_ogr_mvt_errors():
 
     if ogr.Open('MVT:/i_do_not/exist') is not None:
         gdaltest.post_reason('fail')
@@ -761,7 +761,7 @@ def ogr_mvt_errors():
 ###############################################################################
 
 
-def ogr_mvt_http_start():
+def test_ogr_mvt_http_start():
 
     gdaltest.webserver_process = None
     gdaltest.webserver_port = 0
@@ -778,7 +778,7 @@ def ogr_mvt_http_start():
 ###############################################################################
 
 
-def ogr_mvt_http():
+def test_ogr_mvt_http():
 
     if gdaltest.webserver_port == 0:
         return 'skip'
@@ -872,7 +872,7 @@ def ogr_mvt_http():
 ###############################################################################
 
 
-def ogr_mvt_http_stop():
+def test_ogr_mvt_http_stop():
 
     if gdaltest.webserver_port == 0:
         return 'skip'
@@ -884,7 +884,7 @@ def ogr_mvt_http_stop():
 ###############################################################################
 
 
-def ogr_mvt_write_one_layer():
+def test_ogr_mvt_write_one_layer():
 
     if not ogrtest.have_geos() or ogr.GetDriverByName('SQLITE') is None:
         return 'skip'
@@ -1209,7 +1209,7 @@ def ogr_mvt_write_one_layer():
 ###############################################################################
 
 
-def ogr_mvt_write_conf():
+def test_ogr_mvt_write_conf():
 
     if not ogrtest.have_geos() or ogr.GetDriverByName('SQLITE') is None:
         return 'skip'
@@ -1289,7 +1289,7 @@ def ogr_mvt_write_conf():
 ###############################################################################
 
 
-def ogr_mvt_write_mbtiles():
+def test_ogr_mvt_write_mbtiles():
 
     if not ogrtest.have_geos() or ogr.GetDriverByName('SQLITE') is None:
         return 'skip'
@@ -1326,7 +1326,7 @@ def ogr_mvt_write_mbtiles():
 ###############################################################################
 
 
-def ogr_mvt_write_limitations_max_size():
+def test_ogr_mvt_write_limitations_max_size():
 
     if not ogrtest.have_geos() or ogr.GetDriverByName('SQLITE') is None:
         return 'skip'
@@ -1377,7 +1377,7 @@ def ogr_mvt_write_limitations_max_size():
 ###############################################################################
 
 
-def ogr_mvt_write_polygon_repaired():
+def test_ogr_mvt_write_polygon_repaired():
 
     if not ogrtest.have_geos() or ogr.GetDriverByName('SQLITE') is None:
         return 'skip'
@@ -1434,7 +1434,7 @@ def ogr_mvt_write_polygon_repaired():
 ###############################################################################
 
 
-def ogr_mvt_write_conflicting_innner_ring():
+def test_ogr_mvt_write_conflicting_innner_ring():
 
     if not ogrtest.have_geos() or ogr.GetDriverByName('SQLITE') is None:
         return 'skip'
@@ -1473,7 +1473,7 @@ def ogr_mvt_write_conflicting_innner_ring():
 ###############################################################################
 
 
-def ogr_mvt_write_limitations_max_size_polygon():
+def test_ogr_mvt_write_limitations_max_size_polygon():
 
     if not ogrtest.have_geos() or ogr.GetDriverByName('SQLITE') is None:
         return 'skip'
@@ -1513,7 +1513,7 @@ def ogr_mvt_write_limitations_max_size_polygon():
 ###############################################################################
 
 
-def ogr_mvt_write_limitations_max_features():
+def test_ogr_mvt_write_limitations_max_features():
 
     if not ogrtest.have_geos() or ogr.GetDriverByName('SQLITE') is None:
         return 'skip'
@@ -1560,7 +1560,7 @@ def ogr_mvt_write_limitations_max_features():
 ###############################################################################
 
 
-def ogr_mvt_write_custom_tiling_scheme():
+def test_ogr_mvt_write_custom_tiling_scheme():
 
     if not ogrtest.have_geos() or ogr.GetDriverByName('SQLITE') is None:
         return 'skip'
@@ -1603,7 +1603,7 @@ def ogr_mvt_write_custom_tiling_scheme():
 ###############################################################################
 
 
-def ogr_mvt_write_errors():
+def test_ogr_mvt_write_errors():
 
     if not ogrtest.have_geos() or ogr.GetDriverByName('SQLITE') is None:
         return 'skip'
@@ -1791,7 +1791,7 @@ def ogr_mvt_write_errors():
 #
 
 
-def ogr_mvt_write_reuse_temp_db():
+def test_ogr_mvt_write_reuse_temp_db():
 
     if not ogrtest.have_geos() or ogr.GetDriverByName('SQLITE') is None:
         return 'skip'
@@ -1836,46 +1836,46 @@ def ogr_mvt_write_reuse_temp_db():
 #
 
 gdaltest_list = [
-    ogr_mvt_datatypes,
-    ogr_mvt_datatype_promotion,
-    ogr_mvt_limit_cases,
-    ogr_mvt_with_extension_fields,
-    ogr_mvt_mixed,
-    ogr_mvt_linestring,
-    ogr_mvt_multilinestring,
-    ogr_mvt_polygon,
-    ogr_mvt_point_polygon,
-    ogr_mvt_point_polygon_clip,
-    ogr_mvt_tileset_without_readdir,
-    ogr_mvt_tileset_without_metadata_file,
-    ogr_mvt_tileset_json_field,
-    ogr_mvt_tileset_tilegl,
-    ogr_mvt_open_variants,
-    ogr_mvt_xyz_options,
-    ogr_mvt_test_ogrsf_pbf,
-    ogr_mvt_test_ogrsf_directory,
-    ogr_mvt_mbtiles,
-    ogr_mvt_mbtiles_json_field,
-    ogr_mvt_mbtiles_json_field_auto,
-    ogr_mvt_mbtiles_open_vector_in_raster_mode,
-    ogr_mvt_mbtiles_test_ogrsf,
-    ogr_mvt_x_y_z_filename_scheme,
-    ogr_mvt_polygon_larger_than_header,
-    ogr_mvt_errors,
-    ogr_mvt_http_start,
-    ogr_mvt_http,
-    ogr_mvt_http_stop,
-    ogr_mvt_write_one_layer,
-    ogr_mvt_write_conf,
-    ogr_mvt_write_mbtiles,
-    ogr_mvt_write_polygon_repaired,
-    ogr_mvt_write_conflicting_innner_ring,
-    ogr_mvt_write_limitations_max_size,
-    ogr_mvt_write_limitations_max_size_polygon,
-    ogr_mvt_write_limitations_max_features,
-    ogr_mvt_write_custom_tiling_scheme,
-    ogr_mvt_write_errors,
-    ogr_mvt_write_reuse_temp_db,
+    test_ogr_mvt_datatypes,
+    test_ogr_mvt_datatype_promotion,
+    test_ogr_mvt_limit_cases,
+    test_ogr_mvt_with_extension_fields,
+    test_ogr_mvt_mixed,
+    test_ogr_mvt_linestring,
+    test_ogr_mvt_multilinestring,
+    test_ogr_mvt_polygon,
+    test_ogr_mvt_point_polygon,
+    test_ogr_mvt_point_polygon_clip,
+    test_ogr_mvt_tileset_without_readdir,
+    test_ogr_mvt_tileset_without_metadata_file,
+    test_ogr_mvt_tileset_json_field,
+    test_ogr_mvt_tileset_tilegl,
+    test_ogr_mvt_open_variants,
+    test_ogr_mvt_xyz_options,
+    test_ogr_mvt_test_ogrsf_pbf,
+    test_ogr_mvt_test_ogrsf_directory,
+    test_ogr_mvt_mbtiles,
+    test_ogr_mvt_mbtiles_json_field,
+    test_ogr_mvt_mbtiles_json_field_auto,
+    test_ogr_mvt_mbtiles_open_vector_in_raster_mode,
+    test_ogr_mvt_mbtiles_test_ogrsf,
+    test_ogr_mvt_x_y_z_filename_scheme,
+    test_ogr_mvt_polygon_larger_than_header,
+    test_ogr_mvt_errors,
+    test_ogr_mvt_http_start,
+    test_ogr_mvt_http,
+    test_ogr_mvt_http_stop,
+    test_ogr_mvt_write_one_layer,
+    test_ogr_mvt_write_conf,
+    test_ogr_mvt_write_mbtiles,
+    test_ogr_mvt_write_polygon_repaired,
+    test_ogr_mvt_write_conflicting_innner_ring,
+    test_ogr_mvt_write_limitations_max_size,
+    test_ogr_mvt_write_limitations_max_size_polygon,
+    test_ogr_mvt_write_limitations_max_features,
+    test_ogr_mvt_write_custom_tiling_scheme,
+    test_ogr_mvt_write_errors,
+    test_ogr_mvt_write_reuse_temp_db,
 ]
 
 # gdaltest_list = [ ogr_mvt_http_start, ogr_mvt_http, ogr_mvt_http_stop ]
diff --git a/autotest/ogr/ogr_mysql.py b/autotest/ogr/ogr_mysql.py
index afb037367f05..59de0d583f4b 100755
--- a/autotest/ogr/ogr_mysql.py
+++ b/autotest/ogr/ogr_mysql.py
@@ -50,7 +50,7 @@
 # Open Database.
 
 
-def ogr_mysql_1():
+def test_ogr_mysql_1():
 
     gdaltest.mysql_ds = None
 
@@ -81,7 +81,7 @@ def ogr_mysql_1():
 # Create table from data/poly.shp
 
 
-def ogr_mysql_2():
+def test_ogr_mysql_2():
 
     if gdaltest.mysql_ds is None:
         return 'skip'
@@ -138,7 +138,7 @@ def ogr_mysql_2():
 # Verify that stuff we just wrote is still OK.
 
 
-def ogr_mysql_3():
+def test_ogr_mysql_3():
     if gdaltest.mysql_ds is None:
         return 'skip'
 
@@ -191,7 +191,7 @@ def ogr_mysql_3():
 # geometries are still OK.
 
 
-def ogr_mysql_4():
+def test_ogr_mysql_4():
 
     if gdaltest.mysql_ds is None:
         return 'skip'
@@ -253,7 +253,7 @@ def ogr_mysql_4():
 # Test ExecuteSQL() results layers without geometry.
 
 
-def ogr_mysql_5():
+def test_ogr_mysql_5():
 
     if gdaltest.mysql_ds is None:
         return 'skip'
@@ -277,7 +277,7 @@ def ogr_mysql_5():
 # Test ExecuteSQL() results layers with geometry.
 
 
-def ogr_mysql_6():
+def test_ogr_mysql_6():
 
     if gdaltest.mysql_ds is None:
         return 'skip'
@@ -314,7 +314,7 @@ def ogr_mysql_6():
 # Test spatial filtering.
 
 
-def ogr_mysql_7():
+def test_ogr_mysql_7():
 
     if gdaltest.mysql_ds is None:
         return 'skip'
@@ -354,7 +354,7 @@ def ogr_mysql_7():
 # No geometry in this test.
 
 
-def ogr_mysql_8():
+def test_ogr_mysql_8():
 
     if gdaltest.mysql_ds is None:
         return 'skip'
@@ -388,7 +388,7 @@ def ogr_mysql_8():
 # Verify inplace update of a feature with SetFeature().
 
 
-def ogr_mysql_9():
+def test_ogr_mysql_9():
 
     if gdaltest.mysql_ds is None:
         return 'skip'
@@ -448,7 +448,7 @@ def ogr_mysql_9():
 # Verify that DeleteFeature() works properly.
 
 
-def ogr_mysql_10():
+def test_ogr_mysql_10():
 
     if gdaltest.mysql_ds is None:
         return 'skip'
@@ -479,7 +479,7 @@ def ogr_mysql_10():
 ###############################################################################
 # Test very large query.
 
-def ogr_mysql_15():
+def test_ogr_mysql_15():
 
     if gdaltest.mysql_ds is None:
         return 'skip'
@@ -502,7 +502,7 @@ def ogr_mysql_15():
 ###############################################################################
 # Test very large statement.
 
-def ogr_mysql_16():
+def test_ogr_mysql_16():
 
     if gdaltest.mysql_ds is None:
         return 'skip'
@@ -528,7 +528,7 @@ def ogr_mysql_16():
 # Test requesting a non-existent table by name (bug 1480).
 
 
-def ogr_mysql_17():
+def test_ogr_mysql_17():
 
     if gdaltest.mysql_ds is None:
         return 'skip'
@@ -570,7 +570,7 @@ def ogr_mysql_18():
 # Test reading a layer extent
 
 
-def ogr_mysql_19():
+def test_ogr_mysql_19():
 
     if gdaltest.mysql_ds is None:
         return 'skip'
@@ -599,7 +599,7 @@ def ogr_mysql_19():
 # Test using reserved keywords as column names and table names
 
 
-def ogr_mysql_20():
+def test_ogr_mysql_20():
 
     if gdaltest.mysql_ds is None:
         return 'skip'
@@ -628,7 +628,7 @@ def ogr_mysql_20():
 # Test inserting NULL geometries into a table with a spatial index -> must FAIL
 
 
-def ogr_mysql_21():
+def test_ogr_mysql_21():
 
     if gdaltest.mysql_ds is None:
         return 'skip'
@@ -656,7 +656,7 @@ def ogr_mysql_21():
 # Test inserting NULL geometries into a table without a spatial index
 
 
-def ogr_mysql_22():
+def test_ogr_mysql_22():
 
     if gdaltest.mysql_ds is None:
         return 'skip'
@@ -682,7 +682,7 @@ def ogr_mysql_22():
 # Check for right precision
 
 
-def ogr_mysql_23():
+def test_ogr_mysql_23():
 
     if gdaltest.mysql_ds is None:
         return 'skip'
@@ -727,7 +727,7 @@ def ogr_mysql_23():
 # Run test_ogrsf
 
 
-def ogr_mysql_24():
+def test_ogr_mysql_24():
 
     if gdaltest.mysql_ds is None:
         return 'skip'
@@ -748,7 +748,7 @@ def ogr_mysql_24():
 # Test 64 bit FID
 
 
-def ogr_mysql_72():
+def test_ogr_mysql_72():
 
     if gdaltest.mysql_ds is None:
         return 'skip'
@@ -804,7 +804,7 @@ def ogr_mysql_72():
 # Test nullable
 
 
-def ogr_mysql_25():
+def test_ogr_mysql_25():
 
     if gdaltest.mysql_ds is None:
         return 'skip'
@@ -865,7 +865,7 @@ def ogr_mysql_25():
 # Test default values
 
 
-def ogr_mysql_26():
+def test_ogr_mysql_26():
 
     if gdaltest.mysql_ds is None:
         return 'skip'
@@ -961,7 +961,7 @@ def ogr_mysql_26():
 #
 
 
-def ogr_mysql_longlat():
+def test_ogr_mysql_longlat():
 
     if gdaltest.mysql_ds is None:
         return 'skip'
@@ -1002,7 +1002,7 @@ def ogr_mysql_longlat():
 #
 
 
-def ogr_mysql_cleanup():
+def test_ogr_mysql_cleanup():
 
     if gdaltest.mysql_ds is None:
         return 'skip'
@@ -1027,34 +1027,34 @@ def ogr_mysql_cleanup():
 
 
 gdaltest_list = [
-    ogr_mysql_1,
+    test_ogr_mysql_1,
     #    ogr_mysql_cleanup,
-    ogr_mysql_2,
-    ogr_mysql_19,
-    ogr_mysql_3,
-    ogr_mysql_4,
-    ogr_mysql_5,
-    ogr_mysql_6,
-    ogr_mysql_7,
-    ogr_mysql_8,
-    ogr_mysql_9,
-    ogr_mysql_10,
+    test_ogr_mysql_2,
+    test_ogr_mysql_19,
+    test_ogr_mysql_3,
+    test_ogr_mysql_4,
+    test_ogr_mysql_5,
+    test_ogr_mysql_6,
+    test_ogr_mysql_7,
+    test_ogr_mysql_8,
+    test_ogr_mysql_9,
+    test_ogr_mysql_10,
     # ogr_mysql_11 to _14 are PG only features
-    ogr_mysql_15,
-    ogr_mysql_16,
-    ogr_mysql_17,
+    test_ogr_mysql_15,
+    test_ogr_mysql_16,
+    test_ogr_mysql_17,
     # Fails but it is probably OK
     #    ogr_mysql_18,
-    ogr_mysql_20,
-    ogr_mysql_21,
-    ogr_mysql_22,
-    ogr_mysql_23,
-    ogr_mysql_24,
-    ogr_mysql_72,
-    ogr_mysql_25,
-    ogr_mysql_26,
-    ogr_mysql_longlat,
-    ogr_mysql_cleanup
+    test_ogr_mysql_20,
+    test_ogr_mysql_21,
+    test_ogr_mysql_22,
+    test_ogr_mysql_23,
+    test_ogr_mysql_24,
+    test_ogr_mysql_72,
+    test_ogr_mysql_25,
+    test_ogr_mysql_26,
+    test_ogr_mysql_longlat,
+    test_ogr_mysql_cleanup
 ]
 
 if __name__ == '__main__':
diff --git a/autotest/ogr/ogr_nas.py b/autotest/ogr/ogr_nas.py
index cebee95920e2..e0504ee5f5e0 100755
--- a/autotest/ogr/ogr_nas.py
+++ b/autotest/ogr/ogr_nas.py
@@ -46,7 +46,7 @@
 #
 
 
-def ogr_nas_1():
+def test_ogr_nas_1():
 
     drv = ogr.GetDriverByName('NAS')
     if drv is None:
@@ -106,7 +106,7 @@ def ogr_nas_1():
 #
 
 
-def ogr_nas_2():
+def test_ogr_nas_2():
 
     drv = ogr.GetDriverByName('NAS')
     if drv is None:
@@ -167,7 +167,7 @@ def ogr_nas_2():
 #
 
 
-def ogr_nas_3():
+def test_ogr_nas_3():
 
     drv = ogr.GetDriverByName('NAS')
     if drv is None:
@@ -192,7 +192,7 @@ def ogr_nas_3():
 #
 
 
-def ogr_nas_4():
+def test_ogr_nas_4():
 
     drv = ogr.GetDriverByName('NAS')
     if drv is None:
@@ -249,7 +249,7 @@ def ogr_nas_4():
 #
 
 
-def ogr_nas_5():
+def test_ogr_nas_5():
 
     drv = ogr.GetDriverByName('NAS')
     if drv is None:
@@ -335,11 +335,11 @@ def ogr_nas_5():
 
 
 gdaltest_list = [
-    ogr_nas_1,
-    ogr_nas_2,
-    ogr_nas_3,
-    ogr_nas_4,
-    ogr_nas_5]
+    test_ogr_nas_1,
+    test_ogr_nas_2,
+    test_ogr_nas_3,
+    test_ogr_nas_4,
+    test_ogr_nas_5]
 
 if __name__ == '__main__':
 
diff --git a/autotest/ogr/ogr_ntf.py b/autotest/ogr/ogr_ntf.py
index 92f956ec10a4..d154831c7356 100755
--- a/autotest/ogr/ogr_ntf.py
+++ b/autotest/ogr/ogr_ntf.py
@@ -86,7 +86,7 @@
 ###############################################################################
 
 
-def ogr_ntf_1():
+def test_ogr_ntf_1():
 
     if not gdaltest.download_file('http://www.ordnancesurvey.co.uk/oswebsite/products/strategi/sampledata/stratntf.exe', 'stratntf.exe'):
         return 'skip'
@@ -136,7 +136,7 @@ def ogr_ntf_1():
 
 
 ###############################################################################
-def ogr_ntf_2():
+def test_ogr_ntf_2():
 
     if not gdaltest.download_file('http://www.ordnancesurvey.co.uk/oswebsite/products/meridian2/sampledata/meridian2ntf.exe', 'meridian2ntf.exe'):
         return 'skip'
@@ -192,8 +192,8 @@ def ogr_ntf_2():
 
 
 gdaltest_list = [
-    ogr_ntf_1,
-    ogr_ntf_2]
+    test_ogr_ntf_1,
+    test_ogr_ntf_2]
 
 if __name__ == '__main__':
 
diff --git a/autotest/ogr/ogr_oci.py b/autotest/ogr/ogr_oci.py
index 12dc80d6f638..dd283a5ff0b2 100755
--- a/autotest/ogr/ogr_oci.py
+++ b/autotest/ogr/ogr_oci.py
@@ -40,7 +40,7 @@
 # Open ORACLE.
 
 
-def ogr_oci_1():
+def test_ogr_oci_1():
 
     gdaltest.oci_ds = None
 
@@ -62,7 +62,7 @@ def ogr_oci_1():
 # Create Oracle table from data/poly.shp
 
 
-def ogr_oci_2():
+def test_ogr_oci_2():
 
     if gdaltest.oci_ds is None:
         return 'skip'
@@ -140,7 +140,7 @@ def reverse_rings(poly):
 # Verify that stuff we just wrote is still OK.
 
 
-def ogr_oci_3():
+def test_ogr_oci_3():
     if gdaltest.oci_ds is None:
         return 'skip'
 
@@ -185,7 +185,7 @@ def ogr_oci_3():
 # geometries are still OK.
 
 
-def ogr_oci_4():
+def test_ogr_oci_4():
 
     if gdaltest.oci_ds is None:
         return 'skip'
@@ -223,7 +223,7 @@ def ogr_oci_4():
 # Test ExecuteSQL() results layers without geometry.
 
 
-def ogr_oci_5():
+def test_ogr_oci_5():
 
     if gdaltest.oci_ds is None:
         return 'skip'
@@ -245,7 +245,7 @@ def ogr_oci_5():
 # Test ExecuteSQL() results layers with geometry.
 
 
-def ogr_oci_6():
+def test_ogr_oci_6():
 
     if gdaltest.oci_ds is None:
         return 'skip'
@@ -271,7 +271,7 @@ def ogr_oci_6():
 # Test spatial filtering.
 
 
-def ogr_oci_7():
+def test_ogr_oci_7():
 
     if gdaltest.oci_ds is None:
         return 'skip'
@@ -295,7 +295,7 @@ def ogr_oci_7():
 # to an oracle coordinate system using the ORACLE authority code.
 
 
-def ogr_oci_8():
+def test_ogr_oci_8():
 
     if gdaltest.oci_ds is None:
         return 'skip'
@@ -343,7 +343,7 @@ def ogr_oci_8():
 # the coordinate system gets properly remapped to the Oracle WGS84.
 
 
-def ogr_oci_9():
+def test_ogr_oci_9():
 
     if gdaltest.oci_ds is None:
         return 'skip'
@@ -388,7 +388,7 @@ def ogr_oci_9():
 # Test handling of specialized Oracle Rectangle Geometries.
 
 
-def ogr_oci_10():
+def test_ogr_oci_10():
 
     if gdaltest.oci_ds is None:
         return 'skip'
@@ -436,7 +436,7 @@ def ogr_oci_10():
 # Test handling of specialized Oracle circle Geometries.
 
 
-def ogr_oci_11():
+def test_ogr_oci_11():
 
     if gdaltest.oci_ds is None:
         return 'skip'
@@ -475,7 +475,7 @@ def ogr_oci_11():
 # Test handling of specialized Oracle circular arc linestring Geometries.
 
 
-def ogr_oci_12():
+def test_ogr_oci_12():
 
     if gdaltest.oci_ds is None:
         return 'skip'
@@ -513,7 +513,7 @@ def ogr_oci_12():
 # Test handling of specialized Oracle circular arc polygon Geometries.
 
 
-def ogr_oci_13():
+def test_ogr_oci_13():
 
     if gdaltest.oci_ds is None:
         return 'skip'
@@ -552,7 +552,7 @@ def ogr_oci_13():
 # Test handling of compount linestring.
 
 
-def ogr_oci_14():
+def test_ogr_oci_14():
 
     if gdaltest.oci_ds is None:
         return 'skip'
@@ -591,7 +591,7 @@ def ogr_oci_14():
 # Test handling of compount polygon.
 
 
-def ogr_oci_15():
+def test_ogr_oci_15():
 
     if gdaltest.oci_ds is None:
         return 'skip'
@@ -630,7 +630,7 @@ def ogr_oci_15():
 # Test deleting an existing layer.
 
 
-def ogr_oci_16():
+def test_ogr_oci_16():
 
     if gdaltest.oci_ds is None:
         return 'skip'
@@ -666,7 +666,7 @@ def ogr_oci_16():
 # Test that synctodisk actually sets the layer bounds metadata.
 
 
-def ogr_oci_17():
+def test_ogr_oci_17():
 
     if gdaltest.oci_ds is None:
         return 'skip'
@@ -740,7 +740,7 @@ def ogr_oci_17():
 # Test layer geometry types
 
 
-def ogr_oci_18():
+def test_ogr_oci_18():
 
     if gdaltest.oci_ds is None:
         return 'skip'
@@ -810,7 +810,7 @@ def ogr_oci_18():
 # Test date / datetime
 
 
-def ogr_oci_19():
+def test_ogr_oci_19():
 
     if gdaltest.oci_ds is None:
         return 'skip'
@@ -844,7 +844,7 @@ def ogr_oci_19():
 # Test not nullable fields
 
 
-def ogr_oci_20():
+def test_ogr_oci_20():
 
     if gdaltest.oci_ds is None:
         return 'skip'
@@ -943,7 +943,7 @@ def ogr_oci_20():
 # Test default values
 
 
-def ogr_oci_21():
+def test_ogr_oci_21():
 
     if gdaltest.oci_ds is None:
         return 'skip'
@@ -1052,7 +1052,7 @@ def ogr_oci_21():
 #
 
 
-def ogr_oci_cleanup():
+def test_ogr_oci_cleanup():
 
     if gdaltest.oci_ds is None:
         return 'skip'
@@ -1086,28 +1086,28 @@ def ogr_oci_cleanup():
 
 
 gdaltest_list = [
-    ogr_oci_1,
-    ogr_oci_2,
-    ogr_oci_3,
-    ogr_oci_4,
-    ogr_oci_5,
-    ogr_oci_6,
-    ogr_oci_7,
-    ogr_oci_8,
-    ogr_oci_9,
-    ogr_oci_10,
-    ogr_oci_11,
-    ogr_oci_12,
-    ogr_oci_13,
-    ogr_oci_14,
-    ogr_oci_15,
-    ogr_oci_16,
-    ogr_oci_17,
-    ogr_oci_18,
-    ogr_oci_19,
-    ogr_oci_20,
-    ogr_oci_21,
-    ogr_oci_cleanup]
+    test_ogr_oci_1,
+    test_ogr_oci_2,
+    test_ogr_oci_3,
+    test_ogr_oci_4,
+    test_ogr_oci_5,
+    test_ogr_oci_6,
+    test_ogr_oci_7,
+    test_ogr_oci_8,
+    test_ogr_oci_9,
+    test_ogr_oci_10,
+    test_ogr_oci_11,
+    test_ogr_oci_12,
+    test_ogr_oci_13,
+    test_ogr_oci_14,
+    test_ogr_oci_15,
+    test_ogr_oci_16,
+    test_ogr_oci_17,
+    test_ogr_oci_18,
+    test_ogr_oci_19,
+    test_ogr_oci_20,
+    test_ogr_oci_21,
+    test_ogr_oci_cleanup]
 
 if __name__ == '__main__':
 
diff --git a/autotest/ogr/ogr_odbc.py b/autotest/ogr/ogr_odbc.py
index abb632f2428f..49ac033ffdda 100755
--- a/autotest/ogr/ogr_odbc.py
+++ b/autotest/ogr/ogr_odbc.py
@@ -41,7 +41,7 @@
 # Basic testing
 
 
-def ogr_odbc_1():
+def test_ogr_odbc_1():
 
     ogrtest.odbc_drv = None
     if sys.platform != 'win32':
@@ -148,7 +148,7 @@ def ogr_odbc_1():
 # Run test_ogrsf
 
 
-def ogr_odbc_2():
+def test_ogr_odbc_2():
     if ogrtest.odbc_drv is None:
         return 'skip'
 
@@ -168,7 +168,7 @@ def ogr_odbc_2():
 # Cleanup
 
 
-def ogr_odbc_cleanup():
+def test_ogr_odbc_cleanup():
     if ogrtest.odbc_drv is None:
         return 'skip'
 
@@ -178,9 +178,9 @@ def ogr_odbc_cleanup():
 
 
 gdaltest_list = [
-    ogr_odbc_1,
-    ogr_odbc_2,
-    ogr_odbc_cleanup
+    test_ogr_odbc_1,
+    test_ogr_odbc_2,
+    test_ogr_odbc_cleanup
 ]
 
 if __name__ == '__main__':
diff --git a/autotest/ogr/ogr_ods.py b/autotest/ogr/ogr_ods.py
index fc76f3f9a96d..18dd97625497 100755
--- a/autotest/ogr/ogr_ods.py
+++ b/autotest/ogr/ogr_ods.py
@@ -126,7 +126,7 @@ def ogr_ods_check(ds):
 # Basic tests
 
 
-def ogr_ods_1():
+def test_ogr_ods_1():
 
     drv = ogr.GetDriverByName('ODS')
     if drv is None:
@@ -147,7 +147,7 @@ def ogr_ods_1():
 # Basic tests
 
 
-def ogr_ods_kspread_1():
+def test_ogr_ods_kspread_1():
 
     drv = ogr.GetDriverByName('ODS')
     if drv is None:
@@ -245,7 +245,7 @@ def ogr_ods_kspread_1():
 # Test OGR_ODS_HEADERS = DISABLE
 
 
-def ogr_ods_2():
+def test_ogr_ods_2():
 
     drv = ogr.GetDriverByName('ODS')
     if drv is None:
@@ -269,7 +269,7 @@ def ogr_ods_2():
 # Test OGR_ODS_FIELD_TYPES = STRING
 
 
-def ogr_ods_3():
+def test_ogr_ods_3():
 
     drv = ogr.GetDriverByName('ODS')
     if drv is None:
@@ -292,7 +292,7 @@ def ogr_ods_3():
 # Run test_ogrsf
 
 
-def ogr_ods_4():
+def test_ogr_ods_4():
 
     drv = ogr.GetDriverByName('ODS')
     if drv is None:
@@ -314,7 +314,7 @@ def ogr_ods_4():
 # Test write support
 
 
-def ogr_ods_5():
+def test_ogr_ods_5():
 
     drv = ogr.GetDriverByName('ODS')
     if drv is None:
@@ -338,7 +338,7 @@ def ogr_ods_5():
 # Test formula evaluation
 
 
-def ogr_ods_6():
+def test_ogr_ods_6():
 
     drv = ogr.GetDriverByName('ODS')
     if drv is None:
@@ -385,7 +385,7 @@ def ogr_ods_6():
 # Test update support
 
 
-def ogr_ods_7():
+def test_ogr_ods_7():
 
     drv = ogr.GetDriverByName('ODS')
     if drv is None:
@@ -430,7 +430,7 @@ def ogr_ods_7():
 # Test Integer64
 
 
-def ogr_ods_8():
+def test_ogr_ods_8():
 
     drv = ogr.GetDriverByName('ODS')
     if drv is None:
@@ -471,7 +471,7 @@ def ogr_ods_8():
 # Test DateTime with milliseconds
 
 
-def ogr_ods_9():
+def test_ogr_ods_9():
 
     drv = ogr.GetDriverByName('ODS')
     if drv is None:
@@ -519,7 +519,7 @@ def ogr_ods_9():
 # Test Boolean
 
 
-def ogr_ods_boolean():
+def test_ogr_ods_boolean():
 
     drv = ogr.GetDriverByName('ODS')
     if drv is None:
@@ -564,17 +564,17 @@ def ogr_ods_boolean():
 
 
 gdaltest_list = [
-    ogr_ods_1,
-    ogr_ods_kspread_1,
-    ogr_ods_2,
-    ogr_ods_3,
-    ogr_ods_4,
-    ogr_ods_5,
-    ogr_ods_6,
-    ogr_ods_7,
-    ogr_ods_8,
-    ogr_ods_9,
-    ogr_ods_boolean,
+    test_ogr_ods_1,
+    test_ogr_ods_kspread_1,
+    test_ogr_ods_2,
+    test_ogr_ods_3,
+    test_ogr_ods_4,
+    test_ogr_ods_5,
+    test_ogr_ods_6,
+    test_ogr_ods_7,
+    test_ogr_ods_8,
+    test_ogr_ods_9,
+    test_ogr_ods_boolean,
 ]
 
 if __name__ == '__main__':
diff --git a/autotest/ogr/ogr_ogdi.py b/autotest/ogr/ogr_ogdi.py
index a81f35844f13..561f9322ca11 100755
--- a/autotest/ogr/ogr_ogdi.py
+++ b/autotest/ogr/ogr_ogdi.py
@@ -39,7 +39,7 @@
 ###############################################################################
 
 
-def ogr_ogdi_1():
+def test_ogr_ogdi_1():
 
     ogrtest.ogdi_ds = None
 
@@ -112,7 +112,7 @@ def ogr_ogdi_1():
 # Run test_ogrsf
 
 
-def ogr_ogdi_2():
+def test_ogr_ogdi_2():
 
     if ogrtest.ogdi_ds is None:
         return 'skip'
@@ -135,7 +135,7 @@ def ogr_ogdi_2():
 # Test GetFeature()
 
 
-def ogr_ogdi_3():
+def test_ogr_ogdi_3():
 
     if ogrtest.ogdi_ds is None:
         return 'skip'
@@ -183,7 +183,7 @@ def ogr_ogdi_3():
 # Extract of full dataset
 
 
-def ogr_ogdi_4():
+def test_ogr_ogdi_4():
 
     if ogrtest.ogdi_drv is None:
         return 'skip'
@@ -242,7 +242,7 @@ def ogr_ogdi_4():
 # Run test_ogrsf
 
 
-def ogr_ogdi_5():
+def test_ogr_ogdi_5():
 
     if ogrtest.ogdi_drv is None:
         return 'skip'
@@ -264,7 +264,7 @@ def ogr_ogdi_5():
 ###############################################################################
 
 
-def ogr_ogdi_cleanup():
+def test_ogr_ogdi_cleanup():
 
     if ogrtest.ogdi_ds is None:
         return 'skip'
@@ -274,12 +274,12 @@ def ogr_ogdi_cleanup():
 
 
 gdaltest_list = [
-    ogr_ogdi_1,
-    ogr_ogdi_2,
-    ogr_ogdi_3,
-    ogr_ogdi_4,
-    ogr_ogdi_5,
-    ogr_ogdi_cleanup]
+    test_ogr_ogdi_1,
+    test_ogr_ogdi_2,
+    test_ogr_ogdi_3,
+    test_ogr_ogdi_4,
+    test_ogr_ogdi_5,
+    test_ogr_ogdi_cleanup]
 
 if __name__ == '__main__':
 
diff --git a/autotest/ogr/ogr_openair.py b/autotest/ogr/ogr_openair.py
index 53183dab4823..243c084eba65 100755
--- a/autotest/ogr/ogr_openair.py
+++ b/autotest/ogr/ogr_openair.py
@@ -39,7 +39,7 @@
 # Basic test
 
 
-def ogr_openair_1():
+def test_ogr_openair_1():
 
     ds = ogr.Open('data/openair_test.txt')
     if ds is None:
@@ -82,7 +82,7 @@ def ogr_openair_1():
 
 
 gdaltest_list = [
-    ogr_openair_1]
+    test_ogr_openair_1]
 
 
 if __name__ == '__main__':
diff --git a/autotest/ogr/ogr_openfilegdb.py b/autotest/ogr/ogr_openfilegdb.py
index 476cefe6306a..0b6a72c458d6 100755
--- a/autotest/ogr/ogr_openfilegdb.py
+++ b/autotest/ogr/ogr_openfilegdb.py
@@ -81,7 +81,7 @@
 ###############################################################################
 # Disable FileGDB driver
 
-def ogr_openfilegdb_init():
+def test_ogr_openfilegdb_init():
 
     ogrtest.fgdb_drv = ogr.GetDriverByName('FileGDB')
     if ogrtest.fgdb_drv is not None:
@@ -269,7 +269,7 @@ def ogr_openfilegdb_make_test_data():
 # Basic tests
 
 
-def ogr_openfilegdb_1(filename='data/testopenfilegdb.gdb.zip', version10=True):
+def test_ogr_openfilegdb_1(filename='data/testopenfilegdb.gdb.zip', version10=True):
 
     srs = osr.SpatialReference()
     srs.SetFromUserInput("WGS84")
@@ -421,18 +421,18 @@ def ogr_openfilegdb_1(filename='data/testopenfilegdb.gdb.zip', version10=True):
     return 'success'
 
 
-def ogr_openfilegdb_1_92():
-    return ogr_openfilegdb_1(filename='data/testopenfilegdb92.gdb.zip', version10=False)
+def test_ogr_openfilegdb_1_92():
+    return test_ogr_openfilegdb_1(filename='data/testopenfilegdb92.gdb.zip', version10=False)
 
 
-def ogr_openfilegdb_1_93():
-    return ogr_openfilegdb_1(filename='data/testopenfilegdb93.gdb.zip', version10=False)
+def test_ogr_openfilegdb_1_93():
+    return test_ogr_openfilegdb_1(filename='data/testopenfilegdb93.gdb.zip', version10=False)
 
 ###############################################################################
 # Run test_ogrsf
 
 
-def ogr_openfilegdb_2(filename='data/testopenfilegdb.gdb.zip'):
+def test_ogr_openfilegdb_2(filename='data/testopenfilegdb.gdb.zip'):
 
     import test_cli_utilities
     if test_cli_utilities.get_test_ogrsf_path() is None:
@@ -447,18 +447,18 @@ def ogr_openfilegdb_2(filename='data/testopenfilegdb.gdb.zip'):
     return 'success'
 
 
-def ogr_openfilegdb_2_92():
-    return ogr_openfilegdb_2(filename='data/testopenfilegdb92.gdb.zip')
+def test_ogr_openfilegdb_2_92():
+    return test_ogr_openfilegdb_2(filename='data/testopenfilegdb92.gdb.zip')
 
 
-def ogr_openfilegdb_2_93():
-    return ogr_openfilegdb_2(filename='data/testopenfilegdb93.gdb.zip')
+def test_ogr_openfilegdb_2_93():
+    return test_ogr_openfilegdb_2(filename='data/testopenfilegdb93.gdb.zip')
 
 ###############################################################################
 # Open a .gdbtable directly
 
 
-def ogr_openfilegdb_3():
+def test_ogr_openfilegdb_3():
 
     ds = ogr.Open('/vsizip/data/testopenfilegdb.gdb.zip/testopenfilegdb.gdb/a00000009.gdbtable')
     if ds.GetLayerCount() != 1:
@@ -491,7 +491,7 @@ def ogr_openfilegdb_3():
 # Test use of attribute indexes
 
 
-def ogr_openfilegdb_4():
+def test_ogr_openfilegdb_4():
 
     ds = ogr.Open('/vsizip/data/testopenfilegdb.gdb.zip/testopenfilegdb.gdb')
 
@@ -714,7 +714,7 @@ def ogr_openfilegdb_4():
 # Test opening an unzipped dataset
 
 
-def ogr_openfilegdb_5():
+def test_ogr_openfilegdb_5():
 
     try:
         shutil.rmtree('tmp/testopenfilegdb.gdb')
@@ -740,7 +740,7 @@ def ogr_openfilegdb_5():
 # Test special SQL processing for min/max/count/sum/avg values
 
 
-def ogr_openfilegdb_6():
+def test_ogr_openfilegdb_6():
 
     ds = ogr.Open('data/testopenfilegdb.gdb.zip')
 
@@ -788,7 +788,7 @@ def ogr_openfilegdb_6():
 # Test special SQL processing for ORDER BY
 
 
-def ogr_openfilegdb_7():
+def test_ogr_openfilegdb_7():
 
     ds = ogr.Open('data/testopenfilegdb.gdb.zip')
 
@@ -871,7 +871,7 @@ def ogr_openfilegdb_7():
 # Test reading a .gdbtable without .gdbtablx
 
 
-def ogr_openfilegdb_8():
+def test_ogr_openfilegdb_8():
 
     ds = ogr.Open('data/testopenfilegdb.gdb.zip')
     dict_feat_count = {}
@@ -912,7 +912,7 @@ def ogr_openfilegdb_8():
 # Test reading a .gdbtable outside a .gdb
 
 
-def ogr_openfilegdb_9():
+def test_ogr_openfilegdb_9():
 
     try:
         os.stat('tmp/testopenfilegdb.gdb')
@@ -959,7 +959,7 @@ def unfuzz(backup):
     f.close()
 
 
-def ogr_openfilegdb_10():
+def test_ogr_openfilegdb_10():
 
     try:
         os.stat('tmp/testopenfilegdb.gdb')
@@ -1116,7 +1116,7 @@ def get_spi_state(ds, lyr):
     return value
 
 
-def ogr_openfilegdb_11():
+def test_ogr_openfilegdb_11():
 
     # Test building spatial index with GetFeatureCount()
     ds = ogr.Open('data/testopenfilegdb.gdb.zip')
@@ -1307,7 +1307,7 @@ def ogr_openfilegdb_11():
 # Test opening a FGDB with both SRID and LatestSRID set (#5638)
 
 
-def ogr_openfilegdb_12():
+def test_ogr_openfilegdb_12():
 
     ds = ogr.Open('/vsizip/data/test3005.gdb.zip')
     lyr = ds.GetLayer(0)
@@ -1328,7 +1328,7 @@ def ogr_openfilegdb_12():
 # Test opening a FGDB v9 with a non spatial table (#5673)
 
 
-def ogr_openfilegdb_13():
+def test_ogr_openfilegdb_13():
 
     ds = ogr.Open('/vsizip/data/ESSENCE_NAIPF_ORI_PROV_sub93.gdb.zip')
     lyr = ds.GetLayer(0)
@@ -1354,7 +1354,7 @@ def ogr_openfilegdb_13():
 # Test not nullable fields
 
 
-def ogr_openfilegdb_14():
+def test_ogr_openfilegdb_14():
 
     ds = ogr.Open('data/testopenfilegdb.gdb.zip')
     lyr = ds.GetLayerByName('testnotnullable')
@@ -1375,7 +1375,7 @@ def ogr_openfilegdb_14():
 # Test default values
 
 
-def ogr_openfilegdb_15():
+def test_ogr_openfilegdb_15():
 
     ds = ogr.Open('data/test_default_val.gdb.zip')
     lyr = ds.GetLayer(0)
@@ -1406,7 +1406,7 @@ def ogr_openfilegdb_15():
 ###############################################################################
 # Read layers with sparse pages
 
-def ogr_openfilegdb_16():
+def test_ogr_openfilegdb_16():
 
     ds = ogr.Open('data/sparse.gdb.zip')
     lyr = ds.GetLayer(0)
@@ -1443,7 +1443,7 @@ def ogr_openfilegdb_16():
 # Read a MULTILINESTRING ZM with a dummy M array (#6528)
 
 
-def ogr_openfilegdb_17():
+def test_ogr_openfilegdb_17():
 
     ds = ogr.Open('data/multilinestringzm_with_dummy_m_array.gdb.zip')
     lyr = ds.GetLayer(0)
@@ -1458,7 +1458,7 @@ def ogr_openfilegdb_17():
 # Read curves
 
 
-def ogr_openfilegdb_18():
+def test_ogr_openfilegdb_18():
 
     ds = ogr.Open('data/curves.gdb')
     lyr = ds.GetLayerByName('line')
@@ -1501,7 +1501,7 @@ def ogr_openfilegdb_18():
 # Test opening '.'
 
 
-def ogr_openfilegdb_19():
+def test_ogr_openfilegdb_19():
 
     os.chdir('data/curves.gdb')
     ds = ogr.Open('.')
@@ -1516,7 +1516,7 @@ def ogr_openfilegdb_19():
 # one of the starting point (#7017)
 
 
-def ogr_openfilegdb_20():
+def test_ogr_openfilegdb_20():
 
     ds = ogr.Open('data/filegdb_polygonzm_m_not_closing_with_curves.gdb')
     lyr = ds.GetLayer(0)
@@ -1548,7 +1548,7 @@ def ogr_openfilegdb_20():
 # Test selecting FID column with OGRSQL
 
 
-def ogr_openfilegdb_21():
+def test_ogr_openfilegdb_21():
 
     ds = ogr.Open('data/curves.gdb')
     sql_lyr = ds.ExecuteSQL('SELECT OBJECTID FROM polygon WHERE OBJECTID = 2')
@@ -1580,7 +1580,7 @@ def ogr_openfilegdb_21():
 # Cleanup
 
 
-def ogr_openfilegdb_cleanup():
+def test_ogr_openfilegdb_cleanup():
 
     if ogrtest.fgdb_drv is not None:
         ogrtest.fgdb_drv.Register()
@@ -1603,34 +1603,34 @@ def ogr_openfilegdb_cleanup():
 
 
 gdaltest_list = [
-    ogr_openfilegdb_init,
+    test_ogr_openfilegdb_init,
     # ogr_openfilegdb_make_test_data,
-    ogr_openfilegdb_1,
-    ogr_openfilegdb_1_92,
-    ogr_openfilegdb_1_93,
-    ogr_openfilegdb_2,
-    ogr_openfilegdb_2_92,
-    ogr_openfilegdb_2_93,
-    ogr_openfilegdb_3,
-    ogr_openfilegdb_4,
-    ogr_openfilegdb_5,
-    ogr_openfilegdb_6,
-    ogr_openfilegdb_7,
-    ogr_openfilegdb_8,
-    ogr_openfilegdb_9,
-    ogr_openfilegdb_10,
-    ogr_openfilegdb_11,
-    ogr_openfilegdb_12,
-    ogr_openfilegdb_13,
-    ogr_openfilegdb_14,
-    ogr_openfilegdb_15,
-    ogr_openfilegdb_16,
-    ogr_openfilegdb_17,
-    ogr_openfilegdb_18,
-    ogr_openfilegdb_19,
-    ogr_openfilegdb_20,
-    ogr_openfilegdb_21,
-    ogr_openfilegdb_cleanup,
+    test_ogr_openfilegdb_1,
+    test_ogr_openfilegdb_1_92,
+    test_ogr_openfilegdb_1_93,
+    test_ogr_openfilegdb_2,
+    test_ogr_openfilegdb_2_92,
+    test_ogr_openfilegdb_2_93,
+    test_ogr_openfilegdb_3,
+    test_ogr_openfilegdb_4,
+    test_ogr_openfilegdb_5,
+    test_ogr_openfilegdb_6,
+    test_ogr_openfilegdb_7,
+    test_ogr_openfilegdb_8,
+    test_ogr_openfilegdb_9,
+    test_ogr_openfilegdb_10,
+    test_ogr_openfilegdb_11,
+    test_ogr_openfilegdb_12,
+    test_ogr_openfilegdb_13,
+    test_ogr_openfilegdb_14,
+    test_ogr_openfilegdb_15,
+    test_ogr_openfilegdb_16,
+    test_ogr_openfilegdb_17,
+    test_ogr_openfilegdb_18,
+    test_ogr_openfilegdb_19,
+    test_ogr_openfilegdb_20,
+    test_ogr_openfilegdb_21,
+    test_ogr_openfilegdb_cleanup,
 ]
 
 if __name__ == '__main__':
diff --git a/autotest/ogr/ogr_osm.py b/autotest/ogr/ogr_osm.py
index 481f3684b68b..5988dd15f5a7 100755
--- a/autotest/ogr/ogr_osm.py
+++ b/autotest/ogr/ogr_osm.py
@@ -42,7 +42,7 @@
 # Test .pbf
 
 
-def ogr_osm_1(filename='data/test.pbf'):
+def test_ogr_osm_1(filename='data/test.pbf'):
 
     ogrtest.osm_drv = ogr.GetDriverByName('OSM')
     if ogrtest.osm_drv is None:
@@ -281,14 +281,14 @@ def ogr_osm_1(filename='data/test.pbf'):
 # Test .osm
 
 
-def ogr_osm_2():
-    return ogr_osm_1('data/test.osm')
+def test_ogr_osm_2():
+    return test_ogr_osm_1('data/test.osm')
 
 ###############################################################################
 # Test ogr2ogr
 
 
-def ogr_osm_3(options=None, all_layers=False):
+def test_ogr_osm_3(options=None, all_layers=False):
 
     if ogrtest.osm_drv is None:
         return 'skip'
@@ -308,7 +308,7 @@ def ogr_osm_3(options=None, all_layers=False):
     with gdaltest.error_handler():
         gdal.VectorTranslate('tmp/ogr_osm_3', 'data/test.pbf', options=layers + options)
 
-    ret = ogr_osm_1(filepath)
+    ret = test_ogr_osm_1(filepath)
 
     ogr.GetDriverByName('ESRI Shapefile').DeleteDataSource(filepath)
 
@@ -318,9 +318,9 @@ def ogr_osm_3(options=None, all_layers=False):
 # Test ogr2ogr with --config OSM_USE_CUSTOM_INDEXING NO and -skip
 
 
-def ogr_osm_3_sqlite_nodes():
+def test_ogr_osm_3_sqlite_nodes():
     gdal.SetConfigOption('OSM_USE_CUSTOM_INDEXING', 'NO')
-    ret = ogr_osm_3(options='-skip')
+    ret = test_ogr_osm_3(options='-skip')
     gdal.SetConfigOption('OSM_USE_CUSTOM_INDEXING', None)
     return ret
 
@@ -328,9 +328,9 @@ def ogr_osm_3_sqlite_nodes():
 # Test ogr2ogr with --config OSM_COMPRESS_NODES YES
 
 
-def ogr_osm_3_custom_compress_nodes():
+def test_ogr_osm_3_custom_compress_nodes():
     gdal.SetConfigOption('OSM_COMPRESS_NODES', 'YES')
-    ret = ogr_osm_3()
+    ret = test_ogr_osm_3()
     gdal.SetConfigOption('OSM_COMPRESS_NODES', None)
     return ret
 
@@ -338,14 +338,14 @@ def ogr_osm_3_custom_compress_nodes():
 # Test ogr2ogr with all layers
 
 
-def ogr_osm_3_all_layers():
-    return ogr_osm_3(options='-skip', all_layers=True)
+def test_ogr_osm_3_all_layers():
+    return test_ogr_osm_3(options='-skip', all_layers=True)
 
 ###############################################################################
 # Test optimization when reading only the points layer through a SQL request
 
 
-def ogr_osm_4():
+def test_ogr_osm_4():
 
     if ogrtest.osm_drv is None:
         return 'skip'
@@ -409,7 +409,7 @@ def ogr_osm_4():
 # Test optimizations for early attribute filter evaluation
 
 
-def ogr_osm_5():
+def test_ogr_osm_5():
 
     if ogrtest.osm_drv is None:
         return 'skip'
@@ -457,7 +457,7 @@ def ogr_osm_5():
 # Test ogr2ogr -sql
 
 
-def ogr_osm_6():
+def test_ogr_osm_6():
 
     if ogrtest.osm_drv is None:
         return 'skip'
@@ -493,7 +493,7 @@ def ogr_osm_6():
 # with SQLite dialect (#4825)
 
 
-def ogr_osm_7():
+def test_ogr_osm_7():
 
     if ogrtest.osm_drv is None:
         return 'skip'
@@ -519,7 +519,7 @@ def ogr_osm_7():
 # Test 64-bit ids
 
 
-def ogr_osm_8():
+def test_ogr_osm_8():
 
     if ogrtest.osm_drv is None:
         return 'skip'
@@ -553,14 +553,14 @@ def ogr_osm_8():
 # Same as ogr_osm_8 but with OSM_USE_CUSTOM_INDEXING=NO
 
 
-def ogr_osm_9():
+def test_ogr_osm_9():
 
     if ogrtest.osm_drv is None:
         return 'skip'
 
     old_val = gdal.GetConfigOption('OSM_USE_CUSTOM_INDEXING')
     gdal.SetConfigOption('OSM_USE_CUSTOM_INDEXING', 'NO')
-    ret = ogr_osm_8()
+    ret = test_ogr_osm_8()
     gdal.SetConfigOption('OSM_USE_CUSTOM_INDEXING', old_val)
 
     return ret
@@ -569,7 +569,7 @@ def ogr_osm_9():
 # Some error conditions
 
 
-def ogr_osm_10():
+def test_ogr_osm_10():
 
     if ogrtest.osm_drv is None:
         return 'skip'
@@ -659,7 +659,7 @@ def ogr_osm_10():
 # Test all_tags
 
 
-def ogr_osm_11():
+def test_ogr_osm_11():
 
     if ogrtest.osm_drv is None:
         return 'skip'
@@ -690,7 +690,7 @@ def ogr_osm_11():
 # Test that attribute filter set on a line layer is well taken into
 # account
 
-def ogr_osm_12():
+def test_ogr_osm_12():
 
     if ogrtest.osm_drv is None:
         return 'skip'
@@ -717,21 +717,21 @@ def ogr_osm_12():
 # Test test_uncompressed_dense_true_nometadata.pbf
 
 
-def ogr_osm_test_uncompressed_dense_true_nometadata_pbf():
-    return ogr_osm_1('data/test_uncompressed_dense_true_nometadata.pbf')
+def test_ogr_osm_test_uncompressed_dense_true_nometadata_pbf():
+    return test_ogr_osm_1('data/test_uncompressed_dense_true_nometadata.pbf')
 
 ###############################################################################
 # Test test_uncompressed_dense_false.pbf
 
 
-def ogr_osm_test_uncompressed_dense_false_pbf():
-    return ogr_osm_1('data/test_uncompressed_dense_false.pbf')
+def test_ogr_osm_test_uncompressed_dense_false_pbf():
+    return test_ogr_osm_1('data/test_uncompressed_dense_false.pbf')
 
 # Special case: if an object has a 'osm_id' key, then do not use it to override
 # "our" osm_id field. But put it in other_fields (#6347)
 
 
-def ogr_osm_13():
+def test_ogr_osm_13():
 
     if ogrtest.osm_drv is None or not ogrtest.osm_drv_parse_osm:
         return 'skip'
@@ -760,7 +760,7 @@ def ogr_osm_13():
 # Test that we handle polygons in other_relations (#6475)
 
 
-def ogr_osm_14():
+def test_ogr_osm_14():
 
     if ogrtest.osm_drv is None or not ogrtest.osm_drv_parse_osm:
         return 'skip'
@@ -817,7 +817,7 @@ def ogr_osm_15_progresscbk_return_false(pct, msg, user_data):
     return 0
 
 
-def ogr_osm_15():
+def test_ogr_osm_15():
 
     if ogrtest.osm_drv is None:
         return 'skip'
@@ -907,7 +907,7 @@ def ogr_osm_15():
 # Test laundering of tags (https://github.com/OSGeo/gdal/pull/161)
 
 
-def ogr_osm_16():
+def test_ogr_osm_16():
 
     if ogrtest.osm_drv is None or not ogrtest.osm_drv_parse_osm:
         return 'skip'
@@ -947,7 +947,7 @@ def ogr_osm_16():
 # GDALVectorTranslate() in random feature mode, when there is no feature)
 
 
-def ogr_osm_17():
+def test_ogr_osm_17():
 
     if ogrtest.osm_drv is None or not ogrtest.osm_drv_parse_osm:
         return 'skip'
@@ -973,7 +973,7 @@ def ogr_osm_17():
 # regarding EOF
 
 
-def ogr_osm_18():
+def test_ogr_osm_18():
 
     if ogrtest.osm_drv is None:
         return 'skip'
@@ -994,29 +994,29 @@ def ogr_osm_18():
 
 
 gdaltest_list = [
-    ogr_osm_1,
-    ogr_osm_2,
-    ogr_osm_3,
-    ogr_osm_3_sqlite_nodes,
-    ogr_osm_3_custom_compress_nodes,
-    ogr_osm_3_all_layers,
-    ogr_osm_4,
-    ogr_osm_5,
-    ogr_osm_6,
-    ogr_osm_7,
-    ogr_osm_8,
-    ogr_osm_9,
-    ogr_osm_10,
-    ogr_osm_11,
-    ogr_osm_12,
-    ogr_osm_test_uncompressed_dense_true_nometadata_pbf,
-    ogr_osm_test_uncompressed_dense_false_pbf,
-    ogr_osm_13,
-    ogr_osm_14,
-    ogr_osm_15,
-    ogr_osm_16,
-    ogr_osm_17,
-    ogr_osm_18,
+    test_ogr_osm_1,
+    test_ogr_osm_2,
+    test_ogr_osm_3,
+    test_ogr_osm_3_sqlite_nodes,
+    test_ogr_osm_3_custom_compress_nodes,
+    test_ogr_osm_3_all_layers,
+    test_ogr_osm_4,
+    test_ogr_osm_5,
+    test_ogr_osm_6,
+    test_ogr_osm_7,
+    test_ogr_osm_8,
+    test_ogr_osm_9,
+    test_ogr_osm_10,
+    test_ogr_osm_11,
+    test_ogr_osm_12,
+    test_ogr_osm_test_uncompressed_dense_true_nometadata_pbf,
+    test_ogr_osm_test_uncompressed_dense_false_pbf,
+    test_ogr_osm_13,
+    test_ogr_osm_14,
+    test_ogr_osm_15,
+    test_ogr_osm_16,
+    test_ogr_osm_17,
+    test_ogr_osm_18,
 ]
 
 if __name__ == '__main__':
diff --git a/autotest/ogr/ogr_pcidsk.py b/autotest/ogr/ogr_pcidsk.py
index 98c21c35f507..daddafaee719 100755
--- a/autotest/ogr/ogr_pcidsk.py
+++ b/autotest/ogr/ogr_pcidsk.py
@@ -48,7 +48,7 @@
 # Test creation
 
 
-def ogr_pcidsk_1():
+def test_ogr_pcidsk_1():
 
     ogr_drv = ogr.GetDriverByName('PCIDSK')
     if ogr_drv is None:
@@ -140,7 +140,7 @@ def ogr_pcidsk_1():
 # Test reading
 
 
-def ogr_pcidsk_2():
+def test_ogr_pcidsk_2():
 
     ogr_drv = ogr.GetDriverByName('PCIDSK')
     if ogr_drv is None:
@@ -212,7 +212,7 @@ def ogr_pcidsk_2():
 # Check with test_ogrsf
 
 
-def ogr_pcidsk_3():
+def test_ogr_pcidsk_3():
 
     import test_cli_utilities
     if test_cli_utilities.get_test_ogrsf_path() is None:
@@ -242,7 +242,7 @@ def ogr_pcidsk_3():
 # Test that we cannot open a raster only pcidsk in read-only mode
 
 
-def ogr_pcidsk_4():
+def test_ogr_pcidsk_4():
 
     if ogr.GetDriverByName('PCIDSK') is None:
         return 'skip'
@@ -261,7 +261,7 @@ def ogr_pcidsk_4():
 # Test that we can open a raster only pcidsk in update mode
 
 
-def ogr_pcidsk_5():
+def test_ogr_pcidsk_5():
 
     if ogr.GetDriverByName('PCIDSK') is None:
         return 'skip'
@@ -279,7 +279,7 @@ def ogr_pcidsk_5():
 ###############################################################################
 
 
-def ogr_pcidsk_add_field_to_non_empty_layer():
+def test_ogr_pcidsk_add_field_to_non_empty_layer():
 
     if ogr.GetDriverByName('PCIDSK') is None:
         return 'skip'
@@ -308,7 +308,7 @@ def ogr_pcidsk_add_field_to_non_empty_layer():
 ###############################################################################
 
 
-def ogr_pcidsk_too_many_layers():
+def test_ogr_pcidsk_too_many_layers():
 
     if ogr.GetDriverByName('PCIDSK') is None:
         return 'skip'
@@ -330,7 +330,7 @@ def ogr_pcidsk_too_many_layers():
 ###############################################################################
 # Check a polygon layer
 
-def ogr_pcidsk_online_1():
+def test_ogr_pcidsk_online_1():
 
     if ogr.GetDriverByName('PCIDSK') is None:
         return 'skip'
@@ -365,7 +365,7 @@ def ogr_pcidsk_online_1():
 # Check a polygon layer
 
 
-def ogr_pcidsk_online_2():
+def test_ogr_pcidsk_online_2():
 
     import test_cli_utilities
     if test_cli_utilities.get_test_ogrsf_path() is None:
@@ -389,7 +389,7 @@ def ogr_pcidsk_online_2():
 # Cleanup
 
 
-def ogr_pcidsk_cleanup():
+def test_ogr_pcidsk_cleanup():
 
     gdal.Unlink('tmp/ogr_pcidsk_1.pix')
 
@@ -397,16 +397,16 @@ def ogr_pcidsk_cleanup():
 
 
 gdaltest_list = [
-    ogr_pcidsk_1,
-    ogr_pcidsk_2,
-    ogr_pcidsk_3,
-    ogr_pcidsk_4,
-    ogr_pcidsk_5,
-    ogr_pcidsk_add_field_to_non_empty_layer,
-    ogr_pcidsk_too_many_layers,
-    ogr_pcidsk_online_1,
-    ogr_pcidsk_online_2,
-    ogr_pcidsk_cleanup]
+    test_ogr_pcidsk_1,
+    test_ogr_pcidsk_2,
+    test_ogr_pcidsk_3,
+    test_ogr_pcidsk_4,
+    test_ogr_pcidsk_5,
+    test_ogr_pcidsk_add_field_to_non_empty_layer,
+    test_ogr_pcidsk_too_many_layers,
+    test_ogr_pcidsk_online_1,
+    test_ogr_pcidsk_online_2,
+    test_ogr_pcidsk_cleanup]
 
 if __name__ == '__main__':
 
diff --git a/autotest/ogr/ogr_pdf.py b/autotest/ogr/ogr_pdf.py
index 6425cf17a6d9..e9f88a2b7c68 100755
--- a/autotest/ogr/ogr_pdf.py
+++ b/autotest/ogr/ogr_pdf.py
@@ -56,7 +56,7 @@ def has_read_support():
 # Test write support
 
 
-def ogr_pdf_1(name='tmp/ogr_pdf_1.pdf', write_attributes='YES'):
+def test_ogr_pdf_1(name='tmp/ogr_pdf_1.pdf', write_attributes='YES'):
 
     if ogr.GetDriverByName('PDF') is None:
         return 'skip'
@@ -129,7 +129,7 @@ def ogr_pdf_1(name='tmp/ogr_pdf_1.pdf', write_attributes='YES'):
 # Test read support
 
 
-def ogr_pdf_2(name='tmp/ogr_pdf_1.pdf', has_attributes=True):
+def test_ogr_pdf_2(name='tmp/ogr_pdf_1.pdf', has_attributes=True):
 
     if not has_read_support():
         return 'skip'
@@ -221,21 +221,21 @@ def ogr_pdf_2(name='tmp/ogr_pdf_1.pdf', has_attributes=True):
 # Test write support without writing attributes
 
 
-def ogr_pdf_3():
-    return ogr_pdf_1('tmp/ogr_pdf_2.pdf', 'NO')
+def test_ogr_pdf_3():
+    return test_ogr_pdf_1('tmp/ogr_pdf_2.pdf', 'NO')
 
 ###############################################################################
 # Check read support without writing attributes
 
 
-def ogr_pdf_4():
-    return ogr_pdf_2('tmp/ogr_pdf_2.pdf', False)
+def test_ogr_pdf_4():
+    return test_ogr_pdf_2('tmp/ogr_pdf_2.pdf', False)
 
 
 ###############################################################################
 # Switch from poppler to podofo if both are available
 
-def ogr_pdf_4_podofo():
+def test_ogr_pdf_4_podofo():
 
     gdal_pdf_drv = gdal.GetDriverByName('PDF')
     if gdal_pdf_drv is None:
@@ -245,7 +245,7 @@ def ogr_pdf_4_podofo():
     if 'HAVE_POPPLER' in md and 'HAVE_PODOFO' in md:
         gdal.SetConfigOption("GDAL_PDF_LIB", "PODOFO")
         print('Using podofo now')
-        ret = ogr_pdf_4()
+        ret = test_ogr_pdf_4()
         gdal.SetConfigOption("GDAL_PDF_LIB", None)
         return ret
     return 'skip'
@@ -254,7 +254,7 @@ def ogr_pdf_4_podofo():
 # Test read support with OGR_PDF_READ_NON_STRUCTURED=YES
 
 
-def ogr_pdf_5():
+def test_ogr_pdf_5():
 
     if not has_read_support():
         return 'skip'
@@ -277,7 +277,7 @@ def ogr_pdf_5():
 # Test read support with a non-OGR datasource
 
 
-def ogr_pdf_online_1():
+def test_ogr_pdf_online_1():
 
     if not has_read_support():
         return 'skip'
@@ -335,7 +335,7 @@ def ogr_pdf_online_1():
 # Test read support of non-structured content
 
 
-def ogr_pdf_online_2():
+def test_ogr_pdf_online_2():
 
     if not has_read_support():
         return 'skip'
@@ -409,7 +409,7 @@ def ogr_pdf_online_2():
 # Cleanup
 
 
-def ogr_pdf_cleanup():
+def test_ogr_pdf_cleanup():
 
     if ogr.GetDriverByName('PDF') is None:
         return 'skip'
@@ -421,15 +421,15 @@ def ogr_pdf_cleanup():
 
 
 gdaltest_list = [
-    ogr_pdf_1,
-    ogr_pdf_2,
-    ogr_pdf_3,
-    ogr_pdf_4,
-    ogr_pdf_4_podofo,
-    ogr_pdf_5,
-    ogr_pdf_online_1,
-    ogr_pdf_online_2,
-    ogr_pdf_cleanup
+    test_ogr_pdf_1,
+    test_ogr_pdf_2,
+    test_ogr_pdf_3,
+    test_ogr_pdf_4,
+    test_ogr_pdf_4_podofo,
+    test_ogr_pdf_5,
+    test_ogr_pdf_online_1,
+    test_ogr_pdf_online_2,
+    test_ogr_pdf_cleanup
 ]
 
 if __name__ == '__main__':
diff --git a/autotest/ogr/ogr_pds.py b/autotest/ogr/ogr_pds.py
index e32ad1f7236e..da3d2f486588 100755
--- a/autotest/ogr/ogr_pds.py
+++ b/autotest/ogr/ogr_pds.py
@@ -39,7 +39,7 @@
 # Basic test
 
 
-def ogr_pds_1():
+def test_ogr_pds_1():
 
     ds = ogr.Open('data/ap01578l.lbl')
     if ds is None:
@@ -79,7 +79,7 @@ def ogr_pds_1():
 # Read IEEE_FLOAT columns (see https://github.com/OSGeo/gdal/issues/570)
 
 
-def ogr_pds_2():
+def test_ogr_pds_2():
 
     ds = ogr.Open('data/virsvd_orb_11187_050618.lbl')
     lyr = ds.GetLayer(0)
@@ -92,8 +92,8 @@ def ogr_pds_2():
 
 
 gdaltest_list = [
-    ogr_pds_1,
-    ogr_pds_2,
+    test_ogr_pds_1,
+    test_ogr_pds_2,
 ]
 
 if __name__ == '__main__':
diff --git a/autotest/ogr/ogr_pg.py b/autotest/ogr/ogr_pg.py
index 7c7273963b77..1c46286f3ec9 100755
--- a/autotest/ogr/ogr_pg.py
+++ b/autotest/ogr/ogr_pg.py
@@ -165,7 +165,7 @@ def test_ogr_pg_1():
 # Create table from data/poly.shp
 
 
-def ogr_pg_2(with_and_without_postgis):
+def test_ogr_pg_2(with_and_without_postgis):
 
     if gdaltest.pg_ds is None:
         return 'skip'
@@ -261,7 +261,7 @@ def ogr_pg_2(with_and_without_postgis):
 # Test reading a layer extent
 
 
-def ogr_pg_19(with_and_without_postgis):
+def test_ogr_pg_19(with_and_without_postgis):
 
     if gdaltest.pg_ds is None:
         return 'skip'
@@ -304,7 +304,7 @@ def ogr_pg_19(with_and_without_postgis):
 # Test reading a SQL result layer extent
 
 
-def ogr_pg_19_2(with_and_without_postgis):
+def test_ogr_pg_19_2(with_and_without_postgis):
 
     if gdaltest.pg_ds is None:
         return 'skip'
@@ -330,7 +330,7 @@ def ogr_pg_19_2(with_and_without_postgis):
 # Verify that stuff we just wrote is still OK.
 
 
-def ogr_pg_3(with_and_without_postgis):
+def test_ogr_pg_3(with_and_without_postgis):
     if gdaltest.pg_ds is None:
         return 'skip'
 
@@ -375,7 +375,7 @@ def ogr_pg_3(with_and_without_postgis):
 # geometries are still OK.
 
 
-def ogr_pg_4(with_and_without_postgis):
+def test_ogr_pg_4(with_and_without_postgis):
 
     if gdaltest.pg_ds is None:
         return 'skip'
@@ -420,7 +420,7 @@ def ogr_pg_4(with_and_without_postgis):
 # Test ExecuteSQL() results layers without geometry.
 
 
-def ogr_pg_5(with_and_without_postgis):
+def test_ogr_pg_5(with_and_without_postgis):
 
     if gdaltest.pg_ds is None:
         return 'skip'
@@ -443,7 +443,7 @@ def ogr_pg_5(with_and_without_postgis):
 # Test ExecuteSQL() results layers with geometry.
 
 
-def ogr_pg_6(with_and_without_postgis):
+def test_ogr_pg_6(with_and_without_postgis):
 
     if gdaltest.pg_ds is None:
         return 'skip'
@@ -481,7 +481,7 @@ def ogr_pg_6(with_and_without_postgis):
 # Test spatial filtering.
 
 
-def ogr_pg_7(with_and_without_postgis):
+def test_ogr_pg_7(with_and_without_postgis):
 
     if gdaltest.pg_ds is None:
         return 'skip'
@@ -521,7 +521,7 @@ def ogr_pg_7(with_and_without_postgis):
 # No geometry in this test.
 
 
-def ogr_pg_8(with_and_without_postgis):
+def test_ogr_pg_8(with_and_without_postgis):
 
     if gdaltest.pg_ds is None:
         return 'skip'
@@ -553,7 +553,7 @@ def ogr_pg_8(with_and_without_postgis):
 # Verify inplace update of a feature with SetFeature().
 
 
-def ogr_pg_9(with_and_without_postgis):
+def test_ogr_pg_9(with_and_without_postgis):
 
     if gdaltest.pg_ds is None:
         return 'skip'
@@ -629,7 +629,7 @@ def ogr_pg_9(with_and_without_postgis):
 # Verify that DeleteFeature() works properly.
 
 
-def ogr_pg_10(with_and_without_postgis):
+def test_ogr_pg_10(with_and_without_postgis):
 
     if gdaltest.pg_ds is None:
         return 'skip'
@@ -665,7 +665,7 @@ def ogr_pg_10(with_and_without_postgis):
 # Create table from data/poly.shp in INSERT mode.
 
 
-def ogr_pg_11(with_and_without_postgis):
+def test_ogr_pg_11(with_and_without_postgis):
 
     if gdaltest.pg_ds is None:
         return 'skip'
@@ -719,7 +719,7 @@ def ogr_pg_11(with_and_without_postgis):
 # Verify that stuff we just wrote is still OK.
 
 
-def ogr_pg_12(with_and_without_postgis):
+def test_ogr_pg_12(with_and_without_postgis):
     if gdaltest.pg_ds is None:
         return 'skip'
 
@@ -751,7 +751,7 @@ def ogr_pg_12(with_and_without_postgis):
 # Create a table with some date fields.
 
 
-def ogr_pg_13(with_and_without_postgis):
+def test_ogr_pg_13(with_and_without_postgis):
 
     if gdaltest.pg_ds is None:
         return 'skip'
@@ -788,7 +788,7 @@ def ogr_pg_13(with_and_without_postgis):
 # Fetch in several timezones to test our timezone processing.
 
 
-def ogr_pg_14(with_and_without_postgis):
+def test_ogr_pg_14(with_and_without_postgis):
     if gdaltest.pg_ds is None:
         return 'skip'
 
@@ -853,7 +853,7 @@ def ogr_pg_14(with_and_without_postgis):
 # Test very large query.
 
 
-def ogr_pg_15(with_and_without_postgis):
+def test_ogr_pg_15(with_and_without_postgis):
 
     if gdaltest.pg_ds is None:
         return 'skip'
@@ -876,7 +876,7 @@ def ogr_pg_15(with_and_without_postgis):
 ###############################################################################
 # Test very large statement.
 
-def ogr_pg_16(with_and_without_postgis):
+def test_ogr_pg_16(with_and_without_postgis):
 
     if gdaltest.pg_ds is None:
         return 'skip'
@@ -902,7 +902,7 @@ def ogr_pg_16(with_and_without_postgis):
 # Test requesting a non-existent table by name (bug 1480).
 
 
-def ogr_pg_17(with_and_without_postgis):
+def test_ogr_pg_17(with_and_without_postgis):
 
     if gdaltest.pg_ds is None:
         return 'skip'
@@ -927,7 +927,7 @@ def ogr_pg_17(with_and_without_postgis):
 # Test getting a layer by name that was not previously a layer.
 
 
-def ogr_pg_18(with_and_without_postgis):
+def test_ogr_pg_18(with_and_without_postgis):
 
     if gdaltest.pg_ds is None or not gdaltest.pg_has_postgis:
         return 'skip'
@@ -949,7 +949,7 @@ def ogr_pg_18(with_and_without_postgis):
 # Test reading 4-dim geometry in EWKT format
 
 
-def ogr_pg_20(with_and_without_postgis):
+def test_ogr_pg_20(with_and_without_postgis):
 
     if gdaltest.pg_ds is None or not gdaltest.pg_has_postgis:
         return 'skip'
@@ -1037,7 +1037,7 @@ def ogr_pg_20(with_and_without_postgis):
 # Test reading 4-dimension geometries in EWKB format
 
 
-def ogr_pg_21(with_and_without_postgis):
+def test_ogr_pg_21(with_and_without_postgis):
 
     if gdaltest.pg_ds is None or not gdaltest.pg_has_postgis:
         return 'skip'
@@ -1071,7 +1071,7 @@ def ogr_pg_21(with_and_without_postgis):
 # Check if the sub geometries of TIN and POLYHEDRALSURFACE are valid
 
 
-def ogr_pg_21_subgeoms(with_and_without_postgis):
+def test_ogr_pg_21_subgeoms(with_and_without_postgis):
 
     if gdaltest.pg_ds is None or not gdaltest.pg_has_postgis:
         return 'skip'
@@ -1116,7 +1116,7 @@ def ogr_pg_21_subgeoms(with_and_without_postgis):
 # Check if the 3d geometries of TIN, Triangle and POLYHEDRALSURFACE are valid
 
 
-def ogr_pg_21_3d_geometries():
+def test_ogr_pg_21_3d_geometries():
 
     if gdaltest.pg_ds is None:
         return 'skip'
@@ -1168,7 +1168,7 @@ def ogr_pg_21_3d_geometries():
 # This test checks if schema support and schema name quoting works well.
 
 
-def ogr_pg_22(with_and_without_postgis):
+def test_ogr_pg_22(with_and_without_postgis):
 
     if gdaltest.pg_ds is None:
         return 'skip'
@@ -1227,7 +1227,7 @@ def ogr_pg_22(with_and_without_postgis):
 # Create table with all data types
 
 
-def ogr_pg_23(with_and_without_postgis):
+def test_ogr_pg_23(with_and_without_postgis):
 
     if gdaltest.pg_ds is None:
         return 'skip'
@@ -1417,7 +1417,7 @@ def check_value_23(layer_defn, feat):
 # Test with PG: connection
 
 
-def ogr_pg_24(with_and_without_postgis):
+def test_ogr_pg_24(with_and_without_postgis):
 
     if gdaltest.pg_ds is None:
         return 'skip'
@@ -1442,7 +1442,7 @@ def ogr_pg_24(with_and_without_postgis):
 # Test with PG: connection and SELECT query
 
 
-def ogr_pg_25(with_and_without_postgis):
+def test_ogr_pg_25(with_and_without_postgis):
 
     if gdaltest.pg_ds is None:
         return 'skip'
@@ -1469,7 +1469,7 @@ def ogr_pg_25(with_and_without_postgis):
 # Duplicate all data types in INSERT mode
 
 
-def ogr_pg_28(with_and_without_postgis):
+def test_ogr_pg_28(with_and_without_postgis):
 
     if gdaltest.pg_ds is None:
         return 'skip'
@@ -1520,7 +1520,7 @@ def ogr_pg_28(with_and_without_postgis):
 # Test with PG: connection
 
 
-def ogr_pg_29(with_and_without_postgis):
+def test_ogr_pg_29(with_and_without_postgis):
 
     if gdaltest.pg_ds is None:
         return 'skip'
@@ -1552,7 +1552,7 @@ def ogr_pg_29(with_and_without_postgis):
 # Duplicate all data types in PG_USE_COPY mode
 
 
-def ogr_pg_30(with_and_without_postgis):
+def test_ogr_pg_30(with_and_without_postgis):
 
     if gdaltest.pg_ds is None:
         return 'skip'
@@ -1600,7 +1600,7 @@ def ogr_pg_30(with_and_without_postgis):
 ###############################################################################
 # Test the tables= connection string option
 
-def ogr_pg_31(with_and_without_postgis):
+def test_ogr_pg_31(with_and_without_postgis):
 
     if gdaltest.pg_ds is None:
         return 'skip'
@@ -1641,7 +1641,7 @@ def ogr_pg_31(with_and_without_postgis):
 # Test approximate srtext (#2123, #3508)
 
 
-def ogr_pg_32(with_and_without_postgis):
+def test_ogr_pg_32(with_and_without_postgis):
 
     if gdaltest.pg_ds is None or not gdaltest.pg_has_postgis:
         return 'skip'
@@ -1782,7 +1782,7 @@ def ogr_pg_32(with_and_without_postgis):
 # Test encoding as UTF8
 
 
-def ogr_pg_33(with_and_without_postgis):
+def test_ogr_pg_33(with_and_without_postgis):
 
     if gdaltest.pg_ds is None:
         return 'skip'
@@ -1804,7 +1804,7 @@ def ogr_pg_33(with_and_without_postgis):
 # Test encoding as Latin1
 
 
-def ogr_pg_34(with_and_without_postgis):
+def test_ogr_pg_34(with_and_without_postgis):
 
     if gdaltest.pg_ds is None:
         return 'skip'
@@ -1842,7 +1842,7 @@ def ogr_pg_34(with_and_without_postgis):
 ###############################################################################
 # Test for buffer overflows
 
-def ogr_pg_35(with_and_without_postgis):
+def test_ogr_pg_35(with_and_without_postgis):
 
     if gdaltest.pg_ds is None:
         return 'skip'
@@ -1874,7 +1874,7 @@ def ogr_pg_35(with_and_without_postgis):
 # Test support for inherited tables : tables inherited from a Postgis Table
 
 
-def ogr_pg_36(with_and_without_postgis):
+def test_ogr_pg_36(with_and_without_postgis):
 
     if gdaltest.pg_ds is None:
         return 'skip'
@@ -1929,7 +1929,7 @@ def ogr_pg_36(with_and_without_postgis):
     return 'success'
 
 
-def ogr_pg_36_bis(with_and_without_postgis):
+def test_ogr_pg_36_bis(with_and_without_postgis):
 
     if gdaltest.pg_ds is None:
         return 'skip'
@@ -1955,7 +1955,7 @@ def ogr_pg_36_bis(with_and_without_postgis):
 # Test support for inherited tables : Postgis table inherited from a non-Postgis table
 
 
-def ogr_pg_37(with_and_without_postgis):
+def test_ogr_pg_37(with_and_without_postgis):
 
     if gdaltest.pg_ds is None or not gdaltest.pg_has_postgis:
         return 'skip'
@@ -1986,7 +1986,7 @@ def ogr_pg_37(with_and_without_postgis):
 # Test support for multiple geometry columns (RFC 41)
 
 
-def ogr_pg_38(with_and_without_postgis):
+def test_ogr_pg_38(with_and_without_postgis):
     if gdaltest.pg_ds is None or not gdaltest.pg_has_postgis:
         return 'skip'
 
@@ -2074,7 +2074,7 @@ def ogr_pg_38(with_and_without_postgis):
 # Test support for named views
 
 
-def ogr_pg_39(with_and_without_postgis):
+def test_ogr_pg_39(with_and_without_postgis):
     if gdaltest.pg_ds is None:
         return 'skip'
 
@@ -2165,7 +2165,7 @@ def ogr_pg_39(with_and_without_postgis):
 # Test GetFeature() with an invalid id
 
 
-def ogr_pg_40(with_and_without_postgis):
+def test_ogr_pg_40(with_and_without_postgis):
     if gdaltest.pg_ds is None:
         return 'skip'
 
@@ -2179,7 +2179,7 @@ def ogr_pg_40(with_and_without_postgis):
 # Test active_schema= option
 
 
-def ogr_pg_41(with_and_without_postgis):
+def test_ogr_pg_41(with_and_without_postgis):
     if gdaltest.pg_ds is None:
         return 'skip'
 
@@ -2250,7 +2250,7 @@ def ogr_pg_41(with_and_without_postgis):
 # Test schemas= option
 
 
-def ogr_pg_42(with_and_without_postgis):
+def test_ogr_pg_42(with_and_without_postgis):
     if gdaltest.pg_ds is None:
         return 'skip'
 
@@ -2315,7 +2315,7 @@ def ogr_pg_42(with_and_without_postgis):
 ###############################################################################
 # Test schemas= option
 
-def ogr_pg_43(with_and_without_postgis):
+def test_ogr_pg_43(with_and_without_postgis):
     if gdaltest.pg_ds is None:
         return 'skip'
 
@@ -2352,7 +2352,7 @@ def ogr_pg_43(with_and_without_postgis):
 # Test for table and column names that need quoting (#2945)
 
 
-def ogr_pg_44(with_and_without_postgis):
+def test_ogr_pg_44(with_and_without_postgis):
 
     if gdaltest.pg_ds is None:
         return 'skip'
@@ -2400,7 +2400,7 @@ def ogr_pg_44(with_and_without_postgis):
 # Test SetNextByIndex (#3117)
 
 
-def ogr_pg_45(with_and_without_postgis):
+def test_ogr_pg_45(with_and_without_postgis):
 
     if gdaltest.pg_ds is None:
         return 'skip'
@@ -2434,7 +2434,7 @@ def ogr_pg_45(with_and_without_postgis):
 # with SetFeature()
 
 
-def ogr_pg_46(with_and_without_postgis):
+def test_ogr_pg_46(with_and_without_postgis):
 
     if gdaltest.pg_ds is None:
         return 'skip'
@@ -2496,7 +2496,7 @@ def ogr_pg_46(with_and_without_postgis):
 # Test that we can handle 'geography' column type introduced in PostGIS 1.5
 
 
-def ogr_pg_47(with_and_without_postgis):
+def test_ogr_pg_47(with_and_without_postgis):
 
     if gdaltest.pg_ds is None:
         return 'skip'
@@ -2613,7 +2613,7 @@ def ogr_pg_47(with_and_without_postgis):
 # PostGIS DB.
 
 
-def ogr_pg_48(with_and_without_postgis):
+def test_ogr_pg_48(with_and_without_postgis):
 
     if gdaltest.pg_ds is None:
         return 'skip'
@@ -2698,7 +2698,7 @@ def ogr_pg_48(with_and_without_postgis):
 # Go on with previous test but set PGSQL_OGR_FID this time
 
 
-def ogr_pg_49(with_and_without_postgis):
+def test_ogr_pg_49(with_and_without_postgis):
 
     if gdaltest.pg_ds is None:
         return 'skip'
@@ -2729,7 +2729,7 @@ def ogr_pg_49(with_and_without_postgis):
 # This tests writing using COPY and INSERT
 
 
-def ogr_pg_50(with_and_without_postgis):
+def test_ogr_pg_50(with_and_without_postgis):
 
     if gdaltest.pg_ds is None:
         return 'skip'
@@ -2798,7 +2798,7 @@ def ogr_pg_50(with_and_without_postgis):
 # Run test_ogrsf
 
 
-def ogr_pg_51(with_and_without_postgis):
+def test_ogr_pg_51(with_and_without_postgis):
 
     if gdaltest.pg_ds is None:
         return 'skip'
@@ -2819,7 +2819,7 @@ def ogr_pg_51(with_and_without_postgis):
 # Run test_ogrsf with -sql
 
 
-def ogr_pg_52(with_and_without_postgis):
+def test_ogr_pg_52(with_and_without_postgis):
 
     if gdaltest.pg_ds is None:
         return 'skip'
@@ -2840,7 +2840,7 @@ def ogr_pg_52(with_and_without_postgis):
 # Test creating a layer with explicitly wkbNone geometry type.
 
 
-def ogr_pg_53(with_and_without_postgis):
+def test_ogr_pg_53(with_and_without_postgis):
 
     if gdaltest.pg_ds is None:
         return 'skip'
@@ -2901,7 +2901,7 @@ def ogr_pg_53(with_and_without_postgis):
 # Check that we can overwrite a non-spatial geometry table (#4012)
 
 
-def ogr_pg_53_bis(with_and_without_postgis):
+def test_ogr_pg_53_bis(with_and_without_postgis):
     import test_cli_utilities
     if test_cli_utilities.get_ogr2ogr_path() is None:
         return 'skip'
@@ -2926,7 +2926,7 @@ def ogr_pg_53_bis(with_and_without_postgis):
 # Test reading AsEWKB()
 
 
-def ogr_pg_54(with_and_without_postgis):
+def test_ogr_pg_54(with_and_without_postgis):
 
     if gdaltest.pg_ds is None:
         return 'skip'
@@ -2951,7 +2951,7 @@ def ogr_pg_54(with_and_without_postgis):
 # Test reading geoms as Base64 encoded strings
 
 
-def ogr_pg_55(with_and_without_postgis):
+def test_ogr_pg_55(with_and_without_postgis):
 
     if gdaltest.pg_ds is None:
         return 'skip'
@@ -2984,7 +2984,7 @@ def ogr_pg_55(with_and_without_postgis):
 # non-spatial table and without FID in COPY mode (#4040)
 
 
-def ogr_pg_56(with_and_without_postgis):
+def test_ogr_pg_56(with_and_without_postgis):
 
     if gdaltest.pg_ds is None:
         return 'skip'
@@ -3073,7 +3073,7 @@ def ogr_pg_56(with_and_without_postgis):
 # Test inserting an empty feature
 
 
-def ogr_pg_57(with_and_without_postgis):
+def test_ogr_pg_57(with_and_without_postgis):
 
     if gdaltest.pg_ds is None:
         return 'skip'
@@ -3093,7 +3093,7 @@ def ogr_pg_57(with_and_without_postgis):
 # Test RFC35
 
 
-def ogr_pg_58(with_and_without_postgis):
+def test_ogr_pg_58(with_and_without_postgis):
 
     if gdaltest.pg_ds is None:
         return 'skip'
@@ -3154,7 +3154,7 @@ def ogr_pg_58(with_and_without_postgis):
 # but which is not the layer name.
 
 
-def ogr_pg_59(with_and_without_postgis):
+def test_ogr_pg_59(with_and_without_postgis):
 
     if gdaltest.pg_ds is None:
         return 'skip'
@@ -3184,7 +3184,7 @@ def ogr_pg_59(with_and_without_postgis):
 # non-incrementing PK.
 
 
-def ogr_pg_60(with_and_without_postgis):
+def test_ogr_pg_60(with_and_without_postgis):
 
     if gdaltest.pg_ds is None:
         return 'skip'
@@ -3222,7 +3222,7 @@ def ogr_pg_60(with_and_without_postgis):
 # Test insertion of features with FID set in COPY mode (#4495)
 
 
-def ogr_pg_61(with_and_without_postgis):
+def test_ogr_pg_61(with_and_without_postgis):
 
     if gdaltest.pg_ds is None:
         return 'skip'
@@ -3270,7 +3270,7 @@ def ogr_pg_61(with_and_without_postgis):
 # Test ExecuteSQL() and getting SRID of the request (#4699)
 
 
-def ogr_pg_62(with_and_without_postgis):
+def test_ogr_pg_62(with_and_without_postgis):
 
     if gdaltest.pg_ds is None:
         return 'skip'
@@ -3305,7 +3305,7 @@ def ogr_pg_62(with_and_without_postgis):
 # Test COLUMN_TYPES layer creation option (#4788)
 
 
-def ogr_pg_63(with_and_without_postgis):
+def test_ogr_pg_63(with_and_without_postgis):
 
     if gdaltest.pg_ds is None:
         return 'skip'
@@ -3350,7 +3350,7 @@ def ogr_pg_63(with_and_without_postgis):
 # Test OGR_TRUNCATE config. option (#5091)
 
 
-def ogr_pg_64(with_and_without_postgis):
+def test_ogr_pg_64(with_and_without_postgis):
 
     if gdaltest.pg_ds is None:
         return 'skip'
@@ -3393,7 +3393,7 @@ def ogr_pg_64(with_and_without_postgis):
 # Test RFC 41
 
 
-def ogr_pg_65(with_and_without_postgis):
+def test_ogr_pg_65(with_and_without_postgis):
 
     if gdaltest.pg_ds is None:
         return 'skip'
@@ -3555,7 +3555,7 @@ def ogr_pg_65(with_and_without_postgis):
 # Run test_ogrsf
 
 
-def ogr_pg_66(with_and_without_postgis):
+def test_ogr_pg_66(with_and_without_postgis):
 
     if gdaltest.pg_ds is None:
         return 'skip'
@@ -3579,7 +3579,7 @@ def ogr_pg_66(with_and_without_postgis):
 # Test retrieving SRID from values (#5131)
 
 
-def ogr_pg_67(with_and_without_postgis):
+def test_ogr_pg_67(with_and_without_postgis):
 
     if gdaltest.pg_ds is None:
         return 'skip'
@@ -3630,7 +3630,7 @@ def ogr_pg_67(with_and_without_postgis):
 # Test retrieving SRID from values even if we don't have select rights on geometry_columns (#5131)
 
 
-def ogr_pg_68(with_and_without_postgis):
+def test_ogr_pg_68(with_and_without_postgis):
 
     if gdaltest.pg_ds is None:
         return 'skip'
@@ -3688,7 +3688,7 @@ def has_run_load_tables(ds):
     return int(ds.GetMetadataItem("bHasLoadTables", "_DEBUG_"))
 
 
-def ogr_pg_69(with_and_without_postgis):
+def test_ogr_pg_69(with_and_without_postgis):
 
     if gdaltest.pg_ds is None:
         return 'skip'
@@ -3731,7 +3731,7 @@ def ogr_pg_69(with_and_without_postgis):
 # Test historical non-differed creation of tables (#5547)
 
 
-def ogr_pg_70(with_and_without_postgis):
+def test_ogr_pg_70(with_and_without_postgis):
 
     if gdaltest.pg_ds is None:
         return 'skip'
@@ -3793,7 +3793,7 @@ def ogr_pg_70(with_and_without_postgis):
 # Test interoperability of WKT/WKB with PostGIS.
 
 
-def ogr_pg_71(with_and_without_postgis):
+def test_ogr_pg_71(with_and_without_postgis):
 
     if gdaltest.pg_ds is None:
         return 'skip'
@@ -3930,7 +3930,7 @@ def ogr_pg_71(with_and_without_postgis):
 # Test 64 bit FID
 
 
-def ogr_pg_72(with_and_without_postgis):
+def test_ogr_pg_72(with_and_without_postgis):
 
     if gdaltest.pg_ds is None:
         return 'skip'
@@ -3999,7 +3999,7 @@ def ogr_pg_72(with_and_without_postgis):
 # Test not nullable fields
 
 
-def ogr_pg_73(with_and_without_postgis):
+def test_ogr_pg_73(with_and_without_postgis):
 
     if gdaltest.pg_ds is None:
         return 'skip'
@@ -4108,7 +4108,7 @@ def ogr_pg_73(with_and_without_postgis):
 # Test default values
 
 
-def ogr_pg_74(with_and_without_postgis):
+def test_ogr_pg_74(with_and_without_postgis):
 
     if gdaltest.pg_ds is None:
         return 'skip'
@@ -4280,7 +4280,7 @@ def ogr_pg_74(with_and_without_postgis):
 # Test creating a field with the fid name
 
 
-def ogr_pg_75(with_and_without_postgis):
+def test_ogr_pg_75(with_and_without_postgis):
 
     if gdaltest.pg_ds is None:
         return 'skip'
@@ -4401,7 +4401,7 @@ def ogr_pg_76_get_transaction_state(ds):
             int(ds.GetMetadataItem("bUserTransactionActive", "_DEBUG_")))
 
 
-def ogr_pg_76(with_and_without_postgis):
+def test_ogr_pg_76(with_and_without_postgis):
 
     if gdaltest.pg_ds is None:
         return 'skip'
@@ -4876,7 +4876,7 @@ def ogr_pg_76_scenario4(lyr1, lyr2with_and_without_postgis):
 # Test ogr2ogr can insert multiple layers at once
 
 
-def ogr_pg_77(with_and_without_postgis):
+def test_ogr_pg_77(with_and_without_postgis):
     import test_cli_utilities
     if test_cli_utilities.get_ogr2ogr_path() is None:
         return 'skip'
@@ -4934,7 +4934,7 @@ def ogr_pg_77(with_and_without_postgis):
 # Test manually added geometry constraints
 
 
-def ogr_pg_78(with_and_without_postgis):
+def test_ogr_pg_78(with_and_without_postgis):
 
     if gdaltest.pg_ds is None or not gdaltest.pg_has_postgis_2:
         return 'skip'
@@ -5032,7 +5032,7 @@ def ogr_pg_78(with_and_without_postgis):
 # Test PRELUDE_STATEMENTS and CLOSING_STATEMENTS open options
 
 
-def ogr_pg_79(with_and_without_postgis):
+def test_ogr_pg_79(with_and_without_postgis):
 
     if gdaltest.pg_ds is None:
         return 'skip'
@@ -5116,7 +5116,7 @@ def ogr_pg_79(with_and_without_postgis):
 # Test retrieving an error from ExecuteSQL() (#6194)
 
 
-def ogr_pg_80():
+def test_ogr_pg_80():
 
     if gdaltest.pg_ds is None:
         return 'skip'
@@ -5137,7 +5137,7 @@ def ogr_pg_80():
 # Test that ogr2ogr -skip properly rollbacks transactions (#6328)
 
 
-def ogr_pg_81():
+def test_ogr_pg_81():
 
     if gdaltest.pg_ds is None:
         return 'skip'
@@ -5186,7 +5186,7 @@ def ogr_pg_81():
 # is not-nullable, and hence the CreateGeomField() interface is used.
 
 
-def ogr_pg_82():
+def test_ogr_pg_82():
 
     if gdaltest.pg_ds is None or not gdaltest.pg_has_postgis:
         return 'skip'
@@ -5204,7 +5204,7 @@ def ogr_pg_82():
 # Test ZM support
 
 
-def ogr_pg_83():
+def test_ogr_pg_83():
 
     if gdaltest.pg_ds is None or not gdaltest.pg_has_postgis:
         return 'skip'
@@ -5273,7 +5273,7 @@ def ogr_pg_83():
 # Test description
 
 
-def ogr_pg_84():
+def test_ogr_pg_84():
 
     if gdaltest.pg_ds is None:
         return 'skip'
@@ -5354,7 +5354,7 @@ def ogr_pg_84():
 # Test append of several layers in PG_USE_COPY mode (#6411)
 
 
-def ogr_pg_85():
+def test_ogr_pg_85():
 
     if gdaltest.pg_ds is None:
         return 'skip'
@@ -5415,7 +5415,7 @@ def ogr_pg_85():
 # Test OFTBinary
 
 
-def ogr_pg_86():
+def test_ogr_pg_86():
 
     if gdaltest.pg_ds is None:
         return 'skip'
@@ -5458,7 +5458,7 @@ def ogr_pg_86():
 # Test sequence updating (#7032)
 
 
-def ogr_pg_87():
+def test_ogr_pg_87():
 
     if gdaltest.pg_ds is None:
         return 'skip'
@@ -5493,7 +5493,7 @@ def ogr_pg_87():
 # Test JSON subtype
 
 
-def ogr_pg_json():
+def test_ogr_pg_json():
 
     if gdaltest.pg_ds is None:
         return 'skip'
@@ -5529,7 +5529,7 @@ def ogr_pg_json():
 #
 
 
-def ogr_pg_table_cleanup(with_and_without_postgis):
+def test_ogr_pg_table_cleanup(with_and_without_postgis):
 
     if gdaltest.pg_ds is None:
         return 'skip'
@@ -5608,13 +5608,13 @@ def ogr_pg_table_cleanup(with_and_without_postgis):
     return 'success'
 
 
-def ogr_pg_cleanup(with_and_without_postgis):
+def test_ogr_pg_cleanup(with_and_without_postgis):
 
     if gdaltest.pg_ds is None:
         return 'skip'
 
     gdaltest.pg_ds = ogr.Open('PG:' + gdaltest.pg_connection_string, update=1)
-    ogr_pg_table_cleanup()
+    test_ogr_pg_table_cleanup()
 
     gdaltest.pg_ds.Destroy()
     gdaltest.pg_ds = None
@@ -5625,98 +5625,98 @@ def ogr_pg_cleanup(with_and_without_postgis):
 
 
 gdaltest_list = [
-    ogr_pg_table_cleanup,
-    ogr_pg_2,
-    ogr_pg_19,
-    ogr_pg_19_2,
-    ogr_pg_3,
-    ogr_pg_4,
-    ogr_pg_5,
-    ogr_pg_6,
-    ogr_pg_7,
-    ogr_pg_8,
-    ogr_pg_9,
-    ogr_pg_10,
-    ogr_pg_11,
-    ogr_pg_12,
-    ogr_pg_13,
-    ogr_pg_14,
-    ogr_pg_15,
-    ogr_pg_16,
-    ogr_pg_17,
-    ogr_pg_18,
-    ogr_pg_20,
-    ogr_pg_21,
-    ogr_pg_21_subgeoms,
-    ogr_pg_21_3d_geometries,
-    ogr_pg_22,
-    ogr_pg_23,
-    ogr_pg_24,
-    ogr_pg_25,
-    ogr_pg_28,
-    ogr_pg_29,
-    ogr_pg_30,
-    ogr_pg_31,
-    ogr_pg_32,
-    ogr_pg_33,
-    ogr_pg_34,
-    ogr_pg_35,
-    ogr_pg_36,
-    ogr_pg_36_bis,
-    ogr_pg_37,
-    ogr_pg_38,
-    ogr_pg_39,
-    ogr_pg_40,
-    ogr_pg_41,
-    ogr_pg_42,
-    ogr_pg_43,
-    ogr_pg_44,
-    ogr_pg_45,
-    ogr_pg_46,
-    ogr_pg_47,
-    ogr_pg_48,
-    ogr_pg_49,
-    ogr_pg_50,
-    ogr_pg_51,
-    ogr_pg_52,
-    ogr_pg_53,
-    ogr_pg_53_bis,
-    ogr_pg_54,
-    ogr_pg_55,
-    ogr_pg_56,
-    ogr_pg_57,
-    ogr_pg_58,
-    ogr_pg_59,
-    ogr_pg_60,
-    ogr_pg_61,
-    ogr_pg_62,
-    ogr_pg_63,
-    ogr_pg_64,
-    ogr_pg_65,
-    ogr_pg_66,
-    ogr_pg_67,
-    ogr_pg_68,
-    ogr_pg_69,
-    ogr_pg_70,
-    ogr_pg_71,
-    ogr_pg_72,
-    ogr_pg_73,
-    ogr_pg_74,
-    ogr_pg_75,
-    ogr_pg_76,
-    ogr_pg_77,
-    ogr_pg_78,
-    ogr_pg_79,
-    ogr_pg_80,
-    ogr_pg_81,
-    ogr_pg_82,
-    ogr_pg_83,
-    ogr_pg_84,
-    ogr_pg_85,
-    ogr_pg_86,
-    ogr_pg_87,
-    ogr_pg_json,
-    ogr_pg_cleanup
+    test_ogr_pg_table_cleanup,
+    test_ogr_pg_2,
+    test_ogr_pg_19,
+    test_ogr_pg_19_2,
+    test_ogr_pg_3,
+    test_ogr_pg_4,
+    test_ogr_pg_5,
+    test_ogr_pg_6,
+    test_ogr_pg_7,
+    test_ogr_pg_8,
+    test_ogr_pg_9,
+    test_ogr_pg_10,
+    test_ogr_pg_11,
+    test_ogr_pg_12,
+    test_ogr_pg_13,
+    test_ogr_pg_14,
+    test_ogr_pg_15,
+    test_ogr_pg_16,
+    test_ogr_pg_17,
+    test_ogr_pg_18,
+    test_ogr_pg_20,
+    test_ogr_pg_21,
+    test_ogr_pg_21_subgeoms,
+    test_ogr_pg_21_3d_geometries,
+    test_ogr_pg_22,
+    test_ogr_pg_23,
+    test_ogr_pg_24,
+    test_ogr_pg_25,
+    test_ogr_pg_28,
+    test_ogr_pg_29,
+    test_ogr_pg_30,
+    test_ogr_pg_31,
+    test_ogr_pg_32,
+    test_ogr_pg_33,
+    test_ogr_pg_34,
+    test_ogr_pg_35,
+    test_ogr_pg_36,
+    test_ogr_pg_36_bis,
+    test_ogr_pg_37,
+    test_ogr_pg_38,
+    test_ogr_pg_39,
+    test_ogr_pg_40,
+    test_ogr_pg_41,
+    test_ogr_pg_42,
+    test_ogr_pg_43,
+    test_ogr_pg_44,
+    test_ogr_pg_45,
+    test_ogr_pg_46,
+    test_ogr_pg_47,
+    test_ogr_pg_48,
+    test_ogr_pg_49,
+    test_ogr_pg_50,
+    test_ogr_pg_51,
+    test_ogr_pg_52,
+    test_ogr_pg_53,
+    test_ogr_pg_53_bis,
+    test_ogr_pg_54,
+    test_ogr_pg_55,
+    test_ogr_pg_56,
+    test_ogr_pg_57,
+    test_ogr_pg_58,
+    test_ogr_pg_59,
+    test_ogr_pg_60,
+    test_ogr_pg_61,
+    test_ogr_pg_62,
+    test_ogr_pg_63,
+    test_ogr_pg_64,
+    test_ogr_pg_65,
+    test_ogr_pg_66,
+    test_ogr_pg_67,
+    test_ogr_pg_68,
+    test_ogr_pg_69,
+    test_ogr_pg_70,
+    test_ogr_pg_71,
+    test_ogr_pg_72,
+    test_ogr_pg_73,
+    test_ogr_pg_74,
+    test_ogr_pg_75,
+    test_ogr_pg_76,
+    test_ogr_pg_77,
+    test_ogr_pg_78,
+    test_ogr_pg_79,
+    test_ogr_pg_80,
+    test_ogr_pg_81,
+    test_ogr_pg_82,
+    test_ogr_pg_83,
+    test_ogr_pg_84,
+    test_ogr_pg_85,
+    test_ogr_pg_86,
+    test_ogr_pg_87,
+    test_ogr_pg_json,
+    test_ogr_pg_cleanup
 ]
 
 
diff --git a/autotest/ogr/ogr_pgdump.py b/autotest/ogr/ogr_pgdump.py
index 56de8f87c00c..f9e4d25096ef 100755
--- a/autotest/ogr/ogr_pgdump.py
+++ b/autotest/ogr/ogr_pgdump.py
@@ -42,7 +42,7 @@
 # Create table from data/poly.shp
 
 
-def ogr_pgdump_1():
+def test_ogr_pgdump_1():
 
     try:
         os.remove('tmp/tpoly.sql')
@@ -110,7 +110,7 @@ def ogr_pgdump_1():
 # Create table from data/poly.shp with PG_USE_COPY=YES
 
 
-def ogr_pgdump_2():
+def test_ogr_pgdump_2():
 
     try:
         os.remove('tmp/tpoly.sql')
@@ -184,7 +184,7 @@ def ogr_pgdump_2():
 ###############################################################################
 # Create table from data/poly.shp without any geometry
 
-def ogr_pgdump_3():
+def test_ogr_pgdump_3():
 
     try:
         os.remove('tmp/tpoly.sql')
@@ -270,7 +270,7 @@ def ogr_pgdump_3():
 # Test multi-geometry support
 
 
-def ogr_pgdump_4():
+def test_ogr_pgdump_4():
 
     ds = ogr.GetDriverByName('PGDump').CreateDataSource('tmp/ogr_pgdump_4.sql', options=['LINEFORMAT=LF'])
     if ds.TestCapability(ogr.ODsCCreateGeomFieldAfterCreateLayer) == 0:
@@ -323,7 +323,7 @@ def ogr_pgdump_4():
 # Test non nullable field support
 
 
-def ogr_pgdump_5():
+def test_ogr_pgdump_5():
 
     ds = ogr.GetDriverByName('PGDump').CreateDataSource('/vsimem/ogr_pgdump_5.sql', options=['LINEFORMAT=LF'])
     lyr = ds.CreateLayer('test', geom_type=ogr.wkbNone)
@@ -385,7 +385,7 @@ def ogr_pgdump_5():
 # Test default values
 
 
-def ogr_pgdump_6():
+def test_ogr_pgdump_6():
 
     ds = ogr.GetDriverByName('PGDump').CreateDataSource('/vsimem/ogr_pgdump_6.sql', options=['LINEFORMAT=LF'])
     lyr = ds.CreateLayer('test', geom_type=ogr.wkbNone)
@@ -479,7 +479,7 @@ def ogr_pgdump_6():
 # Test creating a field with the fid name (PG_USE_COPY=NO)
 
 
-def ogr_pgdump_7():
+def test_ogr_pgdump_7():
 
     ds = ogr.GetDriverByName('PGDump').CreateDataSource('/vsimem/ogr_pgdump_7.sql', options=['LINEFORMAT=LF'])
     lyr = ds.CreateLayer('test', geom_type=ogr.wkbNone, options=['FID=myfid'])
@@ -590,7 +590,7 @@ def ogr_pgdump_7():
 # Test creating a field with the fid name (PG_USE_COPY=NO)
 
 
-def ogr_pgdump_8():
+def test_ogr_pgdump_8():
 
     ds = ogr.GetDriverByName('PGDump').CreateDataSource('/vsimem/ogr_pgdump_8.sql', options=['LINEFORMAT=LF'])
     lyr = ds.CreateLayer('test', geom_type=ogr.wkbNone, options=['FID=myfid'])
@@ -709,7 +709,7 @@ def ogr_pgdump_8():
 # Test creating a field with the fid name (PG_USE_COPY=NO)
 
 
-def ogr_pgdump_9(pg_use_copy='YES'):
+def test_ogr_pgdump_9(pg_use_copy='YES'):
 
     gdal.SetConfigOption('PG_USE_COPY', pg_use_copy)
 
@@ -771,14 +771,14 @@ def ogr_pgdump_9(pg_use_copy='YES'):
     return 'success'
 
 
-def ogr_pgdump_10():
-    return ogr_pgdump_9('NO')
+def test_ogr_pgdump_10():
+    return test_ogr_pgdump_9('NO')
 
 ###############################################################################
 # Export POINT EMPTY for PostGIS 2.2
 
 
-def ogr_pgdump_11():
+def test_ogr_pgdump_11():
 
     ds = ogr.GetDriverByName('PGDump').CreateDataSource('/vsimem/ogr_pgdump_11.sql', options=['LINEFORMAT=LF'])
     lyr = ds.CreateLayer('test', geom_type=ogr.wkbPoint, options=['POSTGIS_VERSION=2.2'])
@@ -809,7 +809,7 @@ def ogr_pgdump_11():
 # is not-nullable, and hence the CreateGeomField() interface is used.
 
 
-def ogr_pgdump_12():
+def test_ogr_pgdump_12():
 
     ds = ogr.GetDriverByName('PGDump').CreateDataSource('/vsimem/ogr_pgdump_12.sql', options=['LINEFORMAT=LF'])
     lyr = ds.CreateLayer('test', geom_type=ogr.wkbNone, options=['GEOMETRY_NAME=another_name'])
@@ -832,7 +832,7 @@ def ogr_pgdump_12():
 # Test ZM support
 
 
-def ogr_pgdump_13():
+def test_ogr_pgdump_13():
 
     tests = [[ogr.wkbUnknown, [], 'POINT ZM (1 2 3 4)', ["'GEOMETRY',2)", "0101000000000000000000F03F0000000000000040"]],
              [ogr.wkbUnknown, ['GEOM_TYPE=geography'], 'POINT ZM (1 2 3 4)', ["geography(GEOMETRY", "0101000000000000000000F03F0000000000000040"]],
@@ -906,7 +906,7 @@ def ogr_pgdump_13():
 # Test description
 
 
-def ogr_pgdump_14():
+def test_ogr_pgdump_14():
 
     # Set with DESCRIPTION layer creation option
     ds = ogr.GetDriverByName('PGDump').CreateDataSource('/vsimem/ogr_pgdump_14.sql', options=['LINEFORMAT=LF'])
@@ -965,7 +965,7 @@ def ogr_pgdump_14():
 # NULL vs unset
 
 
-def ogr_pgdump_15():
+def test_ogr_pgdump_15():
 
     ds = ogr.GetDriverByName('PGDump').CreateDataSource('/vsimem/ogr_pgdump_15.sql', options=['LINEFORMAT=LF'])
     lyr = ds.CreateLayer('test', geom_type=ogr.wkbNone)
@@ -995,7 +995,7 @@ def ogr_pgdump_15():
 # Test sequence updating
 
 
-def ogr_pgdump_16():
+def test_ogr_pgdump_16():
 
     for pg_use_copy in ('YES', 'NO'):
 
@@ -1027,7 +1027,7 @@ def ogr_pgdump_16():
 # Cleanup
 
 
-def ogr_pgdump_cleanup():
+def test_ogr_pgdump_cleanup():
 
     try:
         os.remove('tmp/tpoly.sql')
@@ -1041,23 +1041,23 @@ def ogr_pgdump_cleanup():
 
 
 gdaltest_list = [
-    ogr_pgdump_1,
-    ogr_pgdump_2,
-    ogr_pgdump_3,
-    ogr_pgdump_4,
-    ogr_pgdump_5,
-    ogr_pgdump_6,
-    ogr_pgdump_7,
-    ogr_pgdump_8,
-    ogr_pgdump_9,
-    ogr_pgdump_10,
-    ogr_pgdump_11,
-    ogr_pgdump_12,
-    ogr_pgdump_13,
-    ogr_pgdump_14,
-    ogr_pgdump_15,
-    ogr_pgdump_16,
-    ogr_pgdump_cleanup]
+    test_ogr_pgdump_1,
+    test_ogr_pgdump_2,
+    test_ogr_pgdump_3,
+    test_ogr_pgdump_4,
+    test_ogr_pgdump_5,
+    test_ogr_pgdump_6,
+    test_ogr_pgdump_7,
+    test_ogr_pgdump_8,
+    test_ogr_pgdump_9,
+    test_ogr_pgdump_10,
+    test_ogr_pgdump_11,
+    test_ogr_pgdump_12,
+    test_ogr_pgdump_13,
+    test_ogr_pgdump_14,
+    test_ogr_pgdump_15,
+    test_ogr_pgdump_16,
+    test_ogr_pgdump_cleanup]
 
 
 if __name__ == '__main__':
diff --git a/autotest/ogr/ogr_pgeo.py b/autotest/ogr/ogr_pgeo.py
index 38af7371755a..7e527483d689 100755
--- a/autotest/ogr/ogr_pgeo.py
+++ b/autotest/ogr/ogr_pgeo.py
@@ -304,7 +304,7 @@ def ogr_pgeo_cleanup():
 #
 
 
-def ogr_pgeo_main():
+def test_ogr_pgeo_main():
 
     # Run with the PGeo driver only (MDB disabled)
     gdaltest.run_tests([ogr_pgeo_1])
@@ -318,7 +318,7 @@ def ogr_pgeo_main():
 
 
 gdaltest_list = [
-    ogr_pgeo_main
+    test_ogr_pgeo_main
 ]
 
 if __name__ == '__main__':
diff --git a/autotest/ogr/ogr_plscenes.py b/autotest/ogr/ogr_plscenes.py
index 4dd8e2ca037d..f888a826630e 100755
--- a/autotest/ogr/ogr_plscenes.py
+++ b/autotest/ogr/ogr_plscenes.py
@@ -41,7 +41,7 @@
 # Find PLScenes driver
 
 
-def ogr_plscenes_init():
+def test_ogr_plscenes_init():
 
     gdaltest.plscenes_drv = ogr.GetDriverByName('PLScenes')
 
@@ -53,7 +53,7 @@ def ogr_plscenes_init():
 # Test Data V1 API catalog listing with a single catalog
 
 
-def ogr_plscenes_data_v1_catalog_no_paging():
+def test_ogr_plscenes_data_v1_catalog_no_paging():
 
     if gdaltest.plscenes_drv is None:
         return 'skip'
@@ -88,7 +88,7 @@ def ogr_plscenes_data_v1_catalog_no_paging():
 # Test Data V1 API catalog listing with catalog paging
 
 
-def ogr_plscenes_data_v1_catalog_paging():
+def test_ogr_plscenes_data_v1_catalog_paging():
 
     if gdaltest.plscenes_drv is None:
         return 'skip'
@@ -133,7 +133,7 @@ def ogr_plscenes_data_v1_catalog_paging():
 # Test Data V1 API
 
 
-def ogr_plscenes_data_v1_nominal():
+def test_ogr_plscenes_data_v1_nominal():
 
     if gdaltest.plscenes_drv is None:
         return 'skip'
@@ -619,7 +619,7 @@ def ogr_plscenes_data_v1_nominal():
 # Test robustness to errors in Data V1 API
 
 
-def ogr_plscenes_data_v1_errors():
+def test_ogr_plscenes_data_v1_errors():
 
     if gdaltest.plscenes_drv is None:
         return 'skip'
@@ -735,7 +735,7 @@ def ogr_plscenes_data_v1_errors():
 # Test Data V1 API against real server
 
 
-def ogr_plscenes_data_v1_live():
+def test_ogr_plscenes_data_v1_live():
 
     if gdaltest.plscenes_drv is None:
         return 'skip'
@@ -839,12 +839,12 @@ def ogr_plscenes_data_v1_live():
 
 
 gdaltest_list = [
-    ogr_plscenes_init,
-    ogr_plscenes_data_v1_catalog_no_paging,
-    ogr_plscenes_data_v1_catalog_paging,
-    ogr_plscenes_data_v1_nominal,
-    ogr_plscenes_data_v1_errors,
-    ogr_plscenes_data_v1_live
+    test_ogr_plscenes_init,
+    test_ogr_plscenes_data_v1_catalog_no_paging,
+    test_ogr_plscenes_data_v1_catalog_paging,
+    test_ogr_plscenes_data_v1_nominal,
+    test_ogr_plscenes_data_v1_errors,
+    test_ogr_plscenes_data_v1_live
 ]
 
 if __name__ == '__main__':
diff --git a/autotest/ogr/ogr_rec.py b/autotest/ogr/ogr_rec.py
index 7114732af9b3..465666e04892 100755
--- a/autotest/ogr/ogr_rec.py
+++ b/autotest/ogr/ogr_rec.py
@@ -37,7 +37,7 @@
 ###############################################################################
 
 
-def ogr_rec_1():
+def test_ogr_rec_1():
 
     import test_cli_utilities
     if test_cli_utilities.get_test_ogrsf_path() is None:
@@ -53,7 +53,7 @@ def ogr_rec_1():
 
 
 gdaltest_list = [
-    ogr_rec_1
+    test_ogr_rec_1
 ]
 
 if __name__ == '__main__':
diff --git a/autotest/ogr/ogr_refcount.py b/autotest/ogr/ogr_refcount.py
index f68fdf225645..0fa2f70dddda 100755
--- a/autotest/ogr/ogr_refcount.py
+++ b/autotest/ogr/ogr_refcount.py
@@ -36,7 +36,7 @@
 # Open two datasets in shared mode.
 
 
-def ogr_refcount_1():
+def test_ogr_refcount_1():
     # if ogr.GetOpenDSCount() != 0:
     #    gdaltest.post_reason( 'Initial Open DS count is not zero!' )
     #    return 'failed'
@@ -58,7 +58,7 @@ def ogr_refcount_1():
 # Verify that reopening one of the datasets returns the existing shared handle.
 
 
-def ogr_refcount_2():
+def test_ogr_refcount_2():
 
     ds_3 = ogr.OpenShared('data/idlink.dbf')
 
@@ -86,7 +86,7 @@ def ogr_refcount_2():
 # Verify that releasing the datasources has the expected behaviour.
 
 
-def ogr_refcount_3():
+def test_ogr_refcount_3():
 
     gdaltest.ds_3.Release()
 
@@ -106,7 +106,7 @@ def ogr_refcount_3():
 # Verify that we can walk the open datasource list.
 
 
-def ogr_refcount_4():
+def test_ogr_refcount_4():
 
     with gdaltest.error_handler():
         ds = ogr.GetOpenDS(0)
@@ -122,7 +122,7 @@ def ogr_refcount_4():
 ###############################################################################
 
 
-def ogr_refcount_cleanup():
+def test_ogr_refcount_cleanup():
     gdaltest.ds_2.Release()
 
     # if ogr.GetOpenDSCount() != 0:
@@ -133,11 +133,11 @@ def ogr_refcount_cleanup():
 
 
 gdaltest_list = [
-    ogr_refcount_1,
-    ogr_refcount_2,
-    ogr_refcount_3,
-    ogr_refcount_4,
-    ogr_refcount_cleanup]
+    test_ogr_refcount_1,
+    test_ogr_refcount_2,
+    test_ogr_refcount_3,
+    test_ogr_refcount_4,
+    test_ogr_refcount_cleanup]
 
 if __name__ == '__main__':
 
diff --git a/autotest/ogr/ogr_rfc30.py b/autotest/ogr/ogr_rfc30.py
index 5534c647b999..6d5868a7308f 100755
--- a/autotest/ogr/ogr_rfc30.py
+++ b/autotest/ogr/ogr_rfc30.py
@@ -60,7 +60,7 @@ def ogr_rfc30_1_internal(filename, layer_name):
     return 'success'
 
 
-def ogr_rfc30_1():
+def test_ogr_rfc30_1():
 
     if version_info >= (3, 0, 0):
         filename = '/vsimem/\u00e9.shp'
@@ -73,7 +73,7 @@ def ogr_rfc30_1():
     return ogr_rfc30_1_internal(filename, layer_name)
 
 
-def ogr_rfc30_1_bis():
+def test_ogr_rfc30_1_bis():
 
     if version_info >= (3, 0, 0):
         return 'skip'
@@ -87,7 +87,7 @@ def ogr_rfc30_1_bis():
     return ogr_rfc30_1_internal(filename, layer_name)
 
 
-gdaltest_list = [ogr_rfc30_1, ogr_rfc30_1_bis]
+gdaltest_list = [test_ogr_rfc30_1, test_ogr_rfc30_1_bis]
 
 if __name__ == '__main__':
 
diff --git a/autotest/ogr/ogr_rfc35_mem.py b/autotest/ogr/ogr_rfc35_mem.py
index e6dbe09ec6eb..4b792b80688c 100755
--- a/autotest/ogr/ogr_rfc35_mem.py
+++ b/autotest/ogr/ogr_rfc35_mem.py
@@ -39,7 +39,7 @@
 # Initiate the test file
 
 
-def ogr_rfc35_mem_1():
+def test_ogr_rfc35_mem_1():
 
     gdaltest.rfc35_mem_ds = ogr.GetDriverByName('Memory').CreateDataSource('rfc35_test')
     lyr = gdaltest.rfc35_mem_ds.CreateLayer('rfc35_test')
@@ -147,7 +147,7 @@ def Check(lyr, expected_order):
     return 'success'
 
 
-def ogr_rfc35_mem_2():
+def test_ogr_rfc35_mem_2():
 
     lyr = gdaltest.rfc35_mem_ds.GetLayer(0)
 
@@ -215,7 +215,7 @@ def ogr_rfc35_mem_2():
 # Test AlterFieldDefn() for change of name and width
 
 
-def ogr_rfc35_mem_3():
+def test_ogr_rfc35_mem_3():
 
     lyr = gdaltest.rfc35_mem_ds.GetLayer(0)
 
@@ -267,7 +267,7 @@ def ogr_rfc35_mem_3():
 # Test AlterFieldDefn() for change of type
 
 
-def ogr_rfc35_mem_4():
+def test_ogr_rfc35_mem_4():
 
     lyr = gdaltest.rfc35_mem_ds.GetLayer(0)
     lyr_defn = lyr.GetLayerDefn()
@@ -378,7 +378,7 @@ def ogr_rfc35_mem_4():
 # Test DeleteField()
 
 
-def ogr_rfc35_mem_5():
+def test_ogr_rfc35_mem_5():
 
     lyr = gdaltest.rfc35_mem_ds.GetLayer(0)
     lyr_defn = lyr.GetLayerDefn()
@@ -435,7 +435,7 @@ def ogr_rfc35_mem_5():
 # Initiate the test file
 
 
-def ogr_rfc35_mem_cleanup():
+def test_ogr_rfc35_mem_cleanup():
 
     gdaltest.rfc35_mem_ds = None
 
@@ -443,12 +443,12 @@ def ogr_rfc35_mem_cleanup():
 
 
 gdaltest_list = [
-    ogr_rfc35_mem_1,
-    ogr_rfc35_mem_2,
-    ogr_rfc35_mem_3,
-    ogr_rfc35_mem_4,
-    ogr_rfc35_mem_5,
-    ogr_rfc35_mem_cleanup]
+    test_ogr_rfc35_mem_1,
+    test_ogr_rfc35_mem_2,
+    test_ogr_rfc35_mem_3,
+    test_ogr_rfc35_mem_4,
+    test_ogr_rfc35_mem_5,
+    test_ogr_rfc35_mem_cleanup]
 
 
 if __name__ == '__main__':
diff --git a/autotest/ogr/ogr_rfc35_mitab.py b/autotest/ogr/ogr_rfc35_mitab.py
index 6fc3fd024b0b..05fa006309fb 100755
--- a/autotest/ogr/ogr_rfc35_mitab.py
+++ b/autotest/ogr/ogr_rfc35_mitab.py
@@ -62,7 +62,7 @@ def CheckFileSize(src_filename):
 # Initiate the test file
 
 
-def ogr_rfc35_mitab_1():
+def test_ogr_rfc35_mitab_1():
 
     ds = ogr.GetDriverByName('MapInfo File').CreateDataSource('/vsimem/rfc35_test.tab')
     lyr = ds.CreateLayer('rfc35_test')
@@ -177,7 +177,7 @@ def Check(lyr, expected_order):
     return 'success'
 
 
-def ogr_rfc35_mitab_2():
+def test_ogr_rfc35_mitab_2():
 
     ds = ogr.Open('/vsimem/rfc35_test.tab', update=1)
     lyr = ds.GetLayer(0)
@@ -296,7 +296,7 @@ def ogr_rfc35_mitab_2():
 # Test AlterFieldDefn() for change of name and width
 
 
-def ogr_rfc35_mitab_3():
+def test_ogr_rfc35_mitab_3():
 
     ds = ogr.Open('/vsimem/rfc35_test.tab', update=1)
     lyr = ds.GetLayer(0)
@@ -358,7 +358,7 @@ def ogr_rfc35_mitab_3():
 # Test AlterFieldDefn() for change of type
 
 
-def ogr_rfc35_mitab_4():
+def test_ogr_rfc35_mitab_4():
 
     ds = ogr.Open('/vsimem/rfc35_test.tab', update=1)
     lyr = ds.GetLayer(0)
@@ -543,7 +543,7 @@ def ogr_rfc35_mitab_4():
 # Test DeleteField()
 
 
-def ogr_rfc35_mitab_5():
+def test_ogr_rfc35_mitab_5():
 
     ds = ogr.Open('/vsimem/rfc35_test.tab', update=1)
     lyr = ds.GetLayer(0)
@@ -640,7 +640,7 @@ def ogr_rfc35_mitab_5():
 # Initiate the test file
 
 
-def ogr_rfc35_mitab_cleanup():
+def test_ogr_rfc35_mitab_cleanup():
 
     ogr.GetDriverByName('MapInfo File').DeleteDataSource('/vsimem/rfc35_test.tab')
 
@@ -648,12 +648,12 @@ def ogr_rfc35_mitab_cleanup():
 
 
 gdaltest_list = [
-    ogr_rfc35_mitab_1,
-    ogr_rfc35_mitab_2,
-    ogr_rfc35_mitab_3,
-    ogr_rfc35_mitab_4,
-    ogr_rfc35_mitab_5,
-    ogr_rfc35_mitab_cleanup]
+    test_ogr_rfc35_mitab_1,
+    test_ogr_rfc35_mitab_2,
+    test_ogr_rfc35_mitab_3,
+    test_ogr_rfc35_mitab_4,
+    test_ogr_rfc35_mitab_5,
+    test_ogr_rfc35_mitab_cleanup]
 
 
 if __name__ == '__main__':
diff --git a/autotest/ogr/ogr_rfc35_shape.py b/autotest/ogr/ogr_rfc35_shape.py
index c3553329a79f..40ae2975952f 100755
--- a/autotest/ogr/ogr_rfc35_shape.py
+++ b/autotest/ogr/ogr_rfc35_shape.py
@@ -62,7 +62,7 @@ def CheckFileSize(src_filename):
 # Initiate the test file
 
 
-def ogr_rfc35_shape_1():
+def test_ogr_rfc35_shape_1():
 
     ds = ogr.GetDriverByName('ESRI Shapefile').CreateDataSource('/vsimem/rfc35_test.dbf')
     lyr = ds.CreateLayer('rfc35_test')
@@ -177,7 +177,7 @@ def Check(lyr, expected_order):
     return 'success'
 
 
-def ogr_rfc35_shape_2():
+def test_ogr_rfc35_shape_2():
 
     ds = ogr.Open('/vsimem/rfc35_test.dbf', update=1)
     lyr = ds.GetLayer(0)
@@ -259,7 +259,7 @@ def ogr_rfc35_shape_2():
 # Test AlterFieldDefn() for change of name and width
 
 
-def ogr_rfc35_shape_3():
+def test_ogr_rfc35_shape_3():
 
     ds = ogr.Open('/vsimem/rfc35_test.dbf', update=1)
     lyr = ds.GetLayer(0)
@@ -316,7 +316,7 @@ def ogr_rfc35_shape_3():
 # Test AlterFieldDefn() for change of type
 
 
-def ogr_rfc35_shape_4():
+def test_ogr_rfc35_shape_4():
 
     ds = ogr.Open('/vsimem/rfc35_test.dbf', update=1)
     lyr = ds.GetLayer(0)
@@ -475,7 +475,7 @@ def ogr_rfc35_shape_4():
 # Test DeleteField()
 
 
-def ogr_rfc35_shape_5():
+def test_ogr_rfc35_shape_5():
 
     ds = ogr.Open('/vsimem/rfc35_test.dbf', update=1)
     lyr = ds.GetLayer(0)
@@ -554,7 +554,7 @@ def ogr_rfc35_shape_5():
 # Initiate the test file
 
 
-def ogr_rfc35_shape_cleanup():
+def test_ogr_rfc35_shape_cleanup():
 
     ogr.GetDriverByName('ESRI Shapefile').DeleteDataSource('/vsimem/rfc35_test.dbf')
 
@@ -562,12 +562,12 @@ def ogr_rfc35_shape_cleanup():
 
 
 gdaltest_list = [
-    ogr_rfc35_shape_1,
-    ogr_rfc35_shape_2,
-    ogr_rfc35_shape_3,
-    ogr_rfc35_shape_4,
-    ogr_rfc35_shape_5,
-    ogr_rfc35_shape_cleanup]
+    test_ogr_rfc35_shape_1,
+    test_ogr_rfc35_shape_2,
+    test_ogr_rfc35_shape_3,
+    test_ogr_rfc35_shape_4,
+    test_ogr_rfc35_shape_5,
+    test_ogr_rfc35_shape_cleanup]
 
 
 if __name__ == '__main__':
diff --git a/autotest/ogr/ogr_rfc35_sqlite.py b/autotest/ogr/ogr_rfc35_sqlite.py
index 4a7ff5058078..e3ae8a3ab83f 100755
--- a/autotest/ogr/ogr_rfc35_sqlite.py
+++ b/autotest/ogr/ogr_rfc35_sqlite.py
@@ -39,7 +39,7 @@
 # Initiate the test file
 
 
-def ogr_rfc35_sqlite_1():
+def test_ogr_rfc35_sqlite_1():
 
     gdaltest.rfc35_sqlite_ds = None
     gdaltest.rfc35_sqlite_ds_name = None
@@ -161,7 +161,7 @@ def Check(lyr, expected_order):
     return 'success'
 
 
-def ogr_rfc35_sqlite_2():
+def test_ogr_rfc35_sqlite_2():
 
     if gdaltest.rfc35_sqlite_ds is None:
         return 'skip'
@@ -244,7 +244,7 @@ def ogr_rfc35_sqlite_2():
 # Test AlterFieldDefn() for change of name and width
 
 
-def ogr_rfc35_sqlite_3():
+def test_ogr_rfc35_sqlite_3():
 
     if gdaltest.rfc35_sqlite_ds is None:
         return 'skip'
@@ -305,7 +305,7 @@ def ogr_rfc35_sqlite_3():
 # Test AlterFieldDefn() for change of type
 
 
-def ogr_rfc35_sqlite_4():
+def test_ogr_rfc35_sqlite_4():
 
     if gdaltest.rfc35_sqlite_ds is None:
         return 'skip'
@@ -433,7 +433,7 @@ def ogr_rfc35_sqlite_4():
 # Test DeleteField()
 
 
-def ogr_rfc35_sqlite_5():
+def test_ogr_rfc35_sqlite_5():
 
     if gdaltest.rfc35_sqlite_ds is None:
         return 'skip'
@@ -505,7 +505,7 @@ def ogr_rfc35_sqlite_5():
 # Initiate the test file
 
 
-def ogr_rfc35_sqlite_cleanup():
+def test_ogr_rfc35_sqlite_cleanup():
 
     if gdaltest.rfc35_sqlite_ds_name is None:
         return 'skip'
@@ -517,12 +517,12 @@ def ogr_rfc35_sqlite_cleanup():
 
 
 gdaltest_list = [
-    ogr_rfc35_sqlite_1,
-    ogr_rfc35_sqlite_2,
-    ogr_rfc35_sqlite_3,
-    ogr_rfc35_sqlite_4,
-    ogr_rfc35_sqlite_5,
-    ogr_rfc35_sqlite_cleanup]
+    test_ogr_rfc35_sqlite_1,
+    test_ogr_rfc35_sqlite_2,
+    test_ogr_rfc35_sqlite_3,
+    test_ogr_rfc35_sqlite_4,
+    test_ogr_rfc35_sqlite_5,
+    test_ogr_rfc35_sqlite_cleanup]
 
 
 if __name__ == '__main__':
diff --git a/autotest/ogr/ogr_rfc41.py b/autotest/ogr/ogr_rfc41.py
index b5d652b3c8b6..a68568e9e6a6 100755
--- a/autotest/ogr/ogr_rfc41.py
+++ b/autotest/ogr/ogr_rfc41.py
@@ -41,7 +41,7 @@
 # Test OGRGeomFieldDefn class
 
 
-def ogr_rfc41_1():
+def test_ogr_rfc41_1():
 
     gfld_defn = ogr.GeomFieldDefn()
 
@@ -109,7 +109,7 @@ def ogr_rfc41_1():
 ###############################################################################
 # Test OGRFeatureDefn methods related to OGRGeomFieldDefn class
 
-def ogr_rfc41_2():
+def test_ogr_rfc41_2():
 
     # Check implicit geometry field creation
     feature_defn = ogr.FeatureDefn()
@@ -274,7 +274,7 @@ def ogr_rfc41_2():
 # Test OGRFeature methods
 
 
-def ogr_rfc41_3():
+def test_ogr_rfc41_3():
 
     # Test with just one geometry field
     feature_defn = ogr.FeatureDefn()
@@ -420,7 +420,7 @@ def ogr_rfc41_3():
 # Test OGRLayer methods
 
 
-def ogr_rfc41_4():
+def test_ogr_rfc41_4():
 
     ds = ogr.GetDriverByName('memory').CreateDataSource('')
     if ds.TestCapability(ogr.ODsCCreateGeomFieldAfterCreateLayer) == 0:
@@ -524,7 +524,7 @@ def ogr_rfc41_4():
 # Test Python field accessors facilities
 
 
-def ogr_rfc41_5():
+def test_ogr_rfc41_5():
 
     feature_defn = ogr.FeatureDefn()
     field_defn = ogr.FieldDefn('strfield', ogr.OFTString)
@@ -614,7 +614,7 @@ def ogr_rfc41_5():
 # Test OGRSQL with geometries
 
 
-def ogr_rfc41_6():
+def test_ogr_rfc41_6():
 
     ds = ogr.GetDriverByName('memory').CreateDataSource('')
     sr = osr.SpatialReference()
@@ -1014,7 +1014,7 @@ def ogr_rfc41_6():
 # Test crazy OGRSQL
 
 
-def ogr_rfc41_7():
+def test_ogr_rfc41_7():
 
     ds = ogr.Open('data')
     sql = "select eas_id, \"_ogr_geometry_\" as geom1, cast(null as geometry) as geom2, " + \
@@ -1048,7 +1048,7 @@ def ogr_rfc41_7():
 # Test SQLite dialect
 
 
-def ogr_rfc41_8():
+def test_ogr_rfc41_8():
 
     import ogr_sql_sqlite
     if not ogr_sql_sqlite.ogr_sql_sqlite_available():
@@ -1129,14 +1129,14 @@ def ogr_rfc41_8():
 
 
 gdaltest_list = [
-    ogr_rfc41_1,
-    ogr_rfc41_2,
-    ogr_rfc41_3,
-    ogr_rfc41_4,
-    ogr_rfc41_5,
-    ogr_rfc41_6,
-    ogr_rfc41_7,
-    ogr_rfc41_8,
+    test_ogr_rfc41_1,
+    test_ogr_rfc41_2,
+    test_ogr_rfc41_3,
+    test_ogr_rfc41_4,
+    test_ogr_rfc41_5,
+    test_ogr_rfc41_6,
+    test_ogr_rfc41_7,
+    test_ogr_rfc41_8,
 ]
 
 if __name__ == '__main__':
diff --git a/autotest/ogr/ogr_s57.py b/autotest/ogr/ogr_s57.py
index 52d9356833dd..14319197520a 100755
--- a/autotest/ogr/ogr_s57.py
+++ b/autotest/ogr/ogr_s57.py
@@ -44,7 +44,7 @@
 # Verify we can open the test file.
 
 
-def ogr_s57_1():
+def test_ogr_s57_1():
 
     gdaltest.s57_ds = None
 
@@ -64,7 +64,7 @@ def ogr_s57_1():
 # matches our expectations.
 
 
-def ogr_s57_2():
+def test_ogr_s57_2():
     if gdaltest.s57_ds is None:
         return 'skip'
 
@@ -109,7 +109,7 @@ def ogr_s57_2():
 # Check the COALNE feature.
 
 
-def ogr_s57_3():
+def test_ogr_s57_3():
     if gdaltest.s57_ds is None:
         return 'skip'
 
@@ -137,7 +137,7 @@ def ogr_s57_3():
 # Check the M_QUAL feature.
 
 
-def ogr_s57_4():
+def test_ogr_s57_4():
     if gdaltest.s57_ds is None:
         return 'skip'
 
@@ -164,7 +164,7 @@ def ogr_s57_4():
 # Check the SOUNDG feature.
 
 
-def ogr_s57_5():
+def test_ogr_s57_5():
     if gdaltest.s57_ds is None:
         return 'skip'
 
@@ -193,7 +193,7 @@ def ogr_s57_5():
 # Test reading features from dataset with some double byte attributes. (#1526)
 
 
-def ogr_s57_6():
+def test_ogr_s57_6():
 
     ds = ogr.Open('data/bug1526.000')
 
@@ -214,7 +214,7 @@ def ogr_s57_6():
 # Test handling of a dataset with a multilinestring feature (#2147).
 
 
-def ogr_s57_7():
+def test_ogr_s57_7():
 
     ds = ogr.Open('data/bug2147_3R7D0889.000')
 
@@ -235,7 +235,7 @@ def ogr_s57_7():
 # Run test_ogrsf
 
 
-def ogr_s57_8():
+def test_ogr_s57_8():
 
     import test_cli_utilities
     if test_cli_utilities.get_test_ogrsf_path() is None:
@@ -253,7 +253,7 @@ def ogr_s57_8():
 # Test S57 to S57 conversion
 
 
-def ogr_s57_9():
+def test_ogr_s57_9():
 
     gdal.Unlink('tmp/ogr_s57_9.000')
 
@@ -277,13 +277,13 @@ def ogr_s57_9():
         return 'fail'
 
     gdaltest.s57_ds = ds
-    if ogr_s57_2() != 'success':
+    if test_ogr_s57_2() != 'success':
         return 'fail'
-    if ogr_s57_3() != 'success':
+    if test_ogr_s57_3() != 'success':
         return 'fail'
-    if ogr_s57_4() != 'success':
+    if test_ogr_s57_4() != 'success':
         return 'fail'
-    if ogr_s57_5() != 'success':
+    if test_ogr_s57_5() != 'success':
         return 'fail'
 
     gdaltest.s57_ds = None
@@ -304,7 +304,7 @@ def ogr_s57_9():
         return 'fail'
 
     gdaltest.s57_ds = ds
-    if ogr_s57_4() != 'success':
+    if test_ogr_s57_4() != 'success':
         return 'fail'
 
     gdaltest.s57_ds = None
@@ -317,7 +317,7 @@ def ogr_s57_9():
 # Test opening a fake very small S57 file
 
 
-def ogr_s57_10():
+def test_ogr_s57_10():
 
     ds = ogr.Open('data/fake_s57.000')
     lyr = ds.GetLayer(0)
@@ -331,7 +331,7 @@ def ogr_s57_10():
 # using variant (C.1.5.1) logic.
 
 
-def ogr_s57_11():
+def test_ogr_s57_11():
 
     ds = ogr.Open('data/fake_s57_variant_C151.000')
     lyr = ds.GetLayer(0)
@@ -344,7 +344,7 @@ def ogr_s57_11():
 # Test decoding of Dutch inland ENCs (#3881).
 
 
-def ogr_s57_online_1():
+def test_ogr_s57_online_1():
 
     if not gdaltest.download_file('ftp://sdg.ivs90.nl/ENC/1R5MK050.000', '1R5MK050.000'):
         return 'skip'
@@ -375,7 +375,7 @@ def ogr_s57_online_1():
 # Test with ENC 3.0 TDS - tile without updates.
 
 
-def ogr_s57_online_2():
+def test_ogr_s57_online_2():
 
     if not gdaltest.download_file('http://download.osgeo.org/gdal/data/s57/enctds/GB5X01SW.000', 'GB5X01SW.000'):
         return 'skip'
@@ -413,7 +413,7 @@ def ogr_s57_online_2():
 # Test with ENC 3.0 TDS - tile with updates.
 
 
-def ogr_s57_online_3():
+def test_ogr_s57_online_3():
 
     if not gdaltest.download_file('http://download.osgeo.org/gdal/data/s57/enctds/GB5X01SW.001', 'GB5X01SW.001'):
         return 'skip'
@@ -453,7 +453,7 @@ def ogr_s57_online_3():
 # Test ENC LL2 (#5048)
 
 
-def ogr_s57_online_4():
+def test_ogr_s57_online_4():
 
     if not gdaltest.download_file('http://www1.kaiho.mlit.go.jp/KOKAI/ENC/images/sample/sample.zip', 'sample.zip'):
         return 'skip'
@@ -485,7 +485,7 @@ def ogr_s57_online_4():
 #  Cleanup
 
 
-def ogr_s57_cleanup():
+def test_ogr_s57_cleanup():
 
     gdaltest.s57_ds = None
 
@@ -493,22 +493,22 @@ def ogr_s57_cleanup():
 
 
 gdaltest_list = [
-    ogr_s57_1,
-    ogr_s57_2,
-    ogr_s57_3,
-    ogr_s57_4,
-    ogr_s57_5,
-    ogr_s57_6,
-    ogr_s57_7,
-    ogr_s57_8,
-    ogr_s57_9,
-    ogr_s57_10,
-    ogr_s57_11,
-    ogr_s57_online_1,
-    ogr_s57_online_2,
-    ogr_s57_online_3,
-    ogr_s57_online_4,
-    ogr_s57_cleanup]
+    test_ogr_s57_1,
+    test_ogr_s57_2,
+    test_ogr_s57_3,
+    test_ogr_s57_4,
+    test_ogr_s57_5,
+    test_ogr_s57_6,
+    test_ogr_s57_7,
+    test_ogr_s57_8,
+    test_ogr_s57_9,
+    test_ogr_s57_10,
+    test_ogr_s57_11,
+    test_ogr_s57_online_1,
+    test_ogr_s57_online_2,
+    test_ogr_s57_online_3,
+    test_ogr_s57_online_4,
+    test_ogr_s57_cleanup]
 
 if __name__ == '__main__':
 
diff --git a/autotest/ogr/ogr_sde.py b/autotest/ogr/ogr_sde.py
index 6a2add8b484f..132f92aadf8f 100755
--- a/autotest/ogr/ogr_sde.py
+++ b/autotest/ogr/ogr_sde.py
@@ -54,7 +54,7 @@
     pass
 
 
-def ogr_sde_1():
+def test_ogr_sde_1():
     "Test basic opening of a database"
 
     if gdaltest.sde_dr is None:
@@ -74,7 +74,7 @@ def ogr_sde_1():
     return 'success'
 
 
-def ogr_sde_2():
+def test_ogr_sde_2():
     "Test creation of a layer"
     if gdaltest.sde_dr is None:
         return 'skip'
@@ -115,7 +115,7 @@ def ogr_sde_2():
     return 'success'
 
 
-def ogr_sde_3():
+def test_ogr_sde_3():
     "Test basic version locking"
     if gdaltest.sde_dr is None:
         return 'skip'
@@ -133,7 +133,7 @@ def ogr_sde_3():
     return 'success'
 
 
-def ogr_sde_4():
+def test_ogr_sde_4():
     "Test basic version creation"
 
     if gdaltest.sde_dr is None:
@@ -154,7 +154,7 @@ def ogr_sde_4():
     return 'success'
 
 
-def ogr_sde_5():
+def test_ogr_sde_5():
     "Test versioned editing"
 
     if gdaltest.sde_dr is None:
@@ -218,7 +218,7 @@ def ogr_sde_5():
     return 'success'
 
 
-def ogr_sde_6():
+def test_ogr_sde_6():
     "Extent fetching"
 
     if gdaltest.sde_dr is None:
@@ -239,7 +239,7 @@ def ogr_sde_6():
     return 'success'
 
 
-def ogr_sde_7():
+def test_ogr_sde_7():
     "Bad layer test"
 
     if gdaltest.sde_dr is None:
@@ -282,7 +282,7 @@ def ogr_sde_7():
     return 'success'
 
 
-def ogr_sde_8():
+def test_ogr_sde_8():
     "Test spatial references"
     if gdaltest.sde_dr is None:
         return 'skip'
@@ -326,7 +326,7 @@ def ogr_sde_8():
     return 'success'
 
 
-def ogr_sde_cleanup():
+def test_ogr_sde_cleanup():
     if gdaltest.sde_dr is None:
         return 'skip'
     base = 'SDE:%s,%s,%s,%s,%s' % (sde_server, sde_port, sde_db, sde_user, sde_password)
@@ -338,16 +338,16 @@ def ogr_sde_cleanup():
 
 
 gdaltest_list = [
-    ogr_sde_1,
-    ogr_sde_2,
-    ogr_sde_3,
-    ogr_sde_4,
-    ogr_sde_5,
-    ogr_sde_6,
-    ogr_sde_7,
-    ogr_sde_8,
-
-    ogr_sde_cleanup
+    test_ogr_sde_1,
+    test_ogr_sde_2,
+    test_ogr_sde_3,
+    test_ogr_sde_4,
+    test_ogr_sde_5,
+    test_ogr_sde_6,
+    test_ogr_sde_7,
+    test_ogr_sde_8,
+
+    test_ogr_sde_cleanup
 ]
 
 if __name__ == '__main__':
diff --git a/autotest/ogr/ogr_sdts.py b/autotest/ogr/ogr_sdts.py
index 2fff407e33c9..4314e2c1c41b 100755
--- a/autotest/ogr/ogr_sdts.py
+++ b/autotest/ogr/ogr_sdts.py
@@ -38,7 +38,7 @@
 # Test reading
 
 
-def ogr_sdts_1():
+def test_ogr_sdts_1():
 
     gdaltest.sdts_ds = ogr.Open('data/D3607551_rd0s_1_sdts_truncated/TR01CATD.DDF')
 
@@ -82,7 +82,7 @@ def ogr_sdts_1():
 #
 
 gdaltest_list = [
-    ogr_sdts_1]
+    test_ogr_sdts_1]
 
 if __name__ == '__main__':
 
diff --git a/autotest/ogr/ogr_segukooa.py b/autotest/ogr/ogr_segukooa.py
index 93815daefa06..af9a0368e418 100755
--- a/autotest/ogr/ogr_segukooa.py
+++ b/autotest/ogr/ogr_segukooa.py
@@ -39,7 +39,7 @@
 # Read SEGP1
 
 
-def ogr_segp1_points():
+def test_ogr_segp1_points():
 
     ds = ogr.Open('data/test.segp1')
     if ds is None:
@@ -86,7 +86,7 @@ def ogr_segp1_points():
 # Read SEGP1 lines
 
 
-def ogr_segp1_lines():
+def test_ogr_segp1_lines():
 
     ds = ogr.Open('data/test.segp1')
     if ds is None:
@@ -134,7 +134,7 @@ def ogr_segp1_lines():
 # Read UKOOA
 
 
-def ogr_ukooa_points():
+def test_ogr_ukooa_points():
 
     ds = ogr.Open('data/test.ukooa')
     if ds is None:
@@ -180,7 +180,7 @@ def ogr_ukooa_points():
 # Read UKOOA lines
 
 
-def ogr_ukooa_lines():
+def test_ogr_ukooa_lines():
 
     ds = ogr.Open('data/test.ukooa')
     if ds is None:
@@ -226,10 +226,10 @@ def ogr_ukooa_lines():
 
 
 gdaltest_list = [
-    ogr_segp1_points,
-    ogr_segp1_lines,
-    ogr_ukooa_points,
-    ogr_ukooa_lines,
+    test_ogr_segp1_points,
+    test_ogr_segp1_lines,
+    test_ogr_ukooa_points,
+    test_ogr_ukooa_lines,
 ]
 
 
diff --git a/autotest/ogr/ogr_segy.py b/autotest/ogr/ogr_segy.py
index 7414dd76d4d0..ff77f8911c44 100755
--- a/autotest/ogr/ogr_segy.py
+++ b/autotest/ogr/ogr_segy.py
@@ -39,7 +39,7 @@
 # Read SEG-Y
 
 
-def ogr_segy_1():
+def test_ogr_segy_1():
 
     ds = ogr.Open('data/segy/testsegy.segy')
     if ds is None:
@@ -118,7 +118,7 @@ def ogr_segy_1():
 # Read ASCII header SEG-Y
 
 
-def ogr_segy_2():
+def test_ogr_segy_2():
     ds = ogr.Open('data/segy/ascii-header-with-nuls.sgy')
     if ds is None:
         gdaltest.post_reason('cannot open dataset')
@@ -139,8 +139,8 @@ def ogr_segy_2():
 
 
 gdaltest_list = [
-    ogr_segy_1,
-    ogr_segy_2,
+    test_ogr_segy_1,
+    test_ogr_segy_2,
 ]
 
 
diff --git a/autotest/ogr/ogr_selafin.py b/autotest/ogr/ogr_selafin.py
index 67b14d001e2c..858b295e3c54 100755
--- a/autotest/ogr/ogr_selafin.py
+++ b/autotest/ogr/ogr_selafin.py
@@ -43,7 +43,7 @@
 # Create wasp datasource
 
 
-def ogr_selafin_create_ds():
+def test_ogr_selafin_create_ds():
 
     gdaltest.selafin_ds = None
     try:
@@ -62,8 +62,8 @@ def ogr_selafin_create_ds():
 # Add a few points to the datasource
 
 
-def ogr_selafin_create_nodes():
-    if ogr_selafin_create_ds() != 'success':
+def test_ogr_selafin_create_nodes():
+    if test_ogr_selafin_create_ds() != 'success':
         return 'skip'
     ref = osr.SpatialReference()
     ref.ImportFromEPSG(4326)
@@ -96,7 +96,7 @@ def ogr_selafin_create_nodes():
 # Add a set of elements to the datasource
 
 
-def ogr_selafin_create_elements():
+def test_ogr_selafin_create_elements():
 
     gdaltest.selafin_ds = ogr.Open('tmp/tmp.slf', 1)
     if gdaltest.selafin_ds is None:
@@ -159,7 +159,7 @@ def ogr_selafin_create_elements():
 # Add a field and set its values for point features
 
 
-def ogr_selafin_set_field():
+def test_ogr_selafin_set_field():
 
     gdaltest.selafin_ds = ogr.Open('tmp/tmp.slf', 1)
     if gdaltest.selafin_ds is None:
@@ -197,7 +197,7 @@ def ogr_selafin_set_field():
 ###############################################################################
 # Cleanup
 
-def ogr_selafin_cleanup():
+def test_ogr_selafin_cleanup():
 
     selafin_drv = ogr.GetDriverByName('Selafin')
     selafin_drv.DeleteDataSource('tmp/tmp.slf')
@@ -205,11 +205,11 @@ def ogr_selafin_cleanup():
 
 
 gdaltest_list = [
-    ogr_selafin_create_ds,
-    ogr_selafin_create_nodes,
-    ogr_selafin_create_elements,
-    ogr_selafin_set_field,
-    ogr_selafin_cleanup
+    test_ogr_selafin_create_ds,
+    test_ogr_selafin_create_nodes,
+    test_ogr_selafin_create_elements,
+    test_ogr_selafin_set_field,
+    test_ogr_selafin_cleanup
 ]
 
 if __name__ == '__main__':
diff --git a/autotest/ogr/ogr_shape.py b/autotest/ogr/ogr_shape.py
index f62b0072fc94..b436c5db1d71 100755
--- a/autotest/ogr/ogr_shape.py
+++ b/autotest/ogr/ogr_shape.py
@@ -43,7 +43,7 @@
 # Open Shapefile
 
 
-def ogr_shape_1():
+def test_ogr_shape_1():
 
     shape_drv = ogr.GetDriverByName('ESRI Shapefile')
     shape_drv.DeleteDataSource('tmp')
@@ -58,7 +58,7 @@ def ogr_shape_1():
 # Create table from data/poly.shp
 
 
-def ogr_shape_2():
+def test_ogr_shape_2():
 
     if gdaltest.shape_ds is None:
         return 'skip'
@@ -104,7 +104,7 @@ def ogr_shape_2():
 # Verify that stuff we just wrote is still OK.
 
 
-def ogr_shape_3():
+def test_ogr_shape_3():
     if gdaltest.shape_ds is None:
         return 'skip'
 
@@ -136,7 +136,7 @@ def ogr_shape_3():
 # Write a feature without a geometry, and verify that it works OK.
 
 
-def ogr_shape_4():
+def test_ogr_shape_4():
 
     if gdaltest.shape_ds is None:
         return 'skip'
@@ -169,7 +169,7 @@ def ogr_shape_4():
 # Test ExecuteSQL() results layers without geometry.
 
 
-def ogr_shape_5():
+def test_ogr_shape_5():
 
     if gdaltest.shape_ds is None:
         return 'skip'
@@ -188,7 +188,7 @@ def ogr_shape_5():
 # Test ExecuteSQL() results layers with geometry.
 
 
-def ogr_shape_6():
+def test_ogr_shape_6():
 
     if gdaltest.shape_ds is None:
         return 'skip'
@@ -211,7 +211,7 @@ def ogr_shape_6():
 # Test spatial filtering.
 
 
-def ogr_shape_7():
+def test_ogr_shape_7():
 
     if gdaltest.shape_ds is None:
         return 'skip'
@@ -234,7 +234,7 @@ def ogr_shape_7():
 # Create spatial index, and verify we get the same results.
 
 
-def ogr_shape_8():
+def test_ogr_shape_8():
 
     if gdaltest.shape_ds is None:
         return 'skip'
@@ -274,7 +274,7 @@ def ogr_shape_8():
 # Test that we don't return a polygon if we are "inside" but non-overlapping.
 
 
-def ogr_shape_9():
+def test_ogr_shape_9():
 
     if gdaltest.shape_ds is None:
         return 'skip'
@@ -295,7 +295,7 @@ def ogr_shape_9():
 # Do a fair size query that should pull in a few shapes.
 
 
-def ogr_shape_10():
+def test_ogr_shape_10():
 
     if gdaltest.shape_ds is None:
         return 'skip'
@@ -311,7 +311,7 @@ def ogr_shape_10():
 # Do a mixed indexed attribute and spatial query.
 
 
-def ogr_shape_11():
+def test_ogr_shape_11():
 
     if gdaltest.shape_ds is None:
         return 'skip'
@@ -340,7 +340,7 @@ def ogr_shape_11():
 # Check that multipolygon of asm.shp is properly returned.
 
 
-def ogr_shape_12():
+def test_ogr_shape_12():
 
     if gdaltest.shape_ds is None:
         return 'skip'
@@ -386,7 +386,7 @@ def ogr_shape_12():
 # Perform a SetFeature() on a couple features, resetting the size.
 
 
-def ogr_shape_13():
+def test_ogr_shape_13():
 
     if gdaltest.shape_ds is None:
         return 'skip'
@@ -429,7 +429,7 @@ def ogr_shape_13():
 # Verify last changes.
 
 
-def ogr_shape_14():
+def test_ogr_shape_14():
 
     if gdaltest.shape_ds is None:
         return 'skip'
@@ -470,7 +470,7 @@ def ogr_shape_14():
 # Delete a feature, and verify reduced count.
 
 
-def ogr_shape_15():
+def test_ogr_shape_15():
 
     if gdaltest.shape_ds is None:
         return 'skip'
@@ -505,7 +505,7 @@ def ogr_shape_15():
 # Repack and verify a few things.
 
 
-def ogr_shape_16():
+def test_ogr_shape_16():
 
     if gdaltest.shape_ds is None:
         return 'skip'
@@ -542,7 +542,7 @@ def ogr_shape_16():
 # Test adding a field to the schema of a populated layer.
 
 
-def ogr_shape_16_1():
+def test_ogr_shape_16_1():
 
     if gdaltest.shape_ds is None:
         return 'skip'
@@ -576,7 +576,7 @@ def ogr_shape_16_1():
 # Simple test with point shapefile with no associated .dbf
 
 
-def ogr_shape_17():
+def test_ogr_shape_17():
 
     if gdaltest.shape_ds is None:
         return 'skip'
@@ -627,7 +627,7 @@ def ogr_shape_17():
 # Test reading data/poly.PRJ file with mixed-case file name
 
 
-def ogr_shape_18():
+def test_ogr_shape_18():
 
     shp_ds = ogr.Open('data/poly.shp')
     shp_lyr = shp_ds.GetLayer(0)
@@ -657,7 +657,7 @@ def ogr_shape_18():
 # and deciding on polygon vs. multipolygon (#1217)
 
 
-def ogr_shape_19():
+def test_ogr_shape_19():
 
     ds = ogr.Open('data/Stacks.shp')
     lyr = ds.GetLayer(0)
@@ -677,7 +677,7 @@ def ogr_shape_19():
 # From GDAL 1.6.0, the expected behaviour is to return a feature with a NULL geometry
 
 
-def ogr_shape_20():
+def test_ogr_shape_20():
 
     if gdaltest.shape_ds is None:
         return 'skip'
@@ -718,7 +718,7 @@ def ogr_shape_20():
 # Test robutness towards broken/unfriendly shapefiles
 
 
-def ogr_shape_21():
+def test_ogr_shape_21():
 
     if gdaltest.shape_ds is None:
         return 'skip'
@@ -756,7 +756,7 @@ def ogr_shape_21():
 ###############################################################################
 # Test writing and reading all handled data types
 
-def ogr_shape_22():
+def test_ogr_shape_22():
 
     if gdaltest.shape_ds is None:
         return 'skip'
@@ -892,7 +892,7 @@ def ogr_shape_23_write_geom(layer_name, geom, expected_geom, wkbType):
 ###############################################################################
 # Test writing and reading all handled geometry types
 
-def ogr_shape_23():
+def test_ogr_shape_23():
 
     if gdaltest.shape_ds is None:
         return 'skip'
@@ -1051,7 +1051,7 @@ def ogr_shape_23():
 ###############################################################################
 # Test reading a polygon whose outer and the inner ring touches at one point (#2589)
 
-def ogr_shape_24():
+def test_ogr_shape_24():
 
     if gdaltest.shape_ds is None:
         return 'skip'
@@ -1071,7 +1071,7 @@ def ogr_shape_24():
 # part, but not inside it, and sharing the same first point... (#2589)
 
 
-def ogr_shape_25():
+def test_ogr_shape_25():
     layer_name = 'touchingrings2'
     wkt = 'MULTIPOLYGON(((10 5, 5 5,5 0,0 0,0 10,10 10,10 5)),((10 5,10 0,5 0,5 4.9,10 5)), ((100 100,100 200,200 200,200 100,100 100)))'
     geom = ogr.CreateGeometryFromWkt(wkt)
@@ -1099,7 +1099,7 @@ def ogr_shape_25():
 # Test a polygon made of one outer ring and two inner rings (special case
 # in organizePolygons()
 
-def ogr_shape_26():
+def test_ogr_shape_26():
     layer_name = 'oneouterring'
     wkt = 'POLYGON ((100 100,100 200,200 200,200 100,100 100),(110 110,120 110,120 120,110 120,110 110),(130 110,140 110,140 120,130 120,130 110))'
     geom = ogr.CreateGeometryFromWkt(wkt)
@@ -1115,7 +1115,7 @@ def ogr_shape_26():
 # Test alternate date formatting (#2746)
 
 
-def ogr_shape_27():
+def test_ogr_shape_27():
 
     result = 'success'
 
@@ -1138,7 +1138,7 @@ def ogr_shape_27():
 # Test reading a 3 GB .DBF (#3011)
 
 
-def ogr_shape_28():
+def test_ogr_shape_28():
 
     # Determine if the filesystem supports sparse files (we don't want to create a real 3 GB
     # file !
@@ -1248,7 +1248,7 @@ def ogr_shape_28():
 # Test that REPACK doesn't change extension case (#3293)
 
 
-def ogr_shape_29():
+def test_ogr_shape_29():
 
     os.mkdir('tmp/UPPERCASE')
     shutil.copy('data/poly.shp', 'tmp/UPPERCASE/UPPERCASE.SHP')
@@ -1288,7 +1288,7 @@ def ogr_shape_29():
 # Test that REPACK doesn't change extension case (#3293)
 
 
-def ogr_shape_30():
+def test_ogr_shape_30():
 
     os.mkdir('tmp/lowercase')
     shutil.copy('data/poly.shp', 'tmp/lowercase/lowercase.shp')
@@ -1319,7 +1319,7 @@ def ogr_shape_30():
 # FIXME: Empty field names are allowed now!
 
 
-def ogr_shape_31():
+def test_ogr_shape_31():
 
     if gdaltest.shape_ds is None:
         return 'skip'
@@ -1393,7 +1393,7 @@ def ogr_shape_31():
 # Assuming 2^32 is the max value for unsigned int.
 
 
-def ogr_shape_32():
+def test_ogr_shape_32():
     # This test takes a few minutes and disk space. Hence, skipped by default.
     # To run this test, make sure that the directory BigFilePath points to has
     # 4.5 GB space available or give a new directory that does and delete the
@@ -1459,7 +1459,7 @@ def ogr_shape_32():
 # coordinate offset (#3356)
 
 
-def ogr_shape_33():
+def test_ogr_shape_33():
 
     ds = ogr.Open('data/bigoffset.shp')
     lyr = ds.GetLayer(0)
@@ -1477,7 +1477,7 @@ def ogr_shape_33():
 # Check that we can write correct winding order even with polygons with big
 # coordinate offset (#33XX)
 
-def ogr_shape_34():
+def test_ogr_shape_34():
 
     ds = ogr.GetDriverByName('ESRI Shapefile').CreateDataSource('tmp/bigoffset.shp')
     lyr = ds.CreateLayer('bigoffset')
@@ -1503,7 +1503,7 @@ def ogr_shape_34():
 # Check that we can read & write a VSI*L dataset
 
 
-def ogr_shape_35():
+def test_ogr_shape_35():
 
     ds = ogr.GetDriverByName('ESRI Shapefile').CreateDataSource('/vsimem/test35.shp')
     srs = osr.SpatialReference()
@@ -1536,7 +1536,7 @@ def ogr_shape_35():
 # Check that we can read from the root of a .ZIP file
 
 
-def ogr_shape_36():
+def test_ogr_shape_36():
 
     ds = ogr.Open('/vsizip/data/poly.zip')
     if ds is None:
@@ -1562,7 +1562,7 @@ def ogr_shape_36():
 # Check that we can read from the root of a .tar.gz file
 
 
-def ogr_shape_37():
+def test_ogr_shape_37():
 
     ds = ogr.Open('/vsitar/data/poly.tar.gz')
     if ds is None:
@@ -1600,7 +1600,7 @@ def ogr_shape_37():
 # Check that we can read from a .tar file
 
 
-def ogr_shape_37_bis():
+def test_ogr_shape_37_bis():
 
     ds = ogr.Open('/vsitar/data/poly.tar')
     if ds is None:
@@ -1635,7 +1635,7 @@ def ogr_shape_37_bis():
 # Check that we cannot create duplicated layers
 
 
-def ogr_shape_38():
+def test_ogr_shape_38():
 
     ds = ogr.Open('/vsimem/', update=1)
     gdal.PushErrorHandler('CPLQuietErrorHandler')
@@ -1654,7 +1654,7 @@ def ogr_shape_38():
 # coordinate offset (#3356)
 
 
-def ogr_shape_39():
+def test_ogr_shape_39():
 
     ds = ogr.Open('data/multipatch.shp')
     lyr = ds.GetLayer(0)
@@ -1671,7 +1671,7 @@ def ogr_shape_39():
 ###############################################################################
 # Make some changes to a shapefile and check the index files. qix, sbn & sbx
 
-def ogr_shape_40():
+def test_ogr_shape_40():
 
     if gdaltest.shape_ds is None:
         return 'skip'
@@ -1753,7 +1753,7 @@ def ogr_shape_40():
 # Run test_ogrsf
 
 
-def ogr_shape_41():
+def test_ogr_shape_41():
 
     import test_cli_utilities
     if test_cli_utilities.get_test_ogrsf_path() is None:
@@ -1779,7 +1779,7 @@ def ogr_shape_41():
 # Run test_ogrsf with -sql
 
 
-def ogr_shape_42():
+def test_ogr_shape_42():
 
     import test_cli_utilities
     if test_cli_utilities.get_test_ogrsf_path() is None:
@@ -1805,7 +1805,7 @@ def ogr_shape_42():
 # Test /vsizip//vsicurl/
 
 
-def ogr_shape_43():
+def test_ogr_shape_43():
 
     drv = gdal.GetDriverByName('HTTP')
     if drv is None:
@@ -1875,7 +1875,7 @@ def ogr_shape_44_DISABLED():
 # Test ignored fields works ok on a shapefile.
 
 
-def ogr_shape_45():
+def test_ogr_shape_45():
 
     shp_ds = ogr.Open('data/poly.shp')
     shp_layer = shp_ds.GetLayer(0)
@@ -1948,7 +1948,7 @@ def ogr_shape_45():
 # directory as 'foo.shp'
 
 
-def ogr_shape_46():
+def test_ogr_shape_46():
 
     ds = ogr.GetDriverByName('ESRI Shapefile').CreateDataSource('/vsimem/ogr_shape_46.shp')
     ds.CreateLayer('you_can_put_here_what_you_want_i_dont_care')
@@ -1972,7 +1972,7 @@ def ogr_shape_46():
 # file, but a filename that OGR recognizes
 
 
-def ogr_shape_47():
+def test_ogr_shape_47():
 
     if not gdaltest.support_symlink():
         return 'skip'
@@ -1994,7 +1994,7 @@ def ogr_shape_47():
 # Test RECOMPUTE EXTENT ON (#4027)
 
 
-def ogr_shape_48():
+def test_ogr_shape_48():
 
     ds = ogr.GetDriverByName('ESRI Shapefile').CreateDataSource('/vsimem/ogr_shape_48.shp')
     lyr = ds.CreateLayer('ogr_shape_48')
@@ -2069,7 +2069,7 @@ def ogr_shape_48():
 # Test that we can read at an LDID/87 file and recode to UTF-8.
 
 
-def ogr_shape_49():
+def test_ogr_shape_49():
 
     ds = ogr.Open('data/facility_surface_dd.dbf')
     lyr = ds.GetLayer(0)
@@ -2095,7 +2095,7 @@ def ogr_shape_49():
 # Test that we can read encoded field names
 
 
-def ogr_shape_50():
+def test_ogr_shape_50():
 
     ds = ogr.Open('data/chinese.dbf')
     if ds is None:
@@ -2133,7 +2133,7 @@ def ogr_shape_50():
 # Test that we can add a field when there's no dbf file initially
 
 
-def ogr_shape_51():
+def test_ogr_shape_51():
 
     if int(gdal.VersionInfo('VERSION_NUM')) < 1900:
         gdaltest.post_reason('would crash')
@@ -2180,7 +2180,7 @@ def ogr_shape_51():
 # Test fix for #3356
 
 
-def ogr_shape_52():
+def test_ogr_shape_52():
 
     expected_geom = ogr.CreateGeometryFromWkt('MULTIPOLYGON (((175.524709766699999 -40.17203475,175.524757883299998 -40.172050566700001,175.52480505 -40.1720663,175.524858766699992 -40.172091433299997,175.524913916700001 -40.172112966699999,175.524966049999989 -40.172136933300003,175.525030633299991 -40.17216185,175.5250873 -40.17218215,175.52515168330001 -40.1722011,175.525217666700001 -40.172221216700002,175.525269416700013 -40.172234466699997,175.5253165 -40.1722478,175.52535415 -40.1722577667,175.52538385 -40.17226365,175.525436816699994 -40.1722814333,175.525507016700004 -40.17229905,175.525594783299994 -40.172322033299999,175.525669933300009 -40.172339533299997,175.52574 -40.17235335,175.525807566699996 -40.1723672,175.52585005 -40.17237395,175.52588115 -40.172378683300003,175.525969816700012 -40.172388633300002,175.526057266700008 -40.1724020833,175.52723455 -40.17253515,175.527275583299996 -40.1725388,175.527324533300003 -40.17254675,175.527394866700007 -40.172552766700001,175.527473066699997 -40.172561616700001,175.527576666700014 -40.172572916699998,175.527678333300003 -40.172584266699999,175.527787883299993 -40.17259845,175.52789345 -40.172609716700002,175.527953933300012 -40.17261295,175.528028083300001 -40.1726174,175.52809835 -40.1726219333,175.528151650000012 -40.172625833300003,175.528190349999988 -40.17262725,175.528230900000011 -40.172631183299998,175.5282776 -40.1726338,175.528322800000012 -40.172637633299999,175.5283648 -40.17263915,175.5284115 -40.172641766700004,175.528452133299993 -40.17264435,175.528492133300006 -40.172646033299998,175.52856465 -40.17264805,175.528621733300014 -40.1726492,175.52868035 -40.172650333299998,175.528751333299994 -40.172652383299997,175.528814566699992 -40.1726534,175.528883933299994 -40.172653116699998,175.528939383300013 -40.17265195,175.529002566700001 -40.1726518,175.529070350000012 -40.172650366699997,175.529136633299998 -40.17265015,175.529193616700013 -40.17264895,175.529250616700011 -40.172647733300003,175.529313800000011 -40.172647583299998,175.529376783299995 -40.172647016699997,175.52895773329999 -40.172694633299997,175.528450866700013 -40.172752216699998,175.52835635 -40.172753466700001,175.52741181670001 -40.1727757333,175.52685245 -40.172532333299998,175.52627245 -40.172501266700003,175.5262405167 -40.172502816700003,175.5258356 -40.172522816700003,175.5256125 -40.172533833300001,175.525424433300003 -40.172543116699998,175.524834133300004 -40.1725533,175.524739033299994 -40.172414983300001,175.5247128 -40.17207405,175.524709766699999 -40.17203475)),((175.531267916699989 -40.17286525,175.5312654 -40.172863283300003,175.531252849999987 -40.172853516700002,175.531054566699993 -40.172822366699997,175.530193283300008 -40.172687333299997,175.529890266699994 -40.1726398,175.529916116700008 -40.172639383300002,175.529972483300014 -40.172639216699999,175.53002885 -40.1726398,175.530085183300002 -40.17264115,175.530141500000013 -40.17264325,175.530197733300014 -40.172646133299999,175.530253916699991 -40.172649766699998,175.530309983299986 -40.172654166699999,175.53036595 -40.172659333299997,175.5304218 -40.17266525,175.53047748329999 -40.172671916699997,175.530533016699991 -40.17267935,175.5305883833 -40.1726875333,175.530643533300008 -40.172696466700003,175.530722333299991 -40.172710633299999,175.530800633300004 -40.1727263167,175.5308541 -40.17273795,175.5309073 -40.1727503,175.530960216700009 -40.172763366700003,175.531012816700013 -40.172777133300002,175.5310651 -40.1727916,175.53111705 -40.172806766699999,175.531168650000012 -40.172822633300001,175.531219883299997 -40.172839183299999,175.531270733300005 -40.1728564,175.531267916699989 -40.17286525)))')
 
@@ -2219,7 +2219,7 @@ def ogr_shape_52():
 # Test various expected error cases
 
 
-def ogr_shape_53():
+def test_ogr_shape_53():
 
     ds = ogr.GetDriverByName('ESRI Shapefile').CreateDataSource('/vsimem/ogr_shape_53.shp')
     lyr = ds.CreateLayer('ogr_shape_53')
@@ -2551,7 +2551,7 @@ def ogr_shape_54_test_layer(ds, layer_index):
     return 'success'
 
 
-def ogr_shape_54():
+def test_ogr_shape_54():
 
     shape_drv = ogr.GetDriverByName('ESRI Shapefile')
     ds_name = '/vsimem/ogr_shape_54'
@@ -2680,7 +2680,7 @@ def ogr_shape_54():
 # Test that we cannot add more fields that the maximum allowed
 
 
-def ogr_shape_55():
+def test_ogr_shape_55():
     shape_drv = ogr.GetDriverByName('ESRI Shapefile')
     ds_name = '/vsimem/ogr_shape_55'
     ds = shape_drv.CreateDataSource(ds_name)
@@ -2728,7 +2728,7 @@ def ogr_shape_55():
 # Test that we cannot add more fields that the maximum allowed record length
 
 
-def ogr_shape_56():
+def test_ogr_shape_56():
     shape_drv = ogr.GetDriverByName('ESRI Shapefile')
     ds_name = '/vsimem/ogr_shape_56'
     ds = shape_drv.CreateDataSource(ds_name)
@@ -2776,7 +2776,7 @@ def ogr_shape_56():
 # Test that we emit a warning if the truncation of a field value occurs
 
 
-def ogr_shape_57():
+def test_ogr_shape_57():
     shape_drv = ogr.GetDriverByName('ESRI Shapefile')
     ds_name = '/vsimem/ogr_shape_57'
     ds = shape_drv.CreateDataSource(ds_name)
@@ -2814,7 +2814,7 @@ def ogr_shape_57():
 # Test creating and reading back all geometry types
 
 
-def ogr_shape_58():
+def test_ogr_shape_58():
     shape_drv = ogr.GetDriverByName('ESRI Shapefile')
     ds_name = '/vsimem/ogr_shape_58'
     ds = shape_drv.CreateDataSource(ds_name)
@@ -2869,7 +2869,7 @@ def ogr_shape_58():
 # Test reading a shape with XYM geometries
 
 
-def ogr_shape_59():
+def test_ogr_shape_59():
 
     if gdaltest.shape_ds is None:
         return 'skip'
@@ -2935,7 +2935,7 @@ def ogr_shape_59():
 # Test reading a shape with XYZM geometries
 
 
-def ogr_shape_60():
+def test_ogr_shape_60():
 
     if gdaltest.shape_ds is None:
         return 'skip'
@@ -2970,7 +2970,7 @@ def ogr_shape_60():
 # Test field auto-growing
 
 
-def ogr_shape_61():
+def test_ogr_shape_61():
     shape_drv = ogr.GetDriverByName('ESRI Shapefile')
     ds_name = '/vsimem/ogr_shape_61'
     ds = shape_drv.CreateDataSource(ds_name)
@@ -3040,7 +3040,7 @@ def ogr_shape_61():
 # Test field resizing
 
 
-def ogr_shape_62():
+def test_ogr_shape_62():
     shape_drv = ogr.GetDriverByName('ESRI Shapefile')
     ds_name = '/vsimem/ogr_shape_62'
     ds = shape_drv.CreateDataSource(ds_name)
@@ -3108,7 +3108,7 @@ def ogr_shape_62():
 # More testing of recoding
 
 
-def ogr_shape_63():
+def test_ogr_shape_63():
 
     ds = ogr.GetDriverByName('ESRI Shapefile').CreateDataSource('/vsimem/ogr_shape_63.dbf')
     lyr = ds.CreateLayer('ogr_shape_63', geom_type=ogr.wkbNone)
@@ -3175,7 +3175,7 @@ def ogr_shape_63():
 # Test creating layers whose name include dot character
 
 
-def ogr_shape_64():
+def test_ogr_shape_64():
 
     ds = ogr.GetDriverByName('ESRI Shapefile').CreateDataSource('/vsimem/ogr_shape_64')
 
@@ -3226,7 +3226,7 @@ def ogr_shape_64():
 # Test reading a DBF with a 'nan' as a numeric value (#4799)
 
 
-def ogr_shape_65():
+def test_ogr_shape_65():
 
     ds = ogr.Open('data/nan.dbf')
     lyr = ds.GetLayer(0)
@@ -3245,7 +3245,7 @@ def ogr_shape_65():
 # Test failures when creating files and datasources
 
 
-def ogr_shape_66():
+def test_ogr_shape_66():
 
     ds = ogr.GetDriverByName('ESRI Shapefile').CreateDataSource('/i_dont_exist/bar.dbf')
     gdal.PushErrorHandler('CPLQuietErrorHandler')
@@ -3288,7 +3288,7 @@ def ogr_shape_66():
 # Test opening an empty .sbn spatial index
 
 
-def ogr_shape_67():
+def test_ogr_shape_67():
 
     shutil.copy('data/emptyshapefilewithsbn.shp', 'tmp/emptyshapefilewithsbn.shp')
     shutil.copy('data/emptyshapefilewithsbn.shx', 'tmp/emptyshapefilewithsbn.shx')
@@ -3314,7 +3314,7 @@ def ogr_shape_67():
 # Test opening a shape datasource with files with mixed case and then REPACK
 
 
-def ogr_shape_68():
+def test_ogr_shape_68():
 
     if sys.platform == 'darwin':
         print("Fails on MacOSX. Not sure why.")
@@ -3412,7 +3412,7 @@ def ogr_shape_68():
 # Test fix for #5135 (creating a field of type Integer with a big width)
 
 
-def ogr_shape_69():
+def test_ogr_shape_69():
 
     ds = ogr.GetDriverByName('ESRI Shapefile').CreateDataSource('/vsimem/ogr_shape_69.shp')
     lyr = ds.CreateLayer('ogr_shape_69')
@@ -3443,7 +3443,7 @@ def ogr_shape_69():
 # (shapefile opened twice on Windows)
 
 
-def ogr_shape_70():
+def test_ogr_shape_70():
 
     if sys.platform != 'win32':
         return 'skip'
@@ -3484,7 +3484,7 @@ def ogr_shape_70():
 # Test heterogeneous file permissions on .shp and .dbf.
 
 
-def ogr_shape_71():
+def test_ogr_shape_71():
 
     if sys.platform.find('linux') != 0:
         return 'skip'
@@ -3516,7 +3516,7 @@ def ogr_shape_71():
 # Test shapefile size limit
 
 
-def ogr_shape_72():
+def test_ogr_shape_72():
 
     # Determine if the filesystem supports sparse files (we don't want to create a real 3 GB
     # file !
@@ -3601,7 +3601,7 @@ def ogr_shape_72():
 # twice by the same point (#5342)
 
 
-def ogr_shape_73():
+def test_ogr_shape_73():
 
     ds = ogr.GetDriverByName('ESRI Shapefile').CreateDataSource('/vsimem/ogr_shape_73.shp')
     lyr = ds.CreateLayer('ogr_shape_73', geom_type=ogr.wkbPolygon)
@@ -3632,7 +3632,7 @@ def ogr_shape_73():
 # two outer rings are touching, by the first vertex of one.
 
 
-def ogr_shape_74():
+def test_ogr_shape_74():
 
     ds = ogr.GetDriverByName('ESRI Shapefile').CreateDataSource('/vsimem/ogr_shape_74.shp')
     lyr = ds.CreateLayer('ogr_shape_74', geom_type=ogr.wkbPolygon)
@@ -3669,7 +3669,7 @@ def ogr_shape_74():
 # Test GetFileList()
 
 
-def ogr_shape_75():
+def test_ogr_shape_75():
 
     ds = gdal.OpenEx('data/poly.shp')
     if ds.GetFileList() != ['data/poly.shp', 'data/poly.shx', 'data/poly.dbf', 'data/poly.PRJ'] and \
@@ -3706,7 +3706,7 @@ def ogr_shape_75():
 # Test opening shapefile whose .prj has a UTF-8 BOM marker
 
 
-def ogr_shape_76():
+def test_ogr_shape_76():
 
     ds = ogr.Open('data/prjwithutf8bom.shp')
     lyr = ds.GetLayer(0)
@@ -3720,7 +3720,7 @@ def ogr_shape_76():
 # Test opening shapefile whose .shx doesn't follow the official shapefile spec (#5608)
 
 
-def ogr_shape_77():
+def test_ogr_shape_77():
 
     ds = ogr.Open('data/nonconformant_shx_ticket5608.shp')
     lyr = ds.GetLayer(0)
@@ -3736,7 +3736,7 @@ def ogr_shape_77():
 # loss of precision (#5625)
 
 
-def ogr_shape_78():
+def test_ogr_shape_78():
 
     ds = ogr.GetDriverByName('ESRI Shapefile').CreateDataSource('/vsimem/ogr_shape_78.dbf')
     lyr = ds.CreateLayer('ogr_shape_78')
@@ -3799,7 +3799,7 @@ def ogr_shape_78():
 # Test adding a field after creating features with 0 field
 
 
-def ogr_shape_79():
+def test_ogr_shape_79():
 
     ds = ogr.GetDriverByName('ESRI Shapefile').CreateDataSource('/vsimem/ogr_shape_79.dbf')
     lyr = ds.CreateLayer('ogr_shape_79')
@@ -3833,7 +3833,7 @@ def ogr_shape_79():
 # Test reading a shape with invalid extent (nan values) (#5702)
 
 
-def ogr_shape_80():
+def test_ogr_shape_80():
 
     ds = ogr.Open('data/extentnan.shp')
     lyr = ds.GetLayer(0)
@@ -3849,7 +3849,7 @@ def ogr_shape_80():
 # Test REPACK after SetFeature() and geometry change (#XXXX)
 
 
-def ogr_shape_81():
+def test_ogr_shape_81():
 
     ds = ogr.GetDriverByName('ESRI Shapefile').CreateDataSource('/vsimem/ogr_shape_81.shp')
     lyr = ds.CreateLayer('ogr_shape_81')
@@ -3931,7 +3931,7 @@ def ogr_shape_81():
 # Test string length more than 254 bytes in UTF-8 encoding cut to 254 bytes
 
 
-def ogr_shape_82():
+def test_ogr_shape_82():
 
     if gdaltest.shape_ds is None:
         return 'skip'
@@ -4008,7 +4008,7 @@ def ogr_shape_82():
 # Test behaviour with curve geometries
 
 
-def ogr_shape_83():
+def test_ogr_shape_83():
 
     ds = ogr.GetDriverByName('ESRI Shapefile').CreateDataSource('/vsimem/ogr_shape_83.shp')
     lyr = ds.CreateLayer('ogr_shape_83', geom_type=ogr.wkbCurvePolygon)
@@ -4032,7 +4032,7 @@ def ogr_shape_83():
 # Test SPATIAL_INDEX creation option
 
 
-def ogr_shape_84():
+def test_ogr_shape_84():
 
     ds = ogr.GetDriverByName('ESRI Shapefile').CreateDataSource('/vsimem/ogr_shape_84.shp')
     lyr = ds.CreateLayer('ogr_shape_84', options=['SPATIAL_INDEX=YES'])
@@ -4052,7 +4052,7 @@ def ogr_shape_84():
 # Test Integer64
 
 
-def ogr_shape_85():
+def test_ogr_shape_85():
 
     ds = ogr.GetDriverByName('ESRI Shapefile').CreateDataSource('/vsimem/ogr_shape_85.shp')
     lyr = ds.CreateLayer('ogr_shape_85')
@@ -4148,7 +4148,7 @@ def ogr_shape_85():
 # OGR can not produce such a file (unless patched)
 
 
-def ogr_shape_86():
+def test_ogr_shape_86():
 
     ds = ogr.Open('data/mixed_shape_type_non_conformant.shp')
     sql_lyr = ds.ExecuteSQL("select count(distinct ogr_geometry) from mixed_shape_type_non_conformant")
@@ -4164,7 +4164,7 @@ def ogr_shape_86():
 # Check we accept opening standalone .dbf files with weird header lengths (#6035)
 
 
-def ogr_shape_87():
+def test_ogr_shape_87():
 
     ds = ogr.Open('data/weird_header_length.dbf')
     lyr = ds.GetLayer(0)
@@ -4178,7 +4178,7 @@ def ogr_shape_87():
 # Test REPACK after SetFeature() and geometry change, without DBF
 
 
-def ogr_shape_88():
+def test_ogr_shape_88():
 
     ds = ogr.GetDriverByName('ESRI Shapefile').CreateDataSource('/vsimem/ogr_shape_88.shp')
     lyr = ds.CreateLayer('ogr_shape_88')
@@ -4206,7 +4206,7 @@ def ogr_shape_88():
 # Test reading geometry bigger than 10 MB
 
 
-def ogr_shape_89():
+def test_ogr_shape_89():
 
     ds = ogr.GetDriverByName('ESRI Shapefile').CreateDataSource('/vsimem/ogr_shape_89.shp')
     lyr = ds.CreateLayer('ogr_shape_89')
@@ -4257,7 +4257,7 @@ def ogr_shape_89():
 # Test reading a lot of geometries
 
 
-def ogr_shape_90():
+def test_ogr_shape_90():
 
     ds = ogr.GetDriverByName('ESRI Shapefile').CreateDataSource('/vsimem/ogr_shape_90.shp')
     lyr = ds.CreateLayer('ogr_shape_90')
@@ -4300,7 +4300,7 @@ def ogr_shape_90():
 # Test reading XYM geometries but with missing M array (#6317)
 
 
-def ogr_shape_91():
+def test_ogr_shape_91():
 
     ds = ogr.Open('data/arcm_without_m.shp')
     lyr = ds.GetLayer(0)
@@ -4318,7 +4318,7 @@ def ogr_shape_91():
 # Test reading multipoint Z geometries without M
 
 
-def ogr_shape_92():
+def test_ogr_shape_92():
 
     ds = ogr.Open('data/multipointz_without_m.shp')
     lyr = ds.GetLayer(0)
@@ -4335,7 +4335,7 @@ def ogr_shape_92():
 # Test reading point Z geometries without M
 
 
-def ogr_shape_93():
+def test_ogr_shape_93():
 
     ds = ogr.Open('data/pointz_without_m.shp')
     lyr = ds.GetLayer(0)
@@ -4352,7 +4352,7 @@ def ogr_shape_93():
 # Test SHPT creation option / CreateLayer(geom_type = xxx)
 
 
-def ogr_shape_94():
+def test_ogr_shape_94():
 
     tests = [["POINT", ogr.wkbPoint, "POINT (1 2)"],
              ["POINTM", ogr.wkbPointM, "POINT M (1 2 3)"],
@@ -4426,7 +4426,7 @@ def ogr_shape_94():
 # Test demoting of ZM to Z when the M values are nodata
 
 
-def ogr_shape_95():
+def test_ogr_shape_95():
 
     ds = gdal.OpenEx('data/pointzm_with_all_nodata_m.shp')
     lyr = ds.GetLayer(0)
@@ -4473,7 +4473,7 @@ def ogr_shape_95():
 # Test updating a XYM shapefile (#6331)
 
 
-def ogr_shape_96():
+def test_ogr_shape_96():
 
     ds = ogr.GetDriverByName('ESRI Shapefile').CreateDataSource('/vsimem/ogr_shape_96.shp')
     lyr = ds.CreateLayer('ogr_shape_96')
@@ -4510,7 +4510,7 @@ def ogr_shape_96():
 # Test updating a XYZM shapefile
 
 
-def ogr_shape_97():
+def test_ogr_shape_97():
 
     ds = ogr.GetDriverByName('ESRI Shapefile').CreateDataSource('/vsimem/ogr_shape_97.shp')
     lyr = ds.CreateLayer('ogr_shape_97')
@@ -4547,7 +4547,7 @@ def ogr_shape_97():
 # Test restore function when .shx file is missing
 
 
-def ogr_shape_98():
+def test_ogr_shape_98():
 
     if gdaltest.shape_ds is None:
         return 'skip'
@@ -4583,7 +4583,7 @@ def ogr_shape_98():
 # Import TOWGS84 from EPSG when possible (#6485)
 
 
-def ogr_shape_99():
+def test_ogr_shape_99():
 
     ds = ogr.GetDriverByName('ESRI Shapefile').CreateDataSource('/vsimem/ogr_shape_99.shp')
     lyr = ds.CreateLayer('ogr_shape_99')
@@ -4632,7 +4632,7 @@ def ogr_shape_99():
 # Test REPACK with both implementations
 
 
-def ogr_shape_100():
+def test_ogr_shape_100():
 
     old_val = gdal.GetConfigOption('OGR_SHAPE_PACK_IN_PLACE')
 
@@ -4750,7 +4750,7 @@ def ogr_shape_100():
 # Test auto repack
 
 
-def ogr_shape_101():
+def test_ogr_shape_101():
 
     for i in range(2):
 
@@ -4868,7 +4868,7 @@ def ogr_shape_101():
 # Test reading invalid .prj
 
 
-def ogr_shape_102():
+def test_ogr_shape_102():
 
     ds = ogr.GetDriverByName('ESRI Shapefile').CreateDataSource('/vsimem/ogr_shape_102.shp')
     lyr = ds.CreateLayer('ogr_shape_102', geom_type=ogr.wkbPoint)
@@ -4909,7 +4909,7 @@ def check_EOF(filename, expected=True):
     return True
 
 
-def ogr_shape_103():
+def test_ogr_shape_103():
 
     filename = '/vsimem/ogr_shape_103.dbf'
 
@@ -5096,7 +5096,7 @@ def ogr_shape_103():
 # Test writing MULTIPATCH
 
 
-def ogr_shape_104():
+def test_ogr_shape_104():
 
     for (wkt, lyr_type, options, expected_wkt) in \
         [['TIN Z (((0 0 0,0 1 2,1 1 3,0 0 0)))', ogr.wkbUnknown, [], None],
@@ -5143,7 +5143,7 @@ def ogr_shape_104():
 # Test reading .dbf with substantial padding after last field definition.
 
 
-def ogr_shape_105():
+def test_ogr_shape_105():
 
     ds = ogr.Open('data/padding_after_field_defns.dbf')
     lyr = ds.GetLayer(0)
@@ -5161,7 +5161,7 @@ def ogr_shape_105():
 # Test that rewriting the last shape reuses the space it took. (#6787)
 
 
-def ogr_shape_106():
+def test_ogr_shape_106():
 
     shape_drv = ogr.GetDriverByName('ESRI Shapefile')
     ds = shape_drv.CreateDataSource('/vsimem/ogr_shape_106.shp')
@@ -5238,7 +5238,7 @@ def is_same(filename1, filename2, verbose=True):
 # Test that multiple edition of the last shape works properly (#7031)
 
 
-def ogr_shape_107():
+def test_ogr_shape_107():
 
     layer_name = 'ogr_shape_107'
     filename = '/vsimem/' + layer_name + '.shp'
@@ -5323,7 +5323,7 @@ def ogr_shape_107():
 # Test spatial + attribute filter
 
 
-def ogr_shape_108():
+def test_ogr_shape_108():
 
     ds = ogr.Open('data/poly.shp')
     lyr = ds.GetLayer(0)
@@ -5341,7 +5341,7 @@ def ogr_shape_108():
 ###############################################################################
 # Test writing invalid polygon
 
-def ogr_shape_109():
+def test_ogr_shape_109():
 
     layer_name = 'ogr_shape_109'
     filename = '/vsimem/' + layer_name + '.shp'
@@ -5364,7 +5364,7 @@ def ogr_shape_109():
 ###############################################################################
 
 
-def ogr_shape_110_write_invalid_multipatch():
+def test_ogr_shape_110_write_invalid_multipatch():
 
     layer_name = 'ogr_shape_110'
     filename = '/vsimem/' + layer_name + '.shp'
@@ -5386,7 +5386,7 @@ def ogr_shape_110_write_invalid_multipatch():
 ###############################################################################
 
 
-def ogr_shape_111_delete_field_no_record():
+def test_ogr_shape_111_delete_field_no_record():
 
     layer_name = 'ogr_shape_111_delete_field_no_record'
     filename = '/vsimem/' + layer_name + '.shp'
@@ -5415,7 +5415,7 @@ def ogr_shape_111_delete_field_no_record():
 ###############################################################################
 
 
-def ogr_shape_cleanup():
+def test_ogr_shape_cleanup():
 
     if gdaltest.shape_ds is None:
         return 'skip'
@@ -5457,120 +5457,120 @@ def ogr_shape_cleanup():
 
 
 gdaltest_list = [
-    ogr_shape_1,
-    ogr_shape_2,
-    ogr_shape_3,
-    ogr_shape_4,
-    ogr_shape_5,
-    ogr_shape_6,
-    ogr_shape_7,
-    ogr_shape_8,
-    ogr_shape_9,
-    ogr_shape_10,
-    ogr_shape_11,
-    ogr_shape_12,
-    ogr_shape_13,
-    ogr_shape_14,
-    ogr_shape_15,
-    ogr_shape_16,
-    ogr_shape_16_1,
-    ogr_shape_17,
-    ogr_shape_18,
-    ogr_shape_19,
-    ogr_shape_20,
-    ogr_shape_21,
-    ogr_shape_22,
-    ogr_shape_23,
-    ogr_shape_24,
-    ogr_shape_25,
-    ogr_shape_26,
-    ogr_shape_27,
-    ogr_shape_28,
-    ogr_shape_29,
-    ogr_shape_30,
-    ogr_shape_31,
-    ogr_shape_32,
-    ogr_shape_33,
-    ogr_shape_34,
-    ogr_shape_35,
-    ogr_shape_36,
-    ogr_shape_37,
-    ogr_shape_37_bis,
-    ogr_shape_38,
-    ogr_shape_39,
-    ogr_shape_40,
-    ogr_shape_41,
-    ogr_shape_42,
-    ogr_shape_43,
+    test_ogr_shape_1,
+    test_ogr_shape_2,
+    test_ogr_shape_3,
+    test_ogr_shape_4,
+    test_ogr_shape_5,
+    test_ogr_shape_6,
+    test_ogr_shape_7,
+    test_ogr_shape_8,
+    test_ogr_shape_9,
+    test_ogr_shape_10,
+    test_ogr_shape_11,
+    test_ogr_shape_12,
+    test_ogr_shape_13,
+    test_ogr_shape_14,
+    test_ogr_shape_15,
+    test_ogr_shape_16,
+    test_ogr_shape_16_1,
+    test_ogr_shape_17,
+    test_ogr_shape_18,
+    test_ogr_shape_19,
+    test_ogr_shape_20,
+    test_ogr_shape_21,
+    test_ogr_shape_22,
+    test_ogr_shape_23,
+    test_ogr_shape_24,
+    test_ogr_shape_25,
+    test_ogr_shape_26,
+    test_ogr_shape_27,
+    test_ogr_shape_28,
+    test_ogr_shape_29,
+    test_ogr_shape_30,
+    test_ogr_shape_31,
+    test_ogr_shape_32,
+    test_ogr_shape_33,
+    test_ogr_shape_34,
+    test_ogr_shape_35,
+    test_ogr_shape_36,
+    test_ogr_shape_37,
+    test_ogr_shape_37_bis,
+    test_ogr_shape_38,
+    test_ogr_shape_39,
+    test_ogr_shape_40,
+    test_ogr_shape_41,
+    test_ogr_shape_42,
+    test_ogr_shape_43,
     # ogr_shape_44,
-    ogr_shape_45,
-    ogr_shape_46,
-    ogr_shape_47,
-    ogr_shape_48,
-    ogr_shape_49,
-    ogr_shape_50,
-    ogr_shape_51,
-    ogr_shape_52,
-    ogr_shape_53,
-    ogr_shape_54,
-    ogr_shape_55,
-    ogr_shape_56,
-    ogr_shape_57,
-    ogr_shape_58,
-    ogr_shape_59,
-    ogr_shape_60,
-    ogr_shape_61,
-    ogr_shape_62,
-    ogr_shape_63,
-    ogr_shape_64,
-    ogr_shape_65,
-    ogr_shape_66,
-    ogr_shape_67,
-    ogr_shape_68,
-    ogr_shape_69,
-    ogr_shape_70,
-    ogr_shape_71,
-    ogr_shape_72,
-    ogr_shape_73,
-    ogr_shape_74,
-    ogr_shape_75,
-    ogr_shape_76,
-    ogr_shape_77,
-    ogr_shape_78,
-    ogr_shape_79,
-    ogr_shape_80,
-    ogr_shape_81,
-    ogr_shape_82,
-    ogr_shape_83,
-    ogr_shape_84,
-    ogr_shape_85,
-    ogr_shape_86,
-    ogr_shape_87,
-    ogr_shape_88,
-    ogr_shape_89,
-    ogr_shape_90,
-    ogr_shape_91,
-    ogr_shape_92,
-    ogr_shape_93,
-    ogr_shape_94,
-    ogr_shape_95,
-    ogr_shape_96,
-    ogr_shape_97,
-    ogr_shape_98,
-    ogr_shape_99,
-    ogr_shape_100,
-    ogr_shape_101,
-    ogr_shape_102,
-    ogr_shape_103,
-    ogr_shape_104,
-    ogr_shape_105,
-    ogr_shape_106,
-    ogr_shape_107,
-    ogr_shape_108,
-    ogr_shape_109,
-    ogr_shape_110_write_invalid_multipatch,
-    ogr_shape_111_delete_field_no_record,
-    ogr_shape_cleanup]
+    test_ogr_shape_45,
+    test_ogr_shape_46,
+    test_ogr_shape_47,
+    test_ogr_shape_48,
+    test_ogr_shape_49,
+    test_ogr_shape_50,
+    test_ogr_shape_51,
+    test_ogr_shape_52,
+    test_ogr_shape_53,
+    test_ogr_shape_54,
+    test_ogr_shape_55,
+    test_ogr_shape_56,
+    test_ogr_shape_57,
+    test_ogr_shape_58,
+    test_ogr_shape_59,
+    test_ogr_shape_60,
+    test_ogr_shape_61,
+    test_ogr_shape_62,
+    test_ogr_shape_63,
+    test_ogr_shape_64,
+    test_ogr_shape_65,
+    test_ogr_shape_66,
+    test_ogr_shape_67,
+    test_ogr_shape_68,
+    test_ogr_shape_69,
+    test_ogr_shape_70,
+    test_ogr_shape_71,
+    test_ogr_shape_72,
+    test_ogr_shape_73,
+    test_ogr_shape_74,
+    test_ogr_shape_75,
+    test_ogr_shape_76,
+    test_ogr_shape_77,
+    test_ogr_shape_78,
+    test_ogr_shape_79,
+    test_ogr_shape_80,
+    test_ogr_shape_81,
+    test_ogr_shape_82,
+    test_ogr_shape_83,
+    test_ogr_shape_84,
+    test_ogr_shape_85,
+    test_ogr_shape_86,
+    test_ogr_shape_87,
+    test_ogr_shape_88,
+    test_ogr_shape_89,
+    test_ogr_shape_90,
+    test_ogr_shape_91,
+    test_ogr_shape_92,
+    test_ogr_shape_93,
+    test_ogr_shape_94,
+    test_ogr_shape_95,
+    test_ogr_shape_96,
+    test_ogr_shape_97,
+    test_ogr_shape_98,
+    test_ogr_shape_99,
+    test_ogr_shape_100,
+    test_ogr_shape_101,
+    test_ogr_shape_102,
+    test_ogr_shape_103,
+    test_ogr_shape_104,
+    test_ogr_shape_105,
+    test_ogr_shape_106,
+    test_ogr_shape_107,
+    test_ogr_shape_108,
+    test_ogr_shape_109,
+    test_ogr_shape_110_write_invalid_multipatch,
+    test_ogr_shape_111_delete_field_no_record,
+    test_ogr_shape_cleanup]
 
 # gdaltest_list = [ ogr_shape_107 ]
 
diff --git a/autotest/ogr/ogr_shape_qix.py b/autotest/ogr/ogr_shape_qix.py
index 30eab6495492..58030c7ee52e 100755
--- a/autotest/ogr/ogr_shape_qix.py
+++ b/autotest/ogr/ogr_shape_qix.py
@@ -87,7 +87,7 @@ def build_rectangle_from_point(x, y, radius=0.1):
 # Test geoms on a 10x10 grid
 
 
-def ogr_shape_qix_1():
+def test_ogr_shape_qix_1():
 
     shape_drv = ogr.GetDriverByName('ESRI Shapefile')
     ds = shape_drv.CreateDataSource('/vsimem/ogr_shape_qix.shp')
@@ -116,7 +116,7 @@ def ogr_shape_qix_1():
 # Test geoms on a 100x100 grid
 
 
-def ogr_shape_qix_2():
+def test_ogr_shape_qix_2():
 
     shape_drv = ogr.GetDriverByName('ESRI Shapefile')
     ds = shape_drv.CreateDataSource('/vsimem/ogr_shape_qix.shp')
@@ -145,7 +145,7 @@ def ogr_shape_qix_2():
 # Test 2 separated regions of 10x10 geoms
 
 
-def ogr_shape_qix_3():
+def test_ogr_shape_qix_3():
 
     shape_drv = ogr.GetDriverByName('ESRI Shapefile')
     ds = shape_drv.CreateDataSource('/vsimem/ogr_shape_qix.shp')
@@ -234,7 +234,7 @@ def build_rectangle(x1, y1, x2, y2):
 # Test random geometries
 
 
-def ogr_shape_qix_4():
+def test_ogr_shape_qix_4():
 
     shape_drv = ogr.GetDriverByName('ESRI Shapefile')
     ds = shape_drv.CreateDataSource('/vsimem/ogr_shape_qix.shp')
@@ -273,10 +273,10 @@ def ogr_shape_qix_4():
 
 
 gdaltest_list = [
-    ogr_shape_qix_1,
-    ogr_shape_qix_2,
-    ogr_shape_qix_3,
-    ogr_shape_qix_4,
+    test_ogr_shape_qix_1,
+    test_ogr_shape_qix_2,
+    test_ogr_shape_qix_3,
+    test_ogr_shape_qix_4,
 ]
 
 if __name__ == '__main__':
diff --git a/autotest/ogr/ogr_shape_sbn.py b/autotest/ogr/ogr_shape_sbn.py
index 5414513fe509..6ace12cd85da 100755
--- a/autotest/ogr/ogr_shape_sbn.py
+++ b/autotest/ogr/ogr_shape_sbn.py
@@ -107,7 +107,7 @@ def search_all_features(lyr):
 # Test
 
 
-def ogr_shape_sbn_1():
+def test_ogr_shape_sbn_1():
 
     if not gdaltest.download_file('http://pubs.usgs.gov/sim/3194/contents/Cochiti_shapefiles.zip', 'Cochiti_shapefiles.zip'):
         return 'skip'
@@ -137,7 +137,7 @@ def ogr_shape_sbn_1():
 # Test
 
 
-def ogr_shape_sbn_2():
+def test_ogr_shape_sbn_2():
 
     ds = ogr.Open('data/CoHI_GCS12.shp')
     lyr = ds.GetLayer(0)
@@ -145,8 +145,8 @@ def ogr_shape_sbn_2():
 
 
 gdaltest_list = [
-    ogr_shape_sbn_1,
-    ogr_shape_sbn_2,
+    test_ogr_shape_sbn_1,
+    test_ogr_shape_sbn_2,
 ]
 
 if __name__ == '__main__':
diff --git a/autotest/ogr/ogr_sosi.py b/autotest/ogr/ogr_sosi.py
index 84b7724d2187..b53e757a1968 100755
--- a/autotest/ogr/ogr_sosi.py
+++ b/autotest/ogr/ogr_sosi.py
@@ -38,7 +38,7 @@
 ###############################################################################
 
 
-def ogr_sosi_1():
+def test_ogr_sosi_1():
 
     if ogr.GetDriverByName('SOSI') is None:
         return 'skip'
@@ -60,7 +60,7 @@ def ogr_sosi_1():
 
 
 gdaltest_list = [
-    ogr_sosi_1]
+    test_ogr_sosi_1]
 
 if __name__ == '__main__':
 
diff --git a/autotest/ogr/ogr_sql_rfc28.py b/autotest/ogr/ogr_sql_rfc28.py
index f14da9947cbf..84684e254a82 100755
--- a/autotest/ogr/ogr_sql_rfc28.py
+++ b/autotest/ogr/ogr_sql_rfc28.py
@@ -43,7 +43,7 @@
 # expression for the value.
 
 
-def ogr_rfc28_1():
+def test_ogr_rfc28_1():
     gdaltest.ds = ogr.Open('data')
     gdaltest.lyr = gdaltest.ds.GetLayerByName('poly')
 
@@ -60,7 +60,7 @@ def ogr_rfc28_1():
 # Test CONCAT operator in the context of a WHERE clause.
 
 
-def ogr_rfc28_2():
+def test_ogr_rfc28_2():
     gdaltest.lyr.SetAttributeFilter("CONCAT('x',PRFEDEA) = 'x35043423'")
 
     count = gdaltest.lyr.GetFeatureCount()
@@ -75,7 +75,7 @@ def ogr_rfc28_2():
 # Test '+' operator on strings.
 
 
-def ogr_rfc28_3():
+def test_ogr_rfc28_3():
     gdaltest.lyr.SetAttributeFilter("'x'+PRFEDEA = 'x35043423'")
 
     count = gdaltest.lyr.GetFeatureCount()
@@ -90,7 +90,7 @@ def ogr_rfc28_3():
 # Test '%' operator.
 
 
-def ogr_rfc28_4():
+def test_ogr_rfc28_4():
     gdaltest.lyr.SetAttributeFilter("EAS_ID % 5 = 1")
 
     count = gdaltest.lyr.GetFeatureCount()
@@ -105,7 +105,7 @@ def ogr_rfc28_4():
 # Test '%' operator.
 
 
-def ogr_rfc28_5():
+def test_ogr_rfc28_5():
     gdaltest.lyr.SetAttributeFilter("EAS_ID % 5 = 1")
 
     count = gdaltest.lyr.GetFeatureCount()
@@ -120,7 +120,7 @@ def ogr_rfc28_5():
 # Test support for a quoted field name.
 
 
-def ogr_rfc28_6():
+def test_ogr_rfc28_6():
     gdaltest.lyr.SetAttributeFilter("\"EAS_ID\" = 166")
 
     count = gdaltest.lyr.GetFeatureCount()
@@ -135,7 +135,7 @@ def ogr_rfc28_6():
 # test with distinguished name for field in where clause.
 
 
-def ogr_rfc28_7_wrong_quoting():
+def test_ogr_rfc28_7_wrong_quoting():
     with gdaltest.error_handler():
         ql = gdaltest.ds.ExecuteSQL("select eas_id from idlink where \"idlink.eas_id\" = 166")
 
@@ -148,7 +148,7 @@ def ogr_rfc28_7_wrong_quoting():
     return 'success'
 
 
-def ogr_rfc28_7_good_quoting():
+def test_ogr_rfc28_7_good_quoting():
     ql = gdaltest.ds.ExecuteSQL("select eas_id from idlink where idlink.eas_id = 166")
 
     count = ql.GetFeatureCount()
@@ -163,7 +163,7 @@ def ogr_rfc28_7_good_quoting():
 # test with distinguished name for field in target columns.
 
 
-def ogr_rfc28_8_wrong_quoting():
+def test_ogr_rfc28_8_wrong_quoting():
     with gdaltest.error_handler():
         ql = gdaltest.ds.ExecuteSQL("select \"idlink.eas_id\" from idlink where \"idlink.eas_id\" = 166")
 
@@ -180,7 +180,7 @@ def ogr_rfc28_8_wrong_quoting():
     return 'success' if tr else 'fail'
 
 
-def ogr_rfc28_8_good_quoting():
+def test_ogr_rfc28_8_good_quoting():
     ql = gdaltest.ds.ExecuteSQL("select idlink.eas_id from idlink where idlink.eas_id = 166")
 
     count = ql.GetFeatureCount()
@@ -199,7 +199,7 @@ def ogr_rfc28_8_good_quoting():
 # Test with quoted funky (non-identifier) name.
 
 
-def ogr_rfc28_9():
+def test_ogr_rfc28_9():
     ds = ogr.Open('data/oddname.csv')
     lyr = ds.GetLayer(0)
     lyr.SetAttributeFilter("\"Funky @Name\" = '32'")
@@ -218,7 +218,7 @@ def ogr_rfc28_9():
 # test quoted names for funky columns in SELECT WHERE (confirm unparse quoting)
 
 
-def ogr_rfc28_10():
+def test_ogr_rfc28_10():
     ds = ogr.Open('data/oddname.csv')
     lyr = ds.ExecuteSQL("SELECT * from oddname where \"Funky @Name\" = '32'")
 
@@ -237,7 +237,7 @@ def ogr_rfc28_10():
 # test quoted funky names in output columns list.
 
 
-def ogr_rfc28_11():
+def test_ogr_rfc28_11():
     ds = ogr.Open('data/oddname.csv')
     lyr = ds.ExecuteSQL("SELECT \"Funky @Name\" from oddname where prime_meridian_code = '8902'")
 
@@ -256,7 +256,7 @@ def ogr_rfc28_11():
 # test selecting fixed string fields.
 
 
-def ogr_rfc28_12():
+def test_ogr_rfc28_12():
     lyr = gdaltest.ds.ExecuteSQL("SELECT 'constant string', 'other' as abc, eas_id from idlink where eas_id = 165")
 
     count = lyr.GetFeatureCount()
@@ -285,7 +285,7 @@ def ogr_rfc28_12():
 # Test SUBSTR operator in the context of a WHERE clause.
 
 
-def ogr_rfc28_13():
+def test_ogr_rfc28_13():
     gdaltest.lyr.SetAttributeFilter("SUBSTR(PRFEDEA,5,4) = '3423'")
 
     count = gdaltest.lyr.GetFeatureCount()
@@ -300,7 +300,7 @@ def ogr_rfc28_13():
 # test selecting fixed string fields.
 
 
-def ogr_rfc28_14():
+def test_ogr_rfc28_14():
     lyr = gdaltest.ds.ExecuteSQL("SELECT SUBSTR(PRFEDEA,4,5) from poly where eas_id in (168,179)")
 
     expect = ['43411', '43423']
@@ -314,7 +314,7 @@ def ogr_rfc28_14():
 # Test CONCAT with more than two arguments.
 
 
-def ogr_rfc28_15():
+def test_ogr_rfc28_15():
     lyr = gdaltest.ds.ExecuteSQL("SELECT CONCAT(PRFEDEA,' ',CAST(EAS_ID AS CHARACTER(3))) from poly where eas_id in (168,179)")
 
     expect = ['35043411 168', '35043423 179']
@@ -328,7 +328,7 @@ def ogr_rfc28_15():
 # Test parse support for negative numbers (#3724)
 
 
-def ogr_rfc28_16():
+def test_ogr_rfc28_16():
     lyr = gdaltest.ds.ExecuteSQL("SELECT -1, 3--1,3*-1,2e-1,3-1 from poly where eas_id = 168")
 
     expect = [-1]
@@ -358,7 +358,7 @@ def ogr_rfc28_16():
 # Test evaluation of division - had a problem with type conversion.
 
 
-def ogr_rfc28_17():
+def test_ogr_rfc28_17():
     lyr = gdaltest.ds.ExecuteSQL("SELECT 5/2, 5.0/2.0, 5/2.0, 5.0/2 from poly where eas_id = 168")
 
     expect = [2]
@@ -384,7 +384,7 @@ def ogr_rfc28_17():
 ###############################################################################
 # Test some special distinct cases.
 
-def ogr_rfc28_18():
+def test_ogr_rfc28_18():
     lyr = gdaltest.ds.ExecuteSQL("SELECT COUNT(distinct id), COUNT(distinct id) as \"xx\" from departs")
 
     expect = [1]
@@ -402,7 +402,7 @@ def ogr_rfc28_18():
 ###############################################################################
 # Verify that NOT IN ( list ) works
 
-def ogr_rfc28_19():
+def test_ogr_rfc28_19():
 
     sql_lyr = gdaltest.ds.ExecuteSQL('select * from poly where eas_id not in (158,165)')
 
@@ -420,7 +420,7 @@ def ogr_rfc28_19():
 ###############################################################################
 # Verify arithmetic operator precedence and unary minus
 
-def ogr_rfc28_20():
+def test_ogr_rfc28_20():
 
     ds = ogr.GetDriverByName("Memory").CreateDataSource("my_ds")
     lyr = ds.CreateLayer("my_layer")
@@ -444,7 +444,7 @@ def ogr_rfc28_20():
 # Verify that BETWEEN works
 
 
-def ogr_rfc28_21():
+def test_ogr_rfc28_21():
 
     sql_lyr = gdaltest.ds.ExecuteSQL('select * from poly where eas_id between 165 and 169')
 
@@ -468,7 +468,7 @@ def ogr_rfc28_21():
 # Verify that NOT BETWEEN works
 
 
-def ogr_rfc28_22():
+def test_ogr_rfc28_22():
 
     sql_lyr = gdaltest.ds.ExecuteSQL('select * from poly where eas_id not between 165 and 169')
 
@@ -492,7 +492,7 @@ def ogr_rfc28_22():
 # Verify that NOT LIKE works
 
 
-def ogr_rfc28_23():
+def test_ogr_rfc28_23():
 
     sql_lyr = gdaltest.ds.ExecuteSQL("select * from poly where PRFEDEA NOT LIKE '35043413'")
 
@@ -516,7 +516,7 @@ def ogr_rfc28_23():
 # Verify that NULL works
 
 
-def ogr_rfc28_24():
+def test_ogr_rfc28_24():
 
     sql_lyr = gdaltest.ds.ExecuteSQL("select *, NULL, NULL as nullstrfield, CAST(null as integer) as nullintfield from poly where NULL IS NULL")
 
@@ -551,7 +551,7 @@ def ogr_rfc28_24():
 # Verify that LIKE pattern ESCAPE escape_char works
 
 
-def ogr_rfc28_25():
+def test_ogr_rfc28_25():
 
     sql_lyr = gdaltest.ds.ExecuteSQL("select * from poly where prfedea LIKE 'x35043408' ESCAPE 'x'")
 
@@ -569,7 +569,7 @@ def ogr_rfc28_25():
 # Test SUBSTR with negative offsets
 
 
-def ogr_rfc28_26():
+def test_ogr_rfc28_26():
     lyr = gdaltest.ds.ExecuteSQL("SELECT SUBSTR(PRFEDEA,-2) from poly where eas_id in (168,179)")
 
     expect = ['11', '23']
@@ -583,7 +583,7 @@ def ogr_rfc28_26():
 # Test that we correctly let floating point values as floating point, and not as integer (#4634)"
 
 
-def ogr_rfc28_27():
+def test_ogr_rfc28_27():
 
     lyr = gdaltest.ds.ExecuteSQL("SELECT * FROM poly WHERE 4000000000. > 2000000000.")
 
@@ -610,7 +610,7 @@ def ogr_rfc28_28_test(formula, expected_val):
     return 'success'
 
 
-def ogr_rfc28_28():
+def test_ogr_rfc28_28():
 
     operators = ['+', '-', '*', '/', '%']
     formulas = []
@@ -695,7 +695,7 @@ def ogr_rfc28_28():
 # Test behaviour of binary operations when one operand is a NULL value
 
 
-def ogr_rfc28_29():
+def test_ogr_rfc28_29():
 
     lyr = gdaltest.ds.ExecuteSQL("select * from idlink where (eas_id + cast(null as integer)) is not null or eas_id = 170 + cast(null as integer) or (eas_id + cast(null as float)) is not null or eas_id = 170.0 + cast(null as float)")
 
@@ -709,7 +709,7 @@ def ogr_rfc28_29():
 # Test behaviour of binary operations on strings when one operand is a NULL value
 
 
-def ogr_rfc28_30():
+def test_ogr_rfc28_30():
 
     lyr = gdaltest.ds.ExecuteSQL("select * from idlink2 where F1 <> 'foo' or concat(F1,cast(null as character(32))) is not null")
 
@@ -723,7 +723,7 @@ def ogr_rfc28_30():
 # Test UNION ALL
 
 
-def ogr_rfc28_31():
+def test_ogr_rfc28_31():
 
     lyr = gdaltest.ds.ExecuteSQL("select * from idlink union all select * from idlink2")
 
@@ -737,7 +737,7 @@ def ogr_rfc28_31():
 # Test UNION ALL with parenthesis
 
 
-def ogr_rfc28_32():
+def test_ogr_rfc28_32():
 
     lyr = gdaltest.ds.ExecuteSQL("(select * from idlink) union all (select * from idlink2 order by eas_id)")
 
@@ -751,7 +751,7 @@ def ogr_rfc28_32():
 # Test lack of end-of-string character
 
 
-def ogr_rfc28_33():
+def test_ogr_rfc28_33():
 
     gdal.PushErrorHandler('CPLQuietErrorHandler')
     lyr = gdaltest.ds.ExecuteSQL("select * from idlink where name='foo")
@@ -763,7 +763,7 @@ def ogr_rfc28_33():
 # Test wildcard expansion of an unknown table.
 
 
-def ogr_rfc28_34():
+def test_ogr_rfc28_34():
 
     gdal.PushErrorHandler('CPLQuietErrorHandler')
     lyr = gdaltest.ds.ExecuteSQL("select foo.* from idlink")
@@ -779,7 +779,7 @@ def ogr_rfc28_34():
 # Test selecting more than one distinct
 
 
-def ogr_rfc28_35():
+def test_ogr_rfc28_35():
 
     gdal.PushErrorHandler('CPLQuietErrorHandler')
     lyr = gdaltest.ds.ExecuteSQL("select distinct eas_id, distinct name from idlink")
@@ -794,7 +794,7 @@ def ogr_rfc28_35():
 # Test selecting more than one distinct
 
 
-def ogr_rfc28_35_bis():
+def test_ogr_rfc28_35_bis():
 
     gdal.PushErrorHandler('CPLQuietErrorHandler')
     lyr = gdaltest.ds.ExecuteSQL("select distinct eas_id, name from idlink")
@@ -809,7 +809,7 @@ def ogr_rfc28_35_bis():
 # Test selecting more than one distinct
 
 
-def ogr_rfc28_35_ter():
+def test_ogr_rfc28_35_ter():
 
     gdal.PushErrorHandler('CPLQuietErrorHandler')
     lyr = gdaltest.ds.ExecuteSQL("select distinct * from idlink")
@@ -824,7 +824,7 @@ def ogr_rfc28_35_ter():
 # Test ORDER BY a DISTINCT list by more than one key
 
 
-def ogr_rfc28_36():
+def test_ogr_rfc28_36():
 
     gdal.ErrorReset()
     gdal.PushErrorHandler('CPLQuietErrorHandler')
@@ -842,7 +842,7 @@ def ogr_rfc28_36():
 # Test different fields for ORDER BY and DISTINCT
 
 
-def ogr_rfc28_37():
+def test_ogr_rfc28_37():
 
     gdal.ErrorReset()
     gdal.PushErrorHandler('CPLQuietErrorHandler')
@@ -860,7 +860,7 @@ def ogr_rfc28_37():
 # Test invalid SUBSTR
 
 
-def ogr_rfc28_38():
+def test_ogr_rfc28_38():
 
     gdal.ErrorReset()
     gdal.PushErrorHandler('CPLQuietErrorHandler')
@@ -888,7 +888,7 @@ def ogr_rfc28_38():
 # Test COUNT() on a 0-row result
 
 
-def ogr_rfc28_39():
+def test_ogr_rfc28_39():
 
     lyr = gdaltest.ds.ExecuteSQL("SELECT COUNT(*) from poly where 0 = 1")
 
@@ -902,7 +902,7 @@ def ogr_rfc28_39():
 # Test MIN(), MAX() and AVG() on a date (#5333)
 
 
-def ogr_rfc28_40():
+def test_ogr_rfc28_40():
 
     ds = ogr.GetDriverByName('Memory').CreateDataSource('')
     lyr = ds.CreateLayer('test')
@@ -937,7 +937,7 @@ def ogr_rfc28_40():
 ###############################################################################
 # Verify that SELECT * works on a layer with a field that has a dot character (#5379)
 
-def ogr_rfc28_41():
+def test_ogr_rfc28_41():
 
     ds = ogr.GetDriverByName("Memory").CreateDataSource("my_ds")
     lyr = ds.CreateLayer("my_layer")
@@ -969,7 +969,7 @@ def ogr_rfc28_41():
 # Test boolean and int16 support
 
 
-def ogr_rfc28_42():
+def test_ogr_rfc28_42():
 
     ds = ogr.GetDriverByName('Memory').CreateDataSource('')
     lyr = ds.CreateLayer('test')
@@ -1055,7 +1055,7 @@ def ogr_rfc28_42():
 # Test integer64 support
 
 
-def ogr_rfc28_43():
+def test_ogr_rfc28_43():
 
     ds = ogr.GetDriverByName('Memory').CreateDataSource('')
     lyr = ds.CreateLayer('test')
@@ -1116,7 +1116,7 @@ def ogr_rfc28_43():
 # Test crazy quoting of table and fields
 
 
-def ogr_rfc28_44():
+def test_ogr_rfc28_44():
 
     ds = ogr.GetDriverByName('Memory').CreateDataSource('')
     lyr = ds.CreateLayer('lyr.withpoint')
@@ -1204,7 +1204,7 @@ def ogr_rfc28_44():
 # Test 'FROM table_name AS alias'
 
 
-def ogr_rfc28_45():
+def test_ogr_rfc28_45():
 
     ql = gdaltest.ds.ExecuteSQL("select eas_id from idlink as il where il.eas_id = 166")
 
@@ -1220,7 +1220,7 @@ def ogr_rfc28_45():
 # Test fid special column and 64 bit
 
 
-def ogr_rfc28_46():
+def test_ogr_rfc28_46():
 
     ds = ogr.GetDriverByName('Memory').CreateDataSource('')
     lyr = ds.CreateLayer('lyr')
@@ -1283,7 +1283,7 @@ def ogr_rfc28_46():
 # Test LIMIT and OFFSET
 
 
-def ogr_rfc28_47():
+def test_ogr_rfc28_47():
 
     lyr = gdaltest.ds.ExecuteSQL("SELECT * FROM POLY LIMIT 0")
     tr = ogrtest.check_features_against_list(lyr, 'EAS_ID', [])
@@ -1424,7 +1424,7 @@ def ogr_rfc28_47():
 # Test date/datetime comparisons (#6810)
 
 
-def ogr_rfc28_48():
+def test_ogr_rfc28_48():
 
     ds = ogr.GetDriverByName('Memory').CreateDataSource('')
     lyr = ds.CreateLayer('lyr')
@@ -1536,7 +1536,7 @@ def ogr_rfc28_48():
 
 
 ###############################################################################
-def ogr_rfc28_int_overflows():
+def test_ogr_rfc28_int_overflows():
 
     ds = ogr.GetDriverByName('Memory').CreateDataSource('')
     lyr = ds.CreateLayer('lyr')
@@ -1590,7 +1590,7 @@ def ogr_rfc28_int_overflows():
 ###############################################################################
 
 
-def ogr_rfc28_cleanup():
+def test_ogr_rfc28_cleanup():
     gdaltest.lyr = None
     gdaltest.ds = None
 
@@ -1598,60 +1598,60 @@ def ogr_rfc28_cleanup():
 
 
 gdaltest_list = [
-    ogr_rfc28_1,
-    ogr_rfc28_2,
-    ogr_rfc28_3,
-    ogr_rfc28_4,
-    ogr_rfc28_5,
-    ogr_rfc28_6,
-    ogr_rfc28_7_wrong_quoting,
-    ogr_rfc28_7_good_quoting,
-    ogr_rfc28_8_wrong_quoting,
-    ogr_rfc28_8_good_quoting,
-    ogr_rfc28_9,
-    ogr_rfc28_10,
-    ogr_rfc28_11,
-    ogr_rfc28_12,
-    ogr_rfc28_13,
-    ogr_rfc28_14,
-    ogr_rfc28_15,
-    ogr_rfc28_16,
-    ogr_rfc28_17,
-    ogr_rfc28_18,
-    ogr_rfc28_19,
-    ogr_rfc28_20,
-    ogr_rfc28_21,
-    ogr_rfc28_22,
-    ogr_rfc28_23,
-    ogr_rfc28_24,
-    ogr_rfc28_25,
-    ogr_rfc28_26,
-    ogr_rfc28_27,
-    ogr_rfc28_28,
-    ogr_rfc28_29,
-    ogr_rfc28_30,
-    ogr_rfc28_31,
-    ogr_rfc28_32,
-    ogr_rfc28_33,
-    ogr_rfc28_34,
-    ogr_rfc28_35,
-    ogr_rfc28_35_bis,
-    ogr_rfc28_35_ter,
-    ogr_rfc28_36,
-    ogr_rfc28_37,
-    ogr_rfc28_38,
-    ogr_rfc28_39,
-    ogr_rfc28_40,
-    ogr_rfc28_41,
-    ogr_rfc28_42,
-    ogr_rfc28_43,
-    ogr_rfc28_44,
-    ogr_rfc28_45,
-    ogr_rfc28_46,
-    ogr_rfc28_47,
-    ogr_rfc28_48,
-    ogr_rfc28_int_overflows,
-    ogr_rfc28_cleanup]
+    test_ogr_rfc28_1,
+    test_ogr_rfc28_2,
+    test_ogr_rfc28_3,
+    test_ogr_rfc28_4,
+    test_ogr_rfc28_5,
+    test_ogr_rfc28_6,
+    test_ogr_rfc28_7_wrong_quoting,
+    test_ogr_rfc28_7_good_quoting,
+    test_ogr_rfc28_8_wrong_quoting,
+    test_ogr_rfc28_8_good_quoting,
+    test_ogr_rfc28_9,
+    test_ogr_rfc28_10,
+    test_ogr_rfc28_11,
+    test_ogr_rfc28_12,
+    test_ogr_rfc28_13,
+    test_ogr_rfc28_14,
+    test_ogr_rfc28_15,
+    test_ogr_rfc28_16,
+    test_ogr_rfc28_17,
+    test_ogr_rfc28_18,
+    test_ogr_rfc28_19,
+    test_ogr_rfc28_20,
+    test_ogr_rfc28_21,
+    test_ogr_rfc28_22,
+    test_ogr_rfc28_23,
+    test_ogr_rfc28_24,
+    test_ogr_rfc28_25,
+    test_ogr_rfc28_26,
+    test_ogr_rfc28_27,
+    test_ogr_rfc28_28,
+    test_ogr_rfc28_29,
+    test_ogr_rfc28_30,
+    test_ogr_rfc28_31,
+    test_ogr_rfc28_32,
+    test_ogr_rfc28_33,
+    test_ogr_rfc28_34,
+    test_ogr_rfc28_35,
+    test_ogr_rfc28_35_bis,
+    test_ogr_rfc28_35_ter,
+    test_ogr_rfc28_36,
+    test_ogr_rfc28_37,
+    test_ogr_rfc28_38,
+    test_ogr_rfc28_39,
+    test_ogr_rfc28_40,
+    test_ogr_rfc28_41,
+    test_ogr_rfc28_42,
+    test_ogr_rfc28_43,
+    test_ogr_rfc28_44,
+    test_ogr_rfc28_45,
+    test_ogr_rfc28_46,
+    test_ogr_rfc28_47,
+    test_ogr_rfc28_48,
+    test_ogr_rfc28_int_overflows,
+    test_ogr_rfc28_cleanup]
 
 if __name__ == '__main__':
 
diff --git a/autotest/ogr/ogr_sql_sqlite.py b/autotest/ogr/ogr_sql_sqlite.py
index 5e6e2c93f2b8..2e1faf4ea0d3 100755
--- a/autotest/ogr/ogr_sql_sqlite.py
+++ b/autotest/ogr/ogr_sql_sqlite.py
@@ -73,7 +73,7 @@ def ogr_sql_sqlite_available():
 # Tests that don't involve geometry
 
 
-def ogr_sql_sqlite_1():
+def test_ogr_sql_sqlite_1():
 
     ret = ogr_sql_sqlite_available()
     if ret == 'fail':
@@ -299,7 +299,7 @@ def ogr_sql_sqlite_1():
 # Tests that involve geometry  (but without needing Spatialite)
 
 
-def ogr_sql_sqlite_2():
+def test_ogr_sql_sqlite_2():
 
     if not ogrtest.has_sqlite_dialect:
         return 'skip'
@@ -427,7 +427,7 @@ def ogr_sql_sqlite_2():
 # Test that involves a join
 
 
-def ogr_sql_sqlite_3():
+def test_ogr_sql_sqlite_3():
 
     if not ogrtest.has_sqlite_dialect:
         return 'skip'
@@ -460,7 +460,7 @@ def ogr_sql_sqlite_3():
 # Test that involves a self-join (to check that we can open twice the same table)
 
 
-def ogr_sql_sqlite_4():
+def test_ogr_sql_sqlite_4():
 
     if not ogrtest.has_sqlite_dialect:
         return 'skip'
@@ -483,7 +483,7 @@ def ogr_sql_sqlite_4():
 # Test that involves spatialite
 
 
-def ogr_sql_sqlite_5():
+def test_ogr_sql_sqlite_5():
 
     if not ogrtest.has_sqlite_dialect:
         return 'skip'
@@ -523,7 +523,7 @@ def ogr_sql_sqlite_5():
 # we are fully compatible with regular SQLite
 
 
-def ogr_sql_sqlite_6():
+def test_ogr_sql_sqlite_6():
 
     if not ogrtest.has_sqlite_dialect:
         return 'skip'
@@ -533,15 +533,15 @@ def ogr_sql_sqlite_6():
 
     gdal.SetConfigOption('OGR_SQLITE_DIALECT_USE_SPATIALITE', 'NO')
 
-    ret = ogr_sql_sqlite_1()
+    ret = test_ogr_sql_sqlite_1()
     if ret != 'success':
         return ret
 
-    ret = ogr_sql_sqlite_2()
+    ret = test_ogr_sql_sqlite_2()
     if ret != 'success':
         return ret
 
-    ret = ogr_sql_sqlite_4()
+    ret = test_ogr_sql_sqlite_4()
     if ret != 'success':
         return ret
 
@@ -553,7 +553,7 @@ def ogr_sql_sqlite_6():
 # Test if there's a text column called GEOMETRY already in the table
 
 
-def ogr_sql_sqlite_7():
+def test_ogr_sql_sqlite_7():
 
     if not ogrtest.has_sqlite_dialect:
         return 'skip'
@@ -606,7 +606,7 @@ def ogr_sql_sqlite_7():
 # Test join with an external datasource
 
 
-def ogr_sql_sqlite_8():
+def test_ogr_sql_sqlite_8():
 
     if not ogrtest.has_sqlite_dialect:
         return 'skip'
@@ -630,7 +630,7 @@ def ogr_sql_sqlite_8():
 # Check parsing of sub-selects
 
 
-def ogr_sql_sqlite_9():
+def test_ogr_sql_sqlite_9():
 
     if not ogrtest.has_sqlite_dialect:
         return 'skip'
@@ -654,7 +654,7 @@ def ogr_sql_sqlite_9():
 # Test optimized count(*)
 
 
-def ogr_sql_sqlite_10():
+def test_ogr_sql_sqlite_10():
 
     if not ogrtest.has_sqlite_dialect:
         return 'skip'
@@ -678,7 +678,7 @@ def ogr_sql_sqlite_10():
 # Test correct parsing of litterals
 
 
-def ogr_sql_sqlite_11():
+def test_ogr_sql_sqlite_11():
 
     if not ogrtest.has_sqlite_dialect:
         return 'skip'
@@ -708,7 +708,7 @@ def ogr_sql_sqlite_11():
 # Test various error conditions
 
 
-def ogr_sql_sqlite_12():
+def test_ogr_sql_sqlite_12():
 
     if not ogrtest.has_sqlite_dialect:
         return 'skip'
@@ -741,7 +741,7 @@ def ogr_sql_sqlite_12():
 # Test ogr_layer_Extent(), ogr_layer_SRID() and ogr_layer_GeometryType()
 
 
-def ogr_sql_sqlite_13():
+def test_ogr_sql_sqlite_13():
 
     if not ogrtest.has_sqlite_dialect:
         return 'skip'
@@ -962,7 +962,7 @@ def ogr_sql_sqlite_14_and_15(sql):
 # Test 'idx_layername_geometryname' spatial index recognition
 
 
-def ogr_sql_sqlite_14():
+def test_ogr_sql_sqlite_14():
 
     if not ogrtest.has_sqlite_dialect:
         return 'skip'
@@ -981,7 +981,7 @@ def ogr_sql_sqlite_14():
 # Test 'SpatialIndex' spatial index recognition
 
 
-def ogr_sql_sqlite_15():
+def test_ogr_sql_sqlite_15():
 
     if not ogrtest.has_sqlite_dialect:
         return 'skip'
@@ -1265,7 +1265,7 @@ def do_GET(self):
 
 
 ###############################################################################
-def ogr_sql_sqlite_start_webserver():
+def test_ogr_sql_sqlite_start_webserver():
 
     ogrtest.webserver_process = None
     ogrtest.webserver_port = 0
@@ -1286,7 +1286,7 @@ def ogr_sql_sqlite_start_webserver():
 # Test ogr_geocode()
 
 
-def ogr_sql_sqlite_16(service=None, template='http://127.0.0.1:%d/geocoding?q=%%s'):
+def test_ogr_sql_sqlite_16(service=None, template='http://127.0.0.1:%d/geocoding?q=%%s'):
 
     if not ogrtest.has_sqlite_dialect:
         return 'skip'
@@ -1414,7 +1414,7 @@ def ogr_sql_sqlite_16(service=None, template='http://127.0.0.1:%d/geocoding?q=%%
 # Test ogr_geocode_reverse()
 
 
-def ogr_sql_sqlite_17(service=None, template='http://127.0.0.1:%d/reversegeocoding?lon={lon}&lat={lat}'):
+def test_ogr_sql_sqlite_17(service=None, template='http://127.0.0.1:%d/reversegeocoding?lon={lon}&lat={lat}'):
 
     if not ogrtest.has_sqlite_dialect:
         return 'skip'
@@ -1533,55 +1533,55 @@ def ogr_sql_sqlite_17(service=None, template='http://127.0.0.1:%d/reversegeocodi
 # Test ogr_geocode() with Yahoo geocoding service
 
 
-def ogr_sql_sqlite_18():
+def test_ogr_sql_sqlite_18():
 
-    return ogr_sql_sqlite_16('YAHOO', 'http://127.0.0.1:%d/yahoogeocoding?q=%%s')
+    return test_ogr_sql_sqlite_16('YAHOO', 'http://127.0.0.1:%d/yahoogeocoding?q=%%s')
 
 ###############################################################################
 # Test ogr_geocode_reverse() with Yahoo geocoding service
 
 
-def ogr_sql_sqlite_19():
+def test_ogr_sql_sqlite_19():
 
-    return ogr_sql_sqlite_17('YAHOO', 'http://127.0.0.1:%d/yahooreversegeocoding?q={lat},{lon}&gflags=R')
+    return test_ogr_sql_sqlite_17('YAHOO', 'http://127.0.0.1:%d/yahooreversegeocoding?q={lat},{lon}&gflags=R')
 
 ###############################################################################
 # Test ogr_geocode() with GeoNames.org geocoding service
 
 
-def ogr_sql_sqlite_20():
+def test_ogr_sql_sqlite_20():
 
-    return ogr_sql_sqlite_16('GEONAMES', 'http://127.0.0.1:%d/geonamesgeocoding?q=%%s')
+    return test_ogr_sql_sqlite_16('GEONAMES', 'http://127.0.0.1:%d/geonamesgeocoding?q=%%s')
 
 ###############################################################################
 # Test ogr_geocode_reverse() with GeoNames.org geocoding service
 
 
-def ogr_sql_sqlite_21():
+def test_ogr_sql_sqlite_21():
 
-    return ogr_sql_sqlite_17('GEONAMES', 'http://127.0.0.1:%d/geonamesreversegeocoding?lat={lat}&lng={lon}')
+    return test_ogr_sql_sqlite_17('GEONAMES', 'http://127.0.0.1:%d/geonamesreversegeocoding?lat={lat}&lng={lon}')
 
 ###############################################################################
 # Test ogr_geocode() with Bing geocoding service
 
 
-def ogr_sql_sqlite_22():
+def test_ogr_sql_sqlite_22():
 
-    return ogr_sql_sqlite_16('BING', 'http://127.0.0.1:%d/binggeocoding?q=%%s')
+    return test_ogr_sql_sqlite_16('BING', 'http://127.0.0.1:%d/binggeocoding?q=%%s')
 
 ###############################################################################
 # Test ogr_geocode_reverse() with Bing geocoding service
 
 
-def ogr_sql_sqlite_23():
+def test_ogr_sql_sqlite_23():
 
-    return ogr_sql_sqlite_17('BING', 'http://127.0.0.1:%d/bingreversegeocoding?{lat},{lon}')
+    return test_ogr_sql_sqlite_17('BING', 'http://127.0.0.1:%d/bingreversegeocoding?{lat},{lon}')
 
 ###############################################################################
 # Test ogr_deflate() and ogr_inflate()
 
 
-def ogr_sql_sqlite_24():
+def test_ogr_sql_sqlite_24():
 
     if not ogrtest.has_sqlite_dialect:
         return 'skip'
@@ -1672,7 +1672,7 @@ def ogr_sql_sqlite_24():
 ###############################################################################
 
 
-def ogr_sql_sqlite_stop_webserver():
+def test_ogr_sql_sqlite_stop_webserver():
 
     if ogrtest.webserver_port == 0:
         return 'skip'
@@ -1700,7 +1700,7 @@ def ogr_sql_sqlite_25_test_errors(ds, fct):
         return True
 
 
-def ogr_sql_sqlite_25():
+def test_ogr_sql_sqlite_25():
 
     if not ogrtest.has_sqlite_dialect:
         return 'skip'
@@ -1765,7 +1765,7 @@ def ogr_sql_sqlite_25():
     return 'success'
 
 
-def ogr_sql_sqlite_26():
+def test_ogr_sql_sqlite_26():
 
     if not ogrtest.has_sqlite_dialect:
         return 'skip'
@@ -1906,7 +1906,7 @@ def ogr_sql_sqlite_26():
 ###############################################################################
 # Test MIN(), MAX() on a date
 
-def ogr_sql_sqlite_27():
+def test_ogr_sql_sqlite_27():
 
     if not ogrtest.has_sqlite_dialect:
         return 'skip'
@@ -1945,7 +1945,7 @@ def ogr_sql_sqlite_27():
 # Test hstore_get_value()
 
 
-def ogr_sql_sqlite_28():
+def test_ogr_sql_sqlite_28():
 
     if not ogrtest.has_sqlite_dialect:
         return 'skip'
@@ -1994,7 +1994,7 @@ def ogr_sql_sqlite_28():
 # Test compat with curve geometries
 
 
-def ogr_sql_sqlite_29():
+def test_ogr_sql_sqlite_29():
 
     if not ogrtest.has_sqlite_dialect:
         return 'skip'
@@ -2028,7 +2028,7 @@ def ogr_sql_sqlite_29():
 # Test compat with M geometries
 
 
-def ogr_sql_sqlite_30():
+def test_ogr_sql_sqlite_30():
 
     if not ogrtest.has_sqlite_dialect:
         return 'skip'
@@ -2082,7 +2082,7 @@ def ogr_sql_sqlite_30():
 # Test filtering complex field name
 
 
-def ogr_sql_sqlite_31():
+def test_ogr_sql_sqlite_31():
 
     if not ogrtest.has_sqlite_dialect:
         return 'skip'
@@ -2108,39 +2108,39 @@ def ogr_sql_sqlite_31():
 
 
 gdaltest_list = [
-    ogr_sql_sqlite_1,
-    ogr_sql_sqlite_2,
-    ogr_sql_sqlite_3,
-    ogr_sql_sqlite_4,
-    ogr_sql_sqlite_5,
-    ogr_sql_sqlite_6,
-    ogr_sql_sqlite_7,
-    ogr_sql_sqlite_8,
-    ogr_sql_sqlite_9,
-    ogr_sql_sqlite_10,
-    ogr_sql_sqlite_11,
-    ogr_sql_sqlite_12,
-    ogr_sql_sqlite_13,
-    ogr_sql_sqlite_14,
-    ogr_sql_sqlite_15,
-    ogr_sql_sqlite_start_webserver,
-    ogr_sql_sqlite_16,
-    ogr_sql_sqlite_17,
-    ogr_sql_sqlite_18,
-    ogr_sql_sqlite_19,
-    ogr_sql_sqlite_20,
-    ogr_sql_sqlite_21,
-    ogr_sql_sqlite_22,
-    ogr_sql_sqlite_23,
-    ogr_sql_sqlite_stop_webserver,
-    ogr_sql_sqlite_24,
-    ogr_sql_sqlite_25,
-    ogr_sql_sqlite_26,
-    ogr_sql_sqlite_27,
-    ogr_sql_sqlite_28,
-    ogr_sql_sqlite_29,
-    ogr_sql_sqlite_30,
-    ogr_sql_sqlite_31
+    test_ogr_sql_sqlite_1,
+    test_ogr_sql_sqlite_2,
+    test_ogr_sql_sqlite_3,
+    test_ogr_sql_sqlite_4,
+    test_ogr_sql_sqlite_5,
+    test_ogr_sql_sqlite_6,
+    test_ogr_sql_sqlite_7,
+    test_ogr_sql_sqlite_8,
+    test_ogr_sql_sqlite_9,
+    test_ogr_sql_sqlite_10,
+    test_ogr_sql_sqlite_11,
+    test_ogr_sql_sqlite_12,
+    test_ogr_sql_sqlite_13,
+    test_ogr_sql_sqlite_14,
+    test_ogr_sql_sqlite_15,
+    test_ogr_sql_sqlite_start_webserver,
+    test_ogr_sql_sqlite_16,
+    test_ogr_sql_sqlite_17,
+    test_ogr_sql_sqlite_18,
+    test_ogr_sql_sqlite_19,
+    test_ogr_sql_sqlite_20,
+    test_ogr_sql_sqlite_21,
+    test_ogr_sql_sqlite_22,
+    test_ogr_sql_sqlite_23,
+    test_ogr_sql_sqlite_stop_webserver,
+    test_ogr_sql_sqlite_24,
+    test_ogr_sql_sqlite_25,
+    test_ogr_sql_sqlite_26,
+    test_ogr_sql_sqlite_27,
+    test_ogr_sql_sqlite_28,
+    test_ogr_sql_sqlite_29,
+    test_ogr_sql_sqlite_30,
+    test_ogr_sql_sqlite_31
 ]
 
 if __name__ == '__main__':
diff --git a/autotest/ogr/ogr_sql_test.py b/autotest/ogr/ogr_sql_test.py
index ae8b16074745..7150c14f445e 100755
--- a/autotest/ogr/ogr_sql_test.py
+++ b/autotest/ogr/ogr_sql_test.py
@@ -39,7 +39,7 @@
 # Test a simple query with a where clause.
 
 
-def ogr_sql_1():
+def test_ogr_sql_1():
     gdaltest.ds = ogr.Open('data')
     gdaltest.lyr = gdaltest.ds.GetLayerByName('poly')
 
@@ -62,7 +62,7 @@ def ogr_sql_1():
 # Test DISTINCT handling
 
 
-def ogr_sql_2():
+def test_ogr_sql_2():
 
     expect = [168, 169, 166, 158, 165]
 
@@ -78,7 +78,7 @@ def ogr_sql_2():
 # Test ORDER BY handling
 
 
-def ogr_sql_3():
+def test_ogr_sql_3():
 
     expect = [158, 165, 166, 168, 169]
 
@@ -94,7 +94,7 @@ def ogr_sql_3():
 # Test ORDER BY DESC handling
 
 
-def ogr_sql_3_desc():
+def test_ogr_sql_3_desc():
 
     expect = [169, 168, 166, 165, 158]
 
@@ -110,7 +110,7 @@ def ogr_sql_3_desc():
 # Test DISTINCT and ORDER BY on strings.
 
 
-def ogr_sql_4():
+def test_ogr_sql_4():
 
     expect = ['_158_', '_165_', '_166_', '_168_', '_170_', '_171_', '_179_']
 
@@ -126,7 +126,7 @@ def ogr_sql_4():
 # Test column functions.
 
 
-def ogr_sql_5():
+def test_ogr_sql_5():
 
     sql_lyr = gdaltest.ds.ExecuteSQL('select max(eas_id), min(eas_id), avg(eas_id), sum(eas_id), count(eas_id) from idlink')
     feat = sql_lyr.GetNextFeature()
@@ -158,7 +158,7 @@ def ogr_sql_5():
 # Test simple COUNT() function.
 
 
-def ogr_sql_6():
+def test_ogr_sql_6():
 
     expect = [10]
 
@@ -174,7 +174,7 @@ def ogr_sql_6():
 # Verify that selecting the FID works properly.
 
 
-def ogr_sql_7():
+def test_ogr_sql_7():
 
     expect = [7, 8]
 
@@ -190,7 +190,7 @@ def ogr_sql_7():
 # Verify that wildcard expansion works properly.
 
 
-def ogr_sql_8():
+def test_ogr_sql_8():
 
     expect = ['35043369', '35043408']
 
@@ -206,7 +206,7 @@ def ogr_sql_8():
 # Verify that quoted table names work.
 
 
-def ogr_sql_9():
+def test_ogr_sql_9():
 
     expect = ['35043369', '35043408']
 
@@ -222,7 +222,7 @@ def ogr_sql_9():
 # Test the ILIKE operator.
 
 
-def ogr_sql_10():
+def test_ogr_sql_10():
 
     expect = [170]
 
@@ -238,7 +238,7 @@ def ogr_sql_10():
 # Test MAX() on empty dataset.
 
 
-def ogr_sql_11():
+def test_ogr_sql_11():
 
     expect = [None]
 
@@ -254,7 +254,7 @@ def ogr_sql_11():
 # Test DISTINCT on empty dataset.
 
 
-def ogr_sql_12():
+def test_ogr_sql_12():
 
     expect = []
 
@@ -270,7 +270,7 @@ def ogr_sql_12():
 # Verify selection of, and on ogr_geometry.
 
 
-def ogr_sql_13():
+def test_ogr_sql_13():
 
     expect = ['POLYGON', 'POLYGON', 'POLYGON', 'POLYGON', 'POLYGON',
               'POLYGON', 'POLYGON', 'POLYGON', 'POLYGON', 'POLYGON']
@@ -287,7 +287,7 @@ def ogr_sql_13():
 # Verify selection of, and on ogr_style and ogr_geom_wkt.
 
 
-def ogr_sql_14():
+def test_ogr_sql_14():
 
     expect = [
         'BRUSH(fc:#000000,bc:#ffffff,id:"mapinfo-brush-1,ogr-brush-1");PEN(w:1px,c:#000000,id:"mapinfo-pen-2,ogr-pen-0")',
@@ -307,7 +307,7 @@ def ogr_sql_14():
 # Verify that selecting with filtering by FID works properly.
 
 
-def ogr_sql_15():
+def test_ogr_sql_15():
 
     expect = [7]
 
@@ -322,7 +322,7 @@ def ogr_sql_15():
 ###############################################################################
 
 
-def ogr_sql_16():
+def test_ogr_sql_16():
 
     expect = [2]
 
@@ -340,7 +340,7 @@ def ogr_sql_16():
 ###############################################################################
 # Test the RFC 21 CAST operator.
 #
-def ogr_sql_17():
+def test_ogr_sql_17():
 
     expect = ['1', '2']
 
@@ -392,7 +392,7 @@ def ogr_sql_17():
 ###############################################################################
 # Test extended character set
 
-def ogr_sql_18():
+def test_ogr_sql_18():
 
     if sys.version_info >= (3, 0, 0):
         return 'skip'
@@ -435,7 +435,7 @@ def ogr_sql_18():
 # Test empty request string
 
 
-def ogr_sql_19():
+def test_ogr_sql_19():
 
     gdal.PushErrorHandler('CPLQuietErrorHandler')
     sql_lyr = gdaltest.ds.ExecuteSQL('')
@@ -450,7 +450,7 @@ def ogr_sql_19():
 # Test query "SELECT * from my_layer" on layer without any field (#2788)
 
 
-def ogr_sql_20():
+def test_ogr_sql_20():
 
     mem_ds = ogr.GetDriverByName("Memory").CreateDataSource("my_ds")
     mem_lyr = mem_ds.CreateLayer("my_layer")
@@ -475,7 +475,7 @@ def ogr_sql_20():
 # Test query "SELECT *, fid from my_layer" on layer without any field (#2788)
 
 
-def ogr_sql_21():
+def test_ogr_sql_21():
 
     mem_ds = ogr.GetDriverByName("Memory").CreateDataSource("my_ds")
     mem_ds.CreateLayer("my_layer")
@@ -494,7 +494,7 @@ def ogr_sql_21():
 # Test multiple expansion of '*' as in "SELECT *, fid, *, my_layer.* from my_layer" (#2788)
 
 
-def ogr_sql_22():
+def test_ogr_sql_22():
 
     mem_ds = ogr.GetDriverByName("Memory").CreateDataSource("my_ds")
     mem_lyr = mem_ds.CreateLayer("my_layer")
@@ -524,7 +524,7 @@ def ogr_sql_22():
 # Test query "SELECT DISTINCT test from my_layer" (#2788)
 
 
-def ogr_sql_23():
+def test_ogr_sql_23():
 
     mem_ds = ogr.GetDriverByName("Memory").CreateDataSource("my_ds")
     mem_lyr = mem_ds.CreateLayer("my_layer")
@@ -552,7 +552,7 @@ def ogr_sql_23():
 # Test that style strings get carried with OGR SQL SELECT results. (#2808)
 
 
-def ogr_sql_24():
+def test_ogr_sql_24():
 
     result = 'success'
 
@@ -575,7 +575,7 @@ def ogr_sql_24():
 # Test for OGR_GEOM_AREA special field (#2949)
 
 
-def ogr_sql_25():
+def test_ogr_sql_25():
 
     mem_ds = ogr.GetDriverByName("Memory").CreateDataSource("my_ds")
     mem_lyr = mem_ds.CreateLayer("my_layer")
@@ -610,7 +610,7 @@ def ogr_sql_25():
 #
 
 
-def ogr_sql_26():
+def test_ogr_sql_26():
 
     mem_ds = ogr.GetDriverByName("Memory").CreateDataSource("my_ds")
     mem_lyr = mem_ds.CreateLayer("my_layer")
@@ -639,7 +639,7 @@ def ogr_sql_26():
 #
 
 
-def ogr_sql_27():
+def test_ogr_sql_27():
 
     ds = ogr.Open('data/testdatetime.csv')
 
@@ -662,7 +662,7 @@ def ogr_sql_27():
 # With RFC 28 new implementation, most of them are directly caught by the generated
 # code from the grammar
 
-def ogr_sql_28():
+def test_ogr_sql_28():
 
     ds = ogr.GetDriverByName("Memory").CreateDataSource("my_ds")
     lyr = ds.CreateLayer("my_layer")
@@ -837,7 +837,7 @@ def ogr_sql_28():
 # Verify that IS NULL and IS NOT NULL are working
 
 
-def ogr_sql_29():
+def test_ogr_sql_29():
 
     ds = ogr.GetDriverByName("Memory").CreateDataSource("my_ds")
     lyr = ds.CreateLayer("my_layer")
@@ -881,7 +881,7 @@ def ogr_sql_29():
 # Verify a select mixing a count(*) with something else works without errors
 
 
-def ogr_sql_30():
+def test_ogr_sql_30():
 
     gdal.ErrorReset()
 
@@ -901,7 +901,7 @@ def ogr_sql_30():
 # Regression test for #4022
 
 
-def ogr_sql_31():
+def test_ogr_sql_31():
 
     gdal.ErrorReset()
 
@@ -921,7 +921,7 @@ def ogr_sql_31():
 # Regression test for #4022 (same as above, but with dialect = 'OGRSQL')
 
 
-def ogr_sql_32():
+def test_ogr_sql_32():
 
     gdal.ErrorReset()
 
@@ -942,7 +942,7 @@ def ogr_sql_32():
 # Check ALTER TABLE commands
 
 
-def ogr_sql_33():
+def test_ogr_sql_33():
 
     ds = ogr.GetDriverByName("Memory").CreateDataSource("my_ds")
     lyr = ds.CreateLayer("my_layer")
@@ -991,7 +991,7 @@ def ogr_sql_33():
 # Test implicit conversion from string to numeric (#4259)
 
 
-def ogr_sql_34():
+def test_ogr_sql_34():
 
     sql_lyr = gdaltest.ds.ExecuteSQL("select count(*) from poly where eas_id in ('165')")
 
@@ -1016,7 +1016,7 @@ def ogr_sql_34():
 # Test huge SQL queries (#4262)
 
 
-def ogr_sql_35():
+def test_ogr_sql_35():
 
     cols = "area"
     for _ in range(10):
@@ -1033,7 +1033,7 @@ def ogr_sql_35():
 # Test select distinct on null values (#4353)
 
 
-def ogr_sql_36():
+def test_ogr_sql_36():
 
     ds = ogr.GetDriverByName('Memory').CreateDataSource('ogr_sql_36')
     lyr = ds.CreateLayer('layer')
@@ -1089,7 +1089,7 @@ def ogr_sql_36():
 # Test select count([distinct] column) with null values (#4354)
 
 
-def ogr_sql_37():
+def test_ogr_sql_37():
 
     ds = ogr.GetDriverByName('Memory').CreateDataSource('ogr_sql_37')
     lyr = ds.CreateLayer('layer')
@@ -1183,7 +1183,7 @@ def ogr_sql_37():
 # Test "SELECT MAX(OGR_GEOM_AREA) FROM XXXX" (#4633)
 
 
-def ogr_sql_38():
+def test_ogr_sql_38():
 
     sql_lyr = gdaltest.ds.ExecuteSQL("SELECT MAX(OGR_GEOM_AREA) FROM poly")
 
@@ -1201,7 +1201,7 @@ def ogr_sql_38():
 # Test ORDER BY on a float special field
 
 
-def ogr_sql_39():
+def test_ogr_sql_39():
 
     sql_lyr = gdaltest.ds.ExecuteSQL("SELECT * FROM poly ORDER BY OGR_GEOM_AREA")
 
@@ -1219,7 +1219,7 @@ def ogr_sql_39():
 # Test ORDER BY on a int special field
 
 
-def ogr_sql_40():
+def test_ogr_sql_40():
 
     sql_lyr = gdaltest.ds.ExecuteSQL("SELECT * FROM poly ORDER BY FID DESC")
 
@@ -1233,7 +1233,7 @@ def ogr_sql_40():
 # Test ORDER BY on a string special field
 
 
-def ogr_sql_41():
+def test_ogr_sql_41():
 
     sql_lyr = gdaltest.ds.ExecuteSQL("SELECT * FROM poly ORDER BY OGR_GEOMETRY")
 
@@ -1247,7 +1247,7 @@ def ogr_sql_41():
 # Test comparing to empty string
 
 
-def ogr_sql_42():
+def test_ogr_sql_42():
 
     lyr = gdaltest.ds.GetLayerByName('poly')
     lyr.SetAttributeFilter("prfedea <> ''")
@@ -1270,7 +1270,7 @@ def ogr_sql_42():
 # Test escape sequences
 
 
-def ogr_sql_43():
+def test_ogr_sql_43():
 
     ret = 'success'
     sql = "SELECT '\"' as a, '\\\'' as b, '\'\'' as c FROM poly"
@@ -1288,7 +1288,7 @@ def ogr_sql_43():
 # Test hstore_get_value()
 
 
-def ogr_sql_44():
+def test_ogr_sql_44():
 
     # Invalid parameters
     for sql in ["SELECT hstore_get_value('a') FROM poly",
@@ -1350,7 +1350,7 @@ def ogr_sql_44():
 # Test 64 bit GetFeatureCount()
 
 
-def ogr_sql_45():
+def test_ogr_sql_45():
 
     ds = ogr.Open("""<OGRVRTDataSource>
   <OGRVRTLayer name="poly">
@@ -1394,7 +1394,7 @@ def ogr_sql_45():
 # Test strict SQL quoting
 
 
-def ogr_sql_46():
+def test_ogr_sql_46():
 
     ds = ogr.GetDriverByName('Memory').CreateDataSource('test')
     lyr = ds.CreateLayer('test')
@@ -1468,7 +1468,7 @@ def ogr_sql_46():
 # Test NULL sorting (#6155)
 
 
-def ogr_sql_47():
+def test_ogr_sql_47():
 
     ds = ogr.Open('data/sort_test.dbf')
     sql_lyr = ds.ExecuteSQL('SELECT * FROM sort_test ORDER BY text_value')
@@ -1491,7 +1491,7 @@ def ogr_sql_47():
 # Test sorting of more than 100 elements
 
 
-def ogr_sql_48():
+def test_ogr_sql_48():
 
     ds = ogr.GetDriverByName('Memory').CreateDataSource('')
     lyr = ds.CreateLayer('test', geom_type=ogr.wkbNone)
@@ -1519,7 +1519,7 @@ def ogr_sql_48():
     return 'success'
 
 
-def ogr_sql_cleanup():
+def test_ogr_sql_cleanup():
     gdaltest.lyr = None
     gdaltest.ds = None
 
@@ -1527,56 +1527,56 @@ def ogr_sql_cleanup():
 
 
 gdaltest_list = [
-    ogr_sql_1,
-    ogr_sql_2,
-    ogr_sql_3,
-    ogr_sql_3_desc,
-    ogr_sql_4,
-    ogr_sql_5,
-    ogr_sql_6,
-    ogr_sql_7,
-    ogr_sql_8,
-    ogr_sql_9,
-    ogr_sql_10,
-    ogr_sql_11,
-    ogr_sql_12,
-    ogr_sql_13,
-    ogr_sql_14,
-    ogr_sql_15,
-    ogr_sql_16,
-    ogr_sql_17,
-    ogr_sql_18,
-    ogr_sql_19,
-    ogr_sql_20,
-    ogr_sql_21,
-    ogr_sql_22,
-    ogr_sql_23,
-    ogr_sql_24,
-    ogr_sql_25,
-    ogr_sql_26,
-    ogr_sql_27,
-    ogr_sql_28,
-    ogr_sql_29,
-    ogr_sql_30,
-    ogr_sql_31,
-    ogr_sql_32,
-    ogr_sql_33,
-    ogr_sql_34,
-    ogr_sql_35,
-    ogr_sql_36,
-    ogr_sql_37,
-    ogr_sql_38,
-    ogr_sql_39,
-    ogr_sql_40,
-    ogr_sql_41,
-    ogr_sql_42,
-    ogr_sql_43,
-    ogr_sql_44,
-    ogr_sql_45,
-    ogr_sql_46,
-    ogr_sql_47,
-    ogr_sql_48,
-    ogr_sql_cleanup]
+    test_ogr_sql_1,
+    test_ogr_sql_2,
+    test_ogr_sql_3,
+    test_ogr_sql_3_desc,
+    test_ogr_sql_4,
+    test_ogr_sql_5,
+    test_ogr_sql_6,
+    test_ogr_sql_7,
+    test_ogr_sql_8,
+    test_ogr_sql_9,
+    test_ogr_sql_10,
+    test_ogr_sql_11,
+    test_ogr_sql_12,
+    test_ogr_sql_13,
+    test_ogr_sql_14,
+    test_ogr_sql_15,
+    test_ogr_sql_16,
+    test_ogr_sql_17,
+    test_ogr_sql_18,
+    test_ogr_sql_19,
+    test_ogr_sql_20,
+    test_ogr_sql_21,
+    test_ogr_sql_22,
+    test_ogr_sql_23,
+    test_ogr_sql_24,
+    test_ogr_sql_25,
+    test_ogr_sql_26,
+    test_ogr_sql_27,
+    test_ogr_sql_28,
+    test_ogr_sql_29,
+    test_ogr_sql_30,
+    test_ogr_sql_31,
+    test_ogr_sql_32,
+    test_ogr_sql_33,
+    test_ogr_sql_34,
+    test_ogr_sql_35,
+    test_ogr_sql_36,
+    test_ogr_sql_37,
+    test_ogr_sql_38,
+    test_ogr_sql_39,
+    test_ogr_sql_40,
+    test_ogr_sql_41,
+    test_ogr_sql_42,
+    test_ogr_sql_43,
+    test_ogr_sql_44,
+    test_ogr_sql_45,
+    test_ogr_sql_46,
+    test_ogr_sql_47,
+    test_ogr_sql_48,
+    test_ogr_sql_cleanup]
 
 if __name__ == '__main__':
 
diff --git a/autotest/ogr/ogr_sqlite.py b/autotest/ogr/ogr_sqlite.py
index d2c32cfd3993..54d9f4d7ef42 100755
--- a/autotest/ogr/ogr_sqlite.py
+++ b/autotest/ogr/ogr_sqlite.py
@@ -52,7 +52,7 @@
 # Create a fresh database.
 
 
-def ogr_sqlite_1():
+def test_ogr_sqlite_1():
 
     gdaltest.sl_ds = None
     gdaltest.has_spatialite = False
@@ -81,7 +81,7 @@ def ogr_sqlite_1():
 # Create table from data/poly.shp
 
 
-def ogr_sqlite_2():
+def test_ogr_sqlite_2():
 
     if gdaltest.sl_ds is None:
         return 'skip'
@@ -198,7 +198,7 @@ def ogr_sqlite_2():
 # Verify that stuff we just wrote is still OK.
 
 
-def ogr_sqlite_3():
+def test_ogr_sqlite_3():
     if gdaltest.sl_ds is None:
         return 'skip'
 
@@ -249,7 +249,7 @@ def ogr_sqlite_3():
 # geometries are still OK.
 
 
-def ogr_sqlite_4():
+def test_ogr_sqlite_4():
 
     if gdaltest.sl_ds is None:
         return 'skip'
@@ -289,7 +289,7 @@ def ogr_sqlite_4():
 # Test ExecuteSQL() results layers without geometry.
 
 
-def ogr_sqlite_5():
+def test_ogr_sqlite_5():
 
     if gdaltest.sl_ds is None:
         return 'skip'
@@ -312,7 +312,7 @@ def ogr_sqlite_5():
 # Test ExecuteSQL() results layers with geometry.
 
 
-def ogr_sqlite_6():
+def test_ogr_sqlite_6():
 
     if gdaltest.sl_ds is None:
         return 'skip'
@@ -334,7 +334,7 @@ def ogr_sqlite_6():
 # Test spatial filtering.
 
 
-def ogr_sqlite_7():
+def test_ogr_sqlite_7():
 
     if gdaltest.sl_ds is None:
         return 'skip'
@@ -369,7 +369,7 @@ def ogr_sqlite_7():
 # Test transactions with rollback.
 
 
-def ogr_sqlite_8():
+def test_ogr_sqlite_8():
 
     if gdaltest.sl_ds is None:
         return 'skip'
@@ -427,7 +427,7 @@ def ogr_sqlite_8():
 # Test SetFeature()
 
 
-def ogr_sqlite_9():
+def test_ogr_sqlite_9():
 
     if gdaltest.sl_ds is None:
         return 'skip'
@@ -488,7 +488,7 @@ def ogr_sqlite_9():
 # Test GetFeature()
 
 
-def ogr_sqlite_10():
+def test_ogr_sqlite_10():
 
     if gdaltest.sl_ds is None:
         return 'skip'
@@ -525,7 +525,7 @@ def ogr_sqlite_10():
 # Test FORMAT=WKB creation option
 
 
-def ogr_sqlite_11():
+def test_ogr_sqlite_11():
 
     if gdaltest.sl_ds is None:
         return 'skip'
@@ -561,7 +561,7 @@ def ogr_sqlite_11():
 # Test FORMAT=WKT creation option
 
 
-def ogr_sqlite_12():
+def test_ogr_sqlite_12():
 
     if gdaltest.sl_ds is None:
         return 'skip'
@@ -612,7 +612,7 @@ def ogr_sqlite_12():
 # Test SRID support
 
 
-def ogr_sqlite_13():
+def test_ogr_sqlite_13():
 
     if gdaltest.sl_ds is None:
         return 'skip'
@@ -652,7 +652,7 @@ def ogr_sqlite_13():
 ###############################################################################
 # Test all column types
 
-def ogr_sqlite_14():
+def test_ogr_sqlite_14():
 
     if gdaltest.sl_ds is None:
         return 'skip'
@@ -704,7 +704,7 @@ def ogr_sqlite_14():
 # Test FORMAT=SPATIALITE layer creation option
 
 
-def ogr_sqlite_15():
+def test_ogr_sqlite_15():
 
     if gdaltest.sl_ds is None:
         return 'skip'
@@ -779,7 +779,7 @@ def ogr_sqlite_15():
 ###############################################################################
 # Test reading geometries in FGF (FDO Geometry Format) binary representation.
 
-def ogr_sqlite_16():
+def test_ogr_sqlite_16():
 
     if gdaltest.sl_ds is None:
         return 'skip'
@@ -867,7 +867,7 @@ def ogr_sqlite_16():
 # Test SPATIALITE dataset creation option
 
 
-def ogr_sqlite_17():
+def test_ogr_sqlite_17():
 
     if gdaltest.sl_ds is None:
         return 'skip'
@@ -923,7 +923,7 @@ def ogr_sqlite_17():
 # Create a layer with a non EPSG SRS into a SPATIALITE DB (#3506)
 
 
-def ogr_sqlite_18():
+def test_ogr_sqlite_18():
 
     if gdaltest.sl_ds is None:
         return 'skip'
@@ -964,7 +964,7 @@ def ogr_sqlite_18():
 # Create a SpatiaLite DB with INIT_WITH_EPSG=YES
 
 
-def ogr_sqlite_19():
+def test_ogr_sqlite_19():
 
     if gdaltest.sl_ds is None:
         return 'skip'
@@ -1005,7 +1005,7 @@ def ogr_sqlite_19():
 # Create a SpatiaLite DB with INIT_WITH_EPSG=NO
 
 
-def ogr_sqlite_19_bis():
+def test_ogr_sqlite_19_bis():
 
     if gdaltest.sl_ds is None:
         return 'skip'
@@ -1044,7 +1044,7 @@ def ogr_sqlite_19_bis():
 # Create a regular DB with INIT_WITH_EPSG=YES
 
 
-def ogr_sqlite_20():
+def test_ogr_sqlite_20():
 
     if gdaltest.sl_ds is None:
         return 'skip'
@@ -1078,7 +1078,7 @@ def ogr_sqlite_20():
 # Test CopyLayer() from a table layer (#3617)
 
 
-def ogr_sqlite_21():
+def test_ogr_sqlite_21():
 
     if gdaltest.sl_ds is None:
         return 'skip'
@@ -1100,7 +1100,7 @@ def ogr_sqlite_21():
 # Test CopyLayer() from a result layer (#3617)
 
 
-def ogr_sqlite_22():
+def test_ogr_sqlite_22():
 
     if gdaltest.sl_ds is None:
         return 'skip'
@@ -1124,7 +1124,7 @@ def ogr_sqlite_22():
 # Test ignored fields works ok
 
 
-def ogr_sqlite_23():
+def test_ogr_sqlite_23():
 
     if gdaltest.sl_ds is None:
         return 'skip'
@@ -1192,7 +1192,7 @@ def ogr_sqlite_23():
 # Test that ExecuteSQL() with OGRSQL dialect doesn't forward the where clause to sqlite (#4022)
 
 
-def ogr_sqlite_24():
+def test_ogr_sqlite_24():
 
     if gdaltest.sl_ds is None:
         return 'skip'
@@ -1264,7 +1264,7 @@ def ogr_sqlite_24():
 # Test opening a /vsicurl/ DB
 
 
-def ogr_sqlite_25():
+def test_ogr_sqlite_25():
 
     if gdaltest.sl_ds is None:
         return 'skip'
@@ -1314,7 +1314,7 @@ def ogr_sqlite_25():
 # Test creating a :memory: DB
 
 
-def ogr_sqlite_26():
+def test_ogr_sqlite_26():
 
     if gdaltest.sl_ds is None:
         return 'skip'
@@ -1339,7 +1339,7 @@ def ogr_sqlite_26():
 # Run test_ogrsf
 
 
-def ogr_sqlite_27():
+def test_ogr_sqlite_27():
 
     if gdaltest.sl_ds is None:
         return 'skip'
@@ -1390,7 +1390,7 @@ def ogr_sqlite_27():
 # Run test_ogrsf on a spatialite enabled DB
 
 
-def ogr_sqlite_28():
+def test_ogr_sqlite_28():
 
     if gdaltest.sl_ds is None:
         return 'skip'
@@ -1440,7 +1440,7 @@ def ogr_sqlite_28():
 # Test CreateFeature() with empty feature
 
 
-def ogr_sqlite_29():
+def test_ogr_sqlite_29():
 
     if gdaltest.sl_ds is None:
         return 'skip'
@@ -1464,7 +1464,7 @@ def ogr_sqlite_29():
 # Test ExecuteSQL() with empty result set (#4684)
 
 
-def ogr_sqlite_30():
+def test_ogr_sqlite_30():
 
     if gdaltest.sl_ds is None:
         return 'skip'
@@ -1486,7 +1486,7 @@ def ogr_sqlite_30():
 # Test if SpatiaLite is available
 
 
-def ogr_spatialite_1():
+def test_ogr_spatialite_1():
 
     if gdaltest.sl_ds is None:
         return 'skip'
@@ -1510,7 +1510,7 @@ def ogr_spatialite_1():
 # Test spatial filter when SpatiaLite is available
 
 
-def ogr_spatialite_2():
+def test_ogr_spatialite_2():
 
     if not gdaltest.has_spatialite:
         return 'skip'
@@ -1719,7 +1719,7 @@ def ogr_spatialite_2():
 # Test VirtualShape feature of SpatiaLite
 
 
-def ogr_spatialite_3():
+def test_ogr_spatialite_3():
 
     if not gdaltest.has_spatialite:
         return 'skip'
@@ -1746,7 +1746,7 @@ def ogr_spatialite_3():
 # Test updating a spatialite DB (#3471 and #3474)
 
 
-def ogr_spatialite_4():
+def test_ogr_spatialite_4():
 
     if not gdaltest.has_spatialite:
         return 'skip'
@@ -1804,7 +1804,7 @@ def ogr_spatialite_4():
 # Test writing and reading back spatialite geometries (#4092)
 
 
-def ogr_spatialite_5(bUseComprGeom=False):
+def test_ogr_spatialite_5(bUseComprGeom=False):
 
     if not gdaltest.has_spatialite:
         return 'skip'
@@ -1942,7 +1942,7 @@ def ogr_spatialite_5(bUseComprGeom=False):
 ###############################################################################
 # Test writing and reading back spatialite geometries in compressed form
 
-def ogr_spatialite_compressed_geom_5():
+def test_ogr_spatialite_compressed_geom_5():
 
     if not gdaltest.has_spatialite:
         return 'skip'
@@ -1950,13 +1950,13 @@ def ogr_spatialite_compressed_geom_5():
     if gdaltest.spatialite_version == '2.3.1':
         return 'skip'
 
-    return ogr_spatialite_5(bUseComprGeom=True)
+    return test_ogr_spatialite_5(bUseComprGeom=True)
 
 ###############################################################################
 # Test spatialite spatial views
 
 
-def ogr_spatialite_6():
+def test_ogr_spatialite_6():
 
     if not gdaltest.has_spatialite:
         return 'skip'
@@ -2103,7 +2103,7 @@ def ogr_spatialite_6():
 # Test VirtualShape:xxx.shp
 
 
-def ogr_spatialite_7():
+def test_ogr_spatialite_7():
 
     if not gdaltest.has_spatialite:
         return 'skip'
@@ -2133,7 +2133,7 @@ def ogr_spatialite_7():
 # Test tables with multiple geometry columns (#4768)
 
 
-def ogr_spatialite_8():
+def test_ogr_spatialite_8():
 
     if not gdaltest.has_spatialite:
         return 'skip'
@@ -2339,7 +2339,7 @@ def ogr_spatialite_8():
 # Test tables with multiple geometry columns (#4768)
 
 
-def ogr_sqlite_31():
+def test_ogr_sqlite_31():
 
     if gdaltest.sl_ds is None:
         return 'skip'
@@ -2421,7 +2421,7 @@ def ogr_sqlite_31():
 # Test datetime support
 
 
-def ogr_sqlite_32():
+def test_ogr_sqlite_32():
 
     if gdaltest.sl_ds is None:
         return 'skip'
@@ -2478,7 +2478,7 @@ def ogr_sqlite_32():
 # Test SRID layer creation option
 
 
-def ogr_sqlite_33():
+def test_ogr_sqlite_33():
 
     if gdaltest.sl_ds is None:
         return 'skip'
@@ -2554,7 +2554,7 @@ def ogr_sqlite_33():
 # Test REGEXP support (#4823)
 
 
-def ogr_sqlite_34():
+def test_ogr_sqlite_34():
 
     if gdaltest.sl_ds is None:
         return 'skip'
@@ -2631,7 +2631,7 @@ def ogr_sqlite_34():
 # Test SetAttributeFilter() on SQL result layer
 
 
-def ogr_sqlite_35():
+def test_ogr_sqlite_35():
 
     if gdaltest.sl_ds is None:
         return 'skip'
@@ -2728,7 +2728,7 @@ def ogr_sqlite_35():
 # Test FID64 support
 
 
-def ogr_sqlite_36():
+def test_ogr_sqlite_36():
 
     if gdaltest.sl_ds is None:
         return 'skip'
@@ -2767,7 +2767,7 @@ def ogr_sqlite_36():
 # Test not nullable fields
 
 
-def ogr_sqlite_37():
+def test_ogr_sqlite_37():
 
     if gdaltest.sl_ds is None:
         return 'skip'
@@ -2878,7 +2878,7 @@ def ogr_sqlite_37():
 # Test  default values
 
 
-def ogr_sqlite_38():
+def test_ogr_sqlite_38():
 
     if gdaltest.sl_ds is None:
         return 'skip'
@@ -3020,7 +3020,7 @@ def ogr_sqlite_38():
 # Test spatial filters with point extent
 
 
-def ogr_spatialite_9():
+def test_ogr_spatialite_9():
 
     if not gdaltest.has_spatialite:
         return 'skip'
@@ -3044,7 +3044,7 @@ def ogr_spatialite_9():
 # Test not nullable fields
 
 
-def ogr_spatialite_10():
+def test_ogr_spatialite_10():
 
     if not gdaltest.has_spatialite:
         return 'skip'
@@ -3094,7 +3094,7 @@ def ogr_spatialite_10():
 ###############################################################################
 # Test creating a field with the fid name
 
-def ogr_sqlite_39():
+def test_ogr_sqlite_39():
 
     if gdaltest.sl_ds is None:
         return 'skip'
@@ -3192,7 +3192,7 @@ def ogr_sqlite_39():
 # Test dataset transactions
 
 
-def ogr_sqlite_40():
+def test_ogr_sqlite_40():
 
     if gdaltest.sl_ds is None:
         return 'skip'
@@ -3354,7 +3354,7 @@ def ogr_sqlite_40():
 # Test reading dates from Julian day floating point representation
 
 
-def ogr_sqlite_41():
+def test_ogr_sqlite_41():
 
     if gdaltest.sl_ds is None:
         return 'skip'
@@ -3380,7 +3380,7 @@ def ogr_sqlite_41():
 # Test ExecuteSQL() heuristics (#6107)
 
 
-def ogr_sqlite_42():
+def test_ogr_sqlite_42():
 
     if gdaltest.sl_ds is None:
         return 'skip'
@@ -3443,7 +3443,7 @@ def ogr_sqlite_42():
 # Test file:foo?mode=memory&cache=shared (#6150)
 
 
-def ogr_sqlite_43():
+def test_ogr_sqlite_43():
 
     if gdaltest.sl_ds is None:
         return 'skip'
@@ -3463,7 +3463,7 @@ def ogr_sqlite_43():
 # Test reading/writing StringList, etc..
 
 
-def ogr_sqlite_44():
+def test_ogr_sqlite_44():
 
     if gdaltest.sl_ds is None:
         return 'skip'
@@ -3510,7 +3510,7 @@ def ogr_sqlite_44():
 # Test WAL and opening in read-only (#6776)
 
 
-def ogr_sqlite_45():
+def test_ogr_sqlite_45():
 
     if gdaltest.sl_ds is None:
         return 'skip'
@@ -3551,7 +3551,7 @@ def ogr_sqlite_45():
 ###############################################################################
 # Test creating unsupported geometry types
 
-def ogr_spatialite_11():
+def test_ogr_spatialite_11():
 
     if not gdaltest.has_spatialite:
         return 'skip'
@@ -3581,7 +3581,7 @@ def ogr_spatialite_11():
 # Test opening a .sql file
 
 
-def ogr_spatialite_12():
+def test_ogr_spatialite_12():
 
     if not gdaltest.has_spatialite:
         return 'skip'
@@ -3601,7 +3601,7 @@ def ogr_spatialite_12():
 
 ###############################################################################
 
-def ogr_sqlite_iterate_and_update():
+def test_ogr_sqlite_iterate_and_update():
 
     if gdaltest.sl_ds is None:
         return 'skip'
@@ -3633,7 +3633,7 @@ def ogr_sqlite_iterate_and_update():
 #
 
 
-def ogr_sqlite_cleanup():
+def test_ogr_sqlite_cleanup():
 
     if gdaltest.sl_ds is None:
         return 'skip'
@@ -3746,7 +3746,7 @@ def ogr_sqlite_cleanup():
 # Ask to run again tests in a new python process without libspatialite loaded
 
 
-def ogr_sqlite_without_spatialite():
+def test_ogr_sqlite_without_spatialite():
 
     if not gdaltest.has_spatialite or not run_without_spatialite:
         return 'skip'
@@ -3761,74 +3761,74 @@ def ogr_sqlite_without_spatialite():
 
 
 gdaltest_list = [
-    ogr_sqlite_1,
-    ogr_sqlite_2,
-    ogr_sqlite_3,
-    ogr_sqlite_4,
-    ogr_sqlite_5,
-    ogr_sqlite_6,
-    ogr_sqlite_7,
-    ogr_sqlite_8,
-    ogr_sqlite_9,
-    ogr_sqlite_10,
-    ogr_sqlite_11,
-    ogr_sqlite_12,
-    ogr_sqlite_13,
-    ogr_sqlite_14,
-    ogr_sqlite_15,
-    ogr_sqlite_16,
-    ogr_sqlite_20,
-    ogr_sqlite_21,
-    ogr_sqlite_22,
-    ogr_sqlite_23,
-    ogr_sqlite_24,
-    ogr_sqlite_25,
-    ogr_sqlite_26,
-    ogr_sqlite_27,
-    ogr_sqlite_28,
-    ogr_sqlite_29,
-    ogr_sqlite_30,
-    ogr_spatialite_1,
-    ogr_sqlite_17,
-    ogr_sqlite_18,
-    ogr_sqlite_19,
-    ogr_sqlite_19_bis,
-    ogr_spatialite_2,
-    ogr_spatialite_3,
-    ogr_spatialite_4,
-    ogr_spatialite_5,
-    ogr_spatialite_compressed_geom_5,
-    ogr_spatialite_6,
-    ogr_spatialite_7,
-    ogr_spatialite_8,
-    ogr_sqlite_31,
-    ogr_sqlite_32,
-    ogr_sqlite_33,
-    ogr_sqlite_34,
-    ogr_sqlite_35,
-    ogr_sqlite_36,
-    ogr_sqlite_37,
-    ogr_sqlite_38,
-    ogr_spatialite_9,
-    ogr_spatialite_10,
-    ogr_sqlite_39,
-    ogr_sqlite_40,
-    ogr_sqlite_41,
-    ogr_sqlite_42,
-    ogr_sqlite_43,
-    ogr_sqlite_44,
-    ogr_sqlite_45,
-    ogr_sqlite_iterate_and_update,
-    ogr_spatialite_11,
-    ogr_spatialite_12,
-    ogr_sqlite_cleanup,
-    ogr_sqlite_without_spatialite,
+    test_ogr_sqlite_1,
+    test_ogr_sqlite_2,
+    test_ogr_sqlite_3,
+    test_ogr_sqlite_4,
+    test_ogr_sqlite_5,
+    test_ogr_sqlite_6,
+    test_ogr_sqlite_7,
+    test_ogr_sqlite_8,
+    test_ogr_sqlite_9,
+    test_ogr_sqlite_10,
+    test_ogr_sqlite_11,
+    test_ogr_sqlite_12,
+    test_ogr_sqlite_13,
+    test_ogr_sqlite_14,
+    test_ogr_sqlite_15,
+    test_ogr_sqlite_16,
+    test_ogr_sqlite_20,
+    test_ogr_sqlite_21,
+    test_ogr_sqlite_22,
+    test_ogr_sqlite_23,
+    test_ogr_sqlite_24,
+    test_ogr_sqlite_25,
+    test_ogr_sqlite_26,
+    test_ogr_sqlite_27,
+    test_ogr_sqlite_28,
+    test_ogr_sqlite_29,
+    test_ogr_sqlite_30,
+    test_ogr_spatialite_1,
+    test_ogr_sqlite_17,
+    test_ogr_sqlite_18,
+    test_ogr_sqlite_19,
+    test_ogr_sqlite_19_bis,
+    test_ogr_spatialite_2,
+    test_ogr_spatialite_3,
+    test_ogr_spatialite_4,
+    test_ogr_spatialite_5,
+    test_ogr_spatialite_compressed_geom_5,
+    test_ogr_spatialite_6,
+    test_ogr_spatialite_7,
+    test_ogr_spatialite_8,
+    test_ogr_sqlite_31,
+    test_ogr_sqlite_32,
+    test_ogr_sqlite_33,
+    test_ogr_sqlite_34,
+    test_ogr_sqlite_35,
+    test_ogr_sqlite_36,
+    test_ogr_sqlite_37,
+    test_ogr_sqlite_38,
+    test_ogr_spatialite_9,
+    test_ogr_spatialite_10,
+    test_ogr_sqlite_39,
+    test_ogr_sqlite_40,
+    test_ogr_sqlite_41,
+    test_ogr_sqlite_42,
+    test_ogr_sqlite_43,
+    test_ogr_sqlite_44,
+    test_ogr_sqlite_45,
+    test_ogr_sqlite_iterate_and_update,
+    test_ogr_spatialite_11,
+    test_ogr_spatialite_12,
+    test_ogr_sqlite_cleanup,
+    test_ogr_sqlite_without_spatialite,
 ]
 
 disabled_gdaltest_list = [
-    ogr_sqlite_1,
-    ogr_sqlite_45,
-    ogr_sqlite_cleanup,
+    test_ogr_sqlite_1,
+    test_ogr_sqlite_45,
+    test_ogr_sqlite_cleanup,
 ]
 
 if __name__ == '__main__':
diff --git a/autotest/ogr/ogr_style.py b/autotest/ogr/ogr_style.py
index ed8eb2a30681..2864c32186d3 100755
--- a/autotest/ogr/ogr_style.py
+++ b/autotest/ogr/ogr_style.py
@@ -41,7 +41,7 @@
 #
 
 
-def ogr_style_styletable():
+def test_ogr_style_styletable():
 
     style_table = ogr.StyleTable()
     style_table.AddStyle("style1_normal", 'SYMBOL(id:"http://style1_normal",c:#67452301)')
@@ -142,7 +142,7 @@ def ogr_style_styletable():
 
 
 gdaltest_list = [
-    ogr_style_styletable]
+    test_ogr_style_styletable]
 
 if __name__ == '__main__':
 
diff --git a/autotest/ogr/ogr_sua.py b/autotest/ogr/ogr_sua.py
index 659e38e3d541..c4c22c1c30c8 100755
--- a/autotest/ogr/ogr_sua.py
+++ b/autotest/ogr/ogr_sua.py
@@ -39,7 +39,7 @@
 # Basic test
 
 
-def ogr_sua_1():
+def test_ogr_sua_1():
 
     ds = ogr.Open('data/za.sua')
     if ds is None:
@@ -71,7 +71,7 @@ def ogr_sua_1():
 
 
 gdaltest_list = [
-    ogr_sua_1]
+    test_ogr_sua_1]
 
 
 if __name__ == '__main__':
diff --git a/autotest/ogr/ogr_svg.py b/autotest/ogr/ogr_svg.py
index c12ce59819e2..f7af20ff7a68 100755
--- a/autotest/ogr/ogr_svg.py
+++ b/autotest/ogr/ogr_svg.py
@@ -36,7 +36,7 @@
 from osgeo import ogr
 
 
-def ogr_svg_init():
+def test_ogr_svg_init():
     gdaltest.svg_ds = None
 
     gdaltest.svg_ds = ogr.Open('data/test.svg')
@@ -59,7 +59,7 @@ def ogr_svg_init():
 # Test
 
 
-def ogr_svg_1():
+def test_ogr_svg_1():
     if not gdaltest.have_svg:
         return 'skip'
 
@@ -112,16 +112,16 @@ def ogr_svg_1():
 #
 
 
-def ogr_svg_cleanup():
+def test_ogr_svg_cleanup():
 
     gdaltest.svg_ds = None
     return 'success'
 
 
 gdaltest_list = [
-    ogr_svg_init,
-    ogr_svg_1,
-    ogr_svg_cleanup]
+    test_ogr_svg_init,
+    test_ogr_svg_1,
+    test_ogr_svg_cleanup]
 
 if __name__ == '__main__':
 
diff --git a/autotest/ogr/ogr_sxf.py b/autotest/ogr/ogr_sxf.py
index 1cdb3199a6f0..65360e13410f 100755
--- a/autotest/ogr/ogr_sxf.py
+++ b/autotest/ogr/ogr_sxf.py
@@ -36,7 +36,7 @@
 # Open SXF datasource.
 
 
-def ogr_sxf_1():
+def test_ogr_sxf_1():
 
     gdaltest.sxf_ds = None
     with gdaltest.error_handler():
@@ -51,7 +51,7 @@ def ogr_sxf_1():
 ###############################################################################
 # Run test_ogrsf
 
-def ogr_sxf_2():
+def test_ogr_sxf_2():
 
     import test_cli_utilities
     if test_cli_utilities.get_test_ogrsf_path() is None:
@@ -69,7 +69,7 @@ def ogr_sxf_2():
 #
 
 
-def ogr_sxf_cleanup():
+def test_ogr_sxf_cleanup():
 
     if gdaltest.sxf_ds is None:
         return 'skip'
@@ -80,9 +80,9 @@ def ogr_sxf_cleanup():
 
 
 gdaltest_list = [
-    ogr_sxf_1,
-    ogr_sxf_2,
-    ogr_sxf_cleanup]
+    test_ogr_sxf_1,
+    test_ogr_sxf_2,
+    test_ogr_sxf_cleanup]
 
 if __name__ == '__main__':
 
diff --git a/autotest/ogr/ogr_tiger.py b/autotest/ogr/ogr_tiger.py
index 5540eb78f41a..1e2def835c06 100755
--- a/autotest/ogr/ogr_tiger.py
+++ b/autotest/ogr/ogr_tiger.py
@@ -41,7 +41,7 @@
 ###############################################################################
 
 
-def ogr_tiger_1():
+def test_ogr_tiger_1():
 
     ogrtest.tiger_ds = None
 
@@ -104,7 +104,7 @@ def ogr_tiger_1():
 # Run test_ogrsf
 
 
-def ogr_tiger_2():
+def test_ogr_tiger_2():
 
     if ogrtest.tiger_ds is None:
         return 'skip'
@@ -125,7 +125,7 @@ def ogr_tiger_2():
 # Test TIGER writing
 
 
-def ogr_tiger_3():
+def test_ogr_tiger_3():
 
     if ogrtest.tiger_ds is None:
         return 'skip'
@@ -175,7 +175,7 @@ def ogr_tiger_3():
 # Load into a /vsimem instance to test virtualization.
 
 
-def ogr_tiger_4():
+def test_ogr_tiger_4():
 
     if ogrtest.tiger_ds is None:
         return 'skip'
@@ -240,7 +240,7 @@ def ogr_tiger_4():
 ###############################################################################
 
 
-def ogr_tiger_cleanup():
+def test_ogr_tiger_cleanup():
 
     if ogrtest.tiger_ds is None:
         return 'skip'
@@ -250,11 +250,11 @@ def ogr_tiger_cleanup():
 
 
 gdaltest_list = [
-    ogr_tiger_1,
-    ogr_tiger_2,
-    ogr_tiger_3,
-    ogr_tiger_4,
-    ogr_tiger_cleanup]
+    test_ogr_tiger_1,
+    test_ogr_tiger_2,
+    test_ogr_tiger_3,
+    test_ogr_tiger_4,
+    test_ogr_tiger_cleanup]
 
 if __name__ == '__main__':
 
diff --git a/autotest/ogr/ogr_vdv.py b/autotest/ogr/ogr_vdv.py
index 593404b58454..471f66f0e61e 100755
--- a/autotest/ogr/ogr_vdv.py
+++ b/autotest/ogr/ogr_vdv.py
@@ -42,7 +42,7 @@
 # Basic test of .idf file
 
 
-def ogr_idf_1():
+def test_ogr_idf_1():
 
     ds = ogr.Open('data/test.idf')
     lyr = ds.GetLayer(0)
@@ -79,17 +79,17 @@ def ogr_idf_1():
 #
 
 
-def ogr_idf_1_with_temp_sqlite_db():
+def test_ogr_idf_1_with_temp_sqlite_db():
     if ogr.GetDriverByName('SQLite') is None:
         return 'skip'
     with gdaltest.config_option('OGR_IDF_TEMP_DB_THRESHOLD', '0'):
-        return ogr_idf_1()
+        return test_ogr_idf_1()
 
 ###############################################################################
 # Basic test of .idf file
 
 
-def ogr_idf_3d():
+def test_ogr_idf_3d():
 
     ds = ogr.Open('data/test_3d.idf')
     lyr = ds.GetLayer(0)
@@ -126,7 +126,7 @@ def ogr_idf_3d():
 # Run test_ogrsf on .idf
 
 
-def ogr_idf_2():
+def test_ogr_idf_2():
 
     import test_cli_utilities
     if test_cli_utilities.get_test_ogrsf_path() is None:
@@ -144,7 +144,7 @@ def ogr_idf_2():
 # Create a VDV file
 
 
-def ogr_vdv_1(filename='tmp/test.x10', dsco=None, lco=None):
+def test_ogr_vdv_1(filename='tmp/test.x10', dsco=None, lco=None):
 
     dsco = [] if dsco is None else dsco
     lco = [] if lco is None else lco
@@ -200,7 +200,7 @@ def ogr_vdv_1(filename='tmp/test.x10', dsco=None, lco=None):
 # Read it
 
 
-def ogr_vdv_2(src_filename='tmp/test.x10'):
+def test_ogr_vdv_2(src_filename='tmp/test.x10'):
 
     out_filename = '/vsimem/vdv/ogr_vdv_2.x10'
     gdal.Unlink(out_filename)
@@ -272,7 +272,7 @@ def ogr_vdv_2(src_filename='tmp/test.x10'):
 # Run test_ogrsf on it
 
 
-def ogr_vdv_3():
+def test_ogr_vdv_3():
 
     import test_cli_utilities
     if test_cli_utilities.get_test_ogrsf_path() is None:
@@ -290,21 +290,21 @@ def ogr_vdv_3():
 # Create a VDV directory
 
 
-def ogr_vdv_4():
-    return ogr_vdv_1(filename='tmp/test_x10', dsco=['SINGLE_FILE=NO'], lco=['EXTENSION=txt'])
+def test_ogr_vdv_4():
+    return test_ogr_vdv_1(filename='tmp/test_x10', dsco=['SINGLE_FILE=NO'], lco=['EXTENSION=txt'])
 
 ###############################################################################
 # Read it
 
 
-def ogr_vdv_5():
-    return ogr_vdv_2(src_filename='tmp/test_x10')
+def test_ogr_vdv_5():
+    return test_ogr_vdv_2(src_filename='tmp/test_x10')
 
 ###############################################################################
 # Run test_ogrsf on it
 
 
-def ogr_vdv_6():
+def test_ogr_vdv_6():
 
     import test_cli_utilities
     if test_cli_utilities.get_test_ogrsf_path() is None:
@@ -322,7 +322,7 @@ def ogr_vdv_6():
 # Run VDV452
 
 
-def ogr_vdv_7():
+def test_ogr_vdv_7():
 
     tests = [('VDV-452', 'STOP', 'POINT_LONGITUDE', 'POINT_LATITUDE'),
              ('VDV-452-ENGLISH', 'STOP', 'POINT_LONGITUDE', 'POINT_LATITUDE'),
@@ -403,7 +403,7 @@ def ogr_vdv_7():
 # Test a few error cases
 
 
-def ogr_vdv_8():
+def test_ogr_vdv_8():
 
     gdal.PushErrorHandler()
     ds = ogr.GetDriverByName('VDV').CreateDataSource('/does/not_exist')
@@ -586,7 +586,7 @@ def ogr_vdv_8():
 # Cleanup
 
 
-def ogr_vdv_cleanup():
+def test_ogr_vdv_cleanup():
 
     gdal.Unlink('tmp/test.x10')
     gdal.Unlink('/vsimem/vdv/ogr_vdv_2.x10')
@@ -602,19 +602,19 @@ def ogr_vdv_cleanup():
 
 
 gdaltest_list = [
-    ogr_idf_1,
-    ogr_idf_1_with_temp_sqlite_db,
-    ogr_idf_3d,
-    ogr_idf_2,
-    ogr_vdv_1,
-    ogr_vdv_2,
-    ogr_vdv_3,
-    ogr_vdv_4,
-    ogr_vdv_5,
-    ogr_vdv_6,
-    ogr_vdv_7,
-    ogr_vdv_8,
-    ogr_vdv_cleanup]
+    test_ogr_idf_1,
+    test_ogr_idf_1_with_temp_sqlite_db,
+    test_ogr_idf_3d,
+    test_ogr_idf_2,
+    test_ogr_vdv_1,
+    test_ogr_vdv_2,
+    test_ogr_vdv_3,
+    test_ogr_vdv_4,
+    test_ogr_vdv_5,
+    test_ogr_vdv_6,
+    test_ogr_vdv_7,
+    test_ogr_vdv_8,
+    test_ogr_vdv_cleanup]
 
 
 if __name__ == '__main__':
diff --git a/autotest/ogr/ogr_vfk.py b/autotest/ogr/ogr_vfk.py
index 07537e2b30ae..9f7d627b0137 100755
--- a/autotest/ogr/ogr_vfk.py
+++ b/autotest/ogr/ogr_vfk.py
@@ -43,7 +43,7 @@
 # check number of fields and features
 
 
-def ogr_vfk_1():
+def test_ogr_vfk_1():
 
     gdaltest.vfk_drv = ogr.GetDriverByName('VFK')
     if gdaltest.vfk_drv is None:
@@ -89,7 +89,7 @@ def ogr_vfk_1():
 # Read the first feature from layer 'PAR', check envelope
 
 
-def ogr_vfk_2():
+def test_ogr_vfk_2():
 
     if gdaltest.vfk_drv is None:
         return 'skip'
@@ -121,7 +121,7 @@ def ogr_vfk_2():
 # Read features from layer 'SOBR', test attribute query
 
 
-def ogr_vfk_3():
+def test_ogr_vfk_3():
 
     if gdaltest.vfk_drv is None:
         return 'skip'
@@ -152,7 +152,7 @@ def ogr_vfk_3():
 # Read features from layer 'SBP', test random access, check length
 
 
-def ogr_vfk_4():
+def test_ogr_vfk_4():
 
     if gdaltest.vfk_drv is None:
         return 'skip'
@@ -176,7 +176,7 @@ def ogr_vfk_4():
 # Read features from layer 'HP', check geometry type
 
 
-def ogr_vfk_5():
+def test_ogr_vfk_5():
 
     if gdaltest.vfk_drv is None:
         return 'skip'
@@ -199,7 +199,7 @@ def ogr_vfk_5():
 # Re-Open file (test .db persistence)
 
 
-def ogr_vfk_6():
+def test_ogr_vfk_6():
 
     if gdaltest.vfk_drv is None:
         return 'skip'
@@ -242,7 +242,7 @@ def ogr_vfk_6():
 # Read PAR layer, check data types (Integer64 new in GDAL 2.2)
 
 
-def ogr_vfk_7():
+def test_ogr_vfk_7():
 
     if gdaltest.vfk_drv is None:
         return 'skip'
@@ -264,7 +264,7 @@ def ogr_vfk_7():
 # Open DB file as datasource (new in GDAL 2.2)
 
 
-def ogr_vfk_8():
+def test_ogr_vfk_8():
 
     if gdaltest.vfk_drv is None:
         return 'skip'
@@ -292,7 +292,7 @@ def ogr_vfk_8():
 # Open datasource with SUPPRESS_GEOMETRY open option (new in GDAL 2.3)
 
 
-def ogr_vfk_9():
+def test_ogr_vfk_9():
 
     if gdaltest.vfk_drv is None:
         return 'skip'
@@ -321,7 +321,7 @@ def ogr_vfk_9():
 # Open datasource with FILE_FIELD open option (new in GDAL 2.4)
 
 
-def ogr_vfk_10():
+def test_ogr_vfk_10():
 
     if gdaltest.vfk_drv is None:
         return 'skip'
@@ -352,7 +352,7 @@ def ogr_vfk_10():
 # Read PAR layer, check sequential feature access consistency
 
 
-def ogr_vfk_11():
+def test_ogr_vfk_11():
     def count_features():
         gdaltest.vfk_layer_par.ResetReading()
         count = 0
@@ -381,7 +381,7 @@ def count_features():
 # cleanup
 
 
-def ogr_vfk_cleanup():
+def test_ogr_vfk_cleanup():
 
     if gdaltest.vfk_drv is None:
         return 'skip'
@@ -403,18 +403,18 @@ def ogr_vfk_cleanup():
 
 
 gdaltest_list = [
-    ogr_vfk_1,
-    ogr_vfk_2,
-    ogr_vfk_3,
-    ogr_vfk_4,
-    ogr_vfk_5,
-    ogr_vfk_6,
-    ogr_vfk_7,
-    ogr_vfk_8,
-    ogr_vfk_9,
-    ogr_vfk_10,
-    ogr_vfk_11,
-    ogr_vfk_cleanup]
+    test_ogr_vfk_1,
+    test_ogr_vfk_2,
+    test_ogr_vfk_3,
+    test_ogr_vfk_4,
+    test_ogr_vfk_5,
+    test_ogr_vfk_6,
+    test_ogr_vfk_7,
+    test_ogr_vfk_8,
+    test_ogr_vfk_9,
+    test_ogr_vfk_10,
+    test_ogr_vfk_11,
+    test_ogr_vfk_cleanup]
 
 if __name__ == '__main__':
     gdaltest.setup_run('ogr_vfk')
diff --git a/autotest/ogr/ogr_virtualogr.py b/autotest/ogr/ogr_virtualogr.py
index 3ccf11aaf6e2..f7775cc21260 100755
--- a/autotest/ogr/ogr_virtualogr.py
+++ b/autotest/ogr/ogr_virtualogr.py
@@ -69,7 +69,7 @@ def ogr_virtualogr_run_sql(sql_statement):
 # Basic tests
 
 
-def ogr_virtualogr_1():
+def test_ogr_virtualogr_1():
 
     import ogr_sql_sqlite
     if not ogr_sql_sqlite.ogr_sql_sqlite_available():
@@ -144,7 +144,7 @@ def ogr_virtualogr_1():
 # Test detection of suspicious use of VirtualOGR
 
 
-def ogr_virtualogr_2():
+def test_ogr_virtualogr_2():
 
     if not ogrtest.has_sqlite_dialect:
         return 'skip'
@@ -227,7 +227,7 @@ def ogr_virtualogr_2():
 # Test GDAL as a SQLite3 dynamically loaded extension
 
 
-def ogr_virtualogr_3():
+def test_ogr_virtualogr_3():
 
     if not ogrtest.has_sqlite_dialect:
         return 'skip'
@@ -266,7 +266,7 @@ def ogr_virtualogr_3():
 # Test ogr_datasource_load_layers()
 
 
-def ogr_virtualogr_4():
+def test_ogr_virtualogr_4():
 
     if not ogrtest.has_sqlite_dialect:
         return 'skip'
@@ -335,7 +335,7 @@ def ogr_virtualogr_4():
 # Test failed CREATE VIRTUAL TABLE USING VirtualOGR
 
 
-def ogr_virtualogr_5():
+def test_ogr_virtualogr_5():
 
     if not ogrtest.has_sqlite_dialect:
         return 'skip'
@@ -362,11 +362,11 @@ def ogr_virtualogr_5():
 
 
 gdaltest_list = [
-    ogr_virtualogr_1,
-    ogr_virtualogr_2,
-    ogr_virtualogr_3,
-    ogr_virtualogr_4,
-    ogr_virtualogr_5,
+    test_ogr_virtualogr_1,
+    test_ogr_virtualogr_2,
+    test_ogr_virtualogr_3,
+    test_ogr_virtualogr_4,
+    test_ogr_virtualogr_5,
 ]
 
 if __name__ == '__main__':
diff --git a/autotest/ogr/ogr_vrt.py b/autotest/ogr/ogr_vrt.py
index 6a702b314da4..24c6db83e910 100755
--- a/autotest/ogr/ogr_vrt.py
+++ b/autotest/ogr/ogr_vrt.py
@@ -42,7 +42,7 @@
 # Open VRT datasource.
 
 
-def ogr_vrt_1():
+def test_ogr_vrt_1():
 
     with gdaltest.error_handler():
         # Complains about dummySrcDataSource as expected.
@@ -58,7 +58,7 @@ def ogr_vrt_1():
 # Also tests FID-copied-from-source.
 
 
-def ogr_vrt_2():
+def test_ogr_vrt_2():
     if gdaltest.vrt_ds is None:
         return 'skip'
 
@@ -104,7 +104,7 @@ def ogr_vrt_2():
 # Also tests FID-from-attribute.
 
 
-def ogr_vrt_3():
+def test_ogr_vrt_3():
     if gdaltest.vrt_ds is None:
         return 'skip'
 
@@ -142,7 +142,7 @@ def ogr_vrt_3():
 ###############################################################################
 # Test a spatial query.
 
-def ogr_vrt_4():
+def test_ogr_vrt_4():
     if gdaltest.vrt_ds is None:
         return 'skip'
 
@@ -172,7 +172,7 @@ def ogr_vrt_4():
 ###############################################################################
 # Test an attribute query.
 
-def ogr_vrt_5():
+def test_ogr_vrt_5():
 
     lyr = gdaltest.vrt_ds.GetLayerByName('test3')
     lyr.ResetReading()
@@ -200,7 +200,7 @@ def ogr_vrt_5():
 # Test GetFeature() on layer with FID coming from a column.
 
 
-def ogr_vrt_6():
+def test_ogr_vrt_6():
 
     if gdaltest.vrt_ds is None:
         return 'skip'
@@ -220,7 +220,7 @@ def ogr_vrt_6():
 #
 
 
-def ogr_vrt_7():
+def test_ogr_vrt_7():
     if gdaltest.vrt_ds is None:
         return 'skip'
 
@@ -260,7 +260,7 @@ def ogr_vrt_7():
 #
 
 
-def ogr_vrt_8():
+def test_ogr_vrt_8():
     if gdaltest.vrt_ds is None:
         return 'skip'
 
@@ -300,7 +300,7 @@ def ogr_vrt_8():
 ###############################################################################
 # Test that attribute filters are passed through to an underlying layer.
 
-def ogr_vrt_9():
+def test_ogr_vrt_9():
 
     if gdaltest.vrt_ds is None:
         return 'skip'
@@ -335,7 +335,7 @@ def ogr_vrt_9():
 #
 
 
-def ogr_vrt_10():
+def test_ogr_vrt_10():
     if gdaltest.vrt_ds is None:
         return 'skip'
 
@@ -359,7 +359,7 @@ def ogr_vrt_10():
 # Test also the reportGeomSrcColumn attribute
 
 
-def ogr_vrt_11():
+def test_ogr_vrt_11():
     if gdaltest.vrt_ds is None:
         return 'skip'
 
@@ -471,7 +471,7 @@ def ogr_vrt_11():
 # Test VRT write capabilities with WKT geometries
 
 
-def ogr_vrt_12():
+def test_ogr_vrt_12():
     if gdaltest.vrt_ds is None:
         return 'skip'
 
@@ -515,7 +515,7 @@ def ogr_vrt_12():
 # Test VRT write capabilities with WKB geometries
 
 
-def ogr_vrt_13():
+def test_ogr_vrt_13():
     if gdaltest.vrt_ds is None:
         return 'skip'
 
@@ -558,7 +558,7 @@ def ogr_vrt_13():
 # Test SrcRegion element for VGS_Direct
 
 
-def ogr_vrt_14():
+def test_ogr_vrt_14():
     if gdaltest.vrt_ds is None:
         return 'skip'
 
@@ -661,7 +661,7 @@ def ogr_vrt_14():
 ###############################################################################
 # Test SrcRegion element for VGS_WKT
 
-def ogr_vrt_15():
+def test_ogr_vrt_15():
     if gdaltest.vrt_ds is None:
         return 'skip'
 
@@ -721,7 +721,7 @@ def ogr_vrt_15():
 ###############################################################################
 # Test SrcRegion element for VGS_PointFromColumns
 
-def ogr_vrt_16():
+def test_ogr_vrt_16():
     if gdaltest.vrt_ds is None:
         return 'skip'
 
@@ -791,7 +791,7 @@ def ogr_vrt_16():
 ###############################################################################
 # Test explicit field definitions.
 
-def ogr_vrt_17():
+def test_ogr_vrt_17():
 
     if gdaltest.vrt_ds is None:
         return 'skip'
@@ -860,7 +860,7 @@ def ogr_vrt_17():
 # when explicit fields are defined.
 
 
-def ogr_vrt_18():
+def test_ogr_vrt_18():
 
     if gdaltest.vrt_ds is None:
         return 'skip'
@@ -892,7 +892,7 @@ def ogr_vrt_18():
 # Run test_ogrsf (optimized path)
 
 
-def ogr_vrt_19_optimized():
+def test_ogr_vrt_19_optimized():
 
     if gdaltest.vrt_ds is None:
         return 'skip'
@@ -912,7 +912,7 @@ def ogr_vrt_19_optimized():
 # Run test_ogrsf (non optimized path)
 
 
-def ogr_vrt_19_nonoptimized():
+def test_ogr_vrt_19_nonoptimized():
 
     if gdaltest.vrt_ds is None:
         return 'skip'
@@ -932,7 +932,7 @@ def ogr_vrt_19_nonoptimized():
 # Test VGS_Direct
 
 
-def ogr_vrt_20():
+def test_ogr_vrt_20():
     if gdaltest.vrt_ds is None:
         return 'skip'
 
@@ -1186,7 +1186,7 @@ def ogr_vrt_21_internal():
     return 'success'
 
 
-def ogr_vrt_21():
+def test_ogr_vrt_21():
     gdal.PushErrorHandler('CPLQuietErrorHandler')
     try:
         ret = ogr_vrt_21_internal()
@@ -1325,7 +1325,7 @@ def ogr_vrt_22_internal():
     return 'success'
 
 
-def ogr_vrt_22():
+def test_ogr_vrt_22():
     gdal.PushErrorHandler('CPLQuietErrorHandler')
     try:
         ret = ogr_vrt_22_internal()
@@ -1338,7 +1338,7 @@ def ogr_vrt_22():
 # Test anti-recursion mechanism
 
 
-def ogr_vrt_23(shared_ds_flag=''):
+def test_ogr_vrt_23(shared_ds_flag=''):
 
     if int(gdal.VersionInfo('VERSION_NUM')) < 1900:
         gdaltest.post_reason('would crash')
@@ -1383,9 +1383,9 @@ def ogr_vrt_23(shared_ds_flag=''):
 # Test anti-recursion mechanism on shared DS
 
 
-def ogr_vrt_24():
+def test_ogr_vrt_24():
 
-    ret = ogr_vrt_23(' shared="1"')
+    ret = test_ogr_vrt_23(' shared="1"')
     if ret != 'success':
         return ret
 
@@ -1426,7 +1426,7 @@ def ogr_vrt_24():
 ###############################################################################
 # Test GetFIDColumn()
 
-def ogr_vrt_25():
+def test_ogr_vrt_25():
 
     with gdaltest.error_handler():
         ds = ogr.Open('data/vrt_test.vrt')
@@ -1469,7 +1469,7 @@ def ogr_vrt_25():
 # Test transaction support
 
 
-def ogr_vrt_26():
+def test_ogr_vrt_26():
 
     if ogr.GetDriverByName('SQLite') is None:
         return 'skip'
@@ -1533,7 +1533,7 @@ def ogr_vrt_26():
 # Test shapebin geometry
 
 
-def ogr_vrt_27():
+def test_ogr_vrt_27():
 
     csv = """dummy,shapebin
 "dummy","01000000000000000000F03F0000000000000040"
@@ -1576,7 +1576,7 @@ def ogr_vrt_27():
 # Invalid VRT testing
 
 
-def ogr_vrt_28():
+def test_ogr_vrt_28():
 
     with gdaltest.error_handler():
         ds = ogr.Open("<OGRVRTDataSource></foo>")
@@ -1634,7 +1634,7 @@ def ogr_vrt_28():
 # Test OGRVRTWarpedLayer
 
 
-def ogr_vrt_29():
+def test_ogr_vrt_29():
 
     gdal.Unlink('tmp/ogr_vrt_29.shp')
     gdal.Unlink('tmp/ogr_vrt_29.shx')
@@ -2002,7 +2002,7 @@ def ogr_vrt_29():
 ###############################################################################
 # Test OGRVRTUnionLayer
 
-def ogr_vrt_30():
+def test_ogr_vrt_30():
 
     for filename in ['tmp/ogr_vrt_30_1.shp',
                      'tmp/ogr_vrt_30_1.shx',
@@ -2509,7 +2509,7 @@ def ogr_vrt_30():
 # Test anti-recursion mechanism with union layer
 
 
-def ogr_vrt_31(shared_ds_flag=''):
+def test_ogr_vrt_31(shared_ds_flag=''):
 
     rec1 = """<OGRVRTDataSource>
     <OGRVRTUnionLayer name="rec1">
@@ -2558,15 +2558,15 @@ def ogr_vrt_31(shared_ds_flag=''):
 # Test anti-recursion mechanism on shared DS
 
 
-def ogr_vrt_32():
+def test_ogr_vrt_32():
 
-    return ogr_vrt_31(' shared="1"')
+    return test_ogr_vrt_31(' shared="1"')
 
 
 ###############################################################################
 # Test multi-geometry support
 
-def ogr_vrt_33():
+def test_ogr_vrt_33():
 
     try:
         import shutil
@@ -3324,7 +3324,7 @@ def ogr_vrt_33():
 # Test SetIgnoredFields() with with PointFromColumns geometries
 
 
-def ogr_vrt_34():
+def test_ogr_vrt_34():
     if gdaltest.vrt_ds is None:
         return 'skip'
 
@@ -3366,7 +3366,7 @@ def ogr_vrt_34():
 # Test nullable fields
 
 
-def ogr_vrt_35():
+def test_ogr_vrt_35():
     if gdaltest.vrt_ds is None:
         return 'skip'
 
@@ -3446,7 +3446,7 @@ def ogr_vrt_35():
 # Test editing direct geometries
 
 
-def ogr_vrt_36():
+def test_ogr_vrt_36():
     if gdaltest.vrt_ds is None:
         return 'skip'
 
@@ -3493,7 +3493,7 @@ def ogr_vrt_36():
 # Test implict non-spatial layers (#6336)
 
 
-def ogr_vrt_37():
+def test_ogr_vrt_37():
 
     with gdaltest.error_handler():
         ds = ogr.Open('data/vrt_test.vrt')
@@ -3517,7 +3517,7 @@ def ogr_vrt_37():
 # Test reading geometry type
 
 
-def ogr_vrt_38():
+def test_ogr_vrt_38():
     if gdaltest.vrt_ds is None:
         return 'skip'
 
@@ -3572,7 +3572,7 @@ def ogr_vrt_38():
 # Test that attribute filtering works with <FID>
 
 
-def ogr_vrt_39():
+def test_ogr_vrt_39():
     if gdaltest.vrt_ds is None:
         return 'skip'
 
@@ -3616,7 +3616,7 @@ def ogr_vrt_39():
 # Test PointZM support with encoding="PointFromColumns"
 
 
-def ogr_vrt_40():
+def test_ogr_vrt_40():
     if gdaltest.vrt_ds is None:
         return 'skip'
 
@@ -3657,7 +3657,7 @@ def ogr_vrt_40():
 # Test GetExtent() on erroneous definition
 
 
-def ogr_vrt_41():
+def test_ogr_vrt_41():
 
     ds = ogr.Open("""<OGRVRTDataSource>
   <OGRVRTLayer name="test">
@@ -3674,7 +3674,7 @@ def ogr_vrt_41():
 #
 
 
-def ogr_vrt_cleanup():
+def test_ogr_vrt_cleanup():
 
     if gdaltest.vrt_ds is None:
         return 'skip'
@@ -3699,49 +3699,49 @@ def ogr_vrt_cleanup():
 
 
 gdaltest_list = [
-    ogr_vrt_1,
-    ogr_vrt_2,
-    ogr_vrt_3,
-    ogr_vrt_4,
-    ogr_vrt_5,
-    ogr_vrt_6,
-    ogr_vrt_7,
-    ogr_vrt_8,
-    ogr_vrt_9,
-    ogr_vrt_10,
-    ogr_vrt_11,
-    ogr_vrt_12,
-    ogr_vrt_13,
-    ogr_vrt_14,
-    ogr_vrt_15,
-    ogr_vrt_16,
-    ogr_vrt_17,
-    ogr_vrt_18,
-    ogr_vrt_19_optimized,
-    ogr_vrt_19_nonoptimized,
-    ogr_vrt_20,
-    ogr_vrt_21,
-    ogr_vrt_22,
-    ogr_vrt_23,
-    ogr_vrt_24,
-    ogr_vrt_25,
-    ogr_vrt_26,
-    ogr_vrt_27,
-    ogr_vrt_28,
-    ogr_vrt_29,
-    ogr_vrt_30,
-    ogr_vrt_31,
-    ogr_vrt_32,
-    ogr_vrt_33,
-    ogr_vrt_34,
-    ogr_vrt_35,
-    ogr_vrt_36,
-    ogr_vrt_37,
-    ogr_vrt_38,
-    ogr_vrt_39,
-    ogr_vrt_40,
-    ogr_vrt_41,
-    ogr_vrt_cleanup]
+    test_ogr_vrt_1,
+    test_ogr_vrt_2,
+    test_ogr_vrt_3,
+    test_ogr_vrt_4,
+    test_ogr_vrt_5,
+    test_ogr_vrt_6,
+    test_ogr_vrt_7,
+    test_ogr_vrt_8,
+    test_ogr_vrt_9,
+    test_ogr_vrt_10,
+    test_ogr_vrt_11,
+    test_ogr_vrt_12,
+    test_ogr_vrt_13,
+    test_ogr_vrt_14,
+    test_ogr_vrt_15,
+    test_ogr_vrt_16,
+    test_ogr_vrt_17,
+    test_ogr_vrt_18,
+    test_ogr_vrt_19_optimized,
+    test_ogr_vrt_19_nonoptimized,
+    test_ogr_vrt_20,
+    test_ogr_vrt_21,
+    test_ogr_vrt_22,
+    test_ogr_vrt_23,
+    test_ogr_vrt_24,
+    test_ogr_vrt_25,
+    test_ogr_vrt_26,
+    test_ogr_vrt_27,
+    test_ogr_vrt_28,
+    test_ogr_vrt_29,
+    test_ogr_vrt_30,
+    test_ogr_vrt_31,
+    test_ogr_vrt_32,
+    test_ogr_vrt_33,
+    test_ogr_vrt_34,
+    test_ogr_vrt_35,
+    test_ogr_vrt_36,
+    test_ogr_vrt_37,
+    test_ogr_vrt_38,
+    test_ogr_vrt_39,
+    test_ogr_vrt_40,
+    test_ogr_vrt_41,
+    test_ogr_vrt_cleanup]
 
 if __name__ == '__main__':
 
diff --git a/autotest/ogr/ogr_wasp.py b/autotest/ogr/ogr_wasp.py
index 22140cc7247d..df638b5fc87c 100755
--- a/autotest/ogr/ogr_wasp.py
+++ b/autotest/ogr/ogr_wasp.py
@@ -43,7 +43,7 @@
 # Create wasp datasource
 
 
-def ogr_wasp_create_ds():
+def test_ogr_wasp_create_ds():
 
     wasp_drv = ogr.GetDriverByName('WAsP')
     wasp_drv.DeleteDataSource('tmp.map')
@@ -58,9 +58,9 @@ def ogr_wasp_create_ds():
 # Create elevation .map from linestrings z
 
 
-def ogr_wasp_elevation_from_linestring_z():
+def test_ogr_wasp_elevation_from_linestring_z():
 
-    if ogr_wasp_create_ds() != 'success':
+    if test_ogr_wasp_create_ds() != 'success':
         return 'skip'
 
     ref = osr.SpatialReference()
@@ -119,9 +119,9 @@ def ogr_wasp_elevation_from_linestring_z():
 # Create elevation .map from linestrings z with simplification
 
 
-def ogr_wasp_elevation_from_linestring_z_toler():
+def test_ogr_wasp_elevation_from_linestring_z_toler():
 
-    if ogr_wasp_create_ds() != 'success':
+    if test_ogr_wasp_create_ds() != 'success':
         return 'skip'
 
     ref = osr.SpatialReference()
@@ -189,9 +189,9 @@ def ogr_wasp_elevation_from_linestring_z_toler():
 ###############################################################################
 # Create elevation .map from linestrings field
 
-def ogr_wasp_elevation_from_linestring_field():
+def test_ogr_wasp_elevation_from_linestring_field():
 
-    if ogr_wasp_create_ds() != 'success':
+    if test_ogr_wasp_create_ds() != 'success':
         return 'skip'
 
     layer = gdaltest.wasp_ds.CreateLayer('mylayer',
@@ -244,9 +244,9 @@ def ogr_wasp_elevation_from_linestring_field():
 # Create roughness .map from linestrings fields
 
 
-def ogr_wasp_roughness_from_linestring_fields():
+def test_ogr_wasp_roughness_from_linestring_fields():
 
-    if ogr_wasp_create_ds() != 'success':
+    if test_ogr_wasp_create_ds() != 'success':
         return 'skip'
 
     layer = gdaltest.wasp_ds.CreateLayer('mylayer',
@@ -307,9 +307,9 @@ def ogr_wasp_roughness_from_linestring_fields():
 # Create .map from polygons z
 
 
-def ogr_wasp_roughness_from_polygon_z():
+def test_ogr_wasp_roughness_from_polygon_z():
 
-    if ogr_wasp_create_ds() != 'success':
+    if test_ogr_wasp_create_ds() != 'success':
         return 'skip'
 
     if not ogrtest.have_geos():
@@ -377,9 +377,9 @@ def ogr_wasp_roughness_from_polygon_z():
 # Create .map from polygons field
 
 
-def ogr_wasp_roughness_from_polygon_field():
+def test_ogr_wasp_roughness_from_polygon_field():
 
-    if ogr_wasp_create_ds() != 'success':
+    if test_ogr_wasp_create_ds() != 'success':
         return 'skip'
 
     if not ogrtest.have_geos():
@@ -452,9 +452,9 @@ def ogr_wasp_roughness_from_polygon_field():
 # a continuing line (pichart map)
 
 
-def ogr_wasp_merge():
+def test_ogr_wasp_merge():
 
-    if ogr_wasp_create_ds() != 'success':
+    if test_ogr_wasp_create_ds() != 'success':
         return 'skip'
 
     if not ogrtest.have_geos():
@@ -522,8 +522,8 @@ def ogr_wasp_merge():
 # Read map file
 
 
-def ogr_wasp_reading():
-    if ogr_wasp_elevation_from_linestring_z() != 'success':
+def test_ogr_wasp_reading():
+    if test_ogr_wasp_elevation_from_linestring_z() != 'success':
         return 'skip'
 
     gdaltest.wasp_ds = None
@@ -548,7 +548,7 @@ def ogr_wasp_reading():
 # Cleanup
 
 
-def ogr_wasp_cleanup():
+def test_ogr_wasp_cleanup():
 
     wasp_drv = ogr.GetDriverByName('WAsP')
     wasp_drv.DeleteDataSource('tmp.map')
@@ -556,16 +556,16 @@ def ogr_wasp_cleanup():
 
 
 gdaltest_list = [
-    ogr_wasp_create_ds,
-    ogr_wasp_elevation_from_linestring_z,
-    ogr_wasp_elevation_from_linestring_z_toler,
-    ogr_wasp_elevation_from_linestring_field,
-    ogr_wasp_roughness_from_linestring_fields,
-    ogr_wasp_roughness_from_polygon_z,
-    ogr_wasp_roughness_from_polygon_field,
-    ogr_wasp_merge,
-    ogr_wasp_reading,
-    ogr_wasp_cleanup
+    test_ogr_wasp_create_ds,
+    test_ogr_wasp_elevation_from_linestring_z,
+    test_ogr_wasp_elevation_from_linestring_z_toler,
+    test_ogr_wasp_elevation_from_linestring_field,
+    test_ogr_wasp_roughness_from_linestring_fields,
+    test_ogr_wasp_roughness_from_polygon_z,
+    test_ogr_wasp_roughness_from_polygon_field,
+    test_ogr_wasp_merge,
+    test_ogr_wasp_reading,
+    test_ogr_wasp_cleanup
 ]
 
 if __name__ == '__main__':
diff --git a/autotest/ogr/ogr_wfs3.py b/autotest/ogr/ogr_wfs3.py
index db39eb065b7a..e156ddc6167d 100755
--- a/autotest/ogr/ogr_wfs3.py
+++ b/autotest/ogr/ogr_wfs3.py
@@ -41,7 +41,7 @@
 #
 
 
-def ogr_wfs3_init():
+def test_ogr_wfs3_init():
 
     gdaltest.wfs3_drv = ogr.GetDriverByName('WFS3')
     if gdaltest.wfs3_drv is None:
@@ -57,7 +57,7 @@ def ogr_wfs3_init():
 ###############################################################################
 
 
-def ogr_wfs3_errors():
+def test_ogr_wfs3_errors():
     if gdaltest.wfs3_drv is None:
         return 'skip'
 
@@ -152,7 +152,7 @@ def ogr_wfs3_errors():
 ###############################################################################
 
 
-def ogr_wfs3_empty_layer():
+def test_ogr_wfs3_empty_layer():
     if gdaltest.wfs3_drv is None:
         return 'skip'
 
@@ -190,7 +190,7 @@ def ogr_wfs3_empty_layer():
 ###############################################################################
 
 
-def ogr_wfs3_fc_links_next_geojson():
+def test_ogr_wfs3_fc_links_next_geojson():
     if gdaltest.wfs3_drv is None:
         return 'skip'
 
@@ -266,7 +266,7 @@ def ogr_wfs3_fc_links_next_geojson():
 ###############################################################################
 
 
-def ogr_wfs3_fc_links_next_headers():
+def test_ogr_wfs3_fc_links_next_headers():
     if gdaltest.wfs3_drv is None:
         return 'skip'
 
@@ -341,7 +341,7 @@ def ogr_wfs3_fc_links_next_headers():
 ###############################################################################
 
 
-def ogr_wfs3_spatial_filter():
+def test_ogr_wfs3_spatial_filter():
     if gdaltest.wfs3_drv is None:
         return 'skip'
 
@@ -425,7 +425,7 @@ def ogr_wfs3_spatial_filter():
 ###############################################################################
 
 
-def ogr_wfs3_get_feature_count():
+def test_ogr_wfs3_get_feature_count():
     if gdaltest.wfs3_drv is None:
         return 'skip'
 
@@ -495,7 +495,7 @@ def ogr_wfs3_get_feature_count():
 ###############################################################################
 
 
-def ogr_wfs3_attribute_filter():
+def test_ogr_wfs3_attribute_filter():
     if gdaltest.wfs3_drv is None:
         return 'skip'
 
@@ -620,7 +620,7 @@ def ogr_wfs3_attribute_filter():
 ###############################################################################
 
 
-def ogr_wfs3_cleanup():
+def test_ogr_wfs3_cleanup():
 
     if gdaltest.wfs3_drv is None:
         return 'skip'
@@ -632,15 +632,15 @@ def ogr_wfs3_cleanup():
 
 
 gdaltest_list = [
-    ogr_wfs3_init,
-    ogr_wfs3_errors,
-    ogr_wfs3_empty_layer,
-    ogr_wfs3_fc_links_next_geojson,
-    ogr_wfs3_fc_links_next_headers,
-    ogr_wfs3_spatial_filter,
-    ogr_wfs3_get_feature_count,
-    ogr_wfs3_attribute_filter,
-    ogr_wfs3_cleanup,
+    test_ogr_wfs3_init,
+    test_ogr_wfs3_errors,
+    test_ogr_wfs3_empty_layer,
+    test_ogr_wfs3_fc_links_next_geojson,
+    test_ogr_wfs3_fc_links_next_headers,
+    test_ogr_wfs3_spatial_filter,
+    test_ogr_wfs3_get_feature_count,
+    test_ogr_wfs3_attribute_filter,
+    test_ogr_wfs3_cleanup,
 ]
 
 if __name__ == '__main__':
diff --git a/autotest/ogr/ogr_wkbwkt_geom.py b/autotest/ogr/ogr_wkbwkt_geom.py
index 763a70d1ff87..67b737f3c5b3 100755
--- a/autotest/ogr/ogr_wkbwkt_geom.py
+++ b/autotest/ogr/ogr_wkbwkt_geom.py
@@ -124,7 +124,7 @@ def test_wkbwkt_geom(unit):
 # Test geometry with very large exponents of coordinate values.
 
 
-def ogr_wkbwkt_geom_bigexponents():
+def test_ogr_wkbwkt_geom_bigexponents():
 
     bigx = -1.79769313486e+308
     bigy = -1.12345678901e+308
@@ -146,7 +146,7 @@ def ogr_wkbwkt_geom_bigexponents():
 ###############################################################################
 # Test importing broken/unhandled WKT.
 
-def ogr_wkbwkt_test_broken_geom():
+def test_ogr_wkbwkt_test_broken_geom():
 
     list_broken = ['POINT',
                    'POINT UNKNOWN',
@@ -387,7 +387,7 @@ def ogr_wkbwkt_test_broken_geom():
 # Test importing WKT SF1.2
 
 
-def ogr_wkbwkt_test_import_wkt_sf12():
+def test_ogr_wkbwkt_test_import_wkt_sf12():
 
     list_wkt_tuples = [('POINT EMPTY', 'POINT EMPTY'),
                        ('POINT Z EMPTY', 'POINT EMPTY'),
@@ -518,7 +518,7 @@ def ogr_wkbwkt_test_import_wkt_sf12():
 # doesn't work
 
 
-def ogr_wkbwkt_test_import_bad_multipoint_wkb():
+def test_ogr_wkbwkt_test_import_bad_multipoint_wkb():
 
     import struct
     wkb = struct.pack('B' * 30, 0, 0, 0, 0, 6, 0, 0, 0, 1, 0, 0, 0, 0, 1, 64, 0, 0, 0, 0, 0, 0, 0, 64, 0, 0, 0, 0, 0, 0, 0)
@@ -534,7 +534,7 @@ def ogr_wkbwkt_test_import_bad_multipoint_wkb():
 # Test WKT -> WKB -> WKT roundtripping for GEOMETRYCOLLECTION
 
 
-def ogr_wkbwkt_test_geometrycollection_wktwkb():
+def test_ogr_wkbwkt_test_geometrycollection_wktwkb():
 
     wkt_list = ['GEOMETRYCOLLECTION (POINT (0 1))',
                 'GEOMETRYCOLLECTION (LINESTRING (0 1,2 3))',
@@ -566,7 +566,7 @@ def ogr_wkbwkt_test_geometrycollection_wktwkb():
 # Test that importing too nested WKT doesn't cause stack overflows
 
 
-def ogr_wkbwkt_test_geometrycollection_wkt_recursion():
+def test_ogr_wkbwkt_test_geometrycollection_wkt_recursion():
 
     wkt = 'GEOMETRYCOLLECTION (' * 31 + 'GEOMETRYCOLLECTION EMPTY' + ')' * 31
 
@@ -591,7 +591,7 @@ def ogr_wkbwkt_test_geometrycollection_wkt_recursion():
 # Test that importing too nested WKB doesn't cause stack overflows
 
 
-def ogr_wkbwkt_test_geometrycollection_wkb_recursion():
+def test_ogr_wkbwkt_test_geometrycollection_wkb_recursion():
 
     import struct
     wkb_repeat = struct.pack('B' * 9, 0, 0, 0, 0, 7, 0, 0, 0, 1)
@@ -619,7 +619,7 @@ def ogr_wkbwkt_test_geometrycollection_wkb_recursion():
 # Test ISO WKT compliant export of MULTIPOINT
 
 
-def ogr_wkbwkt_export_wkt_iso_multipoint():
+def test_ogr_wkbwkt_export_wkt_iso_multipoint():
 
     wkt = 'MULTIPOINT ((0 0),(1 1))'
     g = ogr.CreateGeometryFromWkt(wkt)
@@ -635,7 +635,7 @@ def ogr_wkbwkt_export_wkt_iso_multipoint():
 # Test exporting WKT with non finite values (#6319)
 
 
-def ogr_wkt_inf_nan():
+def test_ogr_wkt_inf_nan():
 
     g = ogr.Geometry(ogr.wkbPoint)
     g.AddPoint(float('inf'), float('-inf'), float('nan'))
@@ -651,7 +651,7 @@ def ogr_wkt_inf_nan():
 # Test corrupted WKT
 
 
-def ogr_wkt_multicurve_compoundcurve_corrupted():
+def test_ogr_wkt_multicurve_compoundcurve_corrupted():
 
     with gdaltest.error_handler():
         g = ogr.CreateGeometryFromWkt('MULTICURVE(COMPOUNDCURVE')
@@ -664,7 +664,7 @@ def ogr_wkt_multicurve_compoundcurve_corrupted():
 # Test corrupted WKT
 
 
-def ogr_wkt_multipolygon_corrupted():
+def test_ogr_wkt_multipolygon_corrupted():
 
     with gdaltest.error_handler():
         g = ogr.CreateGeometryFromWkt('MULTIPOLYGON(POLYGON((N')
@@ -681,17 +681,17 @@ def ogr_wkt_multipolygon_corrupted():
 
 
 gdaltest_list = [
-    ogr_wkbwkt_geom_bigexponents,
-    ogr_wkbwkt_test_broken_geom,
-    ogr_wkbwkt_test_import_wkt_sf12,
-    ogr_wkbwkt_test_import_bad_multipoint_wkb,
-    ogr_wkbwkt_test_geometrycollection_wktwkb,
-    ogr_wkbwkt_test_geometrycollection_wkt_recursion,
-    ogr_wkbwkt_test_geometrycollection_wkb_recursion,
-    ogr_wkbwkt_export_wkt_iso_multipoint,
-    ogr_wkt_inf_nan,
-    ogr_wkt_multicurve_compoundcurve_corrupted,
-    ogr_wkt_multipolygon_corrupted,
+    test_ogr_wkbwkt_geom_bigexponents,
+    test_ogr_wkbwkt_test_broken_geom,
+    test_ogr_wkbwkt_test_import_wkt_sf12,
+    test_ogr_wkbwkt_test_import_bad_multipoint_wkb,
+    test_ogr_wkbwkt_test_geometrycollection_wktwkb,
+    test_ogr_wkbwkt_test_geometrycollection_wkt_recursion,
+    test_ogr_wkbwkt_test_geometrycollection_wkb_recursion,
+    test_ogr_wkbwkt_export_wkt_iso_multipoint,
+    test_ogr_wkt_inf_nan,
+    test_ogr_wkt_multicurve_compoundcurve_corrupted,
+    test_ogr_wkt_multipolygon_corrupted,
 ]
 
 if __name__ == '__main__':
diff --git a/autotest/ogr/ogr_wktempty.py b/autotest/ogr/ogr_wktempty.py
index 4c429cd28122..2313845f3edf 100755
--- a/autotest/ogr/ogr_wktempty.py
+++ b/autotest/ogr/ogr_wktempty.py
@@ -71,7 +71,7 @@ def test_empty_wkt(test_input, expected):
         geom.Destroy()
 
 
-def ogr_wktempty_test_partial_empty_geoms():
+def test_ogr_wktempty_test_partial_empty_geoms():
 
     # Multipoint with a valid point and an empty point
     wkt = 'MULTIPOINT (1 1)'
@@ -150,7 +150,7 @@ def ogr_wktempty_test_partial_empty_geoms():
     return 'success'
 
 
-gdaltest_list = [ogr_wktempty_test_partial_empty_geoms]
+gdaltest_list = [test_ogr_wktempty_test_partial_empty_geoms]
 
 if __name__ == '__main__':
 
diff --git a/autotest/ogr/ogr_xls.py b/autotest/ogr/ogr_xls.py
index 35d33aa5e126..5d83b42f6682 100755
--- a/autotest/ogr/ogr_xls.py
+++ b/autotest/ogr/ogr_xls.py
@@ -40,7 +40,7 @@
 # Basic tests
 
 
-def ogr_xls_1():
+def test_ogr_xls_1():
 
     drv = ogr.GetDriverByName('XLS')
     if drv is None:
@@ -121,7 +121,7 @@ def ogr_xls_1():
 # Test OGR_XLS_HEADERS = DISABLE
 
 
-def ogr_xls_2():
+def test_ogr_xls_2():
 
     drv = ogr.GetDriverByName('XLS')
     if drv is None:
@@ -145,7 +145,7 @@ def ogr_xls_2():
 # Test OGR_XLS_FIELD_TYPES = STRING
 
 
-def ogr_xls_3():
+def test_ogr_xls_3():
 
     drv = ogr.GetDriverByName('XLS')
     if drv is None:
@@ -168,7 +168,7 @@ def ogr_xls_3():
 # Run test_ogrsf
 
 
-def ogr_xls_4():
+def test_ogr_xls_4():
 
     drv = ogr.GetDriverByName('XLS')
     if drv is None:
@@ -188,10 +188,10 @@ def ogr_xls_4():
 
 
 gdaltest_list = [
-    ogr_xls_1,
-    ogr_xls_2,
-    ogr_xls_3,
-    ogr_xls_4
+    test_ogr_xls_1,
+    test_ogr_xls_2,
+    test_ogr_xls_3,
+    test_ogr_xls_4
 ]
 
 if __name__ == '__main__':
diff --git a/autotest/ogr/ogr_xlsx.py b/autotest/ogr/ogr_xlsx.py
index f6bcc643aaa7..969522eda9cc 100755
--- a/autotest/ogr/ogr_xlsx.py
+++ b/autotest/ogr/ogr_xlsx.py
@@ -125,7 +125,7 @@ def ogr_xlsx_check(ds):
 # Basic tests
 
 
-def ogr_xlsx_1():
+def test_ogr_xlsx_1():
 
     drv = ogr.GetDriverByName('XLSX')
     if drv is None:
@@ -146,7 +146,7 @@ def ogr_xlsx_1():
 # Test OGR_XLSX_HEADERS = DISABLE
 
 
-def ogr_xlsx_2():
+def test_ogr_xlsx_2():
 
     drv = ogr.GetDriverByName('XLSX')
     if drv is None:
@@ -170,7 +170,7 @@ def ogr_xlsx_2():
 # Test OGR_XLSX_FIELD_TYPES = STRING
 
 
-def ogr_xlsx_3():
+def test_ogr_xlsx_3():
 
     drv = ogr.GetDriverByName('XLSX')
     if drv is None:
@@ -193,7 +193,7 @@ def ogr_xlsx_3():
 # Run test_ogrsf
 
 
-def ogr_xlsx_4():
+def test_ogr_xlsx_4():
 
     drv = ogr.GetDriverByName('XLSX')
     if drv is None:
@@ -215,7 +215,7 @@ def ogr_xlsx_4():
 # Test write support
 
 
-def ogr_xlsx_5():
+def test_ogr_xlsx_5():
 
     drv = ogr.GetDriverByName('XLSX')
     if drv is None:
@@ -239,7 +239,7 @@ def ogr_xlsx_5():
 # Test reading a file using inlineStr representation.
 
 
-def ogr_xlsx_6():
+def test_ogr_xlsx_6():
 
     drv = ogr.GetDriverByName('XLSX')
     if drv is None:
@@ -274,7 +274,7 @@ def ogr_xlsx_6():
 # Test update support
 
 
-def ogr_xlsx_7():
+def test_ogr_xlsx_7():
 
     drv = ogr.GetDriverByName('XLSX')
     if drv is None:
@@ -317,7 +317,7 @@ def ogr_xlsx_7():
 # Test number of columns > 26 (#5774)
 
 
-def ogr_xlsx_8():
+def test_ogr_xlsx_8():
 
     drv = ogr.GetDriverByName('XLSX')
     if drv is None:
@@ -350,7 +350,7 @@ def ogr_xlsx_8():
 # Test Integer64
 
 
-def ogr_xlsx_9():
+def test_ogr_xlsx_9():
 
     drv = ogr.GetDriverByName('XLSX')
     if drv is None:
@@ -391,7 +391,7 @@ def ogr_xlsx_9():
 # Test DateTime with milliseconds
 
 
-def ogr_xlsx_10():
+def test_ogr_xlsx_10():
 
     drv = ogr.GetDriverByName('XLSX')
     if drv is None:
@@ -439,7 +439,7 @@ def ogr_xlsx_10():
 # Test reading sheet with more than 26 columns with holes (#6363)"
 
 
-def ogr_xlsx_11():
+def test_ogr_xlsx_11():
 
     drv = ogr.GetDriverByName('XLSX')
     if drv is None:
@@ -461,7 +461,7 @@ def ogr_xlsx_11():
 # workbook.xml.rels (#6733)
 
 
-def ogr_xlsx_12():
+def test_ogr_xlsx_12():
 
     drv = ogr.GetDriverByName('XLSX')
     if drv is None:
@@ -480,7 +480,7 @@ def ogr_xlsx_12():
 # Test that data types are correctly picked up even if first row is missing data
 
 
-def ogr_xlsx_13():
+def test_ogr_xlsx_13():
 
     drv = ogr.GetDriverByName('XLSX')
     if drv is None:
@@ -532,7 +532,7 @@ def ogr_xlsx_13():
 # Test that field names are picked up even if last field has no data
 
 
-def ogr_xlsx_14():
+def test_ogr_xlsx_14():
 
     drv = ogr.GetDriverByName('XLSX')
     if drv is None:
@@ -584,7 +584,7 @@ def ogr_xlsx_14():
 # Test appending a layer to an existing document
 
 
-def ogr_xlsx_15():
+def test_ogr_xlsx_15():
 
     drv = ogr.GetDriverByName('XLSX')
     if drv is None:
@@ -610,7 +610,7 @@ def ogr_xlsx_15():
 # Test Boolean
 
 
-def ogr_xlsx_boolean():
+def test_ogr_xlsx_boolean():
 
     drv = ogr.GetDriverByName('XLSX')
     if drv is None:
@@ -648,22 +648,22 @@ def ogr_xlsx_boolean():
 
 
 gdaltest_list = [
-    ogr_xlsx_1,
-    ogr_xlsx_2,
-    ogr_xlsx_3,
-    ogr_xlsx_4,
-    ogr_xlsx_5,
-    ogr_xlsx_6,
-    ogr_xlsx_7,
-    ogr_xlsx_8,
-    ogr_xlsx_9,
-    ogr_xlsx_10,
-    ogr_xlsx_11,
-    ogr_xlsx_12,
-    ogr_xlsx_13,
-    ogr_xlsx_14,
-    ogr_xlsx_15,
-    ogr_xlsx_boolean,
+    test_ogr_xlsx_1,
+    test_ogr_xlsx_2,
+    test_ogr_xlsx_3,
+    test_ogr_xlsx_4,
+    test_ogr_xlsx_5,
+    test_ogr_xlsx_6,
+    test_ogr_xlsx_7,
+    test_ogr_xlsx_8,
+    test_ogr_xlsx_9,
+    test_ogr_xlsx_10,
+    test_ogr_xlsx_11,
+    test_ogr_xlsx_12,
+    test_ogr_xlsx_13,
+    test_ogr_xlsx_14,
+    test_ogr_xlsx_15,
+    test_ogr_xlsx_boolean,
 ]
 
 if __name__ == '__main__':
diff --git a/autotest/ogr/ogr_xplane.py b/autotest/ogr/ogr_xplane.py
index 3ac8110cd552..d4973edb0d3d 100755
--- a/autotest/ogr/ogr_xplane.py
+++ b/autotest/ogr/ogr_xplane.py
@@ -38,7 +38,7 @@
 # Test apt.dat reading
 
 
-def ogr_xplane_apt_dat():
+def test_ogr_xplane_apt_dat():
 
     xplane_apt_ds = ogr.Open('data/apt.dat')
 
@@ -84,7 +84,7 @@ def ogr_xplane_apt_dat():
 ###############################################################################
 # Test apt.dat v810 reading
 
-def ogr_xplane_apt_v810_dat():
+def test_ogr_xplane_apt_v810_dat():
 
     xplane_apt_ds = ogr.Open('data/apt810/apt.dat')
 
@@ -130,7 +130,7 @@ def ogr_xplane_apt_v810_dat():
 # Test nav.dat reading
 
 
-def ogr_xplane_nav_dat():
+def test_ogr_xplane_nav_dat():
 
     xplane_nav_ds = ogr.Open('data/nav.dat')
 
@@ -167,7 +167,7 @@ def ogr_xplane_nav_dat():
 ###############################################################################
 # Test awy.dat reading
 
-def ogr_xplane_awy_dat():
+def test_ogr_xplane_awy_dat():
 
     xplane_awy_ds = ogr.Open('data/awy.dat')
 
@@ -197,7 +197,7 @@ def ogr_xplane_awy_dat():
 # Test fix.dat reading
 
 
-def ogr_xplane_fix_dat():
+def test_ogr_xplane_fix_dat():
 
     xplane_fix_ds = ogr.Open('data/fix.dat')
 
@@ -227,11 +227,11 @@ def ogr_xplane_fix_dat():
 
 
 gdaltest_list = [
-    ogr_xplane_apt_dat,
-    ogr_xplane_apt_v810_dat,
-    ogr_xplane_nav_dat,
-    ogr_xplane_awy_dat,
-    ogr_xplane_fix_dat]
+    test_ogr_xplane_apt_dat,
+    test_ogr_xplane_apt_v810_dat,
+    test_ogr_xplane_nav_dat,
+    test_ogr_xplane_awy_dat,
+    test_ogr_xplane_fix_dat]
 
 if __name__ == '__main__':
 
diff --git a/autotest/ogr/ograpispy.py b/autotest/ogr/ograpispy.py
index 38b440009f8c..d67ca18ca4e8 100755
--- a/autotest/ogr/ograpispy.py
+++ b/autotest/ogr/ograpispy.py
@@ -45,7 +45,7 @@
 # Basic test without snapshoting
 
 
-def ograpispy_1():
+def test_ograpispy_1():
 
     gdal.SetConfigOption('OGR_API_SPY_FILE', 'tmp/ograpispy_1.py')
     test_py_scripts.run_py_script('data', 'testograpispy', '')
@@ -76,7 +76,7 @@ def ograpispy_1():
 # With snapshoting
 
 
-def ograpispy_2():
+def test_ograpispy_2():
 
     if not ogrtest.has_apispy:
         return 'skip'
@@ -136,7 +136,7 @@ def ograpispy_2():
 #
 
 
-def ograpispy_cleanup():
+def test_ograpispy_cleanup():
     gdal.Unlink('tmp/ograpispy_1.py')
     gdal.Unlink('tmp/ograpispy_2.py')
     gdal.Unlink('tmp/ograpispy_2.pyc')
@@ -155,9 +155,9 @@ def ograpispy_cleanup():
 
 
 gdaltest_list = [
-    ograpispy_1,
-    ograpispy_2,
-    ograpispy_cleanup
+    test_ograpispy_1,
+    test_ograpispy_2,
+    test_ograpispy_cleanup
 ]
 
 if __name__ == '__main__':
diff --git a/autotest/osr/osr_basic.py b/autotest/osr/osr_basic.py
index 6ac462df2090..99108c5a8e46 100755
--- a/autotest/osr/osr_basic.py
+++ b/autotest/osr/osr_basic.py
@@ -41,7 +41,7 @@
 ###############################################################################
 # Create a UTM WGS84 coordinate system and check various items.
 
-def osr_basic_1():
+def test_osr_basic_1():
 
     utm_srs = osr.SpatialReference()
     # Southern hemisphere
@@ -93,7 +93,7 @@ def osr_basic_1():
 # Simple default NAD83 State Plane zone.
 
 
-def osr_basic_2():
+def test_osr_basic_2():
 
     srs = osr.SpatialReference()
     srs.SetStatePlane(403, 1)  # California III NAD83.
@@ -138,7 +138,7 @@ def osr_basic_2():
 # NAD83 State Plane zone, but overridden to be in Feet.
 
 
-def osr_basic_3():
+def test_osr_basic_3():
 
     srs = osr.SpatialReference()
 
@@ -211,7 +211,7 @@ def osr_basic_3():
 # Translate a coordinate system with nad shift into to PROJ.4 and back
 # and verify that the TOWGS84 parameters are preserved.
 
-def osr_basic_4():
+def test_osr_basic_4():
 
     srs = osr.SpatialReference()
     srs.SetGS(cm=-117.0, fe=100000.0, fn=100000)
@@ -239,7 +239,7 @@ def osr_basic_4():
 # Test URN support for OGC:CRS84.
 
 
-def osr_basic_5():
+def test_osr_basic_5():
 
     wkt_1 = osr.GetUserInputAsWKT('urn:ogc:def:crs:OGC:1.3:CRS84')
     wkt_2 = osr.GetUserInputAsWKT('WGS84')
@@ -253,7 +253,7 @@ def osr_basic_5():
 # Test URN support for EPSG
 
 
-def osr_basic_6():
+def test_osr_basic_6():
 
     # Without version
     wkt_1 = osr.GetUserInputAsWKT('urn:x-ogc:def:crs:EPSG::4326')
@@ -286,7 +286,7 @@ def osr_basic_6():
 # Test URN support for auto projection.
 
 
-def osr_basic_7():
+def test_osr_basic_7():
 
     wkt_1 = osr.GetUserInputAsWKT('urn:ogc:def:crs:OGC::AUTO42001:-117:33')
     wkt_2 = 'PROJCS["UTM Zone 11, Northern Hemisphere",GEOGCS["WGS 84",DATUM["WGS_1984",SPHEROID["WGS 84",6378137,298.257223563,AUTHORITY["EPSG","7030"]],AUTHORITY["EPSG","6326"]],PRIMEM["Greenwich",0,AUTHORITY["EPSG","8901"]],UNIT["degree",0.0174532925199433,AUTHORITY["EPSG","9122"]],AUTHORITY["EPSG","4326"]],PROJECTION["Transverse_Mercator"],PARAMETER["latitude_of_origin",0],PARAMETER["central_meridian",-117],PARAMETER["scale_factor",0.9996],PARAMETER["false_easting",500000],PARAMETER["false_northing",0],UNIT["Meter",1,AUTHORITY["EPSG","9001"]]]'
@@ -302,7 +302,7 @@ def osr_basic_7():
 # Test the SetLinearUnitsAndUpdateParameters() method.
 
 
-def osr_basic_8():
+def test_osr_basic_8():
 
     srs = osr.SpatialReference()
 
@@ -336,7 +336,7 @@ def osr_basic_8():
 # Test the Validate() method.
 
 
-def osr_basic_9():
+def test_osr_basic_9():
 
     srs = osr.SpatialReference()
     srs.SetFromUserInput("PROJCS[\"unnamed\",GEOGCS[\"unnamed ellipse\",DATUM[\"unknown\",SPHEROID[\"unnamed\",6378137,0]],PRIMEM[\"Greenwich\",0],UNIT[\"degree\",0.0174532925199433]],PROJECTION[\"Mercator_2SP\"],PARAMETER[\"standard_parallel_1\",0],PARAMETER[\"latitude_of_origin\",0],PARAMETER[\"central_meridian\",0],PARAMETER[\"false_easting\",0],PARAMETER[\"false_northing\",0],UNIT[\"Meter\",1],EXTENSION[\"PROJ4\",\"+proj=merc +a=6378137 +b=6378137 +lat_ts=0.0 +lon_0=0.0 +x_0=0.0 +y_0=0 +k=1.0 +units=m +nadgrids=@null +wktext  +no_defs\"]]")
@@ -349,7 +349,7 @@ def osr_basic_9():
 ###############################################################################
 # Test the Validate() method on PROJCS with AXIS definition (#2739)
 
-def osr_basic_10():
+def test_osr_basic_10():
 
     srs = osr.SpatialReference()
     srs.SetFromUserInput("""PROJCS["NAD83(CSRS98) / UTM zone 20N (deprecated)",
@@ -385,7 +385,7 @@ def osr_basic_10():
 # Test the IsSame() method (and the IsSameGeogCS() method through that)
 
 
-def osr_basic_11():
+def test_osr_basic_11():
 
     srs1 = osr.SpatialReference()
     srs1.SetFromUserInput("""PROJCS["NAD83(CSRS98) / UTM zone 20N (deprecated)",
@@ -441,7 +441,7 @@ def osr_basic_11():
 # Test URN support for OGC:CRS84.
 
 
-def osr_basic_12():
+def test_osr_basic_12():
 
     wkt_1 = osr.GetUserInputAsWKT('CRS:84')
     wkt_2 = osr.GetUserInputAsWKT('WGS84')
@@ -455,7 +455,7 @@ def osr_basic_12():
 # Test GEOCCS lookup in supporting data files.
 
 
-def osr_basic_13():
+def test_osr_basic_13():
 
     srs = osr.SpatialReference()
     srs.ImportFromEPSG(4328)
@@ -482,7 +482,7 @@ def osr_basic_13():
 # Manually setup a simple geocentric/wgs84 srs.
 
 
-def osr_basic_14():
+def test_osr_basic_14():
 
     srs = osr.SpatialReference()
     srs.SetGeocCS('My Geocentric')
@@ -511,7 +511,7 @@ def osr_basic_14():
 # Test validation and fixup methods.
 
 
-def osr_basic_15():
+def test_osr_basic_15():
 
     wkt = """GEOCCS["WGS 84 (geocentric)",
     PRIMEM["Greenwich",0,
@@ -544,7 +544,7 @@ def osr_basic_15():
 # Test OSRSetGeocCS()
 
 
-def osr_basic_16():
+def test_osr_basic_16():
 
     # Nominal test : change citation of a GEOCCS
     srs = osr.SpatialReference()
@@ -623,7 +623,7 @@ def osr_basic_16():
 # Test OGC URL support
 
 
-def osr_basic_17():
+def test_osr_basic_17():
 
     wkt_1 = osr.GetUserInputAsWKT('urn:ogc:def:crs:EPSG::4326')
     wkt_2 = osr.GetUserInputAsWKT('http://www.opengis.net/def/crs/EPSG/0/4326')
@@ -637,7 +637,7 @@ def osr_basic_17():
 # Test OGC URL support for compound CRS
 
 
-def osr_basic_18():
+def test_osr_basic_18():
 
     # This is a dummy one, but who cares
     wkt = osr.GetUserInputAsWKT('http://www.opengis.net/def/crs-compound?1=http://www.opengis.net/def/crs/EPSG/0/4326&2=http://www.opengis.net/def/crs/EPSG/0/4326')
@@ -652,7 +652,7 @@ def osr_basic_18():
 # Test well known GCS names against their corresponding EPSG definitions (#6080)
 
 
-def osr_basic_19():
+def test_osr_basic_19():
 
     sr = osr.SpatialReference()
     sr.SetWellKnownGeogCS('WGS84')
@@ -708,7 +708,7 @@ def osr_basic_19():
 # Test GetAxisName() and GetAxisOrientation() and GetAngularUnitsName()
 
 
-def osr_basic_20():
+def test_osr_basic_20():
 
     sr = osr.SpatialReference()
     sr.ImportFromEPSGA(4326)
@@ -744,7 +744,7 @@ def osr_basic_20():
 # Test IsSame() with equivalent forms of Mercator_1SP and Mercator_2SP
 
 
-def osr_basic_21():
+def test_osr_basic_21():
 
     wkt1 = """PROJCS["unnamed",
     GEOGCS["Segara (Jakarta)",
@@ -808,7 +808,7 @@ def osr_basic_21():
 # Test LCC_2SP -> LCC_1SP -> LCC_2SP
 
 
-def osr_basic_22():
+def test_osr_basic_22():
 
     sr = osr.SpatialReference()
     sr.SetFromUserInput("""PROJCS["unnamed",
@@ -1005,7 +1005,7 @@ def osr_basic_22():
 # Test LCC_1SP -> LCC_2SP -> LCC_1SP
 
 
-def osr_basic_23():
+def test_osr_basic_23():
 
     sr = osr.SpatialReference()
     sr.SetFromUserInput("""PROJCS["unnamed",
@@ -1073,7 +1073,7 @@ def osr_basic_23():
 # Test Mercator_1SP -> Mercator_2SP -> Mercator_1SP
 
 
-def osr_basic_24():
+def test_osr_basic_24():
 
     sr = osr.SpatialReference()
     sr.SetFromUserInput("""PROJCS["unnamed",
@@ -1131,7 +1131,7 @@ def osr_basic_24():
 # Test corner cases of ConvertToOtherProjection()
 
 
-def osr_basic_25():
+def test_osr_basic_25():
 
     sr = osr.SpatialReference()
     sr.SetFromUserInput("""GEOGCS["WGS 84",
@@ -1443,7 +1443,7 @@ def osr_basic_25():
 # Test corner cases of osr.SetGeocCS()
 
 
-def osr_basic_setgeogcs():
+def test_osr_basic_setgeogcs():
 
     sr = osr.SpatialReference()
     sr.SetGeogCS(None, None, None, 0, 0, None, 0, None, 0)
@@ -1481,32 +1481,32 @@ def osr_basic_setgeogcs():
 
 
 gdaltest_list = [
-    osr_basic_1,
-    osr_basic_2,
-    osr_basic_3,
-    osr_basic_4,
-    osr_basic_5,
-    osr_basic_6,
-    osr_basic_7,
-    osr_basic_8,
-    osr_basic_9,
-    osr_basic_10,
-    osr_basic_11,
-    osr_basic_12,
-    osr_basic_13,
-    osr_basic_14,
-    osr_basic_15,
-    osr_basic_16,
-    osr_basic_17,
-    osr_basic_18,
-    osr_basic_19,
-    osr_basic_20,
-    osr_basic_21,
-    osr_basic_22,
-    osr_basic_23,
-    osr_basic_24,
-    osr_basic_25,
-    osr_basic_setgeogcs,
+    test_osr_basic_1,
+    test_osr_basic_2,
+    test_osr_basic_3,
+    test_osr_basic_4,
+    test_osr_basic_5,
+    test_osr_basic_6,
+    test_osr_basic_7,
+    test_osr_basic_8,
+    test_osr_basic_9,
+    test_osr_basic_10,
+    test_osr_basic_11,
+    test_osr_basic_12,
+    test_osr_basic_13,
+    test_osr_basic_14,
+    test_osr_basic_15,
+    test_osr_basic_16,
+    test_osr_basic_17,
+    test_osr_basic_18,
+    test_osr_basic_19,
+    test_osr_basic_20,
+    test_osr_basic_21,
+    test_osr_basic_22,
+    test_osr_basic_23,
+    test_osr_basic_24,
+    test_osr_basic_25,
+    test_osr_basic_setgeogcs,
     None]
 
 if __name__ == '__main__':
diff --git a/autotest/osr/osr_compd.py b/autotest/osr/osr_compd.py
index d2d00d82e099..cacdf0a6731c 100755
--- a/autotest/osr/osr_compd.py
+++ b/autotest/osr/osr_compd.py
@@ -43,7 +43,7 @@
 # Test parsing and a few operations on a compound coordinate system.
 
 
-def osr_compd_1():
+def test_osr_compd_1():
 
     srs = osr.SpatialReference()
     srs.ImportFromWkt(example_compd_wkt)
@@ -87,7 +87,7 @@ def osr_compd_1():
 # Test SetFromUserInput()
 
 
-def osr_compd_2():
+def test_osr_compd_2():
 
     srs = osr.SpatialReference()
     srs.SetFromUserInput(example_compd_wkt)
@@ -106,7 +106,7 @@ def osr_compd_2():
 # Test expansion of compound coordinate systems from EPSG definition.
 
 
-def osr_compd_3():
+def test_osr_compd_3():
 
     srs = osr.SpatialReference()
     srs.ImportFromEPSG(7401)
@@ -161,7 +161,7 @@ def osr_compd_3():
 # Test expansion of GCS+VERTCS compound coordinate system.
 
 
-def osr_compd_4():
+def test_osr_compd_4():
 
     srs = osr.SpatialReference()
     srs.ImportFromEPSG(7400)
@@ -206,7 +206,7 @@ def osr_compd_4():
 # expanded properly and converted to PROJ.4 format with the grids.
 
 
-def osr_compd_5():
+def test_osr_compd_5():
 
     srs = osr.SpatialReference()
     srs.SetFromUserInput('EPSG:26911+5703')
@@ -271,7 +271,7 @@ def osr_compd_5():
 # Test conversion from PROJ.4 to WKT including vertical units.
 
 
-def osr_compd_6():
+def test_osr_compd_6():
 
     if not osr_proj4.have_proj480():
         return 'skip'
@@ -329,7 +329,7 @@ def osr_compd_6():
 # Test SetCompound()
 
 
-def osr_compd_7():
+def test_osr_compd_7():
 
     srs_horiz = osr.SpatialReference()
     srs_horiz.ImportFromEPSG(4326)
@@ -388,7 +388,7 @@ def osr_compd_7():
 # Test ImportFromURN()
 
 
-def osr_compd_8():
+def test_osr_compd_8():
 
     srs = osr.SpatialReference()
     srs.SetFromUserInput('urn:ogc:def:crs,crs:EPSG::27700,crs:EPSG::5701')
@@ -407,14 +407,14 @@ def osr_compd_8():
 
 
 gdaltest_list = [
-    osr_compd_1,
-    osr_compd_2,
-    osr_compd_3,
-    osr_compd_4,
-    osr_compd_5,
-    osr_compd_6,
-    osr_compd_7,
-    osr_compd_8,
+    test_osr_compd_1,
+    test_osr_compd_2,
+    test_osr_compd_3,
+    test_osr_compd_4,
+    test_osr_compd_5,
+    test_osr_compd_6,
+    test_osr_compd_7,
+    test_osr_compd_8,
     None]
 
 if __name__ == '__main__':
diff --git a/autotest/osr/osr_ct.py b/autotest/osr/osr_ct.py
index 82b7874206fb..e3bacf72afb7 100755
--- a/autotest/osr/osr_ct.py
+++ b/autotest/osr/osr_ct.py
@@ -43,7 +43,7 @@
 ###############################################################################
 # Verify that we have PROJ.4 available.
 
-def osr_ct_1():
+def test_osr_ct_1():
 
     gdaltest.have_proj4 = 0
 
@@ -81,7 +81,7 @@ def osr_ct_1():
 # Actually perform a simple LL to UTM conversion.
 
 
-def osr_ct_2():
+def test_osr_ct_2():
 
     if gdaltest.have_proj4 == 0:
         return 'skip'
@@ -109,7 +109,7 @@ def osr_ct_2():
 # geometry which also uses it is deleted.
 
 
-def osr_ct_3():
+def test_osr_ct_3():
 
     if gdaltest.have_proj4 == 0:
         return 'skip'
@@ -146,7 +146,7 @@ def osr_ct_3():
 # Works for both OG and NG bindings
 
 
-def osr_ct_4():
+def test_osr_ct_4():
 
     if gdaltest.have_proj4 == 0:
         return 'skip'
@@ -176,7 +176,7 @@ def osr_ct_4():
 # New in NG bindings (#3020)
 
 
-def osr_ct_5():
+def test_osr_ct_5():
 
     if gdaltest.have_proj4 == 0:
         return 'skip'
@@ -205,7 +205,7 @@ def osr_ct_5():
 # Test osr.CreateCoordinateTransformation() method
 
 
-def osr_ct_6():
+def test_osr_ct_6():
 
     if gdaltest.have_proj4 == 0:
         return 'skip'
@@ -240,7 +240,7 @@ def osr_ct_6():
 # Actually perform a simple Pseudo Mercator to LL conversion.
 
 
-def osr_ct_7():
+def test_osr_ct_7():
 
     if gdaltest.have_proj4 == 0:
         return 'skip'
@@ -284,7 +284,7 @@ def osr_ct_7():
 # Test WebMercator -> WGS84 optimized transform
 
 
-def osr_ct_8():
+def test_osr_ct_8():
 
     if gdaltest.have_proj4 == 0:
         return 'skip'
@@ -329,7 +329,7 @@ def osr_ct_8():
 # Cleanup
 
 
-def osr_ct_cleanup():
+def test_osr_ct_cleanup():
 
     if gdaltest.have_proj4 == 0:
         return 'skip'
@@ -340,15 +340,15 @@ def osr_ct_cleanup():
 
 
 gdaltest_list = [
-    osr_ct_1,
-    osr_ct_2,
-    osr_ct_3,
-    osr_ct_4,
-    osr_ct_5,
-    osr_ct_6,
-    osr_ct_7,
-    osr_ct_8,
-    osr_ct_cleanup,
+    test_osr_ct_1,
+    test_osr_ct_2,
+    test_osr_ct_3,
+    test_osr_ct_4,
+    test_osr_ct_5,
+    test_osr_ct_6,
+    test_osr_ct_7,
+    test_osr_ct_8,
+    test_osr_ct_cleanup,
     None]
 
 if __name__ == '__main__':
diff --git a/autotest/osr/osr_epsg.py b/autotest/osr/osr_epsg.py
index 59aa99930bae..71948ca9d2c8 100755
--- a/autotest/osr/osr_epsg.py
+++ b/autotest/osr/osr_epsg.py
@@ -41,7 +41,7 @@
 # file with the adjusted central_meridian.
 
 
-def osr_epsg_1():
+def test_osr_epsg_1():
 
     srs = osr.SpatialReference()
     srs.ImportFromEPSG(26591)
@@ -58,7 +58,7 @@ def osr_epsg_1():
 # from gcs.override.csv.
 
 
-def osr_epsg_2():
+def test_osr_epsg_2():
 
     srs = osr.SpatialReference()
     srs.ImportFromEPSG(4312)
@@ -76,7 +76,7 @@ def osr_epsg_2():
 # towgs84 values set properly (#3579)
 
 
-def osr_epsg_3():
+def test_osr_epsg_3():
 
     for epsg in [3120, 2172, 2173, 2174, 2175, 3333, 3334, 3335, 3329, 3330, 3331, 3332, 3328, 4179]:
         srs = osr.SpatialReference()
@@ -97,7 +97,7 @@ def osr_epsg_3():
 #   Check that EPSG:4326 is *not* considered as lat/long (#3813)
 
 
-def osr_epsg_4():
+def test_osr_epsg_4():
 
     srs = osr.SpatialReference()
     srs.ImportFromEPSG(4326)
@@ -116,7 +116,7 @@ def osr_epsg_4():
 #   Check that EPSGA:4326 is considered as lat/long
 
 
-def osr_epsg_5():
+def test_osr_epsg_5():
 
     srs = osr.SpatialReference()
     srs.ImportFromEPSGA(4326)
@@ -135,7 +135,7 @@ def osr_epsg_5():
 #   Test datum shift for OSGB 36
 
 
-def osr_epsg_6():
+def test_osr_epsg_6():
 
     srs = osr.SpatialReference()
     srs.ImportFromEPSG(4277)
@@ -151,7 +151,7 @@ def osr_epsg_6():
 #   Check that EPSG:2193 is *not* considered as N/E
 
 
-def osr_epsg_7():
+def test_osr_epsg_7():
 
     srs = osr.SpatialReference()
     srs.ImportFromEPSG(2193)
@@ -170,7 +170,7 @@ def osr_epsg_7():
 #   Check that EPSGA:2193 is considered as N/E
 
 
-def osr_epsg_8():
+def test_osr_epsg_8():
 
     srs = osr.SpatialReference()
     srs.ImportFromEPSGA(2193)
@@ -189,7 +189,7 @@ def osr_epsg_8():
 #   Check EPSG:3857
 
 
-def osr_epsg_9():
+def test_osr_epsg_9():
 
     srs = osr.SpatialReference()
     srs.ImportFromEPSG(3857)
@@ -209,7 +209,7 @@ def osr_epsg_9():
 #   Test AutoIdentifyEPSG() on Polar Stereographic
 
 
-def osr_epsg_10():
+def test_osr_epsg_10():
 
     srs = osr.SpatialReference()
     srs.SetFromUserInput("""PROJCS["PS         WGS84",
@@ -285,7 +285,7 @@ def osr_epsg_10():
 # Test datum shift for EPSG:2065 (PCS based override)
 
 
-def osr_epsg_11():
+def test_osr_epsg_11():
 
     srs = osr.SpatialReference()
     srs.ImportFromEPSG(2065)
@@ -302,7 +302,7 @@ def osr_epsg_11():
 # different EPSG codes)
 
 
-def osr_epsg_12():
+def test_osr_epsg_12():
 
     sr1 = osr.SpatialReference()
     sr1.ImportFromEPSG(3857)
@@ -318,7 +318,7 @@ def osr_epsg_12():
 # Test FindMatches()
 
 
-def osr_epsg_13():
+def test_osr_epsg_13():
 
     # One exact match (and test PROJCS)
     sr = osr.SpatialReference()
@@ -442,7 +442,7 @@ def osr_epsg_13():
 ###############################################################################
 
 
-def osr_epsg_gcs_deprecated():
+def test_osr_epsg_gcs_deprecated():
 
     sr = osr.SpatialReference()
     sr.ImportFromEPSG(4268)
@@ -454,7 +454,7 @@ def osr_epsg_gcs_deprecated():
 ###############################################################################
 
 
-def osr_epsg_geoccs_deprecated():
+def test_osr_epsg_geoccs_deprecated():
 
     sr = osr.SpatialReference()
     sr.ImportFromEPSG(4346)
@@ -467,21 +467,21 @@ def osr_epsg_geoccs_deprecated():
 
 
 gdaltest_list = [
-    osr_epsg_1,
-    osr_epsg_2,
-    osr_epsg_3,
-    osr_epsg_4,
-    osr_epsg_5,
-    osr_epsg_6,
-    osr_epsg_7,
-    osr_epsg_8,
-    osr_epsg_9,
-    osr_epsg_10,
-    osr_epsg_11,
-    osr_epsg_12,
-    osr_epsg_13,
-    osr_epsg_gcs_deprecated,
-    osr_epsg_geoccs_deprecated,
+    test_osr_epsg_1,
+    test_osr_epsg_2,
+    test_osr_epsg_3,
+    test_osr_epsg_4,
+    test_osr_epsg_5,
+    test_osr_epsg_6,
+    test_osr_epsg_7,
+    test_osr_epsg_8,
+    test_osr_epsg_9,
+    test_osr_epsg_10,
+    test_osr_epsg_11,
+    test_osr_epsg_12,
+    test_osr_epsg_13,
+    test_osr_epsg_gcs_deprecated,
+    test_osr_epsg_geoccs_deprecated,
     None]
 
 if __name__ == '__main__':
diff --git a/autotest/osr/osr_erm.py b/autotest/osr/osr_erm.py
index c51dfab5db7a..c508202fae93 100755
--- a/autotest/osr/osr_erm.py
+++ b/autotest/osr/osr_erm.py
@@ -37,7 +37,7 @@
 #
 
 
-def osr_erm_1():
+def test_osr_erm_1():
 
     for sphere_datum in ['SPHERE', 'SPHERE2', 'USSPHERE']:
         srs = osr.SpatialReference()
@@ -56,7 +56,7 @@ def osr_erm_1():
 #
 
 
-def osr_erm_2():
+def test_osr_erm_2():
 
     srs = osr.SpatialReference()
     if srs.ImportFromERM('EPSG:3395', 'EPSG:3395', 'METRE') != 0 \
@@ -77,8 +77,8 @@ def osr_erm_2():
 
 
 gdaltest_list = [
-    osr_erm_1,
-    osr_erm_2,
+    test_osr_erm_1,
+    test_osr_erm_2,
     None]
 
 if __name__ == '__main__':
diff --git a/autotest/osr/osr_esri.py b/autotest/osr/osr_esri.py
index f22a15d0f5e6..57da59ed20db 100755
--- a/autotest/osr/osr_esri.py
+++ b/autotest/osr/osr_esri.py
@@ -49,7 +49,7 @@
 # gdal_datum.csv file.
 
 
-def osr_esri_1():
+def test_osr_esri_1():
 
     srs = osr.SpatialReference()
     srs.ImportFromEPSG(4202)
@@ -80,7 +80,7 @@ def osr_esri_1():
 # translating certain GEOGCSes to ESRI format.
 
 
-def osr_esri_2():
+def test_osr_esri_2():
 
     srs = osr.SpatialReference()
     srs.SetFromUserInput('+proj=utm +zone=11 +south +datum=WGS84')
@@ -103,7 +103,7 @@ def osr_esri_2():
 # Verify that Unnamed is changed to Unknown in morphToESRI().
 
 
-def osr_esri_3():
+def test_osr_esri_3():
 
     srs = osr.SpatialReference()
     srs.SetFromUserInput('+proj=mill +datum=WGS84')
@@ -121,7 +121,7 @@ def osr_esri_3():
 # Verify Polar Stereographic translations work properly OGR to ESRI.
 
 
-def osr_esri_4():
+def test_osr_esri_4():
 
     srs = osr.SpatialReference()
     srs.SetFromUserInput('PROJCS["PS Test",GEOGCS["WGS 84",DATUM["WGS_1984",SPHEROID["WGS 84",6378137,298.257223563]],PRIMEM["Greenwich",0],UNIT["degree",0.0174532925199433]],PROJECTION["Polar_Stereographic"],PARAMETER["latitude_of_origin",-80.2333],PARAMETER["central_meridian",171],PARAMETER["scale_factor",0.9999],PARAMETER["false_easting",0],PARAMETER["false_northing",0],UNIT["metre",1]]')
@@ -144,7 +144,7 @@ def osr_esri_4():
 # Verify Polar Stereographic translations work properly ESRI to OGR.
 
 
-def osr_esri_5():
+def test_osr_esri_5():
 
     srs = osr.SpatialReference()
     srs.SetFromUserInput('PROJCS["PS Test",GEOGCS["GCS_WGS_1984",DATUM["D_WGS_1984",SPHEROID["WGS_1984",6378137,298.257223563]],PRIMEM["Greenwich",0],UNIT["Degree",0.017453292519943295]],PROJECTION["Stereographic_South_Pole"],PARAMETER["standard_parallel_1",-80.2333],PARAMETER["central_meridian",171],PARAMETER["scale_factor",0.9999],PARAMETER["false_easting",0],PARAMETER["false_northing",0],UNIT["Meter",1]]')
@@ -168,7 +168,7 @@ def osr_esri_5():
 # per bug 187.
 
 
-def osr_esri_6():
+def test_osr_esri_6():
 
     srs = osr.SpatialReference()
     srs.SetFromUserInput('PROJCS["Texas Centric Mapping System/Lambert Conformal",GEOGCS["GCS_North_American_1983",DATUM["D_North_American_1983",SPHEROID["GRS_1980",6378137.0,298.257222101]],PRIMEM["Greenwich",0.0],UNIT["Degree",0.0174532925199433]],PROJECTION["Lambert_Conformal_Conic"],PARAMETER["False_Easting",1500000.0],PARAMETER["False_Northing",5000000.0],PARAMETER["Central_Meridian",-100.0],PARAMETER["Standard_Parallel_1",27.5],PARAMETER["Standard_Parallel_2",35.0],PARAMETER["Scale_Factor",1.0],PARAMETER["Latitude_Of_Origin",18.0],UNIT["Meter",1.0]]')
@@ -187,7 +187,7 @@ def osr_esri_6():
 # Verify that FEET is treated as US survey feet per bug #1533.
 
 
-def osr_esri_7():
+def test_osr_esri_7():
 
     prj = ['Projection    STATEPLANE',
            'Fipszone      903',
@@ -238,7 +238,7 @@ def osr_esri_7():
 # Verify that handling of numerically specified units (see bug #1533)
 
 
-def osr_esri_8():
+def test_osr_esri_8():
 
     prj = ['Projection    STATEPLANE',
            'Fipszone      903',
@@ -287,7 +287,7 @@ def osr_esri_8():
 # Verify Equidistant Conic handling.
 
 
-def osr_esri_9():
+def test_osr_esri_9():
 
     srs = osr.SpatialReference()
     srs.SetFromUserInput('PROJCS["edc",GEOGCS["GCS_North_American_1983",DATUM["D_North_American_1983",SPHEROID["GRS_1980",6378137.0,298.257222101]],PRIMEM["Greenwich",0.0],UNIT["Degree",0.0174532925199433]],PROJECTION["Equidistant_Conic"],PARAMETER["False_Easting",0.0],PARAMETER["False_Northing",0.0],PARAMETER["Central_Meridian",-96.0],PARAMETER["Standard_Parallel_1",29.5],PARAMETER["Standard_Parallel_2",45.5],PARAMETER["Latitude_Of_Origin",37.5],UNIT["Meter",1.0]]')
@@ -320,7 +320,7 @@ def osr_esri_9():
 # Verify Plate_Carree handling.
 
 
-def osr_esri_10():
+def test_osr_esri_10():
 
     srs = osr.SpatialReference()
     srs.SetFromUserInput('PROJCS["Sphere_Plate_Carree",GEOGCS["GCS_Sphere",DATUM["D_Sphere",SPHEROID["Sphere",6371000.0,0.0]],PRIMEM["Greenwich",0.0],UNIT["Degree",0.0174532925199433]],PROJECTION["Plate_Carree"],PARAMETER["False_Easting",0.0],PARAMETER["False_Northing",0.0],PARAMETER["Central_Meridian",0.0],UNIT["Meter",1.0]]')
@@ -353,7 +353,7 @@ def osr_esri_10():
 # Verify arc/info style TM handling.
 
 
-def osr_esri_11():
+def test_osr_esri_11():
 
     srs = osr.SpatialReference()
     srs.ImportFromESRI(['Projection    TRANSVERSE',
@@ -387,7 +387,7 @@ def osr_esri_11():
 # Test automatic morphing of ESRI-style LCC WKT prefixed with 'ESRI::'
 
 
-def osr_esri_12():
+def test_osr_esri_12():
 
     srs = osr.SpatialReference()
     srs.SetFromUserInput('ESRI::PROJCS["Lambert Conformal Conic",GEOGCS["grs80",DATUM["D_North_American_1983",SPHEROID["Geodetic_Reference_System_1980",6378137,298.257222101]],PRIMEM["Greenwich",0],UNIT["Degree",0.017453292519943295]],PROJECTION["Lambert_Conformal_Conic"],PARAMETER["standard_parallel_1",34.33333333333334],PARAMETER["standard_parallel_2",36.16666666666666],PARAMETER["latitude_of_origin",33.75],PARAMETER["central_meridian",-79],PARAMETER["false_easting",609601.22],PARAMETER["false_northing",0],UNIT["Meter",1]]')
@@ -420,7 +420,7 @@ def osr_esri_12():
 # but read directly from file.
 
 
-def osr_esri_13():
+def test_osr_esri_13():
 
     srs = osr.SpatialReference()
     srs.SetFromUserInput('data/lcc_esri.prj')
@@ -453,7 +453,7 @@ def osr_esri_13():
 # Verify that state plane epsg authority values are not applied if the
 # linear units are changed for old style .prj files (bug #1697)
 
-def osr_esri_14():
+def test_osr_esri_14():
 
     srs = osr.SpatialReference()
     srs.ImportFromESRI(['PROJECTION STATEPLANE',
@@ -484,7 +484,7 @@ def osr_esri_14():
 # of the rectified_grid_angle parameter.
 
 
-def osr_esri_15():
+def test_osr_esri_15():
 
     srs = osr.SpatialReference()
     srs.SetFromUserInput('PROJCS["Bern_1898_Bern_LV03C",GEOGCS["GCS_Bern_1898_Bern",DATUM["D_Bern_1898",SPHEROID["Bessel_1841",6377397.155,299.1528128]],PRIMEM["Bern",7.439583333333333],UNIT["Degree",0.0174532925199433]],PROJECTION["Hotine_Oblique_Mercator_Azimuth_Center"],PARAMETER["False_Easting",0.0],PARAMETER["False_Northing",0.0],PARAMETER["Scale_Factor",1.0],PARAMETER["Azimuth",90.0],PARAMETER["Longitude_Of_Center",0.0],PARAMETER["Latitude_Of_Center",46.95240555555556],UNIT["Meter",1.0]]')
@@ -519,7 +519,7 @@ def osr_esri_15():
 # cleanup of parameters.
 
 
-def osr_esri_16():
+def test_osr_esri_16():
 
     srs = osr.SpatialReference()
     srs.SetFromUserInput('+proj=eqc +lat_0=0 +lat_ts=-10 +lon_0=2 +x=100000 +y_0=200000 +ellps=sphere')
@@ -540,7 +540,7 @@ def osr_esri_16():
 ###############################################################################
 # Test LAEA support (#3017)
 
-def osr_esri_17():
+def test_osr_esri_17():
 
     original = 'PROJCS["ETRS89 / ETRS-LAEA",GEOGCS["ETRS89",DATUM["European_Terrestrial_Reference_System_1989",SPHEROID["GRS 1980",6378137,298.257222101]],PRIMEM["Greenwich",0],UNIT["degree",0.01745329251994328]],UNIT["metre",1],PROJECTION["Lambert_Azimuthal_Equal_Area"],PARAMETER["latitude_of_center",52],PARAMETER["longitude_of_center",10],PARAMETER["false_easting",4321000],PARAMETER["false_northing",3210000]]'
     srs = osr.SpatialReference()
@@ -574,7 +574,7 @@ def osr_esri_17():
 # Test EC morphing.
 
 
-def osr_esri_18():
+def test_osr_esri_18():
 
     original = """PROJCS["World_Equidistant_Cylindrical",
     GEOGCS["GCS_WGS_1984",
@@ -621,7 +621,7 @@ def osr_esri_18():
 # Test spheroid remapping (per #3904)
 
 
-def osr_esri_19():
+def test_osr_esri_19():
 
     original = """GEOGCS["GCS_South_American_1969",DATUM["D_South_American_1969",SPHEROID["GRS_1967_Truncated",6378160.0,298.25]],PRIMEM["Greenwich",0.0],UNIT["Degree",0.0174532925199433]]"""
 
@@ -737,7 +737,7 @@ def osr_esri_test(wkt_esri, wkt_ogc, proj4):
 # Orthographics (#4249)
 
 
-def osr_esri_20():
+def test_osr_esri_20():
 
     result = 'success'
 
@@ -931,7 +931,7 @@ def osr_esri_test_esri_ogc_esri(ifile, ofile_base, fix_config='NO', check_epsg=F
     return result
 
 
-def osr_esri_21():
+def test_osr_esri_21():
 
     # FIXME ?
     if sys.version_info >= (3, 0, 0):
@@ -1116,7 +1116,7 @@ def osr_esri_test_ogc_esri_ogc(ifile, ofile_base, fix_config='NO', check_epsg=Fa
 # Test EPSG->OGC->ESRI->OGC
 
 
-def osr_esri_22():
+def test_osr_esri_22():
 
     result = 'success'
 
@@ -1137,7 +1137,7 @@ def osr_esri_22():
 # set GDAL_FIX_ESRI_WKT=DATUM (bugs #4378 and #4345), don't expect to fail
 
 
-def osr_esri_23():
+def test_osr_esri_23():
 
     result = 'success'
 
@@ -1160,7 +1160,7 @@ def osr_esri_23():
 #
 
 
-def osr_esri_24():
+def test_osr_esri_24():
 
     srs = osr.SpatialReference()
     srs.ImportFromWkt('''PROJCS["Custom",
@@ -1189,7 +1189,7 @@ def osr_esri_24():
 #
 
 
-def osr_esri_25():
+def test_osr_esri_25():
     srs = osr.SpatialReference()
     srs.SetFromUserInput(
         'PROJCS["WGS_1984_Web_Mercator_Auxiliary_Sphere",'
@@ -1235,7 +1235,7 @@ def osr_esri_25():
 #
 
 
-def osr_esri_26():
+def test_osr_esri_26():
     srs = osr.SpatialReference()
     srs.SetFromUserInput("""PROJCS["NAD_1983_HARN_WISCRS_Washburn_County_Meters",GEOGCS["GCS_North_American_1983_HARN",DATUM["D_North_American_1983_HARN",SPHEROID["GRS_1980",6378137.0,298.257222101]],PRIMEM["Greenwich",0.0],UNIT["Degree",0.0174532925199433]],PROJECTION["Lambert_Conformal_Conic"],PARAMETER["False_Easting",234086.8682],PARAMETER["False_Northing",188358.6058],PARAMETER["Central_Meridian",-91.78333333333333],PARAMETER["Standard_Parallel_1",45.96121983333334],PARAMETER["Scale_Factor",1.0000475376],PARAMETER["Latitude_Of_Origin",45.96121983333334],UNIT["Meter",1.0]]""")
     srs.MorphFromESRI()
@@ -1250,7 +1250,7 @@ def osr_esri_26():
 # Test Mercator_2SP (#4861)
 
 
-def osr_esri_27():
+def test_osr_esri_27():
 
     esri_wkt = """PROJCS["Batavia_NEIEZ",
     GEOGCS["GCS_Batavia",
@@ -1310,7 +1310,7 @@ def osr_esri_27():
 ###############################################################################
 # Test Mercator_1SP (#4861)
 
-def osr_esri_28():
+def test_osr_esri_28():
 
     ogc_wkt = """PROJCS["Segara (Jakarta) / NEIEZ (deprecated)",
     GEOGCS["Segara (Jakarta)",
@@ -1381,7 +1381,7 @@ def osr_esri_28():
 # Test Web Mercator
 
 
-def osr_esri_29():
+def test_osr_esri_29():
 
     srs = osr.SpatialReference()
     srs.ImportFromEPSG(3857)
@@ -1469,7 +1469,7 @@ def osr_esri_29():
 # Verify import of custom ellipsoid
 
 
-def osr_esri_30():
+def test_osr_esri_30():
 
     prj = ['Projection    GEOGRAPHIC',
            'Parameters    6370000.0  6370000.0',
@@ -1497,7 +1497,7 @@ def osr_esri_30():
 # Verify import of old-style Mercator
 
 
-def osr_esri_31():
+def test_osr_esri_31():
 
     prj = ['Projection    MERCATOR',
            'Datum         WGS84',
@@ -1548,7 +1548,7 @@ def osr_esri_31():
 # Bad Equidistant Conic
 
 
-def osr_esri_32():
+def test_osr_esri_32():
     # Autofuzz POC from b/65416453
     prj = [
         'PROJECTIONLOCA?L_CSw?(  EQUIDISTANT_CONIC',
@@ -1568,7 +1568,7 @@ def osr_esri_32():
 # Test morphing invalid PROJCS WKT does not crash
 
 
-def osr_esri_33():
+def test_osr_esri_33():
 
     sr = osr.SpatialReference()
     sr.ImportFromWkt('PROJCS[]')
@@ -1582,39 +1582,39 @@ def osr_esri_33():
 
 
 gdaltest_list = [
-    osr_esri_1,
-    osr_esri_2,
-    osr_esri_3,
-    osr_esri_4,
-    osr_esri_5,
-    osr_esri_6,
-    osr_esri_7,
-    osr_esri_8,
-    osr_esri_9,
-    osr_esri_10,
-    osr_esri_11,
-    osr_esri_12,
-    osr_esri_13,
-    osr_esri_14,
-    osr_esri_15,
-    osr_esri_16,
-    osr_esri_17,
-    osr_esri_18,
-    osr_esri_19,
-    osr_esri_20,
-    osr_esri_21,
-    osr_esri_22,
-    osr_esri_23,
-    osr_esri_24,
-    osr_esri_25,
-    osr_esri_26,
-    osr_esri_27,
-    osr_esri_28,
-    osr_esri_29,
-    osr_esri_30,
-    osr_esri_31,
-    osr_esri_32,
-    osr_esri_33,
+    test_osr_esri_1,
+    test_osr_esri_2,
+    test_osr_esri_3,
+    test_osr_esri_4,
+    test_osr_esri_5,
+    test_osr_esri_6,
+    test_osr_esri_7,
+    test_osr_esri_8,
+    test_osr_esri_9,
+    test_osr_esri_10,
+    test_osr_esri_11,
+    test_osr_esri_12,
+    test_osr_esri_13,
+    test_osr_esri_14,
+    test_osr_esri_15,
+    test_osr_esri_16,
+    test_osr_esri_17,
+    test_osr_esri_18,
+    test_osr_esri_19,
+    test_osr_esri_20,
+    test_osr_esri_21,
+    test_osr_esri_22,
+    test_osr_esri_23,
+    test_osr_esri_24,
+    test_osr_esri_25,
+    test_osr_esri_26,
+    test_osr_esri_27,
+    test_osr_esri_28,
+    test_osr_esri_29,
+    test_osr_esri_30,
+    test_osr_esri_31,
+    test_osr_esri_32,
+    test_osr_esri_33,
     None]
 
 if __name__ == '__main__':
diff --git a/autotest/osr/osr_getprojectionmethods.py b/autotest/osr/osr_getprojectionmethods.py
index 52776e4d8a7e..3afe24e76ffe 100755
--- a/autotest/osr/osr_getprojectionmethods.py
+++ b/autotest/osr/osr_getprojectionmethods.py
@@ -38,7 +38,7 @@
 ###############################################################################
 # Test osr.GetProjectionMethods()
 
-def osr_getprojectionmethods_1():
+def test_osr_getprojectionmethods_1():
 
     methods = osr.GetProjectionMethods()
     if methods[0][0] != 'Transverse_Mercator':
@@ -48,7 +48,7 @@ def osr_getprojectionmethods_1():
 
 
 gdaltest_list = [
-    osr_getprojectionmethods_1,
+    test_osr_getprojectionmethods_1,
     None]
 
 if __name__ == '__main__':
diff --git a/autotest/osr/osr_micoordsys.py b/autotest/osr/osr_micoordsys.py
index 507d18ea313a..2cdb84667e57 100755
--- a/autotest/osr/osr_micoordsys.py
+++ b/autotest/osr/osr_micoordsys.py
@@ -39,7 +39,7 @@
 #
 
 
-def osr_micoordsys_1():
+def test_osr_micoordsys_1():
 
     srs = osr.SpatialReference()
     srs.ImportFromMICoordSys('Earth Projection 3, 62, "m", -117.474542888889, 33.7644620277778, 33.9036340277778, 33.6252900277778, 0, 0')
@@ -61,7 +61,7 @@ def osr_micoordsys_1():
 #
 
 
-def osr_micoordsys_2():
+def test_osr_micoordsys_2():
 
     srs = osr.SpatialReference()
     srs.ImportFromWkt("""PROJCS["unnamed",GEOGCS["NAD27",\
@@ -91,7 +91,7 @@ def osr_micoordsys_2():
 #
 
 
-def osr_micoordsys_3():
+def test_osr_micoordsys_3():
 
     srs = osr.SpatialReference()
     srs.ImportFromEPSG(3857)
@@ -123,9 +123,9 @@ def osr_micoordsys_3():
 
 
 gdaltest_list = [
-    osr_micoordsys_1,
-    osr_micoordsys_2,
-    osr_micoordsys_3]
+    test_osr_micoordsys_1,
+    test_osr_micoordsys_2,
+    test_osr_micoordsys_3]
 
 if __name__ == '__main__':
 
diff --git a/autotest/osr/osr_ozi.py b/autotest/osr/osr_ozi.py
index 39c48ba60520..3e532ed1ca72 100755
--- a/autotest/osr/osr_ozi.py
+++ b/autotest/osr/osr_ozi.py
@@ -38,7 +38,7 @@
 # Test with WGS 84 datum
 
 
-def osr_ozi_1():
+def test_osr_ozi_1():
 
     srs = osr.SpatialReference()
     srs.ImportFromOzi(["OziExplorer Map Data File Version 2.2",
@@ -60,7 +60,7 @@ def osr_ozi_1():
 # Test with another datum known by OZI and whose EPSG code is known
 
 
-def osr_ozi_2():
+def test_osr_ozi_2():
 
     srs = osr.SpatialReference()
     srs.ImportFromOzi(["OziExplorer Map Data File Version 2.2",
@@ -83,7 +83,7 @@ def osr_ozi_2():
 # Test with another datum known by OZI and whose EPSG code is unknown
 
 
-def osr_ozi_3():
+def test_osr_ozi_3():
 
     srs = osr.SpatialReference()
     srs.ImportFromOzi(["OziExplorer Map Data File Version 2.2",
@@ -103,9 +103,9 @@ def osr_ozi_3():
 
 
 gdaltest_list = [
-    osr_ozi_1,
-    osr_ozi_2,
-    osr_ozi_3,
+    test_osr_ozi_1,
+    test_osr_ozi_2,
+    test_osr_ozi_3,
     None]
 
 if __name__ == '__main__':
diff --git a/autotest/osr/osr_pci.py b/autotest/osr/osr_pci.py
index 3c62a2b66260..f33d96c663a8 100755
--- a/autotest/osr/osr_pci.py
+++ b/autotest/osr/osr_pci.py
@@ -36,7 +36,7 @@
 #
 
 
-def osr_pci_1():
+def test_osr_pci_1():
 
     prj_parms = (0.0, 0.0, 45.0, 54.5, 47.0, 62.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0)
     srs = osr.SpatialReference()
@@ -71,7 +71,7 @@ def osr_pci_1():
 #
 
 
-def osr_pci_2():
+def test_osr_pci_2():
 
     srs = osr.SpatialReference()
     srs.ImportFromWkt("""PROJCS["unnamed",GEOGCS["NAD27",\
@@ -104,7 +104,7 @@ def osr_pci_2():
 #
 
 
-def osr_pci_3():
+def test_osr_pci_3():
 
     srs = osr.SpatialReference()
     srs.ImportFromPCI(
@@ -143,7 +143,7 @@ def osr_pci_3():
 #
 
 
-def osr_pci_4():
+def test_osr_pci_4():
 
     prj_parms = (0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0)
 
@@ -170,7 +170,7 @@ def osr_pci_4():
 #
 
 
-def osr_pci_5():
+def test_osr_pci_5():
 
     prj_parms = (0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0)
 
@@ -197,7 +197,7 @@ def osr_pci_5():
 #
 
 
-def osr_pci_6():
+def test_osr_pci_6():
 
     prj_parms = (0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0)
 
@@ -225,7 +225,7 @@ def osr_pci_6():
 #
 
 
-def osr_pci_7():
+def test_osr_pci_7():
 
     srs = osr.SpatialReference()
     srs.SetFromUserInput('GEOGCS["My GCS",DATUM["My Datum",SPHEROID["Bessel 1841",6377397.155,299.1528128,AUTHORITY["EPSG","7004"]],TOWGS84[565.04,49.91,465.84,0.4094,-0.3597,1.8685,4.077200000063286]],PRIMEM["Greenwich",0],UNIT["degree",0.0174532925199433]]')
@@ -244,13 +244,13 @@ def osr_pci_7():
 
 
 gdaltest_list = [
-    osr_pci_1,
-    osr_pci_2,
-    osr_pci_3,
-    osr_pci_4,
-    osr_pci_5,
-    osr_pci_6,
-    osr_pci_7,
+    test_osr_pci_1,
+    test_osr_pci_2,
+    test_osr_pci_3,
+    test_osr_pci_4,
+    test_osr_pci_5,
+    test_osr_pci_6,
+    test_osr_pci_7,
     None]
 
 if __name__ == '__main__':
diff --git a/autotest/osr/osr_pm.py b/autotest/osr/osr_pm.py
index 90c6679dab25..be6eecfc1732 100755
--- a/autotest/osr/osr_pm.py
+++ b/autotest/osr/osr_pm.py
@@ -40,7 +40,7 @@
 # and the central meridian.
 
 
-def osr_pm_1():
+def test_osr_pm_1():
 
     srs = osr.SpatialReference()
     srs.ImportFromEPSG(27572)
@@ -60,7 +60,7 @@ def osr_pm_1():
 # and the central meridian in the PROJ.4 string.
 
 
-def osr_pm_2():
+def test_osr_pm_2():
 
     srs = osr.SpatialReference()
     srs.ImportFromEPSG(27572)
@@ -83,7 +83,7 @@ def osr_pm_2():
 # are properly preserved.
 
 
-def osr_pm_3():
+def test_osr_pm_3():
 
     srs = osr.SpatialReference()
     srs.ImportFromProj4('+proj=utm +zone=30 +datum=WGS84 +pm=bogota')
@@ -102,9 +102,9 @@ def osr_pm_3():
 ###############################################################################
 
 gdaltest_list = [
-    osr_pm_1,
-    osr_pm_2,
-    osr_pm_3,
+    test_osr_pm_1,
+    test_osr_pm_2,
+    test_osr_pm_3,
     None]
 
 if __name__ == '__main__':
diff --git a/autotest/osr/osr_proj4.py b/autotest/osr/osr_proj4.py
index 6ccd98cd262f..085371d3271c 100755
--- a/autotest/osr/osr_proj4.py
+++ b/autotest/osr/osr_proj4.py
@@ -92,7 +92,7 @@ def have_proj480():
 #
 
 
-def osr_proj4_1():
+def test_osr_proj4_1():
 
     srs = osr.SpatialReference()
     srs.ImportFromProj4('+proj=tmerc +lat_0=53.5000000000 +lon_0=-8.0000000000 +k_0=1.0000350000 +x_0=200000.0000000000 +y_0=250000.0000000000 +a=6377340.189000 +rf=299.324965 +towgs84=482.530,-130.596,564.557,-1.042,-0.214,-0.631,8.15')
@@ -109,7 +109,7 @@ def osr_proj4_1():
 #
 
 
-def osr_proj4_2():
+def test_osr_proj4_2():
 
     srs = osr.SpatialReference()
     srs.ImportFromProj4("+proj=lcc +x_0=0.6096012192024384e+06 +y_0=0 +lon_0=90dw +lat_0=42dn +lat_1=44d4'n +lat_2=42d44'n +a=6378206.400000 +rf=294.978698 +nadgrids=conus,ntv1_can.dat +units=m")
@@ -130,7 +130,7 @@ def osr_proj4_2():
 #
 
 
-def osr_proj4_3():
+def test_osr_proj4_3():
 
     srs = osr.SpatialReference()
 
@@ -154,7 +154,7 @@ def osr_proj4_3():
 #
 
 
-def osr_proj4_4():
+def test_osr_proj4_4():
 
     srs = osr.SpatialReference()
     srs.SetFromUserInput('+proj=utm +zone=11 +datum=WGS84')
@@ -179,7 +179,7 @@ def osr_proj4_4():
 #
 
 
-def osr_proj4_5():
+def test_osr_proj4_5():
 
     srs = osr.SpatialReference()
 
@@ -209,7 +209,7 @@ def osr_proj4_5():
 #
 
 
-def osr_proj4_6():
+def test_osr_proj4_6():
 
     expect_proj4 = '+proj=merc +lon_0=0 +lat_ts=46.1333331 +x_0=1000 +y_0=2000 +datum=WGS84 +units=m +no_defs '
 
@@ -276,7 +276,7 @@ def osr_proj4_6():
 #
 
 
-def osr_proj4_7():
+def test_osr_proj4_7():
 
     srs = osr.SpatialReference()
     srs.ImportFromEPSG(23700)
@@ -321,7 +321,7 @@ def osr_proj4_7():
 # Check EPSG:3857, confirm Google Mercator hackery.
 
 
-def osr_proj4_8():
+def test_osr_proj4_8():
 
     srs = osr.SpatialReference()
     srs.ImportFromEPSG(3857)
@@ -349,7 +349,7 @@ def osr_proj4_8():
 #
 
 
-def osr_proj4_9():
+def test_osr_proj4_9():
 
     srs = osr.SpatialReference()
     srs.ImportFromEPSG(4267)
@@ -377,7 +377,7 @@ def osr_proj4_9():
 #
 
 
-def osr_proj4_10():
+def test_osr_proj4_10():
 
     srs = osr.SpatialReference()
     srs.ImportFromProj4('+proj=geocent +ellps=WGS84 +towgs84=0,0,0 ')
@@ -405,7 +405,7 @@ def osr_proj4_10():
 #
 
 
-def osr_proj4_11():
+def test_osr_proj4_11():
 
     proj4strlist = ['+proj=bonne +lon_0=2 +lat_1=1 +x_0=3 +y_0=4',
                     '+proj=cass +lat_0=1 +lon_0=2 +x_0=3 +y_0=4',
@@ -504,7 +504,7 @@ def osr_proj4_11():
 #
 
 
-def osr_proj4_12():
+def test_osr_proj4_12():
 
     expect_wkt = """GEOGCS["WGS 84",
     DATUM["WGS_1984",
@@ -534,7 +534,7 @@ def osr_proj4_12():
 #
 
 
-def osr_proj4_13():
+def test_osr_proj4_13():
 
     proj4strlist = ['',
                     # None,
@@ -562,7 +562,7 @@ def osr_proj4_13():
 #
 
 
-def osr_proj4_14():
+def test_osr_proj4_14():
 
     proj4str = '+proj=etmerc +lat_0=0 +lon_0=9 +k=0.9996 +units=m +x_0=500000 +datum=WGS84 +nodefs'
 
@@ -636,7 +636,7 @@ def osr_proj4_14():
 #
 
 
-def osr_proj4_15():
+def test_osr_proj4_15():
 
     srs = osr.SpatialReference()
     if srs.ImportFromProj4("+init=IGNF:LAMB93") != 0:
@@ -659,7 +659,7 @@ def osr_proj4_15():
 #
 
 
-def osr_proj4_16():
+def test_osr_proj4_16():
 
     def almost(a, b):
         if abs(a - b) > 0.000000000001:
@@ -702,7 +702,7 @@ def almost(a, b):
 #
 
 
-def osr_proj4_17():
+def test_osr_proj4_17():
 
     units = (('km', 'kilometre'),
              ('m', 'Meter'),
@@ -741,7 +741,7 @@ def osr_proj4_17():
 #
 
 
-def osr_proj4_18():
+def test_osr_proj4_18():
 
     for p in ['no_off', 'no_uoff']:
         srs = osr.SpatialReference()
@@ -765,7 +765,7 @@ def osr_proj4_18():
 # Test EXTENSION and AUTHORITY in DATUM
 
 
-def osr_proj4_19():
+def test_osr_proj4_19():
 
     srs = osr.SpatialReference()
     srs.ImportFromProj4("+proj=longlat +datum=WGS84 +nadgrids=@null")
@@ -786,7 +786,7 @@ def osr_proj4_19():
 # Test EXTENSION in GOGCS
 
 
-def osr_proj4_20():
+def test_osr_proj4_20():
 
     srs = osr.SpatialReference()
     srs.ImportFromProj4("+proj=longlat +foo=bar +wktext")
@@ -808,7 +808,7 @@ def osr_proj4_20():
 # Test importing datum other than WGS84, WGS72, NAD27 or NAD83
 
 
-def osr_proj4_21():
+def test_osr_proj4_21():
 
     srs = osr.SpatialReference()
     srs.ImportFromProj4("+proj=longlat +datum=nzgd49")
@@ -828,7 +828,7 @@ def osr_proj4_21():
 # Test importing ellipsoid defined with +R
 
 
-def osr_proj4_22():
+def test_osr_proj4_22():
 
     srs = osr.SpatialReference()
     srs.ImportFromProj4("+proj=longlat +R=1")
@@ -845,7 +845,7 @@ def osr_proj4_22():
 # Test importing ellipsoid defined with +a and +f
 
 
-def osr_proj4_23():
+def test_osr_proj4_23():
 
     # +f=0 particular case
     srs = osr.SpatialReference()
@@ -872,7 +872,7 @@ def osr_proj4_23():
 # Test importing linear units defined with +to_meter
 
 
-def osr_proj4_24():
+def test_osr_proj4_24():
 
     srs = osr.SpatialReference()
     srs.ImportFromProj4("+proj=merc +to_meter=1.0")
@@ -919,7 +919,7 @@ def osr_proj4_24():
 # Test importing linear units defined with +vto_meter
 
 
-def osr_proj4_25():
+def test_osr_proj4_25():
 
     if not have_proj480():
         return 'skip'
@@ -969,7 +969,7 @@ def osr_proj4_25():
 # Test importing linear units defined with +vunits
 
 
-def osr_proj4_26():
+def test_osr_proj4_26():
 
     if not have_proj480():
         return 'skip'
@@ -1009,7 +1009,7 @@ def osr_proj4_26():
 # Test geostationary +sweep (#6030)
 
 
-def osr_proj4_27():
+def test_osr_proj4_27():
 
     if not have_proj480():
         return 'skip'
@@ -1029,7 +1029,7 @@ def osr_proj4_27():
 # Test importing +init=epsg: with an override
 
 
-def osr_proj4_28():
+def test_osr_proj4_28():
 
     srs = osr.SpatialReference()
     srs.ImportFromProj4("+init=epsg:32631 +units=cm")
@@ -1043,7 +1043,7 @@ def osr_proj4_28():
     return 'success'
 
 
-def osr_proj4_28_missing_proj_epsg_dict():
+def test_osr_proj4_28_missing_proj_epsg_dict():
 
     python_exe = sys.executable
     if sys.platform == 'win32':
@@ -1056,7 +1056,7 @@ def osr_proj4_28_missing_proj_epsg_dict():
     return 'success'
 
 
-def osr_proj4_error_cases_export_mercator():
+def test_osr_proj4_error_cases_export_mercator():
 
     srs = osr.SpatialReference()
 
@@ -1082,36 +1082,36 @@ def osr_proj4_error_cases_export_mercator():
 
 
 gdaltest_list = [
-    osr_proj4_1,
-    osr_proj4_2,
-    osr_proj4_3,
-    osr_proj4_4,
-    osr_proj4_5,
-    osr_proj4_6,
-    osr_proj4_7,
-    osr_proj4_8,
-    osr_proj4_9,
-    osr_proj4_10,
-    osr_proj4_11,
-    osr_proj4_12,
-    osr_proj4_13,
-    osr_proj4_14,
-    osr_proj4_15,
-    osr_proj4_16,
-    osr_proj4_17,
-    osr_proj4_18,
-    osr_proj4_19,
-    osr_proj4_20,
-    osr_proj4_21,
-    osr_proj4_22,
-    osr_proj4_23,
-    osr_proj4_24,
-    osr_proj4_25,
-    osr_proj4_26,
-    osr_proj4_27,
-    osr_proj4_28,
-    osr_proj4_28_missing_proj_epsg_dict,
-    osr_proj4_error_cases_export_mercator,
+    test_osr_proj4_1,
+    test_osr_proj4_2,
+    test_osr_proj4_3,
+    test_osr_proj4_4,
+    test_osr_proj4_5,
+    test_osr_proj4_6,
+    test_osr_proj4_7,
+    test_osr_proj4_8,
+    test_osr_proj4_9,
+    test_osr_proj4_10,
+    test_osr_proj4_11,
+    test_osr_proj4_12,
+    test_osr_proj4_13,
+    test_osr_proj4_14,
+    test_osr_proj4_15,
+    test_osr_proj4_16,
+    test_osr_proj4_17,
+    test_osr_proj4_18,
+    test_osr_proj4_19,
+    test_osr_proj4_20,
+    test_osr_proj4_21,
+    test_osr_proj4_22,
+    test_osr_proj4_23,
+    test_osr_proj4_24,
+    test_osr_proj4_25,
+    test_osr_proj4_26,
+    test_osr_proj4_27,
+    test_osr_proj4_28,
+    test_osr_proj4_28_missing_proj_epsg_dict,
+    test_osr_proj4_error_cases_export_mercator,
 ]
 
 
@@ -1119,7 +1119,7 @@ def osr_proj4_error_cases_export_mercator():
 
     if len(sys.argv) == 2 and sys.argv[1] == "osr_proj4_28":
         os.putenv('PROJ_LIB', '/i/dont_exist')
-        gdaltest.run_tests([osr_proj4_28])
+        gdaltest.run_tests([test_osr_proj4_28])
         sys.exit(0)
 
     gdaltest.setup_run('osr_proj4')
diff --git a/autotest/osr/osr_url.py b/autotest/osr/osr_url.py
index 486820ec9648..18650444ca10 100755
--- a/autotest/osr/osr_url.py
+++ b/autotest/osr/osr_url.py
@@ -73,17 +73,17 @@ def osr_url_test(url, expected_wkt):
     return 'success'
 
 
-def osr_url_1():
+def test_osr_url_1():
     return osr_url_test('http://spatialreference.org/ref/epsg/4326/', expected_wkt)
 
 
-def osr_url_2():
+def test_osr_url_2():
     return osr_url_test('http://spatialreference.org/ref/epsg/4326/ogcwkt/', expected_wkt)
 
 
 gdaltest_list = [
-    osr_url_1,
-    osr_url_2,
+    test_osr_url_1,
+    test_osr_url_2,
     None]
 
 if __name__ == '__main__':
diff --git a/autotest/osr/osr_usgs.py b/autotest/osr/osr_usgs.py
index d564d2e85fe2..945df77a75d0 100755
--- a/autotest/osr/osr_usgs.py
+++ b/autotest/osr/osr_usgs.py
@@ -40,7 +40,7 @@
 #
 
 
-def osr_usgs_1():
+def test_osr_usgs_1():
 
     srs = osr.SpatialReference()
     srs.ImportFromUSGS(
@@ -67,7 +67,7 @@ def osr_usgs_1():
 #
 
 
-def osr_usgs_2():
+def test_osr_usgs_2():
 
     srs = osr.SpatialReference()
     srs.ImportFromWkt("""PROJCS["unnamed",GEOGCS["NAD27",\
@@ -97,8 +97,8 @@ def osr_usgs_2():
 
 
 gdaltest_list = [
-    osr_usgs_1,
-    osr_usgs_2,
+    test_osr_usgs_1,
+    test_osr_usgs_2,
     None]
 
 if __name__ == '__main__':
diff --git a/autotest/osr/osr_validate.py b/autotest/osr/osr_validate.py
index 2923b6a13061..8c70bed7bd9a 100755
--- a/autotest/osr/osr_validate.py
+++ b/autotest/osr/osr_validate.py
@@ -39,7 +39,7 @@
 # No root pointer
 
 
-def osr_validate_1():
+def test_osr_validate_1():
 
     empty_srs = osr.SpatialReference()
     if empty_srs.Validate() == 0:
@@ -51,7 +51,7 @@ def osr_validate_1():
 # Unrecognized root node
 
 
-def osr_validate_2():
+def test_osr_validate_2():
 
     srs = osr.SpatialReference()
     srs.ImportFromWkt("FOO[]")
@@ -64,7 +64,7 @@ def osr_validate_2():
 # COMPD_CS errors
 
 
-def osr_validate_3():
+def test_osr_validate_3():
 
     # No DATUM child in GEOGCS
     srs = osr.SpatialReference()
@@ -96,7 +96,7 @@ def osr_validate_3():
 # VERT_CS errors
 
 
-def osr_validate_4():
+def test_osr_validate_4():
 
     # Invalid number of children : 1
     srs = osr.SpatialReference()
@@ -152,7 +152,7 @@ def osr_validate_4():
 # GEOCCS errors
 
 
-def osr_validate_5():
+def test_osr_validate_5():
 
     # srs.ImportFromWkt('GEOCCS["My Geocentric",DATUM["WGS_1984",SPHEROID["WGS 84",6378137,298.257223563,AUTHORITY["EPSG","7030"]],TOWGS84[0,0,0,0,0,0,0],AUTHORITY["EPSG","6326"]],PRIMEM["Greenwich",0,AUTHORITY["EPSG","8901"]],UNIT["meter",1]]')
 
@@ -216,7 +216,7 @@ def osr_validate_5():
 # PROJCS errors
 
 
-def osr_validate_6():
+def test_osr_validate_6():
 
     # srs.ImportFromWkt('PROJCS["WGS 84 / UTM zone 31N",GEOGCS["WGS 84",DATUM["WGS_1984",SPHEROID["WGS 84",6378137,298.257223563,AUTHORITY["EPSG","7030"]],AUTHORITY["EPSG","6326"]],PRIMEM["Greenwich",0,AUTHORITY["EPSG","8901"]],UNIT["degree",0.0174532925199433,AUTHORITY["EPSG","9122"]],AUTHORITY["EPSG","4326"]],PROJECTION["Transverse_Mercator"],PARAMETER["latitude_of_origin",0],PARAMETER["central_meridian",3],PARAMETER["scale_factor",0.9996],PARAMETER["false_easting",500000],PARAMETER["false_northing",0],UNIT["metre",1,AUTHORITY["EPSG","9001"]],AXIS["Easting",EAST],AXIS["Northing",NORTH],AUTHORITY["EPSG","32631"]]')
 
@@ -298,12 +298,12 @@ def osr_validate_6():
 
 
 gdaltest_list = [
-    osr_validate_1,
-    osr_validate_2,
-    osr_validate_3,
-    osr_validate_4,
-    osr_validate_5,
-    osr_validate_6]
+    test_osr_validate_1,
+    test_osr_validate_2,
+    test_osr_validate_3,
+    test_osr_validate_4,
+    test_osr_validate_5,
+    test_osr_validate_6]
 
 if __name__ == '__main__':
 
diff --git a/autotest/osr/osr_xml.py b/autotest/osr/osr_xml.py
index e3e353342f4e..d767f5ee20b0 100755
--- a/autotest/osr/osr_xml.py
+++ b/autotest/osr/osr_xml.py
@@ -41,7 +41,7 @@
 #
 
 
-def osr_xml_1():
+def test_osr_xml_1():
 
     gdaltest.srs_xml = """<gml:ProjectedCRS>
   <gml:srsName>WGS 84 / UTM zone 31N</gml:srsName>
@@ -191,7 +191,7 @@ def osr_xml_1():
 #
 
 
-def osr_xml_2():
+def test_osr_xml_2():
 
     srs = osr.SpatialReference()
     srs.ImportFromWkt(gdaltest.srs_wkt)
@@ -212,8 +212,8 @@ def osr_xml_2():
 
 
 gdaltest_list = [
-    osr_xml_1,
-    osr_xml_2]
+    test_osr_xml_1,
+    test_osr_xml_2]
 
 if __name__ == '__main__':
 

From 1a5aa2785201653d7b53c914255b33c174c60a91 Mon Sep 17 00:00:00 2001
From: Craig de Stigter <craig.destigter@koordinates.com>
Date: Mon, 10 Dec 2018 09:21:37 +1300
Subject: [PATCH 136/488] Automated: Don't expect 'success' from test helpers

Helpers are about to raise exceptions for skip/fail events,
rather than returning a value.
---
 autotest/gcore/hdf4_read.py              | 14 ----
 autotest/gdrivers/aigrid.py              |  2 -
 autotest/gdrivers/bag.py                 |  2 -
 autotest/gdrivers/ecw.py                 | 12 ++--
 autotest/gdrivers/ers.py                 |  3 +-
 autotest/gdrivers/gif.py                 |  3 +-
 autotest/gdrivers/gpkg.py                | 84 ++++++++----------------
 autotest/gdrivers/ignfheightasciigrid.py |  3 +-
 autotest/gdrivers/ingr.py                |  2 -
 autotest/gdrivers/isis.py                | 22 -------
 autotest/gdrivers/jp2lura.py             | 15 ++---
 autotest/gdrivers/jp2openjpeg.py         | 15 ++---
 autotest/gdrivers/jpeg2000.py            | 15 ++---
 autotest/gdrivers/kea.py                 |  4 --
 autotest/gdrivers/mrsid.py               | 15 ++---
 autotest/gdrivers/netcdf.py              | 28 --------
 autotest/gdrivers/nitf.py                | 18 ++---
 autotest/gdrivers/pds.py                 | 12 +---
 autotest/gdrivers/rmf.py                 | 20 ++----
 autotest/gdrivers/rraster.py             |  2 -
 autotest/gdrivers/saga.py                |  4 --
 autotest/gdrivers/sdts.py                |  5 +-
 autotest/gdrivers/srp.py                 |  2 -
 autotest/gdrivers/vicar.py               |  4 +-
 autotest/ogr/ogr_bna.py                  |  7 +-
 autotest/ogr/ogr_georss.py               |  9 +--
 autotest/ogr/ogr_gml_read.py             | 19 ++----
 autotest/ogr/ogr_index_test.py           | 10 ---
 autotest/ogr/ogr_mitab.py                |  9 +--
 autotest/ogr/ogr_pg.py                   | 17 +----
 autotest/ogr/ogr_rfc35_mem.py            | 44 -------------
 autotest/ogr/ogr_rfc35_mitab.py          | 10 ---
 autotest/ogr/ogr_rfc35_shape.py          | 58 ----------------
 autotest/ogr/ogr_rfc35_sqlite.py         | 64 ------------------
 autotest/ogr/ogr_s57.py                  | 15 ++---
 autotest/ogr/ogr_selafin.py              |  3 +-
 autotest/ogr/ogr_shape.py                | 26 --------
 autotest/ogr/ogr_shape_sbn.py            |  2 -
 autotest/ogr/ogr_sql_sqlite.py           |  6 --
 autotest/ogr/ogr_vrt.py                  |  2 -
 autotest/ogr/ogr_wasp.py                 | 24 +++----
 autotest/osr/osr_metacrs.py              |  2 -
 autotest/pyscripts/test_gdal_ls_py.py    | 18 -----
 43 files changed, 97 insertions(+), 554 deletions(-)

diff --git a/autotest/gcore/hdf4_read.py b/autotest/gcore/hdf4_read.py
index cb52da4dc9b3..22ba75316ea7 100755
--- a/autotest/gcore/hdf4_read.py
+++ b/autotest/gcore/hdf4_read.py
@@ -97,8 +97,6 @@ def test_hdf4_read_online_2():
     tst = gdaltest.GDALTest('HDF4Image', 'HDF4_SDS:UNKNOWN:"tmp/cache/A2006005182000.L2_LAC_SST.x.hdf":13', 1, 13209, filename_absolute=1)
 
     ret = tst.testOpen()
-    if ret != 'success':
-        return ret
 
     ds = gdal.Open('HDF4_SDS:UNKNOWN:"tmp/cache/A2006005182000.L2_LAC_SST.x.hdf":13')
     md = ds.GetMetadata('GEOLOCATION')
@@ -125,8 +123,6 @@ def test_hdf4_read_online_3():
     tst = gdaltest.GDALTest('HDF4Image', 'tmp/cache/MO36MW14.chlor_MODIS.ADD2001089.004.2002186190207.hdf', 1, 34723, filename_absolute=1)
 
     ret = tst.testOpen()
-    if ret != 'success':
-        return ret
 
     ds = gdal.Open('tmp/cache/MO36MW14.chlor_MODIS.ADD2001089.004.2002186190207.hdf')
     gt = ds.GetGeoTransform()
@@ -161,8 +157,6 @@ def test_hdf4_read_online_4():
     tst = gdaltest.GDALTest('HDF4Image', 'tmp/cache/S2002196124536.L1A_HDUN.BartonBendish.extract.hdf', 1, 33112, filename_absolute=1)
 
     ret = tst.testOpen()
-    if ret != 'success':
-        return ret
 
     ds = gdal.Open('tmp/cache/S2002196124536.L1A_HDUN.BartonBendish.extract.hdf')
     if ds.RasterCount != 8:
@@ -189,8 +183,6 @@ def test_hdf4_read_online_5():
     tst = gdaltest.GDALTest('HDF4Image', 'tmp/cache/199101.s04m1pfv50-sst-16b.hdf', 1, 41173, filename_absolute=1)
 
     ret = tst.testOpen()
-    if ret != 'success':
-        return ret
 
     return 'success'
 
@@ -211,8 +203,6 @@ def test_hdf4_read_online_6():
     tst = gdaltest.GDALTest('HDF4Image', 'HDF4_EOS:EOS_GRID:"tmp/cache/MOD09Q1G_EVI.A2006233.h07v03.005.2008338190308.hdf":"MODIS_NACP_EVI":"MODIS_EVI"', 1, 12197, filename_absolute=1)
 
     ret = tst.testOpen()
-    if ret != 'success':
-        return ret
 
     ds = gdal.Open('HDF4_EOS:EOS_GRID:tmp/cache/MOD09Q1G_EVI.A2006233.h07v03.005.2008338190308.hdf:MODIS_NACP_EVI:MODIS_EVI')
 
@@ -248,8 +238,6 @@ def test_hdf4_read_online_7():
     tst = gdaltest.GDALTest('HDF4Image', 'HDF4_EOS:EOS_GRID:tmp/cache/MOD09A1.A2010041.h06v03.005.2010051001103.hdf:MOD_Grid_500m_Surface_Reflectance:sur_refl_b01', 1, 54894, filename_absolute=1)
 
     ret = tst.testOpen()
-    if ret != 'success':
-        return ret
 
     ds = gdal.Open('HDF4_EOS:EOS_GRID:tmp/cache/MOD09A1.A2010041.h06v03.005.2010051001103.hdf:MOD_Grid_500m_Surface_Reflectance:sur_refl_b01')
 
@@ -286,8 +274,6 @@ def test_hdf4_read_online_8():
     tst = gdaltest.GDALTest('HDF4Image', 'HDF4_EOS:EOS_GRID:tmp/cache/MOD13Q1.A2006161.h21v13.005.2008234103220.hdf:MODIS_Grid_16DAY_250m_500m_VI:250m 16 days NDVI', 1, 53837, filename_absolute=1)
 
     ret = tst.testOpen()
-    if ret != 'success':
-        return ret
 
     ds = gdal.Open('HDF4_EOS:EOS_GRID:tmp/cache/MOD13Q1.A2006161.h21v13.005.2008234103220.hdf:MODIS_Grid_16DAY_250m_500m_VI:250m 16 days NDVI')
 
diff --git a/autotest/gdrivers/aigrid.py b/autotest/gdrivers/aigrid.py
index 09ce6c564407..ba7bbbbe41fd 100755
--- a/autotest/gdrivers/aigrid.py
+++ b/autotest/gdrivers/aigrid.py
@@ -181,8 +181,6 @@ def test_aigrid_online_1():
 
     tst = gdaltest.GDALTest('AIG', 'tmp/cache/nzdem/nzdem500/hdr.adf', 1, 45334, filename_absolute=1)
     ret = tst.testOpen()
-    if ret != 'success':
-        return ret
 
     ds = gdal.Open('tmp/cache/nzdem/nzdem500/hdr.adf')
 
diff --git a/autotest/gdrivers/bag.py b/autotest/gdrivers/bag.py
index 982455194738..cbc4878692e4 100755
--- a/autotest/gdrivers/bag.py
+++ b/autotest/gdrivers/bag.py
@@ -843,8 +843,6 @@ def test_bag_write_two_bands():
     ret = tst.testCreateCopy(quiet_error_handler=False,
                              delete_copy=False,
                              new_filename='/vsimem/out.bag')
-    if ret != 'success':
-        return ret
 
     ds = gdal.Open('/vsimem/out.bag')
     xml = ds.GetMetadata_List('xml:BAG')[0]
diff --git a/autotest/gdrivers/ecw.py b/autotest/gdrivers/ecw.py
index 8e7a8801456d..4f932e51536a 100755
--- a/autotest/gdrivers/ecw.py
+++ b/autotest/gdrivers/ecw.py
@@ -2173,8 +2173,7 @@ def test_ecw_online_1():
     # checksum = 32316 on my PC
     tst = gdaltest.GDALTest('JP2ECW', 'tmp/cache/7sisters200.j2k', 1, None, filename_absolute=1)
 
-    if tst.testOpen() != 'success':
-        return 'fail'
+    tst.testOpen()
 
     ds = gdal.Open('tmp/cache/7sisters200.j2k')
     ds.GetRasterBand(1).Checksum()
@@ -2195,8 +2194,7 @@ def test_ecw_online_2():
     # checksum = 1292 on my PC
     tst = gdaltest.GDALTest('JP2ECW', 'tmp/cache/gcp.jp2', 1, None, filename_absolute=1)
 
-    if tst.testOpen() != 'success':
-        return 'fail'
+    tst.testOpen()
 
     ds = gdal.Open('tmp/cache/gcp.jp2')
     ds.GetRasterBand(1).Checksum()
@@ -2231,8 +2229,7 @@ def ecw_online_3():
     # checksum = 16481 on my PC
     tst = gdaltest.GDALTest('JP2ECW', 'tmp/cache/Bretagne1.j2k', 1, None, filename_absolute=1)
 
-    if tst.testOpen() != 'success':
-        return 'fail'
+    tst.testOpen()
 
     ds = gdal.Open('tmp/cache/Bretagne1.j2k')
     ds_ref = gdal.Open('tmp/cache/Bretagne1.bmp')
@@ -2270,8 +2267,7 @@ def test_ecw_online_4():
     # Checksum = 53054 on my PC
     tst = gdaltest.GDALTest('JP2ECW', 'tmp/cache/Bretagne2.j2k', 1, None, filename_absolute=1)
 
-    if tst.testOpen() != 'success':
-        return 'fail'
+    tst.testOpen()
 
     ds = gdal.Open('tmp/cache/Bretagne2.j2k')
     ds_ref = gdal.Open('tmp/cache/Bretagne2.bmp')
diff --git a/autotest/gdrivers/ers.py b/autotest/gdrivers/ers.py
index 799df323a44c..1b699b344be2 100755
--- a/autotest/gdrivers/ers.py
+++ b/autotest/gdrivers/ers.py
@@ -44,8 +44,7 @@
 def test_ers_1():
 
     tst = gdaltest.GDALTest('ERS', 'srtm.ers', 1, 64074)
-    if tst.testOpen() != 'success':
-        return 'fail'
+    tst.testOpen()
     ds = gdal.Open('data/srtm.ers')
     md = ds.GetRasterBand(1).GetMetadata()
     expected_md = {'STATISTICS_MEAN': '-4020.25', 'STATISTICS_MINIMUM': '-4315', 'STATISTICS_MAXIMUM': '-3744', 'STATISTICS_MEDIAN': '-4000'}
diff --git a/autotest/gdrivers/gif.py b/autotest/gdrivers/gif.py
index 10c379ab38bc..f30b02d82a83 100755
--- a/autotest/gdrivers/gif.py
+++ b/autotest/gdrivers/gif.py
@@ -171,8 +171,7 @@ def test_gif_7():
 
     tst = gdaltest.GDALTest('BIGGIF', 'bug407.gif', 1, 57921)
 
-    if tst.testOpen() != 'success':
-        return 'fail'
+    tst.testOpen()
 
     ds = gdal.Open('data/bug407.gif')
     if ds is None:
diff --git a/autotest/gdrivers/gpkg.py b/autotest/gdrivers/gpkg.py
index 8ec3494198ed..c823855a5572 100755
--- a/autotest/gdrivers/gpkg.py
+++ b/autotest/gdrivers/gpkg.py
@@ -249,8 +249,7 @@ def test_gpkg_1():
         gdaltest.post_reason('fail')
         print('Got %s, expected %s' % (str(got_cs), str(expected_cs)))
         return 'fail'
-    if check_tile_format(out_ds, 'PNG', 2, False) != 'success':
-        return 'fail'
+    check_tile_format(out_ds, 'PNG', 2, False)
 
     # Check that there's no extensions
     out_ds = gdal.Open('/vsimem/tmp.gpkg')
@@ -307,8 +306,7 @@ def test_gpkg_1():
         gdaltest.post_reason('fail')
         print('Got %s, expected %s' % (str(got_cs), str(expected_cs)))
         return 'fail'
-    if check_tile_format(out_ds, 'PNG', 1, False) != 'success':
-        return 'fail'
+    check_tile_format(out_ds, 'PNG', 1, False)
     out_ds = None
 
     gdal.Unlink('/vsimem/tmp.gpkg')
@@ -344,8 +342,7 @@ def test_gpkg_2():
         gdaltest.post_reason('fail')
         print('Got %s, expected %s' % (str(got_cs), str(expected_cs)))
         return 'fail'
-    if check_tile_format(out_ds, 'JPEG', 1, False) != 'success':
-        return 'fail'
+    check_tile_format(out_ds, 'JPEG', 1, False)
 
     # Check that there's no extensions
     out_ds = gdal.Open('/vsimem/tmp.gpkg')
@@ -380,8 +377,7 @@ def test_gpkg_2():
         gdaltest.post_reason('fail')
         print('Got %s, expected %s' % (str(got_cs), str(expected_cs)))
         return 'fail'
-    if check_tile_format(out_ds, 'JPEG', 1, False) != 'success':
-        return 'fail'
+    check_tile_format(out_ds, 'JPEG', 1, False)
 
     # Try deregistering JPEG driver
     gdaltest.jpeg_dr.Deregister()
@@ -463,8 +459,7 @@ def test_gpkg_3():
         expected_band_count = 4
     else:
         expected_band_count = 3
-    if check_tile_format(out_ds, 'WEBP', expected_band_count, False) != 'success':
-        return 'fail'
+    check_tile_format(out_ds, 'WEBP', expected_band_count, False)
 
     out_ds = None
 
@@ -491,8 +486,7 @@ def test_gpkg_3():
         gdaltest.post_reason('fail')
         print('Got %s, expected %s' % (str(got_cs), str(expected_cs)))
         return 'fail'
-    if check_tile_format(out_ds, 'WEBP', 3, False) != 'success':
-        return 'fail'
+    check_tile_format(out_ds, 'WEBP', 3, False)
 
     # Try deregistering WEBP driver
     gdaltest.webp_dr.Deregister()
@@ -584,8 +578,7 @@ def test_gpkg_4(tile_drv_name='PNG'):
         gdaltest.post_reason('fail')
         print('Got %s, expected %s' % (str(got_cs), str(expected_cs)))
         return 'fail'
-    if check_tile_format(out_ds, tile_drv_name, working_bands, False) != 'success':
-        return 'fail'
+    check_tile_format(out_ds, tile_drv_name, working_bands, False)
     out_ds = None
 
     ds = gdal.OpenEx('/vsimem/tmp.gpkg', open_options=['USE_TILE_EXTENT=YES'])
@@ -611,8 +604,7 @@ def test_gpkg_4(tile_drv_name='PNG'):
         gdaltest.post_reason('fail')
         print('Got %s, expected %s' % (str(got_cs), str(expected_cs)))
         return 'fail'
-    if check_tile_format(out_ds, tile_drv_name, 3, False) != 'success':
-        return 'fail'
+    check_tile_format(out_ds, tile_drv_name, 3, False)
     out_ds = None
 
     gdal.Unlink('/vsimem/tmp.gpkg')
@@ -689,8 +681,7 @@ def test_gpkg_7(tile_drv_name='PNG'):
         gdaltest.post_reason('fail')
         print('Got %s, expected %s' % (str(got_cs), str(expected_cs)))
         return 'fail'
-    if check_tile_format(out_ds, tile_drv_name, working_bands, False) != 'success':
-        return 'fail'
+    check_tile_format(out_ds, tile_drv_name, working_bands, False)
     out_ds = None
 
     gdal.Unlink('/vsimem/tmp.gpkg')
@@ -710,8 +701,7 @@ def test_gpkg_7(tile_drv_name='PNG'):
         gdaltest.post_reason('fail')
         print('Got %s, expected %s' % (str(got_cs), str(expected_cs)))
         return 'fail'
-    if check_tile_format(out_ds, tile_drv_name, 3, False) != 'success':
-        return 'fail'
+    check_tile_format(out_ds, tile_drv_name, 3, False)
     out_ds = None
 
     gdal.Unlink('/vsimem/tmp.gpkg')
@@ -731,8 +721,7 @@ def test_gpkg_7(tile_drv_name='PNG'):
         gdaltest.post_reason('fail')
         print('Got %s, expected %s' % (str(got_cs), str(expected_cs)))
         return 'fail'
-    if check_tile_format(out_ds, None, None, None) != 'success':
-        return 'fail'
+    check_tile_format(out_ds, None, None, None)
     out_ds = None
 
     gdal.Unlink('/vsimem/tmp.gpkg')
@@ -801,8 +790,7 @@ def test_gpkg_10():
         gdaltest.post_reason('fail')
         print('Got %s, expected %s' % (str(got_cs), str(expected_cs)))
         return 'fail'
-    if check_tile_format(out_ds, 'PNG', 1, True) != 'success':
-        return 'fail'
+    check_tile_format(out_ds, 'PNG', 1, True)
     got_ct = out_ds.GetRasterBand(1).GetColorTable()
     if got_ct is not None:
         gdaltest.post_reason('fail')
@@ -879,8 +867,7 @@ def test_gpkg_10():
         gdaltest.post_reason('fail')
         print('Got %s, expected %s' % (str(got_cs), str(expected_cs)))
         return 'fail'
-    if check_tile_format(out_ds, 'PNG', 4, False) != 'success':
-        return 'fail'
+    check_tile_format(out_ds, 'PNG', 4, False)
     got_ct = out_ds.GetRasterBand(1).GetColorTable()
     if got_ct is not None:
         gdaltest.post_reason('fail')
@@ -1677,8 +1664,7 @@ def test_gpkg_17():
         gdaltest.post_reason('fail')
         print(got_cs)
         return 'fail'
-    if check_tile_format(out_ds, 'PNG', 1, False, zoom_level=0) != 'success':
-        return 'fail'
+    check_tile_format(out_ds, 'PNG', 1, False, zoom_level=0)
     if out_ds.GetRasterBand(1).GetOverview(0).GetColorTable() is not None:
         gdaltest.post_reason('fail')
         return 'fail'
@@ -1701,8 +1687,7 @@ def test_gpkg_17():
         gdaltest.post_reason('fail')
         print(got_cs)
         return 'fail'
-    if check_tile_format(out_ds, 'PNG', 1, False, zoom_level=0) != 'success':
-        return 'fail'
+    check_tile_format(out_ds, 'PNG', 1, False, zoom_level=0)
     out_ds = None
     gdal.Unlink('/vsimem/tmp.gpkg')
 
@@ -1722,8 +1707,7 @@ def test_gpkg_17():
         gdaltest.post_reason('fail')
         print(got_cs)
         return 'fail'
-    if check_tile_format(out_ds, 'PNG', 3, False, zoom_level=0) != 'success':
-        return 'fail'
+    check_tile_format(out_ds, 'PNG', 3, False, zoom_level=0)
 
     # Check that there's no extensions
     out_ds = gdal.Open('/vsimem/tmp.gpkg')
@@ -1856,10 +1840,8 @@ def test_gpkg_18():
         print(got_cs)
         print(expected_cs_ov1)
         return 'fail'
-    if check_tile_format(out_ds, 'PNG', 3, False, zoom_level=1) != 'success':
-        return 'fail'
-    if check_tile_format(out_ds, 'PNG', 4, False, zoom_level=0) != 'success':
-        return 'fail'
+    check_tile_format(out_ds, 'PNG', 3, False, zoom_level=1)
+    check_tile_format(out_ds, 'PNG', 4, False, zoom_level=0)
     out_ds = None
 
     # Test gpkg_zoom_other extension
@@ -2013,10 +1995,8 @@ def test_gpkg_19():
         print(got_cs)
         print(expected_cs_ov1)
         return 'fail'
-    if check_tile_format(out_ds, 'PNG', 1, True, zoom_level=1) != 'success':
-        return 'fail'
-    if check_tile_format(out_ds, 'PNG', 4, False, zoom_level=0) != 'success':
-        return 'fail'
+    check_tile_format(out_ds, 'PNG', 1, True, zoom_level=1)
+    check_tile_format(out_ds, 'PNG', 4, False, zoom_level=0)
     out_ds = None
     gdal.Unlink('/vsimem/tmp.gpkg')
 
@@ -2049,8 +2029,7 @@ def test_gpkg_20():
         print(got_cs)
         print(expected_cs)
         return 'fail'
-    if check_tile_format(out_ds, 'PNG', 1, True) != 'success':
-        return 'fail'
+    check_tile_format(out_ds, 'PNG', 1, True)
     out_ds = None
     gdal.Unlink('/vsimem/tmp.gpkg')
 
@@ -2068,8 +2047,7 @@ def test_gpkg_20():
         print(got_cs)
         print(expected_cs)
         return 'fail'
-    if check_tile_format(out_ds, 'PNG', 1, True) != 'success':
-        return 'fail'
+    check_tile_format(out_ds, 'PNG', 1, True)
     out_ds = None
     gdal.Unlink('/vsimem/tmp.gpkg')
 
@@ -2087,10 +2065,8 @@ def test_gpkg_20():
         print(got_cs)
         print(expected_cs)
         return 'fail'
-    if check_tile_format(out_ds, 'PNG', 1, True) != 'success':
-        return 'fail'
-    if check_tile_format(out_ds, 'PNG', 4, False, row=0, col=2) != 'success':
-        return 'fail'
+    check_tile_format(out_ds, 'PNG', 1, True)
+    check_tile_format(out_ds, 'PNG', 4, False, row=0, col=2)
     out_ds = None
     gdal.Unlink('/vsimem/tmp.gpkg')
 
@@ -2113,8 +2089,7 @@ def test_gpkg_20():
         print(got_cs)
         print(expected_cs)
         return 'fail'
-    if check_tile_format(out_ds, 'PNG', 1, True) != 'success':
-        return 'fail'
+    check_tile_format(out_ds, 'PNG', 1, True)
     out_ds = None
     out_ds = gdal.OpenEx('/vsimem/tmp.gpkg', gdal.OF_RASTER, open_options=['BAND_COUNT=1'])
     if out_ds.GetRasterBand(1).GetColorTable().GetCount() != 1:
@@ -2801,8 +2776,7 @@ def test_gpkg_31():
     gdal.SetConfigOption('GPKG_PNG_SUPPORTS_2BANDS', None)
 
     ds = gdal.Open('/vsimem/tmp.gpkg')
-    if check_tile_format(ds, 'PNG', 4, False) != 'success':
-        return 'fail'
+    check_tile_format(ds, 'PNG', 4, False)
     expected_cs = [4672, 4672, 4672, 4873]
     got_cs = [ds.GetRasterBand(i + 1).Checksum() for i in range(4)]
     if got_cs != expected_cs:
@@ -2832,8 +2806,7 @@ def test_gpkg_32():
     gdal.SetConfigOption('GPKG_PNG_SUPPORTS_2BANDS', None)
 
     ds = gdal.Open('/vsimem/tmp.gpkg')
-    if check_tile_format(ds, 'PNG', 4, False) != 'success':
-        return 'fail'
+    check_tile_format(ds, 'PNG', 4, False)
     expected_cs = [1970, 1970, 1970, 10807]
     got_cs = [ds.GetRasterBand(i + 1).Checksum() for i in range(ds.RasterCount)]
     if got_cs != expected_cs:
@@ -2873,8 +2846,7 @@ def test_gpkg_33():
     gdal.Unlink(src_ds.GetDescription())
 
     ds = gdal.Open('/vsimem/tmp.gpkg')
-    if check_tile_format(ds, 'PNG', 4, False) != 'success':
-        return 'fail'
+    check_tile_format(ds, 'PNG', 4, False)
     expected_cs = [10991, 57677, 34965, 10638]
     got_cs = [ds.GetRasterBand(i + 1).Checksum() for i in range(4)]
     if got_cs != expected_cs:
diff --git a/autotest/gdrivers/ignfheightasciigrid.py b/autotest/gdrivers/ignfheightasciigrid.py
index afe0b67d31b8..386b38965d59 100755
--- a/autotest/gdrivers/ignfheightasciigrid.py
+++ b/autotest/gdrivers/ignfheightasciigrid.py
@@ -181,8 +181,7 @@ def test_ignfheightasciigrid_gra():
     tst = gdaltest.GDALTest(
         'IGNFHeightASCIIGrid', 'ignfheightasciigrid.gra', 1, 21)
     gt = (-152.125, 0.25, 0.0, -16.375, 0.0, -0.25)
-    if tst.testOpen(check_gt=gt, check_prj='WGS84') != 'success':
-        return 'fail'
+    tst.testOpen(check_gt=gt, check_prj='WGS84')
 
     ds = gdal.OpenEx('data/ignfheightasciigrid.gra', gdal.OF_RASTER)
     if ds.GetRasterBand(1).GetNoDataValue() != 9999:
diff --git a/autotest/gdrivers/ingr.py b/autotest/gdrivers/ingr.py
index 5407420332a0..d2ad420dfd66 100755
--- a/autotest/gdrivers/ingr.py
+++ b/autotest/gdrivers/ingr.py
@@ -63,8 +63,6 @@ def test_ingr_3():
 
     tst = gdaltest.GDALTest('INGR', '8bit_pal.cot', 1, 4855)
     result = tst.testOpen()
-    if result != 'success':
-        return result
 
     ds = gdal.Open('data/8bit_pal.cot')
     ct = ds.GetRasterBand(1).GetRasterColorTable()
diff --git a/autotest/gdrivers/isis.py b/autotest/gdrivers/isis.py
index 5887ffdf8df2..f7308f9d1de0 100755
--- a/autotest/gdrivers/isis.py
+++ b/autotest/gdrivers/isis.py
@@ -118,8 +118,6 @@ def test_isis_4():
     tst = gdaltest.GDALTest('ISIS3', 'isis3_detached.lbl', 1, 9978)
     ret = tst.testCreateCopy(new_filename='/vsimem/isis_tmp.lbl',
                              delete_copy=0)
-    if ret != 'success':
-        return ret
     ds = gdal.Open('/vsimem/isis_tmp.lbl')
     if ds.GetMetadataDomainList() != ['', 'json:ISIS3']:
         gdaltest.post_reason('fail')
@@ -151,8 +149,6 @@ def test_isis_4():
                             options=['USE_SRC_MAPPING=YES'])
     ret = tst.testCreateCopy(new_filename='/vsimem/isis_tmp.lbl',
                              delete_copy=0)
-    if ret != 'success':
-        return ret
     ds = gdal.Open('/vsimem/isis_tmp.lbl')
     lbl = ds.GetMetadata_List('json:ISIS3')[0]
     if lbl.find('PositiveWest') < 0:
@@ -174,8 +170,6 @@ def test_isis_4():
                                      'TARGET_NAME=my_label'])
     ret = tst.testCreateCopy(new_filename='/vsimem/isis_tmp.lbl',
                              delete_copy=0)
-    if ret != 'success':
-        return ret
     ds = gdal.Open('/vsimem/isis_tmp.lbl')
     lbl = ds.GetMetadata_List('json:ISIS3')[0]
     if lbl.find('PositiveEast') < 0:
@@ -205,8 +199,6 @@ def test_isis_5():
                                      'WRITE_BOUNDING_DEGREES=NO'])
     ret = tst.testCreateCopy(new_filename='/vsimem/isis_tmp.lbl',
                              delete_copy=0)
-    if ret != 'success':
-        return ret
     if gdal.VSIStatL('/vsimem/isis_tmp.cub') is not None:
         gdaltest.post_reason('fail')
         return 'fail'
@@ -231,8 +223,6 @@ def test_isis_6():
                                      'COMMENT=my comment'])
     ret = tst.testCreateCopy(new_filename='/vsimem/isis_tmp.lbl',
                              delete_copy=0)
-    if ret != 'success':
-        return ret
     if gdal.VSIStatL('/vsimem/isis_tmp.cub') is None:
         gdaltest.post_reason('fail')
         return 'fail'
@@ -267,8 +257,6 @@ def test_isis_7():
                                      'USE_SRC_LABEL=NO'])
     ret = tst.testCreateCopy(new_filename='/vsimem/isis_tmp.lbl',
                              delete_copy=0)
-    if ret != 'success':
-        return ret
     if gdal.VSIStatL('/vsimem/isis_tmp.tif') is None:
         gdaltest.post_reason('fail')
         return 'fail'
@@ -288,8 +276,6 @@ def test_isis_7():
                                      'USE_SRC_LABEL=NO'])
     ret = tst.testCreateCopy(new_filename='/vsimem/isis_tmp.lbl',
                              delete_copy=0)
-    if ret != 'success':
-        return ret
     if gdal.VSIStatL('/vsimem/isis_tmp.tif') is None:
         gdaltest.post_reason('fail')
         return 'fail'
@@ -315,8 +301,6 @@ def test_isis_8():
                                      'GEOTIFF_OPTIONS=COMPRESS=LZW'])
     ret = tst.testCreateCopy(new_filename='/vsimem/isis_tmp.lbl',
                              delete_copy=0)
-    if ret != 'success':
-        return ret
     if gdal.VSIStatL('/vsimem/isis_tmp.tif') is None:
         gdaltest.post_reason('fail')
         return 'fail'
@@ -350,8 +334,6 @@ def test_isis_9():
                                      'EXTERNAL_FILENAME=/vsimem/foo.bin'])
     ret = tst.testCreateCopy(new_filename='/vsimem/isis_tmp.lbl',
                              delete_copy=0)
-    if ret != 'success':
-        return ret
     if gdal.VSIStatL('/vsimem/foo.bin') is None:
         gdaltest.post_reason('fail')
         return 'fail'
@@ -382,8 +364,6 @@ def test_isis_10():
                                      'EXTERNAL_FILENAME=/vsimem/foo.tif'])
     ret = tst.testCreateCopy(new_filename='/vsimem/isis_tmp.lbl',
                              delete_copy=0)
-    if ret != 'success':
-        return ret
     ds = gdal.Open('/vsimem/foo.tif')
     if ds.GetRasterBand(1).GetBlockSize() != [16, 32]:
         gdaltest.post_reason('fail')
@@ -408,8 +388,6 @@ def test_isis_11():
                                      'GEOTIFF_OPTIONS=COMPRESS=LZW'])
     ret = tst.testCreateCopy(new_filename='/vsimem/isis_tmp.lbl',
                              delete_copy=0)
-    if ret != 'success':
-        return ret
     ds = gdal.Open('/vsimem/isis_tmp.tif')
     if ds.GetRasterBand(1).GetBlockSize() != [256, 256]:
         gdaltest.post_reason('fail')
diff --git a/autotest/gdrivers/jp2lura.py b/autotest/gdrivers/jp2lura.py
index a584baf4295c..ecf612136efd 100755
--- a/autotest/gdrivers/jp2lura.py
+++ b/autotest/gdrivers/jp2lura.py
@@ -315,8 +315,7 @@ def test_jp2lura_6():
 
     tst = gdaltest.GDALTest('JP2Lura', 'll.jp2', 1, None)
 
-    if tst.testOpen() != 'success':
-        return 'fail'
+    tst.testOpen()
 
     ds = gdal.Open('data/ll.jp2')
     ds.GetRasterBand(1).Checksum()
@@ -1935,8 +1934,7 @@ def test_jp2lura_online_1():
     # Checksum = 32669 on my PC
     tst = gdaltest.GDALTest('JP2Lura', 'tmp/cache/7sisters200.j2k', 1, None, filename_absolute=1)
 
-    if tst.testOpen() != 'success':
-        return 'fail'
+    tst.testOpen()
 
     ds = gdal.Open('tmp/cache/7sisters200.j2k')
     ds.GetRasterBand(1).Checksum()
@@ -1958,8 +1956,7 @@ def test_jp2lura_online_2():
     # Checksum = 15621 on my PC
     tst = gdaltest.GDALTest('JP2Lura', 'tmp/cache/gcp.jp2', 1, None, filename_absolute=1)
 
-    if tst.testOpen() != 'success':
-        return 'fail'
+    tst.testOpen()
 
     ds = gdal.Open('tmp/cache/gcp.jp2')
     ds.GetRasterBand(1).Checksum()
@@ -1991,8 +1988,7 @@ def test_jp2lura_online_3():
 
     tst = gdaltest.GDALTest('JP2Lura', 'tmp/cache/Bretagne1.j2k', 1, None, filename_absolute=1)
 
-    if tst.testOpen() != 'success':
-        return 'fail'
+    tst.testOpen()
 
     ds = gdal.Open('tmp/cache/Bretagne1.j2k')
     ds_ref = gdal.Open('tmp/cache/Bretagne1.bmp')
@@ -2025,8 +2021,7 @@ def test_jp2lura_online_4():
 
     tst = gdaltest.GDALTest('JP2Lura', 'tmp/cache/Bretagne2.j2k', 1, None, filename_absolute=1)
 
-    if tst.testOpen() != 'success':
-        return 'expected_fail'
+    tst.testOpen()
 
     ds = gdal.Open('tmp/cache/Bretagne2.j2k')
     ds_ref = gdal.Open('tmp/cache/Bretagne2.bmp')
diff --git a/autotest/gdrivers/jp2openjpeg.py b/autotest/gdrivers/jp2openjpeg.py
index b0e931fe03a9..29ace11c0e6e 100755
--- a/autotest/gdrivers/jp2openjpeg.py
+++ b/autotest/gdrivers/jp2openjpeg.py
@@ -219,8 +219,7 @@ def test_jp2openjpeg_6():
 
     tst = gdaltest.GDALTest('JP2OpenJPEG', 'll.jp2', 1, None)
 
-    if tst.testOpen() != 'success':
-        return 'fail'
+    tst.testOpen()
 
     ds = gdal.Open('data/ll.jp2')
     ds.GetRasterBand(1).Checksum()
@@ -3365,8 +3364,7 @@ def test_jp2openjpeg_online_1():
     # Checksum = 32669 on my PC
     tst = gdaltest.GDALTest('JP2OpenJPEG', 'tmp/cache/7sisters200.j2k', 1, None, filename_absolute=1)
 
-    if tst.testOpen() != 'success':
-        return 'fail'
+    tst.testOpen()
 
     ds = gdal.Open('tmp/cache/7sisters200.j2k')
     ds.GetRasterBand(1).Checksum()
@@ -3388,8 +3386,7 @@ def test_jp2openjpeg_online_2():
     # Checksum = 15621 on my PC
     tst = gdaltest.GDALTest('JP2OpenJPEG', 'tmp/cache/gcp.jp2', 1, None, filename_absolute=1)
 
-    if tst.testOpen() != 'success':
-        return 'fail'
+    tst.testOpen()
 
     ds = gdal.Open('tmp/cache/gcp.jp2')
     ds.GetRasterBand(1).Checksum()
@@ -3421,8 +3418,7 @@ def test_jp2openjpeg_online_3():
 
     tst = gdaltest.GDALTest('JP2OpenJPEG', 'tmp/cache/Bretagne1.j2k', 1, None, filename_absolute=1)
 
-    if tst.testOpen() != 'success':
-        return 'fail'
+    tst.testOpen()
 
     ds = gdal.Open('tmp/cache/Bretagne1.j2k')
     ds_ref = gdal.Open('tmp/cache/Bretagne1.bmp')
@@ -3455,8 +3451,7 @@ def test_jp2openjpeg_online_4():
 
     tst = gdaltest.GDALTest('JP2OpenJPEG', 'tmp/cache/Bretagne2.j2k', 1, None, filename_absolute=1)
 
-    if tst.testOpen() != 'success':
-        return 'expected_fail'
+    tst.testOpen()
 
     ds = gdal.Open('tmp/cache/Bretagne2.j2k')
     ds_ref = gdal.Open('tmp/cache/Bretagne2.bmp')
diff --git a/autotest/gdrivers/jpeg2000.py b/autotest/gdrivers/jpeg2000.py
index f357668eba81..4f9554e30c3b 100755
--- a/autotest/gdrivers/jpeg2000.py
+++ b/autotest/gdrivers/jpeg2000.py
@@ -140,8 +140,7 @@ def test_jpeg2000_4():
         return 'skip'
 
     tst = gdaltest.GDALTest('JPEG2000', 'byte.jp2', 1, 50054)
-    if tst.testCreateCopy() != 'success':
-        return 'fail'
+    tst.testCreateCopy()
 
     # This may fail for a good reason
     if tst.testCreateCopy(check_gt=1, check_srs=1) != 'success':
@@ -173,8 +172,7 @@ def test_jpeg2000_6():
 
     tst = gdaltest.GDALTest('JPEG2000', 'll.jp2', 1, None)
 
-    if tst.testOpen() != 'success':
-        return 'fail'
+    tst.testOpen()
 
     ds = gdal.Open('data/ll.jp2')
     ds.GetRasterBand(1).Checksum()
@@ -342,8 +340,7 @@ def test_jpeg2000_online_1():
     # Checksum = 32669 on my PC
     tst = gdaltest.GDALTest('JPEG2000', 'tmp/cache/7sisters200.j2k', 1, None, filename_absolute=1)
 
-    if tst.testOpen() != 'success':
-        return 'fail'
+    tst.testOpen()
 
     ds = gdal.Open('tmp/cache/7sisters200.j2k')
     ds.GetRasterBand(1).Checksum()
@@ -365,8 +362,7 @@ def test_jpeg2000_online_2():
     # Checksum = 15621 on my PC
     tst = gdaltest.GDALTest('JPEG2000', 'tmp/cache/gcp.jp2', 1, None, filename_absolute=1)
 
-    if tst.testOpen() != 'success':
-        return 'fail'
+    tst.testOpen()
 
     ds = gdal.Open('tmp/cache/gcp.jp2')
     ds.GetRasterBand(1).Checksum()
@@ -399,8 +395,7 @@ def test_jpeg2000_online_3():
     # Checksum = 14443 on my PC
     tst = gdaltest.GDALTest('JPEG2000', 'tmp/cache/Bretagne1.j2k', 1, None, filename_absolute=1)
 
-    if tst.testOpen() != 'success':
-        return 'fail'
+    tst.testOpen()
 
     ds = gdal.Open('tmp/cache/Bretagne1.j2k')
     ds_ref = gdal.Open('tmp/cache/Bretagne1.bmp')
diff --git a/autotest/gdrivers/kea.py b/autotest/gdrivers/kea.py
index 25990fc5f6f8..c1dacc0e3fe7 100755
--- a/autotest/gdrivers/kea.py
+++ b/autotest/gdrivers/kea.py
@@ -73,8 +73,6 @@ def test_kea_2():
     for src_file in src_files:
         tst = gdaltest.GDALTest('KEA', src_file, 1, 4672)
         ret = tst.testCreateCopy(check_minmax=1)
-        if ret != 'success':
-            return ret
 
     return 'success'
 
@@ -97,8 +95,6 @@ def test_kea_3():
     for src_file in src_files:
         tst = gdaltest.GDALTest('KEA', src_file, 1, 4672)
         ret = tst.testCreate(out_bands=1, check_minmax=1)
-        if ret != 'success':
-            return ret
 
     return 'success'
 
diff --git a/autotest/gdrivers/mrsid.py b/autotest/gdrivers/mrsid.py
index 2b4b8e9459eb..fa711eeff193 100755
--- a/autotest/gdrivers/mrsid.py
+++ b/autotest/gdrivers/mrsid.py
@@ -115,9 +115,6 @@ def test_mrsid_1():
                        check_stat=(0.0, 255.0, 103.319, 55.153),
                        check_approx_stat=(2.0, 243.0, 103.131, 43.978))
 
-    if ret != 'success':
-        return ret
-
     ds = gdal.Open('data/mercator.sid')
     got_prj = ds.GetProjectionRef()
     ds = None
@@ -459,8 +456,7 @@ def test_mrsid_online_1():
     # Checksum = 29473 on my PC
     tst = gdaltest.GDALTest('JP2MrSID', 'tmp/cache/7sisters200.j2k', 1, None, filename_absolute=1)
 
-    if tst.testOpen() != 'success':
-        return 'fail'
+    tst.testOpen()
 
     ds = gdal.Open('tmp/cache/7sisters200.j2k')
     ds.GetRasterBand(1).Checksum()
@@ -482,8 +478,7 @@ def test_mrsid_online_2():
     # Checksum = 209 on my PC
     tst = gdaltest.GDALTest('JP2MrSID', 'tmp/cache/gcp.jp2', 1, None, filename_absolute=1)
 
-    if tst.testOpen() != 'success':
-        return 'fail'
+    tst.testOpen()
 
     # The JP2MrSID driver doesn't handle GCPs
     ds = gdal.Open('tmp/cache/gcp.jp2')
@@ -517,8 +512,7 @@ def test_mrsid_online_3():
     # checksum = 14443 on my PC
     tst = gdaltest.GDALTest('JP2MrSID', 'tmp/cache/Bretagne1.j2k', 1, None, filename_absolute=1)
 
-    if tst.testOpen() != 'success':
-        return 'fail'
+    tst.testOpen()
 
     ds = gdal.Open('tmp/cache/Bretagne1.j2k')
     ds_ref = gdal.Open('tmp/cache/Bretagne1.bmp')
@@ -554,8 +548,7 @@ def test_mrsid_online_4():
     # Checksum = 53186 on my PC
     tst = gdaltest.GDALTest('JP2MrSID', 'tmp/cache/Bretagne2.j2k', 1, None, filename_absolute=1)
 
-    if tst.testOpen() != 'success':
-        return 'fail'
+    tst.testOpen()
 
     ds = gdal.Open('tmp/cache/Bretagne2.j2k')
     ds_ref = gdal.Open('tmp/cache/Bretagne2.bmp')
diff --git a/autotest/gdrivers/netcdf.py b/autotest/gdrivers/netcdf.py
index fac78514b745..f15dcdeef784 100755
--- a/autotest/gdrivers/netcdf.py
+++ b/autotest/gdrivers/netcdf.py
@@ -333,9 +333,6 @@ def test_netcdf_2():
 
     result = tst.testOpen(check_prj=wkt)
 
-    if result != 'success':
-        return result
-
     # Test that in raster-only mode, update isn't supported (not sure what would be missing for that...)
     with gdaltest.error_handler():
         ds = gdal.Open('tmp/netcdf2.nc', gdal.GA_Update)
@@ -1013,8 +1010,6 @@ def test_netcdf_25():
         return 'skip'
 
     result = netcdf_test_copy('data/nc_vars.nc', 1, None, 'tmp/netcdf_25.nc')
-    if result != 'success':
-        return result
 
     vals_global = {'NC_GLOBAL#test': 'testval',
                    'NC_GLOBAL#valid_range_i': '0,255',
@@ -1042,8 +1037,6 @@ def netcdf_25_nc4():
         return 'skip'
 
     result = netcdf_test_copy('data/nc4_vars.nc', 1, None, 'tmp/netcdf_25_nc4.nc', ['FORMAT=NC4'])
-    if result != 'success':
-        return result
 
     vals_global = {'NC_GLOBAL#test': 'testval',
                    'NC_GLOBAL#test_string': 'testval_string',
@@ -1203,8 +1196,6 @@ def test_netcdf_28():
 
     # copy file
     result = netcdf_test_copy(ifile, 0, None, ofile)
-    if result != 'success':
-        return 'fail'
 
     # test file
     return netcdf_test_4dfile(ofile)
@@ -1247,8 +1238,6 @@ def test_netcdf_29():
 
     # copy vrt to netcdf, with proper dimension rolling
     result = netcdf_test_copy(ofile1, 0, None, ofile)
-    if result != 'success':
-        return 'fail'
 
     # test file
     result = netcdf_test_4dfile(ofile)
@@ -1321,11 +1310,7 @@ def test_netcdf_32():
 
     # test basic read/write
     result = netcdf_test_copy(ifile, 1, 4672, ofile, ['FORMAT=NC4'])
-    if result != 'success':
-        return 'fail'
     result = netcdf_test_copy(ifile, 1, 4672, ofile, ['FORMAT=NC4C'])
-    if result != 'success':
-        return 'fail'
 
     return 'success'
 
@@ -1342,8 +1327,6 @@ def test_netcdf_33():
     ofile = 'tmp/netcdf_33.nc'
 
     result = netcdf_test_copy(ifile, 1, None, ofile, ['FORMAT=NC4'])
-    if result != 'success':
-        return result
 
     return netcdf_check_vars('tmp/netcdf_33.nc')
 
@@ -1411,8 +1394,6 @@ def test_netcdf_35():
 
     # copy file
     result = netcdf_test_copy(ifile, 0, None, ofile)
-    if result != 'success':
-        return 'fail'
 
     # test long metadata is copied correctly
     ds = gdal.Open(ofile)
@@ -2073,9 +2054,6 @@ def test_netcdf_51():
     if netcdf_cf.netcdf_cf_setup() == 'success' and \
        gdaltest.netcdf_cf_method is not None:
         result_cf = netcdf_cf.netcdf_cf_check_file('tmp/netcdf_51.nc', 'auto', False)
-        if result_cf != 'success':
-            gdaltest.post_reason('failure')
-            return 'fail'
 
     gdal.Unlink('tmp/netcdf_51.nc')
     gdal.Unlink('tmp/netcdf_51.csv')
@@ -2208,9 +2186,6 @@ def test_netcdf_52():
     if netcdf_cf.netcdf_cf_setup() == 'success' and \
        gdaltest.netcdf_cf_method is not None:
         result_cf = netcdf_cf.netcdf_cf_check_file('tmp/netcdf_52.nc', 'auto', False)
-        if result_cf != 'success':
-            gdaltest.post_reason('failure')
-            return 'fail'
 
     gdal.Unlink('tmp/netcdf_52.nc')
     gdal.Unlink('tmp/netcdf_52.csv')
@@ -2665,9 +2640,6 @@ def test_netcdf_62_cf_check():
     if netcdf_cf.netcdf_cf_setup() == 'success' and \
        gdaltest.netcdf_cf_method is not None:
         result_cf = netcdf_cf.netcdf_cf_check_file('tmp/netcdf_62.nc', 'auto', False)
-        if result_cf != 'success':
-            gdaltest.post_reason('failure')
-            return 'fail'
 
     gdal.Unlink('/vsimem/netcdf_62.nc')
 
diff --git a/autotest/gdrivers/nitf.py b/autotest/gdrivers/nitf.py
index 7fe2659b61ab..ec573c9b8cf9 100755
--- a/autotest/gdrivers/nitf.py
+++ b/autotest/gdrivers/nitf.py
@@ -558,8 +558,7 @@ def test_nitf_26():
 
 def test_nitf_27():
 
-    if nitf_create(['ICORDS=G', 'IC=NC', 'BLOCKXSIZE=10', 'BLOCKYSIZE=10']) != 'success':
-        return 'fail'
+    nitf_create(['ICORDS=G', 'IC=NC', 'BLOCKXSIZE=10', 'BLOCKYSIZE=10'])
 
     return nitf_check_created_file(32498, 42602, 38982)
 
@@ -872,10 +871,9 @@ def test_nitf_30():
 
 def test_nitf_31():
 
-    if nitf_create(['TRE=CUSTOM= Test TRE1\\0MORE',
+    nitf_create(['TRE=CUSTOM= Test TRE1\\0MORE',
                     'TRE=TOTEST=SecondTRE',
-                    'ICORDS=G']) != 'success':
-        return 'fail'
+                    'ICORDS=G'])
 
     ds = gdal.Open('tmp/test_create.ntf')
 
@@ -909,8 +907,7 @@ def test_nitf_31():
 
 def test_nitf_32():
 
-    if nitf_create(['ICORDS=D']) != 'success':
-        return 'fail'
+    nitf_create(['ICORDS=D'])
 
     return nitf_check_created_file(32498, 42602, 38982)
 
@@ -920,15 +917,14 @@ def test_nitf_32():
 
 def test_nitf_33():
 
-    if nitf_create(['ICORDS=D',
+    nitf_create(['ICORDS=D',
                     'BLOCKA_BLOCK_COUNT=01',
                     'BLOCKA_BLOCK_INSTANCE_01=01',
                     'BLOCKA_L_LINES_01=100',
                     'BLOCKA_FRLC_LOC_01=+29.950000+119.950000',
                     'BLOCKA_LRLC_LOC_01=+20.050000+119.950000',
                     'BLOCKA_LRFC_LOC_01=+20.050000+100.050000',
-                    'BLOCKA_FRFC_LOC_01=+29.950000+100.050000']) != 'success':
-        return 'fail'
+                    'BLOCKA_FRFC_LOC_01=+29.950000+100.050000'])
 
     return nitf_check_created_file(32498, 42602, 38982)
 
@@ -3771,8 +3767,6 @@ def test_nitf_online_25():
     tst = gdaltest.GDALTest('NITF', 'tmp/cache/Case1_HRE10G324642N1170747W_Uxx.hr5', 1, 7099, filename_absolute=1)
 
     ret = tst.testOpen()
-    if ret != 'success':
-        return ret
 
     ds = gdal.Open('tmp/cache/Case1_HRE10G324642N1170747W_Uxx.hr5')
     xml_tre = ds.GetMetadata('xml:TRE')[0]
diff --git a/autotest/gdrivers/pds.py b/autotest/gdrivers/pds.py
index 62637acf5b26..71356bcdbf06 100755
--- a/autotest/gdrivers/pds.py
+++ b/autotest/gdrivers/pds.py
@@ -77,8 +77,6 @@ def test_pds_2():
                        check_gt=expected_gt)
     gdal.SetConfigOption('PDS_SampleProjOffset_Shift', None)
     gdal.SetConfigOption('PDS_LineProjOffset_Shift', None)
-    if ret != 'success':
-        return 'fail'
 
     ds = gdal.Open('data/fl73n003_truncated.img')
     if ds.GetRasterBand(1).GetNoDataValue() != 7:
@@ -108,8 +106,7 @@ def test_pds_3():
     tst = gdaltest.GDALTest('PDS', 'EN0001426030M_truncated.IMG', 1, 1367)
 
     gt_expected = (0, 1, 0, 0, 0, 1)
-    if tst.testOpen(check_gt=gt_expected) != 'success':
-        return 'fail'
+    tst.testOpen(check_gt=gt_expected)
 
     ds = gdal.Open('data/EN0001426030M_truncated.IMG')
     if ds.GetRasterBand(1).GetNoDataValue() != 0:
@@ -162,8 +159,6 @@ def test_pds_6():
     ret = tst.testOpen(check_gt=gt_expected)
     gdal.SetConfigOption('PDS_SampleProjOffset_Shift', None)
     gdal.SetConfigOption('PDS_LineProjOffset_Shift', None)
-    if ret != 'success':
-        return 'fail'
 
     ds = gdal.Open('data/ESP_013951_1955_RED.LBL')
 
@@ -210,8 +205,6 @@ def test_pds_7():
                        check_gt=gt_expected)
     gdal.SetConfigOption('PDS_SampleProjOffset_Shift', None)
     gdal.SetConfigOption('PDS_LineProjOffset_Shift', None)
-    if ret != 'success':
-        return 'fail'
 
     return 'success'
 
@@ -252,8 +245,7 @@ def test_pds_9():
     # Derived from http://pdsimage.wr.usgs.gov/data/co-v_e_j_s-radar-3-sbdr-v1.0/CORADR_0035/DATA/BIDR/BIEQI49N071_D035_T00AS01_V02.LBL
     tst = gdaltest.GDALTest('PDS', 'PDS_WITH_ZIP_IMG.LBL', 1, 0)
 
-    if tst.testOpen() != 'success':
-        return 'fail'
+    tst.testOpen()
 
     ds = gdal.Open('data/PDS_WITH_ZIP_IMG.LBL')
     got_nd = ds.GetRasterBand(1).GetNoDataValue()
diff --git a/autotest/gdrivers/rmf.py b/autotest/gdrivers/rmf.py
index 4922b2f26d25..2fbf4a16a540 100755
--- a/autotest/gdrivers/rmf.py
+++ b/autotest/gdrivers/rmf.py
@@ -65,14 +65,10 @@ def test_rmf_4():
     tst = gdaltest.GDALTest('rmf', 'rgbsmall.rsw', 1, 21212)
     ret = tst.testOpen(check_gt=(-44.840320, 0.003432, 0,
                                  -22.932584, 0, -0.003432))
-    if ret != 'success':
-        return 'fail'
 
     tst = gdaltest.GDALTest('rmf', 'rgbsmall.rsw', 2, 21053)
     ret = tst.testOpen(check_gt=(-44.840320, 0.003432, 0,
                                  -22.932584, 0, -0.003432))
-    if ret != 'success':
-        return 'fail'
 
     tst = gdaltest.GDALTest('rmf', 'rgbsmall.rsw', 3, 21349)
     return tst.testOpen(check_gt=(-44.840320, 0.003432, 0,
@@ -85,16 +81,12 @@ def test_rmf_5():
     with gdaltest.error_handler():
         ret = tst.testOpen()
 
-    if ret != 'success':
-        return 'fail'
-
+    
     tst = gdaltest.GDALTest('rmf', 'rgbsmall-lzw.rsw', 2, 41429)
     with gdaltest.error_handler():
         ret = tst.testOpen()
 
-    if ret != 'success':
-        return 'fail'
-
+    
     tst = gdaltest.GDALTest('rmf', 'rgbsmall-lzw.rsw', 3, 40238)
     with gdaltest.error_handler():
         return tst.testOpen()
@@ -105,15 +97,11 @@ def test_rmf_6():
     tst = gdaltest.GDALTest('rmf', 'big-endian.rsw', 1, 7782)
     with gdaltest.error_handler():
         ret = tst.testOpen()
-    if ret != 'success':
-        return 'fail'
-
+    
     tst = gdaltest.GDALTest('rmf', 'big-endian.rsw', 2, 8480)
     with gdaltest.error_handler():
         ret = tst.testOpen()
-    if ret != 'success':
-        return 'fail'
-
+    
     tst = gdaltest.GDALTest('rmf', 'big-endian.rsw', 3, 4195)
     with gdaltest.error_handler():
         return tst.testOpen()
diff --git a/autotest/gdrivers/rraster.py b/autotest/gdrivers/rraster.py
index 01669dd662db..40ecec87f809 100755
--- a/autotest/gdrivers/rraster.py
+++ b/autotest/gdrivers/rraster.py
@@ -51,8 +51,6 @@ def test_rraster_1(filename='data/byte_rraster.grd', check_prj=None):
                        check_gt=ref_ds.GetGeoTransform(),
                        check_min=74,
                        check_max=255)
-    if ret != 'success':
-        return ret
 
     ds = gdal.Open(filename)
     md = ds.GetMetadata()
diff --git a/autotest/gdrivers/saga.py b/autotest/gdrivers/saga.py
index 979c953b9885..0917b53a358e 100755
--- a/autotest/gdrivers/saga.py
+++ b/autotest/gdrivers/saga.py
@@ -96,8 +96,6 @@ def test_saga_4():
         else:
             check_minmax = 1
         ret = tst.testCreateCopy(new_filename='tmp/test4.sdat', check_minmax=check_minmax)
-        if ret != 'success':
-            return ret
 
     return 'success'
 
@@ -122,8 +120,6 @@ def test_saga_5():
         else:
             check_minmax = 1
         ret = tst.testCreate(new_filename='tmp/test5.sdat', out_bands=1, check_minmax=check_minmax)
-        if ret != 'success':
-            return ret
 
     return 'success'
 
diff --git a/autotest/gdrivers/sdts.py b/autotest/gdrivers/sdts.py
index 0c11b17f6c18..f0ab691f0144 100755
--- a/autotest/gdrivers/sdts.py
+++ b/autotest/gdrivers/sdts.py
@@ -46,10 +46,9 @@ def test_sdts_1():
     srs = osr.SpatialReference()
     srs.SetWellKnownGeogCS('NAD27')
     srs.SetUTM(16)
-    if tst.testOpen(check_prj=srs.ExportToWkt(),
+    tst.testOpen(check_prj=srs.ExportToWkt(),
                     check_gt=(666015, 30, 0, 5040735, 0, -30),
-                    check_filelist=False) != 'success':
-        return 'fail'
+                    check_filelist=False)
 
     ds = gdal.Open('data/STDS_1107834_truncated/1107CATD.DDF')
     md = ds.GetMetadata()
diff --git a/autotest/gdrivers/srp.py b/autotest/gdrivers/srp.py
index e0b94cb2297a..d034266fe66a 100755
--- a/autotest/gdrivers/srp.py
+++ b/autotest/gdrivers/srp.py
@@ -48,8 +48,6 @@ def test_srp_1(filename='USRP_PCB0/FKUSRP01.IMG'):
 
     tst = gdaltest.GDALTest('SRP', filename, 1, 24576)
     ret = tst.testOpen(check_prj=srs.ExportToWkt(), check_gt=(500000.0, 5.0, 0.0, 5000000.0, 0.0, -5.0))
-    if ret != 'success':
-        return ret
 
     ds = gdal.Open('data/' + filename)
     if ds.GetRasterBand(1).GetColorInterpretation() != gdal.GCI_PaletteIndex:
diff --git a/autotest/gdrivers/vicar.py b/autotest/gdrivers/vicar.py
index cc7fc73027c2..4f34ac92d57d 100755
--- a/autotest/gdrivers/vicar.py
+++ b/autotest/gdrivers/vicar.py
@@ -52,9 +52,7 @@ def test_vicar_1():
     PARAMETER["longitude_of_center",137],
     PARAMETER["false_easting",0],
     PARAMETER["false_northing",0]]"""
-    if tst.testOpen(check_prj=expected_prj, skip_checksum=True) != 'success':
-        gdaltest.post_reason('fail')
-        return 'fail'
+    tst.testOpen(check_prj=expected_prj, skip_checksum=True)
 
     ds = gdal.Open('data/test_vicar_truncated.bin')
     expected_gt = (-53985.0, 25.0, 0.0, -200805.0, 0.0, -25.0)
diff --git a/autotest/ogr/ogr_bna.py b/autotest/ogr/ogr_bna.py
index f13372efbd25..2fa0c6e4c552 100755
--- a/autotest/ogr/ogr_bna.py
+++ b/autotest/ogr/ogr_bna.py
@@ -205,8 +205,7 @@ def ogr_bna_write(creation_options):
     for layer_name in ['points', 'lines', 'polygons', 'ellipses']:
         src_lyr = gdaltest.bna_ds.GetLayerByName('test_' + layer_name)
         dst_lyr = output_ds.GetLayerByName('out_' + layer_name)
-        if ogr_bna_check_content(src_lyr, dst_lyr) != 'success':
-            return 'fail'
+        ogr_bna_check_content(src_lyr, dst_lyr)
 
     return 'success'
 
@@ -224,8 +223,6 @@ def test_ogr_bna_6():
         pass
 
     ret = ogr_bna_write(['LINEFORMAT=LF', 'MULTILINE=NO', 'COORDINATE_PRECISION=3'])
-    if ret != 'success':
-        return ret
 
     size = os.stat('tmp/out.bna').st_size
     if size != 1601:
@@ -235,8 +232,6 @@ def test_ogr_bna_6():
     os.remove('tmp/out.bna')
 
     ret = ogr_bna_write(['LINEFORMAT=CRLF', 'MULTILINE=NO', 'COORDINATE_PRECISION=3'])
-    if ret != 'success':
-        return ret
 
     size = os.stat('tmp/out.bna').st_size
     if size != 1611:
diff --git a/autotest/ogr/ogr_georss.py b/autotest/ogr/ogr_georss.py
index 08f6d4982b70..9d377624f90b 100755
--- a/autotest/ogr/ogr_georss.py
+++ b/autotest/ogr/ogr_georss.py
@@ -338,8 +338,7 @@ def ogr_georss_create(filename, options):
 
 def test_ogr_georss_4():
 
-    if ogr_georss_create('tmp/test_rss2.xml', []) != 'success':
-        return 'fail'
+    ogr_georss_create('tmp/test_rss2.xml', [])
 
     content = open('tmp/test_rss2.xml').read()
     if content.find('<georss:point>49 2') == -1:
@@ -362,8 +361,7 @@ def test_ogr_georss_5():
 
 def test_ogr_georss_6():
 
-    if ogr_georss_create('tmp/test_rss2.xml', ['GEOM_DIALECT=GML']) != 'success':
-        return 'fail'
+    ogr_georss_create('tmp/test_rss2.xml', ['GEOM_DIALECT=GML'])
 
     content = open('tmp/test_rss2.xml').read()
     if content.find('<georss:where><gml:Point><gml:pos>49 2') == -1:
@@ -388,8 +386,7 @@ def test_ogr_georss_7():
 
 def test_ogr_georss_8():
 
-    if ogr_georss_create('tmp/test_rss2.xml', ['GEOM_DIALECT=W3C_GEO']) != 'success':
-        return 'fail'
+    ogr_georss_create('tmp/test_rss2.xml', ['GEOM_DIALECT=W3C_GEO'])
 
     content = open('tmp/test_rss2.xml').read()
     if content.find('<geo:lat>49') == -1 or content.find('<geo:long>2') == -1:
diff --git a/autotest/ogr/ogr_gml_read.py b/autotest/ogr/ogr_gml_read.py
index 36acd7cf8a26..ebae82bd1e09 100755
--- a/autotest/ogr/ogr_gml_read.py
+++ b/autotest/ogr/ogr_gml_read.py
@@ -1272,9 +1272,6 @@ def test_ogr_gml_31():
     ret = test_ogr_gml_29()
     gdal.SetConfigOption('GML_READ_MODE', None)
 
-    if ret != 'success':
-        return ret
-
     # Test reading second layer and then first layer
     gdal.SetConfigOption('GML_READ_MODE', 'SEQUENTIAL_LAYERS')
     ds = ogr.Open('data/testfmegml.gml')
@@ -3752,9 +3749,7 @@ def test_ogr_gml_71():
     # With .xsd
     gdal.Unlink('data/wfsjointlayer.gfs')
     ds = ogr.Open('data/wfsjointlayer.gml')
-    if ogr_gml_71_helper(ds) != 'success':
-        gdaltest.post_reason('fail')
-        return 'fail'
+    ogr_gml_71_helper(ds)
     ds = None
 
     try:
@@ -3766,9 +3761,7 @@ def test_ogr_gml_71():
 
     # With .xsd but that is only partially understood
     ds = gdal.OpenEx('data/wfsjointlayer.gml', open_options=['XSD=data/wfsjointlayer_not_understood.xsd'])
-    if ogr_gml_71_helper(ds) != 'success':
-        gdaltest.post_reason('fail')
-        return 'fail'
+    ogr_gml_71_helper(ds)
     ds = None
 
     try:
@@ -3781,9 +3774,7 @@ def test_ogr_gml_71():
     shutil.copy('data/wfsjointlayer.gml', 'tmp/wfsjointlayer.gml')
     gdal.Unlink('tmp/wfsjointlayer.gfs')
     ds = ogr.Open('tmp/wfsjointlayer.gml')
-    if ogr_gml_71_helper(ds) != 'success':
-        gdaltest.post_reason('fail')
-        return 'fail'
+    ogr_gml_71_helper(ds)
     ds = None
 
     try:
@@ -3794,9 +3785,7 @@ def test_ogr_gml_71():
 
     # With .gfs
     ds = ogr.Open('tmp/wfsjointlayer.gml')
-    if ogr_gml_71_helper(ds) != 'success':
-        gdaltest.post_reason('fail')
-        return 'fail'
+    ogr_gml_71_helper(ds)
     ds = None
 
     return 'success'
diff --git a/autotest/ogr/ogr_index_test.py b/autotest/ogr/ogr_index_test.py
index f0559c54ec0e..72fab8dcc0e5 100755
--- a/autotest/ogr/ogr_index_test.py
+++ b/autotest/ogr/ogr_index_test.py
@@ -460,28 +460,18 @@ def test_ogr_index_11():
 
     lyr.SetAttributeFilter("intfield = 1 OR strfield = 'bar'")
     ret = ogr_index_11_check(lyr, [0, 1, 3])
-    if ret != 'success':
-        return ret
 
     lyr.SetAttributeFilter("intfield = 1 AND strfield = 'bar'")
     ret = ogr_index_11_check(lyr, [1])
-    if ret != 'success':
-        return ret
 
     lyr.SetAttributeFilter("intfield = 1 AND strfield = 'foo'")
     ret = ogr_index_11_check(lyr, [0])
-    if ret != 'success':
-        return ret
 
     lyr.SetAttributeFilter("intfield = 3 AND strfield = 'foo'")
     ret = ogr_index_11_check(lyr, [])
-    if ret != 'success':
-        return ret
 
     lyr.SetAttributeFilter("intfield IN (1, 2, 3)")
     ret = ogr_index_11_check(lyr, [0, 1, 2, 3, 4])
-    if ret != 'success':
-        return ret
 
     ds = None
 
diff --git a/autotest/ogr/ogr_mitab.py b/autotest/ogr/ogr_mitab.py
index 4c31c4003434..553920282128 100755
--- a/autotest/ogr/ogr_mitab.py
+++ b/autotest/ogr/ogr_mitab.py
@@ -401,8 +401,7 @@ def test_ogr_mitab_13():
         return 'skip'
 
     import ogr_gml_read
-    if ogr_gml_read.ogr_gml_1() != 'success':
-        return 'skip'
+    ogr_gml_read.ogr_gml_1()
 
     if test_cli_utilities.get_ogr2ogr_path() is None:
         return 'skip'
@@ -452,8 +451,7 @@ def test_ogr_mitab_14():
         return 'skip'
 
     import ogr_gml_read
-    if ogr_gml_read.ogr_gml_1() != 'success':
-        return 'skip'
+    ogr_gml_read.ogr_gml_1()
 
     if test_cli_utilities.get_ogr2ogr_path() is None:
         return 'skip'
@@ -565,8 +563,7 @@ def test_ogr_mitab_17():
         return 'skip'
 
     import ogr_gml_read
-    if ogr_gml_read.ogr_gml_1() != 'success':
-        return 'skip'
+    ogr_gml_read.ogr_gml_1()
 
     if test_cli_utilities.get_test_ogrsf_path() is None:
         return 'skip'
diff --git a/autotest/ogr/ogr_pg.py b/autotest/ogr/ogr_pg.py
index 1c46286f3ec9..35e8c97a58b8 100755
--- a/autotest/ogr/ogr_pg.py
+++ b/autotest/ogr/ogr_pg.py
@@ -1429,8 +1429,7 @@ def test_ogr_pg_24(with_and_without_postgis):
     lyr = ds.GetLayerByName('datatypetest')
 
     feat = lyr.GetNextFeature()
-    if check_value_23(lyr.GetLayerDefn(), feat) != 'success':
-        return 'fail'
+    check_value_23(lyr.GetLayerDefn(), feat)
 
     feat = None
 
@@ -1454,8 +1453,7 @@ def test_ogr_pg_25(with_and_without_postgis):
     sql_lyr = ds.ExecuteSQL('select * from datatypetest')
 
     feat = sql_lyr.GetNextFeature()
-    if check_value_23(sql_lyr.GetLayerDefn(), feat) != 'success':
-        return 'fail'
+    check_value_23(sql_lyr.GetLayerDefn(), feat)
 
     ds.ReleaseResultSet(sql_lyr)
 
@@ -1533,8 +1531,7 @@ def test_ogr_pg_29(with_and_without_postgis):
 
     # my_timestamp has now a time zone...
     feat = lyr.GetNextFeature()
-    if check_value_23(lyr.GetLayerDefn(), feat) != 'success':
-        return 'fail'
+    check_value_23(lyr.GetLayerDefn(), feat)
 
     geom = feat.GetGeometryRef()
     wkt = geom.ExportToWkt()
@@ -4460,17 +4457,9 @@ def test_ogr_pg_76(with_and_without_postgis):
         return 'fail'
 
     ret = ogr_pg_76_scenario1(lyr1, lyr2)
-    if ret != 'success':
-        return ret
     ret = ogr_pg_76_scenario2(lyr1, lyr2)
-    if ret != 'success':
-        return ret
     ret = ogr_pg_76_scenario3(lyr1, lyr2)
-    if ret != 'success':
-        return ret
     ret = ogr_pg_76_scenario4(lyr1, lyr2)
-    if ret != 'success':
-        return ret
 
     return ret
 
diff --git a/autotest/ogr/ogr_rfc35_mem.py b/autotest/ogr/ogr_rfc35_mem.py
index 4b792b80688c..1fddc0348ff0 100755
--- a/autotest/ogr/ogr_rfc35_mem.py
+++ b/autotest/ogr/ogr_rfc35_mem.py
@@ -137,12 +137,8 @@ def CheckColumnOrder(lyr, expected_order):
 def Check(lyr, expected_order):
 
     ret = CheckColumnOrder(lyr, expected_order)
-    if ret != 'success':
-        return ret
 
     ret = CheckFeatures(lyr)
-    if ret != 'success':
-        return ret
 
     return 'success'
 
@@ -165,43 +161,27 @@ def test_ogr_rfc35_mem_2():
     if lyr.ReorderField(1, 3) != 0:
         return 'fail'
     ret = Check(lyr, ['foo5', 'baz15', 'baw20', 'bar10'])
-    if ret != 'success':
-        return ret
 
     lyr.ReorderField(3, 1)
     ret = Check(lyr, ['foo5', 'bar10', 'baz15', 'baw20'])
-    if ret != 'success':
-        return ret
 
     lyr.ReorderField(0, 2)
     ret = Check(lyr, ['bar10', 'baz15', 'foo5', 'baw20'])
-    if ret != 'success':
-        return ret
 
     lyr.ReorderField(2, 0)
     ret = Check(lyr, ['foo5', 'bar10', 'baz15', 'baw20'])
-    if ret != 'success':
-        return ret
 
     lyr.ReorderField(0, 1)
     ret = Check(lyr, ['bar10', 'foo5', 'baz15', 'baw20'])
-    if ret != 'success':
-        return ret
 
     lyr.ReorderField(1, 0)
     ret = Check(lyr, ['foo5', 'bar10', 'baz15', 'baw20'])
-    if ret != 'success':
-        return ret
 
     lyr.ReorderFields([3, 2, 1, 0])
     ret = Check(lyr, ['baw20', 'baz15', 'bar10', 'foo5'])
-    if ret != 'success':
-        return ret
 
     lyr.ReorderFields([3, 2, 1, 0])
     ret = Check(lyr, ['foo5', 'bar10', 'baz15', 'baw20'])
-    if ret != 'success':
-        return ret
 
     gdal.PushErrorHandler('CPLQuietErrorHandler')
     ret = lyr.ReorderFields([0, 0, 0, 0])
@@ -239,8 +219,6 @@ def test_ogr_rfc35_mem_3():
     lyr.AlterFieldDefn(lyr_defn.GetFieldIndex("baz15"), fd, ogr.ALTER_ALL_FLAG)
 
     ret = CheckFeatures(lyr, field3='baz25')
-    if ret != 'success':
-        return ret
 
     fd = ogr.FieldDefn("baz5", ogr.OFTString)
     fd.SetWidth(5)
@@ -249,8 +227,6 @@ def test_ogr_rfc35_mem_3():
     lyr.AlterFieldDefn(lyr_defn.GetFieldIndex("baz25"), fd, ogr.ALTER_ALL_FLAG)
 
     ret = CheckFeatures(lyr, field3='baz5')
-    if ret != 'success':
-        return ret
 
     lyr_defn = lyr.GetLayerDefn()
     fld_defn = lyr_defn.GetFieldDefn(lyr_defn.GetFieldIndex('baz5'))
@@ -258,8 +234,6 @@ def test_ogr_rfc35_mem_3():
         return 'fail'
 
     ret = CheckFeatures(lyr, field3='baz5')
-    if ret != 'success':
-        return ret
 
     return 'success'
 
@@ -296,8 +270,6 @@ def test_ogr_rfc35_mem_4():
     feat = None
 
     ret = CheckFeatures(lyr, field3='baz5')
-    if ret != 'success':
-        return ret
 
     fd.SetWidth(5)
     lyr.AlterFieldDefn(lyr_defn.GetFieldIndex("intfield"), fd, ogr.ALTER_ALL_FLAG)
@@ -309,8 +281,6 @@ def test_ogr_rfc35_mem_4():
     feat = None
 
     ret = CheckFeatures(lyr, field3='baz5')
-    if ret != 'success':
-        return ret
 
     fd.SetWidth(4)
     lyr.AlterFieldDefn(lyr_defn.GetFieldIndex("intfield"), fd, ogr.ALTER_ALL_FLAG)
@@ -323,8 +293,6 @@ def test_ogr_rfc35_mem_4():
     feat = None
 
     ret = CheckFeatures(lyr, field3='baz5')
-    if ret != 'success':
-        return ret
 
     fd = ogr.FieldDefn("oldintfld", ogr.OFTString)
     fd.SetWidth(15)
@@ -338,8 +306,6 @@ def test_ogr_rfc35_mem_4():
     feat = None
 
     ret = CheckFeatures(lyr, field3='baz5')
-    if ret != 'success':
-        return ret
 
     lyr.DeleteField(lyr_defn.GetFieldIndex("oldintfld"))
 
@@ -369,8 +335,6 @@ def test_ogr_rfc35_mem_4():
     feat = None
 
     ret = CheckFeatures(lyr, field3='baz5')
-    if ret != 'success':
-        return ret
 
     return 'success'
 
@@ -402,22 +366,16 @@ def test_ogr_rfc35_mem_5():
         return 'fail'
 
     ret = CheckFeatures(lyr, field3='baz5')
-    if ret != 'success':
-        return ret
 
     if lyr.DeleteField(lyr_defn.GetFieldIndex('baw20')) != 0:
         return 'fail'
 
     ret = CheckFeatures(lyr, field3='baz5', field4=None)
-    if ret != 'success':
-        return ret
 
     if lyr.DeleteField(lyr_defn.GetFieldIndex('baz5')) != 0:
         return 'fail'
 
     ret = CheckFeatures(lyr, field3=None, field4=None)
-    if ret != 'success':
-        return ret
 
     if lyr.DeleteField(lyr_defn.GetFieldIndex('foo5')) != 0:
         return 'fail'
@@ -426,8 +384,6 @@ def test_ogr_rfc35_mem_5():
         return 'fail'
 
     ret = CheckFeatures(lyr, field1=None, field2=None, field3=None, field4=None)
-    if ret != 'success':
-        return ret
 
     return 'success'
 
diff --git a/autotest/ogr/ogr_rfc35_mitab.py b/autotest/ogr/ogr_rfc35_mitab.py
index 05fa006309fb..2e2670deb640 100755
--- a/autotest/ogr/ogr_rfc35_mitab.py
+++ b/autotest/ogr/ogr_rfc35_mitab.py
@@ -156,23 +156,15 @@ def CheckColumnOrder(lyr, expected_order):
 def Check(lyr, expected_order):
 
     ret = CheckColumnOrder(lyr, expected_order)
-    if ret != 'success':
-        return ret
 
     ret = CheckFeatures(lyr)
-    if ret != 'success':
-        return ret
 
     ds = ogr.Open('/vsimem/rfc35_test.tab', update=1)
     lyr_reopen = ds.GetLayer(0)
 
     ret = CheckColumnOrder(lyr_reopen, expected_order)
-    if ret != 'success':
-        return ret
 
     ret = CheckFeatures(lyr_reopen)
-    if ret != 'success':
-        return ret
 
     return 'success'
 
@@ -349,8 +341,6 @@ def test_ogr_rfc35_mitab_3():
         return 'fail'
 
     ret = CheckFeatures(lyr, field3='baz5')
-    if ret != 'success':
-        return ret
 
     return 'success'
 
diff --git a/autotest/ogr/ogr_rfc35_shape.py b/autotest/ogr/ogr_rfc35_shape.py
index 40ae2975952f..a9540d481201 100755
--- a/autotest/ogr/ogr_rfc35_shape.py
+++ b/autotest/ogr/ogr_rfc35_shape.py
@@ -156,23 +156,15 @@ def CheckColumnOrder(lyr, expected_order):
 def Check(lyr, expected_order):
 
     ret = CheckColumnOrder(lyr, expected_order)
-    if ret != 'success':
-        return ret
 
     ret = CheckFeatures(lyr)
-    if ret != 'success':
-        return ret
 
     ds = ogr.Open('/vsimem/rfc35_test.dbf', update=1)
     lyr_reopen = ds.GetLayer(0)
 
     ret = CheckColumnOrder(lyr_reopen, expected_order)
-    if ret != 'success':
-        return ret
 
     ret = CheckFeatures(lyr_reopen)
-    if ret != 'success':
-        return ret
 
     return 'success'
 
@@ -196,43 +188,27 @@ def test_ogr_rfc35_shape_2():
     if lyr.ReorderField(1, 3) != 0:
         return 'fail'
     ret = Check(lyr, ['foo5', 'baz15', 'baw20', 'bar10'])
-    if ret != 'success':
-        return ret
 
     lyr.ReorderField(3, 1)
     ret = Check(lyr, ['foo5', 'bar10', 'baz15', 'baw20'])
-    if ret != 'success':
-        return ret
 
     lyr.ReorderField(0, 2)
     ret = Check(lyr, ['bar10', 'baz15', 'foo5', 'baw20'])
-    if ret != 'success':
-        return ret
 
     lyr.ReorderField(2, 0)
     ret = Check(lyr, ['foo5', 'bar10', 'baz15', 'baw20'])
-    if ret != 'success':
-        return ret
 
     lyr.ReorderField(0, 1)
     ret = Check(lyr, ['bar10', 'foo5', 'baz15', 'baw20'])
-    if ret != 'success':
-        return ret
 
     lyr.ReorderField(1, 0)
     ret = Check(lyr, ['foo5', 'bar10', 'baz15', 'baw20'])
-    if ret != 'success':
-        return ret
 
     lyr.ReorderFields([3, 2, 1, 0])
     ret = Check(lyr, ['baw20', 'baz15', 'bar10', 'foo5'])
-    if ret != 'success':
-        return ret
 
     lyr.ReorderFields([3, 2, 1, 0])
     ret = Check(lyr, ['foo5', 'bar10', 'baz15', 'baw20'])
-    if ret != 'success':
-        return ret
 
     gdal.PushErrorHandler('CPLQuietErrorHandler')
     ret = lyr.ReorderFields([0, 0, 0, 0])
@@ -246,12 +222,8 @@ def test_ogr_rfc35_shape_2():
     lyr = ds.GetLayer(0)
 
     ret = CheckColumnOrder(lyr, ['foo5', 'bar10', 'baz15', 'baw20'])
-    if ret != 'success':
-        return ret
 
     ret = CheckFeatures(lyr)
-    if ret != 'success':
-        return ret
 
     return 'success'
 
@@ -284,8 +256,6 @@ def test_ogr_rfc35_shape_3():
     lyr.AlterFieldDefn(lyr_defn.GetFieldIndex("baz15"), fd, ogr.ALTER_ALL_FLAG)
 
     ret = CheckFeatures(lyr, field3='baz25')
-    if ret != 'success':
-        return ret
 
     fd = ogr.FieldDefn("baz5", ogr.OFTString)
     fd.SetWidth(5)
@@ -294,8 +264,6 @@ def test_ogr_rfc35_shape_3():
     lyr.AlterFieldDefn(lyr_defn.GetFieldIndex("baz25"), fd, ogr.ALTER_ALL_FLAG)
 
     ret = CheckFeatures(lyr, field3='baz5')
-    if ret != 'success':
-        return ret
 
     ds = None
 
@@ -307,8 +275,6 @@ def test_ogr_rfc35_shape_3():
         return 'fail'
 
     ret = CheckFeatures(lyr, field3='baz5')
-    if ret != 'success':
-        return ret
 
     return 'success'
 
@@ -346,8 +312,6 @@ def test_ogr_rfc35_shape_4():
     feat = None
 
     ret = CheckFeatures(lyr, field3='baz5')
-    if ret != 'success':
-        return ret
 
     fd.SetWidth(5)
     lyr.AlterFieldDefn(lyr_defn.GetFieldIndex("intfield"), fd, ogr.ALTER_ALL_FLAG)
@@ -359,8 +323,6 @@ def test_ogr_rfc35_shape_4():
     feat = None
 
     ret = CheckFeatures(lyr, field3='baz5')
-    if ret != 'success':
-        return ret
 
     ds = None
 
@@ -378,8 +340,6 @@ def test_ogr_rfc35_shape_4():
     feat = None
 
     ret = CheckFeatures(lyr, field3='baz5')
-    if ret != 'success':
-        return ret
 
     ds = None
 
@@ -403,8 +363,6 @@ def test_ogr_rfc35_shape_4():
     feat = None
 
     ret = CheckFeatures(lyr, field3='baz5')
-    if ret != 'success':
-        return ret
 
     ds = None
 
@@ -419,8 +377,6 @@ def test_ogr_rfc35_shape_4():
     feat = None
 
     ret = CheckFeatures(lyr, field3='baz5')
-    if ret != 'success':
-        return ret
 
     lyr.DeleteField(lyr_defn.GetFieldIndex("oldintfld"))
 
@@ -450,8 +406,6 @@ def test_ogr_rfc35_shape_4():
     feat = None
 
     ret = CheckFeatures(lyr, field3='baz5')
-    if ret != 'success':
-        return ret
 
     ds = None
 
@@ -466,8 +420,6 @@ def test_ogr_rfc35_shape_4():
     feat = None
 
     ret = CheckFeatures(lyr, field3='baz5')
-    if ret != 'success':
-        return ret
 
     return 'success'
 
@@ -500,8 +452,6 @@ def test_ogr_rfc35_shape_5():
         return 'fail'
 
     ret = CheckFeatures(lyr, field3='baz5')
-    if ret != 'success':
-        return ret
 
     if lyr.DeleteField(lyr_defn.GetFieldIndex('baw20')) != 0:
         return 'fail'
@@ -518,15 +468,11 @@ def test_ogr_rfc35_shape_5():
     lyr_defn = lyr.GetLayerDefn()
 
     ret = CheckFeatures(lyr, field3='baz5', field4=None)
-    if ret != 'success':
-        return ret
 
     if lyr.DeleteField(lyr_defn.GetFieldIndex('baz5')) != 0:
         return 'fail'
 
     ret = CheckFeatures(lyr, field3=None, field4=None)
-    if ret != 'success':
-        return ret
 
     if lyr.DeleteField(lyr_defn.GetFieldIndex('foo5')) != 0:
         return 'fail'
@@ -535,8 +481,6 @@ def test_ogr_rfc35_shape_5():
         return 'fail'
 
     ret = CheckFeatures(lyr, field1=None, field2=None, field3=None, field4=None)
-    if ret != 'success':
-        return ret
 
     ds = None
 
@@ -545,8 +489,6 @@ def test_ogr_rfc35_shape_5():
     lyr_defn = lyr.GetLayerDefn()
 
     ret = CheckFeatures(lyr, field1=None, field2=None, field3=None, field4=None)
-    if ret != 'success':
-        return ret
 
     return 'success'
 
diff --git a/autotest/ogr/ogr_rfc35_sqlite.py b/autotest/ogr/ogr_rfc35_sqlite.py
index e3ae8a3ab83f..10a8392b3c7f 100755
--- a/autotest/ogr/ogr_rfc35_sqlite.py
+++ b/autotest/ogr/ogr_rfc35_sqlite.py
@@ -151,12 +151,8 @@ def CheckColumnOrder(lyr, expected_order):
 def Check(lyr, expected_order):
 
     ret = CheckColumnOrder(lyr, expected_order)
-    if ret != 'success':
-        return ret
 
     ret = CheckFeatures(lyr)
-    if ret != 'success':
-        return ret
 
     return 'success'
 
@@ -185,51 +181,27 @@ def test_ogr_rfc35_sqlite_2():
         return 'fail'
 
     ret = Check(lyr, ['foo5', 'baz15', 'baw20', 'bar10'])
-    if ret != 'success':
-        gdaltest.post_reason('failed')
-        return ret
 
     lyr.ReorderField(3, 1)
     ret = Check(lyr, ['foo5', 'bar10', 'baz15', 'baw20'])
-    if ret != 'success':
-        gdaltest.post_reason('failed')
-        return ret
 
     lyr.ReorderField(0, 2)
     ret = Check(lyr, ['bar10', 'baz15', 'foo5', 'baw20'])
-    if ret != 'success':
-        gdaltest.post_reason('failed')
-        return ret
 
     lyr.ReorderField(2, 0)
     ret = Check(lyr, ['foo5', 'bar10', 'baz15', 'baw20'])
-    if ret != 'success':
-        gdaltest.post_reason('failed')
-        return ret
 
     lyr.ReorderField(0, 1)
     ret = Check(lyr, ['bar10', 'foo5', 'baz15', 'baw20'])
-    if ret != 'success':
-        gdaltest.post_reason('failed')
-        return ret
 
     lyr.ReorderField(1, 0)
     ret = Check(lyr, ['foo5', 'bar10', 'baz15', 'baw20'])
-    if ret != 'success':
-        gdaltest.post_reason('failed')
-        return ret
 
     lyr.ReorderFields([3, 2, 1, 0])
     ret = Check(lyr, ['baw20', 'baz15', 'bar10', 'foo5'])
-    if ret != 'success':
-        gdaltest.post_reason('failed')
-        return ret
 
     lyr.ReorderFields([3, 2, 1, 0])
     ret = Check(lyr, ['foo5', 'bar10', 'baz15', 'baw20'])
-    if ret != 'success':
-        gdaltest.post_reason('failed')
-        return ret
 
     gdal.PushErrorHandler('CPLQuietErrorHandler')
     ret = lyr.ReorderFields([0, 0, 0, 0])
@@ -273,9 +245,6 @@ def test_ogr_rfc35_sqlite_3():
     lyr.AlterFieldDefn(lyr_defn.GetFieldIndex("baz15"), fd, ogr.ALTER_ALL_FLAG)
 
     ret = CheckFeatures(lyr, field3='baz25')
-    if ret != 'success':
-        gdaltest.post_reason('failed')
-        return ret
 
     fd = ogr.FieldDefn("baz5", ogr.OFTString)
     fd.SetWidth(5)
@@ -284,9 +253,6 @@ def test_ogr_rfc35_sqlite_3():
     lyr.AlterFieldDefn(lyr_defn.GetFieldIndex("baz25"), fd, ogr.ALTER_ALL_FLAG)
 
     ret = CheckFeatures(lyr, field3='baz5')
-    if ret != 'success':
-        gdaltest.post_reason('failed')
-        return ret
 
     lyr_defn = lyr.GetLayerDefn()
     fld_defn = lyr_defn.GetFieldDefn(lyr_defn.GetFieldIndex('baz5'))
@@ -295,9 +261,6 @@ def test_ogr_rfc35_sqlite_3():
         return 'fail'
 
     ret = CheckFeatures(lyr, field3='baz5')
-    if ret != 'success':
-        gdaltest.post_reason('failed')
-        return ret
 
     return 'success'
 
@@ -339,9 +302,6 @@ def test_ogr_rfc35_sqlite_4():
     feat = None
 
     ret = CheckFeatures(lyr, field3='baz5')
-    if ret != 'success':
-        gdaltest.post_reason('failed')
-        return ret
 
     fd.SetWidth(5)
     lyr.AlterFieldDefn(lyr_defn.GetFieldIndex("intfield"), fd, ogr.ALTER_ALL_FLAG)
@@ -354,9 +314,6 @@ def test_ogr_rfc35_sqlite_4():
     feat = None
 
     ret = CheckFeatures(lyr, field3='baz5')
-    if ret != 'success':
-        gdaltest.post_reason('failed')
-        return ret
 
     fd.SetWidth(4)
     lyr.AlterFieldDefn(lyr_defn.GetFieldIndex("intfield"), fd, ogr.ALTER_ALL_FLAG)
@@ -370,9 +327,6 @@ def test_ogr_rfc35_sqlite_4():
     feat = None
 
     ret = CheckFeatures(lyr, field3='baz5')
-    if ret != 'success':
-        gdaltest.post_reason('failed')
-        return ret
 
     fd = ogr.FieldDefn("oldintfld", ogr.OFTString)
     fd.SetWidth(15)
@@ -387,9 +341,6 @@ def test_ogr_rfc35_sqlite_4():
     feat = None
 
     ret = CheckFeatures(lyr, field3='baz5')
-    if ret != 'success':
-        gdaltest.post_reason('failed')
-        return ret
 
     lyr.DeleteField(lyr_defn.GetFieldIndex("oldintfld"))
 
@@ -423,9 +374,6 @@ def test_ogr_rfc35_sqlite_4():
     feat = None
 
     ret = CheckFeatures(lyr, field3='baz5')
-    if ret != 'success':
-        gdaltest.post_reason('failed')
-        return ret
 
     return 'success'
 
@@ -464,27 +412,18 @@ def test_ogr_rfc35_sqlite_5():
         return 'fail'
 
     ret = CheckFeatures(lyr, field3='baz5')
-    if ret != 'success':
-        gdaltest.post_reason('failed')
-        return ret
 
     if lyr.DeleteField(lyr_defn.GetFieldIndex('baw20')) != 0:
         gdaltest.post_reason('failed')
         return 'fail'
 
     ret = CheckFeatures(lyr, field3='baz5', field4=None)
-    if ret != 'success':
-        gdaltest.post_reason('failed')
-        return ret
 
     if lyr.DeleteField(lyr_defn.GetFieldIndex('baz5')) != 0:
         gdaltest.post_reason('failed')
         return 'fail'
 
     ret = CheckFeatures(lyr, field3=None, field4=None)
-    if ret != 'success':
-        gdaltest.post_reason('failed')
-        return ret
 
     if lyr.DeleteField(lyr_defn.GetFieldIndex('foo5')) != 0:
         gdaltest.post_reason('failed')
@@ -495,9 +434,6 @@ def test_ogr_rfc35_sqlite_5():
         return 'fail'
 
     ret = CheckFeatures(lyr, field1=None, field2=None, field3=None, field4=None)
-    if ret != 'success':
-        gdaltest.post_reason('failed')
-        return ret
 
     return 'success'
 
diff --git a/autotest/ogr/ogr_s57.py b/autotest/ogr/ogr_s57.py
index 14319197520a..efd38b5754b9 100755
--- a/autotest/ogr/ogr_s57.py
+++ b/autotest/ogr/ogr_s57.py
@@ -277,14 +277,10 @@ def test_ogr_s57_9():
         return 'fail'
 
     gdaltest.s57_ds = ds
-    if test_ogr_s57_2() != 'success':
-        return 'fail'
-    if test_ogr_s57_3() != 'success':
-        return 'fail'
-    if test_ogr_s57_4() != 'success':
-        return 'fail'
-    if test_ogr_s57_5() != 'success':
-        return 'fail'
+    test_ogr_s57_2()
+    test_ogr_s57_3()
+    test_ogr_s57_4()
+    test_ogr_s57_5()
 
     gdaltest.s57_ds = None
 
@@ -304,8 +300,7 @@ def test_ogr_s57_9():
         return 'fail'
 
     gdaltest.s57_ds = ds
-    if test_ogr_s57_4() != 'success':
-        return 'fail'
+    test_ogr_s57_4()
 
     gdaltest.s57_ds = None
 
diff --git a/autotest/ogr/ogr_selafin.py b/autotest/ogr/ogr_selafin.py
index 858b295e3c54..aa3c5bffc9d1 100755
--- a/autotest/ogr/ogr_selafin.py
+++ b/autotest/ogr/ogr_selafin.py
@@ -63,8 +63,7 @@ def test_ogr_selafin_create_ds():
 
 
 def test_ogr_selafin_create_nodes():
-    if test_ogr_selafin_create_ds() != 'success':
-        return 'skip'
+    test_ogr_selafin_create_ds()
     ref = osr.SpatialReference()
     ref.ImportFromEPSG(4326)
     layer = gdaltest.selafin_ds.CreateLayer('name', ref, geom_type=ogr.wkbPoint)
diff --git a/autotest/ogr/ogr_shape.py b/autotest/ogr/ogr_shape.py
index b436c5db1d71..6fbb595021b4 100755
--- a/autotest/ogr/ogr_shape.py
+++ b/autotest/ogr/ogr_shape.py
@@ -2570,31 +2570,15 @@ def test_ogr_shape_54():
     ds = ogr.Open(ds_name)
     for i in range(N):
         ret = ogr_shape_54_test_layer(ds, i)
-        if ret != 'success':
-            return ret
 
     # Now some 'random' access
     ret = ogr_shape_54_test_layer(ds, N - 1 - LRUListSize)
-    if ret != 'success':
-        return ret
     ret = ogr_shape_54_test_layer(ds, N - LRUListSize / 2)
-    if ret != 'success':
-        return ret
     ret = ogr_shape_54_test_layer(ds, N - LRUListSize / 4)
-    if ret != 'success':
-        return ret
     ret = ogr_shape_54_test_layer(ds, 0)
-    if ret != 'success':
-        return ret
     ret = ogr_shape_54_test_layer(ds, 0)
-    if ret != 'success':
-        return ret
     ret = ogr_shape_54_test_layer(ds, 2)
-    if ret != 'success':
-        return ret
     ret = ogr_shape_54_test_layer(ds, 1)
-    if ret != 'success':
-        return ret
     ds = None
 
     # Test adding a new layer
@@ -2605,30 +2589,20 @@ def test_ogr_shape_54():
     # Test accessing the new layer
     ds = ogr.Open(ds_name)
     ret = ogr_shape_54_test_layer(ds, N)
-    if ret != 'success':
-        return ret
     ds = None
 
     # Test deleting layers
     ds = ogr.Open(ds_name, update=1)
     for i in range(N):
         ret = ogr_shape_54_test_layer(ds, i)
-        if ret != 'success':
-            return ret
     for i in range(N - LRUListSize + 1, N):
         ds.ExecuteSQL('DROP TABLE layer%03d' % i)
     ret = ogr_shape_54_test_layer(ds, N - LRUListSize)
-    if ret != 'success':
-        return ret
     ogr_shape_54_create_layer(ds, N + 2)
     for i in range(0, N - LRUListSize + 1):
         ds.ExecuteSQL('DROP TABLE layer%03d' % i)
     ret = ogr_shape_54_test_layer(ds, N)
-    if ret != 'success':
-        return ret
     ret = ogr_shape_54_test_layer(ds, N + 2)
-    if ret != 'success':
-        return ret
     ds = None
 
     # Destroy and recreate datasource
diff --git a/autotest/ogr/ogr_shape_sbn.py b/autotest/ogr/ogr_shape_sbn.py
index 6ace12cd85da..02ffb2dd6e70 100755
--- a/autotest/ogr/ogr_shape_sbn.py
+++ b/autotest/ogr/ogr_shape_sbn.py
@@ -128,8 +128,6 @@ def test_ogr_shape_sbn_1():
     for i in range(ds.GetLayerCount()):
         lyr = ds.GetLayer(i)
         ret = search_all_features(lyr)
-        if ret != 'success':
-            return ret
 
     return 'success'
 
diff --git a/autotest/ogr/ogr_sql_sqlite.py b/autotest/ogr/ogr_sql_sqlite.py
index 2e1faf4ea0d3..822ea2814767 100755
--- a/autotest/ogr/ogr_sql_sqlite.py
+++ b/autotest/ogr/ogr_sql_sqlite.py
@@ -534,16 +534,10 @@ def test_ogr_sql_sqlite_6():
     gdal.SetConfigOption('OGR_SQLITE_DIALECT_USE_SPATIALITE', 'NO')
 
     ret = test_ogr_sql_sqlite_1()
-    if ret != 'success':
-        return ret
 
     ret = test_ogr_sql_sqlite_2()
-    if ret != 'success':
-        return ret
 
     ret = test_ogr_sql_sqlite_4()
-    if ret != 'success':
-        return ret
 
     gdal.SetConfigOption('OGR_SQLITE_DIALECT_USE_SPATIALITE', None)
 
diff --git a/autotest/ogr/ogr_vrt.py b/autotest/ogr/ogr_vrt.py
index 24c6db83e910..cd99dae7bcb5 100755
--- a/autotest/ogr/ogr_vrt.py
+++ b/autotest/ogr/ogr_vrt.py
@@ -1386,8 +1386,6 @@ def test_ogr_vrt_23(shared_ds_flag=''):
 def test_ogr_vrt_24():
 
     ret = test_ogr_vrt_23(' shared="1"')
-    if ret != 'success':
-        return ret
 
     rec1 = """<OGRVRTDataSource>
     <OGRVRTLayer name="test">
diff --git a/autotest/ogr/ogr_wasp.py b/autotest/ogr/ogr_wasp.py
index df638b5fc87c..70f3ff587a53 100755
--- a/autotest/ogr/ogr_wasp.py
+++ b/autotest/ogr/ogr_wasp.py
@@ -60,8 +60,7 @@ def test_ogr_wasp_create_ds():
 
 def test_ogr_wasp_elevation_from_linestring_z():
 
-    if test_ogr_wasp_create_ds() != 'success':
-        return 'skip'
+    test_ogr_wasp_create_ds()
 
     ref = osr.SpatialReference()
     ref.ImportFromProj4('+proj=lcc +lat_1=46.8 +lat_0=46.8 +lon_0=0 +k_0=0.99987742 +x_0=600000 +y_0=2200000 +a=6378249.2 +b=6356514.999978254 +pm=2.337229167 +units=m +no_defs')
@@ -121,8 +120,7 @@ def test_ogr_wasp_elevation_from_linestring_z():
 
 def test_ogr_wasp_elevation_from_linestring_z_toler():
 
-    if test_ogr_wasp_create_ds() != 'success':
-        return 'skip'
+    test_ogr_wasp_create_ds()
 
     ref = osr.SpatialReference()
     ref.ImportFromProj4('+proj=lcc +lat_1=46.8 +lat_0=46.8 +lon_0=0 +k_0=0.99987742 +x_0=600000 +y_0=2200000 +a=6378249.2 +b=6356514.999978254 +pm=2.337229167 +units=m +no_defs')
@@ -191,8 +189,7 @@ def test_ogr_wasp_elevation_from_linestring_z_toler():
 
 def test_ogr_wasp_elevation_from_linestring_field():
 
-    if test_ogr_wasp_create_ds() != 'success':
-        return 'skip'
+    test_ogr_wasp_create_ds()
 
     layer = gdaltest.wasp_ds.CreateLayer('mylayer',
                                          options=['WASP_FIELDS=elevation'],
@@ -246,8 +243,7 @@ def test_ogr_wasp_elevation_from_linestring_field():
 
 def test_ogr_wasp_roughness_from_linestring_fields():
 
-    if test_ogr_wasp_create_ds() != 'success':
-        return 'skip'
+    test_ogr_wasp_create_ds()
 
     layer = gdaltest.wasp_ds.CreateLayer('mylayer',
                                          options=['WASP_FIELDS=z_left,z_right'],
@@ -309,8 +305,7 @@ def test_ogr_wasp_roughness_from_linestring_fields():
 
 def test_ogr_wasp_roughness_from_polygon_z():
 
-    if test_ogr_wasp_create_ds() != 'success':
-        return 'skip'
+    test_ogr_wasp_create_ds()
 
     if not ogrtest.have_geos():
         gdal.PushErrorHandler('CPLQuietErrorHandler')
@@ -379,8 +374,7 @@ def test_ogr_wasp_roughness_from_polygon_z():
 
 def test_ogr_wasp_roughness_from_polygon_field():
 
-    if test_ogr_wasp_create_ds() != 'success':
-        return 'skip'
+    test_ogr_wasp_create_ds()
 
     if not ogrtest.have_geos():
         gdal.PushErrorHandler('CPLQuietErrorHandler')
@@ -454,8 +448,7 @@ def test_ogr_wasp_roughness_from_polygon_field():
 
 def test_ogr_wasp_merge():
 
-    if test_ogr_wasp_create_ds() != 'success':
-        return 'skip'
+    test_ogr_wasp_create_ds()
 
     if not ogrtest.have_geos():
         gdal.PushErrorHandler('CPLQuietErrorHandler')
@@ -523,8 +516,7 @@ def test_ogr_wasp_merge():
 
 
 def test_ogr_wasp_reading():
-    if test_ogr_wasp_elevation_from_linestring_z() != 'success':
-        return 'skip'
+    test_ogr_wasp_elevation_from_linestring_z()
 
     gdaltest.wasp_ds = None
 
diff --git a/autotest/osr/osr_metacrs.py b/autotest/osr/osr_metacrs.py
index 517cb4a32682..facb68035da2 100755
--- a/autotest/osr/osr_metacrs.py
+++ b/autotest/osr/osr_metacrs.py
@@ -59,8 +59,6 @@ def test_metacrs(self, test_line):
         self.dst_error = None
 
         result = self.parse_line()
-        if result != 'success':
-            return result
 
         try:
             gdal.PushErrorHandler('CPLQuietErrorHandler')
diff --git a/autotest/pyscripts/test_gdal_ls_py.py b/autotest/pyscripts/test_gdal_ls_py.py
index 8fb481cd8789..ab1c18b6f39d 100755
--- a/autotest/pyscripts/test_gdal_ls_py.py
+++ b/autotest/pyscripts/test_gdal_ls_py.py
@@ -79,9 +79,6 @@ def test_gdal_ls_py_1():
     # TODO: Why the '' as the first element of the list here and below?
     ret, ret_str = run_gdal_ls(['', '-l', '../ogr/data/poly.shp'])
 
-    if ret != 'success':
-        return ret
-
     if ret_str.find('poly.shp') == -1:
         print(ret_str)
         return 'fail'
@@ -95,9 +92,6 @@ def test_gdal_ls_py_1():
 def test_gdal_ls_py_2():
     ret, ret_str = run_gdal_ls(['', '-l', '../ogr/data'])
 
-    if ret != 'success':
-        return ret
-
     if ret_str.find('poly.shp') == -1:
         print(ret_str)
         return 'fail'
@@ -111,9 +105,6 @@ def test_gdal_ls_py_2():
 def test_gdal_ls_py_3():
     ret, ret_str = run_gdal_ls(['', '-R', '../ogr/data'])
 
-    if ret != 'success':
-        return ret
-
     if ret_str.find('PROJ_UNITS') == -1:
         print(ret_str)
         return 'fail'
@@ -127,9 +118,6 @@ def test_gdal_ls_py_3():
 def test_gdal_ls_py_4():
     ret, ret_str = run_gdal_ls(['', '-l', '/vsizip/../ogr/data/poly.zip'])
 
-    if ret != 'success':
-        return ret
-
     if ret_str.find('-r--r--r--  1 unknown unknown          415 2008-02-11 21:35 /vsizip/../ogr/data/poly.zip/poly.PRJ') == -1:
         print(ret_str)
         if gdaltest.skip_on_travis():
@@ -194,9 +182,6 @@ def test_gdal_ls_py_6():
 
     ret, ret_str = run_gdal_ls(['', '-l', '/vsizip/vsicurl/https://raw.githubusercontent.com/OSGeo/gdal/master/autotest/ogr/data/poly.zip'])
 
-    if ret != 'success':
-        return ret
-
     if ret_str.find('-r--r--r--  1 unknown unknown          415 2008-02-11 21:35 /vsizip/vsicurl/https://raw.githubusercontent.com/OSGeo/gdal/master/autotest/ogr/data/poly.zip/poly.PRJ') == -1:
         print(ret_str)
         if gdaltest.skip_on_travis():
@@ -272,9 +257,6 @@ def test_gdal_ls_py_8():
 
     ret, ret_str = run_gdal_ls(['', '-l', '-R', '-Rzip', 'ftp://download.osgeo.org/gdal/data/aig'])
 
-    if ret != 'success':
-        return ret
-
     if ret_str.find('-r--r--r--  1 unknown unknown        24576 2007-03-29 00:00 /vsicurl/ftp://download.osgeo.org/gdal/data/aig/nzdem/info/arc0002r.001') == -1:
         print(ret_str)
         return 'fail'

From 81a03cb9af98768c9f5b2a5c8a35fa23df42fddf Mon Sep 17 00:00:00 2001
From: Craig de Stigter <craig.destigter@koordinates.com>
Date: Mon, 10 Dec 2018 09:22:41 +1300
Subject: [PATCH 137/488] Automated: Remove useless `post_reason() calls

gdaltest.post_reason('fail') isn't a useful reason to keep.
---
 autotest/alg/applyverticalshiftgrid.py        |  32 --
 autotest/alg/contour.py                       |   1 -
 autotest/alg/reproject.py                     |   2 -
 autotest/alg/warp.py                          |  17 -
 autotest/gcore/basic_test.py                  |  70 ----
 autotest/gcore/gdal_api_proxy.py              |  90 -----
 autotest/gcore/hfa_write.py                   |   6 -
 autotest/gcore/mask.py                        |  12 -
 autotest/gcore/misc.py                        |   3 -
 autotest/gcore/nodatamaskband.py              |   5 -
 autotest/gcore/numpy_rw.py                    |  17 -
 autotest/gcore/overviewds.py                  |  27 --
 autotest/gcore/pam.py                         |   7 -
 autotest/gcore/pixfun.py                      |   2 -
 autotest/gcore/rasterio.py                    |  73 ----
 autotest/gcore/testnonboundtoswig.py          |   6 -
 autotest/gcore/tiff_ovr.py                    |  17 -
 autotest/gcore/tiff_read.py                   | 109 ------
 autotest/gcore/tiff_srs.py                    |  15 -
 autotest/gcore/tiff_write.py                  | 274 -------------
 autotest/gcore/transformer.py                 |  13 -
 autotest/gcore/virtualmem.py                  |  12 -
 autotest/gcore/vrt_read.py                    |  49 ---
 autotest/gcore/vrtmisc.py                     |  30 --
 autotest/gcore/vsiaz.py                       |  78 ----
 autotest/gcore/vsicrypt.py                    |  39 --
 autotest/gcore/vsicurl.py                     |  11 -
 autotest/gcore/vsicurl_streaming.py           |  15 -
 autotest/gcore/vsifile.py                     | 101 -----
 autotest/gcore/vsigs.py                       |  76 ----
 autotest/gcore/vsioss.py                      | 110 ------
 autotest/gcore/vsis3.py                       | 196 ----------
 autotest/gcore/vsistdin.py                    |   2 -
 autotest/gcore/vsiswift.py                    |  58 ---
 autotest/gcore/vsiwebhdfs.py                  |  55 ---
 autotest/gcore/vsizip.py                      |  36 --
 autotest/gdrivers/aaigrid.py                  |   6 -
 autotest/gdrivers/bag.py                      |  63 ---
 autotest/gdrivers/cals.py                     |  13 -
 autotest/gdrivers/db2.py                      |   6 -
 autotest/gdrivers/derived.py                  |  13 -
 autotest/gdrivers/ecrgtoc.py                  |   3 -
 autotest/gdrivers/ecw.py                      |  60 ---
 autotest/gdrivers/eedai.py                    |  21 -
 autotest/gdrivers/ehdr.py                     |  11 -
 autotest/gdrivers/ers.py                      |   1 -
 autotest/gdrivers/gdalhttp.py                 |   4 -
 autotest/gdrivers/gpkg.py                     | 300 --------------
 autotest/gdrivers/grib.py                     |  17 -
 autotest/gdrivers/hdf5.py                     |  11 -
 autotest/gdrivers/ignfheightasciigrid.py      |   5 -
 autotest/gdrivers/ingr.py                     |   3 -
 autotest/gdrivers/iris.py                     |   2 -
 autotest/gdrivers/isis.py                     | 125 ------
 autotest/gdrivers/jp2kak.py                   |   9 -
 autotest/gdrivers/jp2lura.py                  | 121 ------
 autotest/gdrivers/jp2openjpeg.py              | 209 ----------
 autotest/gdrivers/jpeg.py                     |  55 ---
 autotest/gdrivers/jpeg2000.py                 |   5 -
 autotest/gdrivers/jpeg_profile.py             |  11 -
 autotest/gdrivers/kea.py                      |  97 -----
 autotest/gdrivers/kmlsuperoverlay.py          |  19 -
 autotest/gdrivers/l1b.py                      |  11 -
 autotest/gdrivers/mbtiles.py                  |  30 --
 autotest/gdrivers/mem.py                      |  71 ----
 autotest/gdrivers/mrf.py                      |  26 --
 autotest/gdrivers/netcdf.py                   |  70 ----
 autotest/gdrivers/nitf.py                     |   9 -
 autotest/gdrivers/ntv2.py                     |   4 -
 autotest/gdrivers/pcidsk.py                   |  15 -
 autotest/gdrivers/pdf.py                      |  36 --
 autotest/gdrivers/pds.py                      |   4 -
 autotest/gdrivers/pds4.py                     |  57 ---
 autotest/gdrivers/plmosaic.py                 |  56 ---
 autotest/gdrivers/png.py                      |  10 -
 autotest/gdrivers/png_profile.py              |  22 --
 autotest/gdrivers/postgisraster.py            |  10 -
 autotest/gdrivers/rda.py                      |  99 -----
 autotest/gdrivers/rl2.py                      |  37 --
 autotest/gdrivers/rraster.py                  |  14 -
 autotest/gdrivers/rs2.py                      |   1 -
 autotest/gdrivers/sentinel2.py                | 206 ----------
 autotest/gdrivers/srp.py                      |   6 -
 autotest/gdrivers/srtmhgt.py                  |   1 -
 autotest/gdrivers/tiff_profile.py             |  29 --
 autotest/gdrivers/vicar.py                    |   6 -
 autotest/gdrivers/vrtderived.py               |  14 -
 autotest/gdrivers/vrtmask.py                  |   1 -
 autotest/gdrivers/vrtovr.py                   |   4 -
 autotest/gdrivers/vrtpansharpen.py            |  81 ----
 autotest/gdrivers/vrtrawlink.py               |   1 -
 autotest/gdrivers/vrtwarp.py                  |  31 --
 autotest/gdrivers/wmts.py                     | 109 ------
 autotest/gdrivers/xyz.py                      |  14 -
 autotest/gnm/gnm_test.py                      |   2 -
 autotest/ogr/ogr_avc.py                       |   9 -
 autotest/ogr/ogr_basic_test.py                |  32 --
 autotest/ogr/ogr_cad.py                       |   2 -
 autotest/ogr/ogr_carto.py                     | 118 ------
 autotest/ogr/ogr_couchdb.py                   |   4 -
 autotest/ogr/ogr_csv.py                       | 167 --------
 autotest/ogr/ogr_csw.py                       |  40 --
 autotest/ogr/ogr_dgnv8.py                     |   9 -
 autotest/ogr/ogr_dxf.py                       |  56 ---
 autotest/ogr/ogr_eeda.py                      |  20 -
 autotest/ogr/ogr_elasticsearch.py             | 132 -------
 autotest/ogr/ogr_factory.py                   |   2 -
 autotest/ogr/ogr_feature.py                   |  62 ---
 autotest/ogr/ogr_fgdb.py                      | 182 ---------
 autotest/ogr/ogr_fgdb_stress_test.py          |   6 -
 autotest/ogr/ogr_geojson.py                   | 180 ---------
 autotest/ogr/ogr_geojsonseq.py                |  12 -
 autotest/ogr/ogr_geom.py                      | 367 ------------------
 autotest/ogr/ogr_gml_geom.py                  |  18 -
 autotest/ogr/ogr_gml_read.py                  | 179 ---------
 autotest/ogr/ogr_gmlas.py                     | 292 --------------
 autotest/ogr/ogr_gpkg.py                      | 358 +----------------
 autotest/ogr/ogr_idrisi.py                    |  40 --
 autotest/ogr/ogr_index_test.py                |  19 -
 autotest/ogr/ogr_jml.py                       |  28 --
 autotest/ogr/ogr_join_test.py                 |   5 -
 autotest/ogr/ogr_kml.py                       |  16 -
 autotest/ogr/ogr_libkml.py                    |  65 ----
 autotest/ogr/ogr_mem.py                       |  47 ---
 autotest/ogr/ogr_mitab.py                     | 115 ------
 autotest/ogr/ogr_mongodb.py                   |  78 ----
 autotest/ogr/ogr_mssqlspatial.py              |   2 -
 autotest/ogr/ogr_mvt.py                       | 116 ------
 autotest/ogr/ogr_mysql.py                     |  22 --
 autotest/ogr/ogr_oci.py                       |  29 --
 autotest/ogr/ogr_odbc.py                      |  10 -
 autotest/ogr/ogr_ods.py                       |  28 --
 autotest/ogr/ogr_openfilegdb.py               |  97 -----
 autotest/ogr/ogr_osm.py                       |  73 ----
 autotest/ogr/ogr_pcidsk.py                    |  23 --
 autotest/ogr/ogr_pdf.py                       |  23 --
 autotest/ogr/ogr_pg.py                        | 240 ------------
 autotest/ogr/ogr_pgdump.py                    |  29 --
 autotest/ogr/ogr_plscenes.py                  |  68 ----
 autotest/ogr/ogr_rfc35_mitab.py               |  26 --
 autotest/ogr/ogr_rfc35_sqlite.py              |  23 --
 autotest/ogr/ogr_rfc41.py                     | 176 ---------
 autotest/ogr/ogr_s57.py                       |   2 -
 autotest/ogr/ogr_segy.py                      |   8 -
 autotest/ogr/ogr_shape.py                     | 157 --------
 autotest/ogr/ogr_sql_rfc28.py                 |  85 ----
 autotest/ogr/ogr_sql_sqlite.py                |  70 ----
 autotest/ogr/ogr_sql_test.py                  |  36 --
 autotest/ogr/ogr_sqlite.py                    | 169 --------
 autotest/ogr/ogr_style.py                     |  16 -
 autotest/ogr/ogr_tiger.py                     |   3 -
 autotest/ogr/ogr_vdv.py                       |  32 --
 autotest/ogr/ogr_virtualogr.py                |  20 -
 autotest/ogr/ogr_vrt.py                       | 156 --------
 autotest/ogr/ogr_wfs.py                       | 229 -----------
 autotest/ogr/ogr_wfs3.py                      |  29 --
 autotest/ogr/ogr_wkbwkt_geom.py               |   2 -
 autotest/ogr/ogr_xls.py                       |  10 -
 autotest/ogr/ogr_xlsx.py                      |  22 --
 autotest/ogr/ograpispy.py                     |   3 -
 autotest/osr/osr_basic.py                     |  45 ---
 autotest/osr/osr_compd.py                     |   1 -
 autotest/osr/osr_epsg.py                      |  17 -
 autotest/osr/osr_esri.py                      |  10 -
 autotest/osr/osr_micoordsys.py                |   3 -
 autotest/osr/osr_proj4.py                     |  23 --
 autotest/pymod/ogrtest.py                     |   2 -
 autotest/pyscripts/test_gdal_calc.py          |   2 -
 autotest/pyscripts/test_gdal_edit.py          |  30 --
 autotest/pyscripts/test_gdal_pansharpen.py    |   2 -
 autotest/pyscripts/test_gdal_polygonize.py    |   2 -
 autotest/pyscripts/test_gdal_retile.py        |   4 -
 autotest/pyscripts/test_ogr2ogr_py.py         |   6 -
 autotest/pyscripts/test_ogrmerge.py           |  25 --
 autotest/utilities/test_gdal_grid_lib.py      |   2 -
 autotest/utilities/test_gdal_rasterize_lib.py |   6 -
 autotest/utilities/test_gdal_translate.py     |  16 -
 autotest/utilities/test_gdal_translate_lib.py |  12 -
 autotest/utilities/test_gdaladdo.py           |   3 -
 autotest/utilities/test_gdalbuildvrt.py       |   4 -
 autotest/utilities/test_gdaldem.py            |   3 -
 autotest/utilities/test_gdalinfo.py           |   4 -
 autotest/utilities/test_gdalinfo_lib.py       |   4 -
 autotest/utilities/test_gdalsrsinfo.py        |   3 -
 autotest/utilities/test_gdaltindex.py         |   5 -
 autotest/utilities/test_gdalwarp.py           |  26 --
 autotest/utilities/test_gdalwarp_lib.py       |  30 --
 autotest/utilities/test_gnmutils.py           |   3 -
 autotest/utilities/test_nearblack_lib.py      |   1 -
 autotest/utilities/test_ogr2ogr.py            |  47 ---
 autotest/utilities/test_ogr2ogr_lib.py        |  11 -
 autotest/utilities/test_ogrinfo.py            |  10 -
 autotest/utilities/test_ogrtindex.py          |   1 -
 193 files changed, 1 insertion(+), 8999 deletions(-)

diff --git a/autotest/alg/applyverticalshiftgrid.py b/autotest/alg/applyverticalshiftgrid.py
index 82c459452881..4dc642755058 100755
--- a/autotest/alg/applyverticalshiftgrid.py
+++ b/autotest/alg/applyverticalshiftgrid.py
@@ -47,23 +47,18 @@ def test_applyverticalshiftgrid_1():
     grid_ds = gdal.Translate('', src_ds, format='MEM')
     out_ds = gdal.ApplyVerticalShiftGrid(src_ds, grid_ds)
     if out_ds.GetRasterBand(1).DataType != gdal.GDT_Byte:
-        gdaltest.post_reason('fail')
         print(out_ds.GetRasterBand(1).DataType)
         return 'fail'
     if out_ds.RasterXSize != src_ds.RasterXSize:
-        gdaltest.post_reason('fail')
         print(out_ds.RasterXSize)
         return 'fail'
     if out_ds.RasterYSize != src_ds.RasterYSize:
-        gdaltest.post_reason('fail')
         print(out_ds.RasterYSize)
         return 'fail'
     if out_ds.GetGeoTransform() != src_ds.GetGeoTransform():
-        gdaltest.post_reason('fail')
         print(out_ds.GetGeoTransform())
         return 'fail'
     if out_ds.GetProjectionRef() != src_ds.GetProjectionRef():
-        gdaltest.post_reason('fail')
         print(out_ds.GetProjectionRef())
         return 'fail'
     # Check that we can drop the reference to the sources
@@ -72,7 +67,6 @@ def test_applyverticalshiftgrid_1():
 
     cs = out_ds.GetRasterBand(1).Checksum()
     if cs != 10038:
-        gdaltest.post_reason('fail')
         print(cs)
         return 'fail'
 
@@ -85,7 +79,6 @@ def test_applyverticalshiftgrid_1():
                                          options=['BLOCKSIZE=15'])
     cs = out_ds.GetRasterBand(1).Checksum()
     if cs != 10038:
-        gdaltest.post_reason('fail')
         print(cs)
         return 'fail'
 
@@ -93,12 +86,10 @@ def test_applyverticalshiftgrid_1():
     out_ds = gdal.ApplyVerticalShiftGrid(src_ds, src_ds, True,
                                          options=['DATATYPE=Float32'])
     if out_ds.GetRasterBand(1).DataType != gdal.GDT_Float32:
-        gdaltest.post_reason('fail')
         print(out_ds.GetRasterBand(1).DataType)
         return 'fail'
     cs = out_ds.GetRasterBand(1).Checksum()
     if cs != 0:
-        gdaltest.post_reason('fail')
         print(cs)
         return 'fail'
 
@@ -130,7 +121,6 @@ def test_applyverticalshiftgrid_2():
         with gdaltest.error_handler():
             out_ds = gdal.ApplyVerticalShiftGrid(src_ds, grid_ds)
         if out_ds is not None:
-            gdaltest.post_reason('fail')
             print(i)
             return 'fail'
 
@@ -144,7 +134,6 @@ def test_applyverticalshiftgrid_2():
     with gdaltest.error_handler():
         out_ds = gdal.ApplyVerticalShiftGrid(src_ds, grid_ds)
     if out_ds is not None:
-        gdaltest.post_reason('fail')
         return 'fail'
 
     # Non invertable grid geotransform
@@ -157,7 +146,6 @@ def test_applyverticalshiftgrid_2():
     with gdaltest.error_handler():
         out_ds = gdal.ApplyVerticalShiftGrid(src_ds, grid_ds)
     if out_ds is not None:
-        gdaltest.post_reason('fail')
         return 'fail'
 
     # No PROJ.4 translation for source SRS, coordinate transformation
@@ -171,7 +159,6 @@ def test_applyverticalshiftgrid_2():
     with gdaltest.error_handler():
         out_ds = gdal.ApplyVerticalShiftGrid(src_ds, grid_ds)
     if out_ds is not None:
-        gdaltest.post_reason('fail')
         return 'fail'
 
     # Out of memory
@@ -186,7 +173,6 @@ def test_applyverticalshiftgrid_2():
             out_ds = gdal.ApplyVerticalShiftGrid(src_ds, grid_ds,
                                                  options=['BLOCKSIZE=2000000000'])
         if out_ds is not None:
-            gdaltest.post_reason('fail')
             return 'fail'
 
     # Wrong DATATYPE
@@ -200,7 +186,6 @@ def test_applyverticalshiftgrid_2():
         out_ds = gdal.ApplyVerticalShiftGrid(src_ds, grid_ds,
                                              options=['DATATYPE=x'])
     if out_ds is not None:
-        gdaltest.post_reason('fail')
         return 'fail'
 
     return 'success'
@@ -217,24 +202,19 @@ def test_applyverticalshiftgrid_3():
     out_ds = gdal.ApplyVerticalShiftGrid(src_ds, grid_ds,
                                          options=['RESAMPLING=NEAREST'])
     if out_ds.RasterXSize != src_ds.RasterXSize:
-        gdaltest.post_reason('fail')
         print(out_ds.RasterXSize)
         return 'fail'
     if out_ds.RasterYSize != src_ds.RasterYSize:
-        gdaltest.post_reason('fail')
         print(out_ds.RasterYSize)
         return 'fail'
     if out_ds.GetGeoTransform() != src_ds.GetGeoTransform():
-        gdaltest.post_reason('fail')
         print(out_ds.GetGeoTransform())
         return 'fail'
     if out_ds.GetProjectionRef() != src_ds.GetProjectionRef():
-        gdaltest.post_reason('fail')
         print(out_ds.GetProjectionRef())
         return 'fail'
     cs = out_ds.GetRasterBand(1).Checksum()
     if cs != 5112:
-        gdaltest.post_reason('fail')
         print(cs)
         return 'fail'
 
@@ -242,7 +222,6 @@ def test_applyverticalshiftgrid_3():
                                          options=['RESAMPLING=BILINEAR'])
     cs = out_ds.GetRasterBand(1).Checksum()
     if cs != 4867 and cs != 4868:
-        gdaltest.post_reason('fail')
         print(cs)
         return 'fail'
 
@@ -250,7 +229,6 @@ def test_applyverticalshiftgrid_3():
                                          options=['RESAMPLING=CUBIC'])
     cs = out_ds.GetRasterBand(1).Checksum()
     if cs != 4841 and cs != 4854:
-        gdaltest.post_reason('fail')
         print(cs)
         return 'fail'
 
@@ -277,12 +255,10 @@ def test_applyverticalshiftgrid_4():
     grid_ds.GetRasterBand(1).Fill(30)
     out_ds = gdal.ApplyVerticalShiftGrid(src_ds, grid_ds)
     if out_ds.GetRasterBand(1).GetNoDataValue() != 1:
-        gdaltest.post_reason('fail')
         print(out_ds.GetRasterBand(1).GetNoDataValue())
         return 'fail'
     cs = out_ds.GetRasterBand(1).Checksum()
     if cs != 1:
-        gdaltest.post_reason('fail')
         print(cs)
         return 'fail'
 
@@ -298,12 +274,10 @@ def test_applyverticalshiftgrid_4():
     grid_ds.GetRasterBand(1).SetNoDataValue(30)
     out_ds = gdal.ApplyVerticalShiftGrid(src_ds, grid_ds)
     if out_ds.GetRasterBand(1).GetNoDataValue() is not None:
-        gdaltest.post_reason('fail')
         print(out_ds.GetRasterBand(1).GetNoDataValue())
         return 'fail'
     cs = out_ds.GetRasterBand(1).Checksum()
     if cs != 1:
-        gdaltest.post_reason('fail')
         print(cs)
         return 'fail'
 
@@ -320,7 +294,6 @@ def test_applyverticalshiftgrid_4():
     with gdaltest.error_handler():
         data = out_ds.GetRasterBand(1).ReadRaster()
     if data is not None:
-        gdaltest.post_reason('fail')
         return 'fail'
 
     # ERROR_ON_MISSING_VERT_SHIFT due to nodata in grid
@@ -337,7 +310,6 @@ def test_applyverticalshiftgrid_4():
     with gdaltest.error_handler():
         data = out_ds.GetRasterBand(1).ReadRaster()
     if data is not None:
-        gdaltest.post_reason('fail')
         return 'fail'
 
     return 'success'
@@ -357,7 +329,6 @@ def test_applyverticalshiftgrid_5():
     out_ds = gdal.ApplyVerticalShiftGrid(src_ds, grid_ds, srcUnitToMeter=2)
     cs = out_ds.GetRasterBand(1).Checksum()
     if cs != 4672:
-        gdaltest.post_reason('fail')
         print(cs)
         return 'fail'
 
@@ -370,7 +341,6 @@ def test_applyverticalshiftgrid_5():
     out_ds = gdal.ApplyVerticalShiftGrid(src_ds, grid_ds, dstUnitToMeter=0.5)
     cs = out_ds.GetRasterBand(1).Checksum()
     if cs != 4672:
-        gdaltest.post_reason('fail')
         print(cs)
         return 'fail'
 
@@ -392,7 +362,6 @@ def test_applyverticalshiftgrid_6():
                    dstSRS='+proj=utm +zone=11 +datum=NAD27 +geoidgrids=/vsimem/applyverticalshiftgrid_6.gtx +vunits=m +no_defs')
     cs = ds.GetRasterBand(1).Checksum()
     if cs != 4783:
-        gdaltest.post_reason('fail')
         print(cs)
         return 'fail'
 
@@ -416,7 +385,6 @@ def test_applyverticalshiftgrid_7():
                    dstSRS='+proj=utm +zone=11 +datum=NAD27 +geoidgrids=/vsimem/applyverticalshiftgrid_7.gtx +vunits=m +no_defs')
     cs = ds.GetRasterBand(1).Checksum()
     if cs != 4783:
-        gdaltest.post_reason('fail')
         print(cs)
         return 'fail'
 
diff --git a/autotest/alg/contour.py b/autotest/alg/contour.py
index fa8664e58298..2b749d083578 100755
--- a/autotest/alg/contour.py
+++ b/autotest/alg/contour.py
@@ -216,7 +216,6 @@ def test_contour_real_world_case():
 
     ogr_lyr.SetAttributeFilter('elev = 330')
     if ogr_lyr.GetFeatureCount() != 1:
-        gdaltest.post_reason('fail')
         return 'fail'
     f = ogr_lyr.GetNextFeature()
     if ogrtest.check_feature_geometry(f, 'LINESTRING (4.50497512437811 11.5,4.5 11.501996007984,3.5 11.8333333333333,2.5 11.5049751243781,2.490099009901 11.5,2.0 10.5,2.5 10.1666666666667,3.0 9.5,3.5 9.21428571428571,4.49800399201597 8.5,4.5 8.49857346647646,5.5 8.16666666666667,6.5 8.0,7.5 8.0,8.0 7.5,8.5 7.0,9.490099009901 6.5,9.5 6.49667774086379,10.5 6.16666666666667,11.4950248756219 5.5,11.5 5.49833610648919,12.5 5.49667774086379,13.5 5.49800399201597,13.501996007984 5.5,13.5 5.50199600798403,12.501996007984 6.5,12.5 6.50142653352354,11.5 6.509900990099,10.509900990099 7.5,10.5 7.50142653352354,9.5 7.9,8.50332225913621 8.5,8.5 8.50249376558603,7.83333333333333 9.5,7.5 10.0,7.0 10.5,6.5 10.7857142857143,5.5 11.1666666666667,4.50497512437811 11.5)', 0.01) != 0:
diff --git a/autotest/alg/reproject.py b/autotest/alg/reproject.py
index c01495cf058a..045ddf8775df 100755
--- a/autotest/alg/reproject.py
+++ b/autotest/alg/reproject.py
@@ -119,7 +119,6 @@ def test_reproject_3():
     got_data = dst_ds.GetRasterBand(1).ReadRaster(0, 0, 6, 3).decode('latin1')
     expected_data = '\x03\x7f\x7f\x7f\x03\x03\x03\x7f\x7f\x7f\x03\x03\x03\x7f\x7f\x7f\x03\x03'
     if got_data != expected_data:
-        gdaltest.post_reason('fail')
         import struct
         print(struct.unpack('B' * 18, got_data))
         return 'fail'
@@ -146,7 +145,6 @@ def test_reproject_4():
     got_data = dst_ds.GetRasterBand(1).ReadRaster(0, 0, 6, 3).decode('latin1')
     expected_data = '\x03\x7f\x7f\x7f\x03\x03\x03\x7f\x7f\x7f\x03\x03\x03\x7f\x7f\x7f\x03\x03'
     if got_data != expected_data:
-        gdaltest.post_reason('fail')
         import struct
         print(struct.unpack('B' * 18, got_data))
         return 'fail'
diff --git a/autotest/alg/warp.py b/autotest/alg/warp.py
index 8100815ff267..56c0a87ad32c 100755
--- a/autotest/alg/warp.py
+++ b/autotest/alg/warp.py
@@ -1110,7 +1110,6 @@ def test_warp_29():
     gdal.SetConfigOption('WARP_THREAD_CHUNK_SIZE', None)
 
     if cs_monothread != cs_multithread:
-        gdaltest.post_reason('failed')
         return 'fail'
 
     old_val = gdal.GetConfigOption('GDAL_NUM_THREADS')
@@ -1123,7 +1122,6 @@ def test_warp_29():
     gdal.SetConfigOption('WARP_THREAD_CHUNK_SIZE', None)
 
     if cs_monothread != cs_multithread:
-        gdaltest.post_reason('failed')
         return 'fail'
 
     src_ds = gdal.Open('../gcore/data/byte.tif')
@@ -1138,7 +1136,6 @@ def test_warp_29():
     ds = None
 
     if got_cs != src_ds.GetRasterBand(1).Checksum():
-        gdaltest.post_reason('failed')
         return 'fail'
 
     ds = gdal.Open('data/byte_tps.vrt')
@@ -1151,7 +1148,6 @@ def test_warp_29():
     ds = None
 
     if got_cs != src_ds.GetRasterBand(1).Checksum():
-        gdaltest.post_reason('failed')
         return 'fail'
 
     src_ds = None
@@ -1215,7 +1211,6 @@ def test_warp_30():
     gdal.PopErrorHandler()
 
     if ret == 0:
-        gdaltest.post_reason('failed')
         return 'fail'
 
     old_val = gdal.GetConfigOption('GDAL_NUM_THREADS')
@@ -1234,7 +1229,6 @@ def test_warp_30():
     gdal.SetConfigOption('GDAL_NUM_THREADS', old_val)
 
     if ret == 0:
-        gdaltest.post_reason('failed')
         return 'fail'
 
     gdal.Unlink('/vsimem/warp_30.tif')
@@ -1386,7 +1380,6 @@ def test_warp_37():
     gdal.PopErrorHandler()
     gdal.ErrorReset()
     if tmp_ds is not None:
-        gdaltest.post_reason('fail')
         return 'fail'
 
     # Incompatible projection (UTM 40 is on the other side of the earth w.r.t UTM 11)
@@ -1400,7 +1393,6 @@ def test_warp_37():
     gdal.PopErrorHandler()
     gdal.ErrorReset()
     if tmp_ds is not None:
-        gdaltest.post_reason('fail')
         return 'fail'
 
     return 'success'
@@ -1520,16 +1512,13 @@ def test_warp_41():
 
     vrt_ds = gdal.AutoCreateWarpedVRT(src_ds, None, None, gdal.GRA_NearestNeighbour, 0.3)
     if vrt_ds.RasterXSize != src_ds.RasterXSize:
-        gdaltest.post_reason('fail')
         return 'fail'
     if vrt_ds.RasterYSize != src_ds.RasterYSize:
-        gdaltest.post_reason('fail')
         return 'fail'
     src_gt = src_ds.GetGeoTransform()
     vrt_gt = vrt_ds.GetGeoTransform()
     for i in range(6):
         if abs(src_gt[i] - vrt_gt[i]) > 1e-5:
-            gdaltest.post_reason('fail')
             return 'fail'
 
     return 'success'
@@ -1792,7 +1781,6 @@ def test_warp_52():
 
     cs = out_ds.GetRasterBand(4).Checksum()
     if cs != 3188:
-        gdaltest.post_reason('fail')
         print(cs)
         return 'fail'
 
@@ -1829,7 +1817,6 @@ def test_warp_53():
                 cs1 = dst_ds.GetRasterBand(1).Checksum()
                 cs2 = dst_ds.GetRasterBand(2).Checksum()
                 if cs1 not in expected_cs or cs2 not in [3903, 4138]:
-                    gdaltest.post_reason('fail')
                     print(typestr)
                     print(option)
                     print(alg_name)
@@ -1853,7 +1840,6 @@ def test_warp_54():
         expected_cs = src_ds.GetRasterBand(i + 1).Checksum()
         got_cs = dst_ds.GetRasterBand(i + 1).Checksum()
         if expected_cs != got_cs:
-            gdaltest.post_reason('fail')
             print(i)
             print(got_cs)
             print(expected_cs)
@@ -1867,7 +1853,6 @@ def test_warp_54():
         expected_cs = src_ds.GetRasterBand(i + 1).Checksum()
         got_cs = dst_ds.GetRasterBand(i + 1).Checksum()
         if expected_cs != got_cs:
-            gdaltest.post_reason('fail')
             print(i)
             print(got_cs)
             print(expected_cs)
@@ -1883,7 +1868,6 @@ def test_warp_54():
         expected_cs = src_ds.GetRasterBand(i + 1).Checksum()
         got_cs = dst_ds.GetRasterBand(i + 1).Checksum()
         if expected_cs != got_cs:
-            gdaltest.post_reason('fail')
             print(i)
             print(got_cs)
             print(expected_cs)
@@ -1904,7 +1888,6 @@ def test_warp_55():
     ds = gdal.Open('data/warpedvrt_with_ovr.vrt')
     cs = ds.GetRasterBand(1).GetOverview(0).Checksum()
     if cs != 25128:
-        gdaltest.post_reason('fail')
         print(cs)
         return 'fail'
     ds = None
diff --git a/autotest/gcore/basic_test.py b/autotest/gcore/basic_test.py
index 0756ac2fdea0..6974d8be255b 100755
--- a/autotest/gcore/basic_test.py
+++ b/autotest/gcore/basic_test.py
@@ -181,7 +181,6 @@ def test_basic_test_8():
 
     ret = gdal.VersionInfo('RELEASE_DATE')
     if len(ret) != 8:
-        gdaltest.post_reason('fail')
         print(ret)
         return 'fail'
 
@@ -191,7 +190,6 @@ def test_basic_test_8():
 
     ret = gdaltest.runexternal(python_exe + ' basic_test.py LICENSE 0')
     if ret.find('GDAL/OGR is released under the MIT/X license') != 0 and ret.find('GDAL/OGR Licensing') < 0:
-        gdaltest.post_reason('fail')
         print(ret)
         return 'fail'
 
@@ -201,7 +199,6 @@ def test_basic_test_8():
     ret = gdaltest.runexternal(python_exe + ' basic_test.py LICENSE 1')
     os.unlink('tmp/LICENSE.TXT')
     if ret.find('fake_license') != 0 and ret.find('GDAL/OGR Licensing') < 0:
-        gdaltest.post_reason('fail')
         print(ret)
         return 'fail'
 
@@ -227,15 +224,12 @@ def test_basic_test_9():
     gdal.PopErrorHandler()
 
     if gdaltest.eErrClass != 1:
-        gdaltest.post_reason('fail')
         return 'fail'
 
     if gdaltest.err_no != 2:
-        gdaltest.post_reason('fail')
         return 'fail'
 
     if gdaltest.msg != 'test':
-        gdaltest.post_reason('fail')
         return 'fail'
 
     return 'success'
@@ -269,15 +263,12 @@ def test_basic_test_10():
     gdal.PopErrorHandler()
 
     if error_handler.eErrClass != 1:
-        gdaltest.post_reason('fail')
         return 'fail'
 
     if error_handler.err_no != 2:
-        gdaltest.post_reason('fail')
         return 'fail'
 
     if error_handler.msg != 'test':
-        gdaltest.post_reason('fail')
         return 'fail'
 
     return 'success'
@@ -290,103 +281,83 @@ def test_basic_test_11():
 
     ds = gdal.OpenEx('data/byte.tif')
     if ds is None:
-        gdaltest.post_reason('fail')
         return 'fail'
 
     ds = gdal.OpenEx('data/byte.tif', gdal.OF_RASTER)
     if ds is None:
-        gdaltest.post_reason('fail')
         return 'fail'
 
     ds = gdal.OpenEx('data/byte.tif', gdal.OF_VECTOR)
     if ds is not None:
-        gdaltest.post_reason('fail')
         return 'fail'
 
     ds = gdal.OpenEx('data/byte.tif', gdal.OF_RASTER | gdal.OF_VECTOR)
     if ds is None:
-        gdaltest.post_reason('fail')
         return 'fail'
 
     ds = gdal.OpenEx('data/byte.tif', gdal.OF_ALL)
     if ds is None:
-        gdaltest.post_reason('fail')
         return 'fail'
 
     ds = gdal.OpenEx('data/byte.tif', gdal.OF_UPDATE)
     if ds is None:
-        gdaltest.post_reason('fail')
         return 'fail'
 
     ds = gdal.OpenEx('data/byte.tif', gdal.OF_RASTER | gdal.OF_VECTOR | gdal.OF_UPDATE | gdal.OF_VERBOSE_ERROR)
     if ds is None:
-        gdaltest.post_reason('fail')
         return 'fail'
 
     ds = gdal.OpenEx('data/byte.tif', allowed_drivers=[])
     if ds is None:
-        gdaltest.post_reason('fail')
         return 'fail'
 
     ds = gdal.OpenEx('data/byte.tif', allowed_drivers=['GTiff'])
     if ds is None:
-        gdaltest.post_reason('fail')
         return 'fail'
 
     ds = gdal.OpenEx('data/byte.tif', allowed_drivers=['PNG'])
     if ds is not None:
-        gdaltest.post_reason('fail')
         return 'fail'
 
     with gdaltest.error_handler():
         ds = gdal.OpenEx('data/byte.tif', open_options=['FOO'])
     if ds is None:
-        gdaltest.post_reason('fail')
         return 'fail'
 
     ar_ds = [gdal.OpenEx('data/byte.tif', gdal.OF_SHARED) for _ in range(1024)]
     if ar_ds[1023] is None:
-        gdaltest.post_reason('fail')
         return 'fail'
     ar_ds = None
 
     ds = gdal.OpenEx('../ogr/data/poly.shp', gdal.OF_RASTER)
     if ds is not None:
-        gdaltest.post_reason('fail')
         return 'fail'
 
     ds = gdal.OpenEx('../ogr/data/poly.shp', gdal.OF_VECTOR)
     if ds is None:
-        gdaltest.post_reason('fail')
         return 'fail'
     if ds.GetLayerCount() != 1:
-        gdaltest.post_reason('fail')
         return 'fail'
     if ds.GetLayer(0) is None:
-        gdaltest.post_reason('fail')
         return 'fail'
     ds.GetLayer(0).GetMetadata()
 
     ds = gdal.OpenEx('../ogr/data/poly.shp', allowed_drivers=['ESRI Shapefile'])
     if ds is None:
-        gdaltest.post_reason('fail')
         return 'fail'
 
     ds = gdal.OpenEx('../ogr/data/poly.shp', gdal.OF_RASTER | gdal.OF_VECTOR)
     if ds is None:
-        gdaltest.post_reason('fail')
         return 'fail'
 
     ds = gdal.OpenEx('non existing')
     if ds is not None or gdal.GetLastErrorMsg() != '':
-        gdaltest.post_reason('fail')
         return 'fail'
 
     gdal.PushErrorHandler('CPLQuietErrorHandler')
     ds = gdal.OpenEx('non existing', gdal.OF_VERBOSE_ERROR)
     gdal.PopErrorHandler()
     if ds is not None or gdal.GetLastErrorMsg() == '':
-        gdaltest.post_reason('fail')
         return 'fail'
 
     old_use_exceptions_status = gdal.GetUseExceptions()
@@ -399,7 +370,6 @@ def test_basic_test_11():
     if old_use_exceptions_status == 0:
         gdal.DontUseExceptions()
     if not got_exception:
-        gdaltest.post_reason('fail')
         return 'fail'
 
     return 'success'
@@ -412,50 +382,38 @@ def test_basic_test_12():
 
     ds = gdal.GetDriverByName('MEMORY').Create('bar', 0, 0, 0)
     if ds.GetDescription() != 'bar':
-        gdaltest.post_reason('failure')
         print(ds.GetDescription())
         return 'fail'
     lyr = ds.CreateLayer("foo")
     if lyr is None:
-        gdaltest.post_reason('failure')
         return 'fail'
     if lyr.GetDescription() != 'foo':
-        gdaltest.post_reason('failure')
         print(lyr.GetDescription())
         return 'fail'
     from osgeo import ogr
     if lyr.TestCapability(ogr.OLCCreateField) != 1:
-        gdaltest.post_reason('failure')
         return 'fail'
     if ds.GetLayerCount() != 1:
-        gdaltest.post_reason('failure')
         return 'fail'
     lyr = ds.GetLayerByName("foo")
     if lyr is None:
-        gdaltest.post_reason('failure')
         return 'fail'
     lyr = ds.GetLayerByIndex(0)
     if lyr is None:
-        gdaltest.post_reason('failure')
         return 'fail'
     lyr = ds.GetLayer(0)
     if lyr is None:
-        gdaltest.post_reason('failure')
         return 'fail'
     sql_lyr = ds.ExecuteSQL('SELECT * FROM foo')
     if sql_lyr is None:
-        gdaltest.post_reason('failure')
         return 'fail'
     ds.ReleaseResultSet(sql_lyr)
     new_lyr = ds.CopyLayer(lyr, 'bar')
     if new_lyr is None:
-        gdaltest.post_reason('failure')
         return 'fail'
     if ds.DeleteLayer(0) != 0:
-        gdaltest.post_reason('failure')
         return 'fail'
     if ds.DeleteLayer('bar') != 0:
-        gdaltest.post_reason('failure')
         return 'fail'
     ds.SetStyleTable(ds.GetStyleTable())
     ds = None
@@ -484,19 +442,14 @@ def test_basic_test_13():
             ds.SetMetadataItem("ScaleBounds.MaxScale", "2000000")
 
         if ds.GetMetadataItem('scalebounds') != 'True':
-            gdaltest.post_reason('failure')
             return 'fail'
         if ds.GetMetadataItem('ScaleBounds') != 'True':
-            gdaltest.post_reason('failure')
             return 'fail'
         if ds.GetMetadataItem('SCALEBOUNDS') != 'True':
-            gdaltest.post_reason('failure')
             return 'fail'
         if ds.GetMetadataItem('ScaleBounds.MinScale') != '0':
-            gdaltest.post_reason('failure')
             return 'fail'
         if ds.GetMetadataItem('ScaleBounds.MaxScale') != '2000000':
-            gdaltest.post_reason('failure')
             return 'fail'
     ds = None
 
@@ -505,7 +458,6 @@ def test_basic_test_13():
         ds.SetMetadataItem("FILENAME_%d" % i, "%d" % i)
     for i in range(200):
         if ds.GetMetadataItem("FILENAME_%d" % i) != '%d' % i:
-            gdaltest.post_reason('failure')
             return 'fail'
 
     return 'success'
@@ -520,50 +472,42 @@ def test_basic_test_14():
 
     ds.SetMetadata('foo')
     if ds.GetMetadata_List() != ['foo']:
-        gdaltest.post_reason('failure')
         return 'fail'
 
     try:
         ds.SetMetadata(5)
-        gdaltest.post_reason('failure')
         return 'fail'
     except:
         pass
 
     ds.SetMetadata(['foo=bar'])
     if ds.GetMetadata_List() != ['foo=bar']:
-        gdaltest.post_reason('failure')
         return 'fail'
 
     try:
         ds.SetMetadata([5])
-        gdaltest.post_reason('failure')
         return 'fail'
     except:
         pass
 
     ds.SetMetadata({'foo': 'baz'})
     if ds.GetMetadata_List() != ['foo=baz']:
-        gdaltest.post_reason('failure')
         return 'fail'
 
     try:
         ds.SetMetadata({'foo': 5})
-        gdaltest.post_reason('failure')
         return 'fail'
     except:
         pass
 
     try:
         ds.SetMetadata({5: 'baz'})
-        gdaltest.post_reason('failure')
         return 'fail'
     except:
         pass
 
     try:
         ds.SetMetadata({5: 6})
-        gdaltest.post_reason('failure')
         return 'fail'
     except:
         pass
@@ -575,24 +519,20 @@ def test_basic_test_14():
 
     ds.SetMetadata({'bar': val})
     if ds.GetMetadata()['bar'] != val:
-        gdaltest.post_reason('failure')
         return 'fail'
 
     ds.SetMetadata({val: 'baz'})
     if ds.GetMetadata()[val] != 'baz':
-        gdaltest.post_reason('failure')
         return 'fail'
 
     try:
         ds.SetMetadata({val: 5})
-        gdaltest.post_reason('failure')
         return 'fail'
     except:
         pass
 
     try:
         ds.SetMetadata({5: val})
-        gdaltest.post_reason('failure')
         return 'fail'
     except:
         pass
@@ -622,7 +562,6 @@ def test_basic_test_15():
     try:
         with gdaltest.error_handler():
             gdal.GetDriverByName('MEM').CreateCopy('', gdal.GetDriverByName('MEM').Create('', 1, 1), callback='foo')
-        gdaltest.post_reason('fail')
         return 'fail'
     except:
         pass
@@ -630,19 +569,16 @@ def test_basic_test_15():
     with gdaltest.error_handler():
         ds = gdal.GetDriverByName('MEM').CreateCopy('', gdal.GetDriverByName('MEM').Create('', 1, 1), callback=basic_test_15_cbk_no_argument)
     if ds is not None:
-        gdaltest.post_reason('fail')
         return 'fail'
 
     with gdaltest.error_handler():
         ds = gdal.GetDriverByName('MEM').CreateCopy('', gdal.GetDriverByName('MEM').Create('', 1, 1), callback=basic_test_15_cbk_no_ret)
     if ds is None:
-        gdaltest.post_reason('fail')
         return 'fail'
 
     with gdaltest.error_handler():
         ds = gdal.GetDriverByName('MEM').CreateCopy('', gdal.GetDriverByName('MEM').Create('', 1, 1), callback=basic_test_15_cbk_bad_ret)
     if ds is not None:
-        gdaltest.post_reason('fail')
         return 'fail'
 
     return 'success'
@@ -656,7 +592,6 @@ def test_basic_test_16():
     gdal.ErrorReset()
     gdal.OpenEx('data/byte.tif', open_options=['@UNRECOGNIZED=FOO'])
     if gdal.GetLastErrorMsg() != '':
-        gdaltest.post_reason('fail')
         return 'fail'
 
     gdal.ErrorReset()
@@ -665,7 +600,6 @@ def test_basic_test_16():
         gdal.OpenEx('/vsimem/temp.tif', gdal.OF_UPDATE, open_options=['@NUM_THREADS=INVALID'])
     gdal.Unlink('/vsimem/temp.tif')
     if gdal.GetLastErrorMsg() != 'Invalid value for NUM_THREADS: INVALID':
-        gdaltest.post_reason('fail')
         print(gdal.GetLastErrorMsg())
         return 'fail'
 
@@ -689,10 +623,8 @@ def test_basic_test_17():
         gdal.DontUseExceptions()
         ogr.DontUseExceptions()
         if gdal.GetUseExceptions():
-            gdaltest.post_reason('fail')
             return 'fail'
         if ogr.GetUseExceptions():
-            gdaltest.post_reason('fail')
             return 'fail'
 
     for _ in range(2):
@@ -714,10 +646,8 @@ def test_basic_test_17():
             gdaltest.post_reason('expected failure')
             return 'fail'
         if gdal.GetUseExceptions():
-            gdaltest.post_reason('fail')
             return 'fail'
         if ogr.GetUseExceptions():
-            gdaltest.post_reason('fail')
             return 'fail'
 
     return 'success'
diff --git a/autotest/gcore/gdal_api_proxy.py b/autotest/gcore/gdal_api_proxy.py
index 9b886389d6cb..9f3b49b72bd1 100755
--- a/autotest/gcore/gdal_api_proxy.py
+++ b/autotest/gcore/gdal_api_proxy.py
@@ -137,7 +137,6 @@ def test_gdal_api_proxy_sub():
 
     drv = gdal.IdentifyDriver('data/byte.tif')
     if drv.GetDescription() != 'API_PROXY':
-        gdaltest.post_reason('fail')
         return 'fail'
 
     ds = gdal.GetDriverByName('GTiff').Create('tmp/byte.tif', 1, 1, 3)
@@ -147,7 +146,6 @@ def test_gdal_api_proxy_sub():
     ds = gdal.GetDriverByName('GTiff').CreateCopy('tmp/byte.tif', src_ds, options=['TILED=YES'])
     got_cs = ds.GetRasterBand(1).Checksum()
     if src_cs != got_cs:
-        gdaltest.post_reason('fail')
         return 'fail'
     ds = None
 
@@ -156,26 +154,21 @@ def test_gdal_api_proxy_sub():
     ds.SetGeoTransform([1, 2, 3, 4, 5, 6])
     got_gt = ds.GetGeoTransform()
     if src_gt == got_gt:
-        gdaltest.post_reason('fail')
         return 'fail'
 
     ds.SetGeoTransform(src_gt)
     got_gt = ds.GetGeoTransform()
     if src_gt != got_gt:
-        gdaltest.post_reason('fail')
         return 'fail'
 
     if ds.GetGCPCount() != 0:
-        gdaltest.post_reason('fail')
         return 'fail'
 
     if ds.GetGCPProjection() != '':
         print(ds.GetGCPProjection())
-        gdaltest.post_reason('fail')
         return 'fail'
 
     if ds.GetGCPs():
-        gdaltest.post_reason('fail')
         return 'fail'
 
     gcps = [gdal.GCP(0, 1, 2, 3, 4)]
@@ -183,37 +176,31 @@ def test_gdal_api_proxy_sub():
 
     got_gcps = ds.GetGCPs()
     if len(got_gcps) != 1:
-        gdaltest.post_reason('fail')
         return 'fail'
 
     if got_gcps[0].GCPLine != gcps[0].GCPLine or  \
        got_gcps[0].GCPPixel != gcps[0].GCPPixel or  \
        got_gcps[0].GCPX != gcps[0].GCPX or \
        got_gcps[0].GCPY != gcps[0].GCPY:
-        gdaltest.post_reason('fail')
         return 'fail'
 
     if ds.GetGCPProjection() != 'foo':
-        gdaltest.post_reason('fail')
         print(ds.GetGCPProjection())
         return 'fail'
 
     ds.SetGCPs([], "")
 
     if ds.GetGCPs():
-        gdaltest.post_reason('fail')
         return 'fail'
 
     ds.SetProjection('')
     got_prj = ds.GetProjectionRef()
     if src_prj == got_prj:
-        gdaltest.post_reason('fail')
         return 'fail'
 
     ds.SetProjection(src_prj)
     got_prj = ds.GetProjectionRef()
     if src_prj != got_prj:
-        gdaltest.post_reason('fail')
         print(src_prj)
         print(got_prj)
         return 'fail'
@@ -221,25 +208,21 @@ def test_gdal_api_proxy_sub():
     ds.GetRasterBand(1).Fill(0)
     got_cs = ds.GetRasterBand(1).Checksum()
     if got_cs != 0:
-        gdaltest.post_reason('fail')
         return 'fail'
 
     ds.GetRasterBand(1).WriteRaster(0, 0, 20, 20, src_data)
     got_cs = ds.GetRasterBand(1).Checksum()
     if src_cs != got_cs:
-        gdaltest.post_reason('fail')
         return 'fail'
 
     ds.GetRasterBand(1).Fill(0)
     got_cs = ds.GetRasterBand(1).Checksum()
     if got_cs != 0:
-        gdaltest.post_reason('fail')
         return 'fail'
 
     ds.WriteRaster(0, 0, 20, 20, src_data)
     got_cs = ds.GetRasterBand(1).Checksum()
     if src_cs != got_cs:
-        gdaltest.post_reason('fail')
         return 'fail'
 
     # Not bound to SWIG
@@ -247,41 +230,33 @@ def test_gdal_api_proxy_sub():
 
     got_data = ds.ReadRaster(0, 0, 20, 20)
     if src_data != got_data:
-        gdaltest.post_reason('fail')
         return 'fail'
 
     got_data = ds.GetRasterBand(1).ReadRaster(0, 0, 20, 20)
     if src_data != got_data:
-        gdaltest.post_reason('fail')
         return 'fail'
 
     got_data_weird_spacing = ds.ReadRaster(0, 0, 20, 20, buf_pixel_space=1, buf_line_space=32)
     if len(got_data_weird_spacing) != 32 * (20 - 1) + 20:
-        gdaltest.post_reason('fail')
         print(len(got_data_weird_spacing))
         return 'fail'
 
     if got_data[20:20 + 20] != got_data_weird_spacing[32:32 + 20]:
-        gdaltest.post_reason('fail')
         return 'fail'
 
     got_data_weird_spacing = ds.GetRasterBand(1).ReadRaster(0, 0, 20, 20, buf_pixel_space=1, buf_line_space=32)
     if len(got_data_weird_spacing) != 32 * (20 - 1) + 20:
-        gdaltest.post_reason('fail')
         print(len(got_data_weird_spacing))
         return 'fail'
 
     if got_data[20:20 + 20] != got_data_weird_spacing[32:32 + 20]:
-        gdaltest.post_reason('fail')
         return 'fail'
 
     got_block = ds.GetRasterBand(1).ReadBlock(0, 0)
     if len(got_block) != 256 * 256:
-        gdaltest.post_reason('fail')
         return 'fail'
 
     if got_data[20:20 + 20] != got_block[256:256 + 20]:
-        gdaltest.post_reason('fail')
         return 'fail'
 
     ds.FlushCache()
@@ -289,304 +264,239 @@ def test_gdal_api_proxy_sub():
 
     got_data = ds.GetRasterBand(1).ReadRaster(0, 0, 20, 20)
     if src_data != got_data:
-        gdaltest.post_reason('fail')
         return 'fail'
 
     if len(ds.GetFileList()) != 1:
-        gdaltest.post_reason('fail')
         return 'fail'
 
     if ds.AddBand(gdal.GDT_Byte) == 0:
-        gdaltest.post_reason('fail')
         return 'fail'
 
     got_md = ds.GetMetadata()
     if src_md != got_md:
-        gdaltest.post_reason('fail')
         print(src_md)
         print(got_md)
         return 'fail'
 
     if ds.GetMetadataItem('AREA_OR_POINT') != 'Area':
-        gdaltest.post_reason('fail')
         return 'fail'
 
     if ds.GetMetadataItem('foo') is not None:
-        gdaltest.post_reason('fail')
         return 'fail'
 
     ds.SetMetadataItem('foo', 'bar')
     if ds.GetMetadataItem('foo') != 'bar':
-        gdaltest.post_reason('fail')
         return 'fail'
 
     ds.SetMetadata({'foo': 'baz'}, 'OTHER')
     if ds.GetMetadataItem('foo', 'OTHER') != 'baz':
-        gdaltest.post_reason('fail')
         return 'fail'
 
     ds.GetRasterBand(1).SetMetadata({'foo': 'baw'}, 'OTHER')
     if ds.GetRasterBand(1).GetMetadataItem('foo', 'OTHER') != 'baw':
-        gdaltest.post_reason('fail')
         return 'fail'
 
     if ds.GetMetadataItem('INTERLEAVE', 'IMAGE_STRUCTURE') != 'BAND':
-        gdaltest.post_reason('fail')
         return 'fail'
 
     if ds.GetRasterBand(1).GetMetadata():
-        gdaltest.post_reason('fail')
         print(ds.GetRasterBand(1).GetMetadata())
         return 'fail'
 
     if ds.GetRasterBand(1).GetMetadataItem('foo') is not None:
-        gdaltest.post_reason('fail')
         return 'fail'
 
     ds.GetRasterBand(1).SetMetadataItem('foo', 'baz')
     if ds.GetRasterBand(1).GetMetadataItem('foo') != 'baz':
-        gdaltest.post_reason('fail')
         return 'fail'
 
     ds.GetRasterBand(1).SetMetadata({'foo': 'baw'})
     if ds.GetRasterBand(1).GetMetadataItem('foo') != 'baw':
-        gdaltest.post_reason('fail')
         return 'fail'
 
     if ds.GetRasterBand(1).GetColorInterpretation() != gdal.GCI_GrayIndex:
-        gdaltest.post_reason('fail')
         return 'fail'
 
     ds.GetRasterBand(1).SetColorInterpretation(gdal.GCI_Undefined)
 
     ct = ds.GetRasterBand(1).GetColorTable()
     if ct is not None:
-        gdaltest.post_reason('fail')
         return 'fail'
 
     ct = gdal.ColorTable()
     ct.SetColorEntry(0, (1, 2, 3))
     if ds.GetRasterBand(1).SetColorTable(ct) != 0:
-        gdaltest.post_reason('fail')
         return 'fail'
 
     ct = ds.GetRasterBand(1).GetColorTable()
     if ct is None:
-        gdaltest.post_reason('fail')
         return 'fail'
     if ct.GetColorEntry(0) != (1, 2, 3, 255):
-        gdaltest.post_reason('fail')
         return 'fail'
 
     ct = ds.GetRasterBand(1).GetColorTable()
     if ct is None:
-        gdaltest.post_reason('fail')
         return 'fail'
 
     if ds.GetRasterBand(1).SetColorTable(None) != 0:
-        gdaltest.post_reason('fail')
         return 'fail'
 
     ct = ds.GetRasterBand(1).GetColorTable()
     if ct is not None:
-        gdaltest.post_reason('fail')
         return 'fail'
 
     rat = ds.GetRasterBand(1).GetDefaultRAT()
     if rat is not None:
-        gdaltest.post_reason('fail')
         return 'fail'
 
     if ds.GetRasterBand(1).SetDefaultRAT(None) != 0:
-        gdaltest.post_reason('fail')
         return 'fail'
 
     ref_rat = gdal.RasterAttributeTable()
     if ds.GetRasterBand(1).SetDefaultRAT(ref_rat) != 0:
-        gdaltest.post_reason('fail')
         return 'fail'
 
     rat = ds.GetRasterBand(1).GetDefaultRAT()
     if rat is not None:
-        gdaltest.post_reason('fail')
         return 'fail'
 
     if ds.GetRasterBand(1).SetDefaultRAT(None) != 0:
-        gdaltest.post_reason('fail')
         return 'fail'
 
     rat = ds.GetRasterBand(1).GetDefaultRAT()
     if rat is not None:
-        gdaltest.post_reason('fail')
         return 'fail'
 
     if ds.GetRasterBand(1).GetMinimum() is not None:
-        gdaltest.post_reason('fail')
         return 'fail'
 
     got_stats = ds.GetRasterBand(1).GetStatistics(0, 0)
     if got_stats[3] >= 0.0:
-        gdaltest.post_reason('fail')
         return 'fail'
 
     got_stats = ds.GetRasterBand(1).GetStatistics(1, 1)
     if got_stats[0] != 74.0:
-        gdaltest.post_reason('fail')
         return 'fail'
 
     if ds.GetRasterBand(1).GetMinimum() != 74.0:
-        gdaltest.post_reason('fail')
         return 'fail'
 
     if ds.GetRasterBand(1).GetMaximum() != 255.0:
-        gdaltest.post_reason('fail')
         return 'fail'
 
     ds.GetRasterBand(1).SetStatistics(1, 2, 3, 4)
     got_stats = ds.GetRasterBand(1).GetStatistics(1, 1)
     if got_stats != [1, 2, 3, 4]:
         print(got_stats)
-        gdaltest.post_reason('fail')
         return 'fail'
 
     ds.GetRasterBand(1).ComputeStatistics(0)
     got_stats = ds.GetRasterBand(1).GetStatistics(1, 1)
     if got_stats[0] != 74.0:
-        gdaltest.post_reason('fail')
         return 'fail'
 
     minmax = ds.GetRasterBand(1).ComputeRasterMinMax()
     if minmax != (74.0, 255.0):
-        gdaltest.post_reason('fail')
         print(minmax)
         return 'fail'
 
     if ds.GetRasterBand(1).GetOffset() != 0.0:
-        gdaltest.post_reason('fail')
         return 'fail'
 
     if ds.GetRasterBand(1).GetScale() != 1.0:
-        gdaltest.post_reason('fail')
         return 'fail'
 
     ds.GetRasterBand(1).SetOffset(10.0)
     if ds.GetRasterBand(1).GetOffset() != 10.0:
-        gdaltest.post_reason('fail')
         return 'fail'
 
     ds.GetRasterBand(1).SetScale(2.0)
     if ds.GetRasterBand(1).GetScale() != 2.0:
-        gdaltest.post_reason('fail')
         return 'fail'
 
     ds.BuildOverviews('NEAR', [2])
     if ds.GetRasterBand(1).GetOverviewCount() != 1:
-        gdaltest.post_reason('fail')
         return 'fail'
 
     if ds.GetRasterBand(1).GetOverview(-1) is not None:
-        gdaltest.post_reason('fail')
         return 'fail'
 
     if ds.GetRasterBand(1).GetOverview(0) is None:
-        gdaltest.post_reason('fail')
         return 'fail'
 
     if ds.GetRasterBand(1).GetOverview(0) is None:
-        gdaltest.post_reason('fail')
         return 'fail'
 
     got_hist = ds.GetRasterBand(1).GetHistogram()
     if len(got_hist) != 256:
-        gdaltest.post_reason('fail')
         return 'fail'
 
     (minval, maxval, nitems, got_hist2) = ds.GetRasterBand(1).GetDefaultHistogram()
     if minval != -0.5:
-        gdaltest.post_reason('fail')
         return 'fail'
     if maxval != 255.5:
-        gdaltest.post_reason('fail')
         return 'fail'
     if nitems != 256:
-        gdaltest.post_reason('fail')
         return 'fail'
     if got_hist != got_hist2:
-        gdaltest.post_reason('fail')
         return 'fail'
 
     ds.GetRasterBand(1).SetDefaultHistogram(1, 2, [3])
     (minval, maxval, nitems, got_hist3) = ds.GetRasterBand(1).GetDefaultHistogram()
     if minval != 1:
-        gdaltest.post_reason('fail')
         return 'fail'
     if maxval != 2:
-        gdaltest.post_reason('fail')
         return 'fail'
     if nitems != 1:
-        gdaltest.post_reason('fail')
         return 'fail'
     if got_hist3[0] != 3:
-        gdaltest.post_reason('fail')
         return 'fail'
 
     got_nodatavalue = ds.GetRasterBand(1).GetNoDataValue()
     if got_nodatavalue is not None:
-        gdaltest.post_reason('fail')
         return 'fail'
 
     ds.GetRasterBand(1).SetNoDataValue(123)
     got_nodatavalue = ds.GetRasterBand(1).GetNoDataValue()
     if got_nodatavalue != 123:
-        gdaltest.post_reason('fail')
         return 'fail'
 
     if ds.GetRasterBand(1).GetMaskFlags() != 8:
-        gdaltest.post_reason('fail')
         return 'fail'
 
     if ds.GetRasterBand(1).GetMaskBand() is None:
-        gdaltest.post_reason('fail')
         return 'fail'
 
     ret = ds.GetRasterBand(1).DeleteNoDataValue()
     if ret != 0:
-        gdaltest.post_reason('fail')
         return 'fail'
     got_nodatavalue = ds.GetRasterBand(1).GetNoDataValue()
     if got_nodatavalue is not None:
-        gdaltest.post_reason('fail')
         return 'fail'
 
     ds.CreateMaskBand(0)
 
     if ds.GetRasterBand(1).GetMaskFlags() != 2:
         print(ds.GetRasterBand(1).GetMaskFlags())
-        gdaltest.post_reason('fail')
         return 'fail'
 
     if ds.GetRasterBand(1).GetMaskBand() is None:
-        gdaltest.post_reason('fail')
         return 'fail'
 
     ds.GetRasterBand(1).CreateMaskBand(0)
 
     if ds.GetRasterBand(1).HasArbitraryOverviews() != 0:
-        gdaltest.post_reason('fail')
         return 'fail'
 
     ds.GetRasterBand(1).SetUnitType('foo')
     if ds.GetRasterBand(1).GetUnitType() != 'foo':
-        gdaltest.post_reason('fail')
         return 'fail'
 
     if ds.GetRasterBand(1).GetCategoryNames() is not None:
-        gdaltest.post_reason('fail')
         return 'fail'
 
     ds.GetRasterBand(1).SetCategoryNames(['foo'])
     if ds.GetRasterBand(1).GetCategoryNames() != ['foo']:
-        gdaltest.post_reason('fail')
         return 'fail'
 
     ds.GetRasterBand(1).SetDescription('bar')
diff --git a/autotest/gcore/hfa_write.py b/autotest/gcore/hfa_write.py
index 5e7524c6057b..70bc71d763cf 100755
--- a/autotest/gcore/hfa_write.py
+++ b/autotest/gcore/hfa_write.py
@@ -289,11 +289,9 @@ def test_hfa_update_existing_aux_overviews():
     new_cs_ovr0 = ds.GetRasterBand(1).GetOverview(0).Checksum()
     new_cs_ovr1 = ds.GetRasterBand(1).GetOverview(1).Checksum()
     if cs_ovr0 != new_cs_ovr0:
-        gdaltest.post_reason('fail')
         gdal.SetConfigOption('USE_RRD', None)
         return 'fail'
     if cs_ovr1 != new_cs_ovr1:
-        gdaltest.post_reason('fail')
         gdal.SetConfigOption('USE_RRD', None)
         return 'fail'
 
@@ -307,11 +305,9 @@ def test_hfa_update_existing_aux_overviews():
     new_cs_ovr0 = ds.GetRasterBand(1).GetOverview(0).Checksum()
     new_cs_ovr1 = ds.GetRasterBand(1).GetOverview(1).Checksum()
     if cs_ovr0 != new_cs_ovr0:
-        gdaltest.post_reason('fail')
         gdal.SetConfigOption('USE_RRD', None)
         return 'fail'
     if cs_ovr1 != new_cs_ovr1:
-        gdaltest.post_reason('fail')
         gdal.SetConfigOption('USE_RRD', None)
         return 'fail'
 
@@ -324,11 +320,9 @@ def test_hfa_update_existing_aux_overviews():
     new_cs_ovr0 = ds.GetRasterBand(1).GetOverview(0).Checksum()
     new_cs_ovr1 = ds.GetRasterBand(1).GetOverview(1).Checksum()
     if cs_ovr0 != new_cs_ovr0:
-        gdaltest.post_reason('fail')
         gdal.SetConfigOption('USE_RRD', None)
         return 'fail'
     if cs_ovr1 != new_cs_ovr1:
-        gdaltest.post_reason('fail')
         gdal.SetConfigOption('USE_RRD', None)
         return 'fail'
     ds = None
diff --git a/autotest/gcore/mask.py b/autotest/gcore/mask.py
index 91ce1c0526c2..563ea4a3e506 100755
--- a/autotest/gcore/mask.py
+++ b/autotest/gcore/mask.py
@@ -676,7 +676,6 @@ def test_mask_14():
     gdal.SetConfigOption('GDAL_TIFF_INTERNAL_MASK', None)
     gdal.SetCacheMax(old_val)
     if out_ds.GetRasterBand(1).Checksum() == 0:
-        gdaltest.post_reason('failure')
         return 'fail'
     cs = ds.GetRasterBand(1).GetMaskBand().Checksum()
     if cs != 400:
@@ -1035,14 +1034,12 @@ def test_mask_24():
     # IRasterIO() optimized case
     import struct
     if struct.unpack('B', mask.ReadRaster(0, 0, 1, 1))[0] != 255:
-        gdaltest.post_reason('fail')
         print(struct.unpack('B', mask.ReadRaster(0, 0, 1, 1))[0])
         return 'fail'
 
     # IReadBlock() code path
     (blockx, blocky) = mask.GetBlockSize()
     if struct.unpack('B' * blockx * blocky, mask.ReadBlock(0, 0))[0] != 255:
-        gdaltest.post_reason('fail')
         print(struct.unpack('B' * blockx * blocky, mask.ReadBlock(0, 0))[0])
         return 'fail'
     mask.FlushCache()
@@ -1050,7 +1047,6 @@ def test_mask_24():
     # Test special case where dynamics is only 0-255
     ds.GetRasterBand(4).Fill(255)
     if struct.unpack('B', mask.ReadRaster(0, 0, 1, 1))[0] != 1:
-        gdaltest.post_reason('fail')
         print(struct.unpack('B', mask.ReadRaster(0, 0, 1, 1))[0])
         return 'fail'
 
@@ -1068,7 +1064,6 @@ def test_mask_25():
 
     ds = gdal.GetDriverByName('GTiff').Create('/vsimem/mask_25.tif', 1, 1)
     if ds.GetRasterBand(1).GetMaskFlags() != gdal.GMF_ALL_VALID:
-        gdaltest.post_reason('fail')
         return 'fail'
     ds = None
 
@@ -1076,11 +1071,9 @@ def test_mask_25():
     gdal.GetDriverByName('GTiff').Create('/vsimem/mask_25.tif.msk', 1, 1)
     ds = gdal.Open('/vsimem/mask_25.tif')
     if ds.GetRasterBand(1).GetMaskFlags() != gdal.GMF_ALL_VALID:
-        gdaltest.post_reason('fail')
         return 'fail'
     cs = ds.GetRasterBand(1).GetMaskBand().Checksum()
     if cs != 3:
-        gdaltest.post_reason('fail')
         print(cs)
         return 'fail'
     ds = None
@@ -1093,11 +1086,9 @@ def test_mask_25():
     ds = None
     ds = gdal.Open('/vsimem/mask_25.tif')
     if ds.GetRasterBand(1).GetMaskFlags() != 0:
-        gdaltest.post_reason('fail')
         return 'fail'
     cs = ds.GetRasterBand(1).GetMaskBand().Checksum()
     if cs != 0:
-        gdaltest.post_reason('fail')
         print(cs)
         return 'fail'
     ds = None
@@ -1112,7 +1103,6 @@ def test_mask_25():
     ds = gdal.Open('/vsimem/mask_25.tif')
     with gdaltest.error_handler():
         if ds.GetRasterBand(2).GetMaskFlags() != gdal.GMF_ALL_VALID:
-            gdaltest.post_reason('fail')
             return 'fail'
     ds = None
     gdal.Unlink('/vsimem/mask_25.tif')
@@ -1123,7 +1113,6 @@ def test_mask_25():
     ds.GetRasterBand(1).CreateMaskBand(gdal.GMF_PER_DATASET)
     with gdaltest.error_handler():
         if ds.GetRasterBand(2).CreateMaskBand(0) == 0:
-            gdaltest.post_reason('fail')
             return 'fail'
     ds = None
     gdal.Unlink('/vsimem/mask_25.tif')
@@ -1155,7 +1144,6 @@ def test_mask_26():
     # IRasterIO() optimized case
     import struct
     if struct.unpack('B', mask.ReadRaster(0, 0, 1, 1))[0] != 255:
-        gdaltest.post_reason('fail')
         print(struct.unpack('B', mask.ReadRaster(0, 0, 1, 1))[0])
         return 'fail'
 
diff --git a/autotest/gcore/misc.py b/autotest/gcore/misc.py
index ec310958afb9..7350c83bf357 100755
--- a/autotest/gcore/misc.py
+++ b/autotest/gcore/misc.py
@@ -597,7 +597,6 @@ def test_misc_12():
             ds = drv.CreateCopy('/nonexistingpath' + get_filename(drv, ''), src_ds)
             gdal.PopErrorHandler()
             if ds is None and gdal.GetLastErrorMsg() == '':
-                gdaltest.post_reason('failure')
                 print('CreateCopy() into non existing dir fails without error message for driver %s' % drv.ShortName)
                 gdal.Unlink('/vsimem/misc_12_src.tif')
                 return 'fail'
@@ -637,7 +636,6 @@ def test_misc_13():
     out_ds = gdal.GetDriverByName('ESRI Shapefile').CreateCopy('/vsimem/out.shp', ds)
     gdal.PopErrorHandler()
     if out_ds is not None:
-        gdaltest.post_reason('fail')
         return 'fail'
 
     # Raster-only -> vector-only
@@ -646,7 +644,6 @@ def test_misc_13():
     out_ds = gdal.GetDriverByName('GTiff').CreateCopy('/vsimem/out.tif', ds)
     gdal.PopErrorHandler()
     if out_ds is not None:
-        gdaltest.post_reason('fail')
         return 'fail'
 
     return 'success'
diff --git a/autotest/gcore/nodatamaskband.py b/autotest/gcore/nodatamaskband.py
index 8f76f08033d1..553026a127e7 100755
--- a/autotest/gcore/nodatamaskband.py
+++ b/autotest/gcore/nodatamaskband.py
@@ -66,7 +66,6 @@ def test_nodatamaskband_1():
                        0, 255, 255, 0, 0, 255,
                        255, 0, 0, 255, 255, 255)
         if data_ar != expected_ar:
-            gdaltest.post_reason('fail')
             print(dt)
             print(data_ar)
             return 'fail'
@@ -75,7 +74,6 @@ def test_nodatamaskband_1():
         data_ar = struct.unpack('B' * 6 * 1, data)
         expected_ar = (0, 255, 255, 0, 0, 255)
         if data_ar != expected_ar:
-            gdaltest.post_reason('fail')
             print(dt)
             print(data_ar)
             return 'fail'
@@ -84,7 +82,6 @@ def test_nodatamaskband_1():
         data_ar = struct.unpack('B' * 6 * 1, data)
         expected_ar = (255, 0, 0, 255, 255, 255)
         if data_ar != expected_ar:
-            gdaltest.post_reason('fail')
             print(dt)
             print(data_ar)
             return 'fail'
@@ -95,7 +92,6 @@ def test_nodatamaskband_1():
         expected_ar = (255, 0, 255,
                        0, 255, 255)
         if data_ar != expected_ar:
-            gdaltest.post_reason('fail')
             print(dt)
             print(data_ar)
             return 'fail'
@@ -106,7 +102,6 @@ def test_nodatamaskband_1():
         expected_ar = (255, 0, 255,
                        0, 255, 255)
         if data_ar != expected_ar:
-            gdaltest.post_reason('fail')
             print(dt)
             print(data_ar)
             return 'fail'
diff --git a/autotest/gcore/numpy_rw.py b/autotest/gcore/numpy_rw.py
index c03fe81983d2..388bed21264b 100755
--- a/autotest/gcore/numpy_rw.py
+++ b/autotest/gcore/numpy_rw.py
@@ -692,10 +692,8 @@ def test_numpy_rw_14():
                                            callback=numpy_rw_14_progress_callback,
                                            callback_data=tab)
     if data is None:
-        gdaltest.post_reason('failure')
         return 'fail'
     if abs(tab[0] - 1.05) > 1e-5 or not tab[1]:
-        gdaltest.post_reason('failure')
         return 'fail'
 
     # Test interruption
@@ -703,10 +701,8 @@ def test_numpy_rw_14():
     data = ds.GetRasterBand(1).ReadAsArray(callback=numpy_rw_14_progress_interrupt_callback,
                                            callback_data=tab)
     if data is not None:
-        gdaltest.post_reason('failure')
         return 'fail'
     if tab[0] < 0.50:
-        gdaltest.post_reason('failure')
         return 'fail'
 
     # Test Dataset.ReadAsArray
@@ -715,10 +711,8 @@ def test_numpy_rw_14():
                           callback=numpy_rw_14_progress_callback,
                           callback_data=tab)
     if data is None:
-        gdaltest.post_reason('failure')
         return 'fail'
     if abs(tab[0] - 1.05) > 1e-5 or not tab[1]:
-        gdaltest.post_reason('failure')
         return 'fail'
 
     # Same with interruption
@@ -726,7 +720,6 @@ def test_numpy_rw_14():
     data = ds.ReadAsArray(callback=numpy_rw_14_progress_interrupt_callback,
                           callback_data=tab)
     if data is not None or tab[0] < 0.50:
-        gdaltest.post_reason('failure')
         return 'fail'
 
     # Test Dataset.ReadAsArray on a multi band file
@@ -736,7 +729,6 @@ def test_numpy_rw_14():
     data = ds.ReadAsArray(callback=numpy_rw_14_progress_callback_2,
                           callback_data=last_pct)
     if data is None or abs(last_pct[0] - 1.0) > 1e-5:
-        gdaltest.post_reason('failure')
         return 'fail'
 
     last_pct = [0]
@@ -747,7 +739,6 @@ def test_numpy_rw_14():
                           callback=numpy_rw_14_progress_callback_2,
                           callback_data=last_pct)
     if data is None or abs(last_pct[0] - 1.0) > 1e-5:
-        gdaltest.post_reason('failure')
         return 'fail'
 
     return 'success'
@@ -768,12 +759,10 @@ def test_numpy_rw_15():
     ds = gdal_array.OpenArray(array)
     gt = ds.GetGeoTransform(can_return_null=True)
     if gt is not None:
-        gdaltest.post_reason('failure')
         return 'fail'
     ds.SetGeoTransform([1, 2, 3, 4, 5, -6])
     gt = ds.GetGeoTransform()
     if gt != (1, 2, 3, 4, 5, -6):
-        gdaltest.post_reason('failure')
         return 'fail'
 
     return 'success'
@@ -795,7 +784,6 @@ def test_numpy_rw_16():
     with gdaltest.error_handler():
         ds = gdal_array.OpenArray(array)
     if ds is not None:
-        gdaltest.post_reason('failure')
         return 'fail'
 
     # 4D
@@ -803,7 +791,6 @@ def test_numpy_rw_16():
     with gdaltest.error_handler():
         ds = gdal_array.OpenArray(array)
     if ds is not None:
-        gdaltest.post_reason('failure')
         return 'fail'
 
     # Unsupported data type
@@ -811,7 +798,6 @@ def test_numpy_rw_16():
     with gdaltest.error_handler():
         ds = gdal_array.OpenArray(array)
     if ds is not None:
-        gdaltest.post_reason('failure')
         return 'fail'
 
     return 'success'
@@ -833,21 +819,18 @@ def test_numpy_rw_17():
     with gdaltest.error_handler():
         ds = gdal.Open(gdal_array.GetArrayFilename(array))
     if ds is not None:
-        gdaltest.post_reason('failure')
         return 'fail'
 
     gdal.SetConfigOption('GDAL_ARRAY_OPEN_BY_FILENAME', 'TRUE')
     ds = gdal.Open(gdal_array.GetArrayFilename(array))
     gdal.SetConfigOption('GDAL_ARRAY_OPEN_BY_FILENAME', None)
     if ds is None:
-        gdaltest.post_reason('failure')
         return 'fail'
 
     # Invalid value
     with gdaltest.error_handler():
         ds = gdal.Open('NUMPY:::invalid')
     if ds is not None:
-        gdaltest.post_reason('failure')
         return 'fail'
 
     return 'success'
diff --git a/autotest/gcore/overviewds.py b/autotest/gcore/overviewds.py
index a641a328f652..9ab4fdac9db4 100755
--- a/autotest/gcore/overviewds.py
+++ b/autotest/gcore/overviewds.py
@@ -64,7 +64,6 @@ def test_overviewds_2():
 
     ds = gdal.OpenEx('tmp/byte.tif', open_options=['OVERVIEW_LEVEL=0only'])
     if ds.GetRasterBand(1).GetOverviewCount() != 0:
-        gdaltest.post_reason('fail')
         return 'fail'
     ds = None
 
@@ -73,54 +72,41 @@ def test_overviewds_2():
     if ds is None:
         return 'fail'
     if ds.RasterXSize != 10 or ds.RasterYSize != 10 or ds.RasterCount != 1:
-        gdaltest.post_reason('fail')
         return 'fail'
     if ds.GetProjectionRef() != src_ds.GetProjectionRef():
-        gdaltest.post_reason('fail')
         return 'fail'
     src_gt = src_ds.GetGeoTransform()
     expected_gt = (src_gt[0], src_gt[1] * 2, src_gt[2], src_gt[3], src_gt[4], src_gt[5] * 2)
     gt = ds.GetGeoTransform()
     for i in range(6):
         if abs(expected_gt[i] - gt[i]) > 1e-5:
-            gdaltest.post_reason('fail')
             print(expected_gt)
             print(gt)
             return 'fail'
     if ds.GetGCPCount() != 0 or ds.GetGCPProjection() != src_ds.GetGCPProjection() or ds.GetGCPs():
-        gdaltest.post_reason('fail')
         return 'fail'
     expected_data = src_ds.ReadRaster(0, 0, 20, 20, 10, 10)
     got_data = ds.ReadRaster(0, 0, 10, 10)
     if expected_data != got_data:
-        gdaltest.post_reason('fail')
         return 'fail'
     got_data = ds.GetRasterBand(1).ReadRaster(0, 0, 10, 10)
     if expected_data != got_data:
-        gdaltest.post_reason('fail')
         return 'fail'
     if ds.GetRasterBand(1).GetOverviewCount() != 1:
-        gdaltest.post_reason('fail')
         return 'fail'
     expected_data = src_ds.ReadRaster(0, 0, 20, 20, 5, 5)
     got_data = ds.GetRasterBand(1).GetOverview(0).ReadRaster(0, 0, 5, 5)
     if expected_data != got_data:
-        gdaltest.post_reason('fail')
         return 'fail'
     if ds.GetMetadata() != src_ds.GetMetadata():
-        gdaltest.post_reason('fail')
         return 'fail'
     if ds.GetMetadataItem('AREA_OR_POINT') != src_ds.GetMetadataItem('AREA_OR_POINT'):
-        gdaltest.post_reason('fail')
         return 'fail'
     if ds.GetMetadata('RPC'):
-        gdaltest.post_reason('fail')
         return 'fail'
     if ds.GetMetadata('GEOLOCATION'):
-        gdaltest.post_reason('fail')
         return 'fail'
     if ds.GetMetadataItem('RPC', 'FOO') is not None:
-        gdaltest.post_reason('fail')
         return 'fail'
     ds = None
 
@@ -164,7 +150,6 @@ def test_overviewds_3():
     for i in range(3):
         if gcps[i].GCPPixel != src_gcps[i].GCPPixel / 2 or gcps[i].GCPLine != src_gcps[i].GCPLine / 2 or \
            gcps[i].GCPX != src_gcps[i].GCPX or gcps[i].GCPY != src_gcps[i].GCPY:
-            gdaltest.post_reason('fail')
             return 'fail'
 
     # Really check that the transformer works
@@ -173,7 +158,6 @@ def test_overviewds_3():
 
     for i in range(3):
         if abs(ref_pnt[i] - pnt[i]) > 1e-5:
-            gdaltest.post_reason('fail')
             print(ref_pnt)
             print(pnt)
             return 'fail'
@@ -210,17 +194,14 @@ def test_overviewds_4():
 
     for key in rpc_md:
         if ds.GetMetadataItem(key, 'RPC') != got_md[key]:
-            gdaltest.post_reason('fail')
             return 'fail'
         if key == 'LINE_SCALE' or key == 'SAMP_SCALE' or key == 'LINE_OFF' or key == 'SAMP_OFF':
             if float(got_md[key]) != myfloat(rpc_md[key]) / 2:
-                gdaltest.post_reason('fail')
                 print(key)
                 print(got_md[key])
                 print(rpc_md[key])
                 return 'fail'
         elif got_md[key] != rpc_md[key]:
-            gdaltest.post_reason('fail')
             print(key)
             print(got_md[key])
             print(rpc_md[key])
@@ -232,7 +213,6 @@ def test_overviewds_4():
 
     for i in range(3):
         if abs(ref_pnt[i] - pnt[i]) > 1e-5:
-            gdaltest.post_reason('fail')
             print(ref_pnt)
             print(pnt)
             return 'fail'
@@ -269,24 +249,20 @@ def test_overviewds_5():
 
     for key in geoloc_md:
         if ds.GetMetadataItem(key, 'GEOLOCATION') != got_md[key]:
-            gdaltest.post_reason('fail')
             return 'fail'
         if key == 'PIXEL_OFFSET' or key == 'LINE_OFFSET':
             if abs(float(got_md[key]) - myfloat(geoloc_md[key]) * 2) > 1e-1:
-                gdaltest.post_reason('fail')
                 print(key)
                 print(got_md[key])
                 print(geoloc_md[key])
                 return 'fail'
         elif key == 'PIXEL_STEP' or key == 'LINE_STEP':
             if abs(float(got_md[key]) - myfloat(geoloc_md[key]) / 2) > 1e-1:
-                gdaltest.post_reason('fail')
                 print(key)
                 print(got_md[key])
                 print(geoloc_md[key])
                 return 'fail'
         elif got_md[key] != geoloc_md[key]:
-            gdaltest.post_reason('fail')
             print(key)
             print(got_md[key])
             print(geoloc_md[key])
@@ -299,7 +275,6 @@ def test_overviewds_5():
 
     for i in range(3):
         if abs(pnt[i] - expected_xyz[i]) > 0.5:
-            gdaltest.post_reason('fail')
             print(pnt)
             print(expected_xyz)
             return 'fail'
@@ -326,11 +301,9 @@ def test_overviewds_6():
 
     ds = gdal.Open('tmp/byte.vrt')
     if ds.RasterXSize != 10 or ds.RasterYSize != 10 or ds.RasterCount != 1:
-        gdaltest.post_reason('fail')
         return 'fail'
     got_cs = ds.GetRasterBand(1).Checksum()
     if got_cs != expected_cs:
-        gdaltest.post_reason('fail')
         return 'fail'
     ds = None
 
diff --git a/autotest/gcore/pam.py b/autotest/gcore/pam.py
index 271ac4c22afa..b957686e77ac 100755
--- a/autotest/gcore/pam.py
+++ b/autotest/gcore/pam.py
@@ -142,7 +142,6 @@ def test_pam_3():
     ds = None
     ds = gdal.Open('tmp/pam.pnm', gdal.GA_Update)
     if ds.GetRasterBand(1).DeleteNoDataValue() != 0:
-        gdaltest.post_reason('fail')
         return 'fail'
     ds = None
 
@@ -485,16 +484,13 @@ def test_pam_12():
     gdal.Unlink('tmp/byte.tif.aux.xml')
 
     if hist1 != hist2:
-        gdaltest.post_reason('fail')
         print(hist1)
         print(hist2)
         return 'fail'
     if hist1[0] != 6000000000:
-        gdaltest.post_reason('fail')
         print(hist1)
         return 'fail'
     if aux_xml.find('<HistCounts>6000000000|') < 0:
-        gdaltest.post_reason('fail')
         print(aux_xml)
         return 'fail'
 
@@ -517,20 +513,17 @@ def test_pam_13():
     ret = ds.GetRasterBand(1).SetNoDataValue(0)
     gdal.PopErrorHandler()
     if ret == 0:
-        gdaltest.post_reason('fail')
         return 'fail'
 
     gdal.PushErrorHandler()
     ret = ds.GetRasterBand(1).DeleteNoDataValue()
     gdal.PopErrorHandler()
     if ret == 0:
-        gdaltest.post_reason('fail')
         return 'fail'
 
     ds = None
 
     if gdal.VSIStatL('/vsimem/tmp.pnm.aux.xml') is not None:
-        gdaltest.post_reason('fail')
         return 'fail'
 
     gdal.Unlink('/vsimem/tmp.pnm')
diff --git a/autotest/gcore/pixfun.py b/autotest/gcore/pixfun.py
index f721d310e5ff..a21fd5fcc7e1 100755
--- a/autotest/gcore/pixfun.py
+++ b/autotest/gcore/pixfun.py
@@ -121,7 +121,6 @@ def test_pixfun_imag_c():
     refdata = refds.GetRasterBand(1).ReadAsArray()
 
     if not numpy.alltrue(data == refdata.imag):
-        gdaltest.post_reason('fail')
         return 'fail'
 
     # Test bugfix of #6599
@@ -130,7 +129,6 @@ def test_pixfun_imag_c():
     copied_ds = None
 
     if not numpy.alltrue(data == data_ds):
-        gdaltest.post_reason('fail')
         return 'fail'
 
     return 'success'
diff --git a/autotest/gcore/rasterio.py b/autotest/gcore/rasterio.py
index d720c1816fae..ee26bf673184 100755
--- a/autotest/gcore/rasterio.py
+++ b/autotest/gcore/rasterio.py
@@ -396,7 +396,6 @@ def test_rasterio_8():
         gdaltest.post_reason('did not read expected band data via ReadRaster()')
         return 'fail'
     if abs(tab[0] - 1) > 1e-5 or not tab[1]:
-        gdaltest.post_reason('failure')
         return 'fail'
 
     # Test interruption
@@ -405,10 +404,8 @@ def test_rasterio_8():
                                           callback=rasterio_8_progress_interrupt_callback,
                                           callback_data=tab)
     if data is not None:
-        gdaltest.post_reason('failure')
         return 'fail'
     if tab[0] < 0.50:
-        gdaltest.post_reason('failure')
         return 'fail'
 
     # Test RasterBand.ReadRaster with type change
@@ -420,7 +417,6 @@ def test_rasterio_8():
         gdaltest.post_reason('did not read expected band data via ReadRaster()')
         return 'fail'
     if abs(tab[0] - 1) > 1e-5 or not tab[1]:
-        gdaltest.post_reason('failure')
         return 'fail'
 
     # Same with interruption
@@ -429,7 +425,6 @@ def test_rasterio_8():
                                           callback=rasterio_8_progress_interrupt_callback,
                                           callback_data=tab)
     if data is not None or tab[0] < 0.50:
-        gdaltest.post_reason('failure')
         return 'fail'
 
     # Test RasterBand.ReadRaster with resampling
@@ -441,7 +436,6 @@ def test_rasterio_8():
         gdaltest.post_reason('did not read expected band data via ReadRaster()')
         return 'fail'
     if abs(tab[0] - 1) > 1e-5 or not tab[1]:
-        gdaltest.post_reason('failure')
         return 'fail'
 
     # Same with interruption
@@ -450,7 +444,6 @@ def test_rasterio_8():
                                           callback=rasterio_8_progress_interrupt_callback,
                                           callback_data=tab)
     if data is not None or tab[0] < 0.50:
-        gdaltest.post_reason('failure')
         return 'fail'
 
     # Test Dataset.ReadRaster
@@ -462,7 +455,6 @@ def test_rasterio_8():
         gdaltest.post_reason('did not read expected dataset data via ReadRaster()')
         return 'fail'
     if abs(tab[0] - 1) > 1e-5 or not tab[1]:
-        gdaltest.post_reason('failure')
         return 'fail'
 
     ds = None
@@ -474,7 +466,6 @@ def test_rasterio_8():
                          callback=rasterio_8_progress_callback_2,
                          callback_data=last_pct)
     if data is None or abs(last_pct[0] - 1.0) > 1e-5:
-        gdaltest.post_reason('failure')
         return 'fail'
 
     # Same with interruption
@@ -482,7 +473,6 @@ def test_rasterio_8():
     data = ds.ReadRaster(callback=rasterio_8_progress_interrupt_callback,
                          callback_data=tab)
     if data is not None or tab[0] < 0.50:
-        gdaltest.post_reason('failure')
         return 'fail'
 
     ds = None
@@ -494,7 +484,6 @@ def test_rasterio_8():
                          callback=rasterio_8_progress_callback_2,
                          callback_data=last_pct)
     if data is None or abs(last_pct[0] - 1.0) > 1e-5:
-        gdaltest.post_reason('failure')
         return 'fail'
 
     # Same with interruption
@@ -502,7 +491,6 @@ def test_rasterio_8():
     data = ds.ReadRaster(callback=rasterio_8_progress_interrupt_callback,
                          callback_data=tab)
     if data is not None or tab[0] < 0.50:
-        gdaltest.post_reason('failure')
         return 'fail'
 
     return 'success'
@@ -541,17 +529,14 @@ def test_rasterio_9():
                                           callback=rasterio_9_progress_callback,
                                           callback_data=tab)
     if data is None:
-        gdaltest.post_reason('failure')
         return 'fail'
     data_ar = struct.unpack('h' * 10 * 10, data)
     cs = rasterio_9_checksum(data, 10, 10, data_type=gdal.GDT_Int16)
     if cs != 1211:  # checksum of gdal_translate data/byte.tif out.tif -outsize 10 10 -r BILINEAR
-        gdaltest.post_reason('failure')
         print(cs)
         return 'fail'
 
     if abs(tab[0] - 1.0) > 1e-5:
-        gdaltest.post_reason('failure')
         return 'fail'
 
     # Same but query with GDT_Float32. Check that we do not get floating-point
@@ -563,7 +548,6 @@ def test_rasterio_9():
 
     data_float32_ar = struct.unpack('f' * 10 * 10, data)
     if data_ar != data_float32_ar:
-        gdaltest.post_reason('failure')
         print(data_float32_ar)
         return 'fail'
 
@@ -575,16 +559,13 @@ def test_rasterio_9():
                                           callback=rasterio_9_progress_callback,
                                           callback_data=tab)
     if data is None:
-        gdaltest.post_reason('failure')
         return 'fail'
     cs = rasterio_9_checksum(data, 10, 10)
     if cs != 1154:  # checksum of gdal_translate data/byte.tif out.tif -outsize 10 10 -r LANCZOS
-        gdaltest.post_reason('failure')
         print(cs)
         return 'fail'
 
     if abs(tab[0] - 1.0) > 1e-5:
-        gdaltest.post_reason('failure')
         return 'fail'
 
     # Test RasterBand.ReadRaster, with Bilinear and UInt16 data type
@@ -597,16 +578,13 @@ def test_rasterio_9():
                                                      callback=rasterio_9_progress_callback,
                                                      callback_data=tab)
     if data is None:
-        gdaltest.post_reason('failure')
         return 'fail'
     cs = rasterio_9_checksum(data, 10, 10, data_type=gdal.GDT_UInt16)
     if cs != 1211:  # checksum of gdal_translate data/byte.tif out.tif -outsize 10 10 -r BILINEAR
-        gdaltest.post_reason('failure')
         print(cs)
         return 'fail'
 
     if abs(tab[0] - 1.0) > 1e-5:
-        gdaltest.post_reason('failure')
         return 'fail'
 
     # Test RasterBand.ReadRaster, with Bilinear on Complex, thus using warp API
@@ -619,16 +597,13 @@ def test_rasterio_9():
                                                   callback=rasterio_9_progress_callback,
                                                   callback_data=tab)
     if data is None:
-        gdaltest.post_reason('failure')
         return 'fail'
     cs = rasterio_9_checksum(data, 10, 10, data_type=gdal.GDT_CInt16)
     if cs != 1211:  # checksum of gdal_translate data/byte.tif out.tif -outsize 10 10 -r BILINEAR
-        gdaltest.post_reason('failure')
         print(cs)
         return 'fail'
 
     if abs(tab[0] - 1.0) > 1e-5:
-        gdaltest.post_reason('failure')
         return 'fail'
 
     # Test interruption
@@ -641,10 +616,8 @@ def test_rasterio_9():
                                           callback_data=tab)
     gdal.PopErrorHandler()
     if data is not None:
-        gdaltest.post_reason('failure')
         return 'fail'
     if tab[0] < 0.50:
-        gdaltest.post_reason('failure')
         return 'fail'
 
     # Test RasterBand.ReadRaster, with Gauss, and downsampling
@@ -655,16 +628,13 @@ def test_rasterio_9():
                                           callback=rasterio_9_progress_callback,
                                           callback_data=tab)
     if data is None:
-        gdaltest.post_reason('failure')
         return 'fail'
     cs = rasterio_9_checksum(data, 10, 10)
     if cs != 1089:  # checksum of gdal_translate data/byte.tif out.tif -outsize 10 10 -r GAUSS
-        gdaltest.post_reason('failure')
         print(cs)
         return 'fail'
 
     if abs(tab[0] - 1.0) > 1e-5:
-        gdaltest.post_reason('failure')
         return 'fail'
 
     # Test RasterBand.ReadRaster, with Cubic, and downsampling
@@ -675,16 +645,13 @@ def test_rasterio_9():
                                           callback=rasterio_9_progress_callback,
                                           callback_data=tab)
     if data is None:
-        gdaltest.post_reason('failure')
         return 'fail'
     cs = rasterio_9_checksum(data, 10, 10)
     if cs != 1059:  # checksum of gdal_translate data/byte.tif out.tif -outsize 10 10 -r CUBIC
-        gdaltest.post_reason('failure')
         print(cs)
         return 'fail'
 
     if abs(tab[0] - 1.0) > 1e-5:
-        gdaltest.post_reason('failure')
         return 'fail'
 
     # Test RasterBand.ReadRaster, with Cubic, and downsampling with >=8x8 source samples used for a dest sample
@@ -692,11 +659,9 @@ def test_rasterio_9():
                                           buf_ysize=5,
                                           resample_alg=gdal.GRIORA_Cubic)
     if data is None:
-        gdaltest.post_reason('failure')
         return 'fail'
     cs = rasterio_9_checksum(data, 5, 5)
     if cs != 214:  # checksum of gdal_translate data/byte.tif out.tif -outsize 5 5 -r CUBIC
-        gdaltest.post_reason('failure')
         print(cs)
         return 'fail'
 
@@ -705,11 +670,9 @@ def test_rasterio_9():
                                                      buf_ysize=5,
                                                      resample_alg=gdal.GRIORA_Cubic)
     if data is None:
-        gdaltest.post_reason('failure')
         return 'fail'
     cs = rasterio_9_checksum(data, 5, 5, data_type=gdal.GDT_UInt16)
     if cs != 214:  # checksum of gdal_translate data/byte.tif out.tif -outsize 5 5 -r CUBIC
-        gdaltest.post_reason('failure')
         print(cs)
         return 'fail'
 
@@ -721,16 +684,13 @@ def test_rasterio_9():
                                           callback=rasterio_9_progress_callback,
                                           callback_data=tab)
     if data is None:
-        gdaltest.post_reason('failure')
         return 'fail'
     cs = rasterio_9_checksum(data, 40, 40)
     if cs != 19556:  # checksum of gdal_translate data/byte.tif out.tif -outsize 40 40 -r CUBIC
-        gdaltest.post_reason('failure')
         print(cs)
         return 'fail'
 
     if abs(tab[0] - 1.0) > 1e-5:
-        gdaltest.post_reason('failure')
         return 'fail'
 
     # Test Dataset.ReadRaster, with Cubic and supersampling
@@ -741,16 +701,13 @@ def test_rasterio_9():
                          callback=rasterio_9_progress_callback,
                          callback_data=tab)
     if data is None:
-        gdaltest.post_reason('failure')
         return 'fail'
     cs = rasterio_9_checksum(data, 40, 40)
     if cs != 19041:  # checksum of gdal_translate data/byte.tif out.tif -outsize 40 40 -r CUBICSPLINE
-        gdaltest.post_reason('failure')
         print(cs)
         return 'fail'
 
     if abs(tab[0] - 1.0) > 1e-5:
-        gdaltest.post_reason('failure')
         return 'fail'
 
     # Test Dataset.ReadRaster on a multi band file, with INTERLEAVE=PIXEL
@@ -762,21 +719,17 @@ def test_rasterio_9():
                          callback=rasterio_9_progress_callback,
                          callback_data=tab)
     if data is None:
-        gdaltest.post_reason('failure')
         return 'fail'
     cs = rasterio_9_checksum(data[0:25 * 25], 25, 25)
     if cs != 5975:  # checksum of gdal_translate data/rgbsmall_cmyk.tif out.tif -outsize 25 25 -r CUBIC
-        gdaltest.post_reason('failure')
         print(cs)
         return 'fail'
     cs = rasterio_9_checksum(data[25 * 25:2 * 25 * 25], 25, 25)
     if cs != 6248:  # checksum of gdal_translate data/rgbsmall_cmyk.tif out.tif -outsize 25 25 -r CUBIC
-        gdaltest.post_reason('failure')
         print(cs)
         return 'fail'
 
     if abs(tab[0] - 1.0) > 1e-5:
-        gdaltest.post_reason('failure')
         return 'fail'
     ds = None
 
@@ -789,15 +742,12 @@ def test_rasterio_9():
                                           callback=rasterio_9_progress_callback,
                                           callback_data=tab)
     if data is None:
-        gdaltest.post_reason('failure')
         return 'fail'
     cs = rasterio_9_checksum(data, 162 * 16, 150 * 16)
     if cs != 30836:  # checksum of gdal_translate data/stefan_full_rgba.png out.tif -outsize 1600% 1600% -r CUBIC
-        gdaltest.post_reason('failure')
         print(cs)
         return 'fail'
     if abs(tab[0] - 1.0) > 1e-5:
-        gdaltest.post_reason('failure')
         return 'fail'
 
     return 'success'
@@ -813,7 +763,6 @@ def test_rasterio_10():
     data = ds.GetRasterBand(1).ReadRaster()
     gdal.PopErrorHandler()
     if data is not None:
-        gdaltest.post_reason('failure')
         return 'fail'
 
     # Change buffer type
@@ -821,7 +770,6 @@ def test_rasterio_10():
     data = ds.GetRasterBand(1).ReadRaster(buf_type=gdal.GDT_Int16)
     gdal.PopErrorHandler()
     if data is not None:
-        gdaltest.post_reason('failure')
         return 'fail'
 
     # Resampling case
@@ -830,7 +778,6 @@ def test_rasterio_10():
                                           buf_ysize=10)
     gdal.PopErrorHandler()
     if data is not None:
-        gdaltest.post_reason('failure')
         return 'fail'
 
     return 'success'
@@ -855,7 +802,6 @@ def test_rasterio_11():
     mem_ds.GetRasterBand(1).SetMetadataItem('NBITS', '8', 'IMAGE_STRUCTURE')
     ar = mem_ds.GetRasterBand(1).ReadAsArray(0, 0, 4, 3, 8, 3, resample_alg=gdal.GRIORA_Cubic)
     if ar.max() != 129:
-        gdaltest.post_reason('failure')
         print(ar.max())
         return 'fail'
 
@@ -864,7 +810,6 @@ def test_rasterio_11():
     ar = mem_ds.GetRasterBand(1).ReadAsArray(0, 0, 4, 3, 8, 3, resample_alg=gdal.GRIORA_Cubic)
     # Would overshoot to 129 if NBITS was ignored
     if ar.max() != 127:
-        gdaltest.post_reason('failure')
         print(ar.max())
         return 'fail'
 
@@ -903,13 +848,11 @@ def test_rasterio_12():
                                callback=rasterio_12_progress_callback,
                                callback_data=tab)
     if tab[0] != 1.0:
-        gdaltest.post_reason('failure')
         print(tab)
         return 'fail'
 
     ar_ds2 = mem_ds.ReadAsArray(0, 0, 4, 3, buf_xsize=8, buf_ysize=3, resample_alg=gdal.GRIORA_Cubic)
     if not numpy.array_equal(ar_ds, ar_ds2):
-        gdaltest.post_reason('failure')
         print(ar_ds)
         print(ar_ds2)
         return 'fail'
@@ -919,21 +862,18 @@ def test_rasterio_12():
     # Results of band or dataset RasterIO should be the same
     for i in range(4):
         if not numpy.array_equal(ar_ds[i], ar_bands[i]):
-            gdaltest.post_reason('failure')
             print(ar_ds)
             print(ar_bands[i])
             return 'fail'
 
     # First, second and third band should have identical content
     if not numpy.array_equal(ar_ds[0], ar_ds[1]):
-        gdaltest.post_reason('failure')
         print(ar_ds[0])
         print(ar_ds[1])
         return 'fail'
 
     # Alpha band should be different
     if numpy.array_equal(ar_ds[0], ar_ds[3]):
-        gdaltest.post_reason('failure')
         print(ar_ds[0])
         print(ar_ds[3])
         return 'fail'
@@ -963,7 +903,6 @@ def test_rasterio_13():
 
         expected_ar = numpy.array([[0, 0, 0, 0, 0, 0, 0, 0], [0, 255, 255, 255, 255, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0]])
         if not numpy.array_equal(ar_ds, expected_ar):
-            gdaltest.post_reason('failure')
             print(dt)
             print(ar_ds)
             print(expected_ar)
@@ -993,7 +932,6 @@ def test_rasterio_14():
     ds = gdal.Translate('/vsimem/rasterio_14_out.asc', '/vsimem/rasterio_14.asc', options='-of AAIGRID -r average -outsize 50% 50%')
     cs = ds.GetRasterBand(1).Checksum()
     if cs != 110:
-        gdaltest.post_reason('fail')
         print(cs)
         print(ds.ReadAsArray())
         return 'fail'
@@ -1006,14 +944,12 @@ def test_rasterio_14():
     data = ds.ReadRaster(buf_xsize=int(ds.RasterXSize / 2), buf_ysize=1, resample_alg=gdal.GRIORA_Average)
     data = struct.unpack('B' * int(ds.RasterXSize / 2), data)
     if data[-1:][0] != 50:
-        gdaltest.post_reason('fail')
         print(data[-1:][0])
         return 'fail'
 
     data = ds.ReadRaster(ds.RasterXSize - 2, 0, 2, 1, buf_xsize=1, buf_ysize=1, resample_alg=gdal.GRIORA_Average)
     data = struct.unpack('B' * 1, data)
     if data[0] != 50:
-        gdaltest.post_reason('fail')
         print(data[0])
         return 'fail'
 
@@ -1022,14 +958,12 @@ def test_rasterio_14():
     data = ds.ReadRaster(buf_xsize=1, buf_ysize=int(ds.RasterYSize / 2), resample_alg=gdal.GRIORA_Average)
     data = struct.unpack('B' * int(ds.RasterYSize / 2), data)
     if data[-1:][0] != 50:
-        gdaltest.post_reason('fail')
         print(data[-1:][0])
         return 'fail'
 
     data = ds.ReadRaster(0, ds.RasterYSize - 2, 1, 2, buf_xsize=1, buf_ysize=1, resample_alg=gdal.GRIORA_Average)
     data = struct.unpack('B' * 1, data)
     if data[0] != 50:
-        gdaltest.post_reason('fail')
         print(data[0])
         return 'fail'
 
@@ -1057,7 +991,6 @@ def test_rasterio_15():
     data = ds.GetRasterBand(1).ReadRaster()
     cs = ds.GetRasterBand(1).Checksum()
     if data != data_ref or cs != 134:
-        gdaltest.post_reason('fail')
         print(cs)
         print(ds.ReadAsArray())
         return 'fail'
@@ -1089,7 +1022,6 @@ def test_rasterio_16():
     ds = gdal.Translate('/vsimem/rasterio_16_out.asc', '/vsimem/rasterio_16.asc', options='-of AAIGRID -r mode -outsize 50% 50%')
     cs = ds.GetRasterBand(1).Checksum()
     if cs != 15:
-        gdaltest.post_reason('fail')
         print(cs)
         print(ds.ReadAsArray())
         return 'fail'
@@ -1120,7 +1052,6 @@ def test_rasterio_lanczos_nodata():
                    0, 0, 0, 22460, 22460, 22547, 22538, 22456, 22572,
                    0, 0, 0, 0, 22504, 22496, 22564, 22563, 22610)
     if data_ar != expected_ar:
-        gdaltest.post_reason('fail')
         print(data_ar)
         return 'fail'
 
@@ -1151,7 +1082,6 @@ def test_rasterio_resampled_value_is_nodata():
     data_ar = struct.unpack('f' * 1, data)
     expected_ar = (1.1754943508222875e-38, )
     if data_ar != expected_ar:
-        gdaltest.post_reason('fail')
         print(data_ar)
         return 'fail'
 
@@ -1161,7 +1091,6 @@ def test_rasterio_resampled_value_is_nodata():
     data_ar = struct.unpack('f' * 1, data)
     expected_ar = (1.1754943508222875e-38, )
     if data_ar != expected_ar:
-        gdaltest.post_reason('fail')
         print(data_ar)
         return 'fail'
 
@@ -1188,7 +1117,6 @@ def test_rasterio_resampled_value_is_nodata():
     data_ar = struct.unpack('I' * 1, data)
     expected_ar = (1, )
     if data_ar != expected_ar:
-        gdaltest.post_reason('fail')
         print(data_ar)
         return 'fail'
 
@@ -1198,7 +1126,6 @@ def test_rasterio_resampled_value_is_nodata():
     data_ar = struct.unpack('I' * 1, data)
     expected_ar = (1, )
     if data_ar != expected_ar:
-        gdaltest.post_reason('fail')
         print(data_ar)
         return 'fail'
 
diff --git a/autotest/gcore/testnonboundtoswig.py b/autotest/gcore/testnonboundtoswig.py
index c230852740a4..c459f6ea7601 100755
--- a/autotest/gcore/testnonboundtoswig.py
+++ b/autotest/gcore/testnonboundtoswig.py
@@ -204,7 +204,6 @@ def test_testnonboundtoswig_GDALSimpleImageWarp():
 
     native_in_ds = gdal_handle_stdcall.GDALOpen(filename, gdal.GA_ReadOnly)
     if native_in_ds is None:
-        gdaltest.post_reason('fail')
         return 'fail'
 
     filename = '/vsimem/out.tif'
@@ -213,17 +212,14 @@ def test_testnonboundtoswig_GDALSimpleImageWarp():
 
     native_out_ds = gdal_handle_stdcall.GDALOpen(filename, gdal.GA_Update)
     if native_out_ds is None:
-        gdaltest.post_reason('fail')
         return 'fail'
 
     pTransformerArg = gdal_handle.GDALCreateGenImgProjTransformer2(native_in_ds, native_out_ds, None)
     if pTransformerArg is None:
-        gdaltest.post_reason('fail')
         return 'fail'
 
     ret = gdal_handle_stdcall.GDALSimpleImageWarp(native_in_ds, native_out_ds, 0, None, gdal_handle_stdcall.GDALGenImgProjTransform, pTransformerArg, None, None, None)
     if ret != 1:
-        gdaltest.post_reason('fail')
         print(ret)
         return 'fail'
 
@@ -239,7 +235,6 @@ def test_testnonboundtoswig_GDALSimpleImageWarp():
     gdal.Unlink('/vsimem/out.tif')
 
     if cs != 4672:
-        gdaltest.post_reason('fail')
         print(cs)
         return 'fail'
 
@@ -336,7 +331,6 @@ def test_testnonboundtoswig_VRTDerivedBands():
         funcName = bytes(funcName, 'utf-8')
     ret = gdal_handle_stdcall.GDALAddDerivedBandPixelFunc(funcName, my_cDerivedPixelFunc)
     if ret != 0:
-        gdaltest.post_reason('fail')
         return 'fail'
 
     vrt_xml = """<VRTDataset rasterXSize="20" rasterYSize="20">
diff --git a/autotest/gcore/tiff_ovr.py b/autotest/gcore/tiff_ovr.py
index 9324d976606b..c27a9df86680 100755
--- a/autotest/gcore/tiff_ovr.py
+++ b/autotest/gcore/tiff_ovr.py
@@ -2025,7 +2025,6 @@ def test_tiff_ovr_49(both_endian):
     ds = None
     ds = gdal.Open('/vsimem/tiff_ovr_49.tif.ovr')
     if ds.GetRasterBand(1).Checksum() == 0:
-        gdaltest.post_reason('fail')
         return 'fail'
     ds = None
     gdal.GetDriverByName('GTiff').Delete('/vsimem/tiff_ovr_49.tif')
@@ -2099,12 +2098,10 @@ def test_tiff_ovr_52():
     ds = gdal.Open('/vsimem/tiff_ovr_52.tif')
     cs = ds.GetRasterBand(1).GetOverview(0).Checksum()
     if cs != 328:
-        gdaltest.post_reason('fail')
         print(cs)
         return 'fail'
     cs = ds.GetRasterBand(1).GetOverview(1).Checksum()
     if cs != 1087:
-        gdaltest.post_reason('fail')
         print(cs)
         return 'fail'
     ds = None
@@ -2123,12 +2120,10 @@ def test_tiff_ovr_52():
     ds = gdal.Open('/vsimem/tiff_ovr_52.tif')
     cs = ds.GetRasterBand(1).GetOverview(0).Checksum()
     if cs != 328:
-        gdaltest.post_reason('fail')
         print(cs)
         return 'fail'
     cs = ds.GetRasterBand(1).GetOverview(1).Checksum()
     if cs != 1087:
-        gdaltest.post_reason('fail')
         print(cs)
         return 'fail'
     ds = None
@@ -2160,12 +2155,10 @@ def test_tiff_ovr_53():
     ds = gdal.Open('/vsimem/tiff_ovr_53.tif')
     cs = ds.GetRasterBand(1).GetOverview(0).Checksum()
     if cs != 1087:
-        gdaltest.post_reason('fail')
         print(cs)
         return 'fail'
     cs = ds.GetRasterBand(1).GetOverview(1).Checksum()
     if cs != 328:
-        gdaltest.post_reason('fail')
         print(cs)
         return 'fail'
     ds = None
@@ -2190,12 +2183,10 @@ def test_tiff_ovr_53():
     ds = gdal.Open('/vsimem/tiff_ovr_53.tif')
     cs = ds.GetRasterBand(1).GetOverview(0).Checksum()
     if cs != 1087:
-        gdaltest.post_reason('fail')
         print(cs)
         return 'fail'
     cs = ds.GetRasterBand(1).GetOverview(1).Checksum()
     if cs != 328:
-        gdaltest.post_reason('fail')
         print(cs)
         return 'fail'
     ds = None
@@ -2239,7 +2230,6 @@ def test_tiff_ovr_54():
     gdal.GetDriverByName('GTiff').Delete('/vsimem/tiff_ovr_54.tif')
 
     if cs0 == 0 or cs1 == 0:
-        gdaltest.post_reason('fail')
         print(cs0, cs1)
         return 'fail'
 
@@ -2255,12 +2245,10 @@ def test_tiff_ovr_too_many_levels_contig():
     ds = gdal.GetDriverByName('GTiff').CreateCopy(tmpfilename, src_ds)
     ds.BuildOverviews('AVERAGE', [2, 4, 8, 16, 32, 64, 128, 256, 512, 1024, 2048, 4096])
     if ds.GetRasterBand(1).GetOverviewCount() != 5:
-        gdaltest.post_reason('fail')
         print(ds.GetRasterBand(1).GetOverviewCount())
         return 'fail'
     ds.BuildOverviews('AVERAGE', [2, 4, 8, 16, 32, 64, 128, 256, 512, 1024, 2048, 4096])
     if ds.GetRasterBand(1).GetOverviewCount() != 5:
-        gdaltest.post_reason('fail')
         return 'fail'
     ds = None
     gdal.GetDriverByName('GTiff').Delete(tmpfilename)
@@ -2277,11 +2265,9 @@ def test_tiff_ovr_too_many_levels_separate():
     ds = gdal.GetDriverByName('GTiff').CreateCopy(tmpfilename, src_ds)
     ds.BuildOverviews('AVERAGE', [2, 4, 8, 16, 32, 64, 128, 256, 512, 1024, 2048, 4096])
     if ds.GetRasterBand(1).GetOverviewCount() != 6:
-        gdaltest.post_reason('fail')
         print(ds.GetRasterBand(1).GetOverviewCount())
         return 'fail'
     if ds.GetRasterBand(1).GetOverviewCount() != 6:
-        gdaltest.post_reason('fail')
         print(ds.GetRasterBand(1).GetOverviewCount())
         return 'fail'
     ds = None
@@ -2300,11 +2286,9 @@ def test_tiff_ovr_too_many_levels_external():
     ds = gdal.Open(tmpfilename)
     ds.BuildOverviews('AVERAGE', [2, 4, 8, 16, 32, 64, 128, 256, 512, 1024, 2048, 4096])
     if ds.GetRasterBand(1).GetOverviewCount() != 5:
-        gdaltest.post_reason('fail')
         return 'fail'
     ds.BuildOverviews('AVERAGE', [2, 4, 8, 16, 32, 64, 128, 256, 512, 1024, 2048, 4096])
     if ds.GetRasterBand(1).GetOverviewCount() != 5:
-        gdaltest.post_reason('fail')
         return 'fail'
     ds = None
     gdal.GetDriverByName('GTiff').Delete(tmpfilename)
@@ -2333,7 +2317,6 @@ def test_tiff_ovr_average_multiband_vs_singleband():
     gdal.GetDriverByName('GTiff').Delete('/vsimem/tiff_ovr_average_multiband_pixel.tif')
 
     if cs_band != cs_pixel:
-        gdaltest.post_reason('fail')
         print(cs_band, cs_pixel)
         return 'fail'
 
diff --git a/autotest/gcore/tiff_read.py b/autotest/gcore/tiff_read.py
index fc56fe63006b..8297577c4e37 100755
--- a/autotest/gcore/tiff_read.py
+++ b/autotest/gcore/tiff_read.py
@@ -88,19 +88,16 @@ def test_tiff_read_off():
     # Test absolute/offset directory access.
     ds = gdal.Open('GTIFF_DIR:off:408:data/byte.tif')
     if ds.GetRasterBand(1).Checksum() != 4672:
-        gdaltest.post_reason('fail')
         return 'fail'
 
     # Same with GTIFF_RAW: prefix
     ds = gdal.Open('GTIFF_RAW:GTIFF_DIR:off:408:data/byte.tif')
     if ds.GetRasterBand(1).Checksum() != 4672:
-        gdaltest.post_reason('fail')
         return 'fail'
 
     # Test index directory access
     ds = gdal.Open('GTIFF_DIR:1:data/byte.tif')
     if ds.GetRasterBand(1).Checksum() != 4672:
-        gdaltest.post_reason('fail')
         return 'fail'
 
     # Check that georeferencing is read properly when accessing
@@ -115,32 +112,27 @@ def test_tiff_read_off():
     with gdaltest.error_handler():
         ds = gdal.Open('GTIFF_DIR:')
     if ds is not None:
-        gdaltest.post_reason('fail')
         return 'fail'
 
     with gdaltest.error_handler():
         ds = gdal.Open('GTIFF_DIR:1')
     if ds is not None:
-        gdaltest.post_reason('fail')
         return 'fail'
 
     with gdaltest.error_handler():
         ds = gdal.Open('GTIFF_DIR:1:')
     if ds is not None:
-        gdaltest.post_reason('fail')
         return 'fail'
 
     with gdaltest.error_handler():
         ds = gdal.Open('GTIFF_DIR:1:/vsimem/i_dont_exist.tif')
     if ds is not None:
-        gdaltest.post_reason('fail')
         return 'fail'
 
     # Requested directory not found
     with gdaltest.error_handler():
         ds = gdal.Open('GTIFF_DIR:2:data/byte.tif')
     if ds is not None:
-        gdaltest.post_reason('fail')
         return 'fail'
 
     # Opening a specific TIFF directory is not supported in update mode.
@@ -148,7 +140,6 @@ def test_tiff_read_off():
     with gdaltest.error_handler():
         ds = gdal.Open('GTIFF_DIR:1:data/byte.tif', gdal.GA_Update)
     if ds is None:
-        gdaltest.post_reason('fail')
         return 'fail'
 
     return 'success'
@@ -180,7 +171,6 @@ def test_tiff_check_alpha():
     if gdaltest.supports_force_rgba:
         got_cs = [ds.GetRasterBand(i + 1).Checksum() for i in range(ds.RasterCount)]
         if got_cs != [1970, 1970, 1970, 10807]:
-            gdaltest.post_reason('fail')
             print(got_cs)
             return 'fail'
         ds = None
@@ -203,7 +193,6 @@ def test_tiff_check_alpha():
         got_cs = [ds.GetRasterBand(i + 1).Checksum() for i in range(ds.RasterCount)]
         # FIXME? Not the same as without GTIFF_FORCE_RGBA=YES
         if got_cs != [11547, 57792, 35643, 10807]:
-            gdaltest.post_reason('fail')
             print(got_cs)
             return 'fail'
         ds = None
@@ -225,7 +214,6 @@ def test_tiff_check_alpha():
         gdal.SetConfigOption('GTIFF_FORCE_RGBA', None)
         got_cs = [ds.GetRasterBand(i + 1).Checksum() for i in range(ds.RasterCount)]
         if got_cs != [12603, 58561, 36064, 10807]:
-            gdaltest.post_reason('fail')
             print(got_cs)
             return 'fail'
         ds = None
@@ -1146,7 +1134,6 @@ def test_tiff_read_exif_and_gps():
     ds = None
 
     if exif_md is None or not exif_md:
-        gdaltest.post_reason('failed')
         return 'fail'
 
     ds = gdal.Open('data/exif_and_gps.tif')
@@ -1154,7 +1141,6 @@ def test_tiff_read_exif_and_gps():
     ds = None
 
     if EXIF_GPSVersionID is None:
-        gdaltest.post_reason('failed')
         return 'fail'
 
     # We should not get any EXIF metadata with that file
@@ -1163,7 +1149,6 @@ def test_tiff_read_exif_and_gps():
     ds = None
 
     if not (exif_md is None or not exif_md):
-        gdaltest.post_reason('failed')
         return 'fail'
 
     return 'success'
@@ -1180,18 +1165,15 @@ def test_tiff_jpeg_rgba_pixel_interleaved():
     ds = gdal.Open('data/stefan_full_rgba_jpeg_contig.tif')
     md = ds.GetMetadata('IMAGE_STRUCTURE')
     if md['INTERLEAVE'] != 'PIXEL':
-        gdaltest.post_reason('failed')
         return 'fail'
 
     expected_cs = [16404, 62700, 37913, 14174]
     for i in range(4):
         cs = ds.GetRasterBand(i + 1).Checksum()
         if cs != expected_cs[i]:
-            gdaltest.post_reason('failed')
             return 'fail'
 
         if ds.GetRasterBand(i + 1).GetRasterColorInterpretation() != gdal.GCI_RedBand + i:
-            gdaltest.post_reason('failed')
             return 'fail'
 
     ds = None
@@ -1210,18 +1192,15 @@ def test_tiff_jpeg_rgba_band_interleaved():
     ds = gdal.Open('data/stefan_full_rgba_jpeg_separate.tif')
     md = ds.GetMetadata('IMAGE_STRUCTURE')
     if md['INTERLEAVE'] != 'BAND':
-        gdaltest.post_reason('failed')
         return 'fail'
 
     expected_cs = [16404, 62700, 37913, 14174]
     for i in range(4):
         cs = ds.GetRasterBand(i + 1).Checksum()
         if cs != expected_cs[i]:
-            gdaltest.post_reason('failed')
             return 'fail'
 
         if ds.GetRasterBand(i + 1).GetRasterColorInterpretation() != gdal.GCI_RedBand + i:
-            gdaltest.post_reason('failed')
             return 'fail'
 
     ds = None
@@ -1358,33 +1337,24 @@ def test_tiff_read_tiff_metadata():
 
     ds = gdal.Open('data/stefan_full_rgba_jpeg_contig.tif')
     if ds.GetRasterBand(1).GetMetadataItem('BLOCK_OFFSET_0_0', 'TIFF') != '254':
-        gdaltest.post_reason('fail')
         return 'fail'
     if ds.GetRasterBand(1).GetMetadataItem('BLOCK_SIZE_0_0', 'TIFF') != '770':
-        gdaltest.post_reason('fail')
         return 'fail'
     if ds.GetRasterBand(1).GetMetadataItem('JPEGTABLES', 'TIFF').find('FFD8') != 0:
-        gdaltest.post_reason('fail')
         return 'fail'
     if ds.GetRasterBand(1).GetMetadataItem('BLOCK_OFFSET_100_0', 'TIFF') is not None:
-        gdaltest.post_reason('fail')
         return 'fail'
     if ds.GetRasterBand(1).GetMetadataItem('BLOCK_OFFSET_0_100', 'TIFF') is not None:
-        gdaltest.post_reason('fail')
         return 'fail'
     if ds.GetRasterBand(1).GetMetadataItem('BLOCK_SIZE_100_0', 'TIFF') is not None:
-        gdaltest.post_reason('fail')
         return 'fail'
     if ds.GetRasterBand(1).GetMetadataItem('BLOCK_SIZE_0_100', 'TIFF') is not None:
-        gdaltest.post_reason('fail')
         return 'fail'
 
     ds = gdal.Open('data/stefan_full_rgba_jpeg_separate.tif')
     if ds.GetRasterBand(4).GetMetadataItem('BLOCK_OFFSET_0_2', 'TIFF') != '11071':
-        gdaltest.post_reason('fail')
         return 'fail'
     if ds.GetRasterBand(4).GetMetadataItem('BLOCK_SIZE_0_2', 'TIFF') != '188':
-        gdaltest.post_reason('fail')
         return 'fail'
 
     return 'success'
@@ -1405,7 +1375,6 @@ def test_tiff_read_irregular_tile_size_jpeg_in_tiff():
     ds.GetRasterBand(1).Checksum()
     gdal.PopErrorHandler()
     if gdal.GetLastErrorType() == 0:
-        gdaltest.post_reason('fail')
         return 'fail'
 
     gdal.ErrorReset()
@@ -1413,7 +1382,6 @@ def test_tiff_read_irregular_tile_size_jpeg_in_tiff():
     ds.GetRasterBand(1).GetOverview(0).Checksum()
     gdal.PopErrorHandler()
     if gdal.GetLastErrorType() == 0:
-        gdaltest.post_reason('fail')
         return 'fail'
     gdal.ErrorReset()
 
@@ -1643,14 +1611,12 @@ def test_tiff_direct_and_virtual_mem_io():
                     gdal.Unlink(filename)
 
                     if ref_data_native_type != got_data_native_type:
-                        gdaltest.post_reason('fail')
                         print(option)
                         print(i)
                         return 'fail'
 
                     if truncated and not band_interleaved:
                         if got_data_native_type_whole is not None:
-                            gdaltest.post_reason('fail')
                             print(truncated)
                             print(band_interleaved)
                             print(option)
@@ -1658,19 +1624,16 @@ def test_tiff_direct_and_virtual_mem_io():
                             print(gdal.GetDataTypeName(dt))
                             return 'fail'
                     elif ref_data_native_type_whole != got_data_native_type_whole:
-                        gdaltest.post_reason('fail')
                         print(option)
                         print(i)
                         return 'fail'
 
                     if ref_data_native_type_downsampled != got_data_native_type_downsampled:
-                        gdaltest.post_reason('fail')
                         print(option)
                         print(i)
                         return 'fail'
 
                     if not truncated and ref_data_native_type_downsampled_not_nearest != got_data_native_type_downsampled_not_nearest:
-                        gdaltest.post_reason('fail')
                         print(truncated)
                         print(band_interleaved)
                         print(option)
@@ -1678,7 +1641,6 @@ def test_tiff_direct_and_virtual_mem_io():
                         return 'fail'
 
                     if ref_data_native_type_upsampled != got_data_native_type_upsampled:
-                        gdaltest.post_reason('fail')
                         print(option)
                         print(i)
                         return 'fail'
@@ -1687,7 +1649,6 @@ def test_tiff_direct_and_virtual_mem_io():
                         for x in range(xsize):
                             for k in range(dt_size):
                                 if ref_data_native_type_custom_spacings[(y * xsize + x) * nbands * dt_size + k] != got_data_native_type_custom_spacings[(y * xsize + x) * nbands * dt_size + k]:
-                                    gdaltest.post_reason('fail')
                                     print(gdal.GetDataTypeName(dt))
                                     print(option)
                                     print(i)
@@ -1695,7 +1656,6 @@ def test_tiff_direct_and_virtual_mem_io():
                                 if not truncated:
                                     for band in range(nbands):
                                         if ref_nbands_data_native_type_custom_spacings[(y * xsize + x) * 2 * nbands * dt_size + band * dt_size + k] != got_nbands_data_native_type_custom_spacings[(y * xsize + x) * 2 * nbands * dt_size + band * dt_size + k]:
-                                            gdaltest.post_reason('fail')
                                             print(gdal.GetDataTypeName(dt))
                                             print(option)
                                             print(i)
@@ -1704,7 +1664,6 @@ def test_tiff_direct_and_virtual_mem_io():
                                     if nbands == 3:
                                         for band in range(nbands):
                                             if ref_nbands_data_native_type_custom_spacings_2[(y * xsize + x) * 4 * dt_size + band * dt_size + k] != got_nbands_data_native_type_custom_spacings_2[(y * xsize + x) * 4 * dt_size + band * dt_size + k]:
-                                                gdaltest.post_reason('fail')
                                                 print(gdal.GetDataTypeName(dt))
                                                 print(option)
                                                 print(i)
@@ -1712,14 +1671,12 @@ def test_tiff_direct_and_virtual_mem_io():
                                                 return 'fail'
 
                     if ref_data_float32 != got_data_float32:
-                        gdaltest.post_reason('fail')
                         print(gdal.GetDataTypeName(dt))
                         print(option)
                         print(i)
                         return 'fail'
 
                     if not truncated and ref_nbands_data_native_type != got_nbands_data_native_type:
-                        gdaltest.post_reason('fail')
                         print(truncated)
                         print(band_interleaved)
                         print(option)
@@ -1728,13 +1685,11 @@ def test_tiff_direct_and_virtual_mem_io():
 
                     if truncated:
                         if got_nbands_data_native_type_whole is not None:
-                            gdaltest.post_reason('fail')
                             print(gdal.GetDataTypeName(dt))
                             print(option)
                             print(i)
                             return 'fail'
                     elif ref_nbands_data_native_type_whole != got_nbands_data_native_type_whole:
-                        gdaltest.post_reason('fail')
                         print(gdal.GetDataTypeName(dt))
                         print(option)
                         print(i)
@@ -1742,18 +1697,15 @@ def test_tiff_direct_and_virtual_mem_io():
 
                     if truncated:
                         if got_nbands_data_native_type_pixel_interleaved_whole is not None:
-                            gdaltest.post_reason('fail')
                             print(option)
                             print(i)
                             return 'fail'
                     elif ref_nbands_data_native_type_pixel_interleaved_whole != got_nbands_data_native_type_pixel_interleaved_whole:
-                        gdaltest.post_reason('fail')
                         print(option)
                         print(i)
                         return 'fail'
 
                     if truncated and got_nbands_data_native_type_bottom_right_downsampled is not None:
-                        gdaltest.post_reason('fail')
                         print(gdal.GetDataTypeName(dt))
                         print(option)
                         print(i)
@@ -1763,25 +1715,21 @@ def test_tiff_direct_and_virtual_mem_io():
                         continue
 
                     if ref_nbands_data_native_type_downsampled != got_nbands_data_native_type_downsampled:
-                        gdaltest.post_reason('fail')
                         print(option)
                         print(i)
                         return 'fail'
 
                     if ref_nbands_data_native_type_downsampled_interleaved != got_nbands_data_native_type_downsampled_interleaved:
-                        gdaltest.post_reason('fail')
                         print(option)
                         print(i)
                         return 'fail'
 
                     if ref_nbands_data_native_type_downsampled_not_nearest != got_nbands_data_native_type_downsampled_not_nearest:
-                        gdaltest.post_reason('fail')
                         print(option)
                         print(i)
                         return 'fail'
 
                     if ref_nbands_data_native_type_upsampled != got_nbands_data_native_type_upsampled:
-                        gdaltest.post_reason('fail')
                         print(option)
                         print(i)
                         # import struct
@@ -1794,7 +1742,6 @@ def test_tiff_direct_and_virtual_mem_io():
                         return 'fail'
 
                     if ref_nbands_data_native_type_downsampled_x_upsampled_y != got_nbands_data_native_type_downsampled_x_upsampled_y:
-                        gdaltest.post_reason('fail')
                         print(option)
                         print(i)
                         # import struct
@@ -1807,13 +1754,11 @@ def test_tiff_direct_and_virtual_mem_io():
                         return 'fail'
 
                     if ref_nbands_data_native_type_unordered_list != got_nbands_data_native_type_unordered_list:
-                        gdaltest.post_reason('fail')
                         print(option)
                         print(i)
                         return 'fail'
 
                     if ref_nbands_data_native_type_pixel_interleaved != got_nbands_data_native_type_pixel_interleaved:
-                        gdaltest.post_reason('fail')
                         print(option)
                         print(i)
                         return 'fail'
@@ -1823,7 +1768,6 @@ def test_tiff_direct_and_virtual_mem_io():
                             for b in range(nbands - 1):
                                 for k in range(dt_size):
                                     if ref_nbands_m_1_data_native_type_pixel_interleaved_with_extra_space[((y * xsize + x) * nbands + b) * dt_size + k] != got_nbands_m_1_data_native_type_pixel_interleaved_with_extra_space[((y * xsize + x) * nbands + b) * dt_size + k]:
-                                        gdaltest.post_reason('fail')
                                         print(option)
                                         print(i)
                                         print(y)
@@ -1832,13 +1776,11 @@ def test_tiff_direct_and_virtual_mem_io():
                                         return 'fail'
 
                     if ref_nbands_data_float32 != got_nbands_data_float32:
-                        gdaltest.post_reason('fail')
                         print(option)
                         print(i)
                         return 'fail'
 
                     if ref_nbands_data_float32_pixel_interleaved != got_nbands_data_float32_pixel_interleaved:
-                        gdaltest.post_reason('fail')
                         print(option)
                         print(i)
                         return 'fail'
@@ -2475,7 +2417,6 @@ def test_tiff_read_empty_nodata_tag():
 
     ds = gdal.Open('data/empty_nodata.tif')
     if ds.GetRasterBand(1).GetNoDataValue() is not None:
-        gdaltest.post_reason('fail')
         print(ds.GetRasterBand(1).GetNoDataValue())
         return 'fail'
 
@@ -2511,7 +2452,6 @@ def test_tiff_read_strace_check():
             lines_with_dotdot_gcore += [line]
 
     if len(lines_with_dotdot_gcore) != 1:
-        gdaltest.post_reason('fail')
         print(lines_with_dotdot_gcore)
         return 'fail'
 
@@ -2550,7 +2490,6 @@ def test_tiff_read_minisblack_as_rgba():
     gdal.SetConfigOption('GTIFF_FORCE_RGBA', None)
     got_cs = [ds.GetRasterBand(i + 1).Checksum() for i in range(ds.RasterCount)]
     if got_cs != [4672, 4672, 4672, 4873]:
-        gdaltest.post_reason('fail')
         print(got_cs)
         return 'fail'
     ds = None
@@ -2571,7 +2510,6 @@ def test_tiff_read_colortable_as_rgba():
     gdal.SetConfigOption('GTIFF_FORCE_RGBA', None)
     got_cs = [ds.GetRasterBand(i + 1).Checksum() for i in range(ds.RasterCount)]
     if got_cs != [2433, 2433, 2433, 4873]:
-        gdaltest.post_reason('fail')
         print(got_cs)
         return 'fail'
     ds = None
@@ -2593,7 +2531,6 @@ def test_tiff_read_logl_as_rgba():
     got_cs = [ds.GetRasterBand(i + 1).Checksum() for i in range(ds.RasterCount)]
     # I'm pretty sure this isn't the expected result...
     if got_cs != [0, 0, 0, 4873]:
-        gdaltest.post_reason('fail')
         print(got_cs)
         return 'fail'
     ds = None
@@ -2618,7 +2555,6 @@ def test_tiff_read_strip_separate_as_rgba():
     gdal.SetConfigOption('GTIFF_FORCE_RGBA', None)
     got_cs = [ds.GetRasterBand(i + 1).Checksum() for i in range(ds.RasterCount)]
     if got_cs != [21212, 21053, 21349, 30658]:
-        gdaltest.post_reason('fail')
         print(got_cs)
         return 'fail'
     ds = None
@@ -2635,7 +2571,6 @@ def test_tiff_read_strip_separate_as_rgba():
     gdal.SetConfigOption('GTIFF_FORCE_RGBA', None)
     got_cs = [ds.GetRasterBand(i + 1).Checksum() for i in range(ds.RasterCount)]
     if got_cs != [21212, 21212, 21212, 30658]:
-        gdaltest.post_reason('fail')
         print(got_cs)
         return 'fail'
     ds = None
@@ -2662,7 +2597,6 @@ def test_tiff_read_tiled_separate_as_rgba():
     gdal.SetConfigOption('GTIFF_FORCE_RGBA', None)
     got_cs = [ds.GetRasterBand(i + 1).Checksum() for i in range(ds.RasterCount)]
     if got_cs != [21212, 21053, 21349, 30658]:
-        gdaltest.post_reason('fail')
         print(got_cs)
         return 'fail'
     ds = None
@@ -2678,7 +2612,6 @@ def test_tiff_read_tiled_separate_as_rgba():
     gdal.SetConfigOption('GTIFF_FORCE_RGBA', None)
     got_cs = [ds.GetRasterBand(i + 1).Checksum() for i in range(ds.RasterCount)]
     if got_cs != [4672, 4672, 4672, 4873]:
-        gdaltest.post_reason('fail')
         print(got_cs)
         return 'fail'
     ds = None
@@ -2710,11 +2643,9 @@ def test_tiff_read_wrong_number_extrasamples():
     with gdaltest.error_handler():
         ds = gdal.Open('data/6band_wrong_number_extrasamples.tif')
     if gdal.GetLastErrorMsg().find('Wrong number of ExtraSamples') < 0:
-        gdaltest.post_reason('fail')
         print(gdal.GetLastErrorMsg())
         return 'fail'
     if ds.GetRasterBand(6).GetRasterColorInterpretation() != gdal.GCI_AlphaBand:
-        gdaltest.post_reason('fail')
         print(ds.GetRasterBand(6).GetRasterColorInterpretation())
         return 'fail'
 
@@ -2730,7 +2661,6 @@ def test_tiff_read_one_strip_no_bytecount():
     ds = gdal.Open('data/one_strip_nobytecount.tif')
     gdal.PopErrorHandler()
     if ds.GetRasterBand(1).Checksum() != 1:
-        gdaltest.post_reason('fail')
         print(ds.GetRasterBand(1).Checksum())
         return 'fail'
 
@@ -2953,7 +2883,6 @@ def test_tiff_read_one_band_from_two_bands():
 
     ds = gdal.Open('/vsimem/tiff_read_one_band_from_two_bands_dst.tif')
     if ds.GetRasterBand(1).Checksum() != 4672:
-        gdaltest.post_reason('fail')
         return 'fail'
     ds = None
     gdal.Unlink('/vsimem/tiff_read_one_band_from_two_bands.tif')
@@ -2970,7 +2899,6 @@ def test_tiff_read_jpeg_cloud_optimized():
         cs0 = ds.GetRasterBand(1).Checksum()
         cs1 = ds.GetRasterBand(1).GetOverview(0).Checksum()
         if cs0 != 4743 or cs1 != 1133:
-            gdaltest.post_reason('failure')
             print(i)
             print(cs0)
             print(cs1)
@@ -2990,7 +2918,6 @@ def test_tiff_read_corrupted_jpeg_cloud_optimized():
     ds = gdal.Open('data/byte_ovr_jpeg_tablesmode_not_correctly_set_on_ovr.tif')
     cs0 = ds.GetRasterBand(1).Checksum()
     if cs0 != 4743:
-        gdaltest.post_reason('failure')
         print(cs0)
         return 'fail'
 
@@ -2999,7 +2926,6 @@ def test_tiff_read_corrupted_jpeg_cloud_optimized():
     if cs1 == 0:
         print('Expected error while writing overview with libjpeg-6b')
     elif cs1 != 1133:
-        gdaltest.post_reason('failure')
         print(cs1)
         return 'fail'
 
@@ -3033,7 +2959,6 @@ def test_tiff_read_ycbcr_lzw():
         if cs1 == 0:
             gdal.PopErrorHandler()
         if got_cs1 != cs1 or got_cs2 != cs2 or got_cs3 != cs3:
-            gdaltest.post_reason('failure')
             print(filename, got_cs1, got_cs2, got_cs3)
             return 'fail'
 
@@ -3048,10 +2973,8 @@ def test_tiff_read_ycbcr_int12():
     with gdaltest.error_handler():
         ds = gdal.Open('data/int12_ycbcr_contig.tif')
     if ds is not None:
-        gdaltest.post_reason('fail')
         return 'fail'
     if gdal.GetLastErrorMsg().find('Cannot open TIFF file with') < 0:
-        gdaltest.post_reason('fail')
         print(gdal.GetLastErrorMsg())
         return 'fail'
 
@@ -3072,7 +2995,6 @@ def test_tiff_read_unit_from_srs():
     ds = gdal.Open('/vsimem/tiff_read_unit_from_srs.tif')
     unit = ds.GetRasterBand(1).GetUnitType()
     if unit != 'metre':
-        gdaltest.post_reason('fail')
         print(unit)
         return 'fail'
     ds = None
@@ -3089,10 +3011,8 @@ def test_tiff_read_arcgis93_geodataxform_gcp():
 
     ds = gdal.Open('data/arcgis93_geodataxform_gcp.tif')
     if ds.GetGCPProjection().find('26712') < 0:
-        gdaltest.post_reason('fail')
         return 'fail'
     if ds.GetGCPCount() != 16:
-        gdaltest.post_reason('fail')
         return 'fail'
     gcp = ds.GetGCPs()[0]
     if abs(gcp.GCPPixel - 565) > 1e-5 or \
@@ -3100,7 +3020,6 @@ def test_tiff_read_arcgis93_geodataxform_gcp():
        abs(gcp.GCPX - 500000) > 1e-5 or \
        abs(gcp.GCPY - 4705078.79016612) > 1e-5 or \
        abs(gcp.GCPZ - 0) > 1e-5:
-        gdaltest.post_reason('fail')
         return 'fail'
     return 'success'
 
@@ -3113,7 +3032,6 @@ def test_tiff_read_block_width_above_32bit():
     with gdaltest.error_handler():
         ds = gdal.Open('data/block_width_above_32bit.tif')
     if ds is not None:
-        gdaltest.post_reason('fail')
         return 'fail'
     return 'success'
 
@@ -3126,7 +3044,6 @@ def test_tiff_read_image_width_above_32bit():
     with gdaltest.error_handler():
         ds = gdal.Open('data/image_width_above_32bit.tif')
     if ds is not None:
-        gdaltest.post_reason('fail')
         return 'fail'
     return 'success'
 
@@ -3139,13 +3056,11 @@ def test_tiff_read_second_image_width_above_32bit():
     ds = gdal.Open('data/second_image_width_above_32bit.tif')
     with gdaltest.error_handler():
         if ds.GetMetadata("SUBDATASETS") != {}:
-            gdaltest.post_reason('fail')
             return 'fail'
 
     with gdaltest.error_handler():
         ds = gdal.Open('GTIFF_DIR:2:data/second_image_width_above_32bit.tif')
     if ds is not None:
-        gdaltest.post_reason('fail')
         return 'fail'
 
     return 'success'
@@ -3159,11 +3074,9 @@ def test_tiff_read_minimum_tiff_tags_no_warning():
     gdal.ErrorReset()
     ds = gdal.Open('data/minimum_tiff_tags_no_warning.tif')
     if gdal.GetLastErrorMsg() != '':
-        gdaltest.post_reason('fail')
         return 'fail'
     ds.GetRasterBand(1).Checksum()
     if gdal.GetLastErrorMsg() != '':
-        gdaltest.post_reason('fail')
         return 'fail'
 
     return 'success'
@@ -3178,12 +3091,10 @@ def test_tiff_read_minimum_tiff_tags_with_warning():
     with gdaltest.error_handler():
         ds = gdal.Open('data/minimum_tiff_tags_with_warning.tif')
     if gdal.GetLastErrorMsg() == '':
-        gdaltest.post_reason('fail')
         return 'fail'
     gdal.ErrorReset()
     ds.GetRasterBand(1).Checksum()
     if gdal.GetLastErrorMsg() != '':
-        gdaltest.post_reason('fail')
         return 'fail'
 
     return 'success'
@@ -3429,10 +3340,8 @@ def test_tiff_read_uint33():
     with gdaltest.error_handler():
         ds = gdal.Open('data/uint33.tif')
     if ds is not None:
-        gdaltest.post_reason('fail')
         return 'fail'
     if gdal.GetLastErrorMsg().find('Unsupported TIFF configuration') < 0:
-        gdaltest.post_reason('fail')
         print(gdal.GetLastErrorMsg())
         return 'fail'
 
@@ -3477,7 +3386,6 @@ def test_tiff_read_toomanyblocks():
     with gdaltest.error_handler():
         ds = gdal.Open('data/toomanyblocks.tif')
     if ds is not None:
-        gdaltest.post_reason('fail')
         return 'fail'
 
     return 'success'
@@ -3491,7 +3399,6 @@ def test_tiff_read_toomanyblocks_separate():
     with gdaltest.error_handler():
         ds = gdal.Open('data/toomanyblocks_separate.tif')
     if ds is not None:
-        gdaltest.post_reason('fail')
         return 'fail'
 
     return 'success'
@@ -3506,22 +3413,17 @@ def test_tiff_read_size_of_stripbytecount_lower_than_stripcount():
     ds = gdal.Open('data/size_of_stripbytecount_lower_than_stripcount.tif')
     # There are 3 strips but StripByteCounts has just two elements;
     if ds.GetRasterBand(1).GetMetadataItem('BLOCK_OFFSET_0_1', 'TIFF') != '171':
-        gdaltest.post_reason('fail')
         return 'fail'
     if ds.GetRasterBand(1).GetMetadataItem('BLOCK_SIZE_0_1', 'TIFF') != '1':
-        gdaltest.post_reason('fail')
         return 'fail'
     if ds.GetRasterBand(1).GetMetadataItem('BLOCK_OFFSET_0_2', 'TIFF') is not None:
-        gdaltest.post_reason('fail')
         return 'fail'
     if ds.GetRasterBand(1).GetMetadataItem('BLOCK_SIZE_0_2', 'TIFF') is not None:
-        gdaltest.post_reason('fail')
         return 'fail'
 
     ds = gdal.Open('data/size_of_stripbytecount_at_1_and_lower_than_stripcount.tif')
     # There are 3 strips but StripByteCounts has just one element;
     if ds.GetRasterBand(1).GetMetadataItem('BLOCK_SIZE_0_0', 'TIFF') != '1':
-        gdaltest.post_reason('fail')
         return 'fail'
 
     return 'success'
@@ -3595,7 +3497,6 @@ def test_tiff_read_progressive_jpeg_denial_of_service():
     with gdaltest.error_handler():
         cs = ds.GetRasterBand(1).Checksum()
         if cs != 0 or gdal.GetLastErrorMsg() == '':
-            gdaltest.post_reason('fail')
             return 'fail'
 
     # Should error out with 'TIFFjpeg_progress_monitor:Scan number...
@@ -3608,7 +3509,6 @@ def test_tiff_read_progressive_jpeg_denial_of_service():
         del os.environ['LIBTIFF_ALLOW_LARGE_LIBJPEG_MEM_ALLOC']
         del os.environ['LIBTIFF_JPEG_MAX_ALLOWED_SCAN_NUMBER']
         if gdal.GetLastErrorMsg() == '':
-            gdaltest.post_reason('fail')
             return 'fail'
 
     return 'success'
@@ -3651,7 +3551,6 @@ def test_tiff_read_mmap_interface():
         cs = ds.GetRasterBand(1).Checksum()
         gdal.SetConfigOption('GTIFF_USE_MMAP', None)
         if cs != 4672:
-            gdaltest.post_reason('fail')
             print(options, cs)
             return 'fail'
 
@@ -3667,7 +3566,6 @@ def test_tiff_read_mmap_interface():
             cs = ds.GetRasterBand(1).Checksum()
         gdal.SetConfigOption('GTIFF_USE_MMAP', None)
         if cs != 0:
-            gdaltest.post_reason('fail')
             print(options, cs)
             return 'fail'
         gdal.Unlink(tmpfile)
@@ -3691,7 +3589,6 @@ def test_tiff_read_jpeg_too_big_last_stripe():
     with gdaltest.error_handler():
         cs = ds.GetRasterBand(1).Checksum()
     if cs != 4557:
-        gdaltest.post_reason('fail')
         print(cs)
         return 'fail'
 
@@ -3699,7 +3596,6 @@ def test_tiff_read_jpeg_too_big_last_stripe():
     with gdaltest.error_handler():
         cs = ds.GetRasterBand(1).Checksum()
     if cs != 4557:
-        gdaltest.post_reason('fail')
         print(cs)
         return 'fail'
 
@@ -3714,19 +3610,16 @@ def test_tiff_read_negative_scaley():
     ds = gdal.Open('data/negative_scaley.tif')
     with gdaltest.error_handler():
         if ds.GetGeoTransform()[5] != -60:
-            gdaltest.post_reason('fail')
             return 'fail'
 
     ds = gdal.Open('data/negative_scaley.tif')
     with gdaltest.config_option('GTIFF_HONOUR_NEGATIVE_SCALEY', 'NO'):
         if ds.GetGeoTransform()[5] != -60:
-            gdaltest.post_reason('fail')
             return 'fail'
 
     ds = gdal.Open('data/negative_scaley.tif')
     with gdaltest.config_option('GTIFF_HONOUR_NEGATIVE_SCALEY', 'YES'):
         if ds.GetGeoTransform()[5] != 60:
-            gdaltest.post_reason('fail')
             return 'fail'
 
     return 'success'
@@ -3850,11 +3743,9 @@ def test_tiff_read_overview_of_external_mask():
     gdal.Unlink(filename + '.msk')
 
     if cs1 != cs2:
-        gdaltest.post_reason('fail')
         print(cs1, cs2)
         return 'fail'
     if flags1 != gdal.GMF_PER_DATASET:
-        gdaltest.post_reason('fail')
         print(flags1)
         return 'fail'
 
diff --git a/autotest/gcore/tiff_srs.py b/autotest/gcore/tiff_srs.py
index 03fed36f28d6..dd34fcbbe821 100755
--- a/autotest/gcore/tiff_srs.py
+++ b/autotest/gcore/tiff_srs.py
@@ -190,7 +190,6 @@ def test_tiff_srs_WGS_1984_Web_Mercator_Auxiliary_Sphere():
     PARAMETER["Auxiliary_Sphere_Type",0.0],
     UNIT["Meter",1.0],
     EXTENSION["PROJ4","+proj=merc +a=6378137 +b=6378137 +lat_ts=0.0 +lon_0=0.0 +x_0=0.0 +y_0=0 +k=1.0 +units=m +nadgrids=@null +wktext  +no_defs"]]""":
-        gdaltest.post_reason('fail')
         print(wkt)
         return 'fail'
 
@@ -213,7 +212,6 @@ def test_tiff_srs_angular_units():
     wkt = ds.GetProjectionRef()
     if wkt.find('UNIT["arc-second",4.848136811095361e-06]') < 0 and \
        wkt.find('UNIT["arc-second",4.848136811095361e-006]') < 0:  # wine variant
-        gdaltest.post_reason('fail')
         print(wkt)
         return 'fail'
     ds = None
@@ -228,7 +226,6 @@ def test_tiff_srs_angular_units():
     ds = gdal.Open('/vsimem/tiff_srs_angular_units.tif')
     wkt = ds.GetProjectionRef()
     if wkt.find('UNIT["arc-minute",0.0002908882086657216]') < 0:
-        gdaltest.post_reason('fail')
         print(wkt)
         return 'fail'
     ds = None
@@ -243,7 +240,6 @@ def test_tiff_srs_angular_units():
     ds = gdal.Open('/vsimem/tiff_srs_angular_units.tif')
     wkt = ds.GetProjectionRef()
     if wkt.find('UNIT["grad",0.01570796326794897]') < 0:
-        gdaltest.post_reason('fail')
         print(wkt)
         return 'fail'
     ds = None
@@ -258,7 +254,6 @@ def test_tiff_srs_angular_units():
     ds = gdal.Open('/vsimem/tiff_srs_angular_units.tif')
     wkt = ds.GetProjectionRef()
     if wkt.find('UNIT["gon",0.01570796326794897]') < 0:
-        gdaltest.post_reason('fail')
         print(wkt)
         return 'fail'
     ds = None
@@ -273,7 +268,6 @@ def test_tiff_srs_angular_units():
     ds = gdal.Open('/vsimem/tiff_srs_angular_units.tif')
     wkt = ds.GetProjectionRef()
     if wkt.find('UNIT["radian",1]') < 0:
-        gdaltest.post_reason('fail')
         print(wkt)
         return 'fail'
     ds = None
@@ -288,7 +282,6 @@ def test_tiff_srs_angular_units():
     ds = gdal.Open('/vsimem/tiff_srs_angular_units.tif')
     wkt = ds.GetProjectionRef()
     if wkt.find('UNIT["custom",1.23]') < 0:
-        gdaltest.post_reason('fail')
         print(wkt)
         return 'fail'
     ds = None
@@ -313,7 +306,6 @@ def test_tiff_custom_datum_known_ellipsoid():
     ds = gdal.Open('/vsimem/tiff_custom_datum_known_ellipsoid.tif')
     wkt = ds.GetProjectionRef()
     if wkt != 'GEOGCS["WGS 84 based",DATUM["WGS_1984_based",SPHEROID["WGS 84",6378137,298.257223563,AUTHORITY["EPSG","7030"]]],PRIMEM["Greenwich",0],UNIT["degree",0.0174532925199433]]':
-        gdaltest.post_reason('fail')
         print(wkt)
         return 'fail'
     ds = None
@@ -335,7 +327,6 @@ def test_tiff_srs_epsg_2853_with_us_feet():
     gdal.SetConfigOption('GTIFF_IMPORT_FROM_EPSG', old_val)
     wkt = ds.GetProjectionRef()
     if wkt.find('PARAMETER["false_easting",11482916.66') < 0 or wkt.find('UNIT["us_survey_feet",0.3048006') < 0 or wkt.find('2853') >= 0:
-        gdaltest.post_reason('fail')
         print(wkt)
         return 'fail'
 
@@ -344,7 +335,6 @@ def test_tiff_srs_epsg_2853_with_us_feet():
     gdal.SetConfigOption('GTIFF_IMPORT_FROM_EPSG', old_val)
     wkt = ds.GetProjectionRef()
     if wkt.find('PARAMETER["false_easting",11482916.66') < 0 or wkt.find('UNIT["us_survey_feet",0.3048006') < 0 or wkt.find('2853') >= 0:
-        gdaltest.post_reason('fail')
         print(wkt)
         return 'fail'
 
@@ -375,7 +365,6 @@ def test_tiff_srs_PCSCitationGeoKey_LUnits():
     ds = gdal.Open('/vsimem/tiff_srs_PCSCitationGeoKey_LUnits.tif')
     wkt = ds.GetProjectionRef()
     if wkt != 'PROJCS["UTM Zone 32, Northern Hemisphere",GEOGCS["GRS 1980(IUGG, 1980)",DATUM["unknown",SPHEROID["GRS80",6378137,298.257222101],TOWGS84[0,0,0,0,0,0,0]],PRIMEM["Greenwich",0],UNIT["degree",0.0174532925199433]],PROJECTION["Transverse_Mercator"],PARAMETER["latitude_of_origin",0],PARAMETER["central_meridian",9],PARAMETER["scale_factor",0.9996],PARAMETER["false_easting",50000000],PARAMETER["false_northing",0],UNIT["Centimeter",0.01]]':
-        gdaltest.post_reason('fail')
         print(wkt)
         return 'fail'
     ds = None
@@ -395,7 +384,6 @@ def test_tiff_srs_projection_3856():
     ds = None
 
     if wkt.find('EXTENSION["PROJ4","+proj=merc +a=6378137 +b=6378137 +lat_ts=0.0 +lon_0=0.0 +x_0=0.0 +y_0=0 +k=1.0 +units=m +nadgrids=@null +wktext  +no_defs') < 0:
-        gdaltest.post_reason('fail')
         print(wkt)
         return 'fail'
 
@@ -412,7 +400,6 @@ def test_tiff_srs_imagine_localcs_citation():
     ds = None
 
     if wkt != 'LOCAL_CS["Projection Name = UTM Units = meters GeoTIFF Units = meters",UNIT["unknown",1]]':
-        gdaltest.post_reason('fail')
         print(wkt)
         return 'fail'
 
@@ -430,7 +417,6 @@ def test_tiff_srs_towgs84_override():
     ds = None
 
     if wkt.find('TOWGS84[584.8,67,400.3,0.105,0.013,-2.378,10.29]') < 0:
-        gdaltest.post_reason('fail')
         print(wkt)
         return 'fail'
 
@@ -447,7 +433,6 @@ def test_tiff_srs_pcscitation():
     ds = None
 
     if wkt.find('PROJCS["mycitation",') != 0:
-        gdaltest.post_reason('fail')
         print(wkt)
         return 'fail'
 
diff --git a/autotest/gcore/tiff_write.py b/autotest/gcore/tiff_write.py
index 787725d740ff..0a16343bc207 100755
--- a/autotest/gcore/tiff_write.py
+++ b/autotest/gcore/tiff_write.py
@@ -1244,36 +1244,29 @@ def test_tiff_write_29():
     # TIFFTAG_EXTRASAMPLES=EXTRASAMPLE_UNSPECIFIED
     ds = gdaltest.tiff_drv.Create('/vsimem/rgba.tif', 1, 1, 4, options=['PHOTOMETRIC=RGB'])
     if ds.GetMetadataItem('TIFFTAG_EXTRASAMPLES', '_DEBUG_') != '0':
-        gdaltest.post_reason('fail')
         print(ds.GetMetadataItem('TIFFTAG_EXTRASAMPLES', '_DEBUG_'))
         return 'fail'
     if ds.GetRasterBand(4).GetRasterColorInterpretation() != gdal.GCI_Undefined:
-        gdaltest.post_reason('fail')
         return 'fail'
 
     # Now turn on alpha
     ds.GetRasterBand(4).SetRasterColorInterpretation(gdal.GCI_AlphaBand)
 
     if ds.GetRasterBand(4).GetRasterColorInterpretation() != gdal.GCI_AlphaBand:
-        gdaltest.post_reason('fail')
         return 'fail'
     if ds.GetMetadataItem('TIFFTAG_EXTRASAMPLES', '_DEBUG_') != '2':
-        gdaltest.post_reason('fail')
         print(ds.GetMetadataItem('TIFFTAG_EXTRASAMPLES', '_DEBUG_'))
         return 'fail'
     ds = None
 
     if gdal.VSIStatL('/vsimem/rgba.tif.aux.xml') is not None:
-        gdaltest.post_reason('fail')
         return 'fail'
 
     ds = gdal.Open('/vsimem/rgba.tif')
     if ds.GetMetadataItem('TIFFTAG_EXTRASAMPLES', '_DEBUG_') != '2':
-        gdaltest.post_reason('fail')
         print(ds.GetMetadataItem('TIFFTAG_EXTRASAMPLES', '_DEBUG_'))
         return 'fail'
     if ds.GetRasterBand(4).GetRasterColorInterpretation() != gdal.GCI_AlphaBand:
-        gdaltest.post_reason('fail')
         return 'fail'
 
     # Test cancelling alpha
@@ -1281,16 +1274,13 @@ def test_tiff_write_29():
     ds = None
 
     if gdal.VSIStatL('/vsimem/rgb_no_alpha.tif.aux.xml') is not None:
-        gdaltest.post_reason('fail')
         return 'fail'
 
     ds = gdal.Open('/vsimem/rgb_no_alpha.tif')
     if ds.GetMetadataItem('TIFFTAG_EXTRASAMPLES', '_DEBUG_') != '0':
-        gdaltest.post_reason('fail')
         print(ds.GetMetadataItem('TIFFTAG_EXTRASAMPLES', '_DEBUG_'))
         return 'fail'
     if ds.GetRasterBand(4).GetRasterColorInterpretation() != gdal.GCI_Undefined:
-        gdaltest.post_reason('fail')
         return 'fail'
 
     # Test re-adding alpha
@@ -1298,16 +1288,13 @@ def test_tiff_write_29():
     ds = None
 
     if gdal.VSIStatL('/vsimem/rgb_added_alpha.tif.aux.xml') is not None:
-        gdaltest.post_reason('fail')
         return 'fail'
 
     ds = gdal.Open('/vsimem/rgb_added_alpha.tif')
     if ds.GetMetadataItem('TIFFTAG_EXTRASAMPLES', '_DEBUG_') != '2':
-        gdaltest.post_reason('fail')
         print(ds.GetMetadataItem('TIFFTAG_EXTRASAMPLES', '_DEBUG_'))
         return 'fail'
     if ds.GetRasterBand(4).GetRasterColorInterpretation() != gdal.GCI_AlphaBand:
-        gdaltest.post_reason('fail')
         return 'fail'
     ds = None
 
@@ -2616,23 +2603,19 @@ def test_tiff_write_70():
 
     ds = gdal.Open('tmp/tiff_write_70.tif', gdal.GA_Update)
     if ds.GetRasterBand(1).DeleteNoDataValue() != 0:
-        gdaltest.post_reason('fail')
         return 'fail'
     if ds.GetRasterBand(1).GetNoDataValue() is not None:
-        gdaltest.post_reason('fail')
         return 'fail'
     ds = None
 
     try:
         os.stat('tmp/tiff_write_70.tif.aux.xml')
-        gdaltest.post_reason('fail')
         return 'fail'
     except OSError:
         pass
 
     ds = gdal.Open('tmp/tiff_write_70.tif')
     if ds.GetRasterBand(1).GetNoDataValue() is not None:
-        gdaltest.post_reason('fail')
         return 'fail'
     ds = None
 
@@ -3655,7 +3638,6 @@ def test_tiff_write_87():
         return 'fail'
 
     if ifd_main != 8 and not(ifd_main < ifd_ovr_0 and ifd_ovr_0 < ifd_ovr_1 and ifd_ovr_1 < data_ovr_1 and data_ovr_1 < data_ovr_0 and data_ovr_0 < data_main):
-        gdaltest.post_reason('failure')
         print(ifd_main, ifd_ovr_0, ifd_ovr_1, data_ovr_1, data_ovr_0, data_main)
         return 'fail'
 
@@ -4653,7 +4635,6 @@ def test_tiff_write_115():
     ds = gdal.Open(tmpfilename)
     md = ds.GetMetadata('IMAGE_STRUCTURE')
     if md['INTERLEAVE'] != 'PIXEL':
-        gdaltest.post_reason('failed')
         ds = None
         gdal.Unlink(tmpfilename)
         return 'fail'
@@ -4662,13 +4643,11 @@ def test_tiff_write_115():
     for i in range(4):
         cs = ds.GetRasterBand(i + 1).Checksum()
         if cs != expected_cs[i]:
-            gdaltest.post_reason('failed')
             ds = None
             gdal.Unlink(tmpfilename)
             return 'fail'
 
         if ds.GetRasterBand(i + 1).GetRasterColorInterpretation() != gdal.GCI_RedBand + i:
-            gdaltest.post_reason('failed')
             ds = None
             gdal.Unlink(tmpfilename)
             return 'fail'
@@ -4705,7 +4684,6 @@ def test_tiff_write_116():
     ds = gdal.Open(tmpfilename)
     md = ds.GetMetadata('IMAGE_STRUCTURE')
     if md['INTERLEAVE'] != 'BAND':
-        gdaltest.post_reason('failed')
         ds = None
         gdal.Unlink(tmpfilename)
         return 'fail'
@@ -4714,13 +4692,11 @@ def test_tiff_write_116():
     for i in range(4):
         cs = ds.GetRasterBand(i + 1).Checksum()
         if cs != expected_cs[i]:
-            gdaltest.post_reason('failed')
             ds = None
             gdal.Unlink(tmpfilename)
             return 'fail'
 
         if ds.GetRasterBand(i + 1).GetRasterColorInterpretation() != gdal.GCI_RedBand + i:
-            gdaltest.post_reason('failed')
             ds = None
             gdal.Unlink(tmpfilename)
             return 'fail'
@@ -4876,7 +4852,6 @@ def test_tiff_write_121():
     ds = gdaltest.tiff_drv.CreateCopy('/vsimem/tiff_write_121.tif', src_ds, options=['COPY_SRC_OVERVIEWS=YES'])
     gdal.PopErrorHandler()
     if ds is not None:
-        gdaltest.post_reason('fail')
         return 'fail'
     src_ds = None
 
@@ -4903,7 +4878,6 @@ def test_tiff_write_121():
     ds = gdaltest.tiff_drv.CreateCopy('/vsimem/tiff_write_121.tif', src_ds, options=['COPY_SRC_OVERVIEWS=YES'])
     gdal.PopErrorHandler()
     if ds is not None:
-        gdaltest.post_reason('fail')
         return 'fail'
     src_ds = None
 
@@ -4934,7 +4908,6 @@ def test_tiff_write_121():
     ds = gdaltest.tiff_drv.CreateCopy('/vsimem/tiff_write_121.tif', src_ds, options=['COPY_SRC_OVERVIEWS=YES'])
     gdal.PopErrorHandler()
     if ds is not None:
-        gdaltest.post_reason('fail')
         return 'fail'
     src_ds = None
 
@@ -4994,20 +4967,15 @@ def test_tiff_write_123():
         gdaltest.post_reason('did not expect a TIFFTAG_GDAL_METADATA tag')
         return 'fail'
     if src_ds.GetMetadataItem('TIFFTAG_PHOTOMETRIC', '_DEBUG_') != '2':
-        gdaltest.post_reason('fail')
         print(src_ds.GetMetadataItem('TIFFTAG_PHOTOMETRIC', '_DEBUG_'))
         return 'fail'
     if src_ds.GetRasterBand(1).GetColorInterpretation() != gdal.GCI_RedBand:
-        gdaltest.post_reason('fail')
         return 'fail'
     if src_ds.GetRasterBand(4).GetColorInterpretation() != gdal.GCI_Undefined:
-        gdaltest.post_reason('fail')
         return 'fail'
     if src_ds.GetRasterBand(5).GetColorInterpretation() != gdal.GCI_AlphaBand:
-        gdaltest.post_reason('fail')
         return 'fail'
     if src_ds.GetMetadataItem('TIFFTAG_EXTRASAMPLES', '_DEBUG_') != '0,2':
-        gdaltest.post_reason('fail')
         print(src_ds.GetMetadataItem('TIFFTAG_EXTRASAMPLES', '_DEBUG_'))
         return 'fail'
 
@@ -5022,16 +4990,12 @@ def test_tiff_write_123():
         gdaltest.post_reason('did not expect a TIFFTAG_GDAL_METADATA tag')
         return 'fail'
     if ds.GetRasterBand(1).GetColorInterpretation() != gdal.GCI_RedBand:
-        gdaltest.post_reason('fail')
         return 'fail'
     if src_ds.GetRasterBand(4).GetColorInterpretation() != gdal.GCI_Undefined:
-        gdaltest.post_reason('fail')
         return 'fail'
     if src_ds.GetRasterBand(5).GetColorInterpretation() != gdal.GCI_AlphaBand:
-        gdaltest.post_reason('fail')
         return 'fail'
     if ds.GetMetadataItem('TIFFTAG_EXTRASAMPLES', '_DEBUG_') != '0,2':
-        gdaltest.post_reason('fail')
         print(ds.GetMetadataItem('TIFFTAG_EXTRASAMPLES', '_DEBUG_'))
         return 'fail'
     ds = None
@@ -5042,16 +5006,13 @@ def test_tiff_write_123():
     # From implicit RGB to BGR (with Photometric = MinIsBlack)
     ds = gdaltest.tiff_drv.Create('/vsimem/tiff_write_123_bgr.tif', 1, 1, 3, gdal.GDT_Byte)
     if ds.GetMetadataItem('TIFFTAG_PHOTOMETRIC', '_DEBUG_') != '2':
-        gdaltest.post_reason('fail')
         print(ds.GetMetadataItem('TIFFTAG_PHOTOMETRIC', '_DEBUG_'))
         return 'fail'
     if ds.GetMetadataItem('TIFFTAG_EXTRASAMPLES', '_DEBUG_') is not None:
-        gdaltest.post_reason('fail')
         print(ds.GetMetadataItem('TIFFTAG_EXTRASAMPLES', '_DEBUG_'))
         return 'fail'
     ds.GetRasterBand(1).SetColorInterpretation(gdal.GCI_BlueBand)
     if ds.GetRasterBand(1).GetColorInterpretation() != gdal.GCI_BlueBand:
-        gdaltest.post_reason('fail')
         return 'fail'
     ds.GetRasterBand(2).SetColorInterpretation(gdal.GCI_GreenBand)
     ds.GetRasterBand(3).SetColorInterpretation(gdal.GCI_RedBand)
@@ -5063,24 +5024,19 @@ def test_tiff_write_123():
         return 'fail'
     ds = gdal.Open('/vsimem/tiff_write_123_bgr.tif')
     if ds.GetMetadataItem('TIFFTAG_PHOTOMETRIC', '_DEBUG_') != '1':
-        gdaltest.post_reason('fail')
         print(ds.GetMetadataItem('TIFFTAG_PHOTOMETRIC', '_DEBUG_'))
         return 'fail'
     if ds.GetMetadataItem('TIFFTAG_EXTRASAMPLES', '_DEBUG_') != '0,0':
-        gdaltest.post_reason('fail')
         print(ds.GetMetadataItem('TIFFTAG_EXTRASAMPLES', '_DEBUG_'))
         return 'fail'
     if ds.GetMetadataItem('TIFFTAG_GDAL_METADATA', '_DEBUG_') is None:
         gdaltest.post_reason('expected a TIFFTAG_GDAL_METADATA tag')
         return 'fail'
     if ds.GetRasterBand(1).GetColorInterpretation() != gdal.GCI_BlueBand:
-        gdaltest.post_reason('fail')
         return 'fail'
     if ds.GetRasterBand(2).GetColorInterpretation() != gdal.GCI_GreenBand:
-        gdaltest.post_reason('fail')
         return 'fail'
     if ds.GetRasterBand(3).GetColorInterpretation() != gdal.GCI_RedBand:
-        gdaltest.post_reason('fail')
         return 'fail'
     ds = None
 
@@ -5095,13 +5051,10 @@ def test_tiff_write_123():
         return 'fail'
     ds = gdal.Open('/vsimem/tiff_write_123_bgr.tif')
     if ds.GetRasterBand(1).GetColorInterpretation() != gdal.GCI_RedBand:
-        gdaltest.post_reason('fail')
         return 'fail'
     if ds.GetRasterBand(2).GetColorInterpretation() != gdal.GCI_GreenBand:
-        gdaltest.post_reason('fail')
         return 'fail'
     if ds.GetRasterBand(3).GetColorInterpretation() != gdal.GCI_RedBand:
-        gdaltest.post_reason('fail')
         return 'fail'
     ds = None
     gdaltest.tiff_drv.Delete('/vsimem/tiff_write_123_bgr.tif')
@@ -5123,13 +5076,10 @@ def test_tiff_write_123():
         gdaltest.post_reason('did not expect a TIFFTAG_GDAL_METADATA tag')
         return 'fail'
     if ds.GetRasterBand(1).GetColorInterpretation() != gdal.GCI_BlueBand:
-        gdaltest.post_reason('fail')
         return 'fail'
     if ds.GetRasterBand(2).GetColorInterpretation() != gdal.GCI_GreenBand:
-        gdaltest.post_reason('fail')
         return 'fail'
     if ds.GetRasterBand(3).GetColorInterpretation() != gdal.GCI_RedBand:
-        gdaltest.post_reason('fail')
         return 'fail'
     ds = None
     gdaltest.tiff_drv.Delete('/vsimem/tiff_write_123_bgr.tif')
@@ -5137,30 +5087,23 @@ def test_tiff_write_123():
     # From implicit RGBA to MINISBLACK
     ds = gdaltest.tiff_drv.Create('/vsimem/tiff_write_123_rgba.tif', 1, 1, 4, gdal.GDT_Byte)
     if ds.GetMetadataItem('TIFFTAG_PHOTOMETRIC', '_DEBUG_') != '2':
-        gdaltest.post_reason('fail')
         print(ds.GetMetadataItem('TIFFTAG_PHOTOMETRIC', '_DEBUG_'))
         return 'fail'
     if ds.GetRasterBand(1).GetColorInterpretation() != gdal.GCI_RedBand:
-        gdaltest.post_reason('fail')
         return 'fail'
     if ds.GetRasterBand(4).GetColorInterpretation() != gdal.GCI_AlphaBand:
-        gdaltest.post_reason('fail')
         return 'fail'
     if ds.GetMetadataItem('TIFFTAG_EXTRASAMPLES', '_DEBUG_') != '2':
-        gdaltest.post_reason('fail')
         print(ds.GetMetadataItem('TIFFTAG_EXTRASAMPLES', '_DEBUG_'))
         return 'fail'
 
     ds.GetRasterBand(1).SetColorInterpretation(gdal.GCI_Undefined)
     if ds.GetRasterBand(1).GetColorInterpretation() != gdal.GCI_Undefined:
-        gdaltest.post_reason('fail')
         return 'fail'
     if ds.GetMetadataItem('TIFFTAG_PHOTOMETRIC', '_DEBUG_') != '1':
-        gdaltest.post_reason('fail')
         print(ds.GetMetadataItem('TIFFTAG_PHOTOMETRIC', '_DEBUG_'))
         return 'fail'
     if ds.GetMetadataItem('TIFFTAG_EXTRASAMPLES', '_DEBUG_') != '0,0,2':
-        gdaltest.post_reason('fail')
         print(ds.GetMetadataItem('TIFFTAG_EXTRASAMPLES', '_DEBUG_'))
         return 'fail'
     ds = None
@@ -5184,10 +5127,8 @@ def test_tiff_write_123():
         gdaltest.post_reason('did not expect TIFFTAG_GDAL_METADATA tag')
         return 'fail'
     if ds.GetRasterBand(1).GetColorInterpretation() != gdal.GCI_GrayIndex:
-        gdaltest.post_reason('fail')
         return 'fail'
     if ds.GetRasterBand(4).GetColorInterpretation() != gdal.GCI_AlphaBand:
-        gdaltest.post_reason('fail')
         return 'fail'
     ds = None
     gdaltest.tiff_drv.Delete('/vsimem/tiff_write_123_guua.tif')
@@ -5198,11 +5139,9 @@ def test_tiff_write_123():
     ds = gdaltest.tiff_drv.CreateCopy('/vsimem/tiff_write_123_rgb.tif', src_ds)
     src_ds = None
     if ds.GetMetadataItem('TIFFTAG_PHOTOMETRIC', '_DEBUG_') != '2':
-        gdaltest.post_reason('fail')
         print(ds.GetMetadataItem('TIFFTAG_PHOTOMETRIC', '_DEBUG_'))
         return 'fail'
     if ds.GetMetadataItem('TIFFTAG_EXTRASAMPLES', '_DEBUG_') is not None:
-        gdaltest.post_reason('fail')
         print(ds.GetMetadataItem('TIFFTAG_EXTRASAMPLES', '_DEBUG_'))
         return 'fail'
     ds = None
@@ -5216,7 +5155,6 @@ def test_tiff_write_123():
                                  options=['PHOTOMETRIC=RGB'])
     ds = gdal.Open('/vsimem/tiff_write_123_rgb.tif')
     if ds.GetRasterBand(1).GetColorInterpretation() != gdal.GCI_RedBand:
-        gdaltest.post_reason('fail')
         return 'fail'
     ds = None
     gdaltest.tiff_drv.Delete('/vsimem/tiff_write_123_rgb.tif')
@@ -5227,13 +5165,10 @@ def test_tiff_write_123():
                                  options=['PHOTOMETRIC=RGB'])
     ds = gdal.Open('/vsimem/tiff_write_123_rgbua.tif')
     if ds.GetRasterBand(1).GetColorInterpretation() != gdal.GCI_RedBand:
-        gdaltest.post_reason('fail')
         return 'fail'
     if ds.GetRasterBand(4).GetColorInterpretation() != gdal.GCI_Undefined:
-        gdaltest.post_reason('fail')
         return 'fail'
     if ds.GetRasterBand(5).GetColorInterpretation() != gdal.GCI_AlphaBand:
-        gdaltest.post_reason('fail')
         return 'fail'
     ds = None
     gdaltest.tiff_drv.Delete('/vsimem/tiff_write_123_rgbua.tif')
@@ -5250,7 +5185,6 @@ def test_tiff_write_123():
         return 'fail'
     ds = gdal.Open('/vsimem/tiff_write_123_rgba_to_undefined.tif')
     if ds.GetRasterBand(4).GetColorInterpretation() != gdal.GCI_Undefined:
-        gdaltest.post_reason('fail')
         return 'fail'
     ds = None
     gdaltest.tiff_drv.Delete('/vsimem/tiff_write_123_rgba_to_undefined.tif')
@@ -5369,46 +5303,38 @@ def test_tiff_write_126():
         if ds.GetRasterBand(1).GetOverviewCount() != 0:
             print(options)
             print(ds.GetRasterBand(1).GetOverviewCount())
-            gdaltest.post_reason('fail')
             return 'fail'
         # But they do exist...
         cs = ds.GetRasterBand(1).GetOverview(0).Checksum()
         if cs not in cs1:
             print(options)
             print(cs)
-            gdaltest.post_reason('fail')
             return 'fail'
         cs = ds.GetRasterBand(2).GetOverview(0).Checksum()
         if cs not in cs2:
             print(options)
             print(cs)
-            gdaltest.post_reason('fail')
             return 'fail'
         cs = ds.GetRasterBand(1).GetOverview(1).Checksum()
         if cs not in cs3:
             print(options)
             print(cs)
-            gdaltest.post_reason('fail')
             return 'fail'
         cs = ds.GetRasterBand(1).GetOverview(2).Checksum()
         if cs not in cs4:
             print(options)
             print(cs)
-            gdaltest.post_reason('fail')
             return 'fail'
         if ds.GetRasterBand(1).GetOverview(-1) is not None:
             print(options)
-            gdaltest.post_reason('fail')
             return 'fail'
         if ds.GetRasterBand(1).GetOverview(3) is not None:
             print(options)
-            gdaltest.post_reason('fail')
             return 'fail'
         ovr_1_data = ds.GetRasterBand(1).GetOverview(1).GetDataset().ReadRaster(0, 0, 400, 200)
         subsampled_data = ds.ReadRaster(0, 0, 1600, 800, 400, 200)
         if ovr_1_data != subsampled_data:
             print(options)
-            gdaltest.post_reason('fail')
             return 'fail'
         ds = None
 
@@ -5433,32 +5359,27 @@ def test_tiff_write_126():
         if ds.GetRasterBand(1).GetOverviewCount() != 0:
             print(options)
             print(ds.GetRasterBand(1).GetOverviewCount())
-            gdaltest.post_reason('fail')
             return 'fail'
         # But they do exist...
         cs = ds.GetRasterBand(1).GetOverview(0).Checksum()
         if cs not in cs1:
             print(options)
             print(cs)
-            gdaltest.post_reason('fail')
             return 'fail'
         cs = ds.GetRasterBand(1).GetOverview(1).Checksum()
         if cs not in cs3:
             print(options)
             print(cs)
-            gdaltest.post_reason('fail')
             return 'fail'
         cs = ds.GetRasterBand(1).GetOverview(2).Checksum()
         if cs not in cs4:
             print(options)
             print(cs)
-            gdaltest.post_reason('fail')
             return 'fail'
         ovr_1_data = ds.GetRasterBand(1).GetOverview(1).GetDataset().ReadRaster(0, 0, 400, 200)
         subsampled_data = ds.ReadRaster(0, 0, 1600, 800, 400, 200)
         if ovr_1_data != subsampled_data:
             print(options)
-            gdaltest.post_reason('fail')
             return 'fail'
         ds = None
 
@@ -5475,13 +5396,11 @@ def test_tiff_write_126():
     ds = gdal.Open('/vsimem/tiff_write_126.tif')
     if ds.GetRasterBand(1).GetBlockSize() != [8, 1]:
         print(ds.GetRasterBand(1).GetBlockSize())
-        gdaltest.post_reason('fail')
         return 'fail'
     ovr_ds = ds.GetRasterBand(1).GetOverview(1).GetDataset()
     ovr_1_data = ovr_ds.ReadRaster(0, 0, ovr_ds.RasterXSize, ovr_ds.RasterYSize, 1, 1)
     subsampled_data = ds.ReadRaster(0, 0, ds.RasterXSize, ds.RasterYSize, 1, 1)
     if ovr_1_data != subsampled_data:
-        gdaltest.post_reason('fail')
         return 'fail'
     ds = None
 
@@ -5498,16 +5417,12 @@ def test_tiff_write_126():
 
     ds = gdal.Open('/vsimem/tiff_write_126.tif')
     if ds.GetRasterBand(1).GetOverview(0) is None:
-        gdaltest.post_reason('fail')
         return 'fail'
     if ds.GetRasterBand(1).GetMetadataItem('JPEGTABLES', 'TIFF') is None:
-        gdaltest.post_reason('fail')
         return 'fail'
     if ds.GetRasterBand(1).GetMetadataItem('BLOCK_OFFSET_0_0', 'TIFF') is not None:
-        gdaltest.post_reason('fail')
         return 'fail'
     if ds.GetRasterBand(1).GetMetadataItem('BLOCK_SIZE_0_0', 'TIFF') is not None:
-        gdaltest.post_reason('fail')
         return 'fail'
     ds = None
     gdaltest.tiff_drv.Delete('/vsimem/tiff_write_126.tif')
@@ -5522,7 +5437,6 @@ def test_tiff_write_126():
     cs = ds.GetRasterBand(1).GetOverview(0).Checksum()
     if cs != 0:
         print(cs)
-        gdaltest.post_reason('fail')
         return 'fail'
     ds = None
     gdaltest.tiff_drv.Delete('/vsimem/tiff_write_126.tif')
@@ -5549,7 +5463,6 @@ def test_tiff_write_127():
         ds = gdal.Open('/vsimem/tiff_write_127.tif', gdal.GA_Update)
         obj = ds if i == 0 else ds.GetRasterBand(1)
         if obj.GetMetadataItem('key') != 'value':
-            gdaltest.post_reason('fail')
             print(i)
             print(obj.GetMetadata())
             return 'fail'
@@ -5560,7 +5473,6 @@ def test_tiff_write_127():
         ds = gdal.Open('/vsimem/tiff_write_127.tif', gdal.GA_Update)
         obj = ds if i == 0 else ds.GetRasterBand(1)
         if obj.GetMetadata():
-            gdaltest.post_reason('fail')
             print(i)
             return 'fail'
         obj.SetMetadataItem('key', 'value')
@@ -5570,7 +5482,6 @@ def test_tiff_write_127():
         ds = gdal.Open('/vsimem/tiff_write_127.tif', gdal.GA_Update)
         obj = ds if i == 0 else ds.GetRasterBand(1)
         if obj.GetMetadataItem('key') != 'value':
-            gdaltest.post_reason('fail')
             print(i)
             return 'fail'
         obj.SetMetadataItem('key', None)
@@ -5580,7 +5491,6 @@ def test_tiff_write_127():
         ds = gdal.Open('/vsimem/tiff_write_127.tif', gdal.GA_Update)
         obj = ds if i == 0 else ds.GetRasterBand(1)
         if obj.GetMetadata():
-            gdaltest.post_reason('fail')
             print(i)
             return 'fail'
         obj = None
@@ -5621,10 +5531,8 @@ def test_tiff_write_128():
     ds = gdal.Open('GTIFF_RAW:/vsimem/tiff_write_128.tif')
     for i in range(4):
         if src_ds.GetRasterBand(i + 1).GetColorInterpretation() != ds.GetRasterBand(i + 1).GetColorInterpretation():
-            gdaltest.post_reason('fail')
             return 'fail'
         if src_ds.GetRasterBand(i + 1).Checksum() != ds.GetRasterBand(i + 1).Checksum():
-            gdaltest.post_reason('fail')
             return 'fail'
     ds = None
 
@@ -5641,10 +5549,8 @@ def test_tiff_write_128():
     ds = gdal.Open('GTIFF_RAW:/vsimem/tiff_write_128.tif')
     for i in range(4):
         if src_ds.GetRasterBand(i + 1).GetColorInterpretation() != ds.GetRasterBand(i + 1).GetColorInterpretation():
-            gdaltest.post_reason('fail')
             return 'fail'
         if src_ds.GetRasterBand(i + 1).Checksum() != ds.GetRasterBand(i + 1).Checksum():
-            gdaltest.post_reason('fail')
             return 'fail'
     ds = None
 
@@ -5662,10 +5568,8 @@ def test_tiff_write_128():
     for i in range(4):
         # The color interpretation will NOT be CMYK
         if src_ds.GetRasterBand(i + 1).GetColorInterpretation() == ds.GetRasterBand(i + 1).GetColorInterpretation():
-            gdaltest.post_reason('fail')
             return 'fail'
         if src_ds.GetRasterBand(i + 1).Checksum() != ds.GetRasterBand(i + 1).Checksum():
-            gdaltest.post_reason('fail')
             return 'fail'
     ds = None
 
@@ -5711,7 +5615,6 @@ def test_tiff_write_129():
                 if i == 0:
                     cs_ref = cs
                 elif cs != cs_ref:
-                    gdaltest.post_reason('fail')
                     print(jpegtablesmode)
                     print(photometric)
                     print(i)
@@ -5734,7 +5637,6 @@ def test_tiff_write_130():
     shutil.copyfile('data/byte_jpg_unusual_jpegtable.tif', 'tmp/byte_jpg_unusual_jpegtable.tif')
     ds = gdal.Open('tmp/byte_jpg_unusual_jpegtable.tif', gdal.GA_Update)
     if ds.GetRasterBand(1).Checksum() != 4771:
-        gdaltest.post_reason('fail')
         print(ds.GetRasterBand(1).Checksum())
         return 'fail'
     src_ds = gdal.Open('data/byte.tif', gdal.GA_Update)
@@ -5743,7 +5645,6 @@ def test_tiff_write_130():
     ds = None
     ds = gdal.Open('tmp/byte_jpg_unusual_jpegtable.tif')
     if ds.GetRasterBand(1).Checksum() != 4743:
-        gdaltest.post_reason('fail')
         print(ds.GetRasterBand(1).Checksum())
         return 'fail'
     ds = None
@@ -5752,7 +5653,6 @@ def test_tiff_write_130():
     shutil.copyfile('data/byte_jpg_tablesmodezero.tif', 'tmp/byte_jpg_tablesmodezero.tif')
     ds = gdal.Open('tmp/byte_jpg_tablesmodezero.tif', gdal.GA_Update)
     if ds.GetRasterBand(1).Checksum() != 4743:
-        gdaltest.post_reason('fail')
         print(ds.GetRasterBand(1).Checksum())
         return 'fail'
     src_ds = gdal.Open('data/byte.tif', gdal.GA_Update)
@@ -5761,7 +5661,6 @@ def test_tiff_write_130():
     ds = None
     ds = gdal.Open('tmp/byte_jpg_tablesmodezero.tif')
     if ds.GetRasterBand(1).Checksum() != 4743:
-        gdaltest.post_reason('fail')
         print(ds.GetRasterBand(1).Checksum())
         return 'fail'
     ds = None
@@ -5784,7 +5683,6 @@ def test_tiff_write_131(level=1):
     ds = gdaltest.tiff_drv.CreateCopy(filename, src_ds,
                                  options=['COMPRESS=LZMA', 'LZMA_PRESET=' + str(level)])
     if ds.GetRasterBand(1).Checksum() != 4672:
-        gdaltest.post_reason('fail')
         return 'fail'
     ds = None
 
@@ -5795,7 +5693,6 @@ def test_tiff_write_131(level=1):
 
     ds = gdal.Open(filename)
     if ds.GetRasterBand(1).Checksum() != 4672:
-        gdaltest.post_reason('fail')
         return 'fail'
     ds = None
 
@@ -5827,7 +5724,6 @@ def test_tiff_write_132():
 
         # Check that PAM file exists
         if gdal.VSIStatL('/vsimem/tiff_write_132.tif.aux.xml') is None:
-            gdaltest.post_reason('fail')
             return 'fail'
 
         # Open in read-write
@@ -5842,13 +5738,11 @@ def test_tiff_write_132():
 
         # Check that PAM file no longer exists
         if gdal.VSIStatL('/vsimem/tiff_write_132.tif.aux.xml') is not None:
-            gdaltest.post_reason('fail')
             print(i)
             return 'fail'
 
         ds = gdal.Open('/vsimem/tiff_write_132.tif')
         if ds.GetMetadataItem('FOO') != 'BAZ' or ds.GetRasterBand(1).GetMetadataItem('FOO') != 'BAZ':
-            gdaltest.post_reason('fail')
             return 'fail'
         ds = None
 
@@ -5878,43 +5772,36 @@ def test_tiff_write_133():
     ret = src_ds.SetProjection(srs.ExportToWkt())
     gdal.PopErrorHandler()
     if ret == 0:
-        gdaltest.post_reason('fail')
         return 'fail'
     gdal.PushErrorHandler()
     ret = src_ds.SetGeoTransform([1, 2, 0, 3, 0, -4])
     gdal.PopErrorHandler()
     if ret == 0:
-        gdaltest.post_reason('fail')
         return 'fail'
     gdal.PushErrorHandler()
     ret = src_ds.SetMetadataItem('FOO', 'BAZ')
     gdal.PopErrorHandler()
     if ret == 0:
-        gdaltest.post_reason('fail')
         return 'fail'
     gdal.PushErrorHandler()
     ret = src_ds.SetMetadata({})
     gdal.PopErrorHandler()
     if ret == 0:
-        gdaltest.post_reason('fail')
         return 'fail'
     gdal.PushErrorHandler()
     ret = src_ds.GetRasterBand(1).SetMetadataItem('FOO', 'BAZ')
     gdal.PopErrorHandler()
     if ret == 0:
-        gdaltest.post_reason('fail')
         return 'fail'
     gdal.PushErrorHandler()
     ret = src_ds.GetRasterBand(1).SetMetadata({})
     gdal.PopErrorHandler()
     if ret == 0:
-        gdaltest.post_reason('fail')
         return 'fail'
     gdal.PushErrorHandler()
     ret = src_ds.GetRasterBand(1).SetNoDataValue(0)
     gdal.PopErrorHandler()
     if ret == 0:
-        gdaltest.post_reason('fail')
         return 'fail'
 
     # Pixel interleaved
@@ -5925,23 +5812,18 @@ def test_tiff_write_133():
     ds = gdal.Open('/vsimem/tiff_write_133_dst.tif')
     gdal.SetConfigOption('TIFF_READ_STREAMING', None)
     if ds.GetProjectionRef().find('32601') < 0:
-        gdaltest.post_reason('fail')
         return 'fail'
     if ds.GetGeoTransform() != (1.0, 2.0, 0.0, 3.0, 0.0, -2.0):
-        gdaltest.post_reason('fail')
         return 'fail'
     if ds.GetMetadataItem('FOO') != 'BAR':
-        gdaltest.post_reason('fail')
         return 'fail'
     if ds.GetMetadataItem('UNORDERED_BLOCKS', 'TIFF') is not None:
-        gdaltest.post_reason('fail')
         return 'fail'
 
     with gdaltest.SetCacheMax(0):
         for y in range(1000):
             got_data = ds.ReadRaster(0, y, 1024, 1)
             if got_data is None:
-                gdaltest.post_reason('fail')
                 return 'fail'
 
     ds.FlushCache()
@@ -5950,7 +5832,6 @@ def test_tiff_write_133():
         got_data = ds.ReadRaster(0, y, 1024, 1)
         gdal.PopErrorHandler()
         if got_data is not None:
-            gdaltest.post_reason('fail')
             return 'fail'
     ds = None
     gdaltest.tiff_drv.Delete('/vsimem/tiff_write_133_dst.tif')
@@ -5963,16 +5844,12 @@ def test_tiff_write_133():
     ds = gdal.Open('/vsimem/tiff_write_133_dst.tif')
     gdal.SetConfigOption('TIFF_READ_STREAMING', None)
     if ds.GetProjectionRef().find('32601') < 0:
-        gdaltest.post_reason('fail')
         return 'fail'
     if ds.GetGeoTransform() != (1.0, 2.0, 0.0, 3.0, 0.0, -2.0):
-        gdaltest.post_reason('fail')
         return 'fail'
     if ds.GetMetadataItem('FOO') != 'BAR':
-        gdaltest.post_reason('fail')
         return 'fail'
     if ds.GetMetadataItem('UNORDERED_BLOCKS', 'TIFF') is not None:
-        gdaltest.post_reason('fail')
         return 'fail'
 
     with gdaltest.SetCacheMax(0):
@@ -5988,7 +5865,6 @@ def test_tiff_write_133():
                     xsize = ds.RasterXSize - x
                 got_data = ds.ReadRaster(x, y, xsize, ysize)
                 if got_data is None:
-                    gdaltest.post_reason('fail')
                     return 'fail'
 
     ds = None
@@ -6002,7 +5878,6 @@ def test_tiff_write_133():
     ds = gdal.Open('/vsimem/tiff_write_133_dst.tif')
     gdal.SetConfigOption('TIFF_READ_STREAMING', None)
     if ds.GetMetadataItem('UNORDERED_BLOCKS', 'TIFF') is not None:
-        gdaltest.post_reason('fail')
         return 'fail'
 
     with gdaltest.SetCacheMax(0):
@@ -6010,7 +5885,6 @@ def test_tiff_write_133():
             for y in range(1000):
                 got_data = ds.GetRasterBand(band + 1).ReadRaster(0, y, 1024, 1)
                 if got_data is None:
-                    gdaltest.post_reason('fail')
                     return 'fail'
     ds = None
     gdaltest.tiff_drv.Delete('/vsimem/tiff_write_133_dst.tif')
@@ -6025,14 +5899,12 @@ def test_tiff_write_133():
         ds = gdal.Open('/vsimem/tiff_write_133_dst.tif')
         gdal.SetConfigOption('TIFF_READ_STREAMING', None)
         if ds.GetMetadataItem('UNORDERED_BLOCKS', 'TIFF') is not None:
-            gdaltest.post_reason('fail')
             return 'fail'
 
         with gdaltest.SetCacheMax(0):
             for y in range(1000):
                 got_data = ds.ReadRaster(0, y, 1024, 1)
                 if got_data is None:
-                    gdaltest.post_reason('fail')
                     return 'fail'
 
         ds = None
@@ -6043,20 +5915,17 @@ def test_tiff_write_133():
     out_ds = gdaltest.tiff_drv.CreateCopy('/vsimem/tiff_write_133_dst.tif', src_ds, options=['STREAMABLE_OUTPUT=YES', 'COMPRESS=DEFLATE'])
     gdal.PopErrorHandler()
     if out_ds is not None:
-        gdaltest.post_reason('fail')
         return 'fail'
 
     # Test writing into a non authorized file
     ds = gdaltest.tiff_drv.Create('/foo/bar', 1024, 1000, 3, options=['STREAMABLE_OUTPUT=YES', 'BLOCKYSIZE=1'])
     if ds is not None:
-        gdaltest.post_reason('fail')
         return 'fail'
 
     gdal.PushErrorHandler()
     out_ds = gdaltest.tiff_drv.CreateCopy('/foo/bar', src_ds, options=['STREAMABLE_OUTPUT=YES'])
     gdal.PopErrorHandler()
     if out_ds is not None:
-        gdaltest.post_reason('fail')
         return 'fail'
 
     src_ds = None
@@ -6068,7 +5937,6 @@ def test_tiff_write_133():
     gdal.PopErrorHandler()
     gdal.SetConfigOption('TIFF_READ_STREAMING', None)
     if ds is not None:
-        gdaltest.post_reason('fail')
         return 'fail'
 
     # BigTIFF with IFD not at offset 16
@@ -6085,7 +5953,6 @@ def test_tiff_write_133():
         gdal.PopErrorHandler()
         gdal.SetConfigOption('TIFF_READ_STREAMING', None)
         if ds is not None:
-            gdaltest.post_reason('fail')
             return 'fail'
 
     # Test reading strips in not increasing order
@@ -6101,14 +5968,12 @@ def test_tiff_write_133():
     gdal.PopErrorHandler()
     gdal.SetConfigOption('TIFF_READ_STREAMING', None)
     if ds.GetMetadataItem('UNORDERED_BLOCKS', 'TIFF') != 'YES':
-        gdaltest.post_reason('fail')
         return 'fail'
 
     with gdaltest.SetCacheMax(0):
         for y in range(1000):
             got_data = ds.ReadRaster(0, 1000 - y - 1, 1024, 1)
             if got_data is None:
-                gdaltest.post_reason('fail')
                 return 'fail'
 
     # Test writing strips in not increasing order in a streamable output
@@ -6119,7 +5984,6 @@ def test_tiff_write_133():
     ds.FlushCache()
     gdal.PopErrorHandler()
     if gdal.GetLastErrorMsg() == '':
-        gdaltest.post_reason('fail')
         return 'fail'
     ds = None
 
@@ -6131,7 +5995,6 @@ def test_tiff_write_133():
     ds.FlushCache()
     gdal.PopErrorHandler()
     if gdal.GetLastErrorMsg() == '':
-        gdaltest.post_reason('fail')
         return 'fail'
     ds = None
 
@@ -6155,7 +6018,6 @@ def test_tiff_write_134():
     cs2 = ds.GetRasterBand(2).Checksum()
     cs3 = ds.GetRasterBand(3).Checksum()
     if cs1 != 1 or cs2 != 0 or cs3 != 5:
-        gdaltest.post_reason('fail')
         print(cs1)
         print(cs2)
         print(cs3)
@@ -6174,7 +6036,6 @@ def test_tiff_write_134():
     cs2 = ds.GetRasterBand(2).Checksum()
     cs3 = ds.GetRasterBand(3).Checksum()
     if cs1 != 1 or cs2 != 0 or cs3 != 5:
-        gdaltest.post_reason('fail')
         print(cs1)
         print(cs2)
         print(cs3)
@@ -6193,7 +6054,6 @@ def test_tiff_write_134():
     cs2 = ds.GetRasterBand(2).Checksum()
     cs3 = ds.GetRasterBand(3).Checksum()
     if cs1 != 5 or cs2 != 5 or cs3 != 5:
-        gdaltest.post_reason('fail')
         print(cs1)
         print(cs2)
         print(cs3)
@@ -6220,10 +6080,8 @@ def test_tiff_write_135():
 
     ds = gdal.Open('/vsimem/tiff_write_135.tif')
     if ds.GetGCPs():
-        gdaltest.post_reason('fail')
         return 'fail'
     if ds.GetGCPProjection() != '':
-        gdaltest.post_reason('fail')
         return 'fail'
     ds = None
 
@@ -6239,10 +6097,8 @@ def test_tiff_write_135():
 
     ds = gdal.Open('/vsimem/tiff_write_135.tif')
     if ds.GetGCPs():
-        gdaltest.post_reason('fail')
         return 'fail'
     if ds.GetGCPProjection() != '':
-        gdaltest.post_reason('fail')
         return 'fail'
     ds = None
 
@@ -6261,13 +6117,10 @@ def test_tiff_write_135():
 
     ds = gdal.Open('/vsimem/tiff_write_135.tif')
     if ds.GetGCPs():
-        gdaltest.post_reason('fail')
         return 'fail'
     if ds.GetGeoTransform() != (1, 2, 3, 4, 5, -6):
-        gdaltest.post_reason('fail')
         return 'fail'
     if ds.GetProjectionRef().find('32601') < 0:
-        gdaltest.post_reason('fail')
         return 'fail'
     ds = None
 
@@ -6290,7 +6143,6 @@ def test_tiff_write_136():
     ds = gdal.Open('/vsimem/tiff_write_136.tif')
     cs = ds.GetRasterBand(1).Checksum()
     if cs != expected_cs:
-        gdaltest.post_reason('fail')
         print(cs)
         print(expected_cs)
         return 'fail'
@@ -6321,7 +6173,6 @@ def test_tiff_write_137():
     cs = ds.GetRasterBand(1).Checksum()
     ds = None
     if cs != expected_cs:
-        gdaltest.post_reason('fail')
         print(cs)
         print(expected_cs)
         return 'fail'
@@ -6335,7 +6186,6 @@ def test_tiff_write_137():
     cs = ds.GetRasterBand(1).Checksum()
     ds = None
     if cs != expected_cs:
-        gdaltest.post_reason('fail')
         print(cs)
         print(expected_cs)
         return 'fail'
@@ -6351,7 +6201,6 @@ def test_tiff_write_137():
     cs = ds.GetRasterBand(1).Checksum()
     ds = None
     if cs != expected_cs:
-        gdaltest.post_reason('fail')
         print(cs)
         print(expected_cs)
         return 'fail'
@@ -6363,7 +6212,6 @@ def test_tiff_write_137():
     ds.FlushCache()
     val = ds.ReadRaster(0, 0, 1, 1).decode('ascii')
     if val != 'A':
-        gdaltest.post_reason('fail')
         print(val)
         return 'fail'
     ds = None
@@ -6381,7 +6229,6 @@ def test_tiff_write_137():
     cs = ds.GetRasterBand(1).Checksum()
     ds = None
     if cs != 4672:
-        gdaltest.post_reason('fail')
         print(cs)
         print(expected_cs)
         return 'fail'
@@ -6408,7 +6255,6 @@ def test_tiff_write_138():
     ds = None
     size = gdal.VSIStatL('/vsimem/tiff_write_138.tif').size
     if size != 181:
-        gdaltest.post_reason('fail')
         print(size)
         return 'fail'
 
@@ -6433,7 +6279,6 @@ def test_tiff_write_138():
         ds = None
         size = gdal.VSIStatL('/vsimem/tiff_write_138.tif').size
         if size != 181:
-            gdaltest.post_reason('fail')
             print(size)
             return 'fail'
 
@@ -6466,7 +6311,6 @@ def test_tiff_write_139():
         for i in range(nbands):
             content = ds.GetRasterBand(i + 1).ReadRaster()
             if ref_content != content:
-                gdaltest.post_reason('fail')
                 return 'fail'
         ds = None
 
@@ -6486,7 +6330,6 @@ def test_tiff_write_139():
         ds = gdal.Open('/vsimem/tiff_write_139.tif')
         content = ds.GetRasterBand(1).ReadRaster()
         if ref_content != content:
-            gdaltest.post_reason('fail')
             print(endianness)
             print(struct.unpack('h' * 6, content))
             return 'fail'
@@ -6508,7 +6351,6 @@ def test_tiff_write_139():
         ds = gdal.Open('/vsimem/tiff_write_139.tif')
         content = ds.GetRasterBand(1).ReadRaster()
         if ref_content != content:
-            gdaltest.post_reason('fail')
             print(endianness)
             print(struct.unpack('H' * 6, content))
             return 'fail'
@@ -6530,7 +6372,6 @@ def test_tiff_write_139():
         ds = gdal.Open('/vsimem/tiff_write_139.tif')
         content = ds.GetRasterBand(1).ReadRaster()
         if ref_content != content:
-            gdaltest.post_reason('fail')
             print(endianness)
             print(struct.unpack('I' * 6, content))
             return 'fail'
@@ -6548,7 +6389,6 @@ def test_tiff_write_139():
     ds = gdal.Open('/vsimem/tiff_write_139.tif')
     content = ds.GetRasterBand(1).ReadRaster()
     if ref_content != content:
-        gdaltest.post_reason('fail')
         print(struct.unpack('d' * 4, content))
         return 'fail'
     ds = None
@@ -6573,7 +6413,6 @@ def test_tiff_write_140():
         return 'fail'
     ds = gdal.Open('/vsimem/tiff_write_140.tif')
     if ds.GetRasterBand(5).GetColorInterpretation() != gdal.GCI_AlphaBand:
-        gdaltest.post_reason('fail')
         print(ds.GetRasterBand(5).GetColorInterpretation())
         return 'fail'
     ds = None
@@ -6586,10 +6425,8 @@ def test_tiff_write_140():
     with gdaltest.error_handler():
         ret = ds.GetRasterBand(5).SetColorInterpretation(gdal.GCI_AlphaBand)
     if gdal.GetLastErrorMsg() == '':
-        gdaltest.post_reason('fail')
         return 'fail'
     if ret != 0:
-        gdaltest.post_reason('fail')
         return 'fail'
     ds = None
     statBuf = gdal.VSIStatL('/vsimem/tiff_write_140.tif.aux.xml', gdal.VSI_STAT_EXISTS_FLAG | gdal.VSI_STAT_NATURE_FLAG | gdal.VSI_STAT_SIZE_FLAG)
@@ -6598,11 +6435,9 @@ def test_tiff_write_140():
         return 'fail'
     ds = gdal.Open('/vsimem/tiff_write_140.tif')
     if ds.GetRasterBand(2).GetColorInterpretation() != gdal.GCI_AlphaBand:
-        gdaltest.post_reason('fail')
         print(ds.GetRasterBand(5).GetColorInterpretation())
         return 'fail'
     if ds.GetRasterBand(5).GetColorInterpretation() != gdal.GCI_AlphaBand:
-        gdaltest.post_reason('fail')
         print(ds.GetRasterBand(5).GetColorInterpretation())
         return 'fail'
     ds = None
@@ -6614,10 +6449,8 @@ def test_tiff_write_140():
     with gdaltest.error_handler():
         ret = ds.GetRasterBand(5).SetColorInterpretation(gdal.GCI_AlphaBand)
     if gdal.GetLastErrorMsg().find('ALPHA') < 0:
-        gdaltest.post_reason('fail')
         return 'fail'
     if ret != 0:
-        gdaltest.post_reason('fail')
         return 'fail'
     ds = None
     statBuf = gdal.VSIStatL('/vsimem/tiff_write_140.tif.aux.xml', gdal.VSI_STAT_EXISTS_FLAG | gdal.VSI_STAT_NATURE_FLAG | gdal.VSI_STAT_SIZE_FLAG)
@@ -6626,11 +6459,9 @@ def test_tiff_write_140():
         return 'fail'
     ds = gdal.Open('/vsimem/tiff_write_140.tif')
     if ds.GetRasterBand(2).GetColorInterpretation() != gdal.GCI_AlphaBand:
-        gdaltest.post_reason('fail')
         print(ds.GetRasterBand(5).GetColorInterpretation())
         return 'fail'
     if ds.GetRasterBand(5).GetColorInterpretation() != gdal.GCI_AlphaBand:
-        gdaltest.post_reason('fail')
         print(ds.GetRasterBand(5).GetColorInterpretation())
         return 'fail'
     ds = None
@@ -6656,12 +6487,10 @@ def test_tiff_write_141():
     ds = None
 
     if wkt.find('PROJCS["WGS_1984_Web_Mercator_Auxiliary_Sphere"') != 0:
-        gdaltest.post_reason('fail')
         print(wkt)
         return 'fail'
 
     if wkt.find('EXTENSION["PROJ4"') < 0:
-        gdaltest.post_reason('fail')
         print(wkt)
         return 'fail'
 
@@ -6713,7 +6542,6 @@ def test_tiff_write_143():
     with gdaltest.error_handler():
         ds = gdaltest.tiff_drv.Create('/vsimem/tiff_write_143.tif', 1000000000, 1000000000)
     if ds is not None:
-        gdaltest.post_reason('fail')
         return 'fail'
 
     return 'success'
@@ -6755,7 +6583,6 @@ def test_tiff_write_144():
     gdal.Unlink('tmp/tiff_write_144.tif')
 
     if got_cs != 4873 or got_cs_ovr != 1218:
-        gdaltest.post_reason('fail')
         print(got_cs)
         print(got_cs_ovr)
         return 'fail'
@@ -6926,7 +6753,6 @@ def test_tiff_write_149():
     cs = ds.GetRasterBand(1).Checksum()
     ds = None
     if cs != 1:
-        gdaltest.post_reason('fail')
         print(cs)
         return 'fail'
     gdaltest.tiff_drv.Delete('/vsimem/tiff_write_149.tif')
@@ -6941,7 +6767,6 @@ def test_tiff_write_149():
     cs = ds.GetRasterBand(1).Checksum()
     ds = None
     if cs != expected_cs:
-        gdaltest.post_reason('fail')
         print(cs)
         return 'fail'
     gdaltest.tiff_drv.Delete('/vsimem/tiff_write_149.tif')
@@ -6955,7 +6780,6 @@ def test_tiff_write_149():
     cs = ds.GetRasterBand(1).Checksum()
     ds = None
     if cs != expected_cs:
-        gdaltest.post_reason('fail')
         print(cs)
         return 'fail'
     gdaltest.tiff_drv.Delete('/vsimem/tiff_write_149.tif')
@@ -6969,7 +6793,6 @@ def test_tiff_write_149():
     cs = ds.GetRasterBand(1).Checksum()
     ds = None
     if cs != expected_cs:
-        gdaltest.post_reason('fail')
         print(cs)
         return 'fail'
     gdaltest.tiff_drv.Delete('/vsimem/tiff_write_149.tif')
@@ -6989,7 +6812,6 @@ def test_tiff_write_150():
     with gdaltest.error_handler():
         ds.FlushCache()
     if gdal.GetLastErrorMsg() == '':
-        gdaltest.post_reason('fail')
         return 'fail'
     ds = None
     gdaltest.tiff_drv.Delete('tmp/tiled_bad_offset.tif')
@@ -7014,13 +6836,10 @@ def test_tiff_write_151():
     ds = None
     ds = gdal.Open('/vsimem/tiff_write_151.tif')
     if ds.GetRasterBand(1).Checksum() != 1:
-        gdaltest.post_reason('fail')
         return 'fail'
     if ds.GetRasterBand(2).Checksum() != 1:
-        gdaltest.post_reason('fail')
         return 'fail'
     if ds.GetRasterBand(3).Checksum() != 1:
-        gdaltest.post_reason('fail')
         return 'fail'
     ds = None
     gdaltest.tiff_drv.Delete('/vsimem/tiff_write_151.tif')
@@ -7039,11 +6858,9 @@ def test_tiff_write_152():
     ds = None
     ds = gdal.Open('/vsimem/tiff_write_152.tif')
     if ds.GetRasterBand(1).Checksum() != 0:
-        gdaltest.post_reason('fail')
         print(ds.GetRasterBand(1).Checksum())
         return 'fail'
     if ds.GetRasterBand(2).Checksum() != 1:
-        gdaltest.post_reason('fail')
         print(ds.GetRasterBand(1).Checksum())
         return 'fail'
     ds = None
@@ -7071,7 +6888,6 @@ def test_tiff_write_153():
     gdaltest.tiff_drv.Delete(target_dir + '/tiff_write_153.tif')
 
     if ret == gdal.VSI_RANGE_STATUS_DATA:
-        gdaltest.post_reason('fail')
         print(ret)
         return 'fail'
 
@@ -7091,13 +6907,11 @@ def test_tiff_write_154():
     ds.FlushCache()
     # At that point empty blocks have not yet been flushed
     if gdal.VSIStatL('/vsimem/tiff_write_154.tif').size != 162:
-        gdaltest.post_reason('fail')
         print(gdal.VSIStatL('/vsimem/tiff_write_154.tif').size)
         return 'fail'
     ds = None
     # Now they are and that's done in a filesystem sparse way. TODO: check this
     if gdal.VSIStatL('/vsimem/tiff_write_154.tif').size != 256162:
-        gdaltest.post_reason('fail')
         print(gdal.VSIStatL('/vsimem/tiff_write_154.tif').size)
         return 'fail'
     gdaltest.tiff_drv.Delete('/vsimem/tiff_write_154.tif')
@@ -7106,12 +6920,10 @@ def test_tiff_write_154():
     ds.FlushCache()
     # With compression, empty blocks are written right away
     if gdal.VSIStatL('/vsimem/tiff_write_154.tif').size != 462:
-        gdaltest.post_reason('fail')
         print(gdal.VSIStatL('/vsimem/tiff_write_154.tif').size)
         return 'fail'
     ds = None
     if gdal.VSIStatL('/vsimem/tiff_write_154.tif').size != 462:
-        gdaltest.post_reason('fail')
         print(gdal.VSIStatL('/vsimem/tiff_write_154.tif').size)
         return 'fail'
     gdaltest.tiff_drv.Delete('/vsimem/tiff_write_154.tif')
@@ -7120,7 +6932,6 @@ def test_tiff_write_154():
     ds = gdaltest.tiff_drv.CreateCopy('/vsimem/tiff_write_154.tif', src_ds, options=['SPARSE_OK=YES', 'BLOCKYSIZE=256'])
     ds = None
     if gdal.VSIStatL('/vsimem/tiff_write_154.tif').size != 162:
-        gdaltest.post_reason('fail')
         print(gdal.VSIStatL('/vsimem/tiff_write_154.tif').size)
         return 'fail'
     # SPARSE_OK in Open()/update: blocks are not written
@@ -7128,7 +6939,6 @@ def test_tiff_write_154():
     ds.GetRasterBand(1).Fill(0)
     ds = None
     if gdal.VSIStatL('/vsimem/tiff_write_154.tif').size != 162:
-        gdaltest.post_reason('fail')
         print(gdal.VSIStatL('/vsimem/tiff_write_154.tif').size)
         return 'fail'
     ds = None
@@ -7137,7 +6947,6 @@ def test_tiff_write_154():
     ds.GetRasterBand(1).Fill(0)
     ds = None
     if gdal.VSIStatL('/vsimem/tiff_write_154.tif').size != 250162:
-        gdaltest.post_reason('fail')
         print(gdal.VSIStatL('/vsimem/tiff_write_154.tif').size)
         return 'fail'
     ds = None
@@ -7147,7 +6956,6 @@ def test_tiff_write_154():
     ds = gdaltest.tiff_drv.CreateCopy('/vsimem/tiff_write_154.tif', src_ds, options=['SPARSE_OK=YES', 'BLOCKYSIZE=256', 'COMPRESS=DEFLATE'])
     ds = None
     if gdal.VSIStatL('/vsimem/tiff_write_154.tif').size != 174:
-        gdaltest.post_reason('fail')
         print(gdal.VSIStatL('/vsimem/tiff_write_154.tif').size)
         return 'fail'
     gdaltest.tiff_drv.Delete('/vsimem/tiff_write_154.tif')
@@ -7156,7 +6964,6 @@ def test_tiff_write_154():
     ds = gdaltest.tiff_drv.CreateCopy('/vsimem/tiff_write_154.tif', src_ds, options=['SPARSE_OK=YES', 'TILED=YES'])
     ds = None
     if gdal.VSIStatL('/vsimem/tiff_write_154.tif').size != 190:
-        gdaltest.post_reason('fail')
         print(gdal.VSIStatL('/vsimem/tiff_write_154.tif').size)
         return 'fail'
     gdaltest.tiff_drv.Delete('/vsimem/tiff_write_154.tif')
@@ -7174,7 +6981,6 @@ def test_tiff_write_154():
             options = ['SPARSE_OK=YES', 'BLOCKYSIZE=256']
         gdaltest.tiff_drv.CreateCopy('/vsimem/tiff_write_154.tif', src_ds, options=options)
         if gdal.VSIStatL('/vsimem/tiff_write_154.tif').size != 162:
-            gdaltest.post_reason('fail')
             print(dt)
             print(gdal.VSIStatL('/vsimem/tiff_write_154.tif').size)
             return 'fail'
@@ -7195,7 +7001,6 @@ def test_tiff_write_154():
         ds = gdaltest.tiff_drv.CreateCopy('/vsimem/tiff_write_154.tif', src_ds, options=options)
         ds = None
         if gdal.VSIStatL('/vsimem/tiff_write_154.tif').size != 174:
-            gdaltest.post_reason('fail')
             print(dt)
             print(gdal.VSIStatL('/vsimem/tiff_write_154.tif').size)
             return 'fail'
@@ -7206,7 +7011,6 @@ def test_tiff_write_154():
     src_ds.GetRasterBand(1).WriteRaster(99, 0, 1, 1, struct.pack('B' * 1, 1))
     gdaltest.tiff_drv.CreateCopy('/vsimem/tiff_write_154.tif', src_ds, options=['SPARSE_OK=YES'])
     if gdal.VSIStatL('/vsimem/tiff_write_154.tif').size != 246:
-        gdaltest.post_reason('fail')
         print(gdal.VSIStatL('/vsimem/tiff_write_154.tif').size)
         return 'fail'
 
@@ -7221,7 +7025,6 @@ def test_tiff_write_154():
     ds = None
     gdaltest.tiff_drv.Delete('/vsimem/tiff_write_154.tif')
     if offset is None or int(offset) == 0:
-        gdaltest.post_reason('fail')
         return 'fail'
 
     return 'success'
@@ -7237,12 +7040,10 @@ def test_tiff_write_155():
     ds = None
 
     if gdal.VSIStatL('/vsimem/tiff_write_155.tif.aux.xml') is not None:
-        gdaltest.post_reason('fail')
         return 'fail'
 
     ds = gdal.Open('/vsimem/tiff_write_155.tif')
     if ds.GetRasterBand(1).GetDescription() != 'foo':
-        gdaltest.post_reason('fail')
         return 'fail'
     ds = None
     gdaltest.tiff_drv.Delete('/vsimem/tiff_write_155.tif')
@@ -7252,12 +7053,10 @@ def test_tiff_write_155():
     ds = None
 
     if gdal.VSIStatL('/vsimem/tiff_write_155.tif.aux.xml') is None:
-        gdaltest.post_reason('fail')
         return 'fail'
 
     ds = gdal.Open('/vsimem/tiff_write_155.tif')
     if ds.GetRasterBand(1).GetDescription() != 'foo':
-        gdaltest.post_reason('fail')
         return 'fail'
     ds = None
     gdaltest.tiff_drv.Delete('/vsimem/tiff_write_155.tif')
@@ -7275,21 +7074,18 @@ def test_tiff_write_156():
 
     (flags, pct) = ds.GetRasterBand(1).GetDataCoverageStatus(0, 0, 32, 32)
     if flags != gdal.GDAL_DATA_COVERAGE_STATUS_DATA or pct != 100.0:
-        gdaltest.post_reason('failure')
         print(flags)
         print(pct)
         return 'fail'
 
     (flags, pct) = ds.GetRasterBand(1).GetDataCoverageStatus(32, 0, 32, 32)
     if flags != gdal.GDAL_DATA_COVERAGE_STATUS_EMPTY or pct != 0.0:
-        gdaltest.post_reason('failure')
         print(flags)
         print(pct)
         return 'fail'
 
     (flags, pct) = ds.GetRasterBand(1).GetDataCoverageStatus(16, 16, 32, 32)
     if flags != gdal.GDAL_DATA_COVERAGE_STATUS_DATA | gdal.GDAL_DATA_COVERAGE_STATUS_EMPTY or pct != 25.0:
-        gdaltest.post_reason('failure')
         print(flags)
         print(pct)
         return 'fail'
@@ -7304,7 +7100,6 @@ def test_tiff_write_156():
     ds = gdal.Open('/vsimem/tiff_write_156.tif')
     flags, _ = ds.GetRasterBand(1).GetDataCoverageStatus(0, 100, 1, 1)
     if flags != gdal.GDAL_DATA_COVERAGE_STATUS_DATA:
-        gdaltest.post_reason('failure')
         print(flags)
         return 'fail'
     ds = None
@@ -7352,19 +7147,16 @@ def test_tiff_write_157():
     # Check that we properly deserialize Float16 values
     ds = gdal.Open('/vsimem/tiff_write_157.tif')
     if ds.GetRasterBand(1).GetMetadataItem('NBITS', 'IMAGE_STRUCTURE') != '16':
-        gdaltest.post_reason('failure')
         return 'fail'
     got = struct.unpack('f' * 14, ds.ReadRaster())
     expected = [0.0, -0.0, gdaltest.posinf(), -gdaltest.posinf(), gdaltest.NaN(), gdaltest.NaN(), 1.25, -1.25, 5.9604644775390625e-08, -5.9604644775390625e-08, 6.0975551605224609e-05, -6.0975551605224609e-05, 6.103515625e-05, -6.103515625e-05]
     for i in range(14):
         if i == 4 or i == 5:
             if got[i] == got[i]:
-                gdaltest.post_reason('failure')
                 print(i)
                 print(got[i])
                 return 'fail'
         elif abs(got[i] - expected[i]) > 1e-15:
-            gdaltest.post_reason('failure')
             print(i)
             print(got[i])
             print(expected[i])
@@ -7384,7 +7176,6 @@ def test_tiff_write_157():
     gdal.VSIFCloseL(f)
 
     if vals != vals_copied:
-        gdaltest.post_reason('failure')
         print(struct.unpack('H' * 14, vals))
         print(struct.unpack('H' * 14, vals_copied))
         return 'fail'
@@ -7428,12 +7219,10 @@ def test_tiff_write_157():
     for i in range(18):
         if i == 4 or i == 5:
             if got[i] == got[i]:
-                gdaltest.post_reason('failure')
                 print(i)
                 print(got[i])
                 return 'fail'
         elif abs(got[i] - expected[i]) > 1e-15:
-            gdaltest.post_reason('failure')
             print(i)
             print(got[i])
             print(expected[i])
@@ -7446,12 +7235,10 @@ def test_tiff_write_157():
     ds = gdal.Open('/vsimem/tiff_write_157.tif')
     cs = ds.GetRasterBand(1).Checksum()
     if cs != 30111:
-        gdaltest.post_reason('failure')
         print(cs)
         return 'fail'
     cs = ds.GetRasterBand(2).Checksum()
     if cs != 32302:
-        gdaltest.post_reason('failure')
         print(cs)
         return 'fail'
     ds = None
@@ -7469,29 +7256,23 @@ def test_tiff_write_158():
     ds = gdaltest.tiff_drv.Create('/vsimem/tiff_write_158.tif', 20, 40, 1, options=['TILED=YES', 'BLOCKXSIZE=16', 'BLOCKYSIZE=32'])
     (w, h) = ds.GetRasterBand(1).GetActualBlockSize(0, 0)
     if (w, h) != (16, 32):
-        gdaltest.post_reason('failure')
         print(w, h)
         return 'fail'
     (w, h) = ds.GetRasterBand(1).GetActualBlockSize(1, 1)
     if (w, h) != (4, 8):
-        gdaltest.post_reason('failure')
         print(w, h)
         return 'fail'
     res = ds.GetRasterBand(1).GetActualBlockSize(2, 0)
     if res is not None:
-        gdaltest.post_reason('failure')
         return 'fail'
     res = ds.GetRasterBand(1).GetActualBlockSize(0, 2)
     if res is not None:
-        gdaltest.post_reason('failure')
         return 'fail'
     res = ds.GetRasterBand(1).GetActualBlockSize(-1, 0)
     if res is not None:
-        gdaltest.post_reason('failure')
         return 'fail'
     res = ds.GetRasterBand(1).GetActualBlockSize(0, -1)
     if res is not None:
-        gdaltest.post_reason('failure')
         return 'fail'
     ds = None
 
@@ -7527,7 +7308,6 @@ def test_tiff_write_159():
         cs1 = ds.GetRasterBand(1).GetOverview(0).Checksum()
         cs2 = ds.GetRasterBand(1).GetOverview(1).Checksum()
         if cs0 == 0 or cs1 == 0 or cs2 == 0:
-            gdaltest.post_reason('failure')
             print(options)
             print(cs0)
             print(cs1)
@@ -7540,7 +7320,6 @@ def test_tiff_write_159():
         data_ovr_0 = int(ds.GetRasterBand(1).GetOverview(0).GetMetadataItem('BLOCK_OFFSET_0_0', 'TIFF'))
         data_main = int(ds.GetRasterBand(1).GetMetadataItem('BLOCK_OFFSET_0_0', 'TIFF'))
         if not(ifd_main < ifd_ovr_0 and ifd_ovr_0 < ifd_ovr_1 and ifd_ovr_1 < data_ovr_1 and data_ovr_1 < data_ovr_0 and data_ovr_0 < data_main):
-            gdaltest.post_reason('failure')
             print(options)
             print(ifd_main, ifd_ovr_0, ifd_ovr_1, data_ovr_1, data_ovr_0, data_main)
             return 'fail'
@@ -7548,12 +7327,10 @@ def test_tiff_write_159():
         table_ovr_0 = ds.GetRasterBand(1).GetOverview(0).GetMetadataItem('JPEGTABLES', 'TIFF')
         table_ovr_1 = ds.GetRasterBand(1).GetOverview(1).GetMetadataItem('JPEGTABLES', 'TIFF')
         if table_main != table_ovr_0 or table_ovr_0 != table_ovr_1:
-            gdaltest.post_reason('failure')
             print(options)
             return 'fail'
         # Check that the JPEG tables are different in the 3 modes
         if table_main == prev_table:
-            gdaltest.post_reason('failure')
             print(options)
             return 'fail'
         prev_table = table_main
@@ -7574,7 +7351,6 @@ def test_tiff_write_159():
         cs0 = ds.GetRasterBand(1).Checksum()
         cs1 = ds.GetRasterBand(1).GetOverview(0).Checksum()
         if cs0 != 4743 or cs1 != 1133:
-            gdaltest.post_reason('failure')
             print(value)
             print(cs0)
             print(cs1)
@@ -7598,7 +7374,6 @@ def test_tiff_write_160():
     ds = gdal.Open('/vsimem/tiff_write_160.tif')
     cs = ds.GetRasterBand(1).Checksum()
     if cs != 1218:
-        gdaltest.post_reason('fail')
         print(cs)
         return 'fail'
     ds = None
@@ -7621,38 +7396,29 @@ def test_tiff_write_161():
     src_ds = gdal.Open('data/gcps.vrt')
     with gdaltest.error_handler():
         if ds.SetGCPs(src_ds.GetGCPs(), '') != 0:
-            gdaltest.post_reason('fail')
             return 'fail'
     if ds.GetGeoTransform(can_return_null=True) is not None:
-        gdaltest.post_reason('fail')
         return 'fail'
     ds = None
 
     ds = gdal.Open('/vsimem/tiff_write_161.tif', gdal.GA_Update)
     if not ds.GetGCPs():
-        gdaltest.post_reason('fail')
         return 'fail'
     if ds.GetGeoTransform(can_return_null=True) is not None:
-        gdaltest.post_reason('fail')
         return 'fail'
     with gdaltest.error_handler():
         if ds.SetGeoTransform([0, 1, 2, 3, 4, 5]) != 0:
-            gdaltest.post_reason('fail')
             return 'fail'
     if ds.GetGeoTransform() != (0.0, 1.0, 2.0, 3.0, 4.0, 5.0):
-        gdaltest.post_reason('fail')
         return 'fail'
     if ds.GetGCPs():
-        gdaltest.post_reason('fail')
         return 'fail'
     ds = None
 
     ds = gdal.Open('/vsimem/tiff_write_161.tif', gdal.GA_Update)
     if ds.GetGCPs():
-        gdaltest.post_reason('fail')
         return 'fail'
     if ds.GetGeoTransform() != (0.0, 1.0, 2.0, 3.0, 4.0, 5.0):
-        gdaltest.post_reason('fail')
         return 'fail'
     ds = None
 
@@ -7696,13 +7462,11 @@ def test_tiff_write_163():
     ds = gdal.Open('/vsimem/tiff_write_163.tif')
     cs = ds.GetRasterBand(1).Checksum()
     if cs != 47567:
-        gdaltest.post_reason('fail')
         print(cs)
         return 'fail'
     # Check that IsBlockAvailable() works properly in that mode
     offset_0_2 = ds.GetRasterBand(1).GetMetadataItem('BLOCK_OFFSET_0_2', 'TIFF')
     if offset_0_2 != str(146 + 2 * 8192):
-        gdaltest.post_reason('fail')
         print(offset_0_2)
         return 'fail'
     ds = None
@@ -7726,7 +7490,6 @@ def test_tiff_write_164():
     ds = None
 
     if gt != (0, 1, 0, 0, 0, 1):
-        gdaltest.post_reason('fail')
         print(gt)
         return 'fail'
 
@@ -7740,7 +7503,6 @@ def test_tiff_write_164():
     ds = None
 
     if gt != (0, 1, 0, 0, 0, -1):
-        gdaltest.post_reason('fail')
         print(gt)
         return 'fail'
 
@@ -7757,7 +7519,6 @@ def test_tiff_write_165():
     ds = gdaltest.tiff_drv.Create('/vsimem/test.tif', 1, 1, 3)
     ret = ds.GetRasterBand(1).SetNoDataValue(100)
     if ret != 0:
-        gdaltest.post_reason('fail')
         return 'fail'
 
     with gdaltest.error_handler():
@@ -7766,18 +7527,15 @@ def test_tiff_write_165():
         gdaltest.post_reason('warning expected, but not emitted')
         return 'fail'
     if ret != 0:
-        gdaltest.post_reason('fail')
         return 'fail'
 
     nd = ds.GetRasterBand(1).GetNoDataValue()
     if nd != 100:
-        gdaltest.post_reason('fail')
         print(nd)
         return 'fail'
 
     nd = ds.GetRasterBand(2).GetNoDataValue()
     if nd != 200:
-        gdaltest.post_reason('fail')
         print(nd)
         return 'fail'
 
@@ -7788,7 +7546,6 @@ def test_tiff_write_165():
     ds = None
 
     if nd != 200:
-        gdaltest.post_reason('fail')
         print(nd)
         return 'fail'
 
@@ -7804,12 +7561,10 @@ def test_tiff_write_166():
 
     ds = gdal.Open('data/tiff_vertcs_scale_offset.tif')
     if ds.GetRasterBand(1).GetScale() != 2.0:
-        gdaltest.post_reason('fail')
         print(ds.GetRasterBand(1).GetScale())
         return 'fail'
 
     if ds.GetRasterBand(1).GetOffset() != 10.0:
-        gdaltest.post_reason('fail')
         print(ds.GetRasterBand(1).GetOffset())
         return 'fail'
 
@@ -7817,17 +7572,14 @@ def test_tiff_write_166():
     gdal.Translate('/vsimem/tiff_write_166.tif', 'data/byte.tif',
                    options='-a_srs EPSG:26711+5773 -a_scale 2.0 -a_offset 10 -co PROFILE=GEOTIFF')
     if gdal.VSIStatL('/vsimem/tiff_write_166.tif.aux.xml') is not None:
-        gdaltest.post_reason('fail')
         return 'fail'
 
     ds = gdal.Open('/vsimem/tiff_write_166.tif')
     if ds.GetRasterBand(1).GetScale() != 2.0:
-        gdaltest.post_reason('fail')
         print(ds.GetRasterBand(1).GetScale())
         return 'fail'
 
     if ds.GetRasterBand(1).GetOffset() != 10.0:
-        gdaltest.post_reason('fail')
         print(ds.GetRasterBand(1).GetOffset())
         return 'fail'
     ds = None
@@ -7837,17 +7589,14 @@ def test_tiff_write_166():
     gdal.Translate('/vsimem/tiff_write_166.tif', 'data/byte.tif',
                    options='-a_srs EPSG:26711+5773 -a_offset 10 -co PROFILE=GEOTIFF')
     if gdal.VSIStatL('/vsimem/tiff_write_166.tif.aux.xml') is not None:
-        gdaltest.post_reason('fail')
         return 'fail'
 
     ds = gdal.Open('/vsimem/tiff_write_166.tif')
     if ds.GetRasterBand(1).GetScale() != 1.0:
-        gdaltest.post_reason('fail')
         print(ds.GetRasterBand(1).GetScale())
         return 'fail'
 
     if ds.GetRasterBand(1).GetOffset() != 10.0:
-        gdaltest.post_reason('fail')
         print(ds.GetRasterBand(1).GetOffset())
         return 'fail'
     ds = None
@@ -7863,16 +7612,13 @@ def test_tiff_write_166():
     ds.GetRasterBand(1).SetOffset(10)
     ds = None
     if gdal.VSIStatL('/vsimem/tiff_write_166.tif.aux.xml') is not None:
-        gdaltest.post_reason('fail')
         return 'fail'
 
     ds = gdal.Open('/vsimem/tiff_write_166.tif')
     if ds.GetRasterBand(1).GetScale() != 2.0:
-        gdaltest.post_reason('fail')
         print(ds.GetRasterBand(1).GetScale())
         return 'fail'
     if ds.GetRasterBand(1).GetOffset() != 10.0:
-        gdaltest.post_reason('fail')
         print(ds.GetRasterBand(1).GetOffset())
         return 'fail'
     ds = None
@@ -7887,16 +7633,13 @@ def test_tiff_write_166():
     ds.GetRasterBand(1).SetScale(2)
     ds = None
     if gdal.VSIStatL('/vsimem/tiff_write_166.tif.aux.xml') is not None:
-        gdaltest.post_reason('fail')
         return 'fail'
 
     ds = gdal.Open('/vsimem/tiff_write_166.tif')
     if ds.GetRasterBand(1).GetScale() != 2.0:
-        gdaltest.post_reason('fail')
         print(ds.GetRasterBand(1).GetScale())
         return 'fail'
     if ds.GetRasterBand(1).GetOffset() != 0.0:
-        gdaltest.post_reason('fail')
         print(ds.GetRasterBand(1).GetOffset())
         return 'fail'
     ds = None
@@ -7911,16 +7654,13 @@ def test_tiff_write_166():
     ds.GetRasterBand(1).SetOffset(10)
     ds = None
     if gdal.VSIStatL('/vsimem/tiff_write_166.tif.aux.xml') is not None:
-        gdaltest.post_reason('fail')
         return 'fail'
 
     ds = gdal.Open('/vsimem/tiff_write_166.tif')
     if ds.GetRasterBand(1).GetScale() != 1.0:
-        gdaltest.post_reason('fail')
         print(ds.GetRasterBand(1).GetScale())
         return 'fail'
     if ds.GetRasterBand(1).GetOffset() != 10.0:
-        gdaltest.post_reason('fail')
         print(ds.GetRasterBand(1).GetOffset())
         return 'fail'
     ds = None
@@ -7947,7 +7687,6 @@ def test_tiff_write_167_deflate_zlevel():
     gdal.Unlink('/vsimem/out.tif')
 
     if size2 >= size1:
-        gdaltest.post_reason('fail')
         print(size1, size2)
         return 'fail'
 
@@ -7963,7 +7702,6 @@ def test_tiff_write_167_deflate_zlevel():
     gdal.Unlink('/vsimem/out.tif')
 
     if size2 != size2_create:
-        gdaltest.post_reason('fail')
         print(size2, size2_create)
         return 'fail'
 
@@ -8068,7 +7806,6 @@ def test_tiff_write_tiled_webp():
     ds = gdal.Open(filename)
     cs = [ds.GetRasterBand(i+1).Checksum() for i in range(3)]
     if cs != [21212, 21053, 21349]:
-        gdaltest.post_reason('fail')
         print(cs)
         return 'fail'
 
@@ -8127,11 +7864,9 @@ def test_tiff_write_172_geometadata_tiff_rsid():
 
     ds = gdal.Open(tmpfilename, gdal.GA_Update)
     if ds.GetMetadataItem('GEO_METADATA') != 'foo':
-        gdaltest.post_reason('fail')
         print(ds.GetMetadata())
         return 'fail'
     if ds.GetMetadataItem('TIFF_RSID') != 'bar':
-        gdaltest.post_reason('fail')
         print(ds.GetMetadata())
         return 'fail'
     ds.SetMetadata({})
@@ -8139,11 +7874,9 @@ def test_tiff_write_172_geometadata_tiff_rsid():
 
     ds = gdal.Open(tmpfilename)
     if ds.GetMetadataItem('GEO_METADATA') is not None:
-        gdaltest.post_reason('fail')
         print(ds.GetMetadata())
         return 'fail'
     if ds.GetMetadataItem('TIFF_RSID') is not None:
-        gdaltest.post_reason('fail')
         print(ds.GetMetadata())
         return 'fail'
     ds = None
@@ -8253,7 +7986,6 @@ def test_tiff_write_177_lerc_several_bands_tiling():
     ds = None
     gdal.Unlink(filename)
     if cs != [30111, 32302, 40026]:
-        gdaltest.post_reason('fail')
         print(cs)
         return 'fail'
 
@@ -8277,7 +8009,6 @@ def test_tiff_write_178_lerc_with_alpha():
     ds = None
     gdal.Unlink(filename)
     if cs != [12603, 58561, 36064, 10807]:
-        gdaltest.post_reason('fail')
         print(cs)
         return 'fail'
 
@@ -8301,7 +8032,6 @@ def test_tiff_write_178_lerc_with_alpha_0_and_255():
     ds = None
     gdal.Unlink(filename)
     if cs != [13, 13, 13, 13]:
-        gdaltest.post_reason('fail')
         print(cs)
         return 'fail'
 
@@ -8327,7 +8057,6 @@ def test_tiff_write_179_lerc_data_types():
         ds = None
         gdal.Unlink(filename)
         if cs != 4672:
-            gdaltest.post_reason('fail')
             print(cs)
             return 'fail'
 
@@ -8341,7 +8070,6 @@ def test_tiff_write_179_lerc_data_types():
     ds = None
     gdal.Unlink(filename)
     if cs != 4672:
-        gdaltest.post_reason('fail')
         print(cs)
         return 'fail'
 
@@ -8349,7 +8077,6 @@ def test_tiff_write_179_lerc_data_types():
     with gdaltest.error_handler():
         gdal.Translate(filename, 'data/cfloat32.tif', creationOptions=['COMPRESS=LERC'])
     if gdal.GetLastErrorMsg() == '':
-        gdaltest.post_reason('fail')
         return 'fail'
     gdal.Unlink(filename)
 
@@ -8373,7 +8100,6 @@ def test_tiff_write_180_lerc_separate():
     ds = None
     gdal.Unlink(filename)
     if cs != [30111, 32302, 40026]:
-        gdaltest.post_reason('fail')
         print(cs)
         return 'fail'
 
diff --git a/autotest/gcore/transformer.py b/autotest/gcore/transformer.py
index 32ec5d22bb1a..22a0dfcd868d 100755
--- a/autotest/gcore/transformer.py
+++ b/autotest/gcore/transformer.py
@@ -317,12 +317,10 @@ def test_transformer_5():
 
     (success, pnt) = tr.TransformPoint(0, 40000, 0, 0)
     if success != 0:
-        gdaltest.post_reason('fail')
         return 'fail'
 
     (success, pnt) = tr.TransformPoint(1, 125, 40, 0)
     if success != 0:
-        gdaltest.post_reason('fail')
         return 'fail'
 
     tr = None
@@ -466,19 +464,16 @@ def test_transformer_9():
         points = [(125.64828521533849, 39.869345204440144)] * 10
         (pnt, success) = tr.TransformPoints(1, points)
         if not success[0]:
-            gdaltest.post_reason('failure')
             print(method)
             return 'fail'
         pnt_optimized = pnt[0]
 
         (success, pnt) = tr.TransformPoint(1, 125.64828521533849, 39.869345204440144, 0)
         if not success:
-            gdaltest.post_reason('failure')
             print(method)
             return 'fail'
 
         if pnt != pnt_optimized:
-            gdaltest.post_reason('failure')
             print(method)
             print(pnt)
             print(pnt_optimized)
@@ -641,7 +636,6 @@ def test_transformer_12():
 
     tr = gdal.Transformer(ds, None, ['METHOD=GCP_TPS'])
     if tr is None:
-        gdaltest.post_reason('fail')
         return 'fail'
 
     ds = gdal.Open("""
@@ -665,7 +659,6 @@ def test_transformer_12():
     with gdaltest.error_handler():
         tr = gdal.Transformer(ds, None, ['METHOD=GCP_TPS'])
     if gdal.GetLastErrorMsg() == '':
-        gdaltest.post_reason('fail')
         return 'fail'
 
     ds = gdal.Open("""
@@ -689,7 +682,6 @@ def test_transformer_12():
     with gdaltest.error_handler():
         tr = gdal.Transformer(ds, None, ['METHOD=GCP_TPS'])
     if gdal.GetLastErrorMsg() == '':
-        gdaltest.post_reason('fail')
         return 'fail'
 
     return 'success'
@@ -763,7 +755,6 @@ def test_transformer_14():
     gdal.SetConfigOption('RPC_INVERSE_LOG', old_rpc_inverse_log)
     (success, pnt) = tr.TransformPoint(0, 0, 0)
     if not success or abs(pnt[0] - 1.9391846640653961e-05) > 1e-7 or abs(pnt[1] - -0.0038824752244123275) > 1e-7:
-        gdaltest.post_reason('fail')
         print(pnt)
         return 'fail'
 
@@ -772,7 +763,6 @@ def test_transformer_14():
         content = gdal.VSIFReadL(1, 1000, f).decode('ASCII')
         gdal.VSIFCloseL(f)
     if content.find('Integer,Real,Real,Real,String,Real,Real') != 0:
-        gdaltest.post_reason('fail')
         print(content)
         return 'fail'
 
@@ -782,7 +772,6 @@ def test_transformer_14():
         gdal.VSIFCloseL(f)
     if content.find("""iter,long,lat,height,WKT,error_pixel_x,error_pixel_y
 0,""") != 0:
-        gdaltest.post_reason('fail')
         print(content)
         return 'fail'
 
@@ -905,12 +894,10 @@ def test_transformer_16():
        content.find('<MaxErrorReverse>0.1</MaxErrorReverse>') < 0 or \
        content.find('<MaxErrorForward>0.0001</MaxErrorForward>') < 0 or \
        content.find('<MaxErrorReverse>6.1</MaxErrorReverse>') < 0:
-        gdaltest.post_reason('fail')
         print(content)
         return 'fail'
     ds = gdal.Translate('', '/vsimem/transformer_16.vrt', format='MEM')
     if ds.GetRasterBand(1).Checksum() != 4727:
-        gdaltest.post_reason('failure')
         print(ds.GetRasterBand(1).Checksum())
         return 'fail'
     ds = None
diff --git a/autotest/gcore/virtualmem.py b/autotest/gcore/virtualmem.py
index b284d54aaa97..05279db291ff 100755
--- a/autotest/gcore/virtualmem.py
+++ b/autotest/gcore/virtualmem.py
@@ -90,26 +90,19 @@ def test_virtualmem_1():
                 for x in range(reqxsize):
                     for band in range(3):
                         if ar_tip[tiley][tilex][y][x][band] != ar[band][tiley * tileysize + y][tilex * tilexsize + x]:
-                            gdaltest.post_reason('fail')
                             return 'fail'
                         if ar_tip[tiley][tilex][y][x][band] != ar_flat_bsq[band][tiley * tileysize + y][tilex * tilexsize + x]:
-                            gdaltest.post_reason('fail')
                             return 'fail'
                         if ar_tip[tiley][tilex][y][x][band] != ar_flat_bip[tiley * tileysize + y][tilex * tilexsize + x][band]:
-                            gdaltest.post_reason('fail')
                             return 'fail'
                         if ar_tip[tiley][tilex][y][x][band] != ar_bsq[band][tiley][tilex][y][x]:
-                            gdaltest.post_reason('fail')
                             return 'fail'
                         if ar_tip[tiley][tilex][y][x][band] != ar_bit[tiley][tilex][band][y][x]:
-                            gdaltest.post_reason('fail')
                             return 'fail'
                         if band == 0:
                             if ar_flat_band1[tiley * tileysize + y][tilex * tilexsize + x] != ar_flat_bip[tiley * tileysize + y][tilex * tilexsize + x][0]:
-                                gdaltest.post_reason('fail')
                                 return 'fail'
                             if ar_tiled_band1[tiley][tilex][y][x] != ar_flat_bip[tiley * tileysize + y][tilex * tilexsize + x][0]:
-                                gdaltest.post_reason('fail')
                                 return 'fail'
 
     # We need to destroy the array before dataset destruction
@@ -192,10 +185,8 @@ def test_virtualmem_3():
         ar_255.fill(255)
         for y in range(ds.RasterYSize):
             if not gdalnumeric.array_equal(ar1[y], ar_127):
-                gdaltest.post_reason('fail')
                 return 'fail'
             if not gdalnumeric.array_equal(ar2[y], ar_255):
-                gdaltest.post_reason('fail')
                 return 'fail'
         # We need to destroy the array before dataset destruction
         ar1 = None
@@ -246,7 +237,6 @@ def test_virtualmem_4():
         ar2 = None
         ds = None
         if val != 127:
-            gdaltest.post_reason('fail')
             print(val)
             return 'fail'
 
@@ -259,13 +249,11 @@ def test_virtualmem_4():
         ar_255.fill(255)
         for y in range(ds.RasterYSize):
             if not gdalnumeric.array_equal(ar1[y], ar_127):
-                gdaltest.post_reason('fail')
                 ar1 = None
                 ar2 = None
                 ds = None
                 return 'fail'
             if not gdalnumeric.array_equal(ar2[y], ar_255):
-                gdaltest.post_reason('fail')
                 ar1 = None
                 ar2 = None
                 ds = None
diff --git a/autotest/gcore/vrt_read.py b/autotest/gcore/vrt_read.py
index dd03513e2b3b..0f24a437f04c 100755
--- a/autotest/gcore/vrt_read.py
+++ b/autotest/gcore/vrt_read.py
@@ -341,11 +341,9 @@ def test_vrt_read_7():
     gdal.Unlink(filename)
 
     if ds is not None:
-        gdaltest.post_reason('fail')
         return 'fail'
 
     if error_msg == '':
-        gdaltest.post_reason('fail')
         return 'fail'
 
     return 'success'
@@ -423,13 +421,11 @@ def test_vrt_read_10():
     gdal.VSIFCloseL(f)
 
     if vrt_hist != mem_hist:
-        gdaltest.post_reason('fail')
         print(vrt_hist)
         print(mem_hist)
         return 'fail'
 
     if content.find('<Histograms>') < 0:
-        gdaltest.post_reason('fail')
         print(content)
         return 'fail'
 
@@ -456,7 +452,6 @@ def test_vrt_read_10():
         gdal.VSIFCloseL(f)
 
         if content.find('<Histograms>') < 0:
-            gdaltest.post_reason('fail')
             print(content)
             return 'fail'
 
@@ -486,7 +481,6 @@ def test_vrt_read_10():
         gdal.VSIFCloseL(f)
 
         if content.find('<Histograms>') < 0:
-            gdaltest.post_reason('fail')
             print(content)
             return 'fail'
 
@@ -611,7 +605,6 @@ def test_vrt_read_14():
 
     if vrt_stats[0] != 115.0 or vrt_stats[1] != 173.0:
         print(vrt_stats)
-        gdaltest.post_reason('fail')
         return 'fail'
 
     return 'success'
@@ -807,7 +800,6 @@ def test_vrt_read_20():
 </VRTDataset>""")
     ret = gdaltest.runexternal(test_cli_utilities.get_gdalinfo_path() + ' -checksum tmp/byte2.vrt --config VRT_SHARED_SOURCE 0 --config GDAL_MAX_DATASET_POOL_SIZE 3')
     if ret.find('Checksum=4672') < 0:
-        gdaltest.post_reason('failure')
         print(ret)
         return 'fail'
 
@@ -843,7 +835,6 @@ def test_vrt_read_21():
 </VRTDataset>""")
     ds = gdal.Open('/vsimem/vrt_read_21.vrt')
     if ds.GetRasterBand(1).GetOverviewCount() != 1:
-        gdaltest.post_reason('failure')
         print(ds.GetRasterBand(1).GetOverviewCount())
         return 'fail'
     data_ds_one_band = ds.ReadRaster(0, 0, 800, 800, 400, 400)
@@ -872,22 +863,18 @@ def test_vrt_read_21():
 </VRTDataset>""")
     ds = gdal.Open('/vsimem/vrt_read_21.vrt')
     if ds.GetRasterBand(1).GetOverviewCount() != 1:
-        gdaltest.post_reason('failure')
         print(ds.GetRasterBand(1).GetOverviewCount())
         return 'fail'
 
     ds = gdal.Open('/vsimem/vrt_read_21.vrt')
     ovr_band = ds.GetRasterBand(1).GetOverview(-1)
     if ovr_band is not None:
-        gdaltest.post_reason('failure')
         return 'fail'
     ovr_band = ds.GetRasterBand(1).GetOverview(1)
     if ovr_band is not None:
-        gdaltest.post_reason('failure')
         return 'fail'
     ovr_band = ds.GetRasterBand(1).GetOverview(0)
     if ovr_band is None:
-        gdaltest.post_reason('failure')
         return 'fail'
     cs = ovr_band.Checksum()
     cs2 = ds.GetRasterBand(2).GetOverview(0).Checksum()
@@ -895,7 +882,6 @@ def test_vrt_read_21():
     data = ds.ReadRaster(0, 0, 800, 800, 400, 400)
 
     if data != data_ds_one_band + ds.GetRasterBand(2).ReadRaster(0, 0, 800, 800, 400, 400):
-        gdaltest.post_reason('failure')
         return 'fail'
 
     mem_ds = gdal.GetDriverByName('MEM').Create('', 400, 400, 2)
@@ -904,12 +890,10 @@ def test_vrt_read_21():
     ref_cs2 = mem_ds.GetRasterBand(2).Checksum()
     mem_ds = None
     if cs != ref_cs:
-        gdaltest.post_reason('failure')
         print(cs)
         print(ref_cs)
         return 'fail'
     if cs2 != ref_cs2:
-        gdaltest.post_reason('failure')
         print(cs2)
         print(ref_cs2)
         return 'fail'
@@ -920,12 +904,10 @@ def test_vrt_read_21():
     ds = None
 
     if cs != expected_cs:
-        gdaltest.post_reason('failure')
         print(cs)
         print(expected_cs)
         return 'fail'
     if cs2 != expected_cs2:
-        gdaltest.post_reason('failure')
         print(cs2)
         print(expected_cs2)
         return 'fail'
@@ -962,26 +944,21 @@ def test_vrt_read_22():
   </VRTRasterBand>
 </VRTDataset>""")
     if ds.GetRasterBand(1).GetMinimum() != 63:
-        gdaltest.post_reason('failure')
         return 'fail'
 
     if ds.GetRasterBand(1).GetMaximum() != 63:
-        gdaltest.post_reason('failure')
         return 'fail'
 
     if ds.GetRasterBand(1).ComputeRasterMinMax() != (63, 63):
-        gdaltest.post_reason('failure')
         return 'fail'
 
     if ds.GetRasterBand(1).ComputeStatistics(False) != [63.0, 63.0, 63.0, 0.0]:
-        gdaltest.post_reason('failure')
         print(ds.GetRasterBand(1).ComputeStatistics(False))
         return 'fail'
 
     data = ds.ReadRaster()
     got = struct.unpack('B' * 20 * 20, data)
     if got[0] != 63:
-        gdaltest.post_reason('failure')
         return 'fail'
 
     ds = gdal.Open("""<VRTDataset rasterXSize="20" rasterYSize="20">
@@ -996,19 +973,15 @@ def test_vrt_read_22():
   </VRTRasterBand>
 </VRTDataset>""")
     if ds.GetRasterBand(1).GetMinimum() != 63:
-        gdaltest.post_reason('failure')
         return 'fail'
 
     if ds.GetRasterBand(1).GetMaximum() != 63:
-        gdaltest.post_reason('failure')
         return 'fail'
 
     if ds.GetRasterBand(1).ComputeRasterMinMax() != (63, 63):
-        gdaltest.post_reason('failure')
         return 'fail'
 
     if ds.GetRasterBand(1).ComputeStatistics(False) != [63.0, 63.0, 63.0, 0.0]:
-        gdaltest.post_reason('failure')
         print(ds.GetRasterBand(1).ComputeStatistics(False))
         return 'fail'
 
@@ -1025,20 +998,16 @@ def test_vrt_read_22():
   </VRTRasterBand>
 </VRTDataset>""")
     if ds.GetRasterBand(1).GetMinimum() is not None:
-        gdaltest.post_reason('failure')
         print(ds.GetRasterBand(1).GetMinimum())
         return 'fail'
 
     if ds.GetRasterBand(1).GetMaximum() is not None:
-        gdaltest.post_reason('failure')
         return 'fail'
 
     if ds.GetRasterBand(1).ComputeRasterMinMax() != (63, 63):
-        gdaltest.post_reason('failure')
         return 'fail'
 
     if ds.GetRasterBand(1).ComputeStatistics(False) != [63.0, 63.0, 63.0, 0.0]:
-        gdaltest.post_reason('failure')
         print(ds.GetRasterBand(1).ComputeStatistics(False))
         return 'fail'
 
@@ -1074,11 +1043,9 @@ def test_vrt_read_23():
 </VRTDataset>""")
     got_ar = ds.GetRasterBand(1).ReadAsArray(0, 0, 2, 1, 4, 1, resample_alg=gdal.GRIORA_Bilinear)
     if list(got_ar[0]) != [0, 10, 10, 10]:
-        gdaltest.post_reason('failure')
         print(list(got_ar[0]))
         return 'fail'
     if ds.ReadRaster(0, 0, 2, 1, 4, 1, resample_alg=gdal.GRIORA_Bilinear) != ds.GetRasterBand(1).ReadRaster(0, 0, 2, 1, 4, 1, resample_alg=gdal.GRIORA_Bilinear):
-        gdaltest.post_reason('failure')
         return 'fail'
     ds = None
 
@@ -1099,11 +1066,9 @@ def test_vrt_read_23():
 </VRTDataset>""")
     got_ar = ds.GetRasterBand(1).ReadAsArray(0, 0, 2, 1, 4, 1, resample_alg=gdal.GRIORA_Bilinear)
     if list(got_ar[0]) != [0, 10, 10, 10]:
-        gdaltest.post_reason('failure')
         print(list(got_ar[0]))
         return 'fail'
     if ds.ReadRaster(0, 0, 2, 1, 4, 1, resample_alg=gdal.GRIORA_Bilinear) != ds.GetRasterBand(1).ReadRaster(0, 0, 2, 1, 4, 1, resample_alg=gdal.GRIORA_Bilinear):
-        gdaltest.post_reason('failure')
         return 'fail'
     ds = None
 
@@ -1129,7 +1094,6 @@ def test_vrt_read_24():
     # Please do not change the expected checksum without checking that
     # the result image has no vertical black line in the middle
     if cs != 46612:
-        gdaltest.post_reason('failure')
         print(cs)
         return 'fail'
     ds = None
@@ -1171,28 +1135,24 @@ def test_vrt_read_25():
 
     (flags, pct) = ds.GetRasterBand(1).GetDataCoverageStatus(0, 0, 20, 20)
     if flags != gdal.GDAL_DATA_COVERAGE_STATUS_DATA or pct != 100.0:
-        gdaltest.post_reason('failure')
         print(flags)
         print(pct)
         return 'fail'
 
     (flags, pct) = ds.GetRasterBand(1).GetDataCoverageStatus(1005, 35, 10, 10)
     if flags != gdal.GDAL_DATA_COVERAGE_STATUS_DATA or pct != 100.0:
-        gdaltest.post_reason('failure')
         print(flags)
         print(pct)
         return 'fail'
 
     (flags, pct) = ds.GetRasterBand(1).GetDataCoverageStatus(100, 100, 20, 20)
     if flags != gdal.GDAL_DATA_COVERAGE_STATUS_EMPTY or pct != 0.0:
-        gdaltest.post_reason('failure')
         print(flags)
         print(pct)
         return 'fail'
 
     (flags, pct) = ds.GetRasterBand(1).GetDataCoverageStatus(10, 10, 20, 20)
     if flags != gdal.GDAL_DATA_COVERAGE_STATUS_DATA | gdal.GDAL_DATA_COVERAGE_STATUS_EMPTY or pct != 25.0:
-        gdaltest.post_reason('failure')
         print(flags)
         print(pct)
         return 'fail'
@@ -1225,7 +1185,6 @@ def test_vrt_read_26():
     partial_data = struct.unpack('B' * 1 * 1, partial_data)
 
     if partial_data[0] != full_data[22 + 1]:
-        gdaltest.post_reason('fail')
         print(full_data)
         print(partial_data[0])
         print(full_data[22 + 1])
@@ -1296,7 +1255,6 @@ def test_vrt_read_29():
     # Just after opening, we shouldn't have read the source
     lst = gdaltest.get_opened_files()
     if lst.sort() != lst_before.sort():
-        gdaltest.post_reason('fail')
         print(lst)
         print(lst_before)
         return 'fail'
@@ -1305,14 +1263,12 @@ def test_vrt_read_29():
     ds.GetRasterBand(1).Checksum()
     lst = gdaltest.get_opened_files()
     if len(lst) != len(lst_before) + 1:
-        gdaltest.post_reason('fail')
         print(lst)
         print(lst_before)
         return 'fail'
     ds.GetRasterBand(2).Checksum()
     lst = gdaltest.get_opened_files()
     if len(lst) != len(lst_before) + 1:
-        gdaltest.post_reason('fail')
         print(lst)
         print(lst_before)
         return 'fail'
@@ -1324,7 +1280,6 @@ def test_vrt_read_29():
     ds2.GetRasterBand(1).Checksum()
     lst = gdaltest.get_opened_files()
     if len(lst) != len(lst_before) + 2:
-        gdaltest.post_reason('fail')
         print(lst)
         print(lst_before)
         return 'fail'
@@ -1379,14 +1334,12 @@ def test_vrt_read_31():
     data = ds.GetRasterBand(1).ReadRaster(0, 0, 2, 2, buf_type=gdal.GDT_Float32)
     got = struct.unpack('f' * 2 * 2, data)
     if got != (0, 1, 254, 255):
-        gdaltest.post_reason('fail')
         print(got)
         return 'fail'
 
     data = ds.ReadRaster(0, 0, 2, 2, buf_type=gdal.GDT_Float32)
     got = struct.unpack('f' * 2 * 2, data)
     if got != (0, 1, 254, 255):
-        gdaltest.post_reason('fail')
         print(got)
         return 'fail'
 
@@ -1445,7 +1398,6 @@ def test_vrt_subpixel_offset():
     ds = gdal.Open('data/vrt_subpixel_offset.vrt')
     cs = ds.GetRasterBand(1).Checksum()
     if cs != 4849:
-        gdaltest.post_reason('fail')
         print(cs)
         return 'fail'
 
@@ -1461,7 +1413,6 @@ def test_vrt_dstsize_larger_than_source():
     ds = gdal.Open('data/dstsize_larger_than_source.vrt')
     cs = ds.GetRasterBand(1).Checksum()
     if cs != 33273:
-        gdaltest.post_reason('fail')
         print(cs)
         return 'fail'
 
diff --git a/autotest/gcore/vrtmisc.py b/autotest/gcore/vrtmisc.py
index 84d2482f816b..bfe5cf9b37c0 100755
--- a/autotest/gcore/vrtmisc.py
+++ b/autotest/gcore/vrtmisc.py
@@ -270,15 +270,12 @@ def test_vrtmisc_10():
 
     ds = gdal.Open("/vsimem/vrtmisc_10.vrt", gdal.GA_Update)
     if ds.GetMetadata() != {'foo': 'bar'}:
-        gdaltest.post_reason('fail')
         print(ds.GetMetadata())
         return 'fail'
     if ds.GetMetadata('some_domain') != {'bar': 'baz'}:
-        gdaltest.post_reason('fail')
         print(ds.GetMetadata('some_domain'))
         return 'fail'
     if ds.GetMetadata_List('xml:a_xml_domain')[0] != '<some_xml />\n':
-        gdaltest.post_reason('fail')
         print(ds.GetMetadata_List('xml:a_xml_domain'))
         return 'fail'
     # Empty default domain
@@ -287,15 +284,12 @@ def test_vrtmisc_10():
 
     ds = gdal.Open("/vsimem/vrtmisc_10.vrt")
     if ds.GetMetadata() != {}:
-        gdaltest.post_reason('fail')
         print(ds.GetMetadata())
         return 'fail'
     if ds.GetMetadata('some_domain') != {'bar': 'baz'}:
-        gdaltest.post_reason('fail')
         print(ds.GetMetadata('some_domain'))
         return 'fail'
     if ds.GetMetadata_List('xml:a_xml_domain')[0] != '<some_xml />\n':
-        gdaltest.post_reason('fail')
         print(ds.GetMetadata_List('xml:a_xml_domain'))
         return 'fail'
     ds = None
@@ -336,7 +330,6 @@ def test_vrtmisc_11():
     gdal.Unlink("tmp/vrtmisc_11.vrt")
 
     if data.find('<SourceFilename relativeToVRT="1">../data/byte.tif</SourceFilename>') < 0:
-        gdaltest.post_reason('fail')
         return 'fail'
 
     return "success"
@@ -367,16 +360,13 @@ def test_vrtmisc_12():
 
     ds = gdal.Open("/vsimem/vrtmisc_12.vrt", gdal.GA_Update)
     if ds.GetRasterBand(1).GetNoDataValue() != 123:
-        gdaltest.post_reason('fail')
         return 'fail'
     if ds.GetRasterBand(1).DeleteNoDataValue() != 0:
-        gdaltest.post_reason('fail')
         return 'fail'
     ds = None
 
     ds = gdal.Open("/vsimem/vrtmisc_12.vrt")
     if ds.GetRasterBand(1).GetNoDataValue() is not None:
-        gdaltest.post_reason('fail')
         return 'fail'
     ds = None
 
@@ -393,7 +383,6 @@ def test_vrtmisc_13():
     ds = gdal.Open('data/oddsize1bit.tif')
     out_ds = gdal.GetDriverByName('VRT').CreateCopy('', ds)
     if out_ds.GetRasterBand(1).GetMetadataItem('NBITS', 'IMAGE_STRUCTURE') != '1':
-        gdaltest.post_reason('fail')
         return 'fail'
 
     return "success"
@@ -416,7 +405,6 @@ def test_vrtmisc_14():
 
     if content.find('<SrcRect xOff="0" yOff="0" xSize="123456789" ySize="1"') < 0 or \
        content.find('<DstRect xOff="0" yOff="0" xSize="123456789" ySize="1"') < 0:
-        gdaltest.post_reason('fail')
         print(content)
         return 'fail'
 
@@ -432,7 +420,6 @@ def test_vrtmisc_14():
 
     if content.find('<SrcRect xOff="0" yOff="0" xSize="1" ySize="123456789"') < 0 or \
        content.find('<DstRect xOff="0" yOff="0" xSize="1" ySize="123456789"') < 0:
-        gdaltest.post_reason('fail')
         print(content)
         return 'fail'
 
@@ -447,7 +434,6 @@ def test_vrtmisc_15():
     ds = gdal.GetDriverByName('GTiff').Create('/vsimem/vrtmisc_15.tif', 1, 1, options=['PIXELTYPE=SIGNEDBYTE'])
     out_ds = gdal.GetDriverByName('VRT').CreateCopy('', ds)
     if out_ds.GetRasterBand(1).GetMetadataItem('PIXELTYPE', 'IMAGE_STRUCTURE') != 'SIGNEDBYTE':
-        gdaltest.post_reason('fail')
         return 'fail'
     ds = None
     gdal.Unlink('/vsimem/vrtmisc_15.tif')
@@ -466,19 +452,15 @@ def test_vrtmisc_16():
     gdal.VSIFCloseL(fp)
 
     if content.find('<SrcRect xOff="0" yOff="0" xSize="952" ySize="1189"') < 0:
-        gdaltest.post_reason('fail')
         print(content)
         return 'fail'
     if content.find('<DstRect xOff="0" yOff="0" xSize="952" ySize="1189"') < 0:
-        gdaltest.post_reason('fail')
         print(content)
         return 'fail'
     if content.find('<SrcRect xOff="0" yOff="0" xSize="494" ySize="893"') < 0:
-        gdaltest.post_reason('fail')
         print(content)
         return 'fail'
     if content.find('<DstRect xOff="1680" yOff="5922" xSize="494" ySize="893"') < 0:
-        gdaltest.post_reason('fail')
         print(content)
         return 'fail'
 
@@ -486,7 +468,6 @@ def test_vrtmisc_16():
     ds = gdal.Open('/vsimem/vrtmisc_16.tif')
     cs = ds.GetRasterBand(1).Checksum()
     if cs != 206:
-        gdaltest.post_reason('fail')
         print(cs)
         return 'fail'
     gdal.Unlink('/vsimem/vrtmisc_16.tif')
@@ -517,7 +498,6 @@ def test_vrtmisc_16():
     ds = gdal.Open('/vsimem/vrtmisc_16.tif')
     cs = ds.GetRasterBand(1).Checksum()
     if cs != 206:
-        gdaltest.post_reason('fail')
         print(cs)
         return 'fail'
     gdal.Unlink('/vsimem/vrtmisc_16.tif')
@@ -553,13 +533,11 @@ def test_vrtmisc_18():
     vrt_ds = gdal.GetDriverByName('VRT').CreateCopy('', ds)
     xml_vrt = vrt_ds.GetMetadata('xml:VRT')[0]
     if gdal.GetLastErrorMsg() != '':
-        gdaltest.post_reason('fail')
         return 'fail'
     vrt_ds = None
 
     if xml_vrt.find('<SourceFilename relativeToVRT="1">data/byte.tif</SourceFilename>') < 0 and \
        xml_vrt.find('<SourceFilename relativeToVRT="1">data\\byte.tif</SourceFilename>') < 0:
-        gdaltest.post_reason('fail')
         print(xml_vrt)
         return 'fail'
 
@@ -580,12 +558,10 @@ def test_vrtmisc_rat():
 
     xml_vrt = vrt_ds.GetMetadata('xml:VRT')[0]
     if gdal.GetLastErrorMsg() != '':
-        gdaltest.post_reason('fail')
         return 'fail'
     vrt_ds = None
 
     if xml_vrt.find('<GDALRasterAttributeTable tableType="thematic">') < 0:
-        gdaltest.post_reason('fail')
         print(xml_vrt)
         return 'fail'
 
@@ -593,12 +569,10 @@ def test_vrtmisc_rat():
 
     xml_vrt = vrt_ds.GetMetadata('xml:VRT')[0]
     if gdal.GetLastErrorMsg() != '':
-        gdaltest.post_reason('fail')
         return 'fail'
     vrt_ds = None
 
     if xml_vrt.find('<GDALRasterAttributeTable tableType="thematic">') < 0:
-        gdaltest.post_reason('fail')
         print(xml_vrt)
         return 'fail'
 
@@ -607,11 +581,9 @@ def test_vrtmisc_rat():
     vrt_ds = gdal.Open('/vsimem/vrtmisc_rat.vrt', gdal.GA_Update)
     rat = vrt_ds.GetRasterBand(1).GetDefaultRAT()
     if rat is None or rat.GetColumnCount() != 1:
-        gdaltest.post_reason('fail')
         return 'fail'
     vrt_ds.GetRasterBand(1).SetDefaultRAT(None)
     if vrt_ds.GetRasterBand(1).GetDefaultRAT() is not None:
-        gdaltest.post_reason('fail')
         return 'fail'
     vrt_ds = None
 
@@ -633,11 +605,9 @@ def test_vrtmisc_colortable():
     ct.SetColorEntry(0, (255, 255, 255, 255))
     ds.GetRasterBand(1).SetColorTable(ct)
     if ds.GetRasterBand(1).GetColorTable().GetCount() != 1:
-        gdaltest.post_reason('fail')
         return 'fail'
     ds.GetRasterBand(1).SetColorTable(None)
     if ds.GetRasterBand(1).GetColorTable() is not None:
-        gdaltest.post_reason('fail')
         return 'fail'
 
     return 'success'
diff --git a/autotest/gcore/vsiaz.py b/autotest/gcore/vsiaz.py
index 96a2cc3064ff..e95bcb7af677 100755
--- a/autotest/gcore/vsiaz.py
+++ b/autotest/gcore/vsiaz.py
@@ -56,7 +56,6 @@ def test_vsiaz_init():
             gdal.SetConfigOption(var, "")
 
     if gdal.GetSignedURL('/vsiaz/foo/bar') is not None:
-        gdaltest.post_reason('fail')
         return 'fail'
 
     return 'success'
@@ -75,7 +74,6 @@ def test_vsiaz_real_server_errors():
     with gdaltest.error_handler():
         f = open_for_read('/vsiaz/foo/bar')
     if f is not None or gdal.VSIGetLastErrorMsg().find('AZURE_STORAGE_ACCOUNT') < 0:
-        gdaltest.post_reason('fail')
         print(gdal.VSIGetLastErrorMsg())
         return 'fail'
 
@@ -83,7 +81,6 @@ def test_vsiaz_real_server_errors():
     with gdaltest.error_handler():
         f = open_for_read('/vsiaz_streaming/foo/bar')
     if f is not None or gdal.VSIGetLastErrorMsg().find('AZURE_STORAGE_ACCOUNT') < 0:
-        gdaltest.post_reason('fail')
         print(gdal.VSIGetLastErrorMsg())
         return 'fail'
 
@@ -93,7 +90,6 @@ def test_vsiaz_real_server_errors():
     with gdaltest.error_handler():
         f = open_for_read('/vsiaz/foo/bar')
     if f is not None:
-        gdaltest.post_reason('fail')
         return 'fail'
     gdal.SetConfigOption('AZURE_STORAGE_CONNECTION_STRING', '')
 
@@ -104,7 +100,6 @@ def test_vsiaz_real_server_errors():
     with gdaltest.error_handler():
         f = open_for_read('/vsiaz/foo/bar')
     if f is not None or gdal.VSIGetLastErrorMsg().find('AZURE_STORAGE_ACCESS_KEY') < 0:
-        gdaltest.post_reason('fail')
         print(gdal.VSIGetLastErrorMsg())
         return 'fail'
 
@@ -118,7 +113,6 @@ def test_vsiaz_real_server_errors():
             gdal.VSIFCloseL(f)
         if gdal.GetConfigOption('APPVEYOR') is not None:
             return 'success'
-        gdaltest.post_reason('fail')
         print(gdal.VSIGetLastErrorMsg())
         return 'fail'
 
@@ -126,7 +120,6 @@ def test_vsiaz_real_server_errors():
     with gdaltest.error_handler():
         f = open_for_read('/vsiaz_streaming/foo/bar.baz')
     if f is not None:
-        gdaltest.post_reason('fail')
         print(gdal.VSIGetLastErrorMsg())
         return 'fail'
 
@@ -167,7 +160,6 @@ def test_vsiaz_fake_basic():
     signed_url = gdal.GetSignedURL('/vsiaz/az_fake_bucket/resource', ['START_DATE=20180213T123456'])
     if signed_url not in ('http://127.0.0.1:8080/azure/blob/myaccount/az_fake_bucket/resource?se=2018-02-13T13%3A34%3A56Z&sig=9Jc4yBFlSRZSSxf059OohN6pYRrjuHWJWSEuryczN%2FM%3D&sp=r&sr=c&st=2018-02-13T12%3A34%3A56Z&sv=2012-02-12',
                           'http://127.0.0.1:8081/azure/blob/myaccount/az_fake_bucket/resource?se=2018-02-13T13%3A34%3A56Z&sig=9Jc4yBFlSRZSSxf059OohN6pYRrjuHWJWSEuryczN%2FM%3D&sp=r&sr=c&st=2018-02-13T12%3A34%3A56Z&sv=2012-02-12'):
-        gdaltest.post_reason('fail')
         print(signed_url)
         return 'fail'
 
@@ -193,13 +185,11 @@ def method(request):
     with webserver.install_http_handler(handler):
         f = open_for_read('/vsiaz/az_fake_bucket/resource')
         if f is None:
-            gdaltest.post_reason('fail')
             return 'fail'
         data = gdal.VSIFReadL(1, 4, f).decode('ascii')
         gdal.VSIFCloseL(f)
 
     if data != 'foo':
-        gdaltest.post_reason('fail')
         print(data)
         return 'fail'
 
@@ -226,13 +216,11 @@ def method(request):
     with webserver.install_http_handler(handler):
         f = open_for_read('/vsiaz_streaming/az_fake_bucket/resource')
         if f is None:
-            gdaltest.post_reason('fail')
             return 'fail'
         data = gdal.VSIFReadL(1, 4, f).decode('ascii')
         gdal.VSIFCloseL(f)
 
         if data != 'foo':
-            gdaltest.post_reason('fail')
             print(data)
             return 'fail'
 
@@ -242,7 +230,6 @@ def method(request):
     with webserver.install_http_handler(handler):
         stat_res = gdal.VSIStatL('/vsiaz/az_fake_bucket/resource2.bin')
         if stat_res is None or stat_res.size != 1000000:
-            gdaltest.post_reason('fail')
             if stat_res is not None:
                 print(stat_res.size)
             else:
@@ -255,7 +242,6 @@ def method(request):
     with webserver.install_http_handler(handler):
         stat_res = gdal.VSIStatL('/vsiaz_streaming/az_fake_bucket/resource2.bin')
         if stat_res is None or stat_res.size != 1000000:
-            gdaltest.post_reason('fail')
             if stat_res is not None:
                 print(stat_res.size)
             else:
@@ -319,27 +305,22 @@ def test_vsiaz_fake_readdir():
             print('Skipped on trusty branch, but should be investigated')
             return 'skip'
 
-        gdaltest.post_reason('fail')
         return 'fail'
     gdal.VSIFCloseL(f)
 
     dir_contents = gdal.ReadDir('/vsiaz/az_fake_bucket2/a_dir')
     if dir_contents != ['resource3.bin', 'resource4.bin', 'subdir']:
-        gdaltest.post_reason('fail')
         print(dir_contents)
         return 'fail'
     if gdal.VSIStatL('/vsiaz/az_fake_bucket2/a_dir/resource3.bin').size != 123456:
-        gdaltest.post_reason('fail')
         print(gdal.VSIStatL('/vsiaz/az_fake_bucket2/a_dir/resource3.bin').size)
         return 'fail'
     if gdal.VSIStatL('/vsiaz/az_fake_bucket2/a_dir/resource3.bin').mtime != 1:
-        gdaltest.post_reason('fail')
         return 'fail'
 
     # ReadDir on something known to be a file shouldn't cause network access
     dir_contents = gdal.ReadDir('/vsiaz/az_fake_bucket2/a_dir/resource3.bin')
     if dir_contents is not None:
-        gdaltest.post_reason('fail')
         return 'fail'
 
     # Test error on ReadDir()
@@ -348,7 +329,6 @@ def test_vsiaz_fake_readdir():
     with webserver.install_http_handler(handler):
         dir_contents = gdal.ReadDir('/vsiaz/az_fake_bucket2/error_test/')
     if dir_contents is not None:
-        gdaltest.post_reason('fail')
         print(dir_contents)
         return 'fail'
 
@@ -363,7 +343,6 @@ def test_vsiaz_fake_readdir():
     with webserver.install_http_handler(handler):
         dir_contents = gdal.ReadDir('/vsiaz/')
     if dir_contents != ['.']:
-        gdaltest.post_reason('fail')
         print(dir_contents)
         return 'fail'
 
@@ -395,7 +374,6 @@ def test_vsiaz_fake_readdir():
     with webserver.install_http_handler(handler):
         dir_contents = gdal.ReadDir('/vsiaz/')
     if dir_contents != ['mycontainer1', 'mycontainer2']:
-        gdaltest.post_reason('fail')
         print(dir_contents)
         return 'fail'
 
@@ -415,7 +393,6 @@ def test_vsiaz_fake_write():
     # Test creation of BlockBob
     f = gdal.VSIFOpenL('/vsiaz/test_copy/file.bin', 'wb')
     if f is None:
-        gdaltest.post_reason('fail')
         return 'fail'
 
     handler = webserver.SequentialHandler()
@@ -450,7 +427,6 @@ def method(request):
         ret = gdal.VSIFWriteL('x' * 35000, 1, 35000, f)
         ret += gdal.VSIFWriteL('x' * 5000, 1, 5000, f)
         if ret != 40000:
-            gdaltest.post_reason('fail')
             print(ret)
             gdal.VSIFCloseL(f)
             return 'fail'
@@ -459,12 +435,10 @@ def method(request):
     # Simulate illegal read
     f = gdal.VSIFOpenL('/vsiaz/test_copy/file.bin', 'wb')
     if f is None:
-        gdaltest.post_reason('fail')
         return 'fail'
     with gdaltest.error_handler():
         ret = gdal.VSIFReadL(1, 1, f)
     if ret:
-        gdaltest.post_reason('fail')
         print(ret)
         return 'fail'
     gdal.VSIFCloseL(f)
@@ -472,19 +446,16 @@ def method(request):
     # Simulate illegal seek
     f = gdal.VSIFOpenL('/vsiaz/test_copy/file.bin', 'wb')
     if f is None:
-        gdaltest.post_reason('fail')
         return 'fail'
     with gdaltest.error_handler():
         ret = gdal.VSIFSeekL(f, 1, 0)
     if ret == 0:
-        gdaltest.post_reason('fail')
         return 'fail'
     gdal.VSIFCloseL(f)
 
     # Simulate failure when putting BlockBob
     f = gdal.VSIFOpenL('/vsiaz/test_copy/file.bin', 'wb')
     if f is None:
-        gdaltest.post_reason('fail')
         return 'fail'
 
     handler = webserver.SequentialHandler()
@@ -498,33 +469,27 @@ def method(request):
     handler.add('PUT', '/azure/blob/myaccount/test_copy/file.bin', custom_method=method)
 
     if gdal.VSIFSeekL(f, 0, 0) != 0:
-        gdaltest.post_reason('fail')
         gdal.VSIFCloseL(f)
         return 'fail'
 
     gdal.VSIFWriteL('x' * 35000, 1, 35000, f)
 
     if gdal.VSIFTellL(f) != 35000:
-        gdaltest.post_reason('fail')
         gdal.VSIFCloseL(f)
         return 'fail'
 
     if gdal.VSIFSeekL(f, 35000, 0) != 0:
-        gdaltest.post_reason('fail')
         gdal.VSIFCloseL(f)
         return 'fail'
 
     if gdal.VSIFSeekL(f, 0, 1) != 0:
-        gdaltest.post_reason('fail')
         gdal.VSIFCloseL(f)
         return 'fail'
     if gdal.VSIFSeekL(f, 0, 2) != 0:
-        gdaltest.post_reason('fail')
         gdal.VSIFCloseL(f)
         return 'fail'
 
     if gdal.VSIFEofL(f) != 0:
-        gdaltest.post_reason('fail')
         gdal.VSIFCloseL(f)
         return 'fail'
 
@@ -532,7 +497,6 @@ def method(request):
         with gdaltest.error_handler():
             ret = gdal.VSIFCloseL(f)
         if ret == 0:
-            gdaltest.post_reason('fail')
             print(ret)
             gdal.VSIFCloseL(f)
             return 'fail'
@@ -540,7 +504,6 @@ def method(request):
     # Simulate creation of BlockBob over an existing blob of incompatible type
     f = gdal.VSIFOpenL('/vsiaz/test_copy/file.bin', 'wb')
     if f is None:
-        gdaltest.post_reason('fail')
         return 'fail'
 
     handler = webserver.SequentialHandler()
@@ -555,7 +518,6 @@ def method(request):
     f = gdal.VSIFOpenL('/vsiaz/test_copy/file.bin', 'wb')
     gdal.SetConfigOption('VSIAZ_CHUNK_SIZE_BYTES', None)
     if f is None:
-        gdaltest.post_reason('fail')
         return 'fail'
 
     handler = webserver.SequentialHandler()
@@ -627,7 +589,6 @@ def method(request):
     with webserver.install_http_handler(handler):
         ret = gdal.VSIFWriteL('0123456789abcdef', 1, 16, f)
         if ret != 16:
-            gdaltest.post_reason('fail')
             print(ret)
             gdal.VSIFCloseL(f)
             return 'fail'
@@ -638,7 +599,6 @@ def method(request):
     f = gdal.VSIFOpenL('/vsiaz/test_copy/file.bin', 'wb')
     gdal.SetConfigOption('VSIAZ_CHUNK_SIZE_BYTES', None)
     if f is None:
-        gdaltest.post_reason('fail')
         return 'fail'
 
     handler = webserver.SequentialHandler()
@@ -655,7 +615,6 @@ def method(request):
         with gdaltest.error_handler():
             ret = gdal.VSIFWriteL('0123456789abcdef', 1, 16, f)
         if ret != 0:
-            gdaltest.post_reason('fail')
             print(ret)
             gdal.VSIFCloseL(f)
             return 'fail'
@@ -666,7 +625,6 @@ def method(request):
     f = gdal.VSIFOpenL('/vsiaz/test_copy/file.bin', 'wb')
     gdal.SetConfigOption('VSIAZ_CHUNK_SIZE_BYTES', None)
     if f is None:
-        gdaltest.post_reason('fail')
         return 'fail'
 
     handler = webserver.SequentialHandler()
@@ -676,7 +634,6 @@ def method(request):
         with gdaltest.error_handler():
             ret = gdal.VSIFWriteL('0123456789abcdef', 1, 16, f)
         if ret != 0:
-            gdaltest.post_reason('fail')
             print(ret)
             gdal.VSIFCloseL(f)
             return 'fail'
@@ -700,7 +657,6 @@ def test_vsiaz_fake_unlink():
     with webserver.install_http_handler(handler):
         ret = gdal.Unlink('/vsiaz/az_bucket_test_unlink/myfile')
     if ret != 0:
-        gdaltest.post_reason('fail')
         return 'fail'
 
     # Failure
@@ -711,7 +667,6 @@ def test_vsiaz_fake_unlink():
         with gdaltest.error_handler():
             ret = gdal.Unlink('/vsiaz/az_bucket_test_unlink/myfile')
     if ret != -1:
-        gdaltest.post_reason('fail')
         return 'fail'
 
     return 'success'
@@ -728,7 +683,6 @@ def test_vsiaz_fake_mkdir_rmdir():
     # Invalid name
     ret = gdal.Mkdir('/vsiaz', 0)
     if ret == 0:
-        gdaltest.post_reason('fail')
         return 'fail'
 
     handler = webserver.SequentialHandler()
@@ -738,7 +692,6 @@ def test_vsiaz_fake_mkdir_rmdir():
     with webserver.install_http_handler(handler):
         ret = gdal.Mkdir('/vsiaz/az_bucket_test_mkdir/dir', 0)
     if ret != 0:
-        gdaltest.post_reason('fail')
         return 'fail'
 
     # Try creating already existing directory
@@ -760,13 +713,11 @@ def test_vsiaz_fake_mkdir_rmdir():
     with webserver.install_http_handler(handler):
         ret = gdal.Mkdir('/vsiaz/az_bucket_test_mkdir/dir', 0)
     if ret == 0:
-        gdaltest.post_reason('fail')
         return 'fail'
 
     # Invalid name
     ret = gdal.Rmdir('/vsiaz')
     if ret == 0:
-        gdaltest.post_reason('fail')
         return 'fail'
 
     # Not a directory
@@ -783,7 +734,6 @@ def test_vsiaz_fake_mkdir_rmdir():
     with webserver.install_http_handler(handler):
         ret = gdal.Rmdir('/vsiaz/az_bucket_test_mkdir/it_is_a_file')
     if ret == 0:
-        gdaltest.post_reason('fail')
         return 'fail'
 
     # Valid
@@ -805,7 +755,6 @@ def test_vsiaz_fake_mkdir_rmdir():
     with webserver.install_http_handler(handler):
         ret = gdal.Rmdir('/vsiaz/az_bucket_test_mkdir/dir')
     if ret != 0:
-        gdaltest.post_reason('fail')
         return 'fail'
 
     # Try deleting already deleted directory
@@ -815,7 +764,6 @@ def test_vsiaz_fake_mkdir_rmdir():
     with webserver.install_http_handler(handler):
         ret = gdal.Rmdir('/vsiaz/az_bucket_test_mkdir/dir')
     if ret == 0:
-        gdaltest.post_reason('fail')
         return 'fail'
 
     # Try deleting non-empty directory
@@ -850,7 +798,6 @@ def test_vsiaz_fake_mkdir_rmdir():
     with webserver.install_http_handler(handler):
         ret = gdal.Rmdir('/vsiaz/az_bucket_test_mkdir/dir_nonempty')
     if ret == 0:
-        gdaltest.post_reason('fail')
         return 'fail'
 
     return 'success'
@@ -868,7 +815,6 @@ def test_vsiaz_fake_test_BlobEndpointInConnectionString():
 
     signed_url = gdal.GetSignedURL('/vsiaz/az_fake_bucket/resource')
     if signed_url.find('http://127.0.0.1:%d/myaccount/az_fake_bucket/resource' % gdaltest.webserver_port) < 0:
-        gdaltest.post_reason('fail')
         print(signed_url)
         return 'fail'
 
@@ -909,20 +855,17 @@ def vsiaz_extra_1():
         path = '/vsiaz/' + az_resource
         statres = gdal.VSIStatL(path)
         if statres is None or not stat.S_ISDIR(statres.mode):
-            gdaltest.post_reason('fail')
             print('%s is not a valid bucket' % path)
             return 'fail'
 
         readdir = gdal.ReadDir(path)
         if readdir is None:
-            gdaltest.post_reason('fail')
             print('ReadDir() should not return empty list')
             return 'fail'
         for filename in readdir:
             if filename != '.':
                 subpath = path + '/' + filename
                 if gdal.VSIStatL(subpath) is None:
-                    gdaltest.post_reason('fail')
                     print('Stat(%s) should not return an error' % subpath)
                     return 'fail'
 
@@ -930,81 +873,68 @@ def vsiaz_extra_1():
         subpath = path + '/' + unique_id
         ret = gdal.Mkdir(subpath, 0)
         if ret < 0:
-            gdaltest.post_reason('fail')
             print('Mkdir(%s) should not return an error' % subpath)
             return 'fail'
 
         readdir = gdal.ReadDir(path)
         if unique_id not in readdir:
-            gdaltest.post_reason('fail')
             print('ReadDir(%s) should contain %s' % (path, unique_id))
             print(readdir)
             return 'fail'
 
         ret = gdal.Mkdir(subpath, 0)
         if ret == 0:
-            gdaltest.post_reason('fail')
             print('Mkdir(%s) repeated should return an error' % subpath)
             return 'fail'
 
         ret = gdal.Rmdir(subpath)
         if ret < 0:
-            gdaltest.post_reason('fail')
             print('Rmdir(%s) should not return an error' % subpath)
             return 'fail'
 
         readdir = gdal.ReadDir(path)
         if unique_id in readdir:
-            gdaltest.post_reason('fail')
             print('ReadDir(%s) should not contain %s' % (path, unique_id))
             print(readdir)
             return 'fail'
 
         ret = gdal.Rmdir(subpath)
         if ret == 0:
-            gdaltest.post_reason('fail')
             print('Rmdir(%s) repeated should return an error' % subpath)
             return 'fail'
 
         ret = gdal.Mkdir(subpath, 0)
         if ret < 0:
-            gdaltest.post_reason('fail')
             print('Mkdir(%s) should not return an error' % subpath)
             return 'fail'
 
         f = gdal.VSIFOpenL(subpath + '/test.txt', 'wb')
         if f is None:
-            gdaltest.post_reason('fail')
             return 'fail'
         gdal.VSIFWriteL('hello', 1, 5, f)
         gdal.VSIFCloseL(f)
 
         ret = gdal.Rmdir(subpath)
         if ret == 0:
-            gdaltest.post_reason('fail')
             print('Rmdir(%s) on non empty directory should return an error' % subpath)
             return 'fail'
 
         f = gdal.VSIFOpenL(subpath + '/test.txt', 'rb')
         if f is None:
-            gdaltest.post_reason('fail')
             return 'fail'
         data = gdal.VSIFReadL(1, 5, f).decode('utf-8')
         if data != 'hello':
-            gdaltest.post_reason('fail')
             print(data)
             return 'fail'
         gdal.VSIFCloseL(f)
 
         ret = gdal.Unlink(subpath + '/test.txt')
         if ret < 0:
-            gdaltest.post_reason('fail')
             print('Unlink(%s) should not return an error' % (subpath + '/test.txt'))
             return 'fail'
 
         ret = gdal.Rmdir(subpath)
         if ret < 0:
-            gdaltest.post_reason('fail')
             print('Rmdir(%s) should not return an error' % subpath)
             return 'fail'
 
@@ -1012,26 +942,22 @@ def vsiaz_extra_1():
 
     f = open_for_read('/vsiaz/' + az_resource)
     if f is None:
-        gdaltest.post_reason('fail')
         return 'fail'
     ret = gdal.VSIFReadL(1, 1, f)
     gdal.VSIFCloseL(f)
 
     if len(ret) != 1:
-        gdaltest.post_reason('fail')
         print(ret)
         return 'fail'
 
     # Same with /vsiaz_streaming/
     f = open_for_read('/vsiaz_streaming/' + az_resource)
     if f is None:
-        gdaltest.post_reason('fail')
         return 'fail'
     ret = gdal.VSIFReadL(1, 1, f)
     gdal.VSIFCloseL(f)
 
     if len(ret) != 1:
-        gdaltest.post_reason('fail')
         print(ret)
         return 'fail'
 
@@ -1044,7 +970,6 @@ def vsiaz_extra_1():
             gdal.VSIFReadL(1, 1, f)
         gdal.VSIFCloseL(f)
         if gdal.VSIGetLastErrorMsg() == '':
-            gdaltest.post_reason('fail')
             print(gdal.VSIGetLastErrorMsg())
             return 'fail'
 
@@ -1052,7 +977,6 @@ def vsiaz_extra_1():
     gdal.ErrorReset()
     f = open_for_read('/vsiaz_streaming/' + az_resource + '/invalid_resource.baz')
     if f is not None:
-        gdaltest.post_reason('fail')
         print(gdal.VSIGetLastErrorMsg())
         return 'fail'
 
@@ -1060,13 +984,11 @@ def vsiaz_extra_1():
     signed_url = gdal.GetSignedURL('/vsiaz/' + az_resource)
     f = open_for_read('/vsicurl_streaming/' + signed_url)
     if f is None:
-        gdaltest.post_reason('fail')
         return 'fail'
     ret = gdal.VSIFReadL(1, 1, f)
     gdal.VSIFCloseL(f)
 
     if len(ret) != 1:
-        gdaltest.post_reason('fail')
         print(ret)
         return 'fail'
 
diff --git a/autotest/gcore/vsicrypt.py b/autotest/gcore/vsicrypt.py
index efe79b9e9c75..b48c63ef42e6 100755
--- a/autotest/gcore/vsicrypt.py
+++ b/autotest/gcore/vsicrypt.py
@@ -66,42 +66,36 @@ def test_vsicrypt_2():
     with gdaltest.error_handler():
         fp = gdal.VSIFOpenL('/vsicrypt//vsimem/file.bin', 'wb+')
     if fp is not None:
-        gdaltest.post_reason('fail')
         return 'fail'
 
     # Invalid file
     with gdaltest.error_handler():
         fp = gdal.VSIFOpenL('/vsicrypt/key=DONT_USE_IN_PROD,file=/not_existing/not_existing', 'wb')
     if fp is not None:
-        gdaltest.post_reason('fail')
         return 'fail'
 
     # Invalid file
     with gdaltest.error_handler():
         fp = gdal.VSIFOpenL('/vsicrypt/key=DONT_USE_IN_PROD,file=/not_existing/not_existing', 'rb')
     if fp is not None:
-        gdaltest.post_reason('fail')
         return 'fail'
 
     # Invalid file
     with gdaltest.error_handler():
         fp = gdal.VSIFOpenL('/vsicrypt/key=DONT_USE_IN_PROD,file=/not_existing/not_existing', 'ab')
     if fp is not None:
-        gdaltest.post_reason('fail')
         return 'fail'
 
     # Invalid access
     with gdaltest.error_handler():
         fp = gdal.VSIFOpenL('/vsicrypt/key=DONT_USE_IN_PROD,file=/not_existing/not_existing', 'foo')
     if fp is not None:
-        gdaltest.post_reason('fail')
         return 'fail'
 
     # Key to short
     with gdaltest.error_handler():
         fp = gdal.VSIFOpenL('/vsicrypt/key=a,file=/vsimem/file.bin', 'wb+')
     if fp is not None:
-        gdaltest.post_reason('fail')
         return 'fail'
 
     # Invalid signature
@@ -109,7 +103,6 @@ def test_vsicrypt_2():
     with gdaltest.error_handler():
         fp = gdal.VSIFOpenL('/vsicrypt/key=DONT_USE_IN_PROD,file=/vsimem/file.bin', 'rb')
     if fp is not None:
-        gdaltest.post_reason('fail')
         return 'fail'
 
     # Generate empty file
@@ -118,7 +111,6 @@ def test_vsicrypt_2():
 
     fp = gdal.VSIFOpenL('/vsicrypt/key=DONT_USE_IN_PROD,file=/vsimem/file.bin', 'rb')
     if fp is None:
-        gdaltest.post_reason('fail')
         return 'fail'
     gdal.VSIFCloseL(fp)
 
@@ -127,7 +119,6 @@ def test_vsicrypt_2():
     gdal.VSIFCloseL(fp)
 
     if len(header) != 46:
-        gdaltest.post_reason('fail')
         print(len(header))
         return 'fail'
 
@@ -140,7 +131,6 @@ def test_vsicrypt_2():
         with gdaltest.error_handler():
             fp = gdal.VSIFOpenL('/vsicrypt/key=DONT_USE_IN_PROD,file=/vsimem/file.bin', 'rb')
         if fp is not None:
-            gdaltest.post_reason('fail')
             return 'fail'
 
     # Test corrupting all bytes of header
@@ -193,7 +183,6 @@ def test_vsicrypt_2():
         fp = gdal.VSIFOpenL(
             '/vsicrypt/key=DONT_USE_IN_PROD,file=/vsimem/file.bin', 'rb')
     if fp is not None:
-        gdaltest.post_reason('fail')
         return 'fail'
 
     # Inconsistent initial vector with key check.
@@ -220,7 +209,6 @@ def test_vsicrypt_2():
     with gdaltest.error_handler():
         fp = gdal.VSIFOpenL('/vsicrypt/key=DONT_USE_IN_PROD,file=/vsimem/file.bin', 'rb')
     if fp is not None:
-        gdaltest.post_reason('fail')
         return 'fail'
 
     # Test reading with wrong key
@@ -233,13 +221,11 @@ def test_vsicrypt_2():
     gdal.VSIFCloseL(fp)
 
     if content == 'hello':
-        gdaltest.post_reason('fail')
         return 'fail'
 
     with gdaltest.error_handler():
         fp = gdal.VSIFOpenL('/vsicrypt/key=short_key,file=/vsimem/file.bin', 'ab')
     if fp is not None:
-        gdaltest.post_reason('fail')
         return 'fail'
 
     # Test reading with wrong key with add_key_check
@@ -250,19 +236,16 @@ def test_vsicrypt_2():
     with gdaltest.error_handler():
         fp = gdal.VSIFOpenL('/vsicrypt/key=dont_use_in_prod,file=/vsimem/file.bin', 'rb')
     if fp is not None:
-        gdaltest.post_reason('fail')
         return 'fail'
 
     with gdaltest.error_handler():
         fp = gdal.VSIFOpenL('/vsicrypt/key=short_key,file=/vsimem/file.bin', 'ab')
     if fp is not None:
-        gdaltest.post_reason('fail')
         return 'fail'
 
     with gdaltest.error_handler():
         fp = gdal.VSIFOpenL('/vsicrypt/key=dont_use_in_prod,file=/vsimem/file.bin', 'ab')
     if fp is not None:
-        gdaltest.post_reason('fail')
         return 'fail'
 
     # Test creating with potentially not build-in alg:
@@ -275,14 +258,12 @@ def test_vsicrypt_2():
     with gdaltest.error_handler():
         fp = gdal.VSIFOpenL('/vsicrypt/key=DONT_USE_IN_PROD,sector_size=1,file=/vsimem/file.bin', 'wb')
     if fp is not None:
-        gdaltest.post_reason('fail')
         return 'fail'
 
     # Sector size (16) should be at least twice larger than the block size (16) in CBC_CTS
     with gdaltest.error_handler():
         fp = gdal.VSIFOpenL('/vsicrypt/key=DONT_USE_IN_PROD,sector_size=16,mode=CBC_CTS,file=/vsimem/file.bin', 'wb')
     if fp is not None:
-        gdaltest.post_reason('fail')
         return 'fail'
 
     gdal.Unlink('/vsimem/file.bin')
@@ -311,7 +292,6 @@ def test_vsicrypt_3():
         else:
             fp = gdal.VSIFOpenL('/vsicrypt/key=DONT_USE_IN_PRODDONT_USE_IN_PROD,%s,file=/vsimem/file.bin' % options, 'wb')
         if fp is None:
-            gdaltest.post_reason('fail')
             print(options)
             return 'fail'
         gdal.VSIFWriteL('hello', 1, 5, fp)
@@ -322,7 +302,6 @@ def test_vsicrypt_3():
         gdal.VSIFCloseL(fp)
 
         if content != 'hello':
-            gdaltest.post_reason('fail')
             print(options)
             return 'fail'
 
@@ -342,7 +321,6 @@ def test_vsicrypt_3():
             gdal.VSIFCloseL(fp)
 
             if content != 'hello':
-                gdaltest.post_reason('fail')
                 print(options)
                 return 'fail'
 
@@ -356,7 +334,6 @@ def test_vsicrypt_3():
     # Get the generated random key
     key_b64 = gdal.GetConfigOption('VSICRYPT_KEY_B64')
     if key_b64 is None:
-        gdaltest.post_reason('fail')
         return 'fail'
 
     gdal.VSIFWriteL('hello', 1, 5, fp)
@@ -367,7 +344,6 @@ def test_vsicrypt_3():
     gdal.VSIFCloseL(fp)
 
     if content != 'hello':
-        gdaltest.post_reason('fail')
         print(options)
         return 'fail'
 
@@ -378,31 +354,26 @@ def test_vsicrypt_3():
     gdal.VSIFCloseL(fp)
 
     if content != 'hello':
-        gdaltest.post_reason('fail')
         print(options)
         return 'fail'
 
     with gdaltest.error_handler():
         statRes = gdal.VSIStatL('/vsicrypt//vsimem/file.bin')
     if statRes is not None:
-        gdaltest.post_reason('fail')
         return 'fail'
 
     ret = gdal.Rename('/vsicrypt//vsimem/file.bin', '/vsicrypt//vsimem/subdir_crypt/file.bin')
     if ret != 0:
-        gdaltest.post_reason('fail')
         print(ret)
         return 'fail'
 
     ret = gdal.Rename('/vsicrypt//vsimem/subdir_crypt/file.bin', '/vsimem/subdir_crypt/file2.bin')
     if ret != 0:
-        gdaltest.post_reason('fail')
         print(ret)
         return 'fail'
 
     dir_content = gdal.ReadDir('/vsicrypt//vsimem/subdir_crypt')
     if dir_content != ['file2.bin']:
-        gdaltest.post_reason('fail')
         print(dir_content)
         return 'fail'
 
@@ -504,7 +475,6 @@ def test_vsicrypt_5():
     content = struct.unpack('B' * len(content), content)
     gdal.VSIFCloseL(f)
     if content != (97, 98, 0, 100):
-        gdaltest.post_reason('fail')
         print(content)
         return 'fail'
 
@@ -519,7 +489,6 @@ def test_vsicrypt_5():
     content = struct.unpack('B' * len(content), content)
     gdal.VSIFCloseL(f)
     if content != (97, 98, 0, 100, 0, 102):
-        gdaltest.post_reason('fail')
         print(content)
         return 'fail'
 
@@ -536,7 +505,6 @@ def test_vsicrypt_5():
     content = struct.unpack('B' * len(content), content)
     gdal.VSIFCloseL(f)
     if content != (97, 98, 0, 100, 0, 102, 0, 104):
-        gdaltest.post_reason('fail')
         print(content)
         return 'fail'
 
@@ -572,7 +540,6 @@ def test_vsicrypt_6():
 
     fp = gdal.VSIFOpenL('/vsicrypt/add_key_check=yes,file=/vsimem/file.bin', 'wb+')
     if fp is None:
-        gdaltest.post_reason('fail')
         return 'fail'
     gdal.VSIFWriteL('hello', 1, 5, fp)
     gdal.VSIFCloseL(fp)
@@ -582,12 +549,10 @@ def test_vsicrypt_6():
     gdal.VSIFCloseL(fp)
 
     if content != 'hello':
-        gdaltest.post_reason('fail')
         return 'fail'
 
     fp = gdal.VSIFOpenL('/vsicrypt//vsimem/file.bin', 'wb+')
     if fp is None:
-        gdaltest.post_reason('fail')
         return 'fail'
     gdal.VSIFWriteL('hello', 1, 5, fp)
     gdal.VSIFCloseL(fp)
@@ -597,7 +562,6 @@ def test_vsicrypt_6():
     gdal.VSIFCloseL(fp)
 
     if content != 'hello':
-        gdaltest.post_reason('fail')
         return 'fail'
 
     # Set a too short key
@@ -605,13 +569,11 @@ def test_vsicrypt_6():
     with gdaltest.error_handler():
         fp = gdal.VSIFOpenL('/vsicrypt//vsimem/file.bin', 'rb')
     if fp is not None:
-        gdaltest.post_reason('fail')
         return 'fail'
 
     with gdaltest.error_handler():
         fp = gdal.VSIFOpenL('/vsicrypt//vsimem/file.bin', 'wb+')
     if fp is not None:
-        gdaltest.post_reason('fail')
         return 'fail'
 
     # Erase key
@@ -619,7 +581,6 @@ def test_vsicrypt_6():
     with gdaltest.error_handler():
         fp = gdal.VSIFOpenL('/vsicrypt//vsimem/file.bin', 'wb+')
     if fp is not None:
-        gdaltest.post_reason('fail')
         return 'fail'
 
     gdal.Unlink('/vsimem/file.bin')
diff --git a/autotest/gcore/vsicurl.py b/autotest/gcore/vsicurl.py
index 65990dc262c2..0992cff4ba45 100755
--- a/autotest/gcore/vsicurl.py
+++ b/autotest/gcore/vsicurl.py
@@ -326,12 +326,10 @@ def method(request):
     with webserver.install_http_handler(handler):
         f = gdal.VSIFOpenL('/vsicurl/http://localhost:%d/test_redirect/test.bin' % gdaltest.webserver_port, 'rb')
     if f is None:
-        gdaltest.post_reason('fail')
         return 'fail'
 
     gdal.VSIFSeekL(f, 0, 2)
     if gdal.VSIFTellL(f) != 1000000:
-        gdaltest.post_reason('fail')
         print(gdal.VSIFTellL(f))
         gdal.VSIFCloseL(f)
         return 'fail'
@@ -374,13 +372,11 @@ def method(request):
     with webserver.install_http_handler(handler):
         content = gdal.VSIFReadL(1, 16383, f).decode('ascii')
         if len(content) != 16383 or content[0] != 'x':
-            gdaltest.post_reason('fail')
             print(content)
             gdal.VSIFCloseL(f)
             return 'fail'
         content = gdal.VSIFReadL(1, 2, f).decode('ascii')
         if content != 'xy':
-            gdaltest.post_reason('fail')
             print(content)
             gdal.VSIFCloseL(f)
             return 'fail'
@@ -419,7 +415,6 @@ def test_vsicurl_test_retry():
             data_len = len(gdal.VSIFReadL(1, 1, f))
             gdal.VSIFCloseL(f)
         if data_len != 0:
-            gdaltest.post_reason('fail')
             print(data_len)
             return 'fail'
 
@@ -434,7 +429,6 @@ def test_vsicurl_test_retry():
     with webserver.install_http_handler(handler):
         f = gdal.VSIFOpenL('/vsicurl?max_retry=2&retry_delay=0.01&url=http://localhost:%d/test_retry/test.txt' % gdaltest.webserver_port, 'rb')
         if f is None:
-            gdaltest.post_reason('fail')
             return 'fail'
         gdal.ErrorReset()
         with gdaltest.error_handler():
@@ -442,11 +436,9 @@ def test_vsicurl_test_retry():
         error_msg = gdal.GetLastErrorMsg()
         gdal.VSIFCloseL(f)
         if data != 'foo':
-            gdaltest.post_reason('fail')
             print(data)
             return 'fail'
         if error_msg.find('429') < 0:
-            gdaltest.post_reason('fail')
             print(error_msg)
             return 'fail'
 
@@ -500,19 +492,16 @@ def test_vsicurl_test_parse_html_filelist_apache():
     with webserver.install_http_handler(handler):
         fl = gdal.ReadDir('/vsicurl/http://localhost:%d/mydir' % gdaltest.webserver_port)
     if fl != ['foo.tif', 'foo%20with%20space.tif']:
-        gdaltest.post_reason('fail')
         print(fl)
         return 'fail'
 
     if gdal.VSIStatL('/vsicurl/http://localhost:%d/mydir/foo%%20with%%20space.tif' % gdaltest.webserver_port, gdal.VSI_STAT_EXISTS_FLAG) is None:
-        gdaltest.post_reason('fail')
         return 'fail'
 
     handler = webserver.SequentialHandler()
     handler.add('HEAD', '/mydir/i_dont_exist', 404, {})
     with webserver.install_http_handler(handler):
         if gdal.VSIStatL('/vsicurl/http://localhost:%d/mydir/i_dont_exist' % gdaltest.webserver_port, gdal.VSI_STAT_EXISTS_FLAG) is not None:
-            gdaltest.post_reason('fail')
             return 'fail'
 
     return 'success'
diff --git a/autotest/gcore/vsicurl_streaming.py b/autotest/gcore/vsicurl_streaming.py
index 29f543692cbb..178a8b9bb8a2 100755
--- a/autotest/gcore/vsicurl_streaming.py
+++ b/autotest/gcore/vsicurl_streaming.py
@@ -52,36 +52,29 @@ def test_vsicurl_streaming_1():
         if gdaltest.gdalurlopen('http://download.osgeo.org/gdal/data/usgsdem/cded/114p01_0100_deme.dem', timeout=4) is None:
             print('cannot open URL')
             return 'skip'
-        gdaltest.post_reason('fail')
         return 'fail'
 
     if gdal.VSIFTellL(fp) != 0:
-        gdaltest.post_reason('fail')
         gdal.VSIFCloseL(fp)
         return 'fail'
     data = gdal.VSIFReadL(1, 50, fp)
     if data.decode('ascii') != '                              114p01DEMe   Base Ma':
-        gdaltest.post_reason('fail')
         gdal.VSIFCloseL(fp)
         return 'fail'
     if gdal.VSIFTellL(fp) != 50:
-        gdaltest.post_reason('fail')
         gdal.VSIFCloseL(fp)
         return 'fail'
 
     gdal.VSIFSeekL(fp, 0, 0)
 
     if gdal.VSIFTellL(fp) != 0:
-        gdaltest.post_reason('fail')
         gdal.VSIFCloseL(fp)
         return 'fail'
     data = gdal.VSIFReadL(1, 50, fp)
     if data.decode('ascii') != '                              114p01DEMe   Base Ma':
-        gdaltest.post_reason('fail')
         gdal.VSIFCloseL(fp)
         return 'fail'
     if gdal.VSIFTellL(fp) != 50:
-        gdaltest.post_reason('fail')
         gdal.VSIFCloseL(fp)
         return 'fail'
 
@@ -90,35 +83,29 @@ def test_vsicurl_streaming_1():
     data_2001 = gdal.VSIFReadL(1, 20, fp)
     if data_2001.decode('ascii') != '7-32767-32767-32767-':
         print(data_2001)
-        gdaltest.post_reason('fail')
         gdal.VSIFCloseL(fp)
         return 'fail'
     if gdal.VSIFTellL(fp) != 2001 + 20:
-        gdaltest.post_reason('fail')
         gdal.VSIFCloseL(fp)
         return 'fail'
 
     gdal.VSIFSeekL(fp, 0, 2)
     if gdal.VSIFTellL(fp) != 9839616:
-        gdaltest.post_reason('fail')
         gdal.VSIFCloseL(fp)
         return 'fail'
 
     nRet = len(gdal.VSIFReadL(1, 10, fp))
     if nRet != 0:
-        gdaltest.post_reason('fail')
         gdal.VSIFCloseL(fp)
         return 'fail'
 
     gdal.VSIFSeekL(fp, 2001, 0)
     data_2001_2 = gdal.VSIFReadL(1, 20, fp)
     if gdal.VSIFTellL(fp) != 2001 + 20:
-        gdaltest.post_reason('fail')
         gdal.VSIFCloseL(fp)
         return 'fail'
 
     if data_2001 != data_2001_2:
-        gdaltest.post_reason('fail')
         gdal.VSIFCloseL(fp)
         return 'fail'
 
@@ -126,11 +113,9 @@ def test_vsicurl_streaming_1():
     data = gdal.VSIFReadL(1, 20, fp)
     if data.decode('ascii') != '67-32767-32767-32767':
         print(data)
-        gdaltest.post_reason('fail')
         gdal.VSIFCloseL(fp)
         return 'fail'
     if gdal.VSIFTellL(fp) != 1024 * 1024 + 100 + 20:
-        gdaltest.post_reason('fail')
         gdal.VSIFCloseL(fp)
         return 'fail'
 
diff --git a/autotest/gcore/vsifile.py b/autotest/gcore/vsifile.py
index e5419a4b1871..ae31a5a0a71f 100755
--- a/autotest/gcore/vsifile.py
+++ b/autotest/gcore/vsifile.py
@@ -46,39 +46,30 @@ def vsifile_generic(filename):
 
     fp = gdal.VSIFOpenL(filename, 'wb+')
     if fp is None:
-        gdaltest.post_reason('failure')
         return 'fail'
 
     if gdal.VSIFWriteL('0123456789', 1, 10, fp) != 10:
-        gdaltest.post_reason('failure')
         return 'fail'
 
     if gdal.VSIFFlushL(fp) != 0:
-        gdaltest.post_reason('failure')
         return 'fail'
 
     if gdal.VSIFTruncateL(fp, 20) != 0:
-        gdaltest.post_reason('failure')
         return 'fail'
 
     if gdal.VSIFTellL(fp) != 10:
-        gdaltest.post_reason('failure')
         return 'fail'
 
     if gdal.VSIFTruncateL(fp, 5) != 0:
-        gdaltest.post_reason('failure')
         return 'fail'
 
     if gdal.VSIFTellL(fp) != 10:
-        gdaltest.post_reason('failure')
         return 'fail'
 
     if gdal.VSIFSeekL(fp, 0, 2) != 0:
-        gdaltest.post_reason('failure')
         return 'fail'
 
     if gdal.VSIFTellL(fp) != 5:
-        gdaltest.post_reason('failure')
         return 'fail'
 
     gdal.VSIFWriteL('XX', 1, 2, fp)
@@ -86,26 +77,21 @@ def vsifile_generic(filename):
 
     statBuf = gdal.VSIStatL(filename, gdal.VSI_STAT_EXISTS_FLAG | gdal.VSI_STAT_NATURE_FLAG | gdal.VSI_STAT_SIZE_FLAG)
     if statBuf.size != 7:
-        gdaltest.post_reason('failure')
         print(statBuf.size)
         return 'fail'
     if abs(start_time - statBuf.mtime) > 2:
-        gdaltest.post_reason('failure')
         print(statBuf.mtime)
         return 'fail'
 
     fp = gdal.VSIFOpenL(filename, 'rb')
     buf = gdal.VSIFReadL(1, 7, fp)
     if gdal.VSIFWriteL('a', 1, 1, fp) != 0:
-        gdaltest.post_reason('fail')
         return 'fail'
     if gdal.VSIFTruncateL(fp, 0) == 0:
-        gdaltest.post_reason('fail')
         return 'fail'
     gdal.VSIFCloseL(fp)
 
     if buf.decode('ascii') != '01234XX':
-        gdaltest.post_reason('failure')
         print(buf.decode('ascii'))
         return 'fail'
 
@@ -116,17 +102,14 @@ def vsifile_generic(filename):
 
     statBuf = gdal.VSIStatL(filename, gdal.VSI_STAT_EXISTS_FLAG | gdal.VSI_STAT_NATURE_FLAG | gdal.VSI_STAT_SIZE_FLAG)
     if statBuf.size != 9:
-        gdaltest.post_reason('failure')
         print(statBuf.size)
         return 'fail'
 
     if gdal.Unlink(filename) != 0:
-        gdaltest.post_reason('failure')
         return 'fail'
 
     statBuf = gdal.VSIStatL(filename, gdal.VSI_STAT_EXISTS_FLAG)
     if statBuf is not None:
-        gdaltest.post_reason('failure')
         return 'fail'
 
     # Test append mode on non existing file
@@ -136,12 +119,10 @@ def vsifile_generic(filename):
 
     statBuf = gdal.VSIStatL(filename, gdal.VSI_STAT_EXISTS_FLAG | gdal.VSI_STAT_NATURE_FLAG | gdal.VSI_STAT_SIZE_FLAG)
     if statBuf.size != 2:
-        gdaltest.post_reason('failure')
         print(statBuf.size)
         return 'fail'
 
     if gdal.Unlink(filename) != 0:
-        gdaltest.post_reason('failure')
         return 'fail'
 
     return 'success'
@@ -183,7 +164,6 @@ def test_vsifile_3():
     gdal.VSIFSeekL(fp, 0, 2)
     pos = gdal.VSIFTellL(fp)
     if pos != 10 * 1024 * 1024 * 1024:
-        gdaltest.post_reason('failure')
         gdal.VSIFCloseL(fp)
         gdal.Unlink(filename)
         print(pos)
@@ -192,7 +172,6 @@ def test_vsifile_3():
     gdal.VSIFSeekL(fp, pos, 0)
     pos = gdal.VSIFTellL(fp)
     if pos != 10 * 1024 * 1024 * 1024:
-        gdaltest.post_reason('failure')
         gdal.VSIFCloseL(fp)
         gdal.Unlink(filename)
         print(pos)
@@ -204,7 +183,6 @@ def test_vsifile_3():
     gdal.Unlink(filename)
 
     if statBuf.size != 10 * 1024 * 1024 * 1024:
-        gdaltest.post_reason('failure')
         print(statBuf.size)
         return 'fail'
 
@@ -252,21 +230,18 @@ def test_vsifile_5():
 
         gdal.VSIFSeekL(fp, 50000, 0)
         if gdal.VSIFTellL(fp) != 50000:
-            gdaltest.post_reason('fail')
             gdal.SetConfigOption('VSI_CACHE_SIZE', None)
             gdal.SetConfigOption('VSI_CACHE', None)
             return 'fail'
 
         gdal.VSIFSeekL(fp, 50000, 1)
         if gdal.VSIFTellL(fp) != 100000:
-            gdaltest.post_reason('fail')
             gdal.SetConfigOption('VSI_CACHE_SIZE', None)
             gdal.SetConfigOption('VSI_CACHE', None)
             return 'fail'
 
         gdal.VSIFSeekL(fp, 0, 2)
         if gdal.VSIFTellL(fp) != 5 * 32768 * 8:
-            gdaltest.post_reason('fail')
             gdal.SetConfigOption('VSI_CACHE_SIZE', None)
             gdal.SetConfigOption('VSI_CACHE', None)
             return 'fail'
@@ -275,7 +250,6 @@ def test_vsifile_5():
         gdal.VSIFSeekL(fp, 0, 0)
         data = gdal.VSIFReadL(1, 3 * 32768, fp)
         if data.decode('ascii') != ref_data[0:3 * 32768]:
-            gdaltest.post_reason('fail')
             gdal.SetConfigOption('VSI_CACHE_SIZE', None)
             gdal.SetConfigOption('VSI_CACHE', None)
             return 'fail'
@@ -283,14 +257,12 @@ def test_vsifile_5():
         gdal.VSIFSeekL(fp, 16384, 0)
         data = gdal.VSIFReadL(1, 5 * 32768, fp)
         if data.decode('ascii') != ref_data[16384:16384 + 5 * 32768]:
-            gdaltest.post_reason('fail')
             gdal.SetConfigOption('VSI_CACHE_SIZE', None)
             gdal.SetConfigOption('VSI_CACHE', None)
             return 'fail'
 
         data = gdal.VSIFReadL(1, 50 * 32768, fp)
         if data[0:1130496].decode('ascii') != ref_data[16384 + 5 * 32768:]:
-            gdaltest.post_reason('fail')
             gdal.SetConfigOption('VSI_CACHE_SIZE', None)
             gdal.SetConfigOption('VSI_CACHE', None)
             return 'fail'
@@ -358,38 +330,29 @@ def test_vsifile_7():
     # Test extending file beyond reasonable limits in write mode
     fp = gdal.VSIFOpenL('/vsimem/vsifile_7.bin', 'wb')
     if gdal.VSIFSeekL(fp, 0x7FFFFFFFFFFFFFFF, 0) != 0:
-        gdaltest.post_reason('fail')
         return 'fail'
     if gdal.VSIStatL('/vsimem/vsifile_7.bin').size != 0:
-        gdaltest.post_reason('fail')
         return 'fail'
     gdal.PushErrorHandler()
     ret = gdal.VSIFWriteL('a', 1, 1, fp)
     gdal.PopErrorHandler()
     if ret != 0:
-        gdaltest.post_reason('fail')
         return 'fail'
     if gdal.VSIStatL('/vsimem/vsifile_7.bin').size != 0:
-        gdaltest.post_reason('fail')
         return 'fail'
     gdal.VSIFCloseL(fp)
 
     # Test seeking  beyond file size in read-only mode
     fp = gdal.VSIFOpenL('/vsimem/vsifile_7.bin', 'rb')
     if gdal.VSIFSeekL(fp, 0x7FFFFFFFFFFFFFFF, 0) != 0:
-        gdaltest.post_reason('fail')
         return 'fail'
     if gdal.VSIFEofL(fp) != 0:
-        gdaltest.post_reason('fail')
         return 'fail'
     if gdal.VSIFTellL(fp) != 0x7FFFFFFFFFFFFFFF:
-        gdaltest.post_reason('fail')
         return 'fail'
     if gdal.VSIFReadL(1, 1, fp):
-        gdaltest.post_reason('fail')
         return 'fail'
     if gdal.VSIFEofL(fp) != 1:
-        gdaltest.post_reason('fail')
         return 'fail'
     gdal.VSIFCloseL(fp)
 
@@ -409,10 +372,8 @@ def test_vsifile_8():
     gdal.VSIFCloseL(fp)
     gdal.Rename('/vsimem/mydir', '/vsimem/newdir'.encode('ascii').decode('ascii'))
     if gdal.VSIStatL('/vsimem/newdir') is None:
-        gdaltest.post_reason('fail')
         return 'fail'
     if gdal.VSIStatL('/vsimem/newdir/a') is None:
-        gdaltest.post_reason('fail')
         return 'fail'
     gdal.Unlink('/vsimem/newdir/a')
     gdal.Rmdir('/vsimem/newdir')
@@ -427,12 +388,10 @@ def test_vsifile_9():
 
     lst = gdal.ReadDir('.')
     if len(lst) < 4:
-        gdaltest.post_reason('fail')
         return 'fail'
     # Test truncation
     lst_truncated = gdal.ReadDir('.', int(len(lst) / 2))
     if len(lst_truncated) <= int(len(lst) / 2):
-        gdaltest.post_reason('fail')
         return 'fail'
 
     gdal.Mkdir('/vsimem/mydir', 438)
@@ -442,12 +401,10 @@ def test_vsifile_9():
 
     lst = gdal.ReadDir('/vsimem/mydir')
     if len(lst) < 4:
-        gdaltest.post_reason('fail')
         return 'fail'
     # Test truncation
     lst_truncated = gdal.ReadDir('/vsimem/mydir', int(len(lst) / 2))
     if len(lst_truncated) <= int(len(lst) / 2):
-        gdaltest.post_reason('fail')
         return 'fail'
 
     for i in range(10):
@@ -521,19 +478,15 @@ def test_vsifile_10():
         gdal.Unlink('/vsimem/vsifile_10.tar')
         return 'skip'
     if contents != ['test.txt', 'huge.txt', 'small.txt']:
-        gdaltest.post_reason('fail')
         print(contents)
         return 'fail'
     if gdal.VSIStatL('/vsitar//vsimem/vsifile_10.tar/test.txt').size != 3:
-        gdaltest.post_reason('fail')
         print(gdal.VSIStatL('/vsitar//vsimem/vsifile_10.tar/test.txt').size)
         return 'fail'
     if gdal.VSIStatL('/vsitar//vsimem/vsifile_10.tar/huge.txt').size != 3888:
-        gdaltest.post_reason('fail')
         print(gdal.VSIStatL('/vsitar//vsimem/vsifile_10.tar/huge.txt').size)
         return 'fail'
     if gdal.VSIStatL('/vsitar//vsimem/vsifile_10.tar/small.txt').size != 1:
-        gdaltest.post_reason('fail')
         print(gdal.VSIStatL('/vsitar//vsimem/vsifile_10.tar/small.txt').size)
         return 'fail'
 
@@ -543,7 +496,6 @@ def test_vsifile_10():
 abc""")
     contents = gdal.ReadDir('/vsitar//vsimem/vsifile_10.tar')
     if contents != ['x']:
-        gdaltest.post_reason('fail')
         print(contents)
         return 'fail'
 
@@ -553,7 +505,6 @@ def test_vsifile_10():
 abc***NEWFILE***:""")
     contents = gdal.ReadDir('/vsitar//vsimem/vsifile_10.tar')
     if contents != ['x']:
-        gdaltest.post_reason('fail')
         print(contents)
         return 'fail'
 
@@ -572,13 +523,10 @@ def test_vsifile_11():
     f = gdal.VSIFOpenL('/vsisubfile/0_,/vsimem/vsifile_11', 'wb')
     gdal.VSIFWriteL('0123456789', 1, 10, f)
     if gdal.VSIFTruncateL(f, 10 + 4096 + 2) != 0:
-        gdaltest.post_reason('fail')
         return 'fail'
     if gdal.VSIFTellL(f) != 10:
-        gdaltest.post_reason('fail')
         return 'fail'
     if gdal.VSIFTruncateL(f, 0) != -1:
-        gdaltest.post_reason('fail')
         return 'fail'
     gdal.VSIFCloseL(f)
 
@@ -588,7 +536,6 @@ def test_vsifile_11():
     import struct
     data = struct.unpack('B' * len(data), data)
     if data[0] != 48 or data[9] != 57 or data[10] != 0 or data[10 + 4096 + 2 - 1] != 0:
-        gdaltest.post_reason('fail')
         print(data)
         return 'fail'
 
@@ -612,7 +559,6 @@ def test_vsifile_12():
     f = gdal.VSIFOpenL(target_dir + '/vsifile_12', 'wb')
     gdal.VSIFWriteL('a', 1, 1, f)
     if gdal.VSIFTruncateL(f, block_size * 2) != 0:
-        gdaltest.post_reason('fail')
         return 'fail'
     ret = gdal.VSIFGetRangeStatusL(f, 0, 1)
     # We could get unknown on nfs
@@ -620,12 +566,10 @@ def test_vsifile_12():
         print('Range status unknown')
     else:
         if ret != gdal.VSI_RANGE_STATUS_DATA:
-            gdaltest.post_reason('fail')
             print(ret)
             return 'fail'
         ret = gdal.VSIFGetRangeStatusL(f, block_size * 2 - 1, 1)
         if ret != gdal.VSI_RANGE_STATUS_HOLE:
-            gdaltest.post_reason('fail')
             print(ret)
             return 'fail'
     gdal.VSIFCloseL(f)
@@ -695,27 +639,22 @@ def test_vsifile_15():
         with gdaltest.error_handler():
             file_len += len(gdal.VSIFReadL(1, 4, fp))
     if file_len != 6469:
-        gdaltest.post_reason('fail')
         return 'fail'
 
     with gdaltest.error_handler():
         file_len += len(gdal.VSIFReadL(1, 4, fp))
     if file_len != 6469:
-        gdaltest.post_reason('fail')
         return 'fail'
 
     with gdaltest.error_handler():
         if gdal.VSIFSeekL(fp, 0, 2) == 0:
-            gdaltest.post_reason('fail')
             return 'fail'
 
     if gdal.VSIFSeekL(fp, 0, 0) != 0:
-        gdaltest.post_reason('fail')
         return 'fail'
 
     len_read = len(gdal.VSIFReadL(1, file_len, fp))
     if len_read != file_len:
-        gdaltest.post_reason('fail')
         print(len_read)
         return 'fail'
 
@@ -747,11 +686,9 @@ def test_vsifile_16():
 def test_vsifile_17():
 
     if gdal.GetActualURL('foo') is not None:
-        gdaltest.post_reason('fail')
         return 'fail'
 
     if gdal.GetSignedURL('foo') is not None:
-        gdaltest.post_reason('fail')
         return 'fail'
 
     return 'success'
@@ -781,7 +718,6 @@ def test_vsifile_19():
         if options is not None:
             ret = gdal.ParseXMLString(options)
             if ret is None:
-                gdaltest.post_reason('fail')
                 print(prefix, options)
                 return 'fail'
 
@@ -904,8 +840,6 @@ def test_vsigzip_multi_thread():
     gdal.Unlink('/vsimem/vsigzip_multi_thread.gz')
 
     if data != 'hello' * 100000:
-        gdaltest.post_reason('fail')
-
         for i in range(10000):
             if data[i*5:i*5+5] != 'hello':
                 print(i*5, data[i*5:i*5+5], data[i*5-5:i*5+5-5])
@@ -923,21 +857,17 @@ def test_vsisync():
 
     with gdaltest.error_handler():
         if gdal.Sync('/i_do/not/exist', '/vsimem/'):
-            gdaltest.post_reason('fail')
             return 'fail'
 
     with gdaltest.error_handler():
         if gdal.Sync('vsifile.py', '/i_do/not/exist'):
-            gdaltest.post_reason('fail')
             return 'fail'
 
     # Test copying a file
     for i in range(2):
         if not gdal.Sync('vsifile.py', '/vsimem/'):
-            gdaltest.post_reason('fail')
             return 'fail'
         if gdal.VSIStatL('/vsimem/vsifile.py').size != gdal.VSIStatL('vsifile.py').size:
-            gdaltest.post_reason('fail')
             return 'fail'
     gdal.Unlink('/vsimem/vsifile.py')
 
@@ -950,23 +880,18 @@ def test_vsisync():
     if sys.platform != 'win32':
         with gdaltest.error_handler():
             if gdal.Sync('/vsimem/test_sync/', '/i_do_not/exist'):
-                gdaltest.post_reason('fail')
                 return 'fail'
 
     if not gdal.Sync('/vsimem/test_sync/', '/vsimem/out'):
-        gdaltest.post_reason('fail')
         return 'fail'
     if gdal.ReadDir('/vsimem/out') != [ 'foo.txt', 'subdir' ]:
-        gdaltest.post_reason('fail')
         print(gdal.ReadDir('/vsimem/out'))
         return 'fail'
     if gdal.ReadDir('/vsimem/out/subdir') != [ 'bar.txt' ]:
-        gdaltest.post_reason('fail')
         print(gdal.ReadDir('/vsimem/out/subdir'))
         return 'fail'
     # Again
     if not gdal.Sync('/vsimem/test_sync/', '/vsimem/out'):
-        gdaltest.post_reason('fail')
         return 'fail'
 
     gdal.RmdirRecursive('/vsimem/out')
@@ -977,20 +902,16 @@ def my_progress(pct, message, user_data):
         pct_values.append(pct)
 
     if not gdal.Sync('/vsimem/test_sync', '/vsimem/out', callback = my_progress):
-        gdaltest.post_reason('fail')
         return 'fail'
 
     if pct_values != [0.5, 1.0]:
-        gdaltest.post_reason('fail')
         print(pct_values)
         return 'fail'
 
     if gdal.ReadDir('/vsimem/out') != [ 'test_sync' ]:
-        gdaltest.post_reason('fail')
         print(gdal.ReadDir('/vsimem/out'))
         return 'fail'
     if gdal.ReadDir('/vsimem/out/test_sync') != [ 'foo.txt', 'subdir' ]:
-        gdaltest.post_reason('fail')
         print(gdal.ReadDir('/vsimem/out/test_sync'))
         return 'fail'
 
@@ -1007,7 +928,6 @@ def test_vsifile_opendir():
     # Non existing dir
     d = gdal.OpenDir('/vsimem/i_dont_exist')
     if d:
-        gdaltest.post_reason('fail')
         return 'fail'
 
     gdal.Mkdir('/vsimem/vsifile_opendir', 0o755)
@@ -1015,11 +935,9 @@ def test_vsifile_opendir():
     # Empty dir
     d = gdal.OpenDir('/vsimem/vsifile_opendir')
     if not d:
-        gdaltest.post_reason('fail')
         return 'fail'
     entry = gdal.GetNextDirEntry(d)
     if entry:
-        gdaltest.post_reason('fail')
         return 'fail'
     gdal.CloseDir(d)
 
@@ -1033,65 +951,50 @@ def test_vsifile_opendir():
 
     entry = gdal.GetNextDirEntry(d)
     if entry.name != 'subdir':
-        gdaltest.post_reason('fail')
         print(entry.name)
         return 'fail'
     if entry.mode != 16384:
-        gdaltest.post_reason('fail')
         print(entry.mode)
         return 'fail'
 
     entry = gdal.GetNextDirEntry(d)
     if entry.name != 'subdir/subdir2':
-        gdaltest.post_reason('fail')
         print(entry.name)
         return 'fail'
     if entry.mode != 16384:
-        gdaltest.post_reason('fail')
         print(entry.mode)
         return 'fail'
 
     entry = gdal.GetNextDirEntry(d)
     if entry.name != 'subdir/subdir2/test2':
-        gdaltest.post_reason('fail')
         print(entry.name)
         return 'fail'
     if entry.mode != 32768:
-        gdaltest.post_reason('fail')
         print(entry.mode)
         return 'fail'
 
     entry = gdal.GetNextDirEntry(d)
     if entry.name != 'test':
-        gdaltest.post_reason('fail')
         print(entry.name)
         return 'fail'
     if entry.mode != 32768:
-        gdaltest.post_reason('fail')
         print(entry.mode)
         return 'fail'
     if not entry.modeKnown:
-        gdaltest.post_reason('fail')
         return 'fail'
     if entry.size != 3:
-        gdaltest.post_reason('fail')
         return 'fail'
     if not entry.sizeKnown:
-        gdaltest.post_reason('fail')
         return 'fail'
     if entry.mtime == 0:
-        gdaltest.post_reason('fail')
         return 'fail'
     if not entry.mtimeKnown:
-        gdaltest.post_reason('fail')
         return 'fail'
     if entry.extra:
-        gdaltest.post_reason('fail')
         return 'fail'
 
     entry = gdal.GetNextDirEntry(d)
     if entry:
-        gdaltest.post_reason('fail')
         return 'fail'
     gdal.CloseDir(d)
 
@@ -1099,24 +1002,20 @@ def test_vsifile_opendir():
     d = gdal.OpenDir('/vsimem/vsifile_opendir', 0)
     entry = gdal.GetNextDirEntry(d)
     if entry.name != 'subdir':
-        gdaltest.post_reason('fail')
         print(entry.name)
         return 'fail'
     entry = gdal.GetNextDirEntry(d)
     if entry.name != 'test':
-        gdaltest.post_reason('fail')
         print(entry.name)
         return 'fail'
     entry = gdal.GetNextDirEntry(d)
     if entry:
-        gdaltest.post_reason('fail')
         return 'fail'
     gdal.CloseDir(d)
 
     # Depth 1
     files = [l_entry.name for l_entry in gdal.listdir('/vsimem/vsifile_opendir', 1)]
     if files != ['subdir', 'subdir/subdir2', 'test']:
-        gdaltest.post_reason('fail')
         print(files)
         return 'fail'
 
diff --git a/autotest/gcore/vsigs.py b/autotest/gcore/vsigs.py
index 258e9acb08d3..e11e5cf62b63 100755
--- a/autotest/gcore/vsigs.py
+++ b/autotest/gcore/vsigs.py
@@ -68,7 +68,6 @@ def test_vsigs_init():
 
     with gdaltest.config_option('CPL_GCE_SKIP', 'YES'):
         if gdal.GetSignedURL('/vsigs/foo/bar') is not None:
-            gdaltest.post_reason('fail')
             return 'fail'
 
     return 'success'
@@ -89,12 +88,10 @@ def test_vsigs_1():
             with gdaltest.error_handler():
                 f = open_for_read('/vsigs/foo/bar')
     if f is not None:
-        gdaltest.post_reason('fail')
         gdal.VSIFCloseL(f)
         return 'fail'
     last_err = gdal.GetLastErrorMsg()
     if last_err.find('Cannot read') < 0:
-        gdaltest.post_reason('fail')
         print(last_err)
         return 'fail'
 
@@ -103,7 +100,6 @@ def test_vsigs_1():
         with gdaltest.config_option('CPL_GCE_SKIP', 'YES'):
             f = open_for_read('/vsigs/foo/bar')
     if f is not None:
-        gdaltest.post_reason('fail')
         gdal.VSIFCloseL(f)
         return 'fail'
 
@@ -113,7 +109,6 @@ def test_vsigs_1():
         with gdaltest.error_handler():
             f = open_for_read('/vsigs/foo/bar')
     if f is not None or gdal.VSIGetLastErrorMsg().find('GS_SECRET_ACCESS_KEY') < 0:
-        gdaltest.post_reason('fail')
         print(gdal.VSIGetLastErrorMsg())
         return 'fail'
 
@@ -122,7 +117,6 @@ def test_vsigs_1():
         with gdaltest.error_handler():
             f = open_for_read('/vsigs_streaming/foo/bar')
     if f is not None or gdal.VSIGetLastErrorMsg().find('GS_SECRET_ACCESS_KEY') < 0:
-        gdaltest.post_reason('fail')
         print(gdal.VSIGetLastErrorMsg())
         return 'fail'
 
@@ -133,7 +127,6 @@ def test_vsigs_1():
     with gdaltest.error_handler():
         f = open_for_read('/vsigs/foo/bar')
     if f is not None or gdal.VSIGetLastErrorMsg().find('GS_ACCESS_KEY_ID') < 0:
-        gdaltest.post_reason('fail')
         print(gdal.VSIGetLastErrorMsg())
         return 'fail'
 
@@ -148,7 +141,6 @@ def test_vsigs_1():
             gdal.VSIFCloseL(f)
         if gdal.GetConfigOption('APPVEYOR') is not None:
             return 'success'
-        gdaltest.post_reason('fail')
         print(gdal.VSIGetLastErrorMsg())
         return 'fail'
 
@@ -156,7 +148,6 @@ def test_vsigs_1():
     with gdaltest.error_handler():
         f = open_for_read('/vsigs_streaming/foo/bar.baz')
     if f is not None or gdal.VSIGetLastErrorMsg() == '':
-        gdaltest.post_reason('fail')
         print(gdal.VSIGetLastErrorMsg())
         return 'fail'
 
@@ -203,12 +194,10 @@ def test_vsigs_2():
         with gdaltest.config_option('GDAL_HTTP_HEADER_FILE', '/vsimem/my_headers.txt'):
             f = open_for_read('/vsigs/gs_fake_bucket_http_header_file/resource')
             if f is None:
-                gdaltest.post_reason('fail')
                 return 'fail'
             data = gdal.VSIFReadL(1, 1, f)
             gdal.VSIFCloseL(f)
             if len(data) != 1:
-                gdaltest.post_reason('fail')
                 return 'fail'
     gdal.Unlink('/vsimem/my_headers.txt')
 
@@ -220,7 +209,6 @@ def test_vsigs_2():
                                    ['START_DATE=20180212T123456Z'])
     if signed_url not in ('http://127.0.0.1:8080/gs_fake_bucket/resource?Expires=1518442496&GoogleAccessId=GS_ACCESS_KEY_ID&Signature=xTphUyMqtKA6UmAX3PEr5VL3EOg%3D',
                           'http://127.0.0.1:8081/gs_fake_bucket/resource?Expires=1518442496&GoogleAccessId=GS_ACCESS_KEY_ID&Signature=xTphUyMqtKA6UmAX3PEr5VL3EOg%3D'):
-        gdaltest.post_reason('fail')
         print(signed_url)
         return 'fail'
 
@@ -231,13 +219,11 @@ def test_vsigs_2():
     with webserver.install_http_handler(handler):
         f = open_for_read('/vsigs/gs_fake_bucket/resource')
         if f is None:
-            gdaltest.post_reason('fail')
             return 'fail'
         data = gdal.VSIFReadL(1, 4, f).decode('ascii')
         gdal.VSIFCloseL(f)
 
     if data != 'foo':
-        gdaltest.post_reason('fail')
         print(data)
         return 'fail'
 
@@ -248,13 +234,11 @@ def test_vsigs_2():
     with webserver.install_http_handler(handler):
         f = open_for_read('/vsigs_streaming/gs_fake_bucket/resource')
         if f is None:
-            gdaltest.post_reason('fail')
             return 'fail'
         data = gdal.VSIFReadL(1, 4, f).decode('ascii')
         gdal.VSIFCloseL(f)
 
         if data != 'foo':
-            gdaltest.post_reason('fail')
             print(data)
             return 'fail'
 
@@ -264,7 +248,6 @@ def test_vsigs_2():
     with webserver.install_http_handler(handler):
         stat_res = gdal.VSIStatL('/vsigs/gs_fake_bucket/resource2.bin')
         if stat_res is None or stat_res.size != 1000000:
-            gdaltest.post_reason('fail')
             if stat_res is not None:
                 print(stat_res.size)
             else:
@@ -277,7 +260,6 @@ def test_vsigs_2():
     with webserver.install_http_handler(handler):
         stat_res = gdal.VSIStatL('/vsigs_streaming/gs_fake_bucket/resource2.bin')
         if stat_res is None or stat_res.size != 1000000:
-            gdaltest.post_reason('fail')
             if stat_res is not None:
                 print(stat_res.size)
             else:
@@ -333,26 +315,21 @@ def test_vsigs_readdir():
             print('Skipped on trusty branch, but should be investigated')
             return 'skip'
 
-        gdaltest.post_reason('fail')
         return 'fail'
     gdal.VSIFCloseL(f)
 
     dir_contents = gdal.ReadDir('/vsigs/gs_fake_bucket2/a_dir')
     if dir_contents != ['resource3.bin', 'resource4.bin', 'subdir']:
-        gdaltest.post_reason('fail')
         print(dir_contents)
         return 'fail'
     if gdal.VSIStatL('/vsigs/gs_fake_bucket2/a_dir/resource3.bin').size != 123456:
-        gdaltest.post_reason('fail')
         return 'fail'
     if gdal.VSIStatL('/vsigs/gs_fake_bucket2/a_dir/resource3.bin').mtime != 1:
-        gdaltest.post_reason('fail')
         return 'fail'
 
     # ReadDir on something known to be a file shouldn't cause network access
     dir_contents = gdal.ReadDir('/vsigs/gs_fake_bucket2/a_dir/resource3.bin')
     if dir_contents is not None:
-        gdaltest.post_reason('fail')
         return 'fail'
 
     # List buckets
@@ -370,7 +347,6 @@ def test_vsigs_readdir():
     with webserver.install_http_handler(handler):
         dir_contents = gdal.ReadDir('/vsigs/')
     if dir_contents != ['mybucket']:
-        gdaltest.post_reason('fail')
         print(dir_contents)
         return 'fail'
 
@@ -389,7 +365,6 @@ def test_vsigs_write():
 
     f = gdal.VSIFOpenL('/vsigs/test_copy/file.bin', 'wb')
     if f is None:
-        gdaltest.post_reason('fail')
         return 'fail'
 
     handler = webserver.SequentialHandler()
@@ -419,7 +394,6 @@ def method(request):
         ret = gdal.VSIFWriteL('x' * 35000, 1, 35000, f)
         ret += gdal.VSIFWriteL('x' * 5000, 1, 5000, f)
         if ret != 40000:
-            gdaltest.post_reason('fail')
             print(ret)
             gdal.VSIFCloseL(f)
             return 'fail'
@@ -428,7 +402,6 @@ def method(request):
     # Simulate failure while transmitting
     f = gdal.VSIFOpenL('/vsigs/test_copy/file.bin', 'wb')
     if f is None:
-        gdaltest.post_reason('fail')
         return 'fail'
 
     handler = webserver.SequentialHandler()
@@ -444,7 +417,6 @@ def method(request):
         with gdaltest.error_handler():
             ret = gdal.VSIFWriteL('x' * 35000, 1, 35000, f)
         if ret != 0:
-            gdaltest.post_reason('fail')
             print(ret)
             gdal.VSIFCloseL(f)
             return 'fail'
@@ -453,7 +425,6 @@ def method(request):
     # Simulate failure at end of transfer
     f = gdal.VSIFOpenL('/vsigs/test_copy/file.bin', 'wb')
     if f is None:
-        gdaltest.post_reason('fail')
         return 'fail'
 
     handler = webserver.SequentialHandler()
@@ -476,14 +447,12 @@ def method(request):
     with webserver.install_http_handler(handler):
         ret = gdal.VSIFWriteL('x' * 35000, 1, 35000, f)
         if ret != 35000:
-            gdaltest.post_reason('fail')
             print(ret)
             gdal.VSIFCloseL(f)
             return 'fail'
         with gdaltest.error_handler():
             ret = gdal.VSIFCloseL(f)
         if ret == 0:
-            gdaltest.post_reason('fail')
             return 'fail'
 
     return 'success'
@@ -507,7 +476,6 @@ def test_vsigs_read_credentials_refresh_token_default_gdal_app():
 
     with gdaltest.error_handler():
         if gdal.GetSignedURL('/vsigs/foo/bar') is not None:
-            gdaltest.post_reason('fail')
             return 'fail'
 
     gdal.VSICurlClearCache()
@@ -555,13 +523,11 @@ def method(request):
     with webserver.install_http_handler(handler):
         f = open_for_read('/vsigs/gs_fake_bucket/resource')
         if f is None:
-            gdaltest.post_reason('fail')
             return 'fail'
         data = gdal.VSIFReadL(1, 4, f).decode('ascii')
         gdal.VSIFCloseL(f)
 
     if data != 'foo':
-        gdaltest.post_reason('fail')
         print(data)
         return 'fail'
 
@@ -634,13 +600,11 @@ def method(request):
     with webserver.install_http_handler(handler):
         f = open_for_read('/vsigs/gs_fake_bucket/resource')
         if f is None:
-            gdaltest.post_reason('fail')
             return 'fail'
         data = gdal.VSIFReadL(1, 4, f).decode('ascii')
         gdal.VSIFCloseL(f)
 
     if data != 'foo':
-        gdaltest.post_reason('fail')
         print(data)
         return 'fail'
 
@@ -746,7 +710,6 @@ def method(request):
             with webserver.install_http_handler(handler):
                 f = open_for_read('/vsigs/gs_fake_bucket/resource')
                 if f is None:
-                    gdaltest.post_reason('fail')
                     return 'fail'
                 data = gdal.VSIFReadL(1, 4, f).decode('ascii')
                 gdal.VSIFCloseL(f)
@@ -761,7 +724,6 @@ def method(request):
             gdal.SetConfigOption('GS_OAUTH2_CLIENT_EMAIL', '')
 
         if data != 'foo':
-            gdaltest.post_reason('fail')
             print(data)
             return 'fail'
 
@@ -840,7 +802,6 @@ def method(request):
         with webserver.install_http_handler(handler):
             f = open_for_read('/vsigs/gs_fake_bucket/resource')
             if f is None:
-                gdaltest.post_reason('fail')
                 gdal.Unlink('/vsimem/service_account.json')
                 return 'fail'
             data = gdal.VSIFReadL(1, 4, f).decode('ascii')
@@ -850,7 +811,6 @@ def method(request):
                                            ['START_DATE=20180212T123456Z'])
             if signed_url not in ('http://127.0.0.1:8080/gs_fake_bucket/resource?Expires=1518442496&GoogleAccessId=CLIENT_EMAIL&Signature=b19I62KdqV51DpWGxhxGXLGJIA8MHvSJofwOygoeQuIxkM6PmmQFvJYTNWRt9zUVTUoVC0UHVB7ee5Z35NqDC8K4i0quu1hb8Js2B4h0W6OAupvyF3nSQ5D0OJmiSbomGMq0Ehyro5cqJ%2FU%2Fd8oAaKrGKVQScKfXoFrSJBbWkNs%3D',
                                   'http://127.0.0.1:8081/gs_fake_bucket/resource?Expires=1518442496&GoogleAccessId=CLIENT_EMAIL&Signature=b19I62KdqV51DpWGxhxGXLGJIA8MHvSJofwOygoeQuIxkM6PmmQFvJYTNWRt9zUVTUoVC0UHVB7ee5Z35NqDC8K4i0quu1hb8Js2B4h0W6OAupvyF3nSQ5D0OJmiSbomGMq0Ehyro5cqJ%2FU%2Fd8oAaKrGKVQScKfXoFrSJBbWkNs%3D'):
-                gdaltest.post_reason('fail')
                 print(signed_url)
                 gdal.Unlink('/vsimem/service_account.json')
                 return 'fail'
@@ -866,7 +826,6 @@ def method(request):
     gdal.Unlink('/vsimem/service_account.json')
 
     if data != 'foo':
-        gdaltest.post_reason('fail')
         print(data)
         return 'fail'
 
@@ -922,13 +881,11 @@ def method(request):
     with webserver.install_http_handler(handler):
         f = open_for_read('/vsigs/gs_fake_bucket/resource')
         if f is None:
-            gdaltest.post_reason('fail')
             return 'fail'
         data = gdal.VSIFReadL(1, 4, f).decode('ascii')
         gdal.VSIFCloseL(f)
 
     if data != 'foo':
-        gdaltest.post_reason('fail')
         print(data)
         return 'fail'
 
@@ -1006,13 +963,11 @@ def method(request):
     with webserver.install_http_handler(handler):
         f = open_for_read('/vsigs/gs_fake_bucket/resource')
         if f is None:
-            gdaltest.post_reason('fail')
             return 'fail'
         data = gdal.VSIFReadL(1, 4, f).decode('ascii')
         gdal.VSIFCloseL(f)
 
     if data != 'foo':
-        gdaltest.post_reason('fail')
         print(data)
         return 'fail'
 
@@ -1073,13 +1028,11 @@ def method(request):
     with webserver.install_http_handler(handler):
         f = open_for_read('/vsigs/gs_fake_bucket/resource')
         if f is None:
-            gdaltest.post_reason('fail')
             return 'fail'
         data = gdal.VSIFReadL(1, 4, f).decode('ascii')
         gdal.VSIFCloseL(f)
 
     if data != 'foo':
-        gdaltest.post_reason('fail')
         print(data)
         return 'fail'
 
@@ -1091,19 +1044,16 @@ def method(request):
     with webserver.install_http_handler(handler):
         f = open_for_read('/vsigs/gs_fake_bucket/bar')
         if f is None:
-            gdaltest.post_reason('fail')
             return 'fail'
         data = gdal.VSIFReadL(1, 4, f).decode('ascii')
         gdal.VSIFCloseL(f)
 
     if data != 'bar':
-        gdaltest.post_reason('fail')
         print(data)
         return 'fail'
 
     with gdaltest.error_handler():
         if gdal.GetSignedURL('/vsigs/foo/bar') is not None:
-            gdaltest.post_reason('fail')
             return 'fail'
 
     gdal.SetConfigOption('CPL_GCE_CREDENTIALS_URL', '')
@@ -1171,13 +1121,11 @@ def method(request):
     with webserver.install_http_handler(handler):
         f = open_for_read('/vsigs/gs_fake_bucket/resource')
         if f is None:
-            gdaltest.post_reason('fail')
             return 'fail'
         data = gdal.VSIFReadL(1, 4, f).decode('ascii')
         gdal.VSIFCloseL(f)
 
     if data != 'foo':
-        gdaltest.post_reason('fail')
         print(data)
         return 'fail'
 
@@ -1227,20 +1175,17 @@ def vsigs_extra_1():
         path = '/vsigs/' + gs_resource
         statres = gdal.VSIStatL(path)
         if statres is None or not stat.S_ISDIR(statres.mode):
-            gdaltest.post_reason('fail')
             print('%s is not a valid bucket' % path)
             return 'fail'
 
         readdir = gdal.ReadDir(path)
         if readdir is None:
-            gdaltest.post_reason('fail')
             print('ReadDir() should not return empty list')
             return 'fail'
         for filename in readdir:
             if filename != '.':
                 subpath = path + '/' + filename
                 if gdal.VSIStatL(subpath) is None:
-                    gdaltest.post_reason('fail')
                     print('Stat(%s) should not return an error' % subpath)
                     return 'fail'
 
@@ -1248,81 +1193,68 @@ def vsigs_extra_1():
         subpath = path + '/' + unique_id
         ret = gdal.Mkdir(subpath, 0)
         if ret < 0:
-            gdaltest.post_reason('fail')
             print('Mkdir(%s) should not return an error' % subpath)
             return 'fail'
 
         readdir = gdal.ReadDir(path)
         if unique_id not in readdir:
-            gdaltest.post_reason('fail')
             print('ReadDir(%s) should contain %s' % (path, unique_id))
             print(readdir)
             return 'fail'
 
         ret = gdal.Mkdir(subpath, 0)
         if ret == 0:
-            gdaltest.post_reason('fail')
             print('Mkdir(%s) repeated should return an error' % subpath)
             return 'fail'
 
         ret = gdal.Rmdir(subpath)
         if ret < 0:
-            gdaltest.post_reason('fail')
             print('Rmdir(%s) should not return an error' % subpath)
             return 'fail'
 
         readdir = gdal.ReadDir(path)
         if unique_id in readdir:
-            gdaltest.post_reason('fail')
             print('ReadDir(%s) should not contain %s' % (path, unique_id))
             print(readdir)
             return 'fail'
 
         ret = gdal.Rmdir(subpath)
         if ret == 0:
-            gdaltest.post_reason('fail')
             print('Rmdir(%s) repeated should return an error' % subpath)
             return 'fail'
 
         ret = gdal.Mkdir(subpath, 0)
         if ret < 0:
-            gdaltest.post_reason('fail')
             print('Mkdir(%s) should not return an error' % subpath)
             return 'fail'
 
         f = gdal.VSIFOpenL(subpath + '/test.txt', 'wb')
         if f is None:
-            gdaltest.post_reason('fail')
             return 'fail'
         gdal.VSIFWriteL('hello', 1, 5, f)
         gdal.VSIFCloseL(f)
 
         ret = gdal.Rmdir(subpath)
         if ret == 0:
-            gdaltest.post_reason('fail')
             print('Rmdir(%s) on non empty directory should return an error' % subpath)
             return 'fail'
 
         f = gdal.VSIFOpenL(subpath + '/test.txt', 'rb')
         if f is None:
-            gdaltest.post_reason('fail')
             return 'fail'
         data = gdal.VSIFReadL(1, 5, f).decode('utf-8')
         if data != 'hello':
-            gdaltest.post_reason('fail')
             print(data)
             return 'fail'
         gdal.VSIFCloseL(f)
 
         ret = gdal.Unlink(subpath + '/test.txt')
         if ret < 0:
-            gdaltest.post_reason('fail')
             print('Unlink(%s) should not return an error' % (subpath + '/test.txt'))
             return 'fail'
 
         ret = gdal.Rmdir(subpath)
         if ret < 0:
-            gdaltest.post_reason('fail')
             print('Rmdir(%s) should not return an error' % subpath)
             return 'fail'
 
@@ -1330,26 +1262,22 @@ def vsigs_extra_1():
 
     f = open_for_read('/vsigs/' + gs_resource)
     if f is None:
-        gdaltest.post_reason('fail')
         return 'fail'
     ret = gdal.VSIFReadL(1, 1, f)
     gdal.VSIFCloseL(f)
 
     if len(ret) != 1:
-        gdaltest.post_reason('fail')
         print(ret)
         return 'fail'
 
     # Same with /vsigs_streaming/
     f = open_for_read('/vsigs_streaming/' + gs_resource)
     if f is None:
-        gdaltest.post_reason('fail')
         return 'fail'
     ret = gdal.VSIFReadL(1, 1, f)
     gdal.VSIFCloseL(f)
 
     if len(ret) != 1:
-        gdaltest.post_reason('fail')
         print(ret)
         return 'fail'
 
@@ -1362,7 +1290,6 @@ def vsigs_extra_1():
             gdal.VSIFReadL(1, 1, f)
         gdal.VSIFCloseL(f)
         if gdal.VSIGetLastErrorMsg() == '':
-            gdaltest.post_reason('fail')
             print(gdal.VSIGetLastErrorMsg())
             return 'fail'
 
@@ -1370,7 +1297,6 @@ def vsigs_extra_1():
     gdal.ErrorReset()
     f = open_for_read('/vsigs_streaming/' + gs_resource + '/invalid_resource.baz')
     if f is not None:
-        gdaltest.post_reason('fail')
         print(gdal.VSIGetLastErrorMsg())
         return 'fail'
 
@@ -1378,13 +1304,11 @@ def vsigs_extra_1():
     signed_url = gdal.GetSignedURL('/vsigs/' + gs_resource)
     f = open_for_read('/vsicurl_streaming/' + signed_url)
     if f is None:
-        gdaltest.post_reason('fail')
         return 'fail'
     ret = gdal.VSIFReadL(1, 1, f)
     gdal.VSIFCloseL(f)
 
     if len(ret) != 1:
-        gdaltest.post_reason('fail')
         print(ret)
         return 'fail'
 
diff --git a/autotest/gcore/vsioss.py b/autotest/gcore/vsioss.py
index a3311b4a7817..93901eed863a 100755
--- a/autotest/gcore/vsioss.py
+++ b/autotest/gcore/vsioss.py
@@ -55,7 +55,6 @@ def test_visoss_init():
             gdal.SetConfigOption(var, "")
 
     if gdal.GetSignedURL('/vsioss/foo/bar') is not None:
-        gdaltest.post_reason('fail')
         return 'fail'
 
     return 'success'
@@ -74,7 +73,6 @@ def test_visoss_1():
     with gdaltest.error_handler():
         f = open_for_read('/vsioss/foo/bar')
     if f is not None or gdal.VSIGetLastErrorMsg().find('OSS_SECRET_ACCESS_KEY') < 0:
-        gdaltest.post_reason('fail')
         print(gdal.VSIGetLastErrorMsg())
         return 'fail'
 
@@ -82,7 +80,6 @@ def test_visoss_1():
     with gdaltest.error_handler():
         f = open_for_read('/vsioss_streaming/foo/bar')
     if f is not None or gdal.VSIGetLastErrorMsg().find('OSS_SECRET_ACCESS_KEY') < 0:
-        gdaltest.post_reason('fail')
         print(gdal.VSIGetLastErrorMsg())
         return 'fail'
 
@@ -93,7 +90,6 @@ def test_visoss_1():
     with gdaltest.error_handler():
         f = open_for_read('/vsioss/foo/bar')
     if f is not None or gdal.VSIGetLastErrorMsg().find('OSS_ACCESS_KEY_ID') < 0:
-        gdaltest.post_reason('fail')
         print(gdal.VSIGetLastErrorMsg())
         return 'fail'
 
@@ -119,7 +115,6 @@ def test_visoss_real_test():
             gdal.VSIFCloseL(f)
         if gdal.GetConfigOption('APPVEYOR') is not None:
             return 'success'
-        gdaltest.post_reason('fail')
         print(gdal.VSIGetLastErrorMsg())
         return 'fail'
 
@@ -127,7 +122,6 @@ def test_visoss_real_test():
     with gdaltest.error_handler():
         f = open_for_read('/vsioss_streaming/foo/bar.baz')
     if f is not None or gdal.VSIGetLastErrorMsg() == '':
-        gdaltest.post_reason('fail')
         print(gdal.VSIGetLastErrorMsg())
         return 'fail'
 
@@ -193,7 +187,6 @@ def test_visoss_2():
                                    ['START_DATE=20180212T123456Z'])
     if signed_url not in ('http://127.0.0.1:8080/oss_fake_bucket/resource?Expires=1518442496&OSSAccessKeyId=OSS_ACCESS_KEY_ID&Signature=bpFqur6tQMNN7Xe7UHVFFrugmgs%3D',
                           'http://127.0.0.1:8081/oss_fake_bucket/resource?Expires=1518442496&OSSAccessKeyId=OSS_ACCESS_KEY_ID&Signature=bpFqur6tQMNN7Xe7UHVFFrugmgs%3D'):
-        gdaltest.post_reason('fail')
         print(signed_url)
         return 'fail'
 
@@ -203,13 +196,11 @@ def test_visoss_2():
     with webserver.install_http_handler(handler):
         f = open_for_read('/vsioss/oss_fake_bucket/resource')
         if f is None:
-            gdaltest.post_reason('fail')
             return 'fail'
         data = gdal.VSIFReadL(1, 4, f).decode('ascii')
         gdal.VSIFCloseL(f)
 
         if data != 'foo':
-            gdaltest.post_reason('fail')
             print(data)
             return 'fail'
 
@@ -218,13 +209,11 @@ def test_visoss_2():
     with webserver.install_http_handler(handler):
         f = open_for_read('/vsioss_streaming/oss_fake_bucket/resource')
         if f is None:
-            gdaltest.post_reason('fail')
             return 'fail'
         data = gdal.VSIFReadL(1, 4, f).decode('ascii')
         gdal.VSIFCloseL(f)
 
     if data != 'foo':
-        gdaltest.post_reason('fail')
         print(data)
         return 'fail'
 
@@ -269,7 +258,6 @@ def method(request):
     with webserver.install_http_handler(handler):
         f = open_for_read('/vsioss/oss_fake_bucket/redirect')
         if f is None:
-            gdaltest.post_reason('fail')
             return 'fail'
         data = gdal.VSIFReadL(1, 4, f).decode('ascii')
         gdal.VSIFCloseL(f)
@@ -280,7 +268,6 @@ def method(request):
             print('Skipped on trusty branch, but should be investigated')
             return 'skip'
 
-        gdaltest.post_reason('fail')
         print(data)
         return 'fail'
 
@@ -289,13 +276,11 @@ def method(request):
     with webserver.install_http_handler(handler):
         f = open_for_read('/vsioss_streaming/oss_fake_bucket/redirect')
         if f is None:
-            gdaltest.post_reason('fail')
             return 'fail'
         data = gdal.VSIFReadL(1, 4, f).decode('ascii')
         gdal.VSIFCloseL(f)
 
     if data != 'foo':
-        gdaltest.post_reason('fail')
         print(data)
         return 'fail'
 
@@ -324,7 +309,6 @@ def method(request):
         with gdaltest.error_handler():
             f = open_for_read('/vsioss_streaming/oss_fake_bucket/non_xml_error')
     if f is not None or gdal.VSIGetLastErrorMsg().find('bla') < 0:
-        gdaltest.post_reason('fail')
         print(gdal.VSIGetLastErrorMsg())
         return 'fail'
 
@@ -340,7 +324,6 @@ def method(request):
         with gdaltest.error_handler():
             f = open_for_read('/vsioss_streaming/oss_fake_bucket/invalid_xml_error')
     if f is not None or gdal.VSIGetLastErrorMsg().find('<oops>') < 0:
-        gdaltest.post_reason('fail')
         print(gdal.VSIGetLastErrorMsg())
         return 'fail'
 
@@ -356,7 +339,6 @@ def method(request):
         with gdaltest.error_handler():
             f = open_for_read('/vsioss_streaming/oss_fake_bucket/no_code_in_error')
     if f is not None or gdal.VSIGetLastErrorMsg().find('<Error/>') < 0:
-        gdaltest.post_reason('fail')
         print(gdal.VSIGetLastErrorMsg())
         return 'fail'
 
@@ -372,7 +354,6 @@ def method(request):
         with gdaltest.error_handler():
             f = open_for_read('/vsioss_streaming/oss_fake_bucket/no_region_in_AuthorizationHeaderMalformed_error')
     if f is not None or gdal.VSIGetLastErrorMsg().find('<Error>') < 0:
-        gdaltest.post_reason('fail')
         print(gdal.VSIGetLastErrorMsg())
         return 'fail'
 
@@ -388,7 +369,6 @@ def method(request):
         with gdaltest.error_handler():
             f = open_for_read('/vsioss_streaming/oss_fake_bucket/no_endpoint_in_PermanentRedirect_error')
     if f is not None or gdal.VSIGetLastErrorMsg().find('<Error>') < 0:
-        gdaltest.post_reason('fail')
         print(gdal.VSIGetLastErrorMsg())
         return 'fail'
 
@@ -404,7 +384,6 @@ def method(request):
         with gdaltest.error_handler():
             f = open_for_read('/vsioss_streaming/oss_fake_bucket/no_message_in_error')
     if f is not None or gdal.VSIGetLastErrorMsg().find('<Error>') < 0:
-        gdaltest.post_reason('fail')
         print(gdal.VSIGetLastErrorMsg())
         return 'fail'
 
@@ -473,27 +452,22 @@ def method(request):
             print('Skipped on trusty branch, but should be investigated')
             return 'skip'
 
-        gdaltest.post_reason('fail')
         return 'fail'
     gdal.VSIFCloseL(f)
 
     with webserver.install_http_handler(webserver.SequentialHandler()):
         dir_contents = gdal.ReadDir('/vsioss/oss_fake_bucket2/a_dir')
     if dir_contents != ['resource3.bin', 'resource4.bin', 'subdir']:
-        gdaltest.post_reason('fail')
         print(dir_contents)
         return 'fail'
     if gdal.VSIStatL('/vsioss/oss_fake_bucket2/a_dir/resource3.bin').size != 123456:
-        gdaltest.post_reason('fail')
         return 'fail'
     if gdal.VSIStatL('/vsioss/oss_fake_bucket2/a_dir/resource3.bin').mtime != 1:
-        gdaltest.post_reason('fail')
         return 'fail'
 
     # ReadDir on something known to be a file shouldn't cause network access
     dir_contents = gdal.ReadDir('/vsioss/oss_fake_bucket2/a_dir/resource3.bin')
     if dir_contents is not None:
-        gdaltest.post_reason('fail')
         return 'fail'
 
     # Test CPL_VSIL_CURL_NON_CACHED
@@ -510,13 +484,11 @@ def method(request):
             with webserver.install_http_handler(handler):
                 f = open_for_read('/vsioss/oss_non_cached/test.txt')
                 if f is None:
-                    gdaltest.post_reason('fail')
                     print(config_option_value)
                     return 'fail'
                 data = gdal.VSIFReadL(1, 3, f).decode('ascii')
                 gdal.VSIFCloseL(f)
                 if data != 'foo':
-                    gdaltest.post_reason('fail')
                     print(config_option_value)
                     print(data)
                     return 'fail'
@@ -527,7 +499,6 @@ def method(request):
             with webserver.install_http_handler(handler):
                 size = gdal.VSIStatL('/vsioss/oss_non_cached/test.txt').size
             if size != 4:
-                gdaltest.post_reason('fail')
                 print(config_option_value)
                 print(size)
                 return 'fail'
@@ -538,7 +509,6 @@ def method(request):
             with webserver.install_http_handler(handler):
                 size = gdal.VSIStatL('/vsioss/oss_non_cached/test.txt').size
                 if size != 3:
-                    gdaltest.post_reason('fail')
                     print(config_option_value)
                     print(data)
                     return 'fail'
@@ -549,13 +519,11 @@ def method(request):
             with webserver.install_http_handler(handler):
                 f = open_for_read('/vsioss/oss_non_cached/test.txt')
                 if f is None:
-                    gdaltest.post_reason('fail')
                     print(config_option_value)
                     return 'fail'
                 data = gdal.VSIFReadL(1, 4, f).decode('ascii')
                 gdal.VSIFCloseL(f)
                 if data != 'bar2':
-                    gdaltest.post_reason('fail')
                     print(config_option_value)
                     print(data)
                     return 'fail'
@@ -588,13 +556,11 @@ def method(request):
             with webserver.install_http_handler(handler):
                 f = open_for_read('/vsioss/oss_non_cached/test.txt')
                 if f is None:
-                    gdaltest.post_reason('fail')
                     print(config_option_value)
                     return 'fail'
                 data = gdal.VSIFReadL(1, 3, f).decode('ascii')
                 gdal.VSIFCloseL(f)
                 if data != 'foo':
-                    gdaltest.post_reason('fail')
                     print(config_option_value)
                     print(data)
                     return 'fail'
@@ -603,14 +569,12 @@ def method(request):
             with webserver.install_http_handler(handler):
                 f = open_for_read('/vsioss/oss_non_cached/test.txt')
                 if f is None:
-                    gdaltest.post_reason('fail')
                     print(config_option_value)
                     return 'fail'
                 data = gdal.VSIFReadL(1, 4, f).decode('ascii')
                 gdal.VSIFCloseL(f)
                 # We should still get foo because of caching
                 if data != 'foo':
-                    gdaltest.post_reason('fail')
                     print(config_option_value)
                     print(data)
                     return 'fail'
@@ -627,7 +591,6 @@ def method(request):
     with webserver.install_http_handler(handler):
         dir_contents = gdal.ReadDir('/vsioss/')
     if dir_contents != ['.']:
-        gdaltest.post_reason('fail')
         print(dir_contents)
         return 'fail'
 
@@ -648,7 +611,6 @@ def method(request):
     with webserver.install_http_handler(handler):
         dir_contents = gdal.ReadDir('/vsioss/')
     if dir_contents != ['mybucket']:
-        gdaltest.post_reason('fail')
         print(dir_contents)
         return 'fail'
 
@@ -667,14 +629,12 @@ def test_visoss_4():
         with gdaltest.error_handler():
             f = gdal.VSIFOpenL('/vsioss/oss_fake_bucket3', 'wb')
     if f is not None:
-        gdaltest.post_reason('fail')
         return 'fail'
 
     handler = webserver.SequentialHandler()
     handler.add('GET', '/oss_fake_bucket3/empty_file.bin', 200, {'Connection': 'close'}, 'foo')
     with webserver.install_http_handler(handler):
         if gdal.VSIStatL('/vsioss/oss_fake_bucket3/empty_file.bin').size != 3:
-            gdaltest.post_reason('fail')
             return 'fail'
 
     # Empty file
@@ -695,19 +655,16 @@ def method(request):
     with webserver.install_http_handler(handler):
         f = gdal.VSIFOpenL('/vsioss/oss_fake_bucket3/empty_file.bin', 'wb')
         if f is None:
-            gdaltest.post_reason('fail')
             return 'fail'
         gdal.ErrorReset()
         gdal.VSIFCloseL(f)
     if gdal.GetLastErrorMsg() != '':
-        gdaltest.post_reason('fail')
         return 'fail'
 
     handler = webserver.SequentialHandler()
     handler.add('GET', '/oss_fake_bucket3/empty_file.bin', 200, {'Connection': 'close'}, '')
     with webserver.install_http_handler(handler):
         if gdal.VSIStatL('/vsioss/oss_fake_bucket3/empty_file.bin').size != 0:
-            gdaltest.post_reason('fail')
             return 'fail'
 
     # Invalid seek
@@ -715,12 +672,10 @@ def method(request):
     with webserver.install_http_handler(handler):
         f = gdal.VSIFOpenL('/vsioss/oss_fake_bucket3/empty_file.bin', 'wb')
         if f is None:
-            gdaltest.post_reason('fail')
             return 'fail'
         with gdaltest.error_handler():
             ret = gdal.VSIFSeekL(f, 1, 0)
         if ret == 0:
-            gdaltest.post_reason('fail')
             return 'fail'
         gdal.VSIFCloseL(f)
 
@@ -729,12 +684,10 @@ def method(request):
     with webserver.install_http_handler(handler):
         f = gdal.VSIFOpenL('/vsioss/oss_fake_bucket3/empty_file.bin', 'wb')
         if f is None:
-            gdaltest.post_reason('fail')
             return 'fail'
         with gdaltest.error_handler():
             ret = gdal.VSIFReadL(1, 1, f)
         if ret:
-            gdaltest.post_reason('fail')
             return 'fail'
         gdal.VSIFCloseL(f)
 
@@ -744,38 +697,29 @@ def method(request):
     with webserver.install_http_handler(handler):
         f = gdal.VSIFOpenL('/vsioss/oss_fake_bucket3/empty_file_error.bin', 'wb')
         if f is None:
-            gdaltest.post_reason('fail')
             return 'fail'
         gdal.ErrorReset()
         with gdaltest.error_handler():
             gdal.VSIFCloseL(f)
     if gdal.GetLastErrorMsg() == '':
-        gdaltest.post_reason('fail')
         return 'fail'
 
     # Nominal case
     with webserver.install_http_handler(webserver.SequentialHandler()):
         f = gdal.VSIFOpenL('/vsioss/oss_fake_bucket3/another_file.bin', 'wb')
         if f is None:
-            gdaltest.post_reason('fail')
             return 'fail'
         if gdal.VSIFSeekL(f, gdal.VSIFTellL(f), 0) != 0:
-            gdaltest.post_reason('fail')
             return 'fail'
         if gdal.VSIFSeekL(f, 0, 1) != 0:
-            gdaltest.post_reason('fail')
             return 'fail'
         if gdal.VSIFSeekL(f, 0, 2) != 0:
-            gdaltest.post_reason('fail')
             return 'fail'
         if gdal.VSIFWriteL('foo', 1, 3, f) != 3:
-            gdaltest.post_reason('fail')
             return 'fail'
         if gdal.VSIFSeekL(f, gdal.VSIFTellL(f), 0) != 0:
-            gdaltest.post_reason('fail')
             return 'fail'
         if gdal.VSIFWriteL('bar', 1, 3, f) != 3:
-            gdaltest.post_reason('fail')
             return 'fail'
 
     handler = webserver.SequentialHandler()
@@ -808,7 +752,6 @@ def method(request):
     with webserver.install_http_handler(handler):
         gdal.VSIFCloseL(f)
     if gdal.GetLastErrorMsg() != '':
-        gdaltest.post_reason('fail')
         return 'fail'
 
     return 'success'
@@ -826,19 +769,16 @@ def test_visoss_5():
         with gdaltest.error_handler():
             ret = gdal.Unlink('/vsioss/foo')
     if ret == 0:
-        gdaltest.post_reason('fail')
         return 'fail'
 
     handler = webserver.SequentialHandler()
     handler.add('GET', '/oss_delete_bucket/delete_file', 200, {'Connection': 'close'}, 'foo')
     with webserver.install_http_handler(handler):
         if gdal.VSIStatL('/vsioss/oss_delete_bucket/delete_file').size != 3:
-            gdaltest.post_reason('fail')
             return 'fail'
 
     with webserver.install_http_handler(webserver.SequentialHandler()):
         if gdal.VSIStatL('/vsioss/oss_delete_bucket/delete_file').size != 3:
-            gdaltest.post_reason('fail')
             return 'fail'
 
     handler = webserver.SequentialHandler()
@@ -846,7 +786,6 @@ def test_visoss_5():
     with webserver.install_http_handler(handler):
         ret = gdal.Unlink('/vsioss/oss_delete_bucket/delete_file')
     if ret != 0:
-        gdaltest.post_reason('fail')
         return 'fail'
 
     handler = webserver.SequentialHandler()
@@ -854,7 +793,6 @@ def test_visoss_5():
     handler.add('GET', '/oss_delete_bucket/?delimiter=%2F&max-keys=100&prefix=delete_file%2F', 404, {'Connection': 'close'}, 'foo')
     with webserver.install_http_handler(handler):
         if gdal.VSIStatL('/vsioss/oss_delete_bucket/delete_file') is not None:
-            gdaltest.post_reason('fail')
             return 'fail'
 
     handler = webserver.SequentialHandler()
@@ -864,7 +802,6 @@ def test_visoss_5():
         with gdaltest.error_handler():
             ret = gdal.Unlink('/vsioss/oss_delete_bucket/delete_file_error')
     if ret == 0:
-        gdaltest.post_reason('fail')
         return 'fail'
 
     return 'success'
@@ -882,7 +819,6 @@ def test_visoss_6():
         with webserver.install_http_handler(webserver.SequentialHandler()):
             f = gdal.VSIFOpenL('/vsioss/oss_fake_bucket4/large_file.bin', 'wb')
     if f is None:
-        gdaltest.post_reason('fail')
         return 'fail'
     size = 1024 * 1024 + 1
     big_buffer = 'a' * size
@@ -917,7 +853,6 @@ def method(request):
     with webserver.install_http_handler(handler):
         ret = gdal.VSIFWriteL(big_buffer, 1, size, f)
     if ret != size:
-        gdaltest.post_reason('fail')
         return 'fail'
     handler = webserver.SequentialHandler()
 
@@ -966,7 +901,6 @@ def method(request):
     with webserver.install_http_handler(handler):
         gdal.VSIFCloseL(f)
     if gdal.GetLastErrorMsg() != '':
-        gdaltest.post_reason('fail')
         return 'fail'
 
     handler = webserver.SequentialHandler()
@@ -982,18 +916,15 @@ def method(request):
             with gdaltest.config_option('VSIOSS_CHUNK_SIZE', '1'):  # 1 MB
                 f = gdal.VSIFOpenL(filename, 'wb')
             if f is None:
-                gdaltest.post_reason('fail')
                 return 'fail'
             with gdaltest.error_handler():
                 ret = gdal.VSIFWriteL(big_buffer, 1, size, f)
             if ret != 0:
-                gdaltest.post_reason('fail')
                 print(ret)
                 return 'fail'
             gdal.ErrorReset()
             gdal.VSIFCloseL(f)
             if gdal.GetLastErrorMsg() != '':
-                gdaltest.post_reason('fail')
                 return 'fail'
 
     handler = webserver.SequentialHandler()
@@ -1013,20 +944,17 @@ def method(request):
             with gdaltest.config_option('VSIOSS_CHUNK_SIZE', '1'):  # 1 MB
                 f = gdal.VSIFOpenL(filename, 'wb')
             if f is None:
-                gdaltest.post_reason('fail')
                 print(filename)
                 return 'fail'
             with gdaltest.error_handler():
                 ret = gdal.VSIFWriteL(big_buffer, 1, size, f)
             if ret != 0:
-                gdaltest.post_reason('fail')
                 print(filename)
                 print(ret)
                 return 'fail'
             gdal.ErrorReset()
             gdal.VSIFCloseL(f)
             if gdal.GetLastErrorMsg() != '':
-                gdaltest.post_reason('fail')
                 print(filename)
                 return 'fail'
 
@@ -1042,13 +970,11 @@ def method(request):
         with gdaltest.config_option('VSIOSS_CHUNK_SIZE', '1'):  # 1 MB
             f = gdal.VSIFOpenL(filename, 'wb')
         if f is None:
-            gdaltest.post_reason('fail')
             print(filename)
             return 'fail'
         with gdaltest.error_handler():
             ret = gdal.VSIFWriteL(big_buffer, 1, size, f)
         if ret != 0:
-            gdaltest.post_reason('fail')
             print(filename)
             print(ret)
             return 'fail'
@@ -1056,7 +982,6 @@ def method(request):
         with gdaltest.error_handler():
             gdal.VSIFCloseL(f)
         if gdal.GetLastErrorMsg() == '':
-            gdaltest.post_reason('fail')
             print(filename)
             return 'fail'
 
@@ -1074,12 +999,10 @@ def method(request):
         with gdaltest.config_option('VSIOSS_CHUNK_SIZE', '1'):  # 1 MB
             f = gdal.VSIFOpenL(filename, 'wb')
             if f is None:
-                gdaltest.post_reason('fail')
                 print(filename)
                 return 'fail'
             ret = gdal.VSIFWriteL(big_buffer, 1, size, f)
             if ret != size:
-                gdaltest.post_reason('fail')
                 print(filename)
                 print(ret)
                 return 'fail'
@@ -1087,7 +1010,6 @@ def method(request):
             with gdaltest.error_handler():
                 gdal.VSIFCloseL(f)
             if gdal.GetLastErrorMsg() == '':
-                gdaltest.post_reason('fail')
                 print(filename)
                 return 'fail'
 
@@ -1109,7 +1031,6 @@ def test_visoss_7():
     with webserver.install_http_handler(handler):
         ret = gdal.Mkdir('/vsioss/oss_bucket_test_mkdir/dir', 0)
     if ret != 0:
-        gdaltest.post_reason('fail')
         return 'fail'
 
     # Try creating already existing directory
@@ -1118,7 +1039,6 @@ def test_visoss_7():
     with webserver.install_http_handler(handler):
         ret = gdal.Mkdir('/vsioss/oss_bucket_test_mkdir/dir', 0)
     if ret == 0:
-        gdaltest.post_reason('fail')
         return 'fail'
 
     handler = webserver.SequentialHandler()
@@ -1126,7 +1046,6 @@ def test_visoss_7():
     with webserver.install_http_handler(handler):
         ret = gdal.Rmdir('/vsioss/oss_bucket_test_mkdir/dir')
     if ret != 0:
-        gdaltest.post_reason('fail')
         return 'fail'
 
     # Try deleting already deleted directory
@@ -1136,7 +1055,6 @@ def test_visoss_7():
     with webserver.install_http_handler(handler):
         ret = gdal.Rmdir('/vsioss/oss_bucket_test_mkdir/dir')
     if ret == 0:
-        gdaltest.post_reason('fail')
         return 'fail'
 
     # Try deleting non-empty directory
@@ -1157,7 +1075,6 @@ def test_visoss_7():
     with webserver.install_http_handler(handler):
         ret = gdal.Rmdir('/vsioss/oss_bucket_test_mkdir/dir_nonempty')
     if ret == 0:
-        gdaltest.post_reason('fail')
         return 'fail'
 
     return 'success'
@@ -1191,20 +1108,17 @@ def test_visoss_8():
     with webserver.install_http_handler(handler):
         listdir = gdal.ReadDir('/vsioss/visoss_8', 0)
     if listdir != ['test', 'test/']:
-        gdaltest.post_reason('fail')
         print(listdir)
         return 'fail'
 
     handler = webserver.SequentialHandler()
     with webserver.install_http_handler(handler):
         if stat.S_ISDIR(gdal.VSIStatL('/vsioss/visoss_8/test').mode):
-            gdaltest.post_reason('fail')
             return 'fail'
 
     handler = webserver.SequentialHandler()
     with webserver.install_http_handler(handler):
         if not stat.S_ISDIR(gdal.VSIStatL('/vsioss/visoss_8/test/').mode):
-            gdaltest.post_reason('fail')
             return 'fail'
 
     return 'success'
@@ -1251,20 +1165,17 @@ def visoss_extra_1():
         path = '/vsioss/' + OSS_RESOURCE
         statres = gdal.VSIStatL(path)
         if statres is None or not stat.S_ISDIR(statres.mode):
-            gdaltest.post_reason('fail')
             print('%s is not a valid bucket' % path)
             return 'fail'
 
         readdir = gdal.ReadDir(path)
         if readdir is None:
-            gdaltest.post_reason('fail')
             print('ReadDir() should not return empty list')
             return 'fail'
         for filename in readdir:
             if filename != '.':
                 subpath = path + '/' + filename
                 if gdal.VSIStatL(subpath) is None:
-                    gdaltest.post_reason('fail')
                     print('Stat(%s) should not return an error' % subpath)
                     return 'fail'
 
@@ -1272,81 +1183,68 @@ def visoss_extra_1():
         subpath = path + '/' + unique_id
         ret = gdal.Mkdir(subpath, 0)
         if ret < 0:
-            gdaltest.post_reason('fail')
             print('Mkdir(%s) should not return an error' % subpath)
             return 'fail'
 
         readdir = gdal.ReadDir(path)
         if unique_id not in readdir:
-            gdaltest.post_reason('fail')
             print('ReadDir(%s) should contain %s' % (path, unique_id))
             print(readdir)
             return 'fail'
 
         ret = gdal.Mkdir(subpath, 0)
         if ret == 0:
-            gdaltest.post_reason('fail')
             print('Mkdir(%s) repeated should return an error' % subpath)
             return 'fail'
 
         ret = gdal.Rmdir(subpath)
         if ret < 0:
-            gdaltest.post_reason('fail')
             print('Rmdir(%s) should not return an error' % subpath)
             return 'fail'
 
         readdir = gdal.ReadDir(path)
         if unique_id in readdir:
-            gdaltest.post_reason('fail')
             print('ReadDir(%s) should not contain %s' % (path, unique_id))
             print(readdir)
             return 'fail'
 
         ret = gdal.Rmdir(subpath)
         if ret == 0:
-            gdaltest.post_reason('fail')
             print('Rmdir(%s) repeated should return an error' % subpath)
             return 'fail'
 
         ret = gdal.Mkdir(subpath, 0)
         if ret < 0:
-            gdaltest.post_reason('fail')
             print('Mkdir(%s) should not return an error' % subpath)
             return 'fail'
 
         f = gdal.VSIFOpenL(subpath + '/test.txt', 'wb')
         if f is None:
-            gdaltest.post_reason('fail')
             return 'fail'
         gdal.VSIFWriteL('hello', 1, 5, f)
         gdal.VSIFCloseL(f)
 
         ret = gdal.Rmdir(subpath)
         if ret == 0:
-            gdaltest.post_reason('fail')
             print('Rmdir(%s) on non empty directory should return an error' % subpath)
             return 'fail'
 
         f = gdal.VSIFOpenL(subpath + '/test.txt', 'rb')
         if f is None:
-            gdaltest.post_reason('fail')
             return 'fail'
         data = gdal.VSIFReadL(1, 5, f).decode('utf-8')
         if data != 'hello':
-            gdaltest.post_reason('fail')
             print(data)
             return 'fail'
         gdal.VSIFCloseL(f)
 
         ret = gdal.Unlink(subpath + '/test.txt')
         if ret < 0:
-            gdaltest.post_reason('fail')
             print('Unlink(%s) should not return an error' % (subpath + '/test.txt'))
             return 'fail'
 
         ret = gdal.Rmdir(subpath)
         if ret < 0:
-            gdaltest.post_reason('fail')
             print('Rmdir(%s) should not return an error' % subpath)
             return 'fail'
 
@@ -1354,27 +1252,23 @@ def visoss_extra_1():
 
     f = open_for_read('/vsioss/' + OSS_RESOURCE)
     if f is None:
-        gdaltest.post_reason('fail')
         print('cannot open %s' % ('/vsioss/' + OSS_RESOURCE))
         return 'fail'
     ret = gdal.VSIFReadL(1, 1, f)
     gdal.VSIFCloseL(f)
 
     if len(ret) != 1:
-        gdaltest.post_reason('fail')
         print(ret)
         return 'fail'
 
     # Same with /vsioss_streaming/
     f = open_for_read('/vsioss_streaming/' + OSS_RESOURCE)
     if f is None:
-        gdaltest.post_reason('fail')
         return 'fail'
     ret = gdal.VSIFReadL(1, 1, f)
     gdal.VSIFCloseL(f)
 
     if len(ret) != 1:
-        gdaltest.post_reason('fail')
         print(ret)
         return 'fail'
 
@@ -1387,7 +1281,6 @@ def visoss_extra_1():
             gdal.VSIFReadL(1, 1, f)
         gdal.VSIFCloseL(f)
         if gdal.VSIGetLastErrorMsg() == '':
-            gdaltest.post_reason('fail')
             print(gdal.VSIGetLastErrorMsg())
             return 'fail'
 
@@ -1395,7 +1288,6 @@ def visoss_extra_1():
     gdal.ErrorReset()
     f = open_for_read('/vsioss_streaming/' + OSS_RESOURCE + '/invalid_resource.baz')
     if f is not None:
-        gdaltest.post_reason('fail')
         print(gdal.VSIGetLastErrorMsg())
         return 'fail'
 
@@ -1403,13 +1295,11 @@ def visoss_extra_1():
     signed_url = gdal.GetSignedURL('/vsioss/' + OSS_RESOURCE)
     f = open_for_read('/vsicurl_streaming/' + signed_url)
     if f is None:
-        gdaltest.post_reason('fail')
         return 'fail'
     ret = gdal.VSIFReadL(1, 1, f)
     gdal.VSIFCloseL(f)
 
     if len(ret) != 1:
-        gdaltest.post_reason('fail')
         print(ret)
         return 'fail'
 
diff --git a/autotest/gcore/vsis3.py b/autotest/gcore/vsis3.py
index 1dff8c9d98b2..01760b786f32 100755
--- a/autotest/gcore/vsis3.py
+++ b/autotest/gcore/vsis3.py
@@ -62,7 +62,6 @@ def test_vsis3_init():
     gdal.SetConfigOption('CPL_AWS_EC2_CREDENTIALS_URL', '')
 
     if gdal.GetSignedURL('/vsis3/foo/bar') is not None:
-        gdaltest.post_reason('fail')
         return 'fail'
 
     return 'success'
@@ -79,13 +78,11 @@ def test_vsis3_no_sign_request():
     with gdaltest.config_option('AWS_NO_SIGN_REQUEST', 'YES'):
         actual_url = gdal.GetActualURL('/vsis3/landsat-pds/L8/001/002/LC80010022016230LGN00/LC80010022016230LGN00_B1.TIF')
         if actual_url != 'https://landsat-pds.s3.amazonaws.com/L8/001/002/LC80010022016230LGN00/LC80010022016230LGN00_B1.TIF':
-            gdaltest.post_reason('fail')
             print(actual_url)
             return 'fail'
 
         actual_url = gdal.GetActualURL('/vsis3_streaming/landsat-pds/L8/001/002/LC80010022016230LGN00/LC80010022016230LGN00_B1.TIF')
         if actual_url != 'https://landsat-pds.s3.amazonaws.com/L8/001/002/LC80010022016230LGN00/LC80010022016230LGN00_B1.TIF':
-            gdaltest.post_reason('fail')
             print(actual_url)
             return 'fail'
 
@@ -113,7 +110,6 @@ def test_vsis3_1():
     with gdaltest.error_handler():
         f = open_for_read('/vsis3/foo/bar')
     if f is not None or gdal.VSIGetLastErrorMsg().find('AWS_SECRET_ACCESS_KEY') < 0:
-        gdaltest.post_reason('fail')
         print(gdal.VSIGetLastErrorMsg())
         return 'fail'
 
@@ -121,7 +117,6 @@ def test_vsis3_1():
     with gdaltest.error_handler():
         f = open_for_read('/vsis3_streaming/foo/bar')
     if f is not None or gdal.VSIGetLastErrorMsg().find('AWS_SECRET_ACCESS_KEY') < 0:
-        gdaltest.post_reason('fail')
         print(gdal.VSIGetLastErrorMsg())
         return 'fail'
 
@@ -132,7 +127,6 @@ def test_vsis3_1():
     with gdaltest.error_handler():
         f = open_for_read('/vsis3/foo/bar')
     if f is not None or gdal.VSIGetLastErrorMsg().find('AWS_ACCESS_KEY_ID') < 0:
-        gdaltest.post_reason('fail')
         print(gdal.VSIGetLastErrorMsg())
         return 'fail'
 
@@ -147,7 +141,6 @@ def test_vsis3_1():
             gdal.VSIFCloseL(f)
         if gdal.GetConfigOption('APPVEYOR') is not None:
             return 'success'
-        gdaltest.post_reason('fail')
         print(gdal.VSIGetLastErrorMsg())
         return 'fail'
 
@@ -155,7 +148,6 @@ def test_vsis3_1():
     with gdaltest.error_handler():
         f = open_for_read('/vsis3_streaming/foo/bar.baz')
     if f is not None or gdal.VSIGetLastErrorMsg() == '':
-        gdaltest.post_reason('fail')
         print(gdal.VSIGetLastErrorMsg())
         return 'fail'
 
@@ -220,7 +212,6 @@ def test_vsis3_2():
     expected_url_8080 = 'http://127.0.0.1:8080/s3_fake_bucket/resource?X-Amz-Algorithm=AWS4-HMAC-SHA256&X-Amz-Credential=AWS_ACCESS_KEY_ID%2F20150101%2Fus-east-1%2Fs3%2Faws4_request&X-Amz-Date=20150101T000000Z&X-Amz-Expires=3600&X-Amz-Signature=dca239dd95f72ff8c37c15c840afc54cd19bdb07f7aaee2223108b5b0ad35da8&X-Amz-SignedHeaders=host'
     expected_url_8081 = 'http://127.0.0.1:8081/s3_fake_bucket/resource?X-Amz-Algorithm=AWS4-HMAC-SHA256&X-Amz-Credential=AWS_ACCESS_KEY_ID%2F20150101%2Fus-east-1%2Fs3%2Faws4_request&X-Amz-Date=20150101T000000Z&X-Amz-Expires=3600&X-Amz-Signature=ef5216bc5971863414c69f6ca095276c0d62c0da97fa4f6ab80c30bd7fc146ac&X-Amz-SignedHeaders=host'
     if signed_url not in (expected_url_8080, expected_url_8081):
-        gdaltest.post_reason('fail')
         print(signed_url)
         return 'fail'
 
@@ -230,13 +221,11 @@ def test_vsis3_2():
     with webserver.install_http_handler(handler):
         f = open_for_read('/vsis3/s3_fake_bucket/resource')
         if f is None:
-            gdaltest.post_reason('fail')
             return 'fail'
         data = gdal.VSIFReadL(1, 4, f).decode('ascii')
         gdal.VSIFCloseL(f)
 
         if data != 'foo':
-            gdaltest.post_reason('fail')
             print(data)
             return 'fail'
 
@@ -245,13 +234,11 @@ def test_vsis3_2():
     with webserver.install_http_handler(handler):
         f = open_for_read('/vsis3_streaming/s3_fake_bucket/resource')
         if f is None:
-            gdaltest.post_reason('fail')
             return 'fail'
         data = gdal.VSIFReadL(1, 4, f).decode('ascii')
         gdal.VSIFCloseL(f)
 
     if data != 'foo':
-        gdaltest.post_reason('fail')
         print(data)
         return 'fail'
 
@@ -284,7 +271,6 @@ def method(request):
         with webserver.install_http_handler(handler):
             f = open_for_read('/vsis3/s3_fake_bucket_with_session_token/resource')
             if f is None:
-                gdaltest.post_reason('fail')
                 return 'fail'
             data = gdal.VSIFReadL(1, 4, f).decode('ascii')
             gdal.VSIFCloseL(f)
@@ -321,7 +307,6 @@ def method(request):
         stat_res = gdal.VSIStatL('/vsis3/s3_fake_bucket/resource2.bin')
         # gdal.SetConfigOption('GDAL_DISABLE_READDIR_ON_OPEN', old_val)
         if stat_res is None or stat_res.size != 1000000:
-            gdaltest.post_reason('fail')
             if stat_res is not None:
                 print(stat_res.size)
             else:
@@ -336,7 +321,6 @@ def method(request):
     with webserver.install_http_handler(handler):
         stat_res = gdal.VSIStatL('/vsis3_streaming/s3_fake_bucket/resource2.bin')
     if stat_res is None or stat_res.size != 1000000:
-        gdaltest.post_reason('fail')
         if stat_res is not None:
             print(stat_res.size)
         else:
@@ -398,7 +382,6 @@ def method(request):
     with webserver.install_http_handler(handler):
         f = open_for_read('/vsis3/s3_fake_bucket/redirect')
         if f is None:
-            gdaltest.post_reason('fail')
             return 'fail'
         data = gdal.VSIFReadL(1, 4, f).decode('ascii')
         gdal.VSIFCloseL(f)
@@ -409,7 +392,6 @@ def method(request):
             print('Skipped on trusty branch, but should be investigated')
             return 'skip'
 
-        gdaltest.post_reason('fail')
         print(data)
         return 'fail'
 
@@ -418,13 +400,11 @@ def method(request):
     with webserver.install_http_handler(handler):
         f = open_for_read('/vsis3_streaming/s3_fake_bucket/redirect')
         if f is None:
-            gdaltest.post_reason('fail')
             return 'fail'
         data = gdal.VSIFReadL(1, 4, f).decode('ascii')
         gdal.VSIFCloseL(f)
 
     if data != 'foo':
-        gdaltest.post_reason('fail')
         print(data)
         return 'fail'
 
@@ -454,7 +434,6 @@ def method(request):
         with gdaltest.error_handler():
             f = open_for_read('/vsis3_streaming/s3_fake_bucket/non_xml_error')
     if f is not None or gdal.VSIGetLastErrorMsg().find('bla') < 0:
-        gdaltest.post_reason('fail')
         print(gdal.VSIGetLastErrorMsg())
         return 'fail'
 
@@ -470,7 +449,6 @@ def method(request):
         with gdaltest.error_handler():
             f = open_for_read('/vsis3_streaming/s3_fake_bucket/invalid_xml_error')
     if f is not None or gdal.VSIGetLastErrorMsg().find('<oops>') < 0:
-        gdaltest.post_reason('fail')
         print(gdal.VSIGetLastErrorMsg())
         return 'fail'
 
@@ -486,7 +464,6 @@ def method(request):
         with gdaltest.error_handler():
             f = open_for_read('/vsis3_streaming/s3_fake_bucket/no_code_in_error')
     if f is not None or gdal.VSIGetLastErrorMsg().find('<Error/>') < 0:
-        gdaltest.post_reason('fail')
         print(gdal.VSIGetLastErrorMsg())
         return 'fail'
 
@@ -502,7 +479,6 @@ def method(request):
         with gdaltest.error_handler():
             f = open_for_read('/vsis3_streaming/s3_fake_bucket/no_region_in_AuthorizationHeaderMalformed_error')
     if f is not None or gdal.VSIGetLastErrorMsg().find('<Error>') < 0:
-        gdaltest.post_reason('fail')
         print(gdal.VSIGetLastErrorMsg())
         return 'fail'
 
@@ -518,7 +494,6 @@ def method(request):
         with gdaltest.error_handler():
             f = open_for_read('/vsis3_streaming/s3_fake_bucket/no_endpoint_in_PermanentRedirect_error')
     if f is not None or gdal.VSIGetLastErrorMsg().find('<Error>') < 0:
-        gdaltest.post_reason('fail')
         print(gdal.VSIGetLastErrorMsg())
         return 'fail'
 
@@ -534,7 +509,6 @@ def method(request):
         with gdaltest.error_handler():
             f = open_for_read('/vsis3_streaming/s3_fake_bucket/no_message_in_error')
     if f is not None or gdal.VSIGetLastErrorMsg().find('<Error>') < 0:
-        gdaltest.post_reason('fail')
         print(gdal.VSIGetLastErrorMsg())
         return 'fail'
 
@@ -571,13 +545,11 @@ def method(request):
             with gdaltest.error_handler():
                 f = open_for_read('/vsis3/s3_fake_bucket_with_requester_pays/resource')
                 if f is None:
-                    gdaltest.post_reason('fail')
                     return 'fail'
                 data = gdal.VSIFReadL(1, 3, f).decode('ascii')
                 gdal.VSIFCloseL(f)
 
     if data != 'foo':
-        gdaltest.post_reason('fail')
         return 'fail'
 
     # Test temporary redirect
@@ -626,13 +598,11 @@ def method_req_2(self, request):
     with webserver.install_http_handler(handler):
         f = open_for_read('/vsis3/s3_test_temporary_redirect_read/resource')
         if f is None:
-            gdaltest.post_reason('fail')
             return 'fail'
         data = gdal.VSIFReadL(1, 3, f).decode('ascii')
         gdal.VSIFCloseL(f)
 
     if data != 'foo':
-        gdaltest.post_reason('fail')
         print(data)
         return 'fail'
 
@@ -646,13 +616,11 @@ def method_req_2(self, request):
     with webserver.install_http_handler(handler):
         f = open_for_read('/vsis3/s3_test_temporary_redirect_read/resource2')
         if f is None:
-            gdaltest.post_reason('fail')
             return 'fail'
         data = gdal.VSIFReadL(1, 3, f).decode('ascii')
         gdal.VSIFCloseL(f)
 
     if data != 'bar':
-        gdaltest.post_reason('fail')
         print(data)
         return 'fail'
 
@@ -759,47 +727,39 @@ def method(request):
             print('Skipped on trusty branch, but should be investigated')
             return 'skip'
 
-        gdaltest.post_reason('fail')
         return 'fail'
     gdal.VSIFCloseL(f)
 
     with webserver.install_http_handler(webserver.SequentialHandler()):
         dir_contents = gdal.ReadDir('/vsis3/s3_fake_bucket2/a_dir')
     if dir_contents != ['resource3.bin', 'resource4.bin', 'subdir']:
-        gdaltest.post_reason('fail')
         print(dir_contents)
         return 'fail'
 
     if gdal.VSIStatL('/vsis3/s3_fake_bucket2/a_dir/resource3.bin').size != 123456:
-        gdaltest.post_reason('fail')
         return 'fail'
     if gdal.VSIStatL('/vsis3/s3_fake_bucket2/a_dir/resource3.bin').mtime != 1:
-        gdaltest.post_reason('fail')
         return 'fail'
 
     # Same as above: cached
     dir_contents = gdal.ReadDir('/vsis3/s3_fake_bucket2/a_dir')
     if dir_contents != ['resource3.bin', 'resource4.bin', 'subdir']:
-        gdaltest.post_reason('fail')
         print(dir_contents)
         return 'fail'
 
     # ReadDir on something known to be a file shouldn't cause network access
     dir_contents = gdal.ReadDir('/vsis3/s3_fake_bucket2/a_dir/resource3.bin')
     if dir_contents is not None:
-        gdaltest.post_reason('fail')
         return 'fail'
 
     # Test unrelated partial clear of the cache
     gdal.VSICurlPartialClearCache('/vsis3/s3_fake_bucket_unrelated')
 
     if gdal.VSIStatL('/vsis3/s3_fake_bucket2/a_dir/resource3.bin').size != 123456:
-        gdaltest.post_reason('fail')
         return 'fail'
 
     dir_contents = gdal.ReadDir('/vsis3/s3_fake_bucket2/a_dir')
     if dir_contents != ['resource3.bin', 'resource4.bin', 'subdir']:
-        gdaltest.post_reason('fail')
         print(dir_contents)
         return 'fail'
 
@@ -827,7 +787,6 @@ def method(request):
     with webserver.install_http_handler(handler):
         dir_contents = gdal.ReadDir('/vsis3/s3_fake_bucket2/a_dir')
     if dir_contents != ['test.txt']:
-        gdaltest.post_reason('fail')
         print(dir_contents)
         return 'fail'
 
@@ -857,7 +816,6 @@ def method(request):
         with webserver.install_http_handler(handler):
             dir_contents = gdal.ReadDir('/vsis3/s3_fake_bucket2/a_dir')
     if dir_contents != ['resource4.bin', 'i_am_a_glacier_file', 'subdir']:
-        gdaltest.post_reason('fail')
         print(dir_contents)
         return 'fail'
 
@@ -876,13 +834,11 @@ def method(request):
             with webserver.install_http_handler(handler):
                 f = open_for_read('/vsis3/s3_non_cached/test.txt')
                 if f is None:
-                    gdaltest.post_reason('fail')
                     print(config_option_value)
                     return 'fail'
                 data = gdal.VSIFReadL(1, 3, f).decode('ascii')
                 gdal.VSIFCloseL(f)
                 if data != 'foo':
-                    gdaltest.post_reason('fail')
                     print(config_option_value)
                     print(data)
                     return 'fail'
@@ -893,7 +849,6 @@ def method(request):
             with webserver.install_http_handler(handler):
                 size = gdal.VSIStatL('/vsis3/s3_non_cached/test.txt').size
             if size != 4:
-                gdaltest.post_reason('fail')
                 print(config_option_value)
                 print(size)
                 return 'fail'
@@ -904,7 +859,6 @@ def method(request):
             with webserver.install_http_handler(handler):
                 size = gdal.VSIStatL('/vsis3/s3_non_cached/test.txt').size
                 if size != 3:
-                    gdaltest.post_reason('fail')
                     print(config_option_value)
                     print(data)
                     return 'fail'
@@ -915,13 +869,11 @@ def method(request):
             with webserver.install_http_handler(handler):
                 f = open_for_read('/vsis3/s3_non_cached/test.txt')
                 if f is None:
-                    gdaltest.post_reason('fail')
                     print(config_option_value)
                     return 'fail'
                 data = gdal.VSIFReadL(1, 4, f).decode('ascii')
                 gdal.VSIFCloseL(f)
                 if data != 'bar2':
-                    gdaltest.post_reason('fail')
                     print(config_option_value)
                     print(data)
                     return 'fail'
@@ -954,13 +906,11 @@ def method(request):
             with webserver.install_http_handler(handler):
                 f = open_for_read('/vsis3/s3_non_cached/test.txt')
                 if f is None:
-                    gdaltest.post_reason('fail')
                     print(config_option_value)
                     return 'fail'
                 data = gdal.VSIFReadL(1, 3, f).decode('ascii')
                 gdal.VSIFCloseL(f)
                 if data != 'foo':
-                    gdaltest.post_reason('fail')
                     print(config_option_value)
                     print(data)
                     return 'fail'
@@ -969,14 +919,12 @@ def method(request):
             with webserver.install_http_handler(handler):
                 f = open_for_read('/vsis3/s3_non_cached/test.txt')
                 if f is None:
-                    gdaltest.post_reason('fail')
                     print(config_option_value)
                     return 'fail'
                 data = gdal.VSIFReadL(1, 4, f).decode('ascii')
                 gdal.VSIFCloseL(f)
                 # We should still get foo because of caching
                 if data != 'foo':
-                    gdaltest.post_reason('fail')
                     print(config_option_value)
                     print(data)
                     return 'fail'
@@ -993,7 +941,6 @@ def method(request):
     with webserver.install_http_handler(handler):
         dir_contents = gdal.ReadDir('/vsis3/')
     if dir_contents != ['.']:
-        gdaltest.post_reason('fail')
         print(dir_contents)
         return 'fail'
 
@@ -1014,7 +961,6 @@ def method(request):
     with webserver.install_http_handler(handler):
         dir_contents = gdal.ReadDir('/vsis3/')
     if dir_contents != ['mybucket']:
-        gdaltest.post_reason('fail')
         print(dir_contents)
         return 'fail'
 
@@ -1072,7 +1018,6 @@ def method_req_2(self, request):
     with webserver.install_http_handler(handler):
         dir_contents = gdal.ReadDir('/vsis3/s3_test_temporary_redirect_read_dir')
     if dir_contents != ['test']:
-        gdaltest.post_reason('fail')
         print(dir_contents)
         return 'fail'
 
@@ -1093,7 +1038,6 @@ def method_req_2(self, request):
     with webserver.install_http_handler(handler):
         dir_contents = gdal.ReadDir('/vsis3/s3_test_temporary_redirect_read_dir/test')
     if dir_contents != ['test2']:
-        gdaltest.post_reason('fail')
         print(dir_contents)
         return 'fail'
 
@@ -1135,46 +1079,37 @@ def test_vsis3_opendir():
     with webserver.install_http_handler(handler):
         d = gdal.OpenDir('/vsis3/vsis3_opendir')
     if d is None:
-        gdaltest.post_reason('fail')
         return 'fail'
 
     entry = gdal.GetNextDirEntry(d)
     if entry.name != 'test.txt':
-        gdaltest.post_reason('fail')
         print(entry.name)
         return 'fail'
     if entry.size != 40:
-        gdaltest.post_reason('fail')
         print(entry.size)
         return 'fail'
     if entry.mode != 32768:
-        gdaltest.post_reason('fail')
         print(entry.mode)
         return 'fail'
     if entry.mtime != 1:
-        gdaltest.post_reason('fail')
         print(entry.mtime)
         return 'fail'
 
     entry = gdal.GetNextDirEntry(d)
     if entry.name != 'subdir':
-        gdaltest.post_reason('fail')
         print(entry.name)
         return 'fail'
     if entry.mode != 16384:
-        gdaltest.post_reason('fail')
         print(entry.mode)
         return 'fail'
 
     entry = gdal.GetNextDirEntry(d)
     if entry.name != 'subdir/test.txt':
-        gdaltest.post_reason('fail')
         print(entry.name)
         return 'fail'
 
     entry = gdal.GetNextDirEntry(d)
     if entry is not None:
-        gdaltest.post_reason('fail')
         return 'fail'
 
     gdal.CloseDir(d)
@@ -1199,40 +1134,32 @@ def test_vsis3_opendir():
     with webserver.install_http_handler(handler):
         d = gdal.OpenDir('/vsis3/vsis3_opendir', 0)
     if d is None:
-        gdaltest.post_reason('fail')
         return 'fail'
 
     entry = gdal.GetNextDirEntry(d)
     if entry.name != 'test.txt':
-        gdaltest.post_reason('fail')
         print(entry.name)
         return 'fail'
     if entry.size != 40:
-        gdaltest.post_reason('fail')
         print(entry.size)
         return 'fail'
     if entry.mode != 32768:
-        gdaltest.post_reason('fail')
         print(entry.mode)
         return 'fail'
     if entry.mtime != 1:
-        gdaltest.post_reason('fail')
         print(entry.mtime)
         return 'fail'
 
     entry = gdal.GetNextDirEntry(d)
     if entry.name != 'subdir':
-        gdaltest.post_reason('fail')
         print(entry.name)
         return 'fail'
     if entry.mode != 16384:
-        gdaltest.post_reason('fail')
         print(entry.mode)
         return 'fail'
 
     entry = gdal.GetNextDirEntry(d)
     if entry is not None:
-        gdaltest.post_reason('fail')
         return 'fail'
 
     gdal.CloseDir(d)
@@ -1257,34 +1184,27 @@ def test_vsis3_opendir():
     with webserver.install_http_handler(handler):
         d = gdal.OpenDir('/vsis3/vsis3_opendir', 1)
         if d is None:
-            gdaltest.post_reason('fail')
             return 'fail'
 
     entry = gdal.GetNextDirEntry(d)
     if entry.name != 'test.txt':
-        gdaltest.post_reason('fail')
         print(entry.name)
         return 'fail'
     if entry.size != 40:
-        gdaltest.post_reason('fail')
         print(entry.size)
         return 'fail'
     if entry.mode != 32768:
-        gdaltest.post_reason('fail')
         print(entry.mode)
         return 'fail'
     if entry.mtime != 1:
-        gdaltest.post_reason('fail')
         print(entry.mtime)
         return 'fail'
 
     entry = gdal.GetNextDirEntry(d)
     if entry.name != 'subdir':
-        gdaltest.post_reason('fail')
         print(entry.name)
         return 'fail'
     if entry.mode != 16384:
-        gdaltest.post_reason('fail')
         print(entry.mode)
         return 'fail'
 
@@ -1304,13 +1224,11 @@ def test_vsis3_opendir():
     with webserver.install_http_handler(handler):
         entry = gdal.GetNextDirEntry(d)
         if entry.name != 'subdir/test.txt':
-            gdaltest.post_reason('fail')
             print(entry.name)
             return 'fail'
 
     entry = gdal.GetNextDirEntry(d)
     if entry is not None:
-        gdaltest.post_reason('fail')
         return 'fail'
 
     gdal.CloseDir(d)
@@ -1332,14 +1250,12 @@ def test_vsis3_4():
         with gdaltest.error_handler():
             f = gdal.VSIFOpenL('/vsis3/s3_fake_bucket3', 'wb')
     if f is not None:
-        gdaltest.post_reason('fail')
         return 'fail'
 
     handler = webserver.SequentialHandler()
     handler.add('GET', '/s3_fake_bucket3/empty_file.bin', 200, {'Connection': 'close'}, 'foo')
     with webserver.install_http_handler(handler):
         if gdal.VSIStatL('/vsis3/s3_fake_bucket3/empty_file.bin').size != 3:
-            gdaltest.post_reason('fail')
             return 'fail'
 
     # Empty file
@@ -1360,19 +1276,16 @@ def method(request):
     with webserver.install_http_handler(handler):
         f = gdal.VSIFOpenL('/vsis3/s3_fake_bucket3/empty_file.bin', 'wb')
         if f is None:
-            gdaltest.post_reason('fail')
             return 'fail'
         gdal.ErrorReset()
         gdal.VSIFCloseL(f)
     if gdal.GetLastErrorMsg() != '':
-        gdaltest.post_reason('fail')
         return 'fail'
 
     handler = webserver.SequentialHandler()
     handler.add('GET', '/s3_fake_bucket3/empty_file.bin', 200, {'Connection': 'close'}, '')
     with webserver.install_http_handler(handler):
         if gdal.VSIStatL('/vsis3/s3_fake_bucket3/empty_file.bin').size != 0:
-            gdaltest.post_reason('fail')
             return 'fail'
 
     # Invalid seek
@@ -1380,12 +1293,10 @@ def method(request):
     with webserver.install_http_handler(handler):
         f = gdal.VSIFOpenL('/vsis3/s3_fake_bucket3/empty_file.bin', 'wb')
         if f is None:
-            gdaltest.post_reason('fail')
             return 'fail'
         with gdaltest.error_handler():
             ret = gdal.VSIFSeekL(f, 1, 0)
         if ret == 0:
-            gdaltest.post_reason('fail')
             return 'fail'
         gdal.VSIFCloseL(f)
 
@@ -1394,12 +1305,10 @@ def method(request):
     with webserver.install_http_handler(handler):
         f = gdal.VSIFOpenL('/vsis3/s3_fake_bucket3/empty_file.bin', 'wb')
         if f is None:
-            gdaltest.post_reason('fail')
             return 'fail'
         with gdaltest.error_handler():
             ret = gdal.VSIFReadL(1, 1, f)
         if ret:
-            gdaltest.post_reason('fail')
             return 'fail'
         gdal.VSIFCloseL(f)
 
@@ -1409,38 +1318,29 @@ def method(request):
     with webserver.install_http_handler(handler):
         f = gdal.VSIFOpenL('/vsis3/s3_fake_bucket3/empty_file_error.bin', 'wb')
         if f is None:
-            gdaltest.post_reason('fail')
             return 'fail'
         gdal.ErrorReset()
         with gdaltest.error_handler():
             gdal.VSIFCloseL(f)
     if gdal.GetLastErrorMsg() == '':
-        gdaltest.post_reason('fail')
         return 'fail'
 
     # Nominal case
     with webserver.install_http_handler(webserver.SequentialHandler()):
         f = gdal.VSIFOpenL('/vsis3/s3_fake_bucket3/another_file.bin', 'wb')
         if f is None:
-            gdaltest.post_reason('fail')
             return 'fail'
         if gdal.VSIFSeekL(f, gdal.VSIFTellL(f), 0) != 0:
-            gdaltest.post_reason('fail')
             return 'fail'
         if gdal.VSIFSeekL(f, 0, 1) != 0:
-            gdaltest.post_reason('fail')
             return 'fail'
         if gdal.VSIFSeekL(f, 0, 2) != 0:
-            gdaltest.post_reason('fail')
             return 'fail'
         if gdal.VSIFWriteL('foo', 1, 3, f) != 3:
-            gdaltest.post_reason('fail')
             return 'fail'
         if gdal.VSIFSeekL(f, gdal.VSIFTellL(f), 0) != 0:
-            gdaltest.post_reason('fail')
             return 'fail'
         if gdal.VSIFWriteL('bar', 1, 3, f) != 3:
-            gdaltest.post_reason('fail')
             return 'fail'
 
     handler = webserver.SequentialHandler()
@@ -1473,17 +1373,14 @@ def method(request):
     with webserver.install_http_handler(handler):
         gdal.VSIFCloseL(f)
     if gdal.GetLastErrorMsg() != '':
-        gdaltest.post_reason('fail')
         return 'fail'
 
     # Redirect case
     with webserver.install_http_handler(webserver.SequentialHandler()):
         f = gdal.VSIFOpenL('/vsis3/s3_fake_bucket3/redirect', 'wb')
         if f is None:
-            gdaltest.post_reason('fail')
             return 'fail'
         if gdal.VSIFWriteL('foobar', 1, 6, f) != 6:
-            gdaltest.post_reason('fail')
             return 'fail'
 
     handler = webserver.SequentialHandler()
@@ -1529,7 +1426,6 @@ def method(request):
     with webserver.install_http_handler(handler):
         gdal.VSIFCloseL(f)
     if gdal.GetLastErrorMsg() != '':
-        gdaltest.post_reason('fail')
         return 'fail'
 
     return 'success'
@@ -1547,20 +1443,17 @@ def test_vsis3_5():
         with gdaltest.error_handler():
             ret = gdal.Unlink('/vsis3/foo')
     if ret == 0:
-        gdaltest.post_reason('fail')
         return 'fail'
 
     handler = webserver.SequentialHandler()
     handler.add('GET', '/s3_delete_bucket/delete_file', 200, {'Connection': 'close'}, 'foo')
     with webserver.install_http_handler(handler):
         if gdal.VSIStatL('/vsis3/s3_delete_bucket/delete_file').size != 3:
-            gdaltest.post_reason('fail')
             return 'fail'
 
     handler = webserver.SequentialHandler()
     with webserver.install_http_handler(handler):
         if gdal.VSIStatL('/vsis3/s3_delete_bucket/delete_file').size != 3:
-            gdaltest.post_reason('fail')
             return 'fail'
 
     handler = webserver.SequentialHandler()
@@ -1568,7 +1461,6 @@ def test_vsis3_5():
     with webserver.install_http_handler(handler):
         ret = gdal.Unlink('/vsis3/s3_delete_bucket/delete_file')
     if ret != 0:
-        gdaltest.post_reason('fail')
         return 'fail'
 
     handler = webserver.SequentialHandler()
@@ -1576,7 +1468,6 @@ def test_vsis3_5():
     handler.add('GET', '/s3_delete_bucket/?delimiter=%2F&max-keys=100&prefix=delete_file%2F', 404, {'Connection': 'close'})
     with webserver.install_http_handler(handler):
         if gdal.VSIStatL('/vsis3/s3_delete_bucket/delete_file') is not None:
-            gdaltest.post_reason('fail')
             return 'fail'
 
     handler = webserver.SequentialHandler()
@@ -1586,7 +1477,6 @@ def test_vsis3_5():
         with gdaltest.error_handler():
             ret = gdal.Unlink('/vsis3/s3_delete_bucket/delete_file_error')
     if ret == 0:
-        gdaltest.post_reason('fail')
         return 'fail'
 
     handler = webserver.SequentialHandler()
@@ -1619,7 +1509,6 @@ def method(request):
     with webserver.install_http_handler(handler):
         ret = gdal.Unlink('/vsis3/s3_delete_bucket/redirect')
     if ret != 0:
-        gdaltest.post_reason('fail')
         return 'fail'
 
     return 'success'
@@ -1637,7 +1526,6 @@ def test_vsis3_6():
         with webserver.install_http_handler(webserver.SequentialHandler()):
             f = gdal.VSIFOpenL('/vsis3/s3_fake_bucket4/large_file.bin', 'wb')
     if f is None:
-        gdaltest.post_reason('fail')
         return 'fail'
     size = 1024 * 1024 + 1
     big_buffer = 'a' * size
@@ -1687,7 +1575,6 @@ def method(request):
     with webserver.install_http_handler(handler):
         ret = gdal.VSIFWriteL(big_buffer, 1, size, f)
     if ret != size:
-        gdaltest.post_reason('fail')
         return 'fail'
     handler = webserver.SequentialHandler()
 
@@ -1736,7 +1623,6 @@ def method(request):
     with webserver.install_http_handler(handler):
         gdal.VSIFCloseL(f)
     if gdal.GetLastErrorMsg() != '':
-        gdaltest.post_reason('fail')
         return 'fail'
 
     handler = webserver.SequentialHandler()
@@ -1752,18 +1638,15 @@ def method(request):
             with gdaltest.config_option('VSIS3_CHUNK_SIZE', '1'):  # 1 MB
                 f = gdal.VSIFOpenL(filename, 'wb')
             if f is None:
-                gdaltest.post_reason('fail')
                 return 'fail'
             with gdaltest.error_handler():
                 ret = gdal.VSIFWriteL(big_buffer, 1, size, f)
             if ret != 0:
-                gdaltest.post_reason('fail')
                 print(ret)
                 return 'fail'
             gdal.ErrorReset()
             gdal.VSIFCloseL(f)
             if gdal.GetLastErrorMsg() != '':
-                gdaltest.post_reason('fail')
                 return 'fail'
 
     handler = webserver.SequentialHandler()
@@ -1783,20 +1666,17 @@ def method(request):
             with gdaltest.config_option('VSIS3_CHUNK_SIZE', '1'):  # 1 MB
                 f = gdal.VSIFOpenL(filename, 'wb')
             if f is None:
-                gdaltest.post_reason('fail')
                 print(filename)
                 return 'fail'
             with gdaltest.error_handler():
                 ret = gdal.VSIFWriteL(big_buffer, 1, size, f)
             if ret != 0:
-                gdaltest.post_reason('fail')
                 print(filename)
                 print(ret)
                 return 'fail'
             gdal.ErrorReset()
             gdal.VSIFCloseL(f)
             if gdal.GetLastErrorMsg() != '':
-                gdaltest.post_reason('fail')
                 print(filename)
                 return 'fail'
 
@@ -1812,13 +1692,11 @@ def method(request):
         with gdaltest.config_option('VSIS3_CHUNK_SIZE', '1'):  # 1 MB
             f = gdal.VSIFOpenL(filename, 'wb')
         if f is None:
-            gdaltest.post_reason('fail')
             print(filename)
             return 'fail'
         with gdaltest.error_handler():
             ret = gdal.VSIFWriteL(big_buffer, 1, size, f)
         if ret != 0:
-            gdaltest.post_reason('fail')
             print(filename)
             print(ret)
             return 'fail'
@@ -1826,7 +1704,6 @@ def method(request):
         with gdaltest.error_handler():
             gdal.VSIFCloseL(f)
         if gdal.GetLastErrorMsg() == '':
-            gdaltest.post_reason('fail')
             print(filename)
             return 'fail'
 
@@ -1844,12 +1721,10 @@ def method(request):
         with gdaltest.config_option('VSIS3_CHUNK_SIZE', '1'):  # 1 MB
             f = gdal.VSIFOpenL(filename, 'wb')
             if f is None:
-                gdaltest.post_reason('fail')
                 print(filename)
                 return 'fail'
             ret = gdal.VSIFWriteL(big_buffer, 1, size, f)
             if ret != size:
-                gdaltest.post_reason('fail')
                 print(filename)
                 print(ret)
                 return 'fail'
@@ -1857,7 +1732,6 @@ def method(request):
             with gdaltest.error_handler():
                 gdal.VSIFCloseL(f)
             if gdal.GetLastErrorMsg() == '':
-                gdaltest.post_reason('fail')
                 print(filename)
                 return 'fail'
 
@@ -1879,16 +1753,13 @@ def test_vsis3_7():
     with webserver.install_http_handler(handler):
         ret = gdal.Mkdir('/vsis3/s3_bucket_test_mkdir/dir', 0)
     if ret != 0:
-        gdaltest.post_reason('fail')
         return 'fail'
 
     if not stat.S_ISDIR(gdal.VSIStatL('/vsis3/s3_bucket_test_mkdir/dir').mode):
-        gdaltest.post_reason('fail')
         return 'fail'
 
     dir_content = gdal.ReadDir('/vsis3/s3_bucket_test_mkdir/dir')
     if dir_content != ['.']:
-        gdaltest.post_reason('fail')
         print(dir_content)
         return 'fail'
 
@@ -1898,7 +1769,6 @@ def test_vsis3_7():
     with webserver.install_http_handler(handler):
         ret = gdal.Mkdir('/vsis3/s3_bucket_test_mkdir/dir', 0)
     if ret == 0:
-        gdaltest.post_reason('fail')
         return 'fail'
 
     handler = webserver.SequentialHandler()
@@ -1906,7 +1776,6 @@ def test_vsis3_7():
     with webserver.install_http_handler(handler):
         ret = gdal.Rmdir('/vsis3/s3_bucket_test_mkdir/dir')
     if ret != 0:
-        gdaltest.post_reason('fail')
         return 'fail'
 
     # Try deleting already deleted directory
@@ -1916,7 +1785,6 @@ def test_vsis3_7():
     with webserver.install_http_handler(handler):
         ret = gdal.Rmdir('/vsis3/s3_bucket_test_mkdir/dir')
     if ret == 0:
-        gdaltest.post_reason('fail')
         return 'fail'
 
     # Try deleting non-empty directory
@@ -1937,7 +1805,6 @@ def test_vsis3_7():
     with webserver.install_http_handler(handler):
         ret = gdal.Rmdir('/vsis3/s3_bucket_test_mkdir/dir_nonempty')
     if ret == 0:
-        gdaltest.post_reason('fail')
         return 'fail'
 
     # Try stat'ing a directory not ending with slash
@@ -1957,7 +1824,6 @@ def test_vsis3_7():
                 """)
     with webserver.install_http_handler(handler):
         if not stat.S_ISDIR(gdal.VSIStatL('/vsis3/s3_bucket_test_dir_stat/test_dir_stat').mode):
-            gdaltest.post_reason('fail')
             return 'fail'
 
     # Try ReadDi'ing a directory not ending with slash
@@ -1976,7 +1842,6 @@ def test_vsis3_7():
                 """)
     with webserver.install_http_handler(handler):
         if gdal.ReadDir('/vsis3/s3_bucket_test_readdir/test_dirread') is None:
-            gdaltest.post_reason('fail')
             return 'fail'
 
     # Try stat'ing a directory ending with slash
@@ -1996,7 +1861,6 @@ def test_vsis3_7():
                 """)
     with webserver.install_http_handler(handler):
         if not stat.S_ISDIR(gdal.VSIStatL('/vsis3/s3_bucket_test_dir_stat_2/test_dir_stat/').mode):
-            gdaltest.post_reason('fail')
             return 'fail'
 
     # Try ReadDi'ing a directory ending with slash
@@ -2015,7 +1879,6 @@ def test_vsis3_7():
                 """)
     with webserver.install_http_handler(handler):
         if gdal.ReadDir('/vsis3/s3_bucket_test_readdir2/test_dirread') is None:
-            gdaltest.post_reason('fail')
             return 'fail'
 
     return 'success'
@@ -2049,20 +1912,17 @@ def test_vsis3_8():
     with webserver.install_http_handler(handler):
         listdir = gdal.ReadDir('/vsis3/vsis3_8', 0)
     if listdir != ['test', 'test/']:
-        gdaltest.post_reason('fail')
         print(listdir)
         return 'fail'
 
     handler = webserver.SequentialHandler()
     with webserver.install_http_handler(handler):
         if stat.S_ISDIR(gdal.VSIStatL('/vsis3/vsis3_8/test').mode):
-            gdaltest.post_reason('fail')
             return 'fail'
 
     handler = webserver.SequentialHandler()
     with webserver.install_http_handler(handler):
         if not stat.S_ISDIR(gdal.VSIStatL('/vsis3/vsis3_8/test/').mode):
-            gdaltest.post_reason('fail')
             return 'fail'
 
     return 'success'
@@ -2084,7 +1944,6 @@ def test_vsis3_sync_etag():
         handler = webserver.SequentialHandler()
         with webserver.install_http_handler(handler):
             if gdal.Sync('/i_do/not/exist', '/vsis3/', options=options):
-                gdaltest.post_reason('fail')
                 return 'fail'
 
     with gdaltest.error_handler():
@@ -2094,7 +1953,6 @@ def test_vsis3_sync_etag():
         handler.add('PUT', '/do_not/exist', 404)
         with webserver.install_http_handler(handler):
             if gdal.Sync('vsifile.py', '/vsis3/do_not/exist', options=options):
-                gdaltest.post_reason('fail')
                 return 'fail'
 
     handler = webserver.SequentialHandler()
@@ -2130,14 +1988,12 @@ def method(request):
     gdal.FileFromMemBuffer('/vsimem/testsync.txt', 'foo')
     with webserver.install_http_handler(handler):
         if not gdal.Sync('/vsimem/testsync.txt', '/vsis3/out', options=options):
-            gdaltest.post_reason('fail')
             return 'fail'
 
     # Re-try with cached ETag. Should generate no network access
     handler = webserver.SequentialHandler()
     with webserver.install_http_handler(handler):
         if not gdal.Sync('/vsimem/testsync.txt', '/vsis3/out', options=options):
-            gdaltest.post_reason('fail')
             return 'fail'
 
     gdal.VSICurlClearCache()
@@ -2150,13 +2006,11 @@ def method(request):
                   'ETag' : '"acbd18db4cc2f85cedef654fccc4a4d8"' }, "foo")
     with webserver.install_http_handler(handler):
         if not gdal.Sync( '/vsis3/out/testsync.txt', '/vsimem/', options=options):
-            gdaltest.post_reason('fail')
             return 'fail'
 
     # Shouldn't do any copy, but hard to verify
     with webserver.install_http_handler(webserver.SequentialHandler()):
         if not gdal.Sync( '/vsis3/out/testsync.txt', '/vsimem/', options=options):
-            gdaltest.post_reason('fail')
             return 'fail'
 
     # Modify target file, and redo synchronization
@@ -2181,14 +2035,12 @@ def method(request):
                   'ETag' : '"acbd18db4cc2f85cedef654fccc4a4d8"' }, "foo")
     with webserver.install_http_handler(handler):
         if not gdal.Sync( '/vsis3/out/testsync.txt', '/vsimem/', options=options):
-            gdaltest.post_reason('fail')
             return 'fail'
 
     f = gdal.VSIFOpenL('/vsimem/testsync.txt', 'rb')
     data = gdal.VSIFReadL(1, 3, f).decode('ascii')
     gdal.VSIFCloseL(f)
     if data != 'foo':
-        gdaltest.post_reason('fail')
         return 'fail'
 
     # /vsimem to S3, but after cleaning the cache
@@ -2202,7 +2054,6 @@ def method(request):
                   'ETag' : '"acbd18db4cc2f85cedef654fccc4a4d8"' }, "foo")
     with webserver.install_http_handler(handler):
         if not gdal.Sync('/vsimem/testsync.txt', '/vsis3/out', options=options):
-            gdaltest.post_reason('fail')
             return 'fail'
 
     gdal.Unlink('/vsimem/testsync.txt')
@@ -2227,7 +2078,6 @@ def method(request):
                 """)
     with webserver.install_http_handler(handler):
         if not gdal.Sync('/vsimem/subdir/', '/vsis3/out', options=options):
-            gdaltest.post_reason('fail')
             return 'fail'
     gdal.RmdirRecursive('/vsimem/subdir')
 
@@ -2261,7 +2111,6 @@ def test_vsis3_sync_timestamp():
     with webserver.install_http_handler(handler):
         if not gdal.Sync( '/vsis3/out/testsync.txt', '/vsimem/',
                          options=options):
-            gdaltest.post_reason('fail')
             return 'fail'
 
     # S3 to local: S3 file is newer -> do nothing
@@ -2274,7 +2123,6 @@ def test_vsis3_sync_timestamp():
     with webserver.install_http_handler(handler):
         if not gdal.Sync( '/vsis3/out/testsync.txt', '/vsimem/',
                          options=options):
-            gdaltest.post_reason('fail')
             return 'fail'
 
     # Local to S3: S3 file is older -> upload
@@ -2288,7 +2136,6 @@ def test_vsis3_sync_timestamp():
     with webserver.install_http_handler(handler):
         if not gdal.Sync( '/vsimem/testsync.txt', '/vsis3/out/testsync.txt',
                          options=options):
-            gdaltest.post_reason('fail')
             return 'fail'
 
     # Local to S3: S3 file is newer -> do nothgin
@@ -2301,7 +2148,6 @@ def test_vsis3_sync_timestamp():
     with webserver.install_http_handler(handler):
         if not gdal.Sync( '/vsimem/testsync.txt', '/vsis3/out/testsync.txt',
                          options=options):
-            gdaltest.post_reason('fail')
             return 'fail'
 
     gdal.Unlink('/vsimem/testsync.txt')
@@ -2341,13 +2187,11 @@ def test_vsis3_read_credentials_file():
     with webserver.install_http_handler(handler):
         f = open_for_read('/vsis3/s3_fake_bucket/resource')
         if f is None:
-            gdaltest.post_reason('fail')
             return 'fail'
         data = gdal.VSIFReadL(1, 4, f).decode('ascii')
         gdal.VSIFCloseL(f)
 
     if data != 'foo':
-        gdaltest.post_reason('fail')
         print(data)
         return 'fail'
 
@@ -2390,13 +2234,11 @@ def test_vsis3_read_config_file():
     with webserver.install_http_handler(handler):
         f = open_for_read('/vsis3/s3_fake_bucket/resource')
         if f is None:
-            gdaltest.post_reason('fail')
             return 'fail'
         data = gdal.VSIFReadL(1, 4, f).decode('ascii')
         gdal.VSIFCloseL(f)
 
     if data != 'foo':
-        gdaltest.post_reason('fail')
         print(data)
         return 'fail'
 
@@ -2452,13 +2294,11 @@ def test_vsis3_read_credentials_config_file():
     with webserver.install_http_handler(handler):
         f = open_for_read('/vsis3/s3_fake_bucket/resource')
         if f is None:
-            gdaltest.post_reason('fail')
             return 'fail'
         data = gdal.VSIFReadL(1, 4, f).decode('ascii')
         gdal.VSIFCloseL(f)
 
     if data != 'foo':
-        gdaltest.post_reason('fail')
         print(data)
         return 'fail'
 
@@ -2516,13 +2356,11 @@ def test_vsis3_read_credentials_config_file_non_default():
     with webserver.install_http_handler(handler):
         f = open_for_read('/vsis3/s3_fake_bucket/resource')
         if f is None:
-            gdaltest.post_reason('fail')
             return 'fail'
         data = gdal.VSIFReadL(1, 4, f).decode('ascii')
         gdal.VSIFCloseL(f)
 
     if data != 'foo':
-        gdaltest.post_reason('fail')
         print(data)
         return 'fail'
 
@@ -2583,17 +2421,14 @@ def test_vsis3_read_credentials_config_file_inconsistent():
         with gdaltest.error_handler():
             f = open_for_read('/vsis3/s3_fake_bucket/resource')
         if f is None:
-            gdaltest.post_reason('fail')
             return 'fail'
         if gdal.GetLastErrorMsg() == '':
             # Expected 'aws_access_key_id defined in both /vsimem/aws_credentials and /vsimem/aws_config'
-            gdaltest.post_reason('fail')
             return 'fail'
         data = gdal.VSIFReadL(1, 4, f).decode('ascii')
         gdal.VSIFCloseL(f)
 
     if data != 'foo':
-        gdaltest.post_reason('fail')
         print(data)
         return 'fail'
 
@@ -2640,13 +2475,11 @@ def test_vsis3_read_credentials_ec2():
     with webserver.install_http_handler(handler):
         f = open_for_read('/vsis3/s3_fake_bucket/resource')
         if f is None:
-            gdaltest.post_reason('fail')
             return 'fail'
         data = gdal.VSIFReadL(1, 4, f).decode('ascii')
         gdal.VSIFCloseL(f)
 
     if data != 'foo':
-        gdaltest.post_reason('fail')
         print(data)
         return 'fail'
 
@@ -2658,13 +2491,11 @@ def test_vsis3_read_credentials_ec2():
     with webserver.install_http_handler(handler):
         f = open_for_read('/vsis3/s3_fake_bucket/bar')
         if f is None:
-            gdaltest.post_reason('fail')
             return 'fail'
         data = gdal.VSIFReadL(1, 4, f).decode('ascii')
         gdal.VSIFCloseL(f)
 
     if data != 'bar':
-        gdaltest.post_reason('fail')
         print(data)
         return 'fail'
 
@@ -2710,13 +2541,11 @@ def test_vsis3_read_credentials_ec2_expiration():
     with webserver.install_http_handler(handler):
         f = open_for_read('/vsis3/s3_fake_bucket/resource')
         if f is None:
-            gdaltest.post_reason('fail')
             return 'fail'
         data = gdal.VSIFReadL(1, 4, f).decode('ascii')
         gdal.VSIFCloseL(f)
 
     if data != 'foo':
-        gdaltest.post_reason('fail')
         print(data)
         return 'fail'
 
@@ -2726,7 +2555,6 @@ def test_vsis3_read_credentials_ec2_expiration():
     with gdaltest.error_handler():
         f = open_for_read('/vsis3/s3_fake_bucket/bar')
     if f is not None:
-        gdaltest.post_reason('fail')
         return 'fail'
 
     gdal.SetConfigOption('CPL_AWS_EC2_CREDENTIALS_URL', '')
@@ -2780,20 +2608,17 @@ def vsis3_extra_1():
         path = '/vsis3/' + s3_resource
         statres = gdal.VSIStatL(path)
         if statres is None or not stat.S_ISDIR(statres.mode):
-            gdaltest.post_reason('fail')
             print('%s is not a valid bucket' % path)
             return 'fail'
 
         readdir = gdal.ReadDir(path)
         if readdir is None:
-            gdaltest.post_reason('fail')
             print('ReadDir() should not return empty list')
             return 'fail'
         for filename in readdir:
             if filename != '.':
                 subpath = path + '/' + filename
                 if gdal.VSIStatL(subpath) is None:
-                    gdaltest.post_reason('fail')
                     print('Stat(%s) should not return an error' % subpath)
                     return 'fail'
 
@@ -2801,81 +2626,68 @@ def vsis3_extra_1():
         subpath = path + '/' + unique_id
         ret = gdal.Mkdir(subpath, 0)
         if ret < 0:
-            gdaltest.post_reason('fail')
             print('Mkdir(%s) should not return an error' % subpath)
             return 'fail'
 
         readdir = gdal.ReadDir(path)
         if unique_id not in readdir:
-            gdaltest.post_reason('fail')
             print('ReadDir(%s) should contain %s' % (path, unique_id))
             print(readdir)
             return 'fail'
 
         ret = gdal.Mkdir(subpath, 0)
         if ret == 0:
-            gdaltest.post_reason('fail')
             print('Mkdir(%s) repeated should return an error' % subpath)
             return 'fail'
 
         ret = gdal.Rmdir(subpath)
         if ret < 0:
-            gdaltest.post_reason('fail')
             print('Rmdir(%s) should not return an error' % subpath)
             return 'fail'
 
         readdir = gdal.ReadDir(path)
         if unique_id in readdir:
-            gdaltest.post_reason('fail')
             print('ReadDir(%s) should not contain %s' % (path, unique_id))
             print(readdir)
             return 'fail'
 
         ret = gdal.Rmdir(subpath)
         if ret == 0:
-            gdaltest.post_reason('fail')
             print('Rmdir(%s) repeated should return an error' % subpath)
             return 'fail'
 
         ret = gdal.Mkdir(subpath, 0)
         if ret < 0:
-            gdaltest.post_reason('fail')
             print('Mkdir(%s) should not return an error' % subpath)
             return 'fail'
 
         f = gdal.VSIFOpenL(subpath + '/test.txt', 'wb')
         if f is None:
-            gdaltest.post_reason('fail')
             return 'fail'
         gdal.VSIFWriteL('hello', 1, 5, f)
         gdal.VSIFCloseL(f)
 
         ret = gdal.Rmdir(subpath)
         if ret == 0:
-            gdaltest.post_reason('fail')
             print('Rmdir(%s) on non empty directory should return an error' % subpath)
             return 'fail'
 
         f = gdal.VSIFOpenL(subpath + '/test.txt', 'rb')
         if f is None:
-            gdaltest.post_reason('fail')
             return 'fail'
         data = gdal.VSIFReadL(1, 5, f).decode('utf-8')
         if data != 'hello':
-            gdaltest.post_reason('fail')
             print(data)
             return 'fail'
         gdal.VSIFCloseL(f)
 
         ret = gdal.Unlink(subpath + '/test.txt')
         if ret < 0:
-            gdaltest.post_reason('fail')
             print('Unlink(%s) should not return an error' % (subpath + '/test.txt'))
             return 'fail'
 
         ret = gdal.Rmdir(subpath)
         if ret < 0:
-            gdaltest.post_reason('fail')
             print('Rmdir(%s) should not return an error' % subpath)
             return 'fail'
 
@@ -2883,27 +2695,23 @@ def vsis3_extra_1():
 
     f = open_for_read('/vsis3/' + s3_resource)
     if f is None:
-        gdaltest.post_reason('fail')
         print('cannot open %s' % ('/vsis3/' + s3_resource))
         return 'fail'
     ret = gdal.VSIFReadL(1, 1, f)
     gdal.VSIFCloseL(f)
 
     if len(ret) != 1:
-        gdaltest.post_reason('fail')
         print(ret)
         return 'fail'
 
     # Same with /vsis3_streaming/
     f = open_for_read('/vsis3_streaming/' + s3_resource)
     if f is None:
-        gdaltest.post_reason('fail')
         return 'fail'
     ret = gdal.VSIFReadL(1, 1, f)
     gdal.VSIFCloseL(f)
 
     if len(ret) != 1:
-        gdaltest.post_reason('fail')
         print(ret)
         return 'fail'
 
@@ -2916,7 +2724,6 @@ def vsis3_extra_1():
             gdal.VSIFReadL(1, 1, f)
         gdal.VSIFCloseL(f)
         if gdal.VSIGetLastErrorMsg() == '':
-            gdaltest.post_reason('fail')
             print(gdal.VSIGetLastErrorMsg())
             return 'fail'
 
@@ -2924,7 +2731,6 @@ def vsis3_extra_1():
     gdal.ErrorReset()
     f = open_for_read('/vsis3_streaming/' + gdal.GetConfigOption('S3_RESOURCE') + '/invalid_resource.baz')
     if f is not None:
-        gdaltest.post_reason('fail')
         print(gdal.VSIGetLastErrorMsg())
         return 'fail'
 
@@ -2932,13 +2738,11 @@ def vsis3_extra_1():
     signed_url = gdal.GetSignedURL('/vsis3/' + s3_resource)
     f = open_for_read('/vsicurl_streaming/' + signed_url)
     if f is None:
-        gdaltest.post_reason('fail')
         return 'fail'
     ret = gdal.VSIFReadL(1, 1, f)
     gdal.VSIFCloseL(f)
 
     if len(ret) != 1:
-        gdaltest.post_reason('fail')
         print(ret)
         return 'fail'
 
diff --git a/autotest/gcore/vsistdin.py b/autotest/gcore/vsistdin.py
index 6a9c0fe7ef59..be4e7d88f767 100755
--- a/autotest/gcore/vsistdin.py
+++ b/autotest/gcore/vsistdin.py
@@ -57,10 +57,8 @@ def test_vsistdin_1():
 
     ds = gdal.Open("tmp/vsistdin_1_out.tif")
     if ds is None:
-        gdaltest.post_reason('fail')
         return 'fail'
     if ds.GetRasterBand(1).Checksum() != cs:
-        gdaltest.post_reason('fail')
         return 'fail'
 
     gdal.Unlink("tmp/vsistdin_1_out.tif")
diff --git a/autotest/gcore/vsiswift.py b/autotest/gcore/vsiswift.py
index 6c0cb2370f99..31f7126d3705 100644
--- a/autotest/gcore/vsiswift.py
+++ b/autotest/gcore/vsiswift.py
@@ -71,7 +71,6 @@ def test_vsiswift_real_server_errors():
     with gdaltest.error_handler():
         f = open_for_read('/vsiswift/foo/bar')
     if f is not None or gdal.VSIGetLastErrorMsg().find('SWIFT_STORAGE_URL') < 0:
-        gdaltest.post_reason('fail')
         print(gdal.VSIGetLastErrorMsg())
         return 'fail'
 
@@ -79,7 +78,6 @@ def test_vsiswift_real_server_errors():
     with gdaltest.error_handler():
         f = open_for_read('/vsiswift_streaming/foo/bar')
     if f is not None or gdal.VSIGetLastErrorMsg().find('SWIFT_STORAGE_URL') < 0:
-        gdaltest.post_reason('fail')
         print(gdal.VSIGetLastErrorMsg())
         return 'fail'
 
@@ -90,7 +88,6 @@ def test_vsiswift_real_server_errors():
     with gdaltest.error_handler():
         f = open_for_read('/vsiswift/foo/bar')
     if f is not None or gdal.VSIGetLastErrorMsg().find('SWIFT_AUTH_TOKEN') < 0:
-        gdaltest.post_reason('fail')
         print(gdal.VSIGetLastErrorMsg())
         return 'fail'
 
@@ -102,7 +99,6 @@ def test_vsiswift_real_server_errors():
     if f is not None:
         if f is not None:
             gdal.VSIFCloseL(f)
-        gdaltest.post_reason('fail')
         print(gdal.VSIGetLastErrorMsg())
         return 'fail'
 
@@ -110,7 +106,6 @@ def test_vsiswift_real_server_errors():
     with gdaltest.error_handler():
         f = open_for_read('/vsiswift_streaming/foo/bar.baz')
     if f is not None:
-        gdaltest.post_reason('fail')
         print(gdal.VSIGetLastErrorMsg())
         return 'fail'
 
@@ -190,13 +185,11 @@ def method(request):
     with webserver.install_http_handler(handler):
         f = open_for_read('/vsiswift/foo/bar')
         if f is None:
-            gdaltest.post_reason('fail')
             return 'fail'
         data = gdal.VSIFReadL(1, 4, f).decode('ascii')
         gdal.VSIFCloseL(f)
 
     if data != 'foo':
-        gdaltest.post_reason('fail')
         print(data)
         return 'fail'
 
@@ -223,13 +216,11 @@ def method(request):
     with webserver.install_http_handler(handler):
         f = open_for_read('/vsiswift/foo/baz')
         if f is None:
-            gdaltest.post_reason('fail')
             return 'fail'
         data = gdal.VSIFReadL(1, 4, f).decode('ascii')
         gdal.VSIFCloseL(f)
 
     if data != 'bar':
-        gdaltest.post_reason('fail')
         print(data)
         return 'fail'
 
@@ -257,7 +248,6 @@ def test_vsiswift_fake_auth_storage_url_and_auth_token():
     with webserver.install_http_handler(handler):
         f = open_for_read('/vsiswift/foo/bar')
         if f is None:
-            gdaltest.post_reason('fail')
             return 'fail'
         gdal.VSIFReadL(1, 4, f).decode('ascii')
         gdal.VSIFCloseL(f)
@@ -286,13 +276,11 @@ def method(request):
     with webserver.install_http_handler(handler):
         f = open_for_read('/vsiswift/foo/bar')
         if f is None:
-            gdaltest.post_reason('fail')
             return 'fail'
         data = gdal.VSIFReadL(1, 4, f).decode('ascii')
         gdal.VSIFCloseL(f)
 
     if data != 'foo':
-        gdaltest.post_reason('fail')
         print(data)
         return 'fail'
 
@@ -315,7 +303,6 @@ def test_vsiswift_stat():
     with webserver.install_http_handler(handler):
         stat_res = gdal.VSIStatL('/vsiswift/foo/bar')
         if stat_res is None or stat_res.size != 1000000:
-            gdaltest.post_reason('fail')
             if stat_res is not None:
                 print(stat_res.size)
             else:
@@ -327,7 +314,6 @@ def test_vsiswift_stat():
     with webserver.install_http_handler(handler):
         stat_res = gdal.VSIStatL('/vsiswift_streaming/foo/bar')
         if stat_res is None or stat_res.size != 1000000:
-            gdaltest.post_reason('fail')
             if stat_res is not None:
                 print(stat_res.size)
             else:
@@ -342,7 +328,6 @@ def test_vsiswift_stat():
     with webserver.install_http_handler(handler):
         stat_res = gdal.VSIStatL('/vsiswift/foo')
         if stat_res is None or not stat.S_ISDIR(stat_res.mode):
-            gdaltest.post_reason('fail')
             return 'fail'
 
     return 'success'
@@ -386,28 +371,23 @@ def test_vsiswift_fake_readdir():
         with webserver.install_http_handler(handler):
             f = open_for_read('/vsiswift/foo/bar.baz')
         if f is None:
-            gdaltest.post_reason('fail')
             return 'fail'
         gdal.VSIFCloseL(f)
 
     dir_contents = gdal.ReadDir('/vsiswift/foo')
     if dir_contents != ['bar.baz', 'mysubdir']:
-        gdaltest.post_reason('fail')
         print(dir_contents)
         return 'fail'
     stat_res = gdal.VSIStatL('/vsiswift/foo/bar.baz')
     if stat_res.size != 123456:
-        gdaltest.post_reason('fail')
         print(stat_res.size)
         return 'fail'
     if stat_res.mtime != 1:
-        gdaltest.post_reason('fail')
         return 'fail'
 
     # ReadDir on something known to be a file shouldn't cause network access
     dir_contents = gdal.ReadDir('/vsiswift/foo/bar.baz')
     if dir_contents is not None:
-        gdaltest.post_reason('fail')
         return 'fail'
 
     # Test error on ReadDir()
@@ -416,7 +396,6 @@ def test_vsiswift_fake_readdir():
     with webserver.install_http_handler(handler):
         dir_contents = gdal.ReadDir('/vsiswift/foo/error_test/')
     if dir_contents is not None:
-        gdaltest.post_reason('fail')
         print(dir_contents)
         return 'fail'
 
@@ -428,7 +407,6 @@ def test_vsiswift_fake_readdir():
     with webserver.install_http_handler(handler):
         dir_contents = gdal.ReadDir('/vsiswift/')
     if dir_contents != ['.']:
-        gdaltest.post_reason('fail')
         print(dir_contents)
         return 'fail'
 
@@ -443,7 +421,6 @@ def test_vsiswift_fake_readdir():
     with webserver.install_http_handler(handler):
         dir_contents = gdal.ReadDir('/vsiswift/')
     if dir_contents != ['mycontainer1', 'mycontainer2']:
-        gdaltest.post_reason('fail')
         print(dir_contents)
         return 'fail'
 
@@ -461,7 +438,6 @@ def test_vsiswift_fake_readdir():
     with webserver.install_http_handler(handler):
         dir_contents = gdal.ReadDir('/vsiswift/')
     if dir_contents != ['foo', 'foo/']:
-        gdaltest.post_reason('fail')
         print(dir_contents)
         return 'fail'
 
@@ -471,7 +447,6 @@ def test_vsiswift_fake_readdir():
     with webserver.install_http_handler(handler):
         dir_contents = gdal.ReadDir('/vsiswift/foo/')
     if dir_contents != ['.']:
-        gdaltest.post_reason('fail')
         print(dir_contents)
         return 'fail'
 
@@ -491,7 +466,6 @@ def test_vsiswift_fake_write():
     # Test creation of BlockBob
     f = gdal.VSIFOpenL('/vsiswift/test_copy/file.bin', 'wb')
     if f is None:
-        gdaltest.post_reason('fail')
         return 'fail'
 
     handler = webserver.SequentialHandler()
@@ -529,7 +503,6 @@ def method(request):
         ret = gdal.VSIFWriteL('x' * 35000, 1, 35000, f)
         ret += gdal.VSIFWriteL('x' * 5000, 1, 5000, f)
         if ret != 40000:
-            gdaltest.post_reason('fail')
             print(ret)
             gdal.VSIFCloseL(f)
             return 'fail'
@@ -556,7 +529,6 @@ def test_vsiswift_fake_unlink():
     with webserver.install_http_handler(handler):
         ret = gdal.Unlink('/vsiswift/foo/bar')
     if ret != 0:
-        gdaltest.post_reason('fail')
         return 'fail'
 
     # Failure
@@ -568,7 +540,6 @@ def test_vsiswift_fake_unlink():
         with gdaltest.error_handler():
             ret = gdal.Unlink('/vsiswift/foo/bar')
     if ret != -1:
-        gdaltest.post_reason('fail')
         return 'fail'
 
     return 'success'
@@ -587,7 +558,6 @@ def test_vsiswift_fake_mkdir_rmdir():
     # Invalid name
     ret = gdal.Mkdir('/vsiswift', 0)
     if ret == 0:
-        gdaltest.post_reason('fail')
         return 'fail'
 
     handler = webserver.SequentialHandler()
@@ -597,7 +567,6 @@ def test_vsiswift_fake_mkdir_rmdir():
     with webserver.install_http_handler(handler):
         ret = gdal.Mkdir('/vsiswift/foo/dir', 0)
     if ret != 0:
-        gdaltest.post_reason('fail')
         return 'fail'
 
     # Try creating already existing directory
@@ -610,13 +579,11 @@ def test_vsiswift_fake_mkdir_rmdir():
     with webserver.install_http_handler(handler):
         ret = gdal.Mkdir('/vsiswift/foo/dir', 0)
     if ret == 0:
-        gdaltest.post_reason('fail')
         return 'fail'
 
     # Invalid name
     ret = gdal.Rmdir('/vsiswift')
     if ret == 0:
-        gdaltest.post_reason('fail')
         return 'fail'
 
     gdal.VSICurlClearCache()
@@ -631,7 +598,6 @@ def test_vsiswift_fake_mkdir_rmdir():
     with webserver.install_http_handler(handler):
         ret = gdal.Rmdir('/vsiswift/foo/it_is_a_file')
     if ret == 0:
-        gdaltest.post_reason('fail')
         return 'fail'
 
     # Valid
@@ -646,7 +612,6 @@ def test_vsiswift_fake_mkdir_rmdir():
     with webserver.install_http_handler(handler):
         ret = gdal.Rmdir('/vsiswift/foo/dir')
     if ret != 0:
-        gdaltest.post_reason('fail')
         return 'fail'
 
     # Try deleting already deleted directory
@@ -656,7 +621,6 @@ def test_vsiswift_fake_mkdir_rmdir():
     with webserver.install_http_handler(handler):
         ret = gdal.Rmdir('/vsiswift/foo/dir')
     if ret == 0:
-        gdaltest.post_reason('fail')
         return 'fail'
 
     gdal.VSICurlClearCache()
@@ -675,7 +639,6 @@ def test_vsiswift_fake_mkdir_rmdir():
     with webserver.install_http_handler(handler):
         ret = gdal.Rmdir('/vsiswift/foo/dir_nonempty')
     if ret == 0:
-        gdaltest.post_reason('fail')
         return 'fail'
 
     return 'success'
@@ -714,20 +677,17 @@ def vsiswift_extra_1():
         path = '/vsiswift/' + swift_resource
         statres = gdal.VSIStatL(path)
         if statres is None or not stat.S_ISDIR(statres.mode):
-            gdaltest.post_reason('fail')
             print('%s is not a valid bucket' % path)
             return 'fail'
 
         readdir = gdal.ReadDir(path)
         if readdir is None:
-            gdaltest.post_reason('fail')
             print('ReadDir() should not return empty list')
             return 'fail'
         for filename in readdir:
             if filename != '.':
                 subpath = path + '/' + filename
                 if gdal.VSIStatL(subpath) is None:
-                    gdaltest.post_reason('fail')
                     print('Stat(%s) should not return an error' % subpath)
                     return 'fail'
 
@@ -735,81 +695,68 @@ def vsiswift_extra_1():
         subpath = path + '/' + unique_id
         ret = gdal.Mkdir(subpath, 0)
         if ret < 0:
-            gdaltest.post_reason('fail')
             print('Mkdir(%s) should not return an error' % subpath)
             return 'fail'
 
         readdir = gdal.ReadDir(path)
         if unique_id not in readdir:
-            gdaltest.post_reason('fail')
             print('ReadDir(%s) should contain %s' % (path, unique_id))
             print(readdir)
             return 'fail'
 
         ret = gdal.Mkdir(subpath, 0)
         if ret == 0:
-            gdaltest.post_reason('fail')
             print('Mkdir(%s) repeated should return an error' % subpath)
             return 'fail'
 
         ret = gdal.Rmdir(subpath)
         if ret < 0:
-            gdaltest.post_reason('fail')
             print('Rmdir(%s) should not return an error' % subpath)
             return 'fail'
 
         readdir = gdal.ReadDir(path)
         if unique_id in readdir:
-            gdaltest.post_reason('fail')
             print('ReadDir(%s) should not contain %s' % (path, unique_id))
             print(readdir)
             return 'fail'
 
         ret = gdal.Rmdir(subpath)
         if ret == 0:
-            gdaltest.post_reason('fail')
             print('Rmdir(%s) repeated should return an error' % subpath)
             return 'fail'
 
         ret = gdal.Mkdir(subpath, 0)
         if ret < 0:
-            gdaltest.post_reason('fail')
             print('Mkdir(%s) should not return an error' % subpath)
             return 'fail'
 
         f = gdal.VSIFOpenL(subpath + '/test.txt', 'wb')
         if f is None:
-            gdaltest.post_reason('fail')
             return 'fail'
         gdal.VSIFWriteL('hello', 1, 5, f)
         gdal.VSIFCloseL(f)
 
         ret = gdal.Rmdir(subpath)
         if ret == 0:
-            gdaltest.post_reason('fail')
             print('Rmdir(%s) on non empty directory should return an error' % subpath)
             return 'fail'
 
         f = gdal.VSIFOpenL(subpath + '/test.txt', 'rb')
         if f is None:
-            gdaltest.post_reason('fail')
             return 'fail'
         data = gdal.VSIFReadL(1, 5, f).decode('utf-8')
         if data != 'hello':
-            gdaltest.post_reason('fail')
             print(data)
             return 'fail'
         gdal.VSIFCloseL(f)
 
         ret = gdal.Unlink(subpath + '/test.txt')
         if ret < 0:
-            gdaltest.post_reason('fail')
             print('Unlink(%s) should not return an error' % (subpath + '/test.txt'))
             return 'fail'
 
         ret = gdal.Rmdir(subpath)
         if ret < 0:
-            gdaltest.post_reason('fail')
             print('Rmdir(%s) should not return an error' % subpath)
             return 'fail'
 
@@ -817,26 +764,22 @@ def vsiswift_extra_1():
 
     f = open_for_read('/vsiswift/' + swift_resource)
     if f is None:
-        gdaltest.post_reason('fail')
         return 'fail'
     ret = gdal.VSIFReadL(1, 1, f)
     gdal.VSIFCloseL(f)
 
     if len(ret) != 1:
-        gdaltest.post_reason('fail')
         print(ret)
         return 'fail'
 
     # Same with /vsiswift_streaming/
     f = open_for_read('/vsiswift_streaming/' + swift_resource)
     if f is None:
-        gdaltest.post_reason('fail')
         return 'fail'
     ret = gdal.VSIFReadL(1, 1, f)
     gdal.VSIFCloseL(f)
 
     if len(ret) != 1:
-        gdaltest.post_reason('fail')
         print(ret)
         return 'fail'
 
@@ -844,7 +787,6 @@ def vsiswift_extra_1():
     gdal.ErrorReset()
     f = open_for_read('/vsiswift_streaming/' + swift_resource + '/invalid_resource.baz')
     if f is not None:
-        gdaltest.post_reason('fail')
         print(gdal.VSIGetLastErrorMsg())
         return 'fail'
 
diff --git a/autotest/gcore/vsiwebhdfs.py b/autotest/gcore/vsiwebhdfs.py
index ea79f7677366..bfa0fb4a3741 100644
--- a/autotest/gcore/vsiwebhdfs.py
+++ b/autotest/gcore/vsiwebhdfs.py
@@ -97,11 +97,9 @@ def test_vsiwebhdfs_open():
     with webserver.install_http_handler(handler):
         f = open_for_read(gdaltest.webhdfs_base_connection + '/foo/bar')
         if f is None:
-            gdaltest.post_reason('fail')
             return 'fail'
         gdal.VSIFSeekL(f, 9999990784 + 10, 0)
         if gdal.VSIFReadL(1, 4, f).decode('ascii') != 'data':
-            gdaltest.post_reason('fail')
             return 'fail'
         gdal.VSIFCloseL(f)
 
@@ -120,10 +118,8 @@ def test_vsiwebhdfs_open():
         with webserver.install_http_handler(handler):
             f = open_for_read(gdaltest.webhdfs_base_connection + '/foo/bar')
             if f is None:
-                gdaltest.post_reason('fail')
                 return 'fail'
             if gdal.VSIFReadL(1, 4, f).decode('ascii') != 'yeah':
-                gdaltest.post_reason('fail')
                 return 'fail'
             gdal.VSIFCloseL(f)
 
@@ -133,19 +129,16 @@ def test_vsiwebhdfs_open():
 
     f = open_for_read(gdaltest.webhdfs_base_connection + '/foo/bar')
     if f is None:
-        gdaltest.post_reason('fail')
         return 'fail'
 
     handler = webserver.SequentialHandler()
     handler.add('GET', '/webhdfs/v1/foo/bar?op=OPEN&offset=0&length=16384', 404)
     with webserver.install_http_handler(handler):
         if len(gdal.VSIFReadL(1, 4, f)) != 0:
-            gdaltest.post_reason('fail')
             return 'fail'
 
     # Retry: shouldn't not cause network access
     if len(gdal.VSIFReadL(1, 4, f)) != 0:
-        gdaltest.post_reason('fail')
         return 'fail'
 
     gdal.VSIFCloseL(f)
@@ -169,7 +162,6 @@ def test_vsiwebhdfs_stat():
     with webserver.install_http_handler(handler):
         stat_res = gdal.VSIStatL(gdaltest.webhdfs_base_connection + '/foo/bar')
     if stat_res is None or stat_res.size != 1000000:
-        gdaltest.post_reason('fail')
         if stat_res is not None:
             print(stat_res.size)
         else:
@@ -179,7 +171,6 @@ def test_vsiwebhdfs_stat():
     # Test caching
     stat_res = gdal.VSIStatL(gdaltest.webhdfs_base_connection + '/foo/bar')
     if stat_res.size != 1000000:
-        gdaltest.post_reason('fail')
         return 'fail'
 
     # Test missing file
@@ -190,7 +181,6 @@ def test_vsiwebhdfs_stat():
         stat_res = gdal.VSIStatL(
             gdaltest.webhdfs_base_connection + '/unexisting')
     if stat_res is not None:
-        gdaltest.post_reason('fail')
         return 'fail'
 
     return 'success'
@@ -212,23 +202,19 @@ def test_vsiwebhdfs_readdir():
     with webserver.install_http_handler(handler):
         dir_contents = gdal.ReadDir(gdaltest.webhdfs_base_connection + '/foo')
     if dir_contents != ['bar.baz', 'mysubdir']:
-        gdaltest.post_reason('fail')
         print(dir_contents)
         return 'fail'
     stat_res = gdal.VSIStatL(gdaltest.webhdfs_base_connection + '/foo/bar.baz')
     if stat_res.size != 123456:
-        gdaltest.post_reason('fail')
         print(stat_res.size)
         return 'fail'
     if stat_res.mtime != 1:
-        gdaltest.post_reason('fail')
         return 'fail'
 
     # ReadDir on something known to be a file shouldn't cause network access
     dir_contents = gdal.ReadDir(
         gdaltest.webhdfs_base_connection + '/foo/bar.baz')
     if dir_contents is not None:
-        gdaltest.post_reason('fail')
         return 'fail'
 
     # Test error on ReadDir()
@@ -238,7 +224,6 @@ def test_vsiwebhdfs_readdir():
         dir_contents = gdal.ReadDir(
             gdaltest.webhdfs_base_connection + 'foo/error_test/')
     if dir_contents is not None:
-        gdaltest.post_reason('fail')
         print(dir_contents)
         return 'fail'
 
@@ -263,7 +248,6 @@ def test_vsiwebhdfs_write():
             f = gdal.VSIFOpenL(
                 gdaltest.webhdfs_base_connection + '/foo/bar', 'wb')
         if f is not None:
-            gdaltest.post_reason('fail')
             return 'fail'
 
     handler = webserver.SequentialHandler()
@@ -277,10 +261,8 @@ def test_vsiwebhdfs_write():
             f = gdal.VSIFOpenL(
                 gdaltest.webhdfs_base_connection + '/foo/bar', 'wb')
             if f is None:
-                gdaltest.post_reason('fail')
                 return 'fail'
     if gdal.VSIFCloseL(f) != 0:
-        gdaltest.post_reason('fail')
         return 'fail'
 
     # Non-empty file
@@ -298,11 +280,9 @@ def test_vsiwebhdfs_write():
             f = gdal.VSIFOpenL(
                 gdaltest.webhdfs_base_connection + '/foo/bar', 'wb')
             if f is None:
-                gdaltest.post_reason('fail')
                 return 'fail'
 
     if gdal.VSIFWriteL('foobar', 1, 6, f) != 6:
-        gdaltest.post_reason('fail')
         return 'fail'
 
     handler = webserver.SequentialHandler()
@@ -328,7 +308,6 @@ def method(request):
 
     with webserver.install_http_handler(handler):
         if gdal.VSIFCloseL(f) != 0:
-            gdaltest.post_reason('fail')
             return 'fail'
 
     # Errors during file creation
@@ -344,7 +323,6 @@ def method(request):
                 f = gdal.VSIFOpenL(
                     gdaltest.webhdfs_base_connection + '/foo/bar', 'wb')
                 if f is not None:
-                    gdaltest.post_reason('fail')
                     return 'fail'
 
     handler = webserver.SequentialHandler()
@@ -356,7 +334,6 @@ def method(request):
                 f = gdal.VSIFOpenL(
                     gdaltest.webhdfs_base_connection + '/foo/bar', 'wb')
                 if f is not None:
-                    gdaltest.post_reason('fail')
                     return 'fail'
 
     # Errors during POST
@@ -374,11 +351,9 @@ def method(request):
             f = gdal.VSIFOpenL(
                 gdaltest.webhdfs_base_connection + '/foo/bar', 'wb')
             if f is None:
-                gdaltest.post_reason('fail')
                 return 'fail'
 
     if gdal.VSIFWriteL('foobar', 1, 6, f) != 6:
-        gdaltest.post_reason('fail')
         return 'fail'
 
     handler = webserver.SequentialHandler()
@@ -390,7 +365,6 @@ def method(request):
     with gdaltest.error_handler():
         with webserver.install_http_handler(handler):
             if gdal.VSIFCloseL(f) == 0:
-                gdaltest.post_reason('fail')
                 return 'fail'
 
     return 'success'
@@ -413,7 +387,6 @@ def test_vsiwebhdfs_unlink():
     with webserver.install_http_handler(handler):
         ret = gdal.Unlink(gdaltest.webhdfs_base_connection + '/foo/bar')
     if ret != 0:
-        gdaltest.post_reason('fail')
         return 'fail'
 
     gdal.VSICurlClearCache()
@@ -431,7 +404,6 @@ def test_vsiwebhdfs_unlink():
         with webserver.install_http_handler(handler):
             ret = gdal.Unlink(gdaltest.webhdfs_base_connection + '/foo/bar')
         if ret != 0:
-            gdaltest.post_reason('fail')
             return 'fail'
 
     # Failure
@@ -442,7 +414,6 @@ def test_vsiwebhdfs_unlink():
         with gdaltest.error_handler():
             ret = gdal.Unlink(gdaltest.webhdfs_base_connection + '/foo/bar')
     if ret != -1:
-        gdaltest.post_reason('fail')
         return 'fail'
 
     gdal.VSICurlClearCache()
@@ -455,7 +426,6 @@ def test_vsiwebhdfs_unlink():
         with gdaltest.error_handler():
             ret = gdal.Unlink(gdaltest.webhdfs_base_connection + '/foo/bar')
     if ret != -1:
-        gdaltest.post_reason('fail')
         return 'fail'
 
     return 'success'
@@ -474,7 +444,6 @@ def test_vsiwebhdfs_mkdir_rmdir():
     # Invalid name
     ret = gdal.Mkdir('/vsiwebhdfs', 0)
     if ret == 0:
-        gdaltest.post_reason('fail')
         return 'fail'
 
     # Valid
@@ -484,7 +453,6 @@ def test_vsiwebhdfs_mkdir_rmdir():
     with webserver.install_http_handler(handler):
         ret = gdal.Mkdir(gdaltest.webhdfs_base_connection + '/foo/dir', 0)
     if ret != 0:
-        gdaltest.post_reason('fail')
         return 'fail'
 
     # Valid with all options
@@ -496,7 +464,6 @@ def test_vsiwebhdfs_mkdir_rmdir():
             ret = gdal.Mkdir(gdaltest.webhdfs_base_connection +
                              '/foo/dir/', 493)  # 0755
         if ret != 0:
-            gdaltest.post_reason('fail')
             return 'fail'
 
     # Error
@@ -506,19 +473,16 @@ def test_vsiwebhdfs_mkdir_rmdir():
         ret = gdal.Mkdir(gdaltest.webhdfs_base_connection +
                          '/foo/dir_error', 0)
     if ret == 0:
-        gdaltest.post_reason('fail')
         return 'fail'
 
     # Root name is invalid
     ret = gdal.Mkdir(gdaltest.webhdfs_base_connection + '/', 0)
     if ret == 0:
-        gdaltest.post_reason('fail')
         return 'fail'
 
     # Invalid name
     ret = gdal.Rmdir('/vsiwebhdfs')
     if ret == 0:
-        gdaltest.post_reason('fail')
         return 'fail'
 
     gdal.VSICurlClearCache()
@@ -530,7 +494,6 @@ def test_vsiwebhdfs_mkdir_rmdir():
     with webserver.install_http_handler(handler):
         ret = gdal.Rmdir(gdaltest.webhdfs_base_connection + '/foo/dir')
     if ret != 0:
-        gdaltest.post_reason('fail')
         return 'fail'
 
     # Error
@@ -539,7 +502,6 @@ def test_vsiwebhdfs_mkdir_rmdir():
     with webserver.install_http_handler(handler):
         ret = gdal.Rmdir(gdaltest.webhdfs_base_connection + '/foo/dir_error')
     if ret == 0:
-        gdaltest.post_reason('fail')
         return 'fail'
 
     return 'success'
@@ -578,20 +540,17 @@ def vsiwebhdfs_extra_1():
         path = '/vsiwebhdfs/' + webhdfs_url
         statres = gdal.VSIStatL(path)
         if statres is None or not stat.S_ISDIR(statres.mode):
-            gdaltest.post_reason('fail')
             print('%s is not a valid bucket' % path)
             return 'fail'
 
         readdir = gdal.ReadDir(path)
         if readdir is None:
-            gdaltest.post_reason('fail')
             print('ReadDir() should not return empty list')
             return 'fail'
         for filename in readdir:
             if filename != '.':
                 subpath = path + '/' + filename
                 if gdal.VSIStatL(subpath) is None:
-                    gdaltest.post_reason('fail')
                     print('Stat(%s) should not return an error' % subpath)
                     return 'fail'
 
@@ -599,13 +558,11 @@ def vsiwebhdfs_extra_1():
         subpath = path + '/' + unique_id
         ret = gdal.Mkdir(subpath, 0)
         if ret < 0:
-            gdaltest.post_reason('fail')
             print('Mkdir(%s) should not return an error' % subpath)
             return 'fail'
 
         readdir = gdal.ReadDir(path)
         if unique_id not in readdir:
-            gdaltest.post_reason('fail')
             print('ReadDir(%s) should contain %s' % (path, unique_id))
             print(readdir)
             return 'fail'
@@ -618,63 +575,53 @@ def vsiwebhdfs_extra_1():
 
         ret = gdal.Rmdir(subpath)
         if ret < 0:
-            gdaltest.post_reason('fail')
             print('Rmdir(%s) should not return an error' % subpath)
             return 'fail'
 
         readdir = gdal.ReadDir(path)
         if unique_id in readdir:
-            gdaltest.post_reason('fail')
             print('ReadDir(%s) should not contain %s' % (path, unique_id))
             print(readdir)
             return 'fail'
 
         ret = gdal.Rmdir(subpath)
         if ret == 0:
-            gdaltest.post_reason('fail')
             print('Rmdir(%s) repeated should return an error' % subpath)
             return 'fail'
 
         ret = gdal.Mkdir(subpath, 0)
         if ret < 0:
-            gdaltest.post_reason('fail')
             print('Mkdir(%s) should not return an error' % subpath)
             return 'fail'
 
         f = gdal.VSIFOpenL(subpath + '/test.txt', 'wb')
         if f is None:
-            gdaltest.post_reason('fail')
             return 'fail'
         gdal.VSIFWriteL('hello', 1, 5, f)
         gdal.VSIFCloseL(f)
 
         ret = gdal.Rmdir(subpath)
         if ret == 0:
-            gdaltest.post_reason('fail')
             print('Rmdir(%s) on non empty directory should return an error' % subpath)
             return 'fail'
 
         f = gdal.VSIFOpenL(subpath + '/test.txt', 'rb')
         if f is None:
-            gdaltest.post_reason('fail')
             return 'fail'
         data = gdal.VSIFReadL(1, 5, f).decode('utf-8')
         if data != 'hello':
-            gdaltest.post_reason('fail')
             print(data)
             return 'fail'
         gdal.VSIFCloseL(f)
 
         ret = gdal.Unlink(subpath + '/test.txt')
         if ret < 0:
-            gdaltest.post_reason('fail')
             print('Unlink(%s) should not return an error' %
                   (subpath + '/test.txt'))
             return 'fail'
 
         ret = gdal.Rmdir(subpath)
         if ret < 0:
-            gdaltest.post_reason('fail')
             print('Rmdir(%s) should not return an error' % subpath)
             return 'fail'
 
@@ -682,13 +629,11 @@ def vsiwebhdfs_extra_1():
 
     f = open_for_read('/vsiwebhdfs/' + webhdfs_url)
     if f is None:
-        gdaltest.post_reason('fail')
         return 'fail'
     ret = gdal.VSIFReadL(1, 1, f)
     gdal.VSIFCloseL(f)
 
     if len(ret) != 1:
-        gdaltest.post_reason('fail')
         print(ret)
         return 'fail'
 
diff --git a/autotest/gcore/vsizip.py b/autotest/gcore/vsizip.py
index 81863b6cf737..7755e334ff57 100755
--- a/autotest/gcore/vsizip.py
+++ b/autotest/gcore/vsizip.py
@@ -123,7 +123,6 @@ def test_vsizip_1():
     gdal.VSIFCloseL(f)
 
     if data.decode('ASCII') != 'abcd':
-        gdaltest.post_reason('fail')
         print(data)
         return 'fail'
 
@@ -131,51 +130,43 @@ def test_vsizip_1():
     gdal.Rename("/vsimem/test.zip", "/vsimem/test.xxx")
     f = gdal.VSIFOpenL("/vsizip/{/vsimem/test.xxx}/subdir3/abcd", "rb")
     if f is None:
-        gdaltest.post_reason('fail')
         return 'fail'
     data = gdal.VSIFReadL(1, 4, f)
     gdal.VSIFCloseL(f)
 
     if data.decode('ASCII') != 'abcd':
-        gdaltest.post_reason('fail')
         print(data)
         return 'fail'
 
     # With a trailing slash
     f = gdal.VSIFOpenL("/vsizip/{/vsimem/test.xxx}/subdir3/abcd/", "rb")
     if f is None:
-        gdaltest.post_reason('fail')
         return 'fail'
     gdal.VSIFCloseL(f)
 
     # Test ReadDir()
     if len(gdal.ReadDir("/vsizip/{/vsimem/test.xxx}")) != 3:
-        gdaltest.post_reason('fail')
         print(gdal.ReadDir("/vsizip/{/vsimem/test.xxx}"))
         return 'fail'
 
     # Unbalanced curls
     f = gdal.VSIFOpenL("/vsizip/{/vsimem/test.xxx", "rb")
     if f is not None:
-        gdaltest.post_reason('fail')
         return 'fail'
 
     # Non existing mainfile
     f = gdal.VSIFOpenL("/vsizip/{/vsimem/test.xxx}/bla", "rb")
     if f is not None:
-        gdaltest.post_reason('fail')
         return 'fail'
 
     # Non existing subfile
     f = gdal.VSIFOpenL("/vsizip/{/vsimem/test.zzz}/bla", "rb")
     if f is not None:
-        gdaltest.post_reason('fail')
         return 'fail'
 
     # Wrong syntax
     f = gdal.VSIFOpenL("/vsizip/{/vsimem/test.xxx}.aux.xml", "rb")
     if f is not None:
-        gdaltest.post_reason('fail')
         return 'fail'
 
     # Test nested { { } }
@@ -193,13 +184,11 @@ def test_vsizip_1():
 
     f = gdal.VSIFOpenL("/vsizip/{/vsizip/{/vsimem/zipinzip.yyy}/test.xxx}/subdir3/abcd/", "rb")
     if f is None:
-        gdaltest.post_reason('fail')
         return 'fail'
     data = gdal.VSIFReadL(1, 4, f)
     gdal.VSIFCloseL(f)
 
     if data.decode('ASCII') != 'abcd':
-        gdaltest.post_reason('fail')
         print(data)
         return 'fail'
 
@@ -208,12 +197,10 @@ def test_vsizip_1():
 
     # Test VSIStatL on a non existing file
     if gdal.VSIStatL('/vsizip//vsimem/foo.zip') is not None:
-        gdaltest.post_reason('fail')
         return 'fail'
 
     # Test ReadDir on a non existing file
     if gdal.ReadDir('/vsizip//vsimem/foo.zip') is not None:
-        gdaltest.post_reason('fail')
         return 'fail'
 
     return 'success'
@@ -355,13 +342,11 @@ def test_vsizip_5():
     # make file in memory
     fmain = gdal.VSIFOpenL('/vsizip/vsimem/bigdepthzip.zip', 'wb')
     if fmain is None:
-        gdaltest.post_reason('fail')
         return 'fail'
 
     filename = "a" + "/a" * 1000
     finside = gdal.VSIFOpenL('/vsizip/vsimem/bigdepthzip.zip/' + filename, 'wb')
     if finside is None:
-        gdaltest.post_reason('fail')
         return 'fail'
     gdal.VSIFCloseL(finside)
     gdal.VSIFCloseL(fmain)
@@ -392,7 +377,6 @@ def test_vsizip_6():
     fmain = gdal.VSIFOpenL("/vsizip/vsimem/test6.zip", "wb")
     f = gdal.VSIFOpenL("/vsizip/vsimem/test6.zip/foo.bar", "wb")
     if f is None:
-        gdaltest.post_reason('fail')
         return 'fail'
     gdal.VSIFWriteL("12345", 1, 5, f)
     gdal.VSIFCloseL(f)
@@ -402,7 +386,6 @@ def test_vsizip_6():
     f = gdal.VSIFOpenL("/vsizip/vsimem/test6.zip/foo.bar", "wb")
     gdal.PopErrorHandler()
     if f is not None:
-        gdaltest.post_reason('fail')
         gdal.VSIFCloseL(f)
         return 'fail'
     gdal.VSIFCloseL(fmain)
@@ -413,7 +396,6 @@ def test_vsizip_6():
     # Now close it each time
     f = gdal.VSIFOpenL("/vsizip/vsimem/test6.zip/foo.bar", "wb")
     if f is None:
-        gdaltest.post_reason('fail')
         return 'fail'
     gdal.VSIFWriteL("12345", 1, 5, f)
     gdal.VSIFCloseL(f)
@@ -423,7 +405,6 @@ def test_vsizip_6():
     f = gdal.VSIFOpenL("/vsizip/vsimem/test6.zip/foo.bar", "wb")
     gdal.PopErrorHandler()
     if f is not None:
-        gdaltest.post_reason('fail')
         gdal.VSIFCloseL(f)
         return 'fail'
 
@@ -472,11 +453,9 @@ def test_vsizip_8():
 def test_vsizip_9():
 
     if gdal.VSIStatL('/vsizip//vsisparse/data/zero_stored.bin.xml.zip/zero.bin').size != 5000 * 1000 * 1000 + 1:
-        gdaltest.post_reason('fail')
         return 'fail'
 
     if gdal.VSIStatL('/vsizip//vsisparse/data/zero_stored.bin.xml.zip/hello.txt').size != 6:
-        gdaltest.post_reason('fail')
         return 'fail'
 
     f = gdal.VSIFOpenL('/vsizip//vsisparse/data/zero_stored.bin.xml.zip/zero.bin', 'rb')
@@ -484,7 +463,6 @@ def test_vsizip_9():
     data = gdal.VSIFReadL(1, 1, f)
     gdal.VSIFCloseL(f)
     if data.decode('ascii') != '\x03':
-        gdaltest.post_reason('fail')
         return 'fail'
 
     f = gdal.VSIFOpenL('/vsizip//vsisparse/data/zero_stored.bin.xml.zip/hello.txt', 'rb')
@@ -492,7 +470,6 @@ def test_vsizip_9():
     gdal.VSIFCloseL(f)
     if data.decode('ascii') != 'HELLO\n':
         print(data)
-        gdaltest.post_reason('fail')
         return 'fail'
 
     return 'success'
@@ -595,7 +572,6 @@ def test_vsizip_12():
     gdal.Unlink('/vsimem/vsizip_12.zip')
 
     if content != ['bar.baz']:
-        gdaltest.post_reason('fail')
         print(content)
         return 'fail'
 
@@ -615,12 +591,10 @@ def test_vsizip_13():
 
     lst = gdal.ReadDir('/vsizip/vsimem/vsizip_13.zip')
     if len(lst) < 4:
-        gdaltest.post_reason('fail')
         return 'fail'
     # Test truncation
     lst_truncated = gdal.ReadDir('/vsizip/vsimem/vsizip_13.zip', int(len(lst) / 2))
     if len(lst_truncated) <= int(len(lst) / 2):
-        gdaltest.post_reason('fail')
         return 'fail'
 
     gdal.Unlink('/vsimem/vsizip_13.zip')
@@ -684,8 +658,6 @@ def test_vsizip_multi_thread():
     gdal.Unlink('/vsimem/vsizip_multi_thread.zip')
 
     if data != 'hello' * 100000:
-        gdaltest.post_reason('fail')
-
         for i in range(10000):
             if data[i*5:i*5+5] != 'hello':
                 print(i*5, data[i*5:i*5+5], data[i*5-5:i*5+5-5])
@@ -715,7 +687,6 @@ def test_vsizip_multi_thread_below_threshold():
     gdal.Unlink('/vsimem/vsizip_multi_thread.zip')
 
     if data != 'hello':
-        gdaltest.post_reason('fail')
         print(data)
         return 'fail'
 
@@ -744,13 +715,11 @@ def test_vsizip_create_zip64():
 
     size = gdal.VSIStatL(zip_name).size
     if size > 0xFFFFFFFF:
-        gdaltest.post_reason('fail')
         print(size)
         return 'fail'
 
     size = gdal.VSIStatL('/vsizip/' + zip_name + '/test').size
     if size != len(s) * niters:
-        gdaltest.post_reason('fail')
         print(size)
         return 'fail'
 
@@ -758,7 +727,6 @@ def test_vsizip_create_zip64():
     data = gdal.VSIFReadL(1, len(s), f).decode('ascii')
     gdal.VSIFCloseL(f)
     if data != s:
-        gdaltest.post_reason('fail')
         return 'fail'
 
     gdal.Unlink(zip_name)
@@ -788,13 +756,11 @@ def test_vsizip_create_zip64_stream_larger_than_4G():
 
     size = gdal.VSIStatL(zip_name).size
     if size <= 0xFFFFFFFF:
-        gdaltest.post_reason('fail')
         print(size)
         return 'fail'
 
     size = gdal.VSIStatL('/vsizip/' + zip_name + '/test2').size
     if size != len(s) * niters:
-        gdaltest.post_reason('fail')
         print(size)
         return 'fail'
 
@@ -802,7 +768,6 @@ def test_vsizip_create_zip64_stream_larger_than_4G():
     data = gdal.VSIFReadL(1, len(s), f).decode('ascii')
     gdal.VSIFCloseL(f)
     if data != s:
-        gdaltest.post_reason('fail')
         return 'fail'
 
     gdal.Unlink(zip_name)
@@ -815,7 +780,6 @@ def test_vsizip_byte_zip64_local_header_zeroed():
 
     size = gdal.VSIStatL('/vsizip/data/byte_zip64_local_header_zeroed.zip/byte.tif').size
     if size != 736:
-        gdaltest.post_reason('fail')
         print(size)
         return 'fail'
 
diff --git a/autotest/gdrivers/aaigrid.py b/autotest/gdrivers/aaigrid.py
index 89ee33e4c603..f3e23a10948c 100755
--- a/autotest/gdrivers/aaigrid.py
+++ b/autotest/gdrivers/aaigrid.py
@@ -328,11 +328,9 @@ def test_aaigrid_12():
     aai.close()
     gdal.GetDriverByName('AAIGRID').Delete('tmp/aaigrid.tmp')
     if not ndv.startswith('nodata_value'):
-        gdaltest.post_reason('fail')
         print(ndv)
         return 'fail'
     if not ndv.endswith('-99999.000'):
-        gdaltest.post_reason('fail')
         print(ndv)
         return 'fail'
     return 'success'
@@ -357,11 +355,9 @@ def test_aaigrid_13():
     aai.close()
     gdal.GetDriverByName('AAIGRID').Delete('tmp/aaigrid.tmp')
     if not ndv.startswith('nodata_value'):
-        gdaltest.post_reason('fail')
         print(ndv)
         return 'fail'
     if not ndv.endswith('-1e+05') and not ndv.endswith('-1e+005'):
-        gdaltest.post_reason('fail')
         print(ndv)
         return 'fail'
     return 'success'
@@ -385,7 +381,6 @@ def test_aaigrid_14():
     gdal.GetDriverByName('AAIGRID').Delete('/vsimem/aaigrid_14.asc')
 
     if data.find('107.0 123') < 0:
-        gdaltest.post_reason('fail')
         print(data)
         return 'fail'
 
@@ -408,7 +403,6 @@ def test_aaigrid_15():
 
     ds = gdal.Open('/vsimem/aaigrid_15.asc')
     if ds.GetRasterBand(1).DataType != gdal.GDT_Float64:
-        gdaltest.post_reason('fail')
         return 'fail'
     ds = None
 
diff --git a/autotest/gdrivers/bag.py b/autotest/gdrivers/bag.py
index cbc4878692e4..f2a190c6d4f1 100755
--- a/autotest/gdrivers/bag.py
+++ b/autotest/gdrivers/bag.py
@@ -206,7 +206,6 @@ def test_bag_vr_normal():
 
     for key in expected_md:
         if key not in got_md or got_md[key] != expected_md[key]:
-            gdaltest.post_reason('fail')
             print(key)
             import pprint
             pp = pprint.PrettyPrinter()
@@ -222,7 +221,6 @@ def test_bag_vr_normal():
 
     got_md2 = gdal.Info(ds, computeChecksum=True, format='json')
     if got_md2 != got_md:
-        gdaltest.post_reason('fail')
         return 'fail'
 
     return 'success'
@@ -238,17 +236,14 @@ def test_bag_vr_list_supergrids():
 
     ds = gdal.OpenEx('data/test_vr.bag', open_options=['MODE=LIST_SUPERGRIDS'])
     if ds is None:
-        gdaltest.post_reason('fail')
         return 'fail'
     sub_ds = ds.GetSubDatasets()
     if len(sub_ds) != 24:
-        gdaltest.post_reason('fail')
         print(len(sub_ds))
         print(sub_ds)
         return 'fail'
 
     if sub_ds[0][0] != 'BAG:"data/test_vr.bag":supergrid:0:0':
-        gdaltest.post_reason('fail')
         print(sub_ds)
         return 'fail'
 
@@ -259,7 +254,6 @@ def test_bag_vr_list_supergrids():
                          open_options=['MODE=LIST_SUPERGRIDS', 'MINX=200'])
     sub_ds = ds.GetSubDatasets()
     if len(sub_ds) != 24:
-        gdaltest.post_reason('fail')
         print(len(sub_ds))
         print(sub_ds)
         return 'fail'
@@ -268,12 +262,10 @@ def test_bag_vr_list_supergrids():
                      'MODE=LIST_SUPERGRIDS', 'MINX=100', 'MAXX=220', 'MINY=500000', 'MAXY=500100'])
     sub_ds = ds.GetSubDatasets()
     if len(sub_ds) != 6:
-        gdaltest.post_reason('fail')
         print(len(sub_ds))
         print(sub_ds)
         return 'fail'
     if sub_ds[0][0] != 'BAG:"data/test_vr.bag":supergrid:1:1':
-        gdaltest.post_reason('fail')
         print(sub_ds)
         return 'fail'
 
@@ -281,12 +273,10 @@ def test_bag_vr_list_supergrids():
                      'MODE=LIST_SUPERGRIDS', 'RES_FILTER_MIN=5', 'RES_FILTER_MAX=10'])
     sub_ds = ds.GetSubDatasets()
     if len(sub_ds) != 12:
-        gdaltest.post_reason('fail')
         print(len(sub_ds))
         print(sub_ds)
         return 'fail'
     if sub_ds[0][0] != 'BAG:"data/test_vr.bag":supergrid:0:3':
-        gdaltest.post_reason('fail')
         print(sub_ds)
         return 'fail'
 
@@ -294,13 +284,11 @@ def test_bag_vr_list_supergrids():
                      'SUPERGRIDS_INDICES=(2,1),(3,4)'])
     sub_ds = ds.GetSubDatasets()
     if len(sub_ds) != 2:
-        gdaltest.post_reason('fail')
         print(len(sub_ds))
         print(sub_ds)
         return 'fail'
     if sub_ds[0][0] != 'BAG:"data/test_vr.bag":supergrid:2:1' or \
        sub_ds[1][0] != 'BAG:"data/test_vr.bag":supergrid:3:4':
-        gdaltest.post_reason('fail')
         print(sub_ds)
         return 'fail'
 
@@ -309,7 +297,6 @@ def test_bag_vr_list_supergrids():
                      'SUPERGRIDS_INDICES=(2,1)'])
     ds2 = gdal.Open('BAG:"data/test_vr.bag":supergrid:2:1')
     if gdal.Info(ds) != gdal.Info(ds2):
-        gdaltest.post_reason('fail')
         print(sub_ds)
         return 'fail'
 
@@ -320,7 +307,6 @@ def test_bag_vr_list_supergrids():
             ds = gdal.OpenEx('data/test_vr.bag', open_options=[
                 'SUPERGRIDS_INDICES=' + invalid_val])
         if gdal.GetLastErrorMsg() == '':
-            gdaltest.post_reason('fail')
             print(invalid_val)
             return 'fail'
 
@@ -337,7 +323,6 @@ def test_bag_vr_open_supergrids():
 
     ds = gdal.Open('BAG:"data/test_vr.bag":supergrid:0:0')
     if ds is None:
-        gdaltest.post_reason('fail')
         return 'fail'
 
     got_md = gdal.Info(ds, computeChecksum=True, format='json')
@@ -375,7 +360,6 @@ def test_bag_vr_open_supergrids():
 
     for key in expected_md:
         if key not in got_md or got_md[key] != expected_md[key]:
-            gdaltest.post_reason('fail')
             print(key)
             import pprint
             pp = pprint.PrettyPrinter()
@@ -385,19 +369,16 @@ def test_bag_vr_open_supergrids():
     with gdaltest.error_handler():
         ds = gdal.Open('BAG:"/vsimem/unexisting.bag":supergrid:0:0')
     if ds is not None:
-        gdaltest.post_reason('fail')
         return 'fail'
 
     with gdaltest.error_handler():
         ds = gdal.Open('BAG:"data/test_vr.bag":supergrid:4:0')
     if ds is not None:
-        gdaltest.post_reason('fail')
         return 'fail'
 
     with gdaltest.error_handler():
         ds = gdal.Open('BAG:"data/test_vr.bag":supergrid:0:6')
     if ds is not None:
-        gdaltest.post_reason('fail')
         return 'fail'
 
     with gdaltest.error_handler():
@@ -420,7 +401,6 @@ def test_bag_vr_resampled():
 
     ds = gdal.OpenEx('data/test_vr.bag', open_options=['MODE=RESAMPLED_GRID'])
     if ds is None:
-        gdaltest.post_reason('fail')
         return 'fail'
 
     got_md = gdal.Info(ds, computeChecksum=True, format='json')
@@ -462,7 +442,6 @@ def test_bag_vr_resampled():
 
     for key in expected_md:
         if key not in got_md or got_md[key] != expected_md[key]:
-            gdaltest.post_reason('fail')
             print(key)
             import pprint
             pp = pprint.PrettyPrinter()
@@ -477,14 +456,12 @@ def test_bag_vr_resampled():
             ds = gdal.OpenEx('data/test_vr.bag',
                              open_options=['MODE=RESAMPLED_GRID'])
             if ds.GetRasterBand(1).GetBlockSize() != [block_size, block_size]:
-                gdaltest.post_reason('fail')
                 print(block_size)
                 print(ds.GetRasterBand(1).GetBlockSize())
                 return 'fail'
             data = ds.ReadRaster()
 
         if data != data_ref:
-            gdaltest.post_reason('fail')
             print(block_size)
             return 'fail'
 
@@ -493,39 +470,32 @@ def test_bag_vr_resampled():
         ds = gdal.OpenEx('data/test_vr.bag',
                          open_options=['MODE=RESAMPLED_GRID'])
     if ds.GetRasterBand(1).GetOverviewCount() != 2:
-        gdaltest.post_reason('fail')
         print(ds.GetRasterBand(1).GetOverviewCount())
         return 'fail'
     if ds.GetRasterBand(1).GetOverview(-1) is not None:
-        gdaltest.post_reason('fail')
         return 'fail'
     if ds.GetRasterBand(1).GetOverview(2) is not None:
-        gdaltest.post_reason('fail')
         return 'fail'
 
     ovr = ds.GetRasterBand(1).GetOverview(0)
     cs = ovr.Checksum()
     if cs != 681:
-        gdaltest.post_reason('fail')
         print(cs)
         return 'fail'
     ovr = ds.GetRasterBand(2).GetOverview(0)
     cs = ovr.Checksum()
     if cs != 1344:
-        gdaltest.post_reason('fail')
         print(cs)
         return 'fail'
     ds.GetRasterBand(1).GetOverview(0).FlushCache()
     ds.GetRasterBand(1).GetOverview(1).FlushCache()
     cs = ovr.Checksum()
     if cs != 1344:
-        gdaltest.post_reason('fail')
         print(cs)
         return 'fail'
     ovr = ds.GetRasterBand(1).GetOverview(0)
     cs = ovr.Checksum()
     if cs != 681:
-        gdaltest.post_reason('fail')
         print(cs)
         return 'fail'
 
@@ -535,7 +505,6 @@ def test_bag_vr_resampled():
     gt = ds.GetGeoTransform()
     got = (gt[0], gt[3], ds.RasterXSize)
     if got != (90.0, 500112.0, 6):
-        gdaltest.post_reason('fail')
         print(got)
         return 'fail'
 
@@ -545,7 +514,6 @@ def test_bag_vr_resampled():
     gt = ds.GetGeoTransform()
     got = (gt[3] + gt[5] * ds.RasterYSize, ds.RasterYSize)
     if got != (500000.0, 21):
-        gdaltest.post_reason('fail')
         print(got)
         return 'fail'
 
@@ -555,7 +523,6 @@ def test_bag_vr_resampled():
     gt = ds.GetGeoTransform()
     got = (gt[1], gt[5])
     if got != (5.0, -6.0):
-        gdaltest.post_reason('fail')
         print(got)
         return 'fail'
 
@@ -565,7 +532,6 @@ def test_bag_vr_resampled():
     gt = ds.GetGeoTransform()
     got = (gt[1], gt[5])
     if got != (4.983333110809326, -5.316666603088379):
-        gdaltest.post_reason('fail')
         print(got)
         return 'fail'
 
@@ -575,7 +541,6 @@ def test_bag_vr_resampled():
     gt = ds.GetGeoTransform()
     got = (gt[1], gt[5])
     if got != (29.899999618530273, -31.899999618530273):
-        gdaltest.post_reason('fail')
         print(got)
         return 'fail'
 
@@ -585,7 +550,6 @@ def test_bag_vr_resampled():
     gt = ds.GetGeoTransform()
     got = (gt[1], gt[5])
     if got != (12.209166447321573, -13.025833209355673):
-        gdaltest.post_reason('fail')
         print(got)
         return 'fail'
 
@@ -596,12 +560,10 @@ def test_bag_vr_resampled():
     gt = ds.GetGeoTransform()
     got = (gt[1], gt[5])
     if got != (8.0, -8.0):
-        gdaltest.post_reason('fail')
         print(got)
         return 'fail'
     got = (ds.GetRasterBand(1).Checksum(), ds.GetRasterBand(2).Checksum())
     if got != (2099, 2747):
-        gdaltest.post_reason('fail')
         print(got)
         return 'fail'
 
@@ -611,12 +573,10 @@ def test_bag_vr_resampled():
     gt = ds.GetGeoTransform()
     got = (gt[1], gt[5])
     if got != (8.0, -8.0):
-        gdaltest.post_reason('fail')
         print(got)
         return 'fail'
     got = (ds.GetRasterBand(1).Checksum(), ds.GetRasterBand(2).Checksum())
     if got != (2099, 2747):
-        gdaltest.post_reason('fail')
         print(got)
         return 'fail'
 
@@ -627,12 +587,10 @@ def test_bag_vr_resampled():
     gt = ds.GetGeoTransform()
     got = (gt[1], gt[5])
     if got != (16.0, -16.0):
-        gdaltest.post_reason('fail')
         print(got)
         return 'fail'
     got = (ds.GetRasterBand(1).Checksum(), ds.GetRasterBand(2).Checksum())
     if got != (796, 864):
-        gdaltest.post_reason('fail')
         print(got)
         return 'fail'
 
@@ -643,12 +601,10 @@ def test_bag_vr_resampled():
     gt = ds.GetGeoTransform()
     got = (gt[1], gt[5])
     if got != (32.0, -32.0):
-        gdaltest.post_reason('fail')
         print(got)
         return 'fail'
     got = (ds.GetRasterBand(1).Checksum(), ds.GetRasterBand(2).Checksum())
     if got != (207, 207):
-        gdaltest.post_reason('fail')
         print(got)
         return 'fail'
 
@@ -658,12 +614,10 @@ def test_bag_vr_resampled():
     gt = ds.GetGeoTransform()
     got = (gt[1], gt[5])
     if got != (29.899999618530273, -31.899999618530273):
-        gdaltest.post_reason('fail')
         print(got)
         return 'fail'
     got = (ds.GetRasterBand(1).Checksum(), ds.GetRasterBand(2).Checksum())
     if got != (165, 205):
-        gdaltest.post_reason('fail')
         print(got)
         return 'fail'
 
@@ -673,7 +627,6 @@ def test_bag_vr_resampled():
                          open_options=['MODE=RESAMPLED_GRID',
                                        'RES_FILTER_MIN=32'])
     if ds is not None:
-        gdaltest.post_reason('fail')
         return 'fail'
 
     # Too small RES_FILTER_MAX
@@ -682,7 +635,6 @@ def test_bag_vr_resampled():
                          open_options=['MODE=RESAMPLED_GRID',
                                        'RES_FILTER_MAX=4'])
     if ds is not None:
-        gdaltest.post_reason('fail')
         return 'fail'
 
     # RES_FILTER_MIN >= RES_FILTER_MAX
@@ -692,7 +644,6 @@ def test_bag_vr_resampled():
                                        'RES_FILTER_MIN=4',
                                        'RES_FILTER_MAX=4'])
     if ds is not None:
-        gdaltest.post_reason('fail')
         return 'fail'
 
     # Test VALUE_POPULATION
@@ -720,7 +671,6 @@ def test_bag_vr_resampled():
     m2_min, M2_min, mean2_min, _ = ds.GetRasterBand(2).ComputeStatistics(False)
 
     if mean1_min >= mean1_mean or mean1_mean >= mean1_max:
-        gdaltest.post_reason('fail')
         print(m1_max, M1_max, mean1_max)
         print(m2_max, M2_max, mean2_max)
         print(m1_mean, M1_mean, mean1_mean)
@@ -731,7 +681,6 @@ def test_bag_vr_resampled():
 
     if m2_min >= m2_max or \
        (m2_mean, M2_mean, mean2_mean) != (m2_max, M2_max, mean2_max):
-        gdaltest.post_reason('fail')
         print(m1_max, M1_max, mean1_max)
         print(m2_max, M2_max, mean2_max)
         print(m1_mean, M1_mean, mean1_mean)
@@ -755,20 +704,15 @@ def test_bag_vr_resampled_mask():
                      open_options=['MODE=RESAMPLED_GRID',
                                    'SUPERGRIDS_MASK=YES'])
     if ds is None:
-        gdaltest.post_reason('fail')
         return 'fail'
     if ds.RasterCount != 1:
-        gdaltest.post_reason('fail')
         return 'fail'
     if ds.GetRasterBand(1).DataType != gdal.GDT_Byte:
-        gdaltest.post_reason('fail')
         return 'fail'
     if ds.GetRasterBand(1).GetNoDataValue() is not None:
-        gdaltest.post_reason('fail')
         return 'fail'
     cs = ds.GetRasterBand(1).Checksum()
     if cs != 4507:
-        gdaltest.post_reason('fail')
         print(cs)
         return 'fail'
 
@@ -788,7 +732,6 @@ def test_bag_vr_resampled_interpolated():
                                    'INTERPOLATION=INVDIST'])
     cs = ds.GetRasterBand(1).Checksum()
     if cs != 2175:
-        gdaltest.post_reason('fail')
         print(cs)
         return 'fail'
 
@@ -797,7 +740,6 @@ def test_bag_vr_resampled_interpolated():
         ds = gdal.OpenEx('data/test_vr.bag',
                          open_options=['MODE=RESAMPLED_GRID'])
     if ds.GetRasterBand(1).GetOverviewCount() != 2:
-        gdaltest.post_reason('fail')
         print(ds.GetRasterBand(1).GetOverviewCount())
         return 'fail'
 
@@ -808,7 +750,6 @@ def test_bag_vr_resampled_interpolated():
                                        'SUPERGRIDS_MASK=YES',
                                        'INTERPOLATION=INVDIST'])
     if ds is not None:
-        gdaltest.post_reason('fail')
         return 'fail'
 
     return 'success'
@@ -847,11 +788,9 @@ def test_bag_write_two_bands():
     ds = gdal.Open('/vsimem/out.bag')
     xml = ds.GetMetadata_List('xml:BAG')[0]
     if xml.find('<bar />') < 0:
-        gdaltest.post_reason('fail')
         print(xml)
         return 'fail'
     if xml.find('Generated by GDAL ') < 0:
-        gdaltest.post_reason('fail')
         print(xml)
         return 'fail'
 
@@ -879,13 +818,11 @@ def test_bag_write_south_up():
     # Check that it is presented as north-up
     cs = ds.GetRasterBand(1).Checksum()
     if cs != 4672:
-        gdaltest.post_reason('fail')
         print(cs)
         return 'fail'
 
     gt = ds.GetGeoTransform()
     if gt != (440720.0, 60.0, 0.0, 3751320.0, 0.0, -60.0):
-        gdaltest.post_reason('fail')
         print(gt)
         return 'fail'
 
diff --git a/autotest/gdrivers/cals.py b/autotest/gdrivers/cals.py
index 2c1790f30dbd..def873922394 100755
--- a/autotest/gdrivers/cals.py
+++ b/autotest/gdrivers/cals.py
@@ -67,19 +67,14 @@ def test_cals_3():
     tmp_ds.SetMetadataItem('TIFFTAG_YRESOLUTION', '600')
     out_ds = gdal.GetDriverByName('CALS').CreateCopy('/vsimem/cals_2.cal', tmp_ds)
     if gdal.VSIStatL('/vsimem/cals_2.cal.aux.xml') is not None:
-        gdaltest.post_reason('fail')
         return 'fail'
     if out_ds.GetRasterBand(1).Checksum() != 3883:
-        gdaltest.post_reason('fail')
         return 'fail'
     if out_ds.GetMetadataItem('PIXEL_PATH') is not None:
-        gdaltest.post_reason('fail')
         return 'fail'
     if out_ds.GetMetadataItem('TIFFTAG_XRESOLUTION') != '600':
-        gdaltest.post_reason('fail')
         return 'fail'
     if out_ds.GetRasterBand(1).GetColorInterpretation() != gdal.GCI_PaletteIndex:
-        gdaltest.post_reason('fail')
         return 'fail'
     tmp_ds = None
     out_ds = None
@@ -101,7 +96,6 @@ def test_cals_4():
     out_ds = gdal.GetDriverByName('CALS').CreateCopy('/vsimem/cals_4.cal', src_ds)
     gdal.PopErrorHandler()
     if out_ds is not None:
-        gdaltest.post_reason('fail')
         return 'fail'
 
     # 2 bands
@@ -110,7 +104,6 @@ def test_cals_4():
     out_ds = gdal.GetDriverByName('CALS').CreateCopy('/vsimem/cals_4.cal', src_ds, strict=True)
     gdal.PopErrorHandler()
     if out_ds is not None:
-        gdaltest.post_reason('fail')
         return 'fail'
 
     # 1 band but not 1-bit
@@ -119,7 +112,6 @@ def test_cals_4():
     out_ds = gdal.GetDriverByName('CALS').CreateCopy('/vsimem/cals_4.cal', src_ds, strict=True)
     gdal.PopErrorHandler()
     if out_ds is not None:
-        gdaltest.post_reason('fail')
         return 'fail'
 
     # Dimension > 999999
@@ -129,7 +121,6 @@ def test_cals_4():
     out_ds = gdal.GetDriverByName('CALS').CreateCopy('/vsimem/cals_4.cal', src_ds, strict=True)
     gdal.PopErrorHandler()
     if out_ds is not None:
-        gdaltest.post_reason('fail')
         return 'fail'
 
     # Invalid output filename
@@ -139,7 +130,6 @@ def test_cals_4():
     out_ds = gdal.GetDriverByName('CALS').CreateCopy('/not_existing_dir/cals_4.cal', src_ds)
     gdal.PopErrorHandler()
     if out_ds is not None:
-        gdaltest.post_reason('fail')
         return 'fail'
 
     return 'success'
@@ -156,13 +146,10 @@ def test_cals_5():
     src_ds.SetMetadataItem('LINE_PROGRESSION', '270')
     out_ds = gdal.GetDriverByName('CALS').CreateCopy('/vsimem/cals_5.cal', src_ds)
     if gdal.VSIStatL('/vsimem/cals_5.cal.aux.xml') is not None:
-        gdaltest.post_reason('fail')
         return 'fail'
     if out_ds.GetMetadataItem('PIXEL_PATH') != '90':
-        gdaltest.post_reason('fail')
         return 'fail'
     if out_ds.GetMetadataItem('LINE_PROGRESSION') != '270':
-        gdaltest.post_reason('fail')
         return 'fail'
     out_ds = None
     gdal.Unlink('/vsimem/cals_5.cal')
diff --git a/autotest/gdrivers/db2.py b/autotest/gdrivers/db2.py
index 7648a34d109a..e74fe8d5a1b2 100755
--- a/autotest/gdrivers/db2.py
+++ b/autotest/gdrivers/db2.py
@@ -152,15 +152,12 @@ def check_tile_format(out_ds, expected_format, expected_band_count, expected_ct,
         expected_mime_type = 'image/x-webp'
 
     if mime_type != expected_mime_type:
-        gdaltest.post_reason('fail')
         print(mime_type)
         return 'fail'
     if band_count != expected_band_count:
-        gdaltest.post_reason('fail')
         print(band_count)
         return 'fail'
     if expected_ct != has_ct:
-        gdaltest.post_reason('fail')
         print(has_ct)
         return 'fail'
     return 'success'
@@ -200,7 +197,6 @@ def test_gpkg_1():
     got_gt = out_ds.GetGeoTransform()
     for i in range(6):
         if abs(expected_gt[i] - got_gt[i]) > 1e-8:
-            gdaltest.post_reason('fail')
             return 'fail'
     got_wkt = out_ds.GetProjectionRef()
     print("\n** expected_wkt " + expected_wkt + " **\n")
@@ -209,12 +205,10 @@ def test_gpkg_1():
 #   the WKT (similar but different)
 #   just check if it contains '11N' for NAD27 UTM zone 11N
     if got_wkt.find('11N') == -1:
-        gdaltest.post_reason('fail')
         return 'fail'
     expected_cs = [expected_cs, expected_cs, expected_cs, 4873]
     got_cs = [out_ds.GetRasterBand(i + 1).Checksum() for i in range(4)]
     if got_cs != expected_cs:
-        gdaltest.post_reason('fail')
         print('Got %s, expected %s' % (str(got_cs), str(expected_cs)))
         return 'fail'
 
diff --git a/autotest/gdrivers/derived.py b/autotest/gdrivers/derived.py
index a98946daf964..7310e1611611 100755
--- a/autotest/gdrivers/derived.py
+++ b/autotest/gdrivers/derived.py
@@ -40,7 +40,6 @@ def test_derived_test1():
     gdal.ErrorReset()
     ds = gdal.Open(filename)
     if ds is None or gdal.GetLastErrorMsg() != '':
-        gdaltest.post_reason('fail')
         return 'fail'
     got_dsds = ds.GetMetadata('DERIVED_SUBDATASETS')
     expected_gt = ds.GetGeoTransform()
@@ -61,7 +60,6 @@ def test_derived_test1():
                      'DERIVED_SUBDATASET_7_DESC': 'log10 of amplitude of input bands from ../gcore/data/cfloat64.tif'}
 
     if got_dsds != expected_dsds:
-        gdaltest.post_reason('fail')
         import pprint
         pprint.pprint(got_dsds)
         return 'fail'
@@ -71,17 +69,14 @@ def test_derived_test1():
         if key.endswith('_NAME'):
             ds = gdal.Open(val)
             if ds is None or gdal.GetLastErrorMsg() != '':
-                gdaltest.post_reason('fail')
                 return 'fail'
             gt = ds.GetGeoTransform()
             if gt != expected_gt:
-                gdaltest.post_reason('fail')
                 import pprint
                 pprint.pprint("Expected geotransform: " + str(expected_gt) + ", got " + str(gt))
                 return 'fail'
             prj = ds.GetProjection()
             if prj != expected_prj:
-                gdaltest.post_reason('fail')
                 import pprint
                 pprint.pprint("Expected projection: " + str(expected_prj) + ", got: " + str(gt))
                 return 'fail'
@@ -93,7 +88,6 @@ def test_derived_test2():
     gdal.ErrorReset()
     ds = gdal.Open(filename)
     if ds is None or gdal.GetLastErrorMsg() != '':
-        gdaltest.post_reason('fail')
         return 'fail'
     got_dsds = ds.GetMetadata('DERIVED_SUBDATASETS')
     expected_dsds = {'DERIVED_SUBDATASET_1_NAME': 'DERIVED_SUBDATASET:AMPLITUDE:../gcore/data/cint_sar.tif',
@@ -120,7 +114,6 @@ def test_derived_test2():
                    'DERIVED_SUBDATASET_7_NAME': 55}
 
     if got_dsds != expected_dsds:
-        gdaltest.post_reason('fail')
         import pprint
         pprint.pprint(got_dsds)
         return 'fail'
@@ -130,11 +123,9 @@ def test_derived_test2():
         if key.endswith('_NAME'):
             ds = gdal.Open(val)
             if ds is None or gdal.GetLastErrorMsg() != '':
-                gdaltest.post_reason('fail')
                 return 'fail'
             cs = ds.GetRasterBand(1).Checksum()
             if expected_cs[key] != cs:
-                gdaltest.post_reason('fail')
                 import pprint
                 pprint.pprint("Expected checksum " + str(expected_cs[key]) + ", got " + str(cs))
                 return 'fail'
@@ -150,26 +141,22 @@ def test_derived_test3():
         # Missing filename
         ds = gdal.Open('DERIVED_SUBDATASET:LOGAMPLITUDE')
     if ds is not None:
-        gdaltest.post_reason('fail')
         return 'fail'
 
     with gdaltest.error_handler():
         ds = gdal.Open('DERIVED_SUBDATASET:invalid_alg:../gcore/data/byte.tif')
     if ds is not None:
-        gdaltest.post_reason('fail')
         return 'fail'
 
     with gdaltest.error_handler():
         ds = gdal.Open('DERIVED_SUBDATASET:LOGAMPLITUDE:dataset_does_not_exist')
     if ds is not None:
-        gdaltest.post_reason('fail')
         return 'fail'
 
     with gdaltest.error_handler():
         # Raster with zero band
         ds = gdal.Open('DERIVED_SUBDATASET:LOGAMPLITUDE:data/CSK_DGM.h5')
     if ds is not None:
-        gdaltest.post_reason('fail')
         return 'fail'
 
     for function in ['real', 'imag', 'complex', 'mod', 'phase', 'conj',
diff --git a/autotest/gdrivers/ecrgtoc.py b/autotest/gdrivers/ecrgtoc.py
index ebd2e3929484..ee1c3a60edf7 100755
--- a/autotest/gdrivers/ecrgtoc.py
+++ b/autotest/gdrivers/ecrgtoc.py
@@ -171,20 +171,17 @@ def test_ecrgtoc_3():
         ds = gdal.Open(name)
         gdal.PopErrorHandler()
         if ds is not None:
-            gdaltest.post_reason('fail')
             print(name)
             return 'fail'
 
     # Legacy syntax
     ds = gdal.Open('ECRG_TOC_ENTRY:ProductTitle:DiscId:/vsimem/TOC.xml')
     if ds is None:
-        gdaltest.post_reason('fail')
         return 'fail'
     ds = None
 
     ds = gdal.Open('ECRG_TOC_ENTRY:ProductTitle:DiscId:1_500_K:/vsimem/TOC.xml')
     if ds is None:
-        gdaltest.post_reason('fail')
         return 'fail'
     ds = None
 
diff --git a/autotest/gdrivers/ecw.py b/autotest/gdrivers/ecw.py
index 4f932e51536a..6450976b6dbb 100755
--- a/autotest/gdrivers/ecw.py
+++ b/autotest/gdrivers/ecw.py
@@ -835,7 +835,6 @@ def test_ecw_24():
 
     try:
         os.stat('tmp/spif83.ecw.aux.xml')
-        gdaltest.post_reason('fail')
         return 'fail'
     except OSError:
         pass
@@ -846,7 +845,6 @@ def test_ecw_24():
 
     for i in range(6):
         if abs(gt[i] - got_gt[i]) > 1e-5:
-            gdaltest.post_reason('fail')
             print(got_gt)
             return 'fail'
 
@@ -891,7 +889,6 @@ def test_ecw_25():
 
     try:
         os.stat('tmp/spif83.ecw.aux.xml')
-        gdaltest.post_reason('fail')
         return 'fail'
     except OSError:
         pass
@@ -904,20 +901,16 @@ def test_ecw_25():
     ds = None
 
     if got_proj != proj:
-        gdaltest.post_reason('fail')
         print(got_proj)
         return 'fail'
     if got_datum != datum:
-        gdaltest.post_reason('fail')
         print(got_datum)
         return 'fail'
     if got_units != units:
-        gdaltest.post_reason('fail')
         print(got_units)
         return 'fail'
 
     if wkt != got_wkt:
-        gdaltest.post_reason('fail')
         print(got_wkt)
         return 'fail'
 
@@ -961,7 +954,6 @@ def test_ecw_26():
 
     try:
         os.stat('tmp/spif83.ecw.aux.xml')
-        gdaltest.post_reason('fail')
         return 'fail'
     except OSError:
         pass
@@ -974,15 +966,12 @@ def test_ecw_26():
     ds = None
 
     if got_proj != proj:
-        gdaltest.post_reason('fail')
         print(proj)
         return 'fail'
     if got_datum != datum:
-        gdaltest.post_reason('fail')
         print(datum)
         return 'fail'
     if got_units != units:
-        gdaltest.post_reason('fail')
         print(units)
         return 'fail'
 
@@ -991,7 +980,6 @@ def test_ecw_26():
     wkt = sr.ExportToWkt()
 
     if wkt != got_wkt:
-        gdaltest.post_reason('fail')
         print(got_wkt)
         return 'fail'
 
@@ -1212,7 +1200,6 @@ def test_ecw_32():
     data_123 = ds.ReadRaster(0, 0, ds.RasterXSize, ds.RasterYSize, band_list=[1, 2, 3])
     data_321 = ds.ReadRaster(0, 0, ds.RasterXSize, ds.RasterYSize, band_list=[3, 2, 1])
     if data_123 == data_321:
-        gdaltest.post_reason('failure')
         return 'fail'
 
     vrt_ds = gdal.Open("""<VRTDataset rasterXSize="400" rasterYSize="400">
@@ -1238,7 +1225,6 @@ def test_ecw_32():
     data_vrt = vrt_ds.ReadRaster(0, 0, ds.RasterXSize, ds.RasterYSize, band_list=[1, 2, 3])
 
     if data_321 != data_vrt:
-        gdaltest.post_reason('failure')
         return 'fail'
 
     return 'success'
@@ -1285,7 +1271,6 @@ def test_ecw_33():
     ds = None
 
     if data1_1 != data1_2 or data2_1 != data2_2 or data3_1 != data3_2:
-        gdaltest.post_reason('fail')
         return 'fail'
 
     # When heuristics is ON, returned values should be the same as
@@ -1294,7 +1279,6 @@ def test_ecw_33():
     tab1 = struct.unpack('B' * 3 * 50 * 50, multiband_data)
     tab2 = struct.unpack('B' * 3 * 50 * 50, data1_1 + data2_1 + data3_2)
     if tab1 != tab2:
-        gdaltest.post_reason('fail')
         return 'fail'
 
     ds = None
@@ -1331,13 +1315,10 @@ def test_ecw_33_bis():
     # SDK such as 5.0)
     for i in range(50 * 50):
         if data1[i * 4] != data_ref[i]:
-            gdaltest.post_reason('fail')
             return 'fail'
         if data2[i * 4] != data_ref[50 * 50 + i]:
-            gdaltest.post_reason('fail')
             return 'fail'
         if data3[i * 4] != data_ref[2 * 50 * 50 + i]:
-            gdaltest.post_reason('fail')
             return 'fail'
 
     ds = None
@@ -1591,7 +1572,6 @@ def test_ecw_40():
                 return 'skip'
             gdaltest.post_reason('explicit error message expected')
             return 'fail'
-        gdaltest.post_reason('fail')
         return 'fail'
 
     expected_md = [
@@ -1616,7 +1596,6 @@ def test_ecw_40():
     got_md = ds.GetMetadata()
     for (key, value) in expected_md:
         if key not in got_md or got_md[key] != value:
-            gdaltest.post_reason('fail')
             print(key)
             print(got_md[key])
             return 'fail'
@@ -1625,7 +1604,6 @@ def test_ecw_40():
     for i in range(4):
         got_cs = ds.GetRasterBand(i + 1).Checksum()
         if got_cs != expected_cs_list[i]:
-            gdaltest.post_reason('fail')
             print(expected_cs_list[i])
             print(got_cs)
             return 'fail'
@@ -1651,16 +1629,12 @@ def test_ecw_41():
 
     # Check that no statistics is already included in the file
     if ds.GetRasterBand(1).GetMinimum() is not None:
-        gdaltest.post_reason('fail')
         return 'fail'
     if ds.GetRasterBand(1).GetMaximum() is not None:
-        gdaltest.post_reason('fail')
         return 'fail'
     if ds.GetRasterBand(1).GetStatistics(1, 0) != [0.0, 0.0, 0.0, -1.0]:
-        gdaltest.post_reason('fail')
         return 'fail'
     if ds.GetRasterBand(1).GetDefaultHistogram(force=0) is not None:
-        gdaltest.post_reason('fail')
         return 'fail'
 
     # Now compute the stats
@@ -1668,7 +1642,6 @@ def test_ecw_41():
     expected_stats = [0.0, 255.0, 21.662427983539093, 51.789457392268119]
     for i in range(4):
         if abs(stats[i] - expected_stats[i]) > 1:
-            gdaltest.post_reason('fail')
             print(stats)
             print(expected_stats)
             return 'fail'
@@ -1678,25 +1651,21 @@ def test_ecw_41():
     # Check that there's no .aux.xml file
     try:
         os.stat('tmp/stefan_full_rgba_ecwv3_meta.ecw.aux.xml')
-        gdaltest.post_reason('fail')
         return 'fail'
     except OSError:
         pass
 
     ds = gdal.Open('tmp/stefan_full_rgba_ecwv3_meta.ecw')
     if ds.GetRasterBand(1).GetMinimum() != 0:
-        gdaltest.post_reason('fail')
         print(ds.GetRasterBand(1).GetMinimum())
         return 'fail'
     if ds.GetRasterBand(1).GetMaximum() != 255:
-        gdaltest.post_reason('fail')
         print(ds.GetRasterBand(1).GetMaximum())
         return 'fail'
     stats = ds.GetRasterBand(1).GetStatistics(0, 0)
     expected_stats = [0.0, 255.0, 21.662427983539093, 51.789457392268119]
     for i in range(4):
         if abs(stats[i] - expected_stats[i]) > 1:
-            gdaltest.post_reason('fail')
             print(stats[i])
             print(expected_stats[i])
             return 'fail'
@@ -1707,7 +1676,6 @@ def test_ecw_41():
     got_hist = ds.GetRasterBand(1).GetDefaultHistogram()
     expected_hist = (-0.5, 255.5, 256, [1006, 16106, 548, 99, 13, 24, 62, 118, 58, 125, 162, 180, 133, 146, 70, 81, 84, 97, 90, 60, 79, 70, 85, 77, 73, 63, 60, 64, 56, 69, 63, 73, 70, 72, 61, 66, 40, 52, 65, 44, 62, 54, 56, 55, 63, 51, 47, 39, 58, 44, 36, 43, 47, 45, 54, 28, 40, 41, 37, 36, 33, 31, 28, 34, 19, 32, 19, 23, 23, 33, 16, 34, 32, 54, 29, 33, 40, 37, 27, 34, 24, 29, 26, 21, 22, 24, 25, 19, 29, 22, 24, 14, 20, 20, 29, 28, 13, 19, 21, 19, 19, 21, 13, 19, 13, 14, 22, 15, 13, 26, 10, 13, 13, 14, 10, 17, 15, 19, 11, 18, 11, 14, 8, 12, 20, 12, 17, 10, 15, 15, 16, 14, 11, 7, 7, 10, 8, 12, 7, 8, 14, 7, 9, 12, 4, 6, 12, 5, 5, 4, 11, 8, 4, 8, 7, 10, 11, 6, 7, 5, 6, 8, 10, 10, 7, 5, 3, 5, 5, 6, 4, 10, 7, 6, 8, 4, 6, 6, 4, 6, 6, 7, 10, 4, 5, 2, 5, 6, 1, 1, 2, 6, 2, 1, 7, 4, 1, 3, 3, 2, 6, 2, 3, 3, 3, 3, 5, 5, 4, 2, 3, 2, 1, 3, 5, 5, 4, 1, 1, 2, 5, 10, 5, 9, 3, 5, 3, 5, 4, 5, 4, 4, 6, 7, 9, 17, 13, 15, 14, 13, 20, 18, 16, 27, 35, 53, 60, 51, 46, 40, 38, 50, 66, 36, 45, 13])
     if got_hist != expected_hist:
-        gdaltest.post_reason('fail')
         print(got_hist)
         print(expected_hist)
         return 'fail'
@@ -1721,16 +1689,13 @@ def test_ecw_41():
 
     ds = gdal.Open('tmp/stefan_full_rgba_ecwv3_meta.ecw')
     if ds.GetRasterBand(1).GetMinimum() != 0:
-        gdaltest.post_reason('fail')
         print(ds.GetRasterBand(1).GetMinimum())
         return 'fail'
     if ds.GetRasterBand(1).GetMaximum() != 255:
-        gdaltest.post_reason('fail')
         print(ds.GetRasterBand(1).GetMaximum())
         return 'fail'
     got_hist = ds.GetRasterBand(1).GetDefaultHistogram(force=0)
     if got_hist != expected_hist:
-        gdaltest.post_reason('fail')
         print(got_hist)
         print(expected_hist)
         return 'fail'
@@ -1739,7 +1704,6 @@ def test_ecw_41():
     # Check that there's no .aux.xml file
     try:
         os.stat('tmp/stefan_full_rgba_ecwv3_meta.ecw.aux.xml')
-        gdaltest.post_reason('fail')
         return 'fail'
     except OSError:
         pass
@@ -1779,7 +1743,6 @@ def test_ecw_42():
     # Check that there's no .aux.xml file
     try:
         os.stat('tmp/stefan_full_rgba_ecwv3_meta.ecw.aux.xml')
-        gdaltest.post_reason('fail')
         return 'fail'
     except OSError:
         pass
@@ -1789,7 +1752,6 @@ def test_ecw_42():
     got_md = ds.GetMetadata()
     for item in md:
         if got_md[item] != md[item]:
-            gdaltest.post_reason('fail')
             print(got_md[item])
             print(md[item])
             return 'fail'
@@ -1814,7 +1776,6 @@ def test_ecw_42():
     # Check that there's no .aux.xml file
     try:
         os.stat('tmp/stefan_full_rgba_ecwv3_meta.ecw.aux.xml')
-        gdaltest.post_reason('fail')
         return 'fail'
     except OSError:
         pass
@@ -1824,7 +1785,6 @@ def test_ecw_42():
     got_md = ds.GetMetadata()
     for item in md:
         if item in got_md and item != 'FILE_METADATA_ACQUISITION_DATE':
-            gdaltest.post_reason('fail')
             print(got_md[item])
             print(md[item])
             return 'fail'
@@ -1848,7 +1808,6 @@ def test_ecw_43():
         return 'fail'
     got_cs = fourth_band.Checksum()
     if got_cs != 8527:
-        gdaltest.post_reason('fail')
         print(got_cs)
         return 'fail'
     jp2_bands_data = ds.ReadRaster(0, 0, ds.RasterXSize, ds.RasterYSize)
@@ -1864,22 +1823,18 @@ def test_ecw_43():
     tmp_ds = None
     gdal.GetDriverByName('GTiff').Delete('/vsimem/ecw_43.tif')
     if got_cs != 8527:
-        gdaltest.post_reason('fail')
         print(got_cs)
         return 'fail'
 
     if jp2_bands_data != gtiff_bands_data:
-        gdaltest.post_reason('fail')
         return 'fail'
 
     if jp2_fourth_band_data != gtiff_fourth_band_data:
-        gdaltest.post_reason('fail')
         return 'fail'
 
     ds = gdal.OpenEx('data/stefan_full_rgba_alpha_1bit.jp2', open_options=['1BIT_ALPHA_PROMOTION=NO'])
     fourth_band = ds.GetRasterBand(4)
     if fourth_band.GetMetadataItem('NBITS', 'IMAGE_STRUCTURE') != '1':
-        gdaltest.post_reason('fail')
         return 'fail'
 
     return 'success'
@@ -1920,7 +1875,6 @@ def test_ecw_44():
     got_md = ds.GetMetadata('JPEG2000')
     for (key, value) in expected_md:
         if key not in got_md or got_md[key] != value:
-            gdaltest.post_reason('fail')
             print(key)
             print(got_md)
             return 'fail'
@@ -1950,12 +1904,10 @@ def test_ecw_45():
     out_ds = gdaltest.jp2ecw_drv.CreateCopy('/vsimem/ecw_45.jp2', src_ds, options=['WRITE_METADATA=YES'])
     del out_ds
     if gdal.VSIStatL('/vsimem/ecw_45.jp2.aux.xml') is not None:
-        gdaltest.post_reason('fail')
         return 'fail'
     ds = gdal.Open('/vsimem/ecw_45.jp2')
     md = RemoveDriverMetadata(ds.GetMetadata())
     if md != {}:
-        gdaltest.post_reason('fail')
         print(md)
         return 'fail'
     gdal.Unlink('/vsimem/ecw_45.jp2')
@@ -1967,12 +1919,10 @@ def test_ecw_45():
         out_ds = gdaltest.jp2ecw_drv.CreateCopy('/vsimem/ecw_45.jp2', src_ds, options=options)
         del out_ds
         if gdal.VSIStatL('/vsimem/ecw_45.jp2.aux.xml') is not None:
-            gdaltest.post_reason('fail')
             return 'fail'
         ds = gdal.Open('/vsimem/ecw_45.jp2')
         md = RemoveDriverMetadata(ds.GetMetadata())
         if md != {'FOO': 'BAR'}:
-            gdaltest.post_reason('fail')
             print(md)
             return 'fail'
         gdal.Unlink('/vsimem/ecw_45.jp2')
@@ -1983,12 +1933,10 @@ def test_ecw_45():
     out_ds = gdaltest.jp2ecw_drv.CreateCopy('/vsimem/ecw_45.jp2', src_ds, options=['WRITE_METADATA=YES'])
     del out_ds
     if gdal.VSIStatL('/vsimem/ecw_45.jp2.aux.xml') is not None:
-        gdaltest.post_reason('fail')
         return 'fail'
     ds = gdal.Open('/vsimem/ecw_45.jp2')
     md = RemoveDriverMetadata(ds.GetMetadata('SOME_DOMAIN'))
     if md != {'FOO': 'BAR'}:
-        gdaltest.post_reason('fail')
         print(md)
         return 'fail'
     gdal.Unlink('/vsimem/ecw_45.jp2')
@@ -1999,11 +1947,9 @@ def test_ecw_45():
     out_ds = gdaltest.jp2ecw_drv.CreateCopy('/vsimem/ecw_45.jp2', src_ds, options=['WRITE_METADATA=YES'])
     del out_ds
     if gdal.VSIStatL('/vsimem/ecw_45.jp2.aux.xml') is not None:
-        gdaltest.post_reason('fail')
         return 'fail'
     ds = gdal.Open('/vsimem/ecw_45.jp2')
     if ds.GetMetadata('xml:SOME_DOMAIN')[0] != '<some_arbitrary_xml_box />\n':
-        gdaltest.post_reason('fail')
         return 'fail'
     gdal.Unlink('/vsimem/ecw_45.jp2')
 
@@ -2014,11 +1960,9 @@ def test_ecw_45():
         out_ds = gdaltest.jp2ecw_drv.CreateCopy('/vsimem/ecw_45.jp2', src_ds, options=options)
         del out_ds
         if gdal.VSIStatL('/vsimem/ecw_45.jp2.aux.xml') is not None:
-            gdaltest.post_reason('fail')
             return 'fail'
         ds = gdal.Open('/vsimem/ecw_45.jp2')
         if ds.GetMetadata('xml:BOX_0')[0] != '<some_arbitrary_xml_box/>':
-            gdaltest.post_reason('fail')
             return 'fail'
         gdal.Unlink('/vsimem/ecw_45.jp2')
 
@@ -2029,11 +1973,9 @@ def test_ecw_45():
         out_ds = gdaltest.jp2ecw_drv.CreateCopy('/vsimem/ecw_45.jp2', src_ds, options=options)
         del out_ds
         if gdal.VSIStatL('/vsimem/ecw_45.jp2.aux.xml') is not None:
-            gdaltest.post_reason('fail')
             return 'fail'
         ds = gdal.Open('/vsimem/ecw_45.jp2')
         if ds.GetMetadata('xml:XMP')[0] != '<fake_xmp_box/>':
-            gdaltest.post_reason('fail')
             return 'fail'
         gdal.Unlink('/vsimem/ecw_45.jp2')
 
@@ -2066,7 +2008,6 @@ def test_ecw_46():
     mem_ds.GetRasterBand(1).WriteRaster(0, 0, 40, 40, upsampled_data)
     cs = mem_ds.GetRasterBand(1).Checksum()
     if cs != ref_cs:
-        gdaltest.post_reason('fail')
         print(cs)
         print(ref_cs)
         return 'fail'
@@ -2090,7 +2031,6 @@ def test_ecw_47():
 
     ds = gdal.Open('/vsimem/ecw_47.ecw')
     if ds is None:
-        gdaltest.post_reason('fail')
         return 'fail'
 
     mean_tolerance = 0.5
diff --git a/autotest/gdrivers/eedai.py b/autotest/gdrivers/eedai.py
index d6fcf036cc96..9115326d92cb 100644
--- a/autotest/gdrivers/eedai.py
+++ b/autotest/gdrivers/eedai.py
@@ -285,7 +285,6 @@ def test_eedai_2():
     info = gdal.Info(ds, format='json')
     for key in expected_info:
         if not (key in info and info[key] == expected_info[key]):
-            gdaltest.post_reason('fail')
             print('Got difference for key %s' % key)
             if key in info:
                 print('Got: ' + str(info[key]))
@@ -297,16 +296,13 @@ def test_eedai_2():
             return 'fail'
 
     if ds.GetProjectionRef().find('32610') < 0:
-        gdaltest.post_reason('fail')
         print(ds.GetProjectionRef())
         return 'fail'
 
     if ds.GetRasterBand(1).GetOverview(-1) is not None:
-        gdaltest.post_reason('fail')
         return 'fail'
 
     if ds.GetRasterBand(1).GetOverview(3) is not None:
-        gdaltest.post_reason('fail')
         return 'fail'
 
     npy_serialized = struct.pack(
@@ -323,13 +319,11 @@ def test_eedai_2():
     got_data = ds.GetRasterBand(1).ReadRaster(1800, 1810, 1, 1)
     got_data = struct.unpack('h', got_data)[0]
     if got_data != 12345:
-        gdaltest.post_reason('fail')
         print(got_data)
         return 'fail'
     got_data = ds.GetRasterBand(2).ReadRaster(1800, 1810, 1, 1)
     got_data = struct.unpack('h', got_data)[0]
     if got_data != 23456:
-        gdaltest.post_reason('fail')
         print(got_data)
         return 'fail'
 
@@ -339,7 +333,6 @@ def test_eedai_2():
     sub_ds = gdal.Open('EEDAI:image:B1,B9')
     gdal.SetConfigOption('EEDA_URL', None)
     if sub_ds.RasterCount != 2:
-        gdaltest.post_reason('fail')
         print(sub_ds.RasterCount)
         return 'fail'
 
@@ -347,14 +340,12 @@ def test_eedai_2():
     sub_ds = gdal.Open('EEDAI:image:B2')
     gdal.SetConfigOption('EEDA_URL', None)
     if sub_ds.RasterCount != 1:
-        gdaltest.post_reason('fail')
         print(sub_ds.RasterCount)
         return 'fail'
 
     got_md = sub_ds.GetRasterBand(1).GetMetadata()
     expected_md = {'prop': 'the_prop_B2'}
     if got_md != expected_md:
-        gdaltest.post_reason('fail')
         print(got_md)
         return 'fail'
 
@@ -644,7 +635,6 @@ def test_eedai_4():
     got_data = ds.GetRasterBand(1).ReadRaster(0, 0, 1, 1)
     got_data = struct.unpack('B', got_data)[0]
     if got_data != 127:
-        gdaltest.post_reason('fail')
         print(got_data)
         return 'fail'
 
@@ -652,7 +642,6 @@ def test_eedai_4():
     got_data = ds.ReadRaster(0, 0, 1, 1)
     got_data = struct.unpack('B' * 3, got_data)
     if got_data != (127, 128, 129):
-        gdaltest.post_reason('fail')
         print(got_data)
         return 'fail'
 
@@ -661,7 +650,6 @@ def test_eedai_4():
     got_data = ds.ReadRaster(0, 0, 1, 1)
     got_data = struct.unpack('B' * 3, got_data)
     if got_data != (127, 128, 129):
-        gdaltest.post_reason('fail')
         print(got_data)
         return 'fail'
 
@@ -672,7 +660,6 @@ def test_eedai_4():
         0, 0, 2, 2, buf_xsize=1, buf_ysize=1)
     got_data = struct.unpack('B', got_data)[0]
     if got_data != 127:
-        gdaltest.post_reason('fail')
         print(got_data)
         return 'fail'
 
@@ -681,7 +668,6 @@ def test_eedai_4():
     got_data = ds.ReadRaster(0, 0, 2, 2, buf_xsize=1, buf_ysize=1)
     got_data = struct.unpack('B' * 3, got_data)
     if got_data != (127, 128, 129):
-        gdaltest.post_reason('fail')
         print(got_data)
         return 'fail'
 
@@ -747,7 +733,6 @@ def test_eedai_geotiff():
     got_data = ds.GetRasterBand(1).ReadRaster(0, 0, 1, 1)
     got_data = struct.unpack('H', got_data)[0]
     if got_data != 12345:
-        gdaltest.post_reason('fail')
         print(got_data)
         return 'fail'
 
@@ -778,30 +763,24 @@ def test_eedai_real_service():
 
     ds = gdal.Open('EEDAI:USDA/NAIP/DOQQ/n_4010064_se_14_2_20070725')
     if ds is None:
-        gdaltest.post_reason('fail')
         return 'fail'
     res = gdal.Info(ds, format='json')
     expected = {'files': [], 'cornerCoordinates': {'upperRight': [415016.0, 4435536.0], 'lowerLeft': [408970.0, 4427936.0], 'lowerRight': [415016.0, 4427936.0], 'upperLeft': [408970.0, 4435536.0], 'center': [411993.0, 4431736.0]}, 'wgs84Extent': {'type': 'Polygon', 'coordinates': [[]]}, 'description': 'EEDAI:USDA/NAIP/DOQQ/n_4010064_se_14_2_20070725', 'driverShortName': 'EEDAI', 'driverLongName': 'Earth Engine Data API Image', 'bands': [{'description': 'R', 'band': 1, 'colorInterpretation': 'Red', 'overviews': [{'size': [1511, 1900]}, {'size': [755, 950]}, {'size': [377, 475]}, {'size': [188, 237]}], 'type': 'Byte', 'block': [256, 256], 'metadata': {}}, {'description': 'G', 'band': 2, 'colorInterpretation': 'Green', 'overviews': [{'size': [1511, 1900]}, {'size': [755, 950]}, {'size': [377, 475]}, {'size': [188, 237]}], 'type': 'Byte', 'block': [256, 256], 'metadata': {}}, {'description': 'B', 'band': 3, 'colorInterpretation': 'Blue', 'overviews': [{'size': [1511, 1900]}, {'size': [755, 950]}, {'size': [377, 475]}, {'size': [188, 237]}], 'type': 'Byte', 'block': [256, 256], 'metadata': {}}], 'coordinateSystem': {'wkt': 'PROJCS["NAD83 / UTM zone 14N",\n    GEOGCS["NAD83",\n        DATUM["North_American_Datum_1983",\n            SPHEROID["GRS 1980",6378137,298.257222101,\n                AUTHORITY["EPSG","7019"]],\n            TOWGS84[0,0,0,0,0,0,0],\n            AUTHORITY["EPSG","6269"]],\n        PRIMEM["Greenwich",0,\n            AUTHORITY["EPSG","8901"]],\n        UNIT["degree",0.0174532925199433,\n            AUTHORITY["EPSG","9122"]],\n        AUTHORITY["EPSG","4269"]],\n    PROJECTION["Transverse_Mercator"],\n    PARAMETER["latitude_of_origin",0],\n    PARAMETER["central_meridian",-99],\n    PARAMETER["scale_factor",0.9996],\n    PARAMETER["false_easting",500000],\n    PARAMETER["false_northing",0],\n    UNIT["metre",1,\n        AUTHORITY["EPSG","9001"]],\n    AXIS["Easting",EAST],\n    AXIS["Northing",NORTH],\n    AUTHORITY["EPSG","26914"]]'}, 'geoTransform': [408970.0, 2.0, 0.0, 4435536.0, 0.0, -2.0], 'metadata': {'IMAGE_STRUCTURE': {'INTERLEAVE': 'PIXEL'}}, 'size': [3023, 3800]}
     if expected != res:
-        gdaltest.post_reason('fail')
         print(res)
         return 'fail'
     if ds.ReadRaster(0, 0, 1, 1) is None:
-        gdaltest.post_reason('fail')
         return 'fail'
 
     ds = gdal.Open('EEDAI:MODIS/006/MYD09GA/2017_05_24')
     if ds is None:
-        gdaltest.post_reason('fail')
         return 'fail'
     res = gdal.Info(ds, format='json')
     expected = {'files': [], 'cornerCoordinates': {'upperRight': [20015109.354, 10007554.677], 'lowerLeft': [-20015109.354, -10007554.677], 'lowerRight': [20015109.354, -10007554.677], 'upperLeft': [-20015109.354, 10007554.677], 'center': [9.6e-06, 6e-06]}, 'wgs84Extent': {'type': 'Polygon', 'coordinates': [[]]}, 'description': 'EEDAI:MODIS/006/MYD09GA/2017_05_24', 'driverShortName': 'EEDAI', 'driverLongName': 'Earth Engine Data API Image', 'bands': [{'description': 'num_observations_1km', 'band': 1, 'colorInterpretation': 'Undefined', 'overviews': [{'size': [21600, 10800]}, {'size': [10800, 5400]}, {'size': [5400, 2700]}, {'size': [2700, 1350]}, {'size': [1350, 675]}, {'size': [675, 337]}, {'size': [337, 168]}, {'size': [168, 84]}], 'type': 'Byte', 'block': [256, 256], 'metadata': {'IMAGE_STRUCTURE': {'PIXELTYPE': 'SIGNEDBYTE'}}}, {'description': 'state_1km', 'band': 2, 'colorInterpretation': 'Undefined', 'overviews': [{'size': [21600, 10800]}, {'size': [10800, 5400]}, {'size': [5400, 2700]}, {'size': [2700, 1350]}, {'size': [1350, 675]}, {'size': [675, 337]}, {'size': [337, 168]}, {'size': [168, 84]}], 'type': 'UInt16', 'block': [256, 256], 'metadata': {}}, {'description': 'SensorZenith', 'band': 3, 'colorInterpretation': 'Undefined', 'overviews': [{'size': [21600, 10800]}, {'size': [10800, 5400]}, {'size': [5400, 2700]}, {'size': [2700, 1350]}, {'size': [1350, 675]}, {'size': [675, 337]}, {'size': [337, 168]}, {'size': [168, 84]}], 'type': 'Int16', 'block': [256, 256], 'metadata': {}}, {'description': 'SensorAzimuth', 'band': 4, 'colorInterpretation': 'Undefined', 'overviews': [{'size': [21600, 10800]}, {'size': [10800, 5400]}, {'size': [5400, 2700]}, {'size': [2700, 1350]}, {'size': [1350, 675]}, {'size': [675, 337]}, {'size': [337, 168]}, {'size': [168, 84]}], 'type': 'Int16', 'block': [256, 256], 'metadata': {}}, {'description': 'Range', 'band': 5, 'colorInterpretation': 'Undefined', 'overviews': [{'size': [21600, 10800]}, {'size': [10800, 5400]}, {'size': [5400, 2700]}, {'size': [2700, 1350]}, {'size': [1350, 675]}, {'size': [675, 337]}, {'size': [337, 168]}, {'size': [168, 84]}], 'type': 'UInt16', 'block': [256, 256], 'metadata': {}}, {'description': 'SolarZenith', 'band': 6, 'colorInterpretation': 'Undefined', 'overviews': [{'size': [21600, 10800]}, {'size': [10800, 5400]}, {'size': [5400, 2700]}, {'size': [2700, 1350]}, {'size': [1350, 675]}, {'size': [675, 337]}, {'size': [337, 168]}, {'size': [168, 84]}], 'type': 'Int16', 'block': [256, 256], 'metadata': {}}, {'description': 'SolarAzimuth', 'band': 7, 'colorInterpretation': 'Undefined', 'overviews': [{'size': [21600, 10800]}, {'size': [10800, 5400]}, {'size': [5400, 2700]}, {'size': [2700, 1350]}, {'size': [1350, 675]}, {'size': [675, 337]}, {'size': [337, 168]}, {'size': [168, 84]}], 'type': 'Int16', 'block': [256, 256], 'metadata': {}}, {'description': 'gflags', 'band': 8, 'colorInterpretation': 'Undefined', 'overviews': [{'size': [21600, 10800]}, {'size': [10800, 5400]}, {'size': [5400, 2700]}, {'size': [2700, 1350]}, {'size': [1350, 675]}, {'size': [675, 337]}, {'size': [337, 168]}, {'size': [168, 84]}], 'type': 'Byte', 'block': [256, 256], 'metadata': {}}, {'description': 'orbit_pnt', 'band': 9, 'colorInterpretation': 'Undefined', 'overviews': [{'size': [21600, 10800]}, {'size': [10800, 5400]}, {'size': [5400, 2700]}, {'size': [2700, 1350]}, {'size': [1350, 675]}, {'size': [675, 337]}, {'size': [337, 168]}, {'size': [168, 84]}], 'type': 'Byte', 'block': [256, 256], 'metadata': {'IMAGE_STRUCTURE': {'PIXELTYPE': 'SIGNEDBYTE'}}}, {'description': 'granule_pnt', 'band': 10, 'colorInterpretation': 'Undefined', 'overviews': [{'size': [21600, 10800]}, {'size': [10800, 5400]}, {'size': [5400, 2700]}, {'size': [2700, 1350]}, {'size': [1350, 675]}, {'size': [675, 337]}, {'size': [337, 168]}, {'size': [168, 84]}], 'type': 'Byte', 'block': [256, 256], 'metadata': {}}], 'coordinateSystem': {'wkt': 'PROJCS["MODIS Sinusoidal",\n    GEOGCS["WGS 84",\n        DATUM["WGS_1984",\n            SPHEROID["WGS 84",6378137,298.257223563,\n                AUTHORITY["EPSG","7030"]],\n            AUTHORITY["EPSG","6326"]],\n        PRIMEM["Greenwich",0,\n            AUTHORITY["EPSG","8901"]],\n        UNIT["degree",0.01745329251994328,\n            AUTHORITY["EPSG","9122"]],\n        AUTHORITY["EPSG","4326"]],\n    PROJECTION["Sinusoidal"],\n    PARAMETER["false_easting",0.0],\n    PARAMETER["false_northing",0.0],\n    PARAMETER["central_meridian",0.0],\n    PARAMETER["semi_major",6371007.181],\n    PARAMETER["semi_minor",6371007.181],\n    UNIT["m",1.0],\n    AUTHORITY["SR-ORG","6974"]]'}, 'geoTransform': [-20015109.354, 926.625433056, 0.0, 10007554.677, 0.0, -926.625433055], 'metadata': {'IMAGE_STRUCTURE': {'INTERLEAVE': 'PIXEL'}, 'SUBDATASETS': {'SUBDATASET_2_NAME': 'EEDAI:MODIS/006/MYD09GA/2017_05_24:num_observations_500m,sur_refl_b01,sur_refl_b02,sur_refl_b03,sur_refl_b04,sur_refl_b05,sur_refl_b06,sur_refl_b07,QC_500m,obscov_500m,iobs_res,q_scan', 'SUBDATASET_2_DESC': 'Bands num_observations_500m,sur_refl_b01,sur_refl_b02,sur_refl_b03,sur_refl_b04,sur_refl_b05,sur_refl_b06,sur_refl_b07,QC_500m,obscov_500m,iobs_res,q_scan of MODIS/006/MYD09GA/2017_05_24', 'SUBDATASET_1_NAME': 'EEDAI:MODIS/006/MYD09GA/2017_05_24:num_observations_1km,state_1km,SensorZenith,SensorAzimuth,Range,SolarZenith,SolarAzimuth,gflags,orbit_pnt,granule_pnt', 'SUBDATASET_1_DESC': 'Bands num_observations_1km,state_1km,SensorZenith,SensorAzimuth,Range,SolarZenith,SolarAzimuth,gflags,orbit_pnt,granule_pnt of MODIS/006/MYD09GA/2017_05_24'}}, 'size': [43200, 21600]}
     if expected != res:
-        gdaltest.post_reason('fail')
         print(res)
         return 'fail'
     if ds.ReadRaster(0, 0, 1, 1) is None:
-        gdaltest.post_reason('fail')
         return 'fail'
 
     return 'success'
diff --git a/autotest/gdrivers/ehdr.py b/autotest/gdrivers/ehdr.py
index 1b797eb3fc10..340ed312feab 100755
--- a/autotest/gdrivers/ehdr.py
+++ b/autotest/gdrivers/ehdr.py
@@ -331,12 +331,10 @@ def test_ehdr_14():
         cs2 = out_ds.GetRasterBand(1).Checksum()
 
         if space == 1 and data != data2:
-            gdaltest.post_reason('fail')
             print(space)
             return 'fail'
 
         if (cs1 != 1087 and cs1 != 1192) or (cs2 != 1087 and cs2 != 1192):
-            gdaltest.post_reason('fail')
             print(space)
             print(cs1)
             print(cs2)
@@ -350,7 +348,6 @@ def test_ehdr_14():
         cs3 = out_ds.GetRasterBand(1).Checksum()
 
         if cs3 != 1087 and cs3 != 1192:
-            gdaltest.post_reason('fail')
             print(space)
             print(cs3)
             return 'fail'
@@ -373,28 +370,22 @@ def test_ehdr_rat():
     ds = gdal.Open(tmpfile)
     rat = ds.GetRasterBand(1).GetDefaultRAT()
     if rat is None:
-        gdaltest.post_reason('fail')
         return 'fail'
     if rat.GetColumnCount() != 4:
-        gdaltest.post_reason('fail')
         print(rat.GetColumnCount())
         return 'fail'
     if rat.GetRowCount() != 25:
-        gdaltest.post_reason('fail')
         print(rat.GetRowCount())
         return 'fail'
     for (idx, val) in [(0, -500), (1, 127), (2, 40), (3, 65)]:
         if rat.GetValueAsInt(0, idx) != val:
-            gdaltest.post_reason('fail')
             print(idx, rat.GetValueAsInt(0, idx))
             return 'fail'
     for (idx, val) in [(0, 2000), (1, 145), (2, 97), (3, 47)]:
         if rat.GetValueAsInt(24, idx) != val:
-            gdaltest.post_reason('fail')
             print(idx, rat.GetValueAsInt(24, idx))
             return 'fail'
     if ds.GetRasterBand(1).GetColorTable() is None:
-        gdaltest.post_reason('fail')
         return 'fail'
     ds = None
 
@@ -405,12 +396,10 @@ def test_ehdr_rat():
 
     ds = gdal.Open(tmpfile, gdal.GA_Update)
     if ds.GetRasterBand(1).GetDefaultRAT() or ds.GetRasterBand(1).GetColorTable():
-        gdaltest.post_reason('fail')
         return 'fail'
     with gdaltest.error_handler():
         ret = ds.GetRasterBand(1).SetDefaultRAT(gdal.RasterAttributeTable())
     if ret == 0:
-        gdaltest.post_reason('fail')
         return 'fail'
     ds = None
 
diff --git a/autotest/gdrivers/ers.py b/autotest/gdrivers/ers.py
index 1b699b344be2..20cef315f188 100755
--- a/autotest/gdrivers/ers.py
+++ b/autotest/gdrivers/ers.py
@@ -49,7 +49,6 @@ def test_ers_1():
     md = ds.GetRasterBand(1).GetMetadata()
     expected_md = {'STATISTICS_MEAN': '-4020.25', 'STATISTICS_MINIMUM': '-4315', 'STATISTICS_MAXIMUM': '-3744', 'STATISTICS_MEDIAN': '-4000'}
     if md != expected_md:
-        gdaltest.post_reason('fail')
         print(md)
         return 'fail'
     return 'success'
diff --git a/autotest/gdrivers/gdalhttp.py b/autotest/gdrivers/gdalhttp.py
index ec1d5b216c7a..c92e65fa89c5 100755
--- a/autotest/gdrivers/gdalhttp.py
+++ b/autotest/gdrivers/gdalhttp.py
@@ -173,13 +173,11 @@ def test_http_4():
         if sys.platform == 'darwin' and gdal.GetConfigOption('TRAVIS', None) is not None:
             print("Fails on MacOSX Travis sometimes. Not sure why.")
             return 'skip'
-        gdaltest.post_reason('fail')
         return 'fail'
 
     filelist = ds.GetFileList()
     if '/vsicurl/ftp://download.osgeo.org/gdal/data/gtiff/utm.tif' not in filelist:
         print(filelist)
-        gdaltest.post_reason('fail')
         return 'fail'
 
     return 'success'
@@ -206,7 +204,6 @@ def test_http_5():
             print('cannot read')
             return 'skip'
         conn.close()
-        gdaltest.post_reason('fail')
         return 'fail'
     filename = ds.GetDescription()
     ds = None
@@ -242,7 +239,6 @@ def test_http_6():
             print('cannot read')
             return 'skip'
         conn.close()
-        gdaltest.post_reason('fail')
         return 'fail'
     ds = None
 
diff --git a/autotest/gdrivers/gpkg.py b/autotest/gdrivers/gpkg.py
index c823855a5572..f708e1f1e97b 100755
--- a/autotest/gdrivers/gpkg.py
+++ b/autotest/gdrivers/gpkg.py
@@ -184,15 +184,12 @@ def check_tile_format(out_ds, expected_format, expected_band_count, expected_ct,
         expected_mime_type = 'image/x-webp'
 
     if mime_type != expected_mime_type:
-        gdaltest.post_reason('fail')
         print(mime_type)
         return 'fail'
     if band_count != expected_band_count:
-        gdaltest.post_reason('fail')
         print(band_count)
         return 'fail'
     if expected_ct != has_ct:
-        gdaltest.post_reason('fail')
         print(has_ct)
         return 'fail'
     return 'success'
@@ -230,23 +227,19 @@ def test_gpkg_1():
     sql_lyr = out_ds.ExecuteSQL("SELECT COUNT(*) FROM sqlite_master WHERE name = 'ogr_empty_table'")
     f = sql_lyr.GetNextFeature()
     if f.GetField(0) != 0:
-        gdaltest.post_reason('fail')
         return 'fail'
     out_ds.ReleaseResultSet(sql_lyr)
 
     got_gt = out_ds.GetGeoTransform()
     for i in range(6):
         if abs(expected_gt[i] - got_gt[i]) > 1e-8:
-            gdaltest.post_reason('fail')
             return 'fail'
     got_wkt = out_ds.GetProjectionRef()
     if expected_wkt != got_wkt:
-        gdaltest.post_reason('fail')
         return 'fail'
     expected_cs = [expected_cs, expected_cs, expected_cs, 4873]
     got_cs = [out_ds.GetRasterBand(i + 1).Checksum() for i in range(4)]
     if got_cs != expected_cs:
-        gdaltest.post_reason('fail')
         print('Got %s, expected %s' % (str(got_cs), str(expected_cs)))
         return 'fail'
     check_tile_format(out_ds, 'PNG', 2, False)
@@ -255,7 +248,6 @@ def test_gpkg_1():
     out_ds = gdal.Open('/vsimem/tmp.gpkg')
     sql_lyr = out_ds.ExecuteSQL("SELECT * FROM sqlite_master WHERE type = 'table' AND name = 'gpkg_extensions'")
     if sql_lyr.GetFeatureCount() != 0:
-        gdaltest.post_reason('fail')
         return 'fail'
     out_ds.ReleaseResultSet(sql_lyr)
 
@@ -265,19 +257,16 @@ def test_gpkg_1():
     expected_cs = expected_cs[0:3]
     got_cs = [out_ds.GetRasterBand(i + 1).Checksum() for i in range(out_ds.RasterCount)]
     if got_cs != expected_cs:
-        gdaltest.post_reason('fail')
         print('Got %s, expected %s' % (str(got_cs), str(expected_cs)))
         return 'fail'
     out_ds = None
 
     ds = gdal.OpenEx('/vsimem/tmp.gpkg', open_options=['USE_TILE_EXTENT=YES'])
     if ds.RasterXSize != 256 or ds.RasterYSize != 256:
-        gdaltest.post_reason('fail')
         return 'fail'
     expected_cs = [clamped_expected_cs, clamped_expected_cs, clamped_expected_cs, 4898]
     got_cs = [ds.GetRasterBand(i + 1).Checksum() for i in range(4)]
     if got_cs != expected_cs:
-        gdaltest.post_reason('fail')
         print('Got %s, expected %s' % (str(got_cs), str(expected_cs)))
         return 'fail'
     ds = None
@@ -288,7 +277,6 @@ def test_gpkg_1():
     ds = None
     ds = gdal.OpenEx('/vsimem/tmp.gpkg', gdal.OF_RASTER, open_options=['USE_TILE_EXTENT=YES'])
     if ds is not None:
-        gdaltest.post_reason('fail')
         return 'fail'
 
     gdal.Unlink('/vsimem/tmp.gpkg')
@@ -303,7 +291,6 @@ def test_gpkg_1():
     expected_cs = [expected_cs, expected_cs, expected_cs, 4873]
     got_cs = [out_ds.GetRasterBand(i + 1).Checksum() for i in range(4)]
     if got_cs != expected_cs:
-        gdaltest.post_reason('fail')
         print('Got %s, expected %s' % (str(got_cs), str(expected_cs)))
         return 'fail'
     check_tile_format(out_ds, 'PNG', 1, False)
@@ -339,7 +326,6 @@ def test_gpkg_2():
     expected_cs = [expected_cs, expected_cs, expected_cs, 4873]
     got_cs = [out_ds.GetRasterBand(i + 1).Checksum() for i in range(4)]
     if got_cs != expected_cs:
-        gdaltest.post_reason('fail')
         print('Got %s, expected %s' % (str(got_cs), str(expected_cs)))
         return 'fail'
     check_tile_format(out_ds, 'JPEG', 1, False)
@@ -348,7 +334,6 @@ def test_gpkg_2():
     out_ds = gdal.Open('/vsimem/tmp.gpkg')
     sql_lyr = out_ds.ExecuteSQL("SELECT * FROM sqlite_master WHERE type = 'table' AND name = 'gpkg_extensions'")
     if sql_lyr.GetFeatureCount() != 0:
-        gdaltest.post_reason('fail')
         return 'fail'
     out_ds.ReleaseResultSet(sql_lyr)
 
@@ -357,7 +342,6 @@ def test_gpkg_2():
     ds = gdal.OpenEx('/vsimem/tmp.gpkg', open_options=['USE_TILE_EXTENT=YES'])
     got_cs = [ds.GetRasterBand(i + 1).Checksum() for i in range(4)]
     if got_cs != clamped_expected_cs:
-        gdaltest.post_reason('fail')
         print('Got %s, expected %s' % (str(got_cs), str(clamped_expected_cs)))
         return 'fail'
     ds = None
@@ -374,7 +358,6 @@ def test_gpkg_2():
     expected_cs = [expected_cs, expected_cs, expected_cs, 4873]
     got_cs = [out_ds.GetRasterBand(i + 1).Checksum() for i in range(4)]
     if got_cs != expected_cs:
-        gdaltest.post_reason('fail')
         print('Got %s, expected %s' % (str(got_cs), str(expected_cs)))
         return 'fail'
     check_tile_format(out_ds, 'JPEG', 1, False)
@@ -389,7 +372,6 @@ def test_gpkg_2():
     out_ds.GetRasterBand(1).Checksum()
     gdal.PopErrorHandler()
     if gdal.GetLastErrorMsg() == '':
-        gdaltest.post_reason('fail')
         return 'fail'
     out_ds = None
 
@@ -402,7 +384,6 @@ def test_gpkg_2():
     out_ds.FlushCache()
     gdal.PopErrorHandler()
     if gdal.GetLastErrorMsg() == '':
-        gdaltest.post_reason('fail')
         return 'fail'
     out_ds = None
 
@@ -444,14 +425,12 @@ def test_gpkg_3():
     out_ds = gdal.OpenEx('/vsimem/tmp.gpkg')
     got_cs = [out_ds.GetRasterBand(i + 1).Checksum() for i in range(3)]
     if got_cs not in (expected_cs, [4736, 4734, 4736]):
-        gdaltest.post_reason('fail')
         print('Got %s, expected %s' % (str(got_cs), str(expected_cs)))
         return 'fail'
 
     # Check that extension is declared
     sql_lyr = out_ds.ExecuteSQL("SELECT * FROM gpkg_extensions WHERE table_name = 'tmp' AND column_name = 'tile_data' AND extension_name = 'gpkg_webp'")
     if sql_lyr.GetFeatureCount() != 1:
-        gdaltest.post_reason('fail')
         return 'fail'
     out_ds.ReleaseResultSet(sql_lyr)
 
@@ -466,7 +445,6 @@ def test_gpkg_3():
     ds = gdal.OpenEx('/vsimem/tmp.gpkg', open_options=['USE_TILE_EXTENT=YES'])
     got_cs = [ds.GetRasterBand(i + 1).Checksum() for i in range(4)]
     if got_cs not in (clamped_expected_cs, [6850, 6848, 6850, 4898]):
-        gdaltest.post_reason('fail')
         print('Got %s, expected %s' % (str(got_cs), str(clamped_expected_cs)))
         return 'fail'
     ds = None
@@ -483,7 +461,6 @@ def test_gpkg_3():
     expected_cs.append(4873)
     got_cs = [out_ds.GetRasterBand(i + 1).Checksum() for i in range(4)]
     if got_cs != expected_cs:
-        gdaltest.post_reason('fail')
         print('Got %s, expected %s' % (str(got_cs), str(expected_cs)))
         return 'fail'
     check_tile_format(out_ds, 'WEBP', 3, False)
@@ -498,7 +475,6 @@ def test_gpkg_3():
     gdal.PopErrorHandler()
     if gdal.GetLastErrorMsg() == '':
         gdaltest.webp_dr.Register()
-        gdaltest.post_reason('fail')
         return 'fail'
 
     # And at pixel reading time as well
@@ -508,7 +484,6 @@ def test_gpkg_3():
     gdal.PopErrorHandler()
     if gdal.GetLastErrorMsg() == '':
         gdaltest.webp_dr.Register()
-        gdaltest.post_reason('fail')
         return 'fail'
     out_ds = None
 
@@ -525,7 +500,6 @@ def test_gpkg_3():
     out_ds = gdal.OpenEx('/vsimem/tmp.gpkg', gdal.OF_RASTER | gdal.OF_UPDATE, open_options=['TILE_FORMAT=WEBP'])
     sql_lyr = out_ds.ExecuteSQL("SELECT * FROM gpkg_extensions WHERE table_name = 'tmp' AND column_name = 'tile_data' AND extension_name = 'gpkg_webp'")
     if sql_lyr.GetFeatureCount() != 1:
-        gdaltest.post_reason('fail')
         return 'fail'
     out_ds.ReleaseResultSet(sql_lyr)
     out_ds = None
@@ -575,7 +549,6 @@ def test_gpkg_4(tile_drv_name='PNG'):
     expected_cs.append(30658)
     got_cs = [out_ds.GetRasterBand(i + 1).Checksum() for i in range(4)]
     if got_cs not in (expected_cs, [22290, 21651, 21551, 30658]):
-        gdaltest.post_reason('fail')
         print('Got %s, expected %s' % (str(got_cs), str(expected_cs)))
         return 'fail'
     check_tile_format(out_ds, tile_drv_name, working_bands, False)
@@ -584,7 +557,6 @@ def test_gpkg_4(tile_drv_name='PNG'):
     ds = gdal.OpenEx('/vsimem/tmp.gpkg', open_options=['USE_TILE_EXTENT=YES'])
     got_cs = [ds.GetRasterBand(i + 1).Checksum() for i in range(4)]
     if got_cs not in (clamped_expected_cs, [56886, 43228, 56508, 30638]):
-        gdaltest.post_reason('fail')
         print('Got %s, expected %s' % (str(got_cs), str(clamped_expected_cs)))
         return 'fail'
     ds = None
@@ -601,7 +573,6 @@ def test_gpkg_4(tile_drv_name='PNG'):
     out_ds = gdal.Open('/vsimem/tmp.gpkg')
     got_cs = [out_ds.GetRasterBand(i + 1).Checksum() for i in range(4)]
     if got_cs != expected_cs:
-        gdaltest.post_reason('fail')
         print('Got %s, expected %s' % (str(got_cs), str(expected_cs)))
         return 'fail'
     check_tile_format(out_ds, tile_drv_name, 3, False)
@@ -678,7 +649,6 @@ def test_gpkg_7(tile_drv_name='PNG'):
     out_ds = gdal.Open('/vsimem/tmp.gpkg')
     got_cs = [out_ds.GetRasterBand(i + 1).Checksum() for i in range(working_bands)]
     if got_cs != expected_cs:
-        gdaltest.post_reason('fail')
         print('Got %s, expected %s' % (str(got_cs), str(expected_cs)))
         return 'fail'
     check_tile_format(out_ds, tile_drv_name, working_bands, False)
@@ -698,7 +668,6 @@ def test_gpkg_7(tile_drv_name='PNG'):
     out_ds = gdal.Open('/vsimem/tmp.gpkg')
     got_cs = [out_ds.GetRasterBand(i + 1).Checksum() for i in range(3)]
     if got_cs != expected_cs:
-        gdaltest.post_reason('fail')
         print('Got %s, expected %s' % (str(got_cs), str(expected_cs)))
         return 'fail'
     check_tile_format(out_ds, tile_drv_name, 3, False)
@@ -718,7 +687,6 @@ def test_gpkg_7(tile_drv_name='PNG'):
     expected_cs = [0, 0, 0, 0]
     got_cs = [out_ds.GetRasterBand(i + 1).Checksum() for i in range(4)]
     if got_cs != expected_cs:
-        gdaltest.post_reason('fail')
         print('Got %s, expected %s' % (str(got_cs), str(expected_cs)))
         return 'fail'
     check_tile_format(out_ds, None, None, None)
@@ -782,18 +750,15 @@ def test_gpkg_10():
     out_ds = gdal.Open('/vsimem/tmp.gpkg')
     block_size = out_ds.GetRasterBand(1).GetBlockSize()
     if block_size != [out_ds.RasterXSize, out_ds.RasterYSize]:
-        gdaltest.post_reason('fail')
         print(block_size)
         return 'fail'
     got_cs = [out_ds.GetRasterBand(i + 1).Checksum() for i in range(4)]
     if got_cs != expected_cs:
-        gdaltest.post_reason('fail')
         print('Got %s, expected %s' % (str(got_cs), str(expected_cs)))
         return 'fail'
     check_tile_format(out_ds, 'PNG', 1, True)
     got_ct = out_ds.GetRasterBand(1).GetColorTable()
     if got_ct is not None:
-        gdaltest.post_reason('fail')
         return 'fail'
 
     # SetColorTable() on a non single-band dataset
@@ -802,7 +767,6 @@ def test_gpkg_10():
     out_ds.GetRasterBand(1).SetColorTable(None)
     gdal.PopErrorHandler()
     if gdal.GetLastErrorMsg() == '':
-        gdaltest.post_reason('fail')
         return 'fail'
 
     out_ds = None
@@ -811,12 +775,10 @@ def test_gpkg_10():
     out_ds = gdal.OpenEx('/vsimem/tmp.gpkg', open_options=['BAND_COUNT=1'])
     got_cs = [out_ds.GetRasterBand(i + 1).Checksum() for i in range(out_ds.RasterCount)]
     if got_cs != expected_cs:
-        gdaltest.post_reason('fail')
         print('Got %s, expected %s' % (str(got_cs), str(expected_cs)))
         return 'fail'
     got_ct = out_ds.GetRasterBand(1).GetColorTable()
     if expected_ct.GetCount() != got_ct.GetCount():
-        gdaltest.post_reason('fail')
         return 'fail'
 
     # SetColorTable() on a re-opened dataset
@@ -825,7 +787,6 @@ def test_gpkg_10():
     out_ds.GetRasterBand(1).SetColorTable(None)
     gdal.PopErrorHandler()
     if gdal.GetLastErrorMsg() == '':
-        gdaltest.post_reason('fail')
         return 'fail'
 
     out_ds = None
@@ -841,7 +802,6 @@ def test_gpkg_10():
     out_ds.GetRasterBand(1).SetColorTable(None)
     gdal.PopErrorHandler()
     if gdal.GetLastErrorMsg() == '':
-        gdaltest.post_reason('fail')
         return 'fail'
 
     gdal.PushErrorHandler()
@@ -864,13 +824,11 @@ def test_gpkg_10():
     out_ds = gdal.Open('/vsimem/tmp.gpkg')
     got_cs = [out_ds.GetRasterBand(i + 1).Checksum() for i in range(4)]
     if got_cs != expected_cs:
-        gdaltest.post_reason('fail')
         print('Got %s, expected %s' % (str(got_cs), str(expected_cs)))
         return 'fail'
     check_tile_format(out_ds, 'PNG', 4, False)
     got_ct = out_ds.GetRasterBand(1).GetColorTable()
     if got_ct is not None:
-        gdaltest.post_reason('fail')
         return 'fail'
 
     return 'success'
@@ -922,7 +880,6 @@ def test_gpkg_11(tile_drv_name='JPEG'):
     out_ds = gdal.Open('/vsimem/tmp.gpkg')
     got_cs = [out_ds.GetRasterBand(i + 1).Checksum() for i in range(working_bands)]
     if got_cs != expected_cs:
-        gdaltest.post_reason('fail')
         print('Got %s, expected %s' % (str(got_cs), str(expected_cs)))
         return 'fail'
     out_ds = None
@@ -962,12 +919,10 @@ def test_gpkg_13():
     out_ds = gdal.Open('/vsimem/tmp.gpkg')
     got_cs = [out_ds.GetRasterBand(i + 1).Checksum() for i in range(3)]
     if got_cs != expected_cs:
-        gdaltest.post_reason('fail')
         print('Got %s, expected %s' % (str(got_cs), str(expected_cs)))
         return 'fail'
     got_ct = out_ds.GetRasterBand(1).GetColorTable()
     if got_ct is not None:
-        gdaltest.post_reason('fail')
         return 'fail'
     out_ds = None
 
@@ -975,12 +930,10 @@ def test_gpkg_13():
     out_ds = gdal.OpenEx('/vsimem/tmp.gpkg', open_options=['BAND_COUNT=1'])
     got_cs = [out_ds.GetRasterBand(i + 1).Checksum() for i in range(out_ds.RasterCount)]
     if got_cs != expected_cs:
-        gdaltest.post_reason('fail')
         print('Got %s, expected %s' % (str(got_cs), str(expected_cs)))
         return 'fail'
     got_ct = out_ds.GetRasterBand(1).GetColorTable()
     if expected_ct.GetCount() != got_ct.GetCount():
-        gdaltest.post_reason('fail')
         return 'fail'
     out_ds = None
 
@@ -996,12 +949,10 @@ def test_gpkg_13():
 
     ds = gdal.OpenEx('/vsimem/tmp.gpkg', open_options=['USE_TILE_EXTENT=YES'])
     if ds.RasterXSize != 512 or ds.RasterYSize != 256:
-        gdaltest.post_reason('fail')
         return 'fail'
     expected_cs = [62358, 45823, 12238, 64301]
     got_cs = [ds.GetRasterBand(i + 1).Checksum() for i in range(4)]
     if got_cs != expected_cs:
-        gdaltest.post_reason('fail')
         print('Got %s, expected %s' % (str(got_cs), str(expected_cs)))
         return 'fail'
     ds = None
@@ -1030,7 +981,6 @@ def test_gpkg_14():
     ds = gdal.OpenEx('/vsimem/tmp.gpkg', open_options=['TABLE=non_existing'])
     gdal.PopErrorHandler()
     if ds is not None:
-        gdaltest.post_reason('fail')
         return 'fail'
 
     ds = gdal.Open('/vsimem/tmp.gpkg')
@@ -1038,76 +988,59 @@ def test_gpkg_14():
     feat_count = sql_lyr.GetFeatureCount()
     ds.ReleaseResultSet(sql_lyr)
     if feat_count != 1:
-        gdaltest.post_reason('fail')
         return 'fail'
     if ds.GetMetadataItem('IDENTIFIER') != 'bar':
-        gdaltest.post_reason('fail')
         print(ds.GetMetadata())
         return 'fail'
     if ds.GetMetadataItem('DESCRIPTION') != 'baz':
-        gdaltest.post_reason('fail')
         print(ds.GetMetadata())
         return 'fail'
     if ds.GetMetadataItem('ZOOM_LEVEL') != '1':
-        gdaltest.post_reason('fail')
         print(ds.GetMetadata())
         return 'fail'
     if ds.GetRasterBand(1).GetOverviewCount() != 0:
-        gdaltest.post_reason('fail')
         return 'fail'
     if ds.GetRasterBand(1).GetOverview(0) is not None:
-        gdaltest.post_reason('fail')
         return 'fail'
     ds = None
 
     # In update mode, we expose even empty overview levels
     ds = gdal.Open('/vsimem/tmp.gpkg', gdal.GA_Update)
     if ds.GetMetadataItem('ZOOM_LEVEL') != '1':
-        gdaltest.post_reason('fail')
         print(ds.GetMetadata())
         return 'fail'
     if ds.GetRasterBand(1).GetOverviewCount() != 1:
-        gdaltest.post_reason('fail')
         return 'fail'
     if ds.GetRasterBand(1).GetOverview(0) is None:
-        gdaltest.post_reason('fail')
         return 'fail'
     if ds.GetRasterBand(1).GetOverview(0).Checksum() != 0:
-        gdaltest.post_reason('fail')
         return 'fail'
     ds = None
 
     ds = gdal.OpenEx('/vsimem/tmp.gpkg', open_options=['ZOOM_LEVEL=2'])
     if ds.RasterXSize != 400:
-        gdaltest.post_reason('fail')
         return 'fail'
     ds = None
 
     ds = gdal.OpenEx('/vsimem/tmp.gpkg', open_options=['ZOOM_LEVEL=1'])
     if ds.RasterXSize != 400:
-        gdaltest.post_reason('fail')
         return 'fail'
     if ds.GetRasterBand(1).GetOverviewCount() != 0:
-        gdaltest.post_reason('fail')
         return 'fail'
     ds = None
 
     # In update mode, we expose even empty overview levels
     ds = gdal.OpenEx('/vsimem/tmp.gpkg', gdal.OF_UPDATE, open_options=['ZOOM_LEVEL=1'])
     if ds.RasterXSize != 400:
-        gdaltest.post_reason('fail')
         return 'fail'
     if ds.GetRasterBand(1).GetOverviewCount() != 1:
-        gdaltest.post_reason('fail')
         return 'fail'
     ds = None
 
     ds = gdal.OpenEx('/vsimem/tmp.gpkg', open_options=['ZOOM_LEVEL=0'])
     if ds.RasterXSize != 200:
-        gdaltest.post_reason('fail')
         return 'fail'
     if ds.GetRasterBand(1).Checksum() != 0:
-        gdaltest.post_reason('fail')
         return 'fail'
     ds = None
 
@@ -1118,18 +1051,15 @@ def test_gpkg_14():
     with gdaltest.error_handler():
         ds = gdal.OpenEx('/vsimem/tmp2.gpkg', open_options=['ZOOM_LEVEL=-1'])
     if ds is not None:
-        gdaltest.post_reason('fail')
         return 'fail'
     gdal.Unlink('/vsimem/tmp2.gpkg')
 
     ds = gdal.OpenEx('/vsimem/tmp.gpkg', open_options=['USE_TILE_EXTENT=YES'])
     if ds.RasterXSize != 512 or ds.RasterYSize != 256:
-        gdaltest.post_reason('fail')
         return 'fail'
     expected_cs = [27644, 31968, 38564, 64301]
     got_cs = [ds.GetRasterBand(i + 1).Checksum() for i in range(4)]
     if got_cs != expected_cs:
-        gdaltest.post_reason('fail')
         print('Got %s, expected %s' % (str(got_cs), str(expected_cs)))
         return 'fail'
     ds = None
@@ -1137,12 +1067,10 @@ def test_gpkg_14():
     # Open with exactly one tile shift
     ds = gdal.OpenEx('/vsimem/tmp.gpkg', gdal.OF_UPDATE, open_options=['TILE_FORMAT=PNG', 'MINX=-410.4', 'MAXY=320.4'])
     if ds.RasterXSize != 400 + 256 or ds.RasterYSize != 200 + 256:
-        gdaltest.post_reason('fail')
         return 'fail'
     expected_cs = [29070, 32796, 41086, 64288]
     got_cs = [ds.GetRasterBand(i + 1).Checksum() for i in range(4)]
     if got_cs != expected_cs:
-        gdaltest.post_reason('fail')
         print('Got %s, expected %s' % (str(got_cs), str(expected_cs)))
         return 'fail'
     data = ds.ReadRaster(0, 0, ds.RasterXSize, ds.RasterYSize)
@@ -1153,7 +1081,6 @@ def test_gpkg_14():
     fc = sql_lyr.GetFeatureCount()
     ds.ReleaseResultSet(sql_lyr)
     if fc != 0:
-        gdaltest.post_reason('fail')
         return 'fail'
     ds.WriteRaster(0, 0, ds.RasterXSize, ds.RasterYSize, data)
     ds = None
@@ -1163,12 +1090,10 @@ def test_gpkg_14():
     if ds.RasterXSize != 600 or ds.RasterYSize != 400:
         print(ds.RasterXSize)
         print(ds.RasterYSize)
-        gdaltest.post_reason('fail')
         return 'fail'
     expected_cs = [28940, 32454, 40526, 64323]
     got_cs = [ds.GetRasterBand(i + 1).Checksum() for i in range(4)]
     if got_cs != expected_cs:
-        gdaltest.post_reason('fail')
         print('Got %s, expected %s' % (str(got_cs), str(expected_cs)))
         return 'fail'
 
@@ -1182,7 +1107,6 @@ def test_gpkg_14():
     fc = sql_lyr.GetFeatureCount()
     ds.ReleaseResultSet(sql_lyr)
     if fc != 0:
-        gdaltest.post_reason('fail')
         return 'fail'
     ds.WriteRaster(0, 0, ds.RasterXSize, ds.RasterYSize, data)
     ds = None
@@ -1191,7 +1115,6 @@ def test_gpkg_14():
     expected_cs = [28940, 32454, 40526, 64323]
     got_cs = [ds.GetRasterBand(i + 1).Checksum() for i in range(4)]
     if got_cs != expected_cs:
-        gdaltest.post_reason('fail')
         print('Got %s, expected %s' % (str(got_cs), str(expected_cs)))
         return 'fail'
     # Partial rewrite
@@ -1203,7 +1126,6 @@ def test_gpkg_14():
     expected_cs = [28940, 32454, 40526, 64323]
     got_cs = [ds.GetRasterBand(i + 1).Checksum() for i in range(4)]
     if got_cs != expected_cs:
-        gdaltest.post_reason('fail')
         print('Got %s, expected %s' % (str(got_cs), str(expected_cs)))
         return 'fail'
     ds = None
@@ -1211,12 +1133,10 @@ def test_gpkg_14():
     # Partial tile shift (included in tiles)
     ds = gdal.OpenEx('GPKG:/vsimem/tmp.gpkg:foo', gdal.OF_UPDATE, open_options=['MINX=-90', 'MAXY=45', 'MINY=-45', 'MAXX=90'])
     if ds.RasterXSize != 200 or ds.RasterYSize != 100:
-        gdaltest.post_reason('fail')
         return 'fail'
     expected_cs = [9586, 9360, 26758, 48827]
     got_cs = [ds.GetRasterBand(i + 1).Checksum() for i in range(4)]
     if got_cs != expected_cs:
-        gdaltest.post_reason('fail')
         print('Got %s, expected %s' % (str(got_cs), str(expected_cs)))
         return 'fail'
 
@@ -1227,12 +1147,10 @@ def test_gpkg_14():
 
     ds = gdal.OpenEx('GPKG:/vsimem/tmp.gpkg:foo', open_options=['MINX=-90', 'MAXY=45', 'MINY=-45', 'MAXX=90'])
     if ds.RasterXSize != 200 or ds.RasterYSize != 100:
-        gdaltest.post_reason('fail')
         return 'fail'
     expected_cs = [9586, 9360, 26758, 48827]
     got_cs = [ds.GetRasterBand(i + 1).Checksum() for i in range(4)]
     if got_cs != expected_cs:
-        gdaltest.post_reason('fail')
         print('Got %s, expected %s' % (str(got_cs), str(expected_cs)))
         return 'fail'
     ds = None
@@ -1247,27 +1165,21 @@ def test_gpkg_14():
     ds = gdal.Open('/vsimem/tmp.gpkg')
     md = ds.GetMetadata('SUBDATASETS')
     if md['SUBDATASET_1_NAME'] != 'GPKG:/vsimem/tmp.gpkg:foo':
-        gdaltest.post_reason('fail')
         print(md)
         return 'fail'
     if md['SUBDATASET_1_DESC'] != 'foo - bar':
-        gdaltest.post_reason('fail')
         print(md)
         return 'fail'
     if md['SUBDATASET_2_NAME'] != 'GPKG:/vsimem/tmp.gpkg:other':
-        gdaltest.post_reason('fail')
         print(md)
         return 'fail'
     if md['SUBDATASET_2_DESC'] != 'other - other':
-        gdaltest.post_reason('fail')
         print(md)
         return 'fail'
     if md['SUBDATASET_3_NAME'] != 'GPKG:/vsimem/tmp.gpkg:byte':
-        gdaltest.post_reason('fail')
         print(md)
         return 'fail'
     if md['SUBDATASET_3_DESC'] != 'byte - byte':
-        gdaltest.post_reason('fail')
         print(md)
         return 'fail'
     ds = None
@@ -1275,22 +1187,18 @@ def test_gpkg_14():
     ds = gdal.Open('GPKG:/vsimem/tmp.gpkg:other')
     block_size = ds.GetRasterBand(1).GetBlockSize()
     if block_size != [64, 64]:
-        gdaltest.post_reason('fail')
         return 'fail'
     ds = None
 
     ds = gdal.OpenEx('/vsimem/tmp.gpkg', open_options=['TABLE=other', 'MINX=-90', 'MAXY=45', 'MINY=-45', 'MAXX=90'])
     if ds.RasterXSize != 200 or ds.RasterYSize != 100:
-        gdaltest.post_reason('fail')
         return 'fail'
     block_size = ds.GetRasterBand(1).GetBlockSize()
     if block_size != [64, 64]:
-        gdaltest.post_reason('fail')
         return 'fail'
     expected_cs = [9586, 9360, 26758, 48827]
     got_cs = [ds.GetRasterBand(i + 1).Checksum() for i in range(4)]
     if got_cs != expected_cs:
-        gdaltest.post_reason('fail')
         print('Got %s, expected %s' % (str(got_cs), str(expected_cs)))
         return 'fail'
     ds = None
@@ -1310,7 +1218,6 @@ def test_gpkg_14():
     expected_cs = [4934, 4934, 4934, 4934]
     got_cs = [ds.GetRasterBand(i + 1).Checksum() for i in range(4)]
     if got_cs != expected_cs:
-        gdaltest.post_reason('fail')
         print('Got %s, expected %s' % (str(got_cs), str(expected_cs)))
         return 'fail'
     ds = None
@@ -1331,7 +1238,6 @@ def test_gpkg_14():
     expected_cs = [1223, 1223, 1223, 1223]
     got_cs = [ds.GetRasterBand(i + 1).Checksum() for i in range(4)]
     if got_cs != expected_cs:
-        gdaltest.post_reason('fail')
         print('Got %s, expected %s' % (str(got_cs), str(expected_cs)))
         return 'fail'
     ds = None
@@ -1352,7 +1258,6 @@ def test_gpkg_14():
     expected_cs = [13365, 13365, 13365, 13365]
     got_cs = [ds.GetRasterBand(i + 1).Checksum() for i in range(4)]
     if got_cs != expected_cs:
-        gdaltest.post_reason('fail')
         print('Got %s, expected %s' % (str(got_cs), str(expected_cs)))
         return 'fail'
     ds = None
@@ -1382,13 +1287,11 @@ def test_gpkg_14():
     fc = sql_lyr.GetFeatureCount()
     ds.ReleaseResultSet(sql_lyr)
     if fc != 0:
-        gdaltest.post_reason('fail')
         return 'fail'
 
     expected_cs = [0, 56451, 0, 0]
     got_cs = [ds.GetRasterBand(i + 1).Checksum() for i in range(4)]
     if got_cs != expected_cs:
-        gdaltest.post_reason('fail')
         print('Got %s, expected %s' % (str(got_cs), str(expected_cs)))
         ds.GetRasterBand(4).Fill(255)
         # sys.exit(0)
@@ -1399,14 +1302,12 @@ def test_gpkg_14():
     with gdaltest.error_handler():
         ds = gdal.OpenEx('/vsimem/tmp.gpkg', open_options=['MINX=-1e12', 'MAXX=-0.9999e12'])
     if ds is not None:
-        gdaltest.post_reason('fail')
         return 'fail'
 
     # Overflow occurred in ComputeTileAndPixelShifts()
     with gdaltest.error_handler():
         ds = gdal.OpenEx('/vsimem/tmp.gpkg', open_options=['MINY=-1e12', 'MAXY=-0.9999e12'])
     if ds is not None:
-        gdaltest.post_reason('fail')
         return 'fail'
 
     # Overflow occurred in ComputeTileAndPixelShifts()
@@ -1417,7 +1318,6 @@ def test_gpkg_14():
     with gdaltest.error_handler():
         ds = gdal.Open('/vsimem/tmp.gpkg')
     if ds is not None:
-        gdaltest.post_reason('fail')
         return 'fail'
 
     gdal.Unlink('/vsimem/tmp.gpkg')
@@ -1437,16 +1337,13 @@ def test_gpkg_15():
     # SetGeoTransform() and SetProjection() on a non-raster GPKG
     out_ds = gdaltest.gpkg_dr.Create('/vsimem/tmp.gpkg', 0, 0, 0)
     if out_ds.GetGeoTransform(can_return_null=True) is not None:
-        gdaltest.post_reason('fail')
         return 'fail'
     if out_ds.GetProjectionRef() != '':
-        gdaltest.post_reason('fail')
         return 'fail'
     gdal.PushErrorHandler()
     ret = out_ds.SetGeoTransform([0, 1, 0, 0, 0, -1])
     gdal.PopErrorHandler()
     if ret == 0:
-        gdaltest.post_reason('fail')
         return 'fail'
 
     srs = osr.SpatialReference()
@@ -1455,7 +1352,6 @@ def test_gpkg_15():
     ret = out_ds.SetProjection(srs.ExportToWkt())
     gdal.PopErrorHandler()
     if ret == 0:
-        gdaltest.post_reason('fail')
         return 'fail'
     out_ds = None
 
@@ -1465,55 +1361,46 @@ def test_gpkg_15():
     out_ds = gdaltest.gpkg_dr.Create('/vsimem/tmp.gpkg', 1, 1)
     ret = out_ds.SetGeoTransform([0, 1, 0, 0, 0, -1])
     if ret != 0:
-        gdaltest.post_reason('fail')
         return 'fail'
     gdal.PushErrorHandler()
     ret = out_ds.SetGeoTransform([0, 1, 0, 0, 0, -1])
     gdal.PopErrorHandler()
     if ret == 0:
-        gdaltest.post_reason('fail')
         return 'fail'
     out_ds = None
 
     # Repeated SetProjection()
     out_ds = gdal.Open('/vsimem/tmp.gpkg', gdal.GA_Update)
     if out_ds.GetProjectionRef() != '':
-        gdaltest.post_reason('fail')
         return 'fail'
     srs = osr.SpatialReference()
     srs.ImportFromEPSG(4326)
     ret = out_ds.SetProjection(srs.ExportToWkt())
     if ret != 0:
-        gdaltest.post_reason('fail')
         return 'fail'
     if out_ds.GetProjectionRef().find('4326') < 0:
-        gdaltest.post_reason('fail')
         return 'fail'
     out_ds = None
 
     out_ds = gdal.Open('/vsimem/tmp.gpkg', gdal.GA_Update)
     if out_ds.GetProjectionRef().find('4326') < 0:
-        gdaltest.post_reason('fail')
         return 'fail'
     out_ds.SetProjection('')
     out_ds = None
 
     out_ds = gdal.Open('/vsimem/tmp.gpkg')
     if out_ds.GetProjectionRef() != '':
-        gdaltest.post_reason('fail')
         return 'fail'
     # Test setting on read-only dataset
     gdal.PushErrorHandler()
     ret = out_ds.SetProjection('')
     gdal.PopErrorHandler()
     if ret == 0:
-        gdaltest.post_reason('fail')
         return 'fail'
     gdal.PushErrorHandler()
     ret = out_ds.SetGeoTransform([0, 1, 0, 0, 0, -1])
     gdal.PopErrorHandler()
     if ret == 0:
-        gdaltest.post_reason('fail')
         return 'fail'
     out_ds = None
 
@@ -1524,21 +1411,17 @@ def test_gpkg_15():
     out_ds.SetGeoTransform([0, 1, 0, 0, 0, -1])
     ret = out_ds.GetRasterBand(1).SetColorInterpretation(gdal.GCI_Undefined)
     if ret != 0:
-        gdaltest.post_reason('fail')
         return 'fail'
     ret = out_ds.GetRasterBand(1).SetColorInterpretation(gdal.GCI_GrayIndex)
     if ret != 0:
-        gdaltest.post_reason('fail')
         return 'fail'
     ret = out_ds.GetRasterBand(1).SetColorInterpretation(gdal.GCI_PaletteIndex)
     if ret != 0:
-        gdaltest.post_reason('fail')
         return 'fail'
     gdal.PushErrorHandler()
     ret = out_ds.GetRasterBand(1).SetColorInterpretation(gdal.GCI_RedBand)
     gdal.PopErrorHandler()
     if ret == 0:
-        gdaltest.post_reason('fail')
         return 'fail'
     out_ds = None
 
@@ -1548,13 +1431,11 @@ def test_gpkg_15():
     out_ds.SetGeoTransform([0, 1, 0, 0, 0, -1])
     ret = out_ds.GetRasterBand(1).SetColorInterpretation(gdal.GCI_RedBand)
     if ret != 0:
-        gdaltest.post_reason('fail')
         return 'fail'
     gdal.PushErrorHandler()
     ret = out_ds.GetRasterBand(2).SetColorInterpretation(gdal.GCI_RedBand)
     gdal.PopErrorHandler()
     if ret == 0:
-        gdaltest.post_reason('fail')
         return 'fail'
     out_ds = None
 
@@ -1564,23 +1445,19 @@ def test_gpkg_15():
     out_ds.SetGeoTransform([0, 1, 0, 0, 0, -1])
     ret = out_ds.GetRasterBand(1).SetColorInterpretation(gdal.GCI_GrayIndex)
     if ret != 0:
-        gdaltest.post_reason('fail')
         return 'fail'
     gdal.PushErrorHandler()
     ret = out_ds.GetRasterBand(1).SetColorInterpretation(gdal.GCI_RedBand)
     gdal.PopErrorHandler()
     if ret == 0:
-        gdaltest.post_reason('fail')
         return 'fail'
     ret = out_ds.GetRasterBand(2).SetColorInterpretation(gdal.GCI_AlphaBand)
     if ret != 0:
-        gdaltest.post_reason('fail')
         return 'fail'
     gdal.PushErrorHandler()
     ret = out_ds.GetRasterBand(2).SetColorInterpretation(gdal.GCI_RedBand)
     gdal.PopErrorHandler()
     if ret == 0:
-        gdaltest.post_reason('fail')
         return 'fail'
     out_ds = None
 
@@ -1619,15 +1496,12 @@ def test_gpkg_16():
     out_ds = None
 
     if abs(val1 - 255) > 1:
-        gdaltest.post_reason('fail')
         print(val1)
         return 'fail'
     if abs(val2 - 127) > 1:
-        gdaltest.post_reason('fail')
         print(val2)
         return 'fail'
     if abs(val3 - 0) > 1:
-        gdaltest.post_reason('fail')
         print(val3)
         return 'fail'
     gdal.Unlink('/vsimem/tmp.gpkg')
@@ -1661,12 +1535,10 @@ def test_gpkg_17():
     out_ds = gdal.Open('/vsimem/tmp.gpkg')
     got_cs = out_ds.GetRasterBand(1).GetOverview(0).Checksum()
     if got_cs != 1087:
-        gdaltest.post_reason('fail')
         print(got_cs)
         return 'fail'
     check_tile_format(out_ds, 'PNG', 1, False, zoom_level=0)
     if out_ds.GetRasterBand(1).GetOverview(0).GetColorTable() is not None:
-        gdaltest.post_reason('fail')
         return 'fail'
     out_ds = None
     gdal.Unlink('/vsimem/tmp.gpkg')
@@ -1684,7 +1556,6 @@ def test_gpkg_17():
     out_ds = gdal.Open('/vsimem/tmp.gpkg')
     got_cs = out_ds.GetRasterBand(1).GetOverview(0).Checksum()
     if got_cs != 1087:
-        gdaltest.post_reason('fail')
         print(got_cs)
         return 'fail'
     check_tile_format(out_ds, 'PNG', 1, False, zoom_level=0)
@@ -1704,7 +1575,6 @@ def test_gpkg_17():
     out_ds = gdal.Open('/vsimem/tmp.gpkg')
     got_cs = out_ds.GetRasterBand(1).GetOverview(0).Checksum()
     if got_cs != 1087:
-        gdaltest.post_reason('fail')
         print(got_cs)
         return 'fail'
     check_tile_format(out_ds, 'PNG', 3, False, zoom_level=0)
@@ -1713,7 +1583,6 @@ def test_gpkg_17():
     out_ds = gdal.Open('/vsimem/tmp.gpkg')
     sql_lyr = out_ds.ExecuteSQL("SELECT * FROM sqlite_master WHERE type = 'table' AND name = 'gpkg_extensions'")
     if sql_lyr.GetFeatureCount() != 0:
-        gdaltest.post_reason('fail')
         return 'fail'
     out_ds.ReleaseResultSet(sql_lyr)
 
@@ -1725,7 +1594,6 @@ def test_gpkg_17():
     out_ds = None
     out_ds = gdal.Open('/vsimem/tmp.gpkg')
     if out_ds.GetRasterBand(1).GetOverviewCount() != 0:
-        gdaltest.post_reason('fail')
         return 'fail'
     out_ds = None
 
@@ -1735,7 +1603,6 @@ def test_gpkg_17():
     ret = out_ds.GetRasterBand(1).GetOverview(0).GetDataset().BuildOverviews('NONE', [])
     gdal.PopErrorHandler()
     if ret == 0:
-        gdaltest.post_reason('fail')
         return 'fail'
     out_ds = None
 
@@ -1745,7 +1612,6 @@ def test_gpkg_17():
     ret = out_ds.BuildOverviews('NEAR', [1])
     gdal.PopErrorHandler()
     if ret == 0:
-        gdaltest.post_reason('fail')
         return 'fail'
     out_ds = None
 
@@ -1757,7 +1623,6 @@ def test_gpkg_17():
     gdal.SetConfigOption('ALLOW_GPKG_ZOOM_OTHER_EXTENSION', None)
     gdal.PopErrorHandler()
     if ret == 0:
-        gdaltest.post_reason('fail')
         return 'fail'
     out_ds = None
 
@@ -1769,7 +1634,6 @@ def test_gpkg_17():
     gdal.SetConfigOption('ALLOW_GPKG_ZOOM_OTHER_EXTENSION', None)
     gdal.PopErrorHandler()
     if ret == 0:
-        gdaltest.post_reason('fail')
         return 'fail'
     out_ds = None
 
@@ -1780,7 +1644,6 @@ def test_gpkg_17():
     ret = out_ds.BuildOverviews('NEAR', [3])
     gdal.PopErrorHandler()
     if ret == 0:
-        gdaltest.post_reason('fail')
         return 'fail'
     out_ds = None
 
@@ -1790,7 +1653,6 @@ def test_gpkg_17():
     ret = out_ds.BuildOverviews('NEAR', [2])
     gdal.PopErrorHandler()
     if ret == 0:
-        gdaltest.post_reason('fail')
         return 'fail'
     out_ds = None
 
@@ -1830,13 +1692,11 @@ def test_gpkg_18():
     out_ds = gdal.Open('/vsimem/tmp.gpkg')
     got_cs = [out_ds.GetRasterBand(i + 1).GetOverview(0).Checksum() for i in range(3)]
     if got_cs != expected_cs_ov0:
-        gdaltest.post_reason('fail')
         print(got_cs)
         print(expected_cs_ov0)
         return 'fail'
     got_cs = [out_ds.GetRasterBand(i + 1).GetOverview(1).Checksum() for i in range(3)]
     if got_cs != expected_cs_ov1:
-        gdaltest.post_reason('fail')
         print(got_cs)
         print(expected_cs_ov1)
         return 'fail'
@@ -1851,27 +1711,22 @@ def test_gpkg_18():
     ret = out_ds.BuildOverviews('NEAR', [3])
     gdal.PopErrorHandler()
     if ret != 0:
-        gdaltest.post_reason('fail')
         return 'fail'
     if out_ds.GetRasterBand(1).GetOverviewCount() != 3:
-        gdaltest.post_reason('fail')
         return 'fail'
     got_cs = [out_ds.GetRasterBand(i + 1).GetOverview(0).Checksum() for i in range(3)]
     if got_cs != expected_cs_ov0:
-        gdaltest.post_reason('fail')
         print(got_cs)
         print(expected_cs_ov0)
         return 'fail'
     expected_cs = [24807, 25544, 34002]
     got_cs = [out_ds.GetRasterBand(i + 1).GetOverview(1).Checksum() for i in range(3)]
     if got_cs != expected_cs:
-        gdaltest.post_reason('fail')
         print(got_cs)
         print(expected_cs)
         return 'fail'
     got_cs = [out_ds.GetRasterBand(i + 1).GetOverview(2).Checksum() for i in range(3)]
     if got_cs != expected_cs_ov1:
-        gdaltest.post_reason('fail')
         print(got_cs)
         print(expected_cs_ov1)
         return 'fail'
@@ -1879,7 +1734,6 @@ def test_gpkg_18():
     # Check that extension is declared
     sql_lyr = out_ds.ExecuteSQL("SELECT * FROM gpkg_extensions WHERE table_name = 'tmp' AND extension_name = 'gpkg_zoom_other'")
     if sql_lyr.GetFeatureCount() != 1:
-        gdaltest.post_reason('fail')
         return 'fail'
     out_ds.ReleaseResultSet(sql_lyr)
 
@@ -1887,24 +1741,20 @@ def test_gpkg_18():
 
     out_ds = gdal.Open('/vsimem/tmp.gpkg')
     if out_ds.GetRasterBand(1).GetOverviewCount() != 3:
-        gdaltest.post_reason('fail')
         return 'fail'
     got_cs = [out_ds.GetRasterBand(i + 1).GetOverview(0).Checksum() for i in range(3)]
     if got_cs != expected_cs_ov0:
-        gdaltest.post_reason('fail')
         print(got_cs)
         print(expected_cs_ov0)
         return 'fail'
     expected_cs = [24807, 25544, 34002]
     got_cs = [out_ds.GetRasterBand(i + 1).GetOverview(1).Checksum() for i in range(3)]
     if got_cs != expected_cs:
-        gdaltest.post_reason('fail')
         print(got_cs)
         print(expected_cs)
         return 'fail'
     got_cs = [out_ds.GetRasterBand(i + 1).GetOverview(2).Checksum() for i in range(3)]
     if got_cs != expected_cs_ov1:
-        gdaltest.post_reason('fail')
         print(got_cs)
         print(expected_cs_ov1)
         return 'fail'
@@ -1914,12 +1764,10 @@ def test_gpkg_18():
     out_ds = gdal.OpenEx('/vsimem/tmp.gpkg', gdal.OF_RASTER | gdal.OF_UPDATE)
     ret = out_ds.BuildOverviews('NEAR', [8])
     if ret != 0:
-        gdaltest.post_reason('fail')
         return 'fail'
     expected_cs = [12725, 12539, 13553]
     got_cs = [out_ds.GetRasterBand(i + 1).GetOverview(3).Checksum() for i in range(3)]
     if got_cs != expected_cs:
-        gdaltest.post_reason('fail')
         print(got_cs)
         print(expected_cs)
         return 'fail'
@@ -1934,7 +1782,6 @@ def test_gpkg_18():
         # Should not result in gpkg_zoom_other
         ret = out_ds.BuildOverviews('NEAR', [8])
         if ret != 0:
-            gdaltest.post_reason('fail')
             return 'fail'
         out_ds = None
 
@@ -1942,7 +1789,6 @@ def test_gpkg_18():
     out_ds = gdal.Open('/vsimem/tmp.gpkg')
     sql_lyr = out_ds.ExecuteSQL("SELECT * FROM sqlite_master WHERE type = 'table' AND name = 'gpkg_extensions'")
     if sql_lyr.GetFeatureCount() != 0:
-        gdaltest.post_reason('fail')
         return 'fail'
     out_ds.ReleaseResultSet(sql_lyr)
     out_ds = None
@@ -1981,17 +1827,14 @@ def test_gpkg_19():
 
     out_ds = gdal.OpenEx('/vsimem/tmp.gpkg', gdal.OF_RASTER, open_options=['BAND_COUNT=1'])
     if out_ds.GetRasterBand(1).GetOverview(0).GetColorTable() is None:
-        gdaltest.post_reason('fail')
         return 'fail'
     got_cs = [out_ds.GetRasterBand(i + 1).GetOverview(0).Checksum() for i in range(1)]
     if got_cs != expected_cs_ov0:
-        gdaltest.post_reason('fail')
         print(got_cs)
         print(expected_cs_ov0)
         return 'fail'
     got_cs = [out_ds.GetRasterBand(i + 1).GetOverview(1).Checksum() for i in range(1)]
     if got_cs != expected_cs_ov1:
-        gdaltest.post_reason('fail')
         print(got_cs)
         print(expected_cs_ov1)
         return 'fail'
@@ -2025,7 +1868,6 @@ def test_gpkg_20():
     got_cs = [out_ds.GetRasterBand(i + 1).Checksum() for i in range(4)]
     expected_cs = [30875, 31451, 38110, 64269]
     if got_cs != expected_cs:
-        gdaltest.post_reason('fail')
         print(got_cs)
         print(expected_cs)
         return 'fail'
@@ -2043,7 +1885,6 @@ def test_gpkg_20():
     got_cs = [out_ds.GetRasterBand(i + 1).Checksum() for i in range(4)]
     expected_cs = [27001, 30168, 34800, 64269]
     if got_cs != expected_cs:
-        gdaltest.post_reason('fail')
         print(got_cs)
         print(expected_cs)
         return 'fail'
@@ -2061,7 +1902,6 @@ def test_gpkg_20():
     got_cs = [out_ds.GetRasterBand(i + 1).Checksum() for i in range(4)]
     expected_cs = [27718, 31528, 42062, 64269]
     if got_cs != expected_cs:
-        gdaltest.post_reason('fail')
         print(got_cs)
         print(expected_cs)
         return 'fail'
@@ -2085,7 +1925,6 @@ def test_gpkg_20():
     got_cs = [out_ds.GetRasterBand(i + 1).Checksum() for i in range(4)]
     expected_cs = [2500, 5000, 7500, 30658]
     if got_cs != expected_cs:
-        gdaltest.post_reason('fail')
         print(got_cs)
         print(expected_cs)
         return 'fail'
@@ -2093,7 +1932,6 @@ def test_gpkg_20():
     out_ds = None
     out_ds = gdal.OpenEx('/vsimem/tmp.gpkg', gdal.OF_RASTER, open_options=['BAND_COUNT=1'])
     if out_ds.GetRasterBand(1).GetColorTable().GetCount() != 1:
-        gdaltest.post_reason('fail')
         return 'fail'
     out_ds = None
     gdal.Unlink('/vsimem/tmp.gpkg')
@@ -2117,7 +1955,6 @@ def test_gpkg_21():
     out_ds.SetGeoTransform([0, 1, 0, 0, 0, -1])
     mddlist = out_ds.GetMetadataDomainList()
     if len(mddlist) != 3:
-        gdaltest.post_reason('fail')
         print(mddlist)
         return 'fail'
     out_ds = None
@@ -2130,7 +1967,6 @@ def test_gpkg_21():
     out_ds.ReleaseResultSet(sql_lyr)
     feat_is_none = feat is None
     if not feat_is_none:
-        gdaltest.post_reason('fail')
         return 'fail'
 
     # Set a metadata item now
@@ -2143,17 +1979,14 @@ def test_gpkg_21():
         out_ds = gdal.Open('/vsimem/tmp.gpkg', gdal.GA_Update)
 
         if out_ds.GetMetadata('GEOPACKAGE'):
-            gdaltest.post_reason('fail')
             return 'fail'
         if out_ds.GetMetadataItem('foo') != foo_value:
-            gdaltest.post_reason('fail')
             print(out_ds.GetMetadataItem('foo'))
             feat.DumpReadable()
             return 'fail'
         md = out_ds.GetMetadata()
         if len(md) != 3 or md['foo'] != foo_value or \
                 md['IDENTIFIER'] != 'tmp' or md['ZOOM_LEVEL'] != '0':
-            gdaltest.post_reason('fail')
             print(md)
             feat.DumpReadable()
             return 'fail'
@@ -2169,7 +2002,6 @@ def test_gpkg_21():
   </Metadata>
 </GDALMultiDomainMetadata>
 """ % foo_value:
-            gdaltest.post_reason('fail')
             print(i)
             feat.DumpReadable()
             return 'fail'
@@ -2184,7 +2016,6 @@ def test_gpkg_21():
                 not feat.IsFieldSet('timestamp') or \
                 feat.GetField('md_file_id') != 1 or \
                 not feat.IsFieldNull('md_parent_id'):
-            gdaltest.post_reason('fail')
             print(i)
             feat.DumpReadable()
             return 'fail'
@@ -2208,7 +2039,6 @@ def test_gpkg_21():
     sql_lyr = out_ds.ExecuteSQL('SELECT * FROM gpkg_metadata')
     feat = sql_lyr.GetNextFeature()
     if feat is not None:
-        gdaltest.post_reason('fail')
         feat.DumpReadable()
         out_ds.ReleaseResultSet(sql_lyr)
         return 'fail'
@@ -2216,7 +2046,6 @@ def test_gpkg_21():
     sql_lyr = out_ds.ExecuteSQL('SELECT * FROM gpkg_metadata_reference')
     feat = sql_lyr.GetNextFeature()
     if feat is not None:
-        gdaltest.post_reason('fail')
         feat.DumpReadable()
         out_ds.ReleaseResultSet(sql_lyr)
         return 'fail'
@@ -2229,15 +2058,12 @@ def test_gpkg_21():
     # Still no metadata
     out_ds = gdal.Open('/vsimem/tmp.gpkg', gdal.GA_Update)
     if out_ds.GetMetadataItem('IDENTIFIER') != 'my_identifier':
-        gdaltest.post_reason('fail')
         return 'fail'
     if out_ds.GetMetadataItem('DESCRIPTION') != 'my_description':
-        gdaltest.post_reason('fail')
         return 'fail'
     sql_lyr = out_ds.ExecuteSQL('SELECT * FROM gpkg_metadata')
     feat = sql_lyr.GetNextFeature()
     if feat is not None:
-        gdaltest.post_reason('fail')
         feat.DumpReadable()
         out_ds.ReleaseResultSet(sql_lyr)
         return 'fail'
@@ -2245,7 +2071,6 @@ def test_gpkg_21():
     sql_lyr = out_ds.ExecuteSQL('SELECT * FROM gpkg_metadata_reference')
     feat = sql_lyr.GetNextFeature()
     if feat is not None:
-        gdaltest.post_reason('fail')
         feat.DumpReadable()
         out_ds.ReleaseResultSet(sql_lyr)
         return 'fail'
@@ -2259,7 +2084,6 @@ def test_gpkg_21():
     out_ds = gdal.Open('/vsimem/tmp.gpkg', gdal.GA_Update)
 
     if out_ds.GetMetadataItem('bar', 'GEOPACKAGE') != 'foo':
-        gdaltest.post_reason('fail')
         return 'fail'
 
     sql_lyr = out_ds.ExecuteSQL('SELECT * FROM gpkg_metadata')
@@ -2273,7 +2097,6 @@ def test_gpkg_21():
   </Metadata>
 </GDALMultiDomainMetadata>
 """:
-        gdaltest.post_reason('fail')
         feat.DumpReadable()
         out_ds.ReleaseResultSet(sql_lyr)
         return 'fail'
@@ -2288,7 +2111,6 @@ def test_gpkg_21():
             not feat.IsFieldSet('timestamp') or \
             feat.GetField('md_file_id') != 1 or \
             not feat.IsFieldNull('md_parent_id'):
-        gdaltest.post_reason('fail')
         feat.DumpReadable()
         out_ds.ReleaseResultSet(sql_lyr)
         return 'fail'
@@ -2299,14 +2121,12 @@ def test_gpkg_21():
 
     out_ds = gdal.Open('/vsimem/tmp.gpkg', gdal.GA_Update)
     if out_ds.GetMetadataItem('bar', 'GEOPACKAGE') != 'baz':
-        gdaltest.post_reason('fail')
         return 'fail'
     out_ds.SetMetadata(None, 'GEOPACKAGE')
     out_ds = None
 
     out_ds = gdal.Open('/vsimem/tmp.gpkg', gdal.GA_Update)
     if out_ds.GetMetadata('GEOPACKAGE'):
-        gdaltest.post_reason('fail')
         return 'fail'
 
     out_ds.SetMetadataItem('1', '2')
@@ -2326,29 +2146,22 @@ def test_gpkg_21():
     for i in range(2):
         out_ds = gdal.Open('/vsimem/tmp.gpkg', gdal.GA_Update)
         if out_ds.GetMetadataItem('1') != '2':
-            gdaltest.post_reason('fail')
             return 'fail'
         if out_ds.GetMetadataItem('GPKG_METADATA_ITEM_1') != 'my_metadata_local':
-            gdaltest.post_reason('fail')
             print(out_ds.GetMetadata())
             return 'fail'
         if out_ds.GetMetadataItem('GPKG_METADATA_ITEM_2') != 'other_metadata_local':
-            gdaltest.post_reason('fail')
             print(out_ds.GetMetadata())
             return 'fail'
         if out_ds.GetMetadataItem('GPKG_METADATA_ITEM_1', 'GEOPACKAGE') != 'my_metadata':
-            gdaltest.post_reason('fail')
             print(out_ds.GetMetadata('GEOPACKAGE'))
             return 'fail'
         if out_ds.GetMetadataItem('GPKG_METADATA_ITEM_2', 'GEOPACKAGE') != 'other_metadata':
-            gdaltest.post_reason('fail')
             print(out_ds.GetMetadata('GEOPACKAGE'))
             return 'fail'
         if out_ds.GetMetadataItem('3', 'CUSTOM_DOMAIN') != '4':
-            gdaltest.post_reason('fail')
             return 'fail'
         if out_ds.GetMetadataItem('6', 'GEOPACKAGE') != '7':
-            gdaltest.post_reason('fail')
             return 'fail'
         out_ds.SetMetadata(out_ds.GetMetadata())
         out_ds.SetMetadata(out_ds.GetMetadata('GEOPACKAGE'), 'GEOPACKAGE')
@@ -2362,13 +2175,11 @@ def test_gpkg_21():
 
     out_ds = gdal.Open('/vsimem/tmp.gpkg', gdal.GA_Update)
     if out_ds.GetMetadataItem('GPKG_METADATA_ITEM_1', 'GEOPACKAGE') != 'my_metadata':
-        gdaltest.post_reason('fail')
         print(out_ds.GetMetadata())
         return 'fail'
     sql_lyr = out_ds.ExecuteSQL('SELECT * FROM gpkg_metadata WHERE id < 10')
     feat = sql_lyr.GetNextFeature()
     if feat is not None:
-        gdaltest.post_reason('fail')
         feat.DumpReadable()
         out_ds.ReleaseResultSet(sql_lyr)
         return 'fail'
@@ -2376,7 +2187,6 @@ def test_gpkg_21():
     sql_lyr = out_ds.ExecuteSQL('SELECT * FROM gpkg_metadata_reference WHERE md_file_id < 10')
     feat = sql_lyr.GetNextFeature()
     if feat is not None:
-        gdaltest.post_reason('fail')
         feat.DumpReadable()
         out_ds.ReleaseResultSet(sql_lyr)
         return 'fail'
@@ -2447,7 +2257,6 @@ def test_gpkg_22(tile_drv_name='PNG'):
     got_cs = [out_ds.GetRasterBand(i + 1).Checksum() for i in range(2)]
     if got_cs != expected_cs:
         if tile_drv_name != 'WEBP' or got_cs not in ([4899, 10807], [6274, 10807], [17638, 10807]):
-            gdaltest.post_reason('fail')
             print('Got %s, expected %s' % (str(got_cs), str(expected_cs)))
             return 'fail'
     out_ds = None
@@ -2457,7 +2266,6 @@ def test_gpkg_22(tile_drv_name='PNG'):
     expected_cs = [expected_cs[0], expected_cs[0], expected_cs[0], expected_cs[1]]
     if got_cs != expected_cs:
         if tile_drv_name != 'WEBP' or got_cs not in ([4899, 4899, 4899, 10807], [4899, 4984, 4899, 10807], [6274, 6274, 6274, 10807], [17638, 17631, 17638, 10807]):
-            gdaltest.post_reason('fail')
             print('Got %s, expected %s' % (str(got_cs), str(expected_cs)))
             return 'fail'
     out_ds = None
@@ -2466,7 +2274,6 @@ def test_gpkg_22(tile_drv_name='PNG'):
     got_cs = [ds.GetRasterBand(i + 1).Checksum() for i in range(4)]
     if got_cs != clamped_expected_cs:
         if tile_drv_name != 'WEBP' or got_cs not in ([5266, 5266, 5266, 11580], [5266, 5310, 5266, 11580], [6436, 6436, 6436, 11580], [17007, 17000, 17007, 11580]):
-            gdaltest.post_reason('fail')
             print('Got %s, expected %s' % (str(got_cs), str(clamped_expected_cs)))
             return 'fail'
     ds = None
@@ -2531,13 +2338,11 @@ def test_gpkg_26():
 
         ds = gdal.Open('/vsimem/tmp.gpkg')
         if ds.GetMetadataItem('AREA_OR_POINT') != 'Area':
-            gdaltest.post_reason('fail')
             return 'fail'
         got_cs = [ds.GetRasterBand(i + 1).Checksum() for i in range(4)]
         # VC12 returns [3561, 3561, 3561, 3691] for GoogleCRS84Quad
         # and For GoogleCRS84Quad RESAMPLING=CUBIC, got [3415, 3415, 3415, 3691]
         if max([abs(got_cs[i] - expected_cs[i]) for i in range(4)]) > 2:
-            gdaltest.post_reason('fail')
             print('For %s, got %s, expected %s' % (scheme, str(got_cs), str(expected_cs)))
             if gdal.GetConfigOption('APPVEYOR') is None:
                 return 'fail'
@@ -2560,7 +2365,6 @@ def test_gpkg_26():
         ds = gdal.Open('/vsimem/tmp.gpkg')
         got_cs = [ds.GetRasterBand(i + 1).Checksum() for i in range(4)]
         if got_cs not in expected_cs:
-            gdaltest.post_reason('fail')
             print('For %s, got %s, expected %s' % (scheme, str(got_cs), str(expected_cs)))
             if gdal.GetConfigOption('APPVEYOR') is None:
                 return 'fail'
@@ -2573,20 +2377,17 @@ def test_gpkg_26():
     ds = gdaltest.gpkg_dr.Create('/vsimem/tmp.gpkg', 1, 1, 1, options=['TILING_SCHEME=GoogleCRS84Quad', 'BLOCKSIZE=128'])
     gdal.PopErrorHandler()
     if ds is not None:
-        gdaltest.post_reason('fail')
         return 'fail'
     gdal.Unlink('/vsimem/tmp.gpkg')
 
     ds = gdaltest.gpkg_dr.Create('/vsimem/tmp.gpkg', 1, 1, 1, options=['TILING_SCHEME=GoogleCRS84Quad'])
     # Test that implicit SRS registration works.
     if ds.GetProjectionRef().find('4326') < 0:
-        gdaltest.post_reason('fail')
         return 'fail'
     gdal.PushErrorHandler()
     ret = ds.SetGeoTransform([0, 10, 0, 0, 0, -10])
     gdal.PopErrorHandler()
     if ret == 0:
-        gdaltest.post_reason('fail')
         return 'fail'
     srs = osr.SpatialReference()
     srs.ImportFromEPSG(32630)
@@ -2594,7 +2395,6 @@ def test_gpkg_26():
     ret = ds.SetProjection(srs.ExportToWkt())
     gdal.PopErrorHandler()
     if ret == 0:
-        gdaltest.post_reason('fail')
         return 'fail'
     gdal.PushErrorHandler()
     ds = None
@@ -2608,7 +2408,6 @@ def test_gpkg_26():
     ds = gdaltest.gpkg_dr.CreateCopy('/foo/tmp.gpkg', src_ds, options=['TILING_SCHEME=invalid'])
     gdal.PopErrorHandler()
     if ds is not None:
-        gdaltest.post_reason('fail')
         return 'fail'
 
     # Invalid target filename
@@ -2617,7 +2416,6 @@ def test_gpkg_26():
     ds = gdaltest.gpkg_dr.CreateCopy('/foo/tmp.gpkg', src_ds, options=['TILING_SCHEME=GoogleCRS84Quad'])
     gdal.PopErrorHandler()
     if ds is not None:
-        gdaltest.post_reason('fail')
         return 'fail'
 
     # Source is not georeferenced
@@ -2626,7 +2424,6 @@ def test_gpkg_26():
     ds = gdaltest.gpkg_dr.CreateCopy('/vsimem/tmp.gpkg', src_ds, options=['TILING_SCHEME=GoogleCRS84Quad'])
     gdal.PopErrorHandler()
     if ds is not None:
-        gdaltest.post_reason('fail')
         return 'fail'
 
     return 'success'
@@ -2653,7 +2450,6 @@ def test_gpkg_27():
     expected_cs = [src_ds.GetRasterBand(i + 1).Checksum() for i in range(3)]
     got_cs = [out_ds.GetRasterBand(i + 1).Checksum() for i in range(3)]
     if got_cs != expected_cs:
-        gdaltest.post_reason('fail')
         print('Got %s, expected %s' % (str(got_cs), str(expected_cs)))
         return 'fail'
 
@@ -2697,7 +2493,6 @@ def test_gpkg_28():
     out_ds = gdal.OpenEx('/vsimem/tmp.gpkg', open_options=['BAND_COUNT=3'])
     got_cs = [out_ds.GetRasterBand(i + 1).Checksum() for i in range(3)]
     if got_cs != expected_cs:
-        gdaltest.post_reason('fail')
         print('Got %s, expected %s' % (str(got_cs), str(expected_cs)))
         return 'fail'
 
@@ -2742,7 +2537,6 @@ def test_gpkg_29(x=0):
     out_ds = gdal.OpenEx('/vsimem/tmp.gpkg', open_options=['BAND_COUNT=3'])
     got_cs = [out_ds.GetRasterBand(i + 1).Checksum() for i in range(3)]
     if got_cs != expected_cs:
-        gdaltest.post_reason('fail')
         print('Got %s, expected %s' % (str(got_cs), str(expected_cs)))
         return 'fail'
 
@@ -2780,7 +2574,6 @@ def test_gpkg_31():
     expected_cs = [4672, 4672, 4672, 4873]
     got_cs = [ds.GetRasterBand(i + 1).Checksum() for i in range(4)]
     if got_cs != expected_cs:
-        gdaltest.post_reason('fail')
         print('Got %s, expected %s' % (str(got_cs), str(expected_cs)))
         return 'fail'
 
@@ -2810,7 +2603,6 @@ def test_gpkg_32():
     expected_cs = [1970, 1970, 1970, 10807]
     got_cs = [ds.GetRasterBand(i + 1).Checksum() for i in range(ds.RasterCount)]
     if got_cs != expected_cs:
-        gdaltest.post_reason('fail')
         print('Got %s, expected %s' % (str(got_cs), str(expected_cs)))
         return 'fail'
 
@@ -2818,7 +2610,6 @@ def test_gpkg_32():
     expected_cs = [1970, 10807]
     got_cs = [ds.GetRasterBand(i + 1).Checksum() for i in range(ds.RasterCount)]
     if got_cs != expected_cs:
-        gdaltest.post_reason('fail')
         print('Got %s, expected %s' % (str(got_cs), str(expected_cs)))
         return 'fail'
 
@@ -2850,7 +2641,6 @@ def test_gpkg_33():
     expected_cs = [10991, 57677, 34965, 10638]
     got_cs = [ds.GetRasterBand(i + 1).Checksum() for i in range(4)]
     if got_cs != expected_cs:
-        gdaltest.post_reason('fail')
         print('Got %s, expected %s' % (str(got_cs), str(expected_cs)))
         return 'fail'
 
@@ -2956,12 +2746,10 @@ def test_gpkg_36():
     out_ds = gdal.Open('/vsimem/gpkg_36.gpkg')
     got_cs = [out_ds.GetRasterBand(i + 1).Checksum() for i in range(4)]
     if got_cs != expected_cs:
-        gdaltest.post_reason('fail')
         print('Got %s, expected %s' % (str(got_cs), str(expected_cs)))
         return 'fail'
     got_ct = out_ds.GetRasterBand(1).GetColorTable()
     if got_ct is not None:
-        gdaltest.post_reason('fail')
         return 'fail'
     out_ds = None
 
@@ -2986,7 +2774,6 @@ def test_gpkg_37():
     ds = gdal.Open('/vsimem/gpkg_37.gpkg', gdal.GA_Update)
     ret = ds.BuildOverviews('NONE', [2, 4, 8, 16, 32, 64, 128, 256, 512, 1024, 2048])
     if ret != 0 or gdal.GetLastErrorMsg() != '':
-        gdaltest.post_reason('fail')
         return 'fail'
     ds = None
 
@@ -3008,7 +2795,6 @@ def test_gpkg_38():
 
     ds = gdal.Open('/vsimem/gpkg_38.gpkg')
     if ds.GetRasterBand(1).Checksum() != src_ds.GetRasterBand(1).Checksum():
-        gdaltest.post_reason('fail')
         return 'fail'
     ds = None
     filesize = gdal.VSIStatL('/vsimem/gpkg_38.gpkg').size
@@ -3021,7 +2807,6 @@ def test_gpkg_38():
         ds = None
     gdal.Unlink(filename)
     if not ds_is_none and gdal.GetLastErrorMsg() == '':
-        gdaltest.post_reason('fail')
         return 'fail'
 
     filename = '/vsimem/||maxlength=%d||gpkg_38.gpkg' % (filesize - 1)
@@ -3031,7 +2816,6 @@ def test_gpkg_38():
         ds = None
     gdal.Unlink(filename)
     if not ds_is_none and gdal.GetLastErrorMsg() == '':
-        gdaltest.post_reason('fail')
         return 'fail'
 
     return 'success'
@@ -3058,27 +2842,21 @@ def test_gpkg_39():
     sql_lyr = ds.ExecuteSQL("SELECT COUNT(*) FROM sqlite_master WHERE name = 'ogr_empty_table'")
     f = sql_lyr.GetNextFeature()
     if f.GetField(0) != 1:
-        gdaltest.post_reason('fail')
         return 'fail'
     ds.ReleaseResultSet(sql_lyr)
 
     if ds.GetRasterBand(1).DataType != gdal.GDT_Int16:
-        gdaltest.post_reason('fail')
         return 'fail'
     if ds.GetRasterBand(1).Checksum() != 4672:
-        gdaltest.post_reason('fail')
         return 'fail'
     if ds.GetMetadataItem('AREA_OR_POINT') != 'Area':
-        gdaltest.post_reason('fail')
         return 'fail'
     sql_lyr = ds.ExecuteSQL('SELECT scale, offset FROM gpkg_2d_gridded_tile_ancillary')
     f = sql_lyr.GetNextFeature()
     if f['scale'] != 1.0:
-        gdaltest.post_reason('fail')
         f.DumpReadable()
         return 'fail'
     if f['offset'] != 0.0:
-        gdaltest.post_reason('fail')
         f.DumpReadable()
         return 'fail'
     ds.ReleaseResultSet(sql_lyr)
@@ -3086,7 +2864,6 @@ def test_gpkg_39():
     sql_lyr = ds.ExecuteSQL('SELECT grid_cell_encoding FROM gpkg_2d_gridded_coverage_ancillary')
     f = sql_lyr.GetNextFeature()
     if f['grid_cell_encoding'] != 'grid-value-is-area':
-        gdaltest.post_reason('fail')
         f.DumpReadable()
         return 'fail'
     ds.ReleaseResultSet(sql_lyr)
@@ -3097,20 +2874,17 @@ def test_gpkg_39():
     ds.ReleaseResultSet(sql_lyr)
     feat_is_none = feat is None
     if not feat_is_none:
-        gdaltest.post_reason('fail')
         return 'fail'
 
     sql_lyr = ds.ExecuteSQL('PRAGMA application_id')
     f = sql_lyr.GetNextFeature()
     if f['application_id'] != 1196444487:
-        gdaltest.post_reason('fail')
         f.DumpReadable()
         return 'fail'
     ds.ReleaseResultSet(sql_lyr)
     sql_lyr = ds.ExecuteSQL('PRAGMA user_version')
     f = sql_lyr.GetNextFeature()
     if f['user_version'] != 10200:
-        gdaltest.post_reason('fail')
         f.DumpReadable()
         return 'fail'
     ds.ReleaseResultSet(sql_lyr)
@@ -3118,7 +2892,6 @@ def test_gpkg_39():
     # Statistics not available on partial tile without nodata
     md = ds.GetRasterBand(1).GetMetadata()
     if md != {}:
-        gdaltest.post_reason('fail')
         print(md)
         return 'fail'
     ds = None
@@ -3127,11 +2900,9 @@ def test_gpkg_39():
     gdal.Translate('/vsimem/gpkg_39.gpkg', 'data/n43.dt0', format='GPKG')
     ds = gdal.Open('/vsimem/gpkg_39.gpkg')
     if ds.GetMetadataItem('AREA_OR_POINT') != 'Point':
-        gdaltest.post_reason('fail')
         print(ds.GetMetadata())
         return 'fail'
     if ds.GetRasterBand(1).GetUnitType() != 'm':
-        gdaltest.post_reason('fail')
         print(ds.GetRasterBand(1).GetUnitType())
         return 'fail'
     ds = None
@@ -3142,11 +2913,9 @@ def test_gpkg_39():
                    creationOptions=['GRID_CELL_ENCODING=grid-value-is-corner'])
     ds = gdal.Open('/vsimem/gpkg_39.gpkg')
     if ds.GetMetadataItem('AREA_OR_POINT') != 'Point':
-        gdaltest.post_reason('fail')
         print(ds.GetMetadata())
         return 'fail'
     if ds.GetRasterBand(1).GetMetadataItem('GRID_CELL_ENCODING') != 'grid-value-is-corner':
-        gdaltest.post_reason('fail')
         print(ds.GetRasterBand(1).GetMetadataItem())
         return 'fail'
 
@@ -3156,7 +2925,6 @@ def test_gpkg_39():
     ds.ReleaseResultSet(sql_lyr)
     feat_is_none = feat is None
     if not feat_is_none:
-        gdaltest.post_reason('fail')
         return 'fail'
 
     ds = None
@@ -3167,7 +2935,6 @@ def test_gpkg_39():
     ds = gdal.Open('/vsimem/gpkg_39.gpkg')
     md = ds.GetRasterBand(1).GetMetadata()
     if md != {'STATISTICS_MINIMUM': '74', 'STATISTICS_MAXIMUM': '255'}:
-        gdaltest.post_reason('fail')
         print(md)
         return 'fail'
     ds = None
@@ -3175,7 +2942,6 @@ def test_gpkg_39():
     ds = gdal.Open('/vsimem/gpkg_39.gpkg')
     mdi = ds.GetRasterBand(1).GetMetadataItem('STATISTICS_MINIMUM')
     if mdi != '74':
-        gdaltest.post_reason('fail')
         print(mdi)
         return 'fail'
     ds = None
@@ -3186,7 +2952,6 @@ def test_gpkg_39():
     ds = gdal.Open('/vsimem/gpkg_39.gpkg')
     md = ds.GetRasterBand(1).GetMetadata()
     if md != {'STATISTICS_MINIMUM': '74', 'STATISTICS_MAXIMUM': '255'}:
-        gdaltest.post_reason('fail')
         print(md)
         return 'fail'
     ds = None
@@ -3194,7 +2959,6 @@ def test_gpkg_39():
     ds = gdal.Open('/vsimem/gpkg_39.gpkg')
     mdi = ds.GetRasterBand(1).GetMetadataItem('STATISTICS_MINIMUM')
     if mdi != '74':
-        gdaltest.post_reason('fail')
         print(mdi)
         return 'fail'
     ds = None
@@ -3202,10 +2966,8 @@ def test_gpkg_39():
     gdal.Translate('/vsimem/gpkg_39.gpkg', src_ds, format='GPKG', noData=1)
     ds = gdal.Open('/vsimem/gpkg_39.gpkg')
     if ds.GetRasterBand(1).Checksum() != 4672:
-        gdaltest.post_reason('fail')
         return 'fail'
     if ds.GetRasterBand(1).GetNoDataValue() != -32768.0:
-        gdaltest.post_reason('fail')
         print(ds.GetRasterBand(1).GetNoDataValue())
         return 'fail'
 
@@ -3213,11 +2975,9 @@ def test_gpkg_39():
     ds = gdal.Open('/vsimem/gpkg_39.gpkg')
     cs = ds.GetRasterBand(1).Checksum()
     if cs != 4649:
-        gdaltest.post_reason('fail')
         print(cs)
         return 'fail'
     if ds.GetRasterBand(1).GetNoDataValue() != -32768.0:
-        gdaltest.post_reason('fail')
         print(ds.GetRasterBand(1).GetNoDataValue())
         return 'fail'
 
@@ -3225,7 +2985,6 @@ def test_gpkg_39():
     ds = gdal.Open('/vsimem/gpkg_39.gpkg')
     cs = ds.GetRasterBand(1).Checksum()
     if cs != 4118 and cs != 4077:
-        gdaltest.post_reason('fail')
         print(cs)
         return 'fail'
 
@@ -3235,7 +2994,6 @@ def test_gpkg_39():
     ds = gdal.Open('/vsimem/gpkg_39.gpkg')
     cs = ds.GetRasterBand(1).Checksum()
     if cs != 4118 and cs != 4077:
-        gdaltest.post_reason('fail')
         print(cs)
         return 'fail'
 
@@ -3243,37 +3001,30 @@ def test_gpkg_39():
     ds = gdal.Open('/vsimem/gpkg_39.gpkg', gdal.GA_Update)
     ds.BuildOverviews('NEAR', [2, 4])
     if ds.GetRasterBand(1).GetOverview(0).Checksum() != 37308:
-        gdaltest.post_reason('fail')
         print(ds.GetRasterBand(1).GetOverview(0).Checksum())
         return 'fail'
     ds.BuildOverviews('NONE', [])
     ds = gdal.Open('/vsimem/gpkg_39.gpkg')
     if ds.GetRasterBand(1).GetOverviewCount() != 0:
-        gdaltest.post_reason('fail')
         return 'fail'
 
     gdal.Translate('/vsimem/gpkg_39.gpkg', src_ds, format='GPKG', outputType=gdal.GDT_UInt16)
     ds = gdal.Open('/vsimem/gpkg_39.gpkg')
     if ds.GetRasterBand(1).DataType != gdal.GDT_UInt16:
-        gdaltest.post_reason('fail')
         return 'fail'
     if ds.GetRasterBand(1).Checksum() != 4672:
-        gdaltest.post_reason('fail')
         return 'fail'
     sql_lyr = ds.ExecuteSQL('SELECT scale, offset FROM gpkg_2d_gridded_tile_ancillary')
     f = sql_lyr.GetNextFeature()
     if f['scale'] != 1.0:
-        gdaltest.post_reason('fail')
         return 'fail'
     ds.ReleaseResultSet(sql_lyr)
 
     gdal.Translate('/vsimem/gpkg_39.gpkg', src_ds, format='GPKG', outputType=gdal.GDT_UInt16, noData=1)
     ds = gdal.Open('/vsimem/gpkg_39.gpkg')
     if ds.GetRasterBand(1).Checksum() != 4672:
-        gdaltest.post_reason('fail')
         return 'fail'
     if ds.GetRasterBand(1).GetNoDataValue() != 1.0:
-        gdaltest.post_reason('fail')
         print(ds.GetRasterBand(1).GetNoDataValue())
         return 'fail'
 
@@ -3281,11 +3032,9 @@ def test_gpkg_39():
     ds = gdal.Open('/vsimem/gpkg_39.gpkg')
     cs = ds.GetRasterBand(1).Checksum()
     if cs != 4672:
-        gdaltest.post_reason('fail')
         print(cs)
         return 'fail'
     if ds.GetRasterBand(1).GetNoDataValue() != 74.0:
-        gdaltest.post_reason('fail')
         print(ds.GetRasterBand(1).GetNoDataValue())
         return 'fail'
 
@@ -3293,56 +3042,45 @@ def test_gpkg_39():
     gdal.Translate('/vsimem/gpkg_39.gpkg', src_ds, format='GPKG')
     ds = gdal.Open('/vsimem/gpkg_39.gpkg')
     if ds.GetRasterBand(1).DataType != gdal.GDT_Float32:
-        gdaltest.post_reason('fail')
         return 'fail'
     if ds.GetRasterBand(1).Checksum() != 4672:
-        gdaltest.post_reason('fail')
         return 'fail'
     sql_lyr = ds.ExecuteSQL('SELECT scale, offset FROM gpkg_2d_gridded_tile_ancillary')
     f = sql_lyr.GetNextFeature()
     if f.GetField('scale') != 1.0:
-        gdaltest.post_reason('fail')
         return 'fail'
     ds.ReleaseResultSet(sql_lyr)
 
     gdal.Translate('/vsimem/gpkg_39.gpkg', src_ds, format='GPKG', noData=1)
     ds = gdal.Open('/vsimem/gpkg_39.gpkg')
     if ds.GetRasterBand(1).Checksum() != 4672:
-        gdaltest.post_reason('fail')
         return 'fail'
     if ds.GetRasterBand(1).GetNoDataValue() != 1:
-        gdaltest.post_reason('fail')
         return 'fail'
 
     gdal.Translate('/vsimem/gpkg_39.gpkg', src_ds, format='GPKG', creationOptions=['TILE_FORMAT=PNG'])
     ds = gdal.Open('/vsimem/gpkg_39.gpkg')
     if ds.GetRasterBand(1).DataType != gdal.GDT_Float32:
-        gdaltest.post_reason('fail')
         return 'fail'
     if ds.GetRasterBand(1).Checksum() != 4672:
-        gdaltest.post_reason('fail')
         return 'fail'
     sql_lyr = ds.ExecuteSQL('SELECT scale, offset FROM gpkg_2d_gridded_tile_ancillary')
     f = sql_lyr.GetNextFeature()
     if f['scale'] == 1.0 or not f.IsFieldSetAndNotNull('scale'):
-        gdaltest.post_reason('fail')
         return 'fail'
     ds.ReleaseResultSet(sql_lyr)
 
     gdal.Translate('/vsimem/gpkg_39.gpkg', src_ds, format='GPKG', noData=74, creationOptions=['TILE_FORMAT=PNG'])
     ds = gdal.Open('/vsimem/gpkg_39.gpkg')
     if ds.GetRasterBand(1).DataType != gdal.GDT_Float32:
-        gdaltest.post_reason('fail')
         return 'fail'
     cs = ds.GetRasterBand(1).Checksum()
     if cs != 4680:
-        gdaltest.post_reason('fail')
         print(cs)
         return 'fail'
     sql_lyr = ds.ExecuteSQL('SELECT scale, offset FROM gpkg_2d_gridded_tile_ancillary')
     f = sql_lyr.GetNextFeature()
     if f['scale'] == 1.0 or not f.IsFieldSetAndNotNull('scale'):
-        gdaltest.post_reason('fail')
         return 'fail'
     ds.ReleaseResultSet(sql_lyr)
 
@@ -3359,14 +3097,11 @@ def test_gpkg_39():
     src_ds = gdal.Open('/vsimem/gpkg_39.asc')
     ds = gdal.Open('/vsimem/gpkg_39.gpkg')
     if ds.GetRasterBand(1).DataType != gdal.GDT_Int16:
-        gdaltest.post_reason('fail')
         return 'fail'
     if ds.GetRasterBand(1).GetNoDataValue() != -32768.0:
-        gdaltest.post_reason('fail')
         print(ds.GetRasterBand(1).GetNoDataValue())
         return 'fail'
     if ds.GetRasterBand(1).Checksum() != src_ds.GetRasterBand(1).Checksum():
-        gdaltest.post_reason('fail')
         print(ds.GetRasterBand(1).GetNoDataValue())
         return 'fail'
     ds = None
@@ -3386,14 +3121,11 @@ def test_gpkg_39():
     src_ds = gdal.Open('/vsimem/gpkg_39.asc')
     ds = gdal.Open('/vsimem/gpkg_39.gpkg')
     if ds.GetRasterBand(1).DataType != gdal.GDT_UInt16:
-        gdaltest.post_reason('fail')
         return 'fail'
     if ds.GetRasterBand(1).GetNoDataValue() != 65535.0:
-        gdaltest.post_reason('fail')
         print(ds.GetRasterBand(1).GetNoDataValue())
         return 'fail'
     if ds.GetRasterBand(1).Checksum() != src_ds.GetRasterBand(1).Checksum():
-        gdaltest.post_reason('fail')
         print(ds.GetRasterBand(1).GetNoDataValue())
         return 'fail'
     ds = None
@@ -3413,14 +3145,11 @@ def test_gpkg_39():
     src_ds = gdal.Open('/vsimem/gpkg_39.asc')
     ds = gdal.Open('/vsimem/gpkg_39.gpkg')
     if ds.GetRasterBand(1).DataType != gdal.GDT_UInt16:
-        gdaltest.post_reason('fail')
         return 'fail'
     if ds.GetRasterBand(1).GetNoDataValue() != 0:
-        gdaltest.post_reason('fail')
         print(ds.GetRasterBand(1).GetNoDataValue())
         return 'fail'
     if ds.GetRasterBand(1).Checksum() != src_ds.GetRasterBand(1).Checksum():
-        gdaltest.post_reason('fail')
         print(ds.GetRasterBand(1).GetNoDataValue())
         return 'fail'
     ds = None
@@ -3444,10 +3173,8 @@ def test_gpkg_39():
     src_ds = gdal.Open('/vsimem/gpkg_39.asc')
     ds = gdal.Open('/vsimem/gpkg_39.gpkg')
     if ds.GetRasterBand(1).DataType != gdal.GDT_Float32:
-        gdaltest.post_reason('fail')
         return 'fail'
     if ds.GetRasterBand(1).Checksum() != src_ds.GetRasterBand(1).Checksum():
-        gdaltest.post_reason('fail')
         print(ds.GetRasterBand(1).GetNoDataValue())
         return 'fail'
     ds = None
@@ -3466,10 +3193,8 @@ def test_gpkg_39():
     src_ds = gdal.Open('/vsimem/gpkg_39.asc')
     ds = gdal.Open('/vsimem/gpkg_39.gpkg')
     if ds.GetRasterBand(1).DataType != gdal.GDT_Float32:
-        gdaltest.post_reason('fail')
         return 'fail'
     if ds.GetRasterBand(1).Checksum() != src_ds.GetRasterBand(1).Checksum():
-        gdaltest.post_reason('fail')
         print(ds.GetRasterBand(1).GetNoDataValue())
         return 'fail'
     ds = None
@@ -3490,7 +3215,6 @@ def test_gpkg_39():
     sql_lyr = ds.ExecuteSQL('SELECT scale, offset FROM gpkg_2d_gridded_tile_ancillary')
     f = sql_lyr.GetNextFeature()
     if f is not None:
-        gdaltest.post_reason('fail')
         return 'fail'
     ds.ReleaseResultSet(sql_lyr)
     ds = None
@@ -3508,7 +3232,6 @@ def test_gpkg_39():
     sql_lyr = ds.ExecuteSQL('SELECT * FROM gpkg_39')
     f = sql_lyr.GetNextFeature()
     if f is not None:
-        gdaltest.post_reason('fail')
         return 'fail'
     ds.ReleaseResultSet(sql_lyr)
     ds = None
@@ -3527,7 +3250,6 @@ def test_gpkg_39():
     sql_lyr = ds.ExecuteSQL('SELECT * FROM gpkg_39')
     f = sql_lyr.GetNextFeature()
     if f is not None:
-        gdaltest.post_reason('fail')
         return 'fail'
     ds.ReleaseResultSet(sql_lyr)
     ds = None
@@ -3553,14 +3275,12 @@ def test_gpkg_40():
     sql_lyr = ds.ExecuteSQL('PRAGMA application_id')
     f = sql_lyr.GetNextFeature()
     if f['application_id'] != 1196444487:
-        gdaltest.post_reason('fail')
         f.DumpReadable()
         return 'fail'
     ds.ReleaseResultSet(sql_lyr)
     sql_lyr = ds.ExecuteSQL('PRAGMA user_version')
     f = sql_lyr.GetNextFeature()
     if f['user_version'] != 10200:
-        gdaltest.post_reason('fail')
         f.DumpReadable()
         return 'fail'
     ds.ReleaseResultSet(sql_lyr)
@@ -3573,14 +3293,12 @@ def test_gpkg_40():
     sql_lyr = ds.ExecuteSQL('PRAGMA application_id')
     f = sql_lyr.GetNextFeature()
     if f['application_id'] != 1196437808:
-        gdaltest.post_reason('fail')
         f.DumpReadable()
         return 'fail'
     ds.ReleaseResultSet(sql_lyr)
     sql_lyr = ds.ExecuteSQL('PRAGMA user_version')
     f = sql_lyr.GetNextFeature()
     if f['user_version'] != 0:
-        gdaltest.post_reason('fail')
         f.DumpReadable()
         return 'fail'
     ds.ReleaseResultSet(sql_lyr)
@@ -3592,14 +3310,12 @@ def test_gpkg_40():
     sql_lyr = ds.ExecuteSQL('PRAGMA application_id')
     f = sql_lyr.GetNextFeature()
     if f['application_id'] != 1196437809:
-        gdaltest.post_reason('fail')
         f.DumpReadable()
         return 'fail'
     ds.ReleaseResultSet(sql_lyr)
     sql_lyr = ds.ExecuteSQL('PRAGMA user_version')
     f = sql_lyr.GetNextFeature()
     if f['user_version'] != 0:
-        gdaltest.post_reason('fail')
         f.DumpReadable()
         return 'fail'
     ds.ReleaseResultSet(sql_lyr)
@@ -3611,14 +3327,12 @@ def test_gpkg_40():
     sql_lyr = ds.ExecuteSQL('PRAGMA application_id')
     f = sql_lyr.GetNextFeature()
     if f['application_id'] != 1196444487:
-        gdaltest.post_reason('fail')
         f.DumpReadable()
         return 'fail'
     ds.ReleaseResultSet(sql_lyr)
     sql_lyr = ds.ExecuteSQL('PRAGMA user_version')
     f = sql_lyr.GetNextFeature()
     if f['user_version'] != 10200:
-        gdaltest.post_reason('fail')
         f.DumpReadable()
         return 'fail'
     ds.ReleaseResultSet(sql_lyr)
@@ -3667,15 +3381,12 @@ def test_gpkg_42():
     fc = sql_lyr.GetFeatureCount()
     ds.ReleaseResultSet(sql_lyr)
     if fc != 0:
-        gdaltest.post_reason('fail')
         return 'fail'
     lyr = ds.CreateLayer('test')
     if lyr is None:
-        gdaltest.post_reason('fail')
         return 'fail'
     ds.FlushCache()
     if gdal.GetLastErrorMsg() != '':
-        gdaltest.post_reason('fail')
         return 'fail'
     ds = None
 
@@ -3703,7 +3414,6 @@ def test_gpkg_43():
     fc = sql_lyr.GetFeatureCount()
     ds.ReleaseResultSet(sql_lyr)
     if fc != 0:
-        gdaltest.post_reason('fail')
         return 'fail'
     ds = None
 
@@ -3711,10 +3421,8 @@ def test_gpkg_43():
                    format='GPKG', creationOptions=['APPEND_SUBDATASET=YES'])
     ds = gdal.OpenEx('/vsimem/gpkg_43.gpkg')
     if ds.GetRasterBand(1).Checksum() != 4672:
-        gdaltest.post_reason('fail')
         return 'fail'
     if ds.GetLayerCount() != 1:
-        gdaltest.post_reason('fail')
         return 'fail'
     ds = None
 
@@ -3787,7 +3495,6 @@ def test_gpkg_46():
         count += 1
         if abs(f.GetField(1) - 40075016.6855785) > 1e-7 or \
            abs(f.GetField(2) - 40075016.6855785) > 1e-7:
-            gdaltest.post_reason('fail')
             f.DumpReadable()
             ds.ReleaseResultSet(sql_lyr)
             gdal.Unlink('/vsimem/gpkg_46.gpkg')
@@ -3798,7 +3505,6 @@ def test_gpkg_46():
     gdal.Unlink('/vsimem/gpkg_46.gpkg')
 
     if count != 23:
-        gdaltest.post_reason('fail')
         return 'fail'
 
     return 'success'
@@ -3880,7 +3586,6 @@ def test_gpkg_delete_raster_layer():
     ds = None
 
     if fc != 0:
-        gdaltest.post_reason('fail')
         print(fc)
         return 'fail'
 
@@ -3890,7 +3595,6 @@ def test_gpkg_delete_raster_layer():
     gdal.VSIFCloseL(f)
 
     if content.find('foo') >= 0:
-        gdaltest.post_reason('fail')
         return 'fail'
 
     gdal.Unlink(filename)
@@ -3920,7 +3624,6 @@ def test_gpkg_delete_gridded_coverage_raster_layer():
     gdal.VSIFCloseL(f)
 
     if content.find('foo') >= 0:
-        gdaltest.post_reason('fail')
         return 'fail'
 
     gdal.Unlink(filename)
@@ -3937,11 +3640,9 @@ def test_gpkg_open_old_gpkg_elevation_tiles_extension():
     gdal.ErrorReset()
     ds = gdal.Open('data/uint16-old-elevation-extension.gpkg')
     if gdal.GetLastErrorMsg() != '':
-        gdaltest.post_reason('fail')
         return 'fail'
     cs = ds.GetRasterBand(1).Checksum()
     if cs != 4672:
-        gdaltest.post_reason('fail')
         return 'fail'
 
     return 'success'
@@ -3982,7 +3683,6 @@ def test_gpkg_match_overview_factor():
     ds = gdal.Open('/vsimem/gpkg_match_overview_factor.gpkg', gdal.GA_Update)
     ret = ds.BuildOverviews('NONE', [2, 4, 8, 16, 32, 64, 128, 256, 512, 1024, 2048])
     if ret != 0 or gdal.GetLastErrorMsg() != '':
-        gdaltest.post_reason('fail')
         return 'fail'
     ds = None
 
diff --git a/autotest/gdrivers/grib.py b/autotest/gdrivers/grib.py
index 3ae6b47dc364..1dd1e8f77998 100755
--- a/autotest/gdrivers/grib.py
+++ b/autotest/gdrivers/grib.py
@@ -138,12 +138,10 @@ def test_grib_read_units():
     ds = gdal.Open('tmp/ds.mint.bin')
     md = ds.GetRasterBand(1).GetMetadata()
     if md['GRIB_UNIT'] != '[C]' or md['GRIB_COMMENT'] != 'Minimum temperature [C]':
-        gdaltest.post_reason('fail')
         print(md)
         return 'success'
     ds.GetRasterBand(1).ComputeStatistics(False)
     if abs(ds.GetRasterBand(1).GetMinimum() - 13) > 1:
-        gdaltest.post_reason('fail')
         print(ds.GetRasterBand(1).GetMinimum())
         return 'success'
     ds = None
@@ -155,12 +153,10 @@ def test_grib_read_units():
     gdal.SetConfigOption('GRIB_NORMALIZE_UNITS', None)
     md = ds.GetRasterBand(1).GetMetadata()
     if md['GRIB_UNIT'] != '[K]' or md['GRIB_COMMENT'] != 'Minimum temperature [K]':
-        gdaltest.post_reason('fail')
         print(md)
         return 'success'
     ds.GetRasterBand(1).ComputeStatistics(False)
     if abs(ds.GetRasterBand(1).GetMinimum() - 286) > 1:
-        gdaltest.post_reason('fail')
         print(ds.GetRasterBand(1).GetMinimum())
         return 'success'
     ds = None
@@ -748,7 +744,6 @@ def test_grib_grib2_write_creation_options():
                                     "PDS_TEMPLATE_NUMBERS=20 0 156 72 0 255 99 0 0 0 1 0 0 0 0 1 255 255 255 255 255 255 255 255 255 255 255 0extra"
                                 ])
     if out_ds is None:
-        gdaltest.post_reason('failure')
         return 'fail'
     out_ds = None
     ds = gdal.Open(tmpfilename)
@@ -770,7 +765,6 @@ def test_grib_grib2_write_creation_options():
                                     "PDS_TEMPLATE_NUMBERS=20 0 156 72 0 255 99 0 0 0 1 0 0 0 0 1 255 255 255 255 255 255 255 255 255 255"
                                 ])
     if out_ds is not None:
-        gdaltest.post_reason('failure')
         return 'fail'
     gdal.Unlink(tmpfilename)
 
@@ -799,7 +793,6 @@ def test_grib_grib2_write_creation_options():
                                     "PDS_TEMPLATE_ASSEMBLED_VALUES=20 0 40008 0 255 99 0 0 1 0 1 -127 -2147483647 255 -127 -2147483647 0extra"
                                 ])
     if out_ds is None:
-        gdaltest.post_reason('failure')
         return 'fail'
     out_ds = None
     ds = gdal.Open(tmpfilename)
@@ -821,7 +814,6 @@ def test_grib_grib2_write_creation_options():
                                     "PDS_TEMPLATE_ASSEMBLED_VALUES=20 0 40008 0 255 99 0 0 1 0 1 -127 -2147483647 255 -127"
                                 ])
     if out_ds is not None:
-        gdaltest.post_reason('failure')
         return 'fail'
     gdal.Unlink(tmpfilename)
 
@@ -850,7 +842,6 @@ def test_grib_grib2_write_creation_options():
                                     "PDS_TEMPLATE_ASSEMBLED_VALUES=5 7 2 0 0 0 0 1 0 2 31 285 17292 2 61145 31 285 17292 2"
                                 ])
     if out_ds is not None:
-        gdaltest.post_reason('failure')
         return 'fail'
     gdal.Unlink(tmpfilename)
 
@@ -897,7 +888,6 @@ def test_grib_grib2_write_creation_options():
                                     "PDS_TEMPLATE_NUMBERS=1 2 3 4 5"
                                 ])
     if out_ds is None:
-        gdaltest.post_reason('failure')
         return 'fail'
     out_ds = None
     with gdaltest.error_handler():
@@ -920,7 +910,6 @@ def test_grib_grib2_write_creation_options():
                                     "PDS_TEMPLATE_ASSEMBLED_VALUES=1 2 3 4 5"
                                 ])
     if out_ds is not None:
-        gdaltest.post_reason('failure')
         return 'fail'
     gdal.Unlink(tmpfilename)
 
@@ -931,7 +920,6 @@ def test_grib_grib2_write_creation_options():
                                     "PDS_PDTN=32"
                                 ])
     if out_ds is not None:
-        gdaltest.post_reason('failure')
         return 'fail'
     gdal.Unlink(tmpfilename)
 
@@ -943,7 +931,6 @@ def test_grib_grib2_write_creation_options():
                                     "PDS_TEMPLATE_NUMBERS=-1 256 0 0 0 0"
                                 ])
     if out_ds is None:
-        gdaltest.post_reason('failure')
         return 'fail'
     out_ds = None
     gdal.Unlink(tmpfilename)
@@ -957,7 +944,6 @@ def test_grib_grib2_write_creation_options():
                                     "PDS_TEMPLATE_ASSEMBLED_VALUES=-1 256 -1 1 128 4000000000 -1 -4 1 1 1 65536 1 1 32768 1 -129 -4 1 -1 -4"
                                 ])
     if out_ds is None:
-        gdaltest.post_reason('failure')
         return 'fail'
     out_ds = None
     gdal.Unlink(tmpfilename)
@@ -971,7 +957,6 @@ def test_grib_grib2_write_creation_options():
                                     "PDS_TEMPLATE_ASSEMBLED_VALUES=20 0 40008 0 255 99 0 0 1 0 1 -127 -2147483647 255 -127 -2147483647"
                                 ])
     if out_ds is not None:
-        gdaltest.post_reason('failure')
         return 'fail'
     gdal.Unlink(tmpfilename)
 
@@ -1032,7 +1017,6 @@ def test_grib_grib2_write_projections():
     out_ds = None
     gdal.Unlink(tmpfilename)
     if wkt.find('SPHEROID["GRS80",6378137,298.257222101]') < 0:
-        gdaltest.post_reason('fail')
         print(wkt)
         return 'fail'
 
@@ -1553,7 +1537,6 @@ def test_grib_grib2_write_nodata():
 
         ds = gdal.Open(tmpfilename)
         if ds.GetRasterBand(1).GetNoDataValue() != 123:
-            gdaltest.post_reason('fail')
             return 'fail'
         ds = None
         gdal.Unlink(tmpfilename)
diff --git a/autotest/gdrivers/hdf5.py b/autotest/gdrivers/hdf5.py
index 756ce5546898..2d40182dd629 100755
--- a/autotest/gdrivers/hdf5.py
+++ b/autotest/gdrivers/hdf5.py
@@ -324,7 +324,6 @@ def test_hdf5_10():
     gdal.ErrorReset()
     ds = gdal.Open('HDF5:"data/CSK_DGM.h5"://S01/QLK')
     if ds is None or gdal.GetLastErrorMsg() != '':
-        gdaltest.post_reason('fail')
         return 'fail'
     ds = None
 
@@ -332,17 +331,14 @@ def test_hdf5_10():
     got_gcpprojection = ds.GetGCPProjection()
     if got_gcpprojection.find('GEOGCS["WGS 84",DATUM["WGS_1984"') != 0:
         print(got_gcpprojection)
-        gdaltest.post_reason('fail')
         return 'fail'
 
     got_gcps = ds.GetGCPs()
     if len(got_gcps) != 4:
-        gdaltest.post_reason('fail')
         return 'fail'
 
     if abs(got_gcps[0].GCPPixel - 0) > 1e-5 or abs(got_gcps[0].GCPLine - 0) > 1e-5 or \
        abs(got_gcps[0].GCPX - 12.2395902509238) > 1e-5 or abs(got_gcps[0].GCPY - 44.7280047434954) > 1e-5:
-        gdaltest.post_reason('fail')
         return 'fail'
 
     ds = None
@@ -362,7 +358,6 @@ def test_hdf5_11():
     gdal.ErrorReset()
     ds = gdal.Open('HDF5:"data/CSK_GEC.h5"://S01/QLK')
     if ds is None or gdal.GetLastErrorMsg() != '':
-        gdaltest.post_reason('fail')
         return 'fail'
     ds = None
 
@@ -370,7 +365,6 @@ def test_hdf5_11():
     got_projection = ds.GetProjection()
     if got_projection.find('PROJCS["Transverse_Mercator",GEOGCS["WGS 84",DATUM["WGS_1984"') != 0:
         print(got_projection)
-        gdaltest.post_reason('fail')
         return 'fail'
 
     got_gt = ds.GetGeoTransform()
@@ -378,7 +372,6 @@ def test_hdf5_11():
     for i in range(6):
         if abs(got_gt[i] - expected_gt[i]) > 1e-5:
             print(got_gt)
-            gdaltest.post_reason('fail')
             return 'fail'
 
     ds = None
@@ -402,7 +395,6 @@ def test_hdf5_12():
     got_projection = ds.GetProjection()
     if got_projection.find('Azimuthal_Equidistant') < 0:
         print(got_projection)
-        gdaltest.post_reason('fail')
         return 'fail'
 
     got_gt = ds.GetGeoTransform()
@@ -413,7 +405,6 @@ def test_hdf5_12():
     if max([abs(got_gt[i] - expected_gt[i]) for i in range(6)]) > 1e-5 and \
        max([abs(got_gt[i] - expected_gt2[i]) for i in range(6)]) > 1e-5:
         print(got_gt)
-        gdaltest.post_reason('fail')
         return 'fail'
 
     return 'success'
@@ -431,12 +422,10 @@ def test_hdf5_13():
 
     got_gcps = ds.GetGCPs()
     if len(got_gcps) != 3030:
-        gdaltest.post_reason('fail')
         return 'fail'
 
     if abs(got_gcps[0].GCPPixel - 0.5) > 1e-5 or abs(got_gcps[0].GCPLine - 0.5) > 1e-5 or \
        abs(got_gcps[0].GCPX - 33.1655693) > 1e-5 or abs(got_gcps[0].GCPY - 39.3207207) > 1e-5:
-        gdaltest.post_reason('fail')
         print(got_gcps[0])
         return 'fail'
 
diff --git a/autotest/gdrivers/ignfheightasciigrid.py b/autotest/gdrivers/ignfheightasciigrid.py
index 386b38965d59..938c9be2ef4d 100755
--- a/autotest/gdrivers/ignfheightasciigrid.py
+++ b/autotest/gdrivers/ignfheightasciigrid.py
@@ -112,10 +112,8 @@ def test_ignfheightasciigrid_invalid():
     gdal.FileFromMemBuffer(filename, ok_content)
     ds = gdal.OpenEx(filename)
     if not ds:
-        gdaltest.post_reason('fail')
         return 'fail'
     if ds.GetRasterBand(1).GetUnitType() != 'm':
-        gdaltest.post_reason('fail')
         return 'fail'
     gdal.Unlink(filename)
 
@@ -151,7 +149,6 @@ def test_ignfheightasciigrid_invalid():
         gdal.FileFromMemBuffer(filename, content)
         with gdaltest.error_handler():
             if gdal.OpenEx(filename, gdal.OF_RASTER):
-                gdaltest.post_reason('fail')
                 print(content)
                 return 'fail'
         gdal.Unlink(filename)
@@ -185,7 +182,6 @@ def test_ignfheightasciigrid_gra():
 
     ds = gdal.OpenEx('data/ignfheightasciigrid.gra', gdal.OF_RASTER)
     if ds.GetRasterBand(1).GetNoDataValue() != 9999:
-        gdaltest.post_reason('fail')
         return 'fail'
     return 'success'
 
@@ -203,7 +199,6 @@ def test_ignfheightasciigrid_gra_invalid():
         gdal.FileFromMemBuffer(filename, content)
         with gdaltest.error_handler():
             if gdal.OpenEx(filename, gdal.OF_RASTER):
-                gdaltest.post_reason('fail')
                 print(content)
                 return 'fail'
         gdal.Unlink(filename)
diff --git a/autotest/gdrivers/ingr.py b/autotest/gdrivers/ingr.py
index d2ad420dfd66..d081e02d5407 100755
--- a/autotest/gdrivers/ingr.py
+++ b/autotest/gdrivers/ingr.py
@@ -222,7 +222,6 @@ def test_ingr_17():
     gdal.GetDriverByName('INGR').Delete('/vsimem/ingr_17.rle')
 
     if got_cs != ref_cs:
-        gdaltest.post_reason('fail')
         print(got_cs)
         print(ref_cs)
         return 'fail'
@@ -247,7 +246,6 @@ def test_ingr_18():
     got_data = ds.ReadRaster(0, ds.RasterYSize - 1, ds.RasterXSize, 1)
 
     if got_data != expected_data:
-        gdaltest.post_reason('fail')
         return 'fail'
 
     ds.FlushCache()
@@ -255,7 +253,6 @@ def test_ingr_18():
     got_data = ds.ReadRaster(0, ds.RasterYSize - 1, ds.RasterXSize, 1)
 
     if got_data != expected_data:
-        gdaltest.post_reason('fail')
         return 'fail'
 
     return 'success'
diff --git a/autotest/gdrivers/iris.py b/autotest/gdrivers/iris.py
index ffc6647202a5..80dfacc7544b 100755
--- a/autotest/gdrivers/iris.py
+++ b/autotest/gdrivers/iris.py
@@ -52,7 +52,6 @@ def test_iris_2():
 
     ds = gdal.Open('data/iristest.dat')
     if ds.GetRasterBand(1).Checksum() != 52872:
-        gdaltest.post_reason('fail')
         return 'fail'
 
     ds.GetProjectionRef()
@@ -75,7 +74,6 @@ def test_iris_2():
     for i in range(6):
         if (expected_gt[i] == 0.0 and got_gt[i] != 0.0) or \
            (expected_gt[i] != 0.0 and abs(got_gt[i] - expected_gt[i]) / abs(expected_gt[i]) > 1e-5):
-            gdaltest.post_reason('fail')
             print(got_gt)
             print(i)
             return 'fail'
diff --git a/autotest/gdrivers/isis.py b/autotest/gdrivers/isis.py
index f7308f9d1de0..6daaf0f71c3c 100755
--- a/autotest/gdrivers/isis.py
+++ b/autotest/gdrivers/isis.py
@@ -120,25 +120,20 @@ def test_isis_4():
                              delete_copy=0)
     ds = gdal.Open('/vsimem/isis_tmp.lbl')
     if ds.GetMetadataDomainList() != ['', 'json:ISIS3']:
-        gdaltest.post_reason('fail')
         print(ds.GetMetadataDomainList())
         return 'fail'
     lbl = ds.GetMetadata_List('json:ISIS3')[0]
     # Couldn't be preserved, since points to dangling file
     if lbl.find('OriginalLabel') >= 0:
-        gdaltest.post_reason('fail')
         print(lbl)
         return 'fail'
     if lbl.find('PositiveWest') >= 0:
-        gdaltest.post_reason('fail')
         print(lbl)
         return 'fail'
     if ds.GetRasterBand(1).GetMaskFlags() != 0:
-        gdaltest.post_reason('fail')
         print(ds.GetRasterBand(1).GetMaskFlags())
         return 'fail'
     if ds.GetRasterBand(1).GetMaskBand().Checksum() != 12220:
-        gdaltest.post_reason('fail')
         print(ds.GetRasterBand(1).GetMaskBand().Checksum())
         return 'fail'
     ds = None
@@ -152,11 +147,9 @@ def test_isis_4():
     ds = gdal.Open('/vsimem/isis_tmp.lbl')
     lbl = ds.GetMetadata_List('json:ISIS3')[0]
     if lbl.find('PositiveWest') < 0:
-        gdaltest.post_reason('fail')
         print(lbl)
         return 'fail'
     if lbl.find('Planetographic') < 0:
-        gdaltest.post_reason('fail')
         print(lbl)
         return 'fail'
     ds = None
@@ -173,15 +166,12 @@ def test_isis_4():
     ds = gdal.Open('/vsimem/isis_tmp.lbl')
     lbl = ds.GetMetadata_List('json:ISIS3')[0]
     if lbl.find('PositiveEast') < 0:
-        gdaltest.post_reason('fail')
         print(lbl)
         return 'fail'
     if lbl.find('Planetocentric') < 0:
-        gdaltest.post_reason('fail')
         print(lbl)
         return 'fail'
     if lbl.find('my_label') < 0:
-        gdaltest.post_reason('fail')
         print(lbl)
         return 'fail'
     ds = None
@@ -200,12 +190,10 @@ def test_isis_5():
     ret = tst.testCreateCopy(new_filename='/vsimem/isis_tmp.lbl',
                              delete_copy=0)
     if gdal.VSIStatL('/vsimem/isis_tmp.cub') is not None:
-        gdaltest.post_reason('fail')
         return 'fail'
     ds = gdal.Open('/vsimem/isis_tmp.lbl')
     lbl = ds.GetMetadata_List('json:ISIS3')[0]
     if lbl.find('MinimumLongitude') >= 0:
-        gdaltest.post_reason('fail')
         print(lbl)
         return 'fail'
     ds = None
@@ -224,24 +212,20 @@ def test_isis_6():
     ret = tst.testCreateCopy(new_filename='/vsimem/isis_tmp.lbl',
                              delete_copy=0)
     if gdal.VSIStatL('/vsimem/isis_tmp.cub') is None:
-        gdaltest.post_reason('fail')
         return 'fail'
     f = gdal.VSIFOpenL('/vsimem/isis_tmp.lbl', 'rb')
     content = gdal.VSIFReadL(1, 10000, f).decode('ASCII')
     gdal.VSIFCloseL(f)
     if content.find('#my comment') < 0:
-        gdaltest.post_reason('fail')
         print(content)
         return 'fail'
     if len(content) == 10000:
-        gdaltest.post_reason('fail')
         return 'fail'
     ds = gdal.Open('/vsimem/isis_tmp.lbl', gdal.GA_Update)
     ds.GetRasterBand(1).Fill(0)
     ds = None
     ds = gdal.Open('/vsimem/isis_tmp.lbl')
     if ds.GetRasterBand(1).Checksum() != 0:
-        gdaltest.post_reason('fail')
         return 'fail'
     ds = None
     gdal.GetDriverByName('ISIS3').Delete('/vsimem/isis_tmp.lbl')
@@ -258,12 +242,10 @@ def test_isis_7():
     ret = tst.testCreateCopy(new_filename='/vsimem/isis_tmp.lbl',
                              delete_copy=0)
     if gdal.VSIStatL('/vsimem/isis_tmp.tif') is None:
-        gdaltest.post_reason('fail')
         return 'fail'
     ds = gdal.Open('/vsimem/isis_tmp.lbl')
     lbl = ds.GetMetadata_List('json:ISIS3')[0]
     if lbl.find('"Format":"BandSequential"') < 0:
-        gdaltest.post_reason('fail')
         print(lbl)
         return 'fail'
     ds = None
@@ -277,12 +259,10 @@ def test_isis_7():
     ret = tst.testCreateCopy(new_filename='/vsimem/isis_tmp.lbl',
                              delete_copy=0)
     if gdal.VSIStatL('/vsimem/isis_tmp.tif') is None:
-        gdaltest.post_reason('fail')
         return 'fail'
     ds = gdal.Open('/vsimem/isis_tmp.lbl')
     lbl = ds.GetMetadata_List('json:ISIS3')[0]
     if lbl.find('"Format":"GeoTIFF"') < 0:
-        gdaltest.post_reason('fail')
         print(lbl)
         return 'fail'
     ds = None
@@ -302,12 +282,10 @@ def test_isis_8():
     ret = tst.testCreateCopy(new_filename='/vsimem/isis_tmp.lbl',
                              delete_copy=0)
     if gdal.VSIStatL('/vsimem/isis_tmp.tif') is None:
-        gdaltest.post_reason('fail')
         return 'fail'
     ds = gdal.Open('/vsimem/isis_tmp.lbl')
     lbl = ds.GetMetadata_List('json:ISIS3')[0]
     if lbl.find('"Format":"GeoTIFF"') < 0:
-        gdaltest.post_reason('fail')
         print(lbl)
         return 'fail'
     ds = None
@@ -316,7 +294,6 @@ def test_isis_8():
     ds = None
     ds = gdal.Open('/vsimem/isis_tmp.lbl')
     if ds.GetRasterBand(1).Checksum() != 0:
-        gdaltest.post_reason('fail')
         return 'fail'
     ds = None
     gdal.GetDriverByName('ISIS3').Delete('/vsimem/isis_tmp.lbl')
@@ -335,19 +312,16 @@ def test_isis_9():
     ret = tst.testCreateCopy(new_filename='/vsimem/isis_tmp.lbl',
                              delete_copy=0)
     if gdal.VSIStatL('/vsimem/foo.bin') is None:
-        gdaltest.post_reason('fail')
         return 'fail'
     ds = gdal.Open('/vsimem/isis_tmp.lbl')
     lbl = ds.GetMetadata_List('json:ISIS3')[0]
     if lbl.find('"Format":"Tile"') < 0 or lbl.find('"TileSamples":256') < 0 or \
        lbl.find('"TileLines":256') < 0:
-        gdaltest.post_reason('fail')
         print(lbl)
         return 'fail'
     ds = None
     gdal.GetDriverByName('ISIS3').Delete('/vsimem/isis_tmp.lbl')
     if gdal.VSIStatL('/vsimem/foo.bin') is not None:
-        gdaltest.post_reason('fail')
         return 'fail'
     return 'success'
 
@@ -366,13 +340,11 @@ def test_isis_10():
                              delete_copy=0)
     ds = gdal.Open('/vsimem/foo.tif')
     if ds.GetRasterBand(1).GetBlockSize() != [16, 32]:
-        gdaltest.post_reason('fail')
         print(ds.GetRasterBand(1).GetBlockSize())
         return 'fail'
     ds = None
     gdal.GetDriverByName('ISIS3').Delete('/vsimem/isis_tmp.lbl')
     if gdal.VSIStatL('/vsimem/foo.tif') is not None:
-        gdaltest.post_reason('fail')
         return 'fail'
     return 'success'
 
@@ -390,7 +362,6 @@ def test_isis_11():
                              delete_copy=0)
     ds = gdal.Open('/vsimem/isis_tmp.tif')
     if ds.GetRasterBand(1).GetBlockSize() != [256, 256]:
-        gdaltest.post_reason('fail')
         print(ds.GetRasterBand(1).GetBlockSize())
         return 'fail'
     ds = None
@@ -409,7 +380,6 @@ def test_isis_12():
         cs = ds.GetRasterBand(i + 1).Checksum()
         expected_cs = src_ds.GetRasterBand(i + 1).Checksum()
         if cs != expected_cs:
-            gdaltest.post_reason('fail')
             print(i + 1, cs, expected_cs)
             return 'fail'
     ds = None
@@ -430,7 +400,6 @@ def test_isis_13():
         cs = ds.GetRasterBand(i + 1).Checksum()
         expected_cs = src_ds.GetRasterBand(i + 1).Checksum()
         if cs != expected_cs:
-            gdaltest.post_reason('fail')
             print(i + 1, cs, expected_cs)
             return 'fail'
     ds = None
@@ -450,7 +419,6 @@ def test_isis_14():
         cs = ds.GetRasterBand(i + 1).Checksum()
         expected_cs = src_ds.GetRasterBand(i + 1).Checksum()
         if cs != expected_cs:
-            gdaltest.post_reason('fail')
             print(i + 1, cs, expected_cs)
             return 'fail'
     ds = None
@@ -471,7 +439,6 @@ def test_isis_15():
         cs = ds.GetRasterBand(i + 1).Checksum()
         expected_cs = src_ds.GetRasterBand(i + 1).Checksum()
         if cs != expected_cs:
-            gdaltest.post_reason('fail')
             print(i + 1, cs, expected_cs)
             return 'fail'
     ds = None
@@ -505,27 +472,21 @@ def test_isis_16():
                 ds = None
                 ds = gdal.Open('/vsimem/isis_tmp.lbl')
                 if ds.GetRasterBand(1).Checksum() != cs:
-                    gdaltest.post_reason('fail')
                     print(dt, cs, nd, options, init_nd, ds.GetRasterBand(1).Checksum())
                     return 'fail'
                 if ds.GetRasterBand(1).GetMaskFlags() != 0:
-                    gdaltest.post_reason('fail')
                     print(dt, cs, nd, options, init_nd, ds.GetRasterBand(1).GetMaskFlags())
                     return 'fail'
                 if ds.GetRasterBand(1).GetMaskBand().Checksum() != 0:
-                    gdaltest.post_reason('fail')
                     print(dt, cs, nd, options, init_nd, ds.GetRasterBand(1).GetMaskBand().Checksum())
                     return 'fail'
                 if ds.GetRasterBand(1).GetOffset() != 10:
-                    gdaltest.post_reason('fail')
                     print(dt, cs, nd, options, init_nd, ds.GetRasterBand(1).GetOffset())
                     return 'fail'
                 if ds.GetRasterBand(1).GetScale() != 20:
-                    gdaltest.post_reason('fail')
                     print(dt, cs, nd, options, init_nd, ds.GetRasterBand(1).GetScale())
                     return 'fail'
                 if ds.GetRasterBand(1).GetNoDataValue() != nd:
-                    gdaltest.post_reason('fail')
                     print(dt, cs, nd, options, init_nd, ds.GetRasterBand(1).GetNoDataValue())
                     return 'fail'
                 ds = None
@@ -556,7 +517,6 @@ def test_isis_18():
     wkt = ds.GetProjectionRef()
     ds = None
     if not osr.SpatialReference(wkt).IsSame(osr.SpatialReference('PROJCS["Equirectangular DATUM_NAME",GEOGCS["GCS_DATUM_NAME",DATUM["D_DATUM_NAME",SPHEROID["DATUM_NAME_localRadius",123455.2424988797,0]],PRIMEM["Reference_Meridian",0],UNIT["degree",0.0174532925199433]],PROJECTION["Equirectangular"],PARAMETER["latitude_of_origin",0],PARAMETER["central_meridian",1],PARAMETER["standard_parallel_1",2],PARAMETER["false_easting",0],PARAMETER["false_northing",0]]')):
-        gdaltest.post_reason('fail')
         print(wkt)
         return 'fail'
 
@@ -573,7 +533,6 @@ def test_isis_18():
     wkt = ds.GetProjectionRef()
     ds = None
     if not osr.SpatialReference(wkt).IsSame(osr.SpatialReference('PROJCS["Equirectangular DATUM_NAME",GEOGCS["GCS_DATUM_NAME",DATUM["D_DATUM_NAME",SPHEROID["DATUM_NAME_localRadius",123455.2424988797,0]],PRIMEM["Reference_Meridian",0],UNIT["degree",0.0174532925199433]],PROJECTION["Equirectangular"],PARAMETER["latitude_of_origin",0],PARAMETER["central_meridian",1],PARAMETER["standard_parallel_1",2],PARAMETER["false_easting",0],PARAMETER["false_northing",0]]')):
-        gdaltest.post_reason('fail')
         print(wkt)
         return 'fail'
 
@@ -587,7 +546,6 @@ def test_isis_18():
     wkt = ds.GetProjectionRef()
     ds = None
     if not osr.SpatialReference(wkt).IsSame(osr.SpatialReference('PROJCS["Orthographic DATUM_NAME",GEOGCS["GCS_DATUM_NAME",DATUM["D_DATUM_NAME",SPHEROID["DATUM_NAME",123456,0]],PRIMEM["Reference_Meridian",0],UNIT["degree",0.0174532925199433]],PROJECTION["Orthographic"],PARAMETER["latitude_of_origin",1],PARAMETER["central_meridian",2],PARAMETER["false_easting",0],PARAMETER["false_northing",0]]')):
-        gdaltest.post_reason('fail')
         print(wkt)
         return 'fail'
 
@@ -601,7 +559,6 @@ def test_isis_18():
     wkt = ds.GetProjectionRef()
     ds = None
     if not osr.SpatialReference(wkt).IsSame(osr.SpatialReference('PROJCS["Sinusoidal DATUM_NAME",GEOGCS["GCS_DATUM_NAME",DATUM["D_DATUM_NAME",SPHEROID["DATUM_NAME",123456,0]],PRIMEM["Reference_Meridian",0],UNIT["degree",0.0174532925199433]],PROJECTION["Sinusoidal"],PARAMETER["longitude_of_center",1],PARAMETER["false_easting",0],PARAMETER["false_northing",0]]')):
-        gdaltest.post_reason('fail')
         print(wkt)
         return 'fail'
 
@@ -615,7 +572,6 @@ def test_isis_18():
     wkt = ds.GetProjectionRef()
     ds = None
     if not osr.SpatialReference(wkt).IsSame(osr.SpatialReference('PROJCS["Mercator DATUM_NAME",GEOGCS["GCS_DATUM_NAME",DATUM["D_DATUM_NAME",SPHEROID["DATUM_NAME",123456,0]],PRIMEM["Reference_Meridian",0],UNIT["degree",0.0174532925199433]],PROJECTION["Mercator_1SP"],PARAMETER["latitude_of_origin",1],PARAMETER["central_meridian",2],PARAMETER["scale_factor",0.9],PARAMETER["false_easting",0],PARAMETER["false_northing",0]]')):
-        gdaltest.post_reason('fail')
         print(wkt)
         return 'fail'
 
@@ -629,7 +585,6 @@ def test_isis_18():
     wkt = ds.GetProjectionRef()
     ds = None
     if not osr.SpatialReference(wkt).IsSame(osr.SpatialReference('PROJCS["PolarStereographic DATUM_NAME",GEOGCS["GCS_DATUM_NAME",DATUM["D_DATUM_NAME",SPHEROID["DATUM_NAME_polarRadius",122838.72,0]],PRIMEM["Reference_Meridian",0],UNIT["degree",0.0174532925199433]],PROJECTION["Polar_Stereographic"],PARAMETER["latitude_of_origin",1],PARAMETER["central_meridian",2],PARAMETER["scale_factor",0.9],PARAMETER["false_easting",0],PARAMETER["false_northing",0]]')):
-        gdaltest.post_reason('fail')
         print(wkt)
         return 'fail'
 
@@ -643,7 +598,6 @@ def test_isis_18():
     wkt = ds.GetProjectionRef()
     ds = None
     if not osr.SpatialReference(wkt).IsSame(osr.SpatialReference('PROJCS["TransverseMercator DATUM_NAME",GEOGCS["GCS_DATUM_NAME",DATUM["D_DATUM_NAME",SPHEROID["DATUM_NAME",123456,0]],PRIMEM["Reference_Meridian",0],UNIT["degree",0.0174532925199433]],PROJECTION["Transverse_Mercator"],PARAMETER["latitude_of_origin",1],PARAMETER["central_meridian",2],PARAMETER["scale_factor",0.9],PARAMETER["false_easting",0],PARAMETER["false_northing",0]]')):
-        gdaltest.post_reason('fail')
         print(wkt)
         return 'fail'
 
@@ -657,7 +611,6 @@ def test_isis_18():
     wkt = ds.GetProjectionRef()
     ds = None
     if not osr.SpatialReference(wkt).IsSame(osr.SpatialReference('PROJCS["LambertConformal DATUM_NAME",GEOGCS["GCS_DATUM_NAME",DATUM["D_DATUM_NAME",SPHEROID["DATUM_NAME",123456,0]],PRIMEM["Reference_Meridian",0],UNIT["degree",0.0174532925199433]],PROJECTION["Lambert_Conformal_Conic_2SP"],PARAMETER["standard_parallel_1",1],PARAMETER["standard_parallel_2",2],PARAMETER["latitude_of_origin",3],PARAMETER["central_meridian",4],PARAMETER["false_easting",0],PARAMETER["false_northing",0]]')):
-        gdaltest.post_reason('fail')
         print(wkt)
         return 'fail'
 
@@ -674,27 +627,21 @@ def test_isis_18():
     ds = gdal.Open('/vsimem/isis_tmp.lbl')
     lbl = ds.GetMetadata_List('json:ISIS3')[0]
     if lbl.find('"TargetName":"my_target"') < 0:
-        gdaltest.post_reason('fail')
         print(lbl)
         return 'fail'
     if lbl.find('"LatitudeType":"Planetographic"') < 0:
-        gdaltest.post_reason('fail')
         print(lbl)
         return 'fail'
     if lbl.find('"MinimumLatitude":2.5') < 0:
-        gdaltest.post_reason('fail')
         print(lbl)
         return 'fail'
     if lbl.find('"MinimumLongitude":1.5') < 0:
-        gdaltest.post_reason('fail')
         print(lbl)
         return 'fail'
     if lbl.find('"MaximumLatitude":4.5') < 0:
-        gdaltest.post_reason('fail')
         print(lbl)
         return 'fail'
     if lbl.find('"MaximumLongitude":3.5') < 0:
-        gdaltest.post_reason('fail')
         print(lbl)
         return 'fail'
     ds = None
@@ -709,27 +656,21 @@ def test_isis_18():
     ds = gdal.Open('/vsimem/isis_tmp.lbl')
     lbl = ds.GetMetadata_List('json:ISIS3')[0]
     if lbl.find('"LongitudeDirection":"PositiveWest"') < 0:
-        gdaltest.post_reason('fail')
         print(lbl)
         return 'fail'
     if lbl.find('"LongitudeDomain":180') < 0:
-        gdaltest.post_reason('fail')
         print(lbl)
         return 'fail'
     if lbl.find('"MinimumLatitude":-60') < 0:
-        gdaltest.post_reason('fail')
         print(lbl)
         return 'fail'
     if lbl.find('"MinimumLongitude":-110') < 0:
-        gdaltest.post_reason('fail')
         print(lbl)
         return 'fail'
     if lbl.find('"MaximumLatitude":40') < 0:
-        gdaltest.post_reason('fail')
         print(lbl)
         return 'fail'
     if lbl.find('"MaximumLongitude":-10') < 0:
-        gdaltest.post_reason('fail')
         print(lbl)
         return 'fail'
     ds = None
@@ -744,27 +685,21 @@ def test_isis_18():
     ds = gdal.Open('/vsimem/isis_tmp.lbl')
     lbl = ds.GetMetadata_List('json:ISIS3')[0]
     if lbl.find('"MinimumLatitude":-60') < 0:
-        gdaltest.post_reason('fail')
         print(lbl)
         return 'fail'
     if lbl.find('"MinimumLongitude":90') < 0:
-        gdaltest.post_reason('fail')
         print(lbl)
         return 'fail'
     if lbl.find('"MaximumLatitude":40') < 0:
-        gdaltest.post_reason('fail')
         print(lbl)
         return 'fail'
     if lbl.find('"MaximumLongitude":350') < 0:
-        gdaltest.post_reason('fail')
         print(lbl)
         return 'fail'
     if lbl.find('"UpperLeftCornerX":-21547') < 0:
-        gdaltest.post_reason('fail')
         print(lbl)
         return 'fail'
     if lbl.find('"UpperLeftCornerY":86188') < 0:
-        gdaltest.post_reason('fail')
         print(lbl)
         return 'fail'
     ds = None
@@ -781,14 +716,12 @@ def test_isis_19():
     ds = gdal.Open('data/isis3_detached.lbl')
     res = gdal.Info(ds, format='json', extraMDDomains=['json:ISIS3'])
     if res['metadata']['json:ISIS3']['IsisCube']['_type'] != 'object':
-        gdaltest.post_reason('fail')
         print(res)
         return 'fail'
 
     ds = gdal.Open('data/isis3_detached.lbl')
     res = gdal.Info(ds, extraMDDomains=['json:ISIS3'])
     if res.find('IsisCube') < 0:
-        gdaltest.post_reason('fail')
         print(res)
         return 'fail'
 
@@ -805,7 +738,6 @@ def test_isis_20():
     ds = gdal.Open('/vsimem/isis_tmp.lbl')
     lbl = ds.GetMetadata_List('json:ISIS3')[0]
     if lbl.find('AMadeUpValue') < 0:
-        gdaltest.post_reason('fail')
         print(lbl)
         return 'fail'
     ds = None
@@ -823,12 +755,10 @@ def test_isis_21():
                   format='ISIS3')
     ds = gdal.Open('/vsimem/isis_tmp.lbl')
     if ds.GetRasterBand(1).Checksum() != 9978:
-        gdaltest.post_reason('fail')
         print(ds.GetRasterBand(1).Checksum())
         return 'fail'
     lbl = ds.GetMetadata_List('json:ISIS3')[0]
     if lbl.find('AMadeUpValue') < 0:
-        gdaltest.post_reason('fail')
         print(lbl)
         return 'fail'
     ds = None
@@ -846,7 +776,6 @@ def test_isis_22():
     js = """invalid"""
     with gdaltest.error_handler():
         if ds.SetMetadata([js], 'json:ISIS3') == 0:
-            gdaltest.post_reason('fail')
             return 'fail'
     ds = None
     gdal.GetDriverByName('ISIS3').Delete('/vsimem/isis_tmp.lbl')
@@ -857,13 +786,11 @@ def test_isis_22():
     ds.SetMetadata([js], 'json:ISIS3')
     lbl = ds.GetMetadata_List('json:ISIS3')
     if lbl is None:
-        gdaltest.post_reason('fail')
         return 'fail'
     ds.SetMetadata([js], 'json:ISIS3')
     ds = None
     ds = gdal.Open('/vsimem/isis_tmp.lbl')
     if ds is None:
-        gdaltest.post_reason('fail')
         return 'fail'
     gdal.GetDriverByName('ISIS3').Delete('/vsimem/isis_tmp.lbl')
 
@@ -874,7 +801,6 @@ def test_isis_22():
     ds = None
     ds = gdal.Open('/vsimem/isis_tmp.lbl')
     if ds is None:
-        gdaltest.post_reason('fail')
         return 'fail'
     gdal.GetDriverByName('ISIS3').Delete('/vsimem/isis_tmp.lbl')
 
@@ -886,7 +812,6 @@ def test_isis_22():
     ds = None
     ds = gdal.Open('/vsimem/isis_tmp.lbl')
     if ds is None:
-        gdaltest.post_reason('fail')
         return 'fail'
     gdal.GetDriverByName('ISIS3').Delete('/vsimem/isis_tmp.lbl')
 
@@ -901,7 +826,6 @@ def test_isis_22():
 
     f = gdal.VSIFOpenL('/vsimem/isis_tmp.lbl', 'rb')
     if f is None:
-        gdaltest.post_reason('fail')
         return 'fail'
     content = gdal.VSIFReadL(1, 10000, f).decode('ASCII')
     gdal.VSIFCloseL(f)
@@ -915,7 +839,6 @@ def test_isis_22():
        content.find('baz       = 5 <M>') < 0 or \
        content.find('baw       = "with space"') < 0 or \
        content.find('very_long = aveeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeee-') < 0:
-        gdaltest.post_reason('fail')
         print(content)
         return 'fail'
 
@@ -926,7 +849,6 @@ def test_isis_22():
        lbl.find('"value":5') < 0 or lbl.find('"unit":"M"') < 0 or \
        lbl.find('"baw":"with space"') < 0 or \
        lbl.find('"very_long":"aveeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeerylooooongtext"') < 0:
-        gdaltest.post_reason('fail')
         print(lbl)
         return 'fail'
     ds = None
@@ -948,7 +870,6 @@ def test_isis_23():
                    format='ISIS3')
     ds = gdal.Open('/vsimem/isis_tmp.lbl')
     if ref_data == ds.GetRasterBand(1).ReadRaster():
-        gdaltest.post_reason('fail')
         return 'fail'
     ds = None
     gdal.GetDriverByName('ISIS3').Delete('/vsimem/isis_tmp.lbl')
@@ -957,7 +878,6 @@ def test_isis_23():
                    format='ISIS3', creationOptions=['DATA_LOCATION=GeoTIFF'])
     ds = gdal.Open('/vsimem/isis_tmp.lbl')
     if ref_data == ds.GetRasterBand(1).ReadRaster():
-        gdaltest.post_reason('fail')
         return 'fail'
     ds = None
     gdal.GetDriverByName('ISIS3').Delete('/vsimem/isis_tmp.lbl')
@@ -966,7 +886,6 @@ def test_isis_23():
                    format='ISIS3', creationOptions=['TILED=YES'])
     ds = gdal.Open('/vsimem/isis_tmp.lbl')
     if ref_data == ds.GetRasterBand(1).ReadRaster():
-        gdaltest.post_reason('fail')
         return 'fail'
     ds = None
     gdal.GetDriverByName('ISIS3').Delete('/vsimem/isis_tmp.lbl')
@@ -981,7 +900,6 @@ def test_isis_23():
                        format='ISIS3')
         ds = gdal.Open('/vsimem/isis_tmp.lbl')
         if ref_data == ds.GetRasterBand(1).ReadRaster():
-            gdaltest.post_reason('fail')
             return 'fail'
         ds = None
         gdal.GetDriverByName('ISIS3').Delete('/vsimem/isis_tmp.lbl')
@@ -1003,7 +921,6 @@ def test_isis_24():
         ds = gdal.GetDriverByName('ISIS3').Create('/vsimem/error.txt', 1, 1,
                                                   options=['DATA_LOCATION=EXTERNAL'])
     if ds is not None:
-        gdaltest.post_reason('fail')
         return 'fail'
 
     # cannot create external filename
@@ -1012,7 +929,6 @@ def test_isis_24():
                                                   options=['DATA_LOCATION=EXTERNAL',
                                                            'EXTERNAL_FILENAME=/i_dont/exist/error.cub'])
     if ds is not None:
-        gdaltest.post_reason('fail')
         return 'fail'
 
     # no GTiff driver
@@ -1032,7 +948,6 @@ def test_isis_24():
                                                   options=['DATA_LOCATION=GEOTIFF',
                                                            'EXTERNAL_FILENAME=/i_dont/exist/error.tif'])
     if ds is not None:
-        gdaltest.post_reason('fail')
         return 'fail'
     gdal.Unlink('/vsimem/error.lbl')
 
@@ -1043,7 +958,6 @@ def test_isis_24():
                                                       src_ds,
                                                       options=['DATA_LOCATION=GEOTIFF'])
     if ds is not None:
-        gdaltest.post_reason('fail')
         return 'fail'
     gdal.Unlink('/vsimem/out.tif')
 
@@ -1057,12 +971,10 @@ def test_isis_24():
     with gdaltest.error_handler():
         ds = gdal.Open('/vsimem/out.lbl')
     if ds is not None:
-        gdaltest.post_reason('fail')
         return 'fail'
     with gdaltest.error_handler():
         ds = gdal.Open('/vsimem/out.lbl', gdal.GA_Update)
     if ds is not None:
-        gdaltest.post_reason('fail')
         return 'fail'
     # Delete would fail since ds is None
     gdal.Unlink('/vsimem/out.lbl')
@@ -1078,7 +990,6 @@ def test_isis_24():
     with gdaltest.error_handler():
         ds = gdal.Open('/vsimem/out.lbl')
     if ds is not None:
-        gdaltest.post_reason('fail')
         return 'fail'
     # Delete would fail since ds is None
     gdal.Unlink('/vsimem/out.lbl')
@@ -1114,12 +1025,10 @@ def test_isis_24():
 
     gdal.FileFromMemBuffer('/vsimem/out.lbl', 'IsisCube')
     if gdal.IdentifyDriver('/vsimem/out.lbl') is None:
-        gdaltest.post_reason('fail')
         return 'fail'
     with gdaltest.error_handler():
         ds = gdal.Open('/vsimem/out.lbl')
     if ds is not None:
-        gdaltest.post_reason('fail')
         return 'fail'
     # Delete would fail since ds is None
     gdal.Unlink('/vsimem/out.lbl')
@@ -1145,7 +1054,6 @@ def test_isis_24():
     with gdaltest.error_handler():
         ds = gdal.Open('/vsimem/out.lbl')
     if ds is not None:
-        gdaltest.post_reason('fail')
         return 'fail'
     # Delete would fail since ds is None
     gdal.Unlink('/vsimem/out.lbl')
@@ -1171,7 +1079,6 @@ def test_isis_24():
     with gdaltest.error_handler():
         ds = gdal.Open('/vsimem/out.lbl')
     if ds is not None:
-        gdaltest.post_reason('fail')
         return 'fail'
     # Delete would fail since ds is None
     gdal.Unlink('/vsimem/out.lbl')
@@ -1197,7 +1104,6 @@ def test_isis_24():
     with gdaltest.error_handler():
         ds = gdal.Open('/vsimem/out.lbl')
     if ds is not None:
-        gdaltest.post_reason('fail')
         return 'fail'
     # Delete would fail since ds is None
     gdal.Unlink('/vsimem/out.lbl')
@@ -1224,7 +1130,6 @@ def test_isis_24():
     with gdaltest.error_handler():
         ds = gdal.Open('/vsimem/out.lbl')
     if ds is not None:
-        gdaltest.post_reason('fail')
         return 'fail'
     # Delete would fail since ds is None
     gdal.Unlink('/vsimem/out.lbl')
@@ -1251,7 +1156,6 @@ def test_isis_24():
     with gdaltest.error_handler():
         ds = gdal.Open('/vsimem/out.lbl')
     if ds is not None:
-        gdaltest.post_reason('fail')
         return 'fail'
     # Delete would fail since ds is None
     gdal.Unlink('/vsimem/out.lbl')
@@ -1271,7 +1175,6 @@ def test_isis_24():
     # missing Group = Pixels. This is actually valid. Assuming Real
     ds = gdal.Open('/vsimem/out.lbl')
     if ds is None:
-        gdaltest.post_reason('fail')
         return 'fail'
     # Delete would fail since ds is None
     gdal.Unlink('/vsimem/out.lbl')
@@ -1284,25 +1187,21 @@ def test_isis_24():
     with gdaltest.error_handler():
         ds = gdal.Open('/vsimem/out.lbl')
     if ds is not None:
-        gdaltest.post_reason('fail')
         return 'fail'
     gdal.GetDriverByName('GTiff').Create('/vsimem/out.tif', 2, 1)
     with gdaltest.error_handler():
         ds = gdal.Open('/vsimem/out.lbl')
     if ds is not None:
-        gdaltest.post_reason('fail')
         return 'fail'
     gdal.GetDriverByName('GTiff').Create('/vsimem/out.tif', 1, 1, 2)
     with gdaltest.error_handler():
         ds = gdal.Open('/vsimem/out.lbl')
     if ds is not None:
-        gdaltest.post_reason('fail')
         return 'fail'
     gdal.GetDriverByName('GTiff').Create('/vsimem/out.tif', 1, 1, 1, gdal.GDT_Int16)
     with gdaltest.error_handler():
         ds = gdal.Open('/vsimem/out.lbl')
     if ds is not None:
-        gdaltest.post_reason('fail')
         return 'fail'
     # Delete would fail since ds is None
     gdal.Unlink('/vsimem/out.lbl')
@@ -1316,42 +1215,36 @@ def test_isis_24():
     with gdaltest.error_handler():
         ds = gdal.Open('/vsimem/out.lbl')
     if gdal.GetLastErrorMsg() == '':
-        gdaltest.post_reason('fail')
         return 'fail'
     gdal.GetDriverByName('GTiff').Create('/vsimem/out.tif', 2, 1)
     gdal.ErrorReset()
     with gdaltest.error_handler():
         ds = gdal.Open('/vsimem/out.lbl')
     if gdal.GetLastErrorMsg() == '':
-        gdaltest.post_reason('fail')
         return 'fail'
     gdal.GetDriverByName('GTiff').Create('/vsimem/out.tif', 1, 1, 2)
     gdal.ErrorReset()
     with gdaltest.error_handler():
         ds = gdal.Open('/vsimem/out.lbl')
     if gdal.GetLastErrorMsg() == '':
-        gdaltest.post_reason('fail')
         return 'fail'
     gdal.GetDriverByName('GTiff').Create('/vsimem/out.tif', 1, 1, 1, gdal.GDT_Int16)
     gdal.ErrorReset()
     with gdaltest.error_handler():
         ds = gdal.Open('/vsimem/out.lbl')
     if gdal.GetLastErrorMsg() == '':
-        gdaltest.post_reason('fail')
         return 'fail'
     gdal.GetDriverByName('GTiff').Create('/vsimem/out.tif', 1, 1, options=['COMPRESS=LZW'])
     gdal.ErrorReset()
     with gdaltest.error_handler():
         ds = gdal.Open('/vsimem/out.lbl')
     if gdal.GetLastErrorMsg() == '':
-        gdaltest.post_reason('fail')
         return 'fail'
     gdal.GetDriverByName('GTiff').Create('/vsimem/out.tif', 1, 1, options=['TILED=YES'])
     gdal.ErrorReset()
     with gdaltest.error_handler():
         ds = gdal.Open('/vsimem/out.lbl')
     if gdal.GetLastErrorMsg() == '':
-        gdaltest.post_reason('fail')
         return 'fail'
     ds = gdal.GetDriverByName('GTiff').Create('/vsimem/out.tif', 1, 1)
     ds.GetRasterBand(1).SetNoDataValue(0)
@@ -1361,7 +1254,6 @@ def test_isis_24():
     with gdaltest.error_handler():
         ds = gdal.Open('/vsimem/out.lbl')
     if gdal.GetLastErrorMsg() == '':
-        gdaltest.post_reason('fail')
         return 'fail'
     with gdaltest.error_handler():
         gdal.GetDriverByName('ISIS3').Delete('/vsimem/out.lbl')
@@ -1373,7 +1265,6 @@ def test_isis_24():
                                                       mem_ds,
                                                       callback=cancel_cbk)
     if ds is not None:
-        gdaltest.post_reason('fail')
         return 'fail'
     # Delete would fail since ds is None
     gdal.Unlink('/vsimem/out.lbl')
@@ -1391,10 +1282,8 @@ def test_isis_25():
     gdal.GetDriverByName('ISIS3').CreateCopy('/vsimem/out.lbl', mem_ds)
     ds = gdal.Open('/vsimem/out.lbl')
     if ds.GetRasterBand(1).GetScale() != 10:
-        gdaltest.post_reason('fail')
         return 'fail'
     if ds.GetRasterBand(1).GetOffset() != 20:
-        gdaltest.post_reason('fail')
         return 'fail'
     ds = None
     gdal.GetDriverByName('ISIS3').Delete('/vsimem/out.lbl')
@@ -1472,7 +1361,6 @@ def test_isis_26():
   x = C
 End_Object
 """) < 0:
-        gdaltest.post_reason('fail')
         print(content)
         return 'fail'
 
@@ -1508,7 +1396,6 @@ def test_isis_27():
             if dst_location == 'EXTERNAL':
                 history_filename = lbl['History']['^History']
                 if history_filename != 'out2.History.IsisCube':
-                    gdaltest.post_reason('fail')
                     print(src_location)
                     print(dst_location)
                     print(content)
@@ -1521,7 +1408,6 @@ def test_isis_27():
                     gdal.VSIFCloseL(f)
 
                 if offset != 0 or size != len(history):
-                    gdaltest.post_reason('fail')
                     print(src_location)
                     print(dst_location)
                     print(content)
@@ -1529,7 +1415,6 @@ def test_isis_27():
                     return 'fail'
             else:
                 if offset + size != len(content):
-                    gdaltest.post_reason('fail')
                     print(src_location)
                     print(dst_location)
                     print(content)
@@ -1540,7 +1425,6 @@ def test_isis_27():
                     history.find('FROM = out.lbl') < 0 or \
                     history.find('TO   = out2.lbl') < 0 or \
                     history.find('TO = out.lbl') < 0:
-                gdaltest.post_reason('fail')
                 print(src_location)
                 print(dst_location)
                 print(content)
@@ -1559,7 +1443,6 @@ def test_isis_27():
         content = gdal.VSIFReadL(1, 10000, f).decode('ASCII')
         gdal.VSIFCloseL(f)
     if content.find('foo') < 0:
-        gdaltest.post_reason('fail')
         print(content)
         return 'fail'
     gdal.GetDriverByName('ISIS3').Delete('/vsimem/out.lbl')
@@ -1601,7 +1484,6 @@ def test_isis_28():
     ds = gdal.Open('/vsimem/in.lbl')
     fl = ds.GetFileList()
     if fl != ['/vsimem/in.lbl', '/vsimem/in_table']:
-        gdaltest.post_reason('fail')
         print(fl)
         return 'success'
     ds = None
@@ -1631,7 +1513,6 @@ def test_isis_28():
             if dst_location == 'EXTERNAL':
                 table_filename = lbl['Table_first_table']['^Table']
                 if table_filename != 'out.Table.first_table':
-                    gdaltest.post_reason('fail')
                     print(src_location)
                     print(dst_location)
                     print(content)
@@ -1644,7 +1525,6 @@ def test_isis_28():
                     gdal.VSIFCloseL(f)
 
                 if offset != 0 or size != 3 or size != len(table):
-                    gdaltest.post_reason('fail')
                     print(src_location)
                     print(dst_location)
                     print(content)
@@ -1652,7 +1532,6 @@ def test_isis_28():
                     return 'fail'
             else:
                 if offset + size != len(content):
-                    gdaltest.post_reason('fail')
                     print(src_location)
                     print(dst_location)
                     print(content)
@@ -1660,7 +1539,6 @@ def test_isis_28():
                 table = content[offset:]
 
             if table != 'FOO':
-                gdaltest.post_reason('fail')
                 print(src_location)
                 print(dst_location)
                 print(content)
@@ -1688,7 +1566,6 @@ def test_isis_29():
     lbl = ds.GetMetadata_List('json:ISIS3')[0]
     lbl = json.loads(lbl)
     if 'History' in lbl:
-        gdaltest.post_reason('fail')
         print(lbl)
         return 'fail'
     ds = None
@@ -1702,12 +1579,10 @@ def test_isis_29():
     lbl = ds.GetMetadata_List('json:ISIS3')[0]
     lbl = json.loads(lbl)
     if 'History' in lbl:
-        gdaltest.post_reason('fail')
         print(lbl)
         return 'fail'
     ds = None
     if gdal.VSIStatL('/vsimem/out.History.IsisCube') is not None:
-        gdaltest.post_reason('fail')
         return 'fail'
 
     gdal.GetDriverByName('ISIS3').Delete('/vsimem/out.lbl')
diff --git a/autotest/gdrivers/jp2kak.py b/autotest/gdrivers/jp2kak.py
index 2b8bb446708f..e0a8d481be81 100755
--- a/autotest/gdrivers/jp2kak.py
+++ b/autotest/gdrivers/jp2kak.py
@@ -176,7 +176,6 @@ def test_jp2kak_11():
     ds = gdal.Open('data/gtsmall_11_int16.jp2')
     cs = ds.GetRasterBand(1).Checksum()
     if cs not in (63475, 63472, 63452, 63471):
-        gdaltest.post_reason('fail')
         print(cs)
         return 'fail'
     return 'success'
@@ -194,7 +193,6 @@ def test_jp2kak_12():
     ds = gdal.Open('data/gtsmall_10_uint16.jp2')
     cs = ds.GetRasterBand(1).Checksum()
     if cs != 63360 and cs != 63357 and cs != 63358:
-        gdaltest.post_reason('fail')
         print(cs)
         return 'fail'
     return 'success'
@@ -414,7 +412,6 @@ def test_jp2kak_20():
         return 'fail'
     got_cs = fourth_band.Checksum()
     if got_cs != 8527:
-        gdaltest.post_reason('fail')
         print(got_cs)
         return 'fail'
     jp2_bands_data = ds.ReadRaster(0, 0, ds.RasterXSize, ds.RasterYSize)
@@ -436,12 +433,10 @@ def test_jp2kak_20():
     tmp_ds = None
     tiff_drv.Delete('/vsimem/jp2kak_20.tif')
     if got_cs != 8527:
-        gdaltest.post_reason('fail')
         print(got_cs)
         return 'fail'
 
     if jp2_bands_data != gtiff_bands_data:
-        gdaltest.post_reason('fail')
         return 'fail'
 
     # if jp2_fourth_band_data != gtiff_fourth_band_data:
@@ -452,7 +447,6 @@ def test_jp2kak_20():
                      open_options=['1BIT_ALPHA_PROMOTION=NO'])
     fourth_band = ds.GetRasterBand(4)
     if fourth_band.GetMetadataItem('NBITS', 'IMAGE_STRUCTURE') != '1':
-        gdaltest.post_reason('fail')
         return 'fail'
 
     return 'success'
@@ -488,7 +482,6 @@ def test_jp2kak_21():
     mem_ds.GetRasterBand(1).WriteRaster(0, 0, 40, 40, upsampled_data)
     cs = mem_ds.GetRasterBand(1).Checksum()
     if cs != ref_cs:
-        gdaltest.post_reason('fail')
         print(cs)
         print(ref_cs)
         return 'fail'
@@ -511,13 +504,11 @@ def test_jp2kak_22():
         ref_cs = src_ds.GetRasterBand(1).Checksum()
         cs = ds.GetRasterBand(1).Checksum()
         if ref_cs != cs:
-            gdaltest.post_reason('fail')
             print(i)
             print(cs)
             print(ref_cs)
             return 'fail'
         if src_ds.GetRasterBand(1).GetColorInterpretation() != ds.GetRasterBand(1).GetColorInterpretation():
-            gdaltest.post_reason('fail')
             print(i)
             return 'fail'
     ds = None
diff --git a/autotest/gdrivers/jp2lura.py b/autotest/gdrivers/jp2lura.py
index ecf612136efd..a9b112975212 100755
--- a/autotest/gdrivers/jp2lura.py
+++ b/autotest/gdrivers/jp2lura.py
@@ -206,7 +206,6 @@ def test_jp2lura_3():
 
     ds = ogr.Open('data/int16.jp2')
     if ds is not None:
-        gdaltest.post_reason('fail')
         return 'fail'
 
     return 'success'
@@ -238,11 +237,9 @@ def test_jp2lura_4(out_filename='tmp/jp2lura_4.jp2'):
     gdal.Unlink('/vsimem/jp2lura_4.vrt')
 
     if gdal.VSIStatL(out_filename + '.aux.xml') is not None:
-        gdaltest.post_reason('fail')
         return 'fail'
 
     if validate(out_filename, inspire_tg=False) == 'fail':
-        gdaltest.post_reason('fail')
         return 'fail'
 
     ds = gdal.Open(out_filename)
@@ -398,13 +395,10 @@ def DISABLED_jp2lura_10():
     out_ds = gdaltest.jp2lura_drv.CreateCopy('/vsimem/jp2lura_10.jp2', src_ds, options=['YCBCR420=YES', 'RESOLUTIONS=3'])
     maxdiff = gdaltest.compare_ds(src_ds, out_ds)
     if out_ds.GetRasterBand(1).GetColorInterpretation() != gdal.GCI_RedBand:
-        gdaltest.post_reason('fail')
         return 'fail'
     if out_ds.GetRasterBand(2).GetColorInterpretation() != gdal.GCI_GreenBand:
-        gdaltest.post_reason('fail')
         return 'fail'
     if out_ds.GetRasterBand(3).GetColorInterpretation() != gdal.GCI_BlueBand:
-        gdaltest.post_reason('fail')
         return 'fail'
     del out_ds
     src_ds = None
@@ -429,11 +423,9 @@ def DISABLED_jp2lura_11():
     ds = gdal.Open('data/stefan_full_rgba_alpha_1bit.jp2')
     fourth_band = ds.GetRasterBand(4)
     if fourth_band.GetMetadataItem('NBITS', 'IMAGE_STRUCTURE') is not None:
-        gdaltest.post_reason('fail')
         return 'fail'
     got_cs = fourth_band.Checksum()
     if got_cs != 8527:
-        gdaltest.post_reason('fail')
         print(got_cs)
         return 'fail'
     jp2_bands_data = ds.ReadRaster(0, 0, ds.RasterXSize, ds.RasterYSize)
@@ -449,22 +441,18 @@ def DISABLED_jp2lura_11():
     tmp_ds = None
     gdal.GetDriverByName('GTiff').Delete('/vsimem/jp2lura_11.tif')
     if got_cs != 8527:
-        gdaltest.post_reason('fail')
         print(got_cs)
         return 'fail'
 
     if jp2_bands_data != gtiff_bands_data:
-        gdaltest.post_reason('fail')
         return 'fail'
 
     if jp2_fourth_band_data != gtiff_fourth_band_data:
-        gdaltest.post_reason('fail')
         return 'fail'
 
     ds = gdal.OpenEx('data/stefan_full_rgba_alpha_1bit.jp2', open_options=['1BIT_ALPHA_PROMOTION=NO'])
     fourth_band = ds.GetRasterBand(4)
     if fourth_band.GetMetadataItem('NBITS', 'IMAGE_STRUCTURE') != '1':
-        gdaltest.post_reason('fail')
         return 'fail'
 
     return 'success'
@@ -494,7 +482,6 @@ def test_jp2lura_12():
     gdaltest.jp2lura_drv.Delete('tmp/jp2lura_12.jp2')
 
     if wkt.find('32631') < 0:
-        gdaltest.post_reason('fail')
         print(wkt)
         return 'fail'
 
@@ -512,7 +499,6 @@ def test_jp2lura_12():
     gdaltest.jp2lura_drv.Delete('tmp/jp2lura_12.jp2')
 
     if gt != (1000, 1, 0, 2000, 0, -1):
-        gdaltest.post_reason('fail')
         print(gt)
         return 'fail'
 
@@ -534,7 +520,6 @@ def test_jp2lura_13():
     src_ds = None
 
     if gdal.VSIStatL('tmp/jp2lura_13.jp2.aux.xml') is not None:
-        gdaltest.post_reason('fail')
         return 'fail'
 
     ds = gdal.Open('tmp/jp2lura_13.jp2')
@@ -542,13 +527,10 @@ def test_jp2lura_13():
     gcps = ds.GetGCPs()
     wkt = ds.GetGCPProjection()
     if count != 4:
-        gdaltest.post_reason('fail')
         return 'fail'
     if len(gcps) != 4:
-        gdaltest.post_reason('fail')
         return 'fail'
     if wkt.find('4326') < 0:
-        gdaltest.post_reason('fail')
         print(wkt)
         return 'fail'
     ds = None
@@ -570,13 +552,10 @@ def test_jp2lura_13():
     gdaltest.jp2lura_drv.Delete('tmp/jp2lura_13.jp2')
 
     if count != 1:
-        gdaltest.post_reason('fail')
         return 'fail'
     if len(gcps) != 1:
-        gdaltest.post_reason('fail')
         return 'fail'
     if wkt.find('32631') < 0:
-        gdaltest.post_reason('fail')
         print(wkt)
         return 'fail'
 
@@ -593,7 +572,6 @@ def test_jp2lura_14():
 
     ds = gdal.Open('data/byte_2gcps.jp2')
     if ds.GetGCPCount() != 2:
-        gdaltest.post_reason('fail')
         return 'fail'
 
     return 'success'
@@ -653,7 +631,6 @@ def test_jp2lura_17():
     src_ds = None
 
     if gdal.VSIStatL('/vsimem/jp2lura_17.jp2.aux.xml') is not None:
-        gdaltest.post_reason('fail')
         return 'fail'
 
     ds = gdal.Open('/vsimem/jp2lura_17.jp2')
@@ -692,7 +669,6 @@ def test_jp2lura_18():
     ds = gdal.Open('/vsimem/jp2lura_18.jp2')
     ds.GetRasterBand(1).Checksum()
     if gdal.GetLastErrorMsg() != '':
-        gdaltest.post_reason('fail')
         return 'fail'
     ds = None
 
@@ -711,7 +687,6 @@ def test_jp2lura_19():
 
     ds = gdal.Open('data/byte_gmljp2_with_nul_car.jp2')
     if ds.GetProjectionRef() == '':
-        gdaltest.post_reason('fail')
         return 'fail'
     ds = None
 
@@ -805,25 +780,19 @@ def test_jp2lura_22():
     del out_ds
     src_ds = None
     if gdal.VSIStatL('/vsimem/jp2lura_22.jp2.aux.xml') is not None:
-        gdaltest.post_reason('fail')
         return 'fail'
     ds = gdal.Open('/vsimem/jp2lura_22.jp2')
     if ds.GetRasterBand(1).GetColorInterpretation() != gdal.GCI_RedBand:
-        gdaltest.post_reason('fail')
         return 'fail'
     if ds.GetRasterBand(2).GetColorInterpretation() != gdal.GCI_GreenBand:
-        gdaltest.post_reason('fail')
         return 'fail'
     if ds.GetRasterBand(3).GetColorInterpretation() != gdal.GCI_BlueBand:
-        gdaltest.post_reason('fail')
         return 'fail'
     if ds.GetRasterBand(4).GetColorInterpretation() != gdal.GCI_AlphaBand:
-        gdaltest.post_reason('fail')
         return 'fail'
     ds = None
 
     if validate('/vsimem/jp2lura_22.jp2', expected_gmljp2=False, inspire_tg=False) == 'fail':
-        gdaltest.post_reason('fail')
         return 'fail'
 
     gdal.Unlink('/vsimem/jp2lura_22.jp2')
@@ -839,17 +808,14 @@ def test_jp2lura_22():
         del out_ds
         src_ds = None
         if gdal.VSIStatL('/vsimem/jp2lura_22.jp2.aux.xml') is not None:
-            gdaltest.post_reason('fail')
             return 'fail'
         ds = gdal.OpenEx('/vsimem/jp2lura_22.jp2', open_options=['1BIT_ALPHA_PROMOTION=NO'])
         fourth_band = ds.GetRasterBand(4)
         if fourth_band.GetMetadataItem('NBITS', 'IMAGE_STRUCTURE') != '1':
-            gdaltest.post_reason('fail')
             return 'fail'
         ds = None
         ds = gdal.Open('/vsimem/jp2lura_22.jp2')
         if ds.GetRasterBand(4).Checksum() != 23120:
-            gdaltest.post_reason('fail')
             print(ds.GetRasterBand(4).Checksum())
             return 'fail'
         ds = None
@@ -861,23 +827,17 @@ def test_jp2lura_22():
         del out_ds
         src_ds = None
         if gdal.VSIStatL('/vsimem/jp2lura_22.jp2.aux.xml') is not None:
-            gdaltest.post_reason('fail')
             return 'fail'
         ds = gdal.Open('/vsimem/jp2lura_22.jp2')
         if ds.GetRasterBand(1).GetColorInterpretation() != gdal.GCI_RedBand:
-            gdaltest.post_reason('fail')
             return 'fail'
         if ds.GetRasterBand(2).GetColorInterpretation() != gdal.GCI_GreenBand:
-            gdaltest.post_reason('fail')
             return 'fail'
         if ds.GetRasterBand(3).GetColorInterpretation() != gdal.GCI_BlueBand:
-            gdaltest.post_reason('fail')
             return 'fail'
         if ds.GetRasterBand(4).GetColorInterpretation() != gdal.GCI_AlphaBand:
-            gdaltest.post_reason('fail')
             return 'fail'
         if ds.GetRasterBand(1).Checksum() != 11457:
-            gdaltest.post_reason('fail')
             print(ds.GetRasterBand(1).Checksum())
             return 'fail'
         ds = None
@@ -891,7 +851,6 @@ def test_jp2lura_22():
         del out_ds
         src_ds = None
         if gdal.VSIStatL('/vsimem/jp2lura_22.jp2.aux.xml') is not None:
-            gdaltest.post_reason('fail')
             return 'fail'
         gdal.Unlink('/vsimem/jp2lura_22.jp2')
 
@@ -906,20 +865,15 @@ def test_jp2lura_22():
         del out_ds
         src_ds = None
         if gdal.VSIStatL('/vsimem/jp2lura_22.jp2.aux.xml') is not None:
-            gdaltest.post_reason('fail')
             return 'fail'
         ds = gdal.Open('/vsimem/jp2lura_22.jp2')
         if ds.GetRasterBand(1).GetColorInterpretation() != gdal.GCI_RedBand:
-            gdaltest.post_reason('fail')
             return 'fail'
         if ds.GetRasterBand(2).GetColorInterpretation() != gdal.GCI_GreenBand:
-            gdaltest.post_reason('fail')
             return 'fail'
         if ds.GetRasterBand(3).GetColorInterpretation() != gdal.GCI_BlueBand:
-            gdaltest.post_reason('fail')
             return 'fail'
         if ds.GetRasterBand(4).GetColorInterpretation() != gdal.GCI_Undefined:
-            gdaltest.post_reason('fail')
             return 'fail'
         ds = None
         gdal.Unlink('/vsimem/jp2lura_22.jp2')
@@ -935,20 +889,15 @@ def test_jp2lura_22():
         del out_ds
         src_ds = None
         if gdal.VSIStatL('/vsimem/jp2lura_22.jp2.aux.xml') is not None:
-            gdaltest.post_reason('fail')
             return 'fail'
         ds = gdal.Open('/vsimem/jp2lura_22.jp2')
         if ds.GetRasterBand(1).GetColorInterpretation() != gdal.GCI_RedBand:
-            gdaltest.post_reason('fail')
             return 'fail'
         if ds.GetRasterBand(2).GetColorInterpretation() != gdal.GCI_GreenBand:
-            gdaltest.post_reason('fail')
             return 'fail'
         if ds.GetRasterBand(3).GetColorInterpretation() != gdal.GCI_BlueBand:
-            gdaltest.post_reason('fail')
             return 'fail'
         if ds.GetRasterBand(4).GetColorInterpretation() != gdal.GCI_AlphaBand:
-            gdaltest.post_reason('fail')
             return 'fail'
         ds = None
         gdal.Unlink('/vsimem/jp2lura_22.jp2')
@@ -975,18 +924,15 @@ def DISABLED_jp2lura_23():
     src_ds = None
     ds = gdal.Open('/vsimem/jp2lura_23.jp2')
     if ds.GetRasterBand(1).GetMetadataItem('NBITS', 'IMAGE_STRUCTURE') != '9':
-        gdaltest.post_reason('failure')
         return 'fail'
 
     out_ds = gdaltest.jp2lura_drv.CreateCopy('/vsimem/jp2lura_23_2.jp2', ds)
     if out_ds.GetRasterBand(1).GetMetadataItem('NBITS', 'IMAGE_STRUCTURE') != '9':
-        gdaltest.post_reason('failure')
         return 'fail'
     del out_ds
 
     ds = None
     if gdal.VSIStatL('/vsimem/jp2lura_23.jp2.aux.xml') is not None:
-        gdaltest.post_reason('fail')
         return 'fail'
     gdal.Unlink('/vsimem/jp2lura_23.jp2')
     gdal.Unlink('/vsimem/jp2lura_23_2.jp2')
@@ -1013,19 +959,15 @@ def test_jp2lura_24():
     del out_ds
     src_ds = None
     if gdal.VSIStatL('/vsimem/jp2lura_24.jp2.aux.xml') is not None:
-        gdaltest.post_reason('fail')
         return 'fail'
     ds = gdal.Open('/vsimem/jp2lura_24.jp2')
     if ds.GetRasterBand(1).GetColorInterpretation() != gdal.GCI_GrayIndex:
-        gdaltest.post_reason('fail')
         return 'fail'
     if ds.GetRasterBand(2).GetColorInterpretation() != gdal.GCI_AlphaBand:
-        gdaltest.post_reason('fail')
         return 'fail'
     ds = None
 
     if validate('/vsimem/jp2lura_24.jp2', expected_gmljp2=False, inspire_tg=False) == 'fail':
-        gdaltest.post_reason('fail')
         return 'fail'
 
     gdal.Unlink('/vsimem/jp2lura_24.jp2')
@@ -1041,26 +983,20 @@ def test_jp2lura_24():
 
         src_ds = None
         if gdal.VSIStatL('/vsimem/jp2lura_24.jp2.aux.xml') is not None:
-            gdaltest.post_reason('fail')
             return 'fail'
         ds = gdal.OpenEx('/vsimem/jp2lura_24.jp2', open_options=['1BIT_ALPHA_PROMOTION=NO'])
         if ds.GetRasterBand(1).GetColorInterpretation() != gdal.GCI_GrayIndex:
-            gdaltest.post_reason('fail')
             return 'fail'
         if ds.GetRasterBand(2).GetColorInterpretation() != gdal.GCI_AlphaBand:
-            gdaltest.post_reason('fail')
             return 'fail'
         if ds.GetRasterBand(2).GetMetadataItem('NBITS', 'IMAGE_STRUCTURE') != '1':
-            gdaltest.post_reason('fail')
             return 'fail'
         ds = None
         ds = gdal.Open('/vsimem/jp2lura_24.jp2')
         if ds.GetRasterBand(2).GetMetadataItem('NBITS', 'IMAGE_STRUCTURE') is not None:
-            gdaltest.post_reason('fail')
             print(ds.GetRasterBand(2).GetMetadataItem('NBITS', 'IMAGE_STRUCTURE'))
             return 'fail'
         if ds.GetRasterBand(2).Checksum() != 23120:
-            gdaltest.post_reason('fail')
             print(ds.GetRasterBand(2).Checksum())
             return 'fail'
         ds = None
@@ -1090,11 +1026,9 @@ def test_jp2lura_25():
     src_ds = None
     ds = gdal.Open('/vsimem/jp2lura_25.jp2')
     if ds.GetRasterBand(1).GetColorInterpretation() != gdal.GCI_Undefined:
-        gdaltest.post_reason('fail')
         return 'fail'
     ds = None
     if gdal.VSIStatL('/vsimem/jp2lura_25.jp2.aux.xml') is not None:
-        gdaltest.post_reason('fail')
         return 'fail'
 
     gdal.Unlink('/vsimem/jp2lura_25.jp2')
@@ -1272,18 +1206,14 @@ def DISABLED_jp2lura_31():
     out_ds = gdaltest.jp2lura_drv.CreateCopy('/vsimem/jp2lura_31.jp2', src_ds)
     del out_ds
     if gdal.VSIStatL('/vsimem/jp2lura_31.jp2.aux.xml') is not None:
-        gdaltest.post_reason('fail')
         return 'fail'
     ds = gdal.Open('/vsimem/jp2lura_31.jp2')
     if ds.GetRasterBand(1).GetColorInterpretation() != gdal.GCI_GreenBand:
-        gdaltest.post_reason('fail')
         print(ds.GetRasterBand(1).GetColorInterpretation())
         return 'fail'
     if ds.GetRasterBand(2).GetColorInterpretation() != gdal.GCI_BlueBand:
-        gdaltest.post_reason('fail')
         return 'fail'
     if ds.GetRasterBand(3).GetColorInterpretation() != gdal.GCI_RedBand:
-        gdaltest.post_reason('fail')
         return 'fail'
     ds = None
     gdal.Unlink('/vsimem/jp2lura_31.jp2')
@@ -1297,21 +1227,16 @@ def DISABLED_jp2lura_31():
     out_ds = gdaltest.jp2lura_drv.CreateCopy('/vsimem/jp2lura_31.jp2', src_ds)
     del out_ds
     if gdal.VSIStatL('/vsimem/jp2lura_31.jp2.aux.xml') is not None:
-        gdaltest.post_reason('fail')
         return 'fail'
     ds = gdal.Open('/vsimem/jp2lura_31.jp2')
     if ds.GetRasterBand(1).GetColorInterpretation() != gdal.GCI_AlphaBand:
-        gdaltest.post_reason('fail')
         print(ds.GetRasterBand(1).GetColorInterpretation())
         return 'fail'
     if ds.GetRasterBand(2).GetColorInterpretation() != gdal.GCI_GreenBand:
-        gdaltest.post_reason('fail')
         return 'fail'
     if ds.GetRasterBand(3).GetColorInterpretation() != gdal.GCI_BlueBand:
-        gdaltest.post_reason('fail')
         return 'fail'
     if ds.GetRasterBand(4).GetColorInterpretation() != gdal.GCI_RedBand:
-        gdaltest.post_reason('fail')
         return 'fail'
     ds = None
     gdal.Unlink('/vsimem/jp2lura_31.jp2')
@@ -1335,7 +1260,6 @@ def DISABLED_jp2lura_33():
     out_ds = gdaltest.jp2lura_drv.CreateCopy('/vsimem/jp2lura_33.jp2', src_ds, options=['BLOCKXSIZE=100000', 'BLOCKYSIZE=100000'])
     gdal.PopErrorHandler()
     if out_ds is not None:
-        gdaltest.post_reason('fail')
         return 'fail'
     out_ds = None
     gdal.Unlink('/vsimem/jp2lura_33.jp2')
@@ -1355,7 +1279,6 @@ def test_jp2lura_34():
     ds = gdal.Open('data/dimensions_above_31bit.jp2')
     gdal.PopErrorHandler()
     if ds is not None:
-        gdaltest.post_reason('fail')
         return 'fail'
 
     return 'success'
@@ -1373,7 +1296,6 @@ def test_jp2lura_35():
     ds = gdal.Open('data/truncated.jp2')
     gdal.PopErrorHandler()
     if ds is not None:
-        gdaltest.post_reason('fail')
         return 'fail'
 
     return 'success'
@@ -1392,7 +1314,6 @@ def test_jp2lura_36():
     out_ds = gdaltest.jp2lura_drv.CreateCopy('/vsimem/jp2lura_36.jp2', src_ds)
     gdal.PopErrorHandler()
     if out_ds is not None or gdal.VSIStatL('/vsimem/jp2lura_36.jp2') is not None:
-        gdaltest.post_reason('fail')
         return 'fail'
 
     return 'success'
@@ -1411,11 +1332,9 @@ def test_jp2lura_37():
     out_ds = gdaltest.jp2lura_drv.CreateCopy('/vsimem/jp2lura_37.jp2', src_ds, options=['WRITE_METADATA=YES'])
     del out_ds
     if gdal.VSIStatL('/vsimem/jp2lura_37.jp2.aux.xml') is not None:
-        gdaltest.post_reason('fail')
         return 'fail'
     ds = gdal.Open('/vsimem/jp2lura_37.jp2')
     if ds.GetMetadata() != {}:
-        gdaltest.post_reason('fail')
         return 'fail'
     gdal.Unlink('/vsimem/jp2lura_37.jp2')
 
@@ -1426,11 +1345,9 @@ def test_jp2lura_37():
         out_ds = gdaltest.jp2lura_drv.CreateCopy('/vsimem/jp2lura_37.jp2', src_ds, options=options)
         del out_ds
         if gdal.VSIStatL('/vsimem/jp2lura_37.jp2.aux.xml') is not None:
-            gdaltest.post_reason('fail')
             return 'fail'
         ds = gdal.Open('/vsimem/jp2lura_37.jp2')
         if ds.GetMetadata() != {'FOO': 'BAR'}:
-            gdaltest.post_reason('fail')
             return 'fail'
         ds = None
 
@@ -1442,12 +1359,10 @@ def test_jp2lura_37():
     out_ds = gdaltest.jp2lura_drv.CreateCopy('/vsimem/jp2lura_37.jp2', src_ds, options=['WRITE_METADATA=YES'])
     del out_ds
     if gdal.VSIStatL('/vsimem/jp2lura_37.jp2.aux.xml') is not None:
-        gdaltest.post_reason('fail')
         return 'fail'
     ds = gdal.Open('/vsimem/jp2lura_37.jp2')
     md = ds.GetMetadata('SOME_DOMAIN')
     if md != {'FOO': 'BAR'}:
-        gdaltest.post_reason('fail')
         print(md)
         return 'fail'
     gdal.Unlink('/vsimem/jp2lura_37.jp2')
@@ -1458,11 +1373,9 @@ def test_jp2lura_37():
     out_ds = gdaltest.jp2lura_drv.CreateCopy('/vsimem/jp2lura_37.jp2', src_ds, options=['WRITE_METADATA=YES'])
     del out_ds
     if gdal.VSIStatL('/vsimem/jp2lura_37.jp2.aux.xml') is not None:
-        gdaltest.post_reason('fail')
         return 'fail'
     ds = gdal.Open('/vsimem/jp2lura_37.jp2')
     if ds.GetMetadata('xml:SOME_DOMAIN')[0] != '<some_arbitrary_xml_box />\n':
-        gdaltest.post_reason('fail')
         return 'fail'
     gdal.Unlink('/vsimem/jp2lura_37.jp2')
 
@@ -1473,11 +1386,9 @@ def test_jp2lura_37():
         out_ds = gdaltest.jp2lura_drv.CreateCopy('/vsimem/jp2lura_37.jp2', src_ds, options=options)
         del out_ds
         if gdal.VSIStatL('/vsimem/jp2lura_37.jp2.aux.xml') is not None:
-            gdaltest.post_reason('fail')
             return 'fail'
         ds = gdal.Open('/vsimem/jp2lura_37.jp2')
         if ds.GetMetadata('xml:BOX_0')[0] != '<some_arbitrary_xml_box/>':
-            gdaltest.post_reason('fail')
             return 'fail'
         gdal.Unlink('/vsimem/jp2lura_37.jp2')
 
@@ -1488,11 +1399,9 @@ def test_jp2lura_37():
         out_ds = gdaltest.jp2lura_drv.CreateCopy('/vsimem/jp2lura_37.jp2', src_ds, options=options)
         del out_ds
         if gdal.VSIStatL('/vsimem/jp2lura_37.jp2.aux.xml') is not None:
-            gdaltest.post_reason('fail')
             return 'fail'
         ds = gdal.Open('/vsimem/jp2lura_37.jp2')
         if ds.GetMetadata('xml:XMP')[0] != '<fake_xmp_box/>':
-            gdaltest.post_reason('fail')
             return 'fail'
         ds = None
 
@@ -1533,7 +1442,6 @@ def test_jp2lura_38():
     src_ds.SetGeoTransform([0, 60, 0, 0, 0, -60])
     out_ds = gdaltest.jp2lura_drv.CreateCopy('/vsimem/jp2lura_38.jp2', src_ds, options=['GeoJP2=NO'])
     if out_ds.GetProjectionRef() != wkt:
-        gdaltest.post_reason('fail')
         print(out_ds.GetProjectionRef())
         return 'fail'
     crsdictionary = out_ds.GetMetadata_List("xml:CRSDictionary.gml")[0]
@@ -1625,7 +1533,6 @@ def test_jp2lura_39():
     del out_ds
     ds = gdal.Open('/vsimem/jp2lura_39.jp2')
     if ds.GetProjectionRef().find('4326') < 0:
-        gdaltest.post_reason('fail')
         print(ds.GetProjectionRef())
         return 'fail'
     ds = None
@@ -1702,14 +1609,12 @@ def test_jp2lura_40():
     del out_ds
     ds = gdal.Open('/vsimem/jp2lura_40.jp2')
     if ds.GetProjectionRef().find('4326') < 0:
-        gdaltest.post_reason('fail')
         print(ds.GetProjectionRef())
         return 'fail'
     got_gt = ds.GetGeoTransform()
     expected_gt = (2, 0.1, 0, 49, 0, -0.1)
     for i in range(6):
         if abs(got_gt[i] - expected_gt[i]) > 1e-5:
-            gdaltest.post_reason('fail')
             print(got_gt)
             return 'fail'
     ds = None
@@ -1730,11 +1635,9 @@ def test_jp2lura_41():
     out_ds = gdaltest.jp2lura_drv.CreateCopy('/vsimem/jp2lura_41.jp2', src_ds,
                                              options=['USE_SRC_CODESTREAM=YES', '@PROFILE=PROFILE_1', 'GEOJP2=NO', 'GMLJP2=NO'])
     if src_ds.GetRasterBand(1).Checksum() != out_ds.GetRasterBand(1).Checksum():
-        gdaltest.post_reason('fail')
         return 'fail'
     del out_ds
     if gdal.VSIStatL('/vsimem/jp2lura_41.jp2').size != 9923:
-        gdaltest.post_reason('fail')
         return 'fail'
     gdal.Unlink('/vsimem/jp2lura_41.jp2')
     gdal.Unlink('/vsimem/jp2lura_41.jp2.aux.xml')
@@ -1761,7 +1664,6 @@ def test_jp2lura_41():
     gdal.PopErrorHandler()
     del out_ds
     if gdal.GetLastErrorMsg() == '':
-        gdaltest.post_reason('fail')
         return 'fail'
     gdal.Unlink('/vsimem/jp2lura_41.jp2')
 
@@ -1796,10 +1698,8 @@ def test_jp2lura_45():
     src_ds = gdal.Open('data/byte.tif')
     out_ds = gdaltest.jp2lura_drv.CreateCopy('/vsimem/jp2lura_45.jp2', src_ds, options=['GMLJP2V2_DEF=YES'])
     if out_ds.GetLayerCount() != 0:
-        gdaltest.post_reason('fail')
         return 'fail'
     if out_ds.GetLayer(0) is not None:
-        gdaltest.post_reason('fail')
         return 'fail'
     del out_ds
 
@@ -1864,7 +1764,6 @@ def test_jp2lura_45():
 </gmljp2:GMLJP2CoverageCollection>
 """
     if gmljp2 != minimal_instance:
-        gdaltest.post_reason('fail')
         print(gmljp2)
         return 'fail'
 
@@ -1885,12 +1784,10 @@ def test_jp2lura_47():
     out_ds = gdaltest.jp2lura_drv.CreateCopy('/vsimem/jp2lura_47.jp2', src_ds)
     del out_ds
     if gdal.VSIStatL('/vsimem/jp2lura_47.jp2.aux.xml') is not None:
-        gdaltest.post_reason('fail')
         return 'fail'
 
     ds = gdal.Open('/vsimem/jp2lura_47.jp2')
     if ds.GetMetadata('RPC') is None:
-        gdaltest.post_reason('fail')
         return 'fail'
     ds = None
 
@@ -1910,11 +1807,9 @@ def test_jp2lura_48():
     ds = gdal.Open('data/byte_tile_2048.jp2')
     (blockxsize, blockysize) = ds.GetRasterBand(1).GetBlockSize()
     if (blockxsize, blockysize) != (20, 20):
-        gdaltest.post_reason('fail')
         print(blockxsize, blockysize)
         return 'fail'
     if ds.GetRasterBand(1).Checksum() != 4610:
-        gdaltest.post_reason('fail')
         return 'fail'
     ds = None
 
@@ -2247,7 +2142,6 @@ def test_jp2lura_51():
     with gdaltest.error_handler():
         ds = gdaltest.jp2lura_drv.CreateCopy('/vsimem/jp2lura_51.jp2', src_ds)
     if ds is not None:
-        gdaltest.post_reason('fail')
         return 'fail'
 
     ds = gdaltest.jp2lura_drv.CreateCopy('/vsimem/jp2lura_51.jp2', src_ds,
@@ -2256,13 +2150,11 @@ def test_jp2lura_51():
     ds = None
 
     if validate('/vsimem/jp2lura_51.jp2', inspire_tg=False) == 'fail':
-        gdaltest.post_reason('fail')
         return 'fail'
 
     gdaltest.jp2lura_drv.Delete('/vsimem/jp2lura_51.jp2')
 
     if maxdiff > 0.01:
-        gdaltest.post_reason('fail')
         return 'fail'
 
     # QUALITY
@@ -2273,12 +2165,10 @@ def test_jp2lura_51():
         maxdiff = gdaltest.compare_ds(ds, src_ds)
         ds = None
         if maxdiff > 124:
-            gdaltest.post_reason('fail')
             print(maxdiff)
             return 'fail'
 
         if validate('/vsimem/jp2lura_51.jp2', inspire_tg=False) == 'fail':
-            gdaltest.post_reason('fail')
             return 'fail'
     ds = None
     with gdaltest.error_handler():
@@ -2291,12 +2181,10 @@ def test_jp2lura_51():
     maxdiff = gdaltest.compare_ds(ds, src_ds)
     ds = None
     if maxdiff > 370:
-        gdaltest.post_reason('fail')
         print(maxdiff)
         return 'fail'
 
     if validate('/vsimem/jp2lura_51.jp2', inspire_tg=False) == 'fail':
-        gdaltest.post_reason('fail')
         return 'fail'
 
     gdaltest.jp2lura_drv.Delete('/vsimem/jp2lura_51.jp2')
@@ -2307,7 +2195,6 @@ def test_jp2lura_51():
     maxdiff = gdaltest.compare_ds(ds, src_ds)
     ds = None
     if maxdiff != 0.0:
-        gdaltest.post_reason('fail')
         print(maxdiff)
         return 'fail'
 
@@ -2342,13 +2229,11 @@ def test_jp2lura_52():
                                              options=['REVERSIBLE=YES'])
         got_min, got_max = ds.GetRasterBand(1).ComputeRasterMinMax()
         if val != got_min or val != got_max:
-            gdaltest.post_reason('fail')
             print(val, dt, fmt, got_min, got_max)
             return 'fail'
         ds = None
 
         if val >= 0 and validate('/vsimem/jp2lura_52.jp2', expected_gmljp2=False, inspire_tg=False) == 'fail':
-            gdaltest.post_reason('fail')
             print(val, dt, fmt)
             return 'fail'
 
@@ -2372,7 +2257,6 @@ def test_jp2lura_53():
     maxdiff = gdaltest.compare_ds(ds, src_ds)
     ds = None
     if maxdiff > 8:
-        gdaltest.post_reason('fail')
         print(maxdiff)
         return 'fail'
 
@@ -2383,7 +2267,6 @@ def test_jp2lura_53():
     maxdiff = gdaltest.compare_ds(ds, src_ds)
     ds = None
     if maxdiff > 2:
-        gdaltest.post_reason('fail')
         print(maxdiff)
         return 'fail'
 
@@ -2395,7 +2278,6 @@ def test_jp2lura_53():
     maxdiff = gdaltest.compare_ds(ds, src_ds)
     ds = None
     if maxdiff > 8:
-        gdaltest.post_reason('fail')
         print(maxdiff)
         return 'fail'
 
@@ -2407,7 +2289,6 @@ def test_jp2lura_53():
     maxdiff = gdaltest.compare_ds(ds, src_ds)
     ds = None
     if maxdiff > 0:
-        gdaltest.post_reason('fail')
         print(maxdiff)
         return 'fail'
 
@@ -2434,7 +2315,6 @@ def test_jp2lura_54():
                                           buf_type=gdal.GDT_Int16)
     data = struct.unpack('h' * 100 * 100, data)
     if min(data) != 100 or max(data) != 100:
-        gdaltest.post_reason('fail')
         print(min(data))
         print(max(data))
         return 'fail'
@@ -2443,7 +2323,6 @@ def test_jp2lura_54():
     data = ds.GetRasterBand(1).ReadRaster(0, 0, 100, 100, 30, 30)
     data = struct.unpack('B' * 30 * 30, data)
     if min(data) != 100 or max(data) != 100:
-        gdaltest.post_reason('fail')
         print(min(data))
         print(max(data))
         return 'fail'
diff --git a/autotest/gdrivers/jp2openjpeg.py b/autotest/gdrivers/jp2openjpeg.py
index 29ace11c0e6e..ef24418804fb 100755
--- a/autotest/gdrivers/jp2openjpeg.py
+++ b/autotest/gdrivers/jp2openjpeg.py
@@ -114,7 +114,6 @@ def test_jp2openjpeg_3():
 
     ds = ogr.Open('data/int16.jp2')
     if ds is not None:
-        gdaltest.post_reason('fail')
         return 'fail'
 
     return 'success'
@@ -146,7 +145,6 @@ def test_jp2openjpeg_4(out_filename='tmp/jp2openjpeg_4.jp2'):
     gdal.Unlink('/vsimem/jp2openjpeg_4.vrt')
 
     if gdal.VSIStatL(out_filename + '.aux.xml') is not None:
-        gdaltest.post_reason('fail')
         return 'fail'
 
     ds = gdal.Open(out_filename)
@@ -302,13 +300,10 @@ def test_jp2openjpeg_10():
     out_ds = gdaltest.jp2openjpeg_drv.CreateCopy('/vsimem/jp2openjpeg_10.jp2', src_ds, options=['YCBCR420=YES', 'RESOLUTIONS=3'])
     maxdiff = gdaltest.compare_ds(src_ds, out_ds)
     if out_ds.GetRasterBand(1).GetColorInterpretation() != gdal.GCI_RedBand:
-        gdaltest.post_reason('fail')
         return 'fail'
     if out_ds.GetRasterBand(2).GetColorInterpretation() != gdal.GCI_GreenBand:
-        gdaltest.post_reason('fail')
         return 'fail'
     if out_ds.GetRasterBand(3).GetColorInterpretation() != gdal.GCI_BlueBand:
-        gdaltest.post_reason('fail')
         return 'fail'
     del out_ds
     src_ds = None
@@ -333,11 +328,9 @@ def test_jp2openjpeg_11():
     ds = gdal.Open('data/stefan_full_rgba_alpha_1bit.jp2')
     fourth_band = ds.GetRasterBand(4)
     if fourth_band.GetMetadataItem('NBITS', 'IMAGE_STRUCTURE') is not None:
-        gdaltest.post_reason('fail')
         return 'fail'
     got_cs = fourth_band.Checksum()
     if got_cs != 8527:
-        gdaltest.post_reason('fail')
         print(got_cs)
         return 'fail'
     jp2_bands_data = ds.ReadRaster(0, 0, ds.RasterXSize, ds.RasterYSize)
@@ -353,22 +346,18 @@ def test_jp2openjpeg_11():
     tmp_ds = None
     gdal.GetDriverByName('GTiff').Delete('/vsimem/jp2openjpeg_11.tif')
     if got_cs != 8527:
-        gdaltest.post_reason('fail')
         print(got_cs)
         return 'fail'
 
     if jp2_bands_data != gtiff_bands_data:
-        gdaltest.post_reason('fail')
         return 'fail'
 
     if jp2_fourth_band_data != gtiff_fourth_band_data:
-        gdaltest.post_reason('fail')
         return 'fail'
 
     ds = gdal.OpenEx('data/stefan_full_rgba_alpha_1bit.jp2', open_options=['1BIT_ALPHA_PROMOTION=NO'])
     fourth_band = ds.GetRasterBand(4)
     if fourth_band.GetMetadataItem('NBITS', 'IMAGE_STRUCTURE') != '1':
-        gdaltest.post_reason('fail')
         return 'fail'
 
     return 'success'
@@ -398,7 +387,6 @@ def test_jp2openjpeg_12():
     gdaltest.jp2openjpeg_drv.Delete('tmp/jp2openjpeg_12.jp2')
 
     if wkt.find('32631') < 0:
-        gdaltest.post_reason('fail')
         print(wkt)
         return 'fail'
 
@@ -416,7 +404,6 @@ def test_jp2openjpeg_12():
     gdaltest.jp2openjpeg_drv.Delete('tmp/jp2openjpeg_12.jp2')
 
     if gt != (1000, 1, 0, 2000, 0, -1):
-        gdaltest.post_reason('fail')
         print(gt)
         return 'fail'
 
@@ -438,7 +425,6 @@ def test_jp2openjpeg_13():
     src_ds = None
 
     if gdal.VSIStatL('tmp/jp2openjpeg_13.jp2.aux.xml') is not None:
-        gdaltest.post_reason('fail')
         return 'fail'
 
     ds = gdal.Open('tmp/jp2openjpeg_13.jp2')
@@ -446,13 +432,10 @@ def test_jp2openjpeg_13():
     gcps = ds.GetGCPs()
     wkt = ds.GetGCPProjection()
     if count != 4:
-        gdaltest.post_reason('fail')
         return 'fail'
     if len(gcps) != 4:
-        gdaltest.post_reason('fail')
         return 'fail'
     if wkt.find('4326') < 0:
-        gdaltest.post_reason('fail')
         print(wkt)
         return 'fail'
     ds = None
@@ -474,13 +457,10 @@ def test_jp2openjpeg_13():
     gdaltest.jp2openjpeg_drv.Delete('tmp/jp2openjpeg_13.jp2')
 
     if count != 1:
-        gdaltest.post_reason('fail')
         return 'fail'
     if len(gcps) != 1:
-        gdaltest.post_reason('fail')
         return 'fail'
     if wkt.find('32631') < 0:
-        gdaltest.post_reason('fail')
         print(wkt)
         return 'fail'
 
@@ -497,7 +477,6 @@ def test_jp2openjpeg_14():
 
     ds = gdal.Open('data/byte_2gcps.jp2')
     if ds.GetGCPCount() != 2:
-        gdaltest.post_reason('fail')
         return 'fail'
 
     return 'success'
@@ -579,7 +558,6 @@ def test_jp2openjpeg_17():
     src_ds = None
 
     if gdal.VSIStatL('/vsimem/jp2openjpeg_17.jp2.aux.xml') is not None:
-        gdaltest.post_reason('fail')
         return 'fail'
 
     ds = gdal.Open('/vsimem/jp2openjpeg_17.jp2')
@@ -618,7 +596,6 @@ def test_jp2openjpeg_18():
     ds = gdal.Open('/vsimem/jp2openjpeg_18.jp2')
     ds.GetRasterBand(1).Checksum()
     if gdal.GetLastErrorMsg() != '':
-        gdaltest.post_reason('fail')
         return 'fail'
     ds = None
 
@@ -637,7 +614,6 @@ def test_jp2openjpeg_19():
 
     ds = gdal.Open('data/byte_gmljp2_with_nul_car.jp2')
     if ds.GetProjectionRef() == '':
-        gdaltest.post_reason('fail')
         return 'fail'
     ds = None
 
@@ -754,20 +730,15 @@ def test_jp2openjpeg_22():
     del out_ds
     src_ds = None
     if gdal.VSIStatL('/vsimem/jp2openjpeg_22.jp2.aux.xml') is not None:
-        gdaltest.post_reason('fail')
         return 'fail'
     ds = gdal.Open('/vsimem/jp2openjpeg_22.jp2')
     if ds.GetRasterBand(1).GetColorInterpretation() != gdal.GCI_RedBand:
-        gdaltest.post_reason('fail')
         return 'fail'
     if ds.GetRasterBand(2).GetColorInterpretation() != gdal.GCI_GreenBand:
-        gdaltest.post_reason('fail')
         return 'fail'
     if ds.GetRasterBand(3).GetColorInterpretation() != gdal.GCI_BlueBand:
-        gdaltest.post_reason('fail')
         return 'fail'
     if ds.GetRasterBand(4).GetColorInterpretation() != gdal.GCI_AlphaBand:
-        gdaltest.post_reason('fail')
         return 'fail'
     ds = None
     gdal.Unlink('/vsimem/jp2openjpeg_22.jp2')
@@ -782,17 +753,14 @@ def test_jp2openjpeg_22():
     del out_ds
     src_ds = None
     if gdal.VSIStatL('/vsimem/jp2openjpeg_22.jp2.aux.xml') is not None:
-        gdaltest.post_reason('fail')
         return 'fail'
     ds = gdal.OpenEx('/vsimem/jp2openjpeg_22.jp2', open_options=['1BIT_ALPHA_PROMOTION=NO'])
     fourth_band = ds.GetRasterBand(4)
     if fourth_band.GetMetadataItem('NBITS', 'IMAGE_STRUCTURE') != '1':
-        gdaltest.post_reason('fail')
         return 'fail'
     ds = None
     ds = gdal.Open('/vsimem/jp2openjpeg_22.jp2')
     if ds.GetRasterBand(4).Checksum() != 23120:
-        gdaltest.post_reason('fail')
         print(ds.GetRasterBand(4).Checksum())
         return 'fail'
     ds = None
@@ -804,23 +772,17 @@ def test_jp2openjpeg_22():
     del out_ds
     src_ds = None
     if gdal.VSIStatL('/vsimem/jp2openjpeg_22.jp2.aux.xml') is not None:
-        gdaltest.post_reason('fail')
         return 'fail'
     ds = gdal.Open('/vsimem/jp2openjpeg_22.jp2')
     if ds.GetRasterBand(1).GetColorInterpretation() != gdal.GCI_RedBand:
-        gdaltest.post_reason('fail')
         return 'fail'
     if ds.GetRasterBand(2).GetColorInterpretation() != gdal.GCI_GreenBand:
-        gdaltest.post_reason('fail')
         return 'fail'
     if ds.GetRasterBand(3).GetColorInterpretation() != gdal.GCI_BlueBand:
-        gdaltest.post_reason('fail')
         return 'fail'
     if ds.GetRasterBand(4).GetColorInterpretation() != gdal.GCI_AlphaBand:
-        gdaltest.post_reason('fail')
         return 'fail'
     if ds.GetRasterBand(1).Checksum() not in [11457, 11450]:
-        gdaltest.post_reason('fail')
         print(ds.GetRasterBand(1).Checksum())
         return 'fail'
     ds = None
@@ -834,7 +796,6 @@ def test_jp2openjpeg_22():
     del out_ds
     src_ds = None
     if gdal.VSIStatL('/vsimem/jp2openjpeg_22.jp2.aux.xml') is not None:
-        gdaltest.post_reason('fail')
         return 'fail'
     gdal.Unlink('/vsimem/jp2openjpeg_22.jp2')
 
@@ -849,20 +810,15 @@ def test_jp2openjpeg_22():
     del out_ds
     src_ds = None
     if gdal.VSIStatL('/vsimem/jp2openjpeg_22.jp2.aux.xml') is not None:
-        gdaltest.post_reason('fail')
         return 'fail'
     ds = gdal.Open('/vsimem/jp2openjpeg_22.jp2')
     if ds.GetRasterBand(1).GetColorInterpretation() != gdal.GCI_RedBand:
-        gdaltest.post_reason('fail')
         return 'fail'
     if ds.GetRasterBand(2).GetColorInterpretation() != gdal.GCI_GreenBand:
-        gdaltest.post_reason('fail')
         return 'fail'
     if ds.GetRasterBand(3).GetColorInterpretation() != gdal.GCI_BlueBand:
-        gdaltest.post_reason('fail')
         return 'fail'
     if ds.GetRasterBand(4).GetColorInterpretation() != gdal.GCI_Undefined:
-        gdaltest.post_reason('fail')
         return 'fail'
     ds = None
     gdal.Unlink('/vsimem/jp2openjpeg_22.jp2')
@@ -878,20 +834,15 @@ def test_jp2openjpeg_22():
     del out_ds
     src_ds = None
     if gdal.VSIStatL('/vsimem/jp2openjpeg_22.jp2.aux.xml') is not None:
-        gdaltest.post_reason('fail')
         return 'fail'
     ds = gdal.Open('/vsimem/jp2openjpeg_22.jp2')
     if ds.GetRasterBand(1).GetColorInterpretation() != gdal.GCI_RedBand:
-        gdaltest.post_reason('fail')
         return 'fail'
     if ds.GetRasterBand(2).GetColorInterpretation() != gdal.GCI_GreenBand:
-        gdaltest.post_reason('fail')
         return 'fail'
     if ds.GetRasterBand(3).GetColorInterpretation() != gdal.GCI_BlueBand:
-        gdaltest.post_reason('fail')
         return 'fail'
     if ds.GetRasterBand(4).GetColorInterpretation() != gdal.GCI_AlphaBand:
-        gdaltest.post_reason('fail')
         return 'fail'
     ds = None
     gdal.Unlink('/vsimem/jp2openjpeg_22.jp2')
@@ -918,18 +869,15 @@ def test_jp2openjpeg_23():
     src_ds = None
     ds = gdal.Open('/vsimem/jp2openjpeg_23.jp2')
     if ds.GetRasterBand(1).GetMetadataItem('NBITS', 'IMAGE_STRUCTURE') != '9':
-        gdaltest.post_reason('failure')
         return 'fail'
 
     out_ds = gdaltest.jp2openjpeg_drv.CreateCopy('/vsimem/jp2openjpeg_23_2.jp2', ds)
     if out_ds.GetRasterBand(1).GetMetadataItem('NBITS', 'IMAGE_STRUCTURE') != '9':
-        gdaltest.post_reason('failure')
         return 'fail'
     del out_ds
 
     ds = None
     if gdal.VSIStatL('/vsimem/jp2openjpeg_23.jp2.aux.xml') is not None:
-        gdaltest.post_reason('fail')
         return 'fail'
     gdal.Unlink('/vsimem/jp2openjpeg_23.jp2')
     gdal.Unlink('/vsimem/jp2openjpeg_23_2.jp2')
@@ -956,14 +904,11 @@ def test_jp2openjpeg_24():
     del out_ds
     src_ds = None
     if gdal.VSIStatL('/vsimem/jp2openjpeg_24.jp2.aux.xml') is not None:
-        gdaltest.post_reason('fail')
         return 'fail'
     ds = gdal.Open('/vsimem/jp2openjpeg_24.jp2')
     if ds.GetRasterBand(1).GetColorInterpretation() != gdal.GCI_GrayIndex:
-        gdaltest.post_reason('fail')
         return 'fail'
     if ds.GetRasterBand(2).GetColorInterpretation() != gdal.GCI_AlphaBand:
-        gdaltest.post_reason('fail')
         return 'fail'
     ds = None
     gdal.Unlink('/vsimem/jp2openjpeg_24.jp2')
@@ -978,26 +923,20 @@ def test_jp2openjpeg_24():
     del out_ds
     src_ds = None
     if gdal.VSIStatL('/vsimem/jp2openjpeg_24.jp2.aux.xml') is not None:
-        gdaltest.post_reason('fail')
         return 'fail'
     ds = gdal.OpenEx('/vsimem/jp2openjpeg_24.jp2', open_options=['1BIT_ALPHA_PROMOTION=NO'])
     if ds.GetRasterBand(1).GetColorInterpretation() != gdal.GCI_GrayIndex:
-        gdaltest.post_reason('fail')
         return 'fail'
     if ds.GetRasterBand(2).GetColorInterpretation() != gdal.GCI_AlphaBand:
-        gdaltest.post_reason('fail')
         return 'fail'
     if ds.GetRasterBand(2).GetMetadataItem('NBITS', 'IMAGE_STRUCTURE') != '1':
-        gdaltest.post_reason('fail')
         return 'fail'
     ds = None
     ds = gdal.Open('/vsimem/jp2openjpeg_24.jp2')
     if ds.GetRasterBand(2).GetMetadataItem('NBITS', 'IMAGE_STRUCTURE') is not None:
-        gdaltest.post_reason('fail')
         print(ds.GetRasterBand(2).GetMetadataItem('NBITS', 'IMAGE_STRUCTURE'))
         return 'fail'
     if ds.GetRasterBand(2).Checksum() != 23120:
-        gdaltest.post_reason('fail')
         print(ds.GetRasterBand(2).Checksum())
         return 'fail'
     ds = None
@@ -1027,11 +966,9 @@ def test_jp2openjpeg_25():
     src_ds = None
     ds = gdal.Open('/vsimem/jp2openjpeg_25.jp2')
     if ds.GetRasterBand(1).GetColorInterpretation() != gdal.GCI_Undefined:
-        gdaltest.post_reason('fail')
         return 'fail'
     ds = None
     if gdal.VSIStatL('/vsimem/jp2openjpeg_25.jp2.aux.xml') is not None:
-        gdaltest.post_reason('fail')
         return 'fail'
 
     gdal.Unlink('/vsimem/jp2openjpeg_25.jp2')
@@ -1099,14 +1036,11 @@ def test_jp2openjpeg_26():
        out_ds.GetRasterBand(1).GetOverview(overview_count - 1).YSize != 2 * 128:
         print(out_ds.GetRasterBand(1).GetOverview(overview_count - 1).XSize)
         print(out_ds.GetRasterBand(1).GetOverview(overview_count - 1).YSize)
-        gdaltest.post_reason('fail')
         return 'fail'
     out_ds = None
     if gdal.VSIStatL('/vsimem/jp2openjpeg_26.jp2.aux.xml') is not None:
-        gdaltest.post_reason('fail')
         return 'fail'
     if validate('/vsimem/jp2openjpeg_26.jp2') == 'fail':
-        gdaltest.post_reason('fail')
         return 'fail'
     gdal.Unlink('/vsimem/jp2openjpeg_26.jp2')
 
@@ -1117,23 +1051,18 @@ def test_jp2openjpeg_26():
        out_ds.GetRasterBand(1).GetOverview(overview_count - 1).YSize != 128:
         print(out_ds.GetRasterBand(1).GetOverview(overview_count - 1).XSize)
         print(out_ds.GetRasterBand(1).GetOverview(overview_count - 1).YSize)
-        gdaltest.post_reason('fail')
         return 'fail'
     gdal.ErrorReset()
     out_ds.GetRasterBand(1).Checksum()
     if gdal.GetLastErrorMsg() != '':
-        gdaltest.post_reason('fail')
         return 'fail'
     out_ds.GetRasterBand(1).GetOverview(0).Checksum()
     if gdal.GetLastErrorMsg() != '':
-        gdaltest.post_reason('fail')
         return 'fail'
     out_ds = None
     if gdal.VSIStatL('/vsimem/jp2openjpeg_26.jp2.aux.xml') is not None:
-        gdaltest.post_reason('fail')
         return 'fail'
     if validate('/vsimem/jp2openjpeg_26.jp2') == 'fail':
-        gdaltest.post_reason('fail')
         return 'fail'
     gdal.Unlink('/vsimem/jp2openjpeg_26.jp2')
 
@@ -1145,17 +1074,13 @@ def test_jp2openjpeg_26():
     out_ds = None
     ds = gdal.OpenEx('/vsimem/jp2openjpeg_26.jp2', open_options=['1BIT_ALPHA_PROMOTION=NO'])
     if ds.GetRasterBand(4).GetColorInterpretation() != gdal.GCI_AlphaBand:
-        gdaltest.post_reason('fail')
         return 'fail'
     if ds.GetRasterBand(4).GetMetadataItem('NBITS', 'IMAGE_STRUCTURE') != '1':
-        gdaltest.post_reason('fail')
         return 'fail'
     ds = None
     if gdal.VSIStatL('/vsimem/jp2openjpeg_26.jp2.aux.xml') is not None:
-        gdaltest.post_reason('fail')
         return 'fail'
     if validate('/vsimem/jp2openjpeg_26.jp2') == 'fail':
-        gdaltest.post_reason('fail')
         return 'fail'
     gdal.Unlink('/vsimem/jp2openjpeg_26.jp2')
 
@@ -1165,15 +1090,12 @@ def test_jp2openjpeg_26():
     out_ds = gdaltest.jp2openjpeg_drv.CreateCopy('/vsimem/jp2openjpeg_26.jp2', src_ds, options=['INSPIRE_TG=YES', 'JPX=NO'])
     gdal.PopErrorHandler()
     if gdal.GetLastErrorMsg() == '':
-        gdaltest.post_reason('fail')
         return 'fail'
     out_ds = None
     if gdal.VSIStatL('/vsimem/jp2openjpeg_26.jp2.aux.xml') is not None:
-        gdaltest.post_reason('fail')
         return 'fail'
     res = validate('/vsimem/jp2openjpeg_26.jp2', return_error_count=True)
     if res != 'skip' and res != (2, 0):
-        gdaltest.post_reason('fail')
         return 'fail'
     gdal.Unlink('/vsimem/jp2openjpeg_26.jp2')
 
@@ -1182,14 +1104,11 @@ def test_jp2openjpeg_26():
     src_ds.GetRasterBand(1).SetMetadataItem('NBITS', '1', 'IMAGE_STRUCTURE')
     out_ds = gdaltest.jp2openjpeg_drv.CreateCopy('/vsimem/jp2openjpeg_26.jp2', src_ds, options=['INSPIRE_TG=YES'])
     if out_ds.GetRasterBand(1).GetMetadataItem('NBITS', 'IMAGE_STRUCTURE') != '1':
-        gdaltest.post_reason('fail')
         return 'fail'
     ds = None
     if gdal.VSIStatL('/vsimem/jp2openjpeg_26.jp2.aux.xml') is not None:
-        gdaltest.post_reason('fail')
         return 'fail'
     if validate('/vsimem/jp2openjpeg_26.jp2', expected_gmljp2=False) == 'fail':
-        gdaltest.post_reason('fail')
         return 'fail'
     gdal.Unlink('/vsimem/jp2openjpeg_26.jp2')
 
@@ -1198,14 +1117,11 @@ def test_jp2openjpeg_26():
     src_ds.GetRasterBand(1).SetMetadataItem('NBITS', '12', 'IMAGE_STRUCTURE')
     out_ds = gdaltest.jp2openjpeg_drv.CreateCopy('/vsimem/jp2openjpeg_26.jp2', src_ds, options=['INSPIRE_TG=YES'])
     if out_ds.GetRasterBand(1).GetMetadataItem('NBITS', 'IMAGE_STRUCTURE') is not None:
-        gdaltest.post_reason('fail')
         return 'fail'
     ds = None
     if gdal.VSIStatL('/vsimem/jp2openjpeg_26.jp2.aux.xml') is not None:
-        gdaltest.post_reason('fail')
         return 'fail'
     if validate('/vsimem/jp2openjpeg_26.jp2', expected_gmljp2=False) == 'fail':
-        gdaltest.post_reason('fail')
         return 'fail'
     gdal.Unlink('/vsimem/jp2openjpeg_26.jp2')
 
@@ -1216,7 +1132,6 @@ def test_jp2openjpeg_26():
     out_ds = gdaltest.jp2openjpeg_drv.CreateCopy('/vsimem/jp2openjpeg_26.jp2', src_ds, options=['INSPIRE_TG=YES', 'BLOCKXSIZE=1536', 'BLOCKYSIZE=1536'])
     gdal.PopErrorHandler()
     if out_ds is not None:
-        gdaltest.post_reason('fail')
         return 'fail'
 
     # Error case: non square tile
@@ -1224,7 +1139,6 @@ def test_jp2openjpeg_26():
     out_ds = gdaltest.jp2openjpeg_drv.CreateCopy('/vsimem/jp2openjpeg_26.jp2', src_ds, options=['INSPIRE_TG=YES', 'BLOCKXSIZE=512', 'BLOCKYSIZE=128'])
     gdal.PopErrorHandler()
     if out_ds is not None:
-        gdaltest.post_reason('fail')
         return 'fail'
 
     # Error case: incompatible PROFILE
@@ -1232,7 +1146,6 @@ def test_jp2openjpeg_26():
     out_ds = gdaltest.jp2openjpeg_drv.CreateCopy('/vsimem/jp2openjpeg_26.jp2', src_ds, options=['INSPIRE_TG=YES', 'PROFILE=UNRESTRICTED'])
     gdal.PopErrorHandler()
     if out_ds is not None:
-        gdaltest.post_reason('fail')
         return 'fail'
 
     # Error case: valid, but too small number of resolutions regarding PROFILE_1
@@ -1240,7 +1153,6 @@ def test_jp2openjpeg_26():
     out_ds = gdaltest.jp2openjpeg_drv.CreateCopy('/vsimem/jp2openjpeg_26.jp2', src_ds, options=['INSPIRE_TG=YES', 'RESOLUTIONS=1'])
     gdal.PopErrorHandler()
     if out_ds is not None:
-        gdaltest.post_reason('fail')
         return 'fail'
 
     # Too big resolution number. Will fallback to default one
@@ -1248,7 +1160,6 @@ def test_jp2openjpeg_26():
     out_ds = gdaltest.jp2openjpeg_drv.CreateCopy('/vsimem/jp2openjpeg_26.jp2', src_ds, options=['INSPIRE_TG=YES', 'RESOLUTIONS=100'])
     gdal.PopErrorHandler()
     if out_ds is None:
-        gdaltest.post_reason('fail')
         return 'fail'
     out_ds = None
     gdal.Unlink('/vsimem/jp2openjpeg_26.jp2')
@@ -1258,7 +1169,6 @@ def test_jp2openjpeg_26():
     out_ds = gdaltest.jp2openjpeg_drv.CreateCopy('/vsimem/jp2openjpeg_26.jp2', src_ds, options=['INSPIRE_TG=YES', 'NBITS=2'])
     gdal.PopErrorHandler()
     if out_ds is not None:
-        gdaltest.post_reason('fail')
         return 'fail'
 
     # Error case: unsupported CODEC (J2K)
@@ -1266,7 +1176,6 @@ def test_jp2openjpeg_26():
     out_ds = gdaltest.jp2openjpeg_drv.CreateCopy('/vsimem/jp2openjpeg_26.j2k', src_ds, options=['INSPIRE_TG=YES'])
     gdal.PopErrorHandler()
     if out_ds is not None:
-        gdaltest.post_reason('fail')
         return 'fail'
 
     # Error case: invalid CODEBLOCK_WIDTH/HEIGHT
@@ -1274,13 +1183,11 @@ def test_jp2openjpeg_26():
     out_ds = gdaltest.jp2openjpeg_drv.CreateCopy('/vsimem/jp2openjpeg_26.jp2', src_ds, options=['INSPIRE_TG=YES', 'CODEBLOCK_WIDTH=128', 'CODEBLOCK_HEIGHT=32'])
     gdal.PopErrorHandler()
     if out_ds is not None:
-        gdaltest.post_reason('fail')
         return 'fail'
     gdal.PushErrorHandler()
     out_ds = gdaltest.jp2openjpeg_drv.CreateCopy('/vsimem/jp2openjpeg_26.jp2', src_ds, options=['INSPIRE_TG=YES', 'CODEBLOCK_WIDTH=32', 'CODEBLOCK_HEIGHT=128'])
     gdal.PopErrorHandler()
     if out_ds is not None:
-        gdaltest.post_reason('fail')
         return 'fail'
 
     return 'success'
@@ -1491,7 +1398,6 @@ def test_jp2openjpeg_30():
         del out_ds
 
         if validate('/vsimem/jp2openjpeg_30.jp2', expected_gmljp2=False) == 'fail':
-            gdaltest.post_reason('fail')
             return 'fail'
 
     gdal.Unlink('/vsimem/jp2openjpeg_30.jp2')
@@ -1545,7 +1451,6 @@ def test_jp2openjpeg_30():
     out_ds = gdaltest.jp2openjpeg_drv.CreateCopy('/vsimem/jp2openjpeg_30.jp2', src_ds)
     gdal.PopErrorHandler()
     if out_ds is not None:
-        gdaltest.post_reason('fail')
         return 'fail'
 
     return 'success'
@@ -1566,18 +1471,14 @@ def test_jp2openjpeg_31():
     out_ds = gdaltest.jp2openjpeg_drv.CreateCopy('/vsimem/jp2openjpeg_31.jp2', src_ds)
     del out_ds
     if gdal.VSIStatL('/vsimem/jp2openjpeg_31.jp2.aux.xml') is not None:
-        gdaltest.post_reason('fail')
         return 'fail'
     ds = gdal.Open('/vsimem/jp2openjpeg_31.jp2')
     if ds.GetRasterBand(1).GetColorInterpretation() != gdal.GCI_GreenBand:
-        gdaltest.post_reason('fail')
         print(ds.GetRasterBand(1).GetColorInterpretation())
         return 'fail'
     if ds.GetRasterBand(2).GetColorInterpretation() != gdal.GCI_BlueBand:
-        gdaltest.post_reason('fail')
         return 'fail'
     if ds.GetRasterBand(3).GetColorInterpretation() != gdal.GCI_RedBand:
-        gdaltest.post_reason('fail')
         return 'fail'
     ds = None
     gdal.Unlink('/vsimem/jp2openjpeg_31.jp2')
@@ -1591,21 +1492,16 @@ def test_jp2openjpeg_31():
     out_ds = gdaltest.jp2openjpeg_drv.CreateCopy('/vsimem/jp2openjpeg_31.jp2', src_ds)
     del out_ds
     if gdal.VSIStatL('/vsimem/jp2openjpeg_31.jp2.aux.xml') is not None:
-        gdaltest.post_reason('fail')
         return 'fail'
     ds = gdal.Open('/vsimem/jp2openjpeg_31.jp2')
     if ds.GetRasterBand(1).GetColorInterpretation() != gdal.GCI_AlphaBand:
-        gdaltest.post_reason('fail')
         print(ds.GetRasterBand(1).GetColorInterpretation())
         return 'fail'
     if ds.GetRasterBand(2).GetColorInterpretation() != gdal.GCI_GreenBand:
-        gdaltest.post_reason('fail')
         return 'fail'
     if ds.GetRasterBand(3).GetColorInterpretation() != gdal.GCI_BlueBand:
-        gdaltest.post_reason('fail')
         return 'fail'
     if ds.GetRasterBand(4).GetColorInterpretation() != gdal.GCI_RedBand:
-        gdaltest.post_reason('fail')
         return 'fail'
     ds = None
     gdal.Unlink('/vsimem/jp2openjpeg_31.jp2')
@@ -1626,7 +1522,6 @@ def test_jp2openjpeg_32():
     out_ds = gdaltest.jp2openjpeg_drv.CreateCopy('/vsimem/jp2openjpeg_32.jp2', src_ds, options=['JP2C_XLBOX=YES'])
     gdal.PopErrorHandler()
     if out_ds.GetRasterBand(1).Checksum() != 0:
-        gdaltest.post_reason('fail')
         return 'fail'
     out_ds = None
     gdal.Unlink('/vsimem/jp2openjpeg_32.jp2')
@@ -1652,7 +1547,6 @@ def test_jp2openjpeg_33():
     out_ds = gdaltest.jp2openjpeg_drv.CreateCopy('/vsimem/jp2openjpeg_33.jp2', src_ds, options=['BLOCKXSIZE=100000', 'BLOCKYSIZE=100000', 'RESOLUTIONS=5'])
     gdal.PopErrorHandler()
     if out_ds is not None:
-        gdaltest.post_reason('fail')
         return 'fail'
     out_ds = None
     gdal.Unlink('/vsimem/jp2openjpeg_33.jp2')
@@ -1672,7 +1566,6 @@ def test_jp2openjpeg_34():
     ds = gdal.Open('data/dimensions_above_31bit.jp2')
     gdal.PopErrorHandler()
     if ds is not None:
-        gdaltest.post_reason('fail')
         return 'fail'
 
     return 'success'
@@ -1690,7 +1583,6 @@ def test_jp2openjpeg_35():
     ds = gdal.Open('data/truncated.jp2')
     gdal.PopErrorHandler()
     if ds is not None:
-        gdaltest.post_reason('fail')
         return 'fail'
 
     return 'success'
@@ -1709,7 +1601,6 @@ def test_jp2openjpeg_36():
     out_ds = gdaltest.jp2openjpeg_drv.CreateCopy('/vsimem/jp2openjpeg_36.jp2', src_ds)
     gdal.PopErrorHandler()
     if out_ds is not None or gdal.VSIStatL('/vsimem/jp2openjpeg_36.jp2') is not None:
-        gdaltest.post_reason('fail')
         return 'fail'
 
     return 'success'
@@ -1728,11 +1619,9 @@ def test_jp2openjpeg_37():
     out_ds = gdaltest.jp2openjpeg_drv.CreateCopy('/vsimem/jp2openjpeg_37.jp2', src_ds, options=['WRITE_METADATA=YES'])
     del out_ds
     if gdal.VSIStatL('/vsimem/jp2openjpeg_37.jp2.aux.xml') is not None:
-        gdaltest.post_reason('fail')
         return 'fail'
     ds = gdal.Open('/vsimem/jp2openjpeg_37.jp2')
     if ds.GetMetadata() != {}:
-        gdaltest.post_reason('fail')
         return 'fail'
     gdal.Unlink('/vsimem/jp2openjpeg_37.jp2')
 
@@ -1743,16 +1632,13 @@ def test_jp2openjpeg_37():
         out_ds = gdaltest.jp2openjpeg_drv.CreateCopy('/vsimem/jp2openjpeg_37.jp2', src_ds, options=options)
         del out_ds
         if gdal.VSIStatL('/vsimem/jp2openjpeg_37.jp2.aux.xml') is not None:
-            gdaltest.post_reason('fail')
             return 'fail'
         ds = gdal.Open('/vsimem/jp2openjpeg_37.jp2')
         if ds.GetMetadata() != {'FOO': 'BAR'}:
-            gdaltest.post_reason('fail')
             return 'fail'
         ds = None
 
         if 'INSPIRE_TG=YES' in options and validate('/vsimem/jp2openjpeg_37.jp2', expected_gmljp2=False) == 'fail':
-            gdaltest.post_reason('fail')
             return 'fail'
 
         gdal.Unlink('/vsimem/jp2openjpeg_37.jp2')
@@ -1763,12 +1649,10 @@ def test_jp2openjpeg_37():
     out_ds = gdaltest.jp2openjpeg_drv.CreateCopy('/vsimem/jp2openjpeg_37.jp2', src_ds, options=['WRITE_METADATA=YES'])
     del out_ds
     if gdal.VSIStatL('/vsimem/jp2openjpeg_37.jp2.aux.xml') is not None:
-        gdaltest.post_reason('fail')
         return 'fail'
     ds = gdal.Open('/vsimem/jp2openjpeg_37.jp2')
     md = ds.GetMetadata('SOME_DOMAIN')
     if md != {'FOO': 'BAR'}:
-        gdaltest.post_reason('fail')
         print(md)
         return 'fail'
     gdal.Unlink('/vsimem/jp2openjpeg_37.jp2')
@@ -1779,11 +1663,9 @@ def test_jp2openjpeg_37():
     out_ds = gdaltest.jp2openjpeg_drv.CreateCopy('/vsimem/jp2openjpeg_37.jp2', src_ds, options=['WRITE_METADATA=YES'])
     del out_ds
     if gdal.VSIStatL('/vsimem/jp2openjpeg_37.jp2.aux.xml') is not None:
-        gdaltest.post_reason('fail')
         return 'fail'
     ds = gdal.Open('/vsimem/jp2openjpeg_37.jp2')
     if ds.GetMetadata('xml:SOME_DOMAIN')[0] != '<some_arbitrary_xml_box />\n':
-        gdaltest.post_reason('fail')
         return 'fail'
     gdal.Unlink('/vsimem/jp2openjpeg_37.jp2')
 
@@ -1794,11 +1676,9 @@ def test_jp2openjpeg_37():
         out_ds = gdaltest.jp2openjpeg_drv.CreateCopy('/vsimem/jp2openjpeg_37.jp2', src_ds, options=options)
         del out_ds
         if gdal.VSIStatL('/vsimem/jp2openjpeg_37.jp2.aux.xml') is not None:
-            gdaltest.post_reason('fail')
             return 'fail'
         ds = gdal.Open('/vsimem/jp2openjpeg_37.jp2')
         if ds.GetMetadata('xml:BOX_0')[0] != '<some_arbitrary_xml_box/>':
-            gdaltest.post_reason('fail')
             return 'fail'
         gdal.Unlink('/vsimem/jp2openjpeg_37.jp2')
 
@@ -1809,16 +1689,13 @@ def test_jp2openjpeg_37():
         out_ds = gdaltest.jp2openjpeg_drv.CreateCopy('/vsimem/jp2openjpeg_37.jp2', src_ds, options=options)
         del out_ds
         if gdal.VSIStatL('/vsimem/jp2openjpeg_37.jp2.aux.xml') is not None:
-            gdaltest.post_reason('fail')
             return 'fail'
         ds = gdal.Open('/vsimem/jp2openjpeg_37.jp2')
         if ds.GetMetadata('xml:XMP')[0] != '<fake_xmp_box/>':
-            gdaltest.post_reason('fail')
             return 'fail'
         ds = None
 
         if 'INSPIRE_TG=YES' in options and validate('/vsimem/jp2openjpeg_37.jp2', expected_gmljp2=False) == 'fail':
-            gdaltest.post_reason('fail')
             return 'fail'
 
         gdal.Unlink('/vsimem/jp2openjpeg_37.jp2')
@@ -1830,16 +1707,13 @@ def test_jp2openjpeg_37():
         out_ds = gdaltest.jp2openjpeg_drv.CreateCopy('/vsimem/jp2openjpeg_37.jp2', src_ds, options=options)
         del out_ds
         if gdal.VSIStatL('/vsimem/jp2openjpeg_37.jp2.aux.xml') is not None:
-            gdaltest.post_reason('fail')
             return 'fail'
         ds = gdal.Open('/vsimem/jp2openjpeg_37.jp2')
         if ds.GetMetadata('xml:IPR')[0] != '<fake_ipr_box/>':
-            gdaltest.post_reason('fail')
             return 'fail'
         ds = None
 
         if validate('/vsimem/jp2openjpeg_37.jp2', expected_gmljp2=False) == 'fail':
-            gdaltest.post_reason('fail')
             return 'fail'
         gdal.Unlink('/vsimem/jp2openjpeg_37.jp2')
 
@@ -1861,7 +1735,6 @@ def test_jp2openjpeg_38():
     src_ds.SetGeoTransform([0, 60, 0, 0, 0, -60])
     out_ds = gdaltest.jp2openjpeg_drv.CreateCopy('/vsimem/jp2openjpeg_38.jp2', src_ds, options=['GeoJP2=NO'])
     if out_ds.GetProjectionRef() != wkt:
-        gdaltest.post_reason('fail')
         print(out_ds.GetProjectionRef())
         return 'fail'
     crsdictionary = out_ds.GetMetadata_List("xml:CRSDictionary.gml")[0]
@@ -1954,7 +1827,6 @@ def test_jp2openjpeg_39():
     del out_ds
     ds = gdal.Open('/vsimem/jp2openjpeg_39.jp2')
     if ds.GetProjectionRef().find('4326') < 0:
-        gdaltest.post_reason('fail')
         print(ds.GetProjectionRef())
         return 'fail'
     ds = None
@@ -2031,14 +1903,12 @@ def test_jp2openjpeg_40():
     del out_ds
     ds = gdal.Open('/vsimem/jp2openjpeg_40.jp2')
     if ds.GetProjectionRef().find('4326') < 0:
-        gdaltest.post_reason('fail')
         print(ds.GetProjectionRef())
         return 'fail'
     got_gt = ds.GetGeoTransform()
     expected_gt = (2, 0.1, 0, 49, 0, -0.1)
     for i in range(6):
         if abs(got_gt[i] - expected_gt[i]) > 1e-5:
-            gdaltest.post_reason('fail')
             print(got_gt)
             return 'fail'
     ds = None
@@ -2059,11 +1929,9 @@ def test_jp2openjpeg_41():
     out_ds = gdaltest.jp2openjpeg_drv.CreateCopy('/vsimem/jp2openjpeg_41.jp2', src_ds,
                                                  options=['USE_SRC_CODESTREAM=YES', 'PROFILE=PROFILE_1', 'GEOJP2=NO', 'GMLJP2=NO'])
     if src_ds.GetRasterBand(1).Checksum() != out_ds.GetRasterBand(1).Checksum():
-        gdaltest.post_reason('fail')
         return 'fail'
     del out_ds
     if gdal.VSIStatL('/vsimem/jp2openjpeg_41.jp2').size != 9923:
-        gdaltest.post_reason('fail')
         return 'fail'
     gdal.Unlink('/vsimem/jp2openjpeg_41.jp2')
     gdal.Unlink('/vsimem/jp2openjpeg_41.jp2.aux.xml')
@@ -2076,7 +1944,6 @@ def test_jp2openjpeg_41():
     gdal.PopErrorHandler()
     del out_ds
     if gdal.GetLastErrorMsg() == '':
-        gdaltest.post_reason('fail')
         return 'fail'
     gdal.Unlink('/vsimem/jp2openjpeg_41.jp2')
     gdal.Unlink('/vsimem/jp2openjpeg_41.jp2.aux.xml')
@@ -2090,7 +1957,6 @@ def test_jp2openjpeg_41():
     gdal.PopErrorHandler()
     del out_ds
     if gdal.GetLastErrorMsg() == '':
-        gdaltest.post_reason('fail')
         return 'fail'
     gdal.Unlink('/vsimem/jp2openjpeg_41.jp2')
 
@@ -2120,13 +1986,11 @@ def test_jp2openjpeg_42():
     ds.SetMetadataItem('FOO', 'BAR')
     ds = None
     if gdal.VSIStatL('/vsimem/jp2openjpeg_42.jp2.aux.xml') is not None:
-        gdaltest.post_reason('fail')
         return 'fail'
 
     # Add metadata and GCP
     ds = gdal.Open('/vsimem/jp2openjpeg_42.jp2', gdal.GA_Update)
     if ds.GetMetadata() != {'FOO': 'BAR'}:
-        gdaltest.post_reason('fail')
         return 'fail'
     sr = osr.SpatialReference()
     sr.ImportFromEPSG(32631)
@@ -2134,19 +1998,15 @@ def test_jp2openjpeg_42():
     ds.SetGCPs(gcps, sr.ExportToWkt())
     ds = None
     if gdal.VSIStatL('/vsimem/jp2openjpeg_42.jp2.aux.xml') is not None:
-        gdaltest.post_reason('fail')
         return 'fail'
 
     # Check we got metadata and GCP, and there's no GMLJP2 box
     ds = gdal.Open('/vsimem/jp2openjpeg_42.jp2', gdal.GA_Update)
     if ds.GetMetadata() != {'FOO': 'BAR'}:
-        gdaltest.post_reason('fail')
         return 'fail'
     if ds.GetGCPCount() != 1:
-        gdaltest.post_reason('fail')
         return 'fail'
     if len(ds.GetMetadataDomainList()) != 2:
-        gdaltest.post_reason('fail')
         print(ds.GetMetadataDomainList())
         return 'fail'
     # Unset metadata and GCP
@@ -2154,20 +2014,16 @@ def test_jp2openjpeg_42():
     ds.SetGCPs([], '')
     ds = None
     if gdal.VSIStatL('/vsimem/jp2openjpeg_42.jp2.aux.xml') is not None:
-        gdaltest.post_reason('fail')
         return 'fail'
 
     # Check we have no longer metadata or GCP
     ds = gdal.Open('/vsimem/jp2openjpeg_42.jp2', gdal.GA_Update)
     if ds.GetMetadata() != {}:
         print(ds.GetMetadata())
-        gdaltest.post_reason('fail')
         return 'fail'
     if ds.GetGCPCount() != 0:
-        gdaltest.post_reason('fail')
         return 'fail'
     if ds.GetMetadataDomainList() != ['DERIVED_SUBDATASETS']:
-        gdaltest.post_reason('fail')
         print(ds.GetMetadataDomainList())
         return 'fail'
     # Add projection and geotransform
@@ -2175,22 +2031,18 @@ def test_jp2openjpeg_42():
     ds.SetGeoTransform([0, 1, 2, 3, 4, 5])
     ds = None
     if gdal.VSIStatL('/vsimem/jp2openjpeg_42.jp2.aux.xml') is not None:
-        gdaltest.post_reason('fail')
         return 'fail'
 
     # Check them
     ds = gdal.Open('/vsimem/jp2openjpeg_42.jp2', gdal.GA_Update)
     if ds.GetProjectionRef().find('32631') < 0:
-        gdaltest.post_reason('fail')
         print(ds.GetProjectionRef())
         return 'fail'
     if ds.GetGeoTransform() != (0, 1, 2, 3, 4, 5):
-        gdaltest.post_reason('fail')
         print(ds.GetGeoTransform())
         return 'fail'
     # Check that we have a GMLJP2 box
     if ds.GetMetadataDomainList() != ['xml:gml.root-instance', 'DERIVED_SUBDATASETS']:
-        gdaltest.post_reason('fail')
         print(ds.GetMetadataDomainList())
         return 'fail'
     # Remove projection and geotransform
@@ -2198,21 +2050,17 @@ def test_jp2openjpeg_42():
     ds.SetGeoTransform([0, 1, 0, 0, 0, 1])
     ds = None
     if gdal.VSIStatL('/vsimem/jp2openjpeg_42.jp2.aux.xml') is not None:
-        gdaltest.post_reason('fail')
         return 'fail'
 
     # Check we have no longer anything
     ds = gdal.Open('/vsimem/jp2openjpeg_42.jp2', gdal.GA_Update)
     if ds.GetProjectionRef() != '':
-        gdaltest.post_reason('fail')
         print(ds.GetProjectionRef())
         return 'fail'
     if ds.GetGeoTransform() != (0, 1, 0, 0, 0, 1):
-        gdaltest.post_reason('fail')
         print(ds.GetGeoTransform())
         return 'fail'
     if ds.GetMetadataDomainList() != ['DERIVED_SUBDATASETS']:
-        gdaltest.post_reason('fail')
         print(ds.GetMetadataDomainList())
         return 'fail'
     ds = None
@@ -2229,17 +2077,14 @@ def test_jp2openjpeg_42():
     ds.SetGeoTransform([1, 2, 3, 4, 5, 6])
     ds = None
     if gdal.VSIStatL('/vsimem/jp2openjpeg_42.jp2.aux.xml') is not None:
-        gdaltest.post_reason('fail')
         return 'fail'
 
     # Check it and that we don't have GMLJP2
     ds = gdal.Open('/vsimem/jp2openjpeg_42.jp2', gdal.GA_Update)
     if ds.GetGeoTransform() != (1, 2, 3, 4, 5, 6):
-        gdaltest.post_reason('fail')
         print(ds.GetGeoTransform())
         return 'fail'
     if ds.GetMetadataDomainList() != ['DERIVED_SUBDATASETS']:
-        gdaltest.post_reason('fail')
         print(ds.GetMetadataDomainList())
         return 'fail'
     ds = None
@@ -2254,23 +2099,19 @@ def test_jp2openjpeg_42():
     # Modify geotransform
     ds = gdal.Open('/vsimem/jp2openjpeg_42.jp2', gdal.GA_Update)
     if ds.GetGeoTransform() != (2, 3, 0, 4, 0, -5):
-        gdaltest.post_reason('fail')
         print(ds.GetGeoTransform())
         return 'fail'
     ds.SetGeoTransform([1, 2, 0, 3, 0, -4])
     ds = None
     if gdal.VSIStatL('/vsimem/jp2openjpeg_42.jp2.aux.xml') is not None:
-        gdaltest.post_reason('fail')
         return 'fail'
 
     # Check it
     ds = gdal.Open('/vsimem/jp2openjpeg_42.jp2', gdal.GA_Update)
     if ds.GetGeoTransform() != (1, 2, 0, 3, 0, -4):
-        gdaltest.post_reason('fail')
         print(ds.GetGeoTransform())
         return 'fail'
     if ds.GetMetadataDomainList() != ['xml:gml.root-instance', 'DERIVED_SUBDATASETS']:
-        gdaltest.post_reason('fail')
         print(ds.GetMetadataDomainList())
         return 'fail'
     # Add GCPs
@@ -2278,29 +2119,24 @@ def test_jp2openjpeg_42():
     ds.SetGCPs(gcps, sr.ExportToWkt())
     ds = None
     if gdal.VSIStatL('/vsimem/jp2openjpeg_42.jp2.aux.xml') is not None:
-        gdaltest.post_reason('fail')
         return 'fail'
 
     # Check it (a GeoJP2 box has been added and GMLJP2 removed)
     ds = gdal.Open('/vsimem/jp2openjpeg_42.jp2', gdal.GA_Update)
     if not ds.GetGCPs():
-        gdaltest.post_reason('fail')
         return 'fail'
     if ds.GetMetadataDomainList() != ['DERIVED_SUBDATASETS']:
-        gdaltest.post_reason('fail')
         print(ds.GetMetadataDomainList())
         return 'fail'
     # Add IPR box
     ds.SetMetadata(['<fake_ipr_box/>'], 'xml:IPR')
     ds = None
     if gdal.VSIStatL('/vsimem/jp2openjpeg_42.jp2.aux.xml') is not None:
-        gdaltest.post_reason('fail')
         return 'fail'
 
     # Check it
     ds = gdal.Open('/vsimem/jp2openjpeg_42.jp2', gdal.GA_Update)
     if ds.GetMetadata('xml:IPR')[0] != '<fake_ipr_box/>':
-        gdaltest.post_reason('fail')
         print(ds.GetMetadata('xml:IPR'))
         return 'fail'
     ds = None
@@ -2361,10 +2197,8 @@ def test_jp2openjpeg_45():
     src_ds = gdal.Open('data/byte.tif')
     out_ds = gdaltest.jp2openjpeg_drv.CreateCopy('/vsimem/jp2openjpeg_45.jp2', src_ds, options=['GMLJP2V2_DEF=YES'])
     if out_ds.GetLayerCount() != 0:
-        gdaltest.post_reason('fail')
         return 'fail'
     if out_ds.GetLayer(0) is not None:
-        gdaltest.post_reason('fail')
         return 'fail'
     del out_ds
 
@@ -2429,13 +2263,11 @@ def test_jp2openjpeg_45():
 </gmljp2:GMLJP2CoverageCollection>
 """
     if gmljp2 != minimal_instance:
-        gdaltest.post_reason('fail')
         print(gmljp2)
         return 'fail'
 
     ret = validate('/vsimem/jp2openjpeg_45.jp2', inspire_tg=False)
     if ret == 'fail':
-        gdaltest.post_reason('fail')
         return 'fail'
 
     gdal.Unlink('/vsimem/jp2openjpeg_45.jp2')
@@ -2446,7 +2278,6 @@ def test_jp2openjpeg_45():
     ds = gdal.Open('/vsimem/jp2openjpeg_45.jp2')
     gmljp2 = ds.GetMetadata_List("xml:gml.root-instance")[0]
     if gmljp2 != minimal_instance:
-        gdaltest.post_reason('fail')
         print(gmljp2)
         return 'fail'
     ds = None
@@ -2458,7 +2289,6 @@ def test_jp2openjpeg_45():
     out_ds = gdaltest.jp2openjpeg_drv.CreateCopy('/vsimem/jp2openjpeg_45.jp2', src_ds, options=['GMLJP2V2_DEF={'])
     gdal.PopErrorHandler()
     if out_ds is not None:
-        gdaltest.post_reason('fail')
         return 'fail'
 
     # Non existing file
@@ -2467,7 +2297,6 @@ def test_jp2openjpeg_45():
     out_ds = gdaltest.jp2openjpeg_drv.CreateCopy('/vsimem/jp2openjpeg_45.jp2', src_ds, options=['GMLJP2V2_DEF=/vsimem/i_do_not_exist'])
     gdal.PopErrorHandler()
     if out_ds is not None:
-        gdaltest.post_reason('fail')
         return 'fail'
 
     # Test JSon conf file as a file
@@ -2478,11 +2307,9 @@ def test_jp2openjpeg_45():
     ds = gdal.Open('/vsimem/jp2openjpeg_45.jp2')
     gmljp2 = ds.GetMetadata_List("xml:gml.root-instance")[0]
     if gmljp2.find('some_gml_id') < 0:
-        gdaltest.post_reason('fail')
         print(gmljp2)
         return 'fail'
     if gmljp2.find('urn:ogc:def:crs:EPSG::26711') < 0:
-        gdaltest.post_reason('fail')
         print(gmljp2)
         return 'fail'
     ds = None
@@ -2497,7 +2324,6 @@ def test_jp2openjpeg_45():
         ds = gdal.Open('/vsimem/jp2openjpeg_45.jp2')
         gmljp2 = ds.GetMetadata_List("xml:gml.root-instance")[0]
         if gmljp2.find(predefined[1]) < 0:
-            gdaltest.post_reason('fail')
             print(predefined[0])
             print(gmljp2)
             return 'fail'
@@ -2513,7 +2339,6 @@ def test_jp2openjpeg_45():
     ds = gdal.Open('/vsimem/jp2openjpeg_45.jp2')
     gmljp2 = ds.GetMetadata_List("xml:gml.root-instance")[0]
     if gmljp2.find('<gmlcov:rangeType></gmlcov:rangeType>') < 0:
-        gdaltest.post_reason('fail')
         print(gmljp2)
         return 'fail'
     ds = None
@@ -2536,7 +2361,6 @@ def test_jp2openjpeg_45():
     ds = gdal.Open('/vsimem/jp2openjpeg_45.jp2')
     gmljp2 = ds.GetMetadata_List("xml:gml.root-instance")[0]
     if gmljp2.find("custom_datarecord") < 0:
-        gdaltest.post_reason('fail')
         print(predefined[0])
         print(gmljp2)
         return 'fail'
@@ -2557,7 +2381,6 @@ def test_jp2openjpeg_45():
     out_ds = gdaltest.jp2openjpeg_drv.CreateCopy('/vsimem/jp2openjpeg_45.jp2', src_ds, options=['GMLJP2V2_DEF=' + json.dumps(conf)])
     gdal.PopErrorHandler()
     if out_ds is not None:
-        gdaltest.post_reason('fail')
         return 'fail'
 
     conf = {
@@ -2913,14 +2736,12 @@ def test_jp2openjpeg_45():
     # Now do the checks
     dircontent = gdal.ReadDir('/vsimem/gmljp2')
     if dircontent is not None:
-        gdaltest.post_reason('fail')
         print(dircontent)
         return 'fail'
 
     ds = gdal.Open('/vsimem/jp2openjpeg_45.jp2')
     gmljp2 = ds.GetMetadata_List("xml:gml.root-instance")[0]
     if gmljp2.find('my_GMLJP2RectifiedGridCoverage') < 0:
-        gdaltest.post_reason('fail')
         print(gmljp2)
         return 'fail'
     first_metadata_pos = gmljp2.find("First metadata")
@@ -2970,54 +2791,45 @@ def test_jp2openjpeg_45():
             style4_pos < extension1_pos and
             extension1_pos < extension3_pos and
             extension3_pos < extension4_pos):
-        gdaltest.post_reason('fail')
         print(gmljp2)
         return 'fail'
     # print(gmljp2)
 
     myshape_gml = ds.GetMetadata_List("xml:myshape.gml")[0]
     if myshape_gml.find("""<ogr1:FeatureCollection gml:id="ID_GMLJP2_0_1_aFeatureCollection" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://ogr.maptools.org/1 gmljp2://xml/myshape.xsd" xmlns:ogr1="http://ogr.maptools.org/1" xmlns:gml="http://www.opengis.net/gml/3.2">""") < 0:
-        gdaltest.post_reason('fail')
         print(myshape_gml)
         return 'fail'
     if myshape_gml.find("""http://www.opengis.net/def/crs/EPSG/0/4326""") < 0:
-        gdaltest.post_reason('fail')
         print(myshape_gml)
         return 'fail'
 
     myshape_xsd = ds.GetMetadata_List("xml:myshape.xsd")[0]
     if myshape_xsd.find("""<xs:schema targetNamespace="http://ogr.maptools.org/1" xmlns:ogr1="http://ogr.maptools.org/1" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:gml="http://www.opengis.net/gml/3.2" xmlns:gmlsf="http://www.opengis.net/gmlsf/2.0" elementFormDefault="qualified" version="1.0">""") < 0:
-        gdaltest.post_reason('fail')
         print(myshape_xsd)
         return 'fail'
 
     myshape2_gml = ds.GetMetadata_List("xml:myshape2.gml")[0]
     if myshape2_gml.find("""<ogr2:FeatureCollection gml:id="ID_GMLJP2_0_2_aFeatureCollection" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://ogr.maptools.org/ gmljp2://xml/a_schema.xsd" xmlns:ogr2="http://ogr.maptools.org/" xmlns:gml="http://www.opengis.net/gml/3.2">""") < 0:
-        gdaltest.post_reason('fail')
         print(myshape2_gml)
         return 'fail'
 
     feature2_gml = ds.GetMetadata_List("xml:feature2.gml")[0]
     if feature2_gml.find("""<FeatureCollection xmlns:ogr="http://ogr.maptools.org/" xmlns:gml="http://www.opengis.net/gml/3.2" xsi:schemaLocation="http://ogr.maptools.org/ gmljp2://xml/a_schema.xsd" gml:id="ID_GMLJP2_0_3_myFC3">""") < 0:
-        gdaltest.post_reason('fail')
         print(feature2_gml)
         return 'fail'
 
     feature3_gml = ds.GetMetadata_List("xml:feature3.gml")[0]
     if feature3_gml.find("""<FeatureCollection xmlns:ogr="http://ogr.maptools.org/" xmlns:gml="http://www.opengis.net/gml/3.2" xsi:schemaLocation="http://www.opengis.net/gml/3.2 http://schemas.opengis.net/gml/3.2.1/gml.xsd http://ogr.maptools.org/ gmljp2://xml/a_schema.xsd" gml:id="ID_GMLJP2_0_4_myFC4">""") < 0:
-        gdaltest.post_reason('fail')
         print(feature3_gml)
         return 'fail'
 
     myshape2_xsd = ds.GetMetadata_List("xml:a_schema.xsd")[0]
     if myshape2_xsd.find("""<xs:schema xmlns:ogr="http://ogr.maptools.org/" """) < 0:
-        gdaltest.post_reason('fail')
         print(myshape2_xsd)
         return 'fail'
 
     duplicated_xsd = ds.GetMetadata_List("xml:duplicated.xsd")[0]
     if duplicated_xsd.find("""<xs:schema xmlns:ogr="http://ogr.maptools.org/" """) < 0:
-        gdaltest.post_reason('fail')
         print(myshape2_xsd)
         return 'fail'
 
@@ -3025,7 +2837,6 @@ def test_jp2openjpeg_45():
 
     ds = ogr.Open('/vsimem/jp2openjpeg_45.jp2')
     if ds.GetLayerCount() != 6:
-        gdaltest.post_reason('fail')
         print(ds.GetLayerCount())
         return 'fail'
     expected_layers = ['FC_GridCoverage_1_myshape',
@@ -3036,7 +2847,6 @@ def test_jp2openjpeg_45():
                        'Annotation_1_myshape']
     for j in range(6):
         if ds.GetLayer(j).GetName() != expected_layers[j]:
-            gdaltest.post_reason('fail')
             for i in range(ds.GetLayerCount()):
                 print(ds.GetLayer(i).GetName())
             return 'fail'
@@ -3044,7 +2854,6 @@ def test_jp2openjpeg_45():
 
     ret = validate('/vsimem/jp2openjpeg_45.jp2', inspire_tg=False)
     if ret == 'fail':
-        gdaltest.post_reason('fail')
         return 'fail'
 
     gdal.Unlink('/vsimem/jp2openjpeg_45.jp2')
@@ -3056,17 +2865,14 @@ def test_jp2openjpeg_45():
 
     dircontent = gdal.ReadDir('/vsimem/gmljp2')
     if dircontent is not None:
-        gdaltest.post_reason('fail')
         print(dircontent)
         return 'fail'
 
     ds = ogr.Open('/vsimem/jp2openjpeg_45.jp2')
     if ds.GetLayerCount() != 1:
-        gdaltest.post_reason('fail')
         print(ds.GetLayerCount())
         return 'fail'
     if ds.GetLayer(0).GetName() != 'FC_GridCoverage_1_poly':
-        gdaltest.post_reason('fail')
         print(ds.GetLayer(0).GetName())
         return 'fail'
     ds = None
@@ -3085,7 +2891,6 @@ def test_jp2openjpeg_45():
     out_ds = gdaltest.jp2openjpeg_drv.CreateCopy('/vsimem/jp2openjpeg_45.jp2', src_ds, options=['GMLJP2V2_DEF=' + json.dumps(conf)])
     del out_ds
     if gdal.VSIStatL('/vsimem/jp2openjpeg_45.jp2.aux.xml') is not None:
-        gdaltest.post_reason('fail')
         fp = gdal.VSIFOpenL('/vsimem/jp2openjpeg_45.jp2.aux.xml', 'rb')
         if fp is not None:
             data = gdal.VSIFReadL(1, 100000, fp).decode('ascii')
@@ -3095,7 +2900,6 @@ def test_jp2openjpeg_45():
 
     ds = gdal.Open('/vsimem/jp2openjpeg_45.jp2')
     if ds.GetMetadata() != {'FOO': 'BAR'}:
-        gdaltest.post_reason('fail')
         print(ds.GetMetadata())
         return 'fail'
     ds = None
@@ -3110,7 +2914,6 @@ def test_jp2openjpeg_45():
     # Nothing should be reported by default
     ds = ogr.Open('/vsimem/jp2openjpeg_45.jp2')
     if ds is not None:
-        gdaltest.post_reason('fail')
         return 'fail'
     ds = None
 
@@ -3121,10 +2924,8 @@ def test_jp2openjpeg_45():
     if ds is None:
         if gdaltest.gdalurlopen('https://raw.githubusercontent.com/OSGeo/gdal/master/autotest/ogr/data/expected_gml_gml32.gml') is None:
             return 'skip'
-        gdaltest.post_reason('fail')
         return 'fail'
     if ds.GetLayerCount() != 1:
-        gdaltest.post_reason('fail')
         return 'fail'
     ds = None
 
@@ -3181,7 +2982,6 @@ def test_jp2openjpeg_46():
     if gmljp2.find("""<gmljp2:metadata>1 str trueX
         <B>my_value</B>
 yeah: """) < 0:
-        gdaltest.post_reason('fail')
         print(gmljp2)
         if gmljp2.find("""<gmljp2:metadata>1 str true""") >= 0:
             return 'skip'
@@ -3219,7 +3019,6 @@ def test_jp2openjpeg_46():
         gdal.Unlink('/vsimem/jp2openjpeg_46.jp2')
 
         if gmljp2.find('<gmljp2:metadata>') >= 0:
-            gdaltest.post_reason('fail')
             print(invalid_template)
             print(gmljp2)
             return 'fail'
@@ -3315,12 +3114,10 @@ def test_jp2openjpeg_47():
     out_ds = gdaltest.jp2openjpeg_drv.CreateCopy('/vsimem/jp2openjpeg_47.jp2', src_ds)
     del out_ds
     if gdal.VSIStatL('/vsimem/jp2openjpeg_47.jp2.aux.xml') is not None:
-        gdaltest.post_reason('fail')
         return 'fail'
 
     ds = gdal.Open('/vsimem/jp2openjpeg_47.jp2')
     if ds.GetMetadata('RPC') is None:
-        gdaltest.post_reason('fail')
         return 'fail'
     ds = None
 
@@ -3340,11 +3137,9 @@ def test_jp2openjpeg_48():
     ds = gdal.Open('data/byte_tile_2048.jp2')
     (blockxsize, blockysize) = ds.GetRasterBand(1).GetBlockSize()
     if (blockxsize, blockysize) != (20, 20):
-        gdaltest.post_reason('fail')
         print(blockxsize, blockysize)
         return 'fail'
     if ds.GetRasterBand(1).Checksum() != 4610:
-        gdaltest.post_reason('fail')
         return 'fail'
     ds = None
 
@@ -3692,13 +3487,11 @@ def test_jp2openjpeg_codeblock_style():
         gdaltest.jp2openjpeg_drv.CreateCopy(filename, gdal.Open('data/byte.tif'),
                                             options=options)
         if gdal.GetLastErrorMsg() != '':
-            gdaltest.post_reason('fail')
             return 'fail'
         ds = gdal.Open(filename)
         cs = ds.GetRasterBand(1).Checksum()
         ds = None
         if cs != 4672:
-            gdaltest.post_reason('fail')
             print(cs)
             return 'fail'
 
@@ -3706,14 +3499,12 @@ def test_jp2openjpeg_codeblock_style():
         gdaltest.jp2openjpeg_drv.CreateCopy(filename, gdal.Open('data/byte.tif'),
                                             options=['CODEBLOCK_STYLE=64'])
     if gdal.GetLastErrorMsg() == '':
-        gdaltest.post_reason('fail')
         return 'fail'
 
     with gdaltest.error_handler():
         gdaltest.jp2openjpeg_drv.CreateCopy(filename, gdal.Open('data/byte.tif'),
                                             options=['CODEBLOCK_STYLE=UNSUPPORTED'])
     if gdal.GetLastErrorMsg() == '':
-        gdaltest.post_reason('fail')
         return 'fail'
 
     gdaltest.jp2openjpeg_drv.Delete(filename)
diff --git a/autotest/gdrivers/jpeg.py b/autotest/gdrivers/jpeg.py
index baa2a2732d48..0e64b2958b6a 100755
--- a/autotest/gdrivers/jpeg.py
+++ b/autotest/gdrivers/jpeg.py
@@ -583,16 +583,12 @@ def test_jpeg_16():
 
     ds = gdal.Open('tmp/albania.jpg')
     if ds.GetRasterBand(1).GetOverviewCount() != 1:
-        gdaltest.post_reason('fail')
         return 'fail'
     if ds.GetRasterBand(1).GetOverview(-1) is not None:
-        gdaltest.post_reason('fail')
         return 'fail'
     if ds.GetRasterBand(1).GetOverview(1) is not None:
-        gdaltest.post_reason('fail')
         return 'fail'
     if ds.GetRasterBand(1).GetOverview(0) is None:
-        gdaltest.post_reason('fail')
         return 'fail'
     # "Internal" overview
 
@@ -602,14 +598,12 @@ def test_jpeg_16():
     else:
         expected_cs = 31892
     if cs != expected_cs:
-        gdaltest.post_reason('fail')
         print(cs)
         return 'fail'
 
     # Build external overviews
     ds.BuildOverviews('NEAR', [2, 4])
     if ds.GetRasterBand(1).GetOverviewCount() != 2:
-        gdaltest.post_reason('fail')
         return 'fail'
     # Check updated checksum
     cs = ds.GetRasterBand(1).GetOverview(0).Checksum()
@@ -618,7 +612,6 @@ def test_jpeg_16():
     else:
         expected_cs = 32460
     if cs != expected_cs:
-        gdaltest.post_reason('fail')
         print(cs)
         return 'fail'
 
@@ -627,7 +620,6 @@ def test_jpeg_16():
     # Check we are using external overviews
     ds = gdal.Open('tmp/albania.jpg')
     if ds.GetRasterBand(1).GetOverviewCount() != 2:
-        gdaltest.post_reason('fail')
         return 'fail'
     cs = ds.GetRasterBand(1).GetOverview(0).Checksum()
     if gdaltest.jpeg_version in ('8', '9b'):
@@ -635,7 +627,6 @@ def test_jpeg_16():
     else:
         expected_cs = 32460
     if cs != expected_cs:
-        gdaltest.post_reason('fail')
         print(cs)
         return 'fail'
 
@@ -654,7 +645,6 @@ def test_jpeg_17():
         if (ds is not None or
             gdal.GetLastErrorType() != gdal.CE_Failure or
                 gdal.GetLastErrorMsg() == ''):
-            gdaltest.post_reason('fail')
             return 'fail'
 
     gdal.ErrorReset()
@@ -666,7 +656,6 @@ def test_jpeg_17():
             gdal.GetLastErrorMsg() == ''):
         # libjpeg-turbo 1.4.0 doesn't emit errors...
         if cs != 4925:
-            gdaltest.post_reason('fail')
             return 'fail'
 
     gdal.ErrorReset()
@@ -678,7 +667,6 @@ def test_jpeg_17():
 
     if (gdal.GetLastErrorType() != gdal.CE_Warning or
             gdal.GetLastErrorMsg() == ''):
-        gdaltest.post_reason('fail')
         return 'fail'
 
     gdal.ErrorReset()
@@ -692,7 +680,6 @@ def test_jpeg_17():
 
     if (gdal.GetLastErrorType() != gdal.CE_Failure or
             gdal.GetLastErrorMsg() == ''):
-        gdaltest.post_reason('fail')
         return 'fail'
 
     return 'success'
@@ -734,11 +721,9 @@ def test_jpeg_18():
         return 'fail'
     line1023_bis = ds.GetRasterBand(1).ReadRaster(0, height - 1, width, 1)
     if line1023_bis == line0 or line1023 != line1023_bis:
-        gdaltest.post_reason('fail')
         return 'fail'
     line0_bis = ds.GetRasterBand(1).ReadRaster(0, 0, width, 1)
     if line0 != line0_bis:
-        gdaltest.post_reason('fail')
         return 'fail'
     line255_ovr1 = ds.GetRasterBand(1).GetOverview(1).ReadRaster(
         0, int(height / 4) - 1, int(width / 4), 1)
@@ -747,17 +732,14 @@ def test_jpeg_18():
         return 'fail'
     line0_bis = ds.GetRasterBand(1).ReadRaster(0, 0, width, 1)
     if line0 != line0_bis:
-        gdaltest.post_reason('fail')
         return 'fail'
     line0_ovr1_bis = ds.GetRasterBand(1).GetOverview(1).ReadRaster(
         0, 0, int(width / 4), 1)
     if line0_ovr1 != line0_ovr1_bis:
-        gdaltest.post_reason('fail')
         return 'fail'
     line255_ovr1_bis = ds.GetRasterBand(1).GetOverview(1).ReadRaster(
         0, int(height / 4) - 1, int(width / 4), 1)
     if line255_ovr1 != line255_ovr1_bis:
-        gdaltest.post_reason('fail')
         return 'fail'
 
     gdal.SetCacheMax(oldSize)
@@ -811,11 +793,9 @@ def test_jpeg_19():
 
         if (width, height, iX) == (24, 25, 8):
             if data1 != data2:
-                gdaltest.post_reason('fail')
                 return 'fail'
         else:
             if data1 == data2:
-                gdaltest.post_reason('fail')
                 return 'fail'
 
         # Check the file with the LSB bit mask order
@@ -824,7 +804,6 @@ def test_jpeg_19():
             0, 0, width, height)
         ds = None
         if tiff_mask_data != jpg_mask_data:
-            gdaltest.post_reason('fail')
             return 'fail'
 
         # Check the file with the MSB bit mask order
@@ -833,7 +812,6 @@ def test_jpeg_19():
             0, 0, width, height)
         ds = None
         if tiff_mask_data != jpg_mask_data:
-            gdaltest.post_reason('fail')
             return 'fail'
 
         gdal.GetDriverByName('GTiff').Delete('/vsimem/jpeg_19.tif')
@@ -854,14 +832,11 @@ def test_jpeg_20():
 
     ds = gdal.Open('/vsimem/jpeg_20.jpg')
     if ds.GetGCPProjection().find('GEOGCS["WGS 84"') != 0:
-        gdaltest.post_reason('failure')
         print(ds.GetGCPProjection())
         return 'fail'
     if ds.GetGCPCount() != 4:
-        gdaltest.post_reason('failure')
         return 'fail'
     if len(ds.GetGCPs()) != 4:
-        gdaltest.post_reason('failure')
         return 'fail'
     ds = None
 
@@ -877,7 +852,6 @@ def test_jpeg_21():
 
     ds = gdal.Open('data/black_with_white_exif_ovr.jpg')
     if ds.GetRasterBand(1).GetOverviewCount() != 3:
-        gdaltest.post_reason('failure')
         print(ds.GetRasterBand(1).GetOverviewCount())
         return 'fail'
     expected_dim_cs = [[512, 512, 0], [256, 256, 0], [196, 196, 12681]]
@@ -888,7 +862,6 @@ def test_jpeg_21():
         if (ovr.XSize != expected_w or
             ovr.YSize != expected_h or
                 cs != expected_cs):
-            gdaltest.post_reason('failure')
             print(ovr.XSize)
             print(ovr.YSize)
             print(cs)
@@ -910,13 +883,11 @@ def test_jpeg_22():
         '/vsimem/jpeg_22.jpg', src_ds, options=['EXIF_THUMBNAIL=YES'])
     src_ds = None
     if ds.GetRasterBand(1).GetOverviewCount() != 4:
-        gdaltest.post_reason('failure')
         print(ds.GetRasterBand(1).GetOverviewCount())
         return 'fail'
     ovr = ds.GetRasterBand(1).GetOverview(3)
     cs = ovr.Checksum()
     if ovr.XSize != 128 or ovr.YSize != 64 or cs != 34957:
-        gdaltest.post_reason('failure')
         print(ovr.XSize)
         print(ovr.YSize)
         print(cs)
@@ -931,7 +902,6 @@ def test_jpeg_22():
     src_ds = None
     ovr = ds.GetRasterBand(1).GetOverview(3)
     if ovr.XSize != 64 or ovr.YSize != 128:
-        gdaltest.post_reason('failure')
         print(ovr.XSize)
         print(ovr.YSize)
         return 'fail'
@@ -946,10 +916,8 @@ def test_jpeg_22():
     src_ds = None
     ovr = ds.GetRasterBand(1).GetOverview(3)
     if ds.GetMetadataItem('COMMENT') != 'foo':
-        gdaltest.post_reason('failure')
         return 'fail'
     if ovr.XSize != 40 or ovr.YSize != 80:
-        gdaltest.post_reason('failure')
         print(ovr.XSize)
         print(ovr.YSize)
         return 'fail'
@@ -963,7 +931,6 @@ def test_jpeg_22():
     src_ds = None
     ovr = ds.GetRasterBand(1).GetOverview(3)
     if ovr.XSize != 30 or ovr.YSize != 60:
-        gdaltest.post_reason('failure')
         print(ovr.XSize)
         print(ovr.YSize)
         return 'fail'
@@ -979,7 +946,6 @@ def test_jpeg_22():
     src_ds = None
     ovr = ds.GetRasterBand(1).GetOverview(3)
     if ovr.XSize != 50 or ovr.YSize != 40:
-        gdaltest.post_reason('failure')
         print(ovr.XSize)
         print(ovr.YSize)
         return 'fail'
@@ -1004,7 +970,6 @@ def test_jpeg_23():
     tmp_ds.WriteRaster(0, 0, ds.RasterXSize, ds.RasterYSize, data)
     got_cs = [tmp_ds.GetRasterBand(i + 1).Checksum() for i in range(3)]
     if cs != got_cs:
-        gdaltest.post_reason('failure')
         return 'fail'
 
     # Pixel interleaved
@@ -1016,7 +981,6 @@ def test_jpeg_23():
                        buf_pixel_space=3, buf_band_space=1)
     got_cs = [tmp_ds.GetRasterBand(i + 1).Checksum() for i in range(3)]
     if cs != got_cs:
-        gdaltest.post_reason('failure')
         return 'fail'
 
     # Pixel interleaved with padding
@@ -1028,7 +992,6 @@ def test_jpeg_23():
                        buf_pixel_space=4, buf_band_space=1)
     got_cs = [tmp_ds.GetRasterBand(i + 1).Checksum() for i in range(3)]
     if cs != got_cs:
-        gdaltest.post_reason('failure')
         return 'fail'
 
     return 'success'
@@ -1120,7 +1083,6 @@ def test_jpeg_27():
     with gdaltest.error_handler():
         cs = ds.GetRasterBand(1).Checksum()
         if cs != 0 or gdal.GetLastErrorMsg() == '':
-            gdaltest.post_reason('fail')
             return 'fail'
 
     # Should error out with 'Scan number...
@@ -1133,7 +1095,6 @@ def test_jpeg_27():
         gdal.SetConfigOption('GDAL_ALLOW_LARGE_LIBJPEG_MEM_ALLOC', None)
         gdal.SetConfigOption('GDAL_JPEG_MAX_ALLOWED_SCAN_NUMBER', None)
         if gdal.GetLastErrorMsg() == '':
-            gdaltest.post_reason('fail')
             return 'fail'
 
     return 'success'
@@ -1152,7 +1113,6 @@ def test_jpeg_28():
     src_ds = None
     ds = gdal.Open(tmpfilename)
     if ds.GetMetadata():
-        gdaltest.post_reason('fail')
         return 'fail'
 
     # EXIF tags only
@@ -1184,13 +1144,11 @@ def test_jpeg_28():
         gdal.GetDriverByName('JPEG').CreateCopy(tmpfilename, src_ds)
     src_ds = None
     if gdal.VSIStatL(tmpfilename + '.aux.xml') is not None:
-        gdaltest.post_reason('fail')
         return 'fail'
     ds = gdal.Open(tmpfilename)
     got_md = ds.GetMetadata()
     expected_md = {'EXIF_DateTimeDigitized': '0123456789012345678', 'EXIF_DateTimeOriginal': '0123456789012345678', 'EXIF_Orientation': '10', 'EXIF_ApertureValue': '(0)', 'EXIF_YResolution': '(96)', 'EXIF_XResolution': '(96)', 'EXIF_TransferFunction': '0 1 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0', 'EXIF_ExifVersion': '0123', 'EXIF_DateTime': 'dt                 ', 'EXIF_FlashpixVersion': 'ABCD', 'EXIF_ComponentsConfiguration': '0x1f 0x00 0x00 0x00', 'EXIF_Make': 'make', 'EXIF_StandardOutputSensitivity': '123456789', 'EXIF_ResolutionUnit': '2', 'EXIF_CompressedBitsPerPixel': '(0)', 'EXIF_SpatialFrequencyResponse': '0xab 0xcd', 'EXIF_ISOSpeedRatings': '1 2 3'}
     if got_md != expected_md:
-        gdaltest.post_reason('fail')
         print(got_md)
         return 'fail'
 
@@ -1201,13 +1159,11 @@ def test_jpeg_28():
         gdal.GetDriverByName('JPEG').CreateCopy(tmpfilename, src_ds)
         src_ds = None
         if gdal.VSIStatL(tmpfilename + '.aux.xml') is not None:
-            gdaltest.post_reason('fail')
             return 'fail'
         ds = gdal.Open(tmpfilename)
         got_val = ds.GetMetadataItem('EXIF_ShutterSpeedValue')
         got_val = got_val.replace('(', '').replace(')', '')
         if float(got_val) != val:
-            gdaltest.post_reason('fail')
             print(val)
             print(ds.GetMetadataItem('EXIF_ShutterSpeedValue'))
             return 'fail'
@@ -1219,13 +1175,11 @@ def test_jpeg_28():
         gdal.GetDriverByName('JPEG').CreateCopy(tmpfilename, src_ds)
         src_ds = None
         if gdal.VSIStatL(tmpfilename + '.aux.xml') is not None:
-            gdaltest.post_reason('fail')
             return 'fail'
         ds = gdal.Open(tmpfilename)
         got_val = ds.GetMetadataItem('EXIF_ApertureValue')
         got_val = got_val.replace('(', '').replace(')', '')
         if float(got_val) != val:
-            gdaltest.post_reason('fail')
             print(val)
             print(ds.GetMetadataItem('EXIF_ApertureValue'))
             return 'fail'
@@ -1237,12 +1191,10 @@ def test_jpeg_28():
     gdal.GetDriverByName('JPEG').CreateCopy(tmpfilename, src_ds)
     src_ds = None
     if gdal.VSIStatL(tmpfilename + '.aux.xml') is not None:
-        gdaltest.post_reason('fail')
         return 'fail'
     ds = gdal.Open(tmpfilename)
     got_md = ds.GetMetadata()
     if got_md != {'EXIF_GPSLatitudeRef': 'N', 'EXIF_GPSLatitude': '(49) (34) (56.5)'}:
-        gdaltest.post_reason('fail')
         print(got_md)
         return 'fail'
     ds = None
@@ -1254,12 +1206,10 @@ def test_jpeg_28():
     gdal.GetDriverByName('JPEG').CreateCopy(tmpfilename, src_ds)
     src_ds = None
     if gdal.VSIStatL(tmpfilename + '.aux.xml') is not None:
-        gdaltest.post_reason('fail')
         return 'fail'
     ds = gdal.Open(tmpfilename)
     got_md = ds.GetMetadata()
     if got_md != {'EXIF_ExifVersion': '0231', 'EXIF_GPSLatitudeRef': 'N'}:
-        gdaltest.post_reason('fail')
         print(got_md)
         return 'fail'
     ds = None
@@ -1273,12 +1223,10 @@ def test_jpeg_28():
         gdal.GetDriverByName('JPEG').CreateCopy(tmpfilename, src_ds)
     src_ds = None
     if gdal.VSIStatL(tmpfilename + '.aux.xml') is None:
-        gdaltest.post_reason('fail')
         return 'fail'
     ds = gdal.Open(tmpfilename)
     got_md = ds.GetMetadata()
     if got_md != {'EXIF_ExifVersion': '0231', 'EXIF_invalid': 'foo', 'FOO': 'BAR'}:
-        gdaltest.post_reason('fail')
         print(got_md)
         return 'fail'
     ds = None
@@ -1299,16 +1247,13 @@ def test_jpeg_28():
                                             options=['EXIF_THUMBNAIL=YES', 'THUMBNAIL_WIDTH=32', 'THUMBNAIL_HEIGHT=32'])
     src_ds = None
     if gdal.VSIStatL(tmpfilename + '.aux.xml') is not None:
-        gdaltest.post_reason('fail')
         return 'fail'
     ds = gdal.Open(tmpfilename)
     got_md = ds.GetMetadata()
     if got_md != {'EXIF_ExifVersion': '0231', 'EXIF_GPSLatitudeRef': 'N'}:
-        gdaltest.post_reason('fail')
         print(got_md)
         return 'fail'
     if ds.GetRasterBand(1).GetOverview(ds.GetRasterBand(1).GetOverviewCount() - 1).XSize != 32:
-        gdaltest.post_reason('fail')
         return 'fail'
     ds = None
 
diff --git a/autotest/gdrivers/jpeg2000.py b/autotest/gdrivers/jpeg2000.py
index 4f9554e30c3b..b98a1b8d15d1 100755
--- a/autotest/gdrivers/jpeg2000.py
+++ b/autotest/gdrivers/jpeg2000.py
@@ -290,7 +290,6 @@ def test_jpeg2000_11():
         return 'fail'
     got_cs = fourth_band.Checksum()
     if got_cs != 8527:
-        gdaltest.post_reason('fail')
         print(got_cs)
         return 'fail'
     jp2_bands_data = ds.ReadRaster(0, 0, ds.RasterXSize, ds.RasterYSize)
@@ -306,22 +305,18 @@ def test_jpeg2000_11():
     tmp_ds = None
     gdal.GetDriverByName('GTiff').Delete('/vsimem/jpeg2000_11.tif')
     if got_cs != 8527:
-        gdaltest.post_reason('fail')
         print(got_cs)
         return 'fail'
 
     if jp2_bands_data != gtiff_bands_data:
-        gdaltest.post_reason('fail')
         return 'fail'
 
     if jp2_fourth_band_data != gtiff_fourth_band_data:
-        gdaltest.post_reason('fail')
         return 'fail'
 
     ds = gdal.OpenEx('data/stefan_full_rgba_alpha_1bit.jp2', open_options=['1BIT_ALPHA_PROMOTION=NO'])
     fourth_band = ds.GetRasterBand(4)
     if fourth_band.GetMetadataItem('NBITS', 'IMAGE_STRUCTURE') != '1':
-        gdaltest.post_reason('fail')
         return 'fail'
 
     return 'success'
diff --git a/autotest/gdrivers/jpeg_profile.py b/autotest/gdrivers/jpeg_profile.py
index 08eabc5ea909..8396f5a9090a 100755
--- a/autotest/gdrivers/jpeg_profile.py
+++ b/autotest/gdrivers/jpeg_profile.py
@@ -63,7 +63,6 @@ def test_jpeg_copy_icc():
     ds2 = None
 
     if md['SOURCE_ICC_PROFILE'] != icc:
-        gdaltest.post_reason('fail')
         return 'fail'
 
     # Check again with dataset from Open()
@@ -73,7 +72,6 @@ def test_jpeg_copy_icc():
     ds2 = None
 
     if md['SOURCE_ICC_PROFILE'] != icc:
-        gdaltest.post_reason('fail')
         return 'fail'
 
     driver_tiff.Delete('tmp/icc_test.tiff')
@@ -106,7 +104,6 @@ def test_jpeg_copy_options_icc():
     ds2 = None
 
     if md['SOURCE_ICC_PROFILE'] != icc:
-        gdaltest.post_reason('fail')
         return 'fail'
 
     # Check again with dataset from Open()
@@ -116,7 +113,6 @@ def test_jpeg_copy_options_icc():
     ds2 = None
 
     if md['SOURCE_ICC_PROFILE'] != icc:
-        gdaltest.post_reason('fail')
         return 'fail'
 
     driver_tiff.Delete('tmp/icc_test.tiff')
@@ -157,17 +153,14 @@ def test_jpeg_copy_icc_64K():
 
     try:
         os.stat('tmp/icc_test.jpg.aux.xml')
-        gdaltest.post_reason('fail')
         return 'fail'
     except OSError:
         pass
 
     if comment != 'foo':
-        gdaltest.post_reason('fail')
         return 'fail'
 
     if md['SOURCE_ICC_PROFILE'] != icc:
-        gdaltest.post_reason('fail')
         return 'fail'
 
     # Check again with dataset from Open()
@@ -177,13 +170,11 @@ def test_jpeg_copy_icc_64K():
 
     try:
         os.stat('tmp/icc_test.jpg.aux.xml')
-        gdaltest.post_reason('fail')
         return 'fail'
     except OSError:
         pass
 
     if md['SOURCE_ICC_PROFILE'] != icc:
-        gdaltest.post_reason('fail')
         return 'fail'
 
     # Check again with GetMetadataItem()
@@ -193,13 +184,11 @@ def test_jpeg_copy_icc_64K():
 
     try:
         os.stat('tmp/icc_test.jpg.aux.xml')
-        gdaltest.post_reason('fail')
         return 'fail'
     except OSError:
         pass
 
     if source_icc_profile != icc:
-        gdaltest.post_reason('fail')
         return 'fail'
 
     driver_tiff.Delete('tmp/icc_test.tiff')
diff --git a/autotest/gdrivers/kea.py b/autotest/gdrivers/kea.py
index c1dacc0e3fe7..f9a6faa23df0 100755
--- a/autotest/gdrivers/kea.py
+++ b/autotest/gdrivers/kea.py
@@ -110,19 +110,15 @@ def test_kea_4():
     ds = gdaltest.kea_driver.Create("/non_existing_path/non_existing_path", 1, 1)
     gdal.PopErrorHandler()
     if ds is not None:
-        gdaltest.post_reason('fail')
         return 'fail'
 
     src_ds = gdaltest.kea_driver.Create('tmp/src.kea', 1, 1, 0)
     if src_ds is None:
-        gdaltest.post_reason('fail')
         return 'fail'
     ds = gdaltest.kea_driver.CreateCopy("tmp/out.kea", src_ds)
     if ds is None:
-        gdaltest.post_reason('fail')
         return 'fail'
     if ds.RasterCount != 0:
-        gdaltest.post_reason('fail')
         return 'fail'
     src_ds = None
     ds = None
@@ -137,14 +133,12 @@ def test_kea_4():
     ret = ds.SetProjection('a')
     gdal.PopErrorHandler()
     if ret == 0:
-        gdaltest.post_reason('fail')
         return 'fail'
 
     gdal.PushErrorHandler('CPLQuietErrorHandler')
     ret = ds.SetGeoTransform([1, 2, 3, 4, 5, 6])
     gdal.PopErrorHandler()
     if ret == 0:
-        gdaltest.post_reason('fail')
         return 'fail'
 
     # Disabled for now since some of them cause memory leaks or
@@ -154,42 +148,36 @@ def test_kea_4():
         ret = ds.SetMetadataItem('foo', 'bar')
         gdal.PopErrorHandler()
         if ret == 0:
-            gdaltest.post_reason('fail')
             return 'fail'
 
         gdal.PushErrorHandler('CPLQuietErrorHandler')
         ret = ds.SetMetadata({'foo': 'bar'})
         gdal.PopErrorHandler()
         if ret == 0:
-            gdaltest.post_reason('fail')
             return 'fail'
 
         gdal.PushErrorHandler('CPLQuietErrorHandler')
         ret = ds.GetRasterBand(1).SetMetadataItem('foo', 'bar')
         gdal.PopErrorHandler()
         if ret == 0:
-            gdaltest.post_reason('fail')
             return 'fail'
 
         gdal.PushErrorHandler('CPLQuietErrorHandler')
         ret = ds.GetRasterBand(1).SetMetadata({'foo': 'bar'})
         gdal.PopErrorHandler()
         if ret == 0:
-            gdaltest.post_reason('fail')
             return 'fail'
 
         gdal.PushErrorHandler('CPLQuietErrorHandler')
         ret = ds.SetGCPs([], "")
         gdal.PopErrorHandler()
         if ret == 0:
-            gdaltest.post_reason('fail')
             return 'fail'
 
     gdal.PushErrorHandler('CPLQuietErrorHandler')
     ret = ds.AddBand(gdal.GDT_Byte)
     gdal.PopErrorHandler()
     if ret == 0:
-        gdaltest.post_reason('fail')
         return 'fail'
 
     ds.GetRasterBand(1).WriteRaster(0, 0, 1, 1, '\0')
@@ -198,7 +186,6 @@ def test_kea_4():
     ds.FlushCache()
     gdal.PopErrorHandler()
     if ds.GetRasterBand(1).Checksum() != 3:
-        gdaltest.post_reason('fail')
         return 'fail'
 
     ds = None
@@ -223,23 +210,18 @@ def test_kea_5():
     ds = None
     ds = gdal.Open('tmp/out.kea')
     if ds.GetRasterBand(1).GetBlockSize() != [15, 15]:
-        gdaltest.post_reason('fail')
         print(ds.GetRasterBand(1).GetBlockSize())
         return 'fail'
     if ds.GetRasterBand(1).GetMetadataItem('LAYER_TYPE') != 'thematic':
-        gdaltest.post_reason('fail')
         print(ds.GetRasterBand(1).GetMetadata())
         return 'fail'
     if ds.GetRasterBand(1).Checksum() != 0:
-        gdaltest.post_reason('fail')
         print(ds.GetRasterBand(1).Checksum())
         return 'fail'
     if ds.GetGeoTransform() != (0, 1, 0, 0, 0, -1):
-        gdaltest.post_reason('fail')
         print(ds.GetGeoTransform())
         return 'fail'
     if ds.GetProjectionRef() != '':
-        gdaltest.post_reason('fail')
         print(ds.GetProjectionRef())
         return 'fail'
     ds = None
@@ -265,83 +247,63 @@ def test_kea_6():
     ds.GetRasterBand(4).SetMetadataItem('LAYER_TYPE', 'thematic')
     ds.GetRasterBand(5).SetMetadataItem('LAYER_TYPE', 'athematic')
     if ds.SetMetadata({'foo': 'bar'}, 'other_domain') == 0:
-        gdaltest.post_reason('fail')
         return 'fail'
     if ds.SetMetadataItem('foo', 'bar', 'other_domain') == 0:
-        gdaltest.post_reason('fail')
         return 'fail'
     if ds.GetRasterBand(1).SetMetadata({'foo': 'bar'}, 'other_domain') == 0:
-        gdaltest.post_reason('fail')
         return 'fail'
     if ds.GetRasterBand(1).SetMetadataItem('foo', 'bar', 'other_domain') == 0:
-        gdaltest.post_reason('fail')
         return 'fail'
     ds = None
 
     ds = gdal.Open('tmp/out.kea')
     if ds.GetMetadata('other_domain') != {}:
-        gdaltest.post_reason('fail')
         print(ds.GetMetadata('other_domain'))
         return 'fail'
     if ds.GetMetadataItem('item', 'other_domain') is not None:
-        gdaltest.post_reason('fail')
         return 'fail'
     if ds.GetRasterBand(1).GetMetadata('other_domain') != {}:
-        gdaltest.post_reason('fail')
         return 'fail'
     if ds.GetRasterBand(1).GetMetadataItem('item', 'other_domain') is not None:
-        gdaltest.post_reason('fail')
         return 'fail'
     md = ds.GetMetadata()
     if md['foo'] != 'bar':
-        gdaltest.post_reason('fail')
         print(md)
         return 'fail'
     if ds.GetMetadataItem('foo') != 'bar':
-        gdaltest.post_reason('fail')
         print(ds.GetMetadataItem('foo'))
         return 'fail'
     if ds.GetMetadataItem('bar') != 'baw':
-        gdaltest.post_reason('fail')
         print(ds.GetMetadataItem('bar'))
         return 'fail'
     if ds.GetRasterBand(1).GetDescription() != 'desc':
-        gdaltest.post_reason('fail')
         return 'fail'
     md = ds.GetRasterBand(1).GetMetadata()
     if md['bar'] != 'baz':
-        gdaltest.post_reason('fail')
         print(md)
         return 'fail'
     if ds.GetRasterBand(1).GetMetadataItem('bar') != 'baz':
-        gdaltest.post_reason('fail')
         print(ds.GetRasterBand(1).GetMetadataItem('bar'))
         return 'fail'
     if ds.GetRasterBand(2).GetMetadataItem('LAYER_TYPE') != 'thematic':
-        gdaltest.post_reason('fail')
         print(ds.GetRasterBand(2).GetMetadataItem('LAYER_TYPE'))
         return 'fail'
     if ds.GetRasterBand(3).GetMetadataItem('LAYER_TYPE') != 'athematic':
-        gdaltest.post_reason('fail')
         print(ds.GetRasterBand(3).GetMetadataItem('LAYER_TYPE'))
         return 'fail'
     if ds.GetRasterBand(4).GetMetadataItem('LAYER_TYPE') != 'thematic':
-        gdaltest.post_reason('fail')
         print(ds.GetRasterBand(4).GetMetadataItem('LAYER_TYPE'))
         return 'fail'
     if ds.GetRasterBand(5).GetMetadataItem('LAYER_TYPE') != 'athematic':
-        gdaltest.post_reason('fail')
         print(ds.GetRasterBand(5).GetMetadataItem('LAYER_TYPE'))
         return 'fail'
     out2_ds = gdaltest.kea_driver.CreateCopy('tmp/out2.kea', ds)
     ds = None
 
     if out2_ds.GetMetadataItem('foo') != 'bar':
-        gdaltest.post_reason('fail')
         print(out2_ds.GetMetadataItem('foo'))
         return 'fail'
     if out2_ds.GetRasterBand(1).GetMetadataItem('bar') != 'baz':
-        gdaltest.post_reason('fail')
         print(out2_ds.GetRasterBand(1).GetMetadataItem('bar'))
         return 'fail'
 
@@ -363,13 +325,10 @@ def test_kea_7():
     # Geotransform
     ds = gdaltest.kea_driver.Create("tmp/out.kea", 1, 1)
     if ds.GetGCPCount() != 0:
-        gdaltest.post_reason('fail')
         return 'fail'
     if ds.SetGeoTransform([1, 2, 3, 4, 5, 6]) != 0:
-        gdaltest.post_reason('fail')
         return 'fail'
     if ds.SetProjection('foo') != 0:
-        gdaltest.post_reason('fail')
         return 'fail'
     ds = None
 
@@ -377,14 +336,11 @@ def test_kea_7():
     out2_ds = gdaltest.kea_driver.CreateCopy('tmp/out2.kea', ds)
     ds = None
     if out2_ds.GetGCPCount() != 0:
-        gdaltest.post_reason('fail')
         return 'fail'
     if out2_ds.GetGeoTransform() != (1, 2, 3, 4, 5, 6):
-        gdaltest.post_reason('fail')
         print(out2_ds.GetGeoTransform())
         return 'fail'
     if out2_ds.GetProjectionRef() != 'foo':
-        gdaltest.post_reason('fail')
         print(out2_ds.GetProjectionRef())
         return 'fail'
     out2_ds = None
@@ -407,10 +363,8 @@ def test_kea_7():
     ds = None
 
     if out2_ds.GetGCPCount() != 2:
-        gdaltest.post_reason('fail')
         return 'fail'
     if out2_ds.GetGCPProjection() != 'foo':
-        gdaltest.post_reason('fail')
         return 'fail'
     got_gcps = out2_ds.GetGCPs()
     for i in range(2):
@@ -420,7 +374,6 @@ def test_kea_7():
            got_gcps[i].Info != gcps[i].Info:
             print(i)
             print(got_gcps[i])
-            gdaltest.post_reason('fail')
             return 'fail'
     out2_ds = None
 
@@ -440,22 +393,18 @@ def test_kea_8():
     for i in range(2):
         ds = gdaltest.kea_driver.Create("tmp/out.kea", 1, 1)
         if ds.GetRasterBand(1).GetColorTable() is not None:
-            gdaltest.post_reason('fail')
             return 'fail'
         if ds.GetRasterBand(1).SetColorTable(None) == 0:  # not allowed by the driver
-            gdaltest.post_reason('fail')
             return 'fail'
         ct = gdal.ColorTable()
         ct.SetColorEntry(0, (0, 255, 0, 255))
         ct.SetColorEntry(1, (255, 0, 255, 255))
         ct.SetColorEntry(2, (0, 0, 255, 255))
         if ds.GetRasterBand(1).SetColorTable(ct) != 0:
-            gdaltest.post_reason('fail')
             return 'fail'
         if i == 1:
             # And again
             if ds.GetRasterBand(1).SetColorTable(ct) != 0:
-                gdaltest.post_reason('fail')
                 return 'fail'
         ds = None
 
@@ -487,7 +436,6 @@ def test_kea_9():
 
     ds = gdaltest.kea_driver.Create("tmp/out.kea", 1, 1, gdal.GCI_YCbCr_CrBand - gdal.GCI_GrayIndex + 1)
     if ds.GetRasterBand(1).GetColorInterpretation() != gdal.GCI_GrayIndex:
-        gdaltest.post_reason('fail')
         return 'fail'
     for i in range(gdal.GCI_GrayIndex, gdal.GCI_YCbCr_CrBand + 1):
         ds.GetRasterBand(i).SetColorInterpretation(i)
@@ -543,7 +491,6 @@ def test_kea_10():
                                   ]:
         ds = gdaltest.kea_driver.Create("tmp/out.kea", 1, 1, 1, dt)
         if ds.GetRasterBand(1).GetNoDataValue() is not None:
-            gdaltest.post_reason('fail')
             return 'fail'
         ds.GetRasterBand(1).SetNoDataValue(nd)
         if ds.GetRasterBand(1).GetNoDataValue() != expected_nd:
@@ -566,7 +513,6 @@ def test_kea_10():
 
         ds = gdal.Open('tmp/out2.kea')
         if ds.GetRasterBand(1).GetNoDataValue() is not None:
-            gdaltest.post_reason('fail')
             return 'fail'
         ds = None
 
@@ -588,22 +534,17 @@ def test_kea_11():
 
     ds = gdal.Open('tmp/out.kea', gdal.GA_Update)
     if ds.AddBand(gdal.GDT_Byte) != 0:
-        gdaltest.post_reason('fail')
         return 'fail'
     if ds.AddBand(gdal.GDT_Int16, options=['DEFLATE=9']) != 0:
-        gdaltest.post_reason('fail')
         return 'fail'
     ds = None
 
     ds = gdal.Open('tmp/out.kea')
     if ds.RasterCount != 3:
-        gdaltest.post_reason('fail')
         return 'fail'
     if ds.GetRasterBand(2).DataType != gdal.GDT_Byte:
-        gdaltest.post_reason('fail')
         return 'fail'
     if ds.GetRasterBand(3).DataType != gdal.GDT_Int16:
-        gdaltest.post_reason('fail')
         return 'fail'
     ds = None
 
@@ -621,15 +562,12 @@ def test_kea_12():
 
     ds = gdaltest.kea_driver.Create("tmp/out.kea", 1, 1, 1, gdal.GDT_Byte)
     if ds.GetRasterBand(1).GetDefaultRAT().GetColumnCount() != 0:
-        gdaltest.post_reason('fail')
         return 'fail'
     if ds.GetRasterBand(1).SetDefaultRAT(None) == 0:  # not allowed by the driver
-        gdaltest.post_reason('fail')
         return 'fail'
     rat = ds.GetRasterBand(1).GetDefaultRAT()
     rat.CreateColumn('col_real_generic', gdal.GFT_Real, gdal.GFU_Generic)
     if ds.GetRasterBand(1).SetDefaultRAT(rat) != 0:
-        gdaltest.post_reason('fail')
         return 'fail'
     rat = ds.GetRasterBand(1).GetDefaultRAT()
     rat.CreateColumn('col_integer_pixelcount', gdal.GFT_Real, gdal.GFU_PixelCount)
@@ -654,7 +592,6 @@ def test_kea_12():
 
     cloned_rat = rat.Clone()
     if ds.GetRasterBand(1).SetDefaultRAT(rat) != 0:
-        gdaltest.post_reason('fail')
         return 'fail'
     ds = None
 
@@ -664,45 +601,33 @@ def test_kea_12():
 
     for i in range(7):
         if rat.GetColOfUsage(rat.GetUsageOfCol(i)) != i:
-            gdaltest.post_reason('fail')
             print(i)
             print(rat.GetColOfUsage(rat.GetUsageOfCol(i)))
             return 'fail'
 
     if cloned_rat.GetNameOfCol(0) != 'col_real_generic':
-        gdaltest.post_reason('fail')
         return 'fail'
     if cloned_rat.GetTypeOfCol(0) != gdal.GFT_Real:
-        gdaltest.post_reason('fail')
         return 'fail'
     if cloned_rat.GetUsageOfCol(0) != gdal.GFU_Generic:
-        gdaltest.post_reason('fail')
         return 'fail'
     if cloned_rat.GetUsageOfCol(1) != gdal.GFU_PixelCount:
-        gdaltest.post_reason('fail')
         return 'fail'
     if cloned_rat.GetTypeOfCol(2) != gdal.GFT_String:
-        gdaltest.post_reason('fail')
         return 'fail'
     if cloned_rat.GetTypeOfCol(3) != gdal.GFT_Integer:
-        gdaltest.post_reason('fail')
         return 'fail'
 
     if rat.GetColumnCount() != cloned_rat.GetColumnCount():
-        gdaltest.post_reason('fail')
         return 'fail'
     if rat.GetRowCount() != cloned_rat.GetRowCount():
-        gdaltest.post_reason('fail')
         return 'fail'
     for i in range(rat.GetColumnCount()):
         if rat.GetNameOfCol(i) != cloned_rat.GetNameOfCol(i):
-            gdaltest.post_reason('fail')
             return 'fail'
         if rat.GetTypeOfCol(i) != cloned_rat.GetTypeOfCol(i):
-            gdaltest.post_reason('fail')
             return 'fail'
         if rat.GetUsageOfCol(i) != cloned_rat.GetUsageOfCol(i):
-            gdaltest.post_reason('fail')
             print(i)
             print(rat.GetUsageOfCol(i))
             print(cloned_rat.GetUsageOfCol(i))
@@ -737,34 +662,25 @@ def test_kea_12():
     gdal.PopErrorHandler()
 
     if rat.GetValueAsDouble(0, 0) != 1.23:
-        gdaltest.post_reason('fail')
         return 'fail'
     if rat.GetValueAsInt(0, 0) != 1:
-        gdaltest.post_reason('fail')
         return 'fail'
     if rat.GetValueAsString(0, 0) != '1.23':
-        gdaltest.post_reason('fail')
         print(rat.GetValueAsString(0, 0))
         return 'fail'
 
     if rat.GetValueAsInt(0, 3) != 123:
-        gdaltest.post_reason('fail')
         return 'fail'
     if rat.GetValueAsDouble(0, 3) != 123:
-        gdaltest.post_reason('fail')
         return 'fail'
     if rat.GetValueAsString(0, 3) != '123':
-        gdaltest.post_reason('fail')
         return 'fail'
 
     if rat.GetValueAsString(0, 2) != 'foo':
-        gdaltest.post_reason('fail')
         return 'fail'
     if rat.GetValueAsInt(0, 2) != 0:
-        gdaltest.post_reason('fail')
         return 'fail'
     if rat.GetValueAsDouble(0, 2) != 0:
-        gdaltest.post_reason('fail')
         return 'fail'
 
     ds = None
@@ -791,22 +707,16 @@ def test_kea_13():
     ds = gdal.Open('tmp/out.kea')
     out2_ds = gdaltest.kea_driver.CreateCopy('tmp/out2.kea', ds)  # yes CreateCopy() of KEA copies overviews
     if out2_ds.GetRasterBand(1).GetOverviewCount() != 1:
-        gdaltest.post_reason('fail')
         return 'fail'
     if out2_ds.GetRasterBand(1).GetOverview(0).Checksum() != 1087:
-        gdaltest.post_reason('fail')
         return 'fail'
     if out2_ds.GetRasterBand(1).GetOverview(0).GetDefaultRAT() is not None:
-        gdaltest.post_reason('fail')
         return 'fail'
     if out2_ds.GetRasterBand(1).GetOverview(0).SetDefaultRAT(None) == 0:
-        gdaltest.post_reason('fail')
         return 'fail'
     if out2_ds.GetRasterBand(1).GetOverview(-1) is not None:
-        gdaltest.post_reason('fail')
         return 'fail'
     if out2_ds.GetRasterBand(1).GetOverview(1) is not None:
-        gdaltest.post_reason('fail')
         return 'fail'
     out2_ds = None
     ds = None
@@ -826,35 +736,28 @@ def test_kea_14():
 
     ds = gdaltest.kea_driver.Create("tmp/out.kea", 1, 1, 1, gdal.GDT_Byte)
     if ds.GetRasterBand(1).GetMaskFlags() != gdal.GMF_ALL_VALID:
-        gdaltest.post_reason('fail')
         return 'fail'
     if ds.GetRasterBand(1).GetMaskBand().Checksum() != 3:
         print(ds.GetRasterBand(1).GetMaskBand().Checksum())
-        gdaltest.post_reason('fail')
         return 'fail'
     ds.GetRasterBand(1).CreateMaskBand(0)
     if ds.GetRasterBand(1).GetMaskFlags() != 0:
-        gdaltest.post_reason('fail')
         return 'fail'
     if ds.GetRasterBand(1).GetMaskBand().Checksum() != 3:
         print(ds.GetRasterBand(1).GetMaskBand().Checksum())
-        gdaltest.post_reason('fail')
         return 'fail'
     ds.GetRasterBand(1).GetMaskBand().Fill(0)
     if ds.GetRasterBand(1).GetMaskBand().Checksum() != 0:
         print(ds.GetRasterBand(1).GetMaskBand().Checksum())
-        gdaltest.post_reason('fail')
         return 'fail'
     ds = None
 
     ds = gdal.Open('tmp/out.kea')
     out2_ds = gdaltest.kea_driver.CreateCopy('tmp/out2.kea', ds)  # yes CreateCopy() of KEA copies overviews
     if out2_ds.GetRasterBand(1).GetMaskFlags() != 0:
-        gdaltest.post_reason('fail')
         return 'fail'
     if out2_ds.GetRasterBand(1).GetMaskBand().Checksum() != 0:
         print(out2_ds.GetRasterBand(1).GetMaskBand().Checksum())
-        gdaltest.post_reason('fail')
         return 'fail'
     out2_ds = None
     ds = None
diff --git a/autotest/gdrivers/kmlsuperoverlay.py b/autotest/gdrivers/kmlsuperoverlay.py
index be22f66c7231..e08c75b5f0d1 100755
--- a/autotest/gdrivers/kmlsuperoverlay.py
+++ b/autotest/gdrivers/kmlsuperoverlay.py
@@ -146,27 +146,22 @@ def test_kmlsuperoverlay_4():
     src_ds = gdal.Open("/vsimem/src.vrt")
     ds = gdal.GetDriverByName('KMLSUPEROVERLAY').CreateCopy('/vsimem/kmlsuperoverlay_4.kmz', src_ds, options=['FORMAT=PNG', 'NAME=myname', 'DESCRIPTION=mydescription', 'ALTITUDE=10', 'ALTITUDEMODE=absolute'])
     if ds.GetMetadataItem('NAME') != 'myname':
-        gdaltest.post_reason('fail')
         return 'fail'
     if ds.GetMetadataItem('DESCRIPTION') != 'mydescription':
-        gdaltest.post_reason('fail')
         return 'fail'
     if ds.GetRasterBand(1).GetOverviewCount() != 1:
-        gdaltest.post_reason('fail')
         ds = None
         src_ds = None
         gdal.Unlink("/vsimem/src.vrt")
         gdal.Unlink("/vsimem/kmlsuperoverlay_4.kmz")
         return 'fail'
     if ds.GetRasterBand(1).GetOverview(0).Checksum() != 30111:
-        gdaltest.post_reason('fail')
         ds = None
         src_ds = None
         gdal.Unlink("/vsimem/src.vrt")
         gdal.Unlink("/vsimem/kmlsuperoverlay_4.kmz")
         return 'fail'
     if ds.GetRasterBand(1).Checksum() != src_ds.GetRasterBand(1).Checksum():
-        gdaltest.post_reason('fail')
         ds = None
         src_ds = None
         gdal.Unlink("/vsimem/src.vrt")
@@ -179,7 +174,6 @@ def test_kmlsuperoverlay_4():
     ref_data = ds.ReadRaster(0, 0, 800, 400, 200, 100)
     vrt_ds = None
     if got_data != ref_data:
-        gdaltest.post_reason('fail')
         ds = None
         src_ds = None
         gdal.Unlink("/vsimem/src.vrt")
@@ -271,31 +265,25 @@ def test_kmlsuperoverlay_6():
 
     ds = gdal.Open('data/kmlimage.kmz')
     if ds.GetProjectionRef().find('WGS_1984') < 0:
-        gdaltest.post_reason('failure')
         return 'fail'
     got_gt = ds.GetGeoTransform()
     ref_gt = [1.2554125761846773, 1.6640895429971981e-05, 0.0, 43.452120815728101, 0.0, -1.0762348187666334e-05]
     for i in range(6):
         if abs(got_gt[i] - ref_gt[i]) > 1e-6:
-            gdaltest.post_reason('failure')
             print(got_gt)
             return 'fail'
     for i in range(4):
         cs = ds.GetRasterBand(i + 1).Checksum()
         if cs != 47673:
             print(cs)
-            gdaltest.post_reason('failure')
             return 'fail'
         if ds.GetRasterBand(i + 1).GetRasterColorInterpretation() != gdal.GCI_RedBand + i:
-            gdaltest.post_reason('failure')
             return 'fail'
     if ds.GetRasterBand(1).GetOverviewCount() != 1:
-        gdaltest.post_reason('failure')
         return 'fail'
     cs = ds.GetRasterBand(1).GetOverview(0).Checksum()
     if cs != 61070:
         print(cs)
-        gdaltest.post_reason('failure')
         return 'fail'
 
     return 'success'
@@ -308,23 +296,19 @@ def test_kmlsuperoverlay_7():
 
     ds = gdal.Open('data/small_world.kml')
     if ds.GetProjectionRef().find('WGS_1984') < 0:
-        gdaltest.post_reason('failure')
         return 'fail'
     got_gt = ds.GetGeoTransform()
     ref_gt = [-180.0, 0.9, 0.0, 90.0, 0.0, -0.9]
     for i in range(6):
         if abs(got_gt[i] - ref_gt[i]) > 1e-6:
-            gdaltest.post_reason('failure')
             print(got_gt)
             return 'fail'
 
     cs = ds.GetRasterBand(1).Checksum()
     if cs != 30111:
         print(cs)
-        gdaltest.post_reason('failure')
         return 'fail'
     if ds.GetRasterBand(1).GetRasterColorInterpretation() != gdal.GCI_RedBand:
-        gdaltest.post_reason('failure')
         return 'fail'
 
     return 'success'
@@ -418,15 +402,12 @@ def test_kmlsuperoverlay_8():
     src_ds = None
 
     if set(os.listdir('tmp/0/0')) != set(('0.kml', '0.png')):
-        gdaltest.post_reason('failure')
         return 'fail'
     if set(os.listdir('tmp/3/1')) != set(('0.jpg', '0.kml', '1.jpg', '1.kml', '2.jpg', '2.kml', '3.jpg', '3.kml',
                                           '4.jpg', '4.kml', '5.jpg', '5.kml', '6.jpg', '6.kml', '7.jpg', '7.kml',)):
-        gdaltest.post_reason('failure')
         return 'fail'
     if set(os.listdir('tmp/3/2')) != set():
         # dir should be empty - 3/2 is entirely transparent so we skip generating files.
-        gdaltest.post_reason('failure')
         return 'fail'
 
     shutil.rmtree('tmp/0')
diff --git a/autotest/gdrivers/l1b.py b/autotest/gdrivers/l1b.py
index 4a58a632eeb5..e92346183842 100755
--- a/autotest/gdrivers/l1b.py
+++ b/autotest/gdrivers/l1b.py
@@ -102,12 +102,10 @@ def test_l1b_geoloc():
     ds = gdal.Open('L1BGCPS_INTERPOL:"tmp/cache/n12gac8bit.l1b"')
     cs = ds.GetRasterBand(1).Checksum()
     if cs != 62397:
-        gdaltest.post_reason('fail')
         print(cs)
         return 'fail'
     cs = ds.GetRasterBand(2).Checksum()
     if cs != 52616:
-        gdaltest.post_reason('fail')
         print(cs)
         return 'fail'
 
@@ -138,7 +136,6 @@ def test_l1b_solar_zenith_angles_before_noaa_15():
     ds = gdal.Open('L1B_SOLAR_ZENITH_ANGLES:"tmp/cache/n12gac10bit.l1b"')
     cs = ds.GetRasterBand(1).Checksum()
     if cs != 22924:
-        gdaltest.post_reason('fail')
         print(cs)
         return 'fail'
 
@@ -201,17 +198,14 @@ def test_l1b_angles_after_noaa_15():
     ds = gdal.Open('L1B_ANGLES:"tmp/cache/n16gac10bit.l1b"')
     cs = ds.GetRasterBand(1).Checksum()
     if cs != 31487:
-        gdaltest.post_reason('fail')
         print(cs)
         return 'fail'
     cs = ds.GetRasterBand(2).Checksum()
     if cs != 23380:
-        gdaltest.post_reason('fail')
         print(cs)
         return 'fail'
     cs = ds.GetRasterBand(3).Checksum()
     if cs != 64989:
-        gdaltest.post_reason('fail')
         print(cs)
         return 'fail'
 
@@ -242,7 +236,6 @@ def test_l1b_clouds_after_noaa_15():
     ds = gdal.Open('L1B_CLOUDS:"tmp/cache/n16gac10bit.l1b"')
     cs = ds.GetRasterBand(1).Checksum()
     if cs != 0:
-        gdaltest.post_reason('fail')
         print(cs)
         return 'fail'
 
@@ -288,16 +281,12 @@ def test_l1b_little_endian():
 
     ds = gdal.Open('/vsizip/data/hrpt_little_endian.l1b.zip')
     if ds.GetGCPProjection().find('GRS80') < 0:
-        gdaltest.post_reason('fail')
         return 'fail'
     if ds.GetRasterBand(1).Checksum() != 14145:
-        gdaltest.post_reason('fail')
         return 'fail'
     if ds.GetRasterBand(1).GetMaskFlags() != gdal.GMF_PER_DATASET:
-        gdaltest.post_reason('fail')
         return 'fail'
     if ds.GetRasterBand(1).GetMaskBand().Checksum() != 25115:
-        gdaltest.post_reason('fail')
         return 'fail'
     ds = None
 
diff --git a/autotest/gdrivers/mbtiles.py b/autotest/gdrivers/mbtiles.py
index afb2a9387778..fb556944fd43 100755
--- a/autotest/gdrivers/mbtiles.py
+++ b/autotest/gdrivers/mbtiles.py
@@ -342,41 +342,34 @@ def test_mbtiles_5():
 
     ds = gdal.OpenEx('/vsimem/mbtiles_5.mbtiles', open_options=['BAND_COUNT=2'])
     if ds.RasterXSize != 19 or ds.RasterYSize != 19:
-        gdaltest.post_reason('fail')
         print(ds.RasterXSize)
         print(ds.RasterYSize)
         return 'fail'
     if ds.RasterCount != 2:
-        gdaltest.post_reason('fail')
         print(ds.RasterCount)
         return 'fail'
     got_gt = ds.GetGeoTransform()
     expected_gt = (-13095853.550435878, 76.437028285176254, 0.0, 4015708.8887064462, 0.0, -76.437028285176254)
     for i in range(6):
         if abs(expected_gt[i] - got_gt[i]) > 1e-6:
-            gdaltest.post_reason('fail')
             print(got_gt)
             print(expected_gt)
             return 'fail'
     got_cs = ds.GetRasterBand(1).Checksum()
     if got_cs != 4118:
-        gdaltest.post_reason('fail')
         print(got_cs)
         return 'fail'
     got_cs = ds.GetRasterBand(2).Checksum()
     if got_cs != 4406:
-        gdaltest.post_reason('fail')
         print(got_cs)
         return 'fail'
     got_md = ds.GetMetadata()
     expected_md = {'ZOOM_LEVEL': '11', 'minzoom': '11', 'maxzoom': '11', 'name': 'mbtiles_5', 'format': 'png', 'bounds': '-117.6420540294745,33.89160566594387,-117.6290077648261,33.90243460427036', 'version': '1.1', 'type': 'overlay', 'description': 'mbtiles_5'}
     if set(got_md.keys()) != set(expected_md.keys()):
-        gdaltest.post_reason('fail')
         print(got_md)
         return 'fail'
     for key in got_md:
         if key != 'bounds' and got_md[key] != expected_md[key]:
-            gdaltest.post_reason('fail')
             print(got_md)
             return 'fail'
     ds = None
@@ -413,13 +406,11 @@ def test_mbtiles_6():
     ds = gdal.Open('tmp/mbtiles_6.mbtiles')
     got_cs = ds.GetRasterBand(1).Checksum()
     if got_cs == 0:
-        gdaltest.post_reason('fail')
         print(got_cs)
         return 'fail'
     got_md = ds.GetMetadata()
     expected_md = {'ZOOM_LEVEL': '11', 'minzoom': '11', 'maxzoom': '11', 'format': 'jpg', 'version': 'version', 'type': 'baselayer', 'name': 'name', 'description': 'description'}
     if got_md != expected_md:
-        gdaltest.post_reason('fail')
         print(got_md)
         return 'fail'
     ds = None
@@ -465,17 +456,14 @@ def test_mbtiles_7():
 
     ds = gdal.Open('/vsimem/mbtiles_7.mbtiles')
     if ds.GetRasterBand(1).GetOverviewCount() != 1:
-        gdaltest.post_reason('fail')
         print(ds.GetRasterBand(1).GetOverviewCount())
         return 'fail'
     expected_ovr_cs = [21179, 22577, 11996, 17849]
     got_ovr_cs = [ds.GetRasterBand(i + 1).GetOverview(0).Checksum() for i in range(ds.RasterCount)]
     if expected_ovr_cs != got_ovr_cs:
-        gdaltest.post_reason('fail')
         print(got_ovr_cs)
         return 'fail'
     if ds.GetMetadataItem('minzoom') != '0':
-        gdaltest.post_reason('fail')
         print(ds.GetMetadata())
         return 'fail'
     ds = None
@@ -486,11 +474,9 @@ def test_mbtiles_7():
 
     ds = gdal.Open('/vsimem/mbtiles_7.mbtiles')
     if ds.GetRasterBand(1).GetOverviewCount() != 0:
-        gdaltest.post_reason('fail')
         print(ds.GetRasterBand(1).GetOverviewCount())
         return 'fail'
     if ds.GetMetadataItem('minzoom') != '1':
-        gdaltest.post_reason('fail')
         print(ds.GetMetadata())
         return 'fail'
     ds = None
@@ -520,15 +506,12 @@ def test_mbtiles_8():
     out_ds = gdal.Open('/vsimem/mbtiles_8.mbtiles')
     got_cs = [out_ds.GetRasterBand(i + 1).Checksum() for i in range(3)]
     if got_cs != expected_cs:
-        gdaltest.post_reason('fail')
         print('Got %s, expected %s' % (str(got_cs), str(expected_cs)))
         return 'fail'
     got_ct = out_ds.GetRasterBand(1).GetColorTable()
     if got_ct is not None:
-        gdaltest.post_reason('fail')
         return 'fail'
     if out_ds.GetRasterBand(1).GetBlockSize() != [256, 256]:
-        gdaltest.post_reason('fail')
         print(out_ds.GetRasterBand(1).GetBlockSize())
         return 'fail'
     out_ds = None
@@ -543,15 +526,12 @@ def test_mbtiles_8():
     out_ds = gdal.Open('/vsimem/mbtiles_8.mbtiles')
     got_cs = [out_ds.GetRasterBand(i + 1).Checksum() for i in range(3)]
     if got_cs != expected_cs:
-        gdaltest.post_reason('fail')
         print('Got %s, expected %s' % (str(got_cs), str(expected_cs)))
         return 'fail'
     got_ct = out_ds.GetRasterBand(1).GetColorTable()
     if got_ct is not None:
-        gdaltest.post_reason('fail')
         return 'fail'
     if out_ds.GetRasterBand(1).GetBlockSize() != [512, 512]:
-        gdaltest.post_reason('fail')
         return 'fail'
     out_ds = None
 
@@ -580,10 +560,8 @@ def test_mbtiles_9():
     with gdaltest.error_handler():
         ds = gdal.Open('/vsimem/mbtiles_9.mbtiles')
     if ds.RasterXSize != 256 or ds.RasterYSize != 256:
-        gdaltest.post_reason('fail')
         return 'fail'
     if abs(ds.GetGeoTransform()[0] - -13110479.091473430395126) > 1e-6:
-        gdaltest.post_reason('fail')
         print(ds.GetGeoTransform())
         return 'fail'
     ds = None
@@ -612,7 +590,6 @@ def test_mbtiles_10():
     ds = gdal.Open('/vsimem/mbtiles_10.mbtiles')
     cs = ds.GetRasterBand(1).Checksum()
     if cs != 29925:
-        gdaltest.post_reason('fail')
         print(cs)
         return 'fail'
     ds = None
@@ -667,7 +644,6 @@ def test_mbtiles_create():
     gdaltest.mbtiles_drv.Create(filename, 1, 1, 1)
     with gdaltest.error_handler():
         if gdal.Open(filename) is not None:
-            gdaltest.post_reason('fail')
             return 'fail'
 
     # Nominal case
@@ -681,7 +657,6 @@ def test_mbtiles_create():
     with gdaltest.error_handler():
         ret = ds.SetGeoTransform(src_ds.GetGeoTransform())
     if ret == 0:
-        gdaltest.post_reason('fail')
         return 'fail'
     ds = None
 
@@ -690,13 +665,11 @@ def test_mbtiles_create():
     with gdaltest.error_handler():
         ret = ds.SetGeoTransform(src_ds.GetGeoTransform())
     if ret == 0:
-        gdaltest.post_reason('fail')
         return 'fail'
     # SetProjection() not supported on read-only dataset
     with gdaltest.error_handler():
         ret = ds.SetProjection(src_ds.GetProjectionRef())
     if ret == 0:
-        gdaltest.post_reason('fail')
         return 'fail'
     ds = None
 
@@ -706,7 +679,6 @@ def test_mbtiles_create():
     with gdaltest.error_handler():
         ret = ds.SetProjection('LOCAL_CS["foo"]')
     if ret == 0:
-        gdaltest.post_reason('fail')
         return 'fail'
     ds = None
 
@@ -716,7 +688,6 @@ def test_mbtiles_create():
     with gdaltest.error_handler():
         ret = ds.SetGeoTransform([0, 1, 0, 0, 0, 1])
     if ret == 0:
-        gdaltest.post_reason('fail')
         return 'fail'
     ds = None
 
@@ -726,7 +697,6 @@ def test_mbtiles_create():
     with gdaltest.error_handler():
         ret = ds.SetGeoTransform([0, 1, 0, 0, 0, -1])
     if ret == 0:
-        gdaltest.post_reason('fail')
         return 'fail'
     ds = None
 
diff --git a/autotest/gdrivers/mem.py b/autotest/gdrivers/mem.py
index b2c2d6837f7a..df13093ef5ab 100755
--- a/autotest/gdrivers/mem.py
+++ b/autotest/gdrivers/mem.py
@@ -297,7 +297,6 @@ def test_mem_6():
     with gdaltest.error_handler():
         ds = drv.Create('', 1, 1, 0x7FFFFFFF, gdal.GDT_Float64)
     if ds is not None:
-        gdaltest.post_reason('fail')
         return 'fail'
     ds = None
 
@@ -305,7 +304,6 @@ def test_mem_6():
     with gdaltest.error_handler():
         ds = drv.Create('', 0x7FFFFFFF, 0x7FFFFFFF, 16)
     if ds is not None:
-        gdaltest.post_reason('fail')
         return 'fail'
     ds = None
 
@@ -313,7 +311,6 @@ def test_mem_6():
     with gdaltest.error_handler():
         ds = drv.Create('', 0x7FFFFFFF, 0x7FFFFFFF, 1, gdal.GDT_Float64)
     if ds is not None:
-        gdaltest.post_reason('fail')
         return 'fail'
     ds = None
 
@@ -321,7 +318,6 @@ def test_mem_6():
     with gdaltest.error_handler():
         ds = drv.Create('', 0x7FFFFFFF, 0x7FFFFFFF, 1, options=['INTERLEAVE=PIXEL'])
     if ds is not None:
-        gdaltest.post_reason('fail')
         return 'fail'
     ds = None
 
@@ -329,7 +325,6 @@ def test_mem_6():
     with gdaltest.error_handler():
         ds = drv.Create('', 0x7FFFFFFF, 0x7FFFFFFF, 1)
     if ds is not None:
-        gdaltest.post_reason('fail')
         return 'fail'
     ds = None
 
@@ -343,7 +338,6 @@ def test_mem_6():
     with gdaltest.error_handler():
         ret = ds.AddBand(gdal.GDT_Float64)
     if ret == 0:
-        gdaltest.post_reason('fail')
         return 'fail'
 
     return 'success'
@@ -402,55 +396,47 @@ def test_mem_9():
             import struct
             print(struct.unpack('B' * 4 * 5, ref_data))
             print(struct.unpack('B' * 4 * 5, got_data))
-            gdaltest.post_reason('fail')
             return 'fail'
 
         ref_data = src_ds.GetRasterBand(2).ReadRaster(20, 8, 4, 5, buf_pixel_space=3, buf_line_space=100)
         got_data = out_ds.GetRasterBand(2).ReadRaster(20, 8, 4, 5, buf_pixel_space=3, buf_line_space=100)
         if ref_data != got_data:
             print(interleave)
-            gdaltest.post_reason('fail')
             return 'fail'
 
         ref_data = src_ds.ReadRaster(20, 8, 4, 5)
         got_data = out_ds.ReadRaster(20, 8, 4, 5)
         if ref_data != got_data:
             print(interleave)
-            gdaltest.post_reason('fail')
             return 'fail'
 
         ref_data = src_ds.ReadRaster(20, 8, 4, 5, buf_pixel_space=3, buf_band_space=1)
         got_data = out_ds.ReadRaster(20, 8, 4, 5, buf_pixel_space=3, buf_band_space=1)
         if ref_data != got_data:
             print(interleave)
-            gdaltest.post_reason('fail')
             return 'fail'
 
         out_ds.WriteRaster(20, 8, 4, 5, got_data, buf_pixel_space=3, buf_band_space=1)
         got_data = out_ds.ReadRaster(20, 8, 4, 5, buf_pixel_space=3, buf_band_space=1)
         if ref_data != got_data:
             print(interleave)
-            gdaltest.post_reason('fail')
             return 'fail'
 
         ref_data = src_ds.ReadRaster(20, 8, 4, 5, buf_pixel_space=3, buf_line_space=100, buf_band_space=1)
         got_data = out_ds.ReadRaster(20, 8, 4, 5, buf_pixel_space=3, buf_line_space=100, buf_band_space=1)
         if ref_data != got_data:
             print(interleave)
-            gdaltest.post_reason('fail')
             return 'fail'
 
         ref_data = src_ds.ReadRaster(20, 20, 4, 5, buf_type=gdal.GDT_Int32, buf_pixel_space=12, buf_band_space=4)
         got_data = out_ds.ReadRaster(20, 20, 4, 5, buf_type=gdal.GDT_Int32, buf_pixel_space=12, buf_band_space=4)
         if ref_data != got_data:
             print(interleave)
-            gdaltest.post_reason('fail')
             return 'fail'
         out_ds.WriteRaster(20, 20, 4, 5, got_data, buf_type=gdal.GDT_Int32, buf_pixel_space=12, buf_band_space=4)
         got_data = out_ds.ReadRaster(20, 20, 4, 5, buf_type=gdal.GDT_Int32, buf_pixel_space=12, buf_band_space=4)
         if ref_data != got_data:
             print(interleave)
-            gdaltest.post_reason('fail')
             return 'fail'
 
         # Test IReadBlock
@@ -461,7 +447,6 @@ def test_mem_9():
         got_data = out_ds.GetRasterBand(1).ReadBlock(0, 10)
         if ref_data != got_data:
             print(interleave)
-            gdaltest.post_reason('fail')
             return 'fail'
 
         # Test IRasterIO(GF_Write,)
@@ -469,7 +454,6 @@ def test_mem_9():
         out_ds.GetRasterBand(1).WriteRaster(6, 7, 4, 5, ref_data)
         got_data = out_ds.GetRasterBand(1).ReadRaster(6, 7, 4, 5)
         if ref_data != got_data:
-            gdaltest.post_reason('fail')
             return 'fail'
 
         # Test IRasterIO(GF_Write, change data type) + IWriteBlock() + IRasterIO(GF_Read, change data type)
@@ -478,14 +462,12 @@ def test_mem_9():
         got_data = out_ds.GetRasterBand(1).ReadRaster(10, 11, 4, 5, buf_type=gdal.GDT_Int32)
         if ref_data != got_data:
             print(interleave)
-            gdaltest.post_reason('fail')
             return 'fail'
 
         ref_data = src_ds.GetRasterBand(1).ReadRaster(10, 11, 4, 5)
         got_data = out_ds.GetRasterBand(1).ReadRaster(10, 11, 4, 5)
         if ref_data != got_data:
             print(interleave)
-            gdaltest.post_reason('fail')
             return 'fail'
 
         # Test IRasterIO(GF_Write, resampling) + IWriteBlock() + IRasterIO(GF_Read, resampling)
@@ -495,13 +477,11 @@ def test_mem_9():
         got_data = out_ds.GetRasterBand(1).ReadRaster(10, 11, 8, 10)
         if ref_data_zoomed != got_data:
             print(interleave)
-            gdaltest.post_reason('fail')
             return 'fail'
 
         got_data = out_ds.GetRasterBand(1).ReadRaster(10, 11, 8, 10, 4, 5)
         if ref_data != got_data:
             print(interleave)
-            gdaltest.post_reason('fail')
             return 'fail'
 
     return 'success'
@@ -520,13 +500,10 @@ def test_mem_10():
     # Requesting overviews when they are not
     ds = gdal.GetDriverByName('MEM').Create('', 1, 1)
     if ds.GetRasterBand(1).GetOverviewCount() != 0:
-        gdaltest.post_reason('fail')
         return 'fail'
     if ds.GetRasterBand(1).GetOverview(-1) is not None:
-        gdaltest.post_reason('fail')
         return 'fail'
     if ds.GetRasterBand(1).GetOverview(0) is not None:
-        gdaltest.post_reason('fail')
         return 'fail'
 
     # Single band case
@@ -534,50 +511,39 @@ def test_mem_10():
     for _ in range(2):
         ret = ds.BuildOverviews('NEAR', [2])
         if ret != 0:
-            gdaltest.post_reason('fail')
             return 'fail'
         if ds.GetRasterBand(1).GetOverviewCount() != 1:
-            gdaltest.post_reason('fail')
             return 'fail'
         cs = ds.GetRasterBand(1).GetOverview(0).Checksum()
         if cs != 1087:
-            gdaltest.post_reason('fail')
             print(cs)
             return 'fail'
 
     ret = ds.BuildOverviews('NEAR', [4])
     if ret != 0:
-        gdaltest.post_reason('fail')
         return 'fail'
     if ds.GetRasterBand(1).GetOverviewCount() != 2:
-        gdaltest.post_reason('fail')
         return 'fail'
     cs = ds.GetRasterBand(1).GetOverview(0).Checksum()
     if cs != 1087:
-        gdaltest.post_reason('fail')
         print(cs)
         return 'fail'
     cs = ds.GetRasterBand(1).GetOverview(1).Checksum()
     if cs != 328:
-        gdaltest.post_reason('fail')
         print(cs)
         return 'fail'
 
     ret = ds.BuildOverviews('NEAR', [2, 4])
     if ret != 0:
-        gdaltest.post_reason('fail')
         return 'fail'
     if ds.GetRasterBand(1).GetOverviewCount() != 2:
-        gdaltest.post_reason('fail')
         return 'fail'
     cs = ds.GetRasterBand(1).GetOverview(0).Checksum()
     if cs != 1087:
-        gdaltest.post_reason('fail')
         print(cs)
         return 'fail'
     cs = ds.GetRasterBand(1).GetOverview(1).Checksum()
     if cs != 328:
-        gdaltest.post_reason('fail')
         print(cs)
         return 'fail'
 
@@ -587,19 +553,15 @@ def test_mem_10():
 
     ret = ds.BuildOverviews('AVERAGE', [2, 4])
     if ret != 0:
-        gdaltest.post_reason('fail')
         return 'fail'
     if ds.GetRasterBand(1).GetOverviewCount() != 2:
-        gdaltest.post_reason('fail')
         return 'fail'
     cs = ds.GetRasterBand(1).GetOverview(0).Checksum()
     if cs != 1152:
-        gdaltest.post_reason('fail')
         print(cs)
         return 'fail'
     cs = ds.GetRasterBand(1).GetOverview(1).Checksum()
     if cs != 240:
-        gdaltest.post_reason('fail')
         print(cs)
         return 'fail'
 
@@ -609,19 +571,15 @@ def test_mem_10():
     ret = ds.BuildOverviews('AVERAGE', [2])
     ret = ds.BuildOverviews('AVERAGE', [4])
     if ret != 0:
-        gdaltest.post_reason('fail')
         return 'fail'
     if ds.GetRasterBand(1).GetOverviewCount() != 2:
-        gdaltest.post_reason('fail')
         return 'fail'
     cs = ds.GetRasterBand(1).GetOverview(0).Checksum()
     if cs != 1152:
-        gdaltest.post_reason('fail')
         print(cs)
         return 'fail'
     cs = ds.GetRasterBand(1).GetOverview(1).Checksum()
     if cs != 240:
-        gdaltest.post_reason('fail')
         print(cs)
         return 'fail'
 
@@ -631,21 +589,17 @@ def test_mem_10():
     ds = gdal.GetDriverByName('MEM').CreateCopy('', gdal.Open('data/rgbsmall.tif'))
     ret = ds.BuildOverviews('NEAR', [2])
     if ret != 0:
-        gdaltest.post_reason('fail')
         return 'fail'
     cs = ds.GetRasterBand(1).GetOverview(0).Checksum()
     if cs != 5057:
-        gdaltest.post_reason('fail')
         print(cs)
         return 'fail'
     cs = ds.GetRasterBand(2).GetOverview(0).Checksum()
     if cs != 5304:
-        gdaltest.post_reason('fail')
         print(cs)
         return 'fail'
     cs = ds.GetRasterBand(3).GetOverview(0).Checksum()
     if cs != 5304:
-        gdaltest.post_reason('fail')
         print(cs)
         return 'fail'
     ds = None
@@ -654,14 +608,11 @@ def test_mem_10():
     ds = gdal.GetDriverByName('MEM').CreateCopy('', gdal.Open('data/byte.tif'))
     ret = ds.BuildOverviews('NEAR', [2])
     if ret != 0:
-        gdaltest.post_reason('fail')
         return 'fail'
     ret = ds.BuildOverviews('NONE', [])
     if ret != 0:
-        gdaltest.post_reason('fail')
         return 'fail'
     if ds.GetRasterBand(1).GetOverviewCount() != 0:
-        gdaltest.post_reason('fail')
         return 'fail'
     ds = None
 
@@ -676,61 +627,50 @@ def test_mem_11():
     # Error case: building overview on a 0 band dataset
     ds = gdal.GetDriverByName('MEM').Create('', 1, 1, 0)
     if ds.CreateMaskBand(gdal.GMF_PER_DATASET) == 0:
-        gdaltest.post_reason('fail')
         return 'fail'
 
     # Per dataset mask on single band dataset
     ds = gdal.GetDriverByName('MEM').Create('', 1, 1)
     if ds.CreateMaskBand(gdal.GMF_PER_DATASET) != 0:
-        gdaltest.post_reason('fail')
         return 'fail'
     if ds.GetRasterBand(1).GetMaskFlags() != gdal.GMF_PER_DATASET:
-        gdaltest.post_reason('fail')
         return 'fail'
     mask = ds.GetRasterBand(1).GetMaskBand()
     cs = mask.Checksum()
     if cs != 0:
-        gdaltest.post_reason('fail')
         return 'fail'
     mask.Fill(255)
     cs = mask.Checksum()
     if cs != 3:
-        gdaltest.post_reason('fail')
         return 'fail'
 
     # Check that the per dataset mask is shared by all bands
     ds = gdal.GetDriverByName('MEM').Create('', 1, 1, 2)
     if ds.CreateMaskBand(gdal.GMF_PER_DATASET) != 0:
-        gdaltest.post_reason('fail')
         return 'fail'
     mask1 = ds.GetRasterBand(1).GetMaskBand()
     mask1.Fill(255)
     mask2 = ds.GetRasterBand(2).GetMaskBand()
     cs = mask2.Checksum()
     if cs != 3:
-        gdaltest.post_reason('fail')
         return 'fail'
 
     # Same but call it on band 2
     ds = gdal.GetDriverByName('MEM').Create('', 1, 1, 2)
     if ds.GetRasterBand(2).CreateMaskBand(gdal.GMF_PER_DATASET) != 0:
-        gdaltest.post_reason('fail')
         return 'fail'
     mask2 = ds.GetRasterBand(2).GetMaskBand()
     mask2.Fill(255)
     mask1 = ds.GetRasterBand(1).GetMaskBand()
     cs = mask1.Checksum()
     if cs != 3:
-        gdaltest.post_reason('fail')
         return 'fail'
 
     # Per band masks
     ds = gdal.GetDriverByName('MEM').Create('', 1, 1, 2)
     if ds.GetRasterBand(1).CreateMaskBand(0) != 0:
-        gdaltest.post_reason('fail')
         return 'fail'
     if ds.GetRasterBand(2).CreateMaskBand(0) != 0:
-        gdaltest.post_reason('fail')
         return 'fail'
     mask1 = ds.GetRasterBand(1).GetMaskBand()
     mask2 = ds.GetRasterBand(2).GetMaskBand()
@@ -738,7 +678,6 @@ def test_mem_11():
     cs1 = mask1.Checksum()
     cs2 = mask2.Checksum()
     if cs1 != 0 or cs2 != 3:
-        gdaltest.post_reason('fail')
         return 'fail'
 
     return 'success'
@@ -756,14 +695,12 @@ def test_mem_12():
     ds.BuildOverviews('NEAR', [2])
     cs = ds.GetRasterBand(1).GetOverview(0).GetMaskBand().Checksum()
     if cs != 267:
-        gdaltest.post_reason('fail')
         print(cs)
         return 'fail'
 
     # Default mask
     cs = ds.GetRasterBand(2).GetOverview(0).GetMaskBand().Checksum()
     if cs != 283:
-        gdaltest.post_reason('fail')
         print(cs)
         return 'fail'
 
@@ -774,12 +711,10 @@ def test_mem_12():
     ds.BuildOverviews('NEAR', [2])
     cs = ds.GetRasterBand(1).GetOverview(0).GetMaskBand().Checksum()
     if cs != 267:
-        gdaltest.post_reason('fail')
         print(cs)
         return 'fail'
     cs2 = ds.GetRasterBand(2).GetOverview(0).GetMaskBand().Checksum()
     if cs2 != cs:
-        gdaltest.post_reason('fail')
         print(cs2)
         return 'fail'
 
@@ -794,11 +729,9 @@ def test_mem_rat():
     ds = gdal.GetDriverByName('MEM').Create('', 1, 1)
     ds.GetRasterBand(1).SetDefaultRAT(gdal.RasterAttributeTable())
     if ds.GetRasterBand(1).GetDefaultRAT() is None:
-        gdaltest.post_reason('fail')
         return 'fail'
     ds.GetRasterBand(1).SetDefaultRAT(None)
     if ds.GetRasterBand(1).GetDefaultRAT() is not None:
-        gdaltest.post_reason('fail')
         return 'fail'
 
     return 'success'
@@ -812,11 +745,9 @@ def test_mem_categorynames():
     ds = gdal.GetDriverByName('MEM').Create('', 1, 1)
     ds.GetRasterBand(1).SetCategoryNames(['foo'])
     if ds.GetRasterBand(1).GetCategoryNames() != ['foo']:
-        gdaltest.post_reason('fail')
         return 'fail'
     ds.GetRasterBand(1).SetCategoryNames([])
     if ds.GetRasterBand(1).GetCategoryNames() is not None:
-        gdaltest.post_reason('fail')
         return 'fail'
 
     return 'success'
@@ -832,11 +763,9 @@ def test_mem_colortable():
     ct.SetColorEntry(0, (255, 255, 255, 255))
     ds.GetRasterBand(1).SetColorTable(ct)
     if ds.GetRasterBand(1).GetColorTable().GetCount() != 1:
-        gdaltest.post_reason('fail')
         return 'fail'
     ds.GetRasterBand(1).SetColorTable(None)
     if ds.GetRasterBand(1).GetColorTable() is not None:
-        gdaltest.post_reason('fail')
         return 'fail'
 
     return 'success'
diff --git a/autotest/gdrivers/mrf.py b/autotest/gdrivers/mrf.py
index 7db5f2a9d7ec..d8ad6ca1cbb7 100755
--- a/autotest/gdrivers/mrf.py
+++ b/autotest/gdrivers/mrf.py
@@ -152,7 +152,6 @@ def test_mrf_overview_near_fact_2():
         ds = gdal.Open('/vsimem/out.mrf')
         cs = ds.GetRasterBand(1).GetOverview(0).Checksum()
         if cs != expected_cs:
-            gdaltest.post_reason('fail')
             print(dt)
             print(cs)
             print(expected_cs)
@@ -186,7 +185,6 @@ def test_mrf_overview_near_with_nodata_fact_2():
         cs = ds.GetRasterBand(1).GetOverview(0).Checksum()
         expected_cs = 1117
         if cs != expected_cs:
-            gdaltest.post_reason('fail')
             print(dt)
             print(cs)
             print(expected_cs)
@@ -220,7 +218,6 @@ def test_mrf_overview_avg_fact_2():
         ds = gdal.Open('/vsimem/out.mrf')
         cs = ds.GetRasterBand(1).GetOverview(0).Checksum()
         if cs != expected_cs:
-            gdaltest.post_reason('fail')
             print(dt)
             print(cs)
             print(expected_cs)
@@ -255,7 +252,6 @@ def test_mrf_overview_avg_with_nodata_fact_2():
         ds = gdal.Open('/vsimem/out.mrf')
         cs = ds.GetRasterBand(1).GetOverview(0).Checksum()
         if cs != expected_cs:
-            gdaltest.post_reason('fail')
             print(dt)
             print(cs)
             print(expected_cs)
@@ -283,7 +279,6 @@ def test_mrf_overview_near_fact_3():
     cs = ds.GetRasterBand(1).GetOverview(0).Checksum()
     expected_cs = 478
     if cs != expected_cs:
-        gdaltest.post_reason('fail')
         print(cs)
         print(expected_cs)
         return 'fail'
@@ -310,7 +305,6 @@ def test_mrf_overview_avg_fact_3():
     cs = ds.GetRasterBand(1).GetOverview(0).Checksum()
     expected_cs = 658
     if cs != expected_cs:
-        gdaltest.post_reason('fail')
         print(cs)
         print(expected_cs)
         return 'fail'
@@ -344,7 +338,6 @@ def test_mrf_overview_avg_with_nodata_fact_3():
         ds = gdal.Open('/vsimem/out.mrf')
         cs = ds.GetRasterBand(1).GetOverview(0).Checksum()
         if cs != expected_cs:
-            gdaltest.post_reason('fail')
             print(dt)
             print(cs)
             print(expected_cs)
@@ -370,7 +363,6 @@ def test_mrf_overview_partial_block():
     ds = gdal.Open('/vsimem/out.mrf')
     cs = ds.GetRasterBand(1).GetOverview(0).Checksum()
     if cs != 1087:
-        gdaltest.post_reason('fail')
         print(cs)
         return 'fail'
     ds = None
@@ -396,7 +388,6 @@ def test_mrf_overview_near_implicit_level():
     ds = gdal.Open('/vsimem/out.mrf')
     cs = ds.GetRasterBand(1).GetOverview(1).Checksum()
     if cs != 328:
-        gdaltest.post_reason('fail')
         print(cs)
         return 'fail'
     ds = None
@@ -404,13 +395,11 @@ def test_mrf_overview_near_implicit_level():
     with gdaltest.error_handler():
         ds = gdal.Open('/vsimem/out.mrf:MRF:L2')
     if ds is not None:
-        gdaltest.post_reason('fail')
         return 'fail'
 
     ds = gdal.Open('/vsimem/out.mrf:MRF:L1')
     cs = ds.GetRasterBand(1).Checksum()
     if cs != 328:
-        gdaltest.post_reason('fail')
         print(cs)
         return 'fail'
     ds = None
@@ -435,7 +424,6 @@ def test_mrf_overview_external():
     cs = ds.GetRasterBand(1).GetOverview(0).Checksum()
     expected_cs = 1087
     if cs != expected_cs:
-        gdaltest.post_reason('fail')
         print(cs)
         print(expected_cs)
         return 'fail'
@@ -458,13 +446,11 @@ def test_mrf_lerc_nodata():
     ds = gdal.Open('/vsimem/out.mrf')
     nodata = ds.GetRasterBand(1).GetNoDataValue()
     if nodata != 107:
-        gdaltest.post_reason('fail')
         print(nodata)
         return 'fail'
     cs = ds.GetRasterBand(1).Checksum()
     expected_cs = 4672
     if cs != expected_cs:
-        gdaltest.post_reason('fail')
         print(cs)
         print(expected_cs)
         return 'fail'
@@ -487,7 +473,6 @@ def test_mrf_lerc_with_huffman():
     cs = ds.GetRasterBand(1).Checksum()
     expected_cs = 31204
     if cs != expected_cs:
-        gdaltest.post_reason('fail')
         print(cs)
         print(expected_cs)
         return 'fail'
@@ -512,7 +497,6 @@ def test_mrf_cached_source():
         cs = ds.GetRasterBand(1).Checksum()
     expected_cs = 0
     if cs != expected_cs:
-        gdaltest.post_reason('fail')
         print(cs)
         print(expected_cs)
         return 'fail'
@@ -534,7 +518,6 @@ def test_mrf_cached_source():
     cs = ds.GetRasterBand(1).Checksum()
     expected_cs = 4672
     if cs != expected_cs:
-        gdaltest.post_reason('fail')
         print(cs)
         print(expected_cs)
         return 'fail'
@@ -545,7 +528,6 @@ def test_mrf_cached_source():
     cs = ds.GetRasterBand(1).Checksum()
     expected_cs = 4672
     if cs != expected_cs:
-        gdaltest.post_reason('fail')
         print(cs)
         print(expected_cs)
         return 'fail'
@@ -578,7 +560,6 @@ def test_mrf_cached_source():
     cs = ds.GetRasterBand(1).Checksum()
     expected_cs = 4672
     if cs != expected_cs:
-        gdaltest.post_reason('fail')
         print(cs)
         print(expected_cs)
         return 'fail'
@@ -589,7 +570,6 @@ def test_mrf_cached_source():
     cs = ds.GetRasterBand(1).Checksum()
     expected_cs = 4672
     if cs != expected_cs:
-        gdaltest.post_reason('fail')
         print(cs)
         print(expected_cs)
         return 'fail'
@@ -614,7 +594,6 @@ def test_mrf_cached_source():
     cs = ds.GetRasterBand(1).Checksum()
     expected_cs = 4672
     if cs != expected_cs:
-        gdaltest.post_reason('fail')
         print(cs)
         print(expected_cs)
         return 'fail'
@@ -630,7 +609,6 @@ def test_mrf_cached_source():
     cs = ds.GetRasterBand(1).Checksum()
     expected_cs = 4672
     if cs != expected_cs:
-        gdaltest.post_reason('fail')
         print(cs)
         print(expected_cs)
         return 'fail'
@@ -674,7 +652,6 @@ def test_mrf_versioned():
     cs = ds.GetRasterBand(1).Checksum()
     expected_cs = 0
     if cs != expected_cs:
-        gdaltest.post_reason('fail')
         print(cs)
         print(expected_cs)
         return 'fail'
@@ -684,7 +661,6 @@ def test_mrf_versioned():
     cs = ds.GetRasterBand(1).Checksum()
     expected_cs = 0
     if cs != expected_cs:
-        gdaltest.post_reason('fail')
         print(cs)
         print(expected_cs)
         return 'fail'
@@ -694,7 +670,6 @@ def test_mrf_versioned():
     cs = ds.GetRasterBand(1).Checksum()
     expected_cs = 4672
     if cs != expected_cs:
-        gdaltest.post_reason('fail')
         print(cs)
         print(expected_cs)
         return 'fail'
@@ -703,7 +678,6 @@ def test_mrf_versioned():
     with gdaltest.error_handler():
         ds = gdal.Open('/vsimem/out.mrf:MRF:V2')
     if ds is not None:
-        gdaltest.post_reason('fail')
         return 'fail'
 
     gdal.Unlink('/vsimem/out.mrf')
diff --git a/autotest/gdrivers/netcdf.py b/autotest/gdrivers/netcdf.py
index f15dcdeef784..5d0eac472000 100755
--- a/autotest/gdrivers/netcdf.py
+++ b/autotest/gdrivers/netcdf.py
@@ -337,7 +337,6 @@ def test_netcdf_2():
     with gdaltest.error_handler():
         ds = gdal.Open('tmp/netcdf2.nc', gdal.GA_Update)
     if ds is not None:
-        gdaltest.post_reason('fail')
         return 'fail'
 
     gdaltest.clean_tmp()
@@ -1560,7 +1559,6 @@ def test_netcdf_39():
     gdal.Unlink('tmp/two_vars_scale_offset.nc')
     gdal.Unlink('tmp/netcdf_39.vrt')
     if cs != 65463:
-        gdaltest.post_reason('failure')
         print(cs)
         return 'fail'
 
@@ -1577,7 +1575,6 @@ def test_netcdf_39():
     gdal.Unlink('tmp/two_vars_scale_offset.nc')
     gdal.Unlink('tmp/netcdf_39.vrt')
     if cs != 65463:
-        gdaltest.post_reason('failure')
         print(cs)
         return 'fail'
 
@@ -1594,7 +1591,6 @@ def test_netcdf_39():
     gdal.Unlink('tmp/two_vars_scale_offset.nc')
     gdal.Unlink('tmp/netcdf_39.vrt')
     if cs != 65463:
-        gdaltest.post_reason('failure')
         print(cs)
         return 'fail'
 
@@ -1609,7 +1605,6 @@ def test_netcdf_39():
 
     gdal.Unlink('tmp/netcdf_39.vrt')
     if cs != 65463:
-        gdaltest.post_reason('failure')
         print(cs)
         return 'fail'
 
@@ -1638,11 +1633,9 @@ def test_netcdf_41():
     with gdaltest.error_handler():
         ds = gdal.Open('data/byte_no_cf.nc')
     if ds.GetGeoTransform() != (440720, 60, 0, 3751320, 0, -60):
-        gdaltest.post_reason('failure')
         print(ds.GetGeoTransform())
         return 'fail'
     if ds.GetProjectionRef().find('26711') < 0:
-        gdaltest.post_reason('failure')
         print(ds.GetGeoTransform())
         return 'fail'
 
@@ -1685,19 +1678,16 @@ def test_netcdf_42():
         'LINE_STEP': '1',
         'Y_DATASET': 'NETCDF:"tmp/netcdf_42.nc":lat',
             'Y_BAND': '1'}:
-        gdaltest.post_reason('failure')
         print(ds.GetMetadata('GEOLOCATION'))
         return 'fail'
 
     ds = gdal.Open('NETCDF:"tmp/netcdf_42.nc":lon')
     if ds.GetRasterBand(1).Checksum() != 36043:
-        gdaltest.post_reason('failure')
         print(ds.GetRasterBand(1).Checksum())
         return 'fail'
 
     ds = gdal.Open('NETCDF:"tmp/netcdf_42.nc":lat')
     if ds.GetRasterBand(1).Checksum() != 33501:
-        gdaltest.post_reason('failure')
         print(ds.GetRasterBand(1).Checksum())
         return 'fail'
 
@@ -1726,7 +1716,6 @@ def test_netcdf_43():
         'LINE_STEP': '1',
         'Y_DATASET': 'NETCDF:"tmp/netcdf_43.nc":lat',
             'Y_BAND': '1'}:
-        gdaltest.post_reason('failure')
         print(ds.GetMetadata('GEOLOCATION'))
         return 'fail'
 
@@ -1763,13 +1752,11 @@ def test_netcdf_45():
     # Test that a vector cannot be opened in raster-only mode
     ds = gdal.OpenEx('data/test_ogr_nc3.nc', gdal.OF_RASTER)
     if ds is not None:
-        gdaltest.post_reason('fail')
         return 'fail'
 
     # Test that a raster cannot be opened in vector-only mode
     ds = gdal.OpenEx('data/cf-bug636.nc', gdal.OF_VECTOR)
     if ds is not None:
-        gdaltest.post_reason('fail')
         return 'fail'
 
     ds = gdal.OpenEx('data/test_ogr_nc3.nc', gdal.OF_VECTOR)
@@ -1787,7 +1774,6 @@ def test_netcdf_45():
 ,,,,,,,,,,,,,,,,,,,,
 """
     if content != expected_content:
-        gdaltest.post_reason('failure')
         print(content)
         return 'fail'
 
@@ -1798,7 +1784,6 @@ def test_netcdf_45():
     expected_content = """WKT,Integer,Integer,Real,Real,String(1),String(3),String,Date,DateTime,DateTime,Integer64,Integer64,Integer(Boolean),Integer(Boolean),Real(Float32),Real(Float32),Integer(Int16),Integer(Int16),Real,Integer
 """
     if content != expected_content:
-        gdaltest.post_reason('failure')
         print(content)
         return 'fail'
     gdal.Unlink('/vsimem/netcdf_45.csv')
@@ -1843,7 +1828,6 @@ def test_netcdf_47():
     with gdaltest.error_handler():
         ds = gdal.OpenEx('data/test_ogr_nc4.nc', gdal.OF_RASTER)
     if ds is not None:
-        gdaltest.post_reason('fail')
         return 'fail'
 
     ds = gdal.OpenEx('data/test_ogr_nc4.nc', gdal.OF_VECTOR)
@@ -1861,7 +1845,6 @@ def test_netcdf_47():
 ,,,,,,,,,,,,,,,,,,,,,,,,,,,
 """
     if content != expected_content:
-        gdaltest.post_reason('failure')
         print(content)
         return 'fail'
 
@@ -1872,7 +1855,6 @@ def test_netcdf_47():
     expected_content = """WKT,Integer,Integer,Real,Real,String(3),String,Date,DateTime,DateTime,Integer64,Integer64,Integer(Boolean),Integer(Boolean),Real(Float32),Real(Float32),Integer(Int16),Integer(Int16),Real,Integer,Integer,Integer,Integer,Integer,Integer64,Integer64,Real,Real
 """
     if content != expected_content:
-        gdaltest.post_reason('failure')
         print(content)
         return 'fail'
     gdal.Unlink('/vsimem/netcdf_47.csv')
@@ -1894,11 +1876,9 @@ def test_netcdf_48():
         ds = gdal.OpenEx('data/test_ogr_no_xyz_var.nc', gdal.OF_VECTOR)
     lyr = ds.GetLayer(0)
     if lyr.GetGeomType() != ogr.wkbNone:
-        gdaltest.post_reason('failure')
         return 'fail'
     f = lyr.GetNextFeature()
     if f['int32'] != 1:
-        gdaltest.post_reason('failure')
         return 'fail'
 
     return 'success'
@@ -1926,7 +1906,6 @@ def test_netcdf_49():
 ,,
 """
     if content != expected_content:
-        gdaltest.post_reason('failure')
         print(content)
         return 'fail'
 
@@ -1956,7 +1935,6 @@ def test_netcdf_50():
     src_json = src_f.ExportToJson()
     out_json = out_f.ExportToJson()
     if src_json != out_json:
-        gdaltest.post_reason('failure')
         print(src_json)
         print(out_json)
         return 'fail'
@@ -1966,14 +1944,12 @@ def test_netcdf_50():
     out_lyr = out_ds.GetLayer(0)
     srs = out_lyr.GetSpatialRef().ExportToWkt()
     if srs.find('PROJCS["OSGB 1936') < 0:
-        gdaltest.post_reason('failure')
         print(srs)
         return 'fail'
     out_f = out_lyr.GetNextFeature()
     out_f.SetFID(-1)
     out_json = out_f.ExportToJson()
     if src_json != out_json:
-        gdaltest.post_reason('failure')
         print(src_json)
         print(out_json)
         return 'fail'
@@ -2011,7 +1987,6 @@ def test_netcdf_51():
 ,,,,,,,,,,,,,,,,,,,,
 """
     if content != expected_content:
-        gdaltest.post_reason('failure')
         print(content)
         return 'fail'
 
@@ -2022,7 +1997,6 @@ def test_netcdf_51():
     expected_content = """WKT,Integer,Integer,Real,Real,String(1),String(3),String,Date,DateTime,DateTime,Integer64,Integer64,Integer(Boolean),Integer(Boolean),Real(Float32),Real(Float32),Integer(Int16),Integer(Int16),Real,Integer
 """
     if content != expected_content:
-        gdaltest.post_reason('failure')
         print(content)
         return 'fail'
 
@@ -2032,12 +2006,10 @@ def test_netcdf_51():
     lyr.CreateField(ogr.FieldDefn('extra_str', ogr.OFTString))
     f = lyr.GetNextFeature()
     if f is None:
-        gdaltest.post_reason('failure')
         return 'fail'
     f['extra'] = 5
     f['extra_str'] = 'foobar'
     if lyr.CreateFeature(f) != 0:
-        gdaltest.post_reason('failure')
         return 'fail'
     ds = None
 
@@ -2045,7 +2017,6 @@ def test_netcdf_51():
     lyr = ds.GetLayer(0)
     f = lyr.GetFeature(lyr.GetFeatureCount())
     if f['int32'] != 1 or f['extra'] != 5 or f['extra_str'] != 'foobar':
-        gdaltest.post_reason('failure')
         return 'fail'
     f = None
     ds = None
@@ -2091,7 +2062,6 @@ def test_netcdf_51_no_gdal_tags():
 ,,,,,,,,,,,,,,,,,,,,
 """
     if content != expected_content:
-        gdaltest.post_reason('failure')
         print(content)
         return 'fail'
 
@@ -2102,7 +2072,6 @@ def test_netcdf_51_no_gdal_tags():
     expected_content = """WKT,Integer,Integer,Real,Real,String(1),String(3),String(10),Date,DateTime,DateTime,Real,Real,Integer,Integer,Real(Float32),Real(Float32),Integer(Int16),Integer(Int16),Real,Integer
 """
     if content != expected_content:
-        gdaltest.post_reason('failure')
         print(content)
         return 'fail'
 
@@ -2145,7 +2114,6 @@ def test_netcdf_52():
 ,,,,,,,,,,,,,,,,,,,,,,,,,,,
 """
     if content != expected_content:
-        gdaltest.post_reason('failure')
         print(content)
         return 'fail'
 
@@ -2156,7 +2124,6 @@ def test_netcdf_52():
     expected_content = """WKT,Integer,Integer,Real,Real,String(3),String,Date,DateTime,DateTime,Integer64,Integer64,Integer(Boolean),Integer(Boolean),Real(Float32),Real(Float32),Integer(Int16),Integer(Int16),Real,Integer,Integer,Integer,Integer,Integer,Integer64,Integer64,Real,Real
 """
     if content != expected_content:
-        gdaltest.post_reason('failure')
         print(content)
         return 'fail'
 
@@ -2165,11 +2132,9 @@ def test_netcdf_52():
     lyr.CreateField(ogr.FieldDefn('extra', ogr.OFTInteger))
     f = lyr.GetNextFeature()
     if f is None:
-        gdaltest.post_reason('failure')
         return 'fail'
     f['extra'] = 5
     if lyr.CreateFeature(f) != 0:
-        gdaltest.post_reason('failure')
         return 'fail'
     ds = None
 
@@ -2177,7 +2142,6 @@ def test_netcdf_52():
     lyr = ds.GetLayer(0)
     f = lyr.GetFeature(lyr.GetFeatureCount())
     if f['int32'] != 1 or f['extra'] != 5:
-        gdaltest.post_reason('failure')
         return 'fail'
     f = None
     ds = None
@@ -2221,7 +2185,6 @@ def test_netcdf_53():
     src_json = src_f.ExportToJson()
     out_json = out_f.ExportToJson()
     if src_json != out_json:
-        gdaltest.post_reason('failure')
         print(src_json)
         print(out_json)
         return 'fail'
@@ -2231,14 +2194,12 @@ def test_netcdf_53():
     out_lyr = out_ds.GetLayer(0)
     srs = out_lyr.GetSpatialRef().ExportToWkt()
     if srs.find('PROJCS["OSGB 1936') < 0:
-        gdaltest.post_reason('failure')
         print(srs)
         return 'fail'
     out_f = out_lyr.GetNextFeature()
     out_f.SetFID(-1)
     out_json = out_f.ExportToJson()
     if src_json != out_json:
-        gdaltest.post_reason('failure')
         print(src_json)
         print(out_json)
         return 'fail'
@@ -2266,14 +2227,12 @@ def test_netcdf_54():
     lyr = ds.GetLayer(0)
     f = lyr.GetNextFeature()
     if f is None:
-        gdaltest.post_reason('failure')
         return 'fail'
     f['int32'] += 1
     f.SetFID(-1)
     f.ExportToJson()
     src_json = f.ExportToJson()
     if lyr.CreateFeature(f) != 0:
-        gdaltest.post_reason('failure')
         return 'fail'
     ds = None
 
@@ -2288,7 +2247,6 @@ def test_netcdf_54():
     gdal.Unlink('tmp/netcdf_54.nc')
 
     if src_json != out_json:
-        gdaltest.post_reason('failure')
         print(src_json)
         print(out_json)
         return 'fail'
@@ -2313,14 +2271,12 @@ def test_netcdf_55():
     lyr = ds.GetLayer(0)
     f = lyr.GetNextFeature()
     if f is None:
-        gdaltest.post_reason('failure')
         return 'fail'
     f['twodimstringchar'] = 'abcd'
     f.SetFID(-1)
     f.ExportToJson()
     src_json = f.ExportToJson()
     if lyr.CreateFeature(f) != 0:
-        gdaltest.post_reason('failure')
         return 'fail'
     ds = None
 
@@ -2335,7 +2291,6 @@ def test_netcdf_55():
     gdal.Unlink('tmp/netcdf_55.nc')
 
     if src_json != out_json:
-        gdaltest.post_reason('failure')
         print(src_json)
         print(out_json)
         return 'fail'
@@ -2361,7 +2316,6 @@ def test_netcdf_56():
     with gdaltest.error_handler():
         ret = lyr.CreateFeature(f)
     if ret != 0:
-        gdaltest.post_reason('failure')
         return 'fail'
     ds = None
 
@@ -2369,7 +2323,6 @@ def test_netcdf_56():
     lyr = ds.GetLayer(0)
     f = lyr.GetFeature(lyr.GetFeatureCount())
     if f['txt'] != '01234' or f.GetGeometryRef() is not None:
-        gdaltest.post_reason('failure')
         f.DumpReadable()
         return 'fail'
     ds = None
@@ -2395,7 +2348,6 @@ def test_netcdf_57():
     with gdaltest.error_handler():
         ds = ogr.GetDriverByName('netCDF').CreateDataSource('/not_existing_dir/invalid_subdir', options=['MULTIPLE_LAYERS=SEPARATE_FILES'])
     if ds is not None:
-        gdaltest.post_reason('failure')
         return 'fail'
 
     open('tmp/netcdf_57', 'wb').close()
@@ -2403,7 +2355,6 @@ def test_netcdf_57():
     with gdaltest.error_handler():
         ds = ogr.GetDriverByName('netCDF').CreateDataSource('/not_existing_dir/invalid_subdir', options=['MULTIPLE_LAYERS=SEPARATE_FILES'])
     if ds is not None:
-        gdaltest.post_reason('failure')
         return 'fail'
 
     os.unlink('tmp/netcdf_57')
@@ -2422,7 +2373,6 @@ def test_netcdf_57():
         lyr = ds.GetLayer(0)
         f = lyr.GetNextFeature()
         if f['lyr_id'] != ilayer:
-            gdaltest.post_reason('failure')
             return 'fail'
         ds = None
 
@@ -2457,7 +2407,6 @@ def test_netcdf_58():
         lyr = ds.GetLayer(ilayer)
         f = lyr.GetNextFeature()
         if f['lyr_id'] != 'lyr_%d' % ilayer:
-            gdaltest.post_reason('failure')
             return 'fail'
     ds = None
 
@@ -2503,12 +2452,10 @@ def test_netcdf_60():
     # Test that a vector cannot be opened in raster-only mode
     ds = gdal.OpenEx('data/profile.nc', gdal.OF_RASTER)
     if ds is not None:
-        gdaltest.post_reason('fail')
         return 'fail'
 
     ds = gdal.OpenEx('data/profile.nc', gdal.OF_VECTOR)
     if ds is None:
-        gdaltest.post_reason('fail')
         return 'fail'
 
     with gdaltest.error_handler():
@@ -2525,7 +2472,6 @@ def test_netcdf_60():
 "POINT Z (3 50 100)",2,4,Santa Fe,baz2
 """
     if content != expected_content:
-        gdaltest.post_reason('failure')
         print(content)
         return 'fail'
 
@@ -2561,7 +2507,6 @@ def test_netcdf_61():
 "POINT Z (3 50 100)",2,4,Santa Fe,baz2
 """
     if content != expected_content:
-        gdaltest.post_reason('failure')
         print(content)
         return 'fail'
 
@@ -2594,7 +2539,6 @@ def test_netcdf_62():
 "POINT Z (3 50 100)",2,4,Santa Fe,baz2
 """
     if content != expected_content:
-        gdaltest.post_reason('failure')
         print(content)
         return 'fail'
 
@@ -2622,7 +2566,6 @@ def test_netcdf_62_ncdump_check():
            ret.find(':featureType = "profile"') < 0 or \
            ret.find('char station(profile') < 0 or \
            ret.find('char foo(record') < 0:
-            gdaltest.post_reason('failure')
             print(ret)
             return 'fail'
     else:
@@ -2673,7 +2616,6 @@ def test_netcdf_63():
 "POINT Z (3 50 100)",2,4,Santa Fe,baz2
 """
     if content != expected_content:
-        gdaltest.post_reason('failure')
         print(content)
         return 'fail'
 
@@ -2703,7 +2645,6 @@ def test_netcdf_63_ncdump_check():
            ret.find('parentIndex:instance_dimension = "profile"') < 0 or \
            ret.find(':featureType = "profile"') < 0 or \
            ret.find('char station(record') < 0:
-            gdaltest.post_reason('failure')
             print(ret)
             return 'fail'
     else:
@@ -2739,7 +2680,6 @@ def test_netcdf_64():
 "POINT Z (3 50 100)",1,4,Santa Fe,baz2
 """
     if content != expected_content:
-        gdaltest.post_reason('failure')
         print(content)
         return 'fail'
 
@@ -2772,7 +2712,6 @@ def test_netcdf_65():
     lyr = ds.GetLayer(0)
     f = lyr.GetNextFeature()
     if f['str'] != '':
-        gdaltest.post_reason('failure')
         f.DumpReadable()
         return 'fail'
     ds = None
@@ -2880,7 +2819,6 @@ def test_netcdf_66():
 "POINT Z (3 50 100)",2,4,Santa Fe,baz2
 """
     if content != expected_content:
-        gdaltest.post_reason('failure')
         print(content)
         return 'fail'
 
@@ -2909,7 +2847,6 @@ def test_netcdf_66_ncdump_check():
            ret.find('profile:cf_role = "profile_id"') < 0 or \
            ret.find('parentIndex:instance_dimension = "profile"') < 0 or \
            ret.find(':featureType = "profile"') < 0:
-            gdaltest.post_reason('failure')
             print(ret)
             return 'fail'
     else:
@@ -2968,7 +2905,6 @@ def test_netcdf_68():
     ds = gdal.Open('data/srid.nc')
     wkt = ds.GetProjectionRef()
     if wkt.find('6933') < 0:
-        gdaltest.post_reason('failure')
         print(wkt)
         return 'fail'
 
@@ -3151,13 +3087,11 @@ def test_netcdf_77():
     ds = gdal.Open('data/fake_Oa01_radiance.nc')
     subdatasets = ds.GetMetadata('SUBDATASETS')
     if len(subdatasets) != 2 * 2:
-        gdaltest.post_reason('fail')
         print(subdatasets)
         return 'fail'
 
     ds = gdal.Open('NETCDF:"data/fake_Oa01_radiance.nc":Oa01_radiance')
     if ds.GetMetadata('GEOLOCATION'):
-        gdaltest.post_reason('fail')
         return 'fail'
 
     return 'success'
@@ -3174,12 +3108,10 @@ def test_netcdf_78():
 
     ds = gdal.Open('data/byte_with_valid_range.nc')
     if ds.GetRasterBand(1).GetNoDataValue() != 240:
-        gdaltest.post_reason('fail')
         return 'fail'
     data = ds.GetRasterBand(1).ReadRaster()
     data = struct.unpack('B' * 4, data)
     if data != (128, 129, 126, 127):
-        gdaltest.post_reason('fail')
         print(data)
         return 'fail'
 
@@ -3197,12 +3129,10 @@ def test_netcdf_79():
 
     ds = gdal.Open('data/byte_with_neg_fillvalue_and_unsigned_hint.nc')
     if ds.GetRasterBand(1).GetNoDataValue() != 240:
-        gdaltest.post_reason('fail')
         return 'fail'
     data = ds.GetRasterBand(1).ReadRaster()
     data = struct.unpack('B' * 4, data)
     if data != (128, 129, 126, 127):
-        gdaltest.post_reason('fail')
         print(data)
         return 'fail'
 
diff --git a/autotest/gdrivers/nitf.py b/autotest/gdrivers/nitf.py
index ec573c9b8cf9..a85406f8cc84 100755
--- a/autotest/gdrivers/nitf.py
+++ b/autotest/gdrivers/nitf.py
@@ -281,7 +281,6 @@ def test_nitf_10():
     expected_cs = src_ds.GetRasterBand(2).Checksum()
     src_ds = None
     if expected_cs != 22296 and expected_cs != 22259:
-        gdaltest.post_reason('fail')
         return 'fail'
 
     tst = gdaltest.GDALTest('NITF', '../tmp/nitf9.ntf', 2, expected_cs)
@@ -1102,7 +1101,6 @@ def test_nitf_38():
 
     gdal.Unlink('tmp/nitf38.vrt')
     if cs != expected_cs:
-        gdaltest.post_reason('failure')
         print(cs)
         return 'fail'
 
@@ -1117,7 +1115,6 @@ def test_nitf_38():
 
     gdal.Unlink('tmp/nitf38.vrt')
     if cs != expected_cs:
-        gdaltest.post_reason('failure')
         print(cs)
         return 'fail'
 
@@ -1132,7 +1129,6 @@ def test_nitf_38():
 
     gdal.Unlink('tmp/nitf38.vrt')
     if cs != expected_cs:
-        gdaltest.post_reason('failure')
         print(cs)
         return 'fail'
 
@@ -1876,7 +1872,6 @@ def test_nitf_read_IMRFCA_IMASDA():
     ds = None
     gdal.Unlink(tmpfile)
     if md is None or md == {}:
-        gdaltest.post_reason('fail')
         print(md)
         return 'fail'
 
@@ -1887,7 +1882,6 @@ def test_nitf_read_IMRFCA_IMASDA():
     ds = None
     gdal.Unlink(tmpfile)
     if md != {}:
-        gdaltest.post_reason('fail')
         print(md)
         return 'fail'
 
@@ -1898,7 +1892,6 @@ def test_nitf_read_IMRFCA_IMASDA():
     ds = None
     gdal.Unlink(tmpfile)
     if md != {}:
-        gdaltest.post_reason('fail')
         print(md)
         return 'fail'
 
@@ -1910,7 +1903,6 @@ def test_nitf_read_IMRFCA_IMASDA():
     ds = None
     gdal.Unlink(tmpfile)
     if md != {}:
-        gdaltest.post_reason('fail')
         print(md)
         return 'fail'
 
@@ -1922,7 +1914,6 @@ def test_nitf_read_IMRFCA_IMASDA():
     ds = None
     gdal.Unlink(tmpfile)
     if md != {}:
-        gdaltest.post_reason('fail')
         print(md)
         return 'fail'
 
diff --git a/autotest/gdrivers/ntv2.py b/autotest/gdrivers/ntv2.py
index 4e7b1ab05827..8ead21d1f7d9 100755
--- a/autotest/gdrivers/ntv2.py
+++ b/autotest/gdrivers/ntv2.py
@@ -83,13 +83,11 @@ def test_ntv2_5():
     gdal.GetDriverByName('NTv2').Create('/vsimem/ntv2_5.gsb', 1, 1, 4, gdal.GDT_Float32, options=['ENDIANNESS=LE'])
     ds = gdal.GetDriverByName('NTv2').CreateCopy('/vsimem/ntv2_5.gsb', src_ds, options=['APPEND_SUBDATASET=YES'])
     if ds.GetRasterBand(2).Checksum() != 10:
-        gdaltest.post_reason('fail')
         print(ds.GetRasterBand(2).Checksum())
         return 'fail'
     ds = None
     ds = gdal.Open('NTv2:1:/vsimem/ntv2_5.gsb')
     if ds.GetRasterBand(2).Checksum() != 10:
-        gdaltest.post_reason('fail')
         print(ds.GetRasterBand(2).Checksum())
         return 'fail'
     ds = None
@@ -107,13 +105,11 @@ def test_ntv2_6():
     gdal.GetDriverByName('NTv2').Create('/vsimem/ntv2_6.gsb', 1, 1, 4, gdal.GDT_Float32, options=['ENDIANNESS=BE'])
     ds = gdal.GetDriverByName('NTv2').CreateCopy('/vsimem/ntv2_6.gsb', src_ds, options=['APPEND_SUBDATASET=YES'])
     if ds.GetRasterBand(2).Checksum() != 10:
-        gdaltest.post_reason('fail')
         print(ds.GetRasterBand(2).Checksum())
         return 'fail'
     ds = None
     ds = gdal.Open('NTv2:1:/vsimem/ntv2_6.gsb')
     if ds.GetRasterBand(2).Checksum() != 10:
-        gdaltest.post_reason('fail')
         print(ds.GetRasterBand(2).Checksum())
         return 'fail'
     ds = None
diff --git a/autotest/gdrivers/pcidsk.py b/autotest/gdrivers/pcidsk.py
index 19d7ae63478a..b4efb150fceb 100755
--- a/autotest/gdrivers/pcidsk.py
+++ b/autotest/gdrivers/pcidsk.py
@@ -409,10 +409,8 @@ def test_pcidsk_15():
 
     ds = gdal.Open('/vsimem/pcidsk_15.pix')
     if ds.RasterCount != 1:
-        gdaltest.post_reason('fail')
         return 'fail'
     if ds.GetLayerCount() != 1:
-        gdaltest.post_reason('fail')
         return 'fail'
 
     ds2 = gdal.GetDriverByName('PCIDSK').CreateCopy('/vsimem/pcidsk_15_2.pix', ds)
@@ -421,10 +419,8 @@ def test_pcidsk_15():
 
     ds = gdal.Open('/vsimem/pcidsk_15_2.pix')
     if ds.RasterCount != 1:
-        gdaltest.post_reason('fail')
         return 'fail'
     if ds.GetLayerCount() != 1:
-        gdaltest.post_reason('fail')
         return 'fail'
     ds = None
 
@@ -435,10 +431,8 @@ def test_pcidsk_15():
 
     ds = gdal.OpenEx('/vsimem/pcidsk_15.pix')
     if ds.RasterCount != 0:
-        gdaltest.post_reason('fail')
         return 'fail'
     if ds.GetLayerCount() != 1:
-        gdaltest.post_reason('fail')
         return 'fail'
 
     ds2 = gdal.GetDriverByName('PCIDSK').CreateCopy('/vsimem/pcidsk_15_2.pix', ds)
@@ -447,10 +441,8 @@ def test_pcidsk_15():
 
     ds = gdal.OpenEx('/vsimem/pcidsk_15_2.pix')
     if ds.RasterCount != 0:
-        gdaltest.post_reason('fail')
         return 'fail'
     if ds.GetLayerCount() != 1:
-        gdaltest.post_reason('fail')
         return 'fail'
     ds = None
 
@@ -460,10 +452,8 @@ def test_pcidsk_15():
 
     ds = gdal.OpenEx('/vsimem/pcidsk_15.pix')
     if ds.RasterCount != 0:
-        gdaltest.post_reason('fail')
         return 'fail'
     if ds.GetLayerCount() != 0:
-        gdaltest.post_reason('fail')
         return 'fail'
 
     ds2 = gdal.GetDriverByName('PCIDSK').CreateCopy('/vsimem/pcidsk_15_2.pix', ds)
@@ -472,10 +462,8 @@ def test_pcidsk_15():
 
     ds = gdal.OpenEx('/vsimem/pcidsk_15_2.pix')
     if ds.RasterCount != 0:
-        gdaltest.post_reason('fail')
         return 'fail'
     if ds.GetLayerCount() != 0:
-        gdaltest.post_reason('fail')
         return 'fail'
     ds = None
 
@@ -494,11 +482,9 @@ def test_pcidsk_external_ovr():
     ds.BuildOverviews('NEAR', [2])
     ds = None
     if gdal.VSIStatL('/vsimem/test.pix.ovr') is None:
-        gdaltest.post_reason('fail')
         return 'fail'
     ds = gdal.Open('/vsimem/test.pix')
     if ds.GetRasterBand(1).GetOverviewCount() != 1:
-        gdaltest.post_reason('fail')
         return 'fail'
     ds = None
 
@@ -517,7 +503,6 @@ def test_pcidsk_external_ovr_rrd():
         ds.BuildOverviews('NEAR', [2])
     ds = None
     if gdal.VSIStatL('/vsimem/test.aux') is None:
-        gdaltest.post_reason('fail')
         return 'fail'
     ds = gdal.Open('/vsimem/test.pix')
     if ds.GetRasterBand(1).GetOverviewCount() != 1:
diff --git a/autotest/gdrivers/pdf.py b/autotest/gdrivers/pdf.py
index a6de15b96be4..1b82863e6c41 100755
--- a/autotest/gdrivers/pdf.py
+++ b/autotest/gdrivers/pdf.py
@@ -639,12 +639,10 @@ def pdf_xmp():
     gdal.GetDriverByName('PDF').Delete('tmp/pdf_xmp.pdf')
 
     if ref_md[0] != got_md[0]:
-        gdaltest.post_reason('fail')
         print(got_md[0])
         return 'fail'
 
     if len(base_md) != 2:  # NEATLINE and DPI
-        gdaltest.post_reason('fail')
         print(base_md)
         return 'fail'
 
@@ -721,7 +719,6 @@ def pdf_update_gt():
     ds = None
 
     if os.path.exists('tmp/pdf_update_gt.pdf.aux.xml'):
-        gdaltest.post_reason('fail')
         return 'fail'
 
     # Check geotransform
@@ -1563,14 +1560,12 @@ def pdf_write_ogr():
             # print('Checksum %s: %d' % (rendering_options[i], cs_tab[i]) )
             for j in range(i + 1, len(rendering_options)):
                 if cs_tab[i] == cs_tab[j] and cs_tab[i] >= 0 and cs_tab[j] >= 0:
-                    gdaltest.post_reason('fail')
                     print('Checksum %s: %d' % (roi, cs_tab[i]))
                     print('Checksum %s: %d' % (rendering_options[j], cs_tab[j]))
                     return 'fail'
 
         # And test that RASTER,VECTOR,TEXT is the default rendering
         if abs(cs_tab[len(rendering_options) - 1]) != cs_ref:
-            gdaltest.post_reason('fail')
             print(cs_ref)
             print(cs_tab[len(rendering_options) - 1])
             return 'fail'
@@ -1680,13 +1675,10 @@ def pdf_jpeg_direct_copy():
     ds = gdal.Open('tmp/pdf_jpeg_direct_copy.pdf')
     # No XMP at PDF level
     if ds.GetMetadata('xml:XMP') is not None:
-        gdaltest.post_reason('failed')
         return 'fail'
     if ds.RasterXSize != 20:
-        gdaltest.post_reason('failed')
         return 'fail'
     if pdf_checksum_available() and ds.GetRasterBand(1).Checksum() == 0:
-        gdaltest.post_reason('failed')
         return 'fail'
     ds = None
 
@@ -1699,7 +1691,6 @@ def pdf_jpeg_direct_copy():
     gdal.Unlink('tmp/pdf_jpeg_direct_copy.pdf')
 
     if offset == -1:
-        gdaltest.post_reason('failed')
         return 'fail'
 
     return 'success'
@@ -1736,13 +1727,10 @@ def pdf_jpeg_in_vrt_direct_copy():
     ds = gdal.Open('tmp/pdf_jpeg_in_vrt_direct_copy.pdf')
     # No XMP at PDF level
     if ds.GetMetadata('xml:XMP') is not None:
-        gdaltest.post_reason('failed')
         return 'fail'
     if ds.RasterXSize != 20:
-        gdaltest.post_reason('failed')
         return 'fail'
     if pdf_checksum_available() and ds.GetRasterBand(1).Checksum() == 0:
-        gdaltest.post_reason('failed')
         return 'fail'
     ds = None
 
@@ -1755,7 +1743,6 @@ def pdf_jpeg_in_vrt_direct_copy():
     gdal.Unlink('tmp/pdf_jpeg_in_vrt_direct_copy.pdf')
 
     if offset == -1:
-        gdaltest.post_reason('failed')
         return 'fail'
 
     return 'success'
@@ -1830,12 +1817,10 @@ def pdf_write_huge():
         ds = None
         ds = gdal.Open(tmp_filename)
         if int(ds.GetMetadataItem('DPI')) != 96:
-            gdaltest.post_reason('failure')
             print(ds.GetMetadataItem('DPI'))
             return 'fail'
         if ds.RasterXSize != src_ds.RasterXSize or \
                 ds.RasterYSize != src_ds.RasterYSize:
-            gdaltest.post_reason('failure')
             print(ds.RasterXSize)
             print(ds.RasterYSize)
             return 'fail'
@@ -1847,12 +1832,10 @@ def pdf_write_huge():
         gdal.PopErrorHandler()
         msg = gdal.GetLastErrorMsg()
         if msg == '':
-            gdaltest.post_reason('failure')
             return 'fail'
         ds = None
         ds = gdal.Open(tmp_filename)
         if int(ds.GetMetadataItem('DPI')) != 72:
-            gdaltest.post_reason('failure')
             print(ds.GetMetadataItem('DPI'))
             return 'fail'
         ds = None
@@ -1867,12 +1850,10 @@ def pdf_write_huge():
         gdal.PopErrorHandler()
         msg = gdal.GetLastErrorMsg()
         if msg == '':
-            gdaltest.post_reason('failure')
             return 'fail'
         ds = None
         ds = gdal.Open(tmp_filename)
         if int(ds.GetMetadataItem('DPI')) != 72:
-            gdaltest.post_reason('failure')
             print(ds.GetMetadataItem('DPI'))
             return 'fail'
         ds = None
@@ -1912,7 +1893,6 @@ def pdf_overviews():
             return 'fail'
         cs = ds.GetRasterBand(1).GetOverview(0).Checksum()
         if cs != 5934:
-            gdaltest.post_reason('failure')
             print(cs)
             return 'fail'
     elif pdf_is_pdfium():
@@ -1921,12 +1901,10 @@ def pdf_overviews():
     ds.BuildOverviews('NONE', [2])
     after = ds.GetRasterBand(1).GetOverviewCount()
     if after != 1:
-        gdaltest.post_reason('failure')
         print(after)
         return 'fail'
     cs = ds.GetRasterBand(1).GetOverview(0).Checksum()
     if cs != 0:
-        gdaltest.post_reason('failure')
         print(cs)
         return 'fail'
     ds = None
@@ -1951,20 +1929,17 @@ def pdf_password():
     with gdaltest.error_handler():
         ds = gdal.Open('data/byte_enc.pdf')
     if ds is not None:
-        gdaltest.post_reason('fail')
         return 'fail'
 
     # Wrong password
     with gdaltest.error_handler():
         ds = gdal.OpenEx('data/byte_enc.pdf', open_options=['USER_PWD=wrong_password'])
     if ds is not None:
-        gdaltest.post_reason('fail')
         return 'fail'
 
     # Correct password
     ds = gdal.OpenEx('data/byte_enc.pdf', open_options=['USER_PWD=user_password'])
     if ds is None:
-        gdaltest.post_reason('fail')
         return 'fail'
 
     import test_cli_utilities
@@ -1980,7 +1955,6 @@ def pdf_password():
     ret = os.system(cmd_line)
     os.unlink('tmp/password.txt')
     if ret == 0:
-        gdaltest.post_reason('fail')
         return 'fail'
 
     # Test ASK_INTERACTIVE with correct password
@@ -1988,7 +1962,6 @@ def pdf_password():
     ret = os.system(cmd_line)
     os.unlink('tmp/password.txt')
     if ret != 0:
-        gdaltest.post_reason('fail')
         return 'fail'
 
     return 'success'
@@ -2032,19 +2005,16 @@ def pdf_multipage():
     with gdaltest.error_handler():
         ds3 = gdal.Open('PDF:0:data/byte_and_rgbsmall_2pages.pdf')
     if ds3 is not None:
-        gdaltest.post_reason('fail')
         return 'fail'
 
     with gdaltest.error_handler():
         ds3 = gdal.Open('PDF:3:data/byte_and_rgbsmall_2pages.pdf')
     if ds3 is not None:
-        gdaltest.post_reason('fail')
         return 'fail'
 
     with gdaltest.error_handler():
         ds = gdal.Open('PDF:1:/does/not/exist.pdf')
     if ds is not None:
-        gdaltest.post_reason('fail')
         return 'fail'
 
     return 'success'
@@ -2062,13 +2032,11 @@ def pdf_metadata():
     ds = gdal.Open('tmp/pdf_metadata.pdf')
     md = ds.GetMetadata()
     if 'FOO' not in md:
-        gdaltest.post_reason('fail')
         print(md)
         return 'fail'
     ds = None
     ds = gdal.Open('tmp/pdf_metadata.pdf')
     if ds.GetMetadataItem('FOO') != 'BAR':
-        gdaltest.post_reason('fail')
         return 'fail'
     ds = None
 
@@ -2090,21 +2058,17 @@ def pdf_pam_georef():
     # Default behaviour should result in no PAM file
     gdaltest.pdf_drv.CreateCopy('tmp/pdf_pam_georef.pdf', src_ds)
     if os.path.exists('tmp/pdf_pam_georef.pdf.aux.xml'):
-        gdaltest.post_reason('fail')
         return 'fail'
 
     # Now disable internal georeferencing, so georef should go to PAM
     gdaltest.pdf_drv.CreateCopy('tmp/pdf_pam_georef.pdf', src_ds, options=['GEO_ENCODING=NONE'])
     if not os.path.exists('tmp/pdf_pam_georef.pdf.aux.xml'):
-        gdaltest.post_reason('fail')
         return 'fail'
 
     ds = gdal.Open('tmp/pdf_pam_georef.pdf')
     if ds.GetGeoTransform() != src_ds.GetGeoTransform():
-        gdaltest.post_reason('fail')
         return 'fail'
     if ds.GetProjectionRef() != src_ds.GetProjectionRef():
-        gdaltest.post_reason('fail')
         return 'fail'
     ds = None
 
diff --git a/autotest/gdrivers/pds.py b/autotest/gdrivers/pds.py
index 71356bcdbf06..460501adfe24 100755
--- a/autotest/gdrivers/pds.py
+++ b/autotest/gdrivers/pds.py
@@ -251,12 +251,10 @@ def test_pds_9():
     got_nd = ds.GetRasterBand(1).GetNoDataValue()
     expected_nd = -3.40282265508890445e+38
     if abs((got_nd - expected_nd) / expected_nd) > 1e-5:
-        gdaltest.post_reason('fail')
         print(got_nd)
         return 'fail'
 
     if not ds.GetProjectionRef():
-        gdaltest.post_reason('fail')
         return 'fail'
 
     return 'success'
@@ -291,12 +289,10 @@ def test_pds_10():
     ds = gdal.Open('/vsimem/pds_10')
 
     if ds.GetMetadataItem('NOTE') != '((1,2,3))':
-        gdaltest.post_reason('fail')
         print(ds.GetMetadataItem('NOTE'))
         return 'fail'
 
     if ds.GetMetadataItem('PRODUCT_ID') != '({1,2},{3,4})':
-        gdaltest.post_reason('fail')
         print(ds.GetMetadataItem('NOTE'))
         return 'fail'
 
diff --git a/autotest/gdrivers/pds4.py b/autotest/gdrivers/pds4.py
index 385e5c7db4c1..de2bbe53b0a6 100755
--- a/autotest/gdrivers/pds4.py
+++ b/autotest/gdrivers/pds4.py
@@ -248,7 +248,6 @@ def test_pds4_8():
     got_gt = ds.GetGeoTransform()
     expected_gt = (85151.12354629935, 42575.561773149675, 0.0, 2086202.5268843342, 0.0, -85151.12354629935)
     if max([abs(got_gt[i] - expected_gt[i]) for i in range(6)]) > 1:
-        gdaltest.post_reason('fail')
         print('')
         print(got_gt)
         print(expected_gt)
@@ -267,13 +266,11 @@ def test_pds4_9():
     ds = gdal.Open('data/byte_pds4.xml')
     ndv = ds.GetRasterBand(1).GetNoDataValue()
     if ndv != 74:
-        gdaltest.post_reason('fail')
         print(ndv)
         return 'fail'
 
     cs = ds.GetRasterBand(1).GetMaskBand().Checksum()
     if cs != 4800:
-        gdaltest.post_reason('fail')
         print(cs)
         return 'fail'
     ds = None
@@ -291,13 +288,11 @@ def test_pds4_9():
     ds = gdal.Open(filename)
     ndv = ds.GetRasterBand(1).GetNoDataValue()
     if ndv != 74:
-        gdaltest.post_reason('fail')
         print(ndv)
         return 'fail'
 
     cs = ds.GetRasterBand(1).GetMaskBand().Checksum()
     if cs != 4800:
-        gdaltest.post_reason('fail')
         print(cs)
         return 'fail'
 
@@ -319,19 +314,16 @@ def test_pds4_9():
         ds = gdal.Open(filename)
         ndv = ds.GetRasterBand(1).GetNoDataValue()
         if ndv != 75:
-            gdaltest.post_reason('fail')
             print(ndv)
             return 'fail'
 
         flag = ds.GetRasterBand(1).GetMaskFlags()
         if flag != 0:
-            gdaltest.post_reason('fail')
             print(flag)
             return 'fail'
 
         cs = ds.GetRasterBand(1).GetMaskBand().Checksum()
         if cs != 4833:
-            gdaltest.post_reason('fail')
             print(cs)
             return 'fail'
 
@@ -352,7 +344,6 @@ def test_pds4_9():
         ds = gdal.Open(filename)
         ndv = ds.GetRasterBand(1).GetNoDataValue()
         if ndv != 74:
-            gdaltest.post_reason('fail')
             print(frmt)
             print(ndv)
             return 'fail'
@@ -369,7 +360,6 @@ def test_pds4_9():
         ds = gdal.Open(filename)
         cs = ds.GetRasterBand(1).Checksum()
         if cs != 1:
-            gdaltest.post_reason('fail')
             print(frmt)
             print(cs)
             return 'fail'
@@ -386,7 +376,6 @@ def test_pds4_9():
         ds = gdal.Open(filename)
         cs = ds.GetRasterBand(1).Checksum()
         if cs != 1:
-            gdaltest.post_reason('fail')
             print(frmt)
             print(cs)
             return 'fail'
@@ -449,7 +438,6 @@ def test_pds4_9():
     ds = gdal.Open(filename)
     ndv = ds.GetRasterBand(1).GetNoDataValue()
     if ndv != 10:
-        gdaltest.post_reason('fail')
         print(ndv)
         return 'fail'
     ds = None
@@ -516,7 +504,6 @@ def test_pds4_9():
     ds = gdal.Open(filename)
     ndv = ds.GetRasterBand(1).GetNoDataValue()
     if ndv != 10:
-        gdaltest.post_reason('fail')
         print(ndv)
         return 'fail'
     ds = None
@@ -551,12 +538,10 @@ def test_pds4_10():
         ds = gdal.Open(filename2)
         scale = ds.GetRasterBand(1).GetScale()
         if scale != 2:
-            gdaltest.post_reason('fail')
             print(scale)
             return 'fail'
         offset = ds.GetRasterBand(1).GetOffset()
         if offset != 3:
-            gdaltest.post_reason('fail')
             print(offset)
             return 'fail'
         ds = None
@@ -590,18 +575,15 @@ def test_pds4_11():
         with gdaltest.config_option('PDS4_FORCE_MASK', 'YES'):
             ds = gdal.Open(filename)
         if ds.GetRasterBand(1).DataType != dt:
-            gdaltest.post_reason('fail')
             print(ds.GetRasterBand(1).DataType)
             print(dt)
             return 'fail'
         got_data = ds.GetRasterBand(1).ReadRaster(0, 0, 1, 1)
         if got_data != data:
-            gdaltest.post_reason('fail')
             print(dt)
             return 'fail'
         cs = ds.GetRasterBand(1).GetMaskBand().Checksum()
         if cs != 3:
-            gdaltest.post_reason('fail')
             print(dt)
             print(cs)
             return 'fail'
@@ -641,35 +623,27 @@ def test_pds4_12():
         data = gdal.VSIFReadL(1, 10000, f).decode('ascii')
         gdal.VSIFCloseL(f)
     if data.find('<logical_identifier>logical_identifier</logical_identifier>') < 0:
-        gdaltest.post_reason('fail')
         print(data)
         return 'fail'
     if data.find('<cart:west_bounding_coordinate unit="deg">1</cart:west_bounding_coordinate>') < 0:
-        gdaltest.post_reason('fail')
         print(data)
         return 'fail'
     if data.find('<cart:east_bounding_coordinate unit="deg">3</cart:east_bounding_coordinate>') < 0:
-        gdaltest.post_reason('fail')
         print(data)
         return 'fail'
     if data.find('<cart:north_bounding_coordinate unit="deg">4</cart:north_bounding_coordinate>') < 0:
-        gdaltest.post_reason('fail')
         print(data)
         return 'fail'
     if data.find('<cart:south_bounding_coordinate unit="deg">2</cart:south_bounding_coordinate>') < 0:
-        gdaltest.post_reason('fail')
         print(data)
         return 'fail'
     if data.find('<cart:latitude_type>planetographic</cart:latitude_type>') < 0:
-        gdaltest.post_reason('fail')
         print(data)
         return 'fail'
     if data.find('<cart:longitude_direction>Positive West</cart:longitude_direction>') < 0:
-        gdaltest.post_reason('fail')
         print(data)
         return 'fail'
     if data.find('<file_name>myimage.raw</file_name>') < 0:
-        gdaltest.post_reason('fail')
         print(data)
         return 'fail'
 
@@ -692,28 +666,24 @@ def test_pds4_13():
                       ('PDS4:data/byte_pds4_multi_sds.xml:2:1',
                        'Image file byte_pds4.img, array third_sds')]
     if subds != expected_subds:
-        gdaltest.post_reason('fail')
         print(subds)
         return 'fail'
 
     ds = gdal.Open('PDS4:data/byte_pds4_multi_sds.xml:1:1')
     cs = ds.GetRasterBand(1).Checksum()
     if cs != 2315:
-        gdaltest.post_reason('fail')
         print(cs)
         return 'fail'
 
     ds = gdal.Open('PDS4:data/byte_pds4_multi_sds.xml:1:2')
     cs = ds.GetRasterBand(1).Checksum()
     if cs != 2302:
-        gdaltest.post_reason('fail')
         print(cs)
         return 'fail'
 
     ds = gdal.Open('PDS4:data/byte_pds4_multi_sds.xml:2:1')
     cs = ds.GetRasterBand(1).Checksum()
     if cs != 3496:
-        gdaltest.post_reason('fail')
         print(cs)
         return 'fail'
 
@@ -721,37 +691,31 @@ def test_pds4_13():
     subds_name = ds.GetSubDatasets()[0][0]
     ds = gdal.Open(subds_name)
     if ds is None:
-        gdaltest.post_reason('fail')
         return 'fail'
 
     with gdaltest.error_handler():
         ds = gdal.Open('PDS4:c:\do_not\exist.xml:1:1')
     if ds is not None:
-        gdaltest.post_reason('fail')
         return 'fail'
 
     with gdaltest.error_handler():
         ds = gdal.Open('PDS4:i_do_not_exist.xml')
     if ds is not None:
-        gdaltest.post_reason('fail')
         return 'fail'
 
     with gdaltest.error_handler():
         ds = gdal.Open('PDS4:i_do_not_exist.xml:1:1')
     if ds is not None:
-        gdaltest.post_reason('fail')
         return 'fail'
 
     with gdaltest.error_handler():
         ds = gdal.Open('PDS4:data/byte_pds4_multi_sds.xml:3:1')
     if ds is not None:
-        gdaltest.post_reason('fail')
         return 'fail'
 
     with gdaltest.error_handler():
         ds = gdal.Open('PDS4:data/byte_pds4_multi_sds.xml:1:3')
     if ds is not None:
-        gdaltest.post_reason('fail')
         return 'fail'
 
     return 'success'
@@ -768,7 +732,6 @@ def test_pds4_14():
     with gdaltest.error_handler():
         ds = gdal.Open(filename)
     if ds is not None:
-        gdaltest.post_reason('fail')
         return 'fail'
 
     gdal.FileFromMemBuffer(filename, """
@@ -842,7 +805,6 @@ def test_pds4_14():
     with gdaltest.error_handler():
         ds = gdal.Open(filename)
     if ds is not None:
-        gdaltest.post_reason('fail')
         return 'fail'
 
     gdal.FileFromMemBuffer(filename, """
@@ -878,7 +840,6 @@ def test_pds4_14():
     with gdaltest.error_handler():
         ds = gdal.Open(filename)
     if ds is not None:
-        gdaltest.post_reason('fail')
         return 'fail'
 
     gdal.FileFromMemBuffer(filename, """
@@ -909,7 +870,6 @@ def test_pds4_14():
     with gdaltest.error_handler():
         ds = gdal.Open(filename)
     if ds is not None:
-        gdaltest.post_reason('fail')
         return 'fail'
 
     gdal.FileFromMemBuffer(filename, """
@@ -940,7 +900,6 @@ def test_pds4_14():
     with gdaltest.error_handler():
         ds = gdal.Open(filename)
     if ds is not None:
-        gdaltest.post_reason('fail')
         return 'fail'
 
     gdal.FileFromMemBuffer(filename, """
@@ -971,7 +930,6 @@ def test_pds4_14():
     with gdaltest.error_handler():
         ds = gdal.Open(filename)
     if ds is not None:
-        gdaltest.post_reason('fail')
         return 'fail'
 
     gdal.Unlink(filename)
@@ -981,7 +939,6 @@ def test_pds4_14():
         ds = gdal.GetDriverByName('PDS4').Create('/vsimem/out.xml', 1, 1,
                                                  options=['INTERLEAVE=INVALID'])
     if ds is not None:
-        gdaltest.post_reason('fail')
         return 'fail'
 
     # INTERLEAVE=BIL not supported for GeoTIFF in PDS4
@@ -990,7 +947,6 @@ def test_pds4_14():
                                                  options=['INTERLEAVE=BIL',
                                                           'IMAGE_FORMAT=GEOTIFF'])
     if ds is not None:
-        gdaltest.post_reason('fail')
         return 'fail'
 
     # Cannot create GeoTIFF file
@@ -998,7 +954,6 @@ def test_pds4_14():
         ds = gdal.GetDriverByName('PDS4').Create('/i/do_not/exist.xml', 1, 1,
                                                  options=['IMAGE_FORMAT=GEOTIFF'])
     if ds is not None:
-        gdaltest.post_reason('fail')
         return 'fail'
 
     gdal.Translate('/vsimem/test.tif', 'data/byte.tif')
@@ -1007,7 +962,6 @@ def test_pds4_14():
         ds = gdal.Translate('/vsimem/test.xml', '/vsimem/test.tif',
                             format='PDS4', creationOptions=['IMAGE_FORMAT=GEOTIFF'])
     if ds is not None:
-        gdaltest.post_reason('fail')
         return 'fail'
     gdal.Unlink('/vsimem/test.tif')
 
@@ -1021,7 +975,6 @@ def test_pds4_14():
     with gdaltest.error_handler():
         ds = None
     if gdal.GetLastErrorMsg() != 'Cannot find Product_Observational element in template':
-        gdaltest.post_reason('fail')
         print(gdal.GetLastErrorMsg())
         return 'fail'
 
@@ -1041,7 +994,6 @@ def test_pds4_14():
     with gdaltest.error_handler():
         ds = None
     if gdal.GetLastErrorMsg() != 'Cannot find Target_Identification element in template':
-        gdaltest.post_reason('fail')
         print(gdal.GetLastErrorMsg())
         return 'fail'
 
@@ -1057,7 +1009,6 @@ def test_pds4_14():
     with gdaltest.error_handler():
         ds = None
     if gdal.GetLastErrorMsg() != 'Cannot find Observation_Area in template':
-        gdaltest.post_reason('fail')
         print(gdal.GetLastErrorMsg())
         return 'fail'
 
@@ -1076,7 +1027,6 @@ def test_pds4_14():
     with gdaltest.error_handler():
         ds = None
     if gdal.GetLastErrorMsg() != 'Unexpected content found after Observation_Area in template':
-        gdaltest.post_reason('fail')
         print(gdal.GetLastErrorMsg())
         return 'fail'
 
@@ -1107,7 +1057,6 @@ def test_pds4_15():
         data = gdal.VSIFReadL(1, 10000, f).decode('ascii')
         gdal.VSIFCloseL(f)
     if data.find('<cart:Cartography>') >= 0:
-        gdaltest.post_reason('fail')
         print(data)
         return 'fail'
 
@@ -1186,15 +1135,12 @@ def test_pds4_16():
         data = gdal.VSIFReadL(1, 10000, f).decode('ascii')
         gdal.VSIFCloseL(f)
     if data.find('http://pds.nasa.gov/pds4/pds/v1 https://pds.nasa.gov/pds4/pds/v1/PDS4_PDS_1800.xsd http://pds.nasa.gov/pds4/cart/v1 https://pds.nasa.gov/pds4/cart/v1/PDS4_CART_1700.xsd"') < 0:
-        gdaltest.post_reason('fail')
         print(data)
         return 'fail'
     if data.find('xmlns:cart="http://pds.nasa.gov/pds4/cart/v1"') < 0:
-        gdaltest.post_reason('fail')
         print(data)
         return 'fail'
     if data.find('<cart:Cartography>') < 0:
-        gdaltest.post_reason('fail')
         print(data)
         return 'fail'
 
@@ -1226,7 +1172,6 @@ def test_pds4_17():
     if data.find('<Array_2D>') < 0 or data.find('<axes>2</axes>') < 0 or \
        data.find('<axis_name>Band</axis_name>') >= 0 or \
        data.find('<sequence_number>3</sequence_number>') >= 0:
-        gdaltest.post_reason('fail')
         print(data)
         return 'fail'
 
@@ -1253,7 +1198,6 @@ def test_pds4_17():
         data = gdal.VSIFReadL(1, 10000, f).decode('ascii')
         gdal.VSIFCloseL(f)
     if data.find('<Array_3D_Spectrum>') < 0 or data.find('<axes>3</axes>') < 0:
-        gdaltest.post_reason('fail')
         print(data)
         return 'fail'
 
@@ -1284,7 +1228,6 @@ def test_pds4_18():
     if data.find('<cart:semi_major_radius unit="m">1</cart:semi_major_radius>') < 0 or \
        data.find('<cart:semi_minor_radius unit="m">1</cart:semi_minor_radius>') < 0 or \
        data.find('<cart:polar_radius unit="m">2</cart:polar_radius>') < 0:
-        gdaltest.post_reason('fail')
         print(data)
         return 'fail'
 
diff --git a/autotest/gdrivers/plmosaic.py b/autotest/gdrivers/plmosaic.py
index e52c2cafc067..1c654457fa6a 100755
--- a/autotest/gdrivers/plmosaic.py
+++ b/autotest/gdrivers/plmosaic.py
@@ -66,7 +66,6 @@ def test_plmosaic_2():
     gdal.SetConfigOption('PL_URL', None)
     gdal.PopErrorHandler()
     if ds is not None:
-        gdaltest.post_reason('fail')
         return 'fail'
 
     return 'success'
@@ -86,7 +85,6 @@ def test_plmosaic_3():
     gdal.SetConfigOption('PL_URL', None)
     gdal.PopErrorHandler()
     if ds is not None:
-        gdaltest.post_reason('fail')
         return 'fail'
 
     return 'success'
@@ -108,7 +106,6 @@ def test_plmosaic_4():
     gdal.SetConfigOption('PL_URL', None)
     gdal.PopErrorHandler()
     if ds is not None:
-        gdaltest.post_reason('fail')
         return 'fail'
 
     return 'success'
@@ -130,7 +127,6 @@ def test_plmosaic_5():
     gdal.SetConfigOption('PL_URL', None)
     gdal.PopErrorHandler()
     if ds is not None:
-        gdaltest.post_reason('fail')
         return 'fail'
 
     return 'success'
@@ -152,7 +148,6 @@ def test_plmosaic_6():
     gdal.SetConfigOption('PL_URL', None)
     gdal.PopErrorHandler()
     if ds is not None:
-        gdaltest.post_reason('fail')
         return 'fail'
 
     return 'success'
@@ -174,7 +169,6 @@ def test_plmosaic_7():
     ds = gdal.OpenEx('PLMosaic:', gdal.OF_RASTER, open_options=['API_KEY=foo'])
     gdal.SetConfigOption('PL_URL', None)
     if ds is not None:
-        gdaltest.post_reason('fail')
         return 'fail'
     ds = None
 
@@ -231,7 +225,6 @@ def test_plmosaic_8():
     ds = gdal.OpenEx('PLMosaic:', gdal.OF_RASTER, open_options=['API_KEY=foo'])
     gdal.SetConfigOption('PL_URL', None)
     if ds.GetMetadata("SUBDATASETS") != {'SUBDATASET_2_NAME': 'PLMOSAIC:mosaic=another_mosaic_name', 'SUBDATASET_2_DESC': 'Mosaic another_mosaic_name', 'SUBDATASET_1_NAME': 'PLMOSAIC:mosaic=my_mosaic_name', 'SUBDATASET_1_DESC': 'Mosaic my_mosaic_name'}:
-        gdaltest.post_reason('fail')
         print(ds.GetMetadata("SUBDATASETS"))
         return 'fail'
     ds = None
@@ -253,7 +246,6 @@ def test_plmosaic_9():
     gdal.SetConfigOption('PL_URL', None)
     gdal.PopErrorHandler()
     if ds is not None or gdal.GetLastErrorMsg().find('/vsimem/root/?name__is=does_not_exist') < 0:
-        gdaltest.post_reason('fail')
         print(gdal.GetLastErrorMsg())
         return 'fail'
 
@@ -275,7 +267,6 @@ def test_plmosaic_9bis():
     gdal.PopErrorHandler()
     gdal.SetConfigOption('PL_URL', None)
     if ds is not None or gdal.GetLastErrorMsg().find('JSON parsing error') < 0:
-        gdaltest.post_reason('fail')
         print(gdal.GetLastErrorMsg())
         return 'fail'
 
@@ -297,7 +288,6 @@ def test_plmosaic_9ter():
     gdal.PopErrorHandler()
     gdal.SetConfigOption('PL_URL', None)
     if ds is not None or gdal.GetLastErrorMsg().find('No mosaic my_mosaic') < 0:
-        gdaltest.post_reason('fail')
         print(gdal.GetLastErrorMsg())
         return 'fail'
 
@@ -324,7 +314,6 @@ def test_plmosaic_10():
     gdal.PopErrorHandler()
     gdal.SetConfigOption('PL_URL', None)
     if ds is not None or gdal.GetLastErrorMsg().find('Missing required parameter') < 0:
-        gdaltest.post_reason('fail')
         print(gdal.GetLastErrorMsg())
         return 'fail'
 
@@ -357,7 +346,6 @@ def test_plmosaic_11():
     gdal.PopErrorHandler()
     gdal.SetConfigOption('PL_URL', None)
     if ds is not None or gdal.GetLastErrorMsg().find('Unsupported coordinate_system') < 0:
-        gdaltest.post_reason('fail')
         print(gdal.GetLastErrorMsg())
         return 'fail'
 
@@ -390,7 +378,6 @@ def test_plmosaic_12():
     gdal.PopErrorHandler()
     gdal.SetConfigOption('PL_URL', None)
     if ds is not None or gdal.GetLastErrorMsg().find('Unsupported data_type') < 0:
-        gdaltest.post_reason('fail')
         print(gdal.GetLastErrorMsg())
         return 'fail'
 
@@ -423,7 +410,6 @@ def test_plmosaic_13():
     gdal.PopErrorHandler()
     gdal.SetConfigOption('PL_URL', None)
     if ds is not None or gdal.GetLastErrorMsg().find('Unsupported resolution') < 0:
-        gdaltest.post_reason('fail')
         print(gdal.GetLastErrorMsg())
         return 'fail'
 
@@ -456,7 +442,6 @@ def test_plmosaic_14():
     gdal.PopErrorHandler()
     gdal.SetConfigOption('PL_URL', None)
     if ds is not None or gdal.GetLastErrorMsg().find('Unsupported quad_size') < 0:
-        gdaltest.post_reason('fail')
         print(gdal.GetLastErrorMsg())
         return 'fail'
 
@@ -495,15 +480,12 @@ def test_plmosaic_15():
     gdal.PopErrorHandler()
     gdal.SetConfigOption('PL_URL', None)
     if gdal.GetLastErrorMsg().find('Invalid _links.tiles') < 0:
-        gdaltest.post_reason('fail')
         print(gdal.GetLastErrorMsg())
         return 'fail'
     if ds.GetRasterBand(1).GetOverviewCount() != 0:
-        gdaltest.post_reason('fail')
         print(ds.GetRasterBand(1).GetOverviewCount())
         return 'fail'
     if ds.GetRasterBand(1).GetOverview(0) is not None:
-        gdaltest.post_reason('fail')
         return 'fail'
     ds = None
 
@@ -563,7 +545,6 @@ def test_plmosaic_16():
     gdal.PopErrorHandler()
     gdal.SetConfigOption('PL_URL', None)
     if ds is not None or gdal.GetLastErrorMsg().find('Unsupported option unsupported_option') < 0:
-        gdaltest.post_reason('fail')
         print(gdal.GetLastErrorMsg())
         return 'fail'
 
@@ -571,11 +552,9 @@ def test_plmosaic_16():
     ds = gdal.OpenEx('PLMosaic:', gdal.OF_RASTER, open_options=['API_KEY=foo'])
     gdal.SetConfigOption('PL_URL', None)
     if ds.GetMetadata("SUBDATASETS") != {}:
-        gdaltest.post_reason('fail')
         print(ds.GetMetadata("SUBDATASETS"))
         return 'fail'
     if ds.GetMetadata() != {'LAST_ACQUIRED': 'last_date', 'NAME': 'my_mosaic', 'FIRST_ACQUIRED': 'first_date'}:
-        gdaltest.post_reason('fail')
         print(ds.GetMetadata())
         return 'fail'
     ds = None
@@ -595,48 +574,37 @@ def test_plmosaic_17():
     ds = gdal.OpenEx('PLMosaic:', gdal.OF_RASTER, open_options=['API_KEY=foo', 'MOSAIC=my_mosaic', 'CACHE_PATH=tmp'])
     gdal.SetConfigOption('PL_URL', None)
     if ds is None:
-        gdaltest.post_reason('fail')
         return 'fail'
     if ds.GetMetadata() != {'LAST_ACQUIRED': 'last_date', 'NAME': 'my_mosaic', 'FIRST_ACQUIRED': 'first_date'}:
-        gdaltest.post_reason('fail')
         print(ds.GetMetadata())
         return 'fail'
     if ds.GetProjectionRef().find('3857') < 0:
-        gdaltest.post_reason('fail')
         print(ds.GetProjectionRef())
         return 'fail'
     if ds.RasterXSize != 8388608:
-        gdaltest.post_reason('fail')
         print(ds.RasterXSize)
         return 'fail'
     if ds.RasterYSize != 8388608:
-        gdaltest.post_reason('fail')
         print(ds.RasterYSize)
         return 'fail'
     got_gt = ds.GetGeoTransform()
     expected_gt = (-20037508.34, 4.7773142671600004, 0.0, 20037508.34, 0.0, -4.7773142671600004)
     for i in range(6):
         if abs(got_gt[i] - expected_gt[i]) > 1e-8:
-            gdaltest.post_reason('fail')
             print(ds.GetGeoTransform())
             return 'fail'
     if ds.GetMetadataItem('INTERLEAVE', 'IMAGE_STRUCTURE') != 'PIXEL':
-        gdaltest.post_reason('fail')
         print(ds.GetMetadata('IMAGE_STRUCTURE'))
         print(ds.GetMetadataItem('INTERLEAVE', 'IMAGE_STRUCTURE'))
         return 'fail'
     if ds.GetRasterBand(1).GetOverviewCount() != 15:
-        gdaltest.post_reason('fail')
         print(ds.GetRasterBand(1).GetOverviewCount())
         return 'fail'
     if ds.GetRasterBand(1).GetOverview(-1) is not None:
-        gdaltest.post_reason('fail')
         return 'fail'
     if ds.GetRasterBand(1).GetOverview(ds.GetRasterBand(1).GetOverviewCount()) is not None:
-        gdaltest.post_reason('fail')
         return 'fail'
     if ds.GetRasterBand(1).GetOverview(0) is None:
-        gdaltest.post_reason('fail')
         return 'fail'
 
     try:
@@ -648,19 +616,16 @@ def test_plmosaic_17():
         # Read at one nonexistent position.
         ds.GetRasterBand(1).ReadRaster(4096 * i, 0, 1, 1)
         if gdal.GetLastErrorMsg() != '':
-            gdaltest.post_reason('fail')
             return 'fail'
     for i in range(11, -1, -1):
         # Again in the same quad, but in different block, to test cache
         ds.GetRasterBand(1).ReadRaster(4096 * i + 256, 0, 1, 1)
         if gdal.GetLastErrorMsg() != '':
-            gdaltest.post_reason('fail')
             return 'fail'
     for i in range(12):
         # Again in the same quad, but in different block, to test cache
         ds.GetRasterBand(1).ReadRaster(4096 * i + 512, 256, 1, 1)
         if gdal.GetLastErrorMsg() != '':
-            gdaltest.post_reason('fail')
             return 'fail'
 
     ds.FlushCache()
@@ -695,7 +660,6 @@ def test_plmosaic_17():
     val = ds.GetRasterBand(1).ReadRaster(0, 0, 1, 1)
     val = struct.unpack('B', val)[0]
     if val != 255:
-        gdaltest.post_reason('fail')
         print(val)
         return 'fail'
 
@@ -712,7 +676,6 @@ def test_plmosaic_17():
     val = ds.GetRasterBand(1).ReadRaster(0, 0, 1, 1)
     val = struct.unpack('B', val)[0]
     if val != 255:
-        gdaltest.post_reason('fail')
         print(val)
         return 'fail'
 
@@ -728,7 +691,6 @@ def test_plmosaic_17():
     val = ds.GetRasterBand(1).ReadRaster(0, 0, 1, 1)
     val = struct.unpack('B', val)[0]
     if val != 255:
-        gdaltest.post_reason('fail')
         print(val)
         return 'fail'
     ds = None
@@ -746,7 +708,6 @@ def test_plmosaic_17():
     val = ds.ReadRaster(0, 0, 1, 1)
     val = struct.unpack('B' * 4, val)
     if val != (254, 0, 0, 0):
-        gdaltest.post_reason('fail')
         print(val)
         return 'fail'
 
@@ -770,13 +731,11 @@ def test_plmosaic_18():
     ret = ds.GetRasterBand(1).GetMetadataItem('Pixel_0_0', 'LocationInfo')
     if ret != """<LocationInfo />
 """:
-        gdaltest.post_reason('fail')
         print(ret)
         return 'fail'
     old_ret = ret
     ret = ds.GetRasterBand(1).GetMetadataItem('Pixel_0_0', 'LocationInfo')
     if ret != old_ret:
-        gdaltest.post_reason('fail')
         print(ret)
         return 'fail'
 
@@ -797,7 +756,6 @@ def test_plmosaic_18():
   </Scenes>
 </LocationInfo>
 """:
-        gdaltest.post_reason('fail')
         print(ret)
         return 'fail'
     ds = None
@@ -821,14 +779,12 @@ def test_plmosaic_19():
     gdal.PopErrorHandler()
     val = struct.unpack('B' * 4, val)
     if val != (254, 0, 0, 0):
-        gdaltest.post_reason('fail')
         print(val)
         return 'fail'
 
     val = ds.ReadRaster(256, 0, 1, 1)
     val = struct.unpack('B' * 4, val)
     if val != (254, 0, 0, 0):
-        gdaltest.post_reason('fail')
         print(val)
         return 'fail'
     ds = None
@@ -850,14 +806,12 @@ def test_plmosaic_20():
     val = ds.ReadRaster(0, 0, 1, 1)
     val = struct.unpack('B' * 4, val)
     if val != (254, 0, 0, 0):
-        gdaltest.post_reason('fail')
         print(val)
         return 'fail'
 
     val = ds.ReadRaster(256, 0, 1, 1)
     val = struct.unpack('B' * 4, val)
     if val != (254, 0, 0, 0):
-        gdaltest.post_reason('fail')
         print(val)
         return 'fail'
     ds = None
@@ -882,7 +836,6 @@ def test_plmosaic_21():
     ds.ReadRaster(256, 512, 1, 1)
     gdal.PopErrorHandler()
     if gdal.GetLastErrorMsg() == '':
-        gdaltest.post_reason('fail')
         return 'fail'
 
     gdal.ErrorReset()
@@ -890,7 +843,6 @@ def test_plmosaic_21():
     ds.GetRasterBand(1).ReadRaster(256, 512, 1, 1)
     gdal.PopErrorHandler()
     if gdal.GetLastErrorMsg() == '':
-        gdaltest.post_reason('fail')
         return 'fail'
 
     gdal.ErrorReset()
@@ -898,7 +850,6 @@ def test_plmosaic_21():
     ds.GetRasterBand(1).ReadBlock(1, 2)
     gdal.PopErrorHandler()
     if gdal.GetLastErrorMsg() == '':
-        gdaltest.post_reason('fail')
         return 'fail'
 
     gdal.FileFromMemBuffer('/vsimem/root/?name__is=mosaic_uint16', """{
@@ -928,7 +879,6 @@ def test_plmosaic_21():
     gdal.SetConfigOption('PL_URL', None)
     gdal.PopErrorHandler()
     if gdal.GetLastErrorMsg().find('Cannot use tile API for full resolution data on non Byte mosaic') < 0:
-        gdaltest.post_reason('fail')
         print(gdal.GetLastErrorMsg())
         return 'fail'
 
@@ -956,7 +906,6 @@ def test_plmosaic_21():
     gdal.SetConfigOption('PL_URL', None)
     gdal.PopErrorHandler()
     if gdal.GetLastErrorMsg().find('Cannot find tile definition, so use_tiles will be ignored') < 0:
-        gdaltest.post_reason('fail')
         print(gdal.GetLastErrorMsg())
         return 'fail'
 
@@ -1020,18 +969,15 @@ def test_plmosaic_with_bbox():
     ds = gdal.OpenEx('PLMosaic:', gdal.OF_RASTER, open_options=['API_KEY=foo'])
     gdal.SetConfigOption('PL_URL', None)
     if ds.RasterXSize != 233472:
-        gdaltest.post_reason('fail')
         print(ds.RasterXSize)
         return 'fail'
     if ds.RasterYSize != 286720:
-        gdaltest.post_reason('fail')
         print(ds.RasterYSize)
         return 'fail'
     got_gt = ds.GetGeoTransform()
     expected_gt = (-11134123.286585508, 4.77731426716, 0.0, 4872401.930333553, 0.0, -4.77731426716)
     for i in range(6):
         if abs(got_gt[i] - expected_gt[i]) > 1e-8:
-            gdaltest.post_reason('fail')
             print(got_gt)
             return 'fail'
 
@@ -1043,7 +989,6 @@ def test_plmosaic_with_bbox():
     val = ds.GetRasterBand(1).ReadRaster(0, 0, 1, 1)
     val = struct.unpack('B', val)[0]
     if val != 125:
-        gdaltest.post_reason('fail')
         print(val)
         return 'fail'
 
@@ -1062,7 +1007,6 @@ def test_plmosaic_with_bbox():
   </Scenes>
 </LocationInfo>
 """:
-        gdaltest.post_reason('fail')
         print(ret)
         return 'fail'
 
diff --git a/autotest/gdrivers/png.py b/autotest/gdrivers/png.py
index 6d629524dc3e..86facd8a1b0f 100755
--- a/autotest/gdrivers/png.py
+++ b/autotest/gdrivers/png.py
@@ -261,7 +261,6 @@ def test_png_12():
     tmp_ds.WriteRaster(0, 0, ds.RasterXSize, ds.RasterYSize, data)
     got_cs = [tmp_ds.GetRasterBand(i + 1).Checksum() for i in range(ds.RasterCount)]
     if cs != got_cs:
-        gdaltest.post_reason('failure')
         return 'fail'
 
     # Pixel interleaved
@@ -270,7 +269,6 @@ def test_png_12():
     tmp_ds.WriteRaster(0, 0, ds.RasterXSize, ds.RasterYSize, data, buf_pixel_space=ds.RasterCount, buf_band_space=1)
     got_cs = [tmp_ds.GetRasterBand(i + 1).Checksum() for i in range(ds.RasterCount)]
     if cs != got_cs:
-        gdaltest.post_reason('failure')
         return 'fail'
 
     # Pixel interleaved with padding
@@ -279,7 +277,6 @@ def test_png_12():
     tmp_ds.WriteRaster(0, 0, ds.RasterXSize, ds.RasterYSize, data, buf_pixel_space=5, buf_band_space=1)
     got_cs = [tmp_ds.GetRasterBand(i + 1).Checksum() for i in range(ds.RasterCount)]
     if cs != got_cs:
-        gdaltest.post_reason('failure')
         return 'fail'
 
     return 'success'
@@ -297,13 +294,11 @@ def test_png_13():
     out_ds = gdal.GetDriverByName('PNG').CreateCopy('/vsimem/tmp.png', src_ds, options=['WRITE_METADATA_AS_TEXT=YES', 'DESCRIPTION=my desc'])
     md = out_ds.GetMetadata()
     if len(md) != 3 or md['foo'] != 'bar' or md['Copyright'] != 'copyright value' or md['Description'] != 'my desc':
-        gdaltest.post_reason('failure')
         print(md)
         return 'fail'
     out_ds = None
     # check that no PAM file is created
     if gdal.VSIStatL('/vsimem/tmp.png.aux.xml') == 0:
-        gdaltest.post_reason('failure')
         return 'fail'
     gdal.Unlink('/vsimem/tmp.png')
     return 'success'
@@ -323,18 +318,15 @@ def test_png_14():
     gdal.Unlink('/vsimem/tmp.png')
 
     if cs != expected_cs:
-        gdaltest.post_reason('failure')
         print(cs)
         return 'fail'
 
     if nbits != '1':
-        gdaltest.post_reason('failure')
         print(nbits)
         return 'fail'
 
     # check that no PAM file is created
     if gdal.VSIStatL('/vsimem/tmp.png.aux.xml') == 0:
-        gdaltest.post_reason('failure')
         return 'fail'
 
     # Test explicit NBITS
@@ -343,7 +335,6 @@ def test_png_14():
     nbits = out_ds.GetRasterBand(1).GetMetadataItem('NBITS', 'IMAGE_STRUCTURE')
     gdal.Unlink('/vsimem/tmp.png')
     if nbits != '2':
-        gdaltest.post_reason('failure')
         print(nbits)
         return 'fail'
 
@@ -354,7 +345,6 @@ def test_png_14():
     nbits = out_ds.GetRasterBand(1).GetMetadataItem('NBITS', 'IMAGE_STRUCTURE')
     gdal.Unlink('/vsimem/tmp.png')
     if nbits is not None:
-        gdaltest.post_reason('failure')
         print(nbits)
         return 'fail'
 
diff --git a/autotest/gdrivers/png_profile.py b/autotest/gdrivers/png_profile.py
index 7c8b00d9a527..fd892f83f134 100755
--- a/autotest/gdrivers/png_profile.py
+++ b/autotest/gdrivers/png_profile.py
@@ -63,12 +63,10 @@ def test_png_copy_icc():
     ds2 = None
 
     if md['SOURCE_ICC_PROFILE'] != icc:
-        gdaltest.post_reason('fail')
         return 'fail'
 
     try:
         os.stat('tmp/icc_test.png.aux.xml')
-        gdaltest.post_reason('fail')
         return 'fail'
     except OSError:
         pass
@@ -80,13 +78,11 @@ def test_png_copy_icc():
 
     try:
         os.stat('tmp/icc_test.png.aux.xml')
-        gdaltest.post_reason('fail')
         return 'fail'
     except OSError:
         pass
 
     if md['SOURCE_ICC_PROFILE'] != icc:
-        gdaltest.post_reason('fail')
         return 'fail'
 
     # Check again with GetMetadataItem()
@@ -96,13 +92,11 @@ def test_png_copy_icc():
 
     try:
         os.stat('tmp/icc_test.png.aux.xml')
-        gdaltest.post_reason('fail')
         return 'fail'
     except OSError:
         pass
 
     if source_icc_profile != icc:
-        gdaltest.post_reason('fail')
         return 'fail'
 
     driver_tiff.Delete('tmp/icc_test.tiff')
@@ -139,7 +133,6 @@ def test_png_copy_options_icc():
     ds2 = None
 
     if md['SOURCE_ICC_PROFILE'] != icc:
-        gdaltest.post_reason('fail')
         return 'fail'
 
     # Check again with dataset from Open()
@@ -149,7 +142,6 @@ def test_png_copy_options_icc():
     ds2 = None
 
     if md['SOURCE_ICC_PROFILE'] != icc:
-        gdaltest.post_reason('fail')
         return 'fail'
 
     driver_tiff.Delete('tmp/icc_test.tiff')
@@ -186,7 +178,6 @@ def test_png_copy_options_colorimetric_data():
 
     for i in range(0, 3):
         if abs(source_whitepoint2[i] - source_whitepoint[i]) > 0.0001:
-            gdaltest.post_reason('fail')
             return 'fail'
 
     source_primaries2 = [
@@ -197,11 +188,9 @@ def test_png_copy_options_colorimetric_data():
     for j in range(0, 3):
         for i in range(0, 3):
             if abs(source_primaries2[j][i] - source_primaries[j][i]) > 0.0001:
-                gdaltest.post_reason('fail')
                 return 'fail'
 
     if float(md['PNG_GAMMA']) != 1.5:
-        gdaltest.post_reason('fail')
         return 'fail'
 
     # Check again with dataset from Open()
@@ -214,7 +203,6 @@ def test_png_copy_options_colorimetric_data():
 
     for i in range(0, 3):
         if abs(source_whitepoint2[i] - source_whitepoint[i]) > 0.0001:
-            gdaltest.post_reason('fail')
             return 'fail'
 
     source_primaries2 = [
@@ -225,11 +213,9 @@ def test_png_copy_options_colorimetric_data():
     for j in range(0, 3):
         for i in range(0, 3):
             if abs(source_primaries2[j][i] - source_primaries[j][i]) > 0.0001:
-                gdaltest.post_reason('fail')
                 return 'fail'
 
     if float(md['PNG_GAMMA']) != 1.5:
-        gdaltest.post_reason('fail')
         return 'fail'
 
     driver_tiff.Delete('tmp/icc_test.tiff')
@@ -269,7 +255,6 @@ def test_png_copy_colorimetric_data():
 
     for i in range(0, 3):
         if abs(source_whitepoint2[i] - source_whitepoint[i]) > 0.0001:
-            gdaltest.post_reason('fail')
             return 'fail'
 
     source_primaries2 = [
@@ -280,11 +265,9 @@ def test_png_copy_colorimetric_data():
     for j in range(0, 3):
         for i in range(0, 3):
             if abs(source_primaries2[j][i] - source_primaries[j][i]) > 0.0001:
-                gdaltest.post_reason('fail')
                 return 'fail'
 
     if float(md['PNG_GAMMA']) != 1.5:
-        gdaltest.post_reason('fail')
         return 'fail'
 
     # Check again with dataset from Open()
@@ -297,7 +280,6 @@ def test_png_copy_colorimetric_data():
 
     for i in range(0, 3):
         if abs(source_whitepoint2[i] - source_whitepoint[i]) > 0.0001:
-            gdaltest.post_reason('fail')
             return 'fail'
 
     source_primaries2 = [
@@ -308,11 +290,9 @@ def test_png_copy_colorimetric_data():
     for j in range(0, 3):
         for i in range(0, 3):
             if abs(source_primaries2[j][i] - source_primaries[j][i]) > 0.0001:
-                gdaltest.post_reason('fail')
                 return 'fail'
 
     if float(md['PNG_GAMMA']) != 1.5:
-        gdaltest.post_reason('fail')
         return 'fail'
 
     driver_tiff.Delete('tmp/icc_test.tiff')
@@ -339,7 +319,6 @@ def test_png_sRGB():
     ds2 = None
 
     if md['SOURCE_ICC_PROFILE_NAME'] != 'sRGB':
-        gdaltest.post_reason('fail')
         return 'fail'
 
     # Check again with dataset from Open()
@@ -349,7 +328,6 @@ def test_png_sRGB():
     ds2 = None
 
     if md['SOURCE_ICC_PROFILE_NAME'] != 'sRGB':
-        gdaltest.post_reason('fail')
         return 'fail'
 
     driver_tiff.Delete('tmp/icc_test.tiff')
diff --git a/autotest/gdrivers/postgisraster.py b/autotest/gdrivers/postgisraster.py
index b7348a30cf17..92f410749edf 100755
--- a/autotest/gdrivers/postgisraster.py
+++ b/autotest/gdrivers/postgisraster.py
@@ -366,7 +366,6 @@ def test_postgisraster_test_create_copy_and_delete_phases():
         ds = gdal.Open(gdaltest.postgisraster_connection_string + "table='small_world_copy' mode=2")
         cs = [ds.GetRasterBand(i + 1).Checksum() for i in range(3)]
         if cs != [30111, 32302, 40026]:
-            gdaltest.post_reason('fail')
             print(cs)
             return 'fail'
         ds = None
@@ -453,7 +452,6 @@ def test_postgisraster_test_norid():
         ds = gdal.Open(gdaltest.postgisraster_connection_string + "table='small_world_noid' mode=2")
     cs = [ds.GetRasterBand(i + 1).Checksum() for i in range(3)]
     if cs != [30111, 32302, 40026]:
-        gdaltest.post_reason('fail')
         print(cs)
         return 'fail'
 
@@ -488,7 +486,6 @@ def test_postgisraster_test_serial():
         ds = gdal.Open(gdaltest.postgisraster_connection_string + "table='small_world_serial' mode=2")
     cs = [ds.GetRasterBand(i + 1).Checksum() for i in range(3)]
     if cs != [30111, 32302, 40026]:
-        gdaltest.post_reason('fail')
         print(cs)
         return 'fail'
 
@@ -523,7 +520,6 @@ def test_postgisraster_test_unique():
         ds = gdal.Open(gdaltest.postgisraster_connection_string + "table='small_world_unique' mode=2")
     cs = [ds.GetRasterBand(i + 1).Checksum() for i in range(3)]
     if cs != [30111, 32302, 40026]:
-        gdaltest.post_reason('fail')
         print(cs)
         return 'fail'
 
@@ -537,7 +533,6 @@ def test_postgisraster_test_constraint():
     ds = gdal.Open(gdaltest.postgisraster_connection_string + "table='small_world_constraint' mode=2")
     cs = [ds.GetRasterBand(i + 1).Checksum() for i in range(3)]
     if cs != [30111, 32302, 40026]:
-        gdaltest.post_reason('fail')
         print(cs)
         return 'fail'
 
@@ -551,7 +546,6 @@ def test_postgisraster_test_constraint_with_spi():
     ds = gdal.Open(gdaltest.postgisraster_connection_string + "table='small_world_constraint_with_spi' mode=2")
     cs = [ds.GetRasterBand(i + 1).Checksum() for i in range(3)]
     if cs != [30111, 32302, 40026]:
-        gdaltest.post_reason('fail')
         print(cs)
         return 'fail'
 
@@ -579,7 +573,6 @@ def test_postgisraster_test_outdb():
     cs = [ds.GetRasterBand(i + 1).Checksum() for i in range(3)]
     expected_cs = [30111, 32302, 40026] if has_guc else [0, 0, 0]
     if cs != expected_cs:
-        gdaltest.post_reason('fail')
         print(cs)
         return 'fail'
 
@@ -593,7 +586,6 @@ def test_postgisraster_test_outdb_client_side():
     ds = gdal.Open(gdaltest.postgisraster_connection_string + "table='small_world_outdb_constraint' mode=2 outdb_resolution=client_side")
     cs = [ds.GetRasterBand(i + 1).Checksum() for i in range(3)]
     if cs != [30111, 32302, 40026]:
-        gdaltest.post_reason('fail')
         print(cs)
         return 'fail'
 
@@ -608,7 +600,6 @@ def test_postgisraster_test_outdb_client_side_force_ireadblock():
     with gdaltest.SetCacheMax(0):
         cs = [ds.GetRasterBand(i + 1).Checksum() for i in range(3)]
     if cs != [30111, 32302, 40026]:
-        gdaltest.post_reason('fail')
         print(cs)
         return 'fail'
 
@@ -622,7 +613,6 @@ def test_postgisraster_test_outdb_client_side_if_possible():
     ds = gdal.Open(gdaltest.postgisraster_connection_string + "table='small_world_outdb_constraint' mode=2 outdb_resolution=client_side_if_possible")
     cs = [ds.GetRasterBand(i + 1).Checksum() for i in range(3)]
     if cs != [30111, 32302, 40026]:
-        gdaltest.post_reason('fail')
         print(cs)
         return 'fail'
 
diff --git a/autotest/gdrivers/rda.py b/autotest/gdrivers/rda.py
index 5281e6c7630b..b79ca8096cde 100755
--- a/autotest/gdrivers/rda.py
+++ b/autotest/gdrivers/rda.py
@@ -72,21 +72,18 @@ def test_rda_bad_connection_string():
     with gdaltest.error_handler():
         ds = gdal.Open('graph-id node-id')
     if ds is not None:
-        gdaltest.post_reason('fail')
         return 'fail'
 
     # Missing graph-id
     with gdaltest.error_handler():
         ds = gdal.Open('"graph-id node-id"')
     if ds is not None:
-        gdaltest.post_reason('fail')
         return 'fail'
 
     # Missing node-id
     with gdaltest.error_handler():
         ds = gdal.Open('{"graph-id": "node-id"}')
     if ds is not None:
-        gdaltest.post_reason('fail')
         return 'fail'
 
     return 'success'
@@ -102,7 +99,6 @@ def test_rda_missing_credentials():
     with gdaltest.error_handler():
         ds = gdal.Open('{"graph-id":"foo","node-id":"bar"}')
     if ds is not None:
-        gdaltest.post_reason('fail')
         return 'fail'
 
     return 'success'
@@ -125,7 +121,6 @@ def test_rda_failed_authentication():
         with gdaltest.error_handler():
             ds = gdal.Open('{"graph-id":"foo","node-id":"bar"}')
     if ds is not None:
-        gdaltest.post_reason('fail')
         return 'fail'
 
     # invalid URL
@@ -135,7 +130,6 @@ def test_rda_failed_authentication():
         with gdaltest.error_handler():
             ds = gdal.Open('{"graph-id":"foo","node-id":"bar"}')
     if ds is not None:
-        gdaltest.post_reason('fail')
         return 'fail'
 
     # 404
@@ -148,7 +142,6 @@ def test_rda_failed_authentication():
             with gdaltest.error_handler():
                 ds = gdal.Open('{"graph-id":"foo","node-id":"bar"}')
     if ds is not None:
-        gdaltest.post_reason('fail')
         return 'fail'
 
     # Invalid json
@@ -161,7 +154,6 @@ def test_rda_failed_authentication():
             with gdaltest.error_handler():
                 ds = gdal.Open('{"graph-id":"foo","node-id":"bar"}')
     if ds is not None:
-        gdaltest.post_reason('fail')
         return 'fail'
 
     # No access token
@@ -174,7 +166,6 @@ def test_rda_failed_authentication():
             with gdaltest.error_handler():
                 ds = gdal.Open('{"graph-id":"foo","node-id":"bar"}')
     if ds is not None:
-        gdaltest.post_reason('fail')
         return 'fail'
 
     return 'success'
@@ -202,7 +193,6 @@ def test_rda_error_metadata():
             with gdaltest.error_handler():
                 ds = gdal.Open('{"graph-id":"foo","node-id":"bar"}')
     if ds is not None:
-        gdaltest.post_reason('fail')
         return 'fail'
 
     # 404 with payload
@@ -218,7 +208,6 @@ def test_rda_error_metadata():
             with gdaltest.error_handler():
                 ds = gdal.Open('{"graph-id":"foo","node-id":"bar"}')
     if ds is not None:
-        gdaltest.post_reason('fail')
         return 'fail'
 
     # invalid json
@@ -234,7 +223,6 @@ def test_rda_error_metadata():
             with gdaltest.error_handler():
                 ds = gdal.Open('{"graph-id":"foo","node-id":"bar"}')
     if ds is not None:
-        gdaltest.post_reason('fail')
         return 'fail'
 
     # a lot of missing elements
@@ -248,7 +236,6 @@ def test_rda_error_metadata():
             with gdaltest.error_handler():
                 ds = gdal.Open('{"graph-id":"foo","node-id":"bar"}')
     if ds is not None:
-        gdaltest.post_reason('fail')
         return 'fail'
 
     # Bad dataType
@@ -285,7 +272,6 @@ def test_rda_error_metadata():
             with gdaltest.error_handler():
                 ds = gdal.Open('{"graph-id":"foo","node-id":"bar"}')
     if ds is not None:
-        gdaltest.post_reason('fail')
         return 'fail'
 
     # Huge numBands
@@ -322,7 +308,6 @@ def test_rda_error_metadata():
             with gdaltest.error_handler():
                 ds = gdal.Open('{"graph-id":"foo","node-id":"bar"}')
     if ds is not None:
-        gdaltest.post_reason('fail')
         return 'fail'
 
     # Invalid dataset dimensions
@@ -359,7 +344,6 @@ def test_rda_error_metadata():
             with gdaltest.error_handler():
                 ds = gdal.Open('{"graph-id":"foo","node-id":"bar"}')
     if ds is not None:
-        gdaltest.post_reason('fail')
         return 'fail'
 
     return 'success'
@@ -420,16 +404,12 @@ def test_rda_graph_nominal():
         with gdaltest.config_options(config_options):
             ds = gdal.Open('{"graph-id":"foo","node-id":"bar","options":{"delete-on-close":false}}')
     if ds is None:
-        gdaltest.post_reason('fail')
         return 'fail'
     if ds.RasterCount != 3:
-        gdaltest.post_reason('fail')
         return 'fail'
     if ds.RasterXSize != 320:
-        gdaltest.post_reason('fail')
         return 'fail'
     if ds.RasterYSize != 300:
-        gdaltest.post_reason('fail')
         return 'fail'
     expected_md = {
         'SENSOR_NAME': 'SENSOR_NAME',
@@ -444,15 +424,12 @@ def test_rda_graph_nominal():
     }
     got_md = ds.GetMetadata()
     if got_md != expected_md:
-        gdaltest.post_reason('fail')
         print(got_md)
         return 'fail'
     if ds.GetRasterBand(1).GetColorInterpretation() != gdal.GCI_RedBand:
-        gdaltest.post_reason('fail')
         return 'fail'
 
     if ds.GetProjectionRef() != '':
-        gdaltest.post_reason('fail')
         return 'fail'
 
     ds = None
@@ -464,16 +441,12 @@ def test_rda_graph_nominal():
                 fd.write('{"graph-id":"foo","node-id":"bar","options":{"delete-on-close":false}}')
             ds = gdal.Open('tmp/rda_test1.dgrda')
     if ds is None:
-        gdaltest.post_reason('fail')
         return 'fail'
     if ds.RasterCount != 3:
-        gdaltest.post_reason('fail')
         return 'fail'
     if ds.RasterXSize != 320:
-        gdaltest.post_reason('fail')
         return 'fail'
     if ds.RasterYSize != 300:
-        gdaltest.post_reason('fail')
         return 'fail'
     expected_md = {
         'SENSOR_NAME': 'SENSOR_NAME',
@@ -488,15 +461,12 @@ def test_rda_graph_nominal():
     }
     got_md = ds.GetMetadata()
     if got_md != expected_md:
-        gdaltest.post_reason('fail')
         print(got_md)
         return 'fail'
     if ds.GetRasterBand(1).GetColorInterpretation() != gdal.GCI_RedBand:
-        gdaltest.post_reason('fail')
         return 'fail'
 
     if ds.GetProjectionRef() != '':
-        gdaltest.post_reason('fail')
         return 'fail'
 
     try:
@@ -509,10 +479,8 @@ def test_rda_graph_nominal():
     with gdaltest.config_options(config_options):
         ds = gdal.Open('{"graph-id":"foo","node-id":"bar","options":{"delete-on-close":false}}')
     if ds is None:
-        gdaltest.post_reason('fail')
         return 'fail'
     if ds.RasterCount != 3:
-        gdaltest.post_reason('fail')
         return 'fail'
 
     gdal.RmdirRecursive('/vsimem/cache_dir')
@@ -527,15 +495,12 @@ def test_rda_graph_nominal():
         with gdaltest.config_options(config_options):
             ds = gdal.Open('{"graph-id":"foo","node-id":"bar","options":{"delete-on-close":false}}')
         if ds is None:
-            gdaltest.post_reason('fail')
             return 'fail'
         if ds.GetProjectionRef().find('32631') < 0:
-            gdaltest.post_reason('fail')
             return 'fail'
 
     got_gt = ds.GetGeoTransform()
     if got_gt != (125.0, 1.0, 0.0, 462.0, 0.0, 2.0):
-        gdaltest.post_reason('fail')
         print(got_gt)
         return 'fail'
 
@@ -546,7 +511,6 @@ def test_rda_graph_nominal():
         ds = gdal.Open('{"graph-id":"foo","node-id":"bar","options":{"delete-on-close":false}}')
     got_gt = ds.GetGeoTransform()
     if got_gt != (125.0, 1.0, 0.0, 462.0, 0.0, 2.0):
-        gdaltest.post_reason('fail')
         print(got_gt)
         return 'fail'
 
@@ -562,10 +526,8 @@ def test_rda_graph_nominal():
         with gdaltest.config_options(config_options):
             ds = gdal.Open('{"graph-id":"foo","node-id":"bar","options":{"delete-on-close":false}}')
         if ds is None:
-            gdaltest.post_reason('fail')
             return 'fail'
         if ds.GetMetadata('RPC') != {}:
-            gdaltest.post_reason('fail')
             return 'fail'
 
     gdal.RmdirRecursive('/vsimem/cache_dir')
@@ -582,10 +544,8 @@ def test_rda_graph_nominal():
         with gdaltest.config_options(config_options):
             ds = gdal.Open('{"graph-id":"foo","node-id":"bar","options":{"delete-on-close":false}}')
         if ds is None:
-            gdaltest.post_reason('fail')
             return 'fail'
         if ds.GetMetadata('RPC') != {}:
-            gdaltest.post_reason('fail')
             return 'fail'
 
     tile_ds = gdal.GetDriverByName('GTiff').Create('/vsimem/tile_00.tif', 256, 256, 3)
@@ -636,7 +596,6 @@ def test_rda_graph_nominal():
     with webserver.install_http_handler(handler):
         cs = [ds.GetRasterBand(i + 1).Checksum() for i in range(3)]
     if cs != [54287, 50451, 21110]:
-        gdaltest.post_reason('fail')
         print(cs)
         return 'fail'
 
@@ -645,33 +604,26 @@ def test_rda_graph_nominal():
         ds = gdal.Open('{"graph-id":"foo","node-id":"bar","options":{"delete-on-close":false}}')
     cs = [ds.GetRasterBand(i + 1).Checksum() for i in range(3)]
     if cs != [54287, 50451, 21110]:
-        gdaltest.post_reason('fail')
         print(cs)
         return 'fail'
 
     data = struct.unpack('B' * (320 * 300 * 3), ds.ReadRaster())
     if data[0] != 255:
-        gdaltest.post_reason('fail')
         return 'fail'
 
     if data[0 + 320 * 300] != 250:
-        gdaltest.post_reason('fail')
         return 'fail'
 
     if data[0 + 320 * 300 * 2] != 245:
-        gdaltest.post_reason('fail')
         return 'fail'
 
     if data[319] != 240:
-        gdaltest.post_reason('fail')
         return 'fail'
 
     if data[320 * 299] != 225:
-        gdaltest.post_reason('fail')
         return 'fail'
 
     if data[320 * 299 + 319] != 210:
-        gdaltest.post_reason('fail')
         return 'fail'
 
     ds = None
@@ -727,10 +679,8 @@ def test_rda_graph_nominal():
 
     data = struct.unpack('B' * (256 * 256), data)
     if data[0] != 255:
-        gdaltest.post_reason('fail')
         return 'fail'
     if data[256 * (256 - 2)] != 225:
-        gdaltest.post_reason('fail')
         return 'fail'
 
 
@@ -739,7 +689,6 @@ def test_rda_graph_nominal():
     data = ds.GetRasterBand(1).ReadBlock(0, 0)
     data = struct.unpack('B' * (256 * 256), data)
     if data[0] != 255:
-        gdaltest.post_reason('fail')
         return 'fail'
 
     gdal.RmdirRecursive('/vsimem/cache_dir')
@@ -756,7 +705,6 @@ def test_rda_graph_nominal():
             with gdaltest.error_handler():
                 data = ds.GetRasterBand(1).ReadBlock(0, 0)
                 if data is not None:
-                    gdaltest.post_reason('fail')
                     return 'fail'
 
     gdal.RmdirRecursive('/vsimem/cache_dir')
@@ -811,19 +759,14 @@ def test_rda_template_nominal():
         with gdaltest.config_options(config_options):
             ds = gdal.Open('{"template-id": "foo","params": [{"nodeId": "bar"}],"options":{"delete-on-close":false}}')
     if ds is None:
-        gdaltest.post_reason('fail')
         return 'fail'
     if ds.RasterCount != 3:
-        gdaltest.post_reason('fail')
         return 'fail'
     if ds.RasterXSize != 320:
-        gdaltest.post_reason('fail')
         return 'fail'
     if ds.RasterYSize != 300:
-        gdaltest.post_reason('fail')
         return 'fail'
     if ds.GetProjectionRef() != '':
-        gdaltest.post_reason('fail')
         return 'fail'
 
     ds = None
@@ -832,10 +775,8 @@ def test_rda_template_nominal():
     with gdaltest.config_options(config_options):
         ds = gdal.Open('{"template-id": "foo","params": [{"nodeId": "bar"}],"options":{"delete-on-close":false}}')
     if ds is None:
-        gdaltest.post_reason('fail')
         return 'fail'
     if ds.RasterCount != 3:
-        gdaltest.post_reason('fail')
         return 'fail'
 
     gdal.RmdirRecursive('/vsimem/cache_dir')
@@ -850,15 +791,12 @@ def test_rda_template_nominal():
         with gdaltest.config_options(config_options):
             ds = gdal.Open('{"template-id": "foo","params": [{"nodeId": "bar"}],"options":{"delete-on-close":false}}')
         if ds is None:
-            gdaltest.post_reason('fail')
             return 'fail'
         if ds.GetProjectionRef().find('32631') < 0:
-            gdaltest.post_reason('fail')
             return 'fail'
 
     got_gt = ds.GetGeoTransform()
     if got_gt != (125.0, 1.0, 0.0, 462.0, 0.0, 2.0):
-        gdaltest.post_reason('fail')
         print(got_gt)
         return 'fail'
 
@@ -869,7 +807,6 @@ def test_rda_template_nominal():
         ds = gdal.Open('{"template-id": "foo","params": [{"nodeId": "bar"}],"options":{"delete-on-close":false}}')
     got_gt = ds.GetGeoTransform()
     if got_gt != (125.0, 1.0, 0.0, 462.0, 0.0, 2.0):
-        gdaltest.post_reason('fail')
         print(got_gt)
         return 'fail'
 
@@ -928,7 +865,6 @@ def test_rda_template_nominal():
 
         cs = [ds.GetRasterBand(i + 1).Checksum() for i in range(3)]
         if cs != [54287, 50451, 21110]:
-            gdaltest.post_reason('fail')
             print(cs)
             return 'fail'
 
@@ -937,33 +873,26 @@ def test_rda_template_nominal():
         ds = gdal.Open('{"template-id": "foo","params": [{"nodeId": "bar"}],"options":{"delete-on-close":false}}')
     cs = [ds.GetRasterBand(i + 1).Checksum() for i in range(3)]
     if cs != [54287, 50451, 21110]:
-        gdaltest.post_reason('fail')
         print(cs)
         return 'fail'
 
     data = struct.unpack('B' * (320 * 300 * 3), ds.ReadRaster())
     if data[0] != 255:
-        gdaltest.post_reason('fail')
         return 'fail'
 
     if data[0 + 320 * 300] != 250:
-        gdaltest.post_reason('fail')
         return 'fail'
 
     if data[0 + 320 * 300 * 2] != 245:
-        gdaltest.post_reason('fail')
         return 'fail'
 
     if data[319] != 240:
-        gdaltest.post_reason('fail')
         return 'fail'
 
     if data[320 * 299] != 225:
-        gdaltest.post_reason('fail')
         return 'fail'
 
     if data[320 * 299 + 319] != 210:
-        gdaltest.post_reason('fail')
         return 'fail'
 
     ds = None
@@ -1051,19 +980,14 @@ def test_rda_template_image_reference_nominal():
         with gdaltest.config_options(config_options):
             ds = gdal.Open('{"templateId": "foo", "nodeId": "bar", "parameters": {"p1": "baz"},"options":{"delete-on-close":false}}')
     if ds is None:
-        gdaltest.post_reason('fail')
         return 'fail'
     if ds.RasterCount != 3:
-        gdaltest.post_reason('fail')
         return 'fail'
     if ds.RasterXSize != 320:
-        gdaltest.post_reason('fail')
         return 'fail'
     if ds.RasterYSize != 300:
-        gdaltest.post_reason('fail')
         return 'fail'
     if ds.GetProjectionRef() != '':
-        gdaltest.post_reason('fail')
         return 'fail'
 
     ds = None
@@ -1072,10 +996,8 @@ def test_rda_template_image_reference_nominal():
     with gdaltest.config_options(config_options):
         ds = gdal.Open('{"templateId": "foo", "nodeId": "bar", "parameters": {"p1": "baz"},"options":{"delete-on-close":false}}')
     if ds is None:
-        gdaltest.post_reason('fail')
         return 'fail'
     if ds.RasterCount != 3:
-        gdaltest.post_reason('fail')
         return 'fail'
 
     gdal.RmdirRecursive('/vsimem/cache_dir')
@@ -1090,15 +1012,12 @@ def test_rda_template_image_reference_nominal():
         with gdaltest.config_options(config_options):
             ds = gdal.Open('{"templateId": "foo", "nodeId": "bar", "parameters": {"p1": "baz"},"options":{"delete-on-close":false}}')
         if ds is None:
-            gdaltest.post_reason('fail')
             return 'fail'
         if ds.GetProjectionRef().find('32631') < 0:
-            gdaltest.post_reason('fail')
             return 'fail'
 
     got_gt = ds.GetGeoTransform()
     if got_gt != (125.0, 1.0, 0.0, 462.0, 0.0, 2.0):
-        gdaltest.post_reason('fail')
         print(got_gt)
         return 'fail'
 
@@ -1109,7 +1028,6 @@ def test_rda_template_image_reference_nominal():
         ds = gdal.Open('{"templateId": "foo", "nodeId": "bar", "parameters": {"p1": "baz"},"options":{"delete-on-close":false}}')
     got_gt = ds.GetGeoTransform()
     if got_gt != (125.0, 1.0, 0.0, 462.0, 0.0, 2.0):
-        gdaltest.post_reason('fail')
         print(got_gt)
         return 'fail'
 
@@ -1168,7 +1086,6 @@ def test_rda_template_image_reference_nominal():
 
         cs = [ds.GetRasterBand(i + 1).Checksum() for i in range(3)]
         if cs != [54287, 50451, 21110]:
-            gdaltest.post_reason('fail')
             print(cs)
             return 'fail'
 
@@ -1177,33 +1094,26 @@ def test_rda_template_image_reference_nominal():
         ds = gdal.Open('{"templateId": "foo", "nodeId": "bar", "parameters": {"p1": "baz"},"options":{"delete-on-close":false}}')
     cs = [ds.GetRasterBand(i + 1).Checksum() for i in range(3)]
     if cs != [54287, 50451, 21110]:
-        gdaltest.post_reason('fail')
         print(cs)
         return 'fail'
 
     data = struct.unpack('B' * (320 * 300 * 3), ds.ReadRaster())
     if data[0] != 255:
-        gdaltest.post_reason('fail')
         return 'fail'
 
     if data[0 + 320 * 300] != 250:
-        gdaltest.post_reason('fail')
         return 'fail'
 
     if data[0 + 320 * 300 * 2] != 245:
-        gdaltest.post_reason('fail')
         return 'fail'
 
     if data[319] != 240:
-        gdaltest.post_reason('fail')
         return 'fail'
 
     if data[320 * 299] != 225:
-        gdaltest.post_reason('fail')
         return 'fail'
 
     if data[320 * 299 + 319] != 210:
-        gdaltest.post_reason('fail')
         return 'fail'
 
     ds = None
@@ -1343,7 +1253,6 @@ def test_rda_download_queue():
     with webserver.install_http_handler(handler):
         data = ds.ReadRaster(0, 1, 4, 2)
     if data != ref_data:
-        gdaltest.post_reason('fail')
         return 'fail'
 
     return 'success'
@@ -1403,7 +1312,6 @@ def test_rda_rpc():
             ds = gdal.Open('{"graph-id":"foo","node-id":"bar","options":{"delete-on-close":false}}')
         md = ds.GetMetadata('RPC')
     if md != {}:
-        gdaltest.post_reason('fail')
         return 'fail'
 
     gdal.RmdirRecursive('/vsimem/cache_dir')
@@ -1420,7 +1328,6 @@ def test_rda_rpc():
         with gdaltest.error_handler():
             md = ds.GetMetadata('RPC')
     if md != {}:
-        gdaltest.post_reason('fail')
         return 'fail'
 
     gdal.RmdirRecursive('/vsimem/cache_dir')
@@ -1438,7 +1345,6 @@ def test_rda_rpc():
     for key in expected_md:
         if not key.endswith('_COEFF'):
             if abs(float(expected_md[key]) - float(md[key])) > 1e-8 * abs(float(expected_md[key])):
-                gdaltest.post_reason('fail')
                 print(key, md)
                 return 'fail'
         else:
@@ -1446,7 +1352,6 @@ def test_rda_rpc():
             got_vals = [float(v) for v in md[key].split(' ')]
             for x in range(20):
                 if abs(expected_vals[x] - got_vals[x]) > 1e-8 * abs(expected_vals[x]):
-                    gdaltest.post_reason('fail')
                     print(key, md)
                     return 'fail'
     ds = None
@@ -1672,7 +1577,6 @@ def test_rda_bad_tile():
         with gdaltest.error_handler():
             data = ds.ReadRaster()
         if data is not None:
-            gdaltest.post_reason('fail')
             return 'fail'
     ds = None
 
@@ -1688,7 +1592,6 @@ def test_rda_bad_tile():
         with gdaltest.error_handler():
             data = ds.GetRasterBand(1).ReadBlock(0, 0)
         if data is not None:
-            gdaltest.post_reason('fail')
             return 'fail'
     ds = None
 
@@ -1704,7 +1607,6 @@ def test_rda_bad_tile():
         with gdaltest.error_handler():
             data = ds.ReadRaster()
         if data is not None:
-            gdaltest.post_reason('fail')
             return 'fail'
     ds = None
 
@@ -1720,7 +1622,6 @@ def test_rda_bad_tile():
         with gdaltest.error_handler():
             data = ds.GetRasterBand(1).ReadBlock(0, 0)
         if data is not None:
-            gdaltest.post_reason('fail')
             return 'fail'
     ds = None
 
diff --git a/autotest/gdrivers/rl2.py b/autotest/gdrivers/rl2.py
index 59ec832cf174..2df7ba3c6e85 100755
--- a/autotest/gdrivers/rl2.py
+++ b/autotest/gdrivers/rl2.py
@@ -71,7 +71,6 @@ def test_rl2_2():
 
     cs = ds.GetRasterBand(1).Checksum()
     if cs != 4672:
-        gdaltest.post_reason('fail')
         print(cs)
         return 'fail'
 
@@ -85,29 +84,23 @@ def test_rl2_2():
 
     wkt = ds.GetProjectionRef()
     if wkt.find('26711') < 0:
-        gdaltest.post_reason('fail')
         return 'fail'
 
     if ds.GetRasterBand(1).GetColorInterpretation() != gdal.GCI_GrayIndex:
-        gdaltest.post_reason('fail')
         return 'fail'
 
     if ds.GetRasterBand(1).GetMinimum() != 74:
-        gdaltest.post_reason('fail')
         return 'fail'
 
     if ds.GetRasterBand(1).GetOverview(-1) is not None:
-        gdaltest.post_reason('fail')
         return 'fail'
 
     if ds.GetRasterBand(1).GetOverview(0) is not None:
-        gdaltest.post_reason('fail')
         return 'fail'
 
     subds = ds.GetSubDatasets()
     expected_subds = []
     if subds != expected_subds:
-        gdaltest.post_reason('fail')
         return 'fail'
 
     gdal.SetConfigOption('RL2_SHOW_ALL_PYRAMID_LEVELS', 'YES')
@@ -116,7 +109,6 @@ def test_rl2_2():
 
     cs = ds.GetRasterBand(1).GetOverview(0).Checksum()
     if cs != 1087:
-        gdaltest.post_reason('fail')
         print(cs)
         return 'fail'
 
@@ -134,37 +126,31 @@ def test_rl2_3():
     ds = gdal.Open('data/small_world.rl2')
 
     if ds.GetRasterBand(1).GetColorInterpretation() != gdal.GCI_RedBand:
-        gdaltest.post_reason('fail')
         return 'fail'
 
     ds.GetRasterBand(1).GetNoDataValue()
 
     cs = ds.GetRasterBand(1).Checksum()
     if cs != 25550:
-        gdaltest.post_reason('fail')
         print(cs)
         return 'fail'
 
     cs = ds.GetRasterBand(2).Checksum()
     if cs != 28146:
-        gdaltest.post_reason('fail')
         print(cs)
         return 'fail'
 
     if ds.GetRasterBand(1).GetOverviewCount() != 2:
-        gdaltest.post_reason('fail')
         return 'fail'
 
     cs = ds.GetRasterBand(1).GetOverview(1).Checksum()
     if cs != 51412:
-        gdaltest.post_reason('fail')
         print(cs)
         return 'fail'
 
     subds = ds.GetSubDatasets()
     expected_subds = [('RASTERLITE2:data/small_world.rl2:small_world:1:world_west', 'Coverage small_world, section world_west / 1'), ('RASTERLITE2:data/small_world.rl2:small_world:2:world_east', 'Coverage small_world, section world_east / 2')]
     if subds != expected_subds:
-        gdaltest.post_reason('fail')
         print(subds)
         return 'fail'
 
@@ -172,17 +158,14 @@ def test_rl2_3():
 
     cs = ds.GetRasterBand(1).Checksum()
     if cs != 3721:
-        gdaltest.post_reason('fail')
         print(cs)
         return 'fail'
 
     if ds.GetRasterBand(1).GetOverviewCount() != 1:
-        gdaltest.post_reason('fail')
         return 'fail'
 
     cs = ds.GetRasterBand(1).GetOverview(0).Checksum()
     if cs != 35686:
-        gdaltest.post_reason('fail')
         print(cs)
         return 'fail'
 
@@ -200,32 +183,26 @@ def test_rl2_4():
     ds = gdal.Open('data/small_world_pct.rl2')
 
     if ds.GetRasterBand(1).GetColorInterpretation() != gdal.GCI_PaletteIndex:
-        gdaltest.post_reason('fail')
         return 'fail'
 
     cs = ds.GetRasterBand(1).Checksum()
     if cs != 14890:
-        gdaltest.post_reason('fail')
         print(cs)
         return 'fail'
 
     pct = ds.GetRasterBand(1).GetColorTable()
     if pct.GetCount() != 256:
-        gdaltest.post_reason('fail')
         return 'fail'
     if pct.GetColorEntry(1) != (176, 184, 176, 255):
-        gdaltest.post_reason('fail')
         print(pct.GetColorEntry(1))
         return 'fail'
 
     pct = ds.GetRasterBand(1).GetColorTable()
     if pct.GetCount() != 256:
-        gdaltest.post_reason('fail')
         return 'fail'
 
     cs = ds.GetRasterBand(1).GetOverview(0).Checksum()
     if cs != 35614:
-        gdaltest.post_reason('fail')
         print(cs)
         return 'fail'
 
@@ -245,7 +222,6 @@ def test_rl2_5():
     subds = ds.GetSubDatasets()
     expected_subds = [('RASTERLITE2:data/multi_type.rl2:uint8', 'Coverage uint8'), ('RASTERLITE2:data/multi_type.rl2:int8', 'Coverage int8'), ('RASTERLITE2:data/multi_type.rl2:uint16', 'Coverage uint16'), ('RASTERLITE2:data/multi_type.rl2:int16', 'Coverage int16'), ('RASTERLITE2:data/multi_type.rl2:uint32', 'Coverage uint32'), ('RASTERLITE2:data/multi_type.rl2:int32', 'Coverage int32'), ('RASTERLITE2:data/multi_type.rl2:float', 'Coverage float'), ('RASTERLITE2:data/multi_type.rl2:double', 'Coverage double'), ('RASTERLITE2:data/multi_type.rl2:1bit', 'Coverage 1bit'), ('RASTERLITE2:data/multi_type.rl2:2bit', 'Coverage 2bit'), ('RASTERLITE2:data/multi_type.rl2:4bit', 'Coverage 4bit')]
     if subds != expected_subds:
-        gdaltest.post_reason('fail')
         print(subds)
         return 'fail'
 
@@ -261,17 +237,14 @@ def test_rl2_5():
     for (subds_name, dt, expected_cs) in tests:
         ds = gdal.Open(subds_name)
         if ds.GetRasterBand(1).DataType != dt:
-            gdaltest.post_reason('fail')
             print(subds_name)
             return 'fail'
         cs = ds.GetRasterBand(1).Checksum()
         if cs != expected_cs:
-            gdaltest.post_reason('fail')
             print(cs)
             return 'fail'
         if subds_name == 'RASTERLITE2:data/multi_type.rl2:int8':
             if ds.GetRasterBand(1).GetMetadataItem('PIXELTYPE', 'IMAGE_STRUCTURE') != 'SIGNEDBYTE':
-                gdaltest.post_reason('fail')
                 print(ds.GetRasterBand(1).GetMetadataItem('PIXELTYPE', 'IMAGE_STRUCTURE'))
                 return 'fail'
 
@@ -557,16 +530,13 @@ def test_rl2_22():
     ds = None
     ds = gdaltest.rl2_drv.CreateCopy('/vsimem/rl2_22.rl2', src_ds, options=['APPEND_SUBDATASET=YES', 'COVERAGE=byte'])
     if ds.GetRasterBand(1).Checksum() != 4672:
-        gdaltest.post_reason('fail')
         print(ds.GetRasterBand(1).Checksum())
         return 'fail'
     ds = None
     ds = gdal.OpenEx('/vsimem/rl2_22.rl2')
     if ds.RasterXSize != 20:
-        gdaltest.post_reason('fail')
         return 'fail'
     if ds.GetLayerCount() != 1:
-        gdaltest.post_reason('fail')
         return 'fail'
 
     left_ds = gdal.Translate('left', src_ds, srcWin=[0, 0, 10, 20], format='MEM')
@@ -575,14 +545,12 @@ def test_rl2_22():
     gdaltest.rl2_drv.CreateCopy('/vsimem/rl2_22.rl2', left_ds, options=['COVERAGE=left_right'])
     ds = gdaltest.rl2_drv.CreateCopy('/vsimem/rl2_22.rl2', right_ds, options=['APPEND_SUBDATASET=YES', 'COVERAGE=left_right', 'SECTION=right'])
     if ds.GetRasterBand(1).Checksum() != 4672:
-        gdaltest.post_reason('fail')
         print(ds.GetRasterBand(1).Checksum())
         return 'fail'
 
     src_ds = gdal.Open('data/rgbsmall.tif')
     ds = gdaltest.rl2_drv.CreateCopy('/vsimem/rl2_22.rl2', src_ds, options=['APPEND_SUBDATASET=YES', 'COVERAGE=rgbsmall'])
     if ds.GetRasterBand(1).Checksum() != src_ds.GetRasterBand(1).Checksum():
-        gdaltest.post_reason('fail')
         print(ds.GetRasterBand(1).Checksum())
         return 'fail'
     ds = None
@@ -605,24 +573,19 @@ def test_rl2_23():
     ds = gdaltest.rl2_drv.CreateCopy('/vsimem/rl2_23.rl2', src_ds)
     ret = ds.BuildOverviews('NEAR', [2])
     if ret != 0:
-        gdaltest.post_reason('fail')
         return 'fail'
     if ds.GetRasterBand(1).GetOverviewCount() != 5:
-        gdaltest.post_reason('fail')
         print(ds.GetRasterBand(1).GetOverviewCount())
         return 'fail'
     cs = ds.GetRasterBand(1).GetOverview(0).Checksum()
     if cs == 0:
-        gdaltest.post_reason('fail')
         print(cs)
         return 'fail'
     ret = ds.BuildOverviews('NONE', [])
     if ret != 0:
-        gdaltest.post_reason('fail')
         return 'fail'
     ds = gdal.Open('/vsimem/rl2_23.rl2')
     if ds.GetRasterBand(1).GetOverviewCount() == 5:
-        gdaltest.post_reason('fail')
         print(ds.GetRasterBand(1).GetOverviewCount())
         return 'fail'
     ds = None
diff --git a/autotest/gdrivers/rraster.py b/autotest/gdrivers/rraster.py
index 40ecec87f809..8754f8881bc5 100755
--- a/autotest/gdrivers/rraster.py
+++ b/autotest/gdrivers/rraster.py
@@ -55,11 +55,9 @@ def test_rraster_1(filename='data/byte_rraster.grd', check_prj=None):
     ds = gdal.Open(filename)
     md = ds.GetMetadata()
     if md != {'CREATOR': "R package 'raster'", 'CREATED': '2016-06-25 17:32:47'}:
-        gdaltest.post_reason('fail')
         print(md)
         return 'fail'
     if ds.GetRasterBand(1).GetDescription() != 'byte':
-        gdaltest.post_reason('fail')
         return 'fail'
     return 'success'
 
@@ -352,10 +350,8 @@ def test_rraster_signedbyte():
 
     ds = gdal.Open(filename2)
     if ds.GetRasterBand(1).GetMetadataItem('PIXELTYPE', 'IMAGE_STRUCTURE') != 'SIGNEDBYTE':
-        gdaltest.post_reason('fail')
         return 'fail'
     if ds.GetRasterBand(1).GetMinimum() != -124:
-        gdaltest.post_reason('fail')
         return 'fail'
     ds = None
 
@@ -381,11 +377,9 @@ def test_rraster_datatypes():
         gdal.Translate(filename, src_ds, format='RRASTER')
         ds = gdal.Open(filename)
         if ds.GetRasterBand(1).DataType != src_ds.GetRasterBand(1).DataType:
-            gdaltest.post_reason('fail')
             print(srcfilename)
             return 'fail'
         if ds.GetRasterBand(1).Checksum() != src_ds.GetRasterBand(1).Checksum():
-            gdaltest.post_reason('fail')
             print(srcfilename)
             return 'fail'
 
@@ -408,10 +402,8 @@ def test_rraster_nodata_and_metadata():
     ds = None
     ds = gdal.Open(filename)
     if ds.GetMetadata() != {'CREATOR': 'GDAL', 'CREATED': 'Today'}:
-        gdaltest.post_reason('fail')
         return 'fail'
     if ds.GetRasterBand(1).GetNoDataValue() != 1:
-        gdaltest.post_reason('fail')
         return 'fail'
     ds = None
 
@@ -429,13 +421,11 @@ def test_rraster_update():
     gdal.Open(filename, gdal.GA_Update)
     ds = gdal.Open(filename, gdal.GA_Update)
     if ds.GetRasterBand(1).Checksum() != 4672:
-        gdaltest.post_reason('fail')
         return 'fail'
     ds.GetRasterBand(1).Fill(0)
     ds = None
     ds = gdal.Open(filename)
     if ds.GetRasterBand(1).Checksum() != 0:
-        gdaltest.post_reason('fail')
         return 'fail'
     ds = None
 
@@ -457,16 +447,12 @@ def test_rraster_colorinterpretation():
     ds = None
     ds = gdal.Open(filename)
     if ds.GetRasterBand(1).GetColorInterpretation() != gdal.GCI_RedBand:
-        gdaltest.post_reason('fail')
         return 'fail'
     if ds.GetRasterBand(2).GetColorInterpretation() != gdal.GCI_GreenBand:
-        gdaltest.post_reason('fail')
         return 'fail'
     if ds.GetRasterBand(3).GetColorInterpretation() != gdal.GCI_BlueBand:
-        gdaltest.post_reason('fail')
         return 'fail'
     if ds.GetRasterBand(4).GetColorInterpretation() != gdal.GCI_AlphaBand:
-        gdaltest.post_reason('fail')
         return 'fail'
     ds = None
 
diff --git a/autotest/gdrivers/rs2.py b/autotest/gdrivers/rs2.py
index af83ace77396..d84120607564 100755
--- a/autotest/gdrivers/rs2.py
+++ b/autotest/gdrivers/rs2.py
@@ -72,7 +72,6 @@ def test_rs2_3():
                     'SAMP_OFF': 'pixelOffset',
                     'SAMP_SCALE': 'pixelScale'}
     if got_rpc != expected_rpc:
-        gdaltest.post_reason('fail')
         print(got_rpc)
         return 'fail'
     return 'success'
diff --git a/autotest/gdrivers/sentinel2.py b/autotest/gdrivers/sentinel2.py
index 7f29ccf547c4..b7cbd430c4c9 100755
--- a/autotest/gdrivers/sentinel2.py
+++ b/autotest/gdrivers/sentinel2.py
@@ -46,7 +46,6 @@ def test_sentinel2_l1c_1():
     gdal.ErrorReset()
     ds = gdal.Open(filename_xml)
     if ds is None or gdal.GetLastErrorMsg() != '':
-        gdaltest.post_reason('fail')
         return 'fail'
 
     expected_md = {'CLOUD_COVERAGE_ASSESSMENT': '0.0',
@@ -79,7 +78,6 @@ def test_sentinel2_l1c_1():
                    'SPECIAL_VALUE_SATURATED': '0'}
     got_md = ds.GetMetadata()
     if got_md != expected_md:
-        gdaltest.post_reason('fail')
         import pprint
         pprint.pprint(got_md)
         return 'fail'
@@ -94,7 +92,6 @@ def test_sentinel2_l1c_1():
                    'SUBDATASET_4_NAME': 'SENTINEL2_L1C:data/fake_sentinel2_l1c/S2A_OPER_PRD_MSIL1C.SAFE/S2A_OPER_MTD_SAFL1C.xml:PREVIEW:EPSG_32632'}
     got_md = ds.GetMetadata('SUBDATASETS')
     if got_md != expected_md:
-        gdaltest.post_reason('fail')
         import pprint
         pprint.pprint(got_md)
         return 'fail'
@@ -105,7 +102,6 @@ def test_sentinel2_l1c_1():
         if os.path.exists('tmp/S2A_OPER_PRD_MSIL1C.zip'):
             ds = gdal.Open('tmp/S2A_OPER_PRD_MSIL1C.zip')
             if ds is None:
-                gdaltest.post_reason('fail')
                 return 'fail'
             os.unlink('tmp/S2A_OPER_PRD_MSIL1C.zip')
 
@@ -114,7 +110,6 @@ def test_sentinel2_l1c_1():
         gdal.ErrorReset()
         ds = gdal.Open(got_md['SUBDATASET_%d_NAME' % (i + 1)])
         if ds is None or gdal.GetLastErrorMsg() != '':
-            gdaltest.post_reason('fail')
             print(got_md['SUBDATASET_%d_NAME' % (i + 1)])
             return 'fail'
 
@@ -131,7 +126,6 @@ def test_sentinel2_l1c_1():
         with gdaltest.error_handler():
             ds = gdal.Open(name)
         if ds is not None:
-            gdaltest.post_reason('fail')
             print(name)
             return 'fail'
 
@@ -147,7 +141,6 @@ def test_sentinel2_l1c_2():
     gdal.ErrorReset()
     ds = gdal.Open('SENTINEL2_L1C:%s:10m:EPSG_32632' % filename_xml)
     if ds is None or gdal.GetLastErrorMsg() != '':
-        gdaltest.post_reason('fail')
         return 'fail'
 
     expected_md = {'CLOUD_COVERAGE_ASSESSMENT': '0.0',
@@ -179,29 +172,24 @@ def test_sentinel2_l1c_2():
                    'SPECIAL_VALUE_SATURATED': '0'}
     got_md = ds.GetMetadata()
     if got_md != expected_md:
-        gdaltest.post_reason('fail')
         import pprint
         pprint.pprint(got_md)
         return 'fail'
 
     if ds.RasterXSize != 20984 or ds.RasterYSize != 20980:
-        gdaltest.post_reason('fail')
         print(ds.RasterXSize)
         print(ds.RasterYSize)
         return 'fail'
 
     if ds.GetProjectionRef().find('32632') < 0:
-        gdaltest.post_reason('fail')
         return 'fail'
 
     got_gt = ds.GetGeoTransform()
     if got_gt != (699960.0, 10.0, 0.0, 5100060.0, 0.0, -10.0):
-        gdaltest.post_reason('fail')
         print(got_gt)
         return 'fail'
 
     if ds.RasterCount != 4:
-        gdaltest.post_reason('fail')
         return 'fail'
 
     vrt = ds.GetMetadata('xml:VRT')[0]
@@ -220,12 +208,10 @@ def test_sentinel2_l1c_2():
       <DstRect xOff="10004" yOff="10000" xSize="10980" ySize="10980" />
     </SimpleSource>"""
     if vrt.find(placement_vrt) < 0:
-        gdaltest.post_reason('fail')
         print(vrt)
         return 'fail'
 
     if ds.GetMetadata('xml:SENTINEL2') is None:
-        gdaltest.post_reason('fail')
         return 'fail'
 
     band = ds.GetRasterBand(1)
@@ -238,27 +224,22 @@ def test_sentinel2_l1c_2():
                    'WAVELENGTH': '665',
                    'WAVELENGTH_UNIT': 'nm'}
     if got_md != expected_md:
-        gdaltest.post_reason('fail')
         import pprint
         pprint.pprint(got_md)
         return 'fail'
 
     if band.GetColorInterpretation() != gdal.GCI_RedBand:
-        gdaltest.post_reason('fail')
         return 'fail'
 
     if band.DataType != gdal.GDT_UInt16:
-        gdaltest.post_reason('fail')
         return 'fail'
 
     if band.GetMetadataItem('NBITS', 'IMAGE_STRUCTURE') != '12':
-        gdaltest.post_reason('fail')
         return 'fail'
 
     band = ds.GetRasterBand(4)
 
     if band.GetColorInterpretation() != gdal.GCI_Undefined:
-        gdaltest.post_reason('fail')
         return 'fail'
 
     got_md = band.GetMetadata()
@@ -270,7 +251,6 @@ def test_sentinel2_l1c_2():
                    'WAVELENGTH': '842',
                    'WAVELENGTH_UNIT': 'nm'}
     if got_md != expected_md:
-        gdaltest.post_reason('fail')
         import pprint
         pprint.pprint(got_md)
         return 'fail'
@@ -286,23 +266,19 @@ def test_sentinel2_l1c_3():
     filename_xml = 'data/fake_sentinel2_l1c/S2A_OPER_PRD_MSIL1C.SAFE/S2A_OPER_MTD_SAFL1C.xml'
     ds = gdal.OpenEx('SENTINEL2_L1C:%s:60m:EPSG_32632' % filename_xml, open_options=['ALPHA=YES'])
     if ds is None:
-        gdaltest.post_reason('fail')
         return 'fail'
 
     if ds.RasterCount != 4:
-        gdaltest.post_reason('fail')
         return 'fail'
 
     band = ds.GetRasterBand(4)
 
     if band.GetColorInterpretation() != gdal.GCI_AlphaBand:
-        gdaltest.post_reason('fail')
         return 'fail'
 
     gdal.ErrorReset()
     cs = band.Checksum()
     if cs != 0 or gdal.GetLastErrorMsg() != '':
-        gdaltest.post_reason('fail')
         return 'fail'
 
     band.ReadRaster()
@@ -318,28 +294,23 @@ def test_sentinel2_l1c_4():
     filename_xml = 'data/fake_sentinel2_l1c/S2A_OPER_PRD_MSIL1C.SAFE/S2A_OPER_MTD_SAFL1C.xml'
     ds = gdal.OpenEx('SENTINEL2_L1C:%s:PREVIEW:EPSG_32632' % filename_xml)
     if ds is None:
-        gdaltest.post_reason('fail')
         return 'fail'
 
     if ds.RasterCount != 3:
-        gdaltest.post_reason('fail')
         return 'fail'
 
     fl = ds.GetFileList()
     # main XML + 2 granule XML + 2 jp2
     if len(fl) != 1 + 2 + 2:
-        gdaltest.post_reason('fail')
         import pprint
         pprint.pprint(fl)
         return 'fail'
 
     band = ds.GetRasterBand(1)
     if band.GetColorInterpretation() != gdal.GCI_RedBand:
-        gdaltest.post_reason('fail')
         return 'fail'
 
     if band.DataType != gdal.GDT_Byte:
-        gdaltest.post_reason('fail')
         return 'fail'
 
     return 'success'
@@ -358,13 +329,11 @@ def test_sentinel2_l1c_5():
     with gdaltest.error_handler():
         ds = gdal.Open('/vsimem/test.xml')
     if ds is not None:
-        gdaltest.post_reason('fail')
         return 'fail'
 
     with gdaltest.error_handler():
         ds = gdal.Open('SENTINEL2_L1C:/vsimem/test.xml:10m:EPSG_32632')
     if ds is not None:
-        gdaltest.post_reason('fail')
         return 'fail'
 
     # File is OK, but granule MTD are missing
@@ -439,14 +408,12 @@ def test_sentinel2_l1c_5():
     with gdaltest.error_handler():
         gdal.Open('/vsimem/test.xml')
     if gdal.GetLastErrorMsg() == '':
-        gdaltest.post_reason('fail')
         return 'fail'
 
     gdal.ErrorReset()
     with gdaltest.error_handler():
         ds = gdal.Open('SENTINEL2_L1C:/vsimem/test.xml:10m:EPSG_32632')
     if ds is not None:
-        gdaltest.post_reason('fail')
         return 'fail'
 
     # No Product_Info
@@ -460,14 +427,12 @@ def test_sentinel2_l1c_5():
     with gdaltest.error_handler():
         ds = gdal.Open('/vsimem/test.xml')
     if ds is not None:
-        gdaltest.post_reason('fail')
         return 'fail'
 
     gdal.ErrorReset()
     with gdaltest.error_handler():
         ds = gdal.Open('SENTINEL2_L1C:/vsimem/test.xml:10m:EPSG_32632')
     if ds is not None:
-        gdaltest.post_reason('fail')
         return 'fail'
 
     # No Product_Organisation
@@ -482,14 +447,12 @@ def test_sentinel2_l1c_5():
     with gdaltest.error_handler():
         ds = gdal.Open('/vsimem/test.xml')
     if ds is not None:
-        gdaltest.post_reason('fail')
         return 'fail'
 
     gdal.ErrorReset()
     with gdaltest.error_handler():
         ds = gdal.Open('SENTINEL2_L1C:/vsimem/test.xml:10m:EPSG_32632')
     if ds is not None:
-        gdaltest.post_reason('fail')
         return 'fail'
 
     # No Band_List
@@ -507,7 +470,6 @@ def test_sentinel2_l1c_5():
     with gdaltest.error_handler():
         ds = gdal.Open('/vsimem/test.xml')
     if ds is not None:
-        gdaltest.post_reason('fail')
         return 'fail'
 
     # No valid bands
@@ -530,7 +492,6 @@ def test_sentinel2_l1c_5():
     with gdaltest.error_handler():
         ds = gdal.Open('/vsimem/test.xml')
     if ds is not None:
-        gdaltest.post_reason('fail')
         return 'fail'
 
     gdal.Unlink('/vsimem/test.xml')
@@ -552,14 +513,12 @@ def test_sentinel2_l1c_6():
     gdal.ErrorReset()
     ds = gdal.Open(filename_xml)
     if ds is None or gdal.GetLastErrorMsg() != '':
-        gdaltest.post_reason('fail')
         return 'fail'
 
     subds_name = ds.GetMetadataItem('SUBDATASET_1_NAME', 'SUBDATASETS')
     gdal.ErrorReset()
     ds = gdal.Open(subds_name)
     if ds is None or gdal.GetLastErrorMsg() != '':
-        gdaltest.post_reason('fail')
         return 'fail'
 
     return 'success'
@@ -630,7 +589,6 @@ def test_sentinel2_l1c_7():
     ds = gdal.Open('SENTINEL2_L1C:/vsimem/test.xml:60m:EPSG_32753')
     nbits = ds.GetRasterBand(1).GetMetadataItem('NBITS', 'IMAGE_STRUCTURE')
     if nbits != '10':
-        gdaltest.post_reason('fail')
         print(nbits)
         return 'fail'
 
@@ -649,7 +607,6 @@ def test_sentinel2_l1c_tile_1():
     gdal.ErrorReset()
     ds = gdal.Open(filename_xml)
     if ds is None or gdal.GetLastErrorMsg() != '':
-        gdaltest.post_reason('fail')
         return 'fail'
 
     expected_md = {'CLOUDY_PIXEL_PERCENTAGE': '0',
@@ -685,7 +642,6 @@ def test_sentinel2_l1c_tile_1():
                    'TILE_ID': 'S2A_OPER_MSI_L1C_TL_MTI__20151231T235959_A000123_T32TQR_N01.03'}
     got_md = ds.GetMetadata()
     if got_md != expected_md:
-        gdaltest.post_reason('fail')
         import pprint
         pprint.pprint(got_md)
         return 'fail'
@@ -700,7 +656,6 @@ def test_sentinel2_l1c_tile_1():
                    'SUBDATASET_4_NAME': 'SENTINEL2_L1C_TILE:data/fake_sentinel2_l1c/S2A_OPER_PRD_MSIL1C.SAFE/GRANULE/S2A_OPER_MSI_L1C_T32TQR_N01.03/S2A_OPER_MTD_L1C_T32TQR.xml:PREVIEW'}
     got_md = ds.GetMetadata('SUBDATASETS')
     if got_md != expected_md:
-        gdaltest.post_reason('fail')
         import pprint
         pprint.pprint(got_md)
         return 'fail'
@@ -710,7 +665,6 @@ def test_sentinel2_l1c_tile_1():
         gdal.ErrorReset()
         ds = gdal.Open(got_md['SUBDATASET_%d_NAME' % (i + 1)])
         if ds is None or gdal.GetLastErrorMsg() != '':
-            gdaltest.post_reason('fail')
             print(got_md['SUBDATASET_%d_NAME' % (i + 1)])
             return 'fail'
 
@@ -722,7 +676,6 @@ def test_sentinel2_l1c_tile_1():
         with gdaltest.error_handler():
             ds = gdal.Open(name)
         if ds is not None:
-            gdaltest.post_reason('fail')
             print(name)
             return 'fail'
 
@@ -740,7 +693,6 @@ def test_sentinel2_l1c_tile_2():
     ds = gdal.Open(filename_xml)
     gdal.SetConfigOption('SENTINEL2_USE_MAIN_MTD', None)
     if ds is None or gdal.GetLastErrorMsg() != '':
-        gdaltest.post_reason('fail')
         return 'fail'
 
     expected_md = {'CLOUDY_PIXEL_PERCENTAGE': '0',
@@ -751,7 +703,6 @@ def test_sentinel2_l1c_tile_2():
                    'TILE_ID': 'S2A_OPER_MSI_L1C_TL_MTI__20151231T235959_A000123_T32TQR_N01.03'}
     got_md = ds.GetMetadata()
     if got_md != expected_md:
-        gdaltest.post_reason('fail')
         import pprint
         pprint.pprint(got_md)
         return 'fail'
@@ -766,7 +717,6 @@ def test_sentinel2_l1c_tile_2():
                    'SUBDATASET_4_NAME': 'SENTINEL2_L1C_TILE:data/fake_sentinel2_l1c/S2A_OPER_PRD_MSIL1C.SAFE/GRANULE/S2A_OPER_MSI_L1C_T32TQR_N01.03/S2A_OPER_MTD_L1C_T32TQR.xml:PREVIEW'}
     got_md = ds.GetMetadata('SUBDATASETS')
     if got_md != expected_md:
-        gdaltest.post_reason('fail')
         import pprint
         pprint.pprint(got_md)
         return 'fail'
@@ -783,7 +733,6 @@ def test_sentinel2_l1c_tile_3():
     gdal.ErrorReset()
     ds = gdal.Open('SENTINEL2_L1C_TILE:%s:10m' % filename_xml)
     if ds is None or gdal.GetLastErrorMsg() != '':
-        gdaltest.post_reason('fail')
         return 'fail'
 
     expected_md = {'CLOUDY_PIXEL_PERCENTAGE': '0',
@@ -819,29 +768,24 @@ def test_sentinel2_l1c_tile_3():
                    'TILE_ID': 'S2A_OPER_MSI_L1C_TL_MTI__20151231T235959_A000123_T32TQR_N01.03'}
     got_md = ds.GetMetadata()
     if got_md != expected_md:
-        gdaltest.post_reason('fail')
         import pprint
         pprint.pprint(got_md)
         return 'fail'
 
     if ds.RasterXSize != 10980 or ds.RasterYSize != 10980:
-        gdaltest.post_reason('fail')
         print(ds.RasterXSize)
         print(ds.RasterYSize)
         return 'fail'
 
     if ds.GetProjectionRef().find('32632') < 0:
-        gdaltest.post_reason('fail')
         return 'fail'
 
     got_gt = ds.GetGeoTransform()
     if got_gt != (699960.0, 10.0, 0.0, 5100060.0, 0.0, -10.0):
-        gdaltest.post_reason('fail')
         print(got_gt)
         return 'fail'
 
     if ds.RasterCount != 4:
-        gdaltest.post_reason('fail')
         return 'fail'
 
     vrt = ds.GetMetadata('xml:VRT')[0]
@@ -853,12 +797,10 @@ def test_sentinel2_l1c_tile_3():
       <DstRect xOff="0" yOff="0" xSize="10980" ySize="10980" />
     </SimpleSource>"""
     if vrt.find(placement_vrt) < 0:
-        gdaltest.post_reason('fail')
         print(vrt)
         return 'fail'
 
     if ds.GetMetadata('xml:SENTINEL2') is None:
-        gdaltest.post_reason('fail')
         return 'fail'
 
     band = ds.GetRasterBand(1)
@@ -871,27 +813,22 @@ def test_sentinel2_l1c_tile_3():
                    'WAVELENGTH': '665',
                    'WAVELENGTH_UNIT': 'nm'}
     if got_md != expected_md:
-        gdaltest.post_reason('fail')
         import pprint
         pprint.pprint(got_md)
         return 'fail'
 
     if band.GetColorInterpretation() != gdal.GCI_RedBand:
-        gdaltest.post_reason('fail')
         return 'fail'
 
     if band.DataType != gdal.GDT_UInt16:
-        gdaltest.post_reason('fail')
         return 'fail'
 
     if band.GetMetadataItem('NBITS', 'IMAGE_STRUCTURE') != '12':
-        gdaltest.post_reason('fail')
         return 'fail'
 
     band = ds.GetRasterBand(4)
 
     if band.GetColorInterpretation() != gdal.GCI_Undefined:
-        gdaltest.post_reason('fail')
         return 'fail'
 
     got_md = band.GetMetadata()
@@ -903,7 +840,6 @@ def test_sentinel2_l1c_tile_3():
                    'WAVELENGTH': '842',
                    'WAVELENGTH_UNIT': 'nm'}
     if got_md != expected_md:
-        gdaltest.post_reason('fail')
         import pprint
         pprint.pprint(got_md)
         return 'fail'
@@ -922,7 +858,6 @@ def test_sentinel2_l1c_tile_4():
     ds = gdal.OpenEx('SENTINEL2_L1C_TILE:%s:10m' % filename_xml, open_options=['ALPHA=YES'])
     gdal.SetConfigOption('SENTINEL2_USE_MAIN_MTD', None)
     if ds is None or gdal.GetLastErrorMsg() != '':
-        gdaltest.post_reason('fail')
         return 'fail'
 
     expected_md = {'CLOUDY_PIXEL_PERCENTAGE': '0',
@@ -933,29 +868,24 @@ def test_sentinel2_l1c_tile_4():
                    'TILE_ID': 'S2A_OPER_MSI_L1C_TL_MTI__20151231T235959_A000123_T32TQR_N01.03'}
     got_md = ds.GetMetadata()
     if got_md != expected_md:
-        gdaltest.post_reason('fail')
         import pprint
         pprint.pprint(got_md)
         return 'fail'
 
     if ds.RasterXSize != 10980 or ds.RasterYSize != 10980:
-        gdaltest.post_reason('fail')
         print(ds.RasterXSize)
         print(ds.RasterYSize)
         return 'fail'
 
     if ds.GetProjectionRef().find('32632') < 0:
-        gdaltest.post_reason('fail')
         return 'fail'
 
     got_gt = ds.GetGeoTransform()
     if got_gt != (699960.0, 10.0, 0.0, 5100060.0, 0.0, -10.0):
-        gdaltest.post_reason('fail')
         print(got_gt)
         return 'fail'
 
     if ds.RasterCount != 5:
-        gdaltest.post_reason('fail')
         return 'fail'
 
     vrt = ds.GetMetadata('xml:VRT')[0]
@@ -967,12 +897,10 @@ def test_sentinel2_l1c_tile_4():
       <DstRect xOff="0" yOff="0" xSize="10980" ySize="10980" />
     </SimpleSource>"""
     if vrt.find(placement_vrt) < 0:
-        gdaltest.post_reason('fail')
         print(vrt)
         return 'fail'
 
     if ds.GetMetadata('xml:SENTINEL2') is None:
-        gdaltest.post_reason('fail')
         return 'fail'
 
     band = ds.GetRasterBand(1)
@@ -983,27 +911,22 @@ def test_sentinel2_l1c_tile_4():
                    'WAVELENGTH': '665',
                    'WAVELENGTH_UNIT': 'nm'}
     if got_md != expected_md:
-        gdaltest.post_reason('fail')
         import pprint
         pprint.pprint(got_md)
         return 'fail'
 
     if band.GetColorInterpretation() != gdal.GCI_RedBand:
-        gdaltest.post_reason('fail')
         return 'fail'
 
     if band.DataType != gdal.GDT_UInt16:
-        gdaltest.post_reason('fail')
         return 'fail'
 
     if band.GetMetadataItem('NBITS', 'IMAGE_STRUCTURE') != '12':
-        gdaltest.post_reason('fail')
         return 'fail'
 
     band = ds.GetRasterBand(5)
 
     if band.GetColorInterpretation() != gdal.GCI_AlphaBand:
-        gdaltest.post_reason('fail')
         return 'fail'
 
     return 'success'
@@ -1018,27 +941,22 @@ def test_sentinel2_l1c_tile_5():
     gdal.ErrorReset()
     ds = gdal.Open('SENTINEL2_L1C_TILE:%s:PREVIEW' % filename_xml)
     if ds is None or gdal.GetLastErrorMsg() != '':
-        gdaltest.post_reason('fail')
         return 'fail'
 
     if ds.RasterXSize != 343 or ds.RasterYSize != 343:
-        gdaltest.post_reason('fail')
         print(ds.RasterXSize)
         print(ds.RasterYSize)
         return 'fail'
 
     if ds.GetProjectionRef().find('32632') < 0:
-        gdaltest.post_reason('fail')
         return 'fail'
 
     got_gt = ds.GetGeoTransform()
     if got_gt != (699960.0, 320.0, 0.0, 5100060.0, 0.0, -320.0):
-        gdaltest.post_reason('fail')
         print(got_gt)
         return 'fail'
 
     if ds.RasterCount != 3:
-        gdaltest.post_reason('fail')
         return 'fail'
 
     vrt = ds.GetMetadata('xml:VRT')[0]
@@ -1050,7 +968,6 @@ def test_sentinel2_l1c_tile_5():
       <DstRect xOff="0" yOff="0" xSize="343" ySize="343" />
     </SimpleSource>"""
     if vrt.find(placement_vrt) < 0:
-        gdaltest.post_reason('fail')
         print(vrt)
         return 'fail'
 
@@ -1070,13 +987,11 @@ def test_sentinel2_l1c_tile_6():
     with gdaltest.error_handler():
         ds = gdal.Open('/vsimem/test.xml')
     if ds is not None:
-        gdaltest.post_reason('fail')
         return 'fail'
 
     with gdaltest.error_handler():
         ds = gdal.Open('SENTINEL2_L1C_TILE:/vsimem/test.xml:10m')
     if ds is not None:
-        gdaltest.post_reason('fail')
         return 'fail'
 
     gdal.FileFromMemBuffer('/vsimem/GRANULE/S2A_OPER_MSI_L1C_bla_N01.03/S2A_OPER_MTD_L1C_bla.xml',
@@ -1110,7 +1025,6 @@ def test_sentinel2_l1c_tile_6():
     with gdaltest.error_handler():
         ds = gdal.Open('SENTINEL2_L1C_TILE:/vsimem/GRANULE/S2A_OPER_MSI_L1C_bla_N01.03/S2A_OPER_MTD_L1C_bla.xml:10m')
     if ds is not None:
-        gdaltest.post_reason('fail')
         return 'fail'
 
     gdal.Unlink('/vsimem/test.xml')
@@ -1128,7 +1042,6 @@ def test_sentinel2_l1b_1():
     gdal.ErrorReset()
     ds = gdal.Open(filename_xml)
     if ds is None or gdal.GetLastErrorMsg() != '':
-        gdaltest.post_reason('fail')
         return 'fail'
 
     expected_md = {'CLOUD_COVERAGE_ASSESSMENT': '0.0',
@@ -1158,7 +1071,6 @@ def test_sentinel2_l1b_1():
                    'SPECIAL_VALUE_SATURATED': '0'}
     got_md = ds.GetMetadata()
     if got_md != expected_md:
-        gdaltest.post_reason('fail')
         import pprint
         pprint.pprint(got_md)
         return 'fail'
@@ -1171,7 +1083,6 @@ def test_sentinel2_l1b_1():
                    'SUBDATASET_3_NAME': 'SENTINEL2_L1B:data/fake_sentinel2_l1b/S2B_OPER_PRD_MSIL1B.SAFE/GRANULE/S2B_OPER_MSI_L1B_N01.03/S2B_OPER_MTD_L1B.xml:60m'}
     got_md = ds.GetMetadata('SUBDATASETS')
     if got_md != expected_md:
-        gdaltest.post_reason('fail')
         import pprint
         pprint.pprint(got_md)
         return 'fail'
@@ -1181,7 +1092,6 @@ def test_sentinel2_l1b_1():
         gdal.ErrorReset()
         ds = gdal.Open(got_md['SUBDATASET_%d_NAME' % (i + 1)])
         if ds is None or gdal.GetLastErrorMsg() != '':
-            gdaltest.post_reason('fail')
             print(got_md['SUBDATASET_%d_NAME' % (i + 1)])
             return 'fail'
 
@@ -1194,7 +1104,6 @@ def test_sentinel2_l1b_1():
         with gdaltest.error_handler():
             ds = gdal.Open(name)
         if ds is not None:
-            gdaltest.post_reason('fail')
             print(name)
             return 'fail'
 
@@ -1210,7 +1119,6 @@ def test_sentinel2_l1b_2():
     gdal.ErrorReset()
     ds = gdal.Open(filename_xml)
     if ds is None or gdal.GetLastErrorMsg() != '':
-        gdaltest.post_reason('fail')
         return 'fail'
 
     expected_md = {'CLOUDY_PIXEL_PERCENTAGE': '0',
@@ -1249,7 +1157,6 @@ def test_sentinel2_l1b_2():
                    'SPECIAL_VALUE_SATURATED': '0'}
     got_md = ds.GetMetadata()
     if got_md != expected_md:
-        gdaltest.post_reason('fail')
         import pprint
         pprint.pprint(got_md)
         return 'fail'
@@ -1262,7 +1169,6 @@ def test_sentinel2_l1b_2():
                       'SUBDATASET_3_NAME': 'SENTINEL2_L1B:data/fake_sentinel2_l1b/S2B_OPER_PRD_MSIL1B.SAFE/GRANULE/S2B_OPER_MSI_L1B_N01.03/S2B_OPER_MTD_L1B.xml:60m'}
     got_md = ds.GetMetadata('SUBDATASETS')
     if got_md != subdatasets_md:
-        gdaltest.post_reason('fail')
         import pprint
         pprint.pprint(got_md)
         return 'fail'
@@ -1275,11 +1181,9 @@ def test_sentinel2_l1b_2():
     finally:
         os.chdir(cwd)
     if ds is None or gdal.GetLastErrorMsg() != '':
-        gdaltest.post_reason('fail')
         return 'fail'
     got_md = ds.GetMetadata()
     if got_md != expected_md:
-        gdaltest.post_reason('fail')
         import pprint
         pprint.pprint(got_md)
         return 'fail'
@@ -1295,7 +1199,6 @@ def test_sentinel2_l1b_3():
     gdal.ErrorReset()
     ds = gdal.Open('SENTINEL2_L1B:data/fake_sentinel2_l1b/S2B_OPER_PRD_MSIL1B.SAFE/GRANULE/S2B_OPER_MSI_L1B_N01.03/S2B_OPER_MTD_L1B.xml:60m')
     if ds is None or gdal.GetLastErrorMsg() != '':
-        gdaltest.post_reason('fail')
         return 'fail'
 
     expected_md = {'CLOUDY_PIXEL_PERCENTAGE': '0',
@@ -1334,24 +1237,20 @@ def test_sentinel2_l1b_3():
                    'SPECIAL_VALUE_SATURATED': '0'}
     got_md = ds.GetMetadata()
     if got_md != expected_md:
-        gdaltest.post_reason('fail')
         import pprint
         pprint.pprint(got_md)
         return 'fail'
 
     if ds.RasterXSize != 1276 or ds.RasterYSize != 384:
-        gdaltest.post_reason('fail')
         print(ds.RasterXSize)
         print(ds.RasterYSize)
         return 'fail'
 
     if ds.GetGCPProjection().find('4326') < 0:
-        gdaltest.post_reason('fail')
         return 'fail'
 
     gcps = ds.GetGCPs()
     if len(gcps) != 5:
-        gdaltest.post_reason('fail')
         print(len(gcps))
         return 'fail'
 
@@ -1360,7 +1259,6 @@ def test_sentinel2_l1b_3():
        gcps[0].GCPX != 11 or \
        gcps[0].GCPY != 46 or \
        gcps[0].GCPZ != 1:
-        gdaltest.post_reason('fail')
         print(gcps[0])
         return 'fail'
 
@@ -1369,7 +1267,6 @@ def test_sentinel2_l1b_3():
        gcps[1].GCPX != 11 or \
        gcps[1].GCPY != 45 or \
        gcps[1].GCPZ != 2:
-        gdaltest.post_reason('fail')
         print(gcps[1])
         return 'fail'
 
@@ -1378,7 +1275,6 @@ def test_sentinel2_l1b_3():
        gcps[2].GCPX != 13 or \
        gcps[2].GCPY != 45 or \
        gcps[2].GCPZ != 3:
-        gdaltest.post_reason('fail')
         print(gcps[2])
         return 'fail'
 
@@ -1387,7 +1283,6 @@ def test_sentinel2_l1b_3():
        gcps[3].GCPX != 13 or \
        gcps[3].GCPY != 46 or \
        gcps[3].GCPZ != 4:
-        gdaltest.post_reason('fail')
         print(gcps[3])
         return 'fail'
 
@@ -1396,12 +1291,10 @@ def test_sentinel2_l1b_3():
        gcps[4].GCPX != 12 or \
        gcps[4].GCPY != 45.5 or \
        gcps[4].GCPZ != 2.5:
-        gdaltest.post_reason('fail')
         print(gcps[4])
         return 'fail'
 
     if ds.RasterCount != 3:
-        gdaltest.post_reason('fail')
         return 'fail'
 
     vrt = ds.GetMetadata('xml:VRT')[0]
@@ -1413,12 +1306,10 @@ def test_sentinel2_l1b_3():
       <DstRect xOff="0" yOff="0" xSize="1276" ySize="384" />
     </SimpleSource>"""
     if vrt.find(placement_vrt) < 0:
-        gdaltest.post_reason('fail')
         print(vrt)
         return 'fail'
 
     if ds.GetMetadata('xml:SENTINEL2') is None:
-        gdaltest.post_reason('fail')
         return 'fail'
 
     band = ds.GetRasterBand(1)
@@ -1429,17 +1320,14 @@ def test_sentinel2_l1b_3():
                    'WAVELENGTH': '443',
                    'WAVELENGTH_UNIT': 'nm'}
     if got_md != expected_md:
-        gdaltest.post_reason('fail')
         import pprint
         pprint.pprint(got_md)
         return 'fail'
 
     if band.DataType != gdal.GDT_UInt16:
-        gdaltest.post_reason('fail')
         return 'fail'
 
     if band.GetMetadataItem('NBITS', 'IMAGE_STRUCTURE') != '12':
-        gdaltest.post_reason('fail')
         return 'fail'
 
     return 'success'
@@ -1510,7 +1398,6 @@ def test_sentinel2_l1b_4():
 """)
     ds = gdal.Open('SENTINEL2_L1B:/vsimem/foo/GRANULE/S2B_OPER_MTD_L1B_N01.03/S2B_OPER_MTD_L1B.xml:60m')
     if ds.RasterXSize != 500:
-        gdaltest.post_reason('fail')
         return 'fail'
 
     # With standard granule metadata (with Granule_Dimensions)
@@ -1536,7 +1423,6 @@ def test_sentinel2_l1b_4():
                    'SUBDATASET_1_NAME': 'SENTINEL2_L1B:/vsimem/foo/GRANULE/S2B_OPER_MTD_L1B_N01.03/S2B_OPER_MTD_L1B.xml:60m'}
     got_md = ds.GetMetadata('SUBDATASETS')
     if got_md != expected_md:
-        gdaltest.post_reason('fail')
         import pprint
         pprint.pprint(got_md)
         return 'fail'
@@ -1544,10 +1430,8 @@ def test_sentinel2_l1b_4():
 
     ds = gdal.OpenEx('SENTINEL2_L1B:/vsimem/foo/GRANULE/S2B_OPER_MTD_L1B_N01.03/S2B_OPER_MTD_L1B.xml:60m', open_options=['ALPHA=YES'])
     if ds is None:
-        gdaltest.post_reason('fail')
         return 'fail'
     if ds.RasterCount != 2:
-        gdaltest.post_reason('fail')
         return 'fail'
     ds = None
 
@@ -1570,7 +1454,6 @@ def test_sentinel2_l1b_5():
     with gdaltest.error_handler():
         ds = gdal.Open('/vsimem/test.xml')
     if ds is not None:
-        gdaltest.post_reason('fail')
         return 'fail'
 
     # No Product_Info
@@ -1584,7 +1467,6 @@ def test_sentinel2_l1b_5():
     with gdaltest.error_handler():
         ds = gdal.Open('/vsimem/test.xml')
     if ds is not None:
-        gdaltest.post_reason('fail')
         return 'fail'
 
     # No Product_Organisation
@@ -1599,14 +1481,12 @@ def test_sentinel2_l1b_5():
     with gdaltest.error_handler():
         ds = gdal.Open('/vsimem/test.xml')
     if ds is not None:
-        gdaltest.post_reason('fail')
         return 'fail'
 
     gdal.ErrorReset()
     with gdaltest.error_handler():
         ds = gdal.Open('SENTINEL2_L1B:/vsimem/test.xml:10m')
     if ds is not None:
-        gdaltest.post_reason('fail')
         return 'fail'
 
     # No Band_List
@@ -1624,7 +1504,6 @@ def test_sentinel2_l1b_5():
     with gdaltest.error_handler():
         ds = gdal.Open('/vsimem/test.xml')
     if ds is not None:
-        gdaltest.post_reason('fail')
         return 'fail'
 
     # No valid bands
@@ -1647,7 +1526,6 @@ def test_sentinel2_l1b_5():
     with gdaltest.error_handler():
         ds = gdal.Open('/vsimem/test.xml')
     if ds is not None:
-        gdaltest.post_reason('fail')
         return 'fail'
 
     # Invalid XML
@@ -1658,14 +1536,12 @@ def test_sentinel2_l1b_5():
     with gdaltest.error_handler():
         ds = gdal.Open('/vsimem/test.xml')
     if ds is not None:
-        gdaltest.post_reason('fail')
         return 'fail'
 
     gdal.ErrorReset()
     with gdaltest.error_handler():
         ds = gdal.Open('SENTINEL2_L1B:/vsimem/test.xml:10m')
     if ds is not None:
-        gdaltest.post_reason('fail')
         return 'fail'
 
     # No Granule_Dimensions
@@ -1681,7 +1557,6 @@ def test_sentinel2_l1b_5():
     with gdaltest.error_handler():
         ds = gdal.Open('SENTINEL2_L1B:/vsimem/test.xml:10m')
     if ds is not None:
-        gdaltest.post_reason('fail')
         return 'fail'
 
     # No ROWS
@@ -1703,7 +1578,6 @@ def test_sentinel2_l1b_5():
     with gdaltest.error_handler():
         ds = gdal.Open('SENTINEL2_L1B:/vsimem/test.xml:10m')
     if ds is not None:
-        gdaltest.post_reason('fail')
         return 'fail'
 
     # No NCOLS
@@ -1725,7 +1599,6 @@ def test_sentinel2_l1b_5():
     with gdaltest.error_handler():
         ds = gdal.Open('SENTINEL2_L1B:/vsimem/test.xml:10m')
     if ds is not None:
-        gdaltest.post_reason('fail')
         return 'fail'
 
     # Not the desired resolution
@@ -1743,7 +1616,6 @@ def test_sentinel2_l1b_5():
     with gdaltest.error_handler():
         ds = gdal.Open('SENTINEL2_L1B:/vsimem/test.xml:10m')
     if ds is not None:
-        gdaltest.post_reason('fail')
         return 'fail'
     gdal.Unlink('/vsimem/test.xml')
 
@@ -1761,7 +1633,6 @@ def test_sentinel2_l2a_1():
     gdal.ErrorReset()
     ds = gdal.Open(filename_xml)
     if ds is None or gdal.GetLastErrorMsg() != '':
-        gdaltest.post_reason('fail')
         return 'fail'
 
     expected_md = {'AOT_RETRIEVAL_ACCURACY': '0',
@@ -1816,7 +1687,6 @@ def test_sentinel2_l2a_1():
                    'WATER_VAPOUR_RETRIEVAL_ACCURACY': '0'}
     got_md = ds.GetMetadata()
     if got_md != expected_md:
-        gdaltest.post_reason('fail')
         import pprint
         pprint.pprint(got_md)
         return 'fail'
@@ -1827,7 +1697,6 @@ def test_sentinel2_l2a_1():
                    'SUBDATASET_2_NAME': 'SENTINEL2_L2A:data/fake_sentinel2_l2a/S2A_USER_PRD_MSIL2A.SAFE/S2A_USER_MTD_SAFL2A.xml:PREVIEW:EPSG_32632'}
     got_md = ds.GetMetadata('SUBDATASETS')
     if got_md != expected_md:
-        gdaltest.post_reason('fail')
         import pprint
         pprint.pprint(got_md)
         return 'fail'
@@ -1837,7 +1706,6 @@ def test_sentinel2_l2a_1():
         gdal.ErrorReset()
         ds = gdal.Open(got_md['SUBDATASET_%d_NAME' % (i + 1)])
         if ds is None or gdal.GetLastErrorMsg() != '':
-            gdaltest.post_reason('fail')
             print(got_md['SUBDATASET_%d_NAME' % (i + 1)])
             return 'fail'
 
@@ -1854,7 +1722,6 @@ def test_sentinel2_l2a_1():
         with gdaltest.error_handler():
             ds = gdal.Open(name)
         if ds is not None:
-            gdaltest.post_reason('fail')
             print(name)
             return 'fail'
 
@@ -1870,7 +1737,6 @@ def test_sentinel2_l2a_2():
     gdal.ErrorReset()
     ds = gdal.Open('SENTINEL2_L2A:%s:60m:EPSG_32632' % filename_xml)
     if ds is None or gdal.GetLastErrorMsg() != '':
-        gdaltest.post_reason('fail')
         return 'fail'
 
     expected_md = {'AOT_RETRIEVAL_ACCURACY': '0',
@@ -1924,29 +1790,24 @@ def test_sentinel2_l2a_2():
                    'WATER_VAPOUR_RETRIEVAL_ACCURACY': '0'}
     got_md = ds.GetMetadata()
     if got_md != expected_md:
-        gdaltest.post_reason('fail')
         import pprint
         pprint.pprint(got_md)
         return 'fail'
 
     if ds.RasterXSize != 1830 or ds.RasterYSize != 1830:
-        gdaltest.post_reason('fail')
         print(ds.RasterXSize)
         print(ds.RasterYSize)
         return 'fail'
 
     if ds.GetProjectionRef().find('32632') < 0:
-        gdaltest.post_reason('fail')
         return 'fail'
 
     got_gt = ds.GetGeoTransform()
     if got_gt != (699960.0, 60.0, 0.0, 5100060.0, 0.0, -60.0):
-        gdaltest.post_reason('fail')
         print(got_gt)
         return 'fail'
 
     if ds.RasterCount != 17:
-        gdaltest.post_reason('fail')
         print(ds.RasterCount)
         return 'fail'
 
@@ -1959,12 +1820,10 @@ def test_sentinel2_l2a_2():
       <DstRect xOff="0" yOff="0" xSize="1830" ySize="1830" />
     </SimpleSource>"""
     if vrt.find(placement_vrt) < 0:
-        gdaltest.post_reason('fail')
         print(vrt)
         return 'fail'
 
     if ds.GetMetadata('xml:SENTINEL2') is None:
-        gdaltest.post_reason('fail')
         return 'fail'
 
     band = ds.GetRasterBand(1)
@@ -1977,25 +1836,21 @@ def test_sentinel2_l2a_2():
                    'WAVELENGTH': '443',
                    'WAVELENGTH_UNIT': 'nm'}
     if got_md != expected_md:
-        gdaltest.post_reason('fail')
         import pprint
         pprint.pprint(got_md)
         return 'fail'
 
     if band.DataType != gdal.GDT_UInt16:
-        gdaltest.post_reason('fail')
         return 'fail'
 
     band = ds.GetRasterBand(13)
 
     if band.GetColorInterpretation() != gdal.GCI_Undefined:
-        gdaltest.post_reason('fail')
         return 'fail'
 
     got_md = band.GetMetadata()
     expected_md = {'BANDNAME': 'AOT'}
     if got_md != expected_md:
-        gdaltest.post_reason('fail')
         import pprint
         pprint.pprint(got_md)
         return 'fail'
@@ -2005,7 +1860,6 @@ def test_sentinel2_l2a_2():
         if ds.GetRasterBand(i + 1).GetMetadataItem('BANDNAME') == 'SCL':
             scl_band = i + 1
     if scl_band == 0:
-        gdaltest.post_reason('fail')
         return 'fail'
     band = ds.GetRasterBand(scl_band)
     expected_categories = ['NODATA',
@@ -2022,7 +1876,6 @@ def test_sentinel2_l2a_2():
                            'SNOW_ICE']
     got_categories = band.GetCategoryNames()
     if got_categories != expected_categories:
-        gdaltest.post_reason('fail')
         import pprint
         pprint.pprint(got_categories)
         return 'fail'
@@ -2043,13 +1896,11 @@ def test_sentinel2_l2a_3():
     with gdaltest.error_handler():
         ds = gdal.Open('/vsimem/test.xml')
     if ds is not None:
-        gdaltest.post_reason('fail')
         return 'fail'
 
     with gdaltest.error_handler():
         ds = gdal.Open('SENTINEL2_L2A:/vsimem/test.xml:10m:EPSG_32632')
     if ds is not None:
-        gdaltest.post_reason('fail')
         return 'fail'
 
     # File is OK, but granule MTD are missing
@@ -2095,14 +1946,12 @@ def test_sentinel2_l2a_3():
     with gdaltest.error_handler():
         gdal.Open('/vsimem/test.xml')
     if gdal.GetLastErrorMsg() == '':
-        gdaltest.post_reason('fail')
         return 'fail'
 
     gdal.ErrorReset()
     with gdaltest.error_handler():
         ds = gdal.Open('SENTINEL2_L2A:/vsimem/test.xml:10m:EPSG_32632')
     if ds is not None:
-        gdaltest.post_reason('fail')
         return 'fail'
 
     gdal.Unlink('/vsimem/test.xml')
@@ -2119,7 +1968,6 @@ def test_sentinel2_l2a_4():
     gdal.ErrorReset()
     ds = gdal.Open(filename_xml)
     if ds is None or gdal.GetLastErrorMsg() != '':
-        gdaltest.post_reason('fail')
         return 'fail'
 
     expected_md = {
@@ -2173,7 +2021,6 @@ def test_sentinel2_l2a_4():
                     'WVP_QUANTIFICATION_VALUE_UNIT': 'cm'}
     got_md = ds.GetMetadata()
     if got_md != expected_md:
-        gdaltest.post_reason('fail')
         import pprint
         pprint.pprint(got_md)
         return 'fail'
@@ -2197,7 +2044,6 @@ def test_sentinel2_l2a_4():
                     'SENTINEL2_L2A:data/fake_sentinel2_l2a_MSIL2A/S2A_MSIL2A_20180818T094031_N0208_R036_T34VFJ_20180818T120345.SAFE/MTD_MSIL2A.xml:TCI:EPSG_32634'}
     got_md = ds.GetMetadata('SUBDATASETS')
     if got_md != expected_md:
-        gdaltest.post_reason('fail')
         import pprint
         pprint.pprint(got_md)
         return 'fail'
@@ -2207,7 +2053,6 @@ def test_sentinel2_l2a_4():
         gdal.ErrorReset()
         ds = gdal.Open(got_md['SUBDATASET_%d_NAME' % (i + 1)])
         if ds is None or gdal.GetLastErrorMsg() != '':
-            gdaltest.post_reason('fail')
             print(got_md['SUBDATASET_%d_NAME' % (i + 1)])
             return 'fail'
 
@@ -2224,7 +2069,6 @@ def test_sentinel2_l2a_4():
         with gdaltest.error_handler():
             ds = gdal.Open(name)
         if ds is not None:
-            gdaltest.post_reason('fail')
             print(name)
             return 'fail'
 
@@ -2241,7 +2085,6 @@ def test_sentinel2_l2a_5():
     gdal.ErrorReset()
     ds = gdal.Open('SENTINEL2_L2A:%s:60m:EPSG_32634' % filename_xml)
     if ds is None or gdal.GetLastErrorMsg() != '':
-        gdaltest.post_reason('fail')
         return 'fail'
 
     expected_md = {
@@ -2294,29 +2137,24 @@ def test_sentinel2_l2a_5():
                     'WVP_QUANTIFICATION_VALUE_UNIT': 'cm'}
     got_md = ds.GetMetadata()
     if got_md != expected_md:
-        gdaltest.post_reason('fail')
         import pprint
         pprint.pprint(got_md)
         return 'fail'
 
     if ds.RasterXSize != 1830 or ds.RasterYSize != 1830:
-        gdaltest.post_reason('fail')
         print(ds.RasterXSize)
         print(ds.RasterYSize)
         return 'fail'
 
     if ds.GetProjectionRef().find('32634') < 0:
-        gdaltest.post_reason('fail')
         return 'fail'
 
     got_gt = ds.GetGeoTransform()
     if got_gt != (600000.0, 60.0, 0.0, 6400020.0, 0.0, -60.0):
-        gdaltest.post_reason('fail')
         print(got_gt)
         return 'fail'
 
     if ds.RasterCount != 2:
-        gdaltest.post_reason('fail')
         print(ds.RasterCount)
         return 'fail'
 
@@ -2329,12 +2167,10 @@ def test_sentinel2_l2a_5():
       <DstRect xOff="0" yOff="0" xSize="1830" ySize="1830" />
     </SimpleSource>"""
     if vrt.find(placement_vrt) < 0:
-        gdaltest.post_reason('fail')
         print(vrt)
         return 'fail'
 
     if ds.GetMetadata('xml:SENTINEL2') is None:
-        gdaltest.post_reason('fail')
         return 'fail'
 
     band = ds.GetRasterBand(1)
@@ -2347,13 +2183,11 @@ def test_sentinel2_l2a_5():
                    'WAVELENGTH': '443',
                    'WAVELENGTH_UNIT': 'nm'}
     if got_md != expected_md:
-        gdaltest.post_reason('fail')
         import pprint
         pprint.pprint(got_md)
         return 'fail'
 
     if band.DataType != gdal.GDT_UInt16:
-        gdaltest.post_reason('fail')
         return 'fail'
 
     return 'success'
@@ -2368,7 +2202,6 @@ def test_sentinel2_l2a_6():
     gdal.ErrorReset()
     ds = gdal.Open(filename_xml)
     if ds is None or gdal.GetLastErrorMsg() != '':
-        gdaltest.post_reason('fail')
         return 'fail'
 
     expected_md = {
@@ -2427,7 +2260,6 @@ def test_sentinel2_l2a_6():
                     'WATER_VAPOUR_RETRIEVAL_ACCURACY': '0.0'}
     got_md = ds.GetMetadata()
     if got_md != expected_md:
-        gdaltest.post_reason('fail')
         import pprint
         pprint.pprint(got_md)
         return 'fail'
@@ -2451,7 +2283,6 @@ def test_sentinel2_l2a_6():
                     'SENTINEL2_L2A:data/fake_sentinel2_l2a_MSIL2Ap/S2A_MSIL2A_20170823T094031_N0205_R036_T34VFJ_20170823T094252.SAFE/MTD_MSIL2A.xml:TCI:EPSG_32634'}
     got_md = ds.GetMetadata('SUBDATASETS')
     if got_md != expected_md:
-        gdaltest.post_reason('fail')
         import pprint
         pprint.pprint(got_md)
         return 'fail'
@@ -2461,7 +2292,6 @@ def test_sentinel2_l2a_6():
         gdal.ErrorReset()
         ds = gdal.Open(got_md['SUBDATASET_%d_NAME' % (i + 1)])
         if ds is None or gdal.GetLastErrorMsg() != '':
-            gdaltest.post_reason('fail')
             print(got_md['SUBDATASET_%d_NAME' % (i + 1)])
             return 'fail'
 
@@ -2478,7 +2308,6 @@ def test_sentinel2_l2a_6():
         with gdaltest.error_handler():
             ds = gdal.Open(name)
         if ds is not None:
-            gdaltest.post_reason('fail')
             print(name)
             return 'fail'
 
@@ -2495,7 +2324,6 @@ def test_sentinel2_l2a_7():
     gdal.ErrorReset()
     ds = gdal.Open('SENTINEL2_L2A:%s:60m:EPSG_32634' % filename_xml)
     if ds is None or gdal.GetLastErrorMsg() != '':
-        gdaltest.post_reason('fail')
         return 'fail'
 
     expected_md = {
@@ -2553,29 +2381,24 @@ def test_sentinel2_l2a_7():
                     'WATER_VAPOUR_RETRIEVAL_ACCURACY': '0.0'}
     got_md = ds.GetMetadata()
     if got_md != expected_md:
-        gdaltest.post_reason('fail')
         import pprint
         pprint.pprint(got_md)
         return 'fail'
 
     if ds.RasterXSize != 1830 or ds.RasterYSize != 1830:
-        gdaltest.post_reason('fail')
         print(ds.RasterXSize)
         print(ds.RasterYSize)
         return 'fail'
 
     if ds.GetProjectionRef().find('32634') < 0:
-        gdaltest.post_reason('fail')
         return 'fail'
 
     got_gt = ds.GetGeoTransform()
     if got_gt != (600000.0, 60.0, 0.0, 6400020.0, 0.0, -60.0):
-        gdaltest.post_reason('fail')
         print(got_gt)
         return 'fail'
 
     if ds.RasterCount != 2:
-        gdaltest.post_reason('fail')
         print(ds.RasterCount)
         return 'fail'
 
@@ -2588,12 +2411,10 @@ def test_sentinel2_l2a_7():
       <DstRect xOff="0" yOff="0" xSize="1830" ySize="1830" />
     </SimpleSource>"""
     if vrt.find(placement_vrt) < 0:
-        gdaltest.post_reason('fail')
         print(vrt)
         return 'fail'
 
     if ds.GetMetadata('xml:SENTINEL2') is None:
-        gdaltest.post_reason('fail')
         return 'fail'
 
     band = ds.GetRasterBand(1)
@@ -2606,13 +2427,11 @@ def test_sentinel2_l2a_7():
                    'WAVELENGTH': '443',
                    'WAVELENGTH_UNIT': 'nm'}
     if got_md != expected_md:
-        gdaltest.post_reason('fail')
         import pprint
         pprint.pprint(got_md)
         return 'fail'
 
     if band.DataType != gdal.GDT_UInt16:
-        gdaltest.post_reason('fail')
         return 'fail'
 
     return 'success'
@@ -2628,7 +2447,6 @@ def test_sentinel2_l1c_safe_compact_1():
     gdal.ErrorReset()
     ds = gdal.Open(filename_xml)
     if ds is None or gdal.GetLastErrorMsg() != '':
-        gdaltest.post_reason('fail')
         return 'fail'
 
     expected_md = {'CLOUD_COVERAGE_ASSESSMENT': '0.0',
@@ -2661,7 +2479,6 @@ def test_sentinel2_l1c_safe_compact_1():
                    'SPECIAL_VALUE_SATURATED': '0'}
     got_md = ds.GetMetadata()
     if got_md != expected_md:
-        gdaltest.post_reason('fail')
         import pprint
         pprint.pprint(got_md)
         return 'fail'
@@ -2676,7 +2493,6 @@ def test_sentinel2_l1c_safe_compact_1():
                    'SUBDATASET_4_NAME': 'SENTINEL2_L1C:data/fake_sentinel2_l1c_safecompact/S2A_MSIL1C_test.SAFE/MTD_MSIL1C.xml:TCI:EPSG_32632'}
     got_md = ds.GetMetadata('SUBDATASETS')
     if got_md != expected_md:
-        gdaltest.post_reason('fail')
         import pprint
         pprint.pprint(got_md)
         return 'fail'
@@ -2686,7 +2502,6 @@ def test_sentinel2_l1c_safe_compact_1():
         gdal.ErrorReset()
         ds = gdal.Open(got_md['SUBDATASET_%d_NAME' % (i + 1)])
         if ds is None or gdal.GetLastErrorMsg() != '':
-            gdaltest.post_reason('fail')
             print(got_md['SUBDATASET_%d_NAME' % (i + 1)])
             return 'fail'
 
@@ -2703,7 +2518,6 @@ def test_sentinel2_l1c_safe_compact_1():
         with gdaltest.error_handler():
             ds = gdal.Open(name)
         if ds is not None:
-            gdaltest.post_reason('fail')
             print(name)
             return 'fail'
 
@@ -2713,7 +2527,6 @@ def test_sentinel2_l1c_safe_compact_1():
         if os.path.exists('tmp/S2A_MSIL1C_test.zip'):
             ds = gdal.Open('tmp/S2A_MSIL1C_test.zip')
             if ds is None:
-                gdaltest.post_reason('fail')
                 return 'fail'
             os.unlink('tmp/S2A_MSIL1C_test.zip')
 
@@ -2729,7 +2542,6 @@ def test_sentinel2_l1c_safe_compact_2():
     gdal.ErrorReset()
     ds = gdal.Open('SENTINEL2_L1C:%s:10m:EPSG_32632' % filename_xml)
     if ds is None or gdal.GetLastErrorMsg() != '':
-        gdaltest.post_reason('fail')
         return 'fail'
 
     expected_md = {'CLOUD_COVERAGE_ASSESSMENT': '0.0',
@@ -2761,29 +2573,24 @@ def test_sentinel2_l1c_safe_compact_2():
                    'SPECIAL_VALUE_SATURATED': '0'}
     got_md = ds.GetMetadata()
     if got_md != expected_md:
-        gdaltest.post_reason('fail')
         import pprint
         pprint.pprint(got_md)
         return 'fail'
 
     if ds.RasterXSize != 10980 or ds.RasterYSize != 10980:
-        gdaltest.post_reason('fail')
         print(ds.RasterXSize)
         print(ds.RasterYSize)
         return 'fail'
 
     if ds.GetProjectionRef().find('32632') < 0:
-        gdaltest.post_reason('fail')
         return 'fail'
 
     got_gt = ds.GetGeoTransform()
     if got_gt != (699960.0, 10.0, 0.0, 5100060.0, 0.0, -10.0):
-        gdaltest.post_reason('fail')
         print(got_gt)
         return 'fail'
 
     if ds.RasterCount != 4:
-        gdaltest.post_reason('fail')
         return 'fail'
 
     vrt = ds.GetMetadata('xml:VRT')[0]
@@ -2796,12 +2603,10 @@ def test_sentinel2_l1c_safe_compact_2():
     </SimpleSource>
 """
     if vrt.find(placement_vrt) < 0:
-        gdaltest.post_reason('fail')
         print(vrt)
         return 'fail'
 
     if ds.GetMetadata('xml:SENTINEL2') is None:
-        gdaltest.post_reason('fail')
         return 'fail'
 
     band = ds.GetRasterBand(1)
@@ -2814,27 +2619,22 @@ def test_sentinel2_l1c_safe_compact_2():
                    'WAVELENGTH': '665',
                    'WAVELENGTH_UNIT': 'nm'}
     if got_md != expected_md:
-        gdaltest.post_reason('fail')
         import pprint
         pprint.pprint(got_md)
         return 'fail'
 
     if band.GetColorInterpretation() != gdal.GCI_RedBand:
-        gdaltest.post_reason('fail')
         return 'fail'
 
     if band.DataType != gdal.GDT_UInt16:
-        gdaltest.post_reason('fail')
         return 'fail'
 
     if band.GetMetadataItem('NBITS', 'IMAGE_STRUCTURE') != '12':
-        gdaltest.post_reason('fail')
         return 'fail'
 
     band = ds.GetRasterBand(4)
 
     if band.GetColorInterpretation() != gdal.GCI_Undefined:
-        gdaltest.post_reason('fail')
         return 'fail'
 
     got_md = band.GetMetadata()
@@ -2846,7 +2646,6 @@ def test_sentinel2_l1c_safe_compact_2():
                    'WAVELENGTH': '842',
                    'WAVELENGTH_UNIT': 'nm'}
     if got_md != expected_md:
-        gdaltest.post_reason('fail')
         import pprint
         pprint.pprint(got_md)
         return 'fail'
@@ -2862,28 +2661,23 @@ def test_sentinel2_l1c_safe_compact_3():
     filename_xml = 'data/fake_sentinel2_l1c_safecompact/S2A_MSIL1C_test.SAFE/MTD_MSIL1C.xml'
     ds = gdal.OpenEx('SENTINEL2_L1C:%s:TCI:EPSG_32632' % filename_xml)
     if ds is None:
-        gdaltest.post_reason('fail')
         return 'fail'
 
     if ds.RasterCount != 3:
-        gdaltest.post_reason('fail')
         return 'fail'
 
     fl = ds.GetFileList()
     # main XML + 1 granule XML + 1 jp2
     if len(fl) != 1 + 1 + 1:
-        gdaltest.post_reason('fail')
         import pprint
         pprint.pprint(fl)
         return 'fail'
 
     band = ds.GetRasterBand(1)
     if band.GetColorInterpretation() != gdal.GCI_RedBand:
-        gdaltest.post_reason('fail')
         return 'fail'
 
     if band.DataType != gdal.GDT_Byte:
-        gdaltest.post_reason('fail')
         return 'fail'
 
     return 'success'
diff --git a/autotest/gdrivers/srp.py b/autotest/gdrivers/srp.py
index d034266fe66a..ae49b07792dd 100755
--- a/autotest/gdrivers/srp.py
+++ b/autotest/gdrivers/srp.py
@@ -51,21 +51,17 @@ def test_srp_1(filename='USRP_PCB0/FKUSRP01.IMG'):
 
     ds = gdal.Open('data/' + filename)
     if ds.GetRasterBand(1).GetColorInterpretation() != gdal.GCI_PaletteIndex:
-        gdaltest.post_reason('fail')
         return 'fail'
 
     ct = ds.GetRasterBand(1).GetColorTable()
     if ct.GetCount() != 4:
-        gdaltest.post_reason('fail')
         return 'fail'
 
     if ct.GetColorEntry(0) != (0, 0, 0, 255):
-        gdaltest.post_reason('fail')
         print(ct.GetColorEntry(0))
         return 'fail'
 
     if ct.GetColorEntry(1) != (255, 0, 0, 255):
-        gdaltest.post_reason('fail')
         print(ct.GetColorEntry(1))
         return 'fail'
 
@@ -124,12 +120,10 @@ def test_srp_5():
     subdatasets = ds.GetMetadata('SUBDATASETS')
     if subdatasets['SUBDATASET_1_NAME'] != 'SRP:data/USRP_PCB0/FKUSRP01.GEN,data/USRP_PCB0/FKUSRP01.IMG' and \
        subdatasets['SUBDATASET_1_NAME'] != 'SRP:data/USRP_PCB0\\FKUSRP01.GEN,data/USRP_PCB0\\FKUSRP01.IMG':
-        gdaltest.post_reason('fail')
         print(subdatasets)
         return 'fail'
     if subdatasets['SUBDATASET_1_DESC'] != 'SRP:data/USRP_PCB0/FKUSRP01.GEN,data/USRP_PCB0/FKUSRP01.IMG' and \
        subdatasets['SUBDATASET_1_DESC'] != 'SRP:data/USRP_PCB0\\FKUSRP01.GEN,data/USRP_PCB0\\FKUSRP01.IMG':
-        gdaltest.post_reason('fail')
         print(subdatasets)
         return 'fail'
 
diff --git a/autotest/gdrivers/srtmhgt.py b/autotest/gdrivers/srtmhgt.py
index 1042ff145e8d..d9c39002c0d2 100755
--- a/autotest/gdrivers/srtmhgt.py
+++ b/autotest/gdrivers/srtmhgt.py
@@ -141,7 +141,6 @@ def test_srtmhgt_4():
 
     ds = gdal.Open('/vsimem/N43W080.SRTMSWBD.raw.zip')
     if ds is None:
-        gdaltest.post_reason('fail')
         return 'fail'
     cs = ds.GetRasterBand(1).Checksum()
     ds = None
diff --git a/autotest/gdrivers/tiff_profile.py b/autotest/gdrivers/tiff_profile.py
index 983aed76ffcd..921f7c178689 100755
--- a/autotest/gdrivers/tiff_profile.py
+++ b/autotest/gdrivers/tiff_profile.py
@@ -61,13 +61,11 @@ def test_tiff_write_icc():
 
     try:
         os.stat('tmp/icc_test.tiff.aux.xml')
-        gdaltest.post_reason('fail')
         return 'fail'
     except OSError:
         pass
 
     if md['SOURCE_ICC_PROFILE'] != icc:
-        gdaltest.post_reason('fail')
         return 'fail'
 
     # Check again with dataset from Open()
@@ -77,13 +75,11 @@ def test_tiff_write_icc():
 
     try:
         os.stat('tmp/icc_test.tiff.aux.xml')
-        gdaltest.post_reason('fail')
         return 'fail'
     except OSError:
         pass
 
     if md['SOURCE_ICC_PROFILE'] != icc:
-        gdaltest.post_reason('fail')
         return 'fail'
 
     # Check again with GetMetadataItem()
@@ -93,13 +89,11 @@ def test_tiff_write_icc():
 
     try:
         os.stat('tmp/icc_test.tiff.aux.xml')
-        gdaltest.post_reason('fail')
         return 'fail'
     except OSError:
         pass
 
     if source_icc_profile != icc:
-        gdaltest.post_reason('fail')
         return 'fail'
 
     driver.Delete('tmp/icc_test.tiff')
@@ -130,7 +124,6 @@ def test_tiff_copy_icc():
     ds2 = None
 
     if md['SOURCE_ICC_PROFILE'] != icc:
-        gdaltest.post_reason('fail')
         return 'fail'
 
     # Check again with dataset from Open()
@@ -140,7 +133,6 @@ def test_tiff_copy_icc():
     ds2 = None
 
     if md['SOURCE_ICC_PROFILE'] != icc:
-        gdaltest.post_reason('fail')
         return 'fail'
 
     driver.Delete('tmp/icc_test.tiff')
@@ -172,7 +164,6 @@ def test_tiff_copy_options_icc():
     ds2 = None
 
     if md['SOURCE_ICC_PROFILE'] != icc:
-        gdaltest.post_reason('fail')
         return 'fail'
 
     # Check again with dataset from Open()
@@ -182,7 +173,6 @@ def test_tiff_copy_options_icc():
     ds2 = None
 
     if md['SOURCE_ICC_PROFILE'] != icc:
-        gdaltest.post_reason('fail')
         return 'fail'
 
     driver.Delete('tmp/icc_test.tiff')
@@ -236,7 +226,6 @@ def test_tiff_copy_options_colorimetric_data():
     for j in range(0, 3):
         for i in range(0, 3):
             if abs(source_primaries2[j][i] - source_primaries[j][i]) > 0.0001:
-                gdaltest.post_reason('fail')
                 return 'fail'
 
     tifftag_transferfunction2 = (
@@ -245,7 +234,6 @@ def test_tiff_copy_options_colorimetric_data():
         eval('[' + md['TIFFTAG_TRANSFERFUNCTION_BLUE'] + ']'))
 
     if tifftag_transferfunction2 != tifftag_transferfunction:
-        gdaltest.post_reason('fail')
         return 'fail'
 
     # Check again with dataset from Open()
@@ -258,7 +246,6 @@ def test_tiff_copy_options_colorimetric_data():
 
     for i in range(0, 3):
         if abs(source_whitepoint2[i] - source_whitepoint[i]) > 0.0001:
-            gdaltest.post_reason('fail')
             return 'fail'
 
     source_primaries2 = [
@@ -269,7 +256,6 @@ def test_tiff_copy_options_colorimetric_data():
     for j in range(0, 3):
         for i in range(0, 3):
             if abs(source_primaries2[j][i] - source_primaries[j][i]) > 0.0001:
-                gdaltest.post_reason('fail')
                 return 'fail'
 
     tifftag_transferfunction2 = (
@@ -278,7 +264,6 @@ def test_tiff_copy_options_colorimetric_data():
         eval('[' + md['TIFFTAG_TRANSFERFUNCTION_BLUE'] + ']'))
 
     if tifftag_transferfunction2 != tifftag_transferfunction:
-        gdaltest.post_reason('fail')
         return 'fail'
 
     driver.Delete('tmp/icc_test.tiff')
@@ -320,7 +305,6 @@ def test_tiff_copy_colorimetric_data():
 
     for i in range(0, 3):
         if abs(source_whitepoint2[i] - source_whitepoint[i]) > 0.0001:
-            gdaltest.post_reason('fail')
             return 'fail'
 
     source_primaries2 = [
@@ -331,7 +315,6 @@ def test_tiff_copy_colorimetric_data():
     for j in range(0, 3):
         for i in range(0, 3):
             if abs(source_primaries2[j][i] - source_primaries[j][i]) > 0.0001:
-                gdaltest.post_reason('fail')
                 return 'fail'
 
     tifftag_transferfunction2 = (
@@ -340,7 +323,6 @@ def test_tiff_copy_colorimetric_data():
         eval('[' + md['TIFFTAG_TRANSFERFUNCTION_BLUE'] + ']'))
 
     if tifftag_transferfunction2 != tifftag_transferfunction:
-        gdaltest.post_reason('fail')
         return 'fail'
 
     # Check again with dataset from Open()
@@ -353,7 +335,6 @@ def test_tiff_copy_colorimetric_data():
 
     for i in range(0, 3):
         if abs(source_whitepoint2[i] - source_whitepoint[i]) > 0.0001:
-            gdaltest.post_reason('fail')
             return 'fail'
 
     source_primaries2 = [
@@ -364,7 +345,6 @@ def test_tiff_copy_colorimetric_data():
     for j in range(0, 3):
         for i in range(0, 3):
             if abs(source_primaries2[j][i] - source_primaries[j][i]) > 0.0001:
-                gdaltest.post_reason('fail')
                 return 'fail'
 
     tifftag_transferfunction2 = (
@@ -373,7 +353,6 @@ def test_tiff_copy_colorimetric_data():
         eval('[' + md['TIFFTAG_TRANSFERFUNCTION_BLUE'] + ']'))
 
     if tifftag_transferfunction2 != tifftag_transferfunction:
-        gdaltest.post_reason('fail')
         return 'fail'
 
     driver.Delete('tmp/icc_test.tiff')
@@ -406,7 +385,6 @@ def test_tiff_update_icc():
     ds = None
 
     if md['SOURCE_ICC_PROFILE'] != icc:
-        gdaltest.post_reason('fail')
         return 'fail'
 
     # Reopen the file to verify it was written.
@@ -415,7 +393,6 @@ def test_tiff_update_icc():
     ds = None
 
     if md['SOURCE_ICC_PROFILE'] != icc:
-        gdaltest.post_reason('fail')
         return 'fail'
 
     driver.Delete('tmp/icc_test.tiff')
@@ -452,7 +429,6 @@ def test_tiff_update_colorimetric():
 
     for i in range(0, 3):
         if abs(source_whitepoint2[i] - source_whitepoint[i]) > 0.0001:
-            gdaltest.post_reason('fail')
             return 'fail'
 
     source_primaries2 = [
@@ -463,7 +439,6 @@ def test_tiff_update_colorimetric():
     for j in range(0, 3):
         for i in range(0, 3):
             if abs(source_primaries2[j][i] - source_primaries[j][i]) > 0.0001:
-                gdaltest.post_reason('fail')
                 return 'fail'
 
     tifftag_transferfunction2 = (
@@ -472,7 +447,6 @@ def test_tiff_update_colorimetric():
         eval('[' + md['TIFFTAG_TRANSFERFUNCTION_BLUE'] + ']'))
 
     if tifftag_transferfunction2 != tifftag_transferfunction:
-        gdaltest.post_reason('fail')
         return 'fail'
 
     # Reopen the file to verify it was written.
@@ -484,7 +458,6 @@ def test_tiff_update_colorimetric():
 
     for i in range(0, 3):
         if abs(source_whitepoint2[i] - source_whitepoint[i]) > 0.0001:
-            gdaltest.post_reason('fail')
             return 'fail'
 
     source_primaries2 = [
@@ -495,7 +468,6 @@ def test_tiff_update_colorimetric():
     for j in range(0, 3):
         for i in range(0, 3):
             if abs(source_primaries2[j][i] - source_primaries[j][i]) > 0.0001:
-                gdaltest.post_reason('fail')
                 return 'fail'
 
     tifftag_transferfunction2 = (
@@ -504,7 +476,6 @@ def test_tiff_update_colorimetric():
         eval('[' + md['TIFFTAG_TRANSFERFUNCTION_BLUE'] + ']'))
 
     if tifftag_transferfunction2 != tifftag_transferfunction:
-        gdaltest.post_reason('fail')
         return 'fail'
 
     driver.Delete('tmp/icc_test.tiff')
diff --git a/autotest/gdrivers/vicar.py b/autotest/gdrivers/vicar.py
index 4f34ac92d57d..68086937b20c 100755
--- a/autotest/gdrivers/vicar.py
+++ b/autotest/gdrivers/vicar.py
@@ -59,26 +59,21 @@ def test_vicar_1():
     got_gt = ds.GetGeoTransform()
     for i in range(6):
         if abs(got_gt[i] - expected_gt[i]) > 1e-8:
-            gdaltest.post_reason('failure')
             print(got_gt)
             print(expected_gt)
             return 'fail'
 
     if ds.GetRasterBand(1).GetNoDataValue() != 0:
-        gdaltest.post_reason('fail')
         return 'fail'
     if abs(ds.GetRasterBand(1).GetScale() - 2.34) > 1e-5:
-        gdaltest.post_reason('fail')
         print(ds.GetRasterBand(1).GetScale())
         return 'fail'
     if abs(ds.GetRasterBand(1).GetOffset() - 4.56) > 1e-5:
-        gdaltest.post_reason('fail')
         return 'fail'
 
     expected_md = {'DLRTO8.REFLECTANCE_OFFSET': '4.56', 'PRODUCT_TYPE': 'IMAGE', 'PIXEL-SHIFT-BUG': 'CORRECTED', 'M94_ORBIT.STOP_TIME': 'stop_time', 'FILE.EVENT_TYPE': 'EVENT_TYPE', 'M94_CAMERAS.MACROPIXEL_SIZE': '1', 'M94_INSTRUMENT.DETECTOR_ID': 'MEX_HRSC_NADIR', 'HRORTHO.SPICE_FILE_NAME': 'SPICE_FILE_NAME', 'DLRTO8.RADIANCE_SCALING_FACTOR': '1.23', 'CONVERSION_DETAILS': 'http://www.lpi.usra.edu/meetings/lpsc2014/pdf/1088.pdf', 'HRORTHO.GEOMETRIC_CALIB_FILE_NAME': 'calib_file_name', 'HRORTHO.EXTORI_FILE_NAME': "extori'_file_name", 'M94_INSTRUMENT.MISSION_PHASE_NAME': 'MISSION_PHASE_NAME', 'HRCONVER.MISSING_FRAMES': '0', 'DLRTO8.RADIANCE_OFFSET': '1.23', 'HRCONVER.OVERFLOW_FRAMES': '0', 'SPACECRAFT_NAME': 'MARS EXPRESS', 'HRFOOT.BEST_GROUND_SAMPLING_DISTANCE': '1.23', 'M94_ORBIT.START_TIME': 'start_time', 'HRORTHO.DTM_NAME': 'dtm_name', 'DLRTO8.REFLECTANCE_SCALING_FACTOR': '2.34', 'HRCONVER.ERROR_FRAMES': '1'}
     md = ds.GetMetadata()
     if len(md) != len(expected_md):
-        gdaltest.post_reason('fail')
         print(md)
         print(len(md))
         print(len(expected_md))
@@ -87,7 +82,6 @@ def test_vicar_1():
         return 'fail'
     for key in expected_md:
         if md[key] != expected_md[key]:
-            gdaltest.post_reason('fail')
             print(md)
             return 'fail'
 
diff --git a/autotest/gdrivers/vrtderived.py b/autotest/gdrivers/vrtderived.py
index c0918c6e8636..79d60bd12a12 100755
--- a/autotest/gdrivers/vrtderived.py
+++ b/autotest/gdrivers/vrtderived.py
@@ -77,7 +77,6 @@ def test_vrtderived_1():
         'BlockXSize="20" BlockYSize="20" />\n'
         '</SimpleSource>\n')
     if md_read['source_0'] != expected_md_read:
-        gdaltest.post_reason('fail')
         print(md_read['source_0'])
         return 'fail'
 
@@ -121,12 +120,10 @@ def test_vrtderived_2():
     with gdaltest.error_handler():
         cs = vrt_ds.GetRasterBand(1).Checksum()
     if cs != 0:
-        gdaltest.post_reason('fail')
         return 'fail'
     with gdaltest.error_handler():
         ret = vrt_ds.GetRasterBand(1).WriteRaster(0, 0, 1, 1, ' ')
     if ret == 0:
-        gdaltest.post_reason('fail')
         return 'fail'
     vrt_ds = None
 
@@ -272,7 +269,6 @@ def test_vrtderived_7():
     if ret.find('Checksum=0') >= 0:
         print('Did not manage to find a Python library')
     elif ret.find('Checksum=50577') < 0:
-        gdaltest.post_reason('fail')
         print(ret)
         print(err)
         return 'fail'
@@ -284,7 +280,6 @@ def test_vrtderived_7():
     if ret.find('Checksum=0') >= 0:
         print('Did not manage to find a Python library')
     elif ret.find('Checksum=50577') < 0:
-        gdaltest.post_reason('fail')
         print(ret)
         print(err)
         return 'fail'
@@ -296,7 +291,6 @@ def test_vrtderived_7():
     if ret.find('Checksum=0') >= 0:
         print('Did not manage to find a Python library')
     elif ret.find('Checksum=50577') < 0:
-        gdaltest.post_reason('fail')
         print(ret)
         print(err)
         return 'fail'
@@ -306,7 +300,6 @@ def test_vrtderived_7():
     if gdal.GetConfigOption('CPL_DEBUG') is not None:
         print(err)
     if ret.find('Checksum=0') < 0:
-        gdaltest.post_reason('fail')
         print(ret)
         print(err)
         return 'fail'
@@ -318,7 +311,6 @@ def test_vrtderived_7():
         if gdal.GetConfigOption('CPL_DEBUG') is not None:
             print(err)
         if ret.find('Checksum=0') < 0:
-            gdaltest.post_reason('fail')
             print(ret)
             print(err)
             return 'fail'
@@ -378,7 +370,6 @@ def test_vrtderived_9():
 </VRTDataset>
 """)
     if ds is not None:
-        gdaltest.post_reason('fail')
         return 'fail'
 
     # Unsupported PixelFunctionLanguage
@@ -391,7 +382,6 @@ def test_vrtderived_9():
 </VRTDataset>
 """)
     if ds is not None:
-        gdaltest.post_reason('fail')
         return 'fail'
 
     # PixelFunctionCode can only be used with Python
@@ -408,7 +398,6 @@ def identity(in_ar, out_ar, xoff, yoff, xsize, ysize, raster_xsize, raster_ysize
 </VRTDataset>
 """)
     if ds is not None:
-        gdaltest.post_reason('fail')
         return 'fail'
 
     # PixelFunctionArguments can only be used with Python
@@ -421,7 +410,6 @@ def identity(in_ar, out_ar, xoff, yoff, xsize, ysize, raster_xsize, raster_ysize
 </VRTDataset>
 """)
     if ds is not None:
-        gdaltest.post_reason('fail')
         return 'fail'
 
     # BufferRadius can only be used with Python
@@ -434,7 +422,6 @@ def identity(in_ar, out_ar, xoff, yoff, xsize, ysize, raster_xsize, raster_ysize
 </VRTDataset>
 """)
     if ds is not None:
-        gdaltest.post_reason('fail')
         return 'fail'
 
     # Invalid BufferRadius
@@ -448,7 +435,6 @@ def identity(in_ar, out_ar, xoff, yoff, xsize, ysize, raster_xsize, raster_ysize
 </VRTDataset>
 """)
     if ds is not None:
-        gdaltest.post_reason('fail')
         return 'fail'
 
     # Error at Python code compilation (indentation error)
diff --git a/autotest/gdrivers/vrtmask.py b/autotest/gdrivers/vrtmask.py
index 3187043fd0ac..30b23c5f342b 100755
--- a/autotest/gdrivers/vrtmask.py
+++ b/autotest/gdrivers/vrtmask.py
@@ -437,7 +437,6 @@ def test_vrtmask_11():
     ds = gdal.Translate('', 'data/byte.tif', format='VRT')
     ret = ds.GetRasterBand(1).CreateMaskBand(gdal.GMF_PER_DATASET)
     if ret != 0:
-        gdaltest.post_reason('fail')
         return 'fail'
 
     return 'success'
diff --git a/autotest/gdrivers/vrtovr.py b/autotest/gdrivers/vrtovr.py
index 37fbb96e2fd6..13e29087d270 100755
--- a/autotest/gdrivers/vrtovr.py
+++ b/autotest/gdrivers/vrtovr.py
@@ -154,7 +154,6 @@ def test_vrtovr_none():
         return 'fail'
 
     if ds.GetRasterBand(1).GetOverview(0):
-        gdaltest.post_reason('fail')
         return 'fail'
 
     return 'success'
@@ -189,16 +188,13 @@ def test_vrtovr_errors():
         return 'fail'
 
     if ds.GetRasterBand(1).GetOverview(-1):
-        gdaltest.post_reason('fail')
         return 'fail'
 
     if ds.GetRasterBand(1).GetOverview(1):
-        gdaltest.post_reason('fail')
         return 'fail'
 
     with gdaltest.error_handler():
         if ds.GetRasterBand(1).GetOverview(0):
-            gdaltest.post_reason('fail')
             return 'fail'
 
     return 'success'
diff --git a/autotest/gdrivers/vrtpansharpen.py b/autotest/gdrivers/vrtpansharpen.py
index 31ceb3738140..a1cbafec32d9 100755
--- a/autotest/gdrivers/vrtpansharpen.py
+++ b/autotest/gdrivers/vrtpansharpen.py
@@ -70,7 +70,6 @@ def test_vrtpansharpen_1():
 </VRTDataset>""")
     gdal.PopErrorHandler()
     if vrt_ds is not None:
-        gdaltest.post_reason('fail')
         return 'fail'
 
     # PanchroBand missing
@@ -109,7 +108,6 @@ def test_vrtpansharpen_1():
 </VRTDataset>""")
     gdal.PopErrorHandler()
     if vrt_ds is not None:
-        gdaltest.post_reason('fail')
         return 'fail'
 
     # PanchroBand.SourceFilename missing
@@ -150,7 +148,6 @@ def test_vrtpansharpen_1():
 </VRTDataset>""")
     gdal.PopErrorHandler()
     if vrt_ds is not None:
-        gdaltest.post_reason('fail')
         return 'fail'
 
     # Invalid dataset name
@@ -193,7 +190,6 @@ def test_vrtpansharpen_1():
 </VRTDataset>""")
     gdal.PopErrorHandler()
     if vrt_ds is not None:
-        gdaltest.post_reason('fail')
         return 'fail'
 
     # Inconsistent declared VRT dimensions with panchro dataset.
@@ -236,7 +232,6 @@ def test_vrtpansharpen_1():
 </VRTDataset>""")
     gdal.PopErrorHandler()
     if vrt_ds is not None:
-        gdaltest.post_reason('fail')
         return 'fail'
 
     # VRTRasterBand of unrecognized subclass 'blabla'
@@ -279,7 +274,6 @@ def test_vrtpansharpen_1():
 </VRTDataset>""")
     gdal.PopErrorHandler()
     if vrt_ds is not None:
-        gdaltest.post_reason('fail')
         return 'fail'
 
     # Algorithm unsupported_alg unsupported
@@ -322,7 +316,6 @@ def test_vrtpansharpen_1():
 </VRTDataset>""")
     gdal.PopErrorHandler()
     if vrt_ds is not None:
-        gdaltest.post_reason('fail')
         return 'fail'
 
     # 10 invalid band of tmp/small_world_pan.tif
@@ -365,7 +358,6 @@ def test_vrtpansharpen_1():
 </VRTDataset>""")
     gdal.PopErrorHandler()
     if vrt_ds is not None:
-        gdaltest.post_reason('fail')
         return 'fail'
 
     # SpectralBand.dstBand = '-1' invalid
@@ -408,7 +400,6 @@ def test_vrtpansharpen_1():
 </VRTDataset>""")
     gdal.PopErrorHandler()
     if vrt_ds is not None:
-        gdaltest.post_reason('fail')
         return 'fail'
 
     # SpectralBand.SourceFilename missing
@@ -450,7 +441,6 @@ def test_vrtpansharpen_1():
 </VRTDataset>""")
     gdal.PopErrorHandler()
     if vrt_ds is not None:
-        gdaltest.post_reason('fail')
         return 'fail'
 
     # Invalid dataset name
@@ -493,7 +483,6 @@ def test_vrtpansharpen_1():
 </VRTDataset>""")
     gdal.PopErrorHandler()
     if vrt_ds is not None:
-        gdaltest.post_reason('fail')
         return 'fail'
 
     # 10 invalid band of data/small_world.tif
@@ -536,7 +525,6 @@ def test_vrtpansharpen_1():
 </VRTDataset>""")
     gdal.PopErrorHandler()
     if vrt_ds is not None:
-        gdaltest.post_reason('fail')
         return 'fail'
 
     # Another spectral band is already mapped to output band 1
@@ -579,7 +567,6 @@ def test_vrtpansharpen_1():
 </VRTDataset>""")
     gdal.PopErrorHandler()
     if vrt_ds is not None:
-        gdaltest.post_reason('fail')
         return 'fail'
 
     # No spectral band defined
@@ -610,7 +597,6 @@ def test_vrtpansharpen_1():
 </VRTDataset>""")
     gdal.PopErrorHandler()
     if vrt_ds is not None:
-        gdaltest.post_reason('fail')
         return 'fail'
 
     # Hole in SpectralBand.dstBand numbering
@@ -644,7 +630,6 @@ def test_vrtpansharpen_1():
 </VRTDataset>""")
     gdal.PopErrorHandler()
     if vrt_ds is not None:
-        gdaltest.post_reason('fail')
         return 'fail'
 
     # Band 4 of type VRTPansharpenedRasterBand, but no corresponding SpectralBand
@@ -689,7 +674,6 @@ def test_vrtpansharpen_1():
 </VRTDataset>""")
     gdal.PopErrorHandler()
     if vrt_ds is not None:
-        gdaltest.post_reason('fail')
         return 'fail'
 
     # SpectralBand.dstBand = '3' invalid
@@ -729,7 +713,6 @@ def test_vrtpansharpen_1():
 </VRTDataset>""")
     gdal.PopErrorHandler()
     if vrt_ds is not None:
-        gdaltest.post_reason('fail')
         return 'fail'
 
     # 2 weights defined, but 3 input spectral bands
@@ -772,7 +755,6 @@ def test_vrtpansharpen_1():
 </VRTDataset>""")
     gdal.PopErrorHandler()
     if vrt_ds is not None:
-        gdaltest.post_reason('fail')
         return 'fail'
 
     # Dimensions of input spectral band 1 different from first spectral band
@@ -795,7 +777,6 @@ def test_vrtpansharpen_1():
 </VRTDataset>""")
     gdal.PopErrorHandler()
     if vrt_ds is not None:
-        gdaltest.post_reason('fail')
         return 'fail'
 
     # Just warnings
@@ -819,10 +800,8 @@ def test_vrtpansharpen_1():
 </VRTDataset>""")
     gdal.PopErrorHandler()
     if vrt_ds is None:
-        gdaltest.post_reason('fail')
         return 'fail'
     if gdal.GetLastErrorMsg() == '':
-        gdaltest.post_reason('fail')
         return 'fail'
 
     # Just warnings
@@ -859,10 +838,8 @@ def test_vrtpansharpen_1():
 </VRTDataset>""")
     gdal.PopErrorHandler()
     if vrt_ds is None:
-        gdaltest.post_reason('fail')
         return 'fail'
     if gdal.GetLastErrorMsg() == '':
-        gdaltest.post_reason('fail')
         return 'fail'
 
     # Unsupported
@@ -870,7 +847,6 @@ def test_vrtpansharpen_1():
     ret = vrt_ds.AddBand(gdal.GDT_Byte)
     gdal.PopErrorHandler()
     if ret == 0:
-        gdaltest.post_reason('fail')
         return 'fail'
 
     return 'success'
@@ -923,28 +899,21 @@ def test_vrtpansharpen_2():
     </PansharpeningOptions>
 </VRTDataset>""")
     if vrt_ds is None:
-        gdaltest.post_reason('fail')
         return 'fail'
     if vrt_ds.GetFileList() != ['tmp/small_world_pan.tif', 'data/small_world.tif']:
-        gdaltest.post_reason('fail')
         print(vrt_ds.GetFileList())
         return 'fail'
     if vrt_ds.GetRasterBand(1).GetMetadataItem('NBITS', 'IMAGE_STRUCTURE') is not None:
-        gdaltest.post_reason('fail')
         return 'fail'
     cs = [vrt_ds.GetRasterBand(i + 1).Checksum() for i in range(vrt_ds.RasterCount)]
     if cs not in ([4735, 10000, 9742], [4731, 9991, 9734]):
-        gdaltest.post_reason('fail')
         print(cs)
         return 'fail'
     if vrt_ds.GetRasterBand(1).GetOverviewCount() != 0:
-        gdaltest.post_reason('fail')
         return 'fail'
     if vrt_ds.GetRasterBand(1).GetOverview(-1) is not None:
-        gdaltest.post_reason('fail')
         return 'fail'
     if vrt_ds.GetRasterBand(1).GetOverview(0) is not None:
-        gdaltest.post_reason('fail')
         return 'fail'
 
     # Check VRTPansharpenedDataset::IRasterIO() in non-resampling case
@@ -953,7 +922,6 @@ def test_vrtpansharpen_2():
     tmp_ds.WriteRaster(0, 0, 800, 400, data)
     cs = [tmp_ds.GetRasterBand(i + 1).Checksum() for i in range(tmp_ds.RasterCount)]
     if cs not in ([4735, 10000, 9742], [4731, 9991, 9734]):
-        gdaltest.post_reason('fail')
         print(cs)
         return 'fail'
 
@@ -961,7 +929,6 @@ def test_vrtpansharpen_2():
     data = vrt_ds.ReadRaster(0, 0, 800, 400, 400, 200)
     ref_data = tmp_ds.ReadRaster(0, 0, 800, 400, 400, 200)
     if data != ref_data:
-        gdaltest.post_reason('fail')
         return 'fail'
 
     # Compact case
@@ -986,11 +953,9 @@ def test_vrtpansharpen_2():
     </PansharpeningOptions>
 </VRTDataset>""")
     if vrt_ds is None:
-        gdaltest.post_reason('fail')
         return 'fail'
     cs = [vrt_ds.GetRasterBand(i + 1).Checksum() for i in range(vrt_ds.RasterCount)]
     if cs not in ([4735, 10000, 9742], [4731, 9991, 9734]):
-        gdaltest.post_reason('fail')
         print(cs)
         return 'fail'
 
@@ -1040,12 +1005,10 @@ def test_vrtpansharpen_2():
     </PansharpeningOptions>
 </VRTDataset>""")
     if vrt_ds is None:
-        gdaltest.post_reason('fail')
         return 'fail'
     # gdal.GetDriverByName('GTiff').CreateCopy('out1.tif', vrt_ds)
     cs = [vrt_ds.GetRasterBand(i + 1).Checksum() for i in range(vrt_ds.RasterCount)]
     if cs not in ([50261, 4735, 10000, 9742], [50261, 4731, 9991, 9734]):
-        gdaltest.post_reason('fail')
         print(cs)
         return 'fail'
 
@@ -1096,12 +1059,10 @@ def test_vrtpansharpen_2():
     </PansharpeningOptions>
 </VRTDataset>""")
     if vrt_ds is None:
-        gdaltest.post_reason('fail')
         return 'fail'
     # gdal.GetDriverByName('GTiff').CreateCopy('out2.tif', vrt_ds)
     cs = [vrt_ds.GetRasterBand(i + 1).Checksum() for i in range(vrt_ds.RasterCount)]
     if cs not in ([50261, 4735, 10000, 9742], [50261, 4727, 9998, 9732]):
-        gdaltest.post_reason('fail')
         print(cs)
         return 'fail'
 
@@ -1141,14 +1102,11 @@ def test_vrtpansharpen_3():
     # Test when only Pan band has overviews
     vrt_ds = gdal.Open(xml)
     if vrt_ds.GetRasterBand(1).GetOverviewCount() != 1:
-        gdaltest.post_reason('fail')
         return 'fail'
     if vrt_ds.GetRasterBand(1).GetOverview(0) is None:
-        gdaltest.post_reason('fail')
         return 'fail'
     cs = [vrt_ds.GetRasterBand(i + 1).GetOverview(0).Checksum() for i in range(vrt_ds.RasterCount)]
     if cs not in ([7123, 7445, 5025], [7120, 7440, 5025]):
-        gdaltest.post_reason('fail')
         print(cs)
         return 'fail'
 
@@ -1160,14 +1118,12 @@ def test_vrtpansharpen_3():
     data2 += vrt_ds.GetRasterBand(3).ReadRaster(0, 0, 800, 400, 400, 200)
 
     if data != data2:
-        gdaltest.post_reason('fail')
         return 'fail'
 
     tmp_ds = gdal.GetDriverByName('MEM').Create('', 400, 200, 3)
     tmp_ds.WriteRaster(0, 0, 400, 200, data)
     cs = [tmp_ds.GetRasterBand(i + 1).Checksum() for i in range(tmp_ds.RasterCount)]
     if cs not in ([7123, 7445, 5025], [7120, 7440, 5025]):
-        gdaltest.post_reason('fail')
         print(cs)
         return 'fail'
 
@@ -1180,14 +1136,11 @@ def test_vrtpansharpen_3():
     # Test when both Pan and spectral bands have overviews
     vrt_ds = gdal.Open(xml)
     if vrt_ds.GetRasterBand(1).GetOverviewCount() != 1:
-        gdaltest.post_reason('fail')
         return 'fail'
     if vrt_ds.GetRasterBand(1).GetOverview(0) is None:
-        gdaltest.post_reason('fail')
         return 'fail'
     cs = [vrt_ds.GetRasterBand(i + 1).GetOverview(0).Checksum() for i in range(vrt_ds.RasterCount)]
     if cs not in ([18033, 18395, 16824], [18033, 18395, 16822]):
-        gdaltest.post_reason('fail')
         print(cs)
         return 'fail'
 
@@ -1233,7 +1186,6 @@ def test_vrtpansharpen_4():
         else:
             expected_cs = [4735, 4731]
         if cs not in expected_cs:
-            gdaltest.post_reason('fail')
             print(gdal.GetDataTypeName(dt))
             print(cs)
             return 'fail'
@@ -1311,13 +1263,11 @@ def test_vrtpansharpen_5():
         cs = tmp_ds.GetRasterBand(1).Checksum()
         if dt == gdal.GDT_UInt16:
             if cs not in (4553, 4549):
-                gdaltest.post_reason('fail')
                 print(gdal.GetDataTypeName(dt))
                 print(cs)
                 return 'fail'
         else:
             if cs != 4450:
-                gdaltest.post_reason('fail')
                 print(gdal.GetDataTypeName(dt))
                 print(cs)
                 return 'fail'
@@ -1389,7 +1339,6 @@ def test_vrtpansharpen_6():
 
             vrt_ds = gdal.Open(xml)
             if vrt_ds.GetRasterBand(1).GetMetadataItem('NBITS', 'IMAGE_STRUCTURE') != str(nbits):
-                gdaltest.post_reason('fail')
                 return 'fail'
 
             ar = vrt_ds.GetRasterBand(1).ReadAsArray()
@@ -1401,7 +1350,6 @@ def test_vrtpansharpen_6():
                 expected_ar = [97280, 113920, 131071, 131071, 131071, 131071, 113920, 97280]
 
             if list(ar[0]) != expected_ar:
-                gdaltest.post_reason('fail')
                 print(gdal.GetDataTypeName(dt))
                 print(i)
                 print(list(ar[0]))
@@ -1439,7 +1387,6 @@ def test_vrtpansharpen_7():
 </VRTDataset>"""
     ds = gdal.Open(xml)
     if ds.GetGeoTransform() != (100.0, 1.0, 0.0, 100.0, 0.0, -1.0) or ds.RasterXSize != 40 or ds.RasterYSize != 60:
-        gdaltest.post_reason('fail')
         print(ds.GetGeoTransform())
         print(ds.RasterXSize)
         print(ds.RasterYSize)
@@ -1459,7 +1406,6 @@ def test_vrtpansharpen_7():
 </VRTDataset>"""
     ds = gdal.Open(xml)
     if ds.GetGeoTransform() != (100.0, 1.0, 0.0, 100.0, 0.0, -1.0) or ds.RasterXSize != 40 or ds.RasterYSize != 60:
-        gdaltest.post_reason('fail')
         print(ds.GetGeoTransform())
         print(ds.RasterXSize)
         print(ds.RasterYSize)
@@ -1482,13 +1428,11 @@ def test_vrtpansharpen_7():
     ds = gdal.Open(xml)
     gdal.PopErrorHandler()
     if ds.GetGeoTransform() != (100.0, 1.0, 0.0, 100.0, 0.0, -1.0) or ds.RasterXSize != 40 or ds.RasterYSize != 60:
-        gdaltest.post_reason('fail')
         print(ds.GetGeoTransform())
         print(ds.RasterXSize)
         print(ds.RasterYSize)
         return 'fail'
     if gdal.GetLastErrorMsg() != '':
-        gdaltest.post_reason('fail')
         return 'fail'
     ds = None
 
@@ -1505,7 +1449,6 @@ def test_vrtpansharpen_7():
 </VRTDataset>"""
     ds = gdal.Open(xml)
     if ds.GetGeoTransform() != (120.0, 1.0, 0.0, 80.0, 0.0, -1.0) or ds.RasterXSize != 10 or ds.RasterYSize != 40:
-        gdaltest.post_reason('fail')
         print(ds.GetGeoTransform())
         print(ds.RasterXSize)
         print(ds.RasterYSize)
@@ -1528,13 +1471,11 @@ def test_vrtpansharpen_7():
     ds = gdal.Open(xml)
     gdal.PopErrorHandler()
     if ds.GetGeoTransform() != (120.0, 1.0, 0.0, 80.0, 0.0, -1.0) or ds.RasterXSize != 20 or ds.RasterYSize != 40:
-        gdaltest.post_reason('fail')
         print(ds.GetGeoTransform())
         print(ds.RasterXSize)
         print(ds.RasterYSize)
         return 'fail'
     if gdal.GetLastErrorMsg() == '':
-        gdaltest.post_reason('fail')
         return 'fail'
     ds = None
 
@@ -1552,13 +1493,11 @@ def test_vrtpansharpen_7():
     gdal.ErrorReset()
     ds = gdal.Open(xml)
     if ds.GetGeoTransform() != (120.0, 1.0, 0.0, 80.0, 0.0, -1.0) or ds.RasterXSize != 20 or ds.RasterYSize != 40:
-        gdaltest.post_reason('fail')
         print(ds.GetGeoTransform())
         print(ds.RasterXSize)
         print(ds.RasterYSize)
         return 'fail'
     if gdal.GetLastErrorMsg() != '':
-        gdaltest.post_reason('fail')
         return 'fail'
     ds = None
 
@@ -1582,7 +1521,6 @@ def test_vrtpansharpen_7():
     ds = gdal.Open(xml)
     gdal.PopErrorHandler()
     if ds is not None:
-        gdaltest.post_reason('fail')
         return 'fail'
     ds = None
 
@@ -1637,7 +1575,6 @@ def test_vrtpansharpen_8():
     gdal.Unlink('tmp/vrtpansharpen_8.vrt')
 
     if cs1 != expected_cs1 or cs2 != expected_cs2 or cs3 != expected_cs3:
-        gdaltest.post_reason('fail')
         print(cs1)
         print(expected_cs1)
         print(cs2)
@@ -1677,11 +1614,9 @@ def test_vrtpansharpen_9():
     </PansharpeningOptions>
 </VRTDataset>""")
     if vrt_ds is None:
-        gdaltest.post_reason('fail')
         return 'fail'
     cs = [vrt_ds.GetRasterBand(i + 1).Checksum() for i in range(vrt_ds.RasterCount)]
     if cs not in ([6950, 11745, 8965],):
-        gdaltest.post_reason('fail')
         print(cs)
         return 'fail'
 
@@ -1719,11 +1654,9 @@ def test_vrtpansharpen_9():
     </PansharpeningOptions>
 </VRTDataset>""")
     if vrt_ds is None:
-        gdaltest.post_reason('fail')
         return 'fail'
     cs = [vrt_ds.GetRasterBand(i + 1).Checksum() for i in range(vrt_ds.RasterCount)]
     if cs not in ([6950, 11745, 8965],):
-        gdaltest.post_reason('fail')
         print(cs)
         return 'fail'
 
@@ -1774,7 +1707,6 @@ def test_vrtpansharpen_10():
     </VRTDataset>""")
     cs = [vrt_ds.GetRasterBand(i + 1).Checksum() for i in range(vrt_ds.RasterCount)]
     if cs != [62009, 62009, 62009, 62009]:
-        gdaltest.post_reason('fail')
         print(cs)
         return 'fail'
 
@@ -1786,7 +1718,6 @@ def test_vrtpansharpen_10():
     tmp_ds.WriteRaster(0, 0, vrt_ds.RasterXSize, vrt_ds.RasterYSize, data_int32)
     ref_data = tmp_ds.ReadRaster(buf_type=gdal.GDT_UInt16)
     if data != ref_data:
-        gdaltest.post_reason('fail')
         return 'fail'
 
     # 4 bands -> 3 bands
@@ -1817,7 +1748,6 @@ def test_vrtpansharpen_10():
     </VRTDataset>""")
     cs = [vrt_ds.GetRasterBand(i + 1).Checksum() for i in range(vrt_ds.RasterCount)]
     if cs != [62009, 62009, 62009]:
-        gdaltest.post_reason('fail')
         print(cs)
         return 'fail'
 
@@ -1829,7 +1759,6 @@ def test_vrtpansharpen_10():
     tmp_ds.WriteRaster(0, 0, vrt_ds.RasterXSize, vrt_ds.RasterYSize, data_int32)
     ref_data = tmp_ds.ReadRaster(buf_type=gdal.GDT_UInt16)
     if data != ref_data:
-        gdaltest.post_reason('fail')
         return 'fail'
 
     # 3 bands
@@ -1856,7 +1785,6 @@ def test_vrtpansharpen_10():
     </VRTDataset>""")
     cs = [vrt_ds.GetRasterBand(i + 1).Checksum() for i in range(vrt_ds.RasterCount)]
     if cs != [62009, 62009, 62009]:
-        gdaltest.post_reason('fail')
         print(cs)
         return 'fail'
 
@@ -1868,7 +1796,6 @@ def test_vrtpansharpen_10():
     tmp_ds.WriteRaster(0, 0, vrt_ds.RasterXSize, vrt_ds.RasterYSize, data_int32)
     ref_data = tmp_ds.ReadRaster(buf_type=gdal.GDT_UInt16)
     if data != ref_data:
-        gdaltest.post_reason('fail')
         return 'fail'
 
     return 'success'
@@ -1893,11 +1820,9 @@ def test_vrtpansharpen_11():
         </PansharpeningOptions>
     </VRTDataset>""", pan_ds.GetRasterBand(1), [ms_ds.GetRasterBand(i + 1) for i in range(3)])
     if vrt_ds is None:
-        gdaltest.post_reason('fail')
         return 'fail'
     cs = [vrt_ds.GetRasterBand(i + 1).Checksum() for i in range(vrt_ds.RasterCount)]
     if cs not in([4735, 10000, 9742], [4731, 9991, 9734]):
-        gdaltest.post_reason('fail')
         print(cs)
         return 'fail'
 
@@ -1918,11 +1843,9 @@ def test_vrtpansharpen_11():
         </PansharpeningOptions>
     </VRTDataset>""", pan_mem_ds.GetRasterBand(1), [ms_mem_ds.GetRasterBand(i + 1) for i in range(3)])
     if vrt_ds is None:
-        gdaltest.post_reason('fail')
         return 'fail'
     cs = [vrt_ds.GetRasterBand(i + 1).Checksum() for i in range(vrt_ds.RasterCount)]
     if cs not in([4735, 10000, 9742], [4731, 9991, 9734]):
-        gdaltest.post_reason('fail')
         print(cs)
         return 'fail'
     vrt_ds = None
@@ -1944,7 +1867,6 @@ def test_vrtpansharpen_11():
         </PansharpeningOptions>
     </VRTDataset>""", pan_mem_ds.GetRasterBand(1), [ms_mem_ds.GetRasterBand(i + 1) for i in range(3)])
     if vrt_ds.GetGeoTransform() != (100.0, 1.0, 0.0, 100.0, 0.0, -1.0) or vrt_ds.RasterXSize != 40 or vrt_ds.RasterYSize != 60:
-        gdaltest.post_reason('fail')
         print(vrt_ds.GetGeoTransform())
         print(vrt_ds.RasterXSize)
         print(vrt_ds.RasterYSize)
@@ -1956,7 +1878,6 @@ def test_vrtpansharpen_11():
     vrt_ds = gdal.CreatePansharpenedVRT("""<invalid_xml""", pan_mem_ds.GetRasterBand(1), [ms_mem_ds.GetRasterBand(i + 1) for i in range(3)])
     gdal.PopErrorHandler()
     if vrt_ds is not None:
-        gdaltest.post_reason('fail')
         return 'fail'
 
     # Not enough bands
@@ -1971,7 +1892,6 @@ def test_vrtpansharpen_11():
     </VRTDataset>""", pan_mem_ds.GetRasterBand(1), [ms_mem_ds.GetRasterBand(i + 1) for i in range(3)])
     gdal.PopErrorHandler()
     if vrt_ds is not None:
-        gdaltest.post_reason('fail')
         return 'fail'
 
     # Too many bands
@@ -1990,7 +1910,6 @@ def test_vrtpansharpen_11():
     </VRTDataset>""", pan_mem_ds.GetRasterBand(1), [ms_mem_ds.GetRasterBand(i + 1) for i in range(3)])
     gdal.PopErrorHandler()
     if vrt_ds is not None:
-        gdaltest.post_reason('fail')
         return 'fail'
 
     return 'success'
diff --git a/autotest/gdrivers/vrtrawlink.py b/autotest/gdrivers/vrtrawlink.py
index fffeb6810081..b0f14d703978 100755
--- a/autotest/gdrivers/vrtrawlink.py
+++ b/autotest/gdrivers/vrtrawlink.py
@@ -211,7 +211,6 @@ def test_vrtrawlink_5():
     if xmlstring.find('<ImageOffset>100</ImageOffset>') < 0 or \
        xmlstring.find('<PixelOffset>3</PixelOffset>') < 0 or \
        xmlstring.find('<LineOffset>93</LineOffset>') < 0:
-        gdaltest.post_reason('fail')
         print(xmlstring)
         return 'fail'
 
diff --git a/autotest/gdrivers/vrtwarp.py b/autotest/gdrivers/vrtwarp.py
index 00133cd951af..3ae343a2b43d 100755
--- a/autotest/gdrivers/vrtwarp.py
+++ b/autotest/gdrivers/vrtwarp.py
@@ -116,17 +116,13 @@ def test_vrtwarp_4():
 
     for i in range(3):
         if vrtwarp_ds.GetRasterBand(1).GetOverviewCount() != 2:
-            gdaltest.post_reason('fail')
             return 'fail'
         if vrtwarp_ds.GetRasterBand(1).Checksum() != cs_main:
             print(i)
-            gdaltest.post_reason('fail')
             return 'fail'
         if vrtwarp_ds.GetRasterBand(1).GetOverview(0).Checksum() != cs_ov0:
-            gdaltest.post_reason('fail')
             return 'fail'
         if vrtwarp_ds.GetRasterBand(1).GetOverview(1).Checksum() != cs_ov1:
-            gdaltest.post_reason('fail')
             return 'fail'
         if i == 0:
             vrtwarp_ds.SetDescription('tmp/vrtwarp_4.vrt')
@@ -151,19 +147,14 @@ def test_vrtwarp_4():
 
     vrtwarp_ds = gdal.Open('tmp/vrtwarp_4.vrt')
     if vrtwarp_ds.GetRasterBand(1).GetOverviewCount() != 3:
-        gdaltest.post_reason('fail')
         return 'fail'
     if vrtwarp_ds.GetRasterBand(1).Checksum() != cs_main:
-        gdaltest.post_reason('fail')
         return 'fail'
     if vrtwarp_ds.GetRasterBand(1).GetOverview(0).Checksum() != cs_ov0:
-        gdaltest.post_reason('fail')
         return 'fail'
     if vrtwarp_ds.GetRasterBand(1).GetOverview(1).Checksum() != cs_ov1:
-        gdaltest.post_reason('fail')
         return 'fail'
     if vrtwarp_ds.GetRasterBand(1).GetOverview(2).Checksum() != expected_cs_ov2:
-        gdaltest.post_reason('fail')
         return 'fail'
     vrtwarp_ds = None
 
@@ -202,16 +193,12 @@ def test_vrtwarp_5():
     vrtwarp_ds.SetMetadataItem('SrcOvrLevel', 'AUTO-1')
     tmp_ds = None
     if vrtwarp_ds.GetRasterBand(1).GetOverviewCount() != 2:
-        gdaltest.post_reason('fail')
         return 'fail'
     if vrtwarp_ds.GetRasterBand(1).Checksum() != cs_main:
-        gdaltest.post_reason('fail')
         return 'fail'
     if vrtwarp_ds.GetRasterBand(1).GetOverview(0).Checksum() != expected_cs_ov0:
-        gdaltest.post_reason('fail')
         return 'fail'
     if vrtwarp_ds.GetRasterBand(1).GetOverview(1).Checksum() != expected_cs_ov1:
-        gdaltest.post_reason('fail')
         return 'fail'
     vrtwarp_ds = None
 
@@ -258,16 +245,12 @@ def test_vrtwarp_6():
     vrtwarp_ds = gdal.Open('tmp/vrtwarp_6.vrt')
 
     if vrtwarp_ds.GetRasterBand(1).GetOverviewCount() != 2:
-        gdaltest.post_reason('fail')
         return 'fail'
     if vrtwarp_ds.GetRasterBand(1).Checksum() != cs_main:
-        gdaltest.post_reason('fail')
         return 'fail'
     if vrtwarp_ds.GetRasterBand(1).GetOverview(0).Checksum() != cs_ov0:
-        gdaltest.post_reason('fail')
         return 'fail'
     if vrtwarp_ds.GetRasterBand(1).GetOverview(1).Checksum() != cs_ov1:
-        gdaltest.post_reason('fail')
         return 'fail'
 
     gdal.Unlink('tmp/vrtwarp_6.vrt')
@@ -309,16 +292,13 @@ def test_vrtwarp_7():
 
     vrtwarp_ds = gdal.Warp('tmp/vrtwarp_7.vrt', 'tmp/vrtwarp_7.tif', options='-overwrite -of VRT -tps')
     if vrtwarp_ds.GetRasterBand(1).GetOverviewCount() != 2:
-        gdaltest.post_reason('fail')
         return 'fail'
     if vrtwarp_ds.GetRasterBand(1).Checksum() != cs_main:
         print(cs_main)
         return 'fail'
     if vrtwarp_ds.GetRasterBand(1).GetOverview(0).Checksum() != cs_ov0:
-        gdaltest.post_reason('fail')
         return 'fail'
     if vrtwarp_ds.GetRasterBand(1).GetOverview(1).Checksum() != cs_ov1:
-        gdaltest.post_reason('fail')
         return 'fail'
     vrtwarp_ds = None
 
@@ -345,13 +325,10 @@ def test_vrtwarp_8():
 
     vrtwarp_ds = gdal.Warp('tmp/vrtwarp_8.vrt', 'tmp/vrtwarp_8.tif', options='-overwrite -of VRT -rpc')
     if vrtwarp_ds.GetRasterBand(1).GetOverviewCount() != 1:
-        gdaltest.post_reason('fail')
         return 'fail'
     if vrtwarp_ds.GetRasterBand(1).Checksum() != expected_cs_main:
-        gdaltest.post_reason('fail')
         return 'fail'
     if vrtwarp_ds.GetRasterBand(1).GetOverview(0).Checksum() != 1214:
-        gdaltest.post_reason('fail')
         print(vrtwarp_ds.GetRasterBand(1).GetOverview(0).XSize)
         print(vrtwarp_ds.GetRasterBand(1).GetOverview(0).YSize)
         print(vrtwarp_ds.GetRasterBand(1).GetOverview(0).Checksum())
@@ -408,13 +385,10 @@ def test_vrtwarp_9():
 
     vrtwarp_ds = gdal.Warp('tmp/vrtwarp_9.vrt', 'tmp/sstgeo.vrt', options='-overwrite -of VRT -geoloc')
     if vrtwarp_ds.GetRasterBand(1).GetOverviewCount() != 1:
-        gdaltest.post_reason('fail')
         return 'fail'
     if vrtwarp_ds.GetRasterBand(1).Checksum() != expected_cs_main:
-        gdaltest.post_reason('fail')
         return 'fail'
     if vrtwarp_ds.GetRasterBand(1).GetOverview(0).Checksum() != 63859:
-        gdaltest.post_reason('fail')
         print(vrtwarp_ds.GetRasterBand(1).GetOverview(0).XSize)
         print(vrtwarp_ds.GetRasterBand(1).GetOverview(0).YSize)
         print(vrtwarp_ds.GetRasterBand(1).GetOverview(0).Checksum())
@@ -457,16 +431,12 @@ def test_vrtwarp_10():
     vrtwarp_ds.SetMetadataItem('SrcOvrLevel', 'NONE')
     tmp_ds = None
     if vrtwarp_ds.GetRasterBand(1).GetOverviewCount() != 2:
-        gdaltest.post_reason('fail')
         return 'fail'
     if vrtwarp_ds.GetRasterBand(1).Checksum() != cs_main:
-        gdaltest.post_reason('fail')
         return 'fail'
     if vrtwarp_ds.GetRasterBand(1).GetOverview(0).Checksum() != expected_cs_ov0:
-        gdaltest.post_reason('fail')
         return 'fail'
     if vrtwarp_ds.GetRasterBand(1).GetOverview(1).Checksum() != expected_cs_ov1:
-        gdaltest.post_reason('fail')
         return 'fail'
     vrtwarp_ds = None
 
@@ -487,7 +457,6 @@ def test_vrtwarp_11():
     ds = None
 
     if cs1 != 22122 or cs2 != 56685 or cs3 != 22122:
-        gdaltest.post_reason('fail')
         print(cs1)
         print(cs2)
         print(cs3)
diff --git a/autotest/gdrivers/wmts.py b/autotest/gdrivers/wmts.py
index 24a1d0200302..0584e544a822 100755
--- a/autotest/gdrivers/wmts.py
+++ b/autotest/gdrivers/wmts.py
@@ -70,28 +70,24 @@ def test_wmts_2():
     ds = gdal.Open('WMTS:')
     gdal.PopErrorHandler()
     if ds is not None:
-        gdaltest.post_reason('fail')
         return 'fail'
 
     gdal.PushErrorHandler()
     ds = gdal.Open('<GDAL_WMTS>')
     gdal.PopErrorHandler()
     if ds is not None:
-        gdaltest.post_reason('fail')
         return 'fail'
 
     gdal.PushErrorHandler()
     ds = gdal.Open('<GDAL_WMTSxxx/>')
     gdal.PopErrorHandler()
     if ds is not None:
-        gdaltest.post_reason('fail')
         return 'fail'
 
     gdal.PushErrorHandler()
     ds = gdal.Open('<GDAL_WMTS></GDAL_WMTS>')
     gdal.PopErrorHandler()
     if ds is not None:
-        gdaltest.post_reason('fail')
         return 'fail'
 
     return 'success'
@@ -109,7 +105,6 @@ def test_wmts_3():
     ds = gdal.Open('WMTS:https://non_existing')
     gdal.PopErrorHandler()
     if ds is not None:
-        gdaltest.post_reason('fail')
         return 'fail'
 
     return 'success'
@@ -127,7 +122,6 @@ def test_wmts_4():
     ds = gdal.Open('WMTS:/vsimem/non_existing')
     gdal.PopErrorHandler()
     if ds is not None:
-        gdaltest.post_reason('fail')
         return 'fail'
 
     return 'success'
@@ -147,7 +141,6 @@ def test_wmts_5():
     ds = gdal.Open('WMTS:/vsimem/invalid_getcapabilities.xml')
     gdal.PopErrorHandler()
     if ds is not None:
-        gdaltest.post_reason('fail')
         return 'fail'
 
     return 'success'
@@ -167,7 +160,6 @@ def test_wmts_6():
     ds = gdal.Open('WMTS:/vsimem/invalid_getcapabilities.xml')
     gdal.PopErrorHandler()
     if ds is not None:
-        gdaltest.post_reason('fail')
         return 'fail'
 
     return 'success'
@@ -187,7 +179,6 @@ def test_wmts_7():
     ds = gdal.Open('WMTS:/vsimem/empty_getcapabilities.xml')
     gdal.PopErrorHandler()
     if ds is not None:
-        gdaltest.post_reason('fail')
         return 'fail'
 
     return 'success'
@@ -213,7 +204,6 @@ def test_wmts_8():
     ds = gdal.Open('WMTS:/vsimem/missing.xml')
     gdal.PopErrorHandler()
     if ds is not None:
-        gdaltest.post_reason('fail')
         return 'fail'
 
     return 'success'
@@ -246,7 +236,6 @@ def test_wmts_9():
     ds = gdal.Open('WMTS:/vsimem/missing_tms.xml')
     gdal.PopErrorHandler()
     if ds is not None:
-        gdaltest.post_reason('fail')
         return 'fail'
 
     return 'success'
@@ -282,7 +271,6 @@ def test_wmts_10():
     ds = gdal.Open('WMTS:/vsimem/missing_SupportedCRS.xml')
     gdal.PopErrorHandler()
     if ds is not None:
-        gdaltest.post_reason('fail')
         return 'fail'
 
     return 'success'
@@ -319,7 +307,6 @@ def test_wmts_11():
     ds = gdal.Open('WMTS:/vsimem/no_tilematrix.xml')
     gdal.PopErrorHandler()
     if ds is not None:
-        gdaltest.post_reason('fail')
         return 'fail'
 
     return 'success'
@@ -357,7 +344,6 @@ def test_wmts_12():
     ds = gdal.Open('WMTS:/vsimem/missing_required_element_in_tilematrix.xml')
     gdal.PopErrorHandler()
     if ds is not None:
-        gdaltest.post_reason('fail')
         return 'fail'
 
     return 'success'
@@ -402,7 +388,6 @@ def test_wmts_12bis():
     ds = gdal.Open('WMTS:/vsimem/wmts_12bis.xml')
     gdal.PopErrorHandler()
     if ds is not None:
-        gdaltest.post_reason('fail')
         return 'fail'
 
     return 'success'
@@ -446,52 +431,39 @@ def test_wmts_13():
 
     ds = gdal.Open('WMTS:/vsimem/minimal.xml')
     if ds is None:
-        gdaltest.post_reason('fail')
         return 'fail'
     if ds.RasterXSize != 256:
-        gdaltest.post_reason('fail')
         return 'fail'
     if ds.RasterYSize != 256:
-        gdaltest.post_reason('fail')
         return 'fail'
     got_gt = ds.GetGeoTransform()
     expected_gt = (-20037508.342799999, 156543.03392811998, 0.0, 20037508.342799999, 0.0, -156543.03392811998)
     for i in range(6):
         if abs(got_gt[i] - expected_gt[i]) > 1e-8:
-            gdaltest.post_reason('fail')
             print(got_gt)
             return 'fail'
     if ds.GetProjectionRef().find('3857') < 0:
-        gdaltest.post_reason('fail')
         return 'fail'
     if ds.RasterCount != 4:
-        gdaltest.post_reason('fail')
         return 'fail'
     for i in range(4):
         if ds.GetRasterBand(i + 1).GetColorInterpretation() != gdal.GCI_RedBand + i:
-            gdaltest.post_reason('fail')
             return 'fail'
     if ds.GetRasterBand(1).GetOverviewCount() != 0:
-        gdaltest.post_reason('fail')
         return 'fail'
     if ds.GetRasterBand(1).GetOverview(0) is not None:
-        gdaltest.post_reason('fail')
         return 'fail'
     gdal.PushErrorHandler()
     cs = ds.GetRasterBand(1).Checksum()
     gdal.PopErrorHandler()
     if cs != 0:
-        gdaltest.post_reason('fail')
         return 'fail'
     if ds.GetSubDatasets() != []:
-        gdaltest.post_reason('fail')
         print(ds.GetSubDatasets())
         return 'fail'
     if ds.GetRasterBand(1).GetMetadataItem('Pixel_0_0', 'LocationInfo') is not None:
-        gdaltest.post_reason('fail')
         return 'fail'
     if ds.GetRasterBand(1).GetMetadataItem('foo') is not None:
-        gdaltest.post_reason('fail')
         return 'fail'
 
     for connection_str in ['WMTS:/vsimem/minimal.xml,layer=',
@@ -502,7 +474,6 @@ def test_wmts_13():
                            'WMTS:/vsimem/minimal.xml,layer=,style=,tilematrixset=']:
         ds = gdal.Open(connection_str)
         if ds is None:
-            gdaltest.post_reason('fail')
             print(connection_str)
             return 'fail'
         ds = None
@@ -516,7 +487,6 @@ def test_wmts_13():
         ds = gdal.Open(connection_str)
         gdal.PopErrorHandler()
         if ds is not None:
-            gdaltest.post_reason('fail')
             print(connection_str)
             return 'fail'
         ds = None
@@ -529,19 +499,16 @@ def test_wmts_13():
     for i in range(4):
         cs = ds.GetRasterBand(i + 1).Checksum()
         if cs != tmp_ds.GetRasterBand(i + 1).Checksum():
-            gdaltest.post_reason('fail')
             return 'fail'
 
     ref_data = tmp_ds.ReadRaster(0, 0, 256, 256)
     got_data = ds.ReadRaster(0, 0, ds.RasterXSize, ds.RasterYSize, 256, 256)
     if ref_data != got_data:
-        gdaltest.post_reason('fail')
         return 'fail'
 
     ref_data = tmp_ds.GetRasterBand(1).ReadRaster(0, 0, 256, 256)
     got_data = ds.GetRasterBand(1).ReadRaster(0, 0, ds.RasterXSize, ds.RasterYSize, 256, 256)
     if ref_data != got_data:
-        gdaltest.post_reason('fail')
         return 'fail'
 
     ds = None
@@ -645,7 +612,6 @@ def test_wmts_14():
 
     ds = gdal.Open('WMTS:/vsimem/nominal.xml')
     if ds is None:
-        gdaltest.post_reason('fail')
         return 'fail'
     if ds.GetSubDatasets() != [('WMTS:/vsimem/nominal.xml,layer=lyr1,tilematrixset=tms,style="style=auto"',
                                 'Layer My layer1, tile matrix set tms, style "Default style"'),
@@ -655,21 +621,17 @@ def test_wmts_14():
                                 'Layer My layer1, tile matrix set another_tms, style "Default style"'),
                                ('WMTS:/vsimem/nominal.xml,layer=lyr1,tilematrixset=another_tms,style=another_style',
                                 'Layer My layer1, tile matrix set another_tms, style "Another style"')]:
-        gdaltest.post_reason('fail')
         print(ds.GetSubDatasets())
         return 'fail'
     if ds.RasterXSize != 67108864:
-        gdaltest.post_reason('fail')
         return 'fail'
     gdal.PushErrorHandler()
     res = ds.GetRasterBand(1).GetMetadataItem('Pixel_1_2', 'LocationInfo')
     gdal.PopErrorHandler()
     if res != '':
-        gdaltest.post_reason('fail')
         print(res)
         return 'fail'
     if ds.GetMetadata() != {'ABSTRACT': 'My abstract', 'TITLE': 'My layer1'}:
-        gdaltest.post_reason('fail')
         print(ds.GetMetadata())
         return 'fail'
 
@@ -701,7 +663,6 @@ def test_wmts_14():
   <ZeroBlockOnServerException>true</ZeroBlockOnServerException>
 </GDAL_WMTS>
 """:
-        gdaltest.post_reason('fail')
         print(data)
         return 'fail'
 
@@ -709,30 +670,25 @@ def test_wmts_14():
     gdal.FileFromMemBuffer('/vsimem/2011-10-04/style=auto/tms/tm_18/0/0/2/1.txt', 'foo')
     res = ds.GetRasterBand(1).GetMetadataItem('Pixel_1_2', 'LocationInfo')
     if res != '<LocationInfo>foo</LocationInfo>':
-        gdaltest.post_reason('fail')
         print(res)
         return 'fail'
     res = ds.GetRasterBand(1).GetMetadataItem('Pixel_1_2', 'LocationInfo')
     if res != '<LocationInfo>foo</LocationInfo>':
-        gdaltest.post_reason('fail')
         print(res)
         return 'fail'
 
     ds = gdal.Open('<GDAL_WMTS><GetCapabilitiesUrl>/vsimem/nominal.xml</GetCapabilitiesUrl></GDAL_WMTS>')
     if ds is None:
-        gdaltest.post_reason('fail')
         return 'fail'
 
     ds = gdal.Open('WMTS:/vsimem/gdal_nominal.xml')
     if ds is None:
-        gdaltest.post_reason('fail')
         return 'fail'
 
     for open_options in [['URL=/vsimem/nominal.xml'],
                          ['URL=/vsimem/nominal.xml', 'STYLE=style=auto', 'TILEMATRIXSET=tms']]:
         ds = gdal.OpenEx('WMTS:', open_options=open_options)
         if ds is None:
-            gdaltest.post_reason('fail')
             return 'fail'
 
     for open_options in [['URL=/vsimem/nominal.xml', 'STYLE=x', 'TILEMATRIXSET=y'],
@@ -742,7 +698,6 @@ def test_wmts_14():
         ds = gdal.OpenEx('WMTS:', open_options=open_options)
         gdal.PopErrorHandler()
         if ds is not None:
-            gdaltest.post_reason('fail')
             return 'fail'
 
     ds = gdal.Open('WMTS:/vsimem/nominal.xml')
@@ -750,43 +705,34 @@ def test_wmts_14():
     res = ds.GetRasterBand(1).GetMetadataItem('Pixel_1_2', 'LocationInfo')
     if res != """<LocationInfo><xml_content />
 </LocationInfo>""":
-        gdaltest.post_reason('fail')
         print(res)
         return 'fail'
 
     ds = gdal.Open('WMTS:/vsimem/gdal_nominal.xml,tilematrix=tm_0')
     if ds is None:
-        gdaltest.post_reason('fail')
         return 'fail'
     if ds.RasterXSize != 256:
-        gdaltest.post_reason('fail')
         print(ds.RasterXSize)
         return 'fail'
 
     ds = gdal.OpenEx('WMTS:/vsimem/gdal_nominal.xml', open_options=['tilematrix=tm_0'])
     if ds is None:
-        gdaltest.post_reason('fail')
         return 'fail'
     if ds.RasterXSize != 256:
-        gdaltest.post_reason('fail')
         print(ds.RasterXSize)
         return 'fail'
 
     ds = gdal.Open('WMTS:/vsimem/gdal_nominal.xml,zoom_level=0')
     if ds is None:
-        gdaltest.post_reason('fail')
         return 'fail'
     if ds.RasterXSize != 256:
-        gdaltest.post_reason('fail')
         print(ds.RasterXSize)
         return 'fail'
 
     ds = gdal.OpenEx('WMTS:/vsimem/gdal_nominal.xml', open_options=['zoom_level=0'])
     if ds is None:
-        gdaltest.post_reason('fail')
         return 'fail'
     if ds.RasterXSize != 256:
-        gdaltest.post_reason('fail')
         print(ds.RasterXSize)
         return 'fail'
 
@@ -810,10 +756,8 @@ def test_wmts_14():
 </GDAL_WMTS>""")
     ds = gdal.Open('WMTS:/vsimem/gdal_nominal.xml')
     if ds is None:
-        gdaltest.post_reason('fail')
         return 'fail'
     if ds.RasterXSize != 256:
-        gdaltest.post_reason('fail')
         print(ds.RasterXSize)
         return 'fail'
 
@@ -837,10 +781,8 @@ def test_wmts_14():
 </GDAL_WMTS>""")
     ds = gdal.Open('WMTS:/vsimem/gdal_nominal.xml')
     if ds is None:
-        gdaltest.post_reason('fail')
         return 'fail'
     if ds.RasterXSize != 256:
-        gdaltest.post_reason('fail')
         print(ds.RasterXSize)
         return 'fail'
 
@@ -953,16 +895,13 @@ def test_wmts_15():
 
     ds = gdal.Open('/vsimem/nominal_kvp.xml?service=WMTS&request=GetCapabilities')
     if ds is None:
-        gdaltest.post_reason('fail')
         return 'fail'
     if ds.RasterXSize != 67108864:
-        gdaltest.post_reason('fail')
         return 'fail'
     gdal.PushErrorHandler()
     res = ds.GetRasterBand(1).GetMetadataItem('Pixel_1_2', 'LocationInfo')
     gdal.PopErrorHandler()
     if res != '':
-        gdaltest.post_reason('fail')
         print(res)
         return 'fail'
 
@@ -973,13 +912,11 @@ def test_wmts_15():
     gdal.FileFromMemBuffer('/vsimem/nominal_kvp.xml?service=WMTS&request=GetFeatureInfo&version=1.0.0&layer=lyr1&style=default_style&InfoFormat=text/plain&TileMatrixSet=tms&TileMatrix=18&TileRow=0&TileCol=0&J=2&I=1&time=2011-10-04', 'bar')
     res = ds.GetRasterBand(1).GetMetadataItem('Pixel_1_2', 'LocationInfo')
     if res != '<LocationInfo>bar</LocationInfo>':
-        gdaltest.post_reason('fail')
         print(res)
         return 'fail'
 
     ds = gdal.Open('WMTS:/vsimem/gdal_nominal_kvp.xml')
     if ds is None:
-        gdaltest.post_reason('fail')
         return 'fail'
     tmp_ds = gdal.GetDriverByName('MEM').Create('', 256, 256, 4)
     for i in range(4):
@@ -988,19 +925,16 @@ def test_wmts_15():
     for i in range(4):
         cs = ds.GetRasterBand(i + 1).GetOverview(0).Checksum()
         if cs != tmp_ds.GetRasterBand(i + 1).Checksum():
-            gdaltest.post_reason('fail')
             return 'fail'
 
     ref_data = tmp_ds.ReadRaster(0, 0, 256, 256)
     got_data = ds.ReadRaster(0, 0, ds.RasterXSize, ds.RasterYSize, 256, 256)
     if ref_data != got_data:
-        gdaltest.post_reason('fail')
         return 'fail'
 
     ref_data = tmp_ds.GetRasterBand(1).ReadRaster(0, 0, 256, 256)
     got_data = ds.GetRasterBand(1).ReadRaster(0, 0, ds.RasterXSize, ds.RasterYSize, 256, 256)
     if ref_data != got_data:
-        gdaltest.post_reason('fail')
         return 'fail'
 
     ds = None
@@ -1074,25 +1008,20 @@ def test_wmts_16():
 
     ds = gdal.Open('WMTS:/vsimem/wmts_16.xml')
     if ds is None:
-        gdaltest.post_reason('fail')
         return 'fail'
     if ds.RasterXSize != 512:
-        gdaltest.post_reason('fail')
         print(ds.RasterXSize)
         return 'fail'
     if ds.RasterYSize != 256:
-        gdaltest.post_reason('fail')
         print(ds.RasterYSize)
         return 'fail'
     got_gt = ds.GetGeoTransform()
     expected_gt = (-90, 0.3515625, 0.0, 90.0, 0.0, -0.3515625)
     for i in range(6):
         if abs(got_gt[i] - expected_gt[i]) > 1e-8:
-            gdaltest.post_reason('fail')
             print(got_gt)
             return 'fail'
     if ds.GetProjectionRef().find('4326') < 0 or ds.GetProjectionRef().find('AXIS') >= 0:
-        gdaltest.post_reason('fail')
         print(ds.GetProjectionRef())
         return 'fail'
 
@@ -1164,25 +1093,20 @@ def test_wmts_17():
 
     ds = gdal.Open('WMTS:/vsimem/wmts_17.xml')
     if ds is None:
-        gdaltest.post_reason('fail')
         return 'fail'
     if ds.RasterXSize != 512:
-        gdaltest.post_reason('fail')
         print(ds.RasterXSize)
         return 'fail'
     if ds.RasterYSize != 256:
-        gdaltest.post_reason('fail')
         print(ds.RasterYSize)
         return 'fail'
     got_gt = ds.GetGeoTransform()
     expected_gt = (-90, 0.3515625, 0.0, 90.0, 0.0, -0.3515625)
     for i in range(6):
         if abs(got_gt[i] - expected_gt[i]) > 1e-8:
-            gdaltest.post_reason('fail')
             print(got_gt)
             return 'fail'
     if ds.GetProjectionRef().find('4326') < 0 or ds.GetProjectionRef().find('AXIS') >= 0:
-        gdaltest.post_reason('fail')
         print(ds.GetProjectionRef())
         return 'fail'
 
@@ -1254,25 +1178,20 @@ def test_wmts_18():
 
     ds = gdal.Open('WMTS:/vsimem/wmts_18.xml')
     if ds is None:
-        gdaltest.post_reason('fail')
         return 'fail'
     if ds.RasterXSize != 512:
-        gdaltest.post_reason('fail')
         print(ds.RasterXSize)
         return 'fail'
     if ds.RasterYSize != 256:
-        gdaltest.post_reason('fail')
         print(ds.RasterYSize)
         return 'fail'
     got_gt = ds.GetGeoTransform()
     expected_gt = (-90, 0.3515625, 0.0, 90.0, 0.0, -0.3515625)
     for i in range(6):
         if abs(got_gt[i] - expected_gt[i]) > 1e-8:
-            gdaltest.post_reason('fail')
             print(got_gt)
             return 'fail'
     if ds.GetProjectionRef().find('4326') < 0 or ds.GetProjectionRef().find('AXIS') >= 0:
-        gdaltest.post_reason('fail')
         print(ds.GetProjectionRef())
         return 'fail'
 
@@ -1349,25 +1268,20 @@ def test_wmts_19():
 
     ds = gdal.Open('WMTS:/vsimem/wmts_19.xml')
     if ds is None:
-        gdaltest.post_reason('fail')
         return 'fail'
     if ds.RasterXSize != 512:
-        gdaltest.post_reason('fail')
         print(ds.RasterXSize)
         return 'fail'
     if ds.RasterYSize != 256:
-        gdaltest.post_reason('fail')
         print(ds.RasterYSize)
         return 'fail'
     got_gt = ds.GetGeoTransform()
     expected_gt = (-90, 0.3515625, 0.0, 90.0, 0.0, -0.3515625)
     for i in range(6):
         if abs(got_gt[i] - expected_gt[i]) > 1e-8:
-            gdaltest.post_reason('fail')
             print(got_gt)
             return 'fail'
     if ds.GetProjectionRef().find('4326') < 0 or ds.GetProjectionRef().find('AXIS') >= 0:
-        gdaltest.post_reason('fail')
         print(ds.GetProjectionRef())
         return 'fail'
 
@@ -1448,25 +1362,20 @@ def test_wmts_20():
 
     ds = gdal.Open('WMTS:/vsimem/wmts_20.xml')
     if ds is None:
-        gdaltest.post_reason('fail')
         return 'fail'
     if ds.RasterXSize != 512:
-        gdaltest.post_reason('fail')
         print(ds.RasterXSize)
         return 'fail'
     if ds.RasterYSize != 256:
-        gdaltest.post_reason('fail')
         print(ds.RasterYSize)
         return 'fail'
     got_gt = ds.GetGeoTransform()
     expected_gt = (-90, 0.3515625, 0.0, 90.0, 0.0, -0.3515625)
     for i in range(6):
         if abs(got_gt[i] - expected_gt[i]) > 1e-8:
-            gdaltest.post_reason('fail')
             print(got_gt)
             return 'fail'
     if ds.GetProjectionRef().find('4326') < 0 or ds.GetProjectionRef().find('AXIS') >= 0:
-        gdaltest.post_reason('fail')
         print(ds.GetProjectionRef())
         return 'fail'
 
@@ -1543,25 +1452,20 @@ def test_wmts_21():
 
     ds = gdal.Open('WMTS:/vsimem/wmts_21.xml,extendbeyonddateline=yes')
     if ds is None:
-        gdaltest.post_reason('fail')
         return 'fail'
     if ds.RasterXSize != 512:
-        gdaltest.post_reason('fail')
         print(ds.RasterXSize)
         return 'fail'
     if ds.RasterYSize != 256:
-        gdaltest.post_reason('fail')
         print(ds.RasterYSize)
         return 'fail'
     got_gt = ds.GetGeoTransform()
     expected_gt = (90, 0.3515625, 0.0, 0.0, 0.0, -0.3515625)
     for i in range(6):
         if abs(got_gt[i] - expected_gt[i]) > 1e-8:
-            gdaltest.post_reason('fail')
             print(got_gt)
             return 'fail'
     if ds.GetProjectionRef().find('4326') < 0 or ds.GetProjectionRef().find('AXIS') >= 0:
-        gdaltest.post_reason('fail')
         print(ds.GetProjectionRef())
         return 'fail'
 
@@ -1576,11 +1480,9 @@ def test_wmts_21():
     tmp0_ds = gdal.GetDriverByName('PNG').CreateCopy('/vsimem/wmts_21/default_style/tms/GoogleCRS84Quad:2/1/0.png', tmp_ds)
 
     if ds.GetRasterBand(1).ReadRaster(0, 0, 256, 256) != tmp3_ds.GetRasterBand(1).ReadRaster(0, 0, 256, 256):
-        gdaltest.post_reason('fail')
         return 'fail'
 
     if ds.GetRasterBand(1).ReadRaster(256, 0, 256, 256) != tmp0_ds.GetRasterBand(1).ReadRaster(0, 0, 256, 256):
-        gdaltest.post_reason('fail')
         return 'fail'
 
     return 'success'
@@ -1633,25 +1535,20 @@ def test_wmts_22():
 
     ds = gdal.Open('WMTS:/vsimem/wmts_22.xml')
     if ds is None:
-        gdaltest.post_reason('fail')
         return 'fail'
     if ds.RasterXSize != 2097152:
-        gdaltest.post_reason('fail')
         print(ds.RasterXSize)
         return 'fail'
     if ds.RasterYSize != 2097152:
-        gdaltest.post_reason('fail')
         print(ds.RasterYSize)
         return 'fail'
     got_gt = ds.GetGeoTransform()
     expected_gt = (-548576.0, 1.0000000000004, 0.0, 8388608.0, 0.0, -1.0000000000004)
     for i in range(6):
         if abs(got_gt[i] - expected_gt[i]) > 1e-8:
-            gdaltest.post_reason('fail')
             print(got_gt)
             return 'fail'
     if ds.GetProjectionRef().find('3067') < 0:
-        gdaltest.post_reason('fail')
         print(ds.GetProjectionRef())
         return 'fail'
 
@@ -1707,22 +1604,18 @@ def wmts_23(imagetype, expected_cs):
 
     ds = gdal.Open('WMTS:' + inputXml)
     if ds is None:
-        gdaltest.post_reason('fail')
         return 'fail'
 
     if ds.RasterXSize != 128:
-        gdaltest.post_reason('fail')
         print(ds.RasterXSize)
         return 'fail'
     if ds.RasterYSize != 128:
-        gdaltest.post_reason('fail')
         print(ds.RasterYSize)
         return 'fail'
 
     for i in range(4):
         cs = ds.GetRasterBand(i + 1).Checksum()
         if cs != expected_cs[i]:
-            gdaltest.post_reason('fail')
             print(cs)
             return 'fail'
 
@@ -2067,12 +1960,10 @@ def test_wmts_check_no_overflow_zoom_level():
 
     ds = gdal.Open(inputXml)
     if ds.RasterXSize != 1073741766 or ds.RasterYSize != 1070224430:
-        gdaltest.post_reason('fail')
         print(ds.RasterXSize, ds.RasterYSize)
         return 'fail'
     count_levels = 1 + ds.GetRasterBand(1).GetOverviewCount()
     if count_levels != 23: # there are 24 in total, but we discard the one labelled 23
-        gdaltest.post_reason('fail')
         print(count_levels)
         return 'fail'
     ds = None
diff --git a/autotest/gdrivers/xyz.py b/autotest/gdrivers/xyz.py
index c9cb545bac3c..8950ccf20537 100755
--- a/autotest/gdrivers/xyz.py
+++ b/autotest/gdrivers/xyz.py
@@ -134,23 +134,18 @@ def test_xyz_4():
     expected_gt = (440660.0, 60.0, 0.0, 3751350.0, 0.0, -120.0)
     for i in range(6):
         if abs(got_gt[i] - expected_gt[i]) > 1e-5:
-            gdaltest.post_reason('fail')
             print(got_gt)
             print(expected_gt)
             return 'fail'
 
     if ds.GetRasterBand(1).GetMinimum() != 1:
-        gdaltest.post_reason('fail')
         return 'fail'
     if ds.GetRasterBand(1).GetMaximum() != 7:
-        gdaltest.post_reason('fail')
         return 'fail'
     if ds.GetRasterBand(1).GetNoDataValue() != 0:
-        gdaltest.post_reason('fail')
         return 'fail'
     for i in [0, 1, 2, 1, 0, 2, 0, 2, 0, 1, 2]:
         if not xyz_4_checkline(ds, i, expected[i]):
-            gdaltest.post_reason('fail')
             return 'fail'
     ds = None
     gdal.Unlink('/vsimem/grid.xyz')
@@ -173,7 +168,6 @@ def test_xyz_5():
 
     ds = gdal.Open('/vsimem/grid.xyz')
     if ds.RasterXSize != 3 or ds.RasterYSize != 2:
-        gdaltest.post_reason('fail')
         return 'fail'
     got_gt = ds.GetGeoTransform()
     expected_gt = (-0.25, 0.5, 0.0, 0.5, 0.0, 1.0)
@@ -182,7 +176,6 @@ def test_xyz_5():
 
     for i in range(6):
         if abs(got_gt[i] - expected_gt[i]) > 1e-5:
-            gdaltest.post_reason('fail')
             print(got_gt)
             print(expected_gt)
             return 'fail'
@@ -206,7 +199,6 @@ def test_xyz_6():
 
     ds = gdal.Open('/vsimem/grid.xyz')
     if ds.RasterXSize != 3 or ds.RasterYSize != 2:
-        gdaltest.post_reason('fail')
         return 'fail'
     got_gt = ds.GetGeoTransform()
     expected_gt = (-0.25, 0.5, 0.0, 0.5, 0.0, 1.0)
@@ -215,7 +207,6 @@ def test_xyz_6():
 
     for i in range(6):
         if abs(got_gt[i] - expected_gt[i]) > 1e-5:
-            gdaltest.post_reason('fail')
             print(got_gt)
             print(expected_gt)
             return 'fail'
@@ -249,7 +240,6 @@ def test_xyz_7():
 
     ds = gdal.Open('/vsimem/grid.xyz')
     if ds.RasterXSize != 3 or ds.RasterYSize != 5:
-        gdaltest.post_reason('fail')
         return 'fail'
     got_gt = ds.GetGeoTransform()
     expected_gt = (354.46666625, 0.0333335, 0.0, 51.5125, 0.0, -0.025)
@@ -259,13 +249,11 @@ def test_xyz_7():
 
     for i in range(6):
         if abs(got_gt[i] - expected_gt[i]) > 1e-8:
-            gdaltest.post_reason('fail')
             print(got_gt)
             print(expected_gt)
             return 'fail'
 
     if cs != 146:
-        gdaltest.post_reason('fail')
         print(cs)
         return 'fail'
 
@@ -287,14 +275,12 @@ def test_xyz_8():
 
     ds = gdal.Open('/vsimem/grid.xyz')
     if ds.RasterXSize != 4 or ds.RasterYSize != 2:
-        gdaltest.post_reason('fail')
         return 'fail'
     cs = ds.GetRasterBand(1).Checksum()
     ds = None
     gdal.Unlink('/vsimem/grid.xyz')
 
     if cs != 35:
-        gdaltest.post_reason('fail')
         print(cs)
         return 'fail'
 
diff --git a/autotest/gnm/gnm_test.py b/autotest/gnm/gnm_test.py
index 5e01cfac4791..814368305e37 100755
--- a/autotest/gnm/gnm_test.py
+++ b/autotest/gnm/gnm_test.py
@@ -64,7 +64,6 @@ def test_gnm_filenetwork_create():
     # cast to GNM
     dn = gnm.CastToNetwork(ds)
     if dn is None:
-        gdaltest.post_reason('fail')
         return 'fail'
     if dn.GetVersion() != 100:
         gdaltest.post_reason('GNM: Check GNM version failed')
@@ -93,7 +92,6 @@ def test_gnm_filenetwork_open():
     # cast to GNM
     dn = gnm.CastToNetwork(ds)
     if dn is None:
-        gdaltest.post_reason('fail')
         return 'fail'
     if dn.GetVersion() != 100:
         gdaltest.post_reason('GNM: Check GNM version failed')
diff --git a/autotest/ogr/ogr_avc.py b/autotest/ogr/ogr_avc.py
index 4d445a2ef260..ac54d0357e29 100755
--- a/autotest/ogr/ogr_avc.py
+++ b/autotest/ogr/ogr_avc.py
@@ -125,18 +125,15 @@ def test_ogr_avc_4():
             count += 1
             last_feature = f
         if count != 80:
-            gdaltest.post_reason('fail')
             print(filename)
             print(count)
             return 'fail'
         count = lyr.GetFeatureCount()
         if count != 80:
-            gdaltest.post_reason('fail')
             print(filename)
             print(count)
             return 'fail'
         if last_feature.GetFieldCount() != 7:
-            gdaltest.post_reason('fail')
             print(filename)
             f.DumpReadable()
             return 'fail'
@@ -145,7 +142,6 @@ def test_ogr_avc_4():
         else:
             fld_name = 'WELLS-ID'
         if last_feature.GetField('ValueId') != 80 or last_feature.GetField(fld_name) != 80:
-            gdaltest.post_reason('fail')
             print(filename)
             f.DumpReadable()
             return 'fail'
@@ -167,23 +163,19 @@ def test_ogr_avc_5():
             count += 1
             last_feature = f
         if count != 3:
-            gdaltest.post_reason('fail')
             print(filename)
             print(count)
             return 'fail'
         count = lyr.GetFeatureCount()
         if count != 3:
-            gdaltest.post_reason('fail')
             print(filename)
             print(count)
             return 'fail'
         if last_feature.GetFieldCount() != 5:
-            gdaltest.post_reason('fail')
             print(filename)
             f.DumpReadable()
             return 'fail'
         if last_feature.GetField('ArcIds') != [-4, -5] or abs(last_feature.GetField('AREA') - 9939.059) > 1e-3:
-            gdaltest.post_reason('fail')
             print(filename)
             f.DumpReadable()
             return 'fail'
@@ -193,7 +185,6 @@ def test_ogr_avc_5():
             # Likely a bug in AVCE00 driver
             expected_wkt = 'POLYGON ((340299.94 4100199.8,340099.88 4100200.0,340299.94 4100199.8))'
         if last_feature.GetGeometryRef().ExportToWkt() != expected_wkt:
-            gdaltest.post_reason('fail')
             print(filename)
             f.DumpReadable()
             return 'fail'
diff --git a/autotest/ogr/ogr_basic_test.py b/autotest/ogr/ogr_basic_test.py
index b4f149415462..3b808af98df7 100755
--- a/autotest/ogr/ogr_basic_test.py
+++ b/autotest/ogr/ogr_basic_test.py
@@ -44,7 +44,6 @@ def test_ogr_basic_1():
     gdaltest.ds = ogr.Open('data/poly.shp')
 
     if gdaltest.ds is None:
-        gdaltest.post_reason('fail')
         return 'fail'
 
     return 'success'
@@ -422,7 +421,6 @@ def test_ogr_basic_9():
 
     for geom_type_tuple in geom_type_tuples:
         if ogr.GeometryTypeToName(geom_type_tuple[0]) != geom_type_tuple[1]:
-            gdaltest.post_reason('fail')
             print('Got %s, expected %s' % (ogr.GeometryTypeToName(geom_type_tuple[0]), geom_type_tuple[1]))
             return 'fail'
 
@@ -475,12 +473,10 @@ def test_ogr_basic_12():
     # boolean integer
     feat_def = ogr.FeatureDefn()
     if ogr.GetFieldSubTypeName(ogr.OFSTBoolean) != 'Boolean':
-        gdaltest.post_reason('fail')
         return 'fail'
     field_def = ogr.FieldDefn('fld', ogr.OFTInteger)
     field_def.SetSubType(ogr.OFSTBoolean)
     if field_def.GetSubType() != ogr.OFSTBoolean:
-        gdaltest.post_reason('fail')
         return 'fail'
     feat_def.AddFieldDefn(field_def)
 
@@ -492,10 +488,8 @@ def test_ogr_basic_12():
     f.SetField('fld', 2)
     gdal.PopErrorHandler()
     if gdal.GetLastErrorMsg() == '':
-        gdaltest.post_reason('fail')
         return 'fail'
     if f.GetField('fld') != 1:
-        gdaltest.post_reason('fail')
         return 'fail'
 
     f.SetField('fld', '0')
@@ -505,10 +499,8 @@ def test_ogr_basic_12():
     f.SetField('fld', '2')
     gdal.PopErrorHandler()
     if gdal.GetLastErrorMsg() == '':
-        gdaltest.post_reason('fail')
         return 'fail'
     if f.GetField('fld') != 1:
-        gdaltest.post_reason('fail')
         return 'fail'
 
     gdal.ErrorReset()
@@ -517,10 +509,8 @@ def test_ogr_basic_12():
     field_def.SetSubType(ogr.OFSTBoolean)
     gdal.PopErrorHandler()
     if gdal.GetLastErrorMsg() == '':
-        gdaltest.post_reason('fail')
         return 'fail'
     if field_def.GetSubType() != ogr.OFSTNone:
-        gdaltest.post_reason('fail')
         return 'fail'
 
     # boolean list
@@ -528,7 +518,6 @@ def test_ogr_basic_12():
     field_def = ogr.FieldDefn('fld', ogr.OFTIntegerList)
     field_def.SetSubType(ogr.OFSTBoolean)
     if field_def.GetSubType() != ogr.OFSTBoolean:
-        gdaltest.post_reason('fail')
         return 'fail'
     feat_def.AddFieldDefn(field_def)
 
@@ -539,22 +528,18 @@ def test_ogr_basic_12():
     f.SetFieldIntegerList(0, [0, 1, 2, 1])
     gdal.PopErrorHandler()
     if gdal.GetLastErrorMsg() == '':
-        gdaltest.post_reason('fail')
         return 'fail'
     if f.GetField('fld') != [0, 1, 1, 1]:
         print(f.GetField('fld'))
-        gdaltest.post_reason('fail')
         return 'fail'
 
     # int16 integer
     feat_def = ogr.FeatureDefn()
     if ogr.GetFieldSubTypeName(ogr.OFSTInt16) != 'Int16':
-        gdaltest.post_reason('fail')
         return 'fail'
     field_def = ogr.FieldDefn('fld', ogr.OFTInteger)
     field_def.SetSubType(ogr.OFSTInt16)
     if field_def.GetSubType() != ogr.OFSTInt16:
-        gdaltest.post_reason('fail')
         return 'fail'
     feat_def.AddFieldDefn(field_def)
 
@@ -566,20 +551,16 @@ def test_ogr_basic_12():
     f.SetField('fld', -32769)
     gdal.PopErrorHandler()
     if gdal.GetLastErrorMsg() == '':
-        gdaltest.post_reason('fail')
         return 'fail'
     if f.GetField('fld') != -32768:
-        gdaltest.post_reason('fail')
         return 'fail'
     gdal.ErrorReset()
     gdal.PushErrorHandler('CPLQuietErrorHandler')
     f.SetField('fld', 32768)
     gdal.PopErrorHandler()
     if gdal.GetLastErrorMsg() == '':
-        gdaltest.post_reason('fail')
         return 'fail'
     if f.GetField('fld') != 32767:
-        gdaltest.post_reason('fail')
         return 'fail'
 
     gdal.ErrorReset()
@@ -588,21 +569,17 @@ def test_ogr_basic_12():
     field_def.SetSubType(ogr.OFSTInt16)
     gdal.PopErrorHandler()
     if gdal.GetLastErrorMsg() == '':
-        gdaltest.post_reason('fail')
         return 'fail'
     if field_def.GetSubType() != ogr.OFSTNone:
-        gdaltest.post_reason('fail')
         return 'fail'
 
     # float32
     feat_def = ogr.FeatureDefn()
     if ogr.GetFieldSubTypeName(ogr.OFSTFloat32) != 'Float32':
-        gdaltest.post_reason('fail')
         return 'fail'
     field_def = ogr.FieldDefn('fld', ogr.OFTReal)
     field_def.SetSubType(ogr.OFSTFloat32)
     if field_def.GetSubType() != ogr.OFSTFloat32:
-        gdaltest.post_reason('fail')
         return 'fail'
     feat_def.AddFieldDefn(field_def)
 
@@ -611,17 +588,14 @@ def test_ogr_basic_12():
         gdal.ErrorReset()
         f.SetField('fld', '1.23')
         if gdal.GetLastErrorMsg() != '':
-            gdaltest.post_reason('fail')
             return 'fail'
         gdal.ErrorReset()
         gdal.PushErrorHandler('CPLQuietErrorHandler')
         f.SetField('fld', 1.230000000001)
         gdal.PopErrorHandler()
         if gdal.GetLastErrorMsg() == '':
-            gdaltest.post_reason('fail')
             return 'fail'
         if abs(f.GetField('fld') - 1.23) < 1e-8:
-            gdaltest.post_reason('fail')
             f.DumpReadable()
             return 'fail'
 
@@ -631,10 +605,8 @@ def test_ogr_basic_12():
     field_def.SetSubType(ogr.OFSTInt16)
     gdal.PopErrorHandler()
     if gdal.GetLastErrorMsg() == '':
-        gdaltest.post_reason('fail')
         return 'fail'
     if field_def.GetSubType() != ogr.OFSTNone:
-        gdaltest.post_reason('fail')
         return 'fail'
 
     return 'success'
@@ -675,7 +647,6 @@ def test_ogr_basic_13():
         f = ogr.Feature(feat_defn)
         f.SetField('date', val)
         if f.GetField('date') != expected_ret:
-            gdaltest.post_reason('fail')
             print(val)
             print(f.GetField('date'))
             return 'fail'
@@ -783,19 +754,16 @@ def test_ogr_basic_dataset_slice():
 
     lyrs = [lyr.GetName() for lyr in ds[1:3]]
     if lyrs != ['lyr2', 'lyr3']:
-        gdaltest.post_reason('fail')
         print(lyrs)
         return 'fail'
 
     lyrs = [lyr.GetName() for lyr in ds[0:4]]
     if lyrs != ['lyr1', 'lyr2', 'lyr3']:
-        gdaltest.post_reason('fail')
         print(lyrs)
         return 'fail'
 
     lyrs = [lyr.GetName() for lyr in ds[0:3:2]]
     if lyrs != ['lyr1', 'lyr3']:
-        gdaltest.post_reason('fail')
         print(lyrs)
         return 'fail'
 
diff --git a/autotest/ogr/ogr_cad.py b/autotest/ogr/ogr_cad.py
index 7503507541a4..dbf66df144a9 100755
--- a/autotest/ogr/ogr_cad.py
+++ b/autotest/ogr/ogr_cad.py
@@ -438,11 +438,9 @@ def test_ogr_cad_9():
     with gdaltest.error_handler():
         ds = gdal.OpenEx('data/AC1018_signature.dwg', allowed_drivers=['CAD'])
     if ds is not None:
-        gdaltest.post_reason('fail')
         return 'fail'
     msg = gdal.GetLastErrorMsg()
     if msg.find('does not support this version') < 0:
-        gdaltest.post_reason('fail')
         return 'fail'
 
     return 'success'
diff --git a/autotest/ogr/ogr_carto.py b/autotest/ogr/ogr_carto.py
index b7f974fed208..20a3802db68c 100755
--- a/autotest/ogr/ogr_carto.py
+++ b/autotest/ogr/ogr_carto.py
@@ -72,7 +72,6 @@ def test_ogr_carto_vsimem():
     ds = ogr.Open('CARTO:foo')
     gdal.PopErrorHandler()
     if ds is not None:
-        gdaltest.post_reason('fail')
         return 'fail'
 
     gdal.FileFromMemBuffer('/vsimem/carto&POSTFIELDS=q=SELECT current_schema() LIMIT 500 OFFSET 0',
@@ -83,7 +82,6 @@ def test_ogr_carto_vsimem():
     ds = ogr.Open('CARTO:foo')
     gdal.PopErrorHandler()
     if ds is not None or gdal.GetLastErrorMsg().find('HTML error page') < 0:
-        gdaltest.post_reason('fail')
         print(gdal.GetLastErrorMsg())
         return 'fail'
 
@@ -91,7 +89,6 @@ def test_ogr_carto_vsimem():
                            """""")
     ds = ogr.Open('CARTO:foo')
     if ds is not None:
-        gdaltest.post_reason('fail')
         print(gdal.GetLastErrorMsg())
         return 'fail'
 
@@ -101,7 +98,6 @@ def test_ogr_carto_vsimem():
     ds = ogr.Open('CARTO:foo')
     gdal.PopErrorHandler()
     if ds is not None or gdal.GetLastErrorMsg().find('JSON parsing error') < 0:
-        gdaltest.post_reason('fail')
         print(gdal.GetLastErrorMsg())
         return 'fail'
 
@@ -109,7 +105,6 @@ def test_ogr_carto_vsimem():
                            """ "not_expected_json" """)
     ds = ogr.Open('CARTO:foo')
     if ds is not None:
-        gdaltest.post_reason('fail')
         print(gdal.GetLastErrorMsg())
         return 'fail'
 
@@ -119,7 +114,6 @@ def test_ogr_carto_vsimem():
     ds = ogr.Open('CARTO:foo')
     gdal.PopErrorHandler()
     if ds is not None or gdal.GetLastErrorMsg().find('Error returned by server : bla') < 0:
-        gdaltest.post_reason('fail')
         print(gdal.GetLastErrorMsg())
         return 'fail'
 
@@ -127,7 +121,6 @@ def test_ogr_carto_vsimem():
                            """{ "fields" : null } """)
     ds = ogr.Open('CARTO:foo')
     if ds is not None:
-        gdaltest.post_reason('fail')
         print(gdal.GetLastErrorMsg())
         return 'fail'
 
@@ -135,7 +128,6 @@ def test_ogr_carto_vsimem():
                            """{ "fields" : "invalid" } """)
     ds = ogr.Open('CARTO:foo')
     if ds is not None:
-        gdaltest.post_reason('fail')
         print(gdal.GetLastErrorMsg())
         return 'fail'
 
@@ -143,7 +135,6 @@ def test_ogr_carto_vsimem():
                            """{ "fields" : {} } """)
     ds = ogr.Open('CARTO:foo')
     if ds is not None:
-        gdaltest.post_reason('fail')
         print(gdal.GetLastErrorMsg())
         return 'fail'
 
@@ -151,7 +142,6 @@ def test_ogr_carto_vsimem():
                            """{ "fields" : { "foo": "invalid" } } """)
     ds = ogr.Open('CARTO:foo')
     if ds is not None:
-        gdaltest.post_reason('fail')
         print(gdal.GetLastErrorMsg())
         return 'fail'
 
@@ -159,7 +149,6 @@ def test_ogr_carto_vsimem():
                            """{ "fields" : { "foo": {} } } """)
     ds = ogr.Open('CARTO:foo')
     if ds is not None:
-        gdaltest.post_reason('fail')
         print(gdal.GetLastErrorMsg())
         return 'fail'
 
@@ -167,7 +156,6 @@ def test_ogr_carto_vsimem():
                            """{ "fields" : { "foo": { "type" : null } } } """)
     ds = ogr.Open('CARTO:foo')
     if ds is not None:
-        gdaltest.post_reason('fail')
         print(gdal.GetLastErrorMsg())
         return 'fail'
 
@@ -175,7 +163,6 @@ def test_ogr_carto_vsimem():
                            """{ "fields" : { "foo": { "type" : {} } } } """)
     ds = ogr.Open('CARTO:foo')
     if ds is not None:
-        gdaltest.post_reason('fail')
         print(gdal.GetLastErrorMsg())
         return 'fail'
 
@@ -183,7 +170,6 @@ def test_ogr_carto_vsimem():
                            """{ "fields" : { "foo": { "type" : "string" } } } """)
     ds = ogr.Open('CARTO:foo')
     if ds is not None:
-        gdaltest.post_reason('fail')
         print(gdal.GetLastErrorMsg())
         return 'fail'
 
@@ -191,7 +177,6 @@ def test_ogr_carto_vsimem():
                            """{"rows":[ {"field1": "foo", "field2": "bar"} ],"fields":{"field1":{"type":"string"}, "field2":{"type":"string"}}}""")
     ds = ogr.Open('CARTO:foo')
     if ds is not None:
-        gdaltest.post_reason('fail')
         print(gdal.GetLastErrorMsg())
         return 'fail'
 
@@ -201,7 +186,6 @@ def test_ogr_carto_vsimem():
     ds = ogr.Open('CARTO:foo')
     gdal.PopErrorHandler()
     if ds is not None:
-        gdaltest.post_reason('fail')
         print(gdal.GetLastErrorMsg())
         return 'fail'
 
@@ -211,7 +195,6 @@ def test_ogr_carto_vsimem():
     ds = ogr.Open('CARTO:foo')
     gdal.PopErrorHandler()
     if ds is not None:
-        gdaltest.post_reason('fail')
         print(gdal.GetLastErrorMsg())
         return 'fail'
 
@@ -219,7 +202,6 @@ def test_ogr_carto_vsimem():
                            """{"rows":[{"cdb_usertables":"table1"}],"fields":{"cdb_usertables":{"type":"string"}}}""")
     ds = ogr.Open('CARTO:foo')
     if ds is None or ds.GetLayerCount() != 1:
-        gdaltest.post_reason('fail')
         print(gdal.GetLastErrorMsg())
         return 'fail'
 
@@ -228,7 +210,6 @@ def test_ogr_carto_vsimem():
     gdal.PopErrorHandler()
 
     if lyr_defn.GetFieldCount() != 0:
-        gdaltest.post_reason('fail')
         return 'fail'
 
     # Empty layer
@@ -238,14 +219,12 @@ def test_ogr_carto_vsimem():
     lyr = ds.GetLayer(0)
     lyr_defn = lyr.GetLayerDefn()
     if lyr_defn.GetFieldCount() != 0:
-        gdaltest.post_reason('fail')
         return 'fail'
 
     gdal.FileFromMemBuffer('/vsimem/carto&POSTFIELDS=q=SELECT * FROM "table1" LIMIT 500 OFFSET 0',
                            """{"rows":[{}],"fields":{}}}""")
     f = lyr.GetNextFeature()
     if f.GetFID() != 0:
-        gdaltest.post_reason('fail')
         f.DumpReadable()
         return 'fail'
 
@@ -256,24 +235,19 @@ def test_ogr_carto_vsimem():
     lyr = ds.GetLayer(0)
     lyr_defn = lyr.GetLayerDefn()
     if lyr_defn.GetFieldCount() != 4:
-        gdaltest.post_reason('fail')
         return 'fail'
     if lyr_defn.GetFieldDefn(0).GetName() != 'strfield' or \
        lyr_defn.GetFieldDefn(0).GetType() != ogr.OFTString:
-        gdaltest.post_reason('fail')
         return 'fail'
     if lyr_defn.GetFieldDefn(1).GetName() != 'realfield' or \
        lyr_defn.GetFieldDefn(1).GetType() != ogr.OFTReal:
-        gdaltest.post_reason('fail')
         return 'fail'
     if lyr_defn.GetFieldDefn(2).GetName() != 'boolfield' or \
        lyr_defn.GetFieldDefn(2).GetType() != ogr.OFTInteger or \
        lyr_defn.GetFieldDefn(2).GetSubType() != ogr.OFSTBoolean:
-        gdaltest.post_reason('fail')
         return 'fail'
     if lyr_defn.GetFieldDefn(3).GetName() != 'datefield' or \
        lyr_defn.GetFieldDefn(3).GetType() != ogr.OFTDateTime:
-        gdaltest.post_reason('fail')
         return 'fail'
 
     gdal.FileFromMemBuffer('/vsimem/carto&POSTFIELDS=q=SELECT "strfield", "realfield", "boolfield", "datefield" FROM "table1" LIMIT 500 OFFSET 0',
@@ -281,7 +255,6 @@ def test_ogr_carto_vsimem():
     f = lyr.GetNextFeature()
     if f['strfield'] != 'foo' or f['realfield'] != 1.23 or f['boolfield'] != 1 or \
        f['datefield'] != '2015/04/24 12:34:56.123+00':
-        gdaltest.post_reason('fail')
         f.DumpReadable()
         return 'fail'
 
@@ -295,7 +268,6 @@ def test_ogr_carto_vsimem():
     lyr_defn = ds.GetLayer(0).GetLayerDefn()
     gdal.PopErrorHandler()
     if lyr_defn.GetFieldCount() != 0:
-        gdaltest.post_reason('fail')
         return 'fail'
 
     get_full_details_fields_url = """/vsimem/carto&POSTFIELDS=q=SELECT a.attname, t.typname, a.attlen, format_type(a.atttypid,a.atttypmod), a.attnum, a.attnotnull, i.indisprimary, pg_get_expr(def.adbin, c.oid) AS defaultexpr, postgis_typmod_dims(a.atttypmod) dim, postgis_typmod_srid(a.atttypmod) srid, postgis_typmod_type(a.atttypmod)::text geomtyp, srtext FROM pg_class c JOIN pg_attribute a ON a.attnum > 0 AND a.attrelid = c.oid AND c.relname = 'table1' JOIN pg_type t ON a.atttypid = t.oid JOIN pg_namespace n ON c.relnamespace=n.oid AND n.nspname= 'public' LEFT JOIN pg_index i ON c.oid = i.indrelid AND i.indisprimary = 't' AND a.attnum = ANY(i.indkey) LEFT JOIN pg_attrdef def ON def.adrelid = c.oid AND def.adnum = a.attnum LEFT JOIN spatial_ref_sys srs ON srs.srid = postgis_typmod_srid(a.atttypmod) ORDER BY a.attnum LIMIT 500 OFFSET 0&api_key=foo"""
@@ -305,7 +277,6 @@ def test_ogr_carto_vsimem():
     lyr_defn = ds.GetLayer(0).GetLayerDefn()
     gdal.PopErrorHandler()
     if lyr_defn.GetFieldCount() != 0:
-        gdaltest.post_reason('fail')
         return 'fail'
 
     gdal.FileFromMemBuffer(get_full_details_fields_url,
@@ -316,14 +287,12 @@ def test_ogr_carto_vsimem():
     lyr_defn = lyr.GetLayerDefn()
     gdal.PopErrorHandler()
     if lyr_defn.GetFieldCount() != 1:
-        gdaltest.post_reason('fail')
         return 'fail'
 
     gdal.PushErrorHandler()
     f = lyr.GetFeature(0)
     gdal.PopErrorHandler()
     if f is not None:
-        gdaltest.post_reason('fail')
         return 'fail'
 
     gdal.FileFromMemBuffer(get_full_details_fields_url,
@@ -355,32 +324,25 @@ def test_ogr_carto_vsimem():
     lyr = ds.GetLayer(0)
     lyr_defn = lyr.GetLayerDefn()
     if lyr_defn.GetFieldCount() != 5:
-        gdaltest.post_reason('fail')
         return 'fail'
     if lyr_defn.GetFieldDefn(0).GetName() != 'strfield' or \
        lyr_defn.GetFieldDefn(0).GetType() != ogr.OFTString or \
        lyr_defn.GetFieldDefn(0).IsNullable() or \
        lyr_defn.GetFieldDefn(0).GetDefault() != 'def_value':
-        gdaltest.post_reason('fail')
         return 'fail'
     if lyr_defn.GetGeomFieldCount() != 1:
-        gdaltest.post_reason('fail')
         return 'fail'
     if lyr_defn.GetGeomFieldDefn(0).GetName() != 'my_geom':
-        gdaltest.post_reason('fail')
         return 'fail'
     if lyr_defn.GetGeomFieldDefn(0).GetType() != ogr.wkbPoint25D:
-        gdaltest.post_reason('fail')
         return 'fail'
     if lyr_defn.GetGeomFieldDefn(0).GetSpatialRef().ExportToWkt().find('4326') < 0:
-        gdaltest.post_reason('fail')
         return 'fail'
 
     gdal.PushErrorHandler()
     fc = lyr.GetFeatureCount()
     gdal.PopErrorHandler()
     if fc != 0:
-        gdaltest.post_reason('fail')
         return 'fail'
 
     gdal.FileFromMemBuffer("""/vsimem/carto&POSTFIELDS=q=SELECT COUNT(*) FROM "table1"&api_key=foo""",
@@ -389,7 +351,6 @@ def test_ogr_carto_vsimem():
     fc = lyr.GetFeatureCount()
     gdal.PopErrorHandler()
     if fc != 0:
-        gdaltest.post_reason('fail')
         return 'fail'
 
     gdal.FileFromMemBuffer("""/vsimem/carto&POSTFIELDS=q=SELECT COUNT(*) FROM "table1"&api_key=foo""",
@@ -399,21 +360,18 @@ def test_ogr_carto_vsimem():
     fc = lyr.GetFeatureCount()
     gdal.PopErrorHandler()
     if fc != 0:
-        gdaltest.post_reason('fail')
         return 'fail'
 
     gdal.FileFromMemBuffer("""/vsimem/carto&POSTFIELDS=q=SELECT COUNT(*) FROM "table1"&api_key=foo""",
                            """{"rows":[{"count":9876543210}],
             "fields":{"count":{"type":"number"}}}""")
     if lyr.GetFeatureCount() != 9876543210:
-        gdaltest.post_reason('fail')
         return 'fail'
 
     gdal.PushErrorHandler()
     extent = lyr.GetExtent()
     gdal.PopErrorHandler()
     if extent != (0, 0, 0, 0):
-        gdaltest.post_reason('fail')
         return 'fail'
 
     gdal.FileFromMemBuffer("""/vsimem/carto&POSTFIELDS=q=SELECT ST_Extent("my_geom") FROM "table1"&api_key=foo""",
@@ -424,7 +382,6 @@ def test_ogr_carto_vsimem():
     extent = lyr.GetExtent()
     gdal.PopErrorHandler()
     if extent != (0, 0, 0, 0):
-        gdaltest.post_reason('fail')
         return 'fail'
 
     gdal.FileFromMemBuffer("""/vsimem/carto&POSTFIELDS=q=SELECT ST_Extent("my_geom") FROM "table1"&api_key=foo""",
@@ -435,7 +392,6 @@ def test_ogr_carto_vsimem():
     lyr.GetExtent()
     gdal.PopErrorHandler()
     if gdal.GetLastErrorMsg() == '':
-        gdaltest.post_reason('fail')
         return 'fail'
 
     gdal.FileFromMemBuffer("""/vsimem/carto&POSTFIELDS=q=SELECT ST_Extent("my_geom") FROM "table1"&api_key=foo""",
@@ -446,7 +402,6 @@ def test_ogr_carto_vsimem():
     lyr.GetExtent()
     gdal.PopErrorHandler()
     if gdal.GetLastErrorMsg() == '':
-        gdaltest.post_reason('fail')
         return 'fail'
 
     gdal.FileFromMemBuffer("""/vsimem/carto&POSTFIELDS=q=SELECT ST_Extent("my_geom") FROM "table1"&api_key=foo""",
@@ -457,14 +412,12 @@ def test_ogr_carto_vsimem():
     lyr.GetExtent()
     gdal.PopErrorHandler()
     if gdal.GetLastErrorMsg() == '':
-        gdaltest.post_reason('fail')
         return 'fail'
 
     gdal.FileFromMemBuffer("""/vsimem/carto&POSTFIELDS=q=SELECT ST_Extent("my_geom") FROM "table1"&api_key=foo""",
                            """{"rows":[{"st_extent":"BOX(0,1,2,3)"}],
             "fields":{"st_extent":{"type":"string"}}}""")
     if lyr.GetExtent() != (0.0, 2.0, 1.0, 3.0):
-        gdaltest.post_reason('fail')
         print(lyr.GetExtent())
         return 'fail'
 
@@ -472,7 +425,6 @@ def test_ogr_carto_vsimem():
     f = lyr.GetFeature(0)
     gdal.PopErrorHandler()
     if f is not None:
-        gdaltest.post_reason('fail')
         return 'fail'
 
     gdal.FileFromMemBuffer("""/vsimem/carto&POSTFIELDS=q=SELECT "cartodb_id", "my_geom", "strfield", "intfield", "doublefield", "boolfield", "datetimefield" FROM "table1" WHERE "cartodb_id" = 0&api_key=foo""",
@@ -482,7 +434,6 @@ def test_ogr_carto_vsimem():
     f = lyr.GetFeature(0)
     gdal.PopErrorHandler()
     if f is not None:
-        gdaltest.post_reason('fail')
         return 'fail'
 
     gdal.FileFromMemBuffer("""/vsimem/carto&POSTFIELDS=q=SELECT "cartodb_id", "my_geom", "strfield", "intfield", "doublefield", "boolfield", "datetimefield" FROM "table1" WHERE "cartodb_id" = 0&api_key=foo""",
@@ -491,7 +442,6 @@ def test_ogr_carto_vsimem():
 
     f = lyr.GetFeature(0)
     if f.GetFID() != -1 or not f.IsFieldNull(0):
-        gdaltest.post_reason('fail')
         return 'fail'
 
     gdal.FileFromMemBuffer("""/vsimem/carto&POSTFIELDS=q=SELECT "cartodb_id", "my_geom", "strfield", "intfield", "doublefield", "boolfield", "datetimefield" FROM "table1" WHERE "cartodb_id" = 0&api_key=foo""",
@@ -500,7 +450,6 @@ def test_ogr_carto_vsimem():
 
     f = lyr.GetFeature(0)
     if f.GetFID() != 0:
-        gdaltest.post_reason('fail')
         return 'fail'
 
     lyr.ResetReading()
@@ -508,7 +457,6 @@ def test_ogr_carto_vsimem():
     f = lyr.GetNextFeature()
     gdal.PopErrorHandler()
     if f is not None:
-        gdaltest.post_reason('fail')
         return 'fail'
 
     gdal.FileFromMemBuffer("""/vsimem/carto&POSTFIELDS=q=SELECT "cartodb_id", "my_geom", "strfield", "intfield", "doublefield", "boolfield", "datetimefield" FROM "table1" WHERE "cartodb_id" >= 0 ORDER BY "cartodb_id" ASC LIMIT 500&api_key=foo""",
@@ -517,13 +465,11 @@ def test_ogr_carto_vsimem():
     lyr.ResetReading()
     f = lyr.GetNextFeature()
     if f.GetFID() != 0:
-        gdaltest.post_reason('fail')
         return 'fail'
     gdal.PushErrorHandler()
     f = lyr.GetNextFeature()
     gdal.PopErrorHandler()
     if f is not None:
-        gdaltest.post_reason('fail')
         return 'fail'
 
     gdal.SetConfigOption('CARTO_PAGE_SIZE', '2')
@@ -533,11 +479,9 @@ def test_ogr_carto_vsimem():
     lyr.ResetReading()
     f = lyr.GetNextFeature()
     if f.GetFID() != 0:
-        gdaltest.post_reason('fail')
         return 'fail'
     f = lyr.GetNextFeature()
     if f.GetFID() != 10:
-        gdaltest.post_reason('fail')
         return 'fail'
 
     gdal.FileFromMemBuffer("""/vsimem/carto&POSTFIELDS=q=SELECT "cartodb_id", "my_geom", "strfield", "intfield", "doublefield", "boolfield", "datetimefield" FROM "table1" WHERE "cartodb_id" >= 11 ORDER BY "cartodb_id" ASC LIMIT 2&api_key=foo""",
@@ -545,12 +489,10 @@ def test_ogr_carto_vsimem():
             "fields":{"cartodb_id":{"type":"numeric"}}}""")
     f = lyr.GetNextFeature()
     if f.GetFID() != 12:
-        gdaltest.post_reason('fail')
         return 'fail'
     gdal.ErrorReset()
     f = lyr.GetNextFeature()
     if f is not None or gdal.GetLastErrorMsg() != '':
-        gdaltest.post_reason('fail')
         return 'fail'
 
     lyr.SetAttributeFilter('strfield is NULL')
@@ -559,7 +501,6 @@ def test_ogr_carto_vsimem():
     fc = lyr.GetFeatureCount()
     gdal.PopErrorHandler()
     if fc != 0:
-        gdaltest.post_reason('fail')
         return 'fail'
 
     gdal.FileFromMemBuffer("""/vsimem/carto&POSTFIELDS=q=SELECT "cartodb_id", "my_geom", "strfield", "intfield", "doublefield", "boolfield", "datetimefield" FROM "table1" WHERE (strfield is NULL) AND "cartodb_id" >= 0 ORDER BY "cartodb_id" ASC LIMIT 2&api_key=foo""",
@@ -568,7 +509,6 @@ def test_ogr_carto_vsimem():
     lyr.ResetReading()
     f = lyr.GetNextFeature()
     if f is None:
-        gdaltest.post_reason('fail')
         return 'fail'
     gdal.FileFromMemBuffer("""/vsimem/carto&POSTFIELDS=q=SELECT "cartodb_id", "my_geom", "strfield", "intfield", "doublefield", "boolfield", "datetimefield" FROM "table1" WHERE (strfield is NULL) AND "cartodb_id" >= 1 ORDER BY "cartodb_id" ASC LIMIT 2&api_key=foo""",
                            """{"rows":[],
@@ -576,14 +516,12 @@ def test_ogr_carto_vsimem():
     gdal.ErrorReset()
     f = lyr.GetNextFeature()
     if f is not None or gdal.GetLastErrorMsg() != '':
-        gdaltest.post_reason('fail')
         return 'fail'
 
     gdal.FileFromMemBuffer("""/vsimem/carto&POSTFIELDS=q=SELECT COUNT(*) FROM "table1" WHERE (strfield is NULL)&api_key=foo""",
                            """{"rows":[{"count":9876543210}],
             "fields":{"count":{"type":"number"}}}""")
     if lyr.GetFeatureCount() != 9876543210:
-        gdaltest.post_reason('fail')
         return 'fail'
 
     lyr.SetSpatialFilterRect(-180, -90, 180, 90)
@@ -592,7 +530,6 @@ def test_ogr_carto_vsimem():
     fc = lyr.GetFeatureCount()
     gdal.PopErrorHandler()
     if fc != 0:
-        gdaltest.post_reason('fail')
         return 'fail'
 
     gdal.FileFromMemBuffer("""/vsimem/carto&POSTFIELDS=q=SELECT "cartodb_id", "my_geom", "strfield", "intfield", "doublefield", "boolfield", "datetimefield" FROM "table1" WHERE ("my_geom" %26%26 'BOX3D(-180 -90, 180 90)'::box3d) AND (strfield is NULL) AND "cartodb_id" >= 0 ORDER BY "cartodb_id" ASC LIMIT 2&api_key=foo""",
@@ -602,21 +539,18 @@ def test_ogr_carto_vsimem():
     lyr.ResetReading()
     f = lyr.GetNextFeature()
     if f is None or f.GetGeometryRef().ExportToWkt() != 'POINT (2 49)':
-        gdaltest.post_reason('fail')
         return 'fail'
 
     gdal.PushErrorHandler()
     fc = lyr.GetFeatureCount()
     gdal.PopErrorHandler()
     if fc != 1:
-        gdaltest.post_reason('fail')
         return 'fail'
 
     gdal.FileFromMemBuffer("""/vsimem/carto&POSTFIELDS=q=SELECT COUNT(*) FROM "table1" WHERE ("my_geom" %26%26 'BOX3D(-180 -90, 180 90)'::box3d) AND (strfield is NULL)&api_key=foo""",
                            """{"rows":[{"count":9876543210}],
             "fields":{"count":{"type":"number"}}}""")
     if lyr.GetFeatureCount() != 9876543210:
-        gdaltest.post_reason('fail')
         return 'fail'
 
     # Not permitted in read-only mode
@@ -644,7 +578,6 @@ def test_ogr_carto_vsimem():
     lyr.GetNextFeature()
     gdal.PopErrorHandler()
     if gdal.GetLastErrorMsg() == '':
-        gdaltest.post_reason('fail')
         return 'fail'
 
     gdal.FileFromMemBuffer("""/vsimem/carto&POSTFIELDS=q=SELECT cdb_cartodbfytable('my_layer')&api_key=foo""",
@@ -673,7 +606,6 @@ def test_ogr_carto_vsimem():
     ret = lyr.CreateFeature(f)
     gdal.PopErrorHandler()
     if ret == 0:
-        gdaltest.post_reason('fail')
         return 'fail'
     f = None
 
@@ -682,14 +614,12 @@ def test_ogr_carto_vsimem():
     with gdaltest.error_handler():
         ret = lyr.CreateField(fld_defn)
     if ret == 0:
-        gdaltest.post_reason('fail')
         return 'fail'
 
     gdal.FileFromMemBuffer("""/vsimem/carto&POSTFIELDS=q=ALTER TABLE "my_layer" ADD COLUMN "intfield" INTEGER&api_key=foo""",
                            """{"rows":[],
             "fields":{}}""")
     if lyr.CreateField(fld_defn) != 0:
-        gdaltest.post_reason('fail')
         return 'fail'
 
     fld_defn = ogr.FieldDefn('boolfield', ogr.OFTInteger)
@@ -699,19 +629,16 @@ def test_ogr_carto_vsimem():
                            """{"rows":[],
             "fields":{}}""")
     if lyr.CreateField(fld_defn) != 0:
-        gdaltest.post_reason('fail')
         return 'fail'
 
     # Invalid field
     with gdaltest.error_handler():
         if lyr.DeleteField(-1) == 0:
-            gdaltest.post_reason('fail')
             return 'fail'
 
     # No server answer
     with gdaltest.error_handler():
         if lyr.DeleteField(0) == 0:
-            gdaltest.post_reason('fail')
             return 'fail'
 
     gdal.FileFromMemBuffer("""/vsimem/carto&POSTFIELDS=q=ALTER TABLE "my_layer" DROP COLUMN "boolfield"&api_key=foo""",
@@ -719,14 +646,12 @@ def test_ogr_carto_vsimem():
             "fields":{}}""")
     fld_pos = lyr.GetLayerDefn().GetFieldIndex(fld_defn.GetName())
     if lyr.DeleteField(fld_pos) != 0:
-        gdaltest.post_reason('fail')
         return 'fail'
 
     gdal.FileFromMemBuffer("""/vsimem/carto&POSTFIELDS=q=ALTER TABLE "my_layer" ADD COLUMN "boolfield" BOOLEAN&api_key=foo""",
                            """{"rows":[],
             "fields":{}}""")
     if lyr.CreateField(fld_defn) != 0:
-        gdaltest.post_reason('fail')
         return 'fail'
 
     f = ogr.Feature(lyr.GetLayerDefn())
@@ -734,7 +659,6 @@ def test_ogr_carto_vsimem():
     ret = lyr.CreateFeature(f)
     gdal.PopErrorHandler()
     if ret == 0:
-        gdaltest.post_reason('fail')
         return 'fail'
 
     f = ogr.Feature(lyr.GetLayerDefn())
@@ -747,7 +671,6 @@ def test_ogr_carto_vsimem():
             "fields":{"cartodb_id":{"type":"integer"}}}""")
     ret = lyr.CreateFeature(f)
     if ret != 0 or f.GetFID() != 1:
-        gdaltest.post_reason('fail')
         return 'fail'
 
     f.SetFID(-1)
@@ -755,7 +678,6 @@ def test_ogr_carto_vsimem():
     ret = lyr.SetFeature(f)
     gdal.PopErrorHandler()
     if ret == 0:
-        gdaltest.post_reason('fail')
         return 'fail'
 
     f.SetFID(3)
@@ -763,21 +685,18 @@ def test_ogr_carto_vsimem():
     ret = lyr.SetFeature(f)
     gdal.PopErrorHandler()
     if ret == 0:
-        gdaltest.post_reason('fail')
         return 'fail'
 
     gdal.FileFromMemBuffer("""/vsimem/carto&POSTFIELDS=q=UPDATE "my_layer" SET "strfield" = 'foo', "intfield" = 1, "boolfield" = 't', "the_geom" = '0101000020E610000000000000000000400000000000804840' WHERE "cartodb_id" = 3&api_key=foo""",
                            """{"total_rows": 0}""")
     ret = lyr.SetFeature(f)
     if ret != ogr.OGRERR_NON_EXISTING_FEATURE:
-        gdaltest.post_reason('fail')
         return 'fail'
 
     gdal.FileFromMemBuffer("""/vsimem/carto&POSTFIELDS=q=UPDATE "my_layer" SET "strfield" = 'foo', "intfield" = 1, "boolfield" = 't', "the_geom" = '0101000020E610000000000000000000400000000000804840' WHERE "cartodb_id" = 3&api_key=foo""",
                            """{"total_rows": 1}""")
     ret = lyr.SetFeature(f)
     if ret != 0:
-        gdaltest.post_reason('fail')
         return 'fail'
 
     f = ogr.Feature(lyr.GetLayerDefn())
@@ -785,7 +704,6 @@ def test_ogr_carto_vsimem():
     ret = lyr.CreateFeature(f)
     gdal.PopErrorHandler()
     if ret == 0:
-        gdaltest.post_reason('fail')
         return 'fail'
 
     gdal.FileFromMemBuffer("""/vsimem/carto&POSTFIELDS=q=INSERT INTO "my_layer" DEFAULT VALUES RETURNING "cartodb_id"&api_key=foo""",
@@ -793,28 +711,24 @@ def test_ogr_carto_vsimem():
             "fields":{"cartodb_id":{"type":"integer"}}}""")
     ret = lyr.CreateFeature(f)
     if ret != 0 or f.GetFID() != 4:
-        gdaltest.post_reason('fail')
         return 'fail'
 
     gdal.PushErrorHandler()
     ret = lyr.DeleteFeature(0)
     gdal.PopErrorHandler()
     if ret == 0:
-        gdaltest.post_reason('fail')
         return 'fail'
 
     gdal.FileFromMemBuffer("""/vsimem/carto&POSTFIELDS=q=DELETE FROM "my_layer" WHERE "cartodb_id" = 0&api_key=foo""",
                            """{"total_rows": 0}""")
     ret = lyr.DeleteFeature(0)
     if ret != ogr.OGRERR_NON_EXISTING_FEATURE:
-        gdaltest.post_reason('fail')
         return 'fail'
 
     gdal.FileFromMemBuffer("""/vsimem/carto&POSTFIELDS=q=DELETE FROM "my_layer" WHERE "cartodb_id" = 0&api_key=foo""",
                            """{"total_rows": 1}""")
     ret = lyr.DeleteFeature(0)
     if ret != 0:
-        gdaltest.post_reason('fail')
         return 'fail'
 
     gdal.FileFromMemBuffer("""/vsimem/carto&POSTFIELDS=q=SELECT cdb_cartodbfytable('my_layer')&api_key=foo""",
@@ -836,7 +750,6 @@ def test_ogr_carto_vsimem():
     f.SetField('strfield', 'foo')
     ret = lyr.CreateFeature(f)
     if ret != 0 or f.GetFID() != 11:
-        gdaltest.post_reason('fail')
         return 'fail'
 
     f = ogr.Feature(lyr.GetLayerDefn())
@@ -847,7 +760,6 @@ def test_ogr_carto_vsimem():
         ret = lyr.CreateFeature(f)
         ds = None
     if ret != 0 or f.GetFID() != 12:
-        gdaltest.post_reason('fail')
         f.DumpReadable()
         return 'fail'
 
@@ -862,7 +774,6 @@ def test_ogr_carto_vsimem():
         ds = None
 
     if ret != 0 or f.GetFID() != 11:
-        gdaltest.post_reason('fail')
         f.DumpReadable()
         return 'fail'
 
@@ -901,21 +812,18 @@ def test_ogr_carto_vsimem():
                            """{"rows":[{"nextid":11}],"fields":{"nextid":{"type":"number"}}}"""):
         ret = lyr.CreateFeature(f)
     if ret != 0 or f.GetFID() != 11:
-        gdaltest.post_reason('fail')
         return 'fail'
 
     f = ogr.Feature(lyr.GetLayerDefn())
     f.SetField('strfield', 'bar')
     ret = lyr.CreateFeature(f)
     if ret != 0 or f.GetFID() != 12:
-        gdaltest.post_reason('fail')
         return 'fail'
 
     f = ogr.Feature(lyr.GetLayerDefn())
     f.SetField('strfield', 'baz')
     ret = lyr.CreateFeature(f)
     if ret != 0 or f.GetFID() != 13:
-        gdaltest.post_reason('fail')
         return 'fail'
 
     gdal.ErrorReset()
@@ -923,7 +831,6 @@ def test_ogr_carto_vsimem():
                            """{"rows":[], "fields":{}}"""):
         ds = None
     if gdal.GetLastErrorMsg() != '':
-        gdaltest.post_reason('fail')
         return 'fail'
 
     ds = gdal.OpenEx('CARTO:foo', gdal.OF_VECTOR | gdal.OF_UPDATE, open_options=['COPY_MODE=NO'])
@@ -932,7 +839,6 @@ def test_ogr_carto_vsimem():
     lyr = ds.CreateLayer('table1')
     gdal.PopErrorHandler()
     if lyr is not None:
-        gdaltest.post_reason('fail')
         return 'fail'
 
     with gdaltest.tempfile("""/vsimem/carto&POSTFIELDS=q=DROP TABLE "table1"&api_key=foo""",
@@ -944,7 +850,6 @@ def test_ogr_carto_vsimem():
     with gdaltest.tempfile("""/vsimem/carto&POSTFIELDS=q=CREATE TABLE "table1" ( cartodb_id SERIAL,the_geom Geometry(MULTIPOLYGON,0),PRIMARY KEY (cartodb_id) );DROP SEQUENCE IF EXISTS "table1_cartodb_id_seq" CASCADE;CREATE SEQUENCE "table1_cartodb_id_seq" START 1;ALTER SEQUENCE "table1_cartodb_id_seq" OWNED BY "table1".cartodb_id;ALTER TABLE "table1" ALTER COLUMN cartodb_id SET DEFAULT nextval('"table1_cartodb_id_seq"')&api_key=foo""",
                            """{"rows":[], "fields":{}}"""):
         if lyr.CreateFeature(f) != 0:
-            gdaltest.post_reason('fail')
             return 'fail'
 
     gdal.ErrorReset()
@@ -953,7 +858,6 @@ def test_ogr_carto_vsimem():
             "fields":{}}"""):
         ds = None
     if gdal.GetLastErrorMsg() != '':
-        gdaltest.post_reason('fail')
         return 'fail'
 
     ds = gdal.OpenEx('CARTO:foo', gdal.OF_VECTOR | gdal.OF_UPDATE, open_options=['COPY_MODE=NO'])
@@ -970,10 +874,8 @@ def test_ogr_carto_vsimem():
         with gdaltest.tempfile("""/vsimem/carto&POSTFIELDS=q=BEGIN;INSERT INTO "table1" ("cartodb_id") VALUES (100);COMMIT;&api_key=foo""",
                                """{"rows":[], "fields":{}}"""):
             if lyr.CreateFeature(f) != 0:
-                gdaltest.post_reason('fail')
                 return 'fail'
             if f.GetFID() != 100:
-                gdaltest.post_reason('fail')
                 return 'fail'
             ds = None
 
@@ -983,17 +885,14 @@ def test_ogr_carto_vsimem():
     ret = ds.DeleteLayer(0)
     gdal.PopErrorHandler()
     if ret == 0:
-        gdaltest.post_reason('fail')
         return 'fail'
 
     gdal.ErrorReset()
     ds = gdal.OpenEx('CARTO:foo', gdal.OF_VECTOR | gdal.OF_UPDATE, open_options=['COPY_MODE=YES'])
     if ds is None:
-        gdaltest.post_reason('fail')
         return 'fail'
     lyr = ds.GetLayerByName('table1')
     if lyr is None:
-        gdaltest.post_reason('fail')
         return 'fail'
 
     with gdaltest.tempfile("""/vsimem/carto/copyfrom?q=COPY%20"table1"%20("strfield","my_geom","cartodb_id")%20FROM%20STDIN%20WITH%20(FORMAT%20text,%20ENCODING%20UTF8)&api_key=foo&POSTFIELDS=copytest\t0101000020E610000000000000000059400000000000005940\t11\n\\.\n""","""{}"""):
@@ -1004,14 +903,12 @@ def test_ogr_carto_vsimem():
             f.SetField('strfield', 'copytest')
             f.SetGeometry(ogr.CreateGeometryFromWkt('POINT(100 100)'))
             if lyr.CreateFeature(f) != 0:
-                gdaltest.post_reason('fail')
                 return 'fail'
 
             f = ogr.Feature(lyr.GetLayerDefn())
             f.SetField('intfield', 12)
             f.SetGeometry(ogr.CreateGeometryFromWkt('POINT(100 100)'))
             if lyr.CreateFeature(f) != 0:
-                gdaltest.post_reason('fail')
                 return 'fail'
 
             ds = None # force flush
@@ -1023,7 +920,6 @@ def test_ogr_carto_vsimem():
                            """{"rows":[], "fields":{}}"""):
         ds.ExecuteSQL('DELLAYER:table1')
     if gdal.GetLastErrorMsg() != '' or ds.GetLayerByName('table1') is not None:
-        gdaltest.post_reason('fail')
         return 'fail'
 
     with gdaltest.tempfile('/vsimem/carto&POSTFIELDS=q=SELECT current_schema() LIMIT 500 OFFSET 0&api_key=foo',
@@ -1034,7 +930,6 @@ def test_ogr_carto_vsimem():
                                    """{"rows":[{"relname": "a_layer"}],"fields":{"relname":{"type":"string"}}}"""):
                 ds = ogr.Open('CARTO:foo')
     if ds.GetLayerByName('a_layer') is None:
-        gdaltest.post_reason('fail')
         return 'fail'
 
 
@@ -1150,7 +1045,6 @@ def ogr_carto_rw_1():
 
     ret = lyr.CreateFeature(f)
     if ret != 0:
-        gdaltest.post_reason('fail')
         return 'fail'
 
     f.SetFID(-1)
@@ -1163,7 +1057,6 @@ def ogr_carto_rw_1():
     f.SetGeometry(ogr.CreateGeometryFromWkt('POINT (1 2)'))
     ret = lyr.CreateFeature(f)
     if ret != 0:
-        gdaltest.post_reason('fail')
         return 'fail'
 
     f.SetField('intfield', 456)
@@ -1171,7 +1064,6 @@ def ogr_carto_rw_1():
     f.SetGeometry(ogr.CreateGeometryFromWkt('POINT (3 4)'))
     ret = lyr.SetFeature(f)
     if ret != 0:
-        gdaltest.post_reason('fail')
         return 'fail'
     fid = f.GetFID()
 
@@ -1184,7 +1076,6 @@ def ogr_carto_rw_1():
         if lyr.GetName() == lyr_name:
             found = True
     if not found:
-        gdaltest.post_reason('fail')
         return 'fail'
     lyr = ds.GetLayerByName(lyr_name)
     found = False
@@ -1192,7 +1083,6 @@ def ogr_carto_rw_1():
         if lyr.GetLayerDefn().GetFieldDefn(i).GetName() == 'strfield':
             found = True
     if not found:
-        gdaltest.post_reason('fail')
         return 'fail'
     f = lyr.GetFeature(fid)
     if f.GetField('strfield') != "fo'o" or \
@@ -1202,7 +1092,6 @@ def ogr_carto_rw_1():
        f.GetField('dt') != '2014/12/04 12:34:56+00' or \
        f.GetField('bool') != 1 or \
        f.GetGeometryRef().ExportToWkt() != 'POINT (3 4)':
-        gdaltest.post_reason('fail')
         f.DumpReadable()
         ds.ExecuteSQL("DELLAYER:" + lyr_name)
         return 'fail'
@@ -1210,7 +1099,6 @@ def ogr_carto_rw_1():
     lyr.DeleteFeature(fid)
     f = lyr.GetFeature(fid)
     if f is not None:
-        gdaltest.post_reason('fail')
         ds.ExecuteSQL("DELLAYER:" + lyr_name)
         return 'fail'
 
@@ -1238,7 +1126,6 @@ def ogr_carto_rw_1():
     sql_lyr = ds.ExecuteSQL('SELECT ST_AsText(the_geom_webmercator) AS foo FROM ' + lyr_name)
     f = sql_lyr.GetNextFeature()
     if not f.GetField(0).startswith('POINT'):
-        gdaltest.post_reason('fail')
         ds.ExecuteSQL("DELLAYER:" + lyr_name)
         ds.ReleaseResultSet(sql_lyr)
         return 'fail'
@@ -1274,23 +1161,18 @@ def ogr_carto_rw_1():
     lyr = ds.GetLayerByName(lyr_name)
     if lyr.GetLayerDefn().GetFieldDefn(lyr.GetLayerDefn().GetFieldIndex('nullable')).IsNullable() != 1:
         ds.ExecuteSQL("DELLAYER:" + lyr_name)
-        gdaltest.post_reason('fail')
         return 'fail'
     if lyr.GetLayerDefn().GetFieldDefn(lyr.GetLayerDefn().GetFieldIndex('not_nullable')).IsNullable() != 0:
         ds.ExecuteSQL("DELLAYER:" + lyr_name)
-        gdaltest.post_reason('fail')
         return 'fail'
     if lyr.GetLayerDefn().GetFieldDefn(lyr.GetLayerDefn().GetFieldIndex('field_string')).GetDefault() != "'a''b'":
         ds.ExecuteSQL("DELLAYER:" + lyr_name)
-        gdaltest.post_reason('fail')
         return 'fail'
     if lyr.GetLayerDefn().GetFieldDefn(lyr.GetLayerDefn().GetFieldIndex('field_datetime_with_default')).GetDefault() != 'CURRENT_TIMESTAMP':
         ds.ExecuteSQL("DELLAYER:" + lyr_name)
-        gdaltest.post_reason('fail')
         return 'fail'
     f = lyr.GetNextFeature()
     if f is None or f.GetField('field_string') != 'a\'b' or not f.IsFieldSet('field_datetime_with_default'):
-        gdaltest.post_reason('fail')
         ds.ExecuteSQL("DELLAYER:" + lyr_name)
         return 'fail'
     ds.ExecuteSQL("DELLAYER:" + lyr_name)
diff --git a/autotest/ogr/ogr_couchdb.py b/autotest/ogr/ogr_couchdb.py
index 83e00280e880..61a0904b50dd 100755
--- a/autotest/ogr/ogr_couchdb.py
+++ b/autotest/ogr/ogr_couchdb.py
@@ -82,7 +82,6 @@ def test_ogr_couchdb_1():
     lyr = ds.GetLayerByName(ogrtest.couchdb_temp_layer_name)
     f = lyr.GetNextFeature()
     if f['AREA'] != 215229.266 or f['EAS_ID'] != '168' or f.GetGeometryRef() is None:
-        gdaltest.post_reason('fail')
         f.DumpReadable()
         return 'fail'
     ds.ExecuteSQL('DELLAYER:' + ogrtest.couchdb_temp_layer_name)
@@ -116,19 +115,16 @@ def test_ogr_couchdb_2():
 
     f = lyr.GetNextFeature()
     if f['str_field'] != 'foo':
-        gdaltest.post_reason('fail')
         f.DumpReadable()
         return 'fail'
 
     f = lyr.GetNextFeature()
     if f['str_field'] is not None:
-        gdaltest.post_reason('fail')
         f.DumpReadable()
         return 'fail'
 
     f = lyr.GetNextFeature()
     if f.IsFieldSet('str_field'):
-        gdaltest.post_reason('fail')
         f.DumpReadable()
         return 'fail'
 
diff --git a/autotest/ogr/ogr_csv.py b/autotest/ogr/ogr_csv.py
index 43aed35ae336..ab187208bff0 100755
--- a/autotest/ogr/ogr_csv.py
+++ b/autotest/ogr/ogr_csv.py
@@ -90,10 +90,8 @@ def test_ogr_csv_2():
 
     with gdaltest.error_handler():
         if gdaltest.csv_ds.CreateLayer('foo') is not None:
-            gdaltest.post_reason('fail')
             return 'fail'
         if gdaltest.csv_ds.DeleteLayer(0) == 0:
-            gdaltest.post_reason('fail')
             return 'fail'
 
     lyr = gdaltest.csv_ds.GetLayerByName('prime_meridian')
@@ -101,10 +99,8 @@ def test_ogr_csv_2():
     f = ogr.Feature(lyr.GetLayerDefn())
     with gdaltest.error_handler():
         if lyr.CreateField(ogr.FieldDefn('foo')) == 0:
-            gdaltest.post_reason('fail')
             return 'fail'
         if lyr.CreateFeature(f) == 0:
-            gdaltest.post_reason('fail')
             return 'fail'
 
     return ogr_csv_check_layer(lyr, False)
@@ -177,14 +173,12 @@ def test_ogr_csv_3():
     if False:  # pylint: disable=using-constant-test
         # Check that we cannot add a new field now
         if gdaltest.csv_lyr1.TestCapability(ogr.OLCCreateField) != 0:
-            gdaltest.post_reason('fail')
             return 'fail'
         field_defn = ogr.FieldDefn('dummy', ogr.OFTString)
         gdal.PushErrorHandler('CPLQuietErrorHandler')
         ret = gdaltest.csv_lyr1.CreateField(field_defn)
         gdal.PopErrorHandler()
         if ret == 0:
-            gdaltest.post_reason('fail')
             return 'fail'
 
     return 'success'
@@ -255,10 +249,8 @@ def test_ogr_csv_7():
 
     with gdaltest.error_handler():
         if gdaltest.csv_tmpds.DeleteLayer(-1) == 0:
-            gdaltest.post_reason('fail')
             return 'fail'
         if gdaltest.csv_tmpds.DeleteLayer(gdaltest.csv_tmpds.GetLayerCount()) == 0:
-            gdaltest.post_reason('fail')
             return 'fail'
 
     gdaltest.csv_tmpds = None
@@ -536,7 +528,6 @@ def test_ogr_csv_12():
 
     with gdaltest.error_handler():
         if gdaltest.csv_tmpds.CreateLayer('testcsvt_copy') is not None:
-            gdaltest.post_reason('fail')
             return 'fail'
 
     #######################################################
@@ -1050,15 +1041,12 @@ def test_ogr_csv_24():
     ds = ogr.Open('/vsimem/single.csv')
     lyr = ds.GetLayer(0)
     if lyr.GetLayerDefn().GetFieldCount() != 1:
-        gdaltest.post_reason('fail')
         return 'fail'
     feat = lyr.GetNextFeature()
     if feat.GetField(0) != '':
-        gdaltest.post_reason('fail')
         return 'fail'
     feat = lyr.GetNextFeature()
     if feat.GetField(0) != 'bar':
-        gdaltest.post_reason('fail')
         return 'fail'
     ds = None
 
@@ -1135,7 +1123,6 @@ def test_ogr_csv_27():
     lyr = ds.GetLayer(0)
     layer_defn = lyr.GetLayerDefn()
     if layer_defn.GetFieldCount() != 8:
-        gdaltest.post_reason('fail')
         return 'fail'
 
     expected_fields = [('unit', ogr.OFTString),
@@ -1152,12 +1139,10 @@ def test_ogr_csv_27():
         if fld.GetName() != expected_field[0]:
             print(fld.GetName())
             print(expected_field[0])
-            gdaltest.post_reason('fail')
             return 'fail'
         if fld.GetType() != expected_field[1]:
             print(fld.GetType())
             print(expected_field[1])
-            gdaltest.post_reason('fail')
             return 'fail'
         i = i + 1
 
@@ -1171,7 +1156,6 @@ def test_ogr_csv_27():
        feat.GetField('time_2012') != 2.34 or \
        feat.IsFieldSet('time_2012_flag'):
         feat.DumpReadable()
-        gdaltest.post_reason('fail')
         return 'fail'
 
     return 'success'
@@ -1196,7 +1180,6 @@ def test_ogr_csv_28():
     os.unlink('tmp/ogr_csv_28.csv')
 
     if data != '1,2\n':
-        gdaltest.post_reason('fail')
         print(data)
         return 'fail'
 
@@ -1210,18 +1193,14 @@ def test_ogr_csv_29():
 
     ds = ogr.GetDriverByName('CSV').CreateDataSource('tmp/ogr_csv_29', options=['GEOMETRY=AS_WKT'])
     if ds.TestCapability(ogr.ODsCCurveGeometries) != 1:
-        gdaltest.post_reason('fail')
         return 'fail'
     lyr = ds.CreateLayer('test', geom_type=ogr.wkbNone)
     if lyr.CreateGeomField(ogr.GeomFieldDefn("geom__WKT_lyr1_EPSG_4326", ogr.wkbPoint)) != 0:
-        gdaltest.post_reason('fail')
         return 'fail'
     if lyr.CreateGeomField(ogr.GeomFieldDefn("geom__WKT_lyr2_EPSG_32632", ogr.wkbPolygon)) != 0:
-        gdaltest.post_reason('fail')
         return 'fail'
     with gdaltest.error_handler():
         if lyr.CreateGeomField(ogr.GeomFieldDefn("geom__WKT_lyr2_EPSG_32632", ogr.wkbPolygon)) == 0:
-            gdaltest.post_reason('fail')
             return 'fail'
     ds = None
 
@@ -1236,26 +1215,21 @@ def test_ogr_csv_29():
     ds = ogr.Open('tmp/ogr_csv_29')
     lyr = ds.GetLayerByName('test')
     if lyr.GetLayerDefn().GetGeomFieldCount() != 2:
-        gdaltest.post_reason('fail')
         return 'fail'
     srs = lyr.GetLayerDefn().GetGeomFieldDefn(0).GetSpatialRef()
     if srs.GetAuthorityCode(None) != '4326':
-        gdaltest.post_reason('fail')
         return 'fail'
     srs = lyr.GetLayerDefn().GetGeomFieldDefn(1).GetSpatialRef()
     if srs.GetAuthorityCode(None) != '32632':
-        gdaltest.post_reason('fail')
         return 'fail'
     feat = lyr.GetNextFeature()
     geom = feat.GetGeomFieldRef('geom__WKT_lyr1_EPSG_4326')
     if geom.ExportToWkt() != 'POINT (1 2)':
         feat.DumpReadable()
-        gdaltest.post_reason('fail')
         return 'fail'
     geom = feat.GetGeomFieldRef('geom__WKT_lyr2_EPSG_32632')
     if geom.ExportToWkt() != 'POLYGON ((0 0,0 1,1 1,1 0,0 0))':
         feat.DumpReadable()
-        gdaltest.post_reason('fail')
         return 'fail'
     ds = None
 
@@ -1290,19 +1264,16 @@ def test_ogr_csv_31():
     f = lyr.GetNextFeature()
     if f.GetField('GEONAMEID') != '3038814' or f.GetField('LATITUDE') != 42.5 or \
        f.GetGeometryRef().ExportToWkt() != 'POINT (1.48333 42.5)':
-        gdaltest.post_reason('fail')
         f.DumpReadable()
         return 'fail'
 
     lyr.ResetReading()
     f = lyr.GetNextFeature()
     if f.GetField('GEONAMEID') != '3038814':
-        gdaltest.post_reason('fail')
         f.DumpReadable()
         return 'fail'
 
     if lyr.GetFeatureCount() != 10:
-        gdaltest.post_reason('fail')
         print(lyr.GetFeatureCount())
         return 'fail'
 
@@ -1324,13 +1295,11 @@ def test_ogr_csv_32():
     for i in range(lyr.GetLayerDefn().GetFieldCount()):
         if lyr.GetLayerDefn().GetFieldDefn(i).GetType() != ogr.OFTString or \
            lyr.GetLayerDefn().GetFieldDefn(i).GetWidth() != 0:
-            gdaltest.post_reason('fail')
             print(i)
             print(lyr.GetLayerDefn().GetFieldDefn(i).GetType())
             print(lyr.GetLayerDefn().GetFieldDefn(i).GetWidth())
             return 'fail'
         if f.GetField(i) != col_values[i]:
-            gdaltest.post_reason('fail')
             print(i)
             f.DumpReadable()
             return 'fail'
@@ -1343,13 +1312,11 @@ def test_ogr_csv_32():
     for i in range(lyr.GetLayerDefn().GetFieldCount()):
         if lyr.GetLayerDefn().GetFieldDefn(i).GetType() != ogr.OFTString or \
            lyr.GetLayerDefn().GetFieldDefn(i).GetWidth() != 0:
-            gdaltest.post_reason('fail')
             print(i)
             print(lyr.GetLayerDefn().GetFieldDefn(i).GetType())
             print(lyr.GetLayerDefn().GetFieldDefn(i).GetWidth())
             return 'fail'
         if f.GetField(i) != col_values[i]:
-            gdaltest.post_reason('fail')
             print(i)
             f.DumpReadable()
             return 'fail'
@@ -1367,13 +1334,11 @@ def test_ogr_csv_32():
     for i in range(lyr.GetLayerDefn().GetFieldCount()):
         if lyr.GetLayerDefn().GetFieldDefn(i).GetType() != col_type[i] or \
            lyr.GetLayerDefn().GetFieldDefn(i).GetWidth() != 0:
-            gdaltest.post_reason('fail')
             print(i)
             print(lyr.GetLayerDefn().GetFieldDefn(i).GetType())
             print(lyr.GetLayerDefn().GetFieldDefn(i).GetWidth())
             return 'fail'
         if f.GetField(i) != col_values[i]:
-            gdaltest.post_reason('fail')
             print(i)
             f.DumpReadable()
             return 'fail'
@@ -1383,7 +1348,6 @@ def test_ogr_csv_32():
                      open_options=['AUTODETECT_TYPE=YES', 'AUTODETECT_SIZE_LIMIT=300'])
     lyr = ds.GetLayer(0)
     if lyr.GetLayerDefn().GetFieldDefn(lyr.GetLayerDefn().GetFieldIndex('str3')).GetType() != ogr.OFTInteger:
-        gdaltest.post_reason('fail')
         return 'fail'
 
     # We limit to the first 2 lines
@@ -1399,13 +1363,11 @@ def test_ogr_csv_32():
     for i in range(lyr.GetLayerDefn().GetFieldCount()):
         if lyr.GetLayerDefn().GetFieldDefn(i).GetType() != col_type[i] or \
            lyr.GetLayerDefn().GetFieldDefn(i).GetWidth() != 0:
-            gdaltest.post_reason('fail')
             print(i)
             print(lyr.GetLayerDefn().GetFieldDefn(i).GetType())
             print(lyr.GetLayerDefn().GetFieldDefn(i).GetWidth())
             return 'fail'
         if f.GetField(i) != col_values[i]:
-            gdaltest.post_reason('fail')
             print(i)
             f.DumpReadable()
             return 'fail'
@@ -1422,14 +1384,12 @@ def test_ogr_csv_32():
         if lyr.GetLayerDefn().GetFieldDefn(i).GetType() != col_type[i] or \
            lyr.GetLayerDefn().GetFieldDefn(i).GetWidth() != col_width[i] or \
            lyr.GetLayerDefn().GetFieldDefn(i).GetPrecision() != col_precision[i]:
-            gdaltest.post_reason('fail')
             print(i)
             print(lyr.GetLayerDefn().GetFieldDefn(i).GetType())
             print(lyr.GetLayerDefn().GetFieldDefn(i).GetWidth())
             print(lyr.GetLayerDefn().GetFieldDefn(i).GetPrecision())
             return 'fail'
         if f.GetField(i) != col_values[i]:
-            gdaltest.post_reason('fail')
             print(i)
             f.DumpReadable()
             return 'fail'
@@ -1446,14 +1406,12 @@ def test_ogr_csv_32():
         if lyr.GetLayerDefn().GetFieldDefn(i).GetType() != col_type[i] or \
            lyr.GetLayerDefn().GetFieldDefn(i).GetWidth() != col_width[i] or \
            lyr.GetLayerDefn().GetFieldDefn(i).GetPrecision() != col_precision[i]:
-            gdaltest.post_reason('fail')
             print(i)
             print(lyr.GetLayerDefn().GetFieldDefn(i).GetType())
             print(lyr.GetLayerDefn().GetFieldDefn(i).GetWidth())
             print(lyr.GetLayerDefn().GetFieldDefn(i).GetPrecision())
             return 'fail'
         if f.GetField(i) != col_values[i]:
-            gdaltest.post_reason('fail')
             print(i)
             f.DumpReadable()
             return 'fail'
@@ -1471,13 +1429,11 @@ def test_ogr_csv_32():
     for i in range(lyr.GetLayerDefn().GetFieldCount()):
         if lyr.GetLayerDefn().GetFieldDefn(i).GetType() != ogr.OFTString and \
            lyr.GetLayerDefn().GetFieldDefn(i + 1).GetNameRef() != lyr.GetLayerDefn().GetFieldDefn(i).GetNameRef() + '_original':
-            gdaltest.post_reason('fail')
             print(i)
             print(lyr.GetLayerDefn().GetFieldDefn(i).GetNameRef())
             print(lyr.GetLayerDefn().GetFieldDefn(i + 1).GetNameRef())
             return 'fail'
         if f.GetField(i) != col_values[i]:
-            gdaltest.post_reason('fail')
             print(i)
             f.DumpReadable()
             return 'fail'
@@ -1499,7 +1455,6 @@ def test_ogr_csv_32():
         lyr.GetFeature(fid)
         gdal.PopErrorHandler()
         if gdal.GetLastErrorType() != gdal.CE_Warning:
-            gdaltest.post_reason('fail')
             print(fid)
             f.DumpReadable()
             return 'fail'
@@ -1515,7 +1470,6 @@ def test_ogr_csv_32():
     lyr = ds.GetLayer(0)
     f = lyr.GetNextFeature()
     if f.GetField(0) != 1.2:
-        gdaltest.post_reason('fail')
         f.DumpReadable()
         return 'fail'
 
@@ -1535,12 +1489,10 @@ def test_ogr_csv_33():
     for i in range(lyr.GetLayerDefn().GetFieldCount()):
         if (i < 10 and lyr.GetLayerDefn().GetFieldDefn(i).GetSubType() != ogr.OFSTBoolean) or \
            (i >= 10 and lyr.GetLayerDefn().GetFieldDefn(i).GetSubType() == ogr.OFSTBoolean):
-            gdaltest.post_reason('fail')
             print(i)
             print(lyr.GetLayerDefn().GetFieldDefn(i).GetSubType())
             return 'fail'
         if f.GetField(i) != col_values[i]:
-            gdaltest.post_reason('fail')
             print(i)
             f.DumpReadable()
             return 'fail'
@@ -1569,19 +1521,15 @@ def test_ogr_csv_33():
     lyr = ds.GetLayer(0)
     if lyr.GetLayerDefn().GetFieldDefn(0).GetType() != ogr.OFTInteger or \
        lyr.GetLayerDefn().GetFieldDefn(0).GetSubType() != ogr.OFSTBoolean:
-        gdaltest.post_reason('fail')
         return 'fail'
     if lyr.GetLayerDefn().GetFieldDefn(1).GetType() != ogr.OFTInteger or \
        lyr.GetLayerDefn().GetFieldDefn(1).GetSubType() != ogr.OFSTInt16:
-        gdaltest.post_reason('fail')
         return 'fail'
     if lyr.GetLayerDefn().GetFieldDefn(2).GetType() != ogr.OFTReal or \
        lyr.GetLayerDefn().GetFieldDefn(2).GetSubType() != ogr.OFSTFloat32:
-        gdaltest.post_reason('fail')
         return 'fail'
     f = lyr.GetNextFeature()
     if f.GetField(0) != 1 or f.GetField(1) != -32768 or f.GetField(2) != 1.23:
-        gdaltest.post_reason('fail')
         f.DumpReadable()
         return 'fail'
     ds = None
@@ -1604,7 +1552,6 @@ def test_ogr_csv_34():
     col_values = [1, 10000000000, 10000000000, 10000000000.0]
     for i in range(lyr.GetLayerDefn().GetFieldCount()):
         if f.GetField(i) != col_values[i]:
-            gdaltest.post_reason('fail')
             print(i)
             f.DumpReadable()
             return 'fail'
@@ -1612,7 +1559,6 @@ def test_ogr_csv_34():
     col_values = [10000000000, 1, 10000000000, 1.0]
     for i in range(lyr.GetLayerDefn().GetFieldCount()):
         if f.GetField(i) != col_values[i]:
-            gdaltest.post_reason('fail')
             print(i)
             f.DumpReadable()
             return 'fail'
@@ -1632,7 +1578,6 @@ def test_ogr_csv_34():
     lyr = ds.GetLayer(0)
     f = lyr.GetNextFeature()
     if f.GetField(0) != 10000000000:
-        gdaltest.post_reason('fail')
         f.DumpReadable()
         return 'fail'
     ds = None
@@ -1658,7 +1603,6 @@ def test_ogr_csv_35():
     lyr = ds.GetLayer(0)
     f = lyr.GetNextFeature()
     if f['FIELD_1'] != 'VAL1' or f['FIELD 2'] != 'VAL 2' or f['FIELD_3'] != 'VAL 3':
-        gdaltest.post_reason('fail')
         f.DumpReadable()
         return 'fail'
     ds = None
@@ -1680,7 +1624,6 @@ def test_ogr_csv_35():
     gdal.VSIFCloseL(f)
 
     if data.find('FIELD_1 "FIELD 2"') < 0 or data.find('VAL1 "VAL 2"') < 0:
-        gdaltest.post_reason('fail')
         print(data)
         return 'fail'
 
@@ -1708,27 +1651,22 @@ def test_ogr_csv_36():
     lyr = ds.GetLayer(0)
     f = lyr.GetNextFeature()
     if f.GetGeometryRef().ExportToWkt() != 'POINT (1 2)' or f['id'] != '1' or f['mygeometry'] != 'POINT(1 2)' or f['format'] != 'wkt':
-        gdaltest.post_reason('fail')
         f.DumpReadable()
         return 'fail'
     f = lyr.GetNextFeature()
     if f.GetGeometryRef().ExportToWkt() != 'POINT (2 49)':
-        gdaltest.post_reason('fail')
         f.DumpReadable()
         return 'fail'
     f = lyr.GetNextFeature()
     if f.GetGeometryRef().ExportToWkt() != 'POINT (3 50)':
-        gdaltest.post_reason('fail')
         f.DumpReadable()
         return 'fail'
     f = lyr.GetNextFeature()
     if f.GetGeometryRef().ExportToWkt() != 'POINT (3 50)':
-        gdaltest.post_reason('fail')
         f.DumpReadable()
         return 'fail'
     f = lyr.GetNextFeature()
     if f.GetGeometryRef() is not None:
-        gdaltest.post_reason('fail')
         f.DumpReadable()
         return 'fail'
     ds = None
@@ -1739,7 +1677,6 @@ def test_ogr_csv_36():
     lyr = ds.GetLayer(0)
     f = lyr.GetNextFeature()
     if f.GetGeometryRef().ExportToWkt() != 'POINT (1 2)':
-        gdaltest.post_reason('fail')
         f.DumpReadable()
         return 'fail'
     ds = None
@@ -1750,7 +1687,6 @@ def test_ogr_csv_36():
     lyr = ds.GetLayer(0)
     f = lyr.GetNextFeature()
     if f.GetGeometryRef().ExportToWkt() != 'POINT (1 2)':
-        gdaltest.post_reason('fail')
         f.DumpReadable()
         return 'fail'
     ds = None
@@ -1761,7 +1697,6 @@ def test_ogr_csv_36():
     lyr = ds.GetLayer(0)
     f = lyr.GetNextFeature()
     if f.GetGeometryRef().ExportToWkt() != 'POINT (1 2)':
-        gdaltest.post_reason('fail')
         f.DumpReadable()
         return 'fail'
     ds = None
@@ -1771,7 +1706,6 @@ def test_ogr_csv_36():
                      open_options=['GEOM_POSSIBLE_NAMES=bla'])
     lyr = ds.GetLayer(0)
     if lyr.GetLayerDefn().GetGeomFieldCount() != 0:
-        gdaltest.post_reason('fail')
         return 'fail'
     ds = None
 
@@ -1780,11 +1714,9 @@ def test_ogr_csv_36():
                      open_options=['GEOM_POSSIBLE_NAMES=mygeometry', 'KEEP_GEOM_COLUMNS=NO'])
     lyr = ds.GetLayer(0)
     if lyr.GetLayerDefn().GetFieldCount() != 2:
-        gdaltest.post_reason('fail')
         return 'fail'
     f = lyr.GetNextFeature()
     if f.GetGeometryRef().ExportToWkt() != 'POINT (1 2)' or f['id'] != '1' or f['format'] != 'wkt':
-        gdaltest.post_reason('fail')
         f.DumpReadable()
         return 'fail'
     ds = None
@@ -1811,17 +1743,14 @@ def test_ogr_csv_37():
     lyr = ds.GetLayer(0)
     f = lyr.GetNextFeature()
     if f.GetGeometryRef().ExportToWkt() != 'POINT (2 49)' or f['id'] != '1' or f['x'] != 2 or f['y'] != 49 or f['other'] != 'a' or f['z'] != '100':
-        gdaltest.post_reason('fail')
         f.DumpReadable()
         return 'fail'
     f = lyr.GetNextFeature()
     if f.GetGeometryRef().ExportToWkt() != 'POINT (3 50)':
-        gdaltest.post_reason('fail')
         f.DumpReadable()
         return 'fail'
     f = lyr.GetNextFeature()
     if f.GetGeometryRef() is not None:
-        gdaltest.post_reason('fail')
         f.DumpReadable()
         return 'fail'
     ds = None
@@ -1832,17 +1761,14 @@ def test_ogr_csv_37():
     lyr = ds.GetLayer(0)
     f = lyr.GetNextFeature()
     if f.GetGeometryRef().ExportToWkt() != 'POINT (2 49 100)' or f['id'] != '1' or f['x'] != 2 or f['y'] != 49 or f['other'] != 'a' or f['z'] != 100:
-        gdaltest.post_reason('fail')
         f.DumpReadable()
         return 'fail'
     f = lyr.GetNextFeature()
     if f.GetGeometryRef().ExportToWkt() != 'POINT (3 50)':
-        gdaltest.post_reason('fail')
         f.DumpReadable()
         return 'fail'
     f = lyr.GetNextFeature()
     if f.GetGeometryRef() is not None:
-        gdaltest.post_reason('fail')
         f.DumpReadable()
         return 'fail'
     ds = None
@@ -1852,11 +1778,9 @@ def test_ogr_csv_37():
                      open_options=['X_POSSIBLE_NAMES=long,x', 'Y_POSSIBLE_NAMES=lat,y', 'KEEP_GEOM_COLUMNS=NO'])
     lyr = ds.GetLayer(0)
     if lyr.GetLayerDefn().GetFieldCount() != 3:
-        gdaltest.post_reason('fail')
         return 'fail'
     f = lyr.GetNextFeature()
     if f.GetGeometryRef().ExportToWkt() != 'POINT (2 49)' or f['id'] != '1' or f['other'] != 'a':
-        gdaltest.post_reason('fail')
         f.DumpReadable()
         return 'fail'
     ds = None
@@ -1885,14 +1809,11 @@ def test_ogr_csv_38():
     ds = ogr.Open('/vsimem/ogr_csv_38.csv')
     lyr = ds.GetLayer(0)
     if lyr.GetLayerDefn().GetGeomFieldDefn(0).GetName() != 'mygeom':
-        gdaltest.post_reason('fail')
         return 'fail'
     if lyr.GetLayerDefn().GetGeomFieldDefn(0).GetSpatialRef().ExportToWkt().find('4326') < 0:
-        gdaltest.post_reason('fail')
         return 'fail'
     f = lyr.GetNextFeature()
     if f.GetGeometryRef().ExportToWkt() != 'POINT (2 49)':
-        gdaltest.post_reason('fail')
         f.DumpReadable()
         return 'fail'
     ds = None
@@ -1922,7 +1843,6 @@ def test_ogr_csv_39():
     lyr = ds.GetLayer(0)
     f = lyr.GetNextFeature()
     if f.GetGeometryRef().ExportToWkt() != 'POINT (2 49)':
-        gdaltest.post_reason('fail')
         f.DumpReadable()
         return 'fail'
     ds = None
@@ -1948,7 +1868,6 @@ def test_ogr_csv_40():
     lyr = ds.GetLayer(0)
     f = lyr.GetNextFeature()
     if f.GetGeometryRef().ExportToWkt() != 'POINT (2 49)' or f['id'] != '1' or f['the_geom'] != '0101000020E61000004486E281C5C257C068B89DDA998F4640':
-        gdaltest.post_reason('fail')
         f.DumpReadable()
         return 'fail'
     f = lyr.GetNextFeature()
@@ -1966,7 +1885,6 @@ def test_ogr_csv_40():
     lyr = ds.GetLayer(0)
     f = lyr.GetNextFeature()
     if f.GetGeometryRef().ExportToWkt().find('POINT (-95.04') < 0 or f['id'] != '1' or f['longitude'] != '2' or f['latitude'] != '49':
-        gdaltest.post_reason('fail')
         f.DumpReadable()
         return 'fail'
     f = lyr.GetNextFeature()
@@ -1992,7 +1910,6 @@ def test_ogr_csv_41():
     lyr = ds.GetLayer(0)
     f = lyr.GetNextFeature()
     if f.GetGeometryRef() is not None or f['id'] != '1' or f['foo'] != 'bar':
-        gdaltest.post_reason('fail')
         f.DumpReadable()
         return 'fail'
     ds = None
@@ -2014,7 +1931,6 @@ def test_ogr_csv_42():
     f = ogr.Feature(lyr.GetLayerDefn())
     f.SetField('id', 1)
     if lyr.CreateFeature(f) != 0:
-        gdaltest.post_reason('fail')
         return 'fail'
     ds = None
 
@@ -2034,80 +1950,63 @@ def test_ogr_csv_43():
     f.SetField('id', 1)
     f.SetGeometry(ogr.CreateGeometryFromWkt('POINT(2 49)'))
     if lyr.CreateFeature(f) != 0:
-        gdaltest.post_reason('fail')
         return 'fail'
     f = None
     lyr.SetNextByIndex(0)
     f = lyr.GetNextFeature()
     if f['id'] != 1:
-        gdaltest.post_reason('fail')
         f.DumpReadable()
         return 'fail'
     f = None
 
     if lyr.TestCapability(ogr.OLCCreateField) != 1:
-        gdaltest.post_reason('fail')
         return 'fail'
     if lyr.CreateField(ogr.FieldDefn('foo', ogr.OFTString)) != 0:
-        gdaltest.post_reason('fail')
         return 'fail'
     with gdaltest.error_handler():
         if lyr.CreateField(ogr.FieldDefn('foo', ogr.OFTString)) == 0:
-            gdaltest.post_reason('fail')
             return 'fail'
     f = lyr.GetFeature(1)
     f.SetField('foo', 'bar')
     if lyr.TestCapability(ogr.OLCRandomWrite) != 1:
-        gdaltest.post_reason('fail')
         return 'fail'
     if lyr.SetFeature(f) != 0:
-        gdaltest.post_reason('fail')
         return 'fail'
     f = lyr.GetFeature(1)
     if f['id'] != 1 or f['foo'] != 'bar' or f.GetGeometryRef().ExportToWkt() != 'POINT (2 49)':
-        gdaltest.post_reason('fail')
         f.DumpReadable()
         return 'fail'
     lyr.ResetReading()
     f = lyr.GetNextFeature()
     if f['id'] != 1 or f['foo'] != 'bar' or f.GetGeometryRef().ExportToWkt() != 'POINT (2 49)':
-        gdaltest.post_reason('fail')
         f.DumpReadable()
         return 'fail'
     f = lyr.GetNextFeature()
     if f is not None:
-        gdaltest.post_reason('fail')
         return 'fail'
     if lyr.GetFeatureCount() != 1:
-        gdaltest.post_reason('fail')
         return 'fail'
     f = ogr.Feature(lyr.GetLayerDefn())
     f.SetField('id', 2)
     f.SetGeometry(ogr.CreateGeometryFromWkt('POINT(3 50)'))
     f.SetField('foo', 'baz')
     if lyr.CreateFeature(f) != 0:
-        gdaltest.post_reason('fail')
         return 'fail'
     if f.GetFID() != 2:
-        gdaltest.post_reason('fail')
         return 'fail'
     f = lyr.GetFeature(2)
     if f['id'] != 2 or f['foo'] != 'baz' or f.GetGeometryRef().ExportToWkt() != 'POINT (3 50)':
-        gdaltest.post_reason('fail')
         f.DumpReadable()
         return 'fail'
     if lyr.GetFeatureCount() != 2:
-        gdaltest.post_reason('fail')
         return 'fail'
     lyr.SetNextByIndex(1)
     f = lyr.GetNextFeature()
     if f['id'] != 2:
-        gdaltest.post_reason('fail')
         f.DumpReadable()
         return 'fail'
     f = lyr.GetNextFeature()
     if f is not None:
-        gdaltest.post_reason('fail')
         f.DumpReadable()
         return 'fail'
     f = None
@@ -2118,66 +2017,49 @@ def test_ogr_csv_43():
     lyr = ds.GetLayer(0)
     f = lyr.GetFeature(2)
     if f['id'] != 2 or f['foo'] != 'baz' or f.GetGeometryRef().ExportToWkt() != 'POINT (3 50)':
-        gdaltest.post_reason('fail')
         f.DumpReadable()
         return 'fail'
     f = None
     if lyr.TestCapability(ogr.OLCDeleteField) != 1:
-        gdaltest.post_reason('fail')
         return 'fail'
     with gdaltest.error_handler():
         if lyr.DeleteField(-1) == 0:
-            gdaltest.post_reason('fail')
             return 'fail'
     if lyr.DeleteField(lyr.GetLayerDefn().GetFieldIndex('foo')) != 0:
-        gdaltest.post_reason('fail')
         return 'fail'
     if lyr.TestCapability(ogr.OLCDeleteFeature) != 1:
-        gdaltest.post_reason('fail')
         return 'fail'
     if lyr.DeleteFeature(2) != 0:
-        gdaltest.post_reason('fail')
         return 'fail'
     if lyr.DeleteFeature(2) != ogr.OGRERR_NON_EXISTING_FEATURE:
-        gdaltest.post_reason('fail')
         return 'fail'
     if lyr.DeleteFeature(3) != ogr.OGRERR_NON_EXISTING_FEATURE:
-        gdaltest.post_reason('fail')
         return 'fail'
     if lyr.GetFeature(2) is not None:
-        gdaltest.post_reason('fail')
         return 'fail'
     if lyr.GetFeature(3) is not None:
-        gdaltest.post_reason('fail')
         return 'fail'
     lyr.ResetReading()
     f = lyr.GetNextFeature()
     if f is None:
-        gdaltest.post_reason('fail')
         return 'fail'
     f = lyr.GetNextFeature()
     if f is not None:
-        gdaltest.post_reason('fail')
         return 'fail'
     f = ogr.Feature(lyr.GetLayerDefn())
     f['id'] = 3
     if lyr.CreateFeature(f) != 0:
-        gdaltest.post_reason('fail')
         return 'fail'
     if f.GetFID() != 3:
-        gdaltest.post_reason('fail')
         return 'fail'
     f = None
     if lyr.CreateField(ogr.FieldDefn('foo', ogr.OFTString)) != 0:
-        gdaltest.post_reason('fail')
         return 'fail'
     f = lyr.GetFeature(1)
     if f['foo'] == 'bar':
-        gdaltest.post_reason('fail')
         return 'fail'
     f = lyr.GetFeature(3)
     if f.GetFID() != 3:
-        gdaltest.post_reason('fail')
         return 'fail'
     f = None
     ds = None
@@ -2186,30 +2068,23 @@ def test_ogr_csv_43():
     lyr = ds.GetLayer(0)
     f = lyr.GetFeature(2)
     if f['id'] != 3:
-        gdaltest.post_reason('fail')
         f.DumpReadable()
         return 'fail'
     f = None
     if lyr.DeleteField(lyr.GetLayerDefn().GetFieldIndex('foo')) != 0:
-        gdaltest.post_reason('fail')
         return 'fail'
     f = ogr.Feature(lyr.GetLayerDefn())
     f.SetGeometry(ogr.CreateGeometryFromWkt('POINT(4 51)'))
     if lyr.CreateFeature(f) != 0:
-        gdaltest.post_reason('fail')
         return 'fail'
     if f.GetFID() != 3:
-        gdaltest.post_reason('fail')
         f.DumpReadable()
         return 'fail'
     if lyr.GetExtent() != (2.0, 4.0, 49.0, 51.0):
-        gdaltest.post_reason('fail')
         return 'fail'
     if lyr.DeleteFeature(f.GetFID()) != 0:
-        gdaltest.post_reason('fail')
         return 'fail'
     if lyr.GetFeatureCount() != 2:
-        gdaltest.post_reason('fail')
         return 'fail'
 
     with gdaltest.error_handler():
@@ -2221,74 +2096,57 @@ def test_ogr_csv_43():
     lyr.SetSpatialFilter(0, lyr.GetSpatialFilter())
     lyr.SetSpatialFilter(lyr.GetSpatialFilter())
     if lyr.GetFeatureCount() != 1:
-        gdaltest.post_reason('fail')
         return 'fail'
     if lyr.GetExtent() != (2.0, 2.0, 49.0, 49.0):
-        gdaltest.post_reason('fail')
         return 'fail'
     if lyr.GetExtent(geom_field=0) != (2.0, 2.0, 49.0, 49.0):
-        gdaltest.post_reason('fail')
         return 'fail'
     with gdaltest.error_handler():
         lyr.GetExtent(geom_field=-1)
     lyr.SetAttributeFilter(None)
 
     if lyr.TestCapability(ogr.OLCCurveGeometries) != 1:
-        gdaltest.post_reason('fail')
         return 'fail'
     if lyr.TestCapability(ogr.OLCTransactions) != 0:
-        gdaltest.post_reason('fail')
         return 'fail'
     lyr.StartTransaction()
     lyr.RollbackTransaction()
     lyr.CommitTransaction()
 
     if lyr.GetGeometryColumn() != '':
-        gdaltest.post_reason('fail')
         return 'fail'
     if lyr.GetFIDColumn() != '':
-        gdaltest.post_reason('fail')
         return 'fail'
 
     if lyr.TestCapability(ogr.OLCReorderFields) != 1:
-        gdaltest.post_reason('fail')
         return 'fail'
     if lyr.ReorderFields([0, 1]) != 0:
-        gdaltest.post_reason('fail')
         return 'fail'
     with gdaltest.error_handler():
         if lyr.ReorderFields([0, -1]) == 0:
-            gdaltest.post_reason('fail')
             return 'fail'
 
     if lyr.TestCapability(ogr.OLCAlterFieldDefn) != 1:
-        gdaltest.post_reason('fail')
         return 'fail'
     fld_defn = lyr.GetLayerDefn().GetFieldDefn(0)
     if lyr.AlterFieldDefn(0, fld_defn, 0) != 0:
-        gdaltest.post_reason('fail')
         return 'fail'
     with gdaltest.error_handler():
         if lyr.AlterFieldDefn(-1, fld_defn, 0) == 0:
-            gdaltest.post_reason('fail')
             return 'fail'
 
     f = lyr.GetFeature(2)
     f.SetGeomField(0, ogr.CreateGeometryFromWkt('POINT (1 2)'))
     if lyr.SetFeature(f) != 0:
-        gdaltest.post_reason('fail')
         return 'fail'
     f = None
     if lyr.TestCapability(ogr.OLCCreateGeomField) != 1:
-        gdaltest.post_reason('fail')
         return 'fail'
     if lyr.CreateGeomField(ogr.GeomFieldDefn('geom__WKT_2')) != 0:
-        gdaltest.post_reason('fail')
         return 'fail'
     f = lyr.GetFeature(2)
     f.SetGeomField(1, ogr.CreateGeometryFromWkt('POINT (3 4)'))
     if lyr.SetFeature(f) != 0:
-        gdaltest.post_reason('fail')
         return 'fail'
 
     f = None
@@ -2298,21 +2156,16 @@ def test_ogr_csv_43():
     lyr = ds.GetLayer(0)
     f = lyr.GetFeature(2)
     if f['WKT'] != 'POINT (1 2)' or f['_WKT_2'] != 'POINT (3 4)':
-        gdaltest.post_reason('fail')
         f.DumpReadable()
         return 'fail'
     if lyr.SetFeature(f) != 0:
-        gdaltest.post_reason('fail')
         return 'fail'
     f = None
     if lyr.DeleteFeature(2) != 0:
-        gdaltest.post_reason('fail')
         return 'fail'
     if lyr.GetFeature(2) is not None:
-        gdaltest.post_reason('fail')
         return 'fail'
     if lyr.DeleteFeature(2) != ogr.OGRERR_NON_EXISTING_FEATURE:
-        gdaltest.post_reason('fail')
         return 'fail'
     ds = None
 
@@ -2333,22 +2186,18 @@ def test_ogr_csv_44():
     f.SetField('id', 1)
     f.SetGeometry(ogr.CreateGeometryFromWkt('POINT(2 49)'))
     if lyr.CreateFeature(f) != 0:
-        gdaltest.post_reason('fail')
         return 'fail'
     f = None
     f = lyr.GetFeature(1)
     if f['id'] != 1 or f.GetGeometryRef().ExportToWkt() != 'POINT (2 49)':
-        gdaltest.post_reason('fail')
         f.DumpReadable()
         return 'fail'
     f = ogr.Feature(lyr.GetLayerDefn())
     f.SetField('id', 2)
     if lyr.CreateFeature(f) != 0:
-        gdaltest.post_reason('fail')
         return 'fail'
     f = lyr.GetFeature(2)
     if f['id'] != 2 or f.GetGeometryRef() is not None:
-        gdaltest.post_reason('fail')
         f.DumpReadable()
         return 'fail'
     ds = None
@@ -2415,11 +2264,9 @@ def test_ogr_csv_46():
     ds = ogr.Open('/vsimem/ogr_csv_46.csv')
     lyr = ds.GetLayer(0)
     if lyr.GetLayerDefn().GetFieldCount() != 4:
-        gdaltest.post_reason('fail')
         return 'fail'
     f = lyr.GetNextFeature()
     if f['id'] != '1' or f['X'] != '10' or f['Y'] != '20' or f['Z'] != '3':
-        gdaltest.post_reason('fail')
         f.DumpReadable()
         return 'fail'
     ds = None
@@ -2435,11 +2282,9 @@ def test_ogr_csv_46():
     ds = ogr.Open('/vsimem/ogr_csv_46.csv')
     lyr = ds.GetLayer(0)
     if lyr.GetLayerDefn().GetFieldCount() != 4:
-        gdaltest.post_reason('fail')
         return 'fail'
     f = lyr.GetNextFeature()
     if f['id'] != '1' or f['X'] != '-10' or f['Y'] != '-20' or f['Z'] != '3':
-        gdaltest.post_reason('fail')
         f.DumpReadable()
         return 'fail'
     ds = None
@@ -2455,11 +2300,9 @@ def test_ogr_csv_46():
     ds = ogr.Open('/vsimem/ogr_csv_46.csv')
     lyr = ds.GetLayer(0)
     if lyr.GetLayerDefn().GetFieldCount() != 4:
-        gdaltest.post_reason('fail')
         return 'fail'
     f = lyr.GetNextFeature()
     if f['id'] != '1' or f['X'] != '-1' or f['Y'] != '-2' or f['Z'] != '-3':
-        gdaltest.post_reason('fail')
         f.DumpReadable()
         return 'fail'
     ds = None
@@ -2476,11 +2319,9 @@ def test_ogr_csv_47():
 
     ds = ogr.GetDriverByName('CSV').CreateDataSource('/vsimem/ogr_csv_47.csv')
     if ds.TestCapability(ogr.ODsCMeasuredGeometries) != 1:
-        gdaltest.post_reason('fail')
         return 'fail'
     lyr = ds.CreateLayer('ogr_csv_47', options=['GEOMETRY=AS_WKT'])
     if lyr.TestCapability(ogr.OLCMeasuredGeometries) != 1:
-        gdaltest.post_reason('fail')
         return 'fail'
     lyr.CreateField(ogr.FieldDefn('id', ogr.OFTInteger))
     f = ogr.Feature(lyr.GetLayerDefn())
@@ -2494,7 +2335,6 @@ def test_ogr_csv_47():
     lyr = ds.GetLayer(0)
     f = lyr.GetNextFeature()
     if f.GetGeometryRef().ExportToIsoWkt() != 'POINT ZM (1 2 3 4)':
-        gdaltest.post_reason('fail')
         f.DumpReadable()
         return 'fail'
     ds = None
@@ -2522,7 +2362,6 @@ def test_ogr_csv_48():
     gdal.VSIFCloseL(f)
 
     if data.find('stringlist,intlist,int64list,reallist\n"[ ""a"", """" ]",[ 1 ],[ 1234567890123 ],[ 0.125') != 0:
-        gdaltest.post_reason('fail')
         print(data)
         return 'fail'
 
@@ -2531,7 +2370,6 @@ def test_ogr_csv_48():
     gdal.VSIFCloseL(f)
 
     if data.find('JSonStringList,JSonIntegerList,JSonInteger64List,JSonRealList') != 0:
-        gdaltest.post_reason('fail')
         print(data)
         return 'fail'
 
@@ -2556,7 +2394,6 @@ def test_ogr_csv_49():
     lyr = ds.GetLayer(0)
     f = lyr.GetNextFeature()
     if not f.IsFieldNull('str'):
-        gdaltest.post_reason('fail')
         f.DumpReadable()
         return 'fail'
     ds = None
@@ -2592,7 +2429,6 @@ def test_ogr_csv_string_quoting_always():
     gdal.VSIFCloseL(f)
 
     if data.find('"AREA","EAS_ID","PRFEDEA"\n215229.266,"168","35043411"') != 0:
-        gdaltest.post_reason('fail')
         print(data)
         return 'fail'
 
@@ -2607,7 +2443,6 @@ def test_ogr_csv_string_quoting_always():
     gdal.VSIFCloseL(f)
 
     if data.find('"AREA","EAS_ID","PRFEDEA"\n215229.266,"168","35043411"\n247328.172,"179","35043423"') != 0:
-        gdaltest.post_reason('fail')
         print(data)
         return 'fail'
 
@@ -2641,7 +2476,6 @@ def test_ogr_csv_string_quoting_if_ambiguous():
     gdal.VSIFCloseL(f)
 
     if data.find('"00123",x,"1.25"') < 0:
-        gdaltest.post_reason('fail')
         print(data)
         return 'fail'
 
@@ -2674,7 +2508,6 @@ def test_ogr_csv_string_quoting_if_needed():
     gdal.VSIFCloseL(f)
 
     if data.find('00123,x,1.25') < 0:
-        gdaltest.post_reason('fail')
         print(data)
         return 'fail'
 
diff --git a/autotest/ogr/ogr_csw.py b/autotest/ogr/ogr_csw.py
index 7b8178072cb7..1a69504c6cc9 100755
--- a/autotest/ogr/ogr_csw.py
+++ b/autotest/ogr/ogr_csw.py
@@ -116,10 +116,8 @@ def test_ogr_csw_vsimem_fail_because_empty_response():
     ds = ogr.Open('CSW:/vsimem/csw_endpoint')
     gdal.PopErrorHandler()
     if ds is not None:
-        gdaltest.post_reason('fail')
         return 'fail'
     if gdal.GetLastErrorMsg().find('Empty content returned by server') < 0:
-        gdaltest.post_reason('fail')
         print(gdal.GetLastErrorMsg())
         return 'fail'
 
@@ -137,10 +135,8 @@ def test_ogr_csw_vsimem_fail_because_no_CSW_Capabilities():
     ds = ogr.Open('CSW:/vsimem/csw_endpoint')
     gdal.PopErrorHandler()
     if ds is not None:
-        gdaltest.post_reason('fail')
         return 'fail'
     if gdal.GetLastErrorMsg().find('Cannot find Capabilities.version') < 0:
-        gdaltest.post_reason('fail')
         print(gdal.GetLastErrorMsg())
         return 'fail'
 
@@ -158,10 +154,8 @@ def test_ogr_csw_vsimem_fail_because_exception():
     ds = ogr.Open('CSW:/vsimem/csw_endpoint')
     gdal.PopErrorHandler()
     if ds is not None:
-        gdaltest.post_reason('fail')
         return 'fail'
     if gdal.GetLastErrorMsg().find('Error returned by server : <ServiceExceptionReport/>') < 0:
-        gdaltest.post_reason('fail')
         print(gdal.GetLastErrorMsg())
         return 'fail'
 
@@ -179,10 +173,8 @@ def test_ogr_csw_vsimem_fail_because_invalid_xml_capabilities():
     ds = ogr.Open('CSW:/vsimem/csw_endpoint')
     gdal.PopErrorHandler()
     if ds is not None:
-        gdaltest.post_reason('fail')
         return 'fail'
     if gdal.GetLastErrorMsg().find('Invalid XML content : <invalid_xml') < 0:
-        gdaltest.post_reason('fail')
         print(gdal.GetLastErrorMsg())
         return 'fail'
 
@@ -202,10 +194,8 @@ def test_ogr_csw_vsimem_fail_because_missing_version():
     ds = ogr.Open('CSW:/vsimem/csw_endpoint')
     gdal.PopErrorHandler()
     if ds is not None:
-        gdaltest.post_reason('fail')
         return 'fail'
     if gdal.GetLastErrorMsg().find('Cannot find Capabilities.version') < 0:
-        gdaltest.post_reason('fail')
         print(gdal.GetLastErrorMsg())
         return 'fail'
 
@@ -224,14 +214,11 @@ def test_ogr_csw_vsimem_csw_minimal_instance():
 """)
     ds = ogr.Open('CSW:/vsimem/csw_endpoint')
     if ds is None:
-        gdaltest.post_reason('fail')
         return 'fail'
     ds.TestCapability('foo')
     if ds.GetLayerCount() != 1:
-        gdaltest.post_reason('fail')
         return 'fail'
     if ds.GetLayer(-1) is not None or ds.GetLayer(1) is not None:
-        gdaltest.post_reason('fail')
         return 'fail'
 
     lyr = ds.GetLayer(0)
@@ -240,14 +227,12 @@ def test_ogr_csw_vsimem_csw_minimal_instance():
     f = lyr.GetNextFeature()
     gdal.PopErrorHandler()
     if f is not None:
-        gdaltest.post_reason('fail')
         return 'fail'
 
     gdal.PushErrorHandler()
     fc = lyr.GetFeatureCount()
     gdal.PopErrorHandler()
     if fc != 0:
-        gdaltest.post_reason('fail')
         return 'fail'
 
     gdal.FileFromMemBuffer("""/vsimem/csw_endpoint&POSTFIELDS=<?xml version="1.0" encoding="UTF-8"?><csw:GetRecords resultType="results" service="CSW" version="2.0.2" startPosition="1" maxRecords="500" xmlns:csw="http://www.opengis.net/cat/csw/2.0.2" xmlns:gml="http://www.opengis.net/gml" xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:dct="http://purl.org/dc/terms/" xmlns:ogc="http://www.opengis.net/ogc" xmlns:ows="http://www.opengis.net/ows" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.opengis.net/cat/csw/2.0.2 http://schemas.opengis.net/csw/2.0.2/CSW-discovery.xsd"><csw:Query typeNames="csw:Record"><csw:ElementSetName>full</csw:ElementSetName></csw:Query></csw:GetRecords>""",
@@ -257,7 +242,6 @@ def test_ogr_csw_vsimem_csw_minimal_instance():
     f = lyr.GetNextFeature()
     gdal.PopErrorHandler()
     if f is not None or gdal.GetLastErrorMsg().find('Empty content returned by server') < 0:
-        gdaltest.post_reason('fail')
         print(gdal.GetLastErrorMsg())
         return 'fail'
 
@@ -268,7 +252,6 @@ def test_ogr_csw_vsimem_csw_minimal_instance():
     f = lyr.GetNextFeature()
     gdal.PopErrorHandler()
     if f is not None or gdal.GetLastErrorMsg().find('Error: cannot parse') < 0:
-        gdaltest.post_reason('fail')
         print(gdal.GetLastErrorMsg())
         return 'fail'
 
@@ -279,7 +262,6 @@ def test_ogr_csw_vsimem_csw_minimal_instance():
     f = lyr.GetNextFeature()
     gdal.PopErrorHandler()
     if f is not None or gdal.GetLastErrorMsg().find('Error: cannot parse') < 0:
-        gdaltest.post_reason('fail')
         print(gdal.GetLastErrorMsg())
         return 'fail'
 
@@ -290,7 +272,6 @@ def test_ogr_csw_vsimem_csw_minimal_instance():
     f = lyr.GetNextFeature()
     gdal.PopErrorHandler()
     if f is not None or gdal.GetLastErrorMsg().find('Error returned by server') < 0:
-        gdaltest.post_reason('fail')
         print(gdal.GetLastErrorMsg())
         return 'fail'
 
@@ -334,38 +315,32 @@ def test_ogr_csw_vsimem_csw_minimal_instance():
     lyr.ResetReading()
     f = lyr.GetNextFeature()
     if f is None:
-        gdaltest.post_reason('fail')
         return 'fail'
     if f['identifier'] != 'an_identifier' or f['other_identifiers'] != ['another_identifier'] or \
        f['subject'] != 'a_subject' or f['other_subjects'] != ['another_subject'] or \
        f['references'] != 'http://foo/' or f['other_references'] != ['http://bar/'] or \
        f['format'] != 'a_format' or f['other_formats'] != ['another_format'] or \
        f['boundingbox'].ExportToWkt() != 'POLYGON ((-180 -90,-180 90,180 90,180 -90,-180 -90))':
-        gdaltest.post_reason('fail')
         f.DumpReadable()
         return 'fail'
     f = lyr.GetNextFeature()
     if f is None:
-        gdaltest.post_reason('fail')
         return 'fail'
     gdal.PushErrorHandler()
     f = lyr.GetNextFeature()
     gdal.PopErrorHandler()
     if f is not None:
-        gdaltest.post_reason('fail')
         return 'fail'
 
     gdal.PushErrorHandler()
     fc = lyr.GetFeatureCount()
     gdal.PopErrorHandler()
     if fc != 2:
-        gdaltest.post_reason('fail')
         return 'fail'
 
     lyr.ResetReading()
     f = lyr.GetNextFeature()
     if f is None:
-        gdaltest.post_reason('fail')
         return 'fail'
     gdal.FileFromMemBuffer("""/vsimem/csw_endpoint&POSTFIELDS=<?xml version="1.0" encoding="UTF-8"?><csw:GetRecords resultType="results" service="CSW" version="2.0.2" startPosition="3" maxRecords="500" xmlns:csw="http://www.opengis.net/cat/csw/2.0.2" xmlns:gml="http://www.opengis.net/gml" xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:dct="http://purl.org/dc/terms/" xmlns:ogc="http://www.opengis.net/ogc" xmlns:ows="http://www.opengis.net/ows" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.opengis.net/cat/csw/2.0.2 http://schemas.opengis.net/csw/2.0.2/CSW-discovery.xsd"><csw:Query typeNames="csw:Record"><csw:ElementSetName>full</csw:ElementSetName></csw:Query></csw:GetRecords>""",
                            """<?xml version="1.0" encoding="UTF-8" standalone="no"?>
@@ -386,11 +361,9 @@ def test_ogr_csw_vsimem_csw_minimal_instance():
 """)
     f = lyr.GetNextFeature()
     if f is None:
-        gdaltest.post_reason('fail')
         return 'fail'
     f = lyr.GetNextFeature()
     if f is None:
-        gdaltest.post_reason('fail')
         return 'fail'
 
     gdal.FileFromMemBuffer("""/vsimem/csw_endpoint&POSTFIELDS=<?xml version="1.0" encoding="UTF-8"?><csw:GetRecords resultType="results" service="CSW" version="2.0.2" startPosition="4" maxRecords="500" xmlns:csw="http://www.opengis.net/cat/csw/2.0.2" xmlns:gml="http://www.opengis.net/gml" xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:dct="http://purl.org/dc/terms/" xmlns:ogc="http://www.opengis.net/ogc" xmlns:ows="http://www.opengis.net/ows" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.opengis.net/cat/csw/2.0.2 http://schemas.opengis.net/csw/2.0.2/CSW-discovery.xsd"><csw:Query typeNames="csw:Record"><csw:ElementSetName>full</csw:ElementSetName></csw:Query></csw:GetRecords>""",
@@ -410,7 +383,6 @@ def test_ogr_csw_vsimem_csw_minimal_instance():
 """)
     f = lyr.GetNextFeature()
     if f is not None:
-        gdaltest.post_reason('fail')
         return 'fail'
 
     gdal.FileFromMemBuffer("""/vsimem/csw_endpoint&POSTFIELDS=<?xml version="1.0" encoding="UTF-8"?><csw:GetRecords resultType="hits" service="CSW" version="2.0.2" xmlns:csw="http://www.opengis.net/cat/csw/2.0.2" xmlns:gml="http://www.opengis.net/gml" xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:dct="http://purl.org/dc/terms/" xmlns:ogc="http://www.opengis.net/ogc" xmlns:ows="http://www.opengis.net/ows" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.opengis.net/cat/csw/2.0.2 http://schemas.opengis.net/csw/2.0.2/CSW-discovery.xsd"><csw:Query typeNames="csw:Record"><csw:ElementSetName>full</csw:ElementSetName></csw:Query></csw:GetRecords>""",
@@ -419,7 +391,6 @@ def test_ogr_csw_vsimem_csw_minimal_instance():
     fc = lyr.GetFeatureCount()
     gdal.PopErrorHandler()
     if fc != 3:
-        gdaltest.post_reason('fail')
         print(gdal.GetLastErrorMsg())
         return 'fail'
 
@@ -429,7 +400,6 @@ def test_ogr_csw_vsimem_csw_minimal_instance():
     fc = lyr.GetFeatureCount()
     gdal.PopErrorHandler()
     if fc != 3:
-        gdaltest.post_reason('fail')
         print(gdal.GetLastErrorMsg())
         return 'fail'
 
@@ -439,7 +409,6 @@ def test_ogr_csw_vsimem_csw_minimal_instance():
     fc = lyr.GetFeatureCount()
     gdal.PopErrorHandler()
     if fc != 3:
-        gdaltest.post_reason('fail')
         print(gdal.GetLastErrorMsg())
         return 'fail'
 
@@ -449,7 +418,6 @@ def test_ogr_csw_vsimem_csw_minimal_instance():
     fc = lyr.GetFeatureCount()
     gdal.PopErrorHandler()
     if fc != 3:
-        gdaltest.post_reason('fail')
         print(gdal.GetLastErrorMsg())
         return 'fail'
 
@@ -470,7 +438,6 @@ def test_ogr_csw_vsimem_csw_minimal_instance():
 """)
     fc = lyr.GetFeatureCount()
     if fc != 200:
-        gdaltest.post_reason('fail')
         return 'fail'
 
     lyr.SetAttributeFilter("identifier = 'an_identifier'")
@@ -494,7 +461,6 @@ def test_ogr_csw_vsimem_csw_minimal_instance():
 """)
     f = lyr.GetNextFeature()
     if f is None:
-        gdaltest.post_reason('fail')
         return 'fail'
 
     gdal.FileFromMemBuffer("""/vsimem/csw_endpoint&POSTFIELDS=<?xml version="1.0" encoding="UTF-8"?><csw:GetRecords resultType="hits" service="CSW" version="2.0.2" xmlns:csw="http://www.opengis.net/cat/csw/2.0.2" xmlns:gml="http://www.opengis.net/gml" xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:dct="http://purl.org/dc/terms/" xmlns:ogc="http://www.opengis.net/ogc" xmlns:ows="http://www.opengis.net/ows" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.opengis.net/cat/csw/2.0.2 http://schemas.opengis.net/csw/2.0.2/CSW-discovery.xsd"><csw:Query typeNames="csw:Record"><csw:ElementSetName>full</csw:ElementSetName><csw:Constraint version="1.1.0"><ogc:Filter><ogc:And><ogc:BBOX><ogc:PropertyName>ows:BoundingBox</ogc:PropertyName><gml:Envelope srsName="urn:ogc:def:crs:EPSG::4326"><gml:lowerCorner>-90 -180</gml:lowerCorner><gml:upperCorner>90 180</gml:upperCorner></gml:Envelope></ogc:BBOX><ogc:PropertyIsEqualTo><ogc:PropertyName>dc:identifier</ogc:PropertyName><ogc:Literal>an_identifier</ogc:Literal></ogc:PropertyIsEqualTo></ogc:And></ogc:Filter></csw:Constraint></csw:Query></csw:GetRecords>""",
@@ -514,7 +480,6 @@ def test_ogr_csw_vsimem_csw_minimal_instance():
 """)
     fc = lyr.GetFeatureCount()
     if fc != 300:
-        gdaltest.post_reason('fail')
         return 'fail'
 
     lyr.SetAttributeFilter("identifier = 'an_identifier' AND " +
@@ -545,7 +510,6 @@ def test_ogr_csw_vsimem_csw_output_schema_csw():
     f = lyr.GetNextFeature()
     gdal.PopErrorHandler()
     if f is not None:
-        gdaltest.post_reason('fail')
         return 'fail'
 
     gdal.FileFromMemBuffer("""/vsimem/csw_endpoint&POSTFIELDS=<?xml version="1.0" encoding="UTF-8"?><csw:GetRecords resultType="results" service="CSW" version="2.0.2" outputSchema="http://www.opengis.net/cat/csw/2.0.2" startPosition="1" maxRecords="500" xmlns:csw="http://www.opengis.net/cat/csw/2.0.2" xmlns:gml="http://www.opengis.net/gml" xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:dct="http://purl.org/dc/terms/" xmlns:ogc="http://www.opengis.net/ogc" xmlns:ows="http://www.opengis.net/ows" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.opengis.net/cat/csw/2.0.2 http://schemas.opengis.net/csw/2.0.2/CSW-discovery.xsd"><csw:Query typeNames="csw:Record"><csw:ElementSetName>full</csw:ElementSetName></csw:Query></csw:GetRecords>""",
@@ -555,7 +519,6 @@ def test_ogr_csw_vsimem_csw_output_schema_csw():
     f = lyr.GetNextFeature()
     gdal.PopErrorHandler()
     if f is not None:
-        gdaltest.post_reason('fail')
         return 'fail'
 
     gdal.FileFromMemBuffer("""/vsimem/csw_endpoint&POSTFIELDS=<?xml version="1.0" encoding="UTF-8"?><csw:GetRecords resultType="results" service="CSW" version="2.0.2" outputSchema="http://www.opengis.net/cat/csw/2.0.2" startPosition="1" maxRecords="500" xmlns:csw="http://www.opengis.net/cat/csw/2.0.2" xmlns:gml="http://www.opengis.net/gml" xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:dct="http://purl.org/dc/terms/" xmlns:ogc="http://www.opengis.net/ogc" xmlns:ows="http://www.opengis.net/ows" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.opengis.net/cat/csw/2.0.2 http://schemas.opengis.net/csw/2.0.2/CSW-discovery.xsd"><csw:Query typeNames="csw:Record"><csw:ElementSetName>full</csw:ElementSetName></csw:Query></csw:GetRecords>""",
@@ -585,7 +548,6 @@ def test_ogr_csw_vsimem_csw_output_schema_csw():
     f = lyr.GetNextFeature()
     if f['raw_xml'].find('<csw:Record') != 0 or \
        f['boundingbox'].ExportToWkt() != 'POLYGON ((-180 -90,-180 90,180 90,180 -90,-180 -90))':
-        gdaltest.post_reason('fail')
         f.DumpReadable()
         return 'fail'
 
@@ -627,7 +589,6 @@ def test_ogr_csw_vsimem_csw_output_schema_gmd():
     f = lyr.GetNextFeature()
     if f['raw_xml'].find('<gmd:MD_Metadata') != 0 or \
        f['boundingbox'].ExportToWkt() != 'POLYGON ((-180 -90,-180 90,180 90,180 -90,-180 -90))':
-        gdaltest.post_reason('fail')
         f.DumpReadable()
         return 'fail'
 
@@ -671,7 +632,6 @@ def test_ogr_csw_vsimem_csw_output_schema_fgdc():
     f = lyr.GetNextFeature()
     if f['raw_xml'].find('<metadata') != 0 or \
        f['boundingbox'].ExportToWkt() != 'POLYGON ((-180 -90,-180 90,180 90,180 -90,-180 -90))':
-        gdaltest.post_reason('fail')
         f.DumpReadable()
         return 'fail'
 
diff --git a/autotest/ogr/ogr_dgnv8.py b/autotest/ogr/ogr_dgnv8.py
index 9db0b393b787..6d659c0e7e10 100755
--- a/autotest/ogr/ogr_dgnv8.py
+++ b/autotest/ogr/ogr_dgnv8.py
@@ -92,7 +92,6 @@ def test_ogr_dgnv8_3():
     ret = gdaltest.runexternal(test_cli_utilities.get_test_ogrsf_path() + ' -ro data/test_dgnv8.dgn')
 
     if ret.find('INFO') == -1 or ret.find('ERROR') != -1:
-        gdaltest.post_reason('fail')
         print(ret)
         return 'fail'
 
@@ -101,7 +100,6 @@ def test_ogr_dgnv8_3():
     os.unlink('tmp/test_dgnv8.dgn')
 
     if ret.find('INFO') == -1 or ret.find('ERROR') != -1:
-        gdaltest.post_reason('fail')
         print(ret)
         return 'fail'
 
@@ -165,7 +163,6 @@ def test_ogr_dgnv8_5():
     ds = ogr.Open(tmp_dgn)
     got_md = ds.GetMetadata_List('DGN')
     if got_md != options:
-        gdaltest.post_reason('fail')
         print(got_md)
         return 'fail'
     ds = None
@@ -174,16 +171,13 @@ def test_ogr_dgnv8_5():
     gdaltest.dgnv8_drv.CreateDataSource(tmp2_dgn, options=['SEED=' + tmp_dgn, 'TITLE=another_title'])
     ds = ogr.Open(tmp2_dgn)
     if ds.GetMetadataItem('TITLE', 'DGN') != 'another_title' or ds.GetMetadataItem('APPLICATION', 'DGN') != 'application':
-        gdaltest.post_reason('fail')
         print(ds.GetMetadata('DGN'))
         return 'fail'
     lyr = ds.GetLayer(0)
     if lyr.GetName() != 'my_layer':
-        gdaltest.post_reason('fail')
         print(lyr.GetName())
         return 'fail'
     if lyr.GetFeatureCount() != 0:
-        gdaltest.post_reason('fail')
         print(lyr.GetFeatureCount())
         return 'fail'
     ds = None
@@ -197,16 +191,13 @@ def test_ogr_dgnv8_5():
     ds = ogr.Open(tmp2_dgn, update=1)
     lyr = ds.GetLayer(0)
     if lyr.GetName() != 'a_layer':
-        gdaltest.post_reason('fail')
         print(lyr.GetName())
         return 'fail'
     if lyr.GetFeatureCount() != 1:
-        gdaltest.post_reason('fail')
         print(lyr.GetFeatureCount())
         return 'fail'
     f = lyr.GetNextFeature()
     if f.GetGeometryRef().ExportToWkt() != 'POINT (2 3)':
-        gdaltest.post_reason('fail')
         f.DumpReadable()
         return 'fail'
     ds = None
diff --git a/autotest/ogr/ogr_dxf.py b/autotest/ogr/ogr_dxf.py
index d77abfd56af2..5f5d0bcccdae 100644
--- a/autotest/ogr/ogr_dxf.py
+++ b/autotest/ogr/ogr_dxf.py
@@ -2766,14 +2766,12 @@ def test_ogr_dxf_38():
     f = lyr.GetNextFeature()
     if f.GetGeometryRef().ExportToWkt() != 'POINT (0 2)' \
             or f.GetStyleString() != 'PEN(c:#000000)':
-        gdaltest.post_reason('fail')
         f.DumpReadable()
         return 'fail'
 
     f = lyr.GetNextFeature()
     if f.GetGeometryRef().ExportToWkt() != 'LINESTRING (0.5 2.0,1 2)' \
             or f.GetStyleString() != 'PEN(c:#000000)':
-        gdaltest.post_reason('fail')
         f.DumpReadable()
         return 'fail'
 
@@ -2790,13 +2788,11 @@ def test_ogr_dxf_39():
 
     f = lyr.GetNextFeature()
     if f.GetGeometryRef().ExportToWkt() != 'POLYGON ((0 5,1.5 2.5,1.5 0.0,0.0 2.5,0 5))':
-        gdaltest.post_reason('fail')
         f.DumpReadable()
         return 'fail'
 
     f = lyr.GetNextFeature()
     if f.GetGeometryRef().ExportToIsoWkt() != 'POLYGON Z ((-10 13 123,10 10 123,5 12 123,8 13 123,-10 13 123))':
-        gdaltest.post_reason('fail')
         f.DumpReadable()
         return 'fail'
 
@@ -2812,7 +2808,6 @@ def test_ogr_dxf_40():
     lyr = ds.GetLayer(0)
     f = lyr.GetFeature(5)
     if ogrtest.check_feature_geometry(f, 'POINT (320000.0 5815007.5 0)') != 0:
-        gdaltest.post_reason('fail')
         f.DumpReadable()
         return 'fail'
 
@@ -2830,14 +2825,12 @@ def test_ogr_dxf_41():
     # INSERT #1: OCS normal vector (0,0,-1)
     f = lyr.GetFeature(1)
     if ogrtest.check_feature_geometry(f, 'LINESTRING (45 20,25 20,25 40,45 40,45 20)') != 0:
-        gdaltest.post_reason('fail')
         f.DumpReadable()
         return 'fail'
 
     # INSERT #2: OCS normal vector (0,1/sqrt(2),-1/sqrt(2))
     f = lyr.GetFeature(3)
     if ogrtest.check_feature_geometry(f, 'LINESTRING Z (10.0 18.0 -76.3675323681472,-10.0 18.0 -76.3675323681472,-10.0 32.142135623731 -62.2253967444162,10.0 32.142135623731 -62.2253967444162,10.0 18.0 -76.3675323681472)') != 0:
-        gdaltest.post_reason('fail')
         f.DumpReadable()
         return 'fail'
 
@@ -2845,7 +2838,6 @@ def test_ogr_dxf_41():
     # Y scale factor of 2 and rotation angle of 45 degrees
     f = lyr.GetFeature(5)
     if ogrtest.check_feature_geometry(f, 'LINESTRING Z (49.7198871869889 -21.8420670839387 75.1721817670195,34.1976071850546 -17.0401066991021 86.8340855568821,41.9587471852111 -48.595846365317 110.157893136607,57.4810271871454 -53.3978067501536 98.4959893467447,49.7198871869889 -21.8420670839387 75.1721817670195)') != 0:
-        gdaltest.post_reason('fail')
         f.DumpReadable()
         return 'fail'
 
@@ -2906,14 +2898,12 @@ def test_ogr_dxf_41():
         "-4.0 41.0121933088198 -132.936074863071," + \
         "-4.0 41.0121933088198 -132.936074863071))"
     if ogrtest.check_feature_geometry(f, expected_wkt) != 0:
-        gdaltest.post_reason('fail')
         f.DumpReadable()
         return 'fail'
 
     # SOLID
     f = lyr.GetFeature(9)
     if ogrtest.check_feature_geometry(f, 'POLYGON Z ((-10.0 13.0 124,8.0 13.0 124,5.0 12.0 123,10.0 10.0 121,-10.0 13.0 124))') != 0:
-        gdaltest.post_reason('fail')
         f.DumpReadable()
         return 'fail'
 
@@ -3027,7 +3017,6 @@ def test_ogr_dxf_44():
         with gdaltest.error_handler():
             lyr.GetFeatureCount()
         if gdal.GetLastErrorMsg().find('DXF_MAX_BSPLINE_CONTROL_POINTS') < 0:
-            gdaltest.post_reason('fail')
             return 'fail'
 
     ds = ogr.Open('data/leader-mleader.dxf')
@@ -3037,13 +3026,11 @@ def test_ogr_dxf_44():
     # (6.0 arrowhead size and 1.5 scale factor)
     f = lyr.GetNextFeature()
     if ogrtest.check_feature_geometry(f, 'LINESTRING Z (21 40 0,10 40 0,19.3125 34.6875 0,10.3125 34.6875 0,-13.5990791268758 34.6875 0)') != 0:
-        gdaltest.post_reason('fail')
         f.DumpReadable()
         return 'fail'
 
     f = lyr.GetNextFeature()
     if ogrtest.check_feature_geometry(f, 'POLYGON ((21.0 41.5,30 40,21.0 38.5,21.0 41.5))') != 0:
-        gdaltest.post_reason('fail')
         f.DumpReadable()
         return 'fail'
 
@@ -3054,14 +3041,12 @@ def test_ogr_dxf_44():
     f = lyr.GetNextFeature()
     if f.GetStyleString() != 'PEN(c:#ff0000)' \
             or ogrtest.check_feature_geometry(f, 'LINESTRING Z (-20.9782552979609 38.1443878852919 30,-12.2152357926375 44.793971841437 30,-13.7256166009765 49.0748560186272 30,-13.9025293262723 49.0416613258524 30)') != 0:
-        gdaltest.post_reason('fail')
         f.DumpReadable()
         return 'fail'
 
     f = lyr.GetNextFeature()
     if f.GetStyleString() != 'BRUSH(fc:#ff0000)' \
             or ogrtest.check_feature_geometry(f, 'POLYGON Z ((-20.9601206293303 38.1204894796201 30,-21.121645731992 38.035579873508 30,-20.9963899665916 38.1682862909638 30,-20.9601206293303 38.1204894796201 30))') != 0:
-        gdaltest.post_reason('fail')
         f.DumpReadable()
         return 'fail'
 
@@ -3069,21 +3054,18 @@ def test_ogr_dxf_44():
     f = lyr.GetNextFeature()
     if f.GetStyleString() != 'PEN(c:#00ff00)' \
             or ogrtest.check_feature_geometry(f, 'LINESTRING Z (26.8 77.6 0,10 65 0,25 55 0,25 50 0,40 65 0,48 65 0,169.282571623465 65.0 0)') != 0:
-        gdaltest.post_reason('fail')
         f.DumpReadable()
         return 'fail'
 
     f = lyr.GetNextFeature()
     if f.GetStyleString() != 'BRUSH(fc:#00ff00)' \
             or ogrtest.check_feature_geometry(f, 'POLYGON ((27.2 80.4,30.4 82.8,32.8 79.6,29.6 77.2,27.2 80.4))') != 0:
-        gdaltest.post_reason('fail')
         f.DumpReadable()
         return 'fail'
 
     f = lyr.GetNextFeature()
     if f.GetStyleString() != 'PEN(c:#00ff00)' \
             or ogrtest.check_feature_geometry(f, 'LINESTRING Z (28.4 78.8 0,26.8 77.6 0)') != 0:
-        gdaltest.post_reason('fail')
         f.DumpReadable()
         return 'fail'
 
@@ -3097,25 +3079,21 @@ def test_ogr_dxf_44():
     # MULTILEADER with custom arrowhead
     f = lyr.GetNextFeature()
     if ogrtest.check_feature_geometry(f, 'MULTILINESTRING ((26.8 32.6,10 20,25 10,25 5,40 20),(40 20,48 20))') != 0:
-        gdaltest.post_reason('fail')
         f.DumpReadable()
         return 'fail'
 
     f = lyr.GetNextFeature()
     if ogrtest.check_feature_geometry(f, 'POLYGON ((27.2 35.4,30.4 37.8,32.8 34.6,29.6 32.2,27.2 35.4))') != 0:
-        gdaltest.post_reason('fail')
         f.DumpReadable()
         return 'fail'
 
     f = lyr.GetNextFeature()
     if ogrtest.check_feature_geometry(f, 'LINESTRING Z (28.4 33.8 0,26.8 32.6 0)') != 0:
-        gdaltest.post_reason('fail')
         f.DumpReadable()
         return 'fail'
 
     f = lyr.GetNextFeature()
     if ogrtest.check_feature_geometry(f, 'POINT (50.0 22.0327421555252)') != 0:
-        gdaltest.post_reason('fail')
         f.DumpReadable()
         return 'fail'
 
@@ -3153,21 +3131,18 @@ def test_ogr_dxf_44():
     f = lyr.GetNextFeature()
     if f.GetStyleString() != 'PEN(c:#0000ff)' \
             or ogrtest.check_feature_geometry(f, 'MULTILINESTRING ((7.6425115795681 -8.00285406769102,18.2 -20.0),(19.2913880067389 -13.9367332958948,18.2 -20.0),(18.2 -20.0,38 -20),(54.8204921137545 -22.5800753657327,60.2227692307692 -20.0),(60.2227692307692 -20.0,52.2227692307692 -20.0))') != 0:
-        gdaltest.post_reason('fail')
         f.DumpReadable()
         return 'fail'
 
     f = lyr.GetNextFeature()
     if f.GetStyleString() != 'BRUSH(fc:#0000ff)' \
             or ogrtest.check_feature_geometry(f, 'POLYGON Z ((7.1420359016196 -8.4432726642857 0,5 -5 0,8.1429872575166 -7.56243547109634 0,7.1420359016196 -8.4432726642857 0))') != 0:
-        gdaltest.post_reason('fail')
         f.DumpReadable()
         return 'fail'
 
     f = lyr.GetNextFeature()
     if f.GetStyleString() != 'BRUSH(fc:#0000ff)' \
             or ogrtest.check_feature_geometry(f, 'POLYGON Z ((18.6352657907565 -13.8186312970179 0,20 -10 0,19.9475102227214 -14.0548352947716 0,18.6352657907565 -13.8186312970179 0))') != 0:
-        gdaltest.post_reason('fail')
         f.DumpReadable()
         return 'fail'
 
@@ -3175,7 +3150,6 @@ def test_ogr_dxf_44():
     f = lyr.GetNextFeature()
     if f.GetStyleString() != 'LABEL(f:"Calibri",it:1,t:"?????????",p:7,s:4g,w:40,c:#0000ff)' \
             or ogrtest.check_feature_geometry(f, 'POINT (40.0 -17.9846153846154)') != 0:
-        gdaltest.post_reason('fail')
         f.DumpReadable()
         return 'fail'
 
@@ -3184,13 +3158,11 @@ def test_ogr_dxf_44():
     f = lyr.GetNextFeature()
     if f.GetStyleString() != 'PEN(c:#ff00ff)' \
             or ogrtest.check_feature_geometry(f, 'MULTILINESTRING ((-41.8919467995818 -22.8930851139176,-36.1215379759023 -17.6108145786645),(-36.1215379759023 -17.6108145786645,-44.0 -19.0))') != 0:
-        gdaltest.post_reason('fail')
         f.DumpReadable()
         return 'fail'
 
     f = lyr.GetNextFeature()
     if ogrtest.check_feature_geometry(f, 'POLYGON ((-40.7553616986189 -14.3661762772835,-44.6945927106677 -15.0607689879512,-44 -19,-40.0607689879512 -18.3054072893323,-40.7553616986189 -14.3661762772835),(-41.9142984770378 -17.0075519687798,-41.126452274628 -16.8686334266463,-40.9875337324945 -17.6564796290561,-41.7753799349043 -17.7953981711896,-41.9142984770378 -17.0075519687798),(-42.0532170191713 -16.2197057663701,-42.1921355613049 -15.4318595639603,-41.4042893588951 -15.2929410218268,-41.2653708167616 -16.0807872242365,-42.0532170191713 -16.2197057663701),(-42.7021446794476 -17.1464705109134,-42.563226137314 -17.9343167133231,-43.3510723397238 -18.0732352554567,-43.4899908818573 -17.2853890530469,-42.7021446794476 -17.1464705109134),(-42.8410632215811 -16.3586243085036,-43.6289094239909 -16.4975428506372,-43.7678279661244 -15.7096966482274,-42.9799817637146 -15.5707781060938,-42.8410632215811 -16.3586243085036))') != 0:
-        gdaltest.post_reason('fail')
         f.DumpReadable()
         return 'fail'
 
@@ -3204,14 +3176,12 @@ def test_ogr_dxf_44():
     if f.GetStyleString() != 'LABEL(f:"Arial",t:"' + test_text + '",p:2,s:1g,c:#ff0000,a:10)' \
         or f.GetField('Text') != test_text \
             or ogrtest.check_feature_geometry(f, 'POINT Z (-42.7597068401767 -14.5165110820149 0)') != 0:
-        gdaltest.post_reason('fail')
         f.DumpReadable()
         return 'fail'
 
     # MULTILEADER with no dogleg
     f = lyr.GetNextFeature()
     if ogrtest.check_feature_geometry(f, 'MULTILINESTRING ((-2.39659963256204 -14.5201521575302,-3.98423252456234 -23.1105237601191),(-26.0282877045921 -20.4748699216691,-3.98423252456233 -23.1105237601191))') != 0:
-        gdaltest.post_reason('fail')
         f.DumpReadable()
         return 'fail'
 
@@ -3221,13 +3191,11 @@ def test_ogr_dxf_44():
     # MULTILEADER with no leader lines (block content only)
     f = lyr.GetNextFeature()
     if ogrtest.check_feature_geometry(f, 'MULTILINESTRING EMPTY') != 0:
-        gdaltest.post_reason('fail')
         f.DumpReadable()
         return 'fail'
 
     f = lyr.GetNextFeature()
     if ogrtest.check_feature_geometry(f, 'POLYGON ((-4.98423252456234 -22.1105237601191,-6.98423252456234 -22.1105237601191,-6.98423252456234 -24.1105237601191,-4.98423252456234 -24.1105237601191,-4.98423252456234 -22.1105237601191),(-5.78423252456234 -23.3105237601191,-5.38423252456234 -23.3105237601191,-5.38423252456234 -23.7105237601191,-5.78423252456234 -23.7105237601191,-5.78423252456234 -23.3105237601191),(-5.78423252456234 -22.9105237601191,-5.78423252456234 -22.5105237601191,-5.38423252456234 -22.5105237601191,-5.38423252456234 -22.9105237601191,-5.78423252456234 -22.9105237601191),(-6.18423252456234 -23.3105237601191,-6.18423252456234 -23.7105237601191,-6.58423252456234 -23.7105237601191,-6.58423252456234 -23.3105237601191,-6.18423252456234 -23.3105237601191),(-6.18423252456234 -22.9105237601191,-6.58423252456234 -22.9105237601191,-6.58423252456234 -22.5105237601191,-6.18423252456234 -22.5105237601191,-6.18423252456234 -22.9105237601191))') != 0:
-        gdaltest.post_reason('fail')
         f.DumpReadable()
         return 'fail'
 
@@ -3236,7 +3204,6 @@ def test_ogr_dxf_44():
     # LEADER with spline path
     f = lyr.GetNextFeature()
     if ogrtest.check_feature_geometry(f, 'LINESTRING Z (75 -5 0,75.3293039686015 -5.27450166567948 0,75.686184437139 -5.54808513378289 0,76.0669570707518 -5.8208730793178 0,76.4679375345795 -6.09298817729179 0,76.8854414937615 -6.36455310271241 0,77.3157846134373 -6.63569053058724 0,77.7552825587464 -6.90652313592384 0,78.2002509948283 -7.17717359372979 0,78.6470055868223 -7.44776457901266 0,79.091861999868 -7.71841876678001 0,79.5311358991048 -7.98925883203941 0,79.9611429496723 -8.26040744979843 0,80.3781988167098 -8.53198729506465 0,80.7786191653568 -8.80412104284562 0,81.1587196607529 -9.07693136814892 0,81.5148159680374 -9.35054094598211 0,81.8432237523498 -9.62507245135277 0,82.1402586788297 -9.90064855926846 0,82.4022364126165 -10.1773919447368 0,82.6254726188496 -10.4554252827652 0,82.8062829626685 -10.7348712483614 0,82.9409831092127 -11.0158525165329 0,83.0258887236216 -11.2984917622873 0,83.0573154710347 -11.5829116606322 0,83.0315790165916 -11.869234886575 0,82.9452821800198 -12.1575745539156 0,82.8004070385963 -12.447864666659 0,82.603711185096 -12.7398802214393 0,82.3621180817583 -13.033390692038 0,82.0825511908225 -13.3281655522369 0,81.7719339745283 -13.6239742758175 0,81.4371898951149 -13.9205863365615 0,81.0852424148219 -14.2177712082505 0,80.7230149958886 -14.515298364666 0,80.3574311005547 -14.8129372795898 0,79.9954141910594 -15.1104574268035 0,79.6438877296422 -15.4076282800887 0,79.3097751785426 -15.704219313227 0,79 -16 0)') != 0:
-        gdaltest.post_reason('fail')
         f.DumpReadable()
         return 'fail'
 
@@ -3244,27 +3211,23 @@ def test_ogr_dxf_44():
     # and text on an angle
     f = lyr.GetNextFeature()
     if ogrtest.check_feature_geometry(f, 'MULTILINESTRING ((97.9154085227223 -24.4884177083425,98.2307499443399 -23.8667044316857,98.5274844683239 -23.1977407715784,98.8076056908493 -22.4865892691047,99.0731072080911 -21.7383124653484,99.3259826162243 -20.9579729013935,99.568225511424 -20.1506331183241,99.8018294898652 -19.3213556572241,100.028788147723 -18.4752030591775,100.251095081172 -17.6172378652682,100.470743886388 -16.7525226165803,100.689728159546 -15.8861198541978,100.91004149682 -15.0230921192046,101.133677494386 -14.1685019526847,101.362629748419 -13.327411895722,101.598891855094 -12.5048844894007,101.844457410585 -11.7059822748045,102.101320011068 -10.9357677930177,102.371473252719 -10.199303585124,102.656910731711 -9.50165219220749,102.95962604422 -8.84787615535218,103.281612786421 -8.24303801564202,103.624864554489 -7.69220031416101,103.991374944599 -7.20042559199311,104.383137552927 -6.77277639022231,104.802145975646 -6.41431524993259,105.250393808933 -6.13010471220794,105.729874648962 -5.92520731813233,106.242582091908 -5.80468560878975,106.790509733946 -5.77360212526418,107.375651171252 -5.8370194086396,108.0 -6.0),(99.0 -4.0,99.2390786191346 -4.00918383080352,99.4787687119818 -4.01534615590692,99.7189331856537 -4.01916439926796,99.9594349472622 -4.02131598484443,100.200136903919 -4.02247833659411,100.440901962737 -4.02332887847475,100.681593030828 -4.02454503444416,100.922073015303 -4.02680422846008,101.162204823276 -4.03078388448032,101.401851361856 -4.03716142646263,101.640875538158 -4.0466142783648,101.879140259293 -4.0598198641446,102.116508432372 -4.07745560775981,102.352842964508 -4.1001989331682,102.588006762813 -4.12872726432755,102.821862734399 -4.16371802519564,103.054283542724 -4.20580126092676,103.285277318696 -4.25494915918985,103.514951346557 -4.31065239888725,103.743415181632 -4.37239063008777,103.970778379245 -4.43964350286021,104.19715049472 -4.51189066727337,104.422641083382 -4.58861177339606,104.647359700555 -4.66928647129708,104.871415901564 -4.75339441104525,105.094919241732 -4.84041524270936,105.317979276384 -4.92982861635822,105.540705560844 -5.02111418206063,105.763207650437 -5.11375158988541,105.985595100486 -5.20722048990135,106.207977466317 -5.30100053217725,106.430464303253 -5.39457136678194,106.653165166619 -5.4874126437842,106.876189611739 -5.57900401325284,107.099647193937 -5.66882512525668,107.323647468538 -5.7563556298645,107.548299990866 -5.84107517714513,107.773714316245 -5.92246341716736,108.0 -6.0))') != 0:
-        gdaltest.post_reason('fail')
         f.DumpReadable()
         return 'fail'
 
     f = lyr.GetNextFeature()
     if ogrtest.check_feature_geometry(f, 'POLYGON Z ((98.5006722379985 -24.8076524621295 0,96 -28 0,97.330144807446 -24.1691829545554 0,98.5006722379985 -24.8076524621295 0))') != 0:
-        gdaltest.post_reason('fail')
         f.DumpReadable()
         return 'fail'
 
     f = lyr.GetNextFeature()
     if f.GetStyleString() != 'LABEL(f:"Arial",t:"Splines",p:7,a:342,s:2g,c:#000000)' \
             or ogrtest.check_feature_geometry(f, 'POINT (110.7043505591 -4.20673403616296)') != 0:
-        gdaltest.post_reason('fail')
         f.DumpReadable()
         return 'fail'
 
     # MULTILEADER with DIMBREAK
     f = lyr.GetNextFeature()
     if ogrtest.check_feature_geometry(f, 'MULTILINESTRING ((50.8917622404846 41.5635728657296,51.2877903403879 42.2579494192141),(51.9070696740577 43.3437639093041,54.3108962133801 47.5585173269448,55.9270734326513 48.2521008552884),(57.0757636753042 48.7450620367561,59.4256548786735 49.7535194092661),(60 50,60 50),(60 50,60 50),(60.625 50.0,61.875 50.0),(63.125 50.0,63.6 50.0))') != 0:
-        gdaltest.post_reason('fail')
         f.DumpReadable()
         return 'fail'
 
@@ -3333,43 +3296,36 @@ def test_ogr_dxf_46():
     # Extension lines
     f = lyr.GetNextFeature()
     if ogrtest.check_feature_geometry(f, 'LINESTRING Z (320000.0 5820010.0625 0,320000.0 5820010.43087258 0)') != 0:
-        gdaltest.post_reason('fail')
         f.DumpReadable()
         return 'fail'
     f = lyr.GetNextFeature()
     if ogrtest.check_feature_geometry(f, 'LINESTRING Z (320010.0 5820010.0625 0,320010.0 5820010.43087258 0)') != 0:
-        gdaltest.post_reason('fail')
         f.DumpReadable()
         return 'fail'
 
     # Dimension arrow lines
     f = lyr.GetNextFeature()
     if ogrtest.check_feature_geometry(f, 'LINESTRING Z (320000.18 5820010.25087258 0,320004.475225102 5820010.25087258 0)') != 0:
-        gdaltest.post_reason('fail')
         f.DumpReadable()
         return 'fail'
     f = lyr.GetNextFeature()
     if ogrtest.check_feature_geometry(f, 'LINESTRING Z (320009.82 5820010.25087258 0,320005.524774898 5820010.25087258 0)') != 0:
-        gdaltest.post_reason('fail')
         f.DumpReadable()
         return 'fail'
 
     # Arrowheads
     f = lyr.GetNextFeature()
     if ogrtest.check_feature_geometry(f, 'POLYGON ((320000.18 5820010.28087259,320000.18 5820010.22087258,320000.0 5820010.25087258,320000.18 5820010.28087259))') != 0:
-        gdaltest.post_reason('fail')
         f.DumpReadable()
         return 'fail'
     f = lyr.GetNextFeature()
     if ogrtest.check_feature_geometry(f, 'POLYGON ((320009.82 5820010.28087259,320009.82 5820010.22087258,320010.0 5820010.25087258,320009.82 5820010.28087259))') != 0:
-        gdaltest.post_reason('fail')
         f.DumpReadable()
         return 'fail'
 
     # Text
     f = lyr.GetNextFeature()
     if ogrtest.check_feature_geometry(f, 'POINT Z (320004.537844475 5820010.16240737 0)') != 0:
-        gdaltest.post_reason('fail')
         f.DumpReadable()
         return 'fail'
     if f.GetStyleString() != 'LABEL(f:"Arial",t:"10.0000",p:1,s:0.18g,c:#000000)':
@@ -3393,26 +3349,22 @@ def test_ogr_dxf_47():
     # Dimension line and extension lines
     f = lyr.GetNextFeature()
     if ogrtest.check_feature_geometry(f, 'MULTILINESTRING ((320010.0 5820010.25087258,320000.0 5820010.25087258),(320010.0 5820010.0625,320010.0 5820010.43087258),(320000.0 5820010.0625,320000.0 5820010.43087258))') != 0:
-        gdaltest.post_reason('fail')
         f.DumpReadable()
         return 'fail'
 
     # Arrowheads
     f = lyr.GetNextFeature()
     if ogrtest.check_feature_geometry(f, 'POLYGON Z ((320009.82 5820010.28087259 0,320010.0 5820010.25087258 0,320009.82 5820010.22087258 0,320009.82 5820010.28087259 0))') != 0:
-        gdaltest.post_reason('fail')
         f.DumpReadable()
         return 'fail'
     f = lyr.GetNextFeature()
     if ogrtest.check_feature_geometry(f, 'POLYGON Z ((320000.18 5820010.22087258 0,320000.0 5820010.25087258 0,320000.18 5820010.28087259 0,320000.18 5820010.22087258 0))') != 0:
-        gdaltest.post_reason('fail')
         f.DumpReadable()
         return 'fail'
 
     # Text
     f = lyr.GetNextFeature()
     if ogrtest.check_feature_geometry(f, 'POINT (320005.0 5820010.25087258)') != 0:
-        gdaltest.post_reason('fail')
         f.DumpReadable()
         return 'fail'
     if f.GetStyleString() != 'LABEL(f:"Arial",t:"10.0000",p:11,s:0.18g,c:#000000)':
@@ -3425,26 +3377,22 @@ def test_ogr_dxf_47():
     # Dimension line
     f = lyr.GetNextFeature()
     if ogrtest.check_feature_geometry(f, 'MULTILINESTRING ((320005 5820005,320000 5820010))') != 0:
-        gdaltest.post_reason('fail')
         f.DumpReadable()
         return 'fail'
 
     # Arrowheads
     f = lyr.GetNextFeature()
     if ogrtest.check_feature_geometry(f, 'POLYGON Z ((320004.116116524 5820006.23743687 0,320005 5820005 0,320003.762563133 5820005.88388348 0,320004.116116524 5820006.23743687 0))') != 0:
-        gdaltest.post_reason('fail')
         f.DumpReadable()
         return 'fail'
     f = lyr.GetNextFeature()
     if ogrtest.check_feature_geometry(f, 'POLYGON Z ((320000.883883476 5820008.76256313 0,320000 5820010 0,320001.237436867 5820009.11611652 0,320000.883883476 5820008.76256313 0))') != 0:
-        gdaltest.post_reason('fail')
         f.DumpReadable()
         return 'fail'
 
     # Text
     f = lyr.GetNextFeature()
     if ogrtest.check_feature_geometry(f, 'POINT (320002.5 5820007.5)') != 0:
-        gdaltest.post_reason('fail')
         f.DumpReadable()
         return 'fail'
     if f.GetStyleString() != 'LABEL(f:"Arial",t:"7.1",p:11,a:-45,s:0.48g,c:#000000)':
@@ -3457,26 +3405,22 @@ def test_ogr_dxf_47():
     # Dimension line
     f = lyr.GetNextFeature()
     if ogrtest.check_feature_geometry(f, 'MULTILINESTRING ((320000.0 5820001.5,320005.0 5820001.5),(320000.0 5820002.4,320000 5820001),(320005.0 5820002.4,320005 5820001))') != 0:
-        gdaltest.post_reason('fail')
         f.DumpReadable()
         return 'fail'
 
     # Arrowheads
     f = lyr.GetNextFeature()
     if ogrtest.check_feature_geometry(f, 'POLYGON Z ((320000.18 5820001.47 0,320000.0 5820001.5 0,320000.18 5820001.53 0,320000.18 5820001.47 0))') != 0:
-        gdaltest.post_reason('fail')
         f.DumpReadable()
         return 'fail'
     f = lyr.GetNextFeature()
     if ogrtest.check_feature_geometry(f, 'POLYGON Z ((320004.82 5820001.53 0,320005.0 5820001.5 0,320004.82 5820001.47 0,320004.82 5820001.53 0))') != 0:
-        gdaltest.post_reason('fail')
         f.DumpReadable()
         return 'fail'
 
     # Text
     f = lyr.GetNextFeature()
     if ogrtest.check_feature_geometry(f, 'POINT (320001.5 5820001.5)') != 0:
-        gdaltest.post_reason('fail')
         f.DumpReadable()
         return 'fail'
     if f.GetStyleString() != 'LABEL(f:"Arial",t:"±2 3\n\\P4 5.0000",p:11,s:0.18g,c:#000000)':
diff --git a/autotest/ogr/ogr_eeda.py b/autotest/ogr/ogr_eeda.py
index 32b9ab125a62..ef82017e317a 100644
--- a/autotest/ogr/ogr_eeda.py
+++ b/autotest/ogr/ogr_eeda.py
@@ -87,25 +87,20 @@ def test_eeda_2():
     lyr = ds.GetLayer(0)
 
     if lyr.TestCapability(ogr.OLCStringsAsUTF8) != 1:
-        gdaltest.post_reason('fail')
         return 'fail'
 
     if lyr.TestCapability('foo') != 0:
-        gdaltest.post_reason('fail')
         return 'fail'
 
     if lyr.GetLayerDefn().GetFieldCount() != 8 + 7 + 4:
-        gdaltest.post_reason('fail')
         print(lyr.GetLayerDefn().GetFieldCount())
         return 'fail'
 
     if lyr.GetExtent() != (-180.0, 180.0, -90.0, 90.0):
-        gdaltest.post_reason('fail')
         print(lyr.GetExtent())
         return 'fail'
 
     if lyr.GetFeatureCount() != -1:
-        gdaltest.post_reason('fail')
         print(lyr.GetFeatureCount())
         return 'fail'
 
@@ -180,13 +175,11 @@ def test_eeda_2():
        f.GetField('double_field') != 1.23 or \
        f.GetField('other_properties') != '{ "another_prop": 3 }' or \
        f.GetGeometryRef().ExportToWkt() != 'MULTIPOLYGON (((2 49,2.1 49.0,2.1 49.1,2.0 49.1,2 49)))':
-        gdaltest.post_reason('fail')
         f.DumpReadable()
         return 'fail'
 
     f = lyr.GetNextFeature()
     if f.GetField('name') != 'projects/earthengine-public/assets/collection/second_feature':
-        gdaltest.post_reason('fail')
         f.DumpReadable()
         return 'fail'
 
@@ -200,20 +193,17 @@ def test_eeda_2():
 
     f = lyr.GetNextFeature()
     if f.GetField('name') != 'projects/earthengine-public/assets/collection/third_feature':
-        gdaltest.post_reason('fail')
         f.DumpReadable()
         return 'fail'
 
     f = lyr.GetNextFeature()
     if f is not None:
-        gdaltest.post_reason('fail')
         return 'fail'
 
     lyr.ResetReading()
 
     f = lyr.GetNextFeature()
     if f.GetField('name') != 'projects/earthengine-public/assets/collection/first_feature':
-        gdaltest.post_reason('fail')
         f.DumpReadable()
         return 'fail'
 
@@ -229,7 +219,6 @@ def test_eeda_2():
 
     f = lyr.GetNextFeature()
     if f.GetField('name') != 'projects/earthengine-public/assets/collection/raw_filter':
-        gdaltest.post_reason('fail')
         return 'fail'
 
     lyr.SetAttributeFilter(None)
@@ -274,7 +263,6 @@ def test_eeda_2():
     gdal.Unlink(ogrtest.eeda_drv_tmpfile)
 
     if f.GetField('name') != 'projects/earthengine-public/assets/collection/filtered_feature':
-        gdaltest.post_reason('fail')
         return 'fail'
 
     lyr.SetSpatialFilter(None)
@@ -299,7 +287,6 @@ def test_eeda_2():
     gdal.Unlink(ogrtest.eeda_drv_tmpfile)
 
     if f.GetField('name') != 'projects/earthengine-public/assets/collection/filtered_feature':
-        gdaltest.post_reason('fail')
         return 'fail'
 
     # Test time equality with day granularity
@@ -322,7 +309,6 @@ def test_eeda_2():
     gdal.Unlink(ogrtest.eeda_drv_tmpfile)
 
     if f.GetField('name') != 'projects/earthengine-public/assets/collection/filtered_feature':
-        gdaltest.post_reason('fail')
         return 'fail'
 
     ds = None
@@ -348,7 +334,6 @@ def test_eeda_3():
     lyr = ds.GetLayer(0)
 
     if lyr.GetLayerDefn().GetFieldCount() != 8 + 7 + 4:
-        gdaltest.post_reason('fail')
         print(lyr.GetLayerDefn().GetFieldCount())
         return 'fail'
     ds = None
@@ -379,7 +364,6 @@ def test_eeda_4():
         ]
     }))
     if not ogr.Open('EEDA:users/foo').GetLayer(0):
-        gdaltest.post_reason('fail')
         return 'fail'
     gdal.Unlink(ogrtest.eeda_drv_tmpfile)
 
@@ -394,7 +378,6 @@ def test_eeda_4():
     }))
     ds = ogr.Open('EEDA:projects/foo')
     if not ds.GetLayer(0):
-        gdaltest.post_reason('fail')
         return 'fail'
     gdal.Unlink(ogrtest.eeda_drv_tmpfile)
     ds = None
@@ -410,7 +393,6 @@ def test_eeda_4():
     }))
     ds = ogr.Open('EEDA:projects/foo/bar/baz')
     if not ds.GetLayer(0):
-        gdaltest.post_reason('fail')
         return 'fail'
     gdal.Unlink(ogrtest.eeda_drv_tmpfile)
     ds = None
@@ -426,7 +408,6 @@ def test_eeda_4():
     }))
     ds = ogr.Open('EEDA:foo')
     if not ds.GetLayer(0):
-        gdaltest.post_reason('fail')
         return 'fail'
     gdal.Unlink(ogrtest.eeda_drv_tmpfile)
     ds = None
@@ -442,7 +423,6 @@ def test_eeda_4():
     }))
     ds = ogr.Open('EEDA:projects/foo/assets/bar')
     if not ds.GetLayer(0):
-        gdaltest.post_reason('fail')
         return 'fail'
     gdal.Unlink(ogrtest.eeda_drv_tmpfile)
     ds = None
diff --git a/autotest/ogr/ogr_elasticsearch.py b/autotest/ogr/ogr_elasticsearch.py
index e1eaaae5b696..888a9168d6e6 100755
--- a/autotest/ogr/ogr_elasticsearch.py
+++ b/autotest/ogr/ogr_elasticsearch.py
@@ -136,23 +136,18 @@ def test_ogr_elasticsearch_1():
         return 'fail'
 
     if ds.TestCapability(ogr.ODsCCreateLayer) == 0:
-        gdaltest.post_reason('fail')
         return 'fail'
     if ds.TestCapability(ogr.ODsCDeleteLayer) == 0:
-        gdaltest.post_reason('fail')
         return 'fail'
     if ds.TestCapability(ogr.ODsCCreateGeomFieldAfterCreateLayer) == 0:
-        gdaltest.post_reason('fail')
         return 'fail'
 
     # Failed index creation
     with gdaltest.error_handler():
         lyr = ds.CreateLayer('foo', srs=ogrtest.srs_wgs84, options=['FID='])
     if lyr is not None:
-        gdaltest.post_reason('fail')
         return 'fail'
     if gdal.GetLastErrorType() != gdal.CE_Failure:
-        gdaltest.post_reason('fail')
         return 'fail'
     gdal.ErrorReset()
 
@@ -161,10 +156,8 @@ def test_ogr_elasticsearch_1():
         '/vsimem/fakeelasticsearch/foo&CUSTOMREQUEST=PUT', '{}')
     lyr = ds.CreateLayer('foo', srs=ogrtest.srs_wgs84, options=['FID='])
     if lyr is None:
-        gdaltest.post_reason('fail')
         return 'fail'
     if gdal.GetLastErrorType() != gdal.CE_None:
-        gdaltest.post_reason('fail')
         return 'fail'
 
     gdal.FileFromMemBuffer(
@@ -176,7 +169,6 @@ def test_ogr_elasticsearch_1():
     lyr = ds.CreateLayer('foo', geom_type=ogr.wkbNone,
                          options=['OVERWRITE=TRUE', 'FID='])
     if gdal.GetLastErrorType() != gdal.CE_None:
-        gdaltest.post_reason('fail')
         return 'fail'
 
     # Simulate failed overwrite
@@ -186,7 +178,6 @@ def test_ogr_elasticsearch_1():
         lyr = ds.CreateLayer('foo', geom_type=ogr.wkbNone,
                              options=['OVERWRITE=TRUE'])
     if gdal.GetLastErrorType() != gdal.CE_Failure:
-        gdaltest.post_reason('fail')
         return 'fail'
     gdal.ErrorReset()
 
@@ -198,23 +189,17 @@ def test_ogr_elasticsearch_1():
     lyr = ds.CreateLayer('foo', geom_type=ogr.wkbNone, options=[
                          'OVERWRITE=TRUE', 'BULK_INSERT=NO', 'FID='])
     if gdal.GetLastErrorType() != gdal.CE_None:
-        gdaltest.post_reason('fail')
         return 'fail'
 
     if lyr.TestCapability(ogr.OLCFastFeatureCount) == 0:
-        gdaltest.post_reason('fail')
         return 'fail'
     if lyr.TestCapability(ogr.OLCStringsAsUTF8) == 0:
-        gdaltest.post_reason('fail')
         return 'fail'
     if lyr.TestCapability(ogr.OLCSequentialWrite) == 0:
-        gdaltest.post_reason('fail')
         return 'fail'
     if lyr.TestCapability(ogr.OLCCreateField) == 0:
-        gdaltest.post_reason('fail')
         return 'fail'
     if lyr.TestCapability(ogr.OLCCreateGeomField) == 0:
-        gdaltest.post_reason('fail')
         return 'fail'
 
     feat = ogr.Feature(lyr.GetLayerDefn())
@@ -223,7 +208,6 @@ def test_ogr_elasticsearch_1():
         '/vsimem/fakeelasticsearch/foo/FeatureCollection/&POSTFIELDS={ "properties": { } }', '{}')
     ret = lyr.CreateFeature(feat)
     if ret != 0:
-        gdaltest.post_reason('fail')
         return 'fail'
     feat = None
 
@@ -232,10 +216,8 @@ def test_ogr_elasticsearch_1():
     with gdaltest.error_handler():
         lyr = ds.CreateLayer('foo', srs=ogrtest.srs_wgs84)
     if gdal.GetLastErrorType() != gdal.CE_Failure:
-        gdaltest.post_reason('fail')
         return 'fail'
     if lyr is not None:
-        gdaltest.post_reason('fail')
         return 'fail'
 
     gdal.FileFromMemBuffer(
@@ -248,7 +230,6 @@ def test_ogr_elasticsearch_1():
     ds.DeleteLayer(10)
     ret = ds.DeleteLayer(0)
     if ret != 0:
-        gdaltest.post_reason('fail')
         return 'fail'
 
     gdal.FileFromMemBuffer(
@@ -275,7 +256,6 @@ def test_ogr_elasticsearch_1():
 
     ret = lyr.SyncToDisk()
     if ret != 0:
-        gdaltest.post_reason('fail')
         return 'fail'
 
     feat = ogr.Feature(lyr.GetLayerDefn())
@@ -298,7 +278,6 @@ def test_ogr_elasticsearch_1():
     with gdaltest.error_handler():
         ret = lyr.CreateFeature(feat)
     if ret == 0:
-        gdaltest.post_reason('fail')
         return 'fail'
 
     # Success
@@ -306,10 +285,8 @@ def test_ogr_elasticsearch_1():
         '/vsimem/fakeelasticsearch/foo2/FeatureCollection/&POSTFIELDS={ "geometry": { "type": "POINT", "coordinates": [ 0.0, 1.0 ] }, "type": "Feature", "properties": { "str_field": "a", "int_field": 1, "int64_field": 123456789012, "real_field": 2.34, "boolean_field": true, "strlist_field": [ "a", "b" ], "intlist_field": [ 1, 2 ], "int64list_field": [ 123456789012, 2 ], "reallist_field": [ 1.23, 4.56 ], "date_field": "2015\/08\/12", "datetime_field": "2015\/08\/12 12:34:56.789", "time_field": "12:34:56.789", "binary_field": "ASNGV4mrze8=" } }', '{ "_id": "my_id" }')
     ret = lyr.CreateFeature(feat)
     if ret != 0:
-        gdaltest.post_reason('fail')
         return 'fail'
     if feat['_id'] != 'my_id':
-        gdaltest.post_reason('fail')
         return 'fail'
 
     # DateTime with TZ
@@ -319,7 +296,6 @@ def test_ogr_elasticsearch_1():
     feat['datetime_field'] = '2015/08/12 12:34:56.789+0300'
     ret = lyr.CreateFeature(feat)
     if ret != 0:
-        gdaltest.post_reason('fail')
         return 'fail'
 
     # CreateFeature() with _id set
@@ -329,7 +305,6 @@ def test_ogr_elasticsearch_1():
     feat['_id'] = 'my_id2'
     ret = lyr.CreateFeature(feat)
     if ret != 0:
-        gdaltest.post_reason('fail')
         return 'fail'
 
     # Failed SetFeature because of missing _id
@@ -337,7 +312,6 @@ def test_ogr_elasticsearch_1():
     with gdaltest.error_handler():
         ret = lyr.SetFeature(feat)
     if ret == 0:
-        gdaltest.post_reason('fail')
         return 'fail'
 
     # Simulate server error
@@ -345,14 +319,12 @@ def test_ogr_elasticsearch_1():
     with gdaltest.error_handler():
         ret = lyr.SetFeature(feat)
     if ret == 0:
-        gdaltest.post_reason('fail')
         return 'fail'
 
     gdal.FileFromMemBuffer(
         '/vsimem/fakeelasticsearch/foo2/FeatureCollection/my_id&POSTFIELDS={ "properties": { } }', '{}')
     ret = lyr.SetFeature(feat)
     if ret != 0:
-        gdaltest.post_reason('fail')
         return 'fail'
 
     # With explicit GEOM_MAPPING_TYPE=GEO_POINT
@@ -369,7 +341,6 @@ def test_ogr_elasticsearch_1():
     feat.SetGeometry(ogr.CreateGeometryFromWkt('LINESTRING(0 0,1 1)'))
     ret = lyr.CreateFeature(feat)
     if ret != 0:
-        gdaltest.post_reason('fail')
         return 'fail'
     feat = None
 
@@ -380,7 +351,6 @@ def test_ogr_elasticsearch_1():
         lyr = ds.CreateLayer('foo4', srs=ogrtest.srs_wgs84, options=[
                              'MAPPING={ "FeatureCollection": { "properties": {} }}'])
     if lyr is not None:
-        gdaltest.post_reason('fail')
         return 'fail'
 
     # Test successful explicit MAPPING with inline JSon mapping
@@ -389,7 +359,6 @@ def test_ogr_elasticsearch_1():
     lyr = ds.CreateLayer('foo4', srs=ogrtest.srs_wgs84, options=[
                          'MAPPING={ "FeatureCollection": { "properties": {} }}'])
     if lyr is None:
-        gdaltest.post_reason('fail')
         return 'fail'
 
     # Test successful explicit MAPPING with reference to file with mapping
@@ -401,7 +370,6 @@ def test_ogr_elasticsearch_1():
                          options=['MAPPING=/vsimem/map.txt'])
     gdal.Unlink('/vsimem/map.txt')
     if lyr is None:
-        gdaltest.post_reason('fail')
         return 'fail'
 
     # Test successful explicit INDEX_DEFINITION with inline JSon mapping
@@ -412,7 +380,6 @@ def test_ogr_elasticsearch_1():
     lyr = ds.CreateLayer('foo4', srs=ogrtest.srs_wgs84, options=[
                          'INDEX_DEFINITION={}', 'MAPPING={}'])
     if lyr is None:
-        gdaltest.post_reason('fail')
         return 'fail'
 
     # Test successful explicit INDEX_DEFINITION with reference to file
@@ -423,7 +390,6 @@ def test_ogr_elasticsearch_1():
                          options=['INDEX_DEFINITION=/vsimem/map.txt', 'MAPPING={}'])
     gdal.Unlink('/vsimem/map.txt')
     if lyr is None:
-        gdaltest.post_reason('fail')
         return 'fail'
 
     return 'success'
@@ -457,7 +423,6 @@ def test_ogr_elasticsearch_2():
     gdal.FileFromMemBuffer('/vsimem/fakeelasticsearch/foo/FeatureCollection/&POSTFIELDS={ "geometry": { "type": "geometrycollection", "geometries": [ { "type": "point", "coordinates": [ 0.0, 1.0 ] }, { "type": "linestring", "coordinates": [ [ 0.0, 1.0 ], [ 2.0, 3.0 ] ] }, { "type": "polygon", "coordinates": [ [ [ 0.0, 0.0 ], [ 0.0, 10.0 ], [ 10.0, 10.0 ], [ 0.0, 0.0 ] ], [ [ 1.0, 1.0 ], [ 1.0, 9.0 ], [ 9.0, 9.0 ], [ 1.0, 1.0 ] ] ] }, { "type": "multipoint", "coordinates": [ [ 0.0, 1.0 ], [ 2.0, 3.0 ] ] }, { "type": "multilinestring", "coordinates": [ [ [ 0.0, 1.0 ], [ 2.0, 3.0 ] ], [ [ 4.0, 5.0 ], [ 6.0, 7.0 ] ] ] }, { "type": "multipolygon", "coordinates": [ [ [ [ 0.0, 0.0 ], [ 0.0, 10.0 ], [ 10.0, 10.0 ], [ 0.0, 0.0 ] ], [ [ 1.0, 1.0 ], [ 1.0, 9.0 ], [ 9.0, 9.0 ], [ 1.0, 1.0 ] ] ], [ [ [ -1.0, -1.0 ], [ -1.0, -9.0 ], [ -9.0, -9.0 ], [ -1.0, -1.0 ] ] ] ] } ] }, "type": "Feature", "properties": { } }', '{}')
     ret = lyr.CreateFeature(feat)
     if ret != 0:
-        gdaltest.post_reason('fail')
         return 'fail'
     feat = None
 
@@ -473,7 +438,6 @@ def test_ogr_elasticsearch_2():
 
     ret = lyr.CreateFeature(feat)
     if ret != 0:
-        gdaltest.post_reason('fail')
         return 'fail'
     feat = None
 
@@ -503,20 +467,17 @@ def test_ogr_elasticsearch_3():
     feat = ogr.Feature(lyr.GetLayerDefn())
     ret = lyr.CreateFeature(feat)
     if ret != 0:
-        gdaltest.post_reason('fail')
         return 'fail'
     feat = None
 
     with gdaltest.error_handler():
         ret = lyr.SyncToDisk()
     if ret == 0:
-        gdaltest.post_reason('fail')
         return 'fail'
 
     feat = ogr.Feature(lyr.GetLayerDefn())
     ret = lyr.CreateFeature(feat)
     if ret != 0:
-        gdaltest.post_reason('fail')
         return 'fail'
     feat = None
 
@@ -526,7 +487,6 @@ def test_ogr_elasticsearch_3():
 """, '{}')
     ret = lyr.SyncToDisk()
     if ret != 0:
-        gdaltest.post_reason('fail')
         return 'fail'
 
     ds = None
@@ -544,7 +504,6 @@ def test_ogr_elasticsearch_4():
     with gdaltest.error_handler():
         ds = ogr.Open('ES:/vsimem/fakeelasticsearch')
     if ds is None:
-        gdaltest.post_reason('fail')
         return 'fail'
 
     # Test case where there's no index
@@ -552,10 +511,8 @@ def test_ogr_elasticsearch_4():
         """/vsimem/fakeelasticsearch/_cat/indices?h=i""", '\n')
     ds = ogr.Open('ES:/vsimem/fakeelasticsearch')
     if ds is None:
-        gdaltest.post_reason('fail')
         return 'fail'
     if ds.GetLayerCount() != 0:
-        gdaltest.post_reason('fail')
         print(ds.GetLayerCount())
         return 'fail'
 
@@ -627,20 +584,16 @@ def test_ogr_elasticsearch_4():
 
     ds = ogr.Open('ES:/vsimem/fakeelasticsearch')
     if ds is None:
-        gdaltest.post_reason('fail')
         return 'fail'
     lyr = ds.GetLayerByName('a_layer')
     if lyr is None:
-        gdaltest.post_reason('fail')
         return 'fail'
     lyr = ds.GetLayerByName('a_layer')
     if lyr is None:
-        gdaltest.post_reason('fail')
         return 'fail'
     with gdaltest.error_handler():
         lyr = ds.GetLayerByName('not_a_layer')
     if lyr is not None:
-        gdaltest.post_reason('fail')
         return 'fail'
     ds = None
 
@@ -648,7 +601,6 @@ def test_ogr_elasticsearch_4():
     ds = gdal.OpenEx('ES:/vsimem/fakeelasticsearch',
                      open_options=['LAYER=a_layer'])
     if ds.GetLayerCount() != 1:
-        gdaltest.post_reason('fail')
         print(ds.GetLayerCount())
         return 'fail'
     ds = None
@@ -657,7 +609,6 @@ def test_ogr_elasticsearch_4():
         ds = gdal.OpenEx('ES:/vsimem/fakeelasticsearch',
                          open_options=['LAYER=not_a_layer'])
     if ds is not None:
-        gdaltest.post_reason('fail')
         return 'fail'
     ds = None
 
@@ -666,7 +617,6 @@ def test_ogr_elasticsearch_4():
     lyr = ds.GetLayerByName('a_layer')
     lyr = ds.GetLayerByName('a_layer')
     if ds.GetLayerCount() != 1:
-        gdaltest.post_reason('fail')
         print(ds.GetLayerCount())
         return 'fail'
     ds = None
@@ -677,10 +627,8 @@ def test_ogr_elasticsearch_4():
 
     ds = ogr.Open('ES:/vsimem/fakeelasticsearch')
     if ds is None:
-        gdaltest.post_reason('fail')
         return 'fail'
     if ds.GetLayerCount() != 1:
-        gdaltest.post_reason('fail')
         print(ds.GetLayerCount())
         return 'fail'
     lyr = ds.GetLayer(0)
@@ -689,14 +637,11 @@ def test_ogr_elasticsearch_4():
         lyr_defn = lyr.GetLayerDefn()
     idx = lyr_defn.GetFieldIndex("strlist_field")
     if lyr_defn.GetFieldDefn(idx).GetType() != ogr.OFTStringList:
-        gdaltest.post_reason('fail')
         return 'fail'
     idx = lyr_defn.GetGeomFieldIndex("a_geoshape")
     if lyr_defn.GetGeomFieldDefn(idx).GetType() != ogr.wkbLineString:
-        gdaltest.post_reason('fail')
         return 'fail'
     if lyr.GetFIDColumn() != 'my_fid':
-        gdaltest.post_reason('fail')
         return 'fail'
 
     gdal.FileFromMemBuffer("""/vsimem/fakeelasticsearch/a_layer/FeatureCollection/_count?pretty""", """{
@@ -724,13 +669,11 @@ def test_ogr_elasticsearch_4():
 }""")
     fc = lyr.GetFeatureCount()
     if fc != 3:
-        gdaltest.post_reason('fail')
         return 'fail'
 
     with gdaltest.error_handler():
         f = lyr.GetNextFeature()
     if f is not None:
-        gdaltest.post_reason('fail')
         return 'fail'
 
     gdal.FileFromMemBuffer("""/vsimem/fakeelasticsearch/a_layer/FeatureCollection/_search?scroll=1m&size=100""", """{
@@ -739,7 +682,6 @@ def test_ogr_elasticsearch_4():
     lyr.ResetReading()
     f = lyr.GetNextFeature()
     if f is not None:
-        gdaltest.post_reason('fail')
         return 'fail'
 
     gdal.FileFromMemBuffer("""/vsimem/fakeelasticsearch/a_layer/FeatureCollection/_search?scroll=1m&size=100""", """{
@@ -807,7 +749,6 @@ def test_ogr_elasticsearch_4():
     lyr = ds.GetLayer(0)
 
     if lyr.GetLayerDefn().GetFieldCount() != 15:
-        gdaltest.post_reason('fail')
         print(lyr.GetLayerDefn().GetFieldCount())
         return 'fail'
 
@@ -862,7 +803,6 @@ def test_ogr_elasticsearch_4():
     lyr.ResetReading()
     f = lyr.GetNextFeature()
     if f is None:
-        gdaltest.post_reason('fail')
         return 'fail'
     if f.GetFID() != 5 or f['_id'] != 'my_id' or f['str_field'] != 'foo' or f['int_field'] != 1 or f['int64_field'] != 123456789012 or \
        f['double_field'] != 1.23 or f['float_field'] != 3.45 or f['boolean_field'] != 1 or \
@@ -874,7 +814,6 @@ def test_ogr_elasticsearch_4():
        f['doublelist_field'] != [1.23] or \
        f['a_geopoint'].ExportToWkt() != 'POINT (2 49)' or \
        f['a_geoshape'].ExportToWkt() != 'LINESTRING (2 49,3 50)':
-        gdaltest.post_reason('fail')
         f.DumpReadable()
         return 'fail'
 
@@ -882,7 +821,6 @@ def test_ogr_elasticsearch_4():
     lyr.GetNextFeature()
     f = lyr.GetNextFeature()
     if f is None:
-        gdaltest.post_reason('fail')
         return 'fail'
 
     gdal.FileFromMemBuffer("""/vsimem/fakeelasticsearch/_search/scroll?scroll=1m&scroll_id=my_scrollid""", """{
@@ -902,7 +840,6 @@ def test_ogr_elasticsearch_4():
 }""")
     f = lyr.GetNextFeature()
     if f['int_field'] != 2:
-        gdaltest.post_reason('fail')
         return 'fail'
 
     gdal.FileFromMemBuffer("""/vsimem/fakeelasticsearch/_search/scroll?scroll=1m&scroll_id=my_scrollid""", """{
@@ -913,11 +850,9 @@ def test_ogr_elasticsearch_4():
 }""")
     f = lyr.GetNextFeature()
     if f is not None:
-        gdaltest.post_reason('fail')
         return 'fail'
     f = lyr.GetNextFeature()
     if f is not None:
-        gdaltest.post_reason('fail')
         return 'fail'
 
     lyr.SetSpatialFilterRect(1, 48, 3, 50)
@@ -943,7 +878,6 @@ def test_ogr_elasticsearch_4():
 }""")
     f = lyr.GetNextFeature()
     if f['int_field'] != 3:
-        gdaltest.post_reason('fail')
         return 'fail'
 
     lyr.SetSpatialFilterRect(1, 1, 48, 3, 50)
@@ -969,7 +903,6 @@ def test_ogr_elasticsearch_4():
 }""")
     f = lyr.GetNextFeature()
     if f['int_field'] != 4:
-        gdaltest.post_reason('fail')
         return 'fail'
 
     gdal.FileFromMemBuffer("""/vsimem/fakeelasticsearch/a_layer/FeatureCollection/_search?pretty&POSTFIELDS={ "size": 0, "query": { "constant_score" : { "filter": { "geo_bounding_box": { "a_geopoint.coordinates": { "top_left": { "lat": 50.0, "lon": 1.0 }, "bottom_right": { "lat": 48.0, "lon": 3.0 } } } } } } }""", """{
@@ -980,7 +913,6 @@ def test_ogr_elasticsearch_4():
 }""")
     fc = lyr.GetFeatureCount()
     if fc != 10:
-        gdaltest.post_reason('fail')
         return 'fail'
 
     lyr.SetSpatialFilter(None)
@@ -1012,7 +944,6 @@ def test_ogr_elasticsearch_4():
 }""")
     f = lyr.GetNextFeature()
     if f['int_field'] != 5:
-        gdaltest.post_reason('fail')
         return 'fail'
     lyr.SetAttributeFilter(None)
 
@@ -1050,7 +981,6 @@ def test_ogr_elasticsearch_4():
 """)
     f = sql_lyr.GetNextFeature()
     if f['some_field'] != '5':
-        gdaltest.post_reason('fail')
         f.DumpReadable()
         return 'fail'
     ds.ReleaseResultSet(sql_lyr)
@@ -1110,7 +1040,6 @@ def test_ogr_elasticsearch_4():
 }""")
     bbox = lyr.GetExtent(geom_field=1)
     if bbox != (1.0, 2.0, 9.0, 10.0):
-        gdaltest.post_reason('fail')
         print(bbox)
         return 'fail'
 
@@ -1118,38 +1047,32 @@ def test_ogr_elasticsearch_4():
     with gdaltest.error_handler():
         ret = lyr.CreateField(ogr.FieldDefn('foo', ogr.OFTString))
     if ret == 0:
-        gdaltest.post_reason('fail')
         return 'fail'
 
     with gdaltest.error_handler():
         ret = lyr.CreateGeomField(ogr.GeomFieldDefn('shape', ogr.wkbPoint))
     if ret == 0:
-        gdaltest.post_reason('fail')
         return 'fail'
 
     with gdaltest.error_handler():
         ret = lyr.CreateFeature(ogr.Feature(lyr.GetLayerDefn()))
     if ret == 0:
-        gdaltest.post_reason('fail')
         return 'fail'
 
     lyr.ResetReading()
     with gdaltest.error_handler():
         ret = lyr.SetFeature(lyr.GetNextFeature())
     if ret == 0:
-        gdaltest.post_reason('fail')
         return 'fail'
 
     with gdaltest.error_handler():
         lyr = ds.CreateLayer('will_not_work')
     if lyr is not None:
-        gdaltest.post_reason('fail')
         return 'fail'
 
     with gdaltest.error_handler():
         ret = ds.DeleteLayer(0)
     if ret == 0:
-        gdaltest.post_reason('fail')
         return 'fail'
 
     return 'success'
@@ -1183,7 +1106,6 @@ def test_ogr_elasticsearch_5():
         '/vsimem/fakeelasticsearch/non_geojson/my_mapping/&POSTFIELDS={ "ogc_fid": 5, "str": "foo" }', '{}')
     ret = lyr.CreateFeature(feat)
     if ret != 0:
-        gdaltest.post_reason('fail')
         return 'fail'
     feat = None
 
@@ -1294,7 +1216,6 @@ def test_ogr_elasticsearch_5():
 }""")
     index = lyr.GetLayerDefn().GetFieldIndex('another_field')
     if index < 0:
-        gdaltest.post_reason('fail')
         return 'fail'
     f = lyr.GetNextFeature()
     if f['str_field'] != 'foo' or \
@@ -1306,7 +1227,6 @@ def test_ogr_elasticsearch_5():
        f['a_geoshape'].ExportToWkt() != 'LINESTRING (2 49,3 50)' or \
        f['superobject.another_geoshape'].ExportToWkt() != 'POINT (3 50)' or \
        f['superobject.another_geoshape2'].ExportToWkt() != 'POINT (2 50)':
-        gdaltest.post_reason('fail')
         f.DumpReadable()
         return 'fail'
 
@@ -1315,25 +1235,21 @@ def test_ogr_elasticsearch_5():
         """/vsimem/fakeelasticsearch/non_geojson/my_mapping/my_id&POSTFIELDS={ "a_geoshape": { "type": "linestring", "coordinates": [ [ 2.0, 49.0 ], [ 3.0, 50.0 ] ] }, "a_geopoint": { "type": "POINT", "coordinates": [ 2.0, 49.0 ] }, "another_geopoint": [ 2.5, 49.5 ], "superobject": { "another_geoshape": { "type": "point", "coordinates": [ 3.0, 50.0 ] }, "another_geoshape2": { "type": "point", "coordinates": [ 2.0, 50.0 ] }, "subfield": "5", "subobject": { "subfield": "foo", "another_subfield": 6 } }, "str_field": "foo" }""", "{}")
     ret = lyr.SetFeature(f)
     if ret != 0:
-        gdaltest.post_reason('failure')
         return 'fail'
 
     f = lyr.GetNextFeature()
     if f['another_geopoint'].ExportToWkt() != 'POINT (2.1 49.1)':
-        gdaltest.post_reason('fail')
         f.DumpReadable()
         return 'fail'
 
     f = lyr.GetNextFeature()
     if f['another_geopoint'].ExportToWkt() != 'POINT (2.2 49.2)':
-        gdaltest.post_reason('fail')
         f.DumpReadable()
         return 'fail'
 
     # Test geohash
     f = lyr.GetNextFeature()
     if ogrtest.check_feature_geometry(f['another_geopoint'], 'POINT (2 49)') != 0:
-        gdaltest.post_reason('fail')
         f.DumpReadable()
         return 'fail'
 
@@ -1362,7 +1278,6 @@ def test_ogr_elasticsearch_5():
        f['a_geopoint'].ExportToWkt() != 'POINT (2 49)' or \
        f['a_geoshape'].ExportToWkt() != 'LINESTRING (2 49,3 50)' or \
        f['superobject.another_geoshape'].ExportToWkt() != 'POINT (3 50)':
-        gdaltest.post_reason('fail')
         f.DumpReadable()
         return 'fail'
 
@@ -1371,14 +1286,12 @@ def test_ogr_elasticsearch_5():
     lyr = ds.GetLayer(0)
     index = lyr.GetLayerDefn().GetFieldIndex('another_field')
     if index >= 0:
-        gdaltest.post_reason('fail')
         return 'fail'
     f = lyr.GetNextFeature()
     if f['str_field'] != 'foo' or \
        f['superobject'] != '{ "subfield": 5, "subobject": { "subfield": "foo", "another_subfield": 6 }, "another_geoshape": { "type": "point", "coordinates": [ 3, 50 ] }, "another_geoshape2": { "type": "point", "coordinates": [ 2, 50 ] } }' or \
        f['a_geopoint'].ExportToWkt() != 'POINT (2 49)' or \
        f['a_geoshape'].ExportToWkt() != 'LINESTRING (2 49,3 50)':
-        gdaltest.post_reason('fail')
         f.DumpReadable()
         return 'fail'
 
@@ -1392,7 +1305,6 @@ def test_ogr_elasticsearch_5():
        f['a_geopoint'].ExportToWkt() != 'POINT (2 49)' or \
        f['a_geoshape'].ExportToWkt() != 'LINESTRING (2 49,3 50)' or \
        f['superobject.another_geoshape'].ExportToWkt() != 'POINT (3 50)':
-        gdaltest.post_reason('fail')
         f.DumpReadable()
         return 'fail'
 
@@ -1402,7 +1314,6 @@ def test_ogr_elasticsearch_5():
         """/vsimem/fakeelasticsearch/non_geojson/my_mapping/my_id&POSTFIELDS={ "foo": "bar" }""", "{}")
     ret = lyr.SetFeature(f)
     if ret != 0:
-        gdaltest.post_reason('fail')
         return 'fail'
 
     return 'success'
@@ -1483,26 +1394,22 @@ def test_ogr_elasticsearch_6():
 }""")
     f = lyr.GetNextFeature()
     if f['geometry'].ExportToWkt() != 'POLYGON ((2 49,3 49,3 50,2 50,2 49))':
-        gdaltest.post_reason('fail')
         f.DumpReadable()
         return 'fail'
 
     f = lyr.GetNextFeature()
     ref_txt = f['geometry'].ExportToWkt()
     if ref_txt.find('POLYGON ((') != 0:
-        gdaltest.post_reason('fail')
         f.DumpReadable()
         return 'fail'
 
     f = lyr.GetNextFeature()
     if f['geometry'].ExportToWkt() != ref_txt:
-        gdaltest.post_reason('fail')
         f.DumpReadable()
         return 'fail'
 
     f = lyr.GetNextFeature()
     if f['geometry'].ExportToWkt() != ref_txt:
-        gdaltest.post_reason('fail')
         f.DumpReadable()
         return 'fail'
 
@@ -1532,7 +1439,6 @@ def test_ogr_elasticsearch_7():
 
     f = gdal.VSIFOpenL('/vsimem/map.txt', 'rb')
     if f is None:
-        gdaltest.post_reason('fail')
         return 'fail'
     data = gdal.VSIFReadL(1, 10000, f).decode('ascii')
     gdal.VSIFCloseL(f)
@@ -1540,7 +1446,6 @@ def test_ogr_elasticsearch_7():
     gdal.Unlink('/vsimem/map.txt')
 
     if data != '{ "FeatureCollection": { "properties": { "type": { "type": "string" }, "properties": { "properties": { } }, "geometry": { "type": "geo_shape" } } } }':
-        gdaltest.post_reason('fail')
         print(data)
         return 'fail'
 
@@ -1586,7 +1491,6 @@ def test_ogr_elasticsearch_8():
         gdaltest.post_reason('warning expected')
         return 'fail'
     if ret != 0:
-        gdaltest.post_reason('fail')
         return 'fail'
 
     # Non EPSG-4326 SRS
@@ -1605,7 +1509,6 @@ def test_ogr_elasticsearch_8():
 """, "{}")
     ret = lyr.CreateFeature(f)
     if ret != 0:
-        gdaltest.post_reason('fail')
         return 'fail'
 
     return 'success'
@@ -1691,7 +1594,6 @@ def test_ogr_elasticsearch_9():
 
     count = lyr.GetFeatureCount()
     if count != 2:
-        gdaltest.post_reason('fail')
         return 'fail'
 
     gdal.FileFromMemBuffer("""/vsimem/fakeelasticsearch/a_layer/FeatureCollection/_search?scroll=1m&size=100&POSTFIELDS={ "query": { "constant_score" : { "filter": { "geo_shape": { "a_geoshape": { "shape": { "type": "envelope", "coordinates": [ [ 2.0, 50.0 ], [ 3.0, 49.0 ] ] } } } } } } }""",
@@ -1717,7 +1619,6 @@ def test_ogr_elasticsearch_9():
 }""")
     f = lyr.GetNextFeature()
     if f is None:
-        gdaltest.post_reason('fail')
         return 'fail'
 
     return 'success'
@@ -1803,7 +1704,6 @@ def test_ogr_elasticsearch_10():
 }""")
     f = lyr.GetNextFeature()
     if f is None:
-        gdaltest.post_reason('fail')
         return 'fail'
 
     lyr.SetAttributeFilter("text_field = 'foo'")
@@ -1826,7 +1726,6 @@ def test_ogr_elasticsearch_10():
 }""")
     f = lyr.GetNextFeature()
     if f is None:
-        gdaltest.post_reason('fail')
         return 'fail'
 
     lyr.SetAttributeFilter("text_field_with_raw = 'foo'")
@@ -1849,7 +1748,6 @@ def test_ogr_elasticsearch_10():
 }""")
     f = lyr.GetNextFeature()
     if f is None:
-        gdaltest.post_reason('fail')
         return 'fail'
 
     lyr.SetAttributeFilter("\"_id\" = 'my_id2'")
@@ -1871,7 +1769,6 @@ def test_ogr_elasticsearch_10():
 }""")
     f = lyr.GetNextFeature()
     if f is None:
-        gdaltest.post_reason('fail')
         return 'fail'
 
     lyr.SetAttributeFilter("keyword_field != 'foo'")
@@ -1894,7 +1791,6 @@ def test_ogr_elasticsearch_10():
 }""")
     f = lyr.GetNextFeature()
     if f is None:
-        gdaltest.post_reason('fail')
         return 'fail'
 
     lyr.SetAttributeFilter("keyword_field IS NULL")
@@ -1916,7 +1812,6 @@ def test_ogr_elasticsearch_10():
 }""")
     f = lyr.GetNextFeature()
     if f is None:
-        gdaltest.post_reason('fail')
         return 'fail'
 
     lyr.SetAttributeFilter("keyword_field BETWEEN 'bar' AND 'foo'")
@@ -1939,7 +1834,6 @@ def test_ogr_elasticsearch_10():
 }""")
     f = lyr.GetNextFeature()
     if f is None:
-        gdaltest.post_reason('fail')
         return 'fail'
 
     lyr.SetAttributeFilter("keyword_field IN ('foo', 'bar')")
@@ -1962,7 +1856,6 @@ def test_ogr_elasticsearch_10():
 }""")
     f = lyr.GetNextFeature()
     if f is None:
-        gdaltest.post_reason('fail')
         return 'fail'
 
     lyr.SetAttributeFilter("text_field IN ('foo', 'bar')")
@@ -1985,7 +1878,6 @@ def test_ogr_elasticsearch_10():
 }""")
     f = lyr.GetNextFeature()
     if f is None:
-        gdaltest.post_reason('fail')
         return 'fail'
 
     lyr.SetAttributeFilter("text_field_with_raw IN ('foo', 'bar')")
@@ -2008,7 +1900,6 @@ def test_ogr_elasticsearch_10():
 }""")
     f = lyr.GetNextFeature()
     if f is None:
-        gdaltest.post_reason('fail')
         return 'fail'
 
     lyr.SetAttributeFilter("\"_id\" IN ('my_id', 'bar')")
@@ -2031,7 +1922,6 @@ def test_ogr_elasticsearch_10():
 }""")
     f = lyr.GetNextFeature()
     if f is None:
-        gdaltest.post_reason('fail')
         return 'fail'
 
     lyr.SetAttributeFilter(
@@ -2057,7 +1947,6 @@ def test_ogr_elasticsearch_10():
 }""")
     f = lyr.GetNextFeature()
     if f is None:
-        gdaltest.post_reason('fail')
         return 'fail'
 
     lyr.SetAttributeFilter("dt_field > '2016/01/01 12:34:56.123'")
@@ -2080,7 +1969,6 @@ def test_ogr_elasticsearch_10():
 }""")
     f = lyr.GetNextFeature()
     if f is None:
-        gdaltest.post_reason('fail')
         return 'fail'
 
     lyr.SetAttributeFilter("NOT dt_field < '2016/01/01 12:34:56.123'")
@@ -2103,7 +1991,6 @@ def test_ogr_elasticsearch_10():
 }""")
     f = lyr.GetNextFeature()
     if f is None:
-        gdaltest.post_reason('fail')
         return 'fail'
 
     lyr.SetAttributeFilter("keyword_field LIKE '_o%'")
@@ -2126,7 +2013,6 @@ def test_ogr_elasticsearch_10():
 }""")
     f = lyr.GetNextFeature()
     if f is None:
-        gdaltest.post_reason('fail')
         return 'fail'
 
     # Evaluated client-side since the pattern uses ? or *
@@ -2150,7 +2036,6 @@ def test_ogr_elasticsearch_10():
 }""")
     f = lyr.GetNextFeature()
     if f is None:
-        gdaltest.post_reason('fail')
         return 'fail'
 
     # Evaluated client-side since the field is analyzed
@@ -2174,7 +2059,6 @@ def test_ogr_elasticsearch_10():
 }""")
     f = lyr.GetNextFeature()
     if f is None:
-        gdaltest.post_reason('fail')
         return 'fail'
 
     lyr.SetAttributeFilter("text_field_with_raw LIKE '_xo%' ESCAPE 'x'")
@@ -2197,7 +2081,6 @@ def test_ogr_elasticsearch_10():
 }""")
     f = lyr.GetNextFeature()
     if f is None:
-        gdaltest.post_reason('fail')
         return 'fail'
 
     lyr.SetAttributeFilter("keyword_field = 'foo' AND 1 = 1")
@@ -2220,13 +2103,11 @@ def test_ogr_elasticsearch_10():
 }""")
     f = lyr.GetNextFeature()
     if f is None:
-        gdaltest.post_reason('fail')
         return 'fail'
 
     lyr.SetAttributeFilter("1 = 1 AND keyword_field = 'foo'")
     f = lyr.GetNextFeature()
     if f is None:
-        gdaltest.post_reason('fail')
         return 'fail'
 
     lyr.SetAttributeFilter("keyword_field = 'bar' OR 1 = 0")
@@ -2249,7 +2130,6 @@ def test_ogr_elasticsearch_10():
 }""")
     f = lyr.GetNextFeature()
     if f is None:
-        gdaltest.post_reason('fail')
         return 'fail'
 
     lyr.SetAttributeFilter("keyword_field = 'foo2'")
@@ -2277,7 +2157,6 @@ def test_ogr_elasticsearch_10():
 }""")
     f = lyr.GetNextFeature()
     if f is None:
-        gdaltest.post_reason('fail')
         return 'fail'
 
     # SQL with WHERE
@@ -2285,7 +2164,6 @@ def test_ogr_elasticsearch_10():
         "SELECT * FROM a_layer WHERE keyword_field = 'foo'")
     f = sql_lyr.GetNextFeature()
     if f is None:
-        gdaltest.post_reason('fail')
         return 'fail'
     ds.ReleaseResultSet(sql_lyr)
 
@@ -2311,7 +2189,6 @@ def test_ogr_elasticsearch_10():
 }""")
     f = sql_lyr.GetNextFeature()
     if f is None:
-        gdaltest.post_reason('fail')
         return 'fail'
     ds.ReleaseResultSet(sql_lyr)
 
@@ -2336,7 +2213,6 @@ def test_ogr_elasticsearch_10():
 }""")
     f = sql_lyr.GetNextFeature()
     if f is None:
-        gdaltest.post_reason('fail')
         return 'fail'
     ds.ReleaseResultSet(sql_lyr)
 
@@ -2361,7 +2237,6 @@ def test_ogr_elasticsearch_10():
 }""")
     f = sql_lyr.GetNextFeature()
     if f is None:
-        gdaltest.post_reason('fail')
         return 'fail'
     ds.ReleaseResultSet(sql_lyr)
 
@@ -2456,19 +2331,16 @@ def test_ogr_elasticsearch_11():
 
     f = lyr.GetNextFeature()
     if f['str_field'] != 'foo':
-        gdaltest.post_reason('fail')
         f.DumpReadable()
         return 'fail'
 
     f = lyr.GetNextFeature()
     if f['str_field'] is not None:
-        gdaltest.post_reason('fail')
         f.DumpReadable()
         return 'fail'
 
     f = lyr.GetNextFeature()
     if f.IsFieldSet('str_field'):
-        gdaltest.post_reason('fail')
         f.DumpReadable()
         return 'fail'
 
@@ -2491,18 +2363,15 @@ def test_ogr_elasticsearch_11():
     f.SetFieldNull('str_field')
     ret = lyr.CreateFeature(f)
     if ret != 0:
-        gdaltest.post_reason('fail')
         return 'fail'
     f = None
 
     f = ogr.Feature(lyr.GetLayerDefn())
     ret = lyr.CreateFeature(f)
     if ret != 0:
-        gdaltest.post_reason('fail')
         return 'fail'
     f = None
     if lyr.SyncToDisk() != 0:
-        gdaltest.post_reason('fail')
         return 'fail'
 
     return 'success'
@@ -2550,7 +2419,6 @@ def test_ogr_elasticsearch_authentication():
     ds = gdal.OpenEx('ES:/vsimem/fakeelasticsearch',
                      open_options=['USERPWD=user:pwd'])
     if ds is None:
-        gdaltest.post_reason('fail')
         return 'fail'
 
     return 'success'
diff --git a/autotest/ogr/ogr_factory.py b/autotest/ogr/ogr_factory.py
index 0f23543f8c10..7ccdd3ed4d61 100755
--- a/autotest/ogr/ogr_factory.py
+++ b/autotest/ogr/ogr_factory.py
@@ -584,14 +584,12 @@ def test_ogr_factory_8():
         if exp_wkt is None:
             exp_wkt = src_wkt
         elif target_type != ogr.wkbUnknown and dst_geom.GetGeometryType() != target_type:
-            gdaltest.post_reason('fail')
             print(src_wkt)
             print(target_type)
             print(dst_geom.ExportToWkt())
             return 'fail'
 
         if ogrtest.check_feature_geometry(dst_geom, exp_wkt):
-            gdaltest.post_reason('fail')
             print(src_wkt)
             print(target_type)
             print(dst_geom.ExportToWkt())
diff --git a/autotest/ogr/ogr_feature.py b/autotest/ogr/ogr_feature.py
index 4af512d72cbd..bff89a400941 100755
--- a/autotest/ogr/ogr_feature.py
+++ b/autotest/ogr/ogr_feature.py
@@ -110,7 +110,6 @@ def mk_src_feature():
     expected_vals = [2011, 11, 11, 14, 10, 35.123, 0]
     for i, exp_val in enumerate(expected_vals):
         if abs(got_vals[i] - exp_val) > 1e-4:
-            gdaltest.post_reason('fail')
             print(got_vals)
             print(expected_vals)
     src_feature.field_integerlist = '(3:10,20,30)'
@@ -189,7 +188,6 @@ def test_ogr_feature_cp_integer():
         vals.append(val)
     if vals != [17, 2147483647, 18, 0, None, None, None, None, 15,
                 2147483647, 17, None]:
-        gdaltest.post_reason('fail')
         print(vals)
         return 'fail'
 
@@ -217,7 +215,6 @@ def test_ogr_feature_cp_integer64():
     int32_ovflw = dst_feature.GetFieldAsInteger('field_integer64')
     gdal.PopErrorHandler()
     if int32_ovflw != 2147483647:
-        gdaltest.post_reason('fail')
         return 'fail'
 
     if not check(dst_feature, 'field_real', 18):
@@ -800,14 +797,12 @@ def test_ogr_feature_overflow_64bit_integer():
     f.SetField(0, '9999999999999999999')
     gdal.PopErrorHandler()
     if f.GetField(0) != 9223372036854775807:
-        gdaltest.post_reason('fail')
         f.DumpReadable()
         return 'fail'
     gdal.PushErrorHandler()
     f.SetField(0, '-9999999999999999999')
     gdal.PopErrorHandler()
     if f.GetField(0) != -9223372036854775808:
-        gdaltest.post_reason('fail')
         f.DumpReadable()
         return 'fail'
     return 'success'
@@ -821,22 +816,18 @@ def test_ogr_feature_nullable_validate():
     feat_def = ogr.FeatureDefn('test')
     f = ogr.Feature(feat_def)
     if f.Validate() != 1:
-        gdaltest.post_reason('fail')
         return 'fail'
 
     # Field with default parameter and empty feature
     feat_def = ogr.FeatureDefn('test')
     field_def = ogr.FieldDefn('field_string', ogr.OFTString)
     if field_def.IsNullable() != 1:
-        gdaltest.post_reason('fail')
         return 'fail'
     if feat_def.GetGeomFieldDefn(0).IsNullable() != 1:
-        gdaltest.post_reason('fail')
         return 'fail'
     feat_def.AddFieldDefn(field_def)
     f = ogr.Feature(feat_def)
     if f.Validate() != 1:
-        gdaltest.post_reason('fail')
         return 'fail'
 
     # Field with not NULL constraint and empty feature
@@ -844,7 +835,6 @@ def test_ogr_feature_nullable_validate():
     field_def = ogr.FieldDefn('field_string', ogr.OFTString)
     field_def.SetNullable(0)
     if field_def.IsNullable() != 0:
-        gdaltest.post_reason('fail')
         return 'fail'
     feat_def.AddFieldDefn(field_def)
     f = ogr.Feature(feat_def)
@@ -852,7 +842,6 @@ def test_ogr_feature_nullable_validate():
     ret = f.Validate()
     gdal.PopErrorHandler()
     if ret != 0:
-        gdaltest.post_reason('fail')
         return 'fail'
 
     # Field with not NULL constraint and non-empty feature
@@ -863,7 +852,6 @@ def test_ogr_feature_nullable_validate():
     f = ogr.Feature(feat_def)
     f.SetField(0, 'foo')
     if f.Validate() != 1:
-        gdaltest.post_reason('fail')
         return 'fail'
 
     # Field with width constraint that is met
@@ -874,7 +862,6 @@ def test_ogr_feature_nullable_validate():
     f = ogr.Feature(feat_def)
     f.SetField(0, 'foo')
     if f.Validate() != 1:
-        gdaltest.post_reason('fail')
         return 'fail'
 
     # Field with width constraint that is not met
@@ -888,7 +875,6 @@ def test_ogr_feature_nullable_validate():
     ret = f.Validate()
     gdal.PopErrorHandler()
     if ret != 0:
-        gdaltest.post_reason('fail')
         return 'fail'
 
     # Geometry field with not-null geometry constraint that is met
@@ -897,13 +883,11 @@ def test_ogr_feature_nullable_validate():
     gfield_def = ogr.GeomFieldDefn('test', ogr.wkbUnknown)
     gfield_def.SetNullable(0)
     if gfield_def.IsNullable() != 0:
-        gdaltest.post_reason('fail')
         return 'fail'
     feat_def.AddGeomFieldDefn(gfield_def)
     f = ogr.Feature(feat_def)
     f.SetGeometry(ogr.CreateGeometryFromWkt('POINT(0 1)'))
     if f.Validate() != 1:
-        gdaltest.post_reason('fail')
         return 'fail'
 
     # Geometry field with not-null geometry constraint that is not met
@@ -917,7 +901,6 @@ def test_ogr_feature_nullable_validate():
     ret = f.Validate()
     gdal.PopErrorHandler()
     if ret != 0:
-        gdaltest.post_reason('fail')
         return 'fail'
 
     # Geometry field with Point geometry type that is met
@@ -926,7 +909,6 @@ def test_ogr_feature_nullable_validate():
     f = ogr.Feature(feat_def)
     f.SetGeometry(ogr.CreateGeometryFromWkt('POINT(0 1)'))
     if f.Validate() != 1:
-        gdaltest.post_reason('fail')
         return 'fail'
 
     # Geometry field with LineString geometry type that is not met
@@ -938,7 +920,6 @@ def test_ogr_feature_nullable_validate():
     ret = f.Validate()
     gdal.PopErrorHandler()
     if ret != 0:
-        gdaltest.post_reason('fail')
         return 'fail'
 
     return 'success'
@@ -953,45 +934,36 @@ def test_ogr_feature_default():
     field_def = ogr.FieldDefn('field_string', ogr.OFTString)
 
     if field_def.GetDefault() is not None:
-        gdaltest.post_reason('fail')
         return 'fail'
     if field_def.IsDefaultDriverSpecific():
-        gdaltest.post_reason('fail')
         return 'fail'
 
     field_def.SetDefault("(some_expr)")
     if field_def.GetDefault() != "(some_expr)":
-        gdaltest.post_reason('fail')
         return 'fail'
     if not field_def.IsDefaultDriverSpecific():
-        gdaltest.post_reason('fail')
         return 'fail'
 
     field_def.SetDefault("'a")
     if field_def.GetDefault() != "'a":
-        gdaltest.post_reason('fail')
         return 'fail'
 
     gdal.PushErrorHandler()
     field_def.SetDefault("'a''")
     gdal.PopErrorHandler()
     if field_def.GetDefault() is not None:
-        gdaltest.post_reason('fail')
         return 'fail'
 
     gdal.PushErrorHandler()
     field_def.SetDefault("'a'b'")
     gdal.PopErrorHandler()
     if field_def.GetDefault() is not None:
-        gdaltest.post_reason('fail')
         return 'fail'
 
     field_def.SetDefault("'a''b'''")
     if field_def.GetDefault() != "'a''b'''":
-        gdaltest.post_reason('fail')
         return 'fail'
     if field_def.IsDefaultDriverSpecific():
-        gdaltest.post_reason('fail')
         return 'fail'
     feat_def.AddFieldDefn(field_def)
 
@@ -1018,7 +990,6 @@ def test_ogr_feature_default():
        f.GetField('field_int') != 123 or \
        f.IsFieldSet('field_nodefault'):
         f.DumpReadable()
-        gdaltest.post_reason('fail')
         return 'fail'
 
     f = ogr.Feature(feat_def)
@@ -1026,7 +997,6 @@ def test_ogr_feature_default():
     f.FillUnsetWithDefault()
     if f.GetField('field_string') != 'b':
         f.DumpReadable()
-        gdaltest.post_reason('fail')
         return 'fail'
 
     return 'success'
@@ -1040,45 +1010,35 @@ def test_ogr_feature_native_data():
     feat_def = ogr.FeatureDefn('test')
     f = ogr.Feature(feat_def)
     if f.GetNativeData() is not None:
-        gdaltest.post_reason('fail')
         return 'fail'
     if f.GetNativeMediaType() is not None:
-        gdaltest.post_reason('fail')
         return 'fail'
 
     f.SetNativeData('native_data')
     if f.GetNativeData() != 'native_data':
-        gdaltest.post_reason('fail')
         return 'fail'
     f.SetNativeMediaType('native_media_type')
     if f.GetNativeMediaType() != 'native_media_type':
-        gdaltest.post_reason('fail')
         print(f.GetNativeMediaType())
         return 'fail'
 
     f2 = ogr.Feature(feat_def)
     f2.SetFrom(f)
     if f2.GetNativeData() != 'native_data':
-        gdaltest.post_reason('fail')
         return 'fail'
     if f2.GetNativeMediaType() != 'native_media_type':
-        gdaltest.post_reason('fail')
         return 'fail'
 
     f_clone = f.Clone()
     if f_clone.GetNativeData() != 'native_data':
-        gdaltest.post_reason('fail')
         return 'fail'
     if f_clone.GetNativeMediaType() != 'native_media_type':
-        gdaltest.post_reason('fail')
         return 'fail'
     f_clone.SetNativeData(None)
     f_clone.SetNativeMediaType(None)
     if f_clone.GetNativeData() is not None:
-        gdaltest.post_reason('fail')
         return 'fail'
     if f_clone.GetNativeMediaType() is not None:
-        gdaltest.post_reason('fail')
         return 'fail'
 
     ds = ogr.GetDriverByName('Memory').CreateDataSource('')
@@ -1098,24 +1058,20 @@ def test_ogr_feature_native_data():
         sql_lyr = ds.ExecuteSQL('SELECT * FROM %s' % lyr.GetName(), dialect=dialect)
         native_data = sql_lyr.GetMetadataItem('NATIVE_DATA', 'NATIVE_DATA')
         if native_data != 'native_data':
-            gdaltest.post_reason('fail')
             print(dialect)
             print(native_data)
             return 'fail'
         native_media_type = sql_lyr.GetMetadataItem('NATIVE_MEDIA_TYPE', 'NATIVE_DATA')
         if native_media_type != 'native_media_type':
-            gdaltest.post_reason('fail')
             print(dialect)
             print(native_media_type)
             return 'fail'
         f = sql_lyr.GetNextFeature()
         if f.GetNativeData() != 'native_data':
-            gdaltest.post_reason('fail')
             print(dialect)
             print(f.GetNativeData())
             return 'fail'
         if f.GetNativeMediaType() != 'native_media_type':
-            gdaltest.post_reason('fail')
             print(dialect)
             print(f.GetNativeMediaType())
             return 'fail'
@@ -1137,7 +1093,6 @@ def test_ogr_feature_set_geometry_self():
     f.SetGeometry(f.GetGeometryRef())
     f.SetGeometry(f.GetGeometryRef())
     if f.GetGeometryRef().ExportToWkt() != 'POINT (2 49)':
-        gdaltest.post_reason('fail')
         return 'fail'
 
     return 'success'
@@ -1153,22 +1108,17 @@ def test_ogr_feature_null_field():
     feat_def.AddFieldDefn(field_def)
     f = ogr.Feature(feat_def)
     if f.IsFieldNull(feat_def.GetFieldIndex("field_string")):
-        gdaltest.post_reason('fail')
         return 'fail'
     if f.IsFieldNull("field_string"):
-        gdaltest.post_reason('fail')
         return 'fail'
     f.SetFieldNull(feat_def.GetFieldIndex("field_string"))
     if f.IsFieldNull(feat_def.GetFieldIndex("field_string")) == 0:
-        gdaltest.post_reason('fail')
         return 'fail'
     f.SetField("field_string", "foo")
     if f.IsFieldNull("field_string"):
-        gdaltest.post_reason('fail')
         return 'fail'
     f.SetFieldNull("field_string")
     if f.IsFieldNull(feat_def.GetFieldIndex("field_string")) == 0:
-        gdaltest.post_reason('fail')
         return 'fail'
     f = None
 
@@ -1194,19 +1144,14 @@ def test_ogr_feature_null_field():
     f.field_reallist = [123.5, 567.0]
     f.field_stringlist = ['abc', 'def']
     if f.IsFieldNull('field_binary') != 0:
-        gdaltest.post_reason('fail')
         return 'fail'
     if f.IsFieldNull('field_integerlist') != 0:
-        gdaltest.post_reason('fail')
         return 'fail'
     if f.IsFieldNull('field_integer64list') != 0:
-        gdaltest.post_reason('fail')
         return 'fail'
     if f.IsFieldNull('field_reallist') != 0:
-        gdaltest.post_reason('fail')
         return 'fail'
     if f.IsFieldNull('field_stringlist') != 0:
-        gdaltest.post_reason('fail')
         return 'fail'
     f.SetField('field_binary', None)
     f.SetFieldNull('field_integerlist')
@@ -1214,27 +1159,20 @@ def test_ogr_feature_null_field():
     f.SetFieldNull('field_reallist')
     f.SetFieldNull('field_stringlist')
     if f.IsFieldNull('field_binary') == 0:
-        gdaltest.post_reason('fail')
         return 'fail'
     if f.IsFieldNull('field_integerlist') == 0:
-        gdaltest.post_reason('fail')
         return 'fail'
     if f.IsFieldNull('field_integer64list') == 0:
-        gdaltest.post_reason('fail')
         return 'fail'
     if f.IsFieldNull('field_reallist') == 0:
-        gdaltest.post_reason('fail')
         return 'fail'
     if f.IsFieldNull('field_stringlist') == 0:
-        gdaltest.post_reason('fail')
         return 'fail'
 
     f_clone = f.Clone()
     if f_clone.IsFieldNull('field_binary') == 0:
-        gdaltest.post_reason('fail')
         return 'fail'
     if not f.Equal(f_clone):
-        gdaltest.post_reason('fail')
         return 'fail'
 
     f = None
diff --git a/autotest/ogr/ogr_fgdb.py b/autotest/ogr/ogr_fgdb.py
index c40a8cd9cb5b..7e2032033f88 100755
--- a/autotest/ogr/ogr_fgdb.py
+++ b/autotest/ogr/ogr_fgdb.py
@@ -175,7 +175,6 @@ def test_ogr_fgdb_1():
         lyr = ds.GetLayerByName(data[0])
         if data[1] != ogr.wkbNone:
             if lyr.GetSpatialRef().IsSame(srs) != 1:
-                gdaltest.post_reason('fail')
                 print(lyr.GetSpatialRef())
                 return 'fail'
         feat = lyr.GetNextFeature()
@@ -186,12 +185,10 @@ def test_ogr_fgdb_1():
                 expected_wkt = data[2]
             if expected_wkt is None:
                 if feat.GetGeometryRef() is not None:
-                    gdaltest.post_reason('fail')
                     print(data)
                     feat.DumpReadable()
                     return 'fail'
             elif ogrtest.check_feature_geometry(feat, expected_wkt) != 0:
-                gdaltest.post_reason('fail')
                 print(data)
                 feat.DumpReadable()
                 return 'fail'
@@ -207,21 +204,17 @@ def test_ogr_fgdb_1():
            feat.GetField('binary') != "00FF7F" or \
            feat.GetField('binary2') != "123456" or \
            feat.GetField('smallint2') != -32768:
-            gdaltest.post_reason('fail')
             feat.DumpReadable()
             return 'fail'
 
         sql_lyr = ds.ExecuteSQL("GetLayerDefinition %s" % lyr.GetName())
         if sql_lyr is None:
-            gdaltest.post_reason('failure')
             return 'fail'
         feat = sql_lyr.GetNextFeature()
         if feat is None:
-            gdaltest.post_reason('failure')
             return 'fail'
         feat = sql_lyr.GetNextFeature()
         if feat is not None:
-            gdaltest.post_reason('failure')
             return 'fail'
         lyr.ResetReading()
         lyr.TestCapability("foo")
@@ -229,22 +222,18 @@ def test_ogr_fgdb_1():
 
         sql_lyr = ds.ExecuteSQL("GetLayerMetadata %s" % lyr.GetName())
         if sql_lyr is None:
-            gdaltest.post_reason('failure')
             return 'fail'
         feat = sql_lyr.GetNextFeature()
         if feat is None:
-            gdaltest.post_reason('failure')
             return 'fail'
         ds.ReleaseResultSet(sql_lyr)
 
     sql_lyr = ds.ExecuteSQL("GetLayerDefinition foo")
     if sql_lyr is not None:
-        gdaltest.post_reason('failure')
         return 'fail'
 
     sql_lyr = ds.ExecuteSQL("GetLayerMetadata foo")
     if sql_lyr is not None:
-        gdaltest.post_reason('failure')
         return 'fail'
 
     ds = None
@@ -263,26 +252,19 @@ def test_ogr_fgdb_DeleteField():
     lyr = ds.GetLayerByIndex(0)
 
     if lyr.GetLayerDefn().GetFieldDefn(lyr.GetLayerDefn().GetFieldIndex('smallint')).GetSubType() != ogr.OFSTInt16:
-        gdaltest.post_reason('fail')
         return 'fail'
     if lyr.GetLayerDefn().GetFieldDefn(lyr.GetLayerDefn().GetFieldIndex('smallint2')).GetSubType() != ogr.OFSTInt16:
-        gdaltest.post_reason('fail')
         return 'fail'
     if lyr.GetLayerDefn().GetFieldDefn(lyr.GetLayerDefn().GetFieldIndex('float')).GetSubType() != ogr.OFSTFloat32:
-        gdaltest.post_reason('fail')
         return 'fail'
     if lyr.GetLayerDefn().GetFieldDefn(lyr.GetLayerDefn().GetFieldIndex('float2')).GetSubType() != ogr.OFSTFloat32:
-        gdaltest.post_reason('fail')
         return 'fail'
 
     if lyr.GetLayerDefn().GetFieldDefn(lyr.GetLayerDefn().GetFieldIndex('smallint')).GetWidth() != 0:
-        gdaltest.post_reason('failure')
         return 'fail'
     if lyr.GetLayerDefn().GetFieldDefn(lyr.GetLayerDefn().GetFieldIndex('str')).GetWidth() != 0:
-        gdaltest.post_reason('failure')
         return 'fail'
     if lyr.DeleteField(lyr.GetLayerDefn().GetFieldIndex('str')) != 0:
-        gdaltest.post_reason('failure')
         return 'fail'
 
     # Needed since FileGDB v1.4, otherwise crash/error ...
@@ -314,14 +296,11 @@ def test_ogr_fgdb_DeleteField():
     ds = ogr.Open("tmp/test.gdb")
     lyr = ds.GetLayerByIndex(0)
     if lyr.GetLayerDefn().GetFieldDefn(lyr.GetLayerDefn().GetFieldIndex('str2')).GetWidth() != 80:
-        gdaltest.post_reason('failure')
         return 'fail'
     if lyr.GetLayerDefn().GetFieldIndex('str') != -1:
-        gdaltest.post_reason('failure')
         return 'fail'
     feat = lyr.GetNextFeature()
     if feat.GetFieldAsString("str2") != "foo2_\xc3\xa9":
-        gdaltest.post_reason('failure')
         return 'fail'
     ds = None
 
@@ -705,23 +684,18 @@ def test_ogr_fgdb_10():
     ds = ogr.Open('tmp/test.gdb')
     lyr = ds.GetLayerByName("srs_exact_4326")
     if lyr.GetSpatialRef().ExportToWkt().find('4326') == -1:
-        gdaltest.post_reason('fail')
         return 'fail'
     lyr = ds.GetLayerByName("srs_approx_4326")
     if lyr.GetSpatialRef().ExportToWkt().find('4326') == -1:
-        gdaltest.post_reason('fail')
         return 'fail'
     lyr = ds.GetLayerByName("srs_exact_2193")
     if lyr.GetSpatialRef().ExportToWkt().find('2193') == -1:
-        gdaltest.post_reason('fail')
         return 'fail'
     lyr = ds.GetLayerByName("srs_approx_2193")
     if lyr.GetSpatialRef().ExportToWkt().find('2193') == -1:
-        gdaltest.post_reason('fail')
         return 'fail'
     lyr = ds.GetLayerByName("srs_approx_4230")
     if lyr.GetSpatialRef().ExportToWkt().find('4230') == -1:
-        gdaltest.post_reason('fail')
         return 'fail'
     ds = None
 
@@ -810,7 +784,6 @@ def test_ogr_fgdb_12():
 
     ds = ogr.Open('tmp/non_existing.gdb')
     if ds is not None:
-        gdaltest.post_reason('fail')
         return 'fail'
 
     gdal.Unlink('tmp/dummy.gdb')
@@ -824,7 +797,6 @@ def test_ogr_fgdb_12():
 
     ds = ogr.Open('tmp/dummy.gdb')
     if ds is not None:
-        gdaltest.post_reason('fail')
         return 'fail'
 
     os.unlink('tmp/dummy.gdb')
@@ -835,7 +807,6 @@ def test_ogr_fgdb_12():
     ds = ogr.Open('tmp/dummy.gdb')
     gdal.PopErrorHandler()
     if ds is not None:
-        gdaltest.post_reason('fail')
         return 'fail'
 
     shutil.rmtree('tmp/dummy.gdb')
@@ -854,7 +825,6 @@ def test_ogr_fgdb_13():
     ds = ogrtest.fgdb_drv.CreateDataSource('tmp/foo')
     gdal.PopErrorHandler()
     if ds is not None:
-        gdaltest.post_reason('fail')
         return 'fail'
 
     f = open('tmp/dummy.gdb', 'wb')
@@ -864,7 +834,6 @@ def test_ogr_fgdb_13():
     ds = ogrtest.fgdb_drv.CreateDataSource('tmp/dummy.gdb')
     gdal.PopErrorHandler()
     if ds is not None:
-        gdaltest.post_reason('fail')
         return 'fail'
 
     os.unlink('tmp/dummy.gdb')
@@ -880,14 +849,12 @@ def test_ogr_fgdb_13():
     ds = ogrtest.fgdb_drv.CreateDataSource(name)
     gdal.PopErrorHandler()
     if ds is not None:
-        gdaltest.post_reason('fail')
         return 'fail'
 
     gdal.PushErrorHandler('CPLQuietErrorHandler')
     ret = ogrtest.fgdb_drv.DeleteDataSource(name)
     gdal.PopErrorHandler()
     if ret == 0:
-        gdaltest.post_reason('fail')
         return 'fail'
 
     return 'success'
@@ -903,11 +870,9 @@ def test_ogr_fgdb_14():
     for _ in range(3):
         ds1 = ogr.Open("tmp/test.gdb")
         if ds1 is None:
-            gdaltest.post_reason('fail')
             return 'fail'
         ds2 = ogr.Open("tmp/test.gdb")
         if ds2 is None:
-            gdaltest.post_reason('fail')
             return 'fail'
         ds2 = None
         ds1 = None
@@ -934,7 +899,6 @@ def test_ogr_fgdb_15():
     sr.ImportFromEPSG(3005)
     expected_wkt = sr.ExportToWkt()
     if got_wkt != expected_wkt:
-        gdaltest.post_reason('fail')
         print(got_wkt)
         print(expected_wkt)
         return 'fail'
@@ -997,7 +961,6 @@ def test_ogr_fgdb_17():
     sr.ImportFromEPSG(4326)
     lyr = ds.CreateLayer('test', geom_type=ogr.wkbPoint, srs=sr, options=['GEOMETRY_NULLABLE=NO'])
     if lyr.GetLayerDefn().GetGeomFieldDefn(0).IsNullable() != 0:
-        gdaltest.post_reason('fail')
         return 'fail'
     field_defn = ogr.FieldDefn('field_not_nullable', ogr.OFTString)
     field_defn.SetNullable(0)
@@ -1010,7 +973,6 @@ def test_ogr_fgdb_17():
     f.SetGeometryDirectly(ogr.CreateGeometryFromWkt('POINT(0 0)'))
     ret = lyr.CreateFeature(f)
     if ret != 0:
-        gdaltest.post_reason('fail')
         return 'fail'
     f = None
 
@@ -1021,7 +983,6 @@ def test_ogr_fgdb_17():
     ret = lyr.CreateFeature(f)
     gdal.PopErrorHandler()
     if ret == 0:
-        gdaltest.post_reason('fail')
         return 'fail'
     f = None
 
@@ -1032,7 +993,6 @@ def test_ogr_fgdb_17():
     ret = lyr.CreateFeature(f)
     gdal.PopErrorHandler()
     if ret == 0:
-        gdaltest.post_reason('fail')
         return 'fail'
     f = None
 
@@ -1041,13 +1001,10 @@ def test_ogr_fgdb_17():
     ds = ogr.Open('tmp/test.gdb', update=1)
     lyr = ds.GetLayerByName('test')
     if lyr.GetLayerDefn().GetFieldDefn(lyr.GetLayerDefn().GetFieldIndex('field_not_nullable')).IsNullable() != 0:
-        gdaltest.post_reason('fail')
         return 'fail'
     if lyr.GetLayerDefn().GetFieldDefn(lyr.GetLayerDefn().GetFieldIndex('field_nullable')).IsNullable() != 1:
-        gdaltest.post_reason('fail')
         return 'fail'
     if lyr.GetLayerDefn().GetGeomFieldDefn(0).IsNullable() != 0:
-        gdaltest.post_reason('fail')
         return 'fail'
 
     ds = None
@@ -1114,18 +1071,14 @@ def ogr_fgdb_18_test_results():
     ds = ogr.Open('tmp/test.gdb', update=1)
     lyr = ds.GetLayerByName('test')
     if lyr.GetLayerDefn().GetFieldDefn(lyr.GetLayerDefn().GetFieldIndex('field_string')).GetDefault() != "'a''b'":
-        gdaltest.post_reason('fail')
         return 'fail'
     if ogrtest.openfilegdb_drv is not None:
         if lyr.GetLayerDefn().GetFieldDefn(lyr.GetLayerDefn().GetFieldIndex('field_int')).GetDefault() != '123':
-            gdaltest.post_reason('fail')
             return 'fail'
         if lyr.GetLayerDefn().GetFieldDefn(lyr.GetLayerDefn().GetFieldIndex('field_real')).GetDefault() != '1.23':
             print(lyr.GetLayerDefn().GetFieldDefn(lyr.GetLayerDefn().GetFieldIndex('field_real')).GetDefault())
-            gdaltest.post_reason('fail')
             return 'fail'
     if lyr.GetLayerDefn().GetFieldDefn(lyr.GetLayerDefn().GetFieldIndex('field_nodefault')).GetDefault() is not None:
-        gdaltest.post_reason('fail')
         return 'fail'
     # if lyr.GetLayerDefn().GetFieldDefn(lyr.GetLayerDefn().GetFieldIndex('field_datetime')).GetDefault() != 'CURRENT_TIMESTAMP':
     #    gdaltest.post_reason('fail')
@@ -1139,7 +1092,6 @@ def ogr_fgdb_18_test_results():
        f.GetField('field_real') != 1.23 or \
        not f.IsFieldNull('field_nodefault') or not f.IsFieldSet('field_datetime') or \
        f.GetField('field_datetime2') != '2015/06/30 12:34:56':
-        gdaltest.post_reason('fail')
         f.DumpReadable()
         return 'fail'
     ds = None
@@ -1200,14 +1152,12 @@ def test_ogr_fgdb_19():
     ret = ds.StartTransaction(force=True)
     gdal.PopErrorHandler()
     if ret == 0:
-        gdaltest.post_reason('fail')
         return 'fail'
     ds = None
 
     (bPerLayerCopyingForTransaction, ds) = ogr_fgdb_19_open_update('tmp/test.gdb')
 
     if ds.TestCapability(ogr.ODsCEmulatedTransactions) != 1:
-        gdaltest.post_reason('fail')
         return 'fail'
 
     # Error case: try in non-forced mode
@@ -1215,7 +1165,6 @@ def test_ogr_fgdb_19():
     ret = ds.StartTransaction(force=False)
     gdal.PopErrorHandler()
     if ret == 0:
-        gdaltest.post_reason('fail')
         return 'fail'
 
     # Error case: try StartTransaction() with a ExecuteSQL layer still active
@@ -1224,7 +1173,6 @@ def test_ogr_fgdb_19():
     ret = ds.StartTransaction(force=True)
     gdal.PopErrorHandler()
     if ret == 0:
-        gdaltest.post_reason('fail')
         return 'fail'
     ds.ReleaseResultSet(sql_lyr)
 
@@ -1233,7 +1181,6 @@ def test_ogr_fgdb_19():
     ret = ds.CommitTransaction()
     gdal.PopErrorHandler()
     if ret == 0:
-        gdaltest.post_reason('fail')
         return 'fail'
 
     # Error case: call RollbackTransaction() while there is no transaction
@@ -1241,7 +1188,6 @@ def test_ogr_fgdb_19():
     ret = ds.RollbackTransaction()
     gdal.PopErrorHandler()
     if ret == 0:
-        gdaltest.post_reason('fail')
         return 'fail'
 
     # Error case: try StartTransaction() with another active connection
@@ -1250,7 +1196,6 @@ def test_ogr_fgdb_19():
     ret = ds2.StartTransaction(force=True)
     gdal.PopErrorHandler()
     if ret == 0:
-        gdaltest.post_reason('fail')
         return 'fail'
     ds2 = None
 
@@ -1263,50 +1208,42 @@ def test_ogr_fgdb_19():
     layer_created_before_transaction_defn = layer_created_before_transaction.GetLayerDefn()
 
     if ds.StartTransaction(force=True) != 0:
-        gdaltest.post_reason('fail')
         return 'fail'
 
     try:
         os.stat('tmp/test.gdb.ogredited')
     except OSError:
-        gdaltest.post_reason('fail')
         return 'fail'
     try:
         os.stat('tmp/test.gdb.ogrtmp')
-        gdaltest.post_reason('fail')
         return 'fail'
     except OSError:
         pass
 
     ret = lyr.CreateField(ogr.FieldDefn('foobar', ogr.OFTString))
     if ret != 0:
-        gdaltest.post_reason('fail')
         return 'fail'
 
     ret = lyr.DeleteField(lyr.GetLayerDefn().GetFieldIndex('foobar'))
     if ret != 0:
-        gdaltest.post_reason('fail')
         return 'fail'
 
     gdal.PushErrorHandler()
     ret = lyr.CreateGeomField(ogr.GeomFieldDefn('foobar', ogr.wkbPoint))
     gdal.PopErrorHandler()
     if ret == 0:
-        gdaltest.post_reason('fail')
         return 'fail'
 
     gdal.PushErrorHandler()
     ret = lyr.ReorderFields([i for i in range(lyr.GetLayerDefn().GetFieldCount())])
     gdal.PopErrorHandler()
     if ret == 0:
-        gdaltest.post_reason('fail')
         return 'fail'
 
     gdal.PushErrorHandler()
     ret = lyr.AlterFieldDefn(0, ogr.FieldDefn('foo', ogr.OFTString), 0)
     gdal.PopErrorHandler()
     if ret == 0:
-        gdaltest.post_reason('fail')
         return 'fail'
 
     f = ogr.Feature(lyr_defn)
@@ -1315,18 +1252,15 @@ def test_ogr_fgdb_19():
     lyr.SetFeature(f)
     fid = f.GetFID()
     if fid <= 0:
-        gdaltest.post_reason('fail')
         print(fid)
         return 'fail'
     lyr.ResetReading()
     for i in range(fid):
         f = lyr.GetNextFeature()
     if f.GetFID() != fid or f.GetField('field_string') != 'foo':
-        gdaltest.post_reason('fail')
         return 'fail'
     f = lyr.GetFeature(fid)
     if f.GetFID() != fid or f.GetField('field_string') != 'foo':
-        gdaltest.post_reason('fail')
         return 'fail'
 
     f = ogr.Feature(layer_created_before_transaction_defn)
@@ -1337,7 +1271,6 @@ def test_ogr_fgdb_19():
     ret = ds.StartTransaction(force=True)
     gdal.PopErrorHandler()
     if ret == 0:
-        gdaltest.post_reason('fail')
         return 'fail'
 
     # Error case: try CommitTransaction() with a ExecuteSQL layer still active
@@ -1346,7 +1279,6 @@ def test_ogr_fgdb_19():
     ret = ds.CommitTransaction()
     gdal.PopErrorHandler()
     if ret == 0:
-        gdaltest.post_reason('fail')
         return 'fail'
     ds.ReleaseResultSet(sql_lyr)
 
@@ -1356,25 +1288,21 @@ def test_ogr_fgdb_19():
     ret = ds.RollbackTransaction()
     gdal.PopErrorHandler()
     if ret == 0:
-        gdaltest.post_reason('fail')
         return 'fail'
     ds.ReleaseResultSet(sql_lyr)
 
     # Test that CommitTransaction() works
     if ds.CommitTransaction() != 0:
-        gdaltest.post_reason('fail')
         return 'fail'
 
     try:
         os.stat('tmp/test.gdb.ogredited')
-        gdaltest.post_reason('fail')
         return 'fail'
     except OSError:
         pass
 
     try:
         os.stat('tmp/test.gdb.ogrtmp')
-        gdaltest.post_reason('fail')
         return 'fail'
     except OSError:
         pass
@@ -1382,7 +1310,6 @@ def test_ogr_fgdb_19():
     lst = gdal.ReadDir('tmp/test.gdb')
     for filename in lst:
         if filename.find('.tmp') >= 0:
-            gdaltest.post_reason('fail')
             print(lst)
             return 'fail'
 
@@ -1390,12 +1317,10 @@ def test_ogr_fgdb_19():
     lyr_tmp = ds.GetLayer(0)
     new_count = lyr_tmp.GetFeatureCount()
     if new_count != old_count + 1:
-        gdaltest.post_reason('fail')
         return 'fail'
     old_count = new_count
 
     if layer_created_before_transaction.GetFeatureCount() != 1:
-        gdaltest.post_reason('fail')
         return 'fail'
 
     for i in range(ds.GetLayerCount()):
@@ -1409,22 +1334,18 @@ def test_ogr_fgdb_19():
     ds.CreateLayer('layer_tmp', geom_type=ogr.wkbNone)
     ret = ds.StartTransaction(force=True)
     if ret != 0:
-        gdaltest.post_reason('fail')
         return 'fail'
     ds.DeleteLayer(ds.GetLayerCount() - 1)
     if ds.CommitTransaction() != 0:
-        gdaltest.post_reason('fail')
         return 'fail'
 
     new_lyr_count = ds.GetLayerCount()
     if new_lyr_count != lyr_count:
-        gdaltest.post_reason('fail')
         return 'fail'
 
     # Test that RollbackTransaction() works
     ret = ds.StartTransaction(force=True)
     if ret != 0:
-        gdaltest.post_reason('fail')
         return 'fail'
 
     f = ogr.Feature(lyr_defn)
@@ -1434,36 +1355,30 @@ def test_ogr_fgdb_19():
     layer_created_during_transaction.CreateField(ogr.FieldDefn('foo', ogr.OFTString))
 
     if ds.RollbackTransaction() != 0:
-        gdaltest.post_reason('fail')
         return 'fail'
 
     try:
         os.stat('tmp/test.gdb.ogredited')
-        gdaltest.post_reason('fail')
         return 'fail'
     except OSError:
         pass
 
     try:
         os.stat('tmp/test.gdb.ogrtmp')
-        gdaltest.post_reason('fail')
         return 'fail'
     except OSError:
         pass
 
     if lyr.GetFeatureCount() != old_count:
-        gdaltest.post_reason('fail')
         print(lyr.GetFeatureCount())
         print(old_count)
         return 'fail'
 
     # Cannot retrieve the layer any more from fresh
     if ds.GetLayerByName('layer_created_during_transaction') is not None:
-        gdaltest.post_reason('fail')
         return 'fail'
     # Pointer is in ghost state
     if layer_created_during_transaction.GetLayerDefn().GetFieldCount() != 0:
-        gdaltest.post_reason('fail')
         return 'fail'
 
     # Simulate an error case where StartTransaction() cannot copy backup files
@@ -1474,11 +1389,9 @@ def test_ogr_fgdb_19():
     gdal.PopErrorHandler()
     gdal.SetConfigOption('FGDB_SIMUL_FAIL', None)
     if ret == 0:
-        gdaltest.post_reason('fail')
         return 'fail'
 
     if ds.GetLayerCount() != lyr_count:
-        gdaltest.post_reason('fail')
         print(lyr_count)
         print(ds.GetLayerCount())
         return 'fail'
@@ -1490,11 +1403,9 @@ def test_ogr_fgdb_19():
     gdal.PopErrorHandler()
     gdal.SetConfigOption('FGDB_SIMUL_FAIL', None)
     if ret == 0:
-        gdaltest.post_reason('fail')
         return 'fail'
 
     if ds.GetLayerCount() != 0:
-        gdaltest.post_reason('fail')
         return 'fail'
     shutil.rmtree('tmp/test.gdb.ogredited')
 
@@ -1568,7 +1479,6 @@ def test_ogr_fgdb_19():
         layer_tmp.CreateField(ogr.FieldDefn('foo', ogr.OFTString))
 
         if ds.StartTransaction(force=True) != 0:
-            gdaltest.post_reason('fail')
             return 'fail'
 
         ds.DeleteLayer(ds.GetLayerCount() - 1)
@@ -1579,7 +1489,6 @@ def test_ogr_fgdb_19():
         gdal.PopErrorHandler()
         gdal.SetConfigOption('FGDB_SIMUL_FAIL', None)
         if ret == 0:
-            gdaltest.post_reason('fail')
             return 'fail'
 
         ds = None
@@ -1589,7 +1498,6 @@ def test_ogr_fgdb_19():
         lst = gdal.ReadDir('tmp/test.gdb')
         for filename in lst:
             if filename.find('.tmp') >= 0:
-                gdaltest.post_reason('fail')
                 print(lst)
                 return 'fail'
 
@@ -1603,7 +1511,6 @@ def test_ogr_fgdb_19():
                 break
 
         if ds.StartTransaction(force=True) != 0:
-            gdaltest.post_reason('fail')
             return 'fail'
 
         lyr = ds.GetLayer(0)
@@ -1617,7 +1524,6 @@ def test_ogr_fgdb_19():
         gdal.PopErrorHandler()
         gdal.SetConfigOption('FGDB_SIMUL_FAIL', None)
         if ret == 0:
-            gdaltest.post_reason('fail')
             return 'fail'
 
         ds = None
@@ -1627,7 +1533,6 @@ def test_ogr_fgdb_19():
         lst = gdal.ReadDir('tmp/test.gdb')
         for filename in lst:
             if filename.find('.tmp') >= 0:
-                gdaltest.post_reason('fail')
                 print(lst)
                 return 'fail'
 
@@ -1636,7 +1541,6 @@ def test_ogr_fgdb_19():
         (bPerLayerCopyingForTransaction, ds) = ogr_fgdb_19_open_update('tmp/test.gdb')
 
         if ds.StartTransaction(force=True) != 0:
-            gdaltest.post_reason('fail')
             return 'fail'
 
         lyr = ds.GetLayer(0)
@@ -1650,7 +1554,6 @@ def test_ogr_fgdb_19():
         gdal.PopErrorHandler()
         gdal.SetConfigOption('FGDB_SIMUL_FAIL', None)
         if ret == 0:
-            gdaltest.post_reason('fail')
             return 'fail'
 
         ds = None
@@ -1668,7 +1571,6 @@ def test_ogr_fgdb_19():
             (bPerLayerCopyingForTransaction, ds) = ogr_fgdb_19_open_update('tmp/test.gdb')
 
             if ds.StartTransaction(force=True) != 0:
-                gdaltest.post_reason('fail')
                 return 'fail'
 
             lyr = ds.GetLayer(0)
@@ -1682,7 +1584,6 @@ def test_ogr_fgdb_19():
             gdal.PopErrorHandler()
             gdal.SetConfigOption('FGDB_SIMUL_FAIL', None)
             if ret != 0:
-                gdaltest.post_reason('fail')
                 print(case)
                 return 'fail'
 
@@ -1691,7 +1592,6 @@ def test_ogr_fgdb_19():
             if case == 'CASE4':
                 try:
                     os.stat('tmp/test.gdb.ogredited')
-                    gdaltest.post_reason('fail')
                     print(case)
                     return 'fail'
                 except OSError:
@@ -1712,7 +1612,6 @@ def test_ogr_fgdb_19():
         lyr_defn = lyr.GetLayerDefn()
 
         if ds.StartTransaction(force=True) != 0:
-            gdaltest.post_reason('fail')
             return 'fail'
 
         gdal.SetConfigOption('FGDB_SIMUL_FAIL', 'CASE1')
@@ -1721,7 +1620,6 @@ def test_ogr_fgdb_19():
         gdal.PopErrorHandler()
         gdal.SetConfigOption('FGDB_SIMUL_FAIL', None)
         if ret == 0:
-            gdaltest.post_reason('fail')
             return 'fail'
 
         ds = None
@@ -1732,7 +1630,6 @@ def test_ogr_fgdb_19():
         lyr_defn = lyr.GetLayerDefn()
 
         if ds.StartTransaction(force=True) != 0:
-            gdaltest.post_reason('fail')
             return 'fail'
 
         gdal.SetConfigOption('FGDB_SIMUL_FAIL', 'CASE2')
@@ -1741,7 +1638,6 @@ def test_ogr_fgdb_19():
         gdal.PopErrorHandler()
         gdal.SetConfigOption('FGDB_SIMUL_FAIL', None)
         if ret == 0:
-            gdaltest.post_reason('fail')
             return 'fail'
 
         ds = None
@@ -1753,7 +1649,6 @@ def test_ogr_fgdb_19():
         lyr_defn = lyr.GetLayerDefn()
 
         if ds.StartTransaction(force=True) != 0:
-            gdaltest.post_reason('fail')
             return 'fail'
 
         gdal.SetConfigOption('FGDB_SIMUL_FAIL', 'CASE3')
@@ -1762,7 +1657,6 @@ def test_ogr_fgdb_19():
         gdal.PopErrorHandler()
         gdal.SetConfigOption('FGDB_SIMUL_FAIL', None)
         if ret != 0:
-            gdaltest.post_reason('fail')
             return 'fail'
 
         ds = None
@@ -1774,7 +1668,6 @@ def test_ogr_fgdb_19():
     lyr_defn = lyr.GetLayerDefn()
 
     if ds.StartTransaction(force=True) != 0:
-        gdaltest.post_reason('fail')
         return 'fail'
 
     gdal.SetConfigOption('FGDB_SIMUL_FAIL', 'CASE_REOPEN')
@@ -1783,11 +1676,9 @@ def test_ogr_fgdb_19():
     gdal.PopErrorHandler()
     gdal.SetConfigOption('FGDB_SIMUL_FAIL', None)
     if ret == 0:
-        gdaltest.post_reason('fail')
         return 'fail'
 
     if ds.GetLayerCount() != 0:
-        gdaltest.post_reason('fail')
         return 'fail'
 
     ds = None
@@ -1798,7 +1689,6 @@ def test_ogr_fgdb_19():
     lyr_defn = lyr.GetLayerDefn()
 
     if ds.StartTransaction(force=True) != 0:
-        gdaltest.post_reason('fail')
         return 'fail'
 
     gdal.SetConfigOption('FGDB_SIMUL_FAIL', 'CASE1')
@@ -1807,7 +1697,6 @@ def test_ogr_fgdb_19():
     gdal.PopErrorHandler()
     gdal.SetConfigOption('FGDB_SIMUL_FAIL', None)
     if ret == 0:
-        gdaltest.post_reason('fail')
         return 'fail'
 
     ds = None
@@ -1819,7 +1708,6 @@ def test_ogr_fgdb_19():
     lyr_defn = lyr.GetLayerDefn()
 
     if ds.StartTransaction(force=True) != 0:
-        gdaltest.post_reason('fail')
         return 'fail'
 
     gdal.SetConfigOption('FGDB_SIMUL_FAIL', 'CASE2')
@@ -1828,11 +1716,9 @@ def test_ogr_fgdb_19():
     gdal.PopErrorHandler()
     gdal.SetConfigOption('FGDB_SIMUL_FAIL', None)
     if ret == 0:
-        gdaltest.post_reason('fail')
         return 'fail'
 
     if ds.GetLayerCount() != 0:
-        gdaltest.post_reason('fail')
         return 'fail'
 
     ds = None
@@ -1902,7 +1788,6 @@ def test_ogr_fgdb_20():
     f.SetField('id', 1)
     ret = lyr.CreateFeature(f)
     if ret != 0 or f.GetFID() != 1 or lyr.GetMetadataItem('1', 'MAP_OGR_FID_TO_FGDB_FID') is not None:
-        gdaltest.post_reason('fail')
         return 'fail'
 
     # Existing FID
@@ -1910,7 +1795,6 @@ def test_ogr_fgdb_20():
     ret = lyr.CreateFeature(f)
     gdal.PopErrorHandler()
     if ret == 0:
-        gdaltest.post_reason('fail')
         return 'fail'
 
     for invalid_fid in [-2, 0, 9876543210]:
@@ -1920,7 +1804,6 @@ def test_ogr_fgdb_20():
         ret = lyr.CreateFeature(f)
         gdal.PopErrorHandler()
         if ret == 0:
-            gdaltest.post_reason('fail')
             print(invalid_fid)
             return 'fail'
 
@@ -1929,7 +1812,6 @@ def test_ogr_fgdb_20():
     f.SetField('id', 2)
     ret = lyr.CreateFeature(f)
     if ret != 0 or f.GetFID() != 2 or lyr.GetMetadataItem('2', 'MAP_OGR_FID_TO_FGDB_FID') is not None:
-        gdaltest.post_reason('fail')
         f.DumpReadable()
         return 'fail'
 
@@ -1944,13 +1826,11 @@ def test_ogr_fgdb_20():
     ret = lyr.CreateFeature(f)
     gdal.PopErrorHandler()
     if ret == 0:
-        gdaltest.post_reason('fail')
         return 'fail'
     ds2 = None
 
     ret = lyr.CreateFeature(f)
     if ret != 0 or f.GetFID() != 4 or lyr.GetMetadataItem('4', 'MAP_OGR_FID_TO_FGDB_FID') != '3':
-        gdaltest.post_reason('fail')
         f.DumpReadable()
         print(lyr.GetMetadataItem('4', 'MAP_OGR_FID_TO_FGDB_FID'))
         return 'fail'
@@ -1960,7 +1840,6 @@ def test_ogr_fgdb_20():
     ds2 = ogr.Open('tmp/test.gdb', update=1)
     gdal.PopErrorHandler()
     if ds2 is not None:
-        gdaltest.post_reason('fail')
         return 'fail'
     ds2 = None
 
@@ -1969,22 +1848,18 @@ def test_ogr_fgdb_20():
     ret = lyr.CreateFeature(f)
     gdal.PopErrorHandler()
     if ret == 0:
-        gdaltest.post_reason('fail')
         return 'fail'
 
     # This FID exists as a FGDB ID, but should not be user visible.
     f.SetFID(3)
     ret = lyr.SetFeature(f)
     if ret != ogr.OGRERR_NON_EXISTING_FEATURE:
-        gdaltest.post_reason('fail')
         return 'fail'
     ret = lyr.DeleteFeature(3)
     if ret != ogr.OGRERR_NON_EXISTING_FEATURE:
-        gdaltest.post_reason('fail')
         return 'fail'
     ret = lyr.GetFeature(3)
     if ret is not None:
-        gdaltest.post_reason('fail')
         return 'fail'
 
     # Trying to set OGR FID = 3 --> FileGDB FID = 4
@@ -1994,7 +1869,6 @@ def test_ogr_fgdb_20():
 
     ret = lyr.CreateFeature(f)
     if ret != 0 or f.GetFID() != 3 or lyr.GetMetadataItem('3', 'MAP_OGR_FID_TO_FGDB_FID') != '4':
-        gdaltest.post_reason('fail')
         f.DumpReadable()
         return 'fail'
 
@@ -2007,20 +1881,16 @@ def test_ogr_fgdb_20():
             else:
                 f = lyr.GetFeature(fid)
             if f is None:
-                gdaltest.post_reason('fail')
                 return 'fail'
             if f.GetFID() != fid or f.GetField('id') != fid:
-                gdaltest.post_reason('fail')
                 f.DumpReadable()
                 print(fid)
                 return 'fail'
             got_fgdb_fid = lyr.GetMetadataItem(str(f.GetFID()), 'MAP_OGR_FID_TO_FGDB_FID')
             if got_fgdb_fid is None:
                 if fgdb_fid is not None:
-                    gdaltest.post_reason('fail')
                     return 'fail'
             elif int(got_fgdb_fid) != fgdb_fid:
-                gdaltest.post_reason('fail')
                 print(got_fgdb_fid)
                 print(fgdb_fid)
                 return 'fail'
@@ -2028,7 +1898,6 @@ def test_ogr_fgdb_20():
     for fid in [-9876543210, 0, 100]:
         f = lyr.GetFeature(fid)
         if f is not None:
-            gdaltest.post_reason('fail')
             f.DumpReadable()
             return 'fail'
 
@@ -2037,33 +1906,27 @@ def test_ogr_fgdb_20():
         f.SetFID(invalid_fid)
         ret = lyr.SetFeature(f)
         if ret != ogr.OGRERR_NON_EXISTING_FEATURE:
-            gdaltest.post_reason('fail')
             return 'fail'
         ret = lyr.DeleteFeature(invalid_fid)
         if ret != ogr.OGRERR_NON_EXISTING_FEATURE:
-            gdaltest.post_reason('fail')
             return 'fail'
 
     f = lyr.GetFeature(3)
     f.SetField('str', '3')
     ret = lyr.SetFeature(f)
     if ret != 0:
-        gdaltest.post_reason('fail')
         return 'fail'
 
     f = lyr.GetFeature(3)
     if f.GetField('str') != '3':
-        gdaltest.post_reason('fail')
         return 'fail'
 
     ret = lyr.DeleteFeature(1)
     if ret != 0:
-        gdaltest.post_reason('fail')
         return 'fail'
 
     ret = lyr.DeleteFeature(3)
     if ret != 0:
-        gdaltest.post_reason('fail')
         return 'fail'
 
     for (fid, fgdb_fid) in [(3, 5), (2049, 6), (10, 7), (7, 8), (9, None), (8, 10), (12, 11)]:
@@ -2072,7 +1935,6 @@ def test_ogr_fgdb_20():
         f.SetField('id', fid)
         ret = lyr.CreateFeature(f)
         if ret != 0 or f.GetFID() != fid or str(lyr.GetMetadataItem(str(fid), 'MAP_OGR_FID_TO_FGDB_FID')) != str(fgdb_fid):
-            gdaltest.post_reason('fail')
             f.DumpReadable()
             print(fid)
             print(lyr.GetMetadataItem(str(fid), 'MAP_OGR_FID_TO_FGDB_FID'))
@@ -2082,7 +1944,6 @@ def test_ogr_fgdb_20():
     f = ogr.Feature(lyr.GetLayerDefn())
     ret = lyr.CreateFeature(f)
     if ret != 0 or f.GetFID() != 13:
-        gdaltest.post_reason('fail')
         f.DumpReadable()
         return 'fail'
     f.SetField('id', f.GetFID())
@@ -2093,10 +1954,8 @@ def test_ogr_fgdb_20():
     for (fid, fgdb_fid) in expected:
         f = lyr.GetNextFeature()
         if f is None:
-            gdaltest.post_reason('fail')
             return 'fail'
         if f.GetFID() != fid or f.GetField('id') != fid or str(lyr.GetMetadataItem(str(fid), 'MAP_OGR_FID_TO_FGDB_FID')) != str(fgdb_fid):
-            gdaltest.post_reason('fail')
             f.DumpReadable()
             print(fid)
             print(lyr.GetMetadataItem(str(fid), 'MAP_OGR_FID_TO_FGDB_FID'))
@@ -2106,7 +1965,6 @@ def test_ogr_fgdb_20():
     lyr.ResetReading()
     f = lyr.GetNextFeature()
     if f.GetFID() != 3:
-        gdaltest.post_reason('fail')
         f.DumpReadable()
         return 'fail'
 
@@ -2115,7 +1973,6 @@ def test_ogr_fgdb_20():
     lyr.ResetReading()
     f = lyr.GetNextFeature()
     if f.GetFID() != 3:
-        gdaltest.post_reason('fail')
         f.DumpReadable()
         return 'fail'
 
@@ -2132,7 +1989,6 @@ def test_ogr_fgdb_20():
     sql_lyr = ds.ExecuteSQL('SELECT * FROM ogr_fgdb_20_simple')
     f = sql_lyr.GetNextFeature()
     if f.GetFID() != 2:
-        gdaltest.post_reason('fail')
         f.DumpReadable()
         return 'fail'
 
@@ -2144,7 +2000,6 @@ def test_ogr_fgdb_20():
     ret = lyr.CreateFeature(f)
     gdal.PopErrorHandler()
     if ret == 0:
-        gdaltest.post_reason('fail')
         return 'fail'
 
     ds.ReleaseResultSet(sql_lyr)
@@ -2184,7 +2039,6 @@ def test_ogr_fgdb_20():
         ds = ogr.Open('tmp/test.gdb', update=update)
         lyr = ds.GetLayerByName('ogr_fgdb_20')
         if lyr.GetFeatureCount() != 10:
-            gdaltest.post_reason('fail')
             print(lyr.GetFeatureCount())
             return 'fail'
         lyr.ResetReading()
@@ -2192,14 +2046,11 @@ def test_ogr_fgdb_20():
         for fid in expected:
             f = lyr.GetNextFeature()
             if gdal.GetLastErrorType() != 0:
-                gdaltest.post_reason('fail')
                 return 'fail'
             if f is None:
-                gdaltest.post_reason('fail')
                 print(fid)
                 return 'fail'
             if f.GetFID() != fid or f.GetField('id') != fid:
-                gdaltest.post_reason('fail')
                 f.DumpReadable()
                 print(fid)
                 return 'fail'
@@ -2209,7 +2060,6 @@ def test_ogr_fgdb_20():
             lyr.ResetReading()
             f = lyr.GetNextFeature()
             if f.GetFID() != fid or f.GetField('id') != fid:
-                gdaltest.post_reason('fail')
                 f.DumpReadable()
                 print(fid)
                 return 'fail'
@@ -2217,11 +2067,9 @@ def test_ogr_fgdb_20():
         lyr = ds.GetLayerByName('ogr_fgdb_20_simple')
         f = lyr.GetNextFeature()
         if f.GetFID() != 2:
-            gdaltest.post_reason('fail')
             return 'fail'
         f = lyr.GetNextFeature()
         if f.GetFID() != 3:
-            gdaltest.post_reason('fail')
             return 'fail'
 
         # Check attribute index
@@ -2232,7 +2080,6 @@ def test_ogr_fgdb_20():
             lyr.ResetReading()
             f = lyr.GetNextFeature()
             if f.GetFID() != fid:
-                gdaltest.post_reason('fail')
                 print(f.GetFID())
                 print(fid)
                 return 'fail'
@@ -2246,7 +2093,6 @@ def test_ogr_fgdb_20():
                 lyr.ResetReading()
                 f = lyr.GetNextFeature()
                 if f.GetFID() != fid:
-                    gdaltest.post_reason('fail')
                     print(f.GetFID())
                     print(fid)
                     return 'fail'
@@ -2260,7 +2106,6 @@ def test_ogr_fgdb_20():
         f.SetField('id', fid)
         ret = lyr.CreateFeature(f)
         if ret != 0 or f.GetFID() != fid or str(lyr.GetMetadataItem(str(fid), 'MAP_OGR_FID_TO_FGDB_FID')) != str(fgdb_fid):
-            gdaltest.post_reason('fail')
             f.DumpReadable()
             print(lyr.GetMetadataItem(str(fid), 'MAP_OGR_FID_TO_FGDB_FID'))
             return 'fail'
@@ -2277,7 +2122,6 @@ def test_ogr_fgdb_20():
         f.SetField('id', fid)
         ret = lyr.CreateFeature(f)
         if ret != 0 or f.GetFID() != fid or lyr.GetMetadataItem(str(fid), 'MAP_OGR_FID_TO_FGDB_FID') != str(fgdb_fid):
-            gdaltest.post_reason('fail')
             f.DumpReadable()
             print(lyr.GetMetadataItem(str(fid), 'MAP_OGR_FID_TO_FGDB_FID'))
             return 'fail'
@@ -2289,7 +2133,6 @@ def test_ogr_fgdb_20():
         ds = ogr.Open('tmp/test.gdb', update=update)
         lyr = ds.GetLayerByName('ogr_fgdb_20')
         if lyr.GetFeatureCount() != 16:
-            gdaltest.post_reason('fail')
             print(lyr.GetFeatureCount())
             return 'fail'
         lyr.ResetReading()
@@ -2297,14 +2140,11 @@ def test_ogr_fgdb_20():
         for fid in expected:
             f = lyr.GetNextFeature()
             if gdal.GetLastErrorType() != 0:
-                gdaltest.post_reason('fail')
                 return 'fail'
             if f is None:
-                gdaltest.post_reason('fail')
                 print(fid)
                 return 'fail'
             if f.GetFID() != fid or f.GetField('id') != fid:
-                gdaltest.post_reason('fail')
                 f.DumpReadable()
                 print(fid)
                 return 'fail'
@@ -2333,43 +2173,33 @@ def test_ogr_fgdb_20():
         gdal.PopErrorHandler()
         if case == 'CASE3':
             if sql_lyr is None:
-                gdaltest.post_reason('fail')
                 print(case)
                 return 'fail'
             ds.ReleaseResultSet(sql_lyr)
         else:
             if sql_lyr is not None:
-                gdaltest.post_reason('fail')
                 print(case)
                 return 'fail'
 
         # Everything will fail, but hopefully without crashing
         lyr.ResetReading()
         if lyr.GetNextFeature() is not None:
-            gdaltest.post_reason('fail')
             return 'fail'
         if lyr.GetFeature(1) is not None:
-            gdaltest.post_reason('fail')
             return 'fail'
         if lyr.DeleteFeature(1) == 0:
-            gdaltest.post_reason('fail')
             return 'fail'
         if lyr.CreateFeature(f) == 0:
-            gdaltest.post_reason('fail')
             return 'fail'
         if lyr.SetFeature(f) == 0:
-            gdaltest.post_reason('fail')
             return 'fail'
         if case != 'CASE3':
             if ds.CreateLayer('bar', geom_type=ogr.wkbNone) is not None:
-                gdaltest.post_reason('fail')
                 return 'fail'
             if ds.DeleteLayer(0) == 0:
-                gdaltest.post_reason('fail')
                 return 'fail'
         sql_lyr = ds.ExecuteSQL('SELECT * FROM foo')
         if case != 'CASE3' and sql_lyr is not None:
-            gdaltest.post_reason('fail')
             print(case)
             return 'fail'
         ds.ReleaseResultSet(sql_lyr)
@@ -2446,7 +2276,6 @@ def test_ogr_fgdb_21():
             expected_geom_type = ogr.wkbMultiPolygonZM
 
         if lyr.GetGeomType() != expected_geom_type:
-            gdaltest.post_reason('fail')
             print(data)
             print(lyr.GetGeomType())
             return 'fail'
@@ -2457,12 +2286,10 @@ def test_ogr_fgdb_21():
             expected_wkt = data[2]
         if expected_wkt is None:
             if feat.GetGeometryRef() is not None:
-                gdaltest.post_reason('fail')
                 print(data)
                 feat.DumpReadable()
                 return 'fail'
         elif ogrtest.check_feature_geometry(feat, expected_wkt) != 0:
-            gdaltest.post_reason('fail')
             print(data)
             feat.DumpReadable()
             return 'fail'
@@ -2485,7 +2312,6 @@ def test_ogr_fgdb_22():
     for f in lyr:
         f_ref = lyr_ref.GetNextFeature()
         if ogrtest.check_feature_geometry(f, f_ref.GetGeometryRef()) != 0:
-            gdaltest.post_reason('fail')
             print(f.GetGeometryRef().ExportToWkt())
             print(f_ref.GetGeometryRef().ExportToWkt())
             return 'fail'
@@ -2496,7 +2322,6 @@ def test_ogr_fgdb_22():
     for f in lyr:
         f_ref = lyr_ref.GetNextFeature()
         if ogrtest.check_feature_geometry(f, f_ref.GetGeometryRef()) != 0:
-            gdaltest.post_reason('fail')
             print(f.GetGeometryRef().ExportToWkt())
             print(f_ref.GetGeometryRef().ExportToWkt())
             return 'fail'
@@ -2508,7 +2333,6 @@ def test_ogr_fgdb_22():
     for f in lyr:
         f_ref = lyr_ref.GetNextFeature()
         if ogrtest.check_feature_geometry(f, f_ref.GetGeometryRef()) != 0:
-            gdaltest.post_reason('fail')
             print(f.GetGeometryRef().ExportToWkt())
             print(f_ref.GetGeometryRef().ExportToWkt())
             return 'fail'
@@ -2546,7 +2370,6 @@ def test_ogr_fgdb_24():
     for f in lyr:
         f_ref = lyr_ref.GetNextFeature()
         if ogrtest.check_feature_geometry(f, f_ref.GetGeometryRef()) != 0:
-            gdaltest.post_reason('fail')
             print(f.GetGeometryRef().ExportToIsoWkt())
             print(f_ref.GetGeometryRef().ExportToIsoWkt())
             return 'fail'
@@ -2558,7 +2381,6 @@ def test_ogr_fgdb_24():
     for f in lyr:
         f_ref = lyr_ref.GetNextFeature()
         if ogrtest.check_feature_geometry(f, f_ref.GetGeometryRef()) != 0:
-            gdaltest.post_reason('fail')
             print(f.GetGeometryRef().ExportToIsoWkt())
             print(f_ref.GetGeometryRef().ExportToIsoWkt())
             return 'fail'
@@ -2574,16 +2396,13 @@ def test_ogr_fgdb_25():
     ds = ogr.Open('data/curves.gdb')
     sql_lyr = ds.ExecuteSQL('SELECT OBJECTID FROM polygon WHERE OBJECTID = 2')
     if sql_lyr is None:
-        gdaltest.post_reason('fail')
         return 'fail'
     f = sql_lyr.GetNextFeature()
     if f.GetFID() != 2:
-        gdaltest.post_reason('fail')
         f.DumpReadable()
         return 'fail'
     f = sql_lyr.GetNextFeature()
     if f is not None:
-        gdaltest.post_reason('fail')
         return 'fail'
     ds.ReleaseResultSet(sql_lyr)
 
@@ -2591,7 +2410,6 @@ def test_ogr_fgdb_25():
     lyr.SetAttributeFilter('OBJECTID = 2')
     f = lyr.GetNextFeature()
     if f.GetFID() != 2:
-        gdaltest.post_reason('fail')
         f.DumpReadable()
         return 'fail'
 
diff --git a/autotest/ogr/ogr_fgdb_stress_test.py b/autotest/ogr/ogr_fgdb_stress_test.py
index 3e37ce4c5ced..8155297b91a9 100755
--- a/autotest/ogr/ogr_fgdb_stress_test.py
+++ b/autotest/ogr/ogr_fgdb_stress_test.py
@@ -126,7 +126,6 @@ def ogr_fgdb_stress_test_1():
                 fid = f.GetFID()
                 # print("created %d" % fid)
             if ret[0] != ret[1]:
-                gdaltest.post_reason('fail')
                 print(ret)
                 return 'fail'
             if ret[0] == 0:
@@ -148,7 +147,6 @@ def ogr_fgdb_stress_test_1():
                 ret.append(lyr.SetFeature(f))
                 # gdal.PopErrorHandler()
             if ret[0] != ret[1]:
-                gdaltest.post_reason('fail')
                 print(ret)
                 return 'fail'
         # Same for DeleteFeature()
@@ -162,7 +160,6 @@ def ogr_fgdb_stress_test_1():
                 ret.append(lyr.DeleteFeature(fid))
                 # gdal.PopErrorHandler()
             if ret[0] != ret[1]:
-                gdaltest.post_reason('fail')
                 print(ret)
                 return 'fail'
 
@@ -189,14 +186,12 @@ def ogr_fgdb_stress_test_2():
         f_test = lyr_test.GetNextFeature()
         f_ref = lyr_ref.GetNextFeature()
         if (f_test is None and f_ref is not None) or (f_test is not None and f_ref is None):
-            gdaltest.post_reason('fail')
             return 'fail'
         if f_test is None:
             break
         if f_test.GetFID() != f_ref.GetFID() or \
            f_test['str'] != f_ref['str'] or \
            ogrtest.check_feature_geometry(f_test, f_ref.GetGeometryRef()) != 0:
-            gdaltest.post_reason('fail')
             f_test.DumpReadable()
             f_ref.DumpReadable()
             return 'fail'
@@ -205,7 +200,6 @@ def ogr_fgdb_stress_test_2():
         lyr_test.SetAttributeFilter("str = '%d'" % val)
         lyr_ref.SetAttributeFilter("str = '%d'" % val)
         if lyr_test.GetFeatureCount() != lyr_ref.GetFeatureCount():
-            gdaltest.post_reason('fail')
             print(val)
             print(lyr_test.GetFeatureCount())
             print(lyr_ref.GetFeatureCount())
diff --git a/autotest/ogr/ogr_geojson.py b/autotest/ogr/ogr_geojson.py
index 52520a8c2c24..d3505a4f6f02 100755
--- a/autotest/ogr/ogr_geojson.py
+++ b/autotest/ogr/ogr_geojson.py
@@ -660,7 +660,6 @@ def test_ogr_geojson_15():
         out_json = json.loads(out)
         expected_out_json = json.loads(expected_out)
         if out_json != expected_out_json:
-            gdaltest.post_reason('fail')
             print(out)
             return 'fail'
 
@@ -668,7 +667,6 @@ def test_ogr_geojson_15():
     expected_out = {'geometry': {'type': 'Point', 'coordinates': [1.0, 2.0]}, 'type': 'Feature', 'properties': {'foo': 'bar', "boolfield": True}, 'id': 0}
 
     if out != expected_out:
-        gdaltest.post_reason('fail')
         print(out)
         return 'fail'
 
@@ -1127,15 +1125,12 @@ def test_ogr_geojson_25():
     ds = ogr.Open('data/topojson1.topojson')
     lyr = ds.GetLayer(0)
     if lyr.GetName() != 'a_layer':
-        gdaltest.post_reason('failure')
         return 'fail'
     feat = lyr.GetNextFeature()
     if ogrtest.check_feature_geometry(feat, 'LINESTRING (100 1000,110 1000,110 1100)') != 0:
-        gdaltest.post_reason('failure')
         return 'fail'
     lyr = ds.GetLayer(1)
     if lyr.GetName() != 'TopoJSON':
-        gdaltest.post_reason('failure')
         return 'fail'
     expected_results = [
         (None, None, 'POINT EMPTY'),
@@ -1175,7 +1170,6 @@ def test_ogr_geojson_25():
         (None, None, 'MULTILINESTRING ((100 1000,110 1000,110 1100,100 1100,100 1000),(101 1010,101 1090,109 1090,109 1010,101 1010))'),
     ]
     if lyr.GetFeatureCount() != len(expected_results):
-        gdaltest.post_reason('failure')
         return 'fail'
     for i, exp_result in enumerate(expected_results):
         feat = lyr.GetNextFeature()
@@ -1192,38 +1186,30 @@ def test_ogr_geojson_25():
     ds = ogr.Open('data/topojson2.topojson')
     lyr = ds.GetLayer(0)
     if lyr.GetName() != 'a_layer':
-        gdaltest.post_reason('failure')
         return 'fail'
     feat = lyr.GetNextFeature()
     if ogrtest.check_feature_geometry(feat, 'LINESTRING (100 1000,110 1000,110 1100)') != 0:
-        gdaltest.post_reason('failure')
         return 'fail'
     lyr = ds.GetLayer(1)
     if lyr.GetName() != 'TopoJSON':
-        gdaltest.post_reason('failure')
         return 'fail'
     feat = lyr.GetNextFeature()
     if ogrtest.check_feature_geometry(feat, 'LINESTRING (100 1000,110 1000,110 1100)') != 0:
-        gdaltest.post_reason('failure')
         return 'fail'
     ds = None
 
     ds = ogr.Open('data/topojson3.topojson')
     lyr = ds.GetLayer(0)
     if lyr.GetName() != 'a_layer':
-        gdaltest.post_reason('failure')
         return 'fail'
     feat = lyr.GetNextFeature()
     if ogrtest.check_feature_geometry(feat, 'LINESTRING (0 0,10 0,0 10,10 0,0 0)') != 0:
-        gdaltest.post_reason('failure')
         return 'fail'
     lyr = ds.GetLayer(1)
     if lyr.GetName() != 'TopoJSON':
-        gdaltest.post_reason('failure')
         return 'fail'
     feat = lyr.GetNextFeature()
     if ogrtest.check_feature_geometry(feat, 'LINESTRING (0 0,10 0,0 10,10 0,0 0)') != 0:
-        gdaltest.post_reason('failure')
         return 'fail'
     ds = None
 
@@ -1252,34 +1238,27 @@ def test_ogr_geojson_26():
 
     lyr = ds.GetLayerByName('OGRGeoJSON')
     if lyr.GetMetadataItem(ogr.OLMD_FID64) is None:
-        gdaltest.post_reason('fail')
         return 'fail'
 
     feature = lyr.GetNextFeature()
     if feature.GetFID() != 1:
-        gdaltest.post_reason('fail')
         feature.DumpReadable()
         return 'fail'
     if feature.GetField("intvalue") != 1:
-        gdaltest.post_reason('fail')
         feature.DumpReadable()
         return 'fail'
     if feature.GetField("int64") != 1234567890123:
-        gdaltest.post_reason('fail')
         feature.DumpReadable()
         return 'fail'
 
     feature = lyr.GetNextFeature()
     if feature.GetFID() != 1234567890123:
-        gdaltest.post_reason('fail')
         feature.DumpReadable()
         return 'fail'
     if feature.GetField("intvalue") != 1234567890123:
-        gdaltest.post_reason('fail')
         feature.DumpReadable()
         return 'fail'
     if feature.GetField("intlist") != [1, 1234567890123]:
-        gdaltest.post_reason('fail')
         feature.DumpReadable()
         return 'fail'
 
@@ -1305,7 +1284,6 @@ def test_ogr_geojson_26():
     gdal.Unlink('/vsimem/ogr_geojson_26.json')
 
     if data.find('{ "type": "Feature", "id": 1234567890123, "properties": { "int64": 1234567890123, "int64list": [ 1234567890123 ] }, "geometry": null }') < 0:
-        gdaltest.post_reason('failure')
         print(data)
         return 'fail'
 
@@ -1732,12 +1710,10 @@ def test_ogr_geojson_35():
     gdal.Unlink('/vsimem/ogr_geojson_35.json')
 
     if data.find('-1.79') == -1 and data.find('e+308') == -1:
-        gdaltest.post_reason('fail')
         print(data)
         return 'fail'
     for ident in range(2, 8):
         if data.find('{ "type": "Feature", "id": %d, "properties": { }, "geometry": null }' % ident) == -1:
-            gdaltest.post_reason('fail')
             print(data)
             return 'fail'
 
@@ -1778,21 +1754,16 @@ def test_ogr_geojson_37():
     feat_defn = lyr.GetLayerDefn()
     if feat_defn.GetFieldDefn(feat_defn.GetFieldIndex('bool')).GetType() != ogr.OFTInteger or \
        feat_defn.GetFieldDefn(feat_defn.GetFieldIndex('bool')).GetSubType() != ogr.OFSTBoolean:
-        gdaltest.post_reason('failure')
         return 'fail'
     if feat_defn.GetFieldDefn(feat_defn.GetFieldIndex('not_bool')).GetSubType() != ogr.OFSTNone:
-        gdaltest.post_reason('failure')
         return 'fail'
     if feat_defn.GetFieldDefn(feat_defn.GetFieldIndex('bool_list')).GetType() != ogr.OFTIntegerList or \
        feat_defn.GetFieldDefn(feat_defn.GetFieldIndex('bool_list')).GetSubType() != ogr.OFSTBoolean:
-        gdaltest.post_reason('failure')
         return 'fail'
     if feat_defn.GetFieldDefn(feat_defn.GetFieldIndex('notbool_list')).GetSubType() != ogr.OFSTNone:
-        gdaltest.post_reason('failure')
         return 'fail'
     f = lyr.GetNextFeature()
     if f.GetField('bool') != 0 or f.GetField('bool_list') != [0, 1]:
-        gdaltest.post_reason('failure')
         f.DumpReadable()
         return 'fail'
 
@@ -1812,7 +1783,6 @@ def test_ogr_geojson_37():
     gdal.Unlink('/vsimem/ogr_geojson_37.json')
 
     if data.find('"bool": false, "not_bool": 0, "bool_list": [ false, true ], "notbool_list": [ 0, 3 ]') < 0:
-        gdaltest.post_reason('failure')
         print(data)
         return 'fail'
 
@@ -1835,33 +1805,25 @@ def test_ogr_geojson_38():
     lyr = ds.GetLayer(0)
     feat_defn = lyr.GetLayerDefn()
     if feat_defn.GetFieldDefn(feat_defn.GetFieldIndex('dt')).GetType() != ogr.OFTDateTime:
-        gdaltest.post_reason('failure')
         return 'fail'
     if feat_defn.GetFieldDefn(feat_defn.GetFieldIndex('dt2')).GetType() != ogr.OFTDateTime:
-        gdaltest.post_reason('failure')
         return 'fail'
     if feat_defn.GetFieldDefn(feat_defn.GetFieldIndex('date')).GetType() != ogr.OFTDate:
-        gdaltest.post_reason('failure')
         return 'fail'
     if feat_defn.GetFieldDefn(feat_defn.GetFieldIndex('time')).GetType() != ogr.OFTTime:
-        gdaltest.post_reason('failure')
         return 'fail'
     if feat_defn.GetFieldDefn(feat_defn.GetFieldIndex('no_dt')).GetType() != ogr.OFTString:
-        gdaltest.post_reason('failure')
         return 'fail'
     if feat_defn.GetFieldDefn(feat_defn.GetFieldIndex('no_dt2')).GetType() != ogr.OFTString:
-        gdaltest.post_reason('failure')
         return 'fail'
     f = lyr.GetNextFeature()
     if f.GetField('dt') != '2014/11/20 12:34:56+01' or f.GetField('dt2') != '2014/11/20 00:00:00' or \
        f.GetField('date') != '2014/11/20' or f.GetField('time') != '12:34:56':
-        gdaltest.post_reason('failure')
         f.DumpReadable()
         return 'fail'
     f = lyr.GetNextFeature()
     if f.GetField('dt') != '2014/11/20 00:00:00' or f.GetField('dt2') != '2014/11/20 12:34:56+00' or \
        f.GetField('date') != '2014/11/20' or f.GetField('time') != '12:34:56':
-        gdaltest.post_reason('failure')
         f.DumpReadable()
         return 'fail'
 
@@ -1882,11 +1844,9 @@ def test_ogr_geojson_39():
     lyr = ds.GetLayer(0)
     feat_defn = lyr.GetLayerDefn()
     if feat_defn.GetFieldDefn(0).GetName() != 'id' or feat_defn.GetFieldDefn(0).GetType() != ogr.OFTString:
-        gdaltest.post_reason('fail')
         return 'fail'
     feat = lyr.GetNextFeature()
     if feat.GetField('id') != 'foo' or feat.GetField('bar') != 'baz':
-        gdaltest.post_reason('fail')
         feat.DumpReadable()
         return 'fail'
 
@@ -1897,11 +1857,9 @@ def test_ogr_geojson_39():
     lyr = ds.GetLayer(0)
     feat_defn = lyr.GetLayerDefn()
     if feat_defn.GetFieldDefn(0).GetName() != 'id' or feat_defn.GetFieldDefn(0).GetType() != ogr.OFTInteger:
-        gdaltest.post_reason('fail')
         return 'fail'
     feat = lyr.GetNextFeature()
     if feat.GetField('id') != 6:
-        gdaltest.post_reason('fail')
         feat.DumpReadable()
         return 'fail'
 
@@ -1913,11 +1871,9 @@ def test_ogr_geojson_39():
     lyr = ds.GetLayer(0)
     feat_defn = lyr.GetLayerDefn()
     if feat_defn.GetFieldDefn(0).GetName() != 'id' or feat_defn.GetFieldDefn(0).GetType() != ogr.OFTInteger:
-        gdaltest.post_reason('fail')
         return 'fail'
     feat = lyr.GetNextFeature()
     if feat.GetField('id') != 6:
-        gdaltest.post_reason('fail')
         feat.DumpReadable()
         return 'fail'
 
@@ -1928,11 +1884,9 @@ def test_ogr_geojson_39():
     lyr = ds.GetLayer(0)
     feat_defn = lyr.GetLayerDefn()
     if feat_defn.GetFieldDefn(0).GetName() != 'id' or feat_defn.GetFieldDefn(0).GetType() != ogr.OFTString:
-        gdaltest.post_reason('fail')
         return 'fail'
     feat = lyr.GetNextFeature()
     if feat.GetField('id') != 'baz':
-        gdaltest.post_reason('fail')
         feat.DumpReadable()
         return 'fail'
 
@@ -1943,11 +1897,9 @@ def test_ogr_geojson_39():
     lyr = ds.GetLayer(0)
     feat_defn = lyr.GetLayerDefn()
     if feat_defn.GetFieldDefn(0).GetName() != 'ID' or feat_defn.GetFieldDefn(0).GetType() != ogr.OFTInteger:
-        gdaltest.post_reason('fail')
         return 'fail'
     feat = lyr.GetNextFeature()
     if feat.GetFID() != 1 or feat.GetField('ID') != 2:
-        gdaltest.post_reason('fail')
         feat.DumpReadable()
         return 'fail'
 
@@ -1966,17 +1918,14 @@ def test_ogr_geojson_39():
     feat_defn = lyr.GetLayerDefn()
     feat = lyr.GetNextFeature()
     if feat.GetFID() != 1 or feat.GetField('foo') != 'bar':
-        gdaltest.post_reason('fail')
         feat.DumpReadable()
         return 'fail'
     feat = lyr.GetNextFeature()
     if feat.GetFID() != 2 or feat.GetField('foo') != 'baz':
-        gdaltest.post_reason('fail')
         feat.DumpReadable()
         return 'fail'
     feat = lyr.GetNextFeature()
     if feat.GetFID() != 3 or feat.GetField('foo') != 'baw':
-        gdaltest.post_reason('fail')
         feat.DumpReadable()
         return 'fail'
 
@@ -1987,11 +1936,9 @@ def test_ogr_geojson_39():
     lyr = ds.GetLayer(0)
     feat_defn = lyr.GetLayerDefn()
     if feat_defn.GetFieldDefn(0).GetName() != 'id' or feat_defn.GetFieldDefn(0).GetType() != ogr.OFTInteger:
-        gdaltest.post_reason('fail')
         return 'fail'
     feat = lyr.GetNextFeature()
     if feat.GetField('id') != -1:
-        gdaltest.post_reason('fail')
         feat.DumpReadable()
         return 'fail'
 
@@ -2003,11 +1950,9 @@ def test_ogr_geojson_39():
     lyr = ds.GetLayer(0)
     feat_defn = lyr.GetLayerDefn()
     if feat_defn.GetFieldDefn(0).GetName() != 'id' or feat_defn.GetFieldDefn(0).GetType() != ogr.OFTInteger64:
-        gdaltest.post_reason('fail')
         return 'fail'
     feat = lyr.GetNextFeature()
     if feat.GetField('id') != -1234567890123:
-        gdaltest.post_reason('fail')
         feat.DumpReadable()
         return 'fail'
 
@@ -2019,11 +1964,9 @@ def test_ogr_geojson_39():
     lyr = ds.GetLayer(0)
     feat_defn = lyr.GetLayerDefn()
     if feat_defn.GetFieldDefn(0).GetName() != 'id' or feat_defn.GetFieldDefn(0).GetType() != ogr.OFTInteger64:
-        gdaltest.post_reason('fail')
         return 'fail'
     feat = lyr.GetNextFeature()
     if feat.GetField('id') != -2:
-        gdaltest.post_reason('fail')
         feat.DumpReadable()
         return 'fail'
 
@@ -2035,11 +1978,9 @@ def test_ogr_geojson_39():
     lyr = ds.GetLayer(0)
     feat_defn = lyr.GetLayerDefn()
     if feat_defn.GetFieldDefn(1).GetName() != 'id' or feat_defn.GetFieldDefn(1).GetType() != ogr.OFTInteger:
-        gdaltest.post_reason('fail')
         return 'fail'
     feat = lyr.GetNextFeature()
     if feat.GetField('id') != 1:
-        gdaltest.post_reason('fail')
         feat.DumpReadable()
         return 'fail'
 
@@ -2052,11 +1993,9 @@ def test_ogr_geojson_39():
     lyr = ds.GetLayer(0)
     feat_defn = lyr.GetLayerDefn()
     if feat_defn.GetFieldDefn(0).GetName() != 'id' or feat_defn.GetFieldDefn(0).GetType() != ogr.OFTString:
-        gdaltest.post_reason('fail')
         return 'fail'
     feat = lyr.GetNextFeature()
     if feat.GetField('id') != '-2':
-        gdaltest.post_reason('fail')
         feat.DumpReadable()
         return 'fail'
 
@@ -2110,7 +2049,6 @@ def test_ogr_geojson_40():
     feat = lyr.GetNextFeature()
     if feat.GetField('a_property') != 'foo' or feat.GetField('some_object.a_property') != 1 or \
        feat.GetField('some_object.another_property') != 2.34:
-        gdaltest.post_reason('fail')
         feat.DumpReadable()
         return 'fail'
 
@@ -2128,27 +2066,23 @@ def test_ogr_geojson_41():
     # Check that by default we return a WGS 84 SRS
     g = ogr.CreateGeometryFromJson("{ 'type': 'Point', 'coordinates' : [ 2, 49] }")
     if g.ExportToWkt() != 'POINT (2 49)':
-        gdaltest.post_reason('fail')
         return 'fail'
     srs = g.GetSpatialReference()
     g = None
 
     if srs.ExportToWkt().find('WGS 84') < 0:
-        gdaltest.post_reason('fail')
         return 'fail'
 
     # But if a crs object is set (allowed originally, but not recommended!), we use it
     g = ogr.CreateGeometryFromJson('{ "type": "Point", "coordinates" : [ 2, 49], "crs": { "type": "name", "properties": { "name": "urn:ogc:def:crs:EPSG::4322" } } }')
     srs = g.GetSpatialReference()
     if srs.ExportToWkt().find('4322') < 0:
-        gdaltest.post_reason('fail')
         return 'fail'
 
     # But if a crs object is set to null, set no crs
     g = ogr.CreateGeometryFromJson('{ "type": "Point", "coordinates" : [ 2, 49], "crs": null }')
     srs = g.GetSpatialReference()
     if srs:
-        gdaltest.post_reason('fail')
         return 'fail'
 
     return 'success'
@@ -2188,11 +2122,9 @@ def test_ogr_geojson_42():
     lyr = ds.GetLayer(0)
     f = lyr.GetNextFeature()
     if f is None or f.GetFID() != 1:
-        gdaltest.post_reason('fail')
         return 'fail'
     f = lyr.GetNextFeature()
     if f is not None:
-        gdaltest.post_reason('fail')
         return 'fail'
     ds = None
     gdal.Unlink('/vsimem/geojson/test.json?resultRecordCount=1')
@@ -2204,11 +2136,9 @@ def test_ogr_geojson_42():
     lyr = ds.GetLayer(0)
     f = lyr.GetNextFeature()
     if f is None or f.GetFID() != 1:
-        gdaltest.post_reason('fail')
         return 'fail'
     f = lyr.GetNextFeature()
     if f is not None:
-        gdaltest.post_reason('fail')
         return 'fail'
     ds = None
     gdal.Unlink('/vsimem/geojson/test.json?resultRecordCount=10')
@@ -2220,16 +2150,13 @@ def test_ogr_geojson_42():
     lyr = ds.GetLayer(0)
     f = lyr.GetNextFeature()
     if f is None or f.GetFID() != 1:
-        gdaltest.post_reason('fail')
         return 'fail'
     f = lyr.GetNextFeature()
     if f is not None:
-        gdaltest.post_reason('fail')
         return 'fail'
     lyr.ResetReading()
     f = lyr.GetNextFeature()
     if f is None or f.GetFID() != 1:
-        gdaltest.post_reason('fail')
         return 'fail'
 
     resultOffset1 = """
@@ -2250,32 +2177,27 @@ def test_ogr_geojson_42():
     gdal.FileFromMemBuffer('/vsimem/geojson/test.json?resultRecordCount=1&resultOffset=1', resultOffset1)
     f = lyr.GetNextFeature()
     if f is None or f.GetFID() != 2:
-        gdaltest.post_reason('fail')
         return 'fail'
     f = lyr.GetNextFeature()
     if f is not None:
-        gdaltest.post_reason('fail')
         return 'fail'
 
     gdal.PushErrorHandler()
     fc = lyr.GetFeatureCount()
     gdal.PopErrorHandler()
     if fc != 2:
-        gdaltest.post_reason('fail')
         return 'fail'
 
     gdal.FileFromMemBuffer('/vsimem/geojson/test.json?resultRecordCount=1&returnCountOnly=true',
                            """{ "count": 123456}""")
     fc = lyr.GetFeatureCount()
     if fc != 123456:
-        gdaltest.post_reason('fail')
         return 'fail'
 
     gdal.PushErrorHandler()
     extent = lyr.GetExtent()
     gdal.PopErrorHandler()
     if extent != (2, 2, 49, 49):
-        gdaltest.post_reason('fail')
         print(extent)
         return 'fail'
 
@@ -2283,20 +2205,16 @@ def test_ogr_geojson_42():
                            """{"type":"FeatureCollection","bbox":[1, 2, 3, 4],"features":[]}""")
     extent = lyr.GetExtent()
     if extent != (1.0, 3.0, 2.0, 4.0):
-        gdaltest.post_reason('fail')
         print(extent)
         return 'fail'
 
     if lyr.TestCapability(ogr.OLCFastFeatureCount) != 1:
-        gdaltest.post_reason('fail')
         return 'fail'
 
     if lyr.TestCapability(ogr.OLCFastGetExtent) != 0:
-        gdaltest.post_reason('fail')
         return 'fail'
 
     if lyr.TestCapability('foo') != 0:
-        gdaltest.post_reason('fail')
         return 'fail'
 
     # Test scrolling with ESRI json
@@ -2357,11 +2275,9 @@ def test_ogr_geojson_42():
     lyr = ds.GetLayer(0)
     f = lyr.GetNextFeature()
     if f is None or f.GetFID() != 1:
-        gdaltest.post_reason('fail')
         return 'fail'
     f = lyr.GetNextFeature()
     if f is None or f.GetFID() != 20:
-        gdaltest.post_reason('fail')
         return 'fail'
     ds = None
     gdal.Unlink('/vsimem/geojson/test.json?resultRecordCount=1')
@@ -2428,12 +2344,10 @@ def test_ogr_geojson_45():
         lyr = ds.GetLayer(0)
         native_data = lyr.GetMetadataItem("NATIVE_DATA", "NATIVE_DATA")
         if native_data != '{ "foo": "bar", "bar": "baz" }':
-            gdaltest.post_reason('fail')
             print(native_data)
             return 'fail'
         native_media_type = lyr.GetMetadataItem("NATIVE_MEDIA_TYPE", "NATIVE_DATA")
         if native_media_type != 'application/vnd.geo+json':
-            gdaltest.post_reason('fail')
             print(native_media_type)
             return 'fail'
         f = lyr.GetNextFeature()
@@ -2445,12 +2359,10 @@ def test_ogr_geojson_45():
         else:
             expected = ['{"type":"Feature","foo":["bar","baz",1.0,true,false,[],{}],"properties":{"myprop":"myvalue"},"geometry":null}']
         if native_data not in expected:
-            gdaltest.post_reason('fail')
             print(native_data)
             return 'fail'
         native_media_type = f.GetNativeMediaType()
         if native_media_type != 'application/vnd.geo+json':
-            gdaltest.post_reason('fail')
             print(native_media_type)
             return 'fail'
         ds = None
@@ -2492,7 +2404,6 @@ def test_ogr_geojson_45():
        data.find('"foo_multilinestring": "bar_multilinestring"') < 0 or data.find('6') < 0 or \
        data.find('"foo_polygon": "bar_polygon"') < 0 or data.find('7') < 0 or \
        data.find('"foo_multipolygon": "bar_multipolygon"') < 0 or data.find('8') < 0:
-        gdaltest.post_reason('fail')
         print(data)
         return 'fail'
 
@@ -2520,7 +2431,6 @@ def test_ogr_geojson_45():
 }
 """
     if json.loads(got) != json.loads(expected):
-        gdaltest.post_reason('fail')
         print(got)
         return 'fail'
 
@@ -2548,7 +2458,6 @@ def test_ogr_geojson_45():
 }
 """
     if json.loads(got) != json.loads(expected):
-        gdaltest.post_reason('fail')
         print(got)
         return 'fail'
 
@@ -2577,7 +2486,6 @@ def test_ogr_geojson_46():
     gdal.Unlink('/vsimem/ogr_geojson_46.json')
 
     if data.find('{ "myprop": { "a": "b" } }') < 0:
-        gdaltest.post_reason('fail')
         print(data)
         return 'fail'
 
@@ -2595,7 +2503,6 @@ def test_ogr_geojson_47():
     with gdaltest.error_handler():
         ds = ogr.Open('{"type": "FeatureCollection", "features":[]}', update=1)
     if ds is not None:
-        gdaltest.post_reason('fail')
         return 'fail'
 
     gdal.FileFromMemBuffer('/vsimem/ogr_geojson_47.json',
@@ -2621,7 +2528,6 @@ def test_ogr_geojson_47():
     if data.find('"foo": "bar"') < 0 or data.find('"bar": "baz"') < 0 or \
        data.find('crs') >= 0 or \
        data.find('"myprop": "another_value"') < 0:
-        gdaltest.post_reason('fail')
         print(data)
         return 'fail'
 
@@ -2632,7 +2538,6 @@ def test_ogr_geojson_47():
     f.SetGeometry(ogr.CreateGeometryFromWkt('POINT(1 2)'))
     lyr.CreateFeature(f)
     if f.GetFID() != 1:
-        gdaltest.post_reason('fail')
         f.DumpReadable()
         return 'fail'
     f = ogr.Feature(lyr.GetLayerDefn())
@@ -2640,7 +2545,6 @@ def test_ogr_geojson_47():
     lyr.CreateFeature(f)
     f = lyr.GetNextFeature()
     if f.GetFID() != 0:
-        gdaltest.post_reason('fail')
         f.DumpReadable()
         return 'fail'
     ds = None
@@ -2658,7 +2562,6 @@ def test_ogr_geojson_47():
     ds = ogr.Open('/vsimem/ogr_geojson_47.json')
     lyr = ds.GetLayer(0)
     if lyr.GetFeatureCount() != 4:
-        gdaltest.post_reason('fail')
         return 'fail'
     ds = None
 
@@ -2675,7 +2578,6 @@ def test_ogr_geojson_47():
        data.find('"myprop": "another_value"') < 0 or \
        data.find('"myprop": "value_of_point_4_5"') < 0 or \
        data.find('id') >= 0:
-        gdaltest.post_reason('fail')
         print(data)
         return 'fail'
 
@@ -2691,7 +2593,6 @@ def test_ogr_geojson_47():
     ds = ogr.Open('/vsimem/ogr_geojson_47.json')
     lyr = ds.GetLayer(0)
     if lyr.GetFeatureCount() != 1:
-        gdaltest.post_reason('fail')
         return 'fail'
     ds = None
 
@@ -2705,7 +2606,6 @@ def test_ogr_geojson_47():
     ds = ogr.Open('/vsimem/ogr_geojson_47.json')
     lyr = ds.GetLayer(0)
     if lyr.GetFeatureCount() != 1:
-        gdaltest.post_reason('fail')
         return 'fail'
     ds = None
 
@@ -2719,7 +2619,6 @@ def test_ogr_geojson_47():
     ds = ogr.Open('/vsimem/ogr_geojson_47.json')
     lyr = ds.GetLayer(0)
     if lyr.GetFeatureCount() != 1:
-        gdaltest.post_reason('fail')
         return 'fail'
     ds = None
 
@@ -2731,7 +2630,6 @@ def test_ogr_geojson_47():
         data = None
 
     if data.find('something') < 0:
-        gdaltest.post_reason('fail')
         print(data)
         return 'fail'
 
@@ -2745,7 +2643,6 @@ def test_ogr_geojson_47():
     ds = ogr.Open('/vsimem/ogr_geojson_47.json')
     lyr = ds.GetLayer(0)
     if lyr.GetFeatureCount() != 2:
-        gdaltest.post_reason('fail')
         return 'fail'
     ds = None
 
@@ -2757,7 +2654,6 @@ def test_ogr_geojson_47():
         data = None
 
     if data.find('bbox') < 0:
-        gdaltest.post_reason('fail')
         print(data)
         return 'fail'
 
@@ -2800,7 +2696,6 @@ def test_ogr_geojson_48():
        data.find('crs') >= 0 or \
        data.find('FeatureCollection') >= 0 or \
        data.find('"myprop": "another_value"') < 0:
-        gdaltest.post_reason('fail')
         print(data)
         return 'fail'
 
@@ -2821,11 +2716,9 @@ def test_ogr_geojson_49():
     ds = gdal.OpenEx('/vsimem/ogr_geojson_49.json', open_options=['ARRAY_AS_STRING=YES'])
     lyr = ds.GetLayer(0)
     if lyr.GetLayerDefn().GetFieldDefn(0).GetType() != ogr.OFTString:
-        gdaltest.post_reason('fail')
         return 'fail'
     f = lyr.GetNextFeature()
     if f['foo'] != '[ "bar" ]':
-        gdaltest.post_reason('fail')
         f.DumpReadable()
         return 'fail'
     ds = None
@@ -2862,7 +2755,6 @@ def test_ogr_geojson_50():
     gdal.Unlink('/vsimem/ogr_geojson_50.json')
 
     if data.find('1.23456789012456') < 0 and data.find('5268.813 ') < 0:
-        gdaltest.post_reason('fail')
         print(data)
         return 'fail'
 
@@ -2884,7 +2776,6 @@ def test_ogr_geojson_50():
     gdal.Unlink('/vsimem/ogr_geojson_50.json')
 
     if data.find('1.23456789012456') < 0 and data.find('-5') < 0:
-        gdaltest.post_reason('fail')
         print(data)
         return 'fail'
 
@@ -2907,7 +2798,6 @@ def test_ogr_geojson_50():
     gdal.Unlink('/vsimem/ogr_geojson_50.json')
 
     if data.find('0.00001234') < 0 or data.find('1.23456789012456') < 0:
-        gdaltest.post_reason('fail')
         print(data)
         return 'fail'
 
@@ -2962,37 +2852,30 @@ def test_ogr_geojson_51():
     gdal.Unlink('/vsimem/ogr_geojson_51.json')
 
     if data.find('{ "id": 1 }, "geometry": null') < 0:
-        gdaltest.post_reason('fail')
         print(data)
         return 'fail'
 
     if data.find('{ "id": 2 }, "geometry": { "type": "LineString", "coordinates": [ ] } }') < 0:
-        gdaltest.post_reason('fail')
         print(data)
         return 'fail'
 
     if data.find('{ "id": 3 }, "geometry": { "type": "Polygon", "coordinates": [ ] } }') < 0:
-        gdaltest.post_reason('fail')
         print(data)
         return 'fail'
 
     if data.find('{ "id": 4 }, "geometry": { "type": "MultiPoint", "coordinates": [ ] } }') < 0:
-        gdaltest.post_reason('fail')
         print(data)
         return 'fail'
 
     if data.find('{ "id": 5 }, "geometry": { "type": "MultiLineString", "coordinates": [ ] } }') < 0:
-        gdaltest.post_reason('fail')
         print(data)
         return 'fail'
 
     if data.find('{ "id": 6 }, "geometry": { "type": "MultiPolygon", "coordinates": [ ] } }') < 0:
-        gdaltest.post_reason('fail')
         print(data)
         return 'fail'
 
     if data.find('{ "id": 7 }, "geometry": { "type": "GeometryCollection", "geometries": [ ] } }') < 0:
-        gdaltest.post_reason('fail')
         print(data)
         return 'fail'
 
@@ -3060,7 +2943,6 @@ def test_ogr_geojson_53():
     gdal.Unlink('/vsimem/ogr_geojson_53.json')
 
     if data.find('{ "type": "Point", "coordinates": [ 1.0, 2.0, 3.0 ] }') < 0:
-        gdaltest.post_reason('fail')
         print(data)
         return 'fail'
 
@@ -3087,33 +2969,25 @@ def test_ogr_geojson_54():
 
     fld = lyr.GetLayerDefn().GetFieldDefn(0)
     if fld.GetType() != ogr.OFTInteger:
-        gdaltest.post_reason('fail')
         return 'fail'
     fld = lyr.GetLayerDefn().GetFieldDefn(1)
     if fld.GetType() != ogr.OFTString:
-        gdaltest.post_reason('fail')
         return 'fail'
     fld = lyr.GetLayerDefn().GetFieldDefn(2)
     if fld.GetType() != ogr.OFTReal:
-        gdaltest.post_reason('fail')
         return 'fail'
     fld = lyr.GetLayerDefn().GetFieldDefn(3)
     if fld.GetType() != ogr.OFTDateTime:
-        gdaltest.post_reason('fail')
         return 'fail'
     fld = lyr.GetLayerDefn().GetFieldDefn(4)
     if fld.GetType() != ogr.OFTInteger:
-        gdaltest.post_reason('fail')
         return 'fail'
     if fld.GetSubType() != ogr.OFSTBoolean:
-        gdaltest.post_reason('fail')
         return 'fail'
     if fld.GetWidth() != 1:
-        gdaltest.post_reason('fail')
         return 'fail'
     fld = lyr.GetLayerDefn().GetFieldDefn(5)
     if fld.GetType() != ogr.OFTString:
-        gdaltest.post_reason('fail')
         return 'fail'
     return 'success'
 
@@ -3155,7 +3029,6 @@ def test_ogr_geojson_55():
 }
 """
     if json.loads(got) != json.loads(expected):
-        gdaltest.post_reason('fail')
         print(got)
         return 'fail'
 
@@ -3181,7 +3054,6 @@ def test_ogr_geojson_55():
 }
 """
     if json.loads(got) != json.loads(expected):
-        gdaltest.post_reason('fail')
         print(got)
         return 'fail'
 
@@ -3233,7 +3105,6 @@ def test_ogr_geojson_55():
 }
 """
     if json.loads(got) != json.loads(expected):
-        gdaltest.post_reason('fail')
         print(got)
         return 'fail'
 
@@ -3278,7 +3149,6 @@ def test_ogr_geojson_56():
 }
 """
     if json.loads(got) != json.loads(expected):
-        gdaltest.post_reason('fail')
         print(got)
         return 'fail'
 
@@ -3309,7 +3179,6 @@ def test_ogr_geojson_56():
 }
 """
     if json.loads(got) != json.loads(expected):
-        gdaltest.post_reason('fail')
         print(got)
         return 'fail'
 
@@ -3347,7 +3216,6 @@ def test_ogr_geojson_57():
 }
 """
     if json.loads(got) != json.loads(expected):
-        gdaltest.post_reason('fail')
         print(got)
         return 'fail'
 
@@ -3377,7 +3245,6 @@ def test_ogr_geojson_57():
 }
 """
     if json.loads(got) != json.loads(expected):
-        gdaltest.post_reason('fail')
         print(got)
         return 'fail'
 
@@ -3403,7 +3270,6 @@ def test_ogr_geojson_57():
 }
 """
     if json.loads(got) != json.loads(expected):
-        gdaltest.post_reason('fail')
         print(got)
         return 'fail'
 
@@ -3429,7 +3295,6 @@ def test_ogr_geojson_57():
 }
 """
     if json.loads(got) != json.loads(expected):
-        gdaltest.post_reason('fail')
         print(got)
         return 'fail'
 
@@ -3455,7 +3320,6 @@ def test_ogr_geojson_57():
 }
 """
     if json.loads(got) != json.loads(expected):
-        gdaltest.post_reason('fail')
         print(got)
         return 'fail'
 
@@ -3481,7 +3345,6 @@ def test_ogr_geojson_57():
 }
 """
     if json.loads(got) != json.loads(expected):
-        gdaltest.post_reason('fail')
         print(got)
         return 'fail'
 
@@ -3528,7 +3391,6 @@ def test_ogr_geojson_57():
 """
 
     if json.loads(got) != json.loads(expected) and json.loads(got) != json.loads(expected2):
-        gdaltest.post_reason('fail')
         print(got)
         return 'fail'
 
@@ -3554,7 +3416,6 @@ def test_ogr_geojson_57():
 }
 """
     if json.loads(got) != json.loads(expected):
-        gdaltest.post_reason('fail')
         print(got)
         return 'fail'
 
@@ -3638,17 +3499,14 @@ def test_ogr_geojson_60():
     lyr = ds.GetLayer(0)
     f = lyr.GetNextFeature()
     if f['foo'] != 'bar':
-        gdaltest.post_reason('failure')
         f.DumpReadable()
         return 'fail'
     f = lyr.GetNextFeature()
     if not f.IsFieldNull('foo'):
-        gdaltest.post_reason('failure')
         f.DumpReadable()
         return 'fail'
     f = lyr.GetNextFeature()
     if f.IsFieldSet('foo'):
-        gdaltest.post_reason('failure')
         f.DumpReadable()
         return 'fail'
 
@@ -3663,7 +3521,6 @@ def test_ogr_geojson_60():
     if data.find('"properties": { "foo": "bar" }') < 0 or \
        data.find('"properties": { "foo": null }') < 0 or \
        data.find('"properties": { }') < 0:
-        gdaltest.post_reason('failure')
         print(data)
         return 'fail'
 
@@ -3681,7 +3538,6 @@ def test_ogr_geojson_61():
     with gdaltest.error_handler():
         ds = gdal.OpenEx('/vsimem/ogr_geojson_61.json')
     if ds is not None:
-        gdaltest.post_reason('failure')
         return 'fail'
     gdal.Unlink('/vsimem/ogr_geojson_61.json')
 
@@ -3689,7 +3545,6 @@ def test_ogr_geojson_61():
     with gdaltest.error_handler():
         ds = gdal.OpenEx("""{ "type": "Point", "x" : { "coordinates" : null } } """)
     if ds is not None:
-        gdaltest.post_reason('failure')
         return 'fail'
 
     # Empty property name
@@ -3699,7 +3554,6 @@ def test_ogr_geojson_61():
     lyr = ds.GetLayer(0)
     f = lyr.GetNextFeature()
     if f.GetField("") != 1:
-        gdaltest.post_reason('failure')
         return 'fail'
     ds = None
     gdal.Unlink('/vsimem/ogr_geojson_61.json')
@@ -3729,7 +3583,6 @@ def test_ogr_geojson_62():
     lyr = ds.GetLayer(0)
     srs = lyr.GetSpatialRef()
     if srs.ExportToWkt().find('32631') < 0:
-        gdaltest.post_reason('failure')
         return 'fail'
 
     # crs type=EPSG (not even documented in GJ2008 spec!) tests. Just for coverage completeness
@@ -3751,7 +3604,6 @@ def test_ogr_geojson_62():
     lyr = ds.GetLayer(0)
     srs = lyr.GetSpatialRef()
     if srs.ExportToWkt().find('32631') < 0:
-        gdaltest.post_reason('failure')
         return 'fail'
 
     # crs type=link tests
@@ -3788,7 +3640,6 @@ def test_ogr_geojson_62():
     lyr = ds.GetLayer(0)
     srs = lyr.GetSpatialRef()
     if srs.ExportToWkt().find('32631') < 0:
-        gdaltest.post_reason('failure')
         return 'fail'
 
     return 'success'
@@ -3894,14 +3745,11 @@ def test_ogr_geojson_67():
 
     ds = ogr.Open('data/grenada.geojson')
     if ds is None:
-        gdaltest.post_reason('fail')
         return 'fail'
     if ds.GetDriver().GetName() != 'GeoJSON':
-        gdaltest.post_reason('fail')
         return 'fail'
     lyr = ds.GetLayer(0)
     if lyr.GetFeatureCount() != 1:
-        gdaltest.post_reason('fail')
         return 'fail'
     return 'success'
 
@@ -3913,14 +3761,11 @@ def test_ogr_geojson_68():
 
     ds = ogr.Open('data/esrijsonstartingwithfeaturesgeometry.json')
     if ds is None:
-        gdaltest.post_reason('fail')
         return 'fail'
     if ds.GetDriver().GetName() != 'ESRIJSON':
-        gdaltest.post_reason('fail')
         return 'fail'
     lyr = ds.GetLayer(0)
     if lyr.GetFeatureCount() != 1:
-        gdaltest.post_reason('fail')
         return 'fail'
     return 'success'
 
@@ -3932,21 +3777,18 @@ def test_ogr_geojson_id_field_and_id_type():
     gdal.VectorTranslate('/vsimem/out.json', 'data/poly.shp', options='-f GeoJSON -lco ID_TYPE=String -preserve_fid -limit 1 -fid 2')
     got = read_file('/vsimem/out.json')
     if got.find('"id": "2", "properties": { "AREA": 261752.781, "EAS_ID": 171, "PRFEDEA": "35043414" }') < 0:
-        gdaltest.post_reason('fail')
         print(got)
         return 'fail'
 
     gdal.VectorTranslate('/vsimem/out.json', 'data/poly.shp', options='-f GeoJSON -lco ID_TYPE=Integer -preserve_fid -limit 1 -fid 2')
     got = read_file('/vsimem/out.json')
     if got.find('"id": 2, "properties": { "AREA": 261752.781, "EAS_ID": 171, "PRFEDEA": "35043414" }') < 0:
-        gdaltest.post_reason('fail')
         print(got)
         return 'fail'
 
     gdal.VectorTranslate('/vsimem/out.json', 'data/poly.shp', format='GeoJSON', layerCreationOptions=['ID_FIELD=EAS_ID'], limit=1)
     got = read_file('/vsimem/out.json')
     if got.find('"id": 168, "properties": { "AREA": 215229.266, "PRFEDEA": "35043411" }') < 0:
-        gdaltest.post_reason('fail')
         print(got)
         return 'fail'
 
@@ -3956,7 +3798,6 @@ def test_ogr_geojson_id_field_and_id_type():
     got = read_file('/vsimem/out2.json')
     gdal.Unlink('/vsimem/out2.json')
     if got.find('"id": 168, "properties": { "AREA": 215229.266, "PRFEDEA": "35043411" }') < 0:
-        gdaltest.post_reason('fail')
         print(got)
         return 'fail'
 
@@ -3966,7 +3807,6 @@ def test_ogr_geojson_id_field_and_id_type():
     got = read_file('/vsimem/out2.json')
     gdal.Unlink('/vsimem/out2.json')
     if got.find('"id": "168", "properties": { "AREA": 215229.266, "PRFEDEA": "35043411" }') < 0:
-        gdaltest.post_reason('fail')
         print(got)
         return 'fail'
 
@@ -3976,7 +3816,6 @@ def test_ogr_geojson_id_field_and_id_type():
     got = read_file('/vsimem/out2.json')
     gdal.Unlink('/vsimem/out2.json')
     if got.find('"id": 168, "properties": { "AREA": 215229.266, "PRFEDEA": "35043411" }') < 0:
-        gdaltest.post_reason('fail')
         print(got)
         return 'fail'
 
@@ -3985,7 +3824,6 @@ def test_ogr_geojson_id_field_and_id_type():
     gdal.VectorTranslate('/vsimem/out.json', 'data/poly.shp', format='GeoJSON', layerCreationOptions=['ID_FIELD=EAS_ID', 'ID_TYPE=String'], limit=1)
     got = read_file('/vsimem/out.json')
     if got.find('"id": "168", "properties": { "AREA": 215229.266, "PRFEDEA": "35043411" }') < 0:
-        gdaltest.post_reason('fail')
         print(got)
         return 'fail'
 
@@ -3995,7 +3833,6 @@ def test_ogr_geojson_id_field_and_id_type():
     got = read_file('/vsimem/out2.json')
     gdal.Unlink('/vsimem/out2.json')
     if got.find('"id": "168", "properties": { "AREA": 215229.266, "PRFEDEA": "35043411" }') < 0:
-        gdaltest.post_reason('fail')
         print(got)
         return 'fail'
 
@@ -4005,7 +3842,6 @@ def test_ogr_geojson_id_field_and_id_type():
     got = read_file('/vsimem/out2.json')
     gdal.Unlink('/vsimem/out2.json')
     if got.find('"id": "168", "properties": { "AREA": 215229.266, "PRFEDEA": "35043411" }') < 0:
-        gdaltest.post_reason('fail')
         print(got)
         return 'fail'
 
@@ -4015,7 +3851,6 @@ def test_ogr_geojson_id_field_and_id_type():
     got = read_file('/vsimem/out2.json')
     gdal.Unlink('/vsimem/out2.json')
     if got.find('"id": 168, "properties": { "AREA": 215229.266, "PRFEDEA": "35043411" }') < 0:
-        gdaltest.post_reason('fail')
         print(got)
         return 'fail'
 
@@ -4025,7 +3860,6 @@ def test_ogr_geojson_id_field_and_id_type():
     got = read_file('/vsimem/out.json')
     gdal.Unlink('/vsimem/out.json')
     if got.find('"id": "35043411", "properties": { "AREA": 215229.266, "EAS_ID": 168 }') < 0:
-        gdaltest.post_reason('fail')
         print(got)
         return 'fail'
 
@@ -4033,7 +3867,6 @@ def test_ogr_geojson_id_field_and_id_type():
     got = read_file('/vsimem/out.json')
     gdal.Unlink('/vsimem/out.json')
     if got.find('"id": 35043411, "properties": { "AREA": 215229.266, "EAS_ID": 168 }') < 0:
-        gdaltest.post_reason('fail')
         print(got)
         return 'fail'
 
@@ -4047,14 +3880,12 @@ def test_ogr_geojson_geom_export_failure():
     g = ogr.CreateGeometryFromWkt('POINT EMPTY')
     geojson = g.ExportToJson()
     if geojson is not None:
-        gdaltest.post_reason('fail')
         print(geojson)
         return 'fail'
 
     g = ogr.CreateGeometryFromWkt('GEOMETRYCOLLECTION(TIN EMPTY)')
     geojson = json.loads(g.ExportToJson())
     if geojson != {"type": "GeometryCollection", "geometries": None}:
-        gdaltest.post_reason('fail')
         print(geojson)
         return 'fail'
 
@@ -4063,7 +3894,6 @@ def test_ogr_geojson_geom_export_failure():
     with gdaltest.error_handler():
         geojson = g.ExportToJson()
     if geojson is not None:
-        gdaltest.post_reason('fail')
         print(geojson)
         return 'fail'
 
@@ -4083,7 +3913,6 @@ def test_ogr_geojson_geom_export_failure():
     with gdaltest.error_handler():
         geojson = g.ExportToJson()
     if geojson is not None:
-        gdaltest.post_reason('fail')
         print(geojson)
         return 'fail'
 
@@ -4273,20 +4102,16 @@ def test_ogr_geojson_non_finite():
     f = lyr.GetNextFeature()
     for i in range(3):
         if lyr.GetLayerDefn().GetFieldDefn(i).GetType() != ogr.OFTReal:
-            gdaltest.post_reason('fail')
             print(i)
             return 'fail'
 
     if f['inf_prop'] != float('inf'):
-        gdaltest.post_reason('fail')
         f.DumpReadable()
         return 'fail'
     if f['minus_inf_prop'] != float('-inf'):
-        gdaltest.post_reason('fail')
         f.DumpReadable()
         return 'fail'
     if not math.isnan(f['nan_prop']):
-        gdaltest.post_reason('fail')
         print(str(f['nan_prop']))
         f.DumpReadable()
         return 'fail'
@@ -4299,7 +4124,6 @@ def test_ogr_geojson_non_finite():
     ds = ogr.Open(tmpfilename)
     lyr = ds.GetLayer(0)
     if lyr.GetLayerDefn().GetFieldCount() != 0:
-        gdaltest.post_reason('fail')
         return 'fail'
     ds = None
 
@@ -4307,19 +4131,15 @@ def test_ogr_geojson_non_finite():
     ds = ogr.Open(tmpfilename)
     lyr = ds.GetLayer(0)
     if lyr.GetLayerDefn().GetFieldCount() != 3:
-        gdaltest.post_reason('fail')
         return 'fail'
     f = lyr.GetNextFeature()
     if f['inf_prop'] != float('inf'):
-        gdaltest.post_reason('fail')
         f.DumpReadable()
         return 'fail'
     if f['minus_inf_prop'] != float('-inf'):
-        gdaltest.post_reason('fail')
         f.DumpReadable()
         return 'fail'
     if not math.isnan(f['nan_prop']):
-        gdaltest.post_reason('fail')
         print(str(f['nan_prop']))
         f.DumpReadable()
         return 'fail'
diff --git a/autotest/ogr/ogr_geojsonseq.py b/autotest/ogr/ogr_geojsonseq.py
index 6b391aadfa27..2b41c676eeb5 100755
--- a/autotest/ogr/ogr_geojsonseq.py
+++ b/autotest/ogr/ogr_geojsonseq.py
@@ -57,12 +57,10 @@ def _ogr_geojsonseq_create(filename, lco, expect_rs):
     lyr.CreateFeature(f)
 
     if ds.TestCapability(ogr.ODsCCreateLayer):
-        gdaltest.post_reason('fail')
         return 'fail'
 
     with gdaltest.error_handler():
         if ds.CreateLayer('foo') is not None:
-            gdaltest.post_reason('fail')
             return 'fail'
 
     ds = None
@@ -72,11 +70,9 @@ def _ogr_geojsonseq_create(filename, lco, expect_rs):
     gdal.VSIFCloseL(f)
     if expect_rs:
         if first != '\x1e':
-            gdaltest.post_reason('fail')
             return 'fail'
     else:
         if first != '{':
-            gdaltest.post_reason('fail')
             return 'fail'
 
     ds = ogr.Open(filename)
@@ -84,16 +80,13 @@ def _ogr_geojsonseq_create(filename, lco, expect_rs):
     f = lyr.GetNextFeature()
     if f['foo'] != 'bar"d' or \
        f.GetGeometryRef().ExportToWkt() != 'POINT (1 2)':
-        gdaltest.post_reason('fail')
         f.DumpReadable()
         return 'fail'
     f = lyr.GetNextFeature()
     if f['foo'] != 'baz' or f.GetGeometryRef().ExportToWkt() != 'POINT (3 4)':
-        gdaltest.post_reason('fail')
         f.DumpReadable()
         return 'fail'
     if lyr.GetNextFeature() is not None:
-        gdaltest.post_reason('fail')
         return 'fail'
     ds = None
 
@@ -146,7 +139,6 @@ def test_ogr_geojsonseq_seq_geometries():
             return 'fail'
         f = lyr.GetNextFeature()
         if f.GetGeometryRef().ExportToWkt() != 'POINT (2 49)':
-            gdaltest.post_reason('fail')
             f.DumpReadable()
             return 'fail'
 
@@ -171,7 +163,6 @@ def test_ogr_geojsonseq_reprojection():
     lyr = ds.GetLayer(0)
     f = lyr.GetNextFeature()
     if f.GetGeometryRef().ExportToWkt() != 'POINT (2 49)':
-        gdaltest.post_reason('fail')
         f.DumpReadable()
         return 'fail'
     ds = None
@@ -188,16 +179,13 @@ def test_ogr_geojsonseq_read_rs_json_pretty():
     f = lyr.GetNextFeature()
     if f['foo'] != 'bar' or \
        f.GetGeometryRef().ExportToWkt() != 'POINT (1 2)':
-        gdaltest.post_reason('fail')
         f.DumpReadable()
         return 'fail'
     f = lyr.GetNextFeature()
     if f['foo'] != 'baz' or f.GetGeometryRef().ExportToWkt() != 'POINT (3 4)':
-        gdaltest.post_reason('fail')
         f.DumpReadable()
         return 'fail'
     if lyr.GetNextFeature() is not None:
-        gdaltest.post_reason('fail')
         return 'fail'
     return 'success'
 
diff --git a/autotest/ogr/ogr_geom.py b/autotest/ogr/ogr_geom.py
index 3fd3664f48ab..3c53c137b30e 100755
--- a/autotest/ogr/ogr_geom.py
+++ b/autotest/ogr/ogr_geom.py
@@ -238,13 +238,11 @@ def test_ogr_geom_polyhedral_surface():
 
     polygon_wkt = ogr.ForceTo(geom.Clone(), ogr.wkbPolygon).ExportToWkt()
     if polygon_wkt != wkt_original:
-        gdaltest.post_reason("fail")
         print(polygon_wkt)
         return 'fail'
 
     polygon_wkt = ogr.ForceTo(geom.Clone(), ogr.wkbMultiPolygon).ExportToWkt()
     if polygon_wkt != 'MULTIPOLYGON (((0 0 0,0 0 1,0 1 1,0 1 0,0 0 0)),((0 0 0,0 1 0,1 1 0,1 0 0,0 0 0)),((0 0 0,1 0 0,1 0 1,0 0 1,0 0 0)),((1 1 0,1 1 1,1 0 1,1 0 0,1 1 0)),((0 1 0,0 1 1,1 1 1,1 1 0,0 1 0)),((0 0 1,1 0 1,1 1 1,0 1 1,0 0 1)))':
-        gdaltest.post_reason("fail")
         print(polygon_wkt)
         return 'fail'
 
@@ -286,7 +284,6 @@ def test_ogr_geom_polyhedral_surface():
 
     g = ogr.CreateGeometryFromWkt('POLYHEDRALSURFACE (((0 0 0,0 0 1,0 1 1,0 1 0,0 0 0)))')
     if g.Equals(g) == 0:
-        gdaltest.post_reason("fail")
         return 'fail'
 
     for wkt in ['MULTIPOLYGON (((0 0 0,0 0 1,0 1 1,0 1 0,0 0 0)))',
@@ -301,12 +298,10 @@ def test_ogr_geom_polyhedral_surface():
 
     # Error
     if g.AddGeometry(ogr.CreateGeometryFromWkt('POINT (0 0)')) == 0:
-        gdaltest.post_reason("fail")
         return 'fail'
 
     # Error
     if g.AddGeometryDirectly(ogr.CreateGeometryFromWkt('POINT (0 0)')) == 0:
-        gdaltest.post_reason("fail")
         return 'fail'
 
     # Test dimension promotion
@@ -315,7 +310,6 @@ def test_ogr_geom_polyhedral_surface():
     g.AddGeometryDirectly(ogr.CreateGeometryFromWkt('POLYGON ((10 10,10 11,11 11,10 10))'))
     wkt = g.ExportToIsoWkt()
     if wkt != 'POLYHEDRALSURFACE ZM (((0 0 1 2,0 1 1 2,1 1 1 2,0 0 1 2)),((10 10 0 0,10 11 0 0,11 11 0 0,10 10 0 0)))':
-        gdaltest.post_reason("fail")
         print(wkt)
         return 'fail'
 
@@ -425,7 +419,6 @@ def test_ogr_geom_tin():
     with gdaltest.error_handler():
         g = ogr.CreateGeometryFromWkt(invalid_wkt)
     if g is not None:
-        gdaltest.post_reason('fail')
         return 'fail'
 
     # hole
@@ -433,23 +426,19 @@ def test_ogr_geom_tin():
     with gdaltest.error_handler():
         g = ogr.CreateGeometryFromWkt(invalid_wkt)
     if g is not None:
-        gdaltest.post_reason('fail')
         return 'fail'
 
     invalid_wkt = 'TIN (POLYGON((0 0,0 1,1 1,0 0)))'
     with gdaltest.error_handler():
         g = ogr.CreateGeometryFromWkt(invalid_wkt)
     if g is not None:
-        gdaltest.post_reason('fail')
         return 'fail'
 
     # Add a POLYGON that can be cast as a TRIANGLE
     g = ogr.Geometry(ogr.wkbTIN)
     if g.AddGeometry(ogr.CreateGeometryFromWkt('POLYGON ((0 0,0 1,1 1,0 0))')) != 0:
-        gdaltest.post_reason('fail')
         return 'fail'
     if g.ExportToIsoWkt() != 'TIN (((0 0,0 1,1 1,0 0)))':
-        gdaltest.post_reason('fail')
         return 'fail'
 
     return 'success'
@@ -729,7 +718,6 @@ def test_ogr_geom_transform_to():
     ret = geom.TransformTo(sr2)
 
     if ret != 0 or abs(geom.GetX() - 426857) > 1 or abs(geom.GetY() - 5427937) > 1:
-        gdaltest.post_reason('failure')
         print(geom.ExportToWkt())
         return 'fail'
 
@@ -739,7 +727,6 @@ def test_ogr_geom_transform_to():
     with gdaltest.error_handler():
         ret = geom.TransformTo(sr2)
     if ret == 0 or gdal.GetLastErrorMsg() == '':
-        gdaltest.post_reason('failure')
         return 'fail'
 
     return 'success'
@@ -820,7 +807,6 @@ def test_ogr_geom_segmentize():
     g2.Segmentize(0.25)
     for i in range(g1.GetPointCount()):
         if g1.GetPoint(i) != g2.GetPoint(g1.GetPointCount() - 1 - i):
-            gdaltest.post_reason('fail')
             print(i)
             print('%.18g' % (g1.GetPoint(i)[0] - g2.GetPoint(g1.GetPointCount() - 1 - i)[0]))
             print('%.18g' % (g1.GetPoint(i)[1] - g2.GetPoint(g1.GetPointCount() - 1 - i)[1]))
@@ -841,35 +827,30 @@ def test_ogr_geom_value():
     p = geom.Value(-1e-3)
     expected_p = ogr.CreateGeometryFromWkt('POINT (2 3)')
     if ogrtest.check_feature_geometry(p, expected_p) != 0:
-        gdaltest.post_reason('fail')
         print(p)
         return 'fail'
 
     p = geom.Value(geom.Length() / 4)
     expected_p = ogr.CreateGeometryFromWkt('POINT (3.5 3)')
     if ogrtest.check_feature_geometry(p, expected_p) != 0:
-        gdaltest.post_reason('fail')
         print(p)
         return 'fail'
 
     p = geom.Value(geom.Length() / 2)
     expected_p = ogr.CreateGeometryFromWkt('POINT (5 3)')
     if ogrtest.check_feature_geometry(p, expected_p) != 0:
-        gdaltest.post_reason('fail')
         print(p)
         return 'fail'
 
     p = geom.Value(3 * geom.Length() / 4)
     expected_p = ogr.CreateGeometryFromWkt('POINT (5 1.5)')
     if ogrtest.check_feature_geometry(p, expected_p) != 0:
-        gdaltest.post_reason('fail')
         print(p)
         return 'fail'
 
     p = geom.Value(geom.Length() + 1e-3)
     expected_p = ogr.CreateGeometryFromWkt('POINT (5 0)')
     if ogrtest.check_feature_geometry(p, expected_p) != 0:
-        gdaltest.post_reason('fail')
         print(p)
         return 'fail'
 
@@ -885,23 +866,19 @@ def test_ogr_geom_flattenTo2D():
 
     # Point is 0 dimension, LineString 1, ...
     if geom.GetDimension() != 0:
-        gdaltest.post_reason('fail')
         print(geom.GetDimension())
         return 'fail'
 
     if geom.GetCoordinateDimension() != 3:
-        gdaltest.post_reason('fail')
         print(geom.GetCoordinateDimension())
         return 'fail'
 
     geom.FlattenTo2D()
     if geom.GetCoordinateDimension() != 2:
-        gdaltest.post_reason('fail')
         print(geom.GetCoordinateDimension())
         return 'fail'
 
     if geom.ExportToWkt() != 'POINT (1 2)':
-        gdaltest.post_reason('fail')
         print(geom.ExportToWkt())
         return 'fail'
 
@@ -917,23 +894,19 @@ def test_ogr_geom_flattenTo2D_triangle():
 
     # Point is 0 dimension, LineString 1, ...
     if geom.GetDimension() != 2:
-        gdaltest.post_reason('fail')
         print(geom.GetDimension())
         return 'fail'
 
     if geom.GetCoordinateDimension() != 3:
-        gdaltest.post_reason('fail')
         print(geom.GetCoordinateDimension())
         return 'fail'
 
     geom.FlattenTo2D()
     if geom.GetCoordinateDimension() != 2:
-        gdaltest.post_reason('fail')
         print(geom.GetCoordinateDimension())
         return 'fail'
 
     if geom.ExportToWkt() != 'TRIANGLE ((0 0,100 0,0 100,0 0))':
-        gdaltest.post_reason('fail')
         print(geom.ExportToWkt())
         return 'fail'
 
@@ -1316,14 +1289,12 @@ def test_ogr_geom_z_empty():
         g1 = ogr.CreateGeometryFromWkt(in_wkt)
         out_wkt = g1.ExportToIsoWkt()
         if in_wkt != out_wkt:
-            gdaltest.post_reason('fail')
             print(out_wkt)
             return 'fail'
 
         g2 = ogr.CreateGeometryFromWkb(g1.ExportToIsoWkb())
         out_wkt = g2.ExportToIsoWkt()
         if in_wkt != out_wkt:
-            gdaltest.post_reason('fail')
             print(out_wkt)
             return 'fail'
 
@@ -1350,29 +1321,23 @@ def test_ogr_geom_getlineargeometry():
         g = ogr.CreateGeometryFromWkt(in_wkt)
         g2 = g.GetLinearGeometry()
         if geom_in != geom_out and not g.HasCurveGeometry():
-            gdaltest.post_reason('fail')
             print(g)
             return 'fail'
         if g2.ExportToWkt() != geom_out + ' EMPTY':
-            gdaltest.post_reason('fail')
             print(g)
             print(g2)
             return 'fail'
 
     g = ogr.CreateGeometryFromWkt('GEOMETRYCOLLECTION(POINT (0 1))')
     if g.HasCurveGeometry():
-        gdaltest.post_reason('fail')
         return 'fail'
     if g.HasCurveGeometry(True):
-        gdaltest.post_reason('fail')
         return 'fail'
 
     g = ogr.CreateGeometryFromWkt('GEOMETRYCOLLECTION(CIRCULARSTRING (0 0,0 1,0 0))')
     if not g.HasCurveGeometry():
-        gdaltest.post_reason('fail')
         return 'fail'
     if not g.HasCurveGeometry(True):
-        gdaltest.post_reason('fail')
         return 'fail'
 
     return 'success'
@@ -1399,19 +1364,16 @@ def test_ogr_geom_getdimension():
                         ('TIN EMPTY', 2)]:
         g = ogr.CreateGeometryFromWkt(geom)
         if g.GetDimension() != dim:
-            gdaltest.post_reason('fail')
             print(g)
             print(dim)
             return 'fail'
 
     g = ogr.CreateGeometryFromWkt('GEOMETRYCOLLECTION(LINESTRING EMPTY, POINT (0 1))')
     if g.GetDimension() != 1:
-        gdaltest.post_reason('fail')
         return 'fail'
 
     g = ogr.CreateGeometryFromWkt('GEOMETRYCOLLECTION(POINT (0 1), LINESTRING EMPTY, POLYGON EMPTY)')
     if g.GetDimension() != 2:
-        gdaltest.post_reason('fail')
         return 'fail'
 
     return 'success'
@@ -1439,13 +1401,11 @@ def test_ogr_geom_triangle():
 
     polygon_wkt = ogr.ForceTo(geom.Clone(), ogr.wkbPolygon).ExportToWkt()
     if polygon_wkt != 'POLYGON ((0 0,0 1,1 1,0 0))':
-        gdaltest.post_reason("fail")
         print(polygon_wkt)
         return 'fail'
 
     polygon_wkt = ogr.ForceTo(geom.Clone(), ogr.wkbMultiPolygon).ExportToWkt()
     if polygon_wkt != 'MULTIPOLYGON (((0 0,0 1,1 1,0 0)))':
-        gdaltest.post_reason("fail")
         print(polygon_wkt)
         return 'fail'
 
@@ -1461,14 +1421,12 @@ def test_ogr_geom_triangle_invalid_wkt():
     with gdaltest.error_handler():
         geom = ogr.CreateGeometryFromWkt(geom_wkt)
     if geom is not None:
-        gdaltest.post_reason('fail')
         return 'fail'
 
     geom_wkt = 'TRIANGLE ((0 0))'
     with gdaltest.error_handler():
         geom = ogr.CreateGeometryFromWkt(geom_wkt)
     if geom is not None:
-        gdaltest.post_reason('fail')
         print(geom)
         return 'fail'
 
@@ -1476,7 +1434,6 @@ def test_ogr_geom_triangle_invalid_wkt():
     with gdaltest.error_handler():
         geom = ogr.CreateGeometryFromWkt(geom_wkt)
     if geom is not None:
-        gdaltest.post_reason('fail')
         print(geom)
         return 'fail'
 
@@ -1484,7 +1441,6 @@ def test_ogr_geom_triangle_invalid_wkt():
     with gdaltest.error_handler():
         geom = ogr.CreateGeometryFromWkt(geom_wkt)
     if geom is not None:
-        gdaltest.post_reason('fail')
         print(geom)
         return 'fail'
 
@@ -1492,7 +1448,6 @@ def test_ogr_geom_triangle_invalid_wkt():
     with gdaltest.error_handler():
         geom = ogr.CreateGeometryFromWkt(geom_wkt)
     if geom is not None:
-        gdaltest.post_reason('fail')
         print(geom)
         return 'fail'
 
@@ -1510,7 +1465,6 @@ def test_ogr_geom_triangle_sfcgal():
     g1 = ogr.CreateGeometryFromWkt('TRIANGLE ((0 0,100 0 100,0 100 100,0 0))')
     g2 = ogr.CreateGeometryFromWkt('TRIANGLE ((-1 -1,100 0 100,0 100 100,-1 -1))')
     if not g2.Intersects(g1):
-        gdaltest.post_reason('fail')
         return 'fail'
 
     g1 = ogr.CreateGeometryFromWkt('TRIANGLE ((0 0,1 0,0 1,0 0))')
@@ -1518,7 +1472,6 @@ def test_ogr_geom_triangle_sfcgal():
     g3 = g1.Intersection(g2)
     g4 = ogr.CreateGeometryFromWkt('TRIANGLE ((0.5 0.5 0,0 0 0,1 0 0,0.5 0.5 0))')
     if not g4.Equals(g3):
-        gdaltest.post_reason('fail')
         return 'fail'
 
     return 'success'
@@ -1534,17 +1487,14 @@ def test_ogr_geom_circularstring():
     # Test export/import Wkt
     g1 = ogr.CreateGeometryFromWkt(in_wkt)
     if g1.GetGeometryType() != ogr.wkbCircularString:
-        gdaltest.post_reason('fail')
         return 'fail'
     out_wkt = g1.ExportToWkt()
     if in_wkt != out_wkt:
-        gdaltest.post_reason('fail')
         print(out_wkt)
         return 'fail'
 
     if ogrtest.have_geos():
         if not g1.IsValid():
-            gdaltest.post_reason('fail')
             return 'fail'
 
     # Test GetEnvelope()
@@ -1552,7 +1502,6 @@ def test_ogr_geom_circularstring():
     expected_env = (0.0, 2.0, -1.0, 1.0)
     for i in range(4):
         if abs(env[i] - expected_env[i]) > 1e-8:
-            gdaltest.post_reason('fail')
             print(env)
             return 'fail'
 
@@ -1560,7 +1509,6 @@ def test_ogr_geom_circularstring():
     length = g1.Length()
     expected_length = 1.5 * math.pi
     if abs(length - expected_length) > 1e-8:
-        gdaltest.post_reason('fail')
         print(length)
         return 'fail'
 
@@ -1568,55 +1516,47 @@ def test_ogr_geom_circularstring():
     p = g1.Value(-1)
     expected_p = ogr.CreateGeometryFromWkt('POINT (0 0)')
     if ogrtest.check_feature_geometry(p, expected_p) != 0:
-        gdaltest.post_reason('fail')
         print(p)
         return 'fail'
 
     p = g1.Value(0)
     expected_p = ogr.CreateGeometryFromWkt('POINT (0 0)')
     if ogrtest.check_feature_geometry(p, expected_p) != 0:
-        gdaltest.post_reason('fail')
         print(p)
         return 'fail'
 
     p = g1.Value(length / 6.0)
     expected_p = ogr.CreateGeometryFromWkt('POINT (0.292893218813453 0.707106781186548)')
     if ogrtest.check_feature_geometry(p, expected_p) != 0:
-        gdaltest.post_reason('fail')
         print(p)
 
     p = g1.Value(length / 3.0)
     expected_p = ogr.CreateGeometryFromWkt('POINT (1 1)')
     if ogrtest.check_feature_geometry(p, expected_p) != 0:
-        gdaltest.post_reason('fail')
         print(p)
         return 'fail'
 
     p = g1.Value(length / 2.0)
     expected_p = ogr.CreateGeometryFromWkt('POINT (1.707106781186547 0.707106781186547)')
     if ogrtest.check_feature_geometry(p, expected_p) != 0:
-        gdaltest.post_reason('fail')
         print(p)
         return 'fail'
 
     p = g1.Value(2 * length / 3.0)
     expected_p = ogr.CreateGeometryFromWkt('POINT (2 0)')
     if ogrtest.check_feature_geometry(p, expected_p) != 0:
-        gdaltest.post_reason('fail')
         print(p)
         return 'fail'
 
     p = g1.Value(length)
     expected_p = ogr.CreateGeometryFromWkt('POINT (1 -1)')
     if ogrtest.check_feature_geometry(p, expected_p) != 0:
-        gdaltest.post_reason('fail')
         print(p)
         return 'fail'
 
     p = g1.Value(length + 1)
     expected_p = ogr.CreateGeometryFromWkt('POINT (1 -1)')
     if ogrtest.check_feature_geometry(p, expected_p) != 0:
-        gdaltest.post_reason('fail')
         print(p)
         return 'fail'
 
@@ -1624,7 +1564,6 @@ def test_ogr_geom_circularstring():
     g2 = ogr.CreateGeometryFromWkb(g1.ExportToWkb())
     out_wkt = g2.ExportToWkt()
     if in_wkt != out_wkt:
-        gdaltest.post_reason('fail')
         print(out_wkt)
         return 'fail'
 
@@ -1632,23 +1571,19 @@ def test_ogr_geom_circularstring():
     in_wkt = 'CIRCULARSTRING Z (0 0 10,1 1 20,2 0 30)'
     g1 = ogr.CreateGeometryFromWkt(in_wkt)
     if g1.GetGeometryType() != ogr.wkbCircularStringZ:
-        gdaltest.post_reason('fail')
         return 'fail'
     out_wkt = g1.ExportToWkt()
     if in_wkt != out_wkt:
-        gdaltest.post_reason('fail')
         print(out_wkt)
         return 'fail'
 
     wkb = g1.ExportToWkb()
     isowkb = g1.ExportToIsoWkb()
     if wkb != isowkb:
-        gdaltest.post_reason('fail')
         return 'fail'
     g2 = ogr.CreateGeometryFromWkb(wkb)
     out_wkt = g2.ExportToWkt()
     if in_wkt != out_wkt:
-        gdaltest.post_reason('fail')
         print(out_wkt)
         return 'fail'
 
@@ -1662,7 +1597,6 @@ def test_ogr_geom_circularstring():
 
     expected_g = ogr.CreateGeometryFromWkt('LINESTRING (0 0,0.218168517531969 0.623489801858729,0.777479066043687 0.974927912181831,1.433883739117561 0.900968867902435,1.900968867902463 0.433883739117562,1.974927912181821 -0.222520933956316,1.623489801858719 -0.78183148246804,1 -1)')
     if ogrtest.check_feature_geometry(g1, expected_g) != 0:
-        gdaltest.post_reason('fail')
         print(g1)
         return 'fail'
 
@@ -1677,22 +1611,18 @@ def test_ogr_geom_circularstring():
     gdal.SetConfigOption('OGR_ARC_STEPSIZE', None)
 
     if ogrtest.check_feature_geometry(g2, expected_g) != 0:
-        gdaltest.post_reason('fail')
         print(g2)
         return 'fail'
 
     # Test HasCurveGeometry
     if not g1.HasCurveGeometry():
-        gdaltest.post_reason('fail')
         return 'fail'
     if not g1.HasCurveGeometry(True):
-        gdaltest.post_reason('fail')
         return 'fail'
 
     # Test GetLinearGeometry
     g2 = g1.GetLinearGeometry(45)
     if ogrtest.check_feature_geometry(g2, expected_g) != 0:
-        gdaltest.post_reason('fail')
         print(g2)
         return 'fail'
 
@@ -1701,7 +1631,6 @@ def test_ogr_geom_circularstring():
     g2 = ogr.ForceToLineString(g1)
     gdal.SetConfigOption('OGR_ARC_STEPSIZE', None)
     if ogrtest.check_feature_geometry(g2, expected_g) != 0:
-        gdaltest.post_reason('fail')
         print(g2)
         return 'fail'
 
@@ -1711,7 +1640,6 @@ def test_ogr_geom_circularstring():
     g2 = ogr.ForceToMultiLineString(g1)
     gdal.SetConfigOption('OGR_ARC_STEPSIZE', None)
     if ogrtest.check_feature_geometry(g2, expected_g2) != 0:
-        gdaltest.post_reason('fail')
         print(g2)
         return 'fail'
 
@@ -1719,7 +1647,6 @@ def test_ogr_geom_circularstring():
     if ogrtest.have_geos():
         g2 = g1.Intersection(g1)
         if g2 is None:
-            gdaltest.post_reason('fail')
             return 'fail'
 
     # Test CIRCULARSTRING wrapped in a GEOMETRYCOLLECTION
@@ -1730,7 +1657,6 @@ def test_ogr_geom_circularstring():
     if ogrtest.have_geos():
         g2 = g1.Intersection(g1)
         if g2 is None:
-            gdaltest.post_reason('fail')
             return 'fail'
 
     # Test ForceToLineString
@@ -1738,7 +1664,6 @@ def test_ogr_geom_circularstring():
     g2 = ogr.ForceToLineString(g1)
     gdal.SetConfigOption('OGR_ARC_STEPSIZE', None)
     if ogrtest.check_feature_geometry(g2, expected_g) != 0:
-        gdaltest.post_reason('fail')
         print(g2)
         return 'fail'
 
@@ -1747,7 +1672,6 @@ def test_ogr_geom_circularstring():
     g2 = ogr.ForceToMultiLineString(g1)
     gdal.SetConfigOption('OGR_ARC_STEPSIZE', None)
     if ogrtest.check_feature_geometry(g2, expected_g2) != 0:
-        gdaltest.post_reason('fail')
         print(g2)
         return 'fail'
 
@@ -1761,14 +1685,12 @@ def test_ogr_geom_circularstring():
     expected_g = ogr.CreateGeometryFromWkt('LINESTRING (0 0,0.116977778440514 -0.321393804843282,0.413175911166547 -0.49240387650611,0.75 -0.433012701892224,0.969846310392967 -0.171010071662835,0.969846310392967 0.171010071662835,0.75 0.433012701892224,0.413175911166547 0.49240387650611,0.116977778440514 0.321393804843282,0 0)')
     g2 = g1.GetLinearGeometry(45)
     if ogrtest.check_feature_geometry(g2, expected_g) != 0:
-        gdaltest.post_reason('fail')
         print(g2)
         return 'fail'
 
     length = g1.Length()
     expected_length = 2 * math.pi * 0.5
     if abs(length - expected_length) > 1e-8:
-        gdaltest.post_reason('fail')
         print(length)
         return 'fail'
 
@@ -1778,14 +1700,12 @@ def test_ogr_geom_circularstring():
     expected_g = ogr.CreateGeometryFromWkt('LINESTRING (0 0,0.049515566048791 0.216941869558781,0.188255099070638 0.390915741234018,0.388739533021848 0.48746395609092,0.611260466978166 0.48746395609092,0.811744900929369 0.390915741234018,0.950484433951232 0.216941869558781,1 0,0.950484433951232 -0.216941869558781,0.811744900929369 -0.390915741234018,0.611260466978166 -0.48746395609092,0.388739533021848 -0.48746395609092,0.188255099070638 -0.390915741234018,0.049515566048791 -0.216941869558781,0 0)')
     g2 = g1.GetLinearGeometry(45)
     if ogrtest.check_feature_geometry(g2, expected_g) != 0:
-        gdaltest.post_reason('fail')
         print(g2)
         return 'fail'
 
     length = g1.Length()
     expected_length = 2 * math.pi * 0.5
     if abs(length - expected_length) > 1e-8:
-        gdaltest.post_reason('fail')
         print(length)
         return 'fail'
 
@@ -1793,7 +1713,6 @@ def test_ogr_geom_circularstring():
     g1.Segmentize(0.5)
     expected_g = ogr.CreateGeometryFromWkt('CIRCULARSTRING (0 0,0.146446609406726 0.353553390593274,0.5 0.5,0.853553390593274 0.353553390593274,1 0,0.853553390593274 -0.353553390593274,0.5 -0.5,0.146446609406726 -0.353553390593274,0 0)')
     if ogrtest.check_feature_geometry(g1, expected_g) != 0:
-        gdaltest.post_reason('fail')
         print(g1)
         return 'fail'
 
@@ -1801,7 +1720,6 @@ def test_ogr_geom_circularstring():
     length = g1.Length()
     expected_length = 2 * math.pi * 0.5
     if abs(length - expected_length) > 1e-8:
-        gdaltest.post_reason('fail')
         print(length)
         return 'fail'
 
@@ -1814,7 +1732,6 @@ def test_ogr_geom_circularstring():
     g2.Segmentize(0.25)
     for i in range(g1.GetPointCount()):
         if g1.GetPoint(i) != g2.GetPoint(g1.GetPointCount() - 1 - i):
-            gdaltest.post_reason('fail')
             print(i)
             print('%.18g' % (g1.GetPoint(i)[0] - g2.GetPoint(g1.GetPointCount() - 1 - i)[0]))
             print('%.18g' % (g1.GetPoint(i)[1] - g2.GetPoint(g1.GetPointCount() - 1 - i)[1]))
@@ -1828,7 +1745,6 @@ def test_ogr_geom_circularstring():
     expected_g = ogr.CreateGeometryFromWkt('LINESTRING (0 0 1,0.116977778440514 -0.321393804843282 1,0.413175911166547 -0.49240387650611 1,0.75 -0.433012701892224 1,0.969846310392967 -0.171010071662835 1,0.969846310392967 0.171010071662835 1,0.75 0.433012701892224 1,0.413175911166547 0.49240387650611 1,0.116977778440514 0.321393804843282 1,0 0 1)')
     g2 = g1.GetLinearGeometry(45)
     if ogrtest.check_feature_geometry(g2, expected_g) != 0:
-        gdaltest.post_reason('fail')
         print(g2)
         return 'fail'
 
@@ -1836,7 +1752,6 @@ def test_ogr_geom_circularstring():
     g1.Segmentize(0.5)
     expected_g = ogr.CreateGeometryFromWkt('CIRCULARSTRING Z (0 0 1,0.146446609406726 -0.353553390593274 1.25,0.5 -0.5 1.5,0.853553390593274 -0.353553390593274 1.75,1 0 2,0.853553390593274 0.353553390593274 1.75,0.5 0.5 1.5,0.146446609406727 0.353553390593274 1.25,0 0 1)')
     if ogrtest.check_feature_geometry(g1, expected_g) != 0:
-        gdaltest.post_reason('fail')
         print(g1)
         return 'fail'
 
@@ -1846,14 +1761,12 @@ def test_ogr_geom_circularstring():
     expected_g = ogr.CreateGeometryFromWkt('LINESTRING (0 0,0.049515566048791 -0.216941869558781,0.188255099070638 -0.390915741234018,0.388739533021848 -0.48746395609092,0.611260466978166 -0.48746395609092,0.811744900929369 -0.390915741234018,0.950484433951232 -0.216941869558781,1 0,0.950484433951232 0.216941869558781,0.811744900929369 0.390915741234018,0.611260466978166 0.48746395609092,0.388739533021848 0.48746395609092,0.188255099070638 0.390915741234018,0.049515566048791 0.216941869558781,0 0)')
     g2 = g1.GetLinearGeometry(45)
     if ogrtest.check_feature_geometry(g2, expected_g) != 0:
-        gdaltest.post_reason('fail')
         print(g2)
         return 'fail'
 
     length = g1.Length()
     expected_length = 2 * math.pi * 0.5
     if abs(length - expected_length) > 1e-8:
-        gdaltest.post_reason('fail')
         print(length)
         return 'fail'
 
@@ -1863,14 +1776,12 @@ def test_ogr_geom_circularstring():
     expected_g = ogr.CreateGeometryFromWkt('LINESTRING (0 0,1 1,2 2)')
     g2 = g1.GetLinearGeometry(45)
     if ogrtest.check_feature_geometry(g2, expected_g) != 0:
-        gdaltest.post_reason('fail')
         print(g2)
         return 'fail'
 
     length = g1.Length()
     expected_length = 2 * math.sqrt(2)
     if abs(length - expected_length) > 1e-8:
-        gdaltest.post_reason('fail')
         print(length)
         return 'fail'
 
@@ -1878,13 +1789,11 @@ def test_ogr_geom_circularstring():
     p = g1.Value(length / 4.0)
     expected_p = ogr.CreateGeometryFromWkt('POINT (0.5 0.5)')
     if ogrtest.check_feature_geometry(p, expected_p) != 0:
-        gdaltest.post_reason('fail')
         print(p)
         return 'fail'
     p = g1.Value(3.0 * length / 4.0)
     expected_p = ogr.CreateGeometryFromWkt('POINT (1.5 1.5)')
     if ogrtest.check_feature_geometry(p, expected_p) != 0:
-        gdaltest.post_reason('fail')
         print(p)
         return 'fail'
 
@@ -1892,7 +1801,6 @@ def test_ogr_geom_circularstring():
     g1.Segmentize(0.5)
     expected_g = ogr.CreateGeometryFromWkt('CIRCULARSTRING (0 0,0.166666666666667 0.166666666666667,0.333333333333333 0.333333333333333,0.5 0.5,0.666666666666667 0.666666666666667,0.833333333333333 0.833333333333333,1 1,1.166666666666667 1.166666666666667,1.333333333333333 1.333333333333333,1.5 1.5,1.666666666666667 1.666666666666667,1.833333333333333 1.833333333333333,2 2)')
     if ogrtest.check_feature_geometry(g1, expected_g) != 0:
-        gdaltest.post_reason('fail')
         print(g1)
         return 'fail'
 
@@ -1900,7 +1808,6 @@ def test_ogr_geom_circularstring():
     length = g1.Length()
     expected_length = 2 * math.sqrt(2)
     if abs(length - expected_length) > 1e-8:
-        gdaltest.post_reason('fail')
         print(length)
         return 'fail'
 
@@ -1910,7 +1817,6 @@ def test_ogr_geom_circularstring():
     expected_g = ogr.CreateGeometryFromWkt('LINESTRING (0 0 1,1 1 2,2 2 1)')
     g2 = g1.GetLinearGeometry(45)
     if ogrtest.check_feature_geometry(g2, expected_g) != 0:
-        gdaltest.post_reason('fail')
         print(g2)
         return 'fail'
 
@@ -1918,7 +1824,6 @@ def test_ogr_geom_circularstring():
     g1.Segmentize(0.5)
     expected_g = ogr.CreateGeometryFromWkt('CIRCULARSTRING Z (0 0 1,0.166666666666667 0.166666666666667 1.166666666666667,0.333333333333333 0.333333333333333 1.333333333333333,0.5 0.5 1.5,0.666666666666667 0.666666666666667 1.666666666666667,0.833333333333333 0.833333333333333 1.833333333333333,1 1 2,1.166666666666667 1.166666666666667 1.833333333333333,1.333333333333333 1.333333333333333 1.666666666666667,1.5 1.5 1.5,1.666666666666667 1.666666666666667 1.333333333333333,1.833333333333333 1.833333333333333 1.166666666666667,2 2 1)')
     if ogrtest.check_feature_geometry(g1, expected_g) != 0:
-        gdaltest.post_reason('fail')
         print(g1)
         return 'fail'
 
@@ -1926,13 +1831,11 @@ def test_ogr_geom_circularstring():
     p = g1.Value(length / 4.0)
     expected_p = ogr.CreateGeometryFromWkt('POINT (0.5 0.5 1.5)')
     if ogrtest.check_feature_geometry(p, expected_p) != 0:
-        gdaltest.post_reason('fail')
         print(p)
         return 'fail'
     p = g1.Value(3.0 * length / 4.0)
     expected_p = ogr.CreateGeometryFromWkt('POINT (1.5 1.5 1.5)')
     if ogrtest.check_feature_geometry(p, expected_p) != 0:
-        gdaltest.post_reason('fail')
         print(p)
         return 'fail'
     in_wkt = 'CIRCULARSTRING (0 0,1 1,1 -1)'
@@ -1955,7 +1858,6 @@ def test_ogr_geom_circularstring():
     expected_env = (cx + r * math.cos(a0), cx + r * math.cos(a2), cy + r * math.sin(a2), cy + r * math.sin(a0))
     for i in range(4):
         if abs(env[i] - expected_env[i]) > 1e-8:
-            gdaltest.post_reason('fail')
             print(env)
             return 'fail'
 
@@ -1972,7 +1874,6 @@ def test_ogr_geom_circularstring():
     expected_env = (cx + r * math.cos(a0), cx + r, cy + r * math.sin(a2), cy + r * math.sin(a0))
     for i in range(4):
         if abs(env[i] - expected_env[i]) > 1e-8:
-            gdaltest.post_reason('fail')
             print(env)
             return 'fail'
 
@@ -1989,7 +1890,6 @@ def test_ogr_geom_circularstring():
     expected_env = (cx - r, cx + r * math.cos(a2), cy - r, cy + r)
     for i in range(4):
         if abs(env[i] - expected_env[i]) > 1e-8:
-            gdaltest.post_reason('fail')
             print(env)
             return 'fail'
 
@@ -2006,7 +1906,6 @@ def test_ogr_geom_circularstring():
     expected_env = (cx - r, cx + r, cy - r, cy + r)
     for i in range(4):
         if abs(env[i] - expected_env[i]) > 1e-8:
-            gdaltest.post_reason('fail')
             print(env)
             return 'fail'
 
@@ -2023,7 +1922,6 @@ def test_ogr_geom_circularstring():
     expected_env = (cx - r, cx + r, cy - r, cy + r)
     for i in range(4):
         if abs(env[i] - expected_env[i]) > 1e-8:
-            gdaltest.post_reason('fail')
             print(env)
             return 'fail'
 
@@ -2033,7 +1931,6 @@ def test_ogr_geom_circularstring():
     g = ogr.CreateGeometryFromWkt(in_wkt)
     gdal.PopErrorHandler()
     if g is not None:
-        gdaltest.post_reason('fail')
         return 'fail'
 
     # EMPTY
@@ -2041,19 +1938,16 @@ def test_ogr_geom_circularstring():
         g1 = ogr.CreateGeometryFromWkt(in_wkt)
         out_wkt = g1.ExportToWkt()
         if in_wkt != out_wkt:
-            gdaltest.post_reason('fail')
             print(in_wkt)
             print(out_wkt)
             return 'fail'
         if g1.Length() != 0.0:
-            gdaltest.post_reason('fail')
             print(in_wkt)
             return 'fail'
 
         g2 = ogr.CreateGeometryFromWkb(g1.ExportToWkb())
         out_wkt = g2.ExportToWkt()
         if in_wkt != out_wkt:
-            gdaltest.post_reason('fail')
             print(in_wkt)
             print(out_wkt)
             return 'fail'
@@ -2069,70 +1963,57 @@ def test_ogr_geom_compoundcurve():
     in_wkt = 'COMPOUNDCURVE (CIRCULARSTRING (0 0,1 1,1 -1))'
     g1 = ogr.CreateGeometryFromWkt(in_wkt)
     if g1.GetGeometryType() != ogr.wkbCompoundCurve:
-        gdaltest.post_reason('fail')
         return 'fail'
     out_wkt = g1.ExportToWkt()
     if in_wkt != out_wkt:
-        gdaltest.post_reason('fail')
         print(out_wkt)
         return 'fail'
 
     if g1.GetGeometryCount() != 1:
-        gdaltest.post_reason('fail')
         return 'fail'
     if g1.GetGeometryRef(0).ExportToWkt() != 'CIRCULARSTRING (0 0,1 1,1 -1)':
-        gdaltest.post_reason('fail')
         return 'fail'
 
     env = g1.GetEnvelope()
     expected_env = (0.0, 2.0, -1.0, 1.0)
     for i in range(4):
         if abs(env[i] - expected_env[i]) > 1e-8:
-            gdaltest.post_reason('fail')
             print(env)
             return 'fail'
 
     length = g1.Length()
     expected_length = 1.5 * math.pi
     if abs(length - expected_length) > 1e-8:
-        gdaltest.post_reason('fail')
         print(length)
         return 'fail'
 
     g2 = ogr.CreateGeometryFromWkb(g1.ExportToWkb())
     out_wkt = g2.ExportToWkt()
     if in_wkt != out_wkt:
-        gdaltest.post_reason('fail')
         print(out_wkt)
         return 'fail'
 
     g1 = ogr.CreateGeometryFromWkt(in_wkt)
     if not g1.HasCurveGeometry():
-        gdaltest.post_reason('fail')
         return 'fail'
     if not g1.HasCurveGeometry(True):
-        gdaltest.post_reason('fail')
         return 'fail'
 
     # CreateGeometryFromWkt of LINESTRING
     in_wkt = 'COMPOUNDCURVE ((0 0,0 10))'
     g1 = ogr.CreateGeometryFromWkt(in_wkt)
     if not g1.HasCurveGeometry():
-        gdaltest.post_reason('fail')
         return 'fail'
     if g1.HasCurveGeometry(True):
-        gdaltest.post_reason('fail')
         return 'fail'
 
     # With Z
     in_wkt = 'COMPOUNDCURVE Z (CIRCULARSTRING Z (0 0 10,1 1 20,2 0 30),(2 0 30,0 0 10))'
     g1 = ogr.CreateGeometryFromWkt(in_wkt)
     if g1.GetGeometryType() != ogr.wkbCompoundCurveZ:
-        gdaltest.post_reason('fail')
         return 'fail'
     out_wkt = g1.ExportToWkt()
     if in_wkt != out_wkt:
-        gdaltest.post_reason('fail')
         print(out_wkt)
         return 'fail'
 
@@ -2140,7 +2021,6 @@ def test_ogr_geom_compoundcurve():
     expected_env = (0.0, 2.0, 0.0, 1.0)
     for i in range(4):
         if abs(env[i] - expected_env[i]) > 1e-8:
-            gdaltest.post_reason('fail')
             print(env)
             return 'fail'
 
@@ -2148,7 +2028,6 @@ def test_ogr_geom_compoundcurve():
     expected_env = (0.0, 2.0, 0.0, 1.0, 10, 30)
     for i in range(6):
         if abs(env[i] - expected_env[i]) > 1e-8:
-            gdaltest.post_reason('fail')
             print(env)
             return 'fail'
 
@@ -2156,47 +2035,40 @@ def test_ogr_geom_compoundcurve():
     p = g1.Value(-1e-3)
     expected_p = ogr.CreateGeometryFromWkt('POINT (0 0 10)')
     if ogrtest.check_feature_geometry(p, expected_p) != 0:
-        gdaltest.post_reason('fail')
         print(p)
         return 'fail'
 
     p = g1.Value(math.pi / 2.0)
     expected_p = ogr.CreateGeometryFromWkt('POINT (1 1 20)')
     if ogrtest.check_feature_geometry(p, expected_p) != 0:
-        gdaltest.post_reason('fail')
         print(p)
         return 'fail'
 
     p = g1.Value(math.pi)
     expected_p = ogr.CreateGeometryFromWkt('POINT (2 0 30)')
     if ogrtest.check_feature_geometry(p, expected_p) != 0:
-        gdaltest.post_reason('fail')
         print(p)
         return 'fail'
 
     p = g1.Value(math.pi + 1)
     expected_p = ogr.CreateGeometryFromWkt('POINT (1 0 20)')
     if ogrtest.check_feature_geometry(p, expected_p) != 0:
-        gdaltest.post_reason('fail')
         print(p)
         return 'fail'
 
     p = g1.Value(math.pi + 2 + 1e-3)
     expected_p = ogr.CreateGeometryFromWkt('POINT (0 0 10)')
     if ogrtest.check_feature_geometry(p, expected_p) != 0:
-        gdaltest.post_reason('fail')
         print(p)
         return 'fail'
 
     wkb = g1.ExportToWkb()
     isowkb = g1.ExportToIsoWkb()
     if wkb != isowkb:
-        gdaltest.post_reason('fail')
         return 'fail'
     g2 = ogr.CreateGeometryFromWkb(wkb)
     out_wkt = g2.ExportToWkt()
     if in_wkt != out_wkt:
-        gdaltest.post_reason('fail')
         print(out_wkt)
         return 'fail'
 
@@ -2204,45 +2076,36 @@ def test_ogr_geom_compoundcurve():
     in_wkt = 'COMPOUNDCURVE (CIRCULARSTRING (0 0,1 1,1 -1),(1 -1,0 0))'
     g1 = ogr.CreateGeometryFromWkt(in_wkt)
     if g1.GetGeometryType() != ogr.wkbCompoundCurve:
-        gdaltest.post_reason('fail')
         return 'fail'
     out_wkt = g1.ExportToWkt()
     if in_wkt != out_wkt:
-        gdaltest.post_reason('fail')
         print(out_wkt)
         return 'fail'
 
     if not g1.Equals(g1):
-        gdaltest.post_reason('fail')
         return 'fail'
 
     if not g1.Equals(g1.Clone()):
-        gdaltest.post_reason('fail')
         return 'fail'
 
     if g1.Equals(ogr.CreateGeometryFromWkt('POINT(0 0)')):
-        gdaltest.post_reason('fail')
         return 'fail'
 
     if g1.Equals(ogr.CreateGeometryFromWkt('COMPOUNDCURVE (CIRCULARSTRING (0 0,1 1,1 -1))')):
-        gdaltest.post_reason('fail')
         return 'fail'
 
     if g1.Equals(ogr.CreateGeometryFromWkt('COMPOUNDCURVE (CIRCULARSTRING (0 0,1 1,1 -1),(1 -1,0 1))')):
-        gdaltest.post_reason('fail')
         return 'fail'
 
     length = g1.Length()
     expected_length = 1.5 * math.pi + math.sqrt(2)
     if abs(length - expected_length) > 1e-8:
-        gdaltest.post_reason('fail')
         print(length)
         return 'fail'
 
     g2 = ogr.CreateGeometryFromWkb(g1.ExportToWkb())
     out_wkt = g2.ExportToWkt()
     if in_wkt != out_wkt:
-        gdaltest.post_reason('fail')
         print(out_wkt)
         return 'fail'
 
@@ -2256,7 +2119,6 @@ def test_ogr_geom_compoundcurve():
 
     expected_g = ogr.CreateGeometryFromWkt('LINESTRING (0 0,0.218168517531969 0.623489801858729,0.777479066043687 0.974927912181831,1.433883739117561 0.900968867902435,1.900968867902463 0.433883739117562,1.974927912181821 -0.222520933956316,1.623489801858719 -0.78183148246804,1 -1)')
     if ogrtest.check_feature_geometry(g1, expected_g) != 0:
-        gdaltest.post_reason('fail')
         print(g1)
         return 'fail'
 
@@ -2272,27 +2134,22 @@ def test_ogr_geom_compoundcurve():
 
     expected_g = ogr.CreateGeometryFromWkt('LINESTRING (0 0,0.218168517531969 0.623489801858729,0.777479066043687 0.974927912181831,1.433883739117561 0.900968867902435,1.900968867902463 0.433883739117562,1.974927912181821 -0.222520933956316,1.623489801858719 -0.78183148246804,1 -1)')
     if ogrtest.check_feature_geometry(g2, expected_g) != 0:
-        gdaltest.post_reason('fail')
         print(g2)
         return 'fail'
 
     g2 = g1.GetLinearGeometry(45)
     if ogrtest.check_feature_geometry(g2, expected_g) != 0:
-        gdaltest.post_reason('fail')
         print(g2)
         return 'fail'
 
     if not g1.HasCurveGeometry():
-        gdaltest.post_reason('fail')
         return 'fail'
 
     if not g1.HasCurveGeometry(True):
-        gdaltest.post_reason('fail')
         return 'fail'
 
     g2 = g1.GetLinearGeometry(45)
     if ogrtest.check_feature_geometry(g2, expected_g) != 0:
-        gdaltest.post_reason('fail')
         print(g2)
         return 'fail'
 
@@ -2300,7 +2157,6 @@ def test_ogr_geom_compoundcurve():
     g2 = ogr.ForceToLineString(g1)
     gdal.SetConfigOption('OGR_ARC_STEPSIZE', None)
     if ogrtest.check_feature_geometry(g2, expected_g) != 0:
-        gdaltest.post_reason('fail')
         print(g2)
         return 'fail'
 
@@ -2309,7 +2165,6 @@ def test_ogr_geom_compoundcurve():
     g2 = ogr.ForceToMultiLineString(g1)
     gdal.SetConfigOption('OGR_ARC_STEPSIZE', None)
     if ogrtest.check_feature_geometry(g2, expected_g) != 0:
-        gdaltest.post_reason('fail')
         print(g2)
         return 'fail'
 
@@ -2317,7 +2172,6 @@ def test_ogr_geom_compoundcurve():
     g1.Segmentize(0.5)
     expected_g = ogr.CreateGeometryFromWkt('COMPOUNDCURVE (CIRCULARSTRING (0 0,0.076120467488713 0.38268343236509,0.292893218813453 0.707106781186548,0.61731656763491 0.923879532511287,1 1,1.38268343236509 0.923879532511287,1.707106781186547 0.707106781186547,1.923879532511287 0.38268343236509,2 0,1.923879532511287 -0.38268343236509,1.707106781186547 -0.707106781186547,1.38268343236509 -0.923879532511287,1 -1))')
     if ogrtest.check_feature_geometry(g1, expected_g) != 0:
-        gdaltest.post_reason('fail')
         print(g1)
         return 'fail'
 
@@ -2327,7 +2181,6 @@ def test_ogr_geom_compoundcurve():
     g = ogr.CreateGeometryFromWkt(in_wkt)
     gdal.PopErrorHandler()
     if g is not None:
-        gdaltest.post_reason('fail')
         return 'fail'
 
     # Error case : invalid curve
@@ -2336,7 +2189,6 @@ def test_ogr_geom_compoundcurve():
     g = ogr.CreateGeometryFromWkt(in_wkt)
     gdal.PopErrorHandler()
     if g is not None:
-        gdaltest.post_reason('fail')
         return 'fail'
 
     # Error case : non contiguous curves
@@ -2345,7 +2197,6 @@ def test_ogr_geom_compoundcurve():
     g = ogr.CreateGeometryFromWkt(in_wkt)
     gdal.PopErrorHandler()
     if g is not None:
-        gdaltest.post_reason('fail')
         return 'fail'
 
     # Error case : non contiguous curves
@@ -2354,7 +2205,6 @@ def test_ogr_geom_compoundcurve():
     g = ogr.CreateGeometryFromWkt(in_wkt)
     gdal.PopErrorHandler()
     if g is not None:
-        gdaltest.post_reason('fail')
         return 'fail'
 
     # Error case : non contiguous curves
@@ -2363,33 +2213,28 @@ def test_ogr_geom_compoundcurve():
     g = ogr.CreateGeometryFromWkt(in_wkt)
     gdal.PopErrorHandler()
     if g is not None:
-        gdaltest.post_reason('fail')
         return 'fail'
 
     g = ogr.Geometry(ogr.wkbCompoundCurve)
     g.AddGeometry(ogr.CreateGeometryFromWkt('LINESTRING(0 0,1 1)'))
     if g.ExportToWkt() != 'COMPOUNDCURVE ((0 0,1 1))':
-        gdaltest.post_reason('fail')
         return 'fail'
 
     gdal.PushErrorHandler('CPLQuietErrorHandler')
     g.AddGeometry(ogr.CreateGeometryFromWkt('LINESTRING(0 0,1 1)'))
     gdal.PopErrorHandler()
     if g.ExportToWkt() != 'COMPOUNDCURVE ((0 0,1 1),(1 1,0 0))':
-        gdaltest.post_reason('fail')
         return 'fail'
 
     g = ogr.Geometry(ogr.wkbCompoundCurve)
     g.AddGeometryDirectly(ogr.CreateGeometryFromWkt('LINESTRING(0 0,1 1)'))
     if g.ExportToWkt() != 'COMPOUNDCURVE ((0 0,1 1))':
-        gdaltest.post_reason('fail')
         return 'fail'
 
     gdal.PushErrorHandler('CPLQuietErrorHandler')
     g.AddGeometryDirectly(ogr.CreateGeometryFromWkt('LINESTRING(0 0,1 1)'))
     gdal.PopErrorHandler()
     if g.ExportToWkt() != 'COMPOUNDCURVE ((0 0,1 1),(1 1,0 0))':
-        gdaltest.post_reason('fail')
         return 'fail'
 
     # Cannot add compoundcurve in compoundcurve
@@ -2398,7 +2243,6 @@ def test_ogr_geom_compoundcurve():
     g.AddGeometryDirectly(ogr.CreateGeometryFromWkt('COMPOUNDCURVE((1 1,2 2))'))
     gdal.PopErrorHandler()
     if g.ExportToWkt() != 'COMPOUNDCURVE EMPTY':
-        gdaltest.post_reason('fail')
         return 'fail'
 
     # Check that discretization is not sensitive to winding order
@@ -2412,7 +2256,6 @@ def test_ogr_geom_compoundcurve():
         # The curves must be exactly the same, despite our stealth mode
         if g2.GetX(i) != g3.GetX(p_count - 1 - i) or \
            g2.GetY(i) != g3.GetY(p_count - 1 - i):
-            gdaltest.post_reason('fail')
             print(g2)
             print(g3)
             print(i)
@@ -2440,7 +2283,6 @@ def test_ogr_geom_compoundcurve():
         g = ogr.CreateGeometryFromWkb(wkb)
         gdal.PopErrorHandler()
         if g is not None:
-            gdaltest.post_reason('fail')
             print(wkb)
             return 'fail'
 
@@ -2449,19 +2291,16 @@ def test_ogr_geom_compoundcurve():
         g1 = ogr.CreateGeometryFromWkt(in_wkt)
         out_wkt = g1.ExportToWkt()
         if in_wkt != out_wkt:
-            gdaltest.post_reason('fail')
             print(in_wkt)
             print(out_wkt)
             return 'fail'
         if g1.Length() != 0.0:
-            gdaltest.post_reason('fail')
             print(in_wkt)
             return 'fail'
 
         g2 = ogr.CreateGeometryFromWkb(g1.ExportToWkb())
         out_wkt = g2.ExportToWkt()
         if in_wkt != out_wkt:
-            gdaltest.post_reason('fail')
             print(in_wkt)
             print(out_wkt)
             return 'fail'
@@ -2477,18 +2316,15 @@ def test_ogr_geom_curvepolygon():
     in_wkt = 'CURVEPOLYGON (CIRCULARSTRING (0 0,1 0,0 0))'
     g1 = ogr.CreateGeometryFromWkt(in_wkt)
     if g1.GetGeometryType() != ogr.wkbCurvePolygon:
-        gdaltest.post_reason('fail')
         return 'fail'
     out_wkt = g1.ExportToWkt()
     if in_wkt != out_wkt:
-        gdaltest.post_reason('fail')
         print(out_wkt)
         return 'fail'
 
     if ogrtest.have_geos():
         p1 = g1.PointOnSurface()
         if (p1.GetX() - 0.5) * (p1.GetX() - 0.5) + p1.GetY() * p1.GetY() > 0.5 * 0.5:
-            gdaltest.post_reason('fail')
             print(p1)
             return 'fail'
 
@@ -2496,14 +2332,12 @@ def test_ogr_geom_curvepolygon():
     expected_env = (0.0, 1.0, -0.5, 0.5)
     for i in range(4):
         if abs(env[i] - expected_env[i]) > 1e-8:
-            gdaltest.post_reason('fail')
             print(env)
             return 'fail'
 
     area = g1.Area()
     expected_area = math.pi * 0.5 * 0.5
     if abs(area - expected_area) > 1e-8:
-        gdaltest.post_reason('fail')
         print(area)
         print(expected_area)
         return 'fail'
@@ -2511,7 +2345,6 @@ def test_ogr_geom_curvepolygon():
     g2 = ogr.CreateGeometryFromWkb(g1.ExportToWkb())
     out_wkt = g2.ExportToWkt()
     if in_wkt != out_wkt:
-        gdaltest.post_reason('fail')
         print(out_wkt)
         return 'fail'
 
@@ -2519,33 +2352,27 @@ def test_ogr_geom_curvepolygon():
     in_wkt = 'CURVEPOLYGON ((0 0,0 10,10 10,10 0,0 0))'
     g1 = ogr.CreateGeometryFromWkt(in_wkt)
     if not g1.HasCurveGeometry():
-        gdaltest.post_reason('fail')
         return 'fail'
     if g1.HasCurveGeometry(True):
-        gdaltest.post_reason('fail')
         return 'fail'
 
     # With Z
     in_wkt = 'CURVEPOLYGON Z (CIRCULARSTRING Z (0 0 10,1 0 10,0 0 10))'
     g1 = ogr.CreateGeometryFromWkt(in_wkt)
     if g1.GetGeometryType() != ogr.wkbCurvePolygonZ:
-        gdaltest.post_reason('fail')
         return 'fail'
     out_wkt = g1.ExportToWkt()
     if in_wkt != out_wkt:
-        gdaltest.post_reason('fail')
         print(out_wkt)
         return 'fail'
 
     wkb = g1.ExportToWkb()
     isowkb = g1.ExportToIsoWkb()
     if wkb != isowkb:
-        gdaltest.post_reason('fail')
         return 'fail'
     g2 = ogr.CreateGeometryFromWkb(wkb)
     out_wkt = g2.ExportToWkt()
     if in_wkt != out_wkt:
-        gdaltest.post_reason('fail')
         print(out_wkt)
         return 'fail'
 
@@ -2559,7 +2386,6 @@ def test_ogr_geom_curvepolygon():
 
     expected_g = ogr.CreateGeometryFromWkt('POLYGON ((0 0,0.116977778440514 -0.321393804843282,0.413175911166547 -0.49240387650611,0.75 -0.433012701892224,0.969846310392967 -0.171010071662835,0.969846310392967 0.171010071662835,0.75 0.433012701892224,0.413175911166547 0.49240387650611,0.116977778440514 0.321393804843282,0 0))')
     if ogrtest.check_feature_geometry(g1, expected_g) != 0:
-        gdaltest.post_reason('fail')
         print(g1)
         return 'fail'
 
@@ -2574,22 +2400,18 @@ def test_ogr_geom_curvepolygon():
     gdal.SetConfigOption('OGR_ARC_STEPSIZE', None)
 
     if ogrtest.check_feature_geometry(g2, expected_g) != 0:
-        gdaltest.post_reason('fail')
         print(g2)
         return 'fail'
 
     # Test HasCurveGeometry
     if not g1.HasCurveGeometry():
-        gdaltest.post_reason('fail')
         return 'fail'
     if not g1.HasCurveGeometry(True):
-        gdaltest.post_reason('fail')
         return 'fail'
 
     # Test GetLinearGeometry
     g2 = g1.GetLinearGeometry(45)
     if ogrtest.check_feature_geometry(g2, expected_g) != 0:
-        gdaltest.post_reason('fail')
         print(g2)
         return 'fail'
 
@@ -2598,7 +2420,6 @@ def test_ogr_geom_curvepolygon():
     g2 = ogr.ForceToPolygon(g1)
     gdal.SetConfigOption('OGR_ARC_STEPSIZE', None)
     if ogrtest.check_feature_geometry(g2, expected_g) != 0:
-        gdaltest.post_reason('fail')
         print(g2)
         return 'fail'
 
@@ -2608,7 +2429,6 @@ def test_ogr_geom_curvepolygon():
     g2 = ogr.ForceToMultiPolygon(g1)
     gdal.SetConfigOption('OGR_ARC_STEPSIZE', None)
     if ogrtest.check_feature_geometry(g2, expected_g2) != 0:
-        gdaltest.post_reason('fail')
         print(g2)
         return 'fail'
 
@@ -2618,7 +2438,6 @@ def test_ogr_geom_curvepolygon():
     gdal.SetConfigOption('OGR_ARC_STEPSIZE', None)
     expected_g3 = ogr.CreateGeometryFromWkt('MULTILINESTRING ((0 0,0.116977778440514 -0.321393804843282,0.413175911166547 -0.49240387650611,0.75 -0.433012701892224,0.969846310392967 -0.171010071662835,0.969846310392967 0.171010071662835,0.75 0.433012701892224,0.413175911166547 0.49240387650611,0.116977778440514 0.321393804843282,0 0))')
     if ogrtest.check_feature_geometry(g2, expected_g3) != 0:
-        gdaltest.post_reason('fail')
         print(g2)
         return 'fail'
 
@@ -2626,7 +2445,6 @@ def test_ogr_geom_curvepolygon():
     if ogrtest.have_geos():
         g2 = g1.Intersection(g1)
         if g2 is None:
-            gdaltest.post_reason('fail')
             return 'fail'
 
     # Test CURVEPOLYGON and COMPOUNDCURVE, CIRCULARSTRING, LINESTRING
@@ -2634,7 +2452,6 @@ def test_ogr_geom_curvepolygon():
     g1 = ogr.CreateGeometryFromWkt(in_wkt)
     g2 = ogr.CreateGeometryFromWkb(g1.ExportToWkb())
     if g2.ExportToWkt() != in_wkt:
-        gdaltest.post_reason('fail')
         print(g2)
         return 'fail'
 
@@ -2643,7 +2460,6 @@ def test_ogr_geom_curvepolygon():
     g1 = ogr.CreateGeometryFromWkt(in_wkt)
     g2 = ogr.CreateGeometryFromWkb(g1.ExportToWkb())
     if not g1.Equals(g2):
-        gdaltest.post_reason('fail')
         print(g2)
         return 'fail'
 
@@ -2651,7 +2467,6 @@ def test_ogr_geom_curvepolygon():
     if ogrtest.have_geos():
         g2 = g1.Intersection(g1)
         if g2 is None:
-            gdaltest.post_reason('fail')
             return 'fail'
 
     # Test ForceToPolygon
@@ -2659,7 +2474,6 @@ def test_ogr_geom_curvepolygon():
     g2 = ogr.ForceToPolygon(g1)
     gdal.SetConfigOption('OGR_ARC_STEPSIZE', None)
     if ogrtest.check_feature_geometry(g2, expected_g) != 0:
-        gdaltest.post_reason('fail')
         print(g2)
         return 'fail'
 
@@ -2668,7 +2482,6 @@ def test_ogr_geom_curvepolygon():
     g2 = ogr.ForceToMultiPolygon(g1)
     gdal.SetConfigOption('OGR_ARC_STEPSIZE', None)
     if ogrtest.check_feature_geometry(g2, expected_g2) != 0:
-        gdaltest.post_reason('fail')
         print(g2)
         return 'fail'
 
@@ -2678,7 +2491,6 @@ def test_ogr_geom_curvepolygon():
     g = ogr.CreateGeometryFromWkt(in_wkt)
     gdal.PopErrorHandler()
     if g is not None:
-        gdaltest.post_reason('fail')
         return 'fail'
 
     # Error case : wrong sub-geometry type
@@ -2687,7 +2499,6 @@ def test_ogr_geom_curvepolygon():
     g = ogr.CreateGeometryFromWkt(in_wkt)
     gdal.PopErrorHandler()
     if g is not None:
-        gdaltest.post_reason('fail')
         return 'fail'
 
     # Error case: non closed ring
@@ -2696,46 +2507,37 @@ def test_ogr_geom_curvepolygon():
     g = ogr.CreateGeometryFromWkt(in_wkt)
     gdal.PopErrorHandler()
     if g is not None:
-        gdaltest.post_reason('fail')
         return 'fail'
 
     # Area
     g = ogr.CreateGeometryFromWkt('CURVEPOLYGON ((0 0,1 1,1 0,0 0))')
     if g.Area() != 0.5:
-        gdaltest.post_reason('fail')
         return 'fail'
 
     g = ogr.CreateGeometryFromWkt('CURVEPOLYGON (COMPOUNDCURVE((0 0,1 1,1 0,0 0)))')
     if g.Area() != 0.5:
-        gdaltest.post_reason('fail')
         return 'fail'
 
     g = ogr.CreateGeometryFromWkt('CURVEPOLYGON (COMPOUNDCURVE((0 0,1 1),(1 1,1 0,0 0)))')
     if g.Area() != 0.5:
-        gdaltest.post_reason('fail')
         return 'fail'
 
     g = ogr.CreateGeometryFromWkt('CURVEPOLYGON ((100000000 100000000,100000001 100000001,100000001 100000000,100000000 100000000))')
     if g.Area() != 0.5:
-        gdaltest.post_reason('fail')
         return 'fail'
 
     # Equals
     g1 = ogr.CreateGeometryFromWkt('CURVEPOLYGON ((0 0,1 1,1 0,0 0),CIRCULARSTRING(0.75 0.5,0.85 0.5,0.75 0.5))')
     if not g1.Equals(g1):
-        gdaltest.post_reason('fail')
         return 'fail'
 
     if not g1.Equals(g1.Clone()):
-        gdaltest.post_reason('fail')
         return 'fail'
 
     if g1.Equals(ogr.CreateGeometryFromWkt('POINT(0 0)')):
-        gdaltest.post_reason('fail')
         return 'fail'
 
     if g1.Equals(ogr.CreateGeometryFromWkt('CURVEPOLYGON ((0 0,1 1,1 0,0 0))')):
-        gdaltest.post_reason('fail')
         return 'fail'
 
     # Intersects optimizations on a circle
@@ -2750,32 +2552,27 @@ def test_ogr_geom_curvepolygon():
     res = res & p1.Within(g1)
     gdal.SetConfigOption('OGR_ARC_STEPSIZE', None)
     if not res:
-        gdaltest.post_reason('fail')
         return 'fail'
 
     # Test point slightly outside circle
     p2 = ogr.CreateGeometryFromWkt('POINT (%.16g %.16g)' % (1 + math.cos(math.pi / 6) + 1e-4, math.sin(math.pi / 6)))
     if p2.Within(g1):
-        gdaltest.post_reason('fail')
         return 'fail'
 
     # Full circle defined by 2 arcs
     g1 = ogr.CreateGeometryFromWkt('CURVEPOLYGON (CIRCULARSTRING (0 0,1 1,2 0,1 -1,0 0))')
     if not p1.Within(g1):
-        gdaltest.post_reason('fail')
         return 'fail'
 
     # Same but in reverse order
     g1 = ogr.CreateGeometryFromWkt('CURVEPOLYGON (CIRCULARSTRING (0 0,1 -1,2 0,1 1,0 0))')
     if not p1.Within(g1):
-        gdaltest.post_reason('fail')
         return 'fail'
 
     # This is not a circle
     p2 = ogr.CreateGeometryFromWkt('POINT (%.16g %.16g)' % (1 + math.cos(math.pi / 6) - 1e-2, math.sin(math.pi / 6)))
     g1 = ogr.CreateGeometryFromWkt('CURVEPOLYGON (CIRCULARSTRING (0 0,1 1,2 0,1 1,0 0))')
     if p2.Within(g1):
-        gdaltest.post_reason('fail')
         return 'fail'
 
     # Test area on circle in 2 pieces
@@ -2783,7 +2580,6 @@ def test_ogr_geom_curvepolygon():
     area = g1.Area()
     expected_area = math.pi
     if abs(area - expected_area) > 1e-10:
-        gdaltest.post_reason('fail')
         print(area)
         print(expected_area)
         return 'fail'
@@ -2793,7 +2589,6 @@ def test_ogr_geom_curvepolygon():
     area = g1.Area()
     expected_area = math.pi + 2 * 2
     if abs(area - expected_area) > 1e-10:
-        gdaltest.post_reason('fail')
         print(area)
         print(expected_area)
         return 'fail'
@@ -2803,7 +2598,6 @@ def test_ogr_geom_curvepolygon():
     area = g1.Area()
     expected_area = math.pi + 2 * 2
     if abs(area - expected_area) > 1e-10:
-        gdaltest.post_reason('fail')
         print(area)
         print(expected_area)
         return 'fail'
@@ -2813,7 +2607,6 @@ def test_ogr_geom_curvepolygon():
     area = g1.Area()
     expected_area = 2 * 2
     if abs(area - expected_area) > 1e-10:
-        gdaltest.post_reason('fail')
         print(area)
         print(expected_area)
         return 'fail'
@@ -2823,19 +2616,16 @@ def test_ogr_geom_curvepolygon():
         g1 = ogr.CreateGeometryFromWkt(in_wkt)
         out_wkt = g1.ExportToWkt()
         if in_wkt != out_wkt:
-            gdaltest.post_reason('fail')
             print(in_wkt)
             print(out_wkt)
             return 'fail'
         if g1.Area() != 0.0:
-            gdaltest.post_reason('fail')
             print(in_wkt)
             return 'fail'
 
         g2 = ogr.CreateGeometryFromWkb(g1.ExportToWkb())
         out_wkt = g2.ExportToWkt()
         if in_wkt != out_wkt:
-            gdaltest.post_reason('fail')
             print(in_wkt)
             print(out_wkt)
             return 'fail'
@@ -2844,14 +2634,12 @@ def test_ogr_geom_curvepolygon():
     g = ogr.Geometry(ogr.wkbCurvePolygon)
     g.AddGeometry(ogr.Geometry(ogr.wkbCircularString))
     if g.Area() != 0:
-        gdaltest.post_reason('fail')
         print(g.Area())
         return 'fail'
 
     # Non-convex CircularString
     g = ogr.CreateGeometryFromWkt('CURVEPOLYGON( COMPOUNDCURVE( CIRCULARSTRING(0 0,0.5 -0.5,1 0,1.5 0.5,2 0), (2 0,2 1,0 1,0 0) ) )')
     if abs(g.Area() - 2.0) > 1e-10:
-        gdaltest.post_reason('fail')
         print(g.Area())
         return 'fail'
 
@@ -2867,11 +2655,9 @@ def test_ogr_geom_multicurve():
     in_wkt = 'MULTICURVE (CIRCULARSTRING (0 0,1 0,0 0))'
     g1 = ogr.CreateGeometryFromWkt(in_wkt)
     if g1.GetGeometryType() != ogr.wkbMultiCurve:
-        gdaltest.post_reason('fail')
         return 'fail'
     out_wkt = g1.ExportToWkt()
     if in_wkt != out_wkt:
-        gdaltest.post_reason('fail')
         print(out_wkt)
         return 'fail'
 
@@ -2883,57 +2669,47 @@ def test_ogr_geom_multicurve():
     expected_env = (0.0, 1.0, -0.5, 0.5)
     for i in range(4):
         if abs(env[i] - expected_env[i]) > 1e-8:
-            gdaltest.post_reason('fail')
             print(env)
             return 'fail'
 
     length = g1.Length()
     expected_length = 2 * math.pi * 0.5
     if abs(length - expected_length) > 1e-8:
-        gdaltest.post_reason('fail')
         print(length)
         return 'fail'
 
     g2 = ogr.CreateGeometryFromWkb(g1.ExportToWkb())
     out_wkt = g2.ExportToWkt()
     if in_wkt != out_wkt:
-        gdaltest.post_reason('fail')
         print(out_wkt)
         return 'fail'
 
     if not g1.HasCurveGeometry():
-        gdaltest.post_reason('fail')
         return 'fail'
     if not g1.HasCurveGeometry(True):
-        gdaltest.post_reason('fail')
         return 'fail'
 
     # MULTICURVE of LINESTRING
     in_wkt = 'MULTICURVE ((0 0,1 0))'
     g1 = ogr.CreateGeometryFromWkt(in_wkt)
     if not g1.HasCurveGeometry():
-        gdaltest.post_reason('fail')
         return 'fail'
     if g1.HasCurveGeometry(True):
-        gdaltest.post_reason('fail')
         return 'fail'
 
     # Z
     in_wkt = 'MULTICURVE Z (CIRCULARSTRING Z (0 0 10,1 0 10,0 0 10))'
     g1 = ogr.CreateGeometryFromWkt(in_wkt)
     if g1.GetGeometryType() != ogr.wkbMultiCurveZ:
-        gdaltest.post_reason('fail')
         return 'fail'
     out_wkt = g1.ExportToWkt()
     if in_wkt != out_wkt:
-        gdaltest.post_reason('fail')
         print(out_wkt)
         return 'fail'
 
     g2 = ogr.CreateGeometryFromWkb(g1.ExportToWkb())
     out_wkt = g2.ExportToWkt()
     if in_wkt != out_wkt:
-        gdaltest.post_reason('fail')
         print(out_wkt)
         return 'fail'
 
@@ -2942,14 +2718,12 @@ def test_ogr_geom_multicurve():
     g1 = ogr.CreateGeometryFromWkt(in_wkt)
     out_wkt = g1.ExportToWkt()
     if in_wkt != out_wkt:
-        gdaltest.post_reason('fail')
         print(out_wkt)
         return 'fail'
 
     g2 = ogr.CreateGeometryFromWkb(g1.ExportToWkb())
     out_wkt = g2.ExportToWkt()
     if in_wkt != out_wkt:
-        gdaltest.post_reason('fail')
         print(out_wkt)
         return 'fail'
 
@@ -2959,14 +2733,12 @@ def test_ogr_geom_multicurve():
     gdal.SetConfigOption('OGR_ARC_STEPSIZE', None)
     expected_g = 'MULTILINESTRING ((0 0,0.116977778440514 -0.321393804843282,0.413175911166547 -0.49240387650611,0.75 -0.433012701892224,0.969846310392967 -0.171010071662835,0.969846310392967 0.171010071662835,0.75 0.433012701892224,0.413175911166547 0.49240387650611,0.116977778440514 0.321393804843282,0 0),(0 0,1 1),(0 0,1 1,2 2,3 3))'
     if ogrtest.check_feature_geometry(g2, expected_g) != 0:
-        gdaltest.post_reason('fail')
         print(g2)
         return 'fail'
 
     # Test GetLinearGeometry
     g2 = g1.GetLinearGeometry(45)
     if ogrtest.check_feature_geometry(g2, expected_g) != 0:
-        gdaltest.post_reason('fail')
         print(g2)
         return 'fail'
 
@@ -2976,7 +2748,6 @@ def test_ogr_geom_multicurve():
     g = ogr.CreateGeometryFromWkt(in_wkt)
     gdal.PopErrorHandler()
     if g is not None:
-        gdaltest.post_reason('fail')
         return 'fail'
 
     return 'success'
@@ -2991,11 +2762,9 @@ def test_ogr_geom_multisurface():
     in_wkt = 'MULTISURFACE (CURVEPOLYGON (CIRCULARSTRING (0 0,1 0,0 0)))'
     g1 = ogr.CreateGeometryFromWkt(in_wkt)
     if g1.GetGeometryType() != ogr.wkbMultiSurface:
-        gdaltest.post_reason('fail')
         return 'fail'
     out_wkt = g1.ExportToWkt()
     if in_wkt != out_wkt:
-        gdaltest.post_reason('fail')
         print(out_wkt)
         return 'fail'
 
@@ -3007,47 +2776,39 @@ def test_ogr_geom_multisurface():
     expected_env = (0.0, 1.0, -0.5, 0.5)
     for i in range(4):
         if abs(env[i] - expected_env[i]) > 1e-8:
-            gdaltest.post_reason('fail')
             print(env)
             return 'fail'
 
     area = g1.Area()
     expected_area = math.pi * 0.5 * 0.5
     if abs(area - expected_area) > 1e-8:
-        gdaltest.post_reason('fail')
         print(area)
         return 'fail'
 
     g2 = ogr.CreateGeometryFromWkb(g1.ExportToWkb())
     out_wkt = g2.ExportToWkt()
     if in_wkt != out_wkt:
-        gdaltest.post_reason('fail')
         print(out_wkt)
         return 'fail'
 
     if not g1.HasCurveGeometry():
-        gdaltest.post_reason('fail')
         return 'fail'
     if not g1.HasCurveGeometry(True):
-        gdaltest.post_reason('fail')
         return 'fail'
 
     # Z
     in_wkt = 'MULTISURFACE Z (CURVEPOLYGON Z (CIRCULARSTRING Z (0 0 10,1 0 10,0 0 10)))'
     g1 = ogr.CreateGeometryFromWkt(in_wkt)
     if g1.GetGeometryType() != ogr.wkbMultiSurfaceZ:
-        gdaltest.post_reason('fail')
         return 'fail'
     out_wkt = g1.ExportToWkt()
     if in_wkt != out_wkt:
-        gdaltest.post_reason('fail')
         print(out_wkt)
         return 'fail'
 
     g2 = ogr.CreateGeometryFromWkb(g1.ExportToWkb())
     out_wkt = g2.ExportToWkt()
     if in_wkt != out_wkt:
-        gdaltest.post_reason('fail')
         print(out_wkt)
         return 'fail'
 
@@ -3055,10 +2816,8 @@ def test_ogr_geom_multisurface():
     in_wkt = 'MULTISURFACE (((0 0,0 10,10 10,10 0,0 0)))'
     g1 = ogr.CreateGeometryFromWkt(in_wkt)
     if not g1.HasCurveGeometry():
-        gdaltest.post_reason('fail')
         return 'fail'
     if g1.HasCurveGeometry(True):
-        gdaltest.post_reason('fail')
         return 'fail'
 
     # WKT with all possible sub geometries
@@ -3066,14 +2825,12 @@ def test_ogr_geom_multisurface():
     g1 = ogr.CreateGeometryFromWkt(in_wkt)
     out_wkt = g1.ExportToWkt()
     if in_wkt != out_wkt:
-        gdaltest.post_reason('fail')
         print(out_wkt)
         return 'fail'
 
     g2 = ogr.CreateGeometryFromWkb(g1.ExportToWkb())
     out_wkt = g2.ExportToWkt()
     if in_wkt != out_wkt:
-        gdaltest.post_reason('fail')
         print(out_wkt)
         return 'fail'
 
@@ -3083,20 +2840,17 @@ def test_ogr_geom_multisurface():
     gdal.SetConfigOption('OGR_ARC_STEPSIZE', None)
     expected_g = 'MULTIPOLYGON (((0 0,0 10,10 10,10 0,0 0)),((0 0,0.116977778440514 -0.321393804843282,0.413175911166547 -0.49240387650611,0.75 -0.433012701892224,0.969846310392967 -0.171010071662835,0.969846310392967 0.171010071662835,0.75 0.433012701892224,0.413175911166547 0.49240387650611,0.116977778440514 0.321393804843282,0 0)))'
     if ogrtest.check_feature_geometry(g2, expected_g) != 0:
-        gdaltest.post_reason('fail')
         print(g2)
         return 'fail'
 
     # Test GetLinearGeometry
     g2 = g1.GetLinearGeometry(45)
     if ogrtest.check_feature_geometry(g2, expected_g) != 0:
-        gdaltest.post_reason('fail')
         print(g2)
         return 'fail'
     # Check that GetLinearGeometry() is idem-potent on MULTIPOLYGON
     g3 = g2.GetLinearGeometry(45)
     if not g3.Equals(g2):
-        gdaltest.post_reason('fail')
         print(g3)
         return 'fail'
 
@@ -3106,7 +2860,6 @@ def test_ogr_geom_multisurface():
         g1 = ogr.CreateGeometryFromWkt(in_wkt)
         p1 = g1.PointOnSurface()
         if p1.ExportToWkt() != 'POINT (0.5 5.0)':
-            gdaltest.post_reason('fail')
             print(p1)
             return 'fail'
 
@@ -3116,7 +2869,6 @@ def test_ogr_geom_multisurface():
     g = ogr.CreateGeometryFromWkt(in_wkt)
     gdal.PopErrorHandler()
     if g is not None:
-        gdaltest.post_reason('fail')
         return 'fail'
 
     return 'success'
@@ -3138,7 +2890,6 @@ def test_ogr_geom_getcurvegeometry():
         g = ogr.CreateGeometryFromWkt(in_wkt)
         g2 = g.GetCurveGeometry()
         if g2.ExportToWkt() != in_wkt:
-            gdaltest.post_reason('fail')
             print(g)
             print(g2)
             return 'fail'
@@ -3146,25 +2897,21 @@ def test_ogr_geom_getcurvegeometry():
     g = ogr.CreateGeometryFromWkt('GEOMETRYCOLLECTION(POINT (0 1))')
     g2 = g.GetCurveGeometry()
     if not g.Equals(g2):
-        gdaltest.post_reason('fail')
         return 'fail'
 
     g = ogr.CreateGeometryFromWkt('GEOMETRYCOLLECTION(LINESTRING (0 0,0 1,0 0))')
     g2 = g.GetCurveGeometry()
     if not g.Equals(g2):
-        gdaltest.post_reason('fail')
         return 'fail'
 
     g = ogr.CreateGeometryFromWkt('POLYGON((0 0,0 1,1 1,1 0,0 0))')
     g2 = g.GetCurveGeometry()
     if not g.Equals(g2):
-        gdaltest.post_reason('fail')
         return 'fail'
 
     g = ogr.CreateGeometryFromWkt('POLYGON Z ((0 0 10,0 1 10,1 1 10,1 0 10,0 0 10))')
     g2 = g.GetCurveGeometry()
     if not g.Equals(g2):
-        gdaltest.post_reason('fail')
         return 'fail'
 
     # CircularString with large step
@@ -3174,7 +2921,6 @@ def test_ogr_geom_getcurvegeometry():
     if g3.GetGeometryType() != ogr.wkbCircularString or \
        g1.GetPoint(0) != g3.GetPoint(0) or g1.GetPoint(2) != g3.GetPoint(2) or \
        abs((g3.GetX(1) - 1) * (g3.GetX(1) - 1) + g3.GetY(1) * g3.GetY(1) - 1) > 1e-8:
-        gdaltest.post_reason('fail')
         print(g3)
         return 'fail'
 
@@ -3183,7 +2929,6 @@ def test_ogr_geom_getcurvegeometry():
     g2 = g1.GetLinearGeometry(15)
     g3 = g2.GetCurveGeometry()
     if not g3.Equals(g1):
-        gdaltest.post_reason('fail')
         print(g3)
         return 'fail'
 
@@ -3192,7 +2937,6 @@ def test_ogr_geom_getcurvegeometry():
     g2 = g1.GetLinearGeometry()
     g3 = g2.GetCurveGeometry()
     if g3.ExportToWkt() != 'LINESTRING (1 2,3 4,5 6)':
-        gdaltest.post_reason('fail')
         print(g3)
         return 'fail'
 
@@ -3214,7 +2958,6 @@ def test_ogr_geom_getcurvegeometry():
         g2 = g1.GetLinearGeometry()
         g3 = g2.GetCurveGeometry()
         if not g3.Equals(g1):
-            gdaltest.post_reason('fail')
             print(g1)
             print(g3)
             return 'fail'
@@ -3280,7 +3023,6 @@ def test_ogr_geom_getcurvegeometry():
     g2 = g1.GetLinearGeometry()
     g3 = g2.GetCurveGeometry()
     if not g3.Equals(g1):
-        gdaltest.post_reason('fail')
         print(g3)
         return 'fail'
 
@@ -3294,7 +3036,6 @@ def test_ogr_geom_getcurvegeometry():
        g1.GetPoint(2) != g3.GetPoint(4) or \
        abs((g3.GetX(1) - 0.5) * (g3.GetX(1) - 0.5) + g3.GetY(1) * g3.GetY(1) - 0.5 * 0.5) > 1e-12 or \
        abs((g3.GetX(3) - 0.5) * (g3.GetX(3) - 0.5) + g3.GetY(3) * g3.GetY(3) - 0.5 * 0.5) > 1e-12:
-        gdaltest.post_reason('fail')
         print(g3)
         # print(abs((g3.GetX(1) - 0.5)*(g3.GetX(1) - 0.5)+g3.GetY(1)*g3.GetY(1) - 0.5*0.5))
         # print(abs((g3.GetX(3) - 0.5)*(g3.GetX(3) - 0.5)+g3.GetY(3)*g3.GetY(3) - 0.5*0.5))
@@ -3309,7 +3050,6 @@ def test_ogr_geom_getcurvegeometry():
         g2 = g1.GetLinearGeometry()
         g3 = g2.GetCurveGeometry()
         if not g3.Equals(g1):
-            gdaltest.post_reason('fail')
             print(g1)
             print(g3)
             return 'fail'
@@ -3319,7 +3059,6 @@ def test_ogr_geom_getcurvegeometry():
     g2 = g1.GetLinearGeometry()
     g3 = g2.GetCurveGeometry()
     if not g3.Equals(g1):
-        gdaltest.post_reason('fail')
         print(g3)
         return 'fail'
 
@@ -3328,7 +3067,6 @@ def test_ogr_geom_getcurvegeometry():
     g2 = g1.GetLinearGeometry()
     g3 = g2.GetCurveGeometry()
     if not g3.Equals(g1):
-        gdaltest.post_reason('fail')
         print(g3)
         return 'fail'
 
@@ -3337,7 +3075,6 @@ def test_ogr_geom_getcurvegeometry():
     g2 = g1.GetLinearGeometry()
     g3 = g2.GetCurveGeometry()
     if not g3.Equals(g1):
-        gdaltest.post_reason('fail')
         print(g3)
         return 'fail'
 
@@ -3346,7 +3083,6 @@ def test_ogr_geom_getcurvegeometry():
     g2 = g1.GetLinearGeometry()
     g3 = g2.GetCurveGeometry()
     if not g3.Equals(g1):
-        gdaltest.post_reason('fail')
         print(g3)
         return 'fail'
 
@@ -3355,7 +3091,6 @@ def test_ogr_geom_getcurvegeometry():
     g2 = ogr.CreateGeometryFromWkt('LINESTRING (0 0,0.000997093138961 0.068920262501281,0.006738548124866 0.137608197923873,0.017197098230267 0.205737600590167,0.032323074784779 0.272984917348872,0.052044643056421 0.339030784160355,0.076268143401735 0.403561542787492,0.104878536064531 0.466270730389102,0.137739947510866 0.526860534941749,0.174696315705653 0.585043209577972,0.215572131266425 0.640542439124111,0.260173270974444 0.693094652347904,0.30828791968472 0.742450273683876,0.359687576256715 0.788374908491942,0.414128138728451 0.830650456220319,0.471351063580441 0.869076146186235,0.531084593583979 0.903469491055406,0.593045048402615 0.933667153492107,0.656938171817632 0.959525721864054,0.722460529179411 0.980922391318168,0.789300948448056 0.99775554699276,0.857141997979641 1.009945246596371,0.925661494039921 1.017433600061489,0.994534030886182 1.020185044470095,1.063432526150724 1.01818651294542,1.132029774186796 1.01144749670781,1.2 1.0,1.267547127648721 0.983752320094182,1.333803428245673 0.962854851656094,1.398449236893265 0.937408418110045,1.461172658788815 0.907535790143504,1.521671074014578 0.873381093378847,1.579652597579492 0.835109113014538,1.634837487668428 0.792904498790658,1.686959495304612 0.746970874114522,1.73576714891352 0.697529853644598,1.781024967590663 0.644819974072535,1.822514597219645 0.589095543261942,1.860035863959079 0.53062541329644,1.89340774001566 0.469691683356621,1.922469217043826 0.406588338684124,1.94708008295817 0.341619832199361,1.967121598410718 0.27509961561613,1.982497069669296 0.207348627140011,1.993132315133044 0.138693743046887,1.998976023234287 0.069466200612231,2 0)')
     g3 = g2.GetCurveGeometry()
     if not g3.Equals(g1):
-        gdaltest.post_reason('fail')
         print(g3)
         return 'fail'
 
@@ -3364,7 +3099,6 @@ def test_ogr_geom_getcurvegeometry():
     g2 = ogr.CreateGeometryFromWkt('LINESTRING (0 0,-0.000199980003999 0.02,0.002236456877416 0.089770423644023,0.009533897446083 0.159200932797352,0.021656789305088 0.227953268998521,0.038546070943884 0.295692477776518,0.060119459480029 0.362088540515299,0.086271851533127 0.426817982271309,0.116875835277923 0.489565447710894,0.151782311181914 0.550025237489786,0.190821218403283 0.607902797589577,0.233802363310224 0.662916154355295,0.280516346085201 0.7147972882427,0.330735580899807 0.763293439582565,0.384215404690045 0.80816834000038,0.440695269130182 0.849203363492117,0.499900009998002 0.886198591548151,0.561541187747236 0.918973787136141,0.62531849275604 0.947369272797732,0.690921208405283 0.971246708581086,0.758029724858684 0.990489766019218,0.826317096169807 1.005004694870594,0.895450633129846 1.014720779860886,0.965093524096011 1.019590685200679,1.034906475903993 1.019590685200679,1.104549366870158 1.014720779860886,1.173682903830197 1.005004694870593,1.2 1.0,1.241970275141317 0.990489766019217,1.309078791594718 0.971246708581085,1.374681507243961 0.947369272797731,1.438458812252765 0.91897378713614,1.500099990002 0.886198591548151,1.559304730869819 0.849203363492116,1.615784595309956 0.808168340000379,1.669264419100194 0.763293439582565,1.7194836539148 0.714797288242699,1.766197636689777 0.662916154355294,1.809178781596718 0.607902797589576,1.848217688818087 0.550025237489785,1.883124164722078 0.489565447710893,1.913728148466874 0.426817982271308,1.939880540519971 0.362088540515298,1.961453929056117 0.295692477776516,1.978343210694912 0.227953268998519,1.990466102553917 0.15920093279735,1.997763543122584 0.089770423644022,2.000199980003999 0.02,2 0)')
     g3 = g2.GetCurveGeometry()
     if not g3.Equals(g1):
-        gdaltest.post_reason('fail')
         print(g3)
         return 'fail'
 
@@ -3374,7 +3108,6 @@ def test_ogr_geom_getcurvegeometry():
     g3 = g2.GetCurveGeometry()
     g1_expected = ogr.CreateGeometryFromWkt('CIRCULARSTRING (0 0,0.98 1.02,2 0)')
     if not g3.Equals(g1_expected):
-        gdaltest.post_reason('fail')
         print(g3)
         return 'fail'
 
@@ -3383,7 +3116,6 @@ def test_ogr_geom_getcurvegeometry():
     g2 = g1.GetLinearGeometry()
     g3 = g2.GetCurveGeometry()
     if not g3.Equals(g1):
-        gdaltest.post_reason('fail')
         print(g3)
         return 'fail'
 
@@ -3392,7 +3124,6 @@ def test_ogr_geom_getcurvegeometry():
     g2 = g1.GetLinearGeometry()
     g3 = g2.GetCurveGeometry()
     if not g3.Equals(g1):
-        gdaltest.post_reason('fail')
         print(g3)
         return 'fail'
 
@@ -3400,7 +3131,6 @@ def test_ogr_geom_getcurvegeometry():
     g2 = g1.GetLinearGeometry()
     g3 = g2.GetCurveGeometry()
     if not g3.Equals(g1):
-        gdaltest.post_reason('fail')
         print(g3)
         return 'fail'
 
@@ -3409,7 +3139,6 @@ def test_ogr_geom_getcurvegeometry():
     g2 = g1.GetLinearGeometry(options=['ADD_INTERMEDIATE_POINT=STEALTH'])
     g3 = g2.GetCurveGeometry()
     if not g3.Equals(g1):
-        gdaltest.post_reason('fail')
         print(g3)
         return 'fail'
 
@@ -3418,7 +3147,6 @@ def test_ogr_geom_getcurvegeometry():
     g2 = g1.GetLinearGeometry(options=['ADD_INTERMEDIATE_POINT=YES'])
     g3 = g2.GetCurveGeometry()
     if not g3.Equals(g1):
-        gdaltest.post_reason('fail')
         print(g3)
         return 'fail'
 
@@ -3427,7 +3155,6 @@ def test_ogr_geom_getcurvegeometry():
     g2 = g1.GetLinearGeometry()
     g3 = g2.GetCurveGeometry()
     if ogrtest.check_feature_geometry(g3, g1) != 0:
-        gdaltest.post_reason('fail')
         print(g3)
         return 'fail'
 
@@ -3436,7 +3163,6 @@ def test_ogr_geom_getcurvegeometry():
     g2 = g1.GetLinearGeometry()
     g3 = g2.GetCurveGeometry()
     if not g3.Equals(g1):
-        gdaltest.post_reason('fail')
         print(g3)
         return 'fail'
 
@@ -3446,7 +3172,6 @@ def test_ogr_geom_getcurvegeometry():
     g3 = g2.GetCurveGeometry()
     g1_expected = ogr.CreateGeometryFromWkt('CIRCULARSTRING (0 0,1.0 1.020199980003999,2 0)')
     if ogrtest.check_feature_geometry(g3, g1_expected) != 0:
-        gdaltest.post_reason('fail')
         print(g3)
         return 'fail'
 
@@ -3455,7 +3180,6 @@ def test_ogr_geom_getcurvegeometry():
     g2_new = g1.GetLinearGeometry(options=['bla', 'ADD_INTERMEDIATE_POINT=FALSE', 'foo=bar'])
     gdal.PopErrorHandler()
     if not g2_new.Equals(g2):
-        gdaltest.post_reason('fail')
         print(g2_new)
         return 'fail'
 
@@ -3464,7 +3188,6 @@ def test_ogr_geom_getcurvegeometry():
     g2.AddPoint_2D(2 - 1e-9, 0)
     g3 = g2.GetCurveGeometry()
     if not g3.Equals(g1):
-        gdaltest.post_reason('fail')
         print(g3)
         return 'fail'
 
@@ -3476,7 +3199,6 @@ def test_ogr_geom_getcurvegeometry():
         g2_new.AddPoint_2D(g2.GetX(i), g2.GetY(i))
     g3 = g2_new.GetCurveGeometry()
     if not g3.Equals(g1):
-        gdaltest.post_reason('fail')
         print(g3)
         return 'fail'
 
@@ -3505,7 +3227,6 @@ def test_ogr_geom_getcurvegeometry():
         g2 = g1.GetLinearGeometry()
         g3 = g2.GetCurveGeometry()
         if (eps == 0 and not g3.Equals(g1)) or (eps > 0 and ogrtest.check_feature_geometry(g3, g1, eps) != 0):
-            gdaltest.post_reason('fail')
             print('')
             print(g1)
             print(g3)
@@ -3517,7 +3238,6 @@ def test_ogr_geom_getcurvegeometry():
     g2 = g1.GetLinearGeometry()
     g3 = g2.GetCurveGeometry()
     if not g3.Equals(g1):
-        gdaltest.post_reason('fail')
         print(g3)
         return 'fail'
 
@@ -3526,7 +3246,6 @@ def test_ogr_geom_getcurvegeometry():
     g2 = g1.GetLinearGeometry()
     g3 = g2.GetCurveGeometry()
     if not g3.Equals(g1):
-        gdaltest.post_reason('fail')
         print(g3)
         return 'fail'
 
@@ -3535,7 +3254,6 @@ def test_ogr_geom_getcurvegeometry():
     g2 = g1.GetLinearGeometry()
     g3 = g2.GetCurveGeometry()
     if not g3.Equals(g1):
-        gdaltest.post_reason('fail')
         print(g3)
         return 'fail'
 
@@ -3544,7 +3262,6 @@ def test_ogr_geom_getcurvegeometry():
         g2 = ogr.CreateGeometryFromWkt('CURVEPOLYGON(CIRCULARSTRING (1 0,3 1,1 0))')
         g3 = g1.Intersection(g2)
         if g3.GetGeometryType() != ogr.wkbCurvePolygon:
-            gdaltest.post_reason('fail')
             print(g3)
             return 'fail'
 
@@ -3552,7 +3269,6 @@ def test_ogr_geom_getcurvegeometry():
         g2 = ogr.CreateGeometryFromWkt('CURVEPOLYGON((1 -1,1 1,3 1,3 -1,1 -1))')
         g3 = g1.Intersection(g2)
         if g3.GetGeometryType() != ogr.wkbCurvePolygon:
-            gdaltest.post_reason('fail')
             print(g3)
             return 'fail'
 
@@ -3560,7 +3276,6 @@ def test_ogr_geom_getcurvegeometry():
         g2 = ogr.CreateGeometryFromWkt('CURVEPOLYGON(CIRCULARSTRING (3 0,5 0,3 0))')
         g3 = g1.Union(g2)
         if g3.ExportToWkt() != 'MULTISURFACE (CURVEPOLYGON (CIRCULARSTRING (0 0,2 0,0 0)),CURVEPOLYGON (CIRCULARSTRING (3 0,5 0,3 0)))':
-            gdaltest.post_reason('fail')
             print(g3)
             return 'fail'
 
@@ -3568,7 +3283,6 @@ def test_ogr_geom_getcurvegeometry():
         g2 = ogr.CreateGeometryFromWkt('CIRCULARSTRING (2 0,1 -1,0 0))')
         g3 = g1.Union(g2)
         if g3.ExportToWkt() != 'MULTICURVE (CIRCULARSTRING (0 0,1 1,2 0),CIRCULARSTRING (2 0,1 -1,0 0))':
-            gdaltest.post_reason('fail')
             print(g3)
             return 'fail'
 
@@ -3576,7 +3290,6 @@ def test_ogr_geom_getcurvegeometry():
         g1 = g1.Buffer(0.5)
         g1 = g1.GetCurveGeometry()
         if g1.ExportToWkt() != 'CURVEPOLYGON (CIRCULARSTRING (1.5 2.0,0.5 2.0,1.5 2.0))':
-            gdaltest.post_reason('fail')
             print(g1)
             return 'fail'
 
@@ -3599,7 +3312,6 @@ def test_ogr_geom_gt_functions():
               (ogr.wkbCircularStringZM, 1)]
     for (gt, res) in tuples:
         if ogr.GT_HasZ(gt) != res:
-            gdaltest.post_reason('fail')
             print(gt)
             return 'fail'
 
@@ -3614,7 +3326,6 @@ def test_ogr_geom_gt_functions():
               (ogr.wkbCircularStringZM, ogr.wkbCircularStringZM)]
     for (gt, res) in tuples:
         if ogr.GT_SetZ(gt) != res:
-            gdaltest.post_reason('fail')
             print(gt)
             return 'fail'
 
@@ -3629,7 +3340,6 @@ def test_ogr_geom_gt_functions():
               (ogr.wkbCircularStringZM, 1)]
     for (gt, res) in tuples:
         if ogr.GT_HasM(gt) != res:
-            gdaltest.post_reason('fail')
             print(gt)
             return 'fail'
 
@@ -3644,7 +3354,6 @@ def test_ogr_geom_gt_functions():
               (ogr.wkbCircularStringZM, ogr.wkbCircularStringZM)]
     for (gt, res) in tuples:
         if ogr.GT_SetM(gt) != res:
-            gdaltest.post_reason('fail')
             print(gt)
             return 'fail'
 
@@ -3669,7 +3378,6 @@ def test_ogr_geom_gt_functions():
               (ogr.wkbCircularStringZ, 0, 0, ogr.wkbCircularString)]
     for (gt, modZ, modM, res) in tuples:
         if ogr.GT_SetModifier(gt, modZ, modM) != res:
-            gdaltest.post_reason('fail')
             print(gt)
             return 'fail'
 
@@ -3685,7 +3393,6 @@ def test_ogr_geom_gt_functions():
               (ogr.wkbCircularStringZM, ogr.wkbCircularString)]
     for (gt, res) in tuples:
         if ogr.GT_Flatten(gt) != res:
-            gdaltest.post_reason('fail')
             print(gt)
             return 'fail'
 
@@ -3707,7 +3414,6 @@ def test_ogr_geom_gt_functions():
              ]
     for (gt, gt2, res) in tuples:
         if ogr.GT_IsSubClassOf(gt, gt2) != res:
-            gdaltest.post_reason('fail')
             print(gt)
             print(gt2)
             return 'fail'
@@ -3730,7 +3436,6 @@ def test_ogr_geom_gt_functions():
               (ogr.wkbTIN, 0)]
     for (gt, res) in tuples:
         if ogr.GT_IsCurve(gt) != res:
-            gdaltest.post_reason('fail')
             print(gt)
             return 'fail'
 
@@ -3750,7 +3455,6 @@ def test_ogr_geom_gt_functions():
               (ogr.wkbTIN, 1)]
     for (gt, res) in tuples:
         if ogr.GT_IsSurface(gt) != res:
-            gdaltest.post_reason('fail')
             print(gt)
             return 'fail'
 
@@ -3766,7 +3470,6 @@ def test_ogr_geom_gt_functions():
               (ogr.wkbPolygon, ogr.wkbMultiPolygon)]
     for (gt, res) in tuples:
         if ogr.GT_GetCollection(gt) != res:
-            gdaltest.post_reason('fail')
             print(gt)
             return 'fail'
 
@@ -3788,7 +3491,6 @@ def test_ogr_geom_gt_functions():
               (ogr.wkbTriangle, 0)]
     for (gt, res) in tuples:
         if ogr.GT_IsNonLinear(gt) != res:
-            gdaltest.post_reason('fail')
             print(gt)
             return 'fail'
 
@@ -3811,7 +3513,6 @@ def test_ogr_geom_gt_functions():
               (ogr.wkbMultiSurface, ogr.wkbMultiSurface)]
     for (gt, res) in tuples:
         if ogr.GT_GetCurve(gt) != res:
-            gdaltest.post_reason('fail')
             print(gt)
             return 'fail'
 
@@ -3834,7 +3535,6 @@ def test_ogr_geom_gt_functions():
               (ogr.wkbMultiSurface, ogr.wkbMultiPolygon)]
     for (gt, res) in tuples:
         if ogr.GT_GetLinear(gt) != res:
-            gdaltest.post_reason('fail')
             print(gt)
             return 'fail'
 
@@ -3899,63 +3599,46 @@ def test_ogr_geom_equals():
     p_0 = ogr.CreateGeometryFromWkt('POINT (0 0)')
     p_1 = ogr.CreateGeometryFromWkt('POINT (1 1)')
     if not p_empty.Equals(p_empty):
-        gdaltest.post_reason('fail')
         return 'fail'
     if not p_0.Equals(p_0):
-        gdaltest.post_reason('fail')
         return 'fail'
     if not p_0.Equals(p_0.Clone()):
-        gdaltest.post_reason('fail')
         return 'fail'
     if p_empty.Equals(p_0):
-        gdaltest.post_reason('fail')
         return 'fail'
     if p_0.Equals(p_empty):
-        gdaltest.post_reason('fail')
         return 'fail'
     if p_0.Equals(p_1):
-        gdaltest.post_reason('fail')
         return 'fail'
 
     l_empty = ogr.Geometry(ogr.wkbLineString)
     l_0_1 = ogr.CreateGeometryFromWkt('LINESTRING (0 0,1 1)')
     l_0_1_2 = ogr.CreateGeometryFromWkt('LINESTRING (0 0,1 1,2 2)')
     if not l_0_1.Equals(l_0_1):
-        gdaltest.post_reason('fail')
         return 'fail'
     if not l_0_1.Equals(l_0_1.Clone()):
-        gdaltest.post_reason('fail')
         return 'fail'
     if l_empty.Equals(l_0_1):
-        gdaltest.post_reason('fail')
         return 'fail'
     if l_0_1.Equals(l_empty):
-        gdaltest.post_reason('fail')
         return 'fail'
     if l_0_1.Equals(l_0_1_2):
-        gdaltest.post_reason('fail')
         return 'fail'
 
     gc_empty = ogr.Geometry(ogr.wkbGeometryCollection)
     gc_p_0 = ogr.CreateGeometryFromWkt('GEOMETRYCOLLECTION (POINT (0 0))')
     gc_p_1 = ogr.CreateGeometryFromWkt('GEOMETRYCOLLECTION (POINT (1 1))')
     if not gc_empty.Equals(gc_empty):
-        gdaltest.post_reason('fail')
         return 'fail'
     if not gc_p_0.Equals(gc_p_0):
-        gdaltest.post_reason('fail')
         return 'fail'
     if not gc_p_0.Equals(gc_p_0.Clone()):
-        gdaltest.post_reason('fail')
         return 'fail'
     if gc_empty.Equals(gc_p_0):
-        gdaltest.post_reason('fail')
         return 'fail'
     if gc_p_0.Equals(gc_empty):
-        gdaltest.post_reason('fail')
         return 'fail'
     if gc_p_0.Equals(gc_p_1):
-        gdaltest.post_reason('fail')
         return 'fail'
 
     return 'success'
@@ -4008,7 +3691,6 @@ def test_ogr_geom_measured_geometries_to_2D_or_3D():
         geom = ogr.CreateGeometryFromWkt(before)
         geom.FlattenTo2D()
         if geom.ExportToIsoWkt() != after_2D:
-            gdaltest.post_reason('fail')
             print(before)
             print(after_2D)
             print(geom.ExportToIsoWkt())
@@ -4017,7 +3699,6 @@ def test_ogr_geom_measured_geometries_to_2D_or_3D():
         geom = ogr.CreateGeometryFromWkt(before)
         geom.SetCoordinateDimension(2)
         if geom.ExportToIsoWkt() != after_2D:
-            gdaltest.post_reason('fail')
             print(before)
             print(after_2D)
             print(geom.ExportToIsoWkt())
@@ -4026,7 +3707,6 @@ def test_ogr_geom_measured_geometries_to_2D_or_3D():
         geom = ogr.CreateGeometryFromWkt(before)
         geom.SetCoordinateDimension(3)
         if geom.ExportToIsoWkt() != after_3D:
-            gdaltest.post_reason('fail')
             print(before)
             print(after_3D)
             print(geom.ExportToIsoWkt())
@@ -4037,31 +3717,25 @@ def test_ogr_geom_measured_geometries_to_2D_or_3D():
         geom.Set3D(geom.Is3D())
         geom.SetMeasured(geom.IsMeasured())
         if geom.ExportToIsoWkt() != before:
-            gdaltest.post_reason('fail')
             print(before)
             print(geom.ExportToIsoWkt())
             return 'fail'
 
     if ogr.CreateGeometryFromWkt('POINT (1 2)').CoordinateDimension() != 2:
-        gdaltest.post_reason('fail')
         return 'fail'
 
     if ogr.CreateGeometryFromWkt('POINT M (1 2 3)').CoordinateDimension() != 3:
-        gdaltest.post_reason('fail')
         return 'fail'
 
     if ogr.CreateGeometryFromWkt('POINT Z (1 2 3)').CoordinateDimension() != 3:
-        gdaltest.post_reason('fail')
         return 'fail'
 
     if ogr.CreateGeometryFromWkt('POINT ZM (1 2 3 4)').CoordinateDimension() != 4:
-        gdaltest.post_reason('fail')
         return 'fail'
 
     # Unrelated test. Test old-style unqualified non-bracketted ZM import
     g = ogr.CreateGeometryFromWkt('MULTIPOINT (1 2 3 4)')
     if g.ExportToIsoWkt() != 'MULTIPOINT ZM ((1 2 3 4))':
-        gdaltest.post_reason('fail')
         print(g.ExportToIsoWkt())
         return 'fail'
 
@@ -4079,7 +3753,6 @@ def test_ogr_geom_postgis_ewkt_xym():
     for (before, after) in list_wkt:
         geom = ogr.CreateGeometryFromWkt(before)
         if geom.ExportToIsoWkt() != after:
-            gdaltest.post_reason('fail')
             print(before)
             print(after)
             print(geom.ExportToIsoWkt())
@@ -4104,7 +3777,6 @@ def test_ogr_geom_curve_surface():
 
     for (wkb_type, name) in tests:
         if ogr.GeometryTypeToName(wkb_type) != name:
-            gdaltest.post_reason('fail')
             print(wkb_type)
             print(name)
             print(ogr.GeometryTypeToName(wkb_type))
@@ -4158,7 +3830,6 @@ def test_ogr_geom_import_corrupted_wkb():
                 if g:
                     g2 = ogr.CreateGeometryFromWkb(g.ExportToIsoWkb())
                     if not g.Equals(g2):
-                        gdaltest.post_reason('fail')
                         print(wkt, i, method)
                         return 'fail'
                 wkb[i] = init_val
@@ -4171,7 +3842,6 @@ def test_ogr_geom_import_corrupted_wkb():
                 else:
                     g = ogr.CreateGeometryFromWkb(str(wkb[0:i]))
             if g is not None:
-                gdaltest.post_reason('fail')
                 print(wkt, i)
                 return 'fail'
 
@@ -4204,55 +3874,46 @@ def test_ogr_geom_triangle_ps_tin_conversion():
             if (g.GetGeometryType() == ogr.wkbTIN or g.GetGeometryType() == ogr.wkbPolyhedralSurface) and g2.GetGeometryType() == ogr.wkbCurvePolygon:
                 wkt_expected = wkt
             if got_wkt != wkt_expected:
-                gdaltest.post_reason('fail')
                 print(wkt, wkt_target, got_wkt, wkt_expected)
                 return 'fail'
 
     g = ogr.ForceTo(ogr.CreateGeometryFromWkt('POLYGON ((0 0,0 1,1 1,1 0,0 0))'), ogr.wkbTriangle)
     if g.GetGeometryType() != ogr.wkbPolygon:
-        gdaltest.post_reason('fail')
         print(g.ExportToWkt())
         return 'fail'
 
     g = ogr.ForceTo(ogr.CreateGeometryFromWkt('POLYHEDRALSURFACE (((0 0,0 1,1 1,1 0,0 0)))'), ogr.wkbTIN)
     if g.GetGeometryType() != ogr.wkbPolyhedralSurface:
-        gdaltest.post_reason('fail')
         print(g.ExportToWkt())
         return 'fail'
 
     g = ogr.ForceTo(ogr.CreateGeometryFromWkt('GEOMETRYCOLLECTION (POLYHEDRALSURFACE (((0 0,0 1,1 1,1 0,0 0))))'), ogr.wkbMultiPolygon)
     if g.ExportToWkt() != 'MULTIPOLYGON (((0 0,0 1,1 1,1 0,0 0)))':
-        gdaltest.post_reason('fail')
         print(g.ExportToWkt())
         return 'fail'
 
     g = ogr.ForceTo(ogr.CreateGeometryFromWkt('GEOMETRYCOLLECTION (TRIANGLE ((0 0,0 1,1 1,0 0)))'), ogr.wkbMultiPolygon)
     if g.ExportToWkt() != 'MULTIPOLYGON (((0 0,0 1,1 1,0 0)))':
-        gdaltest.post_reason('fail')
         print(g.ExportToWkt())
         return 'fail'
 
     g = ogr.ForceTo(ogr.CreateGeometryFromWkt('MULTIPOLYGON (((0 0,0 1,1 1,0 0)))'), ogr.wkbGeometryCollection)
     if g.ExportToWkt() != 'GEOMETRYCOLLECTION (POLYGON ((0 0,0 1,1 1,0 0)))':
-        gdaltest.post_reason('fail')
         print(g.ExportToWkt())
         return 'fail'
 
     g = ogr.ForceTo(ogr.CreateGeometryFromWkt('TRIANGLE ((0 0,0 1,1 1,0 0))'), ogr.wkbGeometryCollection)
     if g.ExportToWkt() != 'GEOMETRYCOLLECTION (TRIANGLE ((0 0,0 1,1 1,0 0)))':
-        gdaltest.post_reason('fail')
         print(g.ExportToWkt())
         return 'fail'
 
     g = ogr.ForceTo(ogr.CreateGeometryFromWkt('TIN (((0 0,0 1,1 1,0 0)))'), ogr.wkbGeometryCollection)
     if g.ExportToWkt() != 'GEOMETRYCOLLECTION (POLYGON ((0 0,0 1,1 1,0 0)))':
-        gdaltest.post_reason('fail')
         print(g.ExportToWkt())
         return 'fail'
 
     g = ogr.ForceTo(ogr.CreateGeometryFromWkt('POLYHEDRALSURFACE (((0 0,0 1,1 1,0 0)))'), ogr.wkbGeometryCollection)
     if g.ExportToWkt() != 'GEOMETRYCOLLECTION (POLYGON ((0 0,0 1,1 1,0 0)))':
-        gdaltest.post_reason('fail')
         print(g.ExportToWkt())
         return 'fail'
 
@@ -4266,14 +3927,12 @@ def test_ogr_geom_multipoint_envelope_bug():
     g = ogr.CreateGeometryFromWkt('MULTIPOINT(0 0,1 1)')
     minx, maxx, miny, maxy = g.GetEnvelope()
     if (minx, maxx, miny, maxy) != (0, 1, 0, 1):
-        gdaltest.post_reason('fail')
         print(minx, maxx, miny, maxy)
         return 'fail'
 
     g = ogr.CreateGeometryFromWkt('MULTIPOINT(0 0 0,1 1 1)')
     minx, maxx, miny, maxy, minz, maxz = g.GetEnvelope3D()
     if (minx, maxx, miny, maxy, minz, maxz) != (0, 1, 0, 1, 0, 1):
-        gdaltest.post_reason('fail')
         print(minx, maxx, miny, maxy, minz, maxz)
         return 'fail'
 
@@ -4304,10 +3963,8 @@ def test_ogr_geom_polygon_intersects_point():
     point = ogr.Geometry(ogr.wkbPoint)
     point.AddPoint(10, 0)
     if poly.Intersects(point) != 1:
-        gdaltest.post_reason('fail')
         return 'fail'
     if poly.Contains(point) != 0:
-        gdaltest.post_reason('fail')
         return 'fail'
 
     return 'success'
@@ -4387,108 +4044,84 @@ def test_ogr_geom_remove_geometry():
     # With GEOMETRYCOLLECTION
     g = ogr.CreateGeometryFromWkt('GEOMETRYCOLLECTION (POINT (1 2),LINESTRING (1 2,2 3),POINT (3 4))')
     if g.RemoveGeometry(3) == 0 or g.RemoveGeometry(-2) == 0:
-        gdaltest.post_reason('fail')
         return 'fail'
 
     if g.RemoveGeometry(1) != 0:
-        gdaltest.post_reason('fail')
         return 'fail'
     if g.ExportToWkt() != 'GEOMETRYCOLLECTION (POINT (1 2),POINT (3 4))':
-        gdaltest.post_reason('fail')
         print(g)
         return 'fail'
 
     if g.RemoveGeometry(1) != 0:
-        gdaltest.post_reason('fail')
         return 'fail'
     if g.ExportToWkt() != 'GEOMETRYCOLLECTION (POINT (1 2))':
-        gdaltest.post_reason('fail')
         print(g)
         return 'fail'
 
     if g.RemoveGeometry(0) != 0:
-        gdaltest.post_reason('fail')
         return 'fail'
     if g.ExportToWkt() != 'GEOMETRYCOLLECTION EMPTY':
-        gdaltest.post_reason('fail')
         print(g)
         return 'fail'
 
     g = ogr.CreateGeometryFromWkt('GEOMETRYCOLLECTION (POINT (1 2),LINESTRING (1 2,2 3),POINT (3 4))')
     if g.RemoveGeometry(-1) != 0:
-        gdaltest.post_reason('fail')
         return 'fail'
     if g.ExportToWkt() != 'GEOMETRYCOLLECTION EMPTY':
-        gdaltest.post_reason('fail')
         print(g)
         return 'fail'
 
     # With POLYHEDRALSURFACE/TIN
     g = ogr.CreateGeometryFromWkt('TIN (((0 0,0 1,1 1,0 0)),((0 0,1 0,1 1,0 0)))')
     if g.RemoveGeometry(2) == 0 or g.RemoveGeometry(-2) == 0:
-        gdaltest.post_reason('fail')
         return 'fail'
 
     if g.RemoveGeometry(1) != 0:
-        gdaltest.post_reason('fail')
         return 'fail'
     if g.ExportToWkt() != 'TIN (((0 0,0 1,1 1,0 0)))':
-        gdaltest.post_reason('fail')
         print(g)
         return 'fail'
 
     if g.RemoveGeometry(0) != 0:
-        gdaltest.post_reason('fail')
         return 'fail'
     if g.ExportToWkt() != 'TIN EMPTY':
-        gdaltest.post_reason('fail')
         print(g)
         return 'fail'
 
     g = ogr.CreateGeometryFromWkt('TIN (((0 0,0 1,1 1,0 0)),((0 0,1 0,1 1,0 0)))')
     if g.RemoveGeometry(-1) != 0:
-        gdaltest.post_reason('fail')
         return 'fail'
     if g.ExportToWkt() != 'TIN EMPTY':
-        gdaltest.post_reason('fail')
         print(g)
         return 'fail'
 
     # With POLYGON
     g = ogr.CreateGeometryFromWkt('POLYGON ((0 0,0 10,10 10,10 0,0 0),(1 1,1 9,9 9,1 1))')
     if g.RemoveGeometry(2) == 0 or g.RemoveGeometry(-2) == 0:
-        gdaltest.post_reason('fail')
         return 'fail'
 
     if g.RemoveGeometry(1) != 0:
-        gdaltest.post_reason('fail')
         return 'fail'
     if g.ExportToWkt() != 'POLYGON ((0 0,0 10,10 10,10 0,0 0))':
-        gdaltest.post_reason('fail')
         print(g)
         return 'fail'
 
     if g.RemoveGeometry(0) != 0:
-        gdaltest.post_reason('fail')
         return 'fail'
     if g.ExportToWkt() != 'POLYGON EMPTY':
-        gdaltest.post_reason('fail')
         print(g)
         return 'fail'
 
     g = ogr.CreateGeometryFromWkt('POLYGON ((0 0,0 10,10 10,10 0,0 0),(1 1,1 9,9 9,1 1))')
     if g.RemoveGeometry(-1) != 0:
-        gdaltest.post_reason('fail')
         return 'fail'
     if g.ExportToWkt() != 'POLYGON EMPTY':
-        gdaltest.post_reason('fail')
         print(g)
         return 'fail'
 
     # Unsupported type
     g = ogr.CreateGeometryFromWkt('POINT (0 0)')
     if g.RemoveGeometry(0) == 0:
-        gdaltest.post_reason('fail')
         return 'fail'
 
     return 'success'
diff --git a/autotest/ogr/ogr_gml_geom.py b/autotest/ogr/ogr_gml_geom.py
index ef7e15d48914..d21a10e89231 100755
--- a/autotest/ogr/ogr_gml_geom.py
+++ b/autotest/ogr/ogr_gml_geom.py
@@ -1860,7 +1860,6 @@ def test_gml_srsDimension_topgeometry():
     geom = ogr.CreateGeometryFromGML(gml)
 
     if geom.ExportToWkt() != 'POLYGON ((0 0 10,0 1 10,1 1 10,1 0 10,0 0 10))':
-        gdaltest.post_reason('fail')
         print(geom.ExportToWkt())
         return 'fail'
 
@@ -1876,20 +1875,17 @@ def test_gml_Arc():
     geom = ogr.CreateGeometryFromGML(gml)
 
     if ogrtest.check_feature_geometry(geom, ogr.CreateGeometryFromWkt('CIRCULARSTRING (1 0,0 1,-1 0)')) != 0:
-        gdaltest.post_reason('fail')
         print(geom)
         return 'fail'
 
     gml2 = geom.ExportToGML(['FORMAT=GML3'])
     expected_gml2 = '<gml:Curve><gml:segments><gml:ArcString><gml:posList>1 0 0 1 -1 0</gml:posList></gml:ArcString></gml:segments></gml:Curve>'
     if gml2 != expected_gml2:
-        gdaltest.post_reason('fail')
         print(gml2)
         return 'fail'
 
     geom2 = ogr.CreateGeometryFromGML(gml2)
     if not geom.Equals(geom2):
-        gdaltest.post_reason('fail')
         print(geom2)
         return 'fail'
 
@@ -1905,7 +1901,6 @@ def test_gml_ArcByBulge():
     geom = ogr.CreateGeometryFromGML(gml)
 
     if ogrtest.check_feature_geometry(geom, ogr.CreateGeometryFromWkt('CIRCULARSTRING (2 0,0 2,-2 0)')) != 0:
-        gdaltest.post_reason('fail')
         print(geom)
         return 'fail'
 
@@ -1921,7 +1916,6 @@ def test_gml_ArcByCenterPoint():
     geom = ogr.CreateGeometryFromGML(gml)
 
     if ogrtest.check_feature_geometry(geom, ogr.CreateGeometryFromWkt('CIRCULARSTRING (1 4,-1 2,1 0)')) != 0:
-        gdaltest.post_reason('fail')
         print(geom)
         return 'fail'
 
@@ -1984,7 +1978,6 @@ def test_gml_CompoundCurve_of_ArcByCenterPoint():
     geom = ogr.CreateGeometryFromGML(gml)
 
     if ogrtest.check_feature_geometry(geom, ogr.CreateGeometryFromWkt('POLYGON ((-80.4 33.86,-80.27 33.63,-80.305028054229538 33.622017309598967,-80.335422529369936 33.613343178471617,-80.366464292754429 33.606448070493634,-80.398003921948742 33.601365147653873,-80.429889693662162 33.598118851265042,-80.461968286017793 33.596724788982847,-80.494085487001527 33.597189662699385,-80.52608690656875 33.599511237590342,-80.557818688893789 33.603678352435914,-80.589128223167393 33.609670971175497,-80.619864849221443 33.617460275496377,-80.63 33.62,-80.39 33.85))')) != 0:
-        gdaltest.post_reason('fail')
         print(geom)
         return 'fail'
 
@@ -2000,7 +1993,6 @@ def test_gml_CircleByCenterPoint():
     geom = ogr.CreateGeometryFromGML(gml)
 
     if ogrtest.check_feature_geometry(geom, ogr.CreateGeometryFromWkt('CIRCULARSTRING (-1 2,3 2,-1 2)')) != 0:
-        gdaltest.post_reason('fail')
         print(geom)
         return 'fail'
 
@@ -2027,13 +2019,11 @@ def test_gml_Circle():
     gml2 = geom.ExportToGML(['FORMAT=GML3'])
     expected_gml2 = '<gml:Curve><gml:segments><gml:Circle><gml:posList>0 0 1 1 2 0</gml:posList></gml:Circle></gml:segments></gml:Curve>'
     if gml2 != expected_gml2:
-        gdaltest.post_reason('fail')
         print(gml2)
         return 'fail'
 
     geom2 = ogr.CreateGeometryFromGML(gml2)
     if geom2.ExportToWkt() != 'CIRCULARSTRING (0 0,1 1,2 0,1 -1,0 0)':
-        gdaltest.post_reason('fail')
         print(geom2)
         return 'fail'
 
@@ -2041,7 +2031,6 @@ def test_gml_Circle():
     gml2 = geom.ExportToGML(['FORMAT=GML3'])
     expected_gml2 = '<gml:Curve><gml:segments><gml:Circle><gml:posList srsDimension="3">0 0 10 1 1 10 2 0 10</gml:posList></gml:Circle></gml:segments></gml:Curve>'
     if gml2 != expected_gml2:
-        gdaltest.post_reason('fail')
         print(gml2)
         return 'fail'
 
@@ -2091,13 +2080,11 @@ def test_gml_ArcString():
     gml2 = geom.ExportToGML(['FORMAT=GML3'])
     expected_gml2 = '<gml:Curve><gml:segments><gml:ArcString><gml:posList>-2 0 -1 -1 0 0 1 -1 2 0 0 2 -2 0</gml:posList></gml:ArcString></gml:segments></gml:Curve>'
     if gml2 != expected_gml2:
-        gdaltest.post_reason('fail')
         print(gml2)
         return 'fail'
 
     geom2 = ogr.CreateGeometryFromGML(gml2)
     if geom2.ExportToWkt() != 'CIRCULARSTRING (-2 0,-1 -1,0 0,1 -1,2 0,0 2,-2 0)':
-        gdaltest.post_reason('fail')
         print(geom2)
         return 'fail'
 
@@ -2114,7 +2101,6 @@ def test_gml_OGRCompoundCurve():
     gml = geom.ExportToGML(['FORMAT=GML3'])
     expected_gml = '<gml:CompositeCurve><gml:curveMember><gml:LineString><gml:posList>0 0 1 1 2 0</gml:posList></gml:LineString></gml:curveMember></gml:CompositeCurve>'
     if gml != expected_gml:
-        gdaltest.post_reason('fail')
         print(gml)
         return 'fail'
 
@@ -2136,7 +2122,6 @@ def test_gml_OGRCompoundCurve():
 
     gml2 = geom.ExportToGML(['FORMAT=GML3'])
     if gml2 != gml:
-        gdaltest.post_reason('fail')
         print(gml2)
         return 'fail'
 
@@ -2205,7 +2190,6 @@ def test_gml_OGRCurvePolygon():
     gml2 = geom.ExportToGML(['FORMAT=GML3'])
     expected_gml2 = '<gml:Polygon><gml:exterior><gml:Curve><gml:segments><gml:Circle><gml:posList>0 0 0.5 0.5 1 0</gml:posList></gml:Circle></gml:segments></gml:Curve></gml:exterior></gml:Polygon>'
     if gml2 != expected_gml2:
-        gdaltest.post_reason('fail')
         print(gml2)
         return 'fail'
 
@@ -2319,7 +2303,6 @@ def test_gml_OGRMultiSurface():
     gml2 = geom.ExportToGML(['FORMAT=GML3'])
     expected_gml2 = '<gml:MultiSurface><gml:surfaceMember><gml:Polygon><gml:exterior><gml:LinearRing><gml:posList>0 0 0 1 1 1 1 0 0 0</gml:posList></gml:LinearRing></gml:exterior></gml:Polygon></gml:surfaceMember></gml:MultiSurface>'
     if gml2 != expected_gml2:
-        gdaltest.post_reason('fail')
         print(gml2)
         return 'fail'
 
@@ -2342,7 +2325,6 @@ def test_gml_OGRMultiCurve():
 
     gml2 = geom.ExportToGML(['FORMAT=GML3'])
     if gml2 != gml:
-        gdaltest.post_reason('fail')
         print(gml2)
         return 'fail'
 
diff --git a/autotest/ogr/ogr_gml_read.py b/autotest/ogr/ogr_gml_read.py
index ebae82bd1e09..cc5833dbf31d 100755
--- a/autotest/ogr/ogr_gml_read.py
+++ b/autotest/ogr/ogr_gml_read.py
@@ -1123,7 +1123,6 @@ def test_ogr_gml_27():
     lyr = ds.GetLayer(0)
 
     if lyr.GetGeomType() != ogr.wkbPolygon25D:
-        gdaltest.post_reason('fail')
         print(lyr.GetGeomType())
         return 'fail'
 
@@ -1150,7 +1149,6 @@ def test_ogr_gml_28():
     ds = ogr.Open('tmp/ogr_gml_28.gml')
     lyr = ds.GetLayer(0)
     if lyr.GetGeomType() != ogr.wkbNone:
-        gdaltest.post_reason('fail')
         return 'fail'
     ds = None
 
@@ -1159,7 +1157,6 @@ def test_ogr_gml_28():
     ds = ogr.Open('tmp/ogr_gml_28.gml')
     lyr = ds.GetLayer(0)
     if lyr.GetGeomType() != ogr.wkbNone:
-        gdaltest.post_reason('fail')
         return 'fail'
     ds = None
 
@@ -1167,7 +1164,6 @@ def test_ogr_gml_28():
     ds = ogr.Open('tmp/ogr_gml_28.gml')
     lyr = ds.GetLayer(0)
     if lyr.GetGeomType() != ogr.wkbNone:
-        gdaltest.post_reason('fail')
         return 'fail'
     ds = None
 
@@ -2015,11 +2011,9 @@ def test_ogr_gml_48():
     lyr = ds.GetLayer(0)
 
     if lyr.GetGeomType() != ogr.wkbUnknown:
-        gdaltest.post_reason('failure')
         return 'fail'
 
     if lyr.GetLayerDefn().GetFieldDefn(0).GetType() != ogr.OFTString:
-        gdaltest.post_reason('failure')
         return 'fail'
 
     ds = None
@@ -2051,7 +2045,6 @@ def test_ogr_gml_49():
     lyr = ds.GetLayer(0)
     feat = lyr.GetNextFeature()
     if feat.GetGeometryRef().GetGeometryType() != ogr.wkbPolygon:
-        gdaltest.post_reason('failure')
         return 'fail'
     ds = None
 
@@ -2060,7 +2053,6 @@ def test_ogr_gml_49():
     lyr = ds.GetLayer(0)
     feat = lyr.GetNextFeature()
     if feat.GetGeometryRef().GetGeometryType() != ogr.wkbPolygon:
-        gdaltest.post_reason('failure')
         return 'fail'
     ds = None
 
@@ -2098,15 +2090,12 @@ def test_ogr_gml_50():
     lyr = ds.GetLayer(0)
     feat = lyr.GetNextFeature()
     if feat.GetFieldAsStringList(lyr.GetLayerDefn().GetFieldIndex('stringlist')) != ['a', 'b']:
-        gdaltest.post_reason('fail')
         feat.DumpReadable()
         return 'fail'
     if feat.GetFieldAsIntegerList(lyr.GetLayerDefn().GetFieldIndex('intlist')) != [2, 3]:
-        gdaltest.post_reason('fail')
         feat.DumpReadable()
         return 'fail'
     if feat.GetFieldAsDoubleList(lyr.GetLayerDefn().GetFieldIndex('reallist')) != [4.56, 5.67]:
-        gdaltest.post_reason('fail')
         feat.DumpReadable()
         return 'fail'
     ds = None
@@ -2137,25 +2126,20 @@ def test_ogr_gml_51():
         content = f.read()
         f.close()
         if content.find("<FeatureCollection") == -1:
-            gdaltest.post_reason('fail')
             print(content)
             return 'fail'
         if frmt == 'GML3':
             if content.find("<featureMember>") == -1:
-                gdaltest.post_reason('fail')
                 print(content)
                 return 'fail'
         if content.find("""<poly""") == -1:
-            gdaltest.post_reason('fail')
             print(content)
             return 'fail'
         if content.find("""<AREA>215229.266</AREA>""") == -1:
-            gdaltest.post_reason('fail')
             print(content)
             return 'fail'
 
         if content.find("""<gml:boundedBy><gml:Envelope><gml:lowerCorner>479647""") != -1:
-            gdaltest.post_reason('fail')
             print(content)
             return 'fail'
 
@@ -2188,15 +2172,12 @@ def test_ogr_gml_52():
 
         lyr = ds.GetLayerByName('A')
         if lyr.GetGeomType() != ogr.wkbPoint25D:
-            gdaltest.post_reason('fail')
             return 'fail'
         srs = lyr.GetSpatialRef()
         if srs is None:
-            gdaltest.post_reason('fail')
             return 'fail'
         wkt = srs.ExportToWkt()
         if wkt.find('3067') < 0:
-            gdaltest.post_reason('fail')
             print(wkt)
             return 'fail'
 
@@ -2207,31 +2188,25 @@ def test_ogr_gml_52():
                 feat.GetField('teksti') != 'En francais !' or \
                 feat.GetField('teksti_kieli') != 'fr' or \
                 ogrtest.check_feature_geometry(feat, 'POINT (280000 7000000 0)') != 0:
-            gdaltest.post_reason('fail')
             feat.DumpReadable()
             return 'fail'
 
         lyr = ds.GetLayerByName('B')
         if lyr.GetGeomType() != ogr.wkbPolygon25D:
-            gdaltest.post_reason('fail')
             return 'fail'
         srs = lyr.GetSpatialRef()
         if srs is None:
-            gdaltest.post_reason('fail')
             return 'fail'
         feat = lyr.GetNextFeature()
         if ogrtest.check_feature_geometry(feat, 'POLYGON ((280000 7000000 0,281000 7000000 0,281000 7001000 0,280000 7001000 0,280000 7000000 0))') != 0:
-            gdaltest.post_reason('fail')
             feat.DumpReadable()
             return 'fail'
 
         lyr = ds.GetLayerByName('C')
         if lyr.GetGeomType() != ogr.wkbLineString25D:
-            gdaltest.post_reason('fail')
             return 'fail'
         feat = lyr.GetNextFeature()
         if ogrtest.check_feature_geometry(feat, 'LINESTRING (280000 7000000 0,281000 7000000 0,281000 7001000 0,280000 7001000 0,280000 7000000 0)') != 0:
-            gdaltest.post_reason('fail')
             feat.DumpReadable()
             return 'fail'
 
@@ -2252,7 +2227,6 @@ def test_ogr_gml_53():
 
     ds = ogr.Open('data/archsites.xsd')
     if ds is not None:
-        gdaltest.post_reason('fail')
         return 'fail'
     ds = None
 
@@ -2271,14 +2245,12 @@ def test_ogr_gml_54():
 
     ds = ogr.Open('data/empty.gml')
     if ds is None:
-        gdaltest.post_reason('fail')
         return 'fail'
     ds = None
 
     # with .gfs now
     ds = ogr.Open('data/empty.gml')
     if ds is None:
-        gdaltest.post_reason('fail')
         return 'fail'
     ds = None
 
@@ -2327,49 +2299,37 @@ def test_ogr_gml_56():
     gdal.SetConfigOption('GML_REGISTRY', None)
     lyr = ds.GetLayerByName('mainFeature')
     if lyr.GetSpatialRef() is None:
-        gdaltest.post_reason('fail')
         return 'fail'
     feat = lyr.GetNextFeature()
     if feat.GetFieldAsString(feat.GetFieldIndex('subFeatureProperty_href')) != '#subFeature.0':
-        gdaltest.post_reason('fail')
         return 'fail'
     if feat.GetFieldAsStringList(feat.GetFieldIndex('subFeatureRepeatedProperty_href')) != ['#subFeatureRepeated.0', '#subFeatureRepeated.1']:
-        gdaltest.post_reason('fail')
         return 'fail'
     if feat.GetGeomFieldRef(0).ExportToWkt() != 'POLYGON ((0 0,0 1,1 1,1 0,0 0))':
-        gdaltest.post_reason('fail')
         return 'fail'
     if feat.GetGeomFieldRef(1).ExportToWkt() != 'POINT (10 10)':
-        gdaltest.post_reason('fail')
         return 'fail'
 
     lyr = ds.GetLayerByName('subFeature')
     if lyr.GetLayerDefn().GetGeomFieldCount() != 0:
-        gdaltest.post_reason('fail')
         return 'fail'
     feat = lyr.GetNextFeature()
     if feat.GetFieldAsStringList(feat.GetFieldIndex('subFeatureRepeatedProperty_href')) != ['#subFeatureRepeated.2']:
-        gdaltest.post_reason('fail')
         return 'fail'
     if feat.GetField('foo') != 'bar':
-        gdaltest.post_reason('fail')
         return 'fail'
 
     lyr = ds.GetLayerByName('subFeatureRepeated')
     feat = lyr.GetNextFeature()
     if feat.GetField('gml_id') != 'subFeatureRepeated.2':
-        gdaltest.post_reason('fail')
         return 'fail'
     if feat.GetField('bar') != 'baz':
-        gdaltest.post_reason('fail')
         return 'fail'
     feat = lyr.GetNextFeature()
     if feat.GetField('gml_id') != 'subFeatureRepeated.0':
-        gdaltest.post_reason('fail')
         return 'fail'
     feat = lyr.GetNextFeature()
     if feat.GetField('gml_id') != 'subFeatureRepeated.1':
-        gdaltest.post_reason('fail')
         return 'fail'
     ds = None
 
@@ -2396,11 +2356,9 @@ def test_ogr_gml_57():
             options = ['FORMAT=GML3.2']
         ds = ogr.GetDriverByName('GML').CreateDataSource('/vsimem/ogr_gml_57.gml', options=options)
         if ds.TestCapability(ogr.ODsCCreateGeomFieldAfterCreateLayer) != 1:
-            gdaltest.post_reason('fail')
             return 'fail'
         lyr = ds.CreateLayer('myLayer', geom_type=ogr.wkbNone)
         if lyr.TestCapability(ogr.OLCCreateGeomField) != 1:
-            gdaltest.post_reason('fail')
             return 'fail'
         geomfielddefn = ogr.GeomFieldDefn('first_geometry', ogr.wkbPoint)
         if i == 1 or i == 2:
@@ -2434,19 +2392,14 @@ def test_ogr_gml_57():
         lyr = ds.GetLayer(0)
         feat = lyr.GetNextFeature()
         if i == 1 and feat.GetGeomFieldRef(0).GetSpatialReference().ExportToWkt().find('32630') < 0:
-            gdaltest.post_reason('fail')
             return 'fail'
         if i == 1 and feat.GetGeomFieldRef(1).GetSpatialReference().ExportToWkt().find('32630') < 0:
-            gdaltest.post_reason('fail')
             return 'fail'
         if i == 2 and feat.GetGeomFieldRef(1).GetSpatialReference().ExportToWkt().find('32631') < 0:
-            gdaltest.post_reason('fail')
             return 'fail'
         if feat.GetGeomFieldRef(0).ExportToWkt() != 'POINT (0 1)':
-            gdaltest.post_reason('fail')
             return 'fail'
         if feat.GetGeomFieldRef(1).ExportToWkt() != 'LINESTRING (2 3,4 5)':
-            gdaltest.post_reason('fail')
             return 'fail'
         ds = None
 
@@ -2470,19 +2423,14 @@ def test_ogr_gml_58():
     lyr = ds.GetLayer(0)
     lyr_defn = lyr.GetLayerDefn()
     if lyr_defn.GetGeomFieldCount() != 2:
-        gdaltest.post_reason('fail')
         return 'fail'
     if lyr_defn.GetGeomFieldDefn(0).GetName() != 'geometry':
-        gdaltest.post_reason('fail')
         return 'fail'
     if lyr_defn.GetGeomFieldDefn(0).GetType() != ogr.wkbMultiPolygon:
-        gdaltest.post_reason('fail')
         return 'fail'
     if lyr_defn.GetGeomFieldDefn(1).GetName() != 'referencePoint':
-        gdaltest.post_reason('fail')
         return 'fail'
     if lyr_defn.GetGeomFieldDefn(1).GetType() != ogr.wkbPoint:
-        gdaltest.post_reason('fail')
         return 'fail'
 
     feat = lyr.GetNextFeature()
@@ -2505,13 +2453,10 @@ def test_ogr_gml_58():
             print(key)
             print(val)
             print(feat.GetField(key))
-            gdaltest.post_reason('fail')
             return 'fail'
     if feat.GetGeomFieldRef(0).ExportToWkt() != 'MULTIPOLYGON (((2 49,2 50,3 50,3 49)))':
-        gdaltest.post_reason('fail')
         return 'fail'
     if feat.GetGeomFieldRef(1).ExportToWkt() != 'POINT (2.5 49.5)':
-        gdaltest.post_reason('fail')
         return 'fail'
 
     feat = lyr.GetNextFeature()
@@ -2534,13 +2479,10 @@ def test_ogr_gml_58():
             print(key)
             print(val)
             print(feat.GetField(key))
-            gdaltest.post_reason('fail')
             return 'fail'
     if feat.GetGeomFieldRef(0).ExportToWkt() != 'MULTIPOLYGON (((2 49,2 50,3 50,3 49)))':
-        gdaltest.post_reason('fail')
         return 'fail'
     if feat.GetGeomFieldRef(1) is not None:
-        gdaltest.post_reason('fail')
         return 'fail'
     feat = None
     lyr = None
@@ -2550,7 +2492,6 @@ def test_ogr_gml_58():
     lyr = ds.GetLayer(0)
     lyr_defn = lyr.GetLayerDefn()
     if lyr_defn.GetGeomFieldCount() != 0:
-        gdaltest.post_reason('fail')
         return 'fail'
 
     feat = lyr.GetNextFeature()
@@ -2570,7 +2511,6 @@ def test_ogr_gml_58():
             print(key)
             print(val)
             print(feat.GetField(key))
-            gdaltest.post_reason('fail')
             return 'fail'
 
     feat = lyr.GetNextFeature()
@@ -2590,7 +2530,6 @@ def test_ogr_gml_58():
             print(key)
             print(val)
             print(feat.GetField(key))
-            gdaltest.post_reason('fail')
             return 'fail'
     feat = None
     lyr = None
@@ -2600,13 +2539,10 @@ def test_ogr_gml_58():
     lyr = ds.GetLayer(0)
     lyr_defn = lyr.GetLayerDefn()
     if lyr_defn.GetGeomFieldCount() != 1:
-        gdaltest.post_reason('fail')
         return 'fail'
     if lyr_defn.GetGeomFieldDefn(0).GetName() != 'geometry':
-        gdaltest.post_reason('fail')
         return 'fail'
     if lyr_defn.GetGeomFieldDefn(0).GetType() != ogr.wkbLineString:
-        gdaltest.post_reason('fail')
         return 'fail'
 
     feat = lyr.GetNextFeature()
@@ -2625,10 +2561,8 @@ def test_ogr_gml_58():
             print(key)
             print(val)
             print(feat.GetField(key))
-            gdaltest.post_reason('fail')
             return 'fail'
     if feat.GetGeomFieldRef(0).ExportToWkt() != 'LINESTRING (2 49,3 50)':
-        gdaltest.post_reason('fail')
         return 'fail'
 
     feat = lyr.GetNextFeature()
@@ -2647,10 +2581,8 @@ def test_ogr_gml_58():
             print(key)
             print(val)
             print(feat.GetField(key))
-            gdaltest.post_reason('fail')
             return 'fail'
     if feat.GetGeomFieldRef(0).ExportToWkt() != 'LINESTRING (2 49,3 50)':
-        gdaltest.post_reason('fail')
         return 'fail'
     feat = None
     lyr = None
@@ -2660,19 +2592,14 @@ def test_ogr_gml_58():
     lyr = ds.GetLayer(0)
     lyr_defn = lyr.GetLayerDefn()
     if lyr_defn.GetGeomFieldCount() != 2:
-        gdaltest.post_reason('fail')
         return 'fail'
     if lyr_defn.GetGeomFieldDefn(0).GetName() != 'geometry':
-        gdaltest.post_reason('fail')
         return 'fail'
     if lyr_defn.GetGeomFieldDefn(0).GetType() != ogr.wkbMultiPolygon:
-        gdaltest.post_reason('fail')
         return 'fail'
     if lyr_defn.GetGeomFieldDefn(1).GetName() != 'referencePoint':
-        gdaltest.post_reason('fail')
         return 'fail'
     if lyr_defn.GetGeomFieldDefn(1).GetType() != ogr.wkbPoint:
-        gdaltest.post_reason('fail')
         return 'fail'
 
     feat = lyr.GetNextFeature()
@@ -2702,13 +2629,10 @@ def test_ogr_gml_58():
             print(key)
             print(val)
             print(feat.GetField(key))
-            gdaltest.post_reason('fail')
             return 'fail'
     if feat.GetGeomFieldRef(0).ExportToWkt() != 'MULTIPOLYGON (((2 49,2 50,3 50,3 49)))':
-        gdaltest.post_reason('fail')
         return 'fail'
     if feat.GetGeomFieldRef(1).ExportToWkt() != 'POINT (2.5 49.5)':
-        gdaltest.post_reason('fail')
         return 'fail'
 
     feat = lyr.GetNextFeature()
@@ -2738,13 +2662,10 @@ def test_ogr_gml_58():
             print(key)
             print(val)
             print(feat.GetField(key))
-            gdaltest.post_reason('fail')
             return 'fail'
     if feat.GetGeomFieldRef(0).ExportToWkt() != 'MULTIPOLYGON (((2 49,2 50,3 50,3 49)))':
-        gdaltest.post_reason('fail')
         return 'fail'
     if feat.GetGeomFieldRef(1) is not None:
-        gdaltest.post_reason('fail')
         return 'fail'
     feat = None
     lyr = None
@@ -2788,7 +2709,6 @@ def test_ogr_gml_59():
             print(key)
             print(val)
             print(feat.GetField(key))
-            gdaltest.post_reason('fail')
             return 'fail'
     feat = None
     lyr = None
@@ -2813,19 +2733,15 @@ def test_ogr_gml_60():
         ds = ogr.Open('data/wfs_200_multiplelayers.gml')
         lyr = ds.GetLayerByName('road')
         if lyr.GetFeatureCount() != 1:
-            gdaltest.post_reason('fail')
             return 'fail'
         feat = lyr.GetNextFeature()
         if feat.GetField('gml_id') != 'road.21':
-            gdaltest.post_reason('fail')
             return 'fail'
         lyr = ds.GetLayerByName('popplace')
         if lyr.GetFeatureCount() != 1:
-            gdaltest.post_reason('fail')
             return 'fail'
         feat = lyr.GetNextFeature()
         if feat.GetField('gml_id') != 'popplace.BACMK':
-            gdaltest.post_reason('fail')
             return 'fail'
         ds = None
 
@@ -2865,23 +2781,19 @@ def test_ogr_gml_61():
 
     feat = lyr.GetNextFeature()
     if feat.GetField('gml_id') != 'Object.1' or feat.GetField('foo') != 'bar':
-        gdaltest.post_reason('fail')
         feat.DumpReadable()
         return 'fail'
     geom = feat.GetGeometryRef()
     if geom.ExportToWkt() != 'POLYGON ((2 48,2 49,3 49,3 48,2 48))':
-        gdaltest.post_reason('fail')
         feat.DumpReadable()
         return 'fail'
 
     feat = lyr.GetNextFeature()
     if feat.GetField('gml_id') != 'Object.2' or feat.GetField('foo') != 'baz':
-        gdaltest.post_reason('fail')
         feat.DumpReadable()
         return 'fail'
     geom = feat.GetGeometryRef()
     if geom.ExportToWkt() != 'POLYGON ((2 -48,2 -49,3 -49,3 -48,2 -48))':
-        gdaltest.post_reason('fail')
         feat.DumpReadable()
         return 'fail'
 
@@ -2905,7 +2817,6 @@ def test_ogr_gml_62():
     ds = ogr.Open('tmp/gmlattributes.gml')
     lyr = ds.GetLayer(0)
     if lyr.GetLayerDefn().GetFieldCount() != 1:
-        gdaltest.post_reason('fail')
         return 'fail'
     ds = None
 
@@ -2921,7 +2832,6 @@ def test_ogr_gml_62():
             gdal.SetConfigOption('GML_ATTRIBUTES_TO_OGR_FIELDS', None)
         lyr = ds.GetLayer(0)
         if lyr.GetLayerDefn().GetFieldCount() != 4:
-            gdaltest.post_reason('fail')
             print(i)
             return 'fail'
         feat = lyr.GetNextFeature()
@@ -2929,7 +2839,6 @@ def test_ogr_gml_62():
                 feat.GetField('element2_attr1') != 'a' or \
                 feat.GetField('element2') != 'foo' or \
                 feat.IsFieldSet('element3_attr1'):
-            gdaltest.post_reason('fail')
             feat.DumpReadable()
             print(i)
             return 'fail'
@@ -2938,7 +2847,6 @@ def test_ogr_gml_62():
                 feat.IsFieldSet('element2_attr1') or \
                 feat.IsFieldSet('element2') or \
                 feat.GetField('element3_attr1') != 1:
-            gdaltest.post_reason('fail')
             feat.DumpReadable()
             print(i)
             return 'fail'
@@ -2947,7 +2855,6 @@ def test_ogr_gml_62():
                 feat.IsFieldSet('element2_attr1') or \
                 feat.IsFieldSet('element2') or \
                 feat.IsFieldSet('element3_attr1'):
-            gdaltest.post_reason('fail')
             feat.DumpReadable()
             print(i)
             return 'fail'
@@ -3052,14 +2959,12 @@ def test_ogr_gml_65():
         gdal.VSIFCloseL(f)
 
         if data.find(expected) < 0:
-            gdaltest.post_reason('fail')
             return 'fail'
 
         ds = ogr.Open(filename)
         lyr = ds.GetLayer(0)
         feat = lyr.GetNextFeature()
         if feat.GetGeometryRef().ExportToWkt() != "MULTIPOLYGON (((0 1 2,3 4 5,6 7 8,0 1 2)))":
-            gdaltest.post_reason('fail')
             feat.DumpReadable()
             return 'fail'
         ds = None
@@ -3214,107 +3119,86 @@ def test_ogr_gml_66():
 
         lyr = ds.GetLayerByName('compoundcurve')
         if lyr.GetGeomType() != ogr.wkbCompoundCurve:
-            gdaltest.post_reason('fail')
             return 'fail'
         feat = lyr.GetNextFeature()
         if feat.GetGeometryRef().ExportToWkt() != 'COMPOUNDCURVE (CIRCULARSTRING (0 0,1 1,2 0))':
-            gdaltest.post_reason('fail')
             feat.DumpReadable()
             return 'fail'
         feat = lyr.GetNextFeature()
         if feat.GetGeometryRef().ExportToWkt() != 'COMPOUNDCURVE (CIRCULARSTRING (0 0,1 1,2 0))':
-            gdaltest.post_reason('fail')
             feat.DumpReadable()
             return 'fail'
         feat = lyr.GetNextFeature()
         if feat.GetGeometryRef().ExportToWkt() != 'COMPOUNDCURVE ((0 0,1 1,2 0))':
-            gdaltest.post_reason('fail')
             feat.DumpReadable()
             return 'fail'
 
         lyr = ds.GetLayerByName('curvepolygon')
         if lyr.GetGeomType() != ogr.wkbCurvePolygon:
-            gdaltest.post_reason('fail')
             return 'fail'
         feat = lyr.GetNextFeature()
         if feat.GetGeometryRef().ExportToWkt() != 'CURVEPOLYGON (CIRCULARSTRING (0 0,0.5 0.5,1 0,0.5 -0.5,0 0))':
-            gdaltest.post_reason('fail')
             feat.DumpReadable()
             return 'fail'
         feat = lyr.GetNextFeature()
         if feat.GetGeometryRef().ExportToWkt() != 'CURVEPOLYGON ((0 0,0 1,1 1,0 0))':
-            gdaltest.post_reason('fail')
             feat.DumpReadable()
             return 'fail'
 
         lyr = ds.GetLayerByName('multisurface')
         if lyr.GetGeomType() != ogr.wkbMultiSurface:
-            gdaltest.post_reason('fail')
             return 'fail'
         feat = lyr.GetNextFeature()
         if feat.GetGeometryRef().ExportToWkt() != 'MULTISURFACE (CURVEPOLYGON (CIRCULARSTRING (0 0,0.5 0.5,1 0,0.5 -0.5,0 0)))':
-            gdaltest.post_reason('fail')
             feat.DumpReadable()
             return 'fail'
         feat = lyr.GetNextFeature()
         if feat.GetGeometryRef().ExportToWkt() != 'MULTISURFACE (((0 0,0 1,1 1,0 0)))':
-            gdaltest.post_reason('fail')
             feat.DumpReadable()
             return 'fail'
 
         lyr = ds.GetLayerByName('multicurve')
         if lyr.GetGeomType() != ogr.wkbMultiCurve:
-            gdaltest.post_reason('fail')
             return 'fail'
         feat = lyr.GetNextFeature()
         if feat.GetGeometryRef().ExportToWkt() != 'MULTICURVE (CIRCULARSTRING (0 0,0.5 0.5,1 0,0.5 -0.5,0 0))':
-            gdaltest.post_reason('fail')
             feat.DumpReadable()
             return 'fail'
         feat = lyr.GetNextFeature()
         if feat.GetGeometryRef().ExportToWkt() != 'MULTICURVE ((0 0,0 1,1 1,0 0))':
-            gdaltest.post_reason('fail')
             feat.DumpReadable()
             return 'fail'
 
         lyr = ds.GetLayerByName('polygon')
         if lyr.GetGeomType() != ogr.wkbPolygon:
-            gdaltest.post_reason('fail')
             return 'fail'
         feat = lyr.GetNextFeature()
         if feat.GetGeometryRef().ExportToWkt() != 'POLYGON ((0 0,0 1,1 1,0 0))':
-            gdaltest.post_reason('fail')
             feat.DumpReadable()
             return 'fail'
 
         lyr = ds.GetLayerByName('linestring')
         if lyr.GetGeomType() != ogr.wkbLineString:
-            gdaltest.post_reason('fail')
             return 'fail'
         feat = lyr.GetNextFeature()
         if feat.GetGeometryRef().ExportToWkt() != 'LINESTRING (0 0,0 1,1 1,0 0)':
-            gdaltest.post_reason('fail')
             feat.DumpReadable()
             return 'fail'
 
         lyr = ds.GetLayerByName('multipolygon')
         if lyr.GetGeomType() != ogr.wkbMultiPolygon:
             print(lyr.GetGeomType())
-            gdaltest.post_reason('fail')
             return 'fail'
         feat = lyr.GetNextFeature()
         if feat.GetGeometryRef().ExportToWkt() != 'MULTIPOLYGON (((0 0,0 1,1 1,0 0)))':
-            gdaltest.post_reason('fail')
             feat.DumpReadable()
             return 'fail'
 
         lyr = ds.GetLayerByName('multilinestring')
         if lyr.GetGeomType() != ogr.wkbMultiLineString:
-            gdaltest.post_reason('fail')
             return 'fail'
         feat = lyr.GetNextFeature()
         if feat.GetGeometryRef().ExportToWkt() != 'MULTILINESTRING ((0 0,0 1,1 1,0 0))':
-            gdaltest.post_reason('fail')
             feat.DumpReadable()
             return 'fail'
 
@@ -3322,88 +3206,72 @@ def test_ogr_gml_66():
         if i != 0:
             if lyr.GetGeomType() != ogr.wkbCompoundCurve:
                 print(lyr.GetGeomType())
-                gdaltest.post_reason('fail')
                 return 'fail'
             feat = lyr.GetNextFeature()
             if feat.GetGeometryRef().ExportToWkt() != 'COMPOUNDCURVE ((0 0,1 1,2 0))':
-                gdaltest.post_reason('fail')
                 feat.DumpReadable()
                 return 'fail'
         else:
             feat = lyr.GetNextFeature()
             if feat.GetGeometryRef().ExportToWkt() != 'LINESTRING (0 0,1 1,2 0)':
-                gdaltest.post_reason('fail')
                 feat.DumpReadable()
                 return 'fail'
         feat = lyr.GetNextFeature()
         if feat.GetGeometryRef().ExportToWkt() != 'COMPOUNDCURVE (CIRCULARSTRING (0 0,1 1,2 0))':
-            gdaltest.post_reason('fail')
             feat.DumpReadable()
             return 'fail'
 
         lyr = ds.GetLayerByName('curvepolygon_untyped')
         if i != 0:
             if lyr.GetGeomType() != ogr.wkbCurvePolygon:
-                gdaltest.post_reason('fail')
                 return 'fail'
             feat = lyr.GetNextFeature()
             if feat.GetGeometryRef().ExportToWkt() != 'CURVEPOLYGON ((0 0,0 1,1 1,0 0))':
-                gdaltest.post_reason('fail')
                 feat.DumpReadable()
                 return 'fail'
         else:
             feat = lyr.GetNextFeature()
             if feat.GetGeometryRef().ExportToWkt() != 'POLYGON ((0 0,0 1,1 1,0 0))':
-                gdaltest.post_reason('fail')
                 feat.DumpReadable()
                 return 'fail'
         feat = lyr.GetNextFeature()
         if feat.GetGeometryRef().ExportToWkt() != 'CURVEPOLYGON (CIRCULARSTRING (0 0,0.5 0.5,1 0,0.5 -0.5,0 0))':
-            gdaltest.post_reason('fail')
             feat.DumpReadable()
             return 'fail'
 
         lyr = ds.GetLayerByName('multisurface_untyped')
         if i != 0:
             if lyr.GetGeomType() != ogr.wkbMultiSurface:
-                gdaltest.post_reason('fail')
                 return 'fail'
             feat = lyr.GetNextFeature()
             if feat.GetGeometryRef().ExportToWkt() != 'MULTISURFACE (((0 0,0 1,1 1,0 0)))':
-                gdaltest.post_reason('fail')
                 feat.DumpReadable()
                 return 'fail'
         else:
             feat = lyr.GetNextFeature()
             if feat.GetGeometryRef().ExportToWkt() != 'MULTIPOLYGON (((0 0,0 1,1 1,0 0)))':
-                gdaltest.post_reason('fail')
                 feat.DumpReadable()
                 return 'fail'
         feat = lyr.GetNextFeature()
         if feat.GetGeometryRef().ExportToWkt() != 'MULTISURFACE (CURVEPOLYGON (CIRCULARSTRING (0 0,0.5 0.5,1 0,0.5 -0.5,0 0)))':
-            gdaltest.post_reason('fail')
             feat.DumpReadable()
             return 'fail'
 
         lyr = ds.GetLayerByName('multicurve_untyped')
         if i != 0:
             if lyr.GetGeomType() != ogr.wkbMultiCurve:
-                gdaltest.post_reason('fail')
                 return 'fail'
             feat = lyr.GetNextFeature()
             if feat.GetGeometryRef().ExportToWkt() != 'MULTICURVE ((0 0,0 1,1 1,0 0))':
-                gdaltest.post_reason('fail')
                 feat.DumpReadable()
                 return 'fail'
         else:
             feat = lyr.GetNextFeature()
             if feat.GetGeometryRef().ExportToWkt() != 'MULTILINESTRING ((0 0,0 1,1 1,0 0))':
-                gdaltest.post_reason('fail')
                 feat.DumpReadable()
                 return 'fail'
         feat = lyr.GetNextFeature()
         if feat.GetGeometryRef().ExportToWkt() != 'MULTICURVE (CIRCULARSTRING (0 0,1 1,2 0))':
-            gdaltest.post_reason('fail')
             feat.DumpReadable()
             return 'fail'
 
@@ -3474,43 +3342,35 @@ def test_ogr_gml_67():
         if lyr.GetLayerDefn().GetFieldDefn(lyr.GetLayerDefn().GetFieldIndex('b1')).GetType() != ogr.OFTInteger or \
            lyr.GetLayerDefn().GetFieldDefn(lyr.GetLayerDefn().GetFieldIndex('b1')).GetSubType() != ogr.OFSTBoolean:
             print(i)
-            gdaltest.post_reason('fail')
             return 'fail'
         if lyr.GetLayerDefn().GetFieldDefn(lyr.GetLayerDefn().GetFieldIndex('bool_list')).GetType() != ogr.OFTIntegerList or \
            lyr.GetLayerDefn().GetFieldDefn(lyr.GetLayerDefn().GetFieldIndex('bool_list')).GetSubType() != ogr.OFSTBoolean:
             print(i)
-            gdaltest.post_reason('fail')
             return 'fail'
         if i == 0:
             if lyr.GetLayerDefn().GetFieldDefn(lyr.GetLayerDefn().GetFieldIndex('short')).GetType() != ogr.OFTInteger or \
                     lyr.GetLayerDefn().GetFieldDefn(lyr.GetLayerDefn().GetFieldIndex('short')).GetSubType() != ogr.OFSTInt16:
                 print(i)
-                gdaltest.post_reason('fail')
                 return 'fail'
         if i == 0:
             if lyr.GetLayerDefn().GetFieldDefn(lyr.GetLayerDefn().GetFieldIndex('float')).GetType() != ogr.OFTReal or \
                     lyr.GetLayerDefn().GetFieldDefn(lyr.GetLayerDefn().GetFieldIndex('float')).GetSubType() != ogr.OFSTFloat32:
                 print(i)
-                gdaltest.post_reason('fail')
                 return 'fail'
         if lyr.GetLayerDefn().GetFieldDefn(lyr.GetLayerDefn().GetFieldIndex('int64')).GetType() != ogr.OFTInteger64:
             print(i)
-            gdaltest.post_reason('fail')
             return 'fail'
         if lyr.GetLayerDefn().GetFieldDefn(lyr.GetLayerDefn().GetFieldIndex('int64list')).GetType() != ogr.OFTInteger64List:
             print(i)
-            gdaltest.post_reason('fail')
             return 'fail'
         f = lyr.GetNextFeature()
         if f.GetField('b1') != 1 or f.GetField('b2') != 0 or f.GetFieldAsString('bool_list') != '(2:1,0)' or f.GetField('short') != -32768 or f.GetField('float') != 1.23:
             print(i)
-            gdaltest.post_reason('fail')
             f.DumpReadable()
             return 'fail'
         f = lyr.GetNextFeature()
         if f.GetFID() != 1234567890123 or f.GetField('int64') != 1234567890123 or f.GetField('int64list') != [1, 1234567890123]:
             print(i)
-            gdaltest.post_reason('fail')
             f.DumpReadable()
             return 'fail'
         ds = None
@@ -3587,7 +3447,6 @@ def test_ogr_gml_69():
     ret = lyr.CreateFeature(f)
     gdal.PopErrorHandler()
     if ret == 0:
-        gdaltest.post_reason('fail')
         return 'fail'
     f = None
 
@@ -3598,7 +3457,6 @@ def test_ogr_gml_69():
     ret = lyr.CreateFeature(f)
     gdal.PopErrorHandler()
     if ret == 0:
-        gdaltest.post_reason('fail')
         return 'fail'
     f = None
 
@@ -3607,16 +3465,12 @@ def test_ogr_gml_69():
     ds = gdal.OpenEx('/vsimem/ogr_gml_69.gml', open_options=['EMPTY_AS_NULL=NO'])
     lyr = ds.GetLayerByName('test')
     if lyr.GetLayerDefn().GetFieldDefn(lyr.GetLayerDefn().GetFieldIndex('field_not_nullable')).IsNullable() != 0:
-        gdaltest.post_reason('fail')
         return 'fail'
     if lyr.GetLayerDefn().GetFieldDefn(lyr.GetLayerDefn().GetFieldIndex('field_nullable')).IsNullable() != 1:
-        gdaltest.post_reason('fail')
         return 'fail'
     if lyr.GetLayerDefn().GetGeomFieldDefn(lyr.GetLayerDefn().GetGeomFieldIndex('geomfield_not_nullable')).IsNullable() != 0:
-        gdaltest.post_reason('fail')
         return 'fail'
     if lyr.GetLayerDefn().GetGeomFieldDefn(lyr.GetLayerDefn().GetGeomFieldIndex('geomfield_nullable')).IsNullable() != 1:
-        gdaltest.post_reason('fail')
         return 'fail'
     ds = None
 
@@ -3653,7 +3507,6 @@ def test_ogr_gml_70():
     lyr = ds.GetLayerByName('test')
     f = lyr.GetNextFeature()
     if f.GetField('field_string') != 'a':
-        gdaltest.post_reason('fail')
         f.DumpReadable()
         return 'fail'
     ds = None
@@ -3670,12 +3523,10 @@ def test_ogr_gml_70():
 def ogr_gml_71_helper(ds):
 
     if ds.GetLayerCount() != 1:
-        gdaltest.post_reason('fail')
         print(ds.GetLayerCount())
         return 'fail'
     lyr = ds.GetLayer(0)
     if lyr.GetName() != 'join_table1_table2':
-        gdaltest.post_reason('fail')
         print(lyr.GetName())
         return 'fail'
     fields = [('table1.gml_id', ogr.OFTString),
@@ -3686,31 +3537,25 @@ def ogr_gml_71_helper(ds):
               ('table2.baz', ogr.OFTString)]
     layer_defn = lyr.GetLayerDefn()
     if layer_defn.GetFieldCount() != len(fields):
-        gdaltest.post_reason('fail')
         print(layer_defn.GetFieldCount())
         return 'fail'
     for i, field in enumerate(fields):
         fld_defn = layer_defn.GetFieldDefn(i)
         if fld_defn.GetName() != field[0]:
-            gdaltest.post_reason('fail')
             print(i)
             print(fld_defn.GetName())
             return 'fail'
         if fld_defn.GetType() != field[1]:
-            gdaltest.post_reason('fail')
             print(i)
             print(fld_defn.GetType())
             return 'fail'
     if layer_defn.GetGeomFieldCount() != 2:
-        gdaltest.post_reason('fail')
         print(layer_defn.GetGeomFieldCount())
         return 'fail'
     if layer_defn.GetGeomFieldDefn(0).GetName() != 'table1.geometry':
-        gdaltest.post_reason('fail')
         print(layer_defn.GetGeomFieldDefn(0).GetName())
         return 'fail'
     if layer_defn.GetGeomFieldDefn(1).GetName() != 'table2.geometry':
-        gdaltest.post_reason('fail')
         print(layer_defn.GetGeomFieldDefn(1).GetName())
         return 'fail'
     f = lyr.GetNextFeature()
@@ -3722,7 +3567,6 @@ def ogr_gml_71_helper(ds):
        f.GetField('table2.baz') != 'foo' or \
        f.GetGeomFieldRef(0) is not None or \
        f.GetGeomFieldRef(1).ExportToWkt() != 'POINT (2 49)':
-        gdaltest.post_reason('fail')
         f.DumpReadable()
         return 'fail'
     f = lyr.GetNextFeature()
@@ -3734,7 +3578,6 @@ def ogr_gml_71_helper(ds):
        f.GetField('table2.baz') != 'bar' or \
        f.GetGeomFieldRef(0).ExportToWkt() != 'POINT (3 50)' or \
        f.GetGeomFieldRef(1).ExportToWkt() != 'POINT (2 50)':
-        gdaltest.post_reason('fail')
         f.DumpReadable()
         return 'fail'
 
@@ -3754,7 +3597,6 @@ def test_ogr_gml_71():
 
     try:
         os.unlink('data/wfsjointlayer.gfs')
-        gdaltest.post_reason('fail')
         return 'fail'
     except OSError:
         pass
@@ -3767,7 +3609,6 @@ def test_ogr_gml_71():
     try:
         os.unlink('data/wfsjointlayer.gfs')
     except OSError:
-        gdaltest.post_reason('fail')
         return 'fail'
 
     # Without .xsd nor .gfs
@@ -3780,7 +3621,6 @@ def test_ogr_gml_71():
     try:
         os.stat('tmp/wfsjointlayer.gfs')
     except OSError:
-        gdaltest.post_reason('fail')
         return 'fail'
 
     # With .gfs
@@ -3805,7 +3645,6 @@ def test_ogr_gml_72():
 
     ds = ogr.Open('/vsimem/ogr_gml_72.gml')
     if ds.GetMetadata() != {'NAME': 'name', 'DESCRIPTION': 'description'}:
-        gdaltest.post_reason('fail')
         print(ds.GetMetadata())
         return 'fail'
     ds = None
@@ -3820,7 +3659,6 @@ def test_ogr_gml_72():
 
     ds = ogr.Open('/vsimem/ogr_gml_72.gml')
     if ds.GetMetadata() != {'NAME': 'name', 'DESCRIPTION': 'description'}:
-        gdaltest.post_reason('fail')
         print(ds.GetMetadata())
         return 'fail'
     ds = None
@@ -3962,7 +3800,6 @@ def test_ogr_gml_75():
 
     ds = ogr.Open('/vsimem/ogr_gml_75.xml')
     if ds is not None:
-        gdaltest.post_reason('fail')
         return 'fail'
     gdal.Unlink('/vsimem/ogr_gml_75.xml')
 
@@ -4020,11 +3857,9 @@ def test_ogr_gml_77():
     ds = ogr.Open('/vsimem/ogr_gml_77.xml')
     lyr = ds.GetLayer(0)
     if lyr.GetSpatialRef().ExportToWkt().find('AXIS') >= 0:
-        gdaltest.post_reason('fail')
         return 'fail'
     f = lyr.GetNextFeature()
     if f.GetGeometryRef().ExportToWkt() != 'POINT (2 49)':
-        gdaltest.post_reason('fail')
         return 'fail'
     ds = None
 
@@ -4032,7 +3867,6 @@ def test_ogr_gml_77():
     lyr = ds.GetLayer(0)
     f = lyr.GetNextFeature()
     if f.GetGeometryRef().ExportToWkt() != 'POINT (2 49)':
-        gdaltest.post_reason('fail')
         return 'fail'
     ds = None
 
@@ -4040,7 +3874,6 @@ def test_ogr_gml_77():
     lyr = ds.GetLayer(0)
     f = lyr.GetNextFeature()
     if f.GetGeometryRef().ExportToWkt() != 'POINT (49 2)':
-        gdaltest.post_reason('fail')
         return 'fail'
     ds = None
 
@@ -4076,11 +3909,9 @@ def test_ogr_gml_78():
     ds = ogr.Open('/vsimem/ogr_gml_78.xml')
     lyr = ds.GetLayer(0)
     if lyr.GetSpatialRef().ExportToWkt().find('AXIS') >= 0:
-        gdaltest.post_reason('fail')
         return 'fail'
     f = lyr.GetNextFeature()
     if f.GetGeometryRef().ExportToWkt() != 'POINT (2 49)':
-        gdaltest.post_reason('fail')
         return 'fail'
     ds = None
 
@@ -4088,7 +3919,6 @@ def test_ogr_gml_78():
     lyr = ds.GetLayer(0)
     f = lyr.GetNextFeature()
     if f.GetGeometryRef().ExportToWkt() != 'POINT (49 2)':
-        gdaltest.post_reason('fail')
         return 'fail'
     ds = None
 
@@ -4096,7 +3926,6 @@ def test_ogr_gml_78():
     lyr = ds.GetLayer(0)
     f = lyr.GetNextFeature()
     if f.GetGeometryRef().ExportToWkt() != 'POINT (2 49)':
-        gdaltest.post_reason('fail')
         return 'fail'
     ds = None
 
@@ -4135,7 +3964,6 @@ def test_ogr_gml_79():
             gdal.VSIFCloseL(f)
 
         if data.find(expected_srsname) < 0 or data.find(expected_coords) < 0:
-            gdaltest.post_reason('fail')
             print(srsname_format)
             print(data)
             return 'fail'
@@ -4175,19 +4003,16 @@ def test_ogr_gml_80():
     lyr = ds.GetLayer(0)
     f = lyr.GetNextFeature()
     if f['int_field'] != 4:
-        gdaltest.post_reason('fail')
         f.DumpReadable()
         return 'fail'
 
     f = lyr.GetNextFeature()
     if f['int_field'] is not None:
-        gdaltest.post_reason('fail')
         f.DumpReadable()
         return 'fail'
 
     f = lyr.GetNextFeature()
     if f.IsFieldSet('int_field'):
-        gdaltest.post_reason('fail')
         f.DumpReadable()
         return 'fail'
     f = None
@@ -4237,7 +4062,6 @@ def test_ogr_gml_82():
     ds = ogr.Open('/vsimem/ogr_gml_82.gml')
     lyr = ds.GetLayer(0)
     if lyr.GetFeatureCount() != 10:
-        gdaltest.post_reason('fail')
         return 'fail'
     ds = None
 
@@ -4246,7 +4070,6 @@ def test_ogr_gml_82():
         data = gdal.VSIFReadL(1, 10000, f).decode('utf-8')
         gdal.VSIFCloseL(f)
     if data.find('gml:FeatureCollection') < 0:
-        gdaltest.post_reason('fail')
         print(data)
         return 'fail'
 
@@ -4255,11 +4078,9 @@ def test_ogr_gml_82():
         data = gdal.VSIFReadL(1, 10000, f).decode('utf-8')
         gdal.VSIFCloseL(f)
     if data.find('name = "FeatureCollection"') >= 0:
-        gdaltest.post_reason('fail')
         print(data)
         return 'fail'
     if data.find('gmlsf') >= 0:
-        gdaltest.post_reason('fail')
         print(data)
         return 'fail'
 
diff --git a/autotest/ogr/ogr_gmlas.py b/autotest/ogr/ogr_gmlas.py
index 10a9b8affdae..4e7ff84e1df7 100755
--- a/autotest/ogr/ogr_gmlas.py
+++ b/autotest/ogr/ogr_gmlas.py
@@ -72,7 +72,6 @@ def compare_ogrinfo_output(gmlfile, reffile, options=''):
     expected = open(reffile, 'rb').read().decode('utf-8')
     expected = expected.replace('\r\n', '\n')
     if ret != expected:
-        gdaltest.post_reason('fail')
         print('Got:')
         print(ret.encode('utf-8'))
         open(tmpfilename, 'wb').write(ret.encode('utf-8'))
@@ -100,7 +99,6 @@ def test_ogr_gmlas_basic():
 
     ds = ogr.Open('GMLAS:data/gmlas/gmlas_test1.xml')
     if ds is None:
-        gdaltest.post_reason('fail')
         return 'fail'
     ds = None
 
@@ -163,7 +161,6 @@ def test_ogr_gmlas_virtual_file():
 
     ds = gdal.OpenEx('GMLAS:/vsimem/ogr_gmlas_8.xml')
     if ds is None:
-        gdaltest.post_reason('fail')
         return 'fail'
 
     gdal.Unlink('/vsimem/ogr_gmlas_8.xml')
@@ -182,7 +179,6 @@ def test_ogr_gmlas_datafile_with_xsd_option():
 
     ds = gdal.OpenEx('GMLAS:data/gmlas/gmlas_test1.xml', open_options=['XSD=data/gmlas/gmlas_test1.xsd'])
     if ds is None:
-        gdaltest.post_reason('fail')
         return 'fail'
 
     return 'success'
@@ -198,7 +194,6 @@ def test_ogr_gmlas_no_datafile_with_xsd_option():
 
     ds = gdal.OpenEx('GMLAS:', open_options=['XSD=data/gmlas/gmlas_test1.xsd'])
     if ds is None:
-        gdaltest.post_reason('fail')
         return 'fail'
 
     return 'success'
@@ -215,10 +210,8 @@ def test_ogr_gmlas_no_datafile_xsd_which_is_not_xsd():
     with gdaltest.error_handler():
         ds = gdal.OpenEx('GMLAS:', open_options=['XSD=data/gmlas/gmlas_test1.xml'])
     if ds is not None:
-        gdaltest.post_reason('fail')
         return 'fail'
     if gdal.GetLastErrorMsg().find("invalid content in 'schema' element") < 0:
-        gdaltest.post_reason('fail')
         print(gdal.GetLastErrorMsg())
         return 'fail'
 
@@ -236,10 +229,8 @@ def test_ogr_gmlas_no_datafile_no_xsd():
     with gdaltest.error_handler():
         ds = gdal.OpenEx('GMLAS:')
     if ds is not None:
-        gdaltest.post_reason('fail')
         return 'fail'
     if gdal.GetLastErrorMsg().find('XSD open option must be provided when no XML data file is passed') < 0:
-        gdaltest.post_reason('fail')
         print(gdal.GetLastErrorMsg())
         return 'fail'
 
@@ -257,10 +248,8 @@ def test_ogr_gmlas_non_existing_gml():
     with gdaltest.error_handler():
         ds = gdal.OpenEx('GMLAS:/vsimem/i_do_not_exist.gml')
     if ds is not None:
-        gdaltest.post_reason('fail')
         return 'fail'
     if gdal.GetLastErrorMsg().find('Cannot open /vsimem/i_do_not_exist.gml') < 0:
-        gdaltest.post_reason('fail')
         print(gdal.GetLastErrorMsg())
         return 'fail'
 
@@ -278,10 +267,8 @@ def test_ogr_gmlas_non_existing_xsd():
     with gdaltest.error_handler():
         ds = gdal.OpenEx('GMLAS:', open_options=['XSD=/vsimem/i_do_not_exist.xsd'])
     if ds is not None:
-        gdaltest.post_reason('fail')
         return 'fail'
     if gdal.GetLastErrorMsg().find('Cannot resolve /vsimem/i_do_not_exist.xsd') < 0:
-        gdaltest.post_reason('fail')
         print(gdal.GetLastErrorMsg())
         return 'fail'
 
@@ -302,10 +289,8 @@ def test_ogr_gmlas_gml_without_schema_location():
     with gdaltest.error_handler():
         ds = gdal.OpenEx('GMLAS:/vsimem/ogr_gmlas_gml_without_schema_location.xml')
     if ds is not None:
-        gdaltest.post_reason('fail')
         return 'fail'
     if gdal.GetLastErrorMsg().find('No schema locations found when analyzing data file: XSD open option must be provided') < 0:
-        gdaltest.post_reason('fail')
         print(gdal.GetLastErrorMsg())
         return 'fail'
 
@@ -325,10 +310,8 @@ def test_ogr_gmlas_invalid_schema():
     with gdaltest.error_handler():
         ds = gdal.OpenEx('GMLAS:data/gmlas/gmlas_invalid_schema.xml')
     if ds is not None:
-        gdaltest.post_reason('fail')
         return 'fail'
     if gdal.GetLastErrorMsg().find('invalid content') < 0:
-        gdaltest.post_reason('fail')
         print(gdal.GetLastErrorMsg())
         return 'fail'
 
@@ -348,10 +331,8 @@ def test_ogr_gmlas_invalid_xml():
     with gdaltest.error_handler():
         f = lyr.GetNextFeature()
     if f is not None:
-        gdaltest.post_reason('fail')
         return 'fail'
     if gdal.GetLastErrorMsg().find('input ended before all started tags were ended') < 0:
-        gdaltest.post_reason('fail')
         print(gdal.GetLastErrorMsg())
         return 'fail'
 
@@ -368,7 +349,6 @@ def test_ogr_gmlas_gml_Reference():
 
     ds = ogr.Open('GMLAS:data/gmlas/gmlas_test_targetelement.xml')
     if ds.GetLayerCount() != 3:
-        gdaltest.post_reason('fail')
         print(ds.GetLayerCount())
         return 'fail'
 
@@ -382,7 +362,6 @@ def test_ogr_gmlas_gml_Reference():
        f['reference_existing_abstract_target_elt_href'] != '#BAW' or \
        f.IsFieldSet('reference_existing_abstract_target_elt_nillable_href') or \
        f['reference_existing_abstract_target_elt_nillable_nil'] != 1:
-        gdaltest.post_reason('fail')
         f.DumpReadable()
         return 'fail'
 
@@ -399,32 +378,25 @@ def test_ogr_gmlas_same_element_in_different_ns():
 
     ds = gdal.OpenEx('GMLAS:data/gmlas/gmlas_same_element_in_different_ns.xml')
     if ds is None:
-        gdaltest.post_reason('fail')
         return 'fail'
     # for i in range(ds.GetLayerCount()):
     #    print(ds.GetLayer(i).GetName())
 
     if ds.GetLayerCount() != 5:
-        gdaltest.post_reason('fail')
         print(ds.GetLayerCount())
         return 'fail'
     lyr = ds.GetLayerByName('elt')
     f = lyr.GetNextFeature()
     if f.IsFieldSet('abstractElt_other_ns_realizationOfAbstractElt_pkid') == 0:
-        gdaltest.post_reason('fail')
         f.DumpReadable()
         return 'fail'
     if ds.GetLayerByName('myns_realizationOfAbstractElt') is None:
-        gdaltest.post_reason('fail')
         return 'fail'
     if ds.GetLayerByName('other_ns_realizationOfAbstractElt') is None:
-        gdaltest.post_reason('fail')
         return 'fail'
     if ds.GetLayerByName('elt_elt2_abstractElt_myns_realizationOfAbstractElt') is None:
-        gdaltest.post_reason('fail')
         return 'fail'
     if ds.GetLayerByName('elt_elt2_abstractElt_other_ns_realizationOfAbstractElt') is None:
-        gdaltest.post_reason('fail')
         return 'fail'
 
     return 'success'
@@ -440,7 +412,6 @@ def test_ogr_gmlas_corner_case_relative_path():
 
     ds = ogr.Open('GMLAS:../ogr/data/gmlas/gmlas_test1.xml')
     if ds is None:
-        gdaltest.post_reason('fail')
         return 'fail'
 
     return 'success'
@@ -459,16 +430,13 @@ def test_ogr_gmlas_unexpected_repeated_element():
     with gdaltest.error_handler():
         f = lyr.GetNextFeature()
     if f is None or f['foo'] != 'foo_again':  # somewhat arbitrary to keep the latest one!
-        gdaltest.post_reason('fail')
         f.DumpReadable()
         return 'fail'
     if gdal.GetLastErrorMsg().find('Unexpected element myns:main_elt/myns:foo') < 0:
-        gdaltest.post_reason('fail')
         print(gdal.GetLastErrorMsg())
         return 'fail'
     f = lyr.GetNextFeature()
     if f is not None:
-        gdaltest.post_reason('fail')
         return 'fail'
     ds = None
 
@@ -488,16 +456,13 @@ def test_ogr_gmlas_unexpected_repeated_element_variant():
     with gdaltest.error_handler():
         f = lyr.GetNextFeature()
     if f is None or f['foo'] != 'foo_again':  # somewhat arbitrary to keep the latest one!
-        gdaltest.post_reason('fail')
         f.DumpReadable()
         return 'fail'
     if gdal.GetLastErrorMsg().find('Unexpected element myns:main_elt/myns:foo') < 0:
-        gdaltest.post_reason('fail')
         print(gdal.GetLastErrorMsg())
         return 'fail'
     f = lyr.GetNextFeature()
     if f is not None:
-        gdaltest.post_reason('fail')
         return 'fail'
     ds = None
 
@@ -518,87 +483,71 @@ def test_ogr_gmlas_geometryproperty():
     with gdaltest.error_handler():
         geom_field_count = lyr.GetLayerDefn().GetGeomFieldCount()
     if geom_field_count != 15:
-        gdaltest.post_reason('fail')
         print(geom_field_count)
         return 'fail'
     f = lyr.GetNextFeature()
     if f['geometryProperty_xml'] != ' <gml:Point gml:id="poly.geom.Geometry" srsName="urn:ogc:def:crs:EPSG::4326"> <gml:pos>49 2</gml:pos> </gml:Point> ':
-        gdaltest.post_reason('fail')
         f.DumpReadable()
         return 'fail'
     if not f.IsFieldNull('geometryPropertyEmpty_xml'):
-        gdaltest.post_reason('fail')
         f.DumpReadable()
         return 'fail'
     if f['pointProperty_xml'] != '<gml:Point gml:id="poly.geom.Point"><gml:pos srsName="http://www.opengis.net/def/crs/EPSG/0/4326">50 3</gml:pos></gml:Point>':
-        gdaltest.post_reason('fail')
         f.DumpReadable()
         return 'fail'
     if f['pointPropertyRepeated_xml'] != [
             '<gml:Point gml:id="poly.geom.pointPropertyRepeated.1"><gml:pos>0 1</gml:pos></gml:Point>',
             '<gml:Point gml:id="poly.geom.pointPropertyRepeated.2"><gml:pos>1 2</gml:pos></gml:Point>',
             '<gml:Point gml:id="poly.geom.pointPropertyRepeated.3"><gml:pos>3 4</gml:pos></gml:Point>']:
-        gdaltest.post_reason('fail')
         print(f['pointPropertyRepeated_xml'])
         f.DumpReadable()
         return 'fail'
     geom_idx = lyr.GetLayerDefn().GetGeomFieldIndex('geometryProperty')
     sr = lyr.GetLayerDefn().GetGeomFieldDefn(geom_idx).GetSpatialRef()
     if sr is None or sr.ExportToWkt().find('4326') < 0 or sr.ExportToWkt().find('AXIS') >= 0:
-        gdaltest.post_reason('fail')
         print(sr)
         return 'fail'
     wkt = f.GetGeomFieldRef(geom_idx).ExportToWkt()
     # Axis swapping
     if wkt != 'POINT (2 49)':
-        gdaltest.post_reason('fail')
         f.DumpReadable()
         return 'fail'
     geom_idx = lyr.GetLayerDefn().GetGeomFieldIndex('geometryPropertyEmpty')
     if f.GetGeomFieldRef(geom_idx) is not None:
-        gdaltest.post_reason('fail')
         f.DumpReadable()
         return 'fail'
     geom_idx = lyr.GetLayerDefn().GetGeomFieldIndex('pointProperty')
     sr = lyr.GetLayerDefn().GetGeomFieldDefn(geom_idx).GetSpatialRef()
     if sr is None or sr.ExportToWkt().find('4326') < 0 or sr.ExportToWkt().find('AXIS') >= 0:
-        gdaltest.post_reason('fail')
         print(sr)
         return 'fail'
     wkt = f.GetGeomFieldRef(geom_idx).ExportToWkt()
     if wkt != 'POINT (3 50)':
-        gdaltest.post_reason('fail')
         f.DumpReadable()
         return 'fail'
     geom_idx = lyr.GetLayerDefn().GetGeomFieldIndex('lineStringProperty')
     sr = lyr.GetLayerDefn().GetGeomFieldDefn(geom_idx).GetSpatialRef()
     if sr is None or sr.ExportToWkt().find('4326') < 0 or sr.ExportToWkt().find('AXIS') >= 0:
-        gdaltest.post_reason('fail')
         print(sr)
         return 'fail'
     if lyr.GetLayerDefn().GetGeomFieldDefn(geom_idx).GetType() != ogr.wkbLineString:
-        gdaltest.post_reason('fail')
         print(lyr.GetLayerDefn().GetGeomFieldDefn(geom_idx).GetType())
         return 'fail'
     wkt = f.GetGeomFieldRef(geom_idx).ExportToWkt()
     if wkt != 'LINESTRING (2 49)':
-        gdaltest.post_reason('fail')
         f.DumpReadable()
         return 'fail'
     geom_idx = lyr.GetLayerDefn().GetGeomFieldIndex('pointPropertyRepeated')
     if lyr.GetLayerDefn().GetGeomFieldDefn(geom_idx).GetType() != ogr.wkbUnknown:
-        gdaltest.post_reason('fail')
         print(lyr.GetLayerDefn().GetGeomFieldDefn(geom_idx).GetType())
         return 'fail'
     wkt = f.GetGeomFieldRef(geom_idx).ExportToWkt()
     if wkt != 'GEOMETRYCOLLECTION (POINT (0 1),POINT (1 2),POINT (3 4))':
-        gdaltest.post_reason('fail')
         f.DumpReadable()
         return 'fail'
     geom_idx = lyr.GetLayerDefn().GetGeomFieldIndex('mycustompointproperty_point')
     wkt = f.GetGeomFieldRef(geom_idx).ExportToWkt()
     if wkt != 'POINT (5 6)':
-        gdaltest.post_reason('fail')
         f.DumpReadable()
         return 'fail'
 
@@ -607,7 +556,6 @@ def test_ogr_gmlas_geometryproperty():
     geom_idx = lyr.GetLayerDefn().GetGeomFieldIndex('geometryProperty')
     geom = f.GetGeomFieldRef(geom_idx)
     if ogrtest.check_feature_geometry(geom, 'POINT (3.0 0.0)') != 0:
-        gdaltest.post_reason('fail')
         f.DumpReadable()
         return 'fail'
 
@@ -616,7 +564,6 @@ def test_ogr_gmlas_geometryproperty():
         f = lyr.GetNextFeature()
     geom_idx = lyr.GetLayerDefn().GetGeomFieldIndex('geometryProperty')
     if f.GetGeomFieldRef(geom_idx) is not None:
-        gdaltest.post_reason('fail')
         f.DumpReadable()
         return 'fail'
 
@@ -630,14 +577,12 @@ def test_ogr_gmlas_geometryproperty():
     wkt = f.GetGeomFieldRef(geom_idx).ExportToWkt()
     # Axis swapping
     if wkt != 'POINT (49 2)':
-        gdaltest.post_reason('fail')
         f.DumpReadable()
         return 'fail'
     geom_idx = lyr.GetLayerDefn().GetGeomFieldIndex('lineStringProperty')
     wkt = f.GetGeomFieldRef(geom_idx).ExportToWkt()
     # Axis swapping
     if wkt != 'LINESTRING (2 49)':
-        gdaltest.post_reason('fail')
         f.DumpReadable()
         return 'fail'
 
@@ -651,14 +596,12 @@ def test_ogr_gmlas_geometryproperty():
     wkt = f.GetGeomFieldRef(geom_idx).ExportToWkt()
     # Axis swapping
     if wkt != 'POINT (2 49)':
-        gdaltest.post_reason('fail')
         f.DumpReadable()
         return 'fail'
     geom_idx = lyr.GetLayerDefn().GetGeomFieldIndex('lineStringProperty')
     wkt = f.GetGeomFieldRef(geom_idx).ExportToWkt()
     # Axis swapping
     if wkt != 'LINESTRING (49 2)':
-        gdaltest.post_reason('fail')
         f.DumpReadable()
         return 'fail'
 
@@ -677,29 +620,24 @@ def test_ogr_gmlas_abstractgeometry():
         'CONFIG_FILE=<Configuration><LayerBuildingRules><GML><IncludeGeometryXML>true</IncludeGeometryXML></GML></LayerBuildingRules></Configuration>'])
     lyr = ds.GetLayer(0)
     if lyr.GetLayerDefn().GetGeomFieldCount() != 2:
-        gdaltest.post_reason('fail')
         print(lyr.GetLayerDefn().GetGeomFieldCount())
         return 'fail'
     f = lyr.GetNextFeature()
     if f['AbstractGeometry_xml'] != '<gml:Point gml:id="test.geom.0"><gml:pos>0 1</gml:pos></gml:Point>':
-        gdaltest.post_reason('fail')
         f.DumpReadable()
         return 'fail'
     if f['repeated_AbstractGeometry_xml'] != [
             '<gml:Point gml:id="test.geom.repeated.1"><gml:pos>0 1</gml:pos>',
             '<gml:Point gml:id="test.geom.repeated.2"><gml:pos>1 2</gml:pos>']:
-        gdaltest.post_reason('fail')
         print(f['repeated_AbstractGeometry_xml'])
         f.DumpReadable()
         return 'fail'
     wkt = f.GetGeomFieldRef(0).ExportToWkt()
     if wkt != 'POINT (0 1)':
-        gdaltest.post_reason('fail')
         f.DumpReadable()
         return 'fail'
     wkt = f.GetGeomFieldRef(1).ExportToWkt()
     if wkt != 'GEOMETRYCOLLECTION (POINT (0 1),POINT (1 2))':
-        gdaltest.post_reason('fail')
         f.DumpReadable()
         return 'fail'
 
@@ -726,7 +664,6 @@ def test_ogr_gmlas_validate():
     # By default check we are silent about validation error
     ds = gdal.OpenEx('GMLAS:data/gmlas/gmlas_validate.xml')
     if ds is None:
-        gdaltest.post_reason('fail')
         return 'fail'
     myhandler = MyHandler()
     gdal.PushErrorHandler(myhandler.error_handler)
@@ -736,13 +673,11 @@ def test_ogr_gmlas_validate():
     gdal.SetConfigOption('GMLAS_WARN_UNEXPECTED', 'YES')
     gdal.PopErrorHandler()
     if myhandler.error_list:
-        gdaltest.post_reason('fail')
         print(myhandler.error_list)
         return 'fail'
 
     ds = gdal.OpenEx('GMLAS:data/gmlas/gmlas_validate.xml')
     if ds is None:
-        gdaltest.post_reason('fail')
         return 'fail'
     myhandler = MyHandler()
     gdal.PushErrorHandler(myhandler.error_handler)
@@ -751,7 +686,6 @@ def test_ogr_gmlas_validate():
     gdal.PopErrorHandler()
     # Unexpected element with xpath=myns:main_elt/myns:bar (subxpath=myns:main_elt/myns:bar) found
     if len(myhandler.error_list) < 2:
-        gdaltest.post_reason('fail')
         print(myhandler.error_list)
         return 'fail'
 
@@ -761,11 +695,9 @@ def test_ogr_gmlas_validate():
     ds = gdal.OpenEx('GMLAS:data/gmlas/gmlas_test1.xml', open_options=['VALIDATE=YES'])
     gdal.PopErrorHandler()
     if ds is None:
-        gdaltest.post_reason('fail')
         print(myhandler.error_list)
         return 'fail'
     if myhandler.error_list:
-        gdaltest.post_reason('fail')
         print(myhandler.error_list)
         return 'fail'
 
@@ -779,11 +711,9 @@ def test_ogr_gmlas_validate():
     gdal.PopErrorHandler()
     gdal.Unlink('/vsimem/gmlas_test1.xml')
     if ds is None:
-        gdaltest.post_reason('fail')
         print(myhandler.error_list)
         return 'fail'
     if myhandler.error_list:
-        gdaltest.post_reason('fail')
         print(myhandler.error_list)
         return 'fail'
 
@@ -793,10 +723,8 @@ def test_ogr_gmlas_validate():
     ds = gdal.OpenEx('GMLAS:data/gmlas/gmlas_validate.xml', open_options=['VALIDATE=YES'])
     gdal.PopErrorHandler()
     if ds is None:
-        gdaltest.post_reason('fail')
         return 'fail'
     if len(myhandler.error_list) != 5:
-        gdaltest.post_reason('fail')
         print(myhandler.error_list)
         print(len(myhandler.error_list))
         return 'fail'
@@ -807,10 +735,8 @@ def test_ogr_gmlas_validate():
     ds = gdal.OpenEx('GMLAS:data/gmlas/gmlas_validate.xml', open_options=['VALIDATE=YES', 'FAIL_IF_VALIDATION_ERROR=YES'])
     gdal.PopErrorHandler()
     if ds is not None:
-        gdaltest.post_reason('fail')
         return 'fail'
     if len(myhandler.error_list) != 6:
-        gdaltest.post_reason('fail')
         print(myhandler.error_list)
         print(len(myhandler.error_list))
         return 'fail'
@@ -821,11 +747,9 @@ def test_ogr_gmlas_validate():
     ds = gdal.OpenEx('GMLAS:', open_options=['XSD=data/gmlas/gmlas_test1.xsd', 'VALIDATE=YES'])
     gdal.PopErrorHandler()
     if ds is None:
-        gdaltest.post_reason('fail')
         print(myhandler.error_list)
         return 'fail'
     if myhandler.error_list:
-        gdaltest.post_reason('fail')
         print(myhandler.error_list)
         return 'fail'
 
@@ -846,7 +770,6 @@ def test_ogr_gmlas_test_ns_prefix():
     lyr = ds.GetLayerByName('_ogr_fields_metadata')
     f = lyr.GetNextFeature()
     if f['field_xpath'] != 'myns:main_elt/myns:reference_missing_target_elt/@xlink:href':
-        gdaltest.post_reason('fail')
         f.DumpReadable()
         return 'fail'
 
@@ -865,7 +788,6 @@ def test_ogr_gmlas_no_namespace():
     lyr = ds.GetLayer(0)
     f = lyr.GetNextFeature()
     if f['foo'] != 'bar':
-        gdaltest.post_reason('fail')
         f.DumpReadable()
         return 'fail'
 
@@ -884,7 +806,6 @@ def test_ogr_gmlas_conf():
     with gdaltest.error_handler():
         ds = gdal.OpenEx('GMLAS:data/gmlas/gmlas_test1.xml', open_options=['CONFIG_FILE=not_existing'])
     if ds is not None:
-        gdaltest.post_reason('fail')
         return 'fail'
 
     # Broken conf file
@@ -893,7 +814,6 @@ def test_ogr_gmlas_conf():
         ds = gdal.OpenEx('GMLAS:data/gmlas/gmlas_test1.xml', open_options=['CONFIG_FILE=/vsimem/my_conf.xml'])
     gdal.Unlink('/vsimem/my_conf.xml')
     if ds is not None:
-        gdaltest.post_reason('fail')
         return 'fail'
 
     # Valid XML, but not validating
@@ -906,24 +826,20 @@ def test_ogr_gmlas_conf():
     ds = gdal.OpenEx('GMLAS:data/gmlas/gmlas_test1.xml', open_options=[
         'CONFIG_FILE=<Configuration><LayerBuildingRules><UseArrays>false</UseArrays></LayerBuildingRules></Configuration>'])
     if ds is None:
-        gdaltest.post_reason('fail')
         return 'fail'
     lyr = ds.GetLayerByName('main_elt_string_array')
     if lyr.GetFeatureCount() != 2:
-        gdaltest.post_reason('fail')
         return 'fail'
 
     # AlwaysGenerateOGRId = true
     ds = gdal.OpenEx('GMLAS:data/gmlas/gmlas_test1.xml', open_options=[
         'CONFIG_FILE=<Configuration><LayerBuildingRules><AlwaysGenerateOGRId>true</AlwaysGenerateOGRId></LayerBuildingRules></Configuration>'])
     if ds is None:
-        gdaltest.post_reason('fail')
         return 'fail'
     lyr = ds.GetLayerByName('main_elt')
     f = lyr.GetNextFeature()
     if f['ogr_pkid'].find('main_elt_1') < 0 or \
        f['otherns_id'] != 'otherns_id':
-        gdaltest.post_reason('fail')
         f.DumpReadable()
         return 'fail'
 
@@ -931,18 +847,15 @@ def test_ogr_gmlas_conf():
     ds = gdal.OpenEx('GMLAS:data/gmlas/gmlas_geometryproperty_gml32.gml', open_options=[
         'CONFIG_FILE=<Configuration><LayerBuildingRules><GML><IncludeGeometryXML>false</IncludeGeometryXML></GML></LayerBuildingRules></Configuration>'])
     if ds is None:
-        gdaltest.post_reason('fail')
         return 'fail'
     lyr = ds.GetLayer(0)
     with gdaltest.error_handler():
         if lyr.GetLayerDefn().GetFieldIndex('geometryProperty_xml') >= 0:
-            gdaltest.post_reason('fail')
             return 'fail'
     f = lyr.GetNextFeature()
     geom_idx = lyr.GetLayerDefn().GetGeomFieldIndex('geometryProperty')
     wkt = f.GetGeomFieldRef(geom_idx).ExportToWkt()
     if wkt != 'POINT (2 49)':
-        gdaltest.post_reason('fail')
         f.DumpReadable()
         return 'fail'
 
@@ -950,10 +863,8 @@ def test_ogr_gmlas_conf():
     ds = gdal.OpenEx('GMLAS:data/gmlas/gmlas_abstractgeometry_gml32.gml', open_options=[
         'CONFIG_FILE=<Configuration><ExposeMetadataLayers>true</ExposeMetadataLayers></Configuration>'])
     if ds is None:
-        gdaltest.post_reason('fail')
         return 'fail'
     if ds.GetLayerCount() != 5:
-        gdaltest.post_reason('fail')
         print(ds.GetLayerCount())
         return 'fail'
     # Test override with open option
@@ -961,10 +872,8 @@ def test_ogr_gmlas_conf():
         'EXPOSE_METADATA_LAYERS=NO',
         'CONFIG_FILE=<Configuration><ExposeMetadataLayers>true</ExposeMetadataLayers></Configuration>'])
     if ds is None:
-        gdaltest.post_reason('fail')
         return 'fail'
     if ds.GetLayerCount() != 1:
-        gdaltest.post_reason('fail')
         print(ds.GetLayerCount())
         return 'fail'
 
@@ -973,7 +882,6 @@ def test_ogr_gmlas_conf():
         ds = gdal.OpenEx('GMLAS:data/gmlas/gmlas_validate.xml', open_options=[
             'CONFIG_FILE=<Configuration><Validation enabled="true"><FailIfError>true</FailIfError></Validation></Configuration>'])
     if ds is not None or gdal.GetLastErrorMsg().find('Validation') < 0:
-        gdaltest.post_reason('fail')
         print(gdal.GetLastErrorMsg())
         return 'fail'
 
@@ -1010,7 +918,6 @@ def test_ogr_gmlas_conf_ignored_xpath():
                         </IgnoredXPaths>
                     </Configuration>""" % xpath])
         if gdal.GetLastErrorMsg().find('XPath syntax') < 0:
-            gdaltest.post_reason('fail')
             print(xpath)
             print(gdal.GetLastErrorMsg())
             return 'fail'
@@ -1028,7 +935,6 @@ def test_ogr_gmlas_conf_ignored_xpath():
                     </IgnoredXPaths>
                 </Configuration>"""])
     if gdal.GetLastErrorMsg().find('Prefix ns was already mapped') < 0:
-        gdaltest.post_reason('fail')
         print(gdal.GetLastErrorMsg())
         return 'fail'
 
@@ -1041,16 +947,13 @@ def test_ogr_gmlas_conf_ignored_xpath():
                 </IgnoredXPaths>
             </Configuration>"""])
     if ds is None:
-        gdaltest.post_reason('fail')
         return 'fail'
     lyr = ds.GetLayerByName('main_elt')
     if lyr.GetLayerDefn().GetFieldIndex('otherns_id') >= 0:
-        gdaltest.post_reason('fail')
         return 'fail'
     with gdaltest.error_handler():
         lyr.GetNextFeature()
     if gdal.GetLastErrorMsg().find('Attribute with xpath=myns:main_elt/@otherns:id found in document but ignored') < 0:
-        gdaltest.post_reason('fail')
         print(gdal.GetLastErrorMsg())
         return 'fail'
 
@@ -1065,12 +968,10 @@ def test_ogr_gmlas_conf_ignored_xpath():
                 </IgnoredXPaths>
             </Configuration>"""])
     if ds is None:
-        gdaltest.post_reason('fail')
         return 'fail'
     lyr = ds.GetLayerByName('main_elt')
     lyr.GetNextFeature()
     if gdal.GetLastErrorMsg() != '':
-        gdaltest.post_reason('fail')
         print(gdal.GetLastErrorMsg())
         return 'fail'
 
@@ -1093,33 +994,25 @@ def test_ogr_gmlas_conf_ignored_xpath():
                 </IgnoredXPaths>
             </Configuration>"""])
     if ds is None:
-        gdaltest.post_reason('fail')
         return 'fail'
     lyr = ds.GetLayerByName('main_elt')
 
     # Ignored fields
     if lyr.GetLayerDefn().GetFieldIndex('optionalStrAttr') >= 0:
-        gdaltest.post_reason('fail')
         return 'fail'
     if lyr.GetLayerDefn().GetFieldIndex('fixedValUnset') >= 0:
-        gdaltest.post_reason('fail')
         return 'fail'
     if lyr.GetLayerDefn().GetFieldIndex('base_int') >= 0:
-        gdaltest.post_reason('fail')
         return 'fail'
     if lyr.GetLayerDefn().GetFieldIndex('string') >= 0:
-        gdaltest.post_reason('fail')
         return 'fail'
     if lyr.GetLayerDefn().GetFieldIndex('string_array') >= 0:
-        gdaltest.post_reason('fail')
         return 'fail'
 
     # Present fields
     if lyr.GetLayerDefn().GetFieldIndex('int_array') < 0:
-        gdaltest.post_reason('fail')
         return 'fail'
     if lyr.GetLayerDefn().GetFieldIndex('long') < 0:
-        gdaltest.post_reason('fail')
         return 'fail'
 
     return 'success'
@@ -1214,7 +1107,6 @@ def test_ogr_gmlas_cache():
         ds = gdal.OpenEx('GMLAS:/vsimem/ogr_gmlas_cache.xml', open_options=[
             'CONFIG_FILE=<Configuration><AllowRemoteSchemaDownload>false</AllowRemoteSchemaDownload><SchemaCache><Directory>/vsimem/my/gmlas_cache</Directory></SchemaCache></Configuration>'])
     if ds is not None or gdal.GetLastErrorMsg().find('Cannot resolve') < 0:
-        gdaltest.post_reason('fail')
         print(gdal.GetLastErrorMsg())
         return 'fail'
 
@@ -1223,11 +1115,9 @@ def test_ogr_gmlas_cache():
         ds = gdal.OpenEx('GMLAS:/vsimem/ogr_gmlas_cache.xml', open_options=[
             'CONFIG_FILE=<Configuration><SchemaCache><Directory>/inexisting_directory/not/exist</Directory></SchemaCache></Configuration>'])
     if ds is None:
-        gdaltest.post_reason('fail')
         webserver.server_stop(webserver_process, webserver_port)
         return 'fail'
     if ds.GetLayerCount() != 1:
-        gdaltest.post_reason('fail')
         print(ds.GetLayerCount())
         webserver.server_stop(webserver_process, webserver_port)
         return 'fail'
@@ -1236,11 +1126,9 @@ def test_ogr_gmlas_cache():
     ds = gdal.OpenEx('GMLAS:/vsimem/ogr_gmlas_cache.xml', open_options=[
         'CONFIG_FILE=<Configuration><SchemaCache><Directory>/vsimem/my/gmlas_cache</Directory></SchemaCache></Configuration>'])
     if ds is None:
-        gdaltest.post_reason('fail')
         webserver.server_stop(webserver_process, webserver_port)
         return 'fail'
     if ds.GetLayerCount() != 1:
-        gdaltest.post_reason('fail')
         print(ds.GetLayerCount())
         webserver.server_stop(webserver_process, webserver_port)
         return 'fail'
@@ -1251,11 +1139,9 @@ def test_ogr_gmlas_cache():
     ds = gdal.OpenEx('GMLAS:/vsimem/ogr_gmlas_cache.xml', open_options=[
         'CONFIG_FILE=<Configuration><SchemaCache><Directory>/vsimem/my/gmlas_cache</Directory></SchemaCache></Configuration>'])
     if ds is None:
-        gdaltest.post_reason('fail')
         webserver.server_stop(webserver_process, webserver_port)
         return 'fail'
     if ds.GetLayerCount() != 1:
-        gdaltest.post_reason('fail')
         webserver.server_stop(webserver_process, webserver_port)
         return 'fail'
 
@@ -1264,11 +1150,9 @@ def test_ogr_gmlas_cache():
         'XSD=http://localhost:%d/vsimem/ogr_gmlas_cache.xsd' % webserver_port,
         'CONFIG_FILE=<Configuration><SchemaCache><Directory>/vsimem/my/gmlas_cache</Directory></SchemaCache></Configuration>'])
     if ds is None:
-        gdaltest.post_reason('fail')
         webserver.server_stop(webserver_process, webserver_port)
         return 'fail'
     if ds.GetLayerCount() != 1:
-        gdaltest.post_reason('fail')
         webserver.server_stop(webserver_process, webserver_port)
         return 'fail'
 
@@ -1278,10 +1162,8 @@ def test_ogr_gmlas_cache():
     ds = gdal.OpenEx('GMLAS:/vsimem/ogr_gmlas_cache.xml', open_options=[
         'CONFIG_FILE=<Configuration><SchemaCache><Directory>/vsimem/my/gmlas_cache</Directory></SchemaCache></Configuration>'])
     if ds is None:
-        gdaltest.post_reason('fail')
         return 'fail'
     if ds.GetLayerCount() != 1:
-        gdaltest.post_reason('fail')
         return 'fail'
 
     # Re try but ask for refresh
@@ -1290,7 +1172,6 @@ def test_ogr_gmlas_cache():
             'REFRESH_CACHE=YES',
             'CONFIG_FILE=<Configuration><SchemaCache><Directory>/vsimem/my/gmlas_cache</Directory></SchemaCache></Configuration>'])
     if ds is not None or gdal.GetLastErrorMsg().find('Cannot resolve') < 0:
-        gdaltest.post_reason('fail')
         print(gdal.GetLastErrorMsg())
         webserver.server_stop(webserver_process, webserver_port)
         return 'fail'
@@ -1302,7 +1183,6 @@ def test_ogr_gmlas_cache():
         ds = gdal.OpenEx('GMLAS:/vsimem/ogr_gmlas_cache.xml', open_options=[
             'CONFIG_FILE=<Configuration><SchemaCache><Directory>/vsimem/my/gmlas_cache</Directory></SchemaCache></Configuration>'])
     if ds is not None or gdal.GetLastErrorMsg().find('Cannot resolve') < 0:
-        gdaltest.post_reason('fail')
         print(gdal.GetLastErrorMsg())
         return 'fail'
 
@@ -1332,7 +1212,6 @@ def test_ogr_gmlas_link_nested_independant_child():
     lyr = ds.GetLayer(0)
     f = lyr.GetNextFeature()
     if f['second_my_id'] != 'second_id':
-        gdaltest.post_reason('fail')
         f.DumpReadable()
         return 'fail'
 
@@ -1352,24 +1231,20 @@ def test_ogr_gmlas_composition_compositionPart():
     lyr = ds.GetLayerByName('first_composition')
     f = lyr.GetNextFeature()
     if f.IsFieldSet('parent_ogr_pkid') == 0 or f.IsFieldSet('CompositionPart_pkid') == 0:
-        gdaltest.post_reason('fail')
         f.DumpReadable()
         return 'fail'
     f = lyr.GetNextFeature()
     if f.IsFieldSet('parent_ogr_pkid') == 0 or f.IsFieldSet('CompositionPart_pkid') == 0:
-        gdaltest.post_reason('fail')
         f.DumpReadable()
         return 'fail'
 
     lyr = ds.GetLayerByName('CompositionPart')
     f = lyr.GetNextFeature()
     if f.IsFieldSet('my_id') == 0 or f.IsFieldSet('a') == 0:
-        gdaltest.post_reason('fail')
         f.DumpReadable()
         return 'fail'
     f = lyr.GetNextFeature()
     if f.IsFieldSet('my_id') == 0 or f.IsFieldSet('a') == 0:
-        gdaltest.post_reason('fail')
         f.DumpReadable()
         return 'fail'
 
@@ -1388,7 +1263,6 @@ def test_ogr_gmlas_instantiate_only_gml_feature():
     ds = gdal.OpenEx('GMLAS:',
                      open_options=['XSD=data/gmlas/gmlas_instantiate_only_gml_feature.xsd'])
     if ds.GetLayerCount() != 1:
-        gdaltest.post_reason('fail')
         return 'fail'
     ds = None
 
@@ -1412,7 +1286,6 @@ def test_ogr_gmlas_timestamp_ignored_for_hash():
     lyr = ds.GetLayer(0)
     f = lyr.GetNextFeature()
     if f['ogr_pkid'] != pkid:
-        gdaltest.post_reason('fail')
         print(pkid)
         f.DumpReadable()
         return 'fail'
@@ -1431,7 +1304,6 @@ def test_ogr_gmlas_dataset_getnextfeature():
     ds = gdal.OpenEx('GMLAS:data/gmlas/gmlas_test1.xml')
 
     if ds.TestCapability(ogr.ODsCRandomLayerRead) != 1:
-        gdaltest.post_reason('fail')
         return 'fail'
 
     count = 0
@@ -1440,7 +1312,6 @@ def test_ogr_gmlas_dataset_getnextfeature():
         f, lyr = ds.GetNextFeature()
         if f is None:
             if lyr is not None:
-                gdaltest.post_reason('fail')
                 return 'fail'
             break
         count += 1
@@ -1448,18 +1319,15 @@ def test_ogr_gmlas_dataset_getnextfeature():
 
     base_count = 59
     if count != base_count:
-        gdaltest.post_reason('fail')
         print(count)
         return 'fail'
 
     if last_l.GetName() != 'main_elt':
-        gdaltest.post_reason('fail')
         print(last_l.GetName())
         return 'fail'
 
     f, lyr = ds.GetNextFeature()
     if f is not None or lyr is not None:
-        gdaltest.post_reason('fail')
         return 'fail'
 
     ds.ResetReading()
@@ -1469,11 +1337,9 @@ def test_ogr_gmlas_dataset_getnextfeature():
         last_pct = pct
         if f is None:
             if l is not None:
-                gdaltest.post_reason('fail')
                 return 'fail'
             break
     if last_pct != 1.0:
-        gdaltest.post_reason('fail')
         print(last_pct - 1.0)
         return 'fail'
 
@@ -1492,7 +1358,6 @@ def test_ogr_gmlas_dataset_getnextfeature():
         f, lyr = ds.GetNextFeature()
         if f is None:
             if lyr is not None:
-                gdaltest.post_reason('fail')
                 return 'fail'
             break
         count += 1
@@ -1503,13 +1368,11 @@ def test_ogr_gmlas_dataset_getnextfeature():
     expected_count += fc_map['_ogr_layer_relationships']
     expected_count += fc_map['_ogr_other_metadata']
     if count != expected_count:
-        gdaltest.post_reason('fail')
         print(count)
         return 'fail'
 
     f, lyr = ds.GetNextFeature()
     if f is not None or lyr is not None:
-        gdaltest.post_reason('fail')
         return 'fail'
 
     ds.ResetReading()
@@ -1519,13 +1382,11 @@ def test_ogr_gmlas_dataset_getnextfeature():
         f, lyr = ds.GetNextFeature()
         if f is None:
             if lyr is not None:
-                gdaltest.post_reason('fail')
                 return 'fail'
             break
         count += 1
 
     if count != expected_count:
-        gdaltest.post_reason('fail')
         print(count)
         print(expected_count)
         return 'fail'
@@ -1549,20 +1410,17 @@ def test_ogr_gmlas_dataset_getnextfeature():
             f, lyr = ds.GetNextFeature()
             if f is None:
                 if lyr is not None:
-                    gdaltest.post_reason('fail')
                     return 'fail'
                 break
             count += 1
 
         if count != expected_count:
-            gdaltest.post_reason('fail')
             print(count)
             print(expected_count)
             return 'fail'
 
         f, lyr = ds.GetNextFeature()
         if f is not None or lyr is not None:
-            gdaltest.post_reason('fail')
             return 'fail'
 
     # Test iterating over metadata layers on XSD-only based dataset
@@ -1573,14 +1431,12 @@ def test_ogr_gmlas_dataset_getnextfeature():
         f, lyr = ds.GetNextFeature()
         if f is None:
             if lyr is not None:
-                gdaltest.post_reason('fail')
                 return 'fail'
             break
         count += 1
         last_l = lyr
 
     if count == 0:
-        gdaltest.post_reason('fail')
         print(count)
         return 'fail'
 
@@ -1598,14 +1454,12 @@ def test_ogr_gmlas_inline_identifier():
 
     ds = gdal.OpenEx('GMLAS:', open_options=['XSD=data/gmlas/gmlas_inline_identifier.xsd'])
     if ds.GetLayerCount() != 2:
-        gdaltest.post_reason('fail')
         print(ds.GetLayerCount())
         for i in range(ds.GetLayerCount()):
             print(ds.GetLayer(i).GetName())
         return 'fail'
     lyr = ds.GetLayer(0)
     if lyr.GetLayerDefn().GetFieldIndex('identifier_foo') < 0:
-        gdaltest.post_reason('fail')
         return 'fail'
 
     return 'success'
@@ -1621,16 +1475,13 @@ def test_ogr_gmlas_avoid_same_name_inlined_classes():
 
     ds = gdal.OpenEx('GMLAS:', open_options=['XSD=data/gmlas/gmlas_avoid_same_name_inlined_classes.xsd'])
     if ds.GetLayerCount() != 3:
-        gdaltest.post_reason('fail')
         print(ds.GetLayerCount())
         return 'fail'
     lyr = ds.GetLayerByName('myFeature_ns1_dt')
     if lyr is None:
-        gdaltest.post_reason('fail')
         return 'fail'
     lyr = ds.GetLayerByName('myFeature_ns2_dt')
     if lyr is None:
-        gdaltest.post_reason('fail')
         return 'fail'
 
     return 'success'
@@ -1651,7 +1502,6 @@ def test_ogr_gmlas_validate_ignored_fixed_attribute():
                               'CONFIG_FILE=<Configuration><IgnoredXPaths><XPath>@bar</XPath></IgnoredXPaths></Configuration>'])
     gdal.PopErrorHandler()
     if myhandler.error_list:
-        gdaltest.post_reason('fail')
         print(myhandler.error_list)
         return 'fail'
 
@@ -1670,36 +1520,30 @@ def test_ogr_gmlas_remove_unused_layers_and_fields():
                      open_options=['REMOVE_UNUSED_LAYERS=YES',
                                    'REMOVE_UNUSED_FIELDS=YES'])
     if ds.GetLayerCount() != 1:
-        gdaltest.post_reason('fail')
         return 'fail'
     lyr = ds.GetLayer(0)
     f = lyr.GetNextFeature()
     if lyr.GetLayerDefn().GetFieldCount() != 4:
-        gdaltest.post_reason('fail')
         print(lyr.GetLayerDefn().GetFieldCount())
         f.DumpReadable()
         return 'fail'
     if f['used1'] != 'foo' or f['used2'] != 'bar' or f['nillable_nilReason'] != 'unknown':
-        gdaltest.post_reason('fail')
         return 'fail'
 
     lyr = ds.GetLayerByName('_ogr_layers_metadata')
     if lyr.GetFeatureCount() != 1:
-        gdaltest.post_reason('fail')
         for f in lyr:
             f.DumpReadable()
         return 'fail'
 
     lyr = ds.GetLayerByName('_ogr_fields_metadata')
     if lyr.GetFeatureCount() != 7:
-        gdaltest.post_reason('fail')
         for f in lyr:
             f.DumpReadable()
         return 'fail'
 
     lyr = ds.GetLayerByName('_ogr_layer_relationships')
     if lyr.GetFeatureCount() != 0:
-        gdaltest.post_reason('fail')
         for f in lyr:
             f.DumpReadable()
         return 'fail'
@@ -1784,7 +1628,6 @@ def test_ogr_gmlas_xlink_resolver():
     ds = gdal.OpenEx('GMLAS:/vsimem/ogr_gmlas_xlink_resolver.xml')
     lyr = ds.GetLayer(0)
     if lyr.GetLayerDefn().GetFieldIndex('my_link_rawcontent') >= 0:
-        gdaltest.post_reason('fail')
         webserver.server_stop(webserver_process, webserver_port)
         return 'fail'
     ds = None
@@ -1800,12 +1643,10 @@ def test_ogr_gmlas_xlink_resolver():
         </XLinkResolution></Configuration>"""])
     lyr = ds.GetLayer(0)
     if lyr.GetLayerDefn().GetFieldIndex('my_link_rawcontent') < 0:
-        gdaltest.post_reason('fail')
         webserver.server_stop(webserver_process, webserver_port)
         return 'fail'
     f = lyr.GetNextFeature()
     if f.IsFieldSet('my_link_rawcontent'):
-        gdaltest.post_reason('fail')
         webserver.server_stop(webserver_process, webserver_port)
         return 'fail'
 
@@ -1815,7 +1656,6 @@ def test_ogr_gmlas_xlink_resolver():
     lyr.ResetReading()
     f = lyr.GetNextFeature()
     if f['my_link_rawcontent'] != 'foo':
-        gdaltest.post_reason('fail')
         webserver.server_stop(webserver_process, webserver_port)
         return 'fail'
     ds = None
@@ -1837,12 +1677,10 @@ def test_ogr_gmlas_xlink_resolver():
     lyr = ds.GetLayer(0)
     f = lyr.GetNextFeature()
     if f['my_link_rawcontent'] != 'bar':
-        gdaltest.post_reason('fail')
         webserver.server_stop(webserver_process, webserver_port)
         return 'fail'
     # Check that the content is not cached
     if gdal.VSIStatL(cached_file) is not None:
-        gdaltest.post_reason('fail')
         webserver.server_stop(webserver_process, webserver_port)
         return 'fail'
 
@@ -1851,13 +1689,11 @@ def test_ogr_gmlas_xlink_resolver():
     lyr.ResetReading()
     f = lyr.GetNextFeature()
     if f['my_link_rawcontent'] != 'bar':
-        gdaltest.post_reason('fail')
         webserver.server_stop(webserver_process, webserver_port)
         return 'fail'
 
     f = lyr.GetNextFeature()
     if f['my_link_rawcontent'] != 'baz':
-        gdaltest.post_reason('fail')
         webserver.server_stop(webserver_process, webserver_port)
         return 'fail'
 
@@ -1867,13 +1703,11 @@ def test_ogr_gmlas_xlink_resolver():
     with gdaltest.error_handler():
         f = lyr.GetNextFeature()
     if f['my_link_rawcontent'] is not None:
-        gdaltest.post_reason('fail')
         webserver.server_stop(webserver_process, webserver_port)
         return 'fail'
 
     f = lyr.GetNextFeature()
     if f['my_link_rawcontent'] != 'baz':
-        gdaltest.post_reason('fail')
         webserver.server_stop(webserver_process, webserver_port)
         return 'fail'
 
@@ -1893,12 +1727,10 @@ def test_ogr_gmlas_xlink_resolver():
     lyr = ds.GetLayer(0)
     f = lyr.GetNextFeature()
     if f['my_link_rawcontent'] != 'bar':
-        gdaltest.post_reason('fail')
         webserver.server_stop(webserver_process, webserver_port)
         return 'fail'
     # Check that the content is cached
     if gdal.VSIStatL(cached_file) is None:
-        gdaltest.post_reason('fail')
         webserver.server_stop(webserver_process, webserver_port)
         return 'fail'
     ds = None
@@ -1917,12 +1749,10 @@ def test_ogr_gmlas_xlink_resolver():
     lyr = ds.GetLayer(0)
     f = lyr.GetNextFeature()
     if f['my_link_rawcontent'] != 'baz':
-        gdaltest.post_reason('fail')
         webserver.server_stop(webserver_process, webserver_port)
         return 'fail'
     # Check that the content is cached
     if gdal.VSIStatL(cached_file) is None:
-        gdaltest.post_reason('fail')
         webserver.server_stop(webserver_process, webserver_port)
         return 'fail'
     ds = None
@@ -1947,7 +1777,6 @@ def test_ogr_gmlas_xlink_resolver():
     with gdaltest.error_handler():
         f = lyr.GetNextFeature()
     if f.IsFieldSet('my_link_rawcontent'):
-        gdaltest.post_reason('fail')
         f.DumpReadable()
         webserver.server_stop(webserver_process, webserver_port)
         return 'fail'
@@ -1969,12 +1798,10 @@ def test_ogr_gmlas_xlink_resolver():
     with gdaltest.error_handler():
         f = lyr.GetNextFeature()
     if gdal.GetLastErrorMsg() == '':
-        gdaltest.post_reason('fail')
         webserver.server_stop(webserver_process, webserver_port)
         return 'fail'
     # Check that the content is not cached
     if gdal.VSIStatL(cached_file) is not None:
-        gdaltest.post_reason('fail')
         webserver.server_stop(webserver_process, webserver_port)
         return 'fail'
     ds = None
@@ -1998,13 +1825,11 @@ def test_ogr_gmlas_xlink_resolver():
        f['my_link_href'] != 'http://localhost:%d/vsimem/resource.xml' % webserver_port or \
        f['my_link_rawcontent'] != 'bar' or \
        f['my_link_attr_after'] != 'b':
-        gdaltest.post_reason('fail')
         f.DumpReadable()
         webserver.server_stop(webserver_process, webserver_port)
         return 'fail'
     # Check that the content is cached
     if gdal.VSIStatL(cached_file) is None:
-        gdaltest.post_reason('fail')
         webserver.server_stop(webserver_process, webserver_port)
         return 'fail'
     ds = None
@@ -2129,14 +1954,12 @@ def test_ogr_gmlas_xlink_resolver():
        f['my_link2_datetime'] != '2016/10/07 12:34:56+00' or \
        f['my_link2_bar'] is not None or \
        f['my_link2_attr_after'] != 'b2':
-        gdaltest.post_reason('fail')
         f.DumpReadable()
         webserver.server_stop(webserver_process, webserver_port)
         return 'fail'
 
     f = lyr.GetNextFeature()
     if f['my_link2_bar'] != 123:
-        gdaltest.post_reason('fail')
         f.DumpReadable()
         webserver.server_stop(webserver_process, webserver_port)
         return 'fail'
@@ -2160,7 +1983,6 @@ def test_ogr_gmlas_xlink_resolver():
        f['my_link2_baz'] != 345 or \
        f['my_link2_bar'] is not None or \
        f['my_link2_attr_after'] != 'b2':
-        gdaltest.post_reason('fail')
         f.DumpReadable()
         webserver.server_stop(webserver_process, webserver_port)
         return 'fail'
@@ -2205,7 +2027,6 @@ def test_ogr_gmlas_recoding():
     lyr = ds.GetLayer(0)
     f = lyr.GetNextFeature()
     if f['attr'] != accent:
-        gdaltest.post_reason('fail')
         f.DumpReadable()
         return 'fail'
 
@@ -2225,7 +2046,6 @@ def test_ogr_gmlas_schema_without_namespace_prefix():
     lyr = ds.GetLayerByName('_ogr_layers_metadata')
     f = lyr.GetNextFeature()
     if f['layer_xpath'] != 'my_ns:main_elt':
-        gdaltest.post_reason('fail')
         f.DumpReadable()
         return 'fail'
 
@@ -2237,7 +2057,6 @@ def test_ogr_gmlas_schema_without_namespace_prefix():
     lyr = ds.GetLayerByName('_ogr_layers_metadata')
     f = lyr.GetNextFeature()
     if f['layer_xpath'] != 'fake_3_0:main_elt':
-        gdaltest.post_reason('fail')
         f.DumpReadable()
         return 'fail'
 
@@ -2249,7 +2068,6 @@ def test_ogr_gmlas_schema_without_namespace_prefix():
     lyr = ds.GetLayerByName('_ogr_layers_metadata')
     f = lyr.GetNextFeature()
     if f['layer_xpath'] != 'my_namespace:main_elt':
-        gdaltest.post_reason('fail')
         f.DumpReadable()
         return 'fail'
 
@@ -2269,7 +2087,6 @@ def test_ogr_gmlas_truncated_xml():
     with gdaltest.error_handler():
         f = lyr.GetNextFeature()
     if f is not None:
-        gdaltest.post_reason('fail')
         f.DumpReadable()
         return 'fail'
 
@@ -2289,57 +2106,46 @@ def test_ogr_gmlas_identifier_truncation():
         'CONFIG_FILE=<Configuration><LayerBuildingRules><IdentifierMaxLength>10</IdentifierMaxLength><PostgreSQLIdentifierLaundering>false</PostgreSQLIdentifierLaundering></LayerBuildingRules></Configuration>'])
     lyr = ds.GetLayerByName('v_l_i_clas')
     if lyr is None:
-        gdaltest.post_reason('fail')
         print(ds.GetLayer(0).GetName())
         return 'fail'
     s = lyr.GetLayerDefn().GetFieldDefn(1).GetName()
     if s != 'v_l_idTifi':
-        gdaltest.post_reason('fail')
         print(s)
         return 'fail'
     s = lyr.GetLayerDefn().GetFieldDefn(2).GetName()
     if s != 'an_lo_ide1':
-        gdaltest.post_reason('fail')
         print(s)
         return 'fail'
     s = lyr.GetLayerDefn().GetFieldDefn(3).GetName()
     if s != 'an_lo_ide2':
-        gdaltest.post_reason('fail')
         print(s)
         return 'fail'
     s = lyr.GetLayerDefn().GetFieldDefn(4).GetName()
     if s != 'x':
-        gdaltest.post_reason('fail')
         print(s)
         return 'fail'
     s = lyr.GetLayerDefn().GetFieldDefn(5).GetName()
     if s != 'noTCAMELCa':
-        gdaltest.post_reason('fail')
         print(s)
         return 'fail'
     s = lyr.GetLayerDefn().GetFieldDefn(6).GetName()
     if s != 'suuuuuuuuu':
-        gdaltest.post_reason('fail')
         print(s)
         return 'fail'
     s = lyr.GetLayerDefn().GetFieldDefn(7).GetName()
     if s != '_r_l_o_n_g':
-        gdaltest.post_reason('fail')
         print(s)
         return 'fail'
     lyr = ds.GetLayerByName('a_l_i_cla1')
     if lyr is None:
-        gdaltest.post_reason('fail')
         print(ds.GetLayer(1).GetName())
         return 'fail'
     lyr = ds.GetLayerByName('a_l_i_cla2')
     if lyr is None:
-        gdaltest.post_reason('fail')
         print(ds.GetLayer(2).GetName())
         return 'fail'
     lyr = ds.GetLayerByName('y')
     if lyr is None:
-        gdaltest.post_reason('fail')
         print(ds.GetLayer(3).GetName())
         return 'fail'
     ds = None
@@ -2360,22 +2166,18 @@ def test_ogr_gmlas_identifier_case_ambiguity():
         'CONFIG_FILE=<Configuration><LayerBuildingRules><PostgreSQLIdentifierLaundering>false</PostgreSQLIdentifierLaundering></LayerBuildingRules></Configuration>'])
     lyr = ds.GetLayerByName('differentcase1')
     if lyr is None:
-        gdaltest.post_reason('fail')
         print(ds.GetLayer(0).GetName())
         return 'fail'
     s = lyr.GetLayerDefn().GetFieldDefn(1).GetName()
     if s != 'differentcase1':
-        gdaltest.post_reason('fail')
         print(s)
         return 'fail'
     s = lyr.GetLayerDefn().GetFieldDefn(2).GetName()
     if s != 'DifferentCASE2':
-        gdaltest.post_reason('fail')
         print(s)
         return 'fail'
     lyr = ds.GetLayerByName('DifferentCASE2')
     if lyr is None:
-        gdaltest.post_reason('fail')
         print(ds.GetLayer(0).GetName())
         return 'fail'
     ds = None
@@ -2404,7 +2206,6 @@ def test_ogr_gmlas_writer():
     gdal.Unlink('/vsimem/ogr_gmlas_writer.db')
 
     if ret_ds is None:
-        gdaltest.post_reason('fail')
         return 'fail'
 
     return 'success'
@@ -2427,7 +2228,6 @@ def test_ogr_gmlas_writer_check_xml_xsd():
     pos_end = got.find('"', pos)
     absolute_xsd = got[pos:pos_end]
     if not absolute_xsd.endswith('gmlas_test1.xsd') or not os.path.exists(absolute_xsd):
-        gdaltest.post_reason('fail')
         print(absolute_xsd)
         return 'fail'
     got = got.replace(absolute_xsd, 'gmlas_test1.xsd')
@@ -2436,8 +2236,6 @@ def test_ogr_gmlas_writer_check_xml_xsd():
     expected = expected.replace('\r\n', '\n')
 
     if got != expected:
-        gdaltest.post_reason('fail')
-
         print('Got:')
         print(got)
         print('')
@@ -2452,7 +2250,6 @@ def test_ogr_gmlas_writer_check_xml_xsd():
     pos_end = got.find('"', pos)
     absolute_xsd = got[pos:pos_end]
     if not absolute_xsd.endswith('gmlas_test1.xsd') or not os.path.exists(absolute_xsd):
-        gdaltest.post_reason('fail')
         print(absolute_xsd)
         return 'fail'
     got = got.replace(absolute_xsd, 'gmlas_test1.xsd')
@@ -2461,8 +2258,6 @@ def test_ogr_gmlas_writer_check_xml_xsd():
     expected = expected.replace('\r\n', '\n')
 
     if got != expected:
-        gdaltest.post_reason('fail')
-
         print('Got:')
         print(got)
         print('')
@@ -2515,8 +2310,6 @@ def test_ogr_gmlas_writer_check_xml_read_back():
     ret_for_comparison = ret_for_comparison.replace('fake_hash', '3CF9893502A592E8CF5EA6EF3D8F8C7B')
 
     if ret_for_comparison != expected:
-        gdaltest.post_reason('fail')
-
         print('XML:')
         print(open('tmp/gmlas_test1_generated.xml', 'rt').read())
         print('')
@@ -2565,12 +2358,10 @@ def test_ogr_gmlas_writer_gml():
     tmp_ds = None
 
     if ret_ds is None:
-        gdaltest.post_reason('fail')
         return 'fail'
 
     f = gdal.VSIFOpenL('/vsimem/ogr_gmlas_writer_gml.xml', 'rb')
     if f is None:
-        gdaltest.post_reason('fail')
         return 'fail'
     content = gdal.VSIFReadL(1, 10000, f).decode('utf-8')
     gdal.VSIFCloseL(f)
@@ -2579,27 +2370,22 @@ def test_ogr_gmlas_writer_gml():
     gdal.Unlink('/vsimem/ogr_gmlas_writer_gml.xsd')
 
     if content.find('xmlns:gml="http://fake_gml32"') < 0:
-        gdaltest.post_reason('fail')
         print(content)
         return 'fail'
 
     if content.find('<ogr:geometryProperty><gml:Point srsName="http://www.opengis.net/def/crs/EPSG/0/4326" gml:id="hash_test_1.geom0"><gml:pos>49 2</gml:pos></gml:Point></ogr:geometryProperty>') < 0:
-        gdaltest.post_reason('fail')
         print(content)
         return 'fail'
 
     if content.find('<ogr:pointProperty><gml:Point srsName="http://www.opengis.net/def/crs/EPSG/0/4326" gml:id="hash_test_1.geom2"><gml:pos>50 3</gml:pos></gml:Point></ogr:pointProperty>') < 0:
-        gdaltest.post_reason('fail')
         print(content)
         return 'fail'
 
     if content.find('      <ogr:pointPropertyRepeated><gml:Point gml:id="hash_test_1.geom13.0"><gml:pos>0 1</gml:pos></gml:Point></ogr:pointPropertyRepeated>') < 0:
-        gdaltest.post_reason('fail')
         print(content)
         return 'fail'
 
     if content.find('      <ogr:pointPropertyRepeated><gml:Point gml:id="hash_test_1.geom13.1"><gml:pos>1 2</gml:pos></gml:Point></ogr:pointPropertyRepeated>') < 0:
-        gdaltest.post_reason('fail')
         print(content)
         return 'fail'
 
@@ -2626,12 +2412,10 @@ def test_ogr_gmlas_writer_gml_assign_srs():
     tmp_ds = None
 
     if ret_ds is None:
-        gdaltest.post_reason('fail')
         return 'fail'
 
     f = gdal.VSIFOpenL('/vsimem/ogr_gmlas_writer_gml.xml', 'rb')
     if f is None:
-        gdaltest.post_reason('fail')
         return 'fail'
     content = gdal.VSIFReadL(1, 10000, f).decode('utf-8')
     gdal.VSIFCloseL(f)
@@ -2640,7 +2424,6 @@ def test_ogr_gmlas_writer_gml_assign_srs():
     gdal.Unlink('/vsimem/ogr_gmlas_writer_gml.xsd')
 
     if content.find('http://www.opengis.net/def/crs/EPSG/0/32631') < 0:
-        gdaltest.post_reason('fail')
         print(content)
         return 'fail'
 
@@ -2663,7 +2446,6 @@ def test_ogr_gmlas_writer_gml_assign_srs():
     gdal.Unlink('/vsimem/ogr_gmlas_writer.db')
 
     if gdal.VSIStatL('/vsimem/gmlas_test1_generated_ref0.xml').size != gdal.VSIStatL('/vsimem/gmlas_test1_generated_asrs.xml').size:
-        gdaltest.post_reason('fail')
         print(gdal.VSIStatL('/vsimem/gmlas_test1_generated_ref0.xml').size)
         print(gdal.VSIStatL('/vsimem/gmlas_test1_generated_asrs.xml').size)
         return 'fail'
@@ -2694,19 +2476,16 @@ def test_ogr_gmlas_writer_gml_original_xml():
     tmp_ds = None
 
     if ret_ds is None:
-        gdaltest.post_reason('fail')
         return 'fail'
     ret_ds = None
 
     ds = gdal.OpenEx('GMLAS:/vsimem/ogr_gmlas_writer_gml.xml', open_options=['VALIDATE=YES'])
     if ds is None or gdal.GetLastErrorMsg() != '':
-        gdaltest.post_reason('fail')
         return 'fail'
     ds = None
 
     f = gdal.VSIFOpenL('/vsimem/ogr_gmlas_writer_gml.xml', 'rb')
     if f is None:
-        gdaltest.post_reason('fail')
         return 'fail'
     content = gdal.VSIFReadL(1, 10000, f).decode('utf-8')
     gdal.VSIFCloseL(f)
@@ -2715,17 +2494,14 @@ def test_ogr_gmlas_writer_gml_original_xml():
     gdal.Unlink('/vsimem/ogr_gmlas_writer_gml.xsd')
 
     if content.find('<ogr:geometryProperty> <gml:Point gml:id="poly.geom.Geometry" srsName="urn:ogc:def:crs:EPSG::4326"> <gml:pos>49 2</gml:pos> </gml:Point> </ogr:geometryProperty>') < 0:
-        gdaltest.post_reason('fail')
         print(content)
         return 'fail'
 
     if content.find('      <ogr:pointPropertyRepeated><gml:Point gml:id="poly.geom.pointPropertyRepeated.1"><gml:pos>0 1</gml:pos></gml:Point></ogr:pointPropertyRepeated>') < 0:
-        gdaltest.post_reason('fail')
         print(content)
         return 'fail'
 
     if content.find('      <ogr:pointPropertyRepeated><gml:Point gml:id="poly.geom.pointPropertyRepeated.2"><gml:pos>1 2</gml:pos></gml:Point></ogr:pointPropertyRepeated>') < 0:
-        gdaltest.post_reason('fail')
         print(content)
         return 'fail'
 
@@ -2754,12 +2530,10 @@ def test_ogr_gmlas_writer_options():
     tmp_ds = None
 
     if ret_ds is None:
-        gdaltest.post_reason('fail')
         return 'fail'
 
     f = gdal.VSIFOpenL('/vsimem/ogr_gmlas_writer_options.xml', 'rb')
     if f is None:
-        gdaltest.post_reason('fail')
         return 'fail'
     content = gdal.VSIFReadL(1, 10000, f).decode('utf-8')
     gdal.VSIFCloseL(f)
@@ -2767,32 +2541,27 @@ def test_ogr_gmlas_writer_options():
     gdal.Unlink('/vsimem/ogr_gmlas_writer_options.xml')
 
     if gdal.VSIStatL('/vsimem/my_schema.xsd') is None:
-        gdaltest.post_reason('fail')
         return 'fail'
 
     gdal.Unlink('/vsimem/my_schema.xsd')
 
     # Test indentation size
     if content.find('\n        <ogr:test gml:id="poly.0">') < 0:
-        gdaltest.post_reason('fail')
         print(content)
         return 'fail'
 
     # Test comment
     if content.find('\n<!-- - - -a comment- - - -->') < 0:
-        gdaltest.post_reason('fail')
         print(content)
         return 'fail'
 
     # Test OUTPUT_XSD_FILENAME
     if content.find('/vsimem/my_schema.xsd') < 0:
-        gdaltest.post_reason('fail')
         print(content)
         return 'fail'
 
     # Test SRSNAME_FORMAT=OGC_URN
     if content.find('<ogr:geometryProperty><gml:Point srsName="urn:ogc:def:crs:EPSG::4326" gml:id="hash_test_1.geom0"><gml:pos>49 2</gml:pos></gml:Point></ogr:geometryProperty>') < 0:
-        gdaltest.post_reason('fail')
         print(content)
         return 'fail'
 
@@ -2806,12 +2575,10 @@ def test_ogr_gmlas_writer_options():
     tmp_ds = None
 
     if ret_ds is None:
-        gdaltest.post_reason('fail')
         return 'fail'
 
     f = gdal.VSIFOpenL('/vsimem/ogr_gmlas_writer_options.xml', 'rb')
     if f is None:
-        gdaltest.post_reason('fail')
         return 'fail'
     content = gdal.VSIFReadL(1, 10000, f).decode('utf-8')
     gdal.VSIFCloseL(f)
@@ -2819,12 +2586,10 @@ def test_ogr_gmlas_writer_options():
     gdal.Unlink('/vsimem/ogr_gmlas_writer_options.xml')
 
     if gdal.VSIStatL('/vsimem/my_schema.xsd') is not None:
-        gdaltest.post_reason('fail')
         return 'fail'
 
     if content.find('timeStamp="1970-01-01T12:34:56Z"') < 0 or \
        content.find('xsi:schemaLocation="http://www.opengis.net/wfs/2.0 http://schemas.opengis.net/wfs/2.0/wfs.xsd ') < 0:
-        gdaltest.post_reason('fail')
         print(content)
         return 'fail'
 
@@ -2838,7 +2603,6 @@ def test_ogr_gmlas_writer_options():
     tmp_ds = None
 
     if ret_ds is None:
-        gdaltest.post_reason('fail')
         return 'fail'
 
     gdal.FileFromMemBuffer('/vsimem/fake_wfs.xsd',
@@ -2863,13 +2627,11 @@ def test_ogr_gmlas_writer_options():
     gdal.Unlink('/vsimem/fake_wfs.xsd')
 
     if ds is None or gdal.GetLastErrorMsg() != '':
-        gdaltest.post_reason('fail')
         return 'fail'
     ds = None
 
     f = gdal.VSIFOpenL('/vsimem/ogr_gmlas_writer_options.xml', 'rb')
     if f is None:
-        gdaltest.post_reason('fail')
         return 'fail'
     content = gdal.VSIFReadL(1, 10000, f).decode('utf-8')
     gdal.VSIFCloseL(f)
@@ -2877,11 +2639,9 @@ def test_ogr_gmlas_writer_options():
     gdal.Unlink('/vsimem/ogr_gmlas_writer_options.xml')
 
     if gdal.VSIStatL('/vsimem/my_schema.xsd') is not None:
-        gdaltest.post_reason('fail')
         return 'fail'
 
     if content.find('xsi:schemaLocation="http://www.opengis.net/wfs/2.0 /vsimem/fake_wfs.xsd ') < 0:
-        gdaltest.post_reason('fail')
         print(content)
         return 'fail'
 
@@ -2900,7 +2660,6 @@ def test_ogr_gmlas_writer_errors():
     with gdaltest.error_handler():
         ret_ds = gdal.VectorTranslate('/vsimem/valid.xml', gdal.GetDriverByName('Memory').Create('', 0, 0, 0, 0), format='GMLAS')
     if ret_ds is not None or gdal.GetLastErrorMsg().find('Source dataset has no layers') < 0:
-        gdaltest.post_reason('fail')
         print(gdal.GetLastErrorMsg())
         return 'fail'
 
@@ -2911,7 +2670,6 @@ def test_ogr_gmlas_writer_errors():
     with gdaltest.error_handler():
         ret_ds = gdal.VectorTranslate('/vsimem/valid.xml', tmp_ds, format='GMLAS')
     if ret_ds is not None or gdal.GetLastErrorMsg().find('Cannot establish schema since no INPUT_XSD creation option specified and no _ogr_other_metadata found in source dataset') < 0:
-        gdaltest.post_reason('fail')
         print(gdal.GetLastErrorMsg())
         return 'fail'
 
@@ -2920,7 +2678,6 @@ def test_ogr_gmlas_writer_errors():
         ret_ds = gdal.VectorTranslate('/vsimem/valid.xml', tmp_ds, format='GMLAS',
                                       datasetCreationOptions=['INPUT_XSD=/i_do_not/exist.xsd'])
     if ret_ds is not None or gdal.GetLastErrorMsg().find('Cannot resolve /i_do_not/exist.xsd') < 0:
-        gdaltest.post_reason('fail')
         print(gdal.GetLastErrorMsg())
         return 'fail'
 
@@ -2933,7 +2690,6 @@ def test_ogr_gmlas_writer_errors():
         ret_ds = gdal.VectorTranslate('/i_am/not/valid.xml', tmp_ds, format='GMLAS',
                                       datasetCreationOptions=['GENERATE_XSD=NO'])
     if ret_ds is not None or gdal.GetLastErrorMsg().find('Cannot create /i_am/not/valid.xml') < 0:
-        gdaltest.post_reason('fail')
         print(gdal.GetLastErrorMsg())
         return 'fail'
 
@@ -2942,7 +2698,6 @@ def test_ogr_gmlas_writer_errors():
         ret_ds = gdal.VectorTranslate('/i_am/not/valid.xsd', tmp_ds, format='GMLAS',
                                       datasetCreationOptions=['GENERATE_XSD=NO'])
     if ret_ds is not None or gdal.GetLastErrorMsg().find('.xsd extension is not valid') < 0:
-        gdaltest.post_reason('fail')
         print(gdal.GetLastErrorMsg())
         return 'fail'
 
@@ -2952,7 +2707,6 @@ def test_ogr_gmlas_writer_errors():
                                       datasetCreationOptions=['WRAPPING=GMLAS_FEATURECOLLECTION',
                                                               'OUTPUT_XSD_FILENAME=/i_am/not/valid.xsd'])
     if ret_ds is not None or gdal.GetLastErrorMsg().find('Cannot create /i_am/not/valid.xsd') < 0:
-        gdaltest.post_reason('fail')
         print(gdal.GetLastErrorMsg())
         return 'fail'
     gdal.Unlink('/vsimem/valid.xml')
@@ -2962,7 +2716,6 @@ def test_ogr_gmlas_writer_errors():
         ret_ds = gdal.VectorTranslate('/vsimem/valid.xml', tmp_ds, format='GMLAS',
                                       datasetCreationOptions=['CONFIG_FILE=/i/do_not/exist'])
     if ret_ds is not None or gdal.GetLastErrorMsg().find('Loading of configuration failed') < 0:
-        gdaltest.post_reason('fail')
         print(gdal.GetLastErrorMsg())
         return 'fail'
 
@@ -2971,7 +2724,6 @@ def test_ogr_gmlas_writer_errors():
         ret_ds = gdal.VectorTranslate('/vsimem/valid.xml', tmp_ds, format='GMLAS',
                                       datasetCreationOptions=['LAYERS=foo'])
     if ret_ds is not None or gdal.GetLastErrorMsg().find('Layer foo specified in LAYERS option does not exist') < 0:
-        gdaltest.post_reason('fail')
         print(gdal.GetLastErrorMsg())
         return 'fail'
     gdal.Unlink('/vsimem/valid.xml')
@@ -2982,7 +2734,6 @@ def test_ogr_gmlas_writer_errors():
     with gdaltest.error_handler():
         ret_ds = gdal.VectorTranslate('/vsimem/valid.xml', src_ds, format='GMLAS')
     if ret_ds is not None or gdal.GetLastErrorMsg().find('_ogr_layers_metadata not found') < 0:
-        gdaltest.post_reason('fail')
         print(gdal.GetLastErrorMsg())
         return 'fail'
 
@@ -2993,7 +2744,6 @@ def test_ogr_gmlas_writer_errors():
     with gdaltest.error_handler():
         ret_ds = gdal.VectorTranslate('/vsimem/valid.xml', src_ds, format='GMLAS')
     if ret_ds is not None or gdal.GetLastErrorMsg().find('_ogr_fields_metadata not found') < 0:
-        gdaltest.post_reason('fail')
         print(gdal.GetLastErrorMsg())
         return 'fail'
 
@@ -3005,7 +2755,6 @@ def test_ogr_gmlas_writer_errors():
     with gdaltest.error_handler():
         ret_ds = gdal.VectorTranslate('/vsimem/valid.xml', src_ds, format='GMLAS')
     if ret_ds is not None or gdal.GetLastErrorMsg().find('_ogr_layer_relationships not found') < 0:
-        gdaltest.post_reason('fail')
         print(gdal.GetLastErrorMsg())
         return 'fail'
 
@@ -3018,7 +2767,6 @@ def test_ogr_gmlas_writer_errors():
     with gdaltest.error_handler():
         ret_ds = gdal.VectorTranslate('/vsimem/valid.xml', src_ds, format='GMLAS')
     if ret_ds is not None or gdal.GetLastErrorMsg().find('Cannot find field layer_name in _ogr_layers_metadata layer') < 0:
-        gdaltest.post_reason('fail')
         print(gdal.GetLastErrorMsg())
         return 'fail'
     gdal.Unlink('/vsimem/valid.xml')
@@ -3043,13 +2791,11 @@ def test_ogr_gmlas_read_fake_gmljp2():
         f, lyr = ds.GetNextFeature()
         if f is None:
             if lyr is not None:
-                gdaltest.post_reason('fail')
                 return 'fail'
             break
         count += 1
 
     if count != 5:
-        gdaltest.post_reason('fail')
         print(count)
         return 'fail'
 
@@ -3082,13 +2828,11 @@ def test_ogr_gmlas_typing_constraints():
     lyr = ds.GetLayer(0)
     f = lyr.GetNextFeature()
     if not f.IsFieldSetAndNotNull('foo_bar_pkid'):
-        gdaltest.post_reason('fail')
         f.DumpReadable()
         return 'fail'
     lyr = ds.GetLayer(1)
     f = lyr.GetNextFeature()
     if f.GetField('value') != 'baz':
-        gdaltest.post_reason('fail')
         f.DumpReadable()
         return 'fail'
     ds = None
@@ -3111,17 +2855,14 @@ def test_ogr_gmlas_typing_constraints():
 </Configuration>"""])
     lyr = ds.GetLayer('main_elt_foo_bar')
     if lyr.GetFeatureCount() != 2:
-        gdaltest.post_reason('fail')
         return 'fail'
     lyr = ds.GetLayer('bar')
     f = lyr.GetNextFeature()
     if f.GetField('value') != 'baz':
-        gdaltest.post_reason('fail')
         f.DumpReadable()
         return 'fail'
     f = lyr.GetNextFeature()
     if f.GetField('value') != 'baz2':
-        gdaltest.post_reason('fail')
         f.DumpReadable()
         return 'fail'
     ds = None
@@ -3145,17 +2886,14 @@ def test_ogr_gmlas_typing_constraints():
     lyr = ds.GetLayer(0)
     f = lyr.GetNextFeature()
     if not f.IsFieldSetAndNotNull('foo_bar_pkid'):
-        gdaltest.post_reason('fail')
         f.DumpReadable()
         return 'fail'
     if f.IsFieldSetAndNotNull('foo_baz_pkid'):
-        gdaltest.post_reason('fail')
         f.DumpReadable()
         return 'fail'
     lyr = ds.GetLayer(1)
     f = lyr.GetNextFeature()
     if f.GetField('value') != 'baz':
-        gdaltest.post_reason('fail')
         f.DumpReadable()
         return 'fail'
     ds = None
@@ -3182,19 +2920,16 @@ def test_ogr_gmlas_swe_dataarray():
        f.GetField('myCount') != 3 or \
        f.GetField('myText') != 'foo' or \
        f.GetField('myBoolean') is False:
-        gdaltest.post_reason('fail')
         f.DumpReadable()
         return 'fail'
     f = lyr.GetNextFeature()
     if f.GetField('myTime') != '2017/09/01 00:00:00' or \
        f.GetField('myCategory') != '2' or \
        f.GetField('myQuantity') != 3.45:
-        gdaltest.post_reason('fail')
         f.DumpReadable()
         return 'fail'
     f = lyr.GetNextFeature()
     if f is not None:
-        gdaltest.post_reason('fail')
         f.DumpReadable()
         return 'fail'
 
@@ -3203,19 +2938,16 @@ def test_ogr_gmlas_swe_dataarray():
     if f.GetField('myTime') != '2016/09/01 00:00:00+01' or \
        f.GetField('myCategory') != '1' or \
        f.GetField('myQuantity') != 2.34:
-        gdaltest.post_reason('fail')
         f.DumpReadable()
         return 'fail'
     f = lyr.GetNextFeature()
     if f.GetField('myTime') != '2017/09/01 00:00:00' or \
        f.GetField('myCategory') is not None or \
        f.GetField('myQuantity') != 3.45:
-        gdaltest.post_reason('fail')
         f.DumpReadable()
         return 'fail'
     f = lyr.GetNextFeature()
     if f is not None:
-        gdaltest.post_reason('fail')
         f.DumpReadable()
         return 'fail'
 
@@ -3224,19 +2956,16 @@ def test_ogr_gmlas_swe_dataarray():
     if f.GetField('myTime') != '2016/09/01 00:00:00+01' or \
        f.GetField('myCategory') != '1' or \
        f.GetField('myQuantity') != 2.34:
-        gdaltest.post_reason('fail')
         f.DumpReadable()
         return 'fail'
     f = lyr.GetNextFeature()
     if f.GetField('myTime') != '2017/09/01 00:00:00' or \
        f.GetField('myCategory') is not None or \
        f.GetField('myQuantity') != 3.45:
-        gdaltest.post_reason('fail')
         f.DumpReadable()
         return 'fail'
     f = lyr.GetNextFeature()
     if f is not None:
-        gdaltest.post_reason('fail')
         f.DumpReadable()
         return 'fail'
 
@@ -3256,14 +2985,12 @@ def test_ogr_gmlas_swe_datarecord():
     gdal.ErrorReset()
     ds = gdal.OpenEx('GMLAS:data/gmlas/gmlas_swe_datarecord.xml', open_options=['VALIDATE=YES'])
     if gdal.GetLastErrorMsg() != '':
-        gdaltest.post_reason('fail')
         return 'fail'
     ds = None
 
     ds = gdal.OpenEx('GMLAS:data/gmlas/gmlas_swe_datarecord.xml')
     lyr = ds.GetLayerByName('main_elt_foo')
     if lyr.GetLayerDefn().GetFieldCount() != 12:
-        gdaltest.post_reason('fail')
         print(lyr.GetLayerDefn().GetFieldCount())
         return 'fail'
     f = lyr.GetNextFeature()
@@ -3275,7 +3002,6 @@ def test_ogr_gmlas_swe_datarecord():
        f.GetField('mycount_value') != 2 or \
        f.GetField('mytext_value') != 'foo' or \
        f.GetField('myboolean_value') is False:
-        gdaltest.post_reason('fail')
         f.DumpReadable()
         return 'fail'
     ds = None
@@ -3303,10 +3029,8 @@ def test_ogr_gmlas_any_field_at_end_of_declaration():
     with gdaltest.error_handler():
         f = lyr.GetNextFeature()
     if gdal.GetLastErrorMsg() == '':
-        gdaltest.post_reason('fail')
         return 'fail'
     if f.GetField('foo') != 'bar':
-        gdaltest.post_reason('fail')
         f.DumpReadable()
         return 'fail'
     if f.GetField('value') != '<something>baz</something>':
@@ -3390,7 +3114,6 @@ def test_ogr_gmlas_no_element_in_first_choice_schema():
     lyr = ds.GetLayerByName('_ogr_layers_metadata')
     f = lyr.GetNextFeature()
     if f['layer_xpath'] != 'my_ns:main_elt':
-        gdaltest.post_reason('fail')
         f.DumpReadable()
         return 'fail'
 
@@ -3413,7 +3136,6 @@ def test_ogr_gmlas_internal_xlink_href():
        f.IsFieldSet('link_to_second_or_third_elt_second_elt_pkid') or \
        f.IsFieldSet('link_to_second_or_third_elt_third_elt_pkid') or \
        f.IsFieldSet('link_to_third_elt_third_elt_pkid'):
-        gdaltest.post_reason('fail')
         f.DumpReadable()
         return 'fail'
 
@@ -3422,7 +3144,6 @@ def test_ogr_gmlas_internal_xlink_href():
        f['link_to_second_or_third_elt_second_elt_pkid'] != 'id2' or \
        f.IsFieldSet('link_to_second_or_third_elt_third_elt_pkid') or \
        f.IsFieldSet('link_to_third_elt_third_elt_pkid'):
-        gdaltest.post_reason('fail')
         f.DumpReadable()
         return 'fail'
 
@@ -3431,7 +3152,6 @@ def test_ogr_gmlas_internal_xlink_href():
        f['link_to_second_or_third_elt_second_elt_pkid'] != 'id3' or \
        f.IsFieldSet('link_to_second_or_third_elt_third_elt_pkid') or \
        f.IsFieldSet('link_to_third_elt_third_elt_pkid'):
-        gdaltest.post_reason('fail')
         f.DumpReadable()
         return 'fail'
 
@@ -3440,7 +3160,6 @@ def test_ogr_gmlas_internal_xlink_href():
        f.IsFieldSet('link_to_second_or_third_elt_second_elt_pkid') or \
        f['link_to_second_or_third_elt_third_elt_pkid'] != 'D1013B7E44F28C976B976A4314FA4A09_third_elt_1' or \
        f.IsFieldSet('link_to_third_elt_third_elt_pkid'):
-        gdaltest.post_reason('fail')
         f.DumpReadable()
         return 'fail'
 
@@ -3449,7 +3168,6 @@ def test_ogr_gmlas_internal_xlink_href():
        f.IsFieldSet('link_to_second_or_third_elt_second_elt_pkid') or \
        f.IsFieldSet('link_to_second_or_third_elt_third_elt_pkid') or \
        f['link_to_third_elt_third_elt_pkid'] != 'D1013B7E44F28C976B976A4314FA4A09_third_elt_1':
-        gdaltest.post_reason('fail')
         f.DumpReadable()
         return 'fail'
 
@@ -3457,7 +3175,6 @@ def test_ogr_gmlas_internal_xlink_href():
     f = lyr.GetNextFeature()
     if f['layer_name'] != 'main_elt' or f['field_index'] != 1 or \
        f['field_name'] != 'link_to_second_or_third_elt_href':
-        gdaltest.post_reason('fail')
         f.DumpReadable()
         return 'fail'
 
@@ -3471,7 +3188,6 @@ def test_ogr_gmlas_internal_xlink_href():
        f['field_max_occurs'] != 1 or \
        f['field_category'] != 'PATH_TO_CHILD_ELEMENT_WITH_LINK' or \
        f['field_related_layer'] != 'second_elt':
-        gdaltest.post_reason('fail')
         f.DumpReadable()
         return 'fail'
 
@@ -3485,35 +3201,30 @@ def test_ogr_gmlas_internal_xlink_href():
        f['field_max_occurs'] != 1 or \
        f['field_category'] != 'PATH_TO_CHILD_ELEMENT_WITH_LINK' or \
        f['field_related_layer'] != 'third_elt':
-        gdaltest.post_reason('fail')
         f.DumpReadable()
         return 'fail'
 
     f = lyr.GetNextFeature()
     if f['layer_name'] != 'main_elt' or f['field_index'] != 4 or \
        f['field_name'] != 'link_to_second_or_third_elt':
-        gdaltest.post_reason('fail')
         f.DumpReadable()
         return 'fail'
 
     f = lyr.GetNextFeature()
     if f['layer_name'] != 'main_elt' or f['field_index'] != 5 or \
        f['field_name'] != 'link_to_third_elt_href':
-        gdaltest.post_reason('fail')
         f.DumpReadable()
         return 'fail'
 
     f = lyr.GetNextFeature()
     if f['layer_name'] != 'main_elt' or f['field_index'] != 6 or \
        f['field_name'] != 'link_to_third_elt_third_elt_pkid':
-        gdaltest.post_reason('fail')
         f.DumpReadable()
         return 'fail'
 
     f = lyr.GetNextFeature()
     if f['layer_name'] != 'third_elt' or f['field_index'] != 1 or \
        f['field_name'] != 'id':
-        gdaltest.post_reason('fail')
         f.DumpReadable()
         return 'fail'
 
@@ -3524,7 +3235,6 @@ def test_ogr_gmlas_internal_xlink_href():
        f['parent_element_name'] != 'link_to_third_elt_third_elt_pkid' or \
        f['child_layer'] != 'third_elt' or \
        f['child_pkid'] != 'ogr_pkid':
-        gdaltest.post_reason('fail')
         f.DumpReadable()
         return 'fail'
 
@@ -3534,7 +3244,6 @@ def test_ogr_gmlas_internal_xlink_href():
        f['parent_element_name'] != 'link_to_second_or_third_elt_second_elt_pkid' or \
        f['child_layer'] != 'second_elt' or \
        f['child_pkid'] != 'id':
-        gdaltest.post_reason('fail')
         f.DumpReadable()
         return 'fail'
 
@@ -3544,7 +3253,6 @@ def test_ogr_gmlas_internal_xlink_href():
        f['parent_element_name'] != 'link_to_second_or_third_elt_third_elt_pkid' or \
        f['child_layer'] != 'third_elt' or \
        f['child_pkid'] != 'ogr_pkid':
-        gdaltest.post_reason('fail')
         f.DumpReadable()
         return 'fail'
 
diff --git a/autotest/ogr/ogr_gpkg.py b/autotest/ogr/ogr_gpkg.py
index 86ebd1933cee..96872de1a072 100755
--- a/autotest/ogr/ogr_gpkg.py
+++ b/autotest/ogr/ogr_gpkg.py
@@ -134,7 +134,6 @@ def test_ogr_gpkg_2():
     sql_lyr = gdaltest.gpkg_ds.ExecuteSQL("SELECT COUNT(*) FROM sqlite_master WHERE name = 'ogr_empty_table'")
     f = sql_lyr.GetNextFeature()
     if f.GetField(0) != 1:
-        gdaltest.post_reason('fail')
         return 'fail'
     gdaltest.gpkg_ds.ReleaseResultSet(sql_lyr)
 
@@ -142,14 +141,12 @@ def test_ogr_gpkg_2():
     sql_lyr = gdaltest.gpkg_ds.ExecuteSQL('PRAGMA application_id')
     f = sql_lyr.GetNextFeature()
     if f['application_id'] != 1196444487:
-        gdaltest.post_reason('fail')
         f.DumpReadable()
         return 'fail'
     gdaltest.gpkg_ds.ReleaseResultSet(sql_lyr)
     sql_lyr = gdaltest.gpkg_ds.ExecuteSQL('PRAGMA user_version')
     f = sql_lyr.GetNextFeature()
     if f['user_version'] != 10200:
-        gdaltest.post_reason('fail')
         f.DumpReadable()
         return 'fail'
     gdaltest.gpkg_ds.ReleaseResultSet(sql_lyr)
@@ -211,7 +208,6 @@ def test_ogr_gpkg_4():
     sql_lyr = gdaltest.gpkg_ds.ExecuteSQL("SELECT COUNT(*) FROM sqlite_master WHERE name = 'ogr_empty_table'")
     f = sql_lyr.GetNextFeature()
     if f.GetField(0) != 0:
-        gdaltest.post_reason('fail')
         return 'fail'
     gdaltest.gpkg_ds.ReleaseResultSet(sql_lyr)
 
@@ -250,7 +246,6 @@ def test_ogr_gpkg_4():
 
     sql_lyr = gdaltest.gpkg_ds.ExecuteSQL("SELECT * FROM sqlite_master WHERE name = 'gpkg_extensions'")
     if sql_lyr.GetFeatureCount() != 0:
-        gdaltest.post_reason('fail')
         return 'fail'
     gdaltest.gpkg_ds.ReleaseResultSet(sql_lyr)
 
@@ -520,13 +515,10 @@ def test_ogr_gpkg_8():
     gdaltest.gpkg_ds = gdaltest.gpkg_dr.Open('tmp/gpkg_test.gpkg', update=1)
     lyr = gdaltest.gpkg_ds.GetLayerByName('tbl_linestring')
     if lyr.GetLayerDefn().GetFieldDefn(6).GetSubType() != ogr.OFSTBoolean:
-        gdaltest.post_reason('fail')
         return 'fail'
     if lyr.GetLayerDefn().GetFieldDefn(7).GetSubType() != ogr.OFSTInt16:
-        gdaltest.post_reason('fail')
         return 'fail'
     if lyr.GetLayerDefn().GetFieldDefn(8).GetSubType() != ogr.OFSTFloat32:
-        gdaltest.post_reason('fail')
         return 'fail'
     feat = lyr.GetNextFeature()
     if feat.GetField(0) != 10 or feat.GetField(1) != 'test string 0 test' or \
@@ -534,7 +526,6 @@ def test_ogr_gpkg_8():
        feat.GetField(4) != '2014/05/17 12:34:56+00' or feat.GetField(5) != 'FFFE' or \
        feat.GetField(6) != 1 or feat.GetField(7) != -32768 or feat.GetField(8) != 1.23 or \
        feat.GetField(9) != 1000000000000:
-        gdaltest.post_reason('fail')
         feat.DumpReadable()
         return 'fail'
 
@@ -647,35 +638,25 @@ def test_ogr_gpkg_12():
 
     sql_lyr = gdaltest.gpkg_ds.ExecuteSQL('SELECT * FROM tbl_linestring_renamed')
     if sql_lyr.GetFIDColumn() != 'fid':
-        gdaltest.post_reason('fail')
         return 'fail'
     if sql_lyr.GetGeomType() != ogr.wkbLineString:
-        gdaltest.post_reason('fail')
         return 'fail'
     if sql_lyr.GetGeometryColumn() != 'geom':
-        gdaltest.post_reason('fail')
         return 'fail'
     if sql_lyr.GetSpatialRef().ExportToWkt().find('32631') < 0:
-        gdaltest.post_reason('fail')
         return 'fail'
     feat = sql_lyr.GetNextFeature()
     if feat.GetFID() != 1:
-        gdaltest.post_reason('fail')
         return 'fail'
     if sql_lyr.GetFeatureCount() != 11:
-        gdaltest.post_reason('fail')
         return 'fail'
     if sql_lyr.GetLayerDefn().GetFieldCount() != 10:
-        gdaltest.post_reason('fail')
         return 'fail'
     if sql_lyr.GetLayerDefn().GetFieldDefn(6).GetSubType() != ogr.OFSTBoolean:
-        gdaltest.post_reason('fail')
         return 'fail'
     if sql_lyr.GetLayerDefn().GetFieldDefn(7).GetSubType() != ogr.OFSTInt16:
-        gdaltest.post_reason('fail')
         return 'fail'
     if sql_lyr.GetLayerDefn().GetFieldDefn(8).GetSubType() != ogr.OFSTFloat32:
-        gdaltest.post_reason('fail')
         return 'fail'
     gdaltest.gpkg_ds.ReleaseResultSet(sql_lyr)
 
@@ -694,53 +675,39 @@ def test_ogr_gpkg_12():
         'CAST(fld_integer64 AS INTEGER) AS FLD_INTEGER64 '
         'FROM tbl_linestring_renamed')
     if sql_lyr.GetFIDColumn() != 'FID':
-        gdaltest.post_reason('fail')
         print(sql_lyr.GetFIDColumn())
         return 'fail'
     if sql_lyr.GetGeometryColumn() != 'GEOM':
-        gdaltest.post_reason('fail')
         print(sql_lyr.GetGeometryColumn())
         return 'fail'
     if sql_lyr.GetLayerDefn().GetFieldCount() != 5:
-        gdaltest.post_reason('fail')
         print(sql_lyr.GetLayerDefn().GetFieldCount())
         return 'fail'
     if sql_lyr.GetLayerDefn().GetFieldDefn(0).GetName() != 'FLD_INTEGER':
-        gdaltest.post_reason('fail')
         return 'fail'
     if sql_lyr.GetLayerDefn().GetFieldDefn(0).GetType() != ogr.OFTInteger:
-        gdaltest.post_reason('fail')
         return 'fail'
     if sql_lyr.GetLayerDefn().GetFieldDefn(1).GetName() != 'FLD_STRING':
-        gdaltest.post_reason('fail')
         return 'fail'
     if sql_lyr.GetLayerDefn().GetFieldDefn(1).GetType() != ogr.OFTString:
-        gdaltest.post_reason('fail')
         return 'fail'
     if sql_lyr.GetLayerDefn().GetFieldDefn(2).GetName() != 'FLD_REAL':
-        gdaltest.post_reason('fail')
         return 'fail'
     if sql_lyr.GetLayerDefn().GetFieldDefn(2).GetType() != ogr.OFTReal:
-        gdaltest.post_reason('fail')
         return 'fail'
     if sql_lyr.GetLayerDefn().GetFieldDefn(3).GetName() != 'FLD_BINARY':
-        gdaltest.post_reason('fail')
         return 'fail'
     if sql_lyr.GetLayerDefn().GetFieldDefn(3).GetType() != ogr.OFTBinary:
-        gdaltest.post_reason('fail')
         return 'fail'
     if sql_lyr.GetLayerDefn().GetFieldDefn(4).GetName() != 'FLD_INTEGER64':
-        gdaltest.post_reason('fail')
         return 'fail'
     if sql_lyr.GetLayerDefn().GetFieldDefn(4).GetType() != ogr.OFTInteger64:
-        gdaltest.post_reason('fail')
         return 'fail'
     gdaltest.gpkg_ds.ReleaseResultSet(sql_lyr)
 
     sql_lyr = gdaltest.gpkg_ds.ExecuteSQL('SELECT * FROM tbl_linestring_renamed WHERE 0=1')
     feat = sql_lyr.GetNextFeature()
     if feat is not None:
-        gdaltest.post_reason('fail')
         return 'fail'
     gdaltest.gpkg_ds.ReleaseResultSet(sql_lyr)
 
@@ -750,27 +717,21 @@ def test_ogr_gpkg_12():
         sql_lyr = gdaltest.gpkg_ds.ExecuteSQL(sql)
         feat = sql_lyr.GetNextFeature()
         if feat is None:
-            gdaltest.post_reason('fail')
             return 'fail'
         feat = sql_lyr.GetNextFeature()
         if feat is not None:
-            gdaltest.post_reason('fail')
             return 'fail'
         if sql_lyr.GetFeatureCount() != 1:
-            gdaltest.post_reason('fail')
             return 'fail'
         gdaltest.gpkg_ds.ReleaseResultSet(sql_lyr)
 
     sql_lyr = gdaltest.gpkg_ds.ExecuteSQL('SELECT sqlite_version()')
     feat = sql_lyr.GetNextFeature()
     if feat is None:
-        gdaltest.post_reason('fail')
         return 'fail'
     if sql_lyr.GetLayerDefn().GetFieldCount() != 1:
-        gdaltest.post_reason('fail')
         return 'fail'
     if sql_lyr.GetLayerDefn().GetGeomFieldCount() != 0:
-        gdaltest.post_reason('fail')
         return 'fail'
     gdaltest.gpkg_ds.ReleaseResultSet(sql_lyr)
 
@@ -798,12 +759,10 @@ def test_ogr_gpkg_13():
     feat = lyr.GetNextFeature()
     if not feat.IsFieldNull('fld_integer'):
         feat.DumpReadable()
-        gdaltest.post_reason('fail')
         return 'fail'
     feat = lyr.GetNextFeature()
     if feat.GetField('fld_integer') != 1:
         feat.DumpReadable()
-        gdaltest.post_reason('fail')
         return 'fail'
 
     # Test second aspatial layer
@@ -815,25 +774,20 @@ def test_ogr_gpkg_13():
         gdaltest.post_reason('fail : warning NOT expected')
         return 'fail'
     if gdaltest.gpkg_ds.GetLayerCount() != 5:
-        gdaltest.post_reason('fail')
         return 'fail'
     lyr = gdaltest.gpkg_ds.GetLayer('non_spatial')
     if lyr.GetGeomType() != ogr.wkbNone:
-        gdaltest.post_reason('fail')
         return 'fail'
     feat = lyr.GetNextFeature()
     if not feat.IsFieldNull('fld_integer'):
-        gdaltest.post_reason('fail')
         return 'fail'
     feat = lyr.GetNextFeature()
     if feat.GetField('fld_integer') != 1:
         feat.DumpReadable()
-        gdaltest.post_reason('fail')
         return 'fail'
 
     sql_lyr = gdaltest.gpkg_ds.ExecuteSQL("SELECT * FROM gpkg_extensions WHERE table_name IS NULL AND extension_name = 'gdal_aspatial'")
     if sql_lyr.GetFeatureCount() != 1:
-        gdaltest.post_reason('fail')
         return 'fail'
     gdaltest.gpkg_ds.ReleaseResultSet(sql_lyr)
 
@@ -853,7 +807,6 @@ def test_ogr_gpkg_14():
 
     lyr = gdaltest.gpkg_ds.CreateLayer('point_no_spi-but-with-dashes', geom_type=ogr.wkbPoint, options=['SPATIAL_INDEX=NO'], srs=sr)
     if lyr.TestCapability(ogr.OLCFastSpatialFilter) != 0:
-        gdaltest.post_reason('fail')
         return 'fail'
     feat = ogr.Feature(lyr.GetLayerDefn())
     feat.SetGeometry(ogr.CreateGeometryFromWkt('POINT(1000 30000000)'))
@@ -877,12 +830,10 @@ def test_ogr_gpkg_14():
 
     f = lyr.GetFeature(5)
     if f.GetGeometryRef() is not None:
-        gdaltest.post_reason('fail')
         f.DumpReadable()
         return 'fail'
     f = lyr.GetFeature(6)
     if f.GetGeometryRef().ExportToWkt() != 'POINT EMPTY':
-        gdaltest.post_reason('fail')
         f.DumpReadable()
         return 'fail'
     f = None
@@ -891,12 +842,10 @@ def test_ogr_gpkg_14():
     res = sql_lyr.TestCapability(ogr.OLCFastSpatialFilter)
     gdaltest.gpkg_ds.ReleaseResultSet(sql_lyr)
     if res != 0:
-        gdaltest.post_reason('fail')
         return 'fail'
 
     lyr = gdaltest.gpkg_ds.CreateLayer('point-with-spi-and-dashes', geom_type=ogr.wkbPoint)
     if lyr.TestCapability(ogr.OLCFastSpatialFilter) != 1:
-        gdaltest.post_reason('fail')
         return 'fail'
     feat = ogr.Feature(lyr.GetLayerDefn())
     feat.SetGeometry(ogr.CreateGeometryFromWkt('POINT(1000 30000000)'))
@@ -922,7 +871,6 @@ def test_ogr_gpkg_14():
     res = sql_lyr.TestCapability(ogr.OLCFastSpatialFilter)
     gdaltest.gpkg_ds.ReleaseResultSet(sql_lyr)
     if res != 1:
-        gdaltest.post_reason('fail')
         return 'fail'
 
     # Test spatial filer right away
@@ -930,11 +878,9 @@ def test_ogr_gpkg_14():
     lyr.ResetReading()
     f = lyr.GetNextFeature()
     if f is None:
-        gdaltest.post_reason('fail')
         return 'fail'
     f = lyr.GetNextFeature()
     if f is not None:
-        gdaltest.post_reason('fail')
         return 'fail'
 
     return 'success'
@@ -957,7 +903,6 @@ def test_ogr_gpkg_15():
        feat.GetField(3) != 1000 or feat.GetField(4) != 30000000 or \
        feat.GetField(5) != 1000 or feat.GetField(6) != 30000000:
         feat.DumpReadable()
-        gdaltest.post_reason('fail')
         return 'fail'
     gdaltest.gpkg_ds.ReleaseResultSet(sql_lyr)
 
@@ -968,7 +913,6 @@ def test_ogr_gpkg_15():
     if not feat.IsFieldNull(0) or not feat.IsFieldNull(1) or not feat.IsFieldNull(2) or \
        not feat.IsFieldNull(3) or not feat.IsFieldNull(4) or not feat.IsFieldNull(5) or not feat.IsFieldNull(6):
         feat.DumpReadable()
-        gdaltest.post_reason('fail')
         return 'fail'
     gdaltest.gpkg_ds.ReleaseResultSet(sql_lyr)
 
@@ -985,7 +929,6 @@ def test_ogr_gpkg_15():
         gdaltest.gpkg_ds.ReleaseResultSet(sql_lyr)
         if got_result != expected_result:
             print("expected_type=%s actual_type=%s expected_result=%d got_result=%d" % (expected_type, actual_type, expected_result, got_result))
-            gdaltest.post_reason('fail')
             return 'fail'
 
     for (sql, expected_result) in [
@@ -1023,14 +966,12 @@ def test_ogr_gpkg_15():
         gdaltest.gpkg_ds.ReleaseResultSet(sql_lyr)
         if got_result != expected_result:
             print(sql)
-            gdaltest.post_reason('fail')
             return 'fail'
 
     # NULL argument
     sql_lyr = gdaltest.gpkg_ds.ExecuteSQL("SELECT SridFromAuthCRS(NULL, 4326)")
     feat = sql_lyr.GetNextFeature()
     if feat.GetField(0) != -1:
-        gdaltest.post_reason('fail')
         feat.DumpReadable()
         return 'fail'
     gdaltest.gpkg_ds.ReleaseResultSet(sql_lyr)
@@ -1039,7 +980,6 @@ def test_ogr_gpkg_15():
     sql_lyr = gdaltest.gpkg_ds.ExecuteSQL("SELECT SridFromAuthCRS('epsg', NULL)")
     feat = sql_lyr.GetNextFeature()
     if feat.GetField(0) != -1:
-        gdaltest.post_reason('fail')
         feat.DumpReadable()
         return 'fail'
     gdaltest.gpkg_ds.ReleaseResultSet(sql_lyr)
@@ -1048,7 +988,6 @@ def test_ogr_gpkg_15():
     sql_lyr = gdaltest.gpkg_ds.ExecuteSQL("SELECT SridFromAuthCRS('epsg', 4326)")
     feat = sql_lyr.GetNextFeature()
     if feat.GetField(0) != 4326:
-        gdaltest.post_reason('fail')
         feat.DumpReadable()
         return 'fail'
     gdaltest.gpkg_ds.ReleaseResultSet(sql_lyr)
@@ -1057,7 +996,6 @@ def test_ogr_gpkg_15():
     sql_lyr = gdaltest.gpkg_ds.ExecuteSQL("SELECT SridFromAuthCRS('epsg', 1234)")
     feat = sql_lyr.GetNextFeature()
     if feat.GetField(0) != -1:
-        gdaltest.post_reason('fail')
         feat.DumpReadable()
         return 'fail'
     gdaltest.gpkg_ds.ReleaseResultSet(sql_lyr)
@@ -1066,7 +1004,6 @@ def test_ogr_gpkg_15():
     sql_lyr = gdaltest.gpkg_ds.ExecuteSQL("SELECT ImportFromEPSG(NULL)")
     feat = sql_lyr.GetNextFeature()
     if feat.GetField(0) != -1:
-        gdaltest.post_reason('fail')
         feat.DumpReadable()
         return 'fail'
     gdaltest.gpkg_ds.ReleaseResultSet(sql_lyr)
@@ -1075,7 +1012,6 @@ def test_ogr_gpkg_15():
     sql_lyr = gdaltest.gpkg_ds.ExecuteSQL("SELECT ImportFromEPSG(4326)")
     feat = sql_lyr.GetNextFeature()
     if feat.GetField(0) != 4326:
-        gdaltest.post_reason('fail')
         feat.DumpReadable()
         return 'fail'
     gdaltest.gpkg_ds.ReleaseResultSet(sql_lyr)
@@ -1084,7 +1020,6 @@ def test_ogr_gpkg_15():
     sql_lyr = gdaltest.gpkg_ds.ExecuteSQL("SELECT ImportFromEPSG(32633)")
     feat = sql_lyr.GetNextFeature()
     if feat.GetField(0) != 32633:
-        gdaltest.post_reason('fail')
         feat.DumpReadable()
         return 'fail'
     gdaltest.gpkg_ds.ReleaseResultSet(sql_lyr)
@@ -1094,7 +1029,6 @@ def test_ogr_gpkg_15():
         sql_lyr = gdaltest.gpkg_ds.ExecuteSQL("SELECT ImportFromEPSG(0)")
     feat = sql_lyr.GetNextFeature()
     if feat.GetField(0) != -1:
-        gdaltest.post_reason('fail')
         feat.DumpReadable()
         return 'fail'
     gdaltest.gpkg_ds.ReleaseResultSet(sql_lyr)
@@ -1103,7 +1037,6 @@ def test_ogr_gpkg_15():
     sql_lyr = gdaltest.gpkg_ds.ExecuteSQL("SELECT ST_Transform(NULL, 4326)")
     feat = sql_lyr.GetNextFeature()
     if feat.GetGeometryRef() is not None:
-        gdaltest.post_reason('fail')
         feat.DumpReadable()
         return 'fail'
     gdaltest.gpkg_ds.ReleaseResultSet(sql_lyr)
@@ -1113,7 +1046,6 @@ def test_ogr_gpkg_15():
         sql_lyr = gdaltest.gpkg_ds.ExecuteSQL("SELECT ST_Transform(x'00', 4326)")
     feat = sql_lyr.GetNextFeature()
     if feat.GetGeometryRef() is not None:
-        gdaltest.post_reason('fail')
         feat.DumpReadable()
         return 'fail'
     gdaltest.gpkg_ds.ReleaseResultSet(sql_lyr)
@@ -1122,7 +1054,6 @@ def test_ogr_gpkg_15():
     sql_lyr = gdaltest.gpkg_ds.ExecuteSQL("SELECT ST_Transform(geom, NULL) FROM tbl_linestring_renamed")
     feat = sql_lyr.GetNextFeature()
     if feat.GetGeometryRef() is not None:
-        gdaltest.post_reason('fail')
         feat.DumpReadable()
         return 'fail'
     gdaltest.gpkg_ds.ReleaseResultSet(sql_lyr)
@@ -1132,7 +1063,6 @@ def test_ogr_gpkg_15():
         sql_lyr = gdaltest.gpkg_ds.ExecuteSQL("SELECT ST_Transform(geom, 0) FROM tbl_linestring_renamed")
     feat = sql_lyr.GetNextFeature()
     if feat.GetGeometryRef() is not None:
-        gdaltest.post_reason('fail')
         feat.DumpReadable()
         return 'fail'
     gdaltest.gpkg_ds.ReleaseResultSet(sql_lyr)
@@ -1142,7 +1072,6 @@ def test_ogr_gpkg_15():
         sql_lyr = gdaltest.gpkg_ds.ExecuteSQL("SELECT ST_Transform(geom, 4326) FROM \"point-with-spi-and-dashes\"")
     feat = sql_lyr.GetNextFeature()
     if feat.GetGeometryRef() is not None:
-        gdaltest.post_reason('fail')
         feat.DumpReadable()
         return 'fail'
     gdaltest.gpkg_ds.ReleaseResultSet(sql_lyr)
@@ -1152,7 +1081,6 @@ def test_ogr_gpkg_15():
         sql_lyr = gdaltest.gpkg_ds.ExecuteSQL("SELECT ST_Transform(x'0001E610000000000000000000000000000000000000000000000000000000000000000000007C04000000000000FE', 4326) FROM tbl_linestring_renamed")
     feat = sql_lyr.GetNextFeature()
     if feat.GetGeometryRef() is not None:
-        gdaltest.post_reason('fail')
         feat.DumpReadable()
         return 'fail'
     gdaltest.gpkg_ds.ReleaseResultSet(sql_lyr)
@@ -1161,7 +1089,6 @@ def test_ogr_gpkg_15():
         sql_lyr = gdaltest.gpkg_ds.ExecuteSQL("SELECT ST_Transform(geom, ST_SRID(geom)) FROM tbl_linestring_renamed")
         feat = sql_lyr.GetNextFeature()
         if feat.GetGeometryRef().ExportToWkt() != 'LINESTRING (5 5,10 5,10 10,5 10)':
-            gdaltest.post_reason('fail')
             feat.DumpReadable()
             return 'fail'
         gdaltest.gpkg_ds.ReleaseResultSet(sql_lyr)
@@ -1169,7 +1096,6 @@ def test_ogr_gpkg_15():
         sql_lyr = gdaltest.gpkg_ds.ExecuteSQL("SELECT ST_SRID(ST_Transform(geom, 4326)) FROM tbl_linestring_renamed")
         feat = sql_lyr.GetNextFeature()
         if feat.GetField(0) != 4326:
-            gdaltest.post_reason('fail')
             feat.DumpReadable()
             return 'fail'
         gdaltest.gpkg_ds.ReleaseResultSet(sql_lyr)
@@ -1178,7 +1104,6 @@ def test_ogr_gpkg_15():
         sql_lyr = gdaltest.gpkg_ds.ExecuteSQL("SELECT ST_SRID(ST_Transform(x'0001E610000000000000000000000000000000000000000000000000000000000000000000007C0400000000000000FE', 4326)) FROM tbl_linestring_renamed")
         feat = sql_lyr.GetNextFeature()
         if feat.GetField(0) != 4326:
-            gdaltest.post_reason('fail')
             feat.DumpReadable()
             return 'fail'
         gdaltest.gpkg_ds.ReleaseResultSet(sql_lyr)
@@ -1187,7 +1112,6 @@ def test_ogr_gpkg_15():
     sql_lyr = gdaltest.gpkg_ds.ExecuteSQL("SELECT ST_MinX(x'00')")
     feat = sql_lyr.GetNextFeature()
     if feat.IsFieldSetAndNotNull(0):
-        gdaltest.post_reason('fail')
         feat.DumpReadable()
         return 'fail'
     feat = None
@@ -1197,7 +1121,6 @@ def test_ogr_gpkg_15():
     sql_lyr = gdaltest.gpkg_ds.ExecuteSQL("SELECT ST_MinX(x'0001020304050607')")
     feat = sql_lyr.GetNextFeature()
     if feat.IsFieldSetAndNotNull(0):
-        gdaltest.post_reason('fail')
         feat.DumpReadable()
         return 'fail'
     feat = None
@@ -1207,7 +1130,6 @@ def test_ogr_gpkg_15():
     sql_lyr = gdaltest.gpkg_ds.ExecuteSQL("SELECT ST_GeometryType(x'4750001100000000')")
     feat = sql_lyr.GetNextFeature()
     if feat.IsFieldSetAndNotNull(0):
-        gdaltest.post_reason('fail')
         feat.DumpReadable()
         return 'fail'
     feat = None
@@ -1217,7 +1139,6 @@ def test_ogr_gpkg_15():
     sql_lyr = gdaltest.gpkg_ds.ExecuteSQL("SELECT ST_GeometryType(x'475000110000000001040000')")
     feat = sql_lyr.GetNextFeature()
     if feat.IsFieldSetAndNotNull(0):
-        gdaltest.post_reason('fail')
         feat.DumpReadable()
         return 'fail'
     feat = None
@@ -1227,7 +1148,6 @@ def test_ogr_gpkg_15():
     sql_lyr = gdaltest.gpkg_ds.ExecuteSQL("SELECT ST_GeometryType(x'47500011000000000104000000')")
     feat = sql_lyr.GetNextFeature()
     if feat.GetField(0) != 'MULTIPOINT':
-        gdaltest.post_reason('fail')
         feat.DumpReadable()
         return 'fail'
     feat = None
@@ -1237,7 +1157,6 @@ def test_ogr_gpkg_15():
     sql_lyr = gdaltest.gpkg_ds.ExecuteSQL("SELECT ST_GeometryType(x'00010000000000000000000000000000000000000000000000000000000000000000000000007C0400000000000000FE')")
     feat = sql_lyr.GetNextFeature()
     if feat.GetField(0) != 'MULTIPOINT':
-        gdaltest.post_reason('fail')
         feat.DumpReadable()
         return 'fail'
     feat = None
@@ -1247,7 +1166,6 @@ def test_ogr_gpkg_15():
     sql_lyr = gdaltest.gpkg_ds.ExecuteSQL("SELECT ST_IsEmpty(x'00010000000000000000000000000000000000000000000000000000000000000000000000007C0400000000000000FE')")
     feat = sql_lyr.GetNextFeature()
     if feat.GetField(0) != 1:
-        gdaltest.post_reason('fail')
         feat.DumpReadable()
         return 'fail'
     feat = None
@@ -1258,7 +1176,6 @@ def test_ogr_gpkg_15():
         sql_lyr = gdaltest.gpkg_ds.ExecuteSQL("SELECT ST_GeometryType(x'475000030000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000')")
     feat = sql_lyr.GetNextFeature()
     if feat.IsFieldSetAndNotNull(0):
-        gdaltest.post_reason('fail')
         feat.DumpReadable()
         return 'fail'
     feat = None
@@ -1280,7 +1197,6 @@ def test_ogr_gpkg_15():
     sql_lyr = gdaltest.gpkg_ds.ExecuteSQL("SELECT hstore_get_value('a=>b', 'a')")
     feat = sql_lyr.GetNextFeature()
     if feat.GetField(0) != 'b':
-        gdaltest.post_reason('fail')
         feat.DumpReadable()
         return 'fail'
     feat = None
@@ -1290,7 +1206,6 @@ def test_ogr_gpkg_15():
     sql_lyr = gdaltest.gpkg_ds.ExecuteSQL("SELECT hstore_get_value('a=>b', 'x')")
     feat = sql_lyr.GetNextFeature()
     if feat.GetField(0) is not None:
-        gdaltest.post_reason('fail')
         feat.DumpReadable()
         return 'fail'
     feat = None
@@ -1300,7 +1215,6 @@ def test_ogr_gpkg_15():
     sql_lyr = gdaltest.gpkg_ds.ExecuteSQL("SELECT hstore_get_value('a=>b', NULL)")
     feat = sql_lyr.GetNextFeature()
     if feat.GetField(0) is not None:
-        gdaltest.post_reason('fail')
         feat.DumpReadable()
         return 'fail'
     feat = None
@@ -1310,7 +1224,6 @@ def test_ogr_gpkg_15():
     sql_lyr = gdaltest.gpkg_ds.ExecuteSQL("SELECT hstore_get_value(NULL, 'a')")
     feat = sql_lyr.GetNextFeature()
     if feat.GetField(0) is not None:
-        gdaltest.post_reason('fail')
         feat.DumpReadable()
         return 'fail'
     feat = None
@@ -1332,11 +1245,9 @@ def test_ogr_gpkg_15():
         sql_lyr = gdaltest.gpkg_ds.ExecuteSQL(
             "SELECT ST_Buffer(geom, 0) FROM tbl_linestring_renamed")
         if sql_lyr.GetGeomType() != ogr.wkbPolygon:
-            gdaltest.post_reason('fail')
             print(sql_lyr.GetGeomType())
             return 'fail'
         if sql_lyr.GetSpatialRef().ExportToWkt().find('32631') < 0:
-            gdaltest.post_reason('fail')
             print(sql_lyr.GetSpatialRef())
             return 'fail'
         gdaltest.gpkg_ds.ReleaseResultSet(sql_lyr)
@@ -1519,17 +1430,14 @@ def test_ogr_gpkg_18():
 
     lyr = ds.GetLayer(0)
     if lyr.GetGeomType() != ogr.wkbCircularString:
-        gdaltest.post_reason('fail')
         return 'fail'
     f = lyr.GetNextFeature()
     g = f.GetGeometryRef()
     if g.GetGeometryType() != ogr.wkbCircularString:
-        gdaltest.post_reason('fail')
         return 'fail'
 
     sql_lyr = ds.ExecuteSQL("SELECT * FROM gpkg_extensions WHERE table_name = 'wkbCircularString' AND extension_name = 'gpkg_geom_CIRCULARSTRING'")
     if sql_lyr.GetFeatureCount() != 1:
-        gdaltest.post_reason('fail')
         return 'fail'
     ds.ReleaseResultSet(sql_lyr)
     ds = None
@@ -1546,7 +1454,6 @@ def test_ogr_gpkg_18():
 
     sql_lyr = ds.ExecuteSQL("SELECT * FROM gpkg_extensions WHERE table_name = 'test' AND extension_name = 'gpkg_geom_CIRCULARSTRING'")
     if sql_lyr.GetFeatureCount() != 1:
-        gdaltest.post_reason('fail')
         return 'fail'
     ds.ReleaseResultSet(sql_lyr)
 
@@ -1561,7 +1468,6 @@ def test_ogr_gpkg_18():
     f = lyr.GetNextFeature()
     g = f.GetGeometryRef()
     if g.GetGeometryType() != ogr.wkbCircularString:
-        gdaltest.post_reason('fail')
         return 'fail'
 
     ds = None
@@ -1572,7 +1478,6 @@ def test_ogr_gpkg_18():
     f.SetGeometry(ogr.CreateGeometryFromWkt('CIRCULARSTRING(0 0,1 0,0 0)'))
     ret = lyr.CreateFeature(f)
     if ret != 0 or gdal.GetLastErrorMsg() != '':
-        gdaltest.post_reason('fail')
         return 'fail'
     f = None
     ds = None
@@ -1584,7 +1489,6 @@ def test_ogr_gpkg_18():
         ds.FlushCache()
     sql_lyr = ds.ExecuteSQL("SELECT * FROM gpkg_extensions WHERE table_name = 'test' AND extension_name = 'gpkg_geom_TRIANGLE'")
     if sql_lyr.GetFeatureCount() != 1:
-        gdaltest.post_reason('fail')
         return 'fail'
     ds.ReleaseResultSet(sql_lyr)
     ds = None
@@ -1603,7 +1507,6 @@ def test_ogr_gpkg_18():
     f = None
     sql_lyr = ds.ExecuteSQL("SELECT * FROM gpkg_extensions WHERE table_name = 'test' AND extension_name LIKE 'gpkg_geom_%'")
     if sql_lyr.GetFeatureCount() != 1:
-        gdaltest.post_reason('fail')
         return 'fail'
     ds.ReleaseResultSet(sql_lyr)
     ds = None
@@ -1623,11 +1526,9 @@ def test_ogr_gpkg_19():
 
     ds = gdaltest.gpkg_dr.CreateDataSource('/vsimem/ogr_gpkg_19.gpkg')
     if ds.GetMetadata():
-        gdaltest.post_reason('fail')
         return 'fail'
     lyr = ds.CreateLayer('test_without_md')
     if lyr.GetMetadata():
-        gdaltest.post_reason('fail')
         return 'fail'
 
     ds.SetMetadataItem('foo', 'bar')
@@ -1643,18 +1544,15 @@ def test_ogr_gpkg_19():
     ds = ogr.Open('/vsimem/ogr_gpkg_19.gpkg')
     if ds.GetMetadataDomainList() != ['']:
         print(ds.GetMetadataDomainList())
-        gdaltest.post_reason('fail')
         return 'fail'
 
     ds = ogr.Open('/vsimem/ogr_gpkg_19.gpkg')
     if len(ds.GetMetadata()) != 1:
         print(ds.GetMetadata())
-        gdaltest.post_reason('fail')
         return 'fail'
 
     ds = ogr.Open('/vsimem/ogr_gpkg_19.gpkg')
     if ds.GetMetadataItem('foo') != 'bar':
-        gdaltest.post_reason('fail')
         print(ds.GetMetadata())
         return 'fail'
     ds = None
@@ -1669,18 +1567,15 @@ def test_ogr_gpkg_19():
     ds = ogr.Open('/vsimem/ogr_gpkg_19.gpkg')
     lyr = ds.GetLayer('test_with_md')
     if lyr.GetMetadataItem('IDENTIFIER') != 'ident':
-        gdaltest.post_reason('fail')
         print(lyr.GetMetadataItem('IDENTIFIER'))
         return 'fail'
     if lyr.GetMetadataItem('DESCRIPTION') != 'desc':
-        gdaltest.post_reason('fail')
         print(lyr.GetMetadataItem('DESCRIPTION'))
         return 'fail'
 
     ds = ogr.Open('/vsimem/ogr_gpkg_19.gpkg', update=1)
     lyr = ds.GetLayer('test_with_md')
     if lyr.GetMetadata() != {'IDENTIFIER': 'ident', 'DESCRIPTION': 'desc'}:
-        gdaltest.post_reason('fail')
         print(lyr.GetMetadata())
         return 'fail'
     lyr.SetMetadataItem('IDENTIFIER', 'another_ident')
@@ -1693,7 +1588,6 @@ def test_ogr_gpkg_19():
     ds = ogr.Open('/vsimem/ogr_gpkg_19.gpkg', update=1)
     lyr = ds.GetLayer('test_with_md')
     if lyr.GetMetadata() != {'IDENTIFIER': 'another_ident', 'DESCRIPTION': 'another_desc'}:
-        gdaltest.post_reason('fail')
         print(lyr.GetMetadata())
         return 'fail'
     lyr.SetMetadataItem('foo', 'bar')
@@ -1703,7 +1597,6 @@ def test_ogr_gpkg_19():
     ds = ogr.Open('/vsimem/ogr_gpkg_19.gpkg', update=1)
     lyr = ds.GetLayer('test_with_md')
     if lyr.GetMetadataDomainList() != ['', 'another_domain']:
-        gdaltest.post_reason('fail')
         print(lyr.GetMetadataDomainList())
         return 'fail'
     ds = None
@@ -1711,11 +1604,9 @@ def test_ogr_gpkg_19():
     ds = ogr.Open('/vsimem/ogr_gpkg_19.gpkg', update=1)
     lyr = ds.GetLayer('test_with_md')
     if lyr.GetMetadata() != {'IDENTIFIER': 'another_ident', 'foo': 'bar', 'DESCRIPTION': 'another_desc'}:
-        gdaltest.post_reason('fail')
         print(lyr.GetMetadata())
         return 'fail'
     if lyr.GetMetadata('another_domain') != {'bar': 'baz'}:
-        gdaltest.post_reason('fail')
         print(lyr.GetMetadata('another_domain'))
         return 'fail'
     lyr.SetMetadata(None)
@@ -1725,11 +1616,9 @@ def test_ogr_gpkg_19():
     ds = ogr.Open('/vsimem/ogr_gpkg_19.gpkg', update=1)
     lyr = ds.GetLayer('test_with_md')
     if lyr.GetMetadata() != {'IDENTIFIER': 'another_ident', 'DESCRIPTION': 'another_desc'}:
-        gdaltest.post_reason('fail')
         print(lyr.GetMetadata())
         return 'fail'
     if lyr.GetMetadataDomainList() != ['']:
-        gdaltest.post_reason('fail')
         print(lyr.GetMetadataDomainList())
         return 'fail'
     ds = None
@@ -1777,7 +1666,6 @@ def test_ogr_gpkg_20():
     fc = sql_lyr.GetFeatureCount()
     ds.ReleaseResultSet(sql_lyr)
     if fc != 1:
-        gdaltest.post_reason('fail')
         print(fc)
         return 'fail'
 
@@ -1785,18 +1673,15 @@ def test_ogr_gpkg_20():
     fc = sql_lyr.GetFeatureCount()
     ds.ReleaseResultSet(sql_lyr)
     if fc != 1:
-        gdaltest.post_reason('fail')
         print(fc)
         return 'fail'
 
     lyr = ds.GetLayer('my_org_4326')
     if lyr.GetSpatialRef().ExportToWkt().find('my geogcs') < 0:
-        gdaltest.post_reason('fail')
         print(lyr.GetSpatialRef().ExportToWkt())
         return 'fail'
     lyr = ds.GetLayer('without_org')
     if lyr.GetSpatialRef().ExportToWkt().find('another geogcs') < 0:
-        gdaltest.post_reason('fail')
         print(lyr.GetSpatialRef().ExportToWkt())
         return 'fail'
     ds = None
@@ -1874,14 +1759,12 @@ def test_ogr_gpkg_21():
     ds = ogr.Open('/vsimem/ogr_gpkg_21.gpkg', update=1)
     lyr = ds.GetLayer(0)
     if lyr.GetLayerDefn().GetFieldDefn(0).GetWidth() != 2:
-        gdaltest.post_reason('fail')
         return 'fail'
     f = ogr.Feature(lyr.GetLayerDefn())
     f.SetField(0, 'ab')
     gdal.ErrorReset()
     lyr.CreateFeature(f)
     if gdal.GetLastErrorMsg() != '':
-        gdaltest.post_reason('fail')
         return 'fail'
 
     f = ogr.Feature(lyr.GetLayerDefn())
@@ -1891,7 +1774,6 @@ def test_ogr_gpkg_21():
     lyr.CreateFeature(f)
     gdal.PopErrorHandler()
     if gdal.GetLastErrorMsg() == '':
-        gdaltest.post_reason('fail')
         return 'fail'
 
     f = ogr.Feature(lyr.GetLayerDefn())
@@ -1901,12 +1783,10 @@ def test_ogr_gpkg_21():
     lyr.CreateFeature(f)
     gdal.PopErrorHandler()
     if gdal.GetLastErrorMsg() == '':
-        gdaltest.post_reason('fail')
         return 'fail'
 
     f = lyr.GetFeature(f.GetFID())
     if f.GetField(0) != 'abc':
-        gdaltest.post_reason('fail')
         return 'fail'
 
     gdal.Unlink('/vsimem/ogr_gpkg_21.gpkg')
@@ -1924,12 +1804,10 @@ def test_ogr_gpkg_21():
     lyr.CreateFeature(f)
     gdal.PopErrorHandler()
     if gdal.GetLastErrorMsg() == '':
-        gdaltest.post_reason('fail')
         return 'fail'
 
     f = lyr.GetFeature(f.GetFID())
     if f.GetField(0) != 'A_':
-        gdaltest.post_reason('fail')
         return 'fail'
 
     f = ogr.Feature(lyr.GetLayerDefn())
@@ -1939,14 +1817,11 @@ def test_ogr_gpkg_21():
     lyr.CreateFeature(f)
     gdal.PopErrorHandler()
     if gdal.GetLastErrorMsg() == '':
-        gdaltest.post_reason('fail')
         return 'fail'
 
     f = lyr.GetFeature(f.GetFID())
     if f.GetField(0) != 'ab':
-        gdaltest.post_reason('fail')
-
-    gdal.Unlink('/vsimem/ogr_gpkg_21.gpkg')
+        gdal.Unlink('/vsimem/ogr_gpkg_21.gpkg')
 
     return 'success'
 
@@ -1975,11 +1850,9 @@ def test_ogr_gpkg_22():
     ds = ogr.Open('/vsimem/ogr_gpkg_22.gpkg')
     lyr = ds.GetLayerByName('test')
     if lyr.GetMetadataItem(ogr.OLMD_FID64) is None:
-        gdaltest.post_reason('fail')
         return 'fail'
     f = lyr.GetNextFeature()
     if f.GetFID() != 1234567890123:
-        gdaltest.post_reason('failure')
         return 'fail'
 
     gdal.Unlink('/vsimem/ogr_gpkg_22.gpkg')
@@ -2019,7 +1892,6 @@ def test_ogr_gpkg_23():
     ret = lyr.CreateFeature(f)
     gdal.PopErrorHandler()
     if ret == 0:
-        gdaltest.post_reason('fail')
         return 'fail'
     f = None
 
@@ -2030,7 +1902,6 @@ def test_ogr_gpkg_23():
     ret = lyr.CreateFeature(f)
     gdal.PopErrorHandler()
     if ret == 0:
-        gdaltest.post_reason('fail')
         return 'fail'
     f = None
 
@@ -2042,7 +1913,6 @@ def test_ogr_gpkg_23():
     ret = lyr.CreateGeomField(ogr.GeomFieldDefn('foo', ogr.wkbPoint))
     gdal.PopErrorHandler()
     if ret == 0:
-        gdaltest.post_reason('fail')
         return 'fail'
 
     f = ogr.Feature(lyr.GetLayerDefn())
@@ -2067,7 +1937,6 @@ def test_ogr_gpkg_23():
     fc = sql_lyr.GetFeatureCount()
     ds.ReleaseResultSet(sql_lyr)
     if fc != 2:
-        gdaltest.post_reason('fail')
         return 'fail'
 
     sql_lyr = ds.ExecuteSQL("SELECT * FROM gpkg_extensions")
@@ -2076,14 +1945,12 @@ def test_ogr_gpkg_23():
     ds.ReleaseResultSet(sql_lyr)
     if fc != 2:  # r-tree and aspatial
         print(fc)
-        gdaltest.post_reason('fail')
         return 'fail'
 
     sql_lyr = ds.ExecuteSQL("SELECT * FROM gpkg_geometry_columns")
     fc = sql_lyr.GetFeatureCount()
     ds.ReleaseResultSet(sql_lyr)
     if fc != 2:
-        gdaltest.post_reason('fail')
         return 'fail'
 
     field_defn = ogr.GeomFieldDefn('geomfield_not_nullable', ogr.wkbPoint)
@@ -2094,7 +1961,6 @@ def test_ogr_gpkg_23():
     fc = sql_lyr.GetFeatureCount()
     ds.ReleaseResultSet(sql_lyr)
     if fc != 3:
-        gdaltest.post_reason('fail')
         return 'fail'
 
     sql_lyr = ds.ExecuteSQL("SELECT * FROM gpkg_extensions")
@@ -2103,14 +1969,12 @@ def test_ogr_gpkg_23():
     ds.ReleaseResultSet(sql_lyr)
     if fc != 1:  # r-tree
         print(fc)
-        gdaltest.post_reason('fail')
         return 'fail'
 
     sql_lyr = ds.ExecuteSQL("SELECT * FROM gpkg_geometry_columns")
     fc = sql_lyr.GetFeatureCount()
     ds.ReleaseResultSet(sql_lyr)
     if fc != 3:
-        gdaltest.post_reason('fail')
         return 'fail'
 
     f = ogr.Feature(lyr.GetLayerDefn())
@@ -2122,7 +1986,6 @@ def test_ogr_gpkg_23():
     # Not Nullable geometry field
     lyr = ds.CreateLayer('test4', geom_type=ogr.wkbPoint, options=['GEOMETRY_NULLABLE=NO'])
     if lyr.GetLayerDefn().GetGeomFieldDefn(0).IsNullable() != 0:
-        gdaltest.post_reason('fail')
         return 'fail'
     f = ogr.Feature(lyr.GetLayerDefn())
     f.SetGeometryDirectly(ogr.CreateGeometryFromWkt('POINT(0 0)'))
@@ -2139,39 +2002,30 @@ def test_ogr_gpkg_23():
     field_defn = ogr.GeomFieldDefn('', ogr.wkbPoint)
     with gdaltest.error_handler():
         if lyr.CreateGeomField(field_defn) == 0:
-            gdaltest.post_reason('fail')
             return 'fail'
 
     lyr = ds.GetLayerByName('test')
     if lyr.GetLayerDefn().GetFieldDefn(lyr.GetLayerDefn().GetFieldIndex('field_not_nullable')).IsNullable() != 0:
-        gdaltest.post_reason('fail')
         return 'fail'
     if lyr.GetLayerDefn().GetFieldDefn(lyr.GetLayerDefn().GetFieldIndex('field_nullable')).IsNullable() != 1:
-        gdaltest.post_reason('fail')
         return 'fail'
     if lyr.GetLayerDefn().GetGeomFieldDefn(lyr.GetLayerDefn().GetGeomFieldIndex('geomfield_not_nullable')).IsNullable() != 0:
-        gdaltest.post_reason('fail')
         return 'fail'
 
     lyr = ds.GetLayerByName('test2')
     if lyr.GetLayerDefn().GetGeomFieldDefn(0).IsNullable() != 1:
-        gdaltest.post_reason('fail')
         return 'fail'
 
     lyr = ds.GetLayerByName('test3')
     if lyr.GetLayerDefn().GetFieldDefn(lyr.GetLayerDefn().GetFieldIndex('field_not_nullable')).IsNullable() != 0:
-        gdaltest.post_reason('fail')
         return 'fail'
     if lyr.GetLayerDefn().GetFieldDefn(lyr.GetLayerDefn().GetFieldIndex('field_nullable')).IsNullable() != 1:
-        gdaltest.post_reason('fail')
         return 'fail'
     if lyr.GetLayerDefn().GetGeomFieldDefn(lyr.GetLayerDefn().GetGeomFieldIndex('geomfield_not_nullable')).IsNullable() != 0:
-        gdaltest.post_reason('fail')
         return 'fail'
 
     lyr = ds.GetLayerByName('test4')
     if lyr.GetLayerDefn().GetGeomFieldDefn(0).IsNullable() != 0:
-        gdaltest.post_reason('fail')
         return 'fail'
 
     ds = None
@@ -2259,35 +2113,26 @@ def test_ogr_gpkg_24():
     ds = ogr.Open('/vsimem/ogr_gpkg_24.gpkg', update=1)
     lyr = ds.GetLayerByName('test')
     if lyr.GetLayerDefn().GetFieldDefn(lyr.GetLayerDefn().GetFieldIndex('field_string')).GetDefault() != "'a''b'":
-        gdaltest.post_reason('fail')
         return 'fail'
     if lyr.GetLayerDefn().GetFieldDefn(lyr.GetLayerDefn().GetFieldIndex('field_int')).GetDefault() != '123':
-        gdaltest.post_reason('fail')
         return 'fail'
     if lyr.GetLayerDefn().GetFieldDefn(lyr.GetLayerDefn().GetFieldIndex('field_real')).GetDefault() != '1.23':
-        gdaltest.post_reason('fail')
         return 'fail'
     if lyr.GetLayerDefn().GetFieldDefn(lyr.GetLayerDefn().GetFieldIndex('field_nodefault')).GetDefault() is not None:
-        gdaltest.post_reason('fail')
         return 'fail'
     # Translated from "(strftime('%Y-%m-%dT%H:%M:%fZ','now'))" to CURRENT_TIMESTAMP
     if lyr.GetLayerDefn().GetFieldDefn(lyr.GetLayerDefn().GetFieldIndex('field_datetime')).GetDefault() != 'CURRENT_TIMESTAMP':
-        gdaltest.post_reason('fail')
         return 'fail'
     if lyr.GetLayerDefn().GetFieldDefn(lyr.GetLayerDefn().GetFieldIndex('field_datetime2')).GetDefault() != "'2015/06/30 12:34:56'":
-        gdaltest.post_reason('fail')
         print(lyr.GetLayerDefn().GetFieldDefn(lyr.GetLayerDefn().GetFieldIndex('field_datetime2')).GetDefault())
         return 'fail'
     if lyr.GetLayerDefn().GetFieldDefn(lyr.GetLayerDefn().GetFieldIndex('field_datetime3')).GetDefault() != "CURRENT_TIMESTAMP":
-        gdaltest.post_reason('fail')
         print(lyr.GetLayerDefn().GetFieldDefn(lyr.GetLayerDefn().GetFieldIndex('field_datetime3')).GetDefault())
         return 'fail'
     if lyr.GetLayerDefn().GetFieldDefn(lyr.GetLayerDefn().GetFieldIndex('field_datetime4')).GetDefault() != "'2015/06/30 12:34:56.123'":
-        gdaltest.post_reason('fail')
         print(lyr.GetLayerDefn().GetFieldDefn(lyr.GetLayerDefn().GetFieldIndex('field_datetime4')).GetDefault())
         return 'fail'
     if lyr.GetLayerDefn().GetFieldDefn(lyr.GetLayerDefn().GetFieldIndex('field_date')).GetDefault() != "CURRENT_DATE":
-        gdaltest.post_reason('fail')
         return 'fail'
     # if lyr.GetLayerDefn().GetFieldDefn(lyr.GetLayerDefn().GetFieldIndex('field_time')).GetDefault() != "CURRENT_TIME":
     #    gdaltest.post_reason('fail')
@@ -2303,7 +2148,6 @@ def test_ogr_gpkg_24():
        f.GetField('field_datetime5') != '2016/06/30 12:34:56.123+00' or \
        f.GetField('field_datetime6') != '2016/06/30 12:34:56+00' or \
        f.GetField('field_string2') != 'X':
-        gdaltest.post_reason('fail')
         f.DumpReadable()
         return 'fail'
 
@@ -2330,12 +2174,10 @@ def test_ogr_gpkg_25():
     ret = lyr.CreateField(ogr.FieldDefn('myfid', ogr.OFTString))
     gdal.PopErrorHandler()
     if ret == 0:
-        gdaltest.post_reason('fail')
         return 'fail'
 
     ret = lyr.CreateField(ogr.FieldDefn('myfid', ogr.OFTInteger))
     if ret != 0:
-        gdaltest.post_reason('fail')
         return 'fail'
     lyr.CreateField(ogr.FieldDefn('str2', ogr.OFTString))
 
@@ -2345,31 +2187,25 @@ def test_ogr_gpkg_25():
     feat.SetField('str2', 'second string')
     ret = lyr.CreateFeature(feat)
     if ret != 0:
-        gdaltest.post_reason('fail')
         return 'fail'
     if feat.GetFID() != 10:
-        gdaltest.post_reason('fail')
         return 'fail'
 
     feat = ogr.Feature(lyr.GetLayerDefn())
     feat.SetField('str2', 'second string')
     ret = lyr.CreateFeature(feat)
     if ret != 0:
-        gdaltest.post_reason('fail')
         return 'fail'
     if feat.GetFID() < 0:
-        gdaltest.post_reason('fail')
         feat.DumpReadable()
         return 'fail'
     if feat.GetField('myfid') != feat.GetFID():
-        gdaltest.post_reason('fail')
         feat.DumpReadable()
         return 'fail'
 
     feat.SetField('str', 'foo')
     ret = lyr.SetFeature(feat)
     if ret != 0:
-        gdaltest.post_reason('fail')
         return 'fail'
 
     feat = ogr.Feature(lyr.GetLayerDefn())
@@ -2379,14 +2215,12 @@ def test_ogr_gpkg_25():
     ret = lyr.CreateFeature(feat)
     gdal.PopErrorHandler()
     if ret == 0:
-        gdaltest.post_reason('fail')
         return 'fail'
 
     gdal.PushErrorHandler()
     ret = lyr.SetFeature(feat)
     gdal.PopErrorHandler()
     if ret == 0:
-        gdaltest.post_reason('fail')
         return 'fail'
 
     feat.UnsetField('myfid')
@@ -2394,18 +2228,15 @@ def test_ogr_gpkg_25():
     ret = lyr.SetFeature(feat)
     gdal.PopErrorHandler()
     if ret == 0:
-        gdaltest.post_reason('fail')
         return 'fail'
 
     lyr.ResetReading()
     f = lyr.GetNextFeature()
     if f.GetFID() != 10 or f.GetField('str') != 'first string' or f.GetField('str2') != 'second string' or f.GetField('myfid') != 10:
-        gdaltest.post_reason('fail')
         f.DumpReadable()
         return 'fail'
     f = lyr.GetFeature(f.GetFID())
     if f.GetFID() != 10 or f.GetField('str') != 'first string' or f.GetField('str2') != 'second string' or f.GetField('myfid') != 10:
-        gdaltest.post_reason('fail')
         f.DumpReadable()
         return 'fail'
     f = None
@@ -2428,66 +2259,55 @@ def test_ogr_gpkg_26():
     ds = gdaltest.gpkg_dr.CreateDataSource('/vsimem/ogr_gpkg_26.gpkg')
 
     if ds.TestCapability(ogr.ODsCTransactions) != 1:
-        gdaltest.post_reason('fail')
         return 'fail'
 
     ret = ds.StartTransaction()
     if ret != 0:
-        gdaltest.post_reason('fail')
         return 'fail'
     gdal.PushErrorHandler()
     ret = ds.StartTransaction()
     gdal.PopErrorHandler()
     if ret == 0:
-        gdaltest.post_reason('fail')
         return 'fail'
 
     lyr = ds.CreateLayer('test')
     lyr.CreateField(ogr.FieldDefn('foo', ogr.OFTString))
     ret = ds.RollbackTransaction()
     if ret != 0:
-        gdaltest.post_reason('fail')
         return 'fail'
     gdal.PushErrorHandler()
     ret = ds.RollbackTransaction()
     gdal.PopErrorHandler()
     if ret == 0:
-        gdaltest.post_reason('fail')
         return 'fail'
     ds = None
 
     ds = ogr.Open('/vsimem/ogr_gpkg_26.gpkg', update=1)
     if ds.GetLayerCount() != 0:
-        gdaltest.post_reason('fail')
         return 'fail'
     ret = ds.StartTransaction()
     if ret != 0:
-        gdaltest.post_reason('fail')
         return 'fail'
     gdal.PushErrorHandler()
     ret = ds.StartTransaction()
     gdal.PopErrorHandler()
     if ret == 0:
-        gdaltest.post_reason('fail')
         return 'fail'
 
     lyr = ds.CreateLayer('test')
     lyr.CreateField(ogr.FieldDefn('foo', ogr.OFTString))
     ret = ds.CommitTransaction()
     if ret != 0:
-        gdaltest.post_reason('fail')
         return 'fail'
     gdal.PushErrorHandler()
     ret = ds.CommitTransaction()
     gdal.PopErrorHandler()
     if ret == 0:
-        gdaltest.post_reason('fail')
         return 'fail'
     ds = None
 
     ds = ogr.Open('/vsimem/ogr_gpkg_26.gpkg', update=1)
     if ds.GetLayerCount() != 1:
-        gdaltest.post_reason('fail')
         return 'fail'
     lyr = ds.GetLayerByName('test')
 
@@ -2496,14 +2316,11 @@ def test_ogr_gpkg_26():
     lyr.ResetReading()
     f = lyr.GetNextFeature()
     if f is None:
-        gdaltest.post_reason('fail')
         return 'fail'
     if lyr.GetFeatureCount() != 1:
-        gdaltest.post_reason('fail')
         return 'fail'
     ds.RollbackTransaction()
     if lyr.GetFeatureCount() != 0:
-        gdaltest.post_reason('fail')
         return 'fail'
 
     ds.StartTransaction()
@@ -2512,16 +2329,13 @@ def test_ogr_gpkg_26():
     lyr.ResetReading()
     f = lyr.GetNextFeature()
     if f is None or f.GetFID() != 1:
-        gdaltest.post_reason('fail')
         return 'fail'
     ds.CommitTransaction()
     # the cursor is still valid after CommitTransaction(), which isn't the case for other backends such as PG !
     f = lyr.GetNextFeature()
     if f is None or f.GetFID() != 2:
-        gdaltest.post_reason('fail')
         return 'fail'
     if lyr.GetFeatureCount() != 2:
-        gdaltest.post_reason('fail')
         return 'fail'
 
     ds.StartTransaction()
@@ -2533,7 +2347,6 @@ def test_ogr_gpkg_26():
     ret = lyr.CreateFeature(f)
     ds.CommitTransaction()
     if ret != 0:
-        gdaltest.post_reason('fail')
         return 'fail'
 
     ds.StartTransaction()
@@ -2542,7 +2355,6 @@ def test_ogr_gpkg_26():
     ret = lyr.CreateFeature(f)
     ds.CommitTransaction()
     if ret != 0:
-        gdaltest.post_reason('fail')
         return 'fail'
 
     if False:  # pylint: disable=using-constant-test
@@ -2568,7 +2380,6 @@ def test_ogr_gpkg_26():
         # For some reason fails with SQLite 3.6.X with 'failed to execute insert : callback requested query abort'
         # but not with later versions...
         if ret != 0:
-            gdaltest.post_reason('fail')
             return 'fail'
 
     ds = None
@@ -2603,7 +2414,6 @@ def test_ogr_gpkg_27():
     sql_lyr = ds.ExecuteSQL('SELECT GeomFromGPB(geom) FROM test')
     f = sql_lyr.GetNextFeature()
     if f.GetGeometryRef().ExportToWkt() != 'POINT (2 49)':
-        gdaltest.post_reason('fail')
         f.DumpReadable()
         return 'fail'
     ds.ReleaseResultSet(sql_lyr)
@@ -2644,18 +2454,15 @@ def test_ogr_gpkg_29():
 
     ds = gdaltest.gpkg_dr.CreateDataSource('/vsimem/ogr_gpkg_29.gpkg')
     if ds.TestCapability(ogr.ODsCMeasuredGeometries) != 1:
-        gdaltest.post_reason('fail')
         return 'fail'
     lyr = ds.CreateLayer('pointm', geom_type=ogr.wkbPointM)
     if lyr.TestCapability(ogr.OLCMeasuredGeometries) != 1:
-        gdaltest.post_reason('fail')
         return 'fail'
     f = ogr.Feature(lyr.GetLayerDefn())
     f.SetGeometryDirectly(ogr.CreateGeometryFromWkt('POINT M (1 2 3)'))
     lyr.CreateFeature(f)
     lyr = ds.CreateLayer('pointzm', geom_type=ogr.wkbPointZM)
     if lyr.TestCapability(ogr.OLCMeasuredGeometries) != 1:
-        gdaltest.post_reason('fail')
         return 'fail'
     f = ogr.Feature(lyr.GetLayerDefn())
     f.SetGeometryDirectly(ogr.CreateGeometryFromWkt('POINT ZM (1 2 3 4)'))
@@ -2669,11 +2476,9 @@ def test_ogr_gpkg_29():
     ds = ogr.Open('/vsimem/ogr_gpkg_29.gpkg', update=1)
     lyr = ds.GetLayerByName('pointm')
     if lyr.GetGeomType() != ogr.wkbPointM:
-        gdaltest.post_reason('fail')
         return 'fail'
     f = lyr.GetNextFeature()
     if f.GetGeometryRef().ExportToIsoWkt() != 'POINT M (1 2 3)':
-        gdaltest.post_reason('fail')
         f.DumpReadable()
         return 'fail'
 
@@ -2682,11 +2487,9 @@ def test_ogr_gpkg_29():
 
     lyr = ds.GetLayerByName('pointzm')
     if lyr.GetGeomType() != ogr.wkbPointZM:
-        gdaltest.post_reason('fail')
         return 'fail'
     f = lyr.GetNextFeature()
     if f.GetGeometryRef().ExportToIsoWkt() != 'POINT ZM (1 2 3 4)':
-        gdaltest.post_reason('fail')
         f.DumpReadable()
         return 'fail'
 
@@ -2699,20 +2502,16 @@ def test_ogr_gpkg_29():
     ds = ogr.Open('/vsimem/ogr_gpkg_29.gpkg')
     lyr = ds.GetLayerByName('pointm')
     if lyr.GetGeomType() != ogr.wkbPointM:
-        gdaltest.post_reason('fail')
         return 'fail'
     f = lyr.GetNextFeature()
     if f.GetGeometryRef().ExportToIsoWkt() != 'POINT M (1 2 3)':
-        gdaltest.post_reason('fail')
         f.DumpReadable()
         return 'fail'
     lyr = ds.GetLayerByName('pointzm')
     if lyr.GetGeomType() != ogr.wkbPointZM:
-        gdaltest.post_reason('fail')
         return 'fail'
     f = lyr.GetNextFeature()
     if f.GetGeometryRef().ExportToIsoWkt() != 'POINT ZM (1 2 3 4)':
-        gdaltest.post_reason('fail')
         f.DumpReadable()
         return 'fail'
     ds = None
@@ -2733,20 +2532,16 @@ def test_ogr_gpkg_30():
     with gdaltest.error_handler():
         ds = gdaltest.gpkg_dr.CreateDataSource('/vsimem/ogr_gpkg_30.geopkg')
     if ds is None:
-        gdaltest.post_reason('fail')
         return 'fail'
     if gdal.GetLastErrorMsg() == '':
-        gdaltest.post_reason('fail')
         return 'fail'
     ds = None
 
     with gdaltest.error_handler():
         ds = ogr.Open('/vsimem/ogr_gpkg_30.geopkg', update=1)
     if ds is None:
-        gdaltest.post_reason('fail')
         return 'fail'
     if gdal.GetLastErrorMsg() == '':
-        gdaltest.post_reason('fail')
         return 'fail'
     ds = None
 
@@ -2784,11 +2579,9 @@ def test_ogr_gpkg_31():
     ds = ogr.Open('/vsimem/ogr_gpkg_31.gpkg')
     lyr = ds.GetLayerByName('curve')
     if lyr.GetGeomType() != ogr.wkbCurve:
-        gdaltest.post_reason('fail')
         return 'fail'
     lyr = ds.GetLayerByName('surface')
     if lyr.GetGeomType() != ogr.wkbSurface:
-        gdaltest.post_reason('fail')
         return 'fail'
     ds = None
 
@@ -2816,21 +2609,17 @@ def test_ogr_gpkg_32():
 
     ds = ogr.Open('/vsimem/ogr_gpkg_32.gpkg')
     if ds.GetLayerCount() != 1:
-        gdaltest.post_reason('fail')
         return 'fail'
     sql_lyr = ds.ExecuteSQL("SELECT * FROM gpkg_contents WHERE table_name != 'ogr_empty_table'")
     if sql_lyr.GetFeatureCount() != 0:
-        gdaltest.post_reason('fail')
         return 'fail'
     ds.ReleaseResultSet(sql_lyr)
     sql_lyr = ds.ExecuteSQL("SELECT * FROM gpkg_geometry_columns WHERE table_name != 'ogr_empty_table'")
     if sql_lyr.GetFeatureCount() != 0:
-        gdaltest.post_reason('fail')
         return 'fail'
     ds.ReleaseResultSet(sql_lyr)
     sql_lyr = ds.ExecuteSQL("SELECT * FROM sqlite_master WHERE name = 'gpkg_extensions'")
     if sql_lyr.GetFeatureCount() != 0:
-        gdaltest.post_reason('fail')
         return 'fail'
     ds.ReleaseResultSet(sql_lyr)
     ds = None
@@ -2861,7 +2650,6 @@ def test_ogr_gpkg_33():
     ds = ogr.Open('/vsimem/ogr_gpkg_33.gpkg')
     sql_lyr = ds.ExecuteSQL("SELECT * FROM gpkg_contents WHERE last_change = '2000-01-01T:00:00:00.000Z' AND table_name != 'ogr_empty_table'")
     if sql_lyr.GetFeatureCount() != 1:
-        gdaltest.post_reason('fail')
         return 'fail'
     ds.ReleaseResultSet(sql_lyr)
     ds = None
@@ -2896,14 +2684,12 @@ def test_ogr_gpkg_test_ogrsf():
     ret = gdaltest.runexternal(test_cli_utilities.get_test_ogrsf_path() + ' tmp/gpkg_test.gpkg --config OGR_SQLITE_SYNCHRONOUS OFF')
 
     if ret.find('INFO') == -1 or ret.find('ERROR') != -1:
-        gdaltest.post_reason('fail')
         print(ret)
         return 'fail'
 
     ret = gdaltest.runexternal(test_cli_utilities.get_test_ogrsf_path() + ' tmp/gpkg_test.gpkg -sql "select * from tbl_linestring_renamed" --config OGR_SQLITE_SYNCHRONOUS OFF')
 
     if ret.find('INFO') == -1 or ret.find('ERROR') != -1:
-        gdaltest.post_reason('fail')
         print(ret)
         return 'fail'
 
@@ -2948,7 +2734,6 @@ def test_ogr_gpkg_34():
     gdal.VSIFCloseL(f)
 
     if content.find(layer_name) < 0:
-        gdaltest.post_reason('fail')
         return 'fail'
 
     ds = ogr.Open(dbname, update=1)
@@ -2956,7 +2741,6 @@ def test_ogr_gpkg_34():
     with gdaltest.error_handler():
         ds.ExecuteSQL('ALTER TABLE "weird\'layer""name" RENAME TO gpkg_contents')
     if gdal.GetLastErrorMsg() == '':
-        gdaltest.post_reason('fail')
         return 'fail'
     gdal.ErrorReset()
     ds.ExecuteSQL('ALTER TABLE "weird\'layer""name" RENAME TO "weird2\'layer""name"')
@@ -2969,7 +2753,6 @@ def test_ogr_gpkg_34():
     gdal.VSIFCloseL(f)
 
     if content.find(layer_name) >= 0:
-        gdaltest.post_reason('fail')
         return 'fail'
     layer_name = new_layer_name
 
@@ -2977,12 +2760,10 @@ def test_ogr_gpkg_34():
     with gdaltest.error_handler():
         ds.ExecuteSQL('DELLAYER:does_not_exist')
     if gdal.GetLastErrorMsg() == '':
-        gdaltest.post_reason('fail')
         return 'fail'
     gdal.ErrorReset()
     ds.ExecuteSQL('DELLAYER:' + layer_name)
     if gdal.GetLastErrorMsg() != '':
-        gdaltest.post_reason('fail')
         return 'fail'
     ds.ExecuteSQL('VACUUM')
     ds = None
@@ -2993,7 +2774,6 @@ def test_ogr_gpkg_34():
     gdal.VSIFCloseL(f)
 
     if content.find(layer_name) >= 0:
-        gdaltest.post_reason('fail')
         return 'fail'
 
     gdaltest.gpkg_dr.DeleteDataSource(dbname)
@@ -3011,16 +2791,13 @@ def test_ogr_gpkg_34():
     ds = ogr.Open(dbname, update=1)
     ds.ExecuteSQL('DROP TABLE "weird2\'layer""name"')
     if gdal.GetLastErrorMsg() != '':
-        gdaltest.post_reason('fail')
         return 'fail'
     ds.ExecuteSQL('DROP TABLE another_layer_name')
     if gdal.GetLastErrorMsg() != '':
-        gdaltest.post_reason('fail')
         return 'fail'
     with gdaltest.error_handler():
         ds.ExecuteSQL('DROP TABLE "foobar"')
     if gdal.GetLastErrorMsg() == '':
-        gdaltest.post_reason('fail')
         return 'fail'
     gdal.ErrorReset()
     ds.ExecuteSQL('VACUUM')
@@ -3032,11 +2809,9 @@ def test_ogr_gpkg_34():
     gdal.VSIFCloseL(f)
 
     if content.find(layer_name) >= 0:
-        gdaltest.post_reason('fail')
         return 'fail'
 
     if content.find('another_layer_name') >= 0:
-        gdaltest.post_reason('fail')
         return 'fail'
 
     gdaltest.gpkg_dr.DeleteDataSource(dbname)
@@ -3092,33 +2867,27 @@ def test_ogr_gpkg_35():
     ds.ExecuteSQL("INSERT INTO gpkg_extensions VALUES('test', 'bar_i_will_disappear', 'extension_name', 'definition', 'scope')")
 
     if lyr.TestCapability(ogr.OLCDeleteField) != 1:
-        gdaltest.post_reason('fail')
         return 'fail'
 
     with gdaltest.error_handler():
         ret = lyr.DeleteField(-1)
     if ret == 0:
-        gdaltest.post_reason('fail')
         return 'fail'
 
     with gdaltest.error_handler():
         ret = lyr.DeleteField(lyr.GetLayerDefn().GetFieldCount())
     if ret == 0:
-        gdaltest.post_reason('fail')
         return 'fail'
 
     if lyr.DeleteField(1) != 0:
-        gdaltest.post_reason('fail')
         return 'fail'
     if lyr.GetLayerDefn().GetFieldCount() != 2:
-        gdaltest.post_reason('fail')
         return 'fail'
 
     lyr.ResetReading()
     f = lyr.GetNextFeature()
     if f.GetFID() != 10 or f['foo'] != 'fooval' or f['baz'] != 'bazval' or \
        f.GetGeometryRef().ExportToWkt() != 'POLYGON ((0 0,0 1,1 1,0 0))':
-        gdaltest.post_reason('fail')
         f.DumpReadable()
         return 'fail'
 
@@ -3126,12 +2895,10 @@ def test_ogr_gpkg_35():
     ret = lyr_nonspatial.DeleteField(1)
     lyr.CommitTransaction()
     if ret != 0:
-        gdaltest.post_reason('fail')
         return 'fail'
     lyr_nonspatial.ResetReading()
     f = lyr_nonspatial.GetNextFeature()
     if f.GetFID() != 10 or f['foo'] != 'fooval' or f['baz'] != 'bazval':
-        gdaltest.post_reason('fail')
         f.DumpReadable()
         return 'fail'
 
@@ -3145,7 +2912,6 @@ def test_ogr_gpkg_35():
     with gdaltest.error_handler():
         ret = lyr.DeleteField(0)
     if ret == 0:
-        gdaltest.post_reason('fail')
         return 'fail'
     ds = None
 
@@ -3155,7 +2921,6 @@ def test_ogr_gpkg_35():
     gdal.VSIFCloseL(f)
 
     if content.find('bar_i_will_disappear') >= 0:
-        gdaltest.post_reason('fail')
         return 'fail'
 
     gdaltest.gpkg_dr.DeleteDataSource(dbname)
@@ -3199,50 +2964,42 @@ def test_ogr_gpkg_36():
     ds.ExecuteSQL("CREATE INDEX my_idx ON test(foo)")
 
     if lyr.TestCapability(ogr.OLCAlterFieldDefn) != 1:
-        gdaltest.post_reason('fail')
         return 'fail'
 
     with gdaltest.error_handler():
         ret = lyr.AlterFieldDefn(-1, ogr.FieldDefn('foo'), ogr.ALTER_ALL_FLAG)
     if ret == 0:
-        gdaltest.post_reason('fail')
         return 'fail'
 
     with gdaltest.error_handler():
         ret = lyr.AlterFieldDefn(1, ogr.FieldDefn('foo'), ogr.ALTER_ALL_FLAG)
     if ret == 0:
-        gdaltest.post_reason('fail')
         return 'fail'
 
     with gdaltest.error_handler():
         ret = lyr.AlterFieldDefn(0, ogr.FieldDefn(lyr.GetGeometryColumn()), ogr.ALTER_ALL_FLAG)
     if ret == 0:
-        gdaltest.post_reason('fail')
         return 'fail'
 
     with gdaltest.error_handler():
         ret = lyr.AlterFieldDefn(0, ogr.FieldDefn(lyr.GetFIDColumn()), ogr.ALTER_ALL_FLAG)
     if ret == 0:
-        gdaltest.post_reason('fail')
         return 'fail'
 
     with gdaltest.error_handler():
         ret = lyr.AlterFieldDefn(0, ogr.FieldDefn('baz'), ogr.ALTER_ALL_FLAG)
     if ret == 0:
-        gdaltest.post_reason('fail')
         return 'fail'
 
     new_field_defn = ogr.FieldDefn('bar', ogr.OFTReal)
     new_field_defn.SetSubType(ogr.OFSTFloat32)
     if lyr.AlterFieldDefn(0, new_field_defn, ogr.ALTER_ALL_FLAG) != 0:
-        gdaltest.post_reason('fail')
         return 'fail'
 
     lyr.ResetReading()
     f = lyr.GetNextFeature()
     if f.GetFID() != 10 or f['bar'] != 10.5 or \
             f.GetGeometryRef().ExportToWkt() != 'POLYGON ((0 0,0 1,1 1,0 0))':
-        gdaltest.post_reason('fail')
         f.DumpReadable()
         return 'fail'
     f = None
@@ -3250,7 +3007,6 @@ def test_ogr_gpkg_36():
     lyr.StartTransaction()
     new_field_defn = ogr.FieldDefn('baw', ogr.OFTString)
     if lyr.AlterFieldDefn(0, new_field_defn, ogr.ALTER_ALL_FLAG) != 0:
-        gdaltest.post_reason('fail')
         return 'fail'
     lyr.CommitTransaction()
 
@@ -3258,7 +3014,6 @@ def test_ogr_gpkg_36():
     f = lyr.GetNextFeature()
     if f.GetFID() != 10 or f['baw'] != '10.5' or \
        f.GetGeometryRef().ExportToWkt() != 'POLYGON ((0 0,0 1,1 1,0 0))':
-        gdaltest.post_reason('fail')
         f.DumpReadable()
         return 'fail'
     f = None
@@ -3267,7 +3022,6 @@ def test_ogr_gpkg_36():
     sql_lyr = ds.ExecuteSQL("SELECT * FROM sqlite_master WHERE name = 'my_idx'")
     f = sql_lyr.GetNextFeature()
     if f is None:
-        gdaltest.post_reason('fail')
         return 'fail'
     f = None
     ds.ReleaseResultSet(sql_lyr)
@@ -3282,7 +3036,6 @@ def test_ogr_gpkg_36():
     with gdaltest.error_handler():
         ret = lyr.AlterFieldDefn(0, ogr.FieldDefn('foo'), ogr.ALTER_ALL_FLAG)
     if ret == 0:
-        gdaltest.post_reason('fail')
         return 'fail'
     ds = None
 
@@ -3292,7 +3045,6 @@ def test_ogr_gpkg_36():
     gdal.VSIFCloseL(f)
 
     if content.find('foo') >= 0:
-        gdaltest.post_reason('fail')
         return 'fail'
 
     gdaltest.gpkg_dr.DeleteDataSource(dbname)
@@ -3307,7 +3059,6 @@ def test_ogr_gpkg_36():
     with gdaltest.error_handler():
         ret = lyr.AlterFieldDefn(0, ogr.FieldDefn('bar'), ogr.ALTER_ALL_FLAG)
     if ret == 0:
-        gdaltest.post_reason('fail')
         return 'fail'
     with gdaltest.error_handler():
         ds = None
@@ -3354,34 +3105,28 @@ def test_ogr_gpkg_37():
     ds.ExecuteSQL("CREATE INDEX my_idx_bar ON test(bar)")
 
     if lyr.TestCapability(ogr.OLCReorderFields) != 1:
-        gdaltest.post_reason('fail')
         return 'fail'
 
     with gdaltest.error_handler():
         ret = lyr.ReorderFields([-1, -1])
     if ret == 0:
-        gdaltest.post_reason('fail')
         return 'fail'
 
     if lyr.ReorderFields([1, 0]) != 0:
-        gdaltest.post_reason('fail')
         return 'fail'
 
     lyr.ResetReading()
     if lyr.GetLayerDefn().GetFieldIndex('foo') != 1 or lyr.GetLayerDefn().GetFieldIndex('bar') != 0:
-        gdaltest.post_reason('fail')
         return 'fail'
     f = lyr.GetNextFeature()
     if f.GetFID() != 10 or f['foo'] != 'fooval' or f['bar'] != 'barval' or \
             f.GetGeometryRef().ExportToWkt() != 'POLYGON ((0 0,0 1,1 1,0 0))':
-        gdaltest.post_reason('fail')
         f.DumpReadable()
         return 'fail'
 
     # Check that index has been recreated
     sql_lyr = ds.ExecuteSQL("SELECT * FROM sqlite_master WHERE name = 'my_idx_foo' OR name = 'my_idx_bar'")
     if sql_lyr.GetFeatureCount() != 2:
-        gdaltest.post_reason('fail')
         return 'fail'
     ds.ReleaseResultSet(sql_lyr)
 
@@ -3393,7 +3138,6 @@ def test_ogr_gpkg_37():
     with gdaltest.error_handler():
         ret = lyr.ReorderFields([1, 0])
     if ret == 0:
-        gdaltest.post_reason('fail')
         return 'fail'
     ds = None
 
@@ -3427,25 +3171,21 @@ def test_ogr_gpkg_38(options=['SPATIAL_INDEX=YES']):
     lyr = ds.GetLayer(0)
     extent = lyr.GetExtent(force=0, can_return_null=True)
     if extent is not None:
-        gdaltest.post_reason('fail')
         print(extent)
         return 'fail'
     # Test that we can compute the extent of a layer that has none registered in gpkg_contents
     extent = lyr.GetExtent(force=1)
     if extent != (1, 3, 2, 4):
-        gdaltest.post_reason('fail')
         print(extent)
         return 'fail'
     sql_lyr = ds.ExecuteSQL('SELECT min_x, min_y, max_x, max_y FROM gpkg_contents')
     f = sql_lyr.GetNextFeature()
     if f['min_x'] != 1 or f['min_y'] != 2 or f['max_x'] != 3 or f['max_y'] != 4:
-        gdaltest.post_reason('fail')
         f.DumpReadable()
         return 'fail'
     ds.ReleaseResultSet(sql_lyr)
     extent = lyr.GetExtent(force=0)
     if extent != (1, 3, 2, 4):
-        gdaltest.post_reason('fail')
         print(extent)
         return 'fail'
 
@@ -3457,14 +3197,12 @@ def test_ogr_gpkg_38(options=['SPATIAL_INDEX=YES']):
     # The extent has grown
     extent = lyr.GetExtent(force=0)
     if extent != (-3.0, 3.0, -4.0, 4.0):
-        gdaltest.post_reason('fail')
         print(extent)
         return 'fail'
 
     ds.ExecuteSQL('RECOMPUTE EXTENT ON test')
     extent = lyr.GetExtent(force=0)
     if extent != (-3.0, -1.0, -4.0, -2.0):
-        gdaltest.post_reason('fail')
         print(extent)
         return 'fail'
     ds = None
@@ -3473,7 +3211,6 @@ def test_ogr_gpkg_38(options=['SPATIAL_INDEX=YES']):
     lyr = ds.GetLayer(0)
     extent = lyr.GetExtent(force=0)
     if extent != (-3.0, -1.0, -4.0, -2.0):
-        gdaltest.post_reason('fail')
         print(extent)
         return 'fail'
     ds = None
@@ -3487,7 +3224,6 @@ def test_ogr_gpkg_38(options=['SPATIAL_INDEX=YES']):
     ds.ExecuteSQL('RECOMPUTE EXTENT ON test')
     extent = lyr.GetExtent(force=0, can_return_null=True)
     if extent is not None:
-        gdaltest.post_reason('fail')
         print(extent)
         return 'fail'
     ds = None
@@ -3496,7 +3232,6 @@ def test_ogr_gpkg_38(options=['SPATIAL_INDEX=YES']):
     lyr = ds.GetLayer(0)
     extent = lyr.GetExtent(force=0, can_return_null=True)
     if extent is not None:
-        gdaltest.post_reason('fail')
         print(extent)
         return 'fail'
     ds = None
@@ -3526,32 +3261,27 @@ def test_ogr_gpkg_39():
 
     lyr = ds.CreateLayer('test_with_explicit_identifier', options=['IDENTIFIER=explicit_identifier'])
     if lyr is None:
-        gdaltest.post_reason('fail')
         return 'fail'
 
     # Allow overwriting
     lyr = ds.CreateLayer('test_with_explicit_identifier', options=['IDENTIFIER=explicit_identifier', 'OVERWRITE=YES'])
     if lyr is None:
-        gdaltest.post_reason('fail')
         return 'fail'
 
     with gdaltest.error_handler():
         lyr = ds.CreateLayer('test2', options=['IDENTIFIER=test'])
     if lyr is not None:
-        gdaltest.post_reason('fail')
         return 'fail'
 
     with gdaltest.error_handler():
         lyr = ds.CreateLayer('test2', options=['IDENTIFIER=explicit_identifier'])
     if lyr is not None:
-        gdaltest.post_reason('fail')
         return 'fail'
 
     ds.ExecuteSQL("INSERT INTO gpkg_contents ( table_name, identifier, data_type ) VALUES ( 'some_table', 'another_identifier', 'some_data_type' )")
     with gdaltest.error_handler():
         lyr = ds.CreateLayer('test2', options=['IDENTIFIER=another_identifier'])
     if lyr is not None:
-        gdaltest.post_reason('fail')
         return 'fail'
     ds = None
 
@@ -3575,21 +3305,17 @@ def test_ogr_gpkg_40():
 
     ds = ogr.Open('/vsimem/ogr_gpkg_40.gpkg')
     if ds.GetLayerCount() != 1:
-        gdaltest.post_reason('fail')
         return 'fail'
     sql_lyr = ds.ExecuteSQL("SELECT * FROM gpkg_contents WHERE table_name != 'ogr_empty_table'")
     if sql_lyr.GetFeatureCount() != 1:
-        gdaltest.post_reason('fail')
         return 'fail'
     ds.ReleaseResultSet(sql_lyr)
     sql_lyr = ds.ExecuteSQL("SELECT * FROM gpkg_geometry_columns WHERE table_name != 'ogr_empty_table'")
     if sql_lyr.GetFeatureCount() != 0:
-        gdaltest.post_reason('fail')
         return 'fail'
     ds.ReleaseResultSet(sql_lyr)
     sql_lyr = ds.ExecuteSQL("SELECT * FROM sqlite_master WHERE name = 'gpkg_extensions'")
     if sql_lyr.GetFeatureCount() != 0:
-        gdaltest.post_reason('fail')
         return 'fail'
     ds.ReleaseResultSet(sql_lyr)
     ds = None
@@ -3622,7 +3348,6 @@ def test_ogr_gpkg_41():
     with gdaltest.error_handler():
         f = lyr.GetNextFeature()
     if f['mycol'] != 'myval' or f.GetFID() != 1:
-        gdaltest.post_reason('fail')
         f.DumpReadable()
         return 'fail'
     ds = None
@@ -3632,7 +3357,6 @@ def test_ogr_gpkg_41():
     with gdaltest.error_handler():
         f = lyr.GetFeature(1)
     if f['mycol'] != 'myval' or f.GetFID() != 1:
-        gdaltest.post_reason('fail')
         f.DumpReadable()
         return 'fail'
     ds = None
@@ -3681,13 +3405,10 @@ def test_ogr_gpkg_42():
     ds = ogr.Open('/vsimem/ogr_gpkg_42.gpkg')
     lyr = ds.GetLayer(0)
     if get_feature_count_from_gpkg_contents(ds) != 5:
-        gdaltest.post_reason('fail')
         return 'fail'
     if not foo_has_trigger(ds):
-        gdaltest.post_reason('fail')
         return 'fail'
     if lyr.TestCapability(ogr.OLCFastFeatureCount) == 0:
-        gdaltest.post_reason('fail')
         return 'fail'
     ds = None
 
@@ -3699,37 +3420,30 @@ def test_ogr_gpkg_42():
 
     # Has been invalidated for now
     if get_feature_count_from_gpkg_contents(ds) is not None:
-        gdaltest.post_reason('fail')
         return 'fail'
 
     if foo_has_trigger(ds):
-        gdaltest.post_reason('fail')
         return 'fail'
 
     fc = lyr.GetFeatureCount()
     if fc != 6:
-        gdaltest.post_reason('fail')
         print(fc)
         return 'fail'
 
     ds.ExecuteSQL('DELETE FROM foo WHERE i = 1')
 
     if not foo_has_trigger(ds):
-        gdaltest.post_reason('fail')
         return 'fail'
 
     if get_feature_count_from_gpkg_contents(ds) is not None:
-        gdaltest.post_reason('fail')
         return 'fail'
 
     fc = lyr.GetFeatureCount()
     if fc != 5:
-        gdaltest.post_reason('fail')
         print(fc)
         return 'fail'
 
     if get_feature_count_from_gpkg_contents(ds) != 5:
-        gdaltest.post_reason('fail')
         return 'fail'
 
     ds = None
@@ -3738,7 +3452,6 @@ def test_ogr_gpkg_42():
     lyr = ds.GetLayer(0)
     fc = lyr.GetFeatureCount()
     if fc != 5:
-        gdaltest.post_reason('fail')
         print(fc)
         return 'fail'
     ds.ExecuteSQL('UPDATE gpkg_ogr_contents SET feature_count = NULL')
@@ -3747,18 +3460,15 @@ def test_ogr_gpkg_42():
     ds = ogr.Open('/vsimem/ogr_gpkg_42.gpkg', update=1)
     lyr = ds.GetLayer(0)
     if get_feature_count_from_gpkg_contents(ds) is not None:
-        gdaltest.post_reason('fail')
         return 'fail'
     fc = lyr.GetFeatureCount()
     if fc != 5:
-        gdaltest.post_reason('fail')
         print(fc)
         return 'fail'
     ds = None
 
     ds = ogr.Open('/vsimem/ogr_gpkg_42.gpkg', update=1)
     if get_feature_count_from_gpkg_contents(ds) != 5:
-        gdaltest.post_reason('fail')
         return 'fail'
 
     # So as to test that we really read from gpkg_ogr_contents
@@ -3768,7 +3478,6 @@ def test_ogr_gpkg_42():
     lyr = ds.GetLayer(0)
     fc = lyr.GetFeatureCount()
     if fc != 5000:
-        gdaltest.post_reason('fail')
         print(fc)
         return 'fail'
 
@@ -3782,7 +3491,6 @@ def test_ogr_gpkg_42():
     f = None
     ds.ReleaseResultSet(sql_lyr)
     if val != 5000:
-        gdaltest.post_reason('fail')
         return 'fail'
 
     # Test layer deletion
@@ -3790,7 +3498,6 @@ def test_ogr_gpkg_42():
     sql_lyr = ds.ExecuteSQL("SELECT feature_count FROM gpkg_ogr_contents WHERE table_name != 'ogr_empty_table'", dialect='DEBUG')
     f = sql_lyr.GetNextFeature()
     if f is not None:
-        gdaltest.post_reason('fail')
         return 'fail'
     ds.ReleaseResultSet(sql_lyr)
     ds = None
@@ -3813,20 +3520,16 @@ def test_ogr_gpkg_42():
     fc = sql_lyr.GetFeatureCount()
     ds.ReleaseResultSet(sql_lyr)
     if fc != 10:
-        gdaltest.post_reason('fail')
         return 'fail'
 
     if foo_has_trigger(ds):
-        gdaltest.post_reason('fail')
         return 'fail'
 
     lyr = ds.GetLayer(0)
     if lyr.TestCapability(ogr.OLCFastFeatureCount) != 0:
-        gdaltest.post_reason('fail')
         return 'fail'
     fc = lyr.GetFeatureCount()
     if fc != 5:
-        gdaltest.post_reason('fail')
         print(fc)
         return 'fail'
     f = ogr.Feature(lyr.GetLayerDefn())
@@ -3835,13 +3538,11 @@ def test_ogr_gpkg_42():
     lyr = ds.GetLayer(0)
     fc = lyr.GetFeatureCount()
     if fc != 6:
-        gdaltest.post_reason('fail')
         print(fc)
         return 'fail'
     ds.ExecuteSQL('DELETE FROM foo WHERE i = 1')
     fc = lyr.GetFeatureCount()
     if fc != 5:
-        gdaltest.post_reason('fail')
         print(fc)
         return 'fail'
     ds = None
@@ -3876,7 +3577,6 @@ def test_ogr_gpkg_43():
     with gdaltest.error_handler():
         ds = gdal.Open('/vsimem/ogr_gpkg_43.gpkg')
     if len(ds.GetMetadata_List('SUBDATASETS')) != 2 * 1000:
-        gdaltest.post_reason('fail')
         print(len(ds.GetMetadata_List('SUBDATASETS')))
         return 'fail'
     ds = None
@@ -3885,7 +3585,6 @@ def test_ogr_gpkg_43():
         ds = ogr.Open('/vsimem/ogr_gpkg_43.gpkg')
     gdal.SetConfigOption('OGR_TABLE_LIMIT', None)
     if ds.GetLayerCount() != 1000:
-        gdaltest.post_reason('fail')
         print(ds.GetLayerCount())
         return 'fail'
     ds = None
@@ -3916,19 +3615,16 @@ def test_ogr_gpkg_44():
     ds = ogr.Open('/vsimem/ogr_gpkg_44.gpkg')
     md = ds.GetMetadata()
     if md != {}:
-        gdaltest.post_reason('fail')
         print(md)
         return 'fail'
     md = ds.GetLayer(0).GetMetadata()
     if md != {}:
-        gdaltest.post_reason('fail')
         print(md)
         return 'fail'
     sql_lyr = ds.ExecuteSQL("SELECT * FROM sqlite_master WHERE name = 'gpkg_metadata'")
     fc = sql_lyr.GetFeatureCount()
     ds.ReleaseResultSet(sql_lyr)
     if fc != 0:
-        gdaltest.post_reason('fail')
         return 'fail'
     ds = None
 
@@ -3939,7 +3635,6 @@ def test_ogr_gpkg_44():
     ds = ogr.Open('/vsimem/ogr_gpkg_44.gpkg')
     md = ds.GetMetadata()
     if md != {'FOO': 'BAR'}:
-        gdaltest.post_reason('fail')
         print(md)
         return 'fail'
     ds = None
@@ -3964,10 +3659,8 @@ def test_ogr_gpkg_45():
     ds = ogr.Open('/vsimem/ogr_gpkg_45.gpkg')
     lyr = ds.GetLayer(0)
     if lyr.GetFIDColumn() != '':
-        gdaltest.post_reason('fail')
         return 'fail'
     if lyr.GetLayerDefn().GetFieldCount() != 2:
-        gdaltest.post_reason('fail')
         return 'fail'
     ds = None
 
@@ -4009,11 +3702,9 @@ def test_ogr_gpkg_46():
     ds = ogr.Open('/vsimem/ogr_gpkg_46.gpkg', update=1)
     lyr = ds.GetLayerByName('my_view')
     if lyr.GetLayerDefn().GetFieldCount() != 1:
-        gdaltest.post_reason('fail')
         print(lyr.GetLayerDefn().GetFieldCount())
         return 'fail'
     if lyr.GetGeometryColumn() != 'my_geom':
-        gdaltest.post_reason('fail')
         print(lyr.GetGeometryColumn())
         return 'fail'
 
@@ -4040,51 +3731,41 @@ def test_ogr_gpkg_46():
     # Effectively test spatial index
     lyr.SetSpatialFilterRect(-0.5, -0.5, 0.5, 0.5)
     if lyr.GetFeatureCount() != 1:
-        gdaltest.post_reason('fail')
         return 'fail'
     f = lyr.GetNextFeature()
     if f is None:
-        gdaltest.post_reason('fail')
         return 'fail'
     f = lyr.GetNextFeature()
     if f is not None:
-        gdaltest.post_reason('fail')
         return 'fail'
 
     # View with FID
     lyr = ds.GetLayerByName('my_view2')
     if lyr.GetLayerDefn().GetFieldCount() != 1:
-        gdaltest.post_reason('fail')
         print(lyr.GetLayerDefn().GetFieldCount())
         return 'fail'
     if lyr.GetFIDColumn() != 'OGC_FID':
-        gdaltest.post_reason('fail')
         return 'fail'
     f = lyr.GetNextFeature()
     if f.GetFID() != 1 or f.GetField(0) != 'bla':
-        gdaltest.post_reason('fail')
         f.DumpReadable()
         return 'fail'
 
     # View without valid rowid
     lyr = ds.GetLayerByName('my_view3')
     if lyr.GetLayerDefn().GetFieldCount() != 2:
-        gdaltest.post_reason('fail')
         print(lyr.GetLayerDefn().GetFieldCount())
         return 'fail'
     f = lyr.GetNextFeature()
     if f.GetFID() != 0:
-        gdaltest.post_reason('fail')
         f.DumpReadable()
         return 'fail'
     f = lyr.GetNextFeature()
     if f.GetFID() != 1:
-        gdaltest.post_reason('fail')
         f.DumpReadable()
         return 'fail'
     f2 = lyr.GetFeature(1)
     if not f.Equal(f2):
-        gdaltest.post_reason('fail')
         f.DumpReadable()
         f2.DumpReadable()
         return 'fail'
@@ -4114,17 +3795,14 @@ def test_ogr_gpkg_47():
     with gdaltest.error_handler():
         ds = ogr.Open('/vsimem/ogr_gpkg_47.gpkg', update=1)
     if ds is None:
-        gdaltest.post_reason('fail')
         return 'fail'
     if gdal.GetLastErrorMsg() == '':
-        gdaltest.post_reason('fail')
         return 'fail'
 
     gdal.SetConfigOption('GPKG_WARN_UNRECOGNIZED_APPLICATION_ID', 'NO')
     ogr.Open('/vsimem/ogr_gpkg_47.gpkg')
     gdal.SetConfigOption('GPKG_WARN_UNRECOGNIZED_APPLICATION_ID', None)
     if gdal.GetLastErrorMsg() != '':
-        gdaltest.post_reason('fail')
         print(gdal.GetLastErrorMsg())
         return 'fail'
 
@@ -4138,10 +3816,8 @@ def test_ogr_gpkg_47():
     with gdaltest.error_handler():
         ds = ogr.Open('/vsimem/ogr_gpkg_47.gpkg', update=1)
     if ds is None:
-        gdaltest.post_reason('fail')
         return 'fail'
     if gdal.GetLastErrorMsg() == '':
-        gdaltest.post_reason('fail')
         return 'fail'
     ds = None
 
@@ -4149,7 +3825,6 @@ def test_ogr_gpkg_47():
     ogr.Open('/vsimem/ogr_gpkg_47.gpkg')
     gdal.SetConfigOption('GPKG_WARN_UNRECOGNIZED_APPLICATION_ID', None)
     if gdal.GetLastErrorMsg() != '':
-        gdaltest.post_reason('fail')
         return 'fail'
 
     # Set GPKG 1.2.1
@@ -4162,10 +3837,8 @@ def test_ogr_gpkg_47():
 
     ds = ogr.Open('/vsimem/ogr_gpkg_47.gpkg', update=1)
     if ds is None:
-        gdaltest.post_reason('fail')
         return 'fail'
     if gdal.GetLastErrorMsg() != '':
-        gdaltest.post_reason('fail')
         return 'fail'
     ds = None
 
@@ -4173,7 +3846,6 @@ def test_ogr_gpkg_47():
     ogr.Open('/vsimem/ogr_gpkg_47.gpkg')
     gdal.SetConfigOption('GPKG_WARN_UNRECOGNIZED_APPLICATION_ID', None)
     if gdal.GetLastErrorMsg() != '':
-        gdaltest.post_reason('fail')
         return 'fail'
 
     # Set GPKG 1.3.0
@@ -4187,17 +3859,14 @@ def test_ogr_gpkg_47():
     with gdaltest.error_handler():
         ds = ogr.Open('/vsimem/ogr_gpkg_47.gpkg', update=1)
     if ds is None:
-        gdaltest.post_reason('fail')
         return 'fail'
     if gdal.GetLastErrorMsg() == '':
-        gdaltest.post_reason('fail')
         return 'fail'
 
     gdal.SetConfigOption('GPKG_WARN_UNRECOGNIZED_APPLICATION_ID', 'NO')
     ogr.Open('/vsimem/ogr_gpkg_47.gpkg')
     gdal.SetConfigOption('GPKG_WARN_UNRECOGNIZED_APPLICATION_ID', None)
     if gdal.GetLastErrorMsg() != '':
-        gdaltest.post_reason('fail')
         return 'fail'
 
     # Just for the sake of coverage testing in DEBUG mode
@@ -4235,7 +3904,6 @@ def test_ogr_gpkg_47():
     gdal.VSIFCloseL(fzip)
     ds = ogr.Open('/vsizip//vsimem/ogr_gpkg_47.zip')
     if ds.GetDriver().GetName() != 'GPKG':
-        gdaltest.post_reason('fail')
         return 'fail'
     ds = None
 
@@ -4268,12 +3936,10 @@ def test_ogr_gpkg_48():
     lyr.ResetReading()
     f = lyr.GetNextFeature()
     if f.GetField('a') != 'a' or f.GetField('b') is not None:
-        gdaltest.post_reason('fail')
         f.DumpReadable()
         return 'fail'
     f = lyr.GetNextFeature()
     if f.GetField('b') != 'b' or f.GetField('c') != 'c' or f.GetField('a') is not None:
-        gdaltest.post_reason('fail')
         f.DumpReadable()
         return 'fail'
 
@@ -4284,23 +3950,19 @@ def test_ogr_gpkg_48():
     lyr.CreateField(fld_defn)
     f = ogr.Feature(lyr.GetLayerDefn())
     if lyr.CreateFeature(f) != 0:
-        gdaltest.post_reason('fail')
         return 'fail'
     lyr.ResetReading()
     f = lyr.GetNextFeature()
     if f.GetField('foo') != 'x':
-        gdaltest.post_reason('fail')
         f.DumpReadable()
         return 'fail'
     f = ogr.Feature(lyr.GetLayerDefn())
     f.SetFID(1)
     if lyr.SetFeature(f) != 0:
-        gdaltest.post_reason('fail')
         return 'fail'
     lyr.ResetReading()
     f = lyr.GetNextFeature()
     if f.GetField('foo') != 'x':
-        gdaltest.post_reason('fail')
         f.DumpReadable()
         return 'fail'
     ds = None
@@ -4329,7 +3991,6 @@ def test_ogr_gpkg_49():
 
     field_defn = ogr.GeomFieldDefn('', ogr.wkbPoint)
     if lyr.CreateGeomField(field_defn) != 0:
-        gdaltest.post_reason('fail')
         return 'fail'
     ds = None
 
@@ -4371,16 +4032,13 @@ def test_ogr_gpkg_50():
     ds = ogr.Open('/vsimem/ogr_gpkg_50.gpkg')
     lyr = ds.GetLayer('test')
     if not lyr.GetSpatialRef().IsSame(srs32631):
-        gdaltest.post_reason('fail')
         return 'fail'
     lyr = ds.GetLayer('without_org')
     if not lyr.GetSpatialRef().IsSame(srs_without_org):
-        gdaltest.post_reason('fail')
         return 'fail'
     sql_lyr = ds.ExecuteSQL('SELECT definition_12_063 FROM gpkg_spatial_ref_sys WHERE srs_id = 32631')
     f = sql_lyr.GetNextFeature()
     if f.GetField(0) != 'undefined':
-        gdaltest.post_reason('fail')
         return 'fail'
     ds.ReleaseResultSet(sql_lyr)
     ds = None
@@ -4441,7 +4099,6 @@ def test_ogr_gpkg_53():
 
     ds = ogr.Open('data/poly_inconsistent_case.gpkg.sql')
     if ds.GetLayerCount() != 1:
-        gdaltest.post_reason('fail')
         return 'fail'
     lyr = ds.GetLayer(0)
     f = lyr.GetNextFeature()
@@ -4453,7 +4110,6 @@ def test_ogr_gpkg_53():
         ret = gdaltest.runexternal(test_cli_utilities.get_test_ogrsf_path() + ' data/poly_inconsistent_case.gpkg.sql')
 
         if ret.find('INFO') == -1 or ret.find('ERROR') != -1:
-            gdaltest.post_reason('fail')
             print(ret)
             return 'fail'
 
@@ -4513,13 +4169,11 @@ def test_ogr_gpkg_54():
     lyr1 = ds.GetLayer(0)
     f = lyr1.GetNextFeature()
     if f.GetGeometryRef().ExportToWkt() != 'POINT (5 6)':
-        gdaltest.post_reason('fail')
         f.DumpReadable()
         return 'fail'
     lyr2 = ds.GetLayer(1)
     f = lyr2.GetNextFeature()
     if f.GetGeometryRef().ExportToWkt() != 'POINT (7 8)':
-        gdaltest.post_reason('fail')
         f.DumpReadable()
         return 'fail'
     ds = None
@@ -4777,7 +4431,6 @@ def test_ogr_gpkg_json():
     fld_defn.SetSubType(ogr.OFSTJSON)
     lyr.CreateField(fld_defn)
     if lyr.GetLayerDefn().GetFieldDefn(0).GetSubType() != ogr.OFSTJSON:
-        gdaltest.post_reason('fail')
         return 'fail'
 
     ds.ReleaseResultSet(ds.ExecuteSQL('SELECT 1 FROM test')) # will crystalize
@@ -4786,7 +4439,6 @@ def test_ogr_gpkg_json():
     fld_defn.SetSubType(ogr.OFSTJSON)
     lyr.CreateField(fld_defn)
     if lyr.GetLayerDefn().GetFieldDefn(1).GetSubType() != ogr.OFSTJSON:
-        gdaltest.post_reason('fail')
         return 'fail'
 
     fld_defn = ogr.FieldDefn('test_string', ogr.OFTString)
@@ -4797,28 +4449,23 @@ def test_ogr_gpkg_json():
     ds = ogr.Open(filename, update = 1)
     lyr = ds.GetLayer(0)
     if lyr.GetLayerDefn().GetFieldDefn(0).GetSubType() != ogr.OFSTJSON:
-        gdaltest.post_reason('fail')
         return 'fail'
     if lyr.GetLayerDefn().GetFieldDefn(1).GetSubType() != ogr.OFSTJSON:
-        gdaltest.post_reason('fail')
         return 'fail'
 
     # Demote field from JSON
     new_defn = ogr.FieldDefn('test_was_json_now_string', ogr.OFTString)
     if lyr.AlterFieldDefn(lyr.GetLayerDefn().GetFieldIndex('test2_json'), new_defn, ogr.ALTER_ALL_FLAG) != 0:
-        gdaltest.post_reason('fail')
         return 'fail'
 
     # Alter field to JSON
     new_defn = ogr.FieldDefn('test_was_string_now_json', ogr.OFTString)
     new_defn.SetSubType(ogr.OFSTJSON)
     if lyr.AlterFieldDefn(lyr.GetLayerDefn().GetFieldIndex('test_string'), new_defn, ogr.ALTER_ALL_FLAG) != 0:
-        gdaltest.post_reason('fail')
         return 'fail'
 
     # Delete JSON field
     if lyr.DeleteField(lyr.GetLayerDefn().GetFieldIndex('test_json')) != 0:
-        gdaltest.post_reason('fail')
         return 'fail'
 
     ds = None
@@ -4831,18 +4478,15 @@ def test_ogr_gpkg_json():
     lyr = ds.GetLayer(0)
     if lyr.GetLayerDefn().GetFieldDefn(
         lyr.GetLayerDefn().GetFieldIndex('test_was_json_now_string')).GetSubType() != ogr.OFSTNone:
-        gdaltest.post_reason('fail')
         return 'fail'
     if lyr.GetLayerDefn().GetFieldDefn(
         lyr.GetLayerDefn().GetFieldIndex('test_was_string_now_json')).GetSubType() != ogr.OFSTJSON:
-        gdaltest.post_reason('fail')
         return 'fail'
 
     sql_lyr = ds.ExecuteSQL("SELECT 1 FROM gpkg_data_columns WHERE table_name = 'test'")
     fc = sql_lyr.GetFeatureCount()
     ds.ReleaseResultSet(sql_lyr)
     if fc != 1: # only test_was_string_now_json remaining
-        gdaltest.post_reason('fail')
         return 'fail'
 
     ds = None
diff --git a/autotest/ogr/ogr_idrisi.py b/autotest/ogr/ogr_idrisi.py
index 95c71b567e19..31f9303ece09 100755
--- a/autotest/ogr/ogr_idrisi.py
+++ b/autotest/ogr/ogr_idrisi.py
@@ -43,79 +43,63 @@ def test_ogr_idrisi_1():
 
     ds = ogr.Open('data/points.vct')
     if ds is None:
-        gdaltest.post_reason('fail')
         return 'fail'
 
     lyr = ds.GetLayer(0)
     if lyr.GetGeomType() != ogr.wkbPoint:
-        gdaltest.post_reason('fail')
         return 'fail'
 
     if lyr.GetLayerDefn().GetFieldDefn(1).GetName() != 'IntegerField':
-        gdaltest.post_reason('fail')
         return 'fail'
 
     if lyr.GetLayerDefn().GetFieldDefn(1).GetType() != ogr.OFTInteger:
-        gdaltest.post_reason('fail')
         return 'fail'
 
     sr = lyr.GetSpatialRef()
     if sr.ExportToWkt().find('PROJCS["UTM Zone 31, Northern Hemisphere"') != 0:
-        gdaltest.post_reason('fail')
         print(sr.ExportToWkt())
         return 'fail'
 
     if lyr.GetFeatureCount() != 2:
-        gdaltest.post_reason('fail')
         return 'fail'
 
     if lyr.TestCapability(ogr.OLCFastFeatureCount) != 1:
-        gdaltest.post_reason('fail')
         return 'fail'
 
     if lyr.TestCapability(ogr.OLCFastGetExtent) != 1:
-        gdaltest.post_reason('fail')
         return 'fail'
 
     if lyr.GetExtent() != (400000.0, 600000.0, 4000000.0, 5000000.0):
-        gdaltest.post_reason('fail')
         print(lyr.GetExtent())
         return 'fail'
 
     feat = lyr.GetNextFeature()
     if feat.GetFieldAsDouble(0) != 1.0:
-        gdaltest.post_reason('fail')
         feat.DumpReadable()
         return 'fail'
 
     if feat.GetFieldAsInteger(1) != 2:
-        gdaltest.post_reason('fail')
         feat.DumpReadable()
         return 'fail'
 
     if feat.GetFieldAsDouble(2) != 3.45:
-        gdaltest.post_reason('fail')
         feat.DumpReadable()
         return 'fail'
 
     if feat.GetFieldAsString(3) != 'foo':
-        gdaltest.post_reason('fail')
         feat.DumpReadable()
         return 'fail'
 
     if ogrtest.check_feature_geometry(feat, ogr.CreateGeometryFromWkt('POINT(400000 5000000)')) != 0:
-        gdaltest.post_reason('fail')
         feat.DumpReadable()
         return 'fail'
 
     feat = lyr.GetNextFeature()
     if feat.GetFieldAsDouble(0) != 2.0:
-        gdaltest.post_reason('fail')
         feat.DumpReadable()
         return 'fail'
 
     if ogrtest.check_feature_geometry(feat, ogr.CreateGeometryFromWkt('POINT (600000 4000000)')) != 0:
-        gdaltest.post_reason('fail')
         feat.DumpReadable()
         return 'fail'
 
@@ -123,7 +107,6 @@ def test_ogr_idrisi_1():
     lyr.ResetReading()
     feat = lyr.GetNextFeature()
     if feat.GetFieldAsDouble(0) != 2.0:
-        gdaltest.post_reason('fail')
         feat.DumpReadable()
         return 'fail'
 
@@ -131,7 +114,6 @@ def test_ogr_idrisi_1():
     lyr.ResetReading()
     feat = lyr.GetNextFeature()
     if feat is not None:
-        gdaltest.post_reason('fail')
         return 'fail'
 
     ds = None
@@ -146,50 +128,40 @@ def test_ogr_idrisi_2():
 
     ds = ogr.Open('data/lines.vct')
     if ds is None:
-        gdaltest.post_reason('fail')
         return 'fail'
 
     lyr = ds.GetLayer(0)
     if lyr.GetGeomType() != ogr.wkbLineString:
-        gdaltest.post_reason('fail')
         return 'fail'
 
     if lyr.GetFeatureCount() != 2:
-        gdaltest.post_reason('fail')
         return 'fail'
 
     if lyr.TestCapability(ogr.OLCFastFeatureCount) != 1:
-        gdaltest.post_reason('fail')
         return 'fail'
 
     if lyr.TestCapability(ogr.OLCFastGetExtent) != 1:
-        gdaltest.post_reason('fail')
         return 'fail'
 
     if lyr.GetExtent() != (400000.0, 600000.0, 4000000.0, 5000000.0):
-        gdaltest.post_reason('fail')
         print(lyr.GetExtent())
         return 'fail'
 
     feat = lyr.GetNextFeature()
     if feat.GetFieldAsDouble(0) != 10.0:
-        gdaltest.post_reason('fail')
         feat.DumpReadable()
         return 'fail'
 
     if ogrtest.check_feature_geometry(feat, ogr.CreateGeometryFromWkt('LINESTRING (400000 5000000,600000 4500000)')) != 0:
-        gdaltest.post_reason('fail')
         feat.DumpReadable()
         return 'fail'
 
     feat = lyr.GetNextFeature()
     if feat.GetFieldAsDouble(0) != 20.0:
-        gdaltest.post_reason('fail')
         feat.DumpReadable()
         return 'fail'
 
     if ogrtest.check_feature_geometry(feat, ogr.CreateGeometryFromWkt('LINESTRING (450000 4000000,550000 4500000)')) != 0:
-        gdaltest.post_reason('fail')
         feat.DumpReadable()
         return 'fail'
 
@@ -197,7 +169,6 @@ def test_ogr_idrisi_2():
     lyr.ResetReading()
     feat = lyr.GetNextFeature()
     if feat is not None:
-        gdaltest.post_reason('fail')
         return 'fail'
 
     ds = None
@@ -212,50 +183,40 @@ def test_ogr_idrisi_3():
 
     ds = ogr.Open('data/polygons.vct')
     if ds is None:
-        gdaltest.post_reason('fail')
         return 'fail'
 
     lyr = ds.GetLayer(0)
     if lyr.GetGeomType() != ogr.wkbPolygon:
-        gdaltest.post_reason('fail')
         return 'fail'
 
     if lyr.GetFeatureCount() != 2:
-        gdaltest.post_reason('fail')
         return 'fail'
 
     if lyr.TestCapability(ogr.OLCFastFeatureCount) != 1:
-        gdaltest.post_reason('fail')
         return 'fail'
 
     if lyr.TestCapability(ogr.OLCFastGetExtent) != 1:
-        gdaltest.post_reason('fail')
         return 'fail'
 
     if lyr.GetExtent() != (400000.0, 600000.0, 4000000.0, 5000000.0):
-        gdaltest.post_reason('fail')
         print(lyr.GetExtent())
         return 'fail'
 
     feat = lyr.GetNextFeature()
     if feat.GetFieldAsDouble(0) != 1.0:
-        gdaltest.post_reason('fail')
         feat.DumpReadable()
         return 'fail'
 
     if ogrtest.check_feature_geometry(feat, ogr.CreateGeometryFromWkt('POLYGON ((400000 4000000,400000 5000000,600000 5000000,600000 4000000,400000 4000000),(450000 4250000,450000 4750000,550000 4750000,550000 4250000,450000 4250000))')) != 0:
-        gdaltest.post_reason('fail')
         feat.DumpReadable()
         return 'fail'
 
     feat = lyr.GetNextFeature()
     if feat.GetFieldAsDouble(0) != 2.0:
-        gdaltest.post_reason('fail')
         feat.DumpReadable()
         return 'fail'
 
     if ogrtest.check_feature_geometry(feat, ogr.CreateGeometryFromWkt('POLYGON ((400000 4000000,400000 5000000,600000 5000000,600000 4000000,400000 4000000))')) != 0:
-        gdaltest.post_reason('fail')
         feat.DumpReadable()
         return 'fail'
 
@@ -263,7 +224,6 @@ def test_ogr_idrisi_3():
     lyr.ResetReading()
     feat = lyr.GetNextFeature()
     if feat is not None:
-        gdaltest.post_reason('fail')
         return 'fail'
 
     ds = None
diff --git a/autotest/ogr/ogr_index_test.py b/autotest/ogr/ogr_index_test.py
index 72fab8dcc0e5..3d6e96d22afb 100755
--- a/autotest/ogr/ogr_index_test.py
+++ b/autotest/ogr/ogr_index_test.py
@@ -304,119 +304,102 @@ def test_ogr_index_10():
     lyr.ResetReading()
     feat = lyr.GetNextFeature()
     if feat is None:
-        gdaltest.post_reason('failed')
         return 'fail'
 
     lyr.SetAttributeFilter('intfield = 1')
     lyr.ResetReading()
     feat = lyr.GetNextFeature()
     if feat is None:
-        gdaltest.post_reason('failed')
         return 'fail'
 
     lyr.SetAttributeFilter('intfield IN (2)')
     lyr.ResetReading()
     feat = lyr.GetNextFeature()
     if feat is not None:
-        gdaltest.post_reason('failed')
         return 'fail'
 
     lyr.SetAttributeFilter('intfield IN (1.0)')
     lyr.ResetReading()
     feat = lyr.GetNextFeature()
     if feat is None:
-        gdaltest.post_reason('failed')
         return 'fail'
 
     lyr.SetAttributeFilter('intfield = 1.0')
     lyr.ResetReading()
     feat = lyr.GetNextFeature()
     if feat is None:
-        gdaltest.post_reason('failed')
         return 'fail'
 
     lyr.SetAttributeFilter('intfield IN (1.1)')
     lyr.ResetReading()
     feat = lyr.GetNextFeature()
     if feat is not None:
-        gdaltest.post_reason('failed')
         return 'fail'
 
     lyr.SetAttributeFilter("intfield IN ('1')")
     lyr.ResetReading()
     feat = lyr.GetNextFeature()
     if feat is None:
-        gdaltest.post_reason('failed')
         return 'fail'
 
     lyr.SetAttributeFilter('realfield IN (1.0)')
     lyr.ResetReading()
     feat = lyr.GetNextFeature()
     if feat is None:
-        gdaltest.post_reason('failed')
         return 'fail'
 
     lyr.SetAttributeFilter('realfield = 1.0')
     lyr.ResetReading()
     feat = lyr.GetNextFeature()
     if feat is None:
-        gdaltest.post_reason('failed')
         return 'fail'
 
     lyr.SetAttributeFilter('realfield IN (1.1)')
     lyr.ResetReading()
     feat = lyr.GetNextFeature()
     if feat is not None:
-        gdaltest.post_reason('failed')
         return 'fail'
 
     lyr.SetAttributeFilter('realfield IN (1)')
     lyr.ResetReading()
     feat = lyr.GetNextFeature()
     if feat is None:
-        gdaltest.post_reason('failed')
         return 'fail'
 
     lyr.SetAttributeFilter('realfield = 1')
     lyr.ResetReading()
     feat = lyr.GetNextFeature()
     if feat is None:
-        gdaltest.post_reason('failed')
         return 'fail'
 
     lyr.SetAttributeFilter('realfield IN (2)')
     lyr.ResetReading()
     feat = lyr.GetNextFeature()
     if feat is not None:
-        gdaltest.post_reason('failed')
         return 'fail'
 
     lyr.SetAttributeFilter("realfield IN ('1')")
     lyr.ResetReading()
     feat = lyr.GetNextFeature()
     if feat is None:
-        gdaltest.post_reason('failed')
         return 'fail'
 
     lyr.SetAttributeFilter("strfield IN ('foo')")
     lyr.ResetReading()
     feat = lyr.GetNextFeature()
     if feat is None:
-        gdaltest.post_reason('failed')
         return 'fail'
 
     lyr.SetAttributeFilter("strfield = 'foo'")
     lyr.ResetReading()
     feat = lyr.GetNextFeature()
     if feat is None:
-        gdaltest.post_reason('failed')
         return 'fail'
 
     lyr.SetAttributeFilter("strfield IN ('bar')")
     lyr.ResetReading()
     feat = lyr.GetNextFeature()
     if feat is not None:
-        gdaltest.post_reason('failed')
         return 'fail'
 
     ds = None
@@ -433,10 +416,8 @@ def ogr_index_11_check(lyr, expected_fids):
     for expected_fid in expected_fids:
         feat = lyr.GetNextFeature()
         if feat is None:
-            gdaltest.post_reason('failed')
             return 'fail'
         if feat.GetFID() != expected_fid:
-            gdaltest.post_reason('failed')
             return 'fail'
 
     return 'success'
diff --git a/autotest/ogr/ogr_jml.py b/autotest/ogr/ogr_jml.py
index 04b7c464915d..916dbed55147 100755
--- a/autotest/ogr/ogr_jml.py
+++ b/autotest/ogr/ogr_jml.py
@@ -61,16 +61,12 @@ def test_ogr_jml_1():
 
     ds = ogr.Open('data/test.jml')
     if ds.GetLayerCount() != 1:
-        gdaltest.post_reason('fail')
         return 'fail'
     if ds.GetLayer(1) is not None:
-        gdaltest.post_reason('fail')
         return 'fail'
     if ds.TestCapability(ogr.ODsCCreateLayer) != 0:
-        gdaltest.post_reason('fail')
         return 'fail'
     if ds.TestCapability(ogr.ODsCDeleteLayer) != 0:
-        gdaltest.post_reason('fail')
         return 'fail'
     lyr = ds.GetLayer(0)
     fields = [('first_property', ogr.OFTString),
@@ -85,13 +81,11 @@ def test_ogr_jml_1():
               ('R_G_B', ogr.OFTString),
               ('not_ignored', ogr.OFTString)]
     if lyr.GetLayerDefn().GetFieldCount() != len(fields):
-        gdaltest.post_reason('fail')
         return 'fail'
     for i, field in enumerate(fields):
         field_defn = lyr.GetLayerDefn().GetFieldDefn(i)
         if field_defn.GetName() != field[0] or field_defn.GetType() != field[1]:
             print(i)
-            gdaltest.post_reason('fail')
             return 'fail'
     feat = lyr.GetNextFeature()
     if feat.GetField('first_property') != 'even' or \
@@ -108,7 +102,6 @@ def test_ogr_jml_1():
        feat.GetStyleString() != 'BRUSH(fc:#0000FF)' or \
        feat.GetGeometryRef().ExportToWkt() != 'POLYGON ((0 0,0 10,10 10,10 0,0 0))':
         feat.DumpReadable()
-        gdaltest.post_reason('fail')
         return 'fail'
 
     feat = lyr.GetNextFeature()
@@ -117,13 +110,11 @@ def test_ogr_jml_1():
        feat.GetStyleString() != 'PEN(c:#FF00FF)' or \
        feat.GetGeometryRef().ExportToWkt() != 'POINT (-1 -1)':
         feat.DumpReadable()
-        gdaltest.post_reason('fail')
         return 'fail'
 
     feat = lyr.GetNextFeature()
     if feat.GetGeometryRef() is not None:
         feat.DumpReadable()
-        gdaltest.post_reason('fail')
         return 'fail'
 
     return 'success'
@@ -170,7 +161,6 @@ def test_ogr_jml_2():
 </featureCollection>
 </JCSDataFile>
 """:
-        gdaltest.post_reason('fail')
         print(data)
         return 'fail'
 
@@ -192,16 +182,12 @@ def test_ogr_jml_2():
         lyr.CreateField(ogr.FieldDefn('time_as_str', ogr.OFTTime))
 
     if lyr.TestCapability(ogr.OLCCreateField) != 1:
-        gdaltest.post_reason('fail')
         return 'fail'
     if lyr.TestCapability(ogr.OLCSequentialWrite) != 1:
-        gdaltest.post_reason('fail')
         return 'fail'
     if lyr.TestCapability(ogr.OLCRandomWrite) != 0:
-        gdaltest.post_reason('fail')
         return 'fail'
     if lyr.TestCapability(ogr.OLCStringsAsUTF8) != 1:
-        gdaltest.post_reason('fail')
         return 'fail'
 
     # empty feature
@@ -209,10 +195,8 @@ def test_ogr_jml_2():
     lyr.CreateFeature(f)
 
     if lyr.TestCapability(ogr.OLCCreateField) != 0:
-        gdaltest.post_reason('fail')
         return 'fail'
     if lyr.CreateField(ogr.FieldDefn('that_wont_work')) == 0:
-        gdaltest.post_reason('fail')
         return 'fail'
 
     f = ogr.Feature(lyr.GetLayerDefn())
@@ -344,7 +328,6 @@ def test_ogr_jml_2():
 </featureCollection>
 </JCSDataFile>
 """:
-        gdaltest.post_reason('fail')
         print(data)
         return 'fail'
 
@@ -372,7 +355,6 @@ def test_ogr_jml_2():
     gdal.VSIFCloseL(f)
 
     if data.find('112233') < 0 or data.find('445566') < 0:
-        gdaltest.post_reason('fail')
         print(data)
         return 'fail'
 
@@ -391,7 +373,6 @@ def test_ogr_jml_2():
     gdal.VSIFCloseL(f)
 
     if data.find('R_G_B') >= 0:
-        gdaltest.post_reason('fail')
         print(data)
         return 'fail'
 
@@ -411,7 +392,6 @@ def test_ogr_jml_2():
     gdal.VSIFCloseL(f)
 
     if data.find('OGR_STYLE') < 0 or data.find('PEN(c:#445566)') < 0:
-        gdaltest.post_reason('fail')
         print(data)
         return 'fail'
 
@@ -433,7 +413,6 @@ def test_ogr_jml_2():
     gdal.VSIFCloseL(f)
 
     if data.find('OGR_STYLE') < 0 or data.find('PEN(c:#445566)') < 0 or data.find('112233') < 0:
-        gdaltest.post_reason('fail')
         print(data)
         return 'fail'
 
@@ -491,7 +470,6 @@ def test_ogr_jml_4():
     lyr.GetLayerDefn()
     gdal.PopErrorHandler()
     if gdal.GetLastErrorType() == 0:
-        gdaltest.post_reason('fail')
         return 'fail'
     ds = None
 
@@ -515,7 +493,6 @@ def test_ogr_jml_4():
     lyr.GetLayerDefn()
     gdal.PopErrorHandler()
     if gdal.GetLastErrorType() == 0:
-        gdaltest.post_reason('fail')
         return 'fail'
     ds = None
 
@@ -545,7 +522,6 @@ def test_ogr_jml_4():
     lyr.GetLayerDefn().GetFieldCount()
     gdal.PopErrorHandler()
     if gdal.GetLastErrorType() == 0:
-        gdaltest.post_reason('fail')
         return 'fail'
     ds = None
 
@@ -576,7 +552,6 @@ def test_ogr_jml_4():
     lyr.GetLayerDefn().GetFieldCount()
     gdal.PopErrorHandler()
     if gdal.GetLastErrorType() == 0:
-        gdaltest.post_reason('fail')
         return 'fail'
     del ds
 
@@ -646,7 +621,6 @@ def test_ogr_jml_4():
     ds = ogr.Open('/vsimem/ogr_jml.jml')
     lyr = ds.GetLayer(0)
     if lyr.GetLayerDefn().GetFieldCount() != 0:
-        gdaltest.post_reason('fail')
         return 'fail'
     lyr.GetNextFeature()
     ds = None
@@ -665,11 +639,9 @@ def test_ogr_jml_read_srs():
     ds = ogr.Open('data/one_point_srid_4326.jml')
     lyr = ds.GetLayer(0)
     if lyr.GetSpatialRef().ExportToWkt().find('4326') < 0:
-        gdaltest.post_reason('fail')
         return 'fail'
     f = lyr.GetNextFeature()
     if f.GetGeometryRef() is None:
-        gdaltest.post_reason('fail')
         return 'fail'
 
     return 'success'
diff --git a/autotest/ogr/ogr_join_test.py b/autotest/ogr/ogr_join_test.py
index 9e4f065c5abe..7dceca704427 100755
--- a/autotest/ogr/ogr_join_test.py
+++ b/autotest/ogr/ogr_join_test.py
@@ -330,12 +330,10 @@ def test_ogr_join_15():
     gdal.Unlink('/vsimem/ogr_join_14')
 
     if val1 != 'c2':
-        gdaltest.post_reason('fail')
         print(val1)
         return 'fail'
 
     if val2 != 'c2':
-        gdaltest.post_reason('fail')
         print(val2)
         return 'fail'
 
@@ -489,7 +487,6 @@ def test_ogr_join_22():
     ds = None
 
     if val != '2':
-        gdaltest.post_reason('fail')
         print(val)
         return 'fail'
 
@@ -515,12 +512,10 @@ def test_ogr_join_23():
     sql_lyr = ds.ExecuteSQL("SELECT * FROM first JOIN second ON first.f = second.f")
     feat = sql_lyr.GetNextFeature()
     if feat.IsFieldSetAndNotNull('second.f'):
-        gdaltest.post_reason('fail')
         feat.DumpReadable()
         return 'fail'
     feat = sql_lyr.GetNextFeature()
     if feat['f'] != 'key1' or feat['second.f'] != 'key1':
-        gdaltest.post_reason('fail')
         feat.DumpReadable()
         return 'fail'
     ds.ReleaseResultSet(sql_lyr)
diff --git a/autotest/ogr/ogr_kml.py b/autotest/ogr/ogr_kml.py
index ee3c3752dacc..67c2694e4547 100755
--- a/autotest/ogr/ogr_kml.py
+++ b/autotest/ogr/ogr_kml.py
@@ -649,7 +649,6 @@ def test_ogr_kml_read_empty():
 
     ds = ogr.Open('data/empty.kml')
     if ds.GetLayerCount() != 0:
-        gdaltest.post_reason('failed')
         print(ds.GetLayerCount())
         return 'fail'
 
@@ -666,17 +665,14 @@ def test_ogr_kml_read_emptylayers():
 
     ds = ogr.Open('data/emptylayers.kml')
     if ds.GetLayerCount() != 2:
-        gdaltest.post_reason('failed')
         print(ds.GetLayerCount())
         return 'fail'
 
     if ds.GetLayer(0).GetFeatureCount() != 0:
-        gdaltest.post_reason('failed')
         print(ds.GetLayer(0).GetFeatureCount())
         return 'fail'
 
     if ds.GetLayer(1).GetFeatureCount() != 0:
-        gdaltest.post_reason('failed')
         print(ds.GetLayer(1).GetFeatureCount())
         return 'fail'
 
@@ -690,12 +686,10 @@ def compare_output(content, expected_content):
     expected_lines = expected_content.strip().split('\n')
 
     if len(content_lines) != len(expected_lines):
-        gdaltest.post_reason('fail')
         print(content)
         return 'fail'
     for i, content_line in enumerate(content_lines):
         if content_line.strip() != expected_lines[i].strip():
-            gdaltest.post_reason('fail')
             print(content)
             return 'fail'
 
@@ -844,12 +838,10 @@ def test_ogr_kml_read_folder_with_subfolder_placemark():
 
     ds = ogr.Open('data/folder_with_subfolder_placemark.kml')
     if ds.GetLayerCount() != 1:
-        gdaltest.post_reason('failed')
         print(ds.GetLayerCount())
         return 'fail'
 
     if ds.GetLayer(0).GetFeatureCount() != 0:
-        gdaltest.post_reason('failed')
         print(ds.GetLayer(0).GetFeatureCount())
         return 'fail'
 
@@ -882,12 +874,10 @@ def test_ogr_kml_read_weird_empty_folders():
 
     ds = ogr.Open('data/weird_empty_folders.kml')
     if ds.GetLayerCount() != 1:
-        gdaltest.post_reason('failed')
         print(ds.GetLayerCount())
         return 'fail'
 
     if ds.GetLayer(0).GetFeatureCount() != 0:
-        gdaltest.post_reason('failed')
         print(ds.GetLayer(0).GetFeatureCount())
         return 'fail'
 
@@ -938,12 +928,10 @@ def test_ogr_kml_read_duplicate_folder_name():
     ds = ogr.Open('data/duplicate_folder_name.kml')
     lyr = ds.GetLayer(0)
     if lyr.GetName() != 'layer':
-        gdaltest.post_reason('failure')
         print(lyr.GetName())
         return 'fail'
     lyr = ds.GetLayer(1)
     if lyr.GetName() != 'layer (#2)':
-        gdaltest.post_reason('failure')
         print(lyr.GetName())
         return 'fail'
 
@@ -961,18 +949,14 @@ def test_ogr_kml_read_placemark_in_root_and_subfolder():
     ds = ogr.Open('data/placemark_in_root_and_subfolder.kml')
     lyr = ds.GetLayerByName('TopLevel')
     if lyr is None:
-        gdaltest.post_reason('failure')
         return 'fail'
     if lyr.GetFeatureCount() != 1:
-        gdaltest.post_reason('failure')
         return 'fail'
 
     lyr = ds.GetLayerByName('SubFolder1')
     if lyr is None:
-        gdaltest.post_reason('failure')
         return 'fail'
     if lyr.GetFeatureCount() != 1:
-        gdaltest.post_reason('failure')
         return 'fail'
 
     return 'success'
diff --git a/autotest/ogr/ogr_libkml.py b/autotest/ogr/ogr_libkml.py
index 8e40d0340920..000db62e2cfd 100755
--- a/autotest/ogr/ogr_libkml.py
+++ b/autotest/ogr/ogr_libkml.py
@@ -694,7 +694,6 @@ def test_ogr_libkml_read_empty():
 
     ds = ogr.Open('data/empty.kml')
     if ds.GetLayerCount() != 0:
-        gdaltest.post_reason('failed')
         print(ds.GetLayerCount())
         return 'fail'
 
@@ -713,18 +712,15 @@ def test_ogr_libkml_read_emptylayers():
 
     ds = ogr.Open('data/emptylayers.kml')
     if ds.GetLayerCount() != 2:
-        gdaltest.post_reason('failed')
         print(ds.GetLayerCount())
         return 'fail'
 
     # --> One difference with the old KML driver
     if ds.GetLayer(0).GetFeatureCount() != 1:
-        gdaltest.post_reason('failed')
         print(ds.GetLayer(0).GetFeatureCount())
         return 'fail'
 
     if ds.GetLayer(1).GetFeatureCount() != 0:
-        gdaltest.post_reason('failed')
         print(ds.GetLayer(1).GetFeatureCount())
         return 'fail'
 
@@ -746,13 +742,11 @@ def test_ogr_libkml_read_emptylayers_without_folder():
 
     ds = ogr.Open('data/emptylayers_without_folder.kml')
     if ds.GetLayerCount() != 1:
-        gdaltest.post_reason('failed')
         print(ds.GetLayerCount())
         return 'fail'
 
     # --> One difference with the old KML driver
     if ds.GetLayer(0).GetName() != 'Test':
-        gdaltest.post_reason('failed')
         print("Layer name must be '" + ds.GetLayer(0).GetName() + "'.")
         return 'fail'
 
@@ -771,32 +765,27 @@ def test_ogr_libkml_read_schema():
 
     ds = ogr.Open('data/test_schema.kml')
     if ds.GetLayerCount() != 4:
-        gdaltest.post_reason('failed')
         print(ds.GetLayerCount())
         return 'fail'
 
     lyr = ds.GetLayer(0)
     feat = lyr.GetNextFeature()
     if feat.GetField('foo') != 'bar':
-        gdaltest.post_reason('failed')
         feat.DumpReadable()
         return 'fail'
 
     lyr = ds.GetLayer(1)
     feat = lyr.GetNextFeature()
     if feat.GetField('foo') != 'baz':
-        gdaltest.post_reason('failed')
         feat.DumpReadable()
         return 'fail'
 
     lyr = ds.GetLayer(2)
     if lyr.GetLayerDefn().GetFieldIndex('foo') != -1:
-        gdaltest.post_reason('failed')
         return 'fail'
 
     lyr = ds.GetLayer(3)
     if lyr.GetLayerDefn().GetFieldIndex('foo') != -1:
-        gdaltest.post_reason('failed')
         return 'fail'
 
     ds = None
@@ -817,21 +806,17 @@ def test_ogr_libkml_extended_data_without_schema_data():
     lyr = ds.GetLayer(0)
     feat = lyr.GetNextFeature()
     if feat.GetField('field1') != '1_1':
-        gdaltest.post_reason('failed')
         feat.DumpReadable()
         return 'fail'
     if feat.GetField('field2') != '1_2':
-        gdaltest.post_reason('failed')
         feat.DumpReadable()
         return 'fail'
 
     feat = lyr.GetNextFeature()
     if feat.GetField('field1') != '2_1':
-        gdaltest.post_reason('failed')
         feat.DumpReadable()
         return 'fail'
     if feat.IsFieldSet('field2'):
-        gdaltest.post_reason('failed')
         feat.DumpReadable()
         return 'fail'
 
@@ -856,7 +841,6 @@ def test_ogr_libkml_gxtrack():
        feat.GetField('end') != '2013/05/28 13:00:00' or \
        feat.GetGeometryRef().ExportToWkt() != 'LINESTRING (2 49,3 50)':
         feat.DumpReadable()
-        gdaltest.post_reason('failure')
         return 'fail'
     ds = None
 
@@ -879,7 +863,6 @@ def test_ogr_libkml_gxmultitrack():
        feat.GetField('end') != '2013/05/28 13:00:00' or \
        feat.GetGeometryRef().ExportToWkt() != 'MULTILINESTRING ((2 49,3 50))':
         feat.DumpReadable()
-        gdaltest.post_reason('failure')
         return 'fail'
     ds = None
 
@@ -929,7 +912,6 @@ def test_ogr_libkml_camera():
        data.find('<roll>10</roll>') == -1 or \
        data.find('<altitudeMode>relativeToGround</altitudeMode>') == -1:
         print(data)
-        gdaltest.post_reason('failure')
         return 'fail'
 
     ds = ogr.Open('/vsimem/ogr_libkml_camera.kml')
@@ -941,7 +923,6 @@ def test_ogr_libkml_camera():
         feat.GetField("tilt") != 75.0 or
             feat.GetField("roll") != 10.0):
         feat.DumpReadable()
-        gdaltest.post_reason('failure')
         return 'fail'
 
     feat = lyr.GetNextFeature()
@@ -951,7 +932,6 @@ def test_ogr_libkml_camera():
         feat.IsFieldSet("roll") or
             feat.GetField("altitudeMode") != 'relativeToGround'):
         feat.DumpReadable()
-        gdaltest.post_reason('failure')
         return 'fail'
     ds = None
 
@@ -984,7 +964,6 @@ def test_ogr_libkml_write_layer_lookat():
        data.find('<latitude>49</latitude>') == -1 or \
        data.find('<range>150</range>') == -1:
         print(data)
-        gdaltest.post_reason('failure')
         return 'fail'
 
     if data.find('<LookAt>') == -1 or \
@@ -996,7 +975,6 @@ def test_ogr_libkml_write_layer_lookat():
        data.find('<range>150</range>') == -1 or \
        data.find('<altitudeMode>relativeToGround</altitudeMode>') == -1:
         print(data)
-        gdaltest.post_reason('failure')
         return 'fail'
 
     return 'success'
@@ -1030,7 +1008,6 @@ def test_ogr_libkml_write_layer_camera():
        data.find('<roll>10</roll>') == -1 or \
        data.find('<altitudeMode>relativeToGround</altitudeMode>') == -1:
         print(data)
-        gdaltest.post_reason('failure')
         return 'fail'
 
     return 'success'
@@ -1063,12 +1040,10 @@ def test_ogr_libkml_write_multigeometry():
     feat = lyr.GetNextFeature()
     if feat.GetGeometryRef().ExportToWkt() != 'POINT (0 1 0)':
         feat.DumpReadable()
-        gdaltest.post_reason('failure')
         return 'fail'
     feat = lyr.GetNextFeature()
     if feat.GetGeometryRef().ExportToWkt() != 'GEOMETRYCOLLECTION EMPTY':
         feat.DumpReadable()
-        gdaltest.post_reason('failure')
         return 'fail'
 
     return 'success'
@@ -1098,7 +1073,6 @@ def test_ogr_libkml_write_snippet():
 
     if data.find('<snippet>test_snippet</snippet>') == -1:
         print(data)
-        gdaltest.post_reason('failure')
         return 'fail'
 
     ds = ogr.Open("/vsimem/ogr_libkml_write_snippet.kml")
@@ -1106,11 +1080,9 @@ def test_ogr_libkml_write_snippet():
     feat = lyr.GetNextFeature()
     if feat.GetField('snippet') != 'test_snippet':
         feat.DumpReadable()
-        gdaltest.post_reason('failure')
         return 'fail'
     if feat.GetGeometryRef().ExportToWkt() != 'POINT (0 1 0)':
         feat.DumpReadable()
-        gdaltest.post_reason('failure')
         return 'fail'
 
     return 'success'
@@ -1172,7 +1144,6 @@ def test_ogr_libkml_write_atom_link():
     if data.find('<kml xmlns="http://www.opengis.net/kml/2.2" xmlns:atom="http://www.w3.org/2005/Atom">') == -1 or \
        data.find('<atom:link href="http://foo" rel="related"/>') == -1:
         print(data)
-        gdaltest.post_reason('failure')
         return 'fail'
 
     return 'success'
@@ -1201,7 +1172,6 @@ def test_ogr_libkml_write_phonenumber():
 
     if data.find('<phoneNumber>tel:911</phoneNumber>') == -1:
         print(data)
-        gdaltest.post_reason('failure')
         return 'fail'
 
     return 'success'
@@ -1238,7 +1208,6 @@ def test_ogr_libkml_write_region():
        data.find('<minLodPixels>256</minLodPixels>') == -1 or \
        data.find('<maxLodPixels>-1</maxLodPixels>') == -1:
         print(data)
-        gdaltest.post_reason('failure')
         return 'fail'
 
     if data.find('<north>90</north>') == -1 or \
@@ -1250,7 +1219,6 @@ def test_ogr_libkml_write_region():
        data.find('<minFadeExtent>1</minFadeExtent>') == -1 or \
        data.find('<maxFadeExtent>2</maxFadeExtent>') == -1:
         print(data)
-        gdaltest.post_reason('failure')
         return 'fail'
 
     return 'success'
@@ -1291,7 +1259,6 @@ def test_ogr_libkml_write_screenoverlay():
     if data.find('<href>http://foo</href>') == -1 or \
        data.find('<screenXY x="0.05" xunits="fraction" y="0.05" yunits="fraction"/>') == -1:
         print(data)
-        gdaltest.post_reason('failure')
         return 'fail'
 
     if data.find('<overlayXY x="10" xunits="pixels" y="20" yunits="pixels"/>') == -1 or \
@@ -1300,7 +1267,6 @@ def test_ogr_libkml_write_screenoverlay():
        data.find('<name>name</name>') == -1 or \
        data.find('<description>description</description>') == -1:
         print(data)
-        gdaltest.post_reason('failure')
         return 'fail'
 
     return 'success'
@@ -1365,7 +1331,6 @@ def test_ogr_libkml_write_model():
        data.find('<href>http://makc.googlecode.com/svn/trunk/flash/sandy_flar2/cube.dae</href>') == -1 or \
        data.find('<href>http://foo</href>') == -1:
         print(data)
-        gdaltest.post_reason('failure')
         return 'fail'
 
     # This can only appear if HTTP resource is available and GDAL is built with curl/http support
@@ -1375,7 +1340,6 @@ def test_ogr_libkml_write_model():
 
         if gdaltest.gdalurlopen('http://makc.googlecode.com/svn/trunk/flash/sandy_flar2/cube.dae') is not None:
             print(data)
-            gdaltest.post_reason('failure')
             return 'fail'
 
     return 'success'
@@ -1483,7 +1447,6 @@ def test_ogr_libkml_read_write_style():
     if lines_got != lines_ref:
         print(data)
         print(styles)
-        gdaltest.post_reason('failure')
         return 'fail'
 
     lines_got = lines[lines.index('<Style id="styleMapExample">'):lines.index('</Document>')]
@@ -1491,7 +1454,6 @@ def test_ogr_libkml_read_write_style():
     if lines_got != lines_ref:
         print(data)
         print(resolved_stylemap)
-        gdaltest.post_reason('failure')
         return 'fail'
 
     # Test reading highlight style in StyleMap
@@ -1516,7 +1478,6 @@ def test_ogr_libkml_read_write_style():
     if lines_got != lines_ref:
         print(data)
         print(resolved_stylemap_highlight)
-        gdaltest.post_reason('failure')
         return 'fail'
 
     # Test writing feature style
@@ -1538,12 +1499,10 @@ def test_ogr_libkml_read_write_style():
     feat = lyr.GetNextFeature()
     if feat.GetStyleString() != '@unknown_style':
         print(feat.GetStyleString())
-        gdaltest.post_reason('failure')
         return 'fail'
     feat = lyr.GetNextFeature()
     if feat.GetStyleString() != style_string:
         print(feat.GetStyleString())
-        gdaltest.post_reason('failure')
         return 'fail'
     ds = None
 
@@ -1580,7 +1539,6 @@ def test_ogr_libkml_read_write_style():
     if lines_got != lines_ref:
         print(data)
         print(resolved_stylemap_highlight)
-        gdaltest.post_reason('failure')
         return 'fail'
 
     # Automatic StyleMap creation testing
@@ -1629,7 +1587,6 @@ def test_ogr_libkml_read_write_style():
     if lines_got != lines_ref:
         print(data)
         print(styles)
-        gdaltest.post_reason('failure')
         return 'fail'
 
     return 'success'
@@ -1690,7 +1647,6 @@ def test_ogr_libkml_write_update():
                 data.find('<Delete>') == -1 or \
                 data.find('<Placemark targetId="layer_to_edit.3"/>') == -1:
             print(data)
-            gdaltest.post_reason('failure')
             return 'fail'
 
     return 'success'
@@ -1735,7 +1691,6 @@ def test_ogr_libkml_write_networklinkcontrol():
         else:
             f = gdal.VSIFOpenL('/vsimem/ogr_libkml_write_networklinkcontrol_dir/doc.kml', 'rb')
         if f is None:
-            gdaltest.post_reason('failure')
             return 'fail'
         data = gdal.VSIFReadL(1, 2048, f)
         data = data.decode('ascii')
@@ -1750,7 +1705,6 @@ def test_ogr_libkml_write_networklinkcontrol():
                 data.find('<linkSnippet>linksnippet</linkSnippet>') == -1 or \
                 data.find('<expires>2014-12-31T23:59:59Z</expires>') == -1:
             print(data)
-            gdaltest.post_reason('failure')
             return 'fail'
 
     return 'success'
@@ -1791,7 +1745,6 @@ def test_ogr_libkml_write_liststyle():
        data.find('<listItemType>checkOffOnly</listItemType>') == -1 or \
        data.find('<listItemType>checkHideChildren</listItemType>') == -1:
         print(data)
-        gdaltest.post_reason('failure')
         return 'fail'
 
     return 'success'
@@ -1862,7 +1815,6 @@ def test_ogr_libkml_write_networklink():
        data.find('<viewBoundScale>0.5</viewBoundScale>') == -1 or \
        data.find('<viewFormat>BBOX=[bboxWest],[bboxSouth],[bboxEast],[bboxNorth]</viewFormat>') == -1:
         print(data)
-        gdaltest.post_reason('failure')
         return 'fail'
 
     return 'success'
@@ -1951,7 +1903,6 @@ def test_ogr_libkml_write_photooverlay():
        data.find('<maxHeight>512</maxHeight>') == -1 or \
        data.find('<gridOrigin>upperLeft</gridOrigin>') == -1:
         print(data)
-        gdaltest.post_reason('failure')
         return 'fail'
 
     return 'success'
@@ -1984,14 +1935,12 @@ def test_ogr_libkml_read_write_data():
     if data.find('<Data name="foo">') == -1 or \
        data.find('<value>bar</value>') == -1:
         print(data)
-        gdaltest.post_reason('failure')
         return 'fail'
 
     ds = ogr.Open("/vsimem/ogr_libkml_read_write_data.kml")
     lyr = ds.GetLayer(0)
     feat = lyr.GetNextFeature()
     if feat.GetField('foo') != 'bar':
-        gdaltest.post_reason('failure')
         return 'fail'
 
     return 'success'
@@ -2021,7 +1970,6 @@ def test_ogr_libkml_write_folder():
        data.find('<styleUrl>#test_liststyle</styleUrl>') == -1 or \
        data.find('<Folder id="test2">') == -1:
         print(data)
-        gdaltest.post_reason('failure')
         return 'fail'
 
     return 'success'
@@ -2056,7 +2004,6 @@ def test_ogr_libkml_write_container_properties():
        data.find('<snippet>lyr_snippet</snippet>') == -1 or \
        data.find('<description>lyr_description</description>') == -1:
         print(data)
-        gdaltest.post_reason('failure')
         return 'fail'
 
     return 'success'
@@ -2074,12 +2021,10 @@ def test_ogr_libkml_read_gx_timestamp():
     lyr = ds.GetLayer(0)
     f = lyr.GetNextFeature()
     if f['timestamp'] != '2016/02/13 12:34:56+00':
-        gdaltest.post_reason('failure')
         f.DumpReadable()
         return 'fail'
     f = lyr.GetNextFeature()
     if f['begin'] != '2016/02/13 00:00:00+00' or f['end'] != '2016/02/14 00:00:00+00':
-        gdaltest.post_reason('failure')
         f.DumpReadable()
         return 'fail'
 
@@ -2114,12 +2059,10 @@ def test_ogr_libkml_read_duplicate_folder_name():
     ds = ogr.Open('data/duplicate_folder_name.kml')
     lyr = ds.GetLayer(0)
     if lyr.GetName() != 'layer':
-        gdaltest.post_reason('failure')
         print(lyr.GetName())
         return 'fail'
     lyr = ds.GetLayer(1)
     if lyr.GetName() != 'layer (#2)':
-        gdaltest.post_reason('failure')
         print(lyr.GetName())
         return 'fail'
 
@@ -2137,18 +2080,14 @@ def test_ogr_libkml_read_placemark_in_root_and_subfolder():
     ds = ogr.Open('data/placemark_in_root_and_subfolder.kml')
     lyr = ds.GetLayerByName('TopLevel')
     if lyr is None:
-        gdaltest.post_reason('failure')
         return 'fail'
     if lyr.GetFeatureCount() != 1:
-        gdaltest.post_reason('failure')
         return 'fail'
 
     lyr = ds.GetLayerByName('SubFolder1')
     if lyr is None:
-        gdaltest.post_reason('failure')
         return 'fail'
     if lyr.GetFeatureCount() != 1:
-        gdaltest.post_reason('failure')
         return 'fail'
 
     return 'success'
@@ -2206,13 +2145,11 @@ def test_ogr_libkml_read_several_schema():
     lyr = ds.GetLayer(0)
     feat = lyr.GetNextFeature()
     if feat['fieldA'] != 'fieldAValue' or feat['common'] != 'commonAValue':
-        gdaltest.post_reason('fail')
         feat.DumpReadable()
         return 'fail'
 
     feat = lyr.GetNextFeature()
     if feat['fieldB'] != 'fieldBValue' or feat['common'] != 'commonBValue':
-        gdaltest.post_reason('fail')
         feat.DumpReadable()
         return 'fail'
 
@@ -2220,13 +2157,11 @@ def test_ogr_libkml_read_several_schema():
     lyr = ds.GetLayer(0)
     feat = lyr.GetNextFeature()
     if feat['fieldA'] != 'fieldAValue' or feat['common'] != 'commonAValue':
-        gdaltest.post_reason('fail')
         feat.DumpReadable()
         return 'fail'
 
     feat = lyr.GetNextFeature()
     if feat['fieldB'] != 'fieldBValue' or feat['common'] != 'commonBValue':
-        gdaltest.post_reason('fail')
         feat.DumpReadable()
         return 'fail'
 
diff --git a/autotest/ogr/ogr_mem.py b/autotest/ogr/ogr_mem.py
index 82fa9b554a9c..de05be3dc732 100755
--- a/autotest/ogr/ogr_mem.py
+++ b/autotest/ogr/ogr_mem.py
@@ -538,44 +538,35 @@ def test_ogr_mem_15():
     f = None
 
     if lyr.GetGeomType() != ogr.wkbCircularString:
-        gdaltest.post_reason('fail')
         return 'fail'
     if lyr.GetLayerDefn().GetGeomType() != ogr.wkbCircularString:
-        gdaltest.post_reason('fail')
         return 'fail'
     if lyr.GetLayerDefn().GetGeomFieldDefn(0).GetType() != ogr.wkbCircularString:
-        gdaltest.post_reason('fail')
         return 'fail'
     f = lyr.GetNextFeature()
     g = f.GetGeometryRef()
     if g.GetGeometryType() != ogr.wkbCircularString:
-        gdaltest.post_reason('fail')
         return 'fail'
 
     # Test SetNonLinearGeometriesEnabledFlag(False)
     old_val = ogr.GetNonLinearGeometriesEnabledFlag()
     ogr.SetNonLinearGeometriesEnabledFlag(False)
     if lyr.GetGeomType() != ogr.wkbLineString:
-        gdaltest.post_reason('fail')
         return 'fail'
     if lyr.GetLayerDefn().GetGeomType() != ogr.wkbLineString:
-        gdaltest.post_reason('fail')
         return 'fail'
     if lyr.GetLayerDefn().GetGeomFieldDefn(0).GetType() != ogr.wkbLineString:
-        gdaltest.post_reason('fail')
         return 'fail'
     lyr.ResetReading()
     f = lyr.GetNextFeature()
     g = f.GetGeometryRef()
     if g.GetGeometryType() != ogr.wkbLineString:
-        gdaltest.post_reason('fail')
         return 'fail'
 
     lyr.ResetReading()
     f = lyr.GetNextFeature()
     g = f.GetGeomFieldRef(0)
     if g.GetGeometryType() != ogr.wkbLineString:
-        gdaltest.post_reason('fail')
         return 'fail'
     ogr.SetNonLinearGeometriesEnabledFlag(old_val)
 
@@ -591,104 +582,82 @@ def test_ogr_mem_16():
     f = ogr.Feature(lyr.GetLayerDefn())
     ret = lyr.CreateFeature(f)
     if ret != 0:
-        gdaltest.post_reason('fail')
         return 'fail'
     if f.GetFID() != 0:
-        gdaltest.post_reason('fail')
         return 'fail'
 
     f = ogr.Feature(lyr.GetLayerDefn())
     ret = lyr.CreateFeature(f)
     if ret != 0:
-        gdaltest.post_reason('fail')
         return 'fail'
     if f.GetFID() != 1:
-        gdaltest.post_reason('fail')
         return 'fail'
 
     f = ogr.Feature(lyr.GetLayerDefn())
     f.SetFID(100000000)
     ret = lyr.CreateFeature(f)
     if ret != 0:
-        gdaltest.post_reason('fail')
         return 'fail'
 
     f = ogr.Feature(lyr.GetLayerDefn())
     f.SetFID(100000000)
     ret = lyr.SetFeature(f)
     if ret != 0:
-        gdaltest.post_reason('fail')
         return 'fail'
 
     if lyr.GetFeatureCount() != 3:
-        gdaltest.post_reason('fail')
         print(lyr.GetFeatureCount())
         return 'fail'
 
     if lyr.GetFeature(0) is None:
-        gdaltest.post_reason('fail')
         return 'fail'
     if lyr.GetFeature(1) is None:
-        gdaltest.post_reason('fail')
         return 'fail'
     if lyr.GetFeature(2) is not None:
-        gdaltest.post_reason('fail')
         return 'fail'
     if lyr.GetFeature(100000000) is None:
-        gdaltest.post_reason('fail')
         return 'fail'
 
     lyr.ResetReading()
     f = lyr.GetNextFeature()
     if f.GetFID() != 0:
-        gdaltest.post_reason('fail')
         return 'fail'
     f = lyr.GetNextFeature()
     if f.GetFID() != 1:
-        gdaltest.post_reason('fail')
         return 'fail'
     f = lyr.GetNextFeature()
     if f.GetFID() != 100000000:
-        gdaltest.post_reason('fail')
         return 'fail'
     f = lyr.GetNextFeature()
     if f is not None:
-        gdaltest.post_reason('fail')
         return 'fail'
 
     f = ogr.Feature(lyr.GetLayerDefn())
     f.SetFID(100000000)
     ret = lyr.CreateFeature(f)
     if ret != 0:
-        gdaltest.post_reason('fail')
         return 'fail'
     if f.GetFID() != 2:
-        gdaltest.post_reason('fail')
         print(f.GetFID())
         return 'fail'
 
     if lyr.GetFeatureCount() != 4:
-        gdaltest.post_reason('fail')
         print(lyr.GetFeatureCount())
         return 'fail'
 
     ret = lyr.DeleteFeature(1)
     if ret != 0:
-        gdaltest.post_reason('fail')
         return 'fail'
 
     if lyr.GetFeatureCount() != 3:
-        gdaltest.post_reason('fail')
         print(lyr.GetFeatureCount())
         return 'fail'
 
     ret = lyr.DeleteFeature(1)
     if ret == 0:
-        gdaltest.post_reason('fail')
         return 'fail'
 
     if lyr.GetFeatureCount() != 3:
-        gdaltest.post_reason('fail')
         print(lyr.GetFeatureCount())
         return 'fail'
 
@@ -698,10 +667,8 @@ def test_ogr_mem_16():
     f.SetFID(1234567890123)
     ret = lyr.CreateFeature(f)
     if ret != 0:
-        gdaltest.post_reason('fail')
         return 'fail'
     if f.GetFID() != 1234567890123:
-        gdaltest.post_reason('fail')
         return 'fail'
     f = None  # Important we must not have dangling references before modifying the schema !
 
@@ -736,47 +703,40 @@ def test_ogr_mem_17():
 
     f, lyr = ds.GetNextFeature()
     if f is None or lyr.GetName() != 'ogr_mem_1':
-        gdaltest.post_reason('fail')
         print(f)
         print(lyr.GetName())
         return 'fail'
 
     f, lyr = ds.GetNextFeature()
     if f is None or lyr.GetName() != 'ogr_mem_1':
-        gdaltest.post_reason('fail')
         print(f)
         print(lyr.GetName())
         return 'fail'
 
     f, lyr = ds.GetNextFeature()
     if f is None or lyr.GetName() != 'ogr_mem_2':
-        gdaltest.post_reason('fail')
         print(f)
         print(lyr.GetName())
         return 'fail'
 
     f, lyr = ds.GetNextFeature()
     if f is None or lyr.GetName() != 'ogr_mem_4':
-        gdaltest.post_reason('fail')
         print(f)
         print(lyr.GetName())
         return 'fail'
 
     f, lyr = ds.GetNextFeature()
     if f is not None or lyr is not None:
-        gdaltest.post_reason('fail')
         return 'fail'
 
     f, lyr = ds.GetNextFeature()
     if f is not None or lyr is not None:
-        gdaltest.post_reason('fail')
         return 'fail'
 
     ds.ResetReading()
 
     f, lyr = ds.GetNextFeature()
     if f is None or lyr.GetName() != 'ogr_mem_1':
-        gdaltest.post_reason('fail')
         print(f)
         print(lyr.GetName())
         return 'fail'
@@ -785,7 +745,6 @@ def test_ogr_mem_17():
 
     f, lyr, pct = ds.GetNextFeature(include_pct=True)
     if f is None or lyr.GetName() != 'ogr_mem_1' or pct != 0.25:
-        gdaltest.post_reason('fail')
         print(f)
         print(lyr.GetName())
         print(pct)
@@ -793,35 +752,30 @@ def test_ogr_mem_17():
 
     f, pct = ds.GetNextFeature(include_layer=False, include_pct=True)
     if f is None or pct != 0.50:
-        gdaltest.post_reason('fail')
         print(f)
         print(pct)
         return 'fail'
 
     f, pct = ds.GetNextFeature(include_layer=False, include_pct=True)
     if f is None or pct != 0.75:
-        gdaltest.post_reason('fail')
         print(f)
         print(pct)
         return 'fail'
 
     f, pct = ds.GetNextFeature(include_layer=False, include_pct=True)
     if f is None or pct != 1.0:
-        gdaltest.post_reason('fail')
         print(f)
         print(pct)
         return 'fail'
 
     f, pct = ds.GetNextFeature(include_layer=False, include_pct=True)
     if f is not None or pct != 1.0:
-        gdaltest.post_reason('fail')
         print(f)
         print(pct)
         return 'fail'
 
     f, pct = ds.GetNextFeature(include_layer=False, include_pct=True)
     if f is not None or pct != 1.0:
-        gdaltest.post_reason('fail')
         print(f)
         print(pct)
         return 'fail'
@@ -830,7 +784,6 @@ def test_ogr_mem_17():
 
     f = ds.GetNextFeature(include_layer=False)
     if f is None:
-        gdaltest.post_reason('fail')
         print(f)
         return 'fail'
 
diff --git a/autotest/ogr/ogr_mitab.py b/autotest/ogr/ogr_mitab.py
index 553920282128..41de4104ceaf 100755
--- a/autotest/ogr/ogr_mitab.py
+++ b/autotest/ogr/ogr_mitab.py
@@ -525,7 +525,6 @@ def test_ogr_mitab_15():
     lyr = ds.GetLayer(0)
     f = lyr.GetNextFeature()
     if f.IsFieldSet(0) or f.GetGeometryRef() is None:
-        gdaltest.post_reason('failure')
         f.DumpReadable()
         return 'fail'
     gdal.Unlink('/vsimem/nomid.mif')
@@ -604,13 +603,11 @@ def test_ogr_mitab_18():
         sr_got = lyr.GetSpatialRef()
         wkt = sr_got.ExportToWkt()
         if wkt.find('2154') < 0:
-            gdaltest.post_reason('failure')
             print(filename)
             print(sr_got)
             return 'fail'
         proj4 = sr_got.ExportToProj4()
         if proj4.find('+proj=lcc +lat_1=49 +lat_2=44 +lat_0=46.5 +lon_0=3 +x_0=700000 +y_0=6600000 +ellps=GRS80 +towgs84=0,0,0,0,0,0,0 +units=m +no_defs') != 0:
-            gdaltest.post_reason('failure')
             print(proj4)
             return 'fail'
         ds = None
@@ -714,7 +711,6 @@ def test_ogr_mitab_20():
             lyr = ds.GetLayer(0)
             feat = lyr.GetNextFeature()
             if i == 6 and lyr.GetSpatialRef().ExportToWkt().find('49.00000000001') < 0:
-                gdaltest.post_reason('fail')
                 print(fmt)
                 print(i)
                 print(lyr.GetSpatialRef().ExportToWkt())
@@ -723,14 +719,12 @@ def test_ogr_mitab_20():
             if fmt == 'tab':
                 if i == 1 or i == 2 or i == 4:
                     if feat.GetGeometryRef().ExportToWkt() != 'POINT (700000.001 6600000.001)':
-                        gdaltest.post_reason('fail')
                         print(fmt)
                         print(i)
                         feat.DumpReadable()
                         return 'fail'
                 else:
                     if feat.GetGeometryRef().ExportToWkt() == 'POINT (700000.001 6600000.001)':
-                        gdaltest.post_reason('fail')
                         print(fmt)
                         print(i)
                         feat.DumpReadable()
@@ -775,7 +769,6 @@ def test_ogr_mitab_20():
         else:
             expected = '49.00000000002'
         if lyr.GetSpatialRef().ExportToWkt().find(expected) < 0:
-            gdaltest.post_reason('fail')
             print(lyr.GetSpatialRef().ExportToWkt())
             print(i)
             gdal.SetConfigOption('MITAB_BOUNDS_FILE', None)
@@ -846,7 +839,6 @@ def test_ogr_mitab_22():
                 if lyr.CreateFeature(feat) != 0:
                     print(i)
                     print(nb_features)
-                    gdaltest.post_reason('fail')
                     return 'fail'
             ds = None
 
@@ -859,7 +851,6 @@ def test_ogr_mitab_22():
                 if lyr.CreateFeature(feat) != 0:
                     print(i)
                     print(nb_features)
-                    gdaltest.post_reason('fail')
                     return 'fail'
                 ds = None
 
@@ -870,7 +861,6 @@ def test_ogr_mitab_22():
                 if f is None or f.GetField('ID') != i + 1:
                     print(nb_features)
                     print(i)
-                    gdaltest.post_reason('fail')
                     return 'fail'
             ds = None
 
@@ -902,11 +892,9 @@ def test_ogr_mitab_23():
             if f is None or f.GetField('ID') != i + 1:
                 print(nb_features)
                 print(i)
-                gdaltest.post_reason('fail')
                 return 'fail'
         f = lyr.GetNextFeature()
         if f is not None:
-            gdaltest.post_reason('fail')
             return 'fail'
         ds = None
 
@@ -938,11 +926,9 @@ def test_ogr_mitab_24():
             if f is None or f.GetField('ID') != i + 1:
                 print(nb_features)
                 print(i)
-                gdaltest.post_reason('fail')
                 return 'fail'
         f = lyr.GetNextFeature()
         if f is not None:
-            gdaltest.post_reason('fail')
             return 'fail'
 
         for i in range(int(nb_features / 2)):
@@ -957,11 +943,9 @@ def test_ogr_mitab_24():
             if f is None or f.GetField('ID') != i + 1:
                 print(nb_features)
                 print(i)
-                gdaltest.post_reason('fail')
                 return 'fail'
         f = lyr.GetNextFeature()
         if f is not None:
-            gdaltest.post_reason('fail')
             return 'fail'
 
         ds = None
@@ -1008,7 +992,6 @@ def test_ogr_mitab_25():
             mtime = os.stat(filename[0:-3] + ext).st_mtime
             if mtime_dict[ext] != mtime:
                 print('mtime of .%s has changed !' % ext)
-                gdaltest.post_reason('fail')
                 return 'fail'
 
         # Try by reading all features
@@ -1020,7 +1003,6 @@ def test_ogr_mitab_25():
             mtime = os.stat(filename[0:-3] + ext).st_mtime
             if mtime_dict[ext] != mtime:
                 print('mtime of .%s has changed !' % ext)
-                gdaltest.post_reason('fail')
                 return 'fail'
 
         # Try by reading all features with a spatial index
@@ -1033,7 +1015,6 @@ def test_ogr_mitab_25():
             mtime = os.stat(filename[0:-3] + ext).st_mtime
             if mtime_dict[ext] != mtime:
                 print('mtime of .%s has changed !' % ext)
-                gdaltest.post_reason('fail')
                 return 'fail'
 
         if test_cli_utilities.get_test_ogrsf_path() is not None:
@@ -1073,7 +1054,6 @@ def test_ogr_mitab_26():
                 if lyr.DeleteFeature(int(nb_features / 2)) != 0:
                     print(j)
                     print(nb_features)
-                    gdaltest.post_reason('fail')
                     return 'fail'
             else:
                 for k in range(int(nb_features / 2)):
@@ -1081,7 +1061,6 @@ def test_ogr_mitab_26():
                         print(j)
                         print(k)
                         print(nb_features)
-                        gdaltest.post_reason('fail')
                         return 'fail'
 
             if j == 1:
@@ -1090,14 +1069,12 @@ def test_ogr_mitab_26():
                 if ret != ogr.OGRERR_NON_EXISTING_FEATURE:
                     print(j)
                     print(nb_features)
-                    gdaltest.post_reason('fail')
                     return 'fail'
 
                 feat = lyr.GetFeature(int(nb_features / 2))
                 if feat is not None:
                     print(j)
                     print(nb_features)
-                    gdaltest.post_reason('fail')
                     return 'fail'
 
                 # Expected failure : illegal feature id
@@ -1105,7 +1082,6 @@ def test_ogr_mitab_26():
                 if ret != ogr.OGRERR_NON_EXISTING_FEATURE:
                     print(j)
                     print(nb_features)
-                    gdaltest.post_reason('fail')
                     return 'fail'
 
             ds = None
@@ -1114,7 +1090,6 @@ def test_ogr_mitab_26():
             lyr = ds.GetLayer(0)
             if lyr.GetFeatureCount() != nb_features / 2:
                 print(nb_features)
-                gdaltest.post_reason('fail')
                 return 'fail'
             ds = None
 
@@ -1129,7 +1104,6 @@ def test_ogr_mitab_26():
                 lyr = ds.GetLayer(0)
                 if lyr.GetFeatureCount() != nb_features / 2 - 1:
                     print(nb_features)
-                    gdaltest.post_reason('fail')
                     return 'fail'
                 ds = None
 
@@ -1157,7 +1131,6 @@ def test_ogr_mitab_27():
     ret = lyr.SetFeature(f)
     gdal.PopErrorHandler()
     if ret == 0:
-        gdaltest.post_reason('fail')
         return 'fail'
 
     # Invalid call : feature with FID <= 0
@@ -1167,7 +1140,6 @@ def test_ogr_mitab_27():
     ret = lyr.SetFeature(f)
     gdal.PopErrorHandler()
     if ret == 0:
-        gdaltest.post_reason('fail')
         return 'fail'
 
     f = ogr.Feature(lyr.GetLayerDefn())
@@ -1185,7 +1157,6 @@ def test_ogr_mitab_27():
     ret = lyr.SetFeature(f)
     gdal.PopErrorHandler()
     if ret == 0:
-        gdaltest.post_reason('fail')
         return 'fail'
 
     # Update previously created object with blank feature
@@ -1200,7 +1171,6 @@ def test_ogr_mitab_27():
     f = lyr.GetNextFeature()
     if f.GetField('intfield') != 0 or f.GetField('realfield') != 0 or f.GetField('stringfield') != '' or \
        f.GetGeometryRef() is not None:
-        gdaltest.post_reason('fail')
         f.DumpReadable()
         return 'fail'
 
@@ -1216,7 +1186,6 @@ def test_ogr_mitab_27():
     f = lyr.GetNextFeature()
     if f.GetField('intfield') != 1 or f.GetField('realfield') != 2.34 or f.GetField('stringfield') != 'foo' or \
        f.GetGeometryRef() is None:
-        gdaltest.post_reason('fail')
         f.DumpReadable()
         return 'fail'
 
@@ -1231,7 +1200,6 @@ def test_ogr_mitab_27():
     f = lyr.GetFeature(1)
     if f.GetField('intfield') != 1 or f.GetField('realfield') != 2.34 or f.GetField('stringfield') != 'foo' or \
        f.GetGeometryRef() is None:
-        gdaltest.post_reason('fail')
         f.DumpReadable()
         return 'fail'
     ds = None
@@ -1242,7 +1210,6 @@ def test_ogr_mitab_27():
     f = lyr.GetFeature(1)
     # SetFeature() with identical feature : no-op
     if lyr.SetFeature(f) != 0:
-        gdaltest.post_reason('fail')
         return 'fail'
     ds = None
 
@@ -1259,13 +1226,11 @@ def test_ogr_mitab_27():
     for _ in range(100):
         f.SetGeometryDirectly(ogr.CreateGeometryFromWkt('POINT (2 3)'))
         if lyr.SetFeature(f) != 0:
-            gdaltest.post_reason('fail')
             return 'fail'
     ds = None
 
     stat = gdal.VSIStatL(filename[0:-3] + "map")
     if stat.size != old_size:
-        gdaltest.post_reason('fail')
         return 'fail'
 
     ds = ogr.Open(filename, update=1)
@@ -1275,13 +1240,11 @@ def test_ogr_mitab_27():
     # SetFeature() with identical geometry : rewrite only attributes
     f.SetField('intfield', -1)
     if lyr.SetFeature(f) != 0:
-        gdaltest.post_reason('fail')
         return 'fail'
 
     f = lyr.GetFeature(1)
     if f.GetField('intfield') != -1 or f.GetField('realfield') != 2.34 or f.GetField('stringfield') != 'foo' or \
        f.GetGeometryRef() is None:
-        gdaltest.post_reason('fail')
         f.DumpReadable()
         return 'fail'
 
@@ -1359,7 +1322,6 @@ def test_ogr_mitab_28():
         x_ref = int(n / N2)
         y_ref = n % N2
         if abs(x - x_ref) + abs(y - y_ref) > 0.1:
-            gdaltest.post_reason('fail')
             return 'fail'
         i = i + 1
 
@@ -1369,7 +1331,6 @@ def test_ogr_mitab_28():
         y = n % N2
         lyr.SetSpatialFilterRect(x - 0.5, y - 0.5, x + 0.5, y + 0.5)
         if lyr.GetFeatureCount() != 1:
-            gdaltest.post_reason('fail')
             return 'fail'
 
     ds = None
@@ -1428,7 +1389,6 @@ def test_ogr_mitab_29():
             print(n)
             print(lyr.GetFeatureCount())
             print(x - 0.01, y - 0.01, x + 0.01, y + 0.01)
-            gdaltest.post_reason('fail')
             return 'fail'
     ds = None
 
@@ -1448,13 +1408,11 @@ def test_ogr_mitab_30(update=0):
     lyr = ds.CreateLayer('test', options=['BOUNDS=0,0,100,100'])
     lyr.CreateField(ogr.FieldDefn('ID', ogr.OFTInteger))
     if lyr.SyncToDisk() != 0:
-        gdaltest.post_reason('fail')
         return 'fail'
 
     ds2 = ogr.Open(filename)
     lyr2 = ds2.GetLayer(0)
     if lyr2.GetFeatureCount() != 0 or lyr2.GetLayerDefn().GetFieldCount() != 1:
-        gdaltest.post_reason('fail')
         return 'fail'
     ds2 = None
 
@@ -1471,12 +1429,10 @@ def test_ogr_mitab_30(update=0):
         time.sleep(1)
 
     if lyr.SyncToDisk() != 0:
-        gdaltest.post_reason('fail')
         return 'fail'
     for ext in ('map', 'tab', 'dat', 'id'):
         stat2 = gdal.VSIStatL(filename[0:-3] + ext)
         if stat[ext].size != stat2.size or stat[ext].mtime != stat2.mtime:
-            gdaltest.post_reason('fail')
             return 'fail'
 
     if update == 1:
@@ -1497,7 +1453,6 @@ def test_ogr_mitab_30(update=0):
         for i in range(2):
             ret = lyr.SyncToDisk()
             if ret != 0:
-                gdaltest.post_reason('fail')
                 return 'fail'
 
             if i == 0:
@@ -1510,7 +1465,6 @@ def test_ogr_mitab_30(update=0):
                         print(ext)
                         print(j)
                         print(i)
-                        gdaltest.post_reason('fail')
                         return 'fail'
 
             ds2 = ogr.Open(filename)
@@ -1518,14 +1472,12 @@ def test_ogr_mitab_30(update=0):
             if lyr2.GetFeatureCount() != j + 1:
                 print(j)
                 print(i)
-                gdaltest.post_reason('fail')
                 return 'fail'
             feat2 = lyr2.GetFeature(j + 1)
             if feat2.GetField('ID') != j + 1 or feat2.GetGeometryRef().ExportToWkt() != 'POINT (%d %d)' % (j, j):
                 print(j)
                 print(i)
                 feat2.DumpReadable()
-                gdaltest.post_reason('fail')
                 return 'fail'
             lyr2.ResetReading()
             for _ in range(j + 1):
@@ -1534,7 +1486,6 @@ def test_ogr_mitab_30(update=0):
                 print(j)
                 print(i)
                 feat2.DumpReadable()
-                gdaltest.post_reason('fail')
                 return 'fail'
             ds2 = None
 
@@ -1562,17 +1513,14 @@ def test_ogr_mitab_32():
         lyr = ds.GetLayer(0)
         if lyr.GetFeatureCount() != 2:
             print(update)
-            gdaltest.post_reason('fail')
             return 'fail'
         f = lyr.GetNextFeature()
         if f.GetField('a') != 1 or f.GetField('b') != 2 or f.GetField('d') != 'hello':
             print(update)
-            gdaltest.post_reason('fail')
             return 'fail'
         f = lyr.GetFeature(2)
         if f.GetField('a') != 4:
             print(update)
-            gdaltest.post_reason('fail')
             return 'fail'
     ds = None
 
@@ -1590,12 +1538,10 @@ def test_ogr_mitab_33():
         lyr = ds.GetLayer(0)
         if lyr.GetFeatureCount() != 1:
             print(update)
-            gdaltest.post_reason('fail')
             return 'fail'
         f = lyr.GetNextFeature()
         if f.GetField('toto') != '':
             print(update)
-            gdaltest.post_reason('fail')
             return 'fail'
     ds = None
 
@@ -1616,15 +1562,12 @@ def test_ogr_mitab_33():
     ds = ogr.Open('tmp/single_point_mapinfo.tab')
     lyr = ds.GetLayer(0)
     if lyr.GetFeatureCount() != 2:
-        gdaltest.post_reason('fail')
         return 'fail'
     f = lyr.GetNextFeature()
     if f is None:
-        gdaltest.post_reason('fail')
         return 'fail'
     f = lyr.GetNextFeature()
     if f is None:
-        gdaltest.post_reason('fail')
         return 'fail'
     ds = None
 
@@ -1646,11 +1589,9 @@ def test_ogr_mitab_33():
     ds = ogr.Open('tmp/single_point_mapinfo.tab')
     lyr = ds.GetLayer(0)
     if lyr.GetFeatureCount() != 1:
-        gdaltest.post_reason('fail')
         return 'fail'
     f = lyr.GetNextFeature()
     if f is None:
-        gdaltest.post_reason('fail')
         return 'fail'
     ds = None
 
@@ -1692,17 +1633,14 @@ def test_ogr_mitab_34():
     f = lyr.GetNextFeature()
     geom = f.GetGeometryRef()
     if abs(geom.GetX(0) - -1000) > 1e-2 or abs(geom.GetY(0) - 3000) > 1e-2:
-        gdaltest.post_reason('fail')
         return 'fail'
     for i in range(999):
         if abs(geom.GetX(i + 1) - (i + 1)) > 1e-2 or abs(geom.GetY(i + 1) - (i + 1)) > 1e-2:
-            gdaltest.post_reason('fail')
             return 'fail'
     f = lyr.GetNextFeature()
     geom = f.GetGeometryRef()
     for i in range(1000):
         if abs(geom.GetX(i) - (i)) > 1e-2 or abs(geom.GetY(i) - (i)) > 1e-2:
-            gdaltest.post_reason('fail')
             return 'fail'
     ds = None
 
@@ -1773,20 +1711,17 @@ def test_ogr_mitab_35():
     srs = osr.SpatialReference()
     coordsys = get_coordsys_from_srs(srs)
     if coordsys != 'CoordSys NonEarth Units "m"':
-        gdaltest.post_reason('fail')
         print(coordsys)
         return 'fail'
 
     srs = osr.SpatialReference('LOCAL_CS["foo"]')
     coordsys = get_coordsys_from_srs(srs)
     if coordsys != 'CoordSys NonEarth Units "m"':
-        gdaltest.post_reason('fail')
         print(coordsys)
         return 'fail'
     srs = get_srs_from_coordsys(coordsys)
     wkt = srs.ExportToWkt()
     if wkt != 'LOCAL_CS["Nonearth",UNIT["Meter",1.0]]':
-        gdaltest.post_reason('fail')
         print(wkt)
         return 'fail'
 
@@ -1797,7 +1732,6 @@ def test_ogr_mitab_35():
         # print(srs)
         got_coordsys = get_coordsys_from_srs(srs)
         if coordsys != got_coordsys:
-            gdaltest.post_reason('fail')
             print(coordsys)
             print(srs)
             print(got_coordsys)
@@ -1808,18 +1742,15 @@ def test_ogr_mitab_35():
     srs.ImportFromEPSG(4326)
     coordsys = get_coordsys_from_srs(srs)
     if coordsys != 'CoordSys Earth Projection 1, 104':
-        gdaltest.post_reason('fail')
         print(coordsys)
         return 'fail'
     srs = get_srs_from_coordsys(coordsys)
     wkt = srs.ExportToWkt()
     if wkt != 'GEOGCS["unnamed",DATUM["WGS_1984",SPHEROID["WGS 84",6378137,298.257223563],TOWGS84[0,0,0,0,0,0,0]],PRIMEM["Greenwich",0],UNIT["degree",0.0174532925199433]]':
-        gdaltest.post_reason('fail')
         print(wkt)
         return 'fail'
     coordsys = get_coordsys_from_srs(srs)
     if coordsys != 'CoordSys Earth Projection 1, 104':
-        gdaltest.post_reason('fail')
         print(coordsys)
         return 'fail'
 
@@ -1828,18 +1759,15 @@ def test_ogr_mitab_35():
     srs.ImportFromEPSG(32631)
     coordsys = get_coordsys_from_srs(srs)
     if coordsys != 'CoordSys Earth Projection 8, 104, "m", 3, 0, 0.9996, 500000, 0':
-        gdaltest.post_reason('fail')
         print(coordsys)
         return 'fail'
     srs = get_srs_from_coordsys(coordsys)
     wkt = srs.ExportToWkt()
     if wkt != 'PROJCS["unnamed",GEOGCS["unnamed",DATUM["WGS_1984",SPHEROID["WGS 84",6378137,298.257223563],TOWGS84[0,0,0,0,0,0,0]],PRIMEM["Greenwich",0],UNIT["degree",0.0174532925199433]],PROJECTION["Transverse_Mercator"],PARAMETER["latitude_of_origin",0],PARAMETER["central_meridian",3],PARAMETER["scale_factor",0.9996],PARAMETER["false_easting",500000],PARAMETER["false_northing",0],UNIT["Meter",1.0]]':
-        gdaltest.post_reason('fail')
         print(wkt)
         return 'fail'
     coordsys = get_coordsys_from_srs(srs)
     if coordsys != 'CoordSys Earth Projection 8, 104, "m", 3, 0, 0.9996, 500000, 0':
-        gdaltest.post_reason('fail')
         print(coordsys)
         return 'fail'
 
@@ -1884,7 +1812,6 @@ def test_ogr_mitab_35():
         # if got_coordsys.find(' Bounds') >= 0:
         #    got_coordsys = got_coordsys[0:got_coordsys.find(' Bounds')]
         if coordsys != got_coordsys:
-            gdaltest.post_reason('fail')
             print(coordsys)
             print(srs)
             print(got_coordsys)
@@ -1895,18 +1822,15 @@ def test_ogr_mitab_35():
     srs.ImportFromEPSG(4322)
     coordsys = get_coordsys_from_srs(srs)
     if coordsys != 'CoordSys Earth Projection 1, 103':
-        gdaltest.post_reason('fail')
         print(coordsys)
         return 'fail'
     srs = get_srs_from_coordsys(coordsys)
     wkt = srs.ExportToWkt()
     if wkt != 'GEOGCS["unnamed",DATUM["WGS_1972",SPHEROID["WGS 72",6378135,298.26],TOWGS84[0,8,10,0,0,0,0]],PRIMEM["Greenwich",0],UNIT["degree",0.0174532925199433]]':
-        gdaltest.post_reason('fail')
         print(wkt)
         return 'fail'
     coordsys = get_coordsys_from_srs(srs)
     if coordsys != 'CoordSys Earth Projection 1, 103':
-        gdaltest.post_reason('fail')
         print(coordsys)
         return 'fail'
 
@@ -1915,32 +1839,27 @@ def test_ogr_mitab_35():
     srs.ImportFromEPSG(2154)
     coordsys = get_coordsys_from_srs(srs)
     if coordsys != 'CoordSys Earth Projection 3, 33, "m", 3, 46.5, 44, 49, 700000, 6600000':
-        gdaltest.post_reason('fail')
         print(coordsys)
         return 'fail'
     srs = get_srs_from_coordsys(coordsys)
     wkt = srs.ExportToWkt()
     if wkt != 'PROJCS["RGF93 / Lambert-93",GEOGCS["RGF93",DATUM["Reseau_Geodesique_Francais_1993",SPHEROID["GRS 80",6378137,298.257222101],TOWGS84[0,0,0,0,0,0,0]],PRIMEM["Greenwich",0],UNIT["degree",0.0174532925199433]],PROJECTION["Lambert_Conformal_Conic_2SP"],PARAMETER["standard_parallel_1",49],PARAMETER["standard_parallel_2",44],PARAMETER["latitude_of_origin",46.5],PARAMETER["central_meridian",3],PARAMETER["false_easting",700000],PARAMETER["false_northing",6600000],UNIT["Meter",1.0],AUTHORITY["EPSG","2154"]]':
-        gdaltest.post_reason('fail')
         print(wkt)
         return 'fail'
     coordsys = get_coordsys_from_srs(srs)
     if coordsys != 'CoordSys Earth Projection 3, 33, "m", 3, 46.5, 44, 49, 700000, 6600000':
-        gdaltest.post_reason('fail')
         print(coordsys)
         return 'fail'
 
     srs = osr.SpatialReference('PROJCS["RGF93 / Lambert-93",GEOGCS["RGF93",DATUM["Reseau_Geodesique_Francais_1993",SPHEROID["GRS 80",6378137,298.257222101],TOWGS84[0,0,0,0,0,0,0]],PRIMEM["Greenwich",0],UNIT["degree",0.0174532925199433]],PROJECTION["Lambert_Conformal_Conic_2SP"],PARAMETER["standard_parallel_1",49.00000000002],PARAMETER["standard_parallel_2",44],PARAMETER["latitude_of_origin",46.5],PARAMETER["central_meridian",3],PARAMETER["false_easting",700000],PARAMETER["false_northing",6600000],UNIT["Meter",1.0],AUTHORITY["EPSG","2154"]]')
     coordsys = get_coordsys_from_srs(srs)
     if coordsys != 'CoordSys Earth Projection 3, 33, "m", 3, 46.5, 44, 49.00000000002, 700000, 6600000':
-        gdaltest.post_reason('fail')
         print(coordsys)
         return 'fail'
     gdal.SetConfigOption('MITAB_BOUNDS_FILE', 'data/mitab_bounds.txt')
     coordsys = get_coordsys_from_srs(srs)
     gdal.SetConfigOption('MITAB_BOUNDS_FILE', None)
     if coordsys != 'CoordSys Earth Projection 3, 33, "m", 3, 46.5, 44, 49.00000000002, 700000, 6600000 Bounds (75000, 6000000) (1275000, 7200000)':
-        gdaltest.post_reason('fail')
         print(coordsys)
         return 'fail'
 
@@ -1948,7 +1867,6 @@ def test_ogr_mitab_35():
     srs = get_srs_from_coordsys('CoordSys Earth Projection 10, 157, "m", 0')
     wkt = srs.ExportToWkt()
     if wkt != 'PROJCS["WGS 84 / Pseudo-Mercator",GEOGCS["unnamed",DATUM["WGS_1984",SPHEROID["WGS 84 (MAPINFO Datum 157)",6378137.01,298.257223563],TOWGS84[0,0,0,0,0,0,0]],PRIMEM["Greenwich",0],UNIT["degree",0.0174532925199433]],PROJECTION["Mercator_1SP"],PARAMETER["central_meridian",0],PARAMETER["scale_factor",1],PARAMETER["false_easting",0],PARAMETER["false_northing",0],UNIT["Meter",1.0],EXTENSION["PROJ4","+proj=merc +a=6378137 +b=6378137 +lat_ts=0.0 +lon_0=0.0 +x_0=0.0 +y_0=0 +k=1.0 +units=m +nadgrids=@null +wktext  +no_defs"]]':
-        gdaltest.post_reason('fail')
         print(wkt)
         return 'fail'
     # We don't round-trip currently
@@ -1960,13 +1878,11 @@ def test_ogr_mitab_35():
         UNIT["degree",0.0174532925199433]]""")
     coordsys = get_coordsys_from_srs(srs)
     if coordsys != 'CoordSys Earth Projection 1, 999, 1, 1, 2, 3':
-        gdaltest.post_reason('fail')
         print(coordsys)
         return 'fail'
     srs = get_srs_from_coordsys(coordsys)
     wkt = srs.ExportToWkt()
     if wkt != 'GEOGCS["unnamed",DATUM["MIF 999,1,1,2,3",SPHEROID["WGS 72",6378135,298.26],TOWGS84[1,2,3,0,0,0,0]],PRIMEM["Greenwich",0],UNIT["degree",0.0174532925199433]]':
-        gdaltest.post_reason('fail')
         print(wkt)
         return 'fail'
 
@@ -1977,13 +1893,11 @@ def test_ogr_mitab_35():
         UNIT["degree",0.0174532925199433]]""")
     coordsys = get_coordsys_from_srs(srs)
     if coordsys != 'CoordSys Earth Projection 1, 9999, 1, 1, 2, 3, 4, 5, 6, 7, 3':
-        gdaltest.post_reason('fail')
         print(coordsys)
         return 'fail'
     srs = get_srs_from_coordsys(coordsys)
     wkt = srs.ExportToWkt()
     if wkt != 'GEOGCS["unnamed",DATUM["MIF 9999,1,1,2,3,4,5,6,7,3",SPHEROID["WGS 72",6378135,298.26],TOWGS84[1,2,3,-4,-5,-6,7]],PRIMEM["non-Greenwich",3],UNIT["degree",0.0174532925199433]]':
-        gdaltest.post_reason('fail')
         print(wkt)
         return 'fail'
 
@@ -2019,7 +1933,6 @@ def test_ogr_mitab_36():
     f = lyr.GetNextFeature()
     got_g = f.GetGeometryRef()
     if ogrtest.check_feature_geometry(f, got_g, max_error=0.1):
-        gdaltest.post_reason('fail')
         f.DumpReadable()
         print(g)
         return 'fail'
@@ -2042,47 +1955,38 @@ def test_ogr_mitab_37():
     ds = ogr.Open('data/seamless.tab')
     lyr = ds.GetLayer(0)
     if lyr.GetFeatureCount() != 4:
-        gdaltest.post_reason('fail')
         return 'fail'
 
     f = lyr.GetNextFeature()
     if f.GetFID() != 4294967297 or f.id != '1':
-        gdaltest.post_reason('fail')
         return 'fail'
 
     f = lyr.GetNextFeature()
     if f.GetFID() != 4294967298 or f.id != '2':
-        gdaltest.post_reason('fail')
         return 'fail'
 
     f = lyr.GetNextFeature()
     if f.GetFID() != 8589934593 or f.id != '3':
-        gdaltest.post_reason('fail')
         return 'fail'
 
     f = lyr.GetNextFeature()
     if f.GetFID() != 8589934594 or f.id != '4':
-        gdaltest.post_reason('fail')
         return 'fail'
 
     f = lyr.GetFeature(4294967297)
     if f.GetFID() != 4294967297 or f.id != '1':
-        gdaltest.post_reason('fail')
         return 'fail'
 
     f = lyr.GetFeature(8589934594)
     if f.GetFID() != 8589934594 or f.id != '4':
-        gdaltest.post_reason('fail')
         return 'fail'
 
     f = lyr.GetFeature(8589934594 + 1)
     if f is not None:
-        gdaltest.post_reason('fail')
         return 'fail'
 
     f = lyr.GetFeature(4294967297 * 2 + 1)
     if f is not None:
-        gdaltest.post_reason('fail')
         return 'fail'
 
     return 'success'
@@ -2097,7 +2001,6 @@ def test_ogr_mitab_38():
     lyr = ds.GetLayer(0)
     f = lyr.GetNextFeature()
     if f['field1'] != '' or f['field2'] != 'foo':
-        gdaltest.post_reason('fail')
         f.DumpReadable()
         return 'fail'
 
@@ -2119,12 +2022,10 @@ def test_ogr_mitab_39():
         f_ref = lyr_ref.GetNextFeature()
         if f is None:
             if f_ref is not None:
-                gdaltest.post_reason('fail')
                 return 'fail'
             break
         if ogrtest.check_feature_geometry(f, f_ref.GetGeometryRef()) != 0 or \
            f.GetStyleString() != f_ref.GetStyleString():
-            gdaltest.post_reason('fail')
             f.DumpReadable()
             f_ref.DumpReadable()
             return 'fail'
@@ -2168,12 +2069,10 @@ def test_ogr_mitab_41():
         f_ref = lyr_ref.GetNextFeature()
         if f is None:
             if f_ref is not None:
-                gdaltest.post_reason('fail')
                 return 'fail'
             break
         if ogrtest.check_feature_geometry(f, f_ref.GetGeometryRef()) != 0 or \
            f.GetStyleString() != f_ref.GetStyleString():
-            gdaltest.post_reason('fail')
             f.DumpReadable()
             f_ref.DumpReadable()
             return 'fail'
@@ -2196,12 +2095,10 @@ def test_ogr_mitab_42():
         f_ref = lyr_ref.GetNextFeature()
         if f is None:
             if f_ref is not None:
-                gdaltest.post_reason('fail')
                 return 'fail'
             break
         if ogrtest.check_feature_geometry(f, f_ref.GetGeometryRef()) != 0 or \
            f.GetStyleString() != f_ref.GetStyleString():
-            gdaltest.post_reason('fail')
             f.DumpReadable()
             f_ref.DumpReadable()
             return 'fail'
@@ -2220,20 +2117,17 @@ def test_ogr_mitab_43():
     with gdaltest.error_handler():
         out_ds = gdal.VectorTranslate('/vsimem/all_geoms_block_invalid.tab', src_ds, format='MapInfo File', datasetCreationOptions=['BLOCKSIZE=32768'])
     if out_ds is not None:
-        gdaltest.post_reason('fail')
         return 'fail'
     gdal.Unlink('/vsimem/all_geoms_block_invalid.dat')
     src_ds = None
 
     size = gdal.VSIStatL('/vsimem/all_geoms_block_512.map').size
     if size != 6144:
-        gdaltest.post_reason('fail')
         print(size)
         return 'fail'
 
     size = gdal.VSIStatL('/vsimem/all_geoms_block_32256.map').size
     if size != 161280:
-        gdaltest.post_reason('fail')
         print(size)
         return 'fail'
 
@@ -2247,12 +2141,10 @@ def test_ogr_mitab_43():
         f_ref = lyr_ref.GetNextFeature()
         if f is None:
             if f_ref is not None:
-                gdaltest.post_reason('fail')
                 return 'fail'
             break
         if ogrtest.check_feature_geometry(f, f_ref.GetGeometryRef()) != 0 or \
            f.GetStyleString() != f_ref.GetStyleString():
-            gdaltest.post_reason('fail')
             f.DumpReadable()
             f_ref.DumpReadable()
             return 'fail'
@@ -2281,7 +2173,6 @@ def test_ogr_mitab_44():
     lyr = ds.GetLayer(0)
     fld_defn = lyr.GetLayerDefn().GetFieldDefn(0)
     if fld_defn.GetWidth() != 20 or fld_defn.GetPrecision() != 16:
-        gdaltest.post_reason('fail')
         print(fld_defn.GetWidth())
         print(fld_defn.GetPrecision())
         return 'fail'
@@ -2552,15 +2443,12 @@ def test_ogr_mitab_49_aspatial():
 
     geom_type = lyr.GetLayerDefn().GetGeomType()
     if geom_type != ogr.wkbNone:
-        gdaltest.post_reason('fail')
         return 'fail'
 
     if lyr.GetSpatialRef() is not None:
-        gdaltest.post_reason('fail')
         return 'fail'
 
     if lyr.GetExtent(can_return_null=True) is not None:
-        gdaltest.post_reason('fail')
         return 'fail'
 
     return 'success'
@@ -2668,17 +2556,14 @@ def test_ogr_mitab_style():
     lyr = ds.GetLayer(0)
     f = lyr.GetNextFeature()
     if f.GetStyleString() != 'BRUSH(fc:#aabbcc,bc:#ddeeff,id:"mapinfo-brush-2,ogr-brush-0");PEN(w:1px,c:#ddeeff,id:"mapinfo-pen-2,ogr-pen-0")':
-        gdaltest.post_reason('fail')
         f.DumpReadable()
         return 'fail'
     f = lyr.GetNextFeature()
     if f.GetStyleString() != 'BRUSH(fc:#aabbcc,id:"mapinfo-brush-1,ogr-brush-1");PEN(w:1px,c:#000000,id:"mapinfo-pen-2,ogr-pen-0")':
-        gdaltest.post_reason('fail')
         f.DumpReadable()
         return 'fail'
     f = lyr.GetNextFeature()
     if f.GetStyleString() != 'BRUSH(fc:#aabbcc,id:"mapinfo-brush-1,ogr-brush-1");PEN(w:1px,c:#000000,id:"mapinfo-pen-2,ogr-pen-0")':
-        gdaltest.post_reason('fail')
         f.DumpReadable()
         return 'fail'
     ds = None
diff --git a/autotest/ogr/ogr_mongodb.py b/autotest/ogr/ogr_mongodb.py
index cdde25b5f286..9543f5c0022d 100755
--- a/autotest/ogr/ogr_mongodb.py
+++ b/autotest/ogr/ogr_mongodb.py
@@ -128,7 +128,6 @@ def test_ogr_mongodb_1():
     ds = ogr.Open("mongodb://")
     gdal.PopErrorHandler()
     if ds is not None:
-        gdaltest.post_reason('fail')
         return 'fail'
 
     # URI to non existent host.
@@ -136,7 +135,6 @@ def test_ogr_mongodb_1():
     ds = ogr.Open("mongodb://non_existing")
     gdal.PopErrorHandler()
     if ds is not None:
-        gdaltest.post_reason('fail')
         return 'fail'
 
     # Connect to non existent host.
@@ -144,7 +142,6 @@ def test_ogr_mongodb_1():
     ds = gdal.OpenEx('mongodb:', open_options=['HOST=non_existing'])
     gdal.PopErrorHandler()
     if ds is not None:
-        gdaltest.post_reason('fail')
         return 'fail'
 
     # All arguments split up
@@ -157,7 +154,6 @@ def test_ogr_mongodb_1():
         open_options += ['PASSWORD=' + ogrtest.mongodb_test_password]
     ds = gdal.OpenEx('mongodb:', open_options=open_options)
     if ds is None:
-        gdaltest.post_reason('fail')
         return 'fail'
 
     # Without DBNAME
@@ -184,7 +180,6 @@ def test_ogr_mongodb_1():
         ds = gdal.OpenEx('mongodb:', open_options=open_options)
         gdal.PopErrorHandler()
         if ds is not None:
-            gdaltest.post_reason('fail')
             return 'fail'
 
         open_options = []
@@ -197,7 +192,6 @@ def test_ogr_mongodb_1():
         ds = gdal.OpenEx('mongodb:', open_options=open_options)
         gdal.PopErrorHandler()
         if ds is not None:
-            gdaltest.post_reason('fail')
             return 'fail'
 
         open_options = []
@@ -210,7 +204,6 @@ def test_ogr_mongodb_1():
         ds = gdal.OpenEx('mongodb:', open_options=open_options)
         gdal.PopErrorHandler()
         if ds is not None:
-            gdaltest.post_reason('fail')
             return 'fail'
 
         open_options = []
@@ -224,7 +217,6 @@ def test_ogr_mongodb_1():
         ds = gdal.OpenEx('mongodb:', open_options=open_options)
         gdal.PopErrorHandler()
         if ds is not None:
-            gdaltest.post_reason('fail')
             return 'fail'
 
     # Test AUTH_JSON: invalid JSon
@@ -237,7 +229,6 @@ def test_ogr_mongodb_1():
     ds = gdal.OpenEx('mongodb:', open_options=open_options)
     gdal.PopErrorHandler()
     if ds is not None:
-        gdaltest.post_reason('fail')
         return 'fail'
 
     # Test AUTH_JSON: missing mechanism
@@ -250,7 +241,6 @@ def test_ogr_mongodb_1():
     ds = gdal.OpenEx('mongodb:', open_options=open_options)
     gdal.PopErrorHandler()
     if ds is not None:
-        gdaltest.post_reason('fail')
         return 'fail'
 
     # Successful AUTH_JSON use
@@ -263,7 +253,6 @@ def test_ogr_mongodb_1():
                          (ogrtest.mongodb_test_dbname, ogrtest.mongodb_test_user, ogrtest.mongodb_test_password)]
         ds = gdal.OpenEx('mongodb:', open_options=open_options)
         if ds is None:
-            gdaltest.post_reason('fail')
             return 'fail'
 
     return 'success'
@@ -278,19 +267,15 @@ def test_ogr_mongodb_2():
 
     ogrtest.mongodb_ds = ogr.Open(ogrtest.mongodb_test_uri, update=1)
     if ogrtest.mongodb_ds.GetLayerByName('not_existing') is not None:
-        gdaltest.post_reason('fail')
         return 'fail'
 
     if ogrtest.mongodb_ds.TestCapability(ogr.ODsCCreateLayer) != 1:
-        gdaltest.post_reason('fail')
         return 'fail'
 
     if ogrtest.mongodb_ds.TestCapability(ogr.ODsCDeleteLayer) != 1:
-        gdaltest.post_reason('fail')
         return 'fail'
 
     if ogrtest.mongodb_ds.TestCapability(ogr.ODsCCreateGeomFieldAfterCreateLayer) != 1:
-        gdaltest.post_reason('fail')
         return 'fail'
 
     # Create layer
@@ -304,19 +289,16 @@ def test_ogr_mongodb_2():
     ret = lyr.CreateGeomField(ogr.GeomFieldDefn('location.mygeom', ogr.wkbPoint))
     gdal.PopErrorHandler()
     if ret == 0:
-        gdaltest.post_reason('fail')
         return 'fail'
 
     ret = lyr.CreateField(ogr.FieldDefn('str', ogr.OFTString))
     if ret != 0:
-        gdaltest.post_reason('fail')
         return 'fail'
 
     gdal.PushErrorHandler()
     ret = lyr.CreateField(ogr.FieldDefn('str', ogr.OFTString))
     gdal.PopErrorHandler()
     if ret == 0:
-        gdaltest.post_reason('fail')
         return 'fail'
 
     lyr.CreateField(ogr.FieldDefn('location.name', ogr.OFTString))
@@ -358,47 +340,39 @@ def test_ogr_mongodb_2():
     f.SetFieldNull('str_is_null')
     f.SetGeometryDirectly(ogr.CreateGeometryFromWkt('POLYGON((2 49,2 50,3 50,3 49,2 49))'))
     if lyr.CreateFeature(f) != 0:
-        gdaltest.post_reason('fail')
         return 'fail'
     if f['_id'] is None:
-        gdaltest.post_reason('fail')
         return 'fail'
     f_ref = f.Clone()
 
     # Test GetFeatureCount()
     if lyr.GetFeatureCount() != 1:
-        gdaltest.post_reason('fail')
         return 'fail'
 
     # Test GetNextFeature()
     lyr.ResetReading()
     f = lyr.GetNextFeature()
     if not f.Equal(f_ref):
-        gdaltest.post_reason('fail')
         f.DumpReadable()
         return 'fail'
     f = lyr.GetNextFeature()
     if f is not None:
-        gdaltest.post_reason('fail')
         f.DumpReadable()
         return 'fail'
 
     # Test GetFeature()
     f = lyr.GetFeature(1)
     if not f.Equal(f_ref):
-        gdaltest.post_reason('fail')
         f.DumpReadable()
         return 'fail'
 
     # Test SetFeature()
     f['bool'] = 0
     if lyr.SetFeature(f) != 0:
-        gdaltest.post_reason('fail')
         return 'fail'
     f_ref = f.Clone()
     f = lyr.GetFeature(1)
     if f['bool'] != 0:
-        gdaltest.post_reason('fail')
         f.DumpReadable()
         return 'fail'
 
@@ -407,7 +381,6 @@ def test_ogr_mongodb_2():
     ret = lyr.DeleteFeature(1)
     gdal.PopErrorHandler()
     if ret == 0:
-        gdaltest.post_reason('fail')
         return 'fail'
 
     # Test Mongo filter
@@ -415,7 +388,6 @@ def test_ogr_mongodb_2():
     lyr.ResetReading()
     f = lyr.GetNextFeature()
     if not f.Equal(f_ref):
-        gdaltest.post_reason('fail')
         f.DumpReadable()
         return 'fail'
 
@@ -423,7 +395,6 @@ def test_ogr_mongodb_2():
     lyr.ResetReading()
     f = lyr.GetNextFeature()
     if f is not None:
-        gdaltest.post_reason('fail')
         f.DumpReadable()
         return 'fail'
 
@@ -432,7 +403,6 @@ def test_ogr_mongodb_2():
     lyr.ResetReading()
     f = lyr.GetNextFeature()
     if not f.Equal(f_ref):
-        gdaltest.post_reason('fail')
         f.DumpReadable()
         return 'fail'
 
@@ -440,7 +410,6 @@ def test_ogr_mongodb_2():
     lyr.ResetReading()
     f = lyr.GetNextFeature()
     if f is not None:
-        gdaltest.post_reason('fail')
         f.DumpReadable()
         return 'fail'
 
@@ -450,7 +419,6 @@ def test_ogr_mongodb_2():
     lyr.ResetReading()
     f = lyr.GetNextFeature()
     if not f.Equal(f_ref):
-        gdaltest.post_reason('fail')
         f.DumpReadable()
         return 'fail'
 
@@ -458,7 +426,6 @@ def test_ogr_mongodb_2():
     lyr.ResetReading()
     f = lyr.GetNextFeature()
     if f is not None:
-        gdaltest.post_reason('fail')
         f.DumpReadable()
         return 'fail'
 
@@ -466,7 +433,6 @@ def test_ogr_mongodb_2():
     f.SetFID(-1)
     f.SetGeometryDirectly(None)
     if lyr.CreateFeature(f) != 0:
-        gdaltest.post_reason('fail')
         return 'fail'
 
     # Duplicate key
@@ -474,14 +440,12 @@ def test_ogr_mongodb_2():
     ret = lyr.SyncToDisk()
     gdal.PopErrorHandler()
     if ret == 0:
-        gdaltest.post_reason('fail')
         return 'fail'
 
     f['_id'] = None
     lyr.CreateFeature(f)
     ret = lyr.SyncToDisk()
     if ret != 0:
-        gdaltest.post_reason('fail')
         return 'fail'
 
     # Missing _id
@@ -490,7 +454,6 @@ def test_ogr_mongodb_2():
     ret = lyr.SetFeature(f)
     gdal.PopErrorHandler()
     if ret == 0:
-        gdaltest.post_reason('fail')
         return 'fail'
 
     # MongoDB dialect of ExecuteSQL() with invalid JSON
@@ -501,7 +464,6 @@ def test_ogr_mongodb_2():
     # MongoDB dialect of ExecuteSQL() with nonexistent command.
     sql_lyr = ogrtest.mongodb_ds.ExecuteSQL('{ "foo": 1 }', dialect='MongoDB')
     if sql_lyr is None:
-        gdaltest.post_reason('fail')
         return 'fail'
     ogrtest.mongodb_ds.ReleaseResultSet(sql_lyr)
 
@@ -509,15 +471,12 @@ def test_ogr_mongodb_2():
     sql_lyr = ogrtest.mongodb_ds.ExecuteSQL('{ "listCommands" : 1 }',
                                             dialect='MongoDB')
     if sql_lyr is None:
-        gdaltest.post_reason('fail')
         return 'fail'
     f = sql_lyr.GetNextFeature()
     if f is None:
-        gdaltest.post_reason('fail')
         return 'fail'
     f = sql_lyr.GetNextFeature()
     if f is not None:
-        gdaltest.post_reason('fail')
         return 'fail'
     sql_lyr.GetLayerDefn()
     sql_lyr.ResetReading()
@@ -527,7 +486,6 @@ def test_ogr_mongodb_2():
     # Regular ExecuteSQL()
     sql_lyr = ogrtest.mongodb_ds.ExecuteSQL('SELECT * FROM ' + ogrtest.mongodb_layer_name)
     if sql_lyr is None:
-        gdaltest.post_reason('fail')
         return 'fail'
     ogrtest.mongodb_ds.ReleaseResultSet(sql_lyr)
 
@@ -544,7 +502,6 @@ def test_ogr_mongodb_2():
     # Check after reopening
     lyr = ogrtest.mongodb_ds.GetLayerByName(ogrtest.mongodb_layer_name)
     if lyr.TestCapability(ogr.OLCFastSpatialFilter) == 0:
-        gdaltest.post_reason('fail')
         return 'fail'
     f = lyr.GetNextFeature()
     json_field = f['_json']
@@ -553,7 +510,6 @@ def test_ogr_mongodb_2():
         if f.GetField(i) != f_ref.GetField(i) or \
            f.GetFieldDefnRef(i).GetType() != f_ref.GetFieldDefnRef(i).GetType() or \
            f.GetFieldDefnRef(i).GetSubType() != f_ref.GetFieldDefnRef(i).GetSubType():
-            gdaltest.post_reason('fail')
             f.DumpReadable()
             f_ref.DumpReadable()
             return 'fail'
@@ -561,7 +517,6 @@ def test_ogr_mongodb_2():
         if not f.GetGeomFieldRef(i).Equals(f_ref.GetGeomFieldRef(i)) or \
                 f.GetGeomFieldDefnRef(i).GetName() != f_ref.GetGeomFieldDefnRef(i).GetName() or \
                 f.GetGeomFieldDefnRef(i).GetType() != f_ref.GetGeomFieldDefnRef(i).GetType():
-            gdaltest.post_reason('fail')
             f.DumpReadable()
             f_ref.DumpReadable()
             return 'fail'
@@ -569,7 +524,6 @@ def test_ogr_mongodb_2():
     lyr.SetSpatialFilterRect(2.1, 49.1, 2.9, 49.9)
     lyr.ResetReading()
     if f is None:
-        gdaltest.post_reason('fail')
         f.DumpReadable()
         return 'fail'
 
@@ -579,7 +533,6 @@ def test_ogr_mongodb_2():
     f = ogr.Feature(lyr.GetLayerDefn())
     f['_json'] = json_field
     if lyr.CreateFeature(f) != 0:
-        gdaltest.post_reason('fail')
         return 'fail'
 
     ogrtest.mongodb_layer_name_guess_types = ogrtest.mongodb_layer_name + "_guess_types"
@@ -620,7 +573,6 @@ def test_ogr_mongodb_2():
     f['_json'] += '"mixedlist2": [true,1,{ "$numberLong" : "1234567890123456" },3.45,"str"]'
     f['_json'] += '}'
     if lyr.CreateFeature(f) != 0:
-        gdaltest.post_reason('fail')
         return 'fail'
 
     f = ogr.Feature(lyr.GetLayerDefn())
@@ -651,7 +603,6 @@ def test_ogr_mongodb_2():
     f['_json'] += '"boollist_intlist" : [2]'
     f['_json'] += '}'
     if lyr.CreateFeature(f) != 0:
-        gdaltest.post_reason('fail')
         return 'fail'
 
     # This new features will not be taken into account by below the FEATURE_COUNT_TO_ESTABLISH_FEATURE_DEFN=2
@@ -665,7 +616,6 @@ def test_ogr_mongodb_2():
     f['_json'] += '"reallist" : [1, { "$numberLong" : "1234567890123456" }, 1.0, "1", { "$minKey": 1 },{ "$maxKey": 1 }, { "$numberLong" : "1234567890123456" } ] '
     f['_json'] += '}'
     if lyr.CreateFeature(f) != 0:
-        gdaltest.post_reason('fail')
         return 'fail'
 
     f = ogr.Feature(lyr.GetLayerDefn())
@@ -675,7 +625,6 @@ def test_ogr_mongodb_2():
     f['_json'] += '"real": { "$maxKey": 1 } '
     f['_json'] += '}'
     if lyr.CreateFeature(f) != 0:
-        gdaltest.post_reason('fail')
         return 'fail'
 
     ogrtest.mongodb_layer_name_with_2d_index = ogrtest.mongodb_layer_name + "_with_2d_index"
@@ -685,7 +634,6 @@ def test_ogr_mongodb_2():
     f = ogr.Feature(lyr.GetLayerDefn())
     f.SetGeometryDirectly(ogr.CreateGeometryFromWkt('POINT(2 49)'))
     if lyr.CreateFeature(f) != 0:
-        gdaltest.post_reason('fail')
         return 'fail'
 
     ogrtest.mongodb_layer_name_no_spatial_index = ogrtest.mongodb_layer_name + "_no_spatial_index"
@@ -694,28 +642,23 @@ def test_ogr_mongodb_2():
         f = ogr.Feature(lyr.GetLayerDefn())
         f.SetGeometryDirectly(ogr.CreateGeometryFromWkt('POINT(2 49)'))
         if lyr.CreateFeature(f) != 0:
-            gdaltest.post_reason('fail')
             return 'fail'
         ogrtest.mongodb_ds.ExecuteSQL('WRITE_OGR_METADATA ' + ogrtest.mongodb_layer_name_no_spatial_index)
 
     # Open "ghost" layer
     lyr = ogrtest.mongodb_ds.GetLayerByName('_ogr_metadata')
     if lyr is None:
-        gdaltest.post_reason('fail')
         return 'fail'
     lyr.SetAttributeFilter("layer LIKE '%s%%'" % ogrtest.mongodb_layer_name)
     if lyr.GetFeatureCount() != 2:
         print(lyr.GetFeatureCount())
-        gdaltest.post_reason('fail')
         return 'fail'
 
     if ogrtest.mongodb_ds.DeleteLayer(-1) == 0:
-        gdaltest.post_reason('fail')
         return 'fail'
 
     lyr = ogrtest.mongodb_ds.GetLayerByName(ogrtest.mongodb_test_dbname + '.' + '_ogr_metadata')
     if lyr is None:
-        gdaltest.post_reason('fail')
         return 'fail'
 
     ogrtest.mongodb_ds = None
@@ -725,7 +668,6 @@ def test_ogr_mongodb_2():
 
     lyr = ogrtest.mongodb_ds.GetLayerByName(ogrtest.mongodb_layer_name_no_ogr_metadata)
     if lyr.TestCapability(ogr.OLCFastSpatialFilter) != 0:
-        gdaltest.post_reason('fail')
         return 'fail'
     f = lyr.GetNextFeature()
     for i in range(f_ref.GetDefnRef().GetFieldCount()):
@@ -738,7 +680,6 @@ def test_ogr_mongodb_2():
         if f.GetField(j) != f_ref.GetField(i) or \
             f.GetFieldDefnRef(j).GetType() != f_ref.GetFieldDefnRef(i).GetType() or \
                 f.GetFieldDefnRef(j).GetSubType() != f_ref.GetFieldDefnRef(i).GetSubType():
-            gdaltest.post_reason('fail')
             f.DumpReadable()
             f_ref.DumpReadable()
             return 'fail'
@@ -748,7 +689,6 @@ def test_ogr_mongodb_2():
         if not f.GetGeomFieldRef(j).Equals(f_ref.GetGeomFieldRef(i)) or \
                 f.GetGeomFieldDefnRef(j).GetName() != f_ref.GetGeomFieldDefnRef(i).GetName() or \
                 f.GetGeomFieldDefnRef(j).GetType() != f_ref.GetGeomFieldDefnRef(i).GetType():
-            gdaltest.post_reason('fail')
             f.DumpReadable()
             f_ref.DumpReadable()
             print(f.GetGeomFieldDefnRef(j).GetType())
@@ -758,7 +698,6 @@ def test_ogr_mongodb_2():
     lyr.SetSpatialFilterRect(2.1, 49.1, 2.9, 49.9)
     lyr.ResetReading()
     if f is None:
-        gdaltest.post_reason('fail')
         f.DumpReadable()
         return 'fail'
 
@@ -800,12 +739,10 @@ def test_ogr_mongodb_2():
     for (fieldname, fieldtype) in expected_fields:
         fld_defn = lyr.GetLayerDefn().GetFieldDefn(lyr.GetLayerDefn().GetFieldIndex(fieldname))
         if fld_defn.GetType() != fieldtype:
-            gdaltest.post_reason('fail')
             print(fieldname)
             print(fld_defn.GetType())
             return 'fail'
         if fld_defn.GetSubType() != ogr.OFSTNone:
-            gdaltest.post_reason('fail')
             return 'fail'
 
     f = lyr.GetNextFeature()
@@ -814,49 +751,41 @@ def test_ogr_mongodb_2():
     if f['intlist'] != [1, 1, -2147483648, 2147483647, -2147483648, 2147483647, -2147483648, 2147483647, 1, 1] or \
        f['int64list'] != [1, 1234567890123456, 1, -9223372036854775808, 9223372036854775807, -9223372036854775808, 9223372036854775807, 1] or \
        f['int'] != -2147483648 or f['int64'] != -9223372036854775808 or f['real'] - 1 != f['real']:
-        gdaltest.post_reason('fail')
         f.DumpReadable()
         return 'fail'
     f = lyr.GetNextFeature()
     if f['int'] != 2147483647 or f['int64'] != 9223372036854775807 or f['real'] + 1 != f['real']:
-        gdaltest.post_reason('fail')
         f.DumpReadable()
         return 'fail'
 
     lyr = ogrtest.mongodb_ds.GetLayerByName(ogrtest.mongodb_layer_name_with_2d_index)
     if lyr.TestCapability(ogr.OLCFastSpatialFilter) == 0:
-        gdaltest.post_reason('fail')
         return 'fail'
     lyr.SetSpatialFilterRect(1.9, 48.9, 2.1, 49.1)
     lyr.ResetReading()
     f = lyr.GetNextFeature()
     if f is None:
-        gdaltest.post_reason('fail')
         return 'fail'
     lyr.SetSpatialFilterRect(1.9, 48.9, 1.95, 48.95)
     lyr.ResetReading()
     f = lyr.GetNextFeature()
     if f is not None:
-        gdaltest.post_reason('fail')
         return 'fail'
 
     lyr = ogrtest.mongodb_ds.GetLayerByName(ogrtest.mongodb_layer_name_no_spatial_index)
     if lyr.TestCapability(ogr.OLCFastSpatialFilter) != 0:
-        gdaltest.post_reason('fail')
         print(lyr.TestCapability(ogr.OLCFastSpatialFilter))
         return 'fail'
     lyr.SetSpatialFilterRect(1.9, 48.9, 2.1, 49.1)
     lyr.ResetReading()
     f = lyr.GetNextFeature()
     if f is None:
-        gdaltest.post_reason('fail')
         return 'fail'
 
     gdal.PushErrorHandler()
     lyr = ogrtest.mongodb_ds.CreateLayer('foo')
     gdal.PopErrorHandler()
     if lyr is not None:
-        gdaltest.post_reason('fail')
         return 'fail'
 
     gdal.ErrorReset()
@@ -864,7 +793,6 @@ def test_ogr_mongodb_2():
     ogrtest.mongodb_ds.ExecuteSQL('WRITE_OGR_METADATA ' + ogrtest.mongodb_layer_name)
     gdal.PopErrorHandler()
     if gdal.GetLastErrorMsg() == '':
-        gdaltest.post_reason('fail')
         return 'fail'
 
     lyr_count_before = ogrtest.mongodb_ds.GetLayerCount()
@@ -872,7 +800,6 @@ def test_ogr_mongodb_2():
     ogrtest.mongodb_ds.ExecuteSQL('DELLAYER:' + ogrtest.mongodb_layer_name)
     gdal.PopErrorHandler()
     if ogrtest.mongodb_ds.GetLayerCount() != lyr_count_before:
-        gdaltest.post_reason('fail')
         return 'fail'
 
     lyr = ogrtest.mongodb_ds.GetLayerByName(ogrtest.mongodb_layer_name)
@@ -881,14 +808,12 @@ def test_ogr_mongodb_2():
     ret = lyr.CreateField(ogr.FieldDefn('foo', ogr.OFTString))
     gdal.PopErrorHandler()
     if ret == 0:
-        gdaltest.post_reason('fail')
         return 'fail'
 
     gdal.PushErrorHandler()
     ret = lyr.CreateGeomField(ogr.GeomFieldDefn('foo', ogr.wkbPoint))
     gdal.PopErrorHandler()
     if ret == 0:
-        gdaltest.post_reason('fail')
         return 'fail'
 
     f = ogr.Feature(lyr.GetLayerDefn())
@@ -896,21 +821,18 @@ def test_ogr_mongodb_2():
     ret = lyr.CreateFeature(f)
     gdal.PopErrorHandler()
     if ret == 0:
-        gdaltest.post_reason('fail')
         return 'fail'
 
     gdal.PushErrorHandler()
     ret = lyr.SetFeature(f)
     gdal.PopErrorHandler()
     if ret == 0:
-        gdaltest.post_reason('fail')
         return 'fail'
 
     gdal.PushErrorHandler()
     ret = lyr.DeleteFeature(1)
     gdal.PopErrorHandler()
     if ret == 0:
-        gdaltest.post_reason('fail')
         return 'fail'
 
     return 'success'
diff --git a/autotest/ogr/ogr_mssqlspatial.py b/autotest/ogr/ogr_mssqlspatial.py
index b8ec21a8a2bb..8c15fadb4c69 100755
--- a/autotest/ogr/ogr_mssqlspatial.py
+++ b/autotest/ogr/ogr_mssqlspatial.py
@@ -144,7 +144,6 @@ def test_ogr_mssqlspatial_3():
         return 'skip'
 
     if gdaltest.mssqlspatial_lyr.GetGeometryColumn() != 'ogr_geometry':
-        gdaltest.post_reason('fail')
         print(gdaltest.mssqlspatial_lyr.GetGeometryColumn())
         return 'fail'
 
@@ -179,7 +178,6 @@ def test_ogr_mssqlspatial_3():
                 gdaltest.post_reason('Attribute %d does not match' % fld)
                 return 'fail'
         if read_feat.GetField('INT64') != 1234567890123:
-            gdaltest.post_reason('failure')
             return 'fail'
 
         read_feat = None
diff --git a/autotest/ogr/ogr_mvt.py b/autotest/ogr/ogr_mvt.py
index 5fbe9046fb9d..c069c42e999a 100644
--- a/autotest/ogr/ogr_mvt.py
+++ b/autotest/ogr/ogr_mvt.py
@@ -63,7 +63,6 @@ def test_ogr_mvt_datatypes():
        f['float_value'] != 1.25 or \
        f['real_value'] != 1.23456789 or \
        f['string_value'] != 'str':
-        gdaltest.post_reason('fail')
         f.DumpReadable()
         return 'fail'
 
@@ -74,7 +73,6 @@ def test_ogr_mvt_datatypes():
 
     count = lyr.GetLayerDefn().GetFieldCount()
     if count != 16:
-        gdaltest.post_reason('fail')
         print(count)
         return 'fail'
 
@@ -102,7 +100,6 @@ def test_ogr_mvt_datatypes():
         ('string_value', ogr.OFTString, ogr.OFSTNone),
     ]
     if tab != expected_tab:
-        gdaltest.post_reason('fail')
         print(tab)
         print(expected_tab)
         return 'fail'
@@ -123,7 +120,6 @@ def test_ogr_mvt_datatypes():
        f['float_value'] != 1.25 or \
        f['real_value'] != 1.23456789 or \
        f['string_value'] != 'str':
-        gdaltest.post_reason('fail')
         f.DumpReadable()
         return 'fail'
 
@@ -145,12 +141,10 @@ def test_ogr_mvt_datatype_promotion():
         lyr = ds.GetLayerByName(layer_name)
         fld_defn = lyr.GetLayerDefn().GetFieldDefn(1)
         if fld_defn.GetType() != dt:
-            gdaltest.post_reason('fail')
             print(layer_name)
             print(fld_defn.GetType(), dt)
             return 'fail'
         if fld_defn.GetSubType() != ogr.OFSTNone:
-            gdaltest.post_reason('fail')
             print(layer_name)
             return 'fail'
 
@@ -166,47 +160,38 @@ def test_ogr_mvt_limit_cases():
 
     lyr = ds.GetLayerByName('empty')
     if lyr.GetFeatureCount() != 0:
-        gdaltest.post_reason('fail')
         return 'fail'
 
     lyr = ds.GetLayerByName('layer1')
     if lyr.GetFeatureCount() != 7:
-        gdaltest.post_reason('fail')
         return 'fail'
 
     f = lyr.GetFeature(1)
     if f['mvt_id'] != 1:
-        gdaltest.post_reason('fail')
         return 'fail'
 
     with gdaltest.error_handler():
         f = lyr.GetFeature(6)
         if f['b'] != 1:
-            gdaltest.post_reason('fail')
             return 'fail'
 
     lyr = ds.GetLayerByName('layer2')
     if lyr.GetFeatureCount() != 0:
-        gdaltest.post_reason('fail')
         return 'fail'
 
     lyr = ds.GetLayerByName('layer3')
     if lyr.GetFeatureCount() != 0:
-        gdaltest.post_reason('fail')
         return 'fail'
 
     lyr = ds.GetLayerByName('layer4')
     if lyr.GetFeatureCount() != 0:
-        gdaltest.post_reason('fail')
         return 'fail'
 
     lyr = ds.GetLayerByName('layer5')
     if lyr.GetFeatureCount() != 1:
-        gdaltest.post_reason('fail')
         return 'fail'
     f = lyr.GetNextFeature()
     if f.GetGeometryRef().ExportToWkt() != 'POINT (2070 2690)':
-        gdaltest.post_reason('fail')
         return 'fail'
 
     return 'success'
@@ -220,7 +205,6 @@ def test_ogr_mvt_with_extension_fields():
     lyr = ds.GetLayer(0)
     f = lyr.GetNextFeature()
     if ogrtest.check_feature_geometry(f, 'LINESTRING (2070 2690,2082 2707)') != 0:
-        gdaltest.post_reason('fail')
         f.DumpReadable()
         return 'fail'
 
@@ -235,12 +219,10 @@ def test_ogr_mvt_mixed():
     lyr = ds.GetLayer(0)
     f = lyr.GetNextFeature()
     if ogrtest.check_feature_geometry(f, 'MULTIPOINT ((215246.671651058 6281289.23636264),(332653.947097085 6447616.20991119))') != 0:
-        gdaltest.post_reason('fail')
         f.DumpReadable()
         return 'fail'
     f = lyr.GetNextFeature()
     if ogrtest.check_feature_geometry(f, 'LINESTRING (215246.671651058 6281289.23636264,332653.947097085 6447616.20991119)') != 0:
-        gdaltest.post_reason('fail')
         f.DumpReadable()
         return 'fail'
 
@@ -373,11 +355,9 @@ def test_ogr_mvt_tileset_tilegl():
     ds = ogr.Open('data/mvt/linestring_tilejson_gl/0')
     lyr = ds.GetLayer(0)
     if lyr.GetLayerDefn().GetFieldCount() != 2:
-        gdaltest.post_reason('fail')
         return 'fail'
     f = lyr.GetNextFeature()
     if f is None:
-        gdaltest.post_reason('fail')
         return 'fail'
 
     return 'success'
@@ -391,15 +371,12 @@ def test_ogr_mvt_tileset_without_metadata_file():
                      open_options=['METADATA_FILE=', 'CLIP=NO'])
     lyr = ds.GetLayerByName('point')
     if lyr.GetGeomType() != ogr.wkbMultiPoint:
-        gdaltest.post_reason('fail')
         return 'fail'
 
     lyr = ds.GetLayerByName('polygon2')
     if lyr.GetGeomType() != ogr.wkbMultiPolygon:
-        gdaltest.post_reason('fail')
         return 'fail'
     if lyr.GetLayerDefn().GetFieldCount() != 2:
-        gdaltest.post_reason('fail')
         return 'fail'
 
     return 'success'
@@ -413,7 +390,6 @@ def test_ogr_mvt_tileset_json_field():
                      open_options=['METADATA_FILE=', 'JSON_FIELD=YES', 'CLIP=NO'])
     lyr = ds.GetLayer(0)
     if lyr.GetLayerDefn().GetFieldCount() != 2:
-        gdaltest.post_reason('fail')
         return 'fail'
     f = lyr.GetNextFeature()
     d = json.loads(f.GetFieldAsString("json"))
@@ -434,7 +410,6 @@ def test_ogr_mvt_tileset_json_field():
             "real_value": 1.23456789,
             "string_value": "str"
     }:
-        gdaltest.post_reason('fail')
         print(f.GetFieldAsString("json"))
         return 'fail'
 
@@ -451,7 +426,6 @@ def test_ogr_mvt_open_variants():
     lyr = ds.GetLayer(0)
     f = lyr.GetNextFeature()
     if ogrtest.check_feature_geometry(f, expected_geom) != 0:
-        gdaltest.post_reason('fail')
         f.DumpReadable()
         return 'fail'
 
@@ -459,7 +433,6 @@ def test_ogr_mvt_open_variants():
     lyr = ds.GetLayer(0)
     f = lyr.GetNextFeature()
     if ogrtest.check_feature_geometry(f, expected_geom) != 0:
-        gdaltest.post_reason('fail')
         f.DumpReadable()
         return 'fail'
 
@@ -467,7 +440,6 @@ def test_ogr_mvt_open_variants():
     lyr = ds.GetLayer(0)
     f = lyr.GetNextFeature()
     if ogrtest.check_feature_geometry(f, expected_geom) != 0:
-        gdaltest.post_reason('fail')
         f.DumpReadable()
         return 'fail'
 
@@ -475,7 +447,6 @@ def test_ogr_mvt_open_variants():
     lyr = ds.GetLayer(0)
     f = lyr.GetNextFeature()
     if ogrtest.check_feature_geometry(f, expected_geom) != 0:
-        gdaltest.post_reason('fail')
         f.DumpReadable()
         return 'fail'
 
@@ -491,7 +462,6 @@ def test_ogr_mvt_xyz_options():
     lyr = ds.GetLayer(0)
     f = lyr.GetNextFeature()
     if ogrtest.check_feature_geometry(f, 'POINT (-12496536.8802869 8299226.7830913)') != 0:
-        gdaltest.post_reason('fail')
         f.DumpReadable()
         return 'fail'
 
@@ -569,7 +539,6 @@ def test_ogr_mvt_mbtiles_json_field():
                      open_options=['JSON_FIELD=YES', 'CLIP=NO'])
     lyr = ds.GetLayer(0)
     if lyr.GetLayerDefn().GetFieldCount() != 2:
-        gdaltest.post_reason('fail')
         return 'fail'
     f = lyr.GetNextFeature()
     d = json.loads(f.GetFieldAsString("json"))
@@ -582,7 +551,6 @@ def test_ogr_mvt_mbtiles_json_field():
              'bool_true': True,
              'float_value': 1.25
              }:
-        gdaltest.post_reason('fail')
         print(f.GetFieldAsString("json"))
         return 'fail'
 
@@ -600,7 +568,6 @@ def test_ogr_mvt_mbtiles_json_field_auto():
                      open_options=['CLIP=NO'])
     lyr = ds.GetLayer(0)
     if lyr.GetLayerDefn().GetFieldCount() != 2:
-        gdaltest.post_reason('fail')
         return 'fail'
     f = lyr.GetNextFeature()
     d = json.loads(f.GetFieldAsString("json"))
@@ -613,7 +580,6 @@ def test_ogr_mvt_mbtiles_json_field_auto():
              'bool_true': True,
              'float_value': 1.25
              }:
-        gdaltest.post_reason('fail')
         print(f.GetFieldAsString("json"))
         return 'fail'
 
@@ -693,19 +659,16 @@ def test_ogr_mvt_polygon_larger_than_header():
 def test_ogr_mvt_errors():
 
     if ogr.Open('MVT:/i_do_not/exist') is not None:
-        gdaltest.post_reason('fail')
         return 'fail'
 
     # Cannot detect Z in directory name
     if ogr.Open('MVT:data') is not None:
-        gdaltest.post_reason('fail')
         return 'fail'
 
     # Invalid Z
     gdal.Mkdir('/vsimem/33', 0)
 
     if ogr.Open('MVT:/vsimem/33') is not None:
-        gdaltest.post_reason('fail')
         return 'fail'
 
     gdal.Rmdir('/vsimem/33')
@@ -714,14 +677,12 @@ def test_ogr_mvt_errors():
     with gdaltest.error_handler():
         if gdal.OpenEx('data/mvt/linestring/0/0/0.pbf',
                        open_options=['METADATA_FILE=/i_do_not/exist']) is None:
-            gdaltest.post_reason('fail')
             return 'fail'
 
     # Invalid metadata
     with gdaltest.error_handler():
         if gdal.OpenEx('data/mvt/linestring/0/0/0.pbf',
                        open_options=['METADATA_FILE=ogr_mvt.py']) is None:
-            gdaltest.post_reason('fail')
             return 'fail'
 
     # Invalid metadata
@@ -729,7 +690,6 @@ def test_ogr_mvt_errors():
     with gdaltest.error_handler():
         if gdal.OpenEx('data/mvt/linestring/0/0/0.pbf',
                        open_options=['METADATA_FILE=/vsimem/my.json']) is None:
-            gdaltest.post_reason('fail')
             return 'fail'
     gdal.Unlink('/vsimem/my.json')
 
@@ -738,7 +698,6 @@ def test_ogr_mvt_errors():
     with gdaltest.error_handler():
         if gdal.OpenEx('data/mvt/linestring/0/0/0.pbf',
                        open_options=['METADATA_FILE=/vsimem/my.json']) is None:
-            gdaltest.post_reason('fail')
             return 'fail'
     gdal.Unlink('/vsimem/my.json')
 
@@ -753,7 +712,6 @@ def test_ogr_mvt_errors():
     ds = ogr.Open(tmpfilename)
     gdal.Unlink(tmpfilename)
     if ds is not None:
-        gdaltest.post_reason('fail')
         return 'fail'
 
     return 'success'
@@ -795,7 +753,6 @@ def test_ogr_mvt_http():
         lyr = ds.GetLayer(0)
         f = lyr.GetNextFeature()
         if f is None:
-            gdaltest.post_reason('fail')
             return 'fail'
 
     # No metadata file nor tile
@@ -807,7 +764,6 @@ def test_ogr_mvt_http():
         with gdaltest.error_handler():
             ds = ogr.Open('MVT:http://127.0.0.1:%d/linestring/0' % gdaltest.webserver_port)
         if ds is not None:
-            gdaltest.post_reason('fail')
             return 'fail'
 
     # No metadata file, but tiles
@@ -823,7 +779,6 @@ def test_ogr_mvt_http():
         lyr = ds.GetLayer(0)
         f = lyr.GetNextFeature()
         if f is None:
-            gdaltest.post_reason('fail')
             return 'fail'
 
     # metadata.json file, but no tiles
@@ -837,7 +792,6 @@ def test_ogr_mvt_http():
         lyr = ds.GetLayer(0)
         f = lyr.GetNextFeature()
         if f is not None:
-            gdaltest.post_reason('fail')
             return 'fail'
 
     # No metadata.json file, but a linestring.json and no tiles
@@ -852,7 +806,6 @@ def test_ogr_mvt_http():
         lyr = ds.GetLayer(0)
         f = lyr.GetNextFeature()
         if f is not None:
-            gdaltest.post_reason('fail')
             return 'fail'
 
     # Open pbf file
@@ -864,7 +817,6 @@ def test_ogr_mvt_http():
         lyr = ds.GetLayer(0)
         f = lyr.GetNextFeature()
         if f is None:
-            gdaltest.post_reason('fail')
             return 'fail'
 
     return 'success'
@@ -905,21 +857,18 @@ def test_ogr_mvt_write_one_layer():
     with gdaltest.error_handler():
         out_ds = gdal.VectorTranslate('/vsimem/outmvt', src_ds, format='MVT')
     if out_ds is None:
-        gdaltest.post_reason('fail')
         return 'fail'
 
     # Cannot create directory
     with gdaltest.error_handler():
         out_ds = gdal.VectorTranslate('/i_dont/exist/outmvt', src_ds, format='MVT')
     if out_ds is not None:
-        gdaltest.post_reason('fail')
         return 'fail'
 
     # Directory already exists
     with gdaltest.error_handler():
         out_ds = gdal.VectorTranslate('/vsimem/outmvt', src_ds, format='MVT')
     if out_ds is not None:
-        gdaltest.post_reason('fail')
         return 'fail'
 
     gdal.RmdirRecursive('/vsimem/outmvt')
@@ -981,13 +930,11 @@ def test_ogr_mvt_write_one_layer():
         out_ds = gdal.VectorTranslate('/vsimem/outmvt', src_ds,
                                       options='-f MVT -preserve_fid')
     if out_ds is None:
-        gdaltest.post_reason('fail')
         return 'fail'
     out_ds = None
 
     out_ds = ogr.Open('/vsimem/outmvt/0')
     if out_ds is None:
-        gdaltest.post_reason('fail')
         return 'fail'
     out_lyr = out_ds.GetLayerByName('mylayer')
     out_f = out_lyr.GetNextFeature()
@@ -1000,7 +947,6 @@ def test_ogr_mvt_write_one_layer():
        out_f['datetimefield'] != '2018-02-01T12:34:56' or \
        out_f['boolfield'] is False or \
        ogrtest.check_feature_geometry(out_f, 'POINT (498980.920645632 997961.84129126)') != 0:
-        gdaltest.post_reason('fail')
         out_f.DumpReadable()
         return 'fail'
 
@@ -1013,7 +959,6 @@ def test_ogr_mvt_write_one_layer():
        out_f['datetimefield'] != '2018-02-01T12:34:56' or \
        out_f['boolfield'] is False or \
        ogrtest.check_feature_geometry(out_f, 'MULTILINESTRING ((498980.920645632 997961.84129126,508764.860266134 1007745.78091176,518548.799886636 1017529.72053226))') != 0:
-        gdaltest.post_reason('fail')
         out_f.DumpReadable()
         return 'fail'
 
@@ -1026,25 +971,21 @@ def test_ogr_mvt_write_one_layer():
        out_f.IsFieldSet('datetimefield') or \
        out_f.IsFieldSet('boolfield') or \
        ogrtest.check_feature_geometry(out_f, 'POLYGON ((498980.920645632 997961.84129126,508764.860266134 1007745.78091176,508764.860266134 997961.84129126,498980.920645632 997961.84129126))') != 0:
-        gdaltest.post_reason('fail')
         out_f.DumpReadable()
         return 'fail'
 
     out_f = out_lyr.GetNextFeature()
     if ogrtest.check_feature_geometry(out_f, 'MULTIPOINT ((498980.920645632 997961.84129126),(508764.860266134 1007745.78091176))') != 0:
-        gdaltest.post_reason('fail')
         out_f.DumpReadable()
         return 'fail'
 
     out_f = out_lyr.GetNextFeature()
     if ogrtest.check_feature_geometry(out_f, 'MULTILINESTRING ((498980.920645632 997961.84129126,508764.860266134 1007745.78091176),(508764.860266134 1007745.78091176,508764.860266134 997961.84129126))') != 0:
-        gdaltest.post_reason('fail')
         out_f.DumpReadable()
         return 'fail'
 
     out_f = out_lyr.GetNextFeature()
     if ogrtest.check_feature_geometry(out_f, 'MULTIPOLYGON (((498980.920645632 997961.84129126,508764.860266134 1007745.78091176,508764.860266134 997961.84129126,498980.920645632 997961.84129126)),((-498980.920645632 997961.84129126,-508764.860266134 997961.84129126,-508764.860266134 1007745.78091176,-498980.920645632 997961.84129126)))') != 0:
-        gdaltest.post_reason('fail')
         out_f.DumpReadable()
         return 'fail'
 
@@ -1052,7 +993,6 @@ def test_ogr_mvt_write_one_layer():
     if (out_f.GetGeometryRef().GetGeometryType() == ogr.wkbPoint and ogrtest.check_feature_geometry(out_f, 'POINT (498980.920645632 997961.84129126)') != 0) or \
        (out_f.GetGeometryRef().GetGeometryType() == ogr.wkbMultiLineString and ogrtest.check_feature_geometry(out_f, 'MULTILINESTRING ((498980.920645632 997961.84129126,508764.860266134 1007745.78091176,518548.799886636 1017529.72053226))') != 0) or \
        out_f.GetGeometryRef().GetGeometryType() not in (ogr.wkbPoint, ogr.wkbMultiLineString):
-        gdaltest.post_reason('fail')
         out_f.DumpReadable()
         return 'fail'
 
@@ -1060,23 +1000,19 @@ def test_ogr_mvt_write_one_layer():
     if (out_f.GetGeometryRef().GetGeometryType() == ogr.wkbPoint and ogrtest.check_feature_geometry(out_f, 'POINT (498980.920645632 997961.84129126)') != 0) or \
        (out_f.GetGeometryRef().GetGeometryType() == ogr.wkbMultiLineString and ogrtest.check_feature_geometry(out_f, 'MULTILINESTRING ((498980.920645632 997961.84129126,508764.860266134 1007745.78091176,518548.799886636 1017529.72053226))') != 0) or \
        out_f.GetGeometryRef().GetGeometryType() not in (ogr.wkbPoint, ogr.wkbMultiLineString):
-        gdaltest.post_reason('fail')
         out_f.DumpReadable()
         return 'fail'
 
     out_ds = ogr.Open('/vsimem/outmvt/5')
     if out_ds is None:
-        gdaltest.post_reason('fail')
         return 'fail'
     out_lyr = out_ds.GetLayerByName('mylayer')
     if out_lyr.GetFeatureCount() != 9:
-        gdaltest.post_reason('fail')
         print(out_lyr.GetFeatureCount())
         return 'fail'
 
     f = gdal.VSIFOpenL('/vsimem/outmvt/metadata.json', 'rb')
     if f is None:
-        gdaltest.post_reason('fail')
         return 'fail'
     data = gdal.VSIFReadL(1, 100000, f).decode('ASCII')
     gdal.VSIFCloseL(f)
@@ -1094,7 +1030,6 @@ def test_ogr_mvt_write_one_layer():
     }
     for k in expected_json:
         if k not in data_json or data_json[k] != expected_json[k]:
-            gdaltest.post_reason('fail')
             print(data)
             return 'fail'
     json_json = json.loads(data_json['json'])
@@ -1198,7 +1133,6 @@ def test_ogr_mvt_write_one_layer():
     }
 
     if json_json != expected_json_json:
-        gdaltest.post_reason('fail')
         print(data_json['json'])
         return 'fail'
 
@@ -1228,24 +1162,20 @@ def test_ogr_mvt_write_conf():
     out_ds = gdal.VectorTranslate('/vsimem/outmvt', src_ds,
                                   format='MVT', datasetCreationOptions=["CONF=%s" % json.dumps(conf)])
     if out_ds is None:
-        gdaltest.post_reason('fail')
         return 'fail'
     out_ds = None
 
     out_ds = ogr.Open('/vsimem/outmvt/1')
     if out_ds is None:
-        gdaltest.post_reason('fail')
         return 'fail'
     out_lyr = out_ds.GetLayerByName('TheLayer')
     out_f = out_lyr.GetNextFeature()
     if ogrtest.check_feature_geometry(out_f, 'MULTIPOINT (498980.920645632 997961.84129126)') != 0:
-        gdaltest.post_reason('fail')
         out_f.DumpReadable()
         return 'fail'
 
     f = gdal.VSIFOpenL('/vsimem/outmvt/metadata.json', 'rb')
     if f is None:
-        gdaltest.post_reason('fail')
         return 'fail'
     data = gdal.VSIFReadL(1, 100000, f).decode('ASCII')
     gdal.VSIFCloseL(f)
@@ -1278,7 +1208,6 @@ def test_ogr_mvt_write_conf():
     }
 
     if json_json != expected_json_json:
-        gdaltest.post_reason('fail')
         print(data_json['json'])
         return 'fail'
 
@@ -1303,18 +1232,15 @@ def test_ogr_mvt_write_mbtiles():
 
     out_ds = gdal.VectorTranslate('/vsimem/out.mbtiles', src_ds)
     if out_ds is None:
-        gdaltest.post_reason('fail')
         return 'fail'
     out_ds = None
 
     out_ds = ogr.Open('/vsimem/out.mbtiles')
     if out_ds is None:
-        gdaltest.post_reason('fail')
         return 'fail'
     out_lyr = out_ds.GetLayerByName('mylayer')
     out_f = out_lyr.GetNextFeature()
     if ogrtest.check_feature_geometry(out_f, 'MULTIPOINT ((499898.164985053 1000102.07808325))') != 0:
-        gdaltest.post_reason('fail')
         out_f.DumpReadable()
         return 'fail'
     out_ds = None
@@ -1349,23 +1275,19 @@ def test_ogr_mvt_write_limitations_max_size():
         out_ds = gdal.VectorTranslate('/vsimem/out.mbtiles', src_ds,
                                       datasetCreationOptions=['MAX_SIZE=100', 'SIMPLIFICATION=1'])
     if out_ds is None:
-        gdaltest.post_reason('fail')
         return 'fail'
     out_ds = None
 
     out_ds = ogr.Open('/vsimem/out.mbtiles')
     if out_ds is None:
-        gdaltest.post_reason('fail')
         return 'fail'
     out_lyr = out_ds.GetLayerByName('mylayer')
     out_f = out_lyr.GetNextFeature()
     if ogrtest.check_feature_geometry(out_f, 'MULTILINESTRING ((498980.920645631 1007745.78091176,508764.860266133 1007745.78091176))') != 0:
-        gdaltest.post_reason('fail')
         out_f.DumpReadable()
         return 'fail'
     out_f = out_lyr.GetNextFeature()
     if ogrtest.check_feature_geometry(out_f, 'POINT (498980.920645631 1007745.78091176)') != 0:
-        gdaltest.post_reason('fail')
         out_f.DumpReadable()
         return 'fail'
     out_ds = None
@@ -1401,28 +1323,23 @@ def test_ogr_mvt_write_polygon_repaired():
 
     out_ds = gdal.VectorTranslate('/vsimem/out.mbtiles', src_ds, datasetCreationOptions=['MAXZOOM=0'])
     if out_ds is None:
-        gdaltest.post_reason('fail')
         return 'fail'
     out_ds = None
 
     out_ds = ogr.Open('/vsimem/out.mbtiles')
     if out_ds is None:
-        gdaltest.post_reason('fail')
         return 'fail'
     out_lyr = out_ds.GetLayerByName('mylayer')
     out_f = out_lyr.GetNextFeature()
     if ogrtest.check_feature_geometry(out_f, 'MULTIPOLYGON (((0 0,0.0 498980.920645632,498980.920645632 498980.920645632,498980.920645632 0.0,0 0)))') != 0:
-        gdaltest.post_reason('fail')
         out_f.DumpReadable()
         return 'fail'
     out_f = out_lyr.GetNextFeature()
     if ogrtest.check_feature_geometry(out_f, 'MULTIPOLYGON (((0 0,0.0 498980.920645632,498980.920645632 498980.920645632,498980.920645632 0.0,0 0)),((997961.84129126 0.0,997961.84129126 997961.84129126,1995923.68258252 997961.84129126,997961.84129126 0.0)))') != 0:
-        gdaltest.post_reason('fail')
         out_f.DumpReadable()
         return 'fail'
     out_f = out_lyr.GetNextFeature()
     if out_f is not None:
-        gdaltest.post_reason('fail')
         out_f.DumpReadable()
         return 'fail'
     out_ds = None
@@ -1450,18 +1367,15 @@ def test_ogr_mvt_write_conflicting_innner_ring():
 
     out_ds = gdal.VectorTranslate('/vsimem/out.mbtiles', src_ds)
     if out_ds is None:
-        gdaltest.post_reason('fail')
         return 'fail'
     out_ds = None
 
     out_ds = ogr.Open('/vsimem/out.mbtiles')
     if out_ds is None:
-        gdaltest.post_reason('fail')
         return 'fail'
     out_lyr = out_ds.GetLayerByName('mylayer')
     out_f = out_lyr.GetNextFeature()
     if ogrtest.check_feature_geometry(out_f, 'MULTIPOLYGON (((-499898.164985052 1000102.07808325,-509987.852718695 1000102.07808325,-509987.852718695 1009886.01770375,-499898.164985052 1000102.07808325),(-502038.401777037 1001019.32242267,-509070.608379273 1008357.27713804,-509070.608379273 1001019.32242267,-502038.401777037 1001019.32242267)))') != 0:
-        gdaltest.post_reason('fail')
         out_f.DumpReadable()
         return 'fail'
     out_ds = None
@@ -1490,18 +1404,15 @@ def test_ogr_mvt_write_limitations_max_size_polygon():
     out_ds = gdal.VectorTranslate('/vsimem/out.mbtiles', src_ds,
                                   datasetCreationOptions=['MAX_SIZE=100'])
     if out_ds is None:
-        gdaltest.post_reason('fail')
         return 'fail'
     out_ds = None
 
     out_ds = ogr.Open('/vsimem/out.mbtiles')
     if out_ds is None:
-        gdaltest.post_reason('fail')
         return 'fail'
     out_lyr = out_ds.GetLayerByName('mylayer')
     out_f = out_lyr.GetNextFeature()
     if ogrtest.check_feature_geometry(out_f, 'MULTIPOLYGON (((498980.920645631 1007745.78091176,508764.860266133 1017529.72053227,508764.860266133 1007745.78091176,498980.920645631 1007745.78091176)))') != 0:
-        gdaltest.post_reason('fail')
         out_f.DumpReadable()
         return 'fail'
     out_ds = None
@@ -1532,23 +1443,19 @@ def test_ogr_mvt_write_limitations_max_features():
     out_ds = gdal.VectorTranslate('/vsimem/out.mbtiles', src_ds, format='MVT',
                                   datasetCreationOptions=['MAX_FEATURES=1'])
     if out_ds is None:
-        gdaltest.post_reason('fail')
         return 'fail'
     out_ds = None
 
     out_ds = ogr.Open('/vsimem/out.mbtiles')
     if out_ds is None:
-        gdaltest.post_reason('fail')
         return 'fail'
     out_lyr = out_ds.GetLayerByName('mylayer')
     out_f = out_lyr.GetNextFeature()
     if ogrtest.check_feature_geometry(out_f, 'POLYGON ((499898.164985053 1000102.07808325,509987.852718696 1100081.71108026,509987.852718696 1000102.07808325,499898.164985053 1000102.07808325))') != 0:
-        gdaltest.post_reason('fail')
         out_f.DumpReadable()
         return 'fail'
     out_f = out_lyr.GetNextFeature()
     if out_f is not None:
-        gdaltest.post_reason('fail')
         out_f.DumpReadable()
         return 'fail'
     out_ds = None
@@ -1577,21 +1484,17 @@ def test_ogr_mvt_write_custom_tiling_scheme():
     out_ds = gdal.VectorTranslate('/vsimem/out', src_ds, format='MVT',
                                   datasetCreationOptions=['TILING_SCHEME=EPSG:3067,-548576,8388608,2097152'])
     if out_ds is None:
-        gdaltest.post_reason('fail')
         return 'fail'
     out_ds = None
 
     out_ds = ogr.Open('/vsimem/out/1')
     if out_ds is None:
-        gdaltest.post_reason('fail')
         return 'fail'
     out_lyr = out_ds.GetLayerByName('mylayer')
     if out_lyr.GetSpatialRef().ExportToWkt().find('3067') < 0:
-        gdaltest.post_reason('fail')
         return 'fail'
     out_f = out_lyr.GetNextFeature()
     if ogrtest.check_feature_geometry(out_f, 'MULTILINESTRING ((-40160 7944704,21024 8044800))') != 0:
-        gdaltest.post_reason('fail')
         out_f.DumpReadable()
         return 'fail'
     out_ds = None
@@ -1613,7 +1516,6 @@ def test_ogr_mvt_write_errors():
     with gdaltest.error_handler():
         ds = gdal.GetDriverByName('MVT').Create('/vsimem/foo', 1, 1)
     if ds is not None:
-        gdaltest.post_reason('fail')
         return 'fail'
 
     # should have mbtiles extension
@@ -1622,7 +1524,6 @@ def test_ogr_mvt_write_errors():
         ds = ogr.GetDriverByName('MVT').CreateDataSource('/vsimem/foo.bar',
                                                          options=['FORMAT=MBTILES'])
     if ds is not None:
-        gdaltest.post_reason('fail')
         return 'fail'
 
     # Cannot create temporary database
@@ -1631,7 +1532,6 @@ def test_ogr_mvt_write_errors():
         ds = ogr.GetDriverByName('MVT').CreateDataSource('/vsimem/foo',
                                                          options=['TEMPORARY_DB=/i/do_not/exist.db'])
     if ds is not None:
-        gdaltest.post_reason('fail')
         return 'fail'
 
     # cannot create mbtiles file
@@ -1639,7 +1539,6 @@ def test_ogr_mvt_write_errors():
         ds = ogr.GetDriverByName('MVT').CreateDataSource('/i/do_not/exist.mbtiles',
                                                          options=['TEMPORARY_DB=/vsimem/temp.db'])
     if ds is not None:
-        gdaltest.post_reason('fail')
         return 'fail'
     gdal.Unlink('/vsimem/temp.db')
 
@@ -1649,13 +1548,11 @@ def test_ogr_mvt_write_errors():
         ds = ogr.GetDriverByName('MVT').CreateDataSource('/vsimem/foo',
                                                          options=['MINZOOM=-1'])
     if ds is not None:
-        gdaltest.post_reason('fail')
         return 'fail'
     with gdaltest.error_handler():
         ds = ogr.GetDriverByName('MVT').CreateDataSource('/vsimem/foo',
                                                          options=['MINZOOM=30'])
     if ds is not None:
-        gdaltest.post_reason('fail')
         return 'fail'
 
     # invalid MAXZOOM
@@ -1664,13 +1561,11 @@ def test_ogr_mvt_write_errors():
         ds = ogr.GetDriverByName('MVT').CreateDataSource('/vsimem/foo',
                                                          options=['MAXZOOM=-1'])
     if ds is not None:
-        gdaltest.post_reason('fail')
         return 'fail'
     with gdaltest.error_handler():
         ds = ogr.GetDriverByName('MVT').CreateDataSource('/vsimem/foo',
                                                          options=['MAXZOOM=30'])
     if ds is not None:
-        gdaltest.post_reason('fail')
         return 'fail'
 
     # invalid MINZOOM vs MAXZOOM
@@ -1679,7 +1574,6 @@ def test_ogr_mvt_write_errors():
         ds = ogr.GetDriverByName('MVT').CreateDataSource('/vsimem/foo',
                                                          options=['MINZOOM=1', 'MAXZOOM=0'])
     if ds is not None:
-        gdaltest.post_reason('fail')
         return 'fail'
 
     # invalid MINZOOM for layer
@@ -1688,7 +1582,6 @@ def test_ogr_mvt_write_errors():
     with gdaltest.error_handler():
         lyr = ds.CreateLayer('foo', options=['MINZOOM=-1'])
     if lyr is not None:
-        gdaltest.post_reason('fail')
         return 'fail'
 
     # invalid CONF
@@ -1699,7 +1592,6 @@ def test_ogr_mvt_write_errors():
                                                          options=['CONF=/vsimem/invalid.json'])
     gdal.Unlink('/vsimem/invalid.json')
     if ds is not None:
-        gdaltest.post_reason('fail')
         return 'fail'
 
     # TILING_SCHEME not allowed with MBTILES
@@ -1707,7 +1599,6 @@ def test_ogr_mvt_write_errors():
         ds = ogr.GetDriverByName('MVT').CreateDataSource('/vsimem/foo.mbtiles',
                                                          options=['TILING_SCHEME=EPSG:4326,-180,180,360'])
     if ds is not None:
-        gdaltest.post_reason('fail')
         return 'fail'
 
     # Invalid TILING_SCHEME
@@ -1716,7 +1607,6 @@ def test_ogr_mvt_write_errors():
         ds = ogr.GetDriverByName('MVT').CreateDataSource('/vsimem/foo',
                                                          options=['TILING_SCHEME=EPSG:4326'])
     if ds is not None:
-        gdaltest.post_reason('fail')
         return 'fail'
 
     # Test failure in creating tile
@@ -1730,7 +1620,6 @@ def test_ogr_mvt_write_errors():
     with gdaltest.error_handler():
         ds = None
     if gdal.GetLastErrorMsg() == '':
-        gdaltest.post_reason('fail')
         return 'fail'
     gdal.RmdirRecursive('tmp/tmpmvt')
 
@@ -1749,7 +1638,6 @@ def test_ogr_mvt_write_errors():
         lyr.CreateFeature(f)
         ds = None
     if gdal.GetLastErrorMsg() == '':
-        gdaltest.post_reason('fail')
         return 'fail'
     gdal.RmdirRecursive('tmp/tmpmvt')
 
@@ -1769,7 +1657,6 @@ def test_ogr_mvt_write_errors():
         lyr.CreateFeature(f)
         ds = None
     if gdal.GetLastErrorMsg() == '':
-        gdaltest.post_reason('fail')
         return 'fail'
     gdal.RmdirRecursive('tmp/tmpmvt')
 
@@ -1807,7 +1694,6 @@ def test_ogr_mvt_write_reuse_temp_db():
         gdal.VectorTranslate('/vsimem/out', src_ds, format='MVT')
 
     if gdal.VSIStatL('/vsimem/out.temp.db') is None:
-        gdaltest.post_reason('fail')
         return 'fail'
 
     gdal.RmdirRecursive('/vsimem/out')
@@ -1817,12 +1703,10 @@ def test_ogr_mvt_write_reuse_temp_db():
 
     out_ds = ogr.Open('/vsimem/out/5')
     if out_ds is None:
-        gdaltest.post_reason('fail')
         return 'fail'
     out_lyr = out_ds.GetLayerByName('mylayer')
     out_f = out_lyr.GetNextFeature()
     if out_f is None:
-        gdaltest.post_reason('fail')
         return 'fail'
     out_ds = None
 
diff --git a/autotest/ogr/ogr_mysql.py b/autotest/ogr/ogr_mysql.py
index 59de0d583f4b..4fa643e462ca 100755
--- a/autotest/ogr/ogr_mysql.py
+++ b/autotest/ogr/ogr_mysql.py
@@ -143,7 +143,6 @@ def test_ogr_mysql_3():
         return 'skip'
 
     if gdaltest.mysql_lyr.GetGeometryColumn() != 'SHAPE':
-        gdaltest.post_reason('fail')
         return 'fail'
 
     if gdaltest.mysql_lyr.GetFeatureCount() != 10:
@@ -175,7 +174,6 @@ def test_ogr_mysql_3():
                 gdaltest.post_reason('Attribute %d does not match' % fld)
                 return 'fail'
         if read_feat.GetField('INT64') != 1234567890123:
-            gdaltest.post_reason('failure')
             return 'fail'
 
         read_feat.Destroy()
@@ -756,33 +754,27 @@ def test_ogr_mysql_72():
     # Regular layer with 32 bit IDs
     lyr = gdaltest.mysql_ds.CreateLayer('ogr_mysql_72', geom_type=ogr.wkbNone)
     if lyr.GetMetadataItem(ogr.OLMD_FID64) is not None:
-        gdaltest.post_reason('fail')
         return 'fail'
     lyr.CreateField(ogr.FieldDefn('foo'))
     f = ogr.Feature(lyr.GetLayerDefn())
     f.SetFID(123456789012345)
     f.SetField(0, 'bar')
     if lyr.CreateFeature(f) != 0:
-        gdaltest.post_reason('fail')
         return 'fail'
     f = lyr.GetFeature(123456789012345)
     if f is None:
-        gdaltest.post_reason('fail')
         return 'fail'
 
     lyr = gdaltest.mysql_ds.CreateLayer('ogr_mysql_72', geom_type=ogr.wkbNone, options=['FID64=YES', 'OVERWRITE=YES'])
     if lyr.GetMetadataItem(ogr.OLMD_FID64) is None:
-        gdaltest.post_reason('fail')
         return 'fail'
     lyr.CreateField(ogr.FieldDefn('foo'))
     f = ogr.Feature(lyr.GetLayerDefn())
     f.SetFID(123456789012345)
     f.SetField(0, 'bar')
     if lyr.CreateFeature(f) != 0:
-        gdaltest.post_reason('fail')
         return 'fail'
     if lyr.SetFeature(f) != 0:
-        gdaltest.post_reason('fail')
         return 'fail'
 
     gdaltest.mysql_ds = None
@@ -790,11 +782,9 @@ def test_ogr_mysql_72():
     gdaltest.mysql_ds = ogr.Open(gdaltest.mysql_connection_string, update=1)
     lyr = gdaltest.mysql_ds.GetLayerByName('ogr_mysql_72')
     if lyr.GetMetadataItem(ogr.OLMD_FID64) is None:
-        gdaltest.post_reason('fail')
         return 'fail'
     f = lyr.GetNextFeature()
     if f.GetFID() != 123456789012345:
-        gdaltest.post_reason('fail')
         f.DumpReadable()
         return 'fail'
 
@@ -829,7 +819,6 @@ def test_ogr_mysql_25():
     ret = lyr.CreateFeature(f)
     gdal.PopErrorHandler()
     if ret == 0:
-        gdaltest.post_reason('fail')
         return 'fail'
     f = None
 
@@ -842,7 +831,6 @@ def test_ogr_mysql_25():
         ret = lyr.CreateFeature(f)
         gdal.PopErrorHandler()
         if ret == 0:
-            gdaltest.post_reason('fail')
             return 'fail'
         f = None
 
@@ -850,13 +838,10 @@ def test_ogr_mysql_25():
     gdaltest.mysql_ds = ogr.Open(gdaltest.mysql_connection_string, update=1)
     lyr = gdaltest.mysql_ds.GetLayerByName('ogr_mysql_25')
     if lyr.GetLayerDefn().GetFieldDefn(lyr.GetLayerDefn().GetFieldIndex('field_not_nullable')).IsNullable() != 0:
-        gdaltest.post_reason('fail')
         return 'fail'
     if lyr.GetLayerDefn().GetFieldDefn(lyr.GetLayerDefn().GetFieldIndex('field_nullable')).IsNullable() != 1:
-        gdaltest.post_reason('fail')
         return 'fail'
     if lyr.GetLayerDefn().GetGeomFieldDefn(0).IsNullable() != 0:
-        gdaltest.post_reason('fail')
         return 'fail'
 
     return 'success'
@@ -917,23 +902,17 @@ def test_ogr_mysql_26():
     gdaltest.mysql_ds = ogr.Open(gdaltest.mysql_connection_string, update=1)
     lyr = gdaltest.mysql_ds.GetLayerByName('ogr_mysql_26')
     if lyr.GetLayerDefn().GetFieldDefn(lyr.GetLayerDefn().GetFieldIndex('field_string')).GetDefault() != "'a''b'":
-        gdaltest.post_reason('fail')
         return 'fail'
     if lyr.GetLayerDefn().GetFieldDefn(lyr.GetLayerDefn().GetFieldIndex('field_int')).GetDefault() != '123':
-        gdaltest.post_reason('fail')
         return 'fail'
     if lyr.GetLayerDefn().GetFieldDefn(lyr.GetLayerDefn().GetFieldIndex('field_real')).GetDefault() != '1.23':
-        gdaltest.post_reason('fail')
         return 'fail'
     if lyr.GetLayerDefn().GetFieldDefn(lyr.GetLayerDefn().GetFieldIndex('field_nodefault')).GetDefault() is not None:
-        gdaltest.post_reason('fail')
         return 'fail'
     if lyr.GetLayerDefn().GetFieldDefn(lyr.GetLayerDefn().GetFieldIndex('field_datetime')).GetDefault() != 'CURRENT_TIMESTAMP':
-        gdaltest.post_reason('fail')
         print(lyr.GetLayerDefn().GetFieldDefn(lyr.GetLayerDefn().GetFieldIndex('field_datetime')).GetDefault())
         return 'fail'
     if lyr.GetLayerDefn().GetFieldDefn(lyr.GetLayerDefn().GetFieldIndex('field_datetime2')).GetDefault() != "'2015/06/30 12:34:56'":
-        gdaltest.post_reason('fail')
         print(lyr.GetLayerDefn().GetFieldDefn(lyr.GetLayerDefn().GetFieldIndex('field_datetime2')).GetDefault())
         return 'fail'
     # if lyr.GetLayerDefn().GetFieldDefn(lyr.GetLayerDefn().GetFieldIndex('field_date')).GetDefault() != "CURRENT_DATE":
@@ -949,7 +928,6 @@ def test_ogr_mysql_26():
        not f.IsFieldNull('field_string_null') or \
        not f.IsFieldNull('field_nodefault') or not f.IsFieldSet('field_datetime') or \
        f.GetField('field_datetime2') != '2015/06/30 12:34:56':
-        gdaltest.post_reason('fail')
         f.DumpReadable()
         return 'fail'
 
diff --git a/autotest/ogr/ogr_oci.py b/autotest/ogr/ogr_oci.py
index dd283a5ff0b2..599f861c3b60 100755
--- a/autotest/ogr/ogr_oci.py
+++ b/autotest/ogr/ogr_oci.py
@@ -232,7 +232,6 @@ def test_ogr_oci_5():
 
     sql_lyr = gdaltest.oci_ds.ExecuteSQL('select distinct eas_id from tpoly order by eas_id desc')
     if sql_lyr.GetLayerDefn().GetGeomFieldCount() != 0:
-        gdaltest.post_reason('fail')
         return 'fail'
 
     tr = ogrtest.check_features_against_list(sql_lyr, 'eas_id', expect)
@@ -252,7 +251,6 @@ def test_ogr_oci_6():
 
     sql_lyr = gdaltest.oci_ds.ExecuteSQL("select * from tpoly where prfedea = '2'")
     if sql_lyr.GetLayerDefn().GetGeomFieldCount() != 1:
-        gdaltest.post_reason('fail')
         return 'fail'
 
     tr = ogrtest.check_features_against_list(sql_lyr, 'prfedea', ['2'])
@@ -781,13 +779,11 @@ def test_ogr_oci_18():
 
         lyr = oci_ds2.GetLayerByName('test_%s' % strgeomtype)
         if lyr.GetGeomType() != geomtype:
-            gdaltest.post_reason('fail')
             print(wkt)
             print(lyr.GetGeomType())
             return 'fail'
         feat = lyr.GetNextFeature()
         if feat.GetGeometryRef().ExportToWkt() != wkt:
-            gdaltest.post_reason('fail')
             print(wkt)
             print(feat.GetGeometryRef().ExportToWkt())
             return 'fail'
@@ -801,7 +797,6 @@ def test_ogr_oci_18():
     oci_ds2 = ogr.Open(dsname)
     lyr = oci_ds2.GetLayerByName('test_NONE')
     if lyr.GetGeomType() != ogr.wkbNone:
-        gdaltest.post_reason('fail')
         return 'fail'
 
     return 'success'
@@ -826,14 +821,11 @@ def test_ogr_oci_19():
 
     sql_lyr = gdaltest.oci_ds.ExecuteSQL('SELECT MYDATE, MYDATETIME FROM testdate')
     if sql_lyr.GetLayerDefn().GetFieldDefn(0).GetType() != ogr.OFTDate:
-        gdaltest.post_reason('fail')
         return 'fail'
     if sql_lyr.GetLayerDefn().GetFieldDefn(1).GetType() != ogr.OFTDateTime:
-        gdaltest.post_reason('fail')
         return 'fail'
     f = sql_lyr.GetNextFeature()
     if f.GetField(0) != '2015/02/03' or f.GetField(1) != '2015/02/03 11:33:44':
-        gdaltest.post_reason('fail')
         f.DumpReadable()
         return 'fail'
     gdaltest.oci_ds.ReleaseResultSet(sql_lyr)
@@ -850,7 +842,6 @@ def test_ogr_oci_20():
         return 'skip'
     lyr = gdaltest.oci_ds.CreateLayer('ogr_oci_20', geom_type=ogr.wkbPoint, options=['GEOMETRY_NULLABLE=NO', 'DIM=2'])
     if lyr.GetLayerDefn().GetGeomFieldDefn(0).IsNullable() != 0:
-        gdaltest.post_reason('fail')
         return 'fail'
     field_defn = ogr.FieldDefn('field_not_nullable', ogr.OFTString)
     field_defn.SetNullable(0)
@@ -864,7 +855,6 @@ def test_ogr_oci_20():
     ret = lyr.CreateFeature(f)
     f = None
     if ret != 0:
-        gdaltest.post_reason('fail')
         return 'fail'
 
     # Error case: missing geometry
@@ -874,7 +864,6 @@ def test_ogr_oci_20():
     ret = lyr.CreateFeature(f)
     gdal.PopErrorHandler()
     if ret == 0:
-        gdaltest.post_reason('fail')
         return 'fail'
     f = None
 
@@ -885,7 +874,6 @@ def test_ogr_oci_20():
     ret = lyr.CreateFeature(f)
     gdal.PopErrorHandler()
     if ret == 0:
-        gdaltest.post_reason('fail')
         return 'fail'
     f = None
     lyr.SyncToDisk()
@@ -893,21 +881,18 @@ def test_ogr_oci_20():
     # Test with nullable geometry
     lyr = gdaltest.oci_ds.CreateLayer('ogr_oci_20bis', geom_type=ogr.wkbPoint, options=['DIM=2'])
     if lyr.GetLayerDefn().GetGeomFieldDefn(0).IsNullable() != 1:
-        gdaltest.post_reason('fail')
         return 'fail'
     f = ogr.Feature(lyr.GetLayerDefn())
     f.SetGeometryDirectly(ogr.CreateGeometryFromWkt('POINT(0 1)'))
     ret = lyr.CreateFeature(f)
     f = None
     if ret != 0:
-        gdaltest.post_reason('fail')
         return 'fail'
 
     f = ogr.Feature(lyr.GetLayerDefn())
     ret = lyr.CreateFeature(f)
     f = None
     if ret != 0:
-        gdaltest.post_reason('fail')
         return 'fail'
     lyr.SyncToDisk()
 
@@ -915,26 +900,20 @@ def test_ogr_oci_20():
 
     lyr = oci_ds2.GetLayerByName('ogr_oci_20')
     if lyr.GetLayerDefn().GetFieldDefn(lyr.GetLayerDefn().GetFieldIndex('field_not_nullable')).IsNullable() != 0:
-        gdaltest.post_reason('fail')
         return 'fail'
     if lyr.GetLayerDefn().GetFieldDefn(lyr.GetLayerDefn().GetFieldIndex('field_nullable')).IsNullable() != 1:
-        gdaltest.post_reason('fail')
         return 'fail'
     if lyr.GetLayerDefn().GetGeomFieldDefn(0).IsNullable() != 0:
-        gdaltest.post_reason('fail')
         return 'fail'
 
     lyr = oci_ds2.GetLayerByName('ogr_oci_20bis')
     if lyr.GetLayerDefn().GetGeomFieldDefn(0).IsNullable() != 1:
-        gdaltest.post_reason('fail')
         return 'fail'
     feat = lyr.GetNextFeature()
     if feat.GetGeometryRef() is None:
-        gdaltest.post_reason('fail')
         return 'fail'
     feat = lyr.GetNextFeature()
     if feat.GetGeometryRef() is not None:
-        gdaltest.post_reason('fail')
         return 'fail'
 
     return 'success'
@@ -1003,22 +982,16 @@ def test_ogr_oci_21():
 
     lyr = oci_ds2.GetLayerByName('ogr_oci_21')
     if lyr.GetLayerDefn().GetFieldDefn(lyr.GetLayerDefn().GetFieldIndex('field_string')).GetDefault() != "'a''b'":
-        gdaltest.post_reason('fail')
         return 'fail'
     if lyr.GetLayerDefn().GetFieldDefn(lyr.GetLayerDefn().GetFieldIndex('field_int')).GetDefault() != '123':
-        gdaltest.post_reason('fail')
         return 'fail'
     if lyr.GetLayerDefn().GetFieldDefn(lyr.GetLayerDefn().GetFieldIndex('field_real')).GetDefault() != '1.23':
-        gdaltest.post_reason('fail')
         return 'fail'
     if lyr.GetLayerDefn().GetFieldDefn(lyr.GetLayerDefn().GetFieldIndex('field_nodefault')).GetDefault() is not None:
-        gdaltest.post_reason('fail')
         return 'fail'
     if lyr.GetLayerDefn().GetFieldDefn(lyr.GetLayerDefn().GetFieldIndex('field_datetime')).GetDefault() != 'CURRENT_TIMESTAMP':
-        gdaltest.post_reason('fail')
         return 'fail'
     if lyr.GetLayerDefn().GetFieldDefn(lyr.GetLayerDefn().GetFieldIndex('field_datetime2')).GetDefault() != "'2015/06/30 12:34:56'":
-        gdaltest.post_reason('fail')
         print(lyr.GetLayerDefn().GetFieldDefn(lyr.GetLayerDefn().GetFieldIndex('field_datetime2')).GetDefault())
         return 'fail'
     # if lyr.GetLayerDefn().GetFieldDefn(lyr.GetLayerDefn().GetFieldIndex('field_date')).GetDefault() != "CURRENT_DATE":
@@ -1031,7 +1004,6 @@ def test_ogr_oci_21():
 
     f = lyr.GetNextFeature()
     if f.GetField('field_string') != 'c':
-        gdaltest.post_reason('fail')
         f.DumpReadable()
         return 'fail'
 
@@ -1040,7 +1012,6 @@ def test_ogr_oci_21():
        f.GetField('field_real') != 1.23 or \
        not f.IsFieldNull('field_nodefault') or not f.IsFieldSet('field_datetime') or \
        f.GetField('field_datetime2') != '2015/06/30 12:34:56':
-        gdaltest.post_reason('fail')
         f.DumpReadable()
         return 'fail'
 
diff --git a/autotest/ogr/ogr_odbc.py b/autotest/ogr/ogr_odbc.py
index 49ac033ffdda..868e3a82d2fd 100755
--- a/autotest/ogr/ogr_odbc.py
+++ b/autotest/ogr/ogr_odbc.py
@@ -76,50 +76,42 @@ def test_ogr_odbc_1():
     # Test with ODBC:user/pwd@dsn syntax
     ds = ogrtest.odbc_drv.Open('ODBC:user/pwd@DRIVER=Microsoft Access Driver (*.mdb);DBQ=tmp/odbc.mdb')
     if ds is None:
-        gdaltest.post_reason('failure')
         return 'fail'
     ds = None
 
     # Test with ODBC:dsn syntax
     ds = ogrtest.odbc_drv.Open('ODBC:DRIVER=Microsoft Access Driver (*.mdb);DBQ=tmp/odbc.mdb')
     if ds is None:
-        gdaltest.post_reason('failure')
         return 'fail'
     ds = None
 
     # Test with ODBC:dsn,table_list syntax
     ds = ogrtest.odbc_drv.Open('ODBC:DRIVER=Microsoft Access Driver (*.mdb);DBQ=tmp/odbc.mdb,test')
     if ds is None:
-        gdaltest.post_reason('failure')
         return 'fail'
     if ds.GetLayerCount() != 1:
-        gdaltest.post_reason('failure')
         return 'fail'
     ds = None
 
     # Reopen and check
     ds = ogrtest.odbc_drv.Open('tmp/odbc.mdb')
     if ds.GetLayerCount() != 2:
-        gdaltest.post_reason('failure')
         return 'fail'
 
     lyr = ds.GetLayerByName('test')
     feat = lyr.GetNextFeature()
     if feat.GetField('intfield') != 1 or feat.GetField('doublefield') != 2.34 or feat.GetField('stringfield') != 'foo':
-        gdaltest.post_reason('failure')
         feat.DumpReadable()
         return 'fail'
 
     lyr = ds.GetLayerByName('test_with_pk')
     # Test GetFeatureCount()
     if lyr.GetFeatureCount() != 5:
-        gdaltest.post_reason('failure')
         return 'fail'
 
     # Test GetFeature()
     feat = lyr.GetFeature(4)
     if feat.GetField('intfield') != 5:
-        gdaltest.post_reason('failure')
         feat.DumpReadable()
         return 'fail'
 
@@ -127,7 +119,6 @@ def test_ogr_odbc_1():
     lyr.SetAttributeFilter('intfield = 6')
     feat = lyr.GetNextFeature()
     if feat.GetFID() != 5:
-        gdaltest.post_reason('failure')
         feat.DumpReadable()
         return 'fail'
 
@@ -135,7 +126,6 @@ def test_ogr_odbc_1():
     sql_lyr = ds.ExecuteSQL("SELECT * FROM test")
     feat = sql_lyr.GetNextFeature()
     if feat.GetField('intfield') != 1 or feat.GetField('doublefield') != 2.34 or feat.GetField('stringfield') != 'foo':
-        gdaltest.post_reason('failure')
         feat.DumpReadable()
         return 'fail'
     ds.ReleaseResultSet(sql_lyr)
diff --git a/autotest/ogr/ogr_ods.py b/autotest/ogr/ogr_ods.py
index 18dd97625497..09fc51bc3cb7 100755
--- a/autotest/ogr/ogr_ods.py
+++ b/autotest/ogr/ogr_ods.py
@@ -44,7 +44,6 @@
 def ogr_ods_check(ds):
 
     if ds.TestCapability("foo") != 0:
-        gdaltest.post_reason('fail')
         return 'fail'
 
     if ds.GetLayerCount() != 8:
@@ -65,12 +64,10 @@ def ogr_ods_check(ds):
         return 'fail'
 
     if lyr.GetFeatureCount() != 26:
-        gdaltest.post_reason('fail')
         print(lyr.GetFeatureCount())
         return 'fail'
 
     if lyr.TestCapability("foo") != 0:
-        gdaltest.post_reason('fail')
         return 'fail'
 
     lyr = ds.GetLayer(6)
@@ -79,7 +76,6 @@ def ogr_ods_check(ds):
         return 'fail'
 
     if lyr.GetLayerDefn().GetFieldCount() != 12:
-        gdaltest.post_reason('fail')
         print(lyr.GetLayerDefn().GetFieldCount())
         return 'fail'
 
@@ -98,7 +94,6 @@ def ogr_ods_check(ds):
 
     for i, typ in enumerate(type_array):
         if lyr.GetLayerDefn().GetFieldDefn(i).GetType() != typ:
-            gdaltest.post_reason('fail')
             print(i)
             print(lyr.GetLayerDefn().GetFieldDefn(i).GetType())
             return 'fail'
@@ -110,13 +105,11 @@ def ogr_ods_check(ds):
        feat.GetFieldAsDouble(3) != 0.52 or \
        feat.GetFieldAsString(4) != '2012/01/22' or \
        feat.GetFieldAsString(5) != '2012/01/22 18:49:00':
-        gdaltest.post_reason('fail')
         feat.DumpReadable()
         return 'fail'
 
     feat = lyr.GetNextFeature()
     if feat.IsFieldSet(2):
-        gdaltest.post_reason('fail')
         feat.DumpReadable()
         return 'fail'
 
@@ -133,7 +126,6 @@ def test_ogr_ods_1():
         return 'skip'
 
     if drv.TestCapability("foo") != 0:
-        gdaltest.post_reason('fail')
         return 'fail'
 
     ds = ogr.Open('data/test.ods')
@@ -154,7 +146,6 @@ def test_ogr_ods_kspread_1():
         return 'skip'
 
     if drv.TestCapability("foo") != 0:
-        gdaltest.post_reason('fail')
         return 'fail'
 
     ds = ogr.Open('data/test_kspread.ods')
@@ -163,7 +154,6 @@ def test_ogr_ods_kspread_1():
         return 'fail'
 
     if ds.TestCapability("foo") != 0:
-        gdaltest.post_reason('fail')
         return 'fail'
 
     if ds.GetLayerCount() != 8:
@@ -184,12 +174,10 @@ def test_ogr_ods_kspread_1():
         return 'fail'
 
     if lyr.GetFeatureCount() != 26:
-        gdaltest.post_reason('fail')
         print(lyr.GetFeatureCount())
         return 'fail'
 
     if lyr.TestCapability("foo") != 0:
-        gdaltest.post_reason('fail')
         return 'fail'
 
     lyr = ds.GetLayer(6)
@@ -198,7 +186,6 @@ def test_ogr_ods_kspread_1():
         return 'fail'
 
     if lyr.GetLayerDefn().GetFieldCount() != 12:
-        gdaltest.post_reason('fail')
         print(lyr.GetLayerDefn().GetFieldCount())
         return 'fail'
 
@@ -218,7 +205,6 @@ def test_ogr_ods_kspread_1():
 
     for i, typ in enumerate(type_array):
         if lyr.GetLayerDefn().GetFieldDefn(i).GetType() != typ:
-            gdaltest.post_reason('fail')
             print(i)
             return 'fail'
 
@@ -229,13 +215,11 @@ def test_ogr_ods_kspread_1():
        feat.GetFieldAsDouble(3) != 0.52 or \
        feat.GetFieldAsString(4) != '2012/01/22' or \
        feat.GetFieldAsString(5) != '22/01/2012 18:49:00':  # 2012/01/22 18:49:00
-        gdaltest.post_reason('fail')
         feat.DumpReadable()
         return 'fail'
 
     feat = lyr.GetNextFeature()
     if feat.IsFieldSet(2):
-        gdaltest.post_reason('fail')
         feat.DumpReadable()
         return 'fail'
 
@@ -257,7 +241,6 @@ def test_ogr_ods_2():
     lyr = ds.GetLayerByName('Feuille7')
 
     if lyr.GetFeatureCount() != 3:
-        gdaltest.post_reason('fail')
         print(lyr.GetFeatureCount())
         return 'fail'
 
@@ -281,7 +264,6 @@ def test_ogr_ods_3():
     lyr = ds.GetLayerByName('Feuille7')
 
     if lyr.GetLayerDefn().GetFieldDefn(1).GetType() != ogr.OFTString:
-        gdaltest.post_reason('fail')
         return 'fail'
 
     gdal.SetConfigOption('OGR_ODS_FIELD_TYPES', None)
@@ -454,12 +436,10 @@ def test_ogr_ods_8():
     ds = ogr.Open('/vsimem/ogr_ods_8.ods')
     lyr = ds.GetLayer(0)
     if lyr.GetLayerDefn().GetFieldDefn(0).GetType() != ogr.OFTInteger64:
-        gdaltest.post_reason('failure')
         return 'fail'
     f = lyr.GetNextFeature()
     f = lyr.GetNextFeature()
     if f.GetField(0) != 12345678901234:
-        gdaltest.post_reason('failure')
         return 'fail'
     ds = None
 
@@ -494,19 +474,15 @@ def test_ogr_ods_9():
     lyr = ds.GetLayer(0)
     for i in range(3):
         if lyr.GetLayerDefn().GetFieldDefn(i).GetType() != ogr.OFTDateTime:
-            gdaltest.post_reason('failure')
             return 'fail'
     f = lyr.GetNextFeature()
     if f.GetField(0) != '2015/12/23 12:34:56.789':
-        gdaltest.post_reason('failure')
         f.DumpReadable()
         return 'fail'
     if f.GetField(1) != '2015/12/23 12:34:56':
-        gdaltest.post_reason('failure')
         f.DumpReadable()
         return 'fail'
     if f.GetField(2) != '2015/12/23 12:34:56':
-        gdaltest.post_reason('failure')
         f.DumpReadable()
         return 'fail'
     ds = None
@@ -543,18 +519,14 @@ def test_ogr_ods_boolean():
     ds = ogr.Open(out_filename)
     lyr = ds.GetLayer(0)
     if lyr.GetLayerDefn().GetFieldDefn(0).GetType() != ogr.OFTInteger:
-        gdaltest.post_reason('failure')
         return 'fail'
     if lyr.GetLayerDefn().GetFieldDefn(0).GetSubType() != ogr.OFSTBoolean:
-        gdaltest.post_reason('failure')
         return 'fail'
     f = lyr.GetNextFeature()
     if not f.GetField(0):
-        gdaltest.post_reason('failure')
         return 'fail'
     f = lyr.GetNextFeature()
     if f.GetField(0):
-        gdaltest.post_reason('failure')
         return 'fail'
     ds = None
 
diff --git a/autotest/ogr/ogr_openfilegdb.py b/autotest/ogr/ogr_openfilegdb.py
index 0b6a72c458d6..fa2ec8fbd047 100755
--- a/autotest/ogr/ogr_openfilegdb.py
+++ b/autotest/ogr/ogr_openfilegdb.py
@@ -293,25 +293,19 @@ def test_ogr_openfilegdb_1(filename='data/testopenfilegdb.gdb.zip', version10=Tr
         elif expected_geom_type == ogr.wkbPolygon25D:
             expected_geom_type = ogr.wkbMultiPolygon25D
         if lyr.GetGeomType() != expected_geom_type:
-            gdaltest.post_reason('fail')
             print(lyr.GetName())
             print(lyr.GetGeomType())
             return 'fail'
         if expected_geom_type is not ogr.wkbNone and lyr.GetLayerDefn().GetGeomFieldDefn(0).IsNullable() != 1:
-            gdaltest.post_reason('fail')
             return 'fail'
         if lyr.GetLayerDefn().GetFieldDefn(lyr.GetLayerDefn().GetFieldIndex('str')).GetWidth() != 0:
-            gdaltest.post_reason('fail')
             return 'fail'
         if lyr.GetLayerDefn().GetFieldDefn(lyr.GetLayerDefn().GetFieldIndex('smallint')).GetSubType() != ogr.OFSTInt16:
-            gdaltest.post_reason('fail')
             return 'fail'
         if lyr.GetLayerDefn().GetFieldDefn(lyr.GetLayerDefn().GetFieldIndex('float')).GetSubType() != ogr.OFSTFloat32:
-            gdaltest.post_reason('fail')
             return 'fail'
         if data[1] != ogr.wkbNone:
             if lyr.GetSpatialRef().IsSame(srs) != 1:
-                gdaltest.post_reason('fail')
                 print(lyr.GetSpatialRef())
                 return 'fail'
         feat = lyr.GetNextFeature()
@@ -324,7 +318,6 @@ def test_ogr_openfilegdb_1(filename='data/testopenfilegdb.gdb.zip', version10=Tr
             if geom:
                 geom = geom.ExportToWkt()
             if geom != expected_wkt and ogrtest.check_feature_geometry(feat, expected_wkt) == 1:
-                gdaltest.post_reason('fail')
                 feat.DumpReadable()
                 print(expected_wkt)
                 return 'fail'
@@ -339,22 +332,18 @@ def test_ogr_openfilegdb_1(filename='data/testopenfilegdb.gdb.zip', version10=Tr
            (version10 and feat.GetField('xml') != "<foo></foo>") or \
            feat.GetField('binary') != "00FF7F" or \
            feat.GetField('binary2') != "123456":
-            gdaltest.post_reason('fail')
             feat.DumpReadable()
             return 'fail'
 
         if version10:
             sql_lyr = ds.ExecuteSQL("GetLayerDefinition %s" % lyr.GetName())
             if sql_lyr is None:
-                gdaltest.post_reason('failure')
                 return 'fail'
             feat = sql_lyr.GetNextFeature()
             if feat is None:
-                gdaltest.post_reason('failure')
                 return 'fail'
             feat = sql_lyr.GetNextFeature()
             if feat is not None:
-                gdaltest.post_reason('failure')
                 return 'fail'
             lyr.ResetReading()
             lyr.TestCapability("foo")
@@ -362,23 +351,19 @@ def test_ogr_openfilegdb_1(filename='data/testopenfilegdb.gdb.zip', version10=Tr
 
             sql_lyr = ds.ExecuteSQL("GetLayerMetadata %s" % lyr.GetName())
             if sql_lyr is None:
-                gdaltest.post_reason('failure')
                 return 'fail'
             feat = sql_lyr.GetNextFeature()
             if feat is None:
-                gdaltest.post_reason('failure')
                 return 'fail'
             ds.ReleaseResultSet(sql_lyr)
 
     if version10:
         sql_lyr = ds.ExecuteSQL("GetLayerDefinition foo")
         if sql_lyr is not None:
-            gdaltest.post_reason('failure')
             return 'fail'
 
         sql_lyr = ds.ExecuteSQL("GetLayerMetadata foo")
         if sql_lyr is not None:
-            gdaltest.post_reason('failure')
             return 'fail'
 
     if version10:
@@ -395,7 +380,6 @@ def test_ogr_openfilegdb_1(filename='data/testopenfilegdb.gdb.zip', version10=Tr
                 expected_geom_type = ogr.wkbMultiPolygonZM
 
             if lyr.GetGeomType() != expected_geom_type:
-                gdaltest.post_reason('fail')
                 print(data)
                 print(lyr.GetGeomType())
                 return 'fail'
@@ -406,12 +390,10 @@ def test_ogr_openfilegdb_1(filename='data/testopenfilegdb.gdb.zip', version10=Tr
                 expected_wkt = data[2]
             if expected_wkt is None:
                 if feat.GetGeometryRef() is not None:
-                    gdaltest.post_reason('fail')
                     print(data)
                     feat.DumpReadable()
                     return 'fail'
             elif ogrtest.check_feature_geometry(feat, expected_wkt) != 0:
-                gdaltest.post_reason('fail')
                 print(data)
                 feat.DumpReadable()
                 return 'fail'
@@ -462,25 +444,20 @@ def test_ogr_openfilegdb_3():
 
     ds = ogr.Open('/vsizip/data/testopenfilegdb.gdb.zip/testopenfilegdb.gdb/a00000009.gdbtable')
     if ds.GetLayerCount() != 1:
-        gdaltest.post_reason('fail')
         return 'fail'
     lyr = ds.GetLayer(0)
     if lyr.GetName() != 'none':
-        gdaltest.post_reason('fail')
         return 'fail'
 
     # Try opening a system table
     lyr = ds.GetLayerByName('GDB_SystemCatalog')
     if lyr.GetName() != 'GDB_SystemCatalog':
-        gdaltest.post_reason('fail')
         return 'fail'
     feat = lyr.GetNextFeature()
     if feat.GetField('Name') != 'GDB_SystemCatalog':
-        gdaltest.post_reason('fail')
         return 'fail'
     lyr = ds.GetLayerByName('GDB_SystemCatalog')
     if lyr.GetName() != 'GDB_SystemCatalog':
-        gdaltest.post_reason('fail')
         return 'fail'
 
     ds = None
@@ -614,23 +591,19 @@ def test_ogr_openfilegdb_4():
         if attr_index_use != expected_attr_index_use:
             print(where_clause, fids, expected_attr_index_use)
             print(attr_index_use)
-            gdaltest.post_reason('fail')
             return 'fail'
         if lyr.GetFeatureCount() != len(fids):
             print(where_clause, fids)
             print(lyr.GetFeatureCount())
-            gdaltest.post_reason('fail')
             return 'fail'
         for fid in fids:
             feat = lyr.GetNextFeature()
             if feat.GetFID() != fid:
                 print(where_clause, fids)
-                gdaltest.post_reason('fail')
                 return 'fail'
         feat = lyr.GetNextFeature()
         if feat is not None:
             print(where_clause, fids)
-            gdaltest.post_reason('fail')
             return 'fail'
 
     lyr = ds.GetLayerByName('none')
@@ -656,23 +629,19 @@ def test_ogr_openfilegdb_4():
         if attr_index_use != expected_attr_index_use:
             print(where_clause, fids, expected_attr_index_use)
             print(attr_index_use)
-            gdaltest.post_reason('fail')
             return 'fail'
         if lyr.GetFeatureCount() != len(fids):
             print(where_clause, fids)
             print(lyr.GetFeatureCount())
-            gdaltest.post_reason('fail')
             return 'fail'
         for fid in fids:
             feat = lyr.GetNextFeature()
             if feat.GetFID() != fid:
                 print(where_clause, fids)
-                gdaltest.post_reason('fail')
                 return 'fail'
         feat = lyr.GetNextFeature()
         if feat is not None:
             print(where_clause, fids)
-            gdaltest.post_reason('fail')
             return 'fail'
 
     lyr = ds.GetLayerByName('big_layer')
@@ -691,7 +660,6 @@ def test_ogr_openfilegdb_4():
         if lyr.GetFeatureCount() != count:
             print(where_clause, count)
             print(lyr.GetFeatureCount())
-            gdaltest.post_reason('fail')
             return 'fail'
         for i in range(count):
             feat = lyr.GetNextFeature()
@@ -699,12 +667,10 @@ def test_ogr_openfilegdb_4():
                (start is not None and
                     feat.GetFID() != i * 4 + start):
                 print(where_clause, count)
-                gdaltest.post_reason('fail')
                 return 'fail'
         feat = lyr.GetNextFeature()
         if feat is not None:
             print(where_clause, count)
-            gdaltest.post_reason('fail')
             return 'fail'
 
     ds = None
@@ -731,7 +697,6 @@ def test_ogr_openfilegdb_5():
 
     ds = ogr.Open('tmp/testopenfilegdb.gdb')
     if ds is None:
-        gdaltest.post_reason('fail')
         return 'fail'
 
     return 'success'
@@ -825,25 +790,21 @@ def test_ogr_openfilegdb_7():
             if sql_lyr is not None:
                 ds.ReleaseResultSet(sql_lyr)
                 print(sql, feat_count, first_fid)
-                gdaltest.post_reason('fail')
                 return 'fail'
             continue
         if sql_lyr is None:
             print(sql, feat_count, first_fid)
-            gdaltest.post_reason('fail')
             return 'fail'
         if expected_optimized:
             if sql_lyr.GetFeatureCount() != feat_count:
                 print(sql, feat_count, first_fid)
                 ds.ReleaseResultSet(sql_lyr)
-                gdaltest.post_reason('fail')
                 return 'fail'
             feat = sql_lyr.GetNextFeature()
             if feat.GetFID() != first_fid:
                 print(sql, feat_count, first_fid)
                 ds.ReleaseResultSet(sql_lyr)
                 feat.DumpReadable()
-                gdaltest.post_reason('fail')
                 return 'fail'
         ds.ReleaseResultSet(sql_lyr)
 
@@ -852,7 +813,6 @@ def test_ogr_openfilegdb_7():
         ds.ReleaseResultSet(sql_lyr)
         if optimized != expected_optimized:
             print(sql, feat_count, first_fid)
-            gdaltest.post_reason('fail')
             return 'fail'
 
         if optimized and sql.find('big_layer') < 0:
@@ -862,7 +822,6 @@ def test_ogr_openfilegdb_7():
                 if ret.find('INFO') == -1 or ret.find('ERROR') != -1:
                     print(sql, feat_count, first_fid)
                     print(ret)
-                    gdaltest.post_reason('fail')
                     return 'fail'
 
     return 'success'
@@ -1122,25 +1081,19 @@ def test_ogr_openfilegdb_11():
     ds = ogr.Open('data/testopenfilegdb.gdb.zip')
     lyr = ds.GetLayerByName('several_polygons')
     if get_spi_state(ds, lyr) != SPI_IN_BUILDING:
-        gdaltest.post_reason('failure')
         return 'fail'
     lyr.ResetReading()
     if get_spi_state(ds, lyr) != SPI_IN_BUILDING:
-        gdaltest.post_reason('failure')
         return 'fail'
     if lyr.TestCapability(ogr.OLCFastFeatureCount) != 1:
-        gdaltest.post_reason('failure')
         return 'fail'
     lyr.SetSpatialFilterRect(0.25, 0.25, 0.5, 0.5)
     if lyr.GetFeatureCount() != 1:
-        gdaltest.post_reason('failure')
         return 'fail'
     if get_spi_state(ds, lyr) != SPI_COMPLETED:
-        gdaltest.post_reason('failure')
         return 'fail'
     # Should return cached value
     if lyr.GetFeatureCount() != 1:
-        gdaltest.post_reason('failure')
         return 'fail'
     # Should use index
     c = 0
@@ -1149,7 +1102,6 @@ def test_ogr_openfilegdb_11():
         c = c + 1
         feat = lyr.GetNextFeature()
     if c != 1:
-        gdaltest.post_reason('failure')
         return 'fail'
     feat = None
     lyr = None
@@ -1162,16 +1114,13 @@ def test_ogr_openfilegdb_11():
     c = 0
     feat = lyr.GetNextFeature()
     if get_spi_state(ds, lyr) != SPI_IN_BUILDING:
-        gdaltest.post_reason('failure')
         return 'fail'
     while feat is not None:
         c = c + 1
         feat = lyr.GetNextFeature()
     if c != 1:
-        gdaltest.post_reason('failure')
         return 'fail'
     if get_spi_state(ds, lyr) != SPI_COMPLETED:
-        gdaltest.post_reason('failure')
         return 'fail'
     feat = None
     lyr = None
@@ -1188,7 +1137,6 @@ def test_ogr_openfilegdb_11():
     lyr = ds.GetLayerByName('multipolygon')
     lyr.SetSpatialFilterRect(1.4, 0.4, 1.6, 0.6)
     if lyr.GetFeatureCount() != expected_count:
-        gdaltest.post_reason('failure')
         return 'fail'
     lyr = None
     ds = None
@@ -1204,10 +1152,8 @@ def test_ogr_openfilegdb_11():
         c = c + 1
         feat = lyr.GetNextFeature()
     if c != expected_count:
-        gdaltest.post_reason('failure')
         return 'fail'
     if lyr.GetFeatureCount() != expected_count:
-        gdaltest.post_reason('failure')
         return 'fail'
     feat = None
     lyr = None
@@ -1220,13 +1166,11 @@ def test_ogr_openfilegdb_11():
     feat = lyr.GetFeature(1)
     feat = lyr.GetFeature(1)
     if get_spi_state(ds, lyr) != SPI_IN_BUILDING:
-        gdaltest.post_reason('failure')
         return 'fail'
     feat = lyr.GetNextFeature()
     while feat is not None:
         feat = lyr.GetNextFeature()
     if get_spi_state(ds, lyr) != SPI_COMPLETED:
-        gdaltest.post_reason('failure')
         return 'fail'
     lyr.ResetReading()
     c = 0
@@ -1235,33 +1179,25 @@ def test_ogr_openfilegdb_11():
         c = c + 1
         feat = lyr.GetNextFeature()
     if c != 1:
-        gdaltest.post_reason('failure')
         return 'fail'
     if get_spi_state(ds, lyr) != SPI_COMPLETED:
-        gdaltest.post_reason('failure')
         return 'fail'
 
     # This will create an array of filtered features
     lyr.SetSpatialFilterRect(0.25, 0.25, 0.5, 0.5)
     if lyr.TestCapability(ogr.OLCFastSetNextByIndex) != 1:
-        gdaltest.post_reason('failure')
         return 'fail'
     # Test SetNextByIndex() with filtered features
     if lyr.SetNextByIndex(-1) == 0:
-        gdaltest.post_reason('failure')
         return 'fail'
     if lyr.SetNextByIndex(1) == 0:
-        gdaltest.post_reason('failure')
         return 'fail'
     if lyr.SetNextByIndex(0) != 0:
-        gdaltest.post_reason('failure')
         return 'fail'
     feat = lyr.GetNextFeature()
     if feat.GetFID() != 1:
-        gdaltest.post_reason('failure')
         return 'fail'
     if get_spi_state(ds, lyr) != SPI_COMPLETED:
-        gdaltest.post_reason('failure')
         return 'fail'
 
     feat = None
@@ -1273,7 +1209,6 @@ def test_ogr_openfilegdb_11():
     lyr = ds.GetLayerByName('multipolygon')
     lyr.SetNextByIndex(3)
     if get_spi_state(ds, lyr) != SPI_INVALID:
-        gdaltest.post_reason('failure')
         return 'fail'
     feat = None
     lyr = None
@@ -1285,7 +1220,6 @@ def test_ogr_openfilegdb_11():
     feat = lyr.GetNextFeature()
     lyr.ResetReading()
     if get_spi_state(ds, lyr) != SPI_INVALID:
-        gdaltest.post_reason('failure')
         return 'fail'
     feat = None
     lyr = None
@@ -1296,7 +1230,6 @@ def test_ogr_openfilegdb_11():
     lyr = ds.GetLayerByName('point')
     lyr.SetAttributeFilter('id = 1')
     if get_spi_state(ds, lyr) != SPI_INVALID:
-        gdaltest.post_reason('failure')
         return 'fail'
     feat = None
     lyr = None
@@ -1316,7 +1249,6 @@ def test_ogr_openfilegdb_12():
     sr.ImportFromEPSG(3005)
     expected_wkt = sr.ExportToWkt()
     if got_wkt != expected_wkt:
-        gdaltest.post_reason('fail')
         print(got_wkt)
         print(expected_wkt)
         return 'fail'
@@ -1333,18 +1265,14 @@ def test_ogr_openfilegdb_13():
     ds = ogr.Open('/vsizip/data/ESSENCE_NAIPF_ORI_PROV_sub93.gdb.zip')
     lyr = ds.GetLayer(0)
     if lyr.GetName() != 'DDE_ESSEN_NAIPF_ORI_VUE':
-        gdaltest.post_reason('fail')
         return 'fail'
     if lyr.GetSpatialRef() is not None:
-        gdaltest.post_reason('fail')
         return 'fail'
     if lyr.GetGeomType() != ogr.wkbNone:
-        gdaltest.post_reason('fail')
         return 'fail'
     f = lyr.GetNextFeature()
     if f.GetField('GEOCODE') != '-673985,22+745574,77':
         f.DumpReadable()
-        gdaltest.post_reason('fail')
         return 'fail'
     ds = None
 
@@ -1359,13 +1287,10 @@ def test_ogr_openfilegdb_14():
     ds = ogr.Open('data/testopenfilegdb.gdb.zip')
     lyr = ds.GetLayerByName('testnotnullable')
     if lyr.GetLayerDefn().GetFieldDefn(lyr.GetLayerDefn().GetFieldIndex('field_not_nullable')).IsNullable() != 0:
-        gdaltest.post_reason('fail')
         return 'fail'
     if lyr.GetLayerDefn().GetFieldDefn(lyr.GetLayerDefn().GetFieldIndex('field_nullable')).IsNullable() != 1:
-        gdaltest.post_reason('fail')
         return 'fail'
     if lyr.GetLayerDefn().GetGeomFieldDefn(0).IsNullable() != 0:
-        gdaltest.post_reason('fail')
         return 'fail'
     ds = None
 
@@ -1380,25 +1305,18 @@ def test_ogr_openfilegdb_15():
     ds = ogr.Open('data/test_default_val.gdb.zip')
     lyr = ds.GetLayer(0)
     if lyr.GetLayerDefn().GetFieldDefn(lyr.GetLayerDefn().GetFieldIndex('STR')).GetDefault() != "'default_val'":
-        gdaltest.post_reason('fail')
         return 'fail'
     if lyr.GetLayerDefn().GetFieldDefn(lyr.GetLayerDefn().GetFieldIndex('STR')).GetWidth() != 50:
-        gdaltest.post_reason('fail')
         return 'fail'
     if lyr.GetLayerDefn().GetFieldDefn(lyr.GetLayerDefn().GetFieldIndex('INT32')).GetDefault() != "123456788":
-        gdaltest.post_reason('fail')
         return 'fail'
     if lyr.GetLayerDefn().GetFieldDefn(lyr.GetLayerDefn().GetFieldIndex('INT16')).GetDefault() != "12345":
-        gdaltest.post_reason('fail')
         return 'fail'
     if lyr.GetLayerDefn().GetFieldDefn(lyr.GetLayerDefn().GetFieldIndex('FLOAT32')).GetDefault().find('1.23') != 0:
-        gdaltest.post_reason('fail')
         return 'fail'
     if lyr.GetLayerDefn().GetFieldDefn(lyr.GetLayerDefn().GetFieldIndex('FLOAT64')).GetDefault().find('1.23456') != 0:
-        gdaltest.post_reason('fail')
         return 'fail'
     if lyr.GetLayerDefn().GetFieldDefn(lyr.GetLayerDefn().GetFieldIndex('DATETIME')).GetDefault() != "'2015/06/30 12:34:56'":
-        gdaltest.post_reason('fail')
         return 'fail'
     return 'success'
 
@@ -1413,28 +1331,23 @@ def test_ogr_openfilegdb_16():
     for fid in [2, 3, 4, 7, 8, 9, 10, 2049, 8191, 16384, 10000000, 10000001]:
         f = lyr.GetNextFeature()
         if f.GetFID() != fid:
-            gdaltest.post_reason('fail')
             print(f.GetFID())
             print(fid)
             return 'fail'
 
     f = lyr.GetFeature(100000)
     if f is not None:
-        gdaltest.post_reason('fail')
         return 'fail'
 
     f = lyr.GetFeature(10000000 - 1)
     if f is not None:
-        gdaltest.post_reason('fail')
         return 'fail'
     f = lyr.GetNextFeature()
     if f is not None:
-        gdaltest.post_reason('fail')
         return 'fail'
 
     f = lyr.GetFeature(16384)
     if f is None:
-        gdaltest.post_reason('fail')
         return 'fail'
 
     return 'success'
@@ -1449,7 +1362,6 @@ def test_ogr_openfilegdb_17():
     lyr = ds.GetLayer(0)
     f = lyr.GetNextFeature()
     if f.GetGeometryRef() is None:
-        gdaltest.post_reason('fail')
         return 'fail'
 
     return 'success'
@@ -1467,7 +1379,6 @@ def test_ogr_openfilegdb_18():
     for f in lyr:
         f_ref = lyr_ref.GetNextFeature()
         if ogrtest.check_feature_geometry(f, f_ref.GetGeometryRef()) != 0:
-            gdaltest.post_reason('fail')
             print(f.GetGeometryRef().ExportToWkt())
             print(f_ref.GetGeometryRef().ExportToWkt())
             return 'fail'
@@ -1478,7 +1389,6 @@ def test_ogr_openfilegdb_18():
     for f in lyr:
         f_ref = lyr_ref.GetNextFeature()
         if ogrtest.check_feature_geometry(f, f_ref.GetGeometryRef()) != 0:
-            gdaltest.post_reason('fail')
             print(f.GetGeometryRef().ExportToWkt())
             print(f_ref.GetGeometryRef().ExportToWkt())
             return 'fail'
@@ -1490,7 +1400,6 @@ def test_ogr_openfilegdb_18():
     for f in lyr:
         f_ref = lyr_ref.GetNextFeature()
         if ogrtest.check_feature_geometry(f, f_ref.GetGeometryRef()) != 0:
-            gdaltest.post_reason('fail')
             print(f.GetGeometryRef().ExportToWkt())
             print(f_ref.GetGeometryRef().ExportToWkt())
             return 'fail'
@@ -1525,7 +1434,6 @@ def test_ogr_openfilegdb_20():
     for f in lyr:
         f_ref = lyr_ref.GetNextFeature()
         if ogrtest.check_feature_geometry(f, f_ref.GetGeometryRef()) != 0:
-            gdaltest.post_reason('fail')
             print(f.GetGeometryRef().ExportToIsoWkt())
             print(f_ref.GetGeometryRef().ExportToIsoWkt())
             return 'fail'
@@ -1537,7 +1445,6 @@ def test_ogr_openfilegdb_20():
     for f in lyr:
         f_ref = lyr_ref.GetNextFeature()
         if ogrtest.check_feature_geometry(f, f_ref.GetGeometryRef()) != 0:
-            gdaltest.post_reason('fail')
             print(f.GetGeometryRef().ExportToIsoWkt())
             print(f_ref.GetGeometryRef().ExportToIsoWkt())
             return 'fail'
@@ -1553,16 +1460,13 @@ def test_ogr_openfilegdb_21():
     ds = ogr.Open('data/curves.gdb')
     sql_lyr = ds.ExecuteSQL('SELECT OBJECTID FROM polygon WHERE OBJECTID = 2')
     if sql_lyr is None:
-        gdaltest.post_reason('fail')
         return 'fail'
     f = sql_lyr.GetNextFeature()
     if f.GetFID() != 2:
-        gdaltest.post_reason('fail')
         f.DumpReadable()
         return 'fail'
     f = sql_lyr.GetNextFeature()
     if f is not None:
-        gdaltest.post_reason('fail')
         return 'fail'
     ds.ReleaseResultSet(sql_lyr)
 
@@ -1570,7 +1474,6 @@ def test_ogr_openfilegdb_21():
     lyr.SetAttributeFilter('OBJECTID = 2')
     f = lyr.GetNextFeature()
     if f.GetFID() != 2:
-        gdaltest.post_reason('fail')
         f.DumpReadable()
         return 'fail'
 
diff --git a/autotest/ogr/ogr_osm.py b/autotest/ogr/ogr_osm.py
index 5988dd15f5a7..767c0c8c36c0 100755
--- a/autotest/ogr/ogr_osm.py
+++ b/autotest/ogr/ogr_osm.py
@@ -55,7 +55,6 @@ def test_ogr_osm_1(filename='data/test.pbf'):
             if gdal.GetLastErrorMsg().find('OSM XML detected, but Expat parser not available') == 0:
                 return 'skip'
 
-        gdaltest.post_reason('fail')
         return 'fail'
     else:
         if filename == 'data/test.osm':
@@ -64,19 +63,16 @@ def test_ogr_osm_1(filename='data/test.pbf'):
     # Test points
     lyr = ds.GetLayer('points')
     if lyr.GetGeomType() != ogr.wkbPoint:
-        gdaltest.post_reason('fail')
         return 'fail'
 
     sr = lyr.GetSpatialRef()
     if sr.ExportToWkt().find('GEOGCS["WGS 84",DATUM["WGS_1984",') != 0 and \
        sr.ExportToWkt().find('GEOGCS["GCS_WGS_1984",DATUM["WGS_1984"') != 0:
-        gdaltest.post_reason('fail')
         print(sr.ExportToWkt())
         return 'fail'
 
     if filename == 'data/test.osm':
         if lyr.GetExtent() != (2.0, 3.0, 49.0, 50.0):
-            gdaltest.post_reason('fail')
             print(lyr.GetExtent())
             return 'fail'
 
@@ -84,25 +80,21 @@ def test_ogr_osm_1(filename='data/test.pbf'):
     if feat.GetFieldAsString('osm_id') != '3' or \
        feat.GetFieldAsString('name') != 'Some interesting point' or \
        feat.GetFieldAsString('other_tags') != '"foo"=>"bar","bar"=>"baz"':
-        gdaltest.post_reason('fail')
         feat.DumpReadable()
         return 'fail'
 
     if ogrtest.check_feature_geometry(feat, ogr.CreateGeometryFromWkt('POINT (3.0 49.5)')) != 0:
-        gdaltest.post_reason('fail')
         feat.DumpReadable()
         return 'fail'
 
     feat = lyr.GetNextFeature()
     if feat is not None:
-        gdaltest.post_reason('fail')
         feat.DumpReadable()
         return 'fail'
 
     # Test lines
     lyr = ds.GetLayer('lines')
     if lyr.GetGeomType() != ogr.wkbLineString:
-        gdaltest.post_reason('fail')
         return 'fail'
 
     feat = lyr.GetNextFeature()
@@ -110,29 +102,24 @@ def test_ogr_osm_1(filename='data/test.pbf'):
        feat.GetFieldAsString('highway') != 'motorway' or \
        feat.GetFieldAsInteger('z_order') != 9 or \
        feat.GetFieldAsString('other_tags') != '"foo"=>"bar"':
-        gdaltest.post_reason('fail')
         feat.DumpReadable()
         return 'fail'
 
     if ogrtest.check_feature_geometry(feat, ogr.CreateGeometryFromWkt('LINESTRING (2 49,3 50)')) != 0:
-        gdaltest.post_reason('fail')
         feat.DumpReadable()
         return 'fail'
 
     feat = lyr.GetNextFeature()
     if feat.GetFieldAsString('osm_id') != '6':
-        gdaltest.post_reason('fail')
         feat.DumpReadable()
         return 'fail'
 
     if ogrtest.check_feature_geometry(feat, ogr.CreateGeometryFromWkt('LINESTRING (2 49,3 49,3 50,2 50,2 49)')) != 0:
-        gdaltest.post_reason('fail')
         feat.DumpReadable()
         return 'fail'
 
     feat = lyr.GetNextFeature()
     if feat is not None:
-        gdaltest.post_reason('fail')
         feat.DumpReadable()
         return 'fail'
 
@@ -140,29 +127,24 @@ def test_ogr_osm_1(filename='data/test.pbf'):
     lyr = ds.GetLayer('multipolygons')
     if filename == 'tmp/ogr_osm_3':
         if lyr.GetGeomType() != ogr.wkbPolygon:
-            gdaltest.post_reason('fail')
             return 'fail'
     else:
         if lyr.GetGeomType() != ogr.wkbMultiPolygon:
-            gdaltest.post_reason('fail')
             return 'fail'
 
     feat = lyr.GetNextFeature()
     if feat.GetFieldAsString('osm_id') != '1' or \
        feat.GetFieldAsString('type') != 'multipolygon' or \
        feat.GetFieldAsString('natural') != 'forest':
-        gdaltest.post_reason('fail')
         feat.DumpReadable()
         return 'fail'
 
     if filename == 'tmp/ogr_osm_3':
         if ogrtest.check_feature_geometry(feat, ogr.CreateGeometryFromWkt('POLYGON ((2 49,2 50,3 50,3 49,2 49),(2.1 49.1,2.2 49.1,2.2 49.2,2.1 49.2,2.1 49.1))')) != 0:
-            gdaltest.post_reason('fail')
             feat.DumpReadable()
             return 'fail'
     else:
         if ogrtest.check_feature_geometry(feat, ogr.CreateGeometryFromWkt('MULTIPOLYGON (((2 49,3 49,3 50,2 50,2 49),(2.1 49.1,2.2 49.1,2.2 49.2,2.1 49.2,2.1 49.1)))')) != 0:
-            gdaltest.post_reason('fail')
             feat.DumpReadable()
             return 'fail'
 
@@ -170,20 +152,17 @@ def test_ogr_osm_1(filename='data/test.pbf'):
     if feat.GetFieldAsString('osm_id') != '5' or \
        feat.GetFieldAsString('type') != 'multipolygon' or \
        feat.GetFieldAsString('natural') != 'wood':
-        gdaltest.post_reason('fail')
         feat.DumpReadable()
         return 'fail'
 
     feat = lyr.GetNextFeature()
     if feat.GetFieldAsString('osm_way_id') != '8' or \
        feat.GetFieldAsString('name') != 'standalone_polygon':
-        gdaltest.post_reason('fail')
         feat.DumpReadable()
         return 'fail'
 
     feat = lyr.GetNextFeature()
     if feat is not None:
-        gdaltest.post_reason('fail')
         feat.DumpReadable()
         return 'fail'
 
@@ -191,34 +170,28 @@ def test_ogr_osm_1(filename='data/test.pbf'):
     lyr = ds.GetLayer('multilinestrings')
     if filename == 'tmp/ogr_osm_3':
         if lyr.GetGeomType() != ogr.wkbLineString:
-            gdaltest.post_reason('fail')
             return 'fail'
     else:
         if lyr.GetGeomType() != ogr.wkbMultiLineString:
-            gdaltest.post_reason('fail')
             return 'fail'
 
     feat = lyr.GetNextFeature()
     if feat.GetFieldAsString('osm_id') != '3' or \
        feat.GetFieldAsString('type') != 'route':
-        gdaltest.post_reason('fail')
         feat.DumpReadable()
         return 'fail'
 
     if filename == 'tmp/ogr_osm_3':
         if ogrtest.check_feature_geometry(feat, ogr.CreateGeometryFromWkt('LINESTRING (2 49,3 50)')) != 0:
-            gdaltest.post_reason('fail')
             feat.DumpReadable()
             return 'fail'
     else:
         if ogrtest.check_feature_geometry(feat, ogr.CreateGeometryFromWkt('MULTILINESTRING ((2 49,3 50))')) != 0:
-            gdaltest.post_reason('fail')
             feat.DumpReadable()
             return 'fail'
 
     feat = lyr.GetNextFeature()
     if feat is not None:
-        gdaltest.post_reason('fail')
         feat.DumpReadable()
         return 'fail'
 
@@ -226,48 +199,39 @@ def test_ogr_osm_1(filename='data/test.pbf'):
     lyr = ds.GetLayer('other_relations')
     if filename == 'tmp/ogr_osm_3':
         if lyr is not None:
-            gdaltest.post_reason('fail')
             return 'fail'
     else:
         if lyr.GetGeomType() != ogr.wkbGeometryCollection:
-            gdaltest.post_reason('fail')
             return 'fail'
 
         feat = lyr.GetNextFeature()
         if feat.GetFieldAsString('osm_id') != '4' or \
            feat.GetFieldAsString('type') != 'other_type':
-            gdaltest.post_reason('fail')
             feat.DumpReadable()
             return 'fail'
 
         if ogrtest.check_feature_geometry(feat, ogr.CreateGeometryFromWkt('GEOMETRYCOLLECTION (POINT (2 49),LINESTRING (2 49,3 50))')) != 0:
-            gdaltest.post_reason('fail')
             feat.DumpReadable()
             return 'fail'
 
         feat = lyr.GetNextFeature()
         if feat is not None:
-            gdaltest.post_reason('fail')
             feat.DumpReadable()
             return 'fail'
 
     if ds.GetDriver().GetName() == 'OSM':
         sql_lyr = ds.ExecuteSQL("GetBytesRead()")
         if sql_lyr is None:
-            gdaltest.post_reason('fail')
             return 'fail'
         feat = sql_lyr.GetNextFeature()
         if feat is None:
-            gdaltest.post_reason('fail')
             return 'fail'
         feat = sql_lyr.GetNextFeature()
         if feat is not None:
-            gdaltest.post_reason('fail')
             return 'fail'
         sql_lyr.ResetReading()
         feat = sql_lyr.GetNextFeature()
         if feat is None:
-            gdaltest.post_reason('fail')
             return 'fail'
         sql_lyr.GetLayerDefn()
         sql_lyr.TestCapability("foo")
@@ -352,7 +316,6 @@ def test_ogr_osm_4():
 
     ds = ogr.Open('data/test.pbf')
     if ds is None:
-        gdaltest.post_reason('fail')
         return 'fail'
 
     sql_lyr = ds.ExecuteSQL('SELECT * FROM points')
@@ -363,7 +326,6 @@ def test_ogr_osm_4():
     ds.ReleaseResultSet(sql_lyr)
 
     if is_none:
-        gdaltest.post_reason('fail')
         return 'fail'
 
     # Test spatial filter
@@ -388,7 +350,6 @@ def test_ogr_osm_4():
         ds.ReleaseResultSet(sql_lyr)
 
     if is_none:
-        gdaltest.post_reason('fail')
         return 'fail'
 
     # Change layer
@@ -400,7 +361,6 @@ def test_ogr_osm_4():
     ds.ReleaseResultSet(sql_lyr)
 
     if is_none:
-        gdaltest.post_reason('fail')
         return 'fail'
 
     return 'success'
@@ -416,7 +376,6 @@ def test_ogr_osm_5():
 
     ds = ogr.Open('data/test.pbf')
     if ds is None:
-        gdaltest.post_reason('fail')
         return 'fail'
 
     tests = [['points', '3', True],
@@ -436,7 +395,6 @@ def test_ogr_osm_5():
         ds.ReleaseResultSet(sql_lyr)
 
         if not (test[2] ^ is_none):  # pylint: disable=superfluous-parens
-            gdaltest.post_reason('fail')
             print(test)
             return 'fail'
 
@@ -447,7 +405,6 @@ def test_ogr_osm_5():
     ds.ReleaseResultSet(sql_lyr)
 
     if is_none:
-        gdaltest.post_reason('fail')
         print(test)
         return 'fail'
 
@@ -482,7 +439,6 @@ def test_ogr_osm_6():
     ogr.GetDriverByName('ESRI Shapefile').DeleteDataSource('tmp/ogr_osm_6')
 
     if count != 3:
-        gdaltest.post_reason('fail')
         print(count)
         return 'fail'
 
@@ -500,7 +456,6 @@ def test_ogr_osm_7():
 
     ds = ogr.Open('data/test.pbf')
     if ds is None:
-        gdaltest.post_reason('fail')
         return 'fail'
 
     sql_lyr = ds.ExecuteSQL('SELECT * FROM points LIMIT 10', dialect='SQLite')
@@ -510,7 +465,6 @@ def test_ogr_osm_7():
     ds.ReleaseResultSet(sql_lyr)
 
     if count != 1:
-        gdaltest.post_reason('fail')
         return 'fail'
 
     return 'success'
@@ -526,7 +480,6 @@ def test_ogr_osm_8():
 
     ds = ogr.Open('data/base-64.osm.pbf')
     if ds is None:
-        gdaltest.post_reason('fail')
         return 'fail'
 
     lyr = ds.GetLayerByName('points')
@@ -535,7 +488,6 @@ def test_ogr_osm_8():
 
     if feat.GetField('name') != 'Treetops' or \
        ogrtest.check_feature_geometry(feat, ogr.CreateGeometryFromWkt('POINT (-61.7964321 17.1498319)')) != 0:
-        gdaltest.post_reason('fail')
         feat.DumpReadable()
         return 'fail'
 
@@ -543,7 +495,6 @@ def test_ogr_osm_8():
     feat = lyr.GetFeature(1113)
 
     if ogrtest.check_feature_geometry(feat, ogr.CreateGeometryFromWkt('MULTIPOLYGON (((-61.7780345 17.140634,-61.7777002 17.1406069,-61.7776854 17.1407739,-61.7779131 17.1407923,-61.7779158 17.1407624,-61.7780224 17.140771,-61.7780345 17.140634)))')) != 0:
-        gdaltest.post_reason('fail')
         feat.DumpReadable()
         return 'fail'
 
@@ -577,7 +528,6 @@ def test_ogr_osm_10():
     # A file that does not exist.
     ds = ogr.Open('/nonexistent/foo.osm')
     if ds is not None:
-        gdaltest.post_reason('fail')
         return 'fail'
 
     # Empty .osm file
@@ -586,7 +536,6 @@ def test_ogr_osm_10():
 
     ds = ogr.Open('/vsimem/foo.osm')
     if ds is not None:
-        gdaltest.post_reason('fail')
         return 'fail'
 
     gdal.Unlink('/vsimem/foo.osm')
@@ -597,7 +546,6 @@ def test_ogr_osm_10():
 
     ds = ogr.Open('/vsimem/foo.pbf')
     if ds is not None:
-        gdaltest.post_reason('fail')
         return 'fail'
 
     gdal.Unlink('/vsimem/foo.pbf')
@@ -616,7 +564,6 @@ def test_ogr_osm_10():
         feat = lyr.GetNextFeature()
         gdal.PopErrorHandler()
         if gdal.GetLastErrorMsg() == '':
-            gdaltest.post_reason('fail')
             return 'fail'
         ds = None
 
@@ -635,7 +582,6 @@ def test_ogr_osm_10():
     feat = lyr.GetNextFeature()
     gdal.PopErrorHandler()
     if gdal.GetLastErrorMsg() == '':
-        gdaltest.post_reason('fail')
         return 'fail'
     ds = None
 
@@ -650,7 +596,6 @@ def test_ogr_osm_10():
         feat = lyr.GetNextFeature()
         gdal.PopErrorHandler()
         if feat is not None or gdal.GetLastErrorMsg() == '':
-            gdaltest.post_reason('fail')
             return 'fail'
 
     return 'success'
@@ -672,14 +617,12 @@ def test_ogr_osm_11():
     if feat.GetFieldAsString('osm_id') != '3' or \
        feat.GetFieldAsString('name') != 'Some interesting point' or \
        feat.GetFieldAsString('all_tags') != '"name"=>"Some interesting point","foo"=>"bar","bar"=>"baz"':
-        gdaltest.post_reason('fail')
         feat.DumpReadable()
         return 'fail'
 
     lyr = ds.GetLayerByName('lines')
     feat = lyr.GetNextFeature()
     if feat.GetField('z_order') != 9:
-        gdaltest.post_reason('fail')
         feat.DumpReadable()
         return 'fail'
 
@@ -747,7 +690,6 @@ def test_ogr_osm_13():
     lyr = ds.GetLayer(0)
     f = lyr.GetNextFeature()
     if f['osm_id'] != '123' or f['other_tags'] != '"osm_id"=>"0"':
-        gdaltest.post_reason('fail')
         f.DumpReadable()
         return 'fail'
     ds = None
@@ -792,7 +734,6 @@ def test_ogr_osm_14():
     sql_lyr = ds.ExecuteSQL('SELECT * FROM other_relations')
     f = sql_lyr.GetNextFeature()
     if f.GetGeometryRef().ExportToWkt() != 'GEOMETRYCOLLECTION (POLYGON ((49 2,49.0 2.1,49.1 2.1,49 2)))':
-        gdaltest.post_reason('fail')
         f.DumpReadable()
         return 'fail'
     ds.ReleaseResultSet(sql_lyr)
@@ -825,7 +766,6 @@ def test_ogr_osm_15():
     ds = gdal.OpenEx('data/test.pbf')
 
     if ds.TestCapability(ogr.ODsCRandomLayerRead) != 1:
-        gdaltest.post_reason('fail')
         return 'fail'
 
     count = 0
@@ -833,37 +773,31 @@ def test_ogr_osm_15():
     while True:
         f, l, pct = ds.GetNextFeature(include_pct=True)
         if pct < last_pct:
-            gdaltest.post_reason('fail')
             print(last_pct)
             print(pct)
             return 'fail'
         last_pct = pct
         if f is None:
             if l is not None:
-                gdaltest.post_reason('fail')
                 return 'fail'
             break
         # f.DumpReadable()
         count += 1
         if f.GetDefnRef().GetName() != l.GetName():
-            gdaltest.post_reason('fail')
             f.DumpReadable()
             print(l.GetName())
             return 'fail'
 
     if count != 8:
-        gdaltest.post_reason('fail')
         print(count)
         return 'fail'
 
     if last_pct != 1.0:
-        gdaltest.post_reason('fail')
         print(last_pct)
         return 'fail'
 
     f, l, pct = ds.GetNextFeature(include_pct=True)
     if f is not None or l is not None or pct != 1.0:
-        gdaltest.post_reason('fail')
         return 'fail'
 
     ds.ResetReading()
@@ -871,24 +805,20 @@ def test_ogr_osm_15():
         f, lyr = ds.GetNextFeature()
         # f.DumpReadable()
         if f is None or lyr is None:
-            gdaltest.post_reason('fail')
             print(i)
             return 'fail'
 
     ds.ResetReading()
     f, lyr = ds.GetNextFeature(callback=ogr_osm_15_progresscbk_return_false)
     if f is not None or lyr is not None:
-        gdaltest.post_reason('fail')
         return 'fail'
 
     ds.ResetReading()
     pct_array = [0]
     f, lyr = ds.GetNextFeature(callback=ogr_osm_15_progresscbk_return_true, callback_data=pct_array)
     if f is None or lyr is None:
-        gdaltest.post_reason('fail')
         return 'fail'
     if pct_array[0] != 1.0:
-        gdaltest.post_reason('fail')
         print(pct_array)
         return 'fail'
 
@@ -932,7 +862,6 @@ def test_ogr_osm_16():
     lyr = ds.GetLayerByName('points')
     f = lyr.GetNextFeature()
     if f['foo_baar'] != 'val' or f['foo_bar'] != 'val2':
-        gdaltest.post_reason('fail')
         f.DumpReadable()
         return 'fail'
     ds = None
@@ -962,7 +891,6 @@ def test_ogr_osm_17():
     ogr.GetDriverByName('ESRI Shapefile').DeleteDataSource('/vsimem/ogr_osm_17')
 
     if layer_count != 4:
-        gdaltest.post_reason('fail')
         print(layer_count)
         return 'fail'
 
@@ -986,7 +914,6 @@ def test_ogr_osm_18():
     ds = None
 
     if count != 2:
-        gdaltest.post_reason('fail')
         print(count)
         return 'fail'
 
diff --git a/autotest/ogr/ogr_pcidsk.py b/autotest/ogr/ogr_pcidsk.py
index daddafaee719..ff2ca3a16c97 100755
--- a/autotest/ogr/ogr_pcidsk.py
+++ b/autotest/ogr/ogr_pcidsk.py
@@ -63,7 +63,6 @@ def test_ogr_pcidsk_1():
     lyr.ResetReading()
     feat = lyr.GetNextFeature()
     if feat is None:
-        gdaltest.post_reason('failure')
         return 'fail'
 
     lyr = ds.CreateLayer('fields', geom_type=ogr.wkbNone)
@@ -84,28 +83,22 @@ def test_ogr_pcidsk_1():
     lyr.CreateFeature(feat)
 
     if lyr.GetFeatureCount() != 2:
-        gdaltest.post_reason('failure')
         return 'fail'
 
     lyr.DeleteFeature(1)
 
     if lyr.GetFeatureCount() != 1:
-        gdaltest.post_reason('failure')
         return 'fail'
 
     lyr.ResetReading()
     feat = lyr.GetNextFeature()
     if feat is None:
-        gdaltest.post_reason('failure')
         return 'fail'
     if feat.GetField(0) != 'foo':
-        gdaltest.post_reason('failure')
         return 'fail'
     if feat.GetField(1) != 1:
-        gdaltest.post_reason('failure')
         return 'fail'
     if feat.GetField(2) != 3.45:
-        gdaltest.post_reason('failure')
         return 'fail'
 
     for (wkt, layername, epsgcode) in wkts:
@@ -123,11 +116,9 @@ def test_ogr_pcidsk_1():
         lyr.ResetReading()
         feat = lyr.GetNextFeature()
         if feat is None:
-            gdaltest.post_reason('failure')
             print(layername)
             return 'fail'
         if feat.GetGeometryRef().ExportToWkt() != wkt:
-            gdaltest.post_reason('failure')
             feat.DumpReadable()
             print(layername)
             return 'fail'
@@ -152,33 +143,26 @@ def test_ogr_pcidsk_2():
 
     lyr = ds.GetLayerByName('nothing')
     if lyr.GetGeomType() != ogr.wkbNone:
-        gdaltest.post_reason('failure')
         return 'fail'
     feat = lyr.GetNextFeature()
     if feat is None:
-        gdaltest.post_reason('failure')
         return 'fail'
 
     lyr = ds.GetLayerByName('fields')
     feat = lyr.GetNextFeature()
     if feat is None:
-        gdaltest.post_reason('failure')
         return 'fail'
     if feat.GetField(0) != 'foo':
-        gdaltest.post_reason('failure')
         return 'fail'
     if feat.GetField(1) != 1:
-        gdaltest.post_reason('failure')
         return 'fail'
     if feat.GetField(2) != 3.45:
-        gdaltest.post_reason('failure')
         return 'fail'
 
     for (wkt, layername, epsgcode) in wkts:
         geom = ogr.CreateGeometryFromWkt(wkt)
         lyr = ds.GetLayerByName(layername)
         if lyr.GetGeomType() != geom.GetGeometryType():
-            gdaltest.post_reason('failure')
             print(layername)
             return 'fail'
 
@@ -187,7 +171,6 @@ def test_ogr_pcidsk_2():
             ref_srs = osr.SpatialReference()
             ref_srs.ImportFromEPSG(epsgcode)
             if srs is None or ref_srs.IsSame(srs) != 1:
-                gdaltest.post_reason('failure')
                 print(layername)
                 print(ref_srs)
                 print(srs)
@@ -195,11 +178,9 @@ def test_ogr_pcidsk_2():
 
         feat = lyr.GetNextFeature()
         if feat is None:
-            gdaltest.post_reason('failure')
             print(layername)
             return 'fail'
         if feat.GetGeometryRef().ExportToWkt() != wkt:
-            gdaltest.post_reason('failure')
             feat.DumpReadable()
             print(layername)
             return 'fail'
@@ -340,22 +321,18 @@ def test_ogr_pcidsk_online_1():
 
     ds = ogr.Open('tmp/cache/polygon.pix')
     if ds is None:
-        gdaltest.post_reason('failure')
         return 'fail'
 
     lyr = ds.GetLayer(0)
     if lyr is None:
-        gdaltest.post_reason('failure')
         return 'fail'
 
     feat = lyr.GetNextFeature()
     if feat is None:
-        gdaltest.post_reason('failure')
         return 'fail'
 
     geom = 'POLYGON ((479819.84375 4765180.5 0,479690.1875 4765259.5 0,479647.0 4765369.5 0,479730.375 4765400.5 0,480039.03125 4765539.5 0,480035.34375 4765558.5 0,480159.78125 4765610.5 0,480202.28125 4765482.0 0,480365.0 4765015.5 0,480389.6875 4764950.0 0,480133.96875 4764856.5 0,480080.28125 4764979.5 0,480082.96875 4765049.5 0,480088.8125 4765139.5 0,480059.90625 4765239.5 0,480019.71875 4765319.5 0,479980.21875 4765409.5 0,479909.875 4765370.0 0,479859.875 4765270.0 0,479819.84375 4765180.5 0))'
     if ogrtest.check_feature_geometry(feat, geom) != 0:
-        gdaltest.post_reason('failure')
         feat.DumpReadable()
         return 'fail'
 
diff --git a/autotest/ogr/ogr_pdf.py b/autotest/ogr/ogr_pdf.py
index e9f88a2b7c68..38c6833b147c 100755
--- a/autotest/ogr/ogr_pdf.py
+++ b/autotest/ogr/ogr_pdf.py
@@ -136,27 +136,21 @@ def test_ogr_pdf_2(name='tmp/ogr_pdf_1.pdf', has_attributes=True):
 
     ds = ogr.Open(name)
     if ds is None:
-        gdaltest.post_reason('fail')
         return 'fail'
 
     lyr = ds.GetLayerByName('first_layer')
     if lyr is None:
-        gdaltest.post_reason('fail')
         return 'fail'
 
     if has_attributes:
         if lyr.GetLayerDefn().GetFieldDefn(lyr.GetLayerDefn().GetFieldIndex('strfield')).GetType() != ogr.OFTString:
-            gdaltest.post_reason('fail')
             return 'fail'
         if lyr.GetLayerDefn().GetFieldDefn(lyr.GetLayerDefn().GetFieldIndex('intfield')).GetType() != ogr.OFTInteger:
-            gdaltest.post_reason('fail')
             return 'fail'
         if lyr.GetLayerDefn().GetFieldDefn(lyr.GetLayerDefn().GetFieldIndex('realfield')).GetType() != ogr.OFTReal:
-            gdaltest.post_reason('fail')
             return 'fail'
     else:
         if lyr.GetLayerDefn().GetFieldCount() != 0:
-            gdaltest.post_reason('fail')
             return 'fail'
 
     if has_attributes:
@@ -171,33 +165,27 @@ def test_ogr_pdf_2(name='tmp/ogr_pdf_1.pdf', has_attributes=True):
     feat = lyr.GetNextFeature()
     if ogrtest.check_feature_geometry(feat, ogr.CreateGeometryFromWkt('LINESTRING(2 48,3 50)')) != 0:
         feat.DumpReadable()
-        gdaltest.post_reason('fail')
         return 'fail'
 
     if has_attributes:
         if feat.GetField('strfield') != 'str':
             feat.DumpReadable()
-            gdaltest.post_reason('fail')
             return 'fail'
         if feat.GetField('intfield') != 1:
             feat.DumpReadable()
-            gdaltest.post_reason('fail')
             return 'fail'
         if abs(feat.GetFieldAsDouble('realfield') - 2.34) > 1e-10:
             feat.DumpReadable()
-            gdaltest.post_reason('fail')
             return 'fail'
 
     feat = lyr.GetNextFeature()
     if ogrtest.check_feature_geometry(feat, ogr.CreateGeometryFromWkt('POLYGON((2 48,2 49,3 49,3 48,2 48))')) != 0:
         feat.DumpReadable()
-        gdaltest.post_reason('fail')
         return 'fail'
 
     feat = lyr.GetNextFeature()
     if ogrtest.check_feature_geometry(feat, ogr.CreateGeometryFromWkt('POLYGON((2 48,2 49,3 49,3 48,2 48),(2.25 48.25,2.25 48.75,2.75 48.75,2.75 48.25,2.25 48.25))')) != 0:
         feat.DumpReadable()
-        gdaltest.post_reason('fail')
         return 'fail'
 
     for i in range(10):
@@ -262,13 +250,11 @@ def test_ogr_pdf_5():
     with gdaltest.config_option('OGR_PDF_READ_NON_STRUCTURED', 'YES'):
         ds = ogr.Open('data/drawing.pdf')
     if ds is None:
-        gdaltest.post_reason('fail')
         return 'fail'
 
     # Note: the circle is wrongly drawned as a diamond
     lyr = ds.GetLayer(0)
     if lyr.GetFeatureCount() != 8:
-        gdaltest.post_reason('fail')
         return 'fail'
 
     return 'success'
@@ -301,22 +287,18 @@ def test_ogr_pdf_online_1():
 
     ds = ogr.Open('tmp/cache/webmap_urbansample.pdf')
     if ds is None:
-        gdaltest.post_reason('fail')
         return 'fail'
 
     if ds.GetLayerCount() != len(expected_layers):
-        gdaltest.post_reason('fail')
         print(ds.GetLayerCount())
         return 'fail'
 
     for i in range(ds.GetLayerCount()):
         if ds.GetLayer(i).GetName() != expected_layers[i][0]:
-            gdaltest.post_reason('fail')
             print('%d : %s' % (i, ds.GetLayer(i).GetName()))
             return 'fail'
 
         if ds.GetLayer(i).GetGeomType() != expected_layers[i][1]:
-            gdaltest.post_reason('fail')
             print('%d : %d' % (i, ds.GetLayer(i).GetGeomType()))
             return 'fail'
 
@@ -326,7 +308,6 @@ def test_ogr_pdf_online_1():
         feat.DumpReadable()
         return 'fail'
     if feat.GetField('ID') != 'VL46':
-        gdaltest.post_reason('fail')
         return 'fail'
 
     return 'success'
@@ -382,11 +363,9 @@ def test_ogr_pdf_online_2():
 
     ds = ogr.Open('tmp/cache/340711752_Azusa_FSTopo.pdf')
     if ds is None:
-        gdaltest.post_reason('fail')
         return 'fail'
 
     if ds.GetLayerCount() != len(expected_layers):
-        gdaltest.post_reason('fail')
         print(ds.GetLayerCount())
         for lyr in ds:
             print(lyr.GetName(), lyr.GetGeomType())
@@ -394,12 +373,10 @@ def test_ogr_pdf_online_2():
 
     for i in range(ds.GetLayerCount()):
         if ds.GetLayer(i).GetName() != expected_layers[i][0]:
-            gdaltest.post_reason('fail')
             print('%d : %s' % (i, ds.GetLayer(i).GetName()))
             return 'fail'
 
         if ds.GetLayer(i).GetGeomType() != expected_layers[i][1]:
-            gdaltest.post_reason('fail')
             print('%d : %d' % (i, ds.GetLayer(i).GetGeomType()))
             return 'fail'
 
diff --git a/autotest/ogr/ogr_pg.py b/autotest/ogr/ogr_pg.py
index 35e8c97a58b8..b478398bec68 100755
--- a/autotest/ogr/ogr_pg.py
+++ b/autotest/ogr/ogr_pg.py
@@ -1615,7 +1615,6 @@ def test_ogr_pg_31(with_and_without_postgis):
     ds = ogr.Open('PG:' + gdaltest.pg_connection_string + ' tables=tpoly,tpolycopy', update=1)
 
     if ds is None or ds.GetLayerCount() != 2:
-        gdaltest.post_reason('fail')
         return 'fail'
 
     sql_lyr = ds.ExecuteSQL('SELECT * FROM test_for_tables_equal_param')
@@ -1627,7 +1626,6 @@ def test_ogr_pg_31(with_and_without_postgis):
         i = i + 1
     ds.ReleaseResultSet(sql_lyr)
     if i != 501:
-        gdaltest.post_reason('fail')
         return 'fail'
 
     ds.Destroy()
@@ -2003,17 +2001,13 @@ def test_ogr_pg_38(with_and_without_postgis):
 
     lyr = ds.GetLayerByName('table37_inherited')
     if lyr is None:
-        gdaltest.post_reason('fail')
         return 'fail'
     gfld_defn = lyr.GetLayerDefn().GetGeomFieldDefn(lyr.GetLayerDefn().GetGeomFieldIndex("wkb_geometry"))
     if gfld_defn is None:
-        gdaltest.post_reason('fail')
         return 'fail'
     if gfld_defn.GetType() != ogr.wkbPoint:
-        gdaltest.post_reason('fail')
         return 'fail'
     if lyr.GetLayerDefn().GetGeomFieldCount() != 3:
-        gdaltest.post_reason('fail')
         print(lyr.GetLayerDefn().GetGeomFieldCount())
         for i in range(lyr.GetLayerDefn().GetGeomFieldCount()):
             print(lyr.GetLayerDefn().GetGeomFieldDefn(i).GetName())
@@ -2022,15 +2016,12 @@ def test_ogr_pg_38(with_and_without_postgis):
     # Explicit query to 'table37_inherited(wkb_geometry)' should also work
     lyr = ds.GetLayerByName('table37_inherited(wkb_geometry)')
     if lyr is None:
-        gdaltest.post_reason('fail')
         return 'fail'
 
     lyr = ds.GetLayerByName('table37_inherited(pointBase)')
     if lyr is None:
-        gdaltest.post_reason('fail')
         return 'fail'
     if lyr.GetGeomType() != ogr.wkbPoint:
-        gdaltest.post_reason('fail')
         return 'fail'
     if lyr.GetGeometryColumn() != 'pointBase':
         gdaltest.post_reason('wrong geometry column name')
@@ -2038,10 +2029,8 @@ def test_ogr_pg_38(with_and_without_postgis):
 
     lyr = ds.GetLayerByName('table37_inherited(point25D)')
     if lyr is None:
-        gdaltest.post_reason('fail')
         return 'fail'
     if lyr.GetGeomType() != ogr.wkbPoint25D:
-        gdaltest.post_reason('fail')
         return 'fail'
     if lyr.GetGeometryColumn() != 'point25D':
         gdaltest.post_reason('wrong geometry column name')
@@ -2054,10 +2043,8 @@ def test_ogr_pg_38(with_and_without_postgis):
 
     lyr = ds.GetLayerByName('table37_inherited(point25D)')
     if lyr is None:
-        gdaltest.post_reason('fail')
         return 'fail'
     if lyr.GetGeomType() != ogr.wkbPoint25D:
-        gdaltest.post_reason('fail')
         return 'fail'
     if lyr.GetGeometryColumn() != 'point25D':
         gdaltest.post_reason('wrong geometry column name')
@@ -2103,10 +2090,8 @@ def test_ogr_pg_39(with_and_without_postgis):
     if gdaltest.pg_has_postgis:
         gfld_defn = lyr.GetLayerDefn().GetGeomFieldDefn(lyr.GetLayerDefn().GetGeomFieldIndex("wkb_geometry"))
         if gfld_defn is None:
-            gdaltest.post_reason('fail')
             return 'fail'
         if gfld_defn.GetType() != ogr.wkbPoint:
-            gdaltest.post_reason('fail')
             return 'fail'
 
     feat = lyr.GetNextFeature()
@@ -3285,7 +3270,6 @@ def test_ogr_pg_62(with_and_without_postgis):
     got_srs = sql_lyr.GetSpatialRef()
     gdaltest.pg_ds.ReleaseResultSet(sql_lyr)
     if got_srs is None or got_srs.ExportToWkt().find('32631') == -1:
-        gdaltest.post_reason('fail')
         return 'fail'
 
     # Test a request on a table, but with a geometry column not in the table
@@ -3293,7 +3277,6 @@ def test_ogr_pg_62(with_and_without_postgis):
     got_srs = sql_lyr.GetSpatialRef()
     gdaltest.pg_ds.ReleaseResultSet(sql_lyr)
     if got_srs is None or got_srs.ExportToWkt().find('4326') == -1:
-        gdaltest.post_reason('fail')
         return 'fail'
 
     return 'success'
@@ -3327,18 +3310,14 @@ def test_ogr_pg_63(with_and_without_postgis):
     ds = ogr.Open('PG:' + gdaltest.pg_connection_string)
     lyr = ds.GetLayerByName('ogr_pg_63')
     if lyr.GetLayerDefn().GetFieldDefn(lyr.GetLayerDefn().GetFieldIndex('foo')).GetType() != ogr.OFTInteger64:
-        gdaltest.post_reason('fail')
         return 'fail'
     if lyr.GetLayerDefn().GetFieldDefn(lyr.GetLayerDefn().GetFieldIndex('bar')).GetType() != ogr.OFTReal:
-        gdaltest.post_reason('fail')
         return 'fail'
 
     feat = lyr.GetNextFeature()
     if feat.GetField('foo') != 123:
-        gdaltest.post_reason('fail')
         return 'fail'
     if feat.GetField('baw') != 123456789012345:
-        gdaltest.post_reason('fail')
         return 'fail'
 
     return 'success'
@@ -3364,7 +3343,6 @@ def test_ogr_pg_64(with_and_without_postgis):
     lyr.CreateFeature(feat)
 
     if lyr.GetFeatureCount() != 2:
-        gdaltest.post_reason('fail')
         print(lyr.GetFeatureCount())
         return 'fail'
 
@@ -3380,7 +3358,6 @@ def test_ogr_pg_64(with_and_without_postgis):
 
     # Just one feature because of truncation
     if lyr.GetFeatureCount() != 1:
-        gdaltest.post_reason('fail')
         print(lyr.GetFeatureCount())
         return 'fail'
 
@@ -3400,11 +3377,9 @@ def test_ogr_pg_65(with_and_without_postgis):
 
     ds = ogr.Open('PG:' + gdaltest.pg_connection_string, update=1)
     if ds.TestCapability(ogr.ODsCCreateGeomFieldAfterCreateLayer) == 0:
-        gdaltest.post_reason('fail')
         return 'fail'
     lyr = ds.CreateLayer('ogr_pg_65', geom_type=ogr.wkbNone)
     if lyr.TestCapability(ogr.OLCCreateGeomField) == 0:
-        gdaltest.post_reason('fail')
         return 'fail'
 
     gfld_defn = ogr.GeomFieldDefn('geom1', ogr.wkbPoint)
@@ -3412,12 +3387,10 @@ def test_ogr_pg_65(with_and_without_postgis):
     srs.ImportFromEPSG(4326)
     gfld_defn.SetSpatialRef(srs)
     if lyr.CreateGeomField(gfld_defn) != 0:
-        gdaltest.post_reason('fail')
         return 'fail'
 
     gfld_defn = ogr.GeomFieldDefn('geom2', ogr.wkbLineString25D)
     if lyr.CreateGeomField(gfld_defn) != 0:
-        gdaltest.post_reason('fail')
         return 'fail'
 
     gfld_defn = ogr.GeomFieldDefn('geom3', ogr.wkbPoint)
@@ -3425,7 +3398,6 @@ def test_ogr_pg_65(with_and_without_postgis):
     srs.ImportFromEPSG(32631)
     gfld_defn.SetSpatialRef(srs)
     if lyr.CreateGeomField(gfld_defn) != 0:
-        gdaltest.post_reason('fail')
         return 'fail'
 
     lyr.CreateField(ogr.FieldDefn('intfield', ogr.OFTInteger))
@@ -3434,11 +3406,9 @@ def test_ogr_pg_65(with_and_without_postgis):
     feat.SetGeomFieldDirectly('geom1', ogr.CreateGeometryFromWkt('POINT (1 2)'))
     feat.SetGeomFieldDirectly('geom2', ogr.CreateGeometryFromWkt('LINESTRING (3 4 5,6 7 8)'))
     if lyr.CreateFeature(feat) != 0:
-        gdaltest.post_reason('fail')
         return 'fail'
     feat = ogr.Feature(lyr.GetLayerDefn())
     if lyr.CreateFeature(feat) != 0:
-        gdaltest.post_reason('fail')
         return 'fail'
     lyr.ResetReading()
     feat = lyr.GetNextFeature()
@@ -3446,13 +3416,11 @@ def test_ogr_pg_65(with_and_without_postgis):
        feat.GetGeomFieldRef('geom1').ExportToWkt() != 'POINT (1 2)' or \
        feat.GetGeomFieldRef('geom2').ExportToWkt() != 'LINESTRING (3 4 5,6 7 8)':
         feat.DumpReadable()
-        gdaltest.post_reason('fail')
         return 'fail'
     feat = lyr.GetNextFeature()
     if feat.GetGeomFieldRef('geom1') is not None or \
        feat.GetGeomFieldRef('geom2') is not None:
         feat.DumpReadable()
-        gdaltest.post_reason('fail')
         return 'fail'
 
     ds = None
@@ -3463,38 +3431,29 @@ def test_ogr_pg_65(with_and_without_postgis):
         else:
             lyr = ds.ExecuteSQL('SELECT * FROM ogr_pg_65')
         if lyr.GetLayerDefn().GetGeomFieldDefn(0).GetName() != 'geom1':
-            gdaltest.post_reason('fail')
             return 'fail'
         if i == 0 and lyr.GetLayerDefn().GetGeomFieldDefn(0).GetType() != ogr.wkbPoint:
-            gdaltest.post_reason('fail')
             return 'fail'
         if lyr.GetLayerDefn().GetGeomFieldDefn(0).GetSpatialRef().ExportToWkt().find('4326') < 0:
-            gdaltest.post_reason('fail')
             return 'fail'
         if lyr.GetLayerDefn().GetGeomFieldDefn(1).GetName() != 'geom2':
-            gdaltest.post_reason('fail')
             return 'fail'
         if i == 0 and lyr.GetLayerDefn().GetGeomFieldDefn(1).GetType() != ogr.wkbLineString25D:
-            gdaltest.post_reason('fail')
             return 'fail'
         if lyr.GetLayerDefn().GetGeomFieldDefn(1).GetSpatialRef() is not None:
-            gdaltest.post_reason('fail')
             return 'fail'
         if i == 0 and lyr.GetLayerDefn().GetGeomFieldDefn(2).GetSpatialRef().ExportToWkt().find('32631') < 0:
-            gdaltest.post_reason('fail')
             return 'fail'
         feat = lyr.GetNextFeature()
         if feat.GetField('intfield') != 123 or \
                 feat.GetGeomFieldRef('geom1').ExportToWkt() != 'POINT (1 2)' or \
                 feat.GetGeomFieldRef('geom2').ExportToWkt() != 'LINESTRING (3 4 5,6 7 8)':
             feat.DumpReadable()
-            gdaltest.post_reason('fail')
             return 'fail'
         feat = lyr.GetNextFeature()
         if feat.GetGeomFieldRef('geom1') is not None or \
            feat.GetGeomFieldRef('geom2') is not None:
             feat.DumpReadable()
-            gdaltest.post_reason('fail')
             return 'fail'
         if i == 1:
             ds.ReleaseResultSet(lyr)
@@ -3508,11 +3467,9 @@ def test_ogr_pg_65(with_and_without_postgis):
     feat.SetGeomFieldDirectly('geom1', ogr.CreateGeometryFromWkt('POINT (3 4)'))
     feat.SetGeomFieldDirectly('geom2', ogr.CreateGeometryFromWkt('LINESTRING (4 5 6,7 8 9)'))
     if lyr.CreateFeature(feat) != 0:
-        gdaltest.post_reason('fail')
         return 'fail'
     feat = ogr.Feature(lyr.GetLayerDefn())
     if lyr.CreateFeature(feat) != 0:
-        gdaltest.post_reason('fail')
         return 'fail'
     gdal.SetConfigOption('PG_USE_COPY', gdaltest.pg_use_copy)
 
@@ -3522,13 +3479,11 @@ def test_ogr_pg_65(with_and_without_postgis):
     if feat.GetGeomFieldRef('geom1').ExportToWkt() != 'POINT (3 4)' or \
        feat.GetGeomFieldRef('geom2').ExportToWkt() != 'LINESTRING (4 5 6,7 8 9)':
         feat.DumpReadable()
-        gdaltest.post_reason('fail')
         return 'fail'
     feat = lyr.GetNextFeature()
     if feat.GetGeomFieldRef('geom1') is not None or \
             feat.GetGeomFieldRef('geom2') is not None:
         feat.DumpReadable()
-        gdaltest.post_reason('fail')
         return 'fail'
 
     import test_cli_utilities
@@ -3537,13 +3492,10 @@ def test_ogr_pg_65(with_and_without_postgis):
         ds = ogr.Open('PG:' + gdaltest.pg_connection_string)
         lyr = ds.GetLayerByName('ogr_pg_65_copied')
         if lyr.GetLayerDefn().GetGeomFieldDefn(0).GetSpatialRef().ExportToWkt().find('4326') < 0:
-            gdaltest.post_reason('fail')
             return 'fail'
         if lyr.GetLayerDefn().GetGeomFieldDefn(1).GetSpatialRef() is not None:
-            gdaltest.post_reason('fail')
             return 'fail'
         if lyr.GetLayerDefn().GetGeomFieldDefn(2).GetSpatialRef().ExportToWkt().find('32631') < 0:
-            gdaltest.post_reason('fail')
             return 'fail'
 
     return 'success'
@@ -3591,7 +3543,6 @@ def test_ogr_pg_67(with_and_without_postgis):
     ds = ogr.Open('PG:' + gdaltest.pg_connection_string, update=1)
     lyr = ds.GetLayerByName('ogr_pg_67')
     if lyr.GetSpatialRef() is not None:
-        gdaltest.post_reason('fail')
         return 'fail'
     feat = ogr.Feature(lyr.GetLayerDefn())
     lyr.CreateFeature(feat)
@@ -3601,7 +3552,6 @@ def test_ogr_pg_67(with_and_without_postgis):
     ds = ogr.Open('PG:' + gdaltest.pg_connection_string, update=1)
     lyr = ds.GetLayerByName('ogr_pg_67')
     if lyr.GetSpatialRef() is not None:
-        gdaltest.post_reason('fail')
         return 'fail'
     ds.ExecuteSQL("ALTER TABLE ogr_pg_67 DROP CONSTRAINT enforce_srid_wkb_geometry")
     ds.ExecuteSQL("UPDATE ogr_pg_67 SET wkb_geometry = ST_GeomFromEWKT('SRID=4326;POINT(0 1)')")
@@ -3610,14 +3560,12 @@ def test_ogr_pg_67(with_and_without_postgis):
     ds = ogr.Open('PG:' + gdaltest.pg_connection_string, update=1)
     lyr = ds.GetLayerByName('ogr_pg_67')
     if lyr.GetSpatialRef() is None:
-        gdaltest.post_reason('fail')
         return 'fail'
     ds = None
 
     ds = ogr.Open('PG:' + gdaltest.pg_connection_string + ' tables=fake', update=1)
     lyr = ds.GetLayerByName('ogr_pg_67')
     if lyr.GetSpatialRef() is None:
-        gdaltest.post_reason('fail')
         return 'fail'
     ds = None
 
@@ -3668,11 +3616,9 @@ def test_ogr_pg_68(with_and_without_postgis):
     gdaltest.pg_ds.ExecuteSQL("GRANT SELECT ON geometry_columns TO %s" % current_user)
 
     if got_srs is None:
-        gdaltest.post_reason('fail')
         return 'fail'
 
     if got_srs2 is None:
-        gdaltest.post_reason('fail')
         return 'fail'
 
     return 'success'
@@ -3693,33 +3639,27 @@ def test_ogr_pg_69(with_and_without_postgis):
     gdaltest.pg_ds = None
     gdaltest.pg_ds = ogr.Open('PG:' + gdaltest.pg_connection_string)
     if has_run_load_tables(gdaltest.pg_ds):
-        gdaltest.post_reason('fail')
         return 'fail'
     gdaltest.pg_ds.GetLayerByName('tpoly')
     if has_run_load_tables(gdaltest.pg_ds):
-        gdaltest.post_reason('fail')
         return 'fail'
     sql_lyr = gdaltest.pg_ds.ExecuteSQL('SELECT * FROM tpoly')
     if has_run_load_tables(gdaltest.pg_ds):
-        gdaltest.post_reason('fail')
         return 'fail'
     feat = sql_lyr.GetNextFeature()
     if has_run_load_tables(gdaltest.pg_ds):
-        gdaltest.post_reason('fail')
         return 'fail'
     del feat
     gdaltest.pg_ds.ReleaseResultSet(sql_lyr)
 
     gdaltest.pg_ds.GetLayer(0)
     if not has_run_load_tables(gdaltest.pg_ds):
-        gdaltest.post_reason('fail')
         return 'fail'
 
     # Test that we can find a layer with non lowercase
     gdaltest.pg_ds = None
     gdaltest.pg_ds = ogr.Open('PG:' + gdaltest.pg_connection_string)
     if gdaltest.pg_ds.GetLayerByName('TPOLY') is None:
-        gdaltest.post_reason('fail')
         return 'fail'
 
     return 'success'
@@ -3740,7 +3680,6 @@ def test_ogr_pg_70(with_and_without_postgis):
     ds = ogr.Open('PG:' + gdaltest.pg_connection_string)
     lyr2 = ds.GetLayerByName('ogr_pg_70')
     if lyr2 is None:
-        gdaltest.post_reason('fail')
         return 'fail'
     ds = None
 
@@ -3749,7 +3688,6 @@ def test_ogr_pg_70(with_and_without_postgis):
     ds = ogr.Open('PG:' + gdaltest.pg_connection_string)
     lyr2 = ds.GetLayerByName('ogr_pg_70')
     if lyr2.GetLayerDefn().GetFieldCount() != 1:
-        gdaltest.post_reason('fail')
         return 'fail'
     ds = None
 
@@ -3759,7 +3697,6 @@ def test_ogr_pg_70(with_and_without_postgis):
     ds = ogr.Open('PG:' + gdaltest.pg_connection_string)
     lyr2 = ds.GetLayerByName('ogr_pg_70')
     if lyr2.GetLayerDefn().GetGeomFieldCount() != 2:
-        gdaltest.post_reason('fail')
         return 'fail'
     ds = None
 
@@ -3775,11 +3712,9 @@ def test_ogr_pg_70(with_and_without_postgis):
         ds = ogr.Open('PG:' + gdaltest.pg_connection_string)
         lyr2 = ds.GetLayerByName('ogr_pg_70')
         if lyr2.GetLayerDefn().GetGeomFieldCount() != 1:
-            gdaltest.post_reason('fail')
             return 'fail'
         geography_columns_lyr = ds.ExecuteSQL("SELECT * FROM geography_columns WHERE f_table_name = 'ogr_pg_70' AND f_geography_column = 'my_geog'")
         if geography_columns_lyr.GetFeatureCount() != 1:
-            gdaltest.post_reason('fail')
             return 'fail'
         ds.ReleaseResultSet(geography_columns_lyr)
         ds = None
@@ -3858,7 +3793,6 @@ def test_ogr_pg_71(with_and_without_postgis):
         if not gdaltest.pg_has_postgis_2 and wkt.find('EMPTY') >= 0:
             expected_wkt = 'GEOMETRYCOLLECTION EMPTY'
         if out_wkt != expected_wkt:
-            gdaltest.post_reason('fail')
             print(expected_wkt)
             print(out_wkt)
             return 'fail'
@@ -3881,7 +3815,6 @@ def test_ogr_pg_71(with_and_without_postgis):
         if not gdaltest.pg_has_postgis_2 and wkt.find('EMPTY') >= 0:
             expected_wkt = 'GEOMETRYCOLLECTION EMPTY'
         if out_wkt != expected_wkt:
-            gdaltest.post_reason('fail')
             print(expected_wkt)
             print(out_wkt)
             return 'fail'
@@ -3898,7 +3831,6 @@ def test_ogr_pg_71(with_and_without_postgis):
         f.SetGeometry(g)
         ret = active_lyr.CreateFeature(f)
         if ret != 0:
-            gdaltest.post_reason('fail')
             print(wkt)
             return 'fail'
         fid = f.GetFID()
@@ -3916,7 +3848,6 @@ def test_ogr_pg_71(with_and_without_postgis):
         f = None
 
         if out_wkt != wkt:
-            gdaltest.post_reason('fail')
             print(wkt)
             print(out_wkt)
             return 'fail'
@@ -3935,33 +3866,27 @@ def test_ogr_pg_72(with_and_without_postgis):
     # Regular layer with 32 bit IDs
     lyr = gdaltest.pg_ds.CreateLayer('ogr_pg_72')
     if lyr.GetMetadataItem(ogr.OLMD_FID64) is not None:
-        gdaltest.post_reason('fail')
         return 'fail'
     lyr.CreateField(ogr.FieldDefn('foo'))
     f = ogr.Feature(lyr.GetLayerDefn())
     f.SetFID(123456789012345)
     f.SetField(0, 'bar')
     if lyr.CreateFeature(f) != 0:
-        gdaltest.post_reason('fail')
         return 'fail'
     f = lyr.GetFeature(123456789012345)
     if f is None:
-        gdaltest.post_reason('fail')
         return 'fail'
 
     lyr = gdaltest.pg_ds.CreateLayer('ogr_pg_72', options=['FID64=YES', 'OVERWRITE=YES'])
     if lyr.GetMetadataItem(ogr.OLMD_FID64) is None:
-        gdaltest.post_reason('fail')
         return 'fail'
     lyr.CreateField(ogr.FieldDefn('foo'))
     f = ogr.Feature(lyr.GetLayerDefn())
     f.SetFID(123456789012345)
     f.SetField(0, 'bar')
     if lyr.CreateFeature(f) != 0:
-        gdaltest.post_reason('fail')
         return 'fail'
     if lyr.SetFeature(f) != 0:
-        gdaltest.post_reason('fail')
         return 'fail'
     gdaltest.pg_ds = None
     # Test with binary protocol
@@ -3980,11 +3905,9 @@ def test_ogr_pg_72(with_and_without_postgis):
     gdaltest.pg_ds = ogr.Open('PG:' + gdaltest.pg_connection_string, update=1)
     lyr = gdaltest.pg_ds.GetLayerByName('ogr_pg_72')
     if lyr.GetMetadataItem(ogr.OLMD_FID64) is None:
-        gdaltest.post_reason('fail')
         return 'fail'
     f = lyr.GetNextFeature()
     if f.GetFID() != 123456789012345:
-        gdaltest.post_reason('fail')
         f.DumpReadable()
         return 'fail'
 
@@ -4030,7 +3953,6 @@ def test_ogr_pg_73(with_and_without_postgis):
     ret = lyr.CreateFeature(f)
     gdal.PopErrorHandler()
     if ret == 0:
-        gdaltest.post_reason('fail')
         return 'fail'
     f = None
 
@@ -4041,7 +3963,6 @@ def test_ogr_pg_73(with_and_without_postgis):
     ret = lyr.CreateFeature(f)
     gdal.PopErrorHandler()
     if ret == 0:
-        gdaltest.post_reason('fail')
         return 'fail'
     f = None
 
@@ -4052,16 +3973,12 @@ def test_ogr_pg_73(with_and_without_postgis):
     ds = ogr.Open('PG:' + gdaltest.pg_connection_string, update=1)
     lyr = ds.GetLayerByName('ogr_pg_73')
     if lyr.GetLayerDefn().GetFieldDefn(lyr.GetLayerDefn().GetFieldIndex('field_not_nullable')).IsNullable() != 0:
-        gdaltest.post_reason('fail')
         return 'fail'
     if lyr.GetLayerDefn().GetFieldDefn(lyr.GetLayerDefn().GetFieldIndex('field_nullable')).IsNullable() != 1:
-        gdaltest.post_reason('fail')
         return 'fail'
     if lyr.GetLayerDefn().GetGeomFieldDefn(lyr.GetLayerDefn().GetGeomFieldIndex('geomfield_not_nullable')).IsNullable() != 0:
-        gdaltest.post_reason('fail')
         return 'fail'
     if lyr.GetLayerDefn().GetGeomFieldDefn(lyr.GetLayerDefn().GetGeomFieldIndex('geomfield_nullable')).IsNullable() != 1:
-        gdaltest.post_reason('fail')
         return 'fail'
 
     # Turn not null into nullable
@@ -4070,7 +3987,6 @@ def test_ogr_pg_73(with_and_without_postgis):
     fd.SetNullable(1)
     lyr.AlterFieldDefn(lyr.GetLayerDefn().GetFieldIndex('field_not_nullable'), fd, ogr.ALTER_ALL_FLAG)
     if lyr.GetLayerDefn().GetFieldDefn(lyr.GetLayerDefn().GetFieldIndex('now_nullable')).IsNullable() != 1:
-        gdaltest.post_reason('fail')
         return 'fail'
 
     # Turn nullable into not null, but remove NULL values first
@@ -4081,21 +3997,16 @@ def test_ogr_pg_73(with_and_without_postgis):
     fd.SetNullable(0)
     lyr.AlterFieldDefn(lyr.GetLayerDefn().GetFieldIndex('field_nullable'), fd, ogr.ALTER_ALL_FLAG)
     if lyr.GetLayerDefn().GetFieldDefn(lyr.GetLayerDefn().GetFieldIndex('now_not_nullable')).IsNullable() != 0:
-        gdaltest.post_reason('fail')
         return 'fail'
 
     sql_lyr = ds.ExecuteSQL('SELECT * FROM ogr_pg_73')
     if sql_lyr.GetLayerDefn().GetFieldDefn(sql_lyr.GetLayerDefn().GetFieldIndex('now_not_nullable')).IsNullable() != 0:
-        gdaltest.post_reason('fail')
         return 'fail'
     if sql_lyr.GetLayerDefn().GetFieldDefn(sql_lyr.GetLayerDefn().GetFieldIndex('now_nullable')).IsNullable() != 1:
-        gdaltest.post_reason('fail')
         return 'fail'
     if sql_lyr.GetLayerDefn().GetGeomFieldDefn(sql_lyr.GetLayerDefn().GetGeomFieldIndex('geomfield_not_nullable')).IsNullable() != 0:
-        gdaltest.post_reason('fail')
         return 'fail'
     if sql_lyr.GetLayerDefn().GetGeomFieldDefn(sql_lyr.GetLayerDefn().GetGeomFieldIndex('geomfield_nullable')).IsNullable() != 1:
-        gdaltest.post_reason('fail')
         return 'fail'
     ds.ReleaseResultSet(sql_lyr)
 
@@ -4186,38 +4097,28 @@ def test_ogr_pg_74(with_and_without_postgis):
     ds.ExecuteSQL('set timezone to "UTC"')
     lyr = ds.GetLayerByName('ogr_pg_74')
     if lyr.GetLayerDefn().GetFieldDefn(lyr.GetLayerDefn().GetFieldIndex('field_string')).GetDefault() != "'a''b'":
-        gdaltest.post_reason('fail')
         return 'fail'
     if lyr.GetLayerDefn().GetFieldDefn(lyr.GetLayerDefn().GetFieldIndex('field_int')).GetDefault() != '123':
-        gdaltest.post_reason('fail')
         return 'fail'
     if lyr.GetLayerDefn().GetFieldDefn(lyr.GetLayerDefn().GetFieldIndex('field_real')).GetDefault() != '1.23':
-        gdaltest.post_reason('fail')
         return 'fail'
     if lyr.GetLayerDefn().GetFieldDefn(lyr.GetLayerDefn().GetFieldIndex('field_nodefault')).GetDefault() is not None:
-        gdaltest.post_reason('fail')
         return 'fail'
     if lyr.GetLayerDefn().GetFieldDefn(lyr.GetLayerDefn().GetFieldIndex('field_datetime')).GetDefault() != 'CURRENT_TIMESTAMP':
-        gdaltest.post_reason('fail')
         return 'fail'
     if lyr.GetLayerDefn().GetFieldDefn(lyr.GetLayerDefn().GetFieldIndex('field_datetime2')).GetDefault() != "'2015/06/30 12:34:56'":
-        gdaltest.post_reason('fail')
         print(lyr.GetLayerDefn().GetFieldDefn(lyr.GetLayerDefn().GetFieldIndex('field_datetime2')).GetDefault())
         return 'fail'
     if lyr.GetLayerDefn().GetFieldDefn(lyr.GetLayerDefn().GetFieldIndex('field_datetime3')).GetDefault() != "'2015/06/30 12:34:56.123'":
-        gdaltest.post_reason('fail')
         print(lyr.GetLayerDefn().GetFieldDefn(lyr.GetLayerDefn().GetFieldIndex('field_datetime3')).GetDefault())
         return 'fail'
     if lyr.GetLayerDefn().GetFieldDefn(lyr.GetLayerDefn().GetFieldIndex('field_date')).GetDefault() != "CURRENT_DATE":
-        gdaltest.post_reason('fail')
         return 'fail'
     if lyr.GetLayerDefn().GetFieldDefn(lyr.GetLayerDefn().GetFieldIndex('field_time')).GetDefault() != "CURRENT_TIME":
-        gdaltest.post_reason('fail')
         return 'fail'
 
     f = lyr.GetNextFeature()
     if not f.IsFieldNull('field_string'):
-        gdaltest.post_reason('fail')
         f.DumpReadable()
         return 'fail'
 
@@ -4228,13 +4129,11 @@ def test_ogr_pg_74(with_and_without_postgis):
        f.GetField('field_datetime2') != '2015/06/30 12:34:56+00' or \
        f.GetField('field_datetime3') != '2015/06/30 12:34:56.123+00' or \
        not f.IsFieldSet('field_date') or not f.IsFieldSet('field_time'):
-        gdaltest.post_reason('fail')
         f.DumpReadable()
         return 'fail'
 
     f = lyr.GetNextFeature()
     if f.GetField('field_string') != 'b':
-        gdaltest.post_reason('fail')
         f.DumpReadable()
         return 'fail'
 
@@ -4246,7 +4145,6 @@ def test_ogr_pg_74(with_and_without_postgis):
     fd.SetDefault("'c'")
     lyr.AlterFieldDefn(lyr.GetLayerDefn().GetFieldIndex('field_string'), fd, ogr.ALTER_DEFAULT_FLAG)
     if lyr.GetLayerDefn().GetFieldDefn(lyr.GetLayerDefn().GetFieldIndex('field_string')).GetDefault() != "'c'":
-        gdaltest.post_reason('fail')
         print(lyr.GetLayerDefn().GetFieldDefn(lyr.GetLayerDefn().GetFieldIndex('field_string')).GetDefault())
         return 'fail'
 
@@ -4256,7 +4154,6 @@ def test_ogr_pg_74(with_and_without_postgis):
     fd.SetDefault(None)
     lyr.AlterFieldDefn(lyr.GetLayerDefn().GetFieldIndex('field_int'), fd, ogr.ALTER_DEFAULT_FLAG)
     if lyr.GetLayerDefn().GetFieldDefn(lyr.GetLayerDefn().GetFieldIndex('field_int')).GetDefault() is not None:
-        gdaltest.post_reason('fail')
         return 'fail'
 
     ds = None
@@ -4264,11 +4161,9 @@ def test_ogr_pg_74(with_and_without_postgis):
     ds.ExecuteSQL('set timezone to "UTC"')
     lyr = ds.GetLayerByName('ogr_pg_74')
     if lyr.GetLayerDefn().GetFieldDefn(lyr.GetLayerDefn().GetFieldIndex('field_string')).GetDefault() != "'c'":
-        gdaltest.post_reason('fail')
         print(lyr.GetLayerDefn().GetFieldDefn(lyr.GetLayerDefn().GetFieldIndex('field_string')).GetDefault())
         return 'fail'
     if lyr.GetLayerDefn().GetFieldDefn(lyr.GetLayerDefn().GetFieldIndex('field_int')).GetDefault() is not None:
-        gdaltest.post_reason('fail')
         return 'fail'
 
     return 'success'
@@ -4292,12 +4187,10 @@ def test_ogr_pg_75(with_and_without_postgis):
     ret = lyr.CreateField(ogr.FieldDefn('myfid', ogr.OFTString))
     gdal.PopErrorHandler()
     if ret == 0:
-        gdaltest.post_reason('fail')
         return 'fail'
 
     ret = lyr.CreateField(ogr.FieldDefn('myfid', ogr.OFTInteger))
     if ret != 0:
-        gdaltest.post_reason('fail')
         return 'fail'
     lyr.CreateField(ogr.FieldDefn('str2', ogr.OFTString))
 
@@ -4307,31 +4200,25 @@ def test_ogr_pg_75(with_and_without_postgis):
     feat.SetField('str2', 'second string')
     ret = lyr.CreateFeature(feat)
     if ret != 0:
-        gdaltest.post_reason('fail')
         return 'fail'
     if feat.GetFID() != 10:
-        gdaltest.post_reason('fail')
         return 'fail'
 
     feat = ogr.Feature(lyr.GetLayerDefn())
     feat.SetField('str2', 'second string')
     ret = lyr.CreateFeature(feat)
     if ret != 0:
-        gdaltest.post_reason('fail')
         return 'fail'
     if feat.GetFID() < 0:
-        gdaltest.post_reason('fail')
         feat.DumpReadable()
         return 'fail'
     if feat.GetField('myfid') != feat.GetFID():
-        gdaltest.post_reason('fail')
         feat.DumpReadable()
         return 'fail'
 
     feat.SetField('str', 'foo')
     ret = lyr.SetFeature(feat)
     if ret != 0:
-        gdaltest.post_reason('fail')
         return 'fail'
 
     feat = ogr.Feature(lyr.GetLayerDefn())
@@ -4341,14 +4228,12 @@ def test_ogr_pg_75(with_and_without_postgis):
     ret = lyr.CreateFeature(feat)
     gdal.PopErrorHandler()
     if ret == 0:
-        gdaltest.post_reason('fail')
         return 'fail'
 
     gdal.PushErrorHandler()
     ret = lyr.SetFeature(feat)
     gdal.PopErrorHandler()
     if ret == 0:
-        gdaltest.post_reason('fail')
         return 'fail'
 
     feat.UnsetField('myfid')
@@ -4356,7 +4241,6 @@ def test_ogr_pg_75(with_and_without_postgis):
     ret = lyr.SetFeature(feat)
     gdal.PopErrorHandler()
     if ret == 0:
-        gdaltest.post_reason('fail')
         return 'fail'
 
     feat = ogr.Feature(lyr.GetLayerDefn())
@@ -4365,21 +4249,17 @@ def test_ogr_pg_75(with_and_without_postgis):
     feat.SetField('str2', 'second string')
     ret = lyr.CreateFeature(feat)
     if ret != 0:
-        gdaltest.post_reason('fail')
         return 'fail'
     if feat.GetFID() != 12:
-        gdaltest.post_reason('fail')
         return 'fail'
 
     lyr.ResetReading()
     f = lyr.GetNextFeature()
     if f.GetFID() != 10 or f.GetField('str') != 'first string' or f.GetField('str2') != 'second string' or f.GetField('myfid') != 10:
-        gdaltest.post_reason('fail')
         f.DumpReadable()
         return 'fail'
     f = lyr.GetFeature(f.GetFID())
     if f.GetFID() != 10 or f.GetField('str') != 'first string' or f.GetField('str2') != 'second string' or f.GetField('myfid') != 10:
-        gdaltest.post_reason('fail')
         f.DumpReadable()
         return 'fail'
     f = None
@@ -4404,12 +4284,10 @@ def test_ogr_pg_76(with_and_without_postgis):
         return 'skip'
 
     if gdaltest.pg_ds.TestCapability(ogr.ODsCTransactions) != 1:
-        gdaltest.post_reason('fail')
         return 'fail'
 
     level = int(gdaltest.pg_ds.GetMetadataItem("nSoftTransactionLevel", "_DEBUG_"))
     if level != 0:
-        gdaltest.post_reason('fail')
         print(level)
         return 'fail'
 
@@ -4423,7 +4301,6 @@ def test_ogr_pg_76(with_and_without_postgis):
         res = f.GetField(0)
         gdaltest.pg_ds.ReleaseResultSet(sql_lyr)
         if res != 1:
-            gdaltest.post_reason('fail')
             return 'fail'
 
         gdaltest.pg_ds.RollbackTransaction()
@@ -4434,7 +4311,6 @@ def test_ogr_pg_76(with_and_without_postgis):
         res = f.GetField(0)
         gdaltest.pg_ds.ReleaseResultSet(sql_lyr)
         if res != 0:
-            gdaltest.post_reason('fail')
             print(res)
             return 'fail'
 
@@ -4452,7 +4328,6 @@ def test_ogr_pg_76(with_and_without_postgis):
 
     level = int(gdaltest.pg_ds.GetMetadataItem("nSoftTransactionLevel", "_DEBUG_"))
     if level != 0:
-        gdaltest.post_reason('fail')
         print(level)
         return 'fail'
 
@@ -4470,69 +4345,56 @@ def ogr_pg_76_scenario1(lyr1, lyr2):
 
     (_, level, savepoint, usertransac) = ogr_pg_76_get_transaction_state(gdaltest.pg_ds)
     if (level, savepoint, usertransac) != (0, 0, 0):
-        gdaltest.post_reason('fail')
         print(level, savepoint, usertransac)
         return 'fail'
 
     f = lyr1.GetNextFeature()
     if f is None or f.GetFID() != 1:
-        gdaltest.post_reason('fail')
         return 'fail'
     (lastcmd, level, savepoint, usertransac) = ogr_pg_76_get_transaction_state(gdaltest.pg_ds)
     if (lastcmd, level, savepoint, usertransac) != ('BEGIN', 1, 0, 0):
-        gdaltest.post_reason('fail')
         print(lastcmd, level, savepoint, usertransac)
         return 'fail'
 
     lyr1.SetAttributeFilter("foo is NULL")
     (lastcmd, level, savepoint, usertransac) = ogr_pg_76_get_transaction_state(gdaltest.pg_ds)
     if (lastcmd, level, savepoint, usertransac) != ('COMMIT', 0, 0, 0):
-        gdaltest.post_reason('fail')
         print(lastcmd, level, savepoint, usertransac)
         return 'fail'
 
     f = lyr1.GetNextFeature()
     if f is None or f.GetFID() != 1:
-        gdaltest.post_reason('fail')
         return 'fail'
     (lastcmd, level, savepoint, usertransac) = ogr_pg_76_get_transaction_state(gdaltest.pg_ds)
     if (lastcmd, level, savepoint, usertransac) != ('BEGIN', 1, 0, 0):
-        gdaltest.post_reason('fail')
         print(lastcmd, level, savepoint, usertransac)
         return 'fail'
 
     f = lyr2.GetNextFeature()
     if f is None or f.GetFID() != 1:
-        gdaltest.post_reason('fail')
         return 'fail'
     (lastcmd, level, savepoint, usertransac) = ogr_pg_76_get_transaction_state(gdaltest.pg_ds)
     if (lastcmd, level, savepoint, usertransac) != ('', 2, 0, 0):
-        gdaltest.post_reason('fail')
         print(lastcmd, level, savepoint, usertransac)
         return 'fail'
 
     f = lyr1.GetNextFeature()
     if f is None or f.GetFID() != 2:
-        gdaltest.post_reason('fail')
         return 'fail'
 
     # Check that GetFeature() doesn't reset the cursor
     f = lyr1.GetFeature(f.GetFID())
     if f is None or f.GetFID() != 2:
-        gdaltest.post_reason('fail')
         return 'fail'
 
     f = lyr1.GetNextFeature()
     if f is None or f.GetFID() != 3:
-        gdaltest.post_reason('fail')
         return 'fail'
     f = lyr2.GetNextFeature()
     if f is None or f.GetFID() != 2:
-        gdaltest.post_reason('fail')
         return 'fail'
     (lastcmd, level, savepoint, usertransac) = ogr_pg_76_get_transaction_state(gdaltest.pg_ds)
     if (lastcmd, level, savepoint, usertransac) != ('', 2, 0, 0):
-        gdaltest.post_reason('fail')
         print(lastcmd, level, savepoint, usertransac)
         return 'fail'
 
@@ -4541,17 +4403,14 @@ def ogr_pg_76_scenario1(lyr1, lyr2):
     lyr1.ResetReading()
     (lastcmd, level, savepoint, usertransac) = ogr_pg_76_get_transaction_state(gdaltest.pg_ds)
     if (lastcmd, level, savepoint, usertransac) != ('', 1, 0, 0):
-        gdaltest.post_reason('fail')
         print(lastcmd, level, savepoint, usertransac)
         return 'fail'
     lyr2.ResetReading()
     (lastcmd, level, savepoint, usertransac) = ogr_pg_76_get_transaction_state(gdaltest.pg_ds)
     if (lastcmd, level, savepoint, usertransac) != ('COMMIT', 0, 0, 0):
-        gdaltest.post_reason('fail')
         print(lastcmd, level, savepoint, usertransac)
         return 'fail'
     if lyr1.GetFeatureCount() != 4:
-        gdaltest.post_reason('fail')
         return 'fail'
 
     return 'success'
@@ -4561,11 +4420,9 @@ def ogr_pg_76_scenario1(lyr1, lyr2):
 def ogr_pg_76_scenario2(lyr1, lyr2with_and_without_postgis):
 
     if gdaltest.pg_ds.StartTransaction() != 0:
-        gdaltest.post_reason('fail')
         return 'fail'
     (lastcmd, level, savepoint, usertransac) = ogr_pg_76_get_transaction_state(gdaltest.pg_ds)
     if (lastcmd, level, savepoint, usertransac) != ('BEGIN', 1, 0, 1):
-        gdaltest.post_reason('fail')
         print(lastcmd, level, savepoint, usertransac)
         return 'fail'
 
@@ -4575,49 +4432,39 @@ def ogr_pg_76_scenario2(lyr1, lyr2with_and_without_postgis):
     ret = gdaltest.pg_ds.StartTransaction()
     gdal.PopErrorHandler()
     if gdal.GetLastErrorMsg() == '' or ret == 0:
-        gdaltest.post_reason('fail')
         return 'fail'
     (lastcmd, level, savepoint, usertransac) = ogr_pg_76_get_transaction_state(gdaltest.pg_ds)
     if (lastcmd, level, savepoint, usertransac) != ('', 1, 0, 1):
-        gdaltest.post_reason('fail')
         print(lastcmd, level, savepoint, usertransac)
         return 'fail'
 
     f = lyr1.GetNextFeature()
     if f is None or f.GetFID() != 1:
-        gdaltest.post_reason('fail')
         return 'fail'
     (lastcmd, level, savepoint, usertransac) = ogr_pg_76_get_transaction_state(gdaltest.pg_ds)
     if (lastcmd, level, savepoint, usertransac) != ('', 2, 0, 1):
-        gdaltest.post_reason('fail')
         print(lastcmd, level, savepoint, usertransac)
         return 'fail'
 
     f = lyr2.GetNextFeature()
     if f is None or f.GetFID() != 1:
-        gdaltest.post_reason('fail')
         return 'fail'
     (lastcmd, level, savepoint, usertransac) = ogr_pg_76_get_transaction_state(gdaltest.pg_ds)
     if (lastcmd, level, savepoint, usertransac) != ('', 3, 0, 1):
-        gdaltest.post_reason('fail')
         print(lastcmd, level, savepoint, usertransac)
         return 'fail'
 
     f = lyr1.GetNextFeature()
     if f is None or f.GetFID() != 2:
-        gdaltest.post_reason('fail')
         return 'fail'
     f = lyr1.GetNextFeature()
     if f is None or f.GetFID() != 3:
-        gdaltest.post_reason('fail')
         return 'fail'
     f = lyr2.GetNextFeature()
     if f is None or f.GetFID() != 2:
-        gdaltest.post_reason('fail')
         return 'fail'
     (lastcmd, level, savepoint, usertransac) = ogr_pg_76_get_transaction_state(gdaltest.pg_ds)
     if (lastcmd, level, savepoint, usertransac) != ('', 3, 0, 1):
-        gdaltest.post_reason('fail')
         print(lastcmd, level, savepoint, usertransac)
         return 'fail'
 
@@ -4626,36 +4473,29 @@ def ogr_pg_76_scenario2(lyr1, lyr2with_and_without_postgis):
     lyr1.ResetReading()
     (lastcmd, level, savepoint, usertransac) = ogr_pg_76_get_transaction_state(gdaltest.pg_ds)
     if (lastcmd, level, savepoint, usertransac) != ('', 2, 0, 1):
-        gdaltest.post_reason('fail')
         print(lastcmd, level, savepoint, usertransac)
         return 'fail'
 
     lyr2.ResetReading()
     (lastcmd, level, savepoint, usertransac) = ogr_pg_76_get_transaction_state(gdaltest.pg_ds)
     if (lastcmd, level, savepoint, usertransac) != ('', 1, 0, 1):
-        gdaltest.post_reason('fail')
         print(lastcmd, level, savepoint, usertransac)
         return 'fail'
 
     if gdaltest.pg_ds.CommitTransaction() != 0:
-        gdaltest.post_reason('fail')
         return 'fail'
     (lastcmd, level, savepoint, usertransac) = ogr_pg_76_get_transaction_state(gdaltest.pg_ds)
     if (lastcmd, level, savepoint, usertransac) != ('COMMIT', 0, 0, 0):
-        gdaltest.post_reason('fail')
         print(lastcmd, level, savepoint, usertransac)
         return 'fail'
 
     if gdaltest.pg_ds.StartTransaction() != 0:
-        gdaltest.post_reason('fail')
         return 'fail'
 
     if gdaltest.pg_ds.RollbackTransaction() != 0:
-        gdaltest.post_reason('fail')
         return 'fail'
     (lastcmd, level, savepoint, usertransac) = ogr_pg_76_get_transaction_state(gdaltest.pg_ds)
     if (lastcmd, level, savepoint, usertransac) != ('ROLLBACK', 0, 0, 0):
-        gdaltest.post_reason('fail')
         print(lastcmd, level, savepoint, usertransac)
         return 'fail'
 
@@ -4665,11 +4505,9 @@ def ogr_pg_76_scenario2(lyr1, lyr2with_and_without_postgis):
     ret = gdaltest.pg_ds.CommitTransaction()
     gdal.PopErrorHandler()
     if gdal.GetLastErrorMsg() == '' or ret == 0:
-        gdaltest.post_reason('fail')
         return 'fail'
     (lastcmd, level, savepoint, usertransac) = ogr_pg_76_get_transaction_state(gdaltest.pg_ds)
     if (lastcmd, level, savepoint, usertransac) != ('', 0, 0, 0):
-        gdaltest.post_reason('fail')
         print(lastcmd, level, savepoint, usertransac)
         return 'fail'
 
@@ -4679,11 +4517,9 @@ def ogr_pg_76_scenario2(lyr1, lyr2with_and_without_postgis):
     ret = gdaltest.pg_ds.RollbackTransaction()
     gdal.PopErrorHandler()
     if gdal.GetLastErrorMsg() == '' or ret == 0:
-        gdaltest.post_reason('fail')
         return 'fail'
     (lastcmd, level, savepoint, usertransac) = ogr_pg_76_get_transaction_state(gdaltest.pg_ds)
     if (lastcmd, level, savepoint, usertransac) != ('', 0, 0, 0):
-        gdaltest.post_reason('fail')
         print(lastcmd, level, savepoint, usertransac)
         return 'fail'
 
@@ -4695,30 +4531,24 @@ def ogr_pg_76_scenario2(lyr1, lyr2with_and_without_postgis):
 def ogr_pg_76_scenario3(lyr1, lyr2with_and_without_postgis):
 
     if gdaltest.pg_ds.StartTransaction() != 0:
-        gdaltest.post_reason('fail')
         return 'fail'
     (lastcmd, level, savepoint, usertransac) = ogr_pg_76_get_transaction_state(gdaltest.pg_ds)
     if (lastcmd, level, savepoint, usertransac) != ('BEGIN', 1, 0, 1):
-        gdaltest.post_reason('fail')
         print(lastcmd, level, savepoint, usertransac)
         return 'fail'
 
     f = lyr1.GetNextFeature()
     if f is None or f.GetFID() != 1:
-        gdaltest.post_reason('fail')
         return 'fail'
     (lastcmd, level, savepoint, usertransac) = ogr_pg_76_get_transaction_state(gdaltest.pg_ds)
     if (lastcmd, level, savepoint, usertransac) != ('', 2, 0, 1):
-        gdaltest.post_reason('fail')
         print(lastcmd, level, savepoint, usertransac)
         return 'fail'
 
     if gdaltest.pg_ds.CommitTransaction() != 0:
-        gdaltest.post_reason('fail')
         return 'fail'
     (lastcmd, level, savepoint, usertransac) = ogr_pg_76_get_transaction_state(gdaltest.pg_ds)
     if (lastcmd, level, savepoint, usertransac) != ('COMMIT', 0, 0, 0):
-        gdaltest.post_reason('fail')
         print(lastcmd, level, savepoint, usertransac)
         return 'fail'
 
@@ -4727,7 +4557,6 @@ def ogr_pg_76_scenario3(lyr1, lyr2with_and_without_postgis):
     f = lyr1.GetNextFeature()
     gdal.PopErrorHandler()
     if gdal.GetLastErrorMsg() == '' or f is not None:
-        gdaltest.post_reason('fail')
         return 'fail'
 
     # Must re-issue an explicit ResetReading()
@@ -4735,18 +4564,15 @@ def ogr_pg_76_scenario3(lyr1, lyr2with_and_without_postgis):
 
     f = lyr1.GetNextFeature()
     if f is None or f.GetFID() != 1:
-        gdaltest.post_reason('fail')
         return 'fail'
     (lastcmd, level, savepoint, usertransac) = ogr_pg_76_get_transaction_state(gdaltest.pg_ds)
     if (lastcmd, level, savepoint, usertransac) != ('BEGIN', 1, 0, 0):
-        gdaltest.post_reason('fail')
         print(lastcmd, level, savepoint, usertransac)
         return 'fail'
 
     lyr1.ResetReading()
     (lastcmd, level, savepoint, usertransac) = ogr_pg_76_get_transaction_state(gdaltest.pg_ds)
     if (lastcmd, level, savepoint, usertransac) != ('COMMIT', 0, 0, 0):
-        gdaltest.post_reason('fail')
         print(lastcmd, level, savepoint, usertransac)
         return 'fail'
 
@@ -4761,26 +4587,21 @@ def ogr_pg_76_scenario4(lyr1, lyr2with_and_without_postgis):
 
     (lastcmd, level, savepoint, usertransac) = ogr_pg_76_get_transaction_state(gdaltest.pg_ds)
     if (lastcmd, level, savepoint, usertransac) != ('', 0, 0, 0):
-        gdaltest.post_reason('fail')
         print(lastcmd, level, savepoint, usertransac)
         return 'fail'
 
     f = lyr1.GetNextFeature()
     if f is None or f.GetFID() != 1:
-        gdaltest.post_reason('fail')
         return 'fail'
     (lastcmd, level, savepoint, usertransac) = ogr_pg_76_get_transaction_state(gdaltest.pg_ds)
     if (lastcmd, level, savepoint, usertransac) != ('BEGIN', 1, 0, 0):
-        gdaltest.post_reason('fail')
         print(lastcmd, level, savepoint, usertransac)
         return 'fail'
 
     if gdaltest.pg_ds.StartTransaction() != 0:
-        gdaltest.post_reason('fail')
         return 'fail'
     (lastcmd, level, savepoint, usertransac) = ogr_pg_76_get_transaction_state(gdaltest.pg_ds)
     if (lastcmd, level, savepoint, usertransac) != ('SAVEPOINT ogr_savepoint', 2, 1, 1):
-        gdaltest.post_reason('fail')
         print(lastcmd, level, savepoint, usertransac)
         return 'fail'
 
@@ -4788,15 +4609,12 @@ def ogr_pg_76_scenario4(lyr1, lyr2with_and_without_postgis):
 
     f = lyr1.GetNextFeature()
     if f is None or f.GetFID() != 2:
-        gdaltest.post_reason('fail')
         return 'fail'
     f = lyr2.GetNextFeature()
     if f is None or f.GetFID() != 1:
-        gdaltest.post_reason('fail')
         return 'fail'
     (lastcmd, level, savepoint, usertransac) = ogr_pg_76_get_transaction_state(gdaltest.pg_ds)
     if (lastcmd, level, savepoint, usertransac) != ('', 3, 1, 1):
-        gdaltest.post_reason('fail')
         print(lastcmd, level, savepoint, usertransac)
         return 'fail'
 
@@ -4804,58 +4622,47 @@ def ogr_pg_76_scenario4(lyr1, lyr2with_and_without_postgis):
     lyr1.SetAttributeFilter("foo is NULL")
     (lastcmd, level, savepoint, usertransac) = ogr_pg_76_get_transaction_state(gdaltest.pg_ds)
     if (lastcmd, level, savepoint, usertransac) != ('', 2, 1, 1):
-        gdaltest.post_reason('fail')
         print(lastcmd, level, savepoint, usertransac)
         return 'fail'
 
     f = lyr1.GetNextFeature()
     if f is None or f.GetFID() != 1:
-        gdaltest.post_reason('fail')
         return 'fail'
     (lastcmd, level, savepoint, usertransac) = ogr_pg_76_get_transaction_state(gdaltest.pg_ds)
     if (lastcmd, level, savepoint, usertransac) != ('', 3, 1, 1):
-        gdaltest.post_reason('fail')
         print(lastcmd, level, savepoint, usertransac)
         return 'fail'
 
     f = lyr2.GetNextFeature()
     if f is None or f.GetFID() != 2:
-        gdaltest.post_reason('fail')
         return 'fail'
 
     if gdaltest.pg_ds.CommitTransaction() != 0:
-        gdaltest.post_reason('fail')
         return 'fail'
     (lastcmd, level, savepoint, usertransac) = ogr_pg_76_get_transaction_state(gdaltest.pg_ds)
     if (lastcmd, level, savepoint, usertransac) != ('RELEASE SAVEPOINT ogr_savepoint', 2, 0, 0):
-        gdaltest.post_reason('fail')
         print(lastcmd, level, savepoint, usertransac)
         return 'fail'
 
     lyr2.ResetReading()
 
     if gdaltest.pg_ds.StartTransaction() != 0:
-        gdaltest.post_reason('fail')
         return 'fail'
 
     if gdaltest.pg_ds.RollbackTransaction() != 0:
-        gdaltest.post_reason('fail')
         return 'fail'
     (lastcmd, level, savepoint, usertransac) = ogr_pg_76_get_transaction_state(gdaltest.pg_ds)
     if (lastcmd, level, savepoint, usertransac) != ('ROLLBACK TO SAVEPOINT ogr_savepoint', 1, 0, 0):
-        gdaltest.post_reason('fail')
         print(lastcmd, level, savepoint, usertransac)
         return 'fail'
 
     f = lyr1.GetNextFeature()
     if f is None or f.GetFID() != 2:
-        gdaltest.post_reason('fail')
         return 'fail'
 
     lyr1.ResetReading()
     (lastcmd, level, savepoint, usertransac) = ogr_pg_76_get_transaction_state(gdaltest.pg_ds)
     if (lastcmd, level, savepoint, usertransac) != ('COMMIT', 0, 0, 0):
-        gdaltest.post_reason('fail')
         print(lastcmd, level, savepoint, usertransac)
         return 'fail'
 
@@ -4950,24 +4757,18 @@ def test_ogr_pg_78(with_and_without_postgis):
         if lyr.GetName() == 'ogr_pg_78':
             ogr_pg_78_found = True
             if lyr.GetGeomType() != ogr.wkbPoint25D:
-                gdaltest.post_reason('fail')
                 return 'fail'
             if lyr.GetSpatialRef().ExportToWkt().find('4326') < 0:
-                gdaltest.post_reason('fail')
                 return 'fail'
         if lyr.GetName() == 'ogr_pg_78_2':
             ogr_pg_78_2_found = True
             if lyr.GetGeomType() != ogr.wkbPoint25D:
-                gdaltest.post_reason('fail')
                 return 'fail'
             if lyr.GetSpatialRef().ExportToWkt().find('4326') < 0:
-                gdaltest.post_reason('fail')
                 return 'fail'
     if not ogr_pg_78_found:
-        gdaltest.post_reason('fail')
         return 'fail'
     if not ogr_pg_78_2_found:
-        gdaltest.post_reason('fail')
         return 'fail'
 
     gdaltest.pg_ds = None
@@ -4990,14 +4791,12 @@ def test_ogr_pg_78(with_and_without_postgis):
                 if val is not None:
                     print('Fails on Travis. geom_type = %d' % lyr.GetGeomType())
                 else:
-                    gdaltest.post_reason('fail')
                     return 'fail'
             if lyr.GetSpatialRef() is None or lyr.GetSpatialRef().ExportToWkt().find('4326') < 0:
                 val = gdal.GetConfigOption('TRAVIS', None)
                 if val is not None:
                     print('Fails on Travis. GetSpatialRef() = %s' % str(lyr.GetSpatialRef()))
                 else:
-                    gdaltest.post_reason('fail')
                     return 'fail'
         if lyr.GetName() == 'ogr_pg_78_2':
             ogr_pg_78_2_found = True
@@ -5009,10 +4808,8 @@ def test_ogr_pg_78(with_and_without_postgis):
             #    gdaltest.post_reason('fail')
             #    return 'fail'
     if not ogr_pg_78_found:
-        gdaltest.post_reason('fail')
         return 'fail'
     if not ogr_pg_78_2_found:
-        gdaltest.post_reason('fail')
         return 'fail'
 
     return 'success'
@@ -5034,22 +4831,18 @@ def test_ogr_pg_79(with_and_without_postgis):
     sql_lyr = ds.ExecuteSQL('SHOW statement_timeout')
     f = sql_lyr.GetNextFeature()
     if f.GetField(0) != '1h':
-        gdaltest.post_reason('fail')
         f.DumpReadable()
         return 'fail'
     ds.ReleaseResultSet(sql_lyr)
     ret = ds.StartTransaction()
     if ret != 0:
-        gdaltest.post_reason('fail')
         return 'fail'
     ret = ds.CommitTransaction()
     if ret != 0:
-        gdaltest.post_reason('fail')
         return 'fail'
     gdal.ErrorReset()
     ds = None
     if gdal.GetLastErrorMsg() != '':
-        gdaltest.post_reason('fail')
         return 'fail'
 
     # random PRELUDE_STATEMENTS
@@ -5059,22 +4852,18 @@ def test_ogr_pg_79(with_and_without_postgis):
     sql_lyr = ds.ExecuteSQL('SHOW statement_timeout')
     f = sql_lyr.GetNextFeature()
     if f.GetField(0) != '1h':
-        gdaltest.post_reason('fail')
         f.DumpReadable()
         return 'fail'
     ds.ReleaseResultSet(sql_lyr)
     ret = ds.StartTransaction()
     if ret != 0:
-        gdaltest.post_reason('fail')
         return 'fail'
     ret = ds.CommitTransaction()
     if ret != 0:
-        gdaltest.post_reason('fail')
         return 'fail'
     gdal.ErrorReset()
     ds = None
     if gdal.GetLastErrorMsg() != '':
-        gdaltest.post_reason('fail')
         return 'fail'
 
     # Test wrong PRELUDE_STATEMENTS
@@ -5084,7 +4873,6 @@ def test_ogr_pg_79(with_and_without_postgis):
                          open_options=['PRELUDE_STATEMENTS=BEGIN;error SET LOCAL statement_timeout TO "1h";',
                                        'CLOSING_STATEMENTS=COMMIT;'])
     if ds is not None:
-        gdaltest.post_reason('fail')
         return 'fail'
 
     # Test wrong CLOSING_STATEMENTS
@@ -5096,7 +4884,6 @@ def test_ogr_pg_79(with_and_without_postgis):
     with gdaltest.error_handler():
         ds = None
     if gdal.GetLastErrorMsg() == '':
-        gdaltest.post_reason('fail')
         return 'fail'
 
     return 'success'
@@ -5114,10 +4901,8 @@ def test_ogr_pg_80():
     with gdaltest.error_handler():
         sql_lyr = gdaltest.pg_ds.ExecuteSQL('SELECT FROM')
     if gdal.GetLastErrorMsg() == '':
-        gdaltest.post_reason('fail')
         return 'fail'
     if sql_lyr is not None:
-        gdaltest.post_reason('fail')
         return 'fail'
 
     return 'success'
@@ -5161,7 +4946,6 @@ def test_ogr_pg_81():
     f = lyr.GetNextFeature()
     f = lyr.GetNextFeature()
     if f['id'] != '2':
-        gdaltest.post_reason('fail')
         f.DumpReadable()
         return 'fail'
     lyr.ResetReading()  # flushes implicit transaction
@@ -5183,7 +4967,6 @@ def test_ogr_pg_82():
     lyr = gdaltest.pg_ds.CreateLayer('ogr_pg_82', geom_type=ogr.wkbNone, options=['GEOMETRY_NAME=another_name'])
     lyr.CreateGeomField(ogr.GeomFieldDefn('my_geom', ogr.wkbPoint))
     if lyr.GetLayerDefn().GetGeomFieldDefn(0).GetName() != 'another_name':
-        gdaltest.post_reason('fail')
         print(lyr.GetLayerDefn().GetGeomFieldDefn(0).GetName())
         return 'fail'
 
@@ -5222,7 +5005,6 @@ def test_ogr_pg_83():
             if geom is not None:
                 got_wkt = geom.ExportToIsoWkt()
         if got_wkt != expected_wkt:
-            gdaltest.post_reason('fail')
             print(geom_type, options, wkt, expected_wkt, got_wkt)
             return 'fail'
         lyr.ResetReading()  # flushes implicit transaction
@@ -5251,7 +5033,6 @@ def test_ogr_pg_83():
             if geom is not None:
                 got_wkt = geom.ExportToIsoWkt()
         if got_wkt != expected_wkt:
-            gdaltest.post_reason('fail')
             print(geom_type, options, wkt, expected_wkt, got_wkt)
             return 'fail'
         lyr.ResetReading()  # flushes implicit transaction
@@ -5273,10 +5054,8 @@ def test_ogr_pg_84():
     lyr.SetMetadata({'DESCRIPTION': 'bar'})
     lyr.SetMetadataItem('DESCRIPTION', 'baz')
     if lyr.GetMetadataItem('DESCRIPTION') != 'foo':
-        gdaltest.post_reason('fail')
         return 'fail'
     if lyr.GetMetadata_List() != ['DESCRIPTION=foo']:
-        gdaltest.post_reason('fail')
         print(lyr.GetMetadata())
         return 'fail'
     ds = None
@@ -5285,10 +5064,8 @@ def test_ogr_pg_84():
     ds.GetLayerCount()  # load all layers
     lyr = ds.GetLayerByName('ogr_pg_84')
     if lyr.GetMetadataItem('DESCRIPTION') != 'foo':
-        gdaltest.post_reason('fail')
         return 'fail'
     if lyr.GetMetadata_List() != ['DESCRIPTION=foo']:
-        gdaltest.post_reason('fail')
         print(lyr.GetMetadata())
         return 'fail'
     # Set with SetMetadata()
@@ -5298,10 +5075,8 @@ def test_ogr_pg_84():
     ds = ogr.Open('PG:' + gdaltest.pg_connection_string, update=1)
     lyr = ds.GetLayerByName('ogr_pg_84')  # load just this layer
     if lyr.GetMetadataItem('DESCRIPTION') != 'bar':
-        gdaltest.post_reason('fail')
         return 'fail'
     if lyr.GetMetadataDomainList() is None:
-        gdaltest.post_reason('fail')
         return 'fail'
     # Set with SetMetadataItem()
     lyr.SetMetadataItem('DESCRIPTION', 'baz')
@@ -5310,10 +5085,8 @@ def test_ogr_pg_84():
     ds = ogr.Open('PG:' + gdaltest.pg_connection_string, update=1)
     lyr = ds.GetLayerByName('ogr_pg_84')
     if lyr.GetMetadataDomainList() is None:
-        gdaltest.post_reason('fail')
         return 'fail'
     if lyr.GetMetadataItem('DESCRIPTION') != 'baz':
-        gdaltest.post_reason('fail')
         return 'fail'
     # Unset with SetMetadataItem()
     lyr.SetMetadataItem('DESCRIPTION', None)
@@ -5322,10 +5095,8 @@ def test_ogr_pg_84():
     ds = ogr.Open('PG:' + gdaltest.pg_connection_string)
     lyr = ds.GetLayerByName('ogr_pg_84')  # load just this layer
     if lyr.GetMetadataDomainList() is not None:
-        gdaltest.post_reason('fail')
         return 'fail'
     if lyr.GetMetadataItem('DESCRIPTION') is not None:
-        gdaltest.post_reason('fail')
         return 'fail'
     ds = None
 
@@ -5333,7 +5104,6 @@ def test_ogr_pg_84():
     ds.GetLayerCount()  # load all layers
     lyr = ds.GetLayerByName('ogr_pg_84')  # load just this layer
     if lyr.GetMetadataItem('DESCRIPTION') is not None:
-        gdaltest.post_reason('fail')
         return 'fail'
     ds = None
 
@@ -5364,11 +5134,9 @@ def test_ogr_pg_85():
     lyr = ds.GetLayerByName('ogr_pg_85_2')
     feat_defn = lyr.GetLayerDefn()
     if feat_defn.GetFieldCount() != 1:
-        gdaltest.post_reason('fail')
         return 'fail'
     f = ogr.Feature(feat_defn)
     if lyr.CreateFeature(f) != 0:
-        gdaltest.post_reason('fail')
         return 'fail'
     ds.CommitTransaction()
     ds = None
@@ -5394,7 +5162,6 @@ def test_ogr_pg_85():
 
     lyr = gdaltest.pg_ds.GetLayerByName('ogr_pg_85_2')
     if lyr.GetFeatureCount() != 2:
-        gdaltest.post_reason('fail')
         print(lyr.GetFeatureCount())
         return 'fail'
 
@@ -5421,7 +5188,6 @@ def test_ogr_pg_86():
     lyr.ResetReading()
     f = lyr.GetNextFeature()
     if f.GetField(0) != '3020':
-        gdaltest.post_reason('fail')
         gdal.SetConfigOption('PG_USE_COPY', old_val)
         return 'fail'
 
@@ -5435,7 +5201,6 @@ def test_ogr_pg_86():
     lyr.ResetReading()
     f = lyr.GetNextFeature()
     if f.GetField(0) != '3020':
-        gdaltest.post_reason('fail')
         gdal.SetConfigOption('PG_USE_COPY', old_val)
         return 'fail'
 
@@ -5464,7 +5229,6 @@ def test_ogr_pg_87():
     f = ogr.Feature(lyr.GetLayerDefn())
     lyr.CreateFeature(f)
     if f.GetFID() != 11:
-        gdaltest.post_reason('fail')
         return 'fail'
 
     # Test updating of sequence after CreateFeatureViaInsert
@@ -5473,7 +5237,6 @@ def test_ogr_pg_87():
     f = ogr.Feature(lyr.GetLayerDefn())
     lyr.CreateFeature(f)
     if f.GetFID() != 12:
-        gdaltest.post_reason('fail')
         return 'fail'
 
     return 'success'
@@ -5498,17 +5261,14 @@ def test_ogr_pg_json():
     gdaltest.pg_ds = ogr.Open('PG:' + gdaltest.pg_connection_string, update=1)
     lyr = gdaltest.pg_ds.GetLayer('ogr_pg_json')
     if lyr.GetLayerDefn().GetFieldDefn(0).GetSubType() != ogr.OFSTJSON:
-        gdaltest.post_reason('fail')
         return 'fail'
     f = lyr.GetNextFeature()
     if f.GetField(0) != '{"a": "b"}':
-        gdaltest.post_reason('fail')
         f.DumpReadable()
         return 'fail'
 
     sql_lyr = gdaltest.pg_ds.ExecuteSQL('SELECT * FROM ogr_pg_json')
     if sql_lyr.GetLayerDefn().GetFieldDefn(0).GetSubType() != ogr.OFSTJSON:
-        gdaltest.post_reason('fail')
         return 'fail'
     gdaltest.pg_ds.ReleaseResultSet(sql_lyr)
 
diff --git a/autotest/ogr/ogr_pgdump.py b/autotest/ogr/ogr_pgdump.py
index f9e4d25096ef..b787c30b4c9c 100755
--- a/autotest/ogr/ogr_pgdump.py
+++ b/autotest/ogr/ogr_pgdump.py
@@ -274,14 +274,12 @@ def test_ogr_pgdump_4():
 
     ds = ogr.GetDriverByName('PGDump').CreateDataSource('tmp/ogr_pgdump_4.sql', options=['LINEFORMAT=LF'])
     if ds.TestCapability(ogr.ODsCCreateGeomFieldAfterCreateLayer) == 0:
-        gdaltest.post_reason('fail')
         return 'fail'
 
     ######################################################
     # Create Layer
     lyr = ds.CreateLayer('test', geom_type=ogr.wkbNone, options=['WRITE_EWKT_GEOM=YES'])
     if lyr.TestCapability(ogr.OLCCreateGeomField) == 0:
-        gdaltest.post_reason('fail')
         return 'fail'
 
     gfld_defn = ogr.GeomFieldDefn("point_nosrs", ogr.wkbPoint)
@@ -350,7 +348,6 @@ def test_ogr_pgdump_5():
     ret = lyr.CreateFeature(f)
     gdal.PopErrorHandler()
     if ret == 0:
-        gdaltest.post_reason('fail')
         return 'fail'
     f = None
 
@@ -361,7 +358,6 @@ def test_ogr_pgdump_5():
     ret = lyr.CreateFeature(f)
     gdal.PopErrorHandler()
     if ret == 0:
-        gdaltest.post_reason('fail')
         return 'fail'
     f = None
 
@@ -489,12 +485,10 @@ def test_ogr_pgdump_7():
     ret = lyr.CreateField(ogr.FieldDefn('myfid', ogr.OFTString))
     gdal.PopErrorHandler()
     if ret == 0:
-        gdaltest.post_reason('fail')
         return 'fail'
 
     ret = lyr.CreateField(ogr.FieldDefn('myfid', ogr.OFTInteger))
     if ret != 0:
-        gdaltest.post_reason('fail')
         return 'fail'
     lyr.CreateField(ogr.FieldDefn('str2', ogr.OFTString))
 
@@ -504,24 +498,19 @@ def test_ogr_pgdump_7():
     feat.SetField('str2', 'second string')
     ret = lyr.CreateFeature(feat)
     if ret != 0:
-        gdaltest.post_reason('fail')
         return 'fail'
     if feat.GetFID() != 10:
-        gdaltest.post_reason('fail')
         return 'fail'
 
     feat = ogr.Feature(lyr.GetLayerDefn())
     feat.SetField('str2', 'second string')
     ret = lyr.CreateFeature(feat)
     if ret != 0:
-        gdaltest.post_reason('fail')
         return 'fail'
     if feat.GetFID() < 0:
-        gdaltest.post_reason('fail')
         feat.DumpReadable()
         return 'fail'
     if feat.GetField('myfid') != feat.GetFID():
-        gdaltest.post_reason('fail')
         feat.DumpReadable()
         return 'fail'
 
@@ -538,7 +527,6 @@ def test_ogr_pgdump_7():
     ret = lyr.CreateFeature(feat)
     gdal.PopErrorHandler()
     if ret == 0:
-        gdaltest.post_reason('fail')
         return 'fail'
 
     # gdal.PushErrorHandler()
@@ -562,10 +550,8 @@ def test_ogr_pgdump_7():
     feat.SetField('str2', 'second string')
     ret = lyr.CreateFeature(feat)
     if ret != 0:
-        gdaltest.post_reason('fail')
         return 'fail'
     if feat.GetFID() != 12:
-        gdaltest.post_reason('fail')
         return 'fail'
 
     ds = None
@@ -600,12 +586,10 @@ def test_ogr_pgdump_8():
     ret = lyr.CreateField(ogr.FieldDefn('myfid', ogr.OFTString))
     gdal.PopErrorHandler()
     if ret == 0:
-        gdaltest.post_reason('fail')
         return 'fail'
 
     ret = lyr.CreateField(ogr.FieldDefn('myfid', ogr.OFTInteger))
     if ret != 0:
-        gdaltest.post_reason('fail')
         return 'fail'
     lyr.CreateField(ogr.FieldDefn('str2', ogr.OFTString))
 
@@ -617,10 +601,8 @@ def test_ogr_pgdump_8():
     ret = lyr.CreateFeature(feat)
     gdal.SetConfigOption('PG_USE_COPY', None)
     if ret != 0:
-        gdaltest.post_reason('fail')
         return 'fail'
     if feat.GetFID() != 10:
-        gdaltest.post_reason('fail')
         return 'fail'
 
     feat = ogr.Feature(lyr.GetLayerDefn())
@@ -629,14 +611,11 @@ def test_ogr_pgdump_8():
     ret = lyr.CreateFeature(feat)
     gdal.SetConfigOption('PG_USE_COPY', None)
     if ret != 0:
-        gdaltest.post_reason('fail')
         return 'fail'
     if feat.GetFID() < 0:
-        gdaltest.post_reason('fail')
         feat.DumpReadable()
         return 'fail'
     if feat.GetField('myfid') != feat.GetFID():
-        gdaltest.post_reason('fail')
         feat.DumpReadable()
         return 'fail'
 
@@ -655,7 +634,6 @@ def test_ogr_pgdump_8():
     gdal.SetConfigOption('PG_USE_COPY', None)
     gdal.PopErrorHandler()
     if ret == 0:
-        gdaltest.post_reason('fail')
         return 'fail'
 
     # gdal.PushErrorHandler()
@@ -681,10 +659,8 @@ def test_ogr_pgdump_8():
     ret = lyr.CreateFeature(feat)
     gdal.SetConfigOption('PG_USE_COPY', None)
     if ret != 0:
-        gdaltest.post_reason('fail')
         return 'fail'
     if feat.GetFID() != 12:
-        gdaltest.post_reason('fail')
         return 'fail'
 
     ds = None
@@ -870,7 +846,6 @@ def test_ogr_pgdump_13():
 
         for expected_string in expected_strings:
             if sql.find(expected_string) < 0:
-                gdaltest.post_reason('fail')
                 print(geom_type, options, wkt, expected_string)
                 print(sql)
                 return 'fail'
@@ -895,7 +870,6 @@ def test_ogr_pgdump_13():
 
         for expected_string in expected_strings:
             if sql.find(expected_string) < 0:
-                gdaltest.post_reason('fail')
                 print(geom_type, options, wkt, expected_string)
                 print(sql)
                 return 'fail'
@@ -923,7 +897,6 @@ def test_ogr_pgdump_14():
     gdal.Unlink('/vsimem/ogr_pgdump_14.sql')
 
     if sql.find("""COMMENT ON TABLE "public"."ogr_pgdump_14" IS 'foo';""") < 0 or sql.find('bar') >= 0 or sql.find('baz') >= 0:
-        gdaltest.post_reason('fail')
         print(sql)
         return 'fail'
 
@@ -939,7 +912,6 @@ def test_ogr_pgdump_14():
 
     gdal.Unlink('/vsimem/ogr_pgdump_14.sql')
     if sql.find("""COMMENT ON TABLE "public"."ogr_pgdump_14" IS 'bar';""") < 0:
-        gdaltest.post_reason('fail')
         print(sql)
         return 'fail'
 
@@ -955,7 +927,6 @@ def test_ogr_pgdump_14():
 
     gdal.Unlink('/vsimem/ogr_pgdump_14.sql')
     if sql.find("""COMMENT ON TABLE "public"."ogr_pgdump_14" IS 'baz';""") < 0:
-        gdaltest.post_reason('fail')
         print(sql)
         return 'fail'
 
diff --git a/autotest/ogr/ogr_plscenes.py b/autotest/ogr/ogr_plscenes.py
index f888a826630e..112a3e1eb471 100755
--- a/autotest/ogr/ogr_plscenes.py
+++ b/autotest/ogr/ogr_plscenes.py
@@ -63,21 +63,16 @@ def test_ogr_plscenes_data_v1_catalog_no_paging():
     ds = gdal.OpenEx('PLScenes:', gdal.OF_VECTOR, open_options=['VERSION=data_v1', 'API_KEY=foo'])
     gdal.SetConfigOption('PL_URL', None)
     if ds is None:
-        gdaltest.post_reason('fail')
         return 'fail'
     with gdaltest.error_handler():
         if ds.GetLayerByName('non_existing') is not None:
-            gdaltest.post_reason('fail')
             return 'fail'
     if ds.GetLayerByName('PSScene3Band') is None:
-        gdaltest.post_reason('fail')
         return 'fail'
     if ds.GetLayerCount() != 1:
-        gdaltest.post_reason('fail')
         return 'fail'
     with gdaltest.error_handler():
         if ds.GetLayerByName('non_existing') is not None:
-            gdaltest.post_reason('fail')
             return 'fail'
 
     gdal.Unlink('/vsimem/data_v1/item-types')
@@ -99,28 +94,21 @@ def test_ogr_plscenes_data_v1_catalog_paging():
     ds = gdal.OpenEx('PLScenes:', gdal.OF_VECTOR, open_options=['VERSION=data_v1', 'API_KEY=foo'])
     gdal.SetConfigOption('PL_URL', None)
     if ds is None:
-        gdaltest.post_reason('fail')
         return 'fail'
     with gdaltest.error_handler():
         if ds.GetLayerByName('non_existing') is not None:
-            gdaltest.post_reason('fail')
             return 'fail'
     if ds.GetLayerByName('PSScene3Band') is None:
-        gdaltest.post_reason('fail')
         return 'fail'
     gdal.FileFromMemBuffer('/vsimem/data_v1/item-types/PSScene4Band', '{ "id": "PSScene4Band"} }')
     if ds.GetLayerByName('PSScene4Band') is None:
-        gdaltest.post_reason('fail')
         return 'fail'
     if ds.GetLayerCount() != 2:
-        gdaltest.post_reason('fail')
         return 'fail'
     if ds.GetLayerByName('PSScene4Band') is None:
-        gdaltest.post_reason('fail')
         return 'fail'
     with gdaltest.error_handler():
         if ds.GetLayerByName('non_existing') is not None:
-            gdaltest.post_reason('fail')
             return 'fail'
 
     gdal.Unlink('/vsimem/data_v1/item-types')
@@ -148,44 +136,36 @@ def test_ogr_plscenes_data_v1_nominal():
     ds = gdal.OpenEx('PLScenes:', gdal.OF_VECTOR, open_options=['VERSION=data_v1', 'API_KEY=foo'])
     gdal.SetConfigOption('PL_URL', None)
     if ds is None:
-        gdaltest.post_reason('fail')
         return 'fail'
 
     gdal.SetConfigOption('PL_URL', '/vsimem/data_v1/')
     ds = gdal.OpenEx('PLScenes:version=data_v1,api_key=foo,FOLLOW_LINKS=YES', gdal.OF_VECTOR)
     gdal.SetConfigOption('PL_URL', None)
     if ds is None:
-        gdaltest.post_reason('fail')
         return 'fail'
 
     lyr = ds.GetLayer(0)
     if lyr.GetName() != 'PSOrthoTile':
-        gdaltest.post_reason('fail')
         return 'fail'
     if lyr.TestCapability(ogr.OLCFastFeatureCount) != 1 or \
        lyr.TestCapability(ogr.OLCStringsAsUTF8) != 1 or \
        lyr.TestCapability(ogr.OLCRandomRead) != 0:
-        gdaltest.post_reason('fail')
         return 'fail'
     # Different serialization depending on libjson versions
     gdal.FileFromMemBuffer("""/vsimem/data_v1/stats&POSTFIELDS={"interval":"year","item_types":["PSOrthoTile"],"filter":{"type":"AndFilter","config":[{"type":"RangeFilter","field_name":"cloud_cover","config":{"gte":0.000000}}]}}""", """{ "buckets": [ { "count": 1 }, { "count": 1} ] }""")
     gdal.FileFromMemBuffer("""/vsimem/data_v1/stats&POSTFIELDS={"interval":"year","item_types":["PSOrthoTile"],"filter":{"type":"AndFilter","config":[{"type":"RangeFilter","field_name":"cloud_cover","config":{"gte":0}}]}}""", """{ "buckets": [ { "count": 1 }, { "count": 1} ] }""")
     gdal.FileFromMemBuffer("""/vsimem/data_v1/stats&POSTFIELDS={"interval":"year","item_types":["PSOrthoTile"],"filter":{"type":"AndFilter","config":[{"type":"RangeFilter","field_name":"cloud_cover","config":{"gte":0.0}}]}}""", """{ "buckets": [ { "count": 1 }, { "count": 1} ] }""")
     if lyr.GetFeatureCount() != 2:
-        gdaltest.post_reason('fail')
         return 'fail'
     if lyr.GetGeomType() != ogr.wkbMultiPolygon:
-        gdaltest.post_reason('fail')
         return 'fail'
     ext = lyr.GetExtent()
     if ext != (-180.0, 180.0, -90.0, 90.0):
-        gdaltest.post_reason('fail')
         print(ext)
         return 'fail'
 
     field_count = lyr.GetLayerDefn().GetFieldCount()
     if field_count != 68:
-        gdaltest.post_reason('fail')
         print(field_count)
         return 'fail'
 
@@ -252,14 +232,12 @@ def test_ogr_plscenes_data_v1_nominal():
        f['asset_analytic_location'] != '/vsimem/data_v1/item-types/PSOrthoTile/items/id/assets/analytic/my.tiff' or \
        f['asset_analytic_status'] != 'active' or \
        f.GetGeometryRef().ExportToWkt() != 'MULTIPOLYGON (((2 49,2.0 49.1,2.1 49.1,2.1 49.0,2 49)))':
-        gdaltest.post_reason('fail')
         f.DumpReadable()
         return 'fail'
 
     lyr.ResetReading()
     f = lyr.GetNextFeature()
     if f.GetFID() != 1:
-        gdaltest.post_reason('fail')
         f.DumpReadable()
         return 'fail'
 
@@ -274,31 +252,26 @@ def test_ogr_plscenes_data_v1_nominal():
 
     f = lyr.GetNextFeature()
     if f.GetFID() != 2 or f['id'] != 'id2':
-        gdaltest.post_reason('fail')
         f.DumpReadable()
         return 'fail'
 
     lyr.ResetReading()
     f = lyr.GetNextFeature()
     if f.GetFID() != 1:
-        gdaltest.post_reason('fail')
         f.DumpReadable()
         return 'fail'
 
     f = lyr.GetNextFeature()
     if f.GetFID() != 2:
-        gdaltest.post_reason('fail')
         f.DumpReadable()
         return 'fail'
 
     f = lyr.GetNextFeature()
     if f is not None:
-        gdaltest.post_reason('fail')
         return 'fail'
 
     f = lyr.GetNextFeature()
     if f is not None:
-        gdaltest.post_reason('fail')
         return 'fail'
 
     gdal.FileFromMemBuffer("""/vsimem/data_v1/quick-search?_page_size=250&POSTFIELDS={"item_types":["PSOrthoTile"],"filter":{"type":"AndFilter","config":[{"type":"GeometryFilter","field_name":"geometry","config":{"type":"Point","coordinates":[2.0,49.0]}}]}}""",
@@ -308,21 +281,18 @@ def test_ogr_plscenes_data_v1_nominal():
     lyr.SetSpatialFilterRect(2, 49, 2, 49)
     f = lyr.GetNextFeature()
     if f['id'] != 'id3':
-        gdaltest.post_reason('fail')
         f.DumpReadable()
         return 'fail'
 
     # Cannot find /vsimem/data_v1/stats&POSTFIELDS={"interval":"year","item_types":["PSOrthoTile"],"filter":{"type":"AndFilter","config":[{"type":"GeometryFilter","field_name":"geometry","config":{"type":"Point","coordinates":[2.0,49.0]}}]}}
     with gdaltest.error_handler():
         if lyr.GetFeatureCount() != 1:
-            gdaltest.post_reason('fail')
             return 'fail'
 
     # Reset spatial filter
     lyr.SetSpatialFilter(0, None)
     f = lyr.GetNextFeature()
     if f['id'] != 'id':
-        gdaltest.post_reason('fail')
         f.DumpReadable()
         return 'fail'
 
@@ -336,7 +306,6 @@ def test_ogr_plscenes_data_v1_nominal():
 
     f = lyr.GetNextFeature()
     if f['id'] != 'filtered_id':
-        gdaltest.post_reason('fail')
         f.DumpReadable()
         return 'fail'
 
@@ -369,7 +338,6 @@ def test_ogr_plscenes_data_v1_nominal():
     gdal.FileFromMemBuffer("""/vsimem/data_v1/quick-search?_page_size=250&POSTFIELDS={"item_types":["PSOrthoTile"],"filter":{"type":"AndFilter","config":[{"type":"AndFilter","config":[{"type":"AndFilter","config":[{"type":"AndFilter","config":[{"type":"AndFilter","config":[{"type":"AndFilter","config":[{"type":"AndFilter","config":[{"type":"AndFilter","config":[{"type":"AndFilter","config":[{"type":"AndFilter","config":[{"type":"AndFilter","config":[{"type":"AndFilter","config":[{"type":"AndFilter","config":[{"type":"AndFilter","config":[{"type":"NotFilter","config":{"type":"StringInFilter","field_name":"id","config":["a"]}},{"type":"DateRangeFilter","field_name":"acquired","config":{"gte":"2016-02-11T00:00:00Z"}}]},{"type":"DateRangeFilter","field_name":"acquired","config":{"lte":"2016-02-12T00:00:00Z"}}]},{"type":"DateRangeFilter","field_name":"acquired","config":{"gt":"1970-01-01T01:23:45Z"}}]},{"type":"DateRangeFilter","field_name":"acquired","config":{"lt":"2100-01-01T01:23:45Z"}}]},{"type":"RangeFilter","field_name":"anomalous_pixels","config":{"gte":1.23456699,"lte":1.2345670099999999}}]},{"type":"NotFilter","config":{"type":"StringInFilter","field_name":"id","config":["b"]}}]},{"type":"RangeFilter","field_name":"columns","config":{"gt":0}}]},{"type":"RangeFilter","field_name":"columns","config":{"lt":2}}]},{"type":"NumberInFilter","field_name":"columns","config":[1]}]},{"type":"NumberInFilter","field_name":"columns","config":[1,2]}]},{"type":"OrFilter","config":[{"type":"StringInFilter","field_name":"id","config":["filtered_2"]},{"type":"StringInFilter","field_name":"id","config":["foo"]}]}]},{"type":"PermissionFilter","config":["download"]}]},{"type":"PermissionFilter","config":["download"]}]}]}}""", content)
     f = lyr.GetNextFeature()
     if f['id'] != 'filtered_2':
-        gdaltest.post_reason('fail')
         f.DumpReadable()
         return 'fail'
 
@@ -387,14 +355,12 @@ def test_ogr_plscenes_data_v1_nominal():
 }""")
     f = lyr.GetNextFeature()
     if f['id'] != 'filtered_3':
-        gdaltest.post_reason('fail')
         f.DumpReadable()
         return 'fail'
 
     lyr.SetAttributeFilter("id > 'a' AND id = 'filtered_3'")
     f = lyr.GetNextFeature()
     if f['id'] != 'filtered_3':
-        gdaltest.post_reason('fail')
         f.DumpReadable()
         return 'fail'
 
@@ -402,7 +368,6 @@ def test_ogr_plscenes_data_v1_nominal():
     lyr.SetAttributeFilter("id > 'a' OR id = 'id'")
     f = lyr.GetNextFeature()
     if f['id'] != 'id':
-        gdaltest.post_reason('fail')
         f.DumpReadable()
         return 'fail'
 
@@ -410,7 +375,6 @@ def test_ogr_plscenes_data_v1_nominal():
     lyr.SetAttributeFilter("NOT id > 'z'")
     f = lyr.GetNextFeature()
     if f['id'] != 'id':
-        gdaltest.post_reason('fail')
         f.DumpReadable()
         return 'fail'
 
@@ -418,7 +382,6 @@ def test_ogr_plscenes_data_v1_nominal():
     lyr.SetAttributeFilter(None)
     f = lyr.GetNextFeature()
     if f['id'] != 'id':
-        gdaltest.post_reason('fail')
         f.DumpReadable()
         return 'fail'
 
@@ -430,7 +393,6 @@ def test_ogr_plscenes_data_v1_nominal():
         ds_raster = gdal.OpenEx('PLScenes:', gdal.OF_RASTER, open_options=['VERSION=data_v1', 'API_KEY=foo', 'SCENE=id'])
     gdal.SetConfigOption('PL_URL', None)
     if ds_raster is not None or gdal.GetLastErrorMsg().find('Missing catalog') < 0:
-        gdaltest.post_reason('fail')
         return 'fail'
 
     # Invalid catalog
@@ -447,7 +409,6 @@ def test_ogr_plscenes_data_v1_nominal():
         ds_raster = gdal.OpenEx('PLScenes:', gdal.OF_RASTER, open_options=['VERSION=data_v1', 'API_KEY=foo', 'ITEMTYPES=PSOrthoTile', 'SCENE=id'])
     gdal.SetConfigOption('PL_URL', None)
     if ds_raster is not None:
-        gdaltest.post_reason('fail')
         return 'fail'
 
     # Inactive file, and activation link not working
@@ -467,7 +428,6 @@ def test_ogr_plscenes_data_v1_nominal():
         ds_raster = gdal.OpenEx('PLScenes:', gdal.OF_RASTER, open_options=['VERSION=data_v1', 'API_KEY=foo', 'ITEMTYPES=PSOrthoTile', 'SCENE=id', 'ACTIVATION_TIMEOUT=1', 'ASSET=analytic'])
     gdal.SetConfigOption('PL_URL', None)
     if ds_raster is not None:
-        gdaltest.post_reason('fail')
         return 'fail'
 
     # File in activation
@@ -487,7 +447,6 @@ def test_ogr_plscenes_data_v1_nominal():
         ds_raster = gdal.OpenEx('PLScenes:', gdal.OF_RASTER, open_options=['VERSION=data_v1', 'API_KEY=foo', 'ITEMTYPES=PSOrthoTile', 'SCENE=id', 'ACTIVATION_TIMEOUT=1', 'ASSET=analytic'])
     gdal.SetConfigOption('PL_URL', None)
     if ds_raster is not None:
-        gdaltest.post_reason('fail')
         return 'fail'
 
     gdal.FileFromMemBuffer('/vsimem/data_v1/item-types/PSOrthoTile/items/id/assets',
@@ -510,7 +469,6 @@ def test_ogr_plscenes_data_v1_nominal():
         ds_raster = gdal.OpenEx('PLScenes:', gdal.OF_RASTER, open_options=['VERSION=data_v1', 'API_KEY=foo', 'ITEMTYPES=PSOrthoTile', 'SCENE=id', 'ACTIVATION_TIMEOUT=1', 'ASSET=analytic'])
     gdal.SetConfigOption('PL_URL', None)
     if ds_raster is not None:
-        gdaltest.post_reason('fail')
         return 'fail'
 
     # JSon content for /vsimem/data_v1/item-types/PSOrthoTile/items/id/assets/analytic/my.tiff
@@ -521,7 +479,6 @@ def test_ogr_plscenes_data_v1_nominal():
         ds_raster = gdal.OpenEx('PLScenes:', gdal.OF_RASTER, open_options=['VERSION=data_v1', 'API_KEY=foo', 'ITEMTYPES=PSOrthoTile', 'SCENE=id', 'ACTIVATION_TIMEOUT=1', 'ASSET=analytic'])
     gdal.SetConfigOption('PL_URL', None)
     if ds_raster is not None:
-        gdaltest.post_reason('fail')
         return 'fail'
 
     # Missing metadata
@@ -532,7 +489,6 @@ def test_ogr_plscenes_data_v1_nominal():
         ds_raster = gdal.OpenEx('PLScenes:', gdal.OF_RASTER, open_options=['VERSION=data_v1', 'API_KEY=foo', 'ITEMTYPES=PSOrthoTile', 'SCENE=id', 'ACTIVATION_TIMEOUT=1', 'ASSET=analytic'])
     gdal.SetConfigOption('PL_URL', None)
     if ds_raster is None:
-        gdaltest.post_reason('fail')
         return 'fail'
     ds_raster = None
 
@@ -543,7 +499,6 @@ def test_ogr_plscenes_data_v1_nominal():
     ds_raster = gdal.OpenEx('PLScenes:', gdal.OF_RASTER, open_options=['VERSION=data_v1', 'API_KEY=foo', 'ITEMTYPES=PSOrthoTile', 'SCENE=id', 'ACTIVATION_TIMEOUT=1', 'ASSET=analytic'])
     gdal.SetConfigOption('PL_URL', None)
     if ds_raster is None:
-        gdaltest.post_reason('fail')
         return 'fail'
     ds_raster = None
 
@@ -559,10 +514,8 @@ def test_ogr_plscenes_data_v1_nominal():
     ds_raster = gdal.OpenEx('PLScenes:', gdal.OF_RASTER, open_options=['VERSION=data_v1', 'API_KEY=foo', 'ITEMTYPES=PSOrthoTile', 'SCENE=id', 'ACTIVATION_TIMEOUT=1', 'ASSET=analytic'])
     gdal.SetConfigOption('PL_URL', None)
     if ds_raster is None:
-        gdaltest.post_reason('fail')
         return 'fail'
     if ds_raster.GetMetadataItem('anomalous_pixels') != '1.23':
-        gdaltest.post_reason('fail')
         return 'fail'
     ds_raster = None
 
@@ -572,7 +525,6 @@ def test_ogr_plscenes_data_v1_nominal():
         ds_raster = gdal.OpenEx('PLScenes:', gdal.OF_RASTER, open_options=['VERSION=data_v1', 'API_KEY=foo', 'ITEMTYPES=PSOrthoTile', 'SCENE=id', 'ACTIVATION_TIMEOUT=1', 'ASSET=invalid'])
     gdal.SetConfigOption('PL_URL', None)
     if ds_raster is not None:
-        gdaltest.post_reason('fail')
         return 'fail'
 
     # Test subdatasets
@@ -580,7 +532,6 @@ def test_ogr_plscenes_data_v1_nominal():
     ds_raster = gdal.OpenEx('PLScenes:', gdal.OF_RASTER, open_options=['VERSION=data_v1', 'API_KEY=foo', 'ITEMTYPES=PSOrthoTile', 'ASSET=list', 'SCENE=id'])
     gdal.SetConfigOption('PL_URL', None)
     if len(ds_raster.GetSubDatasets()) != 1:
-        gdaltest.post_reason('fail')
         return 'fail'
     ds_raster = None
 
@@ -590,7 +541,6 @@ def test_ogr_plscenes_data_v1_nominal():
         ds_raster = gdal.OpenEx('PLScenes:unsupported=yes', gdal.OF_RASTER, open_options=['VERSION=data_v1', 'API_KEY=foo', 'ITEMTYPES=PSOrthoTile', 'SCENE=id'])
     gdal.SetConfigOption('PL_URL', None)
     if ds_raster is not None:
-        gdaltest.post_reason('fail')
         return 'fail'
 
     # Test catalog with vector access
@@ -598,7 +548,6 @@ def test_ogr_plscenes_data_v1_nominal():
     ds2 = gdal.OpenEx('PLScenes:', gdal.OF_VECTOR, open_options=['VERSION=data_v1', 'API_KEY=foo', 'ITEMTYPES=PSOrthoTile'])
     gdal.SetConfigOption('PL_URL', None)
     if ds2 is None or ds2.GetLayerCount() != 1:
-        gdaltest.post_reason('fail')
         return 'fail'
 
     gdal.SetConfigOption('PL_URL', '/vsimem/data_v1/')
@@ -606,7 +555,6 @@ def test_ogr_plscenes_data_v1_nominal():
         ds2 = gdal.OpenEx('PLScenes:', gdal.OF_VECTOR, open_options=['VERSION=data_v1', 'API_KEY=foo', 'ITEMTYPES=invalid'])
     gdal.SetConfigOption('PL_URL', None)
     if ds2 is not None:
-        gdaltest.post_reason('fail')
         return 'fail'
 
     fl = gdal.ReadDir('/vsimem/data_v1')
@@ -635,7 +583,6 @@ def test_ogr_plscenes_data_v1_errors():
         gdal.SetConfigOption('PL_API_KEY', old_key)
     gdal.SetConfigOption('PL_URL', None)
     if ds is not None:
-        gdaltest.post_reason('fail')
         return 'fail'
 
     # Invalid option
@@ -645,7 +592,6 @@ def test_ogr_plscenes_data_v1_errors():
         ds = gdal.OpenEx('PLScenes:version=data_v1,api_key=foo,invalid=invalid', gdal.OF_VECTOR)
         gdal.SetConfigOption('PL_URL', None)
     if ds is not None:
-        gdaltest.post_reason('fail')
         return 'fail'
 
     # Invalid JSON
@@ -655,7 +601,6 @@ def test_ogr_plscenes_data_v1_errors():
         ds = gdal.OpenEx('PLScenes:', gdal.OF_VECTOR, open_options=['VERSION=data_v1', 'API_KEY=foo'])
         gdal.SetConfigOption('PL_URL', None)
     if ds is not None:
-        gdaltest.post_reason('fail')
         return 'fail'
 
     # Not an object
@@ -665,7 +610,6 @@ def test_ogr_plscenes_data_v1_errors():
         ds = gdal.OpenEx('PLScenes:', gdal.OF_VECTOR, open_options=['VERSION=data_v1', 'API_KEY=foo'])
         gdal.SetConfigOption('PL_URL', None)
     if ds is not None:
-        gdaltest.post_reason('fail')
         return 'fail'
 
     # Lack of "item_types"
@@ -675,7 +619,6 @@ def test_ogr_plscenes_data_v1_errors():
         ds = gdal.OpenEx('PLScenes:', gdal.OF_VECTOR, open_options=['VERSION=data_v1', 'API_KEY=foo'])
         gdal.SetConfigOption('PL_URL', None)
     if ds is not None:
-        gdaltest.post_reason('fail')
         return 'fail'
 
     # Invalid catalog objects
@@ -685,7 +628,6 @@ def test_ogr_plscenes_data_v1_errors():
     ds = gdal.OpenEx('PLScenes:', gdal.OF_VECTOR, open_options=['VERSION=data_v1', 'API_KEY=foo'])
     gdal.SetConfigOption('PL_URL', None)
     if ds.GetLayerCount() != 1:
-        gdaltest.post_reason('fail')
         return 'fail'
 
     # Invalid next URL
@@ -696,7 +638,6 @@ def test_ogr_plscenes_data_v1_errors():
     with gdaltest.error_handler():
         lyr_count = ds.GetLayerCount()
     if lyr_count != 1:
-        gdaltest.post_reason('fail')
         return 'fail'
 
     gdal.FileFromMemBuffer('/vsimem/data_v1/item-types', '{"item_types": [{"id": "PSScene3Band"}]}')
@@ -749,18 +690,15 @@ def test_ogr_plscenes_data_v1_live():
     ds = ogr.Open('PLScenes:version=data_v1,FOLLOW_LINKS=YES')
     gdal.SetConfigOption('PLSCENES_PAGE_SIZE', None)
     if ds is None:
-        gdaltest.post_reason('fail')
         return 'fail'
 
     lyr = ds.GetLayer(0)
     if lyr is None:
-        gdaltest.post_reason('fail')
         return 'fail'
 
     lyr.SetAttributeFilter("permissions = 'assets:download'")
     f = lyr.GetNextFeature()
     if f is None:
-        gdaltest.post_reason('fail')
         return 'fail'
     catalog = lyr.GetName()
     scene = f['id']
@@ -778,16 +716,13 @@ def test_ogr_plscenes_data_v1_live():
             asset_name = name[len('asset_'):-len('_location')]
             break
     if asset_name is None:
-        gdaltest.post_reason('fail')
         return 'fail'
 
     acquired_field = lyr_defn.GetFieldIndex('acquired')
     if acquired_field < 0 or lyr_defn.GetFieldDefn(acquired_field).GetType() != ogr.OFTDateTime:
-        gdaltest.post_reason('fail')
         return 'fail'
 
     if not f.IsFieldSet(acquired_field):
-        gdaltest.post_reason('fail')
         f.DumpReadable()
         return 'fail'
 
@@ -822,17 +757,14 @@ def test_ogr_plscenes_data_v1_live():
     lyr.SetAttributeFilter(filtr)
     f = lyr.GetNextFeature()
     if f is None:
-        gdaltest.post_reason('fail')
         return 'fail'
 
     ds = None
 
     ds = gdal.Open('PLScenes:version=data_v1,itemtypes=%s,scene=%s,asset=%s' % (catalog, scene, asset_name))
     if ds is None:
-        gdaltest.post_reason('fail')
         return 'fail'
     if ds.RasterCount == 0:
-        gdaltest.post_reason('fail')
         return 'fail'
 
     return 'success'
diff --git a/autotest/ogr/ogr_rfc35_mitab.py b/autotest/ogr/ogr_rfc35_mitab.py
index 2e2670deb640..f4416e9efdc0 100755
--- a/autotest/ogr/ogr_rfc35_mitab.py
+++ b/autotest/ogr/ogr_rfc35_mitab.py
@@ -175,7 +175,6 @@ def test_ogr_rfc35_mitab_2():
     lyr = ds.GetLayer(0)
 
     if lyr.TestCapability(ogr.OLCReorderFields) != 1:
-        gdaltest.post_reason('fail')
         return 'fail'
 
     feat = ogr.Feature(lyr.GetLayerDefn())
@@ -187,7 +186,6 @@ def test_ogr_rfc35_mitab_2():
     feat = None
 
     if lyr.ReorderField(1, 3) != 0:
-        gdaltest.post_reason('fail')
         return 'fail'
     # ds = None
     # ds = ogr.Open('/vsimem/rfc35_test.tab', update = 1)
@@ -264,7 +262,6 @@ def test_ogr_rfc35_mitab_2():
     ret = lyr.ReorderFields([0, 0, 0, 0])
     gdal.PopErrorHandler()
     if ret == 0:
-        gdaltest.post_reason('fail')
         return 'fail'
 
     # ds = None
@@ -302,14 +299,12 @@ def test_ogr_rfc35_mitab_3():
     ret = lyr.AlterFieldDefn(-1, fd, ogr.ALTER_ALL_FLAG)
     gdal.PopErrorHandler()
     if ret == 0:
-        gdaltest.post_reason('fail')
         return 'fail'
 
     gdal.PushErrorHandler('CPLQuietErrorHandler')
     ret = lyr.AlterFieldDefn(lyr_defn.GetFieldCount(), fd, ogr.ALTER_ALL_FLAG)
     gdal.PopErrorHandler()
     if ret == 0:
-        gdaltest.post_reason('fail')
         return 'fail'
 
     lyr.AlterFieldDefn(lyr_defn.GetFieldIndex("baz15"), fd, ogr.ALTER_ALL_FLAG)
@@ -337,7 +332,6 @@ def test_ogr_rfc35_mitab_3():
     lyr_defn = lyr.GetLayerDefn()
     fld_defn = lyr_defn.GetFieldDefn(lyr_defn.GetFieldIndex('baz5'))
     if fld_defn.GetWidth() != 5:
-        gdaltest.post_reason('fail')
         return 'fail'
 
     ret = CheckFeatures(lyr, field3='baz5')
@@ -355,7 +349,6 @@ def test_ogr_rfc35_mitab_4():
     lyr_defn = lyr.GetLayerDefn()
 
     if lyr.TestCapability(ogr.OLCAlterFieldDefn) != 1:
-        gdaltest.post_reason('fail')
         return 'fail'
 
     fd = ogr.FieldDefn("intfield", ogr.OFTInteger)
@@ -374,13 +367,11 @@ def test_ogr_rfc35_mitab_4():
     ret = lyr.AlterFieldDefn(lyr_defn.GetFieldIndex("intfield"), fd, ogr.ALTER_ALL_FLAG)
     gdal.PopErrorHandler()
     if ret == 0:
-        gdaltest.post_reason('fail')
         return 'fail'
 
     lyr.ResetReading()
     feat = lyr.GetNextFeature()
     if feat.GetField("intfield") != 12345:
-        gdaltest.post_reason('fail')
         return 'fail'
     feat = None
 
@@ -396,7 +387,6 @@ def test_ogr_rfc35_mitab_4():
         lyr.ResetReading()
         feat = lyr.GetNextFeature()
         if feat.GetField("intfield") != 12345:
-            gdaltest.post_reason('fail')
             return 'fail'
         feat = None
 
@@ -418,7 +408,6 @@ def test_ogr_rfc35_mitab_4():
         lyr.ResetReading()
         feat = lyr.GetNextFeature()
         if feat.GetField("intfield") != 1234:
-            gdaltest.post_reason('fail')
             return 'fail'
         feat = None
 
@@ -446,7 +435,6 @@ def test_ogr_rfc35_mitab_4():
     lyr.ResetReading()
     feat = lyr.GetNextFeature()
     if feat.GetField("oldintfld") != '12345':
-        gdaltest.post_reason('fail')
         return 'fail'
     feat = None
 
@@ -464,7 +452,6 @@ def test_ogr_rfc35_mitab_4():
     lyr.ResetReading()
     feat = lyr.GetNextFeature()
     if feat.GetField("oldintfld") != '12345':
-        gdaltest.post_reason('fail')
         return 'fail'
     feat = None
 
@@ -478,18 +465,15 @@ def test_ogr_rfc35_mitab_4():
     fd = ogr.FieldDefn("intfield", ogr.OFTInteger)
     fd.SetWidth(10)
     if lyr.CreateField(fd) != 0:
-        gdaltest.post_reason('fail')
         return 'fail'
 
     if lyr.ReorderField(lyr_defn.GetFieldIndex("intfield"), 0) != 0:
-        gdaltest.post_reason('fail')
         return 'fail'
 
     lyr.ResetReading()
     feat = lyr.GetNextFeature()
     feat.SetField("intfield", 98765)
     if lyr.SetFeature(feat) != 0:
-        gdaltest.post_reason('fail')
         return 'fail'
     feat = None
 
@@ -500,7 +484,6 @@ def test_ogr_rfc35_mitab_4():
     lyr.ResetReading()
     feat = lyr.GetNextFeature()
     if feat.GetField("oldintfld") != '98765':
-        gdaltest.post_reason('fail')
         return 'fail'
     feat = None
 
@@ -518,7 +501,6 @@ def test_ogr_rfc35_mitab_4():
     lyr.ResetReading()
     feat = lyr.GetNextFeature()
     if feat.GetField("oldintfld") != '98765':
-        gdaltest.post_reason('fail')
         return 'fail'
     feat = None
 
@@ -540,25 +522,21 @@ def test_ogr_rfc35_mitab_5():
     lyr_defn = lyr.GetLayerDefn()
 
     if lyr.TestCapability(ogr.OLCDeleteField) != 1:
-        gdaltest.post_reason('fail')
         return 'fail'
 
     if lyr.DeleteField(0) != 0:
-        gdaltest.post_reason('fail')
         return 'fail'
 
     gdal.PushErrorHandler('CPLQuietErrorHandler')
     ret = lyr.DeleteField(-1)
     gdal.PopErrorHandler()
     if ret == 0:
-        gdaltest.post_reason('fail')
         return 'fail'
 
     gdal.PushErrorHandler('CPLQuietErrorHandler')
     ret = lyr.DeleteField(lyr.GetLayerDefn().GetFieldCount())
     gdal.PopErrorHandler()
     if ret == 0:
-        gdaltest.post_reason('fail')
         return 'fail'
 
     ret = CheckFeatures(lyr, field3='baz5')
@@ -567,7 +545,6 @@ def test_ogr_rfc35_mitab_5():
         return ret
 
     if lyr.DeleteField(lyr_defn.GetFieldIndex('baw20')) != 0:
-        gdaltest.post_reason('fail')
         return 'fail'
 
     ds = None
@@ -588,7 +565,6 @@ def test_ogr_rfc35_mitab_5():
         return ret
 
     if lyr.DeleteField(lyr_defn.GetFieldIndex('baz5')) != 0:
-        gdaltest.post_reason('fail')
         return 'fail'
 
     ret = CheckFeatures(lyr, field3=None, field4=None)
@@ -597,7 +573,6 @@ def test_ogr_rfc35_mitab_5():
         return ret
 
     if lyr.DeleteField(lyr_defn.GetFieldIndex('foo5')) != 0:
-        gdaltest.post_reason('fail')
         return 'fail'
 
     # We cannot delete the only one remaining field (well MapInfo prohibits that)
@@ -605,7 +580,6 @@ def test_ogr_rfc35_mitab_5():
     ret = lyr.DeleteField(lyr_defn.GetFieldIndex('bar10'))
     gdal.PopErrorHandler()
     if ret == 0:
-        gdaltest.post_reason('fail')
         return 'fail'
 
     ret = CheckFeatures(lyr, field1=None, field2=None, field3=None, field4=None)
diff --git a/autotest/ogr/ogr_rfc35_sqlite.py b/autotest/ogr/ogr_rfc35_sqlite.py
index 10a8392b3c7f..821a4388e2a5 100755
--- a/autotest/ogr/ogr_rfc35_sqlite.py
+++ b/autotest/ogr/ogr_rfc35_sqlite.py
@@ -165,7 +165,6 @@ def test_ogr_rfc35_sqlite_2():
     lyr = gdaltest.rfc35_sqlite_ds.GetLayer(0)
 
     if lyr.TestCapability(ogr.OLCReorderFields) != 1:
-        gdaltest.post_reason('failed')
         return 'fail'
 
     feat = ogr.Feature(lyr.GetLayerDefn())
@@ -177,7 +176,6 @@ def test_ogr_rfc35_sqlite_2():
     feat = None
 
     if lyr.ReorderField(1, 3) != 0:
-        gdaltest.post_reason('failed')
         return 'fail'
 
     ret = Check(lyr, ['foo5', 'baz15', 'baw20', 'bar10'])
@@ -207,7 +205,6 @@ def test_ogr_rfc35_sqlite_2():
     ret = lyr.ReorderFields([0, 0, 0, 0])
     gdal.PopErrorHandler()
     if ret == 0:
-        gdaltest.post_reason('failed')
         return 'fail'
 
     return 'success'
@@ -232,14 +229,12 @@ def test_ogr_rfc35_sqlite_3():
     ret = lyr.AlterFieldDefn(-1, fd, ogr.ALTER_ALL_FLAG)
     gdal.PopErrorHandler()
     if ret == 0:
-        gdaltest.post_reason('failed')
         return 'fail'
 
     gdal.PushErrorHandler('CPLQuietErrorHandler')
     ret = lyr.AlterFieldDefn(lyr_defn.GetFieldCount(), fd, ogr.ALTER_ALL_FLAG)
     gdal.PopErrorHandler()
     if ret == 0:
-        gdaltest.post_reason('failed')
         return 'fail'
 
     lyr.AlterFieldDefn(lyr_defn.GetFieldIndex("baz15"), fd, ogr.ALTER_ALL_FLAG)
@@ -257,7 +252,6 @@ def test_ogr_rfc35_sqlite_3():
     lyr_defn = lyr.GetLayerDefn()
     fld_defn = lyr_defn.GetFieldDefn(lyr_defn.GetFieldIndex('baz5'))
     if fld_defn.GetWidth() != 5:
-        gdaltest.post_reason('failed')
         return 'fail'
 
     ret = CheckFeatures(lyr, field3='baz5')
@@ -277,7 +271,6 @@ def test_ogr_rfc35_sqlite_4():
     lyr_defn = lyr.GetLayerDefn()
 
     if lyr.TestCapability(ogr.OLCAlterFieldDefn) != 1:
-        gdaltest.post_reason('failed')
         return 'fail'
 
     fd = ogr.FieldDefn("intfield", ogr.OFTInteger)
@@ -297,7 +290,6 @@ def test_ogr_rfc35_sqlite_4():
     lyr.ResetReading()
     feat = lyr.GetNextFeature()
     if feat.GetField("intfield") != 12345:
-        gdaltest.post_reason('failed')
         return 'fail'
     feat = None
 
@@ -309,7 +301,6 @@ def test_ogr_rfc35_sqlite_4():
     lyr.ResetReading()
     feat = lyr.GetNextFeature()
     if feat.GetField("intfield") != 12345:
-        gdaltest.post_reason('failed')
         return 'fail'
     feat = None
 
@@ -322,7 +313,6 @@ def test_ogr_rfc35_sqlite_4():
     feat = lyr.GetNextFeature()
     # if feat.GetField("intfield") != 1234:
     if feat.GetField("intfield") != 12345:
-        gdaltest.post_reason('failed')
         return 'fail'
     feat = None
 
@@ -336,7 +326,6 @@ def test_ogr_rfc35_sqlite_4():
     feat = lyr.GetNextFeature()
     # if feat.GetField("oldintfld") != '1234':
     if feat.GetField("oldintfld") != '12345':
-        gdaltest.post_reason('failed')
         return 'fail'
     feat = None
 
@@ -347,18 +336,15 @@ def test_ogr_rfc35_sqlite_4():
     fd = ogr.FieldDefn("intfield", ogr.OFTInteger)
     fd.SetWidth(10)
     if lyr.CreateField(fd) != 0:
-        gdaltest.post_reason('failed')
         return 'fail'
 
     if lyr.ReorderField(lyr_defn.GetFieldIndex("intfield"), 0) != 0:
-        gdaltest.post_reason('failed')
         return 'fail'
 
     lyr.ResetReading()
     feat = lyr.GetNextFeature()
     feat.SetField("intfield", 98765)
     if lyr.SetFeature(feat) != 0:
-        gdaltest.post_reason('failed')
         return 'fail'
     feat = None
 
@@ -369,7 +355,6 @@ def test_ogr_rfc35_sqlite_4():
     lyr.ResetReading()
     feat = lyr.GetNextFeature()
     if feat.GetField("oldintfld") != '98765':
-        gdaltest.post_reason('failed')
         return 'fail'
     feat = None
 
@@ -390,47 +375,39 @@ def test_ogr_rfc35_sqlite_5():
     lyr_defn = lyr.GetLayerDefn()
 
     if lyr.TestCapability(ogr.OLCDeleteField) != 1:
-        gdaltest.post_reason('failed')
         return 'fail'
 
     gdal.PushErrorHandler('CPLQuietErrorHandler')
     ret = lyr.DeleteField(-1)
     gdal.PopErrorHandler()
     if ret == 0:
-        gdaltest.post_reason('failed')
         return 'fail'
 
     gdal.PushErrorHandler('CPLQuietErrorHandler')
     ret = lyr.DeleteField(lyr.GetLayerDefn().GetFieldCount())
     gdal.PopErrorHandler()
     if ret == 0:
-        gdaltest.post_reason('failed')
         return 'fail'
 
     if lyr.DeleteField(0) != 0:
-        gdaltest.post_reason('failed')
         return 'fail'
 
     ret = CheckFeatures(lyr, field3='baz5')
 
     if lyr.DeleteField(lyr_defn.GetFieldIndex('baw20')) != 0:
-        gdaltest.post_reason('failed')
         return 'fail'
 
     ret = CheckFeatures(lyr, field3='baz5', field4=None)
 
     if lyr.DeleteField(lyr_defn.GetFieldIndex('baz5')) != 0:
-        gdaltest.post_reason('failed')
         return 'fail'
 
     ret = CheckFeatures(lyr, field3=None, field4=None)
 
     if lyr.DeleteField(lyr_defn.GetFieldIndex('foo5')) != 0:
-        gdaltest.post_reason('failed')
         return 'fail'
 
     if lyr.DeleteField(lyr_defn.GetFieldIndex('bar10')) != 0:
-        gdaltest.post_reason('failed')
         return 'fail'
 
     ret = CheckFeatures(lyr, field1=None, field2=None, field3=None, field4=None)
diff --git a/autotest/ogr/ogr_rfc41.py b/autotest/ogr/ogr_rfc41.py
index a68568e9e6a6..619b03bc3200 100755
--- a/autotest/ogr/ogr_rfc41.py
+++ b/autotest/ogr/ogr_rfc41.py
@@ -47,28 +47,22 @@ def test_ogr_rfc41_1():
 
     # Check default values
     if gfld_defn.GetName() != '':
-        gdaltest.post_reason('fail')
         return 'fail'
     if gfld_defn.GetType() != ogr.wkbUnknown:
-        gdaltest.post_reason('fail')
         return 'fail'
     if gfld_defn.GetSpatialRef() is not None:
-        gdaltest.post_reason('fail')
         return 'fail'
     if gfld_defn.IsIgnored() != 0:
-        gdaltest.post_reason('fail')
         return 'fail'
 
     # Test SetName() / GetName()
     gfld_defn.SetName('foo')
     if gfld_defn.GetName() != 'foo':
-        gdaltest.post_reason('fail')
         return 'fail'
 
     # Test SetType() / GetType()
     gfld_defn.SetType(ogr.wkbPoint)
     if gfld_defn.GetType() != ogr.wkbPoint:
-        gdaltest.post_reason('fail')
         return 'fail'
 
     # Test SetSpatialRef() / GetSpatialRef()
@@ -76,12 +70,10 @@ def test_ogr_rfc41_1():
     gfld_defn.SetSpatialRef(sr)
     got_sr = gfld_defn.GetSpatialRef()
     if got_sr.IsSame(sr) == 0:
-        gdaltest.post_reason('fail')
         return 'fail'
 
     gfld_defn.SetSpatialRef(None)
     if gfld_defn.GetSpatialRef() is not None:
-        gdaltest.post_reason('fail')
         return 'fail'
 
     gfld_defn.SetSpatialRef(sr)
@@ -89,7 +81,6 @@ def test_ogr_rfc41_1():
     # Test SetIgnored() / IsIgnored()
     gfld_defn.SetIgnored(1)
     if gfld_defn.IsIgnored() != 1:
-        gdaltest.post_reason('fail')
         return 'fail'
 
     # Test setting invalid value
@@ -98,7 +89,6 @@ def test_ogr_rfc41_1():
     gfld_defn.SetType(-3)
     gdal.PopErrorHandler()
     if gfld_defn.GetType() != old_val:
-        gdaltest.post_reason('fail')
         return 'fail'
 
     gfld_defn = None
@@ -114,31 +104,24 @@ def test_ogr_rfc41_2():
     # Check implicit geometry field creation
     feature_defn = ogr.FeatureDefn()
     if feature_defn.GetGeomFieldCount() != 1:
-        gdaltest.post_reason('fail')
         return 'fail'
     if feature_defn.GetGeomType() != ogr.wkbUnknown:
-        gdaltest.post_reason('fail')
         return 'fail'
 
     # Test IsSame()
     if feature_defn.IsSame(feature_defn) != 1:
-        gdaltest.post_reason('fail')
         return 'fail'
     other_feature_defn = ogr.FeatureDefn()
     if feature_defn.IsSame(other_feature_defn) != 1:
-        gdaltest.post_reason('fail')
         return 'fail'
     other_feature_defn.GetGeomFieldDefn(0).SetSpatialRef(osr.SpatialReference())
     if feature_defn.IsSame(other_feature_defn) != 0:
-        gdaltest.post_reason('fail')
         return 'fail'
     feature_defn.GetGeomFieldDefn(0).SetSpatialRef(osr.SpatialReference())
     if feature_defn.IsSame(other_feature_defn) != 1:
-        gdaltest.post_reason('fail')
         return 'fail'
     other_feature_defn.GetGeomFieldDefn(0).SetSpatialRef(None)
     if feature_defn.IsSame(other_feature_defn) != 0:
-        gdaltest.post_reason('fail')
         return 'fail'
 
     feature_defn = None
@@ -147,33 +130,26 @@ def test_ogr_rfc41_2():
     # Check changing geometry type
     feature_defn.SetGeomType(ogr.wkbPoint)
     if feature_defn.GetGeomType() != ogr.wkbPoint:
-        gdaltest.post_reason('fail')
         return 'fail'
     if feature_defn.GetGeomFieldDefn(0).GetType() != ogr.wkbPoint:
-        gdaltest.post_reason('fail')
         return 'fail'
 
     # Check setting to wkbNone and implicitly destroying the field.
     for _ in range(2):
         feature_defn.SetGeomType(ogr.wkbNone)
         if feature_defn.GetGeomFieldCount() != 0:
-            gdaltest.post_reason('fail')
             return 'fail'
         if feature_defn.GetGeomType() != ogr.wkbNone:
-            gdaltest.post_reason('fail')
             return 'fail'
 
     # Recreate the field
     for t in [ogr.wkbPoint, ogr.wkbLineString]:
         feature_defn.SetGeomType(t)
         if feature_defn.GetGeomFieldCount() != 1:
-            gdaltest.post_reason('fail')
             return 'fail'
         if feature_defn.GetGeomType() != t:
-            gdaltest.post_reason('fail')
             return 'fail'
         if feature_defn.GetGeomFieldDefn(0).GetType() != t:
-            gdaltest.post_reason('fail')
             return 'fail'
 
     # Test setting invalid value
@@ -182,22 +158,17 @@ def test_ogr_rfc41_2():
     feature_defn.SetGeomType(-3)
     gdal.PopErrorHandler()
     if feature_defn.GetGeomType() != old_val:
-        gdaltest.post_reason('fail')
         return 'fail'
 
     # Test SetIgnored() / IsIgnored()
     if feature_defn.IsGeometryIgnored() != 0:
-        gdaltest.post_reason('fail')
         return 'fail'
     if feature_defn.GetGeomFieldDefn(0).IsIgnored() != 0:
-        gdaltest.post_reason('fail')
         return 'fail'
     feature_defn.SetGeometryIgnored(1)
     if feature_defn.IsGeometryIgnored() != 1:
-        gdaltest.post_reason('fail')
         return 'fail'
     if feature_defn.GetGeomFieldDefn(0).IsIgnored() != 1:
-        gdaltest.post_reason('fail')
         return 'fail'
 
     # Test wrong index values for GetGeomFieldDefn()
@@ -206,64 +177,48 @@ def test_ogr_rfc41_2():
         ret = feature_defn.GetGeomFieldDefn(idx)
         gdal.PopErrorHandler()
         if ret is not None:
-            gdaltest.post_reason('fail')
             return 'fail'
 
     # Test GetGeomFieldIndex()
     if feature_defn.GetGeomFieldIndex("") != 0:
-        gdaltest.post_reason('fail')
         return 'fail'
     if feature_defn.GetGeomFieldIndex("invalid") != -1:
-        gdaltest.post_reason('fail')
         return 'fail'
 
     # Test AddGeomFieldDefn()
     gfld_defn = ogr.GeomFieldDefn('polygon_field', ogr.wkbPolygon)
     feature_defn.AddGeomFieldDefn(gfld_defn)
     if feature_defn.GetGeomFieldCount() != 2:
-        gdaltest.post_reason('fail')
         return 'fail'
     if feature_defn.GetGeomFieldIndex("polygon_field") != 1:
-        gdaltest.post_reason('fail')
         return 'fail'
     if feature_defn.GetGeomFieldDefn(1).GetName() != 'polygon_field':
-        gdaltest.post_reason('fail')
         return 'fail'
 
     # Test DeleteGeomFieldDefn() : error cases
     if feature_defn.DeleteGeomFieldDefn(-1) == 0:
-        gdaltest.post_reason('fail')
         return 'fail'
     if feature_defn.DeleteGeomFieldDefn(2) == 0:
-        gdaltest.post_reason('fail')
         return 'fail'
     if feature_defn.GetGeomFieldCount() != 2:
-        gdaltest.post_reason('fail')
         return 'fail'
 
     # Test DeleteGeomFieldDefn() : valid cases
     if feature_defn.DeleteGeomFieldDefn(0) != 0:
-        gdaltest.post_reason('fail')
         return 'fail'
     if feature_defn.GetGeomFieldCount() != 1:
-        gdaltest.post_reason('fail')
         return 'fail'
     if feature_defn.GetGeomFieldIndex("polygon_field") != 0:
-        gdaltest.post_reason('fail')
         return 'fail'
 
     if feature_defn.DeleteGeomFieldDefn(0) != 0:
-        gdaltest.post_reason('fail')
         return 'fail'
     if feature_defn.GetGeomFieldCount() != 0:
-        gdaltest.post_reason('fail')
         return 'fail'
 
     if feature_defn.IsSame(feature_defn) != 1:
-        gdaltest.post_reason('fail')
         return 'fail'
     if feature_defn.IsSame(ogr.FeatureDefn()) != 0:
-        gdaltest.post_reason('fail')
         return 'fail'
 
     feature_defn = None
@@ -280,68 +235,48 @@ def test_ogr_rfc41_3():
     feature_defn = ogr.FeatureDefn()
     feature = ogr.Feature(feature_defn)
     if feature.GetGeomFieldCount() != 1:
-        gdaltest.post_reason('fail')
         return 'fail'
     if feature.GetGeomFieldDefnRef(0).GetName() != '':
-        gdaltest.post_reason('fail')
         return 'fail'
     if feature.GetGeomFieldDefnRef(0).GetType() != ogr.wkbUnknown:
-        gdaltest.post_reason('fail')
         return 'fail'
     if feature.GetGeomFieldIndex('') != 0:
-        gdaltest.post_reason('fail')
         return 'fail'
     if feature.GetGeomFieldIndex('non_existing') != -1:
-        gdaltest.post_reason('fail')
         return 'fail'
     if feature.GetGeomFieldRef(-1) is not None:
-        gdaltest.post_reason('fail')
         return 'fail'
     if feature.GetGeomFieldRef(0) is not None:
-        gdaltest.post_reason('fail')
         return 'fail'
     if feature.GetGeomFieldRef(1) is not None:
-        gdaltest.post_reason('fail')
         return 'fail'
     feature_clone_without_geom = feature.Clone()
     if not feature.Equal(feature_clone_without_geom):
-        gdaltest.post_reason('fail')
         return 'fail'
     if feature.SetGeomField(0, ogr.Geometry(ogr.wkbPoint)) != 0:
-        gdaltest.post_reason('fail')
         return 'fail'
     if feature.GetGeomFieldRef(0).ExportToWkt() != 'POINT EMPTY':
-        gdaltest.post_reason('fail')
         return 'fail'
     if not feature.Equal(feature.Clone()):
-        gdaltest.post_reason('fail')
         return 'fail'
     if feature.Equal(feature_clone_without_geom):
-        gdaltest.post_reason('fail')
         return 'fail'
     feature_clone_with_other_geom = feature.Clone()
     feature_clone_with_other_geom.SetGeometry(ogr.Geometry(ogr.wkbLineString))
     if feature.Equal(feature_clone_with_other_geom):
-        gdaltest.post_reason('fail')
         return 'fail'
     if feature.SetGeomFieldDirectly(-1, None) == 0:
-        gdaltest.post_reason('fail')
         return 'fail'
     if feature.SetGeomFieldDirectly(0, ogr.Geometry(ogr.wkbLineString)) != 0:
-        gdaltest.post_reason('fail')
         return 'fail'
     if feature.GetGeomFieldRef(0).ExportToWkt() != 'LINESTRING EMPTY':
-        gdaltest.post_reason('fail')
         return 'fail'
     feature_clone_with_geom = feature.Clone()
     if feature.SetGeomFieldDirectly(0, None) != 0:
-        gdaltest.post_reason('fail')
         return 'fail'
     if feature.GetGeomFieldRef(0) is not None:
-        gdaltest.post_reason('fail')
         return 'fail'
     if feature.Equal(feature_clone_with_geom):
-        gdaltest.post_reason('fail')
         return 'fail'
     feature = None
 
@@ -350,29 +285,21 @@ def test_ogr_rfc41_3():
     feature_defn.SetGeomType(ogr.wkbNone)
     feature = ogr.Feature(feature_defn)
     if not feature.Equal(feature.Clone()):
-        gdaltest.post_reason('fail')
         return 'fail'
     if feature.GetGeomFieldCount() != 0:
-        gdaltest.post_reason('fail')
         return 'fail'
     # This used to work before RFC 41, but it no longer will
     if feature.SetGeometry(ogr.Geometry(ogr.wkbPoint)) == 0:
-        gdaltest.post_reason('fail')
         return 'fail'
     if feature.SetGeomField(0, ogr.Geometry(ogr.wkbPoint)) == 0:
-        gdaltest.post_reason('fail')
         return 'fail'
     if feature.GetGeometryRef() is not None:
-        gdaltest.post_reason('fail')
         return 'fail'
     if feature.GetGeomFieldRef(0) is not None:
-        gdaltest.post_reason('fail')
         return 'fail'
     if feature.SetGeometryDirectly(ogr.Geometry(ogr.wkbPoint)) == 0:
-        gdaltest.post_reason('fail')
         return 'fail'
     if feature.SetGeomFieldDirectly(0, ogr.Geometry(ogr.wkbPoint)) == 0:
-        gdaltest.post_reason('fail')
         return 'fail'
     feature = None
 
@@ -387,21 +314,16 @@ def test_ogr_rfc41_3():
     feature.SetGeomField(0, ogr.Geometry(ogr.wkbPolygon))
     feature.SetGeomField(1, ogr.Geometry(ogr.wkbPoint))
     if feature.GetGeomFieldRef(0).ExportToWkt() != 'POLYGON EMPTY':
-        gdaltest.post_reason('fail')
         return 'fail'
     if feature.GetGeomFieldRef(1).ExportToWkt() != 'POINT EMPTY':
-        gdaltest.post_reason('fail')
         return 'fail'
     if not feature.Equal(feature.Clone()):
-        gdaltest.post_reason('fail')
         return 'fail'
     other_feature = ogr.Feature(feature_defn)
     if feature.Equal(other_feature):
-        gdaltest.post_reason('fail')
         return 'fail'
     other_feature.SetFrom(feature)
     if not feature.Equal(other_feature):
-        gdaltest.post_reason('fail')
         return 'fail'
 
     # Test that in SetFrom() where target has a single geometry field,
@@ -411,7 +333,6 @@ def test_ogr_rfc41_3():
     feature_default = ogr.Feature(feature_defn_default)
     feature_default.SetFrom(feature)
     if feature_default.GetGeomFieldRef(0).ExportToWkt() != 'POLYGON EMPTY':
-        gdaltest.post_reason('fail')
         return 'fail'
 
     return 'success'
@@ -424,18 +345,14 @@ def test_ogr_rfc41_4():
 
     ds = ogr.GetDriverByName('memory').CreateDataSource('')
     if ds.TestCapability(ogr.ODsCCreateGeomFieldAfterCreateLayer) == 0:
-        gdaltest.post_reason('fail')
         return 'fail'
     sr = osr.SpatialReference()
     lyr = ds.CreateLayer('test', geom_type=ogr.wkbPoint, srs=sr)
     if lyr.TestCapability(ogr.OLCCreateGeomField) == 0:
-        gdaltest.post_reason('fail')
         return 'fail'
     if lyr.GetSpatialRef().IsSame(sr) == 0:
-        gdaltest.post_reason('fail')
         return 'fail'
     if lyr.GetLayerDefn().GetGeomFieldDefn(0).GetSpatialRef().IsSame(sr) == 0:
-        gdaltest.post_reason('fail')
         return 'fail'
     lyr.GetLayerDefn().GetGeomFieldDefn(0).SetName('a_name')
     feat = ogr.Feature(lyr.GetLayerDefn())
@@ -445,7 +362,6 @@ def test_ogr_rfc41_4():
     feat = lyr.GetNextFeature()
     geom = feat.GetGeometryRef()
     if geom.GetSpatialReference().IsSame(sr) == 0:
-        gdaltest.post_reason('fail')
         return 'fail'
     feat = None
     lyr.CreateGeomField(ogr.GeomFieldDefn('another_geom_field', ogr.wkbPolygon))
@@ -457,17 +373,14 @@ def test_ogr_rfc41_4():
     feat = lyr.GetNextFeature()
     geom = feat.GetGeomFieldRef(0)
     if geom.ExportToWkt() != 'POINT (1 2)':
-        gdaltest.post_reason('fail')
         return 'fail'
     geom = feat.GetGeomFieldRef('another_geom_field')
     if geom.ExportToWkt() != 'POLYGON ((10 10,10 11,11 11,11 10,10 10))':
-        gdaltest.post_reason('fail')
         return 'fail'
 
     # Test GetExtent()
     got_extent = lyr.GetExtent(geom_field=1)
     if got_extent != (10.0, 11.0, 10.0, 11.0):
-        gdaltest.post_reason('fail')
         return 'fail'
     # Test invalid geometry field index
     gdal.ErrorReset()
@@ -475,7 +388,6 @@ def test_ogr_rfc41_4():
     got_extent = lyr.GetExtent(geom_field=2)
     gdal.PopErrorHandler()
     if gdal.GetLastErrorMsg() == '':
-        gdaltest.post_reason('fail')
         return 'fail'
 
     # Test SetSpatialFilter()
@@ -483,19 +395,16 @@ def test_ogr_rfc41_4():
     lyr.ResetReading()
     feat = lyr.GetNextFeature()
     if feat is not None:
-        gdaltest.post_reason('fail')
         return 'fail'
     lyr.SetSpatialFilter(1, ogr.CreateGeometryFromWkt('POLYGON ((10 10,10 11,11 11,11 10,10 10))'))
     lyr.ResetReading()
     feat = lyr.GetNextFeature()
     if feat is None:
-        gdaltest.post_reason('fail')
         return 'fail'
     lyr.SetSpatialFilterRect(1, 10, 10, 11, 11)
     lyr.ResetReading()
     feat = lyr.GetNextFeature()
     if feat is None:
-        gdaltest.post_reason('fail')
         return 'fail'
     # Test invalid spatial filter index
     gdal.ErrorReset()
@@ -503,7 +412,6 @@ def test_ogr_rfc41_4():
     lyr.SetSpatialFilterRect(2, 0, 0, 0, 0)
     gdal.PopErrorHandler()
     if gdal.GetLastErrorMsg() == '':
-        gdaltest.post_reason('fail')
         return 'fail'
 
     lyr.SetSpatialFilter(None)
@@ -511,11 +419,9 @@ def test_ogr_rfc41_4():
     dup_feat = another_lyr.GetNextFeature()
     geom = dup_feat.GetGeomFieldRef('a_name')
     if geom.ExportToWkt() != 'POINT (1 2)':
-        gdaltest.post_reason('fail')
         return 'fail'
     geom = dup_feat.GetGeomFieldRef('another_geom_field')
     if geom.ExportToWkt() != 'POLYGON ((10 10,10 11,11 11,11 10,10 10))':
-        gdaltest.post_reason('fail')
         return 'fail'
 
     return 'success'
@@ -534,36 +440,29 @@ def test_ogr_rfc41_5():
     f = ogr.Feature(feature_defn)
 
     if f['strfield'] is not None:
-        gdaltest.post_reason('fail')
         return 'fail'
     if f.strfield is not None:
-        gdaltest.post_reason('fail')
         return 'fail'
 
     if f['geomfield'] is not None:
-        gdaltest.post_reason('fail')
         return 'fail'
     if f.geomfield is not None:
-        gdaltest.post_reason('fail')
         return 'fail'
 
     try:
         f['nonexistent_field']
-        gdaltest.post_reason('fail')
         return 'fail'
     except KeyError:
         pass
 
     try:
         f.nonexistent_field
-        gdaltest.post_reason('fail')
         return 'fail'
     except AttributeError:
         pass
 
     try:
         f['nonexistent_field'] = 'foo'
-        gdaltest.post_reason('fail')
         return 'fail'
     except KeyError:
         pass
@@ -571,41 +470,32 @@ def test_ogr_rfc41_5():
     # This works.  Default Python behaviour. Stored in a dictionary
     f.nonexistent_field = 'bar'
     if f.nonexistent_field != 'bar':
-        gdaltest.post_reason('fail')
         return 'fail'
 
     f['strfield'] = 'foo'
     if f['strfield'] != 'foo':
-        gdaltest.post_reason('fail')
         return 'fail'
     if f.strfield != 'foo':
-        gdaltest.post_reason('fail')
         return 'fail'
 
     f.strfield = 'bar'
     if f['strfield'] != 'bar':
-        gdaltest.post_reason('fail')
         return 'fail'
     if f.strfield != 'bar':
-        gdaltest.post_reason('fail')
         return 'fail'
 
     wkt = 'POINT EMPTY'
     f['geomfield'] = ogr.CreateGeometryFromWkt(wkt)
     if f['geomfield'].ExportToWkt() != wkt:
-        gdaltest.post_reason('fail')
         return 'fail'
     if f.geomfield.ExportToWkt() != wkt:
-        gdaltest.post_reason('fail')
         return 'fail'
 
     wkt2 = 'POLYGON EMPTY'
     f.geomfield = ogr.CreateGeometryFromWkt(wkt2)
     if f['geomfield'].ExportToWkt() != wkt2:
-        gdaltest.post_reason('fail')
         return 'fail'
     if f.geomfield.ExportToWkt() != wkt2:
-        gdaltest.post_reason('fail')
         return 'fail'
 
     return 'success'
@@ -639,21 +529,16 @@ def test_ogr_rfc41_6():
                 'SELECT geomfield, intfield FROM poly']:
         sql_lyr = ds.ExecuteSQL(sql)
         if sql_lyr.GetLayerDefn().GetGeomFieldDefn(0).GetType() != ogr.wkbPolygon:
-            gdaltest.post_reason('fail')
             return 'fail'
         if sql_lyr.GetLayerDefn().GetGeomFieldDefn(0).GetSpatialRef() is None:
-            gdaltest.post_reason('fail')
             return 'fail'
         feat = sql_lyr.GetNextFeature()
         if feat.GetField('intfield') != 1:
-            gdaltest.post_reason('fail')
             return 'fail'
         if feat.GetGeomFieldRef('geomfield') is None:
-            gdaltest.post_reason('fail')
             return 'fail'
         feat = sql_lyr.GetNextFeature()
         if feat.GetGeomFieldRef('geomfield') is not None:
-            gdaltest.post_reason('fail')
             return 'fail'
         feat = None
         ds.ReleaseResultSet(sql_lyr)
@@ -661,14 +546,11 @@ def test_ogr_rfc41_6():
     # Test CAST(geometry_field AS GEOMETRY)
     sql_lyr = ds.ExecuteSQL('SELECT CAST(geomfield AS GEOMETRY) AS mygeom FROM poly WHERE CAST(geomfield AS GEOMETRY) IS NOT NULL')
     if sql_lyr.GetLayerDefn().GetGeomFieldDefn(0).GetType() != ogr.wkbUnknown:
-        gdaltest.post_reason('fail')
         return 'fail'
     if sql_lyr.GetLayerDefn().GetGeomFieldDefn(0).GetSpatialRef() is not None:
-        gdaltest.post_reason('fail')
         return 'fail'
     feat = sql_lyr.GetNextFeature()
     if feat.GetGeomFieldRef('mygeom') is None:
-        gdaltest.post_reason('fail')
         return 'fail'
     feat = None
     ds.ReleaseResultSet(sql_lyr)
@@ -676,14 +558,11 @@ def test_ogr_rfc41_6():
     # Test CAST(xxx AS GEOMETRY(POLYGON))
     sql_lyr = ds.ExecuteSQL('SELECT CAST(geomfield AS GEOMETRY(POLYGON)) AS mygeom FROM poly WHERE CAST(geomfield AS GEOMETRY(POLYGON)) IS NOT NULL')
     if sql_lyr.GetLayerDefn().GetGeomFieldDefn(0).GetType() != ogr.wkbPolygon:
-        gdaltest.post_reason('fail')
         return 'fail'
     if sql_lyr.GetLayerDefn().GetGeomFieldDefn(0).GetSpatialRef() is not None:
-        gdaltest.post_reason('fail')
         return 'fail'
     feat = sql_lyr.GetNextFeature()
     if feat.GetGeomFieldRef('mygeom') is None:
-        gdaltest.post_reason('fail')
         return 'fail'
     feat = None
     ds.ReleaseResultSet(sql_lyr)
@@ -691,14 +570,11 @@ def test_ogr_rfc41_6():
     # Test CAST(xxx AS GEOMETRY(POLYGON,4326))
     sql_lyr = ds.ExecuteSQL('SELECT CAST(geomfield AS GEOMETRY(POLYGON,4326)) AS mygeom FROM poly WHERE CAST(geomfield AS GEOMETRY(POLYGON,4326)) IS NOT NULL')
     if sql_lyr.GetLayerDefn().GetGeomFieldDefn(0).GetType() != ogr.wkbPolygon:
-        gdaltest.post_reason('fail')
         return 'fail'
     if sql_lyr.GetLayerDefn().GetGeomFieldDefn(0).GetSpatialRef().ExportToWkt().find('4326') < 0:
-        gdaltest.post_reason('fail')
         return 'fail'
     feat = sql_lyr.GetNextFeature()
     if feat.GetGeomFieldRef('mygeom') is None:
-        gdaltest.post_reason('fail')
         return 'fail'
     feat = None
     ds.ReleaseResultSet(sql_lyr)
@@ -707,7 +583,6 @@ def test_ogr_rfc41_6():
     sql_lyr = ds.ExecuteSQL("SELECT CAST('MULTIPOLYGON (((0 0,0 1,1 1,1 0,0 0)))' AS GEOMETRY(POLYGON)) AS mygeom FROM poly")
     feat = sql_lyr.GetNextFeature()
     if feat.GetGeomFieldRef('mygeom').ExportToWkt() != 'POLYGON ((0 0,0 1,1 1,1 0,0 0))':
-        gdaltest.post_reason('fail')
         return 'fail'
     feat = None
     ds.ReleaseResultSet(sql_lyr)
@@ -716,7 +591,6 @@ def test_ogr_rfc41_6():
     sql_lyr = ds.ExecuteSQL("SELECT CAST('POLYGON ((0 0,0 1,1 1,1 0,0 0))' AS GEOMETRY(MULTIPOLYGON)) AS mygeom FROM poly")
     feat = sql_lyr.GetNextFeature()
     if feat.GetGeomFieldRef('mygeom').ExportToWkt() != 'MULTIPOLYGON (((0 0,0 1,1 1,1 0,0 0)))':
-        gdaltest.post_reason('fail')
         return 'fail'
     feat = None
     ds.ReleaseResultSet(sql_lyr)
@@ -725,7 +599,6 @@ def test_ogr_rfc41_6():
     sql_lyr = ds.ExecuteSQL("SELECT CAST('MULTILINESTRING ((0 0,0 1,1 1,1 0,0 0))' AS GEOMETRY(LINESTRING)) AS mygeom FROM poly")
     feat = sql_lyr.GetNextFeature()
     if feat.GetGeomFieldRef('mygeom').ExportToWkt() != 'LINESTRING (0 0,0 1,1 1,1 0,0 0)':
-        gdaltest.post_reason('fail')
         return 'fail'
     feat = None
     ds.ReleaseResultSet(sql_lyr)
@@ -734,7 +607,6 @@ def test_ogr_rfc41_6():
     sql_lyr = ds.ExecuteSQL("SELECT CAST('LINESTRING (0 0,0 1,1 1,1 0,0 0)' AS GEOMETRY(MULTILINESTRING)) AS mygeom FROM poly")
     feat = sql_lyr.GetNextFeature()
     if feat.GetGeomFieldRef('mygeom').ExportToWkt() != 'MULTILINESTRING ((0 0,0 1,1 1,1 0,0 0))':
-        gdaltest.post_reason('fail')
         return 'fail'
     feat = None
     ds.ReleaseResultSet(sql_lyr)
@@ -742,17 +614,13 @@ def test_ogr_rfc41_6():
     # Test expression with cast CHARACTER <--> GEOMETRY
     sql_lyr = ds.ExecuteSQL('SELECT CAST(CAST(geomfield AS CHARACTER) AS GEOMETRY) AS mygeom, intfield FROM poly')
     if sql_lyr.GetLayerDefn().GetGeomFieldDefn(0).GetType() != ogr.wkbUnknown:
-        gdaltest.post_reason('fail')
         return 'fail'
     if sql_lyr.GetLayerDefn().GetGeomFieldDefn(0).GetSpatialRef() is not None:
-        gdaltest.post_reason('fail')
         return 'fail'
     feat = sql_lyr.GetNextFeature()
     if feat.GetField('intfield') != 1:
-        gdaltest.post_reason('fail')
         return 'fail'
     if feat.GetGeomFieldRef('mygeom') is None:
-        gdaltest.post_reason('fail')
         return 'fail'
     feat = None
     ds.ReleaseResultSet(sql_lyr)
@@ -760,11 +628,9 @@ def test_ogr_rfc41_6():
     # Test CAST(NULL AS GEOMETRY)
     sql_lyr = ds.ExecuteSQL('SELECT CAST(NULL AS GEOMETRY) FROM poly')
     if sql_lyr.GetLayerDefn().GetGeomFieldDefn(0).GetType() != ogr.wkbUnknown:
-        gdaltest.post_reason('fail')
         return 'fail'
     feat = sql_lyr.GetNextFeature()
     if feat.GetGeomFieldRef('') is not None:
-        gdaltest.post_reason('fail')
         return 'fail'
     feat = None
     ds.ReleaseResultSet(sql_lyr)
@@ -772,11 +638,9 @@ def test_ogr_rfc41_6():
     # Test CAST(stringfield AS GEOMETRY)
     sql_lyr = ds.ExecuteSQL('SELECT CAST(wkt AS GEOMETRY) FROM poly')
     if sql_lyr.GetLayerDefn().GetGeomFieldDefn(0).GetType() != ogr.wkbUnknown:
-        gdaltest.post_reason('fail')
         return 'fail'
     feat = sql_lyr.GetNextFeature()
     if feat.GetGeomFieldRef('wkt').ExportToWkt() != 'POINT (0 0)':
-        gdaltest.post_reason('fail')
         return 'fail'
     feat = None
     ds.ReleaseResultSet(sql_lyr)
@@ -785,10 +649,8 @@ def test_ogr_rfc41_6():
     sql_lyr = ds.ExecuteSQL('SELECT COUNT(geomfield) FROM poly')
     feat = sql_lyr.GetNextFeature()
     if feat is None:
-        gdaltest.post_reason('fail')
         return 'fail'
     if feat.GetField(0) != 1:
-        gdaltest.post_reason('fail')
         return 'fail'
     feat = None
     ds.ReleaseResultSet(sql_lyr)
@@ -810,11 +672,9 @@ def test_ogr_rfc41_6():
         sql_lyr = ds.ExecuteSQL(sql)
         gdal.PopErrorHandler()
         if gdal.GetLastErrorMsg().find(error_msg) != 0:
-            gdaltest.post_reason('fail')
             print('For %s, expected error %s, got %s' % (sql, error_msg, gdal.GetLastErrorMsg()))
             return 'fail'
         if sql_lyr is not None:
-            gdaltest.post_reason('fail')
             return 'fail'
 
     # Test invalid expressions with geometry
@@ -833,22 +693,18 @@ def test_ogr_rfc41_6():
         sql_lyr = ds.ExecuteSQL(sql)
         gdal.PopErrorHandler()
         if gdal.GetLastErrorMsg().find('Cannot use geometry field in this operation') != 0:
-            gdaltest.post_reason('fail')
             print(gdal.GetLastErrorMsg())
             return 'fail'
         if sql_lyr is not None:
-            gdaltest.post_reason('fail')
             return 'fail'
 
     # Test expression with geometry in WHERE
     sql_lyr = ds.ExecuteSQL('SELECT * FROM poly WHERE geomfield IS NOT NULL')
     feat = sql_lyr.GetNextFeature()
     if feat.GetField('intfield') != 1:
-        gdaltest.post_reason('fail')
         return 'fail'
     feat = sql_lyr.GetNextFeature()
     if feat is not None:
-        gdaltest.post_reason('fail')
         return 'fail'
     feat = None
     ds.ReleaseResultSet(sql_lyr)
@@ -856,11 +712,9 @@ def test_ogr_rfc41_6():
     sql_lyr = ds.ExecuteSQL('SELECT * FROM poly WHERE geomfield IS NULL')
     feat = sql_lyr.GetNextFeature()
     if feat.IsFieldSet(0):
-        gdaltest.post_reason('fail')
         return 'fail'
     feat = sql_lyr.GetNextFeature()
     if feat is not None:
-        gdaltest.post_reason('fail')
         return 'fail'
     feat = None
     ds.ReleaseResultSet(sql_lyr)
@@ -868,11 +722,9 @@ def test_ogr_rfc41_6():
     sql_lyr = ds.ExecuteSQL("SELECT * FROM poly WHERE CAST(geomfield AS CHARACTER) = 'POLYGON EMPTY'")
     feat = sql_lyr.GetNextFeature()
     if feat is None:
-        gdaltest.post_reason('fail')
         return 'fail'
     feat = sql_lyr.GetNextFeature()
     if feat is not None:
-        gdaltest.post_reason('fail')
         return 'fail'
     feat = None
     ds.ReleaseResultSet(sql_lyr)
@@ -880,7 +732,6 @@ def test_ogr_rfc41_6():
     sql_lyr = ds.ExecuteSQL('SELECT count(*) FROM poly WHERE geomfield IS NULL')
     feat = sql_lyr.GetNextFeature()
     if feat.GetField(0) != 1:
-        gdaltest.post_reason('fail')
         return 'fail'
     feat = None
     ds.ReleaseResultSet(sql_lyr)
@@ -888,7 +739,6 @@ def test_ogr_rfc41_6():
     sql_lyr = ds.ExecuteSQL('SELECT count(*) FROM poly WHERE geomfield IS NOT NULL')
     feat = sql_lyr.GetNextFeature()
     if feat.GetField(0) != 1:
-        gdaltest.post_reason('fail')
         return 'fail'
     feat = None
     ds.ReleaseResultSet(sql_lyr)
@@ -905,14 +755,12 @@ def test_ogr_rfc41_6():
     sql_lyr.SetSpatialFilterRect(0, 0, 0, 0)
     feat = sql_lyr.GetNextFeature()
     if feat is not None:
-        gdaltest.post_reason('fail')
         return 'fail'
     feat = None
 
     sql_lyr.SetSpatialFilterRect(0, 1, 2, 1, 2)
     feat = sql_lyr.GetNextFeature()
     if feat is None:
-        gdaltest.post_reason('fail')
         return 'fail'
     feat = None
 
@@ -922,7 +770,6 @@ def test_ogr_rfc41_6():
     sql_lyr.SetSpatialFilterRect(2, 0, 0, 0, 0)
     gdal.PopErrorHandler()
     if gdal.GetLastErrorMsg() == '':
-        gdaltest.post_reason('fail')
         return 'fail'
 
     # Test invalid geometry field index
@@ -931,7 +778,6 @@ def test_ogr_rfc41_6():
     sql_lyr.GetExtent(geom_field=2)
     gdal.PopErrorHandler()
     if gdal.GetLastErrorMsg() == '':
-        gdaltest.post_reason('fail')
         return 'fail'
 
     ds.ReleaseResultSet(sql_lyr)
@@ -940,13 +786,10 @@ def test_ogr_rfc41_6():
     sql_lyr = ds.ExecuteSQL('SELECT geomfield as geom1, geomfield as geom2 FROM poly')
     feat = sql_lyr.GetNextFeature()
     if feat is None:
-        gdaltest.post_reason('fail')
         return 'fail'
     if feat.GetGeomFieldRef('geom1') is None:
-        gdaltest.post_reason('fail')
         return 'fail'
     if feat.GetGeomFieldRef('geom2') is None:
-        gdaltest.post_reason('fail')
         return 'fail'
     feat = None
     ds.ReleaseResultSet(sql_lyr)
@@ -965,10 +808,8 @@ def test_ogr_rfc41_6():
         sql_lyr = ds.ExecuteSQL(sql)
         feat = sql_lyr.GetNextFeature()
         if feat.GetGeomFieldRef('geomfield').ExportToWkt() != 'POINT (1 2)':
-            gdaltest.post_reason('fail')
             return 'fail'
         if feat.GetGeomFieldRef('secondarygeom').ExportToWkt() != 'POINT (10 100)':
-            gdaltest.post_reason('fail')
             return 'fail'
         feat = None
         ds.ReleaseResultSet(sql_lyr)
@@ -976,33 +817,26 @@ def test_ogr_rfc41_6():
     # Check that we don't get an implicit geometry field
     sql_lyr = ds.ExecuteSQL('SELECT intfield FROM poly')
     if sql_lyr.GetLayerDefn().GetGeomFieldCount() != 0:
-        gdaltest.post_reason('fail')
         return 'fail'
     ds.ReleaseResultSet(sql_lyr)
 
     # Check GetExtent() and SetSpatialFilter()
     sql_lyr = ds.ExecuteSQL('SELECT * FROM poly')
     if sql_lyr.GetExtent(geom_field=0) != (1.0, 1.0, 2.0, 2.0):
-        gdaltest.post_reason('fail')
         return 'fail'
     if sql_lyr.GetExtent(geom_field=1) != (10.0, 10.0, 100.0, 100.0):
-        gdaltest.post_reason('fail')
         return 'fail'
     sql_lyr.SetSpatialFilterRect(0, 0.5, 1.5, 1.5, 2.5)
     if sql_lyr.GetFeatureCount() != 1:
-        gdaltest.post_reason('fail')
         return 'fail'
     sql_lyr.SetSpatialFilterRect(0, 0, 0, 0.5, 0.5)
     if sql_lyr.GetFeatureCount() != 0:
-        gdaltest.post_reason('fail')
         return 'fail'
     sql_lyr.SetSpatialFilterRect(1, 9, 99, 11, 101)
     if sql_lyr.GetFeatureCount() != 1:
-        gdaltest.post_reason('fail')
         return 'fail'
     sql_lyr.SetSpatialFilterRect(1, 0, 0, 0.5, 0.5)
     if sql_lyr.GetFeatureCount() != 0:
-        gdaltest.post_reason('fail')
         return 'fail'
     ds.ReleaseResultSet(sql_lyr)
 
@@ -1036,7 +870,6 @@ def test_ogr_rfc41_7():
        feat.geom4.GetGeometryType() != ogr.wkbPolygon or \
        feat['_ogr_geometry_'].GetGeometryType() != ogr.wkbPolygon:
         feat.DumpReadable()
-        gdaltest.post_reason('fail')
         return 'fail'
     ds.ReleaseResultSet(sql_lyr)
 
@@ -1067,20 +900,15 @@ def test_ogr_rfc41_8():
     sql_lyr = ds.ExecuteSQL('SELECT * FROM mytable', dialect='SQLite')
     if sql_lyr.GetLayerDefn().GetGeomFieldCount() != 2:
         print(sql_lyr.GetLayerDefn().GetGeomFieldCount())
-        gdaltest.post_reason('fail')
         return 'fail'
     if sql_lyr.GetLayerDefn().GetGeomFieldDefn(0).GetType() != ogr.wkbPolygon:
-        gdaltest.post_reason('fail')
         return 'fail'
     if sql_lyr.GetLayerDefn().GetGeomFieldDefn(0).GetSpatialRef() is not None:
-        gdaltest.post_reason('fail')
         return 'fail'
     if sql_lyr.GetLayerDefn().GetGeomFieldDefn(1).GetType() != ogr.wkbPoint25D:
-        gdaltest.post_reason('fail')
         return 'fail'
     srs = sql_lyr.GetLayerDefn().GetGeomFieldDefn(1).GetSpatialRef()
     if srs.GetAuthorityCode(None) != '4326':
-        gdaltest.post_reason('fail')
         return 'fail'
     ds.ReleaseResultSet(sql_lyr)
 
@@ -1095,12 +923,10 @@ def test_ogr_rfc41_8():
     geom = feat.GetGeomFieldRef('geomfield')
     if geom.ExportToWkt() != 'POLYGON ((0 0,0 1,1 1,1 0,0 0))':
         feat.DumpReadable()
-        gdaltest.post_reason('fail')
         return 'fail'
     geom = feat.GetGeomFieldRef('geomfield2')
     if geom.ExportToWkt() != 'POINT (0 1 2)':
         feat.DumpReadable()
-        gdaltest.post_reason('fail')
         return 'fail'
     feat = None
     ds.ReleaseResultSet(sql_lyr)
@@ -1115,12 +941,10 @@ def test_ogr_rfc41_8():
     geom = feat.GetGeomFieldRef('geomfield')
     if geom.ExportToWkt() != 'POLYGON ((0 0,0 1,1 1,1 0,0 0))':
         feat.DumpReadable()
-        gdaltest.post_reason('fail')
         return 'fail'
     geom = feat.GetGeomFieldRef('geomfield2')
     if geom.ExportToWkt() != 'POINT (3 4 5)':
         feat.DumpReadable()
-        gdaltest.post_reason('fail')
         return 'fail'
     feat = None
     ds.ReleaseResultSet(sql_lyr)
diff --git a/autotest/ogr/ogr_s57.py b/autotest/ogr/ogr_s57.py
index efd38b5754b9..0d0e95ea43c7 100755
--- a/autotest/ogr/ogr_s57.py
+++ b/autotest/ogr/ogr_s57.py
@@ -292,11 +292,9 @@ def test_ogr_s57_9():
 
     ds = gdal.OpenEx('tmp/ogr_s57_9.000', open_options=['RETURN_PRIMITIVES=ON'])
     if ds is None:
-        gdaltest.post_reason('fail')
         return 'fail'
 
     if ds.GetLayerByName('IsolatedNode') is None:
-        gdaltest.post_reason('fail')
         return 'fail'
 
     gdaltest.s57_ds = ds
diff --git a/autotest/ogr/ogr_segy.py b/autotest/ogr/ogr_segy.py
index ff77f8911c44..43bbf95699ad 100755
--- a/autotest/ogr/ogr_segy.py
+++ b/autotest/ogr/ogr_segy.py
@@ -47,7 +47,6 @@ def test_ogr_segy_1():
         return 'fail'
 
     if ds.TestCapability("foo") != 0:
-        gdaltest.post_reason('fail')
         return 'fail'
 
     if ds.GetLayerCount() != 2:
@@ -64,11 +63,9 @@ def test_ogr_segy_1():
         return 'fail'
 
     if lyr.TestCapability("foo") != 0:
-        gdaltest.post_reason('fail')
         return 'fail'
 
     if lyr.GetLayerDefn().GetFieldCount() != 71:
-        gdaltest.post_reason('fail')
         print(lyr.GetLayerDefn().GetFieldCount())
         return 'fail'
 
@@ -81,7 +78,6 @@ def test_ogr_segy_1():
 
     feat = lyr.GetNextFeature()
     if feat is not None:
-        gdaltest.post_reason('fail')
         return 'fail'
 
     lyr = ds.GetLayer(1)
@@ -94,22 +90,18 @@ def test_ogr_segy_1():
         return 'fail'
 
     if lyr.TestCapability("foo") != 0:
-        gdaltest.post_reason('fail')
         return 'fail'
 
     if lyr.GetLayerDefn().GetFieldCount() != 32:
-        gdaltest.post_reason('fail')
         print(lyr.GetLayerDefn().GetFieldCount())
         return 'fail'
 
     feat = lyr.GetNextFeature()
     if feat is None:
-        gdaltest.post_reason('fail')
         return 'fail'
 
     feat = lyr.GetNextFeature()
     if feat is not None:
-        gdaltest.post_reason('fail')
         return 'fail'
 
     return 'success'
diff --git a/autotest/ogr/ogr_shape.py b/autotest/ogr/ogr_shape.py
index 6fbb595021b4..b3d3dda3b5e3 100755
--- a/autotest/ogr/ogr_shape.py
+++ b/autotest/ogr/ogr_shape.py
@@ -1206,7 +1206,6 @@ def test_ogr_shape_28():
     ret = lyr.CreateFeature(feat)
     gdal.PopErrorHandler()
     if ret != 0:
-        gdaltest.post_reason('failure')
         return 'fail'
     feat = None
     if gdal.GetLastErrorMsg().find('2GB file size limit reached') < 0:
@@ -1233,7 +1232,6 @@ def test_ogr_shape_28():
     ret = lyr.CreateFeature(feat)
     gdal.PopErrorHandler()
     if ret == 0:
-        gdaltest.post_reason('failure')
         return 'fail'
     feat = None
     if gdal.GetLastErrorMsg().find('2GB file size limit reached') < 0:
@@ -1272,12 +1270,10 @@ def test_ogr_shape_29():
 
     for filename in lst:
         if filename not in ['.', '..', 'UPPERCASE.SHP', 'UPPERCASE.SHX', 'UPPERCASE.DBF', 'UPPERCASE.CPG']:
-            gdaltest.post_reason('fail')
             print(lst)
             print(filename)
             return 'fail'
         if filename.find('packed') >= 0:
-            gdaltest.post_reason('fail')
             print(lst)
             print(filename)
             return 'fail'
@@ -2227,7 +2223,6 @@ def test_ogr_shape_53():
     # Test ReorderFields() when there are no fields
     ret = lyr.ReorderFields([])
     if ret != 0:
-        gdaltest.post_reason('failed')
         return 'fail'
 
     # Test REPACK when there are no features
@@ -2237,7 +2232,6 @@ def test_ogr_shape_53():
     gdal.PopErrorHandler()
     # Should work without any error
     if gdal.GetLastErrorMsg() != '':
-        gdaltest.post_reason('failed')
         return 'fail'
 
     # Create a field
@@ -2250,7 +2244,6 @@ def test_ogr_shape_53():
     feat = lyr.GetFeature(-1)
     gdal.PopErrorHandler()
     if feat is not None or gdal.GetLastErrorMsg() == '':
-        gdaltest.post_reason('failed')
         return 'fail'
 
     # SetFeature() on a invalid FID
@@ -2261,7 +2254,6 @@ def test_ogr_shape_53():
     feat = None
     gdal.PopErrorHandler()
     if ret == 0:
-        gdaltest.post_reason('failed')
         return 'fail'
 
     # SetFeature() on a invalid FID
@@ -2273,7 +2265,6 @@ def test_ogr_shape_53():
     feat = None
     gdal.PopErrorHandler()
     if ret == 0:
-        gdaltest.post_reason('failed')
         return 'fail'
 
     # DeleteFeature() on a invalid FID
@@ -2282,7 +2273,6 @@ def test_ogr_shape_53():
     ret = lyr.DeleteFeature(-1)
     gdal.PopErrorHandler()
     if ret == 0:
-        gdaltest.post_reason('failed')
         return 'fail'
 
     feat = ogr.Feature(lyr.GetLayerDefn())
@@ -2291,7 +2281,6 @@ def test_ogr_shape_53():
 
     ret = lyr.DeleteFeature(0)
     if ret != 0:
-        gdaltest.post_reason('failed')
         return 'fail'
 
     # Try deleting an already deleted feature
@@ -2300,7 +2289,6 @@ def test_ogr_shape_53():
     ret = lyr.DeleteFeature(0)
     gdal.PopErrorHandler()
     if ret == 0:
-        gdaltest.post_reason('failed')
         return 'fail'
 
     # Test DeleteField() on a invalid index
@@ -2309,7 +2297,6 @@ def test_ogr_shape_53():
     ret = lyr.DeleteField(-1)
     gdal.PopErrorHandler()
     if ret == 0 or gdal.GetLastErrorMsg() == '':
-        gdaltest.post_reason('failed')
         return 'fail'
 
     # Test ReorderFields() with invalid permutation
@@ -2318,7 +2305,6 @@ def test_ogr_shape_53():
     ret = lyr.ReorderFields([1])
     gdal.PopErrorHandler()
     if ret == 0 or gdal.GetLastErrorMsg() == '':
-        gdaltest.post_reason('failed')
         return 'fail'
 
     # Test AlterFieldDefn() on a invalid index
@@ -2328,7 +2314,6 @@ def test_ogr_shape_53():
     ret = lyr.AlterFieldDefn(-1, fd, 0)
     gdal.PopErrorHandler()
     if ret == 0 or gdal.GetLastErrorMsg() == '':
-        gdaltest.post_reason('failed')
         return 'fail'
 
     # Test AlterFieldDefn() when attempting to convert from OFTString to something else
@@ -2338,7 +2323,6 @@ def test_ogr_shape_53():
     ret = lyr.AlterFieldDefn(0, fd, ogr.ALTER_TYPE_FLAG)
     gdal.PopErrorHandler()
     if ret == 0 or gdal.GetLastErrorMsg() == '':
-        gdaltest.post_reason('failed')
         return 'fail'
 
     # Test DROP SPATIAL INDEX ON layer without index
@@ -2347,7 +2331,6 @@ def test_ogr_shape_53():
     ret = ds.ExecuteSQL("DROP SPATIAL INDEX ON ogr_shape_53")
     gdal.PopErrorHandler()
     if gdal.GetLastErrorMsg() == '':
-        gdaltest.post_reason('failed')
         return 'fail'
 
     # Re-create a feature
@@ -2363,22 +2346,16 @@ def test_ogr_shape_53():
     lyr = ds.GetLayer(0)
 
     if lyr.TestCapability(ogr.OLCSequentialWrite) != 0:
-        gdaltest.post_reason('failed')
         return 'fail'
     if lyr.TestCapability(ogr.OLCDeleteFeature) != 0:
-        gdaltest.post_reason('failed')
         return 'fail'
     if lyr.TestCapability(ogr.OLCCreateField) != 0:
-        gdaltest.post_reason('failed')
         return 'fail'
     if lyr.TestCapability(ogr.OLCDeleteField) != 0:
-        gdaltest.post_reason('failed')
         return 'fail'
     if lyr.TestCapability(ogr.OLCReorderFields) != 0:
-        gdaltest.post_reason('failed')
         return 'fail'
     if lyr.TestCapability(ogr.OLCAlterFieldDefn) != 0:
-        gdaltest.post_reason('failed')
         return 'fail'
 
     # Test CreateField()
@@ -2389,7 +2366,6 @@ def test_ogr_shape_53():
     ret = lyr.CreateField(fd)
     gdal.PopErrorHandler()
     if ret == 0 or gdal.GetLastErrorMsg() == '':
-        gdaltest.post_reason('failed')
         return 'fail'
 
     # Test ReorderFields()
@@ -2398,7 +2374,6 @@ def test_ogr_shape_53():
     ret = lyr.ReorderFields([0])
     gdal.PopErrorHandler()
     if ret == 0 or gdal.GetLastErrorMsg() == '':
-        gdaltest.post_reason('failed')
         return 'fail'
 
     # Test DeleteField()
@@ -2407,7 +2382,6 @@ def test_ogr_shape_53():
     ret = lyr.DeleteField(0)
     gdal.PopErrorHandler()
     if ret == 0 or gdal.GetLastErrorMsg() == '':
-        gdaltest.post_reason('failed')
         return 'fail'
 
     # Test AlterFieldDefn()
@@ -2417,7 +2391,6 @@ def test_ogr_shape_53():
     ret = lyr.AlterFieldDefn(0, fd, 0)
     gdal.PopErrorHandler()
     if ret == 0 or gdal.GetLastErrorMsg() == '':
-        gdaltest.post_reason('failed')
         return 'fail'
 
     # Test CreateFeature()
@@ -2428,7 +2401,6 @@ def test_ogr_shape_53():
     ret = lyr.CreateFeature(feat)
     gdal.PopErrorHandler()
     if ret == 0 or gdal.GetLastErrorMsg() == '':
-        gdaltest.post_reason('failed')
         return 'fail'
 
     # Test DeleteFeature()
@@ -2437,7 +2409,6 @@ def test_ogr_shape_53():
     ret = lyr.DeleteFeature(0)
     gdal.PopErrorHandler()
     if ret == 0 or gdal.GetLastErrorMsg() == '':
-        gdaltest.post_reason('failed')
         return 'fail'
 
     # Test SetFeature()
@@ -2448,7 +2419,6 @@ def test_ogr_shape_53():
     ret = lyr.SetFeature(feat)
     gdal.PopErrorHandler()
     if ret == 0 or gdal.GetLastErrorMsg() == '':
-        gdaltest.post_reason('failed')
         return 'fail'
 
     # Test REPACK
@@ -2457,7 +2427,6 @@ def test_ogr_shape_53():
     ret = ds.ExecuteSQL("REPACK ogr_shape_53")
     gdal.PopErrorHandler()
     if gdal.GetLastErrorMsg() == '':
-        gdaltest.post_reason('failed')
         return 'fail'
 
     # Test RECOMPUTE EXTENT ON
@@ -2466,7 +2435,6 @@ def test_ogr_shape_53():
     ret = ds.ExecuteSQL("RECOMPUTE EXTENT ON ogr_shape_53")
     gdal.PopErrorHandler()
     if gdal.GetLastErrorMsg() == '':
-        gdaltest.post_reason('failed')
         return 'fail'
 
     feat = None
@@ -2483,7 +2451,6 @@ def test_ogr_shape_53():
     ret = lyr.DeleteFeature(0)
     gdal.PopErrorHandler()
     if ret == 0 or gdal.GetLastErrorMsg() == '':
-        gdaltest.post_reason('failed')
         return 'fail'
 
     # Test REPACK
@@ -2506,7 +2473,6 @@ def test_ogr_shape_53():
     ret = ds.ExecuteSQL("RECOMPUTE EXTENT ON ogr_shape_53")
     gdal.PopErrorHandler()
     if gdal.GetLastErrorMsg() == '':
-        gdaltest.post_reason('failed')
         return 'fail'
 
     lyr = None
@@ -2629,7 +2595,6 @@ def test_ogr_shape_54():
         lyr.GetNextFeature()
         gdal.PopErrorHandler()
         if gdal.GetLastErrorMsg() == '':
-            gdaltest.post_reason('failed')
             return 'fail'
     gdal.ErrorReset()
 
@@ -2876,12 +2841,10 @@ def test_ogr_shape_59():
     geom = feat.GetGeometryRef()
     if geom.ExportToIsoWkt() != 'LINESTRING M (0 0 10,1 1 20)':
         print(geom.ExportToIsoWkt())
-        gdaltest.post_reason('fail')
         return 'fail'
     feat = shp_lyr.GetNextFeature()
     geom = feat.GetGeometryRef()
     if geom.ExportToIsoWkt() != 'MULTILINESTRING M ((0 0 10,1 1 20),(2 2 30,3 3 40))':
-        gdaltest.post_reason('fail')
         return 'fail'
     geom = None
     feat = None
@@ -2892,13 +2855,11 @@ def test_ogr_shape_59():
     geom = feat.GetGeometryRef()
     if geom.ExportToIsoWkt() != 'POLYGON M ((0 0 10,0 1 20,1 1 30,0 0 40))':
         print(geom.ExportToIsoWkt())
-        gdaltest.post_reason('fail')
         return 'fail'
     feat = shp_lyr.GetNextFeature()
     geom = feat.GetGeometryRef()
     if geom.ExportToIsoWkt() != 'POLYGON M ((0 0 10,0 1 20,1 1 30,0 0 40),(0.25 0.25 50,0.75 0.75 60,0.25 0.75 70,0.25 0.25 80))':
         print(geom.ExportToIsoWkt())
-        gdaltest.post_reason('fail')
         return 'fail'
     geom = None
     feat = None
@@ -3088,12 +3049,10 @@ def test_ogr_shape_63():
     lyr = ds.CreateLayer('ogr_shape_63', geom_type=ogr.wkbNone)
     gdaltest.fieldname = '\xc3\xa9'
     if lyr.CreateField(ogr.FieldDefn(gdaltest.fieldname, ogr.OFTString)) != 0:
-        gdaltest.post_reason('failed')
         return 'fail'
 
     gdaltest.fieldname = '\xc3\xa9\xc3\xa9'
     if lyr.AlterFieldDefn(0, ogr.FieldDefn(gdaltest.fieldname, ogr.OFTString), ogr.ALTER_NAME_FLAG) != 0:
-        gdaltest.post_reason('failed')
         return 'fail'
 
     chinese_str = struct.pack('B' * 6, 229, 144, 141, 231, 167, 176)
@@ -3105,7 +3064,6 @@ def test_ogr_shape_63():
     gdal.PopErrorHandler()
 
     if ret == 0:
-        gdaltest.post_reason('failed')
         return 'fail'
 
     gdal.PushErrorHandler('CPLQuietErrorHandler')
@@ -3113,7 +3071,6 @@ def test_ogr_shape_63():
     gdal.PopErrorHandler()
 
     if ret == 0:
-        gdaltest.post_reason('failed')
         return 'fail'
 
     ds = None
@@ -3121,10 +3078,8 @@ def test_ogr_shape_63():
     ds = ogr.Open('/vsimem/ogr_shape_63.dbf')
     lyr = ds.GetLayer(0)
     if lyr.TestCapability(ogr.OLCStringsAsUTF8) != 1:
-        gdaltest.post_reason('failed')
         return 'fail'
     if lyr.GetLayerDefn().GetFieldDefn(0).GetName() != gdaltest.fieldname:
-        gdaltest.post_reason('failed')
         print(gdaltest.fieldname)
         return 'fail'
     ds = None
@@ -3136,7 +3091,6 @@ def test_ogr_shape_63():
     lyr = ds.GetLayer(0)
     # TestCapability(OLCStringsAsUTF8) should return FALSE
     if lyr.TestCapability(ogr.OLCStringsAsUTF8) != 0:
-        gdaltest.post_reason('failed')
         return 'fail'
     ds = None
 
@@ -3155,7 +3109,6 @@ def test_ogr_shape_64():
 
     lyr = ds.CreateLayer('a.b')
     if lyr.GetName() != 'a.b':
-        gdaltest.post_reason('failed')
         return 'fail'
     lyr.CreateField(ogr.FieldDefn('foo', ogr.OFTString))
     feat = ogr.Feature(lyr.GetLayerDefn())
@@ -3165,7 +3118,6 @@ def test_ogr_shape_64():
 
     lyr = ds.CreateLayer('a.c')
     if lyr.GetName() != 'a.c':
-        gdaltest.post_reason('failed')
         return 'fail'
 
     # Test that we cannot create a duplicate layer
@@ -3173,7 +3125,6 @@ def test_ogr_shape_64():
     lyr = ds.CreateLayer('a.b')
     gdal.PopErrorHandler()
     if lyr is not None:
-        gdaltest.post_reason('failed')
         return 'fail'
 
     ds = None
@@ -3182,7 +3133,6 @@ def test_ogr_shape_64():
     lyr = ds.GetLayer(0)
     feat = lyr.GetNextFeature()
     if feat.GetFieldAsString('foo') != 'bar':
-        gdaltest.post_reason('failed')
         return 'fail'
     ds = None
 
@@ -3226,7 +3176,6 @@ def test_ogr_shape_66():
     lyr = ds.CreateLayer('bar', geom_type=ogr.wkbNone)
     gdal.PopErrorHandler()
     if lyr is not None:
-        gdaltest.post_reason('fail')
         return 'fail'
     ds = None
 
@@ -3235,7 +3184,6 @@ def test_ogr_shape_66():
     lyr = ds.CreateLayer('bar', geom_type=ogr.wkbPoint)
     gdal.PopErrorHandler()
     if lyr is not None:
-        gdaltest.post_reason('fail')
         return 'fail'
     ds = None
 
@@ -3243,7 +3191,6 @@ def test_ogr_shape_66():
     ds = ogr.GetDriverByName('ESRI Shapefile').CreateDataSource('/i_dont_exist/bar')
     gdal.PopErrorHandler()
     if ds is not None:
-        gdaltest.post_reason('fail')
         return 'fail'
 
     f = open('tmp/foo', 'wb')
@@ -3252,7 +3199,6 @@ def test_ogr_shape_66():
     ds = ogr.GetDriverByName('ESRI Shapefile').CreateDataSource('tmp/foo')
     gdal.PopErrorHandler()
     if ds is not None:
-        gdaltest.post_reason('fail')
         return 'fail'
     os.unlink('tmp/foo')
 
@@ -3327,15 +3273,12 @@ def test_ogr_shape_68():
 
         if sys.platform == 'win32':
             if lyr.GetGeomType() != ogr.wkbPolygon:
-                gdaltest.post_reason('fail')
                 return 'fail'
         else:
             if lyr.GetGeomType() != ogr.wkbNone:
-                gdaltest.post_reason('fail')
                 return 'fail'
             lyr = ds.GetLayerByName('mixedcase')
             if lyr.GetGeomType() != ogr.wkbPolygon:
-                gdaltest.post_reason('fail')
                 return 'fail'
             gdal.PushErrorHandler('CPLQuietErrorHandler')
             ret = lyr.DeleteFeature(0)
@@ -3362,22 +3305,17 @@ def test_ogr_shape_68():
         new_dbf_size = os.stat('tmp/mixedcase/MIXEDCASE.DBF').st_size
 
         if new_dbf_size == ori_dbf_size:
-            gdaltest.post_reason('fail')
             return 'fail'
 
         if sys.platform == 'win32':
             if new_shp_size == ori_shp_size:
-                gdaltest.post_reason('fail')
                 return 'fail'
             if new_shx_size == ori_shx_size:
-                gdaltest.post_reason('fail')
                 return 'fail'
         else:
             if new_shp_size != ori_shp_size:
-                gdaltest.post_reason('fail')
                 return 'fail'
             if new_shx_size != ori_shx_size:
-                gdaltest.post_reason('fail')
                 return 'fail'
 
     return 'success'
@@ -3518,7 +3456,6 @@ def test_ogr_shape_72():
     ret = lyr.CreateFeature(feat)
     gdal.PopErrorHandler()
     if ret == 0:
-        gdaltest.post_reason('fail')
         return 'fail'
     ds = None
 
@@ -3539,7 +3476,6 @@ def test_ogr_shape_72():
     ret = lyr.CreateFeature(feat)
     gdal.PopErrorHandler()
     if ret == 0:
-        gdaltest.post_reason('fail')
         return 'fail'
     ds = None
 
@@ -3553,7 +3489,6 @@ def test_ogr_shape_72():
     ret = lyr.CreateFeature(feat)
     gdal.PopErrorHandler()
     if ret != 0:
-        gdaltest.post_reason('fail')
         return 'fail'
     if gdal.GetLastErrorMsg().find('2GB file size limit reached') < 0:
         gdaltest.post_reason('did not find expected warning')
@@ -3564,7 +3499,6 @@ def test_ogr_shape_72():
     lyr = ds.GetLayer(0)
     feat = lyr.GetFeature(1)
     if feat.GetGeometryRef().ExportToWkt() != 'POINT (7 8)':
-        gdaltest.post_reason('fail')
         return 'fail'
     ds = None
 
@@ -3622,7 +3556,6 @@ def test_ogr_shape_74():
     feat = lyr.GetNextFeature()
     got_geom = feat.GetGeometryRef()
     if geom.ExportToWkt() != got_geom.ExportToWkt():
-        gdaltest.post_reason('fail')
         feat.DumpReadable()
         return 'fail'
 
@@ -3632,7 +3565,6 @@ def test_ogr_shape_74():
     gdal.SetConfigOption('OGR_ORGANIZE_POLYGONS', None)
     got_geom = feat.GetGeometryRef()
     if geom.ExportToWkt() != got_geom.ExportToWkt():
-        gdaltest.post_reason('fail')
         feat.DumpReadable()
         return 'fail'
     ds = None
@@ -3648,28 +3580,24 @@ def test_ogr_shape_75():
     ds = gdal.OpenEx('data/poly.shp')
     if ds.GetFileList() != ['data/poly.shp', 'data/poly.shx', 'data/poly.dbf', 'data/poly.PRJ'] and \
        ds.GetFileList() != ['data/poly.shp', 'data/poly.shx', 'data/poly.dbf', 'data/poly.prj']:
-        gdaltest.post_reason('fail')
         print(ds.GetFileList())
         return 'fail'
     ds = None
 
     ds = gdal.OpenEx('data/idlink.dbf')
     if ds.GetFileList() != ['data/idlink.dbf']:
-        gdaltest.post_reason('fail')
         print(ds.GetFileList())
         return 'fail'
     ds = None
 
     ds = gdal.OpenEx('data/testpoly.shp')
     if ds.GetFileList() != ['data/testpoly.shp', 'data/testpoly.shx', 'data/testpoly.dbf', 'data/testpoly.qix']:
-        gdaltest.post_reason('fail')
         print(ds.GetFileList())
         return 'fail'
     ds = None
 
     ds = gdal.OpenEx('data/emptyshapefilewithsbn.shx')
     if ds.GetFileList() != ['data/emptyshapefilewithsbn.shp', 'data/emptyshapefilewithsbn.shx', 'data/emptyshapefilewithsbn.sbn', 'data/emptyshapefilewithsbn.sbx']:
-        gdaltest.post_reason('fail')
         print(ds.GetFileList())
         return 'fail'
     ds = None
@@ -3797,7 +3725,6 @@ def test_ogr_shape_79():
     ds = ogr.Open('/vsimem/ogr_shape_79.dbf')
     lyr = ds.GetLayer(0)
     if lyr.GetLayerDefn().GetFieldCount() != 2:
-        gdaltest.post_reason('fail')
         return 'fail'
     ds = None
 
@@ -3813,7 +3740,6 @@ def test_ogr_shape_80():
     lyr = ds.GetLayer(0)
     extent = lyr.GetExtent()
     if extent is not None and extent[0] != extent[0]:
-        gdaltest.post_reason('fail')
         print(extent)
         return 'fail'
     ds = None
@@ -3850,7 +3776,6 @@ def test_ogr_shape_81():
     ds.ExecuteSQL('REPACK ogr_shape_81')
     size_after = gdal.VSIStatL('/vsimem/ogr_shape_81.shp').size
     if size_after != size_before:
-        gdaltest.post_reason('fail')
         return 'fail'
 
     f = lyr.GetNextFeature()
@@ -3861,7 +3786,6 @@ def test_ogr_shape_81():
     ds.ExecuteSQL('REPACK ogr_shape_81')
     size_after = gdal.VSIStatL('/vsimem/ogr_shape_81.shp').size
     if size_after != size_before:
-        gdaltest.post_reason('fail')
         return 'fail'
 
     # Writes a longer geometry. So .shp will be extended
@@ -3869,7 +3793,6 @@ def test_ogr_shape_81():
     lyr.SetFeature(f)
     size_after = gdal.VSIStatL('/vsimem/ogr_shape_81.shp').size
     if size_after == size_before:
-        gdaltest.post_reason('fail')
         return 'fail'
 
     # Should do something
@@ -3877,7 +3800,6 @@ def test_ogr_shape_81():
     ds.ExecuteSQL('REPACK ogr_shape_81')
     size_after = gdal.VSIStatL('/vsimem/ogr_shape_81.shp').size
     if size_after == size_before:
-        gdaltest.post_reason('fail')
         return 'fail'
 
     # Writes a shorter geometry, so .shp should not change size.
@@ -3886,7 +3808,6 @@ def test_ogr_shape_81():
     lyr.SetFeature(f)
     size_after = gdal.VSIStatL('/vsimem/ogr_shape_81.shp').size
     if size_after != size_before:
-        gdaltest.post_reason('fail')
         return 'fail'
     size_before = size_after
 
@@ -3894,7 +3815,6 @@ def test_ogr_shape_81():
     ds.ExecuteSQL('REPACK ogr_shape_81')
     size_after = gdal.VSIStatL('/vsimem/ogr_shape_81.shp').size
     if size_after == size_before:
-        gdaltest.post_reason('fail')
         return 'fail'
 
     ds = None
@@ -3987,7 +3907,6 @@ def test_ogr_shape_83():
     ds = ogr.GetDriverByName('ESRI Shapefile').CreateDataSource('/vsimem/ogr_shape_83.shp')
     lyr = ds.CreateLayer('ogr_shape_83', geom_type=ogr.wkbCurvePolygon)
     if lyr.GetGeomType() != ogr.wkbPolygon:
-        gdaltest.post_reason('fail')
         return 'fail'
     f = ogr.Feature(lyr.GetLayerDefn())
     f.SetGeometry(ogr.CreateGeometryFromWkt('CURVEPOLYGON((0 0,0 1,1 1,1 0,0 0))'))
@@ -3996,7 +3915,6 @@ def test_ogr_shape_83():
 
     f = lyr.GetFeature(0)
     if f.GetGeometryRef().GetGeometryType() != ogr.wkbPolygon:
-        gdaltest.post_reason('fail')
         return 'fail'
     ds = None
 
@@ -4017,7 +3935,6 @@ def test_ogr_shape_84():
     ds = None
 
     if gdal.VSIStatL('/vsimem/ogr_shape_84.qix') is None:
-        gdaltest.post_reason('fail')
         return 'fail'
 
     return 'success'
@@ -4042,14 +3959,11 @@ def test_ogr_shape_85():
     ds = ogr.Open('/vsimem/ogr_shape_85.shp', update=1)
     lyr = ds.GetLayer(0)
     if lyr.GetLayerDefn().GetFieldDefn(0).GetType() != ogr.OFTInteger:
-        gdaltest.post_reason('failure')
         return 'fail'
     if lyr.GetLayerDefn().GetFieldDefn(1).GetType() != ogr.OFTInteger64:
-        gdaltest.post_reason('failure')
         return 'fail'
     f = lyr.GetNextFeature()
     if f.GetField(0) != 123456789 or f.GetField(1) != 123456789012345678:
-        gdaltest.post_reason('failure')
         return 'fail'
     # Passing from 9 to 10 figures causes "promotion" to Integer64
     f.SetField(0, 2000000000)
@@ -4061,14 +3975,11 @@ def test_ogr_shape_85():
     ds = ogr.Open('/vsimem/ogr_shape_85.shp')
     lyr = ds.GetLayer(0)
     if lyr.GetLayerDefn().GetFieldDefn(0).GetType() != ogr.OFTInteger64:
-        gdaltest.post_reason('failure')
         return 'fail'
     if lyr.GetLayerDefn().GetFieldDefn(1).GetType() != ogr.OFTReal:
-        gdaltest.post_reason('failure')
         return 'fail'
     f = lyr.GetNextFeature()
     if f.GetField(0) != 2000000000 or f.GetField(1) != 9000000000000000000:
-        gdaltest.post_reason('failure')
         return 'fail'
     ds = None
 
@@ -4076,14 +3987,11 @@ def test_ogr_shape_85():
     ds = gdal.OpenEx('/vsimem/ogr_shape_85.shp', gdal.OF_VECTOR, open_options=['ADJUST_TYPE=YES'])
     lyr = ds.GetLayer(0)
     if lyr.GetLayerDefn().GetFieldDefn(0).GetType() != ogr.OFTInteger:
-        gdaltest.post_reason('failure')
         return 'fail'
     if lyr.GetLayerDefn().GetFieldDefn(1).GetType() != ogr.OFTInteger64:
-        gdaltest.post_reason('failure')
         return 'fail'
     f = lyr.GetNextFeature()
     if f.GetField(0) != 2000000000 or f.GetField(1) != 9000000000000000000:
-        gdaltest.post_reason('failure')
         return 'fail'
     ds = None
 
@@ -4098,7 +4006,6 @@ def test_ogr_shape_85():
     fd = ogr.FieldDefn("foo", ogr.OFTInteger64)
     ret = lyr.AlterFieldDefn(0, fd, ogr.ALTER_TYPE_FLAG)
     if ret != 0:
-        gdaltest.post_reason('failure')
         return 'fail'
     f.SetField(0, 123456789012345678)
     lyr.SetFeature(f)
@@ -4107,11 +4014,9 @@ def test_ogr_shape_85():
     ds = ogr.Open('/vsimem/ogr_shape_85.shp', update=1)
     lyr = ds.GetLayer(0)
     if lyr.GetLayerDefn().GetFieldDefn(0).GetType() != ogr.OFTInteger64:
-        gdaltest.post_reason('failure')
         return 'fail'
     f = lyr.GetNextFeature()
     if f.GetField(0) != 123456789012345678:
-        gdaltest.post_reason('failure')
         return 'fail'
     ds = None
 
@@ -4206,7 +4111,6 @@ def test_ogr_shape_89():
     with gdaltest.error_handler():
         f = lyr.GetNextFeature()
     if f is not None and f.GetGeometryRef() is not None:
-        gdaltest.post_reason('fail')
         return 'fail'
     ds = None
 
@@ -4220,7 +4124,6 @@ def test_ogr_shape_89():
     f = lyr.GetNextFeature()
     g = f.GetGeometryRef()
     if g.GetPointCount() != 2:
-        gdaltest.post_reason('fail')
         return 'fail'
 
     ds = None
@@ -4299,7 +4202,6 @@ def test_ogr_shape_92():
     f = lyr.GetNextFeature()
     wkt = f.GetGeometryRef().ExportToIsoWkt()
     if wkt != 'MULTIPOINT Z ((0 1 2),(3 4 5))':
-        gdaltest.post_reason('fail')
         print(wkt)
         return 'fail'
 
@@ -4316,7 +4218,6 @@ def test_ogr_shape_93():
     f = lyr.GetNextFeature()
     wkt = f.GetGeometryRef().ExportToIsoWkt()
     if wkt != 'POINT Z (1 2 3)':
-        gdaltest.post_reason('fail')
         print(wkt)
         return 'fail'
 
@@ -4369,7 +4270,6 @@ def test_ogr_shape_94():
                 lyr = ds.CreateLayer('ogr_shape_94', geom_type=geom_type)
             test_lyr_geom_type = ogr.GT_Flatten(geom_type) != ogr.wkbMultiLineString and ogr.GT_Flatten(geom_type) != ogr.wkbMultiPolygon
             if test_lyr_geom_type and lyr.GetGeomType() != geom_type:
-                gdaltest.post_reason('fail')
                 print(i, shpt, geom_type, wkt, lyr.GetGeomType())
                 return 'fail'
             f = ogr.Feature(lyr.GetLayerDefn())
@@ -4380,7 +4280,6 @@ def test_ogr_shape_94():
             ds = ogr.Open('/vsimem/ogr_shape_94.shp')
             lyr = ds.GetLayer(0)
             if test_lyr_geom_type and lyr.GetGeomType() != geom_type:
-                gdaltest.post_reason('fail')
                 print(shpt, geom_type, wkt, lyr.GetGeomType())
                 return 'fail'
             f = lyr.GetNextFeature()
@@ -4388,7 +4287,6 @@ def test_ogr_shape_94():
                 if expected_fail:
                     print('FIXME!:', i, shpt, geom_type, wkt, f.GetGeometryRef().ExportToIsoWkt())
                 else:
-                    gdaltest.post_reason('fail')
                     print(i, shpt, geom_type, wkt, f.GetGeometryRef().ExportToIsoWkt())
                     return 'fail'
             ds = None
@@ -4405,24 +4303,20 @@ def test_ogr_shape_95():
     ds = gdal.OpenEx('data/pointzm_with_all_nodata_m.shp')
     lyr = ds.GetLayer(0)
     if lyr.GetGeomType() != ogr.wkbPoint25D:
-        gdaltest.post_reason('fail')
         print(lyr.GetGeomType())
         return 'fail'
     f = lyr.GetNextFeature()
     if f.GetGeometryRef().ExportToIsoWkt() != 'POINT Z (1 2 3)':
-        gdaltest.post_reason('fail')
         print(lyr.GetGeomType())
         return 'fail'
 
     ds = gdal.OpenEx('data/pointzm_with_all_nodata_m.shp', open_options=['ADJUST_GEOM_TYPE=NO'])
     lyr = ds.GetLayer(0)
     if lyr.GetGeomType() != ogr.wkbPointZM:
-        gdaltest.post_reason('fail')
         print(lyr.GetGeomType())
         return 'fail'
     f = lyr.GetNextFeature()
     if ogrtest.check_feature_geometry(f, ogr.CreateGeometryFromWkt('POINT ZM (1 2 3 -1.79769313486232e+308)')) != 0:
-        gdaltest.post_reason('fail')
         print(f.GetGeometryRef().ExportToIsoWkt())
         return 'fail'
 
@@ -4430,14 +4324,12 @@ def test_ogr_shape_95():
     ds = gdal.OpenEx('data/pointzm_with_one_valid_m.shp', open_options=['ADJUST_GEOM_TYPE=FIRST_SHAPE'])
     lyr = ds.GetLayer(0)
     if lyr.GetGeomType() != ogr.wkbPoint25D:
-        gdaltest.post_reason('fail')
         print(lyr.GetGeomType())
         return 'fail'
 
     ds = gdal.OpenEx('data/pointzm_with_one_valid_m.shp', open_options=['ADJUST_GEOM_TYPE=ALL_SHAPES'])
     lyr = ds.GetLayer(0)
     if lyr.GetGeomType() != ogr.wkbPointZM:
-        gdaltest.post_reason('fail')
         print(lyr.GetGeomType())
         return 'fail'
 
@@ -4460,7 +4352,6 @@ def test_ogr_shape_96():
     lyr = ds.GetLayer(0)
     f = lyr.GetNextFeature()
     if f.GetGeometryRef().ExportToIsoWkt() != 'POINT M (1 2 3)':
-        gdaltest.post_reason('fail')
         print(f.GetGeometryRef().ExportToIsoWkt())
         return 'fail'
     f.SetGeometry(ogr.CreateGeometryFromWkt('POINT M (1 2 4)'))
@@ -4471,7 +4362,6 @@ def test_ogr_shape_96():
     lyr = ds.GetLayer(0)
     f = lyr.GetNextFeature()
     if f.GetGeometryRef().ExportToIsoWkt() != 'POINT M (1 2 4)':
-        gdaltest.post_reason('fail')
         print(f.GetGeometryRef().ExportToIsoWkt())
         return 'fail'
     ds = None
@@ -4497,7 +4387,6 @@ def test_ogr_shape_97():
     lyr = ds.GetLayer(0)
     f = lyr.GetNextFeature()
     if f.GetGeometryRef().ExportToIsoWkt() != 'POINT ZM (1 2 3 4)':
-        gdaltest.post_reason('fail')
         print(f.GetGeometryRef().ExportToIsoWkt())
         return 'fail'
     f.SetGeometry(ogr.CreateGeometryFromWkt('POINT ZM (1 2 5 6)'))
@@ -4508,7 +4397,6 @@ def test_ogr_shape_97():
     lyr = ds.GetLayer(0)
     f = lyr.GetNextFeature()
     if f.GetGeometryRef().ExportToIsoWkt() != 'POINT ZM (1 2 5 6)':
-        gdaltest.post_reason('fail')
         print(f.GetGeometryRef().ExportToIsoWkt())
         return 'fail'
     ds = None
@@ -4645,43 +4533,36 @@ def test_ogr_shape_100():
         gdal.SetConfigOption('OGR_SHAPE_PACK_IN_PLACE', old_val)
 
         if gdal.GetLastErrorMsg() != '':
-            gdaltest.post_reason('fail')
             print(variant)
             return 'fail'
 
         for ext in ['dbf', 'shp', 'shx', 'cpg']:
             if gdal.VSIStatL('tmp/ogr_shape_100_packed.' + ext) is not None:
-                gdaltest.post_reason('fail')
                 print(variant)
                 print(ext)
                 return 'fail'
 
         f = lyr.GetFeature(0)
         if f['foo'] != '2' or f.GetGeometryRef().ExportToWkt() != 'LINESTRING (1 1,2 2,3 3)':
-            gdaltest.post_reason('fail')
             print(variant)
             f.DumpReadable()
             return 'fail'
         with gdaltest.error_handler():
             f = lyr.GetFeature(1)
         if f is not None:
-            gdaltest.post_reason('fail')
             print(variant)
             return 'fail'
         lyr.ResetReading()
         if lyr.GetFeatureCount() != 1:
-            gdaltest.post_reason('fail')
             print(variant)
             return 'fail'
         f = lyr.GetNextFeature()
         if f['foo'] != '2' or f.GetGeometryRef().ExportToWkt() != 'LINESTRING (1 1,2 2,3 3)':
-            gdaltest.post_reason('fail')
             print(variant)
             f.DumpReadable()
             return 'fail'
         f = lyr.GetNextFeature()
         if f is not None:
-            gdaltest.post_reason('fail')
             print(variant)
             return 'fail'
         f = ogr.Feature(lyr.GetLayerDefn())
@@ -4694,24 +4575,20 @@ def test_ogr_shape_100():
         ds = ogr.Open('tmp/ogr_shape_100.shp')
         lyr = ds.GetLayer(0)
         if lyr.GetFeatureCount() != 2:
-            gdaltest.post_reason('fail')
             print(variant)
             return 'fail'
         f = lyr.GetNextFeature()
         if f['foo'] != '2' or f.GetGeometryRef().ExportToWkt() != 'LINESTRING (1 1,2 2,3 3)':
-            gdaltest.post_reason('fail')
             print(variant)
             f.DumpReadable()
             return 'fail'
         f = lyr.GetNextFeature()
         if f['foo'] != '3' or f.GetGeometryRef().ExportToWkt() != 'LINESTRING (3 3,4 4,5 5,6 6)':
-            gdaltest.post_reason('fail')
             print(variant)
             f.DumpReadable()
             return 'fail'
         f = lyr.GetNextFeature()
         if f is not None:
-            gdaltest.post_reason('fail')
             print(variant)
             return 'fail'
         ds = None
@@ -4748,7 +4625,6 @@ def test_ogr_shape_101():
         else:
             ds.SyncToDisk()
             if lyr.GetFeatureCount() != 1:
-                gdaltest.post_reason('fail')
                 print(i)
                 return 'fail'
             # No-op
@@ -4757,18 +4633,15 @@ def test_ogr_shape_101():
         ds_read = ogr.Open('/vsimem/ogr_shape_101.shp')
         lyr = ds_read.GetLayer(0)
         if lyr.GetFeatureCount() != 1:
-            gdaltest.post_reason('fail')
             print(i)
             return 'fail'
         f = lyr.GetNextFeature()
         if f.GetFID() != 0 or f['foo'] != '2' or f.GetGeometryRef().ExportToWkt() != 'LINESTRING (1 1,2 2,3 3)':
-            gdaltest.post_reason('fail')
             print(i)
             f.DumpReadable()
             return 'fail'
         f = lyr.GetNextFeature()
         if f is not None:
-            gdaltest.post_reason('fail')
             print(i)
             return 'fail'
 
@@ -4792,18 +4665,15 @@ def test_ogr_shape_101():
             ds = ogr.Open('/vsimem/ogr_shape_101.shp')
             lyr = ds.GetLayer(0)
             if lyr.GetFeatureCount() != 1:
-                gdaltest.post_reason('fail')
                 print(i)
                 return 'fail'
             f = lyr.GetNextFeature()
             if f.GetFID() != 0 or f['foo'] != '3' or f.GetGeometryRef().ExportToWkt() != 'LINESTRING (3 3,4 4,5 5,6 6)':
-                gdaltest.post_reason('fail')
                 print(i)
                 f.DumpReadable()
                 return 'fail'
             f = lyr.GetNextFeature()
             if f is not None:
-                gdaltest.post_reason('fail')
                 print(i)
                 return 'fail'
             ds = None
@@ -4822,12 +4692,10 @@ def test_ogr_shape_101():
             ds = ogr.Open('/vsimem/ogr_shape_101.shp')
             lyr = ds.GetLayer(0)
             if lyr.GetFeatureCount() != 2:
-                gdaltest.post_reason('fail')
                 print(i)
                 return 'fail'
             f = lyr.GetNextFeature()
             if f.GetFID() != 1 or f['foo'] != '4':
-                gdaltest.post_reason('fail')
                 print(i)
                 f.DumpReadable()
                 return 'fail'
@@ -4899,7 +4767,6 @@ def test_ogr_shape_103():
         ds = None
 
         if not check_EOF(filename, expected=expected):
-            gdaltest.post_reason('fail')
             print(options)
             return 'fail'
 
@@ -4910,7 +4777,6 @@ def test_ogr_shape_103():
         ds = None
 
         if not check_EOF(filename, expected=expected):
-            gdaltest.post_reason('fail')
             return 'fail'
 
         # Add record
@@ -4920,7 +4786,6 @@ def test_ogr_shape_103():
         ds = None
 
         if not check_EOF(filename, expected=expected):
-            gdaltest.post_reason('fail')
             return 'fail'
 
         # Add another field
@@ -4930,7 +4795,6 @@ def test_ogr_shape_103():
         ds = None
 
         if not check_EOF(filename, expected=expected):
-            gdaltest.post_reason('fail')
             return 'fail'
 
         # Grow a field
@@ -4943,7 +4807,6 @@ def test_ogr_shape_103():
         ds = None
 
         if not check_EOF(filename, expected=expected):
-            gdaltest.post_reason('fail')
             return 'fail'
 
         # Reorder fields
@@ -4953,7 +4816,6 @@ def test_ogr_shape_103():
         ds = None
 
         if not check_EOF(filename, expected=expected):
-            gdaltest.post_reason('fail')
             return 'fail'
 
         # Shrink a field
@@ -4966,7 +4828,6 @@ def test_ogr_shape_103():
         ds = None
 
         if not check_EOF(filename, expected=expected):
-            gdaltest.post_reason('fail')
             return 'fail'
 
         # Remove a field
@@ -4976,7 +4837,6 @@ def test_ogr_shape_103():
         ds = None
 
         if not check_EOF(filename, expected=expected):
-            gdaltest.post_reason('fail')
             return 'fail'
 
         ogr.GetDriverByName('ESRI Shapefile').DeleteDataSource(filename)
@@ -4988,7 +4848,6 @@ def test_ogr_shape_103():
         ds = None
 
         if not check_EOF(filename, expected=expected):
-            gdaltest.post_reason('fail')
             return 'fail'
         ogr.GetDriverByName('ESRI Shapefile').DeleteDataSource(filename)
 
@@ -5001,7 +4860,6 @@ def test_ogr_shape_103():
         ds = None
 
         if not check_EOF(filename, expected=expected):
-            gdaltest.post_reason('fail')
             return 'fail'
 
         # Test editing a record that is not the last one
@@ -5011,7 +4869,6 @@ def test_ogr_shape_103():
         ds = None
 
         if not check_EOF(filename, expected=expected):
-            gdaltest.post_reason('fail')
             return 'fail'
 
         # Test editing the last record
@@ -5022,7 +4879,6 @@ def test_ogr_shape_103():
         ds = None
 
         if not check_EOF(filename, expected=expected):
-            gdaltest.post_reason('fail')
             return 'fail'
 
         ogr.GetDriverByName('ESRI Shapefile').DeleteDataSource(filename)
@@ -5039,7 +4895,6 @@ def test_ogr_shape_103():
     ds.FlushCache()
 
     if not check_EOF(filename):
-        gdaltest.post_reason('fail')
         return 'fail'
     ds = None
 
@@ -5059,7 +4914,6 @@ def test_ogr_shape_103():
 
     # To document our current behaviour. Could make sense to be changed.
     if not check_EOF(filename, expected=False):
-        gdaltest.post_reason('fail')
         return 'fail'
 
     ogr.GetDriverByName('ESRI Shapefile').DeleteDataSource(filename)
@@ -5103,7 +4957,6 @@ def test_ogr_shape_104():
         lyr = ds.GetLayer(0)
         f = lyr.GetNextFeature()
         if f.GetGeometryRef().ExportToIsoWkt() != expected_wkt:
-            gdaltest.post_reason('fail')
             print(wkt, lyr_type, options)
             f.DumpReadable()
             return 'fail'
@@ -5122,11 +4975,9 @@ def test_ogr_shape_105():
     ds = ogr.Open('data/padding_after_field_defns.dbf')
     lyr = ds.GetLayer(0)
     if lyr.GetLayerDefn().GetFieldCount() != 2:
-        gdaltest.post_reason('fail')
         return 'fail'
     f = lyr.GetNextFeature()
     if f['id'] != '1' or f['foo'] != '2':
-        gdaltest.post_reason('fail')
         return 'fail'
 
     return 'success'
@@ -5148,7 +4999,6 @@ def test_ogr_shape_106():
 
     size = gdal.VSIStatL('/vsimem/ogr_shape_106.shp').size
     if size != 188:
-        gdaltest.post_reason('fail')
         print(size)
         return 'fail'
 
@@ -5162,7 +5012,6 @@ def test_ogr_shape_106():
 
     size = gdal.VSIStatL('/vsimem/ogr_shape_106.shp').size
     if size != 188 + 2 * 8:
-        gdaltest.post_reason('fail')
         print(size)
         return 'fail'
 
@@ -5242,19 +5091,16 @@ def test_ogr_shape_107():
     lyr = ds.GetLayer(0)
     f = lyr.GetNextFeature()
     if f.GetGeometryRef().ExportToWkt() != 'LINESTRING (1 2,3 4)':
-        gdaltest.post_reason('fail')
         f.DumpReadable()
         return'fail'
     f = lyr.GetNextFeature()
     if f.GetGeometryRef().ExportToWkt() != 'LINESTRING (5 6)':
-        gdaltest.post_reason('fail')
         f.DumpReadable()
         return'fail'
     ds = None
 
     gdal.VectorTranslate(copy_filename, filename)
     if not is_same(copy_filename, filename):
-        gdaltest.post_reason('fail')
         return'fail'
 
     shape_drv.DeleteDataSource(copy_filename)
@@ -5278,14 +5124,12 @@ def test_ogr_shape_107():
     lyr = ds.GetLayer(0)
     f = lyr.GetNextFeature()
     if f.GetGeometryRef().ExportToWkt() != 'LINESTRING (1 2,3 4)':
-        gdaltest.post_reason('fail')
         f.DumpReadable()
         return'fail'
     ds = None
 
     gdal.VectorTranslate(copy_filename, filename)
     if not is_same(copy_filename, filename):
-        gdaltest.post_reason('fail')
         return'fail'
 
     shape_drv.DeleteDataSource(copy_filename)
@@ -5305,7 +5149,6 @@ def test_ogr_shape_108():
     expected_fc = lyr.GetFeatureCount()
     lyr.SetAttributeFilter("1=1")
     if lyr.GetFeatureCount() != expected_fc:
-        gdaltest.post_reason('fail')
         print(lyr.GetFeatureCount(), expected_fc)
         return'fail'
 
diff --git a/autotest/ogr/ogr_sql_rfc28.py b/autotest/ogr/ogr_sql_rfc28.py
index 84684e254a82..f86c08d93729 100755
--- a/autotest/ogr/ogr_sql_rfc28.py
+++ b/autotest/ogr/ogr_sql_rfc28.py
@@ -950,14 +950,12 @@ def test_ogr_rfc28_41():
     sql_lyr = ds.ExecuteSQL('select * from my_layer')
     feat = sql_lyr.GetNextFeature()
     if feat.GetField('a.b') != 2:
-        gdaltest.post_reason('fail')
         return 'fail'
     ds.ReleaseResultSet(sql_lyr)
 
     sql_lyr = ds.ExecuteSQL('select l.* from my_layer l')
     feat = sql_lyr.GetNextFeature()
     if feat.GetField('l.a.b') != 2:
-        gdaltest.post_reason('fail')
         return 'fail'
     ds.ReleaseResultSet(sql_lyr)
 
@@ -990,62 +988,46 @@ def test_ogr_rfc28_42():
     # To b OR NOT to b... that's the question
     lyr = ds.ExecuteSQL("SELECT b, NOT b, 1 + b, CAST(1 AS BOOLEAN), b IS NOT NULL, short, 1 + short, CAST(1 + short as SMALLINT) FROM test WHERE b OR NOT b")
     if lyr.GetLayerDefn().GetFieldDefn(0).GetSubType() != ogr.OFSTBoolean:
-        gdaltest.post_reason('fail')
         return 'fail'
     if lyr.GetLayerDefn().GetFieldDefn(1).GetSubType() != ogr.OFSTBoolean:
-        gdaltest.post_reason('fail')
         return 'fail'
     if lyr.GetLayerDefn().GetFieldDefn(2).GetSubType() != ogr.OFSTNone:
-        gdaltest.post_reason('fail')
         return 'fail'
     if lyr.GetLayerDefn().GetFieldDefn(3).GetSubType() != ogr.OFSTBoolean:
-        gdaltest.post_reason('fail')
         return 'fail'
     if lyr.GetLayerDefn().GetFieldDefn(4).GetSubType() != ogr.OFSTBoolean:
-        gdaltest.post_reason('fail')
         return 'fail'
     if lyr.GetLayerDefn().GetFieldDefn(5).GetSubType() != ogr.OFSTInt16:
-        gdaltest.post_reason('fail')
         return 'fail'
     if lyr.GetLayerDefn().GetFieldDefn(6).GetSubType() != ogr.OFSTNone:
-        gdaltest.post_reason('fail')
         return 'fail'
     if lyr.GetLayerDefn().GetFieldDefn(7).GetSubType() != ogr.OFSTInt16:
-        gdaltest.post_reason('fail')
         return 'fail'
     f = lyr.GetNextFeature()
     if f.GetField('b') != 0 or f.GetField(1) != 1 or f.GetField(2) != 1 or \
        f.GetField(3) != 1 or f.GetField(4) != 1 or \
        f.GetField(5) != 32000 or f.GetField(6) != 32001 or f.GetField(7) != 32001:
-        gdaltest.post_reason('fail')
         f.DumpReadable()
         return 'fail'
     f = lyr.GetNextFeature()
     if f.GetField('b') != 1 or f.GetField(1) != 0 or f.GetField(2) != 2 or f.GetField(3) != 1 or f.GetField(4) != 1:
-        gdaltest.post_reason('fail')
         f.DumpReadable()
         return 'fail'
     gdaltest.ds.ReleaseResultSet(lyr)
 
     lyr = ds.ExecuteSQL("SELECT MIN(b), MAX(b), SUM(b) FROM test")
     if lyr.GetLayerDefn().GetFieldDefn(0).GetSubType() != ogr.OFSTBoolean:
-        gdaltest.post_reason('fail')
         return 'fail'
     if lyr.GetLayerDefn().GetFieldDefn(1).GetSubType() != ogr.OFSTBoolean:
-        gdaltest.post_reason('fail')
         return 'fail'
     if lyr.GetLayerDefn().GetFieldDefn(2).GetSubType() != ogr.OFSTNone:
-        gdaltest.post_reason('fail')
         return 'fail'
     f = lyr.GetNextFeature()
     if f.GetField('MIN_b') != 0:
-        gdaltest.post_reason('fail')
         return 'fail'
     if f.GetField('MAX_b') != 1:
-        gdaltest.post_reason('fail')
         return 'fail'
     if f.GetField('SUM_b') != 1:
-        gdaltest.post_reason('fail')
         return 'fail'
     gdaltest.ds.ReleaseResultSet(lyr)
 
@@ -1071,13 +1053,10 @@ def test_ogr_rfc28_43():
     lyr = ds.ExecuteSQL("SELECT 1000000000000, myint64, CAST(1 AS bigint), CAST(100000000000 AS bigint), CAST(1 AS numeric(15,0)) FROM test WHERE myint64 < -9999999999 or myint64 > 9999999999")
     f = lyr.GetNextFeature()
     if lyr.GetLayerDefn().GetFieldDefn(2).GetType() != ogr.OFTInteger64:
-        gdaltest.post_reason('fail')
         return 'fail'
     if lyr.GetLayerDefn().GetFieldDefn(3).GetType() != ogr.OFTInteger64:
-        gdaltest.post_reason('fail')
         return 'fail'
     if f.GetField(0) != 1000000000000 or f.GetField(1) != -1000000000000 or f.GetField(2) != 1 or f.GetField(3) != 100000000000 or f.GetField(4) != 1.0:
-        gdaltest.post_reason('fail')
         f.DumpReadable()
         return 'fail'
     gdaltest.ds.ReleaseResultSet(lyr)
@@ -1085,15 +1064,12 @@ def test_ogr_rfc28_43():
     lyr = ds.ExecuteSQL("SELECT MIN(myint64), MAX(myint64), SUM(myint64) FROM test")
     f = lyr.GetNextFeature()
     if f.GetField('MIN_myint64') != -1000000000000:
-        gdaltest.post_reason('fail')
         f.DumpReadable()
         return 'fail'
     if f.GetField('MAX_myint64') != 100000000000:
-        gdaltest.post_reason('fail')
         f.DumpReadable()
         return 'fail'
     if f.GetField('SUM_myint64') != -1000000000000 + 100000000000:
-        gdaltest.post_reason('fail')
         f.DumpReadable()
         return 'fail'
     gdaltest.ds.ReleaseResultSet(lyr)
@@ -1101,12 +1077,10 @@ def test_ogr_rfc28_43():
     lyr = ds.ExecuteSQL("SELECT DISTINCT myint64 FROM test ORDER BY myint64")
     f = lyr.GetNextFeature()
     if f.GetField('myint64') != -1000000000000:
-        gdaltest.post_reason('fail')
         f.DumpReadable()
         return 'fail'
     f = lyr.GetNextFeature()
     if f.GetField('myint64') != 100000000000:
-        gdaltest.post_reason('fail')
         f.DumpReadable()
         return 'fail'
     gdaltest.ds.ReleaseResultSet(lyr)
@@ -1135,22 +1109,18 @@ def test_ogr_rfc28_44():
     gdal.ErrorReset()
     lyr = ds.ExecuteSQL("SELECT * FROM \"lyr.withpoint\" WHERE \"field.withpoint\" = 1")
     if gdal.GetLastErrorMsg() != '':
-        gdaltest.post_reason('fail')
         return 'fail'
     f = lyr.GetNextFeature()
     if f is None:
-        gdaltest.post_reason('fail')
         return 'fail'
     gdaltest.ds.ReleaseResultSet(lyr)
 
     gdal.ErrorReset()
     lyr = ds.ExecuteSQL("SELECT \"lyr.withpoint\".\"field.withpoint\", \"field.withpoint\" FROM \"lyr.withpoint\" WHERE \"lyr.withpoint\".\"field.withpoint\" = 1")
     if gdal.GetLastErrorMsg() != '':
-        gdaltest.post_reason('fail')
         return 'fail'
     f = lyr.GetNextFeature()
     if f is None:
-        gdaltest.post_reason('fail')
         return 'fail'
     gdaltest.ds.ReleaseResultSet(lyr)
 
@@ -1160,11 +1130,9 @@ def test_ogr_rfc28_44():
     lyr = ds.ExecuteSQL("SELECT * FROM \"lyr.withpoint\" WHERE field.withpoint = 1")
     gdal.PopErrorHandler()
     if gdal.GetLastErrorMsg() != 'Passed field name field.withpoint should have been surrounded by double quotes. Accepted since there is no ambiguity...':
-        gdaltest.post_reason('fail')
         return 'fail'
     f = lyr.GetNextFeature()
     if f is None:
-        gdaltest.post_reason('fail')
         return 'fail'
     gdaltest.ds.ReleaseResultSet(lyr)
 
@@ -1178,10 +1146,8 @@ def test_ogr_rfc28_44():
     lyr = ds.ExecuteSQL("SELECT * FROM \"lyr.withpoint\" JOIN field ON \"lyr.withpoint\".foo = field.id WHERE field.withpoint = 1")
     gdal.PopErrorHandler()
     if gdal.GetLastErrorMsg() != '"field"."withpoint" not recognised as an available field.':
-        gdaltest.post_reason('fail')
         return 'fail'
     if lyr is not None:
-        gdaltest.post_reason('fail')
         return 'fail'
 
     # Test our tolerance against unnecessary quoting
@@ -1190,11 +1156,9 @@ def test_ogr_rfc28_44():
     lyr = ds.ExecuteSQL("SELECT * FROM \"lyr.withpoint\" f WHERE \"f.foo\" = 2")
     gdal.PopErrorHandler()
     if gdal.GetLastErrorMsg() != 'Passed field name f.foo should NOT have been surrounded by double quotes. Accepted since there is no ambiguity...':
-        gdaltest.post_reason('fail')
         return 'fail'
     f = lyr.GetNextFeature()
     if f is None:
-        gdaltest.post_reason('fail')
         return 'fail'
     gdaltest.ds.ReleaseResultSet(lyr)
 
@@ -1241,7 +1205,6 @@ def test_ogr_rfc28_46():
 
     lyr.SetAttributeFilter('fid >= 2500000000')
     if lyr.GetFeatureCount() != 2:
-        gdaltest.post_reason('fail')
         print(lyr.GetFeatureCount())
         return 'fail'
     lyr.SetAttributeFilter(None)
@@ -1250,17 +1213,14 @@ def test_ogr_rfc28_46():
     sql_lyr = ds.ExecuteSQL('SELECT CAST(fid AS bigint) AS outfid, val FROM lyr WHERE fid >= 2500000000 ORDER BY fid')
     f = sql_lyr.GetNextFeature()
     if f.GetFID() != 2500000000 or f['outfid'] != 2500000000 or f['val'] != 2:
-        gdaltest.post_reason('fail')
         f.DumpReadable()
         return 'fail'
     f = sql_lyr.GetNextFeature()
     if f.GetFID() != 3000000000 or f['outfid'] != 3000000000 or f['val'] != 1:
-        gdaltest.post_reason('fail')
         f.DumpReadable()
         return 'fail'
     f = sql_lyr.GetNextFeature()
     if f is not None:
-        gdaltest.post_reason('fail')
         f.DumpReadable()
         return 'fail'
     ds.ReleaseResultSet(sql_lyr)
@@ -1270,7 +1230,6 @@ def test_ogr_rfc28_46():
     sql_lyr = ds.ExecuteSQL('SELECT fid AS outfid, val FROM lyr WHERE fid >= 2500000000 ORDER BY fid')
     f = sql_lyr.GetNextFeature()
     if f.GetFID() != 2500000000 or f['outfid'] != 2500000000 or f['val'] != 2:
-        gdaltest.post_reason('fail')
         f.DumpReadable()
         return 'fail'
     ds.ReleaseResultSet(sql_lyr)
@@ -1289,111 +1248,90 @@ def test_ogr_rfc28_47():
     tr = ogrtest.check_features_against_list(lyr, 'EAS_ID', [])
     gdaltest.ds.ReleaseResultSet(lyr)
     if not tr:
-        gdaltest.post_reason('fail')
         return 'fail'
 
     lyr = gdaltest.ds.ExecuteSQL("SELECT * FROM POLY LIMIT 1")
     if lyr.GetFeatureCount() != 1:
-        gdaltest.post_reason('fail')
         return 'fail'
     tr = ogrtest.check_features_against_list(lyr, 'EAS_ID', [168])
     gdaltest.ds.ReleaseResultSet(lyr)
     if not tr:
-        gdaltest.post_reason('fail')
         return 'fail'
 
     lyr = gdaltest.ds.ExecuteSQL("SELECT * FROM POLY ORDER BY EAS_ID LIMIT 1")
     if lyr.GetFeatureCount() != 1:
-        gdaltest.post_reason('fail')
         return 'fail'
     tr = ogrtest.check_features_against_list(lyr, 'EAS_ID', [158])
     gdaltest.ds.ReleaseResultSet(lyr)
     if not tr:
-        gdaltest.post_reason('fail')
         return 'fail'
 
     lyr = gdaltest.ds.ExecuteSQL("SELECT * FROM POLY ORDER BY PRFEDEA LIMIT 1")
     if lyr.GetFeatureCount() != 1:
-        gdaltest.post_reason('fail')
         return 'fail'
     tr = ogrtest.check_features_against_list(lyr, 'PRFEDEA', ['35043369'])
     gdaltest.ds.ReleaseResultSet(lyr)
     if not tr:
-        gdaltest.post_reason('fail')
         return 'fail'
 
     lyr = gdaltest.ds.ExecuteSQL("SELECT * FROM POLY WHERE 0 ORDER BY EAS_ID LIMIT 1")
     if lyr.GetNextFeature() is not None:
-        gdaltest.post_reason('fail')
         return 'fail'
     gdaltest.ds.ReleaseResultSet(lyr)
 
     lyr = gdaltest.ds.ExecuteSQL("SELECT * FROM POLY WHERE EAS_ID = 168 LIMIT 11")
     if lyr.GetFeatureCount() != 1:
-        gdaltest.post_reason('fail')
         return 'fail'
     tr = ogrtest.check_features_against_list(lyr, 'EAS_ID', [168])
     gdaltest.ds.ReleaseResultSet(lyr)
     if not tr:
-        gdaltest.post_reason('fail')
         return 'fail'
 
     lyr = gdaltest.ds.ExecuteSQL("SELECT * FROM POLY WHERE EAS_ID = 168 OFFSET 0")
     tr = ogrtest.check_features_against_list(lyr, 'EAS_ID', [168])
     gdaltest.ds.ReleaseResultSet(lyr)
     if not tr:
-        gdaltest.post_reason('fail')
         return 'fail'
 
     lyr = gdaltest.ds.ExecuteSQL("SELECT * FROM POLY WHERE EAS_ID = 168 OFFSET 1")
     if lyr.GetFeatureCount() != 0:
-        gdaltest.post_reason('fail')
         return 'fail'
     tr = ogrtest.check_features_against_list(lyr, 'EAS_ID', [])
     gdaltest.ds.ReleaseResultSet(lyr)
     if not tr:
-        gdaltest.post_reason('fail')
         return 'fail'
 
     lyr = gdaltest.ds.ExecuteSQL("SELECT * FROM POLY OFFSET 10")
     if lyr.GetFeatureCount() != 0:
-        gdaltest.post_reason('fail')
         return 'fail'
     tr = ogrtest.check_features_against_list(lyr, 'EAS_ID', [])
     gdaltest.ds.ReleaseResultSet(lyr)
     if not tr:
-        gdaltest.post_reason('fail')
         return 'fail'
 
     lyr = gdaltest.ds.ExecuteSQL("SELECT * FROM POLY OFFSET 8")
     if lyr.GetFeatureCount() != 2:
-        gdaltest.post_reason('fail')
         return 'fail'
     tr = ogrtest.check_features_against_list(lyr, 'EAS_ID', [165, 170])
     gdaltest.ds.ReleaseResultSet(lyr)
     if not tr:
-        gdaltest.post_reason('fail')
         return 'fail'
 
     lyr = gdaltest.ds.ExecuteSQL("SELECT * FROM POLY LIMIT 1 OFFSET 8")
     if lyr.GetFeatureCount() != 1:
-        gdaltest.post_reason('fail')
         return 'fail'
     tr = ogrtest.check_features_against_list(lyr, 'EAS_ID', [165])
     gdaltest.ds.ReleaseResultSet(lyr)
     if not tr:
-        gdaltest.post_reason('fail')
         return 'fail'
 
     lyr = gdaltest.ds.ExecuteSQL("SELECT * FROM POLY LIMIT 2 OFFSET 8")
     lyr.SetNextByIndex(1)
     f = lyr.GetNextFeature()
     if f['EAS_ID'] != 170:
-        gdaltest.post_reason('fail')
         return 'fail'
     f = lyr.GetNextFeature()
     if f is not None:
-        gdaltest.post_reason('fail')
         return 'fail'
     gdaltest.ds.ReleaseResultSet(lyr)
 
@@ -1401,21 +1339,18 @@ def test_ogr_rfc28_47():
     tr = ogrtest.check_features_against_list(lyr, 'EAS_ID', [179, 173])
     gdaltest.ds.ReleaseResultSet(lyr)
     if not tr:
-        gdaltest.post_reason('fail')
         return 'fail'
 
     lyr = gdaltest.ds.ExecuteSQL("SELECT * FROM POLY ORDER BY EAS_ID DESC LIMIT 1 OFFSET 1")
     tr = ogrtest.check_features_against_list(lyr, 'EAS_ID', [173])
     gdaltest.ds.ReleaseResultSet(lyr)
     if not tr:
-        gdaltest.post_reason('fail')
         return 'fail'
 
     lyr = gdaltest.ds.ExecuteSQL("SELECT DISTINCT EAS_ID FROM POLY ORDER BY EAS_ID DESC LIMIT 2 OFFSET 3")
     tr = ogrtest.check_features_against_list(lyr, 'EAS_ID', [171, 170])
     gdaltest.ds.ReleaseResultSet(lyr)
     if not tr:
-        gdaltest.post_reason('fail')
         return 'fail'
 
     return 'success'
@@ -1436,100 +1371,81 @@ def test_ogr_rfc28_48():
 
     with gdaltest.error_handler():
         if lyr.SetAttributeFilter('dt >= 2500000000') == 0:
-            gdaltest.post_reason('fail')
             return 'fail'
 
     lyr.SetAttributeFilter("dt >= 'a'")
     with gdaltest.error_handler():
         if lyr.GetFeatureCount() != 0:
-            gdaltest.post_reason('fail')
             return 'fail'
 
     lyr.SetAttributeFilter("'a' <= dt")
     with gdaltest.error_handler():
         if lyr.GetFeatureCount() != 0:
-            gdaltest.post_reason('fail')
             return 'fail'
 
     lyr.SetAttributeFilter("dt BETWEEN dt AND 'a'")
     with gdaltest.error_handler():
         if lyr.GetFeatureCount() != 0:
-            gdaltest.post_reason('fail')
             return 'fail'
 
     lyr.SetAttributeFilter("dt >= '2017/02/17 11:06:34'")
     if lyr.GetFeatureCount() != 1:
-        gdaltest.post_reason('fail')
         return 'fail'
 
     lyr.SetAttributeFilter("dt >= '2017/02/17'")
     if lyr.GetFeatureCount() != 1:
-        gdaltest.post_reason('fail')
         return 'fail'
 
     lyr.SetAttributeFilter("dt >= '2017/02/17 11:06:35'")
     if lyr.GetFeatureCount() != 0:
-        gdaltest.post_reason('fail')
         return 'fail'
 
     lyr.SetAttributeFilter("dt > '2017/02/17 11:06:33'")
     if lyr.GetFeatureCount() != 1:
-        gdaltest.post_reason('fail')
         return 'fail'
 
     lyr.SetAttributeFilter("dt > '2017/02/17 11:06:34'")
     if lyr.GetFeatureCount() != 0:
-        gdaltest.post_reason('fail')
         return 'fail'
 
     lyr.SetAttributeFilter("dt <= '2017/02/17 11:06:34'")
     if lyr.GetFeatureCount() != 1:
-        gdaltest.post_reason('fail')
         return 'fail'
 
     lyr.SetAttributeFilter("dt <= '2017/02/17 11:06:33'")
     if lyr.GetFeatureCount() != 0:
-        gdaltest.post_reason('fail')
         return 'fail'
 
     lyr.SetAttributeFilter("dt < '2017/02/17 11:06:35'")
     if lyr.GetFeatureCount() != 1:
-        gdaltest.post_reason('fail')
         return 'fail'
 
     lyr.SetAttributeFilter("dt < '2017/02/17 11:06:34'")
     if lyr.GetFeatureCount() != 0:
-        gdaltest.post_reason('fail')
         return 'fail'
 
     lyr.SetAttributeFilter("dt = '2017/02/17 11:06:34'")
     if lyr.GetFeatureCount() != 1:
-        gdaltest.post_reason('fail')
         return 'fail'
 
     lyr.SetAttributeFilter("dt = '2017/02/17 11:06:34.001'")
     if lyr.GetFeatureCount() != 0:
-        gdaltest.post_reason('fail')
         return 'fail'
 
     lyr.SetAttributeFilter("dt BETWEEN dt AND dt")
     if lyr.GetFeatureCount() != 1:
-        gdaltest.post_reason('fail')
         return 'fail'
 
     lyr.SetAttributeFilter("dt BETWEEN '2017/02/17 11:06:33.999' AND '2017/02/17 11:06:34.001'")
     if lyr.GetFeatureCount() != 1:
-        gdaltest.post_reason('fail')
         return 'fail'
 
     lyr.SetAttributeFilter("dt BETWEEN '2017/02/17 11:06:34.001' AND dt")
     if lyr.GetFeatureCount() != 0:
-        gdaltest.post_reason('fail')
         return 'fail'
 
     lyr.SetAttributeFilter("dt BETWEEN dt AND '2017/02/17 11:06:33.999'")
     if lyr.GetFeatureCount() != 0:
-        gdaltest.post_reason('fail')
         return 'fail'
 
     return 'success'
@@ -1579,7 +1495,6 @@ def test_ogr_rfc28_int_overflows():
         else:
             f = sql_lyr.GetNextFeature()
         if f.GetField(0) != res:
-            gdaltest.post_reason('fail')
             print(sql, res, f.GetField(0))
             return 'fail'
         ds.ReleaseResultSet(sql_lyr)
diff --git a/autotest/ogr/ogr_sql_sqlite.py b/autotest/ogr/ogr_sql_sqlite.py
index 822ea2814767..0c6d49476da5 100755
--- a/autotest/ogr/ogr_sql_sqlite.py
+++ b/autotest/ogr/ogr_sql_sqlite.py
@@ -77,7 +77,6 @@ def test_ogr_sql_sqlite_1():
 
     ret = ogr_sql_sqlite_available()
     if ret == 'fail':
-        gdaltest.post_reason('fail')
         return ret
     if not ret:
         return 'skip'
@@ -139,7 +138,6 @@ def test_ogr_sql_sqlite_1():
            feat.GetField('datefield') != '2012/08/23' or \
            feat.GetField('timefield') != '21:24:00' or \
            feat.GetField('from') != 'from_val':
-            gdaltest.post_reason('failure')
             feat.DumpReadable()
             return 'fail'
         feat = None
@@ -157,7 +155,6 @@ def test_ogr_sql_sqlite_1():
            feat.GetField('datetimefield') != '2012/08/23 21:24:00' or \
            feat.GetField('datefield') != '2012/08/23' or \
            feat.GetField('timefield') != '12:34:00':
-            gdaltest.post_reason('failure')
             feat.DumpReadable()
             return 'fail'
 
@@ -169,22 +166,16 @@ def test_ogr_sql_sqlite_1():
         # Test SELECT
         sql_lyr = ds.ExecuteSQL("SELECT * FROM my_layer", dialect='SQLite')
         if sql_lyr.GetLayerDefn().GetFieldDefn(sql_lyr.GetLayerDefn().GetFieldIndex('boolfield')).GetSubType() != ogr.OFSTBoolean:
-            gdaltest.post_reason('fail')
             return 'fail'
         if sql_lyr.GetLayerDefn().GetFieldDefn(sql_lyr.GetLayerDefn().GetFieldIndex('int16field')).GetSubType() != ogr.OFSTInt16:
-            gdaltest.post_reason('fail')
             return 'fail'
         if sql_lyr.GetLayerDefn().GetFieldDefn(sql_lyr.GetLayerDefn().GetFieldIndex('float32field')).GetSubType() != ogr.OFSTFloat32:
-            gdaltest.post_reason('fail')
             return 'fail'
         if sql_lyr.GetLayerDefn().GetFieldDefn(sql_lyr.GetLayerDefn().GetFieldIndex('intlistfield')).GetType() != ogr.OFTIntegerList:
-            gdaltest.post_reason('fail')
             return 'fail'
         if sql_lyr.GetLayerDefn().GetFieldDefn(sql_lyr.GetLayerDefn().GetFieldIndex('doublelistfield')).GetType() != ogr.OFTRealList:
-            gdaltest.post_reason('fail')
             return 'fail'
         if sql_lyr.GetLayerDefn().GetFieldDefn(sql_lyr.GetLayerDefn().GetFieldIndex('strlistfield')).GetType() != ogr.OFTStringList:
-            gdaltest.post_reason('fail')
             return 'fail'
         feat = sql_lyr.GetNextFeature()
         if feat.GetField('intfield') != 2 or \
@@ -202,7 +193,6 @@ def test_ogr_sql_sqlite_1():
            feat.GetField('int64listfield') != [1234567890123456] or \
            feat.GetField('doublelistfield') != [1.23] or \
            feat.GetField('strlistfield') != ['a']:
-            gdaltest.post_reason('failure')
             feat.DumpReadable()
             return 'fail'
         feat = None
@@ -216,7 +206,6 @@ def test_ogr_sql_sqlite_1():
            feat.GetField('doublefield') != 3.45 or \
            feat.GetField('strfield') != 'bar' or \
            feat.GetStyleString() != 'cool_style':
-            gdaltest.post_reason('failure')
             feat.DumpReadable()
             return 'fail'
         feat = None
@@ -238,7 +227,6 @@ def test_ogr_sql_sqlite_1():
             sql_lyr = ds.ExecuteSQL("SELECT * FROM my_layer WHERE " + cond, dialect='SQLite')
             feat = sql_lyr.GetNextFeature()
             if feat is None:
-                gdaltest.post_reason('failure')
                 print(cond)
                 return 'fail'
             feat = None
@@ -254,7 +242,6 @@ def test_ogr_sql_sqlite_1():
             sql_lyr = ds.ExecuteSQL("SELECT * FROM my_layer WHERE " + cond, dialect='SQLite')
             feat = sql_lyr.GetNextFeature()
             if feat is not None:
-                gdaltest.post_reason('failure')
                 return 'fail'
             feat = None
             ds.ReleaseResultSet(sql_lyr)
@@ -270,7 +257,6 @@ def test_ogr_sql_sqlite_1():
 
         feat = lyr.GetFeature(1000)
         if feat.GetField('intfield') != 100:
-            gdaltest.post_reason('failure')
             feat.DumpReadable()
             return 'fail'
         feat = None
@@ -284,7 +270,6 @@ def test_ogr_sql_sqlite_1():
         lyr.ResetReading()
         feat = lyr.GetNextFeature()
         if feat is not None:
-            gdaltest.post_reason('failure')
             feat.DumpReadable()
             return 'fail'
         feat = None
@@ -336,7 +321,6 @@ def test_ogr_sql_sqlite_2():
        feat.GetField('doublefield') != 3.45 or \
        feat.GetField('strfield') != 'bar' or \
        feat.GetGeometryRef().ExportToWkt() != 'POINT (0 1)':
-        gdaltest.post_reason('failure')
         feat.DumpReadable()
         return 'fail'
     feat = None
@@ -348,12 +332,10 @@ def test_ogr_sql_sqlite_2():
        feat.GetField('doublefield') != 3.45 or \
        feat.GetField('strfield') != 'bar' or \
        feat.GetGeometryRef().ExportToWkt() != 'POINT (0 1)':
-        gdaltest.post_reason('failure')
         feat.DumpReadable()
         return 'fail'
     got_srs = feat.GetGeometryRef().GetSpatialReference()
     if got_srs is None or srs.IsSame(got_srs) == 0:
-        gdaltest.post_reason('failure')
         print(srs)
         print(got_srs)
         return 'fail'
@@ -368,12 +350,10 @@ def test_ogr_sql_sqlite_2():
        feat.GetField('strfield') != 'bar' or \
        feat.GetStyleString() != 'cool_style' or \
        feat.GetGeometryRef().ExportToWkt() != 'POINT (0 1)':
-        gdaltest.post_reason('failure')
         feat.DumpReadable()
         return 'fail'
     got_srs = feat.GetGeometryRef().GetSpatialReference()
     if got_srs is None or srs.IsSame(got_srs) == 0:
-        gdaltest.post_reason('failure')
         print(srs)
         print(got_srs)
         return 'fail'
@@ -400,7 +380,6 @@ def test_ogr_sql_sqlite_2():
 
     layer_srs = sql_lyr.GetSpatialRef()
     if layer_srs is None or srs.IsSame(layer_srs) == 0:
-        gdaltest.post_reason('failure')
         print(srs)
         print(layer_srs)
         return 'fail'
@@ -408,12 +387,10 @@ def test_ogr_sql_sqlite_2():
     for _ in range(2):
         feat = sql_lyr.GetNextFeature()
         if feat.GetGeometryRef().ExportToWkt() != 'POINT (0 1)':
-            gdaltest.post_reason('failure')
             feat.DumpReadable()
             return 'fail'
         got_srs = feat.GetGeometryRef().GetSpatialReference()
         if got_srs is None or srs.IsSame(got_srs) == 0:
-            gdaltest.post_reason('failure')
             print(srs)
             print(got_srs)
             return 'fail'
@@ -571,14 +548,12 @@ def test_ogr_sql_sqlite_7():
     sql_lyr = ds.ExecuteSQL("SELECT * FROM my_layer", dialect='SQLite')
 
     if sql_lyr.GetGeometryColumn() != 'GEOMETRY2':
-        gdaltest.post_reason('failure')
         return 'fail'
 
     feat = sql_lyr.GetNextFeature()
     if feat.GetField('intfield') != 1 or \
        feat.GetField('geometry') != 'BLA' or \
        feat.GetGeometryRef().ExportToWkt() != 'POINT (0 1)':
-        gdaltest.post_reason('failure')
         feat.DumpReadable()
         return 'fail'
     feat = None
@@ -588,7 +563,6 @@ def test_ogr_sql_sqlite_7():
     sql_lyr = ds.ExecuteSQL("SELECT GEOMETRY2 FROM my_layer", dialect='SQLite')
     feat = sql_lyr.GetNextFeature()
     if feat.GetGeometryRef().ExportToWkt() != 'POINT (0 1)':
-        gdaltest.post_reason('failure')
         feat.DumpReadable()
         return 'fail'
     feat = None
@@ -765,7 +739,6 @@ def test_ogr_sql_sqlite_13():
     ds.ReleaseResultSet(sql_lyr)
 
     if geom is not None:
-        gdaltest.post_reason('fail')
         return 'fail'
 
     # Test on non existing layer
@@ -777,7 +750,6 @@ def test_ogr_sql_sqlite_13():
     ds.ReleaseResultSet(sql_lyr)
 
     if geom is not None:
-        gdaltest.post_reason('fail')
         return 'fail'
 
     # Test ogr_layer_Extent()
@@ -788,7 +760,6 @@ def test_ogr_sql_sqlite_13():
     ds.ReleaseResultSet(sql_lyr)
 
     if geom_wkt != 'POLYGON ((0 1,2 1,2 3,0 3,0 1))':
-        gdaltest.post_reason('fail')
         print(geom_wkt)
         return 'fail'
 
@@ -800,7 +771,6 @@ def test_ogr_sql_sqlite_13():
     ds.ReleaseResultSet(sql_lyr)
 
     if count != 1:
-        gdaltest.post_reason('fail')
         print(count)
         return 'fail'
 
@@ -811,7 +781,6 @@ def test_ogr_sql_sqlite_13():
     ds.ReleaseResultSet(sql_lyr)
 
     if geom is not None:
-        gdaltest.post_reason('fail')
         return 'fail'
 
     # Test ogr_layer_SRID()
@@ -822,7 +791,6 @@ def test_ogr_sql_sqlite_13():
     ds.ReleaseResultSet(sql_lyr)
 
     if the_srid != 4326:
-        gdaltest.post_reason('fail')
         print(the_srid)
         return 'fail'
 
@@ -834,7 +802,6 @@ def test_ogr_sql_sqlite_13():
     ds.ReleaseResultSet(sql_lyr)
 
     if the_srid is not None:
-        gdaltest.post_reason('fail')
         return 'fail'
 
     # Test ogr_layer_GeometryType()
@@ -845,7 +812,6 @@ def test_ogr_sql_sqlite_13():
     ds.ReleaseResultSet(sql_lyr)
 
     if the_geometrytype != 'LINESTRING':
-        gdaltest.post_reason('fail')
         print(the_geometrytype)
         return 'fail'
 
@@ -857,7 +823,6 @@ def test_ogr_sql_sqlite_13():
     ds.ReleaseResultSet(sql_lyr)
 
     if the_geometrytype is not None:
-        gdaltest.post_reason('fail')
         return 'fail'
 
     # Test on a external virtual table
@@ -876,7 +841,6 @@ def test_ogr_sql_sqlite_13():
     ogr.GetDriverByName("ESRI Shapefile").DeleteDataSource('/vsimem/ogr_sql_sqlite_13.shp')
 
     if the_srid_shp != 32631:
-        gdaltest.post_reason('fail')
         print(the_srid_shp)
         return 'fail'
 
@@ -1321,7 +1285,6 @@ def test_ogr_sql_sqlite_16(service=None, template='http://127.0.0.1:%d/geocoding
             sql_lyr = ds.ExecuteSQL(sql, dialect='SQLite')
             feat = sql_lyr.GetNextFeature()
             if feat is None:
-                gdaltest.post_reason('fail')
                 print(sql)
                 ret = 'fail'
                 ds.ReleaseResultSet(sql_lyr)
@@ -1332,7 +1295,6 @@ def test_ogr_sql_sqlite_16(service=None, template='http://127.0.0.1:%d/geocoding
                 (sql == "SELECT ogr_geocode('Paris', '%s')" % name_field and not feat.IsFieldSet(name_field)) or \
                     (sql == "SELECT ogr_geocode('Paris', 'raw')" and not feat.IsFieldSet('raw')):
                 feat.DumpReadable()
-                gdaltest.post_reason('fail')
                 print(sql)
                 ret = 'fail'
                 ds.ReleaseResultSet(sql_lyr)
@@ -1345,14 +1307,12 @@ def test_ogr_sql_sqlite_16(service=None, template='http://127.0.0.1:%d/geocoding
                 sql_lyr = ds.ExecuteSQL(sql, dialect='SQLite')
                 feat = sql_lyr.GetNextFeature()
                 if feat is None:
-                    gdaltest.post_reason('fail')
                     ret = 'fail'
                     ds.ReleaseResultSet(sql_lyr)
                     break
 
                 if feat.GetGeometryRef() is not None:
                     feat.DumpReadable()
-                    gdaltest.post_reason('fail')
                     ret = 'fail'
                     ds.ReleaseResultSet(sql_lyr)
                     break
@@ -1377,10 +1337,8 @@ def test_ogr_sql_sqlite_16(service=None, template='http://127.0.0.1:%d/geocoding
         # Check cache existence
         cache_ds = ogr.Open(cache_filename)
         if cache_ds is None:
-            gdaltest.post_reason('fail')
             ret = 'fail'
         if cache_ds.GetDriver().GetName().lower() != cache_filename[cache_filename.find('.') + 1:].lower():
-            gdaltest.post_reason('fail')
             print(cache_ds.GetDriver().GetName())
             print(cache_filename)
             ret = 'fail'
@@ -1456,7 +1414,6 @@ def test_ogr_sql_sqlite_17(service=None, template='http://127.0.0.1:%d/reversege
             sql_lyr = ds.ExecuteSQL(sql, dialect='SQLite')
             feat = sql_lyr.GetNextFeature()
             if feat is None:
-                gdaltest.post_reason('fail')
                 print(sql)
                 ret = 'fail'
                 ds.ReleaseResultSet(sql_lyr)
@@ -1468,7 +1425,6 @@ def test_ogr_sql_sqlite_17(service=None, template='http://127.0.0.1:%d/reversege
                 field_to_test = name_field
             if not feat.IsFieldSet(field_to_test):
                 feat.DumpReadable()
-                gdaltest.post_reason('fail')
                 print(sql)
                 ret = 'fail'
                 ds.ReleaseResultSet(sql_lyr)
@@ -1501,7 +1457,6 @@ def test_ogr_sql_sqlite_17(service=None, template='http://127.0.0.1:%d/reversege
         # Check cache existence
         cache_ds = ogr.Open(cache_filename)
         if cache_ds is None:
-            gdaltest.post_reason('fail')
             ret = 'fail'
         cache_ds = None
 
@@ -1586,7 +1541,6 @@ def test_ogr_sql_sqlite_24():
     sql_lyr = ds.ExecuteSQL("SELECT CAST(ogr_inflate(ogr_deflate('ab')) AS VARCHAR)", dialect='SQLite')
     feat = sql_lyr.GetNextFeature()
     if feat.GetField(0) != 'ab':
-        gdaltest.post_reason('fail')
         feat.DumpReadable()
         ds.ReleaseResultSet(sql_lyr)
         return 'fail'
@@ -1597,7 +1551,6 @@ def test_ogr_sql_sqlite_24():
     sql_lyr = ds.ExecuteSQL("SELECT CAST(ogr_inflate(ogr_deflate('%s')) AS VARCHAR)" % bigstr, dialect='SQLite')
     feat = sql_lyr.GetNextFeature()
     if feat.GetField(0) != bigstr:
-        gdaltest.post_reason('fail')
         feat.DumpReadable()
         ds.ReleaseResultSet(sql_lyr)
         return 'fail'
@@ -1607,7 +1560,6 @@ def test_ogr_sql_sqlite_24():
     sql_lyr = ds.ExecuteSQL("SELECT ogr_inflate(ogr_deflate(x'0203', 5))", dialect='SQLite')
     feat = sql_lyr.GetNextFeature()
     if feat.GetField(0) != '0203':
-        gdaltest.post_reason('fail')
         feat.DumpReadable()
         ds.ReleaseResultSet(sql_lyr)
         return 'fail'
@@ -1617,7 +1569,6 @@ def test_ogr_sql_sqlite_24():
     sql_lyr = ds.ExecuteSQL("SELECT ogr_inflate(x'0203')", dialect='SQLite')
     feat = sql_lyr.GetNextFeature()
     if not feat.IsFieldNull(0):
-        gdaltest.post_reason('fail')
         feat.DumpReadable()
         ds.ReleaseResultSet(sql_lyr)
         return 'fail'
@@ -1628,7 +1579,6 @@ def test_ogr_sql_sqlite_24():
     sql_lyr = ds.ExecuteSQL("SELECT ogr_deflate()", dialect='SQLite')
     gdal.PopErrorHandler()
     if sql_lyr is not None:
-        gdaltest.post_reason('fail')
         ds.ReleaseResultSet(sql_lyr)
         return 'fail'
 
@@ -1636,7 +1586,6 @@ def test_ogr_sql_sqlite_24():
     sql_lyr = ds.ExecuteSQL("SELECT ogr_deflate('a', 'b')", dialect='SQLite')
     feat = sql_lyr.GetNextFeature()
     if not feat.IsFieldNull(0):
-        gdaltest.post_reason('fail')
         feat.DumpReadable()
         ds.ReleaseResultSet(sql_lyr)
         return 'fail'
@@ -1647,7 +1596,6 @@ def test_ogr_sql_sqlite_24():
     sql_lyr = ds.ExecuteSQL("SELECT ogr_inflate()", dialect='SQLite')
     gdal.PopErrorHandler()
     if sql_lyr is not None:
-        gdaltest.post_reason('fail')
         ds.ReleaseResultSet(sql_lyr)
         return 'fail'
 
@@ -1655,7 +1603,6 @@ def test_ogr_sql_sqlite_24():
     sql_lyr = ds.ExecuteSQL("SELECT ogr_inflate('a')", dialect='SQLite')
     feat = sql_lyr.GetNextFeature()
     if not feat.IsFieldNull(0):
-        gdaltest.post_reason('fail')
         feat.DumpReadable()
         ds.ReleaseResultSet(sql_lyr)
         return 'fail'
@@ -1708,7 +1655,6 @@ def test_ogr_sql_sqlite_25():
     sql_lyr = ds.ExecuteSQL("SELECT ST_GeomFromWKB(ST_AsBinary(ST_GeomFromText(ST_AsText(ST_GeomFromText('POINT (0 1)')),4326)))", dialect='SQLite')
     feat = sql_lyr.GetNextFeature()
     if feat.GetGeometryRef().ExportToWkt() != 'POINT (0 1)':
-        gdaltest.post_reason('fail')
         feat.DumpReadable()
         ds.ReleaseResultSet(sql_lyr)
         return 'fail'
@@ -1726,7 +1672,6 @@ def test_ogr_sql_sqlite_25():
     ds.ReleaseResultSet(sql_lyr)
 
     if val_sql != 4326:
-        gdaltest.post_reason('fail')
         print(val_sql)
         return 'fail'
 
@@ -1742,18 +1687,15 @@ def test_ogr_sql_sqlite_25():
     val_ogr = geomA.GetArea()
 
     if abs(val_sql - val_ogr) > 1e-5:
-        gdaltest.post_reason('fail')
         print(val_sql)
         print(val_ogr)
         return 'fail'
 
     if val1_sql is not None:
-        gdaltest.post_reason('fail')
         print(val1_sql)
         return 'fail'
 
     if val2_sql is not None:
-        gdaltest.post_reason('fail')
         return 'fail'
 
     return 'success'
@@ -1916,10 +1858,8 @@ def test_ogr_sql_sqlite_27():
     lyr.CreateFeature(feat)
     lyr = ds.ExecuteSQL("SELECT MIN(DATE), MAX(DATE) from test", dialect='SQLite')
     if lyr.GetLayerDefn().GetFieldDefn(0).GetType() != ogr.OFTDateTime:
-        gdaltest.post_reason('fail')
         return 'fail'
     if lyr.GetLayerDefn().GetFieldDefn(1).GetType() != ogr.OFTDateTime:
-        gdaltest.post_reason('fail')
         return 'fail'
     tr = ogrtest.check_features_against_list(lyr, 'MIN(DATE)', ['2013/01/01 00:00:00'])
     lyr.ResetReading()
@@ -1952,7 +1892,6 @@ def test_ogr_sql_sqlite_28():
         sql_lyr = ds.ExecuteSQL(sql, dialect='SQLite')
         gdal.PopErrorHandler()
         if sql_lyr is not None:
-            gdaltest.post_reason('fail')
             print(sql)
             return 'fail'
 
@@ -1965,7 +1904,6 @@ def test_ogr_sql_sqlite_28():
         sql_lyr = ds.ExecuteSQL(sql, dialect='SQLite')
         f = sql_lyr.GetNextFeature()
         if not f.IsFieldNull(0):
-            gdaltest.post_reason('fail')
             print(sql)
             f.DumpReadable()
             return 'fail'
@@ -1976,7 +1914,6 @@ def test_ogr_sql_sqlite_28():
         sql_lyr = ds.ExecuteSQL(sql, dialect='SQLite')
         f = sql_lyr.GetNextFeature()
         if f.GetField(0) != expected:
-            gdaltest.post_reason('fail')
             print(sql)
             f.DumpReadable()
             return 'fail'
@@ -2007,12 +1944,10 @@ def test_ogr_sql_sqlite_29():
     ds = None
 
     if geom_type != ogr.wkbCircularString:
-        gdaltest.post_reason('fail')
         print(geom_type)
         return 'fail'
 
     if got_wkt != 'CIRCULARSTRING (0 0,1 0,0 0)':
-        gdaltest.post_reason('fail')
         print(got_wkt)
         return 'fail'
 
@@ -2045,12 +1980,10 @@ def test_ogr_sql_sqlite_30():
     ds.ReleaseResultSet(sql_lyr)
 
     if geom_type != ogr.wkbLineStringM:
-        gdaltest.post_reason('fail')
         print(geom_type)
         return 'fail'
 
     if got_wkt != 'LINESTRING M (1 2 3)':
-        gdaltest.post_reason('fail')
         print(got_wkt)
         return 'fail'
 
@@ -2061,12 +1994,10 @@ def test_ogr_sql_sqlite_30():
     ds.ReleaseResultSet(sql_lyr)
 
     if geom_type != ogr.wkbLineStringZM:
-        gdaltest.post_reason('fail')
         print(geom_type)
         return 'fail'
 
     if got_wkt != 'LINESTRING ZM (1 2 3 4)':
-        gdaltest.post_reason('fail')
         print(got_wkt)
         return 'fail'
 
@@ -2095,7 +2026,6 @@ def test_ogr_sql_sqlite_31():
     ds.ReleaseResultSet(sql_lyr)
 
     if value != 25:
-        gdaltest.post_reason('fail')
         return 'fail'
 
     return 'success'
diff --git a/autotest/ogr/ogr_sql_test.py b/autotest/ogr/ogr_sql_test.py
index 7150c14f445e..9d6f952a386a 100755
--- a/autotest/ogr/ogr_sql_test.py
+++ b/autotest/ogr/ogr_sql_test.py
@@ -132,23 +132,18 @@ def test_ogr_sql_5():
     feat = sql_lyr.GetNextFeature()
     if feat['max_eas_id'] != 179:
         feat.DumpReadable()
-        gdaltest.post_reason('fail')
         return 'fail'
     if feat['min_eas_id'] != 158:
         feat.DumpReadable()
-        gdaltest.post_reason('fail')
         return 'fail'
     if abs(feat['avg_eas_id'] - 168.142857142857) > 1e-12:
         feat.DumpReadable()
-        gdaltest.post_reason('fail')
         return 'fail'
     if feat['count_eas_id'] != 7:
         feat.DumpReadable()
-        gdaltest.post_reason('fail')
         return 'fail'
     if feat['sum_eas_id'] != 1177:
         feat.DumpReadable()
-        gdaltest.post_reason('fail')
         return 'fail'
     gdaltest.ds.ReleaseResultSet(sql_lyr)
 
@@ -1055,13 +1050,11 @@ def test_ogr_sql_36():
         sql_lyr = ds.ExecuteSQL("select distinct %s from layer order by %s asc" % (fieldname, fieldname))
         feat = sql_lyr.GetNextFeature()
         if feat.IsFieldSetAndNotNull(0) != 0:
-            gdaltest.post_reason('fail')
             print('field %s' % fieldname)
             feat.DumpReadable()
             return 'fail'
         feat = sql_lyr.GetNextFeature()
         if feat.IsFieldSetAndNotNull(0) == 0:
-            gdaltest.post_reason('fail')
             print('field %s' % fieldname)
             feat.DumpReadable()
             return 'fail'
@@ -1071,13 +1064,11 @@ def test_ogr_sql_36():
         sql_lyr = ds.ExecuteSQL("select distinct %s from layer order by %s desc" % (fieldname, fieldname))
         feat = sql_lyr.GetNextFeature()
         if feat.IsFieldSetAndNotNull(0) == 0:
-            gdaltest.post_reason('fail')
             print('field %s' % fieldname)
             feat.DumpReadable()
             return 'fail'
         feat = sql_lyr.GetNextFeature()
         if feat.IsFieldSetAndNotNull(0) != 0:
-            gdaltest.post_reason('fail')
             print('field %s' % fieldname)
             feat.DumpReadable()
             return 'fail'
@@ -1120,19 +1111,16 @@ def test_ogr_sql_37():
         sql_lyr = ds.ExecuteSQL("select count(%s), count(distinct %s), count(*) from layer" % (fieldname, fieldname))
         feat = sql_lyr.GetNextFeature()
         if feat.GetFieldAsInteger(0) != 2:
-            gdaltest.post_reason('fail')
             print('field %s' % fieldname)
             feat.DumpReadable()
             return 'fail'
 
         if feat.GetFieldAsInteger(1) != 1:
-            gdaltest.post_reason('fail')
             print('field %s' % fieldname)
             feat.DumpReadable()
             return 'fail'
 
         if feat.GetFieldAsInteger(2) != 4:
-            gdaltest.post_reason('fail')
             print('field %s' % fieldname)
             feat.DumpReadable()
             return 'fail'
@@ -1142,7 +1130,6 @@ def test_ogr_sql_37():
     sql_lyr = ds.ExecuteSQL("select avg(intfield) from layer where intfield is null")
     feat = sql_lyr.GetNextFeature()
     if feat.IsFieldSetAndNotNull(0) != 0:
-        gdaltest.post_reason('fail')
         feat.DumpReadable()
         return 'fail'
     ds.ReleaseResultSet(sql_lyr)
@@ -1151,12 +1138,10 @@ def test_ogr_sql_37():
     sql_lyr = ds.ExecuteSQL("select distinct strfield_first_null from layer")
     feat = sql_lyr.GetNextFeature()
     if feat.IsFieldSetAndNotNull('strfield_first_null'):
-        gdaltest.post_reason('fail')
         feat.DumpReadable()
         return 'fail'
     feat = sql_lyr.GetNextFeature()
     if feat.GetFieldAsString('strfield_first_null') != 'foo':
-        gdaltest.post_reason('fail')
         feat.DumpReadable()
         return 'fail'
     ds.ReleaseResultSet(sql_lyr)
@@ -1164,7 +1149,6 @@ def test_ogr_sql_37():
     sql_lyr = ds.ExecuteSQL("select distinct strfield_never_set from layer")
     feat = sql_lyr.GetNextFeature()
     if feat.IsFieldSetAndNotNull('strfield_never_set'):
-        gdaltest.post_reason('fail')
         feat.DumpReadable()
         return 'fail'
     ds.ReleaseResultSet(sql_lyr)
@@ -1172,7 +1156,6 @@ def test_ogr_sql_37():
     sql_lyr = ds.ExecuteSQL("select min(intfield_never_set), max(intfield_never_set), avg(intfield_never_set), sum(intfield_never_set), count(intfield_never_set) from layer")
     feat = sql_lyr.GetNextFeature()
     if feat.IsFieldSetAndNotNull(0) or feat.IsFieldSetAndNotNull(1) or feat.IsFieldSetAndNotNull(2) or feat.IsFieldSetAndNotNull(3) or feat.GetField(4) != 0:
-        gdaltest.post_reason('fail')
         feat.DumpReadable()
         return 'fail'
     ds.ReleaseResultSet(sql_lyr)
@@ -1254,14 +1237,12 @@ def test_ogr_sql_42():
     feat = lyr.GetNextFeature()
     lyr.SetAttributeFilter(None)
     if feat is None:
-        gdaltest.post_reason('fail')
         return 'fail'
 
     sql_lyr = gdaltest.ds.ExecuteSQL("SELECT * FROM poly WHERE prfedea <> ''")
     feat = sql_lyr.GetNextFeature()
     gdaltest.ds.ReleaseResultSet(sql_lyr)
     if feat is None:
-        gdaltest.post_reason('fail')
         return 'fail'
 
     return 'success'
@@ -1297,7 +1278,6 @@ def test_ogr_sql_44():
         sql_lyr = gdaltest.ds.ExecuteSQL(sql)
         gdal.PopErrorHandler()
         if sql_lyr is not None:
-            gdaltest.post_reason('fail')
             print(sql)
             return 'fail'
 
@@ -1319,7 +1299,6 @@ def test_ogr_sql_44():
         sql_lyr = gdaltest.ds.ExecuteSQL(sql)
         f = sql_lyr.GetNextFeature()
         if f.IsFieldSetAndNotNull(0):
-            gdaltest.post_reason('fail')
             print(sql)
             f.DumpReadable()
             return 'fail'
@@ -1338,7 +1317,6 @@ def test_ogr_sql_44():
         sql_lyr = gdaltest.ds.ExecuteSQL(sql)
         f = sql_lyr.GetNextFeature()
         if f.GetField(0) != expected:
-            gdaltest.post_reason('fail')
             print(sql)
             f.DumpReadable()
             return 'fail'
@@ -1366,24 +1344,20 @@ def test_ogr_sql_45():
     lyr = ds.GetLayer(0)
 
     if lyr.GetFeatureCount() != 1000000000000:
-        gdaltest.post_reason('fail')
         return 'fail'
 
     sql_lyr = ds.ExecuteSQL('SELECT COUNT(*) FROM poly')
     f = sql_lyr.GetNextFeature()
     if f.GetField(0) != 1000000000000:
-        gdaltest.post_reason('fail')
         return 'fail'
     f = None
     ds.ReleaseResultSet(sql_lyr)
 
     sql_lyr = ds.ExecuteSQL('SELECT COUNT(AREA) FROM poly')
     if sql_lyr.GetLayerDefn().GetFieldDefn(0).GetType() != ogr.OFTInteger:
-        gdaltest.post_reason('fail')
         return 'fail'
     f = sql_lyr.GetNextFeature()
     if f.GetField(0) != 10:
-        gdaltest.post_reason('fail')
         return 'fail'
     f = None
     ds.ReleaseResultSet(sql_lyr)
@@ -1413,19 +1387,16 @@ def test_ogr_sql_46():
     sql_lyr = ds.ExecuteSQL("select id, 'id', \"id\" as id2, id as \"id3\", \"from\" from test where \"from\" = 'from'")
     feat = sql_lyr.GetNextFeature()
     if feat.GetField(0) != 3 or feat.GetField(1) != 'id' or feat.GetField(2) != 3 or feat.GetField(3) != 3 or feat.GetField(4) != 'from':
-        gdaltest.post_reason('fail')
         feat.DumpReadable()
         return 'fail'
     feat = sql_lyr.GetNextFeature()
     if feat is not None:
-        gdaltest.post_reason('fail')
         return 'fail'
     ds.ReleaseResultSet(sql_lyr)
 
     sql_lyr = ds.ExecuteSQL("select max(\"id\"), max(id), count(\"id\"), count(id) from \"test\"")
     feat = sql_lyr.GetNextFeature()
     if feat.GetField(0) != 3 or feat.GetField(1) != 3 or feat.GetField(2) != 2 or feat.GetField(3) != 2:
-        gdaltest.post_reason('fail')
         feat.DumpReadable()
         return 'fail'
     ds.ReleaseResultSet(sql_lyr)
@@ -1435,7 +1406,6 @@ def test_ogr_sql_46():
     sql_lyr = ds.ExecuteSQL("select * from 'test'")
     gdal.PopErrorHandler()
     if sql_lyr is not None:
-        gdaltest.post_reason('fail')
         return 'fail'
 
     # Not accepted
@@ -1443,7 +1413,6 @@ def test_ogr_sql_46():
     sql_lyr = ds.ExecuteSQL("select distinct 'id' from 'test'")
     gdal.PopErrorHandler()
     if sql_lyr is not None:
-        gdaltest.post_reason('fail')
         return 'fail'
 
     # Not accepted
@@ -1451,7 +1420,6 @@ def test_ogr_sql_46():
     sql_lyr = ds.ExecuteSQL("select max('id') from 'test'")
     gdal.PopErrorHandler()
     if sql_lyr is not None:
-        gdaltest.post_reason('fail')
         return 'fail'
 
     # Not accepted
@@ -1459,7 +1427,6 @@ def test_ogr_sql_46():
     sql_lyr = ds.ExecuteSQL("select id as 'id2' from 'test'")
     gdal.PopErrorHandler()
     if sql_lyr is not None:
-        gdaltest.post_reason('fail')
         return 'fail'
 
     return 'success'
@@ -1479,7 +1446,6 @@ def test_ogr_sql_47():
         else:
             new_val = ''
         if new_val < prec_val:
-            gdaltest.post_reason('fail')
             print("new_val = '%s', prec_val = '%s'" % (new_val, prec_val))
             return 'fail'
         prec_val = new_val
@@ -1507,13 +1473,11 @@ def test_ogr_sql_48():
     i = 1
     for f in sql_lyr:
         if f['int_field'] != i:
-            gdaltest.post_reason('fail')
             f.DumpReadable()
             return 'fail'
         i = i + 1
     ds.ReleaseResultSet(sql_lyr)
     if i != 1001:
-        gdaltest.post_reason('fail')
         return 'fail'
 
     return 'success'
diff --git a/autotest/ogr/ogr_sqlite.py b/autotest/ogr/ogr_sqlite.py
index 54d9f4d7ef42..76fde9f4fba6 100755
--- a/autotest/ogr/ogr_sqlite.py
+++ b/autotest/ogr/ogr_sqlite.py
@@ -140,7 +140,6 @@ def test_ogr_sqlite_2():
     gdaltest.sl_ds = ogr.Open('tmp/sqlite_test.db', update=1)
     gdaltest.sl_lyr = gdaltest.sl_ds.GetLayerByName('tpoly')
     if gdaltest.sl_lyr.GetGeometryColumn() != 'GEOMETRY':
-        gdaltest.post_reason('failure')
         return 'fail'
 
     for field_desc in fields:
@@ -152,18 +151,14 @@ def test_ogr_sqlite_2():
                    field_defn.GetFieldTypeName(field_desc[1])))
     field_defn = feature_def.GetFieldDefn(feature_def.GetFieldIndex('fld_boolean'))
     if field_defn.GetType() != ogr.OFTInteger or field_defn.GetSubType() != ogr.OFSTBoolean:
-        gdaltest.post_reason('failure')
         return 'fail'
     field_defn = feature_def.GetFieldDefn(feature_def.GetFieldIndex('INT64'))
     if field_defn.GetType() != ogr.OFTInteger64:
-        gdaltest.post_reason('failure')
         return 'fail'
 
     if gdaltest.sl_ds.GetLayerByName('a_layer').GetGeometryColumn() != 'mygeom':
-        gdaltest.post_reason('failure')
         return 'fail'
     if gdaltest.sl_ds.GetLayerByName('a_layer').GetFIDColumn() != 'my_fid':
-        gdaltest.post_reason('failure')
         return 'fail'
 
     ######################################################
@@ -235,7 +230,6 @@ def test_ogr_sqlite_3():
                 gdaltest.post_reason('Attribute %d does not match' % fld)
                 return 'fail'
         if read_feat.GetField('int64') != 1234567890123:
-            gdaltest.post_reason('failure')
             read_feat.DumpReadable()
             return 'fail'
 
@@ -954,7 +948,6 @@ def test_ogr_sqlite_18():
     if feat.GetField('auth_name') != 'OGR' or \
        feat.GetField('proj4text').find('+proj=vandg') != 0:
         feat.DumpReadable()
-        gdaltest.post_reason('fail')
         return 'fail'
     gdaltest.sl_ds.ReleaseResultSet(sql_lyr)
 
@@ -1301,11 +1294,9 @@ def test_ogr_sqlite_25():
 
     lyr = ds.GetLayerByName('polygon')
     if lyr is None:
-        gdaltest.post_reason('failed')
         return 'fail'
 
     if lyr.GetLayerDefn().GetFieldCount() == 0:
-        gdaltest.post_reason('failed')
         return 'fail'
 
     return 'success'
@@ -1372,7 +1363,6 @@ def test_ogr_sqlite_27():
                 ret = ret[0:pos]
 
     if ret.find('INFO') == -1 or ret.find('ERROR') != -1:
-        gdaltest.post_reason('failed')
         print(ret)
         return 'fail'
 
@@ -1380,7 +1370,6 @@ def test_ogr_sqlite_27():
     ret = gdaltest.runexternal(test_cli_utilities.get_test_ogrsf_path() + ' -ro tmp/ogr_sqlite_27.sqlite -sql "SELECT * FROM poly"')
 
     if ret.find('INFO') == -1 or ret.find('ERROR') != -1:
-        gdaltest.post_reason('failed')
         print(ret)
         return 'fail'
 
@@ -1405,7 +1394,6 @@ def test_ogr_sqlite_28():
     os.unlink('tmp/poly_spatialite.sqlite')
 
     if ret.find('INFO') == -1 or ret.find('ERROR') != -1:
-        gdaltest.post_reason('failed')
         print(ret)
         return 'fail'
 
@@ -1413,7 +1401,6 @@ def test_ogr_sqlite_28():
     ret = gdaltest.runexternal(test_cli_utilities.get_test_ogrsf_path() + ' -ro data/poly_spatialite.sqlite -sql "SELECT * FROM poly"')
 
     if ret.find('INFO') == -1 or ret.find('ERROR') != -1:
-        gdaltest.post_reason('failed')
         print(ret)
         return 'fail'
 
@@ -1423,7 +1410,6 @@ def test_ogr_sqlite_28():
     os.unlink('tmp/poly_spatialite4.sqlite')
 
     if ret.find('INFO') == -1 or ret.find('ERROR') != -1:
-        gdaltest.post_reason('failed')
         print(ret)
         return 'fail'
 
@@ -2036,44 +2022,34 @@ def test_ogr_spatialite_6():
     lyr = ds.GetLayerByName(layername)
     view_lyr = ds.GetLayerByName(viewname)
     if view_lyr.GetFIDColumn() != pkid_single:
-        gdaltest.post_reason('failed')
         print(view_lyr.GetGeometryColumn())
         return 'fail'
     if view_lyr.GetGeometryColumn() != thegeom_single:
-        gdaltest.post_reason('failed')
         print(view_lyr.GetGeometryColumn())
         return 'fail'
     if view_lyr.GetLayerDefn().GetFieldDefn(0).GetName() != "int'col":
-        gdaltest.post_reason('failed')
         print(view_lyr.GetLayerDefn().GetFieldDefn(0).GetName())
         return 'fail'
     if view_lyr.GetGeomType() != lyr.GetGeomType():
-        gdaltest.post_reason('failed')
         return 'fail'
     if view_lyr.GetFeatureCount() != lyr.GetFeatureCount():
-        gdaltest.post_reason('failed')
         return 'fail'
     if view_lyr.GetSpatialRef().IsSame(lyr.GetSpatialRef()) != 1:
-        gdaltest.post_reason('failed')
         return 'fail'
     feat = view_lyr.GetFeature(3)
     if feat.GetFieldAsInteger(0) != 34:
-        gdaltest.post_reason('failed')
         feat.DumpReadable()
         return 'fail'
     if feat.GetFieldAsDouble(1) != 56.78:
-        gdaltest.post_reason('failed')
         feat.DumpReadable()
         return 'fail'
     view_lyr.SetAttributeFilter('"int\'col" = 34')
     view_lyr.SetSpatialFilterRect(2.5, 49.5, 3.5, 50.5)
     feat = view_lyr.GetNextFeature()
     if feat.GetFID() != 3:
-        gdaltest.post_reason('failed')
         feat.DumpReadable()
         return 'fail'
     if feat.GetGeometryRef().ExportToWkt() != 'POINT (3 50)':
-        gdaltest.post_reason('failed')
         feat.DumpReadable()
         return 'fail'
     ds = None
@@ -2092,7 +2068,6 @@ def test_ogr_spatialite_6():
     view_lyr.SetSpatialFilterRect(2.5, 49.5, 3.5, 50.5)
     feat = view_lyr.GetNextFeature()
     if feat.GetFID() != 3:
-        gdaltest.post_reason('failed')
         feat.DumpReadable()
         return 'fail'
     ds = None
@@ -2110,21 +2085,17 @@ def test_ogr_spatialite_7():
 
     ds = ogr.Open('VirtualShape:data/poly.shp')
     if ds is None:
-        gdaltest.post_reason('failed')
         return 'fail'
 
     lyr = ds.GetLayerByName('poly')
     if lyr is None:
-        gdaltest.post_reason('failed')
         return 'fail'
 
     if lyr.GetGeomType() != ogr.wkbPolygon:
-        gdaltest.post_reason('failed')
         return 'fail'
 
     f = lyr.GetNextFeature()
     if f.GetGeometryRef() is None:
-        gdaltest.post_reason('failed')
         return 'fail'
 
     return 'success'
@@ -2165,7 +2136,6 @@ def test_ogr_spatialite_8():
     f = lyr.GetNextFeature()
     if f.GetGeomFieldRef('geom1').ExportToWkt() != 'POINT (0 -1)' or \
        f.GetGeomFieldRef('geom2').ExportToWkt() != 'LINESTRING (0 -1,2 3)':
-        gdaltest.post_reason('failed')
         f.DumpReadable()
         return 'fail'
     f.SetGeomFieldDirectly(0, ogr.CreateGeometryFromWkt('POINT(0 1)'))
@@ -2193,40 +2163,30 @@ def test_ogr_spatialite_8():
     lyr = ds.GetLayerByName('test(geom1)')
     view_lyr = ds.GetLayerByName('view_test_geom1')
     if lyr.GetLayerDefn().GetFieldCount() != 1:
-        gdaltest.post_reason('failed')
         return 'fail'
     if view_lyr.GetLayerDefn().GetFieldCount() != 1:
-        gdaltest.post_reason('failed')
         return 'fail'
     if lyr.GetGeometryColumn() != 'geom1':
-        gdaltest.post_reason('failed')
         return 'fail'
     if view_lyr.GetGeometryColumn() != 'renamed_geom1':
-        gdaltest.post_reason('failed')
         return 'fail'
     if lyr.GetGeomType() != ogr.wkbPoint:
-        gdaltest.post_reason('failed')
         return 'fail'
     if view_lyr.GetGeomType() != lyr.GetGeomType():
-        gdaltest.post_reason('failed')
         return 'fail'
     if view_lyr.GetFeatureCount() != lyr.GetFeatureCount():
-        gdaltest.post_reason('failed')
         return 'fail'
     feat = view_lyr.GetFeature(1)
     if feat.GetFieldAsString(0) != 'bar':
-        gdaltest.post_reason('failed')
         feat.DumpReadable()
         return 'fail'
     feat = None
     view_lyr.SetSpatialFilterRect(-1, -1, 10, 10)
     feat = view_lyr.GetNextFeature()
     if feat.GetFID() != 1:
-        gdaltest.post_reason('failed')
         feat.DumpReadable()
         return 'fail'
     if feat.GetGeometryRef().ExportToWkt() != 'POINT (0 1)':
-        gdaltest.post_reason('failed')
         feat.DumpReadable()
         return 'fail'
     feat = None
@@ -2234,40 +2194,30 @@ def test_ogr_spatialite_8():
     lyr = ds.GetLayerByName('test(geom2)')
     view_lyr = ds.GetLayerByName('view_test_geom2')
     if lyr.GetLayerDefn().GetFieldCount() != 1:
-        gdaltest.post_reason('failed')
         return 'fail'
     if view_lyr.GetLayerDefn().GetFieldCount() != 1:
-        gdaltest.post_reason('failed')
         return 'fail'
     if lyr.GetGeometryColumn() != 'geom2':
-        gdaltest.post_reason('failed')
         return 'fail'
     if view_lyr.GetGeometryColumn() != 'renamed_geom2':
-        gdaltest.post_reason('failed')
         return 'fail'
     if lyr.GetGeomType() != ogr.wkbLineString:
-        gdaltest.post_reason('failed')
         return 'fail'
     if view_lyr.GetGeomType() != lyr.GetGeomType():
-        gdaltest.post_reason('failed')
         return 'fail'
     if view_lyr.GetFeatureCount() != lyr.GetFeatureCount():
-        gdaltest.post_reason('failed')
         return 'fail'
     feat = view_lyr.GetFeature(1)
     if feat.GetFieldAsString(0) != 'bar':
-        gdaltest.post_reason('failed')
         feat.DumpReadable()
         return 'fail'
     feat = None
     view_lyr.SetSpatialFilterRect(-1, -1, 10, 10)
     feat = view_lyr.GetNextFeature()
     if feat.GetFID() != 1:
-        gdaltest.post_reason('failed')
         feat.DumpReadable()
         return 'fail'
     if feat.GetGeometryRef().ExportToWkt() != 'LINESTRING (0 1,2 3)':
-        gdaltest.post_reason('failed')
         feat.DumpReadable()
         return 'fail'
     feat = None
@@ -2276,7 +2226,6 @@ def test_ogr_spatialite_8():
     sql_lyr.SetSpatialFilterRect(-1, -1, 10, 10)
     feat = sql_lyr.GetNextFeature()
     if feat.GetGeometryRef().ExportToWkt() != 'LINESTRING (0 1,2 3)':
-        gdaltest.post_reason('failed')
         feat.DumpReadable()
         return 'fail'
     feat = None
@@ -2285,40 +2234,30 @@ def test_ogr_spatialite_8():
     with gdaltest.error_handler():
         lyr = ds.GetLayerByName('invalid_layer_name(geom1)')
     if lyr is not None:
-        gdaltest.post_reason('failed')
         return 'fail'
 
     lyr = ds.GetLayerByName('test')
     if lyr.GetLayerDefn().GetFieldCount() != 1:
-        gdaltest.post_reason('failed')
         return 'fail'
     if lyr.GetLayerDefn().GetGeomFieldCount() != 2:
-        gdaltest.post_reason('failed')
         return 'fail'
     if lyr.GetLayerDefn().GetGeomFieldDefn(0).GetName() != 'geom1':
-        gdaltest.post_reason('failed')
         return 'fail'
     if lyr.GetLayerDefn().GetGeomFieldDefn(1).GetName() != 'geom2':
-        gdaltest.post_reason('failed')
         return 'fail'
     if lyr.GetLayerDefn().GetGeomFieldDefn(0).GetType() != ogr.wkbPoint:
-        gdaltest.post_reason('failed')
         return 'fail'
     if lyr.GetLayerDefn().GetGeomFieldDefn(1).GetType() != ogr.wkbLineString:
-        gdaltest.post_reason('failed')
         return 'fail'
     lyr.SetSpatialFilterRect(-1, -1, 10, 10)
     feat = lyr.GetNextFeature()
     if feat.GetFID() != 1:
-        gdaltest.post_reason('failed')
         feat.DumpReadable()
         return 'fail'
     if feat.GetGeomFieldRef(0).ExportToWkt() != 'POINT (0 1)':
-        gdaltest.post_reason('failed')
         feat.DumpReadable()
         return 'fail'
     if feat.GetGeomFieldRef(1).ExportToWkt() != 'LINESTRING (0 1,2 3)':
-        gdaltest.post_reason('failed')
         feat.DumpReadable()
         return 'fail'
     feat = None
@@ -2326,7 +2265,6 @@ def test_ogr_spatialite_8():
     lyr.SetSpatialFilterRect(1, -1, -1, 10, 10)
     feat = lyr.GetNextFeature()
     if feat.GetFID() != 1:
-        gdaltest.post_reason('failed')
         feat.DumpReadable()
         return 'fail'
     feat = None
@@ -2371,44 +2309,34 @@ def test_ogr_sqlite_31():
 
     lyr = ds.GetLayerByName('test(geom1)')
     if lyr.GetLayerDefn().GetFieldCount() != 1:
-        gdaltest.post_reason('failed')
         return 'fail'
     if lyr.GetGeometryColumn() != 'geom1':
-        gdaltest.post_reason('failed')
         return 'fail'
     if lyr.GetGeomType() != ogr.wkbPoint:
-        gdaltest.post_reason('failed')
         return 'fail'
     lyr.SetSpatialFilterRect(-1, -1, 10, 10)
     feat = lyr.GetNextFeature()
     if feat.GetFID() != 1:
-        gdaltest.post_reason('failed')
         feat.DumpReadable()
         return 'fail'
     if feat.GetGeometryRef().ExportToWkt() != 'POINT (0 1)':
-        gdaltest.post_reason('failed')
         feat.DumpReadable()
         return 'fail'
     feat = None
 
     lyr = ds.GetLayerByName('test(geom2)')
     if lyr.GetLayerDefn().GetFieldCount() != 1:
-        gdaltest.post_reason('failed')
         return 'fail'
     if lyr.GetGeometryColumn() != 'geom2':
-        gdaltest.post_reason('failed')
         return 'fail'
     if lyr.GetGeomType() != ogr.wkbLineString:
-        gdaltest.post_reason('failed')
         return 'fail'
     lyr.SetSpatialFilterRect(-1, -1, 10, 10)
     feat = lyr.GetNextFeature()
     if feat.GetFID() != 1:
-        gdaltest.post_reason('failed')
         feat.DumpReadable()
         return 'fail'
     if feat.GetGeometryRef().ExportToWkt() != 'LINESTRING (0 1,2 3)':
-        gdaltest.post_reason('failed')
         feat.DumpReadable()
         return 'fail'
     feat = None
@@ -2452,20 +2380,16 @@ def test_ogr_sqlite_32():
     lyr = ds.GetLayer(0)
 
     if lyr.GetLayerDefn().GetFieldDefn(0).GetType() != ogr.OFTDateTime:
-        gdaltest.post_reason('fail')
         return 'fail'
     if lyr.GetLayerDefn().GetFieldDefn(1).GetType() != ogr.OFTDate:
-        gdaltest.post_reason('fail')
         return 'fail'
     if lyr.GetLayerDefn().GetFieldDefn(2).GetType() != ogr.OFTTime:
-        gdaltest.post_reason('fail')
         return 'fail'
 
     feat = lyr.GetNextFeature()
     if feat.GetField('datetimefield') != '2012/08/23 21:24:00' or \
             feat.GetField('datefield') != '2012/08/23' or \
             feat.GetField('timefield') != '21:24:00':
-        gdaltest.post_reason('failure')
         feat.DumpReadable()
         return 'fail'
     feat = None
@@ -2518,7 +2442,6 @@ def test_ogr_sqlite_33():
         lyr = ds.GetLayerByName('test2')
         srs = lyr.GetSpatialRef()
         if srs.ExportToWkt().find('4326') == -1:
-            gdaltest.post_reason('failure')
             print(i)
             return 'fail'
 
@@ -2530,7 +2453,6 @@ def test_ogr_sqlite_33():
         ds.ReleaseResultSet(sql_lyr)
 
         if is_none:
-            gdaltest.post_reason('failure')
             print(i)
             return 'fail'
 
@@ -2542,7 +2464,6 @@ def test_ogr_sqlite_33():
         ds.ReleaseResultSet(sql_lyr)
 
         if not is_none:
-            gdaltest.post_reason('failure')
             print(i)
             return 'fail'
 
@@ -2568,7 +2489,6 @@ def test_ogr_sqlite_34():
     val = feat.GetField(0)
     gdaltest.sl_ds.ReleaseResultSet(sql_lyr)
     if val != 1:
-        gdaltest.post_reason('failure')
         return 'fail'
 
     # Evaluates to FALSE
@@ -2577,7 +2497,6 @@ def test_ogr_sqlite_34():
     val = feat.GetField(0)
     gdaltest.sl_ds.ReleaseResultSet(sql_lyr)
     if val != 0:
-        gdaltest.post_reason('failure')
         return 'fail'
 
     # NULL left-member
@@ -2586,7 +2505,6 @@ def test_ogr_sqlite_34():
     val = feat.GetField(0)
     gdaltest.sl_ds.ReleaseResultSet(sql_lyr)
     if val != 0:
-        gdaltest.post_reason('failure')
         return 'fail'
 
     # NULL regexp
@@ -2594,7 +2512,6 @@ def test_ogr_sqlite_34():
     sql_lyr = gdaltest.sl_ds.ExecuteSQL("SELECT 'a' REGEXP NULL")
     gdal.PopErrorHandler()
     if sql_lyr is not None:
-        gdaltest.post_reason('failure')
         return 'fail'
 
     # Invalid regexp
@@ -2602,7 +2519,6 @@ def test_ogr_sqlite_34():
     sql_lyr = gdaltest.sl_ds.ExecuteSQL("SELECT 'a' REGEXP '['")
     gdal.PopErrorHandler()
     if sql_lyr is not None:
-        gdaltest.post_reason('failure')
         return 'fail'
 
     # Adds another pattern
@@ -2611,7 +2527,6 @@ def test_ogr_sqlite_34():
     val = feat.GetField(0)
     gdaltest.sl_ds.ReleaseResultSet(sql_lyr)
     if val != 1:
-        gdaltest.post_reason('failure')
         return 'fail'
 
     # Test cache
@@ -2671,7 +2586,6 @@ def test_ogr_sqlite_35():
         sql_lyr.ResetReading()
         feat = sql_lyr.GetNextFeature()
         if feat is None:
-            gdaltest.post_reason('failure')
             return 'fail'
         feat = None
 
@@ -2679,7 +2593,6 @@ def test_ogr_sqlite_35():
         sql_lyr.ResetReading()
         feat = sql_lyr.GetNextFeature()
         if feat is not None:
-            gdaltest.post_reason('failure')
             return 'fail'
         feat = None
 
@@ -2687,7 +2600,6 @@ def test_ogr_sqlite_35():
         sql_lyr.ResetReading()
         feat = sql_lyr.GetNextFeature()
         if feat is None:
-            gdaltest.post_reason('failure')
             return 'fail'
         feat = None
 
@@ -2696,7 +2608,6 @@ def test_ogr_sqlite_35():
         sql_lyr.ResetReading()
         feat = sql_lyr.GetNextFeature()
         if feat is None:
-            gdaltest.post_reason('failure')
             return 'fail'
         feat = None
 
@@ -2705,7 +2616,6 @@ def test_ogr_sqlite_35():
         sql_lyr.ResetReading()
         feat = sql_lyr.GetNextFeature()
         if feat is not None:
-            gdaltest.post_reason('failure')
             return 'fail'
         feat = None
 
@@ -2714,7 +2624,6 @@ def test_ogr_sqlite_35():
         sql_lyr.ResetReading()
         feat = sql_lyr.GetNextFeature()
         if feat is None:
-            gdaltest.post_reason('failure')
             return 'fail'
         feat = None
 
@@ -2754,11 +2663,9 @@ def test_ogr_sqlite_36():
     ds = ogr.Open('tmp/ogr_sqlite_36.sqlite')
     lyr = ds.GetLayer(0)
     if lyr.GetMetadataItem(ogr.OLMD_FID64) is None:
-        gdaltest.post_reason('fail')
         return 'fail'
     f = lyr.GetNextFeature()
     if f.GetFID() != 1234567890123:
-        gdaltest.post_reason('failure')
         return 'fail'
 
     return 'success'
@@ -2802,7 +2709,6 @@ def test_ogr_sqlite_37():
     ret = lyr.CreateFeature(f)
     gdal.PopErrorHandler()
     if ret == 0:
-        gdaltest.post_reason('fail')
         return 'fail'
     f = None
 
@@ -2813,7 +2719,6 @@ def test_ogr_sqlite_37():
     ret = lyr.CreateFeature(f)
     gdal.PopErrorHandler()
     if ret == 0:
-        gdaltest.post_reason('fail')
         return 'fail'
     f = None
 
@@ -2822,16 +2727,12 @@ def test_ogr_sqlite_37():
     ds = ogr.Open('tmp/ogr_sqlite_37.sqlite', update=1)
     lyr = ds.GetLayerByName('test')
     if lyr.GetLayerDefn().GetFieldDefn(lyr.GetLayerDefn().GetFieldIndex('field_not_nullable')).IsNullable() != 0:
-        gdaltest.post_reason('fail')
         return 'fail'
     if lyr.GetLayerDefn().GetFieldDefn(lyr.GetLayerDefn().GetFieldIndex('field_nullable')).IsNullable() != 1:
-        gdaltest.post_reason('fail')
         return 'fail'
     if lyr.GetLayerDefn().GetGeomFieldDefn(lyr.GetLayerDefn().GetGeomFieldIndex('geomfield_not_nullable')).IsNullable() != 0:
-        gdaltest.post_reason('fail')
         return 'fail'
     if lyr.GetLayerDefn().GetGeomFieldDefn(lyr.GetLayerDefn().GetGeomFieldIndex('geomfield_nullable')).IsNullable() != 1:
-        gdaltest.post_reason('fail')
         return 'fail'
 
     # Turn not null into nullable
@@ -2840,7 +2741,6 @@ def test_ogr_sqlite_37():
     fd.SetNullable(1)
     lyr.AlterFieldDefn(lyr.GetLayerDefn().GetFieldIndex('field_not_nullable'), fd, ogr.ALTER_ALL_FLAG)
     if lyr.GetLayerDefn().GetFieldDefn(lyr.GetLayerDefn().GetFieldIndex('now_nullable')).IsNullable() != 1:
-        gdaltest.post_reason('fail')
         return 'fail'
 
     # Turn nullable into not null, but remove NULL values first
@@ -2851,7 +2751,6 @@ def test_ogr_sqlite_37():
     fd.SetNullable(0)
     lyr.AlterFieldDefn(lyr.GetLayerDefn().GetFieldIndex('field_nullable'), fd, ogr.ALTER_ALL_FLAG)
     if lyr.GetLayerDefn().GetFieldDefn(lyr.GetLayerDefn().GetFieldIndex('now_not_nullable')).IsNullable() != 0:
-        gdaltest.post_reason('fail')
         return 'fail'
 
     ds = None
@@ -2859,16 +2758,12 @@ def test_ogr_sqlite_37():
     ds = ogr.Open('tmp/ogr_sqlite_37.sqlite')
     lyr = ds.GetLayerByName('test')
     if lyr.GetLayerDefn().GetFieldDefn(lyr.GetLayerDefn().GetFieldIndex('now_not_nullable')).IsNullable() != 0:
-        gdaltest.post_reason('fail')
         return 'fail'
     if lyr.GetLayerDefn().GetFieldDefn(lyr.GetLayerDefn().GetFieldIndex('now_nullable')).IsNullable() != 1:
-        gdaltest.post_reason('fail')
         return 'fail'
     if lyr.GetLayerDefn().GetGeomFieldDefn(lyr.GetLayerDefn().GetGeomFieldIndex('geomfield_not_nullable')).IsNullable() != 0:
-        gdaltest.post_reason('fail')
         return 'fail'
     if lyr.GetLayerDefn().GetGeomFieldDefn(lyr.GetLayerDefn().GetGeomFieldIndex('geomfield_nullable')).IsNullable() != 1:
-        gdaltest.post_reason('fail')
         return 'fail'
     ds = None
 
@@ -2937,37 +2832,27 @@ def test_ogr_sqlite_38():
     ds = ogr.Open('tmp/ogr_sqlite_38.sqlite', update=1)
     lyr = ds.GetLayerByName('test')
     if lyr.GetLayerDefn().GetFieldDefn(lyr.GetLayerDefn().GetFieldIndex('field_string')).GetDefault() != "'a''b'":
-        gdaltest.post_reason('fail')
         return 'fail'
     if lyr.GetLayerDefn().GetFieldDefn(lyr.GetLayerDefn().GetFieldIndex('field_int')).GetDefault() != '123':
-        gdaltest.post_reason('fail')
         return 'fail'
     if lyr.GetLayerDefn().GetFieldDefn(lyr.GetLayerDefn().GetFieldIndex('field_real')).GetDefault() != '1.23':
-        gdaltest.post_reason('fail')
         return 'fail'
     if lyr.GetLayerDefn().GetFieldDefn(lyr.GetLayerDefn().GetFieldIndex('field_nodefault')).GetDefault() is not None:
-        gdaltest.post_reason('fail')
         return 'fail'
     if lyr.GetLayerDefn().GetFieldDefn(lyr.GetLayerDefn().GetFieldIndex('field_datetime')).GetDefault() != 'CURRENT_TIMESTAMP':
-        gdaltest.post_reason('fail')
         return 'fail'
     if lyr.GetLayerDefn().GetFieldDefn(lyr.GetLayerDefn().GetFieldIndex('field_datetime2')).GetDefault() != "'2015/06/30 12:34:56'":
-        gdaltest.post_reason('fail')
         print(lyr.GetLayerDefn().GetFieldDefn(lyr.GetLayerDefn().GetFieldIndex('field_datetime2')).GetDefault())
         return 'fail'
     if lyr.GetLayerDefn().GetFieldDefn(lyr.GetLayerDefn().GetFieldIndex('field_datetime3')).GetDefault() != "(strftime('%Y-%m-%dT%H:%M:%fZ','now'))":
-        gdaltest.post_reason('fail')
         print(lyr.GetLayerDefn().GetFieldDefn(lyr.GetLayerDefn().GetFieldIndex('field_datetime3')).GetDefault())
         return 'fail'
     if lyr.GetLayerDefn().GetFieldDefn(lyr.GetLayerDefn().GetFieldIndex('field_datetime4')).GetDefault() != "'2015/06/30 12:34:56.123'":
-        gdaltest.post_reason('fail')
         print(lyr.GetLayerDefn().GetFieldDefn(lyr.GetLayerDefn().GetFieldIndex('field_datetime4')).GetDefault())
         return 'fail'
     if lyr.GetLayerDefn().GetFieldDefn(lyr.GetLayerDefn().GetFieldIndex('field_date')).GetDefault() != "CURRENT_DATE":
-        gdaltest.post_reason('fail')
         return 'fail'
     if lyr.GetLayerDefn().GetFieldDefn(lyr.GetLayerDefn().GetFieldIndex('field_time')).GetDefault() != "CURRENT_TIME":
-        gdaltest.post_reason('fail')
         return 'fail'
     f = lyr.GetNextFeature()
     if f.GetField('field_string') != 'a\'b' or f.GetField('field_int') != 123 or \
@@ -2977,7 +2862,6 @@ def test_ogr_sqlite_38():
        f.GetField('field_datetime4') != '2015/06/30 12:34:56.123' or \
        not f.IsFieldSet('field_datetime3') or \
        not f.IsFieldSet('field_date') or not f.IsFieldSet('field_time'):
-        gdaltest.post_reason('fail')
         f.DumpReadable()
         return 'fail'
 
@@ -2987,7 +2871,6 @@ def test_ogr_sqlite_38():
     fd.SetDefault("'c'")
     lyr.AlterFieldDefn(lyr.GetLayerDefn().GetFieldIndex('field_string'), fd, ogr.ALTER_DEFAULT_FLAG)
     if lyr.GetLayerDefn().GetFieldDefn(lyr.GetLayerDefn().GetFieldIndex('field_string')).GetDefault() != "'c'":
-        gdaltest.post_reason('fail')
         print(lyr.GetLayerDefn().GetFieldDefn(lyr.GetLayerDefn().GetFieldIndex('field_string')).GetDefault())
         return 'fail'
 
@@ -2997,7 +2880,6 @@ def test_ogr_sqlite_38():
     fd.SetDefault(None)
     lyr.AlterFieldDefn(lyr.GetLayerDefn().GetFieldIndex('field_int'), fd, ogr.ALTER_DEFAULT_FLAG)
     if lyr.GetLayerDefn().GetFieldDefn(lyr.GetLayerDefn().GetFieldIndex('field_int')).GetDefault() is not None:
-        gdaltest.post_reason('fail')
         return 'fail'
 
     ds = None
@@ -3005,11 +2887,9 @@ def test_ogr_sqlite_38():
     ds = ogr.Open('tmp/ogr_sqlite_38.sqlite', update=1)
     lyr = ds.GetLayerByName('test')
     if lyr.GetLayerDefn().GetFieldDefn(lyr.GetLayerDefn().GetFieldIndex('field_string')).GetDefault() != "'c'":
-        gdaltest.post_reason('fail')
         print(lyr.GetLayerDefn().GetFieldDefn(lyr.GetLayerDefn().GetFieldIndex('field_string')).GetDefault())
         return 'fail'
     if lyr.GetLayerDefn().GetFieldDefn(lyr.GetLayerDefn().GetFieldIndex('field_int')).GetDefault() is not None:
-        gdaltest.post_reason('fail')
         return 'fail'
 
     ds = None
@@ -3075,16 +2955,12 @@ def test_ogr_spatialite_10():
     ds = ogr.Open('tmp/ogr_spatialite_10.sqlite')
     lyr = ds.GetLayerByName('test')
     if lyr.GetLayerDefn().GetFieldDefn(lyr.GetLayerDefn().GetFieldIndex('field_not_nullable')).IsNullable() != 0:
-        gdaltest.post_reason('fail')
         return 'fail'
     if lyr.GetLayerDefn().GetFieldDefn(lyr.GetLayerDefn().GetFieldIndex('field_nullable')).IsNullable() != 1:
-        gdaltest.post_reason('fail')
         return 'fail'
     if lyr.GetLayerDefn().GetGeomFieldDefn(lyr.GetLayerDefn().GetGeomFieldIndex('geomfield_not_nullable')).IsNullable() != 0:
-        gdaltest.post_reason('fail')
         return 'fail'
     if lyr.GetLayerDefn().GetGeomFieldDefn(lyr.GetLayerDefn().GetGeomFieldIndex('geomfield_nullable')).IsNullable() != 1:
-        gdaltest.post_reason('fail')
         return 'fail'
     ds = None
 
@@ -3107,12 +2983,10 @@ def test_ogr_sqlite_39():
     ret = lyr.CreateField(ogr.FieldDefn('myfid', ogr.OFTString))
     gdal.PopErrorHandler()
     if ret == 0:
-        gdaltest.post_reason('fail')
         return 'fail'
 
     ret = lyr.CreateField(ogr.FieldDefn('myfid', ogr.OFTInteger))
     if ret != 0:
-        gdaltest.post_reason('fail')
         return 'fail'
     lyr.CreateField(ogr.FieldDefn('str2', ogr.OFTString))
 
@@ -3122,31 +2996,25 @@ def test_ogr_sqlite_39():
     feat.SetField('str2', 'second string')
     ret = lyr.CreateFeature(feat)
     if ret != 0:
-        gdaltest.post_reason('fail')
         return 'fail'
     if feat.GetFID() != 10:
-        gdaltest.post_reason('fail')
         return 'fail'
 
     feat = ogr.Feature(lyr.GetLayerDefn())
     feat.SetField('str2', 'second string')
     ret = lyr.CreateFeature(feat)
     if ret != 0:
-        gdaltest.post_reason('fail')
         return 'fail'
     if feat.GetFID() < 0:
-        gdaltest.post_reason('fail')
         feat.DumpReadable()
         return 'fail'
     if feat.GetField('myfid') != feat.GetFID():
-        gdaltest.post_reason('fail')
         feat.DumpReadable()
         return 'fail'
 
     feat.SetField('str', 'foo')
     ret = lyr.SetFeature(feat)
     if ret != 0:
-        gdaltest.post_reason('fail')
         return 'fail'
 
     feat = ogr.Feature(lyr.GetLayerDefn())
@@ -3156,14 +3024,12 @@ def test_ogr_sqlite_39():
     ret = lyr.CreateFeature(feat)
     gdal.PopErrorHandler()
     if ret == 0:
-        gdaltest.post_reason('fail')
         return 'fail'
 
     gdal.PushErrorHandler()
     ret = lyr.SetFeature(feat)
     gdal.PopErrorHandler()
     if ret == 0:
-        gdaltest.post_reason('fail')
         return 'fail'
 
     feat.UnsetField('myfid')
@@ -3171,13 +3037,11 @@ def test_ogr_sqlite_39():
     ret = lyr.SetFeature(feat)
     gdal.PopErrorHandler()
     if ret == 0:
-        gdaltest.post_reason('fail')
         return 'fail'
 
     lyr.ResetReading()
     f = lyr.GetNextFeature()
     if f.GetFID() != 10 or f.GetField('str') != 'first string' or f.GetField('str2') != 'second string' or f.GetField('myfid') != 10:
-        gdaltest.post_reason('fail')
         f.DumpReadable()
         return 'fail'
     f = None
@@ -3204,66 +3068,55 @@ def test_ogr_sqlite_40():
     ds = ogr.GetDriverByName('SQLite').CreateDataSource('/vsimem/ogr_sqlite_40.sqlite', options=options)
 
     if ds.TestCapability(ogr.ODsCTransactions) != 1:
-        gdaltest.post_reason('fail')
         return 'fail'
 
     ret = ds.StartTransaction()
     if ret != 0:
-        gdaltest.post_reason('fail')
         return 'fail'
     gdal.PushErrorHandler()
     ret = ds.StartTransaction()
     gdal.PopErrorHandler()
     if ret == 0:
-        gdaltest.post_reason('fail')
         return 'fail'
 
     lyr = ds.CreateLayer('test', geom_type=ogr.wkbPoint)
     lyr.CreateField(ogr.FieldDefn('foo', ogr.OFTString))
     ret = ds.RollbackTransaction()
     if ret != 0:
-        gdaltest.post_reason('fail')
         return 'fail'
     gdal.PushErrorHandler()
     ret = ds.RollbackTransaction()
     gdal.PopErrorHandler()
     if ret == 0:
-        gdaltest.post_reason('fail')
         return 'fail'
     ds = None
 
     ds = ogr.Open('/vsimem/ogr_sqlite_40.sqlite', update=1)
     if ds.GetLayerCount() != 0:
-        gdaltest.post_reason('fail')
         return 'fail'
     ret = ds.StartTransaction()
     if ret != 0:
-        gdaltest.post_reason('fail')
         return 'fail'
     gdal.PushErrorHandler()
     ret = ds.StartTransaction()
     gdal.PopErrorHandler()
     if ret == 0:
-        gdaltest.post_reason('fail')
         return 'fail'
 
     lyr = ds.CreateLayer('test', geom_type=ogr.wkbPoint)
     lyr.CreateField(ogr.FieldDefn('foo', ogr.OFTString))
     ret = ds.CommitTransaction()
     if ret != 0:
-        gdaltest.post_reason('fail')
         return 'fail'
     gdal.PushErrorHandler()
     ret = ds.CommitTransaction()
     gdal.PopErrorHandler()
     if ret == 0:
-        gdaltest.post_reason('fail')
         return 'fail'
     ds = None
 
     ds = ogr.Open('/vsimem/ogr_sqlite_40.sqlite', update=1)
     if ds.GetLayerCount() != 1:
-        gdaltest.post_reason('fail')
         return 'fail'
     lyr = ds.GetLayerByName('test')
 
@@ -3272,14 +3125,11 @@ def test_ogr_sqlite_40():
     lyr.ResetReading()
     f = lyr.GetNextFeature()
     if f is None:
-        gdaltest.post_reason('fail')
         return 'fail'
     if lyr.GetFeatureCount() != 1:
-        gdaltest.post_reason('fail')
         return 'fail'
     ds.RollbackTransaction()
     if lyr.GetFeatureCount() != 0:
-        gdaltest.post_reason('fail')
         return 'fail'
 
     ds.StartTransaction()
@@ -3288,16 +3138,13 @@ def test_ogr_sqlite_40():
     lyr.ResetReading()
     f = lyr.GetNextFeature()
     if f is None or f.GetFID() != 1:
-        gdaltest.post_reason('fail')
         return 'fail'
     ds.CommitTransaction()
     # the cursor is still valid after CommitTransaction(), which isn't the case for other backends such as PG !
     f = lyr.GetNextFeature()
     if f is None or f.GetFID() != 2:
-        gdaltest.post_reason('fail')
         return 'fail'
     if lyr.GetFeatureCount() != 2:
-        gdaltest.post_reason('fail')
         return 'fail'
 
     ds.StartTransaction()
@@ -3309,7 +3156,6 @@ def test_ogr_sqlite_40():
     ret = lyr.CreateFeature(f)
     ds.CommitTransaction()
     if ret != 0:
-        gdaltest.post_reason('fail')
         return 'fail'
 
     ds.StartTransaction()
@@ -3318,7 +3164,6 @@ def test_ogr_sqlite_40():
     ret = lyr.CreateFeature(f)
     ds.CommitTransaction()
     if ret != 0:
-        gdaltest.post_reason('fail')
         return 'fail'
 
     ds.StartTransaction()
@@ -3341,7 +3186,6 @@ def test_ogr_sqlite_40():
     ret = lyr.CreateFeature(f)
     ds.CommitTransaction()
     if ret != 0:
-        gdaltest.post_reason('fail')
         return 'fail'
 
     ds = None
@@ -3367,7 +3211,6 @@ def test_ogr_sqlite_41():
     lyr = ds.GetLayer(0)
     f = lyr.GetNextFeature()
     if f['a_date'] != '2015/04/30 12:34:56':
-        gdaltest.post_reason('fail')
         return 'fail'
 
     ds = None
@@ -3397,7 +3240,6 @@ def test_ogr_sqlite_42():
     sql_lyr.SetAttributeFilter('id = 1')
     f = sql_lyr.GetNextFeature()
     if f is None:
-        gdaltest.post_reason('fail')
         return 'fail'
     ds.ReleaseResultSet(sql_lyr)
 
@@ -3405,7 +3247,6 @@ def test_ogr_sqlite_42():
     sql_lyr.SetAttributeFilter('id = 1')
     f = sql_lyr.GetNextFeature()
     if f is None:
-        gdaltest.post_reason('fail')
         return 'fail'
     ds.ReleaseResultSet(sql_lyr)
 
@@ -3420,7 +3261,6 @@ def test_ogr_sqlite_42():
     sql_lyr.SetAttributeFilter('id = 1')
     f = sql_lyr.GetNextFeature()
     if f is None:
-        gdaltest.post_reason('fail')
         return 'fail'
     ds.ReleaseResultSet(sql_lyr)
 
@@ -3429,7 +3269,6 @@ def test_ogr_sqlite_42():
     sql_lyr.SetAttributeFilter('id = 1')
     f = sql_lyr.GetNextFeature()
     if f is None:
-        gdaltest.post_reason('fail')
         return 'fail'
     ds.ReleaseResultSet(sql_lyr)
 
@@ -3479,13 +3318,11 @@ def test_ogr_sqlite_44():
 
     f = gdal.VSIFOpenL('/vsimem/ogr_sqlite_44_out.csv', 'rb')
     if f is None:
-        gdaltest.post_reason('fail')
         return 'fail'
     data = gdal.VSIFReadL(1, 10000, f).decode('ascii')
     gdal.VSIFCloseL(f)
 
     if data.find('stringlist,intlist,int64list,reallist,wkt\n"[ ""a"", """" ]",[ 1 ],[ 1234567890123 ],[ 0.125') != 0:
-        gdaltest.post_reason('fail')
         print(data)
         return 'fail'
 
@@ -3494,7 +3331,6 @@ def test_ogr_sqlite_44():
     gdal.VSIFCloseL(f)
 
     if data.find('JSonStringList,JSonIntegerList,JSonInteger64List,JSonRealList') != 0:
-        gdaltest.post_reason('fail')
         print(data)
         return 'fail'
 
@@ -3526,20 +3362,17 @@ def test_ogr_sqlite_45():
     sql_lyr = ds.ExecuteSQL('SELECT * FROM sqlite_master')
     ds.ReleaseResultSet(sql_lyr)
     if not os.path.exists('tmp/ogr_sqlite_45.db-wal'):
-        gdaltest.post_reason('fail')
         return 'fail'
     shutil.copy('tmp/ogr_sqlite_45.db', 'tmp/ogr_sqlite_45_bis.db')
     shutil.copy('tmp/ogr_sqlite_45.db-shm', 'tmp/ogr_sqlite_45_bis.db-shm')
     shutil.copy('tmp/ogr_sqlite_45.db-wal', 'tmp/ogr_sqlite_45_bis.db-wal')
     ds = None
     if os.path.exists('tmp/ogr_sqlite_45.db-wal'):
-        gdaltest.post_reason('fail')
         return 'fail'
 
     ds = ogr.Open('tmp/ogr_sqlite_45_bis.db')
     ds = None
     if os.path.exists('tmp/ogr_sqlite_45_bis.db-wal'):
-        gdaltest.post_reason('fail')
         return 'fail'
 
     gdal.Unlink('tmp/ogr_sqlite_45.db')
@@ -3568,7 +3401,6 @@ def test_ogr_spatialite_11():
     with gdaltest.error_handler():
         res = lyr.CreateGeomField(ogr.GeomFieldDefn('foo', ogr.wkbCurvePolygon))
     if res == 0:
-        gdaltest.post_reason('fail')
         return 'fail'
 
     ds = None
@@ -3593,7 +3425,6 @@ def test_ogr_spatialite_12():
     lyr = ds.GetLayer(0)
     f = lyr.GetNextFeature()
     if f is None:
-        gdaltest.post_reason('fail')
         return 'fail'
 
     return 'success'
diff --git a/autotest/ogr/ogr_style.py b/autotest/ogr/ogr_style.py
index 2864c32186d3..a6aeb91e3290 100755
--- a/autotest/ogr/ogr_style.py
+++ b/autotest/ogr/ogr_style.py
@@ -49,11 +49,9 @@ def test_ogr_style_styletable():
     ret = style_table.SaveStyleTable('/nonexistingdir/nonexistingfile')
     gdal.PopErrorHandler()
     if ret != 0:
-        gdaltest.post_reason('failure')
         print(ret)
         return 'fail'
     if style_table.SaveStyleTable("/vsimem/out.txt") != 1:
-        gdaltest.post_reason('failure')
         return 'fail'
     style_table = None
 
@@ -62,10 +60,8 @@ def test_ogr_style_styletable():
     ret = style_table.LoadStyleTable('/nonexistent')
     gdal.PopErrorHandler()
     if ret != 0:
-        gdaltest.post_reason('failure')
         return 'fail'
     if style_table.LoadStyleTable('/vsimem/out.txt') != 1:
-        gdaltest.post_reason('failure')
         return 'fail'
 
     gdal.Unlink('/vsimem/out.txt')
@@ -74,63 +70,51 @@ def test_ogr_style_styletable():
     ret = style_table.Find("non_existing_style")
     gdal.PopErrorHandler()
     if ret is not None:
-        gdaltest.post_reason('failure')
         return 'fail'
 
     if style_table.Find("style1_normal") != 'SYMBOL(id:"http://style1_normal",c:#67452301)':
-        gdaltest.post_reason('failure')
         return 'fail'
 
     style = style_table.GetNextStyle()
     if style != 'SYMBOL(id:"http://style1_normal",c:#67452301)':
-        gdaltest.post_reason('failure')
         return 'fail'
     style_name = style_table.GetLastStyleName()
     if style_name != 'style1_normal':
-        gdaltest.post_reason('failure')
         return 'fail'
 
     style = style_table.GetNextStyle()
     if style is not None:
-        gdaltest.post_reason('failure')
         return 'fail'
 
     style_table.ResetStyleStringReading()
     style = style_table.GetNextStyle()
     if style is None:
-        gdaltest.post_reason('failure')
         return 'fail'
 
     # GetStyleTable()/SetStyleTable() on data source
     ds = ogr.GetDriverByName('Memory').CreateDataSource('')
     if ds.GetStyleTable() is not None:
-        gdaltest.post_reason('failure')
         return 'fail'
     ds.SetStyleTable(None)
     if ds.GetStyleTable() is not None:
-        gdaltest.post_reason('failure')
         return 'fail'
     ds.SetStyleTable(style_table)
     style_table2 = ds.GetStyleTable()
     style = style_table2.GetNextStyle()
     if style != 'SYMBOL(id:"http://style1_normal",c:#67452301)':
-        gdaltest.post_reason('failure')
         return 'fail'
 
     # GetStyleTable()/SetStyleTable() on layer
     lyr = ds.CreateLayer('foo')
     if lyr.GetStyleTable() is not None:
-        gdaltest.post_reason('failure')
         return 'fail'
     lyr.SetStyleTable(None)
     if lyr.GetStyleTable() is not None:
-        gdaltest.post_reason('failure')
         return 'fail'
     lyr.SetStyleTable(style_table)
     style_table2 = lyr.GetStyleTable()
     style = style_table2.GetNextStyle()
     if style != 'SYMBOL(id:"http://style1_normal",c:#67452301)':
-        gdaltest.post_reason('failure')
         return 'fail'
 
     ds = None
diff --git a/autotest/ogr/ogr_tiger.py b/autotest/ogr/ogr_tiger.py
index 1e2def835c06..e4f33cb5509e 100755
--- a/autotest/ogr/ogr_tiger.py
+++ b/autotest/ogr/ogr_tiger.py
@@ -66,14 +66,12 @@ def test_ogr_tiger_1():
 
     ogrtest.tiger_ds = ogr.Open('tmp/cache/TGR01001')
     if ogrtest.tiger_ds is None:
-        gdaltest.post_reason('fail')
         return 'fail'
 
     ogrtest.tiger_ds = None
     # also test opening with a filename (#4443)
     ogrtest.tiger_ds = ogr.Open('tmp/cache/TGR01001/TGR01001.RT1')
     if ogrtest.tiger_ds is None:
-        gdaltest.post_reason('fail')
         return 'fail'
 
     # Check a few features.
@@ -202,7 +200,6 @@ def test_ogr_tiger_4():
     # also test opening with a filename (#4443)
     ogrtest.tiger_ds = ogr.Open('tmp/cache/TGR01001/TGR01001.RT1')
     if ogrtest.tiger_ds is None:
-        gdaltest.post_reason('fail')
         return 'fail'
 
     # Check a few features.
diff --git a/autotest/ogr/ogr_vdv.py b/autotest/ogr/ogr_vdv.py
index 471f66f0e61e..2a2435f9072f 100755
--- a/autotest/ogr/ogr_vdv.py
+++ b/autotest/ogr/ogr_vdv.py
@@ -48,28 +48,24 @@ def test_ogr_idf_1():
     lyr = ds.GetLayer(0)
     f = lyr.GetNextFeature()
     if f['NODE_ID'] != 1 or f['foo'] != 'U' or f.GetGeometryRef().ExportToWkt() != 'POINT (2 49)':
-        gdaltest.post_reason('fail')
         f.DumpReadable()
         return 'fail'
 
     lyr = ds.GetLayer(1)
     f = lyr.GetNextFeature()
     if f.GetGeometryRef().ExportToWkt() != 'LINESTRING (2 49,2.5 49.5,2.7 49.7,3 50)':
-        gdaltest.post_reason('fail')
         f.DumpReadable()
         return 'fail'
 
     lyr = ds.GetLayer(2)
     f = lyr.GetNextFeature()
     if f.GetGeometryRef().ExportToWkt() != 'POINT (2.5 49.5)':
-        gdaltest.post_reason('fail')
         f.DumpReadable()
         return 'fail'
 
     lyr = ds.GetLayer(3)
     f = lyr.GetNextFeature()
     if f['FOO'] != 1:
-        gdaltest.post_reason('fail')
         f.DumpReadable()
         return 'fail'
 
@@ -95,28 +91,24 @@ def test_ogr_idf_3d():
     lyr = ds.GetLayer(0)
     f = lyr.GetNextFeature()
     if f['NODE_ID'] != 1 or f['foo'] != 'U' or f.GetGeometryRef().ExportToWkt() != 'POINT (2 49 10)':
-        gdaltest.post_reason('fail')
         f.DumpReadable()
         return 'fail'
 
     lyr = ds.GetLayer(1)
     f = lyr.GetNextFeature()
     if f.GetGeometryRef().ExportToWkt() != 'LINESTRING (2 49 10,2.5 49.5 10,2.7 49.7 20,3 50 20)':
-        gdaltest.post_reason('fail')
         f.DumpReadable()
         return 'fail'
 
     lyr = ds.GetLayer(2)
     f = lyr.GetNextFeature()
     if f.GetGeometryRef().ExportToWkt() != 'POINT (2.5 49.5 10)':
-        gdaltest.post_reason('fail')
         f.DumpReadable()
         return 'fail'
 
     lyr = ds.GetLayer(3)
     f = lyr.GetNextFeature()
     if f['FOO'] != 1:
-        gdaltest.post_reason('fail')
         f.DumpReadable()
         return 'fail'
 
@@ -260,7 +252,6 @@ def test_ogr_vdv_2(src_filename='tmp/test.x10'):
     gdal.VSIFCloseL(f)
 
     if got != expected:
-        gdaltest.post_reason('fail')
         print(got)
         return 'fail'
 
@@ -348,7 +339,6 @@ def test_ogr_vdv_7():
         if f[longname] != -1234556789 or \
            f[latname] != -234556789 or \
            ogrtest.check_feature_geometry(f, 'POINT (-123.765774722222 -23.7657747222222)') != 0:
-            gdaltest.post_reason('fail')
             f.DumpReadable()
             return 'fail'
         ds = None
@@ -365,13 +355,10 @@ def test_ogr_vdv_7():
         lyr = ds.CreateLayer('UNKNOWN', options=['PROFILE=' + profile, 'PROFILE_STRICT=' + str(strict)])
         gdal.PopErrorHandler()
         if gdal.GetLastErrorMsg() == '':
-            gdaltest.post_reason('fail')
             return 'fail'
         if strict and lyr is not None:
-            gdaltest.post_reason('fail')
             return 'fail'
         elif not strict and lyr is None:
-            gdaltest.post_reason('fail')
             return 'fail'
 
         if profile == 'VDV-452-GERMAN':
@@ -384,13 +371,10 @@ def test_ogr_vdv_7():
         ret = lyr.CreateField(ogr.FieldDefn('UNKNOWN'))
         gdal.PopErrorHandler()
         if gdal.GetLastErrorMsg() == '':
-            gdaltest.post_reason('fail')
             return 'fail'
         if strict and ret == 0:
-            gdaltest.post_reason('fail')
             return 'fail'
         elif not strict and ret != 0:
-            gdaltest.post_reason('fail')
             return 'fail'
 
         ds = None
@@ -409,14 +393,12 @@ def test_ogr_vdv_8():
     ds = ogr.GetDriverByName('VDV').CreateDataSource('/does/not_exist')
     gdal.PopErrorHandler()
     if ds is not None:
-        gdaltest.post_reason('fail')
         return 'fail'
 
     gdal.PushErrorHandler()
     ds = ogr.GetDriverByName('VDV').CreateDataSource('/does/not_exist', options=['SINGLE_FILE=FALSE'])
     gdal.PopErrorHandler()
     if ds is not None:
-        gdaltest.post_reason('fail')
         return 'fail'
 
     # Add layer in non writable directory
@@ -441,7 +423,6 @@ def test_ogr_vdv_8():
             ds = None
             shutil.rmtree('tmp/ogr_vdv_8')
             if lyr is not None:
-                gdaltest.post_reason('fail')
                 return 'fail'
 
     out_filename = '/vsimem/vdv/ogr_vdv_8.x10'
@@ -452,19 +433,15 @@ def test_ogr_vdv_8():
     ds2 = ogr.GetDriverByName('VDV').CreateDataSource(out_filename)
     gdal.PopErrorHandler()
     if ds2 is not None:
-        gdaltest.post_reason('fail')
         return 'fail'
 
     if ds.TestCapability(ogr.ODsCCreateLayer) != 1:
-        gdaltest.post_reason('fail')
         return 'fail'
 
     lyr1 = ds.CreateLayer("lyr1")
     if lyr1.TestCapability(ogr.OLCSequentialWrite) != 1:
-        gdaltest.post_reason('fail')
         return 'fail'
     if lyr1.TestCapability(ogr.OLCCreateField) != 1:
-        gdaltest.post_reason('fail')
         return 'fail'
 
     lyr1.ResetReading()
@@ -477,14 +454,12 @@ def test_ogr_vdv_8():
 
     # Layer structure is now frozen
     if lyr1.TestCapability(ogr.OLCCreateField) != 0:
-        gdaltest.post_reason('fail')
         return 'fail'
 
     gdal.PushErrorHandler()
     ret = lyr1.CreateField(ogr.FieldDefn('not_allowed'))
     gdal.PopErrorHandler()
     if ret == 0:
-        gdaltest.post_reason('fail')
         return 'fail'
 
     lyr2 = ds.CreateLayer("lyr2")
@@ -493,18 +468,15 @@ def test_ogr_vdv_8():
     # Test interleaved writing
 
     if lyr1.TestCapability(ogr.OLCSequentialWrite) != 0:
-        gdaltest.post_reason('fail')
         return 'fail'
 
     gdal.PushErrorHandler()
     ret = lyr1.CreateFeature(ogr.Feature(lyr1.GetLayerDefn()))
     gdal.PopErrorHandler()
     if ret == 0:
-        gdaltest.post_reason('fail')
         return 'fail'
 
     if lyr1.GetFeatureCount() != 1:
-        gdaltest.post_reason('fail')
         return 'fail'
 
     ds = None
@@ -537,7 +509,6 @@ def test_ogr_vdv_8():
     gdal.VSIFCloseL(f)
 
     if got != expected:
-        gdaltest.post_reason('fail')
         print(got)
         return 'fail'
 
@@ -546,14 +517,12 @@ def test_ogr_vdv_8():
     for i in range(2):
         lyr = ds.GetLayer(i)
         if lyr.GetFeatureCount() != 1:
-            gdaltest.post_reason('fail')
             return 'fail'
         lyr.ResetReading()
         fc = 0
         for f in lyr:
             fc += 1
         if fc != 1:
-            gdaltest.post_reason('fail')
             return 'fail'
         lyr = None
     ds = None
@@ -574,7 +543,6 @@ def test_ogr_vdv_8():
     gdal.VSIFCloseL(f)
 
     if got != expected:
-        gdaltest.post_reason('fail')
         print(got)
         return 'fail'
 
diff --git a/autotest/ogr/ogr_virtualogr.py b/autotest/ogr/ogr_virtualogr.py
index f7775cc21260..ad2f8365ebb2 100755
--- a/autotest/ogr/ogr_virtualogr.py
+++ b/autotest/ogr/ogr_virtualogr.py
@@ -77,65 +77,51 @@ def test_ogr_virtualogr_1():
 
     # Invalid syntax
     if ogr_virtualogr_run_sql("CREATE VIRTUAL TABLE poly USING VirtualOGR()"):
-        gdaltest.post_reason('failed')
         return 'fail'
 
     # Nonexistent dataset
     if ogr_virtualogr_run_sql("CREATE VIRTUAL TABLE poly USING VirtualOGR('foo')"):
-        gdaltest.post_reason('failed')
         return 'fail'
 
     # Dataset with 0 layer
     if ogr_virtualogr_run_sql("CREATE VIRTUAL TABLE poly USING VirtualOGR('<OGRVRTDataSource></OGRVRTDataSource>')"):
-        gdaltest.post_reason('failed')
         return 'fail'
 
     # Dataset with more than 1 layer
     if ogr_virtualogr_run_sql("CREATE VIRTUAL TABLE poly USING VirtualOGR('data')"):
-        gdaltest.post_reason('failed')
         return 'fail'
 
     if not ogr_virtualogr_run_sql("CREATE VIRTUAL TABLE poly USING VirtualOGR('data/poly.shp')"):
-        gdaltest.post_reason('failed')
         return 'fail'
 
     if not ogr_virtualogr_run_sql("CREATE VIRTUAL TABLE poly USING VirtualOGR('data/poly.shp', 0)"):
-        gdaltest.post_reason('failed')
         return 'fail'
 
     if not ogr_virtualogr_run_sql("CREATE VIRTUAL TABLE poly USING VirtualOGR('data/poly.shp', 1)"):
-        gdaltest.post_reason('failed')
         return 'fail'
 
     # Invalid value for update_mode
     if ogr_virtualogr_run_sql("CREATE VIRTUAL TABLE poly USING VirtualOGR('data/poly.shp', 'foo')"):
-        gdaltest.post_reason('failed')
         return 'fail'
 
     # Nonexistent layer
     if ogr_virtualogr_run_sql("CREATE VIRTUAL TABLE poly USING VirtualOGR('data/poly.shp', 0, 'foo')"):
-        gdaltest.post_reason('failed')
         return 'fail'
 
     if not ogr_virtualogr_run_sql("CREATE VIRTUAL TABLE poly USING VirtualOGR('data/poly.shp', 0, 'poly')"):
-        gdaltest.post_reason('failed')
         return 'fail'
 
     if not ogr_virtualogr_run_sql("CREATE VIRTUAL TABLE poly USING VirtualOGR('data/poly.shp', 0, 'poly', 0)"):
-        gdaltest.post_reason('failed')
         return 'fail'
 
     if not ogr_virtualogr_run_sql("CREATE VIRTUAL TABLE poly USING VirtualOGR('data/poly.shp', 0, 'poly', 1)"):
-        gdaltest.post_reason('failed')
         return 'fail'
 
     if not ogr_virtualogr_run_sql("CREATE VIRTUAL TABLE poly USING VirtualOGR('data/poly.shp', 0, 'poly', 1, 1)"):
-        gdaltest.post_reason('failed')
         return 'fail'
 
     # Too many arguments
     if ogr_virtualogr_run_sql("CREATE VIRTUAL TABLE poly USING VirtualOGR('data/poly.shp', 0, 'poly', 1, 1, bla)"):
-        gdaltest.post_reason('failed')
         return 'fail'
 
     return 'success'
@@ -159,7 +145,6 @@ def test_ogr_virtualogr_2():
     ds = ogr.Open('/vsimem/ogr_virtualogr_2.db')
     for i in range(ds.GetLayerCount()):
         if ds.GetLayer(i).GetName() == 'foo':
-            gdaltest.post_reason('fail')
             return 'fail'
     ds = None
 
@@ -172,7 +157,6 @@ def test_ogr_virtualogr_2():
         if ds.GetLayer(i).GetName() == 'foo':
             found = True
     if not found:
-        gdaltest.post_reason('fail')
         return 'fail'
     ds = None
 
@@ -187,7 +171,6 @@ def test_ogr_virtualogr_2():
     ds = ogr.Open('/vsimem/ogr_virtualogr_2.db')
     for i in range(ds.GetLayerCount()):
         if ds.GetLayer(i).GetName() == 'foo':
-            gdaltest.post_reason('fail')
             return 'fail'
     # An error will be triggered at the time the trigger is used
     gdal.PushErrorHandler('CPLQuietErrorHandler')
@@ -285,7 +268,6 @@ def test_ogr_virtualogr_4():
     gdal.Unlink('/vsimem/ogr_virtualogr_4.db')
 
     if ret != 10:
-        gdaltest.post_reason('fail')
         return 'fail'
 
     ds = ogr.GetDriverByName('SQLite').CreateDataSource('/vsimem/ogr_virtualogr_4.db')
@@ -298,7 +280,6 @@ def test_ogr_virtualogr_4():
     gdal.Unlink('/vsimem/ogr_virtualogr_4.db')
 
     if ret != 10:
-        gdaltest.post_reason('fail')
         return 'fail'
 
     ds = ogr.GetDriverByName('SQLite').CreateDataSource('/vsimem/ogr_virtualogr_4.db')
@@ -311,7 +292,6 @@ def test_ogr_virtualogr_4():
     gdal.Unlink('/vsimem/ogr_virtualogr_4.db')
 
     if ret != 10:
-        gdaltest.post_reason('fail')
         return 'fail'
 
     # Various error conditions
diff --git a/autotest/ogr/ogr_vrt.py b/autotest/ogr/ogr_vrt.py
index cd99dae7bcb5..c9738154e34b 100755
--- a/autotest/ogr/ogr_vrt.py
+++ b/autotest/ogr/ogr_vrt.py
@@ -387,19 +387,15 @@ def test_ogr_vrt_11():
 
     # Only val1, val2, style attributes should be reported
     if vrt_lyr.GetLayerDefn().GetFieldCount() != 3:
-        gdaltest.post_reason('failure')
         print(vrt_lyr.GetLayerDefn().GetFieldCount())
         return 'fail'
     if vrt_lyr.GetLayerDefn().GetFieldDefn(0).GetNameRef() != 'val1':
-        gdaltest.post_reason('failure')
         return 'fail'
     if vrt_lyr.GetLayerDefn().GetFieldDefn(1).GetNameRef() != 'val2':
-        gdaltest.post_reason('failure')
         return 'fail'
 
     feat = vrt_lyr.GetNextFeature()
     if feat.GetStyleString() != 'PEN(c:#FF0000,w:5pt,p:"2px 1pt")':
-        gdaltest.post_reason('failure')
         feat.DumpReadable()
         return 'fail'
 
@@ -413,11 +409,9 @@ def test_ogr_vrt_11():
     feat = vrt_lyr.GetFeature(2)
     geom = feat.GetGeometryRef()
     if geom.ExportToWkt() != 'POINT (3 50)':
-        gdaltest.post_reason('failure')
         feat.DumpReadable()
         return 'fail'
     if feat.GetFieldAsString('val1') != 'val21':
-        gdaltest.post_reason('failure')
         return 'fail'
 
     # The x and y fields are considered as string by default, so spatial
@@ -427,10 +421,8 @@ def test_ogr_vrt_11():
     ret = vrt_lyr.GetFeatureCount()
     gdal.PopErrorHandler()
     if gdal.GetLastErrorMsg().find('not declared as numeric fields') == -1:
-        gdaltest.post_reason('failure')
         return 'fail'
     if ret != 1:
-        gdaltest.post_reason('failure')
         return 'fail'
 
     vrt_ds = None
@@ -444,20 +436,16 @@ def test_ogr_vrt_11():
     vrt_lyr = vrt_ds.GetLayerByName('test')
     vrt_lyr.SetSpatialFilterRect(0, 40, 10, 49.5)
     if vrt_lyr.GetFeatureCount() != 1:
-        gdaltest.post_reason('failure')
         return 'fail'
     if gdal.GetLastErrorMsg() != '':
-        gdaltest.post_reason('failure')
         return 'fail'
 
     vrt_lyr.SetAttributeFilter("1 = 1")
     if vrt_lyr.GetFeatureCount() != 1:
-        gdaltest.post_reason('failure')
         return 'fail'
 
     vrt_lyr.SetAttributeFilter("1 = 0")
     if vrt_lyr.GetFeatureCount() != 0:
-        gdaltest.post_reason('failure')
         return 'fail'
 
     vrt_ds = None
@@ -1049,7 +1037,6 @@ def test_ogr_vrt_20():
     feat = vrt_lyr.GetNextFeature()
     if feat.GetGeometryRef() is None or \
        feat.GetGeometryRef().ExportToWkt() != 'POINT (1 2)':
-        gdaltest.post_reason('fail')
         feat.DumpReadable()
         return 'fail'
 
@@ -1070,21 +1057,18 @@ def ogr_vrt_21_internal():
     ds = ogr.Open('data/vrt_test.vrt')
     lyr = ds.GetLayerByName('test3')
     if lyr.GetName() != 'test3':
-        gdaltest.post_reason('fail')
         return 'fail'
     ds = None
 
     ds = ogr.Open('data/vrt_test.vrt')
     lyr = ds.GetLayerByName('test3')
     if lyr.GetGeomType() != ogr.wkbPoint:
-        gdaltest.post_reason('fail')
         return 'fail'
     ds = None
 
     ds = ogr.Open('data/vrt_test.vrt')
     lyr = ds.GetLayerByName('test3')
     if lyr.GetSpatialRef().ExportToWkt().find('84') == -1:
-        gdaltest.post_reason('fail')
         return 'fail'
     ds = None
 
@@ -1096,42 +1080,36 @@ def ogr_vrt_21_internal():
     ds = ogr.Open('data/vrt_test.vrt')
     lyr = ds.GetLayerByName('test3')
     if lyr.GetNextFeature() is None:
-        gdaltest.post_reason('fail')
         return 'fail'
     ds = None
 
     ds = ogr.Open('data/vrt_test.vrt')
     lyr = ds.GetLayerByName('test3')
     if lyr.GetFeature(1) is None:
-        gdaltest.post_reason('fail')
         return 'fail'
     ds = None
 
     ds = ogr.Open('data/vrt_test.vrt')
     lyr = ds.GetLayerByName('test3')
     if lyr.GetFeatureCount() == 0:
-        gdaltest.post_reason('fail')
         return 'fail'
     ds = None
 
     ds = ogr.Open('data/vrt_test.vrt')
     lyr = ds.GetLayerByName('test3')
     if lyr.SetNextByIndex(1) != 0:
-        gdaltest.post_reason('fail')
         return 'fail'
     ds = None
 
     ds = ogr.Open('data/vrt_test.vrt')
     lyr = ds.GetLayerByName('test3')
     if lyr.GetLayerDefn().GetFieldCount() == 0:
-        gdaltest.post_reason('fail')
         return 'fail'
     ds = None
 
     ds = ogr.Open('data/vrt_test.vrt')
     lyr = ds.GetLayerByName('test3')
     if lyr.SetAttributeFilter('') != 0:
-        gdaltest.post_reason('fail')
         return 'fail'
     ds = None
 
@@ -1143,21 +1121,18 @@ def ogr_vrt_21_internal():
     ds = ogr.Open('data/vrt_test.vrt')
     lyr = ds.GetLayerByName('test3')
     if lyr.TestCapability(ogr.OLCFastFeatureCount) != 1:
-        gdaltest.post_reason('fail')
         return 'fail'
     ds = None
 
     ds = ogr.Open('data/vrt_test.vrt')
     lyr = ds.GetLayerByName('test3')
     if lyr.GetExtent() is None:
-        gdaltest.post_reason('fail')
         return 'fail'
     ds = None
 
     ds = ogr.Open('data/vrt_test.vrt')
     lyr = ds.GetLayerByName('test3')
     if lyr.GetFIDColumn() != 'fid':
-        gdaltest.post_reason('fail')
         return 'fail'
     ds = None
 
@@ -1433,21 +1408,18 @@ def test_ogr_vrt_25():
     # fields are taken as VRT fields), we can report the fid column
     lyr = ds.GetLayerByName('test3')
     if lyr.GetFIDColumn() != 'fid':
-        gdaltest.post_reason('fail')
         print(lyr.GetFIDColumn())
         return 'fail'
 
     # test6 layer declares fid, and explicit fields without the fid
     lyr = ds.GetLayerByName('test6')
     if lyr.GetFIDColumn() != 'fid':
-        gdaltest.post_reason('fail')
         print(lyr.GetFIDColumn())
         return 'fail'
 
     # test7 layer just declares fid with an external visible name
     lyr = ds.GetLayerByName('test7')
     if lyr.GetFIDColumn() != 'bar':
-        gdaltest.post_reason('fail')
         print(lyr.GetFIDColumn())
         return 'fail'
 
@@ -1455,7 +1427,6 @@ def test_ogr_vrt_25():
     # so nothing to report
     lyr = ds.GetLayerByName('test2')
     if lyr.GetFIDColumn() != '':
-        gdaltest.post_reason('fail')
         print(lyr.GetFIDColumn())
         return 'fail'
 
@@ -1489,7 +1460,6 @@ def test_ogr_vrt_26():
 
     lyr = vrt_ds.GetLayer(0)
     if lyr.TestCapability(ogr.OLCTransactions) == 0:
-        gdaltest.post_reason('failed')
         return 'fail'
 
     lyr.StartTransaction()
@@ -1499,13 +1469,11 @@ def test_ogr_vrt_26():
     feat = None
 
     if lyr.GetFeatureCount() != 1:
-        gdaltest.post_reason('failed')
         return 'fail'
 
     lyr.RollbackTransaction()
 
     if lyr.GetFeatureCount() != 0:
-        gdaltest.post_reason('failed')
         return 'fail'
 
     lyr.StartTransaction()
@@ -1516,7 +1484,6 @@ def test_ogr_vrt_26():
     lyr.CommitTransaction()
 
     if lyr.GetFeatureCount() != 1:
-        gdaltest.post_reason('failed')
         return 'fail'
 
     vrt_ds = None
@@ -1667,7 +1634,6 @@ def test_ogr_vrt_29():
 </OGRVRTDataSource>""")
     gdal.PopErrorHandler()
     if gdal.GetLastErrorMsg() == '':
-        gdaltest.post_reason('fail')
         return 'fail'
 
     # Non-spatial layer
@@ -1682,7 +1648,6 @@ def test_ogr_vrt_29():
 </OGRVRTDataSource>""")
     gdal.PopErrorHandler()
     if gdal.GetLastErrorMsg() == '':
-        gdaltest.post_reason('fail')
         return 'fail'
 
     # Missing TargetSRS
@@ -1696,7 +1661,6 @@ def test_ogr_vrt_29():
 </OGRVRTDataSource>""")
     gdal.PopErrorHandler()
     if gdal.GetLastErrorMsg() == '':
-        gdaltest.post_reason('fail')
         return 'fail'
 
     # Invalid TargetSRS
@@ -1711,7 +1675,6 @@ def test_ogr_vrt_29():
 </OGRVRTDataSource>""")
     gdal.PopErrorHandler()
     if gdal.GetLastErrorMsg() == '':
-        gdaltest.post_reason('fail')
         return 'fail'
 
     # Invalid SrcSRS
@@ -1727,7 +1690,6 @@ def test_ogr_vrt_29():
 </OGRVRTDataSource>""")
     gdal.PopErrorHandler()
     if gdal.GetLastErrorMsg() == '':
-        gdaltest.post_reason('fail')
         return 'fail'
 
     # TargetSRS == source SRS
@@ -1758,7 +1720,6 @@ def test_ogr_vrt_29():
     lyr = ds.GetLayer(0)
     bb = lyr.GetExtent()
     if bb != (426857, 485608, 5427475, 5516874):
-        gdaltest.post_reason('fail')
         return 'fail'
     ds = None
 
@@ -1795,7 +1756,6 @@ def test_ogr_vrt_29():
 
     feat = lyr.GetNextFeature()
     if ogrtest.check_feature_geometry(feat, 'POINT(426857.987717275274917 5427937.523466162383556)') != 0:
-        gdaltest.post_reason('fail')
         feat.DumpReadable()
         return 'fail'
 
@@ -1803,12 +1763,10 @@ def test_ogr_vrt_29():
 
     feat.SetGeometry(None)
     if lyr.SetFeature(feat) != 0:
-        gdaltest.post_reason('fail')
         return 'fail'
 
     feat.SetGeometry(ogr.CreateGeometryFromWkt('POINT(500000 0)'))
     if lyr.SetFeature(feat) != 0:
-        gdaltest.post_reason('fail')
         return 'fail'
     feat = None
 
@@ -1817,7 +1775,6 @@ def test_ogr_vrt_29():
 
     feat = lyr.GetNextFeature()
     if ogrtest.check_feature_geometry(feat, 'POINT(500000 0)') != 0:
-        gdaltest.post_reason('fail')
         feat.DumpReadable()
         return 'fail'
     feat = None
@@ -1826,14 +1783,12 @@ def test_ogr_vrt_29():
     feat.SetField('id', -99)
     feat.SetGeometry(ogr.CreateGeometryFromWkt('POINT(500000 0)'))
     if lyr.CreateFeature(feat) != 0:
-        gdaltest.post_reason('fail')
         return 'fail'
     feat = None
 
     feat = ogr.Feature(lyr.GetLayerDefn())
     feat.SetField('id', -100)
     if lyr.CreateFeature(feat) != 0:
-        gdaltest.post_reason('fail')
         return 'fail'
     feat = None
 
@@ -1847,7 +1802,6 @@ def test_ogr_vrt_29():
     ret = lyr.DeleteFeature(1)
     gdal.PopErrorHandler()
     if ret == 0:
-        gdaltest.post_reason('fail')
         return 'fail'
 
     feat = lyr.GetNextFeature()
@@ -1856,7 +1810,6 @@ def test_ogr_vrt_29():
     ret = lyr.SetFeature(feat)
     gdal.PopErrorHandler()
     if ret == 0:
-        gdaltest.post_reason('fail')
         return 'fail'
     feat = None
 
@@ -1866,7 +1819,6 @@ def test_ogr_vrt_29():
     ret = lyr.CreateFeature(feat)
     gdal.PopErrorHandler()
     if ret == 0:
-        gdaltest.post_reason('fail')
         return 'fail'
     feat = None
 
@@ -1879,7 +1831,6 @@ def test_ogr_vrt_29():
     feat = lyr.GetNextFeature()
     feat = lyr.GetNextFeature()
     if ogrtest.check_feature_geometry(feat, 'POINT(3.0 0.0)') != 0:
-        gdaltest.post_reason('fail')
         feat.DumpReadable()
         return 'fail'
 
@@ -1887,7 +1838,6 @@ def test_ogr_vrt_29():
     lyr.ResetReading()
     feat = lyr.GetNextFeature()
     if ogrtest.check_feature_geometry(feat, 'POINT(3.0 0.0)') != 0:
-        gdaltest.post_reason('fail')
         feat.DumpReadable()
         return 'fail'
 
@@ -1895,7 +1845,6 @@ def test_ogr_vrt_29():
     lyr.ResetReading()
     feat = lyr.GetNextFeature()
     if feat.GetGeometryRef() is not None:
-        gdaltest.post_reason('fail')
         feat.DumpReadable()
         return 'fail'
 
@@ -1918,7 +1867,6 @@ def test_ogr_vrt_29():
     gdal.PopErrorHandler()
     fid = feat.GetFID()
     if feat.GetGeometryRef() is not None:
-        gdaltest.post_reason('fail')
         feat.DumpReadable()
         return 'fail'
 
@@ -1926,7 +1874,6 @@ def test_ogr_vrt_29():
     feat = lyr.GetFeature(fid)
     gdal.PopErrorHandler()
     if feat.GetGeometryRef() is not None:
-        gdaltest.post_reason('fail')
         feat.DumpReadable()
         return 'fail'
     feat = None
@@ -1955,7 +1902,6 @@ def test_ogr_vrt_29():
     ret = lyr.SetFeature(feat)
     gdal.PopErrorHandler()
     if ret == 0:
-        gdaltest.post_reason('fail')
         return 'fail'
     feat = None
 
@@ -1965,7 +1911,6 @@ def test_ogr_vrt_29():
     ret = lyr.CreateFeature(feat)
     gdal.PopErrorHandler()
     if ret == 0:
-        gdaltest.post_reason('fail')
         return 'fail'
     feat = None
 
@@ -1983,7 +1928,6 @@ def test_ogr_vrt_29():
         ret = gdaltest.runexternal(test_cli_utilities.get_test_ogrsf_path() + ' -ro tmp/ogr_vrt_29.vrt')
 
         if ret.find('INFO') == -1 or ret.find('ERROR') != -1:
-            gdaltest.post_reason('fail')
             print(ret)
             return 'fail'
 
@@ -2234,14 +2178,12 @@ def test_ogr_vrt_30():
         ret = gdaltest.runexternal(test_cli_utilities.get_test_ogrsf_path() + ' -ro tmp/ogr_vrt_30.vrt --config OGR_VRT_MAX_OPENED 1')
 
         if ret.find('INFO') == -1 or ret.find('ERROR') != -1:
-            gdaltest.post_reason('fail')
             print(ret)
             return 'fail'
 
         ret = gdaltest.runexternal(test_cli_utilities.get_test_ogrsf_path() + ' tmp/ogr_vrt_30.vrt')
 
         if ret.find('INFO') == -1 or ret.find('ERROR') != -1:
-            gdaltest.post_reason('fail')
             print(ret)
             return 'fail'
 
@@ -2630,31 +2572,24 @@ def test_ogr_vrt_33():
         for j in range(5):
             if j == 0:
                 if lyr.GetGeomType() != ogr.wkbPoint:
-                    gdaltest.post_reason('fail')
                     return 'fail'
             elif j == 1:
                 if lyr.GetSpatialRef().ExportToWkt().find('GEOGCS') != 0:
-                    gdaltest.post_reason('fail')
                     return 'fail'
             elif j == 2:
                 if lyr.GetLayerDefn().GetGeomFieldDefn(1).GetType() != ogr.wkbPolygon:
-                    gdaltest.post_reason('fail')
                     return 'fail'
             elif j == 3:
                 if lyr.GetExtent(geom_field=1) != (0, 1, 0, 1):
-                    gdaltest.post_reason('fail')
                     return 'fail'
             elif j == 4:
                 if lyr.GetLayerDefn().GetGeomFieldDefn(1).GetSpatialRef().ExportToWkt().find('PROJCS') != 0:
-                    gdaltest.post_reason('fail')
                     return 'fail'
                 feat = lyr.GetNextFeature()
                 if feat.GetGeomFieldRef(0).ExportToWkt() != 'POINT (1 2)':
-                    gdaltest.post_reason('fail')
                     feat.DumpReadable()
                     return 'fail'
                 if feat.GetGeomFieldRef(1).ExportToWkt() != 'POLYGON ((0 0,0 1,1 1,1 0,0 0))':
-                    gdaltest.post_reason('fail')
                     feat.DumpReadable()
                     return 'fail'
 
@@ -2666,7 +2601,6 @@ def test_ogr_vrt_33():
             os.unlink('tmp/ogr_vrt_33.vrt')
 
             if ret.find('INFO') == -1 or ret.find('ERROR') != -1:
-                gdaltest.post_reason('fail')
                 print(ret)
                 return 'fail'
 
@@ -2691,35 +2625,27 @@ def test_ogr_vrt_33():
             lyr = ds.GetLayer(0)
             if i == 0:
                 if lyr.GetGeomType() != ogr.wkbPolygon25D:
-                    gdaltest.post_reason('fail')
                     return 'fail'
             elif i == 1:
                 if lyr.GetSpatialRef().ExportToWkt().find('+proj=merc +a=6378137 +b=6378137 +lat_ts=0.0 +lon_0=0.0 +x_0=0.0 +y_0=0 +k=1.0 +units=m +nadgrids=@null +wktext +no_defs') < 0:
-                    gdaltest.post_reason('fail')
                     return 'fail'
             elif i == 2:
                 if lyr.GetGeometryColumn() != 'foo':
-                    gdaltest.post_reason('fail')
                     return 'fail'
             elif i == 3:
                 if lyr.TestCapability(ogr.OLCFastGetExtent) != 1:
-                    gdaltest.post_reason('fail')
                     return 'fail'
                 if lyr.GetExtent(geom_field=0) != (1, 3, 2, 4):
-                    gdaltest.post_reason('fail')
                     print(lyr.GetExtent(geom_field=0))
                     return 'fail'
             elif i == 4:
                 if lyr.TestCapability(ogr.OLCFastFeatureCount) != 0:
-                    gdaltest.post_reason('fail')
                     return 'fail'
             elif i == 5:
                 if lyr.GetLayerDefn().GetGeomFieldCount() != 1:
-                    gdaltest.post_reason('fail')
                     return 'fail'
                 feat = lyr.GetNextFeature()
                 if feat.GetGeomFieldRef(0).ExportToWkt() != 'POLYGON ((0.5 1.0,1 1,1.0 0.5,0.5 0.5,0.5 1.0))':
-                    gdaltest.post_reason('fail')
                     feat.DumpReadable()
                     return 'fail'
 
@@ -2731,7 +2657,6 @@ def test_ogr_vrt_33():
             os.unlink('tmp/ogr_vrt_33.vrt')
 
             if ret.find('INFO') == -1 or ret.find('ERROR') != -1:
-                gdaltest.post_reason('fail')
                 print(ret)
                 return 'fail'
 
@@ -2747,11 +2672,9 @@ def test_ogr_vrt_33():
         lyr = ds.GetLayer(0)
         if i == 0:
             if lyr.GetGeomType() != ogr.wkbNone:
-                gdaltest.post_reason('fail')
                 return 'fail'
         elif i == 1:
             if lyr.GetSpatialRef() is not None:
-                gdaltest.post_reason('fail')
                 return 'fail'
         elif i == 2:
             lyr.TestCapability(ogr.OLCFastFeatureCount)
@@ -2759,11 +2682,9 @@ def test_ogr_vrt_33():
             lyr.TestCapability(ogr.OLCFastSpatialFilter)
         elif i == 3:
             if lyr.GetLayerDefn().GetGeomFieldCount() != 0:
-                gdaltest.post_reason('fail')
                 return 'fail'
             feat = lyr.GetNextFeature()
             if feat.GetGeomFieldRef(0) is not None:
-                gdaltest.post_reason('fail')
                 feat.DumpReadable()
                 return 'fail'
 
@@ -2775,7 +2696,6 @@ def test_ogr_vrt_33():
         os.unlink('tmp/ogr_vrt_33.vrt')
 
         if ret.find('INFO') == -1 or ret.find('ERROR') != -1:
-            gdaltest.post_reason('fail')
             print(ret)
             return 'fail'
 
@@ -2792,38 +2712,30 @@ def test_ogr_vrt_33():
     ds = ogr.Open(ds_str)
     lyr = ds.GetLayer(0)
     if lyr.GetLayerDefn().GetGeomFieldDefn(1).GetType() != ogr.wkbPoint:
-        gdaltest.post_reason('fail')
         return 'fail'
     if lyr.GetLayerDefn().GetGeomFieldDefn(1).GetSpatialRef().ExportToWkt().find('4326') < 0:
-        gdaltest.post_reason('fail')
         return 'fail'
     feat = lyr.GetNextFeature()
     if feat.GetGeomFieldRef(0).ExportToWkt() != 'POINT (1 2)':
-        gdaltest.post_reason('fail')
         feat.DumpReadable()
         return 'fail'
     if feat.GetGeomFieldRef(1).ExportToWkt() != 'POINT (-1 -2)':
-        gdaltest.post_reason('fail')
         feat.DumpReadable()
         return 'fail'
     lyr.SetSpatialFilterRect(1, 0, 0, 0, 0)
     if lyr.GetFeatureCount() != 0:
-        gdaltest.post_reason('fail')
         return 'fail'
     lyr.SetSpatialFilterRect(1, -1.1, -2.1, -0.9, -1.9)
     if lyr.GetFeatureCount() != 1:
-        gdaltest.post_reason('fail')
         return 'fail'
     lyr.SetSpatialFilter(1, None)
     if lyr.GetFeatureCount() != 1:
-        gdaltest.post_reason('fail')
         return 'fail'
     lyr.SetIgnoredFields(['geom__WKT_EPSG_4326_POINT'])
     lyr.ResetReading()
     feat = lyr.GetNextFeature()
     if feat.GetGeomFieldRef(0) is not None or \
        feat.GetGeomFieldRef(1).ExportToWkt() != 'POINT (-1 -2)':
-        gdaltest.post_reason('fail')
         feat.DumpReadable()
         return 'fail'
     lyr.SetIgnoredFields(['foo'])
@@ -2831,7 +2743,6 @@ def test_ogr_vrt_33():
     feat = lyr.GetNextFeature()
     if feat.GetGeomFieldRef(1) is not None or \
        feat.GetGeomFieldRef(0).ExportToWkt() != 'POINT (1 2)':
-        gdaltest.post_reason('fail')
         feat.DumpReadable()
         return 'fail'
 
@@ -2843,7 +2754,6 @@ def test_ogr_vrt_33():
         os.unlink('tmp/ogr_vrt_33.vrt')
 
         if ret.find('INFO') == -1 or ret.find('ERROR') != -1:
-            gdaltest.post_reason('fail')
             print(ret)
             return 'fail'
 
@@ -2859,13 +2769,11 @@ def test_ogr_vrt_33():
     ds = ogr.Open(ds_str)
     lyr = ds.GetLayer(0)
     if lyr.GetSpatialRef().ExportToWkt().find('32631') < 0:
-        gdaltest.post_reason('fail')
         return 'fail'
     feat = lyr.GetNextFeature()
     if feat.GetGeomFieldRef(0).ExportToWkt().find('POINT') < 0 or \
        feat.GetGeomFieldRef(0).ExportToWkt() == 'POINT (1 2)' or \
        feat.GetGeomFieldRef(1).ExportToWkt() != 'POLYGON ((0 0,0 1,1 1,1 0,0 0))':
-        gdaltest.post_reason('fail')
         feat.DumpReadable()
         return 'fail'
 
@@ -2882,13 +2790,11 @@ def test_ogr_vrt_33():
     ds = ogr.Open(ds_str)
     lyr = ds.GetLayer(0)
     if lyr.GetSpatialRef().ExportToWkt().find('32631') < 0:
-        gdaltest.post_reason('fail')
         return 'fail'
     feat = lyr.GetNextFeature()
     if feat.GetGeomFieldRef(0).ExportToWkt().find('POINT') < 0 or \
        feat.GetGeomFieldRef(0).ExportToWkt() == 'POINT (1 2)' or \
        feat.GetGeomFieldRef(1).ExportToWkt() != 'POLYGON ((0 0,0 1,1 1,1 0,0 0))':
-        gdaltest.post_reason('fail')
         feat.DumpReadable()
         return 'fail'
 
@@ -2906,7 +2812,6 @@ def test_ogr_vrt_33():
     ogr.Open(ds_str)
     gdal.PopErrorHandler()
     if gdal.GetLastErrorMsg() == '':
-        gdaltest.post_reason('fail')
         return 'fail'
 
     # Warped layer with explicit WarpedGeomFieldName (that is the second field)
@@ -2922,13 +2827,11 @@ def test_ogr_vrt_33():
     ds = ogr.Open(ds_str)
     lyr = ds.GetLayer(0)
     if lyr.GetLayerDefn().GetGeomFieldDefn(1).GetSpatialRef().ExportToWkt().find('4326') < 0:
-        gdaltest.post_reason('fail')
         return 'fail'
     feat = lyr.GetNextFeature()
     if feat.GetGeomFieldRef(1).ExportToWkt().find('POLYGON') < 0 or \
        feat.GetGeomFieldRef(1).ExportToWkt() == 'POLYGON ((0 0,0 1,1 1,1 0,0 0))' or \
        feat.GetGeomFieldRef(0).ExportToWkt() != 'POINT (1 2)':
-        gdaltest.post_reason('fail')
         feat.DumpReadable()
         return 'fail'
 
@@ -2951,24 +2854,19 @@ def test_ogr_vrt_33():
                    ['geom__WKT_EPSG_4326_LINESTRING', ogr.wkbLineString, '4326'],
                    ['geom__WKT_EPSG_32631_POINT', ogr.wkbPoint, '32631']]
     if lyr.GetLayerDefn().GetGeomFieldCount() != len(geom_fields):
-        gdaltest.post_reason('fail')
         return 'fail'
     for i, geom_field in enumerate(geom_fields):
         if lyr.GetLayerDefn().GetGeomFieldDefn(i).GetName() != geom_field[0]:
-            gdaltest.post_reason('fail')
             return 'fail'
         if lyr.GetLayerDefn().GetGeomFieldDefn(i).GetType() != geom_field[1]:
-            gdaltest.post_reason('fail')
             return 'fail'
         if lyr.GetLayerDefn().GetGeomFieldDefn(i).GetSpatialRef().ExportToWkt().find(geom_field[2]) < 0:
-            gdaltest.post_reason('fail')
             return 'fail'
     feat = lyr.GetNextFeature()
     if feat.GetGeomFieldRef(0).ExportToWkt() != 'POINT (1 2)' or \
        feat.GetGeomFieldRef(1).ExportToWkt() != 'POLYGON ((0 0,0 1,1 1,1 0,0 0))' or \
        feat.GetGeomFieldRef(2) is not None or \
        feat.GetGeomFieldRef(3) is not None:
-        gdaltest.post_reason('fail')
         feat.DumpReadable()
         return 'fail'
 
@@ -2977,7 +2875,6 @@ def test_ogr_vrt_33():
        feat.GetGeomFieldRef(1).ExportToWkt() != 'POLYGON ((1 1,1 2,2 2,2 1,1 1))' or \
        feat.GetGeomFieldRef(2) is not None or \
        feat.GetGeomFieldRef(3).ExportToWkt() != 'POINT (5 6)':
-        gdaltest.post_reason('fail')
         feat.DumpReadable()
         return 'fail'
 
@@ -2991,7 +2888,6 @@ def test_ogr_vrt_33():
         os.unlink('tmp/ogr_vrt_33.vrt')
 
         if ret.find('INFO') == -1 or ret.find('ERROR') != -1:
-            gdaltest.post_reason('fail')
             print(ret)
             return 'fail'
 
@@ -3013,29 +2909,23 @@ def test_ogr_vrt_33():
     geom_fields = [['geom__WKT_EPSG_4326_POINT', ogr.wkbPoint, '4326'],
                    ['geom__WKT_EPSG_32632_POLYGON', ogr.wkbPolygon, '32632']]
     if lyr.GetLayerDefn().GetGeomFieldCount() != len(geom_fields):
-        gdaltest.post_reason('fail')
         return 'fail'
     for i, geom_field in enumerate(geom_fields):
         if lyr.GetLayerDefn().GetGeomFieldDefn(i).GetName() != geom_field[0]:
-            gdaltest.post_reason('fail')
             return 'fail'
         if lyr.GetLayerDefn().GetGeomFieldDefn(i).GetType() != geom_field[1]:
-            gdaltest.post_reason('fail')
             return 'fail'
         if lyr.GetLayerDefn().GetGeomFieldDefn(i).GetSpatialRef().ExportToWkt().find(geom_field[2]) < 0:
-            gdaltest.post_reason('fail')
             return 'fail'
     feat = lyr.GetNextFeature()
     if feat.GetGeomFieldRef(0).ExportToWkt() != 'POINT (1 2)' or \
        feat.GetGeomFieldRef(1).ExportToWkt() != 'POLYGON ((0 0,0 1,1 1,1 0,0 0))':
-        gdaltest.post_reason('fail')
         feat.DumpReadable()
         return 'fail'
 
     feat = lyr.GetNextFeature()
     if feat.GetGeomFieldRef(0).ExportToWkt() != 'POINT (3 4)' or \
        feat.GetGeomFieldRef(1).ExportToWkt() != 'POLYGON ((1 1,1 2,2 2,2 1,1 1))':
-        gdaltest.post_reason('fail')
         feat.DumpReadable()
         return 'fail'
 
@@ -3049,7 +2939,6 @@ def test_ogr_vrt_33():
         os.unlink('tmp/ogr_vrt_33.vrt')
 
         if ret.find('INFO') == -1 or ret.find('ERROR') != -1:
-            gdaltest.post_reason('fail')
             print(ret)
             return 'fail'
 
@@ -3072,29 +2961,23 @@ def test_ogr_vrt_33():
                    ['geom__WKT_EPSG_32632_POLYGON', ogr.wkbPolygon, '32632'],
                    ['geom__WKT_EPSG_4326_LINESTRING', ogr.wkbLineString, '4326']]
     if lyr.GetLayerDefn().GetGeomFieldCount() != len(geom_fields):
-        gdaltest.post_reason('fail')
         return 'fail'
     for i, geom_field in enumerate(geom_fields):
         if lyr.GetLayerDefn().GetGeomFieldDefn(i).GetName() != geom_field[0]:
-            gdaltest.post_reason('fail')
             return 'fail'
         if lyr.GetLayerDefn().GetGeomFieldDefn(i).GetType() != geom_field[1]:
-            gdaltest.post_reason('fail')
             return 'fail'
         if lyr.GetLayerDefn().GetGeomFieldDefn(i).GetSpatialRef().ExportToWkt().find(geom_field[2]) < 0:
-            gdaltest.post_reason('fail')
             return 'fail'
     feat = lyr.GetNextFeature()
     if feat.GetGeomFieldRef(0).ExportToWkt() != 'POINT (1 2)' or \
        feat.GetGeomFieldRef(1).ExportToWkt() != 'POLYGON ((0 0,0 1,1 1,1 0,0 0))':
-        gdaltest.post_reason('fail')
         feat.DumpReadable()
         return 'fail'
 
     feat = lyr.GetNextFeature()
     if feat.GetGeomFieldRef(0).ExportToWkt() != 'POINT (3 4)' or \
        feat.GetGeomFieldRef(1).ExportToWkt() != 'POLYGON ((1 1,1 2,2 2,2 1,1 1))':
-        gdaltest.post_reason('fail')
         feat.DumpReadable()
         return 'fail'
 
@@ -3108,7 +2991,6 @@ def test_ogr_vrt_33():
         os.unlink('tmp/ogr_vrt_33.vrt')
 
         if ret.find('INFO') == -1 or ret.find('ERROR') != -1:
-            gdaltest.post_reason('fail')
             print(ret)
             return 'fail'
 
@@ -3131,25 +3013,20 @@ def test_ogr_vrt_33():
     geom_fields = [['geom__WKT_EPSG_32632_POLYGON', ogr.wkbPolygon, '32632'],
                    ['geom__WKT_EPSG_4326_POINT', ogr.wkbPoint, '4326']]
     if lyr.GetLayerDefn().GetGeomFieldCount() != len(geom_fields):
-        gdaltest.post_reason('fail')
         return 'fail'
     for i, geom_field in enumerate(geom_fields):
         if lyr.GetLayerDefn().GetGeomFieldDefn(i).GetName() != geom_field[0]:
-            gdaltest.post_reason('fail')
             return 'fail'
         if lyr.GetLayerDefn().GetGeomFieldDefn(i).GetType() != geom_field[1]:
             print(i)
             print(lyr.GetLayerDefn().GetGeomFieldDefn(i).GetType())
             print(geom_field[1])
-            gdaltest.post_reason('fail')
             return 'fail'
         if lyr.GetLayerDefn().GetGeomFieldDefn(i).GetSpatialRef().ExportToWkt().find(geom_field[2]) < 0:
-            gdaltest.post_reason('fail')
             return 'fail'
     feat = lyr.GetNextFeature()
     if feat.GetGeomFieldRef(0).ExportToWkt() != 'POLYGON ((0 0,0 1,1 1,1 0,0 0))' or \
        feat.GetGeomFieldRef(1).ExportToWkt() != 'POINT (1 2)':
-        gdaltest.post_reason('fail')
         feat.DumpReadable()
         return 'fail'
 
@@ -3163,7 +3040,6 @@ def test_ogr_vrt_33():
         os.unlink('tmp/ogr_vrt_33.vrt')
 
         if ret.find('INFO') == -1 or ret.find('ERROR') != -1:
-            gdaltest.post_reason('fail')
             print(ret)
             return 'fail'
 
@@ -3194,31 +3070,25 @@ def test_ogr_vrt_33():
     geom_fields = [['geom__WKT_EPSG_32632_POLYGON', ogr.wkbPolygon25D, '32632'],
                    ['geom__WKT_EPSG_4326_POINT', ogr.wkbPoint, '4322']]
     if lyr.GetLayerDefn().GetGeomFieldCount() != len(geom_fields):
-        gdaltest.post_reason('fail')
         return 'fail'
     bb = lyr.GetExtent(geom_field=1)
     if bb != (1, 3, 2, 4):
-        gdaltest.post_reason('fail')
         print(bb)
         return 'fail'
     for i, geom_field in enumerate(geom_fields):
         if lyr.GetLayerDefn().GetGeomFieldDefn(i).GetName() != geom_field[0]:
-            gdaltest.post_reason('fail')
             return 'fail'
         if lyr.GetLayerDefn().GetGeomFieldDefn(i).GetType() != geom_field[1]:
             print(i)
             print(lyr.GetLayerDefn().GetGeomFieldDefn(i).GetType())
             print(geom_field[1])
-            gdaltest.post_reason('fail')
             return 'fail'
         if lyr.GetLayerDefn().GetGeomFieldDefn(i).GetSpatialRef().ExportToWkt().find(geom_field[2]) < 0:
-            gdaltest.post_reason('fail')
             return 'fail'
     feat = lyr.GetNextFeature()
     if feat.GetGeomFieldRef(0).ExportToWkt() != 'POLYGON ((0 0,0 1,1 1,1 0,0 0))' or \
        feat.GetGeomFieldRef(1).ExportToWkt().find('POINT (') != 0 or \
        feat.GetGeomFieldRef(1).ExportToWkt() == 'POINT (1 2)':
-        gdaltest.post_reason('fail')
         feat.DumpReadable()
         return 'fail'
     ds = None
@@ -3231,7 +3101,6 @@ def test_ogr_vrt_33():
         os.unlink('tmp/ogr_vrt_33.vrt')
 
         if ret.find('INFO') == -1 or ret.find('ERROR') != -1:
-            gdaltest.post_reason('fail')
             print(ret)
             return 'fail'
 
@@ -3252,15 +3121,12 @@ def test_ogr_vrt_33():
     lyr = ds.GetLayer(0)
     if lyr.GetLayerDefn().GetGeomFieldCount() != 0:
         print(lyr.GetLayerDefn().GetGeomFieldCount())
-        gdaltest.post_reason('fail')
         return 'fail'
     if lyr.GetLayerDefn().GetFieldCount() != 6:
         print(lyr.GetLayerDefn().GetGeomFieldCount())
-        gdaltest.post_reason('fail')
         return 'fail'
     feat = lyr.GetNextFeature()
     if feat is None:
-        gdaltest.post_reason('fail')
         return 'fail'
 
     ds = None
@@ -3273,7 +3139,6 @@ def test_ogr_vrt_33():
         os.unlink('tmp/ogr_vrt_33.vrt')
 
         if ret.find('INFO') == -1 or ret.find('ERROR') != -1:
-            gdaltest.post_reason('fail')
             print(ret)
             return 'fail'
 
@@ -3284,24 +3149,19 @@ def test_ogr_vrt_33():
                    ['geom__WKT_EPSG_4326_LINESTRING', ogr.wkbLineString, '4326'],
                    ['geom__WKT_EPSG_32631_POINT', ogr.wkbPoint, '32631']]
     if sql_lyr.GetLayerDefn().GetGeomFieldCount() != len(geom_fields):
-        gdaltest.post_reason('fail')
         return 'fail'
     for i, geom_field in enumerate(geom_fields):
         if sql_lyr.GetLayerDefn().GetGeomFieldDefn(i).GetName() != geom_field[0]:
-            gdaltest.post_reason('fail')
             return 'fail'
         if sql_lyr.GetLayerDefn().GetGeomFieldDefn(i).GetType() != geom_field[1]:
-            gdaltest.post_reason('fail')
             return 'fail'
         if sql_lyr.GetLayerDefn().GetGeomFieldDefn(i).GetSpatialRef().ExportToWkt().find(geom_field[2]) < 0:
-            gdaltest.post_reason('fail')
             return 'fail'
     feat = sql_lyr.GetNextFeature()
     if feat.GetGeomFieldRef(0).ExportToWkt() != 'POINT (1 2)' or \
        feat.GetGeomFieldRef(1).ExportToWkt() != 'POLYGON ((0 0,0 1,1 1,1 0,0 0))' or \
        feat.GetGeomFieldRef(2) is not None or \
        feat.GetGeomFieldRef(3) is not None:
-        gdaltest.post_reason('fail')
         feat.DumpReadable()
         return 'fail'
 
@@ -3310,7 +3170,6 @@ def test_ogr_vrt_33():
        feat.GetGeomFieldRef(1).ExportToWkt() != 'POLYGON ((1 1,1 2,2 2,2 1,1 1))' or \
        feat.GetGeomFieldRef(2) is not None or \
        feat.GetGeomFieldRef(3).ExportToWkt() != 'POINT (5 6)':
-        gdaltest.post_reason('fail')
         feat.DumpReadable()
         return 'fail'
     ds.ReleaseResultSet(sql_lyr)
@@ -3395,16 +3254,12 @@ def test_ogr_vrt_35():
     ds = ogr.Open('tmp/test.vrt')
     lyr = ds.GetLayerByName('test')
     if lyr.GetLayerDefn().GetFieldDefn(0).IsNullable() != 0:
-        gdaltest.post_reason('fail')
         return 'fail'
     if lyr.GetLayerDefn().GetFieldDefn(1).IsNullable() != 1:
-        gdaltest.post_reason('fail')
         return 'fail'
     if lyr.GetLayerDefn().GetGeomFieldDefn(0).IsNullable() != 0:
-        gdaltest.post_reason('fail')
         return 'fail'
     if lyr.GetLayerDefn().GetGeomFieldDefn(1).IsNullable() != 1:
-        gdaltest.post_reason('fail')
         return 'fail'
     ds = None
 
@@ -3421,16 +3276,12 @@ def test_ogr_vrt_35():
     ds = ogr.Open('tmp/test2.vrt')
     lyr = ds.GetLayerByName('test')
     if lyr.GetLayerDefn().GetFieldDefn(0).IsNullable() != 0:
-        gdaltest.post_reason('fail')
         return 'fail'
     if lyr.GetLayerDefn().GetFieldDefn(1).IsNullable() != 1:
-        gdaltest.post_reason('fail')
         return 'fail'
     if lyr.GetLayerDefn().GetGeomFieldDefn(0).IsNullable() != 0:
-        gdaltest.post_reason('fail')
         return 'fail'
     if lyr.GetLayerDefn().GetGeomFieldDefn(1).IsNullable() != 1:
-        gdaltest.post_reason('fail')
         return 'fail'
     ds = None
 
@@ -3477,7 +3328,6 @@ def test_ogr_vrt_36():
     lyr = ds.GetLayer(0)
     f = lyr.GetNextFeature()
     if f['id'] != '1':
-        gdaltest.post_reason('fail')
         f.DumpReadable()
         return 'fail'
     ds = None
@@ -3498,7 +3348,6 @@ def test_ogr_vrt_37():
 
     lyr = ds.GetLayerByName('test6')
     if lyr.GetGeomType() != ogr.wkbNone:
-        gdaltest.post_reason('fail')
         return 'fail'
 
     with gdaltest.error_handler():
@@ -3506,7 +3355,6 @@ def test_ogr_vrt_37():
 
     lyr = ds.GetLayerByName('test6')
     if lyr.GetLayerDefn().GetGeomFieldCount() != 0:
-        gdaltest.post_reason('fail')
         return 'fail'
 
     return 'success'
@@ -3558,7 +3406,6 @@ def test_ogr_vrt_38():
             ds = ogr.Open('/vsimem/ogr_vrt_38.vrt', update=1)
             lyr = ds.GetLayer(0)
             if lyr.GetGeomType() != expected_geom_type:
-                gdaltest.post_reason('failure')
                 print(type_str, qualifier, lyr.GetGeomType())
                 return 'fail'
 
@@ -3599,7 +3446,6 @@ def test_ogr_vrt_39():
     lyr.SetAttributeFilter('fid = 25')
     f = lyr.GetNextFeature()
     if f['val'] != 2:
-        gdaltest.post_reason('fail')
         f.DumpReadable()
         return 'fail'
     ds = None
@@ -3636,12 +3482,10 @@ def test_ogr_vrt_40():
     ds = ogr.Open('/vsimem/ogr_vrt_40.vrt')
     lyr = ds.GetLayer(0)
     if lyr.GetGeomType() != ogr.wkbPointZM:
-        gdaltest.post_reason('fail')
         print(lyr.GetGeomType())
         return 'fail'
     f = lyr.GetNextFeature()
     if f.GetGeometryRef().ExportToIsoWkt() != 'POINT ZM (1 2 3 4)':
-        gdaltest.post_reason('fail')
         f.DumpReadable()
         return 'fail'
     ds = None
diff --git a/autotest/ogr/ogr_wfs.py b/autotest/ogr/ogr_wfs.py
index 4859ee5554c2..9847394fe9f6 100755
--- a/autotest/ogr/ogr_wfs.py
+++ b/autotest/ogr/ogr_wfs.py
@@ -382,7 +382,6 @@ def test_ogr_wfs_geoserver_paging():
     ds = None
 
     if feature_count_wfs100 != feature_count_ref:
-        gdaltest.post_reason('fail')
         print(feature_count_wfs100)
         print(feature_count_ref)
         return 'fail'
@@ -409,13 +408,11 @@ def test_ogr_wfs_geoserver_paging():
     ds = None
 
     if feature_count_wfs110 != feature_count_ref:
-        gdaltest.post_reason('fail')
         print(feature_count_wfs100)
         print(feature_count_ref)
         return 'fail'
 
     if feature_count_wfs110_at_hand != feature_count_ref:
-        gdaltest.post_reason('fail')
         print(feature_count_wfs110_at_hand)
         print(feature_count_ref)
         return 'fail'
@@ -1157,10 +1154,8 @@ def test_ogr_wfs_vsimem_fail_because_empty_response(with_and_without_streaming):
     ds = ogr.Open('WFS:/vsimem/wfs_endpoint')
     gdal.PopErrorHandler()
     if ds is not None:
-        gdaltest.post_reason('fail')
         return 'fail'
     if gdal.GetLastErrorMsg().find('Empty content returned by server') < 0:
-        gdaltest.post_reason('fail')
         print(gdal.GetLastErrorMsg())
         return 'fail'
 
@@ -1179,10 +1174,8 @@ def test_ogr_wfs_vsimem_fail_because_no_WFS_Capabilities(with_and_without_stream
     ds = ogr.Open('WFS:/vsimem/wfs_endpoint')
     gdal.PopErrorHandler()
     if ds is not None:
-        gdaltest.post_reason('fail')
         return 'fail'
     if gdal.GetLastErrorMsg().find('Cannot find <WFS_Capabilities>') < 0:
-        gdaltest.post_reason('fail')
         print(gdal.GetLastErrorMsg())
         return 'fail'
 
@@ -1201,10 +1194,8 @@ def test_ogr_wfs_vsimem_fail_because_exception(with_and_without_streaming):
     ds = ogr.Open('WFS:/vsimem/wfs_endpoint')
     gdal.PopErrorHandler()
     if ds is not None:
-        gdaltest.post_reason('fail')
         return 'fail'
     if gdal.GetLastErrorMsg().find('Error returned by server : <ServiceExceptionReport/>') < 0:
-        gdaltest.post_reason('fail')
         print(gdal.GetLastErrorMsg())
         return 'fail'
 
@@ -1223,10 +1214,8 @@ def test_ogr_wfs_vsimem_fail_because_invalid_xml_capabilities(with_and_without_s
     ds = ogr.Open('WFS:/vsimem/wfs_endpoint')
     gdal.PopErrorHandler()
     if ds is not None:
-        gdaltest.post_reason('fail')
         return 'fail'
     if gdal.GetLastErrorMsg().find('Invalid XML content : <invalid_xml') < 0:
-        gdaltest.post_reason('fail')
         print(gdal.GetLastErrorMsg())
         return 'fail'
 
@@ -1247,10 +1236,8 @@ def test_ogr_wfs_vsimem_fail_because_missing_featuretypelist(with_and_without_st
     ds = ogr.Open('WFS:/vsimem/wfs_endpoint')
     gdal.PopErrorHandler()
     if ds is not None:
-        gdaltest.post_reason('fail')
         return 'fail'
     if gdal.GetLastErrorMsg().find('Cannot find <FeatureTypeList>') < 0:
-        gdaltest.post_reason('fail')
         print(gdal.GetLastErrorMsg())
         return 'fail'
 
@@ -1269,10 +1256,8 @@ def test_ogr_wfs_vsimem_wfs110_open_getcapabilities_file(with_and_without_stream
     ds = ogr.Open('/vsimem/caps.xml')
     gdal.PopErrorHandler()
     if ds is not None:
-        gdaltest.post_reason('fail')
         return 'fail'
     if gdal.GetLastErrorMsg().find('Parse error at EOF, not all elements have been closed') < 0:
-        gdaltest.post_reason('fail')
         print(gdal.GetLastErrorMsg())
         return 'fail'
 
@@ -1284,10 +1269,8 @@ def test_ogr_wfs_vsimem_wfs110_open_getcapabilities_file(with_and_without_stream
     ds = ogr.Open('/vsimem/caps.xml')
     gdal.PopErrorHandler()
     if ds is not None:
-        gdaltest.post_reason('fail')
         return 'fail'
     if gdal.GetLastErrorMsg().find('Cannot find <WFS_Capabilities>') < 0:
-        gdaltest.post_reason('fail')
         print(gdal.GetLastErrorMsg())
         return 'fail'
 
@@ -1306,10 +1289,8 @@ def test_ogr_wfs_vsimem_wfs110_open_getcapabilities_file(with_and_without_stream
     ds = ogr.Open('/vsimem/caps.xml')
     gdal.PopErrorHandler()
     if ds is not None:
-        gdaltest.post_reason('fail')
         return 'fail'
     if gdal.GetLastErrorMsg().find('Cannot find base URL') < 0:
-        gdaltest.post_reason('fail')
         print(gdal.GetLastErrorMsg())
         return 'fail'
 
@@ -1334,10 +1315,8 @@ def test_ogr_wfs_vsimem_wfs110_open_getcapabilities_file(with_and_without_stream
 
     ds = ogr.Open('/vsimem/caps.xml')
     if ds is None:
-        gdaltest.post_reason('fail')
         return 'fail'
     if ds.GetLayerCount() != 1:
-        gdaltest.post_reason('fail')
         return 'fail'
 
     return 'success'
@@ -1361,28 +1340,22 @@ def test_ogr_wfs_vsimem_wfs110_minimal_instance(with_and_without_streaming):
 """)
     ds = ogr.Open('WFS:/vsimem/wfs_endpoint')
     if ds is None:
-        gdaltest.post_reason('fail')
         return 'fail'
     if ds.GetLayerCount() != 0:
-        gdaltest.post_reason('fail')
         return 'fail'
 
     if ds.GetMetadataDomainList() != ['', 'xml:capabilities']:
-        gdaltest.post_reason('fail')
         return 'fail'
     if ds.GetMetadata() != {'TITLE': 'LDS Testing'}:
-        gdaltest.post_reason('fail')
         print(ds.GetMetadata())
         return 'fail'
     if len(ds.GetMetadata_List("xml:capabilities")) != 1:
-        gdaltest.post_reason('fail')
         return 'fail'
 
     gdal.PushErrorHandler()
     ds = ogr.Open('WFS:/vsimem/wfs_endpoint', update=1)
     gdal.PopErrorHandler()
     if ds is not None:
-        gdaltest.post_reason('fail')
         return 'fail'
 
     return 'success'
@@ -1407,14 +1380,11 @@ def test_ogr_wfs_vsimem_wfs110_one_layer_missing_describefeaturetype(with_and_wi
 """)
     ds = ogr.Open('WFS:/vsimem/wfs_endpoint')
     if ds is None:
-        gdaltest.post_reason('fail')
         return 'fail'
     if ds.GetLayerCount() != 1:
-        gdaltest.post_reason('fail')
         return 'fail'
     lyr = ds.GetLayer(0)
     if lyr.GetName() != 'my_layer':
-        gdaltest.post_reason('fail')
         return 'fail'
 
     # Missing DescribeFeatureType
@@ -1423,10 +1393,8 @@ def test_ogr_wfs_vsimem_wfs110_one_layer_missing_describefeaturetype(with_and_wi
     lyr_defn = lyr.GetLayerDefn()
     gdal.PopErrorHandler()
     if gdal.GetLastErrorMsg() == '':
-        gdaltest.post_reason('fail')
         return 'fail'
     if lyr_defn.GetFieldCount() != 0:
-        gdaltest.post_reason('fail')
         return 'fail'
 
     lyr_defn = lyr.GetLayerDefn()
@@ -1452,10 +1420,8 @@ def test_ogr_wfs_vsimem_wfs110_one_layer_invalid_describefeaturetype(with_and_wi
     lyr_defn = lyr.GetLayerDefn()
     gdal.PopErrorHandler()
     if gdal.GetLastErrorMsg() == '':
-        gdaltest.post_reason('fail')
         return 'fail'
     if lyr_defn.GetFieldCount() != 0:
-        gdaltest.post_reason('fail')
         return 'fail'
 
     return 'success'
@@ -1479,10 +1445,8 @@ def test_ogr_wfs_vsimem_wfs110_one_layer_describefeaturetype_missing_schema(with
     lyr_defn = lyr.GetLayerDefn()
     gdal.PopErrorHandler()
     if gdal.GetLastErrorMsg() == '':
-        gdaltest.post_reason('fail')
         return 'fail'
     if lyr_defn.GetFieldCount() != 0:
-        gdaltest.post_reason('fail')
         return 'fail'
 
     return 'success'
@@ -1522,17 +1486,14 @@ def test_ogr_wfs_vsimem_wfs110_one_layer_describefeaturetype(with_and_without_st
 
     lyr_defn = lyr.GetLayerDefn()
     if lyr_defn.GetFieldCount() != 8:
-        gdaltest.post_reason('fail')
         return 'fail'
     if lyr_defn.GetGeomFieldCount() != 1:
-        gdaltest.post_reason('fail')
         return 'fail'
 
     ds = gdal.OpenEx('WFS:/vsimem/wfs_endpoint', open_options=['EXPOSE_GML_ID=NO'])
     lyr = ds.GetLayer(0)
     lyr_defn = lyr.GetLayerDefn()
     if lyr_defn.GetFieldCount() != 7:
-        gdaltest.post_reason('fail')
         return 'fail'
 
     gdal.SetConfigOption('GML_EXPOSE_GML_ID', 'YES')
@@ -1541,7 +1502,6 @@ def test_ogr_wfs_vsimem_wfs110_one_layer_describefeaturetype(with_and_without_st
     lyr = ds.GetLayer(0)
     lyr_defn = lyr.GetLayerDefn()
     if lyr_defn.GetFieldCount() != 7:
-        gdaltest.post_reason('fail')
         return 'fail'
 
     gdal.SetConfigOption('GML_EXPOSE_GML_ID', 'NO')
@@ -1550,7 +1510,6 @@ def test_ogr_wfs_vsimem_wfs110_one_layer_describefeaturetype(with_and_without_st
     lyr = ds.GetLayer(0)
     lyr_defn = lyr.GetLayerDefn()
     if lyr_defn.GetFieldCount() != 8:
-        gdaltest.post_reason('fail')
         return 'fail'
 
     gdal.SetConfigOption('GML_EXPOSE_GML_ID', 'NO')
@@ -1559,7 +1518,6 @@ def test_ogr_wfs_vsimem_wfs110_one_layer_describefeaturetype(with_and_without_st
     lyr = ds.GetLayer(0)
     lyr_defn = lyr.GetLayerDefn()
     if lyr_defn.GetFieldCount() != 7:
-        gdaltest.post_reason('fail')
         return 'fail'
 
     return 'success'
@@ -1578,7 +1536,6 @@ def test_ogr_wfs_vsimem_wfs110_one_layer_xmldescriptionfile_to_be_updated(with_a
     ds = ogr.Open('/vsimem/ogr_wfs_xmldescriptionfile_to_be_updated.xml')
     lyr = ds.GetLayer(0)
     if lyr.GetName() != 'my_layer':
-        gdaltest.post_reason('fail')
         return 'fail'
     ds = None
 
@@ -1597,7 +1554,6 @@ def test_ogr_wfs_vsimem_wfs110_one_layer_xmldescriptionfile_to_be_updated(with_a
   </WFS_Capabilities>
 </OGRWFSDataSource>
 """:
-        gdaltest.post_reason('fail')
         print(data)
         return 'fail'
 
@@ -1643,7 +1599,6 @@ def test_ogr_wfs_vsimem_wfs110_one_layer_xmldescriptionfile_to_be_updated(with_a
   </OGRWFSLayer>
 </OGRWFSDataSource>
 """:
-        gdaltest.post_reason('fail')
         print(data)
         return 'fail'
 
@@ -1678,7 +1633,6 @@ def test_ogr_wfs_vsimem_wfs110_one_layer_xmldescriptionfile_to_be_updated(with_a
     ds = ogr.Open('/vsimem/ogr_wfs_xmldescriptionfile_to_be_updated.xml')
     lyr = ds.GetLayer(0)
     if lyr.GetLayerDefn().GetFieldCount() != 2:
-        gdaltest.post_reason('fail')
         return 'fail'
     ds = None
 
@@ -1699,10 +1653,8 @@ def test_ogr_wfs_vsimem_wfs110_one_layer_missing_getfeaturecount_no_hits(with_an
     count = lyr.GetFeatureCount()
     gdal.PopErrorHandler()
     if gdal.GetLastErrorMsg() == '':
-        gdaltest.post_reason('fail')
         return 'fail'
     if count != 0:
-        gdaltest.post_reason('fail')
         print(count)
         return 'fail'
 
@@ -1746,10 +1698,8 @@ def test_ogr_wfs_vsimem_wfs110_one_layer_missing_getfeaturecount_with_hits(with_
     count = lyr.GetFeatureCount()
     gdal.PopErrorHandler()
     if gdal.GetLastErrorMsg() == '':
-        gdaltest.post_reason('fail')
         return 'fail'
     if count != 0:
-        gdaltest.post_reason('fail')
         print(count)
         return 'fail'
 
@@ -1773,10 +1723,8 @@ def test_ogr_wfs_vsimem_wfs110_one_layer_invalid_getfeaturecount_with_hits(with_
     count = lyr.GetFeatureCount()
     gdal.PopErrorHandler()
     if gdal.GetLastErrorMsg() == '':
-        gdaltest.post_reason('fail')
         return 'fail'
     if count != 0:
-        gdaltest.post_reason('fail')
         print(count)
         return 'fail'
 
@@ -1800,10 +1748,8 @@ def test_ogr_wfs_vsimem_wfs110_one_layer_getfeaturecount_with_hits_missing_Featu
     count = lyr.GetFeatureCount()
     gdal.PopErrorHandler()
     if gdal.GetLastErrorMsg() == '':
-        gdaltest.post_reason('fail')
         return 'fail'
     if count != 0:
-        gdaltest.post_reason('fail')
         print(count)
         return 'fail'
 
@@ -1827,10 +1773,8 @@ def test_ogr_wfs_vsimem_wfs110_one_layer_getfeaturecount_with_hits_invalid_xml(w
     count = lyr.GetFeatureCount()
     gdal.PopErrorHandler()
     if gdal.GetLastErrorMsg() == '':
-        gdaltest.post_reason('fail')
         return 'fail'
     if count != 0:
-        gdaltest.post_reason('fail')
         print(count)
         return 'fail'
 
@@ -1854,10 +1798,8 @@ def test_ogr_wfs_vsimem_wfs110_one_layer_getfeaturecount_with_hits_ServiceExcept
     count = lyr.GetFeatureCount()
     gdal.PopErrorHandler()
     if gdal.GetLastErrorMsg() == '':
-        gdaltest.post_reason('fail')
         return 'fail'
     if count != 0:
-        gdaltest.post_reason('fail')
         print(count)
         return 'fail'
 
@@ -1880,10 +1822,8 @@ def test_ogr_wfs_vsimem_wfs110_one_layer_getfeaturecount_with_hits_missing_numbe
     count = lyr.GetFeatureCount()
     gdal.PopErrorHandler()
     if gdal.GetLastErrorMsg() == '':
-        gdaltest.post_reason('fail')
         return 'fail'
     if count != 0:
-        gdaltest.post_reason('fail')
         print(count)
         return 'fail'
 
@@ -1916,7 +1856,6 @@ def test_ogr_wfs_vsimem_wfs110_one_layer_getfeaturecount_with_hits(with_and_with
 
     count = lyr.GetFeatureCount()
     if count != 1:
-        gdaltest.post_reason('fail')
         print(count)
         return 'fail'
 
@@ -1937,10 +1876,8 @@ def test_ogr_wfs_vsimem_wfs110_one_layer_missing_getfeature(with_and_without_str
     f = lyr.GetNextFeature()
     gdal.PopErrorHandler()
     if gdal.GetLastErrorMsg() == '':
-        gdaltest.post_reason('fail')
         return 'fail'
     if f is not None:
-        gdaltest.post_reason('fail')
         return 'fail'
 
     return 'success'
@@ -1964,10 +1901,8 @@ def test_ogr_wfs_vsimem_wfs110_one_layer_invalid_getfeature(with_and_without_str
     f = lyr.GetNextFeature()
     gdal.PopErrorHandler()
     if gdal.GetLastErrorMsg() == '':
-        gdaltest.post_reason('fail')
         return 'fail'
     if f is not None:
-        gdaltest.post_reason('fail')
         return 'fail'
 
     return 'success'
@@ -1991,11 +1926,9 @@ def test_ogr_wfs_vsimem_wfs110_one_layer_exception_getfeature(with_and_without_s
     f = lyr.GetNextFeature()
     gdal.PopErrorHandler()
     if gdal.GetLastErrorMsg().find('Error returned by server') < 0:
-        gdaltest.post_reason('fail')
         print(gdal.GetLastErrorMsg())
         return 'fail'
     if f is not None:
-        gdaltest.post_reason('fail')
         return 'fail'
 
     return 'success'
@@ -2060,14 +1993,12 @@ def test_ogr_wfs_vsimem_wfs110_one_layer_getfeature(with_and_without_streaming):
     if f.gml_id != 'my_layer.1' or f.boolean != 1 or f.str != 'str' or f.short != 1 or \
        f.int != 123456789 or f.float != 1.2 or f.double != 1.23 or f.dt != '2015-04-17T12:34:56Z' or \
        f.GetGeometryRef().ExportToWkt() != 'POINT (2 49)':
-        gdaltest.post_reason('fail')
         f.DumpReadable()
         return 'fail'
 
     sql_lyr = ds.ExecuteSQL('SELECT * FROM my_layer')
     f = sql_lyr.GetNextFeature()
     if f.gml_id != 'my_layer.1':
-        gdaltest.post_reason('fail')
         f.DumpReadable()
         return 'fail'
     ds.ReleaseResultSet(sql_lyr)
@@ -2084,7 +2015,6 @@ def test_ogr_wfs_vsimem_wfs110_one_layer_getextent(with_and_without_streaming):
     ds = ogr.Open('WFS:/vsimem/wfs_endpoint')
     lyr = ds.GetLayer(0)
     if lyr.GetExtent() != (2, 2, 49, 49):
-        gdaltest.post_reason('fail')
         print(lyr.GetExtent())
         return 'fail'
 
@@ -2108,10 +2038,8 @@ def test_ogr_wfs_vsimem_wfs110_one_layer_getextent_without_getfeature(with_and_w
     extent = lyr.GetExtent()
     gdal.PopErrorHandler()
     if gdal.GetLastErrorMsg() == '':
-        gdaltest.post_reason('fail')
         return 'fail'
     if extent != (0, 0, 0, 0):
-        gdaltest.post_reason('fail')
         print(extent)
         return 'fail'
 
@@ -2178,7 +2106,6 @@ def test_ogr_wfs_vsimem_wfs110_one_layer_getextent_optimized(with_and_without_st
     ds = ogr.Open('WFS:/vsimem/wfs_endpoint')
     lyr = ds.GetLayer(0)
     if lyr.GetExtent() != (-180.0, 180.0, -90.0, 90.0):
-        gdaltest.post_reason('fail')
         print(lyr.GetExtent())
         return 'fail'
 
@@ -2187,14 +2114,12 @@ def test_ogr_wfs_vsimem_wfs110_one_layer_getextent_optimized(with_and_without_st
     got_extent = lyr.GetExtent()
     gdal.PopErrorHandler()
     if got_extent != (0.0, 0.0, 0.0, 0.0):
-        gdaltest.post_reason('fail')
         print(got_extent)
         return 'fail'
 
     ds = gdal.OpenEx('WFS:/vsimem/wfs_endpoint', open_options=['TRUST_CAPABILITIES_BOUNDS=YES'])
     lyr = ds.GetLayer(1)
     if lyr.GetExtent() != (-170.0, 170.0, -80.0, 80.0):
-        gdaltest.post_reason('fail')
         print(lyr.GetExtent())
         return 'fail'
 
@@ -2210,7 +2135,6 @@ def test_ogr_wfs_vsimem_wfs110_one_layer_getextent_optimized(with_and_without_st
         got_extent = lyr.GetExtent()
         for i in range(4):
             if abs(expected_extent[i] - got_extent[i]) > 1e-5:
-                gdaltest.post_reason('fail')
                 print(got_extent)
                 return 'fail'
 
@@ -2308,7 +2232,6 @@ def test_ogr_wfs_vsimem_wfs110_one_layer_getfeature_ogr_getfeature(with_and_with
 
     f = lyr.GetFeature(100)
     if f.gml_id != 'my_layer.100':
-        gdaltest.post_reason('fail')
         f.DumpReadable()
         return 'fail'
 
@@ -2347,10 +2270,8 @@ def test_ogr_wfs_vsimem_wfs110_one_layer_filter_gml_id_failed(with_and_without_s
     f = lyr.GetNextFeature()
     gdal.PopErrorHandler()
     if gdal.GetLastErrorMsg() == '':
-        gdaltest.post_reason('fail')
         return 'fail'
     if f is not None:
-        gdaltest.post_reason('fail')
         return 'fail'
 
     return 'success'
@@ -2401,7 +2322,6 @@ def test_ogr_wfs_vsimem_wfs110_one_layer_filter_gml_id_success(with_and_without_
 
     f = lyr.GetNextFeature()
     if f is None:
-        gdaltest.post_reason('fail')
         return 'fail'
 
     return 'success'
@@ -2452,7 +2372,6 @@ def test_ogr_wfs_vsimem_wfs110_one_layer_filter(with_and_without_streaming):
 
     f = lyr.GetNextFeature()
     if f is None:
-        gdaltest.post_reason('fail')
         return 'fail'
 
     return 'success'
@@ -2503,7 +2422,6 @@ def test_ogr_wfs_vsimem_wfs110_one_layer_filter_spatial_ops(with_and_without_str
     ret = lyr.SetAttributeFilter("ST_Intersects(shape)")
     gdal.PopErrorHandler()
     if ret == 0 or gdal.GetLastErrorMsg().find('Wrong number of arguments for ST_Intersects') < 0:
-        gdaltest.post_reason('fail')
         print(gdal.GetLastErrorMsg())
         return 'fail'
 
@@ -2511,7 +2429,6 @@ def test_ogr_wfs_vsimem_wfs110_one_layer_filter_spatial_ops(with_and_without_str
     ret = lyr.SetAttributeFilter("ST_Intersects(shape, 5)")
     gdal.PopErrorHandler()
     if ret == 0 or gdal.GetLastErrorMsg().find('Wrong field type for argument 2 of ST_Intersects') < 0:
-        gdaltest.post_reason('fail')
         print(gdal.GetLastErrorMsg())
         return 'fail'
 
@@ -2519,7 +2436,6 @@ def test_ogr_wfs_vsimem_wfs110_one_layer_filter_spatial_ops(with_and_without_str
     ret = lyr.SetAttributeFilter("ST_Intersects(shape, ST_MakeEnvelope(1))")
     gdal.PopErrorHandler()
     if ret == 0 or gdal.GetLastErrorMsg().find('Wrong number of arguments for ST_MakeEnvelope') < 0:
-        gdaltest.post_reason('fail')
         print(gdal.GetLastErrorMsg())
         return 'fail'
 
@@ -2527,7 +2443,6 @@ def test_ogr_wfs_vsimem_wfs110_one_layer_filter_spatial_ops(with_and_without_str
     ret = lyr.SetAttributeFilter("ST_Intersects(shape, ST_MakeEnvelope(1,1,1,'a'))")
     gdal.PopErrorHandler()
     if ret == 0 or gdal.GetLastErrorMsg().find('Wrong field type for argument 4 of ST_MakeEnvelope') < 0:
-        gdaltest.post_reason('fail')
         print(gdal.GetLastErrorMsg())
         return 'fail'
 
@@ -2535,7 +2450,6 @@ def test_ogr_wfs_vsimem_wfs110_one_layer_filter_spatial_ops(with_and_without_str
     ret = lyr.SetAttributeFilter("ST_Intersects(shape, ST_MakeEnvelope(1,1,1,1,3.5))")
     gdal.PopErrorHandler()
     if ret == 0 or gdal.GetLastErrorMsg().find('Wrong field type for argument 5 of ST_MakeEnvelope') < 0:
-        gdaltest.post_reason('fail')
         print(gdal.GetLastErrorMsg())
         return 'fail'
 
@@ -2543,7 +2457,6 @@ def test_ogr_wfs_vsimem_wfs110_one_layer_filter_spatial_ops(with_and_without_str
     ret = lyr.SetAttributeFilter("ST_Intersects(shape, ST_MakeEnvelope(1,1,1,1,'not_a_srs'))")
     gdal.PopErrorHandler()
     if ret == 0 or gdal.GetLastErrorMsg().find('Wrong value for argument 5 of ST_MakeEnvelope') < 0:
-        gdaltest.post_reason('fail')
         print(gdal.GetLastErrorMsg())
         return 'fail'
 
@@ -2551,7 +2464,6 @@ def test_ogr_wfs_vsimem_wfs110_one_layer_filter_spatial_ops(with_and_without_str
     ret = lyr.SetAttributeFilter("ST_Intersects(shape, ST_MakeEnvelope(1,1,1,1,-5))")
     gdal.PopErrorHandler()
     if ret == 0 or gdal.GetLastErrorMsg().find('Wrong value for argument 5 of ST_MakeEnvelope') < 0:
-        gdaltest.post_reason('fail')
         print(gdal.GetLastErrorMsg())
         return 'fail'
 
@@ -2559,7 +2471,6 @@ def test_ogr_wfs_vsimem_wfs110_one_layer_filter_spatial_ops(with_and_without_str
     ret = lyr.SetAttributeFilter("ST_Intersects(shape, ST_GeomFromText(1,2,3))")
     gdal.PopErrorHandler()
     if ret == 0 or gdal.GetLastErrorMsg().find('Wrong number of arguments for ST_GeomFromText') < 0:
-        gdaltest.post_reason('fail')
         print(gdal.GetLastErrorMsg())
         return 'fail'
 
@@ -2567,7 +2478,6 @@ def test_ogr_wfs_vsimem_wfs110_one_layer_filter_spatial_ops(with_and_without_str
     ret = lyr.SetAttributeFilter("ST_Intersects(shape, ST_GeomFromText(1))")
     gdal.PopErrorHandler()
     if ret == 0 or gdal.GetLastErrorMsg().find('Wrong field type for argument 1 of ST_GeomFromText') < 0:
-        gdaltest.post_reason('fail')
         print(gdal.GetLastErrorMsg())
         return 'fail'
 
@@ -2575,7 +2485,6 @@ def test_ogr_wfs_vsimem_wfs110_one_layer_filter_spatial_ops(with_and_without_str
     ret = lyr.SetAttributeFilter("ST_Intersects(shape, ST_GeomFromText('INVALID_GEOM'))")
     gdal.PopErrorHandler()
     if ret == 0 or gdal.GetLastErrorMsg().find('Wrong value for argument 1 of ST_GeomFromText') < 0:
-        gdaltest.post_reason('fail')
         print(gdal.GetLastErrorMsg())
         return 'fail'
 
@@ -2583,7 +2492,6 @@ def test_ogr_wfs_vsimem_wfs110_one_layer_filter_spatial_ops(with_and_without_str
     ret = lyr.SetAttributeFilter("ST_Intersects(shape, ST_GeomFromText('POINT(0 0)', 'invalid_srs'))")
     gdal.PopErrorHandler()
     if ret == 0 or gdal.GetLastErrorMsg().find('Wrong value for argument 2 of ST_GeomFromText') < 0:
-        gdaltest.post_reason('fail')
         print(gdal.GetLastErrorMsg())
         return 'fail'
 
@@ -2591,7 +2499,6 @@ def test_ogr_wfs_vsimem_wfs110_one_layer_filter_spatial_ops(with_and_without_str
     ret = lyr.SetAttributeFilter("ST_DWithin(shape)")
     gdal.PopErrorHandler()
     if ret == 0 or gdal.GetLastErrorMsg().find('Wrong number of arguments for ST_DWithin') < 0:
-        gdaltest.post_reason('fail')
         print(gdal.GetLastErrorMsg())
         return 'fail'
 
@@ -2599,7 +2506,6 @@ def test_ogr_wfs_vsimem_wfs110_one_layer_filter_spatial_ops(with_and_without_str
     ret = lyr.SetAttributeFilter("ST_DWithin(shape,'a',5)")
     gdal.PopErrorHandler()
     if ret == 0 or gdal.GetLastErrorMsg().find('Wrong field type for argument 2 of ST_DWithin') < 0:
-        gdaltest.post_reason('fail')
         print(gdal.GetLastErrorMsg())
         return 'fail'
 
@@ -2607,7 +2513,6 @@ def test_ogr_wfs_vsimem_wfs110_one_layer_filter_spatial_ops(with_and_without_str
     ret = lyr.SetAttributeFilter("ST_DWithin(shape,shape,'a')")
     gdal.PopErrorHandler()
     if ret == 0 or gdal.GetLastErrorMsg().find('Wrong field type for argument 3 of ST_DWithin') < 0:
-        gdaltest.post_reason('fail')
         print(gdal.GetLastErrorMsg())
         return 'fail'
 
@@ -2622,7 +2527,6 @@ def test_ogr_wfs_vsimem_wfs110_one_layer_filter_spatial_ops(with_and_without_str
 
     f = lyr.GetNextFeature()
     if f is None:
-        gdaltest.post_reason('fail')
         return 'fail'
 
     gdal.FileFromMemBuffer('/vsimem/wfs_endpoint?SERVICE=WFS&VERSION=1.1.0&REQUEST=GetFeature&TYPENAME=my_layer&FILTER=%3CFilter%20xmlns%3D%22http:%2F%2Fwww.opengis.net%2Fogc%22%20xmlns:gml%3D%22http:%2F%2Fwww.opengis.net%2Fgml%22%3E%3COr%3E%3COr%3E%3CIntersects%3E%3CPropertyName%3Eshape%3C%2FPropertyName%3E%3Cgml:Polygon%20srsName%3D%22urn:ogc:def:crs:EPSG::4326%22%20gml:id%3D%22id1%22%3E%3Cgml:exterior%3E%3Cgml:LinearRing%3E%3Cgml:posList%3E48.5%201.5%2049.5%202.5%2049.5%202.5%2048.5%202.5%2048.5%201.5%3C%2Fgml:posList%3E%3C%2Fgml:LinearRing%3E%3C%2Fgml:exterior%3E%3C%2Fgml:Polygon%3E%3C%2FIntersects%3E%3CIntersects%3E%3CPropertyName%3Eshape%3C%2FPropertyName%3E%3Cgml:Polygon%20srsName%3D%22urn:ogc:def:crs:EPSG::4326%22%20gml:id%3D%22id2%22%3E%3Cgml:exterior%3E%3Cgml:LinearRing%3E%3Cgml:posList%3E48.5%201.5%2049.5%202.5%2049.5%202.5%2048.5%202.5%2048.5%201.5%3C%2Fgml:posList%3E%3C%2Fgml:LinearRing%3E%3C%2Fgml:exterior%3E%3C%2Fgml:Polygon%3E%3C%2FIntersects%3E%3C%2FOr%3E%3CIntersects%3E%3CPropertyName%3Eshape%3C%2FPropertyName%3E%3Cgml:Polygon%20srsName%3D%22EPSG:4326%22%20gml:id%3D%22id3%22%3E%3Cgml:exterior%3E%3Cgml:LinearRing%3E%3Cgml:posList%3E1.5%2048.5%202.5%2049.5%202.5%2049.5%202.5%2048.5%201.5%2048.5%3C%2Fgml:posList%3E%3C%2Fgml:LinearRing%3E%3C%2Fgml:exterior%3E%3C%2Fgml:Polygon%3E%3C%2FIntersects%3E%3C%2FOr%3E%3C%2FFilter%3E',
@@ -2634,7 +2538,6 @@ def test_ogr_wfs_vsimem_wfs110_one_layer_filter_spatial_ops(with_and_without_str
 
     f = lyr.GetNextFeature()
     if f is None:
-        gdaltest.post_reason('fail')
         return 'fail'
 
     gdal.FileFromMemBuffer('/vsimem/wfs_endpoint?SERVICE=WFS&VERSION=1.1.0&REQUEST=GetFeature&TYPENAME=my_layer&FILTER=%3CFilter%20xmlns%3D%22http:%2F%2Fwww.opengis.net%2Fogc%22%20xmlns:gml%3D%22http:%2F%2Fwww.opengis.net%2Fgml%22%3E%3CDWithin%3E%3CPropertyName%3Eshape%3C%2FPropertyName%3E%3Cgml:Envelope%20srsName%3D%22urn:ogc:def:crs:EPSG::4326%22%3E%3Cgml:lowerCorner%3E48.5%201.5%3C%2Fgml:lowerCorner%3E%3Cgml:upperCorner%3E49.5%202.5%3C%2Fgml:upperCorner%3E%3C%2Fgml:Envelope%3E%3CDistance%20unit%3D%22m%22%3E5%3C%2FDistance%3E%3C%2FDWithin%3E%3C%2FFilter%3E',
@@ -2644,7 +2547,6 @@ def test_ogr_wfs_vsimem_wfs110_one_layer_filter_spatial_ops(with_and_without_str
 
     f = lyr.GetNextFeature()
     if f is None:
-        gdaltest.post_reason('fail')
         return 'fail'
 
     sql_lyr = ds.ExecuteSQL("SELECT * FROM my_layer WHERE ST_Intersects(shape, ST_GeomFromText('POLYGON((1.5 48.5,2.5 49.5,2.5 49.5,2.5 48.5,1.5 48.5)))')) OR " +
@@ -2652,7 +2554,6 @@ def test_ogr_wfs_vsimem_wfs110_one_layer_filter_spatial_ops(with_and_without_str
                             "ST_Intersects(shape, ST_GeomFromText('POLYGON((1.5 48.5,2.5 49.5,2.5 49.5,2.5 48.5,1.5 48.5)))', 'EPSG:4326'))")
     f = sql_lyr.GetNextFeature()
     if f is None:
-        gdaltest.post_reason('fail')
         return 'fail'
     ds.ReleaseResultSet(sql_lyr)
 
@@ -2662,7 +2563,6 @@ def test_ogr_wfs_vsimem_wfs110_one_layer_filter_spatial_ops(with_and_without_str
     f = sql_lyr.GetNextFeature()
     gdal.PopErrorHandler()
     if f is not None:
-        gdaltest.post_reason('fail')
         return 'fail'
     ds.ReleaseResultSet(sql_lyr)
 
@@ -2714,14 +2614,12 @@ def test_ogr_wfs_vsimem_wfs110_one_layer_spatial_filter(with_and_without_streami
 
     f = lyr.GetNextFeature()
     if f is None:
-        gdaltest.post_reason('fail')
         return 'fail'
 
     if gdal.GetConfigOption('OGR_WFS_USE_STREAMING') == 'NO':
         lyr.SetSpatialFilterRect(1.5, 48.5, 2.5, 49.5)
         f = lyr.GetNextFeature()
         if f is None:
-            gdaltest.post_reason('fail')
             return 'fail'
 
         lyr.SetSpatialFilter(None)
@@ -2731,7 +2629,6 @@ def test_ogr_wfs_vsimem_wfs110_one_layer_spatial_filter(with_and_without_streami
         lyr.SetSpatialFilterRect(1, 48, 3, 50)
         f = lyr.GetNextFeature()
         if f is None:
-            gdaltest.post_reason('fail')
             return 'fail'
 
     return 'success'
@@ -2783,7 +2680,6 @@ def test_ogr_wfs_vsimem_wfs110_one_layer_spatial_filter_and_attribute_filter(wit
 
     f = lyr.GetNextFeature()
     if f is None:
-        gdaltest.post_reason('fail')
         return 'fail'
 
     return 'success'
@@ -2875,7 +2771,6 @@ def test_ogr_wfs_vsimem_wfs110_insertfeature(with_and_without_streaming):
     ret = lyr.CreateFeature(f)
     gdal.PopErrorHandler()
     if ret == 0:
-        gdaltest.post_reason('fail')
         return 'fail'
 
     wfs_insert_url = """/vsimem/wfs_endpoint&POSTFIELDS=<?xml version="1.0"?>
@@ -2898,7 +2793,6 @@ def test_ogr_wfs_vsimem_wfs110_insertfeature(with_and_without_streaming):
     ret = lyr.CreateFeature(f)
     gdal.PopErrorHandler()
     if ret == 0:
-        gdaltest.post_reason('fail')
         return 'fail'
 
     gdal.FileFromMemBuffer(wfs_insert_url, "<invalid_xml")
@@ -2908,7 +2802,6 @@ def test_ogr_wfs_vsimem_wfs110_insertfeature(with_and_without_streaming):
     ret = lyr.CreateFeature(f)
     gdal.PopErrorHandler()
     if ret == 0:
-        gdaltest.post_reason('fail')
         return 'fail'
 
     gdal.FileFromMemBuffer(wfs_insert_url, "<ServiceExceptionReport/>")
@@ -2918,7 +2811,6 @@ def test_ogr_wfs_vsimem_wfs110_insertfeature(with_and_without_streaming):
     ret = lyr.CreateFeature(f)
     gdal.PopErrorHandler()
     if ret == 0 or gdal.GetLastErrorMsg().find('Error returned by server') < 0:
-        gdaltest.post_reason('fail')
         print(gdal.GetLastErrorMsg())
         return 'fail'
 
@@ -2929,7 +2821,6 @@ def test_ogr_wfs_vsimem_wfs110_insertfeature(with_and_without_streaming):
     ret = lyr.CreateFeature(f)
     gdal.PopErrorHandler()
     if ret == 0 or gdal.GetLastErrorMsg().find('Cannot find <TransactionResponse>') < 0:
-        gdaltest.post_reason('fail')
         print(gdal.GetLastErrorMsg())
         return 'fail'
 
@@ -2943,7 +2834,6 @@ def test_ogr_wfs_vsimem_wfs110_insertfeature(with_and_without_streaming):
     ret = lyr.CreateFeature(f)
     gdal.PopErrorHandler()
     if ret == 0:
-        gdaltest.post_reason('fail')
         return 'fail'
 
     gdal.FileFromMemBuffer(wfs_insert_url,
@@ -2961,7 +2851,6 @@ def test_ogr_wfs_vsimem_wfs110_insertfeature(with_and_without_streaming):
     ret = lyr.CreateFeature(f)
     gdal.PopErrorHandler()
     if ret == 0:
-        gdaltest.post_reason('fail')
         return 'fail'
 
     gdal.FileFromMemBuffer(wfs_insert_url,
@@ -2978,22 +2867,18 @@ def test_ogr_wfs_vsimem_wfs110_insertfeature(with_and_without_streaming):
     sql_lyr = ds.ExecuteSQL('SELECT _LAST_INSERTED_FIDS_ FROM not_existing_layer')
     gdal.PopErrorHandler()
     if sql_lyr is not None:
-        gdaltest.post_reason('fail')
         return 'fail'
 
     f = ogr.Feature(lyr.GetLayerDefn())
     ret = lyr.CreateFeature(f)
     if ret != 0:
-        gdaltest.post_reason('fail')
         return 'fail'
     if f.GetFID() != 100:
-        gdaltest.post_reason('fail')
         return 'fail'
 
     sql_lyr = ds.ExecuteSQL('SELECT _LAST_INSERTED_FIDS_ FROM my_layer')
     got_f = sql_lyr.GetNextFeature()
     if got_f is not None:
-        gdaltest.post_reason('fail')
         return 'fail'
     ds.ReleaseResultSet(sql_lyr)
 
@@ -3001,28 +2886,23 @@ def test_ogr_wfs_vsimem_wfs110_insertfeature(with_and_without_streaming):
     ret = lyr.CreateFeature(f)
     gdal.PopErrorHandler()
     if ret == 0 or gdal.GetLastErrorMsg().find('Cannot insert a feature when gml_id field is already set') < 0:
-        gdaltest.post_reason('fail')
         print(gdal.GetLastErrorMsg())
         return 'fail'
 
     # Empty StartTransaction + CommitTransaction
     ret = lyr.StartTransaction()
     if ret != 0:
-        gdaltest.post_reason('fail')
         return 'fail'
     ret = lyr.CommitTransaction()
     if ret != 0:
-        gdaltest.post_reason('fail')
         return 'fail'
 
     # Empty StartTransaction + RollbackTransaction
     ret = lyr.StartTransaction()
     if ret != 0:
-        gdaltest.post_reason('fail')
         return 'fail'
     ret = lyr.RollbackTransaction()
     if ret != 0:
-        gdaltest.post_reason('fail')
         return 'fail'
 
     # Isolated CommitTransaction
@@ -3030,7 +2910,6 @@ def test_ogr_wfs_vsimem_wfs110_insertfeature(with_and_without_streaming):
     ret = lyr.CommitTransaction()
     gdal.PopErrorHandler()
     if ret == 0:
-        gdaltest.post_reason('fail')
         return 'fail'
 
     # Isolated RollbackTransaction
@@ -3038,51 +2917,42 @@ def test_ogr_wfs_vsimem_wfs110_insertfeature(with_and_without_streaming):
     ret = lyr.RollbackTransaction()
     gdal.PopErrorHandler()
     if ret == 0:
-        gdaltest.post_reason('fail')
         return 'fail'
 
     # 2 StartTransaction in a row
     ret = lyr.StartTransaction()
     if ret != 0:
-        gdaltest.post_reason('fail')
         return 'fail'
     gdal.PushErrorHandler()
     ret = lyr.StartTransaction()
     gdal.PopErrorHandler()
     if ret == 0:
-        gdaltest.post_reason('fail')
         return 'fail'
     ret = lyr.RollbackTransaction()
     if ret != 0:
-        gdaltest.post_reason('fail')
         return 'fail'
 
     # Missing TransactionSummary
     ret = lyr.StartTransaction()
     if ret != 0:
-        gdaltest.post_reason('fail')
         return 'fail'
     f = ogr.Feature(lyr.GetLayerDefn())
     ret = lyr.CreateFeature(f)
     if ret != 0:
-        gdaltest.post_reason('fail')
         return 'fail'
     gdal.PushErrorHandler()
     ret = lyr.CommitTransaction()
     gdal.PopErrorHandler()
     if ret == 0 or gdal.GetLastErrorMsg().find('Only 0 features were inserted whereas 1 where expected') < 0:
-        gdaltest.post_reason('fail')
         print(gdal.GetLastErrorMsg())
         return 'fail'
 
     ret = lyr.StartTransaction()
     if ret != 0:
-        gdaltest.post_reason('fail')
         return 'fail'
     f = ogr.Feature(lyr.GetLayerDefn())
     ret = lyr.CreateFeature(f)
     if ret != 0:
-        gdaltest.post_reason('fail')
         return 'fail'
 
     gdal.FileFromMemBuffer(wfs_insert_url, "<invalid_xml")
@@ -3090,18 +2960,15 @@ def test_ogr_wfs_vsimem_wfs110_insertfeature(with_and_without_streaming):
     ret = lyr.CommitTransaction()
     gdal.PopErrorHandler()
     if ret == 0 or gdal.GetLastErrorMsg().find('Invalid XML content') < 0:
-        gdaltest.post_reason('fail')
         print(gdal.GetLastErrorMsg())
         return 'fail'
 
     ret = lyr.StartTransaction()
     if ret != 0:
-        gdaltest.post_reason('fail')
         return 'fail'
     f = ogr.Feature(lyr.GetLayerDefn())
     ret = lyr.CreateFeature(f)
     if ret != 0:
-        gdaltest.post_reason('fail')
         return 'fail'
 
     gdal.FileFromMemBuffer(wfs_insert_url, "<dummy_xml/>")
@@ -3109,18 +2976,15 @@ def test_ogr_wfs_vsimem_wfs110_insertfeature(with_and_without_streaming):
     ret = lyr.CommitTransaction()
     gdal.PopErrorHandler()
     if ret == 0 or gdal.GetLastErrorMsg().find('Cannot find <TransactionResponse>') < 0:
-        gdaltest.post_reason('fail')
         print(gdal.GetLastErrorMsg())
         return 'fail'
 
     ret = lyr.StartTransaction()
     if ret != 0:
-        gdaltest.post_reason('fail')
         return 'fail'
     f = ogr.Feature(lyr.GetLayerDefn())
     ret = lyr.CreateFeature(f)
     if ret != 0:
-        gdaltest.post_reason('fail')
         return 'fail'
 
     gdal.FileFromMemBuffer(wfs_insert_url, "<ServiceExceptionReport/>")
@@ -3128,18 +2992,15 @@ def test_ogr_wfs_vsimem_wfs110_insertfeature(with_and_without_streaming):
     ret = lyr.CommitTransaction()
     gdal.PopErrorHandler()
     if ret == 0 or gdal.GetLastErrorMsg().find('Error returned by server') < 0:
-        gdaltest.post_reason('fail')
         print(gdal.GetLastErrorMsg())
         return 'fail'
 
     ret = lyr.StartTransaction()
     if ret != 0:
-        gdaltest.post_reason('fail')
         return 'fail'
     f = ogr.Feature(lyr.GetLayerDefn())
     ret = lyr.CreateFeature(f)
     if ret != 0:
-        gdaltest.post_reason('fail')
         return 'fail'
 
     gdal.FileFromMemBuffer(wfs_insert_url,
@@ -3151,18 +3012,15 @@ def test_ogr_wfs_vsimem_wfs110_insertfeature(with_and_without_streaming):
     ret = lyr.CommitTransaction()
     gdal.PopErrorHandler()
     if ret == 0 or gdal.GetLastErrorMsg().find('Cannot find node InsertResults') < 0:
-        gdaltest.post_reason('fail')
         print(gdal.GetLastErrorMsg())
         return 'fail'
 
     ret = lyr.StartTransaction()
     if ret != 0:
-        gdaltest.post_reason('fail')
         return 'fail'
     f = ogr.Feature(lyr.GetLayerDefn())
     ret = lyr.CreateFeature(f)
     if ret != 0:
-        gdaltest.post_reason('fail')
         return 'fail'
 
     gdal.FileFromMemBuffer(wfs_insert_url,
@@ -3175,18 +3033,15 @@ def test_ogr_wfs_vsimem_wfs110_insertfeature(with_and_without_streaming):
     ret = lyr.CommitTransaction()
     gdal.PopErrorHandler()
     if ret == 0 or gdal.GetLastErrorMsg().find('Inconsistent InsertResults: did not get expected FID count') < 0:
-        gdaltest.post_reason('fail')
         print(gdal.GetLastErrorMsg())
         return 'fail'
 
     ret = lyr.StartTransaction()
     if ret != 0:
-        gdaltest.post_reason('fail')
         return 'fail'
     f = ogr.Feature(lyr.GetLayerDefn())
     ret = lyr.CreateFeature(f)
     if ret != 0:
-        gdaltest.post_reason('fail')
         return 'fail'
 
     gdal.FileFromMemBuffer(wfs_insert_url,
@@ -3202,18 +3057,15 @@ def test_ogr_wfs_vsimem_wfs110_insertfeature(with_and_without_streaming):
     ret = lyr.CommitTransaction()
     gdal.PopErrorHandler()
     if ret == 0 or gdal.GetLastErrorMsg().find('Cannot find fid') < 0:
-        gdaltest.post_reason('fail')
         print(gdal.GetLastErrorMsg())
         return 'fail'
 
     ret = lyr.StartTransaction()
     if ret != 0:
-        gdaltest.post_reason('fail')
         return 'fail'
     f = ogr.Feature(lyr.GetLayerDefn())
     ret = lyr.CreateFeature(f)
     if ret != 0:
-        gdaltest.post_reason('fail')
         return 'fail'
 
     gdal.FileFromMemBuffer(wfs_insert_url,
@@ -3228,13 +3080,11 @@ def test_ogr_wfs_vsimem_wfs110_insertfeature(with_and_without_streaming):
 """)
     ret = lyr.CommitTransaction()
     if ret != 0:
-        gdaltest.post_reason('fail')
         return 'fail'
 
     sql_lyr = ds.ExecuteSQL('SELECT _LAST_INSERTED_FIDS_ FROM my_layer')
     f = sql_lyr.GetNextFeature()
     if f.gml_id != 'my_layer.100':
-        gdaltest.post_reason('fail')
         return 'fail'
     sql_lyr.ResetReading()
     sql_lyr.SetNextByIndex(0)
@@ -3282,7 +3132,6 @@ def test_ogr_wfs_vsimem_wfs110_insertfeature(with_and_without_streaming):
     f.SetGeometry(ogr.CreateGeometryFromWkt('POINT (2 49)'))
     ret = lyr.CreateFeature(f)
     if ret != 0:
-        gdaltest.post_reason('fail')
         return 'fail'
 
     gdal.Unlink(wfs_insert_url)
@@ -3307,7 +3156,6 @@ def test_ogr_wfs_vsimem_wfs110_updatefeature(with_and_without_streaming):
     ret = lyr.CreateFeature(f)
     gdal.PopErrorHandler()
     if ret == 0:
-        gdaltest.post_reason('fail')
         return 'fail'
 
     f = ogr.Feature(lyr.GetLayerDefn())
@@ -3315,7 +3163,6 @@ def test_ogr_wfs_vsimem_wfs110_updatefeature(with_and_without_streaming):
     ret = lyr.SetFeature(f)
     gdal.PopErrorHandler()
     if ret == 0 or gdal.GetLastErrorMsg().find('Cannot update a feature when gml_id field is not set') < 0:
-        gdaltest.post_reason('fail')
         print(gdal.GetLastErrorMsg())
         return 'fail'
 
@@ -3325,7 +3172,6 @@ def test_ogr_wfs_vsimem_wfs110_updatefeature(with_and_without_streaming):
     ret = lyr.SetFeature(f)
     gdal.PopErrorHandler()
     if ret == 0:
-        gdaltest.post_reason('fail')
         print(gdal.GetLastErrorMsg())
         return 'fail'
 
@@ -3375,7 +3221,6 @@ def test_ogr_wfs_vsimem_wfs110_updatefeature(with_and_without_streaming):
     ret = lyr.SetFeature(f)
     gdal.PopErrorHandler()
     if ret == 0 or gdal.GetLastErrorMsg().find('Empty content returned by server') < 0:
-        gdaltest.post_reason('fail')
         print(gdal.GetLastErrorMsg())
         return 'fail'
 
@@ -3386,7 +3231,6 @@ def test_ogr_wfs_vsimem_wfs110_updatefeature(with_and_without_streaming):
     ret = lyr.SetFeature(f)
     gdal.PopErrorHandler()
     if ret == 0 or gdal.GetLastErrorMsg().find('Invalid XML content') < 0:
-        gdaltest.post_reason('fail')
         print(gdal.GetLastErrorMsg())
         return 'fail'
 
@@ -3397,7 +3241,6 @@ def test_ogr_wfs_vsimem_wfs110_updatefeature(with_and_without_streaming):
     ret = lyr.SetFeature(f)
     gdal.PopErrorHandler()
     if ret == 0 or gdal.GetLastErrorMsg().find('Error returned by server') < 0:
-        gdaltest.post_reason('fail')
         print(gdal.GetLastErrorMsg())
         return 'fail'
 
@@ -3408,7 +3251,6 @@ def test_ogr_wfs_vsimem_wfs110_updatefeature(with_and_without_streaming):
     ret = lyr.SetFeature(f)
     gdal.PopErrorHandler()
     if ret == 0 or gdal.GetLastErrorMsg().find('Cannot find <TransactionResponse>') < 0:
-        gdaltest.post_reason('fail')
         print(gdal.GetLastErrorMsg())
         return 'fail'
 
@@ -3417,7 +3259,6 @@ def test_ogr_wfs_vsimem_wfs110_updatefeature(with_and_without_streaming):
     f.SetField('gml_id', 'my_layer.1')
     ret = lyr.SetFeature(f)
     if ret != 0:
-        gdaltest.post_reason('fail')
         print(gdal.GetLastErrorMsg())
         return 'fail'
 
@@ -3474,7 +3315,6 @@ def test_ogr_wfs_vsimem_wfs110_updatefeature(with_and_without_streaming):
     f.SetGeometry(ogr.CreateGeometryFromWkt('POINT (2 49)'))
     ret = lyr.SetFeature(f)
     if ret != 0:
-        gdaltest.post_reason('fail')
         return 'fail'
 
     return 'success'
@@ -3495,7 +3335,6 @@ def test_ogr_wfs_vsimem_wfs110_deletefeature(with_and_without_streaming):
     ret = lyr.DeleteFeature(200)
     gdal.PopErrorHandler()
     if ret == 0:
-        gdaltest.post_reason('fail')
         print(gdal.GetLastErrorMsg())
         return 'fail'
 
@@ -3526,7 +3365,6 @@ def test_ogr_wfs_vsimem_wfs110_deletefeature(with_and_without_streaming):
     ret = lyr.DeleteFeature(200)
     gdal.PopErrorHandler()
     if ret == 0:
-        gdaltest.post_reason('fail')
         print(gdal.GetLastErrorMsg())
         return 'fail'
 
@@ -3553,7 +3391,6 @@ def test_ogr_wfs_vsimem_wfs110_deletefeature(with_and_without_streaming):
     ret = lyr.DeleteFeature(200)
     gdal.PopErrorHandler()
     if ret == 0 or gdal.GetLastErrorMsg().find('Empty content returned by server') < 0:
-        gdaltest.post_reason('fail')
         print(gdal.GetLastErrorMsg())
         return 'fail'
 
@@ -3564,7 +3401,6 @@ def test_ogr_wfs_vsimem_wfs110_deletefeature(with_and_without_streaming):
     ret = lyr.DeleteFeature(200)
     gdal.PopErrorHandler()
     if ret == 0 or gdal.GetLastErrorMsg().find('Invalid XML content') < 0:
-        gdaltest.post_reason('fail')
         print(gdal.GetLastErrorMsg())
         return 'fail'
 
@@ -3575,7 +3411,6 @@ def test_ogr_wfs_vsimem_wfs110_deletefeature(with_and_without_streaming):
     ret = lyr.DeleteFeature(200)
     gdal.PopErrorHandler()
     if ret == 0 or gdal.GetLastErrorMsg().find('Cannot find <TransactionResponse>') < 0:
-        gdaltest.post_reason('fail')
         print(gdal.GetLastErrorMsg())
         return 'fail'
 
@@ -3584,7 +3419,6 @@ def test_ogr_wfs_vsimem_wfs110_deletefeature(with_and_without_streaming):
     gdal.FileFromMemBuffer(wfs_delete_url, "<TransactionResponse/>")
     ret = lyr.DeleteFeature(200)
     if ret != 0:
-        gdaltest.post_reason('fail')
         print(gdal.GetLastErrorMsg())
         return 'fail'
 
@@ -3608,7 +3442,6 @@ def test_ogr_wfs_vsimem_wfs110_deletefeature(with_and_without_streaming):
     gdal.ErrorReset()
     sql_lyr = ds.ExecuteSQL("DELETE FROM my_layer WHERE gml_id = 'my_layer.200'")
     if gdal.GetLastErrorMsg() != '':
-        gdaltest.post_reason('fail')
         print(gdal.GetLastErrorMsg())
         return 'fail'
 
@@ -3617,7 +3450,6 @@ def test_ogr_wfs_vsimem_wfs110_deletefeature(with_and_without_streaming):
     sql_lyr = ds.ExecuteSQL("DELETE FROM ")
     gdal.PopErrorHandler()
     if gdal.GetLastErrorMsg() == '':
-        gdaltest.post_reason('fail')
         print(gdal.GetLastErrorMsg())
         return 'fail'
 
@@ -3626,7 +3458,6 @@ def test_ogr_wfs_vsimem_wfs110_deletefeature(with_and_without_streaming):
     sql_lyr = ds.ExecuteSQL("DELETE FROM non_existing_layer WHERE truc")
     gdal.PopErrorHandler()
     if gdal.GetLastErrorMsg().find('Unknown layer') < 0:
-        gdaltest.post_reason('fail')
         print(gdal.GetLastErrorMsg())
         return 'fail'
 
@@ -3635,7 +3466,6 @@ def test_ogr_wfs_vsimem_wfs110_deletefeature(with_and_without_streaming):
     sql_lyr = ds.ExecuteSQL("DELETE FROM my_layer BLA")
     gdal.PopErrorHandler()
     if gdal.GetLastErrorMsg().find('WHERE clause missing') < 0:
-        gdaltest.post_reason('fail')
         print(gdal.GetLastErrorMsg())
         return 'fail'
 
@@ -3644,7 +3474,6 @@ def test_ogr_wfs_vsimem_wfs110_deletefeature(with_and_without_streaming):
     sql_lyr = ds.ExecuteSQL("DELETE FROM my_layer WHERE -")
     gdal.PopErrorHandler()
     if gdal.GetLastErrorMsg().find('SQL Expression Parsing Error') < 0:
-        gdaltest.post_reason('fail')
         print(gdal.GetLastErrorMsg())
         return 'fail'
 
@@ -3653,7 +3482,6 @@ def test_ogr_wfs_vsimem_wfs110_deletefeature(with_and_without_streaming):
     sql_lyr = ds.ExecuteSQL("DELETE FROM my_layer WHERE ogr_geometry = 'POINT'")
     gdal.PopErrorHandler()
     if sql_lyr is not None or gdal.GetLastErrorMsg() == '':
-        gdaltest.post_reason('fail')
         print(gdal.GetLastErrorMsg())
         return 'fail'
 
@@ -3707,7 +3535,6 @@ def test_ogr_wfs_vsimem_wfs110_schema_not_understood(with_and_without_streaming)
     lyr_defn = lyr.GetLayerDefn()
     gdal.PopErrorHandler()
     if lyr_defn.GetFieldCount() != 0:
-        gdaltest.post_reason('fail')
         return 'fail'
 
     ds = ogr.Open('WFS:/vsimem/wfs_endpoint_schema_not_understood')
@@ -3749,7 +3576,6 @@ def test_ogr_wfs_vsimem_wfs110_schema_not_understood(with_and_without_streaming)
 
     lyr_defn = lyr.GetLayerDefn()
     if lyr_defn.GetFieldCount() != 8:
-        gdaltest.post_reason('fail')
         return 'fail'
 
     gdal.FileFromMemBuffer('/vsimem/wfs_endpoint_schema_not_understood?SERVICE=WFS&VERSION=1.1.0&REQUEST=GetFeature&TYPENAME=my_layer', content)
@@ -3758,7 +3584,6 @@ def test_ogr_wfs_vsimem_wfs110_schema_not_understood(with_and_without_streaming)
     if f.gml_id != 'my_layer.1' or f.boolean != 1 or f.str != 'str' or f.short != 1 or \
        f.int != 123456789 or f.float != 1.2 or f.double != 1.23 or f.dt != '2015-04-17T12:34:56Z' or \
        f.GetGeometryRef().ExportToWkt() != 'POINT (2 49)':
-        gdaltest.post_reason('fail')
         f.DumpReadable()
         return 'fail'
 
@@ -3800,7 +3625,6 @@ def test_ogr_wfs_vsimem_wfs110_multiple_layers(with_and_without_streaming):
     lyr_defn = lyr.GetLayerDefn()
     gdal.PopErrorHandler()
     if lyr_defn.GetFieldCount() != 0:
-        gdaltest.post_reason('fail')
         return 'fail'
 
     ds = ogr.Open('WFS:/vsimem/wfs110_multiple_layers')
@@ -3812,7 +3636,6 @@ def test_ogr_wfs_vsimem_wfs110_multiple_layers(with_and_without_streaming):
     lyr_defn = lyr.GetLayerDefn()
     gdal.PopErrorHandler()
     if lyr_defn.GetFieldCount() != 0:
-        gdaltest.post_reason('fail')
         return 'fail'
 
     ds = ogr.Open('WFS:/vsimem/wfs110_multiple_layers')
@@ -3824,7 +3647,6 @@ def test_ogr_wfs_vsimem_wfs110_multiple_layers(with_and_without_streaming):
     lyr_defn = lyr.GetLayerDefn()
     gdal.PopErrorHandler()
     if lyr_defn.GetFieldCount() != 0:
-        gdaltest.post_reason('fail')
         return 'fail'
 
     ds = ogr.Open('WFS:/vsimem/wfs110_multiple_layers')
@@ -3836,7 +3658,6 @@ def test_ogr_wfs_vsimem_wfs110_multiple_layers(with_and_without_streaming):
     lyr_defn = lyr.GetLayerDefn()
     gdal.PopErrorHandler()
     if lyr_defn.GetFieldCount() != 0:
-        gdaltest.post_reason('fail')
         return 'fail'
 
     ds = ogr.Open('WFS:/vsimem/wfs110_multiple_layers')
@@ -3870,13 +3691,11 @@ def test_ogr_wfs_vsimem_wfs110_multiple_layers(with_and_without_streaming):
     lyr = ds.GetLayer(0)
     lyr_defn = lyr.GetLayerDefn()
     if lyr_defn.GetFieldCount() != 2:
-        gdaltest.post_reason('fail')
         return 'fail'
 
     lyr = ds.GetLayer(1)
     lyr_defn = lyr.GetLayerDefn()
     if lyr_defn.GetFieldCount() != 2:
-        gdaltest.post_reason('fail')
         return 'fail'
 
     ds = ogr.Open('WFS:/vsimem/wfs110_multiple_layers')
@@ -3900,7 +3719,6 @@ def test_ogr_wfs_vsimem_wfs110_multiple_layers(with_and_without_streaming):
     lyr = ds.GetLayer(0)
     lyr_defn = lyr.GetLayerDefn()
     if lyr_defn.GetFieldCount() != 2:
-        gdaltest.post_reason('fail')
         return 'fail'
 
     gdal.FileFromMemBuffer('/vsimem/wfs110_multiple_layers?SERVICE=WFS&VERSION=1.1.0&REQUEST=DescribeFeatureType&TYPENAME=my_layer2',
@@ -3921,7 +3739,6 @@ def test_ogr_wfs_vsimem_wfs110_multiple_layers(with_and_without_streaming):
     lyr = ds.GetLayer(1)
     lyr_defn = lyr.GetLayerDefn()
     if lyr_defn.GetFieldCount() != 2:
-        gdaltest.post_reason('fail')
         return 'fail'
 
     return 'success'
@@ -3977,7 +3794,6 @@ def test_ogr_wfs_vsimem_wfs110_multiple_layers_same_name_different_ns(with_and_w
     lyr = ds.GetLayer(0)
     lyr_defn = lyr.GetLayerDefn()
     if lyr_defn.GetFieldCount() != 2:
-        gdaltest.post_reason('fail')
         return 'fail'
 
     gdal.FileFromMemBuffer('/vsimem/wfs110_multiple_layers_different_ns?SERVICE=WFS&VERSION=1.1.0&REQUEST=GetFeature&TYPENAME=ns1:my_layer',
@@ -4002,7 +3818,6 @@ def test_ogr_wfs_vsimem_wfs110_multiple_layers_same_name_different_ns(with_and_w
 
     f = lyr.GetNextFeature()
     if f is None:
-        gdaltest.post_reason('fail')
         return 'fail'
 
     gdal.FileFromMemBuffer('/vsimem/wfs110_multiple_layers_different_ns?SERVICE=WFS&VERSION=1.1.0&REQUEST=DescribeFeatureType&TYPENAME=ns2:my_layer',
@@ -4024,7 +3839,6 @@ def test_ogr_wfs_vsimem_wfs110_multiple_layers_same_name_different_ns(with_and_w
     lyr = ds.GetLayer(1)
     lyr_defn = lyr.GetLayerDefn()
     if lyr_defn.GetFieldCount() != 3:
-        gdaltest.post_reason('fail')
         return 'fail'
 
     return 'success'
@@ -4115,7 +3929,6 @@ def test_ogr_wfs_vsimem_wfs200_paging(with_and_without_streaming):
     ds = ogr.Open('WFS:/vsimem/wfs200_endpoint_paging')
     lyr = ds.GetLayer(0)
     if lyr.GetMetadata() != {'ABSTRACT': 'abstract', 'KEYWORD_1': 'keyword', 'TITLE': 'title'}:
-        gdaltest.post_reason('fail')
         print(lyr.GetMetadata())
         return 'fail'
 
@@ -4200,34 +4013,27 @@ def test_ogr_wfs_vsimem_wfs200_paging(with_and_without_streaming):
 
     f = lyr.GetNextFeature()
     if f is None:
-        gdaltest.post_reason('fail')
         return 'fail'
     if f.gml_id != 'my_layer.1':
-        gdaltest.post_reason('fail')
         f.DumpReadable()
         return 'fail'
 
     f = lyr.GetNextFeature()
     if f is None:
-        gdaltest.post_reason('fail')
         return 'fail'
     if f.gml_id != 'my_layer.2':
-        gdaltest.post_reason('fail')
         f.DumpReadable()
         return 'fail'
 
     f = lyr.GetNextFeature()
     if f is None:
-        gdaltest.post_reason('fail')
         return 'fail'
     if f.gml_id != 'my_layer.3':
-        gdaltest.post_reason('fail')
         f.DumpReadable()
         return 'fail'
 
     f = lyr.GetNextFeature()
     if f is not None:
-        gdaltest.post_reason('fail')
         f.DumpReadable()
         return 'fail'
 
@@ -4360,17 +4166,14 @@ def test_ogr_wfs_vsimem_wfs200_json(with_and_without_streaming):
 
     f = lyr.GetNextFeature()
     if f is None:
-        gdaltest.post_reason('fail')
         return 'fail'
     # We currently invert... A bit weird. See comment in code. Probably inappropriate
     if f.str != 'str' or f.GetGeometryRef().ExportToWkt() != 'POINT (49 2)':
-        gdaltest.post_reason('fail')
         f.DumpReadable()
         return 'fail'
 
     f = lyr.GetNextFeature()
     if f is not None:
-        gdaltest.post_reason('fail')
         f.DumpReadable()
         return 'fail'
 
@@ -4442,11 +4245,9 @@ def test_ogr_wfs_vsimem_wfs200_multipart(with_and_without_streaming):
 
     f = lyr.GetNextFeature()
     if f is None:
-        gdaltest.post_reason('fail')
         return 'fail'
     # We currently invert... A bit weird. See comment in code. Probably inappropriate
     if f.str != 'str' or f.GetGeometryRef().ExportToWkt() != 'POINT (49 2)':
-        gdaltest.post_reason('fail')
         f.DumpReadable()
         return 'fail'
 
@@ -4476,7 +4277,6 @@ def test_ogr_wfs_vsimem_wfs200_multipart(with_and_without_streaming):
 
     f = lyr.GetNextFeature()
     if f is None:
-        gdaltest.post_reason('fail')
         return 'fail'
 
     ds = ogr.Open('WFS:/vsimem/wfs200_endpoint_multipart?OUTPUTFORMAT=multipart')
@@ -4499,11 +4299,9 @@ def test_ogr_wfs_vsimem_wfs200_multipart(with_and_without_streaming):
 """)
     f = lyr.GetNextFeature()
     if f is None:
-        gdaltest.post_reason('fail')
         return 'fail'
     # We currently invert... A bit weird. See comment in code. Probably inappropriate
     if f.str != 'str' or f.GetGeometryRef().ExportToWkt() != 'POINT (49 2)':
-        gdaltest.post_reason('fail')
         f.DumpReadable()
         return 'fail'
 
@@ -4588,7 +4386,6 @@ def test_ogr_wfs_vsimem_wfs200_join(with_and_without_streaming):
     f = sql_lyr.GetNextFeature()
     gdal.PopErrorHandler()
     if f is not None:
-        gdaltest.post_reason('fail')
         return 'fail'
 
     ds.ReleaseResultSet(sql_lyr)
@@ -4603,7 +4400,6 @@ def test_ogr_wfs_vsimem_wfs200_join(with_and_without_streaming):
     f = sql_lyr.GetNextFeature()
     gdal.PopErrorHandler()
     if f is not None or gdal.GetLastErrorMsg().find('Empty content returned by server') < 0:
-        gdaltest.post_reason('fail')
         print(gdal.GetLastErrorMsg())
         return 'fail'
 
@@ -4619,7 +4415,6 @@ def test_ogr_wfs_vsimem_wfs200_join(with_and_without_streaming):
     f = sql_lyr.GetNextFeature()
     gdal.PopErrorHandler()
     if f is not None or gdal.GetLastErrorMsg().find('Error returned by server') < 0:
-        gdaltest.post_reason('fail')
         print(gdal.GetLastErrorMsg())
         return 'fail'
 
@@ -4635,7 +4430,6 @@ def test_ogr_wfs_vsimem_wfs200_join(with_and_without_streaming):
     f = sql_lyr.GetNextFeature()
     gdal.PopErrorHandler()
     if f is not None or gdal.GetLastErrorMsg().find('Error: cannot parse') < 0:
-        gdaltest.post_reason('fail')
         print(gdal.GetLastErrorMsg())
         return 'fail'
 
@@ -4651,7 +4445,6 @@ def test_ogr_wfs_vsimem_wfs200_join(with_and_without_streaming):
     f = sql_lyr.GetNextFeature()
     gdal.PopErrorHandler()
     if f is not None or gdal.GetLastErrorMsg().find('Error: cannot parse') < 0:
-        gdaltest.post_reason('fail')
         print(gdal.GetLastErrorMsg())
         return 'fail'
 
@@ -4738,7 +4531,6 @@ def test_ogr_wfs_vsimem_wfs200_join(with_and_without_streaming):
        f['lyr2.gml_id'] != 'lyr2-101' or f['lyr2.str2'] != '123.4' or \
        f['lyr1.shape'].ExportToWkt() != 'POINT (2.5 48.5)' or \
        f['lyr2.another_shape'].ExportToWkt() != 'POINT (2 49)':
-        gdaltest.post_reason('fail')
         f.DumpReadable()
         return 'fail'
     f = sql_lyr.GetNextFeature()
@@ -4746,12 +4538,10 @@ def test_ogr_wfs_vsimem_wfs200_join(with_and_without_streaming):
        f['lyr2.gml_id'] != 'lyr2-102' or f['lyr2.str2'] != 'foo' or \
        f['lyr1.shape'].ExportToWkt() != 'POINT (2.5 48.5)' or \
        f['lyr2.another_shape'].ExportToWkt() != 'POINT (2 49)':
-        gdaltest.post_reason('fail')
         f.DumpReadable()
         return 'fail'
     f = sql_lyr.GetNextFeature()
     if f is not None:
-        gdaltest.post_reason('fail')
         f.DumpReadable()
         return 'fail'
 
@@ -4759,7 +4549,6 @@ def test_ogr_wfs_vsimem_wfs200_join(with_and_without_streaming):
     sql_lyr.ResetReading()
     f = sql_lyr.GetNextFeature()
     if f['lyr1.gml_id'] != 'lyr1-100':
-        gdaltest.post_reason('fail')
         f.DumpReadable()
         return 'fail'
 
@@ -4767,7 +4556,6 @@ def test_ogr_wfs_vsimem_wfs200_join(with_and_without_streaming):
     fc = sql_lyr.GetFeatureCount()
     gdal.PopErrorHandler()
     if fc != 2:
-        gdaltest.post_reason('fail')
         print(gdal.GetLastErrorMsg())
         print(fc)
         return 'fail'
@@ -4779,7 +4567,6 @@ def test_ogr_wfs_vsimem_wfs200_join(with_and_without_streaming):
     fc = sql_lyr.GetFeatureCount()
     gdal.PopErrorHandler()
     if fc != 2:
-        gdaltest.post_reason('fail')
         print(gdal.GetLastErrorMsg())
         return 'fail'
 
@@ -4790,7 +4577,6 @@ def test_ogr_wfs_vsimem_wfs200_join(with_and_without_streaming):
     fc = sql_lyr.GetFeatureCount()
     gdal.PopErrorHandler()
     if fc != 2:
-        gdaltest.post_reason('fail')
         print(gdal.GetLastErrorMsg())
         return 'fail'
 
@@ -4801,7 +4587,6 @@ def test_ogr_wfs_vsimem_wfs200_join(with_and_without_streaming):
     fc = sql_lyr.GetFeatureCount()
     gdal.PopErrorHandler()
     if fc != 2:
-        gdaltest.post_reason('fail')
         print(gdal.GetLastErrorMsg())
         return 'fail'
 
@@ -4812,7 +4597,6 @@ def test_ogr_wfs_vsimem_wfs200_join(with_and_without_streaming):
     fc = sql_lyr.GetFeatureCount()
     gdal.PopErrorHandler()
     if fc != 2:
-        gdaltest.post_reason('fail')
         print(gdal.GetLastErrorMsg())
         return 'fail'
 
@@ -4823,7 +4607,6 @@ def test_ogr_wfs_vsimem_wfs200_join(with_and_without_streaming):
     fc = sql_lyr.GetFeatureCount()
     gdal.PopErrorHandler()
     if fc != 2:
-        gdaltest.post_reason('fail')
         print(gdal.GetLastErrorMsg())
         return 'fail'
 
@@ -4846,7 +4629,6 @@ def test_ogr_wfs_vsimem_wfs200_join(with_and_without_streaming):
     fc = sql_lyr.GetFeatureCount()
     gdal.PopErrorHandler()
     if fc != 3:
-        gdaltest.post_reason('fail')
         print(gdal.GetLastErrorMsg())
         return 'fail'
 
@@ -4873,7 +4655,6 @@ def test_ogr_wfs_vsimem_wfs200_join(with_and_without_streaming):
        f['lyr2.gml_id'] != 'lyr2-101' or f['lyr2.str2'] != '123.4' or \
        f['lyr1.shape'].ExportToWkt() != 'POINT (2.5 48.5)' or \
        f['lyr2.another_shape'].ExportToWkt() != 'POINT (2 49)':
-        gdaltest.post_reason('fail')
         f.DumpReadable()
         return 'fail'
     ds.ReleaseResultSet(sql_lyr)
@@ -4885,7 +4666,6 @@ def test_ogr_wfs_vsimem_wfs200_join(with_and_without_streaming):
        f['lyr2.gml_id'] != 'lyr2-101' or f['lyr2.str2'] != '123.4' or \
        f['my_alias1.shape'].ExportToWkt() != 'POINT (2.5 48.5)' or \
        f['lyr2.another_shape'].ExportToWkt() != 'POINT (2 49)':
-        gdaltest.post_reason('fail')
         f.DumpReadable()
         return 'fail'
     ds.ReleaseResultSet(sql_lyr)
@@ -4903,7 +4683,6 @@ def test_ogr_wfs_vsimem_wfs200_join(with_and_without_streaming):
        f['str_bigint'] != 123 or \
        f['str_float'] != 123.4 or \
        f['myshape'].ExportToWkt() != 'POINT (2.5 48.5)':
-        gdaltest.post_reason('fail')
         f.DumpReadable()
         return 'fail'
     ds.ReleaseResultSet(sql_lyr)
@@ -4948,7 +4727,6 @@ def test_ogr_wfs_vsimem_wfs200_join(with_and_without_streaming):
        f['lyr2.gml_id'] != 'lyr2-101' or f['lyr2.str2'] != '123.4' or \
        f['lyr1.shape'].ExportToWkt() != 'POINT (2.5 48.5)' or \
        f['lyr2.another_shape'].ExportToWkt() != 'POINT (2 49)':
-        gdaltest.post_reason('fail')
         f.DumpReadable()
         return 'fail'
 
@@ -4959,7 +4737,6 @@ def test_ogr_wfs_vsimem_wfs200_join(with_and_without_streaming):
     sql_lyr = ds.ExecuteSQL("SELECT * FROM lyr1 JOIN lyr2 ON lyr1.str = lyr2.str2 WHERE ST_Within(lyr2.another_shape, ST_MakeEnvelope(-180,-90,180,90))")
     f = sql_lyr.GetNextFeature()
     if f['lyr1.gml_id'] != 'lyr1-100':
-        gdaltest.post_reason('fail')
         f.DumpReadable()
         return 'fail'
     ds.ReleaseResultSet(sql_lyr)
@@ -4969,7 +4746,6 @@ def test_ogr_wfs_vsimem_wfs200_join(with_and_without_streaming):
     sql_lyr = ds.ExecuteSQL("SELECT * FROM lyr1 JOIN lyr2 ON lyr1.str = lyr2.str2 ORDER BY lyr1.str DESC")
     f = sql_lyr.GetNextFeature()
     if f['lyr1.gml_id'] != 'lyr1-100':
-        gdaltest.post_reason('fail')
         f.DumpReadable()
         return 'fail'
     ds.ReleaseResultSet(sql_lyr)
@@ -4978,7 +4754,6 @@ def test_ogr_wfs_vsimem_wfs200_join(with_and_without_streaming):
     sql_lyr = ds.ExecuteSQL("SELECT * FROM lyr1 JOIN lyr2 ON lyr1.str = lyr2.str2 WHERE lyr1.OGR_GEOMETRY IS NOT NULL")
     gdal.PopErrorHandler()
     if sql_lyr is not None or gdal.GetLastErrorMsg().find('Unsupported WHERE clause') < 0:
-        gdaltest.post_reason('fail')
         print(gdal.GetLastErrorMsg())
         return 'fail'
 
@@ -4986,7 +4761,6 @@ def test_ogr_wfs_vsimem_wfs200_join(with_and_without_streaming):
     sql_lyr = ds.ExecuteSQL("SELECT * FROM lyr1 JOIN lyr2 ON lyr1.OGR_GEOMETRY IS NOT NULL")
     gdal.PopErrorHandler()
     if sql_lyr is not None or gdal.GetLastErrorMsg().find('Unsupported JOIN clause') < 0:
-        gdaltest.post_reason('fail')
         print(gdal.GetLastErrorMsg())
         return 'fail'
 
@@ -4994,7 +4768,6 @@ def test_ogr_wfs_vsimem_wfs200_join(with_and_without_streaming):
     sql_lyr = ds.ExecuteSQL("SELECT 1 FROM lyr1 JOIN lyr2 ON lyr1.str = lyr2.str2")
     gdal.PopErrorHandler()
     if sql_lyr is not None or gdal.GetLastErrorMsg().find('Only column names supported in column selection') < 0:
-        gdaltest.post_reason('fail')
         print(gdal.GetLastErrorMsg())
         return 'fail'
 
@@ -5111,7 +4884,6 @@ def test_ogr_wfs_vsimem_wfs200_join_layer_with_namespace_prefix(with_and_without
        f['lyr2.gml_id'] != 'lyr2-101' or f['lyr2.str2'] != '123.4' or \
        f['lyr1.shape'].ExportToWkt() != 'POINT (2.5 48.5)' or \
        f['lyr2.another_shape'].ExportToWkt() != 'POINT (2 49)':
-        gdaltest.post_reason('fail')
         f.DumpReadable()
         return 'fail'
 
@@ -5276,7 +5048,6 @@ def test_ogr_wfs_vsimem_wfs200_join_distinct(with_and_without_streaming):
 </wfs:FeatureCollection>
 """)
     if sql_lyr.GetFeatureCount() != 2:
-        gdaltest.post_reason('fail')
         return 'fail'
 
     ds.ReleaseResultSet(sql_lyr)
diff --git a/autotest/ogr/ogr_wfs3.py b/autotest/ogr/ogr_wfs3.py
index e156ddc6167d..3c2daaaa8440 100755
--- a/autotest/ogr/ogr_wfs3.py
+++ b/autotest/ogr/ogr_wfs3.py
@@ -70,7 +70,6 @@ def test_ogr_wfs3_errors():
         with gdaltest.error_handler():
             ds = ogr.Open('WFS3:http://localhost:%d/wfs3' % gdaltest.webserver_port)
     if ds is not None:
-        gdaltest.post_reason('fail')
         return 'fail'
 
     # No Content-Type
@@ -80,7 +79,6 @@ def test_ogr_wfs3_errors():
         with gdaltest.error_handler():
             ds = ogr.Open('WFS3:http://localhost:%d/wfs3' % gdaltest.webserver_port)
     if ds is not None:
-        gdaltest.post_reason('fail')
         return 'fail'
 
     # Unexpected Content-Type
@@ -91,7 +89,6 @@ def test_ogr_wfs3_errors():
         with gdaltest.error_handler():
             ds = ogr.Open('WFS3:http://localhost:%d/wfs3' % gdaltest.webserver_port)
     if ds is not None:
-        gdaltest.post_reason('fail')
         return 'fail'
 
     # Invalid JSON
@@ -102,7 +99,6 @@ def test_ogr_wfs3_errors():
         with gdaltest.error_handler():
             ds = ogr.Open('WFS3:http://localhost:%d/wfs3' % gdaltest.webserver_port)
     if ds is not None:
-        gdaltest.post_reason('fail')
         return 'fail'
 
     # Valid JSON but not collections array
@@ -113,7 +109,6 @@ def test_ogr_wfs3_errors():
         with gdaltest.error_handler():
             ds = ogr.Open('WFS3:http://localhost:%d/wfs3' % gdaltest.webserver_port)
     if ds is not None:
-        gdaltest.post_reason('fail')
         return 'fail'
 
     # Valid JSON but collections is not an array
@@ -125,7 +120,6 @@ def test_ogr_wfs3_errors():
         with gdaltest.error_handler():
             ds = ogr.Open('WFS3:http://localhost:%d/wfs3' % gdaltest.webserver_port)
     if ds is not None:
-        gdaltest.post_reason('fail')
         return 'fail'
 
     handler = webserver.SequentialHandler()
@@ -135,16 +129,12 @@ def test_ogr_wfs3_errors():
     with webserver.install_http_handler(handler):
         ds = ogr.Open('WFS3:http://localhost:%d/wfs3' % gdaltest.webserver_port)
     if ds is None:
-        gdaltest.post_reason('fail')
         return 'fail'
     if ds.GetLayerCount() != 0:
-        gdaltest.post_reason('fail')
         return 'fail'
     if ds.GetLayer(-1) is not None:
-        gdaltest.post_reason('fail')
         return 'fail'
     if ds.GetLayer(0) is not None:
-        gdaltest.post_reason('fail')
         return 'fail'
 
     return 'success'
@@ -166,14 +156,11 @@ def test_ogr_wfs3_empty_layer():
     with webserver.install_http_handler(handler):
         ds = ogr.Open('WFS3:http://localhost:%d/wfs3' % gdaltest.webserver_port)
     if ds is None:
-        gdaltest.post_reason('fail')
         return 'fail'
     if ds.GetLayerCount() != 1:
-        gdaltest.post_reason('fail')
         return 'fail'
     lyr = ds.GetLayer(0)
     if lyr.GetName() != 'foo':
-        gdaltest.post_reason('fail')
         return 'fail'
 
     handler = webserver.SequentialHandler()
@@ -182,7 +169,6 @@ def test_ogr_wfs3_empty_layer():
                 '{ "type": "FeatureCollection", "features": [] }')
     with webserver.install_http_handler(handler):
         if lyr.GetLayerDefn().GetFieldCount() != 0:
-            gdaltest.post_reason('fail')
             return 'fail'
 
     return 'success'
@@ -217,7 +203,6 @@ def test_ogr_wfs3_fc_links_next_geojson():
                 ] }""")
     with webserver.install_http_handler(handler):
         if lyr.GetLayerDefn().GetFieldCount() != 1:
-            gdaltest.post_reason('fail')
             return 'fail'
 
     handler = webserver.SequentialHandler()
@@ -238,7 +223,6 @@ def test_ogr_wfs3_fc_links_next_geojson():
     with webserver.install_http_handler(handler):
         f = lyr.GetNextFeature()
     if f['foo'] != 'bar':
-        gdaltest.post_reason('fail')
         f.DumpReadable()
         return 'fail'
 
@@ -257,7 +241,6 @@ def test_ogr_wfs3_fc_links_next_geojson():
     with webserver.install_http_handler(handler):
         f = lyr.GetNextFeature()
     if f['foo'] != 'baz':
-        gdaltest.post_reason('fail')
         f.DumpReadable()
         return 'fail'
 
@@ -293,7 +276,6 @@ def test_ogr_wfs3_fc_links_next_headers():
                 ] }""")
     with webserver.install_http_handler(handler):
         if lyr.GetLayerDefn().GetFieldCount() != 1:
-            gdaltest.post_reason('fail')
             return 'fail'
 
     handler = webserver.SequentialHandler()
@@ -313,7 +295,6 @@ def test_ogr_wfs3_fc_links_next_headers():
     with webserver.install_http_handler(handler):
         f = lyr.GetNextFeature()
     if f['foo'] != 'bar':
-        gdaltest.post_reason('fail')
         f.DumpReadable()
         return 'fail'
 
@@ -332,7 +313,6 @@ def test_ogr_wfs3_fc_links_next_headers():
     with webserver.install_http_handler(handler):
         f = lyr.GetNextFeature()
     if f['foo'] != 'baz':
-        gdaltest.post_reason('fail')
         f.DumpReadable()
         return 'fail'
 
@@ -360,7 +340,6 @@ def test_ogr_wfs3_spatial_filter():
         ds = ogr.Open('WFS3:http://localhost:%d/wfs3' % gdaltest.webserver_port)
     lyr = ds.GetLayer(0)
     if lyr.GetExtent() != (-10.0, 15.0, 40.0, 50.0):
-        gdaltest.post_reason('fail')
         print(lyr.GetExtent())
         return 'fail'
 
@@ -377,7 +356,6 @@ def test_ogr_wfs3_spatial_filter():
                 ] }""")
     with webserver.install_http_handler(handler):
         if lyr.GetLayerDefn().GetFieldCount() != 1:
-            gdaltest.post_reason('fail')
             return 'fail'
 
     lyr.SetSpatialFilterRect(2, 49, 3, 50)
@@ -399,7 +377,6 @@ def test_ogr_wfs3_spatial_filter():
     with webserver.install_http_handler(handler):
         f = lyr.GetNextFeature()
     if f is None:
-        gdaltest.post_reason('fail')
         return 'fail'
 
     lyr.SetSpatialFilter(None)
@@ -417,7 +394,6 @@ def test_ogr_wfs3_spatial_filter():
     with webserver.install_http_handler(handler):
         f = lyr.GetNextFeature()
     if f is None:
-        gdaltest.post_reason('fail')
         return 'fail'
 
     return 'success'
@@ -478,7 +454,6 @@ def test_ogr_wfs3_get_feature_count():
                 '{ "numberMatched": 1234 }')
     with webserver.install_http_handler(handler):
         if lyr.GetFeatureCount() != 1234:
-            gdaltest.post_reason('fail')
             return 'fail'
 
     handler = webserver.SequentialHandler()
@@ -487,7 +462,6 @@ def test_ogr_wfs3_get_feature_count():
                 '{ "numberMatched": 1234 }')
     with webserver.install_http_handler(handler):
         if lyr.GetFeatureCount() != 1234:
-            gdaltest.post_reason('fail')
             return 'fail'
 
     return 'success'
@@ -572,7 +546,6 @@ def test_ogr_wfs3_attribute_filter():
     with webserver.install_http_handler(handler):
         f = lyr.GetNextFeature()
     if f is None:
-        gdaltest.post_reason('fail')
         return 'fail'
 
     lyr.ResetReading()
@@ -592,7 +565,6 @@ def test_ogr_wfs3_attribute_filter():
     with webserver.install_http_handler(handler):
         f = lyr.GetNextFeature()
     if f is None:
-        gdaltest.post_reason('fail')
         return 'fail'
 
     lyr.ResetReading()
@@ -612,7 +584,6 @@ def test_ogr_wfs3_attribute_filter():
     with webserver.install_http_handler(handler):
         f = lyr.GetNextFeature()
     if f is None:
-        gdaltest.post_reason('fail')
         return 'fail'
 
     return 'success'
diff --git a/autotest/ogr/ogr_wkbwkt_geom.py b/autotest/ogr/ogr_wkbwkt_geom.py
index 67b737f3c5b3..d22662ab6ec1 100755
--- a/autotest/ogr/ogr_wkbwkt_geom.py
+++ b/autotest/ogr/ogr_wkbwkt_geom.py
@@ -625,7 +625,6 @@ def test_ogr_wkbwkt_export_wkt_iso_multipoint():
     g = ogr.CreateGeometryFromWkt(wkt)
     out_wkt = g.ExportToIsoWkt()
     if out_wkt != wkt:
-        gdaltest.post_reason('fail')
         print(out_wkt)
         return 'fail'
 
@@ -641,7 +640,6 @@ def test_ogr_wkt_inf_nan():
     g.AddPoint(float('inf'), float('-inf'), float('nan'))
     out_wkt = g.ExportToWkt()
     if out_wkt != 'POINT (inf -inf nan)':
-        gdaltest.post_reason('fail')
         print(out_wkt)
         return 'fail'
 
diff --git a/autotest/ogr/ogr_xls.py b/autotest/ogr/ogr_xls.py
index 5d83b42f6682..0ba31d75ef30 100755
--- a/autotest/ogr/ogr_xls.py
+++ b/autotest/ogr/ogr_xls.py
@@ -47,7 +47,6 @@ def test_ogr_xls_1():
         return 'skip'
 
     if drv.TestCapability("foo") != 0:
-        gdaltest.post_reason('fail')
         return 'fail'
 
     ds = ogr.Open('data/test972000xp.xls')
@@ -56,7 +55,6 @@ def test_ogr_xls_1():
         return 'fail'
 
     if ds.TestCapability("foo") != 0:
-        gdaltest.post_reason('fail')
         return 'fail'
 
     if ds.GetLayerCount() != 1:
@@ -77,16 +75,13 @@ def test_ogr_xls_1():
         return 'fail'
 
     if lyr.GetFeatureCount() != 3:
-        gdaltest.post_reason('fail')
         print(lyr.GetFeatureCount())
         return 'fail'
 
     if lyr.TestCapability("foo") != 0:
-        gdaltest.post_reason('fail')
         return 'fail'
 
     if lyr.GetLayerDefn().GetFieldCount() != 5:
-        gdaltest.post_reason('fail')
         print(lyr.GetLayerDefn().GetFieldCount())
         return 'fail'
 
@@ -95,7 +90,6 @@ def test_ogr_xls_1():
        lyr.GetLayerDefn().GetFieldDefn(2).GetType() != ogr.OFTString or \
        lyr.GetLayerDefn().GetFieldDefn(3).GetType() != ogr.OFTDate or \
        lyr.GetLayerDefn().GetFieldDefn(4).GetType() != ogr.OFTDateTime:
-        gdaltest.post_reason('fail')
         return 'fail'
 
     feat = lyr.GetNextFeature()
@@ -104,7 +98,6 @@ def test_ogr_xls_1():
        feat.IsFieldSet(2) or \
        feat.GetFieldAsString(3) != '1980/01/01' or \
        feat.GetFieldAsString(4) != '1980/01/01 00:00:00':
-        gdaltest.post_reason('fail')
         feat.DumpReadable()
         return 'fail'
 
@@ -112,7 +105,6 @@ def test_ogr_xls_1():
     feat = lyr.GetNextFeature()
     feat = lyr.GetNextFeature()
     if feat is not None:
-        gdaltest.post_reason('fail')
         return 'fail'
 
     return 'success'
@@ -133,7 +125,6 @@ def test_ogr_xls_2():
     lyr = ds.GetLayer(0)
 
     if lyr.GetFeatureCount() != 4:
-        gdaltest.post_reason('fail')
         print(lyr.GetFeatureCount())
         return 'fail'
 
@@ -157,7 +148,6 @@ def test_ogr_xls_3():
     lyr = ds.GetLayer(0)
 
     if lyr.GetLayerDefn().GetFieldDefn(0).GetType() != ogr.OFTString:
-        gdaltest.post_reason('fail')
         return 'fail'
 
     gdal.SetConfigOption('OGR_XLS_FIELD_TYPES', None)
diff --git a/autotest/ogr/ogr_xlsx.py b/autotest/ogr/ogr_xlsx.py
index 969522eda9cc..393e1942df36 100755
--- a/autotest/ogr/ogr_xlsx.py
+++ b/autotest/ogr/ogr_xlsx.py
@@ -44,7 +44,6 @@
 def ogr_xlsx_check(ds):
 
     if ds.TestCapability("foo") != 0:
-        gdaltest.post_reason('fail')
         return 'fail'
 
     if ds.GetLayerCount() != 8:
@@ -65,12 +64,10 @@ def ogr_xlsx_check(ds):
         return 'fail'
 
     if lyr.GetFeatureCount() != 26:
-        gdaltest.post_reason('fail')
         print(lyr.GetFeatureCount())
         return 'fail'
 
     if lyr.TestCapability("foo") != 0:
-        gdaltest.post_reason('fail')
         return 'fail'
 
     lyr = ds.GetLayer(6)
@@ -79,7 +76,6 @@ def ogr_xlsx_check(ds):
         return 'fail'
 
     if lyr.GetLayerDefn().GetFieldCount() != 12:
-        gdaltest.post_reason('fail')
         print(lyr.GetLayerDefn().GetFieldCount())
         return 'fail'
 
@@ -98,7 +94,6 @@ def ogr_xlsx_check(ds):
 
     for i, typ in enumerate(type_array):
         if lyr.GetLayerDefn().GetFieldDefn(i).GetType() != typ:
-            gdaltest.post_reason('fail')
             print(i)
             return 'fail'
 
@@ -109,13 +104,11 @@ def ogr_xlsx_check(ds):
        feat.GetFieldAsDouble(3) != 0.52 or \
        feat.GetFieldAsString(4) != '2012/01/22' or \
        feat.GetFieldAsString(5) != '2012/01/22 18:49:00':
-        gdaltest.post_reason('fail')
         feat.DumpReadable()
         return 'fail'
 
     feat = lyr.GetNextFeature()
     if feat.IsFieldSet(2):
-        gdaltest.post_reason('fail')
         feat.DumpReadable()
         return 'fail'
 
@@ -132,7 +125,6 @@ def test_ogr_xlsx_1():
         return 'skip'
 
     if drv.TestCapability("foo") != 0:
-        gdaltest.post_reason('fail')
         return 'fail'
 
     ds = ogr.Open('data/test.xlsx')
@@ -158,7 +150,6 @@ def test_ogr_xlsx_2():
     lyr = ds.GetLayerByName('Feuille7')
 
     if lyr.GetFeatureCount() != 3:
-        gdaltest.post_reason('fail')
         print(lyr.GetFeatureCount())
         return 'fail'
 
@@ -182,7 +173,6 @@ def test_ogr_xlsx_3():
     lyr = ds.GetLayerByName('Feuille7')
 
     if lyr.GetLayerDefn().GetFieldDefn(1).GetType() != ogr.OFTString:
-        gdaltest.post_reason('fail')
         return 'fail'
 
     gdal.SetConfigOption('OGR_XLSX_FIELD_TYPES', None)
@@ -252,7 +242,6 @@ def test_ogr_xlsx_6():
     lyr = ds.GetLayerByName('inlineStr')
 
     if lyr.GetFeatureCount() != 1:
-        gdaltest.post_reason('fail')
         print(lyr.GetFeatureCount())
         return 'fail'
 
@@ -374,12 +363,10 @@ def test_ogr_xlsx_9():
     ds = ogr.Open('/vsimem/ogr_xlsx_9.xlsx')
     lyr = ds.GetLayer(0)
     if lyr.GetLayerDefn().GetFieldDefn(0).GetType() != ogr.OFTInteger64:
-        gdaltest.post_reason('failure')
         return 'fail'
     f = lyr.GetNextFeature()
     f = lyr.GetNextFeature()
     if f.GetField(0) != 12345678901234:
-        gdaltest.post_reason('failure')
         return 'fail'
     ds = None
 
@@ -414,19 +401,15 @@ def test_ogr_xlsx_10():
     lyr = ds.GetLayer(0)
     for i in range(3):
         if lyr.GetLayerDefn().GetFieldDefn(i).GetType() != ogr.OFTDateTime:
-            gdaltest.post_reason('failure')
             return 'fail'
     f = lyr.GetNextFeature()
     if f.GetField(0) != '2015/12/23 12:34:56.789':
-        gdaltest.post_reason('failure')
         f.DumpReadable()
         return 'fail'
     if f.GetField(1) != '2015/12/23 12:34:56':
-        gdaltest.post_reason('failure')
         f.DumpReadable()
         return 'fail'
     if f.GetField(2) != '2015/12/23 12:34:56':
-        gdaltest.post_reason('failure')
         f.DumpReadable()
         return 'fail'
     ds = None
@@ -596,10 +579,8 @@ def test_ogr_xlsx_15():
 
     ds = ogr.Open(out_filename)
     if ds.GetLayerByName('first').GetFeatureCount() == 0:
-        gdaltest.post_reason('fail')
         return 'fail'
     if ds.GetLayerByName('second').GetFeatureCount() == 0:
-        gdaltest.post_reason('fail')
         return 'fail'
     ds = None
 
@@ -631,14 +612,11 @@ def test_ogr_xlsx_boolean():
     ds = ogr.Open(out_filename)
     lyr = ds.GetLayer(0)
     if lyr.GetLayerDefn().GetFieldDefn(0).GetType() != ogr.OFTInteger:
-        gdaltest.post_reason('failure')
         return 'fail'
     if lyr.GetLayerDefn().GetFieldDefn(0).GetSubType() != ogr.OFSTBoolean:
-        gdaltest.post_reason('failure')
         return 'fail'
     f = lyr.GetNextFeature()
     if f.GetField(0) != 1:
-        gdaltest.post_reason('failure')
         return 'fail'
     ds = None
 
diff --git a/autotest/ogr/ograpispy.py b/autotest/ogr/ograpispy.py
index d67ca18ca4e8..5c9dde2be390 100755
--- a/autotest/ogr/ograpispy.py
+++ b/autotest/ogr/ograpispy.py
@@ -103,14 +103,12 @@ def test_ograpispy_2():
     ds = ogr.Open('tmp/snapshot_1/source/ograpispy_2.shp')
     lyr = ds.GetLayer(0)
     if lyr.GetFeatureCount() != 0:
-        gdaltest.post_reason('fail')
         return 'fail'
     ds = None
 
     ds = ogr.Open('tmp/snapshot_1/working/ograpispy_2.shp', update=1)
     lyr = ds.GetLayer(0)
     if lyr.GetFeatureCount() != 1:
-        gdaltest.post_reason('fail')
         return 'fail'
 
     # Add a feature to check that running the script will work
@@ -124,7 +122,6 @@ def test_ograpispy_2():
     lyr = ds.GetLayer(0)
     if lyr.GetFeatureCount() != 1:
         print(lyr.GetFeatureCount())
-        gdaltest.post_reason('fail')
         return 'fail'
     ds = None
 
diff --git a/autotest/osr/osr_basic.py b/autotest/osr/osr_basic.py
index 99108c5a8e46..029e5196a55f 100755
--- a/autotest/osr/osr_basic.py
+++ b/autotest/osr/osr_basic.py
@@ -661,7 +661,6 @@ def test_osr_basic_19():
     sr_ref.ImportFromEPSG(4326)
 
     if sr.ExportToWkt() != sr_ref.ExportToWkt():
-        gdaltest.post_reason('fail')
         print(sr.ExportToWkt())
         print(sr_ref.ExportToWkt())
         return 'fail'
@@ -673,7 +672,6 @@ def test_osr_basic_19():
     sr_ref.ImportFromEPSG(4322)
 
     if sr.ExportToWkt() != sr_ref.ExportToWkt():
-        gdaltest.post_reason('fail')
         print(sr.ExportToWkt())
         print(sr_ref.ExportToWkt())
         return 'fail'
@@ -685,7 +683,6 @@ def test_osr_basic_19():
     sr_ref.ImportFromEPSG(4267)
 
     if sr.ExportToWkt() != sr_ref.ExportToWkt():
-        gdaltest.post_reason('fail')
         print(sr.ExportToWkt())
         print(sr_ref.ExportToWkt())
         return 'fail'
@@ -697,7 +694,6 @@ def test_osr_basic_19():
     sr_ref.ImportFromEPSG(4269)
 
     if sr.ExportToWkt() != sr_ref.ExportToWkt():
-        gdaltest.post_reason('fail')
         print(sr.ExportToWkt())
         print(sr_ref.ExportToWkt())
         return 'fail'
@@ -714,27 +710,22 @@ def test_osr_basic_20():
     sr.ImportFromEPSGA(4326)
 
     if sr.GetAxisName(None, 0) != 'Latitude':
-        gdaltest.post_reason('fail')
         print(sr.GetAxisName(None, 0))
         return 'fail'
 
     if sr.GetAxisOrientation(None, 0) != osr.OAO_North:
-        gdaltest.post_reason('fail')
         print(sr.GetAxisOrientation(None, 0))
         return 'fail'
 
     if sr.GetAxisName('GEOGCS', 1) != 'Longitude':
-        gdaltest.post_reason('fail')
         print(sr.GetAxisName('GEOGCS', 1))
         return 'fail'
 
     if sr.GetAxisOrientation('GEOGCS', 1) != osr.OAO_East:
-        gdaltest.post_reason('fail')
         print(sr.GetAxisOrientation('GEOGCS', 1))
         return 'fail'
 
     if sr.GetAngularUnitsName() != 'degree':
-        gdaltest.post_reason('fail')
         print(sr.GetAngularUnitsName())
         return 'fail'
 
@@ -788,18 +779,15 @@ def test_osr_basic_21():
     sr2.ImportFromWkt(wkt2)
 
     if sr1.IsSame(sr2) == 0:
-        gdaltest.post_reason('fail')
         return 'fail'
 
     if sr2.IsSame(sr1) == 0:
-        gdaltest.post_reason('fail')
         return 'fail'
 
     sr2_not_equivalent = osr.SpatialReference()
     sr2_not_equivalent.ImportFromWkt(wkt2_not_equivalent)
 
     if sr1.IsSame(sr2_not_equivalent) == 1:
-        gdaltest.post_reason('fail')
         return 'fail'
 
     return 'success'
@@ -859,14 +847,12 @@ def test_osr_basic_22():
     expected_sr2.ImportFromWkt(expected_sr2_wkt)
 
     if sr2.IsSame(expected_sr2) == 0:
-        gdaltest.post_reason('fail')
         print(sr2)
         return 'fail'
 
     # Back to LCC_2SP
     sr3 = sr2.ConvertToOtherProjection(osr.SRS_PT_LAMBERT_CONFORMAL_CONIC_2SP)
     if sr3.IsSame(sr) == 0:
-        gdaltest.post_reason('fail')
         print(sr3)
         return 'fail'
 
@@ -914,13 +900,11 @@ def test_osr_basic_22():
     expected_sr2.ImportFromWkt(expected_sr2_wkt)
 
     if sr2.IsSame(expected_sr2) == 0:
-        gdaltest.post_reason('fail')
         print(sr2)
         return 'fail'
 
     sr3 = sr2.ConvertToOtherProjection(osr.SRS_PT_LAMBERT_CONFORMAL_CONIC_2SP)
     if sr3.IsSame(sr) == 0:
-        gdaltest.post_reason('fail')
         print(sr3)
         return 'fail'
 
@@ -968,7 +952,6 @@ def test_osr_basic_22():
     expected_sr2.ImportFromWkt(expected_sr2_wkt)
 
     if sr2.IsSame(expected_sr2) == 0:
-        gdaltest.post_reason('fail')
         print(sr2)
         return 'fail'
 
@@ -995,7 +978,6 @@ def test_osr_basic_22():
     expected_sr3 = osr.SpatialReference()
     expected_sr3.ImportFromWkt(expected_sr3_wkt)
     if sr3.IsSame(expected_sr3) == 0:
-        gdaltest.post_reason('fail')
         print(sr3)
         return 'fail'
 
@@ -1056,14 +1038,12 @@ def test_osr_basic_23():
     expected_sr2.ImportFromWkt(expected_sr2_wkt)
 
     if sr2.IsSame(expected_sr2) == 0:
-        gdaltest.post_reason('fail')
         print(sr2)
         return 'fail'
 
     # Back to LCC_2SP
     sr3 = sr2.ConvertToOtherProjection(osr.SRS_PT_LAMBERT_CONFORMAL_CONIC_1SP)
     if sr3.IsSame(sr) == 0:
-        gdaltest.post_reason('fail')
         print(sr3)
         return 'fail'
 
@@ -1114,14 +1094,12 @@ def test_osr_basic_24():
     expected_sr2.ImportFromWkt(expected_sr2_wkt)
 
     if sr2.IsSame(expected_sr2) == 0:
-        gdaltest.post_reason('fail')
         print(sr2)
         return 'fail'
 
     # Back to LCC_2SP
     sr3 = sr2.ConvertToOtherProjection(osr.SRS_PT_MERCATOR_1SP)
     if sr3.IsSame(sr) == 0:
-        gdaltest.post_reason('fail')
         print(sr3)
         return 'fail'
 
@@ -1140,7 +1118,6 @@ def test_osr_basic_25():
             UNIT["degree",0.0174532925199433]]""")
     sr2 = sr.ConvertToOtherProjection('Mercator_1SP')
     if sr2 is not None:
-        gdaltest.post_reason('fail')
         print(sr2)
         return 'fail'
 
@@ -1157,17 +1134,14 @@ def test_osr_basic_25():
 
     sr2 = sr.ConvertToOtherProjection(None)
     if sr2 is not None:
-        gdaltest.post_reason('fail')
         return 'fail'
 
     sr2 = sr.ConvertToOtherProjection('foo')
     if sr2 is not None:
-        gdaltest.post_reason('fail')
         return 'fail'
 
     sr2 = sr.ConvertToOtherProjection('Mercator_1SP')
     if sr2.IsSame(sr) == 0:
-        gdaltest.post_reason('fail')
         print(sr2)
         return 'fail'
 
@@ -1185,7 +1159,6 @@ def test_osr_basic_25():
         PARAMETER["false_northing",0]]""")
     sr2 = sr.ConvertToOtherProjection('Mercator_2SP')
     if sr2 is not None:
-        gdaltest.post_reason('fail')
         print(sr2)
         return 'fail'
 
@@ -1203,7 +1176,6 @@ def test_osr_basic_25():
         PARAMETER["false_northing",0]]""")
     sr2 = sr.ConvertToOtherProjection('Mercator_2SP')
     if sr2 is not None:
-        gdaltest.post_reason('fail')
         print(sr2)
         return 'fail'
 
@@ -1221,7 +1193,6 @@ def test_osr_basic_25():
     PARAMETER["false_northing",0]]""")
     sr2 = sr.ConvertToOtherProjection('Mercator_1SP')
     if sr2 is not None:
-        gdaltest.post_reason('fail')
         print(sr2)
         return 'fail'
 
@@ -1239,7 +1210,6 @@ def test_osr_basic_25():
     PARAMETER["false_northing",0]]""")
     sr2 = sr.ConvertToOtherProjection('Mercator_1SP')
     if sr2 is not None:
-        gdaltest.post_reason('fail')
         print(sr2)
         return 'fail'
 
@@ -1259,7 +1229,6 @@ def test_osr_basic_25():
     PARAMETER["false_northing",4185861.369]]""")
     sr2 = sr.ConvertToOtherProjection('Lambert_Conformal_Conic_2SP')
     if sr2 is not None:
-        gdaltest.post_reason('fail')
         print(sr2)
         return 'fail'
 
@@ -1279,7 +1248,6 @@ def test_osr_basic_25():
     PARAMETER["false_northing",4185861.369]]""")
     sr2 = sr.ConvertToOtherProjection('Lambert_Conformal_Conic_2SP')
     if sr2 is not None:
-        gdaltest.post_reason('fail')
         print(sr2)
         return 'fail'
 
@@ -1299,7 +1267,6 @@ def test_osr_basic_25():
     PARAMETER["false_northing",4185861.369]]""")
     sr2 = sr.ConvertToOtherProjection('Lambert_Conformal_Conic_2SP')
     if sr2 is not None:
-        gdaltest.post_reason('fail')
         print(sr2)
         return 'fail'
 
@@ -1319,7 +1286,6 @@ def test_osr_basic_25():
     PARAMETER["false_northing",4185861.369]]""")
     sr2 = sr.ConvertToOtherProjection('Lambert_Conformal_Conic_2SP')
     if sr2 is not None:
-        gdaltest.post_reason('fail')
         print(sr2)
         return 'fail'
 
@@ -1338,7 +1304,6 @@ def test_osr_basic_25():
     PARAMETER["false_northing",6600000]]""")
     sr2 = sr.ConvertToOtherProjection('Lambert_Conformal_Conic_1SP')
     if sr2 is not None:
-        gdaltest.post_reason('fail')
         print(sr2)
         return 'fail'
 
@@ -1357,7 +1322,6 @@ def test_osr_basic_25():
     PARAMETER["false_northing",6600000]]""")
     sr2 = sr.ConvertToOtherProjection('Lambert_Conformal_Conic_1SP')
     if sr2 is not None:
-        gdaltest.post_reason('fail')
         print(sr2)
         return 'fail'
 
@@ -1376,7 +1340,6 @@ def test_osr_basic_25():
     PARAMETER["false_northing",6600000]]""")
     sr2 = sr.ConvertToOtherProjection('Lambert_Conformal_Conic_1SP')
     if sr2 is not None:
-        gdaltest.post_reason('fail')
         print(sr2)
         return 'fail'
 
@@ -1395,7 +1358,6 @@ def test_osr_basic_25():
     PARAMETER["false_northing",6600000]]""")
     sr2 = sr.ConvertToOtherProjection('Lambert_Conformal_Conic_1SP')
     if sr2 is not None:
-        gdaltest.post_reason('fail')
         print(sr2)
         return 'fail'
 
@@ -1414,7 +1376,6 @@ def test_osr_basic_25():
     PARAMETER["false_northing",6600000]]""")
     sr2 = sr.ConvertToOtherProjection('Lambert_Conformal_Conic_1SP')
     if sr2 is not None:
-        gdaltest.post_reason('fail')
         print(sr2)
         return 'fail'
 
@@ -1433,7 +1394,6 @@ def test_osr_basic_25():
     PARAMETER["false_northing",6600000]]""")
     sr2 = sr.ConvertToOtherProjection('Lambert_Conformal_Conic_1SP')
     if sr2 is not None:
-        gdaltest.post_reason('fail')
         print(sr2)
         return 'fail'
 
@@ -1448,30 +1408,25 @@ def test_osr_basic_setgeogcs():
     sr = osr.SpatialReference()
     sr.SetGeogCS(None, None, None, 0, 0, None, 0, None, 0)
     if sr.ExportToWkt() != 'GEOGCS["unnamed",DATUM["unknown",SPHEROID["unnamed",0,0]],PRIMEM["Greenwich",0],UNIT["degree",0.0174532925199433]]':
-        gdaltest.post_reason('fail')
         print(sr.ExportToWkt())
         return 'fail'
 
     sr.SetGeogCS('a', 'b', 'c', 1, 2, 'd', 3, 'e', 4)
     if sr.ExportToWkt() != 'GEOGCS["a",DATUM["b",SPHEROID["c",1,2]],PRIMEM["d",3],UNIT["e",4]]':
-        gdaltest.post_reason('fail')
         print(sr.ExportToWkt())
         return 'fail'
 
     sr.SetUTM(31)
     sr.SetGeogCS(None, None, None, 0, 0, None, 0, None, 0)
     if sr.ExportToWkt() != 'PROJCS["UTM Zone 31, Northern Hemisphere",GEOGCS["unnamed",DATUM["unknown",SPHEROID["unnamed",0,0]],PRIMEM["Greenwich",0],UNIT["degree",0.0174532925199433]],PROJECTION["Transverse_Mercator"],PARAMETER["latitude_of_origin",0],PARAMETER["central_meridian",0.01308996938995747],PARAMETER["scale_factor",0.9996],PARAMETER["false_easting",500000],PARAMETER["false_northing",0],UNIT["Meter",1]]':
-        gdaltest.post_reason('fail')
         print(sr.ExportToWkt())
         return 'fail'
 
     sr.ImportFromWkt('FOO["bar",GEOGCS[]]')
     if sr.SetGeogCS(None, None, None, 0, 0, None, 0, None, 0) == 0:
-        gdaltest.post_reason('fail')
         print(sr.ExportToWkt())
         return 'fail'
     if sr.ExportToWkt() != 'FOO["bar",GEOGCS[]]':
-        gdaltest.post_reason('fail')
         print(sr.ExportToWkt())
         return 'fail'
 
diff --git a/autotest/osr/osr_compd.py b/autotest/osr/osr_compd.py
index cacdf0a6731c..0b2cb13b2f6b 100755
--- a/autotest/osr/osr_compd.py
+++ b/autotest/osr/osr_compd.py
@@ -307,7 +307,6 @@ def test_osr_compd_6():
     wkt = srs.ExportToPrettyWkt()
 
     if gdaltest.equal_srs_from_wkt(exp_wkt, wkt) == 0:
-        gdaltest.post_reason('fail')
         return 'fail'
     elif exp_wkt != wkt:
         print('warning they are equivalent, but not completely the same')
diff --git a/autotest/osr/osr_epsg.py b/autotest/osr/osr_epsg.py
index 71948ca9d2c8..5885bf603253 100755
--- a/autotest/osr/osr_epsg.py
+++ b/autotest/osr/osr_epsg.py
@@ -195,7 +195,6 @@ def test_osr_epsg_9():
     srs.ImportFromEPSG(3857)
 
     if srs.ExportToWkt() != 'PROJCS["WGS 84 / Pseudo-Mercator",GEOGCS["WGS 84",DATUM["WGS_1984",SPHEROID["WGS 84",6378137,298.257223563,AUTHORITY["EPSG","7030"]],AUTHORITY["EPSG","6326"]],PRIMEM["Greenwich",0,AUTHORITY["EPSG","8901"]],UNIT["degree",0.0174532925199433,AUTHORITY["EPSG","9122"]],AUTHORITY["EPSG","4326"]],PROJECTION["Mercator_1SP"],PARAMETER["central_meridian",0],PARAMETER["scale_factor",1],PARAMETER["false_easting",0],PARAMETER["false_northing",0],UNIT["metre",1,AUTHORITY["EPSG","9001"]],AXIS["X",EAST],AXIS["Y",NORTH],EXTENSION["PROJ4","+proj=merc +a=6378137 +b=6378137 +lat_ts=0.0 +lon_0=0.0 +x_0=0.0 +y_0=0 +k=1.0 +units=m +nadgrids=@null +wktext +no_defs"],AUTHORITY["EPSG","3857"]]':
-        gdaltest.post_reason('fail')
         print(srs.ExportToWkt())
         return 'fail'
 
@@ -231,18 +230,15 @@ def test_osr_epsg_10():
         AUTHORITY["EPSG","9001"]]]""")
 
     if srs.AutoIdentifyEPSG() != 0:
-        gdaltest.post_reason('fail')
         return 'fail'
 
     if srs.GetAuthorityCode(None) != '3031':
-        gdaltest.post_reason('fail')
         print(srs.ExportToWkt())
         return 'fail'
 
     srs_ref = osr.SpatialReference()
     srs_ref.ImportFromEPSG(3031)
     if srs.IsSame(srs_ref) == 0:
-        gdaltest.post_reason('fail')
         return 'fail'
 
     srs = osr.SpatialReference()
@@ -265,18 +261,15 @@ def test_osr_epsg_10():
         AUTHORITY["EPSG","9001"]]]""")
 
     if srs.AutoIdentifyEPSG() != 0:
-        gdaltest.post_reason('fail')
         return 'fail'
 
     if srs.GetAuthorityCode(None) != '3995':
-        gdaltest.post_reason('fail')
         print(srs.ExportToWkt())
         return 'fail'
 
     srs_ref = osr.SpatialReference()
     srs_ref.ImportFromEPSG(3995)
     if srs.IsSame(srs_ref) == 0:
-        gdaltest.post_reason('fail')
         return 'fail'
 
     return 'success'
@@ -327,11 +320,9 @@ def test_osr_epsg_13():
     sr.MorphFromESRI()
     matches = sr.FindMatches()
     if len(matches) != 1 or matches[0][1] != 100:
-        gdaltest.post_reason('fail')
         print(matches)
         return 'fail'
     if matches[0][0].IsSame(sr) == 0:
-        gdaltest.post_reason('fail')
         return 'fail'
 
     # Two matches (and test GEOGCS)
@@ -343,15 +334,12 @@ def test_osr_epsg_13():
     UNIT["degree",0.0174532925199433]]""")
     matches = sr.FindMatches()
     if len(matches) != 2:
-        gdaltest.post_reason('fail')
         print(matches)
         return 'fail'
     if matches[0][0].GetAuthorityCode(None) != '4126' or matches[0][1] != 90:
-        gdaltest.post_reason('fail')
         print(matches)
         return 'fail'
     if matches[1][0].GetAuthorityCode(None) != '4669' or matches[1][1] != 90:
-        gdaltest.post_reason('fail')
         print(matches)
         return 'fail'
 
@@ -364,7 +352,6 @@ def test_osr_epsg_13():
 """)
     matches = sr.FindMatches()
     if matches:
-        gdaltest.post_reason('fail')
         print(matches)
         return 'fail'
 
@@ -392,11 +379,9 @@ def test_osr_epsg_13():
 """)
     matches = sr.FindMatches()
     if len(matches) != 1 or matches[0][1] != 50:
-        gdaltest.post_reason('fail')
         print(matches)
         return 'fail'
     if matches[0][0].IsSame(sr) == 1:
-        gdaltest.post_reason('fail')
         return 'fail'
 
     # WKT has EPSG code but the definition doesn't match with the official
@@ -430,11 +415,9 @@ def test_osr_epsg_13():
 """)
     matches = sr.FindMatches()
     if len(matches) != 1 or matches[0][1] != 50:
-        gdaltest.post_reason('fail')
         print(matches)
         return 'fail'
     if matches[0][0].IsSame(sr) == 1:
-        gdaltest.post_reason('fail')
         return 'fail'
 
     return 'success'
diff --git a/autotest/osr/osr_esri.py b/autotest/osr/osr_esri.py
index 57da59ed20db..b4f2f321fb7e 100755
--- a/autotest/osr/osr_esri.py
+++ b/autotest/osr/osr_esri.py
@@ -1240,7 +1240,6 @@ def test_osr_esri_26():
     srs.SetFromUserInput("""PROJCS["NAD_1983_HARN_WISCRS_Washburn_County_Meters",GEOGCS["GCS_North_American_1983_HARN",DATUM["D_North_American_1983_HARN",SPHEROID["GRS_1980",6378137.0,298.257222101]],PRIMEM["Greenwich",0.0],UNIT["Degree",0.0174532925199433]],PROJECTION["Lambert_Conformal_Conic"],PARAMETER["False_Easting",234086.8682],PARAMETER["False_Northing",188358.6058],PARAMETER["Central_Meridian",-91.78333333333333],PARAMETER["Standard_Parallel_1",45.96121983333334],PARAMETER["Scale_Factor",1.0000475376],PARAMETER["Latitude_Of_Origin",45.96121983333334],UNIT["Meter",1.0]]""")
     srs.MorphFromESRI()
     if srs.Validate() != 0:
-        gdaltest.post_reason('fail')
         print(srs.ExportToWkt())
         return 'fail'
 
@@ -1282,7 +1281,6 @@ def test_osr_esri_27():
     PARAMETER["Central_Meridian",110.0],
     PARAMETER["Standard_Parallel_1",4.45405154589751],
     UNIT["Meter",1.0]]""":
-        gdaltest.post_reason('fail')
         print(got_wkt)
         return 'fail'
 
@@ -1300,7 +1298,6 @@ def test_osr_esri_27():
     PARAMETER["Central_Meridian",110.0],
     PARAMETER["Standard_Parallel_1",4.45405154589751],
     UNIT["Meter",1.0]]""":
-        gdaltest.post_reason('fail')
         print(got_wkt)
         return 'fail'
 
@@ -1353,7 +1350,6 @@ def test_osr_esri_28():
     PARAMETER["false_easting",3900000],
     PARAMETER["false_northing",900000],
     PARAMETER["standard_parallel_1",4.45405154""") != 0:
-        gdaltest.post_reason('fail')
         print(got_wkt)
         return 'fail'
 
@@ -1371,7 +1367,6 @@ def test_osr_esri_28():
     PARAMETER["false_easting",3900000],
     PARAMETER["false_northing",900000],
     PARAMETER["standard_parallel_1",4.45405154""") != 0:
-        gdaltest.post_reason('fail')
         print(got_wkt)
         return 'fail'
 
@@ -1401,7 +1396,6 @@ def test_osr_esri_29():
     PARAMETER["Standard_Parallel_1",0.0],
     PARAMETER["Auxiliary_Sphere_Type",0.0],
     UNIT["Meter",1.0]]""":
-        gdaltest.post_reason('fail')
         print(got_wkt)
         return 'fail'
 
@@ -1429,7 +1423,6 @@ def test_osr_esri_29():
     AXIS["Y",NORTH],
     EXTENSION["PROJ4","+proj=merc +a=6378137 +b=6378137 +lat_ts=0.0 +lon_0=0.0 +x_0=0.0 +y_0=0 +k=1.0 +units=m +nadgrids=@null +wktext +no_defs"],
     AUTHORITY["EPSG","3857"]]""":
-        gdaltest.post_reason('fail')
         print(got_wkt)
         return 'fail'
 
@@ -1459,7 +1452,6 @@ def test_osr_esri_29():
     AXIS["Y",NORTH],
     EXTENSION["PROJ4","+proj=merc +a=6378137 +b=6378137 +lat_ts=0.0 +lon_0=0.0 +x_0=0.0 +y_0=0 +k=1.0 +units=m +nadgrids=@null +wktext +no_defs"],
     AUTHORITY["EPSG","3857"]]""":
-        gdaltest.post_reason('fail')
         print(got_wkt)
         return 'fail'
 
@@ -1487,7 +1479,6 @@ def test_osr_esri_30():
     srs_wkt = osr.SpatialReference(wkt=wkt)
 
     if not srs_prj.IsSame(srs_wkt):
-        gdaltest.post_reason('fail')
         print(srs_prj)
         return 'fail'
 
@@ -1538,7 +1529,6 @@ def test_osr_esri_31():
     srs_wkt = osr.SpatialReference(wkt=wkt)
 
     if not srs_prj.IsSame(srs_wkt):
-        gdaltest.post_reason('fail')
         print(srs_prj)
         return 'fail'
 
diff --git a/autotest/osr/osr_micoordsys.py b/autotest/osr/osr_micoordsys.py
index 2cdb84667e57..f19ed8edd56e 100755
--- a/autotest/osr/osr_micoordsys.py
+++ b/autotest/osr/osr_micoordsys.py
@@ -99,7 +99,6 @@ def test_osr_micoordsys_3():
     proj = srs.ExportToMICoordSys()
 
     if proj != 'Earth Projection 10, 157, "m", 0':
-        gdaltest.post_reason('failure')
         print(proj)
         return 'fail'
 
@@ -107,7 +106,6 @@ def test_osr_micoordsys_3():
     srs.ImportFromMICoordSys('Earth Projection 10, 157, "m", 0')
     wkt = srs.ExportToWkt()
     if wkt.find('EXTENSION["PROJ4"') < 0:
-        gdaltest.post_reason('failure')
         print(wkt)
         return 'fail'
 
@@ -115,7 +113,6 @@ def test_osr_micoordsys_3():
     proj = srs.ExportToMICoordSys()
 
     if proj != 'Earth Projection 10, 157, "m", 0':
-        gdaltest.post_reason('failure')
         print(proj)
         return 'fail'
 
diff --git a/autotest/osr/osr_proj4.py b/autotest/osr/osr_proj4.py
index 085371d3271c..5a6872004fe3 100755
--- a/autotest/osr/osr_proj4.py
+++ b/autotest/osr/osr_proj4.py
@@ -643,12 +643,10 @@ def test_osr_proj4_15():
         return 'skip'
 
     if srs.GetAuthorityName(None) != 'IGNF' or srs.GetAuthorityCode(None) != 'LAMB93':
-        gdaltest.post_reason('fail')
         print(srs)
         return 'fail'
 
     if srs.Validate() != 0:
-        gdaltest.post_reason('fail')
         print(srs)
         return 'fail'
 
@@ -771,7 +769,6 @@ def test_osr_proj4_19():
     srs.ImportFromProj4("+proj=longlat +datum=WGS84 +nadgrids=@null")
 
     if srs.ExportToWkt() != 'GEOGCS["WGS 84",DATUM["WGS_1984",SPHEROID["WGS 84",6378137,298.257223563,AUTHORITY["EPSG","7030"]],EXTENSION["PROJ4_GRIDS","@null"],AUTHORITY["EPSG","6326"]],PRIMEM["Greenwich",0,AUTHORITY["EPSG","8901"]],UNIT["degree",0.0174532925199433,AUTHORITY["EPSG","9122"]],AUTHORITY["EPSG","4326"]]':
-        gdaltest.post_reason('fail')
         print(srs.ExportToWkt())
         return 'fail'
 
@@ -793,7 +790,6 @@ def test_osr_proj4_20():
 
     if srs.ExportToWkt() != 'GEOGCS["WGS 84",DATUM["unknown",SPHEROID["WGS84",6378137,298.257223563]],PRIMEM["Greenwich",0],UNIT["degree",0.0174532925199433],EXTENSION["PROJ4","+proj=longlat +foo=bar +wktext"]]' and \
        srs.ExportToWkt() != 'GEOGCS["unnamed ellipse",DATUM["unknown",SPHEROID["unnamed",6378137,298.257223563]],PRIMEM["Greenwich",0],UNIT["degree",0.0174532925199433],EXTENSION["PROJ4","+proj=longlat +foo=bar +wktext"]]':
-        gdaltest.post_reason('fail')
         print(srs.ExportToWkt())
         return 'fail'
 
@@ -818,7 +814,6 @@ def test_osr_proj4_21():
     gdal.SetConfigOption('OVERRIDE_PROJ_DATUM_WITH_TOWGS84', None)
 
     if got.find('+proj=longlat +datum=nzgd49') != 0:
-        gdaltest.post_reason('fail')
         print(got)
         return 'fail'
 
@@ -835,7 +830,6 @@ def test_osr_proj4_22():
     got = srs.ExportToProj4()
 
     if got.find('+proj=longlat +a=1 +b=1') != 0:
-        gdaltest.post_reason('fail')
         print(got)
         return 'fail'
 
@@ -853,7 +847,6 @@ def test_osr_proj4_23():
     got = srs.ExportToProj4()
 
     if got.find('+proj=longlat +a=1 +b=1') != 0:
-        gdaltest.post_reason('fail')
         print(got)
         return 'fail'
 
@@ -862,7 +855,6 @@ def test_osr_proj4_23():
     got = srs.ExportToProj4()
 
     if got.find('+proj=longlat +a=2 +b=1') != 0:
-        gdaltest.post_reason('fail')
         print(got)
         return 'fail'
 
@@ -879,7 +871,6 @@ def test_osr_proj4_24():
     got = srs.ExportToProj4()
 
     if got.find('+units=m') < 0:
-        gdaltest.post_reason('fail')
         print(got)
         return 'fail'
 
@@ -889,7 +880,6 @@ def test_osr_proj4_24():
     got = srs.ExportToProj4()
 
     if got.find('+units=ft') < 0:
-        gdaltest.post_reason('fail')
         print(got)
         return 'fail'
 
@@ -899,7 +889,6 @@ def test_osr_proj4_24():
     got = srs.ExportToProj4()
 
     if got.find('+units=us-ft') < 0:
-        gdaltest.post_reason('fail')
         print(got)
         return 'fail'
 
@@ -909,7 +898,6 @@ def test_osr_proj4_24():
     got = srs.ExportToProj4()
 
     if got.find('+to_meter=0.4') < 0:
-        gdaltest.post_reason('fail')
         print(got)
         return 'fail'
 
@@ -929,7 +917,6 @@ def test_osr_proj4_25():
     got = srs.ExportToProj4()
 
     if got.find('+vunits=m') < 0:
-        gdaltest.post_reason('fail')
         print(got)
         return 'fail'
 
@@ -939,7 +926,6 @@ def test_osr_proj4_25():
     got = srs.ExportToProj4()
 
     if got.find('+vunits=ft') < 0:
-        gdaltest.post_reason('fail')
         print(got)
         return 'fail'
 
@@ -949,7 +935,6 @@ def test_osr_proj4_25():
     got = srs.ExportToProj4()
 
     if got.find('+vunits=us-ft') < 0:
-        gdaltest.post_reason('fail')
         print(got)
         return 'fail'
 
@@ -959,7 +944,6 @@ def test_osr_proj4_25():
     got = srs.ExportToProj4()
 
     if got.find('+vto_meter=0.4') < 0:
-        gdaltest.post_reason('fail')
         print(got)
         return 'fail'
 
@@ -979,7 +963,6 @@ def test_osr_proj4_26():
     got = srs.ExportToProj4()
 
     if got.find('+vunits=m') < 0:
-        gdaltest.post_reason('fail')
         print(got)
         return 'fail'
 
@@ -989,7 +972,6 @@ def test_osr_proj4_26():
     got = srs.ExportToProj4()
 
     if got.find('+vunits=ft') < 0:
-        gdaltest.post_reason('fail')
         print(got)
         return 'fail'
 
@@ -999,7 +981,6 @@ def test_osr_proj4_26():
     got = srs.ExportToProj4()
 
     if got.find('+vunits=us-yd') < 0:
-        gdaltest.post_reason('fail')
         print(got)
         return 'fail'
 
@@ -1019,7 +1000,6 @@ def test_osr_proj4_27():
     got = srs.ExportToProj4()
 
     if got.find('+proj=geos +h=35785831 +lon_0=0 +datum=WGS84 +sweep=x +units=m') < 0:
-        gdaltest.post_reason('fail')
         print(got)
         return 'fail'
 
@@ -1036,7 +1016,6 @@ def test_osr_proj4_28():
     got = srs.ExportToWkt()
 
     if got.find('32631') >= 0:
-        gdaltest.post_reason('fail')
         print(got)
         return 'fail'
 
@@ -1065,7 +1044,6 @@ def test_osr_proj4_error_cases_export_mercator():
     with gdaltest.error_handler():
         got = srs.ExportToProj4()
     if got != '':
-        gdaltest.post_reason('fail')
         print(got)
         return 'fail'
 
@@ -1074,7 +1052,6 @@ def test_osr_proj4_error_cases_export_mercator():
     with gdaltest.error_handler():
         got = srs.ExportToProj4()
     if got != '':
-        gdaltest.post_reason('fail')
         print(got)
         return 'fail'
 
diff --git a/autotest/pymod/ogrtest.py b/autotest/pymod/ogrtest.py
index 36d09866e6f9..6309d9eb7223 100644
--- a/autotest/pymod/ogrtest.py
+++ b/autotest/pymod/ogrtest.py
@@ -170,7 +170,6 @@ def compare_layers(lyr, lyr_ref, excluded_fields=None):
     for f_ref in lyr_ref:
         f = lyr.GetNextFeature()
         if f is None:
-            gdaltest.post_reason('fail')
             f_ref.DumpReadable()
             return 'fail'
         if check_feature(f, f_ref, excluded_fields=excluded_fields) != 0:
@@ -179,7 +178,6 @@ def compare_layers(lyr, lyr_ref, excluded_fields=None):
             return 'fail'
     f = lyr.GetNextFeature()
     if f is not None:
-        gdaltest.post_reason('fail')
         f.DumpReadable()
         return 'fail'
     return 'success'
diff --git a/autotest/pyscripts/test_gdal_calc.py b/autotest/pyscripts/test_gdal_calc.py
index 1a8682b3b2f0..b1f8be3e71ff 100755
--- a/autotest/pyscripts/test_gdal_calc.py
+++ b/autotest/pyscripts/test_gdal_calc.py
@@ -320,12 +320,10 @@ def test_gdal_calc_py_6():
     ds = gdal.Open('tmp/test_gdal_calc_py_6.tif')
     cs = ds.GetRasterBand(1).Checksum()
     if cs != 4673:
-        gdaltest.post_reason('failure')
         print(cs)
         return 'fail'
     result = ds.GetRasterBand(1).ComputeRasterMinMax()
     if result != (90, 255):
-        gdaltest.post_reason('failure')
         print(result)
         return 'fail'
 
diff --git a/autotest/pyscripts/test_gdal_edit.py b/autotest/pyscripts/test_gdal_edit.py
index 08709fdfc069..f7e84fcee5b7 100755
--- a/autotest/pyscripts/test_gdal_edit.py
+++ b/autotest/pyscripts/test_gdal_edit.py
@@ -77,34 +77,28 @@ def test_gdal_edit_py_1():
     ds = None
 
     if wkt.find('4326') == -1:
-        gdaltest.post_reason('fail')
         print(wkt)
         return 'fail'
 
     expected_gt = (2.0, 0.050000000000000003, 0.0, 50.0, 0.0, -0.050000000000000003)
     for i in range(6):
         if abs(gt[i] - expected_gt[i]) > 1e-10:
-            gdaltest.post_reason('fail')
             print(gt)
             return 'fail'
 
     if nd != 123:
-        gdaltest.post_reason('fail')
         print(nd)
         return 'fail'
 
     if md['FOO'] != 'BAR':
-        gdaltest.post_reason('fail')
         print(md)
         return 'fail'
 
     if md['UTF8'] != val:
-        gdaltest.post_reason('fail')
         print(md)
         return 'fail'
 
     if md[val] != 'UTF8':
-        gdaltest.post_reason('fail')
         print(md)
         return 'fail'
 
@@ -130,12 +124,10 @@ def test_gdal_edit_py_2():
     ds = None
 
     if gt is not None:
-        gdaltest.post_reason('fail')
         print(gt)
         return 'fail'
 
     if wkt == '':
-        gdaltest.post_reason('fail')
         print(wkt)
         return 'fail'
 
@@ -161,12 +153,10 @@ def test_gdal_edit_py_3():
     ds = None
 
     if gt == (0.0, 1.0, 0.0, 0.0, 0.0, 1.0):
-        gdaltest.post_reason('fail')
         print(gt)
         return 'fail'
 
     if wkt != '':
-        gdaltest.post_reason('fail')
         print(wkt)
         return 'fail'
 
@@ -193,7 +183,6 @@ def test_gdal_edit_py_4():
     band = ds.GetRasterBand(1)
     if (band.GetMetadataItem('STATISTICS_MINIMUM') is None or
             band.GetMetadataItem('FOO') is None):
-        gdaltest.post_reason('fail')
         return 'fail'
     ds = band = None
 
@@ -203,13 +192,11 @@ def test_gdal_edit_py_4():
     band = ds.GetRasterBand(1)
     if (band.GetMetadataItem('STATISTICS_MINIMUM') is not None or
             band.GetMetadataItem('FOO') is None):
-        gdaltest.post_reason('fail')
         return 'fail'
     ds = band = None
 
     try:
         os.stat('tmp/test_gdal_edit_py.tif.aux.xml')
-        gdaltest.post_reason('fail')
         return 'fail'
     except OSError:
         pass
@@ -243,7 +230,6 @@ def test_gdal_edit_py_5():
 
     ds = gdal.Open('tmp/test_gdal_edit_py.tif')
     if ds.ReadAsArray()[15, 12] != 22:
-        gdaltest.post_reason('fail')
         return 'fail'
     ds = None
 
@@ -252,7 +238,6 @@ def test_gdal_edit_py_5():
     ds = gdal.Open('tmp/test_gdal_edit_py.tif')
     stat_min = ds.GetRasterBand(1).GetMetadataItem('STATISTICS_MINIMUM')
     if stat_min is None or float(stat_min) != 22:
-        gdaltest.post_reason('fail')
         return 'fail'
     ds = None
 
@@ -265,7 +250,6 @@ def test_gdal_edit_py_5():
 
     ds = gdal.Open('tmp/test_gdal_edit_py.tif')
     if ds.ReadAsArray()[15, 12] != 26:
-        gdaltest.post_reason('fail')
         return 'fail'
     ds = None
 
@@ -274,7 +258,6 @@ def test_gdal_edit_py_5():
     ds = gdal.Open('tmp/test_gdal_edit_py.tif')
     stat_min = ds.GetRasterBand(1).GetMetadataItem('STATISTICS_MINIMUM')
     if stat_min is None or float(stat_min) != 26:
-        gdaltest.post_reason('fail')
         return 'fail'
     ds = None
 
@@ -298,19 +281,15 @@ def test_gdal_edit_py_6():
     ds = gdal.Open('tmp/test_gdal_edit_py.tif')
     stat_min = ds.GetRasterBand(1).GetMetadataItem('STATISTICS_MINIMUM')
     if stat_min is None or float(stat_min) != 74:
-        gdaltest.post_reason('fail')
         return 'fail'
     stat_max = ds.GetRasterBand(1).GetMetadataItem('STATISTICS_MAXIMUM')
     if stat_max is None or float(stat_max) != 255:
-        gdaltest.post_reason('fail')
         return 'fail'
     stat_mean = ds.GetRasterBand(1).GetMetadataItem('STATISTICS_MEAN')
     if stat_mean is None or abs(float(stat_mean) - 126.765)>0.001:
-        gdaltest.post_reason('fail')
         return 'fail'
     stat_stddev = ds.GetRasterBand(1).GetMetadataItem('STATISTICS_STDDEV')
     if stat_stddev is None or abs(float(stat_stddev) - 22.928)>0.001:
-        gdaltest.post_reason('fail')
         return 'fail'
 
     ds = None
@@ -320,19 +299,15 @@ def test_gdal_edit_py_6():
     ds = gdal.Open('tmp/test_gdal_edit_py.tif')
     stat_min = ds.GetRasterBand(1).GetMetadataItem('STATISTICS_MINIMUM')
     if stat_min is None or float(stat_min) != 22:
-        gdaltest.post_reason('fail')
         return 'fail'
     stat_max = ds.GetRasterBand(1).GetMetadataItem('STATISTICS_MAXIMUM')
     if stat_max is None or float(stat_max) != 217:
-        gdaltest.post_reason('fail')
         return 'fail'
     stat_mean = ds.GetRasterBand(1).GetMetadataItem('STATISTICS_MEAN')
     if stat_mean is None or float(stat_mean) != 100:
-        gdaltest.post_reason('fail')
         return 'fail'
     stat_stddev = ds.GetRasterBand(1).GetMetadataItem('STATISTICS_STDDEV')
     if stat_stddev is None or float(stat_stddev) != 30:
-        gdaltest.post_reason('fail')
         return 'fail'
     ds = None
 
@@ -353,10 +328,8 @@ def test_gdal_edit_py_7():
 
     ds = gdal.Open('tmp/test_gdal_edit_py.tif')
     if ds.GetRasterBand(1).GetScale() != 2:
-        gdaltest.post_reason('fail')
         return 'fail'
     if ds.GetRasterBand(1).GetOffset() != 3:
-        gdaltest.post_reason('fail')
         return 'fail'
 
     return 'success'
@@ -379,14 +352,12 @@ def test_gdal_edit_py_8():
 
     ds = gdal.Open('tmp/test_gdal_edit_py.tif')
     if ds.GetRasterBand(4).GetColorInterpretation() != gdal.GCI_AlphaBand:
-        gdaltest.post_reason('fail')
         return 'fail'
 
     test_py_scripts.run_py_script(script_path, 'gdal_edit', "tmp/test_gdal_edit_py.tif -colorinterp_4 undefined")
 
     ds = gdal.Open('tmp/test_gdal_edit_py.tif')
     if ds.GetRasterBand(4).GetColorInterpretation() != gdal.GCI_Undefined:
-        gdaltest.post_reason('fail')
         return 'fail'
 
     return 'success'
@@ -407,7 +378,6 @@ def test_gdal_edit_py_unsetrpc():
 
     ds = gdal.Open('tmp/test_gdal_edit_py.tif')
     if ds.GetMetadata('RPC'):
-        gdaltest.post_reason('fail')
         return 'fail'
 
     return 'success'
diff --git a/autotest/pyscripts/test_gdal_pansharpen.py b/autotest/pyscripts/test_gdal_pansharpen.py
index d77073570689..31c619eaa1ed 100755
--- a/autotest/pyscripts/test_gdal_pansharpen.py
+++ b/autotest/pyscripts/test_gdal_pansharpen.py
@@ -68,7 +68,6 @@ def test_gdal_pansharpen_1():
     gdal.GetDriverByName('GTiff').Delete('tmp/out.tif')
 
     if cs != [4735, 10000, 9742]:
-        gdaltest.post_reason('fail')
         print(cs)
         return 'fail'
 
@@ -92,7 +91,6 @@ def test_gdal_pansharpen_2():
     gdal.GetDriverByName('VRT').Delete('tmp/out.vrt')
 
     if cs != [9742, 4735]:
-        gdaltest.post_reason('fail')
         print(cs)
         return 'fail'
 
diff --git a/autotest/pyscripts/test_gdal_polygonize.py b/autotest/pyscripts/test_gdal_polygonize.py
index c1fc6399c4e0..f52632749286 100755
--- a/autotest/pyscripts/test_gdal_polygonize.py
+++ b/autotest/pyscripts/test_gdal_polygonize.py
@@ -193,7 +193,6 @@ def test_gdal_polygonize_4():
     os.unlink('tmp/out.gml')
 
     if content.find('<ogr:geometryProperty><gml:Polygon srsName="EPSG:26711"><gml:outerBoundaryIs><gml:LinearRing><gml:coordinates>440720,3751320 440720,3750120 441920,3750120 441920,3751320 440720,3751320</gml:coordinates></gml:LinearRing></gml:outerBoundaryIs></gml:Polygon></ogr:geometryProperty>') < 0:
-        gdaltest.post_reason('fail')
         print(content)
         return 'fail'
 
@@ -205,7 +204,6 @@ def test_gdal_polygonize_4():
     os.unlink('tmp/out.gml')
 
     if content.find('<ogr:geometryProperty><gml:Polygon srsName="EPSG:26711"><gml:outerBoundaryIs><gml:LinearRing><gml:coordinates>440720,3751320 440720,3750120 441920,3750120 441920,3751320 440720,3751320</gml:coordinates></gml:LinearRing></gml:outerBoundaryIs></gml:Polygon></ogr:geometryProperty>') < 0:
-        gdaltest.post_reason('fail')
         print(content)
         return 'fail'
 
diff --git a/autotest/pyscripts/test_gdal_retile.py b/autotest/pyscripts/test_gdal_retile.py
index eac1290e6940..faaed1582e2c 100755
--- a/autotest/pyscripts/test_gdal_retile.py
+++ b/autotest/pyscripts/test_gdal_retile.py
@@ -235,13 +235,11 @@ def test_gdal_retile_4():
     for (filename, width, height) in expected_results:
         ds = gdal.Open(filename)
         if ds.RasterXSize != width:
-            gdaltest.post_reason('fail')
             print(filename)
             print(ds.RasterXSize)
             print(width)
             return 'fail'
         if ds.RasterYSize != height:
-            gdaltest.post_reason('fail')
             print(filename)
             print(ds.RasterYSize)
             print(height)
@@ -274,13 +272,11 @@ def test_gdal_retile_4():
     for (filename, width, height) in expected_results:
         ds = gdal.Open(filename)
         if ds.RasterXSize != width:
-            gdaltest.post_reason('fail')
             print(filename)
             print(ds.RasterXSize)
             print(width)
             return 'fail'
         if ds.RasterYSize != height:
-            gdaltest.post_reason('fail')
             print(filename)
             print(ds.RasterYSize)
             print(height)
diff --git a/autotest/pyscripts/test_ogr2ogr_py.py b/autotest/pyscripts/test_ogr2ogr_py.py
index c1aee28f81f9..55b0a59a16d6 100755
--- a/autotest/pyscripts/test_ogr2ogr_py.py
+++ b/autotest/pyscripts/test_ogr2ogr_py.py
@@ -1412,7 +1412,6 @@ def test_ogr2ogr_py_44():
     f.close()
 
     if data.find('type="gml:MultiPolygonPropertyType"') == -1:
-        gdaltest.post_reason('failure')
         print(data)
         return 'fail'
 
@@ -1421,7 +1420,6 @@ def test_ogr2ogr_py_44():
     f.close()
 
     if data.find('<ogr:geometryProperty><gml:MultiPolygon><gml:polygonMember><gml:Polygon><gml:outerBoundaryIs><gml:LinearRing><gml:coordinates>0,0 0,1 1,1 0,0</gml:coordinates></gml:LinearRing></gml:outerBoundaryIs></gml:Polygon></gml:polygonMember></gml:MultiPolygon></ogr:geometryProperty>') == -1:
-        gdaltest.post_reason('failure')
         print(data)
         return 'fail'
 
@@ -1467,7 +1465,6 @@ def test_ogr2ogr_py_45():
     f.close()
 
     if data.find('type="gml:MultiPolygonPropertyType"') == -1:
-        gdaltest.post_reason('failure')
         print(data)
         return 'fail'
 
@@ -1476,7 +1473,6 @@ def test_ogr2ogr_py_45():
     f.close()
 
     if data.find('<ogr:geometryProperty><gml:MultiPolygon><gml:polygonMember><gml:Polygon><gml:outerBoundaryIs><gml:LinearRing><gml:coordinates>0,0 0,1 1,1 0,0</gml:coordinates></gml:LinearRing></gml:outerBoundaryIs></gml:Polygon></gml:polygonMember></gml:MultiPolygon></ogr:geometryProperty>') == -1:
-        gdaltest.post_reason('failure')
         print(data)
         return 'fail'
 
@@ -1522,7 +1518,6 @@ def test_ogr2ogr_py_46():
     f.close()
 
     if data.find('type="gml:MultiLineStringPropertyType"') == -1:
-        gdaltest.post_reason('failure')
         print(data)
         return 'fail'
 
@@ -1531,7 +1526,6 @@ def test_ogr2ogr_py_46():
     f.close()
 
     if data.find('<ogr:geometryProperty><gml:MultiLineString><gml:lineStringMember><gml:LineString><gml:coordinates>0,0 0,1 1,1 0,0</gml:coordinates></gml:LineString></gml:lineStringMember></gml:MultiLineString></ogr:geometryProperty>') == -1:
-        gdaltest.post_reason('failure')
         print(data)
         return 'fail'
 
diff --git a/autotest/pyscripts/test_ogrmerge.py b/autotest/pyscripts/test_ogrmerge.py
index 742f143fe142..9d236502bed1 100755
--- a/autotest/pyscripts/test_ogrmerge.py
+++ b/autotest/pyscripts/test_ogrmerge.py
@@ -51,7 +51,6 @@ def test_ogrmerge_1():
     ds = ogr.Open('/vsimem/out.shp')
     lyr = ds.GetLayer(0)
     if lyr.GetFeatureCount() != 20:
-        gdaltest.post_reason('fail')
         return 'fail'
     ds = None
 
@@ -76,7 +75,6 @@ def test_ogrmerge_2():
     ds = ogr.Open('/vsimem/out.shp')
     lyr = ds.GetLayer(0)
     if lyr.GetFeatureCount() != 20:
-        gdaltest.post_reason('fail')
         return 'fail'
     ds = None
 
@@ -101,7 +99,6 @@ def test_ogrmerge_3():
     ds = ogr.Open('/vsimem/out.shp')
     lyr = ds.GetLayer(0)
     if lyr.GetFeatureCount() != 10:
-        gdaltest.post_reason('fail')
         return 'fail'
     ds = None
 
@@ -124,10 +121,8 @@ def test_ogrmerge_4():
     ds = ogr.Open('/vsimem/out.vrt')
     lyr = ds.GetLayer(0)
     if lyr.GetName() != 'poly':
-        gdaltest.post_reason('fail')
         return 'fail'
     if lyr.GetFeatureCount() != 10:
-        gdaltest.post_reason('fail')
         return 'fail'
     ds = None
 
@@ -151,19 +146,15 @@ def test_ogrmerge_5():
     ds = ogr.Open('/vsimem/out.vrt')
     lyr = ds.GetLayer(0)
     if lyr.GetName() != 'foo_../ogr/data/poly.shp_poly_0_poly_0':
-        gdaltest.post_reason('fail')
         print(lyr.GetName())
         return 'fail'
     if lyr.GetFeatureCount() != 10:
-        gdaltest.post_reason('fail')
         return 'fail'
     lyr = ds.GetLayer(1)
     if lyr.GetName() != 'foo_../ogr/data/testpoly.shp_testpoly_1_testpoly_0':
-        gdaltest.post_reason('fail')
         print(lyr.GetName())
         return 'fail'
     if lyr.GetFeatureCount() != 14:
-        gdaltest.post_reason('fail')
         return 'fail'
     ds = None
 
@@ -189,7 +180,6 @@ def test_ogrmerge_6():
     lyr = ds.GetLayer(0)
     f = lyr.GetNextFeature()
     if f['source'] != 'foo_../ogr/data/poly.shp_poly_0_poly_0':
-        gdaltest.post_reason('fail')
         f.DumpReadable()
         return 'fail'
     ds = None
@@ -214,7 +204,6 @@ def test_ogrmerge_7():
 
     ds = ogr.Open('/vsimem/out.vrt')
     if ds.GetLayerCount() != 0:
-        gdaltest.post_reason('fail')
         return 'fail'
     ds = None
 
@@ -227,7 +216,6 @@ def test_ogrmerge_7():
 
     ds = ogr.Open('/vsimem/out.vrt')
     if ds.GetLayerCount() != 1:
-        gdaltest.post_reason('fail')
         return 'fail'
     ds = None
 
@@ -240,7 +228,6 @@ def test_ogrmerge_7():
 
     ds = ogr.Open('/vsimem/out.vrt')
     if ds.GetLayerCount() != 0:
-        gdaltest.post_reason('fail')
         return 'fail'
     ds = None
 
@@ -253,7 +240,6 @@ def test_ogrmerge_7():
 
     ds = ogr.Open('/vsimem/out.vrt')
     if ds.GetLayerCount() != 1:
-        gdaltest.post_reason('fail')
         return 'fail'
     ds = None
 
@@ -276,7 +262,6 @@ def test_ogrmerge_8():
 
     ds = ogr.Open('/vsimem/out.vrt')
     if ds is None:
-        gdaltest.post_reason('fail')
         return 'fail'
     ds = None
 
@@ -288,12 +273,10 @@ def test_ogrmerge_8():
     gdal.Unlink('/vsimem/out.vrt')
 
     if content.find('<SrcSRS>EPSG:32630</SrcSRS>') < 0:
-        gdaltest.post_reason('fail')
         print(content)
         return 'fail'
 
     if content.find('<TargetSRS>EPSG:4326</TargetSRS>') < 0:
-        gdaltest.post_reason('fail')
         print(content)
         return 'fail'
 
@@ -314,7 +297,6 @@ def test_ogrmerge_9():
 
     ds = ogr.Open('/vsimem/out.vrt')
     if ds is None:
-        gdaltest.post_reason('fail')
         return 'fail'
     ds = None
 
@@ -326,12 +308,10 @@ def test_ogrmerge_9():
     gdal.Unlink('/vsimem/out.vrt')
 
     if content.find('<SrcSRS>EPSG:32630</SrcSRS>') < 0:
-        gdaltest.post_reason('fail')
         print(content)
         return 'fail'
 
     if content.find('<TargetSRS>EPSG:4326</TargetSRS>') < 0:
-        gdaltest.post_reason('fail')
         print(content)
         return 'fail'
 
@@ -352,7 +332,6 @@ def test_ogrmerge_10():
 
     ds = ogr.Open('/vsimem/out.vrt')
     if ds is None:
-        gdaltest.post_reason('fail')
         return 'fail'
     ds = None
 
@@ -364,7 +343,6 @@ def test_ogrmerge_10():
     gdal.Unlink('/vsimem/out.vrt')
 
     if content.find('<LayerSRS>EPSG:32630</LayerSRS>') < 0:
-        gdaltest.post_reason('fail')
         print(content)
         return 'fail'
 
@@ -385,7 +363,6 @@ def test_ogrmerge_11():
 
     ds = ogr.Open('/vsimem/out.vrt')
     if ds is None:
-        gdaltest.post_reason('fail')
         return 'fail'
     ds = None
 
@@ -397,7 +374,6 @@ def test_ogrmerge_11():
     gdal.Unlink('/vsimem/out.vrt')
 
     if content.find('<LayerSRS>EPSG:32630</LayerSRS>') < 0:
-        gdaltest.post_reason('fail')
         print(content)
         return 'fail'
 
@@ -420,7 +396,6 @@ def test_ogrmerge_12():
 
     ds = ogr.Open('/vsimem/out.vrt')
     if ds is None:
-        gdaltest.post_reason('fail')
         return 'fail'
     ds = None
 
diff --git a/autotest/utilities/test_gdal_grid_lib.py b/autotest/utilities/test_gdal_grid_lib.py
index f9e2ef0794b8..d554ceebbe9a 100755
--- a/autotest/utilities/test_gdal_grid_lib.py
+++ b/autotest/utilities/test_gdal_grid_lib.py
@@ -122,13 +122,11 @@ def test_gdal_grid_lib_2():
 
         cs = ds1.GetRasterBand(1).Checksum()
         if cs != 2:
-            gdaltest.post_reason('fail')
             print(cs)
             return 'fail'
 
         cs = ds2.GetRasterBand(1).Checksum()
         if cs != 1064:
-            gdaltest.post_reason('fail')
             print(cs)
             return 'fail'
 
diff --git a/autotest/utilities/test_gdal_rasterize_lib.py b/autotest/utilities/test_gdal_rasterize_lib.py
index 61b41356bf55..d18bf8718c2a 100755
--- a/autotest/utilities/test_gdal_rasterize_lib.py
+++ b/autotest/utilities/test_gdal_rasterize_lib.py
@@ -90,7 +90,6 @@ def test_gdal_rasterize_lib_1():
 
     ret = gdal.Rasterize(target_ds, vector_ds, bands=[3, 2, 1], burnValues=[200, 220, 240], layers='rast1')
     if ret != 1:
-        gdaltest.post_reason('fail')
         return 'fail'
 
     # Check results.
@@ -178,7 +177,6 @@ def test_gdal_rasterize_lib_100():
 
     ret = gdal.Rasterize(target_ds, vector_ds, burnValues=[255])
     if ret != 1:
-        gdaltest.post_reason('fail')
         return 'fail'
 
     # Check results.
@@ -218,7 +216,6 @@ def test_gdal_rasterize_lib_101():
 
     ret = gdal.Rasterize(target_ds, vector_ds, burnValues=[255])
     if ret != 1:
-        gdaltest.post_reason('fail')
         return 'fail'
 
     # Check results.
@@ -275,7 +272,6 @@ def test_gdal_rasterize_lib_102():
 
     ret = gdal.Rasterize(target_ds, vector_ds, burnValues=[0])
     if ret != 1:
-        gdaltest.post_reason('fail')
         return 'fail'
 
     # Check results.
@@ -291,7 +287,6 @@ def test_gdal_rasterize_lib_102():
     ret = gdal.Rasterize(target_ds, vector_ds, burnValues=[0],
                          transformerOptions=['RPC_HEIGHT=1000'])
     if ret != 1:
-        gdaltest.post_reason('fail')
         return 'fail'
 
     # Check results.
@@ -359,7 +354,6 @@ def test_gdal_rasterize_lib_4():
 
         ret = gdal.Rasterize(target_ds, vector_ds, bands=[3, 2, 1], burnValues=[200, 220, 240], layers='rast1', optim=optim)
         if ret != 1:
-            gdaltest.post_reason('fail')
             return 'fail'
 
         # Check results.
diff --git a/autotest/utilities/test_gdal_translate.py b/autotest/utilities/test_gdal_translate.py
index 023af4d4ae6e..ae15054a004f 100755
--- a/autotest/utilities/test_gdal_translate.py
+++ b/autotest/utilities/test_gdal_translate.py
@@ -725,11 +725,9 @@ def test_gdal_translate_26():
 
     ds = gdal.Open('tmp/test_gdal_translate_26.tif')
     if ds.GetRasterBand(1).GetMinimum() != 10:
-        gdaltest.post_reason('failure')
         print(ds.GetRasterBand(1).GetMinimum())
         return 'fail'
     if ds.GetRasterBand(1).GetNoDataValue() != -999:
-        gdaltest.post_reason('failure')
         print(ds.GetRasterBand(1).GetNoDataValue())
         return 'fail'
 
@@ -764,7 +762,6 @@ def test_gdal_translate_27():
 
     ds = gdal.Open('tmp/test_gdal_translate_27.tif')
     if ds.GetRasterBand(1).GetMetadataItem('STATISTICS_MINIMUM') is None:
-        gdaltest.post_reason('failure')
         return 'fail'
     ds = None
 
@@ -773,7 +770,6 @@ def test_gdal_translate_27():
 
     ds = gdal.Open('tmp/test_gdal_translate_27.tif')
     if ds.GetRasterBand(1).GetMetadataItem('STATISTICS_MINIMUM') is None:
-        gdaltest.post_reason('failure')
         return 'fail'
     ds = None
 
@@ -782,7 +778,6 @@ def test_gdal_translate_27():
 
     ds = gdal.Open('tmp/test_gdal_translate_27.tif')
     if ds.GetRasterBand(1).GetMetadataItem('STATISTICS_MINIMUM') is not None:
-        gdaltest.post_reason('failure')
         return 'fail'
     ds = None
 
@@ -800,7 +795,6 @@ def test_gdal_translate_28():
 
     ds = gdal.Open('tmp/test_gdal_translate_28.tif')
     if ds.GetRasterBand(1).DataType != gdal.GDT_Float64:
-        gdaltest.post_reason('failure')
         return 'fail'
     ds = None
 
@@ -922,7 +916,6 @@ def test_gdal_translate_32():
        abs(float(md['LINE_SCALE']) - 47502) > 1e-5 or \
        abs(float(md['SAMP_OFF']) - 19676.6923076923) > 1e-5 or \
        abs(float(md['SAMP_SCALE']) - 19678.1538461538) > 1e-5:
-        gdaltest.post_reason('fail')
         print(md)
         return 'fail'
 
@@ -933,7 +926,6 @@ def test_gdal_translate_32():
        abs(float(md['LINE_SCALE']) - 15834) > 1e-5 or \
        abs(float(md['SAMP_OFF']) - (13464 - -10)) > 1e-5 or \
        abs(float(md['SAMP_SCALE']) - 13464) > 1e-5:
-        gdaltest.post_reason('fail')
         print(md)
         return 'fail'
 
@@ -951,7 +943,6 @@ def test_gdal_translate_33():
 
     ds = gdal.Open('tmp/test_gdal_translate_33.tif')
     if ds.RasterYSize != 50:
-        gdaltest.post_reason('fail')
         print(ds.RasterYSize)
         return 'fail'
     ds = None
@@ -960,7 +951,6 @@ def test_gdal_translate_33():
 
     ds = gdal.Open('tmp/test_gdal_translate_33.tif')
     if ds.RasterXSize != 200:
-        gdaltest.post_reason('fail')
         print(ds.RasterYSize)
         return 'fail'
     ds = None
@@ -969,7 +959,6 @@ def test_gdal_translate_33():
 
     (_, err) = gdaltest.runexternal_out_and_err(test_cli_utilities.get_gdal_translate_path() + ' -outsize 0 0 ../gdrivers/data/small_world.tif tmp/test_gdal_translate_33.tif')
     if err.find('-outsize 0 0 invalid') < 0:
-        gdaltest.post_reason('fail')
         return 'fail'
 
     return 'success'
@@ -986,7 +975,6 @@ def test_gdal_translate_34():
 
     ds = gdal.Open('tmp/test_gdal_translate_34.vrt')
     if ds.GetRasterBand(1).GetMetadataItem('NBITS', 'IMAGE_STRUCTURE') != '1':
-        gdaltest.post_reason('fail')
         return 'fail'
     ds = None
 
@@ -1004,25 +992,21 @@ def test_gdal_translate_35():
 
     (_, err) = gdaltest.runexternal_out_and_err(test_cli_utilities.get_gdal_translate_path())
     if err.find('No source dataset specified') < 0:
-        gdaltest.post_reason('fail')
         print(err)
         return 'fail'
 
     (_, err) = gdaltest.runexternal_out_and_err(test_cli_utilities.get_gdal_translate_path() + ' ../gcore/data/byte.tif')
     if err.find('No target dataset specified') < 0:
-        gdaltest.post_reason('fail')
         print(err)
         return 'fail'
 
     (_, err) = gdaltest.runexternal_out_and_err(test_cli_utilities.get_gdal_translate_path() + ' /non_existing_path/non_existing.tif /vsimem/out.tif')
     if err.find('does not exist in the file system') < 0 and err.find('No such file or directory') < 0:
-        gdaltest.post_reason('fail')
         print(err)
         return 'fail'
 
     (_, err) = gdaltest.runexternal_out_and_err(test_cli_utilities.get_gdal_translate_path() + ' ../gcore/data/byte.tif /non_existing_path/non_existing.tif')
     if err.find('Attempt to create new tiff file') < 0:
-        gdaltest.post_reason('fail')
         print(err)
         return 'fail'
 
diff --git a/autotest/utilities/test_gdal_translate_lib.py b/autotest/utilities/test_gdal_translate_lib.py
index 3a429f8ece29..b8d6ef75ffc0 100755
--- a/autotest/utilities/test_gdal_translate_lib.py
+++ b/autotest/utilities/test_gdal_translate_lib.py
@@ -433,7 +433,6 @@ def test_gdal_translate_lib_102():
     ds = gdal.Translate('', gdal.Open('../gcore/data/byte.tif'), format='MEM', scaleParams=[[0, 255, 0, 65535]], outputType=gdal.GDT_UInt16)
     result = ds.GetRasterBand(1).ComputeRasterMinMax(False)
     if result != (19018.0, 65535.0):
-        gdaltest.post_reason('failure')
         print(result)
         return 'fail'
 
@@ -446,7 +445,6 @@ def test_gdal_translate_lib_102():
     stats = ds2.GetRasterBand(1).ComputeStatistics(False)
     for i in range(4):
         if abs(stats[i] - expected_stats[i]) > 1e-3:
-            gdaltest.post_reason('failure')
             print(stats)
             return 'fail'
 
@@ -548,45 +546,35 @@ def test_gdal_translate_lib_colorinterp():
     # Less bands specified than available
     ds = gdal.Translate('', src_ds, options='-f MEM -colorinterp blue,gray')
     if ds.GetRasterBand(1).GetColorInterpretation() != gdal.GCI_BlueBand:
-        gdaltest.post_reason('fail')
         return 'fail'
     if ds.GetRasterBand(2).GetColorInterpretation() != gdal.GCI_GrayIndex:
-        gdaltest.post_reason('fail')
         return 'fail'
     if ds.GetRasterBand(3).GetColorInterpretation() != gdal.GCI_BlueBand:
-        gdaltest.post_reason('fail')
         return 'fail'
 
     # More bands specified than available and a unknown color interpretation
     with gdaltest.error_handler():
         ds = gdal.Translate('', src_ds, options='-f MEM -colorinterp alpha,red,undefined,foo')
     if ds.GetRasterBand(1).GetColorInterpretation() != gdal.GCI_AlphaBand:
-        gdaltest.post_reason('fail')
         return 'fail'
     if ds.GetRasterBand(2).GetColorInterpretation() != gdal.GCI_RedBand:
-        gdaltest.post_reason('fail')
         return 'fail'
     if ds.GetRasterBand(3).GetColorInterpretation() != gdal.GCI_Undefined:
-        gdaltest.post_reason('fail')
         return 'fail'
 
     # Test colorinterp_
     ds = gdal.Translate('', src_ds, options='-f MEM -colorinterp_2 alpha')
     if ds.GetRasterBand(1).GetColorInterpretation() != gdal.GCI_RedBand:
-        gdaltest.post_reason('fail')
         return 'fail'
     if ds.GetRasterBand(2).GetColorInterpretation() != gdal.GCI_AlphaBand:
-        gdaltest.post_reason('fail')
         return 'fail'
     if ds.GetRasterBand(3).GetColorInterpretation() != gdal.GCI_BlueBand:
-        gdaltest.post_reason('fail')
         return 'fail'
 
     # Test invalid colorinterp_
     try:
         with gdaltest.error_handler():
             gdal.Translate('', src_ds, options='-f MEM -colorinterp_0 alpha')
-        gdaltest.post_reason('fail')
         return 'fail'
     except:
         pass
diff --git a/autotest/utilities/test_gdaladdo.py b/autotest/utilities/test_gdaladdo.py
index 4e9ac9e3a081..a8695456c1d4 100755
--- a/autotest/utilities/test_gdaladdo.py
+++ b/autotest/utilities/test_gdaladdo.py
@@ -172,7 +172,6 @@ def test_gdaladdo_5():
     ds = None
 
     if cnt != 0:
-        gdaltest.post_reason('fail')
         print(cnt)
         return 'fail'
 
@@ -184,7 +183,6 @@ def test_gdaladdo_5():
     ds = None
 
     if cnt != 5:
-        gdaltest.post_reason('fail')
         print(cnt)
         return 'fail'
 
@@ -198,7 +196,6 @@ def test_gdaladdo_5():
     ds = None
 
     if cnt != 1:
-        gdaltest.post_reason('fail')
         print(cnt)
         return 'fail'
 
diff --git a/autotest/utilities/test_gdalbuildvrt.py b/autotest/utilities/test_gdalbuildvrt.py
index 86f70f691697..194c1691c4d4 100755
--- a/autotest/utilities/test_gdalbuildvrt.py
+++ b/autotest/utilities/test_gdalbuildvrt.py
@@ -503,7 +503,6 @@ def test_gdalbuildvrt_14():
     ds_ref = None
 
     if cs != cs_ref:
-        gdaltest.post_reason('fail')
         print(cs)
         print(cs_ref)
         return 'fail'
@@ -525,7 +524,6 @@ def test_gdalbuildvrt_15():
     ds = None
 
     if cs != 4672:
-        gdaltest.post_reason('fail')
         print(cs)
         return 'fail'
 
@@ -543,14 +541,12 @@ def test_gdalbuildvrt_16():
 
     if not gdaltest.is_travis_branch('mingw'):
         if err.find('ERROR ret code = 1') < 0:
-            gdaltest.post_reason('fail')
             print(out)
             print(err)
             return 'fail'
     else:
         # We don't get the error code on Travis mingw
         if err.find('ERROR') < 0:
-            gdaltest.post_reason('fail')
             print(out)
             print(err)
             return 'fail'
diff --git a/autotest/utilities/test_gdaldem.py b/autotest/utilities/test_gdaldem.py
index d0d5bd74c4fa..79ac5d137375 100755
--- a/autotest/utilities/test_gdaldem.py
+++ b/autotest/utilities/test_gdaldem.py
@@ -677,7 +677,6 @@ def test_gdaldem_color_relief_nodata_nan():
     import struct
     val = struct.unpack('B' * 4, val)
     if val != (0, 0, 0, 1):
-        gdaltest.post_reason('fail')
         print(val)
         return 'fail'
 
@@ -724,7 +723,6 @@ def test_gdaldem_color_relief_repeated_entry():
     import struct
     val = struct.unpack('B' * 6, val)
     if val != (1, 1, 5, 10, 10, 25):
-        gdaltest.post_reason('fail')
         print(val)
         return 'fail'
 
@@ -736,7 +734,6 @@ def test_gdaldem_color_relief_repeated_entry():
 
     val = struct.unpack('B' * 6, val)
     if val != (1, 1, 5, 10, 10, 25):
-        gdaltest.post_reason('fail')
         print(val)
         return 'fail'
 
diff --git a/autotest/utilities/test_gdalinfo.py b/autotest/utilities/test_gdalinfo.py
index 72b5d6e20cbc..beff3af98e13 100755
--- a/autotest/utilities/test_gdalinfo.py
+++ b/autotest/utilities/test_gdalinfo.py
@@ -370,13 +370,11 @@ def test_gdalinfo_18():
 
     (_, err) = gdaltest.runexternal_out_and_err(test_cli_utilities.get_gdalinfo_path() + ' --optfile', check_memleak=False)
     if err.find('--optfile option given without filename') < 0:
-        gdaltest.post_reason('fail')
         print(err)
         return 'fail'
 
     (_, err) = gdaltest.runexternal_out_and_err(test_cli_utilities.get_gdalinfo_path() + ' --optfile /foo/bar', check_memleak=False)
     if err.find('Unable to open optfile') < 0:
-        gdaltest.post_reason('fail')
         print(err)
         return 'fail'
 
@@ -427,13 +425,11 @@ def test_gdalinfo_21():
 
     (_, err) = gdaltest.runexternal_out_and_err(test_cli_utilities.get_gdalinfo_path() + ' --format', check_memleak=False)
     if err.find('--format option given without a format code') < 0:
-        gdaltest.post_reason('fail')
         print(err)
         return 'fail'
 
     (_, err) = gdaltest.runexternal_out_and_err(test_cli_utilities.get_gdalinfo_path() + ' --format foo_bar', check_memleak=False)
     if err.find('--format option given with format') < 0:
-        gdaltest.post_reason('fail')
         print(err)
         return 'fail'
 
diff --git a/autotest/utilities/test_gdalinfo_lib.py b/autotest/utilities/test_gdalinfo_lib.py
index 6d4ca74ee58d..a63d8a01d575 100755
--- a/autotest/utilities/test_gdalinfo_lib.py
+++ b/autotest/utilities/test_gdalinfo_lib.py
@@ -119,17 +119,13 @@ def test_gdalinfo_lib_5():
                     showGCPs=False, showMetadata=False, showRAT=False,
                     showColorTable=False, listMDD=True, showFileList=False)
     if 'files' in ret:
-        gdaltest.post_reason('fail')
         return 'fail'
     band = ret['bands'][0]
     if 'computedMin' not in band:
-        gdaltest.post_reason('fail')
         return 'fail'
     if 'histogram' not in band:
-        gdaltest.post_reason('fail')
         return 'fail'
     if 'checksum' not in band:
-        gdaltest.post_reason('fail')
         return 'fail'
 
     ds = None
diff --git a/autotest/utilities/test_gdalsrsinfo.py b/autotest/utilities/test_gdalsrsinfo.py
index 1c879d9df8d9..632a6c14d542 100755
--- a/autotest/utilities/test_gdalsrsinfo.py
+++ b/autotest/utilities/test_gdalsrsinfo.py
@@ -393,7 +393,6 @@ def test_gdalsrsinfo_17():
                                ' -e "LOCAL_CS[foo]"')
 
     if ret.find('EPSG:-1') < 0:
-        gdaltest.post_reason('fail')
         print(ret)
         return 'fail'
 
@@ -402,7 +401,6 @@ def test_gdalsrsinfo_17():
                                ' -e ../osr/data/lcc_esri.prj')
 
     if ret.find('EPSG:32119') < 0:
-        gdaltest.post_reason('fail')
         print(ret)
         return 'fail'
 
@@ -410,7 +408,6 @@ def test_gdalsrsinfo_17():
     ret = gdaltest.runexternal(test_cli_utilities.get_gdalsrsinfo_path() +
                                """ -e "GEOGCS[\"myLKS94\",DATUM[\"Lithuania_1994_ETRS89\",SPHEROID[\"GRS_1980\",6378137,298.257222101],TOWGS84[0,0,0,0,0,0,0]],PRIMEM[\"Greenwich\",0],UNIT[\"degree\",0.0174532925199433]]" """)
     if ret.find('EPSG:4126') < 0 or ret.find('EPSG:4669') < 0:
-        gdaltest.post_reason('fail')
         print(ret)
         return 'fail'
 
diff --git a/autotest/utilities/test_gdaltindex.py b/autotest/utilities/test_gdaltindex.py
index 51d6573f46f6..59507e28e93b 100755
--- a/autotest/utilities/test_gdaltindex.py
+++ b/autotest/utilities/test_gdaltindex.py
@@ -97,14 +97,12 @@ def test_gdaltindex_1():
 
     ds = ogr.Open('tmp/tileindex.shp')
     if ds.GetLayer(0).GetFeatureCount() != 4:
-        gdaltest.post_reason('fail')
         print(ret_stdout)
         print(ret_stderr)
         print(ds.GetLayer(0).GetFeatureCount())
         return 'fail'
     tileindex_wkt = ds.GetLayer(0).GetSpatialRef().ExportToWkt()
     if tileindex_wkt.find('WGS_1984') == -1:
-        gdaltest.post_reason('fail')
         print(ret_stdout)
         print(ret_stderr)
         print(tileindex_wkt)
@@ -242,17 +240,14 @@ def test_gdaltindex_5():
         feat = lyr.GetNextFeature()
         if src_srs_format == '-src_srs_format PROJ':
             if feat.GetField('src_srs').find('+proj=longlat +ellps=WGS72') != 0:
-                gdaltest.post_reason('fail')
                 feat.DumpReadable()
                 return 'fail'
         elif src_srs_format == '-src_srs_format WKT':
             if feat.GetField('src_srs').find('GEOGCS["WGS 72"') != 0:
-                gdaltest.post_reason('fail')
                 feat.DumpReadable()
                 return 'fail'
         else:
             if feat.GetField('src_srs') != 'EPSG:4322':
-                gdaltest.post_reason('fail')
                 feat.DumpReadable()
                 return 'fail'
         ds = None
diff --git a/autotest/utilities/test_gdalwarp.py b/autotest/utilities/test_gdalwarp.py
index 978bba0e385a..072820acd735 100755
--- a/autotest/utilities/test_gdalwarp.py
+++ b/autotest/utilities/test_gdalwarp.py
@@ -1125,10 +1125,8 @@ def test_gdalwarp_38():
 
     ds = gdal.Open('tmp/testgdalwarp38.tif')
     if ds.GetRasterBand(1).Checksum() != 65531:
-        gdaltest.post_reason('failure')
         return 'fail'
     if ds.GetRasterBand(1).GetNoDataValue() != -999:
-        gdaltest.post_reason('failure')
         return 'fail'
     ds = None
 
@@ -1146,7 +1144,6 @@ def test_gdalwarp_39():
 
     ds = gdal.Open('tmp/test_gdalwarp_39.tif')
     if ds.GetRasterBand(1).DataType != gdal.GDT_Float64:
-        gdaltest.post_reason('failure')
         return 'fail'
     ds = None
 
@@ -1175,7 +1172,6 @@ def test_gdalwarp_40():
 
     ds = gdal.Open('tmp/test_gdalwarp_40.tif')
     if ds.GetRasterBand(1).Checksum() != cs_main:
-        gdaltest.post_reason('failure')
         return 'fail'
     ds = None
 
@@ -1184,7 +1180,6 @@ def test_gdalwarp_40():
 
     ds = gdal.Open('tmp/test_gdalwarp_40.tif')
     if ds.GetRasterBand(1).Checksum() != cs_main:
-        gdaltest.post_reason('failure')
         return 'fail'
     ds = None
 
@@ -1198,7 +1193,6 @@ def test_gdalwarp_40():
 
     ds = gdal.Open('tmp/test_gdalwarp_40.tif')
     if ds.GetRasterBand(1).Checksum() != expected_cs:
-        gdaltest.post_reason('failure')
         return 'fail'
     ds = None
 
@@ -1212,7 +1206,6 @@ def test_gdalwarp_40():
 
     ds = gdal.Open('tmp/test_gdalwarp_40.tif')
     if ds.GetRasterBand(1).Checksum() != expected_cs:
-        gdaltest.post_reason('failure')
         return 'fail'
     ds = None
 
@@ -1221,7 +1214,6 @@ def test_gdalwarp_40():
 
     ds = gdal.Open('tmp/test_gdalwarp_40.tif')
     if ds.GetRasterBand(1).Checksum() != cs_ov0:
-        gdaltest.post_reason('failure')
         return 'fail'
     ds = None
 
@@ -1230,7 +1222,6 @@ def test_gdalwarp_40():
 
     ds = gdal.Open('tmp/test_gdalwarp_40.vrt')
     if ds.GetRasterBand(1).Checksum() != cs_ov0:
-        gdaltest.post_reason('failure')
         return 'fail'
     ds = None
 
@@ -1244,7 +1235,6 @@ def test_gdalwarp_40():
 
     ds = gdal.Open('tmp/test_gdalwarp_40.tif')
     if ds.GetRasterBand(1).Checksum() != expected_cs:
-        gdaltest.post_reason('failure')
         return 'fail'
     ds = None
 
@@ -1258,7 +1248,6 @@ def test_gdalwarp_40():
 
     ds = gdal.Open('tmp/test_gdalwarp_40.tif')
     if ds.GetRasterBand(1).Checksum() != expected_cs:
-        gdaltest.post_reason('failure')
         return 'fail'
     ds = None
 
@@ -1267,7 +1256,6 @@ def test_gdalwarp_40():
 
     ds = gdal.Open('tmp/test_gdalwarp_40.tif')
     if ds.GetRasterBand(1).Checksum() != cs_ov1:
-        gdaltest.post_reason('failure')
         return 'fail'
     ds = None
 
@@ -1281,7 +1269,6 @@ def test_gdalwarp_40():
 
     ds = gdal.Open('tmp/test_gdalwarp_40.tif')
     if ds.GetRasterBand(1).Checksum() != expected_cs:
-        gdaltest.post_reason('failure')
         return 'fail'
     ds = None
 
@@ -1295,7 +1282,6 @@ def test_gdalwarp_40():
 
     ds = gdal.Open('tmp/test_gdalwarp_40.tif')
     if ds.GetRasterBand(1).Checksum() != expected_cs:
-        gdaltest.post_reason('failure')
         return 'fail'
     ds = None
 
@@ -1336,7 +1322,6 @@ def test_gdalwarp_41():
 
     ds = gdal.Open('tmp/test_gdalwarp_41.tif')
     if ds.GetRasterBand(1).Checksum() != 25945:
-        gdaltest.post_reason('failure')
         print(ds.GetRasterBand(1).Checksum())
         return 'fail'
     ds = None
@@ -1346,7 +1331,6 @@ def test_gdalwarp_41():
 
     ds = gdal.Open('tmp/test_gdalwarp_41.tif')
     if ds.GetRasterBand(1).Checksum() != 65068:
-        gdaltest.post_reason('failure')
         print(ds.GetRasterBand(1).Checksum())
         return 'fail'
     ds = None
@@ -1373,7 +1357,6 @@ def test_gdalwarp_42():
     got_cs = [ds.GetRasterBand(i + 1).Checksum() for i in range(4)]
     expected_cs = [25382, 27573, 35297, 59540]
     if got_cs != expected_cs:
-        gdaltest.post_reason('failure')
         print(got_cs)
         return 'fail'
     ds = None
@@ -1385,7 +1368,6 @@ def test_gdalwarp_42():
     got_cs = [ds.GetRasterBand(i + 1).Checksum() for i in range(4)]
     expected_cs = [25382, 27573, 35297, 59540]
     if got_cs != expected_cs:
-        gdaltest.post_reason('failure')
         print(got_cs)
         return 'fail'
     ds = None
@@ -1397,7 +1379,6 @@ def test_gdalwarp_42():
     got_cs = [ds.GetRasterBand(i + 1).Checksum() for i in range(4)]
     expected_cs = [30111, 32302, 40026, 59540]
     if got_cs != expected_cs:
-        gdaltest.post_reason('failure')
         print(got_cs)
         return 'fail'
     ds = None
@@ -1410,7 +1391,6 @@ def test_gdalwarp_42():
     got_cs = [ds.GetRasterBand(i + 1).Checksum() for i in range(4)]
     expected_cs = [25382, 27573, 35297, 59540]
     if got_cs != expected_cs:
-        gdaltest.post_reason('failure')
         print(got_cs)
         return 'fail'
     ds = None
@@ -1433,15 +1413,12 @@ def test_gdalwarp_43():
 
     ds = gdal.Open('tmp/test_gdalwarp_43.tif')
     if ds.GetMetadataItem('NODATA_VALUES') is not None:
-        gdaltest.post_reason('failure')
         return 'fail'
     if ds.GetMetadataItem('FOO') != 'BAR':
-        gdaltest.post_reason('failure')
         return 'fail'
     got_cs = [ds.GetRasterBand(i + 1).Checksum() for i in range(4)]
     expected_cs = [30106, 32285, 40022, 64261]
     if got_cs != expected_cs:
-        gdaltest.post_reason('failure')
         print(got_cs)
         return 'fail'
 
@@ -1481,7 +1458,6 @@ def test_gdalwarp_44():
     ds = None
 
     if cs3 != cs4:
-        gdaltest.post_reason('fail')
         return 'fail'
 
     return 'success'
@@ -1498,7 +1474,6 @@ def test_gdalwarp_45():
 
     ds = gdal.Open('tmp/test_gdalwarp_45.tif')
     if ds.GetRasterBand(1).Checksum() != 4672:
-        gdaltest.post_reason('fail')
         print(ds.GetRasterBand(1).Checksum())
         return 'fail'
 
@@ -1508,7 +1483,6 @@ def test_gdalwarp_45():
 
     ds = gdal.Open('tmp/test_gdalwarp_45.tif')
     if ds.GetRasterBand(1).Checksum() != 4672:
-        gdaltest.post_reason('fail')
         print(ds.GetRasterBand(1).Checksum())
         return 'fail'
 
diff --git a/autotest/utilities/test_gdalwarp_lib.py b/autotest/utilities/test_gdalwarp_lib.py
index 4c8602bd5386..77a285cdd1f0 100755
--- a/autotest/utilities/test_gdalwarp_lib.py
+++ b/autotest/utilities/test_gdalwarp_lib.py
@@ -342,7 +342,6 @@ def test_gdalwarp_lib_16():
 
     ds = gdal.Warp('/vsimem/test_gdalwarp_lib_16.vrt', 'tmp/testgdalwarp_gcp.tif', format='VRT')
     if ds is None:
-        gdaltest.post_reason('fail')
         return 'fail'
 
     if ds.GetRasterBand(1).Checksum() != 4672:
@@ -358,7 +357,6 @@ def test_gdalwarp_lib_16():
     with gdaltest.error_handler():
         ds = gdal.Warp('/i_dont/exist/test_gdalwarp_lib_16.vrt', 'tmp/testgdalwarp_gcp.tif', format='VRT')
     if ds is not None:
-        gdaltest.post_reason('fail')
         return 'fail'
 
     return 'success'
@@ -507,7 +505,6 @@ def test_gdalwarp_lib_45():
 
     ds = gdal.Warp('', ['../gcore/data/byte.tif'], format='MEM', outputBounds=[-117.641087629972, 33.8915301685897, -117.628190189534, 33.9024195619201], outputBoundsSRS='EPSG:4267')
     if ds.GetRasterBand(1).Checksum() != 4672:
-        gdaltest.post_reason('fail')
         print(ds.GetRasterBand(1).Checksum())
         return 'fail'
 
@@ -550,11 +547,9 @@ def test_gdalwarp_lib_46():
     got_gt = ds.GetGeoTransform()
     expected_gt = (2.15, 0.05, 0.0, 48.8, 0.0, -0.05)
     if max([abs(got_gt[i]-expected_gt[i]) for i in range(6)]) > 1e-8:
-        gdaltest.post_reason('fail')
         print(got_gt)
         return 'fail'
     if ds.RasterXSize != 13 or ds.RasterYSize != 13:
-        gdaltest.post_reason('fail')
         print(ds.RasterXSize, ds.RasterYSize)
         return 'fail'
 
@@ -566,11 +561,9 @@ def test_gdalwarp_lib_46():
     got_gt = ds.GetGeoTransform()
     expected_gt = (2.1, 0.05, 0.0, 48.85, 0.0, -0.05)
     if max([abs(got_gt[i]-expected_gt[i]) for i in range(6)]) > 1e-8:
-        gdaltest.post_reason('fail')
         print(got_gt)
         return 'fail'
     if ds.RasterXSize != 15 or ds.RasterYSize != 15:
-        gdaltest.post_reason('fail')
         print(ds.RasterXSize, ds.RasterYSize)
         return 'fail'
 
@@ -590,11 +583,9 @@ def test_gdalwarp_lib_46():
         got_gt = ds.GetGeoTransform()
         expected_gt = (2.15, 0.05, 0.0, 48.85, 0.0, -0.05)
         if max([abs(got_gt[i]-expected_gt[i]) for i in range(6)]) > 1e-8:
-            gdaltest.post_reason('fail')
             print(got_gt)
             return 'fail'
         if ds.RasterXSize != 14 or ds.RasterYSize != 14:
-            gdaltest.post_reason('fail')
             print(ds.RasterXSize, ds.RasterYSize)
             return 'fail'
 
@@ -1548,7 +1539,6 @@ def test_gdalwarp_lib_135():
                        srcSRS='+proj=utm +zone=31 +datum=WGS84 +units=m +geoidgrids=i_dont_exist.tif +vunits=m +no_defs',
                        dstSRS='EPSG:4979')
     if ds is not None:
-        gdaltest.post_reason('fail')
         return 'fail'
 
     # Missing grid in forward path with PROJ_LIB
@@ -1563,7 +1553,6 @@ def test_gdalwarp_lib_135():
     else:
         del os.environ['PROJ_LIB']
     if ds is not None:
-        gdaltest.post_reason('fail')
         return 'fail'
 
     # Missing grid in forward path
@@ -1572,7 +1561,6 @@ def test_gdalwarp_lib_135():
                        srcSRS='+proj=utm +zone=31 +datum=WGS84 +units=m +geoidgrids=~/i_dont_exist.tif +vunits=m +no_defs',
                        dstSRS='EPSG:4979')
     if ds is not None:
-        gdaltest.post_reason('fail')
         return 'fail'
 
     # Missing grid in forward path
@@ -1581,7 +1569,6 @@ def test_gdalwarp_lib_135():
                        srcSRS='+proj=utm +zone=31 +datum=WGS84 +units=m +geoidgrids=/i_dont/exist.tif +vunits=m +no_defs',
                        dstSRS='EPSG:4979')
     if ds is not None:
-        gdaltest.post_reason('fail')
         return 'fail'
 
     # Ungeoref grid in forward path
@@ -1590,7 +1577,6 @@ def test_gdalwarp_lib_135():
                        srcSRS='+proj=utm +zone=31 +datum=WGS84 +units=m +geoidgrids=/vsimem/ungeoref_grid.tif +vunits=m +no_defs',
                        dstSRS='EPSG:4979')
     if ds is not None:
-        gdaltest.post_reason('fail')
         return 'fail'
 
     # Missing grid in inverse path
@@ -1599,7 +1585,6 @@ def test_gdalwarp_lib_135():
                        srcSRS='+proj=utm +zone=31 +datum=WGS84 +units=m +no_defs',
                        dstSRS='+proj=longlat +datum=WGS84 +geoidgrids=i_dont_exist.tif +vunits=m +no_defs')
     if ds is not None:
-        gdaltest.post_reason('fail')
         return 'fail'
 
     # Ungeoref grid in inverse path
@@ -1608,7 +1593,6 @@ def test_gdalwarp_lib_135():
                        srcSRS='+proj=utm +zone=31 +datum=WGS84 +units=m +no_defs',
                        dstSRS='+proj=longlat +datum=WGS84 +geoidgrids=/vsimem/ungeoref_grid.tif +vunits=m +no_defs')
     if ds is not None:
-        gdaltest.post_reason('fail')
         return 'fail'
 
     # Missing grid in forward path, but this is OK
@@ -1783,13 +1767,11 @@ def test_gdalwarp_lib_136():
     with gdaltest.error_handler():
         ds = gdal.Warp('', '../gcore/data/utmsmall.tif', format='MEM', warpOptions=['CUTLINE=invalid'])
     if ds is not None:
-        gdaltest.post_reason('fail')
         return 'fail'
 
     with gdaltest.error_handler():
         ds = gdal.Warp('', '../gcore/data/utmsmall.tif', format='VRT', warpOptions=['CUTLINE=invalid'])
     if ds is not None:
-        gdaltest.post_reason('fail')
         return 'fail'
 
     return 'success'
@@ -1810,15 +1792,12 @@ def test_gdalwarp_lib_several_sources_with_different_srs_no_explicit_target_srs(
                                   dstSRS='EPSG:4326')
     out_ds = gdal.Warp('', [src_ds_4326_right, src_ds_32611_left], format='MEM')
     if out_ds is None:
-        gdaltest.post_reason('fail')
         return 'fail'
     if out_ds.RasterXSize != 23:
-        gdaltest.post_reason('fail')
         print(out_ds.RasterXSize)
         return 'fail'
     cs = out_ds.GetRasterBand(1).Checksum()
     if cs != 5048:
-        gdaltest.post_reason('fail')
         print(cs)
         return 'fail'
 
@@ -1837,7 +1816,6 @@ def test_gdalwarp_lib_touching_dateline():
     src_ds.SetProjection(sr.ExportToWkt())
     out_ds = gdal.Warp('', src_ds, dstSRS='EPSG:4326', format='MEM')
     if out_ds.RasterXSize != 319:
-        gdaltest.post_reason('fail')
         print(out_ds.RasterXSize)
         return 'fail'
 
@@ -1865,12 +1843,10 @@ def test_gdalwarp_lib_override_default_output_nodata():
                   format='netCDF', creationOptions=['FORMAT=' + frmt])
         ds = gdal.Open('tmp/out.nc')
         if ds.GetRasterBand(1).GetNoDataValue() != 255:
-            gdaltest.post_reason('fail')
             print(frmt)
             print(ds.GetRasterBand(1).GetNoDataValue())
             return 'fail'
         if ds.GetProjection() == '':
-            gdaltest.post_reason('fail')
             print(frmt)
             return 'fail'
         ds = None
@@ -1905,7 +1881,6 @@ def test_gdalwarp_lib_auto_skip_nosource():
                            '-of GTiff ' + options)
         cs = out_ds.GetRasterBand(1).Checksum()
         if cs != 41500:
-            gdaltest.post_reason('fail')
             print(options, cs)
             return 'fail'
 
@@ -1919,7 +1894,6 @@ def test_gdalwarp_lib_auto_skip_nosource():
                            '-of MEM ' + options)
         cs = out_ds.GetRasterBand(1).Checksum()
         if cs != 41500:
-            gdaltest.post_reason('fail')
             print(options, cs)
             return 'fail'
 
@@ -1934,7 +1908,6 @@ def test_gdalwarp_lib_auto_skip_nosource():
                            '-of GTiff ' + options)
         cs = out_ds.GetRasterBand(1).Checksum()
         if cs != 51132:
-            gdaltest.post_reason('fail')
             print(options, cs)
             return 'fail'
 
@@ -1949,7 +1922,6 @@ def test_gdalwarp_lib_auto_skip_nosource():
                            '-of MEM ' + options)
         cs = out_ds.GetRasterBand(1).Checksum()
         if cs != 51132:
-            gdaltest.post_reason('fail')
             print(options, cs)
             return 'fail'
 
@@ -1962,7 +1934,6 @@ def test_gdalwarp_lib_auto_skip_nosource():
                            '-of GTiff ' + options)
         cs = out_ds.GetRasterBand(1).Checksum()
         if cs != 41500:
-            gdaltest.post_reason('fail')
             print(options, cs)
             return 'fail'
 
@@ -1984,7 +1955,6 @@ def test_gdalwarp_lib_auto_skip_nosource():
                            '-of GTiff ' + options)
         cs = out_ds.GetRasterBand(1).Checksum()
         if cs != 41500:
-            gdaltest.post_reason('fail')
             print(options, cs)
             return 'fail'
 
diff --git a/autotest/utilities/test_gnmutils.py b/autotest/utilities/test_gnmutils.py
index 1c4cc05a7d72..bcfa27b33a4f 100755
--- a/autotest/utilities/test_gnmutils.py
+++ b/autotest/utilities/test_gnmutils.py
@@ -97,13 +97,10 @@ def test_gnmmanage_3():
     ret = gdaltest.runexternal(test_cli_utilities.get_gnmmanage_path() + ' info tmp/test_gnm')
 
     if ret.find('Network version: 1.0.') == -1:
-        gdaltest.post_reason('fail')
         return 'fail'
     if ret.find('Network name: test_gnm.') == -1:
-        gdaltest.post_reason('fail')
         return 'fail'
     if ret.find('Network description') == -1:
-        gdaltest.post_reason('fail')
         return 'fail'
 
     return 'success'
diff --git a/autotest/utilities/test_nearblack_lib.py b/autotest/utilities/test_nearblack_lib.py
index e455722bd02e..4ca7ae7e891f 100755
--- a/autotest/utilities/test_nearblack_lib.py
+++ b/autotest/utilities/test_nearblack_lib.py
@@ -192,7 +192,6 @@ def test_nearblack_lib_8():
     ds = gdal.GetDriverByName('MEM').CreateCopy('', src_ds)
     ret = gdal.Nearblack(ds, ds, maxNonBlack=0)
     if ret != 1:
-        gdaltest.post_reason('failure')
         return 'fail'
 
     if ds.GetRasterBand(1).Checksum() != 21106:
diff --git a/autotest/utilities/test_ogr2ogr.py b/autotest/utilities/test_ogr2ogr.py
index f1ffec3add1d..d66ddbebcb77 100755
--- a/autotest/utilities/test_ogr2ogr.py
+++ b/autotest/utilities/test_ogr2ogr.py
@@ -1629,7 +1629,6 @@ def test_ogr2ogr_44():
     f.close()
 
     if data.find('type="gml:MultiPolygonPropertyType"') == -1:
-        gdaltest.post_reason('failure')
         print(data)
         return 'fail'
 
@@ -1638,7 +1637,6 @@ def test_ogr2ogr_44():
     f.close()
 
     if data.find('<ogr:geometryProperty><gml:MultiPolygon><gml:polygonMember><gml:Polygon><gml:outerBoundaryIs><gml:LinearRing><gml:coordinates>0,0 0,1 1,1 0,0</gml:coordinates></gml:LinearRing></gml:outerBoundaryIs></gml:Polygon></gml:polygonMember></gml:MultiPolygon></ogr:geometryProperty>') == -1:
-        gdaltest.post_reason('failure')
         print(data)
         return 'fail'
 
@@ -1683,7 +1681,6 @@ def test_ogr2ogr_45():
     f.close()
 
     if data.find('type="gml:MultiLineStringPropertyType"') == -1:
-        gdaltest.post_reason('failure')
         print(data)
         return 'fail'
 
@@ -1692,7 +1689,6 @@ def test_ogr2ogr_45():
     f.close()
 
     if data.find('<ogr:geometryProperty><gml:MultiLineString><gml:lineStringMember><gml:LineString><gml:coordinates>0,0 0,1 1,1 0,0</gml:coordinates></gml:LineString></gml:lineStringMember></gml:MultiLineString></ogr:geometryProperty>') == -1:
-        gdaltest.post_reason('failure')
         print(data)
         return 'fail'
 
@@ -1738,13 +1734,11 @@ def test_ogr2ogr_46():
         f.close()
 
         if data.find('2,49') == -1 and data.find('2.0,49.0') == -1 and data.find('222638.') == -1:
-            gdaltest.post_reason('failure')
             print(option)
             print(data)
             return 'fail'
 
         if data.find('3,50') == -1 and data.find('3.0,50.0') == -1 and data.find('333958.') == -1:
-            gdaltest.post_reason('failure')
             print(option)
             print(data)
             return 'fail'
@@ -1804,7 +1798,6 @@ def test_ogr2ogr_47():
     f.close()
 
     if data.find('>-3.0,40.65') == -1 and data.find('<3.0,40.65') == -1:
-        gdaltest.post_reason('failure')
         print(data)
         return 'fail'
 
@@ -1945,13 +1938,11 @@ def test_ogr2ogr_50():
     lyr = ds.GetLayer(0)
     feat = lyr.GetNextFeature()
     if feat.GetField('field1') != 'foo' or not feat.IsFieldNull('field2'):
-        gdaltest.post_reason('fail')
         feat.DumpReadable()
         return 'fail'
 
     feat = lyr.GetNextFeature()
     if feat.GetField('field1') != 'bar' or feat.GetField('field2') != 'baz':
-        gdaltest.post_reason('fail')
         feat.DumpReadable()
         return 'fail'
     ds = None
@@ -1985,7 +1976,6 @@ def test_ogr2ogr_51():
     expected_lines = ['"_WKTgeom1_EPSG_4326","_WKTgeom2_EPSG_32631","id","foo"', '"POINT (1 2)","POINT (3 4)","1","bar"']
     for i in range(2):
         if lines[i].strip() != expected_lines[i]:
-            gdaltest.post_reason('fail')
             print(lines)
             return 'fail'
 
@@ -1996,12 +1986,10 @@ def test_ogr2ogr_51():
     lyr = ds.GetLayer(0)
     sr = lyr.GetSpatialRef()
     if sr is None or sr.ExportToWkt().find('GEOGCS["WGS 84"') != 0:
-        gdaltest.post_reason('fail')
         print(sr.ExportToWkt())
         return 'fail'
     feat = lyr.GetNextFeature()
     if feat.GetGeometryRef().ExportToWkt() != 'POINT (1 2)':
-        gdaltest.post_reason('fail')
         return 'fail'
     ds = None
     ogr.GetDriverByName('ESRI Shapefile').DeleteDataSource('tmp/test_ogr2ogr_51_dst.shp')
@@ -2018,7 +2006,6 @@ def test_ogr2ogr_51():
                       '"POINT (1 2)","POINT (3 4)","1","bar"']
     for i in range(3):
         if lines[i].strip() != expected_lines[i]:
-            gdaltest.post_reason('fail')
             print(lines)
             return 'fail'
 
@@ -2034,7 +2021,6 @@ def test_ogr2ogr_51():
     expected_lines = ['"_WKTgeom2_EPSG_32631","_WKTgeom1_EPSG_4326","foo","id"', '"POINT (3 4)","POINT (1 2)","bar","1"']
     for i in range(2):
         if lines[i].strip() != expected_lines[i]:
-            gdaltest.post_reason('fail')
             print(lines)
             return 'fail'
 
@@ -2050,7 +2036,6 @@ def test_ogr2ogr_51():
                       '"POINT (3 4)","POINT (1 2)","bar","1"']
     for i in range(2):
         if lines[i].strip() != expected_lines[i]:
-            gdaltest.post_reason('fail')
             print(lines)
             return 'fail'
 
@@ -2079,7 +2064,6 @@ def test_ogr2ogr_52():
     f.close()
 
     if content.find('LINESTRING (0 0,') < 0:
-        gdaltest.post_reason('fail')
         print(content)
         return 'fail'
 
@@ -2090,7 +2074,6 @@ def test_ogr2ogr_52():
     f.close()
 
     if content.find('COMPOUNDCURVE ((0 0,') < 0:
-        gdaltest.post_reason('fail')
         print(content)
         return 'fail'
 
@@ -2129,7 +2112,6 @@ def test_ogr2ogr_53():
        content.find('<SimpleData name="i64">123456789012</SimpleData>') < 0 or \
        content.find('<SimpleField name="b" type="string"></SimpleField>') < 0 or \
        content.find('<SimpleData name="b">1</SimpleData>') < 0:
-        gdaltest.post_reason('fail')
         print(content)
         return 'fail'
 
@@ -2143,7 +2125,6 @@ def test_ogr2ogr_53():
     f.close()
 
     if content.find('"123456789012.0"') < 0:
-        gdaltest.post_reason('fail')
         print(content)
         return 'fail'
 
@@ -2158,7 +2139,6 @@ def test_ogr2ogr_53():
 
     if content.find('<SimpleField name="i64" type="string"></SimpleField>') < 0 or \
        content.find('<SimpleData name="i64">123456789012</SimpleData>') < 0:
-        gdaltest.post_reason('fail')
         print(content)
         return 'fail'
 
@@ -2205,7 +2185,6 @@ def test_ogr2ogr_54():
     if content.find('<xs:element name="WKT" type="gml:GeometryPropertyType" nillable="true" minOccurs="1" maxOccurs="1"/>') < 0 or \
        content.find('<xs:element name="fld1" nillable="true" minOccurs="1" maxOccurs="1">') < 0 or \
        content.find('<xs:element name="fld2" nillable="true" minOccurs="0" maxOccurs="1">') < 0:
-        gdaltest.post_reason('fail')
         print(content)
         return 'fail'
 
@@ -2222,7 +2201,6 @@ def test_ogr2ogr_54():
     if content.find('<xs:element name="WKT" type="gml:GeometryPropertyType" nillable="true" minOccurs="0" maxOccurs="1"/>') < 0 or \
        content.find('<xs:element name="fld1" nillable="true" minOccurs="0" maxOccurs="1">') < 0 or \
        content.find('<xs:element name="fld2" nillable="true" minOccurs="0" maxOccurs="1">') < 0:
-        gdaltest.post_reason('fail')
         print(content)
         return 'fail'
 
@@ -2272,7 +2250,6 @@ def test_ogr2ogr_55():
     f.close()
 
     if content.find('<ogr:fld2>2</ogr:fld2>') < 0:
-        gdaltest.post_reason('fail')
         print(content)
         return 'fail'
 
@@ -2287,7 +2264,6 @@ def test_ogr2ogr_55():
     f.close()
 
     if content.find('<ogr:fld2>') >= 0:
-        gdaltest.post_reason('fail')
         print(content)
         return 'fail'
 
@@ -2325,7 +2301,6 @@ def test_ogr2ogr_56():
 
     if content.find("""ALTER TABLE "public"."test_ogr2ogr_56" ADD COLUMN "myid"" """) >= 0 or \
        content.find("""INSERT INTO "public"."test_ogr2ogr_56" ("wkb_geometry" , "myid" , "str", "wkt") VALUES ('010100000000000000000000000000000000000000', 10, 'aaa', 'POINT(0 0)');""") < 0:
-        gdaltest.post_reason('fail')
         print(content)
         return 'fail'
 
@@ -2374,7 +2349,6 @@ def test_ogr2ogr_57():
 
     if content.find("""CREATE TABLE "public"."test_ogr2ogr_57" (    "id" SERIAL,    CONSTRAINT "test_ogr2ogr_57_pk" PRIMARY KEY ("id") )""") < 0 or \
        content.find("""INSERT INTO "public"."test_ogr2ogr_57" ("wkt" , "id" , "str") VALUES ('010100000000000000000000000000000000000000', 10, 'a')""") < 0:
-        gdaltest.post_reason('fail')
         print(content)
         return 'fail'
 
@@ -2389,7 +2363,6 @@ def test_ogr2ogr_57():
 
     if content.find("""CREATE TABLE "public"."test_ogr2ogr_57" (    "ogc_fid" SERIAL,    CONSTRAINT "test_ogr2ogr_57_pk" PRIMARY KEY ("ogc_fid") )""") < 0 or \
        content.find("""INSERT INTO "public"."test_ogr2ogr_57" ("wkt" , "str") VALUES ('010100000000000000000000000000000000000000', 'a')""") < 0:
-        gdaltest.post_reason('fail')
         print(content)
         return 'fail'
 
@@ -2416,7 +2389,6 @@ def test_ogr2ogr_58():
     ds = ogr.Open('tmp/test_ogr2ogr_58.sqlite')
     lyr = ds.GetLayer(0)
     if lyr.GetFeatureCount() != 10:
-        gdaltest.post_reason('fail')
         return 'fail'
     ds = None
 
@@ -2446,20 +2418,16 @@ def test_ogr2ogr_59():
 
     ds = ogr.Open('tmp/test_ogr2ogr_59_dest.gpkg')
     if ds.GetMetadata() != {'FOO': 'BAR', 'BAZ': 'BAW'}:
-        gdaltest.post_reason('fail')
         print(ds.GetMetadata())
         return 'fail'
     if ds.GetMetadata('another_domain') != {'BAR': 'BAZ'}:
-        gdaltest.post_reason('fail')
         print(ds.GetMetadata())
         return 'fail'
     lyr = ds.GetLayer(0)
     if lyr.GetMetadata() != {'lyr_FOO': 'lyr_BAR'}:
-        gdaltest.post_reason('fail')
         print(lyr.GetMetadata())
         return 'fail'
     if lyr.GetMetadata('lyr_another_domain') != {'lyr_BAR': 'lyr_BAZ'}:
-        gdaltest.post_reason('fail')
         print(lyr.GetMetadata())
         return 'fail'
     ds = None
@@ -2469,12 +2437,10 @@ def test_ogr2ogr_59():
     gdaltest.runexternal(test_cli_utilities.get_ogr2ogr_path() + ' -f GPKG tmp/test_ogr2ogr_59_dest.gpkg tmp/test_ogr2ogr_59_src.gpkg -nomd')
     ds = ogr.Open('tmp/test_ogr2ogr_59_dest.gpkg')
     if ds.GetMetadata() != {}:
-        gdaltest.post_reason('fail')
         print(ds.GetMetadata())
         return 'fail'
     lyr = ds.GetLayer(0)
     if lyr.GetMetadata() != {}:
-        gdaltest.post_reason('fail')
         print(lyr.GetMetadata())
         return 'fail'
     ds = None
@@ -2500,7 +2466,6 @@ def test_ogr2ogr_60():
     ds = ogr.Open('tmp/test_ogr2ogr_60.gdb')
     lyr = ds.GetLayer(0)
     if lyr.GetFeatureCount() != 10:
-        gdaltest.post_reason('fail')
         return 'fail'
     ds = None
 
@@ -2525,7 +2490,6 @@ def test_ogr2ogr_61():
 
     ds = ogr.Open('tmp/test_ogr2ogr_61.shp')
     if ds is None or ds.GetLayer(0).GetFeatureCount() != 1:
-        gdaltest.post_reason('fail')
         return 'fail'
     ds.Destroy()
 
@@ -2533,7 +2497,6 @@ def test_ogr2ogr_61():
 
     ds = ogr.Open('tmp/test_ogr2ogr_61_2.shp')
     if ds is None or ds.GetLayer(0).GetFeatureCount() != 1:
-        gdaltest.post_reason('fail')
         return 'fail'
     ds.Destroy()
 
@@ -2560,14 +2523,12 @@ def test_ogr2ogr_62():
     gdaltest.runexternal(test_cli_utilities.get_ogr2ogr_path() + """ -f GeoJSON tmp/test_ogr2ogr_62.json tmp/test_ogr2ogr_62_in.json""")
     fp = gdal.VSIFOpenL('tmp/test_ogr2ogr_62.json', 'rb')
     if fp is None:
-        gdaltest.post_reason('fail')
         return 'fail'
     data = gdal.VSIFReadL(1, 10000, fp).decode('ascii')
     gdal.VSIFCloseL(fp)
     os.unlink('tmp/test_ogr2ogr_62.json')
 
     if data.find('bar') < 0 or data.find('baz') < 0:
-        gdaltest.post_reason('fail')
         print(data)
         return 'fail'
 
@@ -2575,7 +2536,6 @@ def test_ogr2ogr_62():
     gdaltest.runexternal(test_cli_utilities.get_ogr2ogr_path() + """ -f GeoJSON tmp/test_ogr2ogr_62.json tmp/test_ogr2ogr_62_in.json -noNativeData""")
     fp = gdal.VSIFOpenL('tmp/test_ogr2ogr_62.json', 'rb')
     if fp is None:
-        gdaltest.post_reason('fail')
         return 'fail'
     data = gdal.VSIFReadL(1, 10000, fp).decode('ascii')
     gdal.VSIFCloseL(fp)
@@ -2583,7 +2543,6 @@ def test_ogr2ogr_62():
     os.unlink('tmp/test_ogr2ogr_62_in.json')
 
     if data.find('bar') >= 0 or data.find('baz') >= 0:
-        gdaltest.post_reason('fail')
         print(data)
         return 'fail'
 
@@ -2605,12 +2564,10 @@ def test_ogr2ogr_63():
 
     (ret, err) = gdaltest.runexternal_out_and_err(test_cli_utilities.get_ogr2ogr_path() + ' --formats')
     if ret.find('Supported Formats') < 0:
-        gdaltest.post_reason('fail')
         print(ret)
         print(err)
         return 'fail'
     if err.find('ERROR') >= 0:
-        gdaltest.post_reason('fail')
         print(ret)
         print(err)
         return 'fail'
@@ -2647,10 +2604,8 @@ def test_ogr2ogr_64():
 
     ds = ogr.Open('tmp/out_csv')
     if ds.GetLayerByName(first_layer).GetFeatureCount() != 1:
-        gdaltest.post_reason('fail')
         return 'fail'
     if ds.GetLayerByName(second_layer).GetFeatureCount() != 2:
-        gdaltest.post_reason('fail')
         return 'fail'
     ds = None
 
@@ -2670,7 +2625,6 @@ def test_ogr2ogr_65():
     gdaltest.runexternal(test_cli_utilities.get_ogr2ogr_path() + ' tmp/out.csv ../ogr/data/poly.shp')
     ds = gdal.OpenEx('tmp/out.csv')
     if ds.GetDriver().ShortName != 'CSV':
-        gdaltest.post_reason('fail')
         return 'fail'
     ds = None
     gdal.Unlink('tmp/out.csv')
@@ -2694,7 +2648,6 @@ def test_ogr2ogr_66():
 
     (ret, err) = gdaltest.runexternal_out_and_err(test_cli_utilities.get_ogr2ogr_path() + ' ../ogr/data/poly.shp ../ogr/data/poly.shp')
     if err.find("Source and destination datasets must be different in non-update mode") < 0:
-        gdaltest.post_reason('fail')
         print(ret)
         print(err)
         return 'fail'
diff --git a/autotest/utilities/test_ogr2ogr_lib.py b/autotest/utilities/test_ogr2ogr_lib.py
index 65d41994b42c..f4df6052ecf2 100755
--- a/autotest/utilities/test_ogr2ogr_lib.py
+++ b/autotest/utilities/test_ogr2ogr_lib.py
@@ -68,14 +68,12 @@ def test_ogr2ogr_lib_2():
     srcDS = gdal.OpenEx('../ogr/data/poly.shp')
     ds = gdal.VectorTranslate('', srcDS, format='Memory', SQLStatement='select * from poly', SQLDialect='OGRSQL')
     if ds is None or ds.GetLayer(0).GetFeatureCount() != 10:
-        gdaltest.post_reason('fail')
         return 'fail'
 
     # Test @filename syntax
     gdal.FileFromMemBuffer('/vsimem/sql.txt', '-- initial comment\nselect * from poly\n-- trailing comment')
     ds = gdal.VectorTranslate('', srcDS, format='Memory', SQLStatement='@/vsimem/sql.txt')
     if ds is None or ds.GetLayer(0).GetFeatureCount() != 10:
-        gdaltest.post_reason('fail')
         return 'fail'
     gdal.Unlink('/vsimem/sql.txt')
 
@@ -86,7 +84,6 @@ def test_ogr2ogr_lib_2():
         gdal.FileFromMemBuffer('/vsimem/sql.txt', '\xEF\xBB\xBFselect * from poly')
     ds = gdal.VectorTranslate('', srcDS, format='Memory', SQLStatement='@/vsimem/sql.txt')
     if ds is None or ds.GetLayer(0).GetFeatureCount() != 10:
-        gdaltest.post_reason('fail')
         return 'fail'
     gdal.Unlink('/vsimem/sql.txt')
 
@@ -101,14 +98,12 @@ def test_ogr2ogr_lib_3():
     srcDS = gdal.OpenEx('../ogr/data/poly.shp')
     ds = gdal.VectorTranslate('', srcDS, format='Memory', where='EAS_ID=171')
     if ds is None or ds.GetLayer(0).GetFeatureCount() != 1:
-        gdaltest.post_reason('fail')
         return 'fail'
 
     # Test @filename syntax
     gdal.FileFromMemBuffer('/vsimem/filter.txt', 'EAS_ID=171')
     ds = gdal.VectorTranslate('', srcDS, format='Memory', where='@/vsimem/filter.txt')
     if ds is None or ds.GetLayer(0).GetFeatureCount() != 1:
-        gdaltest.post_reason('fail')
         return 'fail'
     gdal.Unlink('/vsimem/filter.txt')
 
@@ -390,7 +385,6 @@ def test_ogr2ogr_lib_16():
         lyr = ds.GetLayer(0)
         f = lyr.GetNextFeature()
         if f.GetGeometryRef().ExportToIsoWkt() != wkt_after:
-            gdaltest.post_reason('failure')
             print(wkt_before)
             print(dim)
             print(wkt_after)
@@ -449,12 +443,10 @@ def test_ogr2ogr_lib_19():
     lyr = ds.GetLayer(0)
     f = lyr.GetNextFeature()
     if f['foo'] != 'bar' or f.IsFieldSet('bar'):
-        gdaltest.post_reason('fail')
         f.DumpReadable()
         return 'fail'
     f = lyr.GetNextFeature()
     if f['bar'] != 'foo' or f.IsFieldSet('foo'):
-        gdaltest.post_reason('fail')
         f.DumpReadable()
         return 'fail'
     ds = None
@@ -477,7 +469,6 @@ def test_ogr2ogr_lib_20():
     ds = gdal.VectorTranslate('/vsimem/out.gpkg', src_ds, format='GPKG')
     lyr = ds.GetLayer(0)
     if lyr.GetGeometryColumn() != 'foo':
-        gdaltest.post_reason('fail')
         print(lyr.GetGeometryColumn())
         return 'fail'
     ds = None
@@ -491,7 +482,6 @@ def test_ogr2ogr_lib_20():
     ds = gdal.VectorTranslate('/vsimem/out.gpkg', src_ds, format='GPKG', selectFields=['bar'])
     lyr = ds.GetLayer(0)
     if lyr.GetGeometryColumn() != 'bar':
-        gdaltest.post_reason('fail')
         print(lyr.GetGeometryColumn())
         return 'fail'
     ds = None
@@ -546,7 +536,6 @@ def test_ogr2ogr_clipsrc_no_dst_geom():
     lyr = ds.GetLayer(0)
     fc = lyr.GetFeatureCount()
     if fc != 1:
-        gdaltest.post_reason('fail')
         print(fc)
         return 'fail'
     ds = None
diff --git a/autotest/utilities/test_ogrinfo.py b/autotest/utilities/test_ogrinfo.py
index 8eb21a5e4738..e4dc178c39e3 100755
--- a/autotest/utilities/test_ogrinfo.py
+++ b/autotest/utilities/test_ogrinfo.py
@@ -80,22 +80,16 @@ def test_ogrinfo_3():
 
     ret = gdaltest.runexternal(test_cli_utilities.get_ogrinfo_path() + ' -al ../ogr/data/poly.shp')
     if ret.find('Layer name: poly') == -1:
-        gdaltest.post_reason('fail')
         return 'fail'
     if ret.find('Geometry: Polygon') == -1:
-        gdaltest.post_reason('fail')
         return 'fail'
     if ret.find('Feature Count: 10') == -1:
-        gdaltest.post_reason('fail')
         return 'fail'
     if ret.find('Extent: (478315') == -1:
-        gdaltest.post_reason('fail')
         return 'fail'
     if ret.find('PROJCS["OSGB') == -1:
-        gdaltest.post_reason('fail')
         return 'fail'
     if ret.find('AREA: Real (') == -1:
-        gdaltest.post_reason('fail')
         return 'fail'
 
     return 'success'
@@ -190,7 +184,6 @@ def test_ogrinfo_9():
 
     ret = gdaltest.runexternal(test_cli_utilities.get_ogrinfo_path() + ' ../ogr/data/poly.shp poly -where "EAS_ID=171"')
     if ret.find('Feature Count: 1') == -1:
-        gdaltest.post_reason('fail')
         print(ret)
         return 'fail'
 
@@ -311,13 +304,11 @@ def test_ogrinfo_17():
 
     (_, err) = gdaltest.runexternal_out_and_err(test_cli_utilities.get_ogrinfo_path() + ' --optfile', check_memleak=False)
     if err.find('--optfile option given without filename') < 0:
-        gdaltest.post_reason('fail')
         print(err)
         return 'fail'
 
     (_, err) = gdaltest.runexternal_out_and_err(test_cli_utilities.get_ogrinfo_path() + ' --optfile /foo/bar', check_memleak=False)
     if err.find('Unable to open optfile') < 0:
-        gdaltest.post_reason('fail')
         print(err)
         return 'fail'
 
@@ -327,7 +318,6 @@ def test_ogrinfo_17():
     (_, err) = gdaltest.runexternal_out_and_err(test_cli_utilities.get_ogrinfo_path() + ' --optfile tmp/optfile.txt', check_memleak=False)
     os.unlink('tmp/optfile.txt')
     if err.find('--config option given without a key and value argument') < 0:
-        gdaltest.post_reason('fail')
         print(err)
         return 'fail'
 
diff --git a/autotest/utilities/test_ogrtindex.py b/autotest/utilities/test_ogrtindex.py
index c7805766d23f..0a5e3510af50 100755
--- a/autotest/utilities/test_ogrtindex.py
+++ b/autotest/utilities/test_ogrtindex.py
@@ -215,7 +215,6 @@ def test_ogrtindex_3():
         feat = ds.GetLayer(0).GetNextFeature()
         while feat is not None:
             if feat.GetField('src_srs') != expected_srss[i]:
-                gdaltest.post_reason('fail')
                 print(i, src_srs_format)
                 feat.DumpReadable()
                 return 'fail'

From 3fe4e7dd4445f7a10b5c32d5b5005da324942c23 Mon Sep 17 00:00:00 2001
From: Craig de Stigter <craig.destigter@koordinates.com>
Date: Mon, 10 Dec 2018 09:24:09 +1300
Subject: [PATCH 138/488] Automated: 'return fail' --> assert

Pytest uses assertion rewriting to add context to normal `assert` statements.
This means a lot of `if` statements can be better written as assertions.
---
 autotest/alg/applyverticalshiftgrid.py        |  121 +-
 autotest/alg/contour.py                       |   43 +-
 autotest/alg/cutline.py                       |    4 +-
 autotest/alg/dither.py                        |    8 +-
 autotest/alg/polygonize.py                    |   32 +-
 autotest/alg/proximity.py                     |   10 +-
 autotest/alg/rasterize.py                     |   25 +-
 autotest/alg/reproject.py                     |    7 +-
 autotest/alg/sieve.py                         |   25 +-
 autotest/alg/tps.py                           |    3 +-
 autotest/alg/warp.py                          |  275 +--
 autotest/gcore/asyncreader.py                 |   12 +-
 autotest/gcore/basic_test.py                  |  214 +-
 autotest/gcore/colortable.py                  |   10 +-
 autotest/gcore/envi_read.py                   |    4 +-
 autotest/gcore/gcps2geotransform.py           |   36 +-
 autotest/gcore/gdal_api_proxy.py              |  300 +--
 autotest/gcore/gdal_stats.py                  |  303 +--
 autotest/gcore/hdf4_read.py                   |   58 +-
 autotest/gcore/hfa_write.py                   |   47 +-
 autotest/gcore/histogram.py                   |   30 +-
 autotest/gcore/identify.py                    |   39 +-
 autotest/gcore/mask.py                        |  442 +---
 autotest/gcore/minixml.py                     |  144 +-
 autotest/gcore/misc.py                        |   70 +-
 autotest/gcore/nodatamaskband.py              |   25 +-
 autotest/gcore/numpy_rw.py                    |  234 +-
 autotest/gcore/overviewds.py                  |  103 +-
 autotest/gcore/pam.py                         |  189 +-
 autotest/gcore/pixfun.py                      |  345 +--
 autotest/gcore/rasterio.py                    |  375 +--
 autotest/gcore/rat.py                         |   60 +-
 autotest/gcore/rfc30.py                       |   28 +-
 autotest/gcore/testnonboundtoswig.py          |   31 +-
 autotest/gcore/tiff_ovr.py                    |  564 ++---
 autotest/gcore/tiff_read.py                   | 1068 +++------
 autotest/gcore/tiff_srs.py                    |   89 +-
 autotest/gcore/tiff_write.py                  | 2110 +++++------------
 autotest/gcore/transformer.py                 |  343 +--
 autotest/gcore/virtualmem.py                  |   35 +-
 autotest/gcore/vrt_read.py                    |  349 +--
 autotest/gcore/vrtmisc.py                     |  195 +-
 autotest/gcore/vsiaz.py                       |  232 +-
 autotest/gcore/vsicrypt.py                    |  140 +-
 autotest/gcore/vsicurl.py                     |   64 +-
 autotest/gcore/vsifile.py                     |  372 +--
 autotest/gcore/vsigs.py                       |  243 +-
 autotest/gcore/vsihdfs.py                     |   51 +-
 autotest/gcore/vsioss.py                      |  397 +---
 autotest/gcore/vsis3.py                       |  695 ++----
 autotest/gcore/vsistdin.py                    |   15 +-
 autotest/gcore/vsiswift.py                    |  201 +-
 autotest/gcore/vsiwebhdfs.py                  |  186 +-
 autotest/gcore/vsizip.py                      |  244 +-
 autotest/gdrivers/aaigrid.py                  |  104 +-
 autotest/gdrivers/adrg.py                     |   48 +-
 autotest/gdrivers/aigrid.py                   |   97 +-
 autotest/gdrivers/arg.py                      |   49 +-
 autotest/gdrivers/bag.py                      |  304 +--
 autotest/gdrivers/blx.py                      |   20 +-
 autotest/gdrivers/cals.py                     |   39 +-
 autotest/gdrivers/ctg.py                      |   13 +-
 autotest/gdrivers/db2.py                      |   31 +-
 autotest/gdrivers/derived.py                  |   24 +-
 autotest/gdrivers/dimap.py                    |   60 +-
 autotest/gdrivers/dods.py                     |    5 +-
 autotest/gdrivers/doq2.py                     |   21 +-
 autotest/gdrivers/dted.py                     |   70 +-
 autotest/gdrivers/e00grid.py                  |   37 +-
 autotest/gdrivers/ecrgtoc.py                  |   88 +-
 autotest/gdrivers/ecw.py                      |  549 ++---
 autotest/gdrivers/eedai.py                    |   83 +-
 autotest/gdrivers/ehdr.py                     |  147 +-
 autotest/gdrivers/envi.py                     |   54 +-
 autotest/gdrivers/envisat.py                  |  117 +-
 autotest/gdrivers/ers.py                      |  123 +-
 autotest/gdrivers/fast.py                     |   41 +-
 autotest/gdrivers/gdalhttp.py                 |   11 +-
 autotest/gdrivers/gif.py                      |   38 +-
 autotest/gdrivers/gpkg.py                     | 1006 +++-----
 autotest/gdrivers/grib.py                     |  418 +---
 autotest/gdrivers/gta.py                      |   81 +-
 autotest/gdrivers/hdf5.py                     |  187 +-
 autotest/gdrivers/hfa.py                      |  428 +---
 autotest/gdrivers/ida.py                      |   17 +-
 autotest/gdrivers/ignfheightasciigrid.py      |   24 +-
 autotest/gdrivers/ingr.py                     |   20 +-
 autotest/gdrivers/iris.py                     |   15 +-
 autotest/gdrivers/isce.py                     |    3 +-
 autotest/gdrivers/isis.py                     |  486 ++--
 autotest/gdrivers/jp2kak.py                   |  100 +-
 autotest/gdrivers/jp2lura.py                  |  577 ++---
 autotest/gdrivers/jp2metadata.py              |   50 +-
 autotest/gdrivers/jp2openjpeg.py              |  943 +++-----
 autotest/gdrivers/jpeg.py                     |  444 ++--
 autotest/gdrivers/jpeg2000.py                 |   82 +-
 autotest/gdrivers/jpeg_profile.py             |   24 +-
 autotest/gdrivers/jpipkak.py                  |   53 +-
 autotest/gdrivers/kea.py                      |  362 +--
 autotest/gdrivers/kmlsuperoverlay.py          |   58 +-
 autotest/gdrivers/l1b.py                      |   72 +-
 autotest/gdrivers/lcp.py                      |  230 +-
 autotest/gdrivers/mbtiles.py                  |  193 +-
 autotest/gdrivers/mem.py                      |  326 +--
 autotest/gdrivers/mg4lidar.py                 |    9 +-
 autotest/gdrivers/mrf.py                      |  127 +-
 autotest/gdrivers/mrsid.py                    |   48 +-
 autotest/gdrivers/netcdf.py                   |  607 ++---
 autotest/gdrivers/netcdf_cf.py                |    9 +-
 autotest/gdrivers/nitf.py                     |  841 ++-----
 autotest/gdrivers/ntv2.py                     |   22 +-
 autotest/gdrivers/ozi.py                      |   32 +-
 autotest/gdrivers/pcidsk.py                   |  121 +-
 autotest/gdrivers/pcraster.py                 |   10 +-
 autotest/gdrivers/pdf.py                      |  443 +---
 autotest/gdrivers/pds.py                      |   40 +-
 autotest/gdrivers/pds4.py                     |  288 +--
 autotest/gdrivers/plmosaic.py                 |  215 +-
 autotest/gdrivers/png.py                      |   88 +-
 autotest/gdrivers/png_profile.py              |   57 +-
 autotest/gdrivers/postgisraster.py            |   70 +-
 autotest/gdrivers/prf.py                      |   32 +-
 autotest/gdrivers/rasdaman.py                 |    4 +-
 autotest/gdrivers/rasterlite.py               |  162 +-
 autotest/gdrivers/rda.py                      |  325 +--
 autotest/gdrivers/rl2.py                      |  167 +-
 autotest/gdrivers/rmf.py                      |  176 +-
 autotest/gdrivers/roipac.py                   |    9 +-
 autotest/gdrivers/rpftoc.py                   |   24 +-
 autotest/gdrivers/rraster.py                  |   79 +-
 autotest/gdrivers/rs2.py                      |    4 +-
 autotest/gdrivers/saga.py                     |   10 +-
 autotest/gdrivers/sdts.py                     |    3 +-
 autotest/gdrivers/sentinel2.py                |  607 ++---
 autotest/gdrivers/snodas.py                   |   12 +-
 autotest/gdrivers/srp.py                      |   36 +-
 autotest/gdrivers/srtmhgt.py                  |   23 +-
 autotest/gdrivers/terragen.py                 |    3 +-
 autotest/gdrivers/tiff_profile.py             |   81 +-
 autotest/gdrivers/til.py                      |   34 +-
 autotest/gdrivers/usgsdem.py                  |   24 +-
 autotest/gdrivers/vicar.py                    |   28 +-
 autotest/gdrivers/vrtderived.py               |  169 +-
 autotest/gdrivers/vrtfilt.py                  |    9 +-
 autotest/gdrivers/vrtmask.py                  |   88 +-
 autotest/gdrivers/vrtovr.py                   |   51 +-
 autotest/gdrivers/vrtpansharpen.py            |  294 +--
 autotest/gdrivers/vrtrawlink.py               |   91 +-
 autotest/gdrivers/vrtwarp.py                  |  116 +-
 autotest/gdrivers/wcs.py                      |   96 +-
 autotest/gdrivers/webp.py                     |   34 +-
 autotest/gdrivers/wms.py                      |  254 +-
 autotest/gdrivers/wmts.py                     |  396 +---
 autotest/gdrivers/xyz.py                      |   74 +-
 autotest/gnm/gnm_test.py                      |   76 +-
 autotest/ogr/ogr_arcgen.py                    |   80 +-
 autotest/ogr/ogr_avc.py                       |   44 +-
 autotest/ogr/ogr_basic_test.py                |  180 +-
 autotest/ogr/ogr_bna.py                       |   63 +-
 autotest/ogr/ogr_cad.py                       |  238 +-
 autotest/ogr/ogr_carto.py                     |  359 +--
 autotest/ogr/ogr_cloudant.py                  |   53 +-
 autotest/ogr/ogr_couchdb.py                   |    9 +-
 autotest/ogr/ogr_csv.py                       |  711 ++----
 autotest/ogr/ogr_csw.py                       |  131 +-
 autotest/ogr/ogr_db2.py                       |   79 +-
 autotest/ogr/ogr_db2_hack.py                  |   35 +-
 autotest/ogr/ogr_dgn.py                       |  126 +-
 autotest/ogr/ogr_dgnv8.py                     |   37 +-
 autotest/ogr/ogr_dods.py                      |   49 +-
 autotest/ogr/ogr_dxf.py                       |  696 ++----
 autotest/ogr/ogr_edigeo.py                    |   15 +-
 autotest/ogr/ogr_eeda.py                      |   52 +-
 autotest/ogr/ogr_elasticsearch.py             |  405 +---
 autotest/ogr/ogr_factory.py                   |  111 +-
 autotest/ogr/ogr_feature.py                   |  630 ++---
 autotest/ogr/ogr_fgdb.py                      |  533 ++---
 autotest/ogr/ogr_fgdb_stress_test.py          |   21 +-
 autotest/ogr/ogr_geoconcept.py                |   77 +-
 autotest/ogr/ogr_geojson.py                   |  988 +++-----
 autotest/ogr/ogr_geojsonseq.py                |   34 +-
 autotest/ogr/ogr_geom.py                      | 1826 ++++----------
 autotest/ogr/ogr_georss.py                    |  181 +-
 autotest/ogr/ogr_geos.py                      |  188 +-
 autotest/ogr/ogr_gft.py                       |   37 +-
 autotest/ogr/ogr_gml_fgd_read.py              |   33 +-
 autotest/ogr/ogr_gml_geom.py                  |  574 ++---
 autotest/ogr/ogr_gml_read.py                  | 1030 +++-----
 autotest/ogr/ogr_gmlas.py                     |  633 ++---
 autotest/ogr/ogr_gmt.py                       |   59 +-
 autotest/ogr/ogr_gpkg.py                      | 1267 +++-------
 autotest/ogr/ogr_gpsbabel.py                  |   19 +-
 autotest/ogr/ogr_gpx.py                       |  113 +-
 autotest/ogr/ogr_grass.py                     |   16 +-
 autotest/ogr/ogr_gtm.py                       |  260 +-
 autotest/ogr/ogr_htf.py                       |   48 +-
 autotest/ogr/ogr_idrisi.py                    |   76 +-
 autotest/ogr/ogr_ili.py                       |  389 +--
 autotest/ogr/ogr_index_test.py                |   79 +-
 autotest/ogr/ogr_ingres.py                    |   32 +-
 autotest/ogr/ogr_jml.py                       |   90 +-
 autotest/ogr/ogr_join_test.py                 |   46 +-
 autotest/ogr/ogr_kml.py                       |  354 +--
 autotest/ogr/ogr_layer_algebra.py             |  269 +--
 autotest/ogr/ogr_libkml.py                    |  529 ++---
 autotest/ogr/ogr_mem.py                       |  333 +--
 autotest/ogr/ogr_mitab.py                     |  521 ++--
 autotest/ogr/ogr_mongodb.py                   |  191 +-
 autotest/ogr/ogr_mssqlspatial.py              |   85 +-
 autotest/ogr/ogr_mvt.py                       |  306 +--
 autotest/ogr/ogr_mysql.py                     |  198 +-
 autotest/ogr/ogr_nas.py                       |  104 +-
 autotest/ogr/ogr_ntf.py                       |   38 +-
 autotest/ogr/ogr_oci.py                       |  157 +-
 autotest/ogr/ogr_odbc.py                      |   22 +-
 autotest/ogr/ogr_ods.py                       |  131 +-
 autotest/ogr/ogr_ogdi.py                      |   79 +-
 autotest/ogr/ogr_openair.py                   |   25 +-
 autotest/ogr/ogr_openfilegdb.py               |  317 +--
 autotest/ogr/ogr_osm.py                       |  152 +-
 autotest/ogr/ogr_pcidsk.py                    |   85 +-
 autotest/ogr/ogr_pdf.py                       |   62 +-
 autotest/ogr/ogr_pds.py                       |   16 +-
 autotest/ogr/ogr_pg.py                        | 1436 ++++-------
 autotest/ogr/ogr_pgdump.py                    |  160 +-
 autotest/ogr/ogr_pgeo.py                      |   42 +-
 autotest/ogr/ogr_plscenes.py                  |  165 +-
 autotest/ogr/ogr_rec.py                       |    4 +-
 autotest/ogr/ogr_rfc30.py                     |    8 +-
 autotest/ogr/ogr_rfc35_mem.py                 |   72 +-
 autotest/ogr/ogr_rfc35_mitab.py               |   86 +-
 autotest/ogr/ogr_rfc35_shape.py               |   83 +-
 autotest/ogr/ogr_rfc35_sqlite.py              |   72 +-
 autotest/ogr/ogr_rfc41.py                     |  508 ++--
 autotest/ogr/ogr_s57.py                       |  143 +-
 autotest/ogr/ogr_sde.py                       |   14 +-
 autotest/ogr/ogr_sdts.py                      |   19 +-
 autotest/ogr/ogr_segukooa.py                  |   48 +-
 autotest/ogr/ogr_segy.py                      |   62 +-
 autotest/ogr/ogr_selafin.py                   |   49 +-
 autotest/ogr/ogr_shape.py                     | 1287 ++++------
 autotest/ogr/ogr_shape_qix.py                 |   17 +-
 autotest/ogr/ogr_shape_sbn.py                 |    8 +-
 autotest/ogr/ogr_sosi.py                      |    4 +-
 autotest/ogr/ogr_sql_rfc28.py                 |  388 ++-
 autotest/ogr/ogr_sql_sqlite.py                |  195 +-
 autotest/ogr/ogr_sql_test.py                  |  183 +-
 autotest/ogr/ogr_sqlite.py                    |  895 +++----
 autotest/ogr/ogr_style.py                     |   49 +-
 autotest/ogr/ogr_sua.py                       |   15 +-
 autotest/ogr/ogr_svg.py                       |   19 +-
 autotest/ogr/ogr_sxf.py                       |    4 +-
 autotest/ogr/ogr_tiger.py                     |   51 +-
 autotest/ogr/ogr_vdv.py                       |   72 +-
 autotest/ogr/ogr_vfk.py                       |  117 +-
 autotest/ogr/ogr_virtualogr.py                |   71 +-
 autotest/ogr/ogr_vrt.py                       | 1073 +++------
 autotest/ogr/ogr_wasp.py                      |  145 +-
 autotest/ogr/ogr_wfs.py                       |  952 +++-----
 autotest/ogr/ogr_wfs3.py                      |   76 +-
 autotest/ogr/ogr_wkbwkt_geom.py               |   91 +-
 autotest/ogr/ogr_wktempty.py                  |   40 +-
 autotest/ogr/ogr_xls.py                       |   62 +-
 autotest/ogr/ogr_xlsx.py                      |  138 +-
 autotest/ogr/ogr_xplane.py                    |   70 +-
 autotest/ogr/ograpispy.py                     |   10 +-
 autotest/osr/osr_basic.py                     |  364 +--
 autotest/osr/osr_compd.py                     |   97 +-
 autotest/osr/osr_ct.py                        |   64 +-
 autotest/osr/osr_ct_proj.py                   |   20 +-
 autotest/osr/osr_epsg.py                      |  130 +-
 autotest/osr/osr_erm.py                       |   18 +-
 autotest/osr/osr_esri.py                      |  237 +-
 autotest/osr/osr_getprojectionmethods.py      |    3 +-
 autotest/osr/osr_metacrs.py                   |    3 +-
 autotest/osr/osr_micoordsys.py                |   22 +-
 autotest/osr/osr_ozi.py                       |    9 +-
 autotest/osr/osr_pci.py                       |   71 +-
 autotest/osr/osr_pm.py                        |   30 +-
 autotest/osr/osr_proj4.py                     |  215 +-
 autotest/osr/osr_url.py                       |    5 +-
 autotest/osr/osr_usgs.py                      |   19 +-
 autotest/osr/osr_validate.py                  |  105 +-
 autotest/osr/osr_xml.py                       |    8 +-
 autotest/pymod/gdaltest.py                    |  238 +-
 autotest/pyscripts/test_gdal2tiles.py         |   41 +-
 autotest/pyscripts/test_gdal_calc.py          |  170 +-
 autotest/pyscripts/test_gdal_edit.py          |  101 +-
 autotest/pyscripts/test_gdal_fillnodata.py    |    8 +-
 autotest/pyscripts/test_gdal_ls_py.py         |   20 +-
 autotest/pyscripts/test_gdal_merge.py         |   94 +-
 autotest/pyscripts/test_gdal_pansharpen.py    |    8 +-
 autotest/pyscripts/test_gdal_polygonize.py    |   16 +-
 autotest/pyscripts/test_gdal_proximity.py     |   10 +-
 autotest/pyscripts/test_gdal_retile.py        |   69 +-
 autotest/pyscripts/test_gdal_sieve.py         |    4 +-
 autotest/pyscripts/test_gdalinfo_py.py        |   77 +-
 autotest/pyscripts/test_gdalmove.py           |   11 +-
 autotest/pyscripts/test_ogr2ogr_py.py         |  238 +-
 autotest/pyscripts/test_ogrinfo_py.py         |   60 +-
 autotest/pyscripts/test_ogrmerge.py           |   80 +-
 autotest/pyscripts/test_rgb2pct.py            |   32 +-
 autotest/utilities/test_gdal_contour.py       |   63 +-
 autotest/utilities/test_gdal_grid.py          |   92 +-
 autotest/utilities/test_gdal_grid_lib.py      |   17 +-
 autotest/utilities/test_gdal_rasterize.py     |  101 +-
 autotest/utilities/test_gdal_rasterize_lib.py |   77 +-
 autotest/utilities/test_gdal_translate.py     |  445 +---
 autotest/utilities/test_gdal_translate_lib.py |  249 +-
 autotest/utilities/test_gdaladdo.py           |   31 +-
 autotest/utilities/test_gdalbuildvrt.py       |  137 +-
 autotest/utilities/test_gdalbuildvrt_lib.py   |   43 +-
 autotest/utilities/test_gdaldem.py            |  298 +--
 autotest/utilities/test_gdaldem_lib.py        |  254 +-
 autotest/utilities/test_gdalinfo.py           |  274 +--
 autotest/utilities/test_gdalinfo_lib.py       |   52 +-
 autotest/utilities/test_gdallocationinfo.py   |   29 +-
 autotest/utilities/test_gdalsrsinfo.py        |   78 +-
 autotest/utilities/test_gdaltindex.py         |   56 +-
 autotest/utilities/test_gdaltransform.py      |   76 +-
 autotest/utilities/test_gdalwarp.py           |  495 ++--
 autotest/utilities/test_gdalwarp_lib.py       |  562 ++---
 autotest/utilities/test_gnmutils.py           |   38 +-
 autotest/utilities/test_nearblack.py          |  118 +-
 autotest/utilities/test_nearblack_lib.py      |   99 +-
 autotest/utilities/test_ogr2ogr.py            |  462 ++--
 autotest/utilities/test_ogr2ogr_lib.py        |  141 +-
 autotest/utilities/test_ogrinfo.py            |  151 +-
 autotest/utilities/test_ogrlineref.py         |   24 +-
 autotest/utilities/test_ogrtindex.py          |   44 +-
 330 files changed, 17447 insertions(+), 41720 deletions(-)

diff --git a/autotest/alg/applyverticalshiftgrid.py b/autotest/alg/applyverticalshiftgrid.py
index 4dc642755058..44abde9ad05a 100755
--- a/autotest/alg/applyverticalshiftgrid.py
+++ b/autotest/alg/applyverticalshiftgrid.py
@@ -46,29 +46,17 @@ def test_applyverticalshiftgrid_1():
                             width=20, height=40)
     grid_ds = gdal.Translate('', src_ds, format='MEM')
     out_ds = gdal.ApplyVerticalShiftGrid(src_ds, grid_ds)
-    if out_ds.GetRasterBand(1).DataType != gdal.GDT_Byte:
-        print(out_ds.GetRasterBand(1).DataType)
-        return 'fail'
-    if out_ds.RasterXSize != src_ds.RasterXSize:
-        print(out_ds.RasterXSize)
-        return 'fail'
-    if out_ds.RasterYSize != src_ds.RasterYSize:
-        print(out_ds.RasterYSize)
-        return 'fail'
-    if out_ds.GetGeoTransform() != src_ds.GetGeoTransform():
-        print(out_ds.GetGeoTransform())
-        return 'fail'
-    if out_ds.GetProjectionRef() != src_ds.GetProjectionRef():
-        print(out_ds.GetProjectionRef())
-        return 'fail'
+    assert out_ds.GetRasterBand(1).DataType == gdal.GDT_Byte
+    assert out_ds.RasterXSize == src_ds.RasterXSize
+    assert out_ds.RasterYSize == src_ds.RasterYSize
+    assert out_ds.GetGeoTransform() == src_ds.GetGeoTransform()
+    assert out_ds.GetProjectionRef() == src_ds.GetProjectionRef()
     # Check that we can drop the reference to the sources
     src_ds = None
     grid_ds = None
 
     cs = out_ds.GetRasterBand(1).Checksum()
-    if cs != 10038:
-        print(cs)
-        return 'fail'
+    assert cs == 10038
 
     src_ds = gdal.Open('../gcore/data/byte.tif')
     src_ds = gdal.Translate('', src_ds, format='MEM',
@@ -78,20 +66,14 @@ def test_applyverticalshiftgrid_1():
     out_ds = gdal.ApplyVerticalShiftGrid(src_ds, src_ds,
                                          options=['BLOCKSIZE=15'])
     cs = out_ds.GetRasterBand(1).Checksum()
-    if cs != 10038:
-        print(cs)
-        return 'fail'
+    assert cs == 10038
 
     # Inverse transformer
     out_ds = gdal.ApplyVerticalShiftGrid(src_ds, src_ds, True,
                                          options=['DATATYPE=Float32'])
-    if out_ds.GetRasterBand(1).DataType != gdal.GDT_Float32:
-        print(out_ds.GetRasterBand(1).DataType)
-        return 'fail'
+    assert out_ds.GetRasterBand(1).DataType == gdal.GDT_Float32
     cs = out_ds.GetRasterBand(1).Checksum()
-    if cs != 0:
-        print(cs)
-        return 'fail'
+    assert cs == 0
 
     return 'success'
 
@@ -120,9 +102,7 @@ def test_applyverticalshiftgrid_2():
             grid_ds.AddBand(gdal.GDT_Byte)
         with gdaltest.error_handler():
             out_ds = gdal.ApplyVerticalShiftGrid(src_ds, grid_ds)
-        if out_ds is not None:
-            print(i)
-            return 'fail'
+        assert out_ds is None, i
 
     # Non invertable source geotransform
     src_ds = gdal.GetDriverByName('MEM').Create('', 1, 1)
@@ -133,8 +113,7 @@ def test_applyverticalshiftgrid_2():
     grid_ds.SetProjection(sr.ExportToWkt())
     with gdaltest.error_handler():
         out_ds = gdal.ApplyVerticalShiftGrid(src_ds, grid_ds)
-    if out_ds is not None:
-        return 'fail'
+    assert out_ds is None
 
     # Non invertable grid geotransform
     src_ds = gdal.GetDriverByName('MEM').Create('', 1, 1)
@@ -145,8 +124,7 @@ def test_applyverticalshiftgrid_2():
     grid_ds.SetProjection(sr.ExportToWkt())
     with gdaltest.error_handler():
         out_ds = gdal.ApplyVerticalShiftGrid(src_ds, grid_ds)
-    if out_ds is not None:
-        return 'fail'
+    assert out_ds is None
 
     # No PROJ.4 translation for source SRS, coordinate transformation
     # initialization has failed
@@ -158,8 +136,7 @@ def test_applyverticalshiftgrid_2():
     grid_ds.SetProjection('LOCAL_CS["foo"]')
     with gdaltest.error_handler():
         out_ds = gdal.ApplyVerticalShiftGrid(src_ds, grid_ds)
-    if out_ds is not None:
-        return 'fail'
+    assert out_ds is None
 
     # Out of memory
     if gdal.GetConfigOption('SKIP_MEM_INTENSIVE_TEST') is None:
@@ -172,8 +149,7 @@ def test_applyverticalshiftgrid_2():
         with gdaltest.error_handler():
             out_ds = gdal.ApplyVerticalShiftGrid(src_ds, grid_ds,
                                                  options=['BLOCKSIZE=2000000000'])
-        if out_ds is not None:
-            return 'fail'
+        assert out_ds is None
 
     # Wrong DATATYPE
     src_ds = gdal.GetDriverByName('MEM').Create('', 1, 1)
@@ -185,8 +161,7 @@ def test_applyverticalshiftgrid_2():
     with gdaltest.error_handler():
         out_ds = gdal.ApplyVerticalShiftGrid(src_ds, grid_ds,
                                              options=['DATATYPE=x'])
-    if out_ds is not None:
-        return 'fail'
+    assert out_ds is None
 
     return 'success'
 
@@ -201,36 +176,22 @@ def test_applyverticalshiftgrid_3():
                         width=40, height=40)
     out_ds = gdal.ApplyVerticalShiftGrid(src_ds, grid_ds,
                                          options=['RESAMPLING=NEAREST'])
-    if out_ds.RasterXSize != src_ds.RasterXSize:
-        print(out_ds.RasterXSize)
-        return 'fail'
-    if out_ds.RasterYSize != src_ds.RasterYSize:
-        print(out_ds.RasterYSize)
-        return 'fail'
-    if out_ds.GetGeoTransform() != src_ds.GetGeoTransform():
-        print(out_ds.GetGeoTransform())
-        return 'fail'
-    if out_ds.GetProjectionRef() != src_ds.GetProjectionRef():
-        print(out_ds.GetProjectionRef())
-        return 'fail'
+    assert out_ds.RasterXSize == src_ds.RasterXSize
+    assert out_ds.RasterYSize == src_ds.RasterYSize
+    assert out_ds.GetGeoTransform() == src_ds.GetGeoTransform()
+    assert out_ds.GetProjectionRef() == src_ds.GetProjectionRef()
     cs = out_ds.GetRasterBand(1).Checksum()
-    if cs != 5112:
-        print(cs)
-        return 'fail'
+    assert cs == 5112
 
     out_ds = gdal.ApplyVerticalShiftGrid(src_ds, grid_ds,
                                          options=['RESAMPLING=BILINEAR'])
     cs = out_ds.GetRasterBand(1).Checksum()
-    if cs != 4867 and cs != 4868:
-        print(cs)
-        return 'fail'
+    assert cs == 4867 or cs == 4868
 
     out_ds = gdal.ApplyVerticalShiftGrid(src_ds, grid_ds,
                                          options=['RESAMPLING=CUBIC'])
     cs = out_ds.GetRasterBand(1).Checksum()
-    if cs != 4841 and cs != 4854:
-        print(cs)
-        return 'fail'
+    assert cs == 4841 or cs == 4854
 
     return 'success'
 
@@ -254,13 +215,9 @@ def test_applyverticalshiftgrid_4():
     grid_ds.SetProjection(sr.ExportToWkt())
     grid_ds.GetRasterBand(1).Fill(30)
     out_ds = gdal.ApplyVerticalShiftGrid(src_ds, grid_ds)
-    if out_ds.GetRasterBand(1).GetNoDataValue() != 1:
-        print(out_ds.GetRasterBand(1).GetNoDataValue())
-        return 'fail'
+    assert out_ds.GetRasterBand(1).GetNoDataValue() == 1
     cs = out_ds.GetRasterBand(1).Checksum()
-    if cs != 1:
-        print(cs)
-        return 'fail'
+    assert cs == 1
 
     # Nodata on grid
     src_ds = gdal.GetDriverByName('MEM').Create('', 1, 1)
@@ -273,13 +230,9 @@ def test_applyverticalshiftgrid_4():
     grid_ds.GetRasterBand(1).Fill(30)
     grid_ds.GetRasterBand(1).SetNoDataValue(30)
     out_ds = gdal.ApplyVerticalShiftGrid(src_ds, grid_ds)
-    if out_ds.GetRasterBand(1).GetNoDataValue() is not None:
-        print(out_ds.GetRasterBand(1).GetNoDataValue())
-        return 'fail'
+    assert out_ds.GetRasterBand(1).GetNoDataValue() is None
     cs = out_ds.GetRasterBand(1).Checksum()
-    if cs != 1:
-        print(cs)
-        return 'fail'
+    assert cs == 1
 
     # ERROR_ON_MISSING_VERT_SHIFT due to non compatible extents
     src_ds = gdal.GetDriverByName('MEM').Create('', 1, 1)
@@ -293,8 +246,7 @@ def test_applyverticalshiftgrid_4():
                                          options=['ERROR_ON_MISSING_VERT_SHIFT=YES'])
     with gdaltest.error_handler():
         data = out_ds.GetRasterBand(1).ReadRaster()
-    if data is not None:
-        return 'fail'
+    assert data is None
 
     # ERROR_ON_MISSING_VERT_SHIFT due to nodata in grid
     src_ds = gdal.GetDriverByName('MEM').Create('', 1, 1)
@@ -309,8 +261,7 @@ def test_applyverticalshiftgrid_4():
                                          options=['ERROR_ON_MISSING_VERT_SHIFT=YES'])
     with gdaltest.error_handler():
         data = out_ds.GetRasterBand(1).ReadRaster()
-    if data is not None:
-        return 'fail'
+    assert data is None
 
     return 'success'
 
@@ -328,9 +279,7 @@ def test_applyverticalshiftgrid_5():
                             scaleParams=[[0, 1, 0, 0.5]])
     out_ds = gdal.ApplyVerticalShiftGrid(src_ds, grid_ds, srcUnitToMeter=2)
     cs = out_ds.GetRasterBand(1).Checksum()
-    if cs != 4672:
-        print(cs)
-        return 'fail'
+    assert cs == 4672
 
     src_ds = gdal.Open('../gcore/data/byte.tif')
     grid_ds = gdal.Translate('', src_ds, format='MEM')
@@ -340,9 +289,7 @@ def test_applyverticalshiftgrid_5():
                             scaleParams=[[0, 1, 0, 0.5]])
     out_ds = gdal.ApplyVerticalShiftGrid(src_ds, grid_ds, dstUnitToMeter=0.5)
     cs = out_ds.GetRasterBand(1).Checksum()
-    if cs != 4672:
-        print(cs)
-        return 'fail'
+    assert cs == 4672
 
     return 'success'
 
@@ -361,9 +308,7 @@ def test_applyverticalshiftgrid_6():
     ds = gdal.Warp('', '../gcore/data/byte.tif', format='MEM',
                    dstSRS='+proj=utm +zone=11 +datum=NAD27 +geoidgrids=/vsimem/applyverticalshiftgrid_6.gtx +vunits=m +no_defs')
     cs = ds.GetRasterBand(1).Checksum()
-    if cs != 4783:
-        print(cs)
-        return 'fail'
+    assert cs == 4783
 
     gdal.Unlink('/vsimem/applyverticalshiftgrid_6.gtx')
 
@@ -384,9 +329,7 @@ def test_applyverticalshiftgrid_7():
     ds = gdal.Warp('', '../gcore/data/byte.tif', format='MEM',
                    dstSRS='+proj=utm +zone=11 +datum=NAD27 +geoidgrids=/vsimem/applyverticalshiftgrid_7.gtx +vunits=m +no_defs')
     cs = ds.GetRasterBand(1).Checksum()
-    if cs != 4783:
-        print(cs)
-        return 'fail'
+    assert cs == 4783
 
     gdal.Unlink('/vsimem/applyverticalshiftgrid_7.gtx')
 
diff --git a/autotest/alg/contour.py b/autotest/alg/contour.py
index 2b749d083578..c7f1f0a36b16 100755
--- a/autotest/alg/contour.py
+++ b/autotest/alg/contour.py
@@ -37,6 +37,7 @@
 from osgeo import ogr
 import gdaltest
 import ogrtest
+import pytest
 
 ###############################################################################
 # Test with -a and -i options
@@ -102,24 +103,18 @@ def test_contour_1():
 
     lyr = ogr_ds.ExecuteSQL("select * from contour order by elev asc")
 
-    if lyr.GetFeatureCount() != len(expected_envelopes):
-        print('Got %d features. Expected %d' % (lyr.GetFeatureCount(), len(expected_envelopes)))
-        return 'fail'
+    assert lyr.GetFeatureCount() == len(expected_envelopes)
 
     i = 0
     feat = lyr.GetNextFeature()
     while feat is not None:
         envelope = feat.GetGeometryRef().GetEnvelope()
-        if feat.GetField('elev') != expected_height[i]:
-            print('Got %f. Expected %f' % (feat.GetField('elev'), expected_height[i]))
-            return 'fail'
+        assert feat.GetField('elev') == expected_height[i]
         for j in range(4):
             if abs(expected_envelopes[i][j] - envelope[j]) > precision / 2 * 1.001:
                 print('i=%d, wkt=%s' % (i, feat.GetGeometryRef().ExportToWkt()))
                 print(feat.GetGeometryRef().GetEnvelope())
-                print(expected_envelopes[i])
-                print('%f, %f' % (expected_envelopes[i][j] - envelope[j], precision / 2))
-                return 'fail'
+                pytest.fail('%f, %f' % (expected_envelopes[i][j] - envelope[j], precision / 2))
         i = i + 1
         feat = lyr.GetNextFeature()
 
@@ -168,27 +163,19 @@ def test_contour_2():
 
     lyr = ogr_ds.ExecuteSQL("select * from contour order by elev asc")
 
-    if lyr.GetFeatureCount() != len(expected_envelopes):
-        print('Got %d features. Expected %d' % (lyr.GetFeatureCount(), len(expected_envelopes)))
-        return 'fail'
+    assert lyr.GetFeatureCount() == len(expected_envelopes)
 
     i = 0
     feat = lyr.GetNextFeature()
     while feat is not None:
-        if feat.GetGeometryRef().GetZ(0) != expected_height[i]:
-            print('Got %f as z. Expected %f' % (feat.GetGeometryRef().GetZ(0), expected_height[i]))
-            return 'fail'
+        assert feat.GetGeometryRef().GetZ(0) == expected_height[i]
         envelope = feat.GetGeometryRef().GetEnvelope()
-        if feat.GetField('elev') != expected_height[i]:
-            print('Got %f. Expected %f' % (feat.GetField('elev'), expected_height[i]))
-            return 'fail'
+        assert feat.GetField('elev') == expected_height[i]
         for j in range(4):
             if abs(expected_envelopes[i][j] - envelope[j]) > precision / 2 * 1.001:
                 print('i=%d, wkt=%s' % (i, feat.GetGeometryRef().ExportToWkt()))
                 print(feat.GetGeometryRef().GetEnvelope())
-                print(expected_envelopes[i])
-                print('%f, %f' % (expected_envelopes[i][j] - envelope[j], precision / 2))
-                return 'fail'
+                pytest.fail('%f, %f' % (expected_envelopes[i][j] - envelope[j], precision / 2))
         i = i + 1
         feat = lyr.GetNextFeature()
 
@@ -215,11 +202,9 @@ def test_contour_real_world_case():
     ds = None
 
     ogr_lyr.SetAttributeFilter('elev = 330')
-    if ogr_lyr.GetFeatureCount() != 1:
-        return 'fail'
+    assert ogr_lyr.GetFeatureCount() == 1
     f = ogr_lyr.GetNextFeature()
-    if ogrtest.check_feature_geometry(f, 'LINESTRING (4.50497512437811 11.5,4.5 11.501996007984,3.5 11.8333333333333,2.5 11.5049751243781,2.490099009901 11.5,2.0 10.5,2.5 10.1666666666667,3.0 9.5,3.5 9.21428571428571,4.49800399201597 8.5,4.5 8.49857346647646,5.5 8.16666666666667,6.5 8.0,7.5 8.0,8.0 7.5,8.5 7.0,9.490099009901 6.5,9.5 6.49667774086379,10.5 6.16666666666667,11.4950248756219 5.5,11.5 5.49833610648919,12.5 5.49667774086379,13.5 5.49800399201597,13.501996007984 5.5,13.5 5.50199600798403,12.501996007984 6.5,12.5 6.50142653352354,11.5 6.509900990099,10.509900990099 7.5,10.5 7.50142653352354,9.5 7.9,8.50332225913621 8.5,8.5 8.50249376558603,7.83333333333333 9.5,7.5 10.0,7.0 10.5,6.5 10.7857142857143,5.5 11.1666666666667,4.50497512437811 11.5)', 0.01) != 0:
-        return 'fail'
+    assert ogrtest.check_feature_geometry(f, 'LINESTRING (4.50497512437811 11.5,4.5 11.501996007984,3.5 11.8333333333333,2.5 11.5049751243781,2.490099009901 11.5,2.0 10.5,2.5 10.1666666666667,3.0 9.5,3.5 9.21428571428571,4.49800399201597 8.5,4.5 8.49857346647646,5.5 8.16666666666667,6.5 8.0,7.5 8.0,8.0 7.5,8.5 7.0,9.490099009901 6.5,9.5 6.49667774086379,10.5 6.16666666666667,11.4950248756219 5.5,11.5 5.49833610648919,12.5 5.49667774086379,13.5 5.49800399201597,13.501996007984 5.5,13.5 5.50199600798403,12.501996007984 6.5,12.5 6.50142653352354,11.5 6.509900990099,10.509900990099 7.5,10.5 7.50142653352354,9.5 7.9,8.50332225913621 8.5,8.5 8.50249376558603,7.83333333333333 9.5,7.5 10.0,7.0 10.5,6.5 10.7857142857143,5.5 11.1666666666667,4.50497512437811 11.5)', 0.01) == 0
     return 'success'
 
 # Test with -p option (polygonize)
@@ -268,9 +253,7 @@ def test_contour_3():
 
     lyr = ogr_ds.ExecuteSQL("select * from contour order by elevMin asc")
 
-    if lyr.GetFeatureCount() != len(expected_envelopes):
-        print('Got %d features. Expected %d' % (lyr.GetFeatureCount(), len(expected_envelopes)))
-        return 'fail'
+    assert lyr.GetFeatureCount() == len(expected_envelopes)
 
     i = 0
     feat = lyr.GetNextFeature()
@@ -287,9 +270,7 @@ def test_contour_3():
             if abs(expected_envelopes[i][j] - envelope[j]) > precision / 2 * 1.001:
                 print('i=%d, wkt=%s' % (i, feat.GetGeometryRef().ExportToWkt()))
                 print(feat.GetGeometryRef().GetEnvelope())
-                print(expected_envelopes[i])
-                print('%f, %f' % (expected_envelopes[i][j] - envelope[j], precision / 2))
-                return 'fail'
+                pytest.fail('%f, %f' % (expected_envelopes[i][j] - envelope[j], precision / 2))
         i = i + 1
         feat = lyr.GetNextFeature()
 
diff --git a/autotest/alg/cutline.py b/autotest/alg/cutline.py
index ca0e60ae5054..7184664413a0 100755
--- a/autotest/alg/cutline.py
+++ b/autotest/alg/cutline.py
@@ -112,9 +112,7 @@ def test_cutline_4():
 </VRTDataset>""")
     out_ds = gdal.Translate('', ds, options='-of MEM -outsize 50%% 50%%')
     cs = out_ds.GetRasterBand(1).Checksum()
-    if cs != 5170:
-        print(cs)
-        return 'fail'
+    assert cs == 5170
 
     gdal.Unlink('/vsimem/utmsmall.tif')
 
diff --git a/autotest/alg/dither.py b/autotest/alg/dither.py
index 79e4b824c230..e53c85dfdd13 100755
--- a/autotest/alg/dither.py
+++ b/autotest/alg/dither.py
@@ -35,6 +35,7 @@
 import gdaltest
 
 from osgeo import gdal
+import pytest
 
 ###############################################################################
 # Test
@@ -68,9 +69,7 @@ def test_dither_1():
     dst_band = None
     dst_ds = None
 
-    if ct.GetCount() != nColors:
-        gdaltest.post_reason('color table size wrong')
-        return 'fail'
+    assert ct.GetCount() == nColors, 'color table size wrong'
 
     ref_ct = [(36, 48, 32, 255), (92, 120, 20, 255), (88, 96, 20, 255), (92, 132, 56, 255),
               (0, 0, 0, 255), (96, 152, 24, 255), (60, 112, 32, 255), (164, 164, 108, 255)]
@@ -93,8 +92,7 @@ def test_dither_1():
 
     if cs != cs_expected:
         print('Got: ', cs)
-        gdaltest.post_reason('got wrong checksum')
-        return 'fail'
+        pytest.fail('got wrong checksum')
 
     return 'success'
 
diff --git a/autotest/alg/polygonize.py b/autotest/alg/polygonize.py
index f8375d255cce..300d0cf99478 100755
--- a/autotest/alg/polygonize.py
+++ b/autotest/alg/polygonize.py
@@ -60,16 +60,12 @@ def test_polygonize_1(is_int_polygonize=True):
         result = gdal.Polygonize(src_band, src_band.GetMaskBand(), mem_layer, 0)
     else:
         result = gdal.FPolygonize(src_band, src_band.GetMaskBand(), mem_layer, 0)
-    if result != 0:
-        gdaltest.post_reason('Polygonize failed')
-        return 'fail'
+    assert result == 0, 'Polygonize failed'
 
     # Confirm we get the set of expected features in the output layer.
 
     expected_feature_number = 13
-    if mem_layer.GetFeatureCount() != expected_feature_number:
-        gdaltest.post_reason('GetFeatureCount() returned %d instead of %d' % (mem_layer.GetFeatureCount(), expected_feature_number))
-        return 'fail'
+    assert mem_layer.GetFeatureCount() == expected_feature_number
 
     expect = [107, 123, 115, 115, 140, 148, 123, 140, 156,
               100, 101, 102, 103]
@@ -110,16 +106,12 @@ def test_polygonize_2():
 
     # run the algorithm.
     result = gdal.Polygonize(src_band, None, mem_layer, 0)
-    if result != 0:
-        gdaltest.post_reason('Polygonize failed')
-        return 'fail'
+    assert result == 0, 'Polygonize failed'
 
     # Confirm we get the set of expected features in the output layer.
 
     expected_feature_number = 17
-    if mem_layer.GetFeatureCount() != expected_feature_number:
-        gdaltest.post_reason('GetFeatureCount() returned %d instead of %d' % (mem_layer.GetFeatureCount(), expected_feature_number))
-        return 'fail'
+    assert mem_layer.GetFeatureCount() == expected_feature_number
 
     expect = [107, 123, 115, 132, 115, 132, 140, 132, 148, 123, 140,
               132, 156, 100, 101, 102, 103]
@@ -148,16 +140,12 @@ def test_polygonize_3():
 
     # run the algorithm.
     result = gdal.Polygonize(src_band, None, mem_layer, 0)
-    if result != 0:
-        gdaltest.post_reason('Polygonize failed')
-        return 'fail'
+    assert result == 0, 'Polygonize failed'
 
     # Confirm we get the expected count of features.
 
     expected_feature_number = 125
-    if mem_layer.GetFeatureCount() != expected_feature_number:
-        gdaltest.post_reason('GetFeatureCount() returned %d instead of %d' % (mem_layer.GetFeatureCount(), expected_feature_number))
-        return 'fail'
+    assert mem_layer.GetFeatureCount() == expected_feature_number
 
     # check at least one geometry.
     mem_layer.SetAttributeFilter('dn = 0')
@@ -191,16 +179,12 @@ def test_polygonize_4():
 
     # run the algorithm.
     result = gdal.Polygonize(src_band, None, mem_layer, 0, ["8CONNECTED=8"])
-    if result != 0:
-        gdaltest.post_reason('Polygonize failed')
-        return 'fail'
+    assert result == 0, 'Polygonize failed'
 
     # Confirm we get the set of expected features in the output layer.
 
     expected_feature_number = 16
-    if mem_layer.GetFeatureCount() != expected_feature_number:
-        gdaltest.post_reason('GetFeatureCount() returned %d instead of %d' % (mem_layer.GetFeatureCount(), expected_feature_number))
-        return 'fail'
+    assert mem_layer.GetFeatureCount() == expected_feature_number
 
     expect = [107, 123, 132, 115, 132, 115, 140, 148,
               123, 140, 132, 156, 100, 101, 102, 103]
diff --git a/autotest/alg/proximity.py b/autotest/alg/proximity.py
index bfc3dbdb232d..37df102cf01c 100755
--- a/autotest/alg/proximity.py
+++ b/autotest/alg/proximity.py
@@ -34,6 +34,7 @@
 import gdaltest
 
 from osgeo import gdal
+import pytest
 
 ###############################################################################
 # Test a fairly default case.
@@ -62,8 +63,7 @@ def test_proximity_1():
 
     if cs != cs_expected:
         print('Got: ', cs)
-        gdaltest.post_reason('got wrong checksum')
-        return 'fail'
+        pytest.fail('got wrong checksum')
     return 'success'
 
 ###############################################################################
@@ -97,8 +97,7 @@ def test_proximity_2():
 
     if cs != cs_expected:
         print('Got: ', cs)
-        gdaltest.post_reason('got wrong checksum')
-        return 'fail'
+        pytest.fail('got wrong checksum')
     return 'success'
 
 ###############################################################################
@@ -132,8 +131,7 @@ def test_proximity_3():
 
     if cs != cs_expected:
         print('Got: ', cs)
-        gdaltest.post_reason('got wrong checksum')
-        return 'fail'
+        pytest.fail('got wrong checksum')
     return 'success'
 
 
diff --git a/autotest/alg/rasterize.py b/autotest/alg/rasterize.py
index 2815e40f8927..922e9756ab0a 100755
--- a/autotest/alg/rasterize.py
+++ b/autotest/alg/rasterize.py
@@ -83,10 +83,7 @@ def test_rasterize_1():
     err = gdal.RasterizeLayer(target_ds, [3, 2, 1], rast_mem_lyr,
                               burn_values=[200, 220, 240])
 
-    if err != 0:
-        print(err)
-        gdaltest.post_reason('got non-zero result code from RasterizeLayer')
-        return 'fail'
+    assert err == 0, 'got non-zero result code from RasterizeLayer'
 
     # Check results.
 
@@ -129,10 +126,7 @@ def test_rasterize_2():
                               options=["ALL_TOUCHED=TRUE"])
     gdal.PopErrorHandler()
 
-    if err != 0:
-        print(err)
-        gdaltest.post_reason('got non-zero result code from RasterizeLayer')
-        return 'fail'
+    assert err == 0, 'got non-zero result code from RasterizeLayer'
 
     # Check results.
 
@@ -186,10 +180,7 @@ def test_rasterize_3():
     err = gdal.RasterizeLayer(target_ds, [3, 2, 1], rast_mem_lyr,
                               burn_values=[10, 10, 55], options=["BURN_VALUE_FROM=Z"])
 
-    if err != 0:
-        print(err)
-        gdaltest.post_reason('got non-zero result code from RasterizeLayer')
-        return 'fail'
+    assert err == 0, 'got non-zero result code from RasterizeLayer'
 
     # Check results.
 
@@ -246,10 +237,7 @@ def test_rasterize_4():
     err = gdal.RasterizeLayer(target_ds, [1, 2, 3], rast_mem_lyr,
                               options=["ATTRIBUTE=CELSIUS"])
 
-    if err != 0:
-        print(err)
-        gdaltest.post_reason('got non-zero result code from RasterizeLayer')
-        return 'fail'
+    assert err == 0, 'got non-zero result code from RasterizeLayer'
 
     # Check results.
     expected = 16265
@@ -315,10 +303,7 @@ def test_rasterize_5():
                               burn_values=[100, 110, 120],
                               options=["MERGE_ALG=ADD"])
 
-    if err != 0:
-        print(err)
-        gdaltest.post_reason('got non-zero result code from RasterizeLayer')
-        return 'fail'
+    assert err == 0, 'got non-zero result code from RasterizeLayer'
 
     # Check results.
 
diff --git a/autotest/alg/reproject.py b/autotest/alg/reproject.py
index 045ddf8775df..93a97832ce55 100755
--- a/autotest/alg/reproject.py
+++ b/autotest/alg/reproject.py
@@ -36,6 +36,7 @@
 
 from osgeo import gdal
 from osgeo import osr
+import pytest
 
 ###############################################################################
 # Test a trivial case.
@@ -61,8 +62,7 @@ def test_reproject_1():
 
     if cs != cs_expected:
         print('Got: ', cs)
-        gdaltest.post_reason('got wrong checksum')
-        return 'fail'
+        pytest.fail('got wrong checksum')
     return 'success'
 
 ###############################################################################
@@ -94,8 +94,7 @@ def test_reproject_2():
 
     if cs != cs_expected:
         print('Got: ', cs)
-        gdaltest.post_reason('got wrong checksum')
-        return 'fail'
+        pytest.fail('got wrong checksum')
     return 'success'
 
 ###############################################################################
diff --git a/autotest/alg/sieve.py b/autotest/alg/sieve.py
index e007c9227b4f..332aac2dd0a0 100755
--- a/autotest/alg/sieve.py
+++ b/autotest/alg/sieve.py
@@ -35,6 +35,7 @@
 import gdaltest
 
 from osgeo import gdal
+import pytest
 
 ###############################################################################
 # Test a fairly default case.
@@ -63,8 +64,7 @@ def test_sieve_1():
 
     if cs != cs_expected:
         print('Got: ', cs)
-        gdaltest.post_reason('got wrong checksum')
-        return 'fail'
+        pytest.fail('got wrong checksum')
     return 'success'
 
 ###############################################################################
@@ -94,8 +94,7 @@ def test_sieve_2():
 
     if cs != cs_expected:
         print('Got: ', cs)
-        gdaltest.post_reason('got wrong checksum')
-        return 'fail'
+        pytest.fail('got wrong checksum')
     return 'success'
 
 ###############################################################################
@@ -126,8 +125,7 @@ def test_sieve_3():
 
     if cs != cs_expected:
         print('Got: ', cs)
-        gdaltest.post_reason('got wrong checksum')
-        return 'fail'
+        pytest.fail('got wrong checksum')
     return 'success'
 
 ###############################################################################
@@ -157,8 +155,7 @@ def test_sieve_4():
 
     if cs != cs_expected:
         print('Got: ', cs)
-        gdaltest.post_reason('got wrong checksum')
-        return 'fail'
+        pytest.fail('got wrong checksum')
     return 'success'
 
 
@@ -189,8 +186,7 @@ def test_sieve_5():
 
     if cs != cs_expected:
         print('Got: ', cs)
-        gdaltest.post_reason('got wrong checksum')
-        return 'fail'
+        pytest.fail('got wrong checksum')
     return 'success'
 
 ###############################################################################
@@ -228,8 +224,7 @@ def test_sieve_6():
     cs = band.Checksum()
     if (size == 102 and cs != 60955) or (size == 3002 and cs != 63178):
         print('Got: ', cs)
-        gdaltest.post_reason('got wrong checksum')
-        return 'fail'
+        pytest.fail('got wrong checksum')
 
     return 'success'
 
@@ -286,8 +281,7 @@ def test_sieve_7():
 
     if cs != cs_expected:
         print('Got: ', cs)
-        gdaltest.post_reason('got wrong checksum')
-        return 'fail'
+        pytest.fail('got wrong checksum')
     return 'success'
 
 ###############################################################################
@@ -335,8 +329,7 @@ def test_sieve_8():
 
     if cs != cs_expected:
         print('Got: ', cs)
-        gdaltest.post_reason('got wrong checksum')
-        return 'fail'
+        pytest.fail('got wrong checksum')
     return 'success'
 
 
diff --git a/autotest/alg/tps.py b/autotest/alg/tps.py
index c55e0b1b99eb..16eacfe793fa 100755
--- a/autotest/alg/tps.py
+++ b/autotest/alg/tps.py
@@ -57,8 +57,7 @@ def test_tps_1():
         transformer = gdal.Transformer(ds, None,
                                        ['DST_SRS=' + utm_wkt,
                                         'METHOD=GCP_TPS'])
-    if transformer is not None:
-        return 'fail'
+    assert transformer is None
 
     return 'success'
 
diff --git a/autotest/alg/warp.py b/autotest/alg/warp.py
index 56c0a87ad32c..0849d8e65c8c 100755
--- a/autotest/alg/warp.py
+++ b/autotest/alg/warp.py
@@ -41,6 +41,7 @@
 from osgeo import osr
 
 import gdaltest
+import pytest
 
 ###############################################################################
 # Verify that we always getting the same image when warping.
@@ -61,9 +62,7 @@ def test_warp_1():
     ds = None
     ref_ds = None
 
-    if maxdiff > 1:
-        gdaltest.post_reason('Image too different from reference')
-        return 'fail'
+    assert maxdiff <= 1, 'Image too different from reference'
 
     return 'success'
 
@@ -80,9 +79,7 @@ def test_warp_1_short():
     ds = None
     ref_ds = None
 
-    if maxdiff > 1:
-        gdaltest.post_reason('Image too different from reference')
-        return 'fail'
+    assert maxdiff <= 1, 'Image too different from reference'
 
     return 'success'
 
@@ -99,9 +96,7 @@ def test_warp_1_ushort():
     ds = None
     ref_ds = None
 
-    if maxdiff > 1:
-        gdaltest.post_reason('Image too different from reference')
-        return 'fail'
+    assert maxdiff <= 1, 'Image too different from reference'
 
     return 'success'
 
@@ -118,9 +113,7 @@ def test_warp_1_float():
     ds = None
     ref_ds = None
 
-    if maxdiff > 1:
-        gdaltest.post_reason('Image too different from reference')
-        return 'fail'
+    assert maxdiff <= 1, 'Image too different from reference'
 
     return 'success'
 
@@ -137,9 +130,7 @@ def test_warp_2():
     ds = None
     ref_ds = None
 
-    if maxdiff > 1:
-        gdaltest.post_reason('Image too different from reference')
-        return 'fail'
+    assert maxdiff <= 1, 'Image too different from reference'
 
     return 'success'
 
@@ -156,9 +147,7 @@ def test_warp_2_short():
     ds = None
     ref_ds = None
 
-    if maxdiff > 1:
-        gdaltest.post_reason('Image too different from reference')
-        return 'fail'
+    assert maxdiff <= 1, 'Image too different from reference'
 
     return 'success'
 
@@ -175,9 +164,7 @@ def test_warp_2_ushort():
     ds = None
     ref_ds = None
 
-    if maxdiff > 1:
-        gdaltest.post_reason('Image too different from reference')
-        return 'fail'
+    assert maxdiff <= 1, 'Image too different from reference'
 
     return 'success'
 
@@ -194,9 +181,7 @@ def test_warp_2_downsize():
     ds = None
     ref_ds = None
 
-    if maxdiff > 1:
-        gdaltest.post_reason('Image too different from reference')
-        return 'fail'
+    assert maxdiff <= 1, 'Image too different from reference'
 
     return 'success'
 
@@ -213,9 +198,7 @@ def test_warp_3():
     ds = None
     ref_ds = None
 
-    if maxdiff > 1:
-        gdaltest.post_reason('Image too different from reference')
-        return 'fail'
+    assert maxdiff <= 1, 'Image too different from reference'
 
     return 'success'
 
@@ -232,9 +215,7 @@ def test_warp_3_short():
     ds = None
     ref_ds = None
 
-    if maxdiff > 1:
-        gdaltest.post_reason('Image too different from reference')
-        return 'fail'
+    assert maxdiff <= 1, 'Image too different from reference'
 
     return 'success'
 
@@ -251,9 +232,7 @@ def test_warp_3_ushort():
     ds = None
     ref_ds = None
 
-    if maxdiff > 1:
-        gdaltest.post_reason('Image too different from reference')
-        return 'fail'
+    assert maxdiff <= 1, 'Image too different from reference'
 
     return 'success'
 
@@ -270,9 +249,7 @@ def test_warp_3_downsize():
     ds = None
     ref_ds = None
 
-    if maxdiff > 1:
-        gdaltest.post_reason('Image too different from reference')
-        return 'fail'
+    assert maxdiff <= 1, 'Image too different from reference'
 
     return 'success'
 
@@ -289,9 +266,7 @@ def test_warp_3_float_downsize():
     ds = None
     ref_ds = None
 
-    if maxdiff > 1:
-        gdaltest.post_reason('Image too different from reference')
-        return 'fail'
+    assert maxdiff <= 1, 'Image too different from reference'
 
     return 'success'
 
@@ -308,9 +283,7 @@ def test_warp_4():
     ds = None
     ref_ds = None
 
-    if maxdiff > 1:
-        gdaltest.post_reason('Image too different from reference')
-        return 'fail'
+    assert maxdiff <= 1, 'Image too different from reference'
 
     return 'success'
 
@@ -327,9 +300,7 @@ def test_warp_4_short():
     ds = None
     ref_ds = None
 
-    if maxdiff > 1:
-        gdaltest.post_reason('Image too different from reference')
-        return 'fail'
+    assert maxdiff <= 1, 'Image too different from reference'
 
     return 'success'
 
@@ -346,9 +317,7 @@ def test_warp_4_ushort():
     ds = None
     ref_ds = None
 
-    if maxdiff > 1:
-        gdaltest.post_reason('Image too different from reference')
-        return 'fail'
+    assert maxdiff <= 1, 'Image too different from reference'
 
     return 'success'
 
@@ -365,9 +334,7 @@ def test_warp_4_downsize():
     ds = None
     ref_ds = None
 
-    if maxdiff > 1:
-        gdaltest.post_reason('Image too different from reference')
-        return 'fail'
+    assert maxdiff <= 1, 'Image too different from reference'
 
     return 'success'
 
@@ -384,9 +351,7 @@ def test_warp_4_short_downsize():
     ds = None
     ref_ds = None
 
-    if maxdiff > 1:
-        gdaltest.post_reason('Image too different from reference')
-        return 'fail'
+    assert maxdiff <= 1, 'Image too different from reference'
 
     return 'success'
 
@@ -403,9 +368,7 @@ def test_warp_4_float_downsize():
     ds = None
     ref_ds = None
 
-    if maxdiff > 1:
-        gdaltest.post_reason('Image too different from reference')
-        return 'fail'
+    assert maxdiff <= 1, 'Image too different from reference'
 
     return 'success'
 
@@ -422,9 +385,7 @@ def test_warp_5():
     ds = None
     ref_ds = None
 
-    if maxdiff > 1:
-        gdaltest.post_reason('Image too different from reference')
-        return 'fail'
+    assert maxdiff <= 1, 'Image too different from reference'
 
     return 'success'
 
@@ -441,9 +402,7 @@ def test_warp_5_downsize():
     ds = None
     ref_ds = None
 
-    if maxdiff > 1:
-        gdaltest.post_reason('Image too different from reference')
-        return 'fail'
+    assert maxdiff <= 1, 'Image too different from reference'
 
     return 'success'
 
@@ -495,9 +454,7 @@ def test_warp_9():
     ds = None
     ref_ds = None
 
-    if maxdiff > 1:
-        gdaltest.post_reason('Image too different from reference')
-        return 'fail'
+    assert maxdiff <= 1, 'Image too different from reference'
 
     return 'success'
 
@@ -514,9 +471,7 @@ def test_warp_10():
     ds = None
     ref_ds = None
 
-    if maxdiff > 1:
-        gdaltest.post_reason('Image too different from reference')
-        return 'fail'
+    assert maxdiff <= 1, 'Image too different from reference'
 
     return 'success'
 
@@ -726,10 +681,7 @@ def warp_19_internal(size, datatype, resampling_string):
 
     gdaltest.tiff_drv.Delete('tmp/testwarp.tif')
 
-    if checksum != checksum_ref:
-        print('got %d, expected %d' % (checksum, checksum_ref))
-        gdaltest.post_reason('Result different from source')
-        return 'fail'
+    assert checksum == checksum_ref, 'Result different from source'
 
     gdaltest.tiff_drv.Delete('tmp/test.tif')
 
@@ -764,9 +716,8 @@ def test_warp_19():
         print('Testing size = %d ...' % size)
         for method in methods:
             for datatype in datatypes:
-                if warp_19_internal(size, datatype, method) != 'success':
-                    print('fail with size = %d, data type = %d and method %s' % (size, datatype, method))
-                    return 'fail'
+                assert warp_19_internal(size, datatype, method) == 'success', \
+                    ('fail with size = %d, data type = %d and method %s' % (size, datatype, method))
 
     return 'success'
 
@@ -949,9 +900,7 @@ def test_warp_24():
     ds = gdal.Warp('', ds_ref, options='-of MEM -r bilinear')
     cs = ds.GetRasterBand(1).Checksum()
 
-    if cs != cs_ref:
-        gdaltest.post_reason('did not get expected checksum')
-        return 'fail'
+    assert cs == cs_ref, 'did not get expected checksum'
 
     return 'success'
 
@@ -965,9 +914,7 @@ def test_warp_25():
     cs = ds.GetRasterBand(1).Checksum()
     ds = None
 
-    if cs != 4672:
-        gdaltest.post_reason('did not get expected checksum')
-        return 'fail'
+    assert cs == 4672, 'did not get expected checksum'
 
     return 'success'
 
@@ -987,9 +934,7 @@ def test_warp_26():
     cs = ds.GetRasterBand(1).Checksum()
     ds = None
 
-    if cs != 4672:
-        gdaltest.post_reason('did not get expected checksum')
-        return 'fail'
+    assert cs == 4672, 'did not get expected checksum'
 
     os.unlink('tmp/warp_25_gcp.vrt')
     os.unlink('tmp/warp_25_warp.vrt')
@@ -1063,8 +1008,7 @@ def test_warp_27():
     ref_cs = ds.GetRasterBand(1).Checksum()
     ds = None
 
-    if cs != ref_cs:
-        return 'fail'
+    assert cs == ref_cs
 
     gdal.Unlink('tmp/warp_27.tif')
     gdal.Unlink('tmp/warp_27_ref.tif')
@@ -1081,11 +1025,7 @@ def test_warp_28():
     ds = gdal.Open('data/utm_alpha_noinit.vrt')
     cs1 = ds.GetRasterBand(1).Checksum()
     cs2 = ds.GetRasterBand(2).Checksum()
-    if cs1 == 0 or cs2 == 0:
-        gdaltest.post_reason('bad checksum')
-        print(cs1)
-        print(cs2)
-        return 'fail'
+    assert not (cs1 == 0 or cs2 == 0), 'bad checksum'
     ds = None
 
     return 'success'
@@ -1109,8 +1049,7 @@ def test_warp_29():
     gdal.SetConfigOption('GDAL_NUM_THREADS', old_val)
     gdal.SetConfigOption('WARP_THREAD_CHUNK_SIZE', None)
 
-    if cs_monothread != cs_multithread:
-        return 'fail'
+    assert cs_monothread == cs_multithread
 
     old_val = gdal.GetConfigOption('GDAL_NUM_THREADS')
     gdal.SetConfigOption('GDAL_NUM_THREADS', '2')
@@ -1121,8 +1060,7 @@ def test_warp_29():
     gdal.SetConfigOption('GDAL_NUM_THREADS', old_val)
     gdal.SetConfigOption('WARP_THREAD_CHUNK_SIZE', None)
 
-    if cs_monothread != cs_multithread:
-        return 'fail'
+    assert cs_monothread == cs_multithread
 
     src_ds = gdal.Open('../gcore/data/byte.tif')
 
@@ -1135,8 +1073,7 @@ def test_warp_29():
     gdal.SetConfigOption('WARP_THREAD_CHUNK_SIZE', None)
     ds = None
 
-    if got_cs != src_ds.GetRasterBand(1).Checksum():
-        return 'fail'
+    assert got_cs == src_ds.GetRasterBand(1).Checksum()
 
     ds = gdal.Open('data/byte_tps.vrt')
     old_val = gdal.GetConfigOption('GDAL_NUM_THREADS')
@@ -1147,8 +1084,7 @@ def test_warp_29():
     gdal.SetConfigOption('WARP_THREAD_CHUNK_SIZE', None)
     ds = None
 
-    if got_cs != src_ds.GetRasterBand(1).Checksum():
-        return 'fail'
+    assert got_cs == src_ds.GetRasterBand(1).Checksum()
 
     src_ds = None
 
@@ -1210,8 +1146,7 @@ def test_warp_30():
                               cbk_user_data)  # Progress callback user data
     gdal.PopErrorHandler()
 
-    if ret == 0:
-        return 'fail'
+    assert ret != 0
 
     old_val = gdal.GetConfigOption('GDAL_NUM_THREADS')
     gdal.SetConfigOption('GDAL_NUM_THREADS', '2')
@@ -1228,8 +1163,7 @@ def test_warp_30():
     gdal.PopErrorHandler()
     gdal.SetConfigOption('GDAL_NUM_THREADS', old_val)
 
-    if ret == 0:
-        return 'fail'
+    assert ret != 0
 
     gdal.Unlink('/vsimem/warp_30.tif')
 
@@ -1250,9 +1184,7 @@ def test_warp_31():
     ds = None
     ref_ds = None
 
-    if maxdiff > 1:
-        gdaltest.post_reason('Image too different from reference')
-        return 'fail'
+    assert maxdiff <= 1, 'Image too different from reference'
 
     return 'success'
 
@@ -1271,9 +1203,7 @@ def test_warp_32():
     ds = None
     ref_ds = None
 
-    if maxdiff > 1:
-        gdaltest.post_reason('Image too different from reference')
-        return 'fail'
+    assert maxdiff <= 1, 'Image too different from reference'
 
     return 'success'
 
@@ -1292,9 +1222,7 @@ def test_warp_33():
     ds = None
     ref_ds = None
 
-    if maxdiff > 1:
-        gdaltest.post_reason('Image too different from reference')
-        return 'fail'
+    assert maxdiff <= 1, 'Image too different from reference'
 
     return 'success'
 
@@ -1313,9 +1241,7 @@ def test_warp_34():
     ds = None
     ref_ds = None
 
-    if maxdiff > 1:
-        gdaltest.post_reason('Image too different from reference')
-        return 'fail'
+    assert maxdiff <= 1, 'Image too different from reference'
 
     return 'success'
 
@@ -1334,9 +1260,7 @@ def test_warp_35():
     ds = None
     ref_ds = None
 
-    if maxdiff > 1:
-        gdaltest.post_reason('Image too different from reference')
-        return 'fail'
+    assert maxdiff <= 1, 'Image too different from reference'
 
     return 'success'
 
@@ -1355,9 +1279,7 @@ def test_warp_36():
     ds = None
     ref_ds = None
 
-    if maxdiff > 1:
-        gdaltest.post_reason('Image too different from reference')
-        return 'fail'
+    assert maxdiff <= 1, 'Image too different from reference'
 
     return 'success'
 
@@ -1379,8 +1301,7 @@ def test_warp_37():
     tmp_ds = gdal.AutoCreateWarpedVRT(src_ds, None, dst_wkt)
     gdal.PopErrorHandler()
     gdal.ErrorReset()
-    if tmp_ds is not None:
-        return 'fail'
+    assert tmp_ds is None
 
     # Incompatible projection (UTM 40 is on the other side of the earth w.r.t UTM 11)
     sr = osr.SpatialReference()
@@ -1392,8 +1313,7 @@ def test_warp_37():
     tmp_ds = gdal.AutoCreateWarpedVRT(src_ds, None, dst_wkt)
     gdal.PopErrorHandler()
     gdal.ErrorReset()
-    if tmp_ds is not None:
-        return 'fail'
+    assert tmp_ds is None
 
     return 'success'
 
@@ -1425,10 +1345,7 @@ def test_warp_38():
 
     # Should exactly match the source file.
     exp_cs = 30546
-    if cs != exp_cs:
-        gdaltest.post_reason('Got %d instead of expected checksum %d.' % (
-            cs, exp_cs))
-        return 'fail'
+    assert cs == exp_cs
 
     os.unlink(out_file)
     return 'success'
@@ -1461,10 +1378,7 @@ def test_warp_39():
 
     # Should exactly match the source file.
     exp_cs = 30546
-    if cs != exp_cs:
-        gdaltest.post_reason('Got %d instead of expected checksum %d.' % (
-            cs, exp_cs))
-        return 'fail'
+    assert cs == exp_cs
 
     os.unlink(out_file)
     return 'success'
@@ -1485,9 +1399,7 @@ def test_warp_40():
     ds = None
     ref_ds = None
 
-    if maxdiff > 1:
-        gdaltest.post_reason('Image too different from reference')
-        return 'fail'
+    assert maxdiff <= 1, 'Image too different from reference'
 
     return 'success'
 
@@ -1511,15 +1423,12 @@ def test_warp_41():
 </VRTDataset>""")
 
     vrt_ds = gdal.AutoCreateWarpedVRT(src_ds, None, None, gdal.GRA_NearestNeighbour, 0.3)
-    if vrt_ds.RasterXSize != src_ds.RasterXSize:
-        return 'fail'
-    if vrt_ds.RasterYSize != src_ds.RasterYSize:
-        return 'fail'
+    assert vrt_ds.RasterXSize == src_ds.RasterXSize
+    assert vrt_ds.RasterYSize == src_ds.RasterYSize
     src_gt = src_ds.GetGeoTransform()
     vrt_gt = vrt_ds.GetGeoTransform()
     for i in range(6):
-        if abs(src_gt[i] - vrt_gt[i]) > 1e-5:
-            return 'fail'
+        assert abs(src_gt[i] - vrt_gt[i]) <= 1e-5
 
     return 'success'
 
@@ -1540,9 +1449,7 @@ def test_warp_42():
     ds = None
     ref_ds = None
 
-    if maxdiff > 1:
-        gdaltest.post_reason('Image too different from reference')
-        return 'fail'
+    assert maxdiff <= 1, 'Image too different from reference'
 
     return 'success'
 
@@ -1561,9 +1468,7 @@ def test_warp_43():
     ds = None
     ref_ds = None
 
-    if maxdiff > 1:
-        gdaltest.post_reason('Image too different from reference')
-        return 'fail'
+    assert maxdiff <= 1, 'Image too different from reference'
 
     return 'success'
 
@@ -1582,9 +1487,7 @@ def test_warp_44():
     ds = None
     ref_ds = None
 
-    if maxdiff > 1:
-        gdaltest.post_reason('Image too different from reference')
-        return 'fail'
+    assert maxdiff <= 1, 'Image too different from reference'
 
     return 'success'
 
@@ -1603,9 +1506,7 @@ def test_warp_45():
     ds = None
     ref_ds = None
 
-    if maxdiff > 1:
-        gdaltest.post_reason('Image too different from reference')
-        return 'fail'
+    assert maxdiff <= 1, 'Image too different from reference'
 
     return 'success'
 
@@ -1624,9 +1525,7 @@ def test_warp_46():
     ds = None
     ref_ds = None
 
-    if maxdiff > 1:
-        gdaltest.post_reason('Image too different from reference')
-        return 'fail'
+    assert maxdiff <= 1, 'Image too different from reference'
 
     return 'success'
 
@@ -1645,9 +1544,7 @@ def test_warp_47():
     ds = None
     ref_ds = None
 
-    if maxdiff > 1:
-        gdaltest.post_reason('Image too different from reference')
-        return 'fail'
+    assert maxdiff <= 1, 'Image too different from reference'
 
     return 'success'
 
@@ -1666,9 +1563,7 @@ def test_warp_48():
     ds = None
     ref_ds = None
 
-    if maxdiff > 1:
-        gdaltest.post_reason('Image too different from reference')
-        return 'fail'
+    assert maxdiff <= 1, 'Image too different from reference'
 
     return 'success'
 
@@ -1687,9 +1582,7 @@ def test_warp_49():
     ds = None
     ref_ds = None
 
-    if maxdiff > 1:
-        gdaltest.post_reason('Image too different from reference')
-        return 'fail'
+    assert maxdiff <= 1, 'Image too different from reference'
 
     return 'success'
 
@@ -1708,9 +1601,7 @@ def test_warp_50():
     ds = None
     ref_ds = None
 
-    if maxdiff > 1:
-        gdaltest.post_reason('Image too different from reference')
-        return 'fail'
+    assert maxdiff <= 1, 'Image too different from reference'
 
     return 'success'
 
@@ -1729,9 +1620,7 @@ def test_warp_51():
     ds = None
     ref_ds = None
 
-    if maxdiff > 1:
-        gdaltest.post_reason('Image too different from reference')
-        return 'fail'
+    assert maxdiff <= 1, 'Image too different from reference'
 
     return 'success'
 
@@ -1775,14 +1664,10 @@ def test_warp_52():
                        resampleAlg=gdal.GRA_Cubic)
 
     end = time.time()
-    if end - start > 5:
-        gdaltest.post_reason('processing time was way too long')
-        return 'fail'
+    assert end - start <= 5, 'processing time was way too long'
 
     cs = out_ds.GetRasterBand(4).Checksum()
-    if cs != 3188:
-        print(cs)
-        return 'fail'
+    assert cs == 3188
 
     return 'success'
 
@@ -1819,10 +1704,7 @@ def test_warp_53():
                 if cs1 not in expected_cs or cs2 not in [3903, 4138]:
                     print(typestr)
                     print(option)
-                    print(alg_name)
-                    print(cs1)
-                    print(cs2)
-                    return 'fail'
+                    pytest.fail(alg_name)
 
     return 'success'
 
@@ -1839,11 +1721,7 @@ def test_warp_54():
     for i in range(4):
         expected_cs = src_ds.GetRasterBand(i + 1).Checksum()
         got_cs = dst_ds.GetRasterBand(i + 1).Checksum()
-        if expected_cs != got_cs:
-            print(i)
-            print(got_cs)
-            print(expected_cs)
-            return 'fail'
+        assert expected_cs == got_cs, i
 
     # Int16
     src_ds = gdal.Translate('', '../gcore/data/stefan_full_rgba.tif',
@@ -1852,11 +1730,7 @@ def test_warp_54():
     for i in range(4):
         expected_cs = src_ds.GetRasterBand(i + 1).Checksum()
         got_cs = dst_ds.GetRasterBand(i + 1).Checksum()
-        if expected_cs != got_cs:
-            print(i)
-            print(got_cs)
-            print(expected_cs)
-            return 'fail'
+        assert expected_cs == got_cs, i
 
     # Test NBITS
     src_ds = gdal.Translate('', '../gcore/data/stefan_full_rgba.tif',
@@ -1867,11 +1741,7 @@ def test_warp_54():
     for i in range(4):
         expected_cs = src_ds.GetRasterBand(i + 1).Checksum()
         got_cs = dst_ds.GetRasterBand(i + 1).Checksum()
-        if expected_cs != got_cs:
-            print(i)
-            print(got_cs)
-            print(expected_cs)
-            return 'fail'
+        assert expected_cs == got_cs, i
     dst_ds = None
 
     gdal.Unlink('/vsimem/warp_54.tif')
@@ -1887,9 +1757,7 @@ def test_warp_55():
 
     ds = gdal.Open('data/warpedvrt_with_ovr.vrt')
     cs = ds.GetRasterBand(1).GetOverview(0).Checksum()
-    if cs != 25128:
-        print(cs)
-        return 'fail'
+    assert cs == 25128
     ds = None
 
     return 'success'
@@ -1923,9 +1791,8 @@ def test_warp_56():
 
         exp = 0 if off < 1 else 100 * (off - 1)**2
         warped = pix_ds.GetRasterBand(1).ReadAsArray()[0, 0]
-        if abs(warped - exp) > 0.6:
-            gdaltest.post_reason('offset: {}, expected: {:.0f}, got: {}'.format(off, exp, warped))
-            return 'fail'
+        assert abs(warped - exp) <= 0.6, \
+            'offset: {}, expected: {:.0f}, got: {}'.format(off, exp, warped)
 
     return 'success'
 
diff --git a/autotest/gcore/asyncreader.py b/autotest/gcore/asyncreader.py
index c666a1be700f..cc37db6b26e6 100755
--- a/autotest/gcore/asyncreader.py
+++ b/autotest/gcore/asyncreader.py
@@ -44,10 +44,8 @@ def test_asyncreader_1():
     asyncreader = ds.BeginAsyncReader(0, 0, ds.RasterXSize, ds.RasterYSize)
     buf = asyncreader.GetBuffer()
     result = asyncreader.GetNextUpdatedRegion(0)
-    if result != [gdal.GARIO_COMPLETE, 0, 0, ds.RasterXSize, ds.RasterYSize]:
-        gdaltest.post_reason('wrong return values for GetNextUpdatedRegion()')
-        print(result)
-        return 'fail'
+    assert result == [gdal.GARIO_COMPLETE, 0, 0, ds.RasterXSize, ds.RasterYSize], \
+        'wrong return values for GetNextUpdatedRegion()'
     ds.EndAsyncReader(asyncreader)
     asyncreader = None
 
@@ -62,11 +60,7 @@ def test_asyncreader_1():
     gdal.Unlink('/vsimem/asyncresult.tif')
 
     for i, csum in enumerate(cs):
-        if csum != expected_cs[i]:
-            gdaltest.post_reason('did not get expected checksum for band %d' % (i + 1))
-            print(csum)
-            print(expected_cs[i])
-            return 'fail'
+        assert csum == expected_cs[i], ('did not get expected checksum for band %d' % (i + 1))
 
     return 'success'
 
diff --git a/autotest/gcore/basic_test.py b/autotest/gcore/basic_test.py
index 6974d8be255b..b0dc74eb63cb 100755
--- a/autotest/gcore/basic_test.py
+++ b/autotest/gcore/basic_test.py
@@ -77,10 +77,7 @@ def test_basic_test_strace_non_existing_file():
         if line.find('non_existing_ds') >= 0:
             interesting_lines += [ line ]
     # Only 3 calls on the file are legit: open(), stat() and readlink()
-    if len(interesting_lines) > 3:
-        gdaltest.post_reason('too many system calls accessing file')
-        print(interesting_lines)
-        return 'fail'
+    assert len(interesting_lines) <= 3, 'too many system calls accessing file'
 
     return 'success'
 
@@ -147,20 +144,15 @@ def basic_test_7_internal():
     except:
         # Special case: we should still be able to get the error message
         # until we call a new GDAL function
-        if not matches_non_existing_error_msg(gdal.GetLastErrorMsg()):
-            gdaltest.post_reason('did not get expected error message, got %s' % gdal.GetLastErrorMsg())
-            return 'fail'
+        assert matches_non_existing_error_msg(gdal.GetLastErrorMsg()), \
+            ('did not get expected error message, got %s' % gdal.GetLastErrorMsg())
 
-        if gdal.GetLastErrorType() == 0:
-            gdaltest.post_reason('did not get expected error type')
-            return 'fail'
+        assert gdal.GetLastErrorType() != 0, 'did not get expected error type'
 
         # Should issue an implicit CPLErrorReset()
         gdal.GetCacheMax()
 
-        if gdal.GetLastErrorType() != 0:
-            gdaltest.post_reason('got unexpected error type')
-            return 'fail'
+        assert gdal.GetLastErrorType() == 0, 'got unexpected error type'
 
         return 'success'
 
@@ -180,27 +172,21 @@ def test_basic_test_7():
 def test_basic_test_8():
 
     ret = gdal.VersionInfo('RELEASE_DATE')
-    if len(ret) != 8:
-        print(ret)
-        return 'fail'
+    assert len(ret) == 8
 
     python_exe = sys.executable
     if sys.platform == 'win32':
         python_exe = python_exe.replace('\\', '/')
 
     ret = gdaltest.runexternal(python_exe + ' basic_test.py LICENSE 0')
-    if ret.find('GDAL/OGR is released under the MIT/X license') != 0 and ret.find('GDAL/OGR Licensing') < 0:
-        print(ret)
-        return 'fail'
+    assert ret.find('GDAL/OGR is released under the MIT/X license') == 0 or ret.find('GDAL/OGR Licensing') >= 0
 
     f = open('tmp/LICENSE.TXT', 'wt')
     f.write('fake_license')
     f.close()
     ret = gdaltest.runexternal(python_exe + ' basic_test.py LICENSE 1')
     os.unlink('tmp/LICENSE.TXT')
-    if ret.find('fake_license') != 0 and ret.find('GDAL/OGR Licensing') < 0:
-        print(ret)
-        return 'fail'
+    assert ret.find('fake_license') == 0 or ret.find('GDAL/OGR Licensing') >= 0
 
     return 'success'
 
@@ -223,14 +209,11 @@ def test_basic_test_9():
     gdal.Error(1, 2, 'test')
     gdal.PopErrorHandler()
 
-    if gdaltest.eErrClass != 1:
-        return 'fail'
+    assert gdaltest.eErrClass == 1
 
-    if gdaltest.err_no != 2:
-        return 'fail'
+    assert gdaltest.err_no == 2
 
-    if gdaltest.msg != 'test':
-        return 'fail'
+    assert gdaltest.msg == 'test'
 
     return 'success'
 
@@ -262,14 +245,11 @@ def test_basic_test_10():
     gdal.Error(1, 2, 'test')
     gdal.PopErrorHandler()
 
-    if error_handler.eErrClass != 1:
-        return 'fail'
+    assert error_handler.eErrClass == 1
 
-    if error_handler.err_no != 2:
-        return 'fail'
+    assert error_handler.err_no == 2
 
-    if error_handler.msg != 'test':
-        return 'fail'
+    assert error_handler.msg == 'test'
 
     return 'success'
 
@@ -280,85 +260,65 @@ def test_basic_test_10():
 def test_basic_test_11():
 
     ds = gdal.OpenEx('data/byte.tif')
-    if ds is None:
-        return 'fail'
+    assert ds is not None
 
     ds = gdal.OpenEx('data/byte.tif', gdal.OF_RASTER)
-    if ds is None:
-        return 'fail'
+    assert ds is not None
 
     ds = gdal.OpenEx('data/byte.tif', gdal.OF_VECTOR)
-    if ds is not None:
-        return 'fail'
+    assert ds is None
 
     ds = gdal.OpenEx('data/byte.tif', gdal.OF_RASTER | gdal.OF_VECTOR)
-    if ds is None:
-        return 'fail'
+    assert ds is not None
 
     ds = gdal.OpenEx('data/byte.tif', gdal.OF_ALL)
-    if ds is None:
-        return 'fail'
+    assert ds is not None
 
     ds = gdal.OpenEx('data/byte.tif', gdal.OF_UPDATE)
-    if ds is None:
-        return 'fail'
+    assert ds is not None
 
     ds = gdal.OpenEx('data/byte.tif', gdal.OF_RASTER | gdal.OF_VECTOR | gdal.OF_UPDATE | gdal.OF_VERBOSE_ERROR)
-    if ds is None:
-        return 'fail'
+    assert ds is not None
 
     ds = gdal.OpenEx('data/byte.tif', allowed_drivers=[])
-    if ds is None:
-        return 'fail'
+    assert ds is not None
 
     ds = gdal.OpenEx('data/byte.tif', allowed_drivers=['GTiff'])
-    if ds is None:
-        return 'fail'
+    assert ds is not None
 
     ds = gdal.OpenEx('data/byte.tif', allowed_drivers=['PNG'])
-    if ds is not None:
-        return 'fail'
+    assert ds is None
 
     with gdaltest.error_handler():
         ds = gdal.OpenEx('data/byte.tif', open_options=['FOO'])
-    if ds is None:
-        return 'fail'
+    assert ds is not None
 
     ar_ds = [gdal.OpenEx('data/byte.tif', gdal.OF_SHARED) for _ in range(1024)]
-    if ar_ds[1023] is None:
-        return 'fail'
+    assert ar_ds[1023] is not None
     ar_ds = None
 
     ds = gdal.OpenEx('../ogr/data/poly.shp', gdal.OF_RASTER)
-    if ds is not None:
-        return 'fail'
+    assert ds is None
 
     ds = gdal.OpenEx('../ogr/data/poly.shp', gdal.OF_VECTOR)
-    if ds is None:
-        return 'fail'
-    if ds.GetLayerCount() != 1:
-        return 'fail'
-    if ds.GetLayer(0) is None:
-        return 'fail'
+    assert ds is not None
+    assert ds.GetLayerCount() == 1
+    assert ds.GetLayer(0) is not None
     ds.GetLayer(0).GetMetadata()
 
     ds = gdal.OpenEx('../ogr/data/poly.shp', allowed_drivers=['ESRI Shapefile'])
-    if ds is None:
-        return 'fail'
+    assert ds is not None
 
     ds = gdal.OpenEx('../ogr/data/poly.shp', gdal.OF_RASTER | gdal.OF_VECTOR)
-    if ds is None:
-        return 'fail'
+    assert ds is not None
 
     ds = gdal.OpenEx('non existing')
-    if ds is not None or gdal.GetLastErrorMsg() != '':
-        return 'fail'
+    assert ds is None and gdal.GetLastErrorMsg() == ''
 
     gdal.PushErrorHandler('CPLQuietErrorHandler')
     ds = gdal.OpenEx('non existing', gdal.OF_VERBOSE_ERROR)
     gdal.PopErrorHandler()
-    if ds is not None or gdal.GetLastErrorMsg() == '':
-        return 'fail'
+    assert ds is None and gdal.GetLastErrorMsg() != ''
 
     old_use_exceptions_status = gdal.GetUseExceptions()
     gdal.UseExceptions()
@@ -369,8 +329,7 @@ def test_basic_test_11():
         got_exception = True
     if old_use_exceptions_status == 0:
         gdal.DontUseExceptions()
-    if not got_exception:
-        return 'fail'
+    assert got_exception
 
     return 'success'
 
@@ -381,40 +340,26 @@ def test_basic_test_11():
 def test_basic_test_12():
 
     ds = gdal.GetDriverByName('MEMORY').Create('bar', 0, 0, 0)
-    if ds.GetDescription() != 'bar':
-        print(ds.GetDescription())
-        return 'fail'
+    assert ds.GetDescription() == 'bar'
     lyr = ds.CreateLayer("foo")
-    if lyr is None:
-        return 'fail'
-    if lyr.GetDescription() != 'foo':
-        print(lyr.GetDescription())
-        return 'fail'
+    assert lyr is not None
+    assert lyr.GetDescription() == 'foo'
     from osgeo import ogr
-    if lyr.TestCapability(ogr.OLCCreateField) != 1:
-        return 'fail'
-    if ds.GetLayerCount() != 1:
-        return 'fail'
+    assert lyr.TestCapability(ogr.OLCCreateField) == 1
+    assert ds.GetLayerCount() == 1
     lyr = ds.GetLayerByName("foo")
-    if lyr is None:
-        return 'fail'
+    assert lyr is not None
     lyr = ds.GetLayerByIndex(0)
-    if lyr is None:
-        return 'fail'
+    assert lyr is not None
     lyr = ds.GetLayer(0)
-    if lyr is None:
-        return 'fail'
+    assert lyr is not None
     sql_lyr = ds.ExecuteSQL('SELECT * FROM foo')
-    if sql_lyr is None:
-        return 'fail'
+    assert sql_lyr is not None
     ds.ReleaseResultSet(sql_lyr)
     new_lyr = ds.CopyLayer(lyr, 'bar')
-    if new_lyr is None:
-        return 'fail'
-    if ds.DeleteLayer(0) != 0:
-        return 'fail'
-    if ds.DeleteLayer('bar') != 0:
-        return 'fail'
+    assert new_lyr is not None
+    assert ds.DeleteLayer(0) == 0
+    assert ds.DeleteLayer('bar') == 0
     ds.SetStyleTable(ds.GetStyleTable())
     ds = None
 
@@ -441,24 +386,18 @@ def test_basic_test_13():
             ds.SetMetadataItem("ScaleBounds", "True")
             ds.SetMetadataItem("ScaleBounds.MaxScale", "2000000")
 
-        if ds.GetMetadataItem('scalebounds') != 'True':
-            return 'fail'
-        if ds.GetMetadataItem('ScaleBounds') != 'True':
-            return 'fail'
-        if ds.GetMetadataItem('SCALEBOUNDS') != 'True':
-            return 'fail'
-        if ds.GetMetadataItem('ScaleBounds.MinScale') != '0':
-            return 'fail'
-        if ds.GetMetadataItem('ScaleBounds.MaxScale') != '2000000':
-            return 'fail'
+        assert ds.GetMetadataItem('scalebounds') == 'True'
+        assert ds.GetMetadataItem('ScaleBounds') == 'True'
+        assert ds.GetMetadataItem('SCALEBOUNDS') == 'True'
+        assert ds.GetMetadataItem('ScaleBounds.MinScale') == '0'
+        assert ds.GetMetadataItem('ScaleBounds.MaxScale') == '2000000'
     ds = None
 
     ds = gdal.GetDriverByName('MEM').Create('', 1, 1)
     for i in range(200):
         ds.SetMetadataItem("FILENAME_%d" % i, "%d" % i)
     for i in range(200):
-        if ds.GetMetadataItem("FILENAME_%d" % i) != '%d' % i:
-            return 'fail'
+        assert ds.GetMetadataItem("FILENAME_%d" % i) == '%d' % i
 
     return 'success'
 
@@ -471,8 +410,7 @@ def test_basic_test_14():
     ds = gdal.GetDriverByName('MEM').Create('', 1, 1)
 
     ds.SetMetadata('foo')
-    if ds.GetMetadata_List() != ['foo']:
-        return 'fail'
+    assert ds.GetMetadata_List() == ['foo']
 
     try:
         ds.SetMetadata(5)
@@ -481,8 +419,7 @@ def test_basic_test_14():
         pass
 
     ds.SetMetadata(['foo=bar'])
-    if ds.GetMetadata_List() != ['foo=bar']:
-        return 'fail'
+    assert ds.GetMetadata_List() == ['foo=bar']
 
     try:
         ds.SetMetadata([5])
@@ -491,8 +428,7 @@ def test_basic_test_14():
         pass
 
     ds.SetMetadata({'foo': 'baz'})
-    if ds.GetMetadata_List() != ['foo=baz']:
-        return 'fail'
+    assert ds.GetMetadata_List() == ['foo=baz']
 
     try:
         ds.SetMetadata({'foo': 5})
@@ -518,12 +454,10 @@ def test_basic_test_14():
         exec("val = u'\\u00e9ven'")
 
     ds.SetMetadata({'bar': val})
-    if ds.GetMetadata()['bar'] != val:
-        return 'fail'
+    assert ds.GetMetadata()['bar'] == val
 
     ds.SetMetadata({val: 'baz'})
-    if ds.GetMetadata()[val] != 'baz':
-        return 'fail'
+    assert ds.GetMetadata()[val] == 'baz'
 
     try:
         ds.SetMetadata({val: 5})
@@ -568,18 +502,15 @@ def test_basic_test_15():
 
     with gdaltest.error_handler():
         ds = gdal.GetDriverByName('MEM').CreateCopy('', gdal.GetDriverByName('MEM').Create('', 1, 1), callback=basic_test_15_cbk_no_argument)
-    if ds is not None:
-        return 'fail'
+    assert ds is None
 
     with gdaltest.error_handler():
         ds = gdal.GetDriverByName('MEM').CreateCopy('', gdal.GetDriverByName('MEM').Create('', 1, 1), callback=basic_test_15_cbk_no_ret)
-    if ds is None:
-        return 'fail'
+    assert ds is not None
 
     with gdaltest.error_handler():
         ds = gdal.GetDriverByName('MEM').CreateCopy('', gdal.GetDriverByName('MEM').Create('', 1, 1), callback=basic_test_15_cbk_bad_ret)
-    if ds is not None:
-        return 'fail'
+    assert ds is None
 
     return 'success'
 
@@ -591,17 +522,14 @@ def test_basic_test_16():
 
     gdal.ErrorReset()
     gdal.OpenEx('data/byte.tif', open_options=['@UNRECOGNIZED=FOO'])
-    if gdal.GetLastErrorMsg() != '':
-        return 'fail'
+    assert gdal.GetLastErrorMsg() == ''
 
     gdal.ErrorReset()
     gdal.Translate('/vsimem/temp.tif', 'data/byte.tif', options='-co BLOCKYSIZE=10')
     with gdaltest.error_handler():
         gdal.OpenEx('/vsimem/temp.tif', gdal.OF_UPDATE, open_options=['@NUM_THREADS=INVALID'])
     gdal.Unlink('/vsimem/temp.tif')
-    if gdal.GetLastErrorMsg() != 'Invalid value for NUM_THREADS: INVALID':
-        print(gdal.GetLastErrorMsg())
-        return 'fail'
+    assert gdal.GetLastErrorMsg() == 'Invalid value for NUM_THREADS: INVALID'
 
     return 'success'
 
@@ -622,10 +550,8 @@ def test_basic_test_17():
             pass
         gdal.DontUseExceptions()
         ogr.DontUseExceptions()
-        if gdal.GetUseExceptions():
-            return 'fail'
-        if ogr.GetUseExceptions():
-            return 'fail'
+        assert not gdal.GetUseExceptions()
+        assert not ogr.GetUseExceptions()
 
     for _ in range(2):
         ogr.UseExceptions()
@@ -642,13 +568,9 @@ def test_basic_test_17():
         except:
             gdal.DontUseExceptions()
             ogr.DontUseExceptions()
-        if flag:
-            gdaltest.post_reason('expected failure')
-            return 'fail'
-        if gdal.GetUseExceptions():
-            return 'fail'
-        if ogr.GetUseExceptions():
-            return 'fail'
+        assert not flag, 'expected failure'
+        assert not gdal.GetUseExceptions()
+        assert not ogr.GetUseExceptions()
 
     return 'success'
 
diff --git a/autotest/gcore/colortable.py b/autotest/gcore/colortable.py
index 158059c200c2..5486c2366d21 100755
--- a/autotest/gcore/colortable.py
+++ b/autotest/gcore/colortable.py
@@ -66,9 +66,7 @@ def test_colortable_2():
             else:
                 o_v = o_data[j]
 
-            if g_data[j] != o_v:
-                gdaltest.post_reason('color table mismatch')
-                return 'fail'
+            assert g_data[j] == o_v, 'color table mismatch'
 
     return 'success'
 
@@ -86,11 +84,9 @@ def test_colortable_3():
 
     ct.CreateColorRamp(0, (255, 0, 0), 255, (0, 0, 255))
 
-    if ct.GetColorEntry(0) != (255, 0, 0, 255):
-        return 'fail'
+    assert ct.GetColorEntry(0) == (255, 0, 0, 255)
 
-    if ct.GetColorEntry(255) != (0, 0, 255, 255):
-        return 'fail'
+    assert ct.GetColorEntry(255) == (0, 0, 255, 255)
 
     return 'success'
 
diff --git a/autotest/gcore/envi_read.py b/autotest/gcore/envi_read.py
index 37860ba43bfc..b9999fec6bf9 100755
--- a/autotest/gcore/envi_read.py
+++ b/autotest/gcore/envi_read.py
@@ -47,9 +47,7 @@ def test_envi_1():
 
     gdal.SetConfigOption('GDAL_READDIR_LIMIT_ON_OPEN', None)
 
-    if len(filelist) != 2:
-        gdaltest.post_reason('did not get expected file list.')
-        return 'fail'
+    assert len(filelist) == 2, 'did not get expected file list.'
 
     return 'success'
 
diff --git a/autotest/gcore/gcps2geotransform.py b/autotest/gcore/gcps2geotransform.py
index 17a9d00a4043..5ad2683b962f 100755
--- a/autotest/gcore/gcps2geotransform.py
+++ b/autotest/gcore/gcps2geotransform.py
@@ -61,9 +61,8 @@ def test_gcps2gt_1():
         (100.0, 0.0, 410000, 370000),
         (100.0, 200.0, 410000, 368000)
     ]))
-    if not gdaltest.geotransform_equals(
-            gt, (400000.0, 100.0, 0.0, 370000.0, 0.0, -10.0), 0.000001):
-        return 'fail'
+    assert gdaltest.geotransform_equals(
+            gt, (400000.0, 100.0, 0.0, 370000.0, 0.0, -10.0), 0.000001)
 
     return 'success'
 
@@ -79,9 +78,8 @@ def test_gcps2gt_2():
         (100.0, 200.0, 410000, 368000),
         (0.0, 200.0, 400000, 368000.01)
     ]))
-    if not gdaltest.geotransform_equals(
-            gt, (400000.0, 100.0, 0.0, 370000.0025, -5e-05, -9.999975), 0.000001):
-        return 'fail'
+    assert gdaltest.geotransform_equals(
+            gt, (400000.0, 100.0, 0.0, 370000.0025, -5e-05, -9.999975), 0.000001)
 
     return 'success'
 
@@ -98,9 +96,7 @@ def test_gcps2gt_3():
         (100.0, 200.0, 410000, 368000),
         (0.0, 200.0, 400000, 360000)
     ]), approx_ok)
-    if gt is not None:
-        gdaltest.post_reason('Expected failure when no good solution.')
-        return 'fail'
+    assert gt is None, 'Expected failure when no good solution.'
 
     return 'success'
 
@@ -113,9 +109,7 @@ def test_gcps2gt_4():
     gt = gdal.GCPsToGeoTransform(_list2gcps([
         (0.0, 0.0, 400000, 370000),
     ]))
-    if gt is not None:
-        gdaltest.post_reason('Expected failure for single GCP.')
-        return 'fail'
+    assert gt is None, 'Expected failure for single GCP.'
 
     return 'success'
 
@@ -129,9 +123,8 @@ def test_gcps2gt_5():
         (0.0, 0.0, 400000, 370000),
         (100.0, 200.0, 410000, 368000),
     ]))
-    if not gdaltest.geotransform_equals(
-            gt, (400000.0, 100.0, 0.0, 370000.0, 0.0, -10.0), 0.000001):
-        return 'fail'
+    assert gdaltest.geotransform_equals(
+            gt, (400000.0, 100.0, 0.0, 370000.0, 0.0, -10.0), 0.000001)
 
     return 'success'
 
@@ -147,9 +140,8 @@ def test_gcps2gt_6():
         (410000, 368000, 410000, 368000),
         (400000, 368000, 400000, 368000),
     ]))
-    if not gdaltest.geotransform_equals(
-            gt, (0.0, 1.0, 0.0, 0.0, 0.0, 1.0), 0.000001):
-        return 'fail'
+    assert gdaltest.geotransform_equals(
+            gt, (0.0, 1.0, 0.0, 0.0, 0.0, 1.0), 0.000001)
 
     return 'success'
 
@@ -165,9 +157,8 @@ def test_gcps2gt_7():
         (410000, 370000, 410000, 370000),
         (400000, 368000, 400000, 368000),
     ]))
-    if not gdaltest.geotransform_equals(
-            gt, (0.0, 1.0, 0.0, 0.0, 0.0, 1.0), 0.000001):
-        return 'fail'
+    assert gdaltest.geotransform_equals(
+            gt, (0.0, 1.0, 0.0, 0.0, 0.0, 1.0), 0.000001)
 
     return 'success'
 
@@ -187,8 +178,7 @@ def test_gcps2gt_8():
     ]))
     gt_expected = (-87.056612873288, -2.232795668658e-05, 3.178617809303e-05,
                    39.227856615716, 2.6091510188921e-05, 1.596921026218e-05)
-    if not gdaltest.geotransform_equals(gt, gt_expected, 0.00001):
-        return 'fail'
+    assert gdaltest.geotransform_equals(gt, gt_expected, 0.00001)
 
     return 'success'
 
diff --git a/autotest/gcore/gdal_api_proxy.py b/autotest/gcore/gdal_api_proxy.py
index 9f3b49b72bd1..29ec4fec8478 100755
--- a/autotest/gcore/gdal_api_proxy.py
+++ b/autotest/gcore/gdal_api_proxy.py
@@ -51,8 +51,7 @@ def test_gdal_api_proxy_1():
 
     ret = test_py_scripts.run_py_script_as_external_script('.', 'gdal_api_proxy', ' \"%s\" -1' % gdaltest.gdalserver_path, display_live_on_parent_stdout=True)
 
-    if ret.find('Failed:    0') == -1:
-        return 'fail'
+    assert ret.find('Failed:    0') != -1
 
     return 'success'
 
@@ -68,8 +67,7 @@ def test_gdal_api_proxy_2():
     import test_py_scripts
     ret = test_py_scripts.run_py_script_as_external_script('.', 'gdal_api_proxy', ' \"%s\" -2' % gdaltest.gdalserver_path, display_live_on_parent_stdout=True)
 
-    if ret.find('Failed:    0') == -1:
-        return 'fail'
+    assert ret.find('Failed:    0') != -1
 
     return 'success'
 
@@ -92,8 +90,7 @@ def test_gdal_api_proxy_3():
     import test_py_scripts
     ret = test_py_scripts.run_py_script_as_external_script('.', 'gdal_api_proxy', ' \"%s\" -3' % gdaltest.gdalserver_path, display_live_on_parent_stdout=True)
 
-    if ret.find('Failed:    0') == -1:
-        return 'fail'
+    assert ret.find('Failed:    0') != -1
 
     return 'success'
 
@@ -116,8 +113,7 @@ def test_gdal_api_proxy_4():
     import test_py_scripts
     ret = test_py_scripts.run_py_script_as_external_script('.', 'gdal_api_proxy', ' \"%s\" -4' % gdaltest.gdalserver_path, display_live_on_parent_stdout=True)
 
-    if ret.find('Failed:    0') == -1:
-        return 'fail'
+    assert ret.find('Failed:    0') != -1
 
     return 'success'
 
@@ -136,8 +132,7 @@ def test_gdal_api_proxy_sub():
     src_ds = None
 
     drv = gdal.IdentifyDriver('data/byte.tif')
-    if drv.GetDescription() != 'API_PROXY':
-        return 'fail'
+    assert drv.GetDescription() == 'API_PROXY'
 
     ds = gdal.GetDriverByName('GTiff').Create('tmp/byte.tif', 1, 1, 3)
     ds = None
@@ -145,359 +140,258 @@ def test_gdal_api_proxy_sub():
     src_ds = gdal.Open('data/byte.tif')
     ds = gdal.GetDriverByName('GTiff').CreateCopy('tmp/byte.tif', src_ds, options=['TILED=YES'])
     got_cs = ds.GetRasterBand(1).Checksum()
-    if src_cs != got_cs:
-        return 'fail'
+    assert src_cs == got_cs
     ds = None
 
     ds = gdal.Open('tmp/byte.tif', gdal.GA_Update)
 
     ds.SetGeoTransform([1, 2, 3, 4, 5, 6])
     got_gt = ds.GetGeoTransform()
-    if src_gt == got_gt:
-        return 'fail'
+    assert src_gt != got_gt
 
     ds.SetGeoTransform(src_gt)
     got_gt = ds.GetGeoTransform()
-    if src_gt != got_gt:
-        return 'fail'
+    assert src_gt == got_gt
 
-    if ds.GetGCPCount() != 0:
-        return 'fail'
+    assert ds.GetGCPCount() == 0
 
-    if ds.GetGCPProjection() != '':
-        print(ds.GetGCPProjection())
-        return 'fail'
+    assert ds.GetGCPProjection() == ''
 
-    if ds.GetGCPs():
-        return 'fail'
+    assert not ds.GetGCPs()
 
     gcps = [gdal.GCP(0, 1, 2, 3, 4)]
     ds.SetGCPs(gcps, "foo")
 
     got_gcps = ds.GetGCPs()
-    if len(got_gcps) != 1:
-        return 'fail'
+    assert len(got_gcps) == 1
 
-    if got_gcps[0].GCPLine != gcps[0].GCPLine or  \
-       got_gcps[0].GCPPixel != gcps[0].GCPPixel or  \
-       got_gcps[0].GCPX != gcps[0].GCPX or \
-       got_gcps[0].GCPY != gcps[0].GCPY:
-        return 'fail'
+    assert (got_gcps[0].GCPLine == gcps[0].GCPLine and  \
+       got_gcps[0].GCPPixel == gcps[0].GCPPixel and  \
+       got_gcps[0].GCPX == gcps[0].GCPX and \
+       got_gcps[0].GCPY == gcps[0].GCPY)
 
-    if ds.GetGCPProjection() != 'foo':
-        print(ds.GetGCPProjection())
-        return 'fail'
+    assert ds.GetGCPProjection() == 'foo'
 
     ds.SetGCPs([], "")
 
-    if ds.GetGCPs():
-        return 'fail'
+    assert not ds.GetGCPs()
 
     ds.SetProjection('')
     got_prj = ds.GetProjectionRef()
-    if src_prj == got_prj:
-        return 'fail'
+    assert src_prj != got_prj
 
     ds.SetProjection(src_prj)
     got_prj = ds.GetProjectionRef()
-    if src_prj != got_prj:
-        print(src_prj)
-        print(got_prj)
-        return 'fail'
+    assert src_prj == got_prj
 
     ds.GetRasterBand(1).Fill(0)
     got_cs = ds.GetRasterBand(1).Checksum()
-    if got_cs != 0:
-        return 'fail'
+    assert got_cs == 0
 
     ds.GetRasterBand(1).WriteRaster(0, 0, 20, 20, src_data)
     got_cs = ds.GetRasterBand(1).Checksum()
-    if src_cs != got_cs:
-        return 'fail'
+    assert src_cs == got_cs
 
     ds.GetRasterBand(1).Fill(0)
     got_cs = ds.GetRasterBand(1).Checksum()
-    if got_cs != 0:
-        return 'fail'
+    assert got_cs == 0
 
     ds.WriteRaster(0, 0, 20, 20, src_data)
     got_cs = ds.GetRasterBand(1).Checksum()
-    if src_cs != got_cs:
-        return 'fail'
+    assert src_cs == got_cs
 
     # Not bound to SWIG
     # ds.AdviseRead(0,0,20,20,20,20)
 
     got_data = ds.ReadRaster(0, 0, 20, 20)
-    if src_data != got_data:
-        return 'fail'
+    assert src_data == got_data
 
     got_data = ds.GetRasterBand(1).ReadRaster(0, 0, 20, 20)
-    if src_data != got_data:
-        return 'fail'
+    assert src_data == got_data
 
     got_data_weird_spacing = ds.ReadRaster(0, 0, 20, 20, buf_pixel_space=1, buf_line_space=32)
-    if len(got_data_weird_spacing) != 32 * (20 - 1) + 20:
-        print(len(got_data_weird_spacing))
-        return 'fail'
+    assert len(got_data_weird_spacing) == 32 * (20 - 1) + 20
 
-    if got_data[20:20 + 20] != got_data_weird_spacing[32:32 + 20]:
-        return 'fail'
+    assert got_data[20:20 + 20] == got_data_weird_spacing[32:32 + 20]
 
     got_data_weird_spacing = ds.GetRasterBand(1).ReadRaster(0, 0, 20, 20, buf_pixel_space=1, buf_line_space=32)
-    if len(got_data_weird_spacing) != 32 * (20 - 1) + 20:
-        print(len(got_data_weird_spacing))
-        return 'fail'
+    assert len(got_data_weird_spacing) == 32 * (20 - 1) + 20
 
-    if got_data[20:20 + 20] != got_data_weird_spacing[32:32 + 20]:
-        return 'fail'
+    assert got_data[20:20 + 20] == got_data_weird_spacing[32:32 + 20]
 
     got_block = ds.GetRasterBand(1).ReadBlock(0, 0)
-    if len(got_block) != 256 * 256:
-        return 'fail'
+    assert len(got_block) == 256 * 256
 
-    if got_data[20:20 + 20] != got_block[256:256 + 20]:
-        return 'fail'
+    assert got_data[20:20 + 20] == got_block[256:256 + 20]
 
     ds.FlushCache()
     ds.GetRasterBand(1).FlushCache()
 
     got_data = ds.GetRasterBand(1).ReadRaster(0, 0, 20, 20)
-    if src_data != got_data:
-        return 'fail'
+    assert src_data == got_data
 
-    if len(ds.GetFileList()) != 1:
-        return 'fail'
+    assert len(ds.GetFileList()) == 1
 
-    if ds.AddBand(gdal.GDT_Byte) == 0:
-        return 'fail'
+    assert ds.AddBand(gdal.GDT_Byte) != 0
 
     got_md = ds.GetMetadata()
-    if src_md != got_md:
-        print(src_md)
-        print(got_md)
-        return 'fail'
+    assert src_md == got_md
 
-    if ds.GetMetadataItem('AREA_OR_POINT') != 'Area':
-        return 'fail'
+    assert ds.GetMetadataItem('AREA_OR_POINT') == 'Area'
 
-    if ds.GetMetadataItem('foo') is not None:
-        return 'fail'
+    assert ds.GetMetadataItem('foo') is None
 
     ds.SetMetadataItem('foo', 'bar')
-    if ds.GetMetadataItem('foo') != 'bar':
-        return 'fail'
+    assert ds.GetMetadataItem('foo') == 'bar'
 
     ds.SetMetadata({'foo': 'baz'}, 'OTHER')
-    if ds.GetMetadataItem('foo', 'OTHER') != 'baz':
-        return 'fail'
+    assert ds.GetMetadataItem('foo', 'OTHER') == 'baz'
 
     ds.GetRasterBand(1).SetMetadata({'foo': 'baw'}, 'OTHER')
-    if ds.GetRasterBand(1).GetMetadataItem('foo', 'OTHER') != 'baw':
-        return 'fail'
+    assert ds.GetRasterBand(1).GetMetadataItem('foo', 'OTHER') == 'baw'
 
-    if ds.GetMetadataItem('INTERLEAVE', 'IMAGE_STRUCTURE') != 'BAND':
-        return 'fail'
+    assert ds.GetMetadataItem('INTERLEAVE', 'IMAGE_STRUCTURE') == 'BAND'
 
-    if ds.GetRasterBand(1).GetMetadata():
-        print(ds.GetRasterBand(1).GetMetadata())
-        return 'fail'
+    assert not ds.GetRasterBand(1).GetMetadata()
 
-    if ds.GetRasterBand(1).GetMetadataItem('foo') is not None:
-        return 'fail'
+    assert ds.GetRasterBand(1).GetMetadataItem('foo') is None
 
     ds.GetRasterBand(1).SetMetadataItem('foo', 'baz')
-    if ds.GetRasterBand(1).GetMetadataItem('foo') != 'baz':
-        return 'fail'
+    assert ds.GetRasterBand(1).GetMetadataItem('foo') == 'baz'
 
     ds.GetRasterBand(1).SetMetadata({'foo': 'baw'})
-    if ds.GetRasterBand(1).GetMetadataItem('foo') != 'baw':
-        return 'fail'
+    assert ds.GetRasterBand(1).GetMetadataItem('foo') == 'baw'
 
-    if ds.GetRasterBand(1).GetColorInterpretation() != gdal.GCI_GrayIndex:
-        return 'fail'
+    assert ds.GetRasterBand(1).GetColorInterpretation() == gdal.GCI_GrayIndex
 
     ds.GetRasterBand(1).SetColorInterpretation(gdal.GCI_Undefined)
 
     ct = ds.GetRasterBand(1).GetColorTable()
-    if ct is not None:
-        return 'fail'
+    assert ct is None
 
     ct = gdal.ColorTable()
     ct.SetColorEntry(0, (1, 2, 3))
-    if ds.GetRasterBand(1).SetColorTable(ct) != 0:
-        return 'fail'
+    assert ds.GetRasterBand(1).SetColorTable(ct) == 0
 
     ct = ds.GetRasterBand(1).GetColorTable()
-    if ct is None:
-        return 'fail'
-    if ct.GetColorEntry(0) != (1, 2, 3, 255):
-        return 'fail'
+    assert ct is not None
+    assert ct.GetColorEntry(0) == (1, 2, 3, 255)
 
     ct = ds.GetRasterBand(1).GetColorTable()
-    if ct is None:
-        return 'fail'
+    assert ct is not None
 
-    if ds.GetRasterBand(1).SetColorTable(None) != 0:
-        return 'fail'
+    assert ds.GetRasterBand(1).SetColorTable(None) == 0
 
     ct = ds.GetRasterBand(1).GetColorTable()
-    if ct is not None:
-        return 'fail'
+    assert ct is None
 
     rat = ds.GetRasterBand(1).GetDefaultRAT()
-    if rat is not None:
-        return 'fail'
+    assert rat is None
 
-    if ds.GetRasterBand(1).SetDefaultRAT(None) != 0:
-        return 'fail'
+    assert ds.GetRasterBand(1).SetDefaultRAT(None) == 0
 
     ref_rat = gdal.RasterAttributeTable()
-    if ds.GetRasterBand(1).SetDefaultRAT(ref_rat) != 0:
-        return 'fail'
+    assert ds.GetRasterBand(1).SetDefaultRAT(ref_rat) == 0
 
     rat = ds.GetRasterBand(1).GetDefaultRAT()
-    if rat is not None:
-        return 'fail'
+    assert rat is None
 
-    if ds.GetRasterBand(1).SetDefaultRAT(None) != 0:
-        return 'fail'
+    assert ds.GetRasterBand(1).SetDefaultRAT(None) == 0
 
     rat = ds.GetRasterBand(1).GetDefaultRAT()
-    if rat is not None:
-        return 'fail'
+    assert rat is None
 
-    if ds.GetRasterBand(1).GetMinimum() is not None:
-        return 'fail'
+    assert ds.GetRasterBand(1).GetMinimum() is None
 
     got_stats = ds.GetRasterBand(1).GetStatistics(0, 0)
-    if got_stats[3] >= 0.0:
-        return 'fail'
+    assert got_stats[3] < 0.0
 
     got_stats = ds.GetRasterBand(1).GetStatistics(1, 1)
-    if got_stats[0] != 74.0:
-        return 'fail'
+    assert got_stats[0] == 74.0
 
-    if ds.GetRasterBand(1).GetMinimum() != 74.0:
-        return 'fail'
+    assert ds.GetRasterBand(1).GetMinimum() == 74.0
 
-    if ds.GetRasterBand(1).GetMaximum() != 255.0:
-        return 'fail'
+    assert ds.GetRasterBand(1).GetMaximum() == 255.0
 
     ds.GetRasterBand(1).SetStatistics(1, 2, 3, 4)
     got_stats = ds.GetRasterBand(1).GetStatistics(1, 1)
-    if got_stats != [1, 2, 3, 4]:
-        print(got_stats)
-        return 'fail'
+    assert got_stats == [1, 2, 3, 4]
 
     ds.GetRasterBand(1).ComputeStatistics(0)
     got_stats = ds.GetRasterBand(1).GetStatistics(1, 1)
-    if got_stats[0] != 74.0:
-        return 'fail'
+    assert got_stats[0] == 74.0
 
     minmax = ds.GetRasterBand(1).ComputeRasterMinMax()
-    if minmax != (74.0, 255.0):
-        print(minmax)
-        return 'fail'
+    assert minmax == (74.0, 255.0)
 
-    if ds.GetRasterBand(1).GetOffset() != 0.0:
-        return 'fail'
+    assert ds.GetRasterBand(1).GetOffset() == 0.0
 
-    if ds.GetRasterBand(1).GetScale() != 1.0:
-        return 'fail'
+    assert ds.GetRasterBand(1).GetScale() == 1.0
 
     ds.GetRasterBand(1).SetOffset(10.0)
-    if ds.GetRasterBand(1).GetOffset() != 10.0:
-        return 'fail'
+    assert ds.GetRasterBand(1).GetOffset() == 10.0
 
     ds.GetRasterBand(1).SetScale(2.0)
-    if ds.GetRasterBand(1).GetScale() != 2.0:
-        return 'fail'
+    assert ds.GetRasterBand(1).GetScale() == 2.0
 
     ds.BuildOverviews('NEAR', [2])
-    if ds.GetRasterBand(1).GetOverviewCount() != 1:
-        return 'fail'
+    assert ds.GetRasterBand(1).GetOverviewCount() == 1
 
-    if ds.GetRasterBand(1).GetOverview(-1) is not None:
-        return 'fail'
+    assert ds.GetRasterBand(1).GetOverview(-1) is None
 
-    if ds.GetRasterBand(1).GetOverview(0) is None:
-        return 'fail'
+    assert ds.GetRasterBand(1).GetOverview(0) is not None
 
-    if ds.GetRasterBand(1).GetOverview(0) is None:
-        return 'fail'
+    assert ds.GetRasterBand(1).GetOverview(0) is not None
 
     got_hist = ds.GetRasterBand(1).GetHistogram()
-    if len(got_hist) != 256:
-        return 'fail'
+    assert len(got_hist) == 256
 
     (minval, maxval, nitems, got_hist2) = ds.GetRasterBand(1).GetDefaultHistogram()
-    if minval != -0.5:
-        return 'fail'
-    if maxval != 255.5:
-        return 'fail'
-    if nitems != 256:
-        return 'fail'
-    if got_hist != got_hist2:
-        return 'fail'
+    assert minval == -0.5
+    assert maxval == 255.5
+    assert nitems == 256
+    assert got_hist == got_hist2
 
     ds.GetRasterBand(1).SetDefaultHistogram(1, 2, [3])
     (minval, maxval, nitems, got_hist3) = ds.GetRasterBand(1).GetDefaultHistogram()
-    if minval != 1:
-        return 'fail'
-    if maxval != 2:
-        return 'fail'
-    if nitems != 1:
-        return 'fail'
-    if got_hist3[0] != 3:
-        return 'fail'
+    assert minval == 1
+    assert maxval == 2
+    assert nitems == 1
+    assert got_hist3[0] == 3
 
     got_nodatavalue = ds.GetRasterBand(1).GetNoDataValue()
-    if got_nodatavalue is not None:
-        return 'fail'
+    assert got_nodatavalue is None
 
     ds.GetRasterBand(1).SetNoDataValue(123)
     got_nodatavalue = ds.GetRasterBand(1).GetNoDataValue()
-    if got_nodatavalue != 123:
-        return 'fail'
+    assert got_nodatavalue == 123
 
-    if ds.GetRasterBand(1).GetMaskFlags() != 8:
-        return 'fail'
+    assert ds.GetRasterBand(1).GetMaskFlags() == 8
 
-    if ds.GetRasterBand(1).GetMaskBand() is None:
-        return 'fail'
+    assert ds.GetRasterBand(1).GetMaskBand() is not None
 
     ret = ds.GetRasterBand(1).DeleteNoDataValue()
-    if ret != 0:
-        return 'fail'
+    assert ret == 0
     got_nodatavalue = ds.GetRasterBand(1).GetNoDataValue()
-    if got_nodatavalue is not None:
-        return 'fail'
+    assert got_nodatavalue is None
 
     ds.CreateMaskBand(0)
 
-    if ds.GetRasterBand(1).GetMaskFlags() != 2:
-        print(ds.GetRasterBand(1).GetMaskFlags())
-        return 'fail'
+    assert ds.GetRasterBand(1).GetMaskFlags() == 2
 
-    if ds.GetRasterBand(1).GetMaskBand() is None:
-        return 'fail'
+    assert ds.GetRasterBand(1).GetMaskBand() is not None
 
     ds.GetRasterBand(1).CreateMaskBand(0)
 
-    if ds.GetRasterBand(1).HasArbitraryOverviews() != 0:
-        return 'fail'
+    assert ds.GetRasterBand(1).HasArbitraryOverviews() == 0
 
     ds.GetRasterBand(1).SetUnitType('foo')
-    if ds.GetRasterBand(1).GetUnitType() != 'foo':
-        return 'fail'
+    assert ds.GetRasterBand(1).GetUnitType() == 'foo'
 
-    if ds.GetRasterBand(1).GetCategoryNames() is not None:
-        return 'fail'
+    assert ds.GetRasterBand(1).GetCategoryNames() is None
 
     ds.GetRasterBand(1).SetCategoryNames(['foo'])
-    if ds.GetRasterBand(1).GetCategoryNames() != ['foo']:
-        return 'fail'
+    assert ds.GetRasterBand(1).GetCategoryNames() == ['foo']
 
     ds.GetRasterBand(1).SetDescription('bar')
 
diff --git a/autotest/gcore/gdal_stats.py b/autotest/gcore/gdal_stats.py
index 75631c61072f..6c3260c03d14 100755
--- a/autotest/gcore/gdal_stats.py
+++ b/autotest/gcore/gdal_stats.py
@@ -35,6 +35,7 @@
 
 import gdaltest
 from osgeo import gdal
+import pytest
 
 ###############################################################################
 # Test handling NaN with GDT_Float32 data
@@ -107,10 +108,7 @@ def test_stats_dont_force():
     gdal.Unlink('data/byte.tif.aux.xml')
     ds = gdal.Open('data/byte.tif')
     stats = ds.GetRasterBand(1).GetStatistics(0, 0)
-    if stats != [0, 0, 0, -1]:
-        gdaltest.post_reason('did not get expected stats')
-        print(stats)
-        return 'fail'
+    assert stats == [0, 0, 0, -1], 'did not get expected stats'
 
     return 'success'
 
@@ -142,24 +140,15 @@ def test_stats_approx_nodata():
     os.remove('tmp/minfloat.tif')
 
     if nodata != -3.4028234663852886e+38:
-        gdaltest.post_reason('did not get expected nodata')
         print("%.18g" % nodata)
-        return 'fail'
+        pytest.fail('did not get expected nodata')
 
-    if stats != [-3.0, 5.0, 1.0, 4.0]:
-        gdaltest.post_reason('did not get expected stats')
-        print(stats)
-        return 'fail'
+    assert stats == [-3.0, 5.0, 1.0, 4.0], 'did not get expected stats'
 
-    if md != {'STATISTICS_MEAN': '1', 'STATISTICS_MAXIMUM': '5', 'STATISTICS_MINIMUM': '-3', 'STATISTICS_STDDEV': '4', 'STATISTICS_VALID_PERCENT': '50'}:
-        gdaltest.post_reason('did not get expected metadata')
-        print(md)
-        return 'fail'
+    assert md == {'STATISTICS_MEAN': '1', 'STATISTICS_MAXIMUM': '5', 'STATISTICS_MINIMUM': '-3', 'STATISTICS_STDDEV': '4', 'STATISTICS_VALID_PERCENT': '50'}, \
+        'did not get expected metadata'
 
-    if minmax != (-3.0, 5.0):
-        gdaltest.post_reason('did not get expected minmax')
-        print(minmax)
-        return 'fail'
+    assert minmax == (-3.0, 5.0), 'did not get expected minmax'
 
     return 'success'
 
@@ -171,9 +160,7 @@ def test_stats_nan_3():
 
     src_ds = gdal.Open('data/nan32_nodata.tif')
     nodata = src_ds.GetRasterBand(1).GetNoDataValue()
-    if not gdaltest.isnan(nodata):
-        gdaltest.post_reason('expected nan, got %f' % nodata)
-        return 'fail'
+    assert gdaltest.isnan(nodata), ('expected nan, got %f' % nodata)
 
     out_ds = gdaltest.gtiff_drv.CreateCopy('tmp/nan32_nodata.tif', src_ds)
     del out_ds
@@ -190,9 +177,7 @@ def test_stats_nan_3():
     ds = None
 
     gdaltest.gtiff_drv.Delete('tmp/nan32_nodata.tif')
-    if not gdaltest.isnan(nodata):
-        gdaltest.post_reason('expected nan, got %f' % nodata)
-        return 'fail'
+    assert gdaltest.isnan(nodata), ('expected nan, got %f' % nodata)
 
     return 'success'
 
@@ -208,14 +193,9 @@ def test_stats_nan_4():
     nodata = ds.GetRasterBand(1).GetNoDataValue()
     ds = None
 
-    if cs != 874:
-        gdaltest.post_reason('did not get expected checksum')
-        print(cs)
-        return 'fail'
+    assert cs == 874, 'did not get expected checksum'
 
-    if not gdaltest.isnan(nodata):
-        gdaltest.post_reason('expected nan, got %f' % nodata)
-        return 'fail'
+    assert gdaltest.isnan(nodata), ('expected nan, got %f' % nodata)
 
     return 'success'
 
@@ -231,14 +211,9 @@ def test_stats_nan_5():
     nodata = ds.GetRasterBand(1).GetNoDataValue()
     ds = None
 
-    if cs != 978:
-        gdaltest.post_reason('did not get expected checksum')
-        print(cs)
-        return 'fail'
+    assert cs == 978, 'did not get expected checksum'
 
-    if nodata != 0:
-        gdaltest.post_reason('expected nan, got %f' % nodata)
-        return 'fail'
+    assert nodata == 0, ('expected nan, got %f' % nodata)
 
     return 'success'
 
@@ -253,14 +228,9 @@ def test_stats_nan_6():
     nodata = ds.GetRasterBand(1).GetNoDataValue()
     ds = None
 
-    if cs != 874:
-        gdaltest.post_reason('did not get expected checksum')
-        print(cs)
-        return 'fail'
+    assert cs == 874, 'did not get expected checksum'
 
-    if not gdaltest.isnan(nodata):
-        gdaltest.post_reason('expected nan, got %f' % nodata)
-        return 'fail'
+    assert gdaltest.isnan(nodata), ('expected nan, got %f' % nodata)
 
     return 'success'
 
@@ -275,14 +245,9 @@ def test_stats_nan_7():
     nodata = ds.GetRasterBand(1).GetNoDataValue()
     ds = None
 
-    if cs != 978:
-        gdaltest.post_reason('did not get expected checksum')
-        print(cs)
-        return 'fail'
+    assert cs == 978, 'did not get expected checksum'
 
-    if nodata != 0:
-        gdaltest.post_reason('expected nan, got %f' % nodata)
-        return 'fail'
+    assert nodata == 0, ('expected nan, got %f' % nodata)
 
     return 'success'
 
@@ -297,14 +262,9 @@ def test_stats_nan_8():
     nodata = ds.GetRasterBand(1).GetNoDataValue()
     ds = None
 
-    if cs != 874:
-        gdaltest.post_reason('did not get expected checksum')
-        print(cs)
-        return 'fail'
+    assert cs == 874, 'did not get expected checksum'
 
-    if not gdaltest.isnan(nodata):
-        gdaltest.post_reason('expected nan, got %f' % nodata)
-        return 'fail'
+    assert gdaltest.isnan(nodata), ('expected nan, got %f' % nodata)
 
     return 'success'
 
@@ -328,18 +288,12 @@ def test_stats_nodata_inf():
     ds.GetRasterBand(1).Checksum()
     user_data = [0]
     stats = ds.GetRasterBand(1).ComputeStatistics(False, stats_nodata_inf_progress_cbk, user_data)
-    if user_data[0] != 1.0:
-        gdaltest.post_reason('did not get expected pct')
-        print(user_data[0])
-        return 'fail'
+    assert user_data[0] == 1.0, 'did not get expected pct'
     ds = None
 
     gdal.GetDriverByName('HFA').Delete('/vsimem/stats_nodata_inf.img')
 
-    if stats != [-2.0, 1.0, -0.5, 1.5]:
-        gdaltest.post_reason('did not get expected stats')
-        print(stats)
-        return 'fail'
+    assert stats == [-2.0, 1.0, -0.5, 1.5], 'did not get expected stats'
 
     return 'success'
 
@@ -352,10 +306,7 @@ def stats_nodata_check(filename, expected_nodata):
     nodata = ds.GetRasterBand(1).GetNoDataValue()
     ds = None
 
-    if nodata != expected_nodata:
-        gdaltest.post_reason('did not get expected nodata value')
-        print(nodata)
-        return 'fail'
+    assert nodata == expected_nodata, 'did not get expected nodata value'
 
     return 'success'
 
@@ -393,10 +344,8 @@ def test_stats_stddev_huge_values():
  100000000 100000002 100000000 100000002""")
     ds = gdal.Open('/vsimem/stats_stddev_huge_values.asc')
     stats = ds.GetRasterBand(1).ComputeStatistics(0)
-    if stats != [100000000.0, 100000002.0, 100000001.0, 1.0]:
-        gdaltest.post_reason('did not get expected stats')
-        print(stats)
-        return 'fail'
+    assert stats == [100000000.0, 100000002.0, 100000001.0, 1.0], \
+        'did not get expected stats'
     ds = None
     gdal.GetDriverByName('AAIGRID').Delete('/vsimem/stats_stddev_huge_values.asc')
 
@@ -419,18 +368,11 @@ def test_stats_square_shape():
 
     gdal.GetDriverByName('GTiff').Delete('/vsimem/stats_square_shape.tif')
 
-    if stats != [255, 255, 255, 0]:
-        gdaltest.post_reason('did not get expected stats')
-        print(stats)
-        return 'fail'
-    if hist[255] != 16 * 16:
-        gdaltest.post_reason('did not get expected histogram')
-        print(hist)
-        return 'fail'
+    assert stats == [255, 255, 255, 0], 'did not get expected stats'
+    assert hist[255] == 16 * 16, 'did not get expected histogram'
     if minmax != (255, 255):
-        gdaltest.post_reason('did not get expected minmax')
         print(hist)
-        return 'fail'
+        pytest.fail('did not get expected minmax')
 
     return 'success'
 
@@ -460,20 +402,14 @@ def test_stats_flt_min():
     os.remove('tmp/flt_min.tif')
 
     if nodata != 1.17549435082228751e-38:
-        gdaltest.post_reason('did not get expected nodata')
         print("%.18g" % nodata)
-        return 'fail'
+        pytest.fail('did not get expected nodata')
 
-    if stats != [0.0, 1.0, 0.33333333333333337, 0.47140452079103168] and \
-       stats != [0.0, 1.0, 0.33333333333333331, 0.47140452079103168]:  # 32 bit
-        gdaltest.post_reason('did not get expected stats')
-        print(stats)
-        return 'fail'
+    assert (stats == [0.0, 1.0, 0.33333333333333337, 0.47140452079103168] or \
+       stats == [0.0, 1.0, 0.33333333333333331, 0.47140452079103168]), \
+        'did not get expected stats'
 
-    if minmax != (0.0, 1.0):
-        gdaltest.post_reason('did not get expected minmax')
-        print(minmax)
-        return 'fail'
+    assert minmax == (0.0, 1.0), 'did not get expected minmax'
 
     return 'success'
 
@@ -503,20 +439,14 @@ def test_stats_dbl_min():
     os.remove('tmp/dbl_min.tif')
 
     if nodata != 2.22507385850720138e-308:
-        gdaltest.post_reason('did not get expected nodata')
         print("%.18g" % nodata)
-        return 'fail'
+        pytest.fail('did not get expected nodata')
 
-    if stats != [0.0, 1.0, 0.33333333333333337, 0.47140452079103168] and \
-       stats != [0.0, 1.0, 0.33333333333333331, 0.47140452079103168]:  # 32 bit
-        gdaltest.post_reason('did not get expected stats')
-        print(stats)
-        return 'fail'
+    assert (stats == [0.0, 1.0, 0.33333333333333337, 0.47140452079103168] or \
+       stats == [0.0, 1.0, 0.33333333333333331, 0.47140452079103168]), \
+        'did not get expected stats'
 
-    if minmax != (0.0, 1.0):
-        gdaltest.post_reason('did not get expected minmax')
-        print(minmax)
-        return 'fail'
+    assert minmax == (0.0, 1.0), 'did not get expected minmax'
 
     return 'success'
 
@@ -534,11 +464,7 @@ def test_stats_byte_partial_tiles():
     gdal.GetDriverByName('GTiff').Delete('/vsimem/stats_byte_tiled.tif')
 
     expected_stats = [0.0, 255.0, 50.22115, 67.119029288849973]
-    if stats != expected_stats:
-        gdaltest.post_reason('did not get expected stats')
-        print(stats)
-        print(expected_stats)
-        return 'fail'
+    assert stats == expected_stats, 'did not get expected stats'
 
     # Same but with nodata set
     ds = gdal.Translate('/vsimem/stats_byte_tiled.tif', '../gdrivers/data/small_world.tif',
@@ -551,11 +477,8 @@ def test_stats_byte_partial_tiles():
 
     expected_stats = [1.0, 255.0, 50.311081057390084, 67.14541389488096]
     expected_stats_32bit = [1.0, 255.0, 50.311081057390084, 67.145413894880946]
-    if stats != expected_stats and stats != expected_stats_32bit:
-        gdaltest.post_reason('did not get expected stats')
-        print(stats)
-        print(expected_stats)
-        return 'fail'
+    assert stats == expected_stats or stats == expected_stats_32bit, \
+        'did not get expected stats'
 
     # Same but with nodata set but untiled and with non power of 16 block size
     ds = gdal.Translate('/vsimem/stats_byte_untiled.tif', '../gdrivers/data/small_world.tif',
@@ -567,11 +490,7 @@ def test_stats_byte_partial_tiles():
     gdal.GetDriverByName('GTiff').Delete('/vsimem/stats_byte_untiled.tif')
 
     expected_stats = [1.0, 255.0, 50.378183963744554, 67.184793517649453]
-    if stats != expected_stats:
-        gdaltest.post_reason('did not get expected stats')
-        print(stats)
-        print(expected_stats)
-        return 'fail'
+    assert stats == expected_stats, 'did not get expected stats'
 
     ds = gdal.GetDriverByName('GTiff').Create('/vsimem/stats_byte_tiled.tif', 1000, 512,
                                               options=['TILED=YES', 'BLOCKXSIZE=512', 'BLOCKYSIZE=512'])
@@ -581,11 +500,8 @@ def test_stats_byte_partial_tiles():
     gdal.Unlink('/vsimem/stats_byte_tiled.tif')
 
     expected_stats = [255.0, 255.0, 255.0, 0.0]
-    if max([abs(stats[i] - expected_stats[i]) for i in range(4)]) > 1e-15:
-        gdaltest.post_reason('did not get expected stats')
-        print(stats)
-        print(expected_stats)
-        return 'fail'
+    assert max([abs(stats[i] - expected_stats[i]) for i in range(4)]) <= 1e-15, \
+        'did not get expected stats'
 
     # Non optimized code path
     ds = gdal.GetDriverByName('MEM').Create('', 1, 1)
@@ -594,11 +510,8 @@ def test_stats_byte_partial_tiles():
     ds = None
 
     expected_stats = [1.0, 1.0, 1.0, 0.0]
-    if max([abs(stats[i] - expected_stats[i]) for i in range(4)]) > 1e-15:
-        gdaltest.post_reason('did not get expected stats')
-        print(stats)
-        print(expected_stats)
-        return 'fail'
+    assert max([abs(stats[i] - expected_stats[i]) for i in range(4)]) <= 1e-15, \
+        'did not get expected stats'
 
     ds = gdal.GetDriverByName('MEM').Create('', 3, 5)
     ds.GetRasterBand(1).WriteRaster(0, 0, 3, 1, struct.pack('B' * 3, 20, 30, 50))
@@ -610,11 +523,8 @@ def test_stats_byte_partial_tiles():
     ds = None
 
     expected_stats = [0.0, 255.0, 35.333333333333336, 60.785597709398971]
-    if max([abs(stats[i] - expected_stats[i]) for i in range(4)]) > 1e-15:
-        gdaltest.post_reason('did not get expected stats')
-        print(stats)
-        print(expected_stats)
-        return 'fail'
+    assert max([abs(stats[i] - expected_stats[i]) for i in range(4)]) <= 1e-15, \
+        'did not get expected stats'
 
     ds = gdal.GetDriverByName('MEM').Create('', 32 + 2, 2)
     ds.GetRasterBand(1).Fill(1)
@@ -623,11 +533,8 @@ def test_stats_byte_partial_tiles():
     ds = None
 
     expected_stats = [0.0, 255.0, 4.7205882352941178, 30.576733555893391]
-    if max([abs(stats[i] - expected_stats[i]) for i in range(4)]) > 1e-15:
-        gdaltest.post_reason('did not get expected stats')
-        print(stats)
-        print(expected_stats)
-        return 'fail'
+    assert max([abs(stats[i] - expected_stats[i]) for i in range(4)]) <= 1e-15, \
+        'did not get expected stats'
 
     ds = gdal.GetDriverByName('MEM').Create('', 32 + 2, 2)
     ds.GetRasterBand(1).Fill(1)
@@ -637,11 +544,8 @@ def test_stats_byte_partial_tiles():
     ds = None
 
     expected_stats = [0.0, 255.0, 4.7205882352941178, 30.576733555893391]
-    if max([abs(stats[i] - expected_stats[i]) for i in range(4)]) > 1e-15:
-        gdaltest.post_reason('did not get expected stats')
-        print(stats)
-        print(expected_stats)
-        return 'fail'
+    assert max([abs(stats[i] - expected_stats[i]) for i in range(4)]) <= 1e-15, \
+        'did not get expected stats'
 
     return 'success'
 
@@ -661,11 +565,7 @@ def test_stats_uint16():
     gdal.GetDriverByName('GTiff').Delete('/vsimem/stats_uint16_tiled.tif')
 
     expected_stats = [0.0, 65535.0, 50.22115 * 65535 / 255, 67.119029288849973 * 65535 / 255]
-    if stats != expected_stats:
-        gdaltest.post_reason('did not get expected stats')
-        print(stats)
-        print(expected_stats)
-        return 'fail'
+    assert stats == expected_stats, 'did not get expected stats'
 
     ds = gdal.Translate('/vsimem/stats_uint16_untiled.tif', '../gdrivers/data/small_world.tif',
                         options='-srcwin 0 0 399 200 -scale 0 255 0 65535 -ot UInt16')
@@ -675,11 +575,7 @@ def test_stats_uint16():
     gdal.GetDriverByName('GTiff').Delete('/vsimem/stats_uint16_untiled.tif')
 
     expected_stats = [0.0, 65535.0, 12923.9921679198, 17259.703026841547]
-    if stats != expected_stats:
-        gdaltest.post_reason('did not get expected stats')
-        print(stats)
-        print(expected_stats)
-        return 'fail'
+    assert stats == expected_stats, 'did not get expected stats'
 
     # Same but with nodata set but untiled and with non power of 16 block size
     ds = gdal.Translate('/vsimem/stats_uint16_untiled.tif', '../gdrivers/data/small_world.tif',
@@ -691,11 +587,7 @@ def test_stats_uint16():
     gdal.GetDriverByName('GTiff').Delete('/vsimem/stats_uint16_untiled.tif')
 
     expected_stats = [257.0, 65535.0, 50.378183963744554 * 65535 / 255, 67.184793517649453 * 65535 / 255]
-    if stats != expected_stats:
-        gdaltest.post_reason('did not get expected stats')
-        print(stats)
-        print(expected_stats)
-        return 'fail'
+    assert stats == expected_stats, 'did not get expected stats'
 
     for fill_val in [0, 1, 32767, 32768, 65535]:
         ds = gdal.GetDriverByName('GTiff').Create('/vsimem/stats_uint16_tiled.tif', 1000, 512, 1, gdal.GDT_UInt16,
@@ -707,11 +599,8 @@ def test_stats_uint16():
 
         expected_stats = [fill_val, fill_val, fill_val, 0.0]
         if max([abs(stats[i] - expected_stats[i]) for i in range(4)]) > 1e-15:
-            gdaltest.post_reason('did not get expected stats')
-            print(stats)
             print(fill_val)
-            print(expected_stats)
-            return 'fail'
+            pytest.fail('did not get expected stats')
 
     # Test remaining pixels after multiple of 32
     ds = gdal.GetDriverByName('MEM').Create('', 32 + 2, 1, 1, gdal.GDT_UInt16)
@@ -721,11 +610,8 @@ def test_stats_uint16():
     ds = None
 
     expected_stats = [0.0, 65535.0, 1928.4411764705883, 11072.48066469611]
-    if max([abs(stats[i] - expected_stats[i]) for i in range(4)]) > 1e-15:
-        gdaltest.post_reason('did not get expected stats')
-        print(stats)
-        print(expected_stats)
-        return 'fail'
+    assert max([abs(stats[i] - expected_stats[i]) for i in range(4)]) <= 1e-15, \
+        'did not get expected stats'
 
     # Non optimized code path
     for fill_val in [0, 1, 32767, 32768, 65535]:
@@ -736,11 +622,8 @@ def test_stats_uint16():
 
         expected_stats = [fill_val, fill_val, fill_val, 0.0]
         if max([abs(stats[i] - expected_stats[i]) for i in range(4)]) > 1e-15:
-            gdaltest.post_reason('did not get expected stats')
-            print(stats)
             print(fill_val)
-            print(expected_stats)
-            return 'fail'
+            pytest.fail('did not get expected stats')
 
     ds = gdal.GetDriverByName('MEM').Create('', 3, 5, 1, gdal.GDT_UInt16)
     ds.GetRasterBand(1).WriteRaster(0, 0, 3, 1, struct.pack('H' * 3, 20, 30, 50))
@@ -752,11 +635,8 @@ def test_stats_uint16():
     ds = None
 
     expected_stats = [0.0, 65535.0, 4387.333333333333, 16342.408927558861]
-    if max([abs(stats[i] - expected_stats[i]) for i in range(4)]) > 1e-15:
-        gdaltest.post_reason('did not get expected stats')
-        print(stats)
-        print(expected_stats)
-        return 'fail'
+    assert max([abs(stats[i] - expected_stats[i]) for i in range(4)]) <= 1e-15, \
+        'did not get expected stats'
 
     ds = gdal.GetDriverByName('MEM').Create('', 2, 2, 1, gdal.GDT_UInt16)
     ds.GetRasterBand(1).WriteRaster(0, 0, 2, 1, struct.pack('H' * 2, 0, 65535))
@@ -765,10 +645,8 @@ def test_stats_uint16():
     ds = None
 
     expected_stats = [0.0, 65535.0, 32767.5, 32767.000003814814]
-    if max([abs(stats[i] - expected_stats[i]) for i in range(4)]) > 1e-15:
-        gdaltest.post_reason('did not get expected stats')
-        print(stats)
-        return 'fail'
+    assert max([abs(stats[i] - expected_stats[i]) for i in range(4)]) <= 1e-15, \
+        'did not get expected stats'
 
     return 'success'
 
@@ -783,20 +661,11 @@ def test_stats_nodata_almost_max_float32():
 
     ds = gdal.Open('/vsimem/float32_almost_nodata_max_float32.tif')
     minmax = ds.GetRasterBand(1).ComputeRasterMinMax()
-    if minmax != (0, 0):
-        gdaltest.post_reason('did not get expected minmax')
-        print(minmax)
-        return 'fail'
+    assert minmax == (0, 0), 'did not get expected minmax'
     stats = ds.GetRasterBand(1).ComputeStatistics(False)
-    if stats != [0, 0, 0, 0]:
-        gdaltest.post_reason('did not get expected stats')
-        print(stats)
-        return 'fail'
+    assert stats == [0, 0, 0, 0], 'did not get expected stats'
     hist = ds.GetRasterBand(1).GetHistogram(approx_ok=0)
-    if hist[0] != 3:
-        gdaltest.post_reason('did not get expected hist')
-        print(hist)
-        return 'fail'
+    assert hist[0] == 3, 'did not get expected hist'
     ds = None
 
     gdal.GetDriverByName('GTiff').Delete('/vsimem/float32_almost_nodata_max_float32.tif')
@@ -816,36 +685,22 @@ def test_stats_approx_stats_flag(dt=gdal.GDT_Byte, struct_frmt='B'):
     approx_ok = 1
     force = 1
     stats = ds.GetRasterBand(1).GetStatistics(approx_ok, force)
-    if stats != [0.0, 0.0, 0.0, 0.0]:
-        gdaltest.post_reason('did not get expected stats')
-        print(stats)
-        return 'fail'
+    assert stats == [0.0, 0.0, 0.0, 0.0], 'did not get expected stats'
     md = ds.GetRasterBand(1).GetMetadata()
-    if md != {'STATISTICS_MEAN': '0', 'STATISTICS_MAXIMUM': '0', 'STATISTICS_MINIMUM': '0', 'STATISTICS_APPROXIMATE': 'YES', 'STATISTICS_STDDEV': '0', 'STATISTICS_VALID_PERCENT': '100'}:
-        gdaltest.post_reason('did not get expected metadata')
-        print(md)
-        return 'fail'
+    assert md == {'STATISTICS_MEAN': '0', 'STATISTICS_MAXIMUM': '0', 'STATISTICS_MINIMUM': '0', 'STATISTICS_APPROXIMATE': 'YES', 'STATISTICS_STDDEV': '0', 'STATISTICS_VALID_PERCENT': '100'}, \
+        'did not get expected metadata'
 
     approx_ok = 0
     force = 0
     stats = ds.GetRasterBand(1).GetStatistics(approx_ok, force)
-    if stats != [0.0, 0.0, 0.0, -1.0]:
-        gdaltest.post_reason('did not get expected stats')
-        print(stats)
-        return 'fail'
+    assert stats == [0.0, 0.0, 0.0, -1.0], 'did not get expected stats'
 
     approx_ok = 0
     force = 1
     stats = ds.GetRasterBand(1).GetStatistics(approx_ok, force)
-    if stats[1] != 20.0:
-        gdaltest.post_reason('did not get expected stats')
-        print(stats)
-        return 'fail'
+    assert stats[1] == 20.0, 'did not get expected stats'
     md = ds.GetRasterBand(1).GetMetadata()
-    if 'STATISTICS_APPROXIMATE' in md:
-        gdaltest.post_reason('did not get expected metadata')
-        print(md)
-        return 'fail'
+    assert 'STATISTICS_APPROXIMATE' not in md, 'did not get expected metadata'
 
     return 'success'
 
@@ -862,10 +717,7 @@ def test_stats_all_nodata():
     force = 1
     with gdaltest.error_handler():
         stats = ds.GetRasterBand(1).GetStatistics(approx_ok, force)
-    if stats != [0.0, 0.0, 0.0, 0.0]:
-        gdaltest.post_reason('did not get expected stats')
-        print(stats)
-        return 'fail'
+    assert stats == [0.0, 0.0, 0.0, 0.0], 'did not get expected stats'
 
     ds = gdal.GetDriverByName('MEM').Create('', 2000, 2000, 1,
                                             gdal.GDT_Float32)
@@ -874,10 +726,7 @@ def test_stats_all_nodata():
     force = 1
     with gdaltest.error_handler():
         stats = ds.GetRasterBand(1).GetStatistics(approx_ok, force)
-    if stats != [0.0, 0.0, 0.0, 0.0]:
-        gdaltest.post_reason('did not get expected stats')
-        print(stats)
-        return 'fail'
+    assert stats == [0.0, 0.0, 0.0, 0.0], 'did not get expected stats'
 
     return 'success'
 
@@ -886,10 +735,8 @@ def test_stats_float32_with_nodata_slightly_above_float_max():
 
     ds = gdal.Open('data/float32_with_nodata_slightly_above_float_max.tif')
     my_min, my_max = ds.GetRasterBand(1).ComputeRasterMinMax()
-    if (my_min, my_max) != (-1.0989999771118164, 0.703338623046875):
-        gdaltest.post_reason('did not get expected stats')
-        print(my_min, my_max)
-        return 'fail'
+    assert (my_min, my_max) == (-1.0989999771118164, 0.703338623046875), \
+        'did not get expected stats'
 
     return 'success'
 
diff --git a/autotest/gcore/hdf4_read.py b/autotest/gcore/hdf4_read.py
index 22ba75316ea7..7b02ab40516c 100755
--- a/autotest/gcore/hdf4_read.py
+++ b/autotest/gcore/hdf4_read.py
@@ -102,9 +102,8 @@ def test_hdf4_read_online_2():
     md = ds.GetMetadata('GEOLOCATION')
     ds = None
 
-    if md['X_DATASET'] != 'HDF4_SDS:UNKNOWN:"tmp/cache/A2006005182000.L2_LAC_SST.x.hdf":11':
-        gdaltest.post_reason('Did not get expected X_DATASET')
-        return 'fail'
+    assert md['X_DATASET'] == 'HDF4_SDS:UNKNOWN:"tmp/cache/A2006005182000.L2_LAC_SST.x.hdf":11', \
+        'Did not get expected X_DATASET'
 
     return 'success'
 
@@ -128,15 +127,10 @@ def test_hdf4_read_online_3():
     gt = ds.GetGeoTransform()
     expected_gt = [-180.0, 0.3515625, 0.0, 90.0, 0.0, -0.3515625]
     for i in range(6):
-        if abs(gt[i] - expected_gt[i]) > 1e-8:
-            print(gt)
-            gdaltest.post_reason('did not get expected gt')
-            return 'fail'
+        assert abs(gt[i] - expected_gt[i]) <= 1e-8, 'did not get expected gt'
 
     srs = ds.GetProjectionRef()
-    if srs.find('Clarke') == -1:
-        gdaltest.post_reason('did not get expected projection')
-        return 'fail'
+    assert srs.find('Clarke') != -1, 'did not get expected projection'
 
     ds = None
 
@@ -159,9 +153,7 @@ def test_hdf4_read_online_4():
     ret = tst.testOpen()
 
     ds = gdal.Open('tmp/cache/S2002196124536.L1A_HDUN.BartonBendish.extract.hdf')
-    if ds.RasterCount != 8:
-        gdaltest.post_reason('did not get expected band number')
-        return 'fail'
+    assert ds.RasterCount == 8, 'did not get expected band number'
 
     ds = None
 
@@ -208,15 +200,10 @@ def test_hdf4_read_online_6():
 
     if 'GetBlockSize' in dir(gdal.Band):
         (blockx, blocky) = ds.GetRasterBand(1).GetBlockSize()
-        if blockx != 4800 or blocky != 4800:
-            gdaltest.post_reason("Did not get expected block size")
-            return 'fail'
+        assert blockx == 4800 and blocky == 4800, "Did not get expected block size"
 
     cs = ds.GetRasterBand(1).Checksum()
-    if cs != 12197:
-        gdaltest.post_reason('did not get expected checksum')
-        print(cs)
-        return 'fail'
+    assert cs == 12197, 'did not get expected checksum'
 
     ds = None
 
@@ -243,15 +230,10 @@ def test_hdf4_read_online_7():
 
     if 'GetBlockSize' in dir(gdal.Band):
         (blockx, blocky) = ds.GetRasterBand(1).GetBlockSize()
-        if blockx != 2400 or blocky != 32:
-            gdaltest.post_reason("Did not get expected block size")
-            return 'fail'
+        assert blockx == 2400 and blocky == 32, "Did not get expected block size"
 
     cs = ds.GetRasterBand(1).Checksum()
-    if cs != 54894:
-        gdaltest.post_reason('did not get expected checksum')
-        print(cs)
-        return 'fail'
+    assert cs == 54894, 'did not get expected checksum'
 
     ds = None
 
@@ -278,17 +260,13 @@ def test_hdf4_read_online_8():
     ds = gdal.Open('HDF4_EOS:EOS_GRID:tmp/cache/MOD13Q1.A2006161.h21v13.005.2008234103220.hdf:MODIS_Grid_16DAY_250m_500m_VI:250m 16 days NDVI')
 
     cs = ds.GetRasterBand(1).Checksum()
-    if cs != 53837:
-        gdaltest.post_reason('did not get expected checksum')
-        print(cs)
-        return 'fail'
+    assert cs == 53837, 'did not get expected checksum'
 
     if 'GetBlockSize' in dir(gdal.Band):
         (blockx, blocky) = ds.GetRasterBand(1).GetBlockSize()
         if blockx != 4800 or blocky == 1:
             print('blockx=%d, blocky=%d' % (blockx, blocky))
-            gdaltest.post_reason("Did not get expected block size")
-            return 'fail'
+            pytest.fail("Did not get expected block size")
 
     ds = None
 
@@ -316,10 +294,7 @@ def test_hdf4_read_online_9():
     gcp_count = ds.GetGCPCount()
     ds = None
 
-    if gcp_count != 4:
-        gdaltest.post_reason('did not get expected gcp count')
-        print(gcp_count)
-        return 'fail'
+    assert gcp_count == 4, 'did not get expected gcp count'
 
     return 'success'
 
@@ -339,15 +314,10 @@ def test_hdf4_read_online_10():
 
     if 'GetBlockSize' in dir(gdal.Band):
         (blockx, blocky) = ds.GetRasterBand(1).GetBlockSize()
-        if blockx != 1200 or blocky != 833:
-            gdaltest.post_reason("Did not get expected block size")
-            return 'fail'
+        assert blockx == 1200 and blocky == 833, "Did not get expected block size"
 
     cs = ds.GetRasterBand(1).Checksum()
-    if cs != 20976:
-        gdaltest.post_reason('did not get expected checksum')
-        print(cs)
-        return 'fail'
+    assert cs == 20976, 'did not get expected checksum'
 
     ds = None
 
diff --git a/autotest/gcore/hfa_write.py b/autotest/gcore/hfa_write.py
index 70bc71d763cf..ad997d88b35e 100755
--- a/autotest/gcore/hfa_write.py
+++ b/autotest/gcore/hfa_write.py
@@ -60,9 +60,7 @@ def test_hfa_write_desc():
 
     new_ds = gdal.Open('tmp/test_desc.img')
     bnd = new_ds.GetRasterBand(1)
-    if bnd.GetDescription() != 'CustomBandName':
-        gdaltest.post_reason('Didnt get custom band name.')
-        return 'fail'
+    assert bnd.GetDescription() == 'CustomBandName', 'Didnt get custom band name.'
 
     bnd = None
     new_ds = None
@@ -85,10 +83,7 @@ def test_hfa_write_4bit():
     ds = gdal.Open('tmp/4bit.img')
     cs = ds.GetRasterBand(1).Checksum()
 
-    if cs != 252:
-        gdaltest.post_reason('Got wrong checksum on 4bit image.')
-        print(cs)
-        return 'fail'
+    assert cs == 252, 'Got wrong checksum on 4bit image.'
 
     ds = None
 
@@ -111,10 +106,7 @@ def test_hfa_write_4bit_compressed():
     ds = gdal.Open('tmp/4bitc.img')
     cs = ds.GetRasterBand(1).Checksum()
 
-    if cs != 252:
-        gdaltest.post_reason('Got wrong checksum on 4bit image.')
-        print(cs)
-        return 'fail'
+    assert cs == 252, 'Got wrong checksum on 4bit image.'
 
     ds = None
 
@@ -137,10 +129,7 @@ def test_hfa_write_nd_invalid():
     ds = gdal.Open('tmp/ndinvalid.img')
     cs = ds.GetRasterBand(1).Checksum()
 
-    if cs != 29754:
-        gdaltest.post_reason('Got wrong checksum on invalid image.')
-        print(cs)
-        return 'fail'
+    assert cs == 29754, 'Got wrong checksum on invalid image.'
 
     ds = None
 
@@ -160,10 +149,7 @@ def test_hfa_update_overviews():
     ds = gdal.Open('tmp/small.img', gdal.GA_Update)
     result = ds.BuildOverviews(overviewlist=[2])
 
-    if result != 0:
-        print(result)
-        gdaltest.post_reason('BuildOverviews() failed.')
-        return 'fail'
+    assert result == 0, 'BuildOverviews() failed.'
     ds = None
 
     return 'success'
@@ -177,19 +163,13 @@ def test_hfa_clean_external_overviews():
     ds = gdal.Open('tmp/small.img', gdal.GA_Update)
     result = ds.BuildOverviews(overviewlist=[])
 
-    if result != 0:
-        gdaltest.post_reason('BuildOverviews() failed.')
-        return 'fail'
+    assert result == 0, 'BuildOverviews() failed.'
 
-    if ds.GetRasterBand(1).GetOverviewCount() != 0:
-        gdaltest.post_reason('Overviews still exist.')
-        return 'fail'
+    assert ds.GetRasterBand(1).GetOverviewCount() == 0, 'Overviews still exist.'
 
     ds = None
     ds = gdal.Open('tmp/small.img')
-    if ds.GetRasterBand(1).GetOverviewCount() != 0:
-        gdaltest.post_reason('Overviews still exist.')
-        return 'fail'
+    assert ds.GetRasterBand(1).GetOverviewCount() == 0, 'Overviews still exist.'
     ds = None
 
     try:
@@ -234,10 +214,7 @@ def test_hfa_use_rrd():
     result = ds.BuildOverviews(overviewlist=[2])
     gdal.SetConfigOption('HFA_USE_RRD', old_value)
 
-    if result != 0:
-        print(result)
-        gdaltest.post_reason('BuildOverviews() failed.')
-        return 'fail'
+    assert result == 0, 'BuildOverviews() failed.'
     ds = None
 
     try:
@@ -247,10 +224,8 @@ def test_hfa_use_rrd():
         return 'fail'
 
     ds = gdal.Open('tmp/small.img')
-    if ds.GetRasterBand(1).GetOverview(0).Checksum() != 26148:
-        print(ds.GetRasterBand(1).GetOverview(0).Checksum())
-        gdaltest.post_reason('Unexpected checksum.')
-        return 'fail'
+    assert ds.GetRasterBand(1).GetOverview(0).Checksum() == 26148, \
+        'Unexpected checksum.'
 
     ds = None
 
diff --git a/autotest/gcore/histogram.py b/autotest/gcore/histogram.py
index 751ec3335229..e5945ae8779c 100755
--- a/autotest/gcore/histogram.py
+++ b/autotest/gcore/histogram.py
@@ -49,10 +49,7 @@ def test_histogram_1():
 
     exp_hist = [2, 0, 0, 0, 0, 0, 0, 0, 8, 0, 0, 0, 0, 0, 0, 0, 23, 0, 0, 0, 0, 0, 0, 0, 0, 29, 0, 0, 0, 0, 0, 0, 0, 46, 0, 0, 0, 0, 0, 0, 0, 69, 0, 0, 0, 0, 0, 0, 0, 99, 0, 0, 0, 0, 0, 0, 0, 0, 120, 0, 0, 0, 0, 0, 0, 0, 178, 0, 0, 0, 0, 0, 0, 0, 193, 0, 0, 0, 0, 0, 0, 0, 212, 0, 0, 0, 0, 0, 0, 0, 281, 0, 0, 0, 0, 0, 0, 0, 0, 365, 0, 0, 0, 0, 0, 0, 0, 460, 0, 0, 0, 0, 0, 0, 0, 533, 0, 0, 0, 0, 0, 0, 0, 544, 0, 0, 0, 0, 0, 0, 0, 0, 626, 0, 0, 0, 0, 0, 0, 0, 653, 0, 0, 0, 0, 0, 0, 0, 673, 0, 0, 0, 0, 0, 0, 0, 629, 0, 0, 0, 0, 0, 0, 0, 0, 586, 0, 0, 0, 0, 0, 0, 0, 541, 0, 0, 0, 0, 0, 0, 0, 435, 0, 0, 0, 0, 0, 0, 0, 348, 0, 0, 0, 0, 0, 0, 0, 341, 0, 0, 0, 0, 0, 0, 0, 0, 284, 0, 0, 0, 0, 0, 0, 0, 225, 0, 0, 0, 0, 0, 0, 0, 237, 0, 0, 0, 0, 0, 0, 0, 172, 0, 0, 0, 0, 0, 0, 0, 0, 159, 0, 0, 0, 0, 0, 0, 0, 105, 0, 0, 0, 0, 0, 0, 0, 824]
 
-    if hist != exp_hist:
-        gdaltest.post_reason('did not get expected histogram.')
-        print(hist)
-        return 'fail'
+    assert hist == exp_hist, 'did not get expected histogram.'
 
     return 'success'
 
@@ -67,10 +64,7 @@ def test_histogram_2():
 
     exp_hist = [10, 52, 115, 219, 371, 493, 825, 1077, 1279, 1302, 1127, 783, 625, 462, 331, 929]
 
-    if hist != exp_hist:
-        gdaltest.post_reason('did not get expected histogram.')
-        print(hist)
-        return 'fail'
+    assert hist == exp_hist, 'did not get expected histogram.'
 
     return 'success'
 
@@ -87,10 +81,7 @@ def test_histogram_3():
 
     exp_hist = [0, 0, 0, 0, 0, 1, 0, 1, 1, 3, 3, 2, 0, 5, 3, 4, 0, 1, 1, 2, 3]
 
-    if hist != exp_hist:
-        gdaltest.post_reason('did not get expected histogram.')
-        print(hist)
-        return 'fail'
+    assert hist == exp_hist, 'did not get expected histogram.'
 
     return 'success'
 
@@ -107,10 +98,7 @@ def test_histogram_4():
 
     exp_hist = [0, 0, 0, 0, 0, 1, 0, 1, 1, 3, 3, 2, 0, 5, 3, 4, 0, 1, 1, 2, 0]
 
-    if hist != exp_hist:
-        gdaltest.post_reason('did not get expected histogram.')
-        print(hist)
-        return 'fail'
+    assert hist == exp_hist, 'did not get expected histogram.'
 
     ds = None
 
@@ -129,10 +117,7 @@ def test_histogram_5():
 
     exp_hist = (-0.5, 255.5, 256, [2, 0, 0, 0, 0, 0, 0, 0, 8, 0, 0, 0, 0, 0, 0, 0, 23, 0, 0, 0, 0, 0, 0, 0, 0, 29, 0, 0, 0, 0, 0, 0, 0, 46, 0, 0, 0, 0, 0, 0, 0, 69, 0, 0, 0, 0, 0, 0, 0, 99, 0, 0, 0, 0, 0, 0, 0, 0, 120, 0, 0, 0, 0, 0, 0, 0, 178, 0, 0, 0, 0, 0, 0, 0, 193, 0, 0, 0, 0, 0, 0, 0, 212, 0, 0, 0, 0, 0, 0, 0, 281, 0, 0, 0, 0, 0, 0, 0, 0, 365, 0, 0, 0, 0, 0, 0, 0, 460, 0, 0, 0, 0, 0, 0, 0, 533, 0, 0, 0, 0, 0, 0, 0, 544, 0, 0, 0, 0, 0, 0, 0, 0, 626, 0, 0, 0, 0, 0, 0, 0, 653, 0, 0, 0, 0, 0, 0, 0, 673, 0, 0, 0, 0, 0, 0, 0, 629, 0, 0, 0, 0, 0, 0, 0, 0, 586, 0, 0, 0, 0, 0, 0, 0, 541, 0, 0, 0, 0, 0, 0, 0, 435, 0, 0, 0, 0, 0, 0, 0, 348, 0, 0, 0, 0, 0, 0, 0, 341, 0, 0, 0, 0, 0, 0, 0, 0, 284, 0, 0, 0, 0, 0, 0, 0, 225, 0, 0, 0, 0, 0, 0, 0, 237, 0, 0, 0, 0, 0, 0, 0, 172, 0, 0, 0, 0, 0, 0, 0, 0, 159, 0, 0, 0, 0, 0, 0, 0, 105, 0, 0, 0, 0, 0, 0, 0, 824])
 
-    if hist != exp_hist:
-        gdaltest.post_reason('did not get expected histogram.')
-        print(hist)
-        return 'fail'
+    assert hist == exp_hist, 'did not get expected histogram.'
 
     ds = None
 
@@ -149,10 +134,7 @@ def test_histogram_6():
     shutil.copy('../gdrivers/data/albania.jpg', 'tmp/albania.jpg')
     ds = gdal.Open('tmp/albania.jpg')
     hist = ds.GetRasterBand(1).GetDefaultHistogram(force=0)
-    if hist is not None:
-        gdaltest.post_reason('did not get expected histogram.')
-        print(hist)
-        return 'fail'
+    assert hist is None, 'did not get expected histogram.'
     ds = None
     os.unlink('tmp/albania.jpg')
 
diff --git a/autotest/gcore/identify.py b/autotest/gcore/identify.py
index 0890ae9c146c..fffe54656764 100755
--- a/autotest/gcore/identify.py
+++ b/autotest/gcore/identify.py
@@ -43,9 +43,8 @@ def test_identify_1():
     file_list = gdal.ReadDir('data')
 
     dr = gdal.IdentifyDriver('data/byte.tif', file_list)
-    if dr is None or dr.GetDescription() != 'GTiff':
-        gdaltest.post_reason('Got wrong driver for byte.tif')
-        return 'fail'
+    assert dr is not None and dr.GetDescription() == 'GTiff', \
+        'Got wrong driver for byte.tif'
 
     return 'success'
 
@@ -58,9 +57,7 @@ def test_identify_2():
     file_list = gdal.ReadDir('data')
 
     dr = gdal.IdentifyDriver('data/byte.pnm.aux.xml', file_list)
-    if dr is not None:
-        gdaltest.post_reason('Got a driver for byte.pnm.aux.xml!')
-        return 'fail'
+    assert dr is None, 'Got a driver for byte.pnm.aux.xml!'
 
     return 'success'
 
@@ -71,9 +68,7 @@ def test_identify_2():
 def test_identify_3():
 
     dr = gdal.IdentifyDriver('data')
-    if dr is not None:
-        gdaltest.post_reason('Got a driver for data directory!')
-        return 'fail'
+    assert dr is None, 'Got a driver for data directory!'
 
     return 'success'
 
@@ -84,34 +79,24 @@ def test_identify_3():
 def test_identify_4():
 
     dr = gdal.IdentifyDriverEx('data/byte.tif')
-    if dr is None or dr.GetDescription() != 'GTiff':
-        gdaltest.post_reason('Got wrong driver for byte.tif')
-        return 'fail'
+    assert dr is not None and dr.GetDescription() == 'GTiff', \
+        'Got wrong driver for byte.tif'
 
     dr = gdal.IdentifyDriverEx('data/byte.tif', gdal.OF_RASTER)
-    if dr is None or dr.GetDescription() != 'GTiff':
-        gdaltest.post_reason('Got wrong driver for byte.tif')
-        return 'fail'
+    assert dr is not None and dr.GetDescription() == 'GTiff', \
+        'Got wrong driver for byte.tif'
 
     dr = gdal.IdentifyDriverEx('data/byte.tif', gdal.OF_VECTOR)
-    if dr is not None:
-        gdaltest.post_reason('Got wrong driver for byte.tif')
-        return 'fail'
+    assert dr is None, 'Got wrong driver for byte.tif'
 
     dr = gdal.IdentifyDriverEx('data/byte.tif', allowed_drivers=['HFA'])
-    if dr is not None:
-        gdaltest.post_reason('Got wrong driver for byte.tif')
-        return 'fail'
+    assert dr is None, 'Got wrong driver for byte.tif'
 
     dr = gdal.IdentifyDriverEx('../gdrivers/data/aea.dat', sibling_files=['aea.dat'])
-    if dr is not None:
-        gdaltest.post_reason('Got a driver, which was not expected!')
-        return 'fail'
+    assert dr is None, 'Got a driver, which was not expected!'
 
     dr = gdal.IdentifyDriverEx('../gdrivers/data/aea.dat', sibling_files=['aea.dat', 'aea.hdr'])
-    if dr is None:
-        gdaltest.post_reason('Did not get a driver!')
-        return 'fail'
+    assert dr is not None, 'Did not get a driver!'
 
     return 'success'
 
diff --git a/autotest/gcore/mask.py b/autotest/gcore/mask.py
index 563ea4a3e506..dca7c291ea10 100755
--- a/autotest/gcore/mask.py
+++ b/autotest/gcore/mask.py
@@ -44,27 +44,17 @@ def test_mask_1():
 
     ds = gdal.Open('data/byte.tif')
 
-    if ds is None:
-        gdaltest.post_reason('Failed to open test dataset.')
-        return 'fail'
+    assert ds is not None, 'Failed to open test dataset.'
 
     band = ds.GetRasterBand(1)
 
-    if band.GetMaskFlags() != gdal.GMF_ALL_VALID:
-        gdaltest.post_reason('Did not get expected mask.')
-        return 'fail'
+    assert band.GetMaskFlags() == gdal.GMF_ALL_VALID, 'Did not get expected mask.'
 
     cs = band.GetMaskBand().Checksum()
-    if cs != 4873:
-        gdaltest.post_reason('Got wrong mask checksum')
-        print(cs)
-        return 'fail'
+    assert cs == 4873, 'Got wrong mask checksum'
 
     my_min, my_max, mean, stddev = band.GetMaskBand().ComputeStatistics(0)
-    if (my_min, my_max, mean, stddev) != (255, 255, 255, 0):
-        gdaltest.post_reason('Got wrong mask stats')
-        print(my_min, my_max, mean, stddev)
-        return 'fail'
+    assert (my_min, my_max, mean, stddev) == (255, 255, 255, 0), 'Got wrong mask stats'
 
     return 'success'
 
@@ -76,21 +66,14 @@ def test_mask_2():
 
     ds = gdal.Open('data/byte.vrt')
 
-    if ds is None:
-        gdaltest.post_reason('Failed to open test dataset.')
-        return 'fail'
+    assert ds is not None, 'Failed to open test dataset.'
 
     band = ds.GetRasterBand(1)
 
-    if band.GetMaskFlags() != gdal.GMF_NODATA:
-        gdaltest.post_reason('Did not get expected mask.')
-        return 'fail'
+    assert band.GetMaskFlags() == gdal.GMF_NODATA, 'Did not get expected mask.'
 
     cs = band.GetMaskBand().Checksum()
-    if cs != 4209:
-        gdaltest.post_reason('Got wrong mask checksum')
-        print(cs)
-        return 'fail'
+    assert cs == 4209, 'Got wrong mask checksum'
 
     return 'success'
 
@@ -102,23 +85,17 @@ def test_mask_3():
 
     ds = gdal.Open('data/stefan_full_rgba.png')
 
-    if ds is None:
-        gdaltest.post_reason('Failed to open test dataset.')
-        return 'fail'
+    assert ds is not None, 'Failed to open test dataset.'
 
     # Test first mask.
 
     band = ds.GetRasterBand(1)
 
-    if band.GetMaskFlags() != gdal.GMF_ALPHA + gdal.GMF_PER_DATASET:
-        gdaltest.post_reason('Did not get expected mask.')
-        return 'fail'
+    assert band.GetMaskFlags() == gdal.GMF_ALPHA + gdal.GMF_PER_DATASET, \
+        'Did not get expected mask.'
 
     cs = band.GetMaskBand().Checksum()
-    if cs != 10807:
-        gdaltest.post_reason('Got wrong mask checksum')
-        print(cs)
-        return 'fail'
+    assert cs == 10807, 'Got wrong mask checksum'
 
     # Verify second and third same as first.
 
@@ -128,22 +105,16 @@ def test_mask_3():
     # We have commented the following tests as SWIG >= 1.3.37 is buggy !
     #  or str(band_2.GetMaskBand()) != str(band.GetMaskBand()) \
     #   or str(band_3.GetMaskBand()) != str(band.GetMaskBand())
-    if band_2.GetMaskFlags() != band.GetMaskFlags() \
-       or band_3.GetMaskFlags() != band.GetMaskFlags():
-        gdaltest.post_reason('Band 2 or 3 does not seem to match first mask')
-        return 'fail'
+    assert band_2.GetMaskFlags() == band.GetMaskFlags() and band_3.GetMaskFlags() == band.GetMaskFlags(), \
+        'Band 2 or 3 does not seem to match first mask'
 
     # Verify alpha has no mask.
     band = ds.GetRasterBand(4)
-    if band.GetMaskFlags() != gdal.GMF_ALL_VALID:
-        gdaltest.post_reason('Did not get expected mask for alpha.')
-        return 'fail'
+    assert band.GetMaskFlags() == gdal.GMF_ALL_VALID, \
+        'Did not get expected mask for alpha.'
 
     cs = band.GetMaskBand().Checksum()
-    if cs != 36074:
-        gdaltest.post_reason('Got wrong alpha mask checksum')
-        print(cs)
-        return 'fail'
+    assert cs == 36074, 'Got wrong alpha mask checksum'
 
     return 'success'
 
@@ -155,9 +126,7 @@ def test_mask_4():
 
     src_ds = gdal.Open('../gdrivers/data/masked.jpg')
 
-    if src_ds is None:
-        gdaltest.post_reason('Failed to open test dataset.')
-        return 'fail'
+    assert src_ds is not None, 'Failed to open test dataset.'
 
     # NOTE: for now we copy to PNM since it does everything (overviews too)
     # externally. Should eventually test with gtiff, hfa.
@@ -166,19 +135,14 @@ def test_mask_4():
     src_ds = None
 
     # confirm we got the custom mask on the copied dataset.
-    if ds.GetRasterBand(1).GetMaskFlags() != gdal.GMF_PER_DATASET:
-        gdaltest.post_reason('did not get expected mask flags')
-        print(ds.GetRasterBand(1).GetMaskFlags())
-        return 'fail'
+    assert ds.GetRasterBand(1).GetMaskFlags() == gdal.GMF_PER_DATASET, \
+        'did not get expected mask flags'
 
     msk = ds.GetRasterBand(1).GetMaskBand()
     cs = msk.Checksum()
     expected_cs = 770
 
-    if cs != expected_cs:
-        gdaltest.post_reason('Did not get expected checksum')
-        print(cs)
-        return 'fail'
+    assert cs == expected_cs, 'Did not get expected checksum'
 
     msk = None
     ds = None
@@ -199,9 +163,7 @@ def test_mask_5():
 
     ds = gdal.Open('tmp/mask_4.pnm', gdal.GA_Update)
 
-    if ds is None:
-        gdaltest.post_reason('Failed to open test dataset.')
-        return 'fail'
+    assert ds is not None, 'Failed to open test dataset.'
 
     # So that we instantiate the mask band before.
     ds.GetRasterBand(1).GetMaskFlags()
@@ -211,19 +173,13 @@ def test_mask_5():
     # confirm mask flags on overview.
     ovr = ds.GetRasterBand(1).GetOverview(1)
 
-    if ovr.GetMaskFlags() != gdal.GMF_PER_DATASET:
-        gdaltest.post_reason('did not get expected mask flags')
-        print(ovr.GetMaskFlags())
-        return 'fail'
+    assert ovr.GetMaskFlags() == gdal.GMF_PER_DATASET, 'did not get expected mask flags'
 
     msk = ovr.GetMaskBand()
     cs = msk.Checksum()
     expected_cs = 20505
 
-    if cs != expected_cs:
-        gdaltest.post_reason('Did not get expected checksum')
-        print(cs)
-        return 'fail'
+    assert cs == expected_cs, 'Did not get expected checksum'
     ovr = None
     msk = None
     ds = None
@@ -234,19 +190,13 @@ def test_mask_5():
     # confirm mask flags on overview.
     ovr = ds.GetRasterBand(1).GetOverview(1)
 
-    if ovr.GetMaskFlags() != gdal.GMF_PER_DATASET:
-        gdaltest.post_reason('did not get expected mask flags')
-        print(ovr.GetMaskFlags())
-        return 'fail'
+    assert ovr.GetMaskFlags() == gdal.GMF_PER_DATASET, 'did not get expected mask flags'
 
     msk = ovr.GetMaskBand()
     cs = msk.Checksum()
     expected_cs = 20505
 
-    if cs != expected_cs:
-        gdaltest.post_reason('Did not get expected checksum')
-        print(cs)
-        return 'fail'
+    assert cs == expected_cs, 'Did not get expected checksum'
 
     ovr = None
     msk = None
@@ -265,21 +215,14 @@ def test_mask_6():
     gdal.SetConfigOption('GDAL_TIFF_INTERNAL_MASK_TO_8BIT', 'FALSE')
     ds = gdal.Open('data/test_with_mask_1bit.tif')
 
-    if ds is None:
-        gdaltest.post_reason('Failed to open test dataset.')
-        return 'fail'
+    assert ds is not None, 'Failed to open test dataset.'
 
     band = ds.GetRasterBand(1)
 
-    if band.GetMaskFlags() != gdal.GMF_PER_DATASET:
-        gdaltest.post_reason('Did not get expected mask.')
-        return 'fail'
+    assert band.GetMaskFlags() == gdal.GMF_PER_DATASET, 'Did not get expected mask.'
 
     cs = band.GetMaskBand().Checksum()
-    if cs != 100:
-        gdaltest.post_reason('Got wrong mask checksum')
-        print(cs)
-        return 'fail'
+    assert cs == 100, 'Got wrong mask checksum'
 
     gdal.SetConfigOption('GDAL_TIFF_INTERNAL_MASK_TO_8BIT', 'TRUE')
 
@@ -294,22 +237,15 @@ def test_mask_7():
     gdal.SetConfigOption('GDAL_TIFF_INTERNAL_MASK_TO_8BIT', 'FALSE')
     ds = gdal.Open('data/test3_with_1mask_1bit.tif')
 
-    if ds is None:
-        gdaltest.post_reason('Failed to open test dataset.')
-        return 'fail'
+    assert ds is not None, 'Failed to open test dataset.'
 
     for i in (1, 2, 3):
         band = ds.GetRasterBand(i)
 
-        if band.GetMaskFlags() != gdal.GMF_PER_DATASET:
-            gdaltest.post_reason('Did not get expected mask.')
-            return 'fail'
+        assert band.GetMaskFlags() == gdal.GMF_PER_DATASET, 'Did not get expected mask.'
 
         cs = band.GetMaskBand().Checksum()
-        if cs != 100:
-            gdaltest.post_reason('Got wrong mask checksum')
-            print(cs)
-            return 'fail'
+        assert cs == 100, 'Got wrong mask checksum'
 
     gdal.SetConfigOption('GDAL_TIFF_INTERNAL_MASK_TO_8BIT', 'TRUE')
 
@@ -324,21 +260,14 @@ def test_mask_8():
 
     ds = gdal.Open('data/test_with_mask_8bit.tif')
 
-    if ds is None:
-        gdaltest.post_reason('Failed to open test dataset.')
-        return 'fail'
+    assert ds is not None, 'Failed to open test dataset.'
 
     band = ds.GetRasterBand(1)
 
-    if band.GetMaskFlags() != gdal.GMF_PER_DATASET:
-        gdaltest.post_reason('Did not get expected mask.')
-        return 'fail'
+    assert band.GetMaskFlags() == gdal.GMF_PER_DATASET, 'Did not get expected mask.'
 
     cs = band.GetMaskBand().Checksum()
-    if cs != 1222:
-        gdaltest.post_reason('Got wrong mask checksum')
-        print(cs)
-        return 'fail'
+    assert cs == 1222, 'Got wrong mask checksum'
 
     return 'success'
 
@@ -351,22 +280,15 @@ def test_mask_9():
 
     ds = gdal.Open('data/test3_with_mask_1bit.tif')
 
-    if ds is None:
-        gdaltest.post_reason('Failed to open test dataset.')
-        return 'fail'
+    assert ds is not None, 'Failed to open test dataset.'
 
     for i in (1, 2, 3):
         band = ds.GetRasterBand(i)
 
-        if band.GetMaskFlags() != 0:
-            gdaltest.post_reason('Did not get expected mask.')
-            return 'fail'
+        assert band.GetMaskFlags() == 0, 'Did not get expected mask.'
 
         cs = band.GetMaskBand().Checksum()
-        if cs != 100:
-            gdaltest.post_reason('Got wrong mask checksum')
-            print(cs)
-            return 'fail'
+        assert cs == 100, 'Got wrong mask checksum'
 
     return 'success'
 
@@ -379,22 +301,15 @@ def test_mask_10():
 
     ds = gdal.Open('data/test3_with_mask_8bit.tif')
 
-    if ds is None:
-        gdaltest.post_reason('Failed to open test dataset.')
-        return 'fail'
+    assert ds is not None, 'Failed to open test dataset.'
 
     for i in (1, 2, 3):
         band = ds.GetRasterBand(i)
 
-        if band.GetMaskFlags() != 0:
-            gdaltest.post_reason('Did not get expected mask.')
-            return 'fail'
+        assert band.GetMaskFlags() == 0, 'Did not get expected mask.'
 
         cs = band.GetMaskBand().Checksum()
-        if cs != 1222:
-            gdaltest.post_reason('Got wrong mask checksum')
-            print(cs)
-            return 'fail'
+        assert cs == 1222, 'Got wrong mask checksum'
 
     return 'success'
 
@@ -408,49 +323,31 @@ def test_mask_11():
     gdal.SetConfigOption('GDAL_TIFF_INTERNAL_MASK_TO_8BIT', 'FALSE')
     ds = gdal.Open('data/test_with_mask_1bit_and_ovr.tif')
 
-    if ds is None:
-        gdaltest.post_reason('Failed to open test dataset.')
-        return 'fail'
+    assert ds is not None, 'Failed to open test dataset.'
 
     band = ds.GetRasterBand(1)
 
     # Let's fetch the mask
-    if band.GetMaskFlags() != gdal.GMF_PER_DATASET:
-        gdaltest.post_reason('Did not get expected mask.')
-        return 'fail'
+    assert band.GetMaskFlags() == gdal.GMF_PER_DATASET, 'Did not get expected mask.'
 
     cs = band.GetMaskBand().Checksum()
-    if cs != 100:
-        gdaltest.post_reason('Got wrong mask checksum')
-        print(cs)
-        return 'fail'
+    assert cs == 100, 'Got wrong mask checksum'
 
     # Let's fetch the overview
     band = ds.GetRasterBand(1).GetOverview(0)
     cs = band.Checksum()
-    if cs != 1126:
-        gdaltest.post_reason('Got wrong overview checksum')
-        print(cs)
-        return 'fail'
+    assert cs == 1126, 'Got wrong overview checksum'
 
     # Let's fetch the mask of the overview
-    if band.GetMaskFlags() != gdal.GMF_PER_DATASET:
-        gdaltest.post_reason('Did not get expected mask.')
-        return 'fail'
+    assert band.GetMaskFlags() == gdal.GMF_PER_DATASET, 'Did not get expected mask.'
 
     cs = band.GetMaskBand().Checksum()
-    if cs != 25:
-        gdaltest.post_reason('Got wrong checksum for the mask of the overview')
-        print(cs)
-        return 'fail'
+    assert cs == 25, 'Got wrong checksum for the mask of the overview'
 
     # Let's fetch the overview of the mask == the mask of the overview
     band = ds.GetRasterBand(1).GetMaskBand().GetOverview(0)
     cs = band.Checksum()
-    if cs != 25:
-        gdaltest.post_reason('Got wrong checksum for the overview of the mask')
-        print(cs)
-        return 'fail'
+    assert cs == 25, 'Got wrong checksum for the overview of the mask'
 
     gdal.SetConfigOption('GDAL_TIFF_INTERNAL_MASK_TO_8BIT', 'TRUE')
 
@@ -466,50 +363,32 @@ def test_mask_12():
     gdal.SetConfigOption('GDAL_TIFF_INTERNAL_MASK_TO_8BIT', 'FALSE')
     ds = gdal.Open('data/test3_with_mask_1bit_and_ovr.tif')
 
-    if ds is None:
-        gdaltest.post_reason('Failed to open test dataset.')
-        return 'fail'
+    assert ds is not None, 'Failed to open test dataset.'
 
     for i in (1, 2, 3):
         band = ds.GetRasterBand(i)
 
         # Let's fetch the mask
-        if band.GetMaskFlags() != gdal.GMF_PER_DATASET:
-            gdaltest.post_reason('Did not get expected mask.')
-            return 'fail'
+        assert band.GetMaskFlags() == gdal.GMF_PER_DATASET, 'Did not get expected mask.'
 
         cs = band.GetMaskBand().Checksum()
-        if cs != 100:
-            gdaltest.post_reason('Got wrong mask checksum')
-            print(cs)
-            return 'fail'
+        assert cs == 100, 'Got wrong mask checksum'
 
         # Let's fetch the overview
         band = ds.GetRasterBand(i).GetOverview(0)
         cs = band.Checksum()
-        if cs != 1126:
-            gdaltest.post_reason('Got wrong overview checksum')
-            print(cs)
-            return 'fail'
+        assert cs == 1126, 'Got wrong overview checksum'
 
         # Let's fetch the mask of the overview
-        if band.GetMaskFlags() != gdal.GMF_PER_DATASET:
-            gdaltest.post_reason('Did not get expected mask.')
-            return 'fail'
+        assert band.GetMaskFlags() == gdal.GMF_PER_DATASET, 'Did not get expected mask.'
 
         cs = band.GetMaskBand().Checksum()
-        if cs != 25:
-            gdaltest.post_reason('Got wrong checksum for the mask of the overview')
-            print(cs)
-            return 'fail'
+        assert cs == 25, 'Got wrong checksum for the mask of the overview'
 
         # Let's fetch the overview of the mask == the mask of the overview
         band = ds.GetRasterBand(i).GetMaskBand().GetOverview(0)
         cs = band.Checksum()
-        if cs != 25:
-            gdaltest.post_reason('Got wrong checksum for the overview of the mask')
-            print(cs)
-            return 'fail'
+        assert cs == 25, 'Got wrong checksum for the overview of the mask'
 
     gdal.SetConfigOption('GDAL_TIFF_INTERNAL_MASK_TO_8BIT', 'TRUE')
 
@@ -525,9 +404,7 @@ def test_mask_13():
 
     src_ds = gdal.Open('data/byte.tif')
 
-    if src_ds is None:
-        gdaltest.post_reason('Failed to open test dataset.')
-        return 'fail'
+    assert src_ds is not None, 'Failed to open test dataset.'
 
     drv = gdal.GetDriverByName('GTiff')
     ds = drv.CreateCopy('tmp/byte_with_mask.tif', src_ds)
@@ -536,18 +413,12 @@ def test_mask_13():
     ds.CreateMaskBand(gdal.GMF_PER_DATASET)
 
     cs = ds.GetRasterBand(1).GetMaskBand().Checksum()
-    if cs != 0:
-        print(cs)
-        gdaltest.post_reason('Got wrong checksum for the mask')
-        return 'fail'
+    assert cs == 0, 'Got wrong checksum for the mask'
 
     ds.GetRasterBand(1).GetMaskBand().Fill(1)
 
     cs = ds.GetRasterBand(1).GetMaskBand().Checksum()
-    if cs != 400:
-        print(cs)
-        gdaltest.post_reason('Got wrong checksum for the mask')
-        return 'fail'
+    assert cs == 400, 'Got wrong checksum for the mask'
 
     ds = None
 
@@ -559,15 +430,11 @@ def test_mask_13():
 
     ds = gdal.Open('tmp/byte_with_mask.tif')
 
-    if ds.GetRasterBand(1).GetMaskFlags() != gdal.GMF_PER_DATASET:
-        gdaltest.post_reason('wrong mask flags')
-        return 'fail'
+    assert ds.GetRasterBand(1).GetMaskFlags() == gdal.GMF_PER_DATASET, \
+        'wrong mask flags'
 
     cs = ds.GetRasterBand(1).GetMaskBand().Checksum()
-    if cs != 400:
-        print(cs)
-        gdaltest.post_reason('Got wrong checksum for the mask')
-        return 'fail'
+    assert cs == 400, 'Got wrong checksum for the mask'
 
     ds = None
 
@@ -590,9 +457,7 @@ def test_mask_14():
 
     src_ds = gdal.Open('data/byte.tif')
 
-    if src_ds is None:
-        gdaltest.post_reason('Failed to open test dataset.')
-        return 'fail'
+    assert src_ds is not None, 'Failed to open test dataset.'
 
     drv = gdal.GetDriverByName('GTiff')
     gdal.SetConfigOption('GDAL_TIFF_INTERNAL_MASK_TO_8BIT', 'FALSE')
@@ -604,45 +469,31 @@ def test_mask_14():
     with gdaltest.error_handler():
         with gdaltest.config_option('GDAL_TIFF_INTERNAL_MASK', 'YES'):
             ret = ds.CreateMaskBand(0)
-    if ret == 0:
-        gdaltest.post_reason('Error expected')
-        return 'fail'
+    assert ret != 0, 'Error expected'
 
     with gdaltest.config_option('GDAL_TIFF_INTERNAL_MASK', 'YES'):
         ret = ds.CreateMaskBand(gdal.GMF_PER_DATASET)
-    if ret != 0:
-        gdaltest.post_reason('Creation failed')
-        return 'fail'
+    assert ret == 0, 'Creation failed'
 
     cs = ds.GetRasterBand(1).GetMaskBand().Checksum()
-    if cs != 0:
-        print(cs)
-        gdaltest.post_reason('Got wrong checksum for the mask (1)')
-        return 'fail'
+    assert cs == 0, 'Got wrong checksum for the mask (1)'
 
     ds.GetRasterBand(1).GetMaskBand().Fill(1)
 
     cs = ds.GetRasterBand(1).GetMaskBand().Checksum()
-    if cs != 400:
-        print(cs)
-        gdaltest.post_reason('Got wrong checksum for the mask (2)')
-        return 'fail'
+    assert cs == 400, 'Got wrong checksum for the mask (2)'
 
     # This TIFF dataset has already an internal mask band
     with gdaltest.error_handler():
         with gdaltest.config_option('GDAL_TIFF_INTERNAL_MASK', 'YES'):
             ret = ds.CreateMaskBand(gdal.GMF_PER_DATASET)
-    if ret == 0:
-        gdaltest.post_reason('Error expected')
-        return 'fail'
+    assert ret != 0, 'Error expected'
 
     # This TIFF dataset has already an internal mask band
     with gdaltest.error_handler():
         with gdaltest.config_option('GDAL_TIFF_INTERNAL_MASK', 'YES'):
             ret = ds.GetRasterBand(1).CreateMaskBand(gdal.GMF_PER_DATASET)
-    if ret == 0:
-        gdaltest.post_reason('Error expected')
-        return 'fail'
+    assert ret != 0, 'Error expected'
 
     ds = None
 
@@ -656,17 +507,13 @@ def test_mask_14():
     gdal.SetConfigOption('GDAL_TIFF_INTERNAL_MASK_TO_8BIT', 'FALSE')
     ds = gdal.Open('tmp/byte_with_mask.tif')
 
-    if ds.GetRasterBand(1).GetMaskFlags() != gdal.GMF_PER_DATASET:
-        gdaltest.post_reason('wrong mask flags')
-        return 'fail'
+    assert ds.GetRasterBand(1).GetMaskFlags() == gdal.GMF_PER_DATASET, \
+        'wrong mask flags'
 
     gdal.SetConfigOption('GDAL_TIFF_INTERNAL_MASK_TO_8BIT', 'TRUE')
 
     cs = ds.GetRasterBand(1).GetMaskBand().Checksum()
-    if cs != 400:
-        print(cs)
-        gdaltest.post_reason('Got wrong checksum for the mask (3)')
-        return 'fail'
+    assert cs == 400, 'Got wrong checksum for the mask (3)'
 
     # Test fix for #5884
     gdal.SetConfigOption('GDAL_TIFF_INTERNAL_MASK', 'YES')
@@ -675,13 +522,9 @@ def test_mask_14():
     out_ds = drv.CreateCopy('/vsimem/byte_with_mask.tif', ds, options=['COMPRESS=JPEG'])
     gdal.SetConfigOption('GDAL_TIFF_INTERNAL_MASK', None)
     gdal.SetCacheMax(old_val)
-    if out_ds.GetRasterBand(1).Checksum() == 0:
-        return 'fail'
+    assert out_ds.GetRasterBand(1).Checksum() != 0
     cs = ds.GetRasterBand(1).GetMaskBand().Checksum()
-    if cs != 400:
-        print(cs)
-        gdaltest.post_reason('Got wrong checksum for the mask (4)')
-        return 'fail'
+    assert cs == 400, 'Got wrong checksum for the mask (4)'
     out_ds = None
     drv.Delete('/vsimem/byte_with_mask.tif')
 
@@ -699,9 +542,7 @@ def mask_and_ovr(order, method):
 
     src_ds = gdal.Open('data/byte.tif')
 
-    if src_ds is None:
-        gdaltest.post_reason('Failed to open test dataset.')
-        return 'fail'
+    assert src_ds is not None, 'Failed to open test dataset.'
 
     drv = gdal.GetDriverByName('GTiff')
     ds = drv.CreateCopy('tmp/byte_with_ovr_and_mask.tif', src_ds)
@@ -757,29 +598,19 @@ def mask_and_ovr(order, method):
     gdal.SetConfigOption('GDAL_TIFF_INTERNAL_MASK_TO_8BIT', 'FALSE')
     ds = gdal.Open('tmp/byte_with_ovr_and_mask.tif')
 
-    if ds.GetRasterBand(1).GetMaskFlags() != gdal.GMF_PER_DATASET:
-        gdaltest.post_reason('wrong mask flags')
-        return 'fail'
+    assert ds.GetRasterBand(1).GetMaskFlags() == gdal.GMF_PER_DATASET, \
+        'wrong mask flags'
 
     gdal.SetConfigOption('GDAL_TIFF_INTERNAL_MASK_TO_8BIT', 'TRUE')
 
     cs = ds.GetRasterBand(1).GetMaskBand().Checksum()
-    if cs != 400:
-        print(cs)
-        gdaltest.post_reason('Got wrong checksum for the mask')
-        return 'fail'
+    assert cs == 400, 'Got wrong checksum for the mask'
 
     cs = ds.GetRasterBand(1).GetOverview(0).GetMaskBand().Checksum()
-    if cs != 100:
-        print(cs)
-        gdaltest.post_reason('Got wrong checksum for the mask of the first overview')
-        return 'fail'
+    assert cs == 100, 'Got wrong checksum for the mask of the first overview'
 
     cs = ds.GetRasterBand(1).GetOverview(1).GetMaskBand().Checksum()
-    if cs != 25:
-        print(cs)
-        gdaltest.post_reason('Got wrong checksum for the mask of the second overview')
-        return 'fail'
+    assert cs == 25, 'Got wrong checksum for the mask of the second overview'
 
     ds = None
 
@@ -827,23 +658,16 @@ def test_mask_19():
 
     ds = gdal.Open('data/test_nodatavalues.tif')
 
-    if ds is None:
-        gdaltest.post_reason('Failed to open test dataset.')
-        return 'fail'
+    assert ds is not None, 'Failed to open test dataset.'
 
-    if ds.GetRasterBand(1).GetMaskFlags() != gdal.GMF_PER_DATASET + gdal.GMF_NODATA:
-        gdaltest.post_reason('did not get expected mask flags')
-        print(ds.GetRasterBand(1).GetMaskFlags())
-        return 'fail'
+    assert ds.GetRasterBand(1).GetMaskFlags() == gdal.GMF_PER_DATASET + gdal.GMF_NODATA, \
+        'did not get expected mask flags'
 
     msk = ds.GetRasterBand(1).GetMaskBand()
     cs = msk.Checksum()
     expected_cs = 11043
 
-    if cs != expected_cs:
-        gdaltest.post_reason('Did not get expected checksum')
-        print(cs)
-        return 'fail'
+    assert cs == expected_cs, 'Did not get expected checksum'
 
     msk = None
     ds = None
@@ -868,14 +692,12 @@ def test_mask_20():
         ds.GetRasterBand(1).Fill(nodatavalue[i])
         ds.GetRasterBand(1).SetNoDataValue(nodatavalue[i])
 
-        if ds.GetRasterBand(1).GetMaskFlags() != gdal.GMF_NODATA:
-            gdaltest.post_reason('did not get expected mask flags for type %s' % gdal.GetDataTypeName(typ))
-            return 'fail'
+        assert ds.GetRasterBand(1).GetMaskFlags() == gdal.GMF_NODATA, \
+            ('did not get expected mask flags for type %s' % gdal.GetDataTypeName(typ))
 
         msk = ds.GetRasterBand(1).GetMaskBand()
-        if msk.Checksum() != 0:
-            gdaltest.post_reason('did not get expected mask checksum for type %s : %d' % gdal.GetDataTypeName(typ, msk.Checksum()))
-            return 'fail'
+        assert msk.Checksum() == 0, \
+            ('did not get expected mask checksum for type %s : %d' % gdal.GetDataTypeName(typ, msk.Checksum()))
 
         msk = None
         ds = None
@@ -905,14 +727,12 @@ def test_mask_21():
         ds.GetRasterBand(2).Fill(nodatavalue[i])
         ds.GetRasterBand(3).Fill(nodatavalue[i])
 
-        if ds.GetRasterBand(1).GetMaskFlags() != gdal.GMF_PER_DATASET + gdal.GMF_NODATA:
-            gdaltest.post_reason('did not get expected mask flags for type %s' % gdal.GetDataTypeName(typ))
-            return 'fail'
+        assert ds.GetRasterBand(1).GetMaskFlags() == gdal.GMF_PER_DATASET + gdal.GMF_NODATA, \
+            ('did not get expected mask flags for type %s' % gdal.GetDataTypeName(typ))
 
         msk = ds.GetRasterBand(1).GetMaskBand()
-        if msk.Checksum() != 0:
-            gdaltest.post_reason('did not get expected mask checksum for type %s : %d' % gdal.GetDataTypeName(typ, msk.Checksum()))
-            return 'fail'
+        assert msk.Checksum() == 0, \
+            ('did not get expected mask checksum for type %s : %d' % gdal.GetDataTypeName(typ, msk.Checksum()))
 
         msk = None
         ds = None
@@ -931,18 +751,12 @@ def test_mask_22():
     ds.CreateMaskBand(gdal.GMF_PER_DATASET)
 
     cs = ds.GetRasterBand(1).GetMaskBand().Checksum()
-    if cs != 0:
-        print(cs)
-        gdaltest.post_reason('Got wrong checksum for the mask')
-        return 'fail'
+    assert cs == 0, 'Got wrong checksum for the mask'
 
     ds.GetRasterBand(1).GetMaskBand().Fill(1)
 
     cs = ds.GetRasterBand(1).GetMaskBand().Checksum()
-    if cs != 400:
-        print(cs)
-        gdaltest.post_reason('Got wrong checksum for the mask')
-        return 'fail'
+    assert cs == 400, 'Got wrong checksum for the mask'
 
     ds = None
 
@@ -954,15 +768,11 @@ def test_mask_22():
 
     ds = gdal.Open('tmp/mask_22.tif')
 
-    if ds.GetRasterBand(1).GetMaskFlags() != gdal.GMF_PER_DATASET:
-        gdaltest.post_reason('wrong mask flags')
-        return 'fail'
+    assert ds.GetRasterBand(1).GetMaskFlags() == gdal.GMF_PER_DATASET, \
+        'wrong mask flags'
 
     cs = ds.GetRasterBand(1).GetMaskBand().Checksum()
-    if cs != 400:
-        print(cs)
-        gdaltest.post_reason('Got wrong checksum for the mask')
-        return 'fail'
+    assert cs == 400, 'Got wrong checksum for the mask'
 
     ds = None
 
@@ -1008,8 +818,7 @@ def test_mask_23():
     drv.Delete('tmp/mask_23_dst.tif')
 
     # 'ERROR 1: TIFFRewriteDirectory:Error fetching directory count' was triggered before
-    if error_msg != '':
-        return 'fail'
+    assert error_msg == ''
 
     return 'success'
 
@@ -1026,29 +835,22 @@ def test_mask_24():
     ds.GetRasterBand(3).Fill(65565)
     ds.GetRasterBand(4).Fill(65565)
 
-    if ds.GetRasterBand(1).GetMaskFlags() != gdal.GMF_ALPHA + gdal.GMF_PER_DATASET:
-        gdaltest.post_reason('Did not get expected mask.')
-        return 'fail'
+    assert ds.GetRasterBand(1).GetMaskFlags() == gdal.GMF_ALPHA + gdal.GMF_PER_DATASET, \
+        'Did not get expected mask.'
     mask = ds.GetRasterBand(1).GetMaskBand()
 
     # IRasterIO() optimized case
     import struct
-    if struct.unpack('B', mask.ReadRaster(0, 0, 1, 1))[0] != 255:
-        print(struct.unpack('B', mask.ReadRaster(0, 0, 1, 1))[0])
-        return 'fail'
+    assert struct.unpack('B', mask.ReadRaster(0, 0, 1, 1))[0] == 255
 
     # IReadBlock() code path
     (blockx, blocky) = mask.GetBlockSize()
-    if struct.unpack('B' * blockx * blocky, mask.ReadBlock(0, 0))[0] != 255:
-        print(struct.unpack('B' * blockx * blocky, mask.ReadBlock(0, 0))[0])
-        return 'fail'
+    assert struct.unpack('B' * blockx * blocky, mask.ReadBlock(0, 0))[0] == 255
     mask.FlushCache()
 
     # Test special case where dynamics is only 0-255
     ds.GetRasterBand(4).Fill(255)
-    if struct.unpack('B', mask.ReadRaster(0, 0, 1, 1))[0] != 1:
-        print(struct.unpack('B', mask.ReadRaster(0, 0, 1, 1))[0])
-        return 'fail'
+    assert struct.unpack('B', mask.ReadRaster(0, 0, 1, 1))[0] == 1
 
     ds = None
 
@@ -1063,19 +865,15 @@ def test_mask_24():
 def test_mask_25():
 
     ds = gdal.GetDriverByName('GTiff').Create('/vsimem/mask_25.tif', 1, 1)
-    if ds.GetRasterBand(1).GetMaskFlags() != gdal.GMF_ALL_VALID:
-        return 'fail'
+    assert ds.GetRasterBand(1).GetMaskFlags() == gdal.GMF_ALL_VALID
     ds = None
 
     # No INTERNAL_MASK_FLAGS_x metadata
     gdal.GetDriverByName('GTiff').Create('/vsimem/mask_25.tif.msk', 1, 1)
     ds = gdal.Open('/vsimem/mask_25.tif')
-    if ds.GetRasterBand(1).GetMaskFlags() != gdal.GMF_ALL_VALID:
-        return 'fail'
+    assert ds.GetRasterBand(1).GetMaskFlags() == gdal.GMF_ALL_VALID
     cs = ds.GetRasterBand(1).GetMaskBand().Checksum()
-    if cs != 3:
-        print(cs)
-        return 'fail'
+    assert cs == 3
     ds = None
     gdal.Unlink('/vsimem/mask_25.tif')
     gdal.Unlink('/vsimem/mask_25.tif.msk')
@@ -1085,12 +883,9 @@ def test_mask_25():
     ds.GetRasterBand(1).CreateMaskBand(0)
     ds = None
     ds = gdal.Open('/vsimem/mask_25.tif')
-    if ds.GetRasterBand(1).GetMaskFlags() != 0:
-        return 'fail'
+    assert ds.GetRasterBand(1).GetMaskFlags() == 0
     cs = ds.GetRasterBand(1).GetMaskBand().Checksum()
-    if cs != 0:
-        print(cs)
-        return 'fail'
+    assert cs == 0
     ds = None
     gdal.Unlink('/vsimem/mask_25.tif')
     gdal.Unlink('/vsimem/mask_25.tif.msk')
@@ -1102,8 +897,7 @@ def test_mask_25():
     ds = None
     ds = gdal.Open('/vsimem/mask_25.tif')
     with gdaltest.error_handler():
-        if ds.GetRasterBand(2).GetMaskFlags() != gdal.GMF_ALL_VALID:
-            return 'fail'
+        assert ds.GetRasterBand(2).GetMaskFlags() == gdal.GMF_ALL_VALID
     ds = None
     gdal.Unlink('/vsimem/mask_25.tif')
     gdal.Unlink('/vsimem/mask_25.tif.msk')
@@ -1112,8 +906,7 @@ def test_mask_25():
     ds = gdal.GetDriverByName('GTiff').Create('/vsimem/mask_25.tif', 1, 1, 2)
     ds.GetRasterBand(1).CreateMaskBand(gdal.GMF_PER_DATASET)
     with gdaltest.error_handler():
-        if ds.GetRasterBand(2).CreateMaskBand(0) == 0:
-            return 'fail'
+        assert ds.GetRasterBand(2).CreateMaskBand(0) != 0
     ds = None
     gdal.Unlink('/vsimem/mask_25.tif')
     gdal.Unlink('/vsimem/mask_25.tif.msk')
@@ -1136,16 +929,13 @@ def test_mask_26():
     ds.GetRasterBand(1).Fill(65565)
     ds.GetRasterBand(2).Fill(65565)
 
-    if ds.GetRasterBand(1).GetMaskFlags() != gdal.GMF_ALPHA + gdal.GMF_PER_DATASET:
-        gdaltest.post_reason('Did not get expected mask.')
-        return 'fail'
+    assert ds.GetRasterBand(1).GetMaskFlags() == gdal.GMF_ALPHA + gdal.GMF_PER_DATASET, \
+        'Did not get expected mask.'
     mask = ds.GetRasterBand(1).GetMaskBand()
 
     # IRasterIO() optimized case
     import struct
-    if struct.unpack('B', mask.ReadRaster(0, 0, 1, 1))[0] != 255:
-        print(struct.unpack('B', mask.ReadRaster(0, 0, 1, 1))[0])
-        return 'fail'
+    assert struct.unpack('B', mask.ReadRaster(0, 0, 1, 1))[0] == 255
 
     ds = None
 
@@ -1173,14 +963,12 @@ def test_mask_27():
         ds.GetRasterBand(1).Fill(nodatavalue[i], 10)
         ds.GetRasterBand(1).SetNoDataValue(nodatavalue[i])
 
-        if ds.GetRasterBand(1).GetMaskFlags() != gdal.GMF_NODATA:
-            gdaltest.post_reason('did not get expected mask flags for type %s' % gdal.GetDataTypeName(typ))
-            return 'fail'
+        assert ds.GetRasterBand(1).GetMaskFlags() == gdal.GMF_NODATA, \
+            ('did not get expected mask flags for type %s' % gdal.GetDataTypeName(typ))
 
         msk = ds.GetRasterBand(1).GetMaskBand()
-        if msk.Checksum() != 0:
-            gdaltest.post_reason('did not get expected mask checksum for type %s : %d' % gdal.GetDataTypeName(typ, msk.Checksum()))
-            return 'fail'
+        assert msk.Checksum() == 0, \
+            ('did not get expected mask checksum for type %s : %d' % gdal.GetDataTypeName(typ, msk.Checksum()))
 
         msk = None
         ds = None
diff --git a/autotest/gcore/minixml.py b/autotest/gcore/minixml.py
index eb642bf91b37..06bc2916e80a 100755
--- a/autotest/gcore/minixml.py
+++ b/autotest/gcore/minixml.py
@@ -43,70 +43,42 @@ def test_minixml_1():
 
     tree = gdal.ParseXMLString('<TestDoc style="123"><sub1/><sub2>abc</sub2></TestDoc>')
 
-    if tree[0] != gdal.CXT_Element:
-        gdaltest.post_reason('wrong node type.')
-        return 'fail'
+    assert tree[0] == gdal.CXT_Element, 'wrong node type.'
 
-    if tree[1] != 'TestDoc':
-        gdaltest.post_reason('Wrong element name')
-        return 'fail'
+    assert tree[1] == 'TestDoc', 'Wrong element name'
 
-    if len(tree) != 5:
-        gdaltest.post_reason('Wrong number of children.')
-        return 'fail'
+    assert len(tree) == 5, 'Wrong number of children.'
 
     # Check style attribute
     node = tree[2]
 
-    if node[0] != gdal.CXT_Attribute:
-        gdaltest.post_reason('wrong node type.')
-        return 'fail'
+    assert node[0] == gdal.CXT_Attribute, 'wrong node type.'
 
-    if node[1] != 'style':
-        gdaltest.post_reason('Wrong element name')
-        return 'fail'
+    assert node[1] == 'style', 'Wrong element name'
 
-    if len(node) != 3:
-        gdaltest.post_reason('Wrong number of children.')
-        return 'fail'
+    assert len(node) == 3, 'Wrong number of children.'
 
-    if node[2][1] != '123':
-        gdaltest.post_reason('Wrong element content.')
-        return 'fail'
+    assert node[2][1] == '123', 'Wrong element content.'
 
     # Check <sub1> element
     node = tree[3]
 
-    if node[0] != gdal.CXT_Element:
-        gdaltest.post_reason('wrong node type.')
-        return 'fail'
+    assert node[0] == gdal.CXT_Element, 'wrong node type.'
 
-    if node[1] != 'sub1':
-        gdaltest.post_reason('Wrong element name')
-        return 'fail'
+    assert node[1] == 'sub1', 'Wrong element name'
 
-    if len(node) != 2:
-        gdaltest.post_reason('Wrong number of children.')
-        return 'fail'
+    assert len(node) == 2, 'Wrong number of children.'
 
     # Check <sub2> element
     node = tree[4]
 
-    if node[0] != gdal.CXT_Element:
-        gdaltest.post_reason('wrong node type.')
-        return 'fail'
+    assert node[0] == gdal.CXT_Element, 'wrong node type.'
 
-    if node[1] != 'sub2':
-        gdaltest.post_reason('Wrong element name')
-        return 'fail'
+    assert node[1] == 'sub2', 'Wrong element name'
 
-    if len(node) != 3:
-        gdaltest.post_reason('Wrong number of children.')
-        return 'fail'
+    assert len(node) == 3, 'Wrong number of children.'
 
-    if node[2][1] != 'abc':
-        gdaltest.post_reason('Wrong element content.')
-        return 'fail'
+    assert node[2][1] == 'abc', 'Wrong element content.'
 
     return 'success'
 
@@ -119,10 +91,7 @@ def test_minixml_2():
     tree = [0, 'TestDoc', [2, 'style', [1, '123']], [0, 'sub1'], [0, 'sub2', [1, 'abc']]]
     doc_target = '<TestDoc style="123">\n  <sub1 />\n  <sub2>abc</sub2>\n</TestDoc>\n'
     doc_got = gdal.SerializeXMLTree(tree)
-    if doc_got != doc_target:
-        gdaltest.post_reason('serialize xml tree failed.')
-        print(doc_got)
-        return 'fail'
+    assert doc_got == doc_target, 'serialize xml tree failed.'
     return 'success'
 
 ###############################################################################
@@ -135,58 +104,36 @@ def test_minixml_3():
     text = fp.read()
     tree = gdal.ParseXMLString(text)
 
-    if tree[0] != gdal.CXT_Element:
-        gdaltest.post_reason('wrong node type.')
-        return 'fail'
+    assert tree[0] == gdal.CXT_Element, 'wrong node type.'
 
     # Check <chapter> element
     node = tree[6]
 
-    if node[0] != gdal.CXT_Element:
-        gdaltest.post_reason('wrong node type.')
-        return 'fail'
+    assert node[0] == gdal.CXT_Element, 'wrong node type.'
 
-    if node[1] != 'chapter':
-        gdaltest.post_reason('Wrong element name')
-        return 'fail'
+    assert node[1] == 'chapter', 'Wrong element name'
 
-    if len(node) != 7:
-        gdaltest.post_reason('Wrong number of children.')
-        return 'fail'
+    assert len(node) == 7, 'Wrong number of children.'
 
     # Check <chapter><title> subelement
     subnode = node[2]
 
-    if subnode[0] != gdal.CXT_Element:
-        gdaltest.post_reason('wrong node type.')
-        return 'fail'
+    assert subnode[0] == gdal.CXT_Element, 'wrong node type.'
 
-    if subnode[1] != 'title':
-        gdaltest.post_reason('Wrong element name')
-        return 'fail'
+    assert subnode[1] == 'title', 'Wrong element name'
 
-    if len(subnode) != 3:
-        gdaltest.post_reason('Wrong number of children.')
-        return 'fail'
+    assert len(subnode) == 3, 'Wrong number of children.'
 
-    if subnode[2][1] != 'Chapter 1':
-        gdaltest.post_reason('Wrong element content.')
-        return 'fail'
+    assert subnode[2][1] == 'Chapter 1', 'Wrong element content.'
 
     # Check fist <chapter><para> subelement
     subnode = node[3]
 
-    if subnode[0] != gdal.CXT_Element:
-        gdaltest.post_reason('wrong node type.')
-        return 'fail'
+    assert subnode[0] == gdal.CXT_Element, 'wrong node type.'
 
-    if subnode[1] != 'para':
-        gdaltest.post_reason('Wrong element name')
-        return 'fail'
+    assert subnode[1] == 'para', 'Wrong element name'
 
-    if len(subnode) != 3:
-        gdaltest.post_reason('Wrong number of children.')
-        return 'fail'
+    assert len(subnode) == 3, 'Wrong number of children.'
 
     return 'success'
 
@@ -198,10 +145,7 @@ def test_minixml_4():
 
     xml = """<?xml encoding="utf-8"?>\n<foo />\n"""
     got_xml = gdal.SerializeXMLTree(gdal.ParseXMLString(xml))
-    if xml != got_xml:
-        gdaltest.post_reason('serialize xml tree failed.')
-        print(got_xml)
-        return 'fail'
+    assert xml == got_xml, 'serialize xml tree failed.'
 
     return 'success'
 
@@ -221,16 +165,11 @@ def test_minixml_5():
             tree = gdal.ParseXMLString(xml_str)
 
         found = gdal.GetLastErrorMsg()
-        if expect not in found:
-            gdaltest.post_reason(
-                'Did not find expected error message: "%s"  '
+        assert expect in found, ('Did not find expected error message: "%s"  '
                 'Found: "%s"  '
                 'For test string: "%s""' % (expect, found, xml_str))
-            return 'fail'
 
-        if tree is None:
-            gdaltest.post_reason('Tree is None: "%s"' % tree)
-            return 'fail'
+        assert tree is not None, ('Tree is None: "%s"' % tree)
 
     return 'success'
 
@@ -260,16 +199,11 @@ def test_minixml_6():
             tree = gdal.ParseXMLString(xml_str)
 
         found = gdal.GetLastErrorMsg()
-        if expect not in found:
-            gdaltest.post_reason(
-                'Did not find expected error message: "%s"  '
+        assert expect in found, ('Did not find expected error message: "%s"  '
                 'Found: "%s"  '
                 'For test string: "%s""' % (expect, found, xml_str))
-            return 'fail'
 
-        if tree is not None:
-            gdaltest.post_reason('Tree is not None: "%s"' % tree)
-            return 'fail'
+        assert tree is None, ('Tree is not None: "%s"' % tree)
 
     return 'success'
 
@@ -291,13 +225,9 @@ def test_minixml_7():
         tree = gdal.ParseXMLString(xml_str)
 
         found = gdal.GetLastErrorMsg()
-        if found != '':
-            gdaltest.post_reason('Unexpected msg "%s"' % found)
-            return 'fail'
+        assert found == '', ('Unexpected msg "%s"' % found)
 
-        if tree is None:
-            gdaltest.post_reason('Tree is None: "%s"' % tree)
-            return 'fail'
+        assert tree is not None, ('Tree is None: "%s"' % tree)
 
     return 'success'
 
@@ -313,12 +243,8 @@ def test_minixml_8():
     gdal.ErrorReset()
     with gdaltest.error_handler():
         tree = gdal.ParseXMLString(xml_str)
-    if tree is not None:
-        gdaltest.post_reason('expected None tree')
-        return 'fail'
-    if gdal.GetLastErrorMsg() == '':
-        gdaltest.post_reason('expected error message')
-        return 'fail'
+    assert tree is None, 'expected None tree'
+    assert gdal.GetLastErrorMsg() != '', 'expected error message'
 
     return 'success'
 
diff --git a/autotest/gcore/misc.py b/autotest/gcore/misc.py
index 7350c83bf357..ce662bafac57 100755
--- a/autotest/gcore/misc.py
+++ b/autotest/gcore/misc.py
@@ -49,8 +49,7 @@ def test_misc_1():
     for i, _ in enumerate(tab_ds):
         name = 'mem_%d' % i
         tab_ds[i] = drv.Create(name, 1, 1, 1)
-        if tab_ds[i] is None:
-            return 'fail'
+        assert tab_ds[i] is not None
     return 'success'
 
 ###############################################################################
@@ -64,8 +63,7 @@ def test_misc_2():
     tab_ds = [None for i in range(5000)]
     for i, _ in enumerate(tab_ds):
         tab_ds[i] = gdal.OpenShared('data/byte.tif')
-        if tab_ds[i] is None:
-            return 'fail'
+        assert tab_ds[i] is not None
 
     return 'success'
 
@@ -454,9 +452,7 @@ def test_misc_7():
     res = gdal.InvGeoTransform(gt)
     expected_inv_gt = (-100.0, 10.0, 0.0, 20.0, 0.0, -1.0)
     for i in range(6):
-        if abs(res[i] - expected_inv_gt[i]) > 1e-6:
-            print(res)
-            return 'fail'
+        assert abs(res[i] - expected_inv_gt[i]) <= 1e-6
 
     return 'success'
 
@@ -473,8 +469,7 @@ def test_misc_8():
 
     gt = (10, 0.1, 0, 20, 0, -1.0)
     res = gdal.ApplyGeoTransform(gt, 10, 1)
-    if res != [11.0, 19.0]:
-        return 'fail'
+    assert res == [11.0, 19.0]
 
     return 'success'
 
@@ -489,10 +484,7 @@ def test_misc_9():
     ret_val = gdal.GetCacheMax()
     gdal.SetCacheMax(old_val)
 
-    if ret_val != 3000000000:
-        gdaltest.post_reason('did not get expected value')
-        print(ret_val)
-        return 'fail'
+    assert ret_val == 3000000000, 'did not get expected value'
 
     return 'success'
 
@@ -516,8 +508,7 @@ def test_misc_10():
 
     import struct
     ar = struct.unpack('B' * 4, data)
-    if ar != (73, 73, 42, 0):
-        return 'fail'
+    assert ar == (73, 73, 42, 0)
 
     try:
         os.remove('data/byte.tif.gz.properties')
@@ -548,10 +539,7 @@ def test_misc_11():
 
     os.remove('tmp/symlink.tif')
 
-    if desc != 'GTIFF_DIR:1:data/byte.tif':
-        gdaltest.post_reason('did not get expected description')
-        print(desc)
-        return 'fail'
+    assert desc == 'GTIFF_DIR:1:data/byte.tif', 'did not get expected description'
 
     return 'success'
 
@@ -635,16 +623,14 @@ def test_misc_13():
     gdal.PushErrorHandler()
     out_ds = gdal.GetDriverByName('ESRI Shapefile').CreateCopy('/vsimem/out.shp', ds)
     gdal.PopErrorHandler()
-    if out_ds is not None:
-        return 'fail'
+    assert out_ds is None
 
     # Raster-only -> vector-only
     ds = gdal.OpenEx('../ogr/data/poly.shp', gdal.OF_VECTOR)
     gdal.PushErrorHandler()
     out_ds = gdal.GetDriverByName('GTiff').CreateCopy('/vsimem/out.tif', ds)
     gdal.PopErrorHandler()
-    if out_ds is not None:
-        return 'fail'
+    assert out_ds is None
 
     return 'success'
 
@@ -674,9 +660,7 @@ def emit(self, record):
     try:
         gdal.ConfigurePythonLogging(logger_name='gdal_logging_test', enable_debug=True)
 
-        if gdal.GetConfigOption("CPL_DEBUG") != "ON":
-            gdaltest.post_reason("should have enabled debug")
-            return 'fail'
+        assert gdal.GetConfigOption("CPL_DEBUG") == "ON", "should have enabled debug"
 
         gdal.Debug("test1", "debug1")
         gdal.Error(gdal.CE_Debug, gdal.CPLE_FileIO, "debug2")
@@ -691,10 +675,7 @@ def emit(self, record):
             'ERROR': ["99999: error1"],
         }
 
-        if handler.messages != expected:
-            print(handler.messages)
-            gdaltest.post_reason("missing log messages")
-            return 'fail'
+        assert handler.messages == expected, "missing log messages"
 
         gdal.SetErrorHandler('CPLDefaultErrorHandler')
         handler.messages.clear()
@@ -702,18 +683,15 @@ def emit(self, record):
 
         gdal.ConfigurePythonLogging(logger_name='gdal_logging_test')
 
-        if gdal.GetConfigOption("CPL_DEBUG") != "OFF":
-            gdaltest.post_reason("shouldn't have enabled debug")
-            return 'fail'
+        assert gdal.GetConfigOption("CPL_DEBUG") == "OFF", \
+            "shouldn't have enabled debug"
 
         # these get suppressed by CPL_DEBUG
         gdal.Debug("test1", "debug3")
         # these don't
         gdal.Error(gdal.CE_Debug, gdal.CPLE_None, "debug4")
 
-        if handler.messages['DEBUG'] != ['debug4']:
-            gdaltest.post_reason("unexpected log messages")
-            return 'fail'
+        assert handler.messages['DEBUG'] == ['debug4'], "unexpected log messages"
 
     finally:
         gdal.SetErrorHandler('CPLDefaultErrorHandler')
@@ -753,9 +731,7 @@ def handle1(ecls, ecode, emsg):
             (gdal.CE_Warning, gdal.CPLE_AssertionFailed, "warning1"),
             (gdal.CE_Failure, 99999, "error1"),
         ]
-        if expected0 != messages0:
-            gdaltest.post_reason("SetErrorHandler: mismatched log messages")
-            return 'fail'
+        assert expected0 == messages0, "SetErrorHandler: mismatched log messages"
         messages0[:] = []
 
         # Check Push
@@ -766,12 +742,8 @@ def handle1(ecls, ecode, emsg):
         gdal.Error(gdal.CE_Warning, gdal.CPLE_AssertionFailed, "warning1")
         gdal.Error(gdal.CE_Failure, 99999, "error1")
 
-        if len(messages0) != 0:
-            gdaltest.post_reason("PushErrorHandler: unexpected log messages")
-            return 'fail'
-        if len(messages1) != 4:
-            gdaltest.post_reason("PushErrorHandler: missing log messages")
-            return 'fail'
+        assert len(messages0) == 0, "PushErrorHandler: unexpected log messages"
+        assert len(messages1) == 4, "PushErrorHandler: missing log messages"
 
         # and pop restores original behaviour
         gdal.PopErrorHandler()
@@ -781,12 +753,8 @@ def handle1(ecls, ecode, emsg):
         gdal.Error(gdal.CE_Warning, gdal.CPLE_AssertionFailed, "warning1")
         gdal.Error(gdal.CE_Failure, 99999, "error1")
 
-        if len(messages0) != 4:
-            gdaltest.post_reason("PopErrorHandler: missing log messages")
-            return 'fail'
-        if len(messages1) != 0:
-            gdaltest.post_reason("PopErrorHandler: unexpected log messages")
-            return 'fail'
+        assert len(messages0) == 4, "PopErrorHandler: missing log messages"
+        assert len(messages1) == 0, "PopErrorHandler: unexpected log messages"
 
     finally:
         gdal.SetErrorHandler('CPLDefaultErrorHandler')
diff --git a/autotest/gcore/nodatamaskband.py b/autotest/gcore/nodatamaskband.py
index 553026a127e7..a90549b16de3 100755
--- a/autotest/gcore/nodatamaskband.py
+++ b/autotest/gcore/nodatamaskband.py
@@ -65,46 +65,31 @@ def test_nodatamaskband_1():
                        0, 255, 255, 0, 0, 255,
                        0, 255, 255, 0, 0, 255,
                        255, 0, 0, 255, 255, 255)
-        if data_ar != expected_ar:
-            print(dt)
-            print(data_ar)
-            return 'fail'
+        assert data_ar == expected_ar, dt
 
         data = ds.GetRasterBand(1).GetMaskBand().ReadBlock(0, 0)
         data_ar = struct.unpack('B' * 6 * 1, data)
         expected_ar = (0, 255, 255, 0, 0, 255)
-        if data_ar != expected_ar:
-            print(dt)
-            print(data_ar)
-            return 'fail'
+        assert data_ar == expected_ar, dt
 
         data = ds.GetRasterBand(1).GetMaskBand().ReadBlock(0, 3)
         data_ar = struct.unpack('B' * 6 * 1, data)
         expected_ar = (255, 0, 0, 255, 255, 255)
-        if data_ar != expected_ar:
-            print(dt)
-            print(data_ar)
-            return 'fail'
+        assert data_ar == expected_ar, dt
 
         data = ds.GetRasterBand(1).GetMaskBand().ReadRaster(
             buf_xsize=3, buf_ysize=2)
         data_ar = struct.unpack('B' * 3 * 2, data)
         expected_ar = (255, 0, 255,
                        0, 255, 255)
-        if data_ar != expected_ar:
-            print(dt)
-            print(data_ar)
-            return 'fail'
+        assert data_ar == expected_ar, dt
 
         data = ds.GetRasterBand(1).GetMaskBand().ReadRaster(
             buf_type=gdal.GDT_UInt16, buf_xsize=3, buf_ysize=2)
         data_ar = struct.unpack('H' * 3 * 2, data)
         expected_ar = (255, 0, 255,
                        0, 255, 255)
-        if data_ar != expected_ar:
-            print(dt)
-            print(data_ar)
-            return 'fail'
+        assert data_ar == expected_ar, dt
 
     return 'success'
 
diff --git a/autotest/gcore/numpy_rw.py b/autotest/gcore/numpy_rw.py
index 388bed21264b..67ddeb6cb64b 100755
--- a/autotest/gcore/numpy_rw.py
+++ b/autotest/gcore/numpy_rw.py
@@ -34,6 +34,7 @@
 
 import gdaltest
 from osgeo import gdal
+import pytest
 
 ###############################################################################
 # verify that we can load Numeric python, and find the Numpy driver.
@@ -51,9 +52,7 @@ def test_numpy_rw_1():
     gdal.AllRegister()
 
     gdaltest.numpy_drv = gdal.GetDriverByName('NUMPY')
-    if gdaltest.numpy_drv is None:
-        gdaltest.post_reason('NUMPY driver not found!')
-        return 'fail'
+    assert gdaltest.numpy_drv is not None, 'NUMPY driver not found!'
 
     return 'success'
 
@@ -69,19 +68,13 @@ def test_numpy_rw_2():
     from osgeo import gdalnumeric
 
     array = gdalnumeric.LoadFile('data/utmsmall.tif')
-    if array is None:
-        gdaltest.post_reason('Failed to load utmsmall.tif into array')
-        return 'fail'
+    assert array is not None, 'Failed to load utmsmall.tif into array'
 
     ds = gdalnumeric.OpenArray(array)
-    if ds is None:
-        gdaltest.post_reason('Failed to open memory array as dataset.')
-        return 'fail'
+    assert ds is not None, 'Failed to open memory array as dataset.'
 
     bnd = ds.GetRasterBand(1)
-    if bnd.Checksum() != 50054:
-        gdaltest.post_reason('Didnt get expected checksum on reopened file')
-        return 'fail'
+    assert bnd.Checksum() == 50054, 'Didnt get expected checksum on reopened file'
     ds = None
 
     return 'success'
@@ -98,10 +91,7 @@ def test_numpy_rw_3():
     ds = gdal.Open('data/cint_sar.tif')
     array = ds.ReadAsArray()
 
-    if array[2][3] != 116 - 16j:
-        print(array[0][2][3])
-        gdaltest.post_reason('complex value read improperly.')
-        return 'fail'
+    assert array[2][3] == 116 - 16j, 'complex value read improperly.'
 
     return 'success'
 
@@ -117,10 +107,8 @@ def test_numpy_rw_4():
     ds = gdal.Open('data/byte.tif')
     array = ds.GetRasterBand(1).ReadAsArray(0, 0, 20, 20, 5, 5)
 
-    if array[2][3] != 123:
-        print(array[2][3])
-        gdaltest.post_reason('Read wrong value - perhaps downsampling algorithm has changed subtly?')
-        return 'fail'
+    assert array[2][3] == 123, \
+        'Read wrong value - perhaps downsampling algorithm has changed subtly?'
 
     return 'success'
 
@@ -137,39 +125,24 @@ def test_numpy_rw_5():
 
     array = gdalnumeric.LoadFile('data/rgbsmall.tif', 35, 21, 1, 1)
 
-    if array[0][0][0] != 78:
-        print(array)
-        gdaltest.post_reason('value read improperly.')
-        return 'fail'
+    assert array[0][0][0] == 78, 'value read improperly.'
 
-    if array[1][0][0] != 117:
-        print(array)
-        gdaltest.post_reason('value read improperly.')
-        return 'fail'
+    assert array[1][0][0] == 117, 'value read improperly.'
 
-    if array[2][0][0] != 24:
-        print(array)
-        gdaltest.post_reason('value read improperly.')
-        return 'fail'
+    assert array[2][0][0] == 24, 'value read improperly.'
 
     array = gdalnumeric.LoadFile('data/rgbsmall.tif', buf_xsize=1, buf_ysize=1, resample_alg=gdal.GRIORA_Bilinear)
-    if array.shape[0] != 3 or array.shape[1] != 1 or array.shape[2] != 1:
-        print(array.shape)
-        gdaltest.post_reason('wrong array shape.')
-        return 'fail'
-    if array[0][0][0] != 70 or array[1][0][0] != 97 or array[2][0][0] != 29:
-        print(array)
-        gdaltest.post_reason('value read improperly.')
-        return 'fail'
+    assert array.shape[0] == 3 and array.shape[1] == 1 and array.shape[2] == 1, \
+        'wrong array shape.'
+    assert array[0][0][0] == 70 and array[1][0][0] == 97 and array[2][0][0] == 29, \
+        'value read improperly.'
 
     import numpy
     array = numpy.zeros([3, 1, 1], dtype=numpy.uint8)
     ds = gdal.Open('data/rgbsmall.tif')
     ds.ReadAsArray(buf_obj=array, resample_alg=gdal.GRIORA_Bilinear)
-    if array[0][0][0] != 70 or array[1][0][0] != 97 or array[2][0][0] != 29:
-        print(array)
-        gdaltest.post_reason('value read improperly.')
-        return 'fail'
+    assert array[0][0][0] == 70 and array[1][0][0] == 97 and array[2][0][0] == 29, \
+        'value read improperly.'
 
     return 'success'
 
@@ -189,12 +162,10 @@ def test_numpy_rw_6():
     array = numpy.zeros([ds.RasterYSize, ds.RasterXSize], numpy.uint8)
     array_res = ds.GetRasterBand(1).ReadAsArray(buf_obj=array)
 
-    if array is not array_res:
-        return 'fail'
+    assert array is array_res
 
     ds2 = gdalnumeric.OpenArray(array)
-    if ds2.GetRasterBand(1).Checksum() != ds.GetRasterBand(1).Checksum():
-        return 'fail'
+    assert ds2.GetRasterBand(1).Checksum() == ds.GetRasterBand(1).Checksum()
 
     return 'success'
 
@@ -214,35 +185,29 @@ def test_numpy_rw_7():
     array = numpy.zeros([1, ds.RasterYSize, ds.RasterXSize], numpy.uint8)
     array_res = ds.ReadAsArray(buf_obj=array)
 
-    if array is not array_res:
-        return 'fail'
+    assert array is array_res
 
     ds2 = gdalnumeric.OpenArray(array)
-    if ds2.GetRasterBand(1).Checksum() != ds.GetRasterBand(1).Checksum():
-        return 'fail'
+    assert ds2.GetRasterBand(1).Checksum() == ds.GetRasterBand(1).Checksum()
 
     # Try again with a 2D array
     array = numpy.zeros([ds.RasterYSize, ds.RasterXSize], numpy.uint8)
     array_res = ds.ReadAsArray(buf_obj=array)
 
-    if array is not array_res:
-        return 'fail'
+    assert array is array_res
 
     ds2 = gdalnumeric.OpenArray(array)
-    if ds2.GetRasterBand(1).Checksum() != ds.GetRasterBand(1).Checksum():
-        return 'fail'
+    assert ds2.GetRasterBand(1).Checksum() == ds.GetRasterBand(1).Checksum()
 
     # With a multi band file
     ds = gdal.Open('data/rgbsmall.tif')
     array = numpy.zeros([ds.RasterCount, ds.RasterYSize, ds.RasterXSize], numpy.uint8)
     array_res = ds.ReadAsArray(buf_obj=array)
 
-    if array is not array_res:
-        return 'fail'
+    assert array is array_res
 
     ds2 = gdalnumeric.OpenArray(array)
-    if ds2.GetRasterBand(1).Checksum() != ds.GetRasterBand(1).Checksum():
-        return 'fail'
+    assert ds2.GetRasterBand(1).Checksum() == ds.GetRasterBand(1).Checksum()
 
     return 'success'
 
@@ -264,8 +229,7 @@ def test_numpy_rw_8():
 
     ds2 = gdalnumeric.OpenArray(array)
     for i in range(1, ds.RasterCount):
-        if ds2.GetRasterBand(i).Checksum() != ds.GetRasterBand(i).Checksum():
-            return 'fail'
+        assert ds2.GetRasterBand(i).Checksum() == ds.GetRasterBand(i).Checksum()
 
     return 'success'
 
@@ -287,10 +251,7 @@ def test_numpy_rw_9():
     out_ds = None
     ds = None
 
-    if cs != 4672:
-        gdaltest.post_reason('did not get expected checksum')
-        print(cs)
-        return 'fail'
+    assert cs == 4672, 'did not get expected checksum'
 
     return 'success'
 
@@ -320,15 +281,9 @@ def test_numpy_rw_10():
 
     gdal.Unlink('/vsimem/signed8.tif')
 
-    if ar2[0][0] != -128 or ar2[0][1] != 127:
-        gdaltest.post_reason('did not get expected result (1)')
-        print(ar2)
-        return 'fail'
+    assert ar2[0][0] == -128 and ar2[0][1] == 127, 'did not get expected result (1)'
 
-    if ar3[0][0] != -128 or ar3[0][1] != 127:
-        gdaltest.post_reason('did not get expected result (2)')
-        print(ar3)
-        return 'fail'
+    assert ar3[0][0] == -128 and ar3[0][1] == 127, 'did not get expected result (2)'
 
     return 'success'
 
@@ -359,10 +314,7 @@ def test_numpy_rw_11():
     for type_tuple in type_tuples:
         ds = gdal.GetDriverByName('GTiff').Create('/vsimem/' + type_tuple[0], 1, 1, 1, type_tuple[1])
         tmp = ds.ReadAsArray()
-        if tmp.dtype != type_tuple[2]:
-            gdaltest.post_reason('did not get expected numpy type')
-            print(type_tuple)
-            return 'fail'
+        assert tmp.dtype == type_tuple[2], 'did not get expected numpy type'
 
         ar = numpy.empty([1, 1], dtype=type_tuple[2])
 
@@ -373,11 +325,8 @@ def test_numpy_rw_11():
         if expected_dt == gdal.GDT_CInt16 or expected_dt == gdal.GDT_CInt32:
             expected_dt = gdal.GDT_CFloat32
         if got_dt != expected_dt:
-            gdaltest.post_reason('did not get expected result (0)')
             print(type_tuple[1])
-            print(got_dt)
-            print(expected_dt)
-            return 'fail'
+            pytest.fail('did not get expected result (0)')
 
         ar[0][0] = type_tuple[3]
         ds.GetRasterBand(1).WriteArray(ar)
@@ -391,19 +340,13 @@ def test_numpy_rw_11():
 
         gdal.Unlink('/vsimem/' + type_tuple[0])
 
-        if (type_tuple[0] == 'float32' and abs(ar2[0][0] - type_tuple[3]) > 1e-6) or \
-           (type_tuple[0] != 'float32' and ar2[0][0] != type_tuple[3]):
-            gdaltest.post_reason('did not get expected result (1)')
-            print(ar2)
-            print(type_tuple)
-            return 'fail'
+        assert (not (type_tuple[0] == 'float32' and abs(ar2[0][0] - type_tuple[3]) > 1e-6) or \
+           (type_tuple[0] != 'float32' and ar2[0][0] != type_tuple[3])), \
+            'did not get expected result (1)'
 
-        if (type_tuple[0] == 'float32' and abs(ar3[0][0] - type_tuple[3]) > 1e-6) or \
-           (type_tuple[0] != 'float32' and ar3[0][0] != type_tuple[3]):
-            gdaltest.post_reason('did not get expected result (2)')
-            print(ar3)
-            print(type_tuple)
-            return 'fail'
+        assert (not (type_tuple[0] == 'float32' and abs(ar3[0][0] - type_tuple[3]) > 1e-6) or \
+           (type_tuple[0] != 'float32' and ar3[0][0] != type_tuple[3])), \
+            'did not get expected result (2)'
 
     return 'success'
 
@@ -434,9 +377,7 @@ def test_numpy_rw_12():
     ds.GetRasterBand(1).ReadAsArray(buf_obj=slice_read)
     ds = None
 
-    if slice_read[0][0] != 1 or slice_read[1][0] != 3:
-        print(slice_read)
-        return 'fail'
+    assert slice_read[0][0] == 1 and slice_read[1][0] == 3
 
     return 'success'
 
@@ -515,33 +456,21 @@ def test_numpy_rw_13():
     # This one should be OK !
     ar = numpy.zeros([1, 2], dtype=numpy.uint8)
     ds.GetRasterBand(1).ReadAsArray(buf_obj=ar, buf_xsize=2, buf_ysize=1)
-    if ar[0][0] != 100 or ar[0][1] != 200:
-        gdaltest.post_reason('did not get expected values')
-        print(ar)
-        return 'fail'
+    assert ar[0][0] == 100 and ar[0][1] == 200, 'did not get expected values'
 
     # This one too
     ar = numpy.zeros([1, 1, 2], dtype=numpy.uint8)
     ds.GetRasterBand(1).ReadAsArray(buf_obj=ar)
-    if ar[0][0][0] != 100 or ar[0][0][1] != 200:
-        gdaltest.post_reason('did not get expected values')
-        print(ar)
-        return 'fail'
+    assert ar[0][0][0] == 100 and ar[0][0][1] == 200, 'did not get expected values'
 
     # This one too
     ar = numpy.zeros([1, 1, 2], dtype=numpy.uint8)
     ds.ReadAsArray(buf_obj=ar)
-    if ar[0][0][0] != 100 or ar[0][0][1] != 200:
-        gdaltest.post_reason('did not get expected values')
-        print(ar)
-        return 'fail'
+    assert ar[0][0][0] == 100 and ar[0][0][1] == 200, 'did not get expected values'
 
     # This one too
     ar = ds.ReadAsArray()
-    if ar[0][0] != 100 or ar[0][1] != 200:
-        gdaltest.post_reason('did not get expected values')
-        print(ar)
-        return 'fail'
+    assert ar[0][0] == 100 and ar[0][1] == 200, 'did not get expected values'
 
     ds = None
 
@@ -618,25 +547,19 @@ def test_numpy_rw_13():
     # This one should be OK !
     ar = numpy.zeros([3, 1, 2], dtype=numpy.uint8)
     ds.ReadAsArray(buf_obj=ar, buf_xsize=2, buf_ysize=1, buf_type=gdal.GDT_Byte)
-    if ar[0][0][0] != 100 or ar[0][0][1] != 200 or ar[1][0][0] != 101 or ar[1][0][1] != 201 or ar[2][0][0] != 102 or ar[2][0][1] != 202:
-        gdaltest.post_reason('did not get expected values')
-        print(ar)
-        return 'fail'
+    assert ar[0][0][0] == 100 and ar[0][0][1] == 200 and ar[1][0][0] == 101 and ar[1][0][1] == 201 and ar[2][0][0] == 102 and ar[2][0][1] == 202, \
+        'did not get expected values'
 
     # This one too
     ar = numpy.zeros([3, 1, 2], dtype=numpy.uint8)
     ds.ReadAsArray(buf_obj=ar)
-    if ar[0][0][0] != 100 or ar[0][0][1] != 200 or ar[1][0][0] != 101 or ar[1][0][1] != 201 or ar[2][0][0] != 102 or ar[2][0][1] != 202:
-        gdaltest.post_reason('did not get expected values')
-        print(ar)
-        return 'fail'
+    assert ar[0][0][0] == 100 and ar[0][0][1] == 200 and ar[1][0][0] == 101 and ar[1][0][1] == 201 and ar[2][0][0] == 102 and ar[2][0][1] == 202, \
+        'did not get expected values'
 
     # This one too
     ar = ds.ReadAsArray()
-    if ar[0][0][0] != 100 or ar[0][0][1] != 200 or ar[1][0][0] != 101 or ar[1][0][1] != 201 or ar[2][0][0] != 102 or ar[2][0][1] != 202:
-        gdaltest.post_reason('did not get expected values')
-        print(ar)
-        return 'fail'
+    assert ar[0][0][0] == 100 and ar[0][0][1] == 200 and ar[1][0][0] == 101 and ar[1][0][1] == 201 and ar[2][0][0] == 102 and ar[2][0][1] == 202, \
+        'did not get expected values'
 
     ds = None
 
@@ -691,36 +614,29 @@ def test_numpy_rw_14():
     data = ds.GetRasterBand(1).ReadAsArray(resample_alg=gdal.GRIORA_NearestNeighbour,
                                            callback=numpy_rw_14_progress_callback,
                                            callback_data=tab)
-    if data is None:
-        return 'fail'
-    if abs(tab[0] - 1.05) > 1e-5 or not tab[1]:
-        return 'fail'
+    assert data is not None
+    assert abs(tab[0] - 1.05) <= 1e-5 and tab[1]
 
     # Test interruption
     tab = [0]
     data = ds.GetRasterBand(1).ReadAsArray(callback=numpy_rw_14_progress_interrupt_callback,
                                            callback_data=tab)
-    if data is not None:
-        return 'fail'
-    if tab[0] < 0.50:
-        return 'fail'
+    assert data is None
+    assert tab[0] >= 0.50
 
     # Test Dataset.ReadAsArray
     tab = [0.05, True]
     data = ds.ReadAsArray(resample_alg=gdal.GRIORA_NearestNeighbour,
                           callback=numpy_rw_14_progress_callback,
                           callback_data=tab)
-    if data is None:
-        return 'fail'
-    if abs(tab[0] - 1.05) > 1e-5 or not tab[1]:
-        return 'fail'
+    assert data is not None
+    assert abs(tab[0] - 1.05) <= 1e-5 and tab[1]
 
     # Same with interruption
     tab = [0]
     data = ds.ReadAsArray(callback=numpy_rw_14_progress_interrupt_callback,
                           callback_data=tab)
-    if data is not None or tab[0] < 0.50:
-        return 'fail'
+    assert data is None and tab[0] >= 0.50
 
     # Test Dataset.ReadAsArray on a multi band file
     ds = None
@@ -728,8 +644,7 @@ def test_numpy_rw_14():
     last_pct = [0]
     data = ds.ReadAsArray(callback=numpy_rw_14_progress_callback_2,
                           callback_data=last_pct)
-    if data is None or abs(last_pct[0] - 1.0) > 1e-5:
-        return 'fail'
+    assert not (data is None or abs(last_pct[0] - 1.0) > 1e-5)
 
     last_pct = [0]
 
@@ -738,8 +653,7 @@ def test_numpy_rw_14():
     data = ds.ReadAsArray(buf_obj=array,
                           callback=numpy_rw_14_progress_callback_2,
                           callback_data=last_pct)
-    if data is None or abs(last_pct[0] - 1.0) > 1e-5:
-        return 'fail'
+    assert not (data is None or abs(last_pct[0] - 1.0) > 1e-5)
 
     return 'success'
 
@@ -758,12 +672,10 @@ def test_numpy_rw_15():
     array = numpy.empty([1, 1, 1], numpy.uint8)
     ds = gdal_array.OpenArray(array)
     gt = ds.GetGeoTransform(can_return_null=True)
-    if gt is not None:
-        return 'fail'
+    assert gt is None
     ds.SetGeoTransform([1, 2, 3, 4, 5, -6])
     gt = ds.GetGeoTransform()
-    if gt != (1, 2, 3, 4, 5, -6):
-        return 'fail'
+    assert gt == (1, 2, 3, 4, 5, -6)
 
     return 'success'
 
@@ -783,22 +695,19 @@ def test_numpy_rw_16():
     array = numpy.empty([1], numpy.uint8)
     with gdaltest.error_handler():
         ds = gdal_array.OpenArray(array)
-    if ds is not None:
-        return 'fail'
+    assert ds is None
 
     # 4D
     array = numpy.empty([1, 1, 1, 1], numpy.uint8)
     with gdaltest.error_handler():
         ds = gdal_array.OpenArray(array)
-    if ds is not None:
-        return 'fail'
+    assert ds is None
 
     # Unsupported data type
     array = numpy.empty([1, 1], numpy.float16)
     with gdaltest.error_handler():
         ds = gdal_array.OpenArray(array)
-    if ds is not None:
-        return 'fail'
+    assert ds is None
 
     return 'success'
 
@@ -818,20 +727,17 @@ def test_numpy_rw_17():
     array = numpy.empty([1, 1], numpy.uint8)
     with gdaltest.error_handler():
         ds = gdal.Open(gdal_array.GetArrayFilename(array))
-    if ds is not None:
-        return 'fail'
+    assert ds is None
 
     gdal.SetConfigOption('GDAL_ARRAY_OPEN_BY_FILENAME', 'TRUE')
     ds = gdal.Open(gdal_array.GetArrayFilename(array))
     gdal.SetConfigOption('GDAL_ARRAY_OPEN_BY_FILENAME', None)
-    if ds is None:
-        return 'fail'
+    assert ds is not None
 
     # Invalid value
     with gdaltest.error_handler():
         ds = gdal.Open('NUMPY:::invalid')
-    if ds is not None:
-        return 'fail'
+    assert ds is None
 
     return 'success'
 
@@ -850,21 +756,17 @@ def test_numpy_rw_18():
 
     img = numpy.random.randint(0, 255, size=(256, 200, 3)).astype('uint8')
     ds = gdal_array.OpenArray(img, interleave='pixel')
-    if ds is None:
-        gdaltest.post_reason('Failed to open memory array as dataset.')
-        return 'fail'
+    assert ds is not None, 'Failed to open memory array as dataset.'
 
     bnd1 = ds.GetRasterBand(1).ReadAsArray()
     bnd2 = ds.GetRasterBand(2).ReadAsArray()
     bnd3 = ds.GetRasterBand(3).ReadAsArray()
 
     res = numpy.dstack((bnd1, bnd2, bnd3))
-    if not numpy.all(img == res):
-        return 'fail'
+    assert numpy.all(img == res)
 
     res = ds.ReadAsArray(interleave='pixel')
-    if not numpy.all(img == res):
-        return 'fail'
+    assert numpy.all(img == res)
 
     return 'success'
 
diff --git a/autotest/gcore/overviewds.py b/autotest/gcore/overviewds.py
index 9ab4fdac9db4..b98a57614202 100755
--- a/autotest/gcore/overviewds.py
+++ b/autotest/gcore/overviewds.py
@@ -43,11 +43,9 @@
 
 def test_overviewds_1():
     ds = gdal.OpenEx('data/byte.tif', open_options=['OVERVIEW_LEVEL=-1'])
-    if ds is not None:
-        return 'fail'
+    assert ds is None
     ds = gdal.OpenEx('data/byte.tif', open_options=['OVERVIEW_LEVEL=0'])
-    if ds is not None:
-        return 'fail'
+    assert ds is None
 
     return 'success'
 
@@ -63,51 +61,34 @@ def test_overviewds_2():
     ds = None
 
     ds = gdal.OpenEx('tmp/byte.tif', open_options=['OVERVIEW_LEVEL=0only'])
-    if ds.GetRasterBand(1).GetOverviewCount() != 0:
-        return 'fail'
+    assert ds.GetRasterBand(1).GetOverviewCount() == 0
     ds = None
 
     src_ds = gdal.Open('tmp/byte.tif')
     ds = gdal.OpenEx('tmp/byte.tif', open_options=['OVERVIEW_LEVEL=0'])
-    if ds is None:
-        return 'fail'
-    if ds.RasterXSize != 10 or ds.RasterYSize != 10 or ds.RasterCount != 1:
-        return 'fail'
-    if ds.GetProjectionRef() != src_ds.GetProjectionRef():
-        return 'fail'
+    assert ds is not None
+    assert ds.RasterXSize == 10 and ds.RasterYSize == 10 and ds.RasterCount == 1
+    assert ds.GetProjectionRef() == src_ds.GetProjectionRef()
     src_gt = src_ds.GetGeoTransform()
     expected_gt = (src_gt[0], src_gt[1] * 2, src_gt[2], src_gt[3], src_gt[4], src_gt[5] * 2)
     gt = ds.GetGeoTransform()
     for i in range(6):
-        if abs(expected_gt[i] - gt[i]) > 1e-5:
-            print(expected_gt)
-            print(gt)
-            return 'fail'
-    if ds.GetGCPCount() != 0 or ds.GetGCPProjection() != src_ds.GetGCPProjection() or ds.GetGCPs():
-        return 'fail'
+        assert abs(expected_gt[i] - gt[i]) <= 1e-5
+    assert ds.GetGCPCount() == 0 and ds.GetGCPProjection() == src_ds.GetGCPProjection() and not ds.GetGCPs()
     expected_data = src_ds.ReadRaster(0, 0, 20, 20, 10, 10)
     got_data = ds.ReadRaster(0, 0, 10, 10)
-    if expected_data != got_data:
-        return 'fail'
+    assert expected_data == got_data
     got_data = ds.GetRasterBand(1).ReadRaster(0, 0, 10, 10)
-    if expected_data != got_data:
-        return 'fail'
-    if ds.GetRasterBand(1).GetOverviewCount() != 1:
-        return 'fail'
+    assert expected_data == got_data
+    assert ds.GetRasterBand(1).GetOverviewCount() == 1
     expected_data = src_ds.ReadRaster(0, 0, 20, 20, 5, 5)
     got_data = ds.GetRasterBand(1).GetOverview(0).ReadRaster(0, 0, 5, 5)
-    if expected_data != got_data:
-        return 'fail'
-    if ds.GetMetadata() != src_ds.GetMetadata():
-        return 'fail'
-    if ds.GetMetadataItem('AREA_OR_POINT') != src_ds.GetMetadataItem('AREA_OR_POINT'):
-        return 'fail'
-    if ds.GetMetadata('RPC'):
-        return 'fail'
-    if ds.GetMetadata('GEOLOCATION'):
-        return 'fail'
-    if ds.GetMetadataItem('RPC', 'FOO') is not None:
-        return 'fail'
+    assert expected_data == got_data
+    assert ds.GetMetadata() == src_ds.GetMetadata()
+    assert ds.GetMetadataItem('AREA_OR_POINT') == src_ds.GetMetadataItem('AREA_OR_POINT')
+    assert not ds.GetMetadata('RPC')
+    assert not ds.GetMetadata('GEOLOCATION')
+    assert ds.GetMetadataItem('RPC', 'FOO') is None
     ds = None
 
     return 'success'
@@ -148,19 +129,15 @@ def test_overviewds_3():
     ds = gdal.OpenEx('tmp/byte.tif', open_options=['OVERVIEW_LEVEL=0'])
     gcps = ds.GetGCPs()
     for i in range(3):
-        if gcps[i].GCPPixel != src_gcps[i].GCPPixel / 2 or gcps[i].GCPLine != src_gcps[i].GCPLine / 2 or \
-           gcps[i].GCPX != src_gcps[i].GCPX or gcps[i].GCPY != src_gcps[i].GCPY:
-            return 'fail'
+        assert (gcps[i].GCPPixel == src_gcps[i].GCPPixel / 2 and gcps[i].GCPLine == src_gcps[i].GCPLine / 2 and \
+           gcps[i].GCPX == src_gcps[i].GCPX and gcps[i].GCPY == src_gcps[i].GCPY)
 
     # Really check that the transformer works
     tr = gdal.Transformer(ds, None, ['METHOD=GCP_POLYNOMIAL'])
     (_, pnt) = tr.TransformPoint(0, 20 / 2.0, 10 / 2.0)
 
     for i in range(3):
-        if abs(ref_pnt[i] - pnt[i]) > 1e-5:
-            print(ref_pnt)
-            print(pnt)
-            return 'fail'
+        assert abs(ref_pnt[i] - pnt[i]) <= 1e-5
     ds = None
 
     return 'success'
@@ -193,14 +170,9 @@ def test_overviewds_4():
     got_md = ds.GetMetadata('RPC')
 
     for key in rpc_md:
-        if ds.GetMetadataItem(key, 'RPC') != got_md[key]:
-            return 'fail'
+        assert ds.GetMetadataItem(key, 'RPC') == got_md[key]
         if key == 'LINE_SCALE' or key == 'SAMP_SCALE' or key == 'LINE_OFF' or key == 'SAMP_OFF':
-            if float(got_md[key]) != myfloat(rpc_md[key]) / 2:
-                print(key)
-                print(got_md[key])
-                print(rpc_md[key])
-                return 'fail'
+            assert float(got_md[key]) == myfloat(rpc_md[key]) / 2
         elif got_md[key] != rpc_md[key]:
             print(key)
             print(got_md[key])
@@ -212,10 +184,7 @@ def test_overviewds_4():
     (_, pnt) = tr.TransformPoint(0, 20 / 2.0, 10 / 2.0)
 
     for i in range(3):
-        if abs(ref_pnt[i] - pnt[i]) > 1e-5:
-            print(ref_pnt)
-            print(pnt)
-            return 'fail'
+        assert abs(ref_pnt[i] - pnt[i]) <= 1e-5
 
     ds = None
 
@@ -248,20 +217,11 @@ def test_overviewds_5():
     got_md = ds.GetMetadata('GEOLOCATION')
 
     for key in geoloc_md:
-        if ds.GetMetadataItem(key, 'GEOLOCATION') != got_md[key]:
-            return 'fail'
+        assert ds.GetMetadataItem(key, 'GEOLOCATION') == got_md[key]
         if key == 'PIXEL_OFFSET' or key == 'LINE_OFFSET':
-            if abs(float(got_md[key]) - myfloat(geoloc_md[key]) * 2) > 1e-1:
-                print(key)
-                print(got_md[key])
-                print(geoloc_md[key])
-                return 'fail'
+            assert abs(float(got_md[key]) - myfloat(geoloc_md[key]) * 2) <= 1e-1
         elif key == 'PIXEL_STEP' or key == 'LINE_STEP':
-            if abs(float(got_md[key]) - myfloat(geoloc_md[key]) / 2) > 1e-1:
-                print(key)
-                print(got_md[key])
-                print(geoloc_md[key])
-                return 'fail'
+            assert abs(float(got_md[key]) - myfloat(geoloc_md[key]) / 2) <= 1e-1
         elif got_md[key] != geoloc_md[key]:
             print(key)
             print(got_md[key])
@@ -274,10 +234,7 @@ def test_overviewds_5():
     (_, pnt) = tr.TransformPoint(1, ref_pnt[0], ref_pnt[1])
 
     for i in range(3):
-        if abs(pnt[i] - expected_xyz[i]) > 0.5:
-            print(pnt)
-            print(expected_xyz)
-            return 'fail'
+        assert abs(pnt[i] - expected_xyz[i]) <= 0.5
     ds = None
 
     return 'success'
@@ -300,11 +257,9 @@ def test_overviewds_6():
     src_ds = None
 
     ds = gdal.Open('tmp/byte.vrt')
-    if ds.RasterXSize != 10 or ds.RasterYSize != 10 or ds.RasterCount != 1:
-        return 'fail'
+    assert ds.RasterXSize == 10 and ds.RasterYSize == 10 and ds.RasterCount == 1
     got_cs = ds.GetRasterBand(1).Checksum()
-    if got_cs != expected_cs:
-        return 'fail'
+    assert got_cs == expected_cs
     ds = None
 
     return 'success'
diff --git a/autotest/gcore/pam.py b/autotest/gcore/pam.py
index b957686e77ac..1cd0f9f0abf1 100755
--- a/autotest/gcore/pam.py
+++ b/autotest/gcore/pam.py
@@ -51,29 +51,20 @@ def test_pam_1():
     ds = gdal.Open("data/byte.pnm")
 
     base_md = ds.GetMetadata()
-    if len(base_md) != 2 or base_md['other'] != 'red' \
-       or base_md['key'] != 'value':
-        gdaltest.post_reason('Default domain metadata missing')
-        return 'fail'
+    assert len(base_md) == 2 and base_md['other'] == 'red' and base_md['key'] == 'value', \
+        'Default domain metadata missing'
 
     xml_md = ds.GetMetadata('xml:test')
 
-    if len(xml_md) != 1:
-        gdaltest.post_reason('xml:test metadata missing')
-        return 'fail'
+    assert len(xml_md) == 1, 'xml:test metadata missing'
 
-    if not isinstance(xml_md, list):
-        gdaltest.post_reason('xml:test metadata not returned as list.')
-        return 'fail'
+    assert isinstance(xml_md, list), 'xml:test metadata not returned as list.'
 
     expected_xml = """<?xml version="2.0"?>
 <TestXML>Value</TestXML>
 """
 
-    if xml_md[0] != expected_xml:
-        gdaltest.post_reason('xml does not match')
-        print(xml_md)
-        return 'fail'
+    assert xml_md[0] == expected_xml, 'xml does not match'
 
     return 'success'
 
@@ -111,44 +102,31 @@ def test_pam_3():
 
     band = ds.GetRasterBand(1)
     base_md = band.GetMetadata()
-    if len(base_md) != 2 or base_md['other'] != 'red' \
-       or base_md['key'] != 'value':
-        gdaltest.post_reason('Default domain metadata missing')
-        return 'fail'
+    assert len(base_md) == 2 and base_md['other'] == 'red' and base_md['key'] == 'value', \
+        'Default domain metadata missing'
 
     xml_md = band.GetMetadata('xml:test')
 
-    if len(xml_md) != 1:
-        gdaltest.post_reason('xml:test metadata missing')
-        return 'fail'
+    assert len(xml_md) == 1, 'xml:test metadata missing'
 
-    if not isinstance(xml_md, list):
-        gdaltest.post_reason('xml:test metadata not returned as list.')
-        return 'fail'
+    assert isinstance(xml_md, list), 'xml:test metadata not returned as list.'
 
     expected_xml = """<?xml version="2.0"?>
 <TestXML>Value</TestXML>
 """
 
-    if xml_md[0] != expected_xml:
-        gdaltest.post_reason('xml does not match')
-        print(xml_md)
-        return 'fail'
+    assert xml_md[0] == expected_xml, 'xml does not match'
 
-    if band.GetNoDataValue() != 100:
-        gdaltest.post_reason('nodata not saved via pam')
-        return 'fail'
+    assert band.GetNoDataValue() == 100, 'nodata not saved via pam'
 
     ds = None
     ds = gdal.Open('tmp/pam.pnm', gdal.GA_Update)
-    if ds.GetRasterBand(1).DeleteNoDataValue() != 0:
-        return 'fail'
+    assert ds.GetRasterBand(1).DeleteNoDataValue() == 0
     ds = None
 
     ds = gdal.Open('tmp/pam.pnm')
-    if ds.GetRasterBand(1).GetNoDataValue() is not None:
-        gdaltest.post_reason('got nodata value whereas none was expected')
-        return 'fail'
+    assert ds.GetRasterBand(1).GetNoDataValue() is None, \
+        'got nodata value whereas none was expected'
 
     return 'success'
 
@@ -168,10 +146,8 @@ def test_pam_4():
     ds = gdal.Open('tmp/mfftest.hdr')
     stats = ds.GetRasterBand(1).GetStatistics(0, 1)
 
-    if stats[0] != 0 or stats[1] != 4:
-        gdaltest.post_reason('Got wrong min/max, likely nodata not working?')
-        print(stats)
-        return 'fail'
+    assert stats[0] == 0 and stats[1] == 4, \
+        'Got wrong min/max, likely nodata not working?'
 
     return 'success'
 
@@ -187,11 +163,7 @@ def test_pam_5():
     filelist = ds.GetFileList()
     ds = None
 
-    if len(filelist) != 1:
-        print(filelist)
-
-        gdaltest.post_reason('did not get expected file list.')
-        return 'fail'
+    assert len(filelist) == 1, 'did not get expected file list.'
 
     return 'success'
 
@@ -203,14 +175,12 @@ def test_pam_5():
 def test_pam_6():
 
     ds = gdal.Open('data/f2r23.tif')
-    if ds.GetRasterBand(1).GetNoDataValue() != 0:
-        gdaltest.post_reason('did not get expected .aux sourced nodata.')
-        return 'fail'
+    assert ds.GetRasterBand(1).GetNoDataValue() == 0, \
+        'did not get expected .aux sourced nodata.'
     ds = None
 
-    if os.path.exists('data/f2r23.tif.aux.xml'):
-        gdaltest.post_reason('did not expect .aux.xml to be created.')
-        return 'fail'
+    assert not os.path.exists('data/f2r23.tif.aux.xml'), \
+        'did not expect .aux.xml to be created.'
 
     return 'success'
 
@@ -235,8 +205,7 @@ def test_pam_7():
     os.remove('tmp/stefan_full_rgba.png')
     os.remove('tmp/stefan_full_rgba.png.ovr')
 
-    if ovr_count != 1:
-        return 'fail'
+    assert ovr_count == 1
 
     return 'success'
 
@@ -259,9 +228,7 @@ def test_pam_8():
 
     gdal.GetDriverByName('GTiff').Delete('/vsimem/pam_8.tif')
 
-    if desc != 'foo':
-        print(desc)
-        return 'fail'
+    assert desc == 'foo'
 
     return 'success'
 
@@ -297,9 +264,7 @@ def test_pam_9():
 
     expected_wkt = """PROJCS["NAD_1983_UTM_Zone_14N",GEOGCS["GCS_North_American_1983",DATUM["North_American_Datum_1983",SPHEROID["GRS_1980",6378137.0,298.257222101]],PRIMEM["Greenwich",0.0],UNIT["Degree",0.0174532925199433]],PROJECTION["Transverse_Mercator"],PARAMETER["false_easting",500000.0],PARAMETER["false_northing",0.0],PARAMETER["central_meridian",-99.0],PARAMETER["scale_factor",0.9996],PARAMETER["latitude_of_origin",0.0],UNIT["Meter",1.0]]"""
 
-    if wkt != expected_wkt:
-        print(wkt)
-        return 'fail'
+    assert wkt == expected_wkt
 
     return 'success'
 
@@ -317,67 +282,38 @@ def test_pam_10():
     ds = gdal.Open('/vsimem/pam_10.asc')
 
     gcps = ds.GetGCPs()
-    if len(gcps) != 2 or ds.GetGCPCount() != 2:
-        return 'fail'
+    assert len(gcps) == 2 and ds.GetGCPCount() == 2
 
-    if ds.GetGCPProjection().find("WGS 84") == -1:
-        print(ds.GetGCPProjection())
-        return 'fail'
+    assert ds.GetGCPProjection().find("WGS 84") != -1
 
-    if gcps[0].GCPPixel != 0 or gcps[0].GCPLine != 1 or \
-       gcps[0].GCPX != 2 or gcps[0].GCPY != 3 or gcps[0].GCPZ != 4:
-        print(gcps[0])
-        return 'fail'
+    assert (gcps[0].GCPPixel == 0 and gcps[0].GCPLine == 1 and \
+       gcps[0].GCPX == 2 and gcps[0].GCPY == 3 and gcps[0].GCPZ == 4)
 
-    if gcps[1].GCPPixel != 1 or gcps[1].GCPLine != 2 or \
-       gcps[1].GCPX != 3 or gcps[1].GCPY != 4 or gcps[1].GCPZ != 5:
-        print(gcps[1])
-        return 'fail'
+    assert (gcps[1].GCPPixel == 1 and gcps[1].GCPLine == 2 and \
+       gcps[1].GCPX == 3 and gcps[1].GCPY == 4 and gcps[1].GCPZ == 5)
 
     band = ds.GetRasterBand(1)
-    if band.GetDescription() != 'MyDescription':
-        print(band.GetDescription())
-        return 'fail'
+    assert band.GetDescription() == 'MyDescription'
 
-    if band.GetUnitType() != 'MyUnit':
-        print(band.GetUnitType())
-        return 'fail'
+    assert band.GetUnitType() == 'MyUnit'
 
-    if band.GetOffset() != 1:
-        print(band.GetOffset())
-        return 'fail'
+    assert band.GetOffset() == 1
 
-    if band.GetScale() != 2:
-        print(band.GetScale())
-        return 'fail'
+    assert band.GetScale() == 2
 
-    if band.GetRasterColorInterpretation() != gdal.GCI_PaletteIndex:
-        print(band.GetRasterColorInterpretation())
-        return 'fail'
+    assert band.GetRasterColorInterpretation() == gdal.GCI_PaletteIndex
 
-    if band.GetCategoryNames() != ['Cat1', 'Cat2']:
-        print(band.GetCategoryNames())
-        return 'fail'
+    assert band.GetCategoryNames() == ['Cat1', 'Cat2']
 
     ct = band.GetColorTable()
-    if ct.GetColorEntry(0) != (0, 0, 0, 255):
-        print(ct.GetColorEntry(0))
-        return 'fail'
-    if ct.GetColorEntry(1) != (1, 1, 1, 255):
-        print(ct.GetColorEntry(1))
-        return 'fail'
+    assert ct.GetColorEntry(0) == (0, 0, 0, 255)
+    assert ct.GetColorEntry(1) == (1, 1, 1, 255)
 
-    if band.GetMaximum() != 0:
-        print(band.GetMaximum())
-        return 'fail'
+    assert band.GetMaximum() == 0
 
-    if band.GetMinimum() != 2:
-        print(band.GetMinimum())
-        return 'fail'
+    assert band.GetMinimum() == 2
 
-    if band.GetMetadata() != {'STATISTICS_MEAN': '1', 'STATISTICS_MINIMUM': '2', 'STATISTICS_MAXIMUM': '0', 'STATISTICS_STDDEV': '3'}:
-        print(band.GetMetadata())
-        return 'fail'
+    assert band.GetMetadata() == {'STATISTICS_MEAN': '1', 'STATISTICS_MINIMUM': '2', 'STATISTICS_MAXIMUM': '0', 'STATISTICS_STDDEV': '3'}
 
     ds = None
 
@@ -417,37 +353,28 @@ def test_pam_11():
     # Compute statistics --> the saving as .aux.xml should fail
     ds = gdal.Open('tmpdirreadonly/byte.tif')
     stats = ds.GetRasterBand(1).ComputeStatistics(False)
-    if stats[0] != 74:
-        gdaltest.post_reason('did not get expected minimum')
-        return 'fail'
+    assert stats[0] == 74, 'did not get expected minimum'
     gdal.ErrorReset()
     ds = None
     error_msg = gdal.GetLastErrorMsg()
-    if error_msg.find('Unable to save auxiliary information') != 0:
-        gdaltest.post_reason('warning was expected at that point')
-        return 'fail'
+    assert error_msg.find('Unable to save auxiliary information') == 0, \
+        'warning was expected at that point'
 
     # Check that we actually have no saved statistics
     ds = gdal.Open('tmpdirreadonly/byte.tif')
     stats = ds.GetRasterBand(1).GetStatistics(False, False)
-    if stats[3] != -1:
-        gdaltest.post_reason('did not expected to have stats at that point')
-        return 'fail'
+    assert stats[3] == -1, 'did not expected to have stats at that point'
     ds = None
 
     # This must be run as an external process so we can override GDAL_PAM_PROXY_DIR
     # at the beginning of the process
     import test_py_scripts
     ret = test_py_scripts.run_py_script_as_external_script('.', 'pamproxydb', '-test1')
-    if ret.find('success') == -1:
-        gdaltest.post_reason('pamproxydb.py -test1 failed %s' % ret)
-        return 'fail'
+    assert ret.find('success') != -1, ('pamproxydb.py -test1 failed %s' % ret)
 
     # Test loading an existing proxydb
     ret = test_py_scripts.run_py_script_as_external_script('.', 'pamproxydb', '-test2')
-    if ret.find('success') == -1:
-        gdaltest.post_reason('pamproxydb.py -test2 failed %s' % ret)
-        return 'fail'
+    assert ret.find('success') != -1, ('pamproxydb.py -test2 failed %s' % ret)
 
     return 'success'
 
@@ -483,16 +410,9 @@ def test_pam_12():
     gdal.Unlink('tmp/byte.tif')
     gdal.Unlink('tmp/byte.tif.aux.xml')
 
-    if hist1 != hist2:
-        print(hist1)
-        print(hist2)
-        return 'fail'
-    if hist1[0] != 6000000000:
-        print(hist1)
-        return 'fail'
-    if aux_xml.find('<HistCounts>6000000000|') < 0:
-        print(aux_xml)
-        return 'fail'
+    assert hist1 == hist2
+    assert hist1[0] == 6000000000
+    assert aux_xml.find('<HistCounts>6000000000|') >= 0
 
     return 'success'
 
@@ -512,19 +432,16 @@ def test_pam_13():
     gdal.PushErrorHandler()
     ret = ds.GetRasterBand(1).SetNoDataValue(0)
     gdal.PopErrorHandler()
-    if ret == 0:
-        return 'fail'
+    assert ret != 0
 
     gdal.PushErrorHandler()
     ret = ds.GetRasterBand(1).DeleteNoDataValue()
     gdal.PopErrorHandler()
-    if ret == 0:
-        return 'fail'
+    assert ret != 0
 
     ds = None
 
-    if gdal.VSIStatL('/vsimem/tmp.pnm.aux.xml') is not None:
-        return 'fail'
+    assert gdal.VSIStatL('/vsimem/tmp.pnm.aux.xml') is None
 
     gdal.Unlink('/vsimem/tmp.pnm')
 
diff --git a/autotest/gcore/pixfun.py b/autotest/gcore/pixfun.py
index a21fd5fcc7e1..eb965698bd83 100755
--- a/autotest/gcore/pixfun.py
+++ b/autotest/gcore/pixfun.py
@@ -52,20 +52,15 @@ def test_pixfun_real_c():
 
     filename = 'data/pixfun_real_c.vrt'
     ds = gdal.OpenShared(filename, gdal.GA_ReadOnly)
-    if ds is None:
-        gdaltest.post_reason('Unable to open "%s" dataset.' % filename)
-        return 'fail'
+    assert ds is not None, ('Unable to open "%s" dataset.' % filename)
     data = ds.GetRasterBand(1).ReadAsArray()
 
     reffilename = 'data/cint_sar.tif'
     refds = gdal.Open(reffilename)
-    if refds is None:
-        gdaltest.post_reason('Unable to open "%s" dataset.' % reffilename)
-        return 'fail'
+    assert refds is not None, ('Unable to open "%s" dataset.' % reffilename)
     refdata = refds.GetRasterBand(1).ReadAsArray()
 
-    if not numpy.alltrue(data == refdata.real):
-        return 'fail'
+    assert numpy.alltrue(data == refdata.real)
 
     return 'success'
 
@@ -80,20 +75,15 @@ def test_pixfun_real_r():
 
     filename = 'data/pixfun_real_r.vrt'
     ds = gdal.OpenShared(filename, gdal.GA_ReadOnly)
-    if ds is None:
-        gdaltest.post_reason('Unable to open "%s" dataset.' % filename)
-        return 'fail'
+    assert ds is not None, ('Unable to open "%s" dataset.' % filename)
     data = ds.GetRasterBand(1).ReadAsArray()
 
     reffilename = 'data/int32.tif'
     refds = gdal.Open(reffilename)
-    if refds is None:
-        gdaltest.post_reason('Unable to open "%s" dataset.' % reffilename)
-        return 'fail'
+    assert refds is not None, ('Unable to open "%s" dataset.' % reffilename)
     refdata = refds.GetRasterBand(1).ReadAsArray()
 
-    if not numpy.alltrue(data == refdata.real):
-        return 'fail'
+    assert numpy.alltrue(data == refdata.real)
 
     return 'success'
 
@@ -108,28 +98,22 @@ def test_pixfun_imag_c():
 
     filename = 'data/pixfun_imag_c.vrt'
     ds = gdal.OpenShared(filename, gdal.GA_ReadOnly)
-    if ds is None:
-        gdaltest.post_reason('Unable to open "%s" dataset.' % filename)
-        return 'fail'
+    assert ds is not None, ('Unable to open "%s" dataset.' % filename)
     data = ds.GetRasterBand(1).ReadAsArray()
 
     reffilename = 'data/cint_sar.tif'
     refds = gdal.Open(reffilename)
-    if refds is None:
-        gdaltest.post_reason('Unable to open "%s" dataset.' % reffilename)
-        return 'fail'
+    assert refds is not None, ('Unable to open "%s" dataset.' % reffilename)
     refdata = refds.GetRasterBand(1).ReadAsArray()
 
-    if not numpy.alltrue(data == refdata.imag):
-        return 'fail'
+    assert numpy.alltrue(data == refdata.imag)
 
     # Test bugfix of #6599
     copied_ds = gdal.Translate('', filename, format='MEM')
     data_ds = copied_ds.GetRasterBand(1).ReadAsArray()
     copied_ds = None
 
-    if not numpy.alltrue(data == data_ds):
-        return 'fail'
+    assert numpy.alltrue(data == data_ds)
 
     return 'success'
 
@@ -144,13 +128,10 @@ def test_pixfun_imag_r():
 
     filename = 'data/pixfun_imag_r.vrt'
     ds = gdal.OpenShared(filename, gdal.GA_ReadOnly)
-    if ds is None:
-        gdaltest.post_reason('Unable to open "%s" dataset.' % filename)
-        return 'fail'
+    assert ds is not None, ('Unable to open "%s" dataset.' % filename)
     data = ds.GetRasterBand(1).ReadAsArray()
 
-    if not numpy.alltrue(data == 0):
-        return 'fail'
+    assert numpy.alltrue(data == 0)
 
     return 'success'
 
@@ -165,20 +146,15 @@ def test_pixfun_complex():
 
     filename = 'data/pixfun_complex.vrt'
     ds = gdal.OpenShared(filename, gdal.GA_ReadOnly)
-    if ds is None:
-        gdaltest.post_reason('Unable to open "%s" dataset.' % filename)
-        return 'fail'
+    assert ds is not None, ('Unable to open "%s" dataset.' % filename)
     data = ds.GetRasterBand(1).ReadAsArray()
 
     reffilename = 'data/int32.tif'
     refds = gdal.Open(reffilename)
-    if refds is None:
-        gdaltest.post_reason('Unable to open "%s" dataset.' % reffilename)
-        return 'fail'
+    assert refds is not None, ('Unable to open "%s" dataset.' % reffilename)
     refdata = refds.GetRasterBand(1).ReadAsArray()
 
-    if not numpy.allclose(data, refdata + 1j * refdata):
-        return 'fail'
+    assert numpy.allclose(data, refdata + 1j * refdata)
 
     return 'success'
 
@@ -193,20 +169,15 @@ def test_pixfun_mod_c():
 
     filename = 'data/pixfun_mod_c.vrt'
     ds = gdal.OpenShared(filename, gdal.GA_ReadOnly)
-    if ds is None:
-        gdaltest.post_reason('Unable to open "%s" dataset.' % filename)
-        return 'fail'
+    assert ds is not None, ('Unable to open "%s" dataset.' % filename)
     data = ds.GetRasterBand(1).ReadAsArray()
 
     reffilename = 'data/cint_sar.tif'
     refds = gdal.Open(reffilename)
-    if refds is None:
-        gdaltest.post_reason('Unable to open "%s" dataset.' % reffilename)
-        return 'fail'
+    assert refds is not None, ('Unable to open "%s" dataset.' % reffilename)
     refdata = refds.GetRasterBand(1).ReadAsArray()
 
-    if not numpy.alltrue(data == numpy.abs(refdata)):
-        return 'fail'
+    assert numpy.alltrue(data == numpy.abs(refdata))
 
     return 'success'
 
@@ -221,20 +192,15 @@ def test_pixfun_mod_r():
 
     filename = 'data/pixfun_mod_r.vrt'
     ds = gdal.OpenShared(filename, gdal.GA_ReadOnly)
-    if ds is None:
-        gdaltest.post_reason('Unable to open "%s" dataset.' % filename)
-        return 'fail'
+    assert ds is not None, ('Unable to open "%s" dataset.' % filename)
     data = ds.GetRasterBand(1).ReadAsArray()
 
     reffilename = 'data/int32.tif'
     refds = gdal.Open(reffilename)
-    if refds is None:
-        gdaltest.post_reason('Unable to open "%s" dataset.' % reffilename)
-        return 'fail'
+    assert refds is not None, ('Unable to open "%s" dataset.' % reffilename)
     refdata = refds.GetRasterBand(1).ReadAsArray()
 
-    if not numpy.alltrue(data == numpy.abs(refdata)):
-        return 'fail'
+    assert numpy.alltrue(data == numpy.abs(refdata))
 
     return 'success'
 
@@ -249,22 +215,16 @@ def test_pixfun_phase_c():
 
     filename = 'data/pixfun_phase_c.vrt'
     ds = gdal.OpenShared(filename, gdal.GA_ReadOnly)
-    if ds is None:
-        gdaltest.post_reason('Unable to open "%s" dataset.' % filename)
-        return 'fail'
+    assert ds is not None, ('Unable to open "%s" dataset.' % filename)
     data = ds.GetRasterBand(1).ReadAsArray()
 
     reffilename = 'data/cint_sar.tif'
     refds = gdal.Open(reffilename)
-    if refds is None:
-        gdaltest.post_reason('Unable to open "%s" dataset.' % reffilename)
-        return 'fail'
+    assert refds is not None, ('Unable to open "%s" dataset.' % reffilename)
     refdata = refds.GetRasterBand(1).ReadAsArray()
     refdata = refdata.astype('complex128')
 
-    if not numpy.allclose(data, numpy.arctan2(refdata.imag, refdata.real)):
-        print(data - numpy.arctan2(refdata.imag, refdata.real))
-        return 'fail'
+    assert numpy.allclose(data, numpy.arctan2(refdata.imag, refdata.real))
 
     return 'success'
 
@@ -279,20 +239,15 @@ def test_pixfun_phase_r():
 
     filename = 'data/pixfun_phase_r.vrt'
     ds = gdal.OpenShared(filename, gdal.GA_ReadOnly)
-    if ds is None:
-        gdaltest.post_reason('Unable to open "%s" dataset.' % filename)
-        return 'fail'
+    assert ds is not None, ('Unable to open "%s" dataset.' % filename)
     data = ds.GetRasterBand(1).ReadAsArray()
 
     reffilename = 'data/pixfun_imag_c.vrt'
     refds = gdal.Open(reffilename)
-    if refds is None:
-        gdaltest.post_reason('Unable to open "%s" dataset.' % reffilename)
-        return 'fail'
+    assert refds is not None, ('Unable to open "%s" dataset.' % reffilename)
     refdata = refds.GetRasterBand(1).ReadAsArray()
 
-    if not numpy.alltrue(data == numpy.arctan2(0, refdata)):
-        return 'fail'
+    assert numpy.alltrue(data == numpy.arctan2(0, refdata))
 
     return 'success'
 
@@ -307,20 +262,15 @@ def test_pixfun_conj_c():
 
     filename = 'data/pixfun_conj_c.vrt'
     ds = gdal.OpenShared(filename, gdal.GA_ReadOnly)
-    if ds is None:
-        gdaltest.post_reason('Unable to open "%s" dataset.' % filename)
-        return 'fail'
+    assert ds is not None, ('Unable to open "%s" dataset.' % filename)
     data = ds.GetRasterBand(1).ReadAsArray()
 
     reffilename = 'data/cint_sar.tif'
     refds = gdal.Open(reffilename)
-    if refds is None:
-        gdaltest.post_reason('Unable to open "%s" dataset.' % reffilename)
-        return 'fail'
+    assert refds is not None, ('Unable to open "%s" dataset.' % reffilename)
     refdata = refds.GetRasterBand(1).ReadAsArray()
 
-    if not numpy.alltrue(data == numpy.conj(refdata)):
-        return 'fail'
+    assert numpy.alltrue(data == numpy.conj(refdata))
 
     return 'success'
 
@@ -335,20 +285,15 @@ def test_pixfun_conj_r():
 
     filename = 'data/pixfun_conj_r.vrt'
     ds = gdal.OpenShared(filename, gdal.GA_ReadOnly)
-    if ds is None:
-        gdaltest.post_reason('Unable to open "%s" dataset.' % filename)
-        return 'fail'
+    assert ds is not None, ('Unable to open "%s" dataset.' % filename)
     data = ds.GetRasterBand(1).ReadAsArray()
 
     reffilename = 'data/int32.tif'
     refds = gdal.Open(reffilename)
-    if refds is None:
-        gdaltest.post_reason('Unable to open "%s" dataset.' % reffilename)
-        return 'fail'
+    assert refds is not None, ('Unable to open "%s" dataset.' % reffilename)
     refdata = refds.GetRasterBand(1).ReadAsArray()
 
-    if not numpy.alltrue(data == numpy.conj(refdata)):
-        return 'fail'
+    assert numpy.alltrue(data == numpy.conj(refdata))
 
     return 'success'
 
@@ -363,9 +308,7 @@ def test_pixfun_sum_r():
 
     filename = 'data/pixfun_sum_r.vrt'
     ds = gdal.OpenShared(filename, gdal.GA_ReadOnly)
-    if ds is None:
-        gdaltest.post_reason('Unable to open "%s" dataset.' % filename)
-        return 'fail'
+    assert ds is not None, ('Unable to open "%s" dataset.' % filename)
     data = ds.GetRasterBand(1).ReadAsArray()
 
     if numpy_available:
@@ -373,13 +316,10 @@ def test_pixfun_sum_r():
         for reffilename in ('data/uint16.tif', 'data/int32.tif',
                             'data/float32.tif'):
             refds = gdal.Open(reffilename)
-            if refds is None:
-                gdaltest.post_reason('Unable to open "%s" dataset.' % reffilename)
-                return 'fail'
+            assert refds is not None, ('Unable to open "%s" dataset.' % reffilename)
             refdata += refds.GetRasterBand(1).ReadAsArray()
 
-        if not numpy.alltrue(data == refdata):
-            return 'fail'
+        assert numpy.alltrue(data == refdata)
 
     return 'success'
 
@@ -394,9 +334,7 @@ def test_pixfun_sum_c():
 
     filename = 'data/pixfun_sum_c.vrt'
     ds = gdal.OpenShared(filename, gdal.GA_ReadOnly)
-    if ds is None:
-        gdaltest.post_reason('Unable to open "%s" dataset.' % filename)
-        return 'fail'
+    assert ds is not None, ('Unable to open "%s" dataset.' % filename)
     data = ds.GetRasterBand(1).ReadAsArray()
 
     if numpy_available:
@@ -404,13 +342,10 @@ def test_pixfun_sum_c():
         for reffilename in ('data/uint16.tif', 'data/cint_sar.tif',
                             'data/cfloat64.tif'):
             refds = gdal.Open(reffilename)
-            if refds is None:
-                gdaltest.post_reason('Unable to open "%s" dataset.' % reffilename)
-                return 'fail'
+            assert refds is not None, ('Unable to open "%s" dataset.' % reffilename)
             refdata += refds.GetRasterBand(1).ReadAsArray(0, 0, 5, 6)
 
-        if not numpy.alltrue(data == refdata):
-            return 'fail'
+        assert numpy.alltrue(data == refdata)
 
     return 'success'
 
@@ -425,27 +360,20 @@ def test_pixfun_diff_r():
 
     filename = 'data/pixfun_diff_r.vrt'
     ds = gdal.OpenShared(filename, gdal.GA_ReadOnly)
-    if ds is None:
-        gdaltest.post_reason('Unable to open "%s" dataset.' % filename)
-        return 'fail'
+    assert ds is not None, ('Unable to open "%s" dataset.' % filename)
     data = ds.GetRasterBand(1).ReadAsArray()
 
     reffilename = 'data/int32.tif'
     refds = gdal.Open(reffilename)
-    if refds is None:
-        gdaltest.post_reason('Unable to open "%s" dataset.' % reffilename)
-        return 'fail'
+    assert refds is not None, ('Unable to open "%s" dataset.' % reffilename)
     refdata1 = refds.GetRasterBand(1).ReadAsArray(0, 0, 5, 6)
 
     reffilename = 'data/float32.tif'
     refds = gdal.Open(reffilename)
-    if refds is None:
-        gdaltest.post_reason('Unable to open "%s" dataset.' % reffilename)
-        return 'fail'
+    assert refds is not None, ('Unable to open "%s" dataset.' % reffilename)
     refdata2 = refds.GetRasterBand(1).ReadAsArray(10, 10, 5, 6)
 
-    if not numpy.alltrue(data == refdata1 - refdata2):
-        return 'fail'
+    assert numpy.alltrue(data == refdata1 - refdata2)
 
     return 'success'
 
@@ -460,27 +388,20 @@ def test_pixfun_diff_c():
 
     filename = 'data/pixfun_diff_c.vrt'
     ds = gdal.OpenShared(filename, gdal.GA_ReadOnly)
-    if ds is None:
-        gdaltest.post_reason('Unable to open "%s" dataset.' % filename)
-        return 'fail'
+    assert ds is not None, ('Unable to open "%s" dataset.' % filename)
     data = ds.GetRasterBand(1).ReadAsArray()
 
     reffilename = 'data/cint_sar.tif'
     refds = gdal.Open(reffilename)
-    if refds is None:
-        gdaltest.post_reason('Unable to open "%s" dataset.' % reffilename)
-        return 'fail'
+    assert refds is not None, ('Unable to open "%s" dataset.' % reffilename)
     refdata1 = refds.GetRasterBand(1).ReadAsArray()
 
     reffilename = 'data/cfloat64.tif'
     refds = gdal.Open(reffilename)
-    if refds is None:
-        gdaltest.post_reason('Unable to open "%s" dataset.' % reffilename)
-        return 'fail'
+    assert refds is not None, ('Unable to open "%s" dataset.' % reffilename)
     refdata2 = refds.GetRasterBand(1).ReadAsArray(0, 0, 5, 6)
 
-    if not numpy.alltrue(data == refdata1 - refdata2):
-        return 'fail'
+    assert numpy.alltrue(data == refdata1 - refdata2)
 
     return 'success'
 
@@ -495,9 +416,7 @@ def test_pixfun_mul_r():
 
     filename = 'data/pixfun_mul_r.vrt'
     ds = gdal.OpenShared(filename, gdal.GA_ReadOnly)
-    if ds is None:
-        gdaltest.post_reason('Unable to open "%s" dataset.' % filename)
-        return 'fail'
+    assert ds is not None, ('Unable to open "%s" dataset.' % filename)
     data = ds.GetRasterBand(1).ReadAsArray()
 
     if numpy_available:
@@ -505,13 +424,10 @@ def test_pixfun_mul_r():
         for reffilename in ('data/uint16.tif', 'data/int32.tif',
                             'data/float32.tif'):
             refds = gdal.Open(reffilename)
-            if refds is None:
-                gdaltest.post_reason('Unable to open "%s" dataset.' % reffilename)
-                return 'fail'
+            assert refds is not None, ('Unable to open "%s" dataset.' % reffilename)
             refdata *= refds.GetRasterBand(1).ReadAsArray()
 
-        if not numpy.alltrue(data == refdata):
-            return 'fail'
+        assert numpy.alltrue(data == refdata)
 
     return 'success'
 
@@ -526,20 +442,15 @@ def test_pixfun_mul_c():
 
     filename = 'data/pixfun_mul_c.vrt'
     ds = gdal.OpenShared(filename, gdal.GA_ReadOnly)
-    if ds is None:
-        gdaltest.post_reason('Unable to open "%s" dataset.' % filename)
-        return 'fail'
+    assert ds is not None, ('Unable to open "%s" dataset.' % filename)
     data = ds.GetRasterBand(1).ReadAsArray()
 
     reffilename = 'data/cint_sar.tif'
     refds = gdal.Open(reffilename)
-    if refds is None:
-        gdaltest.post_reason('Unable to open "%s" dataset.' % reffilename)
-        return 'fail'
+    assert refds is not None, ('Unable to open "%s" dataset.' % reffilename)
     refdata = refds.GetRasterBand(1).ReadAsArray()
 
-    if not numpy.alltrue(data == refdata * refdata):
-        return 'fail'
+    assert numpy.alltrue(data == refdata * refdata)
 
     return 'success'
 
@@ -554,20 +465,15 @@ def test_pixfun_cmul_c():
 
     filename = 'data/pixfun_cmul_c.vrt'
     ds = gdal.OpenShared(filename, gdal.GA_ReadOnly)
-    if ds is None:
-        gdaltest.post_reason('Unable to open "%s" dataset.' % filename)
-        return 'fail'
+    assert ds is not None, ('Unable to open "%s" dataset.' % filename)
     data = ds.GetRasterBand(1).ReadAsArray()
 
     reffilename = 'data/cint_sar.tif'
     refds = gdal.Open(reffilename)
-    if refds is None:
-        gdaltest.post_reason('Unable to open "%s" dataset.' % reffilename)
-        return 'fail'
+    assert refds is not None, ('Unable to open "%s" dataset.' % reffilename)
     refdata = refds.GetRasterBand(1).ReadAsArray()
 
-    if not numpy.alltrue(data == refdata * refdata.conj()):
-        return 'fail'
+    assert numpy.alltrue(data == refdata * refdata.conj())
 
     return 'success'
 
@@ -582,29 +488,22 @@ def test_pixfun_cmul_r():
 
     filename = 'data/pixfun_cmul_r.vrt'
     ds = gdal.OpenShared(filename, gdal.GA_ReadOnly)
-    if ds is None:
-        gdaltest.post_reason('Unable to open "%s" dataset.' % filename)
-        return 'fail'
+    assert ds is not None, ('Unable to open "%s" dataset.' % filename)
     data = ds.GetRasterBand(1).ReadAsArray()
 
     reffilename = 'data/uint16.tif'
     refds = gdal.Open(reffilename)
-    if refds is None:
-        gdaltest.post_reason('Unable to open "%s" dataset.' % reffilename)
-        return 'fail'
+    assert refds is not None, ('Unable to open "%s" dataset.' % reffilename)
     refdata1 = refds.GetRasterBand(1).ReadAsArray()
     refdata1 = refdata1.astype('float64')
 
     reffilename = 'data/int32.tif'
     refds = gdal.Open(reffilename)
-    if refds is None:
-        gdaltest.post_reason('Unable to open "%s" dataset.' % reffilename)
-        return 'fail'
+    assert refds is not None, ('Unable to open "%s" dataset.' % reffilename)
     refdata2 = refds.GetRasterBand(1).ReadAsArray()
     refdata2 = refdata2.astype('float64')
 
-    if not numpy.alltrue(data == refdata1 * refdata2.conj()):
-        return 'fail'
+    assert numpy.alltrue(data == refdata1 * refdata2.conj())
 
     return 'success'
 
@@ -619,21 +518,16 @@ def test_pixfun_inv_r():
 
     filename = 'data/pixfun_inv_r.vrt'
     ds = gdal.OpenShared(filename, gdal.GA_ReadOnly)
-    if ds is None:
-        gdaltest.post_reason('Unable to open "%s" dataset.' % filename)
-        return 'fail'
+    assert ds is not None, ('Unable to open "%s" dataset.' % filename)
     data = ds.GetRasterBand(1).ReadAsArray()
 
     reffilename = 'data/uint16.tif'
     refds = gdal.Open(reffilename)
-    if refds is None:
-        gdaltest.post_reason('Unable to open "%s" dataset.' % reffilename)
-        return 'fail'
+    assert refds is not None, ('Unable to open "%s" dataset.' % reffilename)
     refdata = refds.GetRasterBand(1).ReadAsArray()
     refdata = refdata.astype('float64')
 
-    if not numpy.alltrue(data == 1. / refdata):
-        return 'fail'
+    assert numpy.alltrue(data == 1. / refdata)
 
     return 'success'
 
@@ -648,24 +542,18 @@ def test_pixfun_inv_c():
 
     filename = 'data/pixfun_inv_c.vrt'
     ds = gdal.OpenShared(filename, gdal.GA_ReadOnly)
-    if ds is None:
-        gdaltest.post_reason('Unable to open "%s" dataset.' % filename)
-        return 'fail'
+    assert ds is not None, ('Unable to open "%s" dataset.' % filename)
     data = ds.GetRasterBand(1).ReadAsArray()
 
     reffilename = 'data/cint_sar.tif'
     refds = gdal.Open(reffilename)
-    if refds is None:
-        gdaltest.post_reason('Unable to open "%s" dataset.' % reffilename)
-        return 'fail'
+    assert refds is not None, ('Unable to open "%s" dataset.' % reffilename)
     refdata = refds.GetRasterBand(1).ReadAsArray()
     refdata = refdata.astype('complex')
     delta = data - 1. / refdata
 
-    if not numpy.alltrue(abs(delta.real) < 1e-13):
-        return 'fail'
-    if not numpy.alltrue(abs(delta.imag) < 1e-13):
-        return 'fail'
+    assert numpy.alltrue(abs(delta.real) < 1e-13)
+    assert numpy.alltrue(abs(delta.imag) < 1e-13)
 
     return 'success'
 
@@ -680,20 +568,15 @@ def test_pixfun_intensity_c():
 
     filename = 'data/pixfun_intensity_c.vrt'
     ds = gdal.OpenShared(filename, gdal.GA_ReadOnly)
-    if ds is None:
-        gdaltest.post_reason('Unable to open "%s" dataset.' % filename)
-        return 'fail'
+    assert ds is not None, ('Unable to open "%s" dataset.' % filename)
     data = ds.GetRasterBand(1).ReadAsArray()
 
     reffilename = 'data/cint_sar.tif'
     refds = gdal.Open(reffilename)
-    if refds is None:
-        gdaltest.post_reason('Unable to open "%s" dataset.' % reffilename)
-        return 'fail'
+    assert refds is not None, ('Unable to open "%s" dataset.' % reffilename)
     refdata = refds.GetRasterBand(1).ReadAsArray()
 
-    if not numpy.alltrue(data == (refdata * refdata.conj()).real):
-        return 'fail'
+    assert numpy.alltrue(data == (refdata * refdata.conj()).real)
 
     return 'success'
 
@@ -708,20 +591,15 @@ def test_pixfun_intensity_r():
 
     filename = 'data/pixfun_intensity_r.vrt'
     ds = gdal.OpenShared(filename, gdal.GA_ReadOnly)
-    if ds is None:
-        gdaltest.post_reason('Unable to open "%s" dataset.' % filename)
-        return 'fail'
+    assert ds is not None, ('Unable to open "%s" dataset.' % filename)
     data = ds.GetRasterBand(1).ReadAsArray()
 
     reffilename = 'data/float32.tif'
     refds = gdal.Open(reffilename)
-    if refds is None:
-        gdaltest.post_reason('Unable to open "%s" dataset.' % reffilename)
-        return 'fail'
+    assert refds is not None, ('Unable to open "%s" dataset.' % reffilename)
     refdata = refds.GetRasterBand(1).ReadAsArray()
 
-    if not numpy.alltrue(data == (refdata * refdata.conj()).real):
-        return 'fail'
+    assert numpy.alltrue(data == (refdata * refdata.conj()).real)
 
     return 'success'
 
@@ -736,20 +614,15 @@ def test_pixfun_sqrt():
 
     filename = 'data/pixfun_sqrt.vrt'
     ds = gdal.OpenShared(filename, gdal.GA_ReadOnly)
-    if ds is None:
-        gdaltest.post_reason('Unable to open "%s" dataset.' % filename)
-        return 'fail'
+    assert ds is not None, ('Unable to open "%s" dataset.' % filename)
     data = ds.GetRasterBand(1).ReadAsArray()
 
     reffilename = 'data/float32.tif'
     refds = gdal.Open(reffilename)
-    if refds is None:
-        gdaltest.post_reason('Unable to open "%s" dataset.' % reffilename)
-        return 'fail'
+    assert refds is not None, ('Unable to open "%s" dataset.' % reffilename)
     refdata = refds.GetRasterBand(1).ReadAsArray()
 
-    if not numpy.alltrue(data == numpy.sqrt(refdata)):
-        return 'fail'
+    assert numpy.alltrue(data == numpy.sqrt(refdata))
 
     return 'success'
 
@@ -764,20 +637,15 @@ def test_pixfun_log10_r():
 
     filename = 'data/pixfun_log10_r.vrt'
     ds = gdal.OpenShared(filename, gdal.GA_ReadOnly)
-    if ds is None:
-        gdaltest.post_reason('Unable to open "%s" dataset.' % filename)
-        return 'fail'
+    assert ds is not None, ('Unable to open "%s" dataset.' % filename)
     data = ds.GetRasterBand(1).ReadAsArray()
 
     reffilename = 'data/float32.tif'
     refds = gdal.Open(reffilename)
-    if refds is None:
-        gdaltest.post_reason('Unable to open "%s" dataset.' % reffilename)
-        return 'fail'
+    assert refds is not None, ('Unable to open "%s" dataset.' % reffilename)
     refdata = refds.GetRasterBand(1).ReadAsArray()
 
-    if not numpy.alltrue(data == numpy.log10(refdata)):
-        return 'fail'
+    assert numpy.alltrue(data == numpy.log10(refdata))
 
     return 'success'
 
@@ -792,19 +660,14 @@ def test_pixfun_log10_c():
 
     filename = 'data/pixfun_log10_c.vrt'
     ds = gdal.OpenShared(filename, gdal.GA_ReadOnly)
-    if ds is None:
-        gdaltest.post_reason('Unable to open "%s" dataset.' % filename)
-        return 'fail'
+    assert ds is not None, ('Unable to open "%s" dataset.' % filename)
     data = ds.GetRasterBand(1).ReadAsArray()
 
     reffilename = 'data/cint_sar.tif'
     refds = gdal.Open(reffilename)
-    if refds is None:
-        gdaltest.post_reason('Unable to open "%s" dataset.' % reffilename)
-        return 'fail'
+    assert refds is not None, ('Unable to open "%s" dataset.' % reffilename)
     refdata = refds.GetRasterBand(1).ReadAsArray()
-    if not numpy.allclose(data, numpy.log10(numpy.abs(refdata))):
-        return 'fail'
+    assert numpy.allclose(data, numpy.log10(numpy.abs(refdata)))
 
     return 'success'
 
@@ -819,20 +682,15 @@ def test_pixfun_dB_r():
 
     filename = 'data/pixfun_dB_r.vrt'
     ds = gdal.OpenShared(filename, gdal.GA_ReadOnly)
-    if ds is None:
-        gdaltest.post_reason('Unable to open "%s" dataset.' % filename)
-        return 'fail'
+    assert ds is not None, ('Unable to open "%s" dataset.' % filename)
     data = ds.GetRasterBand(1).ReadAsArray()
 
     reffilename = 'data/float32.tif'
     refds = gdal.Open(reffilename)
-    if refds is None:
-        gdaltest.post_reason('Unable to open "%s" dataset.' % reffilename)
-        return 'fail'
+    assert refds is not None, ('Unable to open "%s" dataset.' % reffilename)
     refdata = refds.GetRasterBand(1).ReadAsArray()
 
-    if not numpy.allclose(data, 20. * numpy.log10(refdata)):
-        return 'fail'
+    assert numpy.allclose(data, 20. * numpy.log10(refdata))
 
     return 'success'
 
@@ -847,19 +705,14 @@ def test_pixfun_dB_c():
 
     filename = 'data/pixfun_dB_c.vrt'
     ds = gdal.OpenShared(filename, gdal.GA_ReadOnly)
-    if ds is None:
-        gdaltest.post_reason('Unable to open "%s" dataset.' % filename)
-        return 'fail'
+    assert ds is not None, ('Unable to open "%s" dataset.' % filename)
     data = ds.GetRasterBand(1).ReadAsArray()
 
     reffilename = 'data/cint_sar.tif'
     refds = gdal.Open(reffilename)
-    if refds is None:
-        gdaltest.post_reason('Unable to open "%s" dataset.' % reffilename)
-        return 'fail'
+    assert refds is not None, ('Unable to open "%s" dataset.' % reffilename)
     refdata = refds.GetRasterBand(1).ReadAsArray()
-    if not numpy.allclose(data, 20. * numpy.log10(numpy.abs(refdata))):
-        return 'fail'
+    assert numpy.allclose(data, 20. * numpy.log10(numpy.abs(refdata)))
 
     return 'success'
 
@@ -874,21 +727,16 @@ def test_pixfun_dB2amp():
 
     filename = 'data/pixfun_dB2amp.vrt'
     ds = gdal.OpenShared(filename, gdal.GA_ReadOnly)
-    if ds is None:
-        gdaltest.post_reason('Unable to open "%s" dataset.' % filename)
-        return 'fail'
+    assert ds is not None, ('Unable to open "%s" dataset.' % filename)
     data = ds.GetRasterBand(1).ReadAsArray()
 
     reffilename = 'data/float32.tif'
     refds = gdal.Open(reffilename)
-    if refds is None:
-        gdaltest.post_reason('Unable to open "%s" dataset.' % reffilename)
-        return 'fail'
+    assert refds is not None, ('Unable to open "%s" dataset.' % reffilename)
     refdata = refds.GetRasterBand(1).ReadAsArray()
 
     # if not numpy.alltrue(data == 10.**(refdata/20.)):
-    if not numpy.allclose(data, 10.**(refdata / 20.)):
-        return 'fail'
+    assert numpy.allclose(data, 10.**(refdata / 20.))
 
     return 'success'
 
@@ -903,21 +751,16 @@ def test_pixfun_dB2pow():
 
     filename = 'data/pixfun_dB2pow.vrt'
     ds = gdal.OpenShared(filename, gdal.GA_ReadOnly)
-    if ds is None:
-        gdaltest.post_reason('Unable to open "%s" dataset.' % filename)
-        return 'fail'
+    assert ds is not None, ('Unable to open "%s" dataset.' % filename)
     data = ds.GetRasterBand(1).ReadAsArray()
 
     reffilename = 'data/float32.tif'
     refds = gdal.Open(reffilename)
-    if refds is None:
-        gdaltest.post_reason('Unable to open "%s" dataset.' % reffilename)
-        return 'fail'
+    assert refds is not None, ('Unable to open "%s" dataset.' % reffilename)
     refdata = refds.GetRasterBand(1).ReadAsArray()
     refdata = refdata.astype('float64')
 
-    if not numpy.allclose(data, 10.**(refdata / 10.)):
-        return 'fail'
+    assert numpy.allclose(data, 10.**(refdata / 10.))
 
     return 'success'
 
diff --git a/autotest/gcore/rasterio.py b/autotest/gcore/rasterio.py
index ee26bf673184..29f07ff5aed3 100755
--- a/autotest/gcore/rasterio.py
+++ b/autotest/gcore/rasterio.py
@@ -35,6 +35,7 @@
 
 import gdaltest
 from osgeo import gdal
+import pytest
 
 ###############################################################################
 # Test writing a 1x1 buffer to a 10x6 raster and read it back
@@ -52,14 +53,10 @@ def test_rasterio_1():
     ds.GetRasterBand(1).Fill(0)
 
     ds.WriteRaster(0, 0, ds.RasterXSize, ds.RasterYSize, data, buf_type=gdal.GDT_Byte, buf_xsize=1, buf_ysize=1)
-    if checksum != ds.GetRasterBand(1).Checksum():
-        gdaltest.post_reason('Didnt get expected checksum ')
-        return 'fail'
+    assert checksum == ds.GetRasterBand(1).Checksum(), 'Didnt get expected checksum '
 
     data2 = ds.ReadRaster(0, 0, ds.RasterXSize, ds.RasterYSize, 1, 1)
-    if data2 != data:
-        gdaltest.post_reason('Didnt get expected buffer ')
-        return 'fail'
+    assert data2 == data, 'Didnt get expected buffer '
 
     ds = None
     drv.Delete('tmp/rasterio1.tif')
@@ -82,14 +79,10 @@ def test_rasterio_2():
     ds.GetRasterBand(1).Fill(0)
 
     ds.WriteRaster(0, 0, ds.RasterXSize, ds.RasterYSize, data, buf_type=gdal.GDT_Byte, buf_xsize=5, buf_ysize=4)
-    if checksum != ds.GetRasterBand(1).Checksum():
-        gdaltest.post_reason('Didnt get expected checksum ')
-        return 'fail'
+    assert checksum == ds.GetRasterBand(1).Checksum(), 'Didnt get expected checksum '
 
     data2 = ds.ReadRaster(0, 0, ds.RasterXSize, ds.RasterYSize, 5, 4)
-    if data2 != data:
-        gdaltest.post_reason('Didnt get expected buffer ')
-        return 'fail'
+    assert data2 == data, 'Didnt get expected buffer '
 
     ds = None
     drv.Delete('tmp/rasterio2.tif')
@@ -127,9 +120,8 @@ def test_rasterio_3():
                                            buf_type=gdal.GDT_Byte,
                                            buf_xsize=xsize + 1, buf_ysize=ysize + 1)
                             data2 = ds.ReadRaster(i, j, k + 1, m + 1, xsize + 1, ysize + 1, gdal.GDT_Byte)
-                            if data2 != data[xsize][ysize]:
-                                gdaltest.post_reason('Didnt get expected buffer ')
-                                return 'fail'
+                            assert data2 == data[xsize][ysize], \
+                                'Didnt get expected buffer '
                     m = m + 1
                 k = k + 1
             j = j + 1
@@ -171,11 +163,8 @@ def test_rasterio_4():
                                            buf_xsize=xsize + 1, buf_ysize=ysize + 1)
                             data2 = ds.ReadRaster(i, j, k + 1, m + 1, xsize + 1, ysize + 1, gdal.GDT_Byte)
                             if data2 != data[(xsize + 1) * (ysize + 1) - 1]:
-                                gdaltest.post_reason('Didnt get expected buffer ')
                                 print(i, j, k, m, xsize, ysize)
-                                print(data2)
-                                print(data[(xsize + 1) * (ysize + 1) - 1])
-                                return 'fail'
+                                pytest.fail('Didnt get expected buffer ')
                     m = m + 1
                 k = k + 1
             if j >= 15:
@@ -210,18 +199,12 @@ def test_rasterio_5():
         res = ds.ReadRaster(0, 0, 1, 1, band_list=[band_number])
         gdal.PopErrorHandler()
         error_msg = gdal.GetLastErrorMsg()
-        if res is not None:
-            gdaltest.post_reason('expected None')
-            return 'fail'
-        if error_msg.find('this band does not exist on dataset') == -1:
-            gdaltest.post_reason('did not get expected error msg')
-            print(error_msg)
-            return 'fail'
+        assert res is None, 'expected None'
+        assert error_msg.find('this band does not exist on dataset') != -1, \
+            'did not get expected error msg'
 
     res = ds.ReadRaster(0, 0, 1, 1, band_list=[1, 1])
-    if res is None:
-        gdaltest.post_reason('expected non None')
-        return 'fail'
+    assert res is not None, 'expected non None'
 
     for obj in [ds, ds.GetRasterBand(1)]:
         gdal.ErrorReset()
@@ -229,13 +212,9 @@ def test_rasterio_5():
         res = obj.ReadRaster(0, 0, 21, 21)
         gdal.PopErrorHandler()
         error_msg = gdal.GetLastErrorMsg()
-        if res is not None:
-            gdaltest.post_reason('expected None')
-            return 'fail'
-        if error_msg.find('Access window out of range in RasterIO()') == -1:
-            gdaltest.post_reason('did not get expected error msg (1)')
-            print(error_msg)
-            return 'fail'
+        assert res is None, 'expected None'
+        assert error_msg.find('Access window out of range in RasterIO()') != -1, \
+            'did not get expected error msg (1)'
 
         # This should only fail on a 32bit build
         try:
@@ -253,26 +232,18 @@ def test_rasterio_5():
             res = obj.ReadRaster(0, 0, 1, 1, 1000000, 1000000)
             gdal.PopErrorHandler()
             error_msg = gdal.GetLastErrorMsg()
-            if res is not None:
-                gdaltest.post_reason('expected None')
-                return 'fail'
-            if error_msg.find('Integer overflow') == -1:
-                gdaltest.post_reason('did not get expected error msg (2)')
-                print(error_msg)
-                return 'fail'
+            assert res is None, 'expected None'
+            assert error_msg.find('Integer overflow') != -1, \
+                'did not get expected error msg (2)'
 
         gdal.ErrorReset()
         gdal.PushErrorHandler('CPLQuietErrorHandler')
         res = obj.ReadRaster(0, 0, 0, 1)
         gdal.PopErrorHandler()
         error_msg = gdal.GetLastErrorMsg()
-        if res is not None:
-            gdaltest.post_reason('expected None')
-            return 'fail'
-        if error_msg.find('Illegal values for buffer size') == -1:
-            gdaltest.post_reason('did not get expected error msg (3)')
-            print(error_msg)
-            return 'fail'
+        assert res is None, 'expected None'
+        assert error_msg.find('Illegal values for buffer size') != -1, \
+            'did not get expected error msg (3)'
 
     ds = None
 
@@ -299,30 +270,24 @@ def test_rasterio_6():
         obj.WriteRaster(0, 0, 2, 2, ' ')
         gdal.PopErrorHandler()
         error_msg = gdal.GetLastErrorMsg()
-        if error_msg.find('Buffer too small') == -1:
-            gdaltest.post_reason('did not get expected error msg (1)')
-            print(error_msg)
-            return 'fail'
+        assert error_msg.find('Buffer too small') != -1, \
+            'did not get expected error msg (1)'
 
         gdal.ErrorReset()
         gdal.PushErrorHandler('CPLQuietErrorHandler')
         obj.WriteRaster(-1, 0, 1, 1, ' ')
         gdal.PopErrorHandler()
         error_msg = gdal.GetLastErrorMsg()
-        if error_msg.find('Access window out of range in RasterIO()') == -1:
-            gdaltest.post_reason('did not get expected error msg (2)')
-            print(error_msg)
-            return 'fail'
+        assert error_msg.find('Access window out of range in RasterIO()') != -1, \
+            'did not get expected error msg (2)'
 
         gdal.ErrorReset()
         gdal.PushErrorHandler('CPLQuietErrorHandler')
         obj.WriteRaster(0, 0, 0, 1, ' ')
         gdal.PopErrorHandler()
         error_msg = gdal.GetLastErrorMsg()
-        if error_msg.find('Illegal values for buffer size') == -1:
-            gdaltest.post_reason('did not get expected error msg (3)')
-            print(error_msg)
-            return 'fail'
+        assert error_msg.find('Illegal values for buffer size') != -1, \
+            'did not get expected error msg (3)'
 
     ds = None
 
@@ -337,14 +302,10 @@ def test_rasterio_7():
     ds = gdal.Open('data/byte.tif')
 
     data = ds.GetRasterBand(1).ReadRaster()
-    if len(data) != 400:
-        gdaltest.post_reason('did not read expected band data via ReadRaster()')
-        return 'fail'
+    assert len(data) == 400, 'did not read expected band data via ReadRaster()'
 
     data = ds.ReadRaster()
-    if len(data) != 400:
-        gdaltest.post_reason('did not read expected dataset data via ReadRaster()')
-        return 'fail'
+    assert len(data) == 400, 'did not read expected dataset data via ReadRaster()'
 
     return 'success'
 
@@ -392,70 +353,54 @@ def test_rasterio_8():
     data = ds.GetRasterBand(1).ReadRaster(resample_alg=gdal.GRIORA_NearestNeighbour,
                                           callback=rasterio_8_progress_callback,
                                           callback_data=tab)
-    if len(data) != 400:
-        gdaltest.post_reason('did not read expected band data via ReadRaster()')
-        return 'fail'
-    if abs(tab[0] - 1) > 1e-5 or not tab[1]:
-        return 'fail'
+    assert len(data) == 400, 'did not read expected band data via ReadRaster()'
+    assert abs(tab[0] - 1) <= 1e-5 and tab[1]
 
     # Test interruption
     tab = [0]
     data = ds.GetRasterBand(1).ReadRaster(resample_alg=gdal.GRIORA_NearestNeighbour,
                                           callback=rasterio_8_progress_interrupt_callback,
                                           callback_data=tab)
-    if data is not None:
-        return 'fail'
-    if tab[0] < 0.50:
-        return 'fail'
+    assert data is None
+    assert tab[0] >= 0.50
 
     # Test RasterBand.ReadRaster with type change
     tab = [0, True]
     data = ds.GetRasterBand(1).ReadRaster(buf_type=gdal.GDT_Int16,
                                           callback=rasterio_8_progress_callback,
                                           callback_data=tab)
-    if data is None:
-        gdaltest.post_reason('did not read expected band data via ReadRaster()')
-        return 'fail'
-    if abs(tab[0] - 1) > 1e-5 or not tab[1]:
-        return 'fail'
+    assert data is not None, 'did not read expected band data via ReadRaster()'
+    assert abs(tab[0] - 1) <= 1e-5 and tab[1]
 
     # Same with interruption
     tab = [0]
     data = ds.GetRasterBand(1).ReadRaster(buf_type=gdal.GDT_Int16,
                                           callback=rasterio_8_progress_interrupt_callback,
                                           callback_data=tab)
-    if data is not None or tab[0] < 0.50:
-        return 'fail'
+    assert data is None and tab[0] >= 0.50
 
     # Test RasterBand.ReadRaster with resampling
     tab = [0, True]
     data = ds.GetRasterBand(1).ReadRaster(buf_xsize=40,
                                           callback=rasterio_8_progress_callback,
                                           callback_data=tab)
-    if data is None:
-        gdaltest.post_reason('did not read expected band data via ReadRaster()')
-        return 'fail'
-    if abs(tab[0] - 1) > 1e-5 or not tab[1]:
-        return 'fail'
+    assert data is not None, 'did not read expected band data via ReadRaster()'
+    assert abs(tab[0] - 1) <= 1e-5 and tab[1]
 
     # Same with interruption
     tab = [0]
     data = ds.GetRasterBand(1).ReadRaster(buf_xsize=40,
                                           callback=rasterio_8_progress_interrupt_callback,
                                           callback_data=tab)
-    if data is not None or tab[0] < 0.50:
-        return 'fail'
+    assert data is None and tab[0] >= 0.50
 
     # Test Dataset.ReadRaster
     tab = [0, True]
     data = ds.ReadRaster(resample_alg=gdal.GRIORA_NearestNeighbour,
                          callback=rasterio_8_progress_callback,
                          callback_data=tab)
-    if len(data) != 400:
-        gdaltest.post_reason('did not read expected dataset data via ReadRaster()')
-        return 'fail'
-    if abs(tab[0] - 1) > 1e-5 or not tab[1]:
-        return 'fail'
+    assert len(data) == 400, 'did not read expected dataset data via ReadRaster()'
+    assert abs(tab[0] - 1) <= 1e-5 and tab[1]
 
     ds = None
 
@@ -465,15 +410,13 @@ def test_rasterio_8():
     data = ds.ReadRaster(resample_alg=gdal.GRIORA_NearestNeighbour,
                          callback=rasterio_8_progress_callback_2,
                          callback_data=last_pct)
-    if data is None or abs(last_pct[0] - 1.0) > 1e-5:
-        return 'fail'
+    assert not (data is None or abs(last_pct[0] - 1.0) > 1e-5)
 
     # Same with interruption
     tab = [0]
     data = ds.ReadRaster(callback=rasterio_8_progress_interrupt_callback,
                          callback_data=tab)
-    if data is not None or tab[0] < 0.50:
-        return 'fail'
+    assert data is None and tab[0] >= 0.50
 
     ds = None
 
@@ -483,15 +426,13 @@ def test_rasterio_8():
     data = ds.ReadRaster(resample_alg=gdal.GRIORA_NearestNeighbour,
                          callback=rasterio_8_progress_callback_2,
                          callback_data=last_pct)
-    if data is None or abs(last_pct[0] - 1.0) > 1e-5:
-        return 'fail'
+    assert not (data is None or abs(last_pct[0] - 1.0) > 1e-5)
 
     # Same with interruption
     tab = [0]
     data = ds.ReadRaster(callback=rasterio_8_progress_interrupt_callback,
                          callback_data=tab)
-    if data is not None or tab[0] < 0.50:
-        return 'fail'
+    assert data is None and tab[0] >= 0.50
 
     return 'success'
 
@@ -528,16 +469,12 @@ def test_rasterio_9():
                                           resample_alg=gdal.GRIORA_Bilinear,
                                           callback=rasterio_9_progress_callback,
                                           callback_data=tab)
-    if data is None:
-        return 'fail'
+    assert data is not None
     data_ar = struct.unpack('h' * 10 * 10, data)
     cs = rasterio_9_checksum(data, 10, 10, data_type=gdal.GDT_Int16)
-    if cs != 1211:  # checksum of gdal_translate data/byte.tif out.tif -outsize 10 10 -r BILINEAR
-        print(cs)
-        return 'fail'
+    assert cs == 1211
 
-    if abs(tab[0] - 1.0) > 1e-5:
-        return 'fail'
+    assert abs(tab[0] - 1.0) <= 1e-5
 
     # Same but query with GDT_Float32. Check that we do not get floating-point
     # values, since the band type is Byte
@@ -547,9 +484,7 @@ def test_rasterio_9():
                                           resample_alg=gdal.GRIORA_Bilinear)
 
     data_float32_ar = struct.unpack('f' * 10 * 10, data)
-    if data_ar != data_float32_ar:
-        print(data_float32_ar)
-        return 'fail'
+    assert data_ar == data_float32_ar
 
     # Test RasterBand.ReadRaster, with Lanczos
     tab = [0, None]
@@ -558,15 +493,11 @@ def test_rasterio_9():
                                           resample_alg=gdal.GRIORA_Lanczos,
                                           callback=rasterio_9_progress_callback,
                                           callback_data=tab)
-    if data is None:
-        return 'fail'
+    assert data is not None
     cs = rasterio_9_checksum(data, 10, 10)
-    if cs != 1154:  # checksum of gdal_translate data/byte.tif out.tif -outsize 10 10 -r LANCZOS
-        print(cs)
-        return 'fail'
+    assert cs == 1154
 
-    if abs(tab[0] - 1.0) > 1e-5:
-        return 'fail'
+    assert abs(tab[0] - 1.0) <= 1e-5
 
     # Test RasterBand.ReadRaster, with Bilinear and UInt16 data type
     src_ds_uint16 = gdal.Open('data/uint16.tif')
@@ -577,15 +508,11 @@ def test_rasterio_9():
                                                      resample_alg=gdal.GRIORA_Bilinear,
                                                      callback=rasterio_9_progress_callback,
                                                      callback_data=tab)
-    if data is None:
-        return 'fail'
+    assert data is not None
     cs = rasterio_9_checksum(data, 10, 10, data_type=gdal.GDT_UInt16)
-    if cs != 1211:  # checksum of gdal_translate data/byte.tif out.tif -outsize 10 10 -r BILINEAR
-        print(cs)
-        return 'fail'
+    assert cs == 1211
 
-    if abs(tab[0] - 1.0) > 1e-5:
-        return 'fail'
+    assert abs(tab[0] - 1.0) <= 1e-5
 
     # Test RasterBand.ReadRaster, with Bilinear on Complex, thus using warp API
     tab = [0, None]
@@ -596,15 +523,11 @@ def test_rasterio_9():
                                                   resample_alg=gdal.GRIORA_Bilinear,
                                                   callback=rasterio_9_progress_callback,
                                                   callback_data=tab)
-    if data is None:
-        return 'fail'
+    assert data is not None
     cs = rasterio_9_checksum(data, 10, 10, data_type=gdal.GDT_CInt16)
-    if cs != 1211:  # checksum of gdal_translate data/byte.tif out.tif -outsize 10 10 -r BILINEAR
-        print(cs)
-        return 'fail'
+    assert cs == 1211
 
-    if abs(tab[0] - 1.0) > 1e-5:
-        return 'fail'
+    assert abs(tab[0] - 1.0) <= 1e-5
 
     # Test interruption
     tab = [0, 0.5]
@@ -615,10 +538,8 @@ def test_rasterio_9():
                                           callback=rasterio_9_progress_callback,
                                           callback_data=tab)
     gdal.PopErrorHandler()
-    if data is not None:
-        return 'fail'
-    if tab[0] < 0.50:
-        return 'fail'
+    assert data is None
+    assert tab[0] >= 0.50
 
     # Test RasterBand.ReadRaster, with Gauss, and downsampling
     tab = [0, None]
@@ -627,15 +548,11 @@ def test_rasterio_9():
                                           resample_alg=gdal.GRIORA_Gauss,
                                           callback=rasterio_9_progress_callback,
                                           callback_data=tab)
-    if data is None:
-        return 'fail'
+    assert data is not None
     cs = rasterio_9_checksum(data, 10, 10)
-    if cs != 1089:  # checksum of gdal_translate data/byte.tif out.tif -outsize 10 10 -r GAUSS
-        print(cs)
-        return 'fail'
+    assert cs == 1089
 
-    if abs(tab[0] - 1.0) > 1e-5:
-        return 'fail'
+    assert abs(tab[0] - 1.0) <= 1e-5
 
     # Test RasterBand.ReadRaster, with Cubic, and downsampling
     tab = [0, None]
@@ -644,37 +561,27 @@ def test_rasterio_9():
                                           resample_alg=gdal.GRIORA_Cubic,
                                           callback=rasterio_9_progress_callback,
                                           callback_data=tab)
-    if data is None:
-        return 'fail'
+    assert data is not None
     cs = rasterio_9_checksum(data, 10, 10)
-    if cs != 1059:  # checksum of gdal_translate data/byte.tif out.tif -outsize 10 10 -r CUBIC
-        print(cs)
-        return 'fail'
+    assert cs == 1059
 
-    if abs(tab[0] - 1.0) > 1e-5:
-        return 'fail'
+    assert abs(tab[0] - 1.0) <= 1e-5
 
     # Test RasterBand.ReadRaster, with Cubic, and downsampling with >=8x8 source samples used for a dest sample
     data = ds.GetRasterBand(1).ReadRaster(buf_xsize=5,
                                           buf_ysize=5,
                                           resample_alg=gdal.GRIORA_Cubic)
-    if data is None:
-        return 'fail'
+    assert data is not None
     cs = rasterio_9_checksum(data, 5, 5)
-    if cs != 214:  # checksum of gdal_translate data/byte.tif out.tif -outsize 5 5 -r CUBIC
-        print(cs)
-        return 'fail'
+    assert cs == 214
 
     # Same with UInt16
     data = src_ds_uint16.GetRasterBand(1).ReadRaster(buf_xsize=5,
                                                      buf_ysize=5,
                                                      resample_alg=gdal.GRIORA_Cubic)
-    if data is None:
-        return 'fail'
+    assert data is not None
     cs = rasterio_9_checksum(data, 5, 5, data_type=gdal.GDT_UInt16)
-    if cs != 214:  # checksum of gdal_translate data/byte.tif out.tif -outsize 5 5 -r CUBIC
-        print(cs)
-        return 'fail'
+    assert cs == 214
 
     # Test RasterBand.ReadRaster, with Cubic and supersampling
     tab = [0, None]
@@ -683,15 +590,11 @@ def test_rasterio_9():
                                           resample_alg=gdal.GRIORA_Cubic,
                                           callback=rasterio_9_progress_callback,
                                           callback_data=tab)
-    if data is None:
-        return 'fail'
+    assert data is not None
     cs = rasterio_9_checksum(data, 40, 40)
-    if cs != 19556:  # checksum of gdal_translate data/byte.tif out.tif -outsize 40 40 -r CUBIC
-        print(cs)
-        return 'fail'
+    assert cs == 19556
 
-    if abs(tab[0] - 1.0) > 1e-5:
-        return 'fail'
+    assert abs(tab[0] - 1.0) <= 1e-5
 
     # Test Dataset.ReadRaster, with Cubic and supersampling
     tab = [0, None]
@@ -700,15 +603,11 @@ def test_rasterio_9():
                          resample_alg=gdal.GRIORA_CubicSpline,
                          callback=rasterio_9_progress_callback,
                          callback_data=tab)
-    if data is None:
-        return 'fail'
+    assert data is not None
     cs = rasterio_9_checksum(data, 40, 40)
-    if cs != 19041:  # checksum of gdal_translate data/byte.tif out.tif -outsize 40 40 -r CUBICSPLINE
-        print(cs)
-        return 'fail'
+    assert cs == 19041
 
-    if abs(tab[0] - 1.0) > 1e-5:
-        return 'fail'
+    assert abs(tab[0] - 1.0) <= 1e-5
 
     # Test Dataset.ReadRaster on a multi band file, with INTERLEAVE=PIXEL
     ds = gdal.Open('data/rgbsmall_cmyk.tif')
@@ -718,19 +617,13 @@ def test_rasterio_9():
                          resample_alg=gdal.GRIORA_Cubic,
                          callback=rasterio_9_progress_callback,
                          callback_data=tab)
-    if data is None:
-        return 'fail'
+    assert data is not None
     cs = rasterio_9_checksum(data[0:25 * 25], 25, 25)
-    if cs != 5975:  # checksum of gdal_translate data/rgbsmall_cmyk.tif out.tif -outsize 25 25 -r CUBIC
-        print(cs)
-        return 'fail'
+    assert cs == 5975
     cs = rasterio_9_checksum(data[25 * 25:2 * 25 * 25], 25, 25)
-    if cs != 6248:  # checksum of gdal_translate data/rgbsmall_cmyk.tif out.tif -outsize 25 25 -r CUBIC
-        print(cs)
-        return 'fail'
+    assert cs == 6248
 
-    if abs(tab[0] - 1.0) > 1e-5:
-        return 'fail'
+    assert abs(tab[0] - 1.0) <= 1e-5
     ds = None
 
     # Test Band.ReadRaster on a RGBA with parts fully opaque, and fully transparent and with huge upscaling
@@ -741,14 +634,10 @@ def test_rasterio_9():
                                           resample_alg=gdal.GRIORA_Cubic,
                                           callback=rasterio_9_progress_callback,
                                           callback_data=tab)
-    if data is None:
-        return 'fail'
+    assert data is not None
     cs = rasterio_9_checksum(data, 162 * 16, 150 * 16)
-    if cs != 30836:  # checksum of gdal_translate data/stefan_full_rgba.png out.tif -outsize 1600% 1600% -r CUBIC
-        print(cs)
-        return 'fail'
-    if abs(tab[0] - 1.0) > 1e-5:
-        return 'fail'
+    assert cs == 30836
+    assert abs(tab[0] - 1.0) <= 1e-5
 
     return 'success'
 
@@ -762,23 +651,20 @@ def test_rasterio_10():
     gdal.PushErrorHandler()
     data = ds.GetRasterBand(1).ReadRaster()
     gdal.PopErrorHandler()
-    if data is not None:
-        return 'fail'
+    assert data is None
 
     # Change buffer type
     gdal.PushErrorHandler()
     data = ds.GetRasterBand(1).ReadRaster(buf_type=gdal.GDT_Int16)
     gdal.PopErrorHandler()
-    if data is not None:
-        return 'fail'
+    assert data is None
 
     # Resampling case
     gdal.PushErrorHandler()
     data = ds.GetRasterBand(1).ReadRaster(buf_xsize=10,
                                           buf_ysize=10)
     gdal.PopErrorHandler()
-    if data is not None:
-        return 'fail'
+    assert data is None
 
     return 'success'
 
@@ -801,17 +687,13 @@ def test_rasterio_11():
     # A bit dummy
     mem_ds.GetRasterBand(1).SetMetadataItem('NBITS', '8', 'IMAGE_STRUCTURE')
     ar = mem_ds.GetRasterBand(1).ReadAsArray(0, 0, 4, 3, 8, 3, resample_alg=gdal.GRIORA_Cubic)
-    if ar.max() != 129:
-        print(ar.max())
-        return 'fail'
+    assert ar.max() == 129
 
     # NBITS=7
     mem_ds.GetRasterBand(1).SetMetadataItem('NBITS', '7', 'IMAGE_STRUCTURE')
     ar = mem_ds.GetRasterBand(1).ReadAsArray(0, 0, 4, 3, 8, 3, resample_alg=gdal.GRIORA_Cubic)
     # Would overshoot to 129 if NBITS was ignored
-    if ar.max() != 127:
-        print(ar.max())
-        return 'fail'
+    assert ar.max() == 127
 
     return 'success'
 
@@ -847,36 +729,22 @@ def test_rasterio_12():
     ar_ds = mem_ds.ReadAsArray(0, 0, 4, 3, buf_xsize=8, buf_ysize=3, resample_alg=gdal.GRIORA_Cubic,
                                callback=rasterio_12_progress_callback,
                                callback_data=tab)
-    if tab[0] != 1.0:
-        print(tab)
-        return 'fail'
+    assert tab[0] == 1.0
 
     ar_ds2 = mem_ds.ReadAsArray(0, 0, 4, 3, buf_xsize=8, buf_ysize=3, resample_alg=gdal.GRIORA_Cubic)
-    if not numpy.array_equal(ar_ds, ar_ds2):
-        print(ar_ds)
-        print(ar_ds2)
-        return 'fail'
+    assert numpy.array_equal(ar_ds, ar_ds2)
 
     ar_bands = [mem_ds.GetRasterBand(i + 1).ReadAsArray(0, 0, 4, 3, buf_xsize=8, buf_ysize=3, resample_alg=gdal.GRIORA_Cubic) for i in range(4)]
 
     # Results of band or dataset RasterIO should be the same
     for i in range(4):
-        if not numpy.array_equal(ar_ds[i], ar_bands[i]):
-            print(ar_ds)
-            print(ar_bands[i])
-            return 'fail'
+        assert numpy.array_equal(ar_ds[i], ar_bands[i])
 
     # First, second and third band should have identical content
-    if not numpy.array_equal(ar_ds[0], ar_ds[1]):
-        print(ar_ds[0])
-        print(ar_ds[1])
-        return 'fail'
+    assert numpy.array_equal(ar_ds[0], ar_ds[1])
 
     # Alpha band should be different
-    if numpy.array_equal(ar_ds[0], ar_ds[3]):
-        print(ar_ds[0])
-        print(ar_ds[3])
-        return 'fail'
+    assert not numpy.array_equal(ar_ds[0], ar_ds[3])
 
     return 'success'
 
@@ -902,11 +770,7 @@ def test_rasterio_13():
         ar_ds = mem_ds.ReadAsArray(0, 0, 4, 3, buf_xsize=8, buf_ysize=3, resample_alg=gdal.GRIORA_Cubic)
 
         expected_ar = numpy.array([[0, 0, 0, 0, 0, 0, 0, 0], [0, 255, 255, 255, 255, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0]])
-        if not numpy.array_equal(ar_ds, expected_ar):
-            print(dt)
-            print(ar_ds)
-            print(expected_ar)
-            return 'fail'
+        assert numpy.array_equal(ar_ds, expected_ar), dt
 
     return 'success'
 
@@ -931,10 +795,7 @@ def test_rasterio_14():
 
     ds = gdal.Translate('/vsimem/rasterio_14_out.asc', '/vsimem/rasterio_14.asc', options='-of AAIGRID -r average -outsize 50% 50%')
     cs = ds.GetRasterBand(1).Checksum()
-    if cs != 110:
-        print(cs)
-        print(ds.ReadAsArray())
-        return 'fail'
+    assert cs == 110, ds.ReadAsArray()
 
     gdal.Unlink('/vsimem/rasterio_14.asc')
     gdal.Unlink('/vsimem/rasterio_14_out.asc')
@@ -943,29 +804,21 @@ def test_rasterio_14():
     ds.GetRasterBand(1).WriteRaster(ds.RasterXSize - 1, 0, 1, 1, struct.pack('B' * 1, 100))
     data = ds.ReadRaster(buf_xsize=int(ds.RasterXSize / 2), buf_ysize=1, resample_alg=gdal.GRIORA_Average)
     data = struct.unpack('B' * int(ds.RasterXSize / 2), data)
-    if data[-1:][0] != 50:
-        print(data[-1:][0])
-        return 'fail'
+    assert data[-1:][0] == 50
 
     data = ds.ReadRaster(ds.RasterXSize - 2, 0, 2, 1, buf_xsize=1, buf_ysize=1, resample_alg=gdal.GRIORA_Average)
     data = struct.unpack('B' * 1, data)
-    if data[0] != 50:
-        print(data[0])
-        return 'fail'
+    assert data[0] == 50
 
     ds = gdal.GetDriverByName('MEM').Create('', 1, 1000000)
     ds.GetRasterBand(1).WriteRaster(0, ds.RasterYSize - 1, 1, 1, struct.pack('B' * 1, 100))
     data = ds.ReadRaster(buf_xsize=1, buf_ysize=int(ds.RasterYSize / 2), resample_alg=gdal.GRIORA_Average)
     data = struct.unpack('B' * int(ds.RasterYSize / 2), data)
-    if data[-1:][0] != 50:
-        print(data[-1:][0])
-        return 'fail'
+    assert data[-1:][0] == 50
 
     data = ds.ReadRaster(0, ds.RasterYSize - 2, 1, 2, buf_xsize=1, buf_ysize=1, resample_alg=gdal.GRIORA_Average)
     data = struct.unpack('B' * 1, data)
-    if data[0] != 50:
-        print(data[0])
-        return 'fail'
+    assert data[0] == 50
 
     return 'success'
 
@@ -990,10 +843,7 @@ def test_rasterio_15():
     ds = gdal.Translate('/vsimem/rasterio_15_out.asc', '/vsimem/rasterio_15.asc', options='-of AAIGRID -r average -outsize 200% 200%')
     data = ds.GetRasterBand(1).ReadRaster()
     cs = ds.GetRasterBand(1).Checksum()
-    if data != data_ref or cs != 134:
-        print(cs)
-        print(ds.ReadAsArray())
-        return 'fail'
+    assert data == data_ref and cs == 134, ds.ReadAsArray()
 
     gdal.Unlink('/vsimem/rasterio_15.asc')
     gdal.Unlink('/vsimem/rasterio_15_out.asc')
@@ -1021,10 +871,7 @@ def test_rasterio_16():
 
     ds = gdal.Translate('/vsimem/rasterio_16_out.asc', '/vsimem/rasterio_16.asc', options='-of AAIGRID -r mode -outsize 50% 50%')
     cs = ds.GetRasterBand(1).Checksum()
-    if cs != 15:
-        print(cs)
-        print(ds.ReadAsArray())
-        return 'fail'
+    assert cs == 15, ds.ReadAsArray()
 
     gdal.Unlink('/vsimem/rasterio_16.asc')
     gdal.Unlink('/vsimem/rasterio_16_out.asc')
@@ -1051,9 +898,7 @@ def test_rasterio_lanczos_nodata():
                    0, 0, 0, 22481, 22466, 22500, 22534, 22536, 22571,
                    0, 0, 0, 22460, 22460, 22547, 22538, 22456, 22572,
                    0, 0, 0, 0, 22504, 22496, 22564, 22563, 22610)
-    if data_ar != expected_ar:
-        print(data_ar)
-        return 'fail'
+    assert data_ar == expected_ar
 
     return 'success'
 
@@ -1081,18 +926,14 @@ def test_rasterio_resampled_value_is_nodata():
                                           resample_alg=gdal.GRIORA_Lanczos)
     data_ar = struct.unpack('f' * 1, data)
     expected_ar = (1.1754943508222875e-38, )
-    if data_ar != expected_ar:
-        print(data_ar)
-        return 'fail'
+    assert data_ar == expected_ar
 
     data = ds.GetRasterBand(1).ReadRaster(buf_xsize=1,
                                           buf_ysize=1,
                                           resample_alg=gdal.GRIORA_Average)
     data_ar = struct.unpack('f' * 1, data)
     expected_ar = (1.1754943508222875e-38, )
-    if data_ar != expected_ar:
-        print(data_ar)
-        return 'fail'
+    assert data_ar == expected_ar
 
     gdal.Unlink('/vsimem/in.asc')
 
@@ -1116,18 +957,14 @@ def test_rasterio_resampled_value_is_nodata():
                                           resample_alg=gdal.GRIORA_Lanczos)
     data_ar = struct.unpack('I' * 1, data)
     expected_ar = (1, )
-    if data_ar != expected_ar:
-        print(data_ar)
-        return 'fail'
+    assert data_ar == expected_ar
 
     data = ds.GetRasterBand(1).ReadRaster(buf_xsize=1,
                                           buf_ysize=1,
                                           resample_alg=gdal.GRIORA_Average)
     data_ar = struct.unpack('I' * 1, data)
     expected_ar = (1, )
-    if data_ar != expected_ar:
-        print(data_ar)
-        return 'fail'
+    assert data_ar == expected_ar
 
     gdal.Unlink('/vsimem/in.asc')
 
diff --git a/autotest/gcore/rat.py b/autotest/gcore/rat.py
index 288493c92180..3e4879fb5156 100755
--- a/autotest/gcore/rat.py
+++ b/autotest/gcore/rat.py
@@ -62,33 +62,19 @@ def test_rat_1():
 
     rat2 = rat.Clone()
 
-    if rat2.GetColumnCount() != 2:
-        gdaltest.post_reason('wrong column count')
-        return 'fail'
+    assert rat2.GetColumnCount() == 2, 'wrong column count'
 
-    if rat2.GetRowCount() != 3:
-        gdaltest.post_reason('wrong row count')
-        return 'fail'
+    assert rat2.GetRowCount() == 3, 'wrong row count'
 
-    if rat2.GetNameOfCol(1) != 'Count':
-        gdaltest.post_reason('wrong column name')
-        return 'fail'
+    assert rat2.GetNameOfCol(1) == 'Count', 'wrong column name'
 
-    if rat2.GetUsageOfCol(1) != gdal.GFU_PixelCount:
-        gdaltest.post_reason('wrong column usage')
-        return 'fail'
+    assert rat2.GetUsageOfCol(1) == gdal.GFU_PixelCount, 'wrong column usage'
 
-    if rat2.GetTypeOfCol(1) != gdal.GFT_Integer:
-        gdaltest.post_reason('wrong column type')
-        return 'fail'
+    assert rat2.GetTypeOfCol(1) == gdal.GFT_Integer, 'wrong column type'
 
-    if rat2.GetRowOfValue(11.0) != 1:
-        gdaltest.post_reason('wrong row for value')
-        return 'fail'
+    assert rat2.GetRowOfValue(11.0) == 1, 'wrong row for value'
 
-    if rat2.GetValueAsInt(1, 1) != 200:
-        gdaltest.post_reason('wrong field value.')
-        return 'fail'
+    assert rat2.GetValueAsInt(1, 1) == 200, 'wrong field value.'
 
     gdaltest.saved_rat = rat
 
@@ -112,33 +98,19 @@ def test_rat_2():
     ds = gdal.Open('tmp/rat_2.pnm', gdal.GA_Update)
     rat2 = ds.GetRasterBand(1).GetDefaultRAT()
 
-    if rat2.GetColumnCount() != 2:
-        gdaltest.post_reason('wrong column count')
-        return 'fail'
+    assert rat2.GetColumnCount() == 2, 'wrong column count'
 
-    if rat2.GetRowCount() != 3:
-        gdaltest.post_reason('wrong row count')
-        return 'fail'
+    assert rat2.GetRowCount() == 3, 'wrong row count'
 
-    if rat2.GetNameOfCol(1) != 'Count':
-        gdaltest.post_reason('wrong column name')
-        return 'fail'
+    assert rat2.GetNameOfCol(1) == 'Count', 'wrong column name'
 
-    if rat2.GetUsageOfCol(1) != gdal.GFU_PixelCount:
-        gdaltest.post_reason('wrong column usage')
-        return 'fail'
+    assert rat2.GetUsageOfCol(1) == gdal.GFU_PixelCount, 'wrong column usage'
 
-    if rat2.GetTypeOfCol(1) != gdal.GFT_Integer:
-        gdaltest.post_reason('wrong column type')
-        return 'fail'
+    assert rat2.GetTypeOfCol(1) == gdal.GFT_Integer, 'wrong column type'
 
-    if rat2.GetRowOfValue(11.0) != 1:
-        gdaltest.post_reason('wrong row for value')
-        return 'fail'
+    assert rat2.GetRowOfValue(11.0) == 1, 'wrong row for value'
 
-    if rat2.GetValueAsInt(1, 1) != 200:
-        gdaltest.post_reason('wrong field value.')
-        return 'fail'
+    assert rat2.GetValueAsInt(1, 1) == 200, 'wrong field value.'
 
     # unset the RAT
     ds.GetRasterBand(1).SetDefaultRAT(None)
@@ -148,9 +120,7 @@ def test_rat_2():
     ds = gdal.Open('tmp/rat_2.pnm')
     rat = ds.GetRasterBand(1).GetDefaultRAT()
     ds = None
-    if rat is not None:
-        gdaltest.post_reason('expected a NULL RAT.')
-        return 'fail'
+    assert rat is None, 'expected a NULL RAT.'
 
     gdal.GetDriverByName('PNM').Delete('tmp/rat_2.pnm')
 
diff --git a/autotest/gcore/rfc30.py b/autotest/gcore/rfc30.py
index 8b04388963db..318c9496ee33 100755
--- a/autotest/gcore/rfc30.py
+++ b/autotest/gcore/rfc30.py
@@ -58,17 +58,13 @@ def test_rfc30_1():
 
     file_list = ds.GetFileList()
 
-    if ds is None:
-        gdaltest.post_reason('failed to open utf filename.')
-        return 'fail'
+    assert ds is not None, 'failed to open utf filename.'
 
     ds = None
 
     ds = gdal.Open(file_list[0])
 
-    if ds is None:
-        gdaltest.post_reason('failed to open utf filename (2).')
-        return 'fail'
+    assert ds is not None, 'failed to open utf filename (2).'
 
     return 'success'
 
@@ -86,9 +82,7 @@ def test_rfc30_2():
         # filename = filename.encode( 'utf-8' )
 
     fd = gdal.VSIFOpenL(filename, 'w')
-    if fd is None:
-        gdaltest.post_reason('failed to create utf-8 named file.')
-        return 'fail'
+    assert fd is not None, 'failed to create utf-8 named file.'
 
     gdal.VSIFWriteL('abc', 3, 1, fd)
     gdal.VSIFCloseL(fd)
@@ -103,14 +97,10 @@ def test_rfc30_2():
         filename_for_rename = filename.encode('utf-8')  # FIXME ? rename should perhaps accept unicode strings
         new_filename = new_filename.encode('utf-8')  # FIXME ? rename should perhaps accept unicode strings
 
-    if gdal.Rename(filename_for_rename, new_filename) != 0:
-        gdaltest.post_reason('utf-8 rename failed.')
-        return 'fail'
+    assert gdal.Rename(filename_for_rename, new_filename) == 0, 'utf-8 rename failed.'
 
     fd = gdal.VSIFOpenL(new_filename, 'r')
-    if fd is None:
-        gdaltest.post_reason('reopen failed with utf8')
-        return 'fail'
+    assert fd is not None, 'reopen failed with utf8'
 
     data = gdal.VSIFReadL(3, 1, fd)
     gdal.VSIFCloseL(fd)
@@ -119,16 +109,12 @@ def test_rfc30_2():
         ok = eval("data == b'abc'")
     else:
         ok = data == 'abc'
-    if not ok:
-        gdaltest.post_reason('did not get expected data.')
-        return 'fail'
+    assert ok, 'did not get expected data.'
 
     gdal.Unlink(new_filename)
 
     fd = gdal.VSIFOpenL(new_filename, 'r')
-    if fd is not None:
-        gdaltest.post_reason('did unlink fail on utf8 filename?')
-        return 'fail'
+    assert fd is None, 'did unlink fail on utf8 filename?'
 
     return 'success'
 
diff --git a/autotest/gcore/testnonboundtoswig.py b/autotest/gcore/testnonboundtoswig.py
index c459f6ea7601..4cf82d135820 100755
--- a/autotest/gcore/testnonboundtoswig.py
+++ b/autotest/gcore/testnonboundtoswig.py
@@ -203,25 +203,20 @@ def test_testnonboundtoswig_GDALSimpleImageWarp():
         filename = bytes(filename, 'utf-8')
 
     native_in_ds = gdal_handle_stdcall.GDALOpen(filename, gdal.GA_ReadOnly)
-    if native_in_ds is None:
-        return 'fail'
+    assert native_in_ds is not None
 
     filename = '/vsimem/out.tif'
     if version_info >= (3, 0, 0):
         filename = bytes(filename, 'utf-8')
 
     native_out_ds = gdal_handle_stdcall.GDALOpen(filename, gdal.GA_Update)
-    if native_out_ds is None:
-        return 'fail'
+    assert native_out_ds is not None
 
     pTransformerArg = gdal_handle.GDALCreateGenImgProjTransformer2(native_in_ds, native_out_ds, None)
-    if pTransformerArg is None:
-        return 'fail'
+    assert pTransformerArg is not None
 
     ret = gdal_handle_stdcall.GDALSimpleImageWarp(native_in_ds, native_out_ds, 0, None, gdal_handle_stdcall.GDALGenImgProjTransform, pTransformerArg, None, None, None)
-    if ret != 1:
-        print(ret)
-        return 'fail'
+    assert ret == 1
 
     gdal_handle.GDALDestroyGenImgProjTransformer(pTransformerArg)
 
@@ -234,9 +229,7 @@ def test_testnonboundtoswig_GDALSimpleImageWarp():
 
     gdal.Unlink('/vsimem/out.tif')
 
-    if cs != 4672:
-        print(cs)
-        return 'fail'
+    assert cs == 4672
 
     return 'success'
 
@@ -330,8 +323,7 @@ def test_testnonboundtoswig_VRTDerivedBands():
     if version_info >= (3, 0, 0):
         funcName = bytes(funcName, 'utf-8')
     ret = gdal_handle_stdcall.GDALAddDerivedBandPixelFunc(funcName, my_cDerivedPixelFunc)
-    if ret != 0:
-        return 'fail'
+    assert ret == 0
 
     vrt_xml = """<VRTDataset rasterXSize="20" rasterYSize="20">
   <VRTRasterBand dataType="Byte" band="1" subClass="VRTDerivedRasterBand">
@@ -356,16 +348,9 @@ def test_testnonboundtoswig_VRTDerivedBands():
     got_data = ds.GetRasterBand(1).ReadRaster(0, 0, 20, 20)
     ds = None
 
-    if ref_cs != got_cs:
-        gdaltest.post_reason('wrong checksum')
-        print(got_cs)
-        return 'fail'
+    assert ref_cs == got_cs, 'wrong checksum'
 
-    if ref_data != got_data:
-        gdaltest.post_reason('wrong data')
-        print(ref_data)
-        print(got_data)
-        return 'fail'
+    assert ref_data == got_data, 'wrong data'
 
     return 'success'
 
diff --git a/autotest/gcore/tiff_ovr.py b/autotest/gcore/tiff_ovr.py
index c27a9df86680..a8d836520335 100755
--- a/autotest/gcore/tiff_ovr.py
+++ b/autotest/gcore/tiff_ovr.py
@@ -62,9 +62,7 @@ def both_endian(request):
 
 def tiff_ovr_check(src_ds):
     for i in (1, 2, 3):
-        if src_ds.GetRasterBand(i).GetOverviewCount() != 2:
-            gdaltest.post_reason('overviews missing')
-            return 'fail'
+        assert src_ds.GetRasterBand(i).GetOverviewCount() == 2, 'overviews missing'
 
         ovr_band = src_ds.GetRasterBand(i).GetOverview(0)
         if ovr_band.XSize != 10 or ovr_band.YSize != 10:
@@ -100,9 +98,7 @@ def test_tiff_ovr_1(both_endian):
 
     src_ds = gdal.Open('data/mfloat32.vrt')
 
-    if src_ds is None:
-        gdaltest.post_reason('Failed to open test dataset.')
-        return 'fail'
+    assert src_ds is not None, 'Failed to open test dataset.'
 
     gdaltest.tiff_drv.CreateCopy('tmp/mfloat32.tif', src_ds,
                                  options=['INTERLEAVE=PIXEL'])
@@ -110,15 +106,11 @@ def test_tiff_ovr_1(both_endian):
 
     ds = gdal.Open('tmp/mfloat32.tif')
 
-    if ds is None:
-        gdaltest.post_reason('Failed to open test dataset.')
-        return 'fail'
+    assert ds is not None, 'Failed to open test dataset.'
 
     err = ds.BuildOverviews(overviewlist=[2, 4])
 
-    if err != 0:
-        gdaltest.post_reason('BuildOverviews reports an error')
-        return 'fail'
+    assert err == 0, 'BuildOverviews reports an error'
 
     ret = tiff_ovr_check(ds)
 
@@ -134,9 +126,7 @@ def test_tiff_ovr_2(both_endian):
 
     src_ds = gdal.Open('tmp/mfloat32.tif')
 
-    if src_ds is None:
-        gdaltest.post_reason('Failed to open test dataset.')
-        return 'fail'
+    assert src_ds is not None, 'Failed to open test dataset.'
 
     ret = tiff_ovr_check(src_ds)
 
@@ -154,14 +144,10 @@ def test_tiff_ovr_3(both_endian):
 
     src_ds = gdal.Open('tmp/mfloat32.tif', gdal.GA_Update)
 
-    if src_ds is None:
-        gdaltest.post_reason('Failed to open test dataset.')
-        return 'fail'
+    assert src_ds is not None, 'Failed to open test dataset.'
 
     err = src_ds.BuildOverviews(overviewlist=[2, 4])
-    if err != 0:
-        gdaltest.post_reason('BuildOverviews reports an error')
-        return 'fail'
+    assert err == 0, 'BuildOverviews reports an error'
 
     ret = tiff_ovr_check(src_ds)
 
@@ -186,9 +172,7 @@ def test_tiff_ovr_4(both_endian):
 
     wrk_ds = gdal.Open('tmp/ovr4.tif', gdal.GA_Update)
 
-    if wrk_ds is None:
-        gdaltest.post_reason('Failed to open test dataset.')
-        return 'fail'
+    assert wrk_ds is not None, 'Failed to open test dataset.'
 
     wrk_ds.BuildOverviews('AVERAGE_BIT2GRAYSCALE', overviewlist=[2, 4])
     wrk_ds = None
@@ -197,10 +181,8 @@ def test_tiff_ovr_4(both_endian):
 
     ovband = wrk_ds.GetRasterBand(1).GetOverview(1)
     md = ovband.GetMetadata()
-    if 'RESAMPLING' not in md \
-       or md['RESAMPLING'] != 'AVERAGE_BIT2GRAYSCALE':
-        gdaltest.post_reason('Did not get expected RESAMPLING metadata.')
-        return 'fail'
+    assert 'RESAMPLING' in md and md['RESAMPLING'] == 'AVERAGE_BIT2GRAYSCALE', \
+        'Did not get expected RESAMPLING metadata.'
 
     # compute average value of overview band image data.
     ovimage = ovband.ReadRaster(0, 0, ovband.XSize, ovband.YSize)
@@ -220,10 +202,7 @@ def test_tiff_ovr_4(both_endian):
 
     average = total / pix_count
     exp_average = 153.0656
-    if abs(average - exp_average) > 0.1:
-        print(average)
-        gdaltest.post_reason('got wrong average for overview image')
-        return 'fail'
+    assert abs(average - exp_average) <= 0.1, 'got wrong average for overview image'
 
     # Read base band as overview resolution and verify we aren't getting
     # the grayscale image.
@@ -243,10 +222,7 @@ def test_tiff_ovr_4(both_endian):
     average = total / pix_count
     exp_average = 0.6096
 
-    if abs(average - exp_average) > 0.01:
-        print(average)
-        gdaltest.post_reason('got wrong average for downsampled image')
-        return 'fail'
+    assert abs(average - exp_average) <= 0.01, 'got wrong average for downsampled image'
 
     wrk_ds = None
 
@@ -262,19 +238,14 @@ def test_tiff_ovr_5(both_endian):
 
     wrk_ds = gdal.Open('tmp/ovr5.tif', gdal.GA_ReadOnly)
 
-    if wrk_ds is None:
-        gdaltest.post_reason('Failed to open test dataset.')
-        return 'fail'
+    assert wrk_ds is not None, 'Failed to open test dataset.'
 
     wrk_ds.BuildOverviews('AVERAGE', overviewlist=[2])
 
     cs = wrk_ds.GetRasterBand(1).GetOverview(0).Checksum()
     exp_cs = 1130
 
-    if cs != exp_cs:
-        gdaltest.post_reason('got wrong overview checksum.')
-        print(exp_cs, cs)
-        return 'fail'
+    assert cs == exp_cs, 'got wrong overview checksum.'
 
     return 'success'
 
@@ -291,9 +262,7 @@ def test_tiff_ovr_6(both_endian):
 
     wrk_ds = gdal.Open('tmp/ovr6.tif', gdal.GA_Update)
 
-    if wrk_ds is None:
-        gdaltest.post_reason('Failed to open test dataset.')
-        return 'fail'
+    assert wrk_ds is not None, 'Failed to open test dataset.'
 
     wrk_ds.BuildOverviews('AVERAGE', overviewlist=[2])
 
@@ -308,10 +277,7 @@ def test_tiff_ovr_6(both_endian):
     cs = wrk_ds.GetRasterBand(1).GetOverview(0).Checksum()
     exp_cs = 1130
 
-    if cs != exp_cs:
-        gdaltest.post_reason('got wrong overview checksum.')
-        print(exp_cs, cs)
-        return 'fail'
+    assert cs == exp_cs, 'got wrong overview checksum.'
 
     return 'success'
 
@@ -327,9 +293,7 @@ def test_tiff_ovr_7(both_endian):
     # In nearest resampling, we are expecting a uniform black image.
     ds = gdal.Open('tmp/test_average_palette.tif', gdal.GA_Update)
 
-    if ds is None:
-        gdaltest.post_reason('Failed to open test dataset.')
-        return 'fail'
+    assert ds is not None, 'Failed to open test dataset.'
 
     ds.BuildOverviews('NEAREST', overviewlist=[2])
 
@@ -338,10 +302,7 @@ def test_tiff_ovr_7(both_endian):
 
     ds = None
 
-    if cs != exp_cs:
-        gdaltest.post_reason('got wrong overview checksum.')
-        print(exp_cs, cs)
-        return 'fail'
+    assert cs == exp_cs, 'got wrong overview checksum.'
 
     return 'success'
 
@@ -358,9 +319,7 @@ def test_tiff_ovr_8(both_endian):
     # index 2. So the result of the averaging is a uniform grey image.
     ds = gdal.Open('tmp/test_average_palette.tif', gdal.GA_Update)
 
-    if ds is None:
-        gdaltest.post_reason('Failed to open test dataset.')
-        return 'fail'
+    assert ds is not None, 'Failed to open test dataset.'
 
     ds.BuildOverviews('AVERAGE', overviewlist=[2])
 
@@ -369,10 +328,7 @@ def test_tiff_ovr_8(both_endian):
 
     ds = None
 
-    if cs != exp_cs:
-        gdaltest.post_reason('got wrong overview checksum.')
-        print(exp_cs, cs)
-        return 'fail'
+    assert cs == exp_cs, 'got wrong overview checksum.'
 
     return 'success'
 
@@ -395,9 +351,7 @@ def test_tiff_ovr_9(both_endian):
 
     ds = gdal.Open('tmp/ovr9.tif', gdal.GA_ReadOnly)
 
-    if ds is None:
-        gdaltest.post_reason('Failed to open test dataset.')
-        return 'fail'
+    assert ds is not None, 'Failed to open test dataset.'
 
     ds.BuildOverviews('AVERAGE', overviewlist=[2])
 
@@ -409,10 +363,7 @@ def test_tiff_ovr_9(both_endian):
 
     ds = None
 
-    if cs != exp_cs and cs != 5635:
-        gdaltest.post_reason('got wrong overview checksum.')
-        print(exp_cs, cs)
-        return 'fail'
+    assert cs == exp_cs or cs == 5635, 'got wrong overview checksum.'
 
     # Re-check after dataset reopening
     ds = gdal.Open('tmp/ovr9.tif', gdal.GA_ReadOnly)
@@ -422,10 +373,7 @@ def test_tiff_ovr_9(both_endian):
 
     ds = None
 
-    if cs != exp_cs and cs != 5635:
-        gdaltest.post_reason('got wrong overview checksum.')
-        print(exp_cs, cs)
-        return 'fail'
+    assert cs == exp_cs or cs == 5635, 'got wrong overview checksum.'
 
     return 'success'
 
@@ -437,35 +385,26 @@ def test_tiff_ovr_10(both_endian):
 
     src_ds = gdal.Open('data/rgbsmall.tif', gdal.GA_ReadOnly)
 
-    if src_ds is None:
-        gdaltest.post_reason('Failed to open test dataset.')
-        return 'fail'
+    assert src_ds is not None, 'Failed to open test dataset.'
 
     ds = gdaltest.tiff_drv.CreateCopy('tmp/ovr10.tif', src_ds, options=['COMPRESS=JPEG', 'PHOTOMETRIC=YCBCR'])
     src_ds = None
 
-    if ds is None:
-        gdaltest.post_reason('Failed to apply JPEG compression.')
-        return 'fail'
+    assert ds is not None, 'Failed to apply JPEG compression.'
 
     ds.BuildOverviews('AVERAGE', overviewlist=[2])
 
     ds = None
     ds = gdal.Open('tmp/ovr10.tif', gdal.GA_ReadOnly)
 
-    if ds is None:
-        gdaltest.post_reason('Failed to open copy of test dataset.')
-        return 'fail'
+    assert ds is not None, 'Failed to open copy of test dataset.'
 
     cs = ds.GetRasterBand(1).GetOverview(0).Checksum()
     exp_cs = 5562
 
     ds = None
 
-    if cs != exp_cs and cs != 5635:
-        gdaltest.post_reason('got wrong overview checksum.')
-        print(exp_cs, cs)
-        return 'fail'
+    assert cs == exp_cs or cs == 5635, 'got wrong overview checksum.'
 
     return 'success'
 
@@ -477,9 +416,7 @@ def test_tiff_ovr_11(both_endian):
 
     src_ds = gdal.Open('data/test_nodatavalues.tif', gdal.GA_ReadOnly)
 
-    if src_ds is None:
-        gdaltest.post_reason('Failed to open test dataset.')
-        return 'fail'
+    assert src_ds is not None, 'Failed to open test dataset.'
 
     ds = gdaltest.tiff_drv.CreateCopy('tmp/ovr11.tif', src_ds)
     src_ds = None
@@ -498,9 +435,7 @@ def test_tiff_ovr_11(both_endian):
     ds = None
     ds = gdal.Open('tmp/ovr11.tif', gdal.GA_ReadOnly)
 
-    if ds is None:
-        gdaltest.post_reason('Failed to open copy of test dataset.')
-        return 'fail'
+    assert ds is not None, 'Failed to open copy of test dataset.'
 
     cs = ds.GetRasterBand(2).GetOverview(0).Checksum()
     # If NODATA_VALUES was ignored, we would get 2766
@@ -508,10 +443,7 @@ def test_tiff_ovr_11(both_endian):
 
     ds = None
 
-    if cs != exp_cs:
-        gdaltest.post_reason('got wrong overview checksum.')
-        print(exp_cs, cs)
-        return 'fail'
+    assert cs == exp_cs, 'got wrong overview checksum.'
 
     return 'success'
 
@@ -524,9 +456,7 @@ def test_tiff_ovr_12(both_endian):
 
     src_ds = gdal.Open('data/test_nodatavalues.tif', gdal.GA_ReadOnly)
 
-    if src_ds is None:
-        gdaltest.post_reason('Failed to open test dataset.')
-        return 'fail'
+    assert src_ds is not None, 'Failed to open test dataset.'
 
     ds = gdaltest.tiff_drv.CreateCopy('tmp/ovr12.tif', src_ds, options=['COMPRESS=DEFLATE'])
     src_ds = None
@@ -545,9 +475,7 @@ def test_tiff_ovr_12(both_endian):
     ds = None
     ds = gdal.Open('tmp/ovr12.tif', gdal.GA_ReadOnly)
 
-    if ds is None:
-        gdaltest.post_reason('Failed to open copy of test dataset.')
-        return 'fail'
+    assert ds is not None, 'Failed to open copy of test dataset.'
 
     cs = ds.GetRasterBand(2).GetOverview(0).Checksum()
     # If NODATA_VALUES was ignored, we would get 2766
@@ -555,10 +483,7 @@ def test_tiff_ovr_12(both_endian):
 
     ds = None
 
-    if cs != exp_cs:
-        gdaltest.post_reason('got wrong overview checksum.')
-        print(exp_cs, cs)
-        return 'fail'
+    assert cs == exp_cs, 'got wrong overview checksum.'
 
     return 'success'
 
@@ -572,9 +497,7 @@ def test_tiff_ovr_13(both_endian):
 
     src_ds = gdal.Open('data/mfloat32.vrt')
 
-    if src_ds is None:
-        gdaltest.post_reason('Failed to open test dataset.')
-        return 'fail'
+    assert src_ds is not None, 'Failed to open test dataset.'
 
     gdaltest.tiff_drv.CreateCopy('tmp/mfloat32.tif', src_ds,
                                  options=['INTERLEAVE=PIXEL'])
@@ -582,15 +505,11 @@ def test_tiff_ovr_13(both_endian):
 
     ds = gdal.Open('tmp/mfloat32.tif')
 
-    if ds is None:
-        gdaltest.post_reason('Failed to open test dataset.')
-        return 'fail'
+    assert ds is not None, 'Failed to open test dataset.'
 
     err = ds.BuildOverviews('GAUSS', overviewlist=[2, 4])
 
-    if err != 0:
-        gdaltest.post_reason('BuildOverviews reports an error')
-        return 'fail'
+    assert err == 0, 'BuildOverviews reports an error'
 
     # if ds.GetRasterBand(1).GetOverview(0).Checksum() != 1225:
     #    gdaltest.post_reason( 'bad checksum' )
@@ -610,9 +529,7 @@ def test_tiff_ovr_14(both_endian):
 
     ds = gdal.Open('tmp/test_gauss_palette.tif', gdal.GA_Update)
 
-    if ds is None:
-        gdaltest.post_reason('Failed to open test dataset.')
-        return 'fail'
+    assert ds is not None, 'Failed to open test dataset.'
 
     ds.BuildOverviews('GAUSS', overviewlist=[2])
 
@@ -621,10 +538,7 @@ def test_tiff_ovr_14(both_endian):
 
     ds = None
 
-    if cs != exp_cs:
-        gdaltest.post_reason('got wrong overview checksum.')
-        print(exp_cs, cs)
-        return 'fail'
+    assert cs == exp_cs, 'got wrong overview checksum.'
 
     return 'success'
 
@@ -637,9 +551,7 @@ def test_tiff_ovr_15(both_endian):
 
     src_ds = gdal.Open('data/test_nodatavalues.tif', gdal.GA_ReadOnly)
 
-    if src_ds is None:
-        gdaltest.post_reason('Failed to open test dataset.')
-        return 'fail'
+    assert src_ds is not None, 'Failed to open test dataset.'
 
     ds = gdaltest.tiff_drv.CreateCopy('tmp/ovr15.tif', src_ds, options=['COMPRESS=DEFLATE'])
     src_ds = None
@@ -658,9 +570,7 @@ def test_tiff_ovr_15(both_endian):
     ds = None
     ds = gdal.Open('tmp/ovr15.tif', gdal.GA_ReadOnly)
 
-    if ds is None:
-        gdaltest.post_reason('Failed to open copy of test dataset.')
-        return 'fail'
+    assert ds is not None, 'Failed to open copy of test dataset.'
 
     cs = ds.GetRasterBand(2).GetOverview(0).Checksum()
     # If NODATA_VALUES was ignored, we would get 2954
@@ -668,10 +578,7 @@ def test_tiff_ovr_15(both_endian):
 
     ds = None
 
-    if cs != exp_cs:
-        gdaltest.post_reason('got wrong overview checksum.')
-        print(exp_cs, cs)
-        return 'fail'
+    assert cs == exp_cs, 'got wrong overview checksum.'
 
     return 'success'
 
@@ -685,9 +592,7 @@ def test_tiff_ovr_16(both_endian):
 
     src_ds = gdal.Open('data/mfloat32.vrt')
 
-    if src_ds is None:
-        gdaltest.post_reason('Failed to open test dataset.')
-        return 'fail'
+    assert src_ds is not None, 'Failed to open test dataset.'
 
     gdaltest.tiff_drv.CreateCopy('tmp/ovr16.tif', src_ds,
                                  options=['INTERLEAVE=PIXEL'])
@@ -695,22 +600,15 @@ def test_tiff_ovr_16(both_endian):
 
     ds = gdal.Open('tmp/ovr16.tif')
 
-    if ds is None:
-        gdaltest.post_reason('Failed to open test dataset.')
-        return 'fail'
+    assert ds is not None, 'Failed to open test dataset.'
 
     err = ds.BuildOverviews('MODE', overviewlist=[2, 4])
 
-    if err != 0:
-        gdaltest.post_reason('BuildOverviews reports an error')
-        return 'fail'
+    assert err == 0, 'BuildOverviews reports an error'
 
     cs = ds.GetRasterBand(1).GetOverview(0).Checksum()
     exp_cs = 1122
-    if cs != exp_cs:
-        gdaltest.post_reason('bad checksum')
-        print(exp_cs, cs)
-        return 'fail'
+    assert cs == exp_cs, 'bad checksum'
 
     ds = None
 
@@ -726,22 +624,15 @@ def test_tiff_ovr_17(both_endian):
 
     ds = gdal.Open('tmp/ovr17.tif')
 
-    if ds is None:
-        gdaltest.post_reason('Failed to open test dataset.')
-        return 'fail'
+    assert ds is not None, 'Failed to open test dataset.'
 
     err = ds.BuildOverviews('MODE', overviewlist=[2, 4])
 
-    if err != 0:
-        gdaltest.post_reason('BuildOverviews reports an error')
-        return 'fail'
+    assert err == 0, 'BuildOverviews reports an error'
 
     cs = ds.GetRasterBand(1).GetOverview(0).Checksum()
     exp_cs = 1122
-    if cs != exp_cs:
-        gdaltest.post_reason('bad checksum')
-        print(exp_cs, cs)
-        return 'fail'
+    assert cs == exp_cs, 'bad checksum'
 
     ds = None
 
@@ -757,9 +648,7 @@ def test_tiff_ovr_18(both_endian):
 
     ds = gdal.Open('tmp/ovr18.tif', gdal.GA_Update)
 
-    if ds is None:
-        gdaltest.post_reason('Failed to open test dataset.')
-        return 'fail'
+    assert ds is not None, 'Failed to open test dataset.'
 
     ds.BuildOverviews('MODE', overviewlist=[2])
 
@@ -768,10 +657,7 @@ def test_tiff_ovr_18(both_endian):
 
     ds = None
 
-    if cs != exp_cs:
-        gdaltest.post_reason('got wrong overview checksum.')
-        print(exp_cs, cs)
-        return 'fail'
+    assert cs == exp_cs, 'got wrong overview checksum.'
 
     return 'success'
 
@@ -797,19 +683,14 @@ def test_tiff_ovr_19(both_endian):
     ds.FlushCache()
     ds.BuildOverviews('NEAR', overviewlist=[2, 4])
 
-    if ds.GetRasterBand(1).GetOverviewCount() != 2:
-        print('Overview could not be generated')
-        return 'fail'
+    assert ds.GetRasterBand(1).GetOverviewCount() == 2, \
+        'Overview could not be generated'
 
     cs = ds.GetRasterBand(1).GetOverview(0).Checksum()
-    if cs != 2500:
-        print(cs)
-        return 'fail'
+    assert cs == 2500
 
     cs = ds.GetRasterBand(1).GetOverview(1).Checksum()
-    if cs != 625:
-        print(cs)
-        return 'fail'
+    assert cs == 625
 
     ds = None
 
@@ -831,9 +712,7 @@ def test_tiff_ovr_20(both_endian):
 
     ds = gdal.Open('tmp/ovr20.tif')
 
-    if ds is None:
-        gdaltest.post_reason('Failed to open test dataset.')
-        return 'fail'
+    assert ds is not None, 'Failed to open test dataset.'
 
     gdal.SetConfigOption('BIGTIFF_OVERVIEW', 'YES')
     ds.BuildOverviews('NEAREST', overviewlist=[2, 4])
@@ -847,9 +726,8 @@ def test_tiff_ovr_20(both_endian):
     fileobj.close()
 
     # Check BigTIFF signature
-    if ((binvalues[2] != 0x2B or binvalues[3] != 0) and
-            (binvalues[3] != 0x2B or binvalues[2] != 0)):
-        return 'fail'
+    assert (not ((binvalues[2] != 0x2B or binvalues[3] != 0) and
+            (binvalues[3] != 0x2B or binvalues[2] != 0)))
 
     return 'success'
 
@@ -869,9 +747,7 @@ def test_tiff_ovr_21(both_endian):
 
     ds = gdal.Open('tmp/ovr21.tif')
 
-    if ds is None:
-        gdaltest.post_reason('Failed to open test dataset.')
-        return 'fail'
+    assert ds is not None, 'Failed to open test dataset.'
 
     # 170 k * 100 k = 17 GB. 17 GB / (2^2) = 4.25 GB > 4.2 GB
     # so BigTIFF is needed
@@ -885,9 +761,8 @@ def test_tiff_ovr_21(both_endian):
     fileobj.close()
 
     # Check BigTIFF signature
-    if ((binvalues[2] != 0x2B or binvalues[3] != 0) and
-            (binvalues[3] != 0x2B or binvalues[2] != 0)):
-        return 'fail'
+    assert (not ((binvalues[2] != 0x2B or binvalues[3] != 0) and
+            (binvalues[3] != 0x2B or binvalues[2] != 0)))
 
     return 'success'
 
@@ -907,9 +782,7 @@ def test_tiff_ovr_22(both_endian):
 
     ds = gdal.Open('tmp/ovr22.tif')
 
-    if ds is None:
-        gdaltest.post_reason('Failed to open test dataset.')
-        return 'fail'
+    assert ds is not None, 'Failed to open test dataset.'
 
     # 170 k * 100 k = 17 GB. 17 GB / (2^2) = 4.25 GB > 4.2 GB
     # so BigTIFF is needed
@@ -942,9 +815,7 @@ def test_tiff_ovr_23(both_endian):
 
     ds = gdal.Open('tmp/ovr23.tif')
 
-    if ds is None:
-        gdaltest.post_reason('Failed to open test dataset.')
-        return 'fail'
+    assert ds is not None, 'Failed to open test dataset.'
 
     gdal.SetConfigOption('BIGTIFF_OVERVIEW', 'NO')
     gdal.SetConfigOption('COMPRESS_OVERVIEW', 'DEFLATE')
@@ -960,9 +831,8 @@ def test_tiff_ovr_23(both_endian):
     fileobj.close()
 
     # Check Classical TIFF signature
-    if ((binvalues[2] != 0x2A or binvalues[3] != 0) and
-            (binvalues[3] != 0x2A or binvalues[2] != 0)):
-        return 'fail'
+    assert (not ((binvalues[2] != 0x2A or binvalues[3] != 0) and
+            (binvalues[3] != 0x2A or binvalues[2] != 0)))
 
     return 'success'
 
@@ -982,9 +852,7 @@ def test_tiff_ovr_24(both_endian):
 
     ds = gdal.Open('tmp/ovr24.tif')
 
-    if ds is None:
-        gdaltest.post_reason('Failed to open test dataset.')
-        return 'fail'
+    assert ds is not None, 'Failed to open test dataset.'
 
     # 85 k * 100 k = 8.5 GB, so BigTIFF might be needed as
     # 8.5 GB / 2 > 4.2 GB
@@ -1000,9 +868,8 @@ def test_tiff_ovr_24(both_endian):
     fileobj.close()
 
     # Check BigTIFF signature
-    if ((binvalues[2] != 0x2B or binvalues[3] != 0) and
-            (binvalues[3] != 0x2B or binvalues[2] != 0)):
-        return 'fail'
+    assert (not ((binvalues[2] != 0x2B or binvalues[3] != 0) and
+            (binvalues[3] != 0x2B or binvalues[2] != 0)))
 
     return 'success'
 
@@ -1020,17 +887,13 @@ def test_tiff_ovr_25(both_endian):
     ds = None
 
     ds = gdal.Open('tmp/ovr25.tif')
-    if ds is None:
-        return 'fail'
+    assert ds is not None
 
-    if ds.GetRasterBand(1).Checksum() != 10000:
-        return 'fail'
+    assert ds.GetRasterBand(1).Checksum() == 10000
 
-    if ds.GetRasterBand(1).GetOverviewCount() == 0:
-        return 'fail'
+    assert ds.GetRasterBand(1).GetOverviewCount() != 0
 
-    if ds.GetRasterBand(1).GetOverview(0).Checksum() != 2500:
-        return 'fail'
+    assert ds.GetRasterBand(1).GetOverview(0).Checksum() == 2500
 
     return 'success'
 
@@ -1047,12 +910,10 @@ def test_tiff_ovr_26(both_endian):
     cs = ds.GetRasterBand(1).GetOverview(0).Checksum()
     ds.GetRasterBand(1).GetOverview(0).Fill(0)
     cs_new = ds.GetRasterBand(1).GetOverview(0).Checksum()
-    if cs_new != 0:
-        return 'fail'
+    assert cs_new == 0
     gdal.RegenerateOverview(ds.GetRasterBand(1), ds.GetRasterBand(1).GetOverview(0), 'NEAR')
     cs_new = ds.GetRasterBand(1).GetOverview(0).Checksum()
-    if cs != cs_new:
-        return 'fail'
+    assert cs == cs_new
     ds = None
 
     return 'success'
@@ -1073,15 +934,12 @@ def test_tiff_ovr_27(both_endian):
     ds.GetRasterBand(1).GetOverview(1).Fill(0)
     cs_new = ds.GetRasterBand(1).GetOverview(0).Checksum()
     cs2_new = ds.GetRasterBand(1).GetOverview(1).Checksum()
-    if cs_new != 0 or cs2_new != 0:
-        return 'fail'
+    assert cs_new == 0 and cs2_new == 0
     gdal.RegenerateOverviews(ds.GetRasterBand(1), [ds.GetRasterBand(1).GetOverview(0), ds.GetRasterBand(1).GetOverview(1)], 'NEAR')
     cs_new = ds.GetRasterBand(1).GetOverview(0).Checksum()
     cs2_new = ds.GetRasterBand(1).GetOverview(1).Checksum()
-    if cs != cs_new:
-        return 'fail'
-    if cs2 != cs2_new:
-        return 'fail'
+    assert cs == cs_new
+    assert cs2 == cs2_new
     ds = None
 
     return 'success'
@@ -1093,20 +951,17 @@ def test_tiff_ovr_27(both_endian):
 def test_tiff_ovr_28(both_endian):
 
     ds = gdal.Open('tmp/ovr25.tif', gdal.GA_Update)
-    if ds.BuildOverviews(overviewlist=[]) != 0:
-        gdaltest.post_reason('BuildOverviews() returned error code.')
-        return 'fail'
+    assert ds.BuildOverviews(overviewlist=[]) == 0, \
+        'BuildOverviews() returned error code.'
 
-    if ds.GetRasterBand(1).GetOverviewCount() != 0:
-        gdaltest.post_reason('Overview(s) appear to still exist.')
-        return 'fail'
+    assert ds.GetRasterBand(1).GetOverviewCount() == 0, \
+        'Overview(s) appear to still exist.'
 
     # Close and reopen to confirm they are really gone.
     ds = None
     ds = gdal.Open('tmp/ovr25.tif')
-    if ds.GetRasterBand(1).GetOverviewCount() != 0:
-        gdaltest.post_reason('Overview(s) appear to still exist after reopen.')
-        return 'fail'
+    assert ds.GetRasterBand(1).GetOverviewCount() == 0, \
+        'Overview(s) appear to still exist after reopen.'
 
     return 'success'
 
@@ -1123,27 +978,19 @@ def test_tiff_ovr_29(both_endian):
     png_ds.BuildOverviews(overviewlist=[2])
     png_ds = None
 
-    if open('tmp/ovr29.png.ovr') is None:
-        gdaltest.post_reason('Did not expected .ovr file.')
-        return 'fail'
+    assert open('tmp/ovr29.png.ovr') is not None, 'Did not expected .ovr file.'
 
     png_ds = gdal.Open('tmp/ovr29.png')
 
-    if png_ds.GetRasterBand(1).GetOverviewCount() != 1:
-        gdaltest.post_reason('did not find overview')
-        return 'fail'
+    assert png_ds.GetRasterBand(1).GetOverviewCount() == 1, 'did not find overview'
 
     png_ds.BuildOverviews(overviewlist=[])
-    if png_ds.GetRasterBand(1).GetOverviewCount() != 0:
-        gdaltest.post_reason('delete overview failed.')
-        return 'fail'
+    assert png_ds.GetRasterBand(1).GetOverviewCount() == 0, 'delete overview failed.'
 
     png_ds = None
     png_ds = gdal.Open('tmp/ovr29.png')
 
-    if png_ds.GetRasterBand(1).GetOverviewCount() != 0:
-        gdaltest.post_reason('delete overview failed.')
-        return 'fail'
+    assert png_ds.GetRasterBand(1).GetOverviewCount() == 0, 'delete overview failed.'
 
     png_ds = None
 
@@ -1183,8 +1030,7 @@ def test_tiff_ovr_30(both_endian):
     ds = None
 
     ds = gdal.Open('tmp/ovr30.tif')
-    if ds.GetProjectionRef().find('4326') == -1:
-        return 'fail'
+    assert ds.GetProjectionRef().find('4326') != -1
 
     return 'success'
 
@@ -1202,9 +1048,8 @@ def test_tiff_ovr_31(both_endian):
     ds.BuildOverviews('average', overviewlist=[2, 4])
     cs = ds.GetRasterBand(1).GetOverview(1).Checksum()
     expected_cs = 7646
-    if cs != expected_cs:
-        gdaltest.post_reason('Checksum is %d. Expected checksum is %d' % (cs, expected_cs))
-        return 'fail'
+    assert cs == expected_cs, \
+        ('Checksum is %d. Expected checksum is %d' % (cs, expected_cs))
     ds = None
 
     return 'success'
@@ -1228,15 +1073,13 @@ def test_tiff_ovr_32(both_endian):
 
     cs = ds.GetRasterBand(1).GetOverview(0).Checksum()
     expected_cs = 21168
-    if cs != expected_cs:
-        gdaltest.post_reason('Checksum is %d. Expected checksum is %d for overview 0.' % (cs, expected_cs))
-        return 'fail'
+    assert cs == expected_cs, \
+        ('Checksum is %d. Expected checksum is %d for overview 0.' % (cs, expected_cs))
 
     cs = ds.GetRasterBand(3).GetOverview(1).Checksum()
     expected_cs = 1851
-    if cs != expected_cs:
-        gdaltest.post_reason('Checksum is %d. Expected checksum is %d for overview 1.' % (cs, expected_cs))
-        return 'fail'
+    assert cs == expected_cs, \
+        ('Checksum is %d. Expected checksum is %d for overview 1.' % (cs, expected_cs))
 
     ds = None
 
@@ -1259,9 +1102,8 @@ def test_tiff_ovr_32(both_endian):
 
     cs = tmp2_ds.GetRasterBand(1).GetOverview(0).Checksum()
     expected_cs = 21168
-    if cs != expected_cs:
-        gdaltest.post_reason('Checksum is %d. Expected checksum is %d for overview 0.' % (cs, expected_cs))
-        return 'fail'
+    assert cs == expected_cs, \
+        ('Checksum is %d. Expected checksum is %d for overview 0.' % (cs, expected_cs))
 
     src_ds = None
     tmp_ds = None
@@ -1281,15 +1123,13 @@ def test_tiff_ovr_32(both_endian):
 
     cs = ds.GetRasterBand(1).GetOverview(0).Checksum()
     expected_cs = 21168
-    if cs != expected_cs:
-        gdaltest.post_reason('Checksum is %d. Expected checksum is %d for overview 0.' % (cs, expected_cs))
-        return 'fail'
+    assert cs == expected_cs, \
+        ('Checksum is %d. Expected checksum is %d for overview 0.' % (cs, expected_cs))
 
     cs = ds.GetRasterBand(3).GetOverview(1).Checksum()
     expected_cs = 1851
-    if cs != expected_cs:
-        gdaltest.post_reason('Checksum is %d. Expected checksum is %d for overview 1.' % (cs, expected_cs))
-        return 'fail'
+    assert cs == expected_cs, \
+        ('Checksum is %d. Expected checksum is %d for overview 1.' % (cs, expected_cs))
 
     ds = None
 
@@ -1303,15 +1143,13 @@ def test_tiff_ovr_32(both_endian):
 
     cs = ds.GetRasterBand(1).GetOverview(0).Checksum()
     expected_cs = 21656
-    if cs != expected_cs:
-        gdaltest.post_reason('Checksum is %d. Expected checksum is %d for overview 0.' % (cs, expected_cs))
-        return 'fail'
+    assert cs == expected_cs, \
+        ('Checksum is %d. Expected checksum is %d for overview 0.' % (cs, expected_cs))
 
     cs = ds.GetRasterBand(3).GetOverview(1).Checksum()
     expected_cs = 2132
-    if cs != expected_cs:
-        gdaltest.post_reason('Checksum is %d. Expected checksum is %d for overview 1.' % (cs, expected_cs))
-        return 'fail'
+    assert cs == expected_cs, \
+        ('Checksum is %d. Expected checksum is %d for overview 1.' % (cs, expected_cs))
 
     ds = None
 
@@ -1335,9 +1173,8 @@ def test_tiff_ovr_32(both_endian):
     cs = tmp2_ds.GetRasterBand(1).GetOverview(0).Checksum()
     # expected_cs = 21656
     expected_cs = 21168
-    if cs != expected_cs:
-        gdaltest.post_reason('Checksum is %d. Expected checksum is %d for overview 0.' % (cs, expected_cs))
-        return 'fail'
+    assert cs == expected_cs, \
+        ('Checksum is %d. Expected checksum is %d for overview 0.' % (cs, expected_cs))
 
     src_ds = None
     tmp_ds = None
@@ -1352,15 +1189,13 @@ def test_tiff_ovr_32(both_endian):
 
     cs = ds.GetRasterBand(1).GetOverview(0).Checksum()
     expected_cs = 21656
-    if cs != expected_cs:
-        gdaltest.post_reason('Checksum is %d. Expected checksum is %d for overview 0.' % (cs, expected_cs))
-        return 'fail'
+    assert cs == expected_cs, \
+        ('Checksum is %d. Expected checksum is %d for overview 0.' % (cs, expected_cs))
 
     cs = ds.GetRasterBand(3).GetOverview(1).Checksum()
     expected_cs = 2132
-    if cs != expected_cs:
-        gdaltest.post_reason('Checksum is %d. Expected checksum is %d for overview 1.' % (cs, expected_cs))
-        return 'fail'
+    assert cs == expected_cs, \
+        ('Checksum is %d. Expected checksum is %d for overview 1.' % (cs, expected_cs))
 
     ds = None
 
@@ -1407,9 +1242,8 @@ def test_tiff_ovr_34(both_endian):
     ds = None
 
     if data != '                         '.encode('ascii'):
-        gdaltest.post_reason('did not get expected cleared overview.')
         print('[%s]' % data)
-        return 'fail'
+        pytest.fail('did not get expected cleared overview.')
 
     gdaltest.tiff_drv.Delete('tmp/ovr34.tif')
 
@@ -1433,9 +1267,8 @@ def test_tiff_ovr_35(both_endian):
     ds = None
 
     if data != '                         '.encode('ascii'):
-        gdaltest.post_reason('did not get expected cleared overview.')
         print('[%s]' % data)
-        return 'fail'
+        pytest.fail('did not get expected cleared overview.')
 
     gdaltest.tiff_drv.Delete('tmp/ovr35.tif')
 
@@ -1466,9 +1299,7 @@ def test_tiff_ovr_37(both_endian):
 
     ds = gdal.Open('tmp/ovr37.dt0')
 
-    if ds is None:
-        gdaltest.post_reason('Failed to open test dataset.')
-        return 'fail'
+    assert ds is not None, 'Failed to open test dataset.'
 
     gdal.SetConfigOption('PREDICTOR_OVERVIEW', '2')
     gdal.SetConfigOption('COMPRESS_OVERVIEW', 'LZW')
@@ -1480,19 +1311,13 @@ def test_tiff_ovr_37(both_endian):
 
     ds = gdal.Open('tmp/ovr37.dt0')
     cs = ds.GetRasterBand(1).GetOverview(0).Checksum()
-    if cs != 45378:
-        print(cs)
-        gdaltest.post_reason('got wrong overview checksum.')
-        return 'fail'
+    assert cs == 45378, 'got wrong overview checksum.'
     ds = None
 
     predictor2_size = os.stat('tmp/ovr37.dt0.ovr')[stat.ST_SIZE]
     # 3957 : on little-endian host
     # XXXX : on big-endian host ??? FIXME: To be updated
-    if predictor2_size != 3957:
-        print(predictor2_size)
-        gdaltest.post_reason('did not get expected file size.')
-        return 'fail'
+    assert predictor2_size == 3957, 'did not get expected file size.'
 
     return 'success'
 
@@ -1514,10 +1339,7 @@ def test_tiff_ovr_38(both_endian):
 
     file_size = os.stat('tmp/ovr38.tif')[stat.ST_SIZE]
 
-    if file_size > 21000:
-        print(file_size)
-        gdaltest.post_reason('did not get expected file size.')
-        return 'fail'
+    assert file_size <= 21000, 'did not get expected file size.'
 
     return 'success'
 
@@ -1553,9 +1375,7 @@ def test_tiff_ovr_39(both_endian):
         ovr_datatype = ds.GetRasterBand(1).DataType
         ds = None
 
-        if datatype != ovr_datatype:
-            gdaltest.post_reason('did not get expected datatype')
-            return 'fail'
+        assert datatype == ovr_datatype, 'did not get expected datatype'
 
         ds = gdal.Open('tmp/ovr39.tif')
         cs = ds.GetRasterBand(1).GetOverview(0).Checksum()
@@ -1566,10 +1386,8 @@ def test_tiff_ovr_39(both_endian):
         else:
             expected_cs = 1087
 
-        if cs != expected_cs:
-            gdaltest.post_reason('did not get expected checksum for datatype %s' % gdal.GetDataTypeName(datatype))
-            print(cs)
-            return 'fail'
+        assert cs == expected_cs, \
+            ('did not get expected checksum for datatype %s' % gdal.GetDataTypeName(datatype))
 
     return 'success'
 
@@ -1583,9 +1401,7 @@ def test_tiff_ovr_40(both_endian):
 
     wrk_ds = gdal.Open('tmp/ovr40.tif')
 
-    if wrk_ds is None:
-        gdaltest.post_reason('Failed to open test dataset.')
-        return 'fail'
+    assert wrk_ds is not None, 'Failed to open test dataset.'
 
     wrk_ds.BuildOverviews('AVERAGE_BIT2GRAYSCALE', overviewlist=[2, 4])
     wrk_ds = None
@@ -1594,10 +1410,8 @@ def test_tiff_ovr_40(both_endian):
 
     ovband = wrk_ds.GetRasterBand(1).GetOverview(1)
     md = ovband.GetMetadata()
-    if 'RESAMPLING' not in md \
-       or md['RESAMPLING'] != 'AVERAGE_BIT2GRAYSCALE':
-        gdaltest.post_reason('Did not get expected RESAMPLING metadata.')
-        return 'fail'
+    assert 'RESAMPLING' in md and md['RESAMPLING'] == 'AVERAGE_BIT2GRAYSCALE', \
+        'Did not get expected RESAMPLING metadata.'
 
     # compute average value of overview band image data.
     ovimage = ovband.ReadRaster(0, 0, ovband.XSize, ovband.YSize)
@@ -1617,10 +1431,7 @@ def test_tiff_ovr_40(both_endian):
 
     average = total / pix_count
     exp_average = 153.0656
-    if abs(average - exp_average) > 0.1:
-        print(average)
-        gdaltest.post_reason('got wrong average for overview image')
-        return 'fail'
+    assert abs(average - exp_average) <= 0.1, 'got wrong average for overview image'
 
     # Read base band as overview resolution and verify we aren't getting
     # the grayscale image.
@@ -1640,10 +1451,7 @@ def test_tiff_ovr_40(both_endian):
     average = total / pix_count
     exp_average = 0.6096
 
-    if abs(average - exp_average) > 0.01:
-        print(average)
-        gdaltest.post_reason('got wrong average for downsampled image')
-        return 'fail'
+    assert abs(average - exp_average) <= 0.01, 'got wrong average for downsampled image'
 
     wrk_ds = None
 
@@ -1670,10 +1478,7 @@ def test_tiff_ovr_41(both_endian):
     cs = ds.GetRasterBand(1).GetOverview(0).Checksum()
     ds = None
 
-    if cs != 1496:
-        print(cs)
-        gdaltest.post_reason('did not get expected checksum')
-        return 'fail'
+    assert cs == 1496, 'did not get expected checksum'
 
     return 'success'
 
@@ -1700,13 +1505,11 @@ def test_tiff_ovr_42(both_endian):
     ds = gdal.Open('tmp/ovr42.tif.ovr')
     ct2 = ds.GetRasterBand(1).GetRasterColorTable()
 
-    if ct2.GetCount() != 256 or \
-       ct2.GetColorEntry(0) != (255, 0, 0, 255) or \
-       ct2.GetColorEntry(1) != (0, 255, 0, 255) or \
-       ct2.GetColorEntry(2) != (0, 0, 255, 255) or \
-       ct2.GetColorEntry(3) != (255, 255, 255, 255):
-        gdaltest.post_reason('Wrong color table entry.')
-        return 'fail'
+    assert (ct2.GetCount() == 256 and \
+       ct2.GetColorEntry(0) == (255, 0, 0, 255) and \
+       ct2.GetColorEntry(1) == (0, 255, 0, 255) and \
+       ct2.GetColorEntry(2) == (0, 0, 255, 255) and \
+       ct2.GetColorEntry(3) == (255, 255, 255, 255)), 'Wrong color table entry.'
 
     ds = None
 
@@ -1762,15 +1565,9 @@ def test_tiff_ovr_43(both_endian):
     cs = ds.GetRasterBand(1).Checksum()
     ds = None
 
-    if 'NBITS' not in md or md['NBITS'] != '12':
-        print(md)
-        gdaltest.post_reason('did not get expected NBITS')
-        return 'fail'
+    assert 'NBITS' in md and md['NBITS'] == '12', 'did not get expected NBITS'
 
-    if cs != 642:
-        print(cs)
-        gdaltest.post_reason('did not get expected checksum')
-        return 'fail'
+    assert cs == 642, 'did not get expected checksum'
 
     gdaltest.tiff_drv.Delete('tmp/ovr43.tif')
 
@@ -1794,18 +1591,13 @@ def test_tiff_ovr_44(both_endian):
     ovr_band = ds.GetRasterBand(1).GetOverview(0)
     if 'GetBlockSize' in dir(gdal.Band):
         (blockx, blocky) = ovr_band.GetBlockSize()
-        if blockx != 256 or blocky != 256:
-            gdaltest.post_reason('did not get expected block size')
-            return 'fail'
+        assert blockx == 256 and blocky == 256, 'did not get expected block size'
     cs = ovr_band.Checksum()
     ds = None
 
     gdaltest.tiff_drv.Delete('tmp/ovr44.tif')
 
-    if cs != 1087:
-        gdaltest.post_reason('did not get expected checksum')
-        print(cs)
-        return 'fail'
+    assert cs == 1087, 'did not get expected checksum'
 
     return 'success'
 
@@ -1826,18 +1618,13 @@ def test_tiff_ovr_45(both_endian):
     ovr_band = ds.GetRasterBand(1)
     if 'GetBlockSize' in dir(gdal.Band):
         (blockx, blocky) = ovr_band.GetBlockSize()
-        if blockx != 256 or blocky != 256:
-            gdaltest.post_reason('did not get expected block size')
-            return 'fail'
+        assert blockx == 256 and blocky == 256, 'did not get expected block size'
     cs = ovr_band.Checksum()
     ds = None
 
     gdaltest.tiff_drv.Delete('tmp/ovr45.tif')
 
-    if cs != 1087:
-        gdaltest.post_reason('did not get expected checksum')
-        print(cs)
-        return 'fail'
+    assert cs == 1087, 'did not get expected checksum'
 
     return 'success'
 
@@ -1962,10 +1749,7 @@ def test_tiff_ovr_47(both_endian):
 
     gdal.Unlink("/vsimem/tiff_ovr_47.tif")
 
-    if cs != 35721:
-        gdaltest.post_reason('did not get expected checksum')
-        print(cs)
-        return 'fail'
+    assert cs == 35721, 'did not get expected checksum'
 
     return 'success'
 
@@ -1983,9 +1767,7 @@ def test_tiff_ovr_48(both_endian):
     ds = gdal.Open('tmp/rgba_with_alpha_0_and_255.tif.ovr')
     for i in range(4):
         cs = ds.GetRasterBand(i + 1).Checksum()
-        if cs != 3:
-            print(i)
-            return 'fail'
+        assert cs == 3, i
 
     # But if we define GDAL_OVR_PROPAGATE_NODATA, a nodata value in source
     # samples will cause the target pixel to be zeroed.
@@ -1999,9 +1781,7 @@ def test_tiff_ovr_48(both_endian):
     ds = gdal.Open('tmp/rgba_with_alpha_0_and_255.tif.ovr')
     for i in range(4):
         cs = ds.GetRasterBand(i + 1).Checksum()
-        if cs != 0:
-            print(i)
-            return 'fail'
+        assert cs == 0, i
 
     return 'success'
 
@@ -2024,8 +1804,7 @@ def test_tiff_ovr_49(both_endian):
     gdal.SetConfigOption('COMPRESS_OVERVIEW', None)
     ds = None
     ds = gdal.Open('/vsimem/tiff_ovr_49.tif.ovr')
-    if ds.GetRasterBand(1).Checksum() == 0:
-        return 'fail'
+    assert ds.GetRasterBand(1).Checksum() != 0
     ds = None
     gdal.GetDriverByName('GTiff').Delete('/vsimem/tiff_ovr_49.tif')
 
@@ -2064,9 +1843,7 @@ def test_tiff_ovr_51():
 
     ds = gdal.Open('/vsimem/tiff_ovr_51.png.ovr')
     cs = ds.GetRasterBand(1).Checksum()
-    if cs != 24518:
-        print(cs)
-        return 'fail'
+    assert cs == 24518
     ds = None
 
     gdal.GetDriverByName('PNG').Delete('/vsimem/tiff_ovr_51.png')
@@ -2097,13 +1874,9 @@ def test_tiff_ovr_52():
 
     ds = gdal.Open('/vsimem/tiff_ovr_52.tif')
     cs = ds.GetRasterBand(1).GetOverview(0).Checksum()
-    if cs != 328:
-        print(cs)
-        return 'fail'
+    assert cs == 328
     cs = ds.GetRasterBand(1).GetOverview(1).Checksum()
-    if cs != 1087:
-        print(cs)
-        return 'fail'
+    assert cs == 1087
     ds = None
 
     gdal.GetDriverByName('GTiff').Delete('/vsimem/tiff_ovr_52.tif')
@@ -2119,13 +1892,9 @@ def test_tiff_ovr_52():
 
     ds = gdal.Open('/vsimem/tiff_ovr_52.tif')
     cs = ds.GetRasterBand(1).GetOverview(0).Checksum()
-    if cs != 328:
-        print(cs)
-        return 'fail'
+    assert cs == 328
     cs = ds.GetRasterBand(1).GetOverview(1).Checksum()
-    if cs != 1087:
-        print(cs)
-        return 'fail'
+    assert cs == 1087
     ds = None
 
     gdal.GetDriverByName('GTiff').Delete('/vsimem/tiff_ovr_52.tif')
@@ -2154,13 +1923,9 @@ def test_tiff_ovr_53():
 
     ds = gdal.Open('/vsimem/tiff_ovr_53.tif')
     cs = ds.GetRasterBand(1).GetOverview(0).Checksum()
-    if cs != 1087:
-        print(cs)
-        return 'fail'
+    assert cs == 1087
     cs = ds.GetRasterBand(1).GetOverview(1).Checksum()
-    if cs != 328:
-        print(cs)
-        return 'fail'
+    assert cs == 328
     ds = None
 
     gdal.GetDriverByName('GTiff').Delete('/vsimem/tiff_ovr_53.tif')
@@ -2182,13 +1947,9 @@ def test_tiff_ovr_53():
 
     ds = gdal.Open('/vsimem/tiff_ovr_53.tif')
     cs = ds.GetRasterBand(1).GetOverview(0).Checksum()
-    if cs != 1087:
-        print(cs)
-        return 'fail'
+    assert cs == 1087
     cs = ds.GetRasterBand(1).GetOverview(1).Checksum()
-    if cs != 328:
-        print(cs)
-        return 'fail'
+    assert cs == 328
     ds = None
 
     gdal.GetDriverByName('GTiff').Delete('/vsimem/tiff_ovr_53.tif')
@@ -2229,9 +1990,7 @@ def test_tiff_ovr_54():
 
     gdal.GetDriverByName('GTiff').Delete('/vsimem/tiff_ovr_54.tif')
 
-    if cs0 == 0 or cs1 == 0:
-        print(cs0, cs1)
-        return 'fail'
+    assert not (cs0 == 0 or cs1 == 0)
 
     return 'success'
 
@@ -2244,12 +2003,9 @@ def test_tiff_ovr_too_many_levels_contig():
     tmpfilename = '/vsimem/tiff_ovr_too_many_levels_contig.tif'
     ds = gdal.GetDriverByName('GTiff').CreateCopy(tmpfilename, src_ds)
     ds.BuildOverviews('AVERAGE', [2, 4, 8, 16, 32, 64, 128, 256, 512, 1024, 2048, 4096])
-    if ds.GetRasterBand(1).GetOverviewCount() != 5:
-        print(ds.GetRasterBand(1).GetOverviewCount())
-        return 'fail'
+    assert ds.GetRasterBand(1).GetOverviewCount() == 5
     ds.BuildOverviews('AVERAGE', [2, 4, 8, 16, 32, 64, 128, 256, 512, 1024, 2048, 4096])
-    if ds.GetRasterBand(1).GetOverviewCount() != 5:
-        return 'fail'
+    assert ds.GetRasterBand(1).GetOverviewCount() == 5
     ds = None
     gdal.GetDriverByName('GTiff').Delete(tmpfilename)
 
@@ -2264,12 +2020,8 @@ def test_tiff_ovr_too_many_levels_separate():
     tmpfilename = '/vsimem/tiff_ovr_too_many_levels_separate.tif'
     ds = gdal.GetDriverByName('GTiff').CreateCopy(tmpfilename, src_ds)
     ds.BuildOverviews('AVERAGE', [2, 4, 8, 16, 32, 64, 128, 256, 512, 1024, 2048, 4096])
-    if ds.GetRasterBand(1).GetOverviewCount() != 6:
-        print(ds.GetRasterBand(1).GetOverviewCount())
-        return 'fail'
-    if ds.GetRasterBand(1).GetOverviewCount() != 6:
-        print(ds.GetRasterBand(1).GetOverviewCount())
-        return 'fail'
+    assert ds.GetRasterBand(1).GetOverviewCount() == 6
+    assert ds.GetRasterBand(1).GetOverviewCount() == 6
     ds = None
     gdal.GetDriverByName('GTiff').Delete(tmpfilename)
 
@@ -2285,11 +2037,9 @@ def test_tiff_ovr_too_many_levels_external():
     gdal.GetDriverByName('GTiff').CreateCopy(tmpfilename, src_ds)
     ds = gdal.Open(tmpfilename)
     ds.BuildOverviews('AVERAGE', [2, 4, 8, 16, 32, 64, 128, 256, 512, 1024, 2048, 4096])
-    if ds.GetRasterBand(1).GetOverviewCount() != 5:
-        return 'fail'
+    assert ds.GetRasterBand(1).GetOverviewCount() == 5
     ds.BuildOverviews('AVERAGE', [2, 4, 8, 16, 32, 64, 128, 256, 512, 1024, 2048, 4096])
-    if ds.GetRasterBand(1).GetOverviewCount() != 5:
-        return 'fail'
+    assert ds.GetRasterBand(1).GetOverviewCount() == 5
     ds = None
     gdal.GetDriverByName('GTiff').Delete(tmpfilename)
 
@@ -2316,9 +2066,7 @@ def test_tiff_ovr_average_multiband_vs_singleband():
     gdal.GetDriverByName('GTiff').Delete('/vsimem/tiff_ovr_average_multiband_band.tif')
     gdal.GetDriverByName('GTiff').Delete('/vsimem/tiff_ovr_average_multiband_pixel.tif')
 
-    if cs_band != cs_pixel:
-        print(cs_band, cs_pixel)
-        return 'fail'
+    assert cs_band == cs_pixel
 
     return 'success'
 
diff --git a/autotest/gcore/tiff_read.py b/autotest/gcore/tiff_read.py
index 8297577c4e37..47d97bc8064f 100755
--- a/autotest/gcore/tiff_read.py
+++ b/autotest/gcore/tiff_read.py
@@ -87,60 +87,49 @@ def test_tiff_read_off():
 
     # Test absolute/offset directory access.
     ds = gdal.Open('GTIFF_DIR:off:408:data/byte.tif')
-    if ds.GetRasterBand(1).Checksum() != 4672:
-        return 'fail'
+    assert ds.GetRasterBand(1).Checksum() == 4672
 
     # Same with GTIFF_RAW: prefix
     ds = gdal.Open('GTIFF_RAW:GTIFF_DIR:off:408:data/byte.tif')
-    if ds.GetRasterBand(1).Checksum() != 4672:
-        return 'fail'
+    assert ds.GetRasterBand(1).Checksum() == 4672
 
     # Test index directory access
     ds = gdal.Open('GTIFF_DIR:1:data/byte.tif')
-    if ds.GetRasterBand(1).Checksum() != 4672:
-        return 'fail'
+    assert ds.GetRasterBand(1).Checksum() == 4672
 
     # Check that georeferencing is read properly when accessing
     # "GTIFF_DIR" subdatasets (#3478)
     gt = ds.GetGeoTransform()
-    if gt != (440720.0, 60.0, 0.0, 3751320.0, 0.0, -60.0):
-        gdaltest.post_reason('did not get expected geotransform')
-        print(gt)
-        return 'fail'
+    assert gt == (440720.0, 60.0, 0.0, 3751320.0, 0.0, -60.0), \
+        'did not get expected geotransform'
 
     # Error cases
     with gdaltest.error_handler():
         ds = gdal.Open('GTIFF_DIR:')
-    if ds is not None:
-        return 'fail'
+    assert ds is None
 
     with gdaltest.error_handler():
         ds = gdal.Open('GTIFF_DIR:1')
-    if ds is not None:
-        return 'fail'
+    assert ds is None
 
     with gdaltest.error_handler():
         ds = gdal.Open('GTIFF_DIR:1:')
-    if ds is not None:
-        return 'fail'
+    assert ds is None
 
     with gdaltest.error_handler():
         ds = gdal.Open('GTIFF_DIR:1:/vsimem/i_dont_exist.tif')
-    if ds is not None:
-        return 'fail'
+    assert ds is None
 
     # Requested directory not found
     with gdaltest.error_handler():
         ds = gdal.Open('GTIFF_DIR:2:data/byte.tif')
-    if ds is not None:
-        return 'fail'
+    assert ds is None
 
     # Opening a specific TIFF directory is not supported in update mode.
     # Switching to read-only
     with gdaltest.error_handler():
         ds = gdal.Open('GTIFF_DIR:1:data/byte.tif', gdal.GA_Update)
-    if ds is None:
-        return 'fail'
+    assert ds is not None
 
     return 'success'
 
@@ -155,10 +144,8 @@ def test_tiff_check_alpha():
 
     ds = gdal.Open('data/stefan_full_greyalpha.tif')
 
-    if ds.GetRasterBand(2).GetRasterColorInterpretation() != gdal.GCI_AlphaBand:
-        gdaltest.post_reason('Wrong color interpretation (stefan_full_greyalpha).')
-        print(ds.GetRasterBand(2).GetRasterColorInterpretation())
-        return 'fail'
+    assert ds.GetRasterBand(2).GetRasterColorInterpretation() == gdal.GCI_AlphaBand, \
+        'Wrong color interpretation (stefan_full_greyalpha).'
 
     ds = None
 
@@ -170,19 +157,15 @@ def test_tiff_check_alpha():
         gdaltest.supports_force_rgba = True
     if gdaltest.supports_force_rgba:
         got_cs = [ds.GetRasterBand(i + 1).Checksum() for i in range(ds.RasterCount)]
-        if got_cs != [1970, 1970, 1970, 10807]:
-            print(got_cs)
-            return 'fail'
+        assert got_cs == [1970, 1970, 1970, 10807]
         ds = None
 
     # RGB + alpha
 
     ds = gdal.Open('data/stefan_full_rgba.tif')
 
-    if ds.GetRasterBand(4).GetRasterColorInterpretation() != gdal.GCI_AlphaBand:
-        gdaltest.post_reason('Wrong color interpretation (stefan_full_rgba).')
-        print(ds.GetRasterBand(4).GetRasterColorInterpretation())
-        return 'fail'
+    assert ds.GetRasterBand(4).GetRasterColorInterpretation() == gdal.GCI_AlphaBand, \
+        'Wrong color interpretation (stefan_full_rgba).'
 
     ds = None
 
@@ -192,19 +175,15 @@ def test_tiff_check_alpha():
         gdal.SetConfigOption('GTIFF_FORCE_RGBA', None)
         got_cs = [ds.GetRasterBand(i + 1).Checksum() for i in range(ds.RasterCount)]
         # FIXME? Not the same as without GTIFF_FORCE_RGBA=YES
-        if got_cs != [11547, 57792, 35643, 10807]:
-            print(got_cs)
-            return 'fail'
+        assert got_cs == [11547, 57792, 35643, 10807]
         ds = None
 
     # RGB + undefined
 
     ds = gdal.Open('data/stefan_full_rgba_photometric_rgb.tif')
 
-    if ds.GetRasterBand(4).GetRasterColorInterpretation() != gdal.GCI_Undefined:
-        gdaltest.post_reason('Wrong color interpretation (stefan_full_rgba_photometric_rgb).')
-        print(ds.GetRasterBand(4).GetRasterColorInterpretation())
-        return 'fail'
+    assert ds.GetRasterBand(4).GetRasterColorInterpretation() == gdal.GCI_Undefined, \
+        'Wrong color interpretation (stefan_full_rgba_photometric_rgb).'
 
     ds = None
 
@@ -213,9 +192,7 @@ def test_tiff_check_alpha():
         ds = gdal.Open('data/stefan_full_rgba_photometric_rgb.tif')
         gdal.SetConfigOption('GTIFF_FORCE_RGBA', None)
         got_cs = [ds.GetRasterBand(i + 1).Checksum() for i in range(ds.RasterCount)]
-        if got_cs != [12603, 58561, 36064, 10807]:
-            print(got_cs)
-            return 'fail'
+        assert got_cs == [12603, 58561, 36064, 10807]
         ds = None
 
     return 'success'
@@ -229,23 +206,17 @@ def test_tiff_read_cmyk_rgba():
     ds = gdal.Open('data/rgbsmall_cmyk.tif')
 
     md = ds.GetMetadata('IMAGE_STRUCTURE')
-    if 'SOURCE_COLOR_SPACE' not in md or md['SOURCE_COLOR_SPACE'] != 'CMYK':
-        print('bad value for IMAGE_STRUCTURE[SOURCE_COLOR_SPACE]')
-        return 'fail'
+    assert 'SOURCE_COLOR_SPACE' in md and md['SOURCE_COLOR_SPACE'] == 'CMYK', \
+        'bad value for IMAGE_STRUCTURE[SOURCE_COLOR_SPACE]'
 
-    if ds.GetRasterBand(1).GetRasterColorInterpretation() != gdal.GCI_RedBand:
-        gdaltest.post_reason('Wrong color interpretation.')
-        print(ds.GetRasterBand(1).GetRasterColorInterpretation())
-        return 'fail'
+    assert ds.GetRasterBand(1).GetRasterColorInterpretation() == gdal.GCI_RedBand, \
+        'Wrong color interpretation.'
 
-    if ds.GetRasterBand(4).GetRasterColorInterpretation() != gdal.GCI_AlphaBand:
-        gdaltest.post_reason('Wrong color interpretation (alpha).')
-        print(ds.GetRasterBand(4).GetRasterColorInterpretation())
-        return 'fail'
+    assert ds.GetRasterBand(4).GetRasterColorInterpretation() == gdal.GCI_AlphaBand, \
+        'Wrong color interpretation (alpha).'
 
-    if ds.GetRasterBand(1).Checksum() != 23303:
-        print('Expected checksum = %d. Got = %d' % (23303, ds.GetRasterBand(1).Checksum()))
-        return 'fail'
+    assert ds.GetRasterBand(1).Checksum() == 23303, \
+        ('Expected checksum = %d. Got = %d' % (23303, ds.GetRasterBand(1).Checksum()))
 
     return 'success'
 
@@ -257,14 +228,11 @@ def test_tiff_read_cmyk_raw():
 
     ds = gdal.Open('GTIFF_RAW:data/rgbsmall_cmyk.tif')
 
-    if ds.GetRasterBand(1).GetRasterColorInterpretation() != gdal.GCI_CyanBand:
-        gdaltest.post_reason('Wrong color interpretation.')
-        print(ds.GetRasterBand(1).GetRasterColorInterpretation())
-        return 'fail'
+    assert ds.GetRasterBand(1).GetRasterColorInterpretation() == gdal.GCI_CyanBand, \
+        'Wrong color interpretation.'
 
-    if ds.GetRasterBand(1).Checksum() != 29430:
-        print('Expected checksum = %d. Got = %d' % (29430, ds.GetRasterBand(1).Checksum()))
-        return 'fail'
+    assert ds.GetRasterBand(1).Checksum() == 29430, \
+        ('Expected checksum = %d. Got = %d' % (29430, ds.GetRasterBand(1).Checksum()))
 
     return 'success'
 
@@ -291,9 +259,8 @@ def test_tiff_read_ojpeg():
     got_cs = ds.GetRasterBand(1).Checksum()
     gdal.PopErrorHandler()
     expected_cs = 61570
-    if got_cs != expected_cs:
-        print('Expected checksum = %d. Got = %d' % (expected_cs, got_cs))
-        return 'fail'
+    assert got_cs == expected_cs, \
+        ('Expected checksum = %d. Got = %d' % (expected_cs, got_cs))
 
     #
     gdal.PushErrorHandler('CPLQuietErrorHandler')
@@ -317,9 +284,8 @@ def test_tiff_read_gzip():
         pass
 
     ds = gdal.Open('/vsigzip/./data/byte.tif.gz')
-    if ds.GetRasterBand(1).Checksum() != 4672:
-        print('Expected checksum = %d. Got = %d' % (4672, ds.GetRasterBand(1).Checksum()))
-        return 'fail'
+    assert ds.GetRasterBand(1).Checksum() == 4672, \
+        ('Expected checksum = %d. Got = %d' % (4672, ds.GetRasterBand(1).Checksum()))
     ds = None
 
     try:
@@ -336,9 +302,8 @@ def test_tiff_read_gzip():
 def test_tiff_read_zip_1():
 
     ds = gdal.Open('/vsizip/./data/byte.tif.zip/byte.tif')
-    if ds.GetRasterBand(1).Checksum() != 4672:
-        print('Expected checksum = %d. Got = %d' % (4672, ds.GetRasterBand(1).Checksum()))
-        return 'fail'
+    assert ds.GetRasterBand(1).Checksum() == 4672, \
+        ('Expected checksum = %d. Got = %d' % (4672, ds.GetRasterBand(1).Checksum()))
     ds = None
 
     return 'success'
@@ -350,9 +315,8 @@ def test_tiff_read_zip_1():
 def test_tiff_read_zip_2():
 
     ds = gdal.Open('/vsizip/./data/byte.tif.zip')
-    if ds.GetRasterBand(1).Checksum() != 4672:
-        print('Expected checksum = %d. Got = %d' % (4672, ds.GetRasterBand(1).Checksum()))
-        return 'fail'
+    assert ds.GetRasterBand(1).Checksum() == 4672, \
+        ('Expected checksum = %d. Got = %d' % (4672, ds.GetRasterBand(1).Checksum()))
     ds = None
 
     return 'success'
@@ -364,9 +328,8 @@ def test_tiff_read_zip_2():
 def test_tiff_read_zip_3():
 
     ds = gdal.Open('/vsizip/./data/onefileinsubdir.zip/onefileinsubdir/byte.tif')
-    if ds.GetRasterBand(1).Checksum() != 4672:
-        print('Expected checksum = %d. Got = %d' % (4672, ds.GetRasterBand(1).Checksum()))
-        return 'fail'
+    assert ds.GetRasterBand(1).Checksum() == 4672, \
+        ('Expected checksum = %d. Got = %d' % (4672, ds.GetRasterBand(1).Checksum()))
     ds = None
 
     return 'success'
@@ -378,9 +341,8 @@ def test_tiff_read_zip_3():
 def test_tiff_read_zip_4():
 
     ds = gdal.Open('/vsizip/./data/onefileinsubdir.zip')
-    if ds.GetRasterBand(1).Checksum() != 4672:
-        print('Expected checksum = %d. Got = %d' % (4672, ds.GetRasterBand(1).Checksum()))
-        return 'fail'
+    assert ds.GetRasterBand(1).Checksum() == 4672, \
+        ('Expected checksum = %d. Got = %d' % (4672, ds.GetRasterBand(1).Checksum()))
     ds = None
 
     return 'success'
@@ -392,9 +354,8 @@ def test_tiff_read_zip_4():
 def test_tiff_read_zip_5():
 
     ds = gdal.Open('/vsizip/./data/twofileinsubdir.zip/twofileinsubdir/byte.tif')
-    if ds.GetRasterBand(1).Checksum() != 4672:
-        print('Expected checksum = %d. Got = %d' % (4672, ds.GetRasterBand(1).Checksum()))
-        return 'fail'
+    assert ds.GetRasterBand(1).Checksum() == 4672, \
+        ('Expected checksum = %d. Got = %d' % (4672, ds.GetRasterBand(1).Checksum()))
     ds = None
 
     return 'success'
@@ -406,9 +367,8 @@ def test_tiff_read_zip_5():
 def test_tiff_read_tar_1():
 
     ds = gdal.Open('/vsitar/./data/byte.tar/byte.tif')
-    if ds.GetRasterBand(1).Checksum() != 4672:
-        print('Expected checksum = %d. Got = %d' % (4672, ds.GetRasterBand(1).Checksum()))
-        return 'fail'
+    assert ds.GetRasterBand(1).Checksum() == 4672, \
+        ('Expected checksum = %d. Got = %d' % (4672, ds.GetRasterBand(1).Checksum()))
     ds = None
 
     return 'success'
@@ -420,9 +380,8 @@ def test_tiff_read_tar_1():
 def test_tiff_read_tar_2():
 
     ds = gdal.Open('/vsitar/./data/byte.tar')
-    if ds.GetRasterBand(1).Checksum() != 4672:
-        print('Expected checksum = %d. Got = %d' % (4672, ds.GetRasterBand(1).Checksum()))
-        return 'fail'
+    assert ds.GetRasterBand(1).Checksum() == 4672, \
+        ('Expected checksum = %d. Got = %d' % (4672, ds.GetRasterBand(1).Checksum()))
     ds = None
 
     return 'success'
@@ -434,9 +393,8 @@ def test_tiff_read_tar_2():
 def test_tiff_read_tgz_1():
 
     ds = gdal.Open('/vsitar/./data/byte.tgz/byte.tif')
-    if ds.GetRasterBand(1).Checksum() != 4672:
-        print('Expected checksum = %d. Got = %d' % (4672, ds.GetRasterBand(1).Checksum()))
-        return 'fail'
+    assert ds.GetRasterBand(1).Checksum() == 4672, \
+        ('Expected checksum = %d. Got = %d' % (4672, ds.GetRasterBand(1).Checksum()))
     ds = None
 
     gdal.Unlink('data/byte.tgz.properties')
@@ -450,9 +408,8 @@ def test_tiff_read_tgz_1():
 def test_tiff_read_tgz_2():
 
     ds = gdal.Open('/vsitar/./data/byte.tgz')
-    if ds.GetRasterBand(1).Checksum() != 4672:
-        print('Expected checksum = %d. Got = %d' % (4672, ds.GetRasterBand(1).Checksum()))
-        return 'fail'
+    assert ds.GetRasterBand(1).Checksum() == 4672, \
+        ('Expected checksum = %d. Got = %d' % (4672, ds.GetRasterBand(1).Checksum()))
     ds = None
 
     gdal.Unlink('data/byte.tgz.properties')
@@ -468,10 +425,8 @@ def test_tiff_grads():
     ds = gdal.Open('data/test_gf.tif')
     srs = ds.GetProjectionRef()
 
-    if srs.find('PARAMETER["latitude_of_origin",46.8]') == -1:
-        print(srs)
-        gdaltest.post_reason('Did not get expected latitude of origin.')
-        return 'fail'
+    assert srs.find('PARAMETER["latitude_of_origin",46.8]') != -1, \
+        'Did not get expected latitude of origin.'
 
     return 'success'
 
@@ -492,8 +447,7 @@ def test_tiff_citation():
 
     if wkt != expected_wkt:
         print('got: ', wkt)
-        gdaltest.post_reason('Erdas citation processing failing?')
-        return 'fail'
+        pytest.fail('Erdas citation processing failing?')
 
     return 'success'
 
@@ -512,9 +466,7 @@ def test_tiff_linearparmunits():
     srs = osr.SpatialReference(wkt)
 
     fe = srs.GetProjParm(osr.SRS_PP_FALSE_EASTING)
-    if abs(fe - 2000000.0) > 0.001:
-        gdaltest.post_reason('did not get expected false easting (1)')
-        return 'fail'
+    assert abs(fe - 2000000.0) <= 0.001, 'did not get expected false easting (1)'
 
     # Test the file with the old (broken) GDAL formulation.
 
@@ -525,9 +477,7 @@ def test_tiff_linearparmunits():
     srs = osr.SpatialReference(wkt)
 
     fe = srs.GetProjParm(osr.SRS_PP_FALSE_EASTING)
-    if abs(fe - 609601.219202438) > 0.001:
-        gdaltest.post_reason('did not get expected false easting (2)')
-        return 'fail'
+    assert abs(fe - 609601.219202438) <= 0.001, 'did not get expected false easting (2)'
 
     # Test the file when using an EPSG code.
 
@@ -538,9 +488,7 @@ def test_tiff_linearparmunits():
     srs = osr.SpatialReference(wkt)
 
     fe = srs.GetProjParm(osr.SRS_PP_FALSE_EASTING)
-    if abs(fe - 2000000.0) > 0.001:
-        gdaltest.post_reason('did not get expected false easting (3)')
-        return 'fail'
+    assert abs(fe - 2000000.0) <= 0.001, 'did not get expected false easting (3)'
 
     return 'success'
 
@@ -561,9 +509,7 @@ def test_tiff_linearparmunits2():
     srs = osr.SpatialReference(wkt)
 
     fe = srs.GetProjParm(osr.SRS_PP_FALSE_EASTING)
-    if abs(fe - 6561666.66667) > 0.001:
-        gdaltest.post_reason('did not get expected false easting (1)')
-        return 'fail'
+    assert abs(fe - 6561666.66667) <= 0.001, 'did not get expected false easting (1)'
 
     # Test the file with the correct formulation that is marked as correct.
 
@@ -574,9 +520,7 @@ def test_tiff_linearparmunits2():
     srs = osr.SpatialReference(wkt)
 
     fe = srs.GetProjParm(osr.SRS_PP_FALSE_EASTING)
-    if abs(fe - 2000000.0) > 0.001:
-        gdaltest.post_reason('did not get expected false easting (2)')
-        return 'fail'
+    assert abs(fe - 2000000.0) <= 0.001, 'did not get expected false easting (2)'
 
     # Test the file with the old (broken) GDAL formulation.
 
@@ -587,9 +531,7 @@ def test_tiff_linearparmunits2():
     srs = osr.SpatialReference(wkt)
 
     fe = srs.GetProjParm(osr.SRS_PP_FALSE_EASTING)
-    if abs(fe - 2000000.0) > 0.001:
-        gdaltest.post_reason('did not get expected false easting (3)')
-        return 'fail'
+    assert abs(fe - 2000000.0) <= 0.001, 'did not get expected false easting (3)'
 
     gdal.SetConfigOption('GTIFF_LINEAR_UNITS', 'DEFAULT')
 
@@ -608,15 +550,10 @@ def test_tiff_g4_split():
 
     (_, blocky) = ds.GetRasterBand(1).GetBlockSize()
 
-    if blocky != 1:
-        gdaltest.post_reason('Did not get scanline sized blocks.')
-        return 'fail'
+    assert blocky == 1, 'Did not get scanline sized blocks.'
 
     cs = ds.GetRasterBand(1).Checksum()
-    if cs != 3322:
-        print(cs)
-        gdaltest.post_reason('Got wrong checksum')
-        return 'fail'
+    assert cs == 3322, 'Got wrong checksum'
 
     return 'success'
 
@@ -628,31 +565,25 @@ def test_tiff_multi_images():
 
     # Implicitly get the content of the first image (backward compatibility).
     ds = gdal.Open('data/twoimages.tif')
-    if ds.GetRasterBand(1).Checksum() != 4672:
-        print('Expected checksum = %d. Got = %d' %
+    assert ds.GetRasterBand(1).Checksum() == 4672, ('Expected checksum = %d. Got = %d' %
               (4672, ds.GetRasterBand(1).Checksum()))
-        return 'fail'
 
     md = ds.GetMetadata('SUBDATASETS')
-    if md['SUBDATASET_1_NAME'] != 'GTIFF_DIR:1:data/twoimages.tif':
-        print(md)
-        gdaltest.post_reason('did not get expected subdatasets metadata.')
-        return 'fail'
+    assert md['SUBDATASET_1_NAME'] == 'GTIFF_DIR:1:data/twoimages.tif', \
+        'did not get expected subdatasets metadata.'
 
     ds = None
 
     # Explicitly get the content of the first image.
     ds = gdal.Open('GTIFF_DIR:1:data/twoimages.tif')
-    if ds.GetRasterBand(1).Checksum() != 4672:
-        print('Expected checksum = %d. Got = %d' % (4672, ds.GetRasterBand(1).Checksum()))
-        return 'fail'
+    assert ds.GetRasterBand(1).Checksum() == 4672, \
+        ('Expected checksum = %d. Got = %d' % (4672, ds.GetRasterBand(1).Checksum()))
     ds = None
 
     # Explicitly get the content of the second image.
     ds = gdal.Open('GTIFF_DIR:2:data/twoimages.tif')
-    if ds.GetRasterBand(1).Checksum() != 4672:
-        print('Expected checksum = %d. Got = %d' % (4672, ds.GetRasterBand(1).Checksum()))
-        return 'fail'
+    assert ds.GetRasterBand(1).Checksum() == 4672, \
+        ('Expected checksum = %d. Got = %d' % (4672, ds.GetRasterBand(1).Checksum()))
     ds = None
 
     return 'success'
@@ -674,23 +605,20 @@ def test_tiff_vsimem():
     gdal.FileFromMemBuffer('/vsimem/tiffinmem', content)
 
     ds = gdal.Open('/vsimem/tiffinmem', gdal.GA_Update)
-    if ds.GetRasterBand(1).Checksum() != 4672:
-        print('Expected checksum = %d. Got = %d' % (4672, ds.GetRasterBand(1).Checksum()))
-        return 'fail'
+    assert ds.GetRasterBand(1).Checksum() == 4672, \
+        ('Expected checksum = %d. Got = %d' % (4672, ds.GetRasterBand(1).Checksum()))
     ds.GetRasterBand(1).Fill(0)
     ds = None
 
     ds = gdal.Open('/vsimem/tiffinmem')
-    if ds.GetRasterBand(1).Checksum() != 0:
-        print('Expected checksum = %d. Got = %d' % (0, ds.GetRasterBand(1).Checksum()))
-        return 'fail'
+    assert ds.GetRasterBand(1).Checksum() == 0, \
+        ('Expected checksum = %d. Got = %d' % (0, ds.GetRasterBand(1).Checksum()))
     ds = None
 
     # Also test with anti-slash
     ds = gdal.Open('/vsimem\\tiffinmem')
-    if ds.GetRasterBand(1).Checksum() != 0:
-        print('Expected checksum = %d. Got = %d' % (0, ds.GetRasterBand(1).Checksum()))
-        return 'fail'
+    assert ds.GetRasterBand(1).Checksum() == 0, \
+        ('Expected checksum = %d. Got = %d' % (0, ds.GetRasterBand(1).Checksum()))
     ds = None
 
     # Release memory associated to the in-memory file
@@ -715,9 +643,8 @@ def test_tiff_vsizip_and_mem():
     gdal.FileFromMemBuffer('/vsimem/tiffinmem.zip', content)
 
     ds = gdal.Open('/vsizip/vsimem/tiffinmem.zip/byte.tif')
-    if ds.GetRasterBand(1).Checksum() != 4672:
-        print('Expected checksum = %d. Got = %d' % (4672, ds.GetRasterBand(1).Checksum()))
-        return 'fail'
+    assert ds.GetRasterBand(1).Checksum() == 4672, \
+        ('Expected checksum = %d. Got = %d' % (4672, ds.GetRasterBand(1).Checksum()))
 
     # Release memory associated to the in-memory file
     gdal.Unlink('/vsimem/tiffinmem.zip')
@@ -731,9 +658,7 @@ def test_tiff_vsizip_and_mem():
 def test_tiff_ProjectedCSTypeGeoKey_only():
 
     ds = gdal.Open('data/ticket3019.tif')
-    if ds.GetProjectionRef().find('WGS 84 / UTM zone 31N') == -1:
-        print(ds.GetProjectionRef())
-        return 'fail'
+    assert ds.GetProjectionRef().find('WGS 84 / UTM zone 31N') != -1
     ds = None
 
     return 'success'
@@ -745,9 +670,7 @@ def test_tiff_ProjectedCSTypeGeoKey_only():
 def test_tiff_GTModelTypeGeoKey_only():
 
     ds = gdal.Open('data/GTModelTypeGeoKey_only.tif')
-    if ds.GetProjectionRef().find('LOCAL_CS["unnamed",GEOGCS["unknown",DATUM["unknown",SPHEROID["unretrievable - using WGS84",6378137,298.257223563]],PRIMEM["Greenwich",0],UNIT[,0.0174532925199433]],UNIT["unknown",1]]') != 0:
-        print(ds.GetProjectionRef())
-        return 'fail'
+    assert ds.GetProjectionRef().find('LOCAL_CS["unnamed",GEOGCS["unknown",DATUM["unknown",SPHEROID["unretrievable - using WGS84",6378137,298.257223563]],PRIMEM["Greenwich",0],UNIT[,0.0174532925199433]],UNIT["unknown",1]]') == 0
     ds = None
 
     return 'success'
@@ -787,10 +710,8 @@ def test_tiff_12bitjpeg():
     except:
         pass
 
-    if stats[2] < 2150 or stats[2] > 2180 or str(stats[2]) == 'nan':
-        gdaltest.post_reason('did not get expected mean for band1.')
-        print(stats)
-        return 'fail'
+    assert not (stats[2] < 2150 or stats[2] > 2180 or str(stats[2]) == 'nan'), \
+        'did not get expected mean for band1.'
     ds = None
 
     os.unlink('data/mandrilmini_12bitjpeg.tif.aux.xml')
@@ -810,15 +731,11 @@ def test_tiff_read_stats_from_pam():
 
     ds = gdal.Open('data/byte.tif')
     md = ds.GetRasterBand(1).GetMetadata()
-    if 'STATISTICS_MINIMUM' in md:
-        gdaltest.post_reason('Unexpected presence of STATISTICS_MINIMUM')
-        return 'fail'
+    assert 'STATISTICS_MINIMUM' not in md, 'Unexpected presence of STATISTICS_MINIMUM'
 
     # Force statistics computation
     stats = ds.GetRasterBand(1).GetStatistics(0, 1)
-    if stats[0] != 74.0 or stats[1] != 255.0:
-        print(stats)
-        return 'fail'
+    assert stats[0] == 74.0 and stats[1] == 255.0
 
     ds = None
     try:
@@ -830,9 +747,7 @@ def test_tiff_read_stats_from_pam():
     ds = gdal.Open('data/byte.tif')
     # Just read statistics (from PAM) without forcing their computation
     stats = ds.GetRasterBand(1).GetStatistics(0, 0)
-    if stats[0] != 74.0 or stats[1] != 255.0:
-        print(stats)
-        return 'fail'
+    assert stats[0] == 74.0 and stats[1] == 255.0
     ds = None
 
     try:
@@ -882,15 +797,10 @@ def test_tiff_read_from_tab():
     except OSError:
         pass
 
-    if gt != (400000.0, 25.0, 0.0, 1300000.0, 0.0, -25.0):
-        gdaltest.post_reason('did not get expected geotransform')
-        print(gt)
-        return 'fail'
+    assert gt == (400000.0, 25.0, 0.0, 1300000.0, 0.0, -25.0), \
+        'did not get expected geotransform'
 
-    if wkt.find('OSGB_1936') == -1:
-        gdaltest.post_reason('did not get expected SRS')
-        print(wkt)
-        return 'fail'
+    assert wkt.find('OSGB_1936') != -1, 'did not get expected SRS'
 
     return 'success'
 
@@ -908,10 +818,7 @@ def test_tiff_read_pixelispoint():
 
     gt_expected = (440690.0, 60.0, 0.0, 3751350.0, 0.0, -60.0)
 
-    if gt != gt_expected:
-        print(gt)
-        gdaltest.post_reason('did not get expected geotransform')
-        return 'fail'
+    assert gt == gt_expected, 'did not get expected geotransform'
 
     gdal.SetConfigOption('GTIFF_POINT_GEO_IGNORE', 'TRUE')
 
@@ -921,10 +828,8 @@ def test_tiff_read_pixelispoint():
 
     gt_expected = (440720.0, 60.0, 0.0, 3751320.0, 0.0, -60.0)
 
-    if gt != gt_expected:
-        print(gt)
-        gdaltest.post_reason('did not get expected geotransform with GTIFF_POINT_GEO_IGNORE TRUE')
-        return 'fail'
+    assert gt == gt_expected, \
+        'did not get expected geotransform with GTIFF_POINT_GEO_IGNORE TRUE'
 
     gdal.SetConfigOption('GTIFF_POINT_GEO_IGNORE', None)
 
@@ -944,10 +849,7 @@ def test_tiff_read_geomatrix():
 
     gt_expected = (1841001.75, 1.5, -5.0, 1144003.25, -5.0, -1.5)
 
-    if gt != gt_expected:
-        print(gt)
-        gdaltest.post_reason('did not get expected geotransform')
-        return 'fail'
+    assert gt == gt_expected, 'did not get expected geotransform'
 
     gdal.SetConfigOption('GTIFF_POINT_GEO_IGNORE', 'TRUE')
 
@@ -957,10 +859,8 @@ def test_tiff_read_geomatrix():
 
     gt_expected = (1841000.0, 1.5, -5.0, 1144000.0, -5.0, -1.5)
 
-    if gt != gt_expected:
-        print(gt)
-        gdaltest.post_reason('did not get expected geotransform with GTIFF_POINT_GEO_IGNORE TRUE')
-        return 'fail'
+    assert gt == gt_expected, \
+        'did not get expected geotransform with GTIFF_POINT_GEO_IGNORE TRUE'
 
     gdal.SetConfigOption('GTIFF_POINT_GEO_IGNORE', None)
 
@@ -978,11 +878,9 @@ def test_tiff_read_corrupted_gtiff():
     del ds
 
     err_msg = gdal.GetLastErrorMsg()
-    if err_msg.find('IO error during') == -1 and \
-       err_msg.find('Error fetching data for field') == -1:
-        gdaltest.post_reason('did not get expected error message')
-        print(err_msg)
-        return 'fail'
+    assert (not (err_msg.find('IO error during') == -1 and \
+       err_msg.find('Error fetching data for field') == -1)), \
+        'did not get expected error message'
 
     return 'success'
 
@@ -997,9 +895,8 @@ def test_tiff_read_tag_without_null_byte():
     gdal.SetConfigOption('CPL_DEBUG', 'OFF')
     ds = gdal.Open('data/tag_without_null_byte.tif')
     gdal.SetConfigOption('CPL_DEBUG', oldval)
-    if gdal.GetLastErrorType() != 0:
-        gdaltest.post_reason('should have not emitted a warning, but only a CPLDebug() message')
-        return 'fail'
+    assert gdal.GetLastErrorType() == 0, \
+        'should have not emitted a warning, but only a CPLDebug() message'
     del ds
 
     return 'success'
@@ -1017,9 +914,7 @@ def test_tiff_read_buggy_packbits():
     gdal.PushErrorHandler('CPLQuietErrorHandler')
     ret = ds.ReadRaster(0, 0, 20, 20)
     gdal.PopErrorHandler()
-    if ret is not None:
-        gdaltest.post_reason('did not expected a valid result')
-        return 'fail'
+    assert ret is None, 'did not expected a valid result'
     ds = None
 
     gdal.SetConfigOption('GTIFF_IGNORE_READ_ERRORS', 'YES')
@@ -1028,9 +923,7 @@ def test_tiff_read_buggy_packbits():
     gdal.PushErrorHandler('CPLQuietErrorHandler')
     ret = ds.ReadRaster(0, 0, 20, 20)
     gdal.PopErrorHandler()
-    if ret is None:
-        gdaltest.post_reason('expected a valid result')
-        return 'fail'
+    assert ret is not None, 'expected a valid result'
     ds = None
 
     return 'success'
@@ -1049,15 +942,12 @@ def test_tiff_read_rpc_txt():
     os.remove('tmp/test.tif')
     os.remove('tmp/test_rpc.txt')
 
-    if rpc_md['HEIGHT_OFF'] != '+0300.000 meters':
-        gdaltest.post_reason('HEIGHT_OFF wrong:"' + rpc_md['HEIGHT_OFF'] + '"')
-        return 'fail'
+    assert rpc_md['HEIGHT_OFF'] == '+0300.000 meters', \
+        ('HEIGHT_OFF wrong:"' + rpc_md['HEIGHT_OFF'] + '"')
 
-    if rpc_md['LINE_DEN_COEFF'].find(
-            '+1.000000000000000E+00 -5.207696939454288E-03') != 0:
-        print(rpc_md['LINE_DEN_COEFF'])
-        gdaltest.post_reason('LINE_DEN_COEFF wrong')
-        return 'fail'
+    assert (rpc_md['LINE_DEN_COEFF'].find(
+            '+1.000000000000000E+00 -5.207696939454288E-03') == 0), \
+        'LINE_DEN_COEFF wrong'
 
     return 'success'
 
@@ -1072,14 +962,10 @@ def test_tiff_read_rpc_tif():
     rpc_md = ds.GetMetadata('RPC')
     ds = None
 
-    if rpc_md['HEIGHT_OFF'] != '300':
-        gdaltest.post_reason('HEIGHT_OFF wrong:' + rpc_md['HEIGHT_OFF'])
-        return 'fail'
+    assert rpc_md['HEIGHT_OFF'] == '300', ('HEIGHT_OFF wrong:' + rpc_md['HEIGHT_OFF'])
 
-    if rpc_md['LINE_DEN_COEFF'].find('1 -0.00520769693945429') != 0:
-        print(rpc_md['LINE_DEN_COEFF'])
-        gdaltest.post_reason('LINE_DEN_COEFF wrong')
-        return 'fail'
+    assert rpc_md['LINE_DEN_COEFF'].find('1 -0.00520769693945429') == 0, \
+        'LINE_DEN_COEFF wrong'
 
     return 'success'
 
@@ -1101,9 +987,8 @@ def test_tiff_small():
     gdal.FileFromMemBuffer('/vsimem/small.tif', content)
 
     ds = gdal.Open('/vsimem/small.tif')
-    if ds.GetRasterBand(1).Checksum() != 0:
-        print('Expected checksum = %d. Got = %d' % (0, ds.GetRasterBand(1).Checksum()))
-        return 'fail'
+    assert ds.GetRasterBand(1).Checksum() == 0, \
+        ('Expected checksum = %d. Got = %d' % (0, ds.GetRasterBand(1).Checksum()))
 
     # Release memory associated to the in-memory file
     gdal.Unlink('/vsimem/small.tif')
@@ -1133,23 +1018,20 @@ def test_tiff_read_exif_and_gps():
     exif_md = ds.GetMetadata('EXIF')
     ds = None
 
-    if exif_md is None or not exif_md:
-        return 'fail'
+    assert exif_md is not None and exif_md
 
     ds = gdal.Open('data/exif_and_gps.tif')
     EXIF_GPSVersionID = ds.GetMetadataItem('EXIF_GPSVersionID', 'EXIF')
     ds = None
 
-    if EXIF_GPSVersionID is None:
-        return 'fail'
+    assert EXIF_GPSVersionID is not None
 
     # We should not get any EXIF metadata with that file
     ds = gdal.Open('data/byte.tif')
     exif_md = ds.GetMetadata('EXIF')
     ds = None
 
-    if not (exif_md is None or not exif_md):
-        return 'fail'
+    assert (exif_md is None or not exif_md)
 
     return 'success'
 
@@ -1164,17 +1046,14 @@ def test_tiff_jpeg_rgba_pixel_interleaved():
 
     ds = gdal.Open('data/stefan_full_rgba_jpeg_contig.tif')
     md = ds.GetMetadata('IMAGE_STRUCTURE')
-    if md['INTERLEAVE'] != 'PIXEL':
-        return 'fail'
+    assert md['INTERLEAVE'] == 'PIXEL'
 
     expected_cs = [16404, 62700, 37913, 14174]
     for i in range(4):
         cs = ds.GetRasterBand(i + 1).Checksum()
-        if cs != expected_cs[i]:
-            return 'fail'
+        assert cs == expected_cs[i]
 
-        if ds.GetRasterBand(i + 1).GetRasterColorInterpretation() != gdal.GCI_RedBand + i:
-            return 'fail'
+        assert ds.GetRasterBand(i + 1).GetRasterColorInterpretation() == gdal.GCI_RedBand + i
 
     ds = None
 
@@ -1191,17 +1070,14 @@ def test_tiff_jpeg_rgba_band_interleaved():
 
     ds = gdal.Open('data/stefan_full_rgba_jpeg_separate.tif')
     md = ds.GetMetadata('IMAGE_STRUCTURE')
-    if md['INTERLEAVE'] != 'BAND':
-        return 'fail'
+    assert md['INTERLEAVE'] == 'BAND'
 
     expected_cs = [16404, 62700, 37913, 14174]
     for i in range(4):
         cs = ds.GetRasterBand(i + 1).Checksum()
-        if cs != expected_cs[i]:
-            return 'fail'
+        assert cs == expected_cs[i]
 
-        if ds.GetRasterBand(i + 1).GetRasterColorInterpretation() != gdal.GCI_RedBand + i:
-            return 'fail'
+        assert ds.GetRasterBand(i + 1).GetRasterColorInterpretation() == gdal.GCI_RedBand + i
 
     ds = None
 
@@ -1224,12 +1100,9 @@ def test_tiff_read_online_1():
     cs = ds.GetRasterBand(1).Checksum()
     ds = None
 
-    if gdal.GetLastErrorMsg() != '':
-        return 'fail'
+    assert gdal.GetLastErrorMsg() == ''
 
-    if cs != 62628 and cs != 28554:
-        print(cs)
-        return 'fail'
+    assert cs == 62628 or cs == 28554
 
     return 'success'
 
@@ -1256,9 +1129,7 @@ def test_tiff_read_online_2():
     gdal.SetConfigOption('CPL_VSIL_CURL_ALLOWED_EXTENSIONS', None)
     gdal.SetConfigOption('GDAL_DISABLE_READDIR_ON_OPEN', None)
 
-    if ds is None:
-        gdaltest.post_reason('could not open dataset')
-        return 'fail'
+    assert ds is not None, 'could not open dataset'
 
     # Read subsampled data
     subsampled_data = ds.ReadRaster(0, 0, 512, 512, 128, 128)
@@ -1269,10 +1140,7 @@ def test_tiff_read_online_2():
     cs = ds.GetRasterBand(1).Checksum()
     ds = None
 
-    if cs != 54935:
-        gdaltest.post_reason('wrong checksum')
-        print(cs)
-        return 'fail'
+    assert cs == 54935, 'wrong checksum'
 
     return 'success'
 
@@ -1289,8 +1157,7 @@ def test_tiff_read_huge4GB():
 
     if not gdaltest.filesystem_supports_sparse_files('tmp'):
         ds = gdal.Open('data/huge4GB.tif')
-        if ds is None:
-            return 'fail'
+        assert ds is not None
     else:
         shutil.copy('data/huge4GB.tif', 'tmp/huge4GB.tif')
         f = open('tmp/huge4GB.tif', 'rb+')
@@ -1320,8 +1187,7 @@ def test_tiff_read_bigtiff():
     cs = ds.GetRasterBand(1).Checksum()
     ds = None
 
-    if cs != 4672:
-        return 'fail'
+    assert cs == 4672
 
     return 'success'
 
@@ -1336,26 +1202,17 @@ def test_tiff_read_tiff_metadata():
         return 'skip'
 
     ds = gdal.Open('data/stefan_full_rgba_jpeg_contig.tif')
-    if ds.GetRasterBand(1).GetMetadataItem('BLOCK_OFFSET_0_0', 'TIFF') != '254':
-        return 'fail'
-    if ds.GetRasterBand(1).GetMetadataItem('BLOCK_SIZE_0_0', 'TIFF') != '770':
-        return 'fail'
-    if ds.GetRasterBand(1).GetMetadataItem('JPEGTABLES', 'TIFF').find('FFD8') != 0:
-        return 'fail'
-    if ds.GetRasterBand(1).GetMetadataItem('BLOCK_OFFSET_100_0', 'TIFF') is not None:
-        return 'fail'
-    if ds.GetRasterBand(1).GetMetadataItem('BLOCK_OFFSET_0_100', 'TIFF') is not None:
-        return 'fail'
-    if ds.GetRasterBand(1).GetMetadataItem('BLOCK_SIZE_100_0', 'TIFF') is not None:
-        return 'fail'
-    if ds.GetRasterBand(1).GetMetadataItem('BLOCK_SIZE_0_100', 'TIFF') is not None:
-        return 'fail'
+    assert ds.GetRasterBand(1).GetMetadataItem('BLOCK_OFFSET_0_0', 'TIFF') == '254'
+    assert ds.GetRasterBand(1).GetMetadataItem('BLOCK_SIZE_0_0', 'TIFF') == '770'
+    assert ds.GetRasterBand(1).GetMetadataItem('JPEGTABLES', 'TIFF').find('FFD8') == 0
+    assert ds.GetRasterBand(1).GetMetadataItem('BLOCK_OFFSET_100_0', 'TIFF') is None
+    assert ds.GetRasterBand(1).GetMetadataItem('BLOCK_OFFSET_0_100', 'TIFF') is None
+    assert ds.GetRasterBand(1).GetMetadataItem('BLOCK_SIZE_100_0', 'TIFF') is None
+    assert ds.GetRasterBand(1).GetMetadataItem('BLOCK_SIZE_0_100', 'TIFF') is None
 
     ds = gdal.Open('data/stefan_full_rgba_jpeg_separate.tif')
-    if ds.GetRasterBand(4).GetMetadataItem('BLOCK_OFFSET_0_2', 'TIFF') != '11071':
-        return 'fail'
-    if ds.GetRasterBand(4).GetMetadataItem('BLOCK_SIZE_0_2', 'TIFF') != '188':
-        return 'fail'
+    assert ds.GetRasterBand(4).GetMetadataItem('BLOCK_OFFSET_0_2', 'TIFF') == '11071'
+    assert ds.GetRasterBand(4).GetMetadataItem('BLOCK_SIZE_0_2', 'TIFF') == '188'
 
     return 'success'
 
@@ -1374,15 +1231,13 @@ def test_tiff_read_irregular_tile_size_jpeg_in_tiff():
     gdal.PushErrorHandler('CPLQuietErrorHandler')
     ds.GetRasterBand(1).Checksum()
     gdal.PopErrorHandler()
-    if gdal.GetLastErrorType() == 0:
-        return 'fail'
+    assert gdal.GetLastErrorType() != 0
 
     gdal.ErrorReset()
     gdal.PushErrorHandler('CPLQuietErrorHandler')
     ds.GetRasterBand(1).GetOverview(0).Checksum()
     gdal.PopErrorHandler()
-    if gdal.GetLastErrorType() == 0:
-        return 'fail'
+    assert gdal.GetLastErrorType() != 0
     gdal.ErrorReset()
 
     return 'success'
@@ -1612,8 +1467,7 @@ def test_tiff_direct_and_virtual_mem_io():
 
                     if ref_data_native_type != got_data_native_type:
                         print(option)
-                        print(i)
-                        return 'fail'
+                        pytest.fail(i)
 
                     if truncated and not band_interleaved:
                         if got_data_native_type_whole is not None:
@@ -1621,8 +1475,7 @@ def test_tiff_direct_and_virtual_mem_io():
                             print(band_interleaved)
                             print(option)
                             print(i)
-                            print(gdal.GetDataTypeName(dt))
-                            return 'fail'
+                            pytest.fail(gdal.GetDataTypeName(dt))
                     elif ref_data_native_type_whole != got_data_native_type_whole:
                         print(option)
                         print(i)
@@ -1630,20 +1483,16 @@ def test_tiff_direct_and_virtual_mem_io():
 
                     if ref_data_native_type_downsampled != got_data_native_type_downsampled:
                         print(option)
-                        print(i)
-                        return 'fail'
+                        pytest.fail(i)
 
                     if not truncated and ref_data_native_type_downsampled_not_nearest != got_data_native_type_downsampled_not_nearest:
-                        print(truncated)
                         print(band_interleaved)
                         print(option)
-                        print(i)
-                        return 'fail'
+                        pytest.fail(i)
 
                     if ref_data_native_type_upsampled != got_data_native_type_upsampled:
                         print(option)
-                        print(i)
-                        return 'fail'
+                        pytest.fail(i)
 
                     for y in range(ysize):
                         for x in range(xsize):
@@ -1651,44 +1500,35 @@ def test_tiff_direct_and_virtual_mem_io():
                                 if ref_data_native_type_custom_spacings[(y * xsize + x) * nbands * dt_size + k] != got_data_native_type_custom_spacings[(y * xsize + x) * nbands * dt_size + k]:
                                     print(gdal.GetDataTypeName(dt))
                                     print(option)
-                                    print(i)
-                                    return 'fail'
+                                    pytest.fail(i)
                                 if not truncated:
                                     for band in range(nbands):
                                         if ref_nbands_data_native_type_custom_spacings[(y * xsize + x) * 2 * nbands * dt_size + band * dt_size + k] != got_nbands_data_native_type_custom_spacings[(y * xsize + x) * 2 * nbands * dt_size + band * dt_size + k]:
                                             print(gdal.GetDataTypeName(dt))
                                             print(option)
-                                            print(i)
-                                            print(x, y, k, band)
-                                            return 'fail'
+                                            pytest.fail(i)
                                     if nbands == 3:
                                         for band in range(nbands):
                                             if ref_nbands_data_native_type_custom_spacings_2[(y * xsize + x) * 4 * dt_size + band * dt_size + k] != got_nbands_data_native_type_custom_spacings_2[(y * xsize + x) * 4 * dt_size + band * dt_size + k]:
                                                 print(gdal.GetDataTypeName(dt))
                                                 print(option)
-                                                print(i)
-                                                print(x, y, k, band)
-                                                return 'fail'
+                                                pytest.fail(i)
 
                     if ref_data_float32 != got_data_float32:
                         print(gdal.GetDataTypeName(dt))
                         print(option)
-                        print(i)
-                        return 'fail'
+                        pytest.fail(i)
 
                     if not truncated and ref_nbands_data_native_type != got_nbands_data_native_type:
-                        print(truncated)
                         print(band_interleaved)
                         print(option)
-                        print(i)
-                        return 'fail'
+                        pytest.fail(i)
 
                     if truncated:
                         if got_nbands_data_native_type_whole is not None:
                             print(gdal.GetDataTypeName(dt))
                             print(option)
-                            print(i)
-                            return 'fail'
+                            pytest.fail(i)
                     elif ref_nbands_data_native_type_whole != got_nbands_data_native_type_whole:
                         print(gdal.GetDataTypeName(dt))
                         print(option)
@@ -1698,8 +1538,7 @@ def test_tiff_direct_and_virtual_mem_io():
                     if truncated:
                         if got_nbands_data_native_type_pixel_interleaved_whole is not None:
                             print(option)
-                            print(i)
-                            return 'fail'
+                            pytest.fail(i)
                     elif ref_nbands_data_native_type_pixel_interleaved_whole != got_nbands_data_native_type_pixel_interleaved_whole:
                         print(option)
                         print(i)
@@ -1708,30 +1547,25 @@ def test_tiff_direct_and_virtual_mem_io():
                     if truncated and got_nbands_data_native_type_bottom_right_downsampled is not None:
                         print(gdal.GetDataTypeName(dt))
                         print(option)
-                        print(i)
-                        return 'fail'
+                        pytest.fail(i)
 
                     if truncated:
                         continue
 
                     if ref_nbands_data_native_type_downsampled != got_nbands_data_native_type_downsampled:
                         print(option)
-                        print(i)
-                        return 'fail'
+                        pytest.fail(i)
 
                     if ref_nbands_data_native_type_downsampled_interleaved != got_nbands_data_native_type_downsampled_interleaved:
                         print(option)
-                        print(i)
-                        return 'fail'
+                        pytest.fail(i)
 
                     if ref_nbands_data_native_type_downsampled_not_nearest != got_nbands_data_native_type_downsampled_not_nearest:
                         print(option)
-                        print(i)
-                        return 'fail'
+                        pytest.fail(i)
 
                     if ref_nbands_data_native_type_upsampled != got_nbands_data_native_type_upsampled:
                         print(option)
-                        print(i)
                         # import struct
                         # f1 = open('out1.txt', 'wb')
                         # f2 = open('out2.txt', 'wb')
@@ -1739,11 +1573,10 @@ def test_tiff_direct_and_virtual_mem_io():
                         #    for y in range(4 * ysize):
                         #        f1.write('%s\n' % str(struct.unpack('B' * 4 * xsize, ref_nbands_data_native_type_upsampled[(b * 4 * ysize + y) * 4 * xsize : (b * 4 * ysize + y + 1) * 4 * xsize])))
                         #        f2.write('%s\n' % str(struct.unpack('B' * 4 * xsize, got_nbands_data_native_type_upsampled[(b * 4 * ysize + y) * 4 * xsize : (b * 4 * ysize + y + 1) * 4 * xsize])))
-                        return 'fail'
+                        pytest.fail(i)
 
                     if ref_nbands_data_native_type_downsampled_x_upsampled_y != got_nbands_data_native_type_downsampled_x_upsampled_y:
                         print(option)
-                        print(i)
                         # import struct
                         # f1 = open('out1.txt', 'wb')
                         # f2 = open('out2.txt', 'wb')
@@ -1751,17 +1584,15 @@ def test_tiff_direct_and_virtual_mem_io():
                         #    for y in range(32 * ysize):
                         #        f1.write('%s\n' % str(struct.unpack('B' * int(xsize/2), ref_nbands_data_native_type_downsampled_x_upsampled_y[(b * 32 * ysize + y) * int(xsize/2) : (b * 32 * ysize + y + 1) * int(xsize/2)])))
                         #        f2.write('%s\n' % str(struct.unpack('B' * int(xsize/2), got_nbands_data_native_type_downsampled_x_upsampled_y[(b * 32 * ysize + y) * int(xsize/2) : (b * 32 * ysize + y + 1) * int(xsize/2)])))
-                        return 'fail'
+                        pytest.fail(i)
 
                     if ref_nbands_data_native_type_unordered_list != got_nbands_data_native_type_unordered_list:
                         print(option)
-                        print(i)
-                        return 'fail'
+                        pytest.fail(i)
 
                     if ref_nbands_data_native_type_pixel_interleaved != got_nbands_data_native_type_pixel_interleaved:
                         print(option)
-                        print(i)
-                        return 'fail'
+                        pytest.fail(i)
 
                     for y in range(ysize):
                         for x in range(xsize):
@@ -1769,29 +1600,22 @@ def test_tiff_direct_and_virtual_mem_io():
                                 for k in range(dt_size):
                                     if ref_nbands_m_1_data_native_type_pixel_interleaved_with_extra_space[((y * xsize + x) * nbands + b) * dt_size + k] != got_nbands_m_1_data_native_type_pixel_interleaved_with_extra_space[((y * xsize + x) * nbands + b) * dt_size + k]:
                                         print(option)
-                                        print(i)
-                                        print(y)
-                                        print(x)
-                                        print(b)
-                                        return 'fail'
+                                        pytest.fail(i)
 
                     if ref_nbands_data_float32 != got_nbands_data_float32:
                         print(option)
-                        print(i)
-                        return 'fail'
+                        pytest.fail(i)
 
                     if ref_nbands_data_float32_pixel_interleaved != got_nbands_data_float32_pixel_interleaved:
                         print(option)
-                        print(i)
-                        return 'fail'
+                        pytest.fail(i)
 
     ds = gdal.Open('data/byte.tif')  # any GTiff file will do
     unreached = ds.GetMetadataItem('UNREACHED_VIRTUALMEMIO_CODE_PATH', '_DEBUG_')
     ds = None
     if unreached:
-        gdaltest.post_reason('missing code coverage in VirtualMemIO()')
         print('unreached = %s' % unreached)
-        return 'fail'
+        pytest.fail('missing code coverage in VirtualMemIO()')
 
     return 'success'
 
@@ -1809,30 +1633,20 @@ def test_tiff_read_md1():
     ds = gdal.Open('data/md_dg.tif', gdal.GA_ReadOnly)
     filelist = ds.GetFileList()
 
-    if len(filelist) != 3:
-        gdaltest.post_reason('did not get expected file list.')
-        return 'fail'
+    assert len(filelist) == 3, 'did not get expected file list.'
 
     metadata = ds.GetMetadataDomainList()
-    if len(metadata) != 6:
-        gdaltest.post_reason('did not get expected metadata list.')
-        return 'fail'
+    assert len(metadata) == 6, 'did not get expected metadata list.'
 
     md = ds.GetMetadata('IMAGERY')
-    if 'SATELLITEID' not in md:
-        print('SATELLITEID not present in IMAGERY Domain')
-        return 'fail'
-    if 'CLOUDCOVER' not in md:
-        print('CLOUDCOVER not present in IMAGERY Domain')
-        return 'fail'
-    if 'ACQUISITIONDATETIME' not in md:
-        print('ACQUISITIONDATETIME not present in IMAGERY Domain')
-        return 'fail'
+    assert 'SATELLITEID' in md, 'SATELLITEID not present in IMAGERY Domain'
+    assert 'CLOUDCOVER' in md, 'CLOUDCOVER not present in IMAGERY Domain'
+    assert 'ACQUISITIONDATETIME' in md, \
+        'ACQUISITIONDATETIME not present in IMAGERY Domain'
 
     # Test UTC date
-    if md['ACQUISITIONDATETIME'] != '2010-04-01 12:00:00':
-        print('bad value for IMAGERY[ACQUISITIONDATETIME]')
-        return 'fail'
+    assert md['ACQUISITIONDATETIME'] == '2010-04-01 12:00:00', \
+        'bad value for IMAGERY[ACQUISITIONDATETIME]'
 
     ds = None
 
@@ -1859,30 +1673,20 @@ def test_tiff_read_md2():
     ds = gdal.Open('data/md_dg_2.tif', gdal.GA_ReadOnly)
     filelist = ds.GetFileList()
 
-    if len(filelist) != 2:
-        gdaltest.post_reason('did not get expected file list.')
-        return 'fail'
+    assert len(filelist) == 2, 'did not get expected file list.'
 
     metadata = ds.GetMetadataDomainList()
-    if len(metadata) != 6:
-        gdaltest.post_reason('did not get expected metadata list.')
-        return 'fail'
+    assert len(metadata) == 6, 'did not get expected metadata list.'
 
     md = ds.GetMetadata('IMAGERY')
-    if 'SATELLITEID' not in md:
-        print('SATELLITEID not present in IMAGERY Domain')
-        return 'fail'
-    if 'CLOUDCOVER' not in md:
-        print('CLOUDCOVER not present in IMAGERY Domain')
-        return 'fail'
-    if 'ACQUISITIONDATETIME' not in md:
-        print('ACQUISITIONDATETIME not present in IMAGERY Domain')
-        return 'fail'
+    assert 'SATELLITEID' in md, 'SATELLITEID not present in IMAGERY Domain'
+    assert 'CLOUDCOVER' in md, 'CLOUDCOVER not present in IMAGERY Domain'
+    assert 'ACQUISITIONDATETIME' in md, \
+        'ACQUISITIONDATETIME not present in IMAGERY Domain'
 
     # Test UTC date
-    if md['ACQUISITIONDATETIME'] != '2011-05-01 13:00:00':
-        print('bad value for IMAGERY[ACQUISITIONDATETIME]')
-        return 'fail'
+    assert md['ACQUISITIONDATETIME'] == '2011-05-01 13:00:00', \
+        'bad value for IMAGERY[ACQUISITIONDATETIME]'
 
     ds = None
 
@@ -1909,30 +1713,20 @@ def test_tiff_read_md3():
     ds = gdal.Open('data/md_ge_rgb_0010000.tif', gdal.GA_ReadOnly)
     filelist = ds.GetFileList()
 
-    if len(filelist) != 3:
-        gdaltest.post_reason('did not get expected file list.')
-        return 'fail'
+    assert len(filelist) == 3, 'did not get expected file list.'
 
     metadata = ds.GetMetadataDomainList()
-    if len(metadata) != 6:
-        gdaltest.post_reason('did not get expected metadata list.')
-        return 'fail'
+    assert len(metadata) == 6, 'did not get expected metadata list.'
 
     md = ds.GetMetadata('IMAGERY')
-    if 'SATELLITEID' not in md:
-        print('SATELLITEID not present in IMAGERY Domain')
-        return 'fail'
-    if 'CLOUDCOVER' not in md:
-        print('CLOUDCOVER not present in IMAGERY Domain')
-        return 'fail'
-    if 'ACQUISITIONDATETIME' not in md:
-        print('ACQUISITIONDATETIME not present in IMAGERY Domain')
-        return 'fail'
+    assert 'SATELLITEID' in md, 'SATELLITEID not present in IMAGERY Domain'
+    assert 'CLOUDCOVER' in md, 'CLOUDCOVER not present in IMAGERY Domain'
+    assert 'ACQUISITIONDATETIME' in md, \
+        'ACQUISITIONDATETIME not present in IMAGERY Domain'
 
     # Test UTC date
-    if md['ACQUISITIONDATETIME'] != '2012-06-01 14:00:00':
-        print('bad value for IMAGERY[ACQUISITIONDATETIME]')
-        return 'fail'
+    assert md['ACQUISITIONDATETIME'] == '2012-06-01 14:00:00', \
+        'bad value for IMAGERY[ACQUISITIONDATETIME]'
 
     ds = None
 
@@ -1959,30 +1753,20 @@ def test_tiff_read_md4():
     ds = gdal.Open('data/md_ov.tif', gdal.GA_ReadOnly)
     filelist = ds.GetFileList()
 
-    if len(filelist) != 3:
-        gdaltest.post_reason('did not get expected file list.')
-        return 'fail'
+    assert len(filelist) == 3, 'did not get expected file list.'
 
     metadata = ds.GetMetadataDomainList()
-    if len(metadata) != 6:
-        gdaltest.post_reason('did not get expected metadata list.')
-        return 'fail'
+    assert len(metadata) == 6, 'did not get expected metadata list.'
 
     md = ds.GetMetadata('IMAGERY')
-    if 'SATELLITEID' not in md:
-        print('SATELLITEID not present in IMAGERY Domain')
-        return 'fail'
-    if 'CLOUDCOVER' not in md:
-        print('CLOUDCOVER not present in IMAGERY Domain')
-        return 'fail'
-    if 'ACQUISITIONDATETIME' not in md:
-        print('ACQUISITIONDATETIME not present in IMAGERY Domain')
-        return 'fail'
+    assert 'SATELLITEID' in md, 'SATELLITEID not present in IMAGERY Domain'
+    assert 'CLOUDCOVER' in md, 'CLOUDCOVER not present in IMAGERY Domain'
+    assert 'ACQUISITIONDATETIME' in md, \
+        'ACQUISITIONDATETIME not present in IMAGERY Domain'
 
     # Test UTC date
-    if md['ACQUISITIONDATETIME'] != '2013-07-01 15:00:00':
-        print('bad value for IMAGERY[ACQUISITIONDATETIME]')
-        return 'fail'
+    assert md['ACQUISITIONDATETIME'] == '2013-07-01 15:00:00', \
+        'bad value for IMAGERY[ACQUISITIONDATETIME]'
 
     ds = None
 
@@ -2009,30 +1793,20 @@ def test_tiff_read_md5():
     ds = gdal.Open('data/md_rdk1.tif', gdal.GA_ReadOnly)
     filelist = ds.GetFileList()
 
-    if len(filelist) != 2:
-        gdaltest.post_reason('did not get expected file list.')
-        return 'fail'
+    assert len(filelist) == 2, 'did not get expected file list.'
 
     metadata = ds.GetMetadataDomainList()
-    if len(metadata) != 5:
-        gdaltest.post_reason('did not get expected metadata list.')
-        return 'fail'
+    assert len(metadata) == 5, 'did not get expected metadata list.'
 
     md = ds.GetMetadata('IMAGERY')
-    if 'SATELLITEID' not in md:
-        print('SATELLITEID not present in IMAGERY Domain')
-        return 'fail'
-    if 'CLOUDCOVER' not in md:
-        print('CLOUDCOVER not present in IMAGERY Domain')
-        return 'fail'
-    if 'ACQUISITIONDATETIME' not in md:
-        print('ACQUISITIONDATETIME not present in IMAGERY Domain')
-        return 'fail'
+    assert 'SATELLITEID' in md, 'SATELLITEID not present in IMAGERY Domain'
+    assert 'CLOUDCOVER' in md, 'CLOUDCOVER not present in IMAGERY Domain'
+    assert 'ACQUISITIONDATETIME' in md, \
+        'ACQUISITIONDATETIME not present in IMAGERY Domain'
 
     # Test UTC date
-    if md['ACQUISITIONDATETIME'] != '2014-08-01 16:00:00':
-        print('bad value for IMAGERY[ACQUISITIONDATETIME]')
-        return 'fail'
+    assert md['ACQUISITIONDATETIME'] == '2014-08-01 16:00:00', \
+        'bad value for IMAGERY[ACQUISITIONDATETIME]'
 
     ds = None
 
@@ -2059,30 +1833,20 @@ def test_tiff_read_md6():
     ds = gdal.Open('data/md_ls_b1.tif', gdal.GA_ReadOnly)
     filelist = ds.GetFileList()
 
-    if len(filelist) != 2:
-        gdaltest.post_reason('did not get expected file list.')
-        return 'fail'
+    assert len(filelist) == 2, 'did not get expected file list.'
 
     metadata = ds.GetMetadataDomainList()
-    if len(metadata) != 5:
-        gdaltest.post_reason('did not get expected metadata list.')
-        return 'fail'
+    assert len(metadata) == 5, 'did not get expected metadata list.'
 
     md = ds.GetMetadata('IMAGERY')
-    if 'SATELLITEID' not in md:
-        print('SATELLITEID not present in IMAGERY Domain')
-        return 'fail'
-    if 'CLOUDCOVER' not in md:
-        print('CLOUDCOVER not present in IMAGERY Domain')
-        return 'fail'
-    if 'ACQUISITIONDATETIME' not in md:
-        print('ACQUISITIONDATETIME not present in IMAGERY Domain')
-        return 'fail'
+    assert 'SATELLITEID' in md, 'SATELLITEID not present in IMAGERY Domain'
+    assert 'CLOUDCOVER' in md, 'CLOUDCOVER not present in IMAGERY Domain'
+    assert 'ACQUISITIONDATETIME' in md, \
+        'ACQUISITIONDATETIME not present in IMAGERY Domain'
 
     # Test UTC date
-    if md['ACQUISITIONDATETIME'] != '2015-09-01 17:00:00':
-        print('bad value for IMAGERY[ACQUISITIONDATETIME]')
-        return 'fail'
+    assert md['ACQUISITIONDATETIME'] == '2015-09-01 17:00:00', \
+        'bad value for IMAGERY[ACQUISITIONDATETIME]'
 
     ds = None
 
@@ -2109,30 +1873,20 @@ def test_tiff_read_md7():
     ds = gdal.Open('data/spot/md_spot.tif', gdal.GA_ReadOnly)
     filelist = ds.GetFileList()
 
-    if len(filelist) != 2:
-        gdaltest.post_reason('did not get expected file list.')
-        return 'fail'
+    assert len(filelist) == 2, 'did not get expected file list.'
 
     metadata = ds.GetMetadataDomainList()
-    if len(metadata) != 5:
-        gdaltest.post_reason('did not get expected metadata list.')
-        return 'fail'
+    assert len(metadata) == 5, 'did not get expected metadata list.'
 
     md = ds.GetMetadata('IMAGERY')
-    if 'SATELLITEID' not in md:
-        print('SATELLITEID not present in IMAGERY Domain')
-        return 'fail'
-    if 'CLOUDCOVER' not in md:
-        print('CLOUDCOVER not present in IMAGERY Domain')
-        return 'fail'
-    if 'ACQUISITIONDATETIME' not in md:
-        print('ACQUISITIONDATETIME not present in IMAGERY Domain')
-        return 'fail'
+    assert 'SATELLITEID' in md, 'SATELLITEID not present in IMAGERY Domain'
+    assert 'CLOUDCOVER' in md, 'CLOUDCOVER not present in IMAGERY Domain'
+    assert 'ACQUISITIONDATETIME' in md, \
+        'ACQUISITIONDATETIME not present in IMAGERY Domain'
 
     # Test UTC date
-    if md['ACQUISITIONDATETIME'] != '2001-03-01 00:00:00':
-        print('bad value for IMAGERY[ACQUISITIONDATETIME]')
-        return 'fail'
+    assert md['ACQUISITIONDATETIME'] == '2001-03-01 00:00:00', \
+        'bad value for IMAGERY[ACQUISITIONDATETIME]'
 
     ds = None
 
@@ -2159,30 +1913,20 @@ def test_tiff_read_md8():
     ds = gdal.Open('data/md_re.tif', gdal.GA_ReadOnly)
     filelist = ds.GetFileList()
 
-    if len(filelist) != 2:
-        gdaltest.post_reason('did not get expected file list.')
-        return 'fail'
+    assert len(filelist) == 2, 'did not get expected file list.'
 
     metadata = ds.GetMetadataDomainList()
-    if len(metadata) != 5:
-        gdaltest.post_reason('did not get expected metadata list.')
-        return 'fail'
+    assert len(metadata) == 5, 'did not get expected metadata list.'
 
     md = ds.GetMetadata('IMAGERY')
-    if 'SATELLITEID' not in md:
-        print('SATELLITEID not present in IMAGERY Domain')
-        return 'fail'
-    if 'CLOUDCOVER' not in md:
-        print('CLOUDCOVER not present in IMAGERY Domain')
-        return 'fail'
-    if 'ACQUISITIONDATETIME' not in md:
-        print('ACQUISITIONDATETIME not present in IMAGERY Domain')
-        return 'fail'
+    assert 'SATELLITEID' in md, 'SATELLITEID not present in IMAGERY Domain'
+    assert 'CLOUDCOVER' in md, 'CLOUDCOVER not present in IMAGERY Domain'
+    assert 'ACQUISITIONDATETIME' in md, \
+        'ACQUISITIONDATETIME not present in IMAGERY Domain'
 
     # Test UTC date
-    if md['ACQUISITIONDATETIME'] != '2010-02-01 12:00:00':
-        print('bad value for IMAGERY[ACQUISITIONDATETIME]')
-        return 'fail'
+    assert md['ACQUISITIONDATETIME'] == '2010-02-01 12:00:00', \
+        'bad value for IMAGERY[ACQUISITIONDATETIME]'
 
     ds = None
 
@@ -2209,27 +1953,19 @@ def test_tiff_read_md9():
     ds = gdal.Open('data/alos/IMG-md_alos.tif', gdal.GA_ReadOnly)
     filelist = ds.GetFileList()
 
-    if len(filelist) != 3:
-        gdaltest.post_reason('did not get expected file list.')
-        return 'fail'
+    assert len(filelist) == 3, 'did not get expected file list.'
 
     metadata = ds.GetMetadataDomainList()
-    if len(metadata) != 6:
-        gdaltest.post_reason('did not get expected metadata list.')
-        return 'fail'
+    assert len(metadata) == 6, 'did not get expected metadata list.'
 
     md = ds.GetMetadata('IMAGERY')
-    if 'SATELLITEID' not in md:
-        print('SATELLITEID not present in IMAGERY Domain')
-        return 'fail'
-    if 'ACQUISITIONDATETIME' not in md:
-        print('ACQUISITIONDATETIME not present in IMAGERY Domain')
-        return 'fail'
+    assert 'SATELLITEID' in md, 'SATELLITEID not present in IMAGERY Domain'
+    assert 'ACQUISITIONDATETIME' in md, \
+        'ACQUISITIONDATETIME not present in IMAGERY Domain'
 
     # Test UTC date
-    if md['ACQUISITIONDATETIME'] != '2010-07-01 00:00:00':
-        print('bad value for IMAGERY[ACQUISITIONDATETIME]')
-        return 'fail'
+    assert md['ACQUISITIONDATETIME'] == '2010-07-01 00:00:00', \
+        'bad value for IMAGERY[ACQUISITIONDATETIME]'
 
     ds = None
 
@@ -2256,30 +1992,20 @@ def test_tiff_read_md10():
     ds = gdal.Open('data/md_eros.tif', gdal.GA_ReadOnly)
     filelist = ds.GetFileList()
 
-    if len(filelist) != 3:
-        gdaltest.post_reason('did not get expected file list.')
-        return 'fail'
+    assert len(filelist) == 3, 'did not get expected file list.'
 
     metadata = ds.GetMetadataDomainList()
-    if len(metadata) != 6:
-        gdaltest.post_reason('did not get expected metadata list.')
-        return 'fail'
+    assert len(metadata) == 6, 'did not get expected metadata list.'
 
     md = ds.GetMetadata('IMAGERY')
-    if 'SATELLITEID' not in md:
-        print('SATELLITEID not present in IMAGERY Domain')
-        return 'fail'
-    if 'CLOUDCOVER' not in md:
-        print('CLOUDCOVER not present in IMAGERY Domain')
-        return 'fail'
-    if 'ACQUISITIONDATETIME' not in md:
-        print('ACQUISITIONDATETIME not present in IMAGERY Domain')
-        return 'fail'
+    assert 'SATELLITEID' in md, 'SATELLITEID not present in IMAGERY Domain'
+    assert 'CLOUDCOVER' in md, 'CLOUDCOVER not present in IMAGERY Domain'
+    assert 'ACQUISITIONDATETIME' in md, \
+        'ACQUISITIONDATETIME not present in IMAGERY Domain'
 
     # Test UTC date
-    if md['ACQUISITIONDATETIME'] != '2013-04-01 11:00:00':
-        print('bad value for IMAGERY[ACQUISITIONDATETIME]')
-        return 'fail'
+    assert md['ACQUISITIONDATETIME'] == '2013-04-01 11:00:00', \
+        'bad value for IMAGERY[ACQUISITIONDATETIME]'
 
     ds = None
 
@@ -2306,30 +2032,20 @@ def test_tiff_read_md11():
     ds = gdal.Open('data/md_kompsat.tif', gdal.GA_ReadOnly)
     filelist = ds.GetFileList()
 
-    if len(filelist) != 3:
-        gdaltest.post_reason('did not get expected file list.')
-        return 'fail'
+    assert len(filelist) == 3, 'did not get expected file list.'
 
     metadata = ds.GetMetadataDomainList()
-    if len(metadata) != 6:
-        gdaltest.post_reason('did not get expected metadata list.')
-        return 'fail'
+    assert len(metadata) == 6, 'did not get expected metadata list.'
 
     md = ds.GetMetadata('IMAGERY')
-    if 'SATELLITEID' not in md:
-        print('SATELLITEID not present in IMAGERY Domain')
-        return 'fail'
-    if 'CLOUDCOVER' not in md:
-        print('CLOUDCOVER not present in IMAGERY Domain')
-        return 'fail'
-    if 'ACQUISITIONDATETIME' not in md:
-        print('ACQUISITIONDATETIME not present in IMAGERY Domain')
-        return 'fail'
+    assert 'SATELLITEID' in md, 'SATELLITEID not present in IMAGERY Domain'
+    assert 'CLOUDCOVER' in md, 'CLOUDCOVER not present in IMAGERY Domain'
+    assert 'ACQUISITIONDATETIME' in md, \
+        'ACQUISITIONDATETIME not present in IMAGERY Domain'
 
     # Test UTC date
-    if md['ACQUISITIONDATETIME'] != '2007-05-01 07:00:00':
-        print('bad value for IMAGERY[ACQUISITIONDATETIME]')
-        return 'fail'
+    assert md['ACQUISITIONDATETIME'] == '2007-05-01 07:00:00', \
+        'bad value for IMAGERY[ACQUISITIONDATETIME]'
 
     ds = None
 
@@ -2351,37 +2067,24 @@ def test_tiff_read_md12():
     ds = gdal.Open('../gdrivers/data/dimap2/IMG_foo_R2C1.TIF', gdal.GA_ReadOnly)
     filelist = ds.GetFileList()
 
-    if len(filelist) != 3:
-        gdaltest.post_reason('did not get expected file list.')
-        return 'fail'
+    assert len(filelist) == 3, 'did not get expected file list.'
 
     metadata = ds.GetMetadataDomainList()
-    if len(metadata) != 6:
-        gdaltest.post_reason('did not get expected metadata list.')
-        return 'fail'
+    assert len(metadata) == 6, 'did not get expected metadata list.'
 
     md = ds.GetMetadata('IMAGERY')
-    if 'SATELLITEID' not in md:
-        print('SATELLITEID not present in IMAGERY Domain')
-        return 'fail'
-    if 'CLOUDCOVER' not in md:
-        print('CLOUDCOVER not present in IMAGERY Domain')
-        return 'fail'
-    if 'ACQUISITIONDATETIME' not in md:
-        print('ACQUISITIONDATETIME not present in IMAGERY Domain')
-        return 'fail'
+    assert 'SATELLITEID' in md, 'SATELLITEID not present in IMAGERY Domain'
+    assert 'CLOUDCOVER' in md, 'CLOUDCOVER not present in IMAGERY Domain'
+    assert 'ACQUISITIONDATETIME' in md, \
+        'ACQUISITIONDATETIME not present in IMAGERY Domain'
 
     # Test UTC date
-    if md['ACQUISITIONDATETIME'] != '2016-06-17 12:34:56':
-        print('bad value for IMAGERY[ACQUISITIONDATETIME]')
-        return 'fail'
+    assert md['ACQUISITIONDATETIME'] == '2016-06-17 12:34:56', \
+        'bad value for IMAGERY[ACQUISITIONDATETIME]'
 
     # Test RPC and that we have a LINE_OFF shift
     rpc = ds.GetMetadata('RPC')
-    if rpc['LINE_OFF'] != '-11':
-        gdaltest.post_reason('RPC wrong.')
-        print(rpc)
-        return 'fail'
+    assert rpc['LINE_OFF'] == '-11', 'RPC wrong.'
 
     ds = None
 
@@ -2403,9 +2106,7 @@ def test_tiff_read_md12():
     gdal.Unlink('tmp/DIM_foo.XML')
     gdal.Unlink('tmp/RPC_foo.XML')
 
-    if len(filelist) > 1:
-        gdaltest.post_reason('did not get expected file list.')
-        return 'fail'
+    assert len(filelist) <= 1, 'did not get expected file list.'
 
     return 'success'
 
@@ -2416,9 +2117,7 @@ def test_tiff_read_md12():
 def test_tiff_read_empty_nodata_tag():
 
     ds = gdal.Open('data/empty_nodata.tif')
-    if ds.GetRasterBand(1).GetNoDataValue() is not None:
-        print(ds.GetRasterBand(1).GetNoDataValue())
-        return 'fail'
+    assert ds.GetRasterBand(1).GetNoDataValue() is None
 
     return 'success'
 
@@ -2451,9 +2150,7 @@ def test_tiff_read_strace_check():
         if line.find('../gcore') >= 0:
             lines_with_dotdot_gcore += [line]
 
-    if len(lines_with_dotdot_gcore) != 1:
-        print(lines_with_dotdot_gcore)
-        return 'fail'
+    assert len(lines_with_dotdot_gcore) == 1
 
     return 'success'
 
@@ -2470,9 +2167,7 @@ def test_tiff_read_readdir_limit_on_open():
 
     gdal.SetConfigOption('GDAL_READDIR_LIMIT_ON_OPEN', None)
 
-    if len(filelist) != 3:
-        gdaltest.post_reason('did not get expected file list.')
-        return 'fail'
+    assert len(filelist) == 3, 'did not get expected file list.'
 
     return 'success'
 
@@ -2489,9 +2184,7 @@ def test_tiff_read_minisblack_as_rgba():
     ds = gdal.Open('data/byte.tif')
     gdal.SetConfigOption('GTIFF_FORCE_RGBA', None)
     got_cs = [ds.GetRasterBand(i + 1).Checksum() for i in range(ds.RasterCount)]
-    if got_cs != [4672, 4672, 4672, 4873]:
-        print(got_cs)
-        return 'fail'
+    assert got_cs == [4672, 4672, 4672, 4873]
     ds = None
 
     return 'success'
@@ -2509,9 +2202,7 @@ def test_tiff_read_colortable_as_rgba():
     ds = gdal.Open('data/test_average_palette.tif')
     gdal.SetConfigOption('GTIFF_FORCE_RGBA', None)
     got_cs = [ds.GetRasterBand(i + 1).Checksum() for i in range(ds.RasterCount)]
-    if got_cs != [2433, 2433, 2433, 4873]:
-        print(got_cs)
-        return 'fail'
+    assert got_cs == [2433, 2433, 2433, 4873]
     ds = None
 
     return 'success'
@@ -2530,9 +2221,7 @@ def test_tiff_read_logl_as_rgba():
     gdal.SetConfigOption('GTIFF_FORCE_RGBA', None)
     got_cs = [ds.GetRasterBand(i + 1).Checksum() for i in range(ds.RasterCount)]
     # I'm pretty sure this isn't the expected result...
-    if got_cs != [0, 0, 0, 4873]:
-        print(got_cs)
-        return 'fail'
+    assert got_cs == [0, 0, 0, 4873]
     ds = None
 
     return 'success'
@@ -2554,9 +2243,7 @@ def test_tiff_read_strip_separate_as_rgba():
     ds = gdal.Open('/vsimem/tiff_read_strip_separate_as_rgba.tif')
     gdal.SetConfigOption('GTIFF_FORCE_RGBA', None)
     got_cs = [ds.GetRasterBand(i + 1).Checksum() for i in range(ds.RasterCount)]
-    if got_cs != [21212, 21053, 21349, 30658]:
-        print(got_cs)
-        return 'fail'
+    assert got_cs == [21212, 21053, 21349, 30658]
     ds = None
 
     gdal.Unlink('/vsimem/tiff_read_strip_separate_as_rgba.tif')
@@ -2570,9 +2257,7 @@ def test_tiff_read_strip_separate_as_rgba():
     ds = gdal.Open('/vsimem/tiff_read_strip_separate_as_rgba.tif')
     gdal.SetConfigOption('GTIFF_FORCE_RGBA', None)
     got_cs = [ds.GetRasterBand(i + 1).Checksum() for i in range(ds.RasterCount)]
-    if got_cs != [21212, 21212, 21212, 30658]:
-        print(got_cs)
-        return 'fail'
+    assert got_cs == [21212, 21212, 21212, 30658]
     ds = None
 
     gdal.Unlink('/vsimem/tiff_read_strip_separate_as_rgba.tif')
@@ -2596,9 +2281,7 @@ def test_tiff_read_tiled_separate_as_rgba():
     ds = gdal.Open('/vsimem/tiff_read_tiled_separate_as_rgba.tif')
     gdal.SetConfigOption('GTIFF_FORCE_RGBA', None)
     got_cs = [ds.GetRasterBand(i + 1).Checksum() for i in range(ds.RasterCount)]
-    if got_cs != [21212, 21053, 21349, 30658]:
-        print(got_cs)
-        return 'fail'
+    assert got_cs == [21212, 21053, 21349, 30658]
     ds = None
 
     gdal.Unlink('/vsimem/tiff_read_tiled_separate_as_rgba.tif')
@@ -2611,9 +2294,7 @@ def test_tiff_read_tiled_separate_as_rgba():
     ds = gdal.Open('/vsimem/tiff_read_tiled_separate_as_rgba.tif')
     gdal.SetConfigOption('GTIFF_FORCE_RGBA', None)
     got_cs = [ds.GetRasterBand(i + 1).Checksum() for i in range(ds.RasterCount)]
-    if got_cs != [4672, 4672, 4672, 4873]:
-        print(got_cs)
-        return 'fail'
+    assert got_cs == [4672, 4672, 4672, 4873]
     ds = None
 
     gdal.Unlink('/vsimem/tiff_read_tiled_separate_as_rgba.tif')
@@ -2628,8 +2309,7 @@ def test_tiff_read_scanline_more_than_2GB():
 
     with gdaltest.error_handler():
         ds = gdal.Open('data/scanline_more_than_2GB.tif')
-    if ds is not None:
-        return 'fail'
+    assert ds is None
     return 'success'
 
 ###############################################################################
@@ -2642,12 +2322,8 @@ def test_tiff_read_wrong_number_extrasamples():
     gdal.ErrorReset()
     with gdaltest.error_handler():
         ds = gdal.Open('data/6band_wrong_number_extrasamples.tif')
-    if gdal.GetLastErrorMsg().find('Wrong number of ExtraSamples') < 0:
-        print(gdal.GetLastErrorMsg())
-        return 'fail'
-    if ds.GetRasterBand(6).GetRasterColorInterpretation() != gdal.GCI_AlphaBand:
-        print(ds.GetRasterBand(6).GetRasterColorInterpretation())
-        return 'fail'
+    assert gdal.GetLastErrorMsg().find('Wrong number of ExtraSamples') >= 0
+    assert ds.GetRasterBand(6).GetRasterColorInterpretation() == gdal.GCI_AlphaBand
 
     return 'success'
 
@@ -2660,9 +2336,7 @@ def test_tiff_read_one_strip_no_bytecount():
     gdal.PushErrorHandler('CPLQuietErrorHandler')
     ds = gdal.Open('data/one_strip_nobytecount.tif')
     gdal.PopErrorHandler()
-    if ds.GetRasterBand(1).Checksum() != 1:
-        print(ds.GetRasterBand(1).Checksum())
-        return 'fail'
+    assert ds.GetRasterBand(1).Checksum() == 1
 
     return 'success'
 
@@ -2722,16 +2396,14 @@ def test_tiff_read_nogeoref():
             gdal.Unlink('/vsimem/byte_nogeoref.tab')
 
             if gt != expected_gt:
-                gdaltest.post_reason('Iteration %d, did not get expected gt for %s,copy_pam=%s,copy_worldfile=%s,copy_tabfile=%s' % (iteration, config_option_value, str(copy_pam), str(copy_worldfile), str(copy_tabfile)))
                 print('Got ' + str(gt))
                 print('Expected ' + str(expected_gt))
-                return 'fail'
+                pytest.fail('Iteration %d, did not get expected gt for %s,copy_pam=%s,copy_worldfile=%s,copy_tabfile=%s' % (iteration, config_option_value, str(copy_pam), str(copy_worldfile), str(copy_tabfile)))
 
             if (expected_srs == '' and srs_wkt != '') or (expected_srs != '' and srs_wkt.find(expected_srs) < 0):
-                gdaltest.post_reason('Iteration %d, did not get expected SRS for %s,copy_pam=%s,copy_worldfile=%s,copy_tabfile=%s' % (iteration, config_option_value, str(copy_pam), str(copy_worldfile), str(copy_tabfile)))
                 print('Got ' + srs_wkt)
                 print('Expected ' + expected_srs)
-                return 'fail'
+                pytest.fail('Iteration %d, did not get expected SRS for %s,copy_pam=%s,copy_worldfile=%s,copy_tabfile=%s' % (iteration, config_option_value, str(copy_pam), str(copy_worldfile), str(copy_tabfile)))
 
     return 'success'
 
@@ -2783,16 +2455,14 @@ def test_tiff_read_inconsistent_georef():
             gdal.Unlink('/vsimem/byte_inconsistent_georef.tab')
 
             if gt != expected_gt:
-                gdaltest.post_reason('Iteration %d, did not get expected gt for %s,copy_pam=%s,copy_worldfile=%s,copy_tabfile=%s' % (iteration, config_option_value, str(copy_pam), str(copy_worldfile), str(copy_tabfile)))
                 print('Got ' + str(gt))
                 print('Expected ' + str(expected_gt))
-                return 'fail'
+                pytest.fail('Iteration %d, did not get expected gt for %s,copy_pam=%s,copy_worldfile=%s,copy_tabfile=%s' % (iteration, config_option_value, str(copy_pam), str(copy_worldfile), str(copy_tabfile)))
 
             if (expected_srs == '' and srs_wkt != '') or (expected_srs != '' and srs_wkt.find(expected_srs) < 0):
-                gdaltest.post_reason('Iteration %d, did not get expected SRS for %s,copy_pam=%s,copy_worldfile=%s,copy_tabfile=%s' % (iteration, config_option_value, str(copy_pam), str(copy_worldfile), str(copy_tabfile)))
                 print('Got ' + srs_wkt)
                 print('Expected ' + expected_srs)
-                return 'fail'
+                pytest.fail('Iteration %d, did not get expected SRS for %s,copy_pam=%s,copy_worldfile=%s,copy_tabfile=%s' % (iteration, config_option_value, str(copy_pam), str(copy_worldfile), str(copy_tabfile)))
 
     return 'success'
 
@@ -2834,16 +2504,14 @@ def test_tiff_read_gcp_internal_and_auxxml():
             gdal.Unlink('/vsimem/byte_gcp.tif.aux.xml')
 
             if gcp_count != expected_gcp_count:
-                gdaltest.post_reason('Iteration %d, did not get expected gcp count for %s,copy_pam=%s' % (iteration, config_option_value, str(copy_pam)))
                 print('Got ' + str(gcp_count))
                 print('Expected ' + str(expected_gcp_count))
-                return 'fail'
+                pytest.fail('Iteration %d, did not get expected gcp count for %s,copy_pam=%s' % (iteration, config_option_value, str(copy_pam)))
 
             if (expected_srs == '' and srs_wkt != '') or (expected_srs != '' and srs_wkt.find(expected_srs) < 0):
-                gdaltest.post_reason('Iteration %d, did not get expected SRS for %s,copy_pam=%s' % (iteration, config_option_value, str(copy_pam)))
                 print('Got ' + srs_wkt)
                 print('Expected ' + expected_srs)
-                return 'fail'
+                pytest.fail('Iteration %d, did not get expected SRS for %s,copy_pam=%s' % (iteration, config_option_value, str(copy_pam)))
 
     return 'success'
 
@@ -2869,9 +2537,8 @@ def test_tiff_read_aux():
     gdal.PushErrorHandler(handler.handler)
     ds.GetFileList()
     gdal.PopErrorHandler()
-    if handler.msg is not None:
-        gdaltest.post_reason('Got message that indicate recursive calls: %s' % handler.msg)
-        return 'fail'
+    assert handler.msg is None, \
+        ('Got message that indicate recursive calls: %s' % handler.msg)
 
     return 'success'
 
@@ -2882,8 +2549,7 @@ def test_tiff_read_one_band_from_two_bands():
     gdal.Translate('/vsimem/tiff_read_one_band_from_two_bands_dst.tif', '/vsimem/tiff_read_one_band_from_two_bands.tif', options='-b 1')
 
     ds = gdal.Open('/vsimem/tiff_read_one_band_from_two_bands_dst.tif')
-    if ds.GetRasterBand(1).Checksum() != 4672:
-        return 'fail'
+    assert ds.GetRasterBand(1).Checksum() == 4672
     ds = None
     gdal.Unlink('/vsimem/tiff_read_one_band_from_two_bands.tif')
     gdal.Unlink('/vsimem/tiff_read_one_band_from_two_bands.tif.aux.xml')
@@ -2898,11 +2564,7 @@ def test_tiff_read_jpeg_cloud_optimized():
         ds = gdal.Open('data/byte_ovr_jpeg_tablesmode%d.tif' % i)
         cs0 = ds.GetRasterBand(1).Checksum()
         cs1 = ds.GetRasterBand(1).GetOverview(0).Checksum()
-        if cs0 != 4743 or cs1 != 1133:
-            print(i)
-            print(cs0)
-            print(cs1)
-            return 'fail'
+        assert cs0 == 4743 and cs1 == 1133, i
         ds = None
 
     return 'success'
@@ -2917,9 +2579,7 @@ def test_tiff_read_corrupted_jpeg_cloud_optimized():
 
     ds = gdal.Open('data/byte_ovr_jpeg_tablesmode_not_correctly_set_on_ovr.tif')
     cs0 = ds.GetRasterBand(1).Checksum()
-    if cs0 != 4743:
-        print(cs0)
-        return 'fail'
+    assert cs0 == 4743
 
     with gdaltest.error_handler():
         cs1 = ds.GetRasterBand(1).GetOverview(0).Checksum()
@@ -2958,9 +2618,8 @@ def test_tiff_read_ycbcr_lzw():
         got_cs3 = ds.GetRasterBand(3).Checksum()
         if cs1 == 0:
             gdal.PopErrorHandler()
-        if got_cs1 != cs1 or got_cs2 != cs2 or got_cs3 != cs3:
-            print(filename, got_cs1, got_cs2, got_cs3)
-            return 'fail'
+        assert got_cs1 == cs1 and got_cs2 == cs2 and got_cs3 == cs3, \
+            (filename, got_cs1, got_cs2, got_cs3)
 
     return 'success'
 
@@ -2972,11 +2631,8 @@ def test_tiff_read_ycbcr_int12():
 
     with gdaltest.error_handler():
         ds = gdal.Open('data/int12_ycbcr_contig.tif')
-    if ds is not None:
-        return 'fail'
-    if gdal.GetLastErrorMsg().find('Cannot open TIFF file with') < 0:
-        print(gdal.GetLastErrorMsg())
-        return 'fail'
+    assert ds is None
+    assert gdal.GetLastErrorMsg().find('Cannot open TIFF file with') >= 0
 
     return 'success'
 
@@ -2994,9 +2650,7 @@ def test_tiff_read_unit_from_srs():
 
     ds = gdal.Open('/vsimem/tiff_read_unit_from_srs.tif')
     unit = ds.GetRasterBand(1).GetUnitType()
-    if unit != 'metre':
-        print(unit)
-        return 'fail'
+    assert unit == 'metre'
     ds = None
 
     gdal.Unlink('/vsimem/tiff_read_unit_from_srs.tif')
@@ -3010,17 +2664,14 @@ def test_tiff_read_unit_from_srs():
 def test_tiff_read_arcgis93_geodataxform_gcp():
 
     ds = gdal.Open('data/arcgis93_geodataxform_gcp.tif')
-    if ds.GetGCPProjection().find('26712') < 0:
-        return 'fail'
-    if ds.GetGCPCount() != 16:
-        return 'fail'
+    assert ds.GetGCPProjection().find('26712') >= 0
+    assert ds.GetGCPCount() == 16
     gcp = ds.GetGCPs()[0]
-    if abs(gcp.GCPPixel - 565) > 1e-5 or \
-       abs(gcp.GCPLine - 11041) > 1e-5 or \
-       abs(gcp.GCPX - 500000) > 1e-5 or \
-       abs(gcp.GCPY - 4705078.79016612) > 1e-5 or \
-       abs(gcp.GCPZ - 0) > 1e-5:
-        return 'fail'
+    assert (abs(gcp.GCPPixel - 565) <= 1e-5 and \
+       abs(gcp.GCPLine - 11041) <= 1e-5 and \
+       abs(gcp.GCPX - 500000) <= 1e-5 and \
+       abs(gcp.GCPY - 4705078.79016612) <= 1e-5 and \
+       abs(gcp.GCPZ - 0) <= 1e-5)
     return 'success'
 
 ###############################################################################
@@ -3031,8 +2682,7 @@ def test_tiff_read_block_width_above_32bit():
 
     with gdaltest.error_handler():
         ds = gdal.Open('data/block_width_above_32bit.tif')
-    if ds is not None:
-        return 'fail'
+    assert ds is None
     return 'success'
 
 ###############################################################################
@@ -3043,8 +2693,7 @@ def test_tiff_read_image_width_above_32bit():
 
     with gdaltest.error_handler():
         ds = gdal.Open('data/image_width_above_32bit.tif')
-    if ds is not None:
-        return 'fail'
+    assert ds is None
     return 'success'
 
 ###############################################################################
@@ -3055,13 +2704,11 @@ def test_tiff_read_second_image_width_above_32bit():
 
     ds = gdal.Open('data/second_image_width_above_32bit.tif')
     with gdaltest.error_handler():
-        if ds.GetMetadata("SUBDATASETS") != {}:
-            return 'fail'
+        assert ds.GetMetadata("SUBDATASETS") == {}
 
     with gdaltest.error_handler():
         ds = gdal.Open('GTIFF_DIR:2:data/second_image_width_above_32bit.tif')
-    if ds is not None:
-        return 'fail'
+    assert ds is None
 
     return 'success'
 
@@ -3073,11 +2720,9 @@ def test_tiff_read_minimum_tiff_tags_no_warning():
 
     gdal.ErrorReset()
     ds = gdal.Open('data/minimum_tiff_tags_no_warning.tif')
-    if gdal.GetLastErrorMsg() != '':
-        return 'fail'
+    assert gdal.GetLastErrorMsg() == ''
     ds.GetRasterBand(1).Checksum()
-    if gdal.GetLastErrorMsg() != '':
-        return 'fail'
+    assert gdal.GetLastErrorMsg() == ''
 
     return 'success'
 
@@ -3090,12 +2735,10 @@ def test_tiff_read_minimum_tiff_tags_with_warning():
     gdal.ErrorReset()
     with gdaltest.error_handler():
         ds = gdal.Open('data/minimum_tiff_tags_with_warning.tif')
-    if gdal.GetLastErrorMsg() == '':
-        return 'fail'
+    assert gdal.GetLastErrorMsg() != ''
     gdal.ErrorReset()
     ds.GetRasterBand(1).Checksum()
-    if gdal.GetLastErrorMsg() != '':
-        return 'fail'
+    assert gdal.GetLastErrorMsg() == ''
 
     return 'success'
 
@@ -3132,8 +2775,7 @@ def test_tiff_read_unknown_compression():
 
     with gdaltest.error_handler():
         ds = gdal.Open('data/unknown_compression.tif')
-    if ds is not None:
-        return 'fail'
+    assert ds is None
 
     return 'success'
 
@@ -3207,8 +2849,7 @@ def test_tiff_read_big_strip():
     if gdal.GetLastErrorMsg().find('cannot allocate') >= 0:
         return 'skip'
     ds = gdal.Open('/vsimem/test.tif')
-    if ds.GetRasterBand(1).Checksum() != 2676:
-        return 'fail'
+    assert ds.GetRasterBand(1).Checksum() == 2676
     ds = None
     gdal.Unlink('/vsimem/test.tif')
 
@@ -3223,9 +2864,7 @@ def test_tiff_read_big_strip_chunky_way():
     gdal.Translate('/vsimem/test.tif', 'data/byte.tif', options='-co compress=lzw -outsize 1000 2001  -co blockysize=2001 -r bilinear')
     ds = gdal.Open('/vsimem/test.tif')
     cs = ds.GetRasterBand(1).Checksum()
-    if cs != 38337:
-        print(cs)
-        return 'fail'
+    assert cs == 38337
     ds = None
     gdal.Unlink('/vsimem/test.tif')
 
@@ -3243,8 +2882,7 @@ def test_tiff_read_big_tile():
     if gdal.GetLastErrorMsg().find('cannot allocate') >= 0:
         return 'skip'
     ds = gdal.Open('/vsimem/test.tif')
-    if ds.GetRasterBand(1).Checksum() != 2676:
-        return 'fail'
+    assert ds.GetRasterBand(1).Checksum() == 2676
     ds = None
     gdal.Unlink('/vsimem/test.tif')
 
@@ -3257,8 +2895,7 @@ def test_tiff_read_huge_tile():
 
     with gdaltest.error_handler():
         ds = gdal.Open('data/hugeblocksize.tif')
-    if ds is not None:
-        return 'fail'
+    assert ds is None
 
     return 'success'
 
@@ -3306,8 +2943,7 @@ def test_tiff_read_many_blocks():
     ds = gdal.GetDriverByName('GTiff').Create('/vsimem/test.tif', 1, 2000000, options=['BLOCKYSIZE=1'])
     ds = None
     ds = gdal.Open('/vsimem/test.tif')
-    if ds.GetRasterBand(1).Checksum() != 0:
-        return 'fail'
+    assert ds.GetRasterBand(1).Checksum() == 0
     ds = None
     gdal.Unlink('/vsimem/test.tif')
 
@@ -3325,9 +2961,7 @@ def test_tiff_read_many_blocks_truncated():
     ds = gdal.Open('data/many_blocks_truncated.tif')
     with gdaltest.error_handler():
         ds.GetRasterBand(1).GetMetadataItem('BLOCK_OFFSET_0_2000000', 'TIFF')
-    if gdal.GetLastErrorMsg() != 'File too short':
-        print(gdal.GetLastErrorMsg())
-        return 'fail'
+    assert gdal.GetLastErrorMsg() == 'File too short'
 
     return 'success'
 
@@ -3339,11 +2973,8 @@ def test_tiff_read_uint33():
 
     with gdaltest.error_handler():
         ds = gdal.Open('data/uint33.tif')
-    if ds is not None:
-        return 'fail'
-    if gdal.GetLastErrorMsg().find('Unsupported TIFF configuration') < 0:
-        print(gdal.GetLastErrorMsg())
-        return 'fail'
+    assert ds is None
+    assert gdal.GetLastErrorMsg().find('Unsupported TIFF configuration') >= 0
 
     return 'success'
 
@@ -3385,8 +3016,7 @@ def test_tiff_read_toomanyblocks():
 
     with gdaltest.error_handler():
         ds = gdal.Open('data/toomanyblocks.tif')
-    if ds is not None:
-        return 'fail'
+    assert ds is None
 
     return 'success'
 
@@ -3398,8 +3028,7 @@ def test_tiff_read_toomanyblocks_separate():
 
     with gdaltest.error_handler():
         ds = gdal.Open('data/toomanyblocks_separate.tif')
-    if ds is not None:
-        return 'fail'
+    assert ds is None
 
     return 'success'
 
@@ -3412,19 +3041,14 @@ def test_tiff_read_size_of_stripbytecount_lower_than_stripcount():
 
     ds = gdal.Open('data/size_of_stripbytecount_lower_than_stripcount.tif')
     # There are 3 strips but StripByteCounts has just two elements;
-    if ds.GetRasterBand(1).GetMetadataItem('BLOCK_OFFSET_0_1', 'TIFF') != '171':
-        return 'fail'
-    if ds.GetRasterBand(1).GetMetadataItem('BLOCK_SIZE_0_1', 'TIFF') != '1':
-        return 'fail'
-    if ds.GetRasterBand(1).GetMetadataItem('BLOCK_OFFSET_0_2', 'TIFF') is not None:
-        return 'fail'
-    if ds.GetRasterBand(1).GetMetadataItem('BLOCK_SIZE_0_2', 'TIFF') is not None:
-        return 'fail'
+    assert ds.GetRasterBand(1).GetMetadataItem('BLOCK_OFFSET_0_1', 'TIFF') == '171'
+    assert ds.GetRasterBand(1).GetMetadataItem('BLOCK_SIZE_0_1', 'TIFF') == '1'
+    assert ds.GetRasterBand(1).GetMetadataItem('BLOCK_OFFSET_0_2', 'TIFF') is None
+    assert ds.GetRasterBand(1).GetMetadataItem('BLOCK_SIZE_0_2', 'TIFF') is None
 
     ds = gdal.Open('data/size_of_stripbytecount_at_1_and_lower_than_stripcount.tif')
     # There are 3 strips but StripByteCounts has just one element;
-    if ds.GetRasterBand(1).GetMetadataItem('BLOCK_SIZE_0_0', 'TIFF') != '1':
-        return 'fail'
+    assert ds.GetRasterBand(1).GetMetadataItem('BLOCK_SIZE_0_0', 'TIFF') == '1'
 
     return 'success'
 
@@ -3496,8 +3120,7 @@ def test_tiff_read_progressive_jpeg_denial_of_service():
     ds = gdal.Open('/vsizip/data/eofloop_valid_huff.tif.zip')
     with gdaltest.error_handler():
         cs = ds.GetRasterBand(1).Checksum()
-        if cs != 0 or gdal.GetLastErrorMsg() == '':
-            return 'fail'
+        assert cs == 0 and gdal.GetLastErrorMsg() != ''
 
     # Should error out with 'TIFFjpeg_progress_monitor:Scan number...
     gdal.ErrorReset()
@@ -3508,8 +3131,7 @@ def test_tiff_read_progressive_jpeg_denial_of_service():
         cs = ds.GetRasterBand(1).Checksum()
         del os.environ['LIBTIFF_ALLOW_LARGE_LIBJPEG_MEM_ALLOC']
         del os.environ['LIBTIFF_JPEG_MAX_ALLOWED_SCAN_NUMBER']
-        if gdal.GetLastErrorMsg() == '':
-            return 'fail'
+        assert gdal.GetLastErrorMsg() != ''
 
     return 'success'
 
@@ -3526,9 +3148,7 @@ def test_tiff_read_old_style_lzw():
     # Shut down warning about old style LZW
     with gdaltest.error_handler():
         cs = ds.GetRasterBand(1).Checksum()
-    if cs != 34282:
-        print(cs)
-        return 'fail'
+    assert cs == 34282
 
     return 'success'
 
@@ -3550,9 +3170,7 @@ def test_tiff_read_mmap_interface():
         ds = gdal.Open(tmpfile)
         cs = ds.GetRasterBand(1).Checksum()
         gdal.SetConfigOption('GTIFF_USE_MMAP', None)
-        if cs != 4672:
-            print(options, cs)
-            return 'fail'
+        assert cs == 4672, (options, cs)
 
         f = gdal.VSIFOpenL(tmpfile, "rb")
         data = gdal.VSIFReadL(1, gdal.VSIStatL(tmpfile).size - 1, f)
@@ -3565,9 +3183,7 @@ def test_tiff_read_mmap_interface():
             ds = gdal.Open(tmpfile)
             cs = ds.GetRasterBand(1).Checksum()
         gdal.SetConfigOption('GTIFF_USE_MMAP', None)
-        if cs != 0:
-            print(options, cs)
-            return 'fail'
+        assert cs == 0, (options, cs)
         gdal.Unlink(tmpfile)
 
     gdal.Unlink(tmpfile)
@@ -3588,16 +3204,12 @@ def test_tiff_read_jpeg_too_big_last_stripe():
     ds = gdal.Open('data/tif_jpeg_too_big_last_stripe.tif')
     with gdaltest.error_handler():
         cs = ds.GetRasterBand(1).Checksum()
-    if cs != 4557:
-        print(cs)
-        return 'fail'
+    assert cs == 4557
 
     ds = gdal.Open('data/tif_jpeg_ycbcr_too_big_last_stripe.tif')
     with gdaltest.error_handler():
         cs = ds.GetRasterBand(1).Checksum()
-    if cs != 4557:
-        print(cs)
-        return 'fail'
+    assert cs == 4557
 
     return 'success'
 
@@ -3609,18 +3221,15 @@ def test_tiff_read_negative_scaley():
 
     ds = gdal.Open('data/negative_scaley.tif')
     with gdaltest.error_handler():
-        if ds.GetGeoTransform()[5] != -60:
-            return 'fail'
+        assert ds.GetGeoTransform()[5] == -60
 
     ds = gdal.Open('data/negative_scaley.tif')
     with gdaltest.config_option('GTIFF_HONOUR_NEGATIVE_SCALEY', 'NO'):
-        if ds.GetGeoTransform()[5] != -60:
-            return 'fail'
+        assert ds.GetGeoTransform()[5] == -60
 
     ds = gdal.Open('data/negative_scaley.tif')
     with gdaltest.config_option('GTIFF_HONOUR_NEGATIVE_SCALEY', 'YES'):
-        if ds.GetGeoTransform()[5] != 60:
-            return 'fail'
+        assert ds.GetGeoTransform()[5] == 60
 
     return 'success'
 
@@ -3691,8 +3300,7 @@ def test_tiff_read_webp_huge_single_strip():
     if md['DMD_CREATIONOPTIONLIST'].find('WEBP') == -1:
         return 'skip'
     ds = gdal.Open('data/tif_webp_huge_single_strip.tif')
-    if ds.GetRasterBand(1).Checksum() == 0:
-        return 'fail'
+    assert ds.GetRasterBand(1).Checksum() != 0
 
     return 'success'
 
@@ -3702,9 +3310,7 @@ def test_tiff_read_webp_huge_single_strip():
 def test_tiff_read_1bit_2bands():
     ds = gdal.Open('data/1bit_2bands.tif')
     cs = (ds.GetRasterBand(1).Checksum(), ds.GetRasterBand(2).Checksum())
-    if cs != (200, 824):
-        print(cs)
-        return 'fail'
+    assert cs == (200, 824)
     return 'success'
 
 ###############################################################################
@@ -3742,12 +3348,8 @@ def test_tiff_read_overview_of_external_mask():
     gdal.Unlink(filename)
     gdal.Unlink(filename + '.msk')
 
-    if cs1 != cs2:
-        print(cs1, cs2)
-        return 'fail'
-    if flags1 != gdal.GMF_PER_DATASET:
-        print(flags1)
-        return 'fail'
+    assert cs1 == cs2
+    assert flags1 == gdal.GMF_PER_DATASET
 
     return 'success'
 
diff --git a/autotest/gcore/tiff_srs.py b/autotest/gcore/tiff_srs.py
index dd34fcbbe821..45e87c4246b4 100755
--- a/autotest/gcore/tiff_srs.py
+++ b/autotest/gcore/tiff_srs.py
@@ -60,12 +60,7 @@ def test_tiff_srs_without_linear_units():
 
     gdal.Unlink('/vsimem/tiff_srs_without_linear_units.tif')
 
-    if sr.IsSame(sr2) != 1:
-
-        gdaltest.post_reason('did not get expected SRS')
-        print(sr)
-        print(sr2)
-        return 'fail'
+    assert sr.IsSame(sr2) == 1, 'did not get expected SRS'
 
     return 'success'
 
@@ -108,12 +103,7 @@ def test_tiff_srs_compd_cs():
 
     gdal.Unlink('/vsimem/tiff_srs_compd_cs.tif')
 
-    if sr.IsSame(sr2) != 1:
-
-        gdaltest.post_reason('did not get expected SRS')
-        print(sr)
-        print(sr2)
-        return 'fail'
+    assert sr.IsSame(sr2) == 1, 'did not get expected SRS'
 
     return 'success'
 
@@ -127,9 +117,7 @@ def test_tiff_srs_weird_mercator_2sp():
     gdal.PushErrorHandler()
     wkt = ds.GetProjectionRef()
     gdal.PopErrorHandler()
-    if gdal.GetLastErrorMsg() == '':
-        gdaltest.post_reason('warning expected')
-        return 'fail'
+    assert gdal.GetLastErrorMsg() != '', 'warning expected'
     sr2 = osr.SpatialReference()
     sr2.SetFromUserInput(wkt)
     ds = None
@@ -154,12 +142,7 @@ def test_tiff_srs_weird_mercator_2sp():
     UNIT["metre",1,
         AUTHORITY["EPSG","9001"]]]""")
 
-    if sr.IsSame(sr2) != 1:
-
-        gdaltest.post_reason('did not get expected SRS')
-        print(sr)
-        print(sr2)
-        return 'fail'
+    assert sr.IsSame(sr2) == 1, 'did not get expected SRS'
 
     return 'success'
 
@@ -176,7 +159,7 @@ def test_tiff_srs_WGS_1984_Web_Mercator_Auxiliary_Sphere():
     wkt = sr.ExportToPrettyWkt()
     ds = None
 
-    if wkt != """PROJCS["WGS_1984_Web_Mercator_Auxiliary_Sphere",
+    assert wkt == """PROJCS["WGS_1984_Web_Mercator_Auxiliary_Sphere",
     GEOGCS["GCS_WGS_1984",
         DATUM["D_WGS_1984",
             SPHEROID["WGS_1984",6378137.0,298.257223563]],
@@ -189,9 +172,7 @@ def test_tiff_srs_WGS_1984_Web_Mercator_Auxiliary_Sphere():
     PARAMETER["Standard_Parallel_1",0.0],
     PARAMETER["Auxiliary_Sphere_Type",0.0],
     UNIT["Meter",1.0],
-    EXTENSION["PROJ4","+proj=merc +a=6378137 +b=6378137 +lat_ts=0.0 +lon_0=0.0 +x_0=0.0 +y_0=0 +k=1.0 +units=m +nadgrids=@null +wktext  +no_defs"]]""":
-        print(wkt)
-        return 'fail'
+    EXTENSION["PROJ4","+proj=merc +a=6378137 +b=6378137 +lat_ts=0.0 +lon_0=0.0 +x_0=0.0 +y_0=0 +k=1.0 +units=m +nadgrids=@null +wktext  +no_defs"]]"""
 
     return 'success'
 
@@ -210,10 +191,8 @@ def test_tiff_srs_angular_units():
     ds = None
     ds = gdal.Open('/vsimem/tiff_srs_angular_units.tif')
     wkt = ds.GetProjectionRef()
-    if wkt.find('UNIT["arc-second",4.848136811095361e-06]') < 0 and \
-       wkt.find('UNIT["arc-second",4.848136811095361e-006]') < 0:  # wine variant
-        print(wkt)
-        return 'fail'
+    assert (wkt.find('UNIT["arc-second",4.848136811095361e-06]') >= 0 or \
+       wkt.find('UNIT["arc-second",4.848136811095361e-006]') >= 0)
     ds = None
 
     ds = gdal.GetDriverByName('GTiff').Create('/vsimem/tiff_srs_angular_units.tif', 1, 1)
@@ -225,9 +204,7 @@ def test_tiff_srs_angular_units():
     ds = None
     ds = gdal.Open('/vsimem/tiff_srs_angular_units.tif')
     wkt = ds.GetProjectionRef()
-    if wkt.find('UNIT["arc-minute",0.0002908882086657216]') < 0:
-        print(wkt)
-        return 'fail'
+    assert wkt.find('UNIT["arc-minute",0.0002908882086657216]') >= 0
     ds = None
 
     ds = gdal.GetDriverByName('GTiff').Create('/vsimem/tiff_srs_angular_units.tif', 1, 1)
@@ -239,9 +216,7 @@ def test_tiff_srs_angular_units():
     ds = None
     ds = gdal.Open('/vsimem/tiff_srs_angular_units.tif')
     wkt = ds.GetProjectionRef()
-    if wkt.find('UNIT["grad",0.01570796326794897]') < 0:
-        print(wkt)
-        return 'fail'
+    assert wkt.find('UNIT["grad",0.01570796326794897]') >= 0
     ds = None
 
     ds = gdal.GetDriverByName('GTiff').Create('/vsimem/tiff_srs_angular_units.tif', 1, 1)
@@ -253,9 +228,7 @@ def test_tiff_srs_angular_units():
     ds = None
     ds = gdal.Open('/vsimem/tiff_srs_angular_units.tif')
     wkt = ds.GetProjectionRef()
-    if wkt.find('UNIT["gon",0.01570796326794897]') < 0:
-        print(wkt)
-        return 'fail'
+    assert wkt.find('UNIT["gon",0.01570796326794897]') >= 0
     ds = None
 
     ds = gdal.GetDriverByName('GTiff').Create('/vsimem/tiff_srs_angular_units.tif', 1, 1)
@@ -267,9 +240,7 @@ def test_tiff_srs_angular_units():
     ds = None
     ds = gdal.Open('/vsimem/tiff_srs_angular_units.tif')
     wkt = ds.GetProjectionRef()
-    if wkt.find('UNIT["radian",1]') < 0:
-        print(wkt)
-        return 'fail'
+    assert wkt.find('UNIT["radian",1]') >= 0
     ds = None
 
     ds = gdal.GetDriverByName('GTiff').Create('/vsimem/tiff_srs_angular_units.tif', 1, 1)
@@ -281,9 +252,7 @@ def test_tiff_srs_angular_units():
     ds = None
     ds = gdal.Open('/vsimem/tiff_srs_angular_units.tif')
     wkt = ds.GetProjectionRef()
-    if wkt.find('UNIT["custom",1.23]') < 0:
-        print(wkt)
-        return 'fail'
+    assert wkt.find('UNIT["custom",1.23]') >= 0
     ds = None
 
     gdal.Unlink('/vsimem/tiff_srs_angular_units.tif')
@@ -305,9 +274,7 @@ def test_tiff_custom_datum_known_ellipsoid():
     ds = None
     ds = gdal.Open('/vsimem/tiff_custom_datum_known_ellipsoid.tif')
     wkt = ds.GetProjectionRef()
-    if wkt != 'GEOGCS["WGS 84 based",DATUM["WGS_1984_based",SPHEROID["WGS 84",6378137,298.257223563,AUTHORITY["EPSG","7030"]]],PRIMEM["Greenwich",0],UNIT["degree",0.0174532925199433]]':
-        print(wkt)
-        return 'fail'
+    assert wkt == 'GEOGCS["WGS 84 based",DATUM["WGS_1984_based",SPHEROID["WGS 84",6378137,298.257223563,AUTHORITY["EPSG","7030"]]],PRIMEM["Greenwich",0],UNIT["degree",0.0174532925199433]]'
     ds = None
 
     gdal.Unlink('/vsimem/tiff_custom_datum_known_ellipsoid.tif')
@@ -326,17 +293,13 @@ def test_tiff_srs_epsg_2853_with_us_feet():
     ds = gdal.Open('data/epsg_2853_with_us_feet.tif')
     gdal.SetConfigOption('GTIFF_IMPORT_FROM_EPSG', old_val)
     wkt = ds.GetProjectionRef()
-    if wkt.find('PARAMETER["false_easting",11482916.66') < 0 or wkt.find('UNIT["us_survey_feet",0.3048006') < 0 or wkt.find('2853') >= 0:
-        print(wkt)
-        return 'fail'
+    assert wkt.find('PARAMETER["false_easting",11482916.66') >= 0 and wkt.find('UNIT["us_survey_feet",0.3048006') >= 0 and wkt.find('2853') < 0
 
     gdal.SetConfigOption('GTIFF_IMPORT_FROM_EPSG', 'NO')
     ds = gdal.Open('data/epsg_2853_with_us_feet.tif')
     gdal.SetConfigOption('GTIFF_IMPORT_FROM_EPSG', old_val)
     wkt = ds.GetProjectionRef()
-    if wkt.find('PARAMETER["false_easting",11482916.66') < 0 or wkt.find('UNIT["us_survey_feet",0.3048006') < 0 or wkt.find('2853') >= 0:
-        print(wkt)
-        return 'fail'
+    assert wkt.find('PARAMETER["false_easting",11482916.66') >= 0 and wkt.find('UNIT["us_survey_feet",0.3048006') >= 0 and wkt.find('2853') < 0
 
     return 'success'
 
@@ -364,9 +327,7 @@ def test_tiff_srs_PCSCitationGeoKey_LUnits():
     ds = None
     ds = gdal.Open('/vsimem/tiff_srs_PCSCitationGeoKey_LUnits.tif')
     wkt = ds.GetProjectionRef()
-    if wkt != 'PROJCS["UTM Zone 32, Northern Hemisphere",GEOGCS["GRS 1980(IUGG, 1980)",DATUM["unknown",SPHEROID["GRS80",6378137,298.257222101],TOWGS84[0,0,0,0,0,0,0]],PRIMEM["Greenwich",0],UNIT["degree",0.0174532925199433]],PROJECTION["Transverse_Mercator"],PARAMETER["latitude_of_origin",0],PARAMETER["central_meridian",9],PARAMETER["scale_factor",0.9996],PARAMETER["false_easting",50000000],PARAMETER["false_northing",0],UNIT["Centimeter",0.01]]':
-        print(wkt)
-        return 'fail'
+    assert wkt == 'PROJCS["UTM Zone 32, Northern Hemisphere",GEOGCS["GRS 1980(IUGG, 1980)",DATUM["unknown",SPHEROID["GRS80",6378137,298.257222101],TOWGS84[0,0,0,0,0,0,0]],PRIMEM["Greenwich",0],UNIT["degree",0.0174532925199433]],PROJECTION["Transverse_Mercator"],PARAMETER["latitude_of_origin",0],PARAMETER["central_meridian",9],PARAMETER["scale_factor",0.9996],PARAMETER["false_easting",50000000],PARAMETER["false_northing",0],UNIT["Centimeter",0.01]]'
     ds = None
 
     gdal.Unlink('/vsimem/tiff_srs_PCSCitationGeoKey_LUnits.tif')
@@ -383,9 +344,7 @@ def test_tiff_srs_projection_3856():
     wkt = ds.GetProjectionRef()
     ds = None
 
-    if wkt.find('EXTENSION["PROJ4","+proj=merc +a=6378137 +b=6378137 +lat_ts=0.0 +lon_0=0.0 +x_0=0.0 +y_0=0 +k=1.0 +units=m +nadgrids=@null +wktext  +no_defs') < 0:
-        print(wkt)
-        return 'fail'
+    assert wkt.find('EXTENSION["PROJ4","+proj=merc +a=6378137 +b=6378137 +lat_ts=0.0 +lon_0=0.0 +x_0=0.0 +y_0=0 +k=1.0 +units=m +nadgrids=@null +wktext  +no_defs') >= 0
 
     return 'success'
 
@@ -399,9 +358,7 @@ def test_tiff_srs_imagine_localcs_citation():
     wkt = ds.GetProjectionRef()
     ds = None
 
-    if wkt != 'LOCAL_CS["Projection Name = UTM Units = meters GeoTIFF Units = meters",UNIT["unknown",1]]':
-        print(wkt)
-        return 'fail'
+    assert wkt == 'LOCAL_CS["Projection Name = UTM Units = meters GeoTIFF Units = meters",UNIT["unknown",1]]'
 
     return 'success'
 
@@ -416,9 +373,7 @@ def test_tiff_srs_towgs84_override():
     wkt = ds.GetProjectionRef()
     ds = None
 
-    if wkt.find('TOWGS84[584.8,67,400.3,0.105,0.013,-2.378,10.29]') < 0:
-        print(wkt)
-        return 'fail'
+    assert wkt.find('TOWGS84[584.8,67,400.3,0.105,0.013,-2.378,10.29]') >= 0
 
     return 'success'
 
@@ -432,9 +387,7 @@ def test_tiff_srs_pcscitation():
     wkt = ds.GetProjectionRef()
     ds = None
 
-    if wkt.find('PROJCS["mycitation",') != 0:
-        print(wkt)
-        return 'fail'
+    assert wkt.find('PROJCS["mycitation",') == 0
 
     return 'success'
 
diff --git a/autotest/gcore/tiff_write.py b/autotest/gcore/tiff_write.py
index 0a16343bc207..234b333199aa 100755
--- a/autotest/gcore/tiff_write.py
+++ b/autotest/gcore/tiff_write.py
@@ -34,6 +34,7 @@
 import shutil
 from osgeo import gdal
 from osgeo import osr
+import pytest
 
 sys.path.append('../../gdal/swig/python/samples')
 
@@ -48,14 +49,10 @@
 def test_tiff_write_1():
 
     gdaltest.tiff_drv = gdal.GetDriverByName('GTiff')
-    if gdaltest.tiff_drv is None:
-        gdaltest.post_reason('GTiff driver not found!')
-        return 'fail'
+    assert gdaltest.tiff_drv is not None, 'GTiff driver not found!'
 
     drv_md = gdaltest.tiff_drv.GetMetadata()
-    if drv_md['DMD_MIMETYPE'] != 'image/tiff':
-        gdaltest.post_reason('mime type is wrong')
-        return 'fail'
+    assert drv_md['DMD_MIMETYPE'] == 'image/tiff', 'mime type is wrong'
 
     return 'success'
 
@@ -70,9 +67,7 @@ def test_tiff_write_2():
     new_ds = gdaltest.tiff_drv.CreateCopy('tmp/test_2.tif', src_ds)
 
     bnd = new_ds.GetRasterBand(1)
-    if bnd.Checksum() != 5028:
-        gdaltest.post_reason('Didnt get expected checksum on still-open file')
-        return 'fail'
+    assert bnd.Checksum() == 5028, 'Didnt get expected checksum on still-open file'
 
     bnd = None
     new_ds = None
@@ -81,13 +76,10 @@ def test_tiff_write_2():
 
     new_ds = gdal.Open('tmp/test_2.tif')
     bnd = new_ds.GetRasterBand(1)
-    if bnd.Checksum() != 5028:
-        gdaltest.post_reason('Didnt get expected checksum on reopened file')
-        return 'fail'
+    assert bnd.Checksum() == 5028, 'Didnt get expected checksum on reopened file'
 
-    if bnd.ComputeRasterMinMax() != (74.0, 255.0):
-        gdaltest.post_reason('ComputeRasterMinMax() returned wrong value')
-        return 'fail'
+    assert bnd.ComputeRasterMinMax() == (74.0, 255.0), \
+        'ComputeRasterMinMax() returned wrong value'
 
     bnd = None
     new_ds = None
@@ -110,9 +102,7 @@ def test_tiff_write_3():
                                           options=options)
 
     bnd = new_ds.GetRasterBand(1)
-    if bnd.Checksum() != 50054:
-        gdaltest.post_reason('Didnt get expected checksum on still-open file')
-        return 'fail'
+    assert bnd.Checksum() == 50054, 'Didnt get expected checksum on still-open file'
 
     bnd = None
     new_ds = None
@@ -172,15 +162,10 @@ def test_tiff_write_4():
     gt = (0.0, 1.0, 0.0, 50.0, 0.0, -1.0)
     new_ds.SetGeoTransform(gt)
 
-    if new_ds.GetRasterBand(1).Checksum() != 21577 \
-       or new_ds.GetRasterBand(2).Checksum() != 20950 \
-       or new_ds.GetRasterBand(3).Checksum() != 23730:
-        gdaltest.post_reason('Wrong checksum.')
-        return 'fail'
+    assert new_ds.GetRasterBand(1).Checksum() == 21577 and new_ds.GetRasterBand(2).Checksum() == 20950 and new_ds.GetRasterBand(3).Checksum() == 23730, \
+        'Wrong checksum.'
 
-    if gt != new_ds.GetGeoTransform():
-        gdaltest.post_reason('Wrong geotransform.')
-        return 'fail'
+    assert gt == new_ds.GetGeoTransform(), 'Wrong geotransform.'
 
     new_ds.SetMetadata({'TEST_KEY': 'TestValue'})
 
@@ -188,25 +173,16 @@ def test_tiff_write_4():
 
     new_ds = gdal.Open('tmp/test_4.tif')
 
-    if new_ds.GetRasterBand(1).Checksum() != 21577 \
-       or new_ds.GetRasterBand(2).Checksum() != 20950 \
-       or new_ds.GetRasterBand(3).Checksum() != 23730:
-        gdaltest.post_reason('Wrong checksum (2).')
-        return 'fail'
+    assert new_ds.GetRasterBand(1).Checksum() == 21577 and new_ds.GetRasterBand(2).Checksum() == 20950 and new_ds.GetRasterBand(3).Checksum() == 23730, \
+        'Wrong checksum (2).'
 
-    if gt != new_ds.GetGeoTransform():
-        gdaltest.post_reason('Wrong geotransform(2).')
-        return 'fail'
+    assert gt == new_ds.GetGeoTransform(), 'Wrong geotransform(2).'
 
     nd = new_ds.GetRasterBand(1).GetNoDataValue()
-    if nd is not None:
-        gdaltest.post_reason('Got unexpected nodata value.')
-        return 'fail'
+    assert nd is None, 'Got unexpected nodata value.'
 
     md_dict = new_ds.GetMetadata()
-    if md_dict['TEST_KEY'] != 'TestValue':
-        gdaltest.post_reason('Missing metadata')
-        return 'fail'
+    assert md_dict['TEST_KEY'] == 'TestValue', 'Missing metadata'
 
     new_ds = None
 
@@ -224,15 +200,11 @@ def test_tiff_write_5():
 
     new_ds = gdaltest.tiff_drv.CreateCopy('tmp/test_5.tif', src_ds)
 
-    if new_ds.GetGCPProjection().find(
-            'AUTHORITY["EPSG","26711"]') == -1:
-        gdaltest.post_reason('GCP Projection not set properly.')
-        return 'fail'
+    assert (new_ds.GetGCPProjection().find(
+            'AUTHORITY["EPSG","26711"]') != -1), 'GCP Projection not set properly.'
 
     gcps = new_ds.GetGCPs()
-    if len(gcps) != 4:
-        gdaltest.post_reason('GCP count wrong.')
-        return 'fail'
+    assert len(gcps) == 4, 'GCP count wrong.'
 
     new_ds = None
 
@@ -245,9 +217,7 @@ def test_tiff_write_5():
 
     new_ds = gdal.Open('tmp/test_5.tif')
     gcps = new_ds.GetGCPs()
-    if len(gcps) != 4:
-        gdaltest.post_reason('GCP count wrong.')
-        return 'fail'
+    assert len(gcps) == 4, 'GCP count wrong.'
     new_ds = None
 
     gdaltest.tiff_drv.Delete('tmp/test_5.tif')
@@ -317,9 +287,7 @@ def test_tiff_write_7():
     ds.FlushCache()
     buf_read = ds.ReadRaster(0, 0, 32, 32, buf_type=gdal.GDT_Byte)
 
-    if buf_read != buf:
-        gdaltest.post_reason('did not get back expected data.')
-        return 'fail'
+    assert buf_read == buf, 'did not get back expected data.'
 
     ds = None
 
@@ -347,9 +315,7 @@ def test_tiff_write_8():
 
     buf_read = ds.ReadRaster(0, 0, 32, 32, buf_type=gdal.GDT_Byte)
 
-    if buf_read != buf:
-        gdaltest.post_reason('did not get back expected data.')
-        return 'fail'
+    assert buf_read == buf, 'did not get back expected data.'
 
     ds = None
 
@@ -371,9 +337,7 @@ def test_tiff_write_9():
 
     new_ds = gdal.Open('tmp/test_9.tif')
     bnd = new_ds.GetRasterBand(1)
-    if bnd.Checksum() != 5287:
-        gdaltest.post_reason('Didnt get expected checksum on reopened file')
-        return 'fail'
+    assert bnd.Checksum() == 5287, 'Didnt get expected checksum on reopened file'
 
     bnd = None
     new_ds = None
@@ -414,8 +378,7 @@ def test_tiff_write_12():
 
     ds = gdal.Open('data/sasha.tif')
     cs = ds.GetRasterBand(3).Checksum()
-    if cs != 31952 and cs != 30145:
-        return 'fail'
+    assert cs == 31952 or cs == 30145
 
     return 'success'
 
@@ -444,16 +407,10 @@ def test_tiff_write_13():
     size = os.stat('tmp/sasha.tif').st_size
 
     gdaltest.tiff_drv.Delete('tmp/sasha.tif')
-    if cs != 17347 and cs != 14445:
-        gdaltest.post_reason('fail: bad checksum')
-        print(cs)
-        return 'fail'
+    assert cs == 17347 or cs == 14445, 'fail: bad checksum'
 
     if md['LIBTIFF'] == 'INTERNAL':
-        if size > 22816:
-            gdaltest.post_reason('fail: bad size')
-            print(size)
-            return 'fail'
+        assert size <= 22816, 'fail: bad size'
 
     return 'success'
 
@@ -484,14 +441,10 @@ def test_tiff_write_15():
     ds = gdal.Open('tmp/tw_15.tif')
 
     md = ds.GetMetadata()
-    if 'test' not in md:
-        gdaltest.post_reason('Metadata absent from .aux.xml file.')
-        return 'fail'
+    assert 'test' in md, 'Metadata absent from .aux.xml file.'
 
     md = ds.GetRasterBand(1).GetMetadata()
-    if 'testBand' not in md:
-        gdaltest.post_reason('Metadata absent from .aux.xml file.')
-        return 'fail'
+    assert 'testBand' in md, 'Metadata absent from .aux.xml file.'
 
     ds = None
 
@@ -499,19 +452,14 @@ def test_tiff_write_15():
 
     ds = gdal.Open('tmp/tw_15.tif')
 
-    if ds.GetGeoTransform() != (0.0, 1.0, 0.0, 0.0, 0.0, 1.0):
-        gdaltest.post_reason('Got wrong geotransform, profile ignored?')
-        return 'fail'
+    assert ds.GetGeoTransform() == (0.0, 1.0, 0.0, 0.0, 0.0, 1.0), \
+        'Got wrong geotransform, profile ignored?'
 
     md = ds.GetMetadata()
-    if 'test' in md:
-        gdaltest.post_reason('Metadata written to BASELINE file.')
-        return 'fail'
+    assert 'test' not in md, 'Metadata written to BASELINE file.'
 
     md = ds.GetRasterBand(1).GetMetadata()
-    if 'testBand' in md:
-        gdaltest.post_reason('Metadata written to BASELINE file.')
-        return 'fail'
+    assert 'testBand' not in md, 'Metadata written to BASELINE file.'
 
     ds = None
 
@@ -543,19 +491,14 @@ def test_tiff_write_16():
     ds = None
 
     ds = gdal.Open('tmp/tw_16.tif')
-    if ds.GetGeoTransform() != (0.0, 1.0, 0.0, 0.0, 0.0, 1.0):
-        gdaltest.post_reason('Got wrong geotransform, profile ignored?')
-        return 'fail'
+    assert ds.GetGeoTransform() == (0.0, 1.0, 0.0, 0.0, 0.0, 1.0), \
+        'Got wrong geotransform, profile ignored?'
 
     md = ds.GetMetadata()
-    if 'test' not in md:
-        gdaltest.post_reason('Metadata absent from .aux.xml file.')
-        return 'fail'
+    assert 'test' in md, 'Metadata absent from .aux.xml file.'
 
     md = ds.GetRasterBand(1).GetMetadata()
-    if 'testBand' not in md:
-        gdaltest.post_reason('Metadata absent from .aux.xml file.')
-        return 'fail'
+    assert 'testBand' in md, 'Metadata absent from .aux.xml file.'
 
     ds = None
 
@@ -571,14 +514,10 @@ def test_tiff_write_16():
     ds = gdal.Open('tmp/tw_16.tif')
 
     md = ds.GetMetadata()
-    if 'test' in md:
-        gdaltest.post_reason('Metadata written to BASELINE file.')
-        return 'fail'
+    assert 'test' not in md, 'Metadata written to BASELINE file.'
 
     md = ds.GetRasterBand(1).GetMetadata()
-    if 'testBand' in md:
-        gdaltest.post_reason('Metadata written to BASELINE file.')
-        return 'fail'
+    assert 'testBand' not in md, 'Metadata written to BASELINE file.'
 
     ds = None
 
@@ -604,24 +543,19 @@ def test_tiff_write_17():
     ds = None
 
     # Ensure there is no .aux.xml file which might hold the RPC.
-    if gdal.VSIStatL(tmpfilename + '.aux.xml'):
-        gdaltest.post_reason('unexpectedly found.aux.xml file')
-        return 'fail'
+    assert not gdal.VSIStatL(tmpfilename + '.aux.xml'), \
+        'unexpectedly found.aux.xml file'
 
     # confirm there is no .rpb file created by default.
-    if gdal.VSIStatL(tmpfilename + '.RPB'):
-        gdaltest.post_reason('unexpectedly found .RPB file')
-        return 'fail'
+    assert not gdal.VSIStatL(tmpfilename + '.RPB'), 'unexpectedly found .RPB file'
 
     # confirm there is no _rpc.txt file created by default.
-    if gdal.VSIStatL(tmpfilename + '_RPC.TXT'):
-        gdaltest.post_reason('unexpectedly found _RPC.TXT file')
-        return 'fail'
+    assert not gdal.VSIStatL(tmpfilename + '_RPC.TXT'), \
+        'unexpectedly found _RPC.TXT file'
 
     # Open the dataset, and confirm the RPC data is still intact.
     ds = gdal.Open(tmpfilename)
-    if not gdaltest.rpcs_equal(ds.GetMetadata('RPC'), rpc_md):
-        return 'fail'
+    assert gdaltest.rpcs_equal(ds.GetMetadata('RPC'), rpc_md)
     ds = None
 
     # Modify the RPC
@@ -633,8 +567,7 @@ def test_tiff_write_17():
     ds = None
 
     ds = gdal.Open(tmpfilename)
-    if not gdaltest.rpcs_equal(ds.GetMetadata('RPC'), modified_rpc):
-        return 'fail'
+    assert gdaltest.rpcs_equal(ds.GetMetadata('RPC'), modified_rpc)
     ds = None
 
     # Unset the RPC
@@ -643,9 +576,7 @@ def test_tiff_write_17():
     ds = None
 
     ds = gdal.Open(tmpfilename)
-    if ds.GetMetadata('RPC'):
-        gdaltest.post_reason('got RPC, but was not expected')
-        return 'fail'
+    assert not ds.GetMetadata('RPC'), 'got RPC, but was not expected'
     ds = None
 
     gdaltest.tiff_drv.Delete(tmpfilename)
@@ -679,60 +610,42 @@ def test_tiff_write_18():
                                       options=['PROFILE=BASELINE'])
 
     # Ensure there is no .aux.xml file which might hold the RPC.
-    if gdal.VSIStatL('tmp/tm_18.tif.aux.xml'):
-        gdaltest.post_reason('unexpectedly found tm_18.tif.aux.xml file')
-        return 'fail'
+    assert not gdal.VSIStatL('tmp/tm_18.tif.aux.xml'), \
+        'unexpectedly found tm_18.tif.aux.xml file'
 
     # confirm there is an .rpb and .imd file.
-    if gdal.VSIStatL('tmp/tw_18.RPB') is None:
-        gdaltest.post_reason('missing .RPB file.')
-        return 'fail'
-    if gdal.VSIStatL('tmp/tw_18.IMD') is None:
-        gdaltest.post_reason('missing .IMD file.')
-        return 'fail'
+    assert gdal.VSIStatL('tmp/tw_18.RPB') is not None, 'missing .RPB file.'
+    assert gdal.VSIStatL('tmp/tw_18.IMD') is not None, 'missing .IMD file.'
 
     # confirm there is no _rpc.txt file created by default.
-    if gdal.VSIStatL('tmp/tw_18_RPC.TXT'):
-        gdaltest.post_reason('unexpectedly found _RPC.TXT file')
-        return 'fail'
+    assert not gdal.VSIStatL('tmp/tw_18_RPC.TXT'), 'unexpectedly found _RPC.TXT file'
 
     # Open the dataset, and confirm the RPC/IMD data is still intact.
     ds = gdal.Open('tmp/tw_18.tif')
 
-    if not gdaltest.rpcs_equal(ds.GetMetadata('RPC'), rpc_md):
-        return 'fail'
+    assert gdaltest.rpcs_equal(ds.GetMetadata('RPC'), rpc_md)
 
     imd_md = ds.GetMetadata('IMD')
-    if imd_md['version'] != '"R"' \
-       or imd_md['numColumns'] != '30324' \
-       or imd_md['IMAGE_1.sunEl'] != '39.7':
-        gdaltest.post_reason('IMD contents wrong?')
-        print(imd_md)
-        return 'fail'
+    assert imd_md['version'] == '"R"' and imd_md['numColumns'] == '30324' and imd_md['IMAGE_1.sunEl'] == '39.7', \
+        'IMD contents wrong?'
 
     ds = None
 
     # Test deferred loading with GetMetadataItem()
     ds = gdal.Open('tmp/tw_18.tif')
-    if ds.GetMetadataItem('LINE_OFF', 'RPC') != '16201':
-        gdaltest.post_reason("wrong value for GetMetadataItem('LINE_OFF', 'RPC')")
-        return 'fail'
-    if ds.GetMetadataItem('version', 'IMD') != '"R"':
-        gdaltest.post_reason("wrong value for GetMetadataItem('version', 'IMD')")
-        return 'fail'
+    assert ds.GetMetadataItem('LINE_OFF', 'RPC') == '16201', \
+        "wrong value for GetMetadataItem('LINE_OFF', 'RPC')"
+    assert ds.GetMetadataItem('version', 'IMD') == '"R"', \
+        "wrong value for GetMetadataItem('version', 'IMD')"
     ds = None
 
     gdaltest.tiff_drv.Delete('tmp/tw_18.tif')
 
     # Confirm IMD and RPC files are cleaned up.  If not likely the
     # file list functionality is not working properly.
-    if gdal.VSIStatL('tmp/tw_18.RPB'):
-        gdaltest.post_reason('RPB did not get cleaned up.')
-        return 'fail'
+    assert not gdal.VSIStatL('tmp/tw_18.RPB'), 'RPB did not get cleaned up.'
 
-    if gdal.VSIStatL('tmp/tw_18.IMD'):
-        gdaltest.post_reason('IMD did not get cleaned up.')
-        return 'fail'
+    assert not gdal.VSIStatL('tmp/tw_18.IMD'), 'IMD did not get cleaned up.'
 
     # Remove the RPC
     gdaltest.tiff_drv.CreateCopy('tmp/tw_18.tif', ds_in,
@@ -740,9 +653,7 @@ def test_tiff_write_18():
     ds = gdal.Open('tmp/tw_18.tif', gdal.GA_Update)
     ds.SetMetadata(None, 'RPC')
     ds = None
-    if os.path.exists('tmp/tw_18.RPB'):
-        gdaltest.post_reason('RPB did not get removed')
-        return 'fail'
+    assert not os.path.exists('tmp/tw_18.RPB'), 'RPB did not get removed'
 
     gdaltest.tiff_drv.Delete('tmp/tw_18.tif')
 
@@ -807,8 +718,7 @@ def test_tiff_write_rpc_txt():
     # Open the dataset, and confirm the RPC data is still intact.
     ds = gdal.Open('tmp/tiff_write_rpc_txt.tif')
 
-    if not gdaltest.rpcs_equal(ds.GetMetadata('RPC'), rpc_md):
-        return 'fail'
+    assert gdaltest.rpcs_equal(ds.GetMetadata('RPC'), rpc_md)
 
     ds = None
 
@@ -858,8 +768,7 @@ def test_tiff_write_rpc_in_pam():
     # Open the dataset, and confirm the RPC data is still intact.
     ds = gdal.Open('tmp/tiff_write_rpc_in_pam.tif')
 
-    if not gdaltest.rpcs_equal(ds.GetMetadata('RPC'), rpc_md):
-        return 'fail'
+    assert gdaltest.rpcs_equal(ds.GetMetadata('RPC'), rpc_md)
 
     ds = None
 
@@ -882,11 +791,10 @@ def test_tiff_write_19():
     # hopefully it's closed now!
 
     new_ds = gdal.Open('tmp/contig_strip_7.tif')
-    if new_ds.GetRasterBand(1).Checksum() != src_ds.GetRasterBand(1).Checksum() or \
-       new_ds.GetRasterBand(2).Checksum() != src_ds.GetRasterBand(2).Checksum() or \
-       new_ds.GetRasterBand(3).Checksum() != src_ds.GetRasterBand(3).Checksum():
-        gdaltest.post_reason('Didnt get expected checksum on reopened file')
-        return 'fail'
+    assert (new_ds.GetRasterBand(1).Checksum() == src_ds.GetRasterBand(1).Checksum() and \
+       new_ds.GetRasterBand(2).Checksum() == src_ds.GetRasterBand(2).Checksum() and \
+       new_ds.GetRasterBand(3).Checksum() == src_ds.GetRasterBand(3).Checksum()), \
+        'Didnt get expected checksum on reopened file'
 
     new_ds = None
     src_ds = None
@@ -936,13 +844,10 @@ def test_tiff_write_20():
     new_ds = gdal.Open('tmp/tags.tif')
     md = new_ds.GetMetadata()
     for item in values:
-        if item[0] not in md:
-            gdaltest.post_reason('Could not find tag %s' % (item[0]))
-            return 'fail'
+        assert item[0] in md, ('Could not find tag %s' % (item[0]))
 
-        if md[item[0]] != item[1]:
-            gdaltest.post_reason('For tag %s, got %s, expected %s' % (item[0], md[item[0]], item[1]))
-            return 'fail'
+        assert md[item[0]] == item[1], \
+            ('For tag %s, got %s, expected %s' % (item[0], md[item[0]], item[1]))
 
     new_ds = None
 
@@ -959,12 +864,10 @@ def test_tiff_write_20():
         pass
 
     ds = gdal.Open('tmp/tags.tif')
-    if ds.GetMetadataItem('TIFFTAG_SOFTWARE') is not None:
-        gdaltest.post_reason('expected unset TIFFTAG_SOFTWARE but got %s' % ds.GetMetadataItem('TIFFTAG_SOFTWARE'))
-        return 'fail'
-    if ds.GetMetadataItem('TIFFTAG_DOCUMENTNAME') is None:
-        gdaltest.post_reason('expected set TIFFTAG_DOCUMENTNAME but got None')
-        return 'fail'
+    assert ds.GetMetadataItem('TIFFTAG_SOFTWARE') is None, \
+        ('expected unset TIFFTAG_SOFTWARE but got %s' % ds.GetMetadataItem('TIFFTAG_SOFTWARE'))
+    assert ds.GetMetadataItem('TIFFTAG_DOCUMENTNAME') is not None, \
+        'expected set TIFFTAG_DOCUMENTNAME but got None'
     ds = None
 
     # Test unsetting all the remaining items
@@ -976,10 +879,7 @@ def test_tiff_write_20():
     got_md = ds.GetMetadata()
     ds = None
 
-    if got_md != {}:
-        gdaltest.post_reason('expected empty metadata list, but got some')
-        print(got_md)
-        return 'fail'
+    assert got_md == {}, 'expected empty metadata list, but got some'
 
     gdaltest.tiff_drv.Delete('tmp/tags.tif')
 
@@ -998,13 +898,10 @@ def test_tiff_write_21():
     new_ds = None
 
     new_ds = gdal.Open('tmp/stefan_full_rgba.tif')
-    if new_ds.RasterCount != 4:
-        return 'fail'
+    assert new_ds.RasterCount == 4
     for i in range(4):
-        if new_ds.GetRasterBand(i + 1).GetRasterColorInterpretation() != src_ds.GetRasterBand(i + 1).GetRasterColorInterpretation():
-            return 'fail'
-        if new_ds.GetRasterBand(i + 1).Checksum() != src_ds.GetRasterBand(i + 1).Checksum():
-            return 'fail'
+        assert new_ds.GetRasterBand(i + 1).GetRasterColorInterpretation() == src_ds.GetRasterBand(i + 1).GetRasterColorInterpretation()
+        assert new_ds.GetRasterBand(i + 1).Checksum() == src_ds.GetRasterBand(i + 1).Checksum()
 
     new_ds = None
     src_ds = None
@@ -1026,13 +923,10 @@ def test_tiff_write_22():
     new_ds = None
 
     new_ds = gdal.Open('tmp/stefan_full_rgba_photometric_rgb.tif')
-    if new_ds.RasterCount != 4:
-        return 'fail'
+    assert new_ds.RasterCount == 4
     for i in range(4):
-        if new_ds.GetRasterBand(i + 1).GetRasterColorInterpretation() != src_ds.GetRasterBand(i + 1).GetRasterColorInterpretation():
-            return 'fail'
-        if new_ds.GetRasterBand(i + 1).Checksum() != src_ds.GetRasterBand(i + 1).Checksum():
-            return 'fail'
+        assert new_ds.GetRasterBand(i + 1).GetRasterColorInterpretation() == src_ds.GetRasterBand(i + 1).GetRasterColorInterpretation()
+        assert new_ds.GetRasterBand(i + 1).Checksum() == src_ds.GetRasterBand(i + 1).Checksum()
 
     new_ds = None
     src_ds = None
@@ -1054,13 +948,10 @@ def test_tiff_write_23():
     new_ds = None
 
     new_ds = gdal.Open('tmp/stefan_full_greyalpha.tif')
-    if new_ds.RasterCount != 2:
-        return 'fail'
+    assert new_ds.RasterCount == 2
     for i in range(2):
-        if new_ds.GetRasterBand(i + 1).GetRasterColorInterpretation() != src_ds.GetRasterBand(i + 1).GetRasterColorInterpretation():
-            return 'fail'
-        if new_ds.GetRasterBand(i + 1).Checksum() != src_ds.GetRasterBand(i + 1).Checksum():
-            return 'fail'
+        assert new_ds.GetRasterBand(i + 1).GetRasterColorInterpretation() == src_ds.GetRasterBand(i + 1).GetRasterColorInterpretation()
+        assert new_ds.GetRasterBand(i + 1).Checksum() == src_ds.GetRasterBand(i + 1).Checksum()
 
     new_ds = None
     src_ds = None
@@ -1082,13 +973,10 @@ def test_tiff_write_24():
     new_ds = None
 
     new_ds = gdal.Open('tmp/stefan_full_greyunspecified.tif')
-    if new_ds.RasterCount != 2:
-        return 'fail'
+    assert new_ds.RasterCount == 2
     for i in range(2):
-        if new_ds.GetRasterBand(i + 1).GetRasterColorInterpretation() != src_ds.GetRasterBand(i + 1).GetRasterColorInterpretation():
-            return 'fail'
-        if new_ds.GetRasterBand(i + 1).Checksum() != src_ds.GetRasterBand(i + 1).Checksum():
-            return 'fail'
+        assert new_ds.GetRasterBand(i + 1).GetRasterColorInterpretation() == src_ds.GetRasterBand(i + 1).GetRasterColorInterpretation()
+        assert new_ds.GetRasterBand(i + 1).Checksum() == src_ds.GetRasterBand(i + 1).Checksum()
 
     new_ds = None
     src_ds = None
@@ -1104,24 +992,15 @@ def test_tiff_write_24():
 def test_tiff_write_25():
 
     src_ds = gdal.Open('data/cielab.tif')
-    if src_ds.RasterCount != 4:
-        return 'fail'
-    if src_ds.GetRasterBand(1).Checksum() != 6:
-        return 'fail'
-    if src_ds.GetRasterBand(2).Checksum() != 3:
-        return 'fail'
-    if src_ds.GetRasterBand(3).Checksum() != 0:
-        return 'fail'
-    if src_ds.GetRasterBand(4).Checksum() != 3:
-        return 'fail'
-    if src_ds.GetRasterBand(1).GetRasterColorInterpretation() != gdal.GCI_RedBand:
-        return 'fail'
-    if src_ds.GetRasterBand(2).GetRasterColorInterpretation() != gdal.GCI_GreenBand:
-        return 'fail'
-    if src_ds.GetRasterBand(3).GetRasterColorInterpretation() != gdal.GCI_BlueBand:
-        return 'fail'
-    if src_ds.GetRasterBand(4).GetRasterColorInterpretation() != gdal.GCI_AlphaBand:
-        return 'fail'
+    assert src_ds.RasterCount == 4
+    assert src_ds.GetRasterBand(1).Checksum() == 6
+    assert src_ds.GetRasterBand(2).Checksum() == 3
+    assert src_ds.GetRasterBand(3).Checksum() == 0
+    assert src_ds.GetRasterBand(4).Checksum() == 3
+    assert src_ds.GetRasterBand(1).GetRasterColorInterpretation() == gdal.GCI_RedBand
+    assert src_ds.GetRasterBand(2).GetRasterColorInterpretation() == gdal.GCI_GreenBand
+    assert src_ds.GetRasterBand(3).GetRasterColorInterpretation() == gdal.GCI_BlueBand
+    assert src_ds.GetRasterBand(4).GetRasterColorInterpretation() == gdal.GCI_AlphaBand
     src_ds = None
 
     return 'success'
@@ -1148,13 +1027,11 @@ def test_tiff_write_26():
     ds = gdal.Open('tmp/ct8.tif')
 
     ct = ds.GetRasterBand(1).GetRasterColorTable()
-    if ct.GetCount() != 256 or \
-       ct.GetColorEntry(0) != (255, 255, 255, 255) or \
-       ct.GetColorEntry(1) != (255, 255, 0, 255) or \
-       ct.GetColorEntry(2) != (255, 0, 255, 255) or \
-       ct.GetColorEntry(3) != (0, 255, 255, 255):
-        gdaltest.post_reason('Wrong color table entry.')
-        return 'fail'
+    assert (ct.GetCount() == 256 and \
+       ct.GetColorEntry(0) == (255, 255, 255, 255) and \
+       ct.GetColorEntry(1) == (255, 255, 0, 255) and \
+       ct.GetColorEntry(2) == (255, 0, 255, 255) and \
+       ct.GetColorEntry(3) == (0, 255, 255, 255)), 'Wrong color table entry.'
 
     ct = None
     ds = None
@@ -1190,13 +1067,11 @@ def test_tiff_write_27():
     ds = gdal.Open('tmp/ct16_copy.tif')
 
     ct = ds.GetRasterBand(1).GetRasterColorTable()
-    if ct.GetCount() != 65536 or \
-       ct.GetColorEntry(0) != (255, 255, 255, 255) or \
-       ct.GetColorEntry(1) != (255, 255, 0, 255) or \
-       ct.GetColorEntry(2) != (255, 0, 255, 255) or \
-       ct.GetColorEntry(3) != (0, 255, 255, 255):
-        gdaltest.post_reason('Wrong color table entry.')
-        return 'fail'
+    assert (ct.GetCount() == 65536 and \
+       ct.GetColorEntry(0) == (255, 255, 255, 255) and \
+       ct.GetColorEntry(1) == (255, 255, 0, 255) and \
+       ct.GetColorEntry(2) == (255, 0, 255, 255) and \
+       ct.GetColorEntry(3) == (0, 255, 255, 255)), 'Wrong color table entry.'
 
     ct = None
     ds = None
@@ -1214,20 +1089,17 @@ def test_tiff_write_28():
 
     ds = gdaltest.tiff_drv.Create('tmp/greyalpha.tif', 1, 1, 2)
 
-    if ds.GetRasterBand(2).GetRasterColorInterpretation() != gdal.GCI_Undefined:
-        return 'fail'
+    assert ds.GetRasterBand(2).GetRasterColorInterpretation() == gdal.GCI_Undefined
 
     ds.GetRasterBand(2).SetRasterColorInterpretation(gdal.GCI_AlphaBand)
 
-    if ds.GetRasterBand(2).GetRasterColorInterpretation() != gdal.GCI_AlphaBand:
-        return 'fail'
+    assert ds.GetRasterBand(2).GetRasterColorInterpretation() == gdal.GCI_AlphaBand
 
     ds = None
 
     ds = gdal.Open('tmp/greyalpha.tif')
 
-    if ds.GetRasterBand(2).GetRasterColorInterpretation() != gdal.GCI_AlphaBand:
-        return 'fail'
+    assert ds.GetRasterBand(2).GetRasterColorInterpretation() == gdal.GCI_AlphaBand
     ds = None
 
     gdaltest.tiff_drv.Delete('tmp/greyalpha.tif')
@@ -1243,59 +1115,41 @@ def test_tiff_write_29():
     # When creating a 4 channel image with PHOTOMETRIC=RGB,
     # TIFFTAG_EXTRASAMPLES=EXTRASAMPLE_UNSPECIFIED
     ds = gdaltest.tiff_drv.Create('/vsimem/rgba.tif', 1, 1, 4, options=['PHOTOMETRIC=RGB'])
-    if ds.GetMetadataItem('TIFFTAG_EXTRASAMPLES', '_DEBUG_') != '0':
-        print(ds.GetMetadataItem('TIFFTAG_EXTRASAMPLES', '_DEBUG_'))
-        return 'fail'
-    if ds.GetRasterBand(4).GetRasterColorInterpretation() != gdal.GCI_Undefined:
-        return 'fail'
+    assert ds.GetMetadataItem('TIFFTAG_EXTRASAMPLES', '_DEBUG_') == '0'
+    assert ds.GetRasterBand(4).GetRasterColorInterpretation() == gdal.GCI_Undefined
 
     # Now turn on alpha
     ds.GetRasterBand(4).SetRasterColorInterpretation(gdal.GCI_AlphaBand)
 
-    if ds.GetRasterBand(4).GetRasterColorInterpretation() != gdal.GCI_AlphaBand:
-        return 'fail'
-    if ds.GetMetadataItem('TIFFTAG_EXTRASAMPLES', '_DEBUG_') != '2':
-        print(ds.GetMetadataItem('TIFFTAG_EXTRASAMPLES', '_DEBUG_'))
-        return 'fail'
+    assert ds.GetRasterBand(4).GetRasterColorInterpretation() == gdal.GCI_AlphaBand
+    assert ds.GetMetadataItem('TIFFTAG_EXTRASAMPLES', '_DEBUG_') == '2'
     ds = None
 
-    if gdal.VSIStatL('/vsimem/rgba.tif.aux.xml') is not None:
-        return 'fail'
+    assert gdal.VSIStatL('/vsimem/rgba.tif.aux.xml') is None
 
     ds = gdal.Open('/vsimem/rgba.tif')
-    if ds.GetMetadataItem('TIFFTAG_EXTRASAMPLES', '_DEBUG_') != '2':
-        print(ds.GetMetadataItem('TIFFTAG_EXTRASAMPLES', '_DEBUG_'))
-        return 'fail'
-    if ds.GetRasterBand(4).GetRasterColorInterpretation() != gdal.GCI_AlphaBand:
-        return 'fail'
+    assert ds.GetMetadataItem('TIFFTAG_EXTRASAMPLES', '_DEBUG_') == '2'
+    assert ds.GetRasterBand(4).GetRasterColorInterpretation() == gdal.GCI_AlphaBand
 
     # Test cancelling alpha
     gdaltest.tiff_drv.CreateCopy('/vsimem/rgb_no_alpha.tif', ds, options=['ALPHA=NO'])
     ds = None
 
-    if gdal.VSIStatL('/vsimem/rgb_no_alpha.tif.aux.xml') is not None:
-        return 'fail'
+    assert gdal.VSIStatL('/vsimem/rgb_no_alpha.tif.aux.xml') is None
 
     ds = gdal.Open('/vsimem/rgb_no_alpha.tif')
-    if ds.GetMetadataItem('TIFFTAG_EXTRASAMPLES', '_DEBUG_') != '0':
-        print(ds.GetMetadataItem('TIFFTAG_EXTRASAMPLES', '_DEBUG_'))
-        return 'fail'
-    if ds.GetRasterBand(4).GetRasterColorInterpretation() != gdal.GCI_Undefined:
-        return 'fail'
+    assert ds.GetMetadataItem('TIFFTAG_EXTRASAMPLES', '_DEBUG_') == '0'
+    assert ds.GetRasterBand(4).GetRasterColorInterpretation() == gdal.GCI_Undefined
 
     # Test re-adding alpha
     gdaltest.tiff_drv.CreateCopy('/vsimem/rgb_added_alpha.tif', ds, options=['ALPHA=YES'])
     ds = None
 
-    if gdal.VSIStatL('/vsimem/rgb_added_alpha.tif.aux.xml') is not None:
-        return 'fail'
+    assert gdal.VSIStatL('/vsimem/rgb_added_alpha.tif.aux.xml') is None
 
     ds = gdal.Open('/vsimem/rgb_added_alpha.tif')
-    if ds.GetMetadataItem('TIFFTAG_EXTRASAMPLES', '_DEBUG_') != '2':
-        print(ds.GetMetadataItem('TIFFTAG_EXTRASAMPLES', '_DEBUG_'))
-        return 'fail'
-    if ds.GetRasterBand(4).GetRasterColorInterpretation() != gdal.GCI_AlphaBand:
-        return 'fail'
+    assert ds.GetMetadataItem('TIFFTAG_EXTRASAMPLES', '_DEBUG_') == '2'
+    assert ds.GetRasterBand(4).GetRasterColorInterpretation() == gdal.GCI_AlphaBand
     ds = None
 
     gdaltest.tiff_drv.Delete('/vsimem/rgba.tif')
@@ -1318,8 +1172,7 @@ def test_tiff_write_30():
     ds = None
 
     ds = gdal.Open('tmp/bigtiff.tif')
-    if ds is None:
-        return 'fail'
+    assert ds is not None
     ds = None
 
     fileobj = open('tmp/bigtiff.tif', mode='rb')
@@ -1330,9 +1183,8 @@ def test_tiff_write_30():
     gdaltest.tiff_drv.Delete('tmp/bigtiff.tif')
 
     # Check BigTIFF signature
-    if ((binvalues[2] != 0x2B or binvalues[3] != 0) and
-            (binvalues[3] != 0x2B or binvalues[2] != 0)):
-        return 'fail'
+    assert (not ((binvalues[2] != 0x2B or binvalues[3] != 0) and
+            (binvalues[3] != 0x2B or binvalues[2] != 0)))
 
     return 'success'
 
@@ -1351,8 +1203,7 @@ def test_tiff_write_31():
     ds = None
 
     ds = gdal.Open('tmp/bigtiff.tif')
-    if ds is None:
-        return 'fail'
+    assert ds is not None
     ds = None
 
     fileobj = open('tmp/bigtiff.tif', mode='rb')
@@ -1363,9 +1214,8 @@ def test_tiff_write_31():
     gdaltest.tiff_drv.Delete('tmp/bigtiff.tif')
 
     # Check BigTIFF signature
-    if ((binvalues[2] != 0x2B or binvalues[3] != 0) and
-            (binvalues[3] != 0x2B or binvalues[2] != 0)):
-        return 'fail'
+    assert (not ((binvalues[2] != 0x2B or binvalues[3] != 0) and
+            (binvalues[3] != 0x2B or binvalues[2] != 0)))
 
     return 'success'
 
@@ -1400,8 +1250,7 @@ def test_tiff_write_32():
             print('')
             print(('old = ', gt))
             print(('new = ', new_gt))
-            gdaltest.post_reason('Geotransform differs.')
-            return 'fail'
+            pytest.fail('Geotransform differs.')
 
     ds = None
 
@@ -1428,14 +1277,10 @@ def test_tiff_write_33():
     ds = gdal.Open('tmp/tw_33.tif')
 
     md = ds.GetMetadata()
-    if 'test' not in md:
-        gdaltest.post_reason('Metadata absent from .aux.xml file.')
-        return 'fail'
+    assert 'test' in md, 'Metadata absent from .aux.xml file.'
 
     md = ds.GetRasterBand(1).GetMetadata()
-    if 'testBand' not in md:
-        gdaltest.post_reason('Metadata absent from .aux.xml file.')
-        return 'fail'
+    assert 'testBand' in md, 'Metadata absent from .aux.xml file.'
 
     ds = None
 
@@ -1451,14 +1296,10 @@ def test_tiff_write_33():
     ds = gdal.Open('tmp/tw_33.tif')
 
     md = ds.GetMetadata()
-    if 'test' in md:
-        gdaltest.post_reason('Metadata written to GeoTIFF file.')
-        return 'fail'
+    assert 'test' not in md, 'Metadata written to GeoTIFF file.'
 
     md = ds.GetRasterBand(1).GetMetadata()
-    if 'testBand' in md:
-        gdaltest.post_reason('Metadata written to GeoTIFF file.')
-        return 'fail'
+    assert 'testBand' not in md, 'Metadata written to GeoTIFF file.'
 
     ds = None
 
@@ -1483,14 +1324,10 @@ def test_tiff_write_34():
     ds = gdal.Open('tmp/tw_34.tif')
 
     md = ds.GetMetadata()
-    if 'test' not in md:
-        gdaltest.post_reason('Metadata absent from .aux.xml file.')
-        return 'fail'
+    assert 'test' in md, 'Metadata absent from .aux.xml file.'
 
     md = ds.GetRasterBand(1).GetMetadata()
-    if 'testBand' not in md:
-        gdaltest.post_reason('Metadata absent from .aux.xml file.')
-        return 'fail'
+    assert 'testBand' in md, 'Metadata absent from .aux.xml file.'
 
     ds = None
 
@@ -1506,14 +1343,10 @@ def test_tiff_write_34():
     ds = gdal.Open('tmp/tw_34.tif')
 
     md = ds.GetMetadata()
-    if 'test' in md:
-        gdaltest.post_reason('Metadata written to GeoTIFF file.')
-        return 'fail'
+    assert 'test' not in md, 'Metadata written to GeoTIFF file.'
 
     md = ds.GetRasterBand(1).GetMetadata()
-    if 'testBand' in md:
-        gdaltest.post_reason('Metadata written to GeoTIFF file.')
-        return 'fail'
+    assert 'testBand' not in md, 'Metadata written to GeoTIFF file.'
 
     ds = None
 
@@ -1570,9 +1403,7 @@ def test_tiff_write_35():
     gdal.PopErrorHandler()
 
     md = ds.GetMetadata()
-    if 'test' not in md or len(md['test']) != 32768:
-        gdaltest.post_reason('Did not get expected metadata.')
-        return 'fail'
+    assert 'test' in md and len(md['test']) == 32768, 'Did not get expected metadata.'
 
     ds = None
 
@@ -1596,29 +1427,18 @@ def tiff_write_big_odd_bits(vrtfilename, tmpfilename, nbits, interleaving):
     ds = gdal.Open(tmpfilename)
     bnd = ds.GetRasterBand(1)
     cs = bnd.Checksum()
-    if cs != 4672:
-        gdaltest.post_reason('Didnt get expected checksum on band 1')
-        print(cs)
-        return 'fail'
+    assert cs == 4672, 'Didnt get expected checksum on band 1'
     md = bnd.GetMetadata('IMAGE_STRUCTURE')
-    if md['NBITS'] != str(nbits):
-        gdaltest.post_reason('Didnt get expected NBITS value')
-        return 'fail'
+    assert md['NBITS'] == str(nbits), 'Didnt get expected NBITS value'
 
     bnd = ds.GetRasterBand(2)
-    if bnd.Checksum() != 4672:
-        gdaltest.post_reason('Didnt get expected checksum on band 2')
-        return 'fail'
+    assert bnd.Checksum() == 4672, 'Didnt get expected checksum on band 2'
     bnd = ds.GetRasterBand(3)
-    if bnd.Checksum() != 4672:
-        gdaltest.post_reason('Didnt get expected checksum on band 3')
-        return 'fail'
+    assert bnd.Checksum() == 4672, 'Didnt get expected checksum on band 3'
     bnd = None
 
     md = ds.GetMetadata('IMAGE_STRUCTURE')
-    if md['INTERLEAVE'] != interleaving:
-        gdaltest.post_reason('Didnt get expected interleaving')
-        return 'fail'
+    assert md['INTERLEAVE'] == interleaving, 'Didnt get expected interleaving'
 
     ds = None
 
@@ -1694,9 +1514,7 @@ def test_tiff_write_44():
     bnd = ds.GetRasterBand(1)
     md = bnd.GetMetadata('IMAGE_STRUCTURE')
     bnd = None
-    if md['NBITS'] != '9':
-        gdaltest.post_reason('Didnt get expected NBITS value')
-        return 'fail'
+    assert md['NBITS'] == '9', 'Didnt get expected NBITS value'
 
     ds2 = gdaltest.tiff_drv.CreateCopy('tmp/tw_44_copy.tif', ds)
     ds2 = None
@@ -1705,9 +1523,7 @@ def test_tiff_write_44():
     bnd = ds2.GetRasterBand(1)
     md = bnd.GetMetadata('IMAGE_STRUCTURE')
     bnd = None
-    if md['NBITS'] != '9':
-        gdaltest.post_reason('Didnt get expected NBITS value')
-        return 'fail'
+    assert md['NBITS'] == '9', 'Didnt get expected NBITS value'
 
     ds = None
     ds2 = None
@@ -1729,9 +1545,7 @@ def test_tiff_write_45():
     bnd = ds.GetRasterBand(1)
     md = bnd.GetMetadata('IMAGE_STRUCTURE')
     bnd = None
-    if md['NBITS'] != '17':
-        gdaltest.post_reason('Didnt get expected NBITS value')
-        return 'fail'
+    assert md['NBITS'] == '17', 'Didnt get expected NBITS value'
 
     ds2 = gdaltest.tiff_drv.CreateCopy('tmp/tw_45_copy.tif', ds)
     ds2 = None
@@ -1740,9 +1554,7 @@ def test_tiff_write_45():
     bnd = ds2.GetRasterBand(1)
     md = bnd.GetMetadata('IMAGE_STRUCTURE')
     bnd = None
-    if md['NBITS'] != '17':
-        gdaltest.post_reason('Didnt get expected NBITS value')
-        return 'fail'
+    assert md['NBITS'] == '17', 'Didnt get expected NBITS value'
 
     ds = None
     ds2 = None
@@ -1784,9 +1596,7 @@ def test_tiff_write_46():
         # We expect (1, 1, 1, 1, 1, 1, 1, 1, 1, 1)
         got = struct.unpack('B' * 10, data)
         for g in got:
-            if g != 1:
-                print(got)
-                return 'fail'
+            assert g == 1, got
 
     ds = None
     ds2 = None
@@ -1825,9 +1635,7 @@ def test_tiff_write_48():
 
     new_ds = None
     new_ds = gdal.Open('tmp/tiff_write_48.tif')
-    if new_ds.GetRasterBand(1).Checksum() != 50054:
-        gdaltest.post_reason('Didnt get expected checksum ')
-        return 'fail'
+    assert new_ds.GetRasterBand(1).Checksum() == 50054, 'Didnt get expected checksum '
 
     new_ds = None
 
@@ -1847,19 +1655,16 @@ def test_tiff_write_49():
     new_ds = gdal.GetDriverByName("GTiff").CreateCopy('tmp/tiff_write_49.tif', src_ds, options=['PHOTOMETRIC=CMYK'])
 
     # At this point, for the purpose of the copy, the dataset will have been opened as RAW
-    if new_ds.GetRasterBand(1).GetRasterColorInterpretation() != gdal.GCI_CyanBand:
-        gdaltest.post_reason('Wrong color interpretation.')
-        print(new_ds.GetRasterBand(1).GetRasterColorInterpretation())
-        return 'fail'
+    assert new_ds.GetRasterBand(1).GetRasterColorInterpretation() == gdal.GCI_CyanBand, \
+        'Wrong color interpretation.'
 
     new_ds = None
 
     new_ds = gdal.Open('GTIFF_RAW:tmp/tiff_write_49.tif')
 
     for i in range(4):
-        if new_ds.GetRasterBand(i + 1).Checksum() != src_ds.GetRasterBand(i + 1).Checksum():
-            gdaltest.post_reason('Didnt get expected checksum ')
-            return 'fail'
+        assert new_ds.GetRasterBand(i + 1).Checksum() == src_ds.GetRasterBand(i + 1).Checksum(), \
+            'Didnt get expected checksum '
 
     src_ds = None
     new_ds = None
@@ -1882,19 +1687,16 @@ def test_tiff_write_50():
         data = src_ds.GetRasterBand(i + 1).ReadRaster(0, 0, src_ds.RasterXSize, src_ds.RasterYSize)
         new_ds.GetRasterBand(i + 1).WriteRaster(0, 0, src_ds.RasterXSize, src_ds.RasterYSize, data)
 
-    if new_ds.GetRasterBand(1).GetRasterColorInterpretation() != gdal.GCI_CyanBand:
-        gdaltest.post_reason('Wrong color interpretation.')
-        print(new_ds.GetRasterBand(1).GetRasterColorInterpretation())
-        return 'fail'
+    assert new_ds.GetRasterBand(1).GetRasterColorInterpretation() == gdal.GCI_CyanBand, \
+        'Wrong color interpretation.'
 
     new_ds = None
 
     new_ds = gdal.Open('GTIFF_RAW:tmp/tiff_write_50.tif')
 
     for i in range(4):
-        if new_ds.GetRasterBand(i + 1).Checksum() != src_ds.GetRasterBand(i + 1).Checksum():
-            gdaltest.post_reason('Didnt get expected checksum ')
-            return 'fail'
+        assert new_ds.GetRasterBand(i + 1).Checksum() == src_ds.GetRasterBand(i + 1).Checksum(), \
+            'Didnt get expected checksum '
 
     src_ds = None
     new_ds = None
@@ -1932,15 +1734,11 @@ def test_tiff_write_51():
     expected_wkt = ds.GetProjection()
     ds = None
 
-    if wkt.find('NAD') != -1 or wkt.find('North Am') != -1:
-        gdaltest.post_reason('It appears the NAD27 datum was not properly cleared.')
-        return 'fail'
+    assert wkt.find('NAD') == -1 and wkt.find('North Am') == -1, \
+        'It appears the NAD27 datum was not properly cleared.'
 
-    if wkt != expected_wkt or wkt.find('WGS 84 / UTM zone 1N') == -1:
-        print(wkt)
-        print(expected_wkt)
-        gdaltest.post_reason('coordinate system does not exactly match.')
-        return 'fail'
+    assert wkt == expected_wkt and wkt.find('WGS 84 / UTM zone 1N') != -1, \
+        'coordinate system does not exactly match.'
 
     ds = None
 
@@ -1969,10 +1767,7 @@ def test_tiff_write_52():
     ds = gdal.Open('tmp/tiff_write_52.tif')
     ct = ds.GetRasterBand(1).GetRasterColorTable()
 
-    if ct.GetColorEntry(0) != (255, 0, 0, 255):
-        print((ct.GetColorEntry(0)))
-        gdaltest.post_reason('Did not get expected color 0.')
-        return 'fail'
+    assert ct.GetColorEntry(0) == (255, 0, 0, 255), 'Did not get expected color 0.'
 
     ct = None
     ds = None
@@ -2005,10 +1800,7 @@ def test_tiff_write_53():
     ds = gdal.Open('tmp/tiff_write_53.tif')
     ct = ds.GetRasterBand(1).GetRasterColorTable()
 
-    if ct.GetColorEntry(0) != (255, 0, 0, 255):
-        print((ct.GetColorEntry(0)))
-        gdaltest.post_reason('Did not get expected color 0.')
-        return 'fail'
+    assert ct.GetColorEntry(0) == (255, 0, 0, 255), 'Did not get expected color 0.'
 
     ct = None
     ds = None
@@ -2043,10 +1835,7 @@ def test_tiff_write_53_bis():
     ds = gdal.Open('tmp/tiff_write_53_bis.tif')
     ct = ds.GetRasterBand(1).GetRasterColorTable()
 
-    if ct.GetColorEntry(0) != (255, 0, 0, 255):
-        print((ct.GetColorEntry(0)))
-        gdaltest.post_reason('Did not get expected color 0.')
-        return 'fail'
+    assert ct.GetColorEntry(0) == (255, 0, 0, 255), 'Did not get expected color 0.'
 
     ct = None
     ds = None
@@ -2079,10 +1868,7 @@ def test_tiff_write_54():
 
     gdaltest.tiff_drv.Delete('tmp/tiff_write_54.tif')
 
-    if cs == 0:
-        gdaltest.post_reason('did not get expected checksum')
-        print(cs)
-        return 'fail'
+    assert cs != 0, 'did not get expected checksum'
 
     return 'success'
 
@@ -2105,10 +1891,8 @@ def test_tiff_write_55():
     srs = ds.GetProjectionRef()
     ds = None
 
-    if srs != srs_expected:
-        print(srs)
-        gdaltest.post_reason('failed to preserve Equirectangular projection as expected, old libgeotiff?')
-        return 'fail'
+    assert srs == srs_expected, \
+        'failed to preserve Equirectangular projection as expected, old libgeotiff?'
 
     gdaltest.tiff_drv.Delete('tmp/tiff_write_55.tif')
 
@@ -2146,9 +1930,7 @@ def test_tiff_write_56():
     ds = gdal.Open('tmp/tiff_write_56.tif')
     ct = ds.GetRasterBand(1).GetRasterColorTable()
 
-    if ct is not None:
-        gdaltest.post_reason('color table seemingly not cleared.')
-        return 'fail'
+    assert ct is None, 'color table seemingly not cleared.'
 
     ct = None
     ds = None
@@ -2181,10 +1963,8 @@ def test_tiff_write_57():
     gt = ds.GetGeoTransform()
     ds = None
 
-    if gt != (100, 1, 3, 200, 3, 1):
-        print(gt)
-        gdaltest.post_reason('did not get expected geotransform, perhaps unset is not working?')
-        return 'fail'
+    assert gt == (100, 1, 3, 200, 3, 1), \
+        'did not get expected geotransform, perhaps unset is not working?'
 
     gdaltest.tiff_drv.Delete('tmp/tiff57.tif')
 
@@ -2206,9 +1986,7 @@ def test_tiff_write_58():
             ds = None
 
             ds = gdal.Open('tmp/tiff_write_58.tif')
-            if ds.GetRasterBand(1).Checksum() != 65241:
-                gdaltest.post_reason('wrong checksum')
-                return 'fail'
+            assert ds.GetRasterBand(1).Checksum() == 65241, 'wrong checksum'
             ds = None
 
             gdaltest.tiff_drv.Delete('tmp/tiff_write_58.tif')
@@ -2286,9 +2064,7 @@ def test_tiff_write_60():
 
         with gdaltest.error_handler():
             ds = gdal.Open('tmp/tiff_write_60.tif')
-        if ds.GetGeoTransform() != gt:
-            gdaltest.post_reason('case1: %s != %s' % (ds.GetGeoTransform(), gt))
-            return 'fail'
+        assert ds.GetGeoTransform() == gt, ('case1: %s != %s' % (ds.GetGeoTransform(), gt))
 
         ds = None
         gdaltest.tiff_drv.Delete('tmp/tiff_write_60.tif')
@@ -2310,9 +2086,8 @@ def test_tiff_write_60():
         gdal.Unlink('tmp/tiff_write_60.tif.aux.xml')
 
         ds = gdal.Open('tmp/tiff_write_60.tif')
-        if ds.GetGeoTransform() != gt:
-            gdaltest.post_reason('case2: %s != %s' % (ds.GetGeoTransform(), gt))
-            return 'fail'
+        assert ds.GetGeoTransform() == gt, \
+            ('case2: %s != %s' % (ds.GetGeoTransform(), gt))
 
         ds = None
         gdaltest.tiff_drv.Delete('tmp/tiff_write_60.tif')
@@ -2341,8 +2116,7 @@ def test_tiff_write_61():
     ds = None
 
     ds = gdal.Open('tmp/bigtiff.tif')
-    if ds is None:
-        return 'fail'
+    assert ds is not None
     ds = None
 
     fileobj = open('tmp/bigtiff.tif', mode='rb')
@@ -2353,9 +2127,8 @@ def test_tiff_write_61():
     gdaltest.tiff_drv.Delete('tmp/bigtiff.tif')
 
     # Check classical TIFF signature
-    if ((binvalues[2] != 0x2A or binvalues[3] != 0) and
-            (binvalues[3] != 0x2A or binvalues[2] != 0)):
-        return 'fail'
+    assert (not ((binvalues[2] != 0x2A or binvalues[3] != 0) and
+            (binvalues[3] != 0x2A or binvalues[2] != 0)))
 
     return 'success'
 
@@ -2374,8 +2147,7 @@ def test_tiff_write_62():
     ds = None
 
     ds = gdal.Open('tmp/bigtiff.tif')
-    if ds is None:
-        return 'fail'
+    assert ds is not None
     ds = None
 
     fileobj = open('tmp/bigtiff.tif', mode='rb')
@@ -2386,9 +2158,8 @@ def test_tiff_write_62():
     gdaltest.tiff_drv.Delete('tmp/bigtiff.tif')
 
     # Check BigTIFF signature
-    if ((binvalues[2] != 0x2B or binvalues[3] != 0) and
-            (binvalues[3] != 0x2B or binvalues[2] != 0)):
-        return 'fail'
+    assert (not ((binvalues[2] != 0x2B or binvalues[3] != 0) and
+            (binvalues[3] != 0x2B or binvalues[2] != 0)))
 
     return 'success'
 
@@ -2432,11 +2203,7 @@ def test_tiff_write_64():
 
     expected_wkt = """GEOGCS["WGS 84",DATUM["WGS_1984",SPHEROID["WGS 84",6378137,298.257223563,AUTHORITY["EPSG","7030"]],AUTHORITY["EPSG","6326"]],PRIMEM["Greenwich",0],UNIT["degree",0.0174532925199433],AUTHORITY["EPSG","4326"]]"""
 
-    if wkt != expected_wkt:
-        print(wkt)
-        print(expected_wkt)
-        gdaltest.post_reason('coordinate system does not exactly match.')
-        return 'fail'
+    assert wkt == expected_wkt, 'coordinate system does not exactly match.'
 
     gdaltest.tiff_drv.Delete('tmp/tiff_write_64.tif')
 
@@ -2459,9 +2226,7 @@ def test_tiff_write_65():
     md = ds.GetMetadata('xml:test')
     ds = None
 
-    if len(md) != 1 or md[0] != doc:
-        gdaltest.post_reason('did not get xml back clean')
-        return 'fail'
+    assert len(md) == 1 and md[0] == doc, 'did not get xml back clean'
 
     gdaltest.tiff_drv.Delete('tmp/tiff_write_65.tif')
 
@@ -2480,14 +2245,11 @@ def test_tiff_write_66():
     ds = None
 
     ds = gdal.Open('tmp/tiff_write_66.tif')
-    if ds.RasterCount != 65535:
-        return 'fail'
+    assert ds.RasterCount == 65535
 
-    if ds.GetRasterBand(1).Checksum() != 0:
-        return 'fail'
+    assert ds.GetRasterBand(1).Checksum() == 0
 
-    if ds.GetRasterBand(65535).Checksum() != 0:
-        return 'fail'
+    assert ds.GetRasterBand(65535).Checksum() == 0
 
     ds = None
 
@@ -2508,14 +2270,11 @@ def test_tiff_write_67():
     ds = None
 
     ds = gdal.Open('tmp/tiff_write_67.tif')
-    if ds.RasterCount != 65535:
-        return 'fail'
+    assert ds.RasterCount == 65535
 
-    if ds.GetRasterBand(1).Checksum() != 0:
-        return 'fail'
+    assert ds.GetRasterBand(1).Checksum() == 0
 
-    if ds.GetRasterBand(65535).Checksum() != 0:
-        return 'fail'
+    assert ds.GetRasterBand(65535).Checksum() == 0
 
     ds = None
 
@@ -2540,8 +2299,7 @@ def test_tiff_write_68():
     ds = None
 
     ds = gdal.Open('tmp/tiff_write_68.tif')
-    if ds.GetRasterBand(1).Checksum() == 0:
-        return 'fail'
+    assert ds.GetRasterBand(1).Checksum() != 0
     ds = None
 
     gdaltest.tiff_drv.Delete('tmp/tiff_write_68.tif')
@@ -2558,9 +2316,7 @@ def test_tiff_write_69():
     ds = None
 
     ds = gdal.Open('tmp/tiff_write_69.tif')
-    if ds.GetRasterBand(1).Checksum() != 0:
-        print((ds.GetRasterBand(1).Checksum()))
-        return 'fail'
+    assert ds.GetRasterBand(1).Checksum() == 0
     ds = None
 
     gdaltest.tiff_drv.Delete('tmp/tiff_write_69.tif')
@@ -2583,10 +2339,8 @@ def test_tiff_write_70():
 
     ds = gdaltest.tiff_drv.Create('tmp/tiff_write_70.tif', 32, 32, 1, gdal.GDT_Int16, options=['SPARSE_OK=YES'])
     ds.GetRasterBand(1).SetNoDataValue(0)
-    if os.stat('tmp/tiff_write_70.tif').st_size > 8:
-        gdaltest.post_reason('directory should not be crystallized')
-        print(os.stat('tmp/tiff_write_70.tif').st_size)
-        return 'fail'
+    assert os.stat('tmp/tiff_write_70.tif').st_size <= 8, \
+        'directory should not be crystallized'
     ds = None
 
     ds = gdal.Open('tmp/tiff_write_70.tif', gdal.GA_Update)
@@ -2594,18 +2348,12 @@ def test_tiff_write_70():
     ds = None
 
     ds = gdal.Open('tmp/tiff_write_70.tif')
-    if ds.GetRasterBand(1).Checksum() != expected_cs:
-        gdaltest.post_reason('wrong checksum')
-        print((ds.GetRasterBand(1).Checksum()))
-        print(expected_cs)
-        return 'fail'
+    assert ds.GetRasterBand(1).Checksum() == expected_cs, 'wrong checksum'
     ds = None
 
     ds = gdal.Open('tmp/tiff_write_70.tif', gdal.GA_Update)
-    if ds.GetRasterBand(1).DeleteNoDataValue() != 0:
-        return 'fail'
-    if ds.GetRasterBand(1).GetNoDataValue() is not None:
-        return 'fail'
+    assert ds.GetRasterBand(1).DeleteNoDataValue() == 0
+    assert ds.GetRasterBand(1).GetNoDataValue() is None
     ds = None
 
     try:
@@ -2615,8 +2363,7 @@ def test_tiff_write_70():
         pass
 
     ds = gdal.Open('tmp/tiff_write_70.tif')
-    if ds.GetRasterBand(1).GetNoDataValue() is not None:
-        return 'fail'
+    assert ds.GetRasterBand(1).GetNoDataValue() is None
     ds = None
 
     gdaltest.tiff_drv.Delete('tmp/tiff_write_70.tif')
@@ -2664,8 +2411,7 @@ def test_tiff_write_71():
 
     ds = gdal.Open('tmp/tiff_write_71.tif')
     data = ds.GetRasterBand(1).ReadRaster(99999, 99999, 1, 1)
-    if struct.unpack('b', data)[0] != 0x78:
-        return 'fail'
+    assert struct.unpack('b', data)[0] == 0x78
     ds = None
 
     gdaltest.tiff_drv.Delete('tmp/tiff_write_71.tif')
@@ -2700,9 +2446,8 @@ def test_tiff_write_72():
         fileobj.close()
 
         # Directory should be at offset 8 of the file
-        if not (binvalues[0] == 0x08 and binvalues[1] == 0x00 and binvalues[2] == 0x00 and binvalues[3] == 0x00):
-            gdaltest.post_reason('Failed with profile %s' % profile)
-            return 'fail'
+        assert (binvalues[0] == 0x08 and binvalues[1] == 0x00 and binvalues[2] == 0x00 and binvalues[3] == 0x00), \
+            ('Failed with profile %s' % profile)
 
     gdaltest.tiff_drv.Delete('tmp/byte.tif')
     gdaltest.tiff_drv.Delete('tmp/tiff_write_72.tif')
@@ -2736,8 +2481,7 @@ def test_tiff_write_73():
     fileobj.close()
 
     # Directory should be at offset 8 of the file
-    if not (binvalues[0] == 0x08 and binvalues[1] == 0x00 and binvalues[2] == 0x00 and binvalues[3] == 0x00):
-        return 'fail'
+    assert (binvalues[0] == 0x08 and binvalues[1] == 0x00 and binvalues[2] == 0x00 and binvalues[3] == 0x00)
 
     # Re-open the file and modify the pixel content
     out_ds = gdal.Open('tmp/tiff_write_73.tif', gdal.GA_Update)
@@ -2754,8 +2498,7 @@ def test_tiff_write_73():
     fileobj.close()
 
     # Directory should be at offset 8 of the file
-    if not (binvalues[0] == 0x08 and binvalues[1] == 0x00 and binvalues[2] == 0x00 and binvalues[3] == 0x00):
-        return 'fail'
+    assert (binvalues[0] == 0x08 and binvalues[1] == 0x00 and binvalues[2] == 0x00 and binvalues[3] == 0x00)
 
     gdaltest.tiff_drv.Delete('tmp/tiff_write_73.tif')
 
@@ -2803,10 +2546,8 @@ def test_tiff_write_74():
         stats = dst_ds.GetRasterBand(1).GetStatistics(0, 1)
 
         if stats[2] < 2150 or stats[2] > 2180:
-            gdaltest.post_reason('did not get expected mean for band1.')
-            print(stats)
             print(photometric)
-            return 'fail'
+            pytest.fail('did not get expected mean for band1.')
 
         try:
             compression = dst_ds.GetMetadataItem('COMPRESSION', 'IMAGE_STRUCTURE')
@@ -2816,10 +2557,8 @@ def test_tiff_write_74():
 
         if (photometric == 'YCBCR' and compression != 'YCbCr JPEG') or \
            (photometric == 'RGB' and compression != 'JPEG'):
-            gdaltest.post_reason('did not get expected COMPRESSION value')
             print(('COMPRESSION="%s"' % compression))
-            print(photometric)
-            return 'fail'
+            pytest.fail('did not get expected COMPRESSION value')
 
         try:
             nbits = dst_ds.GetRasterBand(3).GetMetadataItem('NBITS', 'IMAGE_STRUCTURE')
@@ -2828,9 +2567,8 @@ def test_tiff_write_74():
             nbits = md['NBITS']
 
         if nbits != '12':
-            gdaltest.post_reason('did not get expected NBITS value')
             print(photometric)
-            return 'fail'
+            pytest.fail('did not get expected NBITS value')
 
         dst_ds = None
 
@@ -2865,10 +2603,7 @@ def test_tiff_write_76():
     new_ds = gdal.Open('tmp/tiff_write_76.tif')
 
     cs = new_ds.GetRasterBand(1).Checksum()
-    if cs != 3322:
-        print(cs)
-        gdaltest.post_reason('Got wrong checksum')
-        return 'fail'
+    assert cs == 3322, 'Got wrong checksum'
 
     src_ds = None
     new_ds = None
@@ -2903,19 +2638,13 @@ def test_tiff_write_77():
                     expected_cs = 255 % 7
                 else:
                     expected_cs = 0 % 7
-                if cs != expected_cs:
-                    print(cs)
-                    gdaltest.post_reason('Got wrong checksum')
-                    return 'fail'
+                assert cs == expected_cs, 'Got wrong checksum'
 
             # Test whole bands
             for i in range(3):
                 cs = new_ds.GetRasterBand(i + 1).Checksum()
                 expected_cs = src_ds.GetRasterBand(i + 1).Checksum()
-                if cs != expected_cs:
-                    print(cs)
-                    gdaltest.post_reason('Got wrong checksum')
-                    return 'fail'
+                assert cs == expected_cs, 'Got wrong checksum'
 
             if attempt == 0:
                 new_ds = None
@@ -2973,11 +2702,8 @@ def test_tiff_write_78():
             # this ends up being 1
             expected_cs = 1 % 7
         if cs != expected_cs:
-            print(cs)
-            print(expected_cs)
             print(band_line)
-            gdaltest.post_reason('Got wrong checksum')
-            return 'fail'
+            pytest.fail('Got wrong checksum')
 
     # Test whole bands
     for i in range(3):
@@ -2987,10 +2713,7 @@ def test_tiff_write_78():
             # We should expect 0, but due to JPEG YCbCr compression & decompression,
             # this ends up being 32768
             expected_cs = 32768
-        if cs != expected_cs:
-            print(cs)
-            gdaltest.post_reason('Got wrong checksum')
-            return 'fail'
+        assert cs == expected_cs, 'Got wrong checksum'
 
     new_ds = None
     gdaltest.tiff_drv.Delete('tmp/tiff_write_78.tif')
@@ -3019,10 +2742,8 @@ def test_tiff_write_79():
             if do_projection_ref:
                 ds.GetProjectionRef()
             mdi = ds.GetMetadataItem('AREA_OR_POINT')
-            if mdi != 'Area':
-                gdaltest.post_reason('(1) did not get expected value. do_projection_ref = %d, check_just_after = %d' % (do_projection_ref, check_just_after))
-                print(mdi)
-                return 'fail'
+            assert mdi == 'Area', \
+                ('(1) did not get expected value. do_projection_ref = %d, check_just_after = %d' % (do_projection_ref, check_just_after))
             ds = None
 
             # Still read-only.
@@ -3044,10 +2765,8 @@ def test_tiff_write_79():
             if do_projection_ref:
                 ds.GetProjectionRef()
             mdi = ds.GetMetadataItem('AREA_OR_POINT')
-            if mdi != 'Area':
-                gdaltest.post_reason('(2) did not get expected value. do_projection_ref = %d, check_just_after = %d' % (do_projection_ref, check_just_after))
-                print(mdi)
-                return 'fail'
+            assert mdi == 'Area', \
+                ('(2) did not get expected value. do_projection_ref = %d, check_just_after = %d' % (do_projection_ref, check_just_after))
             ds = None
 
             # Now update to 'Point'
@@ -3057,10 +2776,8 @@ def test_tiff_write_79():
             ds.SetMetadataItem('AREA_OR_POINT', 'Point')
             if check_just_after:
                 mdi = ds.GetMetadataItem('AREA_OR_POINT')
-                if mdi != 'Point':
-                    gdaltest.post_reason('(3) did not get expected value. do_projection_ref = %d, check_just_after = %d' % (do_projection_ref, check_just_after))
-                    print(mdi)
-                    return 'fail'
+                assert mdi == 'Point', \
+                    ('(3) did not get expected value. do_projection_ref = %d, check_just_after = %d' % (do_projection_ref, check_just_after))
             ds = None
             try:
                 # check that it doesn't go to PAM
@@ -3075,10 +2792,8 @@ def test_tiff_write_79():
             if do_projection_ref:
                 ds.GetProjectionRef()
             mdi = ds.GetMetadataItem('AREA_OR_POINT')
-            if mdi != 'Point':
-                gdaltest.post_reason('(4) did not get expected value. do_projection_ref = %d, check_just_after = %d' % (do_projection_ref, check_just_after))
-                print(mdi)
-                return 'fail'
+            assert mdi == 'Point', \
+                ('(4) did not get expected value. do_projection_ref = %d, check_just_after = %d' % (do_projection_ref, check_just_after))
             ds = None
 
             # Now update back to 'Area' through SetMetadata()
@@ -3090,10 +2805,8 @@ def test_tiff_write_79():
             ds.SetMetadata(md)
             if check_just_after:
                 mdi = ds.GetMetadataItem('AREA_OR_POINT')
-                if mdi != 'Area':
-                    gdaltest.post_reason('(5) did not get expected value. do_projection_ref = %d, check_just_after = %d' % (do_projection_ref, check_just_after))
-                    print(mdi)
-                    return 'fail'
+                assert mdi == 'Area', \
+                    ('(5) did not get expected value. do_projection_ref = %d, check_just_after = %d' % (do_projection_ref, check_just_after))
             ds = None
 
             # Now should get 'Area'
@@ -3101,10 +2814,7 @@ def test_tiff_write_79():
             if do_projection_ref:
                 ds.GetProjectionRef()
             mdi = ds.GetMetadataItem('AREA_OR_POINT')
-            if mdi != 'Area':
-                gdaltest.post_reason('(6) did not get expected value')
-                print(mdi)
-                return 'fail'
+            assert mdi == 'Area', '(6) did not get expected value'
             ds = None
 
     gdaltest.tiff_drv.Delete('tmp/tiff_write_79.tif')
@@ -3134,11 +2844,8 @@ def test_tiff_write_80():
     ds = gdal.Open('tmp/tiff_write_80.tif')
     scale = ds.GetRasterBand(1).GetScale()
     offset = ds.GetRasterBand(1).GetOffset()
-    if scale != 100 or offset != 1000:
-        gdaltest.post_reason('did not get expected values in internal case (1)')
-        print(scale)
-        print(offset)
-        return 'fail'
+    assert scale == 100 and offset == 1000, \
+        'did not get expected values in internal case (1)'
     ds = None
 
     # Test CreateCopy()
@@ -3149,11 +2856,7 @@ def test_tiff_write_80():
     ds = gdal.Open('tmp/tiff_write_80_copy.tif')
     scale = ds.GetRasterBand(1).GetScale()
     offset = ds.GetRasterBand(1).GetOffset()
-    if scale != 100 or offset != 1000:
-        gdaltest.post_reason('did not get expected values in copy')
-        print(scale)
-        print(offset)
-        return 'fail'
+    assert scale == 100 and offset == 1000, 'did not get expected values in copy'
     ds = None
     gdaltest.tiff_drv.Delete('tmp/tiff_write_80_copy.tif')
 
@@ -3166,20 +2869,16 @@ def test_tiff_write_80():
     ds = gdal.Open('tmp/tiff_write_80.tif')
     scale = ds.GetRasterBand(1).GetScale()
     offset = ds.GetRasterBand(1).GetOffset()
-    if scale != 1 or offset != 0:
-        gdaltest.post_reason('did not get expected values in internal case (2)')
-        print(scale)
-        print(offset)
-        return 'fail'
+    assert scale == 1 and offset == 0, \
+        'did not get expected values in internal case (2)'
     ds = None
 
     gdaltest.tiff_drv.Delete('tmp/tiff_write_80.tif')
 
     # Third part : test storing and retrieving scale & offsets from PAM metadata
     ds = gdaltest.tiff_drv.Create('tmp/tiff_write_80_bis.tif', 1, 1)
-    if ds.GetRasterBand(1).GetScale() is not None or ds.GetRasterBand(1).GetOffset() is not None:
-        gdaltest.post_reason('expected None values')
-        return 'fail'
+    assert ds.GetRasterBand(1).GetScale() is None and ds.GetRasterBand(1).GetOffset() is None, \
+        'expected None values'
     ds = None
 
     ds = gdal.Open('tmp/tiff_write_80_bis.tif')
@@ -3197,11 +2896,8 @@ def test_tiff_write_80():
     ds = gdal.Open('tmp/tiff_write_80_bis.tif')
     scale = ds.GetRasterBand(1).GetScale()
     offset = ds.GetRasterBand(1).GetOffset()
-    if scale != -100 or offset != -1000:
-        gdaltest.post_reason('did not get expected values in PAM case (1)')
-        print(scale)
-        print(offset)
-        return 'fail'
+    assert scale == -100 and offset == -1000, \
+        'did not get expected values in PAM case (1)'
     ds = None
 
     # Fourth part : test unsetting scale & offsets from PAM metadata
@@ -3221,11 +2917,7 @@ def test_tiff_write_80():
     ds = gdal.Open('tmp/tiff_write_80_bis.tif')
     scale = ds.GetRasterBand(1).GetScale()
     offset = ds.GetRasterBand(1).GetOffset()
-    if scale != 1 or offset != 0:
-        gdaltest.post_reason('did not get expected values in PAM case (2)')
-        print(scale)
-        print(offset)
-        return 'fail'
+    assert scale == 1 and offset == 0, 'did not get expected values in PAM case (2)'
     ds = None
 
     gdaltest.tiff_drv.Delete('tmp/tiff_write_80_bis.tif')
@@ -3253,15 +2945,11 @@ def test_tiff_write_81():
 
     ds = gdal.Open('tmp/tiff_write_81.tif')
 
-    if ds.GetGCPProjection().find(
-            'AUTHORITY["EPSG","26711"]') == -1:
-        gdaltest.post_reason('GCP Projection not set properly.')
-        return 'fail'
+    assert (ds.GetGCPProjection().find(
+            'AUTHORITY["EPSG","26711"]') != -1), 'GCP Projection not set properly.'
 
     gcps = ds.GetGCPs()
-    if len(gcps) != 4:
-        gdaltest.post_reason('GCP count wrong.')
-        return 'fail'
+    assert len(gcps) == 4, 'GCP count wrong.'
 
     ds = None
 
@@ -3282,9 +2970,7 @@ def test_tiff_write_82():
 
     ds = gdal.Open('tmp/tiff_write_82.tif')
     md = ds.GetRasterBand(1).GetMetadata('IMAGE_STRUCTURE')
-    if md['PIXELTYPE'] != 'SIGNEDBYTE':
-        gdaltest.post_reason('did not get SIGNEDBYTE')
-        return 'fail'
+    assert md['PIXELTYPE'] == 'SIGNEDBYTE', 'did not get SIGNEDBYTE'
     ds = None
 
     gdaltest.tiff_drv.Delete('tmp/tiff_write_82.tif')
@@ -3314,18 +3000,13 @@ def test_tiff_write_83():
 
     ds = gdal.Open('tmp/tiff_write_83_2.tif')
     ct2 = ds.GetRasterBand(1).GetRasterColorTable()
-    if ct2.GetColorEntry(127) != (255, 255, 255, 255):
-        gdaltest.post_reason('did not get expected color table')
-        return 'fail'
+    assert ct2.GetColorEntry(127) == (255, 255, 255, 255), \
+        'did not get expected color table'
     ct2 = None
     cs1 = ds.GetRasterBand(1).Checksum()
-    if cs1 != 127 % 7:
-        gdaltest.post_reason('did not get expected checksum for band 1')
-        return 'fail'
+    assert cs1 == 127 % 7, 'did not get expected checksum for band 1'
     cs2 = ds.GetRasterBand(2).Checksum()
-    if cs2 != 255 % 7:
-        gdaltest.post_reason('did not get expected checksum for band 2')
-        return 'fail'
+    assert cs2 == 255 % 7, 'did not get expected checksum for band 2'
     ds = None
 
     gdaltest.tiff_drv.Delete('tmp/tiff_write_83.tif')
@@ -3369,10 +3050,7 @@ def test_tiff_write_84():
 
     gdaltest.tiff_drv.Delete('tmp/tiff_write_84.tif')
 
-    if cs != 0:
-        print(cs)
-        gdaltest.post_reason('did not get expected checksum')
-        return 'fail'
+    assert cs == 0, 'did not get expected checksum'
 
     return 'success'
 
@@ -3397,10 +3075,7 @@ def test_tiff_write_85():
 
     ds = gdal.Open('tmp/tiff_write_85.tif')
     unittype = ds.GetRasterBand(1).GetUnitType()
-    if unittype != 'ft':
-        gdaltest.post_reason('did not get expected values in internal case (1)')
-        print(unittype)
-        return 'fail'
+    assert unittype == 'ft', 'did not get expected values in internal case (1)'
     ds = None
 
     # Test CreateCopy()
@@ -3410,10 +3085,7 @@ def test_tiff_write_85():
     ds = None
     ds = gdal.Open('tmp/tiff_write_85_copy.tif')
     unittype = ds.GetRasterBand(1).GetUnitType()
-    if unittype != 'ft':
-        gdaltest.post_reason('did not get expected values in copy')
-        print(unittype)
-        return 'fail'
+    assert unittype == 'ft', 'did not get expected values in copy'
     ds = None
     gdaltest.tiff_drv.Delete('tmp/tiff_write_85_copy.tif')
 
@@ -3424,19 +3096,14 @@ def test_tiff_write_85():
 
     ds = gdal.Open('tmp/tiff_write_85.tif')
     unittype = ds.GetRasterBand(1).GetUnitType()
-    if unittype != '':
-        gdaltest.post_reason('did not get expected values in internal case (2)')
-        print(unittype)
-        return 'fail'
+    assert unittype == '', 'did not get expected values in internal case (2)'
     ds = None
 
     gdaltest.tiff_drv.Delete('tmp/tiff_write_85.tif')
 
     # Third part : test storing and retrieving unittype from PAM metadata
     ds = gdaltest.tiff_drv.Create('tmp/tiff_write_85_bis.tif', 1, 1)
-    if ds.GetRasterBand(1).GetUnitType():
-        gdaltest.post_reason('expected None values')
-        return 'fail'
+    assert not ds.GetRasterBand(1).GetUnitType(), 'expected None values'
     ds = None
 
     ds = gdal.Open('tmp/tiff_write_85_bis.tif')
@@ -3452,10 +3119,7 @@ def test_tiff_write_85():
 
     ds = gdal.Open('tmp/tiff_write_85_bis.tif')
     unittype = ds.GetRasterBand(1).GetUnitType()
-    if unittype != 'ft':
-        gdaltest.post_reason('did not get expected values in PAM case (1)')
-        print(unittype)
-        return 'fail'
+    assert unittype == 'ft', 'did not get expected values in PAM case (1)'
     ds = None
 
     # Fourth part : test unsetting unittype from PAM metadata
@@ -3473,10 +3137,7 @@ def test_tiff_write_85():
 
     ds = gdal.Open('tmp/tiff_write_85_bis.tif')
     unittype = ds.GetRasterBand(1).GetUnitType()
-    if unittype != '':
-        gdaltest.post_reason('did not get expected values in PAM case (2)')
-        print(unittype)
-        return 'fail'
+    assert unittype == '', 'did not get expected values in PAM case (2)'
     ds = None
 
     gdaltest.tiff_drv.Delete('tmp/tiff_write_85_bis.tif')
@@ -3502,10 +3163,8 @@ def test_tiff_write_86():
 
     # Is the xml:ESRI data available?
     ds = gdal.Open('tmp/tiff_write_86.tif')
-    if ds.GetMetadata('xml:ESRI') != ['<abc />\n']:
-        print(ds.GetMetadata('xml:ESRI'))
-        gdaltest.post_reason('did not get expected xml:ESRI metadata.')
-        return 'fail'
+    assert ds.GetMetadata('xml:ESRI') == ['<abc />\n'], \
+        'did not get expected xml:ESRI metadata.'
 
     if ds.GetMetadataItem('BaseTest') != 'Value':
         gdaltest.post_value('missing metadata(1)')
@@ -3519,10 +3178,7 @@ def test_tiff_write_86():
               'tmp/tiff_write_86.tif.aux.xml.hidden')
 
     ds = gdal.Open('tmp/tiff_write_86.tif')
-    if ds.GetMetadata('xml:ESRI') is not None:
-        print(ds.GetMetadata('xml:ESRI'))
-        gdaltest.post_reason('unexpectedly got xml:ESRI metadata')
-        return 'fail'
+    assert ds.GetMetadata('xml:ESRI') is None, 'unexpectedly got xml:ESRI metadata'
 
     if ds.GetMetadataItem('BaseTest') != 'Value':
         gdaltest.post_value('missing metadata(2)')
@@ -3542,10 +3198,8 @@ def test_tiff_write_86():
 
     # Is the xml:ESRI data available?
     ds = gdal.Open('tmp/tiff_write_86_cc.tif')
-    if ds.GetMetadata('xml:ESRI') != ['<abc />\n']:
-        print(ds.GetMetadata('xml:ESRI'))
-        gdaltest.post_reason('did not get expected xml:ESRI metadata (cc).')
-        return 'fail'
+    assert ds.GetMetadata('xml:ESRI') == ['<abc />\n'], \
+        'did not get expected xml:ESRI metadata (cc).'
 
     if ds.GetMetadataItem('BaseTest') != 'Value':
         gdaltest.post_value('missing metadata(1cc)')
@@ -3558,10 +3212,7 @@ def test_tiff_write_86():
     os.remove('tmp/tiff_write_86_cc.tif.aux.xml')
 
     ds = gdal.Open('tmp/tiff_write_86_cc.tif')
-    if ds.GetMetadata('xml:ESRI') is not None:
-        print(ds.GetMetadata('xml:ESRI'))
-        gdaltest.post_reason('unexpectedly got xml:ESRI metadata(2)')
-        return 'fail'
+    assert ds.GetMetadata('xml:ESRI') is None, 'unexpectedly got xml:ESRI metadata(2)'
 
     if ds.GetMetadataItem('BaseTest') != 'Value':
         gdaltest.post_value('missing metadata(2cc)')
@@ -3611,10 +3262,7 @@ def test_tiff_write_87():
     import validate_cloud_optimized_geotiff
     try:
         _, errors, _ = validate_cloud_optimized_geotiff.validate('tmp/tiff_write_87_dst.tif', check_tiled=False)
-        if errors:
-            gdaltest.post_reason('validate_cloud_optimized_geotiff failed')
-            print(errors)
-            return 'fail'
+        assert not errors, 'validate_cloud_optimized_geotiff failed'
     except OSError:
         gdaltest.post_reason('validate_cloud_optimized_geotiff failed')
         return 'fail'
@@ -3623,23 +3271,11 @@ def test_tiff_write_87():
     gdaltest.tiff_drv.Delete('tmp/tiff_write_87_dst.tif')
 
     # Check checksums
-    if cs1 != expected_cs1 or cs2 != expected_cs2:
-        gdaltest.post_reason('did not get expected checksums')
-        print(cs1)
-        print(cs2)
-        print(expected_cs1)
-        print(expected_cs2)
-        return 'fail'
+    assert cs1 == expected_cs1 and cs2 == expected_cs2, 'did not get expected checksums'
 
-    if nodata_ovr_0 != 0 or nodata_ovr_1 != 0:
-        gdaltest.post_reason('did not get expected nodata values')
-        print(nodata_ovr_0)
-        print(nodata_ovr_1)
-        return 'fail'
+    assert nodata_ovr_0 == 0 and nodata_ovr_1 == 0, 'did not get expected nodata values'
 
-    if ifd_main != 8 and not(ifd_main < ifd_ovr_0 and ifd_ovr_0 < ifd_ovr_1 and ifd_ovr_1 < data_ovr_1 and data_ovr_1 < data_ovr_0 and data_ovr_0 < data_main):
-        print(ifd_main, ifd_ovr_0, ifd_ovr_1, data_ovr_1, data_ovr_0, data_main)
-        return 'fail'
+    assert ifd_main == 8 or(ifd_main < ifd_ovr_0 and ifd_ovr_0 < ifd_ovr_1 and ifd_ovr_1 < data_ovr_1 and data_ovr_1 < data_ovr_0 and data_ovr_0 < data_main)
 
     return 'success'
 
@@ -3696,14 +3332,9 @@ def test_tiff_write_88():
 
     import struct
     ar = struct.unpack('B' * 8, data)
-    if ar[2] != 43:
-        gdaltest.post_reason('not a BIGTIFF file')
-        print(ar)
-        return 'fail'
-    if ar[4] != 8 or ar[5] != 0 or ar[6] != 0 or ar[7] != 0:
-        gdaltest.post_reason('first IFD is not at offset 8')
-        print(ar)
-        return 'fail'
+    assert ar[2] == 43, 'not a BIGTIFF file'
+    assert ar[4] == 8 and ar[5] == 0 and ar[6] == 0 and ar[7] == 0, \
+        'first IFD is not at offset 8'
 
     return 'success'
 
@@ -3753,11 +3384,7 @@ def test_tiff_write_89():
         # print('quality = %d, size = %d' % (quality, size))
 
         if quality != 90:
-            if size >= last_size:
-                gdaltest.post_reason('did not get decreasing file sizes')
-                print(size)
-                print(last_size)
-                return 'fail'
+            assert size < last_size, 'did not get decreasing file sizes'
 
         last_size = size
 
@@ -3801,11 +3428,7 @@ def test_tiff_write_90():
         # print('quality = %d, size = %d' % (quality, size))
 
         if quality != 90:
-            if size >= last_size:
-                gdaltest.post_reason('did not get decreasing file sizes')
-                print(size)
-                print(last_size)
-                return 'fail'
+            assert size < last_size, 'did not get decreasing file sizes'
 
         last_size = size
 
@@ -3854,11 +3477,7 @@ def test_tiff_write_91():
         # print('quality = %d, size = %d' % (quality, size))
 
         if quality != 90:
-            if size >= last_size:
-                gdaltest.post_reason('did not get decreasing file sizes')
-                print(size)
-                print(last_size)
-                return 'fail'
+            assert size < last_size, 'did not get decreasing file sizes'
 
         last_size = size
 
@@ -3910,17 +3529,9 @@ def test_tiff_write_92():
         # print('quality = %d, size = %d' % (quality, size))
 
         if jpeg_quality_overview == 30:
-            if size != last_size:
-                gdaltest.post_reason('did not get equal file sizes')
-                print(size)
-                print(last_size)
-                return 'fail'
+            assert size == last_size, 'did not get equal file sizes'
         elif jpeg_quality_overview == 40:
-            if size <= last_size:
-                gdaltest.post_reason('did not get growing file sizes')
-                print(size)
-                print(last_size)
-                return 'fail'
+            assert size > last_size, 'did not get growing file sizes'
 
         last_size = size
 
@@ -3978,16 +3589,10 @@ def test_tiff_write_93():
         # print('quality = %d, size = %d' % (quality, size))
 
         if quality != 90:
-            if size >= last_size:
-                gdaltest.post_reason('did not get decreasing file sizes')
-                print(size)
-                print(last_size)
-                return 'fail'
+            assert size < last_size, 'did not get decreasing file sizes'
 
-            if quality == 30 and size >= 83000:
-                gdaltest.post_reason('file larger than expected. should be about 69100. perhaps jpeg quality is not well propagated')
-                print(size)
-                return 'fail'
+            assert not (quality == 30 and size >= 83000), \
+                'file larger than expected. should be about 69100. perhaps jpeg quality is not well propagated'
 
         last_size = size
 
@@ -4029,10 +3634,7 @@ def test_tiff_write_94():
     gdaltest.tiff_drv.Delete('tmp/tiff_write_94_src.tif')
     gdaltest.tiff_drv.Delete('tmp/tiff_write_94_dst.tif')
 
-    if cs != 3:
-        print(cs)
-        gdaltest.post_reason('wrong checksum')
-        return 'fail'
+    assert cs == 3, 'wrong checksum'
 
     return 'success'
 
@@ -4055,8 +3657,7 @@ def test_tiff_write_95():
     gdaltest.tiff_drv.Delete('tmp/tiff_write_95_src.tif')
     gdaltest.tiff_drv.Delete('tmp/tiff_write_95_dst.tif')
 
-    if not ok:
-        return 'fail'
+    assert ok
 
     return 'success'
 
@@ -4101,12 +3702,9 @@ def test_tiff_write_96():
     gdaltest.tiff_drv.Delete('tmp/tiff_write_96_src.tif')
     gdaltest.tiff_drv.Delete('tmp/tiff_write_96_dst.tif')
 
-    if [expected_cs, expected_cs_mask, expected_cs_ovr_1, expected_cs_ovr_mask_1, expected_cs_ovr_2, expected_cs_ovr_mask_2] != \
-       [cs, cs_mask, cs_ovr_1, cs_ovr_mask_1, cs_ovr_2, cs_ovr_mask_2]:
-        gdaltest.post_reason('did not get expected checksums')
-        print(expected_cs, expected_cs_mask, expected_cs_ovr_1, expected_cs_ovr_mask_1, expected_cs_ovr_2, expected_cs_ovr_mask_2)
-        print(cs, cs_mask, cs_ovr_1, cs_ovr_mask_1, cs_ovr_2, cs_ovr_mask_2)
-        return 'fail'
+    assert [expected_cs, expected_cs_mask, expected_cs_ovr_1, expected_cs_ovr_mask_1, expected_cs_ovr_2, expected_cs_ovr_mask_2] == \
+       [cs, cs_mask, cs_ovr_1, cs_ovr_mask_1, cs_ovr_2, cs_ovr_mask_2], \
+        'did not get expected checksums'
 
     return 'success'
 
@@ -4128,14 +3726,9 @@ def test_tiff_write_97():
 
     gt_expected = (440690.0, 60.0, 0.0, 3751350.0, 0.0, -60.0)
 
-    if gt != gt_expected:
-        print(gt)
-        gdaltest.post_reason('did not get expected geotransform')
-        return 'fail'
+    assert gt == gt_expected, 'did not get expected geotransform'
 
-    if md != 'Point':
-        gdaltest.post_reason('did not get expected AREA_OR_POINT value')
-        return 'fail'
+    assert md == 'Point', 'did not get expected AREA_OR_POINT value'
 
     gdaltest.tiff_drv.Delete('tmp/test_97.tif')
 
@@ -4152,14 +3745,10 @@ def test_tiff_write_97():
 
     gt_expected = (440690.0, 60.0, 0.0, 3751350.0, 0.0, -60.0)
 
-    if gt != gt_expected:
-        print(gt)
-        gdaltest.post_reason('did not get expected geotransform when ignoring PixelIsPoint')
-        return 'fail'
+    assert gt == gt_expected, \
+        'did not get expected geotransform when ignoring PixelIsPoint'
 
-    if md != 'Point':
-        gdaltest.post_reason('did not get expected AREA_OR_POINT value')
-        return 'fail'
+    assert md == 'Point', 'did not get expected AREA_OR_POINT value'
 
     gdal.SetConfigOption('GTIFF_POINT_GEO_IGNORE', None)
 
@@ -4173,14 +3762,10 @@ def test_tiff_write_97():
 
     gt_expected = (440660.0, 60.0, 0.0, 3751380.0, 0.0, -60.0)
 
-    if gt != gt_expected:
-        print(gt)
-        gdaltest.post_reason('did not get expected geotransform when ignoring PixelIsPoint (2)')
-        return 'fail'
+    assert gt == gt_expected, \
+        'did not get expected geotransform when ignoring PixelIsPoint (2)'
 
-    if md != 'Point':
-        gdaltest.post_reason('did not get expected AREA_OR_POINT value')
-        return 'fail'
+    assert md == 'Point', 'did not get expected AREA_OR_POINT value'
 
     gdaltest.tiff_drv.Delete('tmp/test_97_2.tif')
 
@@ -4207,14 +3792,9 @@ def test_tiff_write_98():
 
     gt_expected = (1841001.75, 1.5, -5.0, 1144003.25, -5.0, -1.5)
 
-    if gt != gt_expected:
-        print(gt)
-        gdaltest.post_reason('did not get expected geotransform')
-        return 'fail'
+    assert gt == gt_expected, 'did not get expected geotransform'
 
-    if md != 'Point':
-        gdaltest.post_reason('did not get expected AREA_OR_POINT value')
-        return 'fail'
+    assert md == 'Point', 'did not get expected AREA_OR_POINT value'
 
     gdal.SetConfigOption('GTIFF_POINT_GEO_IGNORE', 'FALSE')
 
@@ -4227,14 +3807,9 @@ def test_tiff_write_98():
 
     gt_expected = (1841003.5, 1.5, -5.0, 1144006.5, -5.0, -1.5)
 
-    if gt != gt_expected:
-        print(gt)
-        gdaltest.post_reason('did not get expected geotransform (2)')
-        return 'fail'
+    assert gt == gt_expected, 'did not get expected geotransform (2)'
 
-    if md != 'Point':
-        gdaltest.post_reason('did not get expected AREA_OR_POINT value')
-        return 'fail'
+    assert md == 'Point', 'did not get expected AREA_OR_POINT value'
 
     gdaltest.tiff_drv.Delete('tmp/test_98.tif')
 
@@ -4259,9 +3834,7 @@ def test_tiff_write_99():
 
     gdaltest.tiff_drv.Delete('tmp/test_99.tif')
 
-    if (cs1, cs2, cs3) != (21629, 21651, 21371):
-        print('%d,%d,%d' % (cs1, cs2, cs3))
-        return 'fail'
+    assert (cs1, cs2, cs3) == (21629, 21651, 21371), ('%d,%d,%d' % (cs1, cs2, cs3))
 
     return 'success'
 
@@ -4285,9 +3858,7 @@ def test_tiff_write_100():
     gdaltest.tiff_drv.Delete('/vsimem/test_100_src.tif')
     gdaltest.tiff_drv.Delete('/vsimem/test_100_dst.tif')
 
-    if (cs1, cs2) != (3118, 0):
-        print('%d,%d' % (cs1, cs2))
-        return 'fail'
+    assert (cs1, cs2) == (3118, 0), ('%d,%d' % (cs1, cs2))
 
     return 'success'
 
@@ -4397,23 +3968,16 @@ def test_tiff_write_102():
 
     gdaltest.tiff_drv.Delete('/vsimem/tiff_write_102.tif')
 
-    if wkt1.find('COMPD_CS') != 0:
-        gdaltest.post_reason('expected COMPD_CS, but got something else')
-        print(wkt1)
-        return 'fail'
+    assert wkt1.find('COMPD_CS') == 0, 'expected COMPD_CS, but got something else'
 
-    if wkt2.find('COMPD_CS') == 0:
-        gdaltest.post_reason('got COMPD_CS, but did not expected it')
-        print(wkt2)
-        return 'fail'
+    assert wkt2.find('COMPD_CS') != 0, 'got COMPD_CS, but did not expected it'
 
     sr2 = osr.SpatialReference()
     sr2.SetFromUserInput(wkt1)
     got_name = sr2.GetAttrValue('COMPD_CS')
     if got_name != name:
-        gdaltest.post_reason('dit not get expected COMPD_CS name')
         print(wkt2)
-        return 'fail'
+        pytest.fail('dit not get expected COMPD_CS name')
 
     return 'success'
 
@@ -4440,11 +4004,7 @@ def test_tiff_write_103():
     gdaltest.tiff_drv.Delete('tmp/tiff_write_103_src.tif')
     gdaltest.tiff_drv.Delete('tmp/tiff_write_103_dst.tif')
 
-    if src_cs != dst_cs:
-        gdaltest.post_reason('did not get expected checksum')
-        print(src_cs)
-        print(dst_cs)
-        return 'fail'
+    assert src_cs == dst_cs, 'did not get expected checksum'
 
     return 'success'
 
@@ -4467,9 +4027,7 @@ def test_tiff_write_104():
 
     srs = osr.SpatialReference(wkt)
     fe = srs.GetProjParm(osr.SRS_PP_FALSE_EASTING)
-    if abs(fe - 2000000.0) > 0.001:
-        gdaltest.post_reason('did not get expected false easting')
-        return 'fail'
+    assert abs(fe - 2000000.0) <= 0.001, 'did not get expected false easting'
 
     gdaltest.tiff_drv.Delete('tmp/test_104.tif')
 
@@ -4499,9 +4057,7 @@ def test_tiff_write_105():
     ds = gdal.Open('tmp/bug4468.tif')
     cs = ds.GetRasterBand(1).Checksum()
 
-    if cs != 2923:
-        gdaltest.post_reason('Did not get expected checksum, got %d.' % cs)
-        return 'fail'
+    assert cs == 2923, ('Did not get expected checksum, got %d.' % cs)
 
     ds = None
 
@@ -4541,16 +4097,10 @@ def test_tiff_write_106(filename='../gdrivers/data/byte_with_xmp.jpg', options=N
 
     if check_cs:
         for i in range(nbands):
-            if cs[i] != src_cs[i]:
-                gdaltest.post_reason('did not get expected checksum')
-                print(cs[i])
-                print(src_cs[i])
-                return 'fail'
+            assert cs[i] == src_cs[i], 'did not get expected checksum'
     else:
         for i in range(nbands):
-            if cs[i] == 0:
-                gdaltest.post_reason('did not get expected checksum')
-                return 'fail'
+            assert cs[i] != 0, 'did not get expected checksum'
 
     return 'success'
 
@@ -4621,8 +4171,7 @@ def test_tiff_write_115():
 
     src_ds = gdal.Open('data/stefan_full_rgba.tif')
     ds = gdaltest.tiff_drv.CreateCopy(tmpfilename, src_ds, options=['COMPRESS=JPEG'])
-    if ds is None:
-        return 'fail'
+    assert ds is not None
     ds = None
     src_ds = None
 
@@ -4670,8 +4219,7 @@ def test_tiff_write_116():
 
     src_ds = gdal.Open('data/stefan_full_rgba.tif')
     ds = gdaltest.tiff_drv.CreateCopy(tmpfilename, src_ds, options=['COMPRESS=JPEG', 'INTERLEAVE=BAND'])
-    if ds is None:
-        return 'fail'
+    assert ds is not None
     ds = None
     src_ds = None
 
@@ -4753,9 +4301,8 @@ def test_tiff_write_117():
 
     gdal.Unlink('/vsimem/tiff_write_117.tif')
 
-    if data is None:
-        gdaltest.post_reason('if GDAL is configured with external libtiff 4.x, it can fail if it is older than 4.0.3. With internal libtiff, should not fail')
-        return 'fail'
+    assert data is not None, \
+        'if GDAL is configured with external libtiff 4.x, it can fail if it is older than 4.0.3. With internal libtiff, should not fail'
 
     return 'success'
 
@@ -4776,9 +4323,7 @@ def test_tiff_write_118():
 
     gdal.Unlink('/vsimem/tiff_write_118.tif')
 
-    if md:
-        print(md)
-        return 'fail'
+    assert not md
 
     return 'success'
 
@@ -4798,9 +4343,7 @@ def test_tiff_write_119():
 
     gdal.Unlink('/vsimem/tiff_write_119.tif')
 
-    if md['foo'] != 'bar':
-        print(md)
-        return 'fail'
+    assert md['foo'] == 'bar'
 
     return 'success'
 
@@ -4820,12 +4363,8 @@ def test_tiff_write_120():
 
     gdal.Unlink('/vsimem/tiff_write_120.tif')
 
-    if len(md) != 1:
-        print(md)
-        return 'fail'
-    if md[0] != '<foo/>':
-        print(md)
-        return 'fail'
+    assert len(md) == 1
+    assert md[0] == '<foo/>'
 
     return 'success'
 
@@ -4851,8 +4390,7 @@ def test_tiff_write_121():
     gdal.PushErrorHandler('CPLQuietErrorHandler')
     ds = gdaltest.tiff_drv.CreateCopy('/vsimem/tiff_write_121.tif', src_ds, options=['COPY_SRC_OVERVIEWS=YES'])
     gdal.PopErrorHandler()
-    if ds is not None:
-        return 'fail'
+    assert ds is None
     src_ds = None
 
     # Test when the overview count isn't the same on all base bands
@@ -4877,8 +4415,7 @@ def test_tiff_write_121():
     gdal.PushErrorHandler('CPLQuietErrorHandler')
     ds = gdaltest.tiff_drv.CreateCopy('/vsimem/tiff_write_121.tif', src_ds, options=['COPY_SRC_OVERVIEWS=YES'])
     gdal.PopErrorHandler()
-    if ds is not None:
-        return 'fail'
+    assert ds is None
     src_ds = None
 
     # Test when the overview bands of same level have not the same dimensions
@@ -4907,8 +4444,7 @@ def test_tiff_write_121():
     gdal.PushErrorHandler('CPLQuietErrorHandler')
     ds = gdaltest.tiff_drv.CreateCopy('/vsimem/tiff_write_121.tif', src_ds, options=['COPY_SRC_OVERVIEWS=YES'])
     gdal.PopErrorHandler()
-    if ds is not None:
-        return 'fail'
+    assert ds is None
     src_ds = None
 
     return 'success'
@@ -4959,45 +4495,27 @@ def test_tiff_write_123():
     src_ds.GetRasterBand(1).SetColorInterpretation(gdal.GCI_RedBand)
     src_ds = None
     statBuf = gdal.VSIStatL('/vsimem/tiff_write_123_src.tif.aux.xml', gdal.VSI_STAT_EXISTS_FLAG | gdal.VSI_STAT_NATURE_FLAG | gdal.VSI_STAT_SIZE_FLAG)
-    if statBuf is not None:
-        gdaltest.post_reason('did not expect PAM file')
-        return 'fail'
+    assert statBuf is None, 'did not expect PAM file'
     src_ds = gdal.Open('/vsimem/tiff_write_123_src.tif')
-    if src_ds.GetMetadataItem('TIFFTAG_GDAL_METADATA', '_DEBUG_') is not None:
-        gdaltest.post_reason('did not expect a TIFFTAG_GDAL_METADATA tag')
-        return 'fail'
-    if src_ds.GetMetadataItem('TIFFTAG_PHOTOMETRIC', '_DEBUG_') != '2':
-        print(src_ds.GetMetadataItem('TIFFTAG_PHOTOMETRIC', '_DEBUG_'))
-        return 'fail'
-    if src_ds.GetRasterBand(1).GetColorInterpretation() != gdal.GCI_RedBand:
-        return 'fail'
-    if src_ds.GetRasterBand(4).GetColorInterpretation() != gdal.GCI_Undefined:
-        return 'fail'
-    if src_ds.GetRasterBand(5).GetColorInterpretation() != gdal.GCI_AlphaBand:
-        return 'fail'
-    if src_ds.GetMetadataItem('TIFFTAG_EXTRASAMPLES', '_DEBUG_') != '0,2':
-        print(src_ds.GetMetadataItem('TIFFTAG_EXTRASAMPLES', '_DEBUG_'))
-        return 'fail'
+    assert src_ds.GetMetadataItem('TIFFTAG_GDAL_METADATA', '_DEBUG_') is None, \
+        'did not expect a TIFFTAG_GDAL_METADATA tag'
+    assert src_ds.GetMetadataItem('TIFFTAG_PHOTOMETRIC', '_DEBUG_') == '2'
+    assert src_ds.GetRasterBand(1).GetColorInterpretation() == gdal.GCI_RedBand
+    assert src_ds.GetRasterBand(4).GetColorInterpretation() == gdal.GCI_Undefined
+    assert src_ds.GetRasterBand(5).GetColorInterpretation() == gdal.GCI_AlphaBand
+    assert src_ds.GetMetadataItem('TIFFTAG_EXTRASAMPLES', '_DEBUG_') == '0,2'
 
     new_ds = gdaltest.tiff_drv.CreateCopy('/vsimem/tiff_write_123.tif', src_ds)
     del new_ds
     statBuf = gdal.VSIStatL('/vsimem/tiff_write_123.tif.aux.xml', gdal.VSI_STAT_EXISTS_FLAG | gdal.VSI_STAT_NATURE_FLAG | gdal.VSI_STAT_SIZE_FLAG)
-    if statBuf is not None:
-        gdaltest.post_reason('did not expect PAM file')
-        return 'fail'
+    assert statBuf is None, 'did not expect PAM file'
     ds = gdal.Open('/vsimem/tiff_write_123.tif')
-    if ds.GetMetadataItem('TIFFTAG_GDAL_METADATA', '_DEBUG_') is not None:
-        gdaltest.post_reason('did not expect a TIFFTAG_GDAL_METADATA tag')
-        return 'fail'
-    if ds.GetRasterBand(1).GetColorInterpretation() != gdal.GCI_RedBand:
-        return 'fail'
-    if src_ds.GetRasterBand(4).GetColorInterpretation() != gdal.GCI_Undefined:
-        return 'fail'
-    if src_ds.GetRasterBand(5).GetColorInterpretation() != gdal.GCI_AlphaBand:
-        return 'fail'
-    if ds.GetMetadataItem('TIFFTAG_EXTRASAMPLES', '_DEBUG_') != '0,2':
-        print(ds.GetMetadataItem('TIFFTAG_EXTRASAMPLES', '_DEBUG_'))
-        return 'fail'
+    assert ds.GetMetadataItem('TIFFTAG_GDAL_METADATA', '_DEBUG_') is None, \
+        'did not expect a TIFFTAG_GDAL_METADATA tag'
+    assert ds.GetRasterBand(1).GetColorInterpretation() == gdal.GCI_RedBand
+    assert src_ds.GetRasterBand(4).GetColorInterpretation() == gdal.GCI_Undefined
+    assert src_ds.GetRasterBand(5).GetColorInterpretation() == gdal.GCI_AlphaBand
+    assert ds.GetMetadataItem('TIFFTAG_EXTRASAMPLES', '_DEBUG_') == '0,2'
     ds = None
 
     gdaltest.tiff_drv.Delete('/vsimem/tiff_write_123_src.tif')
@@ -5005,39 +4523,24 @@ def test_tiff_write_123():
 
     # From implicit RGB to BGR (with Photometric = MinIsBlack)
     ds = gdaltest.tiff_drv.Create('/vsimem/tiff_write_123_bgr.tif', 1, 1, 3, gdal.GDT_Byte)
-    if ds.GetMetadataItem('TIFFTAG_PHOTOMETRIC', '_DEBUG_') != '2':
-        print(ds.GetMetadataItem('TIFFTAG_PHOTOMETRIC', '_DEBUG_'))
-        return 'fail'
-    if ds.GetMetadataItem('TIFFTAG_EXTRASAMPLES', '_DEBUG_') is not None:
-        print(ds.GetMetadataItem('TIFFTAG_EXTRASAMPLES', '_DEBUG_'))
-        return 'fail'
+    assert ds.GetMetadataItem('TIFFTAG_PHOTOMETRIC', '_DEBUG_') == '2'
+    assert ds.GetMetadataItem('TIFFTAG_EXTRASAMPLES', '_DEBUG_') is None
     ds.GetRasterBand(1).SetColorInterpretation(gdal.GCI_BlueBand)
-    if ds.GetRasterBand(1).GetColorInterpretation() != gdal.GCI_BlueBand:
-        return 'fail'
+    assert ds.GetRasterBand(1).GetColorInterpretation() == gdal.GCI_BlueBand
     ds.GetRasterBand(2).SetColorInterpretation(gdal.GCI_GreenBand)
     ds.GetRasterBand(3).SetColorInterpretation(gdal.GCI_RedBand)
     ds = None
     statBuf = gdal.VSIStatL('/vsimem/tiff_write_123_bgr.tif.aux.xml',
                             gdal.VSI_STAT_EXISTS_FLAG | gdal.VSI_STAT_NATURE_FLAG | gdal.VSI_STAT_SIZE_FLAG)
-    if statBuf is not None:
-        gdaltest.post_reason('did not expect a PAM file')
-        return 'fail'
+    assert statBuf is None, 'did not expect a PAM file'
     ds = gdal.Open('/vsimem/tiff_write_123_bgr.tif')
-    if ds.GetMetadataItem('TIFFTAG_PHOTOMETRIC', '_DEBUG_') != '1':
-        print(ds.GetMetadataItem('TIFFTAG_PHOTOMETRIC', '_DEBUG_'))
-        return 'fail'
-    if ds.GetMetadataItem('TIFFTAG_EXTRASAMPLES', '_DEBUG_') != '0,0':
-        print(ds.GetMetadataItem('TIFFTAG_EXTRASAMPLES', '_DEBUG_'))
-        return 'fail'
-    if ds.GetMetadataItem('TIFFTAG_GDAL_METADATA', '_DEBUG_') is None:
-        gdaltest.post_reason('expected a TIFFTAG_GDAL_METADATA tag')
-        return 'fail'
-    if ds.GetRasterBand(1).GetColorInterpretation() != gdal.GCI_BlueBand:
-        return 'fail'
-    if ds.GetRasterBand(2).GetColorInterpretation() != gdal.GCI_GreenBand:
-        return 'fail'
-    if ds.GetRasterBand(3).GetColorInterpretation() != gdal.GCI_RedBand:
-        return 'fail'
+    assert ds.GetMetadataItem('TIFFTAG_PHOTOMETRIC', '_DEBUG_') == '1'
+    assert ds.GetMetadataItem('TIFFTAG_EXTRASAMPLES', '_DEBUG_') == '0,0'
+    assert ds.GetMetadataItem('TIFFTAG_GDAL_METADATA', '_DEBUG_') is not None, \
+        'expected a TIFFTAG_GDAL_METADATA tag'
+    assert ds.GetRasterBand(1).GetColorInterpretation() == gdal.GCI_BlueBand
+    assert ds.GetRasterBand(2).GetColorInterpretation() == gdal.GCI_GreenBand
+    assert ds.GetRasterBand(3).GetColorInterpretation() == gdal.GCI_RedBand
     ds = None
 
     # Test overriding internal color interpretation with PAM one (read-only mode)
@@ -5046,16 +4549,11 @@ def test_tiff_write_123():
     ds = None
     statBuf = gdal.VSIStatL('/vsimem/tiff_write_123_bgr.tif.aux.xml',
                             gdal.VSI_STAT_EXISTS_FLAG | gdal.VSI_STAT_NATURE_FLAG | gdal.VSI_STAT_SIZE_FLAG)
-    if statBuf is None:
-        gdaltest.post_reason('expected a PAM file')
-        return 'fail'
+    assert statBuf is not None, 'expected a PAM file'
     ds = gdal.Open('/vsimem/tiff_write_123_bgr.tif')
-    if ds.GetRasterBand(1).GetColorInterpretation() != gdal.GCI_RedBand:
-        return 'fail'
-    if ds.GetRasterBand(2).GetColorInterpretation() != gdal.GCI_GreenBand:
-        return 'fail'
-    if ds.GetRasterBand(3).GetColorInterpretation() != gdal.GCI_RedBand:
-        return 'fail'
+    assert ds.GetRasterBand(1).GetColorInterpretation() == gdal.GCI_RedBand
+    assert ds.GetRasterBand(2).GetColorInterpretation() == gdal.GCI_GreenBand
+    assert ds.GetRasterBand(3).GetColorInterpretation() == gdal.GCI_RedBand
     ds = None
     gdaltest.tiff_drv.Delete('/vsimem/tiff_write_123_bgr.tif')
 
@@ -5068,44 +4566,27 @@ def test_tiff_write_123():
     ds = None
     statBuf = gdal.VSIStatL('/vsimem/tiff_write_123_bgr.tif.aux.xml',
                             gdal.VSI_STAT_EXISTS_FLAG | gdal.VSI_STAT_NATURE_FLAG | gdal.VSI_STAT_SIZE_FLAG)
-    if statBuf is None:
-        gdaltest.post_reason('expected a PAM file')
-        return 'fail'
+    assert statBuf is not None, 'expected a PAM file'
     ds = gdal.Open('/vsimem/tiff_write_123_bgr.tif')
-    if ds.GetMetadataItem('TIFFTAG_GDAL_METADATA', '_DEBUG_') is not None:
-        gdaltest.post_reason('did not expect a TIFFTAG_GDAL_METADATA tag')
-        return 'fail'
-    if ds.GetRasterBand(1).GetColorInterpretation() != gdal.GCI_BlueBand:
-        return 'fail'
-    if ds.GetRasterBand(2).GetColorInterpretation() != gdal.GCI_GreenBand:
-        return 'fail'
-    if ds.GetRasterBand(3).GetColorInterpretation() != gdal.GCI_RedBand:
-        return 'fail'
+    assert ds.GetMetadataItem('TIFFTAG_GDAL_METADATA', '_DEBUG_') is None, \
+        'did not expect a TIFFTAG_GDAL_METADATA tag'
+    assert ds.GetRasterBand(1).GetColorInterpretation() == gdal.GCI_BlueBand
+    assert ds.GetRasterBand(2).GetColorInterpretation() == gdal.GCI_GreenBand
+    assert ds.GetRasterBand(3).GetColorInterpretation() == gdal.GCI_RedBand
     ds = None
     gdaltest.tiff_drv.Delete('/vsimem/tiff_write_123_bgr.tif')
 
     # From implicit RGBA to MINISBLACK
     ds = gdaltest.tiff_drv.Create('/vsimem/tiff_write_123_rgba.tif', 1, 1, 4, gdal.GDT_Byte)
-    if ds.GetMetadataItem('TIFFTAG_PHOTOMETRIC', '_DEBUG_') != '2':
-        print(ds.GetMetadataItem('TIFFTAG_PHOTOMETRIC', '_DEBUG_'))
-        return 'fail'
-    if ds.GetRasterBand(1).GetColorInterpretation() != gdal.GCI_RedBand:
-        return 'fail'
-    if ds.GetRasterBand(4).GetColorInterpretation() != gdal.GCI_AlphaBand:
-        return 'fail'
-    if ds.GetMetadataItem('TIFFTAG_EXTRASAMPLES', '_DEBUG_') != '2':
-        print(ds.GetMetadataItem('TIFFTAG_EXTRASAMPLES', '_DEBUG_'))
-        return 'fail'
+    assert ds.GetMetadataItem('TIFFTAG_PHOTOMETRIC', '_DEBUG_') == '2'
+    assert ds.GetRasterBand(1).GetColorInterpretation() == gdal.GCI_RedBand
+    assert ds.GetRasterBand(4).GetColorInterpretation() == gdal.GCI_AlphaBand
+    assert ds.GetMetadataItem('TIFFTAG_EXTRASAMPLES', '_DEBUG_') == '2'
 
     ds.GetRasterBand(1).SetColorInterpretation(gdal.GCI_Undefined)
-    if ds.GetRasterBand(1).GetColorInterpretation() != gdal.GCI_Undefined:
-        return 'fail'
-    if ds.GetMetadataItem('TIFFTAG_PHOTOMETRIC', '_DEBUG_') != '1':
-        print(ds.GetMetadataItem('TIFFTAG_PHOTOMETRIC', '_DEBUG_'))
-        return 'fail'
-    if ds.GetMetadataItem('TIFFTAG_EXTRASAMPLES', '_DEBUG_') != '0,0,2':
-        print(ds.GetMetadataItem('TIFFTAG_EXTRASAMPLES', '_DEBUG_'))
-        return 'fail'
+    assert ds.GetRasterBand(1).GetColorInterpretation() == gdal.GCI_Undefined
+    assert ds.GetMetadataItem('TIFFTAG_PHOTOMETRIC', '_DEBUG_') == '1'
+    assert ds.GetMetadataItem('TIFFTAG_EXTRASAMPLES', '_DEBUG_') == '0,0,2'
     ds = None
 
     gdaltest.tiff_drv.Delete('/vsimem/tiff_write_123_rgba.tif')
@@ -5119,17 +4600,12 @@ def test_tiff_write_123():
     ds.GetRasterBand(4).SetColorInterpretation(gdal.GCI_AlphaBand)
     ds = None
     statBuf = gdal.VSIStatL('/vsimem/tiff_write_123_guua.tif.aux.xml', gdal.VSI_STAT_EXISTS_FLAG | gdal.VSI_STAT_NATURE_FLAG | gdal.VSI_STAT_SIZE_FLAG)
-    if statBuf is not None:
-        gdaltest.post_reason('did not expect PAM file')
-        return 'fail'
+    assert statBuf is None, 'did not expect PAM file'
     ds = gdal.Open('/vsimem/tiff_write_123_guua.tif')
-    if ds.GetMetadataItem('TIFFTAG_GDAL_METADATA', '_DEBUG_') is not None:
-        gdaltest.post_reason('did not expect TIFFTAG_GDAL_METADATA tag')
-        return 'fail'
-    if ds.GetRasterBand(1).GetColorInterpretation() != gdal.GCI_GrayIndex:
-        return 'fail'
-    if ds.GetRasterBand(4).GetColorInterpretation() != gdal.GCI_AlphaBand:
-        return 'fail'
+    assert ds.GetMetadataItem('TIFFTAG_GDAL_METADATA', '_DEBUG_') is None, \
+        'did not expect TIFFTAG_GDAL_METADATA tag'
+    assert ds.GetRasterBand(1).GetColorInterpretation() == gdal.GCI_GrayIndex
+    assert ds.GetRasterBand(4).GetColorInterpretation() == gdal.GCI_AlphaBand
     ds = None
     gdaltest.tiff_drv.Delete('/vsimem/tiff_write_123_guua.tif')
 
@@ -5138,12 +4614,8 @@ def test_tiff_write_123():
                                       1, 1, 3, gdal.GDT_UInt16, options=['PHOTOMETRIC=RGB'])
     ds = gdaltest.tiff_drv.CreateCopy('/vsimem/tiff_write_123_rgb.tif', src_ds)
     src_ds = None
-    if ds.GetMetadataItem('TIFFTAG_PHOTOMETRIC', '_DEBUG_') != '2':
-        print(ds.GetMetadataItem('TIFFTAG_PHOTOMETRIC', '_DEBUG_'))
-        return 'fail'
-    if ds.GetMetadataItem('TIFFTAG_EXTRASAMPLES', '_DEBUG_') is not None:
-        print(ds.GetMetadataItem('TIFFTAG_EXTRASAMPLES', '_DEBUG_'))
-        return 'fail'
+    assert ds.GetMetadataItem('TIFFTAG_PHOTOMETRIC', '_DEBUG_') == '2'
+    assert ds.GetMetadataItem('TIFFTAG_EXTRASAMPLES', '_DEBUG_') is None
     ds = None
     gdaltest.tiff_drv.Delete('/vsimem/tiff_write_123_rgb_src.tif')
     gdaltest.tiff_drv.Delete('/vsimem/tiff_write_123_rgb.tif')
@@ -5154,8 +4626,7 @@ def test_tiff_write_123():
     gdaltest.tiff_drv.CreateCopy('/vsimem/tiff_write_123_rgb.tif', src_ds,
                                  options=['PHOTOMETRIC=RGB'])
     ds = gdal.Open('/vsimem/tiff_write_123_rgb.tif')
-    if ds.GetRasterBand(1).GetColorInterpretation() != gdal.GCI_RedBand:
-        return 'fail'
+    assert ds.GetRasterBand(1).GetColorInterpretation() == gdal.GCI_RedBand
     ds = None
     gdaltest.tiff_drv.Delete('/vsimem/tiff_write_123_rgb.tif')
 
@@ -5164,12 +4635,9 @@ def test_tiff_write_123():
     gdaltest.tiff_drv.CreateCopy('/vsimem/tiff_write_123_rgbua.tif', src_ds,
                                  options=['PHOTOMETRIC=RGB'])
     ds = gdal.Open('/vsimem/tiff_write_123_rgbua.tif')
-    if ds.GetRasterBand(1).GetColorInterpretation() != gdal.GCI_RedBand:
-        return 'fail'
-    if ds.GetRasterBand(4).GetColorInterpretation() != gdal.GCI_Undefined:
-        return 'fail'
-    if ds.GetRasterBand(5).GetColorInterpretation() != gdal.GCI_AlphaBand:
-        return 'fail'
+    assert ds.GetRasterBand(1).GetColorInterpretation() == gdal.GCI_RedBand
+    assert ds.GetRasterBand(4).GetColorInterpretation() == gdal.GCI_Undefined
+    assert ds.GetRasterBand(5).GetColorInterpretation() == gdal.GCI_AlphaBand
     ds = None
     gdaltest.tiff_drv.Delete('/vsimem/tiff_write_123_rgbua.tif')
 
@@ -5180,12 +4648,9 @@ def test_tiff_write_123():
     ds.GetRasterBand(4).SetColorInterpretation(gdal.GCI_Undefined)
     ds = None
     statBuf = gdal.VSIStatL('/vsimem/tiff_write_123_rgba_to_undefined.tif.aux.xml', gdal.VSI_STAT_EXISTS_FLAG | gdal.VSI_STAT_NATURE_FLAG | gdal.VSI_STAT_SIZE_FLAG)
-    if statBuf is not None:
-        gdaltest.post_reason('did not expect PAM file')
-        return 'fail'
+    assert statBuf is None, 'did not expect PAM file'
     ds = gdal.Open('/vsimem/tiff_write_123_rgba_to_undefined.tif')
-    if ds.GetRasterBand(4).GetColorInterpretation() != gdal.GCI_Undefined:
-        return 'fail'
+    assert ds.GetRasterBand(4).GetColorInterpretation() == gdal.GCI_Undefined
     ds = None
     gdaltest.tiff_drv.Delete('/vsimem/tiff_write_123_rgba_to_undefined.tif')
 
@@ -5203,15 +4668,13 @@ def test_tiff_write_124():
     # Test "SetColorTable() can only be called on band 1"
     ret = ds.GetRasterBand(2).SetColorTable(gdal.ColorTable())
     gdal.PopErrorHandler()
-    if ret == 0:
-        return 'fail'
+    assert ret != 0
 
     gdal.PushErrorHandler('CPLQuietErrorHandler')
     # Test "SetColorTable() not supported for multi-sample TIFF files"
     ret = ds.GetRasterBand(1).SetColorTable(gdal.ColorTable())
     gdal.PopErrorHandler()
-    if ret == 0:
-        return 'fail'
+    assert ret != 0
 
     ds = None
 
@@ -5220,8 +4683,7 @@ def test_tiff_write_124():
     # Test "SetColorTable() only supported for Byte or UInt16 bands in TIFF format."
     ret = ds.GetRasterBand(1).SetColorTable(gdal.ColorTable())
     gdal.PopErrorHandler()
-    if ret == 0:
-        return 'fail'
+    assert ret != 0
     ds = None
 
     gdal.PushErrorHandler('CPLQuietErrorHandler')
@@ -5300,42 +4762,21 @@ def test_tiff_write_126():
 
         ds = gdal.Open('/vsimem/tiff_write_126.tif')
         # Officially we have 0 public overviews...
-        if ds.GetRasterBand(1).GetOverviewCount() != 0:
-            print(options)
-            print(ds.GetRasterBand(1).GetOverviewCount())
-            return 'fail'
+        assert ds.GetRasterBand(1).GetOverviewCount() == 0, options
         # But they do exist...
         cs = ds.GetRasterBand(1).GetOverview(0).Checksum()
-        if cs not in cs1:
-            print(options)
-            print(cs)
-            return 'fail'
+        assert cs in cs1, options
         cs = ds.GetRasterBand(2).GetOverview(0).Checksum()
-        if cs not in cs2:
-            print(options)
-            print(cs)
-            return 'fail'
+        assert cs in cs2, options
         cs = ds.GetRasterBand(1).GetOverview(1).Checksum()
-        if cs not in cs3:
-            print(options)
-            print(cs)
-            return 'fail'
+        assert cs in cs3, options
         cs = ds.GetRasterBand(1).GetOverview(2).Checksum()
-        if cs not in cs4:
-            print(options)
-            print(cs)
-            return 'fail'
-        if ds.GetRasterBand(1).GetOverview(-1) is not None:
-            print(options)
-            return 'fail'
-        if ds.GetRasterBand(1).GetOverview(3) is not None:
-            print(options)
-            return 'fail'
+        assert cs in cs4, options
+        assert ds.GetRasterBand(1).GetOverview(-1) is None, options
+        assert ds.GetRasterBand(1).GetOverview(3) is None, options
         ovr_1_data = ds.GetRasterBand(1).GetOverview(1).GetDataset().ReadRaster(0, 0, 400, 200)
         subsampled_data = ds.ReadRaster(0, 0, 1600, 800, 400, 200)
-        if ovr_1_data != subsampled_data:
-            print(options)
-            return 'fail'
+        assert ovr_1_data == subsampled_data, options
         ds = None
 
         gdaltest.tiff_drv.Delete('/vsimem/tiff_write_126.tif')
@@ -5356,31 +4797,17 @@ def test_tiff_write_126():
 
         ds = gdal.Open('/vsimem/tiff_write_126.tif')
         # Officially we have 0 public overviews...
-        if ds.GetRasterBand(1).GetOverviewCount() != 0:
-            print(options)
-            print(ds.GetRasterBand(1).GetOverviewCount())
-            return 'fail'
+        assert ds.GetRasterBand(1).GetOverviewCount() == 0, options
         # But they do exist...
         cs = ds.GetRasterBand(1).GetOverview(0).Checksum()
-        if cs not in cs1:
-            print(options)
-            print(cs)
-            return 'fail'
+        assert cs in cs1, options
         cs = ds.GetRasterBand(1).GetOverview(1).Checksum()
-        if cs not in cs3:
-            print(options)
-            print(cs)
-            return 'fail'
+        assert cs in cs3, options
         cs = ds.GetRasterBand(1).GetOverview(2).Checksum()
-        if cs not in cs4:
-            print(options)
-            print(cs)
-            return 'fail'
+        assert cs in cs4, options
         ovr_1_data = ds.GetRasterBand(1).GetOverview(1).GetDataset().ReadRaster(0, 0, 400, 200)
         subsampled_data = ds.ReadRaster(0, 0, 1600, 800, 400, 200)
-        if ovr_1_data != subsampled_data:
-            print(options)
-            return 'fail'
+        assert ovr_1_data == subsampled_data, options
         ds = None
 
         gdaltest.tiff_drv.Delete('/vsimem/tiff_write_126.tif')
@@ -5394,14 +4821,11 @@ def test_tiff_write_126():
     ds = None
 
     ds = gdal.Open('/vsimem/tiff_write_126.tif')
-    if ds.GetRasterBand(1).GetBlockSize() != [8, 1]:
-        print(ds.GetRasterBand(1).GetBlockSize())
-        return 'fail'
+    assert ds.GetRasterBand(1).GetBlockSize() == [8, 1]
     ovr_ds = ds.GetRasterBand(1).GetOverview(1).GetDataset()
     ovr_1_data = ovr_ds.ReadRaster(0, 0, ovr_ds.RasterXSize, ovr_ds.RasterYSize, 1, 1)
     subsampled_data = ds.ReadRaster(0, 0, ds.RasterXSize, ds.RasterYSize, 1, 1)
-    if ovr_1_data != subsampled_data:
-        return 'fail'
+    assert ovr_1_data == subsampled_data
     ds = None
 
     gdaltest.tiff_drv.Delete('/vsimem/tiff_write_126.tif')
@@ -5416,14 +4840,10 @@ def test_tiff_write_126():
     ds = None
 
     ds = gdal.Open('/vsimem/tiff_write_126.tif')
-    if ds.GetRasterBand(1).GetOverview(0) is None:
-        return 'fail'
-    if ds.GetRasterBand(1).GetMetadataItem('JPEGTABLES', 'TIFF') is None:
-        return 'fail'
-    if ds.GetRasterBand(1).GetMetadataItem('BLOCK_OFFSET_0_0', 'TIFF') is not None:
-        return 'fail'
-    if ds.GetRasterBand(1).GetMetadataItem('BLOCK_SIZE_0_0', 'TIFF') is not None:
-        return 'fail'
+    assert ds.GetRasterBand(1).GetOverview(0) is not None
+    assert ds.GetRasterBand(1).GetMetadataItem('JPEGTABLES', 'TIFF') is not None
+    assert ds.GetRasterBand(1).GetMetadataItem('BLOCK_OFFSET_0_0', 'TIFF') is None
+    assert ds.GetRasterBand(1).GetMetadataItem('BLOCK_SIZE_0_0', 'TIFF') is None
     ds = None
     gdaltest.tiff_drv.Delete('/vsimem/tiff_write_126.tif')
 
@@ -5435,9 +4855,7 @@ def test_tiff_write_126():
 
     ds = gdal.Open('/vsimem/tiff_write_126.tif')
     cs = ds.GetRasterBand(1).GetOverview(0).Checksum()
-    if cs != 0:
-        print(cs)
-        return 'fail'
+    assert cs == 0
     ds = None
     gdaltest.tiff_drv.Delete('/vsimem/tiff_write_126.tif')
 
@@ -5464,43 +4882,35 @@ def test_tiff_write_127():
         obj = ds if i == 0 else ds.GetRasterBand(1)
         if obj.GetMetadataItem('key') != 'value':
             print(i)
-            print(obj.GetMetadata())
-            return 'fail'
+            pytest.fail(obj.GetMetadata())
         obj.SetMetadata({})
         obj = None
         ds = None
 
         ds = gdal.Open('/vsimem/tiff_write_127.tif', gdal.GA_Update)
         obj = ds if i == 0 else ds.GetRasterBand(1)
-        if obj.GetMetadata():
-            print(i)
-            return 'fail'
+        assert not obj.GetMetadata(), i
         obj.SetMetadataItem('key', 'value')
         obj = None
         ds = None
 
         ds = gdal.Open('/vsimem/tiff_write_127.tif', gdal.GA_Update)
         obj = ds if i == 0 else ds.GetRasterBand(1)
-        if obj.GetMetadataItem('key') != 'value':
-            print(i)
-            return 'fail'
+        assert obj.GetMetadataItem('key') == 'value', i
         obj.SetMetadataItem('key', None)
         obj = None
         ds = None
 
         ds = gdal.Open('/vsimem/tiff_write_127.tif', gdal.GA_Update)
         obj = ds if i == 0 else ds.GetRasterBand(1)
-        if obj.GetMetadata():
-            print(i)
-            return 'fail'
+        assert not obj.GetMetadata(), i
         obj = None
         ds = None
 
         statBuf = gdal.VSIStatL('/vsimem/tiff_write_127.tif.aux.xml')
         if statBuf is not None:
-            gdaltest.post_reason('unexpected PAM file')
             print(i)
-            return 'fail'
+            pytest.fail('unexpected PAM file')
 
     gdaltest.tiff_drv.Delete('/vsimem/tiff_write_127.tif')
 
@@ -5530,10 +4940,8 @@ def test_tiff_write_128():
     # We need to reopen in raw to avoig automatic CMYK->RGBA to trigger
     ds = gdal.Open('GTIFF_RAW:/vsimem/tiff_write_128.tif')
     for i in range(4):
-        if src_ds.GetRasterBand(i + 1).GetColorInterpretation() != ds.GetRasterBand(i + 1).GetColorInterpretation():
-            return 'fail'
-        if src_ds.GetRasterBand(i + 1).Checksum() != ds.GetRasterBand(i + 1).Checksum():
-            return 'fail'
+        assert src_ds.GetRasterBand(i + 1).GetColorInterpretation() == ds.GetRasterBand(i + 1).GetColorInterpretation()
+        assert src_ds.GetRasterBand(i + 1).Checksum() == ds.GetRasterBand(i + 1).Checksum()
     ds = None
 
     gdaltest.tiff_drv.Delete('/vsimem/tiff_write_128.tif')
@@ -5548,10 +4956,8 @@ def test_tiff_write_128():
     # We need to reopen in raw to avoig automatic CMYK->RGBA to trigger
     ds = gdal.Open('GTIFF_RAW:/vsimem/tiff_write_128.tif')
     for i in range(4):
-        if src_ds.GetRasterBand(i + 1).GetColorInterpretation() != ds.GetRasterBand(i + 1).GetColorInterpretation():
-            return 'fail'
-        if src_ds.GetRasterBand(i + 1).Checksum() != ds.GetRasterBand(i + 1).Checksum():
-            return 'fail'
+        assert src_ds.GetRasterBand(i + 1).GetColorInterpretation() == ds.GetRasterBand(i + 1).GetColorInterpretation()
+        assert src_ds.GetRasterBand(i + 1).Checksum() == ds.GetRasterBand(i + 1).Checksum()
     ds = None
 
     gdaltest.tiff_drv.Delete('/vsimem/tiff_write_128.tif')
@@ -5567,10 +4973,8 @@ def test_tiff_write_128():
     ds = gdal.Open('/vsimem/tiff_write_128.tif')
     for i in range(4):
         # The color interpretation will NOT be CMYK
-        if src_ds.GetRasterBand(i + 1).GetColorInterpretation() == ds.GetRasterBand(i + 1).GetColorInterpretation():
-            return 'fail'
-        if src_ds.GetRasterBand(i + 1).Checksum() != ds.GetRasterBand(i + 1).Checksum():
-            return 'fail'
+        assert src_ds.GetRasterBand(i + 1).GetColorInterpretation() != ds.GetRasterBand(i + 1).GetColorInterpretation()
+        assert src_ds.GetRasterBand(i + 1).Checksum() == ds.GetRasterBand(i + 1).Checksum()
     ds = None
 
     gdaltest.tiff_drv.Delete('/vsimem/tiff_write_128.tif')
@@ -5636,33 +5040,25 @@ def test_tiff_write_130():
 
     shutil.copyfile('data/byte_jpg_unusual_jpegtable.tif', 'tmp/byte_jpg_unusual_jpegtable.tif')
     ds = gdal.Open('tmp/byte_jpg_unusual_jpegtable.tif', gdal.GA_Update)
-    if ds.GetRasterBand(1).Checksum() != 4771:
-        print(ds.GetRasterBand(1).Checksum())
-        return 'fail'
+    assert ds.GetRasterBand(1).Checksum() == 4771
     src_ds = gdal.Open('data/byte.tif', gdal.GA_Update)
     ds.WriteRaster(0, 0, 20, 20, src_ds.ReadRaster())
     src_ds = None
     ds = None
     ds = gdal.Open('tmp/byte_jpg_unusual_jpegtable.tif')
-    if ds.GetRasterBand(1).Checksum() != 4743:
-        print(ds.GetRasterBand(1).Checksum())
-        return 'fail'
+    assert ds.GetRasterBand(1).Checksum() == 4743
     ds = None
     os.unlink('tmp/byte_jpg_unusual_jpegtable.tif')
 
     shutil.copyfile('data/byte_jpg_tablesmodezero.tif', 'tmp/byte_jpg_tablesmodezero.tif')
     ds = gdal.Open('tmp/byte_jpg_tablesmodezero.tif', gdal.GA_Update)
-    if ds.GetRasterBand(1).Checksum() != 4743:
-        print(ds.GetRasterBand(1).Checksum())
-        return 'fail'
+    assert ds.GetRasterBand(1).Checksum() == 4743
     src_ds = gdal.Open('data/byte.tif', gdal.GA_Update)
     ds.WriteRaster(0, 0, 20, 20, src_ds.ReadRaster())
     src_ds = None
     ds = None
     ds = gdal.Open('tmp/byte_jpg_tablesmodezero.tif')
-    if ds.GetRasterBand(1).Checksum() != 4743:
-        print(ds.GetRasterBand(1).Checksum())
-        return 'fail'
+    assert ds.GetRasterBand(1).Checksum() == 4743
     ds = None
     os.unlink('tmp/byte_jpg_tablesmodezero.tif')
 
@@ -5682,8 +5078,7 @@ def test_tiff_write_131(level=1):
     src_ds = gdal.Open('data/byte.tif')
     ds = gdaltest.tiff_drv.CreateCopy(filename, src_ds,
                                  options=['COMPRESS=LZMA', 'LZMA_PRESET=' + str(level)])
-    if ds.GetRasterBand(1).Checksum() != 4672:
-        return 'fail'
+    assert ds.GetRasterBand(1).Checksum() == 4672
     ds = None
 
     # LZMA requires an howful amount of memory even on small files
@@ -5692,8 +5087,7 @@ def test_tiff_write_131(level=1):
         return 'skip'
 
     ds = gdal.Open(filename)
-    if ds.GetRasterBand(1).Checksum() != 4672:
-        return 'fail'
+    assert ds.GetRasterBand(1).Checksum() == 4672
     ds = None
 
     gdal.Unlink(filename)
@@ -5723,8 +5117,7 @@ def test_tiff_write_132():
         ds = None
 
         # Check that PAM file exists
-        if gdal.VSIStatL('/vsimem/tiff_write_132.tif.aux.xml') is None:
-            return 'fail'
+        assert gdal.VSIStatL('/vsimem/tiff_write_132.tif.aux.xml') is not None
 
         # Open in read-write
         ds = gdal.Open('/vsimem/tiff_write_132.tif', gdal.GA_Update)
@@ -5737,13 +5130,10 @@ def test_tiff_write_132():
         ds = None
 
         # Check that PAM file no longer exists
-        if gdal.VSIStatL('/vsimem/tiff_write_132.tif.aux.xml') is not None:
-            print(i)
-            return 'fail'
+        assert gdal.VSIStatL('/vsimem/tiff_write_132.tif.aux.xml') is None, i
 
         ds = gdal.Open('/vsimem/tiff_write_132.tif')
-        if ds.GetMetadataItem('FOO') != 'BAZ' or ds.GetRasterBand(1).GetMetadataItem('FOO') != 'BAZ':
-            return 'fail'
+        assert ds.GetMetadataItem('FOO') == 'BAZ' and ds.GetRasterBand(1).GetMetadataItem('FOO') == 'BAZ'
         ds = None
 
         gdaltest.tiff_drv.Delete('/vsimem/tiff_write_132.tif')
@@ -5771,38 +5161,31 @@ def test_tiff_write_133():
     gdal.PushErrorHandler()
     ret = src_ds.SetProjection(srs.ExportToWkt())
     gdal.PopErrorHandler()
-    if ret == 0:
-        return 'fail'
+    assert ret != 0
     gdal.PushErrorHandler()
     ret = src_ds.SetGeoTransform([1, 2, 0, 3, 0, -4])
     gdal.PopErrorHandler()
-    if ret == 0:
-        return 'fail'
+    assert ret != 0
     gdal.PushErrorHandler()
     ret = src_ds.SetMetadataItem('FOO', 'BAZ')
     gdal.PopErrorHandler()
-    if ret == 0:
-        return 'fail'
+    assert ret != 0
     gdal.PushErrorHandler()
     ret = src_ds.SetMetadata({})
     gdal.PopErrorHandler()
-    if ret == 0:
-        return 'fail'
+    assert ret != 0
     gdal.PushErrorHandler()
     ret = src_ds.GetRasterBand(1).SetMetadataItem('FOO', 'BAZ')
     gdal.PopErrorHandler()
-    if ret == 0:
-        return 'fail'
+    assert ret != 0
     gdal.PushErrorHandler()
     ret = src_ds.GetRasterBand(1).SetMetadata({})
     gdal.PopErrorHandler()
-    if ret == 0:
-        return 'fail'
+    assert ret != 0
     gdal.PushErrorHandler()
     ret = src_ds.GetRasterBand(1).SetNoDataValue(0)
     gdal.PopErrorHandler()
-    if ret == 0:
-        return 'fail'
+    assert ret != 0
 
     # Pixel interleaved
     out_ds = gdaltest.tiff_drv.CreateCopy('/vsimem/tiff_write_133_dst.tif', src_ds, options=['STREAMABLE_OUTPUT=YES', 'BLOCKYSIZE=32'])
@@ -5811,28 +5194,22 @@ def test_tiff_write_133():
     gdal.SetConfigOption('TIFF_READ_STREAMING', 'YES')
     ds = gdal.Open('/vsimem/tiff_write_133_dst.tif')
     gdal.SetConfigOption('TIFF_READ_STREAMING', None)
-    if ds.GetProjectionRef().find('32601') < 0:
-        return 'fail'
-    if ds.GetGeoTransform() != (1.0, 2.0, 0.0, 3.0, 0.0, -2.0):
-        return 'fail'
-    if ds.GetMetadataItem('FOO') != 'BAR':
-        return 'fail'
-    if ds.GetMetadataItem('UNORDERED_BLOCKS', 'TIFF') is not None:
-        return 'fail'
+    assert ds.GetProjectionRef().find('32601') >= 0
+    assert ds.GetGeoTransform() == (1.0, 2.0, 0.0, 3.0, 0.0, -2.0)
+    assert ds.GetMetadataItem('FOO') == 'BAR'
+    assert ds.GetMetadataItem('UNORDERED_BLOCKS', 'TIFF') is None
 
     with gdaltest.SetCacheMax(0):
         for y in range(1000):
             got_data = ds.ReadRaster(0, y, 1024, 1)
-            if got_data is None:
-                return 'fail'
+            assert got_data is not None
 
     ds.FlushCache()
     for y in range(1000):
         gdal.PushErrorHandler()
         got_data = ds.ReadRaster(0, y, 1024, 1)
         gdal.PopErrorHandler()
-        if got_data is not None:
-            return 'fail'
+        assert got_data is None
     ds = None
     gdaltest.tiff_drv.Delete('/vsimem/tiff_write_133_dst.tif')
 
@@ -5843,14 +5220,10 @@ def test_tiff_write_133():
     gdal.SetConfigOption('TIFF_READ_STREAMING', 'YES')
     ds = gdal.Open('/vsimem/tiff_write_133_dst.tif')
     gdal.SetConfigOption('TIFF_READ_STREAMING', None)
-    if ds.GetProjectionRef().find('32601') < 0:
-        return 'fail'
-    if ds.GetGeoTransform() != (1.0, 2.0, 0.0, 3.0, 0.0, -2.0):
-        return 'fail'
-    if ds.GetMetadataItem('FOO') != 'BAR':
-        return 'fail'
-    if ds.GetMetadataItem('UNORDERED_BLOCKS', 'TIFF') is not None:
-        return 'fail'
+    assert ds.GetProjectionRef().find('32601') >= 0
+    assert ds.GetGeoTransform() == (1.0, 2.0, 0.0, 3.0, 0.0, -2.0)
+    assert ds.GetMetadataItem('FOO') == 'BAR'
+    assert ds.GetMetadataItem('UNORDERED_BLOCKS', 'TIFF') is None
 
     with gdaltest.SetCacheMax(0):
         for yblock in range(int((1000 + 256 - 1) / 256)):
@@ -5864,8 +5237,7 @@ def test_tiff_write_133():
                 if x + xsize > ds.RasterXSize:
                     xsize = ds.RasterXSize - x
                 got_data = ds.ReadRaster(x, y, xsize, ysize)
-                if got_data is None:
-                    return 'fail'
+                assert got_data is not None
 
     ds = None
     gdaltest.tiff_drv.Delete('/vsimem/tiff_write_133_dst.tif')
@@ -5877,15 +5249,13 @@ def test_tiff_write_133():
     gdal.SetConfigOption('TIFF_READ_STREAMING', 'YES')
     ds = gdal.Open('/vsimem/tiff_write_133_dst.tif')
     gdal.SetConfigOption('TIFF_READ_STREAMING', None)
-    if ds.GetMetadataItem('UNORDERED_BLOCKS', 'TIFF') is not None:
-        return 'fail'
+    assert ds.GetMetadataItem('UNORDERED_BLOCKS', 'TIFF') is None
 
     with gdaltest.SetCacheMax(0):
         for band in range(3):
             for y in range(1000):
                 got_data = ds.GetRasterBand(band + 1).ReadRaster(0, y, 1024, 1)
-                if got_data is None:
-                    return 'fail'
+                assert got_data is not None
     ds = None
     gdaltest.tiff_drv.Delete('/vsimem/tiff_write_133_dst.tif')
 
@@ -5898,14 +5268,12 @@ def test_tiff_write_133():
         gdal.SetConfigOption('TIFF_READ_STREAMING', 'YES')
         ds = gdal.Open('/vsimem/tiff_write_133_dst.tif')
         gdal.SetConfigOption('TIFF_READ_STREAMING', None)
-        if ds.GetMetadataItem('UNORDERED_BLOCKS', 'TIFF') is not None:
-            return 'fail'
+        assert ds.GetMetadataItem('UNORDERED_BLOCKS', 'TIFF') is None
 
         with gdaltest.SetCacheMax(0):
             for y in range(1000):
                 got_data = ds.ReadRaster(0, y, 1024, 1)
-                if got_data is None:
-                    return 'fail'
+                assert got_data is not None
 
         ds = None
         gdaltest.tiff_drv.Delete('/vsimem/tiff_write_133_dst.tif')
@@ -5914,19 +5282,16 @@ def test_tiff_write_133():
     gdal.PushErrorHandler()
     out_ds = gdaltest.tiff_drv.CreateCopy('/vsimem/tiff_write_133_dst.tif', src_ds, options=['STREAMABLE_OUTPUT=YES', 'COMPRESS=DEFLATE'])
     gdal.PopErrorHandler()
-    if out_ds is not None:
-        return 'fail'
+    assert out_ds is None
 
     # Test writing into a non authorized file
     ds = gdaltest.tiff_drv.Create('/foo/bar', 1024, 1000, 3, options=['STREAMABLE_OUTPUT=YES', 'BLOCKYSIZE=1'])
-    if ds is not None:
-        return 'fail'
+    assert ds is None
 
     gdal.PushErrorHandler()
     out_ds = gdaltest.tiff_drv.CreateCopy('/foo/bar', src_ds, options=['STREAMABLE_OUTPUT=YES'])
     gdal.PopErrorHandler()
-    if out_ds is not None:
-        return 'fail'
+    assert out_ds is None
 
     src_ds = None
 
@@ -5936,8 +5301,7 @@ def test_tiff_write_133():
     ds = gdal.Open('data/byte.tif')
     gdal.PopErrorHandler()
     gdal.SetConfigOption('TIFF_READ_STREAMING', None)
-    if ds is not None:
-        return 'fail'
+    assert ds is None
 
     # BigTIFF with IFD not at offset 16
     if md['DMD_CREATIONOPTIONLIST'].find('BigTIFF') >= 0:
@@ -5952,8 +5316,7 @@ def test_tiff_write_133():
         ds = gdal.Open('/vsimem/tiff_write_133.tif')
         gdal.PopErrorHandler()
         gdal.SetConfigOption('TIFF_READ_STREAMING', None)
-        if ds is not None:
-            return 'fail'
+        assert ds is None
 
     # Test reading strips in not increasing order
     ds = gdaltest.tiff_drv.Create('/vsimem/tiff_write_133.tif', 1024, 1000, 3, options=['BLOCKYSIZE=1'])
@@ -5967,14 +5330,12 @@ def test_tiff_write_133():
     ds = gdal.Open('/vsimem/tiff_write_133.tif')
     gdal.PopErrorHandler()
     gdal.SetConfigOption('TIFF_READ_STREAMING', None)
-    if ds.GetMetadataItem('UNORDERED_BLOCKS', 'TIFF') != 'YES':
-        return 'fail'
+    assert ds.GetMetadataItem('UNORDERED_BLOCKS', 'TIFF') == 'YES'
 
     with gdaltest.SetCacheMax(0):
         for y in range(1000):
             got_data = ds.ReadRaster(0, 1000 - y - 1, 1024, 1)
-            if got_data is None:
-                return 'fail'
+            assert got_data is not None
 
     # Test writing strips in not increasing order in a streamable output
     ds = gdaltest.tiff_drv.Create('/vsimem/tiff_write_133.tif', 1024, 1000, 3, options=['STREAMABLE_OUTPUT=YES', 'BLOCKYSIZE=1'])
@@ -5983,8 +5344,7 @@ def test_tiff_write_133():
     ret = ds.WriteRaster(0, 999, 1024, 1, 'a' * (3 * 1024))
     ds.FlushCache()
     gdal.PopErrorHandler()
-    if gdal.GetLastErrorMsg() == '':
-        return 'fail'
+    assert gdal.GetLastErrorMsg() != ''
     ds = None
 
     # Test writing tiles in not increasing order in a streamable output
@@ -5994,8 +5354,7 @@ def test_tiff_write_133():
     ret = ds.WriteRaster(256, 256, 256, 256, 'a' * (3 * 256 * 256))
     ds.FlushCache()
     gdal.PopErrorHandler()
-    if gdal.GetLastErrorMsg() == '':
-        return 'fail'
+    assert gdal.GetLastErrorMsg() != ''
     ds = None
 
     gdaltest.tiff_drv.Delete('/vsimem/tiff_write_133.tif')
@@ -6017,11 +5376,7 @@ def test_tiff_write_134():
     cs1 = ds.GetRasterBand(1).Checksum()
     cs2 = ds.GetRasterBand(2).Checksum()
     cs3 = ds.GetRasterBand(3).Checksum()
-    if cs1 != 1 or cs2 != 0 or cs3 != 5:
-        print(cs1)
-        print(cs2)
-        print(cs3)
-        return 'fail'
+    assert cs1 == 1 and cs2 == 0 and cs3 == 5
     ds = None
     gdaltest.tiff_drv.Delete('/vsimem/tiff_write_134.tif')
 
@@ -6035,11 +5390,7 @@ def test_tiff_write_134():
     cs1 = ds.GetRasterBand(1).Checksum()
     cs2 = ds.GetRasterBand(2).Checksum()
     cs3 = ds.GetRasterBand(3).Checksum()
-    if cs1 != 1 or cs2 != 0 or cs3 != 5:
-        print(cs1)
-        print(cs2)
-        print(cs3)
-        return 'fail'
+    assert cs1 == 1 and cs2 == 0 and cs3 == 5
     ds = None
     gdaltest.tiff_drv.Delete('/vsimem/tiff_write_134_src.tif')
     gdaltest.tiff_drv.Delete('/vsimem/tiff_write_134.tif')
@@ -6053,11 +5404,7 @@ def test_tiff_write_134():
     cs1 = ds.GetRasterBand(1).Checksum()
     cs2 = ds.GetRasterBand(2).Checksum()
     cs3 = ds.GetRasterBand(3).Checksum()
-    if cs1 != 5 or cs2 != 5 or cs3 != 5:
-        print(cs1)
-        print(cs2)
-        print(cs3)
-        return 'fail'
+    assert cs1 == 5 and cs2 == 5 and cs3 == 5
     ds = None
     gdaltest.tiff_drv.Delete('/vsimem/tiff_write_134.tif')
 
@@ -6079,10 +5426,8 @@ def test_tiff_write_135():
     ds = None
 
     ds = gdal.Open('/vsimem/tiff_write_135.tif')
-    if ds.GetGCPs():
-        return 'fail'
-    if ds.GetGCPProjection() != '':
-        return 'fail'
+    assert not ds.GetGCPs()
+    assert ds.GetGCPProjection() == ''
     ds = None
 
     # Double clear
@@ -6096,10 +5441,8 @@ def test_tiff_write_135():
     ds = None
 
     ds = gdal.Open('/vsimem/tiff_write_135.tif')
-    if ds.GetGCPs():
-        return 'fail'
-    if ds.GetGCPProjection() != '':
-        return 'fail'
+    assert not ds.GetGCPs()
+    assert ds.GetGCPProjection() == ''
     ds = None
 
     # Clear + set geotransform and new projection
@@ -6116,12 +5459,9 @@ def test_tiff_write_135():
     ds = None
 
     ds = gdal.Open('/vsimem/tiff_write_135.tif')
-    if ds.GetGCPs():
-        return 'fail'
-    if ds.GetGeoTransform() != (1, 2, 3, 4, 5, -6):
-        return 'fail'
-    if ds.GetProjectionRef().find('32601') < 0:
-        return 'fail'
+    assert not ds.GetGCPs()
+    assert ds.GetGeoTransform() == (1, 2, 3, 4, 5, -6)
+    assert ds.GetProjectionRef().find('32601') >= 0
     ds = None
 
     gdal.Unlink('/vsimem/tiff_write_135.tif')
@@ -6142,10 +5482,7 @@ def test_tiff_write_136():
     ds = None
     ds = gdal.Open('/vsimem/tiff_write_136.tif')
     cs = ds.GetRasterBand(1).Checksum()
-    if cs != expected_cs:
-        print(cs)
-        print(expected_cs)
-        return 'fail'
+    assert cs == expected_cs
 
     gdal.Unlink('/vsimem/tiff_write_136_src.tif')
     gdal.Unlink('/vsimem/tiff_write_136.tif')
@@ -6172,10 +5509,7 @@ def test_tiff_write_137():
     ds = gdal.Open('/vsimem/tiff_write_137.tif')
     cs = ds.GetRasterBand(1).Checksum()
     ds = None
-    if cs != expected_cs:
-        print(cs)
-        print(expected_cs)
-        return 'fail'
+    assert cs == expected_cs
 
     # Test NUM_THREADS as creation option with Create()
     ds = gdaltest.tiff_drv.Create('/vsimem/tiff_write_137.tif', 4000, 4000, 1,
@@ -6185,10 +5519,7 @@ def test_tiff_write_137():
     ds = gdal.Open('/vsimem/tiff_write_137.tif')
     cs = ds.GetRasterBand(1).Checksum()
     ds = None
-    if cs != expected_cs:
-        print(cs)
-        print(expected_cs)
-        return 'fail'
+    assert cs == expected_cs
 
     # Test NUM_THREADS as open option
     ds = gdaltest.tiff_drv.Create('/vsimem/tiff_write_137.tif', 4000, 4000,
@@ -6200,10 +5531,7 @@ def test_tiff_write_137():
     ds = gdal.Open('/vsimem/tiff_write_137.tif')
     cs = ds.GetRasterBand(1).Checksum()
     ds = None
-    if cs != expected_cs:
-        print(cs)
-        print(expected_cs)
-        return 'fail'
+    assert cs == expected_cs
 
     # Ask data immediately while the block is compressed
     ds = gdaltest.tiff_drv.Create('/vsimem/tiff_write_137.tif', 4000, 4000,
@@ -6211,9 +5539,7 @@ def test_tiff_write_137():
     ds.WriteRaster(0, 0, 1, 1, 'A')
     ds.FlushCache()
     val = ds.ReadRaster(0, 0, 1, 1).decode('ascii')
-    if val != 'A':
-        print(val)
-        return 'fail'
+    assert val == 'A'
     ds = None
 
     gdal.Unlink('/vsimem/tiff_write_137_src.tif')
@@ -6228,10 +5554,7 @@ def test_tiff_write_137():
     ds = gdal.Open('/vsimem/tiff_write_137.tif')
     cs = ds.GetRasterBand(1).Checksum()
     ds = None
-    if cs != 4672:
-        print(cs)
-        print(expected_cs)
-        return 'fail'
+    assert cs == 4672, expected_cs
     gdal.Unlink('/vsimem/tiff_write_137.tif')
 
     return 'success'
@@ -6254,9 +5577,7 @@ def test_tiff_write_138():
     ds.GetRasterBand(3).FlushCache()
     ds = None
     size = gdal.VSIStatL('/vsimem/tiff_write_138.tif').size
-    if size != 181:
-        print(size)
-        return 'fail'
+    assert size == 181
 
     # Test fix for #5999
 
@@ -6278,9 +5599,7 @@ def test_tiff_write_138():
         tmp_ds = None
         ds = None
         size = gdal.VSIStatL('/vsimem/tiff_write_138.tif').size
-        if size != 181:
-            print(size)
-            return 'fail'
+        assert size == 181
 
     gdal.Unlink('/vsimem/tiff_write_138.tif')
     gdal.Unlink('/vsimem/tiff_write_138_saturate.tif')
@@ -6310,8 +5629,7 @@ def test_tiff_write_139():
         ds = gdal.Open('/vsimem/tiff_write_139.tif')
         for i in range(nbands):
             content = ds.GetRasterBand(i + 1).ReadRaster()
-            if ref_content != content:
-                return 'fail'
+            assert ref_content == content
         ds = None
 
         gdal.Unlink('/vsimem/tiff_write_139.tif')
@@ -6331,8 +5649,7 @@ def test_tiff_write_139():
         content = ds.GetRasterBand(1).ReadRaster()
         if ref_content != content:
             print(endianness)
-            print(struct.unpack('h' * 6, content))
-            return 'fail'
+            pytest.fail(struct.unpack('h' * 6, content))
         ds = None
 
         gdal.Unlink('/vsimem/tiff_write_139.tif')
@@ -6352,8 +5669,7 @@ def test_tiff_write_139():
         content = ds.GetRasterBand(1).ReadRaster()
         if ref_content != content:
             print(endianness)
-            print(struct.unpack('H' * 6, content))
-            return 'fail'
+            pytest.fail(struct.unpack('H' * 6, content))
         ds = None
 
         gdal.Unlink('/vsimem/tiff_write_139.tif')
@@ -6373,8 +5689,7 @@ def test_tiff_write_139():
         content = ds.GetRasterBand(1).ReadRaster()
         if ref_content != content:
             print(endianness)
-            print(struct.unpack('I' * 6, content))
-            return 'fail'
+            pytest.fail(struct.unpack('I' * 6, content))
         ds = None
 
         gdal.Unlink('/vsimem/tiff_write_139.tif')
@@ -6388,9 +5703,7 @@ def test_tiff_write_139():
     ds = None
     ds = gdal.Open('/vsimem/tiff_write_139.tif')
     content = ds.GetRasterBand(1).ReadRaster()
-    if ref_content != content:
-        print(struct.unpack('d' * 4, content))
-        return 'fail'
+    assert ref_content == content, struct.unpack('d' * 4, content)
     ds = None
 
     gdal.Unlink('/vsimem/tiff_write_139.tif')
@@ -6408,13 +5721,9 @@ def test_tiff_write_140():
     ds.GetRasterBand(5).SetColorInterpretation(gdal.GCI_AlphaBand)
     ds = None
     statBuf = gdal.VSIStatL('/vsimem/tiff_write_140.tif.aux.xml', gdal.VSI_STAT_EXISTS_FLAG | gdal.VSI_STAT_NATURE_FLAG | gdal.VSI_STAT_SIZE_FLAG)
-    if statBuf is not None:
-        gdaltest.post_reason('did not expect PAM file')
-        return 'fail'
+    assert statBuf is None, 'did not expect PAM file'
     ds = gdal.Open('/vsimem/tiff_write_140.tif')
-    if ds.GetRasterBand(5).GetColorInterpretation() != gdal.GCI_AlphaBand:
-        print(ds.GetRasterBand(5).GetColorInterpretation())
-        return 'fail'
+    assert ds.GetRasterBand(5).GetColorInterpretation() == gdal.GCI_AlphaBand
     ds = None
 
     # Strange case: set alpha to a band, but it is already set on another one
@@ -6424,22 +5733,14 @@ def test_tiff_write_140():
     gdal.ErrorReset()
     with gdaltest.error_handler():
         ret = ds.GetRasterBand(5).SetColorInterpretation(gdal.GCI_AlphaBand)
-    if gdal.GetLastErrorMsg() == '':
-        return 'fail'
-    if ret != 0:
-        return 'fail'
+    assert gdal.GetLastErrorMsg() != ''
+    assert ret == 0
     ds = None
     statBuf = gdal.VSIStatL('/vsimem/tiff_write_140.tif.aux.xml', gdal.VSI_STAT_EXISTS_FLAG | gdal.VSI_STAT_NATURE_FLAG | gdal.VSI_STAT_SIZE_FLAG)
-    if statBuf is not None:
-        gdaltest.post_reason('did not expect PAM file')
-        return 'fail'
+    assert statBuf is None, 'did not expect PAM file'
     ds = gdal.Open('/vsimem/tiff_write_140.tif')
-    if ds.GetRasterBand(2).GetColorInterpretation() != gdal.GCI_AlphaBand:
-        print(ds.GetRasterBand(5).GetColorInterpretation())
-        return 'fail'
-    if ds.GetRasterBand(5).GetColorInterpretation() != gdal.GCI_AlphaBand:
-        print(ds.GetRasterBand(5).GetColorInterpretation())
-        return 'fail'
+    assert ds.GetRasterBand(2).GetColorInterpretation() == gdal.GCI_AlphaBand
+    assert ds.GetRasterBand(5).GetColorInterpretation() == gdal.GCI_AlphaBand
     ds = None
 
     # Strange case: set alpha to a band, but it is already set on another one (because of ALPHA=YES)
@@ -6448,22 +5749,14 @@ def test_tiff_write_140():
     gdal.ErrorReset()
     with gdaltest.error_handler():
         ret = ds.GetRasterBand(5).SetColorInterpretation(gdal.GCI_AlphaBand)
-    if gdal.GetLastErrorMsg().find('ALPHA') < 0:
-        return 'fail'
-    if ret != 0:
-        return 'fail'
+    assert gdal.GetLastErrorMsg().find('ALPHA') >= 0
+    assert ret == 0
     ds = None
     statBuf = gdal.VSIStatL('/vsimem/tiff_write_140.tif.aux.xml', gdal.VSI_STAT_EXISTS_FLAG | gdal.VSI_STAT_NATURE_FLAG | gdal.VSI_STAT_SIZE_FLAG)
-    if statBuf is not None:
-        gdaltest.post_reason('did not expect PAM file')
-        return 'fail'
+    assert statBuf is None, 'did not expect PAM file'
     ds = gdal.Open('/vsimem/tiff_write_140.tif')
-    if ds.GetRasterBand(2).GetColorInterpretation() != gdal.GCI_AlphaBand:
-        print(ds.GetRasterBand(5).GetColorInterpretation())
-        return 'fail'
-    if ds.GetRasterBand(5).GetColorInterpretation() != gdal.GCI_AlphaBand:
-        print(ds.GetRasterBand(5).GetColorInterpretation())
-        return 'fail'
+    assert ds.GetRasterBand(2).GetColorInterpretation() == gdal.GCI_AlphaBand
+    assert ds.GetRasterBand(5).GetColorInterpretation() == gdal.GCI_AlphaBand
     ds = None
 
     gdaltest.tiff_drv.Delete('/vsimem/tiff_write_140.tif')
@@ -6486,13 +5779,9 @@ def test_tiff_write_141():
     wkt = ds.GetProjectionRef()
     ds = None
 
-    if wkt.find('PROJCS["WGS_1984_Web_Mercator_Auxiliary_Sphere"') != 0:
-        print(wkt)
-        return 'fail'
+    assert wkt.find('PROJCS["WGS_1984_Web_Mercator_Auxiliary_Sphere"') == 0
 
-    if wkt.find('EXTENSION["PROJ4"') < 0:
-        print(wkt)
-        return 'fail'
+    assert wkt.find('EXTENSION["PROJ4"') >= 0
 
     gdaltest.tiff_drv.Delete('/vsimem/tiff_write_141.tif')
 
@@ -6522,14 +5811,9 @@ def test_tiff_write_142():
     gdaltest.tiff_drv.Delete('/vsimem/tiff_write_142_2.tif')
 
     gt_expected = (10, 1, 0, 100, 0, -1)
-    if gt != gt_expected:
-        print(gt)
-        gdaltest.post_reason('did not get expected geotransform')
-        return 'fail'
+    assert gt == gt_expected, 'did not get expected geotransform'
 
-    if md != 'Point':
-        gdaltest.post_reason('did not get expected AREA_OR_POINT value')
-        return 'fail'
+    assert md == 'Point', 'did not get expected AREA_OR_POINT value'
 
     return 'success'
 
@@ -6541,8 +5825,7 @@ def test_tiff_write_143():
 
     with gdaltest.error_handler():
         ds = gdaltest.tiff_drv.Create('/vsimem/tiff_write_143.tif', 1000000000, 1000000000)
-    if ds is not None:
-        return 'fail'
+    assert ds is None
 
     return 'success'
 
@@ -6582,10 +5865,7 @@ def test_tiff_write_144():
 
     gdal.Unlink('tmp/tiff_write_144.tif')
 
-    if got_cs != 4873 or got_cs_ovr != 1218:
-        print(got_cs)
-        print(got_cs_ovr)
-        return 'fail'
+    assert got_cs == 4873 and got_cs_ovr == 1218
 
     return 'success'
 
@@ -6642,9 +5922,8 @@ def test_tiff_write_145():
         ds = None
         # print(gdal.GetLastErrorMsg())
         if gdal.GetLastErrorMsg() == '':
-            gdaltest.post_reason('did not get any warning/error')
             print(options)
-            return 'fail'
+            pytest.fail('did not get any warning/error')
         gdal.Unlink(filename)
 
     return 'success'
@@ -6670,12 +5949,8 @@ def test_tiff_write_146():
 
     for i in range(4):
         for j in range(4):
-            if i != 2 and j >= 2 and abs(original_stats[i][j] - got_stats[i][j]) > 5:
-                gdaltest.post_reason('did not get expected statistics')
-                print(i, j)
-                print(original_stats)
-                print(got_stats)
-                return 'fail'
+            assert i == 2 or j < 2 or abs(original_stats[i][j] - got_stats[i][j]) <= 5, \
+                'did not get expected statistics'
 
     return 'success'
 
@@ -6696,9 +5971,7 @@ def test_tiff_write_147():
     gdal.SetConfigOption('GDAL_JPEG_TO_RGB', None)
     gdal.SetConfigOption('GDAL_PAM_ENABLED', None)
     out_ds = gdal.Open('/vsimem/tiff_write_147.tif')
-    if out_ds.GetRasterBand(1).GetOverview(0) is not None:
-        gdaltest.post_reason('did not expected overview')
-        return 'fail'
+    assert out_ds.GetRasterBand(1).GetOverview(0) is None, 'did not expected overview'
     out_ds = None
     gdal.GetDriverByName('GTiff').Delete('/vsimem/tiff_write_147.tif')
 
@@ -6730,12 +6003,8 @@ def test_tiff_write_148():
 
     for i in range(4):
         for j in range(4):
-            if j >= 2 and abs(original_stats[i][j] - got_stats[i][j]) > 5:
-                gdaltest.post_reason('did not get expected statistics')
-                print(i, j)
-                print(original_stats)
-                print(got_stats)
-                return 'fail'
+            assert j < 2 or abs(original_stats[i][j] - got_stats[i][j]) <= 5, \
+                'did not get expected statistics'
 
     return 'success'
 
@@ -6752,9 +6021,7 @@ def test_tiff_write_149():
     ds = gdal.Open('/vsimem/tiff_write_149.tif')
     cs = ds.GetRasterBand(1).Checksum()
     ds = None
-    if cs != 1:
-        print(cs)
-        return 'fail'
+    assert cs == 1
     gdaltest.tiff_drv.Delete('/vsimem/tiff_write_149.tif')
 
     # Test implicit blocks
@@ -6766,9 +6033,7 @@ def test_tiff_write_149():
     ds = gdal.Open('/vsimem/tiff_write_149.tif')
     cs = ds.GetRasterBand(1).Checksum()
     ds = None
-    if cs != expected_cs:
-        print(cs)
-        return 'fail'
+    assert cs == expected_cs
     gdaltest.tiff_drv.Delete('/vsimem/tiff_write_149.tif')
 
     # NBITS=12, SEPARATE. Checksum must be the same as in the implicit blocks case
@@ -6779,9 +6044,7 @@ def test_tiff_write_149():
     ds = gdal.Open('/vsimem/tiff_write_149.tif')
     cs = ds.GetRasterBand(1).Checksum()
     ds = None
-    if cs != expected_cs:
-        print(cs)
-        return 'fail'
+    assert cs == expected_cs
     gdaltest.tiff_drv.Delete('/vsimem/tiff_write_149.tif')
 
     # NBITS=12, CONTIG. Checksum must be the same as in the implicit blocks case
@@ -6792,9 +6055,7 @@ def test_tiff_write_149():
     ds = gdal.Open('/vsimem/tiff_write_149.tif')
     cs = ds.GetRasterBand(1).Checksum()
     ds = None
-    if cs != expected_cs:
-        print(cs)
-        return 'fail'
+    assert cs == expected_cs
     gdaltest.tiff_drv.Delete('/vsimem/tiff_write_149.tif')
 
     return 'success'
@@ -6811,8 +6072,7 @@ def test_tiff_write_150():
     gdal.ErrorReset()
     with gdaltest.error_handler():
         ds.FlushCache()
-    if gdal.GetLastErrorMsg() == '':
-        return 'fail'
+    assert gdal.GetLastErrorMsg() != ''
     ds = None
     gdaltest.tiff_drv.Delete('tmp/tiled_bad_offset.tif')
 
@@ -6835,12 +6095,9 @@ def test_tiff_write_151():
     ds.GetRasterBand(3).Fill(1)
     ds = None
     ds = gdal.Open('/vsimem/tiff_write_151.tif')
-    if ds.GetRasterBand(1).Checksum() != 1:
-        return 'fail'
-    if ds.GetRasterBand(2).Checksum() != 1:
-        return 'fail'
-    if ds.GetRasterBand(3).Checksum() != 1:
-        return 'fail'
+    assert ds.GetRasterBand(1).Checksum() == 1
+    assert ds.GetRasterBand(2).Checksum() == 1
+    assert ds.GetRasterBand(3).Checksum() == 1
     ds = None
     gdaltest.tiff_drv.Delete('/vsimem/tiff_write_151.tif')
 
@@ -6857,12 +6114,8 @@ def test_tiff_write_152():
     ds.GetRasterBand(2).Fill(1)
     ds = None
     ds = gdal.Open('/vsimem/tiff_write_152.tif')
-    if ds.GetRasterBand(1).Checksum() != 0:
-        print(ds.GetRasterBand(1).Checksum())
-        return 'fail'
-    if ds.GetRasterBand(2).Checksum() != 1:
-        print(ds.GetRasterBand(1).Checksum())
-        return 'fail'
+    assert ds.GetRasterBand(1).Checksum() == 0
+    assert ds.GetRasterBand(2).Checksum() == 1
     ds = None
     gdaltest.tiff_drv.Delete('/vsimem/tiff_write_152.tif')
 
@@ -6887,9 +6140,7 @@ def test_tiff_write_153():
 
     gdaltest.tiff_drv.Delete(target_dir + '/tiff_write_153.tif')
 
-    if ret == gdal.VSI_RANGE_STATUS_DATA:
-        print(ret)
-        return 'fail'
+    assert ret != gdal.VSI_RANGE_STATUS_DATA
 
     return 'success'
 
@@ -6906,66 +6157,48 @@ def test_tiff_write_154():
     ds = gdaltest.tiff_drv.CreateCopy('/vsimem/tiff_write_154.tif', src_ds, options=['BLOCKYSIZE=256'])
     ds.FlushCache()
     # At that point empty blocks have not yet been flushed
-    if gdal.VSIStatL('/vsimem/tiff_write_154.tif').size != 162:
-        print(gdal.VSIStatL('/vsimem/tiff_write_154.tif').size)
-        return 'fail'
+    assert gdal.VSIStatL('/vsimem/tiff_write_154.tif').size == 162
     ds = None
     # Now they are and that's done in a filesystem sparse way. TODO: check this
-    if gdal.VSIStatL('/vsimem/tiff_write_154.tif').size != 256162:
-        print(gdal.VSIStatL('/vsimem/tiff_write_154.tif').size)
-        return 'fail'
+    assert gdal.VSIStatL('/vsimem/tiff_write_154.tif').size == 256162
     gdaltest.tiff_drv.Delete('/vsimem/tiff_write_154.tif')
 
     ds = gdaltest.tiff_drv.CreateCopy('/vsimem/tiff_write_154.tif', src_ds, options=['BLOCKYSIZE=256', 'COMPRESS=DEFLATE'])
     ds.FlushCache()
     # With compression, empty blocks are written right away
-    if gdal.VSIStatL('/vsimem/tiff_write_154.tif').size != 462:
-        print(gdal.VSIStatL('/vsimem/tiff_write_154.tif').size)
-        return 'fail'
+    assert gdal.VSIStatL('/vsimem/tiff_write_154.tif').size == 462
     ds = None
-    if gdal.VSIStatL('/vsimem/tiff_write_154.tif').size != 462:
-        print(gdal.VSIStatL('/vsimem/tiff_write_154.tif').size)
-        return 'fail'
+    assert gdal.VSIStatL('/vsimem/tiff_write_154.tif').size == 462
     gdaltest.tiff_drv.Delete('/vsimem/tiff_write_154.tif')
 
     # SPARSE_OK in CreateCopy(): blocks are not written
     ds = gdaltest.tiff_drv.CreateCopy('/vsimem/tiff_write_154.tif', src_ds, options=['SPARSE_OK=YES', 'BLOCKYSIZE=256'])
     ds = None
-    if gdal.VSIStatL('/vsimem/tiff_write_154.tif').size != 162:
-        print(gdal.VSIStatL('/vsimem/tiff_write_154.tif').size)
-        return 'fail'
+    assert gdal.VSIStatL('/vsimem/tiff_write_154.tif').size == 162
     # SPARSE_OK in Open()/update: blocks are not written
     ds = gdal.OpenEx('/vsimem/tiff_write_154.tif', gdal.OF_UPDATE, open_options=['SPARSE_OK=YES'])
     ds.GetRasterBand(1).Fill(0)
     ds = None
-    if gdal.VSIStatL('/vsimem/tiff_write_154.tif').size != 162:
-        print(gdal.VSIStatL('/vsimem/tiff_write_154.tif').size)
-        return 'fail'
+    assert gdal.VSIStatL('/vsimem/tiff_write_154.tif').size == 162
     ds = None
     # Default behaviour in Open()/update: blocks are written
     ds = gdal.OpenEx('/vsimem/tiff_write_154.tif', gdal.OF_UPDATE)
     ds.GetRasterBand(1).Fill(0)
     ds = None
-    if gdal.VSIStatL('/vsimem/tiff_write_154.tif').size != 250162:
-        print(gdal.VSIStatL('/vsimem/tiff_write_154.tif').size)
-        return 'fail'
+    assert gdal.VSIStatL('/vsimem/tiff_write_154.tif').size == 250162
     ds = None
     gdaltest.tiff_drv.Delete('/vsimem/tiff_write_154.tif')
 
     # SPARSE_OK in CreateCopy() in compressed case (strips): blocks are not written
     ds = gdaltest.tiff_drv.CreateCopy('/vsimem/tiff_write_154.tif', src_ds, options=['SPARSE_OK=YES', 'BLOCKYSIZE=256', 'COMPRESS=DEFLATE'])
     ds = None
-    if gdal.VSIStatL('/vsimem/tiff_write_154.tif').size != 174:
-        print(gdal.VSIStatL('/vsimem/tiff_write_154.tif').size)
-        return 'fail'
+    assert gdal.VSIStatL('/vsimem/tiff_write_154.tif').size == 174
     gdaltest.tiff_drv.Delete('/vsimem/tiff_write_154.tif')
 
     # SPARSE_OK in CreateCopy() in compressed case (tiling): blocks are not written
     ds = gdaltest.tiff_drv.CreateCopy('/vsimem/tiff_write_154.tif', src_ds, options=['SPARSE_OK=YES', 'TILED=YES'])
     ds = None
-    if gdal.VSIStatL('/vsimem/tiff_write_154.tif').size != 190:
-        print(gdal.VSIStatL('/vsimem/tiff_write_154.tif').size)
-        return 'fail'
+    assert gdal.VSIStatL('/vsimem/tiff_write_154.tif').size == 190
     gdaltest.tiff_drv.Delete('/vsimem/tiff_write_154.tif')
 
     # Test detection of 0 blocks for all data types
@@ -6980,10 +6213,7 @@ def test_tiff_write_154():
             src_ds = gdal.GetDriverByName('MEM').Create('', 500, 500, 1, dt)
             options = ['SPARSE_OK=YES', 'BLOCKYSIZE=256']
         gdaltest.tiff_drv.CreateCopy('/vsimem/tiff_write_154.tif', src_ds, options=options)
-        if gdal.VSIStatL('/vsimem/tiff_write_154.tif').size != 162:
-            print(dt)
-            print(gdal.VSIStatL('/vsimem/tiff_write_154.tif').size)
-            return 'fail'
+        assert gdal.VSIStatL('/vsimem/tiff_write_154.tif').size == 162, dt
 
     # Test detection of nodata blocks with nodata != 0 for all data types
     for dt in ['signedbyte', gdal.GDT_Int16, gdal.GDT_UInt16,
@@ -7000,19 +6230,14 @@ def test_tiff_write_154():
         src_ds.GetRasterBand(1).SetNoDataValue(1)
         ds = gdaltest.tiff_drv.CreateCopy('/vsimem/tiff_write_154.tif', src_ds, options=options)
         ds = None
-        if gdal.VSIStatL('/vsimem/tiff_write_154.tif').size != 174:
-            print(dt)
-            print(gdal.VSIStatL('/vsimem/tiff_write_154.tif').size)
-            return 'fail'
+        assert gdal.VSIStatL('/vsimem/tiff_write_154.tif').size == 174, dt
 
     # Test optimized detection when nodata==0, and with the last pixel != 0
     src_ds = gdal.GetDriverByName('MEM').Create('', 100, 1, 1)
     src_ds.GetRasterBand(1).Fill(0)
     src_ds.GetRasterBand(1).WriteRaster(99, 0, 1, 1, struct.pack('B' * 1, 1))
     gdaltest.tiff_drv.CreateCopy('/vsimem/tiff_write_154.tif', src_ds, options=['SPARSE_OK=YES'])
-    if gdal.VSIStatL('/vsimem/tiff_write_154.tif').size != 246:
-        print(gdal.VSIStatL('/vsimem/tiff_write_154.tif').size)
-        return 'fail'
+    assert gdal.VSIStatL('/vsimem/tiff_write_154.tif').size == 246
 
     gdaltest.tiff_drv.Delete('/vsimem/tiff_write_154.tif')
 
@@ -7024,8 +6249,7 @@ def test_tiff_write_154():
     offset = ds.GetRasterBand(1).GetMetadataItem('BLOCK_OFFSET_0_0', 'TIFF')
     ds = None
     gdaltest.tiff_drv.Delete('/vsimem/tiff_write_154.tif')
-    if offset is None or int(offset) == 0:
-        return 'fail'
+    assert not (offset is None or int(offset) == 0)
 
     return 'success'
 
@@ -7039,12 +6263,10 @@ def test_tiff_write_155():
     ds.GetRasterBand(1).SetDescription('foo')
     ds = None
 
-    if gdal.VSIStatL('/vsimem/tiff_write_155.tif.aux.xml') is not None:
-        return 'fail'
+    assert gdal.VSIStatL('/vsimem/tiff_write_155.tif.aux.xml') is None
 
     ds = gdal.Open('/vsimem/tiff_write_155.tif')
-    if ds.GetRasterBand(1).GetDescription() != 'foo':
-        return 'fail'
+    assert ds.GetRasterBand(1).GetDescription() == 'foo'
     ds = None
     gdaltest.tiff_drv.Delete('/vsimem/tiff_write_155.tif')
 
@@ -7052,12 +6274,10 @@ def test_tiff_write_155():
     ds.GetRasterBand(1).SetDescription('foo')
     ds = None
 
-    if gdal.VSIStatL('/vsimem/tiff_write_155.tif.aux.xml') is None:
-        return 'fail'
+    assert gdal.VSIStatL('/vsimem/tiff_write_155.tif.aux.xml') is not None
 
     ds = gdal.Open('/vsimem/tiff_write_155.tif')
-    if ds.GetRasterBand(1).GetDescription() != 'foo':
-        return 'fail'
+    assert ds.GetRasterBand(1).GetDescription() == 'foo'
     ds = None
     gdaltest.tiff_drv.Delete('/vsimem/tiff_write_155.tif')
 
@@ -7073,22 +6293,13 @@ def test_tiff_write_156():
     ds.GetRasterBand(1).WriteRaster(0, 0, 1, 1, 'X')
 
     (flags, pct) = ds.GetRasterBand(1).GetDataCoverageStatus(0, 0, 32, 32)
-    if flags != gdal.GDAL_DATA_COVERAGE_STATUS_DATA or pct != 100.0:
-        print(flags)
-        print(pct)
-        return 'fail'
+    assert flags == gdal.GDAL_DATA_COVERAGE_STATUS_DATA and pct == 100.0
 
     (flags, pct) = ds.GetRasterBand(1).GetDataCoverageStatus(32, 0, 32, 32)
-    if flags != gdal.GDAL_DATA_COVERAGE_STATUS_EMPTY or pct != 0.0:
-        print(flags)
-        print(pct)
-        return 'fail'
+    assert flags == gdal.GDAL_DATA_COVERAGE_STATUS_EMPTY and pct == 0.0
 
     (flags, pct) = ds.GetRasterBand(1).GetDataCoverageStatus(16, 16, 32, 32)
-    if flags != gdal.GDAL_DATA_COVERAGE_STATUS_DATA | gdal.GDAL_DATA_COVERAGE_STATUS_EMPTY or pct != 25.0:
-        print(flags)
-        print(pct)
-        return 'fail'
+    assert flags == gdal.GDAL_DATA_COVERAGE_STATUS_DATA | gdal.GDAL_DATA_COVERAGE_STATUS_EMPTY and pct == 25.0
 
     ds = None
     gdaltest.tiff_drv.Delete('/vsimem/tiff_write_156.tif')
@@ -7099,9 +6310,7 @@ def test_tiff_write_156():
     ds = None
     ds = gdal.Open('/vsimem/tiff_write_156.tif')
     flags, _ = ds.GetRasterBand(1).GetDataCoverageStatus(0, 100, 1, 1)
-    if flags != gdal.GDAL_DATA_COVERAGE_STATUS_DATA:
-        print(flags)
-        return 'fail'
+    assert flags == gdal.GDAL_DATA_COVERAGE_STATUS_DATA
     ds = None
     gdaltest.tiff_drv.Delete('/vsimem/tiff_write_156.tif')
 
@@ -7146,16 +6355,12 @@ def test_tiff_write_157():
 
     # Check that we properly deserialize Float16 values
     ds = gdal.Open('/vsimem/tiff_write_157.tif')
-    if ds.GetRasterBand(1).GetMetadataItem('NBITS', 'IMAGE_STRUCTURE') != '16':
-        return 'fail'
+    assert ds.GetRasterBand(1).GetMetadataItem('NBITS', 'IMAGE_STRUCTURE') == '16'
     got = struct.unpack('f' * 14, ds.ReadRaster())
     expected = [0.0, -0.0, gdaltest.posinf(), -gdaltest.posinf(), gdaltest.NaN(), gdaltest.NaN(), 1.25, -1.25, 5.9604644775390625e-08, -5.9604644775390625e-08, 6.0975551605224609e-05, -6.0975551605224609e-05, 6.103515625e-05, -6.103515625e-05]
     for i in range(14):
         if i == 4 or i == 5:
-            if got[i] == got[i]:
-                print(i)
-                print(got[i])
-                return 'fail'
+            assert got[i] != got[i]
         elif abs(got[i] - expected[i]) > 1e-15:
             print(i)
             print(got[i])
@@ -7177,8 +6382,7 @@ def test_tiff_write_157():
 
     if vals != vals_copied:
         print(struct.unpack('H' * 14, vals))
-        print(struct.unpack('H' * 14, vals_copied))
-        return 'fail'
+        pytest.fail(struct.unpack('H' * 14, vals_copied))
 
     gdaltest.tiff_drv.Delete('/vsimem/tiff_write_157.tif')
     gdaltest.tiff_drv.Delete('/vsimem/tiff_write_157_dst.tif')
@@ -7218,10 +6422,7 @@ def test_tiff_write_157():
                 1.25, -1.25, 0.0, -0.0, 0.0, -0.0, 0.0, -0.0, 5.9604644775390625e-08, gdaltest.posinf())
     for i in range(18):
         if i == 4 or i == 5:
-            if got[i] == got[i]:
-                print(i)
-                print(got[i])
-                return 'fail'
+            assert got[i] != got[i]
         elif abs(got[i] - expected[i]) > 1e-15:
             print(i)
             print(got[i])
@@ -7234,13 +6435,9 @@ def test_tiff_write_157():
     gdal.Translate('/vsimem/tiff_write_157.tif', '../gdrivers/data/small_world.tif', options='-co NBITS=16 -ot Float32')
     ds = gdal.Open('/vsimem/tiff_write_157.tif')
     cs = ds.GetRasterBand(1).Checksum()
-    if cs != 30111:
-        print(cs)
-        return 'fail'
+    assert cs == 30111
     cs = ds.GetRasterBand(2).Checksum()
-    if cs != 32302:
-        print(cs)
-        return 'fail'
+    assert cs == 32302
     ds = None
 
     gdaltest.tiff_drv.Delete('/vsimem/tiff_write_157.tif')
@@ -7255,25 +6452,17 @@ def test_tiff_write_158():
 
     ds = gdaltest.tiff_drv.Create('/vsimem/tiff_write_158.tif', 20, 40, 1, options=['TILED=YES', 'BLOCKXSIZE=16', 'BLOCKYSIZE=32'])
     (w, h) = ds.GetRasterBand(1).GetActualBlockSize(0, 0)
-    if (w, h) != (16, 32):
-        print(w, h)
-        return 'fail'
+    assert (w, h) == (16, 32)
     (w, h) = ds.GetRasterBand(1).GetActualBlockSize(1, 1)
-    if (w, h) != (4, 8):
-        print(w, h)
-        return 'fail'
+    assert (w, h) == (4, 8)
     res = ds.GetRasterBand(1).GetActualBlockSize(2, 0)
-    if res is not None:
-        return 'fail'
+    assert res is None
     res = ds.GetRasterBand(1).GetActualBlockSize(0, 2)
-    if res is not None:
-        return 'fail'
+    assert res is None
     res = ds.GetRasterBand(1).GetActualBlockSize(-1, 0)
-    if res is not None:
-        return 'fail'
+    assert res is None
     res = ds.GetRasterBand(1).GetActualBlockSize(0, -1)
-    if res is not None:
-        return 'fail'
+    assert res is None
     ds = None
 
     gdaltest.tiff_drv.Delete('/vsimem/tiff_write_158.tif')
@@ -7307,32 +6496,21 @@ def test_tiff_write_159():
         cs0 = ds.GetRasterBand(1).Checksum()
         cs1 = ds.GetRasterBand(1).GetOverview(0).Checksum()
         cs2 = ds.GetRasterBand(1).GetOverview(1).Checksum()
-        if cs0 == 0 or cs1 == 0 or cs2 == 0:
-            print(options)
-            print(cs0)
-            print(cs1)
-            print(cs2)
-            return 'fail'
+        assert not (cs0 == 0 or cs1 == 0 or cs2 == 0), options
         ifd_main = int(ds.GetRasterBand(1).GetMetadataItem('IFD_OFFSET', 'TIFF'))
         ifd_ovr_0 = int(ds.GetRasterBand(1).GetOverview(0).GetMetadataItem('IFD_OFFSET', 'TIFF'))
         ifd_ovr_1 = int(ds.GetRasterBand(1).GetOverview(1).GetMetadataItem('IFD_OFFSET', 'TIFF'))
         data_ovr_1 = int(ds.GetRasterBand(1).GetOverview(1).GetMetadataItem('BLOCK_OFFSET_0_0', 'TIFF'))
         data_ovr_0 = int(ds.GetRasterBand(1).GetOverview(0).GetMetadataItem('BLOCK_OFFSET_0_0', 'TIFF'))
         data_main = int(ds.GetRasterBand(1).GetMetadataItem('BLOCK_OFFSET_0_0', 'TIFF'))
-        if not(ifd_main < ifd_ovr_0 and ifd_ovr_0 < ifd_ovr_1 and ifd_ovr_1 < data_ovr_1 and data_ovr_1 < data_ovr_0 and data_ovr_0 < data_main):
-            print(options)
-            print(ifd_main, ifd_ovr_0, ifd_ovr_1, data_ovr_1, data_ovr_0, data_main)
-            return 'fail'
+        assert (ifd_main < ifd_ovr_0 and ifd_ovr_0 < ifd_ovr_1 and ifd_ovr_1 < data_ovr_1 and data_ovr_1 < data_ovr_0 and data_ovr_0 < data_main), \
+            options
         table_main = ds.GetRasterBand(1).GetMetadataItem('JPEGTABLES', 'TIFF')
         table_ovr_0 = ds.GetRasterBand(1).GetOverview(0).GetMetadataItem('JPEGTABLES', 'TIFF')
         table_ovr_1 = ds.GetRasterBand(1).GetOverview(1).GetMetadataItem('JPEGTABLES', 'TIFF')
-        if table_main != table_ovr_0 or table_ovr_0 != table_ovr_1:
-            print(options)
-            return 'fail'
+        assert table_main == table_ovr_0 and table_ovr_0 == table_ovr_1, options
         # Check that the JPEG tables are different in the 3 modes
-        if table_main == prev_table:
-            print(options)
-            return 'fail'
+        assert table_main != prev_table, options
         prev_table = table_main
         ds = None
 
@@ -7350,11 +6528,7 @@ def test_tiff_write_159():
         ds = gdal.Open('/vsimem/tiff_write_159.tif')
         cs0 = ds.GetRasterBand(1).Checksum()
         cs1 = ds.GetRasterBand(1).GetOverview(0).Checksum()
-        if cs0 != 4743 or cs1 != 1133:
-            print(value)
-            print(cs0)
-            print(cs1)
-            return 'fail'
+        assert cs0 == 4743 and cs1 == 1133, value
         ds = None
 
         gdaltest.tiff_drv.Delete('/vsimem/tiff_write_159.tif')
@@ -7373,9 +6547,7 @@ def test_tiff_write_160():
 
     ds = gdal.Open('/vsimem/tiff_write_160.tif')
     cs = ds.GetRasterBand(1).Checksum()
-    if cs != 1218:
-        print(cs)
-        return 'fail'
+    assert cs == 1218
     ds = None
 
     gdaltest.tiff_drv.Delete('/vsimem/tiff_write_160.tif')
@@ -7395,31 +6567,22 @@ def test_tiff_write_161():
     ds = gdal.Open('/vsimem/tiff_write_161.tif', gdal.GA_Update)
     src_ds = gdal.Open('data/gcps.vrt')
     with gdaltest.error_handler():
-        if ds.SetGCPs(src_ds.GetGCPs(), '') != 0:
-            return 'fail'
-    if ds.GetGeoTransform(can_return_null=True) is not None:
-        return 'fail'
+        assert ds.SetGCPs(src_ds.GetGCPs(), '') == 0
+    assert ds.GetGeoTransform(can_return_null=True) is None
     ds = None
 
     ds = gdal.Open('/vsimem/tiff_write_161.tif', gdal.GA_Update)
-    if not ds.GetGCPs():
-        return 'fail'
-    if ds.GetGeoTransform(can_return_null=True) is not None:
-        return 'fail'
+    assert ds.GetGCPs()
+    assert ds.GetGeoTransform(can_return_null=True) is None
     with gdaltest.error_handler():
-        if ds.SetGeoTransform([0, 1, 2, 3, 4, 5]) != 0:
-            return 'fail'
-    if ds.GetGeoTransform() != (0.0, 1.0, 2.0, 3.0, 4.0, 5.0):
-        return 'fail'
-    if ds.GetGCPs():
-        return 'fail'
+        assert ds.SetGeoTransform([0, 1, 2, 3, 4, 5]) == 0
+    assert ds.GetGeoTransform() == (0.0, 1.0, 2.0, 3.0, 4.0, 5.0)
+    assert not ds.GetGCPs()
     ds = None
 
     ds = gdal.Open('/vsimem/tiff_write_161.tif', gdal.GA_Update)
-    if ds.GetGCPs():
-        return 'fail'
-    if ds.GetGeoTransform() != (0.0, 1.0, 2.0, 3.0, 4.0, 5.0):
-        return 'fail'
+    assert not ds.GetGCPs()
+    assert ds.GetGeoTransform() == (0.0, 1.0, 2.0, 3.0, 4.0, 5.0)
     ds = None
 
     gdaltest.tiff_drv.Delete('/vsimem/tiff_write_161.tif')
@@ -7439,8 +6602,7 @@ def test_tiff_write_162():
     gdaltest.tiff_drv.CreateCopy('/vsimem/tiff_write_162.tif', src_ds,
                                  options=options)
 
-    if gdal.GetLastErrorMsg() != '':
-        return 'fail'
+    assert gdal.GetLastErrorMsg() == ''
 
     gdaltest.tiff_drv.Delete('/vsimem/tiff_write_162.tif')
 
@@ -7461,14 +6623,10 @@ def test_tiff_write_163():
                    options='-outsize 1 20000 -co BLOCKYSIZE=20000 -co PROFILE=BASELINE')
     ds = gdal.Open('/vsimem/tiff_write_163.tif')
     cs = ds.GetRasterBand(1).Checksum()
-    if cs != 47567:
-        print(cs)
-        return 'fail'
+    assert cs == 47567
     # Check that IsBlockAvailable() works properly in that mode
     offset_0_2 = ds.GetRasterBand(1).GetMetadataItem('BLOCK_OFFSET_0_2', 'TIFF')
-    if offset_0_2 != str(146 + 2 * 8192):
-        print(offset_0_2)
-        return 'fail'
+    assert offset_0_2 == str(146 + 2 * 8192)
     ds = None
 
     gdaltest.tiff_drv.Delete('/vsimem/tiff_write_163.tif')
@@ -7489,9 +6647,7 @@ def test_tiff_write_164():
     gt = ds.GetGeoTransform(can_return_null=True)
     ds = None
 
-    if gt != (0, 1, 0, 0, 0, 1):
-        print(gt)
-        return 'fail'
+    assert gt == (0, 1, 0, 0, 0, 1)
 
     # Test [0,1,0,0,0,-1] as well
     ds = gdaltest.tiff_drv.Create('/vsimem/test.tif', 1, 1)
@@ -7502,9 +6658,7 @@ def test_tiff_write_164():
     gt = ds.GetGeoTransform(can_return_null=True)
     ds = None
 
-    if gt != (0, 1, 0, 0, 0, -1):
-        print(gt)
-        return 'fail'
+    assert gt == (0, 1, 0, 0, 0, -1)
 
     gdal.Unlink('/vsimem/test.tif')
 
@@ -7518,26 +6672,18 @@ def test_tiff_write_165():
 
     ds = gdaltest.tiff_drv.Create('/vsimem/test.tif', 1, 1, 3)
     ret = ds.GetRasterBand(1).SetNoDataValue(100)
-    if ret != 0:
-        return 'fail'
+    assert ret == 0
 
     with gdaltest.error_handler():
         ret = ds.GetRasterBand(2).SetNoDataValue(200)
-    if gdal.GetLastErrorMsg() == '':
-        gdaltest.post_reason('warning expected, but not emitted')
-        return 'fail'
-    if ret != 0:
-        return 'fail'
+    assert gdal.GetLastErrorMsg() != '', 'warning expected, but not emitted'
+    assert ret == 0
 
     nd = ds.GetRasterBand(1).GetNoDataValue()
-    if nd != 100:
-        print(nd)
-        return 'fail'
+    assert nd == 100
 
     nd = ds.GetRasterBand(2).GetNoDataValue()
-    if nd != 200:
-        print(nd)
-        return 'fail'
+    assert nd == 200
 
     ds = None
 
@@ -7545,9 +6691,7 @@ def test_tiff_write_165():
     nd = ds.GetRasterBand(1).GetNoDataValue()
     ds = None
 
-    if nd != 200:
-        print(nd)
-        return 'fail'
+    assert nd == 200
 
     gdal.Unlink('/vsimem/test.tif')
 
@@ -7560,45 +6704,31 @@ def test_tiff_write_165():
 def test_tiff_write_166():
 
     ds = gdal.Open('data/tiff_vertcs_scale_offset.tif')
-    if ds.GetRasterBand(1).GetScale() != 2.0:
-        print(ds.GetRasterBand(1).GetScale())
-        return 'fail'
+    assert ds.GetRasterBand(1).GetScale() == 2.0
 
-    if ds.GetRasterBand(1).GetOffset() != 10.0:
-        print(ds.GetRasterBand(1).GetOffset())
-        return 'fail'
+    assert ds.GetRasterBand(1).GetOffset() == 10.0
 
     # Scale + offset through CreateCopy()
     gdal.Translate('/vsimem/tiff_write_166.tif', 'data/byte.tif',
                    options='-a_srs EPSG:26711+5773 -a_scale 2.0 -a_offset 10 -co PROFILE=GEOTIFF')
-    if gdal.VSIStatL('/vsimem/tiff_write_166.tif.aux.xml') is not None:
-        return 'fail'
+    assert gdal.VSIStatL('/vsimem/tiff_write_166.tif.aux.xml') is None
 
     ds = gdal.Open('/vsimem/tiff_write_166.tif')
-    if ds.GetRasterBand(1).GetScale() != 2.0:
-        print(ds.GetRasterBand(1).GetScale())
-        return 'fail'
+    assert ds.GetRasterBand(1).GetScale() == 2.0
 
-    if ds.GetRasterBand(1).GetOffset() != 10.0:
-        print(ds.GetRasterBand(1).GetOffset())
-        return 'fail'
+    assert ds.GetRasterBand(1).GetOffset() == 10.0
     ds = None
     gdal.Unlink('/vsimem/tiff_write_166.tif')
 
     # Offset only through CreateCopy()
     gdal.Translate('/vsimem/tiff_write_166.tif', 'data/byte.tif',
                    options='-a_srs EPSG:26711+5773 -a_offset 10 -co PROFILE=GEOTIFF')
-    if gdal.VSIStatL('/vsimem/tiff_write_166.tif.aux.xml') is not None:
-        return 'fail'
+    assert gdal.VSIStatL('/vsimem/tiff_write_166.tif.aux.xml') is None
 
     ds = gdal.Open('/vsimem/tiff_write_166.tif')
-    if ds.GetRasterBand(1).GetScale() != 1.0:
-        print(ds.GetRasterBand(1).GetScale())
-        return 'fail'
+    assert ds.GetRasterBand(1).GetScale() == 1.0
 
-    if ds.GetRasterBand(1).GetOffset() != 10.0:
-        print(ds.GetRasterBand(1).GetOffset())
-        return 'fail'
+    assert ds.GetRasterBand(1).GetOffset() == 10.0
     ds = None
     gdal.Unlink('/vsimem/tiff_write_166.tif')
 
@@ -7611,16 +6741,11 @@ def test_tiff_write_166():
     ds.GetRasterBand(1).SetScale(2)
     ds.GetRasterBand(1).SetOffset(10)
     ds = None
-    if gdal.VSIStatL('/vsimem/tiff_write_166.tif.aux.xml') is not None:
-        return 'fail'
+    assert gdal.VSIStatL('/vsimem/tiff_write_166.tif.aux.xml') is None
 
     ds = gdal.Open('/vsimem/tiff_write_166.tif')
-    if ds.GetRasterBand(1).GetScale() != 2.0:
-        print(ds.GetRasterBand(1).GetScale())
-        return 'fail'
-    if ds.GetRasterBand(1).GetOffset() != 10.0:
-        print(ds.GetRasterBand(1).GetOffset())
-        return 'fail'
+    assert ds.GetRasterBand(1).GetScale() == 2.0
+    assert ds.GetRasterBand(1).GetOffset() == 10.0
     ds = None
     gdal.Unlink('/vsimem/tiff_write_166.tif')
 
@@ -7632,16 +6757,11 @@ def test_tiff_write_166():
     ds.SetGeoTransform([440720, 60, 0, 3751320, 0, -60])
     ds.GetRasterBand(1).SetScale(2)
     ds = None
-    if gdal.VSIStatL('/vsimem/tiff_write_166.tif.aux.xml') is not None:
-        return 'fail'
+    assert gdal.VSIStatL('/vsimem/tiff_write_166.tif.aux.xml') is None
 
     ds = gdal.Open('/vsimem/tiff_write_166.tif')
-    if ds.GetRasterBand(1).GetScale() != 2.0:
-        print(ds.GetRasterBand(1).GetScale())
-        return 'fail'
-    if ds.GetRasterBand(1).GetOffset() != 0.0:
-        print(ds.GetRasterBand(1).GetOffset())
-        return 'fail'
+    assert ds.GetRasterBand(1).GetScale() == 2.0
+    assert ds.GetRasterBand(1).GetOffset() == 0.0
     ds = None
     gdal.Unlink('/vsimem/tiff_write_166.tif')
 
@@ -7653,16 +6773,11 @@ def test_tiff_write_166():
     ds.SetGeoTransform([440720, 60, 0, 3751320, 0, -60])
     ds.GetRasterBand(1).SetOffset(10)
     ds = None
-    if gdal.VSIStatL('/vsimem/tiff_write_166.tif.aux.xml') is not None:
-        return 'fail'
+    assert gdal.VSIStatL('/vsimem/tiff_write_166.tif.aux.xml') is None
 
     ds = gdal.Open('/vsimem/tiff_write_166.tif')
-    if ds.GetRasterBand(1).GetScale() != 1.0:
-        print(ds.GetRasterBand(1).GetScale())
-        return 'fail'
-    if ds.GetRasterBand(1).GetOffset() != 10.0:
-        print(ds.GetRasterBand(1).GetOffset())
-        return 'fail'
+    assert ds.GetRasterBand(1).GetScale() == 1.0
+    assert ds.GetRasterBand(1).GetOffset() == 10.0
     ds = None
     gdal.Unlink('/vsimem/tiff_write_166.tif')
 
@@ -7686,9 +6801,7 @@ def test_tiff_write_167_deflate_zlevel():
     size2 = gdal.VSIStatL('/vsimem/out.tif').size
     gdal.Unlink('/vsimem/out.tif')
 
-    if size2 >= size1:
-        print(size1, size2)
-        return 'fail'
+    assert size2 < size1
 
     ds = gdal.GetDriverByName('GTiff').Create('/vsimem/out.tif', 20, 20, 1,
                                               options=['COMPRESS=DEFLATE',
@@ -7701,9 +6814,7 @@ def test_tiff_write_167_deflate_zlevel():
     size2_create = gdal.VSIStatL('/vsimem/out.tif').size
     gdal.Unlink('/vsimem/out.tif')
 
-    if size2 != size2_create:
-        print(size2, size2_create)
-        return 'fail'
+    assert size2 == size2_create
 
     return 'success'
 
@@ -7737,8 +6848,7 @@ def test_tiff_write_170_invalid_compresion():
     with gdaltest.error_handler():
         gdal.GetDriverByName('GTiff').CreateCopy('/vsimem/out.tif', src_ds,
                                                  options=['COMPRESS=INVALID'])
-    if gdal.GetLastErrorMsg() == '':
-        return 'fail'
+    assert gdal.GetLastErrorMsg() != ''
     gdal.Unlink('/vsimem/out.tif')
     return 'success'
 
@@ -7805,9 +6915,7 @@ def test_tiff_write_tiled_webp():
                                           'TILED=true'])
     ds = gdal.Open(filename)
     cs = [ds.GetRasterBand(i+1).Checksum() for i in range(3)]
-    if cs != [21212, 21053, 21349]:
-        print(cs)
-        return 'fail'
+    assert cs == [21212, 21053, 21349]
 
     gdaltest.tiff_drv.Delete(filename)
     gdal.Unlink('data/md_ge_rgb_0010000.tif.aux.xml')
@@ -7837,12 +6945,8 @@ def test_tiff_write_webp_huge_single_strip():
 
     for i in range(3):
         for j in range(4):
-            if abs(original_stats[i][j] - got_stats[i][j]) > 1e-1 * abs(original_stats[i][j]):
-                gdaltest.post_reason('did not get expected statistics')
-                print(i, j)
-                print(original_stats)
-                print(got_stats)
-                return 'fail'
+            assert abs(original_stats[i][j] - got_stats[i][j]) <= 1e-1 * abs(original_stats[i][j]), \
+                'did not get expected statistics'
 
     gdaltest.tiff_drv.Delete(filename)
     gdal.Unlink('data/tif_webp_huge_single_strip.tif.aux.xml')
@@ -7863,22 +6967,14 @@ def test_tiff_write_172_geometadata_tiff_rsid():
     ds = None
 
     ds = gdal.Open(tmpfilename, gdal.GA_Update)
-    if ds.GetMetadataItem('GEO_METADATA') != 'foo':
-        print(ds.GetMetadata())
-        return 'fail'
-    if ds.GetMetadataItem('TIFF_RSID') != 'bar':
-        print(ds.GetMetadata())
-        return 'fail'
+    assert ds.GetMetadataItem('GEO_METADATA') == 'foo', ds.GetMetadata()
+    assert ds.GetMetadataItem('TIFF_RSID') == 'bar', ds.GetMetadata()
     ds.SetMetadata({})
     ds = None
 
     ds = gdal.Open(tmpfilename)
-    if ds.GetMetadataItem('GEO_METADATA') is not None:
-        print(ds.GetMetadata())
-        return 'fail'
-    if ds.GetMetadataItem('TIFF_RSID') is not None:
-        print(ds.GetMetadata())
-        return 'fail'
+    assert ds.GetMetadataItem('GEO_METADATA') is None, ds.GetMetadata()
+    assert ds.GetMetadataItem('TIFF_RSID') is None, ds.GetMetadata()
     ds = None
 
     gdal.Unlink(tmpfilename)
@@ -7985,9 +7081,7 @@ def test_tiff_write_177_lerc_several_bands_tiling():
     cs = [ds.GetRasterBand(i+1).Checksum() for i in range(3)]
     ds = None
     gdal.Unlink(filename)
-    if cs != [30111, 32302, 40026]:
-        print(cs)
-        return 'fail'
+    assert cs == [30111, 32302, 40026]
 
     return 'success'
 
@@ -8008,9 +7102,7 @@ def test_tiff_write_178_lerc_with_alpha():
     cs = [ds.GetRasterBand(i+1).Checksum() for i in range(4)]
     ds = None
     gdal.Unlink(filename)
-    if cs != [12603, 58561, 36064, 10807]:
-        print(cs)
-        return 'fail'
+    assert cs == [12603, 58561, 36064, 10807]
 
     return 'success'
 
@@ -8031,9 +7123,7 @@ def test_tiff_write_178_lerc_with_alpha_0_and_255():
     cs = [ds.GetRasterBand(i+1).Checksum() for i in range(4)]
     ds = None
     gdal.Unlink(filename)
-    if cs != [13, 13, 13, 13]:
-        print(cs)
-        return 'fail'
+    assert cs == [13, 13, 13, 13]
 
     return 'success'
 
@@ -8056,9 +7146,7 @@ def test_tiff_write_179_lerc_data_types():
         cs = ds.GetRasterBand(1).Checksum()
         ds = None
         gdal.Unlink(filename)
-        if cs != 4672:
-            print(cs)
-            return 'fail'
+        assert cs == 4672
 
     filename_tmp = filename + ".tmp.tif"
     gdal.Translate(filename_tmp, 'data/byte.tif',
@@ -8069,15 +7157,12 @@ def test_tiff_write_179_lerc_data_types():
     cs = ds.GetRasterBand(1).Checksum()
     ds = None
     gdal.Unlink(filename)
-    if cs != 4672:
-        print(cs)
-        return 'fail'
+    assert cs == 4672
 
     gdal.ErrorReset()
     with gdaltest.error_handler():
         gdal.Translate(filename, 'data/cfloat32.tif', creationOptions=['COMPRESS=LERC'])
-    if gdal.GetLastErrorMsg() == '':
-        return 'fail'
+    assert gdal.GetLastErrorMsg() != ''
     gdal.Unlink(filename)
 
     return 'success'
@@ -8099,9 +7184,7 @@ def test_tiff_write_180_lerc_separate():
     cs = [ds.GetRasterBand(i+1).Checksum() for i in range(3)]
     ds = None
     gdal.Unlink(filename)
-    if cs != [30111, 32302, 40026]:
-        print(cs)
-        return 'fail'
+    assert cs == [30111, 32302, 40026]
 
     return 'success'
 
@@ -8119,9 +7202,7 @@ def test_tiff_write_181_xmp():
     xmp_ds = gdal.Open('../gdrivers/data/byte_with_xmp.tif')
     xmp = xmp_ds.GetMetadata('xml:XMP')
     xmp_ds = None
-    if 'W5M0MpCehiHzreSzNTczkc9d' not in xmp[0]:
-        gdaltest.post_reason('Wrong input file without XMP')
-        return 'fail'
+    assert 'W5M0MpCehiHzreSzNTczkc9d' in xmp[0], 'Wrong input file without XMP'
 
     new_ds.SetMetadata(xmp, 'xml:XMP')
     new_ds = None
@@ -8130,9 +7211,8 @@ def test_tiff_write_181_xmp():
 
     new_ds = gdal.Open('tmp/test_181.tif')
     read_xmp = new_ds.GetMetadata('xml:XMP')
-    if not read_xmp or 'W5M0MpCehiHzreSzNTczkc9d' not in read_xmp[0]:
-        gdaltest.post_reason('No XMP data written in output file')
-        return 'fail'
+    assert read_xmp and 'W5M0MpCehiHzreSzNTczkc9d' in read_xmp[0], \
+        'No XMP data written in output file'
     new_ds = None
 
     gdaltest.tiff_drv.Delete('tmp/test_181.tif')
@@ -8149,17 +7229,14 @@ def test_tiff_write_182_xmp_delete():
 
     chg_ds = gdal.Open('tmp/test_182.tif', gdal.GA_Update)
     read_xmp = chg_ds.GetMetadata('xml:XMP')
-    if not read_xmp or 'W5M0MpCehiHzreSzNTczkc9d' not in read_xmp[0]:
-        gdaltest.post_reason('No XMP data written in output file')
-        return 'fail'
+    assert read_xmp and 'W5M0MpCehiHzreSzNTczkc9d' in read_xmp[0], \
+        'No XMP data written in output file'
     chg_ds.SetMetadata(None, 'xml:XMP')
     chg_ds = None
 
     again_ds = gdal.Open('tmp/test_182.tif')
     read_xmp = again_ds.GetMetadata('xml:XMP')
-    if read_xmp:
-        gdaltest.post_reason('XMP data not removed')
-        return 'fail'
+    assert not read_xmp, 'XMP data not removed'
     again_ds = None
 
     gdaltest.tiff_drv.Delete('tmp/test_182.tif')
@@ -8178,8 +7255,7 @@ def tiff_write_api_proxy():
     import test_py_scripts
     ret = test_py_scripts.run_py_script_as_external_script('.', 'tiff_write', ' -api_proxy', display_live_on_parent_stdout=True)
 
-    if ret.find('Failed:    0') == -1:
-        return 'fail'
+    assert ret.find('Failed:    0') != -1
 
     return 'success'
 
diff --git a/autotest/gcore/transformer.py b/autotest/gcore/transformer.py
index 22a0dfcd868d..96b8f63acded 100755
--- a/autotest/gcore/transformer.py
+++ b/autotest/gcore/transformer.py
@@ -36,6 +36,7 @@
 import gdaltest
 from osgeo import gdal
 from osgeo import osr
+import pytest
 
 ###############################################################################
 # Test simple Geotransform based transformer.
@@ -48,23 +49,13 @@ def test_transformer_1():
 
     (success, pnt) = tr.TransformPoint(0, 20, 10)
 
-    if not success \
-       or abs(pnt[0] - 441920) > 0.00000001 \
-       or abs(pnt[1] - 3750720) > 0.00000001 \
-       or pnt[2] != 0.0:
-        print(success, pnt)
-        gdaltest.post_reason('got wrong forward transform result.')
-        return 'fail'
+    assert success and abs(pnt[0] - 441920) <= 0.00000001 and abs(pnt[1] - 3750720) <= 0.00000001 and pnt[2] == 0.0, \
+        'got wrong forward transform result.'
 
     (success, pnt) = tr.TransformPoint(1, pnt[0], pnt[1], pnt[2])
 
-    if not success \
-       or abs(pnt[0] - 20) > 0.00000001 \
-       or abs(pnt[1] - 10) > 0.00000001 \
-       or pnt[2] != 0.0:
-        print(success, pnt)
-        gdaltest.post_reason('got wrong reverse transform result.')
-        return 'fail'
+    assert success and abs(pnt[0] - 20) <= 0.00000001 and abs(pnt[1] - 10) <= 0.00000001 and pnt[2] == 0.0, \
+        'got wrong reverse transform result.'
 
     return 'success'
 
@@ -79,23 +70,13 @@ def test_transformer_2():
 
     (success, pnt) = tr.TransformPoint(0, 20, 10)
 
-    if not success \
-       or abs(pnt[0] - 441920) > 0.001 \
-       or abs(pnt[1] - 3750720) > 0.001 \
-       or pnt[2] != 0:
-        print(success, pnt)
-        gdaltest.post_reason('got wrong forward transform result.')
-        return 'fail'
+    assert success and abs(pnt[0] - 441920) <= 0.001 and abs(pnt[1] - 3750720) <= 0.001 and pnt[2] == 0, \
+        'got wrong forward transform result.'
 
     (success, pnt) = tr.TransformPoint(1, pnt[0], pnt[1], pnt[2])
 
-    if not success \
-       or abs(pnt[0] - 20) > 0.001 \
-       or abs(pnt[1] - 10) > 0.001 \
-       or pnt[2] != 0:
-        print(success, pnt)
-        gdaltest.post_reason('got wrong reverse transform result.')
-        return 'fail'
+    assert success and abs(pnt[0] - 20) <= 0.001 and abs(pnt[1] - 10) <= 0.001 and pnt[2] == 0, \
+        'got wrong reverse transform result.'
 
     return 'success'
 
@@ -110,23 +91,13 @@ def test_transformer_3():
 
     (success, pnt) = tr.TransformPoint(0, 20, 10)
 
-    if not success \
-       or abs(pnt[0] - 441920) > 0.001 \
-       or abs(pnt[1] - 3750720) > 0.001 \
-       or pnt[2] != 0:
-        print(success, pnt)
-        gdaltest.post_reason('got wrong forward transform result.')
-        return 'fail'
+    assert success and abs(pnt[0] - 441920) <= 0.001 and abs(pnt[1] - 3750720) <= 0.001 and pnt[2] == 0, \
+        'got wrong forward transform result.'
 
     (success, pnt) = tr.TransformPoint(1, pnt[0], pnt[1], pnt[2])
 
-    if not success \
-       or abs(pnt[0] - 20) > 0.001 \
-       or abs(pnt[1] - 10) > 0.001 \
-       or pnt[2] != 0:
-        print(success, pnt)
-        gdaltest.post_reason('got wrong reverse transform result.')
-        return 'fail'
+    assert success and abs(pnt[0] - 20) <= 0.001 and abs(pnt[1] - 10) <= 0.001 and pnt[2] == 0, \
+        'got wrong reverse transform result.'
 
     return 'success'
 
@@ -141,23 +112,13 @@ def test_transformer_4():
 
     (success, pnt) = tr.TransformPoint(0, 20, 10)
 
-    if not success \
-       or abs(pnt[0] + 81.961341857910156) > 0.000001 \
-       or abs(pnt[1] - 29.612689971923828) > 0.000001 \
-       or pnt[2] != 0:
-        print(success, pnt)
-        gdaltest.post_reason('got wrong forward transform result.')
-        return 'fail'
+    assert success and abs(pnt[0] + 81.961341857910156) <= 0.000001 and abs(pnt[1] - 29.612689971923828) <= 0.000001 and pnt[2] == 0, \
+        'got wrong forward transform result.'
 
     (success, pnt) = tr.TransformPoint(1, pnt[0], pnt[1], pnt[2])
 
-    if not success \
-       or abs(pnt[0] - 20.436627518907024) > 0.001 \
-       or abs(pnt[1] - 10.484599774610549) > 0.001 \
-       or pnt[2] != 0:
-        print(success, pnt)
-        gdaltest.post_reason('got wrong reverse transform result.')
-        return 'fail'
+    assert success and abs(pnt[0] - 20.436627518907024) <= 0.001 and abs(pnt[1] - 10.484599774610549) <= 0.001 and pnt[2] == 0, \
+        'got wrong reverse transform result.'
 
     return 'success'
 
@@ -171,65 +132,37 @@ def test_transformer_5():
     tr = gdal.Transformer(ds, None, ['METHOD=RPC', 'RPC_PIXEL_ERROR_THRESHOLD=0.05'])
 
     (success, pnt) = tr.TransformPoint(0, 20.5, 10.5)
-    if not success \
-       or abs(pnt[0] - 125.64830100509131) > 0.000001 \
-       or abs(pnt[1] - 39.869433991997553) > 0.000001 \
-       or pnt[2] != 0:
-        print(success, pnt)
-        gdaltest.post_reason('got wrong forward transform result.')
-        return 'fail'
+    assert success and abs(pnt[0] - 125.64830100509131) <= 0.000001 and abs(pnt[1] - 39.869433991997553) <= 0.000001 and pnt[2] == 0, \
+        'got wrong forward transform result.'
 
     (success, pnt) = tr.TransformPoint(1, pnt[0], pnt[1], pnt[2])
-    if not success \
-       or abs(pnt[0] - 20.5) > 0.05 \
-       or abs(pnt[1] - 10.5) > 0.05 \
-       or pnt[2] != 0:
-        print(success, pnt)
-        gdaltest.post_reason('got wrong reverse transform result.')
-        return 'fail'
+    assert success and abs(pnt[0] - 20.5) <= 0.05 and abs(pnt[1] - 10.5) <= 0.05 and pnt[2] == 0, \
+        'got wrong reverse transform result.'
 
     # Try with a different height.
 
     (success, pnt) = tr.TransformPoint(0, 20.5, 10.5, 30)
 
-    if not success \
-       or abs(pnt[0] - 125.64828521533849) > 0.000001 \
-       or abs(pnt[1] - 39.869345204440144) > 0.000001 \
-       or pnt[2] != 30:
-        print(success, pnt)
-        gdaltest.post_reason('got wrong forward transform result.(2)')
-        return 'fail'
+    assert success and abs(pnt[0] - 125.64828521533849) <= 0.000001 and abs(pnt[1] - 39.869345204440144) <= 0.000001 and pnt[2] == 30, \
+        'got wrong forward transform result.(2)'
 
     (success, pnt) = tr.TransformPoint(1, pnt[0], pnt[1], pnt[2])
 
-    if not success \
-       or abs(pnt[0] - 20.5) > 0.05 \
-       or abs(pnt[1] - 10.5) > 0.05 \
-       or pnt[2] != 30:
-        print(success, pnt)
-        gdaltest.post_reason('got wrong reverse transform result.(2)')
-        return 'fail'
+    assert success and abs(pnt[0] - 20.5) <= 0.05 and abs(pnt[1] - 10.5) <= 0.05 and pnt[2] == 30, \
+        'got wrong reverse transform result.(2)'
 
     # Test RPC_HEIGHT option
     tr = gdal.Transformer(ds, None, ['METHOD=RPC', 'RPC_HEIGHT=30'])
 
     (success, pnt) = tr.TransformPoint(0, 20.5, 10.5)
 
-    if not success \
-       or abs(pnt[0] - 125.64828521533849) > 0.000001 \
-       or abs(pnt[1] - 39.869345204440144) > 0.000001:
-        print(success, pnt)
-        gdaltest.post_reason('got wrong forward transform result.(3)')
-        return 'fail'
+    assert success and abs(pnt[0] - 125.64828521533849) <= 0.000001 and abs(pnt[1] - 39.869345204440144) <= 0.000001, \
+        'got wrong forward transform result.(3)'
 
     (success, pnt) = tr.TransformPoint(1, pnt[0], pnt[1], pnt[2])
 
-    if not success \
-       or abs(pnt[0] - 20.5) > 0.1 \
-       or abs(pnt[1] - 10.5) > 0.1:
-        print(success, pnt)
-        gdaltest.post_reason('got wrong reverse transform result.(3)')
-        return 'fail'
+    assert success and abs(pnt[0] - 20.5) <= 0.1 and abs(pnt[1] - 10.5) <= 0.1, \
+        'got wrong reverse transform result.(3)'
 
     # Test RPC_DEM and RPC_HEIGHT_SCALE options
 
@@ -246,21 +179,13 @@ def test_transformer_5():
 
     (success, pnt) = tr.TransformPoint(0, 20.5, 10.5, 0)
 
-    if not success \
-       or abs(pnt[0] - 125.64828521533849) > 0.000001 \
-       or abs(pnt[1] - 39.869345204440144) > 0.000001:
-        print(success, pnt)
-        gdaltest.post_reason('got wrong forward transform result.(4)')
-        return 'fail'
+    assert success and abs(pnt[0] - 125.64828521533849) <= 0.000001 and abs(pnt[1] - 39.869345204440144) <= 0.000001, \
+        'got wrong forward transform result.(4)'
 
     (success, pnt) = tr.TransformPoint(1, pnt[0], pnt[1], pnt[2])
 
-    if not success \
-       or abs(pnt[0] - 20.5) > 0.05 \
-       or abs(pnt[1] - 10.5) > 0.05:
-        print(success, pnt)
-        gdaltest.post_reason('got wrong reverse transform result.(4)')
-        return 'fail'
+    assert success and abs(pnt[0] - 20.5) <= 0.05 and abs(pnt[1] - 10.5) <= 0.05, \
+        'got wrong reverse transform result.(4)'
 
     tr = None
 
@@ -270,21 +195,13 @@ def test_transformer_5():
 
     (success, pnt) = tr.TransformPoint(0, 20.5, 10.5, 0)
 
-    if not success \
-       or abs(pnt[0] - 125.64828521533849) > 0.000001 \
-       or abs(pnt[1] - 39.869345204440144) > 0.000001:
-        print(success, pnt)
-        gdaltest.post_reason('got wrong forward transform result.(5)')
-        return 'fail'
+    assert success and abs(pnt[0] - 125.64828521533849) <= 0.000001 and abs(pnt[1] - 39.869345204440144) <= 0.000001, \
+        'got wrong forward transform result.(5)'
 
     (success, pnt) = tr.TransformPoint(1, pnt[0], pnt[1], pnt[2])
 
-    if not success \
-       or abs(pnt[0] - 20.5) > 0.05 \
-       or abs(pnt[1] - 10.5) > 0.05:
-        print(success, pnt)
-        gdaltest.post_reason('got wrong reverse transform result.(5)')
-        return 'fail'
+    assert success and abs(pnt[0] - 20.5) <= 0.05 and abs(pnt[1] - 10.5) <= 0.05, \
+        'got wrong reverse transform result.(5)'
 
     tr = None
 
@@ -294,21 +211,13 @@ def test_transformer_5():
 
     (success, pnt) = tr.TransformPoint(0, 20.5, 10.5, 0)
 
-    if not success \
-       or abs(pnt[0] - 125.64828521503811) > 0.000001 \
-       or abs(pnt[1] - 39.869345204874911) > 0.000001:
-        print(success, pnt)
-        gdaltest.post_reason('got wrong forward transform result.(6)')
-        return 'fail'
+    assert success and abs(pnt[0] - 125.64828521503811) <= 0.000001 and abs(pnt[1] - 39.869345204874911) <= 0.000001, \
+        'got wrong forward transform result.(6)'
 
     (success, pnt) = tr.TransformPoint(1, pnt[0], pnt[1], pnt[2])
 
-    if not success \
-       or abs(pnt[0] - 20.5) > 0.05 \
-       or abs(pnt[1] - 10.5) > 0.05:
-        print(success, pnt)
-        gdaltest.post_reason('got wrong reverse transform result.(6)')
-        return 'fail'
+    assert success and abs(pnt[0] - 20.5) <= 0.05 and abs(pnt[1] - 10.5) <= 0.05, \
+        'got wrong reverse transform result.(6)'
 
     tr = None
 
@@ -316,12 +225,10 @@ def test_transformer_5():
     tr = gdal.Transformer(ds, None, ['METHOD=RPC', 'RPC_HEIGHT_SCALE=2', 'RPC_DEM=/vsimem/dem.tif'])
 
     (success, pnt) = tr.TransformPoint(0, 40000, 0, 0)
-    if success != 0:
-        return 'fail'
+    assert success == 0
 
     (success, pnt) = tr.TransformPoint(1, 125, 40, 0)
-    if success != 0:
-        return 'fail'
+    assert success == 0
 
     tr = None
 
@@ -336,20 +243,12 @@ def test_transformer_5():
     tr = gdal.Transformer(ds, None, ['METHOD=RPC', 'RPC_HEIGHT_SCALE=2', 'RPC_DEM=/vsimem/dem.tif', 'RPC_DEM_MISSING_VALUE=0'])
 
     (success, pnt) = tr.TransformPoint(0, -99.5, 0.5, 0)
-    if not success \
-       or abs(pnt[0] - 125.64746155942839) > 0.000001 \
-       or abs(pnt[1] - 39.869506789921168) > 0.000001:
-        print(success, pnt)
-        gdaltest.post_reason('got wrong forward transform result.')
-        return 'fail'
+    assert success and abs(pnt[0] - 125.64746155942839) <= 0.000001 and abs(pnt[1] - 39.869506789921168) <= 0.000001, \
+        'got wrong forward transform result.'
 
     (success, pnt) = tr.TransformPoint(1, pnt[0], pnt[1], pnt[2])
-    if not success \
-       or abs(pnt[0] - -99.5) > 0.05 \
-       or abs(pnt[1] - 0.5) > 0.05:
-        print(success, pnt)
-        gdaltest.post_reason('got wrong reverse transform result.')
-        return 'fail'
+    assert success and abs(pnt[0] - -99.5) <= 0.05 and abs(pnt[1] - 0.5) <= 0.05, \
+        'got wrong reverse transform result.'
 
     tr = None
 
@@ -368,13 +267,8 @@ def test_transformer_6():
 
     (success, pnt) = tr.TransformPoint(0, 0.5, 0.5)
 
-    if not success \
-       or abs(pnt[0] - 28.26163232) > 0.0001 \
-       or abs(pnt[1] - -27.79853245) > 0.0001 \
-       or pnt[2] != 0:
-        print(success, pnt)
-        gdaltest.post_reason('got wrong forward transform result.')
-        return 'fail'
+    assert success and abs(pnt[0] - 28.26163232) <= 0.0001 and abs(pnt[1] - -27.79853245) <= 0.0001 and pnt[2] == 0, \
+        'got wrong forward transform result.'
 
     return 'success'
 
@@ -389,13 +283,8 @@ def test_transformer_7():
 
     (pnt, success) = tr.TransformPoints(0, [(20, 10)])
 
-    if success[0] == 0 \
-       or abs(pnt[0][0] - 441920) > 0.00000001 \
-       or abs(pnt[0][1] - 3750720) > 0.00000001 \
-       or pnt[0][2] != 0.0:
-        print(success, pnt)
-        gdaltest.post_reason('got wrong forward transform result.')
-        return 'fail'
+    assert success[0] != 0 and abs(pnt[0][0] - 441920) <= 0.00000001 and abs(pnt[0][1] - 3750720) <= 0.00000001 and pnt[0][2] == 0.0, \
+        'got wrong forward transform result.'
 
     return 'success'
 
@@ -424,15 +313,13 @@ def test_transformer_8():
 
         if success:
             print(success, pnt)
-            gdaltest.post_reason('got wrong forward transform result.')
-            return 'fail'
+            pytest.fail('got wrong forward transform result.')
 
         (success, pnt) = tr.TransformPoint(1, 125.64828521533849, 39.869345204440144, 0)
 
         if success:
             print(success, pnt)
-            gdaltest.post_reason('got wrong reverse transform result.')
-            return 'fail'
+            pytest.fail('got wrong reverse transform result.')
 
     gdal.Unlink('/vsimem/dem.tif')
 
@@ -463,21 +350,13 @@ def test_transformer_9():
 
         points = [(125.64828521533849, 39.869345204440144)] * 10
         (pnt, success) = tr.TransformPoints(1, points)
-        if not success[0]:
-            print(method)
-            return 'fail'
+        assert success[0], method
         pnt_optimized = pnt[0]
 
         (success, pnt) = tr.TransformPoint(1, 125.64828521533849, 39.869345204440144, 0)
-        if not success:
-            print(method)
-            return 'fail'
+        assert success, method
 
-        if pnt != pnt_optimized:
-            print(method)
-            print(pnt)
-            print(pnt_optimized)
-            return 'fail'
+        assert pnt == pnt_optimized, method
 
     gdal.Unlink('/vsimem/dem.tif')
 
@@ -546,24 +425,14 @@ def test_transformer_10():
     tr = gdal.Transformer(ds, None, ['METHOD=RPC', 'RPC_DEM=/vsimem/dem.vrt'])
     (success, pnt) = tr.TransformPoint(1, 125.64828521533849, 39.869345204440144, 0)
 
-    if not success \
-       or abs(pnt[0] - 27.31476045569616) > 1e-5 \
-       or abs(pnt[1] - -53.328814757762302) > 1e-5 \
-       or pnt[2] != 0:
-        print(success, pnt)
-        gdaltest.post_reason('got wrong result.')
-        return 'fail'
+    assert success and abs(pnt[0] - 27.31476045569616) <= 1e-5 and abs(pnt[1] - -53.328814757762302) <= 1e-5 and pnt[2] == 0, \
+        'got wrong result.'
 
     tr = gdal.Transformer(ds, None, ['METHOD=RPC', 'RPC_DEM=/vsimem/dem.vrt', 'RPC_DEM_APPLY_VDATUM_SHIFT=FALSE'])
     (success, pnt) = tr.TransformPoint(1, 125.64828521533849, 39.869345204440144, 0)
 
-    if not success \
-       or abs(pnt[0] - 21.445626206892484) > 1e-5 \
-       or abs(pnt[1] - 1.6460100520871492) > 1e-5 \
-       or pnt[2] != 0:
-        print(success, pnt)
-        gdaltest.post_reason('got wrong result.')
-        return 'fail'
+    assert success and abs(pnt[0] - 21.445626206892484) <= 1e-5 and abs(pnt[1] - 1.6460100520871492) <= 1e-5 and pnt[2] == 0, \
+        'got wrong result.'
 
     gdal.GetDriverByName('GTX').Delete('tmp/fake.gtx')
     gdal.Unlink('/vsimem/dem.tif')
@@ -598,16 +467,12 @@ def test_transformer_11():
 
     tr = gdal.Transformer(ds, None, ['METHOD=RPC', 'RPC_HEIGHT=4000'])
     (success, pnt) = tr.TransformPoint(0, 0, 0, 0)
-    if success:
-        print(pnt)
-        return 'fail'
+    assert not success, pnt
 
     # But this one should succeed
     tr = gdal.Transformer(ds, None, ['METHOD=RPC', 'RPC_HEIGHT=1150'])
     (success, pnt) = tr.TransformPoint(0, 0, 0, 0)
-    if not success or abs(pnt[0] - 77.350939956024618) > 1e-7 or abs(pnt[1] - 38.739703990877814) > 1e-7:
-        print(pnt)
-        return 'fail'
+    assert success and abs(pnt[0] - 77.350939956024618) <= 1e-7 and abs(pnt[1] - 38.739703990877814) <= 1e-7
 
     return 'success'
 
@@ -635,8 +500,7 @@ def test_transformer_12():
 </VRTDataset>""")
 
     tr = gdal.Transformer(ds, None, ['METHOD=GCP_TPS'])
-    if tr is None:
-        return 'fail'
+    assert tr is not None
 
     ds = gdal.Open("""
     <VRTDataset rasterXSize="20" rasterYSize="20">
@@ -658,8 +522,7 @@ def test_transformer_12():
     gdal.ErrorReset()
     with gdaltest.error_handler():
         tr = gdal.Transformer(ds, None, ['METHOD=GCP_TPS'])
-    if gdal.GetLastErrorMsg() == '':
-        return 'fail'
+    assert gdal.GetLastErrorMsg() != ''
 
     ds = gdal.Open("""
     <VRTDataset rasterXSize="20" rasterYSize="20">
@@ -681,8 +544,7 @@ def test_transformer_12():
     gdal.ErrorReset()
     with gdaltest.error_handler():
         tr = gdal.Transformer(ds, None, ['METHOD=GCP_TPS'])
-    if gdal.GetLastErrorMsg() == '':
-        return 'fail'
+    assert gdal.GetLastErrorMsg() != ''
 
     return 'success'
 
@@ -713,9 +575,7 @@ def test_transformer_13():
 
     tr = gdal.Transformer(ds, None, ['METHOD=RPC', 'RPC_DEM=data/transformer_13_dem.tif'])
     (success, pnt) = tr.TransformPoint(0, 6600, 24)
-    if not success or abs(pnt[0] - -108.00066000065341) > 1e-7 or abs(pnt[1] - 39.157694013439489) > 1e-7:
-        print(pnt)
-        return 'fail'
+    assert success and abs(pnt[0] - -108.00066000065341) <= 1e-7 and abs(pnt[1] - 39.157694013439489) <= 1e-7
 
     return 'success'
 
@@ -754,26 +614,20 @@ def test_transformer_14():
     gdal.SetConfigOption('RPC_INVERSE_VERBOSE', old_rpc_inverse_verbose)
     gdal.SetConfigOption('RPC_INVERSE_LOG', old_rpc_inverse_log)
     (success, pnt) = tr.TransformPoint(0, 0, 0)
-    if not success or abs(pnt[0] - 1.9391846640653961e-05) > 1e-7 or abs(pnt[1] - -0.0038824752244123275) > 1e-7:
-        print(pnt)
-        return 'fail'
+    assert success and abs(pnt[0] - 1.9391846640653961e-05) <= 1e-7 and abs(pnt[1] - -0.0038824752244123275) <= 1e-7
 
     f = gdal.VSIFOpenL('/vsimem/transformer_14.csvt', 'rb')
     if f is not None:
         content = gdal.VSIFReadL(1, 1000, f).decode('ASCII')
         gdal.VSIFCloseL(f)
-    if content.find('Integer,Real,Real,Real,String,Real,Real') != 0:
-        print(content)
-        return 'fail'
+    assert content.find('Integer,Real,Real,Real,String,Real,Real') == 0
 
     f = gdal.VSIFOpenL('/vsimem/transformer_14.csv', 'rb')
     if f is not None:
         content = gdal.VSIFReadL(1, 1000, f).decode('ASCII')
         gdal.VSIFCloseL(f)
-    if content.find("""iter,long,lat,height,WKT,error_pixel_x,error_pixel_y
-0,""") != 0:
-        print(content)
-        return 'fail'
+    assert content.find("""iter,long,lat,height,WKT,error_pixel_x,error_pixel_y
+0,""") == 0
 
     gdal.Unlink('/vsimem/transformer_14.csvt')
     gdal.Unlink('/vsimem/transformer_14.csv')
@@ -822,25 +676,15 @@ def test_transformer_15():
 
     tr = gdal.Transformer(ds, None, ['METHOD=RPC', 'RPC_DEM=/vsimem/transformer_15_dem.vrt'])
     (success, pnt) = tr.TransformPoint(0, 0, 0)
-    if not success or abs(pnt[0] - 180.02280735469199) > 1e-7 or abs(pnt[1] - 0.061069145746997976) > 1e-7:
-        print(pnt)
-        return 'fail'
+    assert success and abs(pnt[0] - 180.02280735469199) <= 1e-7 and abs(pnt[1] - 0.061069145746997976) <= 1e-7
 
     (success, pnt_forward) = tr.TransformPoint(1, pnt[0], pnt[1], 0)
-    if not success \
-       or abs(pnt_forward[0] - 0) > 0.1 \
-       or abs(pnt_forward[1] - 0) > 0.1:
-        print(success, pnt_forward)
-        gdaltest.post_reason('got wrong reverse transform result.')
-        return 'fail'
+    assert success and abs(pnt_forward[0] - 0) <= 0.1 and abs(pnt_forward[1] - 0) <= 0.1, \
+        'got wrong reverse transform result.'
 
     (success, pnt_forward) = tr.TransformPoint(1, pnt[0] - 360, pnt[1], 0)
-    if not success \
-       or abs(pnt_forward[0] - 0) > 0.1 \
-       or abs(pnt_forward[1] - 0) > 0.1:
-        print(success, pnt_forward)
-        gdaltest.post_reason('got wrong reverse transform result.')
-        return 'fail'
+    assert success and abs(pnt_forward[0] - 0) <= 0.1 and abs(pnt_forward[1] - 0) <= 0.1, \
+        'got wrong reverse transform result.'
 
     # Now test around -180
     ds = gdal.GetDriverByName('MEM').Create('', 6600, 4400)
@@ -850,25 +694,15 @@ def test_transformer_15():
 
     tr = gdal.Transformer(ds, None, ['METHOD=RPC', 'RPC_DEM=/vsimem/transformer_15_dem.vrt'])
     (success, pnt) = tr.TransformPoint(0, 6600, 4400)
-    if not success or abs(pnt[0] - -180.02313813793387) > 1e-7 or abs(pnt[1] - -0.061398913932229765) > 1e-7:
-        print(pnt)
-        return 'fail'
+    assert success and abs(pnt[0] - -180.02313813793387) <= 1e-7 and abs(pnt[1] - -0.061398913932229765) <= 1e-7
 
     (success, pnt_forward) = tr.TransformPoint(1, pnt[0], pnt[1], 0)
-    if not success \
-       or abs(pnt_forward[0] - 6600) > 0.1 \
-       or abs(pnt_forward[1] - 4400) > 0.1:
-        print(success, pnt_forward)
-        gdaltest.post_reason('got wrong reverse transform result.')
-        return 'fail'
+    assert success and abs(pnt_forward[0] - 6600) <= 0.1 and abs(pnt_forward[1] - 4400) <= 0.1, \
+        'got wrong reverse transform result.'
 
     (success, pnt_forward) = tr.TransformPoint(1, pnt[0] + 360, pnt[1], 0)
-    if not success \
-       or abs(pnt_forward[0] - 6600) > 0.1 \
-       or abs(pnt_forward[1] - 4400) > 0.1:
-        print(success, pnt_forward)
-        gdaltest.post_reason('got wrong reverse transform result.')
-        return 'fail'
+    assert success and abs(pnt_forward[0] - 6600) <= 0.1 and abs(pnt_forward[1] - 4400) <= 0.1, \
+        'got wrong reverse transform result.'
 
     gdal.Unlink('/vsimem/demE179.tif')
     gdal.Unlink('/vsimem/demW180.tif')
@@ -890,16 +724,12 @@ def test_transformer_16():
     if f is not None:
         content = gdal.VSIFReadL(1, 10000, f).decode('ASCII')
         gdal.VSIFCloseL(f)
-    if content.find('<MaxErrorForward>6.05</MaxErrorForward>') < 0 or \
-       content.find('<MaxErrorReverse>0.1</MaxErrorReverse>') < 0 or \
-       content.find('<MaxErrorForward>0.0001</MaxErrorForward>') < 0 or \
-       content.find('<MaxErrorReverse>6.1</MaxErrorReverse>') < 0:
-        print(content)
-        return 'fail'
+    assert (content.find('<MaxErrorForward>6.05</MaxErrorForward>') >= 0 and \
+       content.find('<MaxErrorReverse>0.1</MaxErrorReverse>') >= 0 and \
+       content.find('<MaxErrorForward>0.0001</MaxErrorForward>') >= 0 and \
+       content.find('<MaxErrorReverse>6.1</MaxErrorReverse>') >= 0)
     ds = gdal.Translate('', '/vsimem/transformer_16.vrt', format='MEM')
-    if ds.GetRasterBand(1).Checksum() != 4727:
-        print(ds.GetRasterBand(1).Checksum())
-        return 'fail'
+    assert ds.GetRasterBand(1).Checksum() == 4727
     ds = None
     gdal.Unlink('/vsimem/transformer_16.tif')
     gdal.Unlink('/vsimem/transformer_16.vrt')
@@ -915,8 +745,7 @@ def test_transformer_17():
     ds = gdal.Open('data/rpc.vrt')
     with gdaltest.error_handler():
         tr = gdal.Transformer(ds, None, ['METHOD=RPC', 'RPC_DEM=/vsimem/i/donot/exist/dem.tif'])
-    if tr is not None:
-        return 'fail'
+    assert tr is None
     return 'success'
 
 
diff --git a/autotest/gcore/virtualmem.py b/autotest/gcore/virtualmem.py
index 05279db291ff..c916145d96e9 100755
--- a/autotest/gcore/virtualmem.py
+++ b/autotest/gcore/virtualmem.py
@@ -89,21 +89,14 @@ def test_virtualmem_1():
             for y in range(reqysize):
                 for x in range(reqxsize):
                     for band in range(3):
-                        if ar_tip[tiley][tilex][y][x][band] != ar[band][tiley * tileysize + y][tilex * tilexsize + x]:
-                            return 'fail'
-                        if ar_tip[tiley][tilex][y][x][band] != ar_flat_bsq[band][tiley * tileysize + y][tilex * tilexsize + x]:
-                            return 'fail'
-                        if ar_tip[tiley][tilex][y][x][band] != ar_flat_bip[tiley * tileysize + y][tilex * tilexsize + x][band]:
-                            return 'fail'
-                        if ar_tip[tiley][tilex][y][x][band] != ar_bsq[band][tiley][tilex][y][x]:
-                            return 'fail'
-                        if ar_tip[tiley][tilex][y][x][band] != ar_bit[tiley][tilex][band][y][x]:
-                            return 'fail'
+                        assert ar_tip[tiley][tilex][y][x][band] == ar[band][tiley * tileysize + y][tilex * tilexsize + x]
+                        assert ar_tip[tiley][tilex][y][x][band] == ar_flat_bsq[band][tiley * tileysize + y][tilex * tilexsize + x]
+                        assert ar_tip[tiley][tilex][y][x][band] == ar_flat_bip[tiley * tileysize + y][tilex * tilexsize + x][band]
+                        assert ar_tip[tiley][tilex][y][x][band] == ar_bsq[band][tiley][tilex][y][x]
+                        assert ar_tip[tiley][tilex][y][x][band] == ar_bit[tiley][tilex][band][y][x]
                         if band == 0:
-                            if ar_flat_band1[tiley * tileysize + y][tilex * tilexsize + x] != ar_flat_bip[tiley * tileysize + y][tilex * tilexsize + x][0]:
-                                return 'fail'
-                            if ar_tiled_band1[tiley][tilex][y][x] != ar_flat_bip[tiley * tileysize + y][tilex * tilexsize + x][0]:
-                                return 'fail'
+                            assert ar_flat_band1[tiley * tileysize + y][tilex * tilexsize + x] == ar_flat_bip[tiley * tileysize + y][tilex * tilexsize + x][0]
+                            assert ar_tiled_band1[tiley][tilex][y][x] == ar_flat_bip[tiley * tileysize + y][tilex * tilexsize + x][0]
 
     # We need to destroy the array before dataset destruction
     ar_flat_band1 = None
@@ -142,9 +135,7 @@ def test_virtualmem_2():
     cs = ds.GetRasterBand(1).Checksum()
     ds = None
 
-    if cs != 57182:
-        print(cs)
-        return 'fail'
+    assert cs == 57182
 
     return 'success'
 
@@ -184,10 +175,8 @@ def test_virtualmem_3():
         ar_255 = gdalnumeric.empty(ds.RasterXSize)
         ar_255.fill(255)
         for y in range(ds.RasterYSize):
-            if not gdalnumeric.array_equal(ar1[y], ar_127):
-                return 'fail'
-            if not gdalnumeric.array_equal(ar2[y], ar_255):
-                return 'fail'
+            assert gdalnumeric.array_equal(ar1[y], ar_127)
+            assert gdalnumeric.array_equal(ar2[y], ar_255)
         # We need to destroy the array before dataset destruction
         ar1 = None
         ar2 = None
@@ -236,9 +225,7 @@ def test_virtualmem_4():
         ar1_bis = None
         ar2 = None
         ds = None
-        if val != 127:
-            print(val)
-            return 'fail'
+        assert val == 127
 
         ds = gdal.Open(tmpfile)
         ar1 = ds.GetRasterBand(1).GetVirtualMemAutoArray(gdal.GF_Read)
diff --git a/autotest/gcore/vrt_read.py b/autotest/gcore/vrt_read.py
index 0f24a437f04c..e015447d11b2 100755
--- a/autotest/gcore/vrt_read.py
+++ b/autotest/gcore/vrt_read.py
@@ -99,15 +99,13 @@ def test_vrt_read_1():
 def test_vrt_read_2():
 
     ds = gdal.Open('data/idontexist2.vrt')
-    if ds is None:
-        return 'fail'
+    assert ds is not None
 
     gdal.PushErrorHandler('CPLQuietErrorHandler')
     cs = ds.GetRasterBand(1).Checksum()
     gdal.PopErrorHandler()
 
-    if cs != 0:
-        return 'fail'
+    assert cs == 0
 
     ds.GetMetadata()
     ds.GetRasterBand(1).GetMetadata()
@@ -138,9 +136,7 @@ def test_vrt_read_3():
     data = ds.GetRasterBand(1).ReadRaster(90, 0, 20, 100)
     got = struct.unpack('B' * 20 * 100, data)
     for i in range(100):
-        if got[i * 20 + 9] != 255:
-            gdaltest.post_reason('at line %d, did not find 255' % i)
-            return 'fail'
+        assert got[i * 20 + 9] == 255, ('at line %d, did not find 255' % i)
     ds = None
 
     driver_tif.Delete('tmp/test_mosaic1.tif')
@@ -186,9 +182,8 @@ def test_vrt_read_4():
     gdal.Unlink("/vsimem/test.tif")
 
     if scaleddata[0, 0].real != 5.0 or scaleddata[0, 0].imag != 9.0:
-        gdaltest.post_reason('did not get expected value')
         print('scaleddata[0, 0]: %f %f' % (scaleddata[0, 0].real, scaleddata[0, 0].imag))
-        return 'fail'
+        pytest.fail('did not get expected value')
 
     return 'success'
 
@@ -206,67 +201,39 @@ def test_vrt_read_5():
     ds = gdal.Open('/vsimem/vrt_read_5.vrt')
 
     gcps = ds.GetGCPs()
-    if len(gcps) != 2 or ds.GetGCPCount() != 2:
-        return 'fail'
+    assert len(gcps) == 2 and ds.GetGCPCount() == 2
 
-    if ds.GetGCPProjection().find("WGS 84") == -1:
-        print(ds.GetGCPProjection())
-        return 'fail'
+    assert ds.GetGCPProjection().find("WGS 84") != -1
 
     ds.SetGCPs(ds.GetGCPs(), ds.GetGCPProjection())
 
     gcps = ds.GetGCPs()
-    if len(gcps) != 2 or ds.GetGCPCount() != 2:
-        return 'fail'
+    assert len(gcps) == 2 and ds.GetGCPCount() == 2
 
-    if ds.GetGCPProjection().find("WGS 84") == -1:
-        print(ds.GetGCPProjection())
-        return 'fail'
+    assert ds.GetGCPProjection().find("WGS 84") != -1
 
     band = ds.GetRasterBand(1)
-    if band.GetDescription() != 'MyDescription':
-        print(band.GetDescription())
-        return 'fail'
+    assert band.GetDescription() == 'MyDescription'
 
-    if band.GetUnitType() != 'MyUnit':
-        print(band.GetUnitType())
-        return 'fail'
+    assert band.GetUnitType() == 'MyUnit'
 
-    if band.GetOffset() != 1:
-        print(band.GetOffset())
-        return 'fail'
+    assert band.GetOffset() == 1
 
-    if band.GetScale() != 2:
-        print(band.GetScale())
-        return 'fail'
+    assert band.GetScale() == 2
 
-    if band.GetRasterColorInterpretation() != gdal.GCI_PaletteIndex:
-        print(band.GetRasterColorInterpretation())
-        return 'fail'
+    assert band.GetRasterColorInterpretation() == gdal.GCI_PaletteIndex
 
-    if band.GetCategoryNames() != ['Cat1', 'Cat2']:
-        print(band.GetCategoryNames())
-        return 'fail'
+    assert band.GetCategoryNames() == ['Cat1', 'Cat2']
 
     ct = band.GetColorTable()
-    if ct.GetColorEntry(0) != (0, 0, 0, 255):
-        print(ct.GetColorEntry(0))
-        return 'fail'
-    if ct.GetColorEntry(1) != (1, 1, 1, 255):
-        print(ct.GetColorEntry(1))
-        return 'fail'
+    assert ct.GetColorEntry(0) == (0, 0, 0, 255)
+    assert ct.GetColorEntry(1) == (1, 1, 1, 255)
 
-    if band.GetMaximum() != 0:
-        print(band.GetMaximum())
-        return 'fail'
+    assert band.GetMaximum() == 0
 
-    if band.GetMinimum() != 2:
-        print(band.GetMinimum())
-        return 'fail'
+    assert band.GetMinimum() == 2
 
-    if band.GetMetadata() != {'STATISTICS_MEAN': '1', 'STATISTICS_MINIMUM': '2', 'STATISTICS_MAXIMUM': '0', 'STATISTICS_STDDEV': '3'}:
-        print(band.GetMetadata())
-        return 'fail'
+    assert band.GetMetadata() == {'STATISTICS_MEAN': '1', 'STATISTICS_MINIMUM': '2', 'STATISTICS_MAXIMUM': '0', 'STATISTICS_STDDEV': '3'}
 
     ds = None
 
@@ -285,26 +252,14 @@ def test_vrt_read_6():
     mem_ds = gdal.GetDriverByName('GTiff').CreateCopy('/vsimem/vrt_read_6.tif', src_ds)
     vrt_ds = gdal.GetDriverByName('VRT').CreateCopy('/vsimem/vrt_read_6.vrt', mem_ds)
 
-    if vrt_ds.GetRasterBand(1).GetMinimum() is not None:
-        gdaltest.post_reason('got bad minimum value')
-        print(vrt_ds.GetRasterBand(1).GetMinimum())
-        return 'fail'
-    if vrt_ds.GetRasterBand(1).GetMaximum() is not None:
-        gdaltest.post_reason('got bad maximum value')
-        print(vrt_ds.GetRasterBand(1).GetMaximum())
-        return 'fail'
+    assert vrt_ds.GetRasterBand(1).GetMinimum() is None, 'got bad minimum value'
+    assert vrt_ds.GetRasterBand(1).GetMaximum() is None, 'got bad maximum value'
 
     # Now compute source statistics
     mem_ds.GetRasterBand(1).ComputeStatistics(False)
 
-    if vrt_ds.GetRasterBand(1).GetMinimum() != 74:
-        gdaltest.post_reason('got bad minimum value')
-        print(vrt_ds.GetRasterBand(1).GetMinimum())
-        return 'fail'
-    if vrt_ds.GetRasterBand(1).GetMaximum() != 255:
-        gdaltest.post_reason('got bad maximum value')
-        print(vrt_ds.GetRasterBand(1).GetMaximum())
-        return 'fail'
+    assert vrt_ds.GetRasterBand(1).GetMinimum() == 74, 'got bad minimum value'
+    assert vrt_ds.GetRasterBand(1).GetMaximum() == 255, 'got bad maximum value'
 
     mem_ds = None
     vrt_ds = None
@@ -340,11 +295,9 @@ def test_vrt_read_7():
     error_msg = gdal.GetLastErrorMsg()
     gdal.Unlink(filename)
 
-    if ds is not None:
-        return 'fail'
+    assert ds is None
 
-    if error_msg == '':
-        return 'fail'
+    assert error_msg != ''
 
     return 'success'
 
@@ -367,10 +320,7 @@ def test_vrt_read_8():
     gdal.GetDriverByName('GTiff').Delete('/vsimem/vrt_read_8.tif')
     gdal.GetDriverByName('VRT').Delete('/vsimem/vrt_read_8.vrt')
 
-    if vrt_minmax != mem_minmax:
-        print(vrt_minmax)
-        print(mem_minmax)
-        return 'fail'
+    assert vrt_minmax == mem_minmax
 
     return 'success'
 
@@ -393,10 +343,7 @@ def test_vrt_read_9():
     gdal.GetDriverByName('GTiff').Delete('/vsimem/vrt_read_9.tif')
     gdal.GetDriverByName('VRT').Delete('/vsimem/vrt_read_9.vrt')
 
-    if vrt_stats != mem_stats:
-        print(vrt_stats)
-        print(mem_stats)
-        return 'fail'
+    assert vrt_stats == mem_stats
 
     return 'success'
 
@@ -420,14 +367,9 @@ def test_vrt_read_10():
     content = gdal.VSIFReadL(1, 10000, f).decode('ascii')
     gdal.VSIFCloseL(f)
 
-    if vrt_hist != mem_hist:
-        print(vrt_hist)
-        print(mem_hist)
-        return 'fail'
+    assert vrt_hist == mem_hist
 
-    if content.find('<Histograms>') < 0:
-        print(content)
-        return 'fail'
+    assert content.find('<Histograms>') >= 0
 
     # Single source optimization
     for i in range(2):
@@ -451,9 +393,7 @@ def test_vrt_read_10():
         content = gdal.VSIFReadL(1, 10000, f).decode('ascii')
         gdal.VSIFCloseL(f)
 
-        if content.find('<Histograms>') < 0:
-            print(content)
-            return 'fail'
+        assert content.find('<Histograms>') >= 0
 
     # Two sources general case
     for i in range(2):
@@ -480,9 +420,7 @@ def test_vrt_read_10():
         content = gdal.VSIFReadL(1, 10000, f).decode('ascii')
         gdal.VSIFCloseL(f)
 
-        if content.find('<Histograms>') < 0:
-            print(content)
-            return 'fail'
+        assert content.find('<Histograms>') >= 0
 
     gdal.GetDriverByName('GTiff').Delete('/vsimem/vrt_read_10.tif')
     gdal.GetDriverByName('VRT').Delete('/vsimem/vrt_read_10.vrt')
@@ -510,8 +448,7 @@ def test_vrt_read_11():
 
     os.remove('tmp/byte.vrt')
 
-    if ds is None:
-        return 'fail'
+    assert ds is not None
 
     return 'success'
 
@@ -537,8 +474,7 @@ def test_vrt_read_12():
 
     os.remove('tmp/byte.vrt')
 
-    if ds is None:
-        return 'fail'
+    assert ds is not None
 
     return 'success'
 
@@ -570,8 +506,7 @@ def test_vrt_read_13():
     os.remove('tmp/other_byte.vrt')
     os.remove('tmp/byte.vrt')
 
-    if ds is None:
-        return 'fail'
+    assert ds is not None
 
     return 'success'
 
@@ -603,9 +538,7 @@ def test_vrt_read_14():
 
     gdal.GetDriverByName('GTiff').Delete('/vsimem/vrt_read_14.tif')
 
-    if vrt_stats[0] != 115.0 or vrt_stats[1] != 173.0:
-        print(vrt_stats)
-        return 'fail'
+    assert vrt_stats[0] == 115.0 and vrt_stats[1] == 173.0
 
     return 'success'
 
@@ -635,9 +568,7 @@ def test_vrt_read_15():
 </VRTDataset>""")
 
     cs = vrt_ds.GetRasterBand(1).Checksum()
-    if cs != 1044:
-        print(cs)
-        return 'fail'
+    assert cs == 1044
 
     return 'success'
 
@@ -667,9 +598,7 @@ def test_vrt_read_16():
 </VRTDataset>""")
 
     cs = vrt_ds.GetRasterBand(1).Checksum()
-    if cs != 1044:
-        print(cs)
-        return 'fail'
+    assert cs == 1044
 
     return 'success'
 
@@ -694,9 +623,7 @@ def test_vrt_read_17():
     # Note: AveragedSource with resampling does not give consistent results
     # depending on the RasterIO() request
     cs = vrt_ds.GetRasterBand(1).Checksum()
-    if cs != 847:
-        print(cs)
-        return 'fail'
+    assert cs == 847
 
     return 'success'
 
@@ -708,9 +635,7 @@ def test_vrt_read_18():
 
     vrt_ds = gdal.Open('data/vrtinvrt.vrt')
     cs = vrt_ds.GetRasterBand(1).Checksum()
-    if cs != 4672:
-        print(cs)
-        return 'fail'
+    assert cs == 4672
 
     return 'success'
 
@@ -740,14 +665,10 @@ def test_vrt_read_19():
 </VRTDataset>""")
 
     cs = vrt_ds.GetRasterBand(1).Checksum()
-    if cs != 4672:
-        print(cs)
-        return 'fail'
+    assert cs == 4672
 
     cs = vrt2_ds.GetRasterBand(1).Checksum()
-    if cs != 4672:
-        print(cs)
-        return 'fail'
+    assert cs == 4672
 
     return 'success'
 
@@ -799,9 +720,7 @@ def test_vrt_read_20():
   </VRTRasterBand>
 </VRTDataset>""")
     ret = gdaltest.runexternal(test_cli_utilities.get_gdalinfo_path() + ' -checksum tmp/byte2.vrt --config VRT_SHARED_SOURCE 0 --config GDAL_MAX_DATASET_POOL_SIZE 3')
-    if ret.find('Checksum=4672') < 0:
-        print(ret)
-        return 'fail'
+    assert ret.find('Checksum=4672') >= 0
 
     for f in ['tmp/byte.tif', 'tmp/byte1_1.vrt', 'tmp/byte1_2.vrt', 'tmp/byte1_3.vrt', 'tmp/byte2.vrt']:
         os.unlink(f)
@@ -834,9 +753,7 @@ def test_vrt_read_21():
   </VRTRasterBand>
 </VRTDataset>""")
     ds = gdal.Open('/vsimem/vrt_read_21.vrt')
-    if ds.GetRasterBand(1).GetOverviewCount() != 1:
-        print(ds.GetRasterBand(1).GetOverviewCount())
-        return 'fail'
+    assert ds.GetRasterBand(1).GetOverviewCount() == 1
     data_ds_one_band = ds.ReadRaster(0, 0, 800, 800, 400, 400)
     ds = None
 
@@ -862,55 +779,37 @@ def test_vrt_read_21():
   </VRTRasterBand>
 </VRTDataset>""")
     ds = gdal.Open('/vsimem/vrt_read_21.vrt')
-    if ds.GetRasterBand(1).GetOverviewCount() != 1:
-        print(ds.GetRasterBand(1).GetOverviewCount())
-        return 'fail'
+    assert ds.GetRasterBand(1).GetOverviewCount() == 1
 
     ds = gdal.Open('/vsimem/vrt_read_21.vrt')
     ovr_band = ds.GetRasterBand(1).GetOverview(-1)
-    if ovr_band is not None:
-        return 'fail'
+    assert ovr_band is None
     ovr_band = ds.GetRasterBand(1).GetOverview(1)
-    if ovr_band is not None:
-        return 'fail'
+    assert ovr_band is None
     ovr_band = ds.GetRasterBand(1).GetOverview(0)
-    if ovr_band is None:
-        return 'fail'
+    assert ovr_band is not None
     cs = ovr_band.Checksum()
     cs2 = ds.GetRasterBand(2).GetOverview(0).Checksum()
 
     data = ds.ReadRaster(0, 0, 800, 800, 400, 400)
 
-    if data != data_ds_one_band + ds.GetRasterBand(2).ReadRaster(0, 0, 800, 800, 400, 400):
-        return 'fail'
+    assert data == data_ds_one_band + ds.GetRasterBand(2).ReadRaster(0, 0, 800, 800, 400, 400)
 
     mem_ds = gdal.GetDriverByName('MEM').Create('', 400, 400, 2)
     mem_ds.WriteRaster(0, 0, 400, 400, data)
     ref_cs = mem_ds.GetRasterBand(1).Checksum()
     ref_cs2 = mem_ds.GetRasterBand(2).Checksum()
     mem_ds = None
-    if cs != ref_cs:
-        print(cs)
-        print(ref_cs)
-        return 'fail'
-    if cs2 != ref_cs2:
-        print(cs2)
-        print(ref_cs2)
-        return 'fail'
+    assert cs == ref_cs
+    assert cs2 == ref_cs2
 
     ds.BuildOverviews('NEAR', [2])
     expected_cs = ds.GetRasterBand(1).GetOverview(0).Checksum()
     expected_cs2 = ds.GetRasterBand(2).GetOverview(0).Checksum()
     ds = None
 
-    if cs != expected_cs:
-        print(cs)
-        print(expected_cs)
-        return 'fail'
-    if cs2 != expected_cs2:
-        print(cs2)
-        print(expected_cs2)
-        return 'fail'
+    assert cs == expected_cs
+    assert cs2 == expected_cs2
 
     gdal.Unlink('/vsimem/vrt_read_21.vrt')
     gdal.Unlink('/vsimem/vrt_read_21.vrt.ovr')
@@ -943,23 +842,17 @@ def test_vrt_read_22():
     </SimpleSource>
   </VRTRasterBand>
 </VRTDataset>""")
-    if ds.GetRasterBand(1).GetMinimum() != 63:
-        return 'fail'
+    assert ds.GetRasterBand(1).GetMinimum() == 63
 
-    if ds.GetRasterBand(1).GetMaximum() != 63:
-        return 'fail'
+    assert ds.GetRasterBand(1).GetMaximum() == 63
 
-    if ds.GetRasterBand(1).ComputeRasterMinMax() != (63, 63):
-        return 'fail'
+    assert ds.GetRasterBand(1).ComputeRasterMinMax() == (63, 63)
 
-    if ds.GetRasterBand(1).ComputeStatistics(False) != [63.0, 63.0, 63.0, 0.0]:
-        print(ds.GetRasterBand(1).ComputeStatistics(False))
-        return 'fail'
+    assert ds.GetRasterBand(1).ComputeStatistics(False) == [63.0, 63.0, 63.0, 0.0]
 
     data = ds.ReadRaster()
     got = struct.unpack('B' * 20 * 20, data)
-    if got[0] != 63:
-        return 'fail'
+    assert got[0] == 63
 
     ds = gdal.Open("""<VRTDataset rasterXSize="20" rasterYSize="20">
   <VRTRasterBand dataType="Byte" band="1">
@@ -972,18 +865,13 @@ def test_vrt_read_22():
     </ComplexSource>
   </VRTRasterBand>
 </VRTDataset>""")
-    if ds.GetRasterBand(1).GetMinimum() != 63:
-        return 'fail'
+    assert ds.GetRasterBand(1).GetMinimum() == 63
 
-    if ds.GetRasterBand(1).GetMaximum() != 63:
-        return 'fail'
+    assert ds.GetRasterBand(1).GetMaximum() == 63
 
-    if ds.GetRasterBand(1).ComputeRasterMinMax() != (63, 63):
-        return 'fail'
+    assert ds.GetRasterBand(1).ComputeRasterMinMax() == (63, 63)
 
-    if ds.GetRasterBand(1).ComputeStatistics(False) != [63.0, 63.0, 63.0, 0.0]:
-        print(ds.GetRasterBand(1).ComputeStatistics(False))
-        return 'fail'
+    assert ds.GetRasterBand(1).ComputeStatistics(False) == [63.0, 63.0, 63.0, 0.0]
 
     ds = gdal.Open("""<VRTDataset rasterXSize="20" rasterYSize="20">
   <VRTRasterBand dataType="Byte" band="1">
@@ -997,19 +885,13 @@ def test_vrt_read_22():
     </ComplexSource>
   </VRTRasterBand>
 </VRTDataset>""")
-    if ds.GetRasterBand(1).GetMinimum() is not None:
-        print(ds.GetRasterBand(1).GetMinimum())
-        return 'fail'
+    assert ds.GetRasterBand(1).GetMinimum() is None
 
-    if ds.GetRasterBand(1).GetMaximum() is not None:
-        return 'fail'
+    assert ds.GetRasterBand(1).GetMaximum() is None
 
-    if ds.GetRasterBand(1).ComputeRasterMinMax() != (63, 63):
-        return 'fail'
+    assert ds.GetRasterBand(1).ComputeRasterMinMax() == (63, 63)
 
-    if ds.GetRasterBand(1).ComputeStatistics(False) != [63.0, 63.0, 63.0, 0.0]:
-        print(ds.GetRasterBand(1).ComputeStatistics(False))
-        return 'fail'
+    assert ds.GetRasterBand(1).ComputeStatistics(False) == [63.0, 63.0, 63.0, 0.0]
 
     gdal.Unlink('/vsimem/byte.tif')
     gdal.Unlink('/vsimem/byte.tif.aux.xml')
@@ -1042,11 +924,8 @@ def test_vrt_read_23():
   </VRTRasterBand>
 </VRTDataset>""")
     got_ar = ds.GetRasterBand(1).ReadAsArray(0, 0, 2, 1, 4, 1, resample_alg=gdal.GRIORA_Bilinear)
-    if list(got_ar[0]) != [0, 10, 10, 10]:
-        print(list(got_ar[0]))
-        return 'fail'
-    if ds.ReadRaster(0, 0, 2, 1, 4, 1, resample_alg=gdal.GRIORA_Bilinear) != ds.GetRasterBand(1).ReadRaster(0, 0, 2, 1, 4, 1, resample_alg=gdal.GRIORA_Bilinear):
-        return 'fail'
+    assert list(got_ar[0]) == [0, 10, 10, 10]
+    assert ds.ReadRaster(0, 0, 2, 1, 4, 1, resample_alg=gdal.GRIORA_Bilinear) == ds.GetRasterBand(1).ReadRaster(0, 0, 2, 1, 4, 1, resample_alg=gdal.GRIORA_Bilinear)
     ds = None
 
     gdal.Unlink('/vsimem/vrt_read_23.tif')
@@ -1065,11 +944,8 @@ def test_vrt_read_23():
   </VRTRasterBand>
 </VRTDataset>""")
     got_ar = ds.GetRasterBand(1).ReadAsArray(0, 0, 2, 1, 4, 1, resample_alg=gdal.GRIORA_Bilinear)
-    if list(got_ar[0]) != [0, 10, 10, 10]:
-        print(list(got_ar[0]))
-        return 'fail'
-    if ds.ReadRaster(0, 0, 2, 1, 4, 1, resample_alg=gdal.GRIORA_Bilinear) != ds.GetRasterBand(1).ReadRaster(0, 0, 2, 1, 4, 1, resample_alg=gdal.GRIORA_Bilinear):
-        return 'fail'
+    assert list(got_ar[0]) == [0, 10, 10, 10]
+    assert ds.ReadRaster(0, 0, 2, 1, 4, 1, resample_alg=gdal.GRIORA_Bilinear) == ds.GetRasterBand(1).ReadRaster(0, 0, 2, 1, 4, 1, resample_alg=gdal.GRIORA_Bilinear)
     ds = None
 
     gdal.Unlink('/vsimem/vrt_read_23.tif')
@@ -1093,9 +969,7 @@ def test_vrt_read_24():
 
     # Please do not change the expected checksum without checking that
     # the result image has no vertical black line in the middle
-    if cs != 46612:
-        print(cs)
-        return 'fail'
+    assert cs == 46612
     ds = None
 
     return 'success'
@@ -1134,28 +1008,16 @@ def test_vrt_read_25():
 </VRTDataset>""")
 
     (flags, pct) = ds.GetRasterBand(1).GetDataCoverageStatus(0, 0, 20, 20)
-    if flags != gdal.GDAL_DATA_COVERAGE_STATUS_DATA or pct != 100.0:
-        print(flags)
-        print(pct)
-        return 'fail'
+    assert flags == gdal.GDAL_DATA_COVERAGE_STATUS_DATA and pct == 100.0
 
     (flags, pct) = ds.GetRasterBand(1).GetDataCoverageStatus(1005, 35, 10, 10)
-    if flags != gdal.GDAL_DATA_COVERAGE_STATUS_DATA or pct != 100.0:
-        print(flags)
-        print(pct)
-        return 'fail'
+    assert flags == gdal.GDAL_DATA_COVERAGE_STATUS_DATA and pct == 100.0
 
     (flags, pct) = ds.GetRasterBand(1).GetDataCoverageStatus(100, 100, 20, 20)
-    if flags != gdal.GDAL_DATA_COVERAGE_STATUS_EMPTY or pct != 0.0:
-        print(flags)
-        print(pct)
-        return 'fail'
+    assert flags == gdal.GDAL_DATA_COVERAGE_STATUS_EMPTY and pct == 0.0
 
     (flags, pct) = ds.GetRasterBand(1).GetDataCoverageStatus(10, 10, 20, 20)
-    if flags != gdal.GDAL_DATA_COVERAGE_STATUS_DATA | gdal.GDAL_DATA_COVERAGE_STATUS_EMPTY or pct != 25.0:
-        print(flags)
-        print(pct)
-        return 'fail'
+    assert flags == gdal.GDAL_DATA_COVERAGE_STATUS_DATA | gdal.GDAL_DATA_COVERAGE_STATUS_EMPTY and pct == 25.0
 
     return 'success'
 
@@ -1184,11 +1046,7 @@ def test_vrt_read_26():
     partial_data = vrt_ds.GetRasterBand(1).ReadRaster(1, 1, 1, 1)
     partial_data = struct.unpack('B' * 1 * 1, partial_data)
 
-    if partial_data[0] != full_data[22 + 1]:
-        print(full_data)
-        print(partial_data[0])
-        print(full_data[22 + 1])
-        return 'fail'
+    assert partial_data[0] == full_data[22 + 1]
 
     return 'success'
 
@@ -1210,8 +1068,7 @@ def test_vrt_read_28():
 
     with gdaltest.error_handler():
         ds = gdal.Open('<VRTDataset rasterXSize="1 "rasterYSize="1"><VRTRasterBand band="-2147483648"><SimpleSource></SimpleSource></VRTRasterBand></VRTDataset>')
-    if ds is not None:
-        return 'fail'
+    assert ds is None
 
     return 'success'
 
@@ -1254,24 +1111,15 @@ def test_vrt_read_29():
     ds = gdal.Open(vrt_text)
     # Just after opening, we shouldn't have read the source
     lst = gdaltest.get_opened_files()
-    if lst.sort() != lst_before.sort():
-        print(lst)
-        print(lst_before)
-        return 'fail'
+    assert lst.sort() == lst_before.sort()
 
     # Check that the 2 bands share the same source handle
     ds.GetRasterBand(1).Checksum()
     lst = gdaltest.get_opened_files()
-    if len(lst) != len(lst_before) + 1:
-        print(lst)
-        print(lst_before)
-        return 'fail'
+    assert len(lst) == len(lst_before) + 1
     ds.GetRasterBand(2).Checksum()
     lst = gdaltest.get_opened_files()
-    if len(lst) != len(lst_before) + 1:
-        print(lst)
-        print(lst_before)
-        return 'fail'
+    assert len(lst) == len(lst_before) + 1
 
     # Open a second VRT dataset handle
     ds2 = gdal.Open(vrt_text)
@@ -1279,10 +1127,7 @@ def test_vrt_read_29():
     # Check that it consumes an extra handle
     ds2.GetRasterBand(1).Checksum()
     lst = gdaltest.get_opened_files()
-    if len(lst) != len(lst_before) + 2:
-        print(lst)
-        print(lst_before)
-        return 'fail'
+    assert len(lst) == len(lst_before) + 2
 
     gdal.Unlink('tmp/vrt_read_29.tif')
 
@@ -1306,9 +1151,7 @@ def test_vrt_read_30():
     data = ds.ReadRaster(0, 0, 2, 2, 2, 2, buf_pixel_space=3, buf_line_space=2 * 3, buf_band_space=1)
     got = struct.unpack('B' * 2 * 2 * 3, data)
     for i in range(2 * 2 * 3):
-        if got[i] != 0:
-            print(got)
-            return 'fail'
+        assert got[i] == 0
     ds = None
 
     return 'success'
@@ -1333,15 +1176,11 @@ def test_vrt_read_31():
 
     data = ds.GetRasterBand(1).ReadRaster(0, 0, 2, 2, buf_type=gdal.GDT_Float32)
     got = struct.unpack('f' * 2 * 2, data)
-    if got != (0, 1, 254, 255):
-        print(got)
-        return 'fail'
+    assert got == (0, 1, 254, 255)
 
     data = ds.ReadRaster(0, 0, 2, 2, buf_type=gdal.GDT_Float32)
     got = struct.unpack('f' * 2 * 2, data)
-    if got != (0, 1, 254, 255):
-        print(got)
-        return 'fail'
+    assert got == (0, 1, 254, 255)
 
     ds = None
 
@@ -1372,20 +1211,14 @@ def test_vrt_float32_with_nodata_slightly_below_float_min():
     gdal.Unlink('tmp/minfloat_nodata_slightly_out_of_float.vrt')
 
     # Check that the values were 'normalized' when regenerating the VRT
-    if vrt_content.find('-3.402823466385289') >= 0:
-        gdaltest.post_reason('did not get expected nodata in rewritten VRT')
-        print(vrt_content)
-        return 'fail'
+    assert vrt_content.find('-3.402823466385289') < 0, \
+        'did not get expected nodata in rewritten VRT'
 
     if nodata != -3.4028234663852886e+38:
-        gdaltest.post_reason('did not get expected nodata')
         print("%.18g" % nodata)
-        return 'fail'
+        pytest.fail('did not get expected nodata')
 
-    if stats != [-3.0, 5.0, 1.0, 4.0]:
-        gdaltest.post_reason('did not get expected stats')
-        print(stats)
-        return 'fail'
+    assert stats == [-3.0, 5.0, 1.0, 4.0], 'did not get expected stats'
 
     return 'success'
 
@@ -1397,9 +1230,7 @@ def test_vrt_subpixel_offset():
 
     ds = gdal.Open('data/vrt_subpixel_offset.vrt')
     cs = ds.GetRasterBand(1).Checksum()
-    if cs != 4849:
-        print(cs)
-        return 'fail'
+    assert cs == 4849
 
     return 'success'
 
@@ -1412,9 +1243,7 @@ def test_vrt_dstsize_larger_than_source():
 
     ds = gdal.Open('data/dstsize_larger_than_source.vrt')
     cs = ds.GetRasterBand(1).Checksum()
-    if cs != 33273:
-        print(cs)
-        return 'fail'
+    assert cs == 33273
 
     return 'success'
 
diff --git a/autotest/gcore/vrtmisc.py b/autotest/gcore/vrtmisc.py
index bfe5cf9b37c0..1dfaea02500e 100755
--- a/autotest/gcore/vrtmisc.py
+++ b/autotest/gcore/vrtmisc.py
@@ -45,10 +45,7 @@ def test_vrtmisc_1():
     cs = ds.GetRasterBand(1).Checksum()
     ds = None
 
-    if cs != 4323:
-        gdaltest.post_reason('did not get expected checksum')
-        print(cs)
-        return 'fail'
+    assert cs == 4323, 'did not get expected checksum'
 
     return 'success'
 
@@ -62,10 +59,7 @@ def test_vrtmisc_2():
     cs = ds.GetRasterBand(1).Checksum()
     ds = None
 
-    if cs != 4159:
-        gdaltest.post_reason('did not get expected checksum')
-        print(cs)
-        return 'fail'
+    assert cs == 4159, 'did not get expected checksum'
 
     return 'success'
 
@@ -89,10 +83,7 @@ def test_vrtmisc_3():
     cs = ds.GetRasterBand(1).Checksum()
     ds = None
 
-    if cs != 4159:
-        gdaltest.post_reason('did not get expected checksum')
-        print(cs)
-        return 'fail'
+    assert cs == 4159, 'did not get expected checksum'
 
     return 'success'
 
@@ -108,14 +99,8 @@ def test_vrtmisc_4():
     cs2 = ds.GetRasterBand(2).Checksum()
     ds = None
 
-    if cs1 != 4323:
-        gdaltest.post_reason('did not get expected checksum')
-        print(cs1)
-        return 'fail'
-    if cs2 != 4323:
-        gdaltest.post_reason('did not get expected checksum')
-        print(cs2)
-        return 'fail'
+    assert cs1 == 4323, 'did not get expected checksum'
+    assert cs2 == 4323, 'did not get expected checksum'
 
     return 'success'
 
@@ -131,14 +116,8 @@ def test_vrtmisc_5():
     cs2 = ds.GetRasterBand(2).Checksum()
     ds = None
 
-    if cs1 != 4672:
-        gdaltest.post_reason('did not get expected checksum')
-        print(cs1)
-        return 'fail'
-    if cs2 != 4323:
-        gdaltest.post_reason('did not get expected checksum')
-        print(cs2)
-        return 'fail'
+    assert cs1 == 4672, 'did not get expected checksum'
+    assert cs2 == 4323, 'did not get expected checksum'
 
     return 'success'
 
@@ -154,14 +133,8 @@ def test_vrtmisc_6():
     cs2 = ds.GetRasterBand(2).Checksum()
     ds = None
 
-    if cs1 != 4672:
-        gdaltest.post_reason('did not get expected checksum')
-        print(cs1)
-        return 'fail'
-    if cs2 != 4323:
-        gdaltest.post_reason('did not get expected checksum')
-        print(cs2)
-        return 'fail'
+    assert cs1 == 4672, 'did not get expected checksum'
+    assert cs2 == 4323, 'did not get expected checksum'
 
     return 'success'
 
@@ -177,14 +150,8 @@ def test_vrtmisc_7():
     cs2 = ds.GetRasterBand(2).Checksum()
     ds = None
 
-    if cs1 != 4159:
-        gdaltest.post_reason('did not get expected checksum')
-        print(cs1)
-        return 'fail'
-    if cs2 != 4159:
-        gdaltest.post_reason('did not get expected checksum')
-        print(cs2)
-        return 'fail'
+    assert cs1 == 4159, 'did not get expected checksum'
+    assert cs2 == 4159, 'did not get expected checksum'
 
     return 'success'
 
@@ -200,14 +167,8 @@ def test_vrtmisc_8():
     cs2 = ds.GetRasterBand(2).Checksum()
     ds = None
 
-    if cs1 != 4672:
-        gdaltest.post_reason('did not get expected checksum')
-        print(cs1)
-        return 'fail'
-    if cs2 != 4159:
-        gdaltest.post_reason('did not get expected checksum')
-        print(cs2)
-        return 'fail'
+    assert cs1 == 4672, 'did not get expected checksum'
+    assert cs2 == 4159, 'did not get expected checksum'
 
     return 'success'
 
@@ -223,14 +184,8 @@ def test_vrtmisc_9():
     cs2 = ds.GetRasterBand(2).Checksum()
     ds = None
 
-    if cs1 != 4672:
-        gdaltest.post_reason('did not get expected checksum')
-        print(cs1)
-        return 'fail'
-    if cs2 != 4159:
-        gdaltest.post_reason('did not get expected checksum')
-        print(cs2)
-        return 'fail'
+    assert cs1 == 4672, 'did not get expected checksum'
+    assert cs2 == 4159, 'did not get expected checksum'
 
     return 'success'
 
@@ -269,29 +224,17 @@ def test_vrtmisc_10():
     ds = None
 
     ds = gdal.Open("/vsimem/vrtmisc_10.vrt", gdal.GA_Update)
-    if ds.GetMetadata() != {'foo': 'bar'}:
-        print(ds.GetMetadata())
-        return 'fail'
-    if ds.GetMetadata('some_domain') != {'bar': 'baz'}:
-        print(ds.GetMetadata('some_domain'))
-        return 'fail'
-    if ds.GetMetadata_List('xml:a_xml_domain')[0] != '<some_xml />\n':
-        print(ds.GetMetadata_List('xml:a_xml_domain'))
-        return 'fail'
+    assert ds.GetMetadata() == {'foo': 'bar'}
+    assert ds.GetMetadata('some_domain') == {'bar': 'baz'}
+    assert ds.GetMetadata_List('xml:a_xml_domain')[0] == '<some_xml />\n'
     # Empty default domain
     ds.SetMetadata({})
     ds = None
 
     ds = gdal.Open("/vsimem/vrtmisc_10.vrt")
-    if ds.GetMetadata() != {}:
-        print(ds.GetMetadata())
-        return 'fail'
-    if ds.GetMetadata('some_domain') != {'bar': 'baz'}:
-        print(ds.GetMetadata('some_domain'))
-        return 'fail'
-    if ds.GetMetadata_List('xml:a_xml_domain')[0] != '<some_xml />\n':
-        print(ds.GetMetadata_List('xml:a_xml_domain'))
-        return 'fail'
+    assert ds.GetMetadata() == {}
+    assert ds.GetMetadata('some_domain') == {'bar': 'baz'}
+    assert ds.GetMetadata_List('xml:a_xml_domain')[0] == '<some_xml />\n'
     ds = None
 
     gdal.Unlink("/vsimem/vrtmisc_10.vrt")
@@ -329,8 +272,7 @@ def test_vrtmisc_11():
 
     gdal.Unlink("tmp/vrtmisc_11.vrt")
 
-    if data.find('<SourceFilename relativeToVRT="1">../data/byte.tif</SourceFilename>') < 0:
-        return 'fail'
+    assert data.find('<SourceFilename relativeToVRT="1">../data/byte.tif</SourceFilename>') >= 0
 
     return "success"
 
@@ -359,15 +301,12 @@ def test_vrtmisc_12():
     ds = None
 
     ds = gdal.Open("/vsimem/vrtmisc_12.vrt", gdal.GA_Update)
-    if ds.GetRasterBand(1).GetNoDataValue() != 123:
-        return 'fail'
-    if ds.GetRasterBand(1).DeleteNoDataValue() != 0:
-        return 'fail'
+    assert ds.GetRasterBand(1).GetNoDataValue() == 123
+    assert ds.GetRasterBand(1).DeleteNoDataValue() == 0
     ds = None
 
     ds = gdal.Open("/vsimem/vrtmisc_12.vrt")
-    if ds.GetRasterBand(1).GetNoDataValue() is not None:
-        return 'fail'
+    assert ds.GetRasterBand(1).GetNoDataValue() is None
     ds = None
 
     gdal.Unlink("/vsimem/vrtmisc_12.vrt")
@@ -382,8 +321,7 @@ def test_vrtmisc_13():
 
     ds = gdal.Open('data/oddsize1bit.tif')
     out_ds = gdal.GetDriverByName('VRT').CreateCopy('', ds)
-    if out_ds.GetRasterBand(1).GetMetadataItem('NBITS', 'IMAGE_STRUCTURE') != '1':
-        return 'fail'
+    assert out_ds.GetRasterBand(1).GetMetadataItem('NBITS', 'IMAGE_STRUCTURE') == '1'
 
     return "success"
 
@@ -403,10 +341,8 @@ def test_vrtmisc_14():
     gdal.Unlink("/vsimem/vrtmisc_14_src.tif")
     gdal.Unlink("/vsimem/vrtmisc_14.vrt")
 
-    if content.find('<SrcRect xOff="0" yOff="0" xSize="123456789" ySize="1"') < 0 or \
-       content.find('<DstRect xOff="0" yOff="0" xSize="123456789" ySize="1"') < 0:
-        print(content)
-        return 'fail'
+    assert (content.find('<SrcRect xOff="0" yOff="0" xSize="123456789" ySize="1"') >= 0 and \
+       content.find('<DstRect xOff="0" yOff="0" xSize="123456789" ySize="1"') >= 0)
 
     src_ds = gdal.GetDriverByName('GTiff').Create('/vsimem/vrtmisc_14_src.tif', 1, 123456789, options=['SPARSE_OK=YES', 'TILED=YES'])
     gdal.GetDriverByName('VRT').CreateCopy('/vsimem/vrtmisc_14.vrt', src_ds)
@@ -418,10 +354,8 @@ def test_vrtmisc_14():
     gdal.Unlink("/vsimem/vrtmisc_14_src.tif")
     gdal.Unlink("/vsimem/vrtmisc_14.vrt")
 
-    if content.find('<SrcRect xOff="0" yOff="0" xSize="1" ySize="123456789"') < 0 or \
-       content.find('<DstRect xOff="0" yOff="0" xSize="1" ySize="123456789"') < 0:
-        print(content)
-        return 'fail'
+    assert (content.find('<SrcRect xOff="0" yOff="0" xSize="1" ySize="123456789"') >= 0 and \
+       content.find('<DstRect xOff="0" yOff="0" xSize="1" ySize="123456789"') >= 0)
 
     return "success"
 
@@ -433,8 +367,7 @@ def test_vrtmisc_15():
 
     ds = gdal.GetDriverByName('GTiff').Create('/vsimem/vrtmisc_15.tif', 1, 1, options=['PIXELTYPE=SIGNEDBYTE'])
     out_ds = gdal.GetDriverByName('VRT').CreateCopy('', ds)
-    if out_ds.GetRasterBand(1).GetMetadataItem('PIXELTYPE', 'IMAGE_STRUCTURE') != 'SIGNEDBYTE':
-        return 'fail'
+    assert out_ds.GetRasterBand(1).GetMetadataItem('PIXELTYPE', 'IMAGE_STRUCTURE') == 'SIGNEDBYTE'
     ds = None
     gdal.Unlink('/vsimem/vrtmisc_15.tif')
 
@@ -451,25 +384,15 @@ def test_vrtmisc_16():
     content = gdal.VSIFReadL(1, 100000, fp).decode('latin1')
     gdal.VSIFCloseL(fp)
 
-    if content.find('<SrcRect xOff="0" yOff="0" xSize="952" ySize="1189"') < 0:
-        print(content)
-        return 'fail'
-    if content.find('<DstRect xOff="0" yOff="0" xSize="952" ySize="1189"') < 0:
-        print(content)
-        return 'fail'
-    if content.find('<SrcRect xOff="0" yOff="0" xSize="494" ySize="893"') < 0:
-        print(content)
-        return 'fail'
-    if content.find('<DstRect xOff="1680" yOff="5922" xSize="494" ySize="893"') < 0:
-        print(content)
-        return 'fail'
+    assert content.find('<SrcRect xOff="0" yOff="0" xSize="952" ySize="1189"') >= 0
+    assert content.find('<DstRect xOff="0" yOff="0" xSize="952" ySize="1189"') >= 0
+    assert content.find('<SrcRect xOff="0" yOff="0" xSize="494" ySize="893"') >= 0
+    assert content.find('<DstRect xOff="1680" yOff="5922" xSize="494" ySize="893"') >= 0
 
     gdal.GetDriverByName('GTiff').CreateCopy('/vsimem/vrtmisc_16.tif', gdal.Open('/vsimem/vrtmisc_16.vrt'))
     ds = gdal.Open('/vsimem/vrtmisc_16.tif')
     cs = ds.GetRasterBand(1).Checksum()
-    if cs != 206:
-        print(cs)
-        return 'fail'
+    assert cs == 206
     gdal.Unlink('/vsimem/vrtmisc_16.tif')
     gdal.Unlink('/vsimem/vrtmisc_16.vrt')
 
@@ -497,9 +420,7 @@ def test_vrtmisc_16():
     gdal.GetDriverByName('GTiff').CreateCopy('/vsimem/vrtmisc_16.tif', gdal.Open('/vsimem/vrtmisc_16.vrt'))
     ds = gdal.Open('/vsimem/vrtmisc_16.tif')
     cs = ds.GetRasterBand(1).Checksum()
-    if cs != 206:
-        print(cs)
-        return 'fail'
+    assert cs == 206
     gdal.Unlink('/vsimem/vrtmisc_16.tif')
     gdal.Unlink('/vsimem/vrtmisc_16.vrt')
 
@@ -518,8 +439,7 @@ def test_vrtmisc_17():
 
     gdal.Unlink('/vsimem/vrtmisc_17.vrt')
 
-    if xml_vrt.find('xml:VRT') >= 0:
-        return 'fail'
+    assert xml_vrt.find('xml:VRT') < 0
 
     return "success"
 
@@ -532,14 +452,11 @@ def test_vrtmisc_18():
     ds = gdal.Open('data/byte.vrt')
     vrt_ds = gdal.GetDriverByName('VRT').CreateCopy('', ds)
     xml_vrt = vrt_ds.GetMetadata('xml:VRT')[0]
-    if gdal.GetLastErrorMsg() != '':
-        return 'fail'
+    assert gdal.GetLastErrorMsg() == ''
     vrt_ds = None
 
-    if xml_vrt.find('<SourceFilename relativeToVRT="1">data/byte.tif</SourceFilename>') < 0 and \
-       xml_vrt.find('<SourceFilename relativeToVRT="1">data\\byte.tif</SourceFilename>') < 0:
-        print(xml_vrt)
-        return 'fail'
+    assert (xml_vrt.find('<SourceFilename relativeToVRT="1">data/byte.tif</SourceFilename>') >= 0 or \
+       xml_vrt.find('<SourceFilename relativeToVRT="1">data\\byte.tif</SourceFilename>') >= 0)
 
     return "success"
 
@@ -557,34 +474,26 @@ def test_vrtmisc_rat():
     vrt_ds = gdal.GetDriverByName('VRT').CreateCopy('/vsimem/vrtmisc_rat.vrt', ds)
 
     xml_vrt = vrt_ds.GetMetadata('xml:VRT')[0]
-    if gdal.GetLastErrorMsg() != '':
-        return 'fail'
+    assert gdal.GetLastErrorMsg() == ''
     vrt_ds = None
 
-    if xml_vrt.find('<GDALRasterAttributeTable tableType="thematic">') < 0:
-        print(xml_vrt)
-        return 'fail'
+    assert xml_vrt.find('<GDALRasterAttributeTable tableType="thematic">') >= 0
 
     vrt_ds = gdal.Translate('/vsimem/vrtmisc_rat.vrt', ds, format='VRT', srcWin=[0, 0, 1, 1])
 
     xml_vrt = vrt_ds.GetMetadata('xml:VRT')[0]
-    if gdal.GetLastErrorMsg() != '':
-        return 'fail'
+    assert gdal.GetLastErrorMsg() == ''
     vrt_ds = None
 
-    if xml_vrt.find('<GDALRasterAttributeTable tableType="thematic">') < 0:
-        print(xml_vrt)
-        return 'fail'
+    assert xml_vrt.find('<GDALRasterAttributeTable tableType="thematic">') >= 0
 
     ds = None
 
     vrt_ds = gdal.Open('/vsimem/vrtmisc_rat.vrt', gdal.GA_Update)
     rat = vrt_ds.GetRasterBand(1).GetDefaultRAT()
-    if rat is None or rat.GetColumnCount() != 1:
-        return 'fail'
+    assert rat is not None and rat.GetColumnCount() == 1
     vrt_ds.GetRasterBand(1).SetDefaultRAT(None)
-    if vrt_ds.GetRasterBand(1).GetDefaultRAT() is not None:
-        return 'fail'
+    assert vrt_ds.GetRasterBand(1).GetDefaultRAT() is None
     vrt_ds = None
 
     ds = None
@@ -604,11 +513,9 @@ def test_vrtmisc_colortable():
     ct = gdal.ColorTable()
     ct.SetColorEntry(0, (255, 255, 255, 255))
     ds.GetRasterBand(1).SetColorTable(ct)
-    if ds.GetRasterBand(1).GetColorTable().GetCount() != 1:
-        return 'fail'
+    assert ds.GetRasterBand(1).GetColorTable().GetCount() == 1
     ds.GetRasterBand(1).SetColorTable(None)
-    if ds.GetRasterBand(1).GetColorTable() is not None:
-        return 'fail'
+    assert ds.GetRasterBand(1).GetColorTable() is None
 
     return 'success'
 
@@ -627,9 +534,7 @@ def test_vrtmisc_histogram():
     hist = ds.GetRasterBand(1).GetDefaultHistogram(force=0)
     ds = None
 
-    if hist != (1.0, 2.0, 2, [3000000000, 4]):
-        print(hist)
-        return 'fail'
+    assert hist == (1.0, 2.0, 2, [3000000000, 4])
 
     gdal.Unlink(tmpfile)
     return 'success'
diff --git a/autotest/gcore/vsiaz.py b/autotest/gcore/vsiaz.py
index e95bcb7af677..76107d038056 100755
--- a/autotest/gcore/vsiaz.py
+++ b/autotest/gcore/vsiaz.py
@@ -55,8 +55,7 @@ def test_vsiaz_init():
         if gdaltest.az_vars[var] is not None:
             gdal.SetConfigOption(var, "")
 
-    if gdal.GetSignedURL('/vsiaz/foo/bar') is not None:
-        return 'fail'
+    assert gdal.GetSignedURL('/vsiaz/foo/bar') is None
 
     return 'success'
 
@@ -73,24 +72,19 @@ def test_vsiaz_real_server_errors():
     gdal.ErrorReset()
     with gdaltest.error_handler():
         f = open_for_read('/vsiaz/foo/bar')
-    if f is not None or gdal.VSIGetLastErrorMsg().find('AZURE_STORAGE_ACCOUNT') < 0:
-        print(gdal.VSIGetLastErrorMsg())
-        return 'fail'
+    assert f is None and gdal.VSIGetLastErrorMsg().find('AZURE_STORAGE_ACCOUNT') >= 0
 
     gdal.ErrorReset()
     with gdaltest.error_handler():
         f = open_for_read('/vsiaz_streaming/foo/bar')
-    if f is not None or gdal.VSIGetLastErrorMsg().find('AZURE_STORAGE_ACCOUNT') < 0:
-        print(gdal.VSIGetLastErrorMsg())
-        return 'fail'
+    assert f is None and gdal.VSIGetLastErrorMsg().find('AZURE_STORAGE_ACCOUNT') >= 0
 
     # Invalid AZURE_STORAGE_CONNECTION_STRING
     gdal.SetConfigOption('AZURE_STORAGE_CONNECTION_STRING', 'invalid')
     gdal.ErrorReset()
     with gdaltest.error_handler():
         f = open_for_read('/vsiaz/foo/bar')
-    if f is not None:
-        return 'fail'
+    assert f is None
     gdal.SetConfigOption('AZURE_STORAGE_CONNECTION_STRING', '')
 
     gdal.SetConfigOption('AZURE_STORAGE_ACCOUNT', 'AZURE_STORAGE_ACCOUNT')
@@ -99,9 +93,7 @@ def test_vsiaz_real_server_errors():
     gdal.ErrorReset()
     with gdaltest.error_handler():
         f = open_for_read('/vsiaz/foo/bar')
-    if f is not None or gdal.VSIGetLastErrorMsg().find('AZURE_STORAGE_ACCESS_KEY') < 0:
-        print(gdal.VSIGetLastErrorMsg())
-        return 'fail'
+    assert f is None and gdal.VSIGetLastErrorMsg().find('AZURE_STORAGE_ACCESS_KEY') >= 0
 
     gdal.SetConfigOption('AZURE_STORAGE_ACCESS_KEY', 'AZURE_STORAGE_ACCESS_KEY')
 
@@ -119,9 +111,7 @@ def test_vsiaz_real_server_errors():
     gdal.ErrorReset()
     with gdaltest.error_handler():
         f = open_for_read('/vsiaz_streaming/foo/bar.baz')
-    if f is not None:
-        print(gdal.VSIGetLastErrorMsg())
-        return 'fail'
+    assert f is None, gdal.VSIGetLastErrorMsg()
 
     return 'success'
 
@@ -158,10 +148,8 @@ def test_vsiaz_fake_basic():
         return 'skip'
 
     signed_url = gdal.GetSignedURL('/vsiaz/az_fake_bucket/resource', ['START_DATE=20180213T123456'])
-    if signed_url not in ('http://127.0.0.1:8080/azure/blob/myaccount/az_fake_bucket/resource?se=2018-02-13T13%3A34%3A56Z&sig=9Jc4yBFlSRZSSxf059OohN6pYRrjuHWJWSEuryczN%2FM%3D&sp=r&sr=c&st=2018-02-13T12%3A34%3A56Z&sv=2012-02-12',
-                          'http://127.0.0.1:8081/azure/blob/myaccount/az_fake_bucket/resource?se=2018-02-13T13%3A34%3A56Z&sig=9Jc4yBFlSRZSSxf059OohN6pYRrjuHWJWSEuryczN%2FM%3D&sp=r&sr=c&st=2018-02-13T12%3A34%3A56Z&sv=2012-02-12'):
-        print(signed_url)
-        return 'fail'
+    assert (signed_url in ('http://127.0.0.1:8080/azure/blob/myaccount/az_fake_bucket/resource?se=2018-02-13T13%3A34%3A56Z&sig=9Jc4yBFlSRZSSxf059OohN6pYRrjuHWJWSEuryczN%2FM%3D&sp=r&sr=c&st=2018-02-13T12%3A34%3A56Z&sv=2012-02-12',
+                          'http://127.0.0.1:8081/azure/blob/myaccount/az_fake_bucket/resource?se=2018-02-13T13%3A34%3A56Z&sig=9Jc4yBFlSRZSSxf059OohN6pYRrjuHWJWSEuryczN%2FM%3D&sp=r&sr=c&st=2018-02-13T12%3A34%3A56Z&sv=2012-02-12'))
 
     def method(request):
 
@@ -184,14 +172,11 @@ def method(request):
     handler.add('GET', '/azure/blob/myaccount/az_fake_bucket/resource', custom_method=method)
     with webserver.install_http_handler(handler):
         f = open_for_read('/vsiaz/az_fake_bucket/resource')
-        if f is None:
-            return 'fail'
+        assert f is not None
         data = gdal.VSIFReadL(1, 4, f).decode('ascii')
         gdal.VSIFCloseL(f)
 
-    if data != 'foo':
-        print(data)
-        return 'fail'
+    assert data == 'foo'
 
     def method(request):
 
@@ -215,14 +200,11 @@ def method(request):
     handler.add('GET', '/azure/blob/myaccount/az_fake_bucket/resource', custom_method=method)
     with webserver.install_http_handler(handler):
         f = open_for_read('/vsiaz_streaming/az_fake_bucket/resource')
-        if f is None:
-            return 'fail'
+        assert f is not None
         data = gdal.VSIFReadL(1, 4, f).decode('ascii')
         gdal.VSIFCloseL(f)
 
-        if data != 'foo':
-            print(data)
-            return 'fail'
+        assert data == 'foo'
 
     handler = webserver.SequentialHandler()
     handler.add('HEAD', '/azure/blob/myaccount/az_fake_bucket/resource2.bin', 200,
@@ -309,28 +291,20 @@ def test_vsiaz_fake_readdir():
     gdal.VSIFCloseL(f)
 
     dir_contents = gdal.ReadDir('/vsiaz/az_fake_bucket2/a_dir')
-    if dir_contents != ['resource3.bin', 'resource4.bin', 'subdir']:
-        print(dir_contents)
-        return 'fail'
-    if gdal.VSIStatL('/vsiaz/az_fake_bucket2/a_dir/resource3.bin').size != 123456:
-        print(gdal.VSIStatL('/vsiaz/az_fake_bucket2/a_dir/resource3.bin').size)
-        return 'fail'
-    if gdal.VSIStatL('/vsiaz/az_fake_bucket2/a_dir/resource3.bin').mtime != 1:
-        return 'fail'
+    assert dir_contents == ['resource3.bin', 'resource4.bin', 'subdir']
+    assert gdal.VSIStatL('/vsiaz/az_fake_bucket2/a_dir/resource3.bin').size == 123456
+    assert gdal.VSIStatL('/vsiaz/az_fake_bucket2/a_dir/resource3.bin').mtime == 1
 
     # ReadDir on something known to be a file shouldn't cause network access
     dir_contents = gdal.ReadDir('/vsiaz/az_fake_bucket2/a_dir/resource3.bin')
-    if dir_contents is not None:
-        return 'fail'
+    assert dir_contents is None
 
     # Test error on ReadDir()
     handler = webserver.SequentialHandler()
     handler.add('GET', '/azure/blob/myaccount/az_fake_bucket2?comp=list&delimiter=%2F&prefix=error_test%2F&restype=container', 500)
     with webserver.install_http_handler(handler):
         dir_contents = gdal.ReadDir('/vsiaz/az_fake_bucket2/error_test/')
-    if dir_contents is not None:
-        print(dir_contents)
-        return 'fail'
+    assert dir_contents is None
 
     # List containers (empty result)
     handler = webserver.SequentialHandler()
@@ -342,9 +316,7 @@ def test_vsiaz_fake_readdir():
         """)
     with webserver.install_http_handler(handler):
         dir_contents = gdal.ReadDir('/vsiaz/')
-    if dir_contents != ['.']:
-        print(dir_contents)
-        return 'fail'
+    assert dir_contents == ['.']
 
     gdal.VSICurlClearCache()
 
@@ -373,9 +345,7 @@ def test_vsiaz_fake_readdir():
         """)
     with webserver.install_http_handler(handler):
         dir_contents = gdal.ReadDir('/vsiaz/')
-    if dir_contents != ['mycontainer1', 'mycontainer2']:
-        print(dir_contents)
-        return 'fail'
+    assert dir_contents == ['mycontainer1', 'mycontainer2']
 
     return 'success'
 
@@ -392,8 +362,7 @@ def test_vsiaz_fake_write():
 
     # Test creation of BlockBob
     f = gdal.VSIFOpenL('/vsiaz/test_copy/file.bin', 'wb')
-    if f is None:
-        return 'fail'
+    assert f is not None
 
     handler = webserver.SequentialHandler()
 
@@ -434,29 +403,23 @@ def method(request):
 
     # Simulate illegal read
     f = gdal.VSIFOpenL('/vsiaz/test_copy/file.bin', 'wb')
-    if f is None:
-        return 'fail'
+    assert f is not None
     with gdaltest.error_handler():
         ret = gdal.VSIFReadL(1, 1, f)
-    if ret:
-        print(ret)
-        return 'fail'
+    assert not ret
     gdal.VSIFCloseL(f)
 
     # Simulate illegal seek
     f = gdal.VSIFOpenL('/vsiaz/test_copy/file.bin', 'wb')
-    if f is None:
-        return 'fail'
+    assert f is not None
     with gdaltest.error_handler():
         ret = gdal.VSIFSeekL(f, 1, 0)
-    if ret == 0:
-        return 'fail'
+    assert ret != 0
     gdal.VSIFCloseL(f)
 
     # Simulate failure when putting BlockBob
     f = gdal.VSIFOpenL('/vsiaz/test_copy/file.bin', 'wb')
-    if f is None:
-        return 'fail'
+    assert f is not None
 
     handler = webserver.SequentialHandler()
 
@@ -503,8 +466,7 @@ def method(request):
 
     # Simulate creation of BlockBob over an existing blob of incompatible type
     f = gdal.VSIFOpenL('/vsiaz/test_copy/file.bin', 'wb')
-    if f is None:
-        return 'fail'
+    assert f is not None
 
     handler = webserver.SequentialHandler()
     handler.add('PUT', '/azure/blob/myaccount/test_copy/file.bin', 409)
@@ -517,8 +479,7 @@ def method(request):
     gdal.SetConfigOption('VSIAZ_CHUNK_SIZE_BYTES', '10')
     f = gdal.VSIFOpenL('/vsiaz/test_copy/file.bin', 'wb')
     gdal.SetConfigOption('VSIAZ_CHUNK_SIZE_BYTES', None)
-    if f is None:
-        return 'fail'
+    assert f is not None
 
     handler = webserver.SequentialHandler()
 
@@ -598,8 +559,7 @@ def method(request):
     gdal.SetConfigOption('VSIAZ_CHUNK_SIZE_BYTES', '10')
     f = gdal.VSIFOpenL('/vsiaz/test_copy/file.bin', 'wb')
     gdal.SetConfigOption('VSIAZ_CHUNK_SIZE_BYTES', None)
-    if f is None:
-        return 'fail'
+    assert f is not None
 
     handler = webserver.SequentialHandler()
 
@@ -624,8 +584,7 @@ def method(request):
     gdal.SetConfigOption('VSIAZ_CHUNK_SIZE_BYTES', '10')
     f = gdal.VSIFOpenL('/vsiaz/test_copy/file.bin', 'wb')
     gdal.SetConfigOption('VSIAZ_CHUNK_SIZE_BYTES', None)
-    if f is None:
-        return 'fail'
+    assert f is not None
 
     handler = webserver.SequentialHandler()
     handler.add('PUT', '/azure/blob/myaccount/test_copy/file.bin', 201)
@@ -656,8 +615,7 @@ def test_vsiaz_fake_unlink():
     handler.add('DELETE', '/azure/blob/myaccount/az_bucket_test_unlink/myfile', 202, {'Connection': 'close'})
     with webserver.install_http_handler(handler):
         ret = gdal.Unlink('/vsiaz/az_bucket_test_unlink/myfile')
-    if ret != 0:
-        return 'fail'
+    assert ret == 0
 
     # Failure
     handler = webserver.SequentialHandler()
@@ -666,8 +624,7 @@ def test_vsiaz_fake_unlink():
     with webserver.install_http_handler(handler):
         with gdaltest.error_handler():
             ret = gdal.Unlink('/vsiaz/az_bucket_test_unlink/myfile')
-    if ret != -1:
-        return 'fail'
+    assert ret == -1
 
     return 'success'
 
@@ -682,8 +639,7 @@ def test_vsiaz_fake_mkdir_rmdir():
 
     # Invalid name
     ret = gdal.Mkdir('/vsiaz', 0)
-    if ret == 0:
-        return 'fail'
+    assert ret != 0
 
     handler = webserver.SequentialHandler()
     handler.add('HEAD', '/azure/blob/myaccount/az_bucket_test_mkdir/dir/', 404, {'Connection': 'close'})
@@ -691,8 +647,7 @@ def test_vsiaz_fake_mkdir_rmdir():
     handler.add('PUT', '/azure/blob/myaccount/az_bucket_test_mkdir/dir/.gdal_marker_for_dir', 201)
     with webserver.install_http_handler(handler):
         ret = gdal.Mkdir('/vsiaz/az_bucket_test_mkdir/dir', 0)
-    if ret != 0:
-        return 'fail'
+    assert ret == 0
 
     # Try creating already existing directory
     handler = webserver.SequentialHandler()
@@ -712,13 +667,11 @@ def test_vsiaz_fake_mkdir_rmdir():
                 """)
     with webserver.install_http_handler(handler):
         ret = gdal.Mkdir('/vsiaz/az_bucket_test_mkdir/dir', 0)
-    if ret == 0:
-        return 'fail'
+    assert ret != 0
 
     # Invalid name
     ret = gdal.Rmdir('/vsiaz')
-    if ret == 0:
-        return 'fail'
+    assert ret != 0
 
     # Not a directory
     handler = webserver.SequentialHandler()
@@ -733,8 +686,7 @@ def test_vsiaz_fake_mkdir_rmdir():
                 """)
     with webserver.install_http_handler(handler):
         ret = gdal.Rmdir('/vsiaz/az_bucket_test_mkdir/it_is_a_file')
-    if ret == 0:
-        return 'fail'
+    assert ret != 0
 
     # Valid
     handler = webserver.SequentialHandler()
@@ -754,8 +706,7 @@ def test_vsiaz_fake_mkdir_rmdir():
     handler.add('DELETE', '/azure/blob/myaccount/az_bucket_test_mkdir/dir/.gdal_marker_for_dir', 202)
     with webserver.install_http_handler(handler):
         ret = gdal.Rmdir('/vsiaz/az_bucket_test_mkdir/dir')
-    if ret != 0:
-        return 'fail'
+    assert ret == 0
 
     # Try deleting already deleted directory
     handler = webserver.SequentialHandler()
@@ -763,8 +714,7 @@ def test_vsiaz_fake_mkdir_rmdir():
     handler.add('GET', '/azure/blob/myaccount/az_bucket_test_mkdir?comp=list&delimiter=%2F&maxresults=1&prefix=dir%2F&restype=container', 200)
     with webserver.install_http_handler(handler):
         ret = gdal.Rmdir('/vsiaz/az_bucket_test_mkdir/dir')
-    if ret == 0:
-        return 'fail'
+    assert ret != 0
 
     # Try deleting non-empty directory
     handler = webserver.SequentialHandler()
@@ -797,8 +747,7 @@ def test_vsiaz_fake_mkdir_rmdir():
                 """)
     with webserver.install_http_handler(handler):
         ret = gdal.Rmdir('/vsiaz/az_bucket_test_mkdir/dir_nonempty')
-    if ret == 0:
-        return 'fail'
+    assert ret != 0
 
     return 'success'
 
@@ -814,9 +763,7 @@ def test_vsiaz_fake_test_BlobEndpointInConnectionString():
                          'DefaultEndpointsProtocol=http;AccountName=myaccount;AccountKey=MY_ACCOUNT_KEY;BlobEndpoint=http://127.0.0.1:%d/myaccount' % gdaltest.webserver_port)
 
     signed_url = gdal.GetSignedURL('/vsiaz/az_fake_bucket/resource')
-    if signed_url.find('http://127.0.0.1:%d/myaccount/az_fake_bucket/resource' % gdaltest.webserver_port) < 0:
-        print(signed_url)
-        return 'fail'
+    assert signed_url.find('http://127.0.0.1:%d/myaccount/az_fake_bucket/resource' % gdaltest.webserver_port) >= 0
 
     return 'success'
 
@@ -854,112 +801,80 @@ def vsiaz_extra_1():
     if az_resource.find('/') < 0:
         path = '/vsiaz/' + az_resource
         statres = gdal.VSIStatL(path)
-        if statres is None or not stat.S_ISDIR(statres.mode):
-            print('%s is not a valid bucket' % path)
-            return 'fail'
+        assert statres is not None and stat.S_ISDIR(statres.mode), \
+            ('%s is not a valid bucket' % path)
 
         readdir = gdal.ReadDir(path)
-        if readdir is None:
-            print('ReadDir() should not return empty list')
-            return 'fail'
+        assert readdir is not None, 'ReadDir() should not return empty list'
         for filename in readdir:
             if filename != '.':
                 subpath = path + '/' + filename
-                if gdal.VSIStatL(subpath) is None:
-                    print('Stat(%s) should not return an error' % subpath)
-                    return 'fail'
+                assert gdal.VSIStatL(subpath) is not None, \
+                    ('Stat(%s) should not return an error' % subpath)
 
         unique_id = 'vsiaz_test'
         subpath = path + '/' + unique_id
         ret = gdal.Mkdir(subpath, 0)
-        if ret < 0:
-            print('Mkdir(%s) should not return an error' % subpath)
-            return 'fail'
+        assert ret >= 0, ('Mkdir(%s) should not return an error' % subpath)
 
         readdir = gdal.ReadDir(path)
-        if unique_id not in readdir:
-            print('ReadDir(%s) should contain %s' % (path, unique_id))
-            print(readdir)
-            return 'fail'
+        assert unique_id in readdir, \
+            ('ReadDir(%s) should contain %s' % (path, unique_id))
 
         ret = gdal.Mkdir(subpath, 0)
-        if ret == 0:
-            print('Mkdir(%s) repeated should return an error' % subpath)
-            return 'fail'
+        assert ret != 0, ('Mkdir(%s) repeated should return an error' % subpath)
 
         ret = gdal.Rmdir(subpath)
-        if ret < 0:
-            print('Rmdir(%s) should not return an error' % subpath)
-            return 'fail'
+        assert ret >= 0, ('Rmdir(%s) should not return an error' % subpath)
 
         readdir = gdal.ReadDir(path)
-        if unique_id in readdir:
-            print('ReadDir(%s) should not contain %s' % (path, unique_id))
-            print(readdir)
-            return 'fail'
+        assert unique_id not in readdir, \
+            ('ReadDir(%s) should not contain %s' % (path, unique_id))
 
         ret = gdal.Rmdir(subpath)
-        if ret == 0:
-            print('Rmdir(%s) repeated should return an error' % subpath)
-            return 'fail'
+        assert ret != 0, ('Rmdir(%s) repeated should return an error' % subpath)
 
         ret = gdal.Mkdir(subpath, 0)
-        if ret < 0:
-            print('Mkdir(%s) should not return an error' % subpath)
-            return 'fail'
+        assert ret >= 0, ('Mkdir(%s) should not return an error' % subpath)
 
         f = gdal.VSIFOpenL(subpath + '/test.txt', 'wb')
-        if f is None:
-            return 'fail'
+        assert f is not None
         gdal.VSIFWriteL('hello', 1, 5, f)
         gdal.VSIFCloseL(f)
 
         ret = gdal.Rmdir(subpath)
-        if ret == 0:
-            print('Rmdir(%s) on non empty directory should return an error' % subpath)
-            return 'fail'
+        assert ret != 0, \
+            ('Rmdir(%s) on non empty directory should return an error' % subpath)
 
         f = gdal.VSIFOpenL(subpath + '/test.txt', 'rb')
-        if f is None:
-            return 'fail'
+        assert f is not None
         data = gdal.VSIFReadL(1, 5, f).decode('utf-8')
-        if data != 'hello':
-            print(data)
-            return 'fail'
+        assert data == 'hello'
         gdal.VSIFCloseL(f)
 
         ret = gdal.Unlink(subpath + '/test.txt')
-        if ret < 0:
-            print('Unlink(%s) should not return an error' % (subpath + '/test.txt'))
-            return 'fail'
+        assert ret >= 0, \
+            ('Unlink(%s) should not return an error' % (subpath + '/test.txt'))
 
         ret = gdal.Rmdir(subpath)
-        if ret < 0:
-            print('Rmdir(%s) should not return an error' % subpath)
-            return 'fail'
+        assert ret >= 0, ('Rmdir(%s) should not return an error' % subpath)
 
         return 'success'
 
     f = open_for_read('/vsiaz/' + az_resource)
-    if f is None:
-        return 'fail'
+    assert f is not None
     ret = gdal.VSIFReadL(1, 1, f)
     gdal.VSIFCloseL(f)
 
-    if len(ret) != 1:
-        print(ret)
-        return 'fail'
+    assert len(ret) == 1
 
     # Same with /vsiaz_streaming/
     f = open_for_read('/vsiaz_streaming/' + az_resource)
-    if f is None:
-        return 'fail'
+    assert f is not None
     ret = gdal.VSIFReadL(1, 1, f)
     gdal.VSIFCloseL(f)
 
-    if len(ret) != 1:
-        print(ret)
-        return 'fail'
+    assert len(ret) == 1
 
     if False:  # pylint: disable=using-constant-test
         # we actually try to read at read() time and bSetError = false
@@ -969,28 +884,21 @@ def vsiaz_extra_1():
         with gdaltest.error_handler():
             gdal.VSIFReadL(1, 1, f)
         gdal.VSIFCloseL(f)
-        if gdal.VSIGetLastErrorMsg() == '':
-            print(gdal.VSIGetLastErrorMsg())
-            return 'fail'
+        assert gdal.VSIGetLastErrorMsg() != ''
 
     # Invalid resource
     gdal.ErrorReset()
     f = open_for_read('/vsiaz_streaming/' + az_resource + '/invalid_resource.baz')
-    if f is not None:
-        print(gdal.VSIGetLastErrorMsg())
-        return 'fail'
+    assert f is None, gdal.VSIGetLastErrorMsg()
 
     # Test GetSignedURL()
     signed_url = gdal.GetSignedURL('/vsiaz/' + az_resource)
     f = open_for_read('/vsicurl_streaming/' + signed_url)
-    if f is None:
-        return 'fail'
+    assert f is not None
     ret = gdal.VSIFReadL(1, 1, f)
     gdal.VSIFCloseL(f)
 
-    if len(ret) != 1:
-        print(ret)
-        return 'fail'
+    assert len(ret) == 1
 
     return 'success'
 
diff --git a/autotest/gcore/vsicrypt.py b/autotest/gcore/vsicrypt.py
index b48c63ef42e6..05dfd27c9dde 100755
--- a/autotest/gcore/vsicrypt.py
+++ b/autotest/gcore/vsicrypt.py
@@ -35,6 +35,7 @@
 
 
 import gdaltest
+import pytest
 
 ###############################################################################
 # Use common test for /vsicrypt
@@ -65,62 +66,52 @@ def test_vsicrypt_2():
     # Missing key
     with gdaltest.error_handler():
         fp = gdal.VSIFOpenL('/vsicrypt//vsimem/file.bin', 'wb+')
-    if fp is not None:
-        return 'fail'
+    assert fp is None
 
     # Invalid file
     with gdaltest.error_handler():
         fp = gdal.VSIFOpenL('/vsicrypt/key=DONT_USE_IN_PROD,file=/not_existing/not_existing', 'wb')
-    if fp is not None:
-        return 'fail'
+    assert fp is None
 
     # Invalid file
     with gdaltest.error_handler():
         fp = gdal.VSIFOpenL('/vsicrypt/key=DONT_USE_IN_PROD,file=/not_existing/not_existing', 'rb')
-    if fp is not None:
-        return 'fail'
+    assert fp is None
 
     # Invalid file
     with gdaltest.error_handler():
         fp = gdal.VSIFOpenL('/vsicrypt/key=DONT_USE_IN_PROD,file=/not_existing/not_existing', 'ab')
-    if fp is not None:
-        return 'fail'
+    assert fp is None
 
     # Invalid access
     with gdaltest.error_handler():
         fp = gdal.VSIFOpenL('/vsicrypt/key=DONT_USE_IN_PROD,file=/not_existing/not_existing', 'foo')
-    if fp is not None:
-        return 'fail'
+    assert fp is None
 
     # Key to short
     with gdaltest.error_handler():
         fp = gdal.VSIFOpenL('/vsicrypt/key=a,file=/vsimem/file.bin', 'wb+')
-    if fp is not None:
-        return 'fail'
+    assert fp is None
 
     # Invalid signature
     gdal.FileFromMemBuffer('/vsimem/file.bin', 'foo')
     with gdaltest.error_handler():
         fp = gdal.VSIFOpenL('/vsicrypt/key=DONT_USE_IN_PROD,file=/vsimem/file.bin', 'rb')
-    if fp is not None:
-        return 'fail'
+    assert fp is None
 
     # Generate empty file
     fp = gdal.VSIFOpenL('/vsicrypt/key=DONT_USE_IN_PROD,file=/vsimem/file.bin', 'wb')
     gdal.VSIFCloseL(fp)
 
     fp = gdal.VSIFOpenL('/vsicrypt/key=DONT_USE_IN_PROD,file=/vsimem/file.bin', 'rb')
-    if fp is None:
-        return 'fail'
+    assert fp is not None
     gdal.VSIFCloseL(fp)
 
     fp = gdal.VSIFOpenL('/vsimem/file.bin', 'rb')
     header = gdal.VSIFReadL(1, 1000, fp)
     gdal.VSIFCloseL(fp)
 
-    if len(header) != 46:
-        print(len(header))
-        return 'fail'
+    assert len(header) == 46
 
     # Test shortening header
     for i in range(46):
@@ -130,8 +121,7 @@ def test_vsicrypt_2():
 
         with gdaltest.error_handler():
             fp = gdal.VSIFOpenL('/vsicrypt/key=DONT_USE_IN_PROD,file=/vsimem/file.bin', 'rb')
-        if fp is not None:
-            return 'fail'
+        assert fp is None
 
     # Test corrupting all bytes of header
     for i in range(46):
@@ -182,8 +172,7 @@ def test_vsicrypt_2():
     with gdaltest.error_handler():
         fp = gdal.VSIFOpenL(
             '/vsicrypt/key=DONT_USE_IN_PROD,file=/vsimem/file.bin', 'rb')
-    if fp is not None:
-        return 'fail'
+    assert fp is None
 
     # Inconsistent initial vector with key check.
     header = struct.pack('B' * 39,
@@ -208,8 +197,7 @@ def test_vsicrypt_2():
 
     with gdaltest.error_handler():
         fp = gdal.VSIFOpenL('/vsicrypt/key=DONT_USE_IN_PROD,file=/vsimem/file.bin', 'rb')
-    if fp is not None:
-        return 'fail'
+    assert fp is None
 
     # Test reading with wrong key
     fp = gdal.VSIFOpenL('/vsicrypt/key=DONT_USE_IN_PROD,file=/vsimem/file.bin', 'wb')
@@ -220,13 +208,11 @@ def test_vsicrypt_2():
     content = gdal.VSIFReadL(1, 5, fp).decode('latin1')
     gdal.VSIFCloseL(fp)
 
-    if content == 'hello':
-        return 'fail'
+    assert content != 'hello'
 
     with gdaltest.error_handler():
         fp = gdal.VSIFOpenL('/vsicrypt/key=short_key,file=/vsimem/file.bin', 'ab')
-    if fp is not None:
-        return 'fail'
+    assert fp is None
 
     # Test reading with wrong key with add_key_check
     fp = gdal.VSIFOpenL('/vsicrypt/key=DONT_USE_IN_PROD,add_key_check=yes,file=/vsimem/file.bin', 'wb')
@@ -235,18 +221,15 @@ def test_vsicrypt_2():
 
     with gdaltest.error_handler():
         fp = gdal.VSIFOpenL('/vsicrypt/key=dont_use_in_prod,file=/vsimem/file.bin', 'rb')
-    if fp is not None:
-        return 'fail'
+    assert fp is None
 
     with gdaltest.error_handler():
         fp = gdal.VSIFOpenL('/vsicrypt/key=short_key,file=/vsimem/file.bin', 'ab')
-    if fp is not None:
-        return 'fail'
+    assert fp is None
 
     with gdaltest.error_handler():
         fp = gdal.VSIFOpenL('/vsicrypt/key=dont_use_in_prod,file=/vsimem/file.bin', 'ab')
-    if fp is not None:
-        return 'fail'
+    assert fp is None
 
     # Test creating with potentially not build-in alg:
     with gdaltest.error_handler():
@@ -257,14 +240,12 @@ def test_vsicrypt_2():
     # Invalid sector_size
     with gdaltest.error_handler():
         fp = gdal.VSIFOpenL('/vsicrypt/key=DONT_USE_IN_PROD,sector_size=1,file=/vsimem/file.bin', 'wb')
-    if fp is not None:
-        return 'fail'
+    assert fp is None
 
     # Sector size (16) should be at least twice larger than the block size (16) in CBC_CTS
     with gdaltest.error_handler():
         fp = gdal.VSIFOpenL('/vsicrypt/key=DONT_USE_IN_PROD,sector_size=16,mode=CBC_CTS,file=/vsimem/file.bin', 'wb')
-    if fp is not None:
-        return 'fail'
+    assert fp is None
 
     gdal.Unlink('/vsimem/file.bin')
 
@@ -291,9 +272,7 @@ def test_vsicrypt_3():
                 fp = gdal.VSIFOpenL('/vsicrypt/key=DONT_USE_IN_PRODDONT_USE_IN_PROD,%s,file=/vsimem/file.bin' % options, 'wb')
         else:
             fp = gdal.VSIFOpenL('/vsicrypt/key=DONT_USE_IN_PRODDONT_USE_IN_PROD,%s,file=/vsimem/file.bin' % options, 'wb')
-        if fp is None:
-            print(options)
-            return 'fail'
+        assert fp is not None, options
         gdal.VSIFWriteL('hello', 1, 5, fp)
         gdal.VSIFCloseL(fp)
 
@@ -301,9 +280,7 @@ def test_vsicrypt_3():
         content = gdal.VSIFReadL(1, 5, fp).decode('latin1')
         gdal.VSIFCloseL(fp)
 
-        if content != 'hello':
-            print(options)
-            return 'fail'
+        assert content == 'hello', options
 
     # Some of those algs might be missing
     for options in ['alg=Blowfish', 'alg=Camellia', 'alg=CAST256', 'alg=MARS', 'alg=IDEA', 'alg=RC5', 'alg=RC6', 'alg=Serpent', 'alg=SHACAL2', 'alg=Twofish', 'alg=XTEA']:
@@ -320,9 +297,7 @@ def test_vsicrypt_3():
             content = gdal.VSIFReadL(1, 5, fp).decode('latin1')
             gdal.VSIFCloseL(fp)
 
-            if content != 'hello':
-                print(options)
-                return 'fail'
+            assert content == 'hello', options
 
     # Test key generation
 
@@ -333,8 +308,7 @@ def test_vsicrypt_3():
 
     # Get the generated random key
     key_b64 = gdal.GetConfigOption('VSICRYPT_KEY_B64')
-    if key_b64 is None:
-        return 'fail'
+    assert key_b64 is not None
 
     gdal.VSIFWriteL('hello', 1, 5, fp)
     gdal.VSIFCloseL(fp)
@@ -343,9 +317,7 @@ def test_vsicrypt_3():
     content = gdal.VSIFReadL(1, 5, fp).decode('latin1')
     gdal.VSIFCloseL(fp)
 
-    if content != 'hello':
-        print(options)
-        return 'fail'
+    assert content == 'hello', options
 
     gdal.SetConfigOption('VSICRYPT_KEY_B64', None)
 
@@ -353,29 +325,20 @@ def test_vsicrypt_3():
     content = gdal.VSIFReadL(1, 5, fp).decode('latin1')
     gdal.VSIFCloseL(fp)
 
-    if content != 'hello':
-        print(options)
-        return 'fail'
+    assert content == 'hello', options
 
     with gdaltest.error_handler():
         statRes = gdal.VSIStatL('/vsicrypt//vsimem/file.bin')
-    if statRes is not None:
-        return 'fail'
+    assert statRes is None
 
     ret = gdal.Rename('/vsicrypt//vsimem/file.bin', '/vsicrypt//vsimem/subdir_crypt/file.bin')
-    if ret != 0:
-        print(ret)
-        return 'fail'
+    assert ret == 0
 
     ret = gdal.Rename('/vsicrypt//vsimem/subdir_crypt/file.bin', '/vsimem/subdir_crypt/file2.bin')
-    if ret != 0:
-        print(ret)
-        return 'fail'
+    assert ret == 0
 
     dir_content = gdal.ReadDir('/vsicrypt//vsimem/subdir_crypt')
-    if dir_content != ['file2.bin']:
-        print(dir_content)
-        return 'fail'
+    assert dir_content == ['file2.bin']
 
     gdal.Unlink('/vsimem/subdir_crypt/file2.bin')
 
@@ -425,11 +388,8 @@ def test_vsicrypt_4():
                 if test_content != ref_content:
                     print(seed)
                     print('Test content (%d):' % len(test_content))
-                    print(test_content)
                     print('')
-                    print('Ref content (%d):' % len(ref_content))
-                    print(ref_content)
-                    return 'fail'
+                    pytest.fail('Ref content (%d):' % len(ref_content))
 
         gdal.VSIFSeekL(test_f, 0, 0)
         gdal.VSIFSeekL(ref_f, 0, 0)
@@ -439,11 +399,8 @@ def test_vsicrypt_4():
         if test_content != ref_content:
             print(seed)
             print('Test content (%d):' % len(test_content))
-            print(test_content)
             print('')
-            print('Ref content (%d):' % len(ref_content))
-            print(ref_content)
-            return 'fail'
+            pytest.fail('Ref content (%d):' % len(ref_content))
 
     gdal.Unlink(test_file)
     gdal.Unlink(ref_file)
@@ -474,9 +431,7 @@ def test_vsicrypt_5():
     content = gdal.VSIFReadL(1, 4, f)
     content = struct.unpack('B' * len(content), content)
     gdal.VSIFCloseL(f)
-    if content != (97, 98, 0, 100):
-        print(content)
-        return 'fail'
+    assert content == (97, 98, 0, 100)
 
     f = gdal.VSIFOpenL(test_file, 'rb+')
     gdal.VSIFReadL(1, 1, f)
@@ -488,9 +443,7 @@ def test_vsicrypt_5():
     content = gdal.VSIFReadL(1, 6, f)
     content = struct.unpack('B' * len(content), content)
     gdal.VSIFCloseL(f)
-    if content != (97, 98, 0, 100, 0, 102):
-        print(content)
-        return 'fail'
+    assert content == (97, 98, 0, 100, 0, 102)
 
     f = gdal.VSIFOpenL(test_file, 'rb+')
     gdal.VSIFReadL(1, 1, f)
@@ -504,9 +457,7 @@ def test_vsicrypt_5():
     content = gdal.VSIFReadL(1, 8, f)
     content = struct.unpack('B' * len(content), content)
     gdal.VSIFCloseL(f)
-    if content != (97, 98, 0, 100, 0, 102, 0, 104):
-        print(content)
-        return 'fail'
+    assert content == (97, 98, 0, 100, 0, 102, 0, 104)
 
     gdal.Unlink(test_file)
 
@@ -539,8 +490,7 @@ def test_vsicrypt_6():
         return 'skip'
 
     fp = gdal.VSIFOpenL('/vsicrypt/add_key_check=yes,file=/vsimem/file.bin', 'wb+')
-    if fp is None:
-        return 'fail'
+    assert fp is not None
     gdal.VSIFWriteL('hello', 1, 5, fp)
     gdal.VSIFCloseL(fp)
 
@@ -548,12 +498,10 @@ def test_vsicrypt_6():
     content = gdal.VSIFReadL(1, 5, fp).decode('latin1')
     gdal.VSIFCloseL(fp)
 
-    if content != 'hello':
-        return 'fail'
+    assert content == 'hello'
 
     fp = gdal.VSIFOpenL('/vsicrypt//vsimem/file.bin', 'wb+')
-    if fp is None:
-        return 'fail'
+    assert fp is not None
     gdal.VSIFWriteL('hello', 1, 5, fp)
     gdal.VSIFCloseL(fp)
 
@@ -561,27 +509,23 @@ def test_vsicrypt_6():
     content = gdal.VSIFReadL(1, 5, fp).decode('latin1')
     gdal.VSIFCloseL(fp)
 
-    if content != 'hello':
-        return 'fail'
+    assert content == 'hello'
 
     # Set a too short key
     testnonboundtoswig.gdal_handle.VSISetCryptKey('bbc'.encode('ASCII'), 3)
     with gdaltest.error_handler():
         fp = gdal.VSIFOpenL('/vsicrypt//vsimem/file.bin', 'rb')
-    if fp is not None:
-        return 'fail'
+    assert fp is None
 
     with gdaltest.error_handler():
         fp = gdal.VSIFOpenL('/vsicrypt//vsimem/file.bin', 'wb+')
-    if fp is not None:
-        return 'fail'
+    assert fp is None
 
     # Erase key
     testnonboundtoswig.gdal_handle.VSISetCryptKey(None, 0)
     with gdaltest.error_handler():
         fp = gdal.VSIFOpenL('/vsicrypt//vsimem/file.bin', 'wb+')
-    if fp is not None:
-        return 'fail'
+    assert fp is None
 
     gdal.Unlink('/vsimem/file.bin')
 
diff --git a/autotest/gcore/vsicurl.py b/autotest/gcore/vsicurl.py
index 0992cff4ba45..1bd7b7ce60f8 100755
--- a/autotest/gcore/vsicurl.py
+++ b/autotest/gcore/vsicurl.py
@@ -50,8 +50,7 @@ def test_vsicurl_1():
         return 'skip'
 
     ds = ogr.Open('/vsizip/vsicurl/http://publicfiles.dep.state.fl.us/dear/BWR_GIS/2007NWFLULC/NWFWMD2007LULC.zip')
-    if ds is None:
-        return 'fail'
+    assert ds is not None
 
     return 'success'
 
@@ -67,8 +66,7 @@ def vsicurl_2():
         return 'skip'
 
     ds = gdal.Open('/vsizip//vsicurl/http://eros.usgs.gov/archive/nslrsda/GeoTowns/HongKong/srtm/n22e113.zip/n22e113.bil')
-    if ds is None:
-        return 'fail'
+    assert ds is not None
 
     return 'success'
 
@@ -84,8 +82,7 @@ def vsicurl_3():
         return 'skip'
 
     ds = ogr.Open('/vsizip/vsicurl/http://www.iucnredlist.org/spatial-data/MAMMALS_TERRESTRIAL.zip')
-    if ds is not None:
-        return 'fail'
+    assert ds is None
 
     return 'success'
 
@@ -101,8 +98,7 @@ def test_vsicurl_4():
         return 'skip'
 
     ds = ogr.Open('/vsizip/vsicurl/http://lelserver.env.duke.edu:8080/LandscapeTools/export/49/Downloads/1_Habitats.zip')
-    if ds is not None:
-        return 'fail'
+    assert ds is None
 
     return 'success'
 
@@ -118,8 +114,7 @@ def test_vsicurl_5():
         return 'skip'
 
     ds = gdal.Open('/vsicurl/http://dds.cr.usgs.gov/srtm/SRTM_image_sample/picture%20examples/N34W119_DEM.tif')
-    if ds is None:
-        return 'fail'
+    assert ds is not None
 
     return 'success'
 
@@ -135,8 +130,7 @@ def vsicurl_6_disabled():
         return 'skip'
 
     fl = gdal.ReadDir('/vsicurl/ftp://ftp2.cits.rncan.gc.ca/pub/cantopo/250k_tif')
-    if not fl:
-        return 'fail'
+    assert fl
 
     return 'success'
 
@@ -152,8 +146,7 @@ def test_vsicurl_7():
         return 'skip'
 
     fl = gdal.ReadDir('/vsicurl/http://ortho.linz.govt.nz/tifs/2005_06')
-    if not fl:
-        return 'fail'
+    assert fl
 
     return 'success'
 
@@ -171,8 +164,7 @@ def vsicurl_8():
     ds1 = gdal.Open('/vsigzip//vsicurl/http://dds.cr.usgs.gov/pub/data/DEM/250/notavail/C/chipicoten-w.gz')
     gdal.Open('/vsizip//vsicurl/http://edcftp.cr.usgs.gov/pub/data/landcover/files/2009/biso/gokn09b_dnbr.zip/nps-serotnbsp-9001-20090321_rd.tif')
     cs = ds1.GetRasterBand(1).Checksum()
-    if cs != 61342:
-        return 'fail'
+    assert cs == 61342
 
     return 'success'
 
@@ -195,8 +187,7 @@ def test_vsicurl_9():
         filename = filename.encode('utf-8')
 
     ds = gdal.Open('/vsicurl/http://download.osgeo.org/gdal/data/gtiff/' + filename)
-    if ds is None:
-        return 'fail'
+    assert ds is not None
 
     return 'success'
 
@@ -212,8 +203,7 @@ def test_vsicurl_10():
         return 'skip'
 
     ds = gdal.Open('/vsicurl/http://download.osgeo.org/gdal/data/gtiff/xx%E4%B8%AD%E6%96%87.%E4%B8%AD%E6%96%87')
-    if ds is None:
-        return 'fail'
+    assert ds is not None
 
     return 'success'
 
@@ -236,8 +226,7 @@ def test_vsicurl_11():
     gdal.VSIFCloseL(f)
 
     filelist = gdal.ReadDir('/vsicurl/http://download.osgeo.org/gdal/data/gtiff')
-    if filelist is None or not filelist:
-        return 'fail'
+    assert filelist is not None and filelist
 
     return 'success'
 
@@ -325,8 +314,7 @@ def method(request):
 
     with webserver.install_http_handler(handler):
         f = gdal.VSIFOpenL('/vsicurl/http://localhost:%d/test_redirect/test.bin' % gdaltest.webserver_port, 'rb')
-    if f is None:
-        return 'fail'
+    assert f is not None
 
     gdal.VSIFSeekL(f, 0, 2)
     if gdal.VSIFTellL(f) != 1000000:
@@ -414,9 +402,7 @@ def test_vsicurl_test_retry():
         if f:
             data_len = len(gdal.VSIFReadL(1, 1, f))
             gdal.VSIFCloseL(f)
-        if data_len != 0:
-            print(data_len)
-            return 'fail'
+        assert data_len == 0
 
     gdal.VSICurlClearCache()
 
@@ -428,19 +414,14 @@ def test_vsicurl_test_retry():
     handler.add('GET', '/test_retry/test.txt', 200, {}, 'foo')
     with webserver.install_http_handler(handler):
         f = gdal.VSIFOpenL('/vsicurl?max_retry=2&retry_delay=0.01&url=http://localhost:%d/test_retry/test.txt' % gdaltest.webserver_port, 'rb')
-        if f is None:
-            return 'fail'
+        assert f is not None
         gdal.ErrorReset()
         with gdaltest.error_handler():
             data = gdal.VSIFReadL(1, 3, f).decode('ascii')
         error_msg = gdal.GetLastErrorMsg()
         gdal.VSIFCloseL(f)
-        if data != 'foo':
-            print(data)
-            return 'fail'
-        if error_msg.find('429') < 0:
-            print(error_msg)
-            return 'fail'
+        assert data == 'foo'
+        assert error_msg.find('429') >= 0
 
     return 'success'
 
@@ -459,8 +440,7 @@ def test_vsicurl_test_fallback_from_head_to_get():
     handler.add('GET', '/test_fallback_from_head_to_get', 200, {}, 'foo')
     with webserver.install_http_handler(handler):
         statres = gdal.VSIStatL('/vsicurl/http://localhost:%d/test_fallback_from_head_to_get' % gdaltest.webserver_port)
-    if statres.size != 3:
-        return 'fail'
+    assert statres.size == 3
 
     gdal.VSICurlClearCache()
 
@@ -491,18 +471,14 @@ def test_vsicurl_test_parse_html_filelist_apache():
 </body></html>""")
     with webserver.install_http_handler(handler):
         fl = gdal.ReadDir('/vsicurl/http://localhost:%d/mydir' % gdaltest.webserver_port)
-    if fl != ['foo.tif', 'foo%20with%20space.tif']:
-        print(fl)
-        return 'fail'
+    assert fl == ['foo.tif', 'foo%20with%20space.tif']
 
-    if gdal.VSIStatL('/vsicurl/http://localhost:%d/mydir/foo%%20with%%20space.tif' % gdaltest.webserver_port, gdal.VSI_STAT_EXISTS_FLAG) is None:
-        return 'fail'
+    assert gdal.VSIStatL('/vsicurl/http://localhost:%d/mydir/foo%%20with%%20space.tif' % gdaltest.webserver_port, gdal.VSI_STAT_EXISTS_FLAG) is not None
 
     handler = webserver.SequentialHandler()
     handler.add('HEAD', '/mydir/i_dont_exist', 404, {})
     with webserver.install_http_handler(handler):
-        if gdal.VSIStatL('/vsicurl/http://localhost:%d/mydir/i_dont_exist' % gdaltest.webserver_port, gdal.VSI_STAT_EXISTS_FLAG) is not None:
-            return 'fail'
+        assert gdal.VSIStatL('/vsicurl/http://localhost:%d/mydir/i_dont_exist' % gdaltest.webserver_port, gdal.VSI_STAT_EXISTS_FLAG) is None
 
     return 'success'
 
diff --git a/autotest/gcore/vsifile.py b/autotest/gcore/vsifile.py
index ae31a5a0a71f..1c0da35b0f45 100755
--- a/autotest/gcore/vsifile.py
+++ b/autotest/gcore/vsifile.py
@@ -45,55 +45,38 @@ def vsifile_generic(filename):
     start_time = time.time()
 
     fp = gdal.VSIFOpenL(filename, 'wb+')
-    if fp is None:
-        return 'fail'
+    assert fp is not None
 
-    if gdal.VSIFWriteL('0123456789', 1, 10, fp) != 10:
-        return 'fail'
+    assert gdal.VSIFWriteL('0123456789', 1, 10, fp) == 10
 
-    if gdal.VSIFFlushL(fp) != 0:
-        return 'fail'
+    assert gdal.VSIFFlushL(fp) == 0
 
-    if gdal.VSIFTruncateL(fp, 20) != 0:
-        return 'fail'
+    assert gdal.VSIFTruncateL(fp, 20) == 0
 
-    if gdal.VSIFTellL(fp) != 10:
-        return 'fail'
+    assert gdal.VSIFTellL(fp) == 10
 
-    if gdal.VSIFTruncateL(fp, 5) != 0:
-        return 'fail'
+    assert gdal.VSIFTruncateL(fp, 5) == 0
 
-    if gdal.VSIFTellL(fp) != 10:
-        return 'fail'
+    assert gdal.VSIFTellL(fp) == 10
 
-    if gdal.VSIFSeekL(fp, 0, 2) != 0:
-        return 'fail'
+    assert gdal.VSIFSeekL(fp, 0, 2) == 0
 
-    if gdal.VSIFTellL(fp) != 5:
-        return 'fail'
+    assert gdal.VSIFTellL(fp) == 5
 
     gdal.VSIFWriteL('XX', 1, 2, fp)
     gdal.VSIFCloseL(fp)
 
     statBuf = gdal.VSIStatL(filename, gdal.VSI_STAT_EXISTS_FLAG | gdal.VSI_STAT_NATURE_FLAG | gdal.VSI_STAT_SIZE_FLAG)
-    if statBuf.size != 7:
-        print(statBuf.size)
-        return 'fail'
-    if abs(start_time - statBuf.mtime) > 2:
-        print(statBuf.mtime)
-        return 'fail'
+    assert statBuf.size == 7
+    assert abs(start_time - statBuf.mtime) <= 2
 
     fp = gdal.VSIFOpenL(filename, 'rb')
     buf = gdal.VSIFReadL(1, 7, fp)
-    if gdal.VSIFWriteL('a', 1, 1, fp) != 0:
-        return 'fail'
-    if gdal.VSIFTruncateL(fp, 0) == 0:
-        return 'fail'
+    assert gdal.VSIFWriteL('a', 1, 1, fp) == 0
+    assert gdal.VSIFTruncateL(fp, 0) != 0
     gdal.VSIFCloseL(fp)
 
-    if buf.decode('ascii') != '01234XX':
-        print(buf.decode('ascii'))
-        return 'fail'
+    assert buf.decode('ascii') == '01234XX'
 
     # Test append mode on existing file
     fp = gdal.VSIFOpenL(filename, 'ab')
@@ -101,16 +84,12 @@ def vsifile_generic(filename):
     gdal.VSIFCloseL(fp)
 
     statBuf = gdal.VSIStatL(filename, gdal.VSI_STAT_EXISTS_FLAG | gdal.VSI_STAT_NATURE_FLAG | gdal.VSI_STAT_SIZE_FLAG)
-    if statBuf.size != 9:
-        print(statBuf.size)
-        return 'fail'
+    assert statBuf.size == 9
 
-    if gdal.Unlink(filename) != 0:
-        return 'fail'
+    assert gdal.Unlink(filename) == 0
 
     statBuf = gdal.VSIStatL(filename, gdal.VSI_STAT_EXISTS_FLAG)
-    if statBuf is not None:
-        return 'fail'
+    assert statBuf is None
 
     # Test append mode on non existing file
     fp = gdal.VSIFOpenL(filename, 'ab')
@@ -118,12 +97,9 @@ def vsifile_generic(filename):
     gdal.VSIFCloseL(fp)
 
     statBuf = gdal.VSIStatL(filename, gdal.VSI_STAT_EXISTS_FLAG | gdal.VSI_STAT_NATURE_FLAG | gdal.VSI_STAT_SIZE_FLAG)
-    if statBuf.size != 2:
-        print(statBuf.size)
-        return 'fail'
+    assert statBuf.size == 2
 
-    if gdal.Unlink(filename) != 0:
-        return 'fail'
+    assert gdal.Unlink(filename) == 0
 
     return 'success'
 
@@ -182,9 +158,7 @@ def test_vsifile_3():
     statBuf = gdal.VSIStatL(filename, gdal.VSI_STAT_EXISTS_FLAG | gdal.VSI_STAT_NATURE_FLAG | gdal.VSI_STAT_SIZE_FLAG)
     gdal.Unlink(filename)
 
-    if statBuf.size != 10 * 1024 * 1024 * 1024:
-        print(statBuf.size)
-        return 'fail'
+    assert statBuf.size == 10 * 1024 * 1024 * 1024
 
     return 'success'
 
@@ -199,8 +173,7 @@ def test_vsifile_4():
     # print(len(data))
     gdal.VSIFSeekL(fp, 0, 0)
     data = gdal.VSIFReadL(1, 1000000, fp)
-    if not data:
-        return 'fail'
+    assert data
     gdal.VSIFCloseL(fp)
 
     return 'success'
@@ -298,9 +271,7 @@ def test_vsifile_6():
     got_data = gdal.VSIFReadL(1, len(ref_data), fp)
     gdal.VSIFCloseL(fp)
 
-    if ref_data != got_data:
-        print(got_data)
-        return 'fail'
+    assert ref_data == got_data
 
     # Real test now
     gdal.SetConfigOption('VSI_CACHE', 'YES')
@@ -310,9 +281,7 @@ def test_vsifile_6():
     got_data = gdal.VSIFReadL(1, len(ref_data), fp)
     gdal.VSIFCloseL(fp)
 
-    if ref_data != got_data:
-        print(got_data)
-        return 'fail'
+    assert ref_data == got_data
 
     gdal.Unlink('tmp/vsifile_6.bin')
 
@@ -329,31 +298,22 @@ def test_vsifile_7():
 
     # Test extending file beyond reasonable limits in write mode
     fp = gdal.VSIFOpenL('/vsimem/vsifile_7.bin', 'wb')
-    if gdal.VSIFSeekL(fp, 0x7FFFFFFFFFFFFFFF, 0) != 0:
-        return 'fail'
-    if gdal.VSIStatL('/vsimem/vsifile_7.bin').size != 0:
-        return 'fail'
+    assert gdal.VSIFSeekL(fp, 0x7FFFFFFFFFFFFFFF, 0) == 0
+    assert gdal.VSIStatL('/vsimem/vsifile_7.bin').size == 0
     gdal.PushErrorHandler()
     ret = gdal.VSIFWriteL('a', 1, 1, fp)
     gdal.PopErrorHandler()
-    if ret != 0:
-        return 'fail'
-    if gdal.VSIStatL('/vsimem/vsifile_7.bin').size != 0:
-        return 'fail'
+    assert ret == 0
+    assert gdal.VSIStatL('/vsimem/vsifile_7.bin').size == 0
     gdal.VSIFCloseL(fp)
 
     # Test seeking  beyond file size in read-only mode
     fp = gdal.VSIFOpenL('/vsimem/vsifile_7.bin', 'rb')
-    if gdal.VSIFSeekL(fp, 0x7FFFFFFFFFFFFFFF, 0) != 0:
-        return 'fail'
-    if gdal.VSIFEofL(fp) != 0:
-        return 'fail'
-    if gdal.VSIFTellL(fp) != 0x7FFFFFFFFFFFFFFF:
-        return 'fail'
-    if gdal.VSIFReadL(1, 1, fp):
-        return 'fail'
-    if gdal.VSIFEofL(fp) != 1:
-        return 'fail'
+    assert gdal.VSIFSeekL(fp, 0x7FFFFFFFFFFFFFFF, 0) == 0
+    assert gdal.VSIFEofL(fp) == 0
+    assert gdal.VSIFTellL(fp) == 0x7FFFFFFFFFFFFFFF
+    assert not gdal.VSIFReadL(1, 1, fp)
+    assert gdal.VSIFEofL(fp) == 1
     gdal.VSIFCloseL(fp)
 
     gdal.Unlink('/vsimem/vsifile_7.bin')
@@ -371,10 +331,8 @@ def test_vsifile_8():
     fp = gdal.VSIFOpenL('/vsimem/mydir/a', 'wb')
     gdal.VSIFCloseL(fp)
     gdal.Rename('/vsimem/mydir', '/vsimem/newdir'.encode('ascii').decode('ascii'))
-    if gdal.VSIStatL('/vsimem/newdir') is None:
-        return 'fail'
-    if gdal.VSIStatL('/vsimem/newdir/a') is None:
-        return 'fail'
+    assert gdal.VSIStatL('/vsimem/newdir') is not None
+    assert gdal.VSIStatL('/vsimem/newdir/a') is not None
     gdal.Unlink('/vsimem/newdir/a')
     gdal.Rmdir('/vsimem/newdir')
 
@@ -387,12 +345,10 @@ def test_vsifile_8():
 def test_vsifile_9():
 
     lst = gdal.ReadDir('.')
-    if len(lst) < 4:
-        return 'fail'
+    assert len(lst) >= 4
     # Test truncation
     lst_truncated = gdal.ReadDir('.', int(len(lst) / 2))
-    if len(lst_truncated) <= int(len(lst) / 2):
-        return 'fail'
+    assert len(lst_truncated) > int(len(lst) / 2)
 
     gdal.Mkdir('/vsimem/mydir', 438)
     for i in range(10):
@@ -400,12 +356,10 @@ def test_vsifile_9():
         gdal.VSIFCloseL(fp)
 
     lst = gdal.ReadDir('/vsimem/mydir')
-    if len(lst) < 4:
-        return 'fail'
+    assert len(lst) >= 4
     # Test truncation
     lst_truncated = gdal.ReadDir('/vsimem/mydir', int(len(lst) / 2))
-    if len(lst_truncated) <= int(len(lst) / 2):
-        return 'fail'
+    assert len(lst_truncated) > int(len(lst) / 2)
 
     for i in range(10):
         gdal.Unlink('/vsimem/mydir/%d' % i)
@@ -477,36 +431,24 @@ def test_vsifile_10():
     if contents is None:
         gdal.Unlink('/vsimem/vsifile_10.tar')
         return 'skip'
-    if contents != ['test.txt', 'huge.txt', 'small.txt']:
-        print(contents)
-        return 'fail'
-    if gdal.VSIStatL('/vsitar//vsimem/vsifile_10.tar/test.txt').size != 3:
-        print(gdal.VSIStatL('/vsitar//vsimem/vsifile_10.tar/test.txt').size)
-        return 'fail'
-    if gdal.VSIStatL('/vsitar//vsimem/vsifile_10.tar/huge.txt').size != 3888:
-        print(gdal.VSIStatL('/vsitar//vsimem/vsifile_10.tar/huge.txt').size)
-        return 'fail'
-    if gdal.VSIStatL('/vsitar//vsimem/vsifile_10.tar/small.txt').size != 1:
-        print(gdal.VSIStatL('/vsitar//vsimem/vsifile_10.tar/small.txt').size)
-        return 'fail'
+    assert contents == ['test.txt', 'huge.txt', 'small.txt']
+    assert gdal.VSIStatL('/vsitar//vsimem/vsifile_10.tar/test.txt').size == 3
+    assert gdal.VSIStatL('/vsitar//vsimem/vsifile_10.tar/huge.txt').size == 3888
+    assert gdal.VSIStatL('/vsitar//vsimem/vsifile_10.tar/small.txt').size == 1
 
     gdal.FileFromMemBuffer('/vsimem/vsifile_10.tar',
                            """FUZZER_FRIENDLY_ARCHIVE
 ***NEWFILE***:x
 abc""")
     contents = gdal.ReadDir('/vsitar//vsimem/vsifile_10.tar')
-    if contents != ['x']:
-        print(contents)
-        return 'fail'
+    assert contents == ['x']
 
     gdal.FileFromMemBuffer('/vsimem/vsifile_10.tar',
                            """FUZZER_FRIENDLY_ARCHIVE
 ***NEWFILE***:x
 abc***NEWFILE***:""")
     contents = gdal.ReadDir('/vsitar//vsimem/vsifile_10.tar')
-    if contents != ['x']:
-        print(contents)
-        return 'fail'
+    assert contents == ['x']
 
     gdal.Unlink('/vsimem/vsifile_10.tar')
 
@@ -522,12 +464,9 @@ def test_vsifile_11():
 
     f = gdal.VSIFOpenL('/vsisubfile/0_,/vsimem/vsifile_11', 'wb')
     gdal.VSIFWriteL('0123456789', 1, 10, f)
-    if gdal.VSIFTruncateL(f, 10 + 4096 + 2) != 0:
-        return 'fail'
-    if gdal.VSIFTellL(f) != 10:
-        return 'fail'
-    if gdal.VSIFTruncateL(f, 0) != -1:
-        return 'fail'
+    assert gdal.VSIFTruncateL(f, 10 + 4096 + 2) == 0
+    assert gdal.VSIFTellL(f) == 10
+    assert gdal.VSIFTruncateL(f, 0) == -1
     gdal.VSIFCloseL(f)
 
     f = gdal.VSIFOpenL('/vsimem/vsifile_11', 'rb')
@@ -535,9 +474,7 @@ def test_vsifile_11():
     gdal.VSIFCloseL(f)
     import struct
     data = struct.unpack('B' * len(data), data)
-    if data[0] != 48 or data[9] != 57 or data[10] != 0 or data[10 + 4096 + 2 - 1] != 0:
-        print(data)
-        return 'fail'
+    assert data[0] == 48 and data[9] == 57 and data[10] == 0 and data[10 + 4096 + 2 - 1] == 0
 
     gdal.Unlink('/vsimem/vsifile_11')
 
@@ -558,20 +495,15 @@ def test_vsifile_12():
     block_size = 65536
     f = gdal.VSIFOpenL(target_dir + '/vsifile_12', 'wb')
     gdal.VSIFWriteL('a', 1, 1, f)
-    if gdal.VSIFTruncateL(f, block_size * 2) != 0:
-        return 'fail'
+    assert gdal.VSIFTruncateL(f, block_size * 2) == 0
     ret = gdal.VSIFGetRangeStatusL(f, 0, 1)
     # We could get unknown on nfs
     if ret == gdal.VSI_RANGE_STATUS_UNKNOWN:
         print('Range status unknown')
     else:
-        if ret != gdal.VSI_RANGE_STATUS_DATA:
-            print(ret)
-            return 'fail'
+        assert ret == gdal.VSI_RANGE_STATUS_DATA
         ret = gdal.VSIFGetRangeStatusL(f, block_size * 2 - 1, 1)
-        if ret != gdal.VSI_RANGE_STATUS_HOLE:
-            print(ret)
-            return 'fail'
+        assert ret == gdal.VSI_RANGE_STATUS_HOLE
     gdal.VSIFCloseL(f)
 
     gdal.Unlink(target_dir + '/vsifile_12')
@@ -632,31 +564,24 @@ def test_vsifile_14():
 def test_vsifile_15():
 
     fp = gdal.VSIFOpenL('/vsigzip/data/corrupted_z_buf_error.gz', 'rb')
-    if fp is None:
-        return 'fail'
+    assert fp is not None
     file_len = 0
     while not gdal.VSIFEofL(fp):
         with gdaltest.error_handler():
             file_len += len(gdal.VSIFReadL(1, 4, fp))
-    if file_len != 6469:
-        return 'fail'
+    assert file_len == 6469
 
     with gdaltest.error_handler():
         file_len += len(gdal.VSIFReadL(1, 4, fp))
-    if file_len != 6469:
-        return 'fail'
+    assert file_len == 6469
 
     with gdaltest.error_handler():
-        if gdal.VSIFSeekL(fp, 0, 2) == 0:
-            return 'fail'
+        assert gdal.VSIFSeekL(fp, 0, 2) != 0
 
-    if gdal.VSIFSeekL(fp, 0, 0) != 0:
-        return 'fail'
+    assert gdal.VSIFSeekL(fp, 0, 0) == 0
 
     len_read = len(gdal.VSIFReadL(1, file_len, fp))
-    if len_read != file_len:
-        print(len_read)
-        return 'fail'
+    assert len_read == file_len
 
     gdal.VSIFCloseL(fp)
 
@@ -685,11 +610,9 @@ def test_vsifile_16():
 
 def test_vsifile_17():
 
-    if gdal.GetActualURL('foo') is not None:
-        return 'fail'
+    assert gdal.GetActualURL('foo') is None
 
-    if gdal.GetSignedURL('foo') is not None:
-        return 'fail'
+    assert gdal.GetSignedURL('foo') is None
 
     return 'success'
 
@@ -700,9 +623,7 @@ def test_vsifile_17():
 def test_vsifile_18():
 
     prefixes = gdal.GetFileSystemsPrefixes()
-    if '/vsimem/' not in prefixes:
-        print(prefixes)
-        return 'fail'
+    assert '/vsimem/' in prefixes
 
     return 'success'
 
@@ -717,9 +638,7 @@ def test_vsifile_19():
         # Check that the options is XML correct
         if options is not None:
             ret = gdal.ParseXMLString(options)
-            if ret is None:
-                print(prefix, options)
-                return 'fail'
+            assert ret is not None, (prefix, options)
 
     return 'success'
 
@@ -747,8 +666,7 @@ def test_vsifile_21():
     data = 'This is some data'
 
     vsifile = gdal.VSIFOpenL(filename, 'wb')
-    if gdal.VSIFWriteL(data, 1, len(data), vsifile) != len(data):
-        return 'fail'
+    assert gdal.VSIFWriteL(data, 1, len(data), vsifile) == len(data)
     gdal.VSIFCloseL(vsifile)
 
     vsifile = gdal.VSIFOpenL(filename, 'rb')
@@ -757,19 +675,16 @@ def test_vsifile_21():
     gdal.VSIFSeekL(vsifile, 0, 0)
     data_read = gdal.VSIFReadL(1, vsilen, vsifile)
     data_mem = gdal.VSIGetMemFileBuffer_unsafe(filename)
-    if data_read != data_mem[:]:
-        return 'fail'
+    assert data_read == data_mem[:]
     gdal.VSIFCloseL(vsifile)
     vsifile_write = gdal.VSIFOpenL(filename_write, 'wb')
-    if gdal.VSIFWriteL(data_mem, 1, len(data_mem), vsifile_write) != len(data_mem):
-        return 'fail'
+    assert gdal.VSIFWriteL(data_mem, 1, len(data_mem), vsifile_write) == len(data_mem)
     gdal.VSIFCloseL(vsifile_write)
     gdal.Unlink(filename)
     gdal.Unlink(filename_write)
     with gdaltest.error_handler():
         data3 = gdal.VSIGetMemFileBuffer_unsafe(filename)
-        if data3 != None:
-            return 'fail'
+        assert data3 == None
 
     return 'success'
 
@@ -777,33 +692,23 @@ def test_vsifile_21():
 def test_vsifile_22():
     # VSIOpenL doesn't set errorno
     gdal.VSIErrorReset()
-    if gdal.VSIGetLastErrorNo() != 0:
-        gdaltest.post_reason("Expected Err=0 after VSIErrorReset(), got %d" % gdal.VSIGetLastErrorNo())
-        return 'fail'
+    assert gdal.VSIGetLastErrorNo() == 0, \
+        ("Expected Err=0 after VSIErrorReset(), got %d" % gdal.VSIGetLastErrorNo())
 
     fp = gdal.VSIFOpenL('tmp/not-existing', 'r')
-    if fp is not None:
-        gdaltest.post_reason("Expected None from VSIFOpenL")
-        return 'fail'
-    if gdal.VSIGetLastErrorNo() != 0:
-        gdaltest.post_reason("Expected Err=0 from VSIFOpenL, got %d" % gdal.VSIGetLastErrorNo())
-        return 'fail'
+    assert fp is None, "Expected None from VSIFOpenL"
+    assert gdal.VSIGetLastErrorNo() == 0, \
+        ("Expected Err=0 from VSIFOpenL, got %d" % gdal.VSIGetLastErrorNo())
 
     # VSIOpenExL does
     fp = gdal.VSIFOpenExL('tmp/not-existing', 'r', 1)
-    if fp is not None:
-        gdaltest.post_reason("Expected None from VSIFOpenExL")
-        return 'fail'
-    if gdal.VSIGetLastErrorNo() != 1:
-        gdaltest.post_reason("Expected Err=1 from VSIFOpenExL, got %d" % gdal.VSIGetLastErrorNo())
-        return 'fail'
-    if len(gdal.VSIGetLastErrorMsg()) == 0:
-        gdaltest.post_reason("Expected a VSI error message")
-        return 'fail'
+    assert fp is None, "Expected None from VSIFOpenExL"
+    assert gdal.VSIGetLastErrorNo() == 1, \
+        ("Expected Err=1 from VSIFOpenExL, got %d" % gdal.VSIGetLastErrorNo())
+    assert len(gdal.VSIGetLastErrorMsg()) != 0, "Expected a VSI error message"
     gdal.VSIErrorReset()
-    if gdal.VSIGetLastErrorNo() != 0:
-        gdaltest.post_reason("Expected Err=0 after VSIErrorReset(), got %d" % gdal.VSIGetLastErrorNo())
-        return 'fail'
+    assert gdal.VSIGetLastErrorNo() == 0, \
+        ("Expected Err=0 after VSIErrorReset(), got %d" % gdal.VSIGetLastErrorNo())
 
     return 'success'
 
@@ -815,9 +720,7 @@ def test_vsifile_22():
 def test_vsitar_bug_675():
 
     content = gdal.ReadDir('/vsitar/data/tar_with_star_base256_fields.tar')
-    if len(content) != 1:
-        print(content)
-        return 'fail'
+    assert len(content) == 1
     return 'success'
 
 ###############################################################################
@@ -856,19 +759,15 @@ def test_vsigzip_multi_thread():
 def test_vsisync():
 
     with gdaltest.error_handler():
-        if gdal.Sync('/i_do/not/exist', '/vsimem/'):
-            return 'fail'
+        assert not gdal.Sync('/i_do/not/exist', '/vsimem/')
 
     with gdaltest.error_handler():
-        if gdal.Sync('vsifile.py', '/i_do/not/exist'):
-            return 'fail'
+        assert not gdal.Sync('vsifile.py', '/i_do/not/exist')
 
     # Test copying a file
     for i in range(2):
-        if not gdal.Sync('vsifile.py', '/vsimem/'):
-            return 'fail'
-        if gdal.VSIStatL('/vsimem/vsifile.py').size != gdal.VSIStatL('vsifile.py').size:
-            return 'fail'
+        assert gdal.Sync('vsifile.py', '/vsimem/')
+        assert gdal.VSIStatL('/vsimem/vsifile.py').size == gdal.VSIStatL('vsifile.py').size
     gdal.Unlink('/vsimem/vsifile.py')
 
     # Test copying the content of a directory
@@ -879,20 +778,13 @@ def test_vsisync():
 
     if sys.platform != 'win32':
         with gdaltest.error_handler():
-            if gdal.Sync('/vsimem/test_sync/', '/i_do_not/exist'):
-                return 'fail'
+            assert not gdal.Sync('/vsimem/test_sync/', '/i_do_not/exist')
 
-    if not gdal.Sync('/vsimem/test_sync/', '/vsimem/out'):
-        return 'fail'
-    if gdal.ReadDir('/vsimem/out') != [ 'foo.txt', 'subdir' ]:
-        print(gdal.ReadDir('/vsimem/out'))
-        return 'fail'
-    if gdal.ReadDir('/vsimem/out/subdir') != [ 'bar.txt' ]:
-        print(gdal.ReadDir('/vsimem/out/subdir'))
-        return 'fail'
+    assert gdal.Sync('/vsimem/test_sync/', '/vsimem/out')
+    assert gdal.ReadDir('/vsimem/out') == [ 'foo.txt', 'subdir' ]
+    assert gdal.ReadDir('/vsimem/out/subdir') == [ 'bar.txt' ]
     # Again
-    if not gdal.Sync('/vsimem/test_sync/', '/vsimem/out'):
-        return 'fail'
+    assert gdal.Sync('/vsimem/test_sync/', '/vsimem/out')
 
     gdal.RmdirRecursive('/vsimem/out')
 
@@ -901,19 +793,12 @@ def test_vsisync():
     def my_progress(pct, message, user_data):
         pct_values.append(pct)
 
-    if not gdal.Sync('/vsimem/test_sync', '/vsimem/out', callback = my_progress):
-        return 'fail'
+    assert gdal.Sync('/vsimem/test_sync', '/vsimem/out', callback = my_progress)
 
-    if pct_values != [0.5, 1.0]:
-        print(pct_values)
-        return 'fail'
+    assert pct_values == [0.5, 1.0]
 
-    if gdal.ReadDir('/vsimem/out') != [ 'test_sync' ]:
-        print(gdal.ReadDir('/vsimem/out'))
-        return 'fail'
-    if gdal.ReadDir('/vsimem/out/test_sync') != [ 'foo.txt', 'subdir' ]:
-        print(gdal.ReadDir('/vsimem/out/test_sync'))
-        return 'fail'
+    assert gdal.ReadDir('/vsimem/out') == [ 'test_sync' ]
+    assert gdal.ReadDir('/vsimem/out/test_sync') == [ 'foo.txt', 'subdir' ]
 
     gdal.RmdirRecursive('/vsimem/test_sync')
     gdal.RmdirRecursive('/vsimem/out')
@@ -927,18 +812,15 @@ def test_vsifile_opendir():
 
     # Non existing dir
     d = gdal.OpenDir('/vsimem/i_dont_exist')
-    if d:
-        return 'fail'
+    assert not d
 
     gdal.Mkdir('/vsimem/vsifile_opendir', 0o755)
 
     # Empty dir
     d = gdal.OpenDir('/vsimem/vsifile_opendir')
-    if not d:
-        return 'fail'
+    assert d
     entry = gdal.GetNextDirEntry(d)
-    if entry:
-        return 'fail'
+    assert not entry
     gdal.CloseDir(d)
 
     gdal.FileFromMemBuffer('/vsimem/vsifile_opendir/test', 'foo')
@@ -950,74 +832,44 @@ def test_vsifile_opendir():
     d = gdal.OpenDir('/vsimem/vsifile_opendir')
 
     entry = gdal.GetNextDirEntry(d)
-    if entry.name != 'subdir':
-        print(entry.name)
-        return 'fail'
-    if entry.mode != 16384:
-        print(entry.mode)
-        return 'fail'
+    assert entry.name == 'subdir'
+    assert entry.mode == 16384
 
     entry = gdal.GetNextDirEntry(d)
-    if entry.name != 'subdir/subdir2':
-        print(entry.name)
-        return 'fail'
-    if entry.mode != 16384:
-        print(entry.mode)
-        return 'fail'
+    assert entry.name == 'subdir/subdir2'
+    assert entry.mode == 16384
 
     entry = gdal.GetNextDirEntry(d)
-    if entry.name != 'subdir/subdir2/test2':
-        print(entry.name)
-        return 'fail'
-    if entry.mode != 32768:
-        print(entry.mode)
-        return 'fail'
+    assert entry.name == 'subdir/subdir2/test2'
+    assert entry.mode == 32768
 
     entry = gdal.GetNextDirEntry(d)
-    if entry.name != 'test':
-        print(entry.name)
-        return 'fail'
-    if entry.mode != 32768:
-        print(entry.mode)
-        return 'fail'
-    if not entry.modeKnown:
-        return 'fail'
-    if entry.size != 3:
-        return 'fail'
-    if not entry.sizeKnown:
-        return 'fail'
-    if entry.mtime == 0:
-        return 'fail'
-    if not entry.mtimeKnown:
-        return 'fail'
-    if entry.extra:
-        return 'fail'
+    assert entry.name == 'test'
+    assert entry.mode == 32768
+    assert entry.modeKnown
+    assert entry.size == 3
+    assert entry.sizeKnown
+    assert entry.mtime != 0
+    assert entry.mtimeKnown
+    assert not entry.extra
 
     entry = gdal.GetNextDirEntry(d)
-    if entry:
-        return 'fail'
+    assert not entry
     gdal.CloseDir(d)
 
     # Only top level
     d = gdal.OpenDir('/vsimem/vsifile_opendir', 0)
     entry = gdal.GetNextDirEntry(d)
-    if entry.name != 'subdir':
-        print(entry.name)
-        return 'fail'
+    assert entry.name == 'subdir'
     entry = gdal.GetNextDirEntry(d)
-    if entry.name != 'test':
-        print(entry.name)
-        return 'fail'
+    assert entry.name == 'test'
     entry = gdal.GetNextDirEntry(d)
-    if entry:
-        return 'fail'
+    assert not entry
     gdal.CloseDir(d)
 
     # Depth 1
     files = [l_entry.name for l_entry in gdal.listdir('/vsimem/vsifile_opendir', 1)]
-    if files != ['subdir', 'subdir/subdir2', 'test']:
-        print(files)
-        return 'fail'
+    assert files == ['subdir', 'subdir/subdir2', 'test']
 
     gdal.RmdirRecursive('/vsimem/vsifile_opendir')
 
diff --git a/autotest/gcore/vsigs.py b/autotest/gcore/vsigs.py
index e11e5cf62b63..789473e7f606 100755
--- a/autotest/gcore/vsigs.py
+++ b/autotest/gcore/vsigs.py
@@ -67,8 +67,7 @@ def test_vsigs_init():
     gdal.SetConfigOption('GOOGLE_APPLICATION_CREDENTIALS', '')
 
     with gdaltest.config_option('CPL_GCE_SKIP', 'YES'):
-        if gdal.GetSignedURL('/vsigs/foo/bar') is not None:
-            return 'fail'
+        assert gdal.GetSignedURL('/vsigs/foo/bar') is None
 
     return 'success'
 
@@ -91,9 +90,7 @@ def test_vsigs_1():
         gdal.VSIFCloseL(f)
         return 'fail'
     last_err = gdal.GetLastErrorMsg()
-    if last_err.find('Cannot read') < 0:
-        print(last_err)
-        return 'fail'
+    assert last_err.find('Cannot read') >= 0
 
     # Invalid content for header file
     with gdaltest.config_option('GDAL_HTTP_HEADER_FILE', 'vsigs.py'):
@@ -108,17 +105,13 @@ def test_vsigs_1():
     with gdaltest.config_option('CPL_GCE_SKIP', 'YES'):
         with gdaltest.error_handler():
             f = open_for_read('/vsigs/foo/bar')
-    if f is not None or gdal.VSIGetLastErrorMsg().find('GS_SECRET_ACCESS_KEY') < 0:
-        print(gdal.VSIGetLastErrorMsg())
-        return 'fail'
+    assert f is None and gdal.VSIGetLastErrorMsg().find('GS_SECRET_ACCESS_KEY') >= 0
 
     gdal.ErrorReset()
     with gdaltest.config_option('CPL_GCE_SKIP', 'YES'):
         with gdaltest.error_handler():
             f = open_for_read('/vsigs_streaming/foo/bar')
-    if f is not None or gdal.VSIGetLastErrorMsg().find('GS_SECRET_ACCESS_KEY') < 0:
-        print(gdal.VSIGetLastErrorMsg())
-        return 'fail'
+    assert f is None and gdal.VSIGetLastErrorMsg().find('GS_SECRET_ACCESS_KEY') >= 0
 
     gdal.SetConfigOption('GS_SECRET_ACCESS_KEY', 'GS_SECRET_ACCESS_KEY')
 
@@ -126,9 +119,7 @@ def test_vsigs_1():
     gdal.ErrorReset()
     with gdaltest.error_handler():
         f = open_for_read('/vsigs/foo/bar')
-    if f is not None or gdal.VSIGetLastErrorMsg().find('GS_ACCESS_KEY_ID') < 0:
-        print(gdal.VSIGetLastErrorMsg())
-        return 'fail'
+    assert f is None and gdal.VSIGetLastErrorMsg().find('GS_ACCESS_KEY_ID') >= 0
 
     gdal.SetConfigOption('GS_ACCESS_KEY_ID', 'GS_ACCESS_KEY_ID')
 
@@ -147,9 +138,7 @@ def test_vsigs_1():
     gdal.ErrorReset()
     with gdaltest.error_handler():
         f = open_for_read('/vsigs_streaming/foo/bar.baz')
-    if f is not None or gdal.VSIGetLastErrorMsg() == '':
-        print(gdal.VSIGetLastErrorMsg())
-        return 'fail'
+    assert f is None and gdal.VSIGetLastErrorMsg() != ''
 
     return 'success'
 
@@ -193,12 +182,10 @@ def test_vsigs_2():
     with webserver.install_http_handler(handler):
         with gdaltest.config_option('GDAL_HTTP_HEADER_FILE', '/vsimem/my_headers.txt'):
             f = open_for_read('/vsigs/gs_fake_bucket_http_header_file/resource')
-            if f is None:
-                return 'fail'
+            assert f is not None
             data = gdal.VSIFReadL(1, 1, f)
             gdal.VSIFCloseL(f)
-            if len(data) != 1:
-                return 'fail'
+            assert len(data) == 1
     gdal.Unlink('/vsimem/my_headers.txt')
 
     gdal.SetConfigOption('GS_SECRET_ACCESS_KEY', 'GS_SECRET_ACCESS_KEY')
@@ -207,10 +194,8 @@ def test_vsigs_2():
 
     signed_url = gdal.GetSignedURL('/vsigs/gs_fake_bucket/resource',
                                    ['START_DATE=20180212T123456Z'])
-    if signed_url not in ('http://127.0.0.1:8080/gs_fake_bucket/resource?Expires=1518442496&GoogleAccessId=GS_ACCESS_KEY_ID&Signature=xTphUyMqtKA6UmAX3PEr5VL3EOg%3D',
-                          'http://127.0.0.1:8081/gs_fake_bucket/resource?Expires=1518442496&GoogleAccessId=GS_ACCESS_KEY_ID&Signature=xTphUyMqtKA6UmAX3PEr5VL3EOg%3D'):
-        print(signed_url)
-        return 'fail'
+    assert (signed_url in ('http://127.0.0.1:8080/gs_fake_bucket/resource?Expires=1518442496&GoogleAccessId=GS_ACCESS_KEY_ID&Signature=xTphUyMqtKA6UmAX3PEr5VL3EOg%3D',
+                          'http://127.0.0.1:8081/gs_fake_bucket/resource?Expires=1518442496&GoogleAccessId=GS_ACCESS_KEY_ID&Signature=xTphUyMqtKA6UmAX3PEr5VL3EOg%3D'))
 
     handler = webserver.SequentialHandler()
     handler.add('GET', '/gs_fake_bucket/resource', 200,
@@ -218,14 +203,11 @@ def test_vsigs_2():
                 expected_headers={'Authorization': 'GOOG1 GS_ACCESS_KEY_ID:8tndu9//BfmN+Kg4AFLdUMZMBDQ='})
     with webserver.install_http_handler(handler):
         f = open_for_read('/vsigs/gs_fake_bucket/resource')
-        if f is None:
-            return 'fail'
+        assert f is not None
         data = gdal.VSIFReadL(1, 4, f).decode('ascii')
         gdal.VSIFCloseL(f)
 
-    if data != 'foo':
-        print(data)
-        return 'fail'
+    assert data == 'foo'
 
     handler = webserver.SequentialHandler()
     handler.add('GET', '/gs_fake_bucket/resource', 200,
@@ -233,14 +215,11 @@ def test_vsigs_2():
                 expected_headers={'Authorization': 'GOOG1 GS_ACCESS_KEY_ID:8tndu9//BfmN+Kg4AFLdUMZMBDQ='})
     with webserver.install_http_handler(handler):
         f = open_for_read('/vsigs_streaming/gs_fake_bucket/resource')
-        if f is None:
-            return 'fail'
+        assert f is not None
         data = gdal.VSIFReadL(1, 4, f).decode('ascii')
         gdal.VSIFCloseL(f)
 
-        if data != 'foo':
-            print(data)
-            return 'fail'
+        assert data == 'foo'
 
     handler = webserver.SequentialHandler()
     handler.add('GET', '/gs_fake_bucket/resource2.bin', 206,
@@ -319,18 +298,13 @@ def test_vsigs_readdir():
     gdal.VSIFCloseL(f)
 
     dir_contents = gdal.ReadDir('/vsigs/gs_fake_bucket2/a_dir')
-    if dir_contents != ['resource3.bin', 'resource4.bin', 'subdir']:
-        print(dir_contents)
-        return 'fail'
-    if gdal.VSIStatL('/vsigs/gs_fake_bucket2/a_dir/resource3.bin').size != 123456:
-        return 'fail'
-    if gdal.VSIStatL('/vsigs/gs_fake_bucket2/a_dir/resource3.bin').mtime != 1:
-        return 'fail'
+    assert dir_contents == ['resource3.bin', 'resource4.bin', 'subdir']
+    assert gdal.VSIStatL('/vsigs/gs_fake_bucket2/a_dir/resource3.bin').size == 123456
+    assert gdal.VSIStatL('/vsigs/gs_fake_bucket2/a_dir/resource3.bin').mtime == 1
 
     # ReadDir on something known to be a file shouldn't cause network access
     dir_contents = gdal.ReadDir('/vsigs/gs_fake_bucket2/a_dir/resource3.bin')
-    if dir_contents is not None:
-        return 'fail'
+    assert dir_contents is None
 
     # List buckets
     handler = webserver.SequentialHandler()
@@ -346,9 +320,7 @@ def test_vsigs_readdir():
         """)
     with webserver.install_http_handler(handler):
         dir_contents = gdal.ReadDir('/vsigs/')
-    if dir_contents != ['mybucket']:
-        print(dir_contents)
-        return 'fail'
+    assert dir_contents == ['mybucket']
 
     return 'success'
 
@@ -364,8 +336,7 @@ def test_vsigs_write():
     gdal.VSICurlClearCache()
 
     f = gdal.VSIFOpenL('/vsigs/test_copy/file.bin', 'wb')
-    if f is None:
-        return 'fail'
+    assert f is not None
 
     handler = webserver.SequentialHandler()
 
@@ -401,8 +372,7 @@ def method(request):
 
     # Simulate failure while transmitting
     f = gdal.VSIFOpenL('/vsigs/test_copy/file.bin', 'wb')
-    if f is None:
-        return 'fail'
+    assert f is not None
 
     handler = webserver.SequentialHandler()
 
@@ -424,8 +394,7 @@ def method(request):
 
     # Simulate failure at end of transfer
     f = gdal.VSIFOpenL('/vsigs/test_copy/file.bin', 'wb')
-    if f is None:
-        return 'fail'
+    assert f is not None
 
     handler = webserver.SequentialHandler()
 
@@ -452,8 +421,7 @@ def method(request):
             return 'fail'
         with gdaltest.error_handler():
             ret = gdal.VSIFCloseL(f)
-        if ret == 0:
-            return 'fail'
+        assert ret != 0
 
     return 'success'
 
@@ -475,8 +443,7 @@ def test_vsigs_read_credentials_refresh_token_default_gdal_app():
     gdal.SetConfigOption('GS_OAUTH2_REFRESH_TOKEN', 'REFRESH_TOKEN')
 
     with gdaltest.error_handler():
-        if gdal.GetSignedURL('/vsigs/foo/bar') is not None:
-            return 'fail'
+        assert gdal.GetSignedURL('/vsigs/foo/bar') is None
 
     gdal.VSICurlClearCache()
 
@@ -522,14 +489,11 @@ def method(request):
     handler.add('GET', '/gs_fake_bucket/resource', custom_method=method)
     with webserver.install_http_handler(handler):
         f = open_for_read('/vsigs/gs_fake_bucket/resource')
-        if f is None:
-            return 'fail'
+        assert f is not None
         data = gdal.VSIFReadL(1, 4, f).decode('ascii')
         gdal.VSIFCloseL(f)
 
-    if data != 'foo':
-        print(data)
-        return 'fail'
+    assert data == 'foo'
 
     gdal.SetConfigOption('GOA2_AUTH_URL_TOKEN', None)
     gdal.SetConfigOption('GS_OAUTH2_REFRESH_TOKEN', '')
@@ -599,14 +563,11 @@ def method(request):
     handler.add('GET', '/gs_fake_bucket/resource', custom_method=method)
     with webserver.install_http_handler(handler):
         f = open_for_read('/vsigs/gs_fake_bucket/resource')
-        if f is None:
-            return 'fail'
+        assert f is not None
         data = gdal.VSIFReadL(1, 4, f).decode('ascii')
         gdal.VSIFCloseL(f)
 
-    if data != 'foo':
-        print(data)
-        return 'fail'
+    assert data == 'foo'
 
     gdal.SetConfigOption('GOA2_AUTH_URL_TOKEN', None)
     gdal.SetConfigOption('GS_OAUTH2_REFRESH_TOKEN', '')
@@ -709,8 +670,7 @@ def method(request):
         try:
             with webserver.install_http_handler(handler):
                 f = open_for_read('/vsigs/gs_fake_bucket/resource')
-                if f is None:
-                    return 'fail'
+                assert f is not None
                 data = gdal.VSIFReadL(1, 4, f).decode('ascii')
                 gdal.VSIFCloseL(f)
         except:
@@ -723,9 +683,7 @@ def method(request):
             gdal.SetConfigOption('GS_OAUTH2_PRIVATE_KEY_FILE', '')
             gdal.SetConfigOption('GS_OAUTH2_CLIENT_EMAIL', '')
 
-        if data != 'foo':
-            print(data)
-            return 'fail'
+        assert data == 'foo'
 
     gdal.Unlink('/vsimem/pkey')
 
@@ -825,9 +783,7 @@ def method(request):
 
     gdal.Unlink('/vsimem/service_account.json')
 
-    if data != 'foo':
-        print(data)
-        return 'fail'
+    assert data == 'foo'
 
     return 'success'
 
@@ -880,14 +836,11 @@ def method(request):
     handler.add('GET', '/gs_fake_bucket/resource', custom_method=method)
     with webserver.install_http_handler(handler):
         f = open_for_read('/vsigs/gs_fake_bucket/resource')
-        if f is None:
-            return 'fail'
+        assert f is not None
         data = gdal.VSIFReadL(1, 4, f).decode('ascii')
         gdal.VSIFCloseL(f)
 
-    if data != 'foo':
-        print(data)
-        return 'fail'
+    assert data == 'foo'
 
     gdal.SetConfigOption('CPL_GS_CREDENTIALS_FILE', '')
     gdal.Unlink('/vsimem/.boto')
@@ -962,14 +915,11 @@ def method(request):
     handler.add('GET', '/gs_fake_bucket/resource', custom_method=method)
     with webserver.install_http_handler(handler):
         f = open_for_read('/vsigs/gs_fake_bucket/resource')
-        if f is None:
-            return 'fail'
+        assert f is not None
         data = gdal.VSIFReadL(1, 4, f).decode('ascii')
         gdal.VSIFCloseL(f)
 
-    if data != 'foo':
-        print(data)
-        return 'fail'
+    assert data == 'foo'
 
     gdal.SetConfigOption('CPL_GS_CREDENTIALS_FILE', '')
     gdal.SetConfigOption('GOA2_AUTH_URL_TOKEN', None)
@@ -1027,14 +977,11 @@ def method(request):
     handler.add('GET', '/gs_fake_bucket/resource', custom_method=method)
     with webserver.install_http_handler(handler):
         f = open_for_read('/vsigs/gs_fake_bucket/resource')
-        if f is None:
-            return 'fail'
+        assert f is not None
         data = gdal.VSIFReadL(1, 4, f).decode('ascii')
         gdal.VSIFCloseL(f)
 
-    if data != 'foo':
-        print(data)
-        return 'fail'
+    assert data == 'foo'
 
     # Set a fake URL to check that credentials re-use works
     gdal.SetConfigOption('CPL_GCE_CREDENTIALS_URL', '')
@@ -1043,18 +990,14 @@ def method(request):
     handler.add('GET', '/gs_fake_bucket/bar', 200, {}, 'bar')
     with webserver.install_http_handler(handler):
         f = open_for_read('/vsigs/gs_fake_bucket/bar')
-        if f is None:
-            return 'fail'
+        assert f is not None
         data = gdal.VSIFReadL(1, 4, f).decode('ascii')
         gdal.VSIFCloseL(f)
 
-    if data != 'bar':
-        print(data)
-        return 'fail'
+    assert data == 'bar'
 
     with gdaltest.error_handler():
-        if gdal.GetSignedURL('/vsigs/foo/bar') is not None:
-            return 'fail'
+        assert gdal.GetSignedURL('/vsigs/foo/bar') is None
 
     gdal.SetConfigOption('CPL_GCE_CREDENTIALS_URL', '')
     gdal.SetConfigOption('CPL_GCE_CHECK_LOCAL_FILES', None)
@@ -1120,14 +1063,11 @@ def method(request):
     handler.add('GET', '/gs_fake_bucket/resource', custom_method=method)
     with webserver.install_http_handler(handler):
         f = open_for_read('/vsigs/gs_fake_bucket/resource')
-        if f is None:
-            return 'fail'
+        assert f is not None
         data = gdal.VSIFReadL(1, 4, f).decode('ascii')
         gdal.VSIFCloseL(f)
 
-    if data != 'foo':
-        print(data)
-        return 'fail'
+    assert data == 'foo'
 
     gdal.SetConfigOption('CPL_GCE_CREDENTIALS_URL', '')
     gdal.SetConfigOption('CPL_GCE_CHECK_LOCAL_FILES', None)
@@ -1174,112 +1114,80 @@ def vsigs_extra_1():
     if gs_resource.find('/') < 0:
         path = '/vsigs/' + gs_resource
         statres = gdal.VSIStatL(path)
-        if statres is None or not stat.S_ISDIR(statres.mode):
-            print('%s is not a valid bucket' % path)
-            return 'fail'
+        assert statres is not None and stat.S_ISDIR(statres.mode), \
+            ('%s is not a valid bucket' % path)
 
         readdir = gdal.ReadDir(path)
-        if readdir is None:
-            print('ReadDir() should not return empty list')
-            return 'fail'
+        assert readdir is not None, 'ReadDir() should not return empty list'
         for filename in readdir:
             if filename != '.':
                 subpath = path + '/' + filename
-                if gdal.VSIStatL(subpath) is None:
-                    print('Stat(%s) should not return an error' % subpath)
-                    return 'fail'
+                assert gdal.VSIStatL(subpath) is not None, \
+                    ('Stat(%s) should not return an error' % subpath)
 
         unique_id = 'vsigs_test'
         subpath = path + '/' + unique_id
         ret = gdal.Mkdir(subpath, 0)
-        if ret < 0:
-            print('Mkdir(%s) should not return an error' % subpath)
-            return 'fail'
+        assert ret >= 0, ('Mkdir(%s) should not return an error' % subpath)
 
         readdir = gdal.ReadDir(path)
-        if unique_id not in readdir:
-            print('ReadDir(%s) should contain %s' % (path, unique_id))
-            print(readdir)
-            return 'fail'
+        assert unique_id in readdir, \
+            ('ReadDir(%s) should contain %s' % (path, unique_id))
 
         ret = gdal.Mkdir(subpath, 0)
-        if ret == 0:
-            print('Mkdir(%s) repeated should return an error' % subpath)
-            return 'fail'
+        assert ret != 0, ('Mkdir(%s) repeated should return an error' % subpath)
 
         ret = gdal.Rmdir(subpath)
-        if ret < 0:
-            print('Rmdir(%s) should not return an error' % subpath)
-            return 'fail'
+        assert ret >= 0, ('Rmdir(%s) should not return an error' % subpath)
 
         readdir = gdal.ReadDir(path)
-        if unique_id in readdir:
-            print('ReadDir(%s) should not contain %s' % (path, unique_id))
-            print(readdir)
-            return 'fail'
+        assert unique_id not in readdir, \
+            ('ReadDir(%s) should not contain %s' % (path, unique_id))
 
         ret = gdal.Rmdir(subpath)
-        if ret == 0:
-            print('Rmdir(%s) repeated should return an error' % subpath)
-            return 'fail'
+        assert ret != 0, ('Rmdir(%s) repeated should return an error' % subpath)
 
         ret = gdal.Mkdir(subpath, 0)
-        if ret < 0:
-            print('Mkdir(%s) should not return an error' % subpath)
-            return 'fail'
+        assert ret >= 0, ('Mkdir(%s) should not return an error' % subpath)
 
         f = gdal.VSIFOpenL(subpath + '/test.txt', 'wb')
-        if f is None:
-            return 'fail'
+        assert f is not None
         gdal.VSIFWriteL('hello', 1, 5, f)
         gdal.VSIFCloseL(f)
 
         ret = gdal.Rmdir(subpath)
-        if ret == 0:
-            print('Rmdir(%s) on non empty directory should return an error' % subpath)
-            return 'fail'
+        assert ret != 0, \
+            ('Rmdir(%s) on non empty directory should return an error' % subpath)
 
         f = gdal.VSIFOpenL(subpath + '/test.txt', 'rb')
-        if f is None:
-            return 'fail'
+        assert f is not None
         data = gdal.VSIFReadL(1, 5, f).decode('utf-8')
-        if data != 'hello':
-            print(data)
-            return 'fail'
+        assert data == 'hello'
         gdal.VSIFCloseL(f)
 
         ret = gdal.Unlink(subpath + '/test.txt')
-        if ret < 0:
-            print('Unlink(%s) should not return an error' % (subpath + '/test.txt'))
-            return 'fail'
+        assert ret >= 0, \
+            ('Unlink(%s) should not return an error' % (subpath + '/test.txt'))
 
         ret = gdal.Rmdir(subpath)
-        if ret < 0:
-            print('Rmdir(%s) should not return an error' % subpath)
-            return 'fail'
+        assert ret >= 0, ('Rmdir(%s) should not return an error' % subpath)
 
         return 'success'
 
     f = open_for_read('/vsigs/' + gs_resource)
-    if f is None:
-        return 'fail'
+    assert f is not None
     ret = gdal.VSIFReadL(1, 1, f)
     gdal.VSIFCloseL(f)
 
-    if len(ret) != 1:
-        print(ret)
-        return 'fail'
+    assert len(ret) == 1
 
     # Same with /vsigs_streaming/
     f = open_for_read('/vsigs_streaming/' + gs_resource)
-    if f is None:
-        return 'fail'
+    assert f is not None
     ret = gdal.VSIFReadL(1, 1, f)
     gdal.VSIFCloseL(f)
 
-    if len(ret) != 1:
-        print(ret)
-        return 'fail'
+    assert len(ret) == 1
 
     if False:  # pylint: disable=using-constant-test
         # we actually try to read at read() time and bSetError = false
@@ -1289,28 +1197,21 @@ def vsigs_extra_1():
         with gdaltest.error_handler():
             gdal.VSIFReadL(1, 1, f)
         gdal.VSIFCloseL(f)
-        if gdal.VSIGetLastErrorMsg() == '':
-            print(gdal.VSIGetLastErrorMsg())
-            return 'fail'
+        assert gdal.VSIGetLastErrorMsg() != ''
 
     # Invalid resource
     gdal.ErrorReset()
     f = open_for_read('/vsigs_streaming/' + gs_resource + '/invalid_resource.baz')
-    if f is not None:
-        print(gdal.VSIGetLastErrorMsg())
-        return 'fail'
+    assert f is None, gdal.VSIGetLastErrorMsg()
 
     # Test GetSignedURL()
     signed_url = gdal.GetSignedURL('/vsigs/' + gs_resource)
     f = open_for_read('/vsicurl_streaming/' + signed_url)
-    if f is None:
-        return 'fail'
+    assert f is not None
     ret = gdal.VSIFReadL(1, 1, f)
     gdal.VSIFCloseL(f)
 
-    if len(ret) != 1:
-        print(ret)
-        return 'fail'
+    assert len(ret) == 1
 
     return 'success'
 
diff --git a/autotest/gcore/vsihdfs.py b/autotest/gcore/vsihdfs.py
index 3e4be7a55b35..922b850df5d9 100755
--- a/autotest/gcore/vsihdfs.py
+++ b/autotest/gcore/vsihdfs.py
@@ -48,12 +48,10 @@ def test_vsihdfs_1():
     gdaltest.have_vsihdfs = True
 
     data = gdal.VSIFReadL(5, 1, fp)
-    if not data or data.decode('ascii') != 'Lorem':
-        return 'fail'
+    assert data and data.decode('ascii') == 'Lorem'
 
     data = gdal.VSIFReadL(1, 6, fp)
-    if not data or data.decode('ascii') != ' ipsum':
-        return 'fail'
+    assert data and data.decode('ascii') == ' ipsum'
 
     gdal.VSIFCloseL(fp)
     return 'success'
@@ -65,24 +63,20 @@ def test_vsihdfs_2():
 
     filename = '/vsihdfs/file:' + os.getcwd() + '/data/text.txt'
     fp = gdal.VSIFOpenL(filename, 'rb')
-    if fp is None:
-        return 'fail'
+    assert fp is not None
 
     gdal.VSIFSeekL(fp, 2, 0) # From beginning
     gdal.VSIFSeekL(fp, 5, 0)
     data = gdal.VSIFReadL(6, 1, fp)
-    if not data or data.decode('ascii') != ' ipsum':
-        return 'fail'
+    assert data and data.decode('ascii') == ' ipsum'
 
     gdal.VSIFSeekL(fp, 7, 1) # From current
     data = gdal.VSIFReadL(3, 1, fp)
-    if not data or data.decode('ascii') != 'sit':
-        return 'fail'
+    assert data and data.decode('ascii') == 'sit'
 
     gdal.VSIFSeekL(fp, 9, 2) # From end
     data = gdal.VSIFReadL(7, 1, fp)
-    if not data or data.decode('ascii') != 'laborum':
-        return 'fail'
+    assert data and data.decode('ascii') == 'laborum'
 
     gdal.VSIFCloseL(fp)
     return 'success'
@@ -94,16 +88,13 @@ def test_vsihdfs_3():
 
     filename = '/vsihdfs/file:' + os.getcwd() + '/data/text.txt'
     fp = gdal.VSIFOpenL(filename, 'rb')
-    if fp is None:
-        return 'fail'
+    assert fp is not None
 
     data = gdal.VSIFReadL(5, 1, fp)
-    if not data or data.decode('ascii') != 'Lorem':
-        return 'fail'
+    assert data and data.decode('ascii') == 'Lorem'
 
     offset = gdal.VSIFTellL(fp)
-    if offset != 5:
-        return 'fail'
+    assert offset == 5
 
     gdal.VSIFCloseL(fp)
     return 'success'
@@ -119,28 +110,23 @@ def test_vsihdfs_5():
 
     filename = '/vsihdfs/file:' + os.getcwd() + '/data/text.txt'
     fp = gdal.VSIFOpenL(filename, 'rb')
-    if fp is None:
-        return 'fail'
+    assert fp is not None
 
     gdal.VSIFReadL(5, 1, fp)
     eof = gdal.VSIFEofL(fp)
-    if eof != 0:
-        return 'fail'
+    assert eof == 0
 
     gdal.VSIFReadL(1000000, 1, fp)
     eof = gdal.VSIFEofL(fp)
-    if eof != 0:
-        return 'fail'
+    assert eof == 0
 
     gdal.VSIFReadL(1, 1, fp)
     eof = gdal.VSIFEofL(fp)
-    if eof != 1:
-        return 'fail'
+    assert eof == 1
 
     gdal.VSIFSeekL(fp, 0, 0)
     eof = gdal.VSIFEofL(fp)
-    if eof != 0:
-        return 'fail'
+    assert eof == 0
 
     gdal.VSIFCloseL(fp)
     return 'success'
@@ -152,13 +138,11 @@ def test_vsihdfs_6():
 
     filename = '/vsihdfs/file:' + os.getcwd() + '/data/text.txt'
     statBuf = gdal.VSIStatL(filename, 0)
-    if not statBuf:
-        return 'fail'
+    assert statBuf
 
     filename = '/vsihdfs/file:' + os.getcwd() + '/data/no-such-file.txt'
     statBuf = gdal.VSIStatL(filename, 0)
-    if statBuf:
-        return 'fail'
+    assert not statBuf
 
     return 'success'
 
@@ -169,8 +153,7 @@ def test_vsihdfs_7():
 
     dirname = '/vsihdfs/file:' + os.getcwd() + '/data/'
     lst = gdal.ReadDir(dirname)
-    if len(lst) < 360:
-        return 'fail'
+    assert len(lst) >= 360
 
     return 'success'
 
diff --git a/autotest/gcore/vsioss.py b/autotest/gcore/vsioss.py
index 93901eed863a..213eb885edd5 100755
--- a/autotest/gcore/vsioss.py
+++ b/autotest/gcore/vsioss.py
@@ -35,6 +35,7 @@
 
 import gdaltest
 import webserver
+import pytest
 
 
 def open_for_read(uri):
@@ -54,8 +55,7 @@ def test_visoss_init():
         if gdaltest.oss_vars[var] is not None:
             gdal.SetConfigOption(var, "")
 
-    if gdal.GetSignedURL('/vsioss/foo/bar') is not None:
-        return 'fail'
+    assert gdal.GetSignedURL('/vsioss/foo/bar') is None
 
     return 'success'
 
@@ -72,16 +72,12 @@ def test_visoss_1():
     gdal.ErrorReset()
     with gdaltest.error_handler():
         f = open_for_read('/vsioss/foo/bar')
-    if f is not None or gdal.VSIGetLastErrorMsg().find('OSS_SECRET_ACCESS_KEY') < 0:
-        print(gdal.VSIGetLastErrorMsg())
-        return 'fail'
+    assert f is None and gdal.VSIGetLastErrorMsg().find('OSS_SECRET_ACCESS_KEY') >= 0
 
     gdal.ErrorReset()
     with gdaltest.error_handler():
         f = open_for_read('/vsioss_streaming/foo/bar')
-    if f is not None or gdal.VSIGetLastErrorMsg().find('OSS_SECRET_ACCESS_KEY') < 0:
-        print(gdal.VSIGetLastErrorMsg())
-        return 'fail'
+    assert f is None and gdal.VSIGetLastErrorMsg().find('OSS_SECRET_ACCESS_KEY') >= 0
 
     gdal.SetConfigOption('OSS_SECRET_ACCESS_KEY', 'OSS_SECRET_ACCESS_KEY')
 
@@ -89,9 +85,7 @@ def test_visoss_1():
     gdal.ErrorReset()
     with gdaltest.error_handler():
         f = open_for_read('/vsioss/foo/bar')
-    if f is not None or gdal.VSIGetLastErrorMsg().find('OSS_ACCESS_KEY_ID') < 0:
-        print(gdal.VSIGetLastErrorMsg())
-        return 'fail'
+    assert f is None and gdal.VSIGetLastErrorMsg().find('OSS_ACCESS_KEY_ID') >= 0
 
     gdal.SetConfigOption('OSS_ACCESS_KEY_ID', 'OSS_ACCESS_KEY_ID')
 
@@ -121,9 +115,7 @@ def test_visoss_real_test():
     gdal.ErrorReset()
     with gdaltest.error_handler():
         f = open_for_read('/vsioss_streaming/foo/bar.baz')
-    if f is not None or gdal.VSIGetLastErrorMsg() == '':
-        print(gdal.VSIGetLastErrorMsg())
-        return 'fail'
+    assert f is None and gdal.VSIGetLastErrorMsg() != ''
 
     return 'success'
 
@@ -185,37 +177,29 @@ def test_visoss_2():
 
     signed_url = gdal.GetSignedURL('/vsioss/oss_fake_bucket/resource',
                                    ['START_DATE=20180212T123456Z'])
-    if signed_url not in ('http://127.0.0.1:8080/oss_fake_bucket/resource?Expires=1518442496&OSSAccessKeyId=OSS_ACCESS_KEY_ID&Signature=bpFqur6tQMNN7Xe7UHVFFrugmgs%3D',
-                          'http://127.0.0.1:8081/oss_fake_bucket/resource?Expires=1518442496&OSSAccessKeyId=OSS_ACCESS_KEY_ID&Signature=bpFqur6tQMNN7Xe7UHVFFrugmgs%3D'):
-        print(signed_url)
-        return 'fail'
+    assert (signed_url in ('http://127.0.0.1:8080/oss_fake_bucket/resource?Expires=1518442496&OSSAccessKeyId=OSS_ACCESS_KEY_ID&Signature=bpFqur6tQMNN7Xe7UHVFFrugmgs%3D',
+                          'http://127.0.0.1:8081/oss_fake_bucket/resource?Expires=1518442496&OSSAccessKeyId=OSS_ACCESS_KEY_ID&Signature=bpFqur6tQMNN7Xe7UHVFFrugmgs%3D'))
 
     handler = webserver.SequentialHandler()
     handler.add('GET', '/oss_fake_bucket/resource', custom_method=get_oss_fake_bucket_resource_method)
 
     with webserver.install_http_handler(handler):
         f = open_for_read('/vsioss/oss_fake_bucket/resource')
-        if f is None:
-            return 'fail'
+        assert f is not None
         data = gdal.VSIFReadL(1, 4, f).decode('ascii')
         gdal.VSIFCloseL(f)
 
-        if data != 'foo':
-            print(data)
-            return 'fail'
+        assert data == 'foo'
 
     handler = webserver.SequentialHandler()
     handler.add('GET', '/oss_fake_bucket/resource', custom_method=get_oss_fake_bucket_resource_method)
     with webserver.install_http_handler(handler):
         f = open_for_read('/vsioss_streaming/oss_fake_bucket/resource')
-        if f is None:
-            return 'fail'
+        assert f is not None
         data = gdal.VSIFReadL(1, 4, f).decode('ascii')
         gdal.VSIFCloseL(f)
 
-    if data != 'foo':
-        print(data)
-        return 'fail'
+    assert data == 'foo'
 
     handler = webserver.SequentialHandler()
 
@@ -257,8 +241,7 @@ def method(request):
     # Test region and endpoint 'redirects'
     with webserver.install_http_handler(handler):
         f = open_for_read('/vsioss/oss_fake_bucket/redirect')
-        if f is None:
-            return 'fail'
+        assert f is not None
         data = gdal.VSIFReadL(1, 4, f).decode('ascii')
         gdal.VSIFCloseL(f)
 
@@ -275,14 +258,11 @@ def method(request):
     handler.req_count = 0
     with webserver.install_http_handler(handler):
         f = open_for_read('/vsioss_streaming/oss_fake_bucket/redirect')
-        if f is None:
-            return 'fail'
+        assert f is not None
         data = gdal.VSIFReadL(1, 4, f).decode('ascii')
         gdal.VSIFCloseL(f)
 
-    if data != 'foo':
-        print(data)
-        return 'fail'
+    assert data == 'foo'
 
     handler = webserver.SequentialHandler()
 
@@ -308,9 +288,7 @@ def method(request):
     with webserver.install_http_handler(handler):
         with gdaltest.error_handler():
             f = open_for_read('/vsioss_streaming/oss_fake_bucket/non_xml_error')
-    if f is not None or gdal.VSIGetLastErrorMsg().find('bla') < 0:
-        print(gdal.VSIGetLastErrorMsg())
-        return 'fail'
+    assert f is None and gdal.VSIGetLastErrorMsg().find('bla') >= 0
 
     handler = webserver.SequentialHandler()
     response = '<?xml version="1.0" encoding="UTF-8"?><oops>'
@@ -323,9 +301,7 @@ def method(request):
     with webserver.install_http_handler(handler):
         with gdaltest.error_handler():
             f = open_for_read('/vsioss_streaming/oss_fake_bucket/invalid_xml_error')
-    if f is not None or gdal.VSIGetLastErrorMsg().find('<oops>') < 0:
-        print(gdal.VSIGetLastErrorMsg())
-        return 'fail'
+    assert f is None and gdal.VSIGetLastErrorMsg().find('<oops>') >= 0
 
     handler = webserver.SequentialHandler()
     response = '<?xml version="1.0" encoding="UTF-8"?><Error/>'
@@ -338,9 +314,7 @@ def method(request):
     with webserver.install_http_handler(handler):
         with gdaltest.error_handler():
             f = open_for_read('/vsioss_streaming/oss_fake_bucket/no_code_in_error')
-    if f is not None or gdal.VSIGetLastErrorMsg().find('<Error/>') < 0:
-        print(gdal.VSIGetLastErrorMsg())
-        return 'fail'
+    assert f is None and gdal.VSIGetLastErrorMsg().find('<Error/>') >= 0
 
     handler = webserver.SequentialHandler()
     response = '<?xml version="1.0" encoding="UTF-8"?><Error><Code>AuthorizationHeaderMalformed</Code></Error>'
@@ -353,9 +327,7 @@ def method(request):
     with webserver.install_http_handler(handler):
         with gdaltest.error_handler():
             f = open_for_read('/vsioss_streaming/oss_fake_bucket/no_region_in_AuthorizationHeaderMalformed_error')
-    if f is not None or gdal.VSIGetLastErrorMsg().find('<Error>') < 0:
-        print(gdal.VSIGetLastErrorMsg())
-        return 'fail'
+    assert f is None and gdal.VSIGetLastErrorMsg().find('<Error>') >= 0
 
     handler = webserver.SequentialHandler()
     response = '<?xml version="1.0" encoding="UTF-8"?><Error><Code>PermanentRedirect</Code></Error>'
@@ -368,9 +340,7 @@ def method(request):
     with webserver.install_http_handler(handler):
         with gdaltest.error_handler():
             f = open_for_read('/vsioss_streaming/oss_fake_bucket/no_endpoint_in_PermanentRedirect_error')
-    if f is not None or gdal.VSIGetLastErrorMsg().find('<Error>') < 0:
-        print(gdal.VSIGetLastErrorMsg())
-        return 'fail'
+    assert f is None and gdal.VSIGetLastErrorMsg().find('<Error>') >= 0
 
     handler = webserver.SequentialHandler()
     response = '<?xml version="1.0" encoding="UTF-8"?><Error><Code>bla</Code></Error>'
@@ -383,9 +353,7 @@ def method(request):
     with webserver.install_http_handler(handler):
         with gdaltest.error_handler():
             f = open_for_read('/vsioss_streaming/oss_fake_bucket/no_message_in_error')
-    if f is not None or gdal.VSIGetLastErrorMsg().find('<Error>') < 0:
-        print(gdal.VSIGetLastErrorMsg())
-        return 'fail'
+    assert f is None and gdal.VSIGetLastErrorMsg().find('<Error>') >= 0
 
     return 'success'
 
@@ -457,18 +425,13 @@ def method(request):
 
     with webserver.install_http_handler(webserver.SequentialHandler()):
         dir_contents = gdal.ReadDir('/vsioss/oss_fake_bucket2/a_dir')
-    if dir_contents != ['resource3.bin', 'resource4.bin', 'subdir']:
-        print(dir_contents)
-        return 'fail'
-    if gdal.VSIStatL('/vsioss/oss_fake_bucket2/a_dir/resource3.bin').size != 123456:
-        return 'fail'
-    if gdal.VSIStatL('/vsioss/oss_fake_bucket2/a_dir/resource3.bin').mtime != 1:
-        return 'fail'
+    assert dir_contents == ['resource3.bin', 'resource4.bin', 'subdir']
+    assert gdal.VSIStatL('/vsioss/oss_fake_bucket2/a_dir/resource3.bin').size == 123456
+    assert gdal.VSIStatL('/vsioss/oss_fake_bucket2/a_dir/resource3.bin').mtime == 1
 
     # ReadDir on something known to be a file shouldn't cause network access
     dir_contents = gdal.ReadDir('/vsioss/oss_fake_bucket2/a_dir/resource3.bin')
-    if dir_contents is not None:
-        return 'fail'
+    assert dir_contents is None
 
     # Test CPL_VSIL_CURL_NON_CACHED
     for config_option_value in ['/vsioss/oss_non_cached/test.txt',
@@ -483,25 +446,17 @@ def method(request):
 
             with webserver.install_http_handler(handler):
                 f = open_for_read('/vsioss/oss_non_cached/test.txt')
-                if f is None:
-                    print(config_option_value)
-                    return 'fail'
+                assert f is not None, config_option_value
                 data = gdal.VSIFReadL(1, 3, f).decode('ascii')
                 gdal.VSIFCloseL(f)
-                if data != 'foo':
-                    print(config_option_value)
-                    print(data)
-                    return 'fail'
+                assert data == 'foo', config_option_value
 
             handler = webserver.SequentialHandler()
             handler.add('GET', '/oss_non_cached/test.txt', 200, {}, 'bar2')
 
             with webserver.install_http_handler(handler):
                 size = gdal.VSIStatL('/vsioss/oss_non_cached/test.txt').size
-            if size != 4:
-                print(config_option_value)
-                print(size)
-                return 'fail'
+            assert size == 4, config_option_value
 
             handler = webserver.SequentialHandler()
             handler.add('GET', '/oss_non_cached/test.txt', 200, {}, 'foo')
@@ -510,23 +465,17 @@ def method(request):
                 size = gdal.VSIStatL('/vsioss/oss_non_cached/test.txt').size
                 if size != 3:
                     print(config_option_value)
-                    print(data)
-                    return 'fail'
+                    pytest.fail(data)
 
             handler = webserver.SequentialHandler()
             handler.add('GET', '/oss_non_cached/test.txt', 200, {}, 'bar2')
 
             with webserver.install_http_handler(handler):
                 f = open_for_read('/vsioss/oss_non_cached/test.txt')
-                if f is None:
-                    print(config_option_value)
-                    return 'fail'
+                assert f is not None, config_option_value
                 data = gdal.VSIFReadL(1, 4, f).decode('ascii')
                 gdal.VSIFCloseL(f)
-                if data != 'bar2':
-                    print(config_option_value)
-                    print(data)
-                    return 'fail'
+                assert data == 'bar2', config_option_value
 
     # Retry without option
     for config_option_value in [None,
@@ -555,29 +504,19 @@ def method(request):
 
             with webserver.install_http_handler(handler):
                 f = open_for_read('/vsioss/oss_non_cached/test.txt')
-                if f is None:
-                    print(config_option_value)
-                    return 'fail'
+                assert f is not None, config_option_value
                 data = gdal.VSIFReadL(1, 3, f).decode('ascii')
                 gdal.VSIFCloseL(f)
-                if data != 'foo':
-                    print(config_option_value)
-                    print(data)
-                    return 'fail'
+                assert data == 'foo', config_option_value
 
             handler = webserver.SequentialHandler()
             with webserver.install_http_handler(handler):
                 f = open_for_read('/vsioss/oss_non_cached/test.txt')
-                if f is None:
-                    print(config_option_value)
-                    return 'fail'
+                assert f is not None, config_option_value
                 data = gdal.VSIFReadL(1, 4, f).decode('ascii')
                 gdal.VSIFCloseL(f)
                 # We should still get foo because of caching
-                if data != 'foo':
-                    print(config_option_value)
-                    print(data)
-                    return 'fail'
+                assert data == 'foo', config_option_value
 
     # List buckets (empty result)
     handler = webserver.SequentialHandler()
@@ -590,9 +529,7 @@ def method(request):
         """)
     with webserver.install_http_handler(handler):
         dir_contents = gdal.ReadDir('/vsioss/')
-    if dir_contents != ['.']:
-        print(dir_contents)
-        return 'fail'
+    assert dir_contents == ['.']
 
     gdal.VSICurlClearCache()
 
@@ -610,9 +547,7 @@ def method(request):
         """)
     with webserver.install_http_handler(handler):
         dir_contents = gdal.ReadDir('/vsioss/')
-    if dir_contents != ['mybucket']:
-        print(dir_contents)
-        return 'fail'
+    assert dir_contents == ['mybucket']
 
     return 'success'
 
@@ -628,14 +563,12 @@ def test_visoss_4():
     with webserver.install_http_handler(webserver.SequentialHandler()):
         with gdaltest.error_handler():
             f = gdal.VSIFOpenL('/vsioss/oss_fake_bucket3', 'wb')
-    if f is not None:
-        return 'fail'
+    assert f is None
 
     handler = webserver.SequentialHandler()
     handler.add('GET', '/oss_fake_bucket3/empty_file.bin', 200, {'Connection': 'close'}, 'foo')
     with webserver.install_http_handler(handler):
-        if gdal.VSIStatL('/vsioss/oss_fake_bucket3/empty_file.bin').size != 3:
-            return 'fail'
+        assert gdal.VSIStatL('/vsioss/oss_fake_bucket3/empty_file.bin').size == 3
 
     # Empty file
     handler = webserver.SequentialHandler()
@@ -654,41 +587,34 @@ def method(request):
 
     with webserver.install_http_handler(handler):
         f = gdal.VSIFOpenL('/vsioss/oss_fake_bucket3/empty_file.bin', 'wb')
-        if f is None:
-            return 'fail'
+        assert f is not None
         gdal.ErrorReset()
         gdal.VSIFCloseL(f)
-    if gdal.GetLastErrorMsg() != '':
-        return 'fail'
+    assert gdal.GetLastErrorMsg() == ''
 
     handler = webserver.SequentialHandler()
     handler.add('GET', '/oss_fake_bucket3/empty_file.bin', 200, {'Connection': 'close'}, '')
     with webserver.install_http_handler(handler):
-        if gdal.VSIStatL('/vsioss/oss_fake_bucket3/empty_file.bin').size != 0:
-            return 'fail'
+        assert gdal.VSIStatL('/vsioss/oss_fake_bucket3/empty_file.bin').size == 0
 
     # Invalid seek
     handler = webserver.SequentialHandler()
     with webserver.install_http_handler(handler):
         f = gdal.VSIFOpenL('/vsioss/oss_fake_bucket3/empty_file.bin', 'wb')
-        if f is None:
-            return 'fail'
+        assert f is not None
         with gdaltest.error_handler():
             ret = gdal.VSIFSeekL(f, 1, 0)
-        if ret == 0:
-            return 'fail'
+        assert ret != 0
         gdal.VSIFCloseL(f)
 
     # Invalid read
     handler = webserver.SequentialHandler()
     with webserver.install_http_handler(handler):
         f = gdal.VSIFOpenL('/vsioss/oss_fake_bucket3/empty_file.bin', 'wb')
-        if f is None:
-            return 'fail'
+        assert f is not None
         with gdaltest.error_handler():
             ret = gdal.VSIFReadL(1, 1, f)
-        if ret:
-            return 'fail'
+        assert not ret
         gdal.VSIFCloseL(f)
 
     # Error case
@@ -696,31 +622,22 @@ def method(request):
     handler.add('PUT', '/oss_fake_bucket3/empty_file_error.bin', 403)
     with webserver.install_http_handler(handler):
         f = gdal.VSIFOpenL('/vsioss/oss_fake_bucket3/empty_file_error.bin', 'wb')
-        if f is None:
-            return 'fail'
+        assert f is not None
         gdal.ErrorReset()
         with gdaltest.error_handler():
             gdal.VSIFCloseL(f)
-    if gdal.GetLastErrorMsg() == '':
-        return 'fail'
+    assert gdal.GetLastErrorMsg() != ''
 
     # Nominal case
     with webserver.install_http_handler(webserver.SequentialHandler()):
         f = gdal.VSIFOpenL('/vsioss/oss_fake_bucket3/another_file.bin', 'wb')
-        if f is None:
-            return 'fail'
-        if gdal.VSIFSeekL(f, gdal.VSIFTellL(f), 0) != 0:
-            return 'fail'
-        if gdal.VSIFSeekL(f, 0, 1) != 0:
-            return 'fail'
-        if gdal.VSIFSeekL(f, 0, 2) != 0:
-            return 'fail'
-        if gdal.VSIFWriteL('foo', 1, 3, f) != 3:
-            return 'fail'
-        if gdal.VSIFSeekL(f, gdal.VSIFTellL(f), 0) != 0:
-            return 'fail'
-        if gdal.VSIFWriteL('bar', 1, 3, f) != 3:
-            return 'fail'
+        assert f is not None
+        assert gdal.VSIFSeekL(f, gdal.VSIFTellL(f), 0) == 0
+        assert gdal.VSIFSeekL(f, 0, 1) == 0
+        assert gdal.VSIFSeekL(f, 0, 2) == 0
+        assert gdal.VSIFWriteL('foo', 1, 3, f) == 3
+        assert gdal.VSIFSeekL(f, gdal.VSIFTellL(f), 0) == 0
+        assert gdal.VSIFWriteL('bar', 1, 3, f) == 3
 
     handler = webserver.SequentialHandler()
 
@@ -751,8 +668,7 @@ def method(request):
     gdal.ErrorReset()
     with webserver.install_http_handler(handler):
         gdal.VSIFCloseL(f)
-    if gdal.GetLastErrorMsg() != '':
-        return 'fail'
+    assert gdal.GetLastErrorMsg() == ''
 
     return 'success'
 
@@ -768,32 +684,27 @@ def test_visoss_5():
     with webserver.install_http_handler(webserver.SequentialHandler()):
         with gdaltest.error_handler():
             ret = gdal.Unlink('/vsioss/foo')
-    if ret == 0:
-        return 'fail'
+    assert ret != 0
 
     handler = webserver.SequentialHandler()
     handler.add('GET', '/oss_delete_bucket/delete_file', 200, {'Connection': 'close'}, 'foo')
     with webserver.install_http_handler(handler):
-        if gdal.VSIStatL('/vsioss/oss_delete_bucket/delete_file').size != 3:
-            return 'fail'
+        assert gdal.VSIStatL('/vsioss/oss_delete_bucket/delete_file').size == 3
 
     with webserver.install_http_handler(webserver.SequentialHandler()):
-        if gdal.VSIStatL('/vsioss/oss_delete_bucket/delete_file').size != 3:
-            return 'fail'
+        assert gdal.VSIStatL('/vsioss/oss_delete_bucket/delete_file').size == 3
 
     handler = webserver.SequentialHandler()
     handler.add('DELETE', '/oss_delete_bucket/delete_file', 204)
     with webserver.install_http_handler(handler):
         ret = gdal.Unlink('/vsioss/oss_delete_bucket/delete_file')
-    if ret != 0:
-        return 'fail'
+    assert ret == 0
 
     handler = webserver.SequentialHandler()
     handler.add('GET', '/oss_delete_bucket/delete_file', 404, {'Connection': 'close'}, 'foo')
     handler.add('GET', '/oss_delete_bucket/?delimiter=%2F&max-keys=100&prefix=delete_file%2F', 404, {'Connection': 'close'}, 'foo')
     with webserver.install_http_handler(handler):
-        if gdal.VSIStatL('/vsioss/oss_delete_bucket/delete_file') is not None:
-            return 'fail'
+        assert gdal.VSIStatL('/vsioss/oss_delete_bucket/delete_file') is None
 
     handler = webserver.SequentialHandler()
     handler.add('GET', '/oss_delete_bucket/delete_file_error', 200)
@@ -801,8 +712,7 @@ def test_visoss_5():
     with webserver.install_http_handler(handler):
         with gdaltest.error_handler():
             ret = gdal.Unlink('/vsioss/oss_delete_bucket/delete_file_error')
-    if ret == 0:
-        return 'fail'
+    assert ret != 0
 
     return 'success'
 
@@ -818,8 +728,7 @@ def test_visoss_6():
     with gdaltest.config_option('VSIOSS_CHUNK_SIZE', '1'):  # 1 MB
         with webserver.install_http_handler(webserver.SequentialHandler()):
             f = gdal.VSIFOpenL('/vsioss/oss_fake_bucket4/large_file.bin', 'wb')
-    if f is None:
-        return 'fail'
+    assert f is not None
     size = 1024 * 1024 + 1
     big_buffer = 'a' * size
 
@@ -852,8 +761,7 @@ def method(request):
 
     with webserver.install_http_handler(handler):
         ret = gdal.VSIFWriteL(big_buffer, 1, size, f)
-    if ret != size:
-        return 'fail'
+    assert ret == size
     handler = webserver.SequentialHandler()
 
     def method(request):
@@ -900,8 +808,7 @@ def method(request):
     gdal.ErrorReset()
     with webserver.install_http_handler(handler):
         gdal.VSIFCloseL(f)
-    if gdal.GetLastErrorMsg() != '':
-        return 'fail'
+    assert gdal.GetLastErrorMsg() == ''
 
     handler = webserver.SequentialHandler()
     handler.add('POST', '/oss_fake_bucket4/large_file_initiate_403_error.bin?uploads', 403)
@@ -915,17 +822,13 @@ def method(request):
                          '/vsioss/oss_fake_bucket4/large_file_initiate_no_uploadId.bin']:
             with gdaltest.config_option('VSIOSS_CHUNK_SIZE', '1'):  # 1 MB
                 f = gdal.VSIFOpenL(filename, 'wb')
-            if f is None:
-                return 'fail'
+            assert f is not None
             with gdaltest.error_handler():
                 ret = gdal.VSIFWriteL(big_buffer, 1, size, f)
-            if ret != 0:
-                print(ret)
-                return 'fail'
+            assert ret == 0
             gdal.ErrorReset()
             gdal.VSIFCloseL(f)
-            if gdal.GetLastErrorMsg() != '':
-                return 'fail'
+            assert gdal.GetLastErrorMsg() == ''
 
     handler = webserver.SequentialHandler()
     handler.add('POST', '/oss_fake_bucket4/large_file_upload_part_403_error.bin?uploads', 200, {},
@@ -943,20 +846,13 @@ def method(request):
                          '/vsioss/oss_fake_bucket4/large_file_upload_part_no_etag.bin']:
             with gdaltest.config_option('VSIOSS_CHUNK_SIZE', '1'):  # 1 MB
                 f = gdal.VSIFOpenL(filename, 'wb')
-            if f is None:
-                print(filename)
-                return 'fail'
+            assert f is not None, filename
             with gdaltest.error_handler():
                 ret = gdal.VSIFWriteL(big_buffer, 1, size, f)
-            if ret != 0:
-                print(filename)
-                print(ret)
-                return 'fail'
+            assert ret == 0, filename
             gdal.ErrorReset()
             gdal.VSIFCloseL(f)
-            if gdal.GetLastErrorMsg() != '':
-                print(filename)
-                return 'fail'
+            assert gdal.GetLastErrorMsg() == '', filename
 
     # Simulate failure in AbortMultipart stage
     handler = webserver.SequentialHandler()
@@ -969,21 +865,14 @@ def method(request):
     with webserver.install_http_handler(handler):
         with gdaltest.config_option('VSIOSS_CHUNK_SIZE', '1'):  # 1 MB
             f = gdal.VSIFOpenL(filename, 'wb')
-        if f is None:
-            print(filename)
-            return 'fail'
+        assert f is not None, filename
         with gdaltest.error_handler():
             ret = gdal.VSIFWriteL(big_buffer, 1, size, f)
-        if ret != 0:
-            print(filename)
-            print(ret)
-            return 'fail'
+        assert ret == 0, filename
         gdal.ErrorReset()
         with gdaltest.error_handler():
             gdal.VSIFCloseL(f)
-        if gdal.GetLastErrorMsg() == '':
-            print(filename)
-            return 'fail'
+        assert gdal.GetLastErrorMsg() != '', filename
 
     # Simulate failure in CompleteMultipartUpload stage
     handler = webserver.SequentialHandler()
@@ -998,20 +887,13 @@ def method(request):
     with webserver.install_http_handler(handler):
         with gdaltest.config_option('VSIOSS_CHUNK_SIZE', '1'):  # 1 MB
             f = gdal.VSIFOpenL(filename, 'wb')
-            if f is None:
-                print(filename)
-                return 'fail'
+            assert f is not None, filename
             ret = gdal.VSIFWriteL(big_buffer, 1, size, f)
-            if ret != size:
-                print(filename)
-                print(ret)
-                return 'fail'
+            assert ret == size, filename
             gdal.ErrorReset()
             with gdaltest.error_handler():
                 gdal.VSIFCloseL(f)
-            if gdal.GetLastErrorMsg() == '':
-                print(filename)
-                return 'fail'
+            assert gdal.GetLastErrorMsg() != '', filename
 
     return 'success'
 
@@ -1030,23 +912,20 @@ def test_visoss_7():
     handler.add('PUT', '/oss_bucket_test_mkdir/dir/', 200)
     with webserver.install_http_handler(handler):
         ret = gdal.Mkdir('/vsioss/oss_bucket_test_mkdir/dir', 0)
-    if ret != 0:
-        return 'fail'
+    assert ret == 0
 
     # Try creating already existing directory
     handler = webserver.SequentialHandler()
     handler.add('GET', '/oss_bucket_test_mkdir/dir/', 416)
     with webserver.install_http_handler(handler):
         ret = gdal.Mkdir('/vsioss/oss_bucket_test_mkdir/dir', 0)
-    if ret == 0:
-        return 'fail'
+    assert ret != 0
 
     handler = webserver.SequentialHandler()
     handler.add('DELETE', '/oss_bucket_test_mkdir/dir/', 204)
     with webserver.install_http_handler(handler):
         ret = gdal.Rmdir('/vsioss/oss_bucket_test_mkdir/dir')
-    if ret != 0:
-        return 'fail'
+    assert ret == 0
 
     # Try deleting already deleted directory
     handler = webserver.SequentialHandler()
@@ -1054,8 +933,7 @@ def test_visoss_7():
     handler.add('GET', '/oss_bucket_test_mkdir/?delimiter=%2F&max-keys=100&prefix=dir%2F', 404, {'Connection': 'close'})
     with webserver.install_http_handler(handler):
         ret = gdal.Rmdir('/vsioss/oss_bucket_test_mkdir/dir')
-    if ret == 0:
-        return 'fail'
+    assert ret != 0
 
     # Try deleting non-empty directory
     handler = webserver.SequentialHandler()
@@ -1074,8 +952,7 @@ def test_visoss_7():
                 """)
     with webserver.install_http_handler(handler):
         ret = gdal.Rmdir('/vsioss/oss_bucket_test_mkdir/dir_nonempty')
-    if ret == 0:
-        return 'fail'
+    assert ret != 0
 
     return 'success'
 
@@ -1107,19 +984,15 @@ def test_visoss_8():
 
     with webserver.install_http_handler(handler):
         listdir = gdal.ReadDir('/vsioss/visoss_8', 0)
-    if listdir != ['test', 'test/']:
-        print(listdir)
-        return 'fail'
+    assert listdir == ['test', 'test/']
 
     handler = webserver.SequentialHandler()
     with webserver.install_http_handler(handler):
-        if stat.S_ISDIR(gdal.VSIStatL('/vsioss/visoss_8/test').mode):
-            return 'fail'
+        assert not stat.S_ISDIR(gdal.VSIStatL('/vsioss/visoss_8/test').mode)
 
     handler = webserver.SequentialHandler()
     with webserver.install_http_handler(handler):
-        if not stat.S_ISDIR(gdal.VSIStatL('/vsioss/visoss_8/test/').mode):
-            return 'fail'
+        assert stat.S_ISDIR(gdal.VSIStatL('/vsioss/visoss_8/test/').mode)
 
     return 'success'
 
@@ -1164,113 +1037,80 @@ def visoss_extra_1():
     if OSS_RESOURCE.find('/') < 0:
         path = '/vsioss/' + OSS_RESOURCE
         statres = gdal.VSIStatL(path)
-        if statres is None or not stat.S_ISDIR(statres.mode):
-            print('%s is not a valid bucket' % path)
-            return 'fail'
+        assert statres is not None and stat.S_ISDIR(statres.mode), \
+            ('%s is not a valid bucket' % path)
 
         readdir = gdal.ReadDir(path)
-        if readdir is None:
-            print('ReadDir() should not return empty list')
-            return 'fail'
+        assert readdir is not None, 'ReadDir() should not return empty list'
         for filename in readdir:
             if filename != '.':
                 subpath = path + '/' + filename
-                if gdal.VSIStatL(subpath) is None:
-                    print('Stat(%s) should not return an error' % subpath)
-                    return 'fail'
+                assert gdal.VSIStatL(subpath) is not None, \
+                    ('Stat(%s) should not return an error' % subpath)
 
         unique_id = 'visoss_test'
         subpath = path + '/' + unique_id
         ret = gdal.Mkdir(subpath, 0)
-        if ret < 0:
-            print('Mkdir(%s) should not return an error' % subpath)
-            return 'fail'
+        assert ret >= 0, ('Mkdir(%s) should not return an error' % subpath)
 
         readdir = gdal.ReadDir(path)
-        if unique_id not in readdir:
-            print('ReadDir(%s) should contain %s' % (path, unique_id))
-            print(readdir)
-            return 'fail'
+        assert unique_id in readdir, \
+            ('ReadDir(%s) should contain %s' % (path, unique_id))
 
         ret = gdal.Mkdir(subpath, 0)
-        if ret == 0:
-            print('Mkdir(%s) repeated should return an error' % subpath)
-            return 'fail'
+        assert ret != 0, ('Mkdir(%s) repeated should return an error' % subpath)
 
         ret = gdal.Rmdir(subpath)
-        if ret < 0:
-            print('Rmdir(%s) should not return an error' % subpath)
-            return 'fail'
+        assert ret >= 0, ('Rmdir(%s) should not return an error' % subpath)
 
         readdir = gdal.ReadDir(path)
-        if unique_id in readdir:
-            print('ReadDir(%s) should not contain %s' % (path, unique_id))
-            print(readdir)
-            return 'fail'
+        assert unique_id not in readdir, \
+            ('ReadDir(%s) should not contain %s' % (path, unique_id))
 
         ret = gdal.Rmdir(subpath)
-        if ret == 0:
-            print('Rmdir(%s) repeated should return an error' % subpath)
-            return 'fail'
+        assert ret != 0, ('Rmdir(%s) repeated should return an error' % subpath)
 
         ret = gdal.Mkdir(subpath, 0)
-        if ret < 0:
-            print('Mkdir(%s) should not return an error' % subpath)
-            return 'fail'
+        assert ret >= 0, ('Mkdir(%s) should not return an error' % subpath)
 
         f = gdal.VSIFOpenL(subpath + '/test.txt', 'wb')
-        if f is None:
-            return 'fail'
+        assert f is not None
         gdal.VSIFWriteL('hello', 1, 5, f)
         gdal.VSIFCloseL(f)
 
         ret = gdal.Rmdir(subpath)
-        if ret == 0:
-            print('Rmdir(%s) on non empty directory should return an error' % subpath)
-            return 'fail'
+        assert ret != 0, \
+            ('Rmdir(%s) on non empty directory should return an error' % subpath)
 
         f = gdal.VSIFOpenL(subpath + '/test.txt', 'rb')
-        if f is None:
-            return 'fail'
+        assert f is not None
         data = gdal.VSIFReadL(1, 5, f).decode('utf-8')
-        if data != 'hello':
-            print(data)
-            return 'fail'
+        assert data == 'hello'
         gdal.VSIFCloseL(f)
 
         ret = gdal.Unlink(subpath + '/test.txt')
-        if ret < 0:
-            print('Unlink(%s) should not return an error' % (subpath + '/test.txt'))
-            return 'fail'
+        assert ret >= 0, \
+            ('Unlink(%s) should not return an error' % (subpath + '/test.txt'))
 
         ret = gdal.Rmdir(subpath)
-        if ret < 0:
-            print('Rmdir(%s) should not return an error' % subpath)
-            return 'fail'
+        assert ret >= 0, ('Rmdir(%s) should not return an error' % subpath)
 
         return 'success'
 
     f = open_for_read('/vsioss/' + OSS_RESOURCE)
-    if f is None:
-        print('cannot open %s' % ('/vsioss/' + OSS_RESOURCE))
-        return 'fail'
+    assert f is not None, ('cannot open %s' % ('/vsioss/' + OSS_RESOURCE))
     ret = gdal.VSIFReadL(1, 1, f)
     gdal.VSIFCloseL(f)
 
-    if len(ret) != 1:
-        print(ret)
-        return 'fail'
+    assert len(ret) == 1
 
     # Same with /vsioss_streaming/
     f = open_for_read('/vsioss_streaming/' + OSS_RESOURCE)
-    if f is None:
-        return 'fail'
+    assert f is not None
     ret = gdal.VSIFReadL(1, 1, f)
     gdal.VSIFCloseL(f)
 
-    if len(ret) != 1:
-        print(ret)
-        return 'fail'
+    assert len(ret) == 1
 
     if False:  # pylint: disable=using-constant-test
         # we actually try to read at read() time and bSetError = false:
@@ -1280,28 +1120,21 @@ def visoss_extra_1():
         with gdaltest.error_handler():
             gdal.VSIFReadL(1, 1, f)
         gdal.VSIFCloseL(f)
-        if gdal.VSIGetLastErrorMsg() == '':
-            print(gdal.VSIGetLastErrorMsg())
-            return 'fail'
+        assert gdal.VSIGetLastErrorMsg() != ''
 
     # Invalid resource
     gdal.ErrorReset()
     f = open_for_read('/vsioss_streaming/' + OSS_RESOURCE + '/invalid_resource.baz')
-    if f is not None:
-        print(gdal.VSIGetLastErrorMsg())
-        return 'fail'
+    assert f is None, gdal.VSIGetLastErrorMsg()
 
     # Test GetSignedURL()
     signed_url = gdal.GetSignedURL('/vsioss/' + OSS_RESOURCE)
     f = open_for_read('/vsicurl_streaming/' + signed_url)
-    if f is None:
-        return 'fail'
+    assert f is not None
     ret = gdal.VSIFReadL(1, 1, f)
     gdal.VSIFCloseL(f)
 
-    if len(ret) != 1:
-        print(ret)
-        return 'fail'
+    assert len(ret) == 1
 
     return 'success'
 
diff --git a/autotest/gcore/vsis3.py b/autotest/gcore/vsis3.py
index 01760b786f32..d2070ec83ea4 100755
--- a/autotest/gcore/vsis3.py
+++ b/autotest/gcore/vsis3.py
@@ -36,6 +36,7 @@
 
 import gdaltest
 import webserver
+import pytest
 
 
 def open_for_read(uri):
@@ -61,8 +62,7 @@ def test_vsis3_init():
     gdal.SetConfigOption('AWS_CONFIG_FILE', '')
     gdal.SetConfigOption('CPL_AWS_EC2_CREDENTIALS_URL', '')
 
-    if gdal.GetSignedURL('/vsis3/foo/bar') is not None:
-        return 'fail'
+    assert gdal.GetSignedURL('/vsis3/foo/bar') is None
 
     return 'success'
 
@@ -77,14 +77,10 @@ def test_vsis3_no_sign_request():
 
     with gdaltest.config_option('AWS_NO_SIGN_REQUEST', 'YES'):
         actual_url = gdal.GetActualURL('/vsis3/landsat-pds/L8/001/002/LC80010022016230LGN00/LC80010022016230LGN00_B1.TIF')
-        if actual_url != 'https://landsat-pds.s3.amazonaws.com/L8/001/002/LC80010022016230LGN00/LC80010022016230LGN00_B1.TIF':
-            print(actual_url)
-            return 'fail'
+        assert actual_url == 'https://landsat-pds.s3.amazonaws.com/L8/001/002/LC80010022016230LGN00/LC80010022016230LGN00_B1.TIF'
 
         actual_url = gdal.GetActualURL('/vsis3_streaming/landsat-pds/L8/001/002/LC80010022016230LGN00/LC80010022016230LGN00_B1.TIF')
-        if actual_url != 'https://landsat-pds.s3.amazonaws.com/L8/001/002/LC80010022016230LGN00/LC80010022016230LGN00_B1.TIF':
-            print(actual_url)
-            return 'fail'
+        assert actual_url == 'https://landsat-pds.s3.amazonaws.com/L8/001/002/LC80010022016230LGN00/LC80010022016230LGN00_B1.TIF'
 
         f = open_for_read('/vsis3/landsat-pds/L8/001/002/LC80010022016230LGN00/LC80010022016230LGN00_B1.TIF')
 
@@ -109,16 +105,12 @@ def test_vsis3_1():
     gdal.ErrorReset()
     with gdaltest.error_handler():
         f = open_for_read('/vsis3/foo/bar')
-    if f is not None or gdal.VSIGetLastErrorMsg().find('AWS_SECRET_ACCESS_KEY') < 0:
-        print(gdal.VSIGetLastErrorMsg())
-        return 'fail'
+    assert f is None and gdal.VSIGetLastErrorMsg().find('AWS_SECRET_ACCESS_KEY') >= 0
 
     gdal.ErrorReset()
     with gdaltest.error_handler():
         f = open_for_read('/vsis3_streaming/foo/bar')
-    if f is not None or gdal.VSIGetLastErrorMsg().find('AWS_SECRET_ACCESS_KEY') < 0:
-        print(gdal.VSIGetLastErrorMsg())
-        return 'fail'
+    assert f is None and gdal.VSIGetLastErrorMsg().find('AWS_SECRET_ACCESS_KEY') >= 0
 
     gdal.SetConfigOption('AWS_SECRET_ACCESS_KEY', 'AWS_SECRET_ACCESS_KEY')
 
@@ -126,9 +118,7 @@ def test_vsis3_1():
     gdal.ErrorReset()
     with gdaltest.error_handler():
         f = open_for_read('/vsis3/foo/bar')
-    if f is not None or gdal.VSIGetLastErrorMsg().find('AWS_ACCESS_KEY_ID') < 0:
-        print(gdal.VSIGetLastErrorMsg())
-        return 'fail'
+    assert f is None and gdal.VSIGetLastErrorMsg().find('AWS_ACCESS_KEY_ID') >= 0
 
     gdal.SetConfigOption('AWS_ACCESS_KEY_ID', 'AWS_ACCESS_KEY_ID')
 
@@ -147,9 +137,7 @@ def test_vsis3_1():
     gdal.ErrorReset()
     with gdaltest.error_handler():
         f = open_for_read('/vsis3_streaming/foo/bar.baz')
-    if f is not None or gdal.VSIGetLastErrorMsg() == '':
-        print(gdal.VSIGetLastErrorMsg())
-        return 'fail'
+    assert f is None and gdal.VSIGetLastErrorMsg() != ''
 
     return 'success'
 
@@ -211,36 +199,28 @@ def test_vsis3_2():
     signed_url = gdal.GetSignedURL('/vsis3/s3_fake_bucket/resource')
     expected_url_8080 = 'http://127.0.0.1:8080/s3_fake_bucket/resource?X-Amz-Algorithm=AWS4-HMAC-SHA256&X-Amz-Credential=AWS_ACCESS_KEY_ID%2F20150101%2Fus-east-1%2Fs3%2Faws4_request&X-Amz-Date=20150101T000000Z&X-Amz-Expires=3600&X-Amz-Signature=dca239dd95f72ff8c37c15c840afc54cd19bdb07f7aaee2223108b5b0ad35da8&X-Amz-SignedHeaders=host'
     expected_url_8081 = 'http://127.0.0.1:8081/s3_fake_bucket/resource?X-Amz-Algorithm=AWS4-HMAC-SHA256&X-Amz-Credential=AWS_ACCESS_KEY_ID%2F20150101%2Fus-east-1%2Fs3%2Faws4_request&X-Amz-Date=20150101T000000Z&X-Amz-Expires=3600&X-Amz-Signature=ef5216bc5971863414c69f6ca095276c0d62c0da97fa4f6ab80c30bd7fc146ac&X-Amz-SignedHeaders=host'
-    if signed_url not in (expected_url_8080, expected_url_8081):
-        print(signed_url)
-        return 'fail'
+    assert signed_url in (expected_url_8080, expected_url_8081)
 
     handler = webserver.SequentialHandler()
     handler.add('GET', '/s3_fake_bucket/resource', custom_method=get_s3_fake_bucket_resource_method)
 
     with webserver.install_http_handler(handler):
         f = open_for_read('/vsis3/s3_fake_bucket/resource')
-        if f is None:
-            return 'fail'
+        assert f is not None
         data = gdal.VSIFReadL(1, 4, f).decode('ascii')
         gdal.VSIFCloseL(f)
 
-        if data != 'foo':
-            print(data)
-            return 'fail'
+        assert data == 'foo'
 
     handler = webserver.SequentialHandler()
     handler.add('GET', '/s3_fake_bucket/resource', custom_method=get_s3_fake_bucket_resource_method)
     with webserver.install_http_handler(handler):
         f = open_for_read('/vsis3_streaming/s3_fake_bucket/resource')
-        if f is None:
-            return 'fail'
+        assert f is not None
         data = gdal.VSIFReadL(1, 4, f).decode('ascii')
         gdal.VSIFCloseL(f)
 
-    if data != 'foo':
-        print(data)
-        return 'fail'
+    assert data == 'foo'
 
     handler = webserver.SequentialHandler()
 
@@ -270,8 +250,7 @@ def method(request):
     with gdaltest.config_option('AWS_SESSION_TOKEN', 'AWS_SESSION_TOKEN'):
         with webserver.install_http_handler(handler):
             f = open_for_read('/vsis3/s3_fake_bucket_with_session_token/resource')
-            if f is None:
-                return 'fail'
+            assert f is not None
             data = gdal.VSIFReadL(1, 4, f).decode('ascii')
             gdal.VSIFCloseL(f)
 
@@ -381,8 +360,7 @@ def method(request):
     # Test region and endpoint 'redirects'
     with webserver.install_http_handler(handler):
         f = open_for_read('/vsis3/s3_fake_bucket/redirect')
-        if f is None:
-            return 'fail'
+        assert f is not None
         data = gdal.VSIFReadL(1, 4, f).decode('ascii')
         gdal.VSIFCloseL(f)
 
@@ -399,14 +377,11 @@ def method(request):
     handler.req_count = 0
     with webserver.install_http_handler(handler):
         f = open_for_read('/vsis3_streaming/s3_fake_bucket/redirect')
-        if f is None:
-            return 'fail'
+        assert f is not None
         data = gdal.VSIFReadL(1, 4, f).decode('ascii')
         gdal.VSIFCloseL(f)
 
-    if data != 'foo':
-        print(data)
-        return 'fail'
+    assert data == 'foo'
 
     handler = webserver.SequentialHandler()
 
@@ -433,9 +408,7 @@ def method(request):
     with webserver.install_http_handler(handler):
         with gdaltest.error_handler():
             f = open_for_read('/vsis3_streaming/s3_fake_bucket/non_xml_error')
-    if f is not None or gdal.VSIGetLastErrorMsg().find('bla') < 0:
-        print(gdal.VSIGetLastErrorMsg())
-        return 'fail'
+    assert f is None and gdal.VSIGetLastErrorMsg().find('bla') >= 0
 
     handler = webserver.SequentialHandler()
     response = '<?xml version="1.0" encoding="UTF-8"?><oops>'
@@ -448,9 +421,7 @@ def method(request):
     with webserver.install_http_handler(handler):
         with gdaltest.error_handler():
             f = open_for_read('/vsis3_streaming/s3_fake_bucket/invalid_xml_error')
-    if f is not None or gdal.VSIGetLastErrorMsg().find('<oops>') < 0:
-        print(gdal.VSIGetLastErrorMsg())
-        return 'fail'
+    assert f is None and gdal.VSIGetLastErrorMsg().find('<oops>') >= 0
 
     handler = webserver.SequentialHandler()
     response = '<?xml version="1.0" encoding="UTF-8"?><Error/>'
@@ -463,9 +434,7 @@ def method(request):
     with webserver.install_http_handler(handler):
         with gdaltest.error_handler():
             f = open_for_read('/vsis3_streaming/s3_fake_bucket/no_code_in_error')
-    if f is not None or gdal.VSIGetLastErrorMsg().find('<Error/>') < 0:
-        print(gdal.VSIGetLastErrorMsg())
-        return 'fail'
+    assert f is None and gdal.VSIGetLastErrorMsg().find('<Error/>') >= 0
 
     handler = webserver.SequentialHandler()
     response = '<?xml version="1.0" encoding="UTF-8"?><Error><Code>AuthorizationHeaderMalformed</Code></Error>'
@@ -478,9 +447,7 @@ def method(request):
     with webserver.install_http_handler(handler):
         with gdaltest.error_handler():
             f = open_for_read('/vsis3_streaming/s3_fake_bucket/no_region_in_AuthorizationHeaderMalformed_error')
-    if f is not None or gdal.VSIGetLastErrorMsg().find('<Error>') < 0:
-        print(gdal.VSIGetLastErrorMsg())
-        return 'fail'
+    assert f is None and gdal.VSIGetLastErrorMsg().find('<Error>') >= 0
 
     handler = webserver.SequentialHandler()
     response = '<?xml version="1.0" encoding="UTF-8"?><Error><Code>PermanentRedirect</Code></Error>'
@@ -493,9 +460,7 @@ def method(request):
     with webserver.install_http_handler(handler):
         with gdaltest.error_handler():
             f = open_for_read('/vsis3_streaming/s3_fake_bucket/no_endpoint_in_PermanentRedirect_error')
-    if f is not None or gdal.VSIGetLastErrorMsg().find('<Error>') < 0:
-        print(gdal.VSIGetLastErrorMsg())
-        return 'fail'
+    assert f is None and gdal.VSIGetLastErrorMsg().find('<Error>') >= 0
 
     handler = webserver.SequentialHandler()
     response = '<?xml version="1.0" encoding="UTF-8"?><Error><Code>bla</Code></Error>'
@@ -508,9 +473,7 @@ def method(request):
     with webserver.install_http_handler(handler):
         with gdaltest.error_handler():
             f = open_for_read('/vsis3_streaming/s3_fake_bucket/no_message_in_error')
-    if f is not None or gdal.VSIGetLastErrorMsg().find('<Error>') < 0:
-        print(gdal.VSIGetLastErrorMsg())
-        return 'fail'
+    assert f is None and gdal.VSIGetLastErrorMsg().find('<Error>') >= 0
 
     # Test with requester pays
     handler = webserver.SequentialHandler()
@@ -544,13 +507,11 @@ def method(request):
         with webserver.install_http_handler(handler):
             with gdaltest.error_handler():
                 f = open_for_read('/vsis3/s3_fake_bucket_with_requester_pays/resource')
-                if f is None:
-                    return 'fail'
+                assert f is not None
                 data = gdal.VSIFReadL(1, 3, f).decode('ascii')
                 gdal.VSIFCloseL(f)
 
-    if data != 'foo':
-        return 'fail'
+    assert data == 'foo'
 
     # Test temporary redirect
     handler = webserver.SequentialHandler()
@@ -597,14 +558,11 @@ def method_req_2(self, request):
 
     with webserver.install_http_handler(handler):
         f = open_for_read('/vsis3/s3_test_temporary_redirect_read/resource')
-        if f is None:
-            return 'fail'
+        assert f is not None
         data = gdal.VSIFReadL(1, 3, f).decode('ascii')
         gdal.VSIFCloseL(f)
 
-    if data != 'foo':
-        print(data)
-        return 'fail'
+    assert data == 'foo'
 
     # Retry on the same bucket and check that the redirection was indeed temporary
     handler = webserver.SequentialHandler()
@@ -615,14 +573,11 @@ def method_req_2(self, request):
 
     with webserver.install_http_handler(handler):
         f = open_for_read('/vsis3/s3_test_temporary_redirect_read/resource2')
-        if f is None:
-            return 'fail'
+        assert f is not None
         data = gdal.VSIFReadL(1, 3, f).decode('ascii')
         gdal.VSIFCloseL(f)
 
-    if data != 'bar':
-        print(data)
-        return 'fail'
+    assert data == 'bar'
 
     return 'success'
 
@@ -732,36 +687,26 @@ def method(request):
 
     with webserver.install_http_handler(webserver.SequentialHandler()):
         dir_contents = gdal.ReadDir('/vsis3/s3_fake_bucket2/a_dir')
-    if dir_contents != ['resource3.bin', 'resource4.bin', 'subdir']:
-        print(dir_contents)
-        return 'fail'
+    assert dir_contents == ['resource3.bin', 'resource4.bin', 'subdir']
 
-    if gdal.VSIStatL('/vsis3/s3_fake_bucket2/a_dir/resource3.bin').size != 123456:
-        return 'fail'
-    if gdal.VSIStatL('/vsis3/s3_fake_bucket2/a_dir/resource3.bin').mtime != 1:
-        return 'fail'
+    assert gdal.VSIStatL('/vsis3/s3_fake_bucket2/a_dir/resource3.bin').size == 123456
+    assert gdal.VSIStatL('/vsis3/s3_fake_bucket2/a_dir/resource3.bin').mtime == 1
 
     # Same as above: cached
     dir_contents = gdal.ReadDir('/vsis3/s3_fake_bucket2/a_dir')
-    if dir_contents != ['resource3.bin', 'resource4.bin', 'subdir']:
-        print(dir_contents)
-        return 'fail'
+    assert dir_contents == ['resource3.bin', 'resource4.bin', 'subdir']
 
     # ReadDir on something known to be a file shouldn't cause network access
     dir_contents = gdal.ReadDir('/vsis3/s3_fake_bucket2/a_dir/resource3.bin')
-    if dir_contents is not None:
-        return 'fail'
+    assert dir_contents is None
 
     # Test unrelated partial clear of the cache
     gdal.VSICurlPartialClearCache('/vsis3/s3_fake_bucket_unrelated')
 
-    if gdal.VSIStatL('/vsis3/s3_fake_bucket2/a_dir/resource3.bin').size != 123456:
-        return 'fail'
+    assert gdal.VSIStatL('/vsis3/s3_fake_bucket2/a_dir/resource3.bin').size == 123456
 
     dir_contents = gdal.ReadDir('/vsis3/s3_fake_bucket2/a_dir')
-    if dir_contents != ['resource3.bin', 'resource4.bin', 'subdir']:
-        print(dir_contents)
-        return 'fail'
+    assert dir_contents == ['resource3.bin', 'resource4.bin', 'subdir']
 
     # Test partial clear of the cache
     gdal.VSICurlPartialClearCache('/vsis3/s3_fake_bucket2/a_dir')
@@ -786,9 +731,7 @@ def method(request):
         """)
     with webserver.install_http_handler(handler):
         dir_contents = gdal.ReadDir('/vsis3/s3_fake_bucket2/a_dir')
-    if dir_contents != ['test.txt']:
-        print(dir_contents)
-        return 'fail'
+    assert dir_contents == ['test.txt']
 
     gdal.VSICurlClearCache()
     handler = webserver.SequentialHandler()
@@ -815,9 +758,7 @@ def method(request):
     with gdaltest.config_option('CPL_VSIL_CURL_IGNORE_GLACIER_STORAGE', 'NO'):
         with webserver.install_http_handler(handler):
             dir_contents = gdal.ReadDir('/vsis3/s3_fake_bucket2/a_dir')
-    if dir_contents != ['resource4.bin', 'i_am_a_glacier_file', 'subdir']:
-        print(dir_contents)
-        return 'fail'
+    assert dir_contents == ['resource4.bin', 'i_am_a_glacier_file', 'subdir']
 
 
     # Test CPL_VSIL_CURL_NON_CACHED
@@ -833,25 +774,17 @@ def method(request):
 
             with webserver.install_http_handler(handler):
                 f = open_for_read('/vsis3/s3_non_cached/test.txt')
-                if f is None:
-                    print(config_option_value)
-                    return 'fail'
+                assert f is not None, config_option_value
                 data = gdal.VSIFReadL(1, 3, f).decode('ascii')
                 gdal.VSIFCloseL(f)
-                if data != 'foo':
-                    print(config_option_value)
-                    print(data)
-                    return 'fail'
+                assert data == 'foo', config_option_value
 
             handler = webserver.SequentialHandler()
             handler.add('GET', '/s3_non_cached/test.txt', 200, {}, 'bar2')
 
             with webserver.install_http_handler(handler):
                 size = gdal.VSIStatL('/vsis3/s3_non_cached/test.txt').size
-            if size != 4:
-                print(config_option_value)
-                print(size)
-                return 'fail'
+            assert size == 4, config_option_value
 
             handler = webserver.SequentialHandler()
             handler.add('GET', '/s3_non_cached/test.txt', 200, {}, 'foo')
@@ -860,23 +793,17 @@ def method(request):
                 size = gdal.VSIStatL('/vsis3/s3_non_cached/test.txt').size
                 if size != 3:
                     print(config_option_value)
-                    print(data)
-                    return 'fail'
+                    pytest.fail(data)
 
             handler = webserver.SequentialHandler()
             handler.add('GET', '/s3_non_cached/test.txt', 200, {}, 'bar2')
 
             with webserver.install_http_handler(handler):
                 f = open_for_read('/vsis3/s3_non_cached/test.txt')
-                if f is None:
-                    print(config_option_value)
-                    return 'fail'
+                assert f is not None, config_option_value
                 data = gdal.VSIFReadL(1, 4, f).decode('ascii')
                 gdal.VSIFCloseL(f)
-                if data != 'bar2':
-                    print(config_option_value)
-                    print(data)
-                    return 'fail'
+                assert data == 'bar2', config_option_value
 
     # Retry without option
     for config_option_value in [None,
@@ -905,29 +832,19 @@ def method(request):
 
             with webserver.install_http_handler(handler):
                 f = open_for_read('/vsis3/s3_non_cached/test.txt')
-                if f is None:
-                    print(config_option_value)
-                    return 'fail'
+                assert f is not None, config_option_value
                 data = gdal.VSIFReadL(1, 3, f).decode('ascii')
                 gdal.VSIFCloseL(f)
-                if data != 'foo':
-                    print(config_option_value)
-                    print(data)
-                    return 'fail'
+                assert data == 'foo', config_option_value
 
             handler = webserver.SequentialHandler()
             with webserver.install_http_handler(handler):
                 f = open_for_read('/vsis3/s3_non_cached/test.txt')
-                if f is None:
-                    print(config_option_value)
-                    return 'fail'
+                assert f is not None, config_option_value
                 data = gdal.VSIFReadL(1, 4, f).decode('ascii')
                 gdal.VSIFCloseL(f)
                 # We should still get foo because of caching
-                if data != 'foo':
-                    print(config_option_value)
-                    print(data)
-                    return 'fail'
+                assert data == 'foo', config_option_value
 
     # List buckets (empty result)
     handler = webserver.SequentialHandler()
@@ -940,9 +857,7 @@ def method(request):
         """)
     with webserver.install_http_handler(handler):
         dir_contents = gdal.ReadDir('/vsis3/')
-    if dir_contents != ['.']:
-        print(dir_contents)
-        return 'fail'
+    assert dir_contents == ['.']
 
     gdal.VSICurlClearCache()
 
@@ -960,9 +875,7 @@ def method(request):
         """)
     with webserver.install_http_handler(handler):
         dir_contents = gdal.ReadDir('/vsis3/')
-    if dir_contents != ['mybucket']:
-        print(dir_contents)
-        return 'fail'
+    assert dir_contents == ['mybucket']
 
     # Test temporary redirect
     handler = webserver.SequentialHandler()
@@ -1017,9 +930,7 @@ def method_req_2(self, request):
 
     with webserver.install_http_handler(handler):
         dir_contents = gdal.ReadDir('/vsis3/s3_test_temporary_redirect_read_dir')
-    if dir_contents != ['test']:
-        print(dir_contents)
-        return 'fail'
+    assert dir_contents == ['test']
 
     # Retry on the same bucket and check that the redirection was indeed temporary
     handler = webserver.SequentialHandler()
@@ -1037,9 +948,7 @@ def method_req_2(self, request):
 
     with webserver.install_http_handler(handler):
         dir_contents = gdal.ReadDir('/vsis3/s3_test_temporary_redirect_read_dir/test')
-    if dir_contents != ['test2']:
-        print(dir_contents)
-        return 'fail'
+    assert dir_contents == ['test2']
 
     return 'success'
 
@@ -1078,39 +987,23 @@ def test_vsis3_opendir():
         """)
     with webserver.install_http_handler(handler):
         d = gdal.OpenDir('/vsis3/vsis3_opendir')
-    if d is None:
-        return 'fail'
+    assert d is not None
 
     entry = gdal.GetNextDirEntry(d)
-    if entry.name != 'test.txt':
-        print(entry.name)
-        return 'fail'
-    if entry.size != 40:
-        print(entry.size)
-        return 'fail'
-    if entry.mode != 32768:
-        print(entry.mode)
-        return 'fail'
-    if entry.mtime != 1:
-        print(entry.mtime)
-        return 'fail'
+    assert entry.name == 'test.txt'
+    assert entry.size == 40
+    assert entry.mode == 32768
+    assert entry.mtime == 1
 
     entry = gdal.GetNextDirEntry(d)
-    if entry.name != 'subdir':
-        print(entry.name)
-        return 'fail'
-    if entry.mode != 16384:
-        print(entry.mode)
-        return 'fail'
+    assert entry.name == 'subdir'
+    assert entry.mode == 16384
 
     entry = gdal.GetNextDirEntry(d)
-    if entry.name != 'subdir/test.txt':
-        print(entry.name)
-        return 'fail'
+    assert entry.name == 'subdir/test.txt'
 
     entry = gdal.GetNextDirEntry(d)
-    if entry is not None:
-        return 'fail'
+    assert entry is None
 
     gdal.CloseDir(d)
 
@@ -1133,34 +1026,20 @@ def test_vsis3_opendir():
         """)
     with webserver.install_http_handler(handler):
         d = gdal.OpenDir('/vsis3/vsis3_opendir', 0)
-    if d is None:
-        return 'fail'
+    assert d is not None
 
     entry = gdal.GetNextDirEntry(d)
-    if entry.name != 'test.txt':
-        print(entry.name)
-        return 'fail'
-    if entry.size != 40:
-        print(entry.size)
-        return 'fail'
-    if entry.mode != 32768:
-        print(entry.mode)
-        return 'fail'
-    if entry.mtime != 1:
-        print(entry.mtime)
-        return 'fail'
+    assert entry.name == 'test.txt'
+    assert entry.size == 40
+    assert entry.mode == 32768
+    assert entry.mtime == 1
 
     entry = gdal.GetNextDirEntry(d)
-    if entry.name != 'subdir':
-        print(entry.name)
-        return 'fail'
-    if entry.mode != 16384:
-        print(entry.mode)
-        return 'fail'
+    assert entry.name == 'subdir'
+    assert entry.mode == 16384
 
     entry = gdal.GetNextDirEntry(d)
-    if entry is not None:
-        return 'fail'
+    assert entry is None
 
     gdal.CloseDir(d)
 
@@ -1183,30 +1062,17 @@ def test_vsis3_opendir():
         """)
     with webserver.install_http_handler(handler):
         d = gdal.OpenDir('/vsis3/vsis3_opendir', 1)
-        if d is None:
-            return 'fail'
+        assert d is not None
 
     entry = gdal.GetNextDirEntry(d)
-    if entry.name != 'test.txt':
-        print(entry.name)
-        return 'fail'
-    if entry.size != 40:
-        print(entry.size)
-        return 'fail'
-    if entry.mode != 32768:
-        print(entry.mode)
-        return 'fail'
-    if entry.mtime != 1:
-        print(entry.mtime)
-        return 'fail'
+    assert entry.name == 'test.txt'
+    assert entry.size == 40
+    assert entry.mode == 32768
+    assert entry.mtime == 1
 
     entry = gdal.GetNextDirEntry(d)
-    if entry.name != 'subdir':
-        print(entry.name)
-        return 'fail'
-    if entry.mode != 16384:
-        print(entry.mode)
-        return 'fail'
+    assert entry.name == 'subdir'
+    assert entry.mode == 16384
 
     handler = webserver.SequentialHandler()
     handler.add('GET', '/vsis3_opendir/?delimiter=%2F&prefix=subdir%2F', 200, {'Content-type': 'application/xml'},
@@ -1223,13 +1089,10 @@ def test_vsis3_opendir():
         """)
     with webserver.install_http_handler(handler):
         entry = gdal.GetNextDirEntry(d)
-        if entry.name != 'subdir/test.txt':
-            print(entry.name)
-            return 'fail'
+        assert entry.name == 'subdir/test.txt'
 
     entry = gdal.GetNextDirEntry(d)
-    if entry is not None:
-        return 'fail'
+    assert entry is None
 
     gdal.CloseDir(d)
 
@@ -1249,14 +1112,12 @@ def test_vsis3_4():
     with webserver.install_http_handler(webserver.SequentialHandler()):
         with gdaltest.error_handler():
             f = gdal.VSIFOpenL('/vsis3/s3_fake_bucket3', 'wb')
-    if f is not None:
-        return 'fail'
+    assert f is None
 
     handler = webserver.SequentialHandler()
     handler.add('GET', '/s3_fake_bucket3/empty_file.bin', 200, {'Connection': 'close'}, 'foo')
     with webserver.install_http_handler(handler):
-        if gdal.VSIStatL('/vsis3/s3_fake_bucket3/empty_file.bin').size != 3:
-            return 'fail'
+        assert gdal.VSIStatL('/vsis3/s3_fake_bucket3/empty_file.bin').size == 3
 
     # Empty file
     handler = webserver.SequentialHandler()
@@ -1275,41 +1136,34 @@ def method(request):
 
     with webserver.install_http_handler(handler):
         f = gdal.VSIFOpenL('/vsis3/s3_fake_bucket3/empty_file.bin', 'wb')
-        if f is None:
-            return 'fail'
+        assert f is not None
         gdal.ErrorReset()
         gdal.VSIFCloseL(f)
-    if gdal.GetLastErrorMsg() != '':
-        return 'fail'
+    assert gdal.GetLastErrorMsg() == ''
 
     handler = webserver.SequentialHandler()
     handler.add('GET', '/s3_fake_bucket3/empty_file.bin', 200, {'Connection': 'close'}, '')
     with webserver.install_http_handler(handler):
-        if gdal.VSIStatL('/vsis3/s3_fake_bucket3/empty_file.bin').size != 0:
-            return 'fail'
+        assert gdal.VSIStatL('/vsis3/s3_fake_bucket3/empty_file.bin').size == 0
 
     # Invalid seek
     handler = webserver.SequentialHandler()
     with webserver.install_http_handler(handler):
         f = gdal.VSIFOpenL('/vsis3/s3_fake_bucket3/empty_file.bin', 'wb')
-        if f is None:
-            return 'fail'
+        assert f is not None
         with gdaltest.error_handler():
             ret = gdal.VSIFSeekL(f, 1, 0)
-        if ret == 0:
-            return 'fail'
+        assert ret != 0
         gdal.VSIFCloseL(f)
 
     # Invalid read
     handler = webserver.SequentialHandler()
     with webserver.install_http_handler(handler):
         f = gdal.VSIFOpenL('/vsis3/s3_fake_bucket3/empty_file.bin', 'wb')
-        if f is None:
-            return 'fail'
+        assert f is not None
         with gdaltest.error_handler():
             ret = gdal.VSIFReadL(1, 1, f)
-        if ret:
-            return 'fail'
+        assert not ret
         gdal.VSIFCloseL(f)
 
     # Error case
@@ -1317,31 +1171,22 @@ def method(request):
     handler.add('PUT', '/s3_fake_bucket3/empty_file_error.bin', 403)
     with webserver.install_http_handler(handler):
         f = gdal.VSIFOpenL('/vsis3/s3_fake_bucket3/empty_file_error.bin', 'wb')
-        if f is None:
-            return 'fail'
+        assert f is not None
         gdal.ErrorReset()
         with gdaltest.error_handler():
             gdal.VSIFCloseL(f)
-    if gdal.GetLastErrorMsg() == '':
-        return 'fail'
+    assert gdal.GetLastErrorMsg() != ''
 
     # Nominal case
     with webserver.install_http_handler(webserver.SequentialHandler()):
         f = gdal.VSIFOpenL('/vsis3/s3_fake_bucket3/another_file.bin', 'wb')
-        if f is None:
-            return 'fail'
-        if gdal.VSIFSeekL(f, gdal.VSIFTellL(f), 0) != 0:
-            return 'fail'
-        if gdal.VSIFSeekL(f, 0, 1) != 0:
-            return 'fail'
-        if gdal.VSIFSeekL(f, 0, 2) != 0:
-            return 'fail'
-        if gdal.VSIFWriteL('foo', 1, 3, f) != 3:
-            return 'fail'
-        if gdal.VSIFSeekL(f, gdal.VSIFTellL(f), 0) != 0:
-            return 'fail'
-        if gdal.VSIFWriteL('bar', 1, 3, f) != 3:
-            return 'fail'
+        assert f is not None
+        assert gdal.VSIFSeekL(f, gdal.VSIFTellL(f), 0) == 0
+        assert gdal.VSIFSeekL(f, 0, 1) == 0
+        assert gdal.VSIFSeekL(f, 0, 2) == 0
+        assert gdal.VSIFWriteL('foo', 1, 3, f) == 3
+        assert gdal.VSIFSeekL(f, gdal.VSIFTellL(f), 0) == 0
+        assert gdal.VSIFWriteL('bar', 1, 3, f) == 3
 
     handler = webserver.SequentialHandler()
 
@@ -1372,16 +1217,13 @@ def method(request):
     gdal.ErrorReset()
     with webserver.install_http_handler(handler):
         gdal.VSIFCloseL(f)
-    if gdal.GetLastErrorMsg() != '':
-        return 'fail'
+    assert gdal.GetLastErrorMsg() == ''
 
     # Redirect case
     with webserver.install_http_handler(webserver.SequentialHandler()):
         f = gdal.VSIFOpenL('/vsis3/s3_fake_bucket3/redirect', 'wb')
-        if f is None:
-            return 'fail'
-        if gdal.VSIFWriteL('foobar', 1, 6, f) != 6:
-            return 'fail'
+        assert f is not None
+        assert gdal.VSIFWriteL('foobar', 1, 6, f) == 6
 
     handler = webserver.SequentialHandler()
 
@@ -1425,8 +1267,7 @@ def method(request):
     gdal.ErrorReset()
     with webserver.install_http_handler(handler):
         gdal.VSIFCloseL(f)
-    if gdal.GetLastErrorMsg() != '':
-        return 'fail'
+    assert gdal.GetLastErrorMsg() == ''
 
     return 'success'
 
@@ -1442,33 +1283,28 @@ def test_vsis3_5():
     with webserver.install_http_handler(webserver.SequentialHandler()):
         with gdaltest.error_handler():
             ret = gdal.Unlink('/vsis3/foo')
-    if ret == 0:
-        return 'fail'
+    assert ret != 0
 
     handler = webserver.SequentialHandler()
     handler.add('GET', '/s3_delete_bucket/delete_file', 200, {'Connection': 'close'}, 'foo')
     with webserver.install_http_handler(handler):
-        if gdal.VSIStatL('/vsis3/s3_delete_bucket/delete_file').size != 3:
-            return 'fail'
+        assert gdal.VSIStatL('/vsis3/s3_delete_bucket/delete_file').size == 3
 
     handler = webserver.SequentialHandler()
     with webserver.install_http_handler(handler):
-        if gdal.VSIStatL('/vsis3/s3_delete_bucket/delete_file').size != 3:
-            return 'fail'
+        assert gdal.VSIStatL('/vsis3/s3_delete_bucket/delete_file').size == 3
 
     handler = webserver.SequentialHandler()
     handler.add('DELETE', '/s3_delete_bucket/delete_file', 204)
     with webserver.install_http_handler(handler):
         ret = gdal.Unlink('/vsis3/s3_delete_bucket/delete_file')
-    if ret != 0:
-        return 'fail'
+    assert ret == 0
 
     handler = webserver.SequentialHandler()
     handler.add('GET', '/s3_delete_bucket/delete_file', 404, {'Connection': 'close'})
     handler.add('GET', '/s3_delete_bucket/?delimiter=%2F&max-keys=100&prefix=delete_file%2F', 404, {'Connection': 'close'})
     with webserver.install_http_handler(handler):
-        if gdal.VSIStatL('/vsis3/s3_delete_bucket/delete_file') is not None:
-            return 'fail'
+        assert gdal.VSIStatL('/vsis3/s3_delete_bucket/delete_file') is None
 
     handler = webserver.SequentialHandler()
     handler.add('GET', '/s3_delete_bucket/delete_file_error', 200)
@@ -1476,8 +1312,7 @@ def test_vsis3_5():
     with webserver.install_http_handler(handler):
         with gdaltest.error_handler():
             ret = gdal.Unlink('/vsis3/s3_delete_bucket/delete_file_error')
-    if ret == 0:
-        return 'fail'
+    assert ret != 0
 
     handler = webserver.SequentialHandler()
 
@@ -1508,8 +1343,7 @@ def method(request):
 
     with webserver.install_http_handler(handler):
         ret = gdal.Unlink('/vsis3/s3_delete_bucket/redirect')
-    if ret != 0:
-        return 'fail'
+    assert ret == 0
 
     return 'success'
 
@@ -1525,8 +1359,7 @@ def test_vsis3_6():
     with gdaltest.config_option('VSIS3_CHUNK_SIZE', '1'):  # 1 MB
         with webserver.install_http_handler(webserver.SequentialHandler()):
             f = gdal.VSIFOpenL('/vsis3/s3_fake_bucket4/large_file.bin', 'wb')
-    if f is None:
-        return 'fail'
+    assert f is not None
     size = 1024 * 1024 + 1
     big_buffer = 'a' * size
 
@@ -1574,8 +1407,7 @@ def method(request):
 
     with webserver.install_http_handler(handler):
         ret = gdal.VSIFWriteL(big_buffer, 1, size, f)
-    if ret != size:
-        return 'fail'
+    assert ret == size
     handler = webserver.SequentialHandler()
 
     def method(request):
@@ -1622,8 +1454,7 @@ def method(request):
     gdal.ErrorReset()
     with webserver.install_http_handler(handler):
         gdal.VSIFCloseL(f)
-    if gdal.GetLastErrorMsg() != '':
-        return 'fail'
+    assert gdal.GetLastErrorMsg() == ''
 
     handler = webserver.SequentialHandler()
     handler.add('POST', '/s3_fake_bucket4/large_file_initiate_403_error.bin?uploads', 403)
@@ -1637,17 +1468,13 @@ def method(request):
                          '/vsis3/s3_fake_bucket4/large_file_initiate_no_uploadId.bin']:
             with gdaltest.config_option('VSIS3_CHUNK_SIZE', '1'):  # 1 MB
                 f = gdal.VSIFOpenL(filename, 'wb')
-            if f is None:
-                return 'fail'
+            assert f is not None
             with gdaltest.error_handler():
                 ret = gdal.VSIFWriteL(big_buffer, 1, size, f)
-            if ret != 0:
-                print(ret)
-                return 'fail'
+            assert ret == 0
             gdal.ErrorReset()
             gdal.VSIFCloseL(f)
-            if gdal.GetLastErrorMsg() != '':
-                return 'fail'
+            assert gdal.GetLastErrorMsg() == ''
 
     handler = webserver.SequentialHandler()
     handler.add('POST', '/s3_fake_bucket4/large_file_upload_part_403_error.bin?uploads', 200, {},
@@ -1665,20 +1492,13 @@ def method(request):
                          '/vsis3/s3_fake_bucket4/large_file_upload_part_no_etag.bin']:
             with gdaltest.config_option('VSIS3_CHUNK_SIZE', '1'):  # 1 MB
                 f = gdal.VSIFOpenL(filename, 'wb')
-            if f is None:
-                print(filename)
-                return 'fail'
+            assert f is not None, filename
             with gdaltest.error_handler():
                 ret = gdal.VSIFWriteL(big_buffer, 1, size, f)
-            if ret != 0:
-                print(filename)
-                print(ret)
-                return 'fail'
+            assert ret == 0, filename
             gdal.ErrorReset()
             gdal.VSIFCloseL(f)
-            if gdal.GetLastErrorMsg() != '':
-                print(filename)
-                return 'fail'
+            assert gdal.GetLastErrorMsg() == '', filename
 
     # Simulate failure in AbortMultipart stage
     handler = webserver.SequentialHandler()
@@ -1691,21 +1511,14 @@ def method(request):
     with webserver.install_http_handler(handler):
         with gdaltest.config_option('VSIS3_CHUNK_SIZE', '1'):  # 1 MB
             f = gdal.VSIFOpenL(filename, 'wb')
-        if f is None:
-            print(filename)
-            return 'fail'
+        assert f is not None, filename
         with gdaltest.error_handler():
             ret = gdal.VSIFWriteL(big_buffer, 1, size, f)
-        if ret != 0:
-            print(filename)
-            print(ret)
-            return 'fail'
+        assert ret == 0, filename
         gdal.ErrorReset()
         with gdaltest.error_handler():
             gdal.VSIFCloseL(f)
-        if gdal.GetLastErrorMsg() == '':
-            print(filename)
-            return 'fail'
+        assert gdal.GetLastErrorMsg() != '', filename
 
     # Simulate failure in CompleteMultipartUpload stage
     handler = webserver.SequentialHandler()
@@ -1720,20 +1533,13 @@ def method(request):
     with webserver.install_http_handler(handler):
         with gdaltest.config_option('VSIS3_CHUNK_SIZE', '1'):  # 1 MB
             f = gdal.VSIFOpenL(filename, 'wb')
-            if f is None:
-                print(filename)
-                return 'fail'
+            assert f is not None, filename
             ret = gdal.VSIFWriteL(big_buffer, 1, size, f)
-            if ret != size:
-                print(filename)
-                print(ret)
-                return 'fail'
+            assert ret == size, filename
             gdal.ErrorReset()
             with gdaltest.error_handler():
                 gdal.VSIFCloseL(f)
-            if gdal.GetLastErrorMsg() == '':
-                print(filename)
-                return 'fail'
+            assert gdal.GetLastErrorMsg() != '', filename
 
     return 'success'
 
@@ -1752,31 +1558,25 @@ def test_vsis3_7():
     handler.add('PUT', '/s3_bucket_test_mkdir/dir/', 200)
     with webserver.install_http_handler(handler):
         ret = gdal.Mkdir('/vsis3/s3_bucket_test_mkdir/dir', 0)
-    if ret != 0:
-        return 'fail'
+    assert ret == 0
 
-    if not stat.S_ISDIR(gdal.VSIStatL('/vsis3/s3_bucket_test_mkdir/dir').mode):
-        return 'fail'
+    assert stat.S_ISDIR(gdal.VSIStatL('/vsis3/s3_bucket_test_mkdir/dir').mode)
 
     dir_content = gdal.ReadDir('/vsis3/s3_bucket_test_mkdir/dir')
-    if dir_content != ['.']:
-        print(dir_content)
-        return 'fail'
+    assert dir_content == ['.']
 
     # Try creating already existing directory
     handler = webserver.SequentialHandler()
     handler.add('GET', '/s3_bucket_test_mkdir/dir/', 416, {'Connection': 'close'})
     with webserver.install_http_handler(handler):
         ret = gdal.Mkdir('/vsis3/s3_bucket_test_mkdir/dir', 0)
-    if ret == 0:
-        return 'fail'
+    assert ret != 0
 
     handler = webserver.SequentialHandler()
     handler.add('DELETE', '/s3_bucket_test_mkdir/dir/', 204)
     with webserver.install_http_handler(handler):
         ret = gdal.Rmdir('/vsis3/s3_bucket_test_mkdir/dir')
-    if ret != 0:
-        return 'fail'
+    assert ret == 0
 
     # Try deleting already deleted directory
     handler = webserver.SequentialHandler()
@@ -1784,8 +1584,7 @@ def test_vsis3_7():
     handler.add('GET', '/s3_bucket_test_mkdir/?delimiter=%2F&max-keys=100&prefix=dir%2F', 404, {'Connection': 'close'})
     with webserver.install_http_handler(handler):
         ret = gdal.Rmdir('/vsis3/s3_bucket_test_mkdir/dir')
-    if ret == 0:
-        return 'fail'
+    assert ret != 0
 
     # Try deleting non-empty directory
     handler = webserver.SequentialHandler()
@@ -1804,8 +1603,7 @@ def test_vsis3_7():
                 """)
     with webserver.install_http_handler(handler):
         ret = gdal.Rmdir('/vsis3/s3_bucket_test_mkdir/dir_nonempty')
-    if ret == 0:
-        return 'fail'
+    assert ret != 0
 
     # Try stat'ing a directory not ending with slash
     handler = webserver.SequentialHandler()
@@ -1823,8 +1621,7 @@ def test_vsis3_7():
                     </ListBucketResult>
                 """)
     with webserver.install_http_handler(handler):
-        if not stat.S_ISDIR(gdal.VSIStatL('/vsis3/s3_bucket_test_dir_stat/test_dir_stat').mode):
-            return 'fail'
+        assert stat.S_ISDIR(gdal.VSIStatL('/vsis3/s3_bucket_test_dir_stat/test_dir_stat').mode)
 
     # Try ReadDi'ing a directory not ending with slash
     handler = webserver.SequentialHandler()
@@ -1841,8 +1638,7 @@ def test_vsis3_7():
                     </ListBucketResult>
                 """)
     with webserver.install_http_handler(handler):
-        if gdal.ReadDir('/vsis3/s3_bucket_test_readdir/test_dirread') is None:
-            return 'fail'
+        assert gdal.ReadDir('/vsis3/s3_bucket_test_readdir/test_dirread') is not None
 
     # Try stat'ing a directory ending with slash
     handler = webserver.SequentialHandler()
@@ -1860,8 +1656,7 @@ def test_vsis3_7():
                     </ListBucketResult>
                 """)
     with webserver.install_http_handler(handler):
-        if not stat.S_ISDIR(gdal.VSIStatL('/vsis3/s3_bucket_test_dir_stat_2/test_dir_stat/').mode):
-            return 'fail'
+        assert stat.S_ISDIR(gdal.VSIStatL('/vsis3/s3_bucket_test_dir_stat_2/test_dir_stat/').mode)
 
     # Try ReadDi'ing a directory ending with slash
     handler = webserver.SequentialHandler()
@@ -1878,8 +1673,7 @@ def test_vsis3_7():
                     </ListBucketResult>
                 """)
     with webserver.install_http_handler(handler):
-        if gdal.ReadDir('/vsis3/s3_bucket_test_readdir2/test_dirread') is None:
-            return 'fail'
+        assert gdal.ReadDir('/vsis3/s3_bucket_test_readdir2/test_dirread') is not None
 
     return 'success'
 
@@ -1911,19 +1705,15 @@ def test_vsis3_8():
 
     with webserver.install_http_handler(handler):
         listdir = gdal.ReadDir('/vsis3/vsis3_8', 0)
-    if listdir != ['test', 'test/']:
-        print(listdir)
-        return 'fail'
+    assert listdir == ['test', 'test/']
 
     handler = webserver.SequentialHandler()
     with webserver.install_http_handler(handler):
-        if stat.S_ISDIR(gdal.VSIStatL('/vsis3/vsis3_8/test').mode):
-            return 'fail'
+        assert not stat.S_ISDIR(gdal.VSIStatL('/vsis3/vsis3_8/test').mode)
 
     handler = webserver.SequentialHandler()
     with webserver.install_http_handler(handler):
-        if not stat.S_ISDIR(gdal.VSIStatL('/vsis3/vsis3_8/test/').mode):
-            return 'fail'
+        assert stat.S_ISDIR(gdal.VSIStatL('/vsis3/vsis3_8/test/').mode)
 
     return 'success'
 
@@ -1943,8 +1733,7 @@ def test_vsis3_sync_etag():
     with gdaltest.error_handler():
         handler = webserver.SequentialHandler()
         with webserver.install_http_handler(handler):
-            if gdal.Sync('/i_do/not/exist', '/vsis3/', options=options):
-                return 'fail'
+            assert not gdal.Sync('/i_do/not/exist', '/vsis3/', options=options)
 
     with gdaltest.error_handler():
         handler = webserver.SequentialHandler()
@@ -1952,8 +1741,7 @@ def test_vsis3_sync_etag():
         handler.add('GET', '/do_not/?delimiter=%2F&max-keys=100&prefix=exist%2F', 404)
         handler.add('PUT', '/do_not/exist', 404)
         with webserver.install_http_handler(handler):
-            if gdal.Sync('vsifile.py', '/vsis3/do_not/exist', options=options):
-                return 'fail'
+            assert not gdal.Sync('vsifile.py', '/vsis3/do_not/exist', options=options)
 
     handler = webserver.SequentialHandler()
     handler.add('GET', '/out/', 200)
@@ -1987,14 +1775,12 @@ def method(request):
 
     gdal.FileFromMemBuffer('/vsimem/testsync.txt', 'foo')
     with webserver.install_http_handler(handler):
-        if not gdal.Sync('/vsimem/testsync.txt', '/vsis3/out', options=options):
-            return 'fail'
+        assert gdal.Sync('/vsimem/testsync.txt', '/vsis3/out', options=options)
 
     # Re-try with cached ETag. Should generate no network access
     handler = webserver.SequentialHandler()
     with webserver.install_http_handler(handler):
-        if not gdal.Sync('/vsimem/testsync.txt', '/vsis3/out', options=options):
-            return 'fail'
+        assert gdal.Sync('/vsimem/testsync.txt', '/vsis3/out', options=options)
 
     gdal.VSICurlClearCache()
 
@@ -2005,13 +1791,11 @@ def method(request):
                   'Content-Range': 'bytes 0-2/3',
                   'ETag' : '"acbd18db4cc2f85cedef654fccc4a4d8"' }, "foo")
     with webserver.install_http_handler(handler):
-        if not gdal.Sync( '/vsis3/out/testsync.txt', '/vsimem/', options=options):
-            return 'fail'
+        assert gdal.Sync( '/vsis3/out/testsync.txt', '/vsimem/', options=options)
 
     # Shouldn't do any copy, but hard to verify
     with webserver.install_http_handler(webserver.SequentialHandler()):
-        if not gdal.Sync( '/vsis3/out/testsync.txt', '/vsimem/', options=options):
-            return 'fail'
+        assert gdal.Sync( '/vsis3/out/testsync.txt', '/vsimem/', options=options)
 
     # Modify target file, and redo synchronization
     gdal.FileFromMemBuffer('/vsimem/testsync.txt', 'bar')
@@ -2034,14 +1818,12 @@ def method(request):
                   'Content-Range': 'bytes 0-2/3',
                   'ETag' : '"acbd18db4cc2f85cedef654fccc4a4d8"' }, "foo")
     with webserver.install_http_handler(handler):
-        if not gdal.Sync( '/vsis3/out/testsync.txt', '/vsimem/', options=options):
-            return 'fail'
+        assert gdal.Sync( '/vsis3/out/testsync.txt', '/vsimem/', options=options)
 
     f = gdal.VSIFOpenL('/vsimem/testsync.txt', 'rb')
     data = gdal.VSIFReadL(1, 3, f).decode('ascii')
     gdal.VSIFCloseL(f)
-    if data != 'foo':
-        return 'fail'
+    assert data == 'foo'
 
     # /vsimem to S3, but after cleaning the cache
     gdal.VSICurlClearCache()
@@ -2053,8 +1835,7 @@ def method(request):
                   'Content-Range': 'bytes 0-2/3',
                   'ETag' : '"acbd18db4cc2f85cedef654fccc4a4d8"' }, "foo")
     with webserver.install_http_handler(handler):
-        if not gdal.Sync('/vsimem/testsync.txt', '/vsis3/out', options=options):
-            return 'fail'
+        assert gdal.Sync('/vsimem/testsync.txt', '/vsis3/out', options=options)
 
     gdal.Unlink('/vsimem/testsync.txt')
 
@@ -2077,8 +1858,7 @@ def method(request):
                     </ListBucketResult>
                 """)
     with webserver.install_http_handler(handler):
-        if not gdal.Sync('/vsimem/subdir/', '/vsis3/out', options=options):
-            return 'fail'
+        assert gdal.Sync('/vsimem/subdir/', '/vsis3/out', options=options)
     gdal.RmdirRecursive('/vsimem/subdir')
 
     return 'success'
@@ -2109,9 +1889,8 @@ def test_vsis3_sync_timestamp():
                   'Content-Range': 'bytes 0-2/3',
                   'Last-Modified': 'Mon, 01 Jan 1970 00:00:01 GMT' }, "foo")
     with webserver.install_http_handler(handler):
-        if not gdal.Sync( '/vsis3/out/testsync.txt', '/vsimem/',
-                         options=options):
-            return 'fail'
+        assert gdal.Sync( '/vsis3/out/testsync.txt', '/vsimem/',
+                         options=options)
 
     # S3 to local: S3 file is newer -> do nothing
     gdal.VSICurlClearCache()
@@ -2121,9 +1900,8 @@ def test_vsis3_sync_timestamp():
                   'Content-Range': 'bytes 0-2/3',
                   'Last-Modified': 'Mon, 01 Jan 2037 00:00:01 GMT' }, "foo")
     with webserver.install_http_handler(handler):
-        if not gdal.Sync( '/vsis3/out/testsync.txt', '/vsimem/',
-                         options=options):
-            return 'fail'
+        assert gdal.Sync( '/vsis3/out/testsync.txt', '/vsimem/',
+                         options=options)
 
     # Local to S3: S3 file is older -> upload
     gdal.VSICurlClearCache()
@@ -2134,9 +1912,8 @@ def test_vsis3_sync_timestamp():
                   'Last-Modified': 'Mon, 01 Jan 1970 00:00:01 GMT' }, "foo")
     handler.add('PUT', '/out/testsync.txt', 200)
     with webserver.install_http_handler(handler):
-        if not gdal.Sync( '/vsimem/testsync.txt', '/vsis3/out/testsync.txt',
-                         options=options):
-            return 'fail'
+        assert gdal.Sync( '/vsimem/testsync.txt', '/vsis3/out/testsync.txt',
+                         options=options)
 
     # Local to S3: S3 file is newer -> do nothgin
     gdal.VSICurlClearCache()
@@ -2146,9 +1923,8 @@ def test_vsis3_sync_timestamp():
                   'Content-Range': 'bytes 0-2/3',
                   'Last-Modified': 'Mon, 01 Jan 2037 00:00:01 GMT' }, "foo")
     with webserver.install_http_handler(handler):
-        if not gdal.Sync( '/vsimem/testsync.txt', '/vsis3/out/testsync.txt',
-                         options=options):
-            return 'fail'
+        assert gdal.Sync( '/vsimem/testsync.txt', '/vsis3/out/testsync.txt',
+                         options=options)
 
     gdal.Unlink('/vsimem/testsync.txt')
 
@@ -2186,14 +1962,11 @@ def test_vsis3_read_credentials_file():
     handler.add('GET', '/s3_fake_bucket/resource', custom_method=get_s3_fake_bucket_resource_method)
     with webserver.install_http_handler(handler):
         f = open_for_read('/vsis3/s3_fake_bucket/resource')
-        if f is None:
-            return 'fail'
+        assert f is not None
         data = gdal.VSIFReadL(1, 4, f).decode('ascii')
         gdal.VSIFCloseL(f)
 
-    if data != 'foo':
-        print(data)
-        return 'fail'
+    assert data == 'foo'
 
     gdal.SetConfigOption('CPL_AWS_CREDENTIALS_FILE', '')
     gdal.Unlink('/vsimem/aws_credentials')
@@ -2233,14 +2006,11 @@ def test_vsis3_read_config_file():
     handler.add('GET', '/s3_fake_bucket/resource', custom_method=get_s3_fake_bucket_resource_method)
     with webserver.install_http_handler(handler):
         f = open_for_read('/vsis3/s3_fake_bucket/resource')
-        if f is None:
-            return 'fail'
+        assert f is not None
         data = gdal.VSIFReadL(1, 4, f).decode('ascii')
         gdal.VSIFCloseL(f)
 
-    if data != 'foo':
-        print(data)
-        return 'fail'
+    assert data == 'foo'
 
     gdal.SetConfigOption('AWS_CONFIG_FILE', '')
     gdal.Unlink('/vsimem/aws_config')
@@ -2293,14 +2063,11 @@ def test_vsis3_read_credentials_config_file():
     handler.add('GET', '/s3_fake_bucket/resource', custom_method=get_s3_fake_bucket_resource_method)
     with webserver.install_http_handler(handler):
         f = open_for_read('/vsis3/s3_fake_bucket/resource')
-        if f is None:
-            return 'fail'
+        assert f is not None
         data = gdal.VSIFReadL(1, 4, f).decode('ascii')
         gdal.VSIFCloseL(f)
 
-    if data != 'foo':
-        print(data)
-        return 'fail'
+    assert data == 'foo'
 
     gdal.SetConfigOption('CPL_AWS_CREDENTIALS_FILE', '')
     gdal.Unlink('/vsimem/aws_credentials')
@@ -2355,14 +2122,11 @@ def test_vsis3_read_credentials_config_file_non_default():
     handler.add('GET', '/s3_fake_bucket/resource', custom_method=get_s3_fake_bucket_resource_method)
     with webserver.install_http_handler(handler):
         f = open_for_read('/vsis3/s3_fake_bucket/resource')
-        if f is None:
-            return 'fail'
+        assert f is not None
         data = gdal.VSIFReadL(1, 4, f).decode('ascii')
         gdal.VSIFCloseL(f)
 
-    if data != 'foo':
-        print(data)
-        return 'fail'
+    assert data == 'foo'
 
     gdal.SetConfigOption('CPL_AWS_CREDENTIALS_FILE', '')
     gdal.Unlink('/vsimem/aws_credentials')
@@ -2420,17 +2184,12 @@ def test_vsis3_read_credentials_config_file_inconsistent():
     with webserver.install_http_handler(handler):
         with gdaltest.error_handler():
             f = open_for_read('/vsis3/s3_fake_bucket/resource')
-        if f is None:
-            return 'fail'
-        if gdal.GetLastErrorMsg() == '':
-            # Expected 'aws_access_key_id defined in both /vsimem/aws_credentials and /vsimem/aws_config'
-            return 'fail'
+        assert f is not None
+        assert gdal.GetLastErrorMsg() != ''
         data = gdal.VSIFReadL(1, 4, f).decode('ascii')
         gdal.VSIFCloseL(f)
 
-    if data != 'foo':
-        print(data)
-        return 'fail'
+    assert data == 'foo'
 
     gdal.SetConfigOption('CPL_AWS_CREDENTIALS_FILE', '')
     gdal.Unlink('/vsimem/aws_credentials')
@@ -2474,14 +2233,11 @@ def test_vsis3_read_credentials_ec2():
     handler.add('GET', '/s3_fake_bucket/resource', custom_method=get_s3_fake_bucket_resource_method)
     with webserver.install_http_handler(handler):
         f = open_for_read('/vsis3/s3_fake_bucket/resource')
-        if f is None:
-            return 'fail'
+        assert f is not None
         data = gdal.VSIFReadL(1, 4, f).decode('ascii')
         gdal.VSIFCloseL(f)
 
-    if data != 'foo':
-        print(data)
-        return 'fail'
+    assert data == 'foo'
 
     # Set a fake URL to check that credentials re-use works
     gdal.SetConfigOption('CPL_AWS_EC2_CREDENTIALS_URL', '')
@@ -2490,14 +2246,11 @@ def test_vsis3_read_credentials_ec2():
     handler.add('GET', '/s3_fake_bucket/bar', 200, {}, 'bar')
     with webserver.install_http_handler(handler):
         f = open_for_read('/vsis3/s3_fake_bucket/bar')
-        if f is None:
-            return 'fail'
+        assert f is not None
         data = gdal.VSIFReadL(1, 4, f).decode('ascii')
         gdal.VSIFCloseL(f)
 
-    if data != 'bar':
-        print(data)
-        return 'fail'
+    assert data == 'bar'
 
     gdal.SetConfigOption('CPL_AWS_EC2_CREDENTIALS_URL', '')
     gdal.SetConfigOption('CPL_AWS_AUTODETECT_EC2', None)
@@ -2540,22 +2293,18 @@ def test_vsis3_read_credentials_ec2_expiration():
     handler.add('GET', '/s3_fake_bucket/resource', custom_method=get_s3_fake_bucket_resource_method)
     with webserver.install_http_handler(handler):
         f = open_for_read('/vsis3/s3_fake_bucket/resource')
-        if f is None:
-            return 'fail'
+        assert f is not None
         data = gdal.VSIFReadL(1, 4, f).decode('ascii')
         gdal.VSIFCloseL(f)
 
-    if data != 'foo':
-        print(data)
-        return 'fail'
+    assert data == 'foo'
 
     # Set a fake URL to demonstrate we try to re-fetch credentials
     gdal.SetConfigOption('CPL_AWS_EC2_CREDENTIALS_URL', '')
 
     with gdaltest.error_handler():
         f = open_for_read('/vsis3/s3_fake_bucket/bar')
-    if f is not None:
-        return 'fail'
+    assert f is None
 
     gdal.SetConfigOption('CPL_AWS_EC2_CREDENTIALS_URL', '')
     gdal.SetConfigOption('CPL_AWS_AUTODETECT_EC2', None)
@@ -2607,113 +2356,80 @@ def vsis3_extra_1():
     if s3_resource.find('/') < 0:
         path = '/vsis3/' + s3_resource
         statres = gdal.VSIStatL(path)
-        if statres is None or not stat.S_ISDIR(statres.mode):
-            print('%s is not a valid bucket' % path)
-            return 'fail'
+        assert statres is not None and stat.S_ISDIR(statres.mode), \
+            ('%s is not a valid bucket' % path)
 
         readdir = gdal.ReadDir(path)
-        if readdir is None:
-            print('ReadDir() should not return empty list')
-            return 'fail'
+        assert readdir is not None, 'ReadDir() should not return empty list'
         for filename in readdir:
             if filename != '.':
                 subpath = path + '/' + filename
-                if gdal.VSIStatL(subpath) is None:
-                    print('Stat(%s) should not return an error' % subpath)
-                    return 'fail'
+                assert gdal.VSIStatL(subpath) is not None, \
+                    ('Stat(%s) should not return an error' % subpath)
 
         unique_id = 'vsis3_test'
         subpath = path + '/' + unique_id
         ret = gdal.Mkdir(subpath, 0)
-        if ret < 0:
-            print('Mkdir(%s) should not return an error' % subpath)
-            return 'fail'
+        assert ret >= 0, ('Mkdir(%s) should not return an error' % subpath)
 
         readdir = gdal.ReadDir(path)
-        if unique_id not in readdir:
-            print('ReadDir(%s) should contain %s' % (path, unique_id))
-            print(readdir)
-            return 'fail'
+        assert unique_id in readdir, \
+            ('ReadDir(%s) should contain %s' % (path, unique_id))
 
         ret = gdal.Mkdir(subpath, 0)
-        if ret == 0:
-            print('Mkdir(%s) repeated should return an error' % subpath)
-            return 'fail'
+        assert ret != 0, ('Mkdir(%s) repeated should return an error' % subpath)
 
         ret = gdal.Rmdir(subpath)
-        if ret < 0:
-            print('Rmdir(%s) should not return an error' % subpath)
-            return 'fail'
+        assert ret >= 0, ('Rmdir(%s) should not return an error' % subpath)
 
         readdir = gdal.ReadDir(path)
-        if unique_id in readdir:
-            print('ReadDir(%s) should not contain %s' % (path, unique_id))
-            print(readdir)
-            return 'fail'
+        assert unique_id not in readdir, \
+            ('ReadDir(%s) should not contain %s' % (path, unique_id))
 
         ret = gdal.Rmdir(subpath)
-        if ret == 0:
-            print('Rmdir(%s) repeated should return an error' % subpath)
-            return 'fail'
+        assert ret != 0, ('Rmdir(%s) repeated should return an error' % subpath)
 
         ret = gdal.Mkdir(subpath, 0)
-        if ret < 0:
-            print('Mkdir(%s) should not return an error' % subpath)
-            return 'fail'
+        assert ret >= 0, ('Mkdir(%s) should not return an error' % subpath)
 
         f = gdal.VSIFOpenL(subpath + '/test.txt', 'wb')
-        if f is None:
-            return 'fail'
+        assert f is not None
         gdal.VSIFWriteL('hello', 1, 5, f)
         gdal.VSIFCloseL(f)
 
         ret = gdal.Rmdir(subpath)
-        if ret == 0:
-            print('Rmdir(%s) on non empty directory should return an error' % subpath)
-            return 'fail'
+        assert ret != 0, \
+            ('Rmdir(%s) on non empty directory should return an error' % subpath)
 
         f = gdal.VSIFOpenL(subpath + '/test.txt', 'rb')
-        if f is None:
-            return 'fail'
+        assert f is not None
         data = gdal.VSIFReadL(1, 5, f).decode('utf-8')
-        if data != 'hello':
-            print(data)
-            return 'fail'
+        assert data == 'hello'
         gdal.VSIFCloseL(f)
 
         ret = gdal.Unlink(subpath + '/test.txt')
-        if ret < 0:
-            print('Unlink(%s) should not return an error' % (subpath + '/test.txt'))
-            return 'fail'
+        assert ret >= 0, \
+            ('Unlink(%s) should not return an error' % (subpath + '/test.txt'))
 
         ret = gdal.Rmdir(subpath)
-        if ret < 0:
-            print('Rmdir(%s) should not return an error' % subpath)
-            return 'fail'
+        assert ret >= 0, ('Rmdir(%s) should not return an error' % subpath)
 
         return 'success'
 
     f = open_for_read('/vsis3/' + s3_resource)
-    if f is None:
-        print('cannot open %s' % ('/vsis3/' + s3_resource))
-        return 'fail'
+    assert f is not None, ('cannot open %s' % ('/vsis3/' + s3_resource))
     ret = gdal.VSIFReadL(1, 1, f)
     gdal.VSIFCloseL(f)
 
-    if len(ret) != 1:
-        print(ret)
-        return 'fail'
+    assert len(ret) == 1
 
     # Same with /vsis3_streaming/
     f = open_for_read('/vsis3_streaming/' + s3_resource)
-    if f is None:
-        return 'fail'
+    assert f is not None
     ret = gdal.VSIFReadL(1, 1, f)
     gdal.VSIFCloseL(f)
 
-    if len(ret) != 1:
-        print(ret)
-        return 'fail'
+    assert len(ret) == 1
 
     if False:  # pylint: disable=using-constant-test
         # we actually try to read at read() time and bSetError = false
@@ -2723,28 +2439,21 @@ def vsis3_extra_1():
         with gdaltest.error_handler():
             gdal.VSIFReadL(1, 1, f)
         gdal.VSIFCloseL(f)
-        if gdal.VSIGetLastErrorMsg() == '':
-            print(gdal.VSIGetLastErrorMsg())
-            return 'fail'
+        assert gdal.VSIGetLastErrorMsg() != ''
 
     # Invalid resource
     gdal.ErrorReset()
     f = open_for_read('/vsis3_streaming/' + gdal.GetConfigOption('S3_RESOURCE') + '/invalid_resource.baz')
-    if f is not None:
-        print(gdal.VSIGetLastErrorMsg())
-        return 'fail'
+    assert f is None, gdal.VSIGetLastErrorMsg()
 
     # Test GetSignedURL()
     signed_url = gdal.GetSignedURL('/vsis3/' + s3_resource)
     f = open_for_read('/vsicurl_streaming/' + signed_url)
-    if f is None:
-        return 'fail'
+    assert f is not None
     ret = gdal.VSIFReadL(1, 1, f)
     gdal.VSIFCloseL(f)
 
-    if len(ret) != 1:
-        print(ret)
-        return 'fail'
+    assert len(ret) == 1
 
     return 'success'
 
diff --git a/autotest/gcore/vsistdin.py b/autotest/gcore/vsistdin.py
index be4e7d88f767..a336471c6262 100755
--- a/autotest/gcore/vsistdin.py
+++ b/autotest/gcore/vsistdin.py
@@ -56,10 +56,8 @@ def test_vsistdin_1():
     gdal.Unlink("tmp/vsistdin_1_src.tif")
 
     ds = gdal.Open("tmp/vsistdin_1_out.tif")
-    if ds is None:
-        return 'fail'
-    if ds.GetRasterBand(1).Checksum() != cs:
-        return 'fail'
+    assert ds is not None
+    assert ds.GetRasterBand(1).Checksum() == cs
 
     gdal.Unlink("tmp/vsistdin_1_out.tif")
 
@@ -82,8 +80,7 @@ def test_vsistdin_2():
     gdal.Unlink("tmp/vsistdin_2_src.tif")
 
     ds = gdal.Open("tmp/vsistdin_2_out.tif")
-    if ds is None:
-        return 'fail'
+    assert ds is not None
     ds = None
 
     gdal.Unlink("tmp/vsistdin_2_out.tif")
@@ -99,8 +96,7 @@ def test_vsistdin_3():
     gdal.PushErrorHandler('CPLQuietErrorHandler')
     f = gdal.VSIFOpenL('/vsistdin/', 'wb')
     gdal.PopErrorHandler()
-    if f is not None:
-        return 'fail'
+    assert f is None
 
     return 'success'
 
@@ -133,8 +129,7 @@ def test_vsistdin_4():
     gdal.Unlink("tmp/vsistdin_4_src.vrt")
 
     ds = gdal.Open("tmp/vsistdin_4_out.tif")
-    if ds is None:
-        return 'fail'
+    assert ds is not None
     ds = None
 
     gdal.Unlink("tmp/vsistdin_4_out.tif")
diff --git a/autotest/gcore/vsiswift.py b/autotest/gcore/vsiswift.py
index 31f7126d3705..f3dddb38128e 100644
--- a/autotest/gcore/vsiswift.py
+++ b/autotest/gcore/vsiswift.py
@@ -70,16 +70,12 @@ def test_vsiswift_real_server_errors():
     gdal.ErrorReset()
     with gdaltest.error_handler():
         f = open_for_read('/vsiswift/foo/bar')
-    if f is not None or gdal.VSIGetLastErrorMsg().find('SWIFT_STORAGE_URL') < 0:
-        print(gdal.VSIGetLastErrorMsg())
-        return 'fail'
+    assert f is None and gdal.VSIGetLastErrorMsg().find('SWIFT_STORAGE_URL') >= 0
 
     gdal.ErrorReset()
     with gdaltest.error_handler():
         f = open_for_read('/vsiswift_streaming/foo/bar')
-    if f is not None or gdal.VSIGetLastErrorMsg().find('SWIFT_STORAGE_URL') < 0:
-        print(gdal.VSIGetLastErrorMsg())
-        return 'fail'
+    assert f is None and gdal.VSIGetLastErrorMsg().find('SWIFT_STORAGE_URL') >= 0
 
     gdal.SetConfigOption('SWIFT_STORAGE_URL', 'http://0.0.0.0')
 
@@ -87,9 +83,7 @@ def test_vsiswift_real_server_errors():
     gdal.ErrorReset()
     with gdaltest.error_handler():
         f = open_for_read('/vsiswift/foo/bar')
-    if f is not None or gdal.VSIGetLastErrorMsg().find('SWIFT_AUTH_TOKEN') < 0:
-        print(gdal.VSIGetLastErrorMsg())
-        return 'fail'
+    assert f is None and gdal.VSIGetLastErrorMsg().find('SWIFT_AUTH_TOKEN') >= 0
 
     gdal.SetConfigOption('SWIFT_AUTH_TOKEN', 'SWIFT_AUTH_TOKEN')
 
@@ -105,9 +99,7 @@ def test_vsiswift_real_server_errors():
     gdal.ErrorReset()
     with gdaltest.error_handler():
         f = open_for_read('/vsiswift_streaming/foo/bar.baz')
-    if f is not None:
-        print(gdal.VSIGetLastErrorMsg())
-        return 'fail'
+    assert f is None, gdal.VSIGetLastErrorMsg()
 
     return 'success'
 
@@ -184,14 +176,11 @@ def method(request):
     handler.add('GET', '/v1/AUTH_something/foo/bar', custom_method=method)
     with webserver.install_http_handler(handler):
         f = open_for_read('/vsiswift/foo/bar')
-        if f is None:
-            return 'fail'
+        assert f is not None
         data = gdal.VSIFReadL(1, 4, f).decode('ascii')
         gdal.VSIFCloseL(f)
 
-    if data != 'foo':
-        print(data)
-        return 'fail'
+    assert data == 'foo'
 
     # authentication is reused
 
@@ -215,14 +204,11 @@ def method(request):
 
     with webserver.install_http_handler(handler):
         f = open_for_read('/vsiswift/foo/baz')
-        if f is None:
-            return 'fail'
+        assert f is not None
         data = gdal.VSIFReadL(1, 4, f).decode('ascii')
         gdal.VSIFCloseL(f)
 
-    if data != 'bar':
-        print(data)
-        return 'fail'
+    assert data == 'bar'
 
     return 'success'
 
@@ -247,8 +233,7 @@ def test_vsiswift_fake_auth_storage_url_and_auth_token():
     handler.add('GET', '/v1/AUTH_something/foo/bar', 501)
     with webserver.install_http_handler(handler):
         f = open_for_read('/vsiswift/foo/bar')
-        if f is None:
-            return 'fail'
+        assert f is not None
         gdal.VSIFReadL(1, 4, f).decode('ascii')
         gdal.VSIFCloseL(f)
 
@@ -275,14 +260,11 @@ def method(request):
     handler.add('GET', '/v1/AUTH_something/foo/bar', custom_method=method)
     with webserver.install_http_handler(handler):
         f = open_for_read('/vsiswift/foo/bar')
-        if f is None:
-            return 'fail'
+        assert f is not None
         data = gdal.VSIFReadL(1, 4, f).decode('ascii')
         gdal.VSIFCloseL(f)
 
-    if data != 'foo':
-        print(data)
-        return 'fail'
+    assert data == 'foo'
 
     return 'success'
 
@@ -327,8 +309,7 @@ def test_vsiswift_stat():
     handler.add('GET', '/v1/AUTH_something/foo', 200, {}, "blabla")
     with webserver.install_http_handler(handler):
         stat_res = gdal.VSIStatL('/vsiswift/foo')
-        if stat_res is None or not stat.S_ISDIR(stat_res.mode):
-            return 'fail'
+        assert stat_res is not None and stat.S_ISDIR(stat_res.mode)
 
     return 'success'
 
@@ -370,34 +351,25 @@ def test_vsiswift_fake_readdir():
     with gdaltest.config_option('SWIFT_MAX_KEYS', '1'):
         with webserver.install_http_handler(handler):
             f = open_for_read('/vsiswift/foo/bar.baz')
-        if f is None:
-            return 'fail'
+        assert f is not None
         gdal.VSIFCloseL(f)
 
     dir_contents = gdal.ReadDir('/vsiswift/foo')
-    if dir_contents != ['bar.baz', 'mysubdir']:
-        print(dir_contents)
-        return 'fail'
+    assert dir_contents == ['bar.baz', 'mysubdir']
     stat_res = gdal.VSIStatL('/vsiswift/foo/bar.baz')
-    if stat_res.size != 123456:
-        print(stat_res.size)
-        return 'fail'
-    if stat_res.mtime != 1:
-        return 'fail'
+    assert stat_res.size == 123456
+    assert stat_res.mtime == 1
 
     # ReadDir on something known to be a file shouldn't cause network access
     dir_contents = gdal.ReadDir('/vsiswift/foo/bar.baz')
-    if dir_contents is not None:
-        return 'fail'
+    assert dir_contents is None
 
     # Test error on ReadDir()
     handler = webserver.SequentialHandler()
     handler.add('GET', '/v1/AUTH_something/foo?delimiter=%2F&limit=10000&prefix=error_test%2F', 500)
     with webserver.install_http_handler(handler):
         dir_contents = gdal.ReadDir('/vsiswift/foo/error_test/')
-    if dir_contents is not None:
-        print(dir_contents)
-        return 'fail'
+    assert dir_contents is None
 
     # List containers (empty result)
     handler = webserver.SequentialHandler()
@@ -406,9 +378,7 @@ def test_vsiswift_fake_readdir():
         """)
     with webserver.install_http_handler(handler):
         dir_contents = gdal.ReadDir('/vsiswift/')
-    if dir_contents != ['.']:
-        print(dir_contents)
-        return 'fail'
+    assert dir_contents == ['.']
 
     # List containers
     gdal.VSICurlClearCache()
@@ -420,9 +390,7 @@ def test_vsiswift_fake_readdir():
            ] """)
     with webserver.install_http_handler(handler):
         dir_contents = gdal.ReadDir('/vsiswift/')
-    if dir_contents != ['mycontainer1', 'mycontainer2']:
-        print(dir_contents)
-        return 'fail'
+    assert dir_contents == ['mycontainer1', 'mycontainer2']
 
     # ReadDir() with a file and directory of same names
     gdal.VSICurlClearCache()
@@ -437,18 +405,14 @@ def test_vsiswift_fake_readdir():
              { "subdir": "foo/"} ] """)
     with webserver.install_http_handler(handler):
         dir_contents = gdal.ReadDir('/vsiswift/')
-    if dir_contents != ['foo', 'foo/']:
-        print(dir_contents)
-        return 'fail'
+    assert dir_contents == ['foo', 'foo/']
 
     handler = webserver.SequentialHandler()
     handler.add('GET', '/v1/AUTH_something/foo?delimiter=%2F&limit=10000', 200,
                 {'Content-type': 'application/json'}, "[]")
     with webserver.install_http_handler(handler):
         dir_contents = gdal.ReadDir('/vsiswift/foo/')
-    if dir_contents != ['.']:
-        print(dir_contents)
-        return 'fail'
+    assert dir_contents == ['.']
 
     return 'success'
 
@@ -465,8 +429,7 @@ def test_vsiswift_fake_write():
 
     # Test creation of BlockBob
     f = gdal.VSIFOpenL('/vsiswift/test_copy/file.bin', 'wb')
-    if f is None:
-        return 'fail'
+    assert f is not None
 
     handler = webserver.SequentialHandler()
 
@@ -528,8 +491,7 @@ def test_vsiswift_fake_unlink():
     handler.add('DELETE', '/v1/AUTH_something/foo/bar', 202, {'Connection': 'close'})
     with webserver.install_http_handler(handler):
         ret = gdal.Unlink('/vsiswift/foo/bar')
-    if ret != 0:
-        return 'fail'
+    assert ret == 0
 
     # Failure
     handler = webserver.SequentialHandler()
@@ -539,8 +501,7 @@ def test_vsiswift_fake_unlink():
     with webserver.install_http_handler(handler):
         with gdaltest.error_handler():
             ret = gdal.Unlink('/vsiswift/foo/bar')
-    if ret != -1:
-        return 'fail'
+    assert ret == -1
 
     return 'success'
 
@@ -557,8 +518,7 @@ def test_vsiswift_fake_mkdir_rmdir():
 
     # Invalid name
     ret = gdal.Mkdir('/vsiswift', 0)
-    if ret == 0:
-        return 'fail'
+    assert ret != 0
 
     handler = webserver.SequentialHandler()
     handler.add('GET', '/v1/AUTH_something/foo/dir/', 404, {'Connection': 'close'})
@@ -566,8 +526,7 @@ def test_vsiswift_fake_mkdir_rmdir():
     handler.add('PUT', '/v1/AUTH_something/foo/dir/', 201)
     with webserver.install_http_handler(handler):
         ret = gdal.Mkdir('/vsiswift/foo/dir', 0)
-    if ret != 0:
-        return 'fail'
+    assert ret == 0
 
     # Try creating already existing directory
     handler = webserver.SequentialHandler()
@@ -578,13 +537,11 @@ def test_vsiswift_fake_mkdir_rmdir():
                 """[ { "subdir": "dir/" } ]""")
     with webserver.install_http_handler(handler):
         ret = gdal.Mkdir('/vsiswift/foo/dir', 0)
-    if ret == 0:
-        return 'fail'
+    assert ret != 0
 
     # Invalid name
     ret = gdal.Rmdir('/vsiswift')
-    if ret == 0:
-        return 'fail'
+    assert ret != 0
 
     gdal.VSICurlClearCache()
 
@@ -597,8 +554,7 @@ def test_vsiswift_fake_mkdir_rmdir():
                 """[ { "name": "it_is_a_file/", "bytes": 0, "last_modified": "1970-01-01T00:00:01" } ]""")
     with webserver.install_http_handler(handler):
         ret = gdal.Rmdir('/vsiswift/foo/it_is_a_file')
-    if ret == 0:
-        return 'fail'
+    assert ret != 0
 
     # Valid
     handler = webserver.SequentialHandler()
@@ -611,8 +567,7 @@ def test_vsiswift_fake_mkdir_rmdir():
     handler.add('DELETE', '/v1/AUTH_something/foo/dir/', 204)
     with webserver.install_http_handler(handler):
         ret = gdal.Rmdir('/vsiswift/foo/dir')
-    if ret != 0:
-        return 'fail'
+    assert ret == 0
 
     # Try deleting already deleted directory
     handler = webserver.SequentialHandler()
@@ -620,8 +575,7 @@ def test_vsiswift_fake_mkdir_rmdir():
     handler.add('GET', '/v1/AUTH_something/foo?delimiter=%2F&limit=10000', 200)
     with webserver.install_http_handler(handler):
         ret = gdal.Rmdir('/vsiswift/foo/dir')
-    if ret == 0:
-        return 'fail'
+    assert ret != 0
 
     gdal.VSICurlClearCache()
 
@@ -638,8 +592,7 @@ def test_vsiswift_fake_mkdir_rmdir():
                 """[ { "name": "dir_nonempty/some_file", "bytes": 0, "last_modified": "1970-01-01T00:00:01" } ]""")
     with webserver.install_http_handler(handler):
         ret = gdal.Rmdir('/vsiswift/foo/dir_nonempty')
-    if ret == 0:
-        return 'fail'
+    assert ret != 0
 
     return 'success'
 
@@ -676,119 +629,85 @@ def vsiswift_extra_1():
     if swift_resource.find('/') < 0:
         path = '/vsiswift/' + swift_resource
         statres = gdal.VSIStatL(path)
-        if statres is None or not stat.S_ISDIR(statres.mode):
-            print('%s is not a valid bucket' % path)
-            return 'fail'
+        assert statres is not None and stat.S_ISDIR(statres.mode), \
+            ('%s is not a valid bucket' % path)
 
         readdir = gdal.ReadDir(path)
-        if readdir is None:
-            print('ReadDir() should not return empty list')
-            return 'fail'
+        assert readdir is not None, 'ReadDir() should not return empty list'
         for filename in readdir:
             if filename != '.':
                 subpath = path + '/' + filename
-                if gdal.VSIStatL(subpath) is None:
-                    print('Stat(%s) should not return an error' % subpath)
-                    return 'fail'
+                assert gdal.VSIStatL(subpath) is not None, \
+                    ('Stat(%s) should not return an error' % subpath)
 
         unique_id = 'vsiswift_test'
         subpath = path + '/' + unique_id
         ret = gdal.Mkdir(subpath, 0)
-        if ret < 0:
-            print('Mkdir(%s) should not return an error' % subpath)
-            return 'fail'
+        assert ret >= 0, ('Mkdir(%s) should not return an error' % subpath)
 
         readdir = gdal.ReadDir(path)
-        if unique_id not in readdir:
-            print('ReadDir(%s) should contain %s' % (path, unique_id))
-            print(readdir)
-            return 'fail'
+        assert unique_id in readdir, \
+            ('ReadDir(%s) should contain %s' % (path, unique_id))
 
         ret = gdal.Mkdir(subpath, 0)
-        if ret == 0:
-            print('Mkdir(%s) repeated should return an error' % subpath)
-            return 'fail'
+        assert ret != 0, ('Mkdir(%s) repeated should return an error' % subpath)
 
         ret = gdal.Rmdir(subpath)
-        if ret < 0:
-            print('Rmdir(%s) should not return an error' % subpath)
-            return 'fail'
+        assert ret >= 0, ('Rmdir(%s) should not return an error' % subpath)
 
         readdir = gdal.ReadDir(path)
-        if unique_id in readdir:
-            print('ReadDir(%s) should not contain %s' % (path, unique_id))
-            print(readdir)
-            return 'fail'
+        assert unique_id not in readdir, \
+            ('ReadDir(%s) should not contain %s' % (path, unique_id))
 
         ret = gdal.Rmdir(subpath)
-        if ret == 0:
-            print('Rmdir(%s) repeated should return an error' % subpath)
-            return 'fail'
+        assert ret != 0, ('Rmdir(%s) repeated should return an error' % subpath)
 
         ret = gdal.Mkdir(subpath, 0)
-        if ret < 0:
-            print('Mkdir(%s) should not return an error' % subpath)
-            return 'fail'
+        assert ret >= 0, ('Mkdir(%s) should not return an error' % subpath)
 
         f = gdal.VSIFOpenL(subpath + '/test.txt', 'wb')
-        if f is None:
-            return 'fail'
+        assert f is not None
         gdal.VSIFWriteL('hello', 1, 5, f)
         gdal.VSIFCloseL(f)
 
         ret = gdal.Rmdir(subpath)
-        if ret == 0:
-            print('Rmdir(%s) on non empty directory should return an error' % subpath)
-            return 'fail'
+        assert ret != 0, \
+            ('Rmdir(%s) on non empty directory should return an error' % subpath)
 
         f = gdal.VSIFOpenL(subpath + '/test.txt', 'rb')
-        if f is None:
-            return 'fail'
+        assert f is not None
         data = gdal.VSIFReadL(1, 5, f).decode('utf-8')
-        if data != 'hello':
-            print(data)
-            return 'fail'
+        assert data == 'hello'
         gdal.VSIFCloseL(f)
 
         ret = gdal.Unlink(subpath + '/test.txt')
-        if ret < 0:
-            print('Unlink(%s) should not return an error' % (subpath + '/test.txt'))
-            return 'fail'
+        assert ret >= 0, \
+            ('Unlink(%s) should not return an error' % (subpath + '/test.txt'))
 
         ret = gdal.Rmdir(subpath)
-        if ret < 0:
-            print('Rmdir(%s) should not return an error' % subpath)
-            return 'fail'
+        assert ret >= 0, ('Rmdir(%s) should not return an error' % subpath)
 
         return 'success'
 
     f = open_for_read('/vsiswift/' + swift_resource)
-    if f is None:
-        return 'fail'
+    assert f is not None
     ret = gdal.VSIFReadL(1, 1, f)
     gdal.VSIFCloseL(f)
 
-    if len(ret) != 1:
-        print(ret)
-        return 'fail'
+    assert len(ret) == 1
 
     # Same with /vsiswift_streaming/
     f = open_for_read('/vsiswift_streaming/' + swift_resource)
-    if f is None:
-        return 'fail'
+    assert f is not None
     ret = gdal.VSIFReadL(1, 1, f)
     gdal.VSIFCloseL(f)
 
-    if len(ret) != 1:
-        print(ret)
-        return 'fail'
+    assert len(ret) == 1
 
     # Invalid resource
     gdal.ErrorReset()
     f = open_for_read('/vsiswift_streaming/' + swift_resource + '/invalid_resource.baz')
-    if f is not None:
-        print(gdal.VSIGetLastErrorMsg())
-        return 'fail'
+    assert f is None, gdal.VSIGetLastErrorMsg()
 
     return 'success'
 
diff --git a/autotest/gcore/vsiwebhdfs.py b/autotest/gcore/vsiwebhdfs.py
index bfa0fb4a3741..993ee904ead9 100644
--- a/autotest/gcore/vsiwebhdfs.py
+++ b/autotest/gcore/vsiwebhdfs.py
@@ -96,11 +96,9 @@ def test_vsiwebhdfs_open():
                 {}, '0123456789data')
     with webserver.install_http_handler(handler):
         f = open_for_read(gdaltest.webhdfs_base_connection + '/foo/bar')
-        if f is None:
-            return 'fail'
+        assert f is not None
         gdal.VSIFSeekL(f, 9999990784 + 10, 0)
-        if gdal.VSIFReadL(1, 4, f).decode('ascii') != 'data':
-            return 'fail'
+        assert gdal.VSIFReadL(1, 4, f).decode('ascii') == 'data'
         gdal.VSIFCloseL(f)
 
     # Download with redirect (nominal) and permissions
@@ -117,10 +115,8 @@ def test_vsiwebhdfs_open():
                                   'WEBHDFS_DATANODE_HOST': 'localhost'}):
         with webserver.install_http_handler(handler):
             f = open_for_read(gdaltest.webhdfs_base_connection + '/foo/bar')
-            if f is None:
-                return 'fail'
-            if gdal.VSIFReadL(1, 4, f).decode('ascii') != 'yeah':
-                return 'fail'
+            assert f is not None
+            assert gdal.VSIFReadL(1, 4, f).decode('ascii') == 'yeah'
             gdal.VSIFCloseL(f)
 
     # Test error
@@ -128,18 +124,15 @@ def test_vsiwebhdfs_open():
     gdal.VSICurlClearCache()
 
     f = open_for_read(gdaltest.webhdfs_base_connection + '/foo/bar')
-    if f is None:
-        return 'fail'
+    assert f is not None
 
     handler = webserver.SequentialHandler()
     handler.add('GET', '/webhdfs/v1/foo/bar?op=OPEN&offset=0&length=16384', 404)
     with webserver.install_http_handler(handler):
-        if len(gdal.VSIFReadL(1, 4, f)) != 0:
-            return 'fail'
+        assert len(gdal.VSIFReadL(1, 4, f)) == 0
 
     # Retry: shouldn't not cause network access
-    if len(gdal.VSIFReadL(1, 4, f)) != 0:
-        return 'fail'
+    assert len(gdal.VSIFReadL(1, 4, f)) == 0
 
     gdal.VSIFCloseL(f)
 
@@ -170,8 +163,7 @@ def test_vsiwebhdfs_stat():
 
     # Test caching
     stat_res = gdal.VSIStatL(gdaltest.webhdfs_base_connection + '/foo/bar')
-    if stat_res.size != 1000000:
-        return 'fail'
+    assert stat_res.size == 1000000
 
     # Test missing file
     handler = webserver.SequentialHandler()
@@ -180,8 +172,7 @@ def test_vsiwebhdfs_stat():
     with webserver.install_http_handler(handler):
         stat_res = gdal.VSIStatL(
             gdaltest.webhdfs_base_connection + '/unexisting')
-    if stat_res is not None:
-        return 'fail'
+    assert stat_res is None
 
     return 'success'
 
@@ -201,21 +192,15 @@ def test_vsiwebhdfs_readdir():
                 {}, '{"FileStatuses":{"FileStatus":[{"type":"FILE","modificationTime":1000,"pathSuffix":"bar.baz","length":123456},{"type":"DIRECTORY","pathSuffix":"mysubdir","length":0}]}}')
     with webserver.install_http_handler(handler):
         dir_contents = gdal.ReadDir(gdaltest.webhdfs_base_connection + '/foo')
-    if dir_contents != ['bar.baz', 'mysubdir']:
-        print(dir_contents)
-        return 'fail'
+    assert dir_contents == ['bar.baz', 'mysubdir']
     stat_res = gdal.VSIStatL(gdaltest.webhdfs_base_connection + '/foo/bar.baz')
-    if stat_res.size != 123456:
-        print(stat_res.size)
-        return 'fail'
-    if stat_res.mtime != 1:
-        return 'fail'
+    assert stat_res.size == 123456
+    assert stat_res.mtime == 1
 
     # ReadDir on something known to be a file shouldn't cause network access
     dir_contents = gdal.ReadDir(
         gdaltest.webhdfs_base_connection + '/foo/bar.baz')
-    if dir_contents is not None:
-        return 'fail'
+    assert dir_contents is None
 
     # Test error on ReadDir()
     handler = webserver.SequentialHandler()
@@ -223,9 +208,7 @@ def test_vsiwebhdfs_readdir():
     with webserver.install_http_handler(handler):
         dir_contents = gdal.ReadDir(
             gdaltest.webhdfs_base_connection + 'foo/error_test/')
-    if dir_contents is not None:
-        print(dir_contents)
-        return 'fail'
+    assert dir_contents is None
 
     return 'success'
 
@@ -247,8 +230,7 @@ def test_vsiwebhdfs_write():
         with gdaltest.error_handler():
             f = gdal.VSIFOpenL(
                 gdaltest.webhdfs_base_connection + '/foo/bar', 'wb')
-        if f is not None:
-            return 'fail'
+        assert f is None
 
     handler = webserver.SequentialHandler()
     handler.add('PUT', '/webhdfs/v1/foo/bar?op=CREATE&overwrite=true&user.name=root', 307,
@@ -260,10 +242,8 @@ def test_vsiwebhdfs_write():
         with webserver.install_http_handler(handler):
             f = gdal.VSIFOpenL(
                 gdaltest.webhdfs_base_connection + '/foo/bar', 'wb')
-            if f is None:
-                return 'fail'
-    if gdal.VSIFCloseL(f) != 0:
-        return 'fail'
+            assert f is not None
+    assert gdal.VSIFCloseL(f) == 0
 
     # Non-empty file
 
@@ -279,11 +259,9 @@ def test_vsiwebhdfs_write():
         with webserver.install_http_handler(handler):
             f = gdal.VSIFOpenL(
                 gdaltest.webhdfs_base_connection + '/foo/bar', 'wb')
-            if f is None:
-                return 'fail'
+            assert f is not None
 
-    if gdal.VSIFWriteL('foobar', 1, 6, f) != 6:
-        return 'fail'
+    assert gdal.VSIFWriteL('foobar', 1, 6, f) == 6
 
     handler = webserver.SequentialHandler()
 
@@ -307,8 +285,7 @@ def method(request):
                 200, expected_body='foobar'.encode('ascii'))
 
     with webserver.install_http_handler(handler):
-        if gdal.VSIFCloseL(f) != 0:
-            return 'fail'
+        assert gdal.VSIFCloseL(f) == 0
 
     # Errors during file creation
 
@@ -322,8 +299,7 @@ def method(request):
             with gdaltest.error_handler():
                 f = gdal.VSIFOpenL(
                     gdaltest.webhdfs_base_connection + '/foo/bar', 'wb')
-                if f is not None:
-                    return 'fail'
+                assert f is None
 
     handler = webserver.SequentialHandler()
     handler.add('PUT', '/webhdfs/v1/foo/bar?op=CREATE&overwrite=true&user.name=root', 307,
@@ -333,8 +309,7 @@ def method(request):
             with gdaltest.error_handler():
                 f = gdal.VSIFOpenL(
                     gdaltest.webhdfs_base_connection + '/foo/bar', 'wb')
-                if f is not None:
-                    return 'fail'
+                assert f is None
 
     # Errors during POST
 
@@ -350,11 +325,9 @@ def method(request):
         with webserver.install_http_handler(handler):
             f = gdal.VSIFOpenL(
                 gdaltest.webhdfs_base_connection + '/foo/bar', 'wb')
-            if f is None:
-                return 'fail'
+            assert f is not None
 
-    if gdal.VSIFWriteL('foobar', 1, 6, f) != 6:
-        return 'fail'
+    assert gdal.VSIFWriteL('foobar', 1, 6, f) == 6
 
     handler = webserver.SequentialHandler()
     handler.add('POST', '/webhdfs/v1/foo/bar?op=APPEND&user.name=root', 307,
@@ -364,8 +337,7 @@ def method(request):
 
     with gdaltest.error_handler():
         with webserver.install_http_handler(handler):
-            if gdal.VSIFCloseL(f) == 0:
-                return 'fail'
+            assert gdal.VSIFCloseL(f) != 0
 
     return 'success'
 
@@ -386,8 +358,7 @@ def test_vsiwebhdfs_unlink():
                 {}, '{"boolean":true}')
     with webserver.install_http_handler(handler):
         ret = gdal.Unlink(gdaltest.webhdfs_base_connection + '/foo/bar')
-    if ret != 0:
-        return 'fail'
+    assert ret == 0
 
     gdal.VSICurlClearCache()
 
@@ -403,8 +374,7 @@ def test_vsiwebhdfs_unlink():
                                   'WEBHDFS_DELEGATION': 'token'}):
         with webserver.install_http_handler(handler):
             ret = gdal.Unlink(gdaltest.webhdfs_base_connection + '/foo/bar')
-        if ret != 0:
-            return 'fail'
+        assert ret == 0
 
     # Failure
     handler = webserver.SequentialHandler()
@@ -413,8 +383,7 @@ def test_vsiwebhdfs_unlink():
     with webserver.install_http_handler(handler):
         with gdaltest.error_handler():
             ret = gdal.Unlink(gdaltest.webhdfs_base_connection + '/foo/bar')
-    if ret != -1:
-        return 'fail'
+    assert ret == -1
 
     gdal.VSICurlClearCache()
 
@@ -425,8 +394,7 @@ def test_vsiwebhdfs_unlink():
     with webserver.install_http_handler(handler):
         with gdaltest.error_handler():
             ret = gdal.Unlink(gdaltest.webhdfs_base_connection + '/foo/bar')
-    if ret != -1:
-        return 'fail'
+    assert ret == -1
 
     return 'success'
 
@@ -443,8 +411,7 @@ def test_vsiwebhdfs_mkdir_rmdir():
 
     # Invalid name
     ret = gdal.Mkdir('/vsiwebhdfs', 0)
-    if ret == 0:
-        return 'fail'
+    assert ret != 0
 
     # Valid
     handler = webserver.SequentialHandler()
@@ -452,8 +419,7 @@ def test_vsiwebhdfs_mkdir_rmdir():
                 {}, '{"boolean":true}')
     with webserver.install_http_handler(handler):
         ret = gdal.Mkdir(gdaltest.webhdfs_base_connection + '/foo/dir', 0)
-    if ret != 0:
-        return 'fail'
+    assert ret == 0
 
     # Valid with all options
     handler = webserver.SequentialHandler()
@@ -463,8 +429,7 @@ def test_vsiwebhdfs_mkdir_rmdir():
         with webserver.install_http_handler(handler):
             ret = gdal.Mkdir(gdaltest.webhdfs_base_connection +
                              '/foo/dir/', 493)  # 0755
-        if ret != 0:
-            return 'fail'
+        assert ret == 0
 
     # Error
     handler = webserver.SequentialHandler()
@@ -472,18 +437,15 @@ def test_vsiwebhdfs_mkdir_rmdir():
     with webserver.install_http_handler(handler):
         ret = gdal.Mkdir(gdaltest.webhdfs_base_connection +
                          '/foo/dir_error', 0)
-    if ret == 0:
-        return 'fail'
+    assert ret != 0
 
     # Root name is invalid
     ret = gdal.Mkdir(gdaltest.webhdfs_base_connection + '/', 0)
-    if ret == 0:
-        return 'fail'
+    assert ret != 0
 
     # Invalid name
     ret = gdal.Rmdir('/vsiwebhdfs')
-    if ret == 0:
-        return 'fail'
+    assert ret != 0
 
     gdal.VSICurlClearCache()
 
@@ -493,16 +455,14 @@ def test_vsiwebhdfs_mkdir_rmdir():
                 {}, '{"boolean":true}')
     with webserver.install_http_handler(handler):
         ret = gdal.Rmdir(gdaltest.webhdfs_base_connection + '/foo/dir')
-    if ret != 0:
-        return 'fail'
+    assert ret == 0
 
     # Error
     handler = webserver.SequentialHandler()
     handler.add('DELETE', '/webhdfs/v1/foo/dir_error?op=DELETE', 404)
     with webserver.install_http_handler(handler):
         ret = gdal.Rmdir(gdaltest.webhdfs_base_connection + '/foo/dir_error')
-    if ret == 0:
-        return 'fail'
+    assert ret != 0
 
     return 'success'
 
@@ -539,33 +499,25 @@ def vsiwebhdfs_extra_1():
     if webhdfs_url.endswith('/webhdfs/v1') or webhdfs_url.endswith('/webhdfs/v1/'):
         path = '/vsiwebhdfs/' + webhdfs_url
         statres = gdal.VSIStatL(path)
-        if statres is None or not stat.S_ISDIR(statres.mode):
-            print('%s is not a valid bucket' % path)
-            return 'fail'
+        assert statres is not None and stat.S_ISDIR(statres.mode), \
+            ('%s is not a valid bucket' % path)
 
         readdir = gdal.ReadDir(path)
-        if readdir is None:
-            print('ReadDir() should not return empty list')
-            return 'fail'
+        assert readdir is not None, 'ReadDir() should not return empty list'
         for filename in readdir:
             if filename != '.':
                 subpath = path + '/' + filename
-                if gdal.VSIStatL(subpath) is None:
-                    print('Stat(%s) should not return an error' % subpath)
-                    return 'fail'
+                assert gdal.VSIStatL(subpath) is not None, \
+                    ('Stat(%s) should not return an error' % subpath)
 
         unique_id = 'vsiwebhdfs_test'
         subpath = path + '/' + unique_id
         ret = gdal.Mkdir(subpath, 0)
-        if ret < 0:
-            print('Mkdir(%s) should not return an error' % subpath)
-            return 'fail'
+        assert ret >= 0, ('Mkdir(%s) should not return an error' % subpath)
 
         readdir = gdal.ReadDir(path)
-        if unique_id not in readdir:
-            print('ReadDir(%s) should contain %s' % (path, unique_id))
-            print(readdir)
-            return 'fail'
+        assert unique_id in readdir, \
+            ('ReadDir(%s) should contain %s' % (path, unique_id))
 
         #ret = gdal.Mkdir(subpath, 0)
         # if ret == 0:
@@ -574,68 +526,48 @@ def vsiwebhdfs_extra_1():
         #    return 'fail'
 
         ret = gdal.Rmdir(subpath)
-        if ret < 0:
-            print('Rmdir(%s) should not return an error' % subpath)
-            return 'fail'
+        assert ret >= 0, ('Rmdir(%s) should not return an error' % subpath)
 
         readdir = gdal.ReadDir(path)
-        if unique_id in readdir:
-            print('ReadDir(%s) should not contain %s' % (path, unique_id))
-            print(readdir)
-            return 'fail'
+        assert unique_id not in readdir, \
+            ('ReadDir(%s) should not contain %s' % (path, unique_id))
 
         ret = gdal.Rmdir(subpath)
-        if ret == 0:
-            print('Rmdir(%s) repeated should return an error' % subpath)
-            return 'fail'
+        assert ret != 0, ('Rmdir(%s) repeated should return an error' % subpath)
 
         ret = gdal.Mkdir(subpath, 0)
-        if ret < 0:
-            print('Mkdir(%s) should not return an error' % subpath)
-            return 'fail'
+        assert ret >= 0, ('Mkdir(%s) should not return an error' % subpath)
 
         f = gdal.VSIFOpenL(subpath + '/test.txt', 'wb')
-        if f is None:
-            return 'fail'
+        assert f is not None
         gdal.VSIFWriteL('hello', 1, 5, f)
         gdal.VSIFCloseL(f)
 
         ret = gdal.Rmdir(subpath)
-        if ret == 0:
-            print('Rmdir(%s) on non empty directory should return an error' % subpath)
-            return 'fail'
+        assert ret != 0, \
+            ('Rmdir(%s) on non empty directory should return an error' % subpath)
 
         f = gdal.VSIFOpenL(subpath + '/test.txt', 'rb')
-        if f is None:
-            return 'fail'
+        assert f is not None
         data = gdal.VSIFReadL(1, 5, f).decode('utf-8')
-        if data != 'hello':
-            print(data)
-            return 'fail'
+        assert data == 'hello'
         gdal.VSIFCloseL(f)
 
         ret = gdal.Unlink(subpath + '/test.txt')
-        if ret < 0:
-            print('Unlink(%s) should not return an error' %
+        assert ret >= 0, ('Unlink(%s) should not return an error' %
                   (subpath + '/test.txt'))
-            return 'fail'
 
         ret = gdal.Rmdir(subpath)
-        if ret < 0:
-            print('Rmdir(%s) should not return an error' % subpath)
-            return 'fail'
+        assert ret >= 0, ('Rmdir(%s) should not return an error' % subpath)
 
         return 'success'
 
     f = open_for_read('/vsiwebhdfs/' + webhdfs_url)
-    if f is None:
-        return 'fail'
+    assert f is not None
     ret = gdal.VSIFReadL(1, 1, f)
     gdal.VSIFCloseL(f)
 
-    if len(ret) != 1:
-        print(ret)
-        return 'fail'
+    assert len(ret) == 1
 
     return 'success'
 
diff --git a/autotest/gcore/vsizip.py b/autotest/gcore/vsizip.py
index 7755e334ff57..435be4f7786e 100755
--- a/autotest/gcore/vsizip.py
+++ b/autotest/gcore/vsizip.py
@@ -35,6 +35,7 @@
 
 import gdaltest
 from osgeo import gdal
+import pytest
 
 ###############################################################################
 # Test writing a ZIP with multiple files and directories
@@ -44,15 +45,11 @@ def test_vsizip_1():
 
     # We can keep the handle open during all the ZIP writing
     hZIP = gdal.VSIFOpenL("/vsizip/vsimem/test.zip", "wb")
-    if hZIP is None:
-        gdaltest.post_reason('fail 1')
-        return 'fail'
+    assert hZIP is not None, 'fail 1'
 
     # One way to create a directory
     f = gdal.VSIFOpenL("/vsizip/vsimem/test.zip/subdir2/", "wb")
-    if f is None:
-        gdaltest.post_reason('fail 2')
-        return 'fail'
+    assert f is not None, 'fail 2'
     gdal.VSIFCloseL(f)
 
     # A more natural one
@@ -60,9 +57,7 @@ def test_vsizip_1():
 
     # Create 1st file
     f2 = gdal.VSIFOpenL("/vsizip/vsimem/test.zip/subdir3/abcd", "wb")
-    if f2 is None:
-        gdaltest.post_reason('fail 3')
-        return 'fail'
+    assert f2 is not None, 'fail 3'
     gdal.VSIFWriteL("abcd", 1, 4, f2)
     gdal.VSIFCloseL(f2)
 
@@ -71,19 +66,13 @@ def test_vsizip_1():
     gdal.PushErrorHandler('CPLQuietErrorHandler')
     f = gdal.VSIFOpenL("/vsizip/vsimem/test.zip/subdir3/abcd", "rb")
     gdal.PopErrorHandler()
-    if gdal.GetLastErrorMsg() != 'Cannot read a zip file being written':
-        gdaltest.post_reason('expected error')
-        print(gdal.GetLastErrorMsg())
-        return 'fail'
-    if f is not None:
-        gdaltest.post_reason('should not have been successful 1')
-        return 'fail'
+    assert gdal.GetLastErrorMsg() == 'Cannot read a zip file being written', \
+        'expected error'
+    assert f is None, 'should not have been successful 1'
 
     # Create 2nd file
     f3 = gdal.VSIFOpenL("/vsizip/vsimem/test.zip/subdir3/efghi", "wb")
-    if f3 is None:
-        gdaltest.post_reason('fail 4')
-        return 'fail'
+    assert f3 is not None, 'fail 4'
     gdal.VSIFWriteL("efghi", 1, 5, f3)
 
     # Try creating a 3d file
@@ -91,13 +80,9 @@ def test_vsizip_1():
     gdal.PushErrorHandler('CPLQuietErrorHandler')
     f4 = gdal.VSIFOpenL("/vsizip/vsimem/test.zip/that_wont_work", "wb")
     gdal.PopErrorHandler()
-    if gdal.GetLastErrorMsg() != 'Cannot create that_wont_work while another file is being written in the .zip':
-        gdaltest.post_reason('expected error')
-        print(gdal.GetLastErrorMsg())
-        return 'fail'
-    if f4 is not None:
-        gdaltest.post_reason('should not have been successful 2')
-        return 'fail'
+    assert gdal.GetLastErrorMsg() == 'Cannot create that_wont_work while another file is being written in the .zip', \
+        'expected error'
+    assert f4 is None, 'should not have been successful 2'
 
     gdal.VSIFCloseL(f3)
 
@@ -110,70 +95,51 @@ def test_vsizip_1():
         f = gdal.VSIFOpenL('/vsizip/vsimem/test.zip', 'rb')
     if f is not None:
         gdal.VSIFCloseL(f)
-    if gdal.GetLastErrorMsg() == '':
-        gdaltest.post_reason('expected error')
-        print(gdal.GetLastErrorMsg())
-        return 'fail'
+    assert gdal.GetLastErrorMsg() != '', 'expected error'
 
     f = gdal.VSIFOpenL("/vsizip/vsimem/test.zip/subdir3/abcd", "rb")
-    if f is None:
-        gdaltest.post_reason('fail 5')
-        return 'fail'
+    assert f is not None, 'fail 5'
     data = gdal.VSIFReadL(1, 4, f)
     gdal.VSIFCloseL(f)
 
-    if data.decode('ASCII') != 'abcd':
-        print(data)
-        return 'fail'
+    assert data.decode('ASCII') == 'abcd'
 
     # Test alternate uri syntax
     gdal.Rename("/vsimem/test.zip", "/vsimem/test.xxx")
     f = gdal.VSIFOpenL("/vsizip/{/vsimem/test.xxx}/subdir3/abcd", "rb")
-    if f is None:
-        return 'fail'
+    assert f is not None
     data = gdal.VSIFReadL(1, 4, f)
     gdal.VSIFCloseL(f)
 
-    if data.decode('ASCII') != 'abcd':
-        print(data)
-        return 'fail'
+    assert data.decode('ASCII') == 'abcd'
 
     # With a trailing slash
     f = gdal.VSIFOpenL("/vsizip/{/vsimem/test.xxx}/subdir3/abcd/", "rb")
-    if f is None:
-        return 'fail'
+    assert f is not None
     gdal.VSIFCloseL(f)
 
     # Test ReadDir()
-    if len(gdal.ReadDir("/vsizip/{/vsimem/test.xxx}")) != 3:
-        print(gdal.ReadDir("/vsizip/{/vsimem/test.xxx}"))
-        return 'fail'
+    assert len(gdal.ReadDir("/vsizip/{/vsimem/test.xxx}")) == 3
 
     # Unbalanced curls
     f = gdal.VSIFOpenL("/vsizip/{/vsimem/test.xxx", "rb")
-    if f is not None:
-        return 'fail'
+    assert f is None
 
     # Non existing mainfile
     f = gdal.VSIFOpenL("/vsizip/{/vsimem/test.xxx}/bla", "rb")
-    if f is not None:
-        return 'fail'
+    assert f is None
 
     # Non existing subfile
     f = gdal.VSIFOpenL("/vsizip/{/vsimem/test.zzz}/bla", "rb")
-    if f is not None:
-        return 'fail'
+    assert f is None
 
     # Wrong syntax
     f = gdal.VSIFOpenL("/vsizip/{/vsimem/test.xxx}.aux.xml", "rb")
-    if f is not None:
-        return 'fail'
+    assert f is None
 
     # Test nested { { } }
     hZIP = gdal.VSIFOpenL("/vsizip/{/vsimem/zipinzip.yyy}", "wb")
-    if hZIP is None:
-        gdaltest.post_reason('fail 1')
-        return 'fail'
+    assert hZIP is not None, 'fail 1'
     f = gdal.VSIFOpenL("/vsizip/{/vsimem/zipinzip.yyy}/test.xxx", "wb")
     f_src = gdal.VSIFOpenL("/vsimem/test.xxx", "rb")
     data = gdal.VSIFReadL(1, 10000, f_src)
@@ -183,25 +149,20 @@ def test_vsizip_1():
     gdal.VSIFCloseL(hZIP)
 
     f = gdal.VSIFOpenL("/vsizip/{/vsizip/{/vsimem/zipinzip.yyy}/test.xxx}/subdir3/abcd/", "rb")
-    if f is None:
-        return 'fail'
+    assert f is not None
     data = gdal.VSIFReadL(1, 4, f)
     gdal.VSIFCloseL(f)
 
-    if data.decode('ASCII') != 'abcd':
-        print(data)
-        return 'fail'
+    assert data.decode('ASCII') == 'abcd'
 
     gdal.Unlink("/vsimem/test.xxx")
     gdal.Unlink("/vsimem/zipinzip.yyy")
 
     # Test VSIStatL on a non existing file
-    if gdal.VSIStatL('/vsizip//vsimem/foo.zip') is not None:
-        return 'fail'
+    assert gdal.VSIStatL('/vsizip//vsimem/foo.zip') is None
 
     # Test ReadDir on a non existing file
-    if gdal.ReadDir('/vsizip//vsimem/foo.zip') is not None:
-        return 'fail'
+    assert gdal.ReadDir('/vsizip//vsimem/foo.zip') is None
 
     return 'success'
 
@@ -214,67 +175,44 @@ def test_vsizip_2():
     zip_name = '/vsimem/test2.zip'
 
     fmain = gdal.VSIFOpenL("/vsizip/" + zip_name + "/foo.bar", "wb")
-    if fmain is None:
-        gdaltest.post_reason('fail 1')
-        return 'fail'
+    assert fmain is not None, 'fail 1'
     gdal.VSIFWriteL("12345", 1, 5, fmain)
     gdal.VSIFCloseL(fmain)
 
     content = gdal.ReadDir("/vsizip/" + zip_name)
-    if content != ['foo.bar']:
-        gdaltest.post_reason('bad content 1')
-        print(content)
-        return 'fail'
+    assert content == ['foo.bar'], 'bad content 1'
 
     # Now append a second file
     fmain = gdal.VSIFOpenL("/vsizip/" + zip_name + "/bar.baz", "wb")
-    if fmain is None:
-        gdaltest.post_reason('fail 2')
-        return 'fail'
+    assert fmain is not None, 'fail 2'
     gdal.VSIFWriteL("67890", 1, 5, fmain)
 
     gdal.ErrorReset()
     gdal.PushErrorHandler('CPLQuietErrorHandler')
     content = gdal.ReadDir("/vsizip/" + zip_name)
     gdal.PopErrorHandler()
-    if gdal.GetLastErrorMsg() != 'Cannot read a zip file being written':
-        gdaltest.post_reason('expected error')
-        print(gdal.GetLastErrorMsg())
-        return 'fail'
-    if content is not None:
-        gdaltest.post_reason('bad content 2')
-        print(content)
-        return 'fail'
+    assert gdal.GetLastErrorMsg() == 'Cannot read a zip file being written', \
+        'expected error'
+    assert content is None, 'bad content 2'
 
     gdal.VSIFCloseL(fmain)
 
     content = gdal.ReadDir("/vsizip/" + zip_name)
-    if content != ['foo.bar', 'bar.baz']:
-        gdaltest.post_reason('bad content 3')
-        print(content)
-        return 'fail'
+    assert content == ['foo.bar', 'bar.baz'], 'bad content 3'
 
     fmain = gdal.VSIFOpenL("/vsizip/" + zip_name + "/foo.bar", "rb")
-    if fmain is None:
-        gdaltest.post_reason('fail 3')
-        return 'fail'
+    assert fmain is not None, 'fail 3'
     data = gdal.VSIFReadL(1, 5, fmain)
     gdal.VSIFCloseL(fmain)
 
-    if data.decode('ASCII') != '12345':
-        print(data)
-        return 'fail'
+    assert data.decode('ASCII') == '12345'
 
     fmain = gdal.VSIFOpenL("/vsizip/" + zip_name + "/bar.baz", "rb")
-    if fmain is None:
-        gdaltest.post_reason('fail 4')
-        return 'fail'
+    assert fmain is not None, 'fail 4'
     data = gdal.VSIFReadL(1, 5, fmain)
     gdal.VSIFCloseL(fmain)
 
-    if data.decode('ASCII') != '67890':
-        print(data)
-        return 'fail'
+    assert data.decode('ASCII') == '67890'
 
     gdal.Unlink(zip_name)
 
@@ -307,9 +245,7 @@ def test_vsizip_3():
 
     gdal.Unlink("/vsimem/test3.zip")
 
-    if res != ['foo', 'bar', 'baz']:
-        print(res)
-        return 'fail'
+    assert res == ['foo', 'bar', 'baz']
 
     return 'success'
 
@@ -321,15 +257,10 @@ def test_vsizip_4():
 
     # read recursive and validate content
     res = gdal.ReadDirRecursive("/vsizip/data/testzip.zip")
-    if res is None:
-        gdaltest.post_reason('fail read')
-        return 'fail'
-    if res != ['subdir/', 'subdir/subdir/', 'subdir/subdir/uint16.tif',
+    assert res is not None, 'fail read'
+    assert (res == ['subdir/', 'subdir/subdir/', 'subdir/subdir/uint16.tif',
                'subdir/subdir/test_rpc.txt', 'subdir/test_rpc.txt',
-               'test_rpc.txt', 'uint16.tif']:
-        gdaltest.post_reason('bad content')
-        print(res)
-        return 'fail'
+               'test_rpc.txt', 'uint16.tif']), 'bad content'
 
     return 'success'
 
@@ -341,27 +272,19 @@ def test_vsizip_5():
 
     # make file in memory
     fmain = gdal.VSIFOpenL('/vsizip/vsimem/bigdepthzip.zip', 'wb')
-    if fmain is None:
-        return 'fail'
+    assert fmain is not None
 
     filename = "a" + "/a" * 1000
     finside = gdal.VSIFOpenL('/vsizip/vsimem/bigdepthzip.zip/' + filename, 'wb')
-    if finside is None:
-        return 'fail'
+    assert finside is not None
     gdal.VSIFCloseL(finside)
     gdal.VSIFCloseL(fmain)
 
     # read recursive and validate content
     res = gdal.ReadDirRecursive("/vsizip/vsimem/bigdepthzip.zip")
-    if res is None:
-        gdaltest.post_reason('fail read')
-        return 'fail'
-    if len(res) != 1001:
-        gdaltest.post_reason('wrong size: ' + str(len(res)))
-        return 'fail'
-    if res[10] != 'a/a/a/a/a/a/a/a/a/a/a/':
-        gdaltest.post_reason('bad content: ' + res[10])
-        return 'fail'
+    assert res is not None, 'fail read'
+    assert len(res) == 1001, ('wrong size: ' + str(len(res)))
+    assert res[10] == 'a/a/a/a/a/a/a/a/a/a/a/', ('bad content: ' + res[10])
 
     gdal.Unlink("/vsimem/bigdepthzip.zip")
 
@@ -376,8 +299,7 @@ def test_vsizip_6():
     # Maintain ZIP file opened
     fmain = gdal.VSIFOpenL("/vsizip/vsimem/test6.zip", "wb")
     f = gdal.VSIFOpenL("/vsizip/vsimem/test6.zip/foo.bar", "wb")
-    if f is None:
-        return 'fail'
+    assert f is not None
     gdal.VSIFWriteL("12345", 1, 5, f)
     gdal.VSIFCloseL(f)
     f = None
@@ -395,8 +317,7 @@ def test_vsizip_6():
 
     # Now close it each time
     f = gdal.VSIFOpenL("/vsizip/vsimem/test6.zip/foo.bar", "wb")
-    if f is None:
-        return 'fail'
+    assert f is not None
     gdal.VSIFWriteL("12345", 1, 5, f)
     gdal.VSIFCloseL(f)
     f = None
@@ -429,9 +350,8 @@ def test_vsizip_7():
             ok = 1
 
     if ok == 0:
-        gdaltest.post_reason('bad content')
         print(content)
-        return 'fail'
+        pytest.fail('bad content')
 
     return 'success'
 
@@ -441,8 +361,7 @@ def test_vsizip_7():
 
 def test_vsizip_8():
 
-    if gdal.VSIStatL('/vsizip/vsizip/data/zero.bin.zip.zip/zero.bin.zip').size != 5000 * 1000 * 1000 + 1:
-        return 'fail'
+    assert gdal.VSIStatL('/vsizip/vsizip/data/zero.bin.zip.zip/zero.bin.zip').size == 5000 * 1000 * 1000 + 1
 
     return 'success'
 
@@ -452,25 +371,20 @@ def test_vsizip_8():
 
 def test_vsizip_9():
 
-    if gdal.VSIStatL('/vsizip//vsisparse/data/zero_stored.bin.xml.zip/zero.bin').size != 5000 * 1000 * 1000 + 1:
-        return 'fail'
+    assert gdal.VSIStatL('/vsizip//vsisparse/data/zero_stored.bin.xml.zip/zero.bin').size == 5000 * 1000 * 1000 + 1
 
-    if gdal.VSIStatL('/vsizip//vsisparse/data/zero_stored.bin.xml.zip/hello.txt').size != 6:
-        return 'fail'
+    assert gdal.VSIStatL('/vsizip//vsisparse/data/zero_stored.bin.xml.zip/hello.txt').size == 6
 
     f = gdal.VSIFOpenL('/vsizip//vsisparse/data/zero_stored.bin.xml.zip/zero.bin', 'rb')
     gdal.VSIFSeekL(f, 5000 * 1000 * 1000, 0)
     data = gdal.VSIFReadL(1, 1, f)
     gdal.VSIFCloseL(f)
-    if data.decode('ascii') != '\x03':
-        return 'fail'
+    assert data.decode('ascii') == '\x03'
 
     f = gdal.VSIFOpenL('/vsizip//vsisparse/data/zero_stored.bin.xml.zip/hello.txt', 'rb')
     data = gdal.VSIFReadL(1, 6, f)
     gdal.VSIFCloseL(f)
-    if data.decode('ascii') != 'HELLO\n':
-        print(data)
-        return 'fail'
+    assert data.decode('ascii') == 'HELLO\n'
 
     return 'success'
 
@@ -519,9 +433,8 @@ def test_vsizip_11():
             ok = 1
 
     if ok == 0:
-        gdaltest.post_reason('bad content')
         print(content)
-        return 'fail'
+        pytest.fail('bad content')
 
     return 'success'
 
@@ -571,9 +484,7 @@ def test_vsizip_12():
     gdal.Unlink('/vsimem/vsizip_12_src2.zip')
     gdal.Unlink('/vsimem/vsizip_12.zip')
 
-    if content != ['bar.baz']:
-        print(content)
-        return 'fail'
+    assert content == ['bar.baz']
 
     return 'success'
 
@@ -590,12 +501,10 @@ def test_vsizip_13():
     gdal.VSIFCloseL(fmain)
 
     lst = gdal.ReadDir('/vsizip/vsimem/vsizip_13.zip')
-    if len(lst) < 4:
-        return 'fail'
+    assert len(lst) >= 4
     # Test truncation
     lst_truncated = gdal.ReadDir('/vsizip/vsimem/vsizip_13.zip', int(len(lst) / 2))
-    if len(lst_truncated) <= int(len(lst) / 2):
-        return 'fail'
+    assert len(lst_truncated) > int(len(lst) / 2)
 
     gdal.Unlink('/vsimem/vsizip_13.zip')
 
@@ -627,10 +536,7 @@ def test_vsizip_14():
     gdal.VSIFCloseL(fmain)
 
     content = gdal.ReadDir("/vsizip//vsimem/vsizip_14.zip")
-    if content != [cp866_filename]:
-        gdaltest.post_reason('bad content')
-        print(content)
-        return 'fail'
+    assert content == [cp866_filename], 'bad content'
 
     gdal.Unlink('/vsimem/vsizip_14.zip')
 
@@ -686,9 +592,7 @@ def test_vsizip_multi_thread_below_threshold():
 
     gdal.Unlink('/vsimem/vsizip_multi_thread.zip')
 
-    if data != 'hello':
-        print(data)
-        return 'fail'
+    assert data == 'hello'
 
     return 'success'
 
@@ -714,20 +618,15 @@ def test_vsizip_create_zip64():
         gdal.VSIFCloseL(fmain)
 
     size = gdal.VSIStatL(zip_name).size
-    if size > 0xFFFFFFFF:
-        print(size)
-        return 'fail'
+    assert size <= 0xFFFFFFFF
 
     size = gdal.VSIStatL('/vsizip/' + zip_name + '/test').size
-    if size != len(s) * niters:
-        print(size)
-        return 'fail'
+    assert size == len(s) * niters
 
     f = gdal.VSIFOpenL('/vsizip/' + zip_name + '/test', 'rb')
     data = gdal.VSIFReadL(1, len(s), f).decode('ascii')
     gdal.VSIFCloseL(f)
-    if data != s:
-        return 'fail'
+    assert data == s
 
     gdal.Unlink(zip_name)
 
@@ -755,20 +654,15 @@ def test_vsizip_create_zip64_stream_larger_than_4G():
         gdal.VSIFCloseL(f)
 
     size = gdal.VSIStatL(zip_name).size
-    if size <= 0xFFFFFFFF:
-        print(size)
-        return 'fail'
+    assert size > 0xFFFFFFFF
 
     size = gdal.VSIStatL('/vsizip/' + zip_name + '/test2').size
-    if size != len(s) * niters:
-        print(size)
-        return 'fail'
+    assert size == len(s) * niters
 
     f = gdal.VSIFOpenL('/vsizip/' + zip_name + '/test2', 'rb')
     data = gdal.VSIFReadL(1, len(s), f).decode('ascii')
     gdal.VSIFCloseL(f)
-    if data != s:
-        return 'fail'
+    assert data == s
 
     gdal.Unlink(zip_name)
 
@@ -779,9 +673,7 @@ def test_vsizip_create_zip64_stream_larger_than_4G():
 def test_vsizip_byte_zip64_local_header_zeroed():
 
     size = gdal.VSIStatL('/vsizip/data/byte_zip64_local_header_zeroed.zip/byte.tif').size
-    if size != 736:
-        print(size)
-        return 'fail'
+    assert size == 736
 
     return 'success'
 
diff --git a/autotest/gdrivers/aaigrid.py b/autotest/gdrivers/aaigrid.py
index f3e23a10948c..3360cc2bf2aa 100755
--- a/autotest/gdrivers/aaigrid.py
+++ b/autotest/gdrivers/aaigrid.py
@@ -57,24 +57,17 @@ def test_aaigrid_2():
 
     gt = ds.GetGeoTransform()
 
-    if gt[0] != 100000.0 or gt[1] != 50 or gt[2] != 0 \
-       or gt[3] != 650600.0 or gt[4] != 0 or gt[5] != -50:
-        gdaltest.post_reason('Aaigrid geotransform wrong.')
-        return 'fail'
+    assert gt[0] == 100000.0 and gt[1] == 50 and gt[2] == 0 and gt[3] == 650600.0 and gt[4] == 0 and gt[5] == -50, \
+        'Aaigrid geotransform wrong.'
 
     prj = ds.GetProjection()
-    if prj != 'PROJCS["unnamed",GEOGCS["NAD83",DATUM["North_American_Datum_1983",SPHEROID["GRS 1980",6378137,298.257222101,AUTHORITY["EPSG","7019"]],TOWGS84[0,0,0,0,0,0,0],AUTHORITY["EPSG","6269"]],PRIMEM["Greenwich",0,AUTHORITY["EPSG","8901"]],UNIT["degree",0.0174532925199433,AUTHORITY["EPSG","9122"]],AUTHORITY["EPSG","4269"]],PROJECTION["Albers_Conic_Equal_Area"],PARAMETER["standard_parallel_1",61.66666666666666],PARAMETER["standard_parallel_2",68],PARAMETER["latitude_of_center",59],PARAMETER["longitude_of_center",-132.5],PARAMETER["false_easting",500000],PARAMETER["false_northing",500000],UNIT["METERS",1]]':
-        gdaltest.post_reason('Projection does not match expected:\n%s' % prj)
-        return 'fail'
+    assert prj == 'PROJCS["unnamed",GEOGCS["NAD83",DATUM["North_American_Datum_1983",SPHEROID["GRS 1980",6378137,298.257222101,AUTHORITY["EPSG","7019"]],TOWGS84[0,0,0,0,0,0,0],AUTHORITY["EPSG","6269"]],PRIMEM["Greenwich",0,AUTHORITY["EPSG","8901"]],UNIT["degree",0.0174532925199433,AUTHORITY["EPSG","9122"]],AUTHORITY["EPSG","4269"]],PROJECTION["Albers_Conic_Equal_Area"],PARAMETER["standard_parallel_1",61.66666666666666],PARAMETER["standard_parallel_2",68],PARAMETER["latitude_of_center",59],PARAMETER["longitude_of_center",-132.5],PARAMETER["false_easting",500000],PARAMETER["false_northing",500000],UNIT["METERS",1]]', \
+        ('Projection does not match expected:\n%s' % prj)
 
     band1 = ds.GetRasterBand(1)
-    if band1.GetNoDataValue() != -99999:
-        gdaltest.post_reason('Grid NODATA value wrong or missing.')
-        return 'fail'
+    assert band1.GetNoDataValue() == -99999, 'Grid NODATA value wrong or missing.'
 
-    if band1.DataType != gdal.GDT_Float32:
-        gdaltest.post_reason('Data type is not Float32!')
-        return 'fail'
+    assert band1.DataType == gdal.GDT_Float32, 'Data type is not Float32!'
 
     return 'success'
 
@@ -88,23 +81,15 @@ def test_aaigrid_comma():
 
     gt = ds.GetGeoTransform()
 
-    if gt[0] != 100000.0 or gt[1] != 50 or gt[2] != 0 \
-       or gt[3] != 650600.0 or gt[4] != 0 or gt[5] != -50:
-        gdaltest.post_reason('Aaigrid geotransform wrong.')
-        return 'fail'
+    assert gt[0] == 100000.0 and gt[1] == 50 and gt[2] == 0 and gt[3] == 650600.0 and gt[4] == 0 and gt[5] == -50, \
+        'Aaigrid geotransform wrong.'
 
     band1 = ds.GetRasterBand(1)
-    if band1.Checksum() != 1123:
-        gdaltest.post_reason('Did not get expected nodata value.')
-        return 'fail'
+    assert band1.Checksum() == 1123, 'Did not get expected nodata value.'
 
-    if band1.GetNoDataValue() != -99999:
-        gdaltest.post_reason('Grid NODATA value wrong or missing.')
-        return 'fail'
+    assert band1.GetNoDataValue() == -99999, 'Grid NODATA value wrong or missing.'
 
-    if band1.DataType != gdal.GDT_Float32:
-        gdaltest.post_reason('Data type is not Float32!')
-        return 'fail'
+    assert band1.DataType == gdal.GDT_Float32, 'Data type is not Float32!'
 
     return 'success'
 
@@ -175,13 +160,9 @@ def test_aaigrid_6():
     ds = gdal.Open('data/nodata_float.asc')
 
     b = ds.GetRasterBand(1)
-    if b.GetNoDataValue() != -99999:
-        gdaltest.post_reason('Grid NODATA value wrong or missing.')
-        return 'fail'
+    assert b.GetNoDataValue() == -99999, 'Grid NODATA value wrong or missing.'
 
-    if b.DataType != gdal.GDT_Float32:
-        gdaltest.post_reason('Data type is not Float32!')
-        return 'fail'
+    assert b.DataType == gdal.GDT_Float32, 'Data type is not Float32!'
 
     return 'success'
 
@@ -194,13 +175,9 @@ def test_aaigrid_6bis():
     ds = gdal.Open('data/nodata_int.asc')
 
     b = ds.GetRasterBand(1)
-    if b.GetNoDataValue() != -99999:
-        gdaltest.post_reason('Grid NODATA value wrong or missing.')
-        return 'fail'
+    assert b.GetNoDataValue() == -99999, 'Grid NODATA value wrong or missing.'
 
-    if b.DataType != gdal.GDT_Int32:
-        gdaltest.post_reason('Data type is not Int32!')
-        return 'fail'
+    assert b.DataType == gdal.GDT_Int32, 'Data type is not Int32!'
 
     return 'success'
 
@@ -249,9 +226,7 @@ def test_aaigrid_10():
 
     # By default detected as 32bit float
     ds = gdal.Open('data/float64.asc')
-    if ds.GetRasterBand(1).DataType != gdal.GDT_Float32:
-        gdaltest.post_reason('Data type is not Float32!')
-        return 'fail'
+    assert ds.GetRasterBand(1).DataType == gdal.GDT_Float32, 'Data type is not Float32!'
 
     for i in range(2):
 
@@ -267,22 +242,16 @@ def test_aaigrid_10():
         else:
             ds = gdal.OpenEx('data/float64.asc', open_options=['DATATYPE=Float64'])
 
-        if ds.GetRasterBand(1).DataType != gdal.GDT_Float64:
-            gdaltest.post_reason('Data type is not Float64!')
-            return 'fail'
+        assert ds.GetRasterBand(1).DataType == gdal.GDT_Float64, 'Data type is not Float64!'
 
         nv = ds.GetRasterBand(1).GetNoDataValue()
-        if abs(nv - -1.234567890123) > 1e-16:
-            gdaltest.post_reason('did not get expected nodata value')
-            return 'fail'
+        assert abs(nv - -1.234567890123) <= 1e-16, 'did not get expected nodata value'
 
         got_minmax = ds.GetRasterBand(1).ComputeRasterMinMax()
-        if abs(got_minmax[0] - 1.234567890123) > 1e-16:
-            gdaltest.post_reason('did not get expected min value')
-            return 'fail'
-        if abs(got_minmax[1] - 1.234567890123) > 1e-16:
-            gdaltest.post_reason('did not get expected max value')
-            return 'fail'
+        assert abs(got_minmax[0] - 1.234567890123) <= 1e-16, \
+            'did not get expected min value'
+        assert abs(got_minmax[1] - 1.234567890123) <= 1e-16, \
+            'did not get expected max value'
 
         try:
             os.remove('data/float64.asc.aux.xml')
@@ -320,19 +289,14 @@ def test_aaigrid_12():
     del ds2
 
     aai = open('tmp/aaigrid.tmp')
-    if not aai:
-        return 'fail'
+    assert aai
     for _ in range(5):
         aai.readline()
     ndv = aai.readline().strip().lower()
     aai.close()
     gdal.GetDriverByName('AAIGRID').Delete('tmp/aaigrid.tmp')
-    if not ndv.startswith('nodata_value'):
-        print(ndv)
-        return 'fail'
-    if not ndv.endswith('-99999.000'):
-        print(ndv)
-        return 'fail'
+    assert ndv.startswith('nodata_value')
+    assert ndv.endswith('-99999.000')
     return 'success'
 
 ###############################################################################
@@ -347,19 +311,14 @@ def test_aaigrid_13():
     del ds2
 
     aai = open('tmp/aaigrid.tmp')
-    if not aai:
-        return 'fail'
+    assert aai
     for _ in range(5):
         aai.readline()
     ndv = aai.readline().strip().lower()
     aai.close()
     gdal.GetDriverByName('AAIGRID').Delete('tmp/aaigrid.tmp')
-    if not ndv.startswith('nodata_value'):
-        print(ndv)
-        return 'fail'
-    if not ndv.endswith('-1e+05') and not ndv.endswith('-1e+005'):
-        print(ndv)
-        return 'fail'
+    assert ndv.startswith('nodata_value')
+    assert ndv.endswith('-1e+05') or ndv.endswith('-1e+005')
     return 'success'
 
 ###############################################################################
@@ -380,9 +339,7 @@ def test_aaigrid_14():
 
     gdal.GetDriverByName('AAIGRID').Delete('/vsimem/aaigrid_14.asc')
 
-    if data.find('107.0 123') < 0:
-        print(data)
-        return 'fail'
+    assert data.find('107.0 123') >= 0
 
     return 'success'
 
@@ -402,8 +359,7 @@ def test_aaigrid_15():
 """)
 
     ds = gdal.Open('/vsimem/aaigrid_15.asc')
-    if ds.GetRasterBand(1).DataType != gdal.GDT_Float64:
-        return 'fail'
+    assert ds.GetRasterBand(1).DataType == gdal.GDT_Float64
     ds = None
 
     gdal.Unlink('/vsimem/aaigrid_15.asc')
diff --git a/autotest/gdrivers/adrg.py b/autotest/gdrivers/adrg.py
index e61f8017f0ef..e247f2500dd4 100755
--- a/autotest/gdrivers/adrg.py
+++ b/autotest/gdrivers/adrg.py
@@ -77,9 +77,7 @@ def test_adrg_copy():
 
     chksum = dstds.GetRasterBand(1).Checksum()
 
-    if chksum != 62833:
-        gdaltest.post_reason('Wrong checksum')
-        return 'fail'
+    assert chksum == 62833, 'Wrong checksum'
 
     dstds = None
 
@@ -104,22 +102,16 @@ def test_adrg_2subdatasets():
     shutil.copy('tmp/XXXXXX01.IMG', 'tmp/XXXXXX02.IMG')
 
     ds = gdal.Open('tmp/TRANSH01.THF')
-    if ds.RasterCount != 0:
-        gdaltest.post_reason('did not expected non 0 RasterCount')
-        return 'fail'
+    assert ds.RasterCount == 0, 'did not expected non 0 RasterCount'
     ds = None
 
     ds = gdal.Open('ADRG:tmp/XXXXXX01.GEN,tmp/XXXXXX02.IMG')
     chksum = ds.GetRasterBand(1).Checksum()
 
-    if chksum != 62833:
-        gdaltest.post_reason('Wrong checksum')
-        return 'fail'
+    assert chksum == 62833, 'Wrong checksum'
 
     md = ds.GetMetadata('')
-    if md['ADRG_NAM'] != 'XXXXXX02':
-        gdaltest.post_reason('metadata wrong.')
-        return 'fail'
+    assert md['ADRG_NAM'] == 'XXXXXX02', 'metadata wrong.'
 
     ds = None
 
@@ -144,9 +136,7 @@ def test_adrg_copy_vsimem():
 
     chksum = dstds.GetRasterBand(1).Checksum()
 
-    if chksum != 62833:
-        gdaltest.post_reason('Wrong checksum')
-        return 'fail'
+    assert chksum == 62833, 'Wrong checksum'
 
     dstds = None
 
@@ -154,9 +144,7 @@ def test_adrg_copy_vsimem():
     ds = gdal.Open('/vsimem/ABCDEF01.GEN')
 
     chksum = ds.GetRasterBand(1).Checksum()
-    if chksum != 62833:
-        gdaltest.post_reason('Wrong checksum')
-        return 'fail'
+    assert chksum == 62833, 'Wrong checksum'
 
     ds = None
 
@@ -174,15 +162,11 @@ def test_adrg_zna_9():
     ds = gdal.Open('data/SMALL_ADRG_ZNA9/ABCDEF01.GEN')
     expected_gt = (-307675.73602473765, 100.09145391818853, 0.0, -179477.5051066006, 0.0, -100.09145391818853)
     gt = ds.GetGeoTransform()
-    if max(abs(gt[i] - expected_gt[i]) for i in range(6)) > 1e-5:
-        gdaltest.post_reason('Wrong geotransfsorm')
-        print(gt)
-        return 'fail'
+    assert max(abs(gt[i] - expected_gt[i]) for i in range(6)) <= 1e-5, \
+        'Wrong geotransfsorm'
     wkt = ds.GetProjectionRef()
-    if wkt != """PROJCS["ARC_System_Zone_09",GEOGCS["GCS_Sphere",DATUM["D_Sphere",SPHEROID["Sphere",6378137.0,0.0]],PRIMEM["Greenwich",0],UNIT["degree",0.0174532925199433]],PROJECTION["Azimuthal_Equidistant"],PARAMETER["latitude_of_center",90],PARAMETER["longitude_of_center",0],PARAMETER["false_easting",0],PARAMETER["false_northing",0]]""":
-        gdaltest.post_reason('Wrong WKT')
-        print(wkt)
-        return 'fail'
+    assert wkt == """PROJCS["ARC_System_Zone_09",GEOGCS["GCS_Sphere",DATUM["D_Sphere",SPHEROID["Sphere",6378137.0,0.0]],PRIMEM["Greenwich",0],UNIT["degree",0.0174532925199433]],PROJECTION["Azimuthal_Equidistant"],PARAMETER["latitude_of_center",90],PARAMETER["longitude_of_center",0],PARAMETER["false_easting",0],PARAMETER["false_northing",0]]""", \
+        'Wrong WKT'
 
     return 'success'
 
@@ -195,15 +179,11 @@ def test_adrg_zna_18():
     ds = gdal.Open('data/SMALL_ADRG_ZNA18/ABCDEF01.GEN')
     expected_gt = (-307675.73602473765, 100.09145391818853, 0.0, 179477.5051066006, 0.0, -100.09145391818853)
     gt = ds.GetGeoTransform()
-    if max(abs(gt[i] - expected_gt[i]) for i in range(6)) > 1e-5:
-        gdaltest.post_reason('Wrong geotransfsorm')
-        print(gt)
-        return 'fail'
+    assert max(abs(gt[i] - expected_gt[i]) for i in range(6)) <= 1e-5, \
+        'Wrong geotransfsorm'
     wkt = ds.GetProjectionRef()
-    if wkt != """PROJCS["ARC_System_Zone_18",GEOGCS["GCS_Sphere",DATUM["D_Sphere",SPHEROID["Sphere",6378137.0,0.0]],PRIMEM["Greenwich",0],UNIT["degree",0.0174532925199433]],PROJECTION["Azimuthal_Equidistant"],PARAMETER["latitude_of_center",-90],PARAMETER["longitude_of_center",0],PARAMETER["false_easting",0],PARAMETER["false_northing",0]]""":
-        gdaltest.post_reason('Wrong WKT')
-        print(wkt)
-        return 'fail'
+    assert wkt == """PROJCS["ARC_System_Zone_18",GEOGCS["GCS_Sphere",DATUM["D_Sphere",SPHEROID["Sphere",6378137.0,0.0]],PRIMEM["Greenwich",0],UNIT["degree",0.0174532925199433]],PROJECTION["Azimuthal_Equidistant"],PARAMETER["latitude_of_center",-90],PARAMETER["longitude_of_center",0],PARAMETER["false_easting",0],PARAMETER["false_northing",0]]""", \
+        'Wrong WKT'
 
     return 'success'
 
diff --git a/autotest/gdrivers/aigrid.py b/autotest/gdrivers/aigrid.py
index ba7bbbbe41fd..b2c6907ddcbb 100755
--- a/autotest/gdrivers/aigrid.py
+++ b/autotest/gdrivers/aigrid.py
@@ -55,24 +55,17 @@ def test_aigrid_2():
 
     gt = ds.GetGeoTransform()
 
-    if gt[0] != -0.5 or gt[1] != 1.0 or gt[2] != 0.0 \
-       or gt[3] != 0.5 or gt[4] != 0.0 or gt[5] != -1.0:
-        gdaltest.post_reason('Aigrid geotransform wrong.')
-        return 'fail'
+    assert gt[0] == -0.5 and gt[1] == 1.0 and gt[2] == 0.0 and gt[3] == 0.5 and gt[4] == 0.0 and gt[5] == -1.0, \
+        'Aigrid geotransform wrong.'
 
     prj = ds.GetProjection()
-    if prj.find('PROJCS["UTM Zone 55, Southern Hemisphere",GEOGCS["GDA94",DATUM["Geocentric_Datum_of_Australia_1994"') == -1:
-        gdaltest.post_reason('Projection does not match expected:\n%s' % prj)
-        return 'fail'
+    assert prj.find('PROJCS["UTM Zone 55, Southern Hemisphere",GEOGCS["GDA94",DATUM["Geocentric_Datum_of_Australia_1994"') != -1, \
+        ('Projection does not match expected:\n%s' % prj)
 
     band1 = ds.GetRasterBand(1)
-    if band1.GetNoDataValue() != 255:
-        gdaltest.post_reason('Grid NODATA value wrong or missing.')
-        return 'fail'
+    assert band1.GetNoDataValue() == 255, 'Grid NODATA value wrong or missing.'
 
-    if band1.DataType != gdal.GDT_Byte:
-        gdaltest.post_reason('Data type is not Byte!')
-        return 'fail'
+    assert band1.DataType == gdal.GDT_Byte, 'Data type is not Byte!'
 
     return 'success'
 
@@ -84,17 +77,12 @@ def test_aigrid_3():
 
     ds = gdal.Open('data/abc3x1')
     cm = ds.GetRasterBand(1).GetRasterColorTable()
-    if cm.GetCount() != 256 \
-       or cm.GetColorEntry(0) != (95, 113, 150, 255)\
-       or cm.GetColorEntry(1) != (95, 57, 29, 255):
-        gdaltest.post_reason('Wrong colormap entries')
-        return 'fail'
+    assert cm.GetCount() == 256 and cm.GetColorEntry(0) == (95, 113, 150, 255) and cm.GetColorEntry(1) == (95, 57, 29, 255), \
+        'Wrong colormap entries'
 
     cm = None
 
-    if ds.GetRasterBand(1).GetNoDataValue() != 255.0:
-        gdaltest.post_reason('Wrong nodata value.')
-        return 'fail'
+    assert ds.GetRasterBand(1).GetNoDataValue() == 255.0, 'Wrong nodata value.'
 
     return 'success'
 ###############################################################################
@@ -114,17 +102,12 @@ def test_aigrid_5():
 
     ds = gdal.Open('data/ABC3X1UC')
     cm = ds.GetRasterBand(1).GetRasterColorTable()
-    if cm.GetCount() != 256 \
-       or cm.GetColorEntry(0) != (95, 113, 150, 255)\
-       or cm.GetColorEntry(1) != (95, 57, 29, 255):
-        gdaltest.post_reason('Wrong colormap entries')
-        return 'fail'
+    assert cm.GetCount() == 256 and cm.GetColorEntry(0) == (95, 113, 150, 255) and cm.GetColorEntry(1) == (95, 57, 29, 255), \
+        'Wrong colormap entries'
 
     cm = None
 
-    if ds.GetRasterBand(1).GetNoDataValue() != 255.0:
-        gdaltest.post_reason('Wrong nodata value.')
-        return 'fail'
+    assert ds.GetRasterBand(1).GetNoDataValue() == 255.0, 'Wrong nodata value.'
 
     return 'success'
 
@@ -136,13 +119,9 @@ def test_aigrid_6():
 
     ds = gdal.Open('data/aigrid_sta_24bytes/teststa')
 
-    if ds.GetRasterBand(1).GetMinimum() != 0.0:
-        gdaltest.post_reason('Wrong minimum')
-        return 'fail'
+    assert ds.GetRasterBand(1).GetMinimum() == 0.0, 'Wrong minimum'
 
-    if ds.GetRasterBand(1).GetMaximum() != 2.0:
-        gdaltest.post_reason('Wrong maximum')
-        return 'fail'
+    assert ds.GetRasterBand(1).GetMaximum() == 2.0, 'Wrong maximum'
 
     return 'success'
 
@@ -190,53 +169,29 @@ def test_aigrid_online_1():
         print('Skipping RAT checking... OG Python bindings have no RAT API')
         return 'success'
 
-    if rat is None:
-        gdaltest.post_reason('No RAT found')
-        return 'fail'
+    assert rat is not None, 'No RAT found'
 
-    if rat.GetRowCount() != 2642:
-        gdaltest.post_reason('Wrong row count in RAT')
-        return 'fail'
+    assert rat.GetRowCount() == 2642, 'Wrong row count in RAT'
 
-    if rat.GetColumnCount() != 2:
-        gdaltest.post_reason('Wrong column count in RAT')
-        return 'fail'
+    assert rat.GetColumnCount() == 2, 'Wrong column count in RAT'
 
-    if rat.GetNameOfCol(0) != 'VALUE':
-        gdaltest.post_reason('Wrong name of col 0')
-        return 'fail'
+    assert rat.GetNameOfCol(0) == 'VALUE', 'Wrong name of col 0'
 
-    if rat.GetTypeOfCol(0) != gdal.GFT_Integer:
-        gdaltest.post_reason('Wrong type of col 0')
-        return 'fail'
+    assert rat.GetTypeOfCol(0) == gdal.GFT_Integer, 'Wrong type of col 0'
 
-    if rat.GetUsageOfCol(0) != gdal.GFU_MinMax:
-        gdaltest.post_reason('Wrong usage of col 0')
-        return 'fail'
+    assert rat.GetUsageOfCol(0) == gdal.GFU_MinMax, 'Wrong usage of col 0'
 
-    if rat.GetNameOfCol(1) != 'COUNT':
-        gdaltest.post_reason('Wrong name of col 1')
-        return 'fail'
+    assert rat.GetNameOfCol(1) == 'COUNT', 'Wrong name of col 1'
 
-    if rat.GetTypeOfCol(1) != gdal.GFT_Integer:
-        gdaltest.post_reason('Wrong type of col 1')
-        return 'fail'
+    assert rat.GetTypeOfCol(1) == gdal.GFT_Integer, 'Wrong type of col 1'
 
-    if rat.GetUsageOfCol(1) != gdal.GFU_PixelCount:
-        gdaltest.post_reason('Wrong usage of col 1')
-        return 'fail'
+    assert rat.GetUsageOfCol(1) == gdal.GFU_PixelCount, 'Wrong usage of col 1'
 
-    if rat.GetValueAsInt(2641, 0) != 3627:
-        gdaltest.post_reason('Wrong value in RAT')
-        return 'fail'
+    assert rat.GetValueAsInt(2641, 0) == 3627, 'Wrong value in RAT'
 
-    if ds.GetRasterBand(1).GetMinimum() != 0.0:
-        gdaltest.post_reason('Wrong minimum')
-        return 'fail'
+    assert ds.GetRasterBand(1).GetMinimum() == 0.0, 'Wrong minimum'
 
-    if ds.GetRasterBand(1).GetMaximum() != 3627.0:
-        gdaltest.post_reason('Wrong maximum')
-        return 'fail'
+    assert ds.GetRasterBand(1).GetMaximum() == 3627.0, 'Wrong maximum'
 
     return 'success'
 
diff --git a/autotest/gdrivers/arg.py b/autotest/gdrivers/arg.py
index 60feb6b8dc86..331482ee180d 100755
--- a/autotest/gdrivers/arg.py
+++ b/autotest/gdrivers/arg.py
@@ -134,12 +134,10 @@ def test_arg_unsupported():
             if name == 'int64' or name == 'uint64':
                 with gdaltest.error_handler('CPLQuietErrorHandler'):
                     ds = gdal.Open('data/arg-' + name + '.arg')
-                if ds is not None:
-                    return 'fail'
+                assert ds is None
             else:
                 ds = gdal.Open('data/arg-' + name + '.arg')
-                if ds is None:
-                    return 'fail'
+                assert ds is not None
 
     return 'success'
 
@@ -155,8 +153,7 @@ def test_arg_getrastercount():
             if ds is None:
                 continue
 
-            if ds.RasterCount != 1:
-                return 'fail'
+            assert ds.RasterCount == 1
 
     return 'success'
 
@@ -174,13 +171,12 @@ def test_arg_getgeotransform():
 
             gt = ds.GetGeoTransform()
 
-            if gt[0] != 0 or \
-                    gt[1] != 1 or \
-                    gt[2] != 0 or \
-                    gt[3] != 2 or \
-                    gt[4] != 0 or \
-                    gt[5] != -1:
-                return 'fail'
+            assert (gt[0] == 0 and \
+                    gt[1] == 1 and \
+                    gt[2] == 0 and \
+                    gt[3] == 2 and \
+                    gt[4] == 0 and \
+                    gt[5] == -1)
 
     return 'success'
 
@@ -190,8 +186,7 @@ def test_arg_blocksize():
         return 'skip'
 
     tifDriver = gdal.GetDriverByName('GTiff')
-    if tifDriver is None:
-        return 'fail'
+    assert tifDriver is not None
 
     ds = gdal.Open('data/utm.tif')
     xsize = ds.RasterXSize
@@ -212,8 +207,7 @@ def test_arg_blocksize():
     os.remove('data/utm-uneven-blocks.tif')
     gdal.GetDriverByName('ARG').Delete('data/utm.arg')
 
-    if stat.st_size != (xsize * ysize):
-        return 'fail'
+    assert stat.st_size == (xsize * ysize)
 
     return 'success'
 
@@ -235,8 +229,7 @@ def test_arg_layername():
     ds.SetMetadataItem('LAYER', lyr)
 
     # did the layer name stick?
-    if ds.GetMetadata()['LAYER'] != lyr:
-        return 'fail'
+    assert ds.GetMetadata()['LAYER'] == lyr
 
     # copy the dataset to a new ARG
     ds2 = gdaltest.argDriver.CreateCopy('data/arg-int16-2.arg', ds, False)
@@ -253,8 +246,7 @@ def test_arg_layername():
     gdal.GetDriverByName('ARG').Delete('data/arg-int16-2.arg')
 
     # does the new dataset's layer match the layer set before copying
-    if lyr2 != lyr:
-        return 'fail'
+    assert lyr2 == lyr
 
     os.unlink('data/arg-int16.arg.aux.xml')
 
@@ -271,8 +263,7 @@ def test_arg_nodata():
 
     ds = gdal.Open('data/arg-int8.arg')
 
-    if ds.GetRasterBand(1).GetNoDataValue() != 128:
-        return 'fail'
+    assert ds.GetRasterBand(1).GetNoDataValue() == 128
 
     return 'success'
 
@@ -289,8 +280,7 @@ def test_arg_byteorder():
         return 'skip'
 
     tifDriver = gdal.GetDriverByName('GTiff')
-    if tifDriver is None:
-        return 'fail'
+    assert tifDriver is not None
 
     for d in gdaltest.argTests:
         for (name, _, _) in d['formats']:
@@ -302,12 +292,10 @@ def test_arg_byteorder():
                 continue
 
             dest = tifDriver.CreateCopy(basename + '.tif', orig, False)
-            if dest is None:
-                return 'fail'
+            assert dest is not None
 
             mirror = gdaltest.argDriver.CreateCopy(basename + '2.arg', dest, False)
-            if mirror is None:
-                return 'fail'
+            assert mirror is not None
 
             orig = None
             dest = None
@@ -325,8 +313,7 @@ def test_arg_byteorder():
             gdal.GetDriverByName('GTiff').Delete(basename + '.tif')
             gdal.GetDriverByName('ARG').Delete(basename + '2.arg')
 
-            if data1 != data2:
-                return 'fail'
+            assert data1 == data2
 
     return 'success'
 
diff --git a/autotest/gdrivers/bag.py b/autotest/gdrivers/bag.py
index f2a190c6d4f1..54b2b2719781 100755
--- a/autotest/gdrivers/bag.py
+++ b/autotest/gdrivers/bag.py
@@ -64,58 +64,37 @@ def test_bag_2():
     ds = gdal.Open('data/true_n_nominal.bag')
 
     cs = ds.GetRasterBand(1).Checksum()
-    if cs != 1072:
-        gdaltest.post_reason('Wrong checksum on band 1, got %d.' % cs)
-        return 'fail'
+    assert cs == 1072, ('Wrong checksum on band 1, got %d.' % cs)
 
     cs = ds.GetRasterBand(2).Checksum()
-    if cs != 150:
-        gdaltest.post_reason('Wrong checksum on band 2, got %d.' % cs)
-        return 'fail'
+    assert cs == 150, ('Wrong checksum on band 2, got %d.' % cs)
 
     cs = ds.GetRasterBand(3).Checksum()
-    if cs != 1315:
-        gdaltest.post_reason('Wrong checksum on band 3, got %d.' % cs)
-        return 'fail'
+    assert cs == 1315, ('Wrong checksum on band 3, got %d.' % cs)
 
     b1 = ds.GetRasterBand(1)
-    if abs(b1.GetMinimum() - 10) > 0.01:
-        gdaltest.post_reason('band 1 minimum wrong.')
-        return 'fail'
+    assert abs(b1.GetMinimum() - 10) <= 0.01, 'band 1 minimum wrong.'
 
-    if abs(b1.GetMaximum() - 19.8) > 0.01:
-        gdaltest.post_reason('band 1 maximum wrong.')
-        return 'fail'
+    assert abs(b1.GetMaximum() - 19.8) <= 0.01, 'band 1 maximum wrong.'
 
-    if abs(b1.GetNoDataValue() - 1000000.0) > 0.1:
-        gdaltest.post_reason('band 1 nodata wrong.')
-        return 'fail'
+    assert abs(b1.GetNoDataValue() - 1000000.0) <= 0.1, 'band 1 nodata wrong.'
 
     b2 = ds.GetRasterBand(2)
-    if abs(b2.GetNoDataValue() - 1000000.0) > 0.1:
-        gdaltest.post_reason('band 2 nodata wrong.')
-        return 'fail'
+    assert abs(b2.GetNoDataValue() - 1000000.0) <= 0.1, 'band 2 nodata wrong.'
 
     b3 = ds.GetRasterBand(3)
-    if abs(b3.GetNoDataValue() - 0.0) > 0.1:
-        gdaltest.post_reason('band 3 nodata wrong.')
-        return 'fail'
+    assert abs(b3.GetNoDataValue() - 0.0) <= 0.1, 'band 3 nodata wrong.'
 
     # It would be nice to test srs and geotransform but they are
     # pretty much worthless on this dataset.
 
     # Test the xml:BAG metadata domain
     xmlBag = ds.GetMetadata('xml:BAG')[0]
-    if xmlBag.find('<?xml') != 0:
-        gdaltest.post_reason('did not get xml:BAG metadata')
-        print(xmlBag)
-        return 'fail'
+    assert xmlBag.find('<?xml') == 0, 'did not get xml:BAG metadata'
 
     ds = None
 
-    if gdaltest.is_file_open('data/true_n_nominal.bag'):
-        gdaltest.post_reason('file still opened.')
-        return 'fail'
+    assert not gdaltest.is_file_open('data/true_n_nominal.bag'), 'file still opened.'
 
     return 'success'
 
@@ -131,27 +110,18 @@ def test_bag_3():
     ds = gdal.Open('data/southern_hemi_false_northing.bag')
 
     nr = ds.RasterCount
-    if nr != 2:
-        gdaltest.post_reason('Expected 2 bands, got %d.' % nr)
-        return 'fail'
+    assert nr == 2, ('Expected 2 bands, got %d.' % nr)
 
     cs = ds.GetRasterBand(1).Checksum()
-    if cs != 21402:
-        gdaltest.post_reason('Wrong checksum on band 1, got %d.' % cs)
-        return 'fail'
+    assert cs == 21402, ('Wrong checksum on band 1, got %d.' % cs)
 
     cs = ds.GetRasterBand(2).Checksum()
-    if cs != 33216:
-        gdaltest.post_reason('Wrong checksum on band 2, got %d.' % cs)
-        return 'fail'
+    assert cs == 33216, ('Wrong checksum on band 2, got %d.' % cs)
 
     pj = ds.GetProjection()
-    if 'Southern Hemisphere' not in pj:
-        gdaltest.post_reason('Southern Hemisphere not in projection')
-        return 'fail'
-    if 'PARAMETER["false_northing",10000000]' not in pj:
-        gdaltest.post_reason('Did not find false_northing of 10000000')
-        return 'fail'
+    assert 'Southern Hemisphere' in pj, 'Southern Hemisphere not in projection'
+    assert 'PARAMETER["false_northing",10000000]' in pj, \
+        'Did not find false_northing of 10000000'
 
     return 'success'
 
@@ -165,8 +135,7 @@ def test_bag_vr_normal():
         return 'skip'
 
     ds = gdal.Open('data/test_vr.bag')
-    if ds is None:
-        return 'fail'
+    assert ds is not None
 
     got_md = gdal.Info(ds, computeChecksum=True, format='json')
     expected_md = {
@@ -215,13 +184,10 @@ def test_bag_vr_normal():
     with gdaltest.error_handler():
         ds = gdal.OpenEx('data/test_vr.bag',
                          open_options=['MODE=LOW_RES_GRID', 'MINX=0'])
-    if gdal.GetLastErrorMsg() == '':
-        gdaltest.post_reason('warning expected')
-        return 'fail'
+    assert gdal.GetLastErrorMsg() != '', 'warning expected'
 
     got_md2 = gdal.Info(ds, computeChecksum=True, format='json')
-    if got_md2 != got_md:
-        return 'fail'
+    assert got_md2 == got_md
 
     return 'success'
 
@@ -235,17 +201,11 @@ def test_bag_vr_list_supergrids():
         return 'skip'
 
     ds = gdal.OpenEx('data/test_vr.bag', open_options=['MODE=LIST_SUPERGRIDS'])
-    if ds is None:
-        return 'fail'
+    assert ds is not None
     sub_ds = ds.GetSubDatasets()
-    if len(sub_ds) != 24:
-        print(len(sub_ds))
-        print(sub_ds)
-        return 'fail'
+    assert len(sub_ds) == 24
 
-    if sub_ds[0][0] != 'BAG:"data/test_vr.bag":supergrid:0:0':
-        print(sub_ds)
-        return 'fail'
+    assert sub_ds[0][0] == 'BAG:"data/test_vr.bag":supergrid:0:0'
 
     with gdaltest.error_handler():
         # Bounding box filter ignored since only part of MINX, MINY, MAXX and
@@ -253,52 +213,32 @@ def test_bag_vr_list_supergrids():
         ds = gdal.OpenEx('data/test_vr.bag',
                          open_options=['MODE=LIST_SUPERGRIDS', 'MINX=200'])
     sub_ds = ds.GetSubDatasets()
-    if len(sub_ds) != 24:
-        print(len(sub_ds))
-        print(sub_ds)
-        return 'fail'
+    assert len(sub_ds) == 24
 
     ds = gdal.OpenEx('data/test_vr.bag', open_options=[
                      'MODE=LIST_SUPERGRIDS', 'MINX=100', 'MAXX=220', 'MINY=500000', 'MAXY=500100'])
     sub_ds = ds.GetSubDatasets()
-    if len(sub_ds) != 6:
-        print(len(sub_ds))
-        print(sub_ds)
-        return 'fail'
-    if sub_ds[0][0] != 'BAG:"data/test_vr.bag":supergrid:1:1':
-        print(sub_ds)
-        return 'fail'
+    assert len(sub_ds) == 6
+    assert sub_ds[0][0] == 'BAG:"data/test_vr.bag":supergrid:1:1'
 
     ds = gdal.OpenEx('data/test_vr.bag', open_options=[
                      'MODE=LIST_SUPERGRIDS', 'RES_FILTER_MIN=5', 'RES_FILTER_MAX=10'])
     sub_ds = ds.GetSubDatasets()
-    if len(sub_ds) != 12:
-        print(len(sub_ds))
-        print(sub_ds)
-        return 'fail'
-    if sub_ds[0][0] != 'BAG:"data/test_vr.bag":supergrid:0:3':
-        print(sub_ds)
-        return 'fail'
+    assert len(sub_ds) == 12
+    assert sub_ds[0][0] == 'BAG:"data/test_vr.bag":supergrid:0:3'
 
     ds = gdal.OpenEx('data/test_vr.bag', open_options=[
                      'SUPERGRIDS_INDICES=(2,1),(3,4)'])
     sub_ds = ds.GetSubDatasets()
-    if len(sub_ds) != 2:
-        print(len(sub_ds))
-        print(sub_ds)
-        return 'fail'
-    if sub_ds[0][0] != 'BAG:"data/test_vr.bag":supergrid:2:1' or \
-       sub_ds[1][0] != 'BAG:"data/test_vr.bag":supergrid:3:4':
-        print(sub_ds)
-        return 'fail'
+    assert len(sub_ds) == 2
+    assert (sub_ds[0][0] == 'BAG:"data/test_vr.bag":supergrid:2:1' and \
+       sub_ds[1][0] == 'BAG:"data/test_vr.bag":supergrid:3:4')
 
     # One single tuple: open the subdataset directly
     ds = gdal.OpenEx('data/test_vr.bag', open_options=[
                      'SUPERGRIDS_INDICES=(2,1)'])
     ds2 = gdal.Open('BAG:"data/test_vr.bag":supergrid:2:1')
-    if gdal.Info(ds) != gdal.Info(ds2):
-        print(sub_ds)
-        return 'fail'
+    assert gdal.Info(ds) == gdal.Info(ds2), sub_ds
 
     # Test invalid values for SUPERGRIDS_INDICES
     for invalid_val in ['', 'x', '(', '(1', '(1,', '(1,)', '(1,2),',
@@ -306,9 +246,7 @@ def test_bag_vr_list_supergrids():
         with gdaltest.error_handler():
             ds = gdal.OpenEx('data/test_vr.bag', open_options=[
                 'SUPERGRIDS_INDICES=' + invalid_val])
-        if gdal.GetLastErrorMsg() == '':
-            print(invalid_val)
-            return 'fail'
+        assert gdal.GetLastErrorMsg() != '', invalid_val
 
     return 'success'
 
@@ -322,8 +260,7 @@ def test_bag_vr_open_supergrids():
         return 'skip'
 
     ds = gdal.Open('BAG:"data/test_vr.bag":supergrid:0:0')
-    if ds is None:
-        return 'fail'
+    assert ds is not None
 
     got_md = gdal.Info(ds, computeChecksum=True, format='json')
     expected_md = {
@@ -368,25 +305,20 @@ def test_bag_vr_open_supergrids():
 
     with gdaltest.error_handler():
         ds = gdal.Open('BAG:"/vsimem/unexisting.bag":supergrid:0:0')
-    if ds is not None:
-        return 'fail'
+    assert ds is None
 
     with gdaltest.error_handler():
         ds = gdal.Open('BAG:"data/test_vr.bag":supergrid:4:0')
-    if ds is not None:
-        return 'fail'
+    assert ds is None
 
     with gdaltest.error_handler():
         ds = gdal.Open('BAG:"data/test_vr.bag":supergrid:0:6')
-    if ds is not None:
-        return 'fail'
+    assert ds is None
 
     with gdaltest.error_handler():
         ds = gdal.OpenEx('BAG:"data/test_vr.bag":supergrid:0:0',
                          open_options=['MINX=0'])
-    if gdal.GetLastErrorMsg() == '':
-        gdaltest.post_reason('warning expected')
-        return 'fail'
+    assert gdal.GetLastErrorMsg() != '', 'warning expected'
 
     return 'success'
 
@@ -400,8 +332,7 @@ def test_bag_vr_resampled():
         return 'skip'
 
     ds = gdal.OpenEx('data/test_vr.bag', open_options=['MODE=RESAMPLED_GRID'])
-    if ds is None:
-        return 'fail'
+    assert ds is not None
 
     got_md = gdal.Info(ds, computeChecksum=True, format='json')
     expected_md = {
@@ -455,103 +386,74 @@ def test_bag_vr_resampled():
         with gdaltest.config_option('GDAL_BAG_BLOCK_SIZE', str(block_size)):
             ds = gdal.OpenEx('data/test_vr.bag',
                              open_options=['MODE=RESAMPLED_GRID'])
-            if ds.GetRasterBand(1).GetBlockSize() != [block_size, block_size]:
-                print(block_size)
-                print(ds.GetRasterBand(1).GetBlockSize())
-                return 'fail'
+            assert ds.GetRasterBand(1).GetBlockSize() == [block_size, block_size]
             data = ds.ReadRaster()
 
-        if data != data_ref:
-            print(block_size)
-            return 'fail'
+        assert data == data_ref, block_size
 
     # Test overviews
     with gdaltest.config_option('GDAL_BAG_MIN_OVR_SIZE', '4'):
         ds = gdal.OpenEx('data/test_vr.bag',
                          open_options=['MODE=RESAMPLED_GRID'])
-    if ds.GetRasterBand(1).GetOverviewCount() != 2:
-        print(ds.GetRasterBand(1).GetOverviewCount())
-        return 'fail'
-    if ds.GetRasterBand(1).GetOverview(-1) is not None:
-        return 'fail'
-    if ds.GetRasterBand(1).GetOverview(2) is not None:
-        return 'fail'
+    assert ds.GetRasterBand(1).GetOverviewCount() == 2
+    assert ds.GetRasterBand(1).GetOverview(-1) is None
+    assert ds.GetRasterBand(1).GetOverview(2) is None
 
     ovr = ds.GetRasterBand(1).GetOverview(0)
     cs = ovr.Checksum()
-    if cs != 681:
-        print(cs)
-        return 'fail'
+    assert cs == 681
     ovr = ds.GetRasterBand(2).GetOverview(0)
     cs = ovr.Checksum()
-    if cs != 1344:
-        print(cs)
-        return 'fail'
+    assert cs == 1344
     ds.GetRasterBand(1).GetOverview(0).FlushCache()
     ds.GetRasterBand(1).GetOverview(1).FlushCache()
     cs = ovr.Checksum()
-    if cs != 1344:
-        print(cs)
-        return 'fail'
+    assert cs == 1344
     ovr = ds.GetRasterBand(1).GetOverview(0)
     cs = ovr.Checksum()
-    if cs != 681:
-        print(cs)
-        return 'fail'
+    assert cs == 681
 
     ds = gdal.OpenEx('data/test_vr.bag',
                      open_options=['MODE=RESAMPLED_GRID',
                                    'MINX=90', 'MAXX=120', 'MAXY=500112'])
     gt = ds.GetGeoTransform()
     got = (gt[0], gt[3], ds.RasterXSize)
-    if got != (90.0, 500112.0, 6):
-        print(got)
-        return 'fail'
+    assert got == (90.0, 500112.0, 6)
 
     ds = gdal.OpenEx('data/test_vr.bag',
                      open_options=['MODE=RESAMPLED_GRID',
                                    'MINY=500000'])
     gt = ds.GetGeoTransform()
     got = (gt[3] + gt[5] * ds.RasterYSize, ds.RasterYSize)
-    if got != (500000.0, 21):
-        print(got)
-        return 'fail'
+    assert got == (500000.0, 21)
 
     ds = gdal.OpenEx('data/test_vr.bag',
                      open_options=['MODE=RESAMPLED_GRID',
                                    'RESX=5', 'RESY=6'])
     gt = ds.GetGeoTransform()
     got = (gt[1], gt[5])
-    if got != (5.0, -6.0):
-        print(got)
-        return 'fail'
+    assert got == (5.0, -6.0)
 
     ds = gdal.OpenEx('data/test_vr.bag',
                      open_options=['MODE=RESAMPLED_GRID',
                                    'RES_STRATEGY=MIN'])
     gt = ds.GetGeoTransform()
     got = (gt[1], gt[5])
-    if got != (4.983333110809326, -5.316666603088379):
-        print(got)
-        return 'fail'
+    assert got == (4.983333110809326, -5.316666603088379)
 
     ds = gdal.OpenEx('data/test_vr.bag',
                      open_options=['MODE=RESAMPLED_GRID',
                                    'RES_STRATEGY=MAX'])
     gt = ds.GetGeoTransform()
     got = (gt[1], gt[5])
-    if got != (29.899999618530273, -31.899999618530273):
-        print(got)
-        return 'fail'
+    assert got == (29.899999618530273, -31.899999618530273)
 
     ds = gdal.OpenEx('data/test_vr.bag',
                      open_options=['MODE=RESAMPLED_GRID',
                                    'RES_STRATEGY=MEAN'])
     gt = ds.GetGeoTransform()
     got = (gt[1], gt[5])
-    if got != (12.209166447321573, -13.025833209355673):
-        print(got)
-        return 'fail'
+    assert got == (12.209166447321573, -13.025833209355673)
 
     ds = gdal.OpenEx('data/test_vr.bag',
                      open_options=['MODE=RESAMPLED_GRID',
@@ -559,26 +461,18 @@ def test_bag_vr_resampled():
                                    'RES_FILTER_MAX=8'])
     gt = ds.GetGeoTransform()
     got = (gt[1], gt[5])
-    if got != (8.0, -8.0):
-        print(got)
-        return 'fail'
+    assert got == (8.0, -8.0)
     got = (ds.GetRasterBand(1).Checksum(), ds.GetRasterBand(2).Checksum())
-    if got != (2099, 2747):
-        print(got)
-        return 'fail'
+    assert got == (2099, 2747)
 
     ds = gdal.OpenEx('data/test_vr.bag',
                      open_options=['MODE=RESAMPLED_GRID',
                                    'RES_FILTER_MAX=8'])
     gt = ds.GetGeoTransform()
     got = (gt[1], gt[5])
-    if got != (8.0, -8.0):
-        print(got)
-        return 'fail'
+    assert got == (8.0, -8.0)
     got = (ds.GetRasterBand(1).Checksum(), ds.GetRasterBand(2).Checksum())
-    if got != (2099, 2747):
-        print(got)
-        return 'fail'
+    assert got == (2099, 2747)
 
     ds = gdal.OpenEx('data/test_vr.bag',
                      open_options=['MODE=RESAMPLED_GRID',
@@ -586,13 +480,9 @@ def test_bag_vr_resampled():
                                    'RES_FILTER_MAX=16'])
     gt = ds.GetGeoTransform()
     got = (gt[1], gt[5])
-    if got != (16.0, -16.0):
-        print(got)
-        return 'fail'
+    assert got == (16.0, -16.0)
     got = (ds.GetRasterBand(1).Checksum(), ds.GetRasterBand(2).Checksum())
-    if got != (796, 864):
-        print(got)
-        return 'fail'
+    assert got == (796, 864)
 
     ds = gdal.OpenEx('data/test_vr.bag',
                      open_options=['MODE=RESAMPLED_GRID',
@@ -600,42 +490,32 @@ def test_bag_vr_resampled():
                                    'RES_FILTER_MAX=32'])
     gt = ds.GetGeoTransform()
     got = (gt[1], gt[5])
-    if got != (32.0, -32.0):
-        print(got)
-        return 'fail'
+    assert got == (32.0, -32.0)
     got = (ds.GetRasterBand(1).Checksum(), ds.GetRasterBand(2).Checksum())
-    if got != (207, 207):
-        print(got)
-        return 'fail'
+    assert got == (207, 207)
 
     ds = gdal.OpenEx('data/test_vr.bag',
                      open_options=['MODE=RESAMPLED_GRID',
                                    'RES_FILTER_MIN=16'])
     gt = ds.GetGeoTransform()
     got = (gt[1], gt[5])
-    if got != (29.899999618530273, -31.899999618530273):
-        print(got)
-        return 'fail'
+    assert got == (29.899999618530273, -31.899999618530273)
     got = (ds.GetRasterBand(1).Checksum(), ds.GetRasterBand(2).Checksum())
-    if got != (165, 205):
-        print(got)
-        return 'fail'
+    assert got == (165, 205)
 
     # Too big RES_FILTER_MIN
     with gdaltest.error_handler():
         ds = gdal.OpenEx('data/test_vr.bag',
                          open_options=['MODE=RESAMPLED_GRID',
                                        'RES_FILTER_MIN=32'])
-    if ds is not None:
-        return 'fail'
+    assert ds is None
 
     # Too small RES_FILTER_MAX
     with gdaltest.error_handler():
         ds = gdal.OpenEx('data/test_vr.bag',
                          open_options=['MODE=RESAMPLED_GRID',
                                        'RES_FILTER_MAX=4'])
-    if ds is not None:
-        return 'fail'
+    assert ds is None
 
     # RES_FILTER_MIN >= RES_FILTER_MAX
     with gdaltest.error_handler():
@@ -643,8 +523,7 @@ def test_bag_vr_resampled():
                          open_options=['MODE=RESAMPLED_GRID',
                                        'RES_FILTER_MIN=4',
                                        'RES_FILTER_MAX=4'])
-    if ds is not None:
-        return 'fail'
+    assert ds is None
 
     # Test VALUE_POPULATION
     ds = gdal.OpenEx('data/test_vr.bag',
@@ -676,18 +555,14 @@ def test_bag_vr_resampled():
         print(m1_mean, M1_mean, mean1_mean)
         print(m2_mean, M2_mean, mean2_mean)
         print(m1_min, M1_min, mean1_min)
-        print(m2_min, M2_min, mean2_min)
-        return 'fail'
+        pytest.fail(m2_min, M2_min, mean2_min)
 
     if m2_min >= m2_max or \
        (m2_mean, M2_mean, mean2_mean) != (m2_max, M2_max, mean2_max):
         print(m1_max, M1_max, mean1_max)
-        print(m2_max, M2_max, mean2_max)
         print(m1_mean, M1_mean, mean1_mean)
-        print(m2_mean, M2_mean, mean2_mean)
         print(m1_min, M1_min, mean1_min)
-        print(m2_min, M2_min, mean2_min)
-        return 'fail'
+        pytest.fail(m2_min, M2_min, mean2_min)
 
     return 'success'
 
@@ -703,18 +578,12 @@ def test_bag_vr_resampled_mask():
     ds = gdal.OpenEx('data/test_vr.bag',
                      open_options=['MODE=RESAMPLED_GRID',
                                    'SUPERGRIDS_MASK=YES'])
-    if ds is None:
-        return 'fail'
-    if ds.RasterCount != 1:
-        return 'fail'
-    if ds.GetRasterBand(1).DataType != gdal.GDT_Byte:
-        return 'fail'
-    if ds.GetRasterBand(1).GetNoDataValue() is not None:
-        return 'fail'
+    assert ds is not None
+    assert ds.RasterCount == 1
+    assert ds.GetRasterBand(1).DataType == gdal.GDT_Byte
+    assert ds.GetRasterBand(1).GetNoDataValue() is None
     cs = ds.GetRasterBand(1).Checksum()
-    if cs != 4507:
-        print(cs)
-        return 'fail'
+    assert cs == 4507
 
     return 'success'
 
@@ -731,17 +600,13 @@ def test_bag_vr_resampled_interpolated():
                      open_options=['MODE=RESAMPLED_GRID',
                                    'INTERPOLATION=INVDIST'])
     cs = ds.GetRasterBand(1).Checksum()
-    if cs != 2175:
-        print(cs)
-        return 'fail'
+    assert cs == 2175
 
     # Test overviews
     with gdaltest.config_option('GDAL_BAG_MIN_OVR_SIZE', '4'):
         ds = gdal.OpenEx('data/test_vr.bag',
                          open_options=['MODE=RESAMPLED_GRID'])
-    if ds.GetRasterBand(1).GetOverviewCount() != 2:
-        print(ds.GetRasterBand(1).GetOverviewCount())
-        return 'fail'
+    assert ds.GetRasterBand(1).GetOverviewCount() == 2
 
     # Incompatible options
     with gdaltest.error_handler():
@@ -749,8 +614,7 @@ def test_bag_vr_resampled_interpolated():
                          open_options=['MODE=RESAMPLED_GRID',
                                        'SUPERGRIDS_MASK=YES',
                                        'INTERPOLATION=INVDIST'])
-    if ds is not None:
-        return 'fail'
+    assert ds is None
 
     return 'success'
 
@@ -787,12 +651,8 @@ def test_bag_write_two_bands():
 
     ds = gdal.Open('/vsimem/out.bag')
     xml = ds.GetMetadata_List('xml:BAG')[0]
-    if xml.find('<bar />') < 0:
-        print(xml)
-        return 'fail'
-    if xml.find('Generated by GDAL ') < 0:
-        print(xml)
-        return 'fail'
+    assert xml.find('<bar />') >= 0
+    assert xml.find('Generated by GDAL ') >= 0
 
     gdal.Unlink('/vsimem/out.bag')
 
@@ -817,14 +677,10 @@ def test_bag_write_south_up():
 
     # Check that it is presented as north-up
     cs = ds.GetRasterBand(1).Checksum()
-    if cs != 4672:
-        print(cs)
-        return 'fail'
+    assert cs == 4672
 
     gt = ds.GetGeoTransform()
-    if gt != (440720.0, 60.0, 0.0, 3751320.0, 0.0, -60.0):
-        print(gt)
-        return 'fail'
+    assert gt == (440720.0, 60.0, 0.0, 3751320.0, 0.0, -60.0)
 
     ds = None
 
diff --git a/autotest/gdrivers/blx.py b/autotest/gdrivers/blx.py
index 23d6a163d6c6..ae00a018f196 100755
--- a/autotest/gdrivers/blx.py
+++ b/autotest/gdrivers/blx.py
@@ -83,29 +83,19 @@ def test_blx_5():
     ds = gdal.Open('data/s4103.blx')
 
     band = ds.GetRasterBand(1)
-    if band.GetOverviewCount() != 4:
-        gdaltest.post_reason('did not get expected overview count')
-        return 'fail'
+    assert band.GetOverviewCount() == 4, 'did not get expected overview count'
 
     cs = band.GetOverview(0).Checksum()
-    if cs != 42981:
-        gdaltest.post_reason('wrong overview checksum (%d)' % cs)
-        return 'fail'
+    assert cs == 42981, ('wrong overview checksum (%d)' % cs)
 
     cs = band.GetOverview(1).Checksum()
-    if cs != 61363:
-        gdaltest.post_reason('wrong overview checksum (%d)' % cs)
-        return 'fail'
+    assert cs == 61363, ('wrong overview checksum (%d)' % cs)
 
     cs = band.GetOverview(2).Checksum()
-    if cs != 48060:
-        gdaltest.post_reason('wrong overview checksum (%d)' % cs)
-        return 'fail'
+    assert cs == 48060, ('wrong overview checksum (%d)' % cs)
 
     cs = band.GetOverview(3).Checksum()
-    if cs != 12058:
-        gdaltest.post_reason('wrong overview checksum (%d)' % cs)
-        return 'fail'
+    assert cs == 12058, ('wrong overview checksum (%d)' % cs)
 
     return 'success'
 
diff --git a/autotest/gdrivers/cals.py b/autotest/gdrivers/cals.py
index def873922394..ce0c174fc6fe 100755
--- a/autotest/gdrivers/cals.py
+++ b/autotest/gdrivers/cals.py
@@ -66,16 +66,11 @@ def test_cals_3():
     tmp_ds.SetMetadataItem('TIFFTAG_XRESOLUTION', '600')
     tmp_ds.SetMetadataItem('TIFFTAG_YRESOLUTION', '600')
     out_ds = gdal.GetDriverByName('CALS').CreateCopy('/vsimem/cals_2.cal', tmp_ds)
-    if gdal.VSIStatL('/vsimem/cals_2.cal.aux.xml') is not None:
-        return 'fail'
-    if out_ds.GetRasterBand(1).Checksum() != 3883:
-        return 'fail'
-    if out_ds.GetMetadataItem('PIXEL_PATH') is not None:
-        return 'fail'
-    if out_ds.GetMetadataItem('TIFFTAG_XRESOLUTION') != '600':
-        return 'fail'
-    if out_ds.GetRasterBand(1).GetColorInterpretation() != gdal.GCI_PaletteIndex:
-        return 'fail'
+    assert gdal.VSIStatL('/vsimem/cals_2.cal.aux.xml') is None
+    assert out_ds.GetRasterBand(1).Checksum() == 3883
+    assert out_ds.GetMetadataItem('PIXEL_PATH') is None
+    assert out_ds.GetMetadataItem('TIFFTAG_XRESOLUTION') == '600'
+    assert out_ds.GetRasterBand(1).GetColorInterpretation() == gdal.GCI_PaletteIndex
     tmp_ds = None
     out_ds = None
     gdal.Unlink('/vsimem/cals_2_tmp.cal')
@@ -95,24 +90,21 @@ def test_cals_4():
     gdal.PushErrorHandler()
     out_ds = gdal.GetDriverByName('CALS').CreateCopy('/vsimem/cals_4.cal', src_ds)
     gdal.PopErrorHandler()
-    if out_ds is not None:
-        return 'fail'
+    assert out_ds is None
 
     # 2 bands
     src_ds = gdal.GetDriverByName('MEM').Create('', 1, 1, 2)
     gdal.PushErrorHandler()
     out_ds = gdal.GetDriverByName('CALS').CreateCopy('/vsimem/cals_4.cal', src_ds, strict=True)
     gdal.PopErrorHandler()
-    if out_ds is not None:
-        return 'fail'
+    assert out_ds is None
 
     # 1 band but not 1-bit
     src_ds = gdal.GetDriverByName('MEM').Create('', 1, 1, 1)
     gdal.PushErrorHandler()
     out_ds = gdal.GetDriverByName('CALS').CreateCopy('/vsimem/cals_4.cal', src_ds, strict=True)
     gdal.PopErrorHandler()
-    if out_ds is not None:
-        return 'fail'
+    assert out_ds is None
 
     # Dimension > 999999
     src_ds = gdal.GetDriverByName('MEM').Create('', 1000000, 1, 1)
@@ -120,8 +112,7 @@ def test_cals_4():
     gdal.PushErrorHandler()
     out_ds = gdal.GetDriverByName('CALS').CreateCopy('/vsimem/cals_4.cal', src_ds, strict=True)
     gdal.PopErrorHandler()
-    if out_ds is not None:
-        return 'fail'
+    assert out_ds is None
 
     # Invalid output filename
     src_ds = gdal.GetDriverByName('MEM').Create('', 1, 1, 1)
@@ -129,8 +120,7 @@ def test_cals_4():
     gdal.PushErrorHandler()
     out_ds = gdal.GetDriverByName('CALS').CreateCopy('/not_existing_dir/cals_4.cal', src_ds)
     gdal.PopErrorHandler()
-    if out_ds is not None:
-        return 'fail'
+    assert out_ds is None
 
     return 'success'
 
@@ -145,12 +135,9 @@ def test_cals_5():
     src_ds.SetMetadataItem('PIXEL_PATH', '90')
     src_ds.SetMetadataItem('LINE_PROGRESSION', '270')
     out_ds = gdal.GetDriverByName('CALS').CreateCopy('/vsimem/cals_5.cal', src_ds)
-    if gdal.VSIStatL('/vsimem/cals_5.cal.aux.xml') is not None:
-        return 'fail'
-    if out_ds.GetMetadataItem('PIXEL_PATH') != '90':
-        return 'fail'
-    if out_ds.GetMetadataItem('LINE_PROGRESSION') != '270':
-        return 'fail'
+    assert gdal.VSIStatL('/vsimem/cals_5.cal.aux.xml') is None
+    assert out_ds.GetMetadataItem('PIXEL_PATH') == '90'
+    assert out_ds.GetMetadataItem('LINE_PROGRESSION') == '270'
     out_ds = None
     gdal.Unlink('/vsimem/cals_5.cal')
 
diff --git a/autotest/gdrivers/ctg.py b/autotest/gdrivers/ctg.py
index 4fad78d50419..be26b9b4e507 100755
--- a/autotest/gdrivers/ctg.py
+++ b/autotest/gdrivers/ctg.py
@@ -69,16 +69,11 @@ def test_ctg_1():
     if ret == 'success':
         ds = gdal.Open('data/fake_grid_cell')
         lst = ds.GetRasterBand(1).GetCategoryNames()
-        if lst is None or not lst:
-            gdaltest.post_reason('expected non empty category names for band 1')
-            return 'fail'
+        assert lst is not None and lst, 'expected non empty category names for band 1'
         lst = ds.GetRasterBand(2).GetCategoryNames()
-        if lst is not None:
-            gdaltest.post_reason('expected empty category names for band 2')
-            return 'fail'
-        if ds.GetRasterBand(1).GetNoDataValue() != 0:
-            gdaltest.post_reason('did not get expected nodata value')
-            return 'fail'
+        assert lst is None, 'expected empty category names for band 2'
+        assert ds.GetRasterBand(1).GetNoDataValue() == 0, \
+            'did not get expected nodata value'
 
     return ret
 
diff --git a/autotest/gdrivers/db2.py b/autotest/gdrivers/db2.py
index e74fe8d5a1b2..f03bd36ce461 100755
--- a/autotest/gdrivers/db2.py
+++ b/autotest/gdrivers/db2.py
@@ -151,15 +151,9 @@ def check_tile_format(out_ds, expected_format, expected_band_count, expected_ct,
     elif expected_format == 'WEBP':
         expected_mime_type = 'image/x-webp'
 
-    if mime_type != expected_mime_type:
-        print(mime_type)
-        return 'fail'
-    if band_count != expected_band_count:
-        print(band_count)
-        return 'fail'
-    if expected_ct != has_ct:
-        print(has_ct)
-        return 'fail'
+    assert mime_type == expected_mime_type
+    assert band_count == expected_band_count
+    assert expected_ct == has_ct
     return 'success'
 
 ###############################################################################
@@ -186,31 +180,24 @@ def test_gpkg_1():
     out_ds = gdal.OpenEx(gdaltest.db2_test_server, gdal.OF_RASTER | gdal.OF_UPDATE, open_options=['TABLE=byte'])
 
     bnd = out_ds.GetRasterBand(1)
-    if bnd.Checksum() != 4672:
-        gdaltest.post_reason('Didnt get expected checksum on reopened file')
-        return 'fail'
+    assert bnd.Checksum() == 4672, 'Didnt get expected checksum on reopened file'
 
-    if bnd.ComputeRasterMinMax() != (74.0, 255.0):
-        gdaltest.post_reason('ComputeRasterMinMax() returned wrong value')
-        return 'fail'
+    assert bnd.ComputeRasterMinMax() == (74.0, 255.0), \
+        'ComputeRasterMinMax() returned wrong value'
 
     got_gt = out_ds.GetGeoTransform()
     for i in range(6):
-        if abs(expected_gt[i] - got_gt[i]) > 1e-8:
-            return 'fail'
+        assert abs(expected_gt[i] - got_gt[i]) <= 1e-8
     got_wkt = out_ds.GetProjectionRef()
     print("\n** expected_wkt " + expected_wkt + " **\n")
     print("\n** got_wkt " + got_wkt + " **\n")
 #   string comparison doesn't work with DB2 due to differences in
 #   the WKT (similar but different)
 #   just check if it contains '11N' for NAD27 UTM zone 11N
-    if got_wkt.find('11N') == -1:
-        return 'fail'
+    assert got_wkt.find('11N') != -1
     expected_cs = [expected_cs, expected_cs, expected_cs, 4873]
     got_cs = [out_ds.GetRasterBand(i + 1).Checksum() for i in range(4)]
-    if got_cs != expected_cs:
-        print('Got %s, expected %s' % (str(got_cs), str(expected_cs)))
-        return 'fail'
+    assert got_cs == expected_cs
 
     return 'success'
 
diff --git a/autotest/gdrivers/derived.py b/autotest/gdrivers/derived.py
index 7310e1611611..e417ef47a91a 100755
--- a/autotest/gdrivers/derived.py
+++ b/autotest/gdrivers/derived.py
@@ -39,8 +39,7 @@ def test_derived_test1():
     filename = "../gcore/data/cfloat64.tif"
     gdal.ErrorReset()
     ds = gdal.Open(filename)
-    if ds is None or gdal.GetLastErrorMsg() != '':
-        return 'fail'
+    assert ds is not None and gdal.GetLastErrorMsg() == ''
     got_dsds = ds.GetMetadata('DERIVED_SUBDATASETS')
     expected_gt = ds.GetGeoTransform()
     expected_prj = ds.GetProjection()
@@ -68,8 +67,7 @@ def test_derived_test1():
         val = expected_dsds[key]
         if key.endswith('_NAME'):
             ds = gdal.Open(val)
-            if ds is None or gdal.GetLastErrorMsg() != '':
-                return 'fail'
+            assert ds is not None and gdal.GetLastErrorMsg() == ''
             gt = ds.GetGeoTransform()
             if gt != expected_gt:
                 import pprint
@@ -87,8 +85,7 @@ def test_derived_test2():
     filename = "../gcore/data/cint_sar.tif"
     gdal.ErrorReset()
     ds = gdal.Open(filename)
-    if ds is None or gdal.GetLastErrorMsg() != '':
-        return 'fail'
+    assert ds is not None and gdal.GetLastErrorMsg() == ''
     got_dsds = ds.GetMetadata('DERIVED_SUBDATASETS')
     expected_dsds = {'DERIVED_SUBDATASET_1_NAME': 'DERIVED_SUBDATASET:AMPLITUDE:../gcore/data/cint_sar.tif',
                      'DERIVED_SUBDATASET_1_DESC': 'Amplitude of input bands from ../gcore/data/cint_sar.tif',
@@ -122,8 +119,7 @@ def test_derived_test2():
         val = expected_dsds[key]
         if key.endswith('_NAME'):
             ds = gdal.Open(val)
-            if ds is None or gdal.GetLastErrorMsg() != '':
-                return 'fail'
+            assert ds is not None and gdal.GetLastErrorMsg() == ''
             cs = ds.GetRasterBand(1).Checksum()
             if expected_cs[key] != cs:
                 import pprint
@@ -140,24 +136,20 @@ def test_derived_test3():
     with gdaltest.error_handler():
         # Missing filename
         ds = gdal.Open('DERIVED_SUBDATASET:LOGAMPLITUDE')
-    if ds is not None:
-        return 'fail'
+    assert ds is None
 
     with gdaltest.error_handler():
         ds = gdal.Open('DERIVED_SUBDATASET:invalid_alg:../gcore/data/byte.tif')
-    if ds is not None:
-        return 'fail'
+    assert ds is None
 
     with gdaltest.error_handler():
         ds = gdal.Open('DERIVED_SUBDATASET:LOGAMPLITUDE:dataset_does_not_exist')
-    if ds is not None:
-        return 'fail'
+    assert ds is None
 
     with gdaltest.error_handler():
         # Raster with zero band
         ds = gdal.Open('DERIVED_SUBDATASET:LOGAMPLITUDE:data/CSK_DGM.h5')
-    if ds is not None:
-        return 'fail'
+    assert ds is None
 
     for function in ['real', 'imag', 'complex', 'mod', 'phase', 'conj',
                      'sum', 'diff', 'mul', 'cmul', 'inv', 'intensity',
diff --git a/autotest/gdrivers/dimap.py b/autotest/gdrivers/dimap.py
index 60250ee54b60..9e8e5f29a38a 100755
--- a/autotest/gdrivers/dimap.py
+++ b/autotest/gdrivers/dimap.py
@@ -48,45 +48,25 @@ def test_dimap_1():
 
     ds = gdal.Open('tmp/METADATA.DIM')
 
-    if ds.RasterCount != 1 \
-       or ds.RasterXSize != 6000 \
-       or ds.RasterYSize != 6000:
-        gdaltest.post_reason('wrong size or bands')
-        return 'fail'
+    assert ds.RasterCount == 1 and ds.RasterXSize == 6000 and ds.RasterYSize == 6000, \
+        'wrong size or bands'
 
-    if ds.GetRasterBand(1).Checksum(0, 0, 100, 100) != 21586:
-        gdaltest.post_reason('wrong checksum')
-        return 'fail'
+    assert ds.GetRasterBand(1).Checksum(0, 0, 100, 100) == 21586, 'wrong checksum'
 
     md = ds.GetMetadata()
-    if md['PROCESSING_LEVEL'] != '1A':
-        gdaltest.post_reason('metadata wrong.')
-        return 'fail'
+    assert md['PROCESSING_LEVEL'] == '1A', 'metadata wrong.'
 
     md = ds.GetMetadata()
-    if md['SPECTRAL_PHYSICAL_BIAS'] != '0.000000':
-        gdaltest.post_reason('metadata wrong.')
-        return 'fail'
+    assert md['SPECTRAL_PHYSICAL_BIAS'] == '0.000000', 'metadata wrong.'
 
     gcp_srs = ds.GetGCPProjection()
-    if gcp_srs[:6] != 'GEOGCS' \
+    assert (not (gcp_srs[:6] != 'GEOGCS' \
        or gcp_srs.find('WGS') == -1 \
-       or gcp_srs.find('84') == -1:
-        gdaltest.post_reason('GCP Projection not retained.')
-        print(gcp_srs)
-        return 'fail'
+       or gcp_srs.find('84') == -1)), 'GCP Projection not retained.'
 
     gcps = ds.GetGCPs()
-    if len(gcps) != 4 \
-       or gcps[0].GCPPixel != 0.5 \
-       or gcps[0].GCPLine != 0.5 \
-       or abs(gcps[0].GCPX - 4.3641728) > 0.0000002 \
-       or abs(gcps[0].GCPY - 44.2082255) > 0.0000002 \
-       or abs(gcps[0].GCPZ - 0) > 0.0000002:
-        gdaltest.post_reason('GCPs wrong.')
-        print(len(gcps))
-        print(gcps[0])
-        return 'fail'
+    assert len(gcps) == 4 and gcps[0].GCPPixel == 0.5 and gcps[0].GCPLine == 0.5 and abs(gcps[0].GCPX - 4.3641728) <= 0.0000002 and abs(gcps[0].GCPY - 44.2082255) <= 0.0000002 and abs(gcps[0].GCPZ - 0) <= 0.0000002, \
+        'GCPs wrong.'
 
     ds = None
     os.unlink('tmp/METADATA.DIM')
@@ -103,31 +83,19 @@ def test_dimap_2():
 
     for name in ['data/dimap2', 'data/dimap2/VOL_PHR.XML', 'data/dimap2/DIM_foo.XML']:
         ds = gdal.Open(name)
-        if ds.RasterCount != 4 \
-                or ds.RasterXSize != 20 \
-                or ds.RasterYSize != 30:
-            gdaltest.post_reason('wrong size or bands')
-            return 'fail'
+        assert ds.RasterCount == 4 and ds.RasterXSize == 20 and ds.RasterYSize == 30, \
+            'wrong size or bands'
 
         md = ds.GetMetadata()
         expected_md = {'GEOMETRIC_ATTITUDES_USED': 'ACCURATE', 'FACILITY_PROCESSING_CENTER': 'PROCESSING_CENTER', 'GEOMETRIC_VERTICAL_DESC': 'REFERENCE3D', 'EPHEMERIS_ACQUISITION_ORBIT_DIRECTION': 'DESCENDING', 'BAND_MODE': 'PX', 'EPHEMERIS_NADIR_LON': 'NADIR_LON', 'EPHEMERIS_ACQUISITION_ORBIT_NUMBER': 'ACQUISITION_ORBIT_NUMBER', 'SPECTRAL_PROCESSING': 'PMS', 'CLOUDCOVER_MEASURE_TYPE': 'AUTOMATIC', 'DATASET_JOB_ID': 'JOB_ID', 'MISSION': 'PHR', 'GEOMETRIC_GROUND_SETTING': 'true', 'GEOMETRIC_VERTICAL_SETTING': 'true', 'DATASET_PRODUCTION_DATE': 'PRODUCTION_DATE', 'DATASET_PRODUCER_CONTACT': 'PRODUCER_CONTACT', 'IMAGING_DATE': '2016-06-17', 'CLOUDCOVER_QUALITY_TABLES': 'PHR', 'DATASET_PRODUCER_NAME': 'PRODUCER_NAME', 'GEOMETRIC_GEOMETRIC_PROCESSING': 'SENSOR', 'GEOMETRIC_EPHEMERIS_USED': 'CORRECTED', 'GEOMETRIC_GROUND_DESC': 'R3D_ORTHO', 'DATASET_DELIVERY_TYPE': 'DELIVERY_TYPE', 'PROCESSING_LEVEL': 'SENSOR', 'DATASET_PRODUCER_ADDRESS': 'PRODUCER_ADDRESS', 'DATASET_PRODUCT_CODE': 'PRODUCT_CODE', 'INSTRUMENT_INDEX': '1A', 'EPHEMERIS_NADIR_LAT': 'NADIR_LAT', 'INSTRUMENT': 'PHR', 'CLOUDCOVER_MEASURE_NAME': 'Cloud_Cotation (CLD)', 'FACILITY_SOFTWARE': 'SOFTWARE', 'IMAGING_TIME': '12:34:56', 'MISSION_INDEX': '1A'}
-        if md != expected_md:
-            gdaltest.post_reason('metadata wrong.')
-            print(md)
-            return 'fail'
+        assert md == expected_md, 'metadata wrong.'
 
         rpc = ds.GetMetadata('RPC')
         expected_rpc = {'HEIGHT_OFF': 'HEIGHT_OFF', 'LINE_NUM_COEFF': ' LINE_NUM_COEFF_1 LINE_NUM_COEFF_2 LINE_NUM_COEFF_3 LINE_NUM_COEFF_4 LINE_NUM_COEFF_5 LINE_NUM_COEFF_6 LINE_NUM_COEFF_7 LINE_NUM_COEFF_8 LINE_NUM_COEFF_9 LINE_NUM_COEFF_10 LINE_NUM_COEFF_11 LINE_NUM_COEFF_12 LINE_NUM_COEFF_13 LINE_NUM_COEFF_14 LINE_NUM_COEFF_15 LINE_NUM_COEFF_16 LINE_NUM_COEFF_17 LINE_NUM_COEFF_18 LINE_NUM_COEFF_19 LINE_NUM_COEFF_20', 'LONG_OFF': 'LONG_OFF', 'SAMP_DEN_COEFF': ' SAMP_DEN_COEFF_1 SAMP_DEN_COEFF_2 SAMP_DEN_COEFF_3 SAMP_DEN_COEFF_4 SAMP_DEN_COEFF_5 SAMP_DEN_COEFF_6 SAMP_DEN_COEFF_7 SAMP_DEN_COEFF_8 SAMP_DEN_COEFF_9 SAMP_DEN_COEFF_10 SAMP_DEN_COEFF_11 SAMP_DEN_COEFF_12 SAMP_DEN_COEFF_13 SAMP_DEN_COEFF_14 SAMP_DEN_COEFF_15 SAMP_DEN_COEFF_16 SAMP_DEN_COEFF_17 SAMP_DEN_COEFF_18 SAMP_DEN_COEFF_19 SAMP_DEN_COEFF_20', 'LINE_SCALE': 'LINE_SCALE', 'SAMP_NUM_COEFF': ' SAMP_NUM_COEFF_1 SAMP_NUM_COEFF_2 SAMP_NUM_COEFF_3 SAMP_NUM_COEFF_4 SAMP_NUM_COEFF_5 SAMP_NUM_COEFF_6 SAMP_NUM_COEFF_7 SAMP_NUM_COEFF_8 SAMP_NUM_COEFF_9 SAMP_NUM_COEFF_10 SAMP_NUM_COEFF_11 SAMP_NUM_COEFF_12 SAMP_NUM_COEFF_13 SAMP_NUM_COEFF_14 SAMP_NUM_COEFF_15 SAMP_NUM_COEFF_16 SAMP_NUM_COEFF_17 SAMP_NUM_COEFF_18 SAMP_NUM_COEFF_19 SAMP_NUM_COEFF_20', 'LONG_SCALE': 'LONG_SCALE', 'SAMP_SCALE': 'SAMP_SCALE', 'SAMP_OFF': '4', 'LAT_SCALE': 'LAT_SCALE', 'LAT_OFF': 'LAT_OFF', 'LINE_OFF': '9', 'LINE_DEN_COEFF': ' LINE_DEN_COEFF_1 LINE_DEN_COEFF_2 LINE_DEN_COEFF_3 LINE_DEN_COEFF_4 LINE_DEN_COEFF_5 LINE_DEN_COEFF_6 LINE_DEN_COEFF_7 LINE_DEN_COEFF_8 LINE_DEN_COEFF_9 LINE_DEN_COEFF_10 LINE_DEN_COEFF_11 LINE_DEN_COEFF_12 LINE_DEN_COEFF_13 LINE_DEN_COEFF_14 LINE_DEN_COEFF_15 LINE_DEN_COEFF_16 LINE_DEN_COEFF_17 LINE_DEN_COEFF_18 LINE_DEN_COEFF_19 LINE_DEN_COEFF_20', 'HEIGHT_SCALE': 'HEIGHT_SCALE'}
-        if rpc != expected_rpc:
-            gdaltest.post_reason('RPC wrong.')
-            print(rpc)
-            return 'fail'
+        assert rpc == expected_rpc, 'RPC wrong.'
 
         cs = ds.GetRasterBand(1).Checksum()
-        if cs != 7024:
-            gdaltest.post_reason('wrong checksum.')
-            print(cs)
-            return 'fail'
+        assert cs == 7024, 'wrong checksum.'
 
         ds = None
 
diff --git a/autotest/gdrivers/dods.py b/autotest/gdrivers/dods.py
index 93f1efba24e2..01e2bd8b0a3f 100755
--- a/autotest/gdrivers/dods.py
+++ b/autotest/gdrivers/dods.py
@@ -110,10 +110,7 @@ def dods_6():
     # pylint: disable=unreachable
     gdaltest.dods_grid_ds = gdal.Open('http://g0dup05u.ecs.nasa.gov/opendap/AIRS/AIRX3STD.003/2004.12.28/AIRS.2004.12.28.L3.RetStd001.v4.0.9.0.G05253115303.hdf?TotH2OVap_A[y][x]')
     nd = gdaltest.dods_grid_ds.GetRasterBand(1).GetNoDataValue()
-    if nd != -9999.0:
-        gdaltest.post_reason('nodata value wrong or missing.')
-        print(nd)
-        return 'fail'
+    assert nd == -9999.0, 'nodata value wrong or missing.'
     return 'success'
 
 ###############################################################################
diff --git a/autotest/gdrivers/doq2.py b/autotest/gdrivers/doq2.py
index 0184f86202f6..f56bc05b2ad7 100755
--- a/autotest/gdrivers/doq2.py
+++ b/autotest/gdrivers/doq2.py
@@ -46,28 +46,19 @@ def test_doq2_1():
     mem_ds = gdal.GetDriverByName('MEM').Create('mem_1.mem', 500, 1, gdal.GDT_Byte, 1)
 
     mem_ds.GetRasterBand(1).WriteRaster(0, 0, 500, 1, ds.GetRasterBand(1).ReadRaster(0, 0, 500, 1))
-    if mem_ds.GetRasterBand(1).Checksum() != 4201:
-        gdaltest.post_reason('wrong checksum for band 1')
-        return 'fail'
+    assert mem_ds.GetRasterBand(1).Checksum() == 4201, 'wrong checksum for band 1'
 
     mem_ds.GetRasterBand(1).WriteRaster(0, 0, 500, 1, ds.GetRasterBand(2).ReadRaster(0, 0, 500, 1))
-    if mem_ds.GetRasterBand(1).Checksum() != 4010:
-        gdaltest.post_reason('wrong checksum for band 2')
-        return 'fail'
+    assert mem_ds.GetRasterBand(1).Checksum() == 4010, 'wrong checksum for band 2'
 
     mem_ds.GetRasterBand(1).WriteRaster(0, 0, 500, 1, ds.GetRasterBand(3).ReadRaster(0, 0, 500, 1))
-    if mem_ds.GetRasterBand(1).Checksum() != 5820:
-        gdaltest.post_reason('wrong checksum for band 3')
-        return 'fail'
+    assert mem_ds.GetRasterBand(1).Checksum() == 5820, 'wrong checksum for band 3'
 
-    if ds.GetGeoTransform() != (377054, 1, 0, 4082205, 0, -1):
-        gdaltest.post_reason('wrong geotransform')
-        return 'fail'
+    assert ds.GetGeoTransform() == (377054, 1, 0, 4082205, 0, -1), 'wrong geotransform'
 
     md = ds.GetMetadata()
-    if md['QUADRANGLE_NAME'] != 'NORFOLK SOUTH 3.45 or 7.5-min. name*':
-        gdaltest.post_reason('wrong metadata')
-        return 'fail'
+    assert md['QUADRANGLE_NAME'] == 'NORFOLK SOUTH 3.45 or 7.5-min. name*', \
+        'wrong metadata'
 
     mem_ds = None
     ds = None
diff --git a/autotest/gdrivers/dted.py b/autotest/gdrivers/dted.py
index 3a32107f6d9c..b5c78074dc6f 100755
--- a/autotest/gdrivers/dted.py
+++ b/autotest/gdrivers/dted.py
@@ -58,25 +58,17 @@ def test_dted_2():
 
     max_error = 0.000001
 
-    if abs(gt[0] - (-80.004166666666663)) > max_error or abs(gt[1] - 0.0083333333333333332) > max_error \
-            or abs(gt[2] - 0) > max_error or abs(gt[3] - 44.00416666666667) > max_error \
-            or abs(gt[4] - 0) > max_error or abs(gt[5] - (-0.0083333333333333332)) > max_error:
-        gdaltest.post_reason('DTED geotransform wrong.')
-        return 'fail'
+    assert abs(gt[0] - (-80.004166666666663)) <= max_error and abs(gt[1] - 0.0083333333333333332) <= max_error and abs(gt[2] - 0) <= max_error and abs(gt[3] - 44.00416666666667) <= max_error and abs(gt[4] - 0) <= max_error and abs(gt[5] - (-0.0083333333333333332)) <= max_error, \
+        'DTED geotransform wrong.'
 
     prj = ds.GetProjection()
-    if prj != 'GEOGCS["WGS 84",DATUM["WGS_1984",SPHEROID["WGS 84",6378137,298.257223563,AUTHORITY["EPSG","7030"]],AUTHORITY["EPSG","6326"]],PRIMEM["Greenwich",0,AUTHORITY["EPSG","8901"]],UNIT["degree",0.0174532925199433,AUTHORITY["EPSG","9122"]],AUTHORITY["EPSG","4326"]]':
-        gdaltest.post_reason('Projection does not match expected:\n%s' % prj)
-        return 'fail'
+    assert prj == 'GEOGCS["WGS 84",DATUM["WGS_1984",SPHEROID["WGS 84",6378137,298.257223563,AUTHORITY["EPSG","7030"]],AUTHORITY["EPSG","6326"]],PRIMEM["Greenwich",0,AUTHORITY["EPSG","8901"]],UNIT["degree",0.0174532925199433,AUTHORITY["EPSG","9122"]],AUTHORITY["EPSG","4326"]]', \
+        ('Projection does not match expected:\n%s' % prj)
 
     band1 = ds.GetRasterBand(1)
-    if band1.GetNoDataValue() != -32767:
-        gdaltest.post_reason('Grid NODATA value wrong or missing.')
-        return 'fail'
+    assert band1.GetNoDataValue() == -32767, 'Grid NODATA value wrong or missing.'
 
-    if band1.DataType != gdal.GDT_Int16:
-        gdaltest.post_reason('Data type is not Int16!')
-        return 'fail'
+    assert band1.DataType == gdal.GDT_Int16, 'Data type is not Int16!'
 
     return 'success'
 
@@ -119,8 +111,7 @@ def test_dted_5():
     ds = gdal.Open('tmp/n43.dt1.tif')
     geotransform = ds.GetGeoTransform()
     for i in range(6):
-        if abs(geotransform[i] - ref_geotransform[i]) > 1e-10:
-            return 'fail'
+        assert abs(geotransform[i] - ref_geotransform[i]) <= 1e-10
 
     ds = None
 
@@ -143,8 +134,7 @@ def test_dted_6():
     ds = gdal.Open('tmp/n43.dt2.tif')
     geotransform = ds.GetGeoTransform()
     for i in range(6):
-        if abs(geotransform[i] - ref_geotransform[i]) > 1e-10:
-            return 'fail'
+        assert abs(geotransform[i] - ref_geotransform[i]) <= 1e-10
 
     ds = None
 
@@ -162,13 +152,10 @@ def test_dted_7():
     prj = ds.GetProjection()
     gdal.PopErrorHandler()
 
-    if gdal.GetLastErrorMsg() is None:
-        gdaltest.post_reason('An expected warning was not emitted')
-        return 'fail'
+    assert gdal.GetLastErrorMsg() is not None, 'An expected warning was not emitted'
 
-    if prj != 'GEOGCS["WGS 72",DATUM["WGS_1972",SPHEROID["WGS 72",6378135,298.26]],PRIMEM["Greenwich",0],UNIT["degree",0.0174532925199433],AUTHORITY["EPSG","4322"]]':
-        gdaltest.post_reason('Projection does not match expected:\n%s' % prj)
-        return 'fail'
+    assert prj == 'GEOGCS["WGS 72",DATUM["WGS_1972",SPHEROID["WGS 72",6378135,298.26]],PRIMEM["Greenwich",0],UNIT["degree",0.0174532925199433],AUTHORITY["EPSG","4322"]]', \
+        ('Projection does not match expected:\n%s' % prj)
 
     return 'success'
 
@@ -190,15 +177,11 @@ def test_dted_8():
 
     gdal.SetConfigOption('DTED_VERIFY_CHECKSUM', 'NO')
 
-    if gdal.GetLastErrorMsg() is None:
-        gdaltest.post_reason('An expected warning was not emitted')
-        return 'fail'
+    assert gdal.GetLastErrorMsg() is not None, 'An expected warning was not emitted'
 
     # 49187 is the checksum of data is the DTED is read without checking its checksum
     # so we should not get this value
-    if chksum == 49187:
-        gdaltest.post_reason('DTED_VERIFY_CHECKSUM=YES has had no effect!')
-        return 'fail'
+    assert chksum != 49187, 'DTED_VERIFY_CHECKSUM=YES has had no effect!'
 
     return 'success'
 
@@ -235,9 +218,7 @@ def test_dted_9():
     band = dsDst.GetRasterBand(1)
     chksum = band.Checksum()
 
-    if chksum != 36542:
-        gdaltest.post_reason('Wrong checksum. Checksum found %d' % chksum)
-        return 'fail'
+    assert chksum == 36542, ('Wrong checksum. Checksum found %d' % chksum)
 
     return 'success'
 
@@ -265,25 +246,17 @@ def test_dted_11():
 
     max_error = 0.000001
 
-    if abs(gt[0] - (-80.004166666666663)) > max_error or abs(gt[1] - 0.0083333333333333332) > max_error \
-            or abs(gt[2] - 0) > max_error or abs(gt[3] - 44.00416666666667) > max_error \
-            or abs(gt[4] - 0) > max_error or abs(gt[5] - (-0.0083333333333333332)) > max_error:
-        gdaltest.post_reason('DTED geotransform wrong.')
-        return 'fail'
+    assert abs(gt[0] - (-80.004166666666663)) <= max_error and abs(gt[1] - 0.0083333333333333332) <= max_error and abs(gt[2] - 0) <= max_error and abs(gt[3] - 44.00416666666667) <= max_error and abs(gt[4] - 0) <= max_error and abs(gt[5] - (-0.0083333333333333332)) <= max_error, \
+        'DTED geotransform wrong.'
 
     prj = ds.GetProjection()
-    if prj != 'GEOGCS["WGS 84",DATUM["WGS_1984",SPHEROID["WGS 84",6378137,298.257223563,AUTHORITY["EPSG","7030"]],AUTHORITY["EPSG","6326"]],PRIMEM["Greenwich",0,AUTHORITY["EPSG","8901"]],UNIT["degree",0.0174532925199433,AUTHORITY["EPSG","9122"]],AUTHORITY["EPSG","4326"]]':
-        gdaltest.post_reason('Projection does not match expected:\n%s' % prj)
-        return 'fail'
+    assert prj == 'GEOGCS["WGS 84",DATUM["WGS_1984",SPHEROID["WGS 84",6378137,298.257223563,AUTHORITY["EPSG","7030"]],AUTHORITY["EPSG","6326"]],PRIMEM["Greenwich",0,AUTHORITY["EPSG","8901"]],UNIT["degree",0.0174532925199433,AUTHORITY["EPSG","9122"]],AUTHORITY["EPSG","4326"]]', \
+        ('Projection does not match expected:\n%s' % prj)
 
     band1 = ds.GetRasterBand(1)
-    if band1.GetNoDataValue() != -32767:
-        gdaltest.post_reason('Grid NODATA value wrong or missing.')
-        return 'fail'
+    assert band1.GetNoDataValue() == -32767, 'Grid NODATA value wrong or missing.'
 
-    if band1.DataType != gdal.GDT_Int16:
-        gdaltest.post_reason('Data type is not Int16!')
-        return 'fail'
+    assert band1.DataType == gdal.GDT_Int16, 'Data type is not Int16!'
 
     return 'success'
 
@@ -294,8 +267,7 @@ def test_dted_11():
 def test_dted_12():
 
     ds = gdal.Open('data/w118n033_trunc.dt1')
-    if ds is None:
-        return 'fail'
+    assert ds is not None
 
     return 'success'
 
diff --git a/autotest/gdrivers/e00grid.py b/autotest/gdrivers/e00grid.py
index 800550e75708..878434f0c808 100755
--- a/autotest/gdrivers/e00grid.py
+++ b/autotest/gdrivers/e00grid.py
@@ -65,12 +65,10 @@ def test_e00grid_1():
 
     if ret == 'success':
         ds = gdal.Open('data/fake_e00grid.e00')
-        if ds.GetRasterBand(1).GetNoDataValue() != -32767:
-            gdaltest.post_reason('did not get expected nodata value')
-            return 'fail'
-        if ds.GetRasterBand(1).GetUnitType() != 'ft':
-            gdaltest.post_reason('did not get expected nodata value')
-            return 'fail'
+        assert ds.GetRasterBand(1).GetNoDataValue() == -32767, \
+            'did not get expected nodata value'
+        assert ds.GetRasterBand(1).GetUnitType() == 'ft', \
+            'did not get expected nodata value'
 
     return ret
 
@@ -108,28 +106,17 @@ def test_e00grid_2():
         line0 = ds.ReadRaster(0, 0, 5, 1)
         ds.ReadRaster(0, 1, 5, 1)
         line2 = ds.ReadRaster(0, 2, 5, 1)
-        if line0 == line2:
-            gdaltest.post_reason('should not have gotten the same values')
-            return 'fail'
+        assert line0 != line2, 'should not have gotten the same values'
         ds.ReadRaster(0, 0, 5, 1)
         line2_bis = ds.ReadRaster(0, 2, 5, 1)
-        if line2 != line2_bis:
-            gdaltest.post_reason('did not get the same values for the same line')
-            return 'fail'
-
-        if ds.GetRasterBand(1).GetMinimum() != 1:
-            gdaltest.post_reason('did not get expected minimum value')
-            print(ds.GetRasterBand(1).GetMinimum())
-            return 'fail'
-        if ds.GetRasterBand(1).GetMaximum() != 50:
-            gdaltest.post_reason('did not get expected maximum value')
-            print(ds.GetRasterBand(1).GetMaximum())
-            return 'fail'
+        assert line2 == line2_bis, 'did not get the same values for the same line'
+
+        assert ds.GetRasterBand(1).GetMinimum() == 1, \
+            'did not get expected minimum value'
+        assert ds.GetRasterBand(1).GetMaximum() == 50, \
+            'did not get expected maximum value'
         stats = ds.GetRasterBand(1).GetStatistics(False, True)
-        if stats != [1.0, 50.0, 25.5, 24.5]:
-            gdaltest.post_reason('did not get expected statistics')
-            print(stats)
-            return 'fail'
+        assert stats == [1.0, 50.0, 25.5, 24.5], 'did not get expected statistics'
 
     return ret
 
diff --git a/autotest/gdrivers/ecrgtoc.py b/autotest/gdrivers/ecrgtoc.py
index ee1c3a60edf7..93338c737415 100755
--- a/autotest/gdrivers/ecrgtoc.py
+++ b/autotest/gdrivers/ecrgtoc.py
@@ -34,6 +34,7 @@
 
 
 import gdaltest
+import pytest
 
 
 ###############################################################################
@@ -80,8 +81,7 @@ def test_ecrgtoc_1():
     gdal.VSIFCloseL(f)
 
     ds = gdal.Open('/vsimem/TOC.xml')
-    if ds is None:
-        return 'fail'
+    assert ds is not None
 
     expected_gt = [-85.43147208121826, 0.00059486040609137061, 0.0, 33.166986564299428, 0.0, -0.00044985604606525913]
     gt = ds.GetGeoTransform()
@@ -91,16 +91,10 @@ def test_ecrgtoc_1():
             print(gt)
 
     wkt = ds.GetProjectionRef()
-    if wkt.find('WGS 84') == -1:
-        gdaltest.post_reason('did not get expected SRS')
-        print(wkt)
-        return 'fail'
+    assert wkt.find('WGS 84') != -1, 'did not get expected SRS'
 
     filelist = ds.GetFileList()
-    if len(filelist) != 3:
-        gdaltest.post_reason('did not get expected filelist')
-        print(filelist)
-        return 'fail'
+    assert len(filelist) == 3, 'did not get expected filelist'
 
     ds2 = gdal.GetDriverByName('NITF').Create('/vsimem/clfc/2/000000009s0013.lf2', 2304, 2304, 3,
                                               options=['ICORDS=G', 'TRE=GEOLOB=000605184000800256-85.43147208122+33.16698656430'])
@@ -119,10 +113,7 @@ def test_ecrgtoc_1():
 
     ds = None
 
-    if cs != 5966:
-        gdaltest.post_reason('bad checksum')
-        print(cs)
-        return 'fail'
+    assert cs == 5966, 'bad checksum'
 
     return 'success'
 
@@ -139,10 +130,7 @@ def test_ecrgtoc_2():
     ds = gdal.Open('/vsimem/TOC.xml')
 
     filelist = ds.GetFileList()
-    if len(filelist) != 4:
-        gdaltest.post_reason('did not get expected filelist')
-        print(filelist)
-        return 'fail'
+    assert len(filelist) == 4, 'did not get expected filelist'
 
     ds = None
 
@@ -170,19 +158,15 @@ def test_ecrgtoc_3():
         gdal.PushErrorHandler()
         ds = gdal.Open(name)
         gdal.PopErrorHandler()
-        if ds is not None:
-            print(name)
-            return 'fail'
+        assert ds is None, name
 
     # Legacy syntax
     ds = gdal.Open('ECRG_TOC_ENTRY:ProductTitle:DiscId:/vsimem/TOC.xml')
-    if ds is None:
-        return 'fail'
+    assert ds is not None
     ds = None
 
     ds = gdal.Open('ECRG_TOC_ENTRY:ProductTitle:DiscId:1_500_K:/vsimem/TOC.xml')
-    if ds is None:
-        return 'fail'
+    assert ds is not None
     ds = None
 
     gdal.Unlink('/vsimem/TOC.xml')
@@ -251,64 +235,43 @@ def test_ecrgtoc_4():
     gdal.VSIFCloseL(f)
 
     ds = gdal.Open('/vsimem/TOC.xml')
-    if ds is None:
-        return 'fail'
-    if ds.RasterCount != 0:
-        gdaltest.post_reason('bad raster count')
-        return 'fail'
+    assert ds is not None
+    assert ds.RasterCount == 0, 'bad raster count'
 
     expected_gt = (-85.43147208121826, 0.00059486040609137061, 0.0, 37.241379310344833, 0.0, -0.00044985604606525913)
     gt = ds.GetGeoTransform()
     for i in range(6):
-        if abs(gt[i] - expected_gt[i]) > 1e-10:
-            gdaltest.post_reason('did not get expected geotransform')
-            print(gt)
-            return 'fail'
+        assert abs(gt[i] - expected_gt[i]) <= 1e-10, 'did not get expected geotransform'
 
     wkt = ds.GetProjectionRef()
-    if wkt.find('WGS 84') == -1:
-        gdaltest.post_reason('did not get expected SRS')
-        print(wkt)
-        return 'fail'
+    assert wkt.find('WGS 84') != -1, 'did not get expected SRS'
 
     filelist = ds.GetFileList()
-    if len(filelist) != 4:
-        gdaltest.post_reason('did not get expected filelist')
-        print(filelist)
-        return 'fail'
+    assert len(filelist) == 4, 'did not get expected filelist'
 
     subdatasets = ds.GetMetadata('SUBDATASETS')
     if len(subdatasets) != 6:
-        gdaltest.post_reason('did not get expected subdatasets')
         print(filelist)
-        return 'fail'
+        pytest.fail('did not get expected subdatasets')
 
     ds = None
 
     ds = gdal.Open('ECRG_TOC_ENTRY:ProductTitle:DiscId:1_500_K:/vsimem/TOC.xml')
-    if ds is None:
-        gdaltest.post_reason('did not get subdataset')
-        return 'fail'
+    assert ds is not None, 'did not get subdataset'
     ds = None
 
     ds = gdal.Open('ECRG_TOC_ENTRY:ProductTitle:DiscId:1_1000_K:/vsimem/TOC.xml')
-    if ds is None:
-        gdaltest.post_reason('did not get subdataset')
-        return 'fail'
+    assert ds is not None, 'did not get subdataset'
     ds = None
 
     ds = gdal.Open('ECRG_TOC_ENTRY:ProductTitle:DiscId2:1_500_K:/vsimem/TOC.xml')
-    if ds is None:
-        gdaltest.post_reason('did not get subdataset')
-        return 'fail'
+    assert ds is not None, 'did not get subdataset'
     ds = None
 
     gdal.PushErrorHandler('CPLQuietErrorHandler')
     ds = gdal.Open('ECRG_TOC_ENTRY:ProductTitle:DiscId:/vsimem/TOC.xml')
     gdal.PopErrorHandler()
-    if ds is not None:
-        gdaltest.post_reason('should not have got subdataset')
-        return 'fail'
+    assert ds is None, 'should not have got subdataset'
 
     gdal.Unlink('/vsimem/TOC.xml')
 
@@ -328,8 +291,7 @@ def test_ecrgtoc_online_1():
         return 'skip'
 
     ds = gdal.Open('/vsizip/tmp/cache/ECRG_Sample.zip/ECRG_Sample/EPF/TOC.xml')
-    if ds is None:
-        return 'fail'
+    assert ds is not None
 
     expected_gt = (-85.43147208121826, 0.00059486040609137061, 0.0, 35.239923224568145, 0.0, -0.00044985604606525913)
     gt = ds.GetGeoTransform()
@@ -339,16 +301,10 @@ def test_ecrgtoc_online_1():
             print(gt)
 
     wkt = ds.GetProjectionRef()
-    if wkt.find('WGS 84') == -1:
-        gdaltest.post_reason('did not get expected SRS')
-        print(wkt)
-        return 'fail'
+    assert wkt.find('WGS 84') != -1, 'did not get expected SRS'
 
     filelist = ds.GetFileList()
-    if len(filelist) != 7:
-        gdaltest.post_reason('did not get expected filelist')
-        print(filelist)
-        return 'fail'
+    assert len(filelist) == 7, 'did not get expected filelist'
 
     return 'success'
 
diff --git a/autotest/gdrivers/ecw.py b/autotest/gdrivers/ecw.py
index 6450976b6dbb..9e40fc6de43b 100755
--- a/autotest/gdrivers/ecw.py
+++ b/autotest/gdrivers/ecw.py
@@ -125,20 +125,12 @@ def test_ecw_2():
 
     (mean, stddev) = ds.GetRasterBand(1).ComputeBandStats()
 
-    if abs(mean - exp_mean) > 0.5 or abs(stddev - exp_stddev) > 0.5:
-        gdaltest.post_reason('mean/stddev of (%g,%g) diffs from expected(%g,%g)' % (mean, stddev, exp_mean, exp_stddev))
-        return 'fail'
+    assert abs(mean - exp_mean) <= 0.5 and abs(stddev - exp_stddev) <= 0.5, \
+        ('mean/stddev of (%g,%g) diffs from expected(%g,%g)' % (mean, stddev, exp_mean, exp_stddev))
 
     geotransform = ds.GetGeoTransform()
-    if abs(geotransform[0] - 467498.5) > 0.1 \
-            or abs(geotransform[1] - 16.5475) > 0.001 \
-            or abs(geotransform[2] - 0) > 0.001 \
-            or abs(geotransform[3] - 5077883.2825) > 0.1 \
-            or abs(geotransform[4] - 0) > 0.001 \
-            or abs(geotransform[5] - -16.5475) > 0.001:
-        print(geotransform)
-        gdaltest.post_reason('geotransform differs from expected')
-        return 'fail'
+    assert abs(geotransform[0] - 467498.5) <= 0.1 and abs(geotransform[1] - 16.5475) <= 0.001 and abs(geotransform[2] - 0) <= 0.001 and abs(geotransform[3] - 5077883.2825) <= 0.1 and abs(geotransform[4] - 0) <= 0.001 and abs(geotransform[5] - -16.5475) <= 0.001, \
+        'geotransform differs from expected'
 
     return 'success'
 
@@ -154,9 +146,7 @@ def test_ecw_3():
     out_ds = gdaltest.ecw_drv.CreateCopy('tmp/jrc_out.ecw', ds, options=['TARGET=75'])
     if out_ds is not None:
         version = out_ds.GetMetadataItem('VERSION')
-        if version != '2':
-            gdaltest.post_reason('bad VERSION')
-            return 'fail'
+        assert version == '2', 'bad VERSION'
 
     ds = None
 
@@ -182,9 +172,7 @@ def test_ecw_4():
 
     ds = gdal.Open('tmp/jrc_out.ecw')
     version = ds.GetMetadataItem('VERSION')
-    if version != '2':
-        gdaltest.post_reason('bad VERSION')
-        return 'fail'
+    assert version == '2', 'bad VERSION'
 
     if gdaltest.ecw_drv.major_version == 3:
         (exp_mean, exp_stddev) = (140.290, 66.6303)
@@ -196,20 +184,12 @@ def test_ecw_4():
 
     (mean, stddev) = ds.GetRasterBand(1).ComputeBandStats()
 
-    if abs(mean - exp_mean) > 1.5 or abs(stddev - exp_stddev) > 0.5:
-        gdaltest.post_reason('mean/stddev of (%g,%g) diffs from expected(%g,%g)' % (mean, stddev, exp_mean, exp_stddev))
-        return 'fail'
+    assert abs(mean - exp_mean) <= 1.5 and abs(stddev - exp_stddev) <= 0.5, \
+        ('mean/stddev of (%g,%g) diffs from expected(%g,%g)' % (mean, stddev, exp_mean, exp_stddev))
 
     geotransform = ds.GetGeoTransform()
-    if abs(geotransform[0] - 467498.5) > 0.1 \
-            or abs(geotransform[1] - 16.5475) > 0.001 \
-            or abs(geotransform[2] - 0) > 0.001 \
-            or abs(geotransform[3] - 5077883.2825) > 0.1 \
-            or abs(geotransform[4] - 0) > 0.001 \
-            or abs(geotransform[5] - -16.5475) > 0.001:
-        print(geotransform)
-        gdaltest.post_reason('geotransform differs from expected')
-        return 'fail'
+    assert abs(geotransform[0] - 467498.5) <= 0.1 and abs(geotransform[1] - 16.5475) <= 0.001 and abs(geotransform[2] - 0) <= 0.001 and abs(geotransform[3] - 5077883.2825) <= 0.1 and abs(geotransform[4] - 0) <= 0.001 and abs(geotransform[5] - -16.5475) <= 0.001, \
+        'geotransform differs from expected'
 
     ds = None
 
@@ -225,12 +205,9 @@ def test_ecw_5():
 
     ds = gdal.Open('data/small.vrt')
     ds_out = gdaltest.jp2ecw_drv.CreateCopy('tmp/ecw_5.jp2', ds, options=['TARGET=75'])
-    if ds_out.GetDriver().ShortName != "JP2ECW":
-        return 'fail'
+    assert ds_out.GetDriver().ShortName == "JP2ECW"
     version = ds_out.GetMetadataItem('VERSION')
-    if version != '1':
-        gdaltest.post_reason('bad VERSION')
-        return 'fail'
+    assert version == '1', 'bad VERSION'
     ds = None
 
     return 'success'
@@ -254,39 +231,27 @@ def test_ecw_6():
 
     # The difference in the stddev is outrageously large between win32 and
     # Linux, but I don't know why.
-    if abs(mean - exp_mean) > 1.5 or abs(stddev - exp_stddev) > 6:
-        gdaltest.post_reason('mean/stddev of (%g,%g) diffs from '
+    assert abs(mean - exp_mean) <= 1.5 and abs(stddev - exp_stddev) <= 6, \
+        ('mean/stddev of (%g,%g) diffs from '
                              'expected(%g,%g)' % (mean, stddev, exp_mean,
                                                   exp_stddev))
-        return 'fail'
 
     (mean, stddev) = ds.GetRasterBand(2).ComputeBandStats()
 
     # The difference in the stddev is outrageously large between win32 and
     # Linux, but I don't know why.
-    if abs(mean - exp_mean) > 1.0 or abs(stddev - exp_stddev) > 6:
-        gdaltest.post_reason('mean/stddev of (%g,%g) diffs from '
+    assert abs(mean - exp_mean) <= 1.0 and abs(stddev - exp_stddev) <= 6, \
+        ('mean/stddev of (%g,%g) diffs from '
                              'expected(%g,%g)' % (mean, stddev, exp_mean,
                                                   exp_stddev))
-        return 'fail'
 
     geotransform = ds.GetGeoTransform()
-    if abs(geotransform[0] - 440720) > 0.1 \
-            or abs(geotransform[1] - 60) > 0.001 \
-            or abs(geotransform[2] - 0) > 0.001 \
-            or abs(geotransform[3] - 3751320) > 0.1 \
-            or abs(geotransform[4] - 0) > 0.001 \
-            or abs(geotransform[5] - -60) > 0.001:
-        print(geotransform)
-        gdaltest.post_reason('geotransform differs from expected')
-        return 'fail'
+    assert abs(geotransform[0] - 440720) <= 0.1 and abs(geotransform[1] - 60) <= 0.001 and abs(geotransform[2] - 0) <= 0.001 and abs(geotransform[3] - 3751320) <= 0.1 and abs(geotransform[4] - 0) <= 0.001 and abs(geotransform[5] - -60) <= 0.001, \
+        'geotransform differs from expected'
 
     prj = ds.GetProjectionRef()
-    if prj.find('UTM') == -1 or prj.find('NAD27') == -1 \
-       or prj.find('one 11') == -1:
-        print(prj)
-        gdaltest.post_reason('Coordinate system not UTM 11, NAD27?')
-        return 'fail'
+    assert (not (prj.find('UTM') == -1 or prj.find('NAD27') == -1 \
+       or prj.find('one 11') == -1)), 'Coordinate system not UTM 11, NAD27?'
 
     ds = None
 
@@ -321,26 +286,16 @@ def test_ecw_8():
     (exp_mean, exp_stddev) = (145.57, 43.1712)
     (mean, stddev) = ds.GetRasterBand(1).ComputeBandStats()
 
-    if abs(mean - exp_mean) > 1.0 or abs(stddev - exp_stddev) > 1.0:
-        gdaltest.post_reason('mean/stddev of (%g,%g) diffs from expected(%g,%g)' % (mean, stddev, exp_mean, exp_stddev))
-        return 'fail'
+    assert abs(mean - exp_mean) <= 1.0 and abs(stddev - exp_stddev) <= 1.0, \
+        ('mean/stddev of (%g,%g) diffs from expected(%g,%g)' % (mean, stddev, exp_mean, exp_stddev))
 
     geotransform = ds.GetGeoTransform()
-    if abs(geotransform[0] - 440720) > 0.1 \
-            or abs(geotransform[1] - 60) > 0.001 \
-            or abs(geotransform[2] - 0) > 0.001 \
-            or abs(geotransform[3] - 3751320) > 0.1 \
-            or abs(geotransform[4] - 0) > 0.001 \
-            or abs(geotransform[5] - -60) > 0.001:
-        print(geotransform)
-        gdaltest.post_reason('geotransform differs from expected')
-        return 'fail'
+    assert abs(geotransform[0] - 440720) <= 0.1 and abs(geotransform[1] - 60) <= 0.001 and abs(geotransform[2] - 0) <= 0.001 and abs(geotransform[3] - 3751320) <= 0.1 and abs(geotransform[4] - 0) <= 0.001 and abs(geotransform[5] - -60) <= 0.001, \
+        'geotransform differs from expected'
 
     prj = ds.GetProjectionRef()
-    if prj.find('UTM Zone 11') == -1 or prj.find('WGS 84') == -1:
-        gdaltest.post_reason('Coordinate system not UTM 11, WGS 84?')
-        print(prj)
-        return 'fail'
+    assert not (prj.find('UTM Zone 11') == -1 or prj.find('WGS 84') == -1), \
+        'Coordinate system not UTM 11, WGS 84?'
 
     ds = None
 
@@ -390,20 +345,12 @@ def test_ecw_10():
     (exp_mean, exp_stddev) = (98.49, 57.7129)
     (mean, stddev) = ds.GetRasterBand(1).ComputeBandStats()
 
-    if abs(mean - exp_mean) > 1.1 or abs(stddev - exp_stddev) > 0.1:
-        gdaltest.post_reason('mean/stddev of (%g,%g) diffs from expected(%g,%g)' % (mean, stddev, exp_mean, exp_stddev))
-        return 'fail'
+    assert abs(mean - exp_mean) <= 1.1 and abs(stddev - exp_stddev) <= 0.1, \
+        ('mean/stddev of (%g,%g) diffs from expected(%g,%g)' % (mean, stddev, exp_mean, exp_stddev))
 
     geotransform = ds.GetGeoTransform()
-    if abs(geotransform[0] - 100) > 0.1 \
-            or abs(geotransform[1] - 0.1) > 0.001 \
-            or abs(geotransform[2] - 0) > 0.001 \
-            or abs(geotransform[3] - 30) > 0.1 \
-            or abs(geotransform[4] - 0) > 0.001 \
-            or abs(geotransform[5] - -0.1) > 0.001:
-        print(geotransform)
-        gdaltest.post_reason('geotransform differs from expected')
-        return 'fail'
+    assert abs(geotransform[0] - 100) <= 0.1 and abs(geotransform[1] - 0.1) <= 0.001 and abs(geotransform[2] - 0) <= 0.001 and abs(geotransform[3] - 30) <= 0.1 and abs(geotransform[4] - 0) <= 0.001 and abs(geotransform[5] - -0.1) <= 0.001, \
+        'geotransform differs from expected'
 
     # should check the projection, but I'm too lazy just now.
 
@@ -449,27 +396,17 @@ def test_ecw_12():
     ds = gdal.Open('tmp/test_11.ntf')
 
     geotransform = ds.GetGeoTransform()
-    if abs(geotransform[0] - 100) > 0.1 \
-            or abs(geotransform[1] - 0.1) > 0.001 \
-            or abs(geotransform[2] - 0) > 0.001 \
-            or abs(geotransform[3] - 30.0) > 0.1 \
-            or abs(geotransform[4] - 0) > 0.001 \
-            or abs(geotransform[5] - -0.1) > 0.001:
-        print(geotransform)
-        gdaltest.post_reason('geotransform differs from expected')
-        return 'fail'
+    assert abs(geotransform[0] - 100) <= 0.1 and abs(geotransform[1] - 0.1) <= 0.001 and abs(geotransform[2] - 0) <= 0.001 and abs(geotransform[3] - 30.0) <= 0.1 and abs(geotransform[4] - 0) <= 0.001 and abs(geotransform[5] - -0.1) <= 0.001, \
+        'geotransform differs from expected'
 
-    if ds.GetRasterBand(1).GetRasterColorInterpretation() != gdal.GCI_BlueBand:
-        gdaltest.post_reason('Got wrong color interpretation.')
-        return 'fail'
+    assert ds.GetRasterBand(1).GetRasterColorInterpretation() == gdal.GCI_BlueBand, \
+        'Got wrong color interpretation.'
 
-    if ds.GetRasterBand(2).GetRasterColorInterpretation() != gdal.GCI_GreenBand:
-        gdaltest.post_reason('Got wrong color interpretation.')
-        return 'fail'
+    assert ds.GetRasterBand(2).GetRasterColorInterpretation() == gdal.GCI_GreenBand, \
+        'Got wrong color interpretation.'
 
-    if ds.GetRasterBand(3).GetRasterColorInterpretation() != gdal.GCI_RedBand:
-        gdaltest.post_reason('Got wrong color interpretation.')
-        return 'fail'
+    assert ds.GetRasterBand(3).GetRasterColorInterpretation() == gdal.GCI_RedBand, \
+        'Got wrong color interpretation.'
 
     ds = None
 
@@ -502,10 +439,8 @@ def test_ecw_13():
                  ds.GetRasterBand(3).Checksum())
     ds = None
 
-    if checksums != (19253, 17848, 19127):
-        gdaltest.post_reason('Expected checksums do match expected checksums')
-        print(checksums)
-        return 'fail'
+    assert checksums == (19253, 17848, 19127), \
+        'Expected checksums do match expected checksums'
 
     return 'success'
 
@@ -534,23 +469,13 @@ def test_ecw_15():
     ds = gdal.Open('tmp/rgb_gcp.jp2')
 
     gcp_srs = ds.GetGCPProjection()
-    if gcp_srs[:6] != 'GEOGCS' \
+    assert (not (gcp_srs[:6] != 'GEOGCS' \
        or gcp_srs.find('WGS') == -1 \
-       or gcp_srs.find('84') == -1:
-        gdaltest.post_reason('GCP Projection not retained.')
-        print(gcp_srs)
-        return 'fail'
+       or gcp_srs.find('84') == -1)), 'GCP Projection not retained.'
 
     gcps = ds.GetGCPs()
-    if len(gcps) != 4 \
-       or gcps[1].GCPPixel != 0 \
-       or gcps[1].GCPLine != 50 \
-       or gcps[1].GCPX != 0 \
-       or gcps[1].GCPY != 50 \
-       or gcps[1].GCPZ != 0:
-        gdaltest.post_reason('GCPs wrong.')
-        print(gcps)
-        return 'fail'
+    assert len(gcps) == 4 and gcps[1].GCPPixel == 0 and gcps[1].GCPLine == 50 and gcps[1].GCPX == 0 and gcps[1].GCPY == 50 and gcps[1].GCPZ == 0, \
+        'GCPs wrong.'
 
     ds = None
 
@@ -611,9 +536,7 @@ def test_ecw_17():
     ds_ref = None
 
     # Quite a bit of difference...
-    if maxdiff > 6:
-        gdaltest.post_reason('Image too different from reference')
-        return 'fail'
+    assert maxdiff <= 6, 'Image too different from reference'
 
     return 'success'
 
@@ -664,13 +587,10 @@ def test_ecw_19():
     expected_checksums = [64570, 57277, 56048, 61292]
 
     for i in range(4):
-        if ds.GetRasterBand(i + 1).Checksum() != expected_checksums[i]:
-            gdaltest.post_reason('unexpected checksum (%d) for band %d' % (expected_checksums[i], i + 1))
-            return 'fail'
+        assert ds.GetRasterBand(i + 1).Checksum() == expected_checksums[i], \
+            ('unexpected checksum (%d) for band %d' % (expected_checksums[i], i + 1))
 
-    if ds.GetRasterBand(1).DataType != gdal.GDT_UInt16:
-        gdaltest.post_reason('unexpected data type')
-        return 'fail'
+    assert ds.GetRasterBand(1).DataType == gdal.GDT_UInt16, 'unexpected data type'
 
     return 'success'
 
@@ -687,16 +607,12 @@ def test_ecw_20():
     ds = gdal.Open('data/jrc.ecw')
 
     band = ds.GetRasterBand(1)
-    if band.GetOverviewCount() != 1:
-        gdaltest.post_reason('did not get expected number of overview')
-        return 'fail'
+    assert band.GetOverviewCount() == 1, 'did not get expected number of overview'
 
     # Both requests should go *exactly* to the same code path
     data_subsampled = band.ReadRaster(0, 0, 400, 400, 200, 200)
     data_overview = band.GetOverview(0).ReadRaster(0, 0, 200, 200)
-    if data_subsampled != data_overview:
-        gdaltest.post_reason('inconsistent overview behaviour')
-        return 'fail'
+    assert data_subsampled == data_overview, 'inconsistent overview behaviour'
 
     if gdaltest.ecw_drv.major_version == 3:
         (exp_mean, exp_stddev) = (141.644, 67.2186)
@@ -707,11 +623,10 @@ def test_ecw_20():
             (exp_mean, exp_stddev) = (140.889, 62.742)
     (mean, stddev) = band.GetOverview(0).ComputeBandStats()
 
-    if abs(mean - exp_mean) > 0.5 or abs(stddev - exp_stddev) > 0.5:
-        gdaltest.post_reason('mean/stddev of (%g,%g) diffs from '
+    assert abs(mean - exp_mean) <= 0.5 and abs(stddev - exp_stddev) <= 0.5, \
+        ('mean/stddev of (%g,%g) diffs from '
                              'expected(%g,%g)' % (mean, stddev, exp_mean,
                                                   exp_stddev))
-        return 'fail'
 
     return 'success'
 
@@ -741,9 +656,8 @@ def test_ecw_21():
 
     (mean, stddev) = mem_ds.GetRasterBand(1).ComputeBandStats()
 
-    if abs(mean - exp_mean) > 0.5 or abs(stddev - exp_stddev) > 0.5:
-        gdaltest.post_reason('mean/stddev of (%g,%g) diffs from expected(%g,%g)' % (mean, stddev, exp_mean, exp_stddev))
-        return 'fail'
+    assert abs(mean - exp_mean) <= 0.5 and abs(stddev - exp_stddev) <= 0.5, \
+        ('mean/stddev of (%g,%g) diffs from expected(%g,%g)' % (mean, stddev, exp_mean, exp_stddev))
 
     return 'success'
 
@@ -762,10 +676,7 @@ def test_ecw_22():
     expected_wkt = """PROJCS["L2CAL6M",GEOGCS["NAD83",DATUM["North_American_Datum_1983",SPHEROID["GRS 1980",6378137,298.257222101,AUTHORITY["EPSG","7019"]],TOWGS84[0,0,0,0,0,0,0],AUTHORITY["EPSG","6269"]],PRIMEM["Greenwich",0,AUTHORITY["EPSG","8901"]],UNIT["degree",0.0174532925199433,AUTHORITY["EPSG","9108"]],AXIS["Lat",NORTH],AXIS["Long",EAST],AUTHORITY["EPSG","4269"]],PROJECTION["Lambert_Conformal_Conic_2SP"],PARAMETER["standard_parallel_1",32.78333330780953],PARAMETER["standard_parallel_2",33.88333332087654],PARAMETER["latitude_of_origin",32.16666668243202],PARAMETER["central_meridian",-116.2499999745946],PARAMETER["false_easting",2000000],PARAMETER["false_northing",500000],UNIT["Meter",1]]"""
     wkt = ds.GetProjectionRef()
 
-    if wkt != expected_wkt:
-        print(wkt)
-        gdaltest.post_reason('did not get expected SRS.')
-        return 'fail'
+    assert wkt == expected_wkt, 'did not get expected SRS.'
 
     return 'success'
 
@@ -787,17 +698,11 @@ def test_ecw_23():
     expected_wkt = """PROJCS["OSGB 1936 / British National Grid",GEOGCS["OSGB 1936",DATUM["OSGB_1936",SPHEROID["Airy 1830",6377563.396,299.3249646,AUTHORITY["EPSG","7001"]],TOWGS84[446.448,-125.157,542.06,0.15,0.247,0.842,-20.489],AUTHORITY["EPSG","6277"]],PRIMEM["Greenwich",0,AUTHORITY["EPSG","8901"]],UNIT["degree",0.0174532925199433,AUTHORITY["EPSG","9122"]],AUTHORITY["EPSG","4277"]],UNIT["metre",1,AUTHORITY["EPSG","9001"]],PROJECTION["Transverse_Mercator"],PARAMETER["latitude_of_origin",49],PARAMETER["central_meridian",-2],PARAMETER["scale_factor",0.9996012717],PARAMETER["false_easting",400000],PARAMETER["false_northing",-100000],AUTHORITY["EPSG","27700"],AXIS["Easting",EAST],AXIS["Northing",NORTH]]"""
     wkt = ds.GetProjectionRef()
 
-    if wkt != expected_wkt:
-        print(wkt)
-        gdaltest.post_reason('did not get expected SRS.')
-        return 'fail'
+    assert wkt == expected_wkt, 'did not get expected SRS.'
 
     gt = ds.GetGeoTransform()
     expected_gt = (6138559.5576418638, 195.5116973254697, 0.0, 2274798.7836679211, 0.0, -198.32414964918371)
-    if gt != expected_gt:
-        print(gt)
-        gdaltest.post_reason('did not get expected geotransform.')
-        return 'fail'
+    assert gt == expected_gt, 'did not get expected geotransform.'
 
     try:
         os.remove('tmp/spif83.ecw')
@@ -844,9 +749,7 @@ def test_ecw_24():
     ds = None
 
     for i in range(6):
-        if abs(gt[i] - got_gt[i]) > 1e-5:
-            print(got_gt)
-            return 'fail'
+        assert abs(gt[i] - got_gt[i]) <= 1e-5
 
     try:
         os.remove('tmp/spif83.ecw')
@@ -900,19 +803,11 @@ def test_ecw_25():
     got_wkt = ds.GetProjectionRef()
     ds = None
 
-    if got_proj != proj:
-        print(got_proj)
-        return 'fail'
-    if got_datum != datum:
-        print(got_datum)
-        return 'fail'
-    if got_units != units:
-        print(got_units)
-        return 'fail'
+    assert got_proj == proj
+    assert got_datum == datum
+    assert got_units == units
 
-    if wkt != got_wkt:
-        print(got_wkt)
-        return 'fail'
+    assert wkt == got_wkt
 
     try:
         os.remove('tmp/spif83.ecw')
@@ -965,23 +860,15 @@ def test_ecw_26():
     got_wkt = ds.GetProjectionRef()
     ds = None
 
-    if got_proj != proj:
-        print(proj)
-        return 'fail'
-    if got_datum != datum:
-        print(datum)
-        return 'fail'
-    if got_units != units:
-        print(units)
-        return 'fail'
+    assert got_proj == proj
+    assert got_datum == datum
+    assert got_units == units
 
     sr = osr.SpatialReference()
     sr.ImportFromERM(proj, datum, units)
     wkt = sr.ExportToWkt()
 
-    if wkt != got_wkt:
-        print(got_wkt)
-        return 'fail'
+    assert wkt == got_wkt
 
     try:
         os.remove('tmp/spif83.ecw')
@@ -1002,15 +889,8 @@ def test_ecw_27():
     ds = gdal.Open('data/byte_without_geotransform.jp2')
 
     geotransform = ds.GetGeoTransform()
-    if abs(geotransform[0] - 440720) > 0.1 \
-            or abs(geotransform[1] - 60) > 0.001 \
-            or abs(geotransform[2] - 0) > 0.001 \
-            or abs(geotransform[3] - 3751320) > 0.1 \
-            or abs(geotransform[4] - 0) > 0.001 \
-            or abs(geotransform[5] - -60) > 0.001:
-        print(geotransform)
-        gdaltest.post_reason('geotransform differs from expected')
-        return 'fail'
+    assert abs(geotransform[0] - 440720) <= 0.1 and abs(geotransform[1] - 60) <= 0.001 and abs(geotransform[2] - 0) <= 0.001 and abs(geotransform[3] - 3751320) <= 0.1 and abs(geotransform[4] - 0) <= 0.001 and abs(geotransform[5] - -60) <= 0.001, \
+        'geotransform differs from expected'
 
     ds = None
 
@@ -1132,8 +1012,7 @@ def test_ecw_30():
     data_readblock = ds.GetRasterBand(1).ReadBlock(0, 0)
     ds = None
 
-    if data_readraster != data_readblock:
-        return 'fail'
+    assert data_readraster == data_readblock
 
     return 'success'
 
@@ -1179,9 +1058,7 @@ def test_ecw_31():
     asyncreader = None
     ds = None
 
-    if async_buf != ref_buf:
-        gdaltest.post_reason('async_buf != ref_buf')
-        return 'fail'
+    assert async_buf == ref_buf, 'async_buf != ref_buf'
 
     return 'success'
 
@@ -1199,8 +1076,7 @@ def test_ecw_32():
     ds = gdal.Open('data/jrc.ecw')
     data_123 = ds.ReadRaster(0, 0, ds.RasterXSize, ds.RasterYSize, band_list=[1, 2, 3])
     data_321 = ds.ReadRaster(0, 0, ds.RasterXSize, ds.RasterYSize, band_list=[3, 2, 1])
-    if data_123 == data_321:
-        return 'fail'
+    assert data_123 != data_321
 
     vrt_ds = gdal.Open("""<VRTDataset rasterXSize="400" rasterYSize="400">
     <VRTRasterBand dataType="Byte" band="1">
@@ -1224,8 +1100,7 @@ def test_ecw_32():
     </VRTDataset>""")
     data_vrt = vrt_ds.ReadRaster(0, 0, ds.RasterXSize, ds.RasterYSize, band_list=[1, 2, 3])
 
-    if data_321 != data_vrt:
-        return 'fail'
+    assert data_321 == data_vrt
 
     return 'success'
 
@@ -1270,16 +1145,14 @@ def test_ecw_33():
 
     ds = None
 
-    if data1_1 != data1_2 or data2_1 != data2_2 or data3_1 != data3_2:
-        return 'fail'
+    assert data1_1 == data1_2 and data2_1 == data2_2 and data3_1 == data3_2
 
     # When heuristics is ON, returned values should be the same as
     # 3-band at a time reading
     import struct
     tab1 = struct.unpack('B' * 3 * 50 * 50, multiband_data)
     tab2 = struct.unpack('B' * 3 * 50 * 50, data1_1 + data2_1 + data3_2)
-    if tab1 != tab2:
-        return 'fail'
+    assert tab1 == tab2
 
     ds = None
 
@@ -1314,12 +1187,9 @@ def test_ecw_33_bis():
     # not consistent. (which seems to be no longer the case with more recent
     # SDK such as 5.0)
     for i in range(50 * 50):
-        if data1[i * 4] != data_ref[i]:
-            return 'fail'
-        if data2[i * 4] != data_ref[50 * 50 + i]:
-            return 'fail'
-        if data3[i * 4] != data_ref[2 * 50 * 50 + i]:
-            return 'fail'
+        assert data1[i * 4] == data_ref[i]
+        assert data2[i * 4] == data_ref[50 * 50 + i]
+        assert data3[i * 4] == data_ref[2 * 50 * 50 + i]
 
     ds = None
 
@@ -1348,12 +1218,8 @@ def test_ecw_34():
     version = ds.GetMetadataItem('VERSION')
     ds = None
 
-    if got_data != ref_data:
-        return 'fail'
-    if version != '3':
-        gdaltest.post_reason('bad VERSION')
-        print(version)
-        return 'fail'
+    assert got_data == ref_data
+    assert version == '3', 'bad VERSION'
 
     return 'success'
 
@@ -1376,8 +1242,7 @@ def test_ecw_35():
     got_data = ds.GetRasterBand(1).ReadRaster(0, 0, 128, 128, buf_type=gdal.GDT_UInt16)
     ds = None
 
-    if got_data != ref_data:
-        return 'fail'
+    assert got_data == ref_data
     return 'success'
 
 ###############################################################################
@@ -1417,29 +1282,23 @@ def test_ecw_36():
 
     dswr = gdaltest.ecw_drv.CreateCopy('tmp/jrc312.ecw', vrt_ds, options=['ECW_FORMAT_VERSION=3', 'TARGET=75'])
 
-    if dswr.GetRasterBand(1).GetColorInterpretation() != gdal.GCI_BlueBand:
-        print('Band 1 color interpretation should be Blue  but is : ' + gdal.GetColorInterpretationName(dswr.GetRasterBand(1).GetColorInterpretation()))
-        return 'fail'
-    if dswr.GetRasterBand(2).GetColorInterpretation() != gdal.GCI_RedBand:
-        print('Band 2 color interpretation should be Red but is : ' + gdal.GetColorInterpretationName(dswr.GetRasterBand(2).GetColorInterpretation()))
-        return 'fail'
-    if dswr.GetRasterBand(3).GetColorInterpretation() != gdal.GCI_GreenBand:
-        print('Band 3 color interpretation should be Green but is : ' + gdal.GetColorInterpretationName(dswr.GetRasterBand(3).GetColorInterpretation()))
-        return 'fail'
+    assert dswr.GetRasterBand(1).GetColorInterpretation() == gdal.GCI_BlueBand, \
+        ('Band 1 color interpretation should be Blue  but is : ' + gdal.GetColorInterpretationName(dswr.GetRasterBand(1).GetColorInterpretation()))
+    assert dswr.GetRasterBand(2).GetColorInterpretation() == gdal.GCI_RedBand, \
+        ('Band 2 color interpretation should be Red but is : ' + gdal.GetColorInterpretationName(dswr.GetRasterBand(2).GetColorInterpretation()))
+    assert dswr.GetRasterBand(3).GetColorInterpretation() == gdal.GCI_GreenBand, \
+        ('Band 3 color interpretation should be Green but is : ' + gdal.GetColorInterpretationName(dswr.GetRasterBand(3).GetColorInterpretation()))
 
     dswr = None
 
     dsr = gdal.Open('tmp/jrc312.ecw')
 
-    if dsr.GetRasterBand(1).GetColorInterpretation() != gdal.GCI_BlueBand:
-        print('Band 1 color interpretation should be Blue  but is : ' + gdal.GetColorInterpretationName(dsr.GetRasterBand(1).GetColorInterpretation()))
-        return 'fail'
-    if dsr.GetRasterBand(2).GetColorInterpretation() != gdal.GCI_RedBand:
-        print('Band 2 color interpretation should be Red but is : ' + gdal.GetColorInterpretationName(dsr.GetRasterBand(2).GetColorInterpretation()))
-        return 'fail'
-    if dsr.GetRasterBand(3).GetColorInterpretation() != gdal.GCI_GreenBand:
-        print('Band 3 color interpretation should be Green but is : ' + gdal.GetColorInterpretationName(dsr.GetRasterBand(3).GetColorInterpretation()))
-        return 'fail'
+    assert dsr.GetRasterBand(1).GetColorInterpretation() == gdal.GCI_BlueBand, \
+        ('Band 1 color interpretation should be Blue  but is : ' + gdal.GetColorInterpretationName(dsr.GetRasterBand(1).GetColorInterpretation()))
+    assert dsr.GetRasterBand(2).GetColorInterpretation() == gdal.GCI_RedBand, \
+        ('Band 2 color interpretation should be Red but is : ' + gdal.GetColorInterpretationName(dsr.GetRasterBand(2).GetColorInterpretation()))
+    assert dsr.GetRasterBand(3).GetColorInterpretation() == gdal.GCI_GreenBand, \
+        ('Band 3 color interpretation should be Green but is : ' + gdal.GetColorInterpretationName(dsr.GetRasterBand(3).GetColorInterpretation()))
 
     dsr = None
 
@@ -1460,29 +1319,23 @@ def test_ecw_37():
 
     dswr = gdaltest.ecw_drv.CreateCopy('tmp/jrc123.ecw', ds, options=['ECW_FORMAT_VERSION=3', 'TARGET=75'])
 
-    if dswr.GetRasterBand(1).GetColorInterpretation() != gdal.GCI_RedBand:
-        print('Band 1 color interpretation should be Red but is : ' + gdal.GetColorInterpretationName(dswr.GetRasterBand(1).GetColorInterpretation()))
-        return 'fail'
-    if dswr.GetRasterBand(2).GetColorInterpretation() != gdal.GCI_GreenBand:
-        print('Band 2 color interpretation should be Green but is : ' + gdal.GetColorInterpretationName(dswr.GetRasterBand(2).GetColorInterpretation()))
-        return 'fail'
-    if dswr.GetRasterBand(3).GetColorInterpretation() != gdal.GCI_BlueBand:
-        print('Band 3 color interpretation should be Blue but is : ' + gdal.GetColorInterpretationName(dswr.GetRasterBand(3).GetColorInterpretation()))
-        return 'fail'
+    assert dswr.GetRasterBand(1).GetColorInterpretation() == gdal.GCI_RedBand, \
+        ('Band 1 color interpretation should be Red but is : ' + gdal.GetColorInterpretationName(dswr.GetRasterBand(1).GetColorInterpretation()))
+    assert dswr.GetRasterBand(2).GetColorInterpretation() == gdal.GCI_GreenBand, \
+        ('Band 2 color interpretation should be Green but is : ' + gdal.GetColorInterpretationName(dswr.GetRasterBand(2).GetColorInterpretation()))
+    assert dswr.GetRasterBand(3).GetColorInterpretation() == gdal.GCI_BlueBand, \
+        ('Band 3 color interpretation should be Blue but is : ' + gdal.GetColorInterpretationName(dswr.GetRasterBand(3).GetColorInterpretation()))
 
     dswr = None
 
     dsr = gdal.Open('tmp/jrc123.ecw')
 
-    if dsr.GetRasterBand(1).GetColorInterpretation() != gdal.GCI_RedBand:
-        print('Band 1 color interpretation should be Red  but is : ' + gdal.GetColorInterpretationName(dsr.GetRasterBand(1).GetColorInterpretation()))
-        return 'fail'
-    if dsr.GetRasterBand(2).GetColorInterpretation() != gdal.GCI_GreenBand:
-        print('Band 2 color interpretation should be Green but is : ' + gdal.GetColorInterpretationName(dsr.GetRasterBand(2).GetColorInterpretation()))
-        return 'fail'
-    if dsr.GetRasterBand(3).GetColorInterpretation() != gdal.GCI_BlueBand:
-        print('Band 3 color interpretation should be Blue but is : ' + gdal.GetColorInterpretationName(dsr.GetRasterBand(3).GetColorInterpretation()))
-        return 'fail'
+    assert dsr.GetRasterBand(1).GetColorInterpretation() == gdal.GCI_RedBand, \
+        ('Band 1 color interpretation should be Red  but is : ' + gdal.GetColorInterpretationName(dsr.GetRasterBand(1).GetColorInterpretation()))
+    assert dsr.GetRasterBand(2).GetColorInterpretation() == gdal.GCI_GreenBand, \
+        ('Band 2 color interpretation should be Green but is : ' + gdal.GetColorInterpretationName(dsr.GetRasterBand(2).GetColorInterpretation()))
+    assert dsr.GetRasterBand(3).GetColorInterpretation() == gdal.GCI_BlueBand, \
+        ('Band 3 color interpretation should be Blue but is : ' + gdal.GetColorInterpretationName(dsr.GetRasterBand(3).GetColorInterpretation()))
 
     dsr = None
 
@@ -1519,9 +1372,7 @@ def test_ecw_38():
     ds_ref = None
 
     # Quite a bit of difference...
-    if maxdiff > 0:
-        gdaltest.post_reason('Image too different from reference')
-        return 'fail'
+    assert maxdiff <= 0, 'Image too different from reference'
 
     return 'success'
 
@@ -1550,9 +1401,7 @@ def test_ecw_39():
     result = (hist == ds.GetRasterBand(1).GetDefaultHistogram(force=0))
 
     ds = None
-    if not result:
-        gdaltest.post_reason('Default histogram written incorrectly')
-        return 'fail'
+    assert result, 'Default histogram written incorrectly'
 
     return 'success'
 
@@ -1595,18 +1444,12 @@ def test_ecw_40():
 
     got_md = ds.GetMetadata()
     for (key, value) in expected_md:
-        if key not in got_md or got_md[key] != value:
-            print(key)
-            print(got_md[key])
-            return 'fail'
+        assert key in got_md and got_md[key] == value
 
     expected_cs_list = [28760, 59071, 54087, 22499]
     for i in range(4):
         got_cs = ds.GetRasterBand(i + 1).Checksum()
-        if got_cs != expected_cs_list[i]:
-            print(expected_cs_list[i])
-            print(got_cs)
-            return 'fail'
+        assert got_cs == expected_cs_list[i]
 
     return 'success'
 
@@ -1628,23 +1471,16 @@ def test_ecw_41():
     ds = gdal.Open('tmp/stefan_full_rgba_ecwv3_meta.ecw')
 
     # Check that no statistics is already included in the file
-    if ds.GetRasterBand(1).GetMinimum() is not None:
-        return 'fail'
-    if ds.GetRasterBand(1).GetMaximum() is not None:
-        return 'fail'
-    if ds.GetRasterBand(1).GetStatistics(1, 0) != [0.0, 0.0, 0.0, -1.0]:
-        return 'fail'
-    if ds.GetRasterBand(1).GetDefaultHistogram(force=0) is not None:
-        return 'fail'
+    assert ds.GetRasterBand(1).GetMinimum() is None
+    assert ds.GetRasterBand(1).GetMaximum() is None
+    assert ds.GetRasterBand(1).GetStatistics(1, 0) == [0.0, 0.0, 0.0, -1.0]
+    assert ds.GetRasterBand(1).GetDefaultHistogram(force=0) is None
 
     # Now compute the stats
     stats = ds.GetRasterBand(1).GetStatistics(0, 1)
     expected_stats = [0.0, 255.0, 21.662427983539093, 51.789457392268119]
     for i in range(4):
-        if abs(stats[i] - expected_stats[i]) > 1:
-            print(stats)
-            print(expected_stats)
-            return 'fail'
+        assert abs(stats[i] - expected_stats[i]) <= 1
 
     ds = None
 
@@ -1656,29 +1492,19 @@ def test_ecw_41():
         pass
 
     ds = gdal.Open('tmp/stefan_full_rgba_ecwv3_meta.ecw')
-    if ds.GetRasterBand(1).GetMinimum() != 0:
-        print(ds.GetRasterBand(1).GetMinimum())
-        return 'fail'
-    if ds.GetRasterBand(1).GetMaximum() != 255:
-        print(ds.GetRasterBand(1).GetMaximum())
-        return 'fail'
+    assert ds.GetRasterBand(1).GetMinimum() == 0
+    assert ds.GetRasterBand(1).GetMaximum() == 255
     stats = ds.GetRasterBand(1).GetStatistics(0, 0)
     expected_stats = [0.0, 255.0, 21.662427983539093, 51.789457392268119]
     for i in range(4):
-        if abs(stats[i] - expected_stats[i]) > 1:
-            print(stats[i])
-            print(expected_stats[i])
-            return 'fail'
+        assert abs(stats[i] - expected_stats[i]) <= 1
     ds = None
 
     ds = gdal.Open('tmp/stefan_full_rgba_ecwv3_meta.ecw')
     # And compute the histogram
     got_hist = ds.GetRasterBand(1).GetDefaultHistogram()
     expected_hist = (-0.5, 255.5, 256, [1006, 16106, 548, 99, 13, 24, 62, 118, 58, 125, 162, 180, 133, 146, 70, 81, 84, 97, 90, 60, 79, 70, 85, 77, 73, 63, 60, 64, 56, 69, 63, 73, 70, 72, 61, 66, 40, 52, 65, 44, 62, 54, 56, 55, 63, 51, 47, 39, 58, 44, 36, 43, 47, 45, 54, 28, 40, 41, 37, 36, 33, 31, 28, 34, 19, 32, 19, 23, 23, 33, 16, 34, 32, 54, 29, 33, 40, 37, 27, 34, 24, 29, 26, 21, 22, 24, 25, 19, 29, 22, 24, 14, 20, 20, 29, 28, 13, 19, 21, 19, 19, 21, 13, 19, 13, 14, 22, 15, 13, 26, 10, 13, 13, 14, 10, 17, 15, 19, 11, 18, 11, 14, 8, 12, 20, 12, 17, 10, 15, 15, 16, 14, 11, 7, 7, 10, 8, 12, 7, 8, 14, 7, 9, 12, 4, 6, 12, 5, 5, 4, 11, 8, 4, 8, 7, 10, 11, 6, 7, 5, 6, 8, 10, 10, 7, 5, 3, 5, 5, 6, 4, 10, 7, 6, 8, 4, 6, 6, 4, 6, 6, 7, 10, 4, 5, 2, 5, 6, 1, 1, 2, 6, 2, 1, 7, 4, 1, 3, 3, 2, 6, 2, 3, 3, 3, 3, 5, 5, 4, 2, 3, 2, 1, 3, 5, 5, 4, 1, 1, 2, 5, 10, 5, 9, 3, 5, 3, 5, 4, 5, 4, 4, 6, 7, 9, 17, 13, 15, 14, 13, 20, 18, 16, 27, 35, 53, 60, 51, 46, 40, 38, 50, 66, 36, 45, 13])
-    if got_hist != expected_hist:
-        print(got_hist)
-        print(expected_hist)
-        return 'fail'
+    assert got_hist == expected_hist
     ds = None
 
     # Remove the .aux.xml file
@@ -1688,17 +1514,10 @@ def test_ecw_41():
         pass
 
     ds = gdal.Open('tmp/stefan_full_rgba_ecwv3_meta.ecw')
-    if ds.GetRasterBand(1).GetMinimum() != 0:
-        print(ds.GetRasterBand(1).GetMinimum())
-        return 'fail'
-    if ds.GetRasterBand(1).GetMaximum() != 255:
-        print(ds.GetRasterBand(1).GetMaximum())
-        return 'fail'
+    assert ds.GetRasterBand(1).GetMinimum() == 0
+    assert ds.GetRasterBand(1).GetMaximum() == 255
     got_hist = ds.GetRasterBand(1).GetDefaultHistogram(force=0)
-    if got_hist != expected_hist:
-        print(got_hist)
-        print(expected_hist)
-        return 'fail'
+    assert got_hist == expected_hist
     ds = None
 
     # Check that there's no .aux.xml file
@@ -1751,10 +1570,7 @@ def test_ecw_42():
     ds = gdal.Open('tmp/stefan_full_rgba_ecwv3_meta.ecw')
     got_md = ds.GetMetadata()
     for item in md:
-        if got_md[item] != md[item]:
-            print(got_md[item])
-            print(md[item])
-            return 'fail'
+        assert got_md[item] == md[item]
     ds = None
 
     # Test unsetting all the stuff
@@ -1784,10 +1600,7 @@ def test_ecw_42():
     ds = gdal.Open('tmp/stefan_full_rgba_ecwv3_meta.ecw')
     got_md = ds.GetMetadata()
     for item in md:
-        if item in got_md and item != 'FILE_METADATA_ACQUISITION_DATE':
-            print(got_md[item])
-            print(md[item])
-            return 'fail'
+        assert item not in got_md or item == 'FILE_METADATA_ACQUISITION_DATE', md[item]
     ds = None
 
     return 'success'
@@ -1804,12 +1617,9 @@ def test_ecw_43():
 
     ds = gdal.Open('data/stefan_full_rgba_alpha_1bit.jp2')
     fourth_band = ds.GetRasterBand(4)
-    if fourth_band.GetMetadataItem('NBITS', 'IMAGE_STRUCTURE') is not None:
-        return 'fail'
+    assert fourth_band.GetMetadataItem('NBITS', 'IMAGE_STRUCTURE') is None
     got_cs = fourth_band.Checksum()
-    if got_cs != 8527:
-        print(got_cs)
-        return 'fail'
+    assert got_cs == 8527
     jp2_bands_data = ds.ReadRaster(0, 0, ds.RasterXSize, ds.RasterYSize)
     jp2_fourth_band_data = fourth_band.ReadRaster(0, 0, ds.RasterXSize, ds.RasterYSize)
     fourth_band.ReadRaster(0, 0, ds.RasterXSize, ds.RasterYSize, int(ds.RasterXSize / 16), int(ds.RasterYSize / 16))
@@ -1822,20 +1632,15 @@ def test_ecw_43():
     # gtiff_fourth_band_subsampled_data = fourth_band.ReadRaster(0,0,ds.RasterXSize,ds.RasterYSize,ds.RasterXSize/16,ds.RasterYSize/16)
     tmp_ds = None
     gdal.GetDriverByName('GTiff').Delete('/vsimem/ecw_43.tif')
-    if got_cs != 8527:
-        print(got_cs)
-        return 'fail'
+    assert got_cs == 8527
 
-    if jp2_bands_data != gtiff_bands_data:
-        return 'fail'
+    assert jp2_bands_data == gtiff_bands_data
 
-    if jp2_fourth_band_data != gtiff_fourth_band_data:
-        return 'fail'
+    assert jp2_fourth_band_data == gtiff_fourth_band_data
 
     ds = gdal.OpenEx('data/stefan_full_rgba_alpha_1bit.jp2', open_options=['1BIT_ALPHA_PROMOTION=NO'])
     fourth_band = ds.GetRasterBand(4)
-    if fourth_band.GetMetadataItem('NBITS', 'IMAGE_STRUCTURE') != '1':
-        return 'fail'
+    assert fourth_band.GetMetadataItem('NBITS', 'IMAGE_STRUCTURE') == '1'
 
     return 'success'
 
@@ -1874,10 +1679,7 @@ def test_ecw_44():
 
     got_md = ds.GetMetadata('JPEG2000')
     for (key, value) in expected_md:
-        if key not in got_md or got_md[key] != value:
-            print(key)
-            print(got_md)
-            return 'fail'
+        assert key in got_md and got_md[key] == value
 
     return 'success'
 
@@ -1903,13 +1705,10 @@ def test_ecw_45():
     src_ds = gdal.GetDriverByName('MEM').Create('', 2, 2)
     out_ds = gdaltest.jp2ecw_drv.CreateCopy('/vsimem/ecw_45.jp2', src_ds, options=['WRITE_METADATA=YES'])
     del out_ds
-    if gdal.VSIStatL('/vsimem/ecw_45.jp2.aux.xml') is not None:
-        return 'fail'
+    assert gdal.VSIStatL('/vsimem/ecw_45.jp2.aux.xml') is None
     ds = gdal.Open('/vsimem/ecw_45.jp2')
     md = RemoveDriverMetadata(ds.GetMetadata())
-    if md != {}:
-        print(md)
-        return 'fail'
+    assert md == {}
     gdal.Unlink('/vsimem/ecw_45.jp2')
 
     # Simple metadata in main domain
@@ -1918,13 +1717,10 @@ def test_ecw_45():
         src_ds.SetMetadataItem('FOO', 'BAR')
         out_ds = gdaltest.jp2ecw_drv.CreateCopy('/vsimem/ecw_45.jp2', src_ds, options=options)
         del out_ds
-        if gdal.VSIStatL('/vsimem/ecw_45.jp2.aux.xml') is not None:
-            return 'fail'
+        assert gdal.VSIStatL('/vsimem/ecw_45.jp2.aux.xml') is None
         ds = gdal.Open('/vsimem/ecw_45.jp2')
         md = RemoveDriverMetadata(ds.GetMetadata())
-        if md != {'FOO': 'BAR'}:
-            print(md)
-            return 'fail'
+        assert md == {'FOO': 'BAR'}
         gdal.Unlink('/vsimem/ecw_45.jp2')
 
     # Simple metadata in auxiliary domain
@@ -1932,13 +1728,10 @@ def test_ecw_45():
     src_ds.SetMetadataItem('FOO', 'BAR', 'SOME_DOMAIN')
     out_ds = gdaltest.jp2ecw_drv.CreateCopy('/vsimem/ecw_45.jp2', src_ds, options=['WRITE_METADATA=YES'])
     del out_ds
-    if gdal.VSIStatL('/vsimem/ecw_45.jp2.aux.xml') is not None:
-        return 'fail'
+    assert gdal.VSIStatL('/vsimem/ecw_45.jp2.aux.xml') is None
     ds = gdal.Open('/vsimem/ecw_45.jp2')
     md = RemoveDriverMetadata(ds.GetMetadata('SOME_DOMAIN'))
-    if md != {'FOO': 'BAR'}:
-        print(md)
-        return 'fail'
+    assert md == {'FOO': 'BAR'}
     gdal.Unlink('/vsimem/ecw_45.jp2')
 
     # Simple metadata in auxiliary XML domain
@@ -1946,11 +1739,9 @@ def test_ecw_45():
     src_ds.SetMetadata(['<some_arbitrary_xml_box/>'], 'xml:SOME_DOMAIN')
     out_ds = gdaltest.jp2ecw_drv.CreateCopy('/vsimem/ecw_45.jp2', src_ds, options=['WRITE_METADATA=YES'])
     del out_ds
-    if gdal.VSIStatL('/vsimem/ecw_45.jp2.aux.xml') is not None:
-        return 'fail'
+    assert gdal.VSIStatL('/vsimem/ecw_45.jp2.aux.xml') is None
     ds = gdal.Open('/vsimem/ecw_45.jp2')
-    if ds.GetMetadata('xml:SOME_DOMAIN')[0] != '<some_arbitrary_xml_box />\n':
-        return 'fail'
+    assert ds.GetMetadata('xml:SOME_DOMAIN')[0] == '<some_arbitrary_xml_box />\n'
     gdal.Unlink('/vsimem/ecw_45.jp2')
 
     # Special xml:BOX_ metadata domain
@@ -1959,11 +1750,9 @@ def test_ecw_45():
         src_ds.SetMetadata(['<some_arbitrary_xml_box/>'], 'xml:BOX_1')
         out_ds = gdaltest.jp2ecw_drv.CreateCopy('/vsimem/ecw_45.jp2', src_ds, options=options)
         del out_ds
-        if gdal.VSIStatL('/vsimem/ecw_45.jp2.aux.xml') is not None:
-            return 'fail'
+        assert gdal.VSIStatL('/vsimem/ecw_45.jp2.aux.xml') is None
         ds = gdal.Open('/vsimem/ecw_45.jp2')
-        if ds.GetMetadata('xml:BOX_0')[0] != '<some_arbitrary_xml_box/>':
-            return 'fail'
+        assert ds.GetMetadata('xml:BOX_0')[0] == '<some_arbitrary_xml_box/>'
         gdal.Unlink('/vsimem/ecw_45.jp2')
 
     # Special xml:XMP metadata domain
@@ -1972,11 +1761,9 @@ def test_ecw_45():
         src_ds.SetMetadata(['<fake_xmp_box/>'], 'xml:XMP')
         out_ds = gdaltest.jp2ecw_drv.CreateCopy('/vsimem/ecw_45.jp2', src_ds, options=options)
         del out_ds
-        if gdal.VSIStatL('/vsimem/ecw_45.jp2.aux.xml') is not None:
-            return 'fail'
+        assert gdal.VSIStatL('/vsimem/ecw_45.jp2.aux.xml') is None
         ds = gdal.Open('/vsimem/ecw_45.jp2')
-        if ds.GetMetadata('xml:XMP')[0] != '<fake_xmp_box/>':
-            return 'fail'
+        assert ds.GetMetadata('xml:XMP')[0] == '<fake_xmp_box/>'
         gdal.Unlink('/vsimem/ecw_45.jp2')
 
     return 'success'
@@ -2007,10 +1794,7 @@ def test_ecw_46():
     ref_cs = mem_ds.GetRasterBand(1).Checksum()
     mem_ds.GetRasterBand(1).WriteRaster(0, 0, 40, 40, upsampled_data)
     cs = mem_ds.GetRasterBand(1).Checksum()
-    if cs != ref_cs:
-        print(cs)
-        print(ref_cs)
-        return 'fail'
+    assert cs == ref_cs
 
     return 'success'
 
@@ -2030,8 +1814,7 @@ def test_ecw_47():
     gdal.FileFromMemBuffer('/vsimem/ecw_47.ecw', data)
 
     ds = gdal.Open('/vsimem/ecw_47.ecw')
-    if ds is None:
-        return 'fail'
+    assert ds is not None
 
     mean_tolerance = 0.5
 
@@ -2042,9 +1825,8 @@ def test_ecw_47():
 
     (mean, stddev) = ds.GetRasterBand(1).ComputeBandStats()
 
-    if abs(mean - exp_mean) > mean_tolerance or abs(stddev - exp_stddev) > 0.5:
-        gdaltest.post_reason('mean/stddev of (%g,%g) diffs from expected(%g,%g)' % (mean, stddev, exp_mean, exp_stddev))
-        return 'fail'
+    assert abs(mean - exp_mean) <= mean_tolerance and abs(stddev - exp_stddev) <= 0.5, \
+        ('mean/stddev of (%g,%g) diffs from expected(%g,%g)' % (mean, stddev, exp_mean, exp_stddev))
 
     gdal.Unlink('/vsimem/ecw_47.ecw')
 
@@ -2060,19 +1842,15 @@ def test_ecw_48():
         return 'skip'
 
     ecw_upward = gdal.GetConfigOption('ECW_ALWAYS_UPWARD', 'TRUE')
-    if ecw_upward != 'TRUE' and ecw_upward != 'ON':
-        gdaltest.post_reason('ECW_ALWAYS_UPWARD default value must be TRUE.')
-        return 'fail'
+    assert ecw_upward == 'TRUE' or ecw_upward == 'ON', \
+        'ECW_ALWAYS_UPWARD default value must be TRUE.'
 
     ds = gdal.Open('data/spif83_downward.ecw')
     gt = ds.GetGeoTransform()
 
     # expect Y resolution negative
     expected_gt = (6138559.5576418638, 195.5116973254697, 0.0, 2274798.7836679211, 0.0, -198.32414964918371)
-    if gt != expected_gt:
-        print(gt)
-        gdaltest.post_reason('did not get expected geotransform.')
-        return 'fail'
+    assert gt == expected_gt, 'did not get expected geotransform.'
 
     return 'success'
 
@@ -2093,10 +1871,7 @@ def test_ecw_49():
 
     # expect Y resolution positive
     expected_gt = (6138559.5576418638, 195.5116973254697, 0.0, 2274798.7836679211, 0.0, 198.32414964918371)
-    if gt != expected_gt:
-        print(gt)
-        gdaltest.post_reason('did not get expected geotransform.')
-        return 'fail'
+    assert gt == expected_gt, 'did not get expected geotransform.'
 
     return 'success'
 
@@ -2138,14 +1913,10 @@ def test_ecw_online_2():
 
     ds = gdal.Open('tmp/cache/gcp.jp2')
     ds.GetRasterBand(1).Checksum()
-    if len(ds.GetGCPs()) != 15:
-        gdaltest.post_reason('bad number of GCP')
-        return 'fail'
+    assert len(ds.GetGCPs()) == 15, 'bad number of GCP'
 
     expected_wkt = """GEOGCS["WGS 84",DATUM["WGS_1984",SPHEROID["WGS 84",6378137,298.257223563,AUTHORITY["EPSG","7030"]],AUTHORITY["EPSG","6326"]],PRIMEM["Greenwich",0],UNIT["degree",0.0174532925199433],AUTHORITY["EPSG","4326"]]"""
-    if ds.GetGCPProjection() != expected_wkt:
-        gdaltest.post_reason('bad GCP projection')
-        return 'fail'
+    assert ds.GetGCPProjection() == expected_wkt, 'bad GCP projection'
 
     ds = None
 
@@ -2181,9 +1952,7 @@ def ecw_online_3():
     ds_ref = None
 
     # Difference between the image before and after compression
-    if maxdiff > 16:
-        gdaltest.post_reason('Image too different from reference')
-        return 'fail'
+    assert maxdiff <= 16, 'Image too different from reference'
 
     return 'success'
 
@@ -2219,9 +1988,7 @@ def test_ecw_online_4():
     ds_ref = None
 
     # Difference between the image before and after compression
-    if maxdiff > 1:
-        gdaltest.post_reason('Image too different from reference')
-        return 'fail'
+    assert maxdiff <= 1, 'Image too different from reference'
 
     return 'success'
 
@@ -2251,9 +2018,8 @@ def test_ecw_online_5():
 
     (mean, stddev) = ds.GetRasterBand(2).ComputeBandStats()
 
-    if abs(mean - exp_mean) > mean_tolerance or abs(stddev - exp_stddev) > 0.5:
-        gdaltest.post_reason('mean/stddev of (%g,%g) diffs from expected(%g,%g)' % (mean, stddev, exp_mean, exp_stddev))
-        return 'fail'
+    assert abs(mean - exp_mean) <= mean_tolerance and abs(stddev - exp_stddev) <= 0.5, \
+        ('mean/stddev of (%g,%g) diffs from expected(%g,%g)' % (mean, stddev, exp_mean, exp_stddev))
 
     return 'success'
 
@@ -2315,9 +2081,8 @@ def test_ecw_online_7():
         expected_band_count = 3
     else:
         expected_band_count = 4
-    if ds.RasterCount != expected_band_count:
-        gdaltest.post_reason('Expected %d bands, got %d' % (expected_band_count, ds.RasterCount))
-        return 'fail'
+    assert ds.RasterCount == expected_band_count, \
+        ('Expected %d bands, got %d' % (expected_band_count, ds.RasterCount))
 
     return 'success'
 
diff --git a/autotest/gdrivers/eedai.py b/autotest/gdrivers/eedai.py
index 9115326d92cb..884c3e382be5 100644
--- a/autotest/gdrivers/eedai.py
+++ b/autotest/gdrivers/eedai.py
@@ -295,15 +295,11 @@ def test_eedai_2():
             print(json.dumps(info, indent=4))
             return 'fail'
 
-    if ds.GetProjectionRef().find('32610') < 0:
-        print(ds.GetProjectionRef())
-        return 'fail'
+    assert ds.GetProjectionRef().find('32610') >= 0
 
-    if ds.GetRasterBand(1).GetOverview(-1) is not None:
-        return 'fail'
+    assert ds.GetRasterBand(1).GetOverview(-1) is None
 
-    if ds.GetRasterBand(1).GetOverview(3) is not None:
-        return 'fail'
+    assert ds.GetRasterBand(1).GetOverview(3) is None
 
     npy_serialized = struct.pack(
         'B' * 8, 0x93, ord('N'), ord('U'), ord('M'), ord('P'), ord('Y'), 1, 0)
@@ -318,36 +314,26 @@ def test_eedai_2():
         '/vsimem/ee/projects/earthengine-public/assets/image:getPixels&CUSTOMREQUEST=POST&POSTFIELDS={ "fileFormat": "NPY", "bandIds": [ "B1", "B9" ], "grid": { "affineTransform": { "translateX": 607500.0, "translateY": 4092480.0, "scaleX": 60.0, "scaleY": -60.0, "shearX": 0.0, "shearY": 0.0 }, "dimensions": { "width": 38, "height": 39 } } }', npy_serialized)
     got_data = ds.GetRasterBand(1).ReadRaster(1800, 1810, 1, 1)
     got_data = struct.unpack('h', got_data)[0]
-    if got_data != 12345:
-        print(got_data)
-        return 'fail'
+    assert got_data == 12345
     got_data = ds.GetRasterBand(2).ReadRaster(1800, 1810, 1, 1)
     got_data = struct.unpack('h', got_data)[0]
-    if got_data != 23456:
-        print(got_data)
-        return 'fail'
+    assert got_data == 23456
 
     ds = None
 
     gdal.SetConfigOption('EEDA_URL', '/vsimem/ee/')
     sub_ds = gdal.Open('EEDAI:image:B1,B9')
     gdal.SetConfigOption('EEDA_URL', None)
-    if sub_ds.RasterCount != 2:
-        print(sub_ds.RasterCount)
-        return 'fail'
+    assert sub_ds.RasterCount == 2
 
     gdal.SetConfigOption('EEDA_URL', '/vsimem/ee/')
     sub_ds = gdal.Open('EEDAI:image:B2')
     gdal.SetConfigOption('EEDA_URL', None)
-    if sub_ds.RasterCount != 1:
-        print(sub_ds.RasterCount)
-        return 'fail'
+    assert sub_ds.RasterCount == 1
 
     got_md = sub_ds.GetRasterBand(1).GetMetadata()
     expected_md = {'prop': 'the_prop_B2'}
-    if got_md != expected_md:
-        print(got_md)
-        return 'fail'
+    assert got_md == expected_md
 
     gdal.SetConfigOption('EEDA_BEARER', None)
 
@@ -401,8 +387,7 @@ def test_eedai_3():
     if gdal.GetLastErrorMsg().find('CPLRSASHA256Sign() not implemented') >= 0:
         return 'skip'
 
-    if ds is None:
-        return 'fail'
+    assert ds is not None
 
     return 'success'
 
@@ -459,8 +444,7 @@ def test_eedai_GOOGLE_APPLICATION_CREDENTIALS():
     if gdal.GetLastErrorMsg().find('CPLRSASHA256Sign() not implemented') >= 0:
         return 'skip'
 
-    if ds is None:
-        return 'fail'
+    assert ds is not None
 
     return 'success'
 
@@ -528,8 +512,7 @@ def method(request):
 
     webserver.server_stop(gdaltest.webserver_process, gdaltest.webserver_port)
 
-    if ds is None:
-        return 'fail'
+    assert ds is not None
 
     return 'success'
 
@@ -634,24 +617,18 @@ def test_eedai_4():
         '/vsimem/ee/projects/earthengine-public/assets/image:getPixels&CUSTOMREQUEST=POST&POSTFIELDS={ "fileFormat": "PNG", "bandIds": [ "B1", "B2", "B3" ], "grid": { "affineTransform": { "translateX": 499980.0, "translateY": 4200000.0, "scaleX": 60.0, "scaleY": -60.0, "shearX": 0.0, "shearY": 0.0 }, "dimensions": { "width": 256, "height": 256 } } }', png_data)
     got_data = ds.GetRasterBand(1).ReadRaster(0, 0, 1, 1)
     got_data = struct.unpack('B', got_data)[0]
-    if got_data != 127:
-        print(got_data)
-        return 'fail'
+    assert got_data == 127
 
     # Same with dataset RasterIO
     got_data = ds.ReadRaster(0, 0, 1, 1)
     got_data = struct.unpack('B' * 3, got_data)
-    if got_data != (127, 128, 129):
-        print(got_data)
-        return 'fail'
+    assert got_data == (127, 128, 129)
 
     # Same after flushing cache
     ds.FlushCache()
     got_data = ds.ReadRaster(0, 0, 1, 1)
     got_data = struct.unpack('B' * 3, got_data)
-    if got_data != (127, 128, 129):
-        print(got_data)
-        return 'fail'
+    assert got_data == (127, 128, 129)
 
     # Sub-sampled query
     gdal.FileFromMemBuffer(
@@ -659,17 +636,13 @@ def test_eedai_4():
     got_data = ds.GetRasterBand(1).ReadRaster(
         0, 0, 2, 2, buf_xsize=1, buf_ysize=1)
     got_data = struct.unpack('B', got_data)[0]
-    if got_data != 127:
-        print(got_data)
-        return 'fail'
+    assert got_data == 127
 
     # Same after flushing cache with dataset RasterIO
     ds.FlushCache()
     got_data = ds.ReadRaster(0, 0, 2, 2, buf_xsize=1, buf_ysize=1)
     got_data = struct.unpack('B' * 3, got_data)
-    if got_data != (127, 128, 129):
-        print(got_data)
-        return 'fail'
+    assert got_data == (127, 128, 129)
 
     ds = None
 
@@ -732,9 +705,7 @@ def test_eedai_geotiff():
         '/vsimem/ee/projects/earthengine-public/assets/image:getPixels&CUSTOMREQUEST=POST&POSTFIELDS={ "fileFormat": "GEO_TIFF", "bandIds": [ "B1" ], "grid": { "affineTransform": { "translateX": 499980.0, "translateY": 4200000.0, "scaleX": 60.0, "scaleY": -60.0, "shearX": 0.0, "shearY": 0.0 }, "dimensions": { "width": 256, "height": 256 } } }', data)
     got_data = ds.GetRasterBand(1).ReadRaster(0, 0, 1, 1)
     got_data = struct.unpack('H', got_data)[0]
-    if got_data != 12345:
-        print(got_data)
-        return 'fail'
+    assert got_data == 12345
 
     ds = None
 
@@ -762,26 +733,18 @@ def test_eedai_real_service():
             return 'skip'
 
     ds = gdal.Open('EEDAI:USDA/NAIP/DOQQ/n_4010064_se_14_2_20070725')
-    if ds is None:
-        return 'fail'
+    assert ds is not None
     res = gdal.Info(ds, format='json')
     expected = {'files': [], 'cornerCoordinates': {'upperRight': [415016.0, 4435536.0], 'lowerLeft': [408970.0, 4427936.0], 'lowerRight': [415016.0, 4427936.0], 'upperLeft': [408970.0, 4435536.0], 'center': [411993.0, 4431736.0]}, 'wgs84Extent': {'type': 'Polygon', 'coordinates': [[]]}, 'description': 'EEDAI:USDA/NAIP/DOQQ/n_4010064_se_14_2_20070725', 'driverShortName': 'EEDAI', 'driverLongName': 'Earth Engine Data API Image', 'bands': [{'description': 'R', 'band': 1, 'colorInterpretation': 'Red', 'overviews': [{'size': [1511, 1900]}, {'size': [755, 950]}, {'size': [377, 475]}, {'size': [188, 237]}], 'type': 'Byte', 'block': [256, 256], 'metadata': {}}, {'description': 'G', 'band': 2, 'colorInterpretation': 'Green', 'overviews': [{'size': [1511, 1900]}, {'size': [755, 950]}, {'size': [377, 475]}, {'size': [188, 237]}], 'type': 'Byte', 'block': [256, 256], 'metadata': {}}, {'description': 'B', 'band': 3, 'colorInterpretation': 'Blue', 'overviews': [{'size': [1511, 1900]}, {'size': [755, 950]}, {'size': [377, 475]}, {'size': [188, 237]}], 'type': 'Byte', 'block': [256, 256], 'metadata': {}}], 'coordinateSystem': {'wkt': 'PROJCS["NAD83 / UTM zone 14N",\n    GEOGCS["NAD83",\n        DATUM["North_American_Datum_1983",\n            SPHEROID["GRS 1980",6378137,298.257222101,\n                AUTHORITY["EPSG","7019"]],\n            TOWGS84[0,0,0,0,0,0,0],\n            AUTHORITY["EPSG","6269"]],\n        PRIMEM["Greenwich",0,\n            AUTHORITY["EPSG","8901"]],\n        UNIT["degree",0.0174532925199433,\n            AUTHORITY["EPSG","9122"]],\n        AUTHORITY["EPSG","4269"]],\n    PROJECTION["Transverse_Mercator"],\n    PARAMETER["latitude_of_origin",0],\n    PARAMETER["central_meridian",-99],\n    PARAMETER["scale_factor",0.9996],\n    PARAMETER["false_easting",500000],\n    PARAMETER["false_northing",0],\n    UNIT["metre",1,\n        AUTHORITY["EPSG","9001"]],\n    AXIS["Easting",EAST],\n    AXIS["Northing",NORTH],\n    AUTHORITY["EPSG","26914"]]'}, 'geoTransform': [408970.0, 2.0, 0.0, 4435536.0, 0.0, -2.0], 'metadata': {'IMAGE_STRUCTURE': {'INTERLEAVE': 'PIXEL'}}, 'size': [3023, 3800]}
-    if expected != res:
-        print(res)
-        return 'fail'
-    if ds.ReadRaster(0, 0, 1, 1) is None:
-        return 'fail'
+    assert expected == res
+    assert ds.ReadRaster(0, 0, 1, 1) is not None
 
     ds = gdal.Open('EEDAI:MODIS/006/MYD09GA/2017_05_24')
-    if ds is None:
-        return 'fail'
+    assert ds is not None
     res = gdal.Info(ds, format='json')
     expected = {'files': [], 'cornerCoordinates': {'upperRight': [20015109.354, 10007554.677], 'lowerLeft': [-20015109.354, -10007554.677], 'lowerRight': [20015109.354, -10007554.677], 'upperLeft': [-20015109.354, 10007554.677], 'center': [9.6e-06, 6e-06]}, 'wgs84Extent': {'type': 'Polygon', 'coordinates': [[]]}, 'description': 'EEDAI:MODIS/006/MYD09GA/2017_05_24', 'driverShortName': 'EEDAI', 'driverLongName': 'Earth Engine Data API Image', 'bands': [{'description': 'num_observations_1km', 'band': 1, 'colorInterpretation': 'Undefined', 'overviews': [{'size': [21600, 10800]}, {'size': [10800, 5400]}, {'size': [5400, 2700]}, {'size': [2700, 1350]}, {'size': [1350, 675]}, {'size': [675, 337]}, {'size': [337, 168]}, {'size': [168, 84]}], 'type': 'Byte', 'block': [256, 256], 'metadata': {'IMAGE_STRUCTURE': {'PIXELTYPE': 'SIGNEDBYTE'}}}, {'description': 'state_1km', 'band': 2, 'colorInterpretation': 'Undefined', 'overviews': [{'size': [21600, 10800]}, {'size': [10800, 5400]}, {'size': [5400, 2700]}, {'size': [2700, 1350]}, {'size': [1350, 675]}, {'size': [675, 337]}, {'size': [337, 168]}, {'size': [168, 84]}], 'type': 'UInt16', 'block': [256, 256], 'metadata': {}}, {'description': 'SensorZenith', 'band': 3, 'colorInterpretation': 'Undefined', 'overviews': [{'size': [21600, 10800]}, {'size': [10800, 5400]}, {'size': [5400, 2700]}, {'size': [2700, 1350]}, {'size': [1350, 675]}, {'size': [675, 337]}, {'size': [337, 168]}, {'size': [168, 84]}], 'type': 'Int16', 'block': [256, 256], 'metadata': {}}, {'description': 'SensorAzimuth', 'band': 4, 'colorInterpretation': 'Undefined', 'overviews': [{'size': [21600, 10800]}, {'size': [10800, 5400]}, {'size': [5400, 2700]}, {'size': [2700, 1350]}, {'size': [1350, 675]}, {'size': [675, 337]}, {'size': [337, 168]}, {'size': [168, 84]}], 'type': 'Int16', 'block': [256, 256], 'metadata': {}}, {'description': 'Range', 'band': 5, 'colorInterpretation': 'Undefined', 'overviews': [{'size': [21600, 10800]}, {'size': [10800, 5400]}, {'size': [5400, 2700]}, {'size': [2700, 1350]}, {'size': [1350, 675]}, {'size': [675, 337]}, {'size': [337, 168]}, {'size': [168, 84]}], 'type': 'UInt16', 'block': [256, 256], 'metadata': {}}, {'description': 'SolarZenith', 'band': 6, 'colorInterpretation': 'Undefined', 'overviews': [{'size': [21600, 10800]}, {'size': [10800, 5400]}, {'size': [5400, 2700]}, {'size': [2700, 1350]}, {'size': [1350, 675]}, {'size': [675, 337]}, {'size': [337, 168]}, {'size': [168, 84]}], 'type': 'Int16', 'block': [256, 256], 'metadata': {}}, {'description': 'SolarAzimuth', 'band': 7, 'colorInterpretation': 'Undefined', 'overviews': [{'size': [21600, 10800]}, {'size': [10800, 5400]}, {'size': [5400, 2700]}, {'size': [2700, 1350]}, {'size': [1350, 675]}, {'size': [675, 337]}, {'size': [337, 168]}, {'size': [168, 84]}], 'type': 'Int16', 'block': [256, 256], 'metadata': {}}, {'description': 'gflags', 'band': 8, 'colorInterpretation': 'Undefined', 'overviews': [{'size': [21600, 10800]}, {'size': [10800, 5400]}, {'size': [5400, 2700]}, {'size': [2700, 1350]}, {'size': [1350, 675]}, {'size': [675, 337]}, {'size': [337, 168]}, {'size': [168, 84]}], 'type': 'Byte', 'block': [256, 256], 'metadata': {}}, {'description': 'orbit_pnt', 'band': 9, 'colorInterpretation': 'Undefined', 'overviews': [{'size': [21600, 10800]}, {'size': [10800, 5400]}, {'size': [5400, 2700]}, {'size': [2700, 1350]}, {'size': [1350, 675]}, {'size': [675, 337]}, {'size': [337, 168]}, {'size': [168, 84]}], 'type': 'Byte', 'block': [256, 256], 'metadata': {'IMAGE_STRUCTURE': {'PIXELTYPE': 'SIGNEDBYTE'}}}, {'description': 'granule_pnt', 'band': 10, 'colorInterpretation': 'Undefined', 'overviews': [{'size': [21600, 10800]}, {'size': [10800, 5400]}, {'size': [5400, 2700]}, {'size': [2700, 1350]}, {'size': [1350, 675]}, {'size': [675, 337]}, {'size': [337, 168]}, {'size': [168, 84]}], 'type': 'Byte', 'block': [256, 256], 'metadata': {}}], 'coordinateSystem': {'wkt': 'PROJCS["MODIS Sinusoidal",\n    GEOGCS["WGS 84",\n        DATUM["WGS_1984",\n            SPHEROID["WGS 84",6378137,298.257223563,\n                AUTHORITY["EPSG","7030"]],\n            AUTHORITY["EPSG","6326"]],\n        PRIMEM["Greenwich",0,\n            AUTHORITY["EPSG","8901"]],\n        UNIT["degree",0.01745329251994328,\n            AUTHORITY["EPSG","9122"]],\n        AUTHORITY["EPSG","4326"]],\n    PROJECTION["Sinusoidal"],\n    PARAMETER["false_easting",0.0],\n    PARAMETER["false_northing",0.0],\n    PARAMETER["central_meridian",0.0],\n    PARAMETER["semi_major",6371007.181],\n    PARAMETER["semi_minor",6371007.181],\n    UNIT["m",1.0],\n    AUTHORITY["SR-ORG","6974"]]'}, 'geoTransform': [-20015109.354, 926.625433056, 0.0, 10007554.677, 0.0, -926.625433055], 'metadata': {'IMAGE_STRUCTURE': {'INTERLEAVE': 'PIXEL'}, 'SUBDATASETS': {'SUBDATASET_2_NAME': 'EEDAI:MODIS/006/MYD09GA/2017_05_24:num_observations_500m,sur_refl_b01,sur_refl_b02,sur_refl_b03,sur_refl_b04,sur_refl_b05,sur_refl_b06,sur_refl_b07,QC_500m,obscov_500m,iobs_res,q_scan', 'SUBDATASET_2_DESC': 'Bands num_observations_500m,sur_refl_b01,sur_refl_b02,sur_refl_b03,sur_refl_b04,sur_refl_b05,sur_refl_b06,sur_refl_b07,QC_500m,obscov_500m,iobs_res,q_scan of MODIS/006/MYD09GA/2017_05_24', 'SUBDATASET_1_NAME': 'EEDAI:MODIS/006/MYD09GA/2017_05_24:num_observations_1km,state_1km,SensorZenith,SensorAzimuth,Range,SolarZenith,SolarAzimuth,gflags,orbit_pnt,granule_pnt', 'SUBDATASET_1_DESC': 'Bands num_observations_1km,state_1km,SensorZenith,SensorAzimuth,Range,SolarZenith,SolarAzimuth,gflags,orbit_pnt,granule_pnt of MODIS/006/MYD09GA/2017_05_24'}}, 'size': [43200, 21600]}
-    if expected != res:
-        print(res)
-        return 'fail'
-    if ds.ReadRaster(0, 0, 1, 1) is None:
-        return 'fail'
+    assert expected == res
+    assert ds.ReadRaster(0, 0, 1, 1) is not None
 
     return 'success'
 
diff --git a/autotest/gdrivers/ehdr.py b/autotest/gdrivers/ehdr.py
index 340ed312feab..0d7bb65b1528 100755
--- a/autotest/gdrivers/ehdr.py
+++ b/autotest/gdrivers/ehdr.py
@@ -110,19 +110,13 @@ def test_ehdr_5():
     ds = gdal.Open('tmp/test_4.bil')
     band = ds.GetRasterBand(1)
 
-    if band.GetNoDataValue() != 17:
-        gdaltest.post_reason('failed to preserve nodata value.')
-        return 'fail'
+    assert band.GetNoDataValue() == 17, 'failed to preserve nodata value.'
 
     ct = band.GetRasterColorTable()
-    if ct is None or ct.GetCount() != 4 \
-       or ct.GetColorEntry(2) != (255, 0, 255, 255):
-        gdaltest.post_reason('color table not persisted properly.')
-        return 'fail'
+    assert ct is not None and ct.GetCount() == 4 and ct.GetColorEntry(2) == (255, 0, 255, 255), \
+        'color table not persisted properly.'
 
-    if band.GetDefaultRAT():
-        gdaltest.post_reason('did not expect RAT')
-        return 'fail'
+    assert not band.GetDefaultRAT(), 'did not expect RAT'
 
     band = None
     ct = None
@@ -164,16 +158,12 @@ def test_ehdr_8():
     src_ds = None
 
     md = ds.GetRasterBand(1).GetMetadata('IMAGE_STRUCTURE')
-    if 'PIXELTYPE' not in md or md['PIXELTYPE'] != 'SIGNEDBYTE':
-        gdaltest.post_reason('Failed to detect SIGNEDBYTE')
-        return 'fail'
+    assert 'PIXELTYPE' in md and md['PIXELTYPE'] == 'SIGNEDBYTE', \
+        'Failed to detect SIGNEDBYTE'
 
     cs = ds.GetRasterBand(1).Checksum()
     expected = 4672
-    if cs != expected:
-        print(cs)
-        gdaltest.post_reason('Did not get expected image checksum.')
-        return 'fail'
+    assert cs == expected, 'Did not get expected image checksum.'
 
     ds = None
 
@@ -192,21 +182,12 @@ def test_ehdr_9():
 
     ds = gdal.Open('data/wc_10m_CCCMA_A2a_2020_tmin_9.bil')
 
-    if ds.GetRasterBand(1).DataType != gdal.GDT_Int16:
-        gdaltest.post_reason('wrong datatype')
-        print(ds.GetRasterBand(1).DataType)
-        return 'fail'
+    assert ds.GetRasterBand(1).DataType == gdal.GDT_Int16, 'wrong datatype'
 
-    if ds.GetRasterBand(1).GetMinimum() != -191:
-        gdaltest.post_reason('wrong minimum value')
-        print(ds.GetRasterBand(1).GetMinimum())
-        return 'fail'
+    assert ds.GetRasterBand(1).GetMinimum() == -191, 'wrong minimum value'
 
     wkt = ds.GetProjectionRef()
-    if wkt.find('GEOGCS["WGS 84') != 0:
-        gdaltest.post_reason('wrong projection')
-        print(wkt)
-        return 'fail'
+    assert wkt.find('GEOGCS["WGS 84') == 0, 'wrong projection'
 
     ds = None
 
@@ -240,9 +221,8 @@ def test_ehdr_12():
     ds = None
 
     ds = gdal.Open('/vsimem/1bit.bil')
-    if ds.GetRasterBand(1).Checksum() != src_ds.GetRasterBand(1).Checksum():
-        gdaltest.post_reason('did not get expected checksum')
-        return 'fail'
+    assert ds.GetRasterBand(1).Checksum() == src_ds.GetRasterBand(1).Checksum(), \
+        'did not get expected checksum'
     ds = None
     src_ds = None
 
@@ -264,39 +244,27 @@ def test_ehdr_13():
     src_ds = None
 
     ds = gdal.Open('/vsimem/byte.bil')
-    if ds.GetRasterBand(1).GetMinimum() is not None:
-        gdaltest.post_reason('did not expected minimum')
-        return 'fail'
-    if ds.GetRasterBand(1).GetMaximum() is not None:
-        gdaltest.post_reason('did not expected maximum')
-        return 'fail'
+    assert ds.GetRasterBand(1).GetMinimum() is None, 'did not expected minimum'
+    assert ds.GetRasterBand(1).GetMaximum() is None, 'did not expected maximum'
     stats = ds.GetRasterBand(1).GetStatistics(False, True)
     expected_stats = [74.0, 255.0, 126.765, 22.928470838675704]
     for i in range(4):
-        if abs(stats[i] - expected_stats[i]) > 0.0001:
-            gdaltest.post_reason('did not get expected statistics')
-            return 'fail'
+        assert abs(stats[i] - expected_stats[i]) <= 0.0001, 'did not get expected statistics'
     ds = None
 
     f = gdal.VSIFOpenL('/vsimem/byte.stx', 'rb')
-    if f is None:
-        gdaltest.post_reason('expected .stx file')
-        return 'fail'
+    assert f is not None, 'expected .stx file'
     gdal.VSIFCloseL(f)
 
     ds = gdal.Open('/vsimem/byte.bil')
-    if abs(ds.GetRasterBand(1).GetMinimum() - 74) > 0.0001:
-        gdaltest.post_reason('did not get expected minimum')
-        return 'fail'
-    if abs(ds.GetRasterBand(1).GetMaximum() - 255) > 0.0001:
-        gdaltest.post_reason('did not get expected maximum')
-        return 'fail'
+    assert abs(ds.GetRasterBand(1).GetMinimum() - 74) <= 0.0001, \
+        'did not get expected minimum'
+    assert abs(ds.GetRasterBand(1).GetMaximum() - 255) <= 0.0001, \
+        'did not get expected maximum'
     stats = ds.GetRasterBand(1).GetStatistics(False, True)
     expected_stats = [74.0, 255.0, 126.765, 22.928470838675704]
     for i in range(4):
-        if abs(stats[i] - expected_stats[i]) > 0.0001:
-            gdaltest.post_reason('did not get expected statistics')
-            return 'fail'
+        assert abs(stats[i] - expected_stats[i]) <= 0.0001, 'did not get expected statistics'
     ds = None
 
     gdal.GetDriverByName('EHDR').Delete('/vsimem/byte.bil')
@@ -330,15 +298,9 @@ def test_ehdr_14():
         out_ds.FlushCache()
         cs2 = out_ds.GetRasterBand(1).Checksum()
 
-        if space == 1 and data != data2:
-            print(space)
-            return 'fail'
+        assert space != 1 or data == data2
 
-        if (cs1 != 1087 and cs1 != 1192) or (cs2 != 1087 and cs2 != 1192):
-            print(space)
-            print(cs1)
-            print(cs2)
-            return 'fail'
+        assert not (cs1 != 1087 and cs1 != 1192) or (cs2 != 1087 and cs2 != 1192), space
 
         gdal.SetConfigOption('GDAL_ONE_BIG_READ', 'YES')
         out_ds.GetRasterBand(1).WriteRaster(
@@ -347,10 +309,7 @@ def test_ehdr_14():
         out_ds.FlushCache()
         cs3 = out_ds.GetRasterBand(1).Checksum()
 
-        if cs3 != 1087 and cs3 != 1192:
-            print(space)
-            print(cs3)
-            return 'fail'
+        assert cs3 == 1087 or cs3 == 1192, space
 
     ds = None
 
@@ -369,24 +328,14 @@ def test_ehdr_rat():
     gdal.Translate(tmpfile, 'data/int16_rat.bil', format='EHdr')
     ds = gdal.Open(tmpfile)
     rat = ds.GetRasterBand(1).GetDefaultRAT()
-    if rat is None:
-        return 'fail'
-    if rat.GetColumnCount() != 4:
-        print(rat.GetColumnCount())
-        return 'fail'
-    if rat.GetRowCount() != 25:
-        print(rat.GetRowCount())
-        return 'fail'
+    assert rat is not None
+    assert rat.GetColumnCount() == 4
+    assert rat.GetRowCount() == 25
     for (idx, val) in [(0, -500), (1, 127), (2, 40), (3, 65)]:
-        if rat.GetValueAsInt(0, idx) != val:
-            print(idx, rat.GetValueAsInt(0, idx))
-            return 'fail'
+        assert rat.GetValueAsInt(0, idx) == val
     for (idx, val) in [(0, 2000), (1, 145), (2, 97), (3, 47)]:
-        if rat.GetValueAsInt(24, idx) != val:
-            print(idx, rat.GetValueAsInt(24, idx))
-            return 'fail'
-    if ds.GetRasterBand(1).GetColorTable() is None:
-        return 'fail'
+        assert rat.GetValueAsInt(24, idx) == val
+    assert ds.GetRasterBand(1).GetColorTable() is not None
     ds = None
 
     ds = gdal.Open(tmpfile, gdal.GA_Update)
@@ -395,12 +344,10 @@ def test_ehdr_rat():
     ds = None
 
     ds = gdal.Open(tmpfile, gdal.GA_Update)
-    if ds.GetRasterBand(1).GetDefaultRAT() or ds.GetRasterBand(1).GetColorTable():
-        return 'fail'
+    assert not (ds.GetRasterBand(1).GetDefaultRAT() or ds.GetRasterBand(1).GetColorTable())
     with gdaltest.error_handler():
         ret = ds.GetRasterBand(1).SetDefaultRAT(gdal.RasterAttributeTable())
-    if ret == 0:
-        return 'fail'
+    assert ret != 0
     ds = None
 
     gdal.GetDriverByName('EHDR').Delete(tmpfile)
@@ -423,45 +370,27 @@ def test_ehdr_approx_stats_flag():
     approx_ok = 1
     force = 1
     stats = ds.GetRasterBand(1).GetStatistics(approx_ok, force)
-    if stats != [0.0, 0.0, 0.0, 0.0]:
-        gdaltest.post_reason('did not get expected stats')
-        print(stats)
-        return 'fail'
+    assert stats == [0.0, 0.0, 0.0, 0.0], 'did not get expected stats'
     md = ds.GetRasterBand(1).GetMetadata()
-    if 'STATISTICS_APPROXIMATE' not in md:
-        gdaltest.post_reason('did not get expected metadata')
-        print(md)
-        return 'fail'
+    assert 'STATISTICS_APPROXIMATE' in md, 'did not get expected metadata'
 
     approx_ok = 0
     force = 0
     stats = ds.GetRasterBand(1).GetStatistics(approx_ok, force)
-    if stats != [0.0, 0.0, 0.0, -1.0]:
-        gdaltest.post_reason('did not get expected stats')
-        print(stats)
-        return 'fail'
+    assert stats == [0.0, 0.0, 0.0, -1.0], 'did not get expected stats'
 
     ds = gdal.Open(tmpfile, gdal.GA_Update)
     approx_ok = 0
     force = 0
     stats = ds.GetRasterBand(1).GetStatistics(approx_ok, force)
-    if stats != [0.0, 0.0, 0.0, -1.0]:
-        gdaltest.post_reason('did not get expected stats')
-        print(stats)
-        return 'fail'
+    assert stats == [0.0, 0.0, 0.0, -1.0], 'did not get expected stats'
 
     approx_ok = 0
     force = 1
     stats = ds.GetRasterBand(1).GetStatistics(approx_ok, force)
-    if stats[1] != 20.0:
-        gdaltest.post_reason('did not get expected stats')
-        print(stats)
-        return 'fail'
+    assert stats[1] == 20.0, 'did not get expected stats'
     md = ds.GetRasterBand(1).GetMetadata()
-    if 'STATISTICS_APPROXIMATE' in md:
-        gdaltest.post_reason('did not get expected metadata')
-        print(md)
-        return 'fail'
+    assert 'STATISTICS_APPROXIMATE' not in md, 'did not get expected metadata'
     ds = None
 
     gdal.GetDriverByName('EHDR').Delete(tmpfile)
diff --git a/autotest/gdrivers/envi.py b/autotest/gdrivers/envi.py
index a3c489ad2df3..8bcef549b83f 100755
--- a/autotest/gdrivers/envi.py
+++ b/autotest/gdrivers/envi.py
@@ -195,10 +195,7 @@ def test_envi_8():
     set_gt = (50000, 1, 0, 4500000, 0, -1)
     ds.SetGeoTransform(set_gt)
     got_gt = ds.GetGeoTransform()
-    if set_gt != got_gt:
-        gdaltest.post_reason('did not get expected geotransform')
-        print(got_gt)
-        return 'fail'
+    assert set_gt == got_gt, 'did not get expected geotransform'
     ds = None
 
     gdal.GetDriverByName('ENVI').Delete('/vsimem/foo.bsq')
@@ -233,9 +230,7 @@ def test_envi_10():
 
     gdal.GetDriverByName('ENVI').Delete('/vsimem/envirpc.img')
 
-    if md['HEIGHT_OFF'] != '3355':
-        print(md)
-        return 'fail'
+    assert md['HEIGHT_OFF'] == '3355'
 
     return 'success'
 
@@ -249,10 +244,7 @@ def test_envi_11():
     val = ds.GetRasterBand(1).GetStatistics(0, 0)
     ds = None
 
-    if val != [1.0, 3.0, 2.0, 0.5]:
-        gdaltest.post_reason('bad stats')
-        print(val)
-        return 'fail'
+    assert val == [1.0, 3.0, 2.0, 0.5], 'bad stats'
 
     return 'success'
 
@@ -273,20 +265,11 @@ def test_envi_12():
     category = ds.GetRasterBand(1).GetCategoryNames()
     ct = ds.GetRasterBand(1).GetColorTable()
 
-    if category != ['Black', 'White']:
-        gdaltest.post_reason('bad category names')
-        print(category)
-        return 'fail'
+    assert category == ['Black', 'White'], 'bad category names'
 
-    if ct.GetCount() != 2:
-        gdaltest.post_reason('bad color entry count')
-        print(ct.GetCount())
-        return 'fail'
+    assert ct.GetCount() == 2, 'bad color entry count'
 
-    if ct.GetColorEntry(0) != (0, 0, 0, 255):
-        gdaltest.post_reason('bad color entry')
-        print(ct.GetColorEntry(0))
-        return 'fail'
+    assert ct.GetColorEntry(0) == (0, 0, 0, 255), 'bad color entry'
 
     ds = None
     gdal.GetDriverByName('ENVI').Delete('/vsimem/testenviclasses')
@@ -311,11 +294,9 @@ def test_envi_13():
     ds = None
     gdal.GetDriverByName('ENVI').Delete('/vsimem/envi_13.dat')
 
-    if lines != 1:
-        return 'fail'
+    assert lines == 1
 
-    if val != 'Landsat TM':
-        return 'fail'
+    assert val == 'Landsat TM'
 
     return 'success'
 
@@ -329,8 +310,7 @@ def test_envi_14():
 
     gdal.Unlink('/vsimem/envi_14.dat.aux.xml')
 
-    if gdal.VSIStatL('/vsimem/envi_14.dat').size != 3 * 4 * 5 * 2:
-        return 'fail'
+    assert gdal.VSIStatL('/vsimem/envi_14.dat').size == 3 * 4 * 5 * 2
 
     gdal.GetDriverByName('ENVI').Delete('/vsimem/envi_14.dat')
 
@@ -346,19 +326,15 @@ def test_envi_15():
     got_gt = src_ds.GetGeoTransform()
     expected_gt = [736600.089, 1.0981889363046606, -2.4665727356350224,
                    4078126.75, -2.4665727356350224, -1.0981889363046606]
-    if max([abs((got_gt[i] - expected_gt[i]) / expected_gt[i]) for i in range(6)]) > 1e-5:
-        gdaltest.post_reason('did not get expected geotransform')
-        print(got_gt)
-        return 'fail'
+    assert max([abs((got_gt[i] - expected_gt[i]) / expected_gt[i]) for i in range(6)]) <= 1e-5, \
+        'did not get expected geotransform'
 
     gdal.GetDriverByName('ENVI').CreateCopy('/vsimem/envi_15.dat', src_ds)
 
     ds = gdal.Open('/vsimem/envi_15.dat')
     got_gt = ds.GetGeoTransform()
-    if max([abs((got_gt[i] - expected_gt[i]) / expected_gt[i]) for i in range(6)]) > 1e-5:
-        gdaltest.post_reason('did not get expected geotransform')
-        print(got_gt)
-        return 'fail'
+    assert max([abs((got_gt[i] - expected_gt[i]) / expected_gt[i]) for i in range(6)]) <= 1e-5, \
+        'did not get expected geotransform'
     ds = None
     gdal.GetDriverByName('ENVI').Delete('/vsimem/envi_15.dat')
 
@@ -383,9 +359,7 @@ def test_envi_truncated():
     ds = None
     gdal.GetDriverByName('ENVI').Delete('/vsimem/envi_truncated.dat')
 
-    if cs != 2315:
-        print(cs)
-        return 'fail'
+    assert cs == 2315
 
     return 'success'
 
diff --git a/autotest/gdrivers/envisat.py b/autotest/gdrivers/envisat.py
index a2e6c07420c2..40dbb2a62c82 100755
--- a/autotest/gdrivers/envisat.py
+++ b/autotest/gdrivers/envisat.py
@@ -36,6 +36,7 @@
 
 
 import gdaltest
+import pytest
 
 
 def _get_mds_num(filename):
@@ -99,12 +100,10 @@ def test_envisat_1(self):
             return 'skip'
 
         ds = gdal.Open(os.path.join('tmp', 'cache', self.fileName))
-        if ds is None:
-            return 'fail'
+        assert ds is not None
 
-        if (ds.RasterXSize, ds.RasterYSize) != self.size:
-            gdaltest.post_reason('Bad size. Expected %s, got %s' % (self.size, (ds.RasterXSize, ds.RasterYSize)))
-            return 'fail'
+        assert (ds.RasterXSize, ds.RasterYSize) == self.size, \
+            ('Bad size. Expected %s, got %s' % (self.size, (ds.RasterXSize, ds.RasterYSize)))
 
         return 'success'
 
@@ -113,12 +112,10 @@ def test_envisat_2(self):
             return 'skip'
 
         ds = gdal.Open(os.path.join('tmp', 'cache', self.fileName))
-        if ds is None:
-            return 'fail'
+        assert ds is not None
 
-        if ds.GetRasterBand(1).Checksum() != self.checksum:
-            gdaltest.post_reason('Bad checksum. Expected %d, got %d' % (self.checksum, ds.GetRasterBand(1).Checksum()))
-            return 'fail'
+        assert ds.GetRasterBand(1).Checksum() == self.checksum, \
+            ('Bad checksum. Expected %d, got %d' % (self.checksum, ds.GetRasterBand(1).Checksum()))
 
         return 'success'
 
@@ -129,8 +126,7 @@ def test_envisat_3(self):
             return 'skip'
 
         ds = gdal.Open(os.path.join('tmp', 'cache', self.fileName))
-        if ds is None:
-            return 'fail'
+        assert ds is not None
 
         d = {}
         for gcp in ds.GetGCPs():
@@ -153,12 +149,9 @@ def test_envisat_4(self):
         mds_num = _get_mds_num(filename)
 
         ds = gdal.Open(filename)
-        if ds is None:
-            return 'fail'
+        assert ds is not None
 
-        if ds.RasterCount < mds_num:
-            gdaltest.post_reason('Not all bands have been detected')
-            return 'fail'
+        assert ds.RasterCount >= mds_num, 'Not all bands have been detected'
 
         return 'success'
 
@@ -169,15 +162,13 @@ def test_envisat_5(self):
             return 'skip'
 
         ds = gdal.Open(os.path.join('tmp', 'cache', self.fileName))
-        if ds is None:
-            return 'fail'
+        assert ds is not None
 
         product = ds.GetMetadataItem('MPH_PRODUCT')
         record_md = ds.GetMetadata('RECORDS')
 
-        if product[:3] not in ('ASA', 'SAR', 'MER') and record_md:
-            gdaltest.post_reason('Unexpected metadata in the "RECORDS" domain.')
-            return 'fail'
+        assert product[:3] in ('ASA', 'SAR', 'MER') or not record_md, \
+            'Unexpected metadata in the "RECORDS" domain.'
 
         return 'success'
 
@@ -198,14 +189,11 @@ def test_envisat_asar_1(self):
             return 'skip'
 
         ds = gdal.Open(os.path.join('tmp', 'cache', self.fileName))
-        if ds is None:
-            return 'fail'
+        assert ds is not None
 
         product = ds.GetMetadataItem('MPH_PRODUCT')
 
-        if product[:3] not in ('ASA', 'SAR'):
-            gdaltest.post_reason('Wrong sensor ID.')
-            return 'fail'
+        assert product[:3] in ('ASA', 'SAR'), 'Wrong sensor ID.'
 
         return 'success'
 
@@ -216,15 +204,12 @@ def test_envisat_asar_2(self):
             return 'skip'
 
         ds = gdal.Open(os.path.join('tmp', 'cache', self.fileName))
-        if ds is None:
-            return 'fail'
+        assert ds is not None
 
         product = ds.GetMetadataItem('MPH_PRODUCT')
         record_md = ds.GetMetadata('RECORDS')
 
-        if not record_md:
-            gdaltest.post_reason('Unable to read ADS metadata from ASAR.')
-            return 'fail'
+        assert record_md, 'Unable to read ADS metadata from ASAR.'
 
         record = 'SQ_ADS'  # it is present in all ASAR poducts
         if product.startswith('ASA_WV'):
@@ -234,11 +219,9 @@ def test_envisat_asar_2(self):
                           'PHASE_CROSS_CONF'):
                 key0 = '%s_%s' % (record, field)
                 key1 = '%s_0_%s' % (record, field)
-                if key0 not in record_md and key1 not in record_md:
-                    gdaltest.post_reason(
-                        'No "%s" or "%s" key in "RECORDS" domain.' %
+                assert key0 in record_md or key1 in record_md, \
+                    ('No "%s" or "%s" key in "RECORDS" domain.' %
                         (key0, key1))
-                    return 'fail'
         else:
             for mds in range(1, ds.RasterCount + 1):
                 for field in ('ZERO_DOPPLER_TIME',
@@ -246,11 +229,9 @@ def test_envisat_asar_2(self):
                               'INPUT_STD_DEV'):
                     key0 = 'MDS%d_%s_%s' % (mds, record, field)
                     key1 = 'MDS%d_%s_0_%s' % (mds, record, field)
-                    if key0 not in record_md and key1 not in record_md:
-                        gdaltest.post_reason(
-                            'No "%s" or "%s" key in "RECORDS" domain.' %
+                    assert key0 in record_md or key1 in record_md, \
+                        ('No "%s" or "%s" key in "RECORDS" domain.' %
                             (key0, key1))
-                        return 'fail'
 
         return 'success'
 
@@ -271,14 +252,11 @@ def test_envisat_meris_1(self):
             return 'skip'
 
         ds = gdal.Open(os.path.join('tmp', 'cache', self.fileName))
-        if ds is None:
-            return 'fail'
+        assert ds is not None
 
         product = ds.GetMetadataItem('MPH_PRODUCT')
 
-        if product[:3] not in ('MER',):
-            gdaltest.post_reason('Wrong sensor ID.')
-            return 'fail'
+        assert product[:3] in ('MER',), 'Wrong sensor ID.'
 
         return 'success'
 
@@ -289,25 +267,20 @@ def test_envisat_meris_2(self):
             return 'skip'
 
         ds = gdal.Open(os.path.join('tmp', 'cache', self.fileName))
-        if ds is None:
-            return 'fail'
+        assert ds is not None
 
         record_md = ds.GetMetadata('RECORDS')
 
-        if not record_md:
-            gdaltest.post_reason('Unable to read ADS metadata from ASAR.')
-            return 'fail'
+        assert record_md, 'Unable to read ADS metadata from ASAR.'
 
         record = 'Quality_ADS'  # it is present in all MER poducts
 
         for field in ('DSR_TIME', 'ATTACH_FLAG'):
             key0 = '%s_%s' % (record, field)
             key1 = '%s_0_%s' % (record, field)
-            if key0 not in record_md and key1 not in record_md:
-                gdaltest.post_reason(
-                    'No "%s" or "%s" key in "RECORDS" domain.' %
+            assert key0 in record_md or key1 in record_md, \
+                ('No "%s" or "%s" key in "RECORDS" domain.' %
                     (key0, key1))
-                return 'fail'
 
         return 'success'
 
@@ -318,8 +291,7 @@ def test_envisat_meris_3(self):
             return 'skip'
 
         ds = gdal.Open(os.path.join('tmp', 'cache', self.fileName))
-        if ds is None:
-            return 'fail'
+        assert ds is not None
 
         flags_band = None
         detector_index_band = None
@@ -334,37 +306,27 @@ def test_envisat_meris_3(self):
         product = ds.GetMetadataItem('MPH_PRODUCT')
         level = product[8]
         if level == '1':
-            if not flags_band:
-                gdaltest.post_reason('No flag band in MERIS Level 1 product.')
-                return 'fail'
+            assert flags_band, 'No flag band in MERIS Level 1 product.'
 
             band = ds.GetRasterBand(flags_band)
-            if band.DataType != gdal.GDT_Byte:
-                gdaltest.post_reason('Incorrect data type of the flag band in '
+            assert band.DataType == gdal.GDT_Byte, \
+                ('Incorrect data type of the flag band in '
                                      'MERIS Level 1 product.')
-                return 'fail'
 
-            if not detector_index_band:
-                gdaltest.post_reason('No "detector index" band in MERIS '
+            assert detector_index_band, ('No "detector index" band in MERIS '
                                      'Level 1 product.')
-                return 'fail'
 
             band = ds.GetRasterBand(detector_index_band)
-            if band.DataType != gdal.GDT_Int16:
-                gdaltest.post_reason('Incorrect data type of the '
+            assert band.DataType == gdal.GDT_Int16, ('Incorrect data type of the '
                                      '"detector index" band in MERIS Level 2 '
                                      'product.')
-                return 'fail'
         elif level == '2':
-            if not flags_band:
-                gdaltest.post_reason('No flag band in MERIS Level 2 product.')
-                return 'fail'
+            assert flags_band, 'No flag band in MERIS Level 2 product.'
 
             band = ds.GetRasterBand(flags_band)
-            if band.DataType != gdal.GDT_UInt32:
-                gdaltest.post_reason('Incorrect data type of the flag band in '
+            assert band.DataType == gdal.GDT_UInt32, \
+                ('Incorrect data type of the flag band in '
                                      'MERIS Level 2 product.')
-                return 'fail'
         else:
             gdaltest.post_reason('Invalid product level: %s.' % level)
             return 'fail'
@@ -378,8 +340,7 @@ def test_envisat_meris_4(self):
             return 'skip'
 
         ds = gdal.Open(os.path.join('tmp', 'cache', self.fileName))
-        if ds is None:
-            return 'fail'
+        assert ds is not None
 
         gcp_values = [
             (gcp.Id, gcp.GCPLine, gcp.GCPPixel, gcp.GCPX, gcp.GCPY, gcp.GCPZ)
@@ -402,9 +363,7 @@ def test_envisat_meris_4(self):
         for r, v in zip(ref, gcp_values):
             for i, ri in enumerate(r):
                 if abs(float(ri) - float(v[i])) > 1e-10:
-                    gdaltest.post_reason('Wrong GCP coordinates.')
                     print(r)
-                    print(v)
-                    return 'fail'
+                    pytest.fail('Wrong GCP coordinates.')
 
         return 'success'
diff --git a/autotest/gdrivers/ers.py b/autotest/gdrivers/ers.py
index 20cef315f188..551f94a0530d 100755
--- a/autotest/gdrivers/ers.py
+++ b/autotest/gdrivers/ers.py
@@ -36,6 +36,7 @@
 
 
 import gdaltest
+import pytest
 
 ###############################################################################
 # Perform simple read test.
@@ -48,9 +49,7 @@ def test_ers_1():
     ds = gdal.Open('data/srtm.ers')
     md = ds.GetRasterBand(1).GetMetadata()
     expected_md = {'STATISTICS_MEAN': '-4020.25', 'STATISTICS_MINIMUM': '-4315', 'STATISTICS_MAXIMUM': '-3744', 'STATISTICS_MEDIAN': '-4000'}
-    if md != expected_md:
-        print(md)
-        return 'fail'
+    assert md == expected_md
     return 'success'
 
 ###############################################################################
@@ -97,9 +96,7 @@ def test_ers_5():
     ds = gdal.Open('data/8s.ers')
     md = ds.GetRasterBand(1).GetMetadata('IMAGE_STRUCTURE')
 
-    if md['PIXELTYPE'] != 'SIGNEDBYTE':
-        gdaltest.post_reason('Failed to detect SIGNEDBYTE')
-        return 'fail'
+    assert md['PIXELTYPE'] == 'SIGNEDBYTE', 'Failed to detect SIGNEDBYTE'
 
     ds = None
 
@@ -119,9 +116,7 @@ def test_ers_6():
 
     md = ds.GetRasterBand(1).GetMetadata('IMAGE_STRUCTURE')
 
-    if md['PIXELTYPE'] != 'SIGNEDBYTE':
-        gdaltest.post_reason('Failed to detect SIGNEDBYTE')
-        return 'fail'
+    assert md['PIXELTYPE'] == 'SIGNEDBYTE', 'Failed to detect SIGNEDBYTE'
 
     ds = None
 
@@ -139,10 +134,7 @@ def test_ers_7():
 
     desc = ds.GetRasterBand(1).GetDescription()
 
-    if desc != 'RTP 1st Vertical Derivative':
-        print(desc)
-        gdaltest.post_reason('did not get expected values.')
-        return 'fail'
+    assert desc == 'RTP 1st Vertical Derivative', 'did not get expected values.'
 
     return 'success'
 
@@ -166,23 +158,19 @@ def test_ers_8():
     wkt = ds.GetGCPProjection()
     ds = None
 
-    if wkt != """PROJCS["NUTM11",GEOGCS["NAD27",DATUM["North_American_Datum_1927",SPHEROID["Clarke 1866",6378206.4,294.978698213898,AUTHORITY["EPSG","7008"]],TOWGS84[-3,142,183,0,0,0,0],AUTHORITY["EPSG","6267"]],PRIMEM["Greenwich",0,AUTHORITY["EPSG","8901"]],UNIT["degree",0.0174532925199433,AUTHORITY["EPSG","9108"]],AXIS["Lat",NORTH],AXIS["Long",EAST],AUTHORITY["EPSG","4267"]],PROJECTION["Transverse_Mercator"],PARAMETER["latitude_of_origin",0],PARAMETER["central_meridian",-117],PARAMETER["scale_factor",0.9996],PARAMETER["false_easting",500000],PARAMETER["false_northing",0],UNIT["Meter",1]]""":
-        gdaltest.post_reason('did not get expected GCP projection')
-        print(wkt)
-        return 'fail'
+    assert wkt == """PROJCS["NUTM11",GEOGCS["NAD27",DATUM["North_American_Datum_1927",SPHEROID["Clarke 1866",6378206.4,294.978698213898,AUTHORITY["EPSG","7008"]],TOWGS84[-3,142,183,0,0,0,0],AUTHORITY["EPSG","6267"]],PRIMEM["Greenwich",0,AUTHORITY["EPSG","8901"]],UNIT["degree",0.0174532925199433,AUTHORITY["EPSG","9108"]],AXIS["Lat",NORTH],AXIS["Long",EAST],AUTHORITY["EPSG","4267"]],PROJECTION["Transverse_Mercator"],PARAMETER["latitude_of_origin",0],PARAMETER["central_meridian",-117],PARAMETER["scale_factor",0.9996],PARAMETER["false_easting",500000],PARAMETER["false_northing",0],UNIT["Meter",1]]""", \
+        'did not get expected GCP projection'
 
-    if len(gcps) != len(expected_gcps) or len(gcps) != gcp_count:
-        gdaltest.post_reason('did not get expected GCP number')
-        return 'fail'
+    assert len(gcps) == len(expected_gcps) and len(gcps) == gcp_count, \
+        'did not get expected GCP number'
 
     for i, gcp in enumerate(gcps):
         if abs(gcp.GCPPixel - expected_gcps[i].GCPPixel) > 1e-6 or \
            abs(gcp.GCPLine - expected_gcps[i].GCPLine) > 1e-6 or \
            abs(gcp.GCPX - expected_gcps[i].GCPX) > 1e-6 or \
            abs(gcp.GCPY - expected_gcps[i].GCPY) > 1e-6:
-            gdaltest.post_reason('did not get expected GCP %d' % i)
             print(gcps[i])
-            return 'fail'
+            pytest.fail('did not get expected GCP %d' % i)
 
     drv.Delete('/vsimem/ers_8.ers')
 
@@ -212,10 +200,7 @@ def test_ers_9():
 
     drv.Delete('/vsimem/ers_9.ers')
 
-    if val != 123:
-        gdaltest.post_reason('did not get expected nodata value')
-        print(val)
-        return 'fail'
+    assert val == 123, 'did not get expected nodata value'
 
     return 'success'
 
@@ -231,20 +216,11 @@ def test_ers_10():
     proj = ds.GetMetadataItem("PROJ", "ERS")
     datum = ds.GetMetadataItem("DATUM", "ERS")
     units = ds.GetMetadataItem("UNITS", "ERS")
-    if proj != 'MGA55':
-        gdaltest.post_reason('did not get expected PROJ')
-        print(proj)
-        return 'fail'
+    assert proj == 'MGA55', 'did not get expected PROJ'
 
-    if datum != 'GDA94':
-        gdaltest.post_reason('did not get expected DATUM')
-        print(datum)
-        return 'fail'
+    assert datum == 'GDA94', 'did not get expected DATUM'
 
-    if units != 'METERS':
-        gdaltest.post_reason('did not get expected UNITS')
-        print(units)
-        return 'fail'
+    assert units == 'METERS', 'did not get expected UNITS'
 
     # This should be overridden by the above values
     sr = osr.SpatialReference()
@@ -254,20 +230,11 @@ def test_ers_10():
     proj = ds.GetMetadataItem("PROJ", "ERS")
     datum = ds.GetMetadataItem("DATUM", "ERS")
     units = ds.GetMetadataItem("UNITS", "ERS")
-    if proj != 'MGA55':
-        gdaltest.post_reason('did not get expected PROJ')
-        print(proj)
-        return 'fail'
+    assert proj == 'MGA55', 'did not get expected PROJ'
 
-    if datum != 'GDA94':
-        gdaltest.post_reason('did not get expected DATUM')
-        print(datum)
-        return 'fail'
+    assert datum == 'GDA94', 'did not get expected DATUM'
 
-    if units != 'METERS':
-        gdaltest.post_reason('did not get expected UNITS')
-        print(units)
-        return 'fail'
+    assert units == 'METERS', 'did not get expected UNITS'
 
     ds = None
 
@@ -288,31 +255,17 @@ def test_ers_10():
 
     drv.Delete('/vsimem/ers_10.ers')
 
-    if proj != 'MGA55':
-        gdaltest.post_reason('did not get expected PROJ')
-        print(proj)
-        return 'fail'
+    assert proj == 'MGA55', 'did not get expected PROJ'
 
-    if datum != 'GDA94':
-        gdaltest.post_reason('did not get expected DATUM')
-        print(datum)
-        return 'fail'
+    assert datum == 'GDA94', 'did not get expected DATUM'
 
-    if units != 'METERS':
-        gdaltest.post_reason('did not get expected UNITS')
-        print(units)
-        return 'fail'
+    assert units == 'METERS', 'did not get expected UNITS'
 
-    if md_ers["PROJ"] != proj or md_ers["DATUM"] != datum or md_ers["UNITS"] != units:
-        gdaltest.post_reason('GetMetadata() not consistent with '
+    assert md_ers["PROJ"] == proj and md_ers["DATUM"] == datum and md_ers["UNITS"] == units, \
+        ('GetMetadata() not consistent with '
                              'GetMetadataItem()')
-        print(md_ers)
-        return 'fail'
 
-    if wkt.find("""PROJCS["MGA55""") != 0:
-        gdaltest.post_reason('did not get expected projection')
-        print(wkt)
-        return 'fail'
+    assert wkt.find("""PROJCS["MGA55""") == 0, 'did not get expected projection'
 
     ds = drv.Create('/vsimem/ers_10.ers', 1, 1, options=['DATUM=GDA94', 'PROJ=MGA55', 'UNITS=FEET'])
     ds = None
@@ -325,20 +278,11 @@ def test_ers_10():
     proj = ds.GetMetadataItem("PROJ", "ERS")
     datum = ds.GetMetadataItem("DATUM", "ERS")
     units = ds.GetMetadataItem("UNITS", "ERS")
-    if proj != 'GEODETIC':
-        gdaltest.post_reason('did not get expected PROJ')
-        print(proj)
-        return 'fail'
+    assert proj == 'GEODETIC', 'did not get expected PROJ'
 
-    if datum != 'WGS84':
-        gdaltest.post_reason('did not get expected DATUM')
-        print(datum)
-        return 'fail'
+    assert datum == 'WGS84', 'did not get expected DATUM'
 
-    if units != 'METERS':
-        gdaltest.post_reason('did not get expected UNITS')
-        print(units)
-        return 'fail'
+    assert units == 'METERS', 'did not get expected UNITS'
     ds = None
 
     ds = gdal.Open('/vsimem/ers_10.ers')
@@ -349,20 +293,11 @@ def test_ers_10():
 
     drv.Delete('/vsimem/ers_10.ers')
 
-    if proj != 'GEODETIC':
-        gdaltest.post_reason('did not get expected PROJ')
-        print(proj)
-        return 'fail'
+    assert proj == 'GEODETIC', 'did not get expected PROJ'
 
-    if datum != 'WGS84':
-        gdaltest.post_reason('did not get expected DATUM')
-        print(datum)
-        return 'fail'
+    assert datum == 'WGS84', 'did not get expected DATUM'
 
-    if units != 'METERS':
-        gdaltest.post_reason('did not get expected UNITS')
-        print(units)
-        return 'fail'
+    assert units == 'METERS', 'did not get expected UNITS'
 
     return 'success'
 
diff --git a/autotest/gdrivers/fast.py b/autotest/gdrivers/fast.py
index 299d1513283d..02e059750fc9 100755
--- a/autotest/gdrivers/fast.py
+++ b/autotest/gdrivers/fast.py
@@ -74,26 +74,16 @@ def test_fast_3():
 
     gdaltest.fast_ds = gdal.Open('data/L71118038_03820020111_HPN.FST')
     ds = gdaltest.fast_ds
-    if ds is None:
-        gdaltest.post_reason('Missing test dataset')
-        return 'fail'
+    assert ds is not None, 'Missing test dataset'
 
     md = ds.GetMetadata()
-    if md is None:
-        gdaltest.post_reason('Missing metadata in test dataset')
-        return 'fail'
+    assert md is not None, 'Missing metadata in test dataset'
 
-    if md['ACQUISITION_DATE'] != '20020111':
-        gdaltest.post_reason('ACQUISITION_DATE wrong')
-        return 'fail'
+    assert md['ACQUISITION_DATE'] == '20020111', 'ACQUISITION_DATE wrong'
 
-    if md['SATELLITE'] != 'LANDSAT7':
-        gdaltest.post_reason('SATELLITE wrong')
-        return 'fail'
+    assert md['SATELLITE'] == 'LANDSAT7', 'SATELLITE wrong'
 
-    if md['SENSOR'] != 'ETM+':
-        gdaltest.post_reason('SENSOR wrong')
-        return 'fail'
+    assert md['SENSOR'] == 'ETM+', 'SENSOR wrong'
 
     # GAIN and BIAS expected values
     gb_expected = (-6.199999809265137, 0.775686297697179)
@@ -120,9 +110,7 @@ def test_fast_4():
         return 'skip'
 
     ds = gdaltest.fast_ds
-    if ds is None:
-        gdaltest.post_reason('Missing test dataset')
-        return 'fail'
+    assert ds is not None, 'Missing test dataset'
 
     gt = ds.GetGeoTransform()
 
@@ -130,11 +118,10 @@ def test_fast_4():
     ds = None
 
     tolerance = 0.01
-    if abs(gt[0] - 280342.5) > tolerance or abs(gt[1] - 15.0) > tolerance or \
-       abs(gt[2] - 0.0) > tolerance or abs(gt[3] - 3621457.5) > tolerance or \
-       abs(gt[4] - 0.0) > tolerance or abs(gt[5] + 15.0) > tolerance:
-        gdaltest.post_reason('FAST geotransform wrong')
-        return 'fail'
+    assert (abs(gt[0] - 280342.5) <= tolerance and abs(gt[1] - 15.0) <= tolerance and \
+       abs(gt[2] - 0.0) <= tolerance and abs(gt[3] - 3621457.5) <= tolerance and \
+       abs(gt[4] - 0.0) <= tolerance and abs(gt[5] + 15.0) <= tolerance), \
+        'FAST geotransform wrong'
 
     return 'success'
 
@@ -275,13 +262,9 @@ def test_fast_9():
         return 'skip'
 
     ds = gdal.Open('data/HEADER.DAT')
-    if ds.GetMetadataItem('SENSOR') != '':
-        gdaltest.post_reason('Did not get expected SENSOR value.')
-        return 'fail'
+    assert ds.GetMetadataItem('SENSOR') == '', 'Did not get expected SENSOR value.'
 
-    if ds.RasterCount != 7:
-        gdaltest.post_reason('Did not get expected band count.')
-        return 'fail'
+    assert ds.RasterCount == 7, 'Did not get expected band count.'
 
     return 'success'
 
diff --git a/autotest/gdrivers/gdalhttp.py b/autotest/gdrivers/gdalhttp.py
index c92e65fa89c5..aa810f169e2e 100755
--- a/autotest/gdrivers/gdalhttp.py
+++ b/autotest/gdrivers/gdalhttp.py
@@ -138,9 +138,7 @@ def http_4_old():
         return 'fail'
 
     filelist = ds.GetFileList()
-    if filelist[0] != '/vsicurl/ftp://ftp2.cits.rncan.gc.ca/pub/cantopo/250k_tif/MCR2010_01.tif':
-        print(filelist)
-        return 'fail'
+    assert filelist[0] == '/vsicurl/ftp://ftp2.cits.rncan.gc.ca/pub/cantopo/250k_tif/MCR2010_01.tif'
 
     return 'success'
 
@@ -176,9 +174,7 @@ def test_http_4():
         return 'fail'
 
     filelist = ds.GetFileList()
-    if '/vsicurl/ftp://download.osgeo.org/gdal/data/gtiff/utm.tif' not in filelist:
-        print(filelist)
-        return 'fail'
+    assert '/vsicurl/ftp://download.osgeo.org/gdal/data/gtiff/utm.tif' in filelist
 
     return 'success'
 
@@ -283,8 +279,7 @@ def test_http_test_use_capi_store():
     import test_py_scripts
     ret = test_py_scripts.run_py_script_as_external_script('.', 'gdalhttp', ' -use_capi_store', display_live_on_parent_stdout=True)
 
-    if ret.find('Failed:    0') == -1:
-        return 'fail'
+    assert ret.find('Failed:    0') != -1
 
     return 'success'
 
diff --git a/autotest/gdrivers/gif.py b/autotest/gdrivers/gif.py
index f30b02d82a83..85061498fc48 100755
--- a/autotest/gdrivers/gif.py
+++ b/autotest/gdrivers/gif.py
@@ -86,23 +86,16 @@ def test_gif_4():
 
     ds = gdal.Open('data/bug407.gif')
     cm = ds.GetRasterBand(1).GetRasterColorTable()
-    if cm.GetCount() != 16 \
-       or cm.GetColorEntry(0) != (255, 255, 255, 255) \
-       or cm.GetColorEntry(1) != (255, 255, 208, 255):
-        gdaltest.post_reason('Wrong colormap entries')
-        return 'fail'
+    assert cm.GetCount() == 16 and cm.GetColorEntry(0) == (255, 255, 255, 255) and cm.GetColorEntry(1) == (255, 255, 208, 255), \
+        'Wrong colormap entries'
 
     cm = None
 
-    if ds.GetRasterBand(1).GetNoDataValue() is not None:
-        gdaltest.post_reason('Wrong nodata value.')
-        return 'fail'
+    assert ds.GetRasterBand(1).GetNoDataValue() is None, 'Wrong nodata value.'
 
     md = ds.GetRasterBand(1).GetMetadata()
-    if 'GIF_BACKGROUND' not in md or md['GIF_BACKGROUND'] != '0':
-        print(md)
-        gdaltest.post_reason('background metadata missing.')
-        return 'fail'
+    assert 'GIF_BACKGROUND' in md and md['GIF_BACKGROUND'] == '0', \
+        'background metadata missing.'
 
     return 'success'
 
@@ -174,11 +167,9 @@ def test_gif_7():
     tst.testOpen()
 
     ds = gdal.Open('data/bug407.gif')
-    if ds is None:
-        return 'fail'
+    assert ds is not None
 
-    if ds.GetDriver().ShortName != 'BIGGIF':
-        return 'fail'
+    assert ds.GetDriver().ShortName == 'BIGGIF'
 
     return 'success'
 
@@ -194,11 +185,9 @@ def test_gif_8():
     drv.Register()
 
     ds = gdal.Open('data/fakebig.gif')
-    if ds is None:
-        return 'fail'
+    assert ds is not None
 
-    if ds.GetDriver().ShortName != 'BIGGIF':
-        return 'fail'
+    assert ds.GetDriver().ShortName == 'BIGGIF'
 
     return 'success'
 
@@ -211,16 +200,13 @@ def test_gif_9():
     src_ds = gdal.Open('data/byte.tif')
     ds = gdal.GetDriverByName('GIF').CreateCopy(
         '/vsistdout_redirect//vsimem/tmp.gif', src_ds)
-    if ds.GetRasterBand(1).Checksum() != 0:
-        return 'fail'
+    assert ds.GetRasterBand(1).Checksum() == 0
     src_ds = None
     ds = None
 
     ds = gdal.Open('/vsimem/tmp.gif')
-    if ds is None:
-        return 'fail'
-    if ds.GetRasterBand(1).Checksum() != 4672:
-        return 'fail'
+    assert ds is not None
+    assert ds.GetRasterBand(1).Checksum() == 4672
 
     gdal.Unlink('/vsimem/tmp.gif')
 
diff --git a/autotest/gdrivers/gpkg.py b/autotest/gdrivers/gpkg.py
index f708e1f1e97b..bf63bbcea367 100755
--- a/autotest/gdrivers/gpkg.py
+++ b/autotest/gdrivers/gpkg.py
@@ -183,15 +183,9 @@ def check_tile_format(out_ds, expected_format, expected_band_count, expected_ct,
     elif expected_format == 'WEBP':
         expected_mime_type = 'image/x-webp'
 
-    if mime_type != expected_mime_type:
-        print(mime_type)
-        return 'fail'
-    if band_count != expected_band_count:
-        print(band_count)
-        return 'fail'
-    if expected_ct != has_ct:
-        print(has_ct)
-        return 'fail'
+    assert mime_type == expected_mime_type
+    assert band_count == expected_band_count
+    assert expected_ct == has_ct
     return 'success'
 
 ###############################################################################
@@ -217,38 +211,30 @@ def test_gpkg_1():
         gdaltest.gpkg_dr.CreateCopy('/vsimem/tmp.gpkg', ds, options=['TILE_FORMAT=PNG'])
     ds = None
 
-    if not validate('/vsimem/tmp.gpkg'):
-        gdaltest.post_reason('validation failed')
-        return 'fail'
+    assert validate('/vsimem/tmp.gpkg'), 'validation failed'
 
     out_ds = gdal.Open('/vsimem/tmp.gpkg')
 
     # Check there's no ogr_empty_table
     sql_lyr = out_ds.ExecuteSQL("SELECT COUNT(*) FROM sqlite_master WHERE name = 'ogr_empty_table'")
     f = sql_lyr.GetNextFeature()
-    if f.GetField(0) != 0:
-        return 'fail'
+    assert f.GetField(0) == 0
     out_ds.ReleaseResultSet(sql_lyr)
 
     got_gt = out_ds.GetGeoTransform()
     for i in range(6):
-        if abs(expected_gt[i] - got_gt[i]) > 1e-8:
-            return 'fail'
+        assert abs(expected_gt[i] - got_gt[i]) <= 1e-8
     got_wkt = out_ds.GetProjectionRef()
-    if expected_wkt != got_wkt:
-        return 'fail'
+    assert expected_wkt == got_wkt
     expected_cs = [expected_cs, expected_cs, expected_cs, 4873]
     got_cs = [out_ds.GetRasterBand(i + 1).Checksum() for i in range(4)]
-    if got_cs != expected_cs:
-        print('Got %s, expected %s' % (str(got_cs), str(expected_cs)))
-        return 'fail'
+    assert got_cs == expected_cs
     check_tile_format(out_ds, 'PNG', 2, False)
 
     # Check that there's no extensions
     out_ds = gdal.Open('/vsimem/tmp.gpkg')
     sql_lyr = out_ds.ExecuteSQL("SELECT * FROM sqlite_master WHERE type = 'table' AND name = 'gpkg_extensions'")
-    if sql_lyr.GetFeatureCount() != 0:
-        return 'fail'
+    assert sql_lyr.GetFeatureCount() == 0
     out_ds.ReleaseResultSet(sql_lyr)
 
     out_ds = None
@@ -256,19 +242,14 @@ def test_gpkg_1():
     out_ds = gdal.OpenEx('/vsimem/tmp.gpkg', open_options=['BAND_COUNT=3'])
     expected_cs = expected_cs[0:3]
     got_cs = [out_ds.GetRasterBand(i + 1).Checksum() for i in range(out_ds.RasterCount)]
-    if got_cs != expected_cs:
-        print('Got %s, expected %s' % (str(got_cs), str(expected_cs)))
-        return 'fail'
+    assert got_cs == expected_cs
     out_ds = None
 
     ds = gdal.OpenEx('/vsimem/tmp.gpkg', open_options=['USE_TILE_EXTENT=YES'])
-    if ds.RasterXSize != 256 or ds.RasterYSize != 256:
-        return 'fail'
+    assert ds.RasterXSize == 256 and ds.RasterYSize == 256
     expected_cs = [clamped_expected_cs, clamped_expected_cs, clamped_expected_cs, 4898]
     got_cs = [ds.GetRasterBand(i + 1).Checksum() for i in range(4)]
-    if got_cs != expected_cs:
-        print('Got %s, expected %s' % (str(got_cs), str(expected_cs)))
-        return 'fail'
+    assert got_cs == expected_cs
     ds = None
 
     # Test USE_TILE_EXTENT=YES with empty table
@@ -276,8 +257,7 @@ def test_gpkg_1():
     ds.ExecuteSQL('DELETE FROM tmp')
     ds = None
     ds = gdal.OpenEx('/vsimem/tmp.gpkg', gdal.OF_RASTER, open_options=['USE_TILE_EXTENT=YES'])
-    if ds is not None:
-        return 'fail'
+    assert ds is None
 
     gdal.Unlink('/vsimem/tmp.gpkg')
 
@@ -290,9 +270,7 @@ def test_gpkg_1():
     out_ds = gdal.Open('/vsimem/tmp.gpkg')
     expected_cs = [expected_cs, expected_cs, expected_cs, 4873]
     got_cs = [out_ds.GetRasterBand(i + 1).Checksum() for i in range(4)]
-    if got_cs != expected_cs:
-        print('Got %s, expected %s' % (str(got_cs), str(expected_cs)))
-        return 'fail'
+    assert got_cs == expected_cs
     check_tile_format(out_ds, 'PNG', 1, False)
     out_ds = None
 
@@ -325,25 +303,20 @@ def test_gpkg_2():
     out_ds = gdal.Open('/vsimem/tmp.gpkg')
     expected_cs = [expected_cs, expected_cs, expected_cs, 4873]
     got_cs = [out_ds.GetRasterBand(i + 1).Checksum() for i in range(4)]
-    if got_cs != expected_cs:
-        print('Got %s, expected %s' % (str(got_cs), str(expected_cs)))
-        return 'fail'
+    assert got_cs == expected_cs
     check_tile_format(out_ds, 'JPEG', 1, False)
 
     # Check that there's no extensions
     out_ds = gdal.Open('/vsimem/tmp.gpkg')
     sql_lyr = out_ds.ExecuteSQL("SELECT * FROM sqlite_master WHERE type = 'table' AND name = 'gpkg_extensions'")
-    if sql_lyr.GetFeatureCount() != 0:
-        return 'fail'
+    assert sql_lyr.GetFeatureCount() == 0
     out_ds.ReleaseResultSet(sql_lyr)
 
     out_ds = None
 
     ds = gdal.OpenEx('/vsimem/tmp.gpkg', open_options=['USE_TILE_EXTENT=YES'])
     got_cs = [ds.GetRasterBand(i + 1).Checksum() for i in range(4)]
-    if got_cs != clamped_expected_cs:
-        print('Got %s, expected %s' % (str(got_cs), str(clamped_expected_cs)))
-        return 'fail'
+    assert got_cs == clamped_expected_cs
     ds = None
 
     gdal.Unlink('/vsimem/tmp.gpkg')
@@ -357,9 +330,7 @@ def test_gpkg_2():
     out_ds = gdal.Open('/vsimem/tmp.gpkg')
     expected_cs = [expected_cs, expected_cs, expected_cs, 4873]
     got_cs = [out_ds.GetRasterBand(i + 1).Checksum() for i in range(4)]
-    if got_cs != expected_cs:
-        print('Got %s, expected %s' % (str(got_cs), str(expected_cs)))
-        return 'fail'
+    assert got_cs == expected_cs
     check_tile_format(out_ds, 'JPEG', 1, False)
 
     # Try deregistering JPEG driver
@@ -371,8 +342,7 @@ def test_gpkg_2():
     gdal.PushErrorHandler('CPLQuietErrorHandler')
     out_ds.GetRasterBand(1).Checksum()
     gdal.PopErrorHandler()
-    if gdal.GetLastErrorMsg() == '':
-        return 'fail'
+    assert gdal.GetLastErrorMsg() != ''
     out_ds = None
 
     gdal.Unlink('/vsimem/tmp.gpkg')
@@ -383,8 +353,7 @@ def test_gpkg_2():
     gdal.PushErrorHandler('CPLQuietErrorHandler')
     out_ds.FlushCache()
     gdal.PopErrorHandler()
-    if gdal.GetLastErrorMsg() == '':
-        return 'fail'
+    assert gdal.GetLastErrorMsg() != ''
     out_ds = None
 
     # Re-register driver
@@ -418,20 +387,15 @@ def test_gpkg_3():
     out_ds = gdaltest.gpkg_dr.CreateCopy('/vsimem/tmp.gpkg', ds, options=['TILE_FORMAT=WEBP'])
     out_ds = None
 
-    if not validate('/vsimem/tmp.gpkg'):
-        gdaltest.post_reason('validation failed')
-        return 'fail'
+    assert validate('/vsimem/tmp.gpkg'), 'validation failed'
 
     out_ds = gdal.OpenEx('/vsimem/tmp.gpkg')
     got_cs = [out_ds.GetRasterBand(i + 1).Checksum() for i in range(3)]
-    if got_cs not in (expected_cs, [4736, 4734, 4736]):
-        print('Got %s, expected %s' % (str(got_cs), str(expected_cs)))
-        return 'fail'
+    assert got_cs in (expected_cs, [4736, 4734, 4736])
 
     # Check that extension is declared
     sql_lyr = out_ds.ExecuteSQL("SELECT * FROM gpkg_extensions WHERE table_name = 'tmp' AND column_name = 'tile_data' AND extension_name = 'gpkg_webp'")
-    if sql_lyr.GetFeatureCount() != 1:
-        return 'fail'
+    assert sql_lyr.GetFeatureCount() == 1
     out_ds.ReleaseResultSet(sql_lyr)
 
     if gdaltest.webp_supports_rgba:
@@ -444,9 +408,7 @@ def test_gpkg_3():
 
     ds = gdal.OpenEx('/vsimem/tmp.gpkg', open_options=['USE_TILE_EXTENT=YES'])
     got_cs = [ds.GetRasterBand(i + 1).Checksum() for i in range(4)]
-    if got_cs not in (clamped_expected_cs, [6850, 6848, 6850, 4898]):
-        print('Got %s, expected %s' % (str(got_cs), str(clamped_expected_cs)))
-        return 'fail'
+    assert got_cs in (clamped_expected_cs, [6850, 6848, 6850, 4898])
     ds = None
 
     gdal.Unlink('/vsimem/tmp.gpkg')
@@ -460,9 +422,7 @@ def test_gpkg_3():
     out_ds = gdal.Open('/vsimem/tmp.gpkg')
     expected_cs.append(4873)
     got_cs = [out_ds.GetRasterBand(i + 1).Checksum() for i in range(4)]
-    if got_cs != expected_cs:
-        print('Got %s, expected %s' % (str(got_cs), str(expected_cs)))
-        return 'fail'
+    assert got_cs == expected_cs
     check_tile_format(out_ds, 'WEBP', 3, False)
 
     # Try deregistering WEBP driver
@@ -499,8 +459,7 @@ def test_gpkg_3():
 
     out_ds = gdal.OpenEx('/vsimem/tmp.gpkg', gdal.OF_RASTER | gdal.OF_UPDATE, open_options=['TILE_FORMAT=WEBP'])
     sql_lyr = out_ds.ExecuteSQL("SELECT * FROM gpkg_extensions WHERE table_name = 'tmp' AND column_name = 'tile_data' AND extension_name = 'gpkg_webp'")
-    if sql_lyr.GetFeatureCount() != 1:
-        return 'fail'
+    assert sql_lyr.GetFeatureCount() == 1
     out_ds.ReleaseResultSet(sql_lyr)
     out_ds = None
 
@@ -548,17 +507,13 @@ def test_gpkg_4(tile_drv_name='PNG'):
     out_ds = gdal.Open('/vsimem/tmp.gpkg')
     expected_cs.append(30658)
     got_cs = [out_ds.GetRasterBand(i + 1).Checksum() for i in range(4)]
-    if got_cs not in (expected_cs, [22290, 21651, 21551, 30658]):
-        print('Got %s, expected %s' % (str(got_cs), str(expected_cs)))
-        return 'fail'
+    assert got_cs in (expected_cs, [22290, 21651, 21551, 30658])
     check_tile_format(out_ds, tile_drv_name, working_bands, False)
     out_ds = None
 
     ds = gdal.OpenEx('/vsimem/tmp.gpkg', open_options=['USE_TILE_EXTENT=YES'])
     got_cs = [ds.GetRasterBand(i + 1).Checksum() for i in range(4)]
-    if got_cs not in (clamped_expected_cs, [56886, 43228, 56508, 30638]):
-        print('Got %s, expected %s' % (str(got_cs), str(clamped_expected_cs)))
-        return 'fail'
+    assert got_cs in (clamped_expected_cs, [56886, 43228, 56508, 30638])
     ds = None
 
     gdal.Unlink('/vsimem/tmp.gpkg')
@@ -572,9 +527,7 @@ def test_gpkg_4(tile_drv_name='PNG'):
 
     out_ds = gdal.Open('/vsimem/tmp.gpkg')
     got_cs = [out_ds.GetRasterBand(i + 1).Checksum() for i in range(4)]
-    if got_cs != expected_cs:
-        print('Got %s, expected %s' % (str(got_cs), str(expected_cs)))
-        return 'fail'
+    assert got_cs == expected_cs
     check_tile_format(out_ds, tile_drv_name, 3, False)
     out_ds = None
 
@@ -648,9 +601,7 @@ def test_gpkg_7(tile_drv_name='PNG'):
 
     out_ds = gdal.Open('/vsimem/tmp.gpkg')
     got_cs = [out_ds.GetRasterBand(i + 1).Checksum() for i in range(working_bands)]
-    if got_cs != expected_cs:
-        print('Got %s, expected %s' % (str(got_cs), str(expected_cs)))
-        return 'fail'
+    assert got_cs == expected_cs
     check_tile_format(out_ds, tile_drv_name, working_bands, False)
     out_ds = None
 
@@ -667,9 +618,7 @@ def test_gpkg_7(tile_drv_name='PNG'):
 
     out_ds = gdal.Open('/vsimem/tmp.gpkg')
     got_cs = [out_ds.GetRasterBand(i + 1).Checksum() for i in range(3)]
-    if got_cs != expected_cs:
-        print('Got %s, expected %s' % (str(got_cs), str(expected_cs)))
-        return 'fail'
+    assert got_cs == expected_cs
     check_tile_format(out_ds, tile_drv_name, 3, False)
     out_ds = None
 
@@ -686,9 +635,7 @@ def test_gpkg_7(tile_drv_name='PNG'):
     out_ds = gdal.Open('/vsimem/tmp.gpkg')
     expected_cs = [0, 0, 0, 0]
     got_cs = [out_ds.GetRasterBand(i + 1).Checksum() for i in range(4)]
-    if got_cs != expected_cs:
-        print('Got %s, expected %s' % (str(got_cs), str(expected_cs)))
-        return 'fail'
+    assert got_cs == expected_cs
     check_tile_format(out_ds, None, None, None)
     out_ds = None
 
@@ -749,45 +696,35 @@ def test_gpkg_10():
     expected_cs = [10991, 57677, 34965, 10638]
     out_ds = gdal.Open('/vsimem/tmp.gpkg')
     block_size = out_ds.GetRasterBand(1).GetBlockSize()
-    if block_size != [out_ds.RasterXSize, out_ds.RasterYSize]:
-        print(block_size)
-        return 'fail'
+    assert block_size == [out_ds.RasterXSize, out_ds.RasterYSize]
     got_cs = [out_ds.GetRasterBand(i + 1).Checksum() for i in range(4)]
-    if got_cs != expected_cs:
-        print('Got %s, expected %s' % (str(got_cs), str(expected_cs)))
-        return 'fail'
+    assert got_cs == expected_cs
     check_tile_format(out_ds, 'PNG', 1, True)
     got_ct = out_ds.GetRasterBand(1).GetColorTable()
-    if got_ct is not None:
-        return 'fail'
+    assert got_ct is None
 
     # SetColorTable() on a non single-band dataset
     gdal.ErrorReset()
     gdal.PushErrorHandler()
     out_ds.GetRasterBand(1).SetColorTable(None)
     gdal.PopErrorHandler()
-    if gdal.GetLastErrorMsg() == '':
-        return 'fail'
+    assert gdal.GetLastErrorMsg() != ''
 
     out_ds = None
 
     expected_cs = [expected_cs_single_band]
     out_ds = gdal.OpenEx('/vsimem/tmp.gpkg', open_options=['BAND_COUNT=1'])
     got_cs = [out_ds.GetRasterBand(i + 1).Checksum() for i in range(out_ds.RasterCount)]
-    if got_cs != expected_cs:
-        print('Got %s, expected %s' % (str(got_cs), str(expected_cs)))
-        return 'fail'
+    assert got_cs == expected_cs
     got_ct = out_ds.GetRasterBand(1).GetColorTable()
-    if expected_ct.GetCount() != got_ct.GetCount():
-        return 'fail'
+    assert expected_ct.GetCount() == got_ct.GetCount()
 
     # SetColorTable() on a re-opened dataset
     gdal.ErrorReset()
     gdal.PushErrorHandler()
     out_ds.GetRasterBand(1).SetColorTable(None)
     gdal.PopErrorHandler()
-    if gdal.GetLastErrorMsg() == '':
-        return 'fail'
+    assert gdal.GetLastErrorMsg() != ''
 
     out_ds = None
 
@@ -801,8 +738,7 @@ def test_gpkg_10():
     gdal.PushErrorHandler()
     out_ds.GetRasterBand(1).SetColorTable(None)
     gdal.PopErrorHandler()
-    if gdal.GetLastErrorMsg() == '':
-        return 'fail'
+    assert gdal.GetLastErrorMsg() != ''
 
     gdal.PushErrorHandler()
     out_ds = None
@@ -823,13 +759,10 @@ def test_gpkg_10():
     expected_cs = [10991, 57677, 34965, 10638]
     out_ds = gdal.Open('/vsimem/tmp.gpkg')
     got_cs = [out_ds.GetRasterBand(i + 1).Checksum() for i in range(4)]
-    if got_cs != expected_cs:
-        print('Got %s, expected %s' % (str(got_cs), str(expected_cs)))
-        return 'fail'
+    assert got_cs == expected_cs
     check_tile_format(out_ds, 'PNG', 4, False)
     got_ct = out_ds.GetRasterBand(1).GetColorTable()
-    if got_ct is not None:
-        return 'fail'
+    assert got_ct is None
 
     return 'success'
 
@@ -879,9 +812,7 @@ def test_gpkg_11(tile_drv_name='JPEG'):
 
     out_ds = gdal.Open('/vsimem/tmp.gpkg')
     got_cs = [out_ds.GetRasterBand(i + 1).Checksum() for i in range(working_bands)]
-    if got_cs != expected_cs:
-        print('Got %s, expected %s' % (str(got_cs), str(expected_cs)))
-        return 'fail'
+    assert got_cs == expected_cs
     out_ds = None
 
     gdal.Unlink('/vsimem/tmp.gpkg')
@@ -918,23 +849,17 @@ def test_gpkg_13():
     expected_cs = [63025, 48175, 12204]
     out_ds = gdal.Open('/vsimem/tmp.gpkg')
     got_cs = [out_ds.GetRasterBand(i + 1).Checksum() for i in range(3)]
-    if got_cs != expected_cs:
-        print('Got %s, expected %s' % (str(got_cs), str(expected_cs)))
-        return 'fail'
+    assert got_cs == expected_cs
     got_ct = out_ds.GetRasterBand(1).GetColorTable()
-    if got_ct is not None:
-        return 'fail'
+    assert got_ct is None
     out_ds = None
 
     expected_cs = [expected_cs_single_band]
     out_ds = gdal.OpenEx('/vsimem/tmp.gpkg', open_options=['BAND_COUNT=1'])
     got_cs = [out_ds.GetRasterBand(i + 1).Checksum() for i in range(out_ds.RasterCount)]
-    if got_cs != expected_cs:
-        print('Got %s, expected %s' % (str(got_cs), str(expected_cs)))
-        return 'fail'
+    assert got_cs == expected_cs
     got_ct = out_ds.GetRasterBand(1).GetColorTable()
-    if expected_ct.GetCount() != got_ct.GetCount():
-        return 'fail'
+    assert expected_ct.GetCount() == got_ct.GetCount()
     out_ds = None
 
     gdal.Unlink('/vsimem/tmp.gpkg')
@@ -948,13 +873,10 @@ def test_gpkg_13():
     src_ds = None
 
     ds = gdal.OpenEx('/vsimem/tmp.gpkg', open_options=['USE_TILE_EXTENT=YES'])
-    if ds.RasterXSize != 512 or ds.RasterYSize != 256:
-        return 'fail'
+    assert ds.RasterXSize == 512 and ds.RasterYSize == 256
     expected_cs = [62358, 45823, 12238, 64301]
     got_cs = [ds.GetRasterBand(i + 1).Checksum() for i in range(4)]
-    if got_cs != expected_cs:
-        print('Got %s, expected %s' % (str(got_cs), str(expected_cs)))
-        return 'fail'
+    assert got_cs == expected_cs
     ds = None
 
     gdal.Unlink('/vsimem/tmp.gpkg')
@@ -980,68 +902,46 @@ def test_gpkg_14():
     gdal.PushErrorHandler()
     ds = gdal.OpenEx('/vsimem/tmp.gpkg', open_options=['TABLE=non_existing'])
     gdal.PopErrorHandler()
-    if ds is not None:
-        return 'fail'
+    assert ds is None
 
     ds = gdal.Open('/vsimem/tmp.gpkg')
     sql_lyr = ds.ExecuteSQL("SELECT * FROM gpkg_contents WHERE table_name='foo'")
     feat_count = sql_lyr.GetFeatureCount()
     ds.ReleaseResultSet(sql_lyr)
-    if feat_count != 1:
-        return 'fail'
-    if ds.GetMetadataItem('IDENTIFIER') != 'bar':
-        print(ds.GetMetadata())
-        return 'fail'
-    if ds.GetMetadataItem('DESCRIPTION') != 'baz':
-        print(ds.GetMetadata())
-        return 'fail'
-    if ds.GetMetadataItem('ZOOM_LEVEL') != '1':
-        print(ds.GetMetadata())
-        return 'fail'
-    if ds.GetRasterBand(1).GetOverviewCount() != 0:
-        return 'fail'
-    if ds.GetRasterBand(1).GetOverview(0) is not None:
-        return 'fail'
+    assert feat_count == 1
+    assert ds.GetMetadataItem('IDENTIFIER') == 'bar', ds.GetMetadata()
+    assert ds.GetMetadataItem('DESCRIPTION') == 'baz', ds.GetMetadata()
+    assert ds.GetMetadataItem('ZOOM_LEVEL') == '1', ds.GetMetadata()
+    assert ds.GetRasterBand(1).GetOverviewCount() == 0
+    assert ds.GetRasterBand(1).GetOverview(0) is None
     ds = None
 
     # In update mode, we expose even empty overview levels
     ds = gdal.Open('/vsimem/tmp.gpkg', gdal.GA_Update)
-    if ds.GetMetadataItem('ZOOM_LEVEL') != '1':
-        print(ds.GetMetadata())
-        return 'fail'
-    if ds.GetRasterBand(1).GetOverviewCount() != 1:
-        return 'fail'
-    if ds.GetRasterBand(1).GetOverview(0) is None:
-        return 'fail'
-    if ds.GetRasterBand(1).GetOverview(0).Checksum() != 0:
-        return 'fail'
+    assert ds.GetMetadataItem('ZOOM_LEVEL') == '1', ds.GetMetadata()
+    assert ds.GetRasterBand(1).GetOverviewCount() == 1
+    assert ds.GetRasterBand(1).GetOverview(0) is not None
+    assert ds.GetRasterBand(1).GetOverview(0).Checksum() == 0
     ds = None
 
     ds = gdal.OpenEx('/vsimem/tmp.gpkg', open_options=['ZOOM_LEVEL=2'])
-    if ds.RasterXSize != 400:
-        return 'fail'
+    assert ds.RasterXSize == 400
     ds = None
 
     ds = gdal.OpenEx('/vsimem/tmp.gpkg', open_options=['ZOOM_LEVEL=1'])
-    if ds.RasterXSize != 400:
-        return 'fail'
-    if ds.GetRasterBand(1).GetOverviewCount() != 0:
-        return 'fail'
+    assert ds.RasterXSize == 400
+    assert ds.GetRasterBand(1).GetOverviewCount() == 0
     ds = None
 
     # In update mode, we expose even empty overview levels
     ds = gdal.OpenEx('/vsimem/tmp.gpkg', gdal.OF_UPDATE, open_options=['ZOOM_LEVEL=1'])
-    if ds.RasterXSize != 400:
-        return 'fail'
-    if ds.GetRasterBand(1).GetOverviewCount() != 1:
-        return 'fail'
+    assert ds.RasterXSize == 400
+    assert ds.GetRasterBand(1).GetOverviewCount() == 1
     ds = None
 
     ds = gdal.OpenEx('/vsimem/tmp.gpkg', open_options=['ZOOM_LEVEL=0'])
-    if ds.RasterXSize != 200:
-        return 'fail'
-    if ds.GetRasterBand(1).Checksum() != 0:
-        return 'fail'
+    assert ds.RasterXSize == 200
+    assert ds.GetRasterBand(1).Checksum() == 0
     ds = None
 
     gdal.Translate('/vsimem/tmp2.gpkg', 'data/byte.tif', format='GPKG')
@@ -1050,29 +950,22 @@ def test_gpkg_14():
     ds = None
     with gdaltest.error_handler():
         ds = gdal.OpenEx('/vsimem/tmp2.gpkg', open_options=['ZOOM_LEVEL=-1'])
-    if ds is not None:
-        return 'fail'
+    assert ds is None
     gdal.Unlink('/vsimem/tmp2.gpkg')
 
     ds = gdal.OpenEx('/vsimem/tmp.gpkg', open_options=['USE_TILE_EXTENT=YES'])
-    if ds.RasterXSize != 512 or ds.RasterYSize != 256:
-        return 'fail'
+    assert ds.RasterXSize == 512 and ds.RasterYSize == 256
     expected_cs = [27644, 31968, 38564, 64301]
     got_cs = [ds.GetRasterBand(i + 1).Checksum() for i in range(4)]
-    if got_cs != expected_cs:
-        print('Got %s, expected %s' % (str(got_cs), str(expected_cs)))
-        return 'fail'
+    assert got_cs == expected_cs
     ds = None
 
     # Open with exactly one tile shift
     ds = gdal.OpenEx('/vsimem/tmp.gpkg', gdal.OF_UPDATE, open_options=['TILE_FORMAT=PNG', 'MINX=-410.4', 'MAXY=320.4'])
-    if ds.RasterXSize != 400 + 256 or ds.RasterYSize != 200 + 256:
-        return 'fail'
+    assert ds.RasterXSize == 400 + 256 and ds.RasterYSize == 200 + 256
     expected_cs = [29070, 32796, 41086, 64288]
     got_cs = [ds.GetRasterBand(i + 1).Checksum() for i in range(4)]
-    if got_cs != expected_cs:
-        print('Got %s, expected %s' % (str(got_cs), str(expected_cs)))
-        return 'fail'
+    assert got_cs == expected_cs
     data = ds.ReadRaster(0, 0, ds.RasterXSize, ds.RasterYSize)
     for i in range(ds.RasterCount):
         ds.GetRasterBand(i + 1).Fill(0)
@@ -1080,22 +973,16 @@ def test_gpkg_14():
     sql_lyr = ds.ExecuteSQL('SELECT * FROM foo')
     fc = sql_lyr.GetFeatureCount()
     ds.ReleaseResultSet(sql_lyr)
-    if fc != 0:
-        return 'fail'
+    assert fc == 0
     ds.WriteRaster(0, 0, ds.RasterXSize, ds.RasterYSize, data)
     ds = None
 
     # Partial tile shift (enclosing tiles)
     ds = gdal.OpenEx('GPKG:/vsimem/tmp.gpkg:foo', gdal.OF_UPDATE, open_options=['MINX=-270', 'MAXY=180', 'MINY=-180', 'MAXX=270'])
-    if ds.RasterXSize != 600 or ds.RasterYSize != 400:
-        print(ds.RasterXSize)
-        print(ds.RasterYSize)
-        return 'fail'
+    assert ds.RasterXSize == 600 and ds.RasterYSize == 400
     expected_cs = [28940, 32454, 40526, 64323]
     got_cs = [ds.GetRasterBand(i + 1).Checksum() for i in range(4)]
-    if got_cs != expected_cs:
-        print('Got %s, expected %s' % (str(got_cs), str(expected_cs)))
-        return 'fail'
+    assert got_cs == expected_cs
 
     # Force full rewrite
     data = ds.ReadRaster(0, 0, ds.RasterXSize, ds.RasterYSize)
@@ -1106,17 +993,14 @@ def test_gpkg_14():
     sql_lyr = ds.ExecuteSQL('SELECT * FROM foo')
     fc = sql_lyr.GetFeatureCount()
     ds.ReleaseResultSet(sql_lyr)
-    if fc != 0:
-        return 'fail'
+    assert fc == 0
     ds.WriteRaster(0, 0, ds.RasterXSize, ds.RasterYSize, data)
     ds = None
 
     ds = gdal.OpenEx('GPKG:/vsimem/tmp.gpkg:foo', gdal.OF_UPDATE, open_options=['MINX=-270', 'MAXY=180', 'MINY=-180', 'MAXX=270'])
     expected_cs = [28940, 32454, 40526, 64323]
     got_cs = [ds.GetRasterBand(i + 1).Checksum() for i in range(4)]
-    if got_cs != expected_cs:
-        print('Got %s, expected %s' % (str(got_cs), str(expected_cs)))
-        return 'fail'
+    assert got_cs == expected_cs
     # Partial rewrite
     data = ds.GetRasterBand(1).ReadRaster(0, 0, 256, 256)
     ds.GetRasterBand(1).WriteRaster(0, 0, 256, 256, data)
@@ -1125,20 +1009,15 @@ def test_gpkg_14():
     ds = gdal.OpenEx('GPKG:/vsimem/tmp.gpkg:foo', open_options=['MINX=-270', 'MAXY=180', 'MINY=-180', 'MAXX=270'])
     expected_cs = [28940, 32454, 40526, 64323]
     got_cs = [ds.GetRasterBand(i + 1).Checksum() for i in range(4)]
-    if got_cs != expected_cs:
-        print('Got %s, expected %s' % (str(got_cs), str(expected_cs)))
-        return 'fail'
+    assert got_cs == expected_cs
     ds = None
 
     # Partial tile shift (included in tiles)
     ds = gdal.OpenEx('GPKG:/vsimem/tmp.gpkg:foo', gdal.OF_UPDATE, open_options=['MINX=-90', 'MAXY=45', 'MINY=-45', 'MAXX=90'])
-    if ds.RasterXSize != 200 or ds.RasterYSize != 100:
-        return 'fail'
+    assert ds.RasterXSize == 200 and ds.RasterYSize == 100
     expected_cs = [9586, 9360, 26758, 48827]
     got_cs = [ds.GetRasterBand(i + 1).Checksum() for i in range(4)]
-    if got_cs != expected_cs:
-        print('Got %s, expected %s' % (str(got_cs), str(expected_cs)))
-        return 'fail'
+    assert got_cs == expected_cs
 
     # Force full rewrite
     data = ds.ReadRaster(0, 0, ds.RasterXSize, ds.RasterYSize)
@@ -1146,13 +1025,10 @@ def test_gpkg_14():
     ds = None
 
     ds = gdal.OpenEx('GPKG:/vsimem/tmp.gpkg:foo', open_options=['MINX=-90', 'MAXY=45', 'MINY=-45', 'MAXX=90'])
-    if ds.RasterXSize != 200 or ds.RasterYSize != 100:
-        return 'fail'
+    assert ds.RasterXSize == 200 and ds.RasterYSize == 100
     expected_cs = [9586, 9360, 26758, 48827]
     got_cs = [ds.GetRasterBand(i + 1).Checksum() for i in range(4)]
-    if got_cs != expected_cs:
-        print('Got %s, expected %s' % (str(got_cs), str(expected_cs)))
-        return 'fail'
+    assert got_cs == expected_cs
     ds = None
 
     ds = gdaltest.gpkg_dr.CreateCopy('/vsimem/tmp.gpkg', src_ds, options=['APPEND_SUBDATASET=YES', 'RASTER_TABLE=other', 'BLOCKSIZE=64', 'TILE_FORMAT=PNG'])
@@ -1164,43 +1040,26 @@ def test_gpkg_14():
 
     ds = gdal.Open('/vsimem/tmp.gpkg')
     md = ds.GetMetadata('SUBDATASETS')
-    if md['SUBDATASET_1_NAME'] != 'GPKG:/vsimem/tmp.gpkg:foo':
-        print(md)
-        return 'fail'
-    if md['SUBDATASET_1_DESC'] != 'foo - bar':
-        print(md)
-        return 'fail'
-    if md['SUBDATASET_2_NAME'] != 'GPKG:/vsimem/tmp.gpkg:other':
-        print(md)
-        return 'fail'
-    if md['SUBDATASET_2_DESC'] != 'other - other':
-        print(md)
-        return 'fail'
-    if md['SUBDATASET_3_NAME'] != 'GPKG:/vsimem/tmp.gpkg:byte':
-        print(md)
-        return 'fail'
-    if md['SUBDATASET_3_DESC'] != 'byte - byte':
-        print(md)
-        return 'fail'
+    assert md['SUBDATASET_1_NAME'] == 'GPKG:/vsimem/tmp.gpkg:foo'
+    assert md['SUBDATASET_1_DESC'] == 'foo - bar'
+    assert md['SUBDATASET_2_NAME'] == 'GPKG:/vsimem/tmp.gpkg:other'
+    assert md['SUBDATASET_2_DESC'] == 'other - other'
+    assert md['SUBDATASET_3_NAME'] == 'GPKG:/vsimem/tmp.gpkg:byte'
+    assert md['SUBDATASET_3_DESC'] == 'byte - byte'
     ds = None
 
     ds = gdal.Open('GPKG:/vsimem/tmp.gpkg:other')
     block_size = ds.GetRasterBand(1).GetBlockSize()
-    if block_size != [64, 64]:
-        return 'fail'
+    assert block_size == [64, 64]
     ds = None
 
     ds = gdal.OpenEx('/vsimem/tmp.gpkg', open_options=['TABLE=other', 'MINX=-90', 'MAXY=45', 'MINY=-45', 'MAXX=90'])
-    if ds.RasterXSize != 200 or ds.RasterYSize != 100:
-        return 'fail'
+    assert ds.RasterXSize == 200 and ds.RasterYSize == 100
     block_size = ds.GetRasterBand(1).GetBlockSize()
-    if block_size != [64, 64]:
-        return 'fail'
+    assert block_size == [64, 64]
     expected_cs = [9586, 9360, 26758, 48827]
     got_cs = [ds.GetRasterBand(i + 1).Checksum() for i in range(4)]
-    if got_cs != expected_cs:
-        print('Got %s, expected %s' % (str(got_cs), str(expected_cs)))
-        return 'fail'
+    assert got_cs == expected_cs
     ds = None
 
     gdal.Unlink('/vsimem/tmp.gpkg')
@@ -1217,9 +1076,7 @@ def test_gpkg_14():
     ds = gdal.OpenEx('/vsimem/tmp.gpkg', open_options=['MINX=-10', 'MAXY=10', 'MINY=-30', 'MAXX=30'])
     expected_cs = [4934, 4934, 4934, 4934]
     got_cs = [ds.GetRasterBand(i + 1).Checksum() for i in range(4)]
-    if got_cs != expected_cs:
-        print('Got %s, expected %s' % (str(got_cs), str(expected_cs)))
-        return 'fail'
+    assert got_cs == expected_cs
     ds = None
 
     gdal.Unlink('/vsimem/tmp.gpkg')
@@ -1237,9 +1094,7 @@ def test_gpkg_14():
     ds = gdal.OpenEx('/vsimem/tmp.gpkg', open_options=['MINX=-10', 'MAXY=10', 'MINY=-30', 'MAXX=30'])
     expected_cs = [1223, 1223, 1223, 1223]
     got_cs = [ds.GetRasterBand(i + 1).Checksum() for i in range(4)]
-    if got_cs != expected_cs:
-        print('Got %s, expected %s' % (str(got_cs), str(expected_cs)))
-        return 'fail'
+    assert got_cs == expected_cs
     ds = None
 
     gdal.Unlink('/vsimem/tmp.gpkg')
@@ -1257,9 +1112,7 @@ def test_gpkg_14():
     ds = gdal.OpenEx('/vsimem/tmp.gpkg')
     expected_cs = [13365, 13365, 13365, 13365]
     got_cs = [ds.GetRasterBand(i + 1).Checksum() for i in range(4)]
-    if got_cs != expected_cs:
-        print('Got %s, expected %s' % (str(got_cs), str(expected_cs)))
-        return 'fail'
+    assert got_cs == expected_cs
     ds = None
 
     gdal.Unlink('/vsimem/tmp.gpkg')
@@ -1286,8 +1139,7 @@ def test_gpkg_14():
     sql_lyr = ds.ExecuteSQL('SELECT * FROM tmp')
     fc = sql_lyr.GetFeatureCount()
     ds.ReleaseResultSet(sql_lyr)
-    if fc != 0:
-        return 'fail'
+    assert fc == 0
 
     expected_cs = [0, 56451, 0, 0]
     got_cs = [ds.GetRasterBand(i + 1).Checksum() for i in range(4)]
@@ -1301,14 +1153,12 @@ def test_gpkg_14():
     # Overflow occurred in ComputeTileAndPixelShifts()
     with gdaltest.error_handler():
         ds = gdal.OpenEx('/vsimem/tmp.gpkg', open_options=['MINX=-1e12', 'MAXX=-0.9999e12'])
-    if ds is not None:
-        return 'fail'
+    assert ds is None
 
     # Overflow occurred in ComputeTileAndPixelShifts()
     with gdaltest.error_handler():
         ds = gdal.OpenEx('/vsimem/tmp.gpkg', open_options=['MINY=-1e12', 'MAXY=-0.9999e12'])
-    if ds is not None:
-        return 'fail'
+    assert ds is None
 
     # Overflow occurred in ComputeTileAndPixelShifts()
     gdal.Translate('/vsimem/tmp.gpkg', 'data/byte.tif', format='GPKG')
@@ -1317,8 +1167,7 @@ def test_gpkg_14():
     ds = None
     with gdaltest.error_handler():
         ds = gdal.Open('/vsimem/tmp.gpkg')
-    if ds is not None:
-        return 'fail'
+    assert ds is None
 
     gdal.Unlink('/vsimem/tmp.gpkg')
     return 'success'
@@ -1336,23 +1185,19 @@ def test_gpkg_15():
 
     # SetGeoTransform() and SetProjection() on a non-raster GPKG
     out_ds = gdaltest.gpkg_dr.Create('/vsimem/tmp.gpkg', 0, 0, 0)
-    if out_ds.GetGeoTransform(can_return_null=True) is not None:
-        return 'fail'
-    if out_ds.GetProjectionRef() != '':
-        return 'fail'
+    assert out_ds.GetGeoTransform(can_return_null=True) is None
+    assert out_ds.GetProjectionRef() == ''
     gdal.PushErrorHandler()
     ret = out_ds.SetGeoTransform([0, 1, 0, 0, 0, -1])
     gdal.PopErrorHandler()
-    if ret == 0:
-        return 'fail'
+    assert ret != 0
 
     srs = osr.SpatialReference()
     srs.ImportFromEPSG(4326)
     gdal.PushErrorHandler()
     ret = out_ds.SetProjection(srs.ExportToWkt())
     gdal.PopErrorHandler()
-    if ret == 0:
-        return 'fail'
+    assert ret != 0
     out_ds = None
 
     gdal.Unlink('/vsimem/tmp.gpkg')
@@ -1360,48 +1205,39 @@ def test_gpkg_15():
     # Repeated SetGeoTransform()
     out_ds = gdaltest.gpkg_dr.Create('/vsimem/tmp.gpkg', 1, 1)
     ret = out_ds.SetGeoTransform([0, 1, 0, 0, 0, -1])
-    if ret != 0:
-        return 'fail'
+    assert ret == 0
     gdal.PushErrorHandler()
     ret = out_ds.SetGeoTransform([0, 1, 0, 0, 0, -1])
     gdal.PopErrorHandler()
-    if ret == 0:
-        return 'fail'
+    assert ret != 0
     out_ds = None
 
     # Repeated SetProjection()
     out_ds = gdal.Open('/vsimem/tmp.gpkg', gdal.GA_Update)
-    if out_ds.GetProjectionRef() != '':
-        return 'fail'
+    assert out_ds.GetProjectionRef() == ''
     srs = osr.SpatialReference()
     srs.ImportFromEPSG(4326)
     ret = out_ds.SetProjection(srs.ExportToWkt())
-    if ret != 0:
-        return 'fail'
-    if out_ds.GetProjectionRef().find('4326') < 0:
-        return 'fail'
+    assert ret == 0
+    assert out_ds.GetProjectionRef().find('4326') >= 0
     out_ds = None
 
     out_ds = gdal.Open('/vsimem/tmp.gpkg', gdal.GA_Update)
-    if out_ds.GetProjectionRef().find('4326') < 0:
-        return 'fail'
+    assert out_ds.GetProjectionRef().find('4326') >= 0
     out_ds.SetProjection('')
     out_ds = None
 
     out_ds = gdal.Open('/vsimem/tmp.gpkg')
-    if out_ds.GetProjectionRef() != '':
-        return 'fail'
+    assert out_ds.GetProjectionRef() == ''
     # Test setting on read-only dataset
     gdal.PushErrorHandler()
     ret = out_ds.SetProjection('')
     gdal.PopErrorHandler()
-    if ret == 0:
-        return 'fail'
+    assert ret != 0
     gdal.PushErrorHandler()
     ret = out_ds.SetGeoTransform([0, 1, 0, 0, 0, -1])
     gdal.PopErrorHandler()
-    if ret == 0:
-        return 'fail'
+    assert ret != 0
     out_ds = None
 
     gdal.Unlink('/vsimem/tmp.gpkg')
@@ -1410,19 +1246,15 @@ def test_gpkg_15():
     out_ds = gdaltest.gpkg_dr.Create('/vsimem/tmp.gpkg', 1, 1)
     out_ds.SetGeoTransform([0, 1, 0, 0, 0, -1])
     ret = out_ds.GetRasterBand(1).SetColorInterpretation(gdal.GCI_Undefined)
-    if ret != 0:
-        return 'fail'
+    assert ret == 0
     ret = out_ds.GetRasterBand(1).SetColorInterpretation(gdal.GCI_GrayIndex)
-    if ret != 0:
-        return 'fail'
+    assert ret == 0
     ret = out_ds.GetRasterBand(1).SetColorInterpretation(gdal.GCI_PaletteIndex)
-    if ret != 0:
-        return 'fail'
+    assert ret == 0
     gdal.PushErrorHandler()
     ret = out_ds.GetRasterBand(1).SetColorInterpretation(gdal.GCI_RedBand)
     gdal.PopErrorHandler()
-    if ret == 0:
-        return 'fail'
+    assert ret != 0
     out_ds = None
 
     gdal.Unlink('/vsimem/tmp.gpkg')
@@ -1430,13 +1262,11 @@ def test_gpkg_15():
     out_ds = gdaltest.gpkg_dr.Create('/vsimem/tmp.gpkg', 1, 1, 3)
     out_ds.SetGeoTransform([0, 1, 0, 0, 0, -1])
     ret = out_ds.GetRasterBand(1).SetColorInterpretation(gdal.GCI_RedBand)
-    if ret != 0:
-        return 'fail'
+    assert ret == 0
     gdal.PushErrorHandler()
     ret = out_ds.GetRasterBand(2).SetColorInterpretation(gdal.GCI_RedBand)
     gdal.PopErrorHandler()
-    if ret == 0:
-        return 'fail'
+    assert ret != 0
     out_ds = None
 
     gdal.Unlink('/vsimem/tmp.gpkg')
@@ -1444,21 +1274,17 @@ def test_gpkg_15():
     out_ds = gdaltest.gpkg_dr.Create('/vsimem/tmp.gpkg', 1, 1, 2)
     out_ds.SetGeoTransform([0, 1, 0, 0, 0, -1])
     ret = out_ds.GetRasterBand(1).SetColorInterpretation(gdal.GCI_GrayIndex)
-    if ret != 0:
-        return 'fail'
+    assert ret == 0
     gdal.PushErrorHandler()
     ret = out_ds.GetRasterBand(1).SetColorInterpretation(gdal.GCI_RedBand)
     gdal.PopErrorHandler()
-    if ret == 0:
-        return 'fail'
+    assert ret != 0
     ret = out_ds.GetRasterBand(2).SetColorInterpretation(gdal.GCI_AlphaBand)
-    if ret != 0:
-        return 'fail'
+    assert ret == 0
     gdal.PushErrorHandler()
     ret = out_ds.GetRasterBand(2).SetColorInterpretation(gdal.GCI_RedBand)
     gdal.PopErrorHandler()
-    if ret == 0:
-        return 'fail'
+    assert ret != 0
     out_ds = None
 
     gdal.Unlink('/vsimem/tmp.gpkg')
@@ -1495,15 +1321,9 @@ def test_gpkg_16():
     val3 = ord(out_ds.GetRasterBand(3).ReadRaster(0, 0, 1, 1))
     out_ds = None
 
-    if abs(val1 - 255) > 1:
-        print(val1)
-        return 'fail'
-    if abs(val2 - 127) > 1:
-        print(val2)
-        return 'fail'
-    if abs(val3 - 0) > 1:
-        print(val3)
-        return 'fail'
+    assert abs(val1 - 255) <= 1
+    assert abs(val2 - 127) <= 1
+    assert abs(val3 - 0) <= 1
     gdal.Unlink('/vsimem/tmp.gpkg')
 
     return 'success'
@@ -1528,18 +1348,13 @@ def test_gpkg_17():
     out_ds = None
     ds = None
 
-    if not validate('/vsimem/tmp.gpkg'):
-        gdaltest.post_reason('validation failed')
-        return 'fail'
+    assert validate('/vsimem/tmp.gpkg'), 'validation failed'
 
     out_ds = gdal.Open('/vsimem/tmp.gpkg')
     got_cs = out_ds.GetRasterBand(1).GetOverview(0).Checksum()
-    if got_cs != 1087:
-        print(got_cs)
-        return 'fail'
+    assert got_cs == 1087
     check_tile_format(out_ds, 'PNG', 1, False, zoom_level=0)
-    if out_ds.GetRasterBand(1).GetOverview(0).GetColorTable() is not None:
-        return 'fail'
+    assert out_ds.GetRasterBand(1).GetOverview(0).GetColorTable() is None
     out_ds = None
     gdal.Unlink('/vsimem/tmp.gpkg')
 
@@ -1555,9 +1370,7 @@ def test_gpkg_17():
 
     out_ds = gdal.Open('/vsimem/tmp.gpkg')
     got_cs = out_ds.GetRasterBand(1).GetOverview(0).Checksum()
-    if got_cs != 1087:
-        print(got_cs)
-        return 'fail'
+    assert got_cs == 1087
     check_tile_format(out_ds, 'PNG', 1, False, zoom_level=0)
     out_ds = None
     gdal.Unlink('/vsimem/tmp.gpkg')
@@ -1574,16 +1387,13 @@ def test_gpkg_17():
 
     out_ds = gdal.Open('/vsimem/tmp.gpkg')
     got_cs = out_ds.GetRasterBand(1).GetOverview(0).Checksum()
-    if got_cs != 1087:
-        print(got_cs)
-        return 'fail'
+    assert got_cs == 1087
     check_tile_format(out_ds, 'PNG', 3, False, zoom_level=0)
 
     # Check that there's no extensions
     out_ds = gdal.Open('/vsimem/tmp.gpkg')
     sql_lyr = out_ds.ExecuteSQL("SELECT * FROM sqlite_master WHERE type = 'table' AND name = 'gpkg_extensions'")
-    if sql_lyr.GetFeatureCount() != 0:
-        return 'fail'
+    assert sql_lyr.GetFeatureCount() == 0
     out_ds.ReleaseResultSet(sql_lyr)
 
     out_ds = None
@@ -1593,8 +1403,7 @@ def test_gpkg_17():
     out_ds.BuildOverviews('NONE', [])
     out_ds = None
     out_ds = gdal.Open('/vsimem/tmp.gpkg')
-    if out_ds.GetRasterBand(1).GetOverviewCount() != 0:
-        return 'fail'
+    assert out_ds.GetRasterBand(1).GetOverviewCount() == 0
     out_ds = None
 
     # Test building on an overview dataset --> error
@@ -1602,8 +1411,7 @@ def test_gpkg_17():
     gdal.PushErrorHandler()
     ret = out_ds.GetRasterBand(1).GetOverview(0).GetDataset().BuildOverviews('NONE', [])
     gdal.PopErrorHandler()
-    if ret == 0:
-        return 'fail'
+    assert ret != 0
     out_ds = None
 
     # Test building overview factor 1 --> error
@@ -1611,8 +1419,7 @@ def test_gpkg_17():
     gdal.PushErrorHandler()
     ret = out_ds.BuildOverviews('NEAR', [1])
     gdal.PopErrorHandler()
-    if ret == 0:
-        return 'fail'
+    assert ret != 0
     out_ds = None
 
     # Test building non-supported overview levels
@@ -1622,8 +1429,7 @@ def test_gpkg_17():
     ret = out_ds.BuildOverviews('NEAR', [3])
     gdal.SetConfigOption('ALLOW_GPKG_ZOOM_OTHER_EXTENSION', None)
     gdal.PopErrorHandler()
-    if ret == 0:
-        return 'fail'
+    assert ret != 0
     out_ds = None
 
     # Test building non-supported overview levels
@@ -1633,8 +1439,7 @@ def test_gpkg_17():
     ret = out_ds.BuildOverviews('NEAR', [2, 4])
     gdal.SetConfigOption('ALLOW_GPKG_ZOOM_OTHER_EXTENSION', None)
     gdal.PopErrorHandler()
-    if ret == 0:
-        return 'fail'
+    assert ret != 0
     out_ds = None
 
     # Test gpkg_zoom_other extension
@@ -1643,8 +1448,7 @@ def test_gpkg_17():
     gdal.PushErrorHandler()
     ret = out_ds.BuildOverviews('NEAR', [3])
     gdal.PopErrorHandler()
-    if ret == 0:
-        return 'fail'
+    assert ret != 0
     out_ds = None
 
     # Test building overviews on read-only dataset
@@ -1652,8 +1456,7 @@ def test_gpkg_17():
     gdal.PushErrorHandler()
     ret = out_ds.BuildOverviews('NEAR', [2])
     gdal.PopErrorHandler()
-    if ret == 0:
-        return 'fail'
+    assert ret != 0
     out_ds = None
 
     gdal.Unlink('/vsimem/tmp.gpkg')
@@ -1691,15 +1494,9 @@ def test_gpkg_18():
 
     out_ds = gdal.Open('/vsimem/tmp.gpkg')
     got_cs = [out_ds.GetRasterBand(i + 1).GetOverview(0).Checksum() for i in range(3)]
-    if got_cs != expected_cs_ov0:
-        print(got_cs)
-        print(expected_cs_ov0)
-        return 'fail'
+    assert got_cs == expected_cs_ov0
     got_cs = [out_ds.GetRasterBand(i + 1).GetOverview(1).Checksum() for i in range(3)]
-    if got_cs != expected_cs_ov1:
-        print(got_cs)
-        print(expected_cs_ov1)
-        return 'fail'
+    assert got_cs == expected_cs_ov1
     check_tile_format(out_ds, 'PNG', 3, False, zoom_level=1)
     check_tile_format(out_ds, 'PNG', 4, False, zoom_level=0)
     out_ds = None
@@ -1710,67 +1507,41 @@ def test_gpkg_18():
     gdal.PushErrorHandler()
     ret = out_ds.BuildOverviews('NEAR', [3])
     gdal.PopErrorHandler()
-    if ret != 0:
-        return 'fail'
-    if out_ds.GetRasterBand(1).GetOverviewCount() != 3:
-        return 'fail'
+    assert ret == 0
+    assert out_ds.GetRasterBand(1).GetOverviewCount() == 3
     got_cs = [out_ds.GetRasterBand(i + 1).GetOverview(0).Checksum() for i in range(3)]
-    if got_cs != expected_cs_ov0:
-        print(got_cs)
-        print(expected_cs_ov0)
-        return 'fail'
+    assert got_cs == expected_cs_ov0
     expected_cs = [24807, 25544, 34002]
     got_cs = [out_ds.GetRasterBand(i + 1).GetOverview(1).Checksum() for i in range(3)]
-    if got_cs != expected_cs:
-        print(got_cs)
-        print(expected_cs)
-        return 'fail'
+    assert got_cs == expected_cs
     got_cs = [out_ds.GetRasterBand(i + 1).GetOverview(2).Checksum() for i in range(3)]
-    if got_cs != expected_cs_ov1:
-        print(got_cs)
-        print(expected_cs_ov1)
-        return 'fail'
+    assert got_cs == expected_cs_ov1
 
     # Check that extension is declared
     sql_lyr = out_ds.ExecuteSQL("SELECT * FROM gpkg_extensions WHERE table_name = 'tmp' AND extension_name = 'gpkg_zoom_other'")
-    if sql_lyr.GetFeatureCount() != 1:
-        return 'fail'
+    assert sql_lyr.GetFeatureCount() == 1
     out_ds.ReleaseResultSet(sql_lyr)
 
     out_ds = None
 
     out_ds = gdal.Open('/vsimem/tmp.gpkg')
-    if out_ds.GetRasterBand(1).GetOverviewCount() != 3:
-        return 'fail'
+    assert out_ds.GetRasterBand(1).GetOverviewCount() == 3
     got_cs = [out_ds.GetRasterBand(i + 1).GetOverview(0).Checksum() for i in range(3)]
-    if got_cs != expected_cs_ov0:
-        print(got_cs)
-        print(expected_cs_ov0)
-        return 'fail'
+    assert got_cs == expected_cs_ov0
     expected_cs = [24807, 25544, 34002]
     got_cs = [out_ds.GetRasterBand(i + 1).GetOverview(1).Checksum() for i in range(3)]
-    if got_cs != expected_cs:
-        print(got_cs)
-        print(expected_cs)
-        return 'fail'
+    assert got_cs == expected_cs
     got_cs = [out_ds.GetRasterBand(i + 1).GetOverview(2).Checksum() for i in range(3)]
-    if got_cs != expected_cs_ov1:
-        print(got_cs)
-        print(expected_cs_ov1)
-        return 'fail'
+    assert got_cs == expected_cs_ov1
     out_ds = None
 
     # Add terminating overview
     out_ds = gdal.OpenEx('/vsimem/tmp.gpkg', gdal.OF_RASTER | gdal.OF_UPDATE)
     ret = out_ds.BuildOverviews('NEAR', [8])
-    if ret != 0:
-        return 'fail'
+    assert ret == 0
     expected_cs = [12725, 12539, 13553]
     got_cs = [out_ds.GetRasterBand(i + 1).GetOverview(3).Checksum() for i in range(3)]
-    if got_cs != expected_cs:
-        print(got_cs)
-        print(expected_cs)
-        return 'fail'
+    assert got_cs == expected_cs
     out_ds = None
 
     gdal.Unlink('/vsimem/tmp.gpkg')
@@ -1781,15 +1552,13 @@ def test_gpkg_18():
         out_ds = gdaltest.gpkg_dr.CreateCopy('/vsimem/tmp.gpkg', ds, options=['TILE_FORMAT=PNG', 'BLOCKXSIZE=100', 'BLOCKYSIZE=100'])
         # Should not result in gpkg_zoom_other
         ret = out_ds.BuildOverviews('NEAR', [8])
-        if ret != 0:
-            return 'fail'
+        assert ret == 0
         out_ds = None
 
     # Check that there's no extensions
     out_ds = gdal.Open('/vsimem/tmp.gpkg')
     sql_lyr = out_ds.ExecuteSQL("SELECT * FROM sqlite_master WHERE type = 'table' AND name = 'gpkg_extensions'")
-    if sql_lyr.GetFeatureCount() != 0:
-        return 'fail'
+    assert sql_lyr.GetFeatureCount() == 0
     out_ds.ReleaseResultSet(sql_lyr)
     out_ds = None
 
@@ -1826,18 +1595,11 @@ def test_gpkg_19():
     ds = None
 
     out_ds = gdal.OpenEx('/vsimem/tmp.gpkg', gdal.OF_RASTER, open_options=['BAND_COUNT=1'])
-    if out_ds.GetRasterBand(1).GetOverview(0).GetColorTable() is None:
-        return 'fail'
+    assert out_ds.GetRasterBand(1).GetOverview(0).GetColorTable() is not None
     got_cs = [out_ds.GetRasterBand(i + 1).GetOverview(0).Checksum() for i in range(1)]
-    if got_cs != expected_cs_ov0:
-        print(got_cs)
-        print(expected_cs_ov0)
-        return 'fail'
+    assert got_cs == expected_cs_ov0
     got_cs = [out_ds.GetRasterBand(i + 1).GetOverview(1).Checksum() for i in range(1)]
-    if got_cs != expected_cs_ov1:
-        print(got_cs)
-        print(expected_cs_ov1)
-        return 'fail'
+    assert got_cs == expected_cs_ov1
     check_tile_format(out_ds, 'PNG', 1, True, zoom_level=1)
     check_tile_format(out_ds, 'PNG', 4, False, zoom_level=0)
     out_ds = None
@@ -1867,10 +1629,7 @@ def test_gpkg_20():
     out_ds = gdal.OpenEx('/vsimem/tmp.gpkg', gdal.OF_RASTER)
     got_cs = [out_ds.GetRasterBand(i + 1).Checksum() for i in range(4)]
     expected_cs = [30875, 31451, 38110, 64269]
-    if got_cs != expected_cs:
-        print(got_cs)
-        print(expected_cs)
-        return 'fail'
+    assert got_cs == expected_cs
     check_tile_format(out_ds, 'PNG', 1, True)
     out_ds = None
     gdal.Unlink('/vsimem/tmp.gpkg')
@@ -1884,10 +1643,7 @@ def test_gpkg_20():
     out_ds = gdal.OpenEx('/vsimem/tmp.gpkg', gdal.OF_RASTER)
     got_cs = [out_ds.GetRasterBand(i + 1).Checksum() for i in range(4)]
     expected_cs = [27001, 30168, 34800, 64269]
-    if got_cs != expected_cs:
-        print(got_cs)
-        print(expected_cs)
-        return 'fail'
+    assert got_cs == expected_cs
     check_tile_format(out_ds, 'PNG', 1, True)
     out_ds = None
     gdal.Unlink('/vsimem/tmp.gpkg')
@@ -1901,10 +1657,7 @@ def test_gpkg_20():
     out_ds = gdal.OpenEx('/vsimem/tmp.gpkg', gdal.OF_RASTER)
     got_cs = [out_ds.GetRasterBand(i + 1).Checksum() for i in range(4)]
     expected_cs = [27718, 31528, 42062, 64269]
-    if got_cs != expected_cs:
-        print(got_cs)
-        print(expected_cs)
-        return 'fail'
+    assert got_cs == expected_cs
     check_tile_format(out_ds, 'PNG', 1, True)
     check_tile_format(out_ds, 'PNG', 4, False, row=0, col=2)
     out_ds = None
@@ -1924,15 +1677,11 @@ def test_gpkg_20():
     out_ds = gdal.OpenEx('/vsimem/tmp.gpkg', gdal.OF_RASTER)
     got_cs = [out_ds.GetRasterBand(i + 1).Checksum() for i in range(4)]
     expected_cs = [2500, 5000, 7500, 30658]
-    if got_cs != expected_cs:
-        print(got_cs)
-        print(expected_cs)
-        return 'fail'
+    assert got_cs == expected_cs
     check_tile_format(out_ds, 'PNG', 1, True)
     out_ds = None
     out_ds = gdal.OpenEx('/vsimem/tmp.gpkg', gdal.OF_RASTER, open_options=['BAND_COUNT=1'])
-    if out_ds.GetRasterBand(1).GetColorTable().GetCount() != 1:
-        return 'fail'
+    assert out_ds.GetRasterBand(1).GetColorTable().GetCount() == 1
     out_ds = None
     gdal.Unlink('/vsimem/tmp.gpkg')
 
@@ -1954,9 +1703,7 @@ def test_gpkg_21():
     out_ds = gdaltest.gpkg_dr.Create('/vsimem/tmp.gpkg', 1, 1)
     out_ds.SetGeoTransform([0, 1, 0, 0, 0, -1])
     mddlist = out_ds.GetMetadataDomainList()
-    if len(mddlist) != 3:
-        print(mddlist)
-        return 'fail'
+    assert len(mddlist) == 3
     out_ds = None
 
     out_ds = gdal.Open('/vsimem/tmp.gpkg', gdal.GA_Update)
@@ -1966,8 +1713,7 @@ def test_gpkg_21():
     feat = sql_lyr.GetNextFeature()
     out_ds.ReleaseResultSet(sql_lyr)
     feat_is_none = feat is None
-    if not feat_is_none:
-        return 'fail'
+    assert feat_is_none
 
     # Set a metadata item now
     out_ds.SetMetadataItem('foo', 'bar')
@@ -1978,8 +1724,7 @@ def test_gpkg_21():
 
         out_ds = gdal.Open('/vsimem/tmp.gpkg', gdal.GA_Update)
 
-        if out_ds.GetMetadata('GEOPACKAGE'):
-            return 'fail'
+        assert not out_ds.GetMetadata('GEOPACKAGE')
         if out_ds.GetMetadataItem('foo') != foo_value:
             print(out_ds.GetMetadataItem('foo'))
             feat.DumpReadable()
@@ -2057,10 +1802,8 @@ def test_gpkg_21():
 
     # Still no metadata
     out_ds = gdal.Open('/vsimem/tmp.gpkg', gdal.GA_Update)
-    if out_ds.GetMetadataItem('IDENTIFIER') != 'my_identifier':
-        return 'fail'
-    if out_ds.GetMetadataItem('DESCRIPTION') != 'my_description':
-        return 'fail'
+    assert out_ds.GetMetadataItem('IDENTIFIER') == 'my_identifier'
+    assert out_ds.GetMetadataItem('DESCRIPTION') == 'my_description'
     sql_lyr = out_ds.ExecuteSQL('SELECT * FROM gpkg_metadata')
     feat = sql_lyr.GetNextFeature()
     if feat is not None:
@@ -2083,8 +1826,7 @@ def test_gpkg_21():
 
     out_ds = gdal.Open('/vsimem/tmp.gpkg', gdal.GA_Update)
 
-    if out_ds.GetMetadataItem('bar', 'GEOPACKAGE') != 'foo':
-        return 'fail'
+    assert out_ds.GetMetadataItem('bar', 'GEOPACKAGE') == 'foo'
 
     sql_lyr = out_ds.ExecuteSQL('SELECT * FROM gpkg_metadata')
     feat = sql_lyr.GetNextFeature()
@@ -2120,14 +1862,12 @@ def test_gpkg_21():
     out_ds = None
 
     out_ds = gdal.Open('/vsimem/tmp.gpkg', gdal.GA_Update)
-    if out_ds.GetMetadataItem('bar', 'GEOPACKAGE') != 'baz':
-        return 'fail'
+    assert out_ds.GetMetadataItem('bar', 'GEOPACKAGE') == 'baz'
     out_ds.SetMetadata(None, 'GEOPACKAGE')
     out_ds = None
 
     out_ds = gdal.Open('/vsimem/tmp.gpkg', gdal.GA_Update)
-    if out_ds.GetMetadata('GEOPACKAGE'):
-        return 'fail'
+    assert not out_ds.GetMetadata('GEOPACKAGE')
 
     out_ds.SetMetadataItem('1', '2')
     out_ds.SetMetadataItem('3', '4', 'CUSTOM_DOMAIN')
@@ -2145,24 +1885,17 @@ def test_gpkg_21():
 
     for i in range(2):
         out_ds = gdal.Open('/vsimem/tmp.gpkg', gdal.GA_Update)
-        if out_ds.GetMetadataItem('1') != '2':
-            return 'fail'
-        if out_ds.GetMetadataItem('GPKG_METADATA_ITEM_1') != 'my_metadata_local':
-            print(out_ds.GetMetadata())
-            return 'fail'
-        if out_ds.GetMetadataItem('GPKG_METADATA_ITEM_2') != 'other_metadata_local':
-            print(out_ds.GetMetadata())
-            return 'fail'
-        if out_ds.GetMetadataItem('GPKG_METADATA_ITEM_1', 'GEOPACKAGE') != 'my_metadata':
-            print(out_ds.GetMetadata('GEOPACKAGE'))
-            return 'fail'
-        if out_ds.GetMetadataItem('GPKG_METADATA_ITEM_2', 'GEOPACKAGE') != 'other_metadata':
-            print(out_ds.GetMetadata('GEOPACKAGE'))
-            return 'fail'
-        if out_ds.GetMetadataItem('3', 'CUSTOM_DOMAIN') != '4':
-            return 'fail'
-        if out_ds.GetMetadataItem('6', 'GEOPACKAGE') != '7':
-            return 'fail'
+        assert out_ds.GetMetadataItem('1') == '2'
+        assert out_ds.GetMetadataItem('GPKG_METADATA_ITEM_1') == 'my_metadata_local', \
+            out_ds.GetMetadata()
+        assert out_ds.GetMetadataItem('GPKG_METADATA_ITEM_2') == 'other_metadata_local', \
+            out_ds.GetMetadata()
+        assert out_ds.GetMetadataItem('GPKG_METADATA_ITEM_1', 'GEOPACKAGE') == 'my_metadata', \
+            out_ds.GetMetadata('GEOPACKAGE')
+        assert out_ds.GetMetadataItem('GPKG_METADATA_ITEM_2', 'GEOPACKAGE') == 'other_metadata', \
+            out_ds.GetMetadata('GEOPACKAGE')
+        assert out_ds.GetMetadataItem('3', 'CUSTOM_DOMAIN') == '4'
+        assert out_ds.GetMetadataItem('6', 'GEOPACKAGE') == '7'
         out_ds.SetMetadata(out_ds.GetMetadata())
         out_ds.SetMetadata(out_ds.GetMetadata('GEOPACKAGE'), 'GEOPACKAGE')
         out_ds = None
@@ -2174,9 +1907,8 @@ def test_gpkg_21():
     out_ds = None
 
     out_ds = gdal.Open('/vsimem/tmp.gpkg', gdal.GA_Update)
-    if out_ds.GetMetadataItem('GPKG_METADATA_ITEM_1', 'GEOPACKAGE') != 'my_metadata':
-        print(out_ds.GetMetadata())
-        return 'fail'
+    assert out_ds.GetMetadataItem('GPKG_METADATA_ITEM_1', 'GEOPACKAGE') == 'my_metadata', \
+        out_ds.GetMetadata()
     sql_lyr = out_ds.ExecuteSQL('SELECT * FROM gpkg_metadata WHERE id < 10')
     feat = sql_lyr.GetNextFeature()
     if feat is not None:
@@ -2256,26 +1988,20 @@ def test_gpkg_22(tile_drv_name='PNG'):
     out_ds = gdal.OpenEx('/vsimem/tmp.gpkg', open_options=['BAND_COUNT=2'])
     got_cs = [out_ds.GetRasterBand(i + 1).Checksum() for i in range(2)]
     if got_cs != expected_cs:
-        if tile_drv_name != 'WEBP' or got_cs not in ([4899, 10807], [6274, 10807], [17638, 10807]):
-            print('Got %s, expected %s' % (str(got_cs), str(expected_cs)))
-            return 'fail'
+        assert tile_drv_name == 'WEBP' and got_cs in ([4899, 10807], [6274, 10807], [17638, 10807])
     out_ds = None
 
     out_ds = gdal.Open('/vsimem/tmp.gpkg')
     got_cs = [out_ds.GetRasterBand(i + 1).Checksum() for i in range(4)]
     expected_cs = [expected_cs[0], expected_cs[0], expected_cs[0], expected_cs[1]]
     if got_cs != expected_cs:
-        if tile_drv_name != 'WEBP' or got_cs not in ([4899, 4899, 4899, 10807], [4899, 4984, 4899, 10807], [6274, 6274, 6274, 10807], [17638, 17631, 17638, 10807]):
-            print('Got %s, expected %s' % (str(got_cs), str(expected_cs)))
-            return 'fail'
+        assert tile_drv_name == 'WEBP' and got_cs in ([4899, 4899, 4899, 10807], [4899, 4984, 4899, 10807], [6274, 6274, 6274, 10807], [17638, 17631, 17638, 10807])
     out_ds = None
 
     ds = gdal.OpenEx('/vsimem/tmp.gpkg', open_options=['USE_TILE_EXTENT=YES'])
     got_cs = [ds.GetRasterBand(i + 1).Checksum() for i in range(4)]
     if got_cs != clamped_expected_cs:
-        if tile_drv_name != 'WEBP' or got_cs not in ([5266, 5266, 5266, 11580], [5266, 5310, 5266, 11580], [6436, 6436, 6436, 11580], [17007, 17000, 17007, 11580]):
-            print('Got %s, expected %s' % (str(got_cs), str(clamped_expected_cs)))
-            return 'fail'
+        assert tile_drv_name == 'WEBP' and got_cs in ([5266, 5266, 5266, 11580], [5266, 5310, 5266, 11580], [6436, 6436, 6436, 11580], [17007, 17000, 17007, 11580])
     ds = None
 
     gdal.Unlink('/vsimem/tmp.gpkg')
@@ -2337,15 +2063,13 @@ def test_gpkg_26():
         ds = None
 
         ds = gdal.Open('/vsimem/tmp.gpkg')
-        if ds.GetMetadataItem('AREA_OR_POINT') != 'Area':
-            return 'fail'
+        assert ds.GetMetadataItem('AREA_OR_POINT') == 'Area'
         got_cs = [ds.GetRasterBand(i + 1).Checksum() for i in range(4)]
         # VC12 returns [3561, 3561, 3561, 3691] for GoogleCRS84Quad
         # and For GoogleCRS84Quad RESAMPLING=CUBIC, got [3415, 3415, 3415, 3691]
         if max([abs(got_cs[i] - expected_cs[i]) for i in range(4)]) > 2:
             print('For %s, got %s, expected %s' % (scheme, str(got_cs), str(expected_cs)))
-            if gdal.GetConfigOption('APPVEYOR') is None:
-                return 'fail'
+            assert gdal.GetConfigOption('APPVEYOR') is not None
         ds = None
 
         gdal.Unlink('/vsimem/tmp.gpkg')
@@ -2366,8 +2090,7 @@ def test_gpkg_26():
         got_cs = [ds.GetRasterBand(i + 1).Checksum() for i in range(4)]
         if got_cs not in expected_cs:
             print('For %s, got %s, expected %s' % (scheme, str(got_cs), str(expected_cs)))
-            if gdal.GetConfigOption('APPVEYOR') is None:
-                return 'fail'
+            assert gdal.GetConfigOption('APPVEYOR') is not None
         ds = None
 
         gdal.Unlink('/vsimem/tmp.gpkg')
@@ -2376,26 +2099,22 @@ def test_gpkg_26():
     gdal.PushErrorHandler()
     ds = gdaltest.gpkg_dr.Create('/vsimem/tmp.gpkg', 1, 1, 1, options=['TILING_SCHEME=GoogleCRS84Quad', 'BLOCKSIZE=128'])
     gdal.PopErrorHandler()
-    if ds is not None:
-        return 'fail'
+    assert ds is None
     gdal.Unlink('/vsimem/tmp.gpkg')
 
     ds = gdaltest.gpkg_dr.Create('/vsimem/tmp.gpkg', 1, 1, 1, options=['TILING_SCHEME=GoogleCRS84Quad'])
     # Test that implicit SRS registration works.
-    if ds.GetProjectionRef().find('4326') < 0:
-        return 'fail'
+    assert ds.GetProjectionRef().find('4326') >= 0
     gdal.PushErrorHandler()
     ret = ds.SetGeoTransform([0, 10, 0, 0, 0, -10])
     gdal.PopErrorHandler()
-    if ret == 0:
-        return 'fail'
+    assert ret != 0
     srs = osr.SpatialReference()
     srs.ImportFromEPSG(32630)
     gdal.PushErrorHandler()
     ret = ds.SetProjection(srs.ExportToWkt())
     gdal.PopErrorHandler()
-    if ret == 0:
-        return 'fail'
+    assert ret != 0
     gdal.PushErrorHandler()
     ds = None
     gdal.PopErrorHandler()
@@ -2407,24 +2126,21 @@ def test_gpkg_26():
     gdal.PushErrorHandler()
     ds = gdaltest.gpkg_dr.CreateCopy('/foo/tmp.gpkg', src_ds, options=['TILING_SCHEME=invalid'])
     gdal.PopErrorHandler()
-    if ds is not None:
-        return 'fail'
+    assert ds is None
 
     # Invalid target filename
     src_ds = gdal.Open('data/byte.tif')
     gdal.PushErrorHandler()
     ds = gdaltest.gpkg_dr.CreateCopy('/foo/tmp.gpkg', src_ds, options=['TILING_SCHEME=GoogleCRS84Quad'])
     gdal.PopErrorHandler()
-    if ds is not None:
-        return 'fail'
+    assert ds is None
 
     # Source is not georeferenced
     src_ds = gdal.Open('../gcore/data/stefan_full_rgba.tif')
     gdal.PushErrorHandler()
     ds = gdaltest.gpkg_dr.CreateCopy('/vsimem/tmp.gpkg', src_ds, options=['TILING_SCHEME=GoogleCRS84Quad'])
     gdal.PopErrorHandler()
-    if ds is not None:
-        return 'fail'
+    assert ds is None
 
     return 'success'
 
@@ -2449,9 +2165,7 @@ def test_gpkg_27():
 
     expected_cs = [src_ds.GetRasterBand(i + 1).Checksum() for i in range(3)]
     got_cs = [out_ds.GetRasterBand(i + 1).Checksum() for i in range(3)]
-    if got_cs != expected_cs:
-        print('Got %s, expected %s' % (str(got_cs), str(expected_cs)))
-        return 'fail'
+    assert got_cs == expected_cs
 
     return 'success'
 
@@ -2492,9 +2206,7 @@ def test_gpkg_28():
     out_ds = None
     out_ds = gdal.OpenEx('/vsimem/tmp.gpkg', open_options=['BAND_COUNT=3'])
     got_cs = [out_ds.GetRasterBand(i + 1).Checksum() for i in range(3)]
-    if got_cs != expected_cs:
-        print('Got %s, expected %s' % (str(got_cs), str(expected_cs)))
-        return 'fail'
+    assert got_cs == expected_cs
 
     return 'success'
 
@@ -2536,9 +2248,7 @@ def test_gpkg_29(x=0):
     out_ds = None
     out_ds = gdal.OpenEx('/vsimem/tmp.gpkg', open_options=['BAND_COUNT=3'])
     got_cs = [out_ds.GetRasterBand(i + 1).Checksum() for i in range(3)]
-    if got_cs != expected_cs:
-        print('Got %s, expected %s' % (str(got_cs), str(expected_cs)))
-        return 'fail'
+    assert got_cs == expected_cs
 
     return 'success'
 
@@ -2573,9 +2283,7 @@ def test_gpkg_31():
     check_tile_format(ds, 'PNG', 4, False)
     expected_cs = [4672, 4672, 4672, 4873]
     got_cs = [ds.GetRasterBand(i + 1).Checksum() for i in range(4)]
-    if got_cs != expected_cs:
-        print('Got %s, expected %s' % (str(got_cs), str(expected_cs)))
-        return 'fail'
+    assert got_cs == expected_cs
 
     return 'success'
 
@@ -2602,16 +2310,12 @@ def test_gpkg_32():
     check_tile_format(ds, 'PNG', 4, False)
     expected_cs = [1970, 1970, 1970, 10807]
     got_cs = [ds.GetRasterBand(i + 1).Checksum() for i in range(ds.RasterCount)]
-    if got_cs != expected_cs:
-        print('Got %s, expected %s' % (str(got_cs), str(expected_cs)))
-        return 'fail'
+    assert got_cs == expected_cs
 
     ds = gdal.OpenEx('/vsimem/tmp.gpkg', open_options=['BAND_COUNT=2'])
     expected_cs = [1970, 10807]
     got_cs = [ds.GetRasterBand(i + 1).Checksum() for i in range(ds.RasterCount)]
-    if got_cs != expected_cs:
-        print('Got %s, expected %s' % (str(got_cs), str(expected_cs)))
-        return 'fail'
+    assert got_cs == expected_cs
 
     return 'success'
 
@@ -2640,9 +2344,7 @@ def test_gpkg_33():
     check_tile_format(ds, 'PNG', 4, False)
     expected_cs = [10991, 57677, 34965, 10638]
     got_cs = [ds.GetRasterBand(i + 1).Checksum() for i in range(4)]
-    if got_cs != expected_cs:
-        print('Got %s, expected %s' % (str(got_cs), str(expected_cs)))
-        return 'fail'
+    assert got_cs == expected_cs
 
     return 'success'
 
@@ -2670,8 +2372,7 @@ def test_gpkg_34():
     gdal.ErrorReset()
     ds.BuildOverviews('NEAR', [2])
     ds = None
-    if gdal.GetLastErrorMsg() != '':
-        return 'fail'
+    assert gdal.GetLastErrorMsg() == ''
 
     return 'success'
 
@@ -2721,8 +2422,7 @@ def test_gpkg_35():
 
     gdal.SetCacheMax(oldSize)
 
-    if got_data != expected_data:
-        return 'fail'
+    assert got_data == expected_data
 
     return 'success'
 
@@ -2745,12 +2445,9 @@ def test_gpkg_36():
     expected_cs = [993, 50461, 64354, 17849]
     out_ds = gdal.Open('/vsimem/gpkg_36.gpkg')
     got_cs = [out_ds.GetRasterBand(i + 1).Checksum() for i in range(4)]
-    if got_cs != expected_cs:
-        print('Got %s, expected %s' % (str(got_cs), str(expected_cs)))
-        return 'fail'
+    assert got_cs == expected_cs
     got_ct = out_ds.GetRasterBand(1).GetColorTable()
-    if got_ct is not None:
-        return 'fail'
+    assert got_ct is None
     out_ds = None
 
     gdal.Unlink('/vsimem/gpkg_36.gpkg')
@@ -2773,8 +2470,7 @@ def test_gpkg_37():
 
     ds = gdal.Open('/vsimem/gpkg_37.gpkg', gdal.GA_Update)
     ret = ds.BuildOverviews('NONE', [2, 4, 8, 16, 32, 64, 128, 256, 512, 1024, 2048])
-    if ret != 0 or gdal.GetLastErrorMsg() != '':
-        return 'fail'
+    assert ret == 0 and gdal.GetLastErrorMsg() == ''
     ds = None
 
     gdal.Unlink('/vsimem/gpkg_37.gpkg')
@@ -2794,8 +2490,7 @@ def test_gpkg_38():
     gdaltest.gpkg_dr.CreateCopy('/vsimem/gpkg_38.gpkg', src_ds, options=['TILE_FORMAT=PNG', 'BLOCKSIZE=8'])
 
     ds = gdal.Open('/vsimem/gpkg_38.gpkg')
-    if ds.GetRasterBand(1).Checksum() != src_ds.GetRasterBand(1).Checksum():
-        return 'fail'
+    assert ds.GetRasterBand(1).Checksum() == src_ds.GetRasterBand(1).Checksum()
     ds = None
     filesize = gdal.VSIStatL('/vsimem/gpkg_38.gpkg').size
     gdal.Unlink('/vsimem/gpkg_38.gpkg')
@@ -2806,8 +2501,7 @@ def test_gpkg_38():
         ds_is_none = ds is None
         ds = None
     gdal.Unlink(filename)
-    if not ds_is_none and gdal.GetLastErrorMsg() == '':
-        return 'fail'
+    assert ds_is_none or gdal.GetLastErrorMsg() != ''
 
     filename = '/vsimem/||maxlength=%d||gpkg_38.gpkg' % (filesize - 1)
     with gdaltest.error_handler():
@@ -2815,8 +2509,7 @@ def test_gpkg_38():
         ds_is_none = ds is None
         ds = None
     gdal.Unlink(filename)
-    if not ds_is_none and gdal.GetLastErrorMsg() == '':
-        return 'fail'
+    assert ds_is_none or gdal.GetLastErrorMsg() != ''
 
     return 'success'
 
@@ -2832,25 +2525,19 @@ def test_gpkg_39():
     src_ds = gdal.Open('data/int16.tif')
     gdal.Translate('/vsimem/gpkg_39.gpkg', src_ds, format='GPKG')
 
-    if not validate('/vsimem/gpkg_39.gpkg'):
-        gdaltest.post_reason('validation failed')
-        return 'fail'
+    assert validate('/vsimem/gpkg_39.gpkg'), 'validation failed'
 
     ds = gdal.Open('/vsimem/gpkg_39.gpkg')
 
     # Check there a ogr_empty_table
     sql_lyr = ds.ExecuteSQL("SELECT COUNT(*) FROM sqlite_master WHERE name = 'ogr_empty_table'")
     f = sql_lyr.GetNextFeature()
-    if f.GetField(0) != 1:
-        return 'fail'
+    assert f.GetField(0) == 1
     ds.ReleaseResultSet(sql_lyr)
 
-    if ds.GetRasterBand(1).DataType != gdal.GDT_Int16:
-        return 'fail'
-    if ds.GetRasterBand(1).Checksum() != 4672:
-        return 'fail'
-    if ds.GetMetadataItem('AREA_OR_POINT') != 'Area':
-        return 'fail'
+    assert ds.GetRasterBand(1).DataType == gdal.GDT_Int16
+    assert ds.GetRasterBand(1).Checksum() == 4672
+    assert ds.GetMetadataItem('AREA_OR_POINT') == 'Area'
     sql_lyr = ds.ExecuteSQL('SELECT scale, offset FROM gpkg_2d_gridded_tile_ancillary')
     f = sql_lyr.GetNextFeature()
     if f['scale'] != 1.0:
@@ -2873,8 +2560,7 @@ def test_gpkg_39():
     feat = sql_lyr.GetNextFeature()
     ds.ReleaseResultSet(sql_lyr)
     feat_is_none = feat is None
-    if not feat_is_none:
-        return 'fail'
+    assert feat_is_none
 
     sql_lyr = ds.ExecuteSQL('PRAGMA application_id')
     f = sql_lyr.GetNextFeature()
@@ -2891,20 +2577,14 @@ def test_gpkg_39():
 
     # Statistics not available on partial tile without nodata
     md = ds.GetRasterBand(1).GetMetadata()
-    if md != {}:
-        print(md)
-        return 'fail'
+    assert md == {}
     ds = None
 
     # From a AREA_OR_POINT=Point dataset
     gdal.Translate('/vsimem/gpkg_39.gpkg', 'data/n43.dt0', format='GPKG')
     ds = gdal.Open('/vsimem/gpkg_39.gpkg')
-    if ds.GetMetadataItem('AREA_OR_POINT') != 'Point':
-        print(ds.GetMetadata())
-        return 'fail'
-    if ds.GetRasterBand(1).GetUnitType() != 'm':
-        print(ds.GetRasterBand(1).GetUnitType())
-        return 'fail'
+    assert ds.GetMetadataItem('AREA_OR_POINT') == 'Point', ds.GetMetadata()
+    assert ds.GetRasterBand(1).GetUnitType() == 'm'
     ds = None
 
     # Test GRID_CELL_ENCODING=grid-value-is-corner
@@ -2912,20 +2592,15 @@ def test_gpkg_39():
                    outputType=gdal.GDT_UInt16,
                    creationOptions=['GRID_CELL_ENCODING=grid-value-is-corner'])
     ds = gdal.Open('/vsimem/gpkg_39.gpkg')
-    if ds.GetMetadataItem('AREA_OR_POINT') != 'Point':
-        print(ds.GetMetadata())
-        return 'fail'
-    if ds.GetRasterBand(1).GetMetadataItem('GRID_CELL_ENCODING') != 'grid-value-is-corner':
-        print(ds.GetRasterBand(1).GetMetadataItem())
-        return 'fail'
+    assert ds.GetMetadataItem('AREA_OR_POINT') == 'Point', ds.GetMetadata()
+    assert ds.GetRasterBand(1).GetMetadataItem('GRID_CELL_ENCODING') == 'grid-value-is-corner'
 
     # No metadata for now
     sql_lyr = ds.ExecuteSQL("SELECT 1 FROM sqlite_master WHERE name = 'gpkg_metadata'")
     feat = sql_lyr.GetNextFeature()
     ds.ReleaseResultSet(sql_lyr)
     feat_is_none = feat is None
-    if not feat_is_none:
-        return 'fail'
+    assert feat_is_none
 
     ds = None
 
@@ -2934,16 +2609,12 @@ def test_gpkg_39():
 
     ds = gdal.Open('/vsimem/gpkg_39.gpkg')
     md = ds.GetRasterBand(1).GetMetadata()
-    if md != {'STATISTICS_MINIMUM': '74', 'STATISTICS_MAXIMUM': '255'}:
-        print(md)
-        return 'fail'
+    assert md == {'STATISTICS_MINIMUM': '74', 'STATISTICS_MAXIMUM': '255'}
     ds = None
 
     ds = gdal.Open('/vsimem/gpkg_39.gpkg')
     mdi = ds.GetRasterBand(1).GetMetadataItem('STATISTICS_MINIMUM')
-    if mdi != '74':
-        print(mdi)
-        return 'fail'
+    assert mdi == '74'
     ds = None
 
     # Entire tile: statistics available
@@ -2951,137 +2622,97 @@ def test_gpkg_39():
 
     ds = gdal.Open('/vsimem/gpkg_39.gpkg')
     md = ds.GetRasterBand(1).GetMetadata()
-    if md != {'STATISTICS_MINIMUM': '74', 'STATISTICS_MAXIMUM': '255'}:
-        print(md)
-        return 'fail'
+    assert md == {'STATISTICS_MINIMUM': '74', 'STATISTICS_MAXIMUM': '255'}
     ds = None
 
     ds = gdal.Open('/vsimem/gpkg_39.gpkg')
     mdi = ds.GetRasterBand(1).GetMetadataItem('STATISTICS_MINIMUM')
-    if mdi != '74':
-        print(mdi)
-        return 'fail'
+    assert mdi == '74'
     ds = None
 
     gdal.Translate('/vsimem/gpkg_39.gpkg', src_ds, format='GPKG', noData=1)
     ds = gdal.Open('/vsimem/gpkg_39.gpkg')
-    if ds.GetRasterBand(1).Checksum() != 4672:
-        return 'fail'
-    if ds.GetRasterBand(1).GetNoDataValue() != -32768.0:
-        print(ds.GetRasterBand(1).GetNoDataValue())
-        return 'fail'
+    assert ds.GetRasterBand(1).Checksum() == 4672
+    assert ds.GetRasterBand(1).GetNoDataValue() == -32768.0
 
     gdal.Translate('/vsimem/gpkg_39.gpkg', src_ds, format='GPKG', noData=74)
     ds = gdal.Open('/vsimem/gpkg_39.gpkg')
     cs = ds.GetRasterBand(1).Checksum()
-    if cs != 4649:
-        print(cs)
-        return 'fail'
-    if ds.GetRasterBand(1).GetNoDataValue() != -32768.0:
-        print(ds.GetRasterBand(1).GetNoDataValue())
-        return 'fail'
+    assert cs == 4649
+    assert ds.GetRasterBand(1).GetNoDataValue() == -32768.0
 
     gdal.Translate('/vsimem/gpkg_39.gpkg', src_ds, format='GPKG', noData=1, creationOptions=['TILING_SCHEME=GoogleMapsCompatible'])
     ds = gdal.Open('/vsimem/gpkg_39.gpkg')
     cs = ds.GetRasterBand(1).Checksum()
-    if cs != 4118 and cs != 4077:
-        print(cs)
-        return 'fail'
+    assert cs == 4118 or cs == 4077
 
     gdal.SetConfigOption('GPKG_ADD_DEFINITION_12_063', 'YES')
     gdal.Translate('/vsimem/gpkg_39.gpkg', src_ds, format='GPKG', noData=1, creationOptions=['TILING_SCHEME=GoogleMapsCompatible'])
     gdal.SetConfigOption('GPKG_ADD_DEFINITION_12_063', None)
     ds = gdal.Open('/vsimem/gpkg_39.gpkg')
     cs = ds.GetRasterBand(1).Checksum()
-    if cs != 4118 and cs != 4077:
-        print(cs)
-        return 'fail'
+    assert cs == 4118 or cs == 4077
 
     gdal.Translate('/vsimem/gpkg_39.gpkg', src_ds, format='GPKG', width=1024, height=1024)
     ds = gdal.Open('/vsimem/gpkg_39.gpkg', gdal.GA_Update)
     ds.BuildOverviews('NEAR', [2, 4])
-    if ds.GetRasterBand(1).GetOverview(0).Checksum() != 37308:
-        print(ds.GetRasterBand(1).GetOverview(0).Checksum())
-        return 'fail'
+    assert ds.GetRasterBand(1).GetOverview(0).Checksum() == 37308
     ds.BuildOverviews('NONE', [])
     ds = gdal.Open('/vsimem/gpkg_39.gpkg')
-    if ds.GetRasterBand(1).GetOverviewCount() != 0:
-        return 'fail'
+    assert ds.GetRasterBand(1).GetOverviewCount() == 0
 
     gdal.Translate('/vsimem/gpkg_39.gpkg', src_ds, format='GPKG', outputType=gdal.GDT_UInt16)
     ds = gdal.Open('/vsimem/gpkg_39.gpkg')
-    if ds.GetRasterBand(1).DataType != gdal.GDT_UInt16:
-        return 'fail'
-    if ds.GetRasterBand(1).Checksum() != 4672:
-        return 'fail'
+    assert ds.GetRasterBand(1).DataType == gdal.GDT_UInt16
+    assert ds.GetRasterBand(1).Checksum() == 4672
     sql_lyr = ds.ExecuteSQL('SELECT scale, offset FROM gpkg_2d_gridded_tile_ancillary')
     f = sql_lyr.GetNextFeature()
-    if f['scale'] != 1.0:
-        return 'fail'
+    assert f['scale'] == 1.0
     ds.ReleaseResultSet(sql_lyr)
 
     gdal.Translate('/vsimem/gpkg_39.gpkg', src_ds, format='GPKG', outputType=gdal.GDT_UInt16, noData=1)
     ds = gdal.Open('/vsimem/gpkg_39.gpkg')
-    if ds.GetRasterBand(1).Checksum() != 4672:
-        return 'fail'
-    if ds.GetRasterBand(1).GetNoDataValue() != 1.0:
-        print(ds.GetRasterBand(1).GetNoDataValue())
-        return 'fail'
+    assert ds.GetRasterBand(1).Checksum() == 4672
+    assert ds.GetRasterBand(1).GetNoDataValue() == 1.0
 
     gdal.Translate('/vsimem/gpkg_39.gpkg', src_ds, format='GPKG', outputType=gdal.GDT_UInt16, noData=74)
     ds = gdal.Open('/vsimem/gpkg_39.gpkg')
     cs = ds.GetRasterBand(1).Checksum()
-    if cs != 4672:
-        print(cs)
-        return 'fail'
-    if ds.GetRasterBand(1).GetNoDataValue() != 74.0:
-        print(ds.GetRasterBand(1).GetNoDataValue())
-        return 'fail'
+    assert cs == 4672
+    assert ds.GetRasterBand(1).GetNoDataValue() == 74.0
 
     src_ds = gdal.Open('data/float32.tif')
     gdal.Translate('/vsimem/gpkg_39.gpkg', src_ds, format='GPKG')
     ds = gdal.Open('/vsimem/gpkg_39.gpkg')
-    if ds.GetRasterBand(1).DataType != gdal.GDT_Float32:
-        return 'fail'
-    if ds.GetRasterBand(1).Checksum() != 4672:
-        return 'fail'
+    assert ds.GetRasterBand(1).DataType == gdal.GDT_Float32
+    assert ds.GetRasterBand(1).Checksum() == 4672
     sql_lyr = ds.ExecuteSQL('SELECT scale, offset FROM gpkg_2d_gridded_tile_ancillary')
     f = sql_lyr.GetNextFeature()
-    if f.GetField('scale') != 1.0:
-        return 'fail'
+    assert f.GetField('scale') == 1.0
     ds.ReleaseResultSet(sql_lyr)
 
     gdal.Translate('/vsimem/gpkg_39.gpkg', src_ds, format='GPKG', noData=1)
     ds = gdal.Open('/vsimem/gpkg_39.gpkg')
-    if ds.GetRasterBand(1).Checksum() != 4672:
-        return 'fail'
-    if ds.GetRasterBand(1).GetNoDataValue() != 1:
-        return 'fail'
+    assert ds.GetRasterBand(1).Checksum() == 4672
+    assert ds.GetRasterBand(1).GetNoDataValue() == 1
 
     gdal.Translate('/vsimem/gpkg_39.gpkg', src_ds, format='GPKG', creationOptions=['TILE_FORMAT=PNG'])
     ds = gdal.Open('/vsimem/gpkg_39.gpkg')
-    if ds.GetRasterBand(1).DataType != gdal.GDT_Float32:
-        return 'fail'
-    if ds.GetRasterBand(1).Checksum() != 4672:
-        return 'fail'
+    assert ds.GetRasterBand(1).DataType == gdal.GDT_Float32
+    assert ds.GetRasterBand(1).Checksum() == 4672
     sql_lyr = ds.ExecuteSQL('SELECT scale, offset FROM gpkg_2d_gridded_tile_ancillary')
     f = sql_lyr.GetNextFeature()
-    if f['scale'] == 1.0 or not f.IsFieldSetAndNotNull('scale'):
-        return 'fail'
+    assert f['scale'] != 1.0 and f.IsFieldSetAndNotNull('scale')
     ds.ReleaseResultSet(sql_lyr)
 
     gdal.Translate('/vsimem/gpkg_39.gpkg', src_ds, format='GPKG', noData=74, creationOptions=['TILE_FORMAT=PNG'])
     ds = gdal.Open('/vsimem/gpkg_39.gpkg')
-    if ds.GetRasterBand(1).DataType != gdal.GDT_Float32:
-        return 'fail'
+    assert ds.GetRasterBand(1).DataType == gdal.GDT_Float32
     cs = ds.GetRasterBand(1).Checksum()
-    if cs != 4680:
-        print(cs)
-        return 'fail'
+    assert cs == 4680
     sql_lyr = ds.ExecuteSQL('SELECT scale, offset FROM gpkg_2d_gridded_tile_ancillary')
     f = sql_lyr.GetNextFeature()
-    if f['scale'] == 1.0 or not f.IsFieldSetAndNotNull('scale'):
-        return 'fail'
+    assert f['scale'] != 1.0 and f.IsFieldSetAndNotNull('scale')
     ds.ReleaseResultSet(sql_lyr)
 
     # Particular case with nodata = -32768 for Int16
@@ -3096,14 +2727,10 @@ def test_gpkg_39():
     gdal.Translate('/vsimem/gpkg_39.gpkg', '/vsimem/gpkg_39.asc', format='GPKG', outputType=gdal.GDT_Int16)
     src_ds = gdal.Open('/vsimem/gpkg_39.asc')
     ds = gdal.Open('/vsimem/gpkg_39.gpkg')
-    if ds.GetRasterBand(1).DataType != gdal.GDT_Int16:
-        return 'fail'
-    if ds.GetRasterBand(1).GetNoDataValue() != -32768.0:
-        print(ds.GetRasterBand(1).GetNoDataValue())
-        return 'fail'
-    if ds.GetRasterBand(1).Checksum() != src_ds.GetRasterBand(1).Checksum():
-        print(ds.GetRasterBand(1).GetNoDataValue())
-        return 'fail'
+    assert ds.GetRasterBand(1).DataType == gdal.GDT_Int16
+    assert ds.GetRasterBand(1).GetNoDataValue() == -32768.0
+    assert ds.GetRasterBand(1).Checksum() == src_ds.GetRasterBand(1).Checksum(), \
+        ds.GetRasterBand(1).GetNoDataValue()
     ds = None
     src_ds = None
     gdal.Unlink('/vsimem/gpkg_39.asc')
@@ -3120,14 +2747,10 @@ def test_gpkg_39():
     gdal.Translate('/vsimem/gpkg_39.gpkg', '/vsimem/gpkg_39.asc', format='GPKG', outputType=gdal.GDT_UInt16)
     src_ds = gdal.Open('/vsimem/gpkg_39.asc')
     ds = gdal.Open('/vsimem/gpkg_39.gpkg')
-    if ds.GetRasterBand(1).DataType != gdal.GDT_UInt16:
-        return 'fail'
-    if ds.GetRasterBand(1).GetNoDataValue() != 65535.0:
-        print(ds.GetRasterBand(1).GetNoDataValue())
-        return 'fail'
-    if ds.GetRasterBand(1).Checksum() != src_ds.GetRasterBand(1).Checksum():
-        print(ds.GetRasterBand(1).GetNoDataValue())
-        return 'fail'
+    assert ds.GetRasterBand(1).DataType == gdal.GDT_UInt16
+    assert ds.GetRasterBand(1).GetNoDataValue() == 65535.0
+    assert ds.GetRasterBand(1).Checksum() == src_ds.GetRasterBand(1).Checksum(), \
+        ds.GetRasterBand(1).GetNoDataValue()
     ds = None
     src_ds = None
     gdal.Unlink('/vsimem/gpkg_39.asc')
@@ -3144,14 +2767,10 @@ def test_gpkg_39():
     gdal.Translate('/vsimem/gpkg_39.gpkg', '/vsimem/gpkg_39.asc', format='GPKG', outputType=gdal.GDT_UInt16)
     src_ds = gdal.Open('/vsimem/gpkg_39.asc')
     ds = gdal.Open('/vsimem/gpkg_39.gpkg')
-    if ds.GetRasterBand(1).DataType != gdal.GDT_UInt16:
-        return 'fail'
-    if ds.GetRasterBand(1).GetNoDataValue() != 0:
-        print(ds.GetRasterBand(1).GetNoDataValue())
-        return 'fail'
-    if ds.GetRasterBand(1).Checksum() != src_ds.GetRasterBand(1).Checksum():
-        print(ds.GetRasterBand(1).GetNoDataValue())
-        return 'fail'
+    assert ds.GetRasterBand(1).DataType == gdal.GDT_UInt16
+    assert ds.GetRasterBand(1).GetNoDataValue() == 0
+    assert ds.GetRasterBand(1).Checksum() == src_ds.GetRasterBand(1).Checksum(), \
+        ds.GetRasterBand(1).GetNoDataValue()
     ds = None
     src_ds = None
     gdal.Unlink('/vsimem/gpkg_39.asc')
@@ -3166,17 +2785,13 @@ def test_gpkg_39():
 -100000 100000""")
     gdal.Translate('/vsimem/gpkg_39.gpkg', '/vsimem/gpkg_39.asc', format='GPKG', outputType=gdal.GDT_Float32, creationOptions=['TILE_FORMAT=PNG'])
 
-    if not validate('/vsimem/gpkg_39.gpkg'):
-        gdaltest.post_reason('validation failed')
-        return 'fail'
+    assert validate('/vsimem/gpkg_39.gpkg'), 'validation failed'
 
     src_ds = gdal.Open('/vsimem/gpkg_39.asc')
     ds = gdal.Open('/vsimem/gpkg_39.gpkg')
-    if ds.GetRasterBand(1).DataType != gdal.GDT_Float32:
-        return 'fail'
-    if ds.GetRasterBand(1).Checksum() != src_ds.GetRasterBand(1).Checksum():
-        print(ds.GetRasterBand(1).GetNoDataValue())
-        return 'fail'
+    assert ds.GetRasterBand(1).DataType == gdal.GDT_Float32
+    assert ds.GetRasterBand(1).Checksum() == src_ds.GetRasterBand(1).Checksum(), \
+        ds.GetRasterBand(1).GetNoDataValue()
     ds = None
     src_ds = None
     gdal.Unlink('/vsimem/gpkg_39.asc')
@@ -3192,11 +2807,9 @@ def test_gpkg_39():
     gdal.Translate('/vsimem/gpkg_39.gpkg', '/vsimem/gpkg_39.asc', format='GPKG', outputType=gdal.GDT_Float32, noData=0, creationOptions=['TILE_FORMAT=PNG'])
     src_ds = gdal.Open('/vsimem/gpkg_39.asc')
     ds = gdal.Open('/vsimem/gpkg_39.gpkg')
-    if ds.GetRasterBand(1).DataType != gdal.GDT_Float32:
-        return 'fail'
-    if ds.GetRasterBand(1).Checksum() != src_ds.GetRasterBand(1).Checksum():
-        print(ds.GetRasterBand(1).GetNoDataValue())
-        return 'fail'
+    assert ds.GetRasterBand(1).DataType == gdal.GDT_Float32
+    assert ds.GetRasterBand(1).Checksum() == src_ds.GetRasterBand(1).Checksum(), \
+        ds.GetRasterBand(1).GetNoDataValue()
     ds = None
     src_ds = None
     gdal.Unlink('/vsimem/gpkg_39.asc')
@@ -3214,8 +2827,7 @@ def test_gpkg_39():
     ds.GetRasterBand(1).FlushCache()
     sql_lyr = ds.ExecuteSQL('SELECT scale, offset FROM gpkg_2d_gridded_tile_ancillary')
     f = sql_lyr.GetNextFeature()
-    if f is not None:
-        return 'fail'
+    assert f is None
     ds.ReleaseResultSet(sql_lyr)
     ds = None
 
@@ -3231,8 +2843,7 @@ def test_gpkg_39():
     ds.GetRasterBand(1).FlushCache()
     sql_lyr = ds.ExecuteSQL('SELECT * FROM gpkg_39')
     f = sql_lyr.GetNextFeature()
-    if f is not None:
-        return 'fail'
+    assert f is None
     ds.ReleaseResultSet(sql_lyr)
     ds = None
 
@@ -3249,8 +2860,7 @@ def test_gpkg_39():
     ds.GetRasterBand(1).FlushCache()
     sql_lyr = ds.ExecuteSQL('SELECT * FROM gpkg_39')
     f = sql_lyr.GetNextFeature()
-    if f is not None:
-        return 'fail'
+    assert f is None
     ds.ReleaseResultSet(sql_lyr)
     ds = None
 
@@ -3380,14 +2990,11 @@ def test_gpkg_42():
     sql_lyr = ds.ExecuteSQL("SELECT 1 FROM sqlite_master WHERE name = 'gpkg_geometry_columns'")
     fc = sql_lyr.GetFeatureCount()
     ds.ReleaseResultSet(sql_lyr)
-    if fc != 0:
-        return 'fail'
+    assert fc == 0
     lyr = ds.CreateLayer('test')
-    if lyr is None:
-        return 'fail'
+    assert lyr is not None
     ds.FlushCache()
-    if gdal.GetLastErrorMsg() != '':
-        return 'fail'
+    assert gdal.GetLastErrorMsg() == ''
     ds = None
 
     gdal.Unlink('/vsimem/gpkg_42.gpkg')
@@ -3413,22 +3020,17 @@ def test_gpkg_43():
     sql_lyr = ds.ExecuteSQL("SELECT 1 FROM sqlite_master WHERE name = 'gpkg_tile_matrix_set'")
     fc = sql_lyr.GetFeatureCount()
     ds.ReleaseResultSet(sql_lyr)
-    if fc != 0:
-        return 'fail'
+    assert fc == 0
     ds = None
 
     gdal.Translate('/vsimem/gpkg_43.gpkg', 'data/byte.tif',
                    format='GPKG', creationOptions=['APPEND_SUBDATASET=YES'])
     ds = gdal.OpenEx('/vsimem/gpkg_43.gpkg')
-    if ds.GetRasterBand(1).Checksum() != 4672:
-        return 'fail'
-    if ds.GetLayerCount() != 1:
-        return 'fail'
+    assert ds.GetRasterBand(1).Checksum() == 4672
+    assert ds.GetLayerCount() == 1
     ds = None
 
-    if not validate('/vsimem/gpkg_43.gpkg'):
-        gdaltest.post_reason('validation failed')
-        return 'fail'
+    assert validate('/vsimem/gpkg_43.gpkg'), 'validation failed'
 
     gdal.Unlink('/vsimem/gpkg_43.gpkg')
 
@@ -3447,9 +3049,7 @@ def test_gpkg_44():
         return 'skip'
 
     ds = gdal.Open('data/byte.gpkg.sql')
-    if ds.GetRasterBand(1).Checksum() != 4672:
-        gdaltest.post_reason('validation failed')
-        return 'fail'
+    assert ds.GetRasterBand(1).Checksum() == 4672, 'validation failed'
     return 'success'
 
 ###############################################################################
@@ -3462,9 +3062,7 @@ def test_gpkg_45():
         return 'skip'
 
     ds = gdal.Open('data/byte.gpkg')
-    if ds.GetRasterBand(1).Checksum() != 4672:
-        gdaltest.post_reason('validation failed')
-        return 'fail'
+    assert ds.GetRasterBand(1).Checksum() == 4672, 'validation failed'
     return 'success'
 
 ###############################################################################
@@ -3504,8 +3102,7 @@ def test_gpkg_46():
 
     gdal.Unlink('/vsimem/gpkg_46.gpkg')
 
-    if count != 23:
-        return 'fail'
+    assert count == 23
 
     return 'success'
 
@@ -3525,8 +3122,7 @@ def test_gpkg_47():
     ds = None
     with gdaltest.error_handler():
         ds = gdal.Open(tmpfile)
-    if ds.RasterXSize != 256:
-        return 'fail'
+    assert ds.RasterXSize == 256
     ds = None
 
     gdal.Unlink(tmpfile)
@@ -3585,17 +3181,14 @@ def test_gpkg_delete_raster_layer():
     ds.ExecuteSQL('VACUUM')
     ds = None
 
-    if fc != 0:
-        print(fc)
-        return 'fail'
+    assert fc == 0
 
     # Check that there is no more any reference to the layer
     f = gdal.VSIFOpenL(filename, 'rb')
     content = gdal.VSIFReadL(1, 1000000, f).decode('latin1')
     gdal.VSIFCloseL(f)
 
-    if content.find('foo') >= 0:
-        return 'fail'
+    assert content.find('foo') < 0
 
     gdal.Unlink(filename)
 
@@ -3623,8 +3216,7 @@ def test_gpkg_delete_gridded_coverage_raster_layer():
     content = gdal.VSIFReadL(1, 1000000, f).decode('latin1')
     gdal.VSIFCloseL(f)
 
-    if content.find('foo') >= 0:
-        return 'fail'
+    assert content.find('foo') < 0
 
     gdal.Unlink(filename)
 
@@ -3639,11 +3231,9 @@ def test_gpkg_open_old_gpkg_elevation_tiles_extension():
 
     gdal.ErrorReset()
     ds = gdal.Open('data/uint16-old-elevation-extension.gpkg')
-    if gdal.GetLastErrorMsg() != '':
-        return 'fail'
+    assert gdal.GetLastErrorMsg() == ''
     cs = ds.GetRasterBand(1).Checksum()
-    if cs != 4672:
-        return 'fail'
+    assert cs == 4672
 
     return 'success'
 
@@ -3659,13 +3249,10 @@ def test_gpkg_GeneralCmdLineProcessor():
     if test_cli_utilities.get_gdalinfo_path() is not None and test_cli_utilities.get_ogrinfo_path() is not None:
         ret_gdalinfo = gdaltest.runexternal(test_cli_utilities.get_gdalinfo_path() + ' --format GPKG')
         ret_ogrinfo = gdaltest.runexternal(test_cli_utilities.get_ogrinfo_path() + ' --format GPKG')
-        if ret_gdalinfo.find('<CreationOptionList>') < 0 or \
-           ret_ogrinfo.find('<CreationOptionList>') < 0 or \
-           ret_gdalinfo.find('scope=') >= 0 or \
-           ret_ogrinfo.find('scope=') >= 0:
-            print(ret_gdalinfo)
-            print(ret_ogrinfo)
-            return 'fail'
+        assert (ret_gdalinfo.find('<CreationOptionList>') >= 0 and \
+           ret_ogrinfo.find('<CreationOptionList>') >= 0 and \
+           ret_gdalinfo.find('scope=') < 0 and \
+           ret_ogrinfo.find('scope=') < 0)
 
     return 'success'
 
@@ -3682,8 +3269,7 @@ def test_gpkg_match_overview_factor():
 
     ds = gdal.Open('/vsimem/gpkg_match_overview_factor.gpkg', gdal.GA_Update)
     ret = ds.BuildOverviews('NONE', [2, 4, 8, 16, 32, 64, 128, 256, 512, 1024, 2048])
-    if ret != 0 or gdal.GetLastErrorMsg() != '':
-        return 'fail'
+    assert ret == 0 and gdal.GetLastErrorMsg() == ''
     ds = None
 
     gdal.Unlink('/vsimem/gpkg_match_overview_factor.gpkg')
diff --git a/autotest/gdrivers/grib.py b/autotest/gdrivers/grib.py
index 1dd1e8f77998..10182cc95c9c 100755
--- a/autotest/gdrivers/grib.py
+++ b/autotest/gdrivers/grib.py
@@ -36,6 +36,7 @@
 import shutil
 from osgeo import gdal
 from osgeo import osr
+import pytest
 
 sys.path.append('../osr')
 
@@ -109,17 +110,12 @@ def test_grib_grib2_read_nodata():
         return 'skip'
 
     ds = gdal.Open('data/grib/ds.mint.bin')
-    if ds.GetRasterBand(1).GetNoDataValue() != 9999:
-        return 'fail'
-    if ds.GetRasterBand(2).GetNoDataValue() != 9999:
-        return 'fail'
+    assert ds.GetRasterBand(1).GetNoDataValue() == 9999
+    assert ds.GetRasterBand(2).GetNoDataValue() == 9999
     md = ds.GetRasterBand(1).GetMetadata()
     expected_md = {'GRIB_REF_TIME': '  1203613200 sec UTC', 'GRIB_PDS_TEMPLATE_ASSEMBLED_VALUES': '0 5 2 0 0 255 255 1 19 1 0 0 255 -1 -2147483647 2008 2 22 12 0 0 1 0 3 255 1 12 1 0', 'GRIB_VALID_TIME': '  1203681600 sec UTC', 'GRIB_FORECAST_SECONDS': '68400 sec', 'GRIB_UNIT': '[C]', 'GRIB_PDS_TEMPLATE_NUMBERS': '0 5 2 0 0 0 255 255 1 0 0 0 19 1 0 0 0 0 0 255 129 255 255 255 255 7 216 2 22 12 0 0 1 0 0 0 0 3 255 1 0 0 0 12 1 0 0 0 0', 'GRIB_DISCIPLINE': '0(Meteorological)', 'GRIB_PDS_PDTN': '8', 'GRIB_COMMENT': 'Minimum temperature [C]', 'GRIB_SHORT_NAME': '0-SFC', 'GRIB_ELEMENT': 'MinT'}
     for k in expected_md:
-        if k not in md or md[k] != expected_md[k]:
-            gdaltest.post_reason('Did not get expected metadata')
-            print(md)
-            return 'fail'
+        assert k in md and md[k] == expected_md[k], 'Did not get expected metadata'
 
     return 'success'
 
@@ -182,8 +178,7 @@ def test_grib_read_geotransform_one_n_or_n_one():
     ds = None
     if gt != egt:
         print(gt, '!=', egt)
-        gdaltest.post_reason('Invalid geotransform')
-        return 'fail'
+        pytest.fail('Invalid geotransform')
     return 'success'
 
 ###############################################################################
@@ -198,8 +193,7 @@ def test_grib_read_vsizip():
         return 'skip'
 
     ds = gdal.Open('/vsizip/data/grib/gfs.t00z.mastergrb2f03.zip/gfs.t00z.mastergrb2f03')
-    if ds is None:
-        return 'fail'
+    assert ds is not None
 
     return 'success'
 
@@ -212,26 +206,20 @@ def test_grib_grib2_test_grib_pds_all_bands():
     if gdaltest.grib_drv is None:
         return 'skip'
     ds = gdal.Open('/vsizip/data/grib/gfs.t00z.mastergrb2f03.zip/gfs.t00z.mastergrb2f03')
-    if ds is None:
-        return 'fail'
+    assert ds is not None
     band = ds.GetRasterBand(2)
     md = band.GetMetadataItem('GRIB_PDS_TEMPLATE_NUMBERS')
     ds = None
-    if md is None:
-        gdaltest.post_reason('Failed to fetch pds numbers (#5144)')
-        return 'fail'
+    assert md is not None, 'Failed to fetch pds numbers (#5144)'
 
     gdal.SetConfigOption('GRIB_PDS_ALL_BANDS', 'OFF')
     ds = gdal.Open('/vsizip/data/grib/gfs.t00z.mastergrb2f03.zip/gfs.t00z.mastergrb2f03')
-    if ds is None:
-        return 'fail'
+    assert ds is not None
     band = ds.GetRasterBand(2)
     md = band.GetMetadataItem('GRIB_PDS_TEMPLATE_NUMBERS')
     ds = None
 
-    if md is not None:
-        gdaltest.post_reason('Got pds numbers, when disabled (#5144)')
-        return 'fail'
+    assert md is None, 'Got pds numbers, when disabled (#5144)'
     return 'success'
 
 ###############################################################################
@@ -250,11 +238,8 @@ def test_grib_grib2_read_template_4_15():
     ret, err = gdaltest.runexternal_out_and_err(test_cli_utilities.get_gdalinfo_path() + ' data/grib/template_4_15.grb2 -checksum')
 
     # This is a JPEG2000 compressed file, so just check we can open it or that we get a message saying there's no JPEG2000 driver available
-    if ret.find('Checksum=') < 0 and err.find('Is the JPEG2000 driver available?') < 0:
-        gdaltest.post_reason('Could not open file')
-        print(ret)
-        print(err)
-        return 'fail'
+    assert ret.find('Checksum=') >= 0 or err.find('Is the JPEG2000 driver available?') >= 0, \
+        'Could not open file'
 
     # ds = gdal.Open('data/template4_15.grib')
     # if ds is None:
@@ -276,10 +261,7 @@ def test_grib_grib2_read_png():
 
     ds = gdal.Open('data/grib/MRMS_EchoTop_18_00.50_20161015-133230.grib2')
     cs = ds.GetRasterBand(1).Checksum()
-    if cs != 41854:
-        gdaltest.post_reason('Could not open file')
-        print(cs)
-        return 'fail'
+    assert cs == 41854, 'Could not open file'
 
     return 'success'
 
@@ -295,17 +277,11 @@ def test_grib_grib2_read_template_4_32():
     # First band extracted from http://nomads.ncep.noaa.gov/pub/data/nccf/com/hur/prod/hwrf.2017102006/twenty-se27w.2017102006.hwrfsat.core.0p02.f000.grb2
     ds = gdal.Open('data/grib/twenty-se27w.2017102006.hwrfsat.core.0p02.f000_truncated.grb2')
     cs = ds.GetRasterBand(1).Checksum()
-    if cs != 19911:
-        gdaltest.post_reason('Could not open file')
-        print(cs)
-        return 'fail'
+    assert cs == 19911, 'Could not open file'
     md = ds.GetRasterBand(1).GetMetadata()
     expected_md = {'GRIB_REF_TIME': '  1508479200 sec UTC', 'GRIB_VALID_TIME': '  1508479200 sec UTC', 'GRIB_FORECAST_SECONDS': '0 sec', 'GRIB_UNIT': '[C]', 'GRIB_PDS_TEMPLATE_NUMBERS': '5 7 2 0 0 0 0 0 1 0 0 0 0 1 0 31 1 29 67 140 2 0 0 238 217', 'GRIB_PDS_PDTN': '32', 'GRIB_COMMENT': 'Brightness Temperature [C]', 'GRIB_SHORT_NAME': '0 undefined', 'GRIB_ELEMENT': 'BRTEMP', 'GRIB_PDS_TEMPLATE_ASSEMBLED_VALUES': '5 7 2 0 0 0 0 1 0 1 31 285 17292 2 61145'}
     for k in expected_md:
-        if k not in md or md[k] != expected_md[k]:
-            gdaltest.post_reason('Did not get expected metadata')
-            print(md)
-            return 'fail'
+        assert k in md and md[k] == expected_md[k], 'Did not get expected metadata'
 
     return 'success'
 
@@ -321,17 +297,11 @@ def test_grib_grib2_read_all_zero_data():
     # From http://dd.weather.gc.ca/model_wave/great_lakes/erie/grib2/00/CMC_rdwps_lake-erie_ICEC_SFC_0_latlon0.05x0.05_2017111800_P000.grib2
     ds = gdal.Open('data/grib/CMC_rdwps_lake-erie_ICEC_SFC_0_latlon0.05x0.05_2017111800_P000.grib2')
     cs = ds.GetRasterBand(1).Checksum()
-    if cs != 0:
-        gdaltest.post_reason('Could not open file')
-        print(cs)
-        return 'fail'
+    assert cs == 0, 'Could not open file'
     md = ds.GetRasterBand(1).GetMetadata()
     expected_md = {'GRIB_REF_TIME': '  1510963200 sec UTC', 'GRIB_VALID_TIME': '  1510963200 sec UTC', 'GRIB_FORECAST_SECONDS': '0 sec', 'GRIB_UNIT': '[Proportion]', 'GRIB_PDS_TEMPLATE_NUMBERS': '2 0 0 0 0 0 0 0 1 0 0 0 0 1 0 0 0 0 0 255 255 255 255 255 255', 'GRIB_PDS_PDTN': '0', 'GRIB_COMMENT': 'Ice cover [Proportion]', 'GRIB_SHORT_NAME': '0-SFC', 'GRIB_ELEMENT': 'ICEC'}
     for k in expected_md:
-        if k not in md or md[k] != expected_md[k]:
-            gdaltest.post_reason('Did not get expected metadata')
-            print(md)
-            return 'fail'
+        assert k in md and md[k] == expected_md[k], 'Did not get expected metadata'
 
     return 'success'
 
@@ -346,33 +316,22 @@ def test_grib_grib2_read_rotated_pole_lonlat():
 
     ds = gdal.Open('/vsisparse/data/grib/rotated_pole.grb.xml')
 
-    if ds.RasterXSize != 726 or ds.RasterYSize != 550:
-        gdaltest.post_reason('Did not get expected dimensions')
-        print(ds.RasterXSize)
-        print(ds.RasterYSize)
-        return 'fail'
+    assert ds.RasterXSize == 726 and ds.RasterYSize == 550, \
+        'Did not get expected dimensions'
 
     projection = ds.GetProjectionRef()
     expected_projection = """PROJCS["unnamed",GEOGCS["Coordinate System imported from GRIB file",DATUM["unknown",SPHEROID["Sphere",6367470,0]],PRIMEM["Greenwich",0],UNIT["degree",0.0174532925199433]],PROJECTION["Rotated_pole"],EXTENSION["PROJ4","+proj=ob_tran +lon_0=-15 +o_proj=longlat +o_lon_p=0 +o_lat_p=30 +a=6367470 +b=6367470 +to_meter=0.0174532925199 +wktext"]]"""
-    if projection != expected_projection:
-        gdaltest.post_reason('Did not get expected projection')
-        print(projection)
-        return 'fail'
+    assert projection == expected_projection, 'Did not get expected projection'
 
     gt = ds.GetGeoTransform()
     expected_gt = (-30.25, 0.1, 0.0, 24.15, 0.0, -0.1)
-    if max([abs(gt[i] - expected_gt[i]) for i in range(6)]) > 1e-3:
-        gdaltest.post_reason('Did not get expected geotransform')
-        print(gt)
-        return 'fail'
+    assert max([abs(gt[i] - expected_gt[i]) for i in range(6)]) <= 1e-3, \
+        'Did not get expected geotransform'
 
     md = ds.GetRasterBand(1).GetMetadata()
     expected_md = {'GRIB_REF_TIME': '  1503295200 sec UTC', 'GRIB_VALID_TIME': '  1503295200 sec UTC', 'GRIB_FORECAST_SECONDS': '0 sec', 'GRIB_UNIT': '[m^2/s^2]', 'GRIB_COMMENT': 'Geopotential [m^2/s^2]', 'GRIB_SHORT_NAME': '0-HTGL', 'GRIB_ELEMENT': 'GP'}
     for k in expected_md:
-        if k not in md or md[k] != expected_md[k]:
-            gdaltest.post_reason('Did not get expected metadata')
-            print(md)
-            return 'fail'
+        assert k in md and md[k] == expected_md[k], 'Did not get expected metadata'
 
     return 'success'
 
@@ -395,10 +354,7 @@ def test_grib_grib2_read_template_4_40():
     md = ds.GetRasterBand(1).GetMetadata()
     expected_md = {'GRIB_REF_TIME': '  1505088000 sec UTC', 'GRIB_PDS_TEMPLATE_ASSEMBLED_VALUES': '20 0 40008 0 255 99 0 0 1 0 1 -127 -2147483647 255 -127 -2147483647', 'GRIB_VALID_TIME': '  1505088000 sec UTC', 'GRIB_FORECAST_SECONDS': '0 sec', 'GRIB_UNIT': '[kg/(m^3)]', 'GRIB_PDS_TEMPLATE_NUMBERS': '20 0 156 72 0 255 99 0 0 0 1 0 0 0 0 1 255 255 255 255 255 255 255 255 255 255 255', 'GRIB_PDS_PDTN': '40', 'GRIB_COMMENT': 'Mass Density (Concentration) [kg/(m^3)]', 'GRIB_SHORT_NAME': '0-SFC', 'GRIB_ELEMENT': 'MASSDEN'}
     for k in expected_md:
-        if k not in md or md[k] != expected_md[k]:
-            gdaltest.post_reason('Did not get expected metadata')
-            print(md)
-            return 'fail'
+        assert k in md and md[k] == expected_md[k], 'Did not get expected metadata'
 
     return 'success'
 
@@ -416,10 +372,7 @@ def test_grib_grib2_read_template_4_unhandled():
     md = ds.GetRasterBand(1).GetMetadata()
     expected_md = {'GRIB_PDS_TEMPLATE_NUMBERS': '0 1 2 3 4 5', 'GRIB_PDS_PDTN': '65535'}
     for k in expected_md:
-        if k not in md or md[k] != expected_md[k]:
-            gdaltest.post_reason('Did not get expected metadata')
-            print(md)
-            return 'fail'
+        assert k in md and md[k] == expected_md[k], 'Did not get expected metadata'
 
     return 'success'
 
@@ -436,17 +389,12 @@ def test_grib_grib2_read_transverse_mercator():
 
     projection = ds.GetProjectionRef()
     expected_projection = """PROJCS["unnamed",GEOGCS["Coordinate System imported from GRIB file",DATUM["unknown",SPHEROID["Sphere",6367470,0]],PRIMEM["Greenwich",0],UNIT["degree",0.0174532925199433]],PROJECTION["Transverse_Mercator"],PARAMETER["latitude_of_origin",0],PARAMETER["central_meridian",-117],PARAMETER["scale_factor",0.9996],PARAMETER["false_easting",500000],PARAMETER["false_northing",0],UNIT["Metre",1]]"""
-    if projection != expected_projection:
-        gdaltest.post_reason('Did not get expected projection')
-        print(projection)
-        return 'fail'
+    assert projection == expected_projection, 'Did not get expected projection'
 
     gt = ds.GetGeoTransform()
     expected_gt = (440720.0, 60.0, 0.0, 3751320.0, 0.0, -60.0)
-    if max([abs(gt[i] - expected_gt[i]) for i in range(6)]) > 1e-3:
-        gdaltest.post_reason('Did not get expected geotransform')
-        print(gt)
-        return 'fail'
+    assert max([abs(gt[i] - expected_gt[i]) for i in range(6)]) <= 1e-3, \
+        'Did not get expected geotransform'
 
     return 'success'
 
@@ -466,17 +414,12 @@ def test_grib_grib2_read_mercator():
 
     projection = ds.GetProjectionRef()
     expected_projection = """PROJCS["unnamed",GEOGCS["Coordinate System imported from GRIB file",DATUM["WGS_1984",SPHEROID["WGS 84",6378137,298.257223563]],PRIMEM["Greenwich",0],UNIT["degree",0.0174532925199433]],PROJECTION["Mercator_1SP"],PARAMETER["central_meridian",0],PARAMETER["scale_factor",1],PARAMETER["false_easting",0],PARAMETER["false_northing",0],UNIT["Metre",1]]"""
-    if projection != expected_projection:
-        gdaltest.post_reason('Did not get expected projection')
-        print(projection)
-        return 'fail'
+    assert projection == expected_projection, 'Did not get expected projection'
 
     gt = ds.GetGeoTransform()
     expected_gt = (-13095853.598139772, 72.237, 0.0, 3991876.4600486886, 0.0, -72.237)
-    if max([abs(gt[i] - expected_gt[i]) for i in range(6)]) > 1e-3:
-        gdaltest.post_reason('Did not get expected geotransform')
-        print(gt)
-        return 'fail'
+    assert max([abs(gt[i] - expected_gt[i]) for i in range(6)]) <= 1e-3, \
+        'Did not get expected geotransform'
 
     return 'success'
 
@@ -496,17 +439,12 @@ def test_grib_grib2_read_mercator_2sp():
 
     projection = ds.GetProjectionRef()
     expected_projection = """PROJCS["unnamed",GEOGCS["Coordinate System imported from GRIB file",DATUM["WGS_1984",SPHEROID["WGS 84",6378137,298.257223563]],PRIMEM["Greenwich",0],UNIT["degree",0.0174532925199433]],PROJECTION["Mercator_2SP"],PARAMETER["standard_parallel_1",33.5],PARAMETER["central_meridian",0],PARAMETER["false_easting",0],PARAMETER["false_northing",0],UNIT["Metre",1]]"""
-    if projection != expected_projection:
-        gdaltest.post_reason('Did not get expected projection')
-        print(projection)
-        return 'fail'
+    assert projection == expected_projection, 'Did not get expected projection'
 
     gt = ds.GetGeoTransform()
     expected_gt = (-10931598.94836207, 60.299, 0.0, 3332168.629121481, 0.0, -60.299)
-    if max([abs(gt[i] - expected_gt[i]) for i in range(6)]) > 1e-3:
-        gdaltest.post_reason('Did not get expected geotransform')
-        print(gt)
-        return 'fail'
+    assert max([abs(gt[i] - expected_gt[i]) for i in range(6)]) <= 1e-3, \
+        'Did not get expected geotransform'
 
     return 'success'
 
@@ -526,17 +464,12 @@ def test_grib_grib2_read_lcc():
 
     projection = ds.GetProjectionRef()
     expected_projection = """PROJCS["unnamed",GEOGCS["Coordinate System imported from GRIB file",DATUM["WGS_1984",SPHEROID["WGS 84",6378137,298.257223563]],PRIMEM["Greenwich",0],UNIT["degree",0.0174532925199433]],PROJECTION["Lambert_Conformal_Conic_2SP"],PARAMETER["standard_parallel_1",33],PARAMETER["standard_parallel_2",34],PARAMETER["latitude_of_origin",33.5],PARAMETER["central_meridian",117],PARAMETER["false_easting",0],PARAMETER["false_northing",0],UNIT["Metre",1]]"""
-    if projection != expected_projection:
-        gdaltest.post_reason('Did not get expected projection')
-        print(projection)
-        return 'fail'
+    assert projection == expected_projection, 'Did not get expected projection'
 
     gt = ds.GetGeoTransform()
     expected_gt = (8974734.737685828, 60.021, 0.0, 6235918.9698001575, 0.0, -60.021)
-    if max([abs(gt[i] - expected_gt[i]) for i in range(6)]) > 1e-3:
-        gdaltest.post_reason('Did not get expected geotransform')
-        print(gt)
-        return 'fail'
+    assert max([abs(gt[i] - expected_gt[i]) for i in range(6)]) <= 1e-3, \
+        'Did not get expected geotransform'
 
     return 'success'
 
@@ -556,17 +489,12 @@ def test_grib_grib2_read_polar_stereo():
 
     projection = ds.GetProjectionRef()
     expected_projection = """PROJCS["unnamed",GEOGCS["Coordinate System imported from GRIB file",DATUM["WGS_1984",SPHEROID["WGS 84",6378137,298.257223563]],PRIMEM["Greenwich",0],UNIT["degree",0.0174532925199433]],PROJECTION["Polar_Stereographic"],PARAMETER["latitude_of_origin",60],PARAMETER["central_meridian",0],PARAMETER["scale_factor",1],PARAMETER["false_easting",0],PARAMETER["false_northing",0],UNIT["Metre",1]]"""
-    if projection != expected_projection:
-        gdaltest.post_reason('Did not get expected projection')
-        print(projection)
-        return 'fail'
+    assert projection == expected_projection, 'Did not get expected projection'
 
     gt = ds.GetGeoTransform()
     expected_gt = (-5621962.072511509, 71.86, 0.0, 2943991.8007649644, 0.0, -71.86)
-    if max([abs(gt[i] - expected_gt[i]) for i in range(6)]) > 1e-3:
-        gdaltest.post_reason('Did not get expected geotransform')
-        print(gt)
-        return 'fail'
+    assert max([abs(gt[i] - expected_gt[i]) for i in range(6)]) <= 1e-3, \
+        'Did not get expected geotransform'
 
     return 'success'
 
@@ -586,17 +514,12 @@ def test_grib_grib2_read_aea():
 
     projection = ds.GetProjectionRef()
     expected_projection = """PROJCS["unnamed",GEOGCS["Coordinate System imported from GRIB file",DATUM["WGS_1984",SPHEROID["WGS 84",6378137,298.257223563]],PRIMEM["Greenwich",0],UNIT["degree",0.0174532925199433]],PROJECTION["Albers_Conic_Equal_Area"],PARAMETER["standard_parallel_1",33],PARAMETER["standard_parallel_2",34],PARAMETER["latitude_of_center",33.5],PARAMETER["longitude_of_center",117],PARAMETER["false_easting",0],PARAMETER["false_northing",0],UNIT["Metre",1]]"""
-    if projection != expected_projection:
-        gdaltest.post_reason('Did not get expected projection')
-        print(projection)
-        return 'fail'
+    assert projection == expected_projection, 'Did not get expected projection'
 
     gt = ds.GetGeoTransform()
     expected_gt = (8974979.714292033, 60.022, 0.0, 6235686.52464211, 0.0, -60.022)
-    if max([abs(gt[i] - expected_gt[i]) for i in range(6)]) > 1e-3:
-        gdaltest.post_reason('Did not get expected geotransform')
-        print(gt)
-        return 'fail'
+    assert max([abs(gt[i] - expected_gt[i]) for i in range(6)]) <= 1e-3, \
+        'Did not get expected geotransform'
 
     return 'success'
 
@@ -616,17 +539,12 @@ def test_grib_grib2_read_laea():
 
     projection = ds.GetProjectionRef()
     expected_projection = """PROJCS["unnamed",GEOGCS["Coordinate System imported from GRIB file",DATUM["WGS_1984",SPHEROID["WGS 84",6378137,298.257223563]],PRIMEM["Greenwich",0],UNIT["degree",0.0174532925199433]],PROJECTION["Lambert_Azimuthal_Equal_Area"],PARAMETER["latitude_of_center",33.5],PARAMETER["longitude_of_center",243],PARAMETER["false_easting",0],PARAMETER["false_northing",0],UNIT["Metre",1]]"""
-    if projection != expected_projection:
-        gdaltest.post_reason('Did not get expected projection')
-        print(projection)
-        return 'fail'
+    assert projection == expected_projection, 'Did not get expected projection'
 
     gt = ds.GetGeoTransform()
     expected_gt = (-59384.01063035424, 60.021, 0.0, 44812.5792223211, 0.0, -60.021)
-    if max([abs(gt[i] - expected_gt[i]) for i in range(6)]) > 1e-3:
-        gdaltest.post_reason('Did not get expected geotransform')
-        print(gt)
-        return 'fail'
+    assert max([abs(gt[i] - expected_gt[i]) for i in range(6)]) <= 1e-3, \
+        'Did not get expected geotransform'
 
     return 'success'
 
@@ -641,17 +559,11 @@ def test_grib_grib2_read_template_5_4_grid_point_ieee_floating_point():
 
     ds = gdal.Open('data/grib/ieee754_single.grb2')
     cs = ds.GetRasterBand(1).Checksum()
-    if cs != 4727:
-        gdaltest.post_reason('Did not get expected checksum')
-        print(cs)
-        return 'fail'
+    assert cs == 4727, 'Did not get expected checksum'
 
     ds = gdal.Open('data/grib/ieee754_double.grb2')
     cs = ds.GetRasterBand(1).Checksum()
-    if cs != 4727:
-        gdaltest.post_reason('Did not get expected checksum')
-        print(cs)
-        return 'fail'
+    assert cs == 4727, 'Did not get expected checksum'
 
     return 'success'
 
@@ -666,26 +578,17 @@ def test_grib_grib2_read_section_5_nbits_zero_decimal_scaled():
 
     ds = gdal.Open('data/grib/simple_packing_nbits_zero_decimal_scaled.grb2')
     cs = ds.GetRasterBand(1).Checksum()
-    if cs != 5:
-        gdaltest.post_reason('Did not get expected checksum')
-        print(cs)
-        return 'fail'
+    assert cs == 5, 'Did not get expected checksum'
 
     if gdal.GetDriverByName('PNG') is not None:
         ds = gdal.Open('data/grib/png_nbits_zero_decimal_scaled.grb2')
         cs = ds.GetRasterBand(1).Checksum()
-        if cs != 5:
-            gdaltest.post_reason('Did not get expected checksum')
-            print(cs)
-            return 'fail'
+        assert cs == 5, 'Did not get expected checksum'
 
     if has_jp2kdrv():
         ds = gdal.Open('data/grib/jpeg2000_nbits_zero_decimal_scaled.grb2')
         cs = ds.GetRasterBand(1).Checksum()
-        if cs != 5:
-            gdaltest.post_reason('Did not get expected checksum')
-            print(cs)
-            return 'fail'
+        assert cs == 5, 'Did not get expected checksum'
 
     return 'success'
 
@@ -729,10 +632,7 @@ def test_grib_grib2_write_creation_options():
     md = ds.GetRasterBand(1).GetMetadata()
     expected_md = {'GRIB_IDS': 'CENTER=85(Toulouse) SUBCENTER=3 MASTER_TABLE=5 LOCAL_TABLE=0 SIGNF_REF_TIME=0(Analysis) REF_TIME=2017-09-11T12:34:56Z PROD_STATUS=2(Research) TYPE=0(Analysis)', 'GRIB_PDS_TEMPLATE_NUMBERS': '20 0 156 72 0 255 99 0 0 0 1 0 0 0 0 1 255 255 255 255 255 255 255 255 255 255 255', 'GRIB_DISCIPLINE': '1(Hydrological)', 'GRIB_PDS_PDTN': '40'}
     for k in expected_md:
-        if k not in md or md[k] != expected_md[k]:
-            gdaltest.post_reason('Did not get expected metadata')
-            print(md)
-            return 'fail'
+        assert k in md and md[k] == expected_md[k], 'Did not get expected metadata'
     ds = None
     gdal.Unlink(tmpfilename)
 
@@ -743,17 +643,13 @@ def test_grib_grib2_write_creation_options():
                                     "PDS_PDTN=40",
                                     "PDS_TEMPLATE_NUMBERS=20 0 156 72 0 255 99 0 0 0 1 0 0 0 0 1 255 255 255 255 255 255 255 255 255 255 255 0extra"
                                 ])
-    if out_ds is None:
-        return 'fail'
+    assert out_ds is not None
     out_ds = None
     ds = gdal.Open(tmpfilename)
     md = ds.GetRasterBand(1).GetMetadata()
     expected_md = {'GRIB_PDS_PDTN': '40', 'GRIB_PDS_TEMPLATE_NUMBERS': '20 0 156 72 0 255 99 0 0 0 1 0 0 0 0 1 255 255 255 255 255 255 255 255 255 255 255 0'}
     for k in expected_md:
-        if k not in md or md[k] != expected_md[k]:
-            gdaltest.post_reason('Did not get expected metadata')
-            print(md)
-            return 'fail'
+        assert k in md and md[k] == expected_md[k], 'Did not get expected metadata'
     ds = None
     gdal.Unlink(tmpfilename)
 
@@ -764,8 +660,7 @@ def test_grib_grib2_write_creation_options():
                                     "PDS_PDTN=40",
                                     "PDS_TEMPLATE_NUMBERS=20 0 156 72 0 255 99 0 0 0 1 0 0 0 0 1 255 255 255 255 255 255 255 255 255 255"
                                 ])
-    if out_ds is not None:
-        return 'fail'
+    assert out_ds is None
     gdal.Unlink(tmpfilename)
 
     # Test with PDS_TEMPLATE_ASSEMBLED_VALUES
@@ -778,10 +673,7 @@ def test_grib_grib2_write_creation_options():
     md = ds.GetRasterBand(1).GetMetadata()
     expected_md = {'GRIB_PDS_PDTN': '40', 'GRIB_PDS_TEMPLATE_ASSEMBLED_VALUES': '20 0 40008 0 255 99 0 0 1 0 1 -127 -2147483647 255 -127 -2147483647'}
     for k in expected_md:
-        if k not in md or md[k] != expected_md[k]:
-            gdaltest.post_reason('Did not get expected metadata')
-            print(md)
-            return 'fail'
+        assert k in md and md[k] == expected_md[k], 'Did not get expected metadata'
     ds = None
     gdal.Unlink(tmpfilename)
 
@@ -792,17 +684,13 @@ def test_grib_grib2_write_creation_options():
                                     "PDS_PDTN=40",
                                     "PDS_TEMPLATE_ASSEMBLED_VALUES=20 0 40008 0 255 99 0 0 1 0 1 -127 -2147483647 255 -127 -2147483647 0extra"
                                 ])
-    if out_ds is None:
-        return 'fail'
+    assert out_ds is not None
     out_ds = None
     ds = gdal.Open(tmpfilename)
     md = ds.GetRasterBand(1).GetMetadata()
     expected_md = {'GRIB_PDS_PDTN': '40', 'GRIB_PDS_TEMPLATE_ASSEMBLED_VALUES': '20 0 40008 0 255 99 0 0 1 0 1 -127 -2147483647 255 -127 -2147483647'}
     for k in expected_md:
-        if k not in md or md[k] != expected_md[k]:
-            gdaltest.post_reason('Did not get expected metadata')
-            print(md)
-            return 'fail'
+        assert k in md and md[k] == expected_md[k], 'Did not get expected metadata'
     ds = None
     gdal.Unlink(tmpfilename)
 
@@ -813,8 +701,7 @@ def test_grib_grib2_write_creation_options():
                                     "PDS_PDTN=40",
                                     "PDS_TEMPLATE_ASSEMBLED_VALUES=20 0 40008 0 255 99 0 0 1 0 1 -127 -2147483647 255 -127"
                                 ])
-    if out_ds is not None:
-        return 'fail'
+    assert out_ds is None
     gdal.Unlink(tmpfilename)
 
     # Test with PDS_TEMPLATE_ASSEMBLED_VALUES with variable number of elements
@@ -827,10 +714,7 @@ def test_grib_grib2_write_creation_options():
     md = ds.GetRasterBand(1).GetMetadata()
     expected_md = {'GRIB_PDS_PDTN': '32', 'GRIB_PDS_TEMPLATE_ASSEMBLED_VALUES': '5 7 2 0 0 0 0 1 0 2 31 285 17292 2 61145 31 285 17292 2 61145'}
     for k in expected_md:
-        if k not in md or md[k] != expected_md[k]:
-            gdaltest.post_reason('Did not get expected metadata')
-            print(md)
-            return 'fail'
+        assert k in md and md[k] == expected_md[k], 'Did not get expected metadata'
     ds = None
     gdal.Unlink(tmpfilename)
 
@@ -841,8 +725,7 @@ def test_grib_grib2_write_creation_options():
                                     "PDS_PDTN=32",
                                     "PDS_TEMPLATE_ASSEMBLED_VALUES=5 7 2 0 0 0 0 1 0 2 31 285 17292 2 61145 31 285 17292 2"
                                 ])
-    if out_ds is not None:
-        return 'fail'
+    assert out_ds is None
     gdal.Unlink(tmpfilename)
 
     # Test with PDS_TEMPLATE_ASSEMBLED_VALUES with variable number of elements, and extra elements
@@ -856,10 +739,7 @@ def test_grib_grib2_write_creation_options():
     md = ds.GetRasterBand(1).GetMetadata()
     expected_md = {'GRIB_PDS_PDTN': '32', 'GRIB_PDS_TEMPLATE_ASSEMBLED_VALUES': '5 7 2 0 0 0 0 1 0 2 31 285 17292 2 61145 31 285 17292 2 61145'}
     for k in expected_md:
-        if k not in md or md[k] != expected_md[k]:
-            gdaltest.post_reason('Did not get expected metadata')
-            print(md)
-            return 'fail'
+        assert k in md and md[k] == expected_md[k], 'Did not get expected metadata'
     ds = None
     gdal.Unlink(tmpfilename)
 
@@ -873,10 +753,7 @@ def test_grib_grib2_write_creation_options():
     md = ds.GetRasterBand(1).GetMetadata()
     expected_md = {'GRIB_PDS_PDTN': '32', 'GRIB_PDS_TEMPLATE_ASSEMBLED_VALUES': '5 7 2 0 0 0 0 1 0 2 31 285 17292 2 61145 31 285 17292 2 61145'}
     for k in expected_md:
-        if k not in md or md[k] != expected_md[k]:
-            gdaltest.post_reason('Did not get expected metadata')
-            print(md)
-            return 'fail'
+        assert k in md and md[k] == expected_md[k], 'Did not get expected metadata'
     ds = None
     gdal.Unlink(tmpfilename)
 
@@ -887,18 +764,14 @@ def test_grib_grib2_write_creation_options():
                                     "PDS_PDTN=65535",
                                     "PDS_TEMPLATE_NUMBERS=1 2 3 4 5"
                                 ])
-    if out_ds is None:
-        return 'fail'
+    assert out_ds is not None
     out_ds = None
     with gdaltest.error_handler():
         ds = gdal.Open(tmpfilename)
     md = ds.GetRasterBand(1).GetMetadata()
     expected_md = {'GRIB_PDS_PDTN': '65535', 'GRIB_PDS_TEMPLATE_NUMBERS': '1 2 3 4 5'}
     for k in expected_md:
-        if k not in md or md[k] != expected_md[k]:
-            gdaltest.post_reason('Did not get expected metadata')
-            print(md)
-            return 'fail'
+        assert k in md and md[k] == expected_md[k], 'Did not get expected metadata'
     ds = None
     gdal.Unlink(tmpfilename)
 
@@ -909,8 +782,7 @@ def test_grib_grib2_write_creation_options():
                                     "PDS_PDTN=65535",
                                     "PDS_TEMPLATE_ASSEMBLED_VALUES=1 2 3 4 5"
                                 ])
-    if out_ds is not None:
-        return 'fail'
+    assert out_ds is None
     gdal.Unlink(tmpfilename)
 
     # Test with PDS_PDTN != 0 without template numbers
@@ -919,8 +791,7 @@ def test_grib_grib2_write_creation_options():
                                 creationOptions=[
                                     "PDS_PDTN=32"
                                 ])
-    if out_ds is not None:
-        return 'fail'
+    assert out_ds is None
     gdal.Unlink(tmpfilename)
 
     # Test with invalid values in PDS_TEMPLATE_NUMBERS
@@ -930,8 +801,7 @@ def test_grib_grib2_write_creation_options():
                                     "PDS_PDTN=254",
                                     "PDS_TEMPLATE_NUMBERS=-1 256 0 0 0 0"
                                 ])
-    if out_ds is None:
-        return 'fail'
+    assert out_ds is not None
     out_ds = None
     gdal.Unlink(tmpfilename)
 
@@ -943,8 +813,7 @@ def test_grib_grib2_write_creation_options():
                                     # {44,21,0,                    {1,  1, 2,1,-1,      -4,   -1,-4,1,1,1,  2,  1,1,-2   ,1,-1,  -4,1,-1,-4} },
                                     "PDS_TEMPLATE_ASSEMBLED_VALUES=-1 256 -1 1 128 4000000000 -1 -4 1 1 1 65536 1 1 32768 1 -129 -4 1 -1 -4"
                                 ])
-    if out_ds is None:
-        return 'fail'
+    assert out_ds is not None
     out_ds = None
     gdal.Unlink(tmpfilename)
 
@@ -956,8 +825,7 @@ def test_grib_grib2_write_creation_options():
                                     "PDS_TEMPLATE_NUMBERS=20 0 156 72 0 255 99 0 0 0 1 0 0 0 0 1 255 255 255 255 255 255 255 255 255 255 255",
                                     "PDS_TEMPLATE_ASSEMBLED_VALUES=20 0 40008 0 255 99 0 0 1 0 1 -127 -2147483647 255 -127 -2147483647"
                                 ])
-    if out_ds is not None:
-        return 'fail'
+    assert out_ds is None
     gdal.Unlink(tmpfilename)
 
     return 'success'
@@ -986,19 +854,13 @@ def test_grib_grib2_write_projections():
         gdal.Translate(tmpfilename, filename, format='GRIB')
         out_ds = gdal.Open(tmpfilename)
 
-        if src_ds.GetProjectionRef() != out_ds.GetProjectionRef():
-            gdaltest.post_reason('did not get expected projection for %s' % filename)
-            print(out_ds.GetProjectionRef())
-            print(src_ds.GetProjectionRef())
-            return 'fail'
+        assert src_ds.GetProjectionRef() == out_ds.GetProjectionRef(), \
+            ('did not get expected projection for %s' % filename)
 
         expected_gt = src_ds.GetGeoTransform()
         got_gt = out_ds.GetGeoTransform()
-        if max([abs(expected_gt[i] - got_gt[i]) for i in range(6)]) > 1e-5:
-            gdaltest.post_reason('did not get expected geotransform for %s' % filename)
-            print(got_gt)
-            print(expected_gt)
-            return 'fail'
+        assert max([abs(expected_gt[i] - got_gt[i]) for i in range(6)]) <= 1e-5, \
+            ('did not get expected geotransform for %s' % filename)
 
         out_ds = None
         gdal.Unlink(tmpfilename)
@@ -1016,9 +878,7 @@ def test_grib_grib2_write_projections():
     wkt = out_ds.GetProjectionRef()
     out_ds = None
     gdal.Unlink(tmpfilename)
-    if wkt.find('SPHEROID["GRS80",6378137,298.257222101]') < 0:
-        print(wkt)
-        return 'fail'
+    assert wkt.find('SPHEROID["GRS80",6378137,298.257222101]') >= 0
 
     # Test writing Mercator_1SP with scale != 1 (will be read as Mercator_2SP)
     src_ds = gdal.Warp('', 'data/byte.tif', format='MEM', dstSRS="""PROJCS["unnamed",
@@ -1048,15 +908,12 @@ def test_grib_grib2_write_projections():
     expected_sr = osr.SpatialReference()
     expected_sr.SetFromUserInput(expected_wkt)
     if got_sr.IsSame(expected_sr) == 0:
-        gdaltest.post_reason('did not get expected projection for Mercator_1SP')
         print(out_ds.GetProjectionRef())
-        return 'fail'
+        pytest.fail('did not get expected projection for Mercator_1SP')
     expected_gt = (-10931635.565066436, 60.297, 0.0, 3331982.221608528, 0.0, -60.297)
     got_gt = out_ds.GetGeoTransform()
-    if max([abs(expected_gt[i] - got_gt[i]) for i in range(6)]) > 1e-5:
-        gdaltest.post_reason('did not get expected geotransform for Mercator_1SP')
-        print(got_gt)
-        return 'fail'
+    assert max([abs(expected_gt[i] - got_gt[i]) for i in range(6)]) <= 1e-5, \
+        'did not get expected geotransform for Mercator_1SP'
     out_ds = None
     gdal.Unlink(tmpfilename)
 
@@ -1087,15 +944,12 @@ def test_grib_grib2_write_projections():
     expected_sr = osr.SpatialReference()
     expected_sr.SetFromUserInput(expected_wkt)
     if got_sr.IsSame(expected_sr) == 0:
-        gdaltest.post_reason('did not get expected projection for LCC_1SP')
         print(out_ds.GetProjectionRef())
-        return 'fail'
+        pytest.fail('did not get expected projection for LCC_1SP')
     expected_gt = (8974472.884926716, 60.017, 0.0, 6235685.688523474, 0.0, -60.017)
     got_gt = out_ds.GetGeoTransform()
-    if max([abs(expected_gt[i] - got_gt[i]) for i in range(6)]) > 1e-5:
-        gdaltest.post_reason('did not get expected geotransform for LCC_1SP')
-        print(got_gt)
-        return 'fail'
+    assert max([abs(expected_gt[i] - got_gt[i]) for i in range(6)]) <= 1e-5, \
+        'did not get expected geotransform for LCC_1SP'
     out_ds = None
     gdal.Unlink(tmpfilename)
 
@@ -1246,16 +1100,13 @@ def test_grib_grib2_write_data_encodings():
         gdal.Translate(tmpfilename, filename, format='GRIB',
                        creationOptions=options)
         error_msg = gdal.GetLastErrorMsg()
-        if error_msg != '':
-            gdaltest.post_reason('did not expect error for %s, %s' % (str(filename), str(options)))
-            return 'fail'
+        assert error_msg == '', \
+            ('did not expect error for %s, %s' % (str(filename), str(options)))
 
         section5 = _grib_read_section(tmpfilename, 5)
         section5_template_number = struct.unpack('>h', section5[9:11])[0]
-        if section5_template_number != expected_section5_template_number:
-            gdaltest.post_reason('did not get expected section 5 template number for %s, %s' % (str(filename), str(options)))
-            print(section5_template_number, expected_section5_template_number)
-            return 'fail'
+        assert section5_template_number == expected_section5_template_number, \
+            ('did not get expected section 5 template number for %s, %s' % (str(filename), str(options)))
 
         out_ds = gdal.Open(tmpfilename)
         cs = out_ds.GetRasterBand(1).Checksum()
@@ -1264,10 +1115,8 @@ def test_grib_grib2_write_data_encodings():
         gdal.Unlink(tmpfilename)
         if not isinstance(expected_cs, tuple):
             expected_cs = (expected_cs,)
-        if cs not in expected_cs:
-            gdaltest.post_reason('did not get expected checksum for %s, %s' % (str(filename), str(options)))
-            print(cs, expected_cs)
-            return 'fail'
+        assert cs in expected_cs, \
+            ('did not get expected checksum for %s, %s' % (str(filename), str(options)))
 
         if section5_template_number in (GS5_CMPLX, GS5_CMPLXSEC):
             if isinstance(filename, str):
@@ -1275,10 +1124,8 @@ def test_grib_grib2_write_data_encodings():
             else:
                 ref_ds = filename
             expected_nd = ref_ds.GetRasterBand(1).GetNoDataValue()
-            if nd != expected_nd:
-                gdaltest.post_reason('did not get expected nodata for %s, %s' % (str(filename), str(options)))
-                print(nd, expected_nd)
-                return 'fail'
+            assert nd == expected_nd, \
+                ('did not get expected nodata for %s, %s' % (str(filename), str(options)))
 
     # Test floating point data with dynamic < 1
     test_ds = gdal.GetDriverByName('MEM').Create('', 2, 2, 1, gdal.GDT_Float32)
@@ -1300,15 +1147,13 @@ def test_grib_grib2_write_data_encodings():
         if encoding == 'COMPLEX_PACKING':
             with gdaltest.error_handler():
                 success = gdal.Translate(tmpfilename, test_ds, format='GRIB', creationOptions=options)
-            if success:
-                gdaltest.post_reason('expected error for %s, %s' % ('floating point data with dynamic < 1', str(options)))
-                return 'fail'
+            assert not success, \
+                ('expected error for %s, %s' % ('floating point data with dynamic < 1', str(options)))
         else:
             gdal.Translate(tmpfilename, test_ds, format='GRIB', creationOptions=options)
             error_msg = gdal.GetLastErrorMsg()
-            if error_msg != '':
-                gdaltest.post_reason('did not expect error for %s, %s' % ('floating point data with dynamic < 1', str(options)))
-                return 'fail'
+            assert error_msg == '', \
+                ('did not expect error for %s, %s' % ('floating point data with dynamic < 1', str(options)))
             out_ds = gdal.Open(tmpfilename)
             got_vals = struct.unpack(4 * 'd', out_ds.ReadRaster())
             out_ds = None
@@ -1316,10 +1161,8 @@ def test_grib_grib2_write_data_encodings():
                 expected_vals = (1.23, 1.45, 1.56, 1.78)
             else:
                 expected_vals = (1.2300000190734863, 1.4487500190734863, 1.5581250190734863, 1.7807812690734863)
-            if max([abs(got_vals[i] - expected_vals[i]) for i in range(4)]) > 1e-7:
-                gdaltest.post_reason('did not get expected values')
-                print(got_vals)
-                return 'fail'
+            assert max([abs(got_vals[i] - expected_vals[i]) for i in range(4)]) <= 1e-7, \
+                'did not get expected values'
         gdal.Unlink(tmpfilename)
 
     test_ds = None
@@ -1345,18 +1188,13 @@ def test_grib_grib2_write_data_encodings():
         if encoding != 'SIMPLE_PACKING':
             gdal.PopErrorHandler()
         out_ds = gdal.Open(tmpfilename)
-        if out_ds is None:
-            gdaltest.post_reason('failed to re-open dataset for ' + encoding)
-            return 'fail'
+        assert out_ds is not None, ('failed to re-open dataset for ' + encoding)
         got_vals = struct.unpack(4 * 'd', out_ds.ReadRaster())
         out_ds = None
         gdal.Unlink(tmpfilename)
         expected_vals = (1.23e10, -2.45e10, 1.23e10, -2.45e10)
-        if max([abs((got_vals[i] - expected_vals[i]) / expected_vals[i]) for i in range(4)]) > 1e-4:
-            gdaltest.post_reason('did not get expected values for ' + encoding)
-            print(got_vals)
-            print(max([abs((got_vals[i] - expected_vals[i]) / expected_vals[i]) for i in range(2)]))
-            return 'fail'
+        assert max([abs((got_vals[i] - expected_vals[i]) / expected_vals[i]) for i in range(4)]) <= 1e-4, \
+            ('did not get expected values for ' + encoding)
     test_ds = None
 
     # Test lossy J2K compression
@@ -1367,9 +1205,8 @@ def test_grib_grib2_write_data_encodings():
                        creationOptions=['JPEG2000_DRIVER=' + drvname,
                                         'COMPRESSION_RATIO=20'])
         error_msg = gdal.GetLastErrorMsg()
-        if error_msg != '':
-            gdaltest.post_reason('did not expect error for %s, %s' % (str(filename), str(options)))
-            return 'fail'
+        assert error_msg == '', \
+            ('did not expect error for %s, %s' % (str(filename), str(options)))
         out_ds = gdal.Open(tmpfilename)
         cs = out_ds.GetRasterBand(1).Checksum()
         out_ds = None
@@ -1407,12 +1244,10 @@ def test_grib_grib2_write_data_encodings_warnings_and_errors():
             out_ds = gdaltest.grib_drv.CreateCopy(tmpfilename, src_ds, options=options)
 
         error_msg = gdal.GetLastErrorMsg()
-        if error_msg == '':
-            gdaltest.post_reason('expected warning for %s, %s' % (str(filename), str(options)))
-            return 'fail'
-        if out_ds is None:
-            gdaltest.post_reason('did not expect null return for %s, %s' % (str(filename), str(options)))
-            return 'fail'
+        assert error_msg != '', \
+            ('expected warning for %s, %s' % (str(filename), str(options)))
+        assert out_ds is not None, \
+            ('did not expect null return for %s, %s' % (str(filename), str(options)))
 
         cs = out_ds.GetRasterBand(1).Checksum()
 
@@ -1420,10 +1255,8 @@ def test_grib_grib2_write_data_encodings_warnings_and_errors():
         gdal.Unlink(tmpfilename)
         if not isinstance(expected_cs, tuple):
             expected_cs = (expected_cs,)
-        if cs not in expected_cs:
-            gdaltest.post_reason('did not get expected checksum for %s, %s' % (str(filename), str(options)))
-            print(cs, expected_cs)
-            return 'fail'
+        assert cs in expected_cs, \
+            ('did not get expected checksum for %s, %s' % (str(filename), str(options)))
 
     # Cases where errors are expected
     tests = []
@@ -1447,12 +1280,10 @@ def test_grib_grib2_write_data_encodings_warnings_and_errors():
             out_ds = gdaltest.grib_drv.CreateCopy(tmpfilename, src_ds, options=options)
 
         error_msg = gdal.GetLastErrorMsg()
-        if error_msg == '':
-            gdaltest.post_reason('expected warning for %s, %s' % (str(filename), str(options)))
-            return 'fail'
-        if out_ds is not None:
-            gdaltest.post_reason('expected null return for %s, %s' % (str(filename), str(options)))
-            return 'fail'
+        assert error_msg != '', \
+            ('expected warning for %s, %s' % (str(filename), str(options)))
+        assert out_ds is None, \
+            ('expected null return for %s, %s' % (str(filename), str(options)))
         out_ds = None
         gdal.Unlink(tmpfilename)
 
@@ -1460,9 +1291,7 @@ def test_grib_grib2_write_data_encodings_warnings_and_errors():
 
     with gdaltest.error_handler():
         out_ds = gdal.Translate('/i/do_not/exist.grb2', 'data/byte.tif', format='GRIB')
-    if out_ds is not None:
-        gdaltest.post_reason('expected null return')
-        return 'fail'
+    assert out_ds is None, 'expected null return'
 
     return 'success'
 
@@ -1506,11 +1335,8 @@ def test_grib_grib2_write_temperatures():
             expected_vals = (25.0, 25.1, 25.1, 25.2)
         else:
             expected_vals = (25.0 - 273.15, 25.1 - 273.15, 25.1 - 273.15, 25.2 - 273.15)
-        if max([abs((got_vals[i] - expected_vals[i]) / expected_vals[i]) for i in range(4)]) > 1e-4:
-            gdaltest.post_reason('fail with data_encoding = %s and type = %s' % (data_encoding, str(src_type)))
-            print(got_vals)
-            print(max([abs((got_vals[i] - expected_vals[i]) / expected_vals[i]) for i in range(2)]))
-            return 'fail'
+        assert max([abs((got_vals[i] - expected_vals[i]) / expected_vals[i]) for i in range(4)]) <= 1e-4, \
+            ('fail with data_encoding = %s and type = %s' % (data_encoding, str(src_type)))
 
     return 'success'
 
@@ -1536,8 +1362,7 @@ def test_grib_grib2_write_nodata():
         gdaltest.grib_drv.CreateCopy(tmpfilename, src_ds, options=options)
 
         ds = gdal.Open(tmpfilename)
-        if ds.GetRasterBand(1).GetNoDataValue() != 123:
-            return 'fail'
+        assert ds.GetRasterBand(1).GetNoDataValue() == 123
         ds = None
         gdal.Unlink(tmpfilename)
 
@@ -1561,22 +1386,13 @@ def test_grib_online_grib2_jpeg2000_single_line():
 
     ds = gdal.Open('tmp/cache/' + filename)
     cs = ds.GetRasterBand(1).Checksum()
-    if cs == 0:
-        gdaltest.post_reason('Could not open file')
-        print(cs)
-        return 'fail'
+    assert cs != 0, 'Could not open file'
     nd = ds.GetRasterBand(1).GetNoDataValue()
-    if nd != 9999:
-        gdaltest.post_reason('Bad nodata value')
-        print(nd)
-        return 'fail'
+    assert nd == 9999, 'Bad nodata value'
     md = ds.GetRasterBand(1).GetMetadata()
     expected_md = {'GRIB_REF_TIME': '  1510920000 sec UTC', 'GRIB_VALID_TIME': '  1510923600 sec UTC', 'GRIB_FORECAST_SECONDS': '3600 sec', 'GRIB_UNIT': '[kg/(m^2 s)]', 'GRIB_PDS_TEMPLATE_NUMBERS': '1 7 2 50 50 0 0 0 0 0 0 0 60 1 0 0 0 0 0 255 255 255 255 255 255', 'GRIB_PDS_PDTN': '0', 'GRIB_COMMENT': 'Precipitation rate [kg/(m^2 s)]', 'GRIB_SHORT_NAME': '0-SFC', 'GRIB_ELEMENT': 'PRATE'}
     for k in expected_md:
-        if k not in md or md[k] != expected_md[k]:
-            gdaltest.post_reason('Did not get expected metadata')
-            print(md)
-            return 'fail'
+        assert k in md and md[k] == expected_md[k], 'Did not get expected metadata'
 
     return 'success'
 
diff --git a/autotest/gdrivers/gta.py b/autotest/gdrivers/gta.py
index ed4eb58a2589..42a7a5ebfe63 100755
--- a/autotest/gdrivers/gta.py
+++ b/autotest/gdrivers/gta.py
@@ -82,9 +82,7 @@ def test_gta_2():
 
     out_ds = gdal.Open('/vsimem/byte.gta')
     cs = out_ds.GetRasterBand(1).Checksum()
-    if cs != 0:
-        gdaltest.post_reason('did not get expected checksum')
-        return 'fail'
+    assert cs == 0, 'did not get expected checksum'
     out_ds = None
 
     out_ds = gdal.Open('/vsimem/byte.gta', gdal.GA_Update)
@@ -93,9 +91,7 @@ def test_gta_2():
 
     out_ds = gdal.Open('/vsimem/byte.gta')
     cs = out_ds.GetRasterBand(1).Checksum()
-    if cs != src_ds.GetRasterBand(1).Checksum():
-        gdaltest.post_reason('did not get expected checksum')
-        return 'fail'
+    assert cs == src_ds.GetRasterBand(1).Checksum(), 'did not get expected checksum'
 
     gt = out_ds.GetGeoTransform()
     wkt = out_ds.GetProjectionRef()
@@ -103,13 +99,9 @@ def test_gta_2():
 
     expected_gt = src_ds.GetGeoTransform()
     for i in range(6):
-        if abs(gt[i] - expected_gt[i]) > 1e-6:
-            gdaltest.post_reason('did not get expected wkt')
-            return 'fail'
+        assert abs(gt[i] - expected_gt[i]) <= 1e-6, 'did not get expected wkt'
 
-    if wkt != src_ds.GetProjectionRef():
-        gdaltest.post_reason('did not get expected wkt')
-        return 'fail'
+    assert wkt == src_ds.GetProjectionRef(), 'did not get expected wkt'
 
     gdaltest.gta_drv.Delete('/vsimem/byte.gta')
 
@@ -131,23 +123,17 @@ def test_gta_3():
 
     new_ds = gdal.Open('/vsimem/gta_3.gta')
 
-    if new_ds.GetGeoTransform() != (0.0, 1.0, 0.0, 0.0, 0.0, 1.0):
-        gdaltest.post_reason('GeoTransform not set properly.')
-        return 'fail'
+    assert new_ds.GetGeoTransform() == (0.0, 1.0, 0.0, 0.0, 0.0, 1.0), \
+        'GeoTransform not set properly.'
 
-    if new_ds.GetProjectionRef() != '':
-        gdaltest.post_reason('Projection not set properly.')
-        return 'fail'
+    assert new_ds.GetProjectionRef() == '', 'Projection not set properly.'
 
-    if new_ds.GetGCPProjection() != src_ds.GetGCPProjection():
-        gdaltest.post_reason('GCP Projection not set properly.')
-        return 'fail'
+    assert new_ds.GetGCPProjection() == src_ds.GetGCPProjection(), \
+        'GCP Projection not set properly.'
 
     gcps = new_ds.GetGCPs()
     expected_gcps = src_ds.GetGCPs()
-    if len(gcps) != len(expected_gcps):
-        gdaltest.post_reason('GCP count wrong.')
-        return 'fail'
+    assert len(gcps) == len(expected_gcps), 'GCP count wrong.'
 
     new_ds = None
 
@@ -182,46 +168,19 @@ def test_gta_4():
 
     new_ds = gdal.Open('/vsimem/gta_4.gta')
     band = new_ds.GetRasterBand(1)
-    if band.GetNoDataValue() != 123:
-        gdaltest.post_reason('did not get expected nodata value')
-        print(band.GetNoDataValue())
-        return 'fail'
-    if band.GetMinimum() != 255:
-        gdaltest.post_reason('did not get expected minimum value')
-        print(band.GetMinimum())
-        return 'fail'
-    if band.GetMaximum() != 255:
-        gdaltest.post_reason('did not get expected maximum value')
-        print(band.GetMaximum())
-        return 'fail'
-    if band.GetCategoryNames() != ['a', 'b']:
-        gdaltest.post_reason('did not get expected category names')
-        print(band.GetCategoryNames())
-        return 'fail'
-    if band.GetOffset() != 2:
-        gdaltest.post_reason('did not get expected offset value')
-        print(band.GetOffset())
-        return 'fail'
-    if band.GetScale() != 3:
-        gdaltest.post_reason('did not get expected scale value')
-        print(band.GetScale())
-        return 'fail'
-    if band.GetUnitType() != 'custom':
-        gdaltest.post_reason('did not get expected unit value')
-        print(band.GetUnitType())
-        return 'fail'
-    if band.GetDescription() != 'description':
-        gdaltest.post_reason('did not get expected description')
-        print(band.GetDescription())
-        return 'fail'
+    assert band.GetNoDataValue() == 123, 'did not get expected nodata value'
+    assert band.GetMinimum() == 255, 'did not get expected minimum value'
+    assert band.GetMaximum() == 255, 'did not get expected maximum value'
+    assert band.GetCategoryNames() == ['a', 'b'], 'did not get expected category names'
+    assert band.GetOffset() == 2, 'did not get expected offset value'
+    assert band.GetScale() == 3, 'did not get expected scale value'
+    assert band.GetUnitType() == 'custom', 'did not get expected unit value'
+    assert band.GetDescription() == 'description', 'did not get expected description'
     for i in range(17):
         if i != gdal.GCI_PaletteIndex:
-            if new_ds.GetRasterBand(i + 1).GetColorInterpretation() != i:
-                gdaltest.post_reason(
-                    'did not get expected color interpretation '
+            assert new_ds.GetRasterBand(i + 1).GetColorInterpretation() == i, \
+                ('did not get expected color interpretation '
                     'for band %d' % (i + 1))
-                print(new_ds.GetRasterBand(i + 1).GetColorInterpretation())
-                return 'fail'
 
     new_ds = None
 
diff --git a/autotest/gdrivers/hdf5.py b/autotest/gdrivers/hdf5.py
index 2d40182dd629..974c886fb56d 100755
--- a/autotest/gdrivers/hdf5.py
+++ b/autotest/gdrivers/hdf5.py
@@ -67,22 +67,14 @@ def test_hdf5_2():
 
     sds_list = ds.GetMetadata('SUBDATASETS')
 
-    if len(sds_list) != 4:
-        print(sds_list)
-        gdaltest.post_reason('Did not get expected subdataset count.')
-        return 'fail'
+    assert len(sds_list) == 4, 'Did not get expected subdataset count.'
 
-    if sds_list['SUBDATASET_1_NAME'] != 'HDF5:"data/groups.h5"://MyGroup/Group_A/dset2' \
-       or sds_list['SUBDATASET_2_NAME'] != 'HDF5:"data/groups.h5"://MyGroup/dset1':
-        print(sds_list)
-        gdaltest.post_reason('did not get expected subdatasets.')
-        return 'fail'
+    assert sds_list['SUBDATASET_1_NAME'] == 'HDF5:"data/groups.h5"://MyGroup/Group_A/dset2' and sds_list['SUBDATASET_2_NAME'] == 'HDF5:"data/groups.h5"://MyGroup/dset1', \
+        'did not get expected subdatasets.'
 
     ds = None
 
-    if gdaltest.is_file_open('data/groups.h5'):
-        gdaltest.post_reason('file still opened.')
-        return 'fail'
+    assert not gdaltest.is_file_open('data/groups.h5'), 'file still opened.'
 
     return 'success'
 
@@ -96,15 +88,11 @@ def test_hdf5_3():
     ds = gdal.Open('HDF5:"data/u8be.h5"://TestArray')
 
     cs = ds.GetRasterBand(1).Checksum()
-    if cs != 135:
-        gdaltest.post_reason('did not get expected checksum')
-        return 'fail'
+    assert cs == 135, 'did not get expected checksum'
 
     ds = None
 
-    if gdaltest.is_file_open('data/u8be.h5'):
-        gdaltest.post_reason('file still opened.')
-        return 'fail'
+    assert not gdaltest.is_file_open('data/u8be.h5'), 'file still opened.'
 
     return 'success'
 
@@ -117,9 +105,7 @@ def test_hdf5_4():
     ds = gdal.Open('HDF5:"data/u8be.h5"://TestArray')
 
     cs = ds.GetRasterBand(1).Checksum()
-    if cs != 135:
-        gdaltest.post_reason('did not get expected checksum')
-        return 'fail'
+    assert cs == 135, 'did not get expected checksum'
 
     return 'success'
 
@@ -132,9 +118,7 @@ def test_hdf5_5():
     ds = gdal.Open('HDF5:"data/groups.h5"://MyGroup/dset1')
 
     cs = ds.GetRasterBand(1).Checksum()
-    if cs != 18:
-        gdaltest.post_reason('did not get expected checksum')
-        return 'fail'
+    assert cs == 18, 'did not get expected checksum'
 
     return 'success'
 
@@ -150,27 +134,19 @@ def test_hdf5_6():
     ds.BuildOverviews(overviewlist=[2])
     ds = None
 
-    if gdaltest.is_file_open('tmp/groups.h5'):
-        gdaltest.post_reason('file still opened.')
-        return 'fail'
+    assert not gdaltest.is_file_open('tmp/groups.h5'), 'file still opened.'
 
     ds = gdal.Open('HDF5:"tmp/groups.h5"://MyGroup/dset1')
-    if ds.GetRasterBand(1).GetOverviewCount() != 1:
-        gdaltest.post_reason('failed to find overview')
-        return 'fail'
+    assert ds.GetRasterBand(1).GetOverviewCount() == 1, 'failed to find overview'
     ds = None
 
     # confirm that it works with a different path. (#3290)
 
     ds = gdal.Open('HDF5:"data/../tmp/groups.h5"://MyGroup/dset1')
-    if ds.GetRasterBand(1).GetOverviewCount() != 1:
-        gdaltest.post_reason('failed to find overview with alternate path')
-        return 'fail'
+    assert ds.GetRasterBand(1).GetOverviewCount() == 1, \
+        'failed to find overview with alternate path'
     ovfile = ds.GetMetadataItem('OVERVIEW_FILE', 'OVERVIEWS')
-    if ovfile[:11] != 'data/../tmp':
-        print(ovfile)
-        gdaltest.post_reason('did not get expected OVERVIEW_FILE.')
-        return 'fail'
+    assert ovfile[:11] == 'data/../tmp', 'did not get expected OVERVIEW_FILE.'
     ds = None
 
     gdaltest.clean_tmp()
@@ -188,13 +164,9 @@ def test_hdf5_7():
     metadataList = ds.GetMetadata_List()
     ds = None
 
-    if gdaltest.is_file_open('data/metadata.h5'):
-        gdaltest.post_reason('file still opened.')
-        return 'fail'
+    assert not gdaltest.is_file_open('data/metadata.h5'), 'file still opened.'
 
-    if len(metadata) != len(metadataList):
-        gdaltest.post_reason('error in metadata dictionary setup')
-        return 'fail'
+    assert len(metadata) == len(metadataList), 'error in metadata dictionary setup'
 
     metadataList = [item.split('=', 1)[0] for item in metadataList]
     for key in metadataList:
@@ -215,9 +187,7 @@ def test_hdf5_8():
     metadata = ds.GetMetadata()
     ds = None
 
-    if not metadata:
-        gdaltest.post_reason('no metadata found')
-        return 'fail'
+    assert metadata, 'no metadata found'
 
     h5groups = ['G1', 'Group with spaces', 'Group_with_underscores',
                 'Group with spaces_and_underscores']
@@ -234,38 +204,30 @@ def scanMetadata(parts):
         for attr in attributes:
             name = '_'.join(parts + [attr])
             name = name.replace(' ', '_')
-            if name not in metadata:
-                gdaltest.post_reason('unable to find metadata: "%s"' % name)
-                return 'fail'
+            assert name in metadata, ('unable to find metadata: "%s"' % name)
 
             value = metadata.pop(name)
 
             value = value.strip(' d')
             value = type(attributes[attr])(value)
-            if value != attributes[attr]:
-                gdaltest.post_reason('incorrect metadata value for "%s": '
+            assert value == attributes[attr], ('incorrect metadata value for "%s": '
                                      '"%s" != "%s"' % (name, value,
                                                        attributes[attr]))
-                return 'fail'
 
     # level0
-    if scanMetadata([]) is not None:
-        return 'fail'
+    assert scanMetadata([]) is None
 
     # level1 datasets
     for h5dataset in h5datasets:
-        if scanMetadata([h5dataset]) is not None:
-            return 'fail'
+        assert scanMetadata([h5dataset]) is None
 
     # level1 groups
     for h5group in h5groups:
-        if scanMetadata([h5group]) is not None:
-            return 'fail'
+        assert scanMetadata([h5group]) is None
 
         # level2 datasets
         for h5dataset in h5datasets:
-            if scanMetadata([h5group, h5dataset]) is not None:
-                return 'fail'
+            assert scanMetadata([h5group, h5dataset]) is None
 
     return 'success'
 
@@ -282,9 +244,7 @@ def test_hdf5_9():
     ds = gdal.Open('data/vlstr_metadata.h5')
     metadata = ds.GetRasterBand(1).GetMetadata()
     ds = None
-    if gdaltest.is_file_open('data/vlstr_metadata.h5'):
-        gdaltest.post_reason('file still opened.')
-        return 'fail'
+    assert not gdaltest.is_file_open('data/vlstr_metadata.h5'), 'file still opened.'
 
     ref_metadata = {
         'TEST_BANDNAMES': 'SAA',
@@ -295,22 +255,17 @@ def test_hdf5_9():
         'TEST_RANGE': '0 255 0 255',
     }
 
-    if len(metadata) != len(ref_metadata):
-        gdaltest.post_reason('incorrect number of metadata: '
+    assert len(metadata) == len(ref_metadata), ('incorrect number of metadata: '
                              'expected %d, got %d' % (len(ref_metadata),
                                                       len(metadata)))
-        return 'fail'
 
     for key in metadata:
-        if key not in ref_metadata:
-            gdaltest.post_reason('unexpected metadata key "%s"' % key)
-            return 'fail'
+        assert key in ref_metadata, ('unexpected metadata key "%s"' % key)
 
-        if metadata[key] != ref_metadata[key]:
-            gdaltest.post_reason('incorrect metadata value for key "%s": '
+        assert metadata[key] == ref_metadata[key], \
+            ('incorrect metadata value for key "%s": '
                                  'expected "%s", got "%s" ' %
                                  (key, ref_metadata[key], metadata[key]))
-            return 'fail'
 
     return 'success'
 
@@ -323,28 +278,21 @@ def test_hdf5_10():
     # Try opening the QLK subdataset to check that no error is generated
     gdal.ErrorReset()
     ds = gdal.Open('HDF5:"data/CSK_DGM.h5"://S01/QLK')
-    if ds is None or gdal.GetLastErrorMsg() != '':
-        return 'fail'
+    assert ds is not None and gdal.GetLastErrorMsg() == ''
     ds = None
 
     ds = gdal.Open('HDF5:"data/CSK_DGM.h5"://S01/SBI')
     got_gcpprojection = ds.GetGCPProjection()
-    if got_gcpprojection.find('GEOGCS["WGS 84",DATUM["WGS_1984"') != 0:
-        print(got_gcpprojection)
-        return 'fail'
+    assert got_gcpprojection.find('GEOGCS["WGS 84",DATUM["WGS_1984"') == 0
 
     got_gcps = ds.GetGCPs()
-    if len(got_gcps) != 4:
-        return 'fail'
+    assert len(got_gcps) == 4
 
-    if abs(got_gcps[0].GCPPixel - 0) > 1e-5 or abs(got_gcps[0].GCPLine - 0) > 1e-5 or \
-       abs(got_gcps[0].GCPX - 12.2395902509238) > 1e-5 or abs(got_gcps[0].GCPY - 44.7280047434954) > 1e-5:
-        return 'fail'
+    assert (abs(got_gcps[0].GCPPixel - 0) <= 1e-5 and abs(got_gcps[0].GCPLine - 0) <= 1e-5 and \
+       abs(got_gcps[0].GCPX - 12.2395902509238) <= 1e-5 and abs(got_gcps[0].GCPY - 44.7280047434954) <= 1e-5)
 
     ds = None
-    if gdaltest.is_file_open('data/CSK_DGM.h5'):
-        gdaltest.post_reason('file still opened.')
-        return 'fail'
+    assert not gdaltest.is_file_open('data/CSK_DGM.h5'), 'file still opened.'
 
     return 'success'
 
@@ -357,28 +305,21 @@ def test_hdf5_11():
     # Try opening the QLK subdataset to check that no error is generated
     gdal.ErrorReset()
     ds = gdal.Open('HDF5:"data/CSK_GEC.h5"://S01/QLK')
-    if ds is None or gdal.GetLastErrorMsg() != '':
-        return 'fail'
+    assert ds is not None and gdal.GetLastErrorMsg() == ''
     ds = None
 
     ds = gdal.Open('HDF5:"data/CSK_GEC.h5"://S01/SBI')
     got_projection = ds.GetProjection()
-    if got_projection.find('PROJCS["Transverse_Mercator",GEOGCS["WGS 84",DATUM["WGS_1984"') != 0:
-        print(got_projection)
-        return 'fail'
+    assert got_projection.find('PROJCS["Transverse_Mercator",GEOGCS["WGS 84",DATUM["WGS_1984"') == 0
 
     got_gt = ds.GetGeoTransform()
     expected_gt = (275592.5, 2.5, 0.0, 4998152.5, 0.0, -2.5)
     for i in range(6):
-        if abs(got_gt[i] - expected_gt[i]) > 1e-5:
-            print(got_gt)
-            return 'fail'
+        assert abs(got_gt[i] - expected_gt[i]) <= 1e-5
 
     ds = None
 
-    if gdaltest.is_file_open('data/CSK_GEC.h5'):
-        gdaltest.post_reason('file still opened.')
-        return 'fail'
+    assert not gdaltest.is_file_open('data/CSK_GEC.h5'), 'file still opened.'
 
     return 'success'
 
@@ -393,19 +334,15 @@ def test_hdf5_12():
 
     ds = gdal.Open('tmp/cache/norsa.ss.ppi-00.5-dbz.aeqd-1000.20070601T000039Z.hdf')
     got_projection = ds.GetProjection()
-    if got_projection.find('Azimuthal_Equidistant') < 0:
-        print(got_projection)
-        return 'fail'
+    assert got_projection.find('Azimuthal_Equidistant') >= 0
 
     got_gt = ds.GetGeoTransform()
     expected_gt = (-240890.02470187756, 1001.7181388478905, 0.0, 239638.21326987055, 0.0, -1000.3790932482976)
     # Proj 4.9.3
     expected_gt2 = (-240889.94573659054, 1001.7178235672992, 0.0, 239638.28570609915, 0.0, -1000.3794089534567)
 
-    if max([abs(got_gt[i] - expected_gt[i]) for i in range(6)]) > 1e-5 and \
-       max([abs(got_gt[i] - expected_gt2[i]) for i in range(6)]) > 1e-5:
-        print(got_gt)
-        return 'fail'
+    assert (max([abs(got_gt[i] - expected_gt[i]) for i in range(6)]) <= 1e-5 or \
+       max([abs(got_gt[i] - expected_gt2[i]) for i in range(6)]) <= 1e-5)
 
     return 'success'
 
@@ -421,13 +358,10 @@ def test_hdf5_13():
     ds = gdal.Open('HDF5:"tmp/cache/A2016273115000.L2_LAC_OC.nc"://geophysical_data/Kd_490')
 
     got_gcps = ds.GetGCPs()
-    if len(got_gcps) != 3030:
-        return 'fail'
+    assert len(got_gcps) == 3030
 
-    if abs(got_gcps[0].GCPPixel - 0.5) > 1e-5 or abs(got_gcps[0].GCPLine - 0.5) > 1e-5 or \
-       abs(got_gcps[0].GCPX - 33.1655693) > 1e-5 or abs(got_gcps[0].GCPY - 39.3207207) > 1e-5:
-        print(got_gcps[0])
-        return 'fail'
+    assert (abs(got_gcps[0].GCPPixel - 0.5) <= 1e-5 and abs(got_gcps[0].GCPLine - 0.5) <= 1e-5 and \
+       abs(got_gcps[0].GCPX - 33.1655693) <= 1e-5 and abs(got_gcps[0].GCPY - 39.3207207) <= 1e-5)
 
     return 'success'
 
@@ -440,23 +374,14 @@ def test_hdf5_14():
     ds = gdal.Open('data/complex.h5')
     sds_list = ds.GetMetadata('SUBDATASETS')
 
-    if len(sds_list) != 6:
-        print(sds_list)
-        gdaltest.post_reason('Did not get expected complex subdataset count.')
-        return 'fail'
+    assert len(sds_list) == 6, 'Did not get expected complex subdataset count.'
 
-    if sds_list['SUBDATASET_1_NAME'] != 'HDF5:"data/complex.h5"://f16' \
-            or sds_list['SUBDATASET_2_NAME'] != 'HDF5:"data/complex.h5"://f32' \
-            or sds_list['SUBDATASET_3_NAME'] != 'HDF5:"data/complex.h5"://f64':
-        print(sds_list)
-        gdaltest.post_reason('did not get expected subdatasets.')
-        return 'fail'
+    assert sds_list['SUBDATASET_1_NAME'] == 'HDF5:"data/complex.h5"://f16' and sds_list['SUBDATASET_2_NAME'] == 'HDF5:"data/complex.h5"://f32' and sds_list['SUBDATASET_3_NAME'] == 'HDF5:"data/complex.h5"://f64', \
+        'did not get expected subdatasets.'
 
     ds = None
 
-    if gdaltest.is_file_open('data/complex.h5'):
-        gdaltest.post_reason('file still opened.')
-        return 'fail'
+    assert not gdaltest.is_file_open('data/complex.h5'), 'file still opened.'
 
     return 'success'
 
@@ -470,9 +395,7 @@ def test_hdf5_15():
     ds = gdal.Open('HDF5:"data/complex.h5"://f32')
 
     cs = ds.GetRasterBand(1).Checksum()
-    if cs != 523:
-        gdaltest.post_reason('did not get expected checksum')
-        return 'fail'
+    assert cs == 523, 'did not get expected checksum'
 
     return 'success'
 
@@ -484,9 +407,7 @@ def test_hdf5_16():
     ds = gdal.Open('HDF5:"data/complex.h5"://f64')
 
     cs = ds.GetRasterBand(1).Checksum()
-    if cs != 511:
-        gdaltest.post_reason('did not get expected checksum')
-        return 'fail'
+    assert cs == 511, 'did not get expected checksum'
 
     return 'success'
 
@@ -498,9 +419,7 @@ def test_hdf5_17():
     ds = gdal.Open('HDF5:"data/complex.h5"://f16')
 
     cs = ds.GetRasterBand(1).Checksum()
-    if cs != 412:
-        gdaltest.post_reason('did not get expected checksum')
-        return 'fail'
+    assert cs == 412, 'did not get expected checksum'
 
     return 'success'
 
@@ -508,8 +427,7 @@ def test_hdf5_17():
 def test_hdf5_single_char_varname():
 
     ds = gdal.Open('HDF5:"data/single_char_varname.h5"://e')
-    if ds is None:
-        return 'fail'
+    assert ds is not None
 
     return 'success'
 
@@ -526,8 +444,7 @@ def test_hdf5_virtual_file():
         'metadata.h5'
     ]
     for hdf5_file in hdf5_files:
-        if uffd_compare(hdf5_file) is not True:
-            return 'fail'
+        assert uffd_compare(hdf5_file) is True
 
     return 'success'
 
diff --git a/autotest/gdrivers/hfa.py b/autotest/gdrivers/hfa.py
index 224a34f7b92c..c422f686e859 100755
--- a/autotest/gdrivers/hfa.py
+++ b/autotest/gdrivers/hfa.py
@@ -36,6 +36,7 @@
 
 
 import gdaltest
+import pytest
 
 ###############################################################################
 # Verify we can read the special histogram metadata from a provided image.
@@ -47,33 +48,20 @@ def test_hfa_histread():
     md = ds.GetRasterBand(1).GetMetadata()
     ds = None
 
-    if md['STATISTICS_MINIMUM'] != '8':
-        gdaltest.post_reason('STATISTICS_MINIMUM is wrong.')
-        return 'fail'
+    assert md['STATISTICS_MINIMUM'] == '8', 'STATISTICS_MINIMUM is wrong.'
 
-    if md['STATISTICS_MEDIAN'] != '148':
-        gdaltest.post_reason('STATISTICS_MEDIAN is wrong.')
-        return 'fail'
+    assert md['STATISTICS_MEDIAN'] == '148', 'STATISTICS_MEDIAN is wrong.'
 
-    if md['STATISTICS_HISTOMAX'] != '255':
-        gdaltest.post_reason('STATISTICS_HISTOMAX is wrong.')
-        return 'fail'
+    assert md['STATISTICS_HISTOMAX'] == '255', 'STATISTICS_HISTOMAX is wrong.'
 
-    if md['STATISTICS_HISTOBINVALUES'] != '0|0|0|0|0|0|0|0|8|0|0|0|0|0|0|0|23|0|0|0|0|0|0|0|0|29|0|0|0|0|0|0|0|46|0|0|0|0|0|0|0|69|0|0|0|0|0|0|0|99|0|0|0|0|0|0|0|0|120|0|0|0|0|0|0|0|178|0|0|0|0|0|0|0|193|0|0|0|0|0|0|0|212|0|0|0|0|0|0|0|281|0|0|0|0|0|0|0|0|365|0|0|0|0|0|0|0|460|0|0|0|0|0|0|0|533|0|0|0|0|0|0|0|544|0|0|0|0|0|0|0|0|626|0|0|0|0|0|0|0|653|0|0|0|0|0|0|0|673|0|0|0|0|0|0|0|629|0|0|0|0|0|0|0|0|586|0|0|0|0|0|0|0|541|0|0|0|0|0|0|0|435|0|0|0|0|0|0|0|348|0|0|0|0|0|0|0|341|0|0|0|0|0|0|0|0|284|0|0|0|0|0|0|0|225|0|0|0|0|0|0|0|237|0|0|0|0|0|0|0|172|0|0|0|0|0|0|0|0|159|0|0|0|0|0|0|0|105|0|0|0|0|0|0|0|824|':
-        gdaltest.post_reason('STATISTICS_HISTOBINVALUES is wrong.')
-        return 'fail'
+    assert md['STATISTICS_HISTOBINVALUES'] == '0|0|0|0|0|0|0|0|8|0|0|0|0|0|0|0|23|0|0|0|0|0|0|0|0|29|0|0|0|0|0|0|0|46|0|0|0|0|0|0|0|69|0|0|0|0|0|0|0|99|0|0|0|0|0|0|0|0|120|0|0|0|0|0|0|0|178|0|0|0|0|0|0|0|193|0|0|0|0|0|0|0|212|0|0|0|0|0|0|0|281|0|0|0|0|0|0|0|0|365|0|0|0|0|0|0|0|460|0|0|0|0|0|0|0|533|0|0|0|0|0|0|0|544|0|0|0|0|0|0|0|0|626|0|0|0|0|0|0|0|653|0|0|0|0|0|0|0|673|0|0|0|0|0|0|0|629|0|0|0|0|0|0|0|0|586|0|0|0|0|0|0|0|541|0|0|0|0|0|0|0|435|0|0|0|0|0|0|0|348|0|0|0|0|0|0|0|341|0|0|0|0|0|0|0|0|284|0|0|0|0|0|0|0|225|0|0|0|0|0|0|0|237|0|0|0|0|0|0|0|172|0|0|0|0|0|0|0|0|159|0|0|0|0|0|0|0|105|0|0|0|0|0|0|0|824|', \
+        'STATISTICS_HISTOBINVALUES is wrong.'
 
-    if md['STATISTICS_SKIPFACTORX'] != '1':
-        gdaltest.post_reason('STATISTICS_SKIPFACTORX is wrong.')
-        return 'fail'
+    assert md['STATISTICS_SKIPFACTORX'] == '1', 'STATISTICS_SKIPFACTORX is wrong.'
 
-    if md['STATISTICS_SKIPFACTORY'] != '1':
-        gdaltest.post_reason('STATISTICS_SKIPFACTORY is wrong.')
-        return 'fail'
+    assert md['STATISTICS_SKIPFACTORY'] == '1', 'STATISTICS_SKIPFACTORY is wrong.'
 
-    if md['STATISTICS_EXCLUDEDVALUES'] != '0':
-        gdaltest.post_reason('STATISTICS_EXCLUDEDVALUE is wrong.')
-        return 'fail'
+    assert md['STATISTICS_EXCLUDEDVALUES'] == '0', 'STATISTICS_EXCLUDEDVALUE is wrong.'
 
     return 'success'
 
@@ -101,21 +89,14 @@ def test_hfa_histwrite():
 
     drv.Delete('tmp/work.img')
 
-    if md['STATISTICS_MINIMUM'] != '8':
-        gdaltest.post_reason('STATISTICS_MINIMUM is wrong.')
-        return 'fail'
+    assert md['STATISTICS_MINIMUM'] == '8', 'STATISTICS_MINIMUM is wrong.'
 
-    if md['STATISTICS_MEDIAN'] != '148':
-        gdaltest.post_reason('STATISTICS_MEDIAN is wrong.')
-        return 'fail'
+    assert md['STATISTICS_MEDIAN'] == '148', 'STATISTICS_MEDIAN is wrong.'
 
-    if md['STATISTICS_HISTOMAX'] != '255':
-        gdaltest.post_reason('STATISTICS_HISTOMAX is wrong.')
-        return 'fail'
+    assert md['STATISTICS_HISTOMAX'] == '255', 'STATISTICS_HISTOMAX is wrong.'
 
-    if md['STATISTICS_HISTOBINVALUES'] != '0|0|0|0|0|0|0|0|8|0|0|0|0|0|0|0|23|0|0|0|0|0|0|0|0|29|0|0|0|0|0|0|0|46|0|0|0|0|0|0|0|69|0|0|0|0|0|0|0|99|0|0|0|0|0|0|0|0|120|0|0|0|0|0|0|0|178|0|0|0|0|0|0|0|193|0|0|0|0|0|0|0|212|0|0|0|0|0|0|0|281|0|0|0|0|0|0|0|0|365|0|0|0|0|0|0|0|460|0|0|0|0|0|0|0|533|0|0|0|0|0|0|0|544|0|0|0|0|0|0|0|0|626|0|0|0|0|0|0|0|653|0|0|0|0|0|0|0|673|0|0|0|0|0|0|0|629|0|0|0|0|0|0|0|0|586|0|0|0|0|0|0|0|541|0|0|0|0|0|0|0|435|0|0|0|0|0|0|0|348|0|0|0|0|0|0|0|341|0|0|0|0|0|0|0|0|284|0|0|0|0|0|0|0|225|0|0|0|0|0|0|0|237|0|0|0|0|0|0|0|172|0|0|0|0|0|0|0|0|159|0|0|0|0|0|0|0|105|0|0|0|0|0|0|0|824|':
-        gdaltest.post_reason('STATISTICS_HISTOBINVALUES is wrong.')
-        return 'fail'
+    assert md['STATISTICS_HISTOBINVALUES'] == '0|0|0|0|0|0|0|0|8|0|0|0|0|0|0|0|23|0|0|0|0|0|0|0|0|29|0|0|0|0|0|0|0|46|0|0|0|0|0|0|0|69|0|0|0|0|0|0|0|99|0|0|0|0|0|0|0|0|120|0|0|0|0|0|0|0|178|0|0|0|0|0|0|0|193|0|0|0|0|0|0|0|212|0|0|0|0|0|0|0|281|0|0|0|0|0|0|0|0|365|0|0|0|0|0|0|0|460|0|0|0|0|0|0|0|533|0|0|0|0|0|0|0|544|0|0|0|0|0|0|0|0|626|0|0|0|0|0|0|0|653|0|0|0|0|0|0|0|673|0|0|0|0|0|0|0|629|0|0|0|0|0|0|0|0|586|0|0|0|0|0|0|0|541|0|0|0|0|0|0|0|435|0|0|0|0|0|0|0|348|0|0|0|0|0|0|0|341|0|0|0|0|0|0|0|0|284|0|0|0|0|0|0|0|225|0|0|0|0|0|0|0|237|0|0|0|0|0|0|0|172|0|0|0|0|0|0|0|0|159|0|0|0|0|0|0|0|105|0|0|0|0|0|0|0|824|', \
+        'STATISTICS_HISTOBINVALUES is wrong.'
 
     return 'success'
 
@@ -155,9 +136,7 @@ def test_hfa_histrewrite():
 
     drv.Delete('tmp/work.img')
 
-    if histStr != newHist:
-        gdaltest.post_reason('Rewritten STATISTICS_HISTOBINVALUES is wrong.')
-        return 'fail'
+    assert histStr == newHist, 'Rewritten STATISTICS_HISTOBINVALUES is wrong.'
 
     return 'success'
 
@@ -171,33 +150,19 @@ def test_hfa_int_stats_1():
     md = ds.GetRasterBand(1).GetMetadata()
     ds = None
 
-    if md['STATISTICS_MINIMUM'] != '40918':
-        gdaltest.post_reason('STATISTICS_MINIMUM is wrong.')
-        return 'fail'
+    assert md['STATISTICS_MINIMUM'] == '40918', 'STATISTICS_MINIMUM is wrong.'
 
-    if md['STATISTICS_MAXIMUM'] != '41134':
-        gdaltest.post_reason('STATISTICS_MAXIMUM is wrong.')
-        return 'fail'
+    assert md['STATISTICS_MAXIMUM'] == '41134', 'STATISTICS_MAXIMUM is wrong.'
 
-    if md['STATISTICS_MEDIAN'] != '41017':
-        gdaltest.post_reason('STATISTICS_MEDIAN is wrong.')
-        return 'fail'
+    assert md['STATISTICS_MEDIAN'] == '41017', 'STATISTICS_MEDIAN is wrong.'
 
-    if md['STATISTICS_MODE'] != '41013':
-        gdaltest.post_reason('STATISTICS_MODE is wrong.')
-        return 'fail'
+    assert md['STATISTICS_MODE'] == '41013', 'STATISTICS_MODE is wrong.'
 
-    if md['STATISTICS_HISTOMIN'] != '40918':
-        gdaltest.post_reason('STATISTICS_HISTOMIN is wrong.')
-        return 'fail'
+    assert md['STATISTICS_HISTOMIN'] == '40918', 'STATISTICS_HISTOMIN is wrong.'
 
-    if md['STATISTICS_HISTOMAX'] != '41134':
-        gdaltest.post_reason('STATISTICS_HISTOMAX is wrong.')
-        return 'fail'
+    assert md['STATISTICS_HISTOMAX'] == '41134', 'STATISTICS_HISTOMAX is wrong.'
 
-    if md['LAYER_TYPE'] != 'athematic':
-        gdaltest.post_reason('LAYER_TYPE is wrong.')
-        return 'fail'
+    assert md['LAYER_TYPE'] == 'athematic', 'LAYER_TYPE is wrong.'
 
     return 'success'
 
@@ -213,21 +178,13 @@ def test_hfa_int_stats_2():
 
     tolerance = 0.0001
 
-    if abs(stats[0] - 40918.0) > tolerance:
-        gdaltest.post_reason('Minimum value is wrong.')
-        return 'fail'
+    assert abs(stats[0] - 40918.0) <= tolerance, 'Minimum value is wrong.'
 
-    if abs(stats[1] - 41134.0) > tolerance:
-        gdaltest.post_reason('Maximum value is wrong.')
-        return 'fail'
+    assert abs(stats[1] - 41134.0) <= tolerance, 'Maximum value is wrong.'
 
-    if abs(stats[2] - 41019.784218148) > tolerance:
-        gdaltest.post_reason('Mean value is wrong.')
-        return 'fail'
+    assert abs(stats[2] - 41019.784218148) <= tolerance, 'Mean value is wrong.'
 
-    if abs(stats[3] - 44.637237445468) > tolerance:
-        gdaltest.post_reason('StdDev value is wrong.')
-        return 'fail'
+    assert abs(stats[3] - 44.637237445468) <= tolerance, 'StdDev value is wrong.'
 
     return 'success'
 
@@ -244,38 +201,24 @@ def test_hfa_float_stats_1():
     tolerance = 0.0001
 
     mini = float(md['STATISTICS_MINIMUM'])
-    if abs(mini - 40.91858291626) > tolerance:
-        gdaltest.post_reason('STATISTICS_MINIMUM is wrong.')
-        return 'fail'
+    assert abs(mini - 40.91858291626) <= tolerance, 'STATISTICS_MINIMUM is wrong.'
 
     maxi = float(md['STATISTICS_MAXIMUM'])
-    if abs(maxi - 41.134323120117) > tolerance:
-        gdaltest.post_reason('STATISTICS_MAXIMUM is wrong.')
-        return 'fail'
+    assert abs(maxi - 41.134323120117) <= tolerance, 'STATISTICS_MAXIMUM is wrong.'
 
     median = float(md['STATISTICS_MEDIAN'])
-    if abs(median - 41.017182931304) > tolerance:
-        gdaltest.post_reason('STATISTICS_MEDIAN is wrong.')
-        return 'fail'
+    assert abs(median - 41.017182931304) <= tolerance, 'STATISTICS_MEDIAN is wrong.'
 
     mod = float(md['STATISTICS_MODE'])
-    if abs(mod - 41.0104410499) > tolerance:
-        gdaltest.post_reason('STATISTICS_MODE is wrong.')
-        return 'fail'
+    assert abs(mod - 41.0104410499) <= tolerance, 'STATISTICS_MODE is wrong.'
 
     histMin = float(md['STATISTICS_HISTOMIN'])
-    if abs(histMin - 40.91858291626) > tolerance:
-        gdaltest.post_reason('STATISTICS_HISTOMIN is wrong.')
-        return 'fail'
+    assert abs(histMin - 40.91858291626) <= tolerance, 'STATISTICS_HISTOMIN is wrong.'
 
     histMax = float(md['STATISTICS_HISTOMAX'])
-    if abs(histMax - 41.134323120117) > tolerance:
-        gdaltest.post_reason('STATISTICS_HISTOMAX is wrong.')
-        return 'fail'
+    assert abs(histMax - 41.134323120117) <= tolerance, 'STATISTICS_HISTOMAX is wrong.'
 
-    if md['LAYER_TYPE'] != 'athematic':
-        gdaltest.post_reason('LAYER_TYPE is wrong.')
-        return 'fail'
+    assert md['LAYER_TYPE'] == 'athematic', 'LAYER_TYPE is wrong.'
 
     return 'success'
 
@@ -291,21 +234,13 @@ def test_hfa_float_stats_2():
 
     tolerance = 0.0001
 
-    if abs(stats[0] - 40.91858291626) > tolerance:
-        gdaltest.post_reason('Minimum value is wrong.')
-        return 'fail'
+    assert abs(stats[0] - 40.91858291626) <= tolerance, 'Minimum value is wrong.'
 
-    if abs(stats[1] - 41.134323120117) > tolerance:
-        gdaltest.post_reason('Maximum value is wrong.')
-        return 'fail'
+    assert abs(stats[1] - 41.134323120117) <= tolerance, 'Maximum value is wrong.'
 
-    if abs(stats[2] - 41.020284249223) > tolerance:
-        gdaltest.post_reason('Mean value is wrong.')
-        return 'fail'
+    assert abs(stats[2] - 41.020284249223) <= tolerance, 'Mean value is wrong.'
 
-    if abs(stats[3] - 0.044636441749041) > tolerance:
-        gdaltest.post_reason('StdDev value is wrong.')
-        return 'fail'
+    assert abs(stats[3] - 0.044636441749041) <= tolerance, 'StdDev value is wrong.'
 
     return 'success'
 
@@ -321,9 +256,7 @@ def test_hfa_int_read():
     band.ReadRaster(100, 100, 1, 1)
     ds = None
 
-    if cs != 6691:
-        gdaltest.post_reason('Checksum value is wrong.')
-        return 'fail'
+    assert cs == 6691, 'Checksum value is wrong.'
 
     return 'success'
 
@@ -339,17 +272,13 @@ def test_hfa_float_read():
     data = band.ReadRaster(100, 100, 1, 1)
     ds = None
 
-    if cs != 23529:
-        gdaltest.post_reason('Checksum value is wrong.')
-        return 'fail'
+    assert cs == 23529, 'Checksum value is wrong.'
 
     # Read raw data into tuple of float numbers
     import struct
     value = struct.unpack('f' * 1, data)[0]
 
-    if abs(value - 41.021659851074219) > 0.0001:
-        gdaltest.post_reason('Pixel value is wrong.')
-        return 'fail'
+    assert abs(value - 41.021659851074219) <= 0.0001, 'Pixel value is wrong.'
 
     return 'success'
 
@@ -363,10 +292,7 @@ def test_hfa_pe_read():
     wkt = ds.GetProjectionRef()
     expected = 'PROJCS["World_Cube",GEOGCS["GCS_WGS_1984",DATUM["WGS_1984",SPHEROID["WGS_84",6378137.0,298.257223563]],PRIMEM["Greenwich",0.0],UNIT["Degree",0.0174532925199433]],PROJECTION["Cube"],PARAMETER["False_Easting",0.0],PARAMETER["False_Northing",0.0],PARAMETER["Central_Meridian",0.0],PARAMETER["Option",1.0],UNIT["Meter",1.0]]'
 
-    if wkt != expected:
-        print(wkt)
-        gdaltest.post_reason('failed to read pe string as expected.')
-        return 'fail'
+    assert wkt == expected, 'failed to read pe string as expected.'
 
     return 'success'
 
@@ -389,10 +315,7 @@ def test_hfa_pe_write():
 
     if wkt != expected:
         print('')
-        print(expected)
-        print(wkt)
-        gdaltest.post_reason('failed to write pe string as expected.')
-        return 'fail'
+        pytest.fail('failed to write pe string as expected.')
 
     ds = None
     drv.Delete('tmp/87test.img')
@@ -414,11 +337,7 @@ def test_hfa_metadata_1():
 
     ds = gdal.Open('tmp/md_1.img')
     md = ds.GetRasterBand(1).GetMetadata()
-    if md['test'] != md_val:
-        print(md['test'])
-        print(md_val)
-        gdaltest.post_reason('got wrong metadata back')
-        return 'fail'
+    assert md['test'] == md_val, 'got wrong metadata back'
     ds = None
 
     return 'success'
@@ -439,14 +358,9 @@ def test_hfa_metadata_2():
 
     ds = gdal.Open('tmp/md_1.img')
     md = ds.GetRasterBand(1).GetMetadata()
-    if 'xxx' not in md:
-        gdaltest.post_reason('metadata rewrite seems not to have worked')
-        return 'fail'
+    assert 'xxx' in md, 'metadata rewrite seems not to have worked'
 
-    if md['xxx'] != '123' or md['test'] != '0123456789':
-        print(md)
-        gdaltest.post_reason('got wrong metadata back')
-        return 'fail'
+    assert md['xxx'] == '123' and md['test'] == '0123456789', 'got wrong metadata back'
 
     ds = None
     gdal.GetDriverByName('HFA').Delete('tmp/md_1.img')
@@ -470,16 +384,11 @@ def test_hfa_grow_rrdlist():
     result = ds.BuildOverviews(overviewlist=[4, 8])
     ds = None
 
-    if result != 0:
-        gdaltest.post_reason('BuildOverviews failed.')
-        return 'fail'
+    assert result == 0, 'BuildOverviews failed.'
 
     # Verify overviews are now findable.
     ds = gdal.Open('tmp/bug_1109.img')
-    if ds.GetRasterBand(1).GetOverviewCount() != 3:
-        gdaltest.post_reason('Overview count wrong.')
-        print(ds.GetRasterBand(1).GetOverviewCount())
-        return 'fail'
+    assert ds.GetRasterBand(1).GetOverviewCount() == 3, 'Overview count wrong.'
 
     ds = None
     gdal.GetDriverByName('HFA').Delete('tmp/bug_1109.img')
@@ -519,8 +428,7 @@ def test_hfa_clean_ige():
 
     if not found:
         print(filelist)
-        gdaltest.post_reason('no igetest.ige in file list!')
-        return 'fail'
+        pytest.fail('no igetest.ige in file list!')
 
     # Create a file without a spill file, and verify old ige cleaned up.
 
@@ -551,14 +459,10 @@ def test_hfa_corrupt_aux():
     ds = gdal.Open('data/F0116231.aux')
     gdal.PopErrorHandler()
 
-    if ds.RasterXSize != 1104:
-        gdaltest.post_reason('did not get expected dataset characteristics')
-        return 'fail'
+    assert ds.RasterXSize == 1104, 'did not get expected dataset characteristics'
 
-    if gdal.GetLastErrorType() != 2 \
-       or gdal.GetLastErrorMsg().find('Corrupt (looping)') == -1:
-        gdaltest.post_reason('Did not get expected warning.')
-        return 'fail'
+    assert gdal.GetLastErrorType() == 2 and gdal.GetLastErrorMsg().find('Corrupt (looping)') != -1, \
+        'Did not get expected warning.'
 
     ds = None
 
@@ -616,29 +520,19 @@ def test_hfa_nodata_read():
     ds = gdal.Open('tmp/nodata.img')
     b = ds.GetRasterBand(1)
 
-    if b.GetNoDataValue() != 1:
-        gdaltest.post_reason('failed to preserve nodata value')
-        return 'fail'
+    assert b.GetNoDataValue() == 1, 'failed to preserve nodata value'
 
     stats = b.GetStatistics(False, True)
 
     tolerance = 0.0001
 
-    if abs(stats[0] - 2) > tolerance:
-        gdaltest.post_reason('Minimum value is wrong.')
-        return 'fail'
+    assert abs(stats[0] - 2) <= tolerance, 'Minimum value is wrong.'
 
-    if abs(stats[1] - 4) > tolerance:
-        gdaltest.post_reason('Maximum value is wrong.')
-        return 'fail'
+    assert abs(stats[1] - 4) <= tolerance, 'Maximum value is wrong.'
 
-    if abs(stats[2] - 2.6666666666667) > tolerance:
-        gdaltest.post_reason('Mean value is wrong.')
-        return 'fail'
+    assert abs(stats[2] - 2.6666666666667) <= tolerance, 'Mean value is wrong.'
 
-    if abs(stats[3] - 0.94280904158206) > tolerance:
-        gdaltest.post_reason('StdDev value is wrong.')
-        return 'fail'
+    assert abs(stats[3] - 0.94280904158206) <= tolerance, 'StdDev value is wrong.'
 
     b = None
     ds = None
@@ -666,8 +560,7 @@ def test_hfa_rotated_read():
             print('')
             print('old = ', check_gt)
             print('new = ', new_gt)
-            gdaltest.post_reason('Geotransform differs.')
-            return 'fail'
+            pytest.fail('Geotransform differs.')
 
     ds = None
     return 'success'
@@ -730,12 +623,10 @@ def test_hfa_rotated_write():
             print('')
             print('old = ', check_gt)
             print('new = ', new_gt)
-            gdaltest.post_reason('Geotransform differs.')
-            return 'fail'
+            pytest.fail('Geotransform differs.')
 
     wkt = ds.GetProjection()
-    if not gdaltest.equal_srs_from_wkt(expected_wkt, wkt):
-        return 'fail'
+    assert gdaltest.equal_srs_from_wkt(expected_wkt, wkt)
 
     ds = None
 
@@ -821,21 +712,10 @@ def test_hfa_unique_values_color_table():
 
     ct = ds.GetRasterBand(1).GetRasterColorTable()
 
-    if ct.GetCount() != 256:
-        print(ct.GetCount())
-        gdaltest.post_reason('got wrong color count')
-        return 'fail'
-
-    if ct.GetColorEntry(253) != (0, 0, 0, 0) \
-       or ct.GetColorEntry(254) != (255, 255, 170, 255) \
-       or ct.GetColorEntry(255) != (255, 255, 255, 255):
+    assert ct.GetCount() == 256, 'got wrong color count'
 
-        print(ct.GetColorEntry(253))
-        print(ct.GetColorEntry(254))
-        print(ct.GetColorEntry(255))
-
-        gdaltest.post_reason('Got wrong colors')
-        return 'fail'
+    assert ct.GetColorEntry(253) == (0, 0, 0, 0) and ct.GetColorEntry(254) == (255, 255, 170, 255) and ct.GetColorEntry(255) == (255, 255, 255, 255), \
+        'Got wrong colors'
 
     ct = None
     ds = None
@@ -858,34 +738,19 @@ def test_hfa_unique_values_hist():
     md = ds.GetRasterBand(1).GetMetadata()
 
     expected = '12603|1|0|0|45|1|0|0|0|0|656|177|0|0|5026|1062|0|0|2|0|0|0|0|0|0|0|0|0|0|0|0|0|75|1|0|0|207|158|0|0|8|34|0|0|0|0|538|57|0|10|214|20|0|0|0|0|0|0|0|0|0|0|0|0|0|0|0|0|1|31|0|0|9|625|67|0|0|118|738|117|3004|1499|491|187|1272|513|1|0|0|0|0|0|0|0|0|0|0|0|0|0|0|0|0|0|0|16|3|0|0|283|123|5|1931|835|357|332|944|451|80|40|0|0|0|0|0|0|0|0|0|0|0|0|0|0|0|0|0|0|0|0|0|12|5|0|0|535|1029|118|0|33|246|342|0|0|10|8|0|0|0|0|0|0|0|0|0|0|0|0|0|0|0|0|0|0|0|0|0|169|439|0|0|6|990|329|0|0|120|295|0|0|0|0|0|0|0|0|0|0|0|0|0|0|0|0|0|0|0|0|0|0|0|0|0|0|164|42|0|0|570|966|0|0|18|152|0|0|0|0|0|0|0|0|0|0|0|0|0|0|0|0|0|0|0|0|0|0|0|0|0|0|45|106|0|0|16|16517|'
-    if md['STATISTICS_HISTOBINVALUES'] != expected:
-        print(md['STATISTICS_HISTOBINVALUES'])
-        gdaltest.post_reason('Unexpected HISTOBINVALUES.')
-        return 'fail'
+    assert md['STATISTICS_HISTOBINVALUES'] == expected, 'Unexpected HISTOBINVALUES.'
 
-    if md['STATISTICS_HISTOMIN'] != '0' \
-       or md['STATISTICS_HISTOMAX'] != '255':
-        print(md)
-        gdaltest.post_reason("unexpected histomin/histomax value.")
-        return 'fail'
+    assert md['STATISTICS_HISTOMIN'] == '0' and md['STATISTICS_HISTOMAX'] == '255', \
+        "unexpected histomin/histomax value."
 
     # lets also check the RAT to ensure it has the BinValues column added.
 
     rat = ds.GetRasterBand(1).GetDefaultRAT()
 
-    if rat.GetColumnCount() != 6 \
-       or rat.GetTypeOfCol(0) != gdal.GFT_Real \
-       or rat.GetUsageOfCol(0) != gdal.GFU_MinMax:
-        print(rat.GetColumnCount())
-        print(rat.GetTypeOfCol(0))
-        print(rat.GetUsageOfCol(0))
-        gdaltest.post_reason('BinValues column wrong.')
-        return 'fail'
+    assert rat.GetColumnCount() == 6 and rat.GetTypeOfCol(0) == gdal.GFT_Real and rat.GetUsageOfCol(0) == gdal.GFU_MinMax, \
+        'BinValues column wrong.'
 
-    if rat.GetValueAsInt(2, 0) != 4:
-        print(rat.GetValueAsInt(2, 0))
-        gdaltest.post_reason('BinValues value wrong.')
-        return 'fail'
+    assert rat.GetValueAsInt(2, 0) == 4, 'BinValues value wrong.'
 
     rat = None
 
@@ -920,31 +785,20 @@ def test_hfa_xforms_3rd():
             gdaltest.post_reason('metadata item %d missing' % check_item[0])
             return 'fail'
 
-        if abs(value - check_item[1]) > abs(value / 100000.0):
-            gdaltest.post_reason('metadata item %s has wrong value: %.15g' %
+        assert abs(value - check_item[1]) <= abs(value / 100000.0), \
+            ('metadata item %s has wrong value: %.15g' %
                                  (check_item[0], value))
-            return 'fail'
 
     # Check that the GCPs are as expected implying that the evaluation
     # function for XFORMs if working ok.
 
     gcps = ds.GetGCPs()
 
-    if gcps[0].GCPPixel != 0.5 \
-       or gcps[0].GCPLine != 0.5 \
-       or abs(gcps[0].GCPX - 1667635.007) > 0.001 \
-       or abs(gcps[0].GCPY - 2620003.171) > 0.001:
-        print(gcps[0].GCPPixel, gcps[0].GCPLine, gcps[0].GCPX, gcps[0].GCPY)
-        gdaltest.post_reason('GCP 0 value wrong.')
-        return 'fail'
+    assert gcps[0].GCPPixel == 0.5 and gcps[0].GCPLine == 0.5 and abs(gcps[0].GCPX - 1667635.007) <= 0.001 and abs(gcps[0].GCPY - 2620003.171) <= 0.001, \
+        'GCP 0 value wrong.'
 
-    if abs(gcps[14].GCPPixel - 1769.7) > 0.1 \
-       or abs(gcps[14].GCPLine - 2124.9) > 0.1 \
-       or abs(gcps[14].GCPX - 1665221.064) > 0.001 \
-       or abs(gcps[14].GCPY - 2632414.379) > 0.001:
-        print(gcps[14].GCPPixel, gcps[14].GCPLine, gcps[14].GCPX, gcps[14].GCPY)
-        gdaltest.post_reason('GCP 14 value wrong.')
-        return 'fail'
+    assert abs(gcps[14].GCPPixel - 1769.7) <= 0.1 and abs(gcps[14].GCPLine - 2124.9) <= 0.1 and abs(gcps[14].GCPX - 1665221.064) <= 0.001 and abs(gcps[14].GCPY - 2632414.379) <= 0.001, \
+        'GCP 14 value wrong.'
 
     ds = None
 
@@ -976,9 +830,7 @@ def test_hfa_delete_colortable():
 
     # check color table gone.
     ds = gdal.Open('tmp/i8u.img')
-    if ds.GetRasterBand(1).GetColorTable() is not None:
-        gdaltest.post_reason('failed to remove color table')
-        return 'fail'
+    assert ds.GetRasterBand(1).GetColorTable() is None, 'failed to remove color table'
 
     ds = None
 
@@ -1016,9 +868,7 @@ def test_hfa_delete_colortable2():
 
     # check color table gone.
     ds = gdal.Open('tmp/hfa_delete_colortable2.img')
-    if ds.GetRasterBand(1).GetColorTable() is not None:
-        gdaltest.post_reason('failed to remove color table')
-        return 'fail'
+    assert ds.GetRasterBand(1).GetColorTable() is None, 'failed to remove color table'
 
     ds = None
 
@@ -1036,9 +886,8 @@ def test_hfa_excluded_values():
     md = ds.GetRasterBand(1).GetMetadata()
     ds = None
 
-    if md['STATISTICS_EXCLUDEDVALUES'] != '0,8,9':
-        gdaltest.post_reason('STATISTICS_EXCLUDEDVALUE is wrong.')
-        return 'fail'
+    assert md['STATISTICS_EXCLUDEDVALUES'] == '0,8,9', \
+        'STATISTICS_EXCLUDEDVALUE is wrong.'
 
     return 'success'
 
@@ -1059,13 +908,9 @@ def test_hfa_ov_nodata():
     wrk2_ds = gdal.Open('/vsimem/ov_nodata.img')
     ovb = wrk2_ds.GetRasterBand(1).GetOverview(0)
 
-    if ovb.GetNoDataValue() != -99999:
-        gdaltest.post_reason('nodata not propagated to .img overview.')
-        return 'fail'
+    assert ovb.GetNoDataValue() == -99999, 'nodata not propagated to .img overview.'
 
-    if ovb.GetMaskFlags() != gdal.GMF_NODATA:
-        gdaltest.post_reason('mask flag not as expected.')
-        return 'fail'
+    assert ovb.GetMaskFlags() == gdal.GMF_NODATA, 'mask flag not as expected.'
 
     # Confirm that a .ovr file was *not* produced.
     gdal.PushErrorHandler('CPLQuietErrorHandler')
@@ -1075,9 +920,8 @@ def test_hfa_ov_nodata():
         wrk3_ds = None
     gdal.PopErrorHandler()
 
-    if wrk3_ds is not None:
-        gdaltest.post_reason('this test result is invalid since .ovr file was created, why?')
-        return 'fail'
+    assert wrk3_ds is None, \
+        'this test result is invalid since .ovr file was created, why?'
 
     wrk2_ds = None
     drv.Delete('/vsimem/ov_nodata.img')
@@ -1094,14 +938,11 @@ def test_hfa_read_bit2grayscale():
     band = ds.GetRasterBand(1)
     ov = band.GetOverview(0)
 
-    if ov.Checksum() != 4247:
-        gdaltest.post_reason('did not get expected overview checksum')
-        return 'fail'
+    assert ov.Checksum() == 4247, 'did not get expected overview checksum'
 
     ds_md = ds.GetMetadata()
-    if ds_md['PyramidResamplingType'] != 'AVERAGE_BIT2GRAYSCALE':
-        gdaltest.post_reason('wrong pyramid resampling type metadata.')
-        return 'fail'
+    assert ds_md['PyramidResamplingType'] == 'AVERAGE_BIT2GRAYSCALE', \
+        'wrong pyramid resampling type metadata.'
 
     return 'success'
 
@@ -1126,9 +967,7 @@ def test_hfa_write_bit2grayscale():
 
     ov = ds.GetRasterBand(1).GetOverview(1)
 
-    if ov.Checksum() != 57325:
-        gdaltest.post_reason('wrong checksum for greyscale overview.')
-        return 'fail'
+    assert ov.Checksum() == 57325, 'wrong checksum for greyscale overview.'
 
     ds = None
 
@@ -1169,19 +1008,15 @@ def test_hfa_camera_md():
             gdaltest.post_reason('metadata item %d missing' % check_item[0])
             return 'fail'
 
-        if value != check_item[1]:
-            gdaltest.post_reason('metadata item %s has wrong value: %s' %
+        assert value == check_item[1], ('metadata item %s has wrong value: %s' %
                                  (check_item[0], value))
-            return 'fail'
 
     # Check that the SRS is reasonable.
 
     srs_wkt = md['outputProjection']
     exp_wkt = 'PROJCS["UTM Zone 17, Northern Hemisphere",GEOGCS["NAD27",DATUM["North_American_Datum_1927",SPHEROID["Clarke 1866",6378206.4,294.978698213898,AUTHORITY["EPSG","7008"]],TOWGS84[-10,158,187,0,0,0,0],AUTHORITY["EPSG","6267"]],PRIMEM["Greenwich",0,AUTHORITY["EPSG","8901"]],UNIT["degree",0.0174532925199433,AUTHORITY["EPSG","9108"]],AUTHORITY["EPSG","4267"]],PROJECTION["Transverse_Mercator"],PARAMETER["latitude_of_origin",0],PARAMETER["central_meridian",-81],PARAMETER["scale_factor",0.9996],PARAMETER["false_easting",500000],PARAMETER["false_northing",0],UNIT["Meter",1],AUTHORITY["EPSG","26717"]]'
 
-    if not gdaltest.equal_srs_from_wkt(srs_wkt, exp_wkt):
-        gdaltest.post_reason('wrong outputProjection')
-        return 'fail'
+    assert gdaltest.equal_srs_from_wkt(srs_wkt, exp_wkt), 'wrong outputProjection'
 
     ds = None
     return 'success'
@@ -1194,9 +1029,7 @@ def hfa_verify_dataset_projection(dataset_path, exp_wkt):
 
     ds = gdal.Open(dataset_path)
     srs_wkt = ds.GetProjectionRef()
-    if not gdaltest.equal_srs_from_wkt(exp_wkt, srs_wkt):
-        gdaltest.post_reason('wrong outputProjection')
-        return 'fail'
+    assert gdaltest.equal_srs_from_wkt(exp_wkt, srs_wkt), 'wrong outputProjection'
 
     ds = None
     return 'success'
@@ -1263,26 +1096,18 @@ def test_hfa_rde_overviews():
     exp_cs = 1631
     cs = ds.GetRasterBand(1).Checksum()
 
-    if exp_cs != cs:
-        print(cs)
-        gdaltest.post_reason('did not get expected band checksum')
-        return 'fail'
+    assert exp_cs == cs, 'did not get expected band checksum'
 
     exp_cs = 340
     cs = ds.GetRasterBand(1).GetOverview(0).Checksum()
 
-    if exp_cs != cs:
-        print(cs)
-        gdaltest.post_reason('did not get expected overview checksum')
-        return 'fail'
+    assert exp_cs == cs, 'did not get expected overview checksum'
 
     filelist = ds.GetFileList()
     exp_filelist = ['data/spill.img', 'data/spill.ige', 'data/spill.rrd', 'data/spill.rde']
     exp_filelist_win32 = ['data/spill.img', 'data\\spill.ige', 'data\\spill.rrd', 'data\\spill.rde']
-    if filelist != exp_filelist and filelist != exp_filelist_win32:
-        print(filelist)
-        gdaltest.post_reason('did not get expected file list.')
-        return 'fail'
+    assert filelist == exp_filelist or filelist == exp_filelist_win32, \
+        'did not get expected file list.'
 
     ds = None
 
@@ -1305,41 +1130,28 @@ def test_hfa_copyfiles():
     exp_cs = 340
     cs = ds.GetRasterBand(1).GetOverview(0).Checksum()
 
-    if exp_cs != cs:
-        print(cs)
-        gdaltest.post_reason('did not get expected overview checksum')
-        return 'fail'
+    assert exp_cs == cs, 'did not get expected overview checksum'
 
     filelist = ds.GetFileList()
     exp_filelist = ['tmp/newnamexxx.img', 'tmp/newnamexxx.ige', 'tmp/newnamexxx.rrd', 'tmp/newnamexxx.rde']
     exp_filelist_win32 = ['tmp/newnamexxx.img', 'tmp\\newnamexxx.ige', 'tmp\\newnamexxx.rrd', 'tmp\\newnamexxx.rde']
-    if filelist != exp_filelist and filelist != exp_filelist_win32:
-        print(filelist)
-        gdaltest.post_reason('did not get expected file list.')
-        return 'fail'
+    assert filelist == exp_filelist or filelist == exp_filelist_win32, \
+        'did not get expected file list.'
 
     ds = None
 
     # Check that the filenames in the actual files seem to have been updated.
     img = open('tmp/newnamexxx.img', 'rb').read()
     img = str(img)
-    if img.find('newnamexxx.rrd') == -1:
-        gdaltest.post_reason('RRDNames not updated?')
-        return 'fail'
+    assert img.find('newnamexxx.rrd') != -1, 'RRDNames not updated?'
 
-    if img.find('newnamexxx.ige') == -1:
-        gdaltest.post_reason('spill file not updated?')
-        return 'fail'
+    assert img.find('newnamexxx.ige') != -1, 'spill file not updated?'
 
     rrd = open('tmp/newnamexxx.rrd', 'rb').read()
     rrd = str(rrd)
-    if rrd.find('newnamexxx.img') == -1:
-        gdaltest.post_reason('DependentFile not updated?')
-        return 'fail'
+    assert rrd.find('newnamexxx.img') != -1, 'DependentFile not updated?'
 
-    if rrd.find('newnamexxx.rde') == -1:
-        gdaltest.post_reason('overview spill file not updated?')
-        return 'fail'
+    assert rrd.find('newnamexxx.rde') != -1, 'overview spill file not updated?'
 
     drv.Delete('tmp/newnamexxx.img')
 
@@ -1369,24 +1181,12 @@ def test_hfa_write_rat():
     ds = gdal.Open('tmp/write_rat.img')
     rat = ds.GetRasterBand(1).GetDefaultRAT()
 
-    if rat.GetColumnCount() != 6 \
-       or rat.GetTypeOfCol(0) != gdal.GFT_Real \
-       or rat.GetUsageOfCol(0) != gdal.GFU_Generic:  # should be GFU_MinMax
-        print(rat.GetColumnCount())
-        print(rat.GetTypeOfCol(0))
-        print(rat.GetUsageOfCol(0))
-        gdaltest.post_reason('BinValues column wrong.')
-        return 'fail'
+    assert rat.GetColumnCount() == 6 and rat.GetTypeOfCol(0) == gdal.GFT_Real and rat.GetUsageOfCol(0) == gdal.GFU_Generic, \
+        'BinValues column wrong.'
 
-    if rat.GetValueAsInt(2, 0) != 4:
-        print(rat.GetValueAsInt(2, 0))
-        gdaltest.post_reason('BinValues value wrong.')
-        return 'fail'
+    assert rat.GetValueAsInt(2, 0) == 4, 'BinValues value wrong.'
 
-    if rat.GetValueAsInt(4, 5) != 656:
-        print(rat.GetValueAsInt(4, 5))
-        gdaltest.post_reason('Histogram value wrong.')
-        return 'fail'
+    assert rat.GetValueAsInt(4, 5) == 656, 'Histogram value wrong.'
 
     rat = None
     ds = None
@@ -1421,10 +1221,7 @@ def test_hfa_createcopy_statistics():
 
     gdal.GetDriverByName('HFA').Delete('/vsimem/byte.img')
 
-    if md['STATISTICS_MINIMUM'] != '74':
-        gdaltest.post_reason('STATISTICS_MINIMUM is wrong.')
-        print(md['STATISTICS_MINIMUM'])
-        return 'fail'
+    assert md['STATISTICS_MINIMUM'] == '74', 'STATISTICS_MINIMUM is wrong.'
 
     return 'success'
 
@@ -1436,26 +1233,17 @@ def test_hfa_read_elevation_units():
 
     ds = gdal.Open('../gcore/data/erdas_cm.img')
     unittype = ds.GetRasterBand(1).GetUnitType()
-    if unittype != 'cm':
-        gdaltest.post_reason('Failed to read elevation units')
-        print(unittype)
-        return 'fail'
+    assert unittype == 'cm', 'Failed to read elevation units'
     ds = None
 
     ds = gdal.Open('../gcore/data/erdas_feet.img')
     unittype = ds.GetRasterBand(1).GetUnitType()
-    if unittype != 'feet':
-        gdaltest.post_reason('Failed to read elevation units')
-        print(unittype)
-        return 'fail'
+    assert unittype == 'feet', 'Failed to read elevation units'
     ds = None
 
     ds = gdal.Open('../gcore/data/erdas_m.img')
     unittype = ds.GetRasterBand(1).GetUnitType()
-    if unittype != 'meters':
-        gdaltest.post_reason('Failed to read elevation units')
-        print(unittype)
-        return 'fail'
+    assert unittype == 'meters', 'Failed to read elevation units'
     ds = None
 
     return 'success'
diff --git a/autotest/gdrivers/ida.py b/autotest/gdrivers/ida.py
index 05eb52281cef..27777052b0c4 100755
--- a/autotest/gdrivers/ida.py
+++ b/autotest/gdrivers/ida.py
@@ -33,6 +33,7 @@
 
 
 import gdaltest
+import pytest
 
 ###############################################################################
 # Perform simple read test.
@@ -56,22 +57,16 @@ def test_ida_2():
     if gt[0] != -17.875 or gt[1] != 0.25 or gt[2] != 0 \
        or gt[3] != 37.875 or gt[4] != 0 or gt[5] != -0.25:
         print('got: ', gt)
-        gdaltest.post_reason('Aaigrid geotransform wrong.')
-        return 'fail'
+        pytest.fail('Aaigrid geotransform wrong.')
 
     prj = ds.GetProjection()
-    if prj != 'GEOGCS["WGS 84",DATUM["WGS_1984",SPHEROID["WGS 84",6378137,298.257223563,AUTHORITY["EPSG","7030"]],AUTHORITY["EPSG","6326"]],PRIMEM["Greenwich",0,AUTHORITY["EPSG","8901"]],UNIT["degree",0.0174532925199433,AUTHORITY["EPSG","9122"]],AUTHORITY["EPSG","4326"]]':
-        gdaltest.post_reason('Projection does not match expected:\n%s' % prj)
-        return 'fail'
+    assert prj == 'GEOGCS["WGS 84",DATUM["WGS_1984",SPHEROID["WGS 84",6378137,298.257223563,AUTHORITY["EPSG","7030"]],AUTHORITY["EPSG","6326"]],PRIMEM["Greenwich",0,AUTHORITY["EPSG","8901"]],UNIT["degree",0.0174532925199433,AUTHORITY["EPSG","9122"]],AUTHORITY["EPSG","4326"]]', \
+        ('Projection does not match expected:\n%s' % prj)
 
     band1 = ds.GetRasterBand(1)
-    if band1.GetNoDataValue() != 255:
-        gdaltest.post_reason('Grid NODATA value wrong or missing.')
-        return 'fail'
+    assert band1.GetNoDataValue() == 255, 'Grid NODATA value wrong or missing.'
 
-    if band1.DataType != gdal.GDT_Byte:
-        gdaltest.post_reason('Data type is not byte.')
-        return 'fail'
+    assert band1.DataType == gdal.GDT_Byte, 'Data type is not byte.'
 
     return 'success'
 
diff --git a/autotest/gdrivers/ignfheightasciigrid.py b/autotest/gdrivers/ignfheightasciigrid.py
index 938c9be2ef4d..a00341557bcf 100755
--- a/autotest/gdrivers/ignfheightasciigrid.py
+++ b/autotest/gdrivers/ignfheightasciigrid.py
@@ -99,9 +99,7 @@ def test_ignfheightasciigrid_description_multiword():
     gdal.FileFromMemBuffer(filename, ok_content)
     ds = gdal.OpenEx(filename)
     desc = ds.GetMetadataItem('DESCRIPTION')
-    if desc != 'MULTI WORD':
-        print(desc)
-        return 'fail'
+    assert desc == 'MULTI WORD'
     return 'success'
 
 
@@ -111,10 +109,8 @@ def test_ignfheightasciigrid_invalid():
     ok_content = '2 3 49 50 1 1 1 0 1 0 -0. DESC\r1 2 3 4'
     gdal.FileFromMemBuffer(filename, ok_content)
     ds = gdal.OpenEx(filename)
-    if not ds:
-        return 'fail'
-    if ds.GetRasterBand(1).GetUnitType() != 'm':
-        return 'fail'
+    assert ds
+    assert ds.GetRasterBand(1).GetUnitType() == 'm'
     gdal.Unlink(filename)
 
     contents = ['0 0 0 0 0 0 0 0 0 0 0 0\r',  # a lot of invalid values
@@ -148,9 +144,7 @@ def test_ignfheightasciigrid_invalid():
     for content in contents:
         gdal.FileFromMemBuffer(filename, content)
         with gdaltest.error_handler():
-            if gdal.OpenEx(filename, gdal.OF_RASTER):
-                print(content)
-                return 'fail'
+            assert not gdal.OpenEx(filename, gdal.OF_RASTER), content
         gdal.Unlink(filename)
     return 'success'
 
@@ -168,8 +162,7 @@ def test_ignfheightasciigrid_huge():
 
     ds = gdal.OpenEx(filename, gdal.OF_RASTER)
     gdal.Unlink(filename)
-    if ds is not None:
-        return 'fail'
+    assert ds is None
     return 'success'
 
 
@@ -181,8 +174,7 @@ def test_ignfheightasciigrid_gra():
     tst.testOpen(check_gt=gt, check_prj='WGS84')
 
     ds = gdal.OpenEx('data/ignfheightasciigrid.gra', gdal.OF_RASTER)
-    if ds.GetRasterBand(1).GetNoDataValue() != 9999:
-        return 'fail'
+    assert ds.GetRasterBand(1).GetNoDataValue() == 9999
     return 'success'
 
 
@@ -198,9 +190,7 @@ def test_ignfheightasciigrid_gra_invalid():
     for content in contents:
         gdal.FileFromMemBuffer(filename, content)
         with gdaltest.error_handler():
-            if gdal.OpenEx(filename, gdal.OF_RASTER):
-                print(content)
-                return 'fail'
+            assert not gdal.OpenEx(filename, gdal.OF_RASTER), content
         gdal.Unlink(filename)
     return 'success'
 
diff --git a/autotest/gdrivers/ingr.py b/autotest/gdrivers/ingr.py
index d081e02d5407..f2e0b87fb851 100755
--- a/autotest/gdrivers/ingr.py
+++ b/autotest/gdrivers/ingr.py
@@ -66,9 +66,8 @@ def test_ingr_3():
 
     ds = gdal.Open('data/8bit_pal.cot')
     ct = ds.GetRasterBand(1).GetRasterColorTable()
-    if ct.GetCount() != 256 or ct.GetColorEntry(8) != (8, 8, 8, 255):
-        gdaltest.post_reason('Wrong color table entry.')
-        return 'fail'
+    assert ct.GetCount() == 256 and ct.GetColorEntry(8) == (8, 8, 8, 255), \
+        'Wrong color table entry.'
 
     return 'success'
 
@@ -172,9 +171,7 @@ def test_ingr_14():
     cs = ds.GetRasterBand(1).Checksum()
     ds = None
 
-    if cs != 11466 and cs != 11095:
-        print(cs)
-        return 'fail'
+    assert cs == 11466 or cs == 11095
 
     return 'success'
 
@@ -221,10 +218,7 @@ def test_ingr_17():
 
     gdal.GetDriverByName('INGR').Delete('/vsimem/ingr_17.rle')
 
-    if got_cs != ref_cs:
-        print(got_cs)
-        print(ref_cs)
-        return 'fail'
+    assert got_cs == ref_cs
 
     return 'success'
 
@@ -245,15 +239,13 @@ def test_ingr_18():
 
     got_data = ds.ReadRaster(0, ds.RasterYSize - 1, ds.RasterXSize, 1)
 
-    if got_data != expected_data:
-        return 'fail'
+    assert got_data == expected_data
 
     ds.FlushCache()
 
     got_data = ds.ReadRaster(0, ds.RasterYSize - 1, ds.RasterXSize, 1)
 
-    if got_data != expected_data:
-        return 'fail'
+    assert got_data == expected_data
 
     return 'success'
 
diff --git a/autotest/gdrivers/iris.py b/autotest/gdrivers/iris.py
index 80dfacc7544b..175159520ca2 100755
--- a/autotest/gdrivers/iris.py
+++ b/autotest/gdrivers/iris.py
@@ -51,8 +51,7 @@ def test_iris_1():
 def test_iris_2():
 
     ds = gdal.Open('data/iristest.dat')
-    if ds.GetRasterBand(1).Checksum() != 52872:
-        return 'fail'
+    assert ds.GetRasterBand(1).Checksum() == 52872
 
     ds.GetProjectionRef()
     # expected_wkt = """PROJCS["unnamed",GEOGCS["unnamed ellipse",DATUM["unknown",SPHEROID["unnamed",6371000.5,0]],PRIMEM["Greenwich",0],UNIT["degree",0.0174532925199433]],PROJECTION["Mercator_1SP"],PARAMETER["central_meridian",0],PARAMETER["scale_factor",1],PARAMETER["false_easting",0],PARAMETER["false_northing",0]]"""
@@ -72,11 +71,8 @@ def test_iris_2():
     got_gt = ds.GetGeoTransform()
     expected_gt = [16435.721785269096, 1370.4263720754534, 0.0, 5289830.4584420761, 0.0, -1357.6498705837876]
     for i in range(6):
-        if (expected_gt[i] == 0.0 and got_gt[i] != 0.0) or \
-           (expected_gt[i] != 0.0 and abs(got_gt[i] - expected_gt[i]) / abs(expected_gt[i]) > 1e-5):
-            print(got_gt)
-            print(i)
-            return 'fail'
+        assert (not (expected_gt[i] == 0.0 and got_gt[i] != 0.0) or \
+           (expected_gt[i] != 0.0 and abs(got_gt[i] - expected_gt[i]) / abs(expected_gt[i]) > 1e-5))
 
     expected_metadata = [
         "AZIMUTH_SMOOTHING_FOR_SHEAR=0.0",
@@ -110,10 +106,7 @@ def test_iris_2():
     for md in expected_metadata:
         key = md[0:md.find('=')]
         value = md[md.find('=') + 1:]
-        if got_metadata[key] != value:
-            gdaltest.post_reason('did not find %s' % key)
-            print(got_metadata)
-            return 'fail'
+        assert got_metadata[key] == value, ('did not find %s' % key)
 
     return 'success'
 
diff --git a/autotest/gdrivers/isce.py b/autotest/gdrivers/isce.py
index b546bfbabad8..0e49679a7737 100755
--- a/autotest/gdrivers/isce.py
+++ b/autotest/gdrivers/isce.py
@@ -71,8 +71,7 @@ def test_isce_2():
 
     ds = gdal.Open('data/isce.slc')
     val = ds.GetMetadataItem('IMAGE_TYPE', 'ISCE')
-    if val != 'slc':
-        return 'fail'
+    assert val == 'slc'
 
     return 'success'
 
diff --git a/autotest/gdrivers/isis.py b/autotest/gdrivers/isis.py
index 6daaf0f71c3c..6fc59a6a1773 100755
--- a/autotest/gdrivers/isis.py
+++ b/autotest/gdrivers/isis.py
@@ -37,6 +37,7 @@
 from osgeo import gdal
 from osgeo import osr
 import gdaltest
+import pytest
 
 ###############################################################################
 # Perform simple read test on isis3 detached dataset.
@@ -119,23 +120,13 @@ def test_isis_4():
     ret = tst.testCreateCopy(new_filename='/vsimem/isis_tmp.lbl',
                              delete_copy=0)
     ds = gdal.Open('/vsimem/isis_tmp.lbl')
-    if ds.GetMetadataDomainList() != ['', 'json:ISIS3']:
-        print(ds.GetMetadataDomainList())
-        return 'fail'
+    assert ds.GetMetadataDomainList() == ['', 'json:ISIS3']
     lbl = ds.GetMetadata_List('json:ISIS3')[0]
     # Couldn't be preserved, since points to dangling file
-    if lbl.find('OriginalLabel') >= 0:
-        print(lbl)
-        return 'fail'
-    if lbl.find('PositiveWest') >= 0:
-        print(lbl)
-        return 'fail'
-    if ds.GetRasterBand(1).GetMaskFlags() != 0:
-        print(ds.GetRasterBand(1).GetMaskFlags())
-        return 'fail'
-    if ds.GetRasterBand(1).GetMaskBand().Checksum() != 12220:
-        print(ds.GetRasterBand(1).GetMaskBand().Checksum())
-        return 'fail'
+    assert lbl.find('OriginalLabel') < 0
+    assert lbl.find('PositiveWest') < 0
+    assert ds.GetRasterBand(1).GetMaskFlags() == 0
+    assert ds.GetRasterBand(1).GetMaskBand().Checksum() == 12220
     ds = None
     gdal.GetDriverByName('ISIS3').Delete('/vsimem/isis_tmp.lbl')
 
@@ -146,12 +137,8 @@ def test_isis_4():
                              delete_copy=0)
     ds = gdal.Open('/vsimem/isis_tmp.lbl')
     lbl = ds.GetMetadata_List('json:ISIS3')[0]
-    if lbl.find('PositiveWest') < 0:
-        print(lbl)
-        return 'fail'
-    if lbl.find('Planetographic') < 0:
-        print(lbl)
-        return 'fail'
+    assert lbl.find('PositiveWest') >= 0
+    assert lbl.find('Planetographic') >= 0
     ds = None
     gdal.GetDriverByName('ISIS3').Delete('/vsimem/isis_tmp.lbl')
 
@@ -165,15 +152,9 @@ def test_isis_4():
                              delete_copy=0)
     ds = gdal.Open('/vsimem/isis_tmp.lbl')
     lbl = ds.GetMetadata_List('json:ISIS3')[0]
-    if lbl.find('PositiveEast') < 0:
-        print(lbl)
-        return 'fail'
-    if lbl.find('Planetocentric') < 0:
-        print(lbl)
-        return 'fail'
-    if lbl.find('my_label') < 0:
-        print(lbl)
-        return 'fail'
+    assert lbl.find('PositiveEast') >= 0
+    assert lbl.find('Planetocentric') >= 0
+    assert lbl.find('my_label') >= 0
     ds = None
     gdal.GetDriverByName('ISIS3').Delete('/vsimem/isis_tmp.lbl')
 
@@ -189,13 +170,10 @@ def test_isis_5():
                                      'WRITE_BOUNDING_DEGREES=NO'])
     ret = tst.testCreateCopy(new_filename='/vsimem/isis_tmp.lbl',
                              delete_copy=0)
-    if gdal.VSIStatL('/vsimem/isis_tmp.cub') is not None:
-        return 'fail'
+    assert gdal.VSIStatL('/vsimem/isis_tmp.cub') is None
     ds = gdal.Open('/vsimem/isis_tmp.lbl')
     lbl = ds.GetMetadata_List('json:ISIS3')[0]
-    if lbl.find('MinimumLongitude') >= 0:
-        print(lbl)
-        return 'fail'
+    assert lbl.find('MinimumLongitude') < 0
     ds = None
     gdal.GetDriverByName('ISIS3').Delete('/vsimem/isis_tmp.lbl')
     return 'success'
@@ -211,22 +189,17 @@ def test_isis_6():
                                      'COMMENT=my comment'])
     ret = tst.testCreateCopy(new_filename='/vsimem/isis_tmp.lbl',
                              delete_copy=0)
-    if gdal.VSIStatL('/vsimem/isis_tmp.cub') is None:
-        return 'fail'
+    assert gdal.VSIStatL('/vsimem/isis_tmp.cub') is not None
     f = gdal.VSIFOpenL('/vsimem/isis_tmp.lbl', 'rb')
     content = gdal.VSIFReadL(1, 10000, f).decode('ASCII')
     gdal.VSIFCloseL(f)
-    if content.find('#my comment') < 0:
-        print(content)
-        return 'fail'
-    if len(content) == 10000:
-        return 'fail'
+    assert content.find('#my comment') >= 0
+    assert len(content) != 10000
     ds = gdal.Open('/vsimem/isis_tmp.lbl', gdal.GA_Update)
     ds.GetRasterBand(1).Fill(0)
     ds = None
     ds = gdal.Open('/vsimem/isis_tmp.lbl')
-    if ds.GetRasterBand(1).Checksum() != 0:
-        return 'fail'
+    assert ds.GetRasterBand(1).Checksum() == 0
     ds = None
     gdal.GetDriverByName('ISIS3').Delete('/vsimem/isis_tmp.lbl')
     return 'success'
@@ -241,13 +214,10 @@ def test_isis_7():
                                      'USE_SRC_LABEL=NO'])
     ret = tst.testCreateCopy(new_filename='/vsimem/isis_tmp.lbl',
                              delete_copy=0)
-    if gdal.VSIStatL('/vsimem/isis_tmp.tif') is None:
-        return 'fail'
+    assert gdal.VSIStatL('/vsimem/isis_tmp.tif') is not None
     ds = gdal.Open('/vsimem/isis_tmp.lbl')
     lbl = ds.GetMetadata_List('json:ISIS3')[0]
-    if lbl.find('"Format":"BandSequential"') < 0:
-        print(lbl)
-        return 'fail'
+    assert lbl.find('"Format":"BandSequential"') >= 0
     ds = None
     gdal.GetDriverByName('ISIS3').Delete('/vsimem/isis_tmp.lbl')
 
@@ -258,13 +228,10 @@ def test_isis_7():
                                      'USE_SRC_LABEL=NO'])
     ret = tst.testCreateCopy(new_filename='/vsimem/isis_tmp.lbl',
                              delete_copy=0)
-    if gdal.VSIStatL('/vsimem/isis_tmp.tif') is None:
-        return 'fail'
+    assert gdal.VSIStatL('/vsimem/isis_tmp.tif') is not None
     ds = gdal.Open('/vsimem/isis_tmp.lbl')
     lbl = ds.GetMetadata_List('json:ISIS3')[0]
-    if lbl.find('"Format":"GeoTIFF"') < 0:
-        print(lbl)
-        return 'fail'
+    assert lbl.find('"Format":"GeoTIFF"') >= 0
     ds = None
     gdal.GetDriverByName('ISIS3').Delete('/vsimem/isis_tmp.lbl')
 
@@ -281,20 +248,16 @@ def test_isis_8():
                                      'GEOTIFF_OPTIONS=COMPRESS=LZW'])
     ret = tst.testCreateCopy(new_filename='/vsimem/isis_tmp.lbl',
                              delete_copy=0)
-    if gdal.VSIStatL('/vsimem/isis_tmp.tif') is None:
-        return 'fail'
+    assert gdal.VSIStatL('/vsimem/isis_tmp.tif') is not None
     ds = gdal.Open('/vsimem/isis_tmp.lbl')
     lbl = ds.GetMetadata_List('json:ISIS3')[0]
-    if lbl.find('"Format":"GeoTIFF"') < 0:
-        print(lbl)
-        return 'fail'
+    assert lbl.find('"Format":"GeoTIFF"') >= 0
     ds = None
     ds = gdal.Open('/vsimem/isis_tmp.lbl', gdal.GA_Update)
     ds.GetRasterBand(1).Fill(0)
     ds = None
     ds = gdal.Open('/vsimem/isis_tmp.lbl')
-    if ds.GetRasterBand(1).Checksum() != 0:
-        return 'fail'
+    assert ds.GetRasterBand(1).Checksum() == 0
     ds = None
     gdal.GetDriverByName('ISIS3').Delete('/vsimem/isis_tmp.lbl')
     return 'success'
@@ -311,18 +274,14 @@ def test_isis_9():
                                      'EXTERNAL_FILENAME=/vsimem/foo.bin'])
     ret = tst.testCreateCopy(new_filename='/vsimem/isis_tmp.lbl',
                              delete_copy=0)
-    if gdal.VSIStatL('/vsimem/foo.bin') is None:
-        return 'fail'
+    assert gdal.VSIStatL('/vsimem/foo.bin') is not None
     ds = gdal.Open('/vsimem/isis_tmp.lbl')
     lbl = ds.GetMetadata_List('json:ISIS3')[0]
-    if lbl.find('"Format":"Tile"') < 0 or lbl.find('"TileSamples":256') < 0 or \
-       lbl.find('"TileLines":256') < 0:
-        print(lbl)
-        return 'fail'
+    assert (lbl.find('"Format":"Tile"') >= 0 and lbl.find('"TileSamples":256') >= 0 and \
+       lbl.find('"TileLines":256') >= 0)
     ds = None
     gdal.GetDriverByName('ISIS3').Delete('/vsimem/isis_tmp.lbl')
-    if gdal.VSIStatL('/vsimem/foo.bin') is not None:
-        return 'fail'
+    assert gdal.VSIStatL('/vsimem/foo.bin') is None
     return 'success'
 
 # Tiled creation + regular GeoTIFF + EXTERNAL_FILENAME
@@ -339,13 +298,10 @@ def test_isis_10():
     ret = tst.testCreateCopy(new_filename='/vsimem/isis_tmp.lbl',
                              delete_copy=0)
     ds = gdal.Open('/vsimem/foo.tif')
-    if ds.GetRasterBand(1).GetBlockSize() != [16, 32]:
-        print(ds.GetRasterBand(1).GetBlockSize())
-        return 'fail'
+    assert ds.GetRasterBand(1).GetBlockSize() == [16, 32]
     ds = None
     gdal.GetDriverByName('ISIS3').Delete('/vsimem/isis_tmp.lbl')
-    if gdal.VSIStatL('/vsimem/foo.tif') is not None:
-        return 'fail'
+    assert gdal.VSIStatL('/vsimem/foo.tif') is None
     return 'success'
 
 # Tiled creation + compressed GeoTIFF
@@ -361,9 +317,7 @@ def test_isis_11():
     ret = tst.testCreateCopy(new_filename='/vsimem/isis_tmp.lbl',
                              delete_copy=0)
     ds = gdal.Open('/vsimem/isis_tmp.tif')
-    if ds.GetRasterBand(1).GetBlockSize() != [256, 256]:
-        print(ds.GetRasterBand(1).GetBlockSize())
-        return 'fail'
+    assert ds.GetRasterBand(1).GetBlockSize() == [256, 256]
     ds = None
     gdal.GetDriverByName('ISIS3').Delete('/vsimem/isis_tmp.lbl')
     return 'success'
@@ -379,9 +333,7 @@ def test_isis_12():
     for i in range(4):
         cs = ds.GetRasterBand(i + 1).Checksum()
         expected_cs = src_ds.GetRasterBand(i + 1).Checksum()
-        if cs != expected_cs:
-            print(i + 1, cs, expected_cs)
-            return 'fail'
+        assert cs == expected_cs, (i + 1, cs, expected_cs)
     ds = None
     gdal.GetDriverByName('ISIS3').Delete('/vsimem/isis_tmp.lbl')
     return 'success'
@@ -399,9 +351,7 @@ def test_isis_13():
     for i in range(4):
         cs = ds.GetRasterBand(i + 1).Checksum()
         expected_cs = src_ds.GetRasterBand(i + 1).Checksum()
-        if cs != expected_cs:
-            print(i + 1, cs, expected_cs)
-            return 'fail'
+        assert cs == expected_cs, (i + 1, cs, expected_cs)
     ds = None
     gdal.GetDriverByName('ISIS3').Delete('/vsimem/isis_tmp.lbl')
     return 'success'
@@ -418,9 +368,7 @@ def test_isis_14():
     for i in range(4):
         cs = ds.GetRasterBand(i + 1).Checksum()
         expected_cs = src_ds.GetRasterBand(i + 1).Checksum()
-        if cs != expected_cs:
-            print(i + 1, cs, expected_cs)
-            return 'fail'
+        assert cs == expected_cs, (i + 1, cs, expected_cs)
     ds = None
     gdal.GetDriverByName('ISIS3').Delete('/vsimem/isis_tmp.lbl')
     return 'success'
@@ -438,9 +386,7 @@ def test_isis_15():
     for i in range(4):
         cs = ds.GetRasterBand(i + 1).Checksum()
         expected_cs = src_ds.GetRasterBand(i + 1).Checksum()
-        if cs != expected_cs:
-            print(i + 1, cs, expected_cs)
-            return 'fail'
+        assert cs == expected_cs, (i + 1, cs, expected_cs)
     ds = None
     gdal.GetDriverByName('ISIS3').Delete('/vsimem/isis_tmp.lbl')
     return 'success'
@@ -471,24 +417,18 @@ def test_isis_16():
                     ds.GetRasterBand(1).Fill(nd)
                 ds = None
                 ds = gdal.Open('/vsimem/isis_tmp.lbl')
-                if ds.GetRasterBand(1).Checksum() != cs:
-                    print(dt, cs, nd, options, init_nd, ds.GetRasterBand(1).Checksum())
-                    return 'fail'
-                if ds.GetRasterBand(1).GetMaskFlags() != 0:
-                    print(dt, cs, nd, options, init_nd, ds.GetRasterBand(1).GetMaskFlags())
-                    return 'fail'
-                if ds.GetRasterBand(1).GetMaskBand().Checksum() != 0:
-                    print(dt, cs, nd, options, init_nd, ds.GetRasterBand(1).GetMaskBand().Checksum())
-                    return 'fail'
-                if ds.GetRasterBand(1).GetOffset() != 10:
-                    print(dt, cs, nd, options, init_nd, ds.GetRasterBand(1).GetOffset())
-                    return 'fail'
-                if ds.GetRasterBand(1).GetScale() != 20:
-                    print(dt, cs, nd, options, init_nd, ds.GetRasterBand(1).GetScale())
-                    return 'fail'
-                if ds.GetRasterBand(1).GetNoDataValue() != nd:
-                    print(dt, cs, nd, options, init_nd, ds.GetRasterBand(1).GetNoDataValue())
-                    return 'fail'
+                assert ds.GetRasterBand(1).Checksum() == cs, \
+                    (dt, cs, nd, options, init_nd, ds.GetRasterBand(1).Checksum())
+                assert ds.GetRasterBand(1).GetMaskFlags() == 0, \
+                    (dt, cs, nd, options, init_nd, ds.GetRasterBand(1).GetMaskFlags())
+                assert ds.GetRasterBand(1).GetMaskBand().Checksum() == 0, \
+                    (dt, cs, nd, options, init_nd, ds.GetRasterBand(1).GetMaskBand().Checksum())
+                assert ds.GetRasterBand(1).GetOffset() == 10, \
+                    (dt, cs, nd, options, init_nd, ds.GetRasterBand(1).GetOffset())
+                assert ds.GetRasterBand(1).GetScale() == 20, \
+                    (dt, cs, nd, options, init_nd, ds.GetRasterBand(1).GetScale())
+                assert ds.GetRasterBand(1).GetNoDataValue() == nd, \
+                    (dt, cs, nd, options, init_nd, ds.GetRasterBand(1).GetNoDataValue())
                 ds = None
                 gdal.GetDriverByName('ISIS3').Delete('/vsimem/isis_tmp.lbl')
 
@@ -516,9 +456,7 @@ def test_isis_18():
     ds = gdal.Open('/vsimem/isis_tmp.lbl')
     wkt = ds.GetProjectionRef()
     ds = None
-    if not osr.SpatialReference(wkt).IsSame(osr.SpatialReference('PROJCS["Equirectangular DATUM_NAME",GEOGCS["GCS_DATUM_NAME",DATUM["D_DATUM_NAME",SPHEROID["DATUM_NAME_localRadius",123455.2424988797,0]],PRIMEM["Reference_Meridian",0],UNIT["degree",0.0174532925199433]],PROJECTION["Equirectangular"],PARAMETER["latitude_of_origin",0],PARAMETER["central_meridian",1],PARAMETER["standard_parallel_1",2],PARAMETER["false_easting",0],PARAMETER["false_northing",0]]')):
-        print(wkt)
-        return 'fail'
+    assert osr.SpatialReference(wkt).IsSame(osr.SpatialReference('PROJCS["Equirectangular DATUM_NAME",GEOGCS["GCS_DATUM_NAME",DATUM["D_DATUM_NAME",SPHEROID["DATUM_NAME_localRadius",123455.2424988797,0]],PRIMEM["Reference_Meridian",0],UNIT["degree",0.0174532925199433]],PROJECTION["Equirectangular"],PARAMETER["latitude_of_origin",0],PARAMETER["central_meridian",1],PARAMETER["standard_parallel_1",2],PARAMETER["false_easting",0],PARAMETER["false_northing",0]]'))
 
     sr = osr.SpatialReference()
     sr.SetEquirectangular2(123456, 1, 2, 987654, 3210123)
@@ -532,9 +470,7 @@ def test_isis_18():
     ds = gdal.Open('/vsimem/isis_tmp.lbl')
     wkt = ds.GetProjectionRef()
     ds = None
-    if not osr.SpatialReference(wkt).IsSame(osr.SpatialReference('PROJCS["Equirectangular DATUM_NAME",GEOGCS["GCS_DATUM_NAME",DATUM["D_DATUM_NAME",SPHEROID["DATUM_NAME_localRadius",123455.2424988797,0]],PRIMEM["Reference_Meridian",0],UNIT["degree",0.0174532925199433]],PROJECTION["Equirectangular"],PARAMETER["latitude_of_origin",0],PARAMETER["central_meridian",1],PARAMETER["standard_parallel_1",2],PARAMETER["false_easting",0],PARAMETER["false_northing",0]]')):
-        print(wkt)
-        return 'fail'
+    assert osr.SpatialReference(wkt).IsSame(osr.SpatialReference('PROJCS["Equirectangular DATUM_NAME",GEOGCS["GCS_DATUM_NAME",DATUM["D_DATUM_NAME",SPHEROID["DATUM_NAME_localRadius",123455.2424988797,0]],PRIMEM["Reference_Meridian",0],UNIT["degree",0.0174532925199433]],PROJECTION["Equirectangular"],PARAMETER["latitude_of_origin",0],PARAMETER["central_meridian",1],PARAMETER["standard_parallel_1",2],PARAMETER["false_easting",0],PARAMETER["false_northing",0]]'))
 
     sr = osr.SpatialReference()
     sr.SetOrthographic(1, 2, 0, 0)
@@ -545,9 +481,7 @@ def test_isis_18():
     ds = gdal.Open('/vsimem/isis_tmp.lbl')
     wkt = ds.GetProjectionRef()
     ds = None
-    if not osr.SpatialReference(wkt).IsSame(osr.SpatialReference('PROJCS["Orthographic DATUM_NAME",GEOGCS["GCS_DATUM_NAME",DATUM["D_DATUM_NAME",SPHEROID["DATUM_NAME",123456,0]],PRIMEM["Reference_Meridian",0],UNIT["degree",0.0174532925199433]],PROJECTION["Orthographic"],PARAMETER["latitude_of_origin",1],PARAMETER["central_meridian",2],PARAMETER["false_easting",0],PARAMETER["false_northing",0]]')):
-        print(wkt)
-        return 'fail'
+    assert osr.SpatialReference(wkt).IsSame(osr.SpatialReference('PROJCS["Orthographic DATUM_NAME",GEOGCS["GCS_DATUM_NAME",DATUM["D_DATUM_NAME",SPHEROID["DATUM_NAME",123456,0]],PRIMEM["Reference_Meridian",0],UNIT["degree",0.0174532925199433]],PROJECTION["Orthographic"],PARAMETER["latitude_of_origin",1],PARAMETER["central_meridian",2],PARAMETER["false_easting",0],PARAMETER["false_northing",0]]'))
 
     sr = osr.SpatialReference()
     sr.SetSinusoidal(1, 0, 0)
@@ -558,9 +492,7 @@ def test_isis_18():
     ds = gdal.Open('/vsimem/isis_tmp.lbl')
     wkt = ds.GetProjectionRef()
     ds = None
-    if not osr.SpatialReference(wkt).IsSame(osr.SpatialReference('PROJCS["Sinusoidal DATUM_NAME",GEOGCS["GCS_DATUM_NAME",DATUM["D_DATUM_NAME",SPHEROID["DATUM_NAME",123456,0]],PRIMEM["Reference_Meridian",0],UNIT["degree",0.0174532925199433]],PROJECTION["Sinusoidal"],PARAMETER["longitude_of_center",1],PARAMETER["false_easting",0],PARAMETER["false_northing",0]]')):
-        print(wkt)
-        return 'fail'
+    assert osr.SpatialReference(wkt).IsSame(osr.SpatialReference('PROJCS["Sinusoidal DATUM_NAME",GEOGCS["GCS_DATUM_NAME",DATUM["D_DATUM_NAME",SPHEROID["DATUM_NAME",123456,0]],PRIMEM["Reference_Meridian",0],UNIT["degree",0.0174532925199433]],PROJECTION["Sinusoidal"],PARAMETER["longitude_of_center",1],PARAMETER["false_easting",0],PARAMETER["false_northing",0]]'))
 
     sr = osr.SpatialReference()
     sr.SetMercator(1, 2, 0.9, 0, 0)
@@ -571,9 +503,7 @@ def test_isis_18():
     ds = gdal.Open('/vsimem/isis_tmp.lbl')
     wkt = ds.GetProjectionRef()
     ds = None
-    if not osr.SpatialReference(wkt).IsSame(osr.SpatialReference('PROJCS["Mercator DATUM_NAME",GEOGCS["GCS_DATUM_NAME",DATUM["D_DATUM_NAME",SPHEROID["DATUM_NAME",123456,0]],PRIMEM["Reference_Meridian",0],UNIT["degree",0.0174532925199433]],PROJECTION["Mercator_1SP"],PARAMETER["latitude_of_origin",1],PARAMETER["central_meridian",2],PARAMETER["scale_factor",0.9],PARAMETER["false_easting",0],PARAMETER["false_northing",0]]')):
-        print(wkt)
-        return 'fail'
+    assert osr.SpatialReference(wkt).IsSame(osr.SpatialReference('PROJCS["Mercator DATUM_NAME",GEOGCS["GCS_DATUM_NAME",DATUM["D_DATUM_NAME",SPHEROID["DATUM_NAME",123456,0]],PRIMEM["Reference_Meridian",0],UNIT["degree",0.0174532925199433]],PROJECTION["Mercator_1SP"],PARAMETER["latitude_of_origin",1],PARAMETER["central_meridian",2],PARAMETER["scale_factor",0.9],PARAMETER["false_easting",0],PARAMETER["false_northing",0]]'))
 
     sr = osr.SpatialReference()
     sr.SetPS(1, 2, 0.9, 0, 0)
@@ -584,9 +514,7 @@ def test_isis_18():
     ds = gdal.Open('/vsimem/isis_tmp.lbl')
     wkt = ds.GetProjectionRef()
     ds = None
-    if not osr.SpatialReference(wkt).IsSame(osr.SpatialReference('PROJCS["PolarStereographic DATUM_NAME",GEOGCS["GCS_DATUM_NAME",DATUM["D_DATUM_NAME",SPHEROID["DATUM_NAME_polarRadius",122838.72,0]],PRIMEM["Reference_Meridian",0],UNIT["degree",0.0174532925199433]],PROJECTION["Polar_Stereographic"],PARAMETER["latitude_of_origin",1],PARAMETER["central_meridian",2],PARAMETER["scale_factor",0.9],PARAMETER["false_easting",0],PARAMETER["false_northing",0]]')):
-        print(wkt)
-        return 'fail'
+    assert osr.SpatialReference(wkt).IsSame(osr.SpatialReference('PROJCS["PolarStereographic DATUM_NAME",GEOGCS["GCS_DATUM_NAME",DATUM["D_DATUM_NAME",SPHEROID["DATUM_NAME_polarRadius",122838.72,0]],PRIMEM["Reference_Meridian",0],UNIT["degree",0.0174532925199433]],PROJECTION["Polar_Stereographic"],PARAMETER["latitude_of_origin",1],PARAMETER["central_meridian",2],PARAMETER["scale_factor",0.9],PARAMETER["false_easting",0],PARAMETER["false_northing",0]]'))
 
     sr = osr.SpatialReference()
     sr.SetTM(1, 2, 0.9, 0, 0)
@@ -597,9 +525,7 @@ def test_isis_18():
     ds = gdal.Open('/vsimem/isis_tmp.lbl')
     wkt = ds.GetProjectionRef()
     ds = None
-    if not osr.SpatialReference(wkt).IsSame(osr.SpatialReference('PROJCS["TransverseMercator DATUM_NAME",GEOGCS["GCS_DATUM_NAME",DATUM["D_DATUM_NAME",SPHEROID["DATUM_NAME",123456,0]],PRIMEM["Reference_Meridian",0],UNIT["degree",0.0174532925199433]],PROJECTION["Transverse_Mercator"],PARAMETER["latitude_of_origin",1],PARAMETER["central_meridian",2],PARAMETER["scale_factor",0.9],PARAMETER["false_easting",0],PARAMETER["false_northing",0]]')):
-        print(wkt)
-        return 'fail'
+    assert osr.SpatialReference(wkt).IsSame(osr.SpatialReference('PROJCS["TransverseMercator DATUM_NAME",GEOGCS["GCS_DATUM_NAME",DATUM["D_DATUM_NAME",SPHEROID["DATUM_NAME",123456,0]],PRIMEM["Reference_Meridian",0],UNIT["degree",0.0174532925199433]],PROJECTION["Transverse_Mercator"],PARAMETER["latitude_of_origin",1],PARAMETER["central_meridian",2],PARAMETER["scale_factor",0.9],PARAMETER["false_easting",0],PARAMETER["false_northing",0]]'))
 
     sr = osr.SpatialReference()
     sr.SetLCC(1, 2, 3, 4, 0, 0)
@@ -610,9 +536,7 @@ def test_isis_18():
     ds = gdal.Open('/vsimem/isis_tmp.lbl')
     wkt = ds.GetProjectionRef()
     ds = None
-    if not osr.SpatialReference(wkt).IsSame(osr.SpatialReference('PROJCS["LambertConformal DATUM_NAME",GEOGCS["GCS_DATUM_NAME",DATUM["D_DATUM_NAME",SPHEROID["DATUM_NAME",123456,0]],PRIMEM["Reference_Meridian",0],UNIT["degree",0.0174532925199433]],PROJECTION["Lambert_Conformal_Conic_2SP"],PARAMETER["standard_parallel_1",1],PARAMETER["standard_parallel_2",2],PARAMETER["latitude_of_origin",3],PARAMETER["central_meridian",4],PARAMETER["false_easting",0],PARAMETER["false_northing",0]]')):
-        print(wkt)
-        return 'fail'
+    assert osr.SpatialReference(wkt).IsSame(osr.SpatialReference('PROJCS["LambertConformal DATUM_NAME",GEOGCS["GCS_DATUM_NAME",DATUM["D_DATUM_NAME",SPHEROID["DATUM_NAME",123456,0]],PRIMEM["Reference_Meridian",0],UNIT["degree",0.0174532925199433]],PROJECTION["Lambert_Conformal_Conic_2SP"],PARAMETER["standard_parallel_1",1],PARAMETER["standard_parallel_2",2],PARAMETER["latitude_of_origin",3],PARAMETER["central_meridian",4],PARAMETER["false_easting",0],PARAMETER["false_northing",0]]'))
 
     sr = osr.SpatialReference()
     sr.SetEquirectangular2(0, 1, 2, 0, 0)
@@ -626,24 +550,12 @@ def test_isis_18():
     ds = None
     ds = gdal.Open('/vsimem/isis_tmp.lbl')
     lbl = ds.GetMetadata_List('json:ISIS3')[0]
-    if lbl.find('"TargetName":"my_target"') < 0:
-        print(lbl)
-        return 'fail'
-    if lbl.find('"LatitudeType":"Planetographic"') < 0:
-        print(lbl)
-        return 'fail'
-    if lbl.find('"MinimumLatitude":2.5') < 0:
-        print(lbl)
-        return 'fail'
-    if lbl.find('"MinimumLongitude":1.5') < 0:
-        print(lbl)
-        return 'fail'
-    if lbl.find('"MaximumLatitude":4.5') < 0:
-        print(lbl)
-        return 'fail'
-    if lbl.find('"MaximumLongitude":3.5') < 0:
-        print(lbl)
-        return 'fail'
+    assert lbl.find('"TargetName":"my_target"') >= 0
+    assert lbl.find('"LatitudeType":"Planetographic"') >= 0
+    assert lbl.find('"MinimumLatitude":2.5') >= 0
+    assert lbl.find('"MinimumLongitude":1.5') >= 0
+    assert lbl.find('"MaximumLatitude":4.5') >= 0
+    assert lbl.find('"MaximumLongitude":3.5') >= 0
     ds = None
 
     sr = osr.SpatialReference()
@@ -655,24 +567,12 @@ def test_isis_18():
     ds = None
     ds = gdal.Open('/vsimem/isis_tmp.lbl')
     lbl = ds.GetMetadata_List('json:ISIS3')[0]
-    if lbl.find('"LongitudeDirection":"PositiveWest"') < 0:
-        print(lbl)
-        return 'fail'
-    if lbl.find('"LongitudeDomain":180') < 0:
-        print(lbl)
-        return 'fail'
-    if lbl.find('"MinimumLatitude":-60') < 0:
-        print(lbl)
-        return 'fail'
-    if lbl.find('"MinimumLongitude":-110') < 0:
-        print(lbl)
-        return 'fail'
-    if lbl.find('"MaximumLatitude":40') < 0:
-        print(lbl)
-        return 'fail'
-    if lbl.find('"MaximumLongitude":-10') < 0:
-        print(lbl)
-        return 'fail'
+    assert lbl.find('"LongitudeDirection":"PositiveWest"') >= 0
+    assert lbl.find('"LongitudeDomain":180') >= 0
+    assert lbl.find('"MinimumLatitude":-60') >= 0
+    assert lbl.find('"MinimumLongitude":-110') >= 0
+    assert lbl.find('"MaximumLatitude":40') >= 0
+    assert lbl.find('"MaximumLongitude":-10') >= 0
     ds = None
 
     sr = osr.SpatialReference()
@@ -684,24 +584,12 @@ def test_isis_18():
     ds = None
     ds = gdal.Open('/vsimem/isis_tmp.lbl')
     lbl = ds.GetMetadata_List('json:ISIS3')[0]
-    if lbl.find('"MinimumLatitude":-60') < 0:
-        print(lbl)
-        return 'fail'
-    if lbl.find('"MinimumLongitude":90') < 0:
-        print(lbl)
-        return 'fail'
-    if lbl.find('"MaximumLatitude":40') < 0:
-        print(lbl)
-        return 'fail'
-    if lbl.find('"MaximumLongitude":350') < 0:
-        print(lbl)
-        return 'fail'
-    if lbl.find('"UpperLeftCornerX":-21547') < 0:
-        print(lbl)
-        return 'fail'
-    if lbl.find('"UpperLeftCornerY":86188') < 0:
-        print(lbl)
-        return 'fail'
+    assert lbl.find('"MinimumLatitude":-60') >= 0
+    assert lbl.find('"MinimumLongitude":90') >= 0
+    assert lbl.find('"MaximumLatitude":40') >= 0
+    assert lbl.find('"MaximumLongitude":350') >= 0
+    assert lbl.find('"UpperLeftCornerX":-21547') >= 0
+    assert lbl.find('"UpperLeftCornerY":86188') >= 0
     ds = None
 
     gdal.GetDriverByName('ISIS3').Delete('/vsimem/isis_tmp.lbl')
@@ -715,15 +603,11 @@ def test_isis_19():
 
     ds = gdal.Open('data/isis3_detached.lbl')
     res = gdal.Info(ds, format='json', extraMDDomains=['json:ISIS3'])
-    if res['metadata']['json:ISIS3']['IsisCube']['_type'] != 'object':
-        print(res)
-        return 'fail'
+    assert res['metadata']['json:ISIS3']['IsisCube']['_type'] == 'object'
 
     ds = gdal.Open('data/isis3_detached.lbl')
     res = gdal.Info(ds, extraMDDomains=['json:ISIS3'])
-    if res.find('IsisCube') < 0:
-        print(res)
-        return 'fail'
+    assert res.find('IsisCube') >= 0
 
     return 'success'
 
@@ -737,9 +621,7 @@ def test_isis_20():
                        format='ISIS3', srcWin=[0, 0, 1, 1])
     ds = gdal.Open('/vsimem/isis_tmp.lbl')
     lbl = ds.GetMetadata_List('json:ISIS3')[0]
-    if lbl.find('AMadeUpValue') < 0:
-        print(lbl)
-        return 'fail'
+    assert lbl.find('AMadeUpValue') >= 0
     ds = None
     gdal.GetDriverByName('ISIS3').Delete('/vsimem/isis_tmp.lbl')
 
@@ -754,13 +636,9 @@ def test_isis_21():
         gdal.Warp('/vsimem/isis_tmp.lbl', 'data/isis3_detached.lbl',
                   format='ISIS3')
     ds = gdal.Open('/vsimem/isis_tmp.lbl')
-    if ds.GetRasterBand(1).Checksum() != 9978:
-        print(ds.GetRasterBand(1).Checksum())
-        return 'fail'
+    assert ds.GetRasterBand(1).Checksum() == 9978
     lbl = ds.GetMetadata_List('json:ISIS3')[0]
-    if lbl.find('AMadeUpValue') < 0:
-        print(lbl)
-        return 'fail'
+    assert lbl.find('AMadeUpValue') >= 0
     ds = None
     gdal.GetDriverByName('ISIS3').Delete('/vsimem/isis_tmp.lbl')
 
@@ -775,8 +653,7 @@ def test_isis_22():
     # Invalid Json
     js = """invalid"""
     with gdaltest.error_handler():
-        if ds.SetMetadata([js], 'json:ISIS3') == 0:
-            return 'fail'
+        assert ds.SetMetadata([js], 'json:ISIS3') != 0
     ds = None
     gdal.GetDriverByName('ISIS3').Delete('/vsimem/isis_tmp.lbl')
 
@@ -785,13 +662,11 @@ def test_isis_22():
     js = """{ "IsisCube": 5 }"""
     ds.SetMetadata([js], 'json:ISIS3')
     lbl = ds.GetMetadata_List('json:ISIS3')
-    if lbl is None:
-        return 'fail'
+    assert lbl is not None
     ds.SetMetadata([js], 'json:ISIS3')
     ds = None
     ds = gdal.Open('/vsimem/isis_tmp.lbl')
-    if ds is None:
-        return 'fail'
+    assert ds is not None
     gdal.GetDriverByName('ISIS3').Delete('/vsimem/isis_tmp.lbl')
 
     ds = gdal.GetDriverByName('ISIS3').Create('/vsimem/isis_tmp.lbl', 1, 1)
@@ -800,8 +675,7 @@ def test_isis_22():
     ds.SetMetadata([js], 'json:ISIS3')
     ds = None
     ds = gdal.Open('/vsimem/isis_tmp.lbl')
-    if ds is None:
-        return 'fail'
+    assert ds is not None
     gdal.GetDriverByName('ISIS3').Delete('/vsimem/isis_tmp.lbl')
 
     ds = gdal.GetDriverByName('ISIS3').Create('/vsimem/isis_tmp.lbl', 1, 1)
@@ -811,8 +685,7 @@ def test_isis_22():
     ds.SetMetadata([js], 'json:ISIS3')
     ds = None
     ds = gdal.Open('/vsimem/isis_tmp.lbl')
-    if ds is None:
-        return 'fail'
+    assert ds is not None
     gdal.GetDriverByName('ISIS3').Delete('/vsimem/isis_tmp.lbl')
 
     ds = gdal.GetDriverByName('ISIS3').Create('/vsimem/isis_tmp.lbl', 1, 1,
@@ -825,32 +698,27 @@ def test_isis_22():
     ds = None
 
     f = gdal.VSIFOpenL('/vsimem/isis_tmp.lbl', 'rb')
-    if f is None:
-        return 'fail'
+    assert f is not None
     content = gdal.VSIFReadL(1, 10000, f).decode('ASCII')
     gdal.VSIFCloseL(f)
 
-    if content.find('foo       = bar') < 0 or \
-       content.find('  bar       = (123, 124.0, 2.5, xyz') < 0 or \
-       content.find('               anotherveeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeee-') < 0 or \
-       content.find('               eeeeeeeeeeeeeeeeeeeeeeeerylooooongtext, 234, 456, 789, 234, 567,') < 0 or \
-       content.find('               890, 123456789.0, 123456789.0, 123456789.0, 123456789.0,') < 0 or \
-       content.find('               123456789.0)') < 0 or \
-       content.find('baz       = 5 <M>') < 0 or \
-       content.find('baw       = "with space"') < 0 or \
-       content.find('very_long = aveeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeee-') < 0:
-        print(content)
-        return 'fail'
+    assert (content.find('foo       = bar') >= 0 and \
+       content.find('  bar       = (123, 124.0, 2.5, xyz') >= 0 and \
+       content.find('               anotherveeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeee-') >= 0 and \
+       content.find('               eeeeeeeeeeeeeeeeeeeeeeeerylooooongtext, 234, 456, 789, 234, 567,') >= 0 and \
+       content.find('               890, 123456789.0, 123456789.0, 123456789.0, 123456789.0,') >= 0 and \
+       content.find('               123456789.0)') >= 0 and \
+       content.find('baz       = 5 <M>') >= 0 and \
+       content.find('baw       = "with space"') >= 0 and \
+       content.find('very_long = aveeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeee-') >= 0)
 
     ds = gdal.Open('/vsimem/isis_tmp.lbl')
     lbl = ds.GetMetadata_List('json:ISIS3')[0]
-    if lbl.find('"foo":"bar"') < 0 or lbl.find('123') < 0 or \
-       lbl.find('2.5') < 0 or lbl.find('xyz') < 0 or \
-       lbl.find('"value":5') < 0 or lbl.find('"unit":"M"') < 0 or \
-       lbl.find('"baw":"with space"') < 0 or \
-       lbl.find('"very_long":"aveeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeerylooooongtext"') < 0:
-        print(lbl)
-        return 'fail'
+    assert (lbl.find('"foo":"bar"') >= 0 and lbl.find('123') >= 0 and \
+       lbl.find('2.5') >= 0 and lbl.find('xyz') >= 0 and \
+       lbl.find('"value":5') >= 0 and lbl.find('"unit":"M"') >= 0 and \
+       lbl.find('"baw":"with space"') >= 0 and \
+       lbl.find('"very_long":"aveeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeerylooooongtext"') >= 0)
     ds = None
     gdal.GetDriverByName('ISIS3').Delete('/vsimem/isis_tmp.lbl')
 
@@ -869,24 +737,21 @@ def test_isis_23():
     gdal.Translate('/vsimem/isis_tmp.lbl', mem_ds,
                    format='ISIS3')
     ds = gdal.Open('/vsimem/isis_tmp.lbl')
-    if ref_data == ds.GetRasterBand(1).ReadRaster():
-        return 'fail'
+    assert ref_data != ds.GetRasterBand(1).ReadRaster()
     ds = None
     gdal.GetDriverByName('ISIS3').Delete('/vsimem/isis_tmp.lbl')
 
     gdal.Translate('/vsimem/isis_tmp.lbl', mem_ds,
                    format='ISIS3', creationOptions=['DATA_LOCATION=GeoTIFF'])
     ds = gdal.Open('/vsimem/isis_tmp.lbl')
-    if ref_data == ds.GetRasterBand(1).ReadRaster():
-        return 'fail'
+    assert ref_data != ds.GetRasterBand(1).ReadRaster()
     ds = None
     gdal.GetDriverByName('ISIS3').Delete('/vsimem/isis_tmp.lbl')
 
     gdal.Translate('/vsimem/isis_tmp.lbl', mem_ds,
                    format='ISIS3', creationOptions=['TILED=YES'])
     ds = gdal.Open('/vsimem/isis_tmp.lbl')
-    if ref_data == ds.GetRasterBand(1).ReadRaster():
-        return 'fail'
+    assert ref_data != ds.GetRasterBand(1).ReadRaster()
     ds = None
     gdal.GetDriverByName('ISIS3').Delete('/vsimem/isis_tmp.lbl')
 
@@ -899,8 +764,7 @@ def test_isis_23():
         gdal.Translate('/vsimem/isis_tmp.lbl', mem_ds,
                        format='ISIS3')
         ds = gdal.Open('/vsimem/isis_tmp.lbl')
-        if ref_data == ds.GetRasterBand(1).ReadRaster():
-            return 'fail'
+        assert ref_data != ds.GetRasterBand(1).ReadRaster()
         ds = None
         gdal.GetDriverByName('ISIS3').Delete('/vsimem/isis_tmp.lbl')
 
@@ -920,16 +784,14 @@ def test_isis_24():
     with gdaltest.error_handler():
         ds = gdal.GetDriverByName('ISIS3').Create('/vsimem/error.txt', 1, 1,
                                                   options=['DATA_LOCATION=EXTERNAL'])
-    if ds is not None:
-        return 'fail'
+    assert ds is None
 
     # cannot create external filename
     with gdaltest.error_handler():
         ds = gdal.GetDriverByName('ISIS3').Create('/vsimem/error.lbl', 1, 1,
                                                   options=['DATA_LOCATION=EXTERNAL',
                                                            'EXTERNAL_FILENAME=/i_dont/exist/error.cub'])
-    if ds is not None:
-        return 'fail'
+    assert ds is None
 
     # no GTiff driver
     # with gdaltest.error_handler():
@@ -947,8 +809,7 @@ def test_isis_24():
         ds = gdal.GetDriverByName('ISIS3').Create('/vsimem/error.lbl', 1, 1,
                                                   options=['DATA_LOCATION=GEOTIFF',
                                                            'EXTERNAL_FILENAME=/i_dont/exist/error.tif'])
-    if ds is not None:
-        return 'fail'
+    assert ds is None
     gdal.Unlink('/vsimem/error.lbl')
 
     # Output file has same name as input file
@@ -957,8 +818,7 @@ def test_isis_24():
         ds = gdal.GetDriverByName('ISIS3').CreateCopy('/vsimem/out.lbl',
                                                       src_ds,
                                                       options=['DATA_LOCATION=GEOTIFF'])
-    if ds is not None:
-        return 'fail'
+    assert ds is None
     gdal.Unlink('/vsimem/out.tif')
 
     # Missing /vsimem/out.cub
@@ -970,12 +830,10 @@ def test_isis_24():
     gdal.Unlink('/vsimem/out.cub')
     with gdaltest.error_handler():
         ds = gdal.Open('/vsimem/out.lbl')
-    if ds is not None:
-        return 'fail'
+    assert ds is None
     with gdaltest.error_handler():
         ds = gdal.Open('/vsimem/out.lbl', gdal.GA_Update)
-    if ds is not None:
-        return 'fail'
+    assert ds is None
     # Delete would fail since ds is None
     gdal.Unlink('/vsimem/out.lbl')
 
@@ -989,8 +847,7 @@ def test_isis_24():
     gdal.Unlink('/vsimem/out.tif')
     with gdaltest.error_handler():
         ds = gdal.Open('/vsimem/out.lbl')
-    if ds is not None:
-        return 'fail'
+    assert ds is None
     # Delete would fail since ds is None
     gdal.Unlink('/vsimem/out.lbl')
 
@@ -1024,12 +881,10 @@ def test_isis_24():
         gdal.GetDriverByName('ISIS3').Delete('/vsimem/out.lbl')
 
     gdal.FileFromMemBuffer('/vsimem/out.lbl', 'IsisCube')
-    if gdal.IdentifyDriver('/vsimem/out.lbl') is None:
-        return 'fail'
+    assert gdal.IdentifyDriver('/vsimem/out.lbl') is not None
     with gdaltest.error_handler():
         ds = gdal.Open('/vsimem/out.lbl')
-    if ds is not None:
-        return 'fail'
+    assert ds is None
     # Delete would fail since ds is None
     gdal.Unlink('/vsimem/out.lbl')
 
@@ -1053,8 +908,7 @@ def test_isis_24():
     # Wrong tile dimensions : 0 x 0
     with gdaltest.error_handler():
         ds = gdal.Open('/vsimem/out.lbl')
-    if ds is not None:
-        return 'fail'
+    assert ds is None
     # Delete would fail since ds is None
     gdal.Unlink('/vsimem/out.lbl')
 
@@ -1078,8 +932,7 @@ def test_isis_24():
     # Invalid dataset dimensions : 0 x 0
     with gdaltest.error_handler():
         ds = gdal.Open('/vsimem/out.lbl')
-    if ds is not None:
-        return 'fail'
+    assert ds is None
     # Delete would fail since ds is None
     gdal.Unlink('/vsimem/out.lbl')
 
@@ -1103,8 +956,7 @@ def test_isis_24():
     # Invalid band count : 0
     with gdaltest.error_handler():
         ds = gdal.Open('/vsimem/out.lbl')
-    if ds is not None:
-        return 'fail'
+    assert ds is None
     # Delete would fail since ds is None
     gdal.Unlink('/vsimem/out.lbl')
 
@@ -1129,8 +981,7 @@ def test_isis_24():
     # unhandled format
     with gdaltest.error_handler():
         ds = gdal.Open('/vsimem/out.lbl')
-    if ds is not None:
-        return 'fail'
+    assert ds is None
     # Delete would fail since ds is None
     gdal.Unlink('/vsimem/out.lbl')
 
@@ -1155,8 +1006,7 @@ def test_isis_24():
     # bad PDL formatting
     with gdaltest.error_handler():
         ds = gdal.Open('/vsimem/out.lbl')
-    if ds is not None:
-        return 'fail'
+    assert ds is None
     # Delete would fail since ds is None
     gdal.Unlink('/vsimem/out.lbl')
 
@@ -1174,8 +1024,7 @@ def test_isis_24():
 
     # missing Group = Pixels. This is actually valid. Assuming Real
     ds = gdal.Open('/vsimem/out.lbl')
-    if ds is None:
-        return 'fail'
+    assert ds is not None
     # Delete would fail since ds is None
     gdal.Unlink('/vsimem/out.lbl')
 
@@ -1186,23 +1035,19 @@ def test_isis_24():
     gdal.GetDriverByName('GTiff').Create('/vsimem/out.tif', 1, 2)
     with gdaltest.error_handler():
         ds = gdal.Open('/vsimem/out.lbl')
-    if ds is not None:
-        return 'fail'
+    assert ds is None
     gdal.GetDriverByName('GTiff').Create('/vsimem/out.tif', 2, 1)
     with gdaltest.error_handler():
         ds = gdal.Open('/vsimem/out.lbl')
-    if ds is not None:
-        return 'fail'
+    assert ds is None
     gdal.GetDriverByName('GTiff').Create('/vsimem/out.tif', 1, 1, 2)
     with gdaltest.error_handler():
         ds = gdal.Open('/vsimem/out.lbl')
-    if ds is not None:
-        return 'fail'
+    assert ds is None
     gdal.GetDriverByName('GTiff').Create('/vsimem/out.tif', 1, 1, 1, gdal.GDT_Int16)
     with gdaltest.error_handler():
         ds = gdal.Open('/vsimem/out.lbl')
-    if ds is not None:
-        return 'fail'
+    assert ds is None
     # Delete would fail since ds is None
     gdal.Unlink('/vsimem/out.lbl')
     gdal.Unlink('/vsimem/out.tif')
@@ -1214,38 +1059,32 @@ def test_isis_24():
     gdal.ErrorReset()
     with gdaltest.error_handler():
         ds = gdal.Open('/vsimem/out.lbl')
-    if gdal.GetLastErrorMsg() == '':
-        return 'fail'
+    assert gdal.GetLastErrorMsg() != ''
     gdal.GetDriverByName('GTiff').Create('/vsimem/out.tif', 2, 1)
     gdal.ErrorReset()
     with gdaltest.error_handler():
         ds = gdal.Open('/vsimem/out.lbl')
-    if gdal.GetLastErrorMsg() == '':
-        return 'fail'
+    assert gdal.GetLastErrorMsg() != ''
     gdal.GetDriverByName('GTiff').Create('/vsimem/out.tif', 1, 1, 2)
     gdal.ErrorReset()
     with gdaltest.error_handler():
         ds = gdal.Open('/vsimem/out.lbl')
-    if gdal.GetLastErrorMsg() == '':
-        return 'fail'
+    assert gdal.GetLastErrorMsg() != ''
     gdal.GetDriverByName('GTiff').Create('/vsimem/out.tif', 1, 1, 1, gdal.GDT_Int16)
     gdal.ErrorReset()
     with gdaltest.error_handler():
         ds = gdal.Open('/vsimem/out.lbl')
-    if gdal.GetLastErrorMsg() == '':
-        return 'fail'
+    assert gdal.GetLastErrorMsg() != ''
     gdal.GetDriverByName('GTiff').Create('/vsimem/out.tif', 1, 1, options=['COMPRESS=LZW'])
     gdal.ErrorReset()
     with gdaltest.error_handler():
         ds = gdal.Open('/vsimem/out.lbl')
-    if gdal.GetLastErrorMsg() == '':
-        return 'fail'
+    assert gdal.GetLastErrorMsg() != ''
     gdal.GetDriverByName('GTiff').Create('/vsimem/out.tif', 1, 1, options=['TILED=YES'])
     gdal.ErrorReset()
     with gdaltest.error_handler():
         ds = gdal.Open('/vsimem/out.lbl')
-    if gdal.GetLastErrorMsg() == '':
-        return 'fail'
+    assert gdal.GetLastErrorMsg() != ''
     ds = gdal.GetDriverByName('GTiff').Create('/vsimem/out.tif', 1, 1)
     ds.GetRasterBand(1).SetNoDataValue(0)
     ds.SetMetadataItem('foo', 'bar')
@@ -1253,8 +1092,7 @@ def test_isis_24():
     gdal.ErrorReset()
     with gdaltest.error_handler():
         ds = gdal.Open('/vsimem/out.lbl')
-    if gdal.GetLastErrorMsg() == '':
-        return 'fail'
+    assert gdal.GetLastErrorMsg() != ''
     with gdaltest.error_handler():
         gdal.GetDriverByName('ISIS3').Delete('/vsimem/out.lbl')
     gdal.Unlink('/vsimem/out.tif')
@@ -1264,8 +1102,7 @@ def test_isis_24():
         ds = gdal.GetDriverByName('ISIS3').CreateCopy('/vsimem/out.lbl',
                                                       mem_ds,
                                                       callback=cancel_cbk)
-    if ds is not None:
-        return 'fail'
+    assert ds is None
     # Delete would fail since ds is None
     gdal.Unlink('/vsimem/out.lbl')
 
@@ -1281,10 +1118,8 @@ def test_isis_25():
     mem_ds.GetRasterBand(1).SetOffset(20)
     gdal.GetDriverByName('ISIS3').CreateCopy('/vsimem/out.lbl', mem_ds)
     ds = gdal.Open('/vsimem/out.lbl')
-    if ds.GetRasterBand(1).GetScale() != 10:
-        return 'fail'
-    if ds.GetRasterBand(1).GetOffset() != 20:
-        return 'fail'
+    assert ds.GetRasterBand(1).GetScale() == 10
+    assert ds.GetRasterBand(1).GetOffset() == 20
     ds = None
     gdal.GetDriverByName('ISIS3').Delete('/vsimem/out.lbl')
 
@@ -1340,7 +1175,7 @@ def test_isis_26():
     content = gdal.VSIFReadL(1, 10000, f).decode('ASCII')
     gdal.VSIFCloseL(f)
 
-    if content.find(
+    assert (content.find(
         """Object = Table
   Name = first_table
 End_Object
@@ -1360,9 +1195,7 @@ def test_isis_26():
 Object = foo
   x = C
 End_Object
-""") < 0:
-        print(content)
-        return 'fail'
+""") >= 0)
 
     gdal.Unlink('/vsimem/in.lbl')
     gdal.GetDriverByName('ISIS3').Delete('/vsimem/out.lbl')
@@ -1398,8 +1231,7 @@ def test_isis_27():
                 if history_filename != 'out2.History.IsisCube':
                     print(src_location)
                     print(dst_location)
-                    print(content)
-                    return 'fail'
+                    pytest.fail(content)
 
                 f = gdal.VSIFOpenL('/vsimem/' + history_filename, 'rb')
                 history = None
@@ -1410,15 +1242,11 @@ def test_isis_27():
                 if offset != 0 or size != len(history):
                     print(src_location)
                     print(dst_location)
-                    print(content)
-                    print(history)
-                    return 'fail'
+                    pytest.fail(content)
             else:
                 if offset + size != len(content):
                     print(src_location)
-                    print(dst_location)
-                    print(content)
-                    return 'fail'
+                    pytest.fail(dst_location)
                 history = content[offset:]
 
             if history.find('Object = ') != 0 or \
@@ -1427,9 +1255,7 @@ def test_isis_27():
                     history.find('TO = out.lbl') < 0:
                 print(src_location)
                 print(dst_location)
-                print(content)
-                print(history)
-                return 'fail'
+                pytest.fail(content)
 
             gdal.GetDriverByName('ISIS3').Delete('/vsimem/out.lbl')
             gdal.GetDriverByName('ISIS3').Delete('/vsimem/out2.lbl')
@@ -1442,9 +1268,7 @@ def test_isis_27():
     if f is not None:
         content = gdal.VSIFReadL(1, 10000, f).decode('ASCII')
         gdal.VSIFCloseL(f)
-    if content.find('foo') < 0:
-        print(content)
-        return 'fail'
+    assert content.find('foo') >= 0
     gdal.GetDriverByName('ISIS3').Delete('/vsimem/out.lbl')
 
     return 'success'
@@ -1515,8 +1339,7 @@ def test_isis_28():
                 if table_filename != 'out.Table.first_table':
                     print(src_location)
                     print(dst_location)
-                    print(content)
-                    return 'fail'
+                    pytest.fail(content)
 
                 f = gdal.VSIFOpenL('/vsimem/' + table_filename, 'rb')
                 table = None
@@ -1527,23 +1350,17 @@ def test_isis_28():
                 if offset != 0 or size != 3 or size != len(table):
                     print(src_location)
                     print(dst_location)
-                    print(content)
-                    print(table)
-                    return 'fail'
+                    pytest.fail(content)
             else:
                 if offset + size != len(content):
                     print(src_location)
-                    print(dst_location)
-                    print(content)
-                    return 'fail'
+                    pytest.fail(dst_location)
                 table = content[offset:]
 
             if table != 'FOO':
                 print(src_location)
                 print(dst_location)
-                print(content)
-                print(table)
-                return 'fail'
+                pytest.fail(content)
 
             gdal.GetDriverByName('ISIS3').Delete('/vsimem/out.lbl')
 
@@ -1565,9 +1382,7 @@ def test_isis_29():
     ds = gdal.Open('/vsimem/out.lbl')
     lbl = ds.GetMetadata_List('json:ISIS3')[0]
     lbl = json.loads(lbl)
-    if 'History' in lbl:
-        print(lbl)
-        return 'fail'
+    assert 'History' not in lbl
     ds = None
 
     gdal.GetDriverByName('ISIS3').Delete('/vsimem/out.lbl')
@@ -1578,12 +1393,9 @@ def test_isis_29():
     ds = gdal.Open('/vsimem/out.lbl')
     lbl = ds.GetMetadata_List('json:ISIS3')[0]
     lbl = json.loads(lbl)
-    if 'History' in lbl:
-        print(lbl)
-        return 'fail'
+    assert 'History' not in lbl
     ds = None
-    if gdal.VSIStatL('/vsimem/out.History.IsisCube') is not None:
-        return 'fail'
+    assert gdal.VSIStatL('/vsimem/out.History.IsisCube') is None
 
     gdal.GetDriverByName('ISIS3').Delete('/vsimem/out.lbl')
     gdal.GetDriverByName('ISIS3').Delete('/vsimem/in.lbl')
@@ -1604,9 +1416,7 @@ def test_isis_30():
     ds = None
 
     gdal.GetDriverByName('ISIS3').Delete('/vsimem/test.lbl')
-    if cs != 1:
-        print(cs)
-        return 'fail'
+    assert cs == 1
 
     return 'success'
 
@@ -1626,9 +1436,7 @@ def test_isis_31():
     ds = None
 
     gdal.GetDriverByName('ISIS3').Delete('/vsimem/test.lbl')
-    if cs != 1:
-        print(cs)
-        return 'fail'
+    assert cs == 1
 
     return 'success'
 
diff --git a/autotest/gdrivers/jp2kak.py b/autotest/gdrivers/jp2kak.py
index e0a8d481be81..6dfe81ac7b4a 100755
--- a/autotest/gdrivers/jp2kak.py
+++ b/autotest/gdrivers/jp2kak.py
@@ -156,10 +156,7 @@ def test_jp2kak_10():
     for x in range(8):
         got.append((ord(data[x * 100]), ord(data[80000 + x * 100])))
 
-    if got != expected:
-        print(got)
-        gdaltest.post_reason('did not get expected values.')
-        return 'fail'
+    assert got == expected, 'did not get expected values.'
 
     return 'success'
 
@@ -175,9 +172,7 @@ def test_jp2kak_11():
 
     ds = gdal.Open('data/gtsmall_11_int16.jp2')
     cs = ds.GetRasterBand(1).Checksum()
-    if cs not in (63475, 63472, 63452, 63471):
-        print(cs)
-        return 'fail'
+    assert cs in (63475, 63472, 63452, 63471)
     return 'success'
 
 ###############################################################################
@@ -192,9 +187,7 @@ def test_jp2kak_12():
 
     ds = gdal.Open('data/gtsmall_10_uint16.jp2')
     cs = ds.GetRasterBand(1).Checksum()
-    if cs != 63360 and cs != 63357 and cs != 63358:
-        print(cs)
-        return 'fail'
+    assert cs == 63360 or cs == 63357 or cs == 63358
     return 'success'
 
 
@@ -212,23 +205,18 @@ def test_jp2kak_13():
     src_ds = None
 
     jp2_band = jp2_ds.GetRasterBand(1)
-    if jp2_band.GetOverviewCount() != 1:
-        gdaltest.post_reason('did not get expected number of overviews on jp2')
-        return 'fail'
+    assert jp2_band.GetOverviewCount() == 1, \
+        'did not get expected number of overviews on jp2'
 
     ov_band = jp2_band.GetOverview(0)
-    if ov_band.XSize != 250 or ov_band.YSize != 4:
-        gdaltest.post_reason('did not get expected overview size.')
-        return 'fail'
+    assert ov_band.XSize == 250 and ov_band.YSize == 4, \
+        'did not get expected overview size.'
 
     # Note, due to oddities of rounding related to identifying discard
     # levels the overview is actually generated with no discard levels
     # and in the debug output we see 500x7 -> 500x7 -> 250x4.
     checksum = ov_band.Checksum()
-    if checksum not in (11776, 11736, 11801):
-        print(checksum)
-        gdaltest.post_reason('did not get expected overview checksum')
-        return 'fail'
+    assert checksum in (11776, 11736, 11801), 'did not get expected overview checksum'
 
     return 'success'
 
@@ -247,31 +235,22 @@ def test_jp2kak_14():
     jp2_ds.BuildOverviews('NEAREST', overviewlist=[2, 4])
 
     jp2_band = jp2_ds.GetRasterBand(1)
-    if jp2_band.GetOverviewCount() != 2:
-        gdaltest.post_reason('did not get expected number of overviews on jp2')
-        return 'fail'
+    assert jp2_band.GetOverviewCount() == 2, \
+        'did not get expected number of overviews on jp2'
 
     ov_band = jp2_band.GetOverview(0)
-    if ov_band.XSize != 250 or ov_band.YSize != 4:
-        gdaltest.post_reason('did not get expected overview size.')
-        return 'fail'
+    assert ov_band.XSize == 250 and ov_band.YSize == 4, \
+        'did not get expected overview size.'
 
     checksum = ov_band.Checksum()
-    if checksum not in (12288, 12272, 12224):
-        print(checksum)
-        gdaltest.post_reason('did not get expected overview checksum')
-        return 'fail'
+    assert checksum in (12288, 12272, 12224), 'did not get expected overview checksum'
 
     ov_band = jp2_band.GetOverview(1)
-    if ov_band.XSize != 125 or ov_band.YSize != 2:
-        gdaltest.post_reason('did not get expected overview size. (2)')
-        return 'fail'
+    assert ov_band.XSize == 125 and ov_band.YSize == 2, \
+        'did not get expected overview size. (2)'
 
     checksum = ov_band.Checksum()
-    if checksum not in (2957, 2980, 2990):
-        print(checksum)
-        gdaltest.post_reason('did not get expected overview checksum (2)')
-        return 'fail'
+    assert checksum in (2957, 2980, 2990), 'did not get expected overview checksum (2)'
 
     jp2_ds = None
     gdaltest.jp2kak_drv.Delete('tmp/jp2kak_13.jp2')
@@ -292,10 +271,9 @@ def test_jp2kak_15():
 
     md = jp2_ds.GetMetadata()
 
-    if (md['TIFFTAG_RESOLUTIONUNIT'] != '3 (pixels/cm)' or
-            md['TIFFTAG_XRESOLUTION'] != '200.012'):
-        gdaltest.post_reason('did not get expected resolution metadata')
-        return 'fail'
+    assert (not (md['TIFFTAG_RESOLUTIONUNIT'] != '3 (pixels/cm)' or
+            md['TIFFTAG_XRESOLUTION'] != '200.012')), \
+        'did not get expected resolution metadata'
 
     jp2_ds = None
 
@@ -319,10 +297,9 @@ def test_jp2kak_16():
     jp2_ds = gdal.Open('tmp/jp2kak_16.jp2')
     md = jp2_ds.GetMetadata()
 
-    if (md['TIFFTAG_RESOLUTIONUNIT'] != '3 (pixels/cm)' or
-            md['TIFFTAG_XRESOLUTION'] != '200.012'):
-        gdaltest.post_reason('did not get expected resolution metadata')
-        return 'fail'
+    assert (not (md['TIFFTAG_RESOLUTIONUNIT'] != '3 (pixels/cm)' or
+            md['TIFFTAG_XRESOLUTION'] != '200.012')), \
+        'did not get expected resolution metadata'
 
     jp2_ds = None
 
@@ -408,12 +385,9 @@ def test_jp2kak_20():
 
     ds = gdal.Open('data/stefan_full_rgba_alpha_1bit.jp2')
     fourth_band = ds.GetRasterBand(4)
-    if fourth_band.GetMetadataItem('NBITS', 'IMAGE_STRUCTURE') is not None:
-        return 'fail'
+    assert fourth_band.GetMetadataItem('NBITS', 'IMAGE_STRUCTURE') is None
     got_cs = fourth_band.Checksum()
-    if got_cs != 8527:
-        print(got_cs)
-        return 'fail'
+    assert got_cs == 8527
     jp2_bands_data = ds.ReadRaster(0, 0, ds.RasterXSize, ds.RasterYSize)
     # jp2_fourth_band_data = fourth_band.ReadRaster(
     #     0, 0, ds.RasterXSize, ds.RasterYSize)
@@ -432,12 +406,9 @@ def test_jp2kak_20():
     #     ds.RasterXSize/16, ds.RasterYSize/16)
     tmp_ds = None
     tiff_drv.Delete('/vsimem/jp2kak_20.tif')
-    if got_cs != 8527:
-        print(got_cs)
-        return 'fail'
+    assert got_cs == 8527
 
-    if jp2_bands_data != gtiff_bands_data:
-        return 'fail'
+    assert jp2_bands_data == gtiff_bands_data
 
     # if jp2_fourth_band_data != gtiff_fourth_band_data:
     #    gdaltest.post_reason('fail')
@@ -446,8 +417,7 @@ def test_jp2kak_20():
     ds = gdal.OpenEx('data/stefan_full_rgba_alpha_1bit.jp2',
                      open_options=['1BIT_ALPHA_PROMOTION=NO'])
     fourth_band = ds.GetRasterBand(4)
-    if fourth_band.GetMetadataItem('NBITS', 'IMAGE_STRUCTURE') != '1':
-        return 'fail'
+    assert fourth_band.GetMetadataItem('NBITS', 'IMAGE_STRUCTURE') == '1'
 
     return 'success'
 
@@ -481,10 +451,7 @@ def test_jp2kak_21():
     ref_cs = mem_ds.GetRasterBand(1).Checksum()
     mem_ds.GetRasterBand(1).WriteRaster(0, 0, 40, 40, upsampled_data)
     cs = mem_ds.GetRasterBand(1).Checksum()
-    if cs != ref_cs:
-        print(cs)
-        print(ref_cs)
-        return 'fail'
+    assert cs == ref_cs
 
     return 'success'
 
@@ -503,14 +470,9 @@ def test_jp2kak_22():
     for i in range(4):
         ref_cs = src_ds.GetRasterBand(1).Checksum()
         cs = ds.GetRasterBand(1).Checksum()
-        if ref_cs != cs:
-            print(i)
-            print(cs)
-            print(ref_cs)
-            return 'fail'
-        if src_ds.GetRasterBand(1).GetColorInterpretation() != ds.GetRasterBand(1).GetColorInterpretation():
-            print(i)
-            return 'fail'
+        assert ref_cs == cs, i
+        assert src_ds.GetRasterBand(1).GetColorInterpretation() == ds.GetRasterBand(1).GetColorInterpretation(), \
+            i
     ds = None
 
     gdal.Unlink('/vsimem/jp2kak_22.jp2')
diff --git a/autotest/gdrivers/jp2lura.py b/autotest/gdrivers/jp2lura.py
index a9b112975212..9ae93b375167 100755
--- a/autotest/gdrivers/jp2lura.py
+++ b/autotest/gdrivers/jp2lura.py
@@ -36,6 +36,7 @@
 from osgeo import gdal
 from osgeo import ogr
 from osgeo import osr
+import pytest
 
 sys.path.append('../../gdal/swig/python/samples')
 
@@ -86,8 +87,7 @@ def test_jp2lura_missing_license_num():
     gdal.SetConfigOption('LURA_LICENSE_NUM_1', old_num_1)
     gdal.SetConfigOption('LURA_LICENSE_NUM_2', old_num_2)
 
-    if ds is not None:
-        return 'fail'
+    assert ds is None
 
     return 'success'
 
@@ -109,8 +109,7 @@ def test_jp2lura_invalid_license_num():
     gdal.SetConfigOption('LURA_LICENSE_NUM_1', old_num_1)
     gdal.SetConfigOption('LURA_LICENSE_NUM_2', old_num_2)
 
-    if ds is not None:
-        return 'fail'
+    assert ds is None
 
     return 'success'
 
@@ -200,13 +199,10 @@ def test_jp2lura_3():
     ds_ref = None
 
     # Quite a bit of difference...
-    if maxdiff > 6:
-        gdaltest.post_reason('Image too different from reference')
-        return 'fail'
+    assert maxdiff <= 6, 'Image too different from reference'
 
     ds = ogr.Open('data/int16.jp2')
-    if ds is not None:
-        return 'fail'
+    assert ds is None
 
     return 'success'
 
@@ -236,11 +232,9 @@ def test_jp2lura_4(out_filename='tmp/jp2lura_4.jp2'):
     vrt_ds = None
     gdal.Unlink('/vsimem/jp2lura_4.vrt')
 
-    if gdal.VSIStatL(out_filename + '.aux.xml') is not None:
-        return 'fail'
+    assert gdal.VSIStatL(out_filename + '.aux.xml') is None
 
-    if validate(out_filename, inspire_tg=False) == 'fail':
-        return 'fail'
+    assert validate(out_filename, inspire_tg=False) != 'fail'
 
     ds = gdal.Open(out_filename)
     cs = ds.GetRasterBand(1).Checksum()
@@ -253,12 +247,8 @@ def test_jp2lura_4(out_filename='tmp/jp2lura_4.jp2'):
 
     gdal.Unlink(out_filename)
 
-    if xres != '300' or yres != '200' or resunit != '3 (pixels/cm)':
-        gdaltest.post_reason('bad resolution')
-        print(xres)
-        print(yres)
-        print(resunit)
-        return 'fail'
+    assert xres == '300' and yres == '200' and resunit == '3 (pixels/cm)', \
+        'bad resolution'
 
     sr1 = osr.SpatialReference()
     sr1.SetFromUserInput(got_wkt)
@@ -266,22 +256,14 @@ def test_jp2lura_4(out_filename='tmp/jp2lura_4.jp2'):
     sr2.SetFromUserInput(src_wkt)
 
     if sr1.IsSame(sr2) == 0:
-        gdaltest.post_reason('bad spatial reference')
         print(got_wkt)
         print(src_wkt)
-        return 'fail'
+        pytest.fail('bad spatial reference')
 
     for i in range(6):
-        if abs(got_gt[i] - src_gt[i]) > 1e-8:
-            gdaltest.post_reason('bad geotransform')
-            print(got_gt)
-            print(src_gt)
-            return 'fail'
+        assert abs(got_gt[i] - src_gt[i]) <= 1e-8, 'bad geotransform'
 
-    if cs != 50054:
-        gdaltest.post_reason('bad checksum')
-        print(cs)
-        return 'fail'
+    assert cs == 50054, 'bad checksum'
 
     return 'success'
 
@@ -346,13 +328,10 @@ def test_jp2lura_8():
     expected_checksums = [64570, 57277, 56048]  # 61292]
 
     for i, csum in enumerate(expected_checksums):
-        if ds.GetRasterBand(i + 1).Checksum() != csum:
-            gdaltest.post_reason('unexpected checksum (%d) for band %d' % (csum, i + 1))
-            return 'fail'
+        assert ds.GetRasterBand(i + 1).Checksum() == csum, \
+            ('unexpected checksum (%d) for band %d' % (csum, i + 1))
 
-    if ds.GetRasterBand(1).DataType != gdal.GDT_UInt16:
-        gdaltest.post_reason('unexpected data type')
-        return 'fail'
+    assert ds.GetRasterBand(1).DataType == gdal.GDT_UInt16, 'unexpected data type'
 
     return 'success'
 
@@ -368,15 +347,8 @@ def test_jp2lura_9():
     ds = gdal.Open('data/byte_without_geotransform.jp2')
 
     geotransform = ds.GetGeoTransform()
-    if abs(geotransform[0] - 440720) > 0.1 \
-            or abs(geotransform[1] - 60) > 0.001 \
-            or abs(geotransform[2] - 0) > 0.001 \
-            or abs(geotransform[3] - 3751320) > 0.1 \
-            or abs(geotransform[4] - 0) > 0.001 \
-            or abs(geotransform[5] - -60) > 0.001:
-        print(geotransform)
-        gdaltest.post_reason('geotransform differs from expected')
-        return 'fail'
+    assert abs(geotransform[0] - 440720) <= 0.1 and abs(geotransform[1] - 60) <= 0.001 and abs(geotransform[2] - 0) <= 0.001 and abs(geotransform[3] - 3751320) <= 0.1 and abs(geotransform[4] - 0) <= 0.001 and abs(geotransform[5] - -60) <= 0.001, \
+        'geotransform differs from expected'
 
     ds = None
 
@@ -394,20 +366,15 @@ def DISABLED_jp2lura_10():
     src_ds = gdal.Open('data/rgbsmall.tif')
     out_ds = gdaltest.jp2lura_drv.CreateCopy('/vsimem/jp2lura_10.jp2', src_ds, options=['YCBCR420=YES', 'RESOLUTIONS=3'])
     maxdiff = gdaltest.compare_ds(src_ds, out_ds)
-    if out_ds.GetRasterBand(1).GetColorInterpretation() != gdal.GCI_RedBand:
-        return 'fail'
-    if out_ds.GetRasterBand(2).GetColorInterpretation() != gdal.GCI_GreenBand:
-        return 'fail'
-    if out_ds.GetRasterBand(3).GetColorInterpretation() != gdal.GCI_BlueBand:
-        return 'fail'
+    assert out_ds.GetRasterBand(1).GetColorInterpretation() == gdal.GCI_RedBand
+    assert out_ds.GetRasterBand(2).GetColorInterpretation() == gdal.GCI_GreenBand
+    assert out_ds.GetRasterBand(3).GetColorInterpretation() == gdal.GCI_BlueBand
     del out_ds
     src_ds = None
     gdal.Unlink('/vsimem/jp2lura_10.jp2')
 
     # Quite a bit of difference...
-    if maxdiff > 12:
-        gdaltest.post_reason('Image too different from reference')
-        return 'fail'
+    assert maxdiff <= 12, 'Image too different from reference'
 
     return 'success'
 
@@ -422,12 +389,9 @@ def DISABLED_jp2lura_11():
 
     ds = gdal.Open('data/stefan_full_rgba_alpha_1bit.jp2')
     fourth_band = ds.GetRasterBand(4)
-    if fourth_band.GetMetadataItem('NBITS', 'IMAGE_STRUCTURE') is not None:
-        return 'fail'
+    assert fourth_band.GetMetadataItem('NBITS', 'IMAGE_STRUCTURE') is None
     got_cs = fourth_band.Checksum()
-    if got_cs != 8527:
-        print(got_cs)
-        return 'fail'
+    assert got_cs == 8527
     jp2_bands_data = ds.ReadRaster(0, 0, ds.RasterXSize, ds.RasterYSize)
     jp2_fourth_band_data = fourth_band.ReadRaster(0, 0, ds.RasterXSize, ds.RasterYSize)
     fourth_band.ReadRaster(0, 0, ds.RasterXSize, ds.RasterYSize, int(ds.RasterXSize / 16), int(ds.RasterYSize / 16))
@@ -440,20 +404,15 @@ def DISABLED_jp2lura_11():
     # gtiff_fourth_band_subsampled_data = fourth_band.ReadRaster(0,0,ds.RasterXSize,ds.RasterYSize,ds.RasterXSize/16,ds.RasterYSize/16)
     tmp_ds = None
     gdal.GetDriverByName('GTiff').Delete('/vsimem/jp2lura_11.tif')
-    if got_cs != 8527:
-        print(got_cs)
-        return 'fail'
+    assert got_cs == 8527
 
-    if jp2_bands_data != gtiff_bands_data:
-        return 'fail'
+    assert jp2_bands_data == gtiff_bands_data
 
-    if jp2_fourth_band_data != gtiff_fourth_band_data:
-        return 'fail'
+    assert jp2_fourth_band_data == gtiff_fourth_band_data
 
     ds = gdal.OpenEx('data/stefan_full_rgba_alpha_1bit.jp2', open_options=['1BIT_ALPHA_PROMOTION=NO'])
     fourth_band = ds.GetRasterBand(4)
-    if fourth_band.GetMetadataItem('NBITS', 'IMAGE_STRUCTURE') != '1':
-        return 'fail'
+    assert fourth_band.GetMetadataItem('NBITS', 'IMAGE_STRUCTURE') == '1'
 
     return 'success'
 
@@ -481,9 +440,7 @@ def test_jp2lura_12():
 
     gdaltest.jp2lura_drv.Delete('tmp/jp2lura_12.jp2')
 
-    if wkt.find('32631') < 0:
-        print(wkt)
-        return 'fail'
+    assert wkt.find('32631') >= 0
 
     # Override geotransform
     shutil.copy('data/byte.jp2', 'tmp/jp2lura_12.jp2')
@@ -498,9 +455,7 @@ def test_jp2lura_12():
 
     gdaltest.jp2lura_drv.Delete('tmp/jp2lura_12.jp2')
 
-    if gt != (1000, 1, 0, 2000, 0, -1):
-        print(gt)
-        return 'fail'
+    assert gt == (1000, 1, 0, 2000, 0, -1)
 
     return 'success'
 
@@ -519,20 +474,15 @@ def test_jp2lura_13():
     ds = None
     src_ds = None
 
-    if gdal.VSIStatL('tmp/jp2lura_13.jp2.aux.xml') is not None:
-        return 'fail'
+    assert gdal.VSIStatL('tmp/jp2lura_13.jp2.aux.xml') is None
 
     ds = gdal.Open('tmp/jp2lura_13.jp2')
     count = ds.GetGCPCount()
     gcps = ds.GetGCPs()
     wkt = ds.GetGCPProjection()
-    if count != 4:
-        return 'fail'
-    if len(gcps) != 4:
-        return 'fail'
-    if wkt.find('4326') < 0:
-        print(wkt)
-        return 'fail'
+    assert count == 4
+    assert len(gcps) == 4
+    assert wkt.find('4326') >= 0
     ds = None
 
     # Override GCP
@@ -551,13 +501,9 @@ def test_jp2lura_13():
 
     gdaltest.jp2lura_drv.Delete('tmp/jp2lura_13.jp2')
 
-    if count != 1:
-        return 'fail'
-    if len(gcps) != 1:
-        return 'fail'
-    if wkt.find('32631') < 0:
-        print(wkt)
-        return 'fail'
+    assert count == 1
+    assert len(gcps) == 1
+    assert wkt.find('32631') >= 0
 
     return 'success'
 
@@ -571,8 +517,7 @@ def test_jp2lura_14():
         return 'skip'
 
     ds = gdal.Open('data/byte_2gcps.jp2')
-    if ds.GetGCPCount() != 2:
-        return 'fail'
+    assert ds.GetGCPCount() == 2
 
     return 'success'
 
@@ -587,17 +532,13 @@ def test_jp2lura_16():
 
     ds = gdal.Open('data/byte_point.jp2')
     gt = ds.GetGeoTransform()
-    if ds.GetMetadataItem('AREA_OR_POINT') != 'Point':
-        gdaltest.post_reason('did not get AREA_OR_POINT = Point')
-        return 'fail'
+    assert ds.GetMetadataItem('AREA_OR_POINT') == 'Point', \
+        'did not get AREA_OR_POINT = Point'
     ds = None
 
     gt_expected = (440690.0, 60.0, 0.0, 3751350.0, 0.0, -60.0)
 
-    if gt != gt_expected:
-        print(gt)
-        gdaltest.post_reason('did not get expected geotransform')
-        return 'fail'
+    assert gt == gt_expected, 'did not get expected geotransform'
 
     gdal.SetConfigOption('GTIFF_POINT_GEO_IGNORE', 'TRUE')
 
@@ -609,10 +550,8 @@ def test_jp2lura_16():
 
     gt_expected = (440720.0, 60.0, 0.0, 3751320.0, 0.0, -60.0)
 
-    if gt != gt_expected:
-        print(gt)
-        gdaltest.post_reason('did not get expected geotransform with GTIFF_POINT_GEO_IGNORE TRUE')
-        return 'fail'
+    assert gt == gt_expected, \
+        'did not get expected geotransform with GTIFF_POINT_GEO_IGNORE TRUE'
 
     return 'success'
 
@@ -630,22 +569,17 @@ def test_jp2lura_17():
     ds = None
     src_ds = None
 
-    if gdal.VSIStatL('/vsimem/jp2lura_17.jp2.aux.xml') is not None:
-        return 'fail'
+    assert gdal.VSIStatL('/vsimem/jp2lura_17.jp2.aux.xml') is None
 
     ds = gdal.Open('/vsimem/jp2lura_17.jp2')
     gt = ds.GetGeoTransform()
-    if ds.GetMetadataItem('AREA_OR_POINT') != 'Point':
-        gdaltest.post_reason('did not get AREA_OR_POINT = Point')
-        return 'fail'
+    assert ds.GetMetadataItem('AREA_OR_POINT') == 'Point', \
+        'did not get AREA_OR_POINT = Point'
     ds = None
 
     gt_expected = (440690.0, 60.0, 0.0, 3751350.0, 0.0, -60.0)
 
-    if gt != gt_expected:
-        print(gt)
-        gdaltest.post_reason('did not get expected geotransform')
-        return 'fail'
+    assert gt == gt_expected, 'did not get expected geotransform'
 
     gdal.Unlink('/vsimem/jp2lura_17.jp2')
 
@@ -668,8 +602,7 @@ def test_jp2lura_18():
 
     ds = gdal.Open('/vsimem/jp2lura_18.jp2')
     ds.GetRasterBand(1).Checksum()
-    if gdal.GetLastErrorMsg() != '':
-        return 'fail'
+    assert gdal.GetLastErrorMsg() == ''
     ds = None
 
     gdal.Unlink('/vsimem/jp2lura_18.jp2')
@@ -686,8 +619,7 @@ def test_jp2lura_19():
         return 'skip'
 
     ds = gdal.Open('data/byte_gmljp2_with_nul_car.jp2')
-    if ds.GetProjectionRef() == '':
-        return 'fail'
+    assert ds.GetProjectionRef() != ''
     ds = None
 
     return 'success'
@@ -759,8 +691,7 @@ def test_jp2lura_20():
     ds = None
     gdal.Unlink('/vsimem/jp2lura_20.jp2')
 
-    if not xmlvalidate.validate(gmljp2, ogc_schemas_location='tmp/cache/SCHEMAS_OPENGIS_NET'):
-        return 'fail'
+    assert xmlvalidate.validate(gmljp2, ogc_schemas_location='tmp/cache/SCHEMAS_OPENGIS_NET')
 
     return 'success'
 
@@ -779,27 +710,19 @@ def test_jp2lura_22():
     maxdiff = gdaltest.compare_ds(src_ds, out_ds)
     del out_ds
     src_ds = None
-    if gdal.VSIStatL('/vsimem/jp2lura_22.jp2.aux.xml') is not None:
-        return 'fail'
+    assert gdal.VSIStatL('/vsimem/jp2lura_22.jp2.aux.xml') is None
     ds = gdal.Open('/vsimem/jp2lura_22.jp2')
-    if ds.GetRasterBand(1).GetColorInterpretation() != gdal.GCI_RedBand:
-        return 'fail'
-    if ds.GetRasterBand(2).GetColorInterpretation() != gdal.GCI_GreenBand:
-        return 'fail'
-    if ds.GetRasterBand(3).GetColorInterpretation() != gdal.GCI_BlueBand:
-        return 'fail'
-    if ds.GetRasterBand(4).GetColorInterpretation() != gdal.GCI_AlphaBand:
-        return 'fail'
+    assert ds.GetRasterBand(1).GetColorInterpretation() == gdal.GCI_RedBand
+    assert ds.GetRasterBand(2).GetColorInterpretation() == gdal.GCI_GreenBand
+    assert ds.GetRasterBand(3).GetColorInterpretation() == gdal.GCI_BlueBand
+    assert ds.GetRasterBand(4).GetColorInterpretation() == gdal.GCI_AlphaBand
     ds = None
 
-    if validate('/vsimem/jp2lura_22.jp2', expected_gmljp2=False, inspire_tg=False) == 'fail':
-        return 'fail'
+    assert validate('/vsimem/jp2lura_22.jp2', expected_gmljp2=False, inspire_tg=False) != 'fail'
 
     gdal.Unlink('/vsimem/jp2lura_22.jp2')
 
-    if maxdiff > 0:
-        gdaltest.post_reason('Image too different from reference')
-        return 'fail'
+    assert maxdiff <= 0, 'Image too different from reference'
 
     if False:  # pylint: disable=using-constant-test
         # RGBA with 1BIT_ALPHA=YES
@@ -807,17 +730,13 @@ def test_jp2lura_22():
         out_ds = gdaltest.jp2lura_drv.CreateCopy('/vsimem/jp2lura_22.jp2', src_ds, options=['1BIT_ALPHA=YES'])
         del out_ds
         src_ds = None
-        if gdal.VSIStatL('/vsimem/jp2lura_22.jp2.aux.xml') is not None:
-            return 'fail'
+        assert gdal.VSIStatL('/vsimem/jp2lura_22.jp2.aux.xml') is None
         ds = gdal.OpenEx('/vsimem/jp2lura_22.jp2', open_options=['1BIT_ALPHA_PROMOTION=NO'])
         fourth_band = ds.GetRasterBand(4)
-        if fourth_band.GetMetadataItem('NBITS', 'IMAGE_STRUCTURE') != '1':
-            return 'fail'
+        assert fourth_band.GetMetadataItem('NBITS', 'IMAGE_STRUCTURE') == '1'
         ds = None
         ds = gdal.Open('/vsimem/jp2lura_22.jp2')
-        if ds.GetRasterBand(4).Checksum() != 23120:
-            print(ds.GetRasterBand(4).Checksum())
-            return 'fail'
+        assert ds.GetRasterBand(4).Checksum() == 23120
         ds = None
         gdal.Unlink('/vsimem/jp2lura_22.jp2')
 
@@ -826,20 +745,13 @@ def test_jp2lura_22():
         out_ds = gdaltest.jp2lura_drv.CreateCopy('/vsimem/jp2lura_22.jp2', src_ds, options=['YCBCR420=YES'])
         del out_ds
         src_ds = None
-        if gdal.VSIStatL('/vsimem/jp2lura_22.jp2.aux.xml') is not None:
-            return 'fail'
+        assert gdal.VSIStatL('/vsimem/jp2lura_22.jp2.aux.xml') is None
         ds = gdal.Open('/vsimem/jp2lura_22.jp2')
-        if ds.GetRasterBand(1).GetColorInterpretation() != gdal.GCI_RedBand:
-            return 'fail'
-        if ds.GetRasterBand(2).GetColorInterpretation() != gdal.GCI_GreenBand:
-            return 'fail'
-        if ds.GetRasterBand(3).GetColorInterpretation() != gdal.GCI_BlueBand:
-            return 'fail'
-        if ds.GetRasterBand(4).GetColorInterpretation() != gdal.GCI_AlphaBand:
-            return 'fail'
-        if ds.GetRasterBand(1).Checksum() != 11457:
-            print(ds.GetRasterBand(1).Checksum())
-            return 'fail'
+        assert ds.GetRasterBand(1).GetColorInterpretation() == gdal.GCI_RedBand
+        assert ds.GetRasterBand(2).GetColorInterpretation() == gdal.GCI_GreenBand
+        assert ds.GetRasterBand(3).GetColorInterpretation() == gdal.GCI_BlueBand
+        assert ds.GetRasterBand(4).GetColorInterpretation() == gdal.GCI_AlphaBand
+        assert ds.GetRasterBand(1).Checksum() == 11457
         ds = None
         gdal.Unlink('/vsimem/jp2lura_22.jp2')
 
@@ -850,13 +762,10 @@ def test_jp2lura_22():
         maxdiff = gdaltest.compare_ds(src_ds, out_ds)
         del out_ds
         src_ds = None
-        if gdal.VSIStatL('/vsimem/jp2lura_22.jp2.aux.xml') is not None:
-            return 'fail'
+        assert gdal.VSIStatL('/vsimem/jp2lura_22.jp2.aux.xml') is None
         gdal.Unlink('/vsimem/jp2lura_22.jp2')
 
-        if maxdiff > 0:
-            gdaltest.post_reason('Image too different from reference')
-            return 'fail'
+        assert maxdiff <= 0, 'Image too different from reference'
 
         # RGB,undefined
         src_ds = gdal.Open('../gcore/data/stefan_full_rgba_photometric_rgb.tif')
@@ -864,23 +773,16 @@ def test_jp2lura_22():
         maxdiff = gdaltest.compare_ds(src_ds, out_ds)
         del out_ds
         src_ds = None
-        if gdal.VSIStatL('/vsimem/jp2lura_22.jp2.aux.xml') is not None:
-            return 'fail'
+        assert gdal.VSIStatL('/vsimem/jp2lura_22.jp2.aux.xml') is None
         ds = gdal.Open('/vsimem/jp2lura_22.jp2')
-        if ds.GetRasterBand(1).GetColorInterpretation() != gdal.GCI_RedBand:
-            return 'fail'
-        if ds.GetRasterBand(2).GetColorInterpretation() != gdal.GCI_GreenBand:
-            return 'fail'
-        if ds.GetRasterBand(3).GetColorInterpretation() != gdal.GCI_BlueBand:
-            return 'fail'
-        if ds.GetRasterBand(4).GetColorInterpretation() != gdal.GCI_Undefined:
-            return 'fail'
+        assert ds.GetRasterBand(1).GetColorInterpretation() == gdal.GCI_RedBand
+        assert ds.GetRasterBand(2).GetColorInterpretation() == gdal.GCI_GreenBand
+        assert ds.GetRasterBand(3).GetColorInterpretation() == gdal.GCI_BlueBand
+        assert ds.GetRasterBand(4).GetColorInterpretation() == gdal.GCI_Undefined
         ds = None
         gdal.Unlink('/vsimem/jp2lura_22.jp2')
 
-        if maxdiff > 0:
-            gdaltest.post_reason('Image too different from reference')
-            return 'fail'
+        assert maxdiff <= 0, 'Image too different from reference'
 
         # RGB,undefined with ALPHA=YES
         src_ds = gdal.Open('../gcore/data/stefan_full_rgba_photometric_rgb.tif')
@@ -888,23 +790,16 @@ def test_jp2lura_22():
         maxdiff = gdaltest.compare_ds(src_ds, out_ds)
         del out_ds
         src_ds = None
-        if gdal.VSIStatL('/vsimem/jp2lura_22.jp2.aux.xml') is not None:
-            return 'fail'
+        assert gdal.VSIStatL('/vsimem/jp2lura_22.jp2.aux.xml') is None
         ds = gdal.Open('/vsimem/jp2lura_22.jp2')
-        if ds.GetRasterBand(1).GetColorInterpretation() != gdal.GCI_RedBand:
-            return 'fail'
-        if ds.GetRasterBand(2).GetColorInterpretation() != gdal.GCI_GreenBand:
-            return 'fail'
-        if ds.GetRasterBand(3).GetColorInterpretation() != gdal.GCI_BlueBand:
-            return 'fail'
-        if ds.GetRasterBand(4).GetColorInterpretation() != gdal.GCI_AlphaBand:
-            return 'fail'
+        assert ds.GetRasterBand(1).GetColorInterpretation() == gdal.GCI_RedBand
+        assert ds.GetRasterBand(2).GetColorInterpretation() == gdal.GCI_GreenBand
+        assert ds.GetRasterBand(3).GetColorInterpretation() == gdal.GCI_BlueBand
+        assert ds.GetRasterBand(4).GetColorInterpretation() == gdal.GCI_AlphaBand
         ds = None
         gdal.Unlink('/vsimem/jp2lura_22.jp2')
 
-        if maxdiff > 0:
-            gdaltest.post_reason('Image too different from reference')
-            return 'fail'
+        assert maxdiff <= 0, 'Image too different from reference'
 
     return 'success'
 
@@ -923,23 +818,18 @@ def DISABLED_jp2lura_23():
     del out_ds
     src_ds = None
     ds = gdal.Open('/vsimem/jp2lura_23.jp2')
-    if ds.GetRasterBand(1).GetMetadataItem('NBITS', 'IMAGE_STRUCTURE') != '9':
-        return 'fail'
+    assert ds.GetRasterBand(1).GetMetadataItem('NBITS', 'IMAGE_STRUCTURE') == '9'
 
     out_ds = gdaltest.jp2lura_drv.CreateCopy('/vsimem/jp2lura_23_2.jp2', ds)
-    if out_ds.GetRasterBand(1).GetMetadataItem('NBITS', 'IMAGE_STRUCTURE') != '9':
-        return 'fail'
+    assert out_ds.GetRasterBand(1).GetMetadataItem('NBITS', 'IMAGE_STRUCTURE') == '9'
     del out_ds
 
     ds = None
-    if gdal.VSIStatL('/vsimem/jp2lura_23.jp2.aux.xml') is not None:
-        return 'fail'
+    assert gdal.VSIStatL('/vsimem/jp2lura_23.jp2.aux.xml') is None
     gdal.Unlink('/vsimem/jp2lura_23.jp2')
     gdal.Unlink('/vsimem/jp2lura_23_2.jp2')
 
-    if maxdiff > 1:
-        gdaltest.post_reason('Image too different from reference')
-        return 'fail'
+    assert maxdiff <= 1, 'Image too different from reference'
 
     return 'success'
 
@@ -958,23 +848,17 @@ def test_jp2lura_24():
     maxdiff = gdaltest.compare_ds(src_ds, out_ds)
     del out_ds
     src_ds = None
-    if gdal.VSIStatL('/vsimem/jp2lura_24.jp2.aux.xml') is not None:
-        return 'fail'
+    assert gdal.VSIStatL('/vsimem/jp2lura_24.jp2.aux.xml') is None
     ds = gdal.Open('/vsimem/jp2lura_24.jp2')
-    if ds.GetRasterBand(1).GetColorInterpretation() != gdal.GCI_GrayIndex:
-        return 'fail'
-    if ds.GetRasterBand(2).GetColorInterpretation() != gdal.GCI_AlphaBand:
-        return 'fail'
+    assert ds.GetRasterBand(1).GetColorInterpretation() == gdal.GCI_GrayIndex
+    assert ds.GetRasterBand(2).GetColorInterpretation() == gdal.GCI_AlphaBand
     ds = None
 
-    if validate('/vsimem/jp2lura_24.jp2', expected_gmljp2=False, inspire_tg=False) == 'fail':
-        return 'fail'
+    assert validate('/vsimem/jp2lura_24.jp2', expected_gmljp2=False, inspire_tg=False) != 'fail'
 
     gdal.Unlink('/vsimem/jp2lura_24.jp2')
 
-    if maxdiff > 0:
-        gdaltest.post_reason('Image too different from reference')
-        return 'fail'
+    assert maxdiff <= 0, 'Image too different from reference'
 
     if False:  # pylint: disable=using-constant-test
         #  Grey+alpha with 1BIT_ALPHA=YES
@@ -982,23 +866,15 @@ def test_jp2lura_24():
         gdaltest.jp2lura_drv.CreateCopy('/vsimem/jp2lura_24.jp2', src_ds, options=['1BIT_ALPHA=YES'])
 
         src_ds = None
-        if gdal.VSIStatL('/vsimem/jp2lura_24.jp2.aux.xml') is not None:
-            return 'fail'
+        assert gdal.VSIStatL('/vsimem/jp2lura_24.jp2.aux.xml') is None
         ds = gdal.OpenEx('/vsimem/jp2lura_24.jp2', open_options=['1BIT_ALPHA_PROMOTION=NO'])
-        if ds.GetRasterBand(1).GetColorInterpretation() != gdal.GCI_GrayIndex:
-            return 'fail'
-        if ds.GetRasterBand(2).GetColorInterpretation() != gdal.GCI_AlphaBand:
-            return 'fail'
-        if ds.GetRasterBand(2).GetMetadataItem('NBITS', 'IMAGE_STRUCTURE') != '1':
-            return 'fail'
+        assert ds.GetRasterBand(1).GetColorInterpretation() == gdal.GCI_GrayIndex
+        assert ds.GetRasterBand(2).GetColorInterpretation() == gdal.GCI_AlphaBand
+        assert ds.GetRasterBand(2).GetMetadataItem('NBITS', 'IMAGE_STRUCTURE') == '1'
         ds = None
         ds = gdal.Open('/vsimem/jp2lura_24.jp2')
-        if ds.GetRasterBand(2).GetMetadataItem('NBITS', 'IMAGE_STRUCTURE') is not None:
-            print(ds.GetRasterBand(2).GetMetadataItem('NBITS', 'IMAGE_STRUCTURE'))
-            return 'fail'
-        if ds.GetRasterBand(2).Checksum() != 23120:
-            print(ds.GetRasterBand(2).Checksum())
-            return 'fail'
+        assert ds.GetRasterBand(2).GetMetadataItem('NBITS', 'IMAGE_STRUCTURE') is None
+        assert ds.GetRasterBand(2).Checksum() == 23120
         ds = None
         gdal.Unlink('/vsimem/jp2lura_24.jp2')
 
@@ -1025,17 +901,13 @@ def test_jp2lura_25():
     del out_ds
     src_ds = None
     ds = gdal.Open('/vsimem/jp2lura_25.jp2')
-    if ds.GetRasterBand(1).GetColorInterpretation() != gdal.GCI_Undefined:
-        return 'fail'
+    assert ds.GetRasterBand(1).GetColorInterpretation() == gdal.GCI_Undefined
     ds = None
-    if gdal.VSIStatL('/vsimem/jp2lura_25.jp2.aux.xml') is not None:
-        return 'fail'
+    assert gdal.VSIStatL('/vsimem/jp2lura_25.jp2.aux.xml') is None
 
     gdal.Unlink('/vsimem/jp2lura_25.jp2')
 
-    if maxdiff > 0:
-        gdaltest.post_reason('Image too different from reference')
-        return 'fail'
+    assert maxdiff <= 0, 'Image too different from reference'
 
     return 'success'
 
@@ -1151,14 +1023,12 @@ def test_jp2lura_28():
         out_ds = gdaltest.jp2lura_drv.CreateCopy('/vsimem/jp2lura_28.jp2', src_ds, options=options)
         gdal.PopErrorHandler()
         if warning_expected and gdal.GetLastErrorMsg() == '':
-            gdaltest.post_reason('warning expected')
             print(options)
-            return 'fail'
+            pytest.fail('warning expected')
         del out_ds
         if not jp2lura_test_codeblock('/vsimem/jp2lura_28.jp2', expected_cbkw, expected_cbkh):
-            gdaltest.post_reason('unexpected codeblock size')
             print(options)
-            return 'fail'
+            pytest.fail('unexpected codeblock size')
 
     gdal.Unlink('/vsimem/jp2lura_28.jp2')
 
@@ -1185,8 +1055,7 @@ def test_jp2lura_30():
     gdal.PushErrorHandler()
     out_ds = gdaltest.jp2lura_drv.CreateCopy('/vsimem/jp2lura_30.jp2', src_ds)
     gdal.PopErrorHandler()
-    if out_ds is not None:
-        return 'fail'
+    assert out_ds is None
 
     return 'success'
 
@@ -1205,16 +1074,11 @@ def DISABLED_jp2lura_31():
     src_ds.GetRasterBand(3).SetColorInterpretation(gdal.GCI_RedBand)
     out_ds = gdaltest.jp2lura_drv.CreateCopy('/vsimem/jp2lura_31.jp2', src_ds)
     del out_ds
-    if gdal.VSIStatL('/vsimem/jp2lura_31.jp2.aux.xml') is not None:
-        return 'fail'
+    assert gdal.VSIStatL('/vsimem/jp2lura_31.jp2.aux.xml') is None
     ds = gdal.Open('/vsimem/jp2lura_31.jp2')
-    if ds.GetRasterBand(1).GetColorInterpretation() != gdal.GCI_GreenBand:
-        print(ds.GetRasterBand(1).GetColorInterpretation())
-        return 'fail'
-    if ds.GetRasterBand(2).GetColorInterpretation() != gdal.GCI_BlueBand:
-        return 'fail'
-    if ds.GetRasterBand(3).GetColorInterpretation() != gdal.GCI_RedBand:
-        return 'fail'
+    assert ds.GetRasterBand(1).GetColorInterpretation() == gdal.GCI_GreenBand
+    assert ds.GetRasterBand(2).GetColorInterpretation() == gdal.GCI_BlueBand
+    assert ds.GetRasterBand(3).GetColorInterpretation() == gdal.GCI_RedBand
     ds = None
     gdal.Unlink('/vsimem/jp2lura_31.jp2')
 
@@ -1226,18 +1090,12 @@ def DISABLED_jp2lura_31():
     src_ds.GetRasterBand(4).SetColorInterpretation(gdal.GCI_RedBand)
     out_ds = gdaltest.jp2lura_drv.CreateCopy('/vsimem/jp2lura_31.jp2', src_ds)
     del out_ds
-    if gdal.VSIStatL('/vsimem/jp2lura_31.jp2.aux.xml') is not None:
-        return 'fail'
+    assert gdal.VSIStatL('/vsimem/jp2lura_31.jp2.aux.xml') is None
     ds = gdal.Open('/vsimem/jp2lura_31.jp2')
-    if ds.GetRasterBand(1).GetColorInterpretation() != gdal.GCI_AlphaBand:
-        print(ds.GetRasterBand(1).GetColorInterpretation())
-        return 'fail'
-    if ds.GetRasterBand(2).GetColorInterpretation() != gdal.GCI_GreenBand:
-        return 'fail'
-    if ds.GetRasterBand(3).GetColorInterpretation() != gdal.GCI_BlueBand:
-        return 'fail'
-    if ds.GetRasterBand(4).GetColorInterpretation() != gdal.GCI_RedBand:
-        return 'fail'
+    assert ds.GetRasterBand(1).GetColorInterpretation() == gdal.GCI_AlphaBand
+    assert ds.GetRasterBand(2).GetColorInterpretation() == gdal.GCI_GreenBand
+    assert ds.GetRasterBand(3).GetColorInterpretation() == gdal.GCI_BlueBand
+    assert ds.GetRasterBand(4).GetColorInterpretation() == gdal.GCI_RedBand
     ds = None
     gdal.Unlink('/vsimem/jp2lura_31.jp2')
 
@@ -1259,8 +1117,7 @@ def DISABLED_jp2lura_33():
     gdal.PushErrorHandler()
     out_ds = gdaltest.jp2lura_drv.CreateCopy('/vsimem/jp2lura_33.jp2', src_ds, options=['BLOCKXSIZE=100000', 'BLOCKYSIZE=100000'])
     gdal.PopErrorHandler()
-    if out_ds is not None:
-        return 'fail'
+    assert out_ds is None
     out_ds = None
     gdal.Unlink('/vsimem/jp2lura_33.jp2')
 
@@ -1278,8 +1135,7 @@ def test_jp2lura_34():
     gdal.PushErrorHandler()
     ds = gdal.Open('data/dimensions_above_31bit.jp2')
     gdal.PopErrorHandler()
-    if ds is not None:
-        return 'fail'
+    assert ds is None
 
     return 'success'
 
@@ -1295,8 +1151,7 @@ def test_jp2lura_35():
     gdal.PushErrorHandler()
     ds = gdal.Open('data/truncated.jp2')
     gdal.PopErrorHandler()
-    if ds is not None:
-        return 'fail'
+    assert ds is None
 
     return 'success'
 
@@ -1313,8 +1168,7 @@ def test_jp2lura_36():
     gdal.PushErrorHandler()
     out_ds = gdaltest.jp2lura_drv.CreateCopy('/vsimem/jp2lura_36.jp2', src_ds)
     gdal.PopErrorHandler()
-    if out_ds is not None or gdal.VSIStatL('/vsimem/jp2lura_36.jp2') is not None:
-        return 'fail'
+    assert out_ds is None and gdal.VSIStatL('/vsimem/jp2lura_36.jp2') is None
 
     return 'success'
 
@@ -1331,11 +1185,9 @@ def test_jp2lura_37():
     src_ds = gdal.GetDriverByName('MEM').Create('', 2, 2)
     out_ds = gdaltest.jp2lura_drv.CreateCopy('/vsimem/jp2lura_37.jp2', src_ds, options=['WRITE_METADATA=YES'])
     del out_ds
-    if gdal.VSIStatL('/vsimem/jp2lura_37.jp2.aux.xml') is not None:
-        return 'fail'
+    assert gdal.VSIStatL('/vsimem/jp2lura_37.jp2.aux.xml') is None
     ds = gdal.Open('/vsimem/jp2lura_37.jp2')
-    if ds.GetMetadata() != {}:
-        return 'fail'
+    assert ds.GetMetadata() == {}
     gdal.Unlink('/vsimem/jp2lura_37.jp2')
 
     # Simple metadata in main domain
@@ -1344,11 +1196,9 @@ def test_jp2lura_37():
         src_ds.SetMetadataItem('FOO', 'BAR')
         out_ds = gdaltest.jp2lura_drv.CreateCopy('/vsimem/jp2lura_37.jp2', src_ds, options=options)
         del out_ds
-        if gdal.VSIStatL('/vsimem/jp2lura_37.jp2.aux.xml') is not None:
-            return 'fail'
+        assert gdal.VSIStatL('/vsimem/jp2lura_37.jp2.aux.xml') is None
         ds = gdal.Open('/vsimem/jp2lura_37.jp2')
-        if ds.GetMetadata() != {'FOO': 'BAR'}:
-            return 'fail'
+        assert ds.GetMetadata() == {'FOO': 'BAR'}
         ds = None
 
         gdal.Unlink('/vsimem/jp2lura_37.jp2')
@@ -1358,13 +1208,10 @@ def test_jp2lura_37():
     src_ds.SetMetadataItem('FOO', 'BAR', 'SOME_DOMAIN')
     out_ds = gdaltest.jp2lura_drv.CreateCopy('/vsimem/jp2lura_37.jp2', src_ds, options=['WRITE_METADATA=YES'])
     del out_ds
-    if gdal.VSIStatL('/vsimem/jp2lura_37.jp2.aux.xml') is not None:
-        return 'fail'
+    assert gdal.VSIStatL('/vsimem/jp2lura_37.jp2.aux.xml') is None
     ds = gdal.Open('/vsimem/jp2lura_37.jp2')
     md = ds.GetMetadata('SOME_DOMAIN')
-    if md != {'FOO': 'BAR'}:
-        print(md)
-        return 'fail'
+    assert md == {'FOO': 'BAR'}
     gdal.Unlink('/vsimem/jp2lura_37.jp2')
 
     # Simple metadata in auxiliary XML domain
@@ -1372,11 +1219,9 @@ def test_jp2lura_37():
     src_ds.SetMetadata(['<some_arbitrary_xml_box/>'], 'xml:SOME_DOMAIN')
     out_ds = gdaltest.jp2lura_drv.CreateCopy('/vsimem/jp2lura_37.jp2', src_ds, options=['WRITE_METADATA=YES'])
     del out_ds
-    if gdal.VSIStatL('/vsimem/jp2lura_37.jp2.aux.xml') is not None:
-        return 'fail'
+    assert gdal.VSIStatL('/vsimem/jp2lura_37.jp2.aux.xml') is None
     ds = gdal.Open('/vsimem/jp2lura_37.jp2')
-    if ds.GetMetadata('xml:SOME_DOMAIN')[0] != '<some_arbitrary_xml_box />\n':
-        return 'fail'
+    assert ds.GetMetadata('xml:SOME_DOMAIN')[0] == '<some_arbitrary_xml_box />\n'
     gdal.Unlink('/vsimem/jp2lura_37.jp2')
 
     # Special xml:BOX_ metadata domain
@@ -1385,11 +1230,9 @@ def test_jp2lura_37():
         src_ds.SetMetadata(['<some_arbitrary_xml_box/>'], 'xml:BOX_1')
         out_ds = gdaltest.jp2lura_drv.CreateCopy('/vsimem/jp2lura_37.jp2', src_ds, options=options)
         del out_ds
-        if gdal.VSIStatL('/vsimem/jp2lura_37.jp2.aux.xml') is not None:
-            return 'fail'
+        assert gdal.VSIStatL('/vsimem/jp2lura_37.jp2.aux.xml') is None
         ds = gdal.Open('/vsimem/jp2lura_37.jp2')
-        if ds.GetMetadata('xml:BOX_0')[0] != '<some_arbitrary_xml_box/>':
-            return 'fail'
+        assert ds.GetMetadata('xml:BOX_0')[0] == '<some_arbitrary_xml_box/>'
         gdal.Unlink('/vsimem/jp2lura_37.jp2')
 
     # Special xml:XMP metadata domain
@@ -1398,11 +1241,9 @@ def test_jp2lura_37():
         src_ds.SetMetadata(['<fake_xmp_box/>'], 'xml:XMP')
         out_ds = gdaltest.jp2lura_drv.CreateCopy('/vsimem/jp2lura_37.jp2', src_ds, options=options)
         del out_ds
-        if gdal.VSIStatL('/vsimem/jp2lura_37.jp2.aux.xml') is not None:
-            return 'fail'
+        assert gdal.VSIStatL('/vsimem/jp2lura_37.jp2.aux.xml') is None
         ds = gdal.Open('/vsimem/jp2lura_37.jp2')
-        if ds.GetMetadata('xml:XMP')[0] != '<fake_xmp_box/>':
-            return 'fail'
+        assert ds.GetMetadata('xml:XMP')[0] == '<fake_xmp_box/>'
         ds = None
 
         gdal.Unlink('/vsimem/jp2lura_37.jp2')
@@ -1441,9 +1282,7 @@ def test_jp2lura_38():
     src_ds.SetProjection(wkt)
     src_ds.SetGeoTransform([0, 60, 0, 0, 0, -60])
     out_ds = gdaltest.jp2lura_drv.CreateCopy('/vsimem/jp2lura_38.jp2', src_ds, options=['GeoJP2=NO'])
-    if out_ds.GetProjectionRef() != wkt:
-        print(out_ds.GetProjectionRef())
-        return 'fail'
+    assert out_ds.GetProjectionRef() == wkt
     crsdictionary = out_ds.GetMetadata_List("xml:CRSDictionary.gml")[0]
     out_ds = None
     gdal.Unlink('/vsimem/jp2lura_38.jp2')
@@ -1461,9 +1300,7 @@ def test_jp2lura_38():
         do_validate = False
 
     if do_validate:
-        if not xmlvalidate.validate(crsdictionary, ogc_schemas_location='tmp/cache/SCHEMAS_OPENGIS_NET'):
-            print(crsdictionary)
-            return 'fail'
+        assert xmlvalidate.validate(crsdictionary, ogc_schemas_location='tmp/cache/SCHEMAS_OPENGIS_NET')
 
     return 'success'
 
@@ -1532,9 +1369,7 @@ def test_jp2lura_39():
     gdal.Unlink('/vsimem/override.gml')
     del out_ds
     ds = gdal.Open('/vsimem/jp2lura_39.jp2')
-    if ds.GetProjectionRef().find('4326') < 0:
-        print(ds.GetProjectionRef())
-        return 'fail'
+    assert ds.GetProjectionRef().find('4326') >= 0
     ds = None
     gdal.Unlink('/vsimem/jp2lura_39.jp2')
 
@@ -1608,15 +1443,11 @@ def test_jp2lura_40():
     gdal.Unlink('/vsimem/override.gml')
     del out_ds
     ds = gdal.Open('/vsimem/jp2lura_40.jp2')
-    if ds.GetProjectionRef().find('4326') < 0:
-        print(ds.GetProjectionRef())
-        return 'fail'
+    assert ds.GetProjectionRef().find('4326') >= 0
     got_gt = ds.GetGeoTransform()
     expected_gt = (2, 0.1, 0, 49, 0, -0.1)
     for i in range(6):
-        if abs(got_gt[i] - expected_gt[i]) > 1e-5:
-            print(got_gt)
-            return 'fail'
+        assert abs(got_gt[i] - expected_gt[i]) <= 1e-5
     ds = None
     gdal.Unlink('/vsimem/jp2lura_40.jp2')
 
@@ -1634,11 +1465,9 @@ def test_jp2lura_41():
     src_ds = gdal.Open('data/byte.jp2')
     out_ds = gdaltest.jp2lura_drv.CreateCopy('/vsimem/jp2lura_41.jp2', src_ds,
                                              options=['USE_SRC_CODESTREAM=YES', '@PROFILE=PROFILE_1', 'GEOJP2=NO', 'GMLJP2=NO'])
-    if src_ds.GetRasterBand(1).Checksum() != out_ds.GetRasterBand(1).Checksum():
-        return 'fail'
+    assert src_ds.GetRasterBand(1).Checksum() == out_ds.GetRasterBand(1).Checksum()
     del out_ds
-    if gdal.VSIStatL('/vsimem/jp2lura_41.jp2').size != 9923:
-        return 'fail'
+    assert gdal.VSIStatL('/vsimem/jp2lura_41.jp2').size == 9923
     gdal.Unlink('/vsimem/jp2lura_41.jp2')
     gdal.Unlink('/vsimem/jp2lura_41.jp2.aux.xml')
 
@@ -1663,8 +1492,7 @@ def test_jp2lura_41():
                                              options=['USE_SRC_CODESTREAM=YES'])
     gdal.PopErrorHandler()
     del out_ds
-    if gdal.GetLastErrorMsg() == '':
-        return 'fail'
+    assert gdal.GetLastErrorMsg() != ''
     gdal.Unlink('/vsimem/jp2lura_41.jp2')
 
     return 'success'
@@ -1676,8 +1504,7 @@ def test_jp2lura_41():
 def test_jp2lura_43():
 
     ret = gdal.GetJPEG2000StructureAsString('data/byte.jp2', ['ALL=YES'])
-    if ret is None:
-        return 'fail'
+    assert ret is not None
 
     return 'success'
 
@@ -1697,10 +1524,8 @@ def test_jp2lura_45():
     # Test GMLJP2V2_DEF=YES
     src_ds = gdal.Open('data/byte.tif')
     out_ds = gdaltest.jp2lura_drv.CreateCopy('/vsimem/jp2lura_45.jp2', src_ds, options=['GMLJP2V2_DEF=YES'])
-    if out_ds.GetLayerCount() != 0:
-        return 'fail'
-    if out_ds.GetLayer(0) is not None:
-        return 'fail'
+    assert out_ds.GetLayerCount() == 0
+    assert out_ds.GetLayer(0) is None
     del out_ds
 
     ds = gdal.Open('/vsimem/jp2lura_45.jp2')
@@ -1763,9 +1588,7 @@ def test_jp2lura_45():
   </gmljp2:featureMember>
 </gmljp2:GMLJP2CoverageCollection>
 """
-    if gmljp2 != minimal_instance:
-        print(gmljp2)
-        return 'fail'
+    assert gmljp2 == minimal_instance
 
     gdal.Unlink('/vsimem/jp2lura_45.jp2')
 
@@ -1783,12 +1606,10 @@ def test_jp2lura_47():
     src_ds = gdal.Open('../gcore/data/byte_rpc.tif')
     out_ds = gdaltest.jp2lura_drv.CreateCopy('/vsimem/jp2lura_47.jp2', src_ds)
     del out_ds
-    if gdal.VSIStatL('/vsimem/jp2lura_47.jp2.aux.xml') is not None:
-        return 'fail'
+    assert gdal.VSIStatL('/vsimem/jp2lura_47.jp2.aux.xml') is None
 
     ds = gdal.Open('/vsimem/jp2lura_47.jp2')
-    if ds.GetMetadata('RPC') is None:
-        return 'fail'
+    assert ds.GetMetadata('RPC') is not None
     ds = None
 
     gdal.Unlink('/vsimem/jp2lura_47.jp2')
@@ -1806,11 +1627,8 @@ def test_jp2lura_48():
 
     ds = gdal.Open('data/byte_tile_2048.jp2')
     (blockxsize, blockysize) = ds.GetRasterBand(1).GetBlockSize()
-    if (blockxsize, blockysize) != (20, 20):
-        print(blockxsize, blockysize)
-        return 'fail'
-    if ds.GetRasterBand(1).Checksum() != 4610:
-        return 'fail'
+    assert (blockxsize, blockysize) == (20, 20)
+    assert ds.GetRasterBand(1).Checksum() == 4610
     ds = None
 
     return 'success'
@@ -1855,14 +1673,10 @@ def test_jp2lura_online_2():
 
     ds = gdal.Open('tmp/cache/gcp.jp2')
     ds.GetRasterBand(1).Checksum()
-    if len(ds.GetGCPs()) != 15:
-        gdaltest.post_reason('bad number of GCP')
-        return 'fail'
+    assert len(ds.GetGCPs()) == 15, 'bad number of GCP'
 
     expected_wkt = """GEOGCS["WGS 84",DATUM["WGS_1984",SPHEROID["WGS 84",6378137,298.257223563,AUTHORITY["EPSG","7030"]],AUTHORITY["EPSG","6326"]],PRIMEM["Greenwich",0],UNIT["degree",0.0174532925199433],AUTHORITY["EPSG","4326"]]"""
-    if ds.GetGCPProjection() != expected_wkt:
-        gdaltest.post_reason('bad GCP projection')
-        return 'fail'
+    assert ds.GetGCPProjection() == expected_wkt, 'bad GCP projection'
 
     ds = None
 
@@ -1895,9 +1709,7 @@ def test_jp2lura_online_3():
     ds_ref = None
 
     # Difference between the image before and after compression
-    if maxdiff > 17:
-        gdaltest.post_reason('Image too different from reference')
-        return 'fail'
+    assert maxdiff <= 17, 'Image too different from reference'
 
     return 'success'
 
@@ -1928,9 +1740,7 @@ def test_jp2lura_online_4():
     ds_ref = None
 
     # Difference between the image before and after compression
-    if maxdiff > 10:
-        gdaltest.post_reason('Image too different from reference')
-        return 'fail'
+    assert maxdiff <= 10, 'Image too different from reference'
 
     return 'success'
 
@@ -1948,13 +1758,9 @@ def test_jp2lura_online_5():
 
     ds = gdal.Open('tmp/cache/file9.jp2')
     cs1 = ds.GetRasterBand(1).Checksum()
-    if cs1 != 47664:
-        gdaltest.post_reason('Did not get expected checksums')
-        print(cs1)
-        return 'fail'
-    if ds.GetRasterBand(1).GetColorTable() is None:
-        gdaltest.post_reason('Did not get expected color table')
-        return 'fail'
+    assert cs1 == 47664, 'Did not get expected checksums'
+    assert ds.GetRasterBand(1).GetColorTable() is not None, \
+        'Did not get expected color table'
     ds = None
 
     return 'success'
@@ -1979,8 +1785,7 @@ def test_jp2lura_online_6():
     #    print(cs1, cs2, cs3)
     #    gdaltest.post_reason('Did not get expected checksums')
     #    return 'fail'
-    if ds is not None:
-        return 'fail'
+    assert ds is None
     ds = None
 
     return 'success'
@@ -2032,16 +1837,14 @@ def test_jp2lura_49():
         gdal.Unlink('/vsimem/byte_nogeoref.j2w')
 
         if gt != expected_gt:
-            gdaltest.post_reason('Did not get expected gt for %s,copy_pam=%s,copy_worldfile=%s' % (config_option_value, str(copy_pam), str(copy_worldfile)))
             print('Got ' + str(gt))
             print('Expected ' + str(expected_gt))
-            return 'fail'
+            pytest.fail('Did not get expected gt for %s,copy_pam=%s,copy_worldfile=%s' % (config_option_value, str(copy_pam), str(copy_worldfile)))
 
         if (expected_srs == '' and srs_wkt != '') or (expected_srs != '' and srs_wkt.find(expected_srs) < 0):
-            gdaltest.post_reason('Did not get expected SRS for %s,copy_pam=%s,copy_worldfile=%s' % (config_option_value, str(copy_pam), str(copy_worldfile)))
             print('Got ' + srs_wkt)
             print('Expected ' + expected_srs)
-            return 'fail'
+            pytest.fail('Did not get expected SRS for %s,copy_pam=%s,copy_worldfile=%s' % (config_option_value, str(copy_pam), str(copy_worldfile)))
 
     tests = [(None, True, True, 'LOCAL_CS["PAM"]', (100.0, 1.0, 0.0, 300.0, 0.0, -1.0)),
              (None, True, False, 'LOCAL_CS["PAM"]', (100.0, 1.0, 0.0, 300.0, 0.0, -1.0)),
@@ -2089,30 +1892,24 @@ def test_jp2lura_49():
         gdal.Unlink('/vsimem/inconsitant_geojp2_gmljp2.j2w')
 
         if gt != expected_gt:
-            gdaltest.post_reason('Did not get expected gt for %s,copy_pam=%s,copy_worldfile=%s' % (config_option_value, str(copy_pam), str(copy_worldfile)))
             print('Got ' + str(gt))
             print('Expected ' + str(expected_gt))
-            return 'fail'
+            pytest.fail('Did not get expected gt for %s,copy_pam=%s,copy_worldfile=%s' % (config_option_value, str(copy_pam), str(copy_worldfile)))
 
         if (expected_srs == '' and srs_wkt != '') or (expected_srs != '' and srs_wkt.find(expected_srs) < 0):
-            gdaltest.post_reason('Did not get expected SRS for %s,copy_pam=%s,copy_worldfile=%s' % (config_option_value, str(copy_pam), str(copy_worldfile)))
             print('Got ' + srs_wkt)
             print('Expected ' + expected_srs)
-            return 'fail'
+            pytest.fail('Did not get expected SRS for %s,copy_pam=%s,copy_worldfile=%s' % (config_option_value, str(copy_pam), str(copy_worldfile)))
 
     ds = gdal.OpenEx('data/inconsitant_geojp2_gmljp2.jp2', open_options=['GEOREF_SOURCES=PAM,WORLDFILE'])
     fl = ds.GetFileList()
-    if set(fl) != set(['data/inconsitant_geojp2_gmljp2.jp2', 'data/inconsitant_geojp2_gmljp2.jp2.aux.xml']):
-        gdaltest.post_reason('Did not get expected filelist')
-        print(fl)
-        return 'fail'
+    assert set(fl) == set(['data/inconsitant_geojp2_gmljp2.jp2', 'data/inconsitant_geojp2_gmljp2.jp2.aux.xml']), \
+        'Did not get expected filelist'
 
     gdal.ErrorReset()
     with gdaltest.error_handler():
         gdal.OpenEx('data/inconsitant_geojp2_gmljp2.jp2', open_options=['GEOREF_SOURCES=unhandled'])
-        if gdal.GetLastErrorMsg() == '':
-            gdaltest.post_reason('expected warning')
-            return 'fail'
+        assert gdal.GetLastErrorMsg() != '', 'expected warning'
 
     return 'success'
 
@@ -2141,21 +1938,18 @@ def test_jp2lura_51():
     src_ds = gdal.Open('data/float32.tif')
     with gdaltest.error_handler():
         ds = gdaltest.jp2lura_drv.CreateCopy('/vsimem/jp2lura_51.jp2', src_ds)
-    if ds is not None:
-        return 'fail'
+    assert ds is None
 
     ds = gdaltest.jp2lura_drv.CreateCopy('/vsimem/jp2lura_51.jp2', src_ds,
                                          options=['SPLIT_IEEE754=YES'])
     maxdiff = gdaltest.compare_ds(ds, src_ds)
     ds = None
 
-    if validate('/vsimem/jp2lura_51.jp2', inspire_tg=False) == 'fail':
-        return 'fail'
+    assert validate('/vsimem/jp2lura_51.jp2', inspire_tg=False) != 'fail'
 
     gdaltest.jp2lura_drv.Delete('/vsimem/jp2lura_51.jp2')
 
-    if maxdiff > 0.01:
-        return 'fail'
+    assert maxdiff <= 0.01
 
     # QUALITY
     with gdaltest.error_handler():
@@ -2164,12 +1958,9 @@ def test_jp2lura_51():
     if ds is not None:
         maxdiff = gdaltest.compare_ds(ds, src_ds)
         ds = None
-        if maxdiff > 124:
-            print(maxdiff)
-            return 'fail'
+        assert maxdiff <= 124
 
-        if validate('/vsimem/jp2lura_51.jp2', inspire_tg=False) == 'fail':
-            return 'fail'
+        assert validate('/vsimem/jp2lura_51.jp2', inspire_tg=False) != 'fail'
     ds = None
     with gdaltest.error_handler():
         gdaltest.jp2lura_drv.Delete('/vsimem/jp2lura_51.jp2')
@@ -2180,12 +1971,9 @@ def test_jp2lura_51():
                                          options=['SPLIT_IEEE754=YES', 'RATE=1'])
     maxdiff = gdaltest.compare_ds(ds, src_ds)
     ds = None
-    if maxdiff > 370:
-        print(maxdiff)
-        return 'fail'
+    assert maxdiff <= 370
 
-    if validate('/vsimem/jp2lura_51.jp2', inspire_tg=False) == 'fail':
-        return 'fail'
+    assert validate('/vsimem/jp2lura_51.jp2', inspire_tg=False) != 'fail'
 
     gdaltest.jp2lura_drv.Delete('/vsimem/jp2lura_51.jp2')
 
@@ -2194,9 +1982,7 @@ def test_jp2lura_51():
                                          options=['SPLIT_IEEE754=YES', 'REVERSIBLE=YES'])
     maxdiff = gdaltest.compare_ds(ds, src_ds)
     ds = None
-    if maxdiff != 0.0:
-        print(maxdiff)
-        return 'fail'
+    assert maxdiff == 0.0
 
     gdaltest.jp2lura_drv.Delete('/vsimem/jp2lura_51.jp2')
 
@@ -2228,14 +2014,11 @@ def test_jp2lura_52():
         ds = gdaltest.jp2lura_drv.CreateCopy('/vsimem/jp2lura_52.jp2', src_ds,
                                              options=['REVERSIBLE=YES'])
         got_min, got_max = ds.GetRasterBand(1).ComputeRasterMinMax()
-        if val != got_min or val != got_max:
-            print(val, dt, fmt, got_min, got_max)
-            return 'fail'
+        assert val == got_min and val == got_max, (val, dt, fmt, got_min, got_max)
         ds = None
 
-        if val >= 0 and validate('/vsimem/jp2lura_52.jp2', expected_gmljp2=False, inspire_tg=False) == 'fail':
-            print(val, dt, fmt)
-            return 'fail'
+        assert not (val >= 0 and validate('/vsimem/jp2lura_52.jp2', expected_gmljp2=False, inspire_tg=False) == 'fail'), \
+            (val, dt, fmt)
 
     gdaltest.jp2lura_drv.Delete('/vsimem/jp2lura_52.jp2')
 
@@ -2256,9 +2039,7 @@ def test_jp2lura_53():
                                          options=['RATE=1'])
     maxdiff = gdaltest.compare_ds(ds, src_ds)
     ds = None
-    if maxdiff > 8:
-        print(maxdiff)
-        return 'fail'
+    assert maxdiff <= 8
 
     gdaltest.jp2lura_drv.Delete('/vsimem/jp2lura_53.jp2')
 
@@ -2266,9 +2047,7 @@ def test_jp2lura_53():
                                          options=['QUALITY=100'])
     maxdiff = gdaltest.compare_ds(ds, src_ds)
     ds = None
-    if maxdiff > 2:
-        print(maxdiff)
-        return 'fail'
+    assert maxdiff <= 2
 
     gdaltest.jp2lura_drv.Delete('/vsimem/jp2lura_53.jp2')
 
@@ -2277,9 +2056,7 @@ def test_jp2lura_53():
                                          options=['REVERSIBLE=YES', 'RATE=1'])
     maxdiff = gdaltest.compare_ds(ds, src_ds)
     ds = None
-    if maxdiff > 8:
-        print(maxdiff)
-        return 'fail'
+    assert maxdiff <= 8
 
     gdaltest.jp2lura_drv.Delete('/vsimem/jp2lura_53.jp2')
 
@@ -2288,9 +2065,7 @@ def test_jp2lura_53():
                                          options=['REVERSIBLE=YES', 'QUALITY=100'])
     maxdiff = gdaltest.compare_ds(ds, src_ds)
     ds = None
-    if maxdiff > 0:
-        print(maxdiff)
-        return 'fail'
+    assert maxdiff <= 0
 
     gdaltest.jp2lura_drv.Delete('/vsimem/jp2lura_53.jp2')
 
@@ -2314,18 +2089,12 @@ def test_jp2lura_54():
     data = ds.GetRasterBand(1).ReadRaster(0, 0, 100, 100, 100, 100,
                                           buf_type=gdal.GDT_Int16)
     data = struct.unpack('h' * 100 * 100, data)
-    if min(data) != 100 or max(data) != 100:
-        print(min(data))
-        print(max(data))
-        return 'fail'
+    assert min(data) == 100 and max(data) == 100
 
     # Request at a resolution that is not a power of two
     data = ds.GetRasterBand(1).ReadRaster(0, 0, 100, 100, 30, 30)
     data = struct.unpack('B' * 30 * 30, data)
-    if min(data) != 100 or max(data) != 100:
-        print(min(data))
-        print(max(data))
-        return 'fail'
+    assert min(data) == 100 and max(data) == 100
 
     ds = None
 
diff --git a/autotest/gdrivers/jp2metadata.py b/autotest/gdrivers/jp2metadata.py
index db9fd6fa9dd6..228fbc006cad 100755
--- a/autotest/gdrivers/jp2metadata.py
+++ b/autotest/gdrivers/jp2metadata.py
@@ -35,6 +35,7 @@
 from osgeo import gdal
 
 import gdaltest
+import pytest
 
 
 ###############################################################################
@@ -48,14 +49,10 @@ def test_jp2metadata_1():
 
     wkt = ds.GetProjectionRef()
     gt = ds.GetGeoTransform()
-    if wkt.find('PROJCS["ETRS89') != 0:
-        print(wkt)
-        return 'fail'
+    assert wkt.find('PROJCS["ETRS89') == 0
     expected_gt = (356000.0, 0.5, 0.0, 7596000.0, 0.0, -0.5)
     for i in range(6):
-        if abs(gt[i] - expected_gt[i]) > 1e-5:
-            print(gt)
-            return 'fail'
+        assert abs(gt[i] - expected_gt[i]) <= 1e-5
     return 'success'
 
 ###############################################################################
@@ -76,26 +73,17 @@ def test_jp2metadata_2():
 
     filelist = ds.GetFileList()
 
-    if len(filelist) != 3:
-        gdaltest.post_reason('did not get expected file list.')
-        return 'fail'
+    assert len(filelist) == 3, 'did not get expected file list.'
 
     mddlist = ds.GetMetadataDomainList()
-    if 'IMD' not in mddlist or 'RPC' not in mddlist or 'IMAGERY' not in mddlist:
-        gdaltest.post_reason('did not get expected metadata list.')
-        print(mddlist)
-        return 'fail'
+    assert 'IMD' in mddlist and 'RPC' in mddlist and 'IMAGERY' in mddlist, \
+        'did not get expected metadata list.'
 
     md = ds.GetMetadata('IMAGERY')
-    if 'SATELLITEID' not in md:
-        print('SATELLITEID not present in IMAGERY Domain')
-        return 'fail'
-    if 'CLOUDCOVER' not in md:
-        print('CLOUDCOVER not present in IMAGERY Domain')
-        return 'fail'
-    if 'ACQUISITIONDATETIME' not in md:
-        print('ACQUISITIONDATETIME not present in IMAGERY Domain')
-        return 'fail'
+    assert 'SATELLITEID' in md, 'SATELLITEID not present in IMAGERY Domain'
+    assert 'CLOUDCOVER' in md, 'CLOUDCOVER not present in IMAGERY Domain'
+    assert 'ACQUISITIONDATETIME' in md, \
+        'ACQUISITIONDATETIME not present in IMAGERY Domain'
 
     ds = None
 
@@ -127,10 +115,9 @@ def test_jp2metadata_3():
     wkt = ds.GetProjection()
 
     if wkt != exp_wkt:
-        gdaltest.post_reason('did not get expected WKT, should be WGS84')
         print('got: ', wkt)
         print('exp: ', exp_wkt)
-        return 'fail'
+        pytest.fail('did not get expected WKT, should be WGS84')
 
     gt = ds.GetGeoTransform()
     if abs(gt[0] - 8) > 0.0000001 or abs(gt[3] - 50) > 0.000001 \
@@ -138,9 +125,8 @@ def test_jp2metadata_3():
        or abs(gt[2] - 0.0) > 0.000000000005 \
        or abs(gt[4] - 0.0) > 0.000000000005 \
        or abs(gt[5] - -0.000761397164) > 0.000000000005:
-        gdaltest.post_reason('did not get expected geotransform')
         print('got: ', gt)
-        return 'fail'
+        pytest.fail('did not get expected geotransform')
 
     ds = None
 
@@ -163,10 +149,9 @@ def test_jp2metadata_4():
     wkt = ds.GetProjection()
 
     if wkt != exp_wkt:
-        gdaltest.post_reason('did not get expected WKT, should be WGS84')
         print('got: ', wkt)
         print('exp: ', exp_wkt)
-        return 'fail'
+        pytest.fail('did not get expected WKT, should be WGS84')
 
     gt = ds.GetGeoTransform()
     gte = (42.999583333333369, 0.008271349862259, 0,
@@ -177,9 +162,8 @@ def test_jp2metadata_4():
        or abs(gt[2] - gte[2]) > 0.000000000005 \
        or abs(gt[4] - gte[4]) > 0.000000000005 \
        or abs(gt[5] - gte[5]) > 0.000000000005:
-        gdaltest.post_reason('did not get expected geotransform')
         print('got: ', gt)
-        return 'fail'
+        pytest.fail('did not get expected geotransform')
 
     ds = None
 
@@ -200,10 +184,9 @@ def test_jp2metadata_5():
     wkt = ds.GetProjection()
 
     if wkt != exp_wkt:
-        gdaltest.post_reason('did not get expected WKT')
         print('got: ', wkt)
         print('exp: ', exp_wkt)
-        return 'fail'
+        pytest.fail('did not get expected WKT')
 
     gt = ds.GetGeoTransform()
     gte = (4895766.000000001, 2.0, 0.0, 2296946.0, 0.0, -2.0)
@@ -213,9 +196,8 @@ def test_jp2metadata_5():
        or abs(gt[2] - gte[2]) > 0.000000000005 \
        or abs(gt[4] - gte[4]) > 0.000000000005 \
        or abs(gt[5] - gte[5]) > 0.000000000005:
-        gdaltest.post_reason('did not get expected geotransform')
         print('got: ', gt)
-        return 'fail'
+        pytest.fail('did not get expected geotransform')
 
     ds = None
 
diff --git a/autotest/gdrivers/jp2openjpeg.py b/autotest/gdrivers/jp2openjpeg.py
index ef24418804fb..92aef4da7f8b 100755
--- a/autotest/gdrivers/jp2openjpeg.py
+++ b/autotest/gdrivers/jp2openjpeg.py
@@ -35,6 +35,7 @@
 from osgeo import gdal
 from osgeo import ogr
 from osgeo import osr
+import pytest
 
 sys.path.append('../ogr')
 sys.path.append('../../gdal/swig/python/samples')
@@ -108,13 +109,10 @@ def test_jp2openjpeg_3():
     ds_ref = None
 
     # Quite a bit of difference...
-    if maxdiff > 6:
-        gdaltest.post_reason('Image too different from reference')
-        return 'fail'
+    assert maxdiff <= 6, 'Image too different from reference'
 
     ds = ogr.Open('data/int16.jp2')
-    if ds is not None:
-        return 'fail'
+    assert ds is None
 
     return 'success'
 
@@ -144,8 +142,7 @@ def test_jp2openjpeg_4(out_filename='tmp/jp2openjpeg_4.jp2'):
     vrt_ds = None
     gdal.Unlink('/vsimem/jp2openjpeg_4.vrt')
 
-    if gdal.VSIStatL(out_filename + '.aux.xml') is not None:
-        return 'fail'
+    assert gdal.VSIStatL(out_filename + '.aux.xml') is None
 
     ds = gdal.Open(out_filename)
     cs = ds.GetRasterBand(1).Checksum()
@@ -158,12 +155,8 @@ def test_jp2openjpeg_4(out_filename='tmp/jp2openjpeg_4.jp2'):
 
     gdal.Unlink(out_filename)
 
-    if xres != '300' or yres != '200' or resunit != '3 (pixels/cm)':
-        gdaltest.post_reason('bad resolution')
-        print(xres)
-        print(yres)
-        print(resunit)
-        return 'fail'
+    assert xres == '300' and yres == '200' and resunit == '3 (pixels/cm)', \
+        'bad resolution'
 
     sr1 = osr.SpatialReference()
     sr1.SetFromUserInput(got_wkt)
@@ -171,22 +164,14 @@ def test_jp2openjpeg_4(out_filename='tmp/jp2openjpeg_4.jp2'):
     sr2.SetFromUserInput(src_wkt)
 
     if sr1.IsSame(sr2) == 0:
-        gdaltest.post_reason('bad spatial reference')
         print(got_wkt)
         print(src_wkt)
-        return 'fail'
+        pytest.fail('bad spatial reference')
 
     for i in range(6):
-        if abs(got_gt[i] - src_gt[i]) > 1e-8:
-            gdaltest.post_reason('bad geotransform')
-            print(got_gt)
-            print(src_gt)
-            return 'fail'
+        assert abs(got_gt[i] - src_gt[i]) <= 1e-8, 'bad geotransform'
 
-    if cs != 50054:
-        gdaltest.post_reason('bad checksum')
-        print(cs)
-        return 'fail'
+    assert cs == 50054, 'bad checksum'
 
     return 'success'
 
@@ -251,13 +236,10 @@ def test_jp2openjpeg_8():
     expected_checksums = [64570, 57277, 56048, 61292]
 
     for i in range(4):
-        if ds.GetRasterBand(i + 1).Checksum() != expected_checksums[i]:
-            gdaltest.post_reason('unexpected checksum (%d) for band %d' % (expected_checksums[i], i + 1))
-            return 'fail'
+        assert ds.GetRasterBand(i + 1).Checksum() == expected_checksums[i], \
+            ('unexpected checksum (%d) for band %d' % (expected_checksums[i], i + 1))
 
-    if ds.GetRasterBand(1).DataType != gdal.GDT_UInt16:
-        gdaltest.post_reason('unexpected data type')
-        return 'fail'
+    assert ds.GetRasterBand(1).DataType == gdal.GDT_UInt16, 'unexpected data type'
 
     return 'success'
 
@@ -273,15 +255,8 @@ def test_jp2openjpeg_9():
     ds = gdal.Open('data/byte_without_geotransform.jp2')
 
     geotransform = ds.GetGeoTransform()
-    if abs(geotransform[0] - 440720) > 0.1 \
-            or abs(geotransform[1] - 60) > 0.001 \
-            or abs(geotransform[2] - 0) > 0.001 \
-            or abs(geotransform[3] - 3751320) > 0.1 \
-            or abs(geotransform[4] - 0) > 0.001 \
-            or abs(geotransform[5] - -60) > 0.001:
-        print(geotransform)
-        gdaltest.post_reason('geotransform differs from expected')
-        return 'fail'
+    assert abs(geotransform[0] - 440720) <= 0.1 and abs(geotransform[1] - 60) <= 0.001 and abs(geotransform[2] - 0) <= 0.001 and abs(geotransform[3] - 3751320) <= 0.1 and abs(geotransform[4] - 0) <= 0.001 and abs(geotransform[5] - -60) <= 0.001, \
+        'geotransform differs from expected'
 
     ds = None
 
@@ -299,20 +274,15 @@ def test_jp2openjpeg_10():
     src_ds = gdal.Open('data/rgbsmall.tif')
     out_ds = gdaltest.jp2openjpeg_drv.CreateCopy('/vsimem/jp2openjpeg_10.jp2', src_ds, options=['YCBCR420=YES', 'RESOLUTIONS=3'])
     maxdiff = gdaltest.compare_ds(src_ds, out_ds)
-    if out_ds.GetRasterBand(1).GetColorInterpretation() != gdal.GCI_RedBand:
-        return 'fail'
-    if out_ds.GetRasterBand(2).GetColorInterpretation() != gdal.GCI_GreenBand:
-        return 'fail'
-    if out_ds.GetRasterBand(3).GetColorInterpretation() != gdal.GCI_BlueBand:
-        return 'fail'
+    assert out_ds.GetRasterBand(1).GetColorInterpretation() == gdal.GCI_RedBand
+    assert out_ds.GetRasterBand(2).GetColorInterpretation() == gdal.GCI_GreenBand
+    assert out_ds.GetRasterBand(3).GetColorInterpretation() == gdal.GCI_BlueBand
     del out_ds
     src_ds = None
     gdal.Unlink('/vsimem/jp2openjpeg_10.jp2')
 
     # Quite a bit of difference...
-    if maxdiff > 12:
-        gdaltest.post_reason('Image too different from reference')
-        return 'fail'
+    assert maxdiff <= 12, 'Image too different from reference'
 
     return 'success'
 
@@ -327,12 +297,9 @@ def test_jp2openjpeg_11():
 
     ds = gdal.Open('data/stefan_full_rgba_alpha_1bit.jp2')
     fourth_band = ds.GetRasterBand(4)
-    if fourth_band.GetMetadataItem('NBITS', 'IMAGE_STRUCTURE') is not None:
-        return 'fail'
+    assert fourth_band.GetMetadataItem('NBITS', 'IMAGE_STRUCTURE') is None
     got_cs = fourth_band.Checksum()
-    if got_cs != 8527:
-        print(got_cs)
-        return 'fail'
+    assert got_cs == 8527
     jp2_bands_data = ds.ReadRaster(0, 0, ds.RasterXSize, ds.RasterYSize)
     jp2_fourth_band_data = fourth_band.ReadRaster(0, 0, ds.RasterXSize, ds.RasterYSize)
     fourth_band.ReadRaster(0, 0, ds.RasterXSize, ds.RasterYSize, int(ds.RasterXSize / 16), int(ds.RasterYSize / 16))
@@ -345,20 +312,15 @@ def test_jp2openjpeg_11():
     # gtiff_fourth_band_subsampled_data = fourth_band.ReadRaster(0,0,ds.RasterXSize,ds.RasterYSize,ds.RasterXSize/16,ds.RasterYSize/16)
     tmp_ds = None
     gdal.GetDriverByName('GTiff').Delete('/vsimem/jp2openjpeg_11.tif')
-    if got_cs != 8527:
-        print(got_cs)
-        return 'fail'
+    assert got_cs == 8527
 
-    if jp2_bands_data != gtiff_bands_data:
-        return 'fail'
+    assert jp2_bands_data == gtiff_bands_data
 
-    if jp2_fourth_band_data != gtiff_fourth_band_data:
-        return 'fail'
+    assert jp2_fourth_band_data == gtiff_fourth_band_data
 
     ds = gdal.OpenEx('data/stefan_full_rgba_alpha_1bit.jp2', open_options=['1BIT_ALPHA_PROMOTION=NO'])
     fourth_band = ds.GetRasterBand(4)
-    if fourth_band.GetMetadataItem('NBITS', 'IMAGE_STRUCTURE') != '1':
-        return 'fail'
+    assert fourth_band.GetMetadataItem('NBITS', 'IMAGE_STRUCTURE') == '1'
 
     return 'success'
 
@@ -386,9 +348,7 @@ def test_jp2openjpeg_12():
 
     gdaltest.jp2openjpeg_drv.Delete('tmp/jp2openjpeg_12.jp2')
 
-    if wkt.find('32631') < 0:
-        print(wkt)
-        return 'fail'
+    assert wkt.find('32631') >= 0
 
     # Override geotransform
     shutil.copy('data/byte.jp2', 'tmp/jp2openjpeg_12.jp2')
@@ -403,9 +363,7 @@ def test_jp2openjpeg_12():
 
     gdaltest.jp2openjpeg_drv.Delete('tmp/jp2openjpeg_12.jp2')
 
-    if gt != (1000, 1, 0, 2000, 0, -1):
-        print(gt)
-        return 'fail'
+    assert gt == (1000, 1, 0, 2000, 0, -1)
 
     return 'success'
 
@@ -424,20 +382,15 @@ def test_jp2openjpeg_13():
     ds = None
     src_ds = None
 
-    if gdal.VSIStatL('tmp/jp2openjpeg_13.jp2.aux.xml') is not None:
-        return 'fail'
+    assert gdal.VSIStatL('tmp/jp2openjpeg_13.jp2.aux.xml') is None
 
     ds = gdal.Open('tmp/jp2openjpeg_13.jp2')
     count = ds.GetGCPCount()
     gcps = ds.GetGCPs()
     wkt = ds.GetGCPProjection()
-    if count != 4:
-        return 'fail'
-    if len(gcps) != 4:
-        return 'fail'
-    if wkt.find('4326') < 0:
-        print(wkt)
-        return 'fail'
+    assert count == 4
+    assert len(gcps) == 4
+    assert wkt.find('4326') >= 0
     ds = None
 
     # Override GCP
@@ -456,13 +409,9 @@ def test_jp2openjpeg_13():
 
     gdaltest.jp2openjpeg_drv.Delete('tmp/jp2openjpeg_13.jp2')
 
-    if count != 1:
-        return 'fail'
-    if len(gcps) != 1:
-        return 'fail'
-    if wkt.find('32631') < 0:
-        print(wkt)
-        return 'fail'
+    assert count == 1
+    assert len(gcps) == 1
+    assert wkt.find('32631') >= 0
 
     return 'success'
 
@@ -476,8 +425,7 @@ def test_jp2openjpeg_14():
         return 'skip'
 
     ds = gdal.Open('data/byte_2gcps.jp2')
-    if ds.GetGCPCount() != 2:
-        return 'fail'
+    assert ds.GetGCPCount() == 2
 
     return 'success'
 
@@ -498,8 +446,7 @@ def test_jp2openjpeg_15():
     got_data = ds.ReadRaster()
     ds = None
     gdaltest.jp2openjpeg_drv.Delete('/vsimem/jp2openjpeg_15.jp2')
-    if got_data != data:
-        return 'fail'
+    assert got_data == data
 
     return 'success'
 
@@ -514,17 +461,13 @@ def test_jp2openjpeg_16():
 
     ds = gdal.Open('data/byte_point.jp2')
     gt = ds.GetGeoTransform()
-    if ds.GetMetadataItem('AREA_OR_POINT') != 'Point':
-        gdaltest.post_reason('did not get AREA_OR_POINT = Point')
-        return 'fail'
+    assert ds.GetMetadataItem('AREA_OR_POINT') == 'Point', \
+        'did not get AREA_OR_POINT = Point'
     ds = None
 
     gt_expected = (440690.0, 60.0, 0.0, 3751350.0, 0.0, -60.0)
 
-    if gt != gt_expected:
-        print(gt)
-        gdaltest.post_reason('did not get expected geotransform')
-        return 'fail'
+    assert gt == gt_expected, 'did not get expected geotransform'
 
     gdal.SetConfigOption('GTIFF_POINT_GEO_IGNORE', 'TRUE')
 
@@ -536,10 +479,8 @@ def test_jp2openjpeg_16():
 
     gt_expected = (440720.0, 60.0, 0.0, 3751320.0, 0.0, -60.0)
 
-    if gt != gt_expected:
-        print(gt)
-        gdaltest.post_reason('did not get expected geotransform with GTIFF_POINT_GEO_IGNORE TRUE')
-        return 'fail'
+    assert gt == gt_expected, \
+        'did not get expected geotransform with GTIFF_POINT_GEO_IGNORE TRUE'
 
     return 'success'
 
@@ -557,22 +498,17 @@ def test_jp2openjpeg_17():
     ds = None
     src_ds = None
 
-    if gdal.VSIStatL('/vsimem/jp2openjpeg_17.jp2.aux.xml') is not None:
-        return 'fail'
+    assert gdal.VSIStatL('/vsimem/jp2openjpeg_17.jp2.aux.xml') is None
 
     ds = gdal.Open('/vsimem/jp2openjpeg_17.jp2')
     gt = ds.GetGeoTransform()
-    if ds.GetMetadataItem('AREA_OR_POINT') != 'Point':
-        gdaltest.post_reason('did not get AREA_OR_POINT = Point')
-        return 'fail'
+    assert ds.GetMetadataItem('AREA_OR_POINT') == 'Point', \
+        'did not get AREA_OR_POINT = Point'
     ds = None
 
     gt_expected = (440690.0, 60.0, 0.0, 3751350.0, 0.0, -60.0)
 
-    if gt != gt_expected:
-        print(gt)
-        gdaltest.post_reason('did not get expected geotransform')
-        return 'fail'
+    assert gt == gt_expected, 'did not get expected geotransform'
 
     gdal.Unlink('/vsimem/jp2openjpeg_17.jp2')
 
@@ -595,8 +531,7 @@ def test_jp2openjpeg_18():
 
     ds = gdal.Open('/vsimem/jp2openjpeg_18.jp2')
     ds.GetRasterBand(1).Checksum()
-    if gdal.GetLastErrorMsg() != '':
-        return 'fail'
+    assert gdal.GetLastErrorMsg() == ''
     ds = None
 
     gdal.Unlink('/vsimem/jp2openjpeg_18.jp2')
@@ -613,8 +548,7 @@ def test_jp2openjpeg_19():
         return 'skip'
 
     ds = gdal.Open('data/byte_gmljp2_with_nul_car.jp2')
-    if ds.GetProjectionRef() == '':
-        return 'fail'
+    assert ds.GetProjectionRef() != ''
     ds = None
 
     return 'success'
@@ -686,8 +620,7 @@ def test_jp2openjpeg_20():
     ds = None
     gdal.Unlink('/vsimem/jp2openjpeg_20.jp2')
 
-    if not xmlvalidate.validate(gmljp2, ogc_schemas_location='tmp/cache/SCHEMAS_OPENGIS_NET'):
-        return 'fail'
+    assert xmlvalidate.validate(gmljp2, ogc_schemas_location='tmp/cache/SCHEMAS_OPENGIS_NET')
 
     return 'success'
 
@@ -708,9 +641,7 @@ def test_jp2openjpeg_21():
     gdal.Unlink('/vsimem/jp2openjpeg_21.jp2')
 
     # Quite a bit of difference...
-    if maxdiff > 1:
-        gdaltest.post_reason('Image too different from reference')
-        return 'fail'
+    assert maxdiff <= 1, 'Image too different from reference'
 
     return 'success'
 
@@ -729,40 +660,29 @@ def test_jp2openjpeg_22():
     maxdiff = gdaltest.compare_ds(src_ds, out_ds)
     del out_ds
     src_ds = None
-    if gdal.VSIStatL('/vsimem/jp2openjpeg_22.jp2.aux.xml') is not None:
-        return 'fail'
+    assert gdal.VSIStatL('/vsimem/jp2openjpeg_22.jp2.aux.xml') is None
     ds = gdal.Open('/vsimem/jp2openjpeg_22.jp2')
-    if ds.GetRasterBand(1).GetColorInterpretation() != gdal.GCI_RedBand:
-        return 'fail'
-    if ds.GetRasterBand(2).GetColorInterpretation() != gdal.GCI_GreenBand:
-        return 'fail'
-    if ds.GetRasterBand(3).GetColorInterpretation() != gdal.GCI_BlueBand:
-        return 'fail'
-    if ds.GetRasterBand(4).GetColorInterpretation() != gdal.GCI_AlphaBand:
-        return 'fail'
+    assert ds.GetRasterBand(1).GetColorInterpretation() == gdal.GCI_RedBand
+    assert ds.GetRasterBand(2).GetColorInterpretation() == gdal.GCI_GreenBand
+    assert ds.GetRasterBand(3).GetColorInterpretation() == gdal.GCI_BlueBand
+    assert ds.GetRasterBand(4).GetColorInterpretation() == gdal.GCI_AlphaBand
     ds = None
     gdal.Unlink('/vsimem/jp2openjpeg_22.jp2')
 
-    if maxdiff > 0:
-        gdaltest.post_reason('Image too different from reference')
-        return 'fail'
+    assert maxdiff <= 0, 'Image too different from reference'
 
     # RGBA with 1BIT_ALPHA=YES
     src_ds = gdal.Open('../gcore/data/stefan_full_rgba.tif')
     out_ds = gdaltest.jp2openjpeg_drv.CreateCopy('/vsimem/jp2openjpeg_22.jp2', src_ds, options=['1BIT_ALPHA=YES'])
     del out_ds
     src_ds = None
-    if gdal.VSIStatL('/vsimem/jp2openjpeg_22.jp2.aux.xml') is not None:
-        return 'fail'
+    assert gdal.VSIStatL('/vsimem/jp2openjpeg_22.jp2.aux.xml') is None
     ds = gdal.OpenEx('/vsimem/jp2openjpeg_22.jp2', open_options=['1BIT_ALPHA_PROMOTION=NO'])
     fourth_band = ds.GetRasterBand(4)
-    if fourth_band.GetMetadataItem('NBITS', 'IMAGE_STRUCTURE') != '1':
-        return 'fail'
+    assert fourth_band.GetMetadataItem('NBITS', 'IMAGE_STRUCTURE') == '1'
     ds = None
     ds = gdal.Open('/vsimem/jp2openjpeg_22.jp2')
-    if ds.GetRasterBand(4).Checksum() != 23120:
-        print(ds.GetRasterBand(4).Checksum())
-        return 'fail'
+    assert ds.GetRasterBand(4).Checksum() == 23120
     ds = None
     gdal.Unlink('/vsimem/jp2openjpeg_22.jp2')
 
@@ -771,20 +691,13 @@ def test_jp2openjpeg_22():
     out_ds = gdaltest.jp2openjpeg_drv.CreateCopy('/vsimem/jp2openjpeg_22.jp2', src_ds, options=['YCBCR420=YES'])
     del out_ds
     src_ds = None
-    if gdal.VSIStatL('/vsimem/jp2openjpeg_22.jp2.aux.xml') is not None:
-        return 'fail'
+    assert gdal.VSIStatL('/vsimem/jp2openjpeg_22.jp2.aux.xml') is None
     ds = gdal.Open('/vsimem/jp2openjpeg_22.jp2')
-    if ds.GetRasterBand(1).GetColorInterpretation() != gdal.GCI_RedBand:
-        return 'fail'
-    if ds.GetRasterBand(2).GetColorInterpretation() != gdal.GCI_GreenBand:
-        return 'fail'
-    if ds.GetRasterBand(3).GetColorInterpretation() != gdal.GCI_BlueBand:
-        return 'fail'
-    if ds.GetRasterBand(4).GetColorInterpretation() != gdal.GCI_AlphaBand:
-        return 'fail'
-    if ds.GetRasterBand(1).Checksum() not in [11457, 11450]:
-        print(ds.GetRasterBand(1).Checksum())
-        return 'fail'
+    assert ds.GetRasterBand(1).GetColorInterpretation() == gdal.GCI_RedBand
+    assert ds.GetRasterBand(2).GetColorInterpretation() == gdal.GCI_GreenBand
+    assert ds.GetRasterBand(3).GetColorInterpretation() == gdal.GCI_BlueBand
+    assert ds.GetRasterBand(4).GetColorInterpretation() == gdal.GCI_AlphaBand
+    assert ds.GetRasterBand(1).Checksum() in [11457, 11450]
     ds = None
     gdal.Unlink('/vsimem/jp2openjpeg_22.jp2')
 
@@ -795,13 +708,10 @@ def test_jp2openjpeg_22():
     maxdiff = gdaltest.compare_ds(src_ds, out_ds)
     del out_ds
     src_ds = None
-    if gdal.VSIStatL('/vsimem/jp2openjpeg_22.jp2.aux.xml') is not None:
-        return 'fail'
+    assert gdal.VSIStatL('/vsimem/jp2openjpeg_22.jp2.aux.xml') is None
     gdal.Unlink('/vsimem/jp2openjpeg_22.jp2')
 
-    if maxdiff > 0:
-        gdaltest.post_reason('Image too different from reference')
-        return 'fail'
+    assert maxdiff <= 0, 'Image too different from reference'
 
     # RGB,undefined
     src_ds = gdal.Open('../gcore/data/stefan_full_rgba_photometric_rgb.tif')
@@ -809,23 +719,16 @@ def test_jp2openjpeg_22():
     maxdiff = gdaltest.compare_ds(src_ds, out_ds)
     del out_ds
     src_ds = None
-    if gdal.VSIStatL('/vsimem/jp2openjpeg_22.jp2.aux.xml') is not None:
-        return 'fail'
+    assert gdal.VSIStatL('/vsimem/jp2openjpeg_22.jp2.aux.xml') is None
     ds = gdal.Open('/vsimem/jp2openjpeg_22.jp2')
-    if ds.GetRasterBand(1).GetColorInterpretation() != gdal.GCI_RedBand:
-        return 'fail'
-    if ds.GetRasterBand(2).GetColorInterpretation() != gdal.GCI_GreenBand:
-        return 'fail'
-    if ds.GetRasterBand(3).GetColorInterpretation() != gdal.GCI_BlueBand:
-        return 'fail'
-    if ds.GetRasterBand(4).GetColorInterpretation() != gdal.GCI_Undefined:
-        return 'fail'
+    assert ds.GetRasterBand(1).GetColorInterpretation() == gdal.GCI_RedBand
+    assert ds.GetRasterBand(2).GetColorInterpretation() == gdal.GCI_GreenBand
+    assert ds.GetRasterBand(3).GetColorInterpretation() == gdal.GCI_BlueBand
+    assert ds.GetRasterBand(4).GetColorInterpretation() == gdal.GCI_Undefined
     ds = None
     gdal.Unlink('/vsimem/jp2openjpeg_22.jp2')
 
-    if maxdiff > 0:
-        gdaltest.post_reason('Image too different from reference')
-        return 'fail'
+    assert maxdiff <= 0, 'Image too different from reference'
 
     # RGB,undefined with ALPHA=YES
     src_ds = gdal.Open('../gcore/data/stefan_full_rgba_photometric_rgb.tif')
@@ -833,23 +736,16 @@ def test_jp2openjpeg_22():
     maxdiff = gdaltest.compare_ds(src_ds, out_ds)
     del out_ds
     src_ds = None
-    if gdal.VSIStatL('/vsimem/jp2openjpeg_22.jp2.aux.xml') is not None:
-        return 'fail'
+    assert gdal.VSIStatL('/vsimem/jp2openjpeg_22.jp2.aux.xml') is None
     ds = gdal.Open('/vsimem/jp2openjpeg_22.jp2')
-    if ds.GetRasterBand(1).GetColorInterpretation() != gdal.GCI_RedBand:
-        return 'fail'
-    if ds.GetRasterBand(2).GetColorInterpretation() != gdal.GCI_GreenBand:
-        return 'fail'
-    if ds.GetRasterBand(3).GetColorInterpretation() != gdal.GCI_BlueBand:
-        return 'fail'
-    if ds.GetRasterBand(4).GetColorInterpretation() != gdal.GCI_AlphaBand:
-        return 'fail'
+    assert ds.GetRasterBand(1).GetColorInterpretation() == gdal.GCI_RedBand
+    assert ds.GetRasterBand(2).GetColorInterpretation() == gdal.GCI_GreenBand
+    assert ds.GetRasterBand(3).GetColorInterpretation() == gdal.GCI_BlueBand
+    assert ds.GetRasterBand(4).GetColorInterpretation() == gdal.GCI_AlphaBand
     ds = None
     gdal.Unlink('/vsimem/jp2openjpeg_22.jp2')
 
-    if maxdiff > 0:
-        gdaltest.post_reason('Image too different from reference')
-        return 'fail'
+    assert maxdiff <= 0, 'Image too different from reference'
 
     return 'success'
 
@@ -868,23 +764,18 @@ def test_jp2openjpeg_23():
     del out_ds
     src_ds = None
     ds = gdal.Open('/vsimem/jp2openjpeg_23.jp2')
-    if ds.GetRasterBand(1).GetMetadataItem('NBITS', 'IMAGE_STRUCTURE') != '9':
-        return 'fail'
+    assert ds.GetRasterBand(1).GetMetadataItem('NBITS', 'IMAGE_STRUCTURE') == '9'
 
     out_ds = gdaltest.jp2openjpeg_drv.CreateCopy('/vsimem/jp2openjpeg_23_2.jp2', ds)
-    if out_ds.GetRasterBand(1).GetMetadataItem('NBITS', 'IMAGE_STRUCTURE') != '9':
-        return 'fail'
+    assert out_ds.GetRasterBand(1).GetMetadataItem('NBITS', 'IMAGE_STRUCTURE') == '9'
     del out_ds
 
     ds = None
-    if gdal.VSIStatL('/vsimem/jp2openjpeg_23.jp2.aux.xml') is not None:
-        return 'fail'
+    assert gdal.VSIStatL('/vsimem/jp2openjpeg_23.jp2.aux.xml') is None
     gdal.Unlink('/vsimem/jp2openjpeg_23.jp2')
     gdal.Unlink('/vsimem/jp2openjpeg_23_2.jp2')
 
-    if maxdiff > 1:
-        gdaltest.post_reason('Image too different from reference')
-        return 'fail'
+    assert maxdiff <= 1, 'Image too different from reference'
 
     return 'success'
 
@@ -903,42 +794,29 @@ def test_jp2openjpeg_24():
     maxdiff = gdaltest.compare_ds(src_ds, out_ds)
     del out_ds
     src_ds = None
-    if gdal.VSIStatL('/vsimem/jp2openjpeg_24.jp2.aux.xml') is not None:
-        return 'fail'
+    assert gdal.VSIStatL('/vsimem/jp2openjpeg_24.jp2.aux.xml') is None
     ds = gdal.Open('/vsimem/jp2openjpeg_24.jp2')
-    if ds.GetRasterBand(1).GetColorInterpretation() != gdal.GCI_GrayIndex:
-        return 'fail'
-    if ds.GetRasterBand(2).GetColorInterpretation() != gdal.GCI_AlphaBand:
-        return 'fail'
+    assert ds.GetRasterBand(1).GetColorInterpretation() == gdal.GCI_GrayIndex
+    assert ds.GetRasterBand(2).GetColorInterpretation() == gdal.GCI_AlphaBand
     ds = None
     gdal.Unlink('/vsimem/jp2openjpeg_24.jp2')
 
-    if maxdiff > 0:
-        gdaltest.post_reason('Image too different from reference')
-        return 'fail'
+    assert maxdiff <= 0, 'Image too different from reference'
 
     #  Grey+alpha with 1BIT_ALPHA=YES
     src_ds = gdal.Open('../gcore/data/stefan_full_greyalpha.tif')
     out_ds = gdaltest.jp2openjpeg_drv.CreateCopy('/vsimem/jp2openjpeg_24.jp2', src_ds, options=['1BIT_ALPHA=YES'])
     del out_ds
     src_ds = None
-    if gdal.VSIStatL('/vsimem/jp2openjpeg_24.jp2.aux.xml') is not None:
-        return 'fail'
+    assert gdal.VSIStatL('/vsimem/jp2openjpeg_24.jp2.aux.xml') is None
     ds = gdal.OpenEx('/vsimem/jp2openjpeg_24.jp2', open_options=['1BIT_ALPHA_PROMOTION=NO'])
-    if ds.GetRasterBand(1).GetColorInterpretation() != gdal.GCI_GrayIndex:
-        return 'fail'
-    if ds.GetRasterBand(2).GetColorInterpretation() != gdal.GCI_AlphaBand:
-        return 'fail'
-    if ds.GetRasterBand(2).GetMetadataItem('NBITS', 'IMAGE_STRUCTURE') != '1':
-        return 'fail'
+    assert ds.GetRasterBand(1).GetColorInterpretation() == gdal.GCI_GrayIndex
+    assert ds.GetRasterBand(2).GetColorInterpretation() == gdal.GCI_AlphaBand
+    assert ds.GetRasterBand(2).GetMetadataItem('NBITS', 'IMAGE_STRUCTURE') == '1'
     ds = None
     ds = gdal.Open('/vsimem/jp2openjpeg_24.jp2')
-    if ds.GetRasterBand(2).GetMetadataItem('NBITS', 'IMAGE_STRUCTURE') is not None:
-        print(ds.GetRasterBand(2).GetMetadataItem('NBITS', 'IMAGE_STRUCTURE'))
-        return 'fail'
-    if ds.GetRasterBand(2).Checksum() != 23120:
-        print(ds.GetRasterBand(2).Checksum())
-        return 'fail'
+    assert ds.GetRasterBand(2).GetMetadataItem('NBITS', 'IMAGE_STRUCTURE') is None
+    assert ds.GetRasterBand(2).Checksum() == 23120
     ds = None
     gdal.Unlink('/vsimem/jp2openjpeg_24.jp2')
 
@@ -965,17 +843,13 @@ def test_jp2openjpeg_25():
     del out_ds
     src_ds = None
     ds = gdal.Open('/vsimem/jp2openjpeg_25.jp2')
-    if ds.GetRasterBand(1).GetColorInterpretation() != gdal.GCI_Undefined:
-        return 'fail'
+    assert ds.GetRasterBand(1).GetColorInterpretation() == gdal.GCI_Undefined
     ds = None
-    if gdal.VSIStatL('/vsimem/jp2openjpeg_25.jp2.aux.xml') is not None:
-        return 'fail'
+    assert gdal.VSIStatL('/vsimem/jp2openjpeg_25.jp2.aux.xml') is None
 
     gdal.Unlink('/vsimem/jp2openjpeg_25.jp2')
 
-    if maxdiff > 0:
-        gdaltest.post_reason('Image too different from reference')
-        return 'fail'
+    assert maxdiff <= 0, 'Image too different from reference'
 
     return 'success'
 
@@ -1032,38 +906,26 @@ def test_jp2openjpeg_26():
     overview_count = out_ds.GetRasterBand(1).GetOverviewCount()
     # We have 2x2 1024x1024 tiles. Each of them can be reconstructed down to 128x128.
     # So for full raster the smallest overview is 2*128
-    if out_ds.GetRasterBand(1).GetOverview(overview_count - 1).XSize != 2 * 128 or \
-       out_ds.GetRasterBand(1).GetOverview(overview_count - 1).YSize != 2 * 128:
-        print(out_ds.GetRasterBand(1).GetOverview(overview_count - 1).XSize)
-        print(out_ds.GetRasterBand(1).GetOverview(overview_count - 1).YSize)
-        return 'fail'
+    assert (out_ds.GetRasterBand(1).GetOverview(overview_count - 1).XSize == 2 * 128 and \
+       out_ds.GetRasterBand(1).GetOverview(overview_count - 1).YSize == 2 * 128)
     out_ds = None
-    if gdal.VSIStatL('/vsimem/jp2openjpeg_26.jp2.aux.xml') is not None:
-        return 'fail'
-    if validate('/vsimem/jp2openjpeg_26.jp2') == 'fail':
-        return 'fail'
+    assert gdal.VSIStatL('/vsimem/jp2openjpeg_26.jp2.aux.xml') is None
+    assert validate('/vsimem/jp2openjpeg_26.jp2') != 'fail'
     gdal.Unlink('/vsimem/jp2openjpeg_26.jp2')
 
     # Nominal case: untiled
     out_ds = gdaltest.jp2openjpeg_drv.CreateCopy('/vsimem/jp2openjpeg_26.jp2', src_ds, options=['INSPIRE_TG=YES', 'BLOCKXSIZE=2048', 'BLOCKYSIZE=2048'])
     overview_count = out_ds.GetRasterBand(1).GetOverviewCount()
-    if out_ds.GetRasterBand(1).GetOverview(overview_count - 1).XSize != 128 or \
-       out_ds.GetRasterBand(1).GetOverview(overview_count - 1).YSize != 128:
-        print(out_ds.GetRasterBand(1).GetOverview(overview_count - 1).XSize)
-        print(out_ds.GetRasterBand(1).GetOverview(overview_count - 1).YSize)
-        return 'fail'
+    assert (out_ds.GetRasterBand(1).GetOverview(overview_count - 1).XSize == 128 and \
+       out_ds.GetRasterBand(1).GetOverview(overview_count - 1).YSize == 128)
     gdal.ErrorReset()
     out_ds.GetRasterBand(1).Checksum()
-    if gdal.GetLastErrorMsg() != '':
-        return 'fail'
+    assert gdal.GetLastErrorMsg() == ''
     out_ds.GetRasterBand(1).GetOverview(0).Checksum()
-    if gdal.GetLastErrorMsg() != '':
-        return 'fail'
+    assert gdal.GetLastErrorMsg() == ''
     out_ds = None
-    if gdal.VSIStatL('/vsimem/jp2openjpeg_26.jp2.aux.xml') is not None:
-        return 'fail'
-    if validate('/vsimem/jp2openjpeg_26.jp2') == 'fail':
-        return 'fail'
+    assert gdal.VSIStatL('/vsimem/jp2openjpeg_26.jp2.aux.xml') is None
+    assert validate('/vsimem/jp2openjpeg_26.jp2') != 'fail'
     gdal.Unlink('/vsimem/jp2openjpeg_26.jp2')
 
     # Nominal case: RGBA
@@ -1073,15 +935,11 @@ def test_jp2openjpeg_26():
     out_ds = gdaltest.jp2openjpeg_drv.CreateCopy('/vsimem/jp2openjpeg_26.jp2', src_ds, options=['INSPIRE_TG=YES', 'ALPHA=YES'])
     out_ds = None
     ds = gdal.OpenEx('/vsimem/jp2openjpeg_26.jp2', open_options=['1BIT_ALPHA_PROMOTION=NO'])
-    if ds.GetRasterBand(4).GetColorInterpretation() != gdal.GCI_AlphaBand:
-        return 'fail'
-    if ds.GetRasterBand(4).GetMetadataItem('NBITS', 'IMAGE_STRUCTURE') != '1':
-        return 'fail'
+    assert ds.GetRasterBand(4).GetColorInterpretation() == gdal.GCI_AlphaBand
+    assert ds.GetRasterBand(4).GetMetadataItem('NBITS', 'IMAGE_STRUCTURE') == '1'
     ds = None
-    if gdal.VSIStatL('/vsimem/jp2openjpeg_26.jp2.aux.xml') is not None:
-        return 'fail'
-    if validate('/vsimem/jp2openjpeg_26.jp2') == 'fail':
-        return 'fail'
+    assert gdal.VSIStatL('/vsimem/jp2openjpeg_26.jp2.aux.xml') is None
+    assert validate('/vsimem/jp2openjpeg_26.jp2') != 'fail'
     gdal.Unlink('/vsimem/jp2openjpeg_26.jp2')
 
     # Warning case: disabling JPX
@@ -1089,40 +947,31 @@ def test_jp2openjpeg_26():
     gdal.PushErrorHandler()
     out_ds = gdaltest.jp2openjpeg_drv.CreateCopy('/vsimem/jp2openjpeg_26.jp2', src_ds, options=['INSPIRE_TG=YES', 'JPX=NO'])
     gdal.PopErrorHandler()
-    if gdal.GetLastErrorMsg() == '':
-        return 'fail'
+    assert gdal.GetLastErrorMsg() != ''
     out_ds = None
-    if gdal.VSIStatL('/vsimem/jp2openjpeg_26.jp2.aux.xml') is not None:
-        return 'fail'
+    assert gdal.VSIStatL('/vsimem/jp2openjpeg_26.jp2.aux.xml') is None
     res = validate('/vsimem/jp2openjpeg_26.jp2', return_error_count=True)
-    if res != 'skip' and res != (2, 0):
-        return 'fail'
+    assert res == 'skip' or res == (2, 0)
     gdal.Unlink('/vsimem/jp2openjpeg_26.jp2')
 
     # Bilevel (1 bit)
     src_ds = gdal.GetDriverByName('MEM').Create('', 128, 128, 1)
     src_ds.GetRasterBand(1).SetMetadataItem('NBITS', '1', 'IMAGE_STRUCTURE')
     out_ds = gdaltest.jp2openjpeg_drv.CreateCopy('/vsimem/jp2openjpeg_26.jp2', src_ds, options=['INSPIRE_TG=YES'])
-    if out_ds.GetRasterBand(1).GetMetadataItem('NBITS', 'IMAGE_STRUCTURE') != '1':
-        return 'fail'
+    assert out_ds.GetRasterBand(1).GetMetadataItem('NBITS', 'IMAGE_STRUCTURE') == '1'
     ds = None
-    if gdal.VSIStatL('/vsimem/jp2openjpeg_26.jp2.aux.xml') is not None:
-        return 'fail'
-    if validate('/vsimem/jp2openjpeg_26.jp2', expected_gmljp2=False) == 'fail':
-        return 'fail'
+    assert gdal.VSIStatL('/vsimem/jp2openjpeg_26.jp2.aux.xml') is None
+    assert validate('/vsimem/jp2openjpeg_26.jp2', expected_gmljp2=False) != 'fail'
     gdal.Unlink('/vsimem/jp2openjpeg_26.jp2')
 
     # Auto-promotion 12->16 bits
     src_ds = gdal.GetDriverByName('MEM').Create('', 128, 128, 1, gdal.GDT_UInt16)
     src_ds.GetRasterBand(1).SetMetadataItem('NBITS', '12', 'IMAGE_STRUCTURE')
     out_ds = gdaltest.jp2openjpeg_drv.CreateCopy('/vsimem/jp2openjpeg_26.jp2', src_ds, options=['INSPIRE_TG=YES'])
-    if out_ds.GetRasterBand(1).GetMetadataItem('NBITS', 'IMAGE_STRUCTURE') is not None:
-        return 'fail'
+    assert out_ds.GetRasterBand(1).GetMetadataItem('NBITS', 'IMAGE_STRUCTURE') is None
     ds = None
-    if gdal.VSIStatL('/vsimem/jp2openjpeg_26.jp2.aux.xml') is not None:
-        return 'fail'
-    if validate('/vsimem/jp2openjpeg_26.jp2', expected_gmljp2=False) == 'fail':
-        return 'fail'
+    assert gdal.VSIStatL('/vsimem/jp2openjpeg_26.jp2.aux.xml') is None
+    assert validate('/vsimem/jp2openjpeg_26.jp2', expected_gmljp2=False) != 'fail'
     gdal.Unlink('/vsimem/jp2openjpeg_26.jp2')
 
     src_ds = gdal.GetDriverByName('MEM').Create('', 2048, 2048, 1)
@@ -1131,36 +980,31 @@ def test_jp2openjpeg_26():
     gdal.PushErrorHandler()
     out_ds = gdaltest.jp2openjpeg_drv.CreateCopy('/vsimem/jp2openjpeg_26.jp2', src_ds, options=['INSPIRE_TG=YES', 'BLOCKXSIZE=1536', 'BLOCKYSIZE=1536'])
     gdal.PopErrorHandler()
-    if out_ds is not None:
-        return 'fail'
+    assert out_ds is None
 
     # Error case: non square tile
     gdal.PushErrorHandler()
     out_ds = gdaltest.jp2openjpeg_drv.CreateCopy('/vsimem/jp2openjpeg_26.jp2', src_ds, options=['INSPIRE_TG=YES', 'BLOCKXSIZE=512', 'BLOCKYSIZE=128'])
     gdal.PopErrorHandler()
-    if out_ds is not None:
-        return 'fail'
+    assert out_ds is None
 
     # Error case: incompatible PROFILE
     gdal.PushErrorHandler()
     out_ds = gdaltest.jp2openjpeg_drv.CreateCopy('/vsimem/jp2openjpeg_26.jp2', src_ds, options=['INSPIRE_TG=YES', 'PROFILE=UNRESTRICTED'])
     gdal.PopErrorHandler()
-    if out_ds is not None:
-        return 'fail'
+    assert out_ds is None
 
     # Error case: valid, but too small number of resolutions regarding PROFILE_1
     gdal.PushErrorHandler()
     out_ds = gdaltest.jp2openjpeg_drv.CreateCopy('/vsimem/jp2openjpeg_26.jp2', src_ds, options=['INSPIRE_TG=YES', 'RESOLUTIONS=1'])
     gdal.PopErrorHandler()
-    if out_ds is not None:
-        return 'fail'
+    assert out_ds is None
 
     # Too big resolution number. Will fallback to default one
     gdal.PushErrorHandler()
     out_ds = gdaltest.jp2openjpeg_drv.CreateCopy('/vsimem/jp2openjpeg_26.jp2', src_ds, options=['INSPIRE_TG=YES', 'RESOLUTIONS=100'])
     gdal.PopErrorHandler()
-    if out_ds is None:
-        return 'fail'
+    assert out_ds is not None
     out_ds = None
     gdal.Unlink('/vsimem/jp2openjpeg_26.jp2')
 
@@ -1168,27 +1012,23 @@ def test_jp2openjpeg_26():
     gdal.PushErrorHandler()
     out_ds = gdaltest.jp2openjpeg_drv.CreateCopy('/vsimem/jp2openjpeg_26.jp2', src_ds, options=['INSPIRE_TG=YES', 'NBITS=2'])
     gdal.PopErrorHandler()
-    if out_ds is not None:
-        return 'fail'
+    assert out_ds is None
 
     # Error case: unsupported CODEC (J2K)
     gdal.PushErrorHandler()
     out_ds = gdaltest.jp2openjpeg_drv.CreateCopy('/vsimem/jp2openjpeg_26.j2k', src_ds, options=['INSPIRE_TG=YES'])
     gdal.PopErrorHandler()
-    if out_ds is not None:
-        return 'fail'
+    assert out_ds is None
 
     # Error case: invalid CODEBLOCK_WIDTH/HEIGHT
     gdal.PushErrorHandler()
     out_ds = gdaltest.jp2openjpeg_drv.CreateCopy('/vsimem/jp2openjpeg_26.jp2', src_ds, options=['INSPIRE_TG=YES', 'CODEBLOCK_WIDTH=128', 'CODEBLOCK_HEIGHT=32'])
     gdal.PopErrorHandler()
-    if out_ds is not None:
-        return 'fail'
+    assert out_ds is None
     gdal.PushErrorHandler()
     out_ds = gdaltest.jp2openjpeg_drv.CreateCopy('/vsimem/jp2openjpeg_26.jp2', src_ds, options=['INSPIRE_TG=YES', 'CODEBLOCK_WIDTH=32', 'CODEBLOCK_HEIGHT=128'])
     gdal.PopErrorHandler()
-    if out_ds is not None:
-        return 'fail'
+    assert out_ds is None
 
     return 'success'
 
@@ -1304,14 +1144,12 @@ def test_jp2openjpeg_28():
         out_ds = gdaltest.jp2openjpeg_drv.CreateCopy('/vsimem/jp2openjpeg_28.jp2', src_ds, options=options)
         gdal.PopErrorHandler()
         if warning_expected and gdal.GetLastErrorMsg() == '':
-            gdaltest.post_reason('warning expected')
             print(options)
-            return 'fail'
+            pytest.fail('warning expected')
         del out_ds
         if not jp2openjpeg_test_codeblock('/vsimem/jp2openjpeg_28.jp2', expected_cbkw, expected_cbkh):
-            gdaltest.post_reason('unexpected codeblock size')
             print(options)
-            return 'fail'
+            pytest.fail('unexpected codeblock size')
 
     gdal.Unlink('/vsimem/jp2openjpeg_28.jp2')
 
@@ -1344,9 +1182,8 @@ def test_jp2openjpeg_29():
         out_ds = gdaltest.jp2openjpeg_drv.CreateCopy('/vsimem/jp2openjpeg_29.jp2', src_ds, options=options)
         gdal.PopErrorHandler()
         if warning_expected and gdal.GetLastErrorMsg() == '':
-            gdaltest.post_reason('warning expected')
             print(options)
-            return 'fail'
+            pytest.fail('warning expected')
         # Not sure if that could be easily checked
         del out_ds
         # print gdal.GetJPEG2000StructureAsString('/vsimem/jp2openjpeg_29.jp2', ['ALL=YES'])
@@ -1384,21 +1221,17 @@ def test_jp2openjpeg_30():
         out_ds = gdaltest.jp2openjpeg_drv.CreateCopy('/vsimem/jp2openjpeg_30.jp2', src_ds, options=options)
         gdal.PopErrorHandler()
         if warning_expected and gdal.GetLastErrorMsg() == '':
-            gdaltest.post_reason('warning expected')
             print(options)
-            return 'fail'
+            pytest.fail('warning expected')
         ct = out_ds.GetRasterBand(1).GetRasterColorTable()
-        if ct.GetCount() != 4 or \
-           ct.GetColorEntry(0) != (255, 255, 255, 255) or \
-           ct.GetColorEntry(1) != (255, 255, 0, 255) or \
-           ct.GetColorEntry(2) != (255, 0, 255, 255) or \
-           ct.GetColorEntry(3) != (0, 255, 255, 255):
-            gdaltest.post_reason('Wrong color table entry.')
-            return 'fail'
+        assert (ct.GetCount() == 4 and \
+           ct.GetColorEntry(0) == (255, 255, 255, 255) and \
+           ct.GetColorEntry(1) == (255, 255, 0, 255) and \
+           ct.GetColorEntry(2) == (255, 0, 255, 255) and \
+           ct.GetColorEntry(3) == (0, 255, 255, 255)), 'Wrong color table entry.'
         del out_ds
 
-        if validate('/vsimem/jp2openjpeg_30.jp2', expected_gmljp2=False) == 'fail':
-            return 'fail'
+        assert validate('/vsimem/jp2openjpeg_30.jp2', expected_gmljp2=False) != 'fail'
 
     gdal.Unlink('/vsimem/jp2openjpeg_30.jp2')
 
@@ -1412,13 +1245,11 @@ def test_jp2openjpeg_30():
     src_ds.GetRasterBand(1).SetRasterColorTable(ct)
     out_ds = gdaltest.jp2openjpeg_drv.CreateCopy('/vsimem/jp2openjpeg_30.jp2', src_ds)
     ct = out_ds.GetRasterBand(1).GetRasterColorTable()
-    if ct.GetCount() != 4 or \
-            ct.GetColorEntry(0) != (0, 0, 0, 0) or \
-            ct.GetColorEntry(1) != (255, 255, 0, 255) or \
-            ct.GetColorEntry(2) != (255, 0, 255, 255) or \
-            ct.GetColorEntry(3) != (0, 255, 255, 255):
-        gdaltest.post_reason('Wrong color table entry.')
-        return 'fail'
+    assert (ct.GetCount() == 4 and \
+            ct.GetColorEntry(0) == (0, 0, 0, 0) and \
+            ct.GetColorEntry(1) == (255, 255, 0, 255) and \
+            ct.GetColorEntry(2) == (255, 0, 255, 255) and \
+            ct.GetColorEntry(3) == (0, 255, 255, 255)), 'Wrong color table entry.'
     del out_ds
     gdal.Unlink('/vsimem/jp2openjpeg_30.jp2')
 
@@ -1432,13 +1263,11 @@ def test_jp2openjpeg_30():
     src_ds.GetRasterBand(1).SetRasterColorTable(ct)
     out_ds = gdaltest.jp2openjpeg_drv.CreateCopy('/vsimem/jp2openjpeg_30.jp2', src_ds, options=['CT_COMPONENTS=3'])
     ct = out_ds.GetRasterBand(1).GetRasterColorTable()
-    if ct.GetCount() != 4 or \
-            ct.GetColorEntry(0) != (0, 0, 0, 255) or \
-            ct.GetColorEntry(1) != (255, 255, 0, 255) or \
-            ct.GetColorEntry(2) != (255, 0, 255, 255) or \
-            ct.GetColorEntry(3) != (0, 255, 255, 255):
-        gdaltest.post_reason('Wrong color table entry.')
-        return 'fail'
+    assert (ct.GetCount() == 4 and \
+            ct.GetColorEntry(0) == (0, 0, 0, 255) and \
+            ct.GetColorEntry(1) == (255, 255, 0, 255) and \
+            ct.GetColorEntry(2) == (255, 0, 255, 255) and \
+            ct.GetColorEntry(3) == (0, 255, 255, 255)), 'Wrong color table entry.'
     del out_ds
     gdal.Unlink('/vsimem/jp2openjpeg_30.jp2')
 
@@ -1450,8 +1279,7 @@ def test_jp2openjpeg_30():
     gdal.PushErrorHandler()
     out_ds = gdaltest.jp2openjpeg_drv.CreateCopy('/vsimem/jp2openjpeg_30.jp2', src_ds)
     gdal.PopErrorHandler()
-    if out_ds is not None:
-        return 'fail'
+    assert out_ds is None
 
     return 'success'
 
@@ -1470,16 +1298,11 @@ def test_jp2openjpeg_31():
     src_ds.GetRasterBand(3).SetColorInterpretation(gdal.GCI_RedBand)
     out_ds = gdaltest.jp2openjpeg_drv.CreateCopy('/vsimem/jp2openjpeg_31.jp2', src_ds)
     del out_ds
-    if gdal.VSIStatL('/vsimem/jp2openjpeg_31.jp2.aux.xml') is not None:
-        return 'fail'
+    assert gdal.VSIStatL('/vsimem/jp2openjpeg_31.jp2.aux.xml') is None
     ds = gdal.Open('/vsimem/jp2openjpeg_31.jp2')
-    if ds.GetRasterBand(1).GetColorInterpretation() != gdal.GCI_GreenBand:
-        print(ds.GetRasterBand(1).GetColorInterpretation())
-        return 'fail'
-    if ds.GetRasterBand(2).GetColorInterpretation() != gdal.GCI_BlueBand:
-        return 'fail'
-    if ds.GetRasterBand(3).GetColorInterpretation() != gdal.GCI_RedBand:
-        return 'fail'
+    assert ds.GetRasterBand(1).GetColorInterpretation() == gdal.GCI_GreenBand
+    assert ds.GetRasterBand(2).GetColorInterpretation() == gdal.GCI_BlueBand
+    assert ds.GetRasterBand(3).GetColorInterpretation() == gdal.GCI_RedBand
     ds = None
     gdal.Unlink('/vsimem/jp2openjpeg_31.jp2')
 
@@ -1491,18 +1314,12 @@ def test_jp2openjpeg_31():
     src_ds.GetRasterBand(4).SetColorInterpretation(gdal.GCI_RedBand)
     out_ds = gdaltest.jp2openjpeg_drv.CreateCopy('/vsimem/jp2openjpeg_31.jp2', src_ds)
     del out_ds
-    if gdal.VSIStatL('/vsimem/jp2openjpeg_31.jp2.aux.xml') is not None:
-        return 'fail'
+    assert gdal.VSIStatL('/vsimem/jp2openjpeg_31.jp2.aux.xml') is None
     ds = gdal.Open('/vsimem/jp2openjpeg_31.jp2')
-    if ds.GetRasterBand(1).GetColorInterpretation() != gdal.GCI_AlphaBand:
-        print(ds.GetRasterBand(1).GetColorInterpretation())
-        return 'fail'
-    if ds.GetRasterBand(2).GetColorInterpretation() != gdal.GCI_GreenBand:
-        return 'fail'
-    if ds.GetRasterBand(3).GetColorInterpretation() != gdal.GCI_BlueBand:
-        return 'fail'
-    if ds.GetRasterBand(4).GetColorInterpretation() != gdal.GCI_RedBand:
-        return 'fail'
+    assert ds.GetRasterBand(1).GetColorInterpretation() == gdal.GCI_AlphaBand
+    assert ds.GetRasterBand(2).GetColorInterpretation() == gdal.GCI_GreenBand
+    assert ds.GetRasterBand(3).GetColorInterpretation() == gdal.GCI_BlueBand
+    assert ds.GetRasterBand(4).GetColorInterpretation() == gdal.GCI_RedBand
     ds = None
     gdal.Unlink('/vsimem/jp2openjpeg_31.jp2')
 
@@ -1521,8 +1338,7 @@ def test_jp2openjpeg_32():
     gdal.PushErrorHandler()
     out_ds = gdaltest.jp2openjpeg_drv.CreateCopy('/vsimem/jp2openjpeg_32.jp2', src_ds, options=['JP2C_XLBOX=YES'])
     gdal.PopErrorHandler()
-    if out_ds.GetRasterBand(1).Checksum() != 0:
-        return 'fail'
+    assert out_ds.GetRasterBand(1).Checksum() == 0
     out_ds = None
     gdal.Unlink('/vsimem/jp2openjpeg_32.jp2')
 
@@ -1546,8 +1362,7 @@ def test_jp2openjpeg_33():
     # https://github.com/uclouvain/openjpeg/issues/493
     out_ds = gdaltest.jp2openjpeg_drv.CreateCopy('/vsimem/jp2openjpeg_33.jp2', src_ds, options=['BLOCKXSIZE=100000', 'BLOCKYSIZE=100000', 'RESOLUTIONS=5'])
     gdal.PopErrorHandler()
-    if out_ds is not None:
-        return 'fail'
+    assert out_ds is None
     out_ds = None
     gdal.Unlink('/vsimem/jp2openjpeg_33.jp2')
 
@@ -1565,8 +1380,7 @@ def test_jp2openjpeg_34():
     gdal.PushErrorHandler()
     ds = gdal.Open('data/dimensions_above_31bit.jp2')
     gdal.PopErrorHandler()
-    if ds is not None:
-        return 'fail'
+    assert ds is None
 
     return 'success'
 
@@ -1582,8 +1396,7 @@ def test_jp2openjpeg_35():
     gdal.PushErrorHandler()
     ds = gdal.Open('data/truncated.jp2')
     gdal.PopErrorHandler()
-    if ds is not None:
-        return 'fail'
+    assert ds is None
 
     return 'success'
 
@@ -1600,8 +1413,7 @@ def test_jp2openjpeg_36():
     gdal.PushErrorHandler()
     out_ds = gdaltest.jp2openjpeg_drv.CreateCopy('/vsimem/jp2openjpeg_36.jp2', src_ds)
     gdal.PopErrorHandler()
-    if out_ds is not None or gdal.VSIStatL('/vsimem/jp2openjpeg_36.jp2') is not None:
-        return 'fail'
+    assert out_ds is None and gdal.VSIStatL('/vsimem/jp2openjpeg_36.jp2') is None
 
     return 'success'
 
@@ -1618,11 +1430,9 @@ def test_jp2openjpeg_37():
     src_ds = gdal.GetDriverByName('MEM').Create('', 2, 2)
     out_ds = gdaltest.jp2openjpeg_drv.CreateCopy('/vsimem/jp2openjpeg_37.jp2', src_ds, options=['WRITE_METADATA=YES'])
     del out_ds
-    if gdal.VSIStatL('/vsimem/jp2openjpeg_37.jp2.aux.xml') is not None:
-        return 'fail'
+    assert gdal.VSIStatL('/vsimem/jp2openjpeg_37.jp2.aux.xml') is None
     ds = gdal.Open('/vsimem/jp2openjpeg_37.jp2')
-    if ds.GetMetadata() != {}:
-        return 'fail'
+    assert ds.GetMetadata() == {}
     gdal.Unlink('/vsimem/jp2openjpeg_37.jp2')
 
     # Simple metadata in main domain
@@ -1631,15 +1441,12 @@ def test_jp2openjpeg_37():
         src_ds.SetMetadataItem('FOO', 'BAR')
         out_ds = gdaltest.jp2openjpeg_drv.CreateCopy('/vsimem/jp2openjpeg_37.jp2', src_ds, options=options)
         del out_ds
-        if gdal.VSIStatL('/vsimem/jp2openjpeg_37.jp2.aux.xml') is not None:
-            return 'fail'
+        assert gdal.VSIStatL('/vsimem/jp2openjpeg_37.jp2.aux.xml') is None
         ds = gdal.Open('/vsimem/jp2openjpeg_37.jp2')
-        if ds.GetMetadata() != {'FOO': 'BAR'}:
-            return 'fail'
+        assert ds.GetMetadata() == {'FOO': 'BAR'}
         ds = None
 
-        if 'INSPIRE_TG=YES' in options and validate('/vsimem/jp2openjpeg_37.jp2', expected_gmljp2=False) == 'fail':
-            return 'fail'
+        assert not ('INSPIRE_TG=YES' in options and validate('/vsimem/jp2openjpeg_37.jp2', expected_gmljp2=False) == 'fail')
 
         gdal.Unlink('/vsimem/jp2openjpeg_37.jp2')
 
@@ -1648,13 +1455,10 @@ def test_jp2openjpeg_37():
     src_ds.SetMetadataItem('FOO', 'BAR', 'SOME_DOMAIN')
     out_ds = gdaltest.jp2openjpeg_drv.CreateCopy('/vsimem/jp2openjpeg_37.jp2', src_ds, options=['WRITE_METADATA=YES'])
     del out_ds
-    if gdal.VSIStatL('/vsimem/jp2openjpeg_37.jp2.aux.xml') is not None:
-        return 'fail'
+    assert gdal.VSIStatL('/vsimem/jp2openjpeg_37.jp2.aux.xml') is None
     ds = gdal.Open('/vsimem/jp2openjpeg_37.jp2')
     md = ds.GetMetadata('SOME_DOMAIN')
-    if md != {'FOO': 'BAR'}:
-        print(md)
-        return 'fail'
+    assert md == {'FOO': 'BAR'}
     gdal.Unlink('/vsimem/jp2openjpeg_37.jp2')
 
     # Simple metadata in auxiliary XML domain
@@ -1662,11 +1466,9 @@ def test_jp2openjpeg_37():
     src_ds.SetMetadata(['<some_arbitrary_xml_box/>'], 'xml:SOME_DOMAIN')
     out_ds = gdaltest.jp2openjpeg_drv.CreateCopy('/vsimem/jp2openjpeg_37.jp2', src_ds, options=['WRITE_METADATA=YES'])
     del out_ds
-    if gdal.VSIStatL('/vsimem/jp2openjpeg_37.jp2.aux.xml') is not None:
-        return 'fail'
+    assert gdal.VSIStatL('/vsimem/jp2openjpeg_37.jp2.aux.xml') is None
     ds = gdal.Open('/vsimem/jp2openjpeg_37.jp2')
-    if ds.GetMetadata('xml:SOME_DOMAIN')[0] != '<some_arbitrary_xml_box />\n':
-        return 'fail'
+    assert ds.GetMetadata('xml:SOME_DOMAIN')[0] == '<some_arbitrary_xml_box />\n'
     gdal.Unlink('/vsimem/jp2openjpeg_37.jp2')
 
     # Special xml:BOX_ metadata domain
@@ -1675,11 +1477,9 @@ def test_jp2openjpeg_37():
         src_ds.SetMetadata(['<some_arbitrary_xml_box/>'], 'xml:BOX_1')
         out_ds = gdaltest.jp2openjpeg_drv.CreateCopy('/vsimem/jp2openjpeg_37.jp2', src_ds, options=options)
         del out_ds
-        if gdal.VSIStatL('/vsimem/jp2openjpeg_37.jp2.aux.xml') is not None:
-            return 'fail'
+        assert gdal.VSIStatL('/vsimem/jp2openjpeg_37.jp2.aux.xml') is None
         ds = gdal.Open('/vsimem/jp2openjpeg_37.jp2')
-        if ds.GetMetadata('xml:BOX_0')[0] != '<some_arbitrary_xml_box/>':
-            return 'fail'
+        assert ds.GetMetadata('xml:BOX_0')[0] == '<some_arbitrary_xml_box/>'
         gdal.Unlink('/vsimem/jp2openjpeg_37.jp2')
 
     # Special xml:XMP metadata domain
@@ -1688,15 +1488,12 @@ def test_jp2openjpeg_37():
         src_ds.SetMetadata(['<fake_xmp_box/>'], 'xml:XMP')
         out_ds = gdaltest.jp2openjpeg_drv.CreateCopy('/vsimem/jp2openjpeg_37.jp2', src_ds, options=options)
         del out_ds
-        if gdal.VSIStatL('/vsimem/jp2openjpeg_37.jp2.aux.xml') is not None:
-            return 'fail'
+        assert gdal.VSIStatL('/vsimem/jp2openjpeg_37.jp2.aux.xml') is None
         ds = gdal.Open('/vsimem/jp2openjpeg_37.jp2')
-        if ds.GetMetadata('xml:XMP')[0] != '<fake_xmp_box/>':
-            return 'fail'
+        assert ds.GetMetadata('xml:XMP')[0] == '<fake_xmp_box/>'
         ds = None
 
-        if 'INSPIRE_TG=YES' in options and validate('/vsimem/jp2openjpeg_37.jp2', expected_gmljp2=False) == 'fail':
-            return 'fail'
+        assert not ('INSPIRE_TG=YES' in options and validate('/vsimem/jp2openjpeg_37.jp2', expected_gmljp2=False) == 'fail')
 
         gdal.Unlink('/vsimem/jp2openjpeg_37.jp2')
 
@@ -1706,15 +1503,12 @@ def test_jp2openjpeg_37():
         src_ds.SetMetadata(['<fake_ipr_box/>'], 'xml:IPR')
         out_ds = gdaltest.jp2openjpeg_drv.CreateCopy('/vsimem/jp2openjpeg_37.jp2', src_ds, options=options)
         del out_ds
-        if gdal.VSIStatL('/vsimem/jp2openjpeg_37.jp2.aux.xml') is not None:
-            return 'fail'
+        assert gdal.VSIStatL('/vsimem/jp2openjpeg_37.jp2.aux.xml') is None
         ds = gdal.Open('/vsimem/jp2openjpeg_37.jp2')
-        if ds.GetMetadata('xml:IPR')[0] != '<fake_ipr_box/>':
-            return 'fail'
+        assert ds.GetMetadata('xml:IPR')[0] == '<fake_ipr_box/>'
         ds = None
 
-        if validate('/vsimem/jp2openjpeg_37.jp2', expected_gmljp2=False) == 'fail':
-            return 'fail'
+        assert validate('/vsimem/jp2openjpeg_37.jp2', expected_gmljp2=False) != 'fail'
         gdal.Unlink('/vsimem/jp2openjpeg_37.jp2')
 
     return 'success'
@@ -1734,9 +1528,7 @@ def test_jp2openjpeg_38():
     src_ds.SetProjection(wkt)
     src_ds.SetGeoTransform([0, 60, 0, 0, 0, -60])
     out_ds = gdaltest.jp2openjpeg_drv.CreateCopy('/vsimem/jp2openjpeg_38.jp2', src_ds, options=['GeoJP2=NO'])
-    if out_ds.GetProjectionRef() != wkt:
-        print(out_ds.GetProjectionRef())
-        return 'fail'
+    assert out_ds.GetProjectionRef() == wkt
     crsdictionary = out_ds.GetMetadata_List("xml:CRSDictionary.gml")[0]
     out_ds = None
     gdal.Unlink('/vsimem/jp2openjpeg_38.jp2')
@@ -1755,9 +1547,7 @@ def test_jp2openjpeg_38():
         do_validate = False
 
     if do_validate:
-        if not xmlvalidate.validate(crsdictionary, ogc_schemas_location='tmp/cache/SCHEMAS_OPENGIS_NET'):
-            print(crsdictionary)
-            return 'fail'
+        assert xmlvalidate.validate(crsdictionary, ogc_schemas_location='tmp/cache/SCHEMAS_OPENGIS_NET')
 
     return 'success'
 
@@ -1826,9 +1616,7 @@ def test_jp2openjpeg_39():
     gdal.Unlink('/vsimem/override.gml')
     del out_ds
     ds = gdal.Open('/vsimem/jp2openjpeg_39.jp2')
-    if ds.GetProjectionRef().find('4326') < 0:
-        print(ds.GetProjectionRef())
-        return 'fail'
+    assert ds.GetProjectionRef().find('4326') >= 0
     ds = None
     gdal.Unlink('/vsimem/jp2openjpeg_39.jp2')
 
@@ -1902,15 +1690,11 @@ def test_jp2openjpeg_40():
     gdal.Unlink('/vsimem/override.gml')
     del out_ds
     ds = gdal.Open('/vsimem/jp2openjpeg_40.jp2')
-    if ds.GetProjectionRef().find('4326') < 0:
-        print(ds.GetProjectionRef())
-        return 'fail'
+    assert ds.GetProjectionRef().find('4326') >= 0
     got_gt = ds.GetGeoTransform()
     expected_gt = (2, 0.1, 0, 49, 0, -0.1)
     for i in range(6):
-        if abs(got_gt[i] - expected_gt[i]) > 1e-5:
-            print(got_gt)
-            return 'fail'
+        assert abs(got_gt[i] - expected_gt[i]) <= 1e-5
     ds = None
     gdal.Unlink('/vsimem/jp2openjpeg_40.jp2')
 
@@ -1928,11 +1712,9 @@ def test_jp2openjpeg_41():
     src_ds = gdal.Open('data/byte.jp2')
     out_ds = gdaltest.jp2openjpeg_drv.CreateCopy('/vsimem/jp2openjpeg_41.jp2', src_ds,
                                                  options=['USE_SRC_CODESTREAM=YES', 'PROFILE=PROFILE_1', 'GEOJP2=NO', 'GMLJP2=NO'])
-    if src_ds.GetRasterBand(1).Checksum() != out_ds.GetRasterBand(1).Checksum():
-        return 'fail'
+    assert src_ds.GetRasterBand(1).Checksum() == out_ds.GetRasterBand(1).Checksum()
     del out_ds
-    if gdal.VSIStatL('/vsimem/jp2openjpeg_41.jp2').size != 9923:
-        return 'fail'
+    assert gdal.VSIStatL('/vsimem/jp2openjpeg_41.jp2').size == 9923
     gdal.Unlink('/vsimem/jp2openjpeg_41.jp2')
     gdal.Unlink('/vsimem/jp2openjpeg_41.jp2.aux.xml')
 
@@ -1943,8 +1725,7 @@ def test_jp2openjpeg_41():
                                                  options=['USE_SRC_CODESTREAM=YES', 'QUALITY=1'])
     gdal.PopErrorHandler()
     del out_ds
-    if gdal.GetLastErrorMsg() == '':
-        return 'fail'
+    assert gdal.GetLastErrorMsg() != ''
     gdal.Unlink('/vsimem/jp2openjpeg_41.jp2')
     gdal.Unlink('/vsimem/jp2openjpeg_41.jp2.aux.xml')
 
@@ -1956,8 +1737,7 @@ def test_jp2openjpeg_41():
                                                  options=['USE_SRC_CODESTREAM=YES'])
     gdal.PopErrorHandler()
     del out_ds
-    if gdal.GetLastErrorMsg() == '':
-        return 'fail'
+    assert gdal.GetLastErrorMsg() != ''
     gdal.Unlink('/vsimem/jp2openjpeg_41.jp2')
 
     return 'success'
@@ -1985,84 +1765,57 @@ def test_jp2openjpeg_42():
     ds = gdal.Open('/vsimem/jp2openjpeg_42.jp2', gdal.GA_Update)
     ds.SetMetadataItem('FOO', 'BAR')
     ds = None
-    if gdal.VSIStatL('/vsimem/jp2openjpeg_42.jp2.aux.xml') is not None:
-        return 'fail'
+    assert gdal.VSIStatL('/vsimem/jp2openjpeg_42.jp2.aux.xml') is None
 
     # Add metadata and GCP
     ds = gdal.Open('/vsimem/jp2openjpeg_42.jp2', gdal.GA_Update)
-    if ds.GetMetadata() != {'FOO': 'BAR'}:
-        return 'fail'
+    assert ds.GetMetadata() == {'FOO': 'BAR'}
     sr = osr.SpatialReference()
     sr.ImportFromEPSG(32631)
     gcps = [gdal.GCP(0, 1, 2, 3, 4)]
     ds.SetGCPs(gcps, sr.ExportToWkt())
     ds = None
-    if gdal.VSIStatL('/vsimem/jp2openjpeg_42.jp2.aux.xml') is not None:
-        return 'fail'
+    assert gdal.VSIStatL('/vsimem/jp2openjpeg_42.jp2.aux.xml') is None
 
     # Check we got metadata and GCP, and there's no GMLJP2 box
     ds = gdal.Open('/vsimem/jp2openjpeg_42.jp2', gdal.GA_Update)
-    if ds.GetMetadata() != {'FOO': 'BAR'}:
-        return 'fail'
-    if ds.GetGCPCount() != 1:
-        return 'fail'
-    if len(ds.GetMetadataDomainList()) != 2:
-        print(ds.GetMetadataDomainList())
-        return 'fail'
+    assert ds.GetMetadata() == {'FOO': 'BAR'}
+    assert ds.GetGCPCount() == 1
+    assert len(ds.GetMetadataDomainList()) == 2
     # Unset metadata and GCP
     ds.SetMetadata(None)
     ds.SetGCPs([], '')
     ds = None
-    if gdal.VSIStatL('/vsimem/jp2openjpeg_42.jp2.aux.xml') is not None:
-        return 'fail'
+    assert gdal.VSIStatL('/vsimem/jp2openjpeg_42.jp2.aux.xml') is None
 
     # Check we have no longer metadata or GCP
     ds = gdal.Open('/vsimem/jp2openjpeg_42.jp2', gdal.GA_Update)
-    if ds.GetMetadata() != {}:
-        print(ds.GetMetadata())
-        return 'fail'
-    if ds.GetGCPCount() != 0:
-        return 'fail'
-    if ds.GetMetadataDomainList() != ['DERIVED_SUBDATASETS']:
-        print(ds.GetMetadataDomainList())
-        return 'fail'
+    assert ds.GetMetadata() == {}
+    assert ds.GetGCPCount() == 0
+    assert ds.GetMetadataDomainList() == ['DERIVED_SUBDATASETS']
     # Add projection and geotransform
     ds.SetProjection(sr.ExportToWkt())
     ds.SetGeoTransform([0, 1, 2, 3, 4, 5])
     ds = None
-    if gdal.VSIStatL('/vsimem/jp2openjpeg_42.jp2.aux.xml') is not None:
-        return 'fail'
+    assert gdal.VSIStatL('/vsimem/jp2openjpeg_42.jp2.aux.xml') is None
 
     # Check them
     ds = gdal.Open('/vsimem/jp2openjpeg_42.jp2', gdal.GA_Update)
-    if ds.GetProjectionRef().find('32631') < 0:
-        print(ds.GetProjectionRef())
-        return 'fail'
-    if ds.GetGeoTransform() != (0, 1, 2, 3, 4, 5):
-        print(ds.GetGeoTransform())
-        return 'fail'
+    assert ds.GetProjectionRef().find('32631') >= 0
+    assert ds.GetGeoTransform() == (0, 1, 2, 3, 4, 5)
     # Check that we have a GMLJP2 box
-    if ds.GetMetadataDomainList() != ['xml:gml.root-instance', 'DERIVED_SUBDATASETS']:
-        print(ds.GetMetadataDomainList())
-        return 'fail'
+    assert ds.GetMetadataDomainList() == ['xml:gml.root-instance', 'DERIVED_SUBDATASETS']
     # Remove projection and geotransform
     ds.SetProjection('')
     ds.SetGeoTransform([0, 1, 0, 0, 0, 1])
     ds = None
-    if gdal.VSIStatL('/vsimem/jp2openjpeg_42.jp2.aux.xml') is not None:
-        return 'fail'
+    assert gdal.VSIStatL('/vsimem/jp2openjpeg_42.jp2.aux.xml') is None
 
     # Check we have no longer anything
     ds = gdal.Open('/vsimem/jp2openjpeg_42.jp2', gdal.GA_Update)
-    if ds.GetProjectionRef() != '':
-        print(ds.GetProjectionRef())
-        return 'fail'
-    if ds.GetGeoTransform() != (0, 1, 0, 0, 0, 1):
-        print(ds.GetGeoTransform())
-        return 'fail'
-    if ds.GetMetadataDomainList() != ['DERIVED_SUBDATASETS']:
-        print(ds.GetMetadataDomainList())
-        return 'fail'
+    assert ds.GetProjectionRef() == ''
+    assert ds.GetGeoTransform() == (0, 1, 0, 0, 0, 1)
+    assert ds.GetMetadataDomainList() == ['DERIVED_SUBDATASETS']
     ds = None
 
     # Create file with georef boxes before codestream, and disable GMLJP2
@@ -2076,17 +1829,12 @@ def test_jp2openjpeg_42():
     ds = gdal.Open('/vsimem/jp2openjpeg_42.jp2', gdal.GA_Update)
     ds.SetGeoTransform([1, 2, 3, 4, 5, 6])
     ds = None
-    if gdal.VSIStatL('/vsimem/jp2openjpeg_42.jp2.aux.xml') is not None:
-        return 'fail'
+    assert gdal.VSIStatL('/vsimem/jp2openjpeg_42.jp2.aux.xml') is None
 
     # Check it and that we don't have GMLJP2
     ds = gdal.Open('/vsimem/jp2openjpeg_42.jp2', gdal.GA_Update)
-    if ds.GetGeoTransform() != (1, 2, 3, 4, 5, 6):
-        print(ds.GetGeoTransform())
-        return 'fail'
-    if ds.GetMetadataDomainList() != ['DERIVED_SUBDATASETS']:
-        print(ds.GetMetadataDomainList())
-        return 'fail'
+    assert ds.GetGeoTransform() == (1, 2, 3, 4, 5, 6)
+    assert ds.GetMetadataDomainList() == ['DERIVED_SUBDATASETS']
     ds = None
 
     # Create file with georef boxes before codestream, and disable GeoJP2
@@ -2098,47 +1846,33 @@ def test_jp2openjpeg_42():
 
     # Modify geotransform
     ds = gdal.Open('/vsimem/jp2openjpeg_42.jp2', gdal.GA_Update)
-    if ds.GetGeoTransform() != (2, 3, 0, 4, 0, -5):
-        print(ds.GetGeoTransform())
-        return 'fail'
+    assert ds.GetGeoTransform() == (2, 3, 0, 4, 0, -5)
     ds.SetGeoTransform([1, 2, 0, 3, 0, -4])
     ds = None
-    if gdal.VSIStatL('/vsimem/jp2openjpeg_42.jp2.aux.xml') is not None:
-        return 'fail'
+    assert gdal.VSIStatL('/vsimem/jp2openjpeg_42.jp2.aux.xml') is None
 
     # Check it
     ds = gdal.Open('/vsimem/jp2openjpeg_42.jp2', gdal.GA_Update)
-    if ds.GetGeoTransform() != (1, 2, 0, 3, 0, -4):
-        print(ds.GetGeoTransform())
-        return 'fail'
-    if ds.GetMetadataDomainList() != ['xml:gml.root-instance', 'DERIVED_SUBDATASETS']:
-        print(ds.GetMetadataDomainList())
-        return 'fail'
+    assert ds.GetGeoTransform() == (1, 2, 0, 3, 0, -4)
+    assert ds.GetMetadataDomainList() == ['xml:gml.root-instance', 'DERIVED_SUBDATASETS']
     # Add GCPs
     gcps = [gdal.GCP(0, 1, 2, 3, 4)]
     ds.SetGCPs(gcps, sr.ExportToWkt())
     ds = None
-    if gdal.VSIStatL('/vsimem/jp2openjpeg_42.jp2.aux.xml') is not None:
-        return 'fail'
+    assert gdal.VSIStatL('/vsimem/jp2openjpeg_42.jp2.aux.xml') is None
 
     # Check it (a GeoJP2 box has been added and GMLJP2 removed)
     ds = gdal.Open('/vsimem/jp2openjpeg_42.jp2', gdal.GA_Update)
-    if not ds.GetGCPs():
-        return 'fail'
-    if ds.GetMetadataDomainList() != ['DERIVED_SUBDATASETS']:
-        print(ds.GetMetadataDomainList())
-        return 'fail'
+    assert ds.GetGCPs()
+    assert ds.GetMetadataDomainList() == ['DERIVED_SUBDATASETS']
     # Add IPR box
     ds.SetMetadata(['<fake_ipr_box/>'], 'xml:IPR')
     ds = None
-    if gdal.VSIStatL('/vsimem/jp2openjpeg_42.jp2.aux.xml') is not None:
-        return 'fail'
+    assert gdal.VSIStatL('/vsimem/jp2openjpeg_42.jp2.aux.xml') is None
 
     # Check it
     ds = gdal.Open('/vsimem/jp2openjpeg_42.jp2', gdal.GA_Update)
-    if ds.GetMetadata('xml:IPR')[0] != '<fake_ipr_box/>':
-        print(ds.GetMetadata('xml:IPR'))
-        return 'fail'
+    assert ds.GetMetadata('xml:IPR')[0] == '<fake_ipr_box/>'
     ds = None
 
     gdal.Unlink('/vsimem/jp2openjpeg_42.jp2')
@@ -2152,8 +1886,7 @@ def test_jp2openjpeg_42():
 def test_jp2openjpeg_43():
 
     ret = gdal.GetJPEG2000StructureAsString('data/byte.jp2', ['ALL=YES'])
-    if ret is None:
-        return 'fail'
+    assert ret is not None
 
     return 'success'
 
@@ -2196,10 +1929,8 @@ def test_jp2openjpeg_45():
     # Test GMLJP2V2_DEF=YES
     src_ds = gdal.Open('data/byte.tif')
     out_ds = gdaltest.jp2openjpeg_drv.CreateCopy('/vsimem/jp2openjpeg_45.jp2', src_ds, options=['GMLJP2V2_DEF=YES'])
-    if out_ds.GetLayerCount() != 0:
-        return 'fail'
-    if out_ds.GetLayer(0) is not None:
-        return 'fail'
+    assert out_ds.GetLayerCount() == 0
+    assert out_ds.GetLayer(0) is None
     del out_ds
 
     ds = gdal.Open('/vsimem/jp2openjpeg_45.jp2')
@@ -2262,13 +1993,10 @@ def test_jp2openjpeg_45():
   </gmljp2:featureMember>
 </gmljp2:GMLJP2CoverageCollection>
 """
-    if gmljp2 != minimal_instance:
-        print(gmljp2)
-        return 'fail'
+    assert gmljp2 == minimal_instance
 
     ret = validate('/vsimem/jp2openjpeg_45.jp2', inspire_tg=False)
-    if ret == 'fail':
-        return 'fail'
+    assert ret != 'fail'
 
     gdal.Unlink('/vsimem/jp2openjpeg_45.jp2')
 
@@ -2277,9 +2005,7 @@ def test_jp2openjpeg_45():
     del out_ds
     ds = gdal.Open('/vsimem/jp2openjpeg_45.jp2')
     gmljp2 = ds.GetMetadata_List("xml:gml.root-instance")[0]
-    if gmljp2 != minimal_instance:
-        print(gmljp2)
-        return 'fail'
+    assert gmljp2 == minimal_instance
     ds = None
     gdal.Unlink('/vsimem/jp2openjpeg_45.jp2')
 
@@ -2288,16 +2014,14 @@ def test_jp2openjpeg_45():
     gdal.PushErrorHandler()
     out_ds = gdaltest.jp2openjpeg_drv.CreateCopy('/vsimem/jp2openjpeg_45.jp2', src_ds, options=['GMLJP2V2_DEF={'])
     gdal.PopErrorHandler()
-    if out_ds is not None:
-        return 'fail'
+    assert out_ds is None
 
     # Non existing file
     gdal.ErrorReset()
     gdal.PushErrorHandler()
     out_ds = gdaltest.jp2openjpeg_drv.CreateCopy('/vsimem/jp2openjpeg_45.jp2', src_ds, options=['GMLJP2V2_DEF=/vsimem/i_do_not_exist'])
     gdal.PopErrorHandler()
-    if out_ds is not None:
-        return 'fail'
+    assert out_ds is None
 
     # Test JSon conf file as a file
     gdal.FileFromMemBuffer("/vsimem/conf.json", '{ "root_instance": { "gml_id": "some_gml_id", "crs_url": false } }')
@@ -2306,12 +2030,8 @@ def test_jp2openjpeg_45():
     del out_ds
     ds = gdal.Open('/vsimem/jp2openjpeg_45.jp2')
     gmljp2 = ds.GetMetadata_List("xml:gml.root-instance")[0]
-    if gmljp2.find('some_gml_id') < 0:
-        print(gmljp2)
-        return 'fail'
-    if gmljp2.find('urn:ogc:def:crs:EPSG::26711') < 0:
-        print(gmljp2)
-        return 'fail'
+    assert gmljp2.find('some_gml_id') >= 0
+    assert gmljp2.find('urn:ogc:def:crs:EPSG::26711') >= 0
     ds = None
     gdal.Unlink('/vsimem/jp2openjpeg_45.jp2')
 
@@ -2323,10 +2043,7 @@ def test_jp2openjpeg_45():
         del out_ds
         ds = gdal.Open('/vsimem/jp2openjpeg_45.jp2')
         gmljp2 = ds.GetMetadata_List("xml:gml.root-instance")[0]
-        if gmljp2.find(predefined[1]) < 0:
-            print(predefined[0])
-            print(gmljp2)
-            return 'fail'
+        assert gmljp2.find(predefined[1]) >= 0
         ds = None
         gdal.Unlink('/vsimem/jp2openjpeg_45.jp2')
 
@@ -2338,9 +2055,7 @@ def test_jp2openjpeg_45():
     del out_ds
     ds = gdal.Open('/vsimem/jp2openjpeg_45.jp2')
     gmljp2 = ds.GetMetadata_List("xml:gml.root-instance")[0]
-    if gmljp2.find('<gmlcov:rangeType></gmlcov:rangeType>') < 0:
-        print(gmljp2)
-        return 'fail'
+    assert gmljp2.find('<gmlcov:rangeType></gmlcov:rangeType>') >= 0
     ds = None
     gdal.Unlink('/vsimem/jp2openjpeg_45.jp2')
 
@@ -2360,10 +2075,7 @@ def test_jp2openjpeg_45():
     del out_ds
     ds = gdal.Open('/vsimem/jp2openjpeg_45.jp2')
     gmljp2 = ds.GetMetadata_List("xml:gml.root-instance")[0]
-    if gmljp2.find("custom_datarecord") < 0:
-        print(predefined[0])
-        print(gmljp2)
-        return 'fail'
+    assert gmljp2.find("custom_datarecord") >= 0, predefined[0]
     ds = None
     gdal.Unlink('/vsimem/jp2openjpeg_45.jp2')
 
@@ -2380,8 +2092,7 @@ def test_jp2openjpeg_45():
     gdal.PushErrorHandler()
     out_ds = gdaltest.jp2openjpeg_drv.CreateCopy('/vsimem/jp2openjpeg_45.jp2', src_ds, options=['GMLJP2V2_DEF=' + json.dumps(conf)])
     gdal.PopErrorHandler()
-    if out_ds is not None:
-        return 'fail'
+    assert out_ds is None
 
     conf = {
         "root_instance": {
@@ -2735,15 +2446,11 @@ def test_jp2openjpeg_45():
 
     # Now do the checks
     dircontent = gdal.ReadDir('/vsimem/gmljp2')
-    if dircontent is not None:
-        print(dircontent)
-        return 'fail'
+    assert dircontent is None
 
     ds = gdal.Open('/vsimem/jp2openjpeg_45.jp2')
     gmljp2 = ds.GetMetadata_List("xml:gml.root-instance")[0]
-    if gmljp2.find('my_GMLJP2RectifiedGridCoverage') < 0:
-        print(gmljp2)
-        return 'fail'
+    assert gmljp2.find('my_GMLJP2RectifiedGridCoverage') >= 0
     first_metadata_pos = gmljp2.find("First metadata")
     second_metadata_pos = gmljp2.find("Second metadata")
     third_metadata_pos = gmljp2.find("Third metadata")
@@ -2765,13 +2472,12 @@ def test_jp2openjpeg_45():
     extension3_pos = gmljp2.find("""<extension3 xmlns="http://undefined_namespace" />""")
     extension4_pos = gmljp2.find("""<extension4 xmlns="http://undefined_namespace" />""")
 
-    if first_metadata_pos < 0 or second_metadata_pos < 0 or third_metadata_pos < 0 or \
-       GMLJP2RectifiedGridCoverage_pos < 0 or fourth_metadata_pos < 0 or \
-       feature_pos < 0 or myshape_gml_pos < 0 or myshape2_gml_pos < 0 or \
-       feature2_pos < 0 or myshape_kml_pos < 0 or empty_kml_pos < 0 or \
-       style1_pos < 0 or style2_pos < 0 or style3_pos < 0 or style4_pos < 0 or \
-       extension1_pos < 0 or extension2_pos < 0 or extension3_pos < 0 or extension4_pos < 0 or \
-       not(first_metadata_pos < second_metadata_pos and
+    assert (first_metadata_pos >= 0 and second_metadata_pos >= 0 and third_metadata_pos >= 0 and \
+       GMLJP2RectifiedGridCoverage_pos >= 0 and fourth_metadata_pos >= 0 and \
+       feature_pos >= 0 and myshape_gml_pos >= 0 and myshape2_gml_pos >= 0 and \
+       feature2_pos >= 0 and myshape_kml_pos >= 0 and empty_kml_pos >= 0 and \
+       style1_pos >= 0 and style2_pos >= 0 and style3_pos >= 0 and style4_pos >= 0 and \
+       extension1_pos >= 0 and extension2_pos >= 0 and extension3_pos >= 0 and extension4_pos >= 0 and(first_metadata_pos < second_metadata_pos and
             second_metadata_pos < third_metadata_pos and
             third_metadata_pos < GMLJP2RectifiedGridCoverage_pos and
             GMLJP2RectifiedGridCoverage_pos < fourth_metadata_pos and
@@ -2790,55 +2496,37 @@ def test_jp2openjpeg_45():
             style3_pos < style4_pos and
             style4_pos < extension1_pos and
             extension1_pos < extension3_pos and
-            extension3_pos < extension4_pos):
-        print(gmljp2)
-        return 'fail'
+            extension3_pos < extension4_pos)), \
+        gmljp2
     # print(gmljp2)
 
     myshape_gml = ds.GetMetadata_List("xml:myshape.gml")[0]
-    if myshape_gml.find("""<ogr1:FeatureCollection gml:id="ID_GMLJP2_0_1_aFeatureCollection" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://ogr.maptools.org/1 gmljp2://xml/myshape.xsd" xmlns:ogr1="http://ogr.maptools.org/1" xmlns:gml="http://www.opengis.net/gml/3.2">""") < 0:
-        print(myshape_gml)
-        return 'fail'
-    if myshape_gml.find("""http://www.opengis.net/def/crs/EPSG/0/4326""") < 0:
-        print(myshape_gml)
-        return 'fail'
+    assert myshape_gml.find("""<ogr1:FeatureCollection gml:id="ID_GMLJP2_0_1_aFeatureCollection" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://ogr.maptools.org/1 gmljp2://xml/myshape.xsd" xmlns:ogr1="http://ogr.maptools.org/1" xmlns:gml="http://www.opengis.net/gml/3.2">""") >= 0
+    assert myshape_gml.find("""http://www.opengis.net/def/crs/EPSG/0/4326""") >= 0
 
     myshape_xsd = ds.GetMetadata_List("xml:myshape.xsd")[0]
-    if myshape_xsd.find("""<xs:schema targetNamespace="http://ogr.maptools.org/1" xmlns:ogr1="http://ogr.maptools.org/1" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:gml="http://www.opengis.net/gml/3.2" xmlns:gmlsf="http://www.opengis.net/gmlsf/2.0" elementFormDefault="qualified" version="1.0">""") < 0:
-        print(myshape_xsd)
-        return 'fail'
+    assert myshape_xsd.find("""<xs:schema targetNamespace="http://ogr.maptools.org/1" xmlns:ogr1="http://ogr.maptools.org/1" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:gml="http://www.opengis.net/gml/3.2" xmlns:gmlsf="http://www.opengis.net/gmlsf/2.0" elementFormDefault="qualified" version="1.0">""") >= 0
 
     myshape2_gml = ds.GetMetadata_List("xml:myshape2.gml")[0]
-    if myshape2_gml.find("""<ogr2:FeatureCollection gml:id="ID_GMLJP2_0_2_aFeatureCollection" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://ogr.maptools.org/ gmljp2://xml/a_schema.xsd" xmlns:ogr2="http://ogr.maptools.org/" xmlns:gml="http://www.opengis.net/gml/3.2">""") < 0:
-        print(myshape2_gml)
-        return 'fail'
+    assert myshape2_gml.find("""<ogr2:FeatureCollection gml:id="ID_GMLJP2_0_2_aFeatureCollection" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://ogr.maptools.org/ gmljp2://xml/a_schema.xsd" xmlns:ogr2="http://ogr.maptools.org/" xmlns:gml="http://www.opengis.net/gml/3.2">""") >= 0
 
     feature2_gml = ds.GetMetadata_List("xml:feature2.gml")[0]
-    if feature2_gml.find("""<FeatureCollection xmlns:ogr="http://ogr.maptools.org/" xmlns:gml="http://www.opengis.net/gml/3.2" xsi:schemaLocation="http://ogr.maptools.org/ gmljp2://xml/a_schema.xsd" gml:id="ID_GMLJP2_0_3_myFC3">""") < 0:
-        print(feature2_gml)
-        return 'fail'
+    assert feature2_gml.find("""<FeatureCollection xmlns:ogr="http://ogr.maptools.org/" xmlns:gml="http://www.opengis.net/gml/3.2" xsi:schemaLocation="http://ogr.maptools.org/ gmljp2://xml/a_schema.xsd" gml:id="ID_GMLJP2_0_3_myFC3">""") >= 0
 
     feature3_gml = ds.GetMetadata_List("xml:feature3.gml")[0]
-    if feature3_gml.find("""<FeatureCollection xmlns:ogr="http://ogr.maptools.org/" xmlns:gml="http://www.opengis.net/gml/3.2" xsi:schemaLocation="http://www.opengis.net/gml/3.2 http://schemas.opengis.net/gml/3.2.1/gml.xsd http://ogr.maptools.org/ gmljp2://xml/a_schema.xsd" gml:id="ID_GMLJP2_0_4_myFC4">""") < 0:
-        print(feature3_gml)
-        return 'fail'
+    assert feature3_gml.find("""<FeatureCollection xmlns:ogr="http://ogr.maptools.org/" xmlns:gml="http://www.opengis.net/gml/3.2" xsi:schemaLocation="http://www.opengis.net/gml/3.2 http://schemas.opengis.net/gml/3.2.1/gml.xsd http://ogr.maptools.org/ gmljp2://xml/a_schema.xsd" gml:id="ID_GMLJP2_0_4_myFC4">""") >= 0
 
     myshape2_xsd = ds.GetMetadata_List("xml:a_schema.xsd")[0]
-    if myshape2_xsd.find("""<xs:schema xmlns:ogr="http://ogr.maptools.org/" """) < 0:
-        print(myshape2_xsd)
-        return 'fail'
+    assert myshape2_xsd.find("""<xs:schema xmlns:ogr="http://ogr.maptools.org/" """) >= 0
 
     duplicated_xsd = ds.GetMetadata_List("xml:duplicated.xsd")[0]
-    if duplicated_xsd.find("""<xs:schema xmlns:ogr="http://ogr.maptools.org/" """) < 0:
-        print(myshape2_xsd)
-        return 'fail'
+    assert duplicated_xsd.find("""<xs:schema xmlns:ogr="http://ogr.maptools.org/" """) >= 0, \
+        myshape2_xsd
 
     ds = None
 
     ds = ogr.Open('/vsimem/jp2openjpeg_45.jp2')
-    if ds.GetLayerCount() != 6:
-        print(ds.GetLayerCount())
-        return 'fail'
+    assert ds.GetLayerCount() == 6
     expected_layers = ['FC_GridCoverage_1_myshape',
                        'FC_CoverageCollection_1_Observation',
                        'FC_CoverageCollection_2_myshape',
@@ -2853,8 +2541,7 @@ def test_jp2openjpeg_45():
     ds = None
 
     ret = validate('/vsimem/jp2openjpeg_45.jp2', inspire_tg=False)
-    if ret == 'fail':
-        return 'fail'
+    assert ret != 'fail'
 
     gdal.Unlink('/vsimem/jp2openjpeg_45.jp2')
 
@@ -2864,17 +2551,11 @@ def test_jp2openjpeg_45():
     del out_ds
 
     dircontent = gdal.ReadDir('/vsimem/gmljp2')
-    if dircontent is not None:
-        print(dircontent)
-        return 'fail'
+    assert dircontent is None
 
     ds = ogr.Open('/vsimem/jp2openjpeg_45.jp2')
-    if ds.GetLayerCount() != 1:
-        print(ds.GetLayerCount())
-        return 'fail'
-    if ds.GetLayer(0).GetName() != 'FC_GridCoverage_1_poly':
-        print(ds.GetLayer(0).GetName())
-        return 'fail'
+    assert ds.GetLayerCount() == 1
+    assert ds.GetLayer(0).GetName() == 'FC_GridCoverage_1_poly'
     ds = None
 
     gdal.Unlink('/vsimem/jp2openjpeg_45.jp2')
@@ -2899,9 +2580,7 @@ def test_jp2openjpeg_45():
         return 'fail'
 
     ds = gdal.Open('/vsimem/jp2openjpeg_45.jp2')
-    if ds.GetMetadata() != {'FOO': 'BAR'}:
-        print(ds.GetMetadata())
-        return 'fail'
+    assert ds.GetMetadata() == {'FOO': 'BAR'}
     ds = None
 
     gdal.Unlink('/vsimem/jp2openjpeg_45.jp2')
@@ -2913,8 +2592,7 @@ def test_jp2openjpeg_45():
 
     # Nothing should be reported by default
     ds = ogr.Open('/vsimem/jp2openjpeg_45.jp2')
-    if ds is not None:
-        return 'fail'
+    assert ds is None
     ds = None
 
     # We have to explicitly allow it.
@@ -2925,8 +2603,7 @@ def test_jp2openjpeg_45():
         if gdaltest.gdalurlopen('https://raw.githubusercontent.com/OSGeo/gdal/master/autotest/ogr/data/expected_gml_gml32.gml') is None:
             return 'skip'
         return 'fail'
-    if ds.GetLayerCount() != 1:
-        return 'fail'
+    assert ds.GetLayerCount() == 1
     ds = None
 
     gdal.Unlink('/vsimem/jp2openjpeg_45.jp2.aux.xml')
@@ -3018,10 +2695,7 @@ def test_jp2openjpeg_46():
 
         gdal.Unlink('/vsimem/jp2openjpeg_46.jp2')
 
-        if gmljp2.find('<gmljp2:metadata>') >= 0:
-            print(invalid_template)
-            print(gmljp2)
-            return 'fail'
+        assert gmljp2.find('<gmljp2:metadata>') < 0, invalid_template
 
     # Nonexistent template.
     gdal.FileFromMemBuffer("/vsimem/source.xml", """<A/>""")
@@ -3113,12 +2787,10 @@ def test_jp2openjpeg_47():
     src_ds = gdal.Open('../gcore/data/byte_rpc.tif')
     out_ds = gdaltest.jp2openjpeg_drv.CreateCopy('/vsimem/jp2openjpeg_47.jp2', src_ds)
     del out_ds
-    if gdal.VSIStatL('/vsimem/jp2openjpeg_47.jp2.aux.xml') is not None:
-        return 'fail'
+    assert gdal.VSIStatL('/vsimem/jp2openjpeg_47.jp2.aux.xml') is None
 
     ds = gdal.Open('/vsimem/jp2openjpeg_47.jp2')
-    if ds.GetMetadata('RPC') is None:
-        return 'fail'
+    assert ds.GetMetadata('RPC') is not None
     ds = None
 
     gdal.Unlink('/vsimem/jp2openjpeg_47.jp2')
@@ -3136,11 +2808,8 @@ def test_jp2openjpeg_48():
 
     ds = gdal.Open('data/byte_tile_2048.jp2')
     (blockxsize, blockysize) = ds.GetRasterBand(1).GetBlockSize()
-    if (blockxsize, blockysize) != (20, 20):
-        print(blockxsize, blockysize)
-        return 'fail'
-    if ds.GetRasterBand(1).Checksum() != 4610:
-        return 'fail'
+    assert (blockxsize, blockysize) == (20, 20)
+    assert ds.GetRasterBand(1).Checksum() == 4610
     ds = None
 
     return 'success'
@@ -3185,14 +2854,10 @@ def test_jp2openjpeg_online_2():
 
     ds = gdal.Open('tmp/cache/gcp.jp2')
     ds.GetRasterBand(1).Checksum()
-    if len(ds.GetGCPs()) != 15:
-        gdaltest.post_reason('bad number of GCP')
-        return 'fail'
+    assert len(ds.GetGCPs()) == 15, 'bad number of GCP'
 
     expected_wkt = """GEOGCS["WGS 84",DATUM["WGS_1984",SPHEROID["WGS 84",6378137,298.257223563,AUTHORITY["EPSG","7030"]],AUTHORITY["EPSG","6326"]],PRIMEM["Greenwich",0],UNIT["degree",0.0174532925199433],AUTHORITY["EPSG","4326"]]"""
-    if ds.GetGCPProjection() != expected_wkt:
-        gdaltest.post_reason('bad GCP projection')
-        return 'fail'
+    assert ds.GetGCPProjection() == expected_wkt, 'bad GCP projection'
 
     ds = None
 
@@ -3225,9 +2890,7 @@ def test_jp2openjpeg_online_3():
     ds_ref = None
 
     # Difference between the image before and after compression
-    if maxdiff > 17:
-        gdaltest.post_reason('Image too different from reference')
-        return 'fail'
+    assert maxdiff <= 17, 'Image too different from reference'
 
     return 'success'
 
@@ -3258,9 +2921,7 @@ def test_jp2openjpeg_online_4():
     ds_ref = None
 
     # Difference between the image before and after compression
-    if maxdiff > 10:
-        gdaltest.post_reason('Image too different from reference')
-        return 'fail'
+    assert maxdiff <= 10, 'Image too different from reference'
 
     return 'success'
 
@@ -3278,13 +2939,9 @@ def test_jp2openjpeg_online_5():
 
     ds = gdal.Open('tmp/cache/file9.jp2')
     cs1 = ds.GetRasterBand(1).Checksum()
-    if cs1 != 47664:
-        gdaltest.post_reason('Did not get expected checksums')
-        print(cs1)
-        return 'fail'
-    if ds.GetRasterBand(1).GetColorTable() is None:
-        gdaltest.post_reason('Did not get expected color table')
-        return 'fail'
+    assert cs1 == 47664, 'Did not get expected checksums'
+    assert ds.GetRasterBand(1).GetColorTable() is not None, \
+        'Did not get expected color table'
     ds = None
 
     return 'success'
@@ -3305,10 +2962,8 @@ def test_jp2openjpeg_online_6():
     cs1 = ds.GetRasterBand(1).Checksum()
     cs2 = ds.GetRasterBand(2).Checksum()
     cs3 = ds.GetRasterBand(3).Checksum()
-    if cs1 != 26140 or cs2 != 32689 or cs3 != 48247:
-        print(cs1, cs2, cs3)
-        gdaltest.post_reason('Did not get expected checksums')
-        return 'fail'
+    assert cs1 == 26140 and cs2 == 32689 and cs3 == 48247, \
+        'Did not get expected checksums'
 
     ds = None
 
@@ -3361,16 +3016,14 @@ def test_jp2openjpeg_49():
         gdal.Unlink('/vsimem/byte_nogeoref.j2w')
 
         if gt != expected_gt:
-            gdaltest.post_reason('Did not get expected gt for %s,copy_pam=%s,copy_worldfile=%s' % (config_option_value, str(copy_pam), str(copy_worldfile)))
             print('Got ' + str(gt))
             print('Expected ' + str(expected_gt))
-            return 'fail'
+            pytest.fail('Did not get expected gt for %s,copy_pam=%s,copy_worldfile=%s' % (config_option_value, str(copy_pam), str(copy_worldfile)))
 
         if (expected_srs == '' and srs_wkt != '') or (expected_srs != '' and srs_wkt.find(expected_srs) < 0):
-            gdaltest.post_reason('Did not get expected SRS for %s,copy_pam=%s,copy_worldfile=%s' % (config_option_value, str(copy_pam), str(copy_worldfile)))
             print('Got ' + srs_wkt)
             print('Expected ' + expected_srs)
-            return 'fail'
+            pytest.fail('Did not get expected SRS for %s,copy_pam=%s,copy_worldfile=%s' % (config_option_value, str(copy_pam), str(copy_worldfile)))
 
     tests = [(None, True, True, 'LOCAL_CS["PAM"]', (100.0, 1.0, 0.0, 300.0, 0.0, -1.0)),
              (None, True, False, 'LOCAL_CS["PAM"]', (100.0, 1.0, 0.0, 300.0, 0.0, -1.0)),
@@ -3418,30 +3071,24 @@ def test_jp2openjpeg_49():
         gdal.Unlink('/vsimem/inconsitant_geojp2_gmljp2.j2w')
 
         if gt != expected_gt:
-            gdaltest.post_reason('Did not get expected gt for %s,copy_pam=%s,copy_worldfile=%s' % (config_option_value, str(copy_pam), str(copy_worldfile)))
             print('Got ' + str(gt))
             print('Expected ' + str(expected_gt))
-            return 'fail'
+            pytest.fail('Did not get expected gt for %s,copy_pam=%s,copy_worldfile=%s' % (config_option_value, str(copy_pam), str(copy_worldfile)))
 
         if (expected_srs == '' and srs_wkt != '') or (expected_srs != '' and srs_wkt.find(expected_srs) < 0):
-            gdaltest.post_reason('Did not get expected SRS for %s,copy_pam=%s,copy_worldfile=%s' % (config_option_value, str(copy_pam), str(copy_worldfile)))
             print('Got ' + srs_wkt)
             print('Expected ' + expected_srs)
-            return 'fail'
+            pytest.fail('Did not get expected SRS for %s,copy_pam=%s,copy_worldfile=%s' % (config_option_value, str(copy_pam), str(copy_worldfile)))
 
     ds = gdal.OpenEx('data/inconsitant_geojp2_gmljp2.jp2', open_options=['GEOREF_SOURCES=PAM,WORLDFILE'])
     fl = ds.GetFileList()
-    if set(fl) != set(['data/inconsitant_geojp2_gmljp2.jp2', 'data/inconsitant_geojp2_gmljp2.jp2.aux.xml']):
-        gdaltest.post_reason('Did not get expected filelist')
-        print(fl)
-        return 'fail'
+    assert set(fl) == set(['data/inconsitant_geojp2_gmljp2.jp2', 'data/inconsitant_geojp2_gmljp2.jp2.aux.xml']), \
+        'Did not get expected filelist'
 
     gdal.ErrorReset()
     with gdaltest.error_handler():
         gdal.OpenEx('data/inconsitant_geojp2_gmljp2.jp2', open_options=['GEOREF_SOURCES=unhandled'])
-        if gdal.GetLastErrorMsg() == '':
-            gdaltest.post_reason('expected warning')
-            return 'fail'
+        assert gdal.GetLastErrorMsg() != '', 'expected warning'
 
     return 'success'
 
@@ -3456,15 +3103,10 @@ def test_jp2openjpeg_50():
 
     ds = gdal.Open('data/fake_sent2_preview.jp2')
     blockxsize, blockysize = ds.GetRasterBand(1).GetBlockSize()
-    if blockxsize != ds.RasterXSize or blockysize != ds.RasterYSize:
-        gdaltest.post_reason('expected warning')
-        print(blockxsize, blockysize)
-        return 'fail'
+    assert blockxsize == ds.RasterXSize and blockysize == ds.RasterYSize, \
+        'expected warning'
     cs = ds.GetRasterBand(1).Checksum()
-    if cs != 2046:
-        gdaltest.post_reason('expected warning')
-        print(cs)
-        return 'fail'
+    assert cs == 2046, 'expected warning'
 
     return 'success'
 
@@ -3486,26 +3128,21 @@ def test_jp2openjpeg_codeblock_style():
         gdal.ErrorReset()
         gdaltest.jp2openjpeg_drv.CreateCopy(filename, gdal.Open('data/byte.tif'),
                                             options=options)
-        if gdal.GetLastErrorMsg() != '':
-            return 'fail'
+        assert gdal.GetLastErrorMsg() == ''
         ds = gdal.Open(filename)
         cs = ds.GetRasterBand(1).Checksum()
         ds = None
-        if cs != 4672:
-            print(cs)
-            return 'fail'
+        assert cs == 4672
 
     with gdaltest.error_handler():
         gdaltest.jp2openjpeg_drv.CreateCopy(filename, gdal.Open('data/byte.tif'),
                                             options=['CODEBLOCK_STYLE=64'])
-    if gdal.GetLastErrorMsg() == '':
-        return 'fail'
+    assert gdal.GetLastErrorMsg() != ''
 
     with gdaltest.error_handler():
         gdaltest.jp2openjpeg_drv.CreateCopy(filename, gdal.Open('data/byte.tif'),
                                             options=['CODEBLOCK_STYLE=UNSUPPORTED'])
-    if gdal.GetLastErrorMsg() == '':
-        return 'fail'
+    assert gdal.GetLastErrorMsg() != ''
 
     gdaltest.jp2openjpeg_drv.Delete(filename)
 
@@ -3534,9 +3171,7 @@ def test_jp2openjpeg_external_overviews_single_band():
 
     gdaltest.jp2openjpeg_drv.Delete(filename)
 
-    if cs != 28926:
-        print(cs)
-        return 'fail'
+    assert cs == 28926
 
     return 'success'
 
@@ -3563,9 +3198,7 @@ def test_jp2openjpeg_external_overviews_multiple_band():
 
     gdaltest.jp2openjpeg_drv.Delete(filename)
 
-    if cs != [6233, 7706, 26085]:
-        print(cs)
-        return 'fail'
+    assert cs == [6233, 7706, 26085]
 
     return 'success'
 
diff --git a/autotest/gdrivers/jpeg.py b/autotest/gdrivers/jpeg.py
index 0e64b2958b6a..86b9ec929b21 100755
--- a/autotest/gdrivers/jpeg.py
+++ b/autotest/gdrivers/jpeg.py
@@ -39,6 +39,7 @@
 
 from osgeo import gdal
 from osgeo import gdalconst
+import pytest
 
 ###############################################################################
 # Perform simple read test.
@@ -77,36 +78,29 @@ def test_jpeg_2():
     ds.GetFileList()
 
     try:
-        if (md['EXIF_GPSLatitudeRef'] != 'N' or
+        assert (not (md['EXIF_GPSLatitudeRef'] != 'N' or
                 md['EXIF_GPSLatitude'] != '(41) (1) (22.91)' or
                 md['EXIF_PixelXDimension'] != '361' or
                 md['EXIF_GPSVersionID'] != '0x02 0x00 0x00 0x00' or
                 md['EXIF_ExifVersion'] != '0210' or
-                md['EXIF_XResolution'] != '(96)'):
-            print(md)
-            gdaltest.post_reason('Exif metadata wrong.')
-            return 'fail'
+                md['EXIF_XResolution'] != '(96)')), 'Exif metadata wrong.'
     except KeyError:
         print(md)
         gdaltest.post_reason('Exit metadata apparently missing.')
         return 'fail'
 
-    if ds.GetRasterBand(3).GetRasterColorInterpretation() != gdal.GCI_BlueBand:
-        gdaltest.post_reason('Did not get expected color interpretation.')
-        return 'fail'
+    assert ds.GetRasterBand(3).GetRasterColorInterpretation() == gdal.GCI_BlueBand, \
+        'Did not get expected color interpretation.'
 
     md = ds.GetMetadata('IMAGE_STRUCTURE')
-    if 'INTERLEAVE' not in md or md['INTERLEAVE'] != 'PIXEL':
-        gdaltest.post_reason('missing INTERLEAVE metadata')
-        return 'fail'
-    if 'COMPRESSION' not in md or md['COMPRESSION'] != 'JPEG':
-        gdaltest.post_reason('missing INTERLEAVE metadata')
-        return 'fail'
+    assert 'INTERLEAVE' in md and md['INTERLEAVE'] == 'PIXEL', \
+        'missing INTERLEAVE metadata'
+    assert 'COMPRESSION' in md and md['COMPRESSION'] == 'JPEG', \
+        'missing INTERLEAVE metadata'
 
     md = ds.GetRasterBand(3).GetMetadata('IMAGE_STRUCTURE')
-    if 'COMPRESSION' not in md or md['COMPRESSION'] != 'JPEG':
-        gdaltest.post_reason('missing INTERLEAVE metadata')
-        return 'fail'
+    assert 'COMPRESSION' in md and md['COMPRESSION'] == 'JPEG', \
+        'missing INTERLEAVE metadata'
 
     return 'success'
 
@@ -127,23 +121,16 @@ def test_jpeg_3():
     # IJG, MozJPEG
     expected_cs = [4794, 4787]
 
-    if ds.GetRasterBand(1).Checksum() not in expected_cs:
-        gdaltest.post_reason('Wrong checksum on copied image.')
-        print(ds.GetRasterBand(1).Checksum())
-        return 'fail'
+    assert ds.GetRasterBand(1).Checksum() in expected_cs, \
+        'Wrong checksum on copied image.'
 
-    if ds.GetRasterBand(1).GetRasterColorInterpretation() != gdal.GCI_GrayIndex:
-        gdaltest.post_reason('Wrong color interpretation.')
-        print(ds.GetRasterBand(1).GetRasterColorInterpretation())
-        return 'fail'
+    assert ds.GetRasterBand(1).GetRasterColorInterpretation() == gdal.GCI_GrayIndex, \
+        'Wrong color interpretation.'
 
     expected_gt = [440720.0, 60.0, 0.0, 3751320.0, 0.0, -60.0]
     gt = ds.GetGeoTransform()
     for i in range(6):
-        if abs(gt[i] - expected_gt[i]) > 1e-6:
-            gdaltest.post_reason('did not get expected geotransform from PAM')
-            print(gt)
-            return 'fail'
+        assert abs(gt[i] - expected_gt[i]) <= 1e-6, 'did not get expected geotransform from PAM'
 
     ds = None
 
@@ -159,10 +146,8 @@ def test_jpeg_3():
     expected_gt = [440720.0, 60.0, 0.0, 3751320.0, 0.0, -60.0]
     gt = ds.GetGeoTransform()
     for i in range(6):
-        if abs(gt[i] - expected_gt[i]) > 1e-6:
-            gdaltest.post_reason('did not get expected geotransform from .wld')
-            print(gt)
-            return 'fail'
+        assert abs(gt[i] - expected_gt[i]) <= 1e-6, \
+            'did not get expected geotransform from .wld'
     ds = None
 
     ds = gdal.Open('tmp/byte.jpg')
@@ -195,15 +180,10 @@ def test_jpeg_4():
 
     refband = ds.GetRasterBand(1)
 
-    if refband.GetMaskFlags() != gdalconst.GMF_PER_DATASET:
-        gdaltest.post_reason('wrong mask flags')
-        return 'fail'
+    assert refband.GetMaskFlags() == gdalconst.GMF_PER_DATASET, 'wrong mask flags'
 
     cs = refband.GetMaskBand().Checksum()
-    if cs != 770:
-        gdaltest.post_reason('Wrong mask checksum')
-        print(cs)
-        return 'fail'
+    assert cs == 770, 'Wrong mask checksum'
 
     return 'success'
 
@@ -224,15 +204,10 @@ def test_jpeg_5():
 
     refband = ds2.GetRasterBand(1)
 
-    if refband.GetMaskFlags() != gdalconst.GMF_PER_DATASET:
-        gdaltest.post_reason('wrong mask flags')
-        return 'fail'
+    assert refband.GetMaskFlags() == gdalconst.GMF_PER_DATASET, 'wrong mask flags'
 
     cs = refband.GetMaskBand().Checksum()
-    if cs != 770:
-        gdaltest.post_reason('Wrong checksum on copied images mask.')
-        print(cs)
-        return 'fail'
+    assert cs == 770, 'Wrong checksum on copied images mask.'
 
     refband = None
     ds2 = None
@@ -251,10 +226,8 @@ def test_jpeg_6():
     ds = gdal.Open('data/vophead.jpg')
 
     # Because of the optimization in r17446, we shouldn't yet get this error.
-    if (gdal.GetLastErrorType() == 2 and
-            gdal.GetLastErrorMsg().find('Ignoring EXIF') != -1):
-        gdaltest.post_reason('got error too soon.')
-        return 'fail'
+    assert (not (gdal.GetLastErrorType() == 2 and
+            gdal.GetLastErrorMsg().find('Ignoring EXIF') != -1)), 'got error too soon.'
 
     with gdaltest.error_handler('CPLQuietErrorHandler'):
         # Get this warning:
@@ -262,15 +235,12 @@ def test_jpeg_6():
         md = ds.GetMetadata()
 
     # Did we get an exif related warning?
-    if (gdal.GetLastErrorType() != 2 or
-            gdal.GetLastErrorMsg().find('Ignoring EXIF') == -1):
-        gdaltest.post_reason('did not get expected error.')
-        return 'fail'
+    assert (not (gdal.GetLastErrorType() != 2 or
+            gdal.GetLastErrorMsg().find('Ignoring EXIF') == -1)), \
+        'did not get expected error.'
 
-    if len(md) != 1 or md['EXIF_Software'] != 'IrfanView':
-        gdaltest.post_reason('did not get expected metadata.')
-        print(md)
-        return 'fail'
+    assert len(md) == 1 and md['EXIF_Software'] == 'IrfanView', \
+        'did not get expected metadata.'
 
     ds = None
 
@@ -292,10 +262,8 @@ def test_jpeg_7():
     # IJG, MozJPEG
     expected_cs = [4794, 4787]
 
-    if ds.GetRasterBand(1).Checksum() not in expected_cs:
-        gdaltest.post_reason('Wrong checksum on copied image.')
-        print(ds.GetRasterBand(1).Checksum())
-        return 'fail'
+    assert ds.GetRasterBand(1).Checksum() in expected_cs, \
+        'Wrong checksum on copied image.'
 
     ds = None
     gdal.GetDriverByName('JPEG').Delete('/vsimem/byte.jpg')
@@ -312,45 +280,32 @@ def test_jpeg_8():
 
     expected_cs = 20385
 
-    if ds.GetRasterBand(1).Checksum() != expected_cs:
-        gdaltest.post_reason('Wrong checksum on copied image.')
-        print(ds.GetRasterBand(1).Checksum())
-        return 'fail'
+    assert ds.GetRasterBand(1).Checksum() == expected_cs, \
+        'Wrong checksum on copied image.'
 
-    if ds.GetRasterBand(1).GetRasterColorInterpretation() != gdal.GCI_RedBand:
-        gdaltest.post_reason('Wrong color interpretation.')
-        print(ds.GetRasterBand(1).GetRasterColorInterpretation())
-        return 'fail'
+    assert ds.GetRasterBand(1).GetRasterColorInterpretation() == gdal.GCI_RedBand, \
+        'Wrong color interpretation.'
 
     expected_cs = 20865
 
-    if ds.GetRasterBand(2).Checksum() != expected_cs:
-        gdaltest.post_reason('Wrong checksum on copied image.')
-        print(ds.GetRasterBand(2).Checksum())
-        return 'fail'
+    assert ds.GetRasterBand(2).Checksum() == expected_cs, \
+        'Wrong checksum on copied image.'
 
-    if ds.GetRasterBand(2).GetRasterColorInterpretation() != gdal.GCI_GreenBand:
-        gdaltest.post_reason('Wrong color interpretation.')
-        print(ds.GetRasterBand(2).GetRasterColorInterpretation())
-        return 'fail'
+    assert ds.GetRasterBand(2).GetRasterColorInterpretation() == gdal.GCI_GreenBand, \
+        'Wrong color interpretation.'
 
     expected_cs = 19441
 
-    if ds.GetRasterBand(3).Checksum() != expected_cs:
-        gdaltest.post_reason('Wrong checksum on copied image.')
-        print(ds.GetRasterBand(3).Checksum())
-        return 'fail'
+    assert ds.GetRasterBand(3).Checksum() == expected_cs, \
+        'Wrong checksum on copied image.'
 
-    if ds.GetRasterBand(3).GetRasterColorInterpretation() != gdal.GCI_BlueBand:
-        gdaltest.post_reason('Wrong color interpretation.')
-        print(ds.GetRasterBand(3).GetRasterColorInterpretation())
-        return 'fail'
+    assert ds.GetRasterBand(3).GetRasterColorInterpretation() == gdal.GCI_BlueBand, \
+        'Wrong color interpretation.'
 
     md = ds.GetMetadata('IMAGE_STRUCTURE')
 
-    if 'SOURCE_COLOR_SPACE' not in md or md['SOURCE_COLOR_SPACE'] != 'CMYK':
-        gdaltest.post_reason('missing SOURCE_COLOR_SPACE metadata')
-        return 'fail'
+    assert 'SOURCE_COLOR_SPACE' in md and md['SOURCE_COLOR_SPACE'] == 'CMYK', \
+        'missing SOURCE_COLOR_SPACE metadata'
 
     return 'success'
 
@@ -366,51 +321,35 @@ def test_jpeg_9():
 
     expected_cs = 21187
 
-    if ds.GetRasterBand(1).Checksum() != expected_cs:
-        gdaltest.post_reason('Wrong checksum on copied image.')
-        print(ds.GetRasterBand(1).Checksum())
-        return 'fail'
+    assert ds.GetRasterBand(1).Checksum() == expected_cs, \
+        'Wrong checksum on copied image.'
 
-    if ds.GetRasterBand(1).GetRasterColorInterpretation() != gdal.GCI_CyanBand:
-        gdaltest.post_reason('Wrong color interpretation.')
-        print(ds.GetRasterBand(1).GetRasterColorInterpretation())
-        return 'fail'
+    assert ds.GetRasterBand(1).GetRasterColorInterpretation() == gdal.GCI_CyanBand, \
+        'Wrong color interpretation.'
 
     expected_cs = 21054
 
-    if ds.GetRasterBand(2).Checksum() != expected_cs:
-        gdaltest.post_reason('Wrong checksum on copied image.')
-        print(ds.GetRasterBand(2).Checksum())
-        return 'fail'
+    assert ds.GetRasterBand(2).Checksum() == expected_cs, \
+        'Wrong checksum on copied image.'
 
-    if ds.GetRasterBand(2).GetRasterColorInterpretation() != gdal.GCI_MagentaBand:
-        gdaltest.post_reason('Wrong color interpretation.')
-        print(ds.GetRasterBand(2).GetRasterColorInterpretation())
-        return 'fail'
+    assert ds.GetRasterBand(2).GetRasterColorInterpretation() == gdal.GCI_MagentaBand, \
+        'Wrong color interpretation.'
 
     expected_cs = 21499
 
-    if ds.GetRasterBand(3).Checksum() != expected_cs:
-        gdaltest.post_reason('Wrong checksum on copied image.')
-        print(ds.GetRasterBand(3).Checksum())
-        return 'fail'
+    assert ds.GetRasterBand(3).Checksum() == expected_cs, \
+        'Wrong checksum on copied image.'
 
-    if ds.GetRasterBand(3).GetRasterColorInterpretation() != gdal.GCI_YellowBand:
-        gdaltest.post_reason('Wrong color interpretation.')
-        print(ds.GetRasterBand(3).GetRasterColorInterpretation())
-        return 'fail'
+    assert ds.GetRasterBand(3).GetRasterColorInterpretation() == gdal.GCI_YellowBand, \
+        'Wrong color interpretation.'
 
     expected_cs = 21069
 
-    if ds.GetRasterBand(4).Checksum() != expected_cs:
-        gdaltest.post_reason('Wrong checksum on copied image.')
-        print(ds.GetRasterBand(4).Checksum())
-        return 'fail'
+    assert ds.GetRasterBand(4).Checksum() == expected_cs, \
+        'Wrong checksum on copied image.'
 
-    if ds.GetRasterBand(4).GetRasterColorInterpretation() != gdal.GCI_BlackBand:
-        gdaltest.post_reason('Wrong color interpretation.')
-        print(ds.GetRasterBand(4).GetRasterColorInterpretation())
-        return 'fail'
+    assert ds.GetRasterBand(4).GetRasterColorInterpretation() == gdal.GCI_BlackBand, \
+        'Wrong color interpretation.'
 
     return 'success'
 
@@ -436,12 +375,9 @@ def test_jpeg_10():
         pass
 
     ds = gdal.Open('data/12bit_rose_extract.jpg')
-    if ds.GetRasterBand(1).DataType != gdal.GDT_UInt16:
-        return 'fail'
+    assert ds.GetRasterBand(1).DataType == gdal.GDT_UInt16
     stats = ds.GetRasterBand(1).GetStatistics(0, 1)
-    if stats[2] < 3613 or stats[2] > 3614:
-        print(stats)
-        return 'fail'
+    assert stats[2] >= 3613 and stats[2] <= 3614
     ds = None
 
     try:
@@ -472,12 +408,9 @@ def test_jpeg_11():
     del out_ds
 
     ds = gdal.Open('tmp/jpeg11.jpg')
-    if ds.GetRasterBand(1).DataType != gdal.GDT_UInt16:
-        return 'fail'
+    assert ds.GetRasterBand(1).DataType == gdal.GDT_UInt16
     stats = ds.GetRasterBand(1).GetStatistics(0, 1)
-    if stats[2] < 3613 or stats[2] > 3614:
-        print(stats)
-        return 'fail'
+    assert stats[2] >= 3613 and stats[2] <= 3614
     ds = None
 
     gdal.GetDriverByName('JPEG').Delete('tmp/jpeg11.jpg')
@@ -491,18 +424,15 @@ def test_jpeg_11():
 def test_jpeg_12():
 
     ds = gdal.Open('/vsizip/data/byte_jpg.zip')
-    if ds is None:
-        return 'fail'
+    assert ds is not None
 
     gdal.ErrorReset()
     ds.GetRasterBand(1).Checksum()
-    if gdal.GetLastErrorMsg() != '':
-        return 'fail'
+    assert gdal.GetLastErrorMsg() == ''
 
     gdal.ErrorReset()
     ds.GetRasterBand(1).GetMaskBand().Checksum()
-    if gdal.GetLastErrorMsg() != '':
-        return 'fail'
+    assert gdal.GetLastErrorMsg() == ''
 
     ds = None
 
@@ -517,15 +447,13 @@ def test_jpeg_13():
     src_ds = gdal.Open('data/byte.tif')
     ds = gdal.GetDriverByName('JPEG').CreateCopy(
         '/vsistdout_redirect//vsimem/tmp.jpg', src_ds)
-    if ds.GetRasterBand(1).Checksum() != 0:
-        return 'fail'
+    assert ds.GetRasterBand(1).Checksum() == 0
     ds.ReadRaster(0, 0, 1, 1)
     src_ds = None
     ds = None
 
     ds = gdal.Open('/vsimem/tmp.jpg')
-    if ds is None:
-        return 'fail'
+    assert ds is not None
 
     gdal.Unlink('/vsimem/tmp.jpg')
 
@@ -549,14 +477,12 @@ def test_jpeg_14():
 
     src_ds = gdal.Open('data/12bit_rose_extract.jpg')
     ds = drv.CreateCopy('/vsistdout_redirect//vsimem/tmp.jpg', src_ds)
-    if ds.GetRasterBand(1).Checksum() != 0:
-        return 'fail'
+    assert ds.GetRasterBand(1).Checksum() == 0
     src_ds = None
     ds = None
 
     ds = gdal.Open('/vsimem/tmp.jpg')
-    if ds is None:
-        return 'fail'
+    assert ds is not None
 
     gdal.Unlink('/vsimem/tmp.jpg')
 
@@ -582,14 +508,10 @@ def test_jpeg_16():
     gdal.Unlink('tmp/albania.jpg.ovr')
 
     ds = gdal.Open('tmp/albania.jpg')
-    if ds.GetRasterBand(1).GetOverviewCount() != 1:
-        return 'fail'
-    if ds.GetRasterBand(1).GetOverview(-1) is not None:
-        return 'fail'
-    if ds.GetRasterBand(1).GetOverview(1) is not None:
-        return 'fail'
-    if ds.GetRasterBand(1).GetOverview(0) is None:
-        return 'fail'
+    assert ds.GetRasterBand(1).GetOverviewCount() == 1
+    assert ds.GetRasterBand(1).GetOverview(-1) is None
+    assert ds.GetRasterBand(1).GetOverview(1) is None
+    assert ds.GetRasterBand(1).GetOverview(0) is not None
     # "Internal" overview
 
     cs = ds.GetRasterBand(1).GetOverview(0).Checksum()
@@ -597,38 +519,30 @@ def test_jpeg_16():
         expected_cs = 34218
     else:
         expected_cs = 31892
-    if cs != expected_cs:
-        print(cs)
-        return 'fail'
+    assert cs == expected_cs
 
     # Build external overviews
     ds.BuildOverviews('NEAR', [2, 4])
-    if ds.GetRasterBand(1).GetOverviewCount() != 2:
-        return 'fail'
+    assert ds.GetRasterBand(1).GetOverviewCount() == 2
     # Check updated checksum
     cs = ds.GetRasterBand(1).GetOverview(0).Checksum()
     if gdaltest.jpeg_version in ('8', '9b'):
         expected_cs = 33698
     else:
         expected_cs = 32460
-    if cs != expected_cs:
-        print(cs)
-        return 'fail'
+    assert cs == expected_cs
 
     ds = None
 
     # Check we are using external overviews
     ds = gdal.Open('tmp/albania.jpg')
-    if ds.GetRasterBand(1).GetOverviewCount() != 2:
-        return 'fail'
+    assert ds.GetRasterBand(1).GetOverviewCount() == 2
     cs = ds.GetRasterBand(1).GetOverview(0).Checksum()
     if gdaltest.jpeg_version in ('8', '9b'):
         expected_cs = 33698
     else:
         expected_cs = 32460
-    if cs != expected_cs:
-        print(cs)
-        return 'fail'
+    assert cs == expected_cs
 
     ds = None
 
@@ -642,10 +556,9 @@ def test_jpeg_17():
     gdal.ErrorReset()
     with gdaltest.error_handler('CPLQuietErrorHandler'):
         ds = gdal.Open('data/bogus.jpg')
-        if (ds is not None or
+        assert (not (ds is not None or
             gdal.GetLastErrorType() != gdal.CE_Failure or
-                gdal.GetLastErrorMsg() == ''):
-            return 'fail'
+                gdal.GetLastErrorMsg() == ''))
 
     gdal.ErrorReset()
     ds = gdal.Open('data/byte_corrupted.jpg')
@@ -655,8 +568,7 @@ def test_jpeg_17():
     if (gdal.GetLastErrorType() != gdal.CE_Failure or
             gdal.GetLastErrorMsg() == ''):
         # libjpeg-turbo 1.4.0 doesn't emit errors...
-        if cs != 4925:
-            return 'fail'
+        assert cs == 4925
 
     gdal.ErrorReset()
     ds = gdal.Open('data/byte_corrupted2.jpg')
@@ -665,9 +577,8 @@ def test_jpeg_17():
         #   libjpeg: Corrupt JPEG data: found marker 0x00 instead of RST63
         ds.GetRasterBand(1).Checksum()
 
-    if (gdal.GetLastErrorType() != gdal.CE_Warning or
-            gdal.GetLastErrorMsg() == ''):
-        return 'fail'
+    assert (not (gdal.GetLastErrorType() != gdal.CE_Warning or
+            gdal.GetLastErrorMsg() == ''))
 
     gdal.ErrorReset()
     ds = gdal.Open('data/byte_corrupted2.jpg')
@@ -678,9 +589,8 @@ def test_jpeg_17():
         ds.GetRasterBand(1).Checksum()
         gdal.SetConfigOption('GDAL_ERROR_ON_LIBJPEG_WARNING', None)
 
-    if (gdal.GetLastErrorType() != gdal.CE_Failure or
-            gdal.GetLastErrorMsg() == ''):
-        return 'fail'
+    assert (not (gdal.GetLastErrorType() != gdal.CE_Failure or
+            gdal.GetLastErrorMsg() == ''))
 
     return 'success'
 
@@ -707,40 +617,31 @@ def test_jpeg_18():
 
     line0 = ds.GetRasterBand(1).ReadRaster(0, 0, width, 1)
     data = struct.unpack('B' * width, line0)
-    if abs(data[0] - 0) > 10:
-        return 'fail'
+    assert abs(data[0] - 0) <= 10
     line1023 = ds.GetRasterBand(1).ReadRaster(0, height - 1, width, 1)
     data = struct.unpack('B' * width, line1023)
-    if abs(data[0] - 255) > 10:
-        return 'fail'
+    assert abs(data[0] - 255) <= 10
     line0_ovr1 = ds.GetRasterBand(1).GetOverview(1).ReadRaster(0, 0,
                                                                int(width / 4),
                                                                1)
     data = struct.unpack('B' * (int(width / 4)), line0_ovr1)
-    if abs(data[0] - 0) > 10:
-        return 'fail'
+    assert abs(data[0] - 0) <= 10
     line1023_bis = ds.GetRasterBand(1).ReadRaster(0, height - 1, width, 1)
-    if line1023_bis == line0 or line1023 != line1023_bis:
-        return 'fail'
+    assert line1023_bis != line0 and line1023 == line1023_bis
     line0_bis = ds.GetRasterBand(1).ReadRaster(0, 0, width, 1)
-    if line0 != line0_bis:
-        return 'fail'
+    assert line0 == line0_bis
     line255_ovr1 = ds.GetRasterBand(1).GetOverview(1).ReadRaster(
         0, int(height / 4) - 1, int(width / 4), 1)
     data = struct.unpack('B' * int(width / 4), line255_ovr1)
-    if abs(data[0] - 255) > 10:
-        return 'fail'
+    assert abs(data[0] - 255) <= 10
     line0_bis = ds.GetRasterBand(1).ReadRaster(0, 0, width, 1)
-    if line0 != line0_bis:
-        return 'fail'
+    assert line0 == line0_bis
     line0_ovr1_bis = ds.GetRasterBand(1).GetOverview(1).ReadRaster(
         0, 0, int(width / 4), 1)
-    if line0_ovr1 != line0_ovr1_bis:
-        return 'fail'
+    assert line0_ovr1 == line0_ovr1_bis
     line255_ovr1_bis = ds.GetRasterBand(1).GetOverview(1).ReadRaster(
         0, int(height / 4) - 1, int(width / 4), 1)
-    if line255_ovr1 != line255_ovr1_bis:
-        return 'fail'
+    assert line255_ovr1 == line255_ovr1_bis
 
     gdal.SetCacheMax(oldSize)
 
@@ -792,27 +693,23 @@ def test_jpeg_19():
         gdal.VSIFCloseL(f)
 
         if (width, height, iX) == (24, 25, 8):
-            if data1 != data2:
-                return 'fail'
+            assert data1 == data2
         else:
-            if data1 == data2:
-                return 'fail'
+            assert data1 != data2
 
         # Check the file with the LSB bit mask order
         ds = gdal.Open('/vsimem/jpeg_19.jpg')
         jpg_mask_data = ds.GetRasterBand(1).GetMaskBand().ReadRaster(
             0, 0, width, height)
         ds = None
-        if tiff_mask_data != jpg_mask_data:
-            return 'fail'
+        assert tiff_mask_data == jpg_mask_data
 
         # Check the file with the MSB bit mask order
         ds = gdal.Open('/vsimem/jpeg_19_msb.jpg')
         jpg_mask_data = ds.GetRasterBand(1).GetMaskBand().ReadRaster(
             0, 0, width, height)
         ds = None
-        if tiff_mask_data != jpg_mask_data:
-            return 'fail'
+        assert tiff_mask_data == jpg_mask_data
 
         gdal.GetDriverByName('GTiff').Delete('/vsimem/jpeg_19.tif')
         gdal.GetDriverByName('JPEG').Delete('/vsimem/jpeg_19.jpg')
@@ -831,13 +728,9 @@ def test_jpeg_20():
     ds = None
 
     ds = gdal.Open('/vsimem/jpeg_20.jpg')
-    if ds.GetGCPProjection().find('GEOGCS["WGS 84"') != 0:
-        print(ds.GetGCPProjection())
-        return 'fail'
-    if ds.GetGCPCount() != 4:
-        return 'fail'
-    if len(ds.GetGCPs()) != 4:
-        return 'fail'
+    assert ds.GetGCPProjection().find('GEOGCS["WGS 84"') == 0
+    assert ds.GetGCPCount() == 4
+    assert len(ds.GetGCPs()) == 4
     ds = None
 
     gdal.GetDriverByName('JPEG').Delete('/vsimem/jpeg_20.jpg')
@@ -851,21 +744,15 @@ def test_jpeg_20():
 def test_jpeg_21():
 
     ds = gdal.Open('data/black_with_white_exif_ovr.jpg')
-    if ds.GetRasterBand(1).GetOverviewCount() != 3:
-        print(ds.GetRasterBand(1).GetOverviewCount())
-        return 'fail'
+    assert ds.GetRasterBand(1).GetOverviewCount() == 3
     expected_dim_cs = [[512, 512, 0], [256, 256, 0], [196, 196, 12681]]
     i = 0
     for expected_w, expected_h, expected_cs in expected_dim_cs:
         ovr = ds.GetRasterBand(1).GetOverview(i)
         cs = ovr.Checksum()
-        if (ovr.XSize != expected_w or
+        assert (not (ovr.XSize != expected_w or
             ovr.YSize != expected_h or
-                cs != expected_cs):
-            print(ovr.XSize)
-            print(ovr.YSize)
-            print(cs)
-            return 'fail'
+                cs != expected_cs))
         i = i + 1
     ds = None
 
@@ -882,16 +769,10 @@ def test_jpeg_22():
     ds = gdal.GetDriverByName('JPEG').CreateCopy(
         '/vsimem/jpeg_22.jpg', src_ds, options=['EXIF_THUMBNAIL=YES'])
     src_ds = None
-    if ds.GetRasterBand(1).GetOverviewCount() != 4:
-        print(ds.GetRasterBand(1).GetOverviewCount())
-        return 'fail'
+    assert ds.GetRasterBand(1).GetOverviewCount() == 4
     ovr = ds.GetRasterBand(1).GetOverview(3)
     cs = ovr.Checksum()
-    if ovr.XSize != 128 or ovr.YSize != 64 or cs != 34957:
-        print(ovr.XSize)
-        print(ovr.YSize)
-        print(cs)
-        return 'fail'
+    assert ovr.XSize == 128 and ovr.YSize == 64 and cs == 34957
     ds = None
 
     # With 3 bands
@@ -901,10 +782,7 @@ def test_jpeg_22():
         '/vsimem/jpeg_22.jpg', src_ds, options=['EXIF_THUMBNAIL=YES'])
     src_ds = None
     ovr = ds.GetRasterBand(1).GetOverview(3)
-    if ovr.XSize != 64 or ovr.YSize != 128:
-        print(ovr.XSize)
-        print(ovr.YSize)
-        return 'fail'
+    assert ovr.XSize == 64 and ovr.YSize == 128
     ds = None
 
     # With comment
@@ -915,12 +793,8 @@ def test_jpeg_22():
         options=['COMMENT=foo', 'EXIF_THUMBNAIL=YES', 'THUMBNAIL_WIDTH=40'])
     src_ds = None
     ovr = ds.GetRasterBand(1).GetOverview(3)
-    if ds.GetMetadataItem('COMMENT') != 'foo':
-        return 'fail'
-    if ovr.XSize != 40 or ovr.YSize != 80:
-        print(ovr.XSize)
-        print(ovr.YSize)
-        return 'fail'
+    assert ds.GetMetadataItem('COMMENT') == 'foo'
+    assert ovr.XSize == 40 and ovr.YSize == 80
     ds = None
 
     src_ds = gdal.GetDriverByName('Mem').Create('', 2048, 4096)
@@ -930,10 +804,7 @@ def test_jpeg_22():
         options=['EXIF_THUMBNAIL=YES', 'THUMBNAIL_HEIGHT=60'])
     src_ds = None
     ovr = ds.GetRasterBand(1).GetOverview(3)
-    if ovr.XSize != 30 or ovr.YSize != 60:
-        print(ovr.XSize)
-        print(ovr.YSize)
-        return 'fail'
+    assert ovr.XSize == 30 and ovr.YSize == 60
     ds = None
 
     src_ds = gdal.GetDriverByName('Mem').Create('', 2048, 4096)
@@ -945,10 +816,7 @@ def test_jpeg_22():
                  'THUMBNAIL_HEIGHT=40'])
     src_ds = None
     ovr = ds.GetRasterBand(1).GetOverview(3)
-    if ovr.XSize != 50 or ovr.YSize != 40:
-        print(ovr.XSize)
-        print(ovr.YSize)
-        return 'fail'
+    assert ovr.XSize == 50 and ovr.YSize == 40
     ds = None
 
     gdal.Unlink('/vsimem/jpeg_22.jpg')
@@ -969,8 +837,7 @@ def test_jpeg_23():
         '', ds.RasterXSize, ds.RasterYSize, 3)
     tmp_ds.WriteRaster(0, 0, ds.RasterXSize, ds.RasterYSize, data)
     got_cs = [tmp_ds.GetRasterBand(i + 1).Checksum() for i in range(3)]
-    if cs != got_cs:
-        return 'fail'
+    assert cs == got_cs
 
     # Pixel interleaved
     data = ds.ReadRaster(0, 0, ds.RasterXSize, ds.RasterYSize,
@@ -980,8 +847,7 @@ def test_jpeg_23():
     tmp_ds.WriteRaster(0, 0, ds.RasterXSize, ds.RasterYSize, data,
                        buf_pixel_space=3, buf_band_space=1)
     got_cs = [tmp_ds.GetRasterBand(i + 1).Checksum() for i in range(3)]
-    if cs != got_cs:
-        return 'fail'
+    assert cs == got_cs
 
     # Pixel interleaved with padding
     data = ds.ReadRaster(0, 0, ds.RasterXSize, ds.RasterYSize,
@@ -991,8 +857,7 @@ def test_jpeg_23():
     tmp_ds.WriteRaster(0, 0, ds.RasterXSize, ds.RasterYSize, data,
                        buf_pixel_space=4, buf_band_space=1)
     got_cs = [tmp_ds.GetRasterBand(i + 1).Checksum() for i in range(3)]
-    if cs != got_cs:
-        return 'fail'
+    assert cs == got_cs
 
     return 'success'
 
@@ -1021,10 +886,8 @@ def test_jpeg_24():
 
         expected_cs = 4743
 
-        if ds.GetRasterBand(1).Checksum() != expected_cs:
-            gdaltest.post_reason('Wrong checksum on copied image.')
-            print(ds.GetRasterBand(1).Checksum())
-            return 'fail'
+        assert ds.GetRasterBand(1).Checksum() == expected_cs, \
+            'Wrong checksum on copied image.'
 
         ds = None
         gdal.GetDriverByName('JPEG').Delete('/vsimem/byte.jpg')
@@ -1043,9 +906,8 @@ def test_jpeg_25():
     ds = None
     ds = gdal.Open('/vsimem/byte.jpg')
     if ds.GetMetadataItem('COMMENT') != 'my comment':
-        gdaltest.post_reason('Wrong comment.')
         print(ds.GetMetadata())
-        return 'fail'
+        pytest.fail('Wrong comment.')
 
     ds = None
     gdal.GetDriverByName('JPEG').Delete('/vsimem/byte.jpg')
@@ -1062,8 +924,7 @@ def test_jpeg_26():
     with gdaltest.error_handler():
         ds = gdal.GetDriverByName('JPEG').CreateCopy(
             '/vsimem/jpeg_26.jpg', src_ds)
-    if ds is not None:
-        return 'fail'
+    assert ds is None
     gdal.Unlink('/vsimem/jpeg_26.jpg')
 
     return 'success'
@@ -1082,8 +943,7 @@ def test_jpeg_27():
     ds = gdal.Open('/vsisubfile/146,/vsizip/../gcore/data/eofloop_valid_huff.tif.zip')
     with gdaltest.error_handler():
         cs = ds.GetRasterBand(1).Checksum()
-        if cs != 0 or gdal.GetLastErrorMsg() == '':
-            return 'fail'
+        assert cs == 0 and gdal.GetLastErrorMsg() != ''
 
     # Should error out with 'Scan number...
     gdal.ErrorReset()
@@ -1094,8 +954,7 @@ def test_jpeg_27():
         cs = ds.GetRasterBand(1).Checksum()
         gdal.SetConfigOption('GDAL_ALLOW_LARGE_LIBJPEG_MEM_ALLOC', None)
         gdal.SetConfigOption('GDAL_JPEG_MAX_ALLOWED_SCAN_NUMBER', None)
-        if gdal.GetLastErrorMsg() == '':
-            return 'fail'
+        assert gdal.GetLastErrorMsg() != ''
 
     return 'success'
 
@@ -1112,8 +971,7 @@ def test_jpeg_28():
     ds = gdal.GetDriverByName('JPEG').CreateCopy(tmpfilename, src_ds)
     src_ds = None
     ds = gdal.Open(tmpfilename)
-    if ds.GetMetadata():
-        return 'fail'
+    assert not ds.GetMetadata()
 
     # EXIF tags only
     src_ds = gdal.GetDriverByName('MEM').Create('', 1, 1)
@@ -1143,14 +1001,11 @@ def test_jpeg_28():
     with gdaltest.error_handler():
         gdal.GetDriverByName('JPEG').CreateCopy(tmpfilename, src_ds)
     src_ds = None
-    if gdal.VSIStatL(tmpfilename + '.aux.xml') is not None:
-        return 'fail'
+    assert gdal.VSIStatL(tmpfilename + '.aux.xml') is None
     ds = gdal.Open(tmpfilename)
     got_md = ds.GetMetadata()
     expected_md = {'EXIF_DateTimeDigitized': '0123456789012345678', 'EXIF_DateTimeOriginal': '0123456789012345678', 'EXIF_Orientation': '10', 'EXIF_ApertureValue': '(0)', 'EXIF_YResolution': '(96)', 'EXIF_XResolution': '(96)', 'EXIF_TransferFunction': '0 1 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0', 'EXIF_ExifVersion': '0123', 'EXIF_DateTime': 'dt                 ', 'EXIF_FlashpixVersion': 'ABCD', 'EXIF_ComponentsConfiguration': '0x1f 0x00 0x00 0x00', 'EXIF_Make': 'make', 'EXIF_StandardOutputSensitivity': '123456789', 'EXIF_ResolutionUnit': '2', 'EXIF_CompressedBitsPerPixel': '(0)', 'EXIF_SpatialFrequencyResponse': '0xab 0xcd', 'EXIF_ISOSpeedRatings': '1 2 3'}
-    if got_md != expected_md:
-        print(got_md)
-        return 'fail'
+    assert got_md == expected_md
 
     # Test SRATIONAL
     for val in (-1.5, -1, -0.5, 0, 0.5, 1, 1.5):
@@ -1158,15 +1013,11 @@ def test_jpeg_28():
         src_ds.SetMetadataItem('EXIF_ShutterSpeedValue', str(val))
         gdal.GetDriverByName('JPEG').CreateCopy(tmpfilename, src_ds)
         src_ds = None
-        if gdal.VSIStatL(tmpfilename + '.aux.xml') is not None:
-            return 'fail'
+        assert gdal.VSIStatL(tmpfilename + '.aux.xml') is None
         ds = gdal.Open(tmpfilename)
         got_val = ds.GetMetadataItem('EXIF_ShutterSpeedValue')
         got_val = got_val.replace('(', '').replace(')', '')
-        if float(got_val) != val:
-            print(val)
-            print(ds.GetMetadataItem('EXIF_ShutterSpeedValue'))
-            return 'fail'
+        assert float(got_val) == val, ds.GetMetadataItem('EXIF_ShutterSpeedValue')
 
     # Test RATIONAL
     for val in (0, 0.5, 1, 1.5):
@@ -1174,15 +1025,11 @@ def test_jpeg_28():
         src_ds.SetMetadataItem('EXIF_ApertureValue', str(val))
         gdal.GetDriverByName('JPEG').CreateCopy(tmpfilename, src_ds)
         src_ds = None
-        if gdal.VSIStatL(tmpfilename + '.aux.xml') is not None:
-            return 'fail'
+        assert gdal.VSIStatL(tmpfilename + '.aux.xml') is None
         ds = gdal.Open(tmpfilename)
         got_val = ds.GetMetadataItem('EXIF_ApertureValue')
         got_val = got_val.replace('(', '').replace(')', '')
-        if float(got_val) != val:
-            print(val)
-            print(ds.GetMetadataItem('EXIF_ApertureValue'))
-            return 'fail'
+        assert float(got_val) == val, ds.GetMetadataItem('EXIF_ApertureValue')
 
     # GPS tags only
     src_ds = gdal.GetDriverByName('MEM').Create('', 1, 1)
@@ -1190,13 +1037,10 @@ def test_jpeg_28():
     src_ds.SetMetadataItem('EXIF_GPSLatitude', '49 34 56.5')
     gdal.GetDriverByName('JPEG').CreateCopy(tmpfilename, src_ds)
     src_ds = None
-    if gdal.VSIStatL(tmpfilename + '.aux.xml') is not None:
-        return 'fail'
+    assert gdal.VSIStatL(tmpfilename + '.aux.xml') is None
     ds = gdal.Open(tmpfilename)
     got_md = ds.GetMetadata()
-    if got_md != {'EXIF_GPSLatitudeRef': 'N', 'EXIF_GPSLatitude': '(49) (34) (56.5)'}:
-        print(got_md)
-        return 'fail'
+    assert got_md == {'EXIF_GPSLatitudeRef': 'N', 'EXIF_GPSLatitude': '(49) (34) (56.5)'}
     ds = None
 
     # EXIF and GPS tags
@@ -1205,13 +1049,10 @@ def test_jpeg_28():
     src_ds.SetMetadataItem('EXIF_GPSLatitudeRef', 'N')
     gdal.GetDriverByName('JPEG').CreateCopy(tmpfilename, src_ds)
     src_ds = None
-    if gdal.VSIStatL(tmpfilename + '.aux.xml') is not None:
-        return 'fail'
+    assert gdal.VSIStatL(tmpfilename + '.aux.xml') is None
     ds = gdal.Open(tmpfilename)
     got_md = ds.GetMetadata()
-    if got_md != {'EXIF_ExifVersion': '0231', 'EXIF_GPSLatitudeRef': 'N'}:
-        print(got_md)
-        return 'fail'
+    assert got_md == {'EXIF_ExifVersion': '0231', 'EXIF_GPSLatitudeRef': 'N'}
     ds = None
 
     # EXIF and other metadata
@@ -1222,13 +1063,10 @@ def test_jpeg_28():
     with gdaltest.error_handler():
         gdal.GetDriverByName('JPEG').CreateCopy(tmpfilename, src_ds)
     src_ds = None
-    if gdal.VSIStatL(tmpfilename + '.aux.xml') is None:
-        return 'fail'
+    assert gdal.VSIStatL(tmpfilename + '.aux.xml') is not None
     ds = gdal.Open(tmpfilename)
     got_md = ds.GetMetadata()
-    if got_md != {'EXIF_ExifVersion': '0231', 'EXIF_invalid': 'foo', 'FOO': 'BAR'}:
-        print(got_md)
-        return 'fail'
+    assert got_md == {'EXIF_ExifVersion': '0231', 'EXIF_invalid': 'foo', 'FOO': 'BAR'}
     ds = None
 
     # Too much content for EXIF
@@ -1246,15 +1084,11 @@ def test_jpeg_28():
     gdal.GetDriverByName('JPEG').CreateCopy(tmpfilename, src_ds,
                                             options=['EXIF_THUMBNAIL=YES', 'THUMBNAIL_WIDTH=32', 'THUMBNAIL_HEIGHT=32'])
     src_ds = None
-    if gdal.VSIStatL(tmpfilename + '.aux.xml') is not None:
-        return 'fail'
+    assert gdal.VSIStatL(tmpfilename + '.aux.xml') is None
     ds = gdal.Open(tmpfilename)
     got_md = ds.GetMetadata()
-    if got_md != {'EXIF_ExifVersion': '0231', 'EXIF_GPSLatitudeRef': 'N'}:
-        print(got_md)
-        return 'fail'
-    if ds.GetRasterBand(1).GetOverview(ds.GetRasterBand(1).GetOverviewCount() - 1).XSize != 32:
-        return 'fail'
+    assert got_md == {'EXIF_ExifVersion': '0231', 'EXIF_GPSLatitudeRef': 'N'}
+    assert ds.GetRasterBand(1).GetOverview(ds.GetRasterBand(1).GetOverviewCount() - 1).XSize == 32
     ds = None
 
     gdal.Unlink(tmpfilename)
diff --git a/autotest/gdrivers/jpeg2000.py b/autotest/gdrivers/jpeg2000.py
index b98a1b8d15d1..873abb45bd3c 100755
--- a/autotest/gdrivers/jpeg2000.py
+++ b/autotest/gdrivers/jpeg2000.py
@@ -124,9 +124,7 @@ def test_jpeg2000_3():
     ds_ref = None
 
     # Quite a bit of difference...
-    if maxdiff > 6:
-        gdaltest.post_reason('Image too different from reference')
-        return 'fail'
+    assert maxdiff <= 6, 'Image too different from reference'
 
     return 'success'
 
@@ -206,13 +204,10 @@ def test_jpeg2000_8():
     expected_checksums = [64570, 57277, 56048, 61292]
 
     for i in range(4):
-        if ds.GetRasterBand(i + 1).Checksum() != expected_checksums[i]:
-            gdaltest.post_reason('unexpected checksum (%d) for band %d' % (expected_checksums[i], i + 1))
-            return 'fail'
+        assert ds.GetRasterBand(i + 1).Checksum() == expected_checksums[i], \
+            ('unexpected checksum (%d) for band %d' % (expected_checksums[i], i + 1))
 
-    if ds.GetRasterBand(1).DataType != gdal.GDT_UInt16:
-        gdaltest.post_reason('unexpected data type')
-        return 'fail'
+    assert ds.GetRasterBand(1).DataType == gdal.GDT_UInt16, 'unexpected data type'
 
     return 'success'
 
@@ -228,15 +223,8 @@ def test_jpeg2000_9():
     ds = gdal.Open('data/byte_without_geotransform.jp2')
 
     geotransform = ds.GetGeoTransform()
-    if abs(geotransform[0] - 440720) > 0.1 \
-            or abs(geotransform[1] - 60) > 0.001 \
-            or abs(geotransform[2] - 0) > 0.001 \
-            or abs(geotransform[3] - 3751320) > 0.1 \
-            or abs(geotransform[4] - 0) > 0.001 \
-            or abs(geotransform[5] - -60) > 0.001:
-        print(geotransform)
-        gdaltest.post_reason('geotransform differs from expected')
-        return 'fail'
+    assert abs(geotransform[0] - 440720) <= 0.1 and abs(geotransform[1] - 60) <= 0.001 and abs(geotransform[2] - 0) <= 0.001 and abs(geotransform[3] - 3751320) <= 0.1 and abs(geotransform[4] - 0) <= 0.001 and abs(geotransform[5] - -60) <= 0.001, \
+        'geotransform differs from expected'
 
     ds = None
 
@@ -259,14 +247,10 @@ def test_jpeg2000_10():
     ds = None
 
     ds = gdal.Open('/vsimem/jpeg2000_10_dst.tif')
-    if ds is None:
-        return 'fail'
+    assert ds is not None
     for i in range(src_ds.RasterCount):
-        if ds.GetRasterBand(i + 1).Checksum() != src_ds.GetRasterBand(i + 1).Checksum():
-            gdaltest.post_reason('bad checksum for band %d' % (i + 1))
-            print(ds.GetRasterBand(i + 1).Checksum())
-            print(src_ds.GetRasterBand(i + 1).Checksum())
-            return 'fail'
+        assert ds.GetRasterBand(i + 1).Checksum() == src_ds.GetRasterBand(i + 1).Checksum(), \
+            ('bad checksum for band %d' % (i + 1))
     ds = None
     src_ds = None
 
@@ -286,12 +270,9 @@ def test_jpeg2000_11():
 
     ds = gdal.Open('data/stefan_full_rgba_alpha_1bit.jp2')
     fourth_band = ds.GetRasterBand(4)
-    if fourth_band.GetMetadataItem('NBITS', 'IMAGE_STRUCTURE') is not None:
-        return 'fail'
+    assert fourth_band.GetMetadataItem('NBITS', 'IMAGE_STRUCTURE') is None
     got_cs = fourth_band.Checksum()
-    if got_cs != 8527:
-        print(got_cs)
-        return 'fail'
+    assert got_cs == 8527
     jp2_bands_data = ds.ReadRaster(0, 0, ds.RasterXSize, ds.RasterYSize)
     jp2_fourth_band_data = fourth_band.ReadRaster(0, 0, ds.RasterXSize, ds.RasterYSize)
     fourth_band.ReadRaster(0, 0, ds.RasterXSize, ds.RasterYSize, int(ds.RasterXSize / 16), int(ds.RasterYSize / 16))
@@ -304,20 +285,15 @@ def test_jpeg2000_11():
     # gtiff_fourth_band_subsampled_data = fourth_band.ReadRaster(0,0,ds.RasterXSize,ds.RasterYSize,ds.RasterXSize/16,ds.RasterYSize/16)
     tmp_ds = None
     gdal.GetDriverByName('GTiff').Delete('/vsimem/jpeg2000_11.tif')
-    if got_cs != 8527:
-        print(got_cs)
-        return 'fail'
+    assert got_cs == 8527
 
-    if jp2_bands_data != gtiff_bands_data:
-        return 'fail'
+    assert jp2_bands_data == gtiff_bands_data
 
-    if jp2_fourth_band_data != gtiff_fourth_band_data:
-        return 'fail'
+    assert jp2_fourth_band_data == gtiff_fourth_band_data
 
     ds = gdal.OpenEx('data/stefan_full_rgba_alpha_1bit.jp2', open_options=['1BIT_ALPHA_PROMOTION=NO'])
     fourth_band = ds.GetRasterBand(4)
-    if fourth_band.GetMetadataItem('NBITS', 'IMAGE_STRUCTURE') != '1':
-        return 'fail'
+    assert fourth_band.GetMetadataItem('NBITS', 'IMAGE_STRUCTURE') == '1'
 
     return 'success'
 
@@ -361,14 +337,10 @@ def test_jpeg2000_online_2():
 
     ds = gdal.Open('tmp/cache/gcp.jp2')
     ds.GetRasterBand(1).Checksum()
-    if len(ds.GetGCPs()) != 15:
-        gdaltest.post_reason('bad number of GCP')
-        return 'fail'
+    assert len(ds.GetGCPs()) == 15, 'bad number of GCP'
 
     expected_wkt = """GEOGCS["WGS 84",DATUM["WGS_1984",SPHEROID["WGS 84",6378137,298.257223563,AUTHORITY["EPSG","7030"]],AUTHORITY["EPSG","6326"]],PRIMEM["Greenwich",0],UNIT["degree",0.0174532925199433],AUTHORITY["EPSG","4326"]]"""
-    if ds.GetGCPProjection() != expected_wkt:
-        gdaltest.post_reason('bad GCP projection')
-        return 'fail'
+    assert ds.GetGCPProjection() == expected_wkt, 'bad GCP projection'
 
     ds = None
 
@@ -402,9 +374,7 @@ def test_jpeg2000_online_3():
     ds_ref = None
 
     # Difference between the image before and after compression
-    if maxdiff > 17:
-        gdaltest.post_reason('Image too different from reference')
-        return 'fail'
+    assert maxdiff <= 17, 'Image too different from reference'
 
     return 'success'
 
@@ -439,9 +409,7 @@ def test_jpeg2000_online_4():
     ds_ref = None
 
     # Difference between the image before and after compression
-    if maxdiff > 17:
-        gdaltest.post_reason('Image too different from reference')
-        return 'fail'
+    assert maxdiff <= 17, 'Image too different from reference'
 
     return 'success'
 
@@ -461,10 +429,8 @@ def test_jpeg2000_online_5():
     cs1 = ds.GetRasterBand(1).Checksum()
     cs2 = ds.GetRasterBand(2).Checksum()
     cs3 = ds.GetRasterBand(3).Checksum()
-    if cs1 != 48954 or cs2 != 4939 or cs3 != 17734:
-        print(cs1, cs2, cs3)
-        gdaltest.post_reason('Did not get expected checksums')
-        return 'fail'
+    assert cs1 == 48954 and cs2 == 4939 and cs3 == 17734, \
+        'Did not get expected checksums'
 
     ds = None
 
@@ -486,10 +452,8 @@ def test_jpeg2000_online_6():
     cs1 = ds.GetRasterBand(1).Checksum()
     cs2 = ds.GetRasterBand(2).Checksum()
     cs3 = ds.GetRasterBand(3).Checksum()
-    if cs1 != 25337 or cs2 != 28262 or cs3 != 59580:
-        print(cs1, cs2, cs3)
-        gdaltest.post_reason('Did not get expected checksums')
-        return 'fail'
+    assert cs1 == 25337 and cs2 == 28262 and cs3 == 59580, \
+        'Did not get expected checksums'
 
     ds = None
 
diff --git a/autotest/gdrivers/jpeg_profile.py b/autotest/gdrivers/jpeg_profile.py
index 8396f5a9090a..9a197acdd9f6 100755
--- a/autotest/gdrivers/jpeg_profile.py
+++ b/autotest/gdrivers/jpeg_profile.py
@@ -62,8 +62,7 @@ def test_jpeg_copy_icc():
     ds = None
     ds2 = None
 
-    if md['SOURCE_ICC_PROFILE'] != icc:
-        return 'fail'
+    assert md['SOURCE_ICC_PROFILE'] == icc
 
     # Check again with dataset from Open()
     ds2 = gdal.Open('tmp/icc_test.jpg')
@@ -71,8 +70,7 @@ def test_jpeg_copy_icc():
     ds = None
     ds2 = None
 
-    if md['SOURCE_ICC_PROFILE'] != icc:
-        return 'fail'
+    assert md['SOURCE_ICC_PROFILE'] == icc
 
     driver_tiff.Delete('tmp/icc_test.tiff')
     driver.Delete('tmp/icc_test.jpg')
@@ -103,8 +101,7 @@ def test_jpeg_copy_options_icc():
     ds = None
     ds2 = None
 
-    if md['SOURCE_ICC_PROFILE'] != icc:
-        return 'fail'
+    assert md['SOURCE_ICC_PROFILE'] == icc
 
     # Check again with dataset from Open()
     ds2 = gdal.Open('tmp/icc_test.jpg')
@@ -112,8 +109,7 @@ def test_jpeg_copy_options_icc():
     ds = None
     ds2 = None
 
-    if md['SOURCE_ICC_PROFILE'] != icc:
-        return 'fail'
+    assert md['SOURCE_ICC_PROFILE'] == icc
 
     driver_tiff.Delete('tmp/icc_test.tiff')
     driver.Delete('tmp/icc_test.jpg')
@@ -157,11 +153,9 @@ def test_jpeg_copy_icc_64K():
     except OSError:
         pass
 
-    if comment != 'foo':
-        return 'fail'
+    assert comment == 'foo'
 
-    if md['SOURCE_ICC_PROFILE'] != icc:
-        return 'fail'
+    assert md['SOURCE_ICC_PROFILE'] == icc
 
     # Check again with dataset from Open()
     ds2 = gdal.Open('tmp/icc_test.jpg')
@@ -174,8 +168,7 @@ def test_jpeg_copy_icc_64K():
     except OSError:
         pass
 
-    if md['SOURCE_ICC_PROFILE'] != icc:
-        return 'fail'
+    assert md['SOURCE_ICC_PROFILE'] == icc
 
     # Check again with GetMetadataItem()
     ds2 = gdal.Open('tmp/icc_test.jpg')
@@ -188,8 +181,7 @@ def test_jpeg_copy_icc_64K():
     except OSError:
         pass
 
-    if source_icc_profile != icc:
-        return 'fail'
+    assert source_icc_profile == icc
 
     driver_tiff.Delete('tmp/icc_test.tiff')
     driver.Delete('tmp/icc_test.jpg')
diff --git a/autotest/gdrivers/jpipkak.py b/autotest/gdrivers/jpipkak.py
index d9775334b55b..25ea150e9855 100755
--- a/autotest/gdrivers/jpipkak.py
+++ b/autotest/gdrivers/jpipkak.py
@@ -48,18 +48,14 @@ def test_jpipkak_1():
         return 'skip'
 
     ds = gdal.Open('jpip://216.150.195.220/JP2Server/qb_boulder_msi_uint')
-    if ds is None:
-        gdaltest.post_reason('failed to open jpip stream.')
-        return 'fail'
+    assert ds is not None, 'failed to open jpip stream.'
 
     target = ds.GetRasterBand(3).GetOverview(3)
 
     stats = target.GetStatistics(0, 1)
 
-    if abs(stats[2] - 6791.121) > 1.0 or abs(stats[3] - 3046.536) > 1.0:
-        print(stats)
-        gdaltest.post_reason('did not get expected mean/stddev')
-        return 'fail'
+    assert abs(stats[2] - 6791.121) <= 1.0 and abs(stats[3] - 3046.536) <= 1.0, \
+        'did not get expected mean/stddev'
 
     return 'success'
 
@@ -76,24 +72,19 @@ def test_jpipkak_2():
         return 'skip'
 
     ds = gdal.Open('jpip://216.150.195.220/JP2Server/qb_boulder_pan_byte')
-    if ds is None:
-        gdaltest.post_reason('failed to open jpip stream.')
-        return 'fail'
+    assert ds is not None, 'failed to open jpip stream.'
 
     wkt = ds.GetProjectionRef()
     exp_wkt = 'PROJCS["WGS 84 / UTM zone 13N",GEOGCS["WGS 84",DATUM["WGS_1984",SPHEROID["WGS 84",6378137,298.257223563,AUTHORITY["EPSG","7030"]],AUTHORITY["EPSG","6326"]],PRIMEM["Greenwich",0],UNIT["degree",0.0174532925199433],AUTHORITY["EPSG","4326"]],PROJECTION["Transverse_Mercator"],PARAMETER["latitude_of_origin",0],PARAMETER["central_meridian",-105],PARAMETER["scale_factor",0.9996],PARAMETER["false_easting",500000],PARAMETER["false_northing",0],UNIT["metre",1,AUTHORITY["EPSG","9001"]],AUTHORITY["EPSG","32613"]]'
 
-    if not gdaltest.equal_srs_from_wkt(exp_wkt, wkt):
-        return 'fail'
+    assert gdaltest.equal_srs_from_wkt(exp_wkt, wkt)
 
     target = ds.GetRasterBand(1).GetOverview(3)
 
     stats = target.GetStatistics(0, 1)
 
-    if abs(stats[2] - 43.429) > 1.0 or abs(stats[3] - 18.526) > 1.0:
-        print(stats)
-        gdaltest.post_reason('did not get expected mean/stddev')
-        return 'fail'
+    assert abs(stats[2] - 43.429) <= 1.0 and abs(stats[3] - 18.526) <= 1.0, \
+        'did not get expected mean/stddev'
 
     return 'success'
 
@@ -110,18 +101,14 @@ def test_jpipkak_3():
         return 'skip'
 
     ds = gdal.Open('jpip://216.150.195.220/JP2Server/qb_boulder_pan_11bit')
-    if ds is None:
-        gdaltest.post_reason('failed to open jpip stream.')
-        return 'fail'
+    assert ds is not None, 'failed to open jpip stream.'
 
     target = ds.GetRasterBand(1)
 
     stats = target.GetStatistics(0, 1)
 
-    if abs(stats[2] - 483.501) > 1.0 or abs(stats[3] - 117.972) > 1.0:
-        print(stats)
-        gdaltest.post_reason('did not get expected mean/stddev')
-        return 'fail'
+    assert abs(stats[2] - 483.501) <= 1.0 and abs(stats[3] - 117.972) <= 1.0, \
+        'did not get expected mean/stddev'
 
     return 'success'
 
@@ -138,18 +125,14 @@ def test_jpipkak_4():
         return 'skip'
 
     ds = gdal.Open('jpip://216.150.195.220/JP2Server/qb_boulder_pan_20bit')
-    if ds is None:
-        gdaltest.post_reason('failed to open jpip stream.')
-        return 'fail'
+    assert ds is not None, 'failed to open jpip stream.'
 
     target = ds.GetRasterBand(1)
 
     stats = target.GetStatistics(0, 1)
 
-    if abs(stats[2] - 5333.148) > 1.0 or abs(stats[3] - 2522.023) > 1.0:
-        print(stats)
-        gdaltest.post_reason('did not get expected mean/stddev')
-        return 'fail'
+    assert abs(stats[2] - 5333.148) <= 1.0 and abs(stats[3] - 2522.023) <= 1.0, \
+        'did not get expected mean/stddev'
 
     return 'success'
 
@@ -166,18 +149,14 @@ def test_jpipkak_5():
         return 'skip'
 
     ds = gdal.Open('jpip://216.150.195.220/JP2Server/qb_boulder_pan_byte')
-    if ds is None:
-        gdaltest.post_reason('failed to open jpip stream.')
-        return 'fail'
+    assert ds is not None, 'failed to open jpip stream.'
 
     target = ds.GetRasterBand(1).GetOverview(1)
 
     stats = target.GetStatistics(0, 1)
 
-    if abs(stats[2] - 42.462) > 1.0 or abs(stats[3] - 20.611) > 1.0:
-        print(stats)
-        gdaltest.post_reason('did not get expected mean/stddev')
-        return 'fail'
+    assert abs(stats[2] - 42.462) <= 1.0 and abs(stats[3] - 20.611) <= 1.0, \
+        'did not get expected mean/stddev'
 
     return 'success'
 
diff --git a/autotest/gdrivers/kea.py b/autotest/gdrivers/kea.py
index f9a6faa23df0..826a436cfc70 100755
--- a/autotest/gdrivers/kea.py
+++ b/autotest/gdrivers/kea.py
@@ -34,6 +34,7 @@
 
 
 import gdaltest
+import pytest
 
 ###############################################################################
 
@@ -109,17 +110,13 @@ def test_kea_4():
     gdal.PushErrorHandler('CPLQuietErrorHandler')
     ds = gdaltest.kea_driver.Create("/non_existing_path/non_existing_path", 1, 1)
     gdal.PopErrorHandler()
-    if ds is not None:
-        return 'fail'
+    assert ds is None
 
     src_ds = gdaltest.kea_driver.Create('tmp/src.kea', 1, 1, 0)
-    if src_ds is None:
-        return 'fail'
+    assert src_ds is not None
     ds = gdaltest.kea_driver.CreateCopy("tmp/out.kea", src_ds)
-    if ds is None:
-        return 'fail'
-    if ds.RasterCount != 0:
-        return 'fail'
+    assert ds is not None
+    assert ds.RasterCount == 0
     src_ds = None
     ds = None
 
@@ -132,14 +129,12 @@ def test_kea_4():
     gdal.PushErrorHandler('CPLQuietErrorHandler')
     ret = ds.SetProjection('a')
     gdal.PopErrorHandler()
-    if ret == 0:
-        return 'fail'
+    assert ret != 0
 
     gdal.PushErrorHandler('CPLQuietErrorHandler')
     ret = ds.SetGeoTransform([1, 2, 3, 4, 5, 6])
     gdal.PopErrorHandler()
-    if ret == 0:
-        return 'fail'
+    assert ret != 0
 
     # Disabled for now since some of them cause memory leaks or
     # crash in the HDF5 library finalizer
@@ -147,46 +142,39 @@ def test_kea_4():
         gdal.PushErrorHandler('CPLQuietErrorHandler')
         ret = ds.SetMetadataItem('foo', 'bar')
         gdal.PopErrorHandler()
-        if ret == 0:
-            return 'fail'
+        assert ret != 0
 
         gdal.PushErrorHandler('CPLQuietErrorHandler')
         ret = ds.SetMetadata({'foo': 'bar'})
         gdal.PopErrorHandler()
-        if ret == 0:
-            return 'fail'
+        assert ret != 0
 
         gdal.PushErrorHandler('CPLQuietErrorHandler')
         ret = ds.GetRasterBand(1).SetMetadataItem('foo', 'bar')
         gdal.PopErrorHandler()
-        if ret == 0:
-            return 'fail'
+        assert ret != 0
 
         gdal.PushErrorHandler('CPLQuietErrorHandler')
         ret = ds.GetRasterBand(1).SetMetadata({'foo': 'bar'})
         gdal.PopErrorHandler()
-        if ret == 0:
-            return 'fail'
+        assert ret != 0
 
         gdal.PushErrorHandler('CPLQuietErrorHandler')
         ret = ds.SetGCPs([], "")
         gdal.PopErrorHandler()
-        if ret == 0:
-            return 'fail'
+        assert ret != 0
 
     gdal.PushErrorHandler('CPLQuietErrorHandler')
     ret = ds.AddBand(gdal.GDT_Byte)
     gdal.PopErrorHandler()
-    if ret == 0:
-        return 'fail'
+    assert ret != 0
 
     ds.GetRasterBand(1).WriteRaster(0, 0, 1, 1, '\0')
     gdal.ErrorReset()
     gdal.PushErrorHandler('CPLQuietErrorHandler')
     ds.FlushCache()
     gdal.PopErrorHandler()
-    if ds.GetRasterBand(1).Checksum() != 3:
-        return 'fail'
+    assert ds.GetRasterBand(1).Checksum() == 3
 
     ds = None
 
@@ -209,21 +197,12 @@ def test_kea_5():
     ds = gdaltest.kea_driver.Create("tmp/out.kea", 100, 100, 3, options=options)
     ds = None
     ds = gdal.Open('tmp/out.kea')
-    if ds.GetRasterBand(1).GetBlockSize() != [15, 15]:
-        print(ds.GetRasterBand(1).GetBlockSize())
-        return 'fail'
-    if ds.GetRasterBand(1).GetMetadataItem('LAYER_TYPE') != 'thematic':
-        print(ds.GetRasterBand(1).GetMetadata())
-        return 'fail'
-    if ds.GetRasterBand(1).Checksum() != 0:
-        print(ds.GetRasterBand(1).Checksum())
-        return 'fail'
-    if ds.GetGeoTransform() != (0, 1, 0, 0, 0, -1):
-        print(ds.GetGeoTransform())
-        return 'fail'
-    if ds.GetProjectionRef() != '':
-        print(ds.GetProjectionRef())
-        return 'fail'
+    assert ds.GetRasterBand(1).GetBlockSize() == [15, 15]
+    assert ds.GetRasterBand(1).GetMetadataItem('LAYER_TYPE') == 'thematic', \
+        ds.GetRasterBand(1).GetMetadata()
+    assert ds.GetRasterBand(1).Checksum() == 0
+    assert ds.GetGeoTransform() == (0, 1, 0, 0, 0, -1)
+    assert ds.GetProjectionRef() == ''
     ds = None
     gdaltest.kea_driver.Delete('tmp/out.kea')
 
@@ -246,66 +225,34 @@ def test_kea_6():
     ds.GetRasterBand(3).SetMetadata({'LAYER_TYPE': 'athematic'})
     ds.GetRasterBand(4).SetMetadataItem('LAYER_TYPE', 'thematic')
     ds.GetRasterBand(5).SetMetadataItem('LAYER_TYPE', 'athematic')
-    if ds.SetMetadata({'foo': 'bar'}, 'other_domain') == 0:
-        return 'fail'
-    if ds.SetMetadataItem('foo', 'bar', 'other_domain') == 0:
-        return 'fail'
-    if ds.GetRasterBand(1).SetMetadata({'foo': 'bar'}, 'other_domain') == 0:
-        return 'fail'
-    if ds.GetRasterBand(1).SetMetadataItem('foo', 'bar', 'other_domain') == 0:
-        return 'fail'
+    assert ds.SetMetadata({'foo': 'bar'}, 'other_domain') != 0
+    assert ds.SetMetadataItem('foo', 'bar', 'other_domain') != 0
+    assert ds.GetRasterBand(1).SetMetadata({'foo': 'bar'}, 'other_domain') != 0
+    assert ds.GetRasterBand(1).SetMetadataItem('foo', 'bar', 'other_domain') != 0
     ds = None
 
     ds = gdal.Open('tmp/out.kea')
-    if ds.GetMetadata('other_domain') != {}:
-        print(ds.GetMetadata('other_domain'))
-        return 'fail'
-    if ds.GetMetadataItem('item', 'other_domain') is not None:
-        return 'fail'
-    if ds.GetRasterBand(1).GetMetadata('other_domain') != {}:
-        return 'fail'
-    if ds.GetRasterBand(1).GetMetadataItem('item', 'other_domain') is not None:
-        return 'fail'
+    assert ds.GetMetadata('other_domain') == {}
+    assert ds.GetMetadataItem('item', 'other_domain') is None
+    assert ds.GetRasterBand(1).GetMetadata('other_domain') == {}
+    assert ds.GetRasterBand(1).GetMetadataItem('item', 'other_domain') is None
     md = ds.GetMetadata()
-    if md['foo'] != 'bar':
-        print(md)
-        return 'fail'
-    if ds.GetMetadataItem('foo') != 'bar':
-        print(ds.GetMetadataItem('foo'))
-        return 'fail'
-    if ds.GetMetadataItem('bar') != 'baw':
-        print(ds.GetMetadataItem('bar'))
-        return 'fail'
-    if ds.GetRasterBand(1).GetDescription() != 'desc':
-        return 'fail'
+    assert md['foo'] == 'bar'
+    assert ds.GetMetadataItem('foo') == 'bar'
+    assert ds.GetMetadataItem('bar') == 'baw'
+    assert ds.GetRasterBand(1).GetDescription() == 'desc'
     md = ds.GetRasterBand(1).GetMetadata()
-    if md['bar'] != 'baz':
-        print(md)
-        return 'fail'
-    if ds.GetRasterBand(1).GetMetadataItem('bar') != 'baz':
-        print(ds.GetRasterBand(1).GetMetadataItem('bar'))
-        return 'fail'
-    if ds.GetRasterBand(2).GetMetadataItem('LAYER_TYPE') != 'thematic':
-        print(ds.GetRasterBand(2).GetMetadataItem('LAYER_TYPE'))
-        return 'fail'
-    if ds.GetRasterBand(3).GetMetadataItem('LAYER_TYPE') != 'athematic':
-        print(ds.GetRasterBand(3).GetMetadataItem('LAYER_TYPE'))
-        return 'fail'
-    if ds.GetRasterBand(4).GetMetadataItem('LAYER_TYPE') != 'thematic':
-        print(ds.GetRasterBand(4).GetMetadataItem('LAYER_TYPE'))
-        return 'fail'
-    if ds.GetRasterBand(5).GetMetadataItem('LAYER_TYPE') != 'athematic':
-        print(ds.GetRasterBand(5).GetMetadataItem('LAYER_TYPE'))
-        return 'fail'
+    assert md['bar'] == 'baz'
+    assert ds.GetRasterBand(1).GetMetadataItem('bar') == 'baz'
+    assert ds.GetRasterBand(2).GetMetadataItem('LAYER_TYPE') == 'thematic'
+    assert ds.GetRasterBand(3).GetMetadataItem('LAYER_TYPE') == 'athematic'
+    assert ds.GetRasterBand(4).GetMetadataItem('LAYER_TYPE') == 'thematic'
+    assert ds.GetRasterBand(5).GetMetadataItem('LAYER_TYPE') == 'athematic'
     out2_ds = gdaltest.kea_driver.CreateCopy('tmp/out2.kea', ds)
     ds = None
 
-    if out2_ds.GetMetadataItem('foo') != 'bar':
-        print(out2_ds.GetMetadataItem('foo'))
-        return 'fail'
-    if out2_ds.GetRasterBand(1).GetMetadataItem('bar') != 'baz':
-        print(out2_ds.GetRasterBand(1).GetMetadataItem('bar'))
-        return 'fail'
+    assert out2_ds.GetMetadataItem('foo') == 'bar'
+    assert out2_ds.GetRasterBand(1).GetMetadataItem('bar') == 'baz'
 
     out2_ds = None
 
@@ -324,25 +271,17 @@ def test_kea_7():
 
     # Geotransform
     ds = gdaltest.kea_driver.Create("tmp/out.kea", 1, 1)
-    if ds.GetGCPCount() != 0:
-        return 'fail'
-    if ds.SetGeoTransform([1, 2, 3, 4, 5, 6]) != 0:
-        return 'fail'
-    if ds.SetProjection('foo') != 0:
-        return 'fail'
+    assert ds.GetGCPCount() == 0
+    assert ds.SetGeoTransform([1, 2, 3, 4, 5, 6]) == 0
+    assert ds.SetProjection('foo') == 0
     ds = None
 
     ds = gdal.Open('tmp/out.kea')
     out2_ds = gdaltest.kea_driver.CreateCopy('tmp/out2.kea', ds)
     ds = None
-    if out2_ds.GetGCPCount() != 0:
-        return 'fail'
-    if out2_ds.GetGeoTransform() != (1, 2, 3, 4, 5, 6):
-        print(out2_ds.GetGeoTransform())
-        return 'fail'
-    if out2_ds.GetProjectionRef() != 'foo':
-        print(out2_ds.GetProjectionRef())
-        return 'fail'
+    assert out2_ds.GetGCPCount() == 0
+    assert out2_ds.GetGeoTransform() == (1, 2, 3, 4, 5, 6)
+    assert out2_ds.GetProjectionRef() == 'foo'
     out2_ds = None
 
     gdaltest.kea_driver.Delete('tmp/out.kea')
@@ -362,19 +301,14 @@ def test_kea_7():
     out2_ds = gdaltest.kea_driver.CreateCopy('tmp/out2.kea', ds)
     ds = None
 
-    if out2_ds.GetGCPCount() != 2:
-        return 'fail'
-    if out2_ds.GetGCPProjection() != 'foo':
-        return 'fail'
+    assert out2_ds.GetGCPCount() == 2
+    assert out2_ds.GetGCPProjection() == 'foo'
     got_gcps = out2_ds.GetGCPs()
     for i in range(2):
-        if got_gcps[i].GCPX != gcps[i].GCPX or got_gcps[i].GCPY != gcps[i].GCPY or \
-           got_gcps[i].GCPZ != gcps[i].GCPZ or got_gcps[i].GCPPixel != gcps[i].GCPPixel or \
-           got_gcps[i].GCPLine != gcps[i].GCPLine or got_gcps[i].Id != gcps[i].Id or \
-           got_gcps[i].Info != gcps[i].Info:
-            print(i)
-            print(got_gcps[i])
-            return 'fail'
+        assert (got_gcps[i].GCPX == gcps[i].GCPX and got_gcps[i].GCPY == gcps[i].GCPY and \
+           got_gcps[i].GCPZ == gcps[i].GCPZ and got_gcps[i].GCPPixel == gcps[i].GCPPixel and \
+           got_gcps[i].GCPLine == gcps[i].GCPLine and got_gcps[i].Id == gcps[i].Id and \
+           got_gcps[i].Info == gcps[i].Info)
     out2_ds = None
 
     gdaltest.kea_driver.Delete('tmp/out.kea')
@@ -392,32 +326,25 @@ def test_kea_8():
 
     for i in range(2):
         ds = gdaltest.kea_driver.Create("tmp/out.kea", 1, 1)
-        if ds.GetRasterBand(1).GetColorTable() is not None:
-            return 'fail'
-        if ds.GetRasterBand(1).SetColorTable(None) == 0:  # not allowed by the driver
-            return 'fail'
+        assert ds.GetRasterBand(1).GetColorTable() is None
+        assert ds.GetRasterBand(1).SetColorTable(None) != 0
         ct = gdal.ColorTable()
         ct.SetColorEntry(0, (0, 255, 0, 255))
         ct.SetColorEntry(1, (255, 0, 255, 255))
         ct.SetColorEntry(2, (0, 0, 255, 255))
-        if ds.GetRasterBand(1).SetColorTable(ct) != 0:
-            return 'fail'
+        assert ds.GetRasterBand(1).SetColorTable(ct) == 0
         if i == 1:
             # And again
-            if ds.GetRasterBand(1).SetColorTable(ct) != 0:
-                return 'fail'
+            assert ds.GetRasterBand(1).SetColorTable(ct) == 0
         ds = None
 
         ds = gdal.Open('tmp/out.kea')
         out2_ds = gdaltest.kea_driver.CreateCopy('tmp/out2.kea', ds)
         ds = None
         got_ct = out2_ds.GetRasterBand(1).GetColorTable()
-        if got_ct.GetCount() != 3:
-            gdaltest.post_reason('Got wrong color table entry count.')
-            return 'fail'
-        if got_ct.GetColorEntry(1) != (255, 0, 255, 255):
-            gdaltest.post_reason('Got wrong color table entry.')
-            return 'fail'
+        assert got_ct.GetCount() == 3, 'Got wrong color table entry count.'
+        assert got_ct.GetColorEntry(1) == (255, 0, 255, 255), \
+            'Got wrong color table entry.'
 
         out2_ds = None
 
@@ -435,8 +362,7 @@ def test_kea_9():
         return 'skip'
 
     ds = gdaltest.kea_driver.Create("tmp/out.kea", 1, 1, gdal.GCI_YCbCr_CrBand - gdal.GCI_GrayIndex + 1)
-    if ds.GetRasterBand(1).GetColorInterpretation() != gdal.GCI_GrayIndex:
-        return 'fail'
+    assert ds.GetRasterBand(1).GetColorInterpretation() == gdal.GCI_GrayIndex
     for i in range(gdal.GCI_GrayIndex, gdal.GCI_YCbCr_CrBand + 1):
         ds.GetRasterBand(i).SetColorInterpretation(i)
     ds = None
@@ -445,11 +371,8 @@ def test_kea_9():
     out2_ds = gdaltest.kea_driver.CreateCopy('tmp/out2.kea', ds)
     ds = None
     for i in range(gdal.GCI_GrayIndex, gdal.GCI_YCbCr_CrBand + 1):
-        if out2_ds.GetRasterBand(i).GetColorInterpretation() != i:
-            gdaltest.post_reason('Got wrong color interpretation.')
-            print(i)
-            print(out2_ds.GetRasterBand(i).GetColorInterpretation())
-            return 'fail'
+        assert out2_ds.GetRasterBand(i).GetColorInterpretation() == i, \
+            'Got wrong color interpretation.'
 
     out2_ds = None
 
@@ -490,30 +413,24 @@ def test_kea_10():
                                   (gdal.GDT_Float32, 0.5, 0.5),
                                   ]:
         ds = gdaltest.kea_driver.Create("tmp/out.kea", 1, 1, 1, dt)
-        if ds.GetRasterBand(1).GetNoDataValue() is not None:
-            return 'fail'
+        assert ds.GetRasterBand(1).GetNoDataValue() is None
         ds.GetRasterBand(1).SetNoDataValue(nd)
         if ds.GetRasterBand(1).GetNoDataValue() != expected_nd:
-            gdaltest.post_reason('Got wrong nodata.')
             print(dt)
-            print(ds.GetRasterBand(1).GetNoDataValue())
-            return 'fail'
+            pytest.fail('Got wrong nodata.')
         ds = None
 
         ds = gdal.Open('tmp/out.kea')
         out2_ds = gdaltest.kea_driver.CreateCopy('tmp/out2.kea', ds)
         ds = None
         if out2_ds.GetRasterBand(1).GetNoDataValue() != expected_nd:
-            gdaltest.post_reason('Got wrong nodata.')
             print(dt)
-            print(out2_ds.GetRasterBand(1).GetNoDataValue())
-            return 'fail'
+            pytest.fail('Got wrong nodata.')
         out2_ds.GetRasterBand(1).DeleteNoDataValue()
         out2_ds = None
 
         ds = gdal.Open('tmp/out2.kea')
-        if ds.GetRasterBand(1).GetNoDataValue() is not None:
-            return 'fail'
+        assert ds.GetRasterBand(1).GetNoDataValue() is None
         ds = None
 
         gdaltest.kea_driver.Delete('tmp/out.kea')
@@ -533,19 +450,14 @@ def test_kea_11():
     ds = None
 
     ds = gdal.Open('tmp/out.kea', gdal.GA_Update)
-    if ds.AddBand(gdal.GDT_Byte) != 0:
-        return 'fail'
-    if ds.AddBand(gdal.GDT_Int16, options=['DEFLATE=9']) != 0:
-        return 'fail'
+    assert ds.AddBand(gdal.GDT_Byte) == 0
+    assert ds.AddBand(gdal.GDT_Int16, options=['DEFLATE=9']) == 0
     ds = None
 
     ds = gdal.Open('tmp/out.kea')
-    if ds.RasterCount != 3:
-        return 'fail'
-    if ds.GetRasterBand(2).DataType != gdal.GDT_Byte:
-        return 'fail'
-    if ds.GetRasterBand(3).DataType != gdal.GDT_Int16:
-        return 'fail'
+    assert ds.RasterCount == 3
+    assert ds.GetRasterBand(2).DataType == gdal.GDT_Byte
+    assert ds.GetRasterBand(3).DataType == gdal.GDT_Int16
     ds = None
 
     gdaltest.kea_driver.Delete('tmp/out.kea')
@@ -561,14 +473,11 @@ def test_kea_12():
         return 'skip'
 
     ds = gdaltest.kea_driver.Create("tmp/out.kea", 1, 1, 1, gdal.GDT_Byte)
-    if ds.GetRasterBand(1).GetDefaultRAT().GetColumnCount() != 0:
-        return 'fail'
-    if ds.GetRasterBand(1).SetDefaultRAT(None) == 0:  # not allowed by the driver
-        return 'fail'
+    assert ds.GetRasterBand(1).GetDefaultRAT().GetColumnCount() == 0
+    assert ds.GetRasterBand(1).SetDefaultRAT(None) != 0
     rat = ds.GetRasterBand(1).GetDefaultRAT()
     rat.CreateColumn('col_real_generic', gdal.GFT_Real, gdal.GFU_Generic)
-    if ds.GetRasterBand(1).SetDefaultRAT(rat) != 0:
-        return 'fail'
+    assert ds.GetRasterBand(1).SetDefaultRAT(rat) == 0
     rat = ds.GetRasterBand(1).GetDefaultRAT()
     rat.CreateColumn('col_integer_pixelcount', gdal.GFT_Real, gdal.GFU_PixelCount)
     rat.CreateColumn('col_string_name', gdal.GFT_String, gdal.GFU_Name)
@@ -591,8 +500,7 @@ def test_kea_12():
     rat.SetValueAsInt(0, 3, 123)
 
     cloned_rat = rat.Clone()
-    if ds.GetRasterBand(1).SetDefaultRAT(rat) != 0:
-        return 'fail'
+    assert ds.GetRasterBand(1).SetDefaultRAT(rat) == 0
     ds = None
 
     ds = gdal.Open('tmp/out.kea')
@@ -600,38 +508,21 @@ def test_kea_12():
     rat = out2_ds.GetRasterBand(1).GetDefaultRAT()
 
     for i in range(7):
-        if rat.GetColOfUsage(rat.GetUsageOfCol(i)) != i:
-            print(i)
-            print(rat.GetColOfUsage(rat.GetUsageOfCol(i)))
-            return 'fail'
-
-    if cloned_rat.GetNameOfCol(0) != 'col_real_generic':
-        return 'fail'
-    if cloned_rat.GetTypeOfCol(0) != gdal.GFT_Real:
-        return 'fail'
-    if cloned_rat.GetUsageOfCol(0) != gdal.GFU_Generic:
-        return 'fail'
-    if cloned_rat.GetUsageOfCol(1) != gdal.GFU_PixelCount:
-        return 'fail'
-    if cloned_rat.GetTypeOfCol(2) != gdal.GFT_String:
-        return 'fail'
-    if cloned_rat.GetTypeOfCol(3) != gdal.GFT_Integer:
-        return 'fail'
-
-    if rat.GetColumnCount() != cloned_rat.GetColumnCount():
-        return 'fail'
-    if rat.GetRowCount() != cloned_rat.GetRowCount():
-        return 'fail'
+        assert rat.GetColOfUsage(rat.GetUsageOfCol(i)) == i
+
+    assert cloned_rat.GetNameOfCol(0) == 'col_real_generic'
+    assert cloned_rat.GetTypeOfCol(0) == gdal.GFT_Real
+    assert cloned_rat.GetUsageOfCol(0) == gdal.GFU_Generic
+    assert cloned_rat.GetUsageOfCol(1) == gdal.GFU_PixelCount
+    assert cloned_rat.GetTypeOfCol(2) == gdal.GFT_String
+    assert cloned_rat.GetTypeOfCol(3) == gdal.GFT_Integer
+
+    assert rat.GetColumnCount() == cloned_rat.GetColumnCount()
+    assert rat.GetRowCount() == cloned_rat.GetRowCount()
     for i in range(rat.GetColumnCount()):
-        if rat.GetNameOfCol(i) != cloned_rat.GetNameOfCol(i):
-            return 'fail'
-        if rat.GetTypeOfCol(i) != cloned_rat.GetTypeOfCol(i):
-            return 'fail'
-        if rat.GetUsageOfCol(i) != cloned_rat.GetUsageOfCol(i):
-            print(i)
-            print(rat.GetUsageOfCol(i))
-            print(cloned_rat.GetUsageOfCol(i))
-            return 'fail'
+        assert rat.GetNameOfCol(i) == cloned_rat.GetNameOfCol(i)
+        assert rat.GetTypeOfCol(i) == cloned_rat.GetTypeOfCol(i)
+        assert rat.GetUsageOfCol(i) == cloned_rat.GetUsageOfCol(i)
 
     gdal.PushErrorHandler('CPLQuietErrorHandler')
 
@@ -661,27 +552,17 @@ def test_kea_12():
 
     gdal.PopErrorHandler()
 
-    if rat.GetValueAsDouble(0, 0) != 1.23:
-        return 'fail'
-    if rat.GetValueAsInt(0, 0) != 1:
-        return 'fail'
-    if rat.GetValueAsString(0, 0) != '1.23':
-        print(rat.GetValueAsString(0, 0))
-        return 'fail'
-
-    if rat.GetValueAsInt(0, 3) != 123:
-        return 'fail'
-    if rat.GetValueAsDouble(0, 3) != 123:
-        return 'fail'
-    if rat.GetValueAsString(0, 3) != '123':
-        return 'fail'
-
-    if rat.GetValueAsString(0, 2) != 'foo':
-        return 'fail'
-    if rat.GetValueAsInt(0, 2) != 0:
-        return 'fail'
-    if rat.GetValueAsDouble(0, 2) != 0:
-        return 'fail'
+    assert rat.GetValueAsDouble(0, 0) == 1.23
+    assert rat.GetValueAsInt(0, 0) == 1
+    assert rat.GetValueAsString(0, 0) == '1.23'
+
+    assert rat.GetValueAsInt(0, 3) == 123
+    assert rat.GetValueAsDouble(0, 3) == 123
+    assert rat.GetValueAsString(0, 3) == '123'
+
+    assert rat.GetValueAsString(0, 2) == 'foo'
+    assert rat.GetValueAsInt(0, 2) == 0
+    assert rat.GetValueAsDouble(0, 2) == 0
 
     ds = None
     out2_ds = None
@@ -706,18 +587,12 @@ def test_kea_13():
     ds = None
     ds = gdal.Open('tmp/out.kea')
     out2_ds = gdaltest.kea_driver.CreateCopy('tmp/out2.kea', ds)  # yes CreateCopy() of KEA copies overviews
-    if out2_ds.GetRasterBand(1).GetOverviewCount() != 1:
-        return 'fail'
-    if out2_ds.GetRasterBand(1).GetOverview(0).Checksum() != 1087:
-        return 'fail'
-    if out2_ds.GetRasterBand(1).GetOverview(0).GetDefaultRAT() is not None:
-        return 'fail'
-    if out2_ds.GetRasterBand(1).GetOverview(0).SetDefaultRAT(None) == 0:
-        return 'fail'
-    if out2_ds.GetRasterBand(1).GetOverview(-1) is not None:
-        return 'fail'
-    if out2_ds.GetRasterBand(1).GetOverview(1) is not None:
-        return 'fail'
+    assert out2_ds.GetRasterBand(1).GetOverviewCount() == 1
+    assert out2_ds.GetRasterBand(1).GetOverview(0).Checksum() == 1087
+    assert out2_ds.GetRasterBand(1).GetOverview(0).GetDefaultRAT() is None
+    assert out2_ds.GetRasterBand(1).GetOverview(0).SetDefaultRAT(None) != 0
+    assert out2_ds.GetRasterBand(1).GetOverview(-1) is None
+    assert out2_ds.GetRasterBand(1).GetOverview(1) is None
     out2_ds = None
     ds = None
 
@@ -735,30 +610,19 @@ def test_kea_14():
         return 'skip'
 
     ds = gdaltest.kea_driver.Create("tmp/out.kea", 1, 1, 1, gdal.GDT_Byte)
-    if ds.GetRasterBand(1).GetMaskFlags() != gdal.GMF_ALL_VALID:
-        return 'fail'
-    if ds.GetRasterBand(1).GetMaskBand().Checksum() != 3:
-        print(ds.GetRasterBand(1).GetMaskBand().Checksum())
-        return 'fail'
+    assert ds.GetRasterBand(1).GetMaskFlags() == gdal.GMF_ALL_VALID
+    assert ds.GetRasterBand(1).GetMaskBand().Checksum() == 3
     ds.GetRasterBand(1).CreateMaskBand(0)
-    if ds.GetRasterBand(1).GetMaskFlags() != 0:
-        return 'fail'
-    if ds.GetRasterBand(1).GetMaskBand().Checksum() != 3:
-        print(ds.GetRasterBand(1).GetMaskBand().Checksum())
-        return 'fail'
+    assert ds.GetRasterBand(1).GetMaskFlags() == 0
+    assert ds.GetRasterBand(1).GetMaskBand().Checksum() == 3
     ds.GetRasterBand(1).GetMaskBand().Fill(0)
-    if ds.GetRasterBand(1).GetMaskBand().Checksum() != 0:
-        print(ds.GetRasterBand(1).GetMaskBand().Checksum())
-        return 'fail'
+    assert ds.GetRasterBand(1).GetMaskBand().Checksum() == 0
     ds = None
 
     ds = gdal.Open('tmp/out.kea')
     out2_ds = gdaltest.kea_driver.CreateCopy('tmp/out2.kea', ds)  # yes CreateCopy() of KEA copies overviews
-    if out2_ds.GetRasterBand(1).GetMaskFlags() != 0:
-        return 'fail'
-    if out2_ds.GetRasterBand(1).GetMaskBand().Checksum() != 0:
-        print(out2_ds.GetRasterBand(1).GetMaskBand().Checksum())
-        return 'fail'
+    assert out2_ds.GetRasterBand(1).GetMaskFlags() == 0
+    assert out2_ds.GetRasterBand(1).GetMaskBand().Checksum() == 0
     out2_ds = None
     ds = None
 
diff --git a/autotest/gdrivers/kmlsuperoverlay.py b/autotest/gdrivers/kmlsuperoverlay.py
index e08c75b5f0d1..2fbdc0e2de5c 100755
--- a/autotest/gdrivers/kmlsuperoverlay.py
+++ b/autotest/gdrivers/kmlsuperoverlay.py
@@ -145,10 +145,8 @@ def test_kmlsuperoverlay_4():
 
     src_ds = gdal.Open("/vsimem/src.vrt")
     ds = gdal.GetDriverByName('KMLSUPEROVERLAY').CreateCopy('/vsimem/kmlsuperoverlay_4.kmz', src_ds, options=['FORMAT=PNG', 'NAME=myname', 'DESCRIPTION=mydescription', 'ALTITUDE=10', 'ALTITUDEMODE=absolute'])
-    if ds.GetMetadataItem('NAME') != 'myname':
-        return 'fail'
-    if ds.GetMetadataItem('DESCRIPTION') != 'mydescription':
-        return 'fail'
+    assert ds.GetMetadataItem('NAME') == 'myname'
+    assert ds.GetMetadataItem('DESCRIPTION') == 'mydescription'
     if ds.GetRasterBand(1).GetOverviewCount() != 1:
         ds = None
         src_ds = None
@@ -247,9 +245,8 @@ def test_kmlsuperoverlay_5():
             east = tag.find('{http://earth.google.com/kml/2.1}east').text
             west = tag.find('{http://earth.google.com/kml/2.1}west').text
 
-            if float(east) < float(west):
-                gdaltest.post_reason('East is less than west in LatLonAltBox %s, (%s < %s)' % (f, east, west))
-                return 'fail'
+            assert float(east) >= float(west), \
+                ('East is less than west in LatLonAltBox %s, (%s < %s)' % (f, east, west))
 
     shutil.rmtree('tmp/0')
     shutil.rmtree('tmp/1')
@@ -264,27 +261,18 @@ def test_kmlsuperoverlay_5():
 def test_kmlsuperoverlay_6():
 
     ds = gdal.Open('data/kmlimage.kmz')
-    if ds.GetProjectionRef().find('WGS_1984') < 0:
-        return 'fail'
+    assert ds.GetProjectionRef().find('WGS_1984') >= 0
     got_gt = ds.GetGeoTransform()
     ref_gt = [1.2554125761846773, 1.6640895429971981e-05, 0.0, 43.452120815728101, 0.0, -1.0762348187666334e-05]
     for i in range(6):
-        if abs(got_gt[i] - ref_gt[i]) > 1e-6:
-            print(got_gt)
-            return 'fail'
+        assert abs(got_gt[i] - ref_gt[i]) <= 1e-6
     for i in range(4):
         cs = ds.GetRasterBand(i + 1).Checksum()
-        if cs != 47673:
-            print(cs)
-            return 'fail'
-        if ds.GetRasterBand(i + 1).GetRasterColorInterpretation() != gdal.GCI_RedBand + i:
-            return 'fail'
-    if ds.GetRasterBand(1).GetOverviewCount() != 1:
-        return 'fail'
+        assert cs == 47673
+        assert ds.GetRasterBand(i + 1).GetRasterColorInterpretation() == gdal.GCI_RedBand + i
+    assert ds.GetRasterBand(1).GetOverviewCount() == 1
     cs = ds.GetRasterBand(1).GetOverview(0).Checksum()
-    if cs != 61070:
-        print(cs)
-        return 'fail'
+    assert cs == 61070
 
     return 'success'
 
@@ -295,21 +283,15 @@ def test_kmlsuperoverlay_6():
 def test_kmlsuperoverlay_7():
 
     ds = gdal.Open('data/small_world.kml')
-    if ds.GetProjectionRef().find('WGS_1984') < 0:
-        return 'fail'
+    assert ds.GetProjectionRef().find('WGS_1984') >= 0
     got_gt = ds.GetGeoTransform()
     ref_gt = [-180.0, 0.9, 0.0, 90.0, 0.0, -0.9]
     for i in range(6):
-        if abs(got_gt[i] - ref_gt[i]) > 1e-6:
-            print(got_gt)
-            return 'fail'
+        assert abs(got_gt[i] - ref_gt[i]) <= 1e-6
 
     cs = ds.GetRasterBand(1).Checksum()
-    if cs != 30111:
-        print(cs)
-        return 'fail'
-    if ds.GetRasterBand(1).GetRasterColorInterpretation() != gdal.GCI_RedBand:
-        return 'fail'
+    assert cs == 30111
+    assert ds.GetRasterBand(1).GetRasterColorInterpretation() == gdal.GCI_RedBand
 
     return 'success'
 
@@ -401,14 +383,10 @@ def test_kmlsuperoverlay_8():
     del ds
     src_ds = None
 
-    if set(os.listdir('tmp/0/0')) != set(('0.kml', '0.png')):
-        return 'fail'
-    if set(os.listdir('tmp/3/1')) != set(('0.jpg', '0.kml', '1.jpg', '1.kml', '2.jpg', '2.kml', '3.jpg', '3.kml',
-                                          '4.jpg', '4.kml', '5.jpg', '5.kml', '6.jpg', '6.kml', '7.jpg', '7.kml',)):
-        return 'fail'
-    if set(os.listdir('tmp/3/2')) != set():
-        # dir should be empty - 3/2 is entirely transparent so we skip generating files.
-        return 'fail'
+    assert set(os.listdir('tmp/0/0')) == set(('0.kml', '0.png'))
+    assert (set(os.listdir('tmp/3/1')) == set(('0.jpg', '0.kml', '1.jpg', '1.kml', '2.jpg', '2.kml', '3.jpg', '3.kml',
+                                          '4.jpg', '4.kml', '5.jpg', '5.kml', '6.jpg', '6.kml', '7.jpg', '7.kml',)))
+    assert set(os.listdir('tmp/3/2')) == set()
 
     shutil.rmtree('tmp/0')
     shutil.rmtree('tmp/1')
diff --git a/autotest/gdrivers/l1b.py b/autotest/gdrivers/l1b.py
index e92346183842..270702a9ba6c 100755
--- a/autotest/gdrivers/l1b.py
+++ b/autotest/gdrivers/l1b.py
@@ -94,20 +94,14 @@ def test_l1b_geoloc():
         'Y_BAND': '2',
         'Y_DATASET': 'L1BGCPS_INTERPOL:"tmp/cache/n12gac8bit.l1b"'}
     for key in expected_md:
-        if md[key] != expected_md[key]:
-            print(md)
-            return 'fail'
+        assert md[key] == expected_md[key]
     ds = None
 
     ds = gdal.Open('L1BGCPS_INTERPOL:"tmp/cache/n12gac8bit.l1b"')
     cs = ds.GetRasterBand(1).Checksum()
-    if cs != 62397:
-        print(cs)
-        return 'fail'
+    assert cs == 62397
     cs = ds.GetRasterBand(2).Checksum()
-    if cs != 52616:
-        print(cs)
-        return 'fail'
+    assert cs == 52616
 
     return 'success'
 
@@ -128,16 +122,12 @@ def test_l1b_solar_zenith_angles_before_noaa_15():
         'SUBDATASET_1_DESC': 'Solar zenith angles'
     }
     for key in expected_md:
-        if md[key] != expected_md[key]:
-            print(md)
-            return 'fail'
+        assert md[key] == expected_md[key]
     ds = None
 
     ds = gdal.Open('L1B_SOLAR_ZENITH_ANGLES:"tmp/cache/n12gac10bit.l1b"')
     cs = ds.GetRasterBand(1).Checksum()
-    if cs != 22924:
-        print(cs)
-        return 'fail'
+    assert cs == 22924
 
     return 'success'
 
@@ -160,13 +150,9 @@ def test_l1b_metadata_before_noaa_15():
 
     f = open('tmp/n12gac10bit.l1b_metadata.csv', 'rb')
     ln = f.readline().decode('ascii')
-    if ln != 'SCANLINE,NBLOCKYOFF,YEAR,DAY,MS_IN_DAY,FATAL_FLAG,TIME_ERROR,DATA_GAP,DATA_JITTER,INSUFFICIENT_DATA_FOR_CAL,NO_EARTH_LOCATION,DESCEND,P_N_STATUS,BIT_SYNC_STATUS,SYNC_ERROR,FRAME_SYNC_ERROR,FLYWHEELING,BIT_SLIPPAGE,C3_SBBC,C4_SBBC,C5_SBBC,TIP_PARITY_FRAME_1,TIP_PARITY_FRAME_2,TIP_PARITY_FRAME_3,TIP_PARITY_FRAME_4,TIP_PARITY_FRAME_5,SYNC_ERRORS,CAL_SLOPE_C1,CAL_INTERCEPT_C1,CAL_SLOPE_C2,CAL_INTERCEPT_C2,CAL_SLOPE_C3,CAL_INTERCEPT_C3,CAL_SLOPE_C4,CAL_INTERCEPT_C4,CAL_SLOPE_C5,CAL_INTERCEPT_C5,NUM_SOLZENANGLES_EARTHLOCPNTS\n':
-        print(ln)
-        return 'fail'
+    assert ln == 'SCANLINE,NBLOCKYOFF,YEAR,DAY,MS_IN_DAY,FATAL_FLAG,TIME_ERROR,DATA_GAP,DATA_JITTER,INSUFFICIENT_DATA_FOR_CAL,NO_EARTH_LOCATION,DESCEND,P_N_STATUS,BIT_SYNC_STATUS,SYNC_ERROR,FRAME_SYNC_ERROR,FLYWHEELING,BIT_SLIPPAGE,C3_SBBC,C4_SBBC,C5_SBBC,TIP_PARITY_FRAME_1,TIP_PARITY_FRAME_2,TIP_PARITY_FRAME_3,TIP_PARITY_FRAME_4,TIP_PARITY_FRAME_5,SYNC_ERRORS,CAL_SLOPE_C1,CAL_INTERCEPT_C1,CAL_SLOPE_C2,CAL_INTERCEPT_C2,CAL_SLOPE_C3,CAL_INTERCEPT_C3,CAL_SLOPE_C4,CAL_INTERCEPT_C4,CAL_SLOPE_C5,CAL_INTERCEPT_C5,NUM_SOLZENANGLES_EARTHLOCPNTS\n'
     ln = f.readline().decode('ascii')
-    if ln != '3387,0,1998,84,16966146,0,0,0,0,0,0,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0.102000,-4.130000,0.103000,-4.210000,-0.001677,1.667438,-0.157728,156.939636,-0.179833,179.775742,51\n':
-        print(ln)
-        return 'fail'
+    assert ln == '3387,0,1998,84,16966146,0,0,0,0,0,0,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0.102000,-4.130000,0.103000,-4.210000,-0.001677,1.667438,-0.157728,156.939636,-0.179833,179.775742,51\n'
     f.close()
 
     os.unlink('tmp/n12gac10bit.l1b_metadata.csv')
@@ -190,24 +176,16 @@ def test_l1b_angles_after_noaa_15():
         'SUBDATASET_1_DESC': 'Solar zenith angles, satellite zenith angles and relative azimuth angles'
     }
     for key in expected_md:
-        if md[key] != expected_md[key]:
-            print(md)
-            return 'fail'
+        assert md[key] == expected_md[key]
     ds = None
 
     ds = gdal.Open('L1B_ANGLES:"tmp/cache/n16gac10bit.l1b"')
     cs = ds.GetRasterBand(1).Checksum()
-    if cs != 31487:
-        print(cs)
-        return 'fail'
+    assert cs == 31487
     cs = ds.GetRasterBand(2).Checksum()
-    if cs != 23380:
-        print(cs)
-        return 'fail'
+    assert cs == 23380
     cs = ds.GetRasterBand(3).Checksum()
-    if cs != 64989:
-        print(cs)
-        return 'fail'
+    assert cs == 64989
 
     return 'success'
 
@@ -228,16 +206,12 @@ def test_l1b_clouds_after_noaa_15():
         'SUBDATASET_2_DESC': 'Clouds from AVHRR (CLAVR)'
     }
     for key in expected_md:
-        if md[key] != expected_md[key]:
-            print(md)
-            return 'fail'
+        assert md[key] == expected_md[key]
     ds = None
 
     ds = gdal.Open('L1B_CLOUDS:"tmp/cache/n16gac10bit.l1b"')
     cs = ds.GetRasterBand(1).Checksum()
-    if cs != 0:
-        print(cs)
-        return 'fail'
+    assert cs == 0
 
     return 'success'
 
@@ -260,13 +234,9 @@ def test_l1b_metadata_after_noaa_15():
 
     f = open('tmp/n16gac10bit.l1b_metadata.csv', 'rb')
     ln = f.readline().decode('ascii')
-    if ln != 'SCANLINE,NBLOCKYOFF,YEAR,DAY,MS_IN_DAY,SAT_CLOCK_DRIF_DELTA,SOUTHBOUND,SCANTIME_CORRECTED,C3_SELECT,FATAL_FLAG,TIME_ERROR,DATA_GAP,INSUFFICIENT_DATA_FOR_CAL,NO_EARTH_LOCATION,FIRST_GOOD_TIME_AFTER_CLOCK_UPDATE,INSTRUMENT_STATUS_CHANGED,SYNC_LOCK_DROPPED,FRAME_SYNC_ERROR,FRAME_SYNC_DROPPED_LOCK,FLYWHEELING,BIT_SLIPPAGE,TIP_PARITY_ERROR,REFLECTED_SUNLIGHT_C3B,REFLECTED_SUNLIGHT_C4,REFLECTED_SUNLIGHT_C5,RESYNC,P_N_STATUS,BAD_TIME_CAN_BE_INFERRED,BAD_TIME_CANNOT_BE_INFERRED,TIME_DISCONTINUITY,REPEAT_SCAN_TIME,UNCALIBRATED_BAD_TIME,CALIBRATED_FEWER_SCANLINES,UNCALIBRATED_BAD_PRT,CALIBRATED_MARGINAL_PRT,UNCALIBRATED_CHANNELS,NO_EARTH_LOC_BAD_TIME,EARTH_LOC_QUESTIONABLE_TIME,EARTH_LOC_QUESTIONABLE,EARTH_LOC_VERY_QUESTIONABLE,C3B_UNCALIBRATED,C3B_QUESTIONABLE,C3B_ALL_BLACKBODY,C3B_ALL_SPACEVIEW,C3B_MARGINAL_BLACKBODY,C3B_MARGINAL_SPACEVIEW,C4_UNCALIBRATED,C4_QUESTIONABLE,C4_ALL_BLACKBODY,C4_ALL_SPACEVIEW,C4_MARGINAL_BLACKBODY,C4_MARGINAL_SPACEVIEW,C5_UNCALIBRATED,C5_QUESTIONABLE,C5_ALL_BLACKBODY,C5_ALL_SPACEVIEW,C5_MARGINAL_BLACKBODY,C5_MARGINAL_SPACEVIEW,BIT_ERRORS,VIS_OP_CAL_C1_SLOPE_1,VIS_OP_CAL_C1_INTERCEPT_1,VIS_OP_CAL_C1_SLOPE_2,VIS_OP_CAL_C1_INTERCEPT_2,VIS_OP_CAL_C1_INTERSECTION,VIS_TEST_CAL_C1_SLOPE_1,VIS_TEST_CAL_C1_INTERCEPT_1,VIS_TEST_CAL_C1_SLOPE_2,VIS_TEST_CAL_C1_INTERCEPT_2,VIS_TEST_CAL_C1_INTERSECTION,VIS_PRELAUNCH_CAL_C1_SLOPE_1,VIS_PRELAUNCH_CAL_C1_INTERCEPT_1,VIS_PRELAUNCH_CAL_C1_SLOPE_2,VIS_PRELAUNCH_CAL_C1_INTERCEPT_2,VIS_PRELAUNCH_CAL_C1_INTERSECTION,VIS_OP_CAL_C2_SLOPE_1,VIS_OP_CAL_C2_INTERCEPT_1,VIS_OP_CAL_C2_SLOPE_2,VIS_OP_CAL_C2_INTERCEPT_2,VIS_OP_CAL_C2_INTERSECTION,VIS_TEST_CAL_C2_SLOPE_1,VIS_TEST_CAL_C2_INTERCEPT_1,VIS_TEST_CAL_C2_SLOPE_2,VIS_TEST_CAL_C2_INTERCEPT_2,VIS_TEST_CAL_C2_INTERSECTION,VIS_PRELAUNCH_CAL_C2_SLOPE_1,VIS_PRELAUNCH_CAL_C2_INTERCEPT_1,VIS_PRELAUNCH_CAL_C2_SLOPE_2,VIS_PRELAUNCH_CAL_C2_INTERCEPT_2,VIS_PRELAUNCH_CAL_C2_INTERSECTION,VIS_OP_CAL_C3A_SLOPE_1,VIS_OP_CAL_C3A_INTERCEPT_1,VIS_OP_CAL_C3A_SLOPE_2,VIS_OP_CAL_C3A_INTERCEPT_2,VIS_OP_CAL_C3A_INTERSECTION,VIS_TEST_CAL_C3A_SLOPE_1,VIS_TEST_CAL_C3A_INTERCEPT_1,VIS_TEST_CAL_C3A_SLOPE_2,VIS_TEST_CAL_C3A_INTERCEPT_2,VIS_TEST_CAL_C3A_INTERSECTION,VIS_PRELAUNCH_CAL_C3A_SLOPE_1,VIS_PRELAUNCH_CAL_C3A_INTERCEPT_1,VIS_PRELAUNCH_CAL_C3A_SLOPE_2,VIS_PRELAUNCH_CAL_C3A_INTERCEPT_2,VIS_PRELAUNCH_CAL_C3A_INTERSECTION,IR_OP_CAL_C3B_COEFF_1,IR_OP_CAL_C3B_COEFF_2,IR_OP_CAL_C3B_COEFF_3,IR_TEST_CAL_C3B_COEFF_1,IR_TEST_CAL_C3B_COEFF_2,IR_TEST_CAL_C3B_COEFF_3,IR_OP_CAL_C4_COEFF_1,IR_OP_CAL_C4_COEFF_2,IR_OP_CAL_C4_COEFF_3,IR_TEST_CAL_C4_COEFF_1,IR_TEST_CAL_C4_COEFF_2,IR_TEST_CAL_C4_COEFF_3,IR_OP_CAL_C5_COEFF_1,IR_OP_CAL_C5_COEFF_2,IR_OP_CAL_C5_COEFF_3,IR_TEST_CAL_C5_COEFF_1,IR_TEST_CAL_C5_COEFF_2,IR_TEST_CAL_C5_COEFF_3,EARTH_LOC_CORR_TIP_EULER,EARTH_LOC_IND,SPACECRAFT_ATT_CTRL,ATT_SMODE,ATT_PASSIVE_WHEEL_TEST,TIME_TIP_EULER,TIP_EULER_ROLL,TIP_EULER_PITCH,TIP_EULER_YAW,SPACECRAFT_ALT\n':
-        print(ln)
-        return 'fail'
+    assert ln == 'SCANLINE,NBLOCKYOFF,YEAR,DAY,MS_IN_DAY,SAT_CLOCK_DRIF_DELTA,SOUTHBOUND,SCANTIME_CORRECTED,C3_SELECT,FATAL_FLAG,TIME_ERROR,DATA_GAP,INSUFFICIENT_DATA_FOR_CAL,NO_EARTH_LOCATION,FIRST_GOOD_TIME_AFTER_CLOCK_UPDATE,INSTRUMENT_STATUS_CHANGED,SYNC_LOCK_DROPPED,FRAME_SYNC_ERROR,FRAME_SYNC_DROPPED_LOCK,FLYWHEELING,BIT_SLIPPAGE,TIP_PARITY_ERROR,REFLECTED_SUNLIGHT_C3B,REFLECTED_SUNLIGHT_C4,REFLECTED_SUNLIGHT_C5,RESYNC,P_N_STATUS,BAD_TIME_CAN_BE_INFERRED,BAD_TIME_CANNOT_BE_INFERRED,TIME_DISCONTINUITY,REPEAT_SCAN_TIME,UNCALIBRATED_BAD_TIME,CALIBRATED_FEWER_SCANLINES,UNCALIBRATED_BAD_PRT,CALIBRATED_MARGINAL_PRT,UNCALIBRATED_CHANNELS,NO_EARTH_LOC_BAD_TIME,EARTH_LOC_QUESTIONABLE_TIME,EARTH_LOC_QUESTIONABLE,EARTH_LOC_VERY_QUESTIONABLE,C3B_UNCALIBRATED,C3B_QUESTIONABLE,C3B_ALL_BLACKBODY,C3B_ALL_SPACEVIEW,C3B_MARGINAL_BLACKBODY,C3B_MARGINAL_SPACEVIEW,C4_UNCALIBRATED,C4_QUESTIONABLE,C4_ALL_BLACKBODY,C4_ALL_SPACEVIEW,C4_MARGINAL_BLACKBODY,C4_MARGINAL_SPACEVIEW,C5_UNCALIBRATED,C5_QUESTIONABLE,C5_ALL_BLACKBODY,C5_ALL_SPACEVIEW,C5_MARGINAL_BLACKBODY,C5_MARGINAL_SPACEVIEW,BIT_ERRORS,VIS_OP_CAL_C1_SLOPE_1,VIS_OP_CAL_C1_INTERCEPT_1,VIS_OP_CAL_C1_SLOPE_2,VIS_OP_CAL_C1_INTERCEPT_2,VIS_OP_CAL_C1_INTERSECTION,VIS_TEST_CAL_C1_SLOPE_1,VIS_TEST_CAL_C1_INTERCEPT_1,VIS_TEST_CAL_C1_SLOPE_2,VIS_TEST_CAL_C1_INTERCEPT_2,VIS_TEST_CAL_C1_INTERSECTION,VIS_PRELAUNCH_CAL_C1_SLOPE_1,VIS_PRELAUNCH_CAL_C1_INTERCEPT_1,VIS_PRELAUNCH_CAL_C1_SLOPE_2,VIS_PRELAUNCH_CAL_C1_INTERCEPT_2,VIS_PRELAUNCH_CAL_C1_INTERSECTION,VIS_OP_CAL_C2_SLOPE_1,VIS_OP_CAL_C2_INTERCEPT_1,VIS_OP_CAL_C2_SLOPE_2,VIS_OP_CAL_C2_INTERCEPT_2,VIS_OP_CAL_C2_INTERSECTION,VIS_TEST_CAL_C2_SLOPE_1,VIS_TEST_CAL_C2_INTERCEPT_1,VIS_TEST_CAL_C2_SLOPE_2,VIS_TEST_CAL_C2_INTERCEPT_2,VIS_TEST_CAL_C2_INTERSECTION,VIS_PRELAUNCH_CAL_C2_SLOPE_1,VIS_PRELAUNCH_CAL_C2_INTERCEPT_1,VIS_PRELAUNCH_CAL_C2_SLOPE_2,VIS_PRELAUNCH_CAL_C2_INTERCEPT_2,VIS_PRELAUNCH_CAL_C2_INTERSECTION,VIS_OP_CAL_C3A_SLOPE_1,VIS_OP_CAL_C3A_INTERCEPT_1,VIS_OP_CAL_C3A_SLOPE_2,VIS_OP_CAL_C3A_INTERCEPT_2,VIS_OP_CAL_C3A_INTERSECTION,VIS_TEST_CAL_C3A_SLOPE_1,VIS_TEST_CAL_C3A_INTERCEPT_1,VIS_TEST_CAL_C3A_SLOPE_2,VIS_TEST_CAL_C3A_INTERCEPT_2,VIS_TEST_CAL_C3A_INTERSECTION,VIS_PRELAUNCH_CAL_C3A_SLOPE_1,VIS_PRELAUNCH_CAL_C3A_INTERCEPT_1,VIS_PRELAUNCH_CAL_C3A_SLOPE_2,VIS_PRELAUNCH_CAL_C3A_INTERCEPT_2,VIS_PRELAUNCH_CAL_C3A_INTERSECTION,IR_OP_CAL_C3B_COEFF_1,IR_OP_CAL_C3B_COEFF_2,IR_OP_CAL_C3B_COEFF_3,IR_TEST_CAL_C3B_COEFF_1,IR_TEST_CAL_C3B_COEFF_2,IR_TEST_CAL_C3B_COEFF_3,IR_OP_CAL_C4_COEFF_1,IR_OP_CAL_C4_COEFF_2,IR_OP_CAL_C4_COEFF_3,IR_TEST_CAL_C4_COEFF_1,IR_TEST_CAL_C4_COEFF_2,IR_TEST_CAL_C4_COEFF_3,IR_OP_CAL_C5_COEFF_1,IR_OP_CAL_C5_COEFF_2,IR_OP_CAL_C5_COEFF_3,IR_TEST_CAL_C5_COEFF_1,IR_TEST_CAL_C5_COEFF_2,IR_TEST_CAL_C5_COEFF_3,EARTH_LOC_CORR_TIP_EULER,EARTH_LOC_IND,SPACECRAFT_ATT_CTRL,ATT_SMODE,ATT_PASSIVE_WHEEL_TEST,TIME_TIP_EULER,TIP_EULER_ROLL,TIP_EULER_PITCH,TIP_EULER_YAW,SPACECRAFT_ALT\n'
     ln = f.readline().decode('ascii')
-    if ln != '3406,0,2003,85,3275054,79,1,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0.052300,-2.015999,0.152800,-51.910000,499,0.052300,-2.015999,0.152800,-51.910000,498,0.052300,-2.015999,0.152800,-51.910000,498,0.051300,-1.942999,0.151000,-51.770000,500,0.051300,-1.942999,0.151000,-51.770000,500,0.051300,-1.942999,0.151000,-51.770000,500,0.000000,0.000000,0.000000,0.000000,0,0.000000,0.000000,0.000000,0.000000,0,0.000000,0.000000,0.000000,0.000000,0,2.488212,-0.002511,0.000000,2.488212,-0.002511,0.000000,179.546496,-0.188553,0.000008,179.546496,-0.188553,0.000008,195.236384,-0.201709,0.000006,195.236384,-0.201709,0.000006,0,0,0,0,0,608093,-0.021000,-0.007000,0.000000,862.000000\n':
-        print(ln)
-        return 'fail'
+    assert ln == '3406,0,2003,85,3275054,79,1,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0.052300,-2.015999,0.152800,-51.910000,499,0.052300,-2.015999,0.152800,-51.910000,498,0.052300,-2.015999,0.152800,-51.910000,498,0.051300,-1.942999,0.151000,-51.770000,500,0.051300,-1.942999,0.151000,-51.770000,500,0.051300,-1.942999,0.151000,-51.770000,500,0.000000,0.000000,0.000000,0.000000,0,0.000000,0.000000,0.000000,0.000000,0,0.000000,0.000000,0.000000,0.000000,0,2.488212,-0.002511,0.000000,2.488212,-0.002511,0.000000,179.546496,-0.188553,0.000008,179.546496,-0.188553,0.000008,195.236384,-0.201709,0.000006,195.236384,-0.201709,0.000006,0,0,0,0,0,608093,-0.021000,-0.007000,0.000000,862.000000\n'
     f.close()
 
     os.unlink('tmp/n16gac10bit.l1b_metadata.csv')
@@ -280,14 +250,10 @@ def test_l1b_metadata_after_noaa_15():
 def test_l1b_little_endian():
 
     ds = gdal.Open('/vsizip/data/hrpt_little_endian.l1b.zip')
-    if ds.GetGCPProjection().find('GRS80') < 0:
-        return 'fail'
-    if ds.GetRasterBand(1).Checksum() != 14145:
-        return 'fail'
-    if ds.GetRasterBand(1).GetMaskFlags() != gdal.GMF_PER_DATASET:
-        return 'fail'
-    if ds.GetRasterBand(1).GetMaskBand().Checksum() != 25115:
-        return 'fail'
+    assert ds.GetGCPProjection().find('GRS80') >= 0
+    assert ds.GetRasterBand(1).Checksum() == 14145
+    assert ds.GetRasterBand(1).GetMaskFlags() == gdal.GMF_PER_DATASET
+    assert ds.GetRasterBand(1).GetMaskBand().Checksum() == 25115
     ds = None
 
     return 'success'
diff --git a/autotest/gdrivers/lcp.py b/autotest/gdrivers/lcp.py
index b4f7595eb2c6..c965bc5f7962 100755
--- a/autotest/gdrivers/lcp.py
+++ b/autotest/gdrivers/lcp.py
@@ -35,6 +35,7 @@
 
 
 import gdaltest
+import pytest
 
 ###############################################################################
 #  Test test_FARSITE_UTM12.LCP
@@ -43,22 +44,18 @@
 def test_lcp_1():
 
     ds = gdal.Open('data/test_FARSITE_UTM12.LCP')
-    if ds.RasterCount != 8:
-        gdaltest.post_reason('wrong number of bands')
-        return 'fail'
+    assert ds.RasterCount == 8, 'wrong number of bands'
 
-    if ds.GetProjectionRef().find('NAD_1983_UTM_Zone_12N') == -1:
-        gdaltest.post_reason("didn't get expect projection. Got : %s" % (ds.GetProjectionRef()))
-        return 'fail'
+    assert ds.GetProjectionRef().find('NAD_1983_UTM_Zone_12N') != -1, \
+        ("didn't get expect projection. Got : %s" % (ds.GetProjectionRef()))
 
     metadata = [('LATITUDE', '49'),
                 ('LINEAR_UNIT', 'Meters'),
                 ('DESCRIPTION', 'This is a test LCP file created with FARSITE 4.1.054, using data downloaded from the USGS \r\nNational Map for LANDFIRE (2008-05-06). Data were reprojected to UTM zone 12 on NAD83 \r\nusing gdalwarp (GDAL 1.4.2).\r\n')]
     md = ds.GetMetadata()
     for item in metadata:
-        if md[item[0]] != item[1]:
-            gdaltest.post_reason('wrong metadataitem for dataset. md[\'%s\']=\'%s\', expected \'%s\'' % (item[0], md[item[0]], item[1]))
-            return 'fail'
+        assert md[item[0]] == item[1], \
+            ('wrong metadataitem for dataset. md[\'%s\']=\'%s\', expected \'%s\'' % (item[0], md[item[0]], item[1]))
 
     check_gt = (285807.932887174887583, 30, 0, 5379230.386217921040952, 0, -30)
     new_gt = ds.GetGeoTransform()
@@ -67,8 +64,7 @@ def test_lcp_1():
             print('')
             print('old = ', check_gt)
             print('new = ', new_gt)
-            gdaltest.post_reason('Geotransform differs.')
-            return 'fail'
+            pytest.fail('Geotransform differs.')
 
     dataPerBand = [(18645, [('ELEVATION_UNIT', '0'),
                             ('ELEVATION_UNIT_NAME', 'Meters'),
@@ -123,14 +119,12 @@ def test_lcp_1():
 
     for i in range(8):
         band = ds.GetRasterBand(i + 1)
-        if band.Checksum() != dataPerBand[i][0]:
-            gdaltest.post_reason('wrong checksum for band %d. Got %d, expected %d' % (i + 1, band.Checksum(), dataPerBand[i][0]))
-            return 'fail'
+        assert band.Checksum() == dataPerBand[i][0], \
+            ('wrong checksum for band %d. Got %d, expected %d' % (i + 1, band.Checksum(), dataPerBand[i][0]))
         md = band.GetMetadata()
         for item in dataPerBand[i][1]:
-            if md[item[0]] != item[1]:
-                gdaltest.post_reason('wrong metadataitem for band %d. md[\'%s\']=\'%s\', expected \'%s\'' % (i + 1, item[0], md[item[0]], item[1]))
-                return 'fail'
+            assert md[item[0]] == item[1], \
+                ('wrong metadataitem for band %d. md[\'%s\']=\'%s\', expected \'%s\'' % (i + 1, item[0], md[item[0]], item[1]))
 
     ds = None
 
@@ -143,18 +137,15 @@ def test_lcp_1():
 def test_lcp_2():
 
     ds = gdal.Open('data/test_USGS_LFNM_Alb83.lcp')
-    if ds.RasterCount != 8:
-        gdaltest.post_reason('wrong number of bands')
-        return 'fail'
+    assert ds.RasterCount == 8, 'wrong number of bands'
 
     metadata = [('LATITUDE', '48'),
                 ('LINEAR_UNIT', 'Meters'),
                 ('DESCRIPTION', '')]
     md = ds.GetMetadata()
     for item in metadata:
-        if md[item[0]] != item[1]:
-            gdaltest.post_reason('wrong metadataitem for dataset. md[\'%s\']=\'%s\', expected \'%s\'' % (item[0], md[item[0]], item[1]))
-            return 'fail'
+        assert md[item[0]] == item[1], \
+            ('wrong metadataitem for dataset. md[\'%s\']=\'%s\', expected \'%s\'' % (item[0], md[item[0]], item[1]))
 
     check_gt = (-1328145, 30, 0, 2961735, 0, -30)
     new_gt = ds.GetGeoTransform()
@@ -163,8 +154,7 @@ def test_lcp_2():
             print('')
             print('old = ', check_gt)
             print('new = ', new_gt)
-            gdaltest.post_reason('Geotransform differs.')
-            return 'fail'
+            pytest.fail('Geotransform differs.')
 
     dataPerBand = [(28381, [('ELEVATION_UNIT', '0'),
                             ('ELEVATION_UNIT_NAME', 'Meters'),
@@ -219,14 +209,12 @@ def test_lcp_2():
 
     for i in range(8):
         band = ds.GetRasterBand(i + 1)
-        if band.Checksum() != dataPerBand[i][0]:
-            gdaltest.post_reason('wrong checksum for band %d. Got %d, expected %d' % (i + 1, band.Checksum(), dataPerBand[i][0]))
-            return 'fail'
+        assert band.Checksum() == dataPerBand[i][0], \
+            ('wrong checksum for band %d. Got %d, expected %d' % (i + 1, band.Checksum(), dataPerBand[i][0]))
         md = band.GetMetadata()
         for item in dataPerBand[i][1]:
-            if md[item[0]] != item[1]:
-                gdaltest.post_reason('wrong metadataitem for band %d. md[\'%s\']=\'%s\', expected \'%s\'' % (i + 1, item[0], md[item[0]], item[1]))
-                return 'fail'
+            assert md[item[0]] == item[1], \
+                ('wrong metadataitem for band %d. md[\'%s\']=\'%s\', expected \'%s\'' % (i + 1, item[0], md[item[0]], item[1]))
 
     ds = None
 
@@ -239,12 +227,9 @@ def test_lcp_2():
 def test_lcp_3():
 
     ds = gdal.Open('data/test_USGS_LFNM_Alb83.lcp')
-    if ds is None:
-        return 'fail'
+    assert ds is not None
     wkt = ds.GetProjection()
-    if wkt is None:
-        gdaltest.post_reason('Got None from GetProjection()')
-        return 'fail'
+    assert wkt is not None, 'Got None from GetProjection()'
     return 'success'
 
 ###############################################################################
@@ -254,12 +239,9 @@ def test_lcp_3():
 def test_lcp_4():
 
     ds = gdal.Open('data/test_USGS_LFNM_Alb83.lcp')
-    if ds is None:
-        return 'fail'
+    assert ds is not None
     fl = ds.GetFileList()
-    if len(fl) != 1:
-        gdaltest.post_reason('Invalid file list')
-        return 'fail'
+    assert len(fl) == 1, 'Invalid file list'
     return 'success'
 
 ###############################################################################
@@ -269,12 +251,9 @@ def test_lcp_4():
 def test_lcp_5():
 
     ds = gdal.Open('data/test_FARSITE_UTM12.LCP')
-    if ds is None:
-        return 'fail'
+    assert ds is not None
     wkt = ds.GetProjection()
-    if wkt is None or wkt == '':
-        gdaltest.post_reason('Got invalid wkt from GetProjection()')
-        return 'fail'
+    assert not (wkt is None or wkt == ''), 'Got invalid wkt from GetProjection()'
     return 'success'
 
 ###############################################################################
@@ -285,8 +264,7 @@ def test_lcp_6():
 
     retval = 'success'
     ds = gdal.Open('data/test_FARSITE_UTM12.LCP')
-    if ds is None:
-        return 'fail'
+    assert ds is not None
     fl = ds.GetFileList()
     if len(fl) != 2:
         gdaltest.post_reason('Invalid file list')
@@ -306,18 +284,15 @@ def test_lcp_6():
 def test_lcp_7():
 
     mem_drv = gdal.GetDriverByName('MEM')
-    if mem_drv is None:
-        return 'fail'
+    assert mem_drv is not None
     lcp_drv = gdal.GetDriverByName('LCP')
-    if lcp_drv is None:
-        return 'fail'
+    assert lcp_drv is not None
     # Make sure all available band counts work.
     retval = 'success'
     co = ['LATITUDE=0', 'LINEAR_UNIT=METER']
     for i in [5, 7, 8, 10]:
         src_ds = mem_drv.Create('/vsimem/lcptest', 10, 20, i, gdal.GDT_Int16)
-        if src_ds is None:
-            return 'fail'
+        assert src_ds is not None
         dst_ds = lcp_drv.CreateCopy('tmp/lcp_7.lcp', src_ds, False, co)
         if dst_ds is None:
             gdaltest.post_reason('Failed to create lcp with %d bands' % i)
@@ -342,11 +317,9 @@ def test_lcp_7():
 def test_lcp_8():
 
     mem_drv = gdal.GetDriverByName('MEM')
-    if mem_drv is None:
-        return 'fail'
+    assert mem_drv is not None
     lcp_drv = gdal.GetDriverByName('LCP')
-    if lcp_drv is None:
-        return 'fail'
+    assert lcp_drv is not None
     gdal.PushErrorHandler('CPLQuietErrorHandler')
     retval = 'success'
     co = ['LATITUDE=0', 'LINEAR_UNIT=METER']
@@ -378,19 +351,15 @@ def test_lcp_8():
 def test_lcp_9():
 
     mem_drv = gdal.GetDriverByName('MEM')
-    if mem_drv is None:
-        return 'fail'
+    assert mem_drv is not None
     lcp_drv = gdal.GetDriverByName('LCP')
-    if lcp_drv is None:
-        return 'fail'
+    assert lcp_drv is not None
     src_ds = mem_drv.Create('', 10, 20, 10, gdal.GDT_Int16)
-    if src_ds is None:
-        return 'fail'
+    assert src_ds is not None
     retval = 'success'
     co = ['LATITUDE=0', 'LINEAR_UNIT=METER']
     lcp_ds = lcp_drv.CreateCopy('tmp/lcp_9.lcp', src_ds, False, co)
-    if lcp_ds is None:
-        return 'fail'
+    assert lcp_ds is not None
     lcp_ds = None
     for ext in ['lcp', 'lcp.aux.xml']:
         try:
@@ -406,14 +375,11 @@ def test_lcp_9():
 def test_lcp_10():
 
     mem_drv = gdal.GetDriverByName('MEM')
-    if mem_drv is None:
-        return 'fail'
+    assert mem_drv is not None
     drv = gdal.GetDriverByName('LCP')
-    if drv is None:
-        return 'fail'
+    assert drv is not None
     src_ds = mem_drv.Create('/vsimem/', 10, 10, 10, gdal.GDT_Int16)
-    if src_ds is None:
-        return 'fail'
+    assert src_ds is not None
 
     retval = 'success'
     for option in ['METERS', 'FEET']:
@@ -446,14 +412,11 @@ def test_lcp_10():
 def test_lcp_11():
 
     mem_drv = gdal.GetDriverByName('MEM')
-    if mem_drv is None:
-        return 'fail'
+    assert mem_drv is not None
     drv = gdal.GetDriverByName('LCP')
-    if drv is None:
-        return 'fail'
+    assert drv is not None
     src_ds = mem_drv.Create('/vsimem/', 10, 10, 10, gdal.GDT_Int16)
-    if src_ds is None:
-        return 'fail'
+    assert src_ds is not None
 
     retval = 'success'
     for option in ['DEGREES', 'PERCENT']:
@@ -486,14 +449,11 @@ def test_lcp_11():
 def test_lcp_12():
 
     mem_drv = gdal.GetDriverByName('MEM')
-    if mem_drv is None:
-        return 'fail'
+    assert mem_drv is not None
     drv = gdal.GetDriverByName('LCP')
-    if drv is None:
-        return 'fail'
+    assert drv is not None
     src_ds = mem_drv.Create('/vsimem/', 10, 10, 10, gdal.GDT_Int16)
-    if src_ds is None:
-        return 'fail'
+    assert src_ds is not None
 
     retval = 'success'
     for option in ['GRASS_CATEGORIES', 'AZIMUTH_DEGREES', 'GRASS_DEGREES']:
@@ -525,14 +485,11 @@ def test_lcp_12():
 def test_lcp_13():
 
     mem_drv = gdal.GetDriverByName('MEM')
-    if mem_drv is None:
-        return 'fail'
+    assert mem_drv is not None
     drv = gdal.GetDriverByName('LCP')
-    if drv is None:
-        return 'fail'
+    assert drv is not None
     src_ds = mem_drv.Create('/vsimem/', 10, 10, 10, gdal.GDT_Int16)
-    if src_ds is None:
-        return 'fail'
+    assert src_ds is not None
 
     retval = 'success'
     for option in ['PERCENT', 'CATEGORIES']:
@@ -565,14 +522,11 @@ def test_lcp_13():
 def test_lcp_14():
 
     mem_drv = gdal.GetDriverByName('MEM')
-    if mem_drv is None:
-        return 'fail'
+    assert mem_drv is not None
     drv = gdal.GetDriverByName('LCP')
-    if drv is None:
-        return 'fail'
+    assert drv is not None
     src_ds = mem_drv.Create('/vsimem/', 10, 10, 10, gdal.GDT_Int16)
-    if src_ds is None:
-        return 'fail'
+    assert src_ds is not None
 
     retval = 'success'
     for option in ['METERS', 'FEET', 'METERS_X_10', 'FEET_X_10']:
@@ -605,14 +559,11 @@ def test_lcp_14():
 def test_lcp_15():
 
     mem_drv = gdal.GetDriverByName('MEM')
-    if mem_drv is None:
-        return 'fail'
+    assert mem_drv is not None
     drv = gdal.GetDriverByName('LCP')
-    if drv is None:
-        return 'fail'
+    assert drv is not None
     src_ds = mem_drv.Create('/vsimem/', 10, 10, 10, gdal.GDT_Int16)
-    if src_ds is None:
-        return 'fail'
+    assert src_ds is not None
 
     retval = 'success'
     for option in ['METERS', 'FEET', 'METERS_X_10', 'FEET_X_10']:
@@ -645,14 +596,11 @@ def test_lcp_15():
 def test_lcp_16():
 
     mem_drv = gdal.GetDriverByName('MEM')
-    if mem_drv is None:
-        return 'fail'
+    assert mem_drv is not None
     drv = gdal.GetDriverByName('LCP')
-    if drv is None:
-        return 'fail'
+    assert drv is not None
     src_ds = mem_drv.Create('/vsimem/', 10, 10, 10, gdal.GDT_Int16)
-    if src_ds is None:
-        return 'fail'
+    assert src_ds is not None
 
     retval = 'success'
     answers = ['kg/m^3', 'lb/ft^3', 'kg/m^3 x 100', 'lb/ft^3 x 1000',
@@ -691,14 +639,11 @@ def test_lcp_16():
 def test_lcp_17():
 
     mem_drv = gdal.GetDriverByName('MEM')
-    if mem_drv is None:
-        return 'fail'
+    assert mem_drv is not None
     drv = gdal.GetDriverByName('LCP')
-    if drv is None:
-        return 'fail'
+    assert drv is not None
     src_ds = mem_drv.Create('/vsimem/', 10, 10, 10, gdal.GDT_Int16)
-    if src_ds is None:
-        return 'fail'
+    assert src_ds is not None
 
     retval = 'success'
     answers = ['mg/ha', 't/ac x 10']
@@ -732,14 +677,11 @@ def test_lcp_17():
 def test_lcp_18():
 
     mem_drv = gdal.GetDriverByName('MEM')
-    if mem_drv is None:
-        return 'fail'
+    assert mem_drv is not None
     drv = gdal.GetDriverByName('LCP')
-    if drv is None:
-        return 'fail'
+    assert drv is not None
     src_ds = mem_drv.Create('/vsimem/', 10, 10, 10, gdal.GDT_Int16)
-    if src_ds is None:
-        return 'fail'
+    assert src_ds is not None
 
     retval = 'success'
     co = ['LATITUDE=45', 'LINEAR_UNIT=METER']
@@ -766,14 +708,11 @@ def test_lcp_18():
 def test_lcp_19():
 
     mem_drv = gdal.GetDriverByName('MEM')
-    if mem_drv is None:
-        return 'fail'
+    assert mem_drv is not None
     drv = gdal.GetDriverByName('LCP')
-    if drv is None:
-        return 'fail'
+    assert drv is not None
     src_ds = mem_drv.Create('/vsimem/', 10, 10, 10, gdal.GDT_Int16)
-    if src_ds is None:
-        return 'fail'
+    assert src_ds is not None
 
     retval = 'success'
     co = ['LATITUDE=0', 'LINEAR_UNIT=FOOT']
@@ -801,14 +740,11 @@ def test_lcp_19():
 def test_lcp_20():
 
     mem_drv = gdal.GetDriverByName('MEM')
-    if mem_drv is None:
-        return 'fail'
+    assert mem_drv is not None
     drv = gdal.GetDriverByName('LCP')
-    if drv is None:
-        return 'fail'
+    assert drv is not None
     src_ds = mem_drv.Create('/vsimem/', 10, 10, 10, gdal.GDT_Int16)
-    if src_ds is None:
-        return 'fail'
+    assert src_ds is not None
 
     retval = 'success'
     desc = 'test description'
@@ -840,14 +776,11 @@ def test_lcp_21():
     except ImportError:
         return 'skip'
     mem_drv = gdal.GetDriverByName('MEM')
-    if mem_drv is None:
-        return 'fail'
+    assert mem_drv is not None
     drv = gdal.GetDriverByName('LCP')
-    if drv is None:
-        return 'fail'
+    assert drv is not None
     src_ds = mem_drv.Create('/vsimem/', 3, 3, 10, gdal.GDT_Int16)
-    if src_ds is None:
-        return 'fail'
+    assert src_ds is not None
 
     for i in range(10):
         data = [random.randint(0, 100) for i in range(9)]
@@ -885,14 +818,11 @@ def test_lcp_22():
     except ImportError:
         return 'skip'
     mem_drv = gdal.GetDriverByName('MEM')
-    if mem_drv is None:
-        return 'fail'
+    assert mem_drv is not None
     drv = gdal.GetDriverByName('LCP')
-    if drv is None:
-        return 'fail'
+    assert drv is not None
     src_ds = mem_drv.Create('/vsimem/', 3, 3, 10, gdal.GDT_Int16)
-    if src_ds is None:
-        return 'fail'
+    assert src_ds is not None
 
     for i in range(10):
         data = [random.randint(0, 100) for i in range(9)]
@@ -901,8 +831,7 @@ def test_lcp_22():
     retval = 'success'
     co = ['LATITUDE=0', 'LINEAR_UNIT=METER']
     lcp_ds = drv.CreateCopy('tmp/lcp_22.lcp', src_ds, False, co)
-    if lcp_ds is None:
-        return 'fail'
+    assert lcp_ds is not None
     retval = 'success'
     for i in range(10):
         src_data = src_ds.GetRasterBand(i + 1).ReadAsArray()
@@ -927,14 +856,11 @@ def test_lcp_22():
 def test_lcp_23():
 
     mem_drv = gdal.GetDriverByName('MEM')
-    if mem_drv is None:
-        return 'fail'
+    assert mem_drv is not None
     drv = gdal.GetDriverByName('LCP')
-    if drv is None:
-        return 'fail'
+    assert drv is not None
     src_ds = mem_drv.Create('/vsimem/', 10, 10, 10, gdal.GDT_Int16)
-    if src_ds is None:
-        return 'fail'
+    assert src_ds is not None
 
     retval = 'success'
     bad = 'NOT_A_REAL_OPTION'
diff --git a/autotest/gdrivers/mbtiles.py b/autotest/gdrivers/mbtiles.py
index fb556944fd43..971b34dfa0eb 100755
--- a/autotest/gdrivers/mbtiles.py
+++ b/autotest/gdrivers/mbtiles.py
@@ -60,29 +60,23 @@ def test_mbtiles_2():
         return 'skip'
 
     ds = gdal.OpenEx('data/world_l1.mbtiles', open_options=['USE_BOUNDS=NO'])
-    if ds is None:
-        return 'fail'
+    assert ds is not None
 
-    if ds.RasterCount != 4:
-        gdaltest.post_reason('expected 3 bands')
-        return 'fail'
+    assert ds.RasterCount == 4, 'expected 3 bands'
 
-    if ds.GetRasterBand(1).GetOverviewCount() != 1:
-        gdaltest.post_reason('did not get expected overview count')
-        return 'fail'
+    assert ds.GetRasterBand(1).GetOverviewCount() == 1, \
+        'did not get expected overview count'
 
     expected_cs_tab = [6324, 19386, 45258]
     expected_cs_tab_jpeg8 = [6016, 13996, 45168]
     expected_cs_tab_jpeg9b = [6016, 14034, 45168]
     for i in range(3):
         cs = ds.GetRasterBand(i + 1).Checksum()
-        if ds.GetRasterBand(i + 1).GetColorInterpretation() != gdal.GCI_RedBand + i:
-            gdaltest.post_reason('bad color interpretation')
-            return 'fail'
+        assert ds.GetRasterBand(i + 1).GetColorInterpretation() == gdal.GCI_RedBand + i, \
+            'bad color interpretation'
         expected_cs = expected_cs_tab[i]
-        if cs != expected_cs and cs != expected_cs_tab_jpeg8[i] and cs != expected_cs_tab_jpeg9b[i]:
-            gdaltest.post_reason('for band %d, cs = %d, different from expected_cs = %d' % (i + 1, cs, expected_cs))
-            return 'fail'
+        assert cs == expected_cs or cs == expected_cs_tab_jpeg8[i] or cs == expected_cs_tab_jpeg9b[i], \
+            ('for band %d, cs = %d, different from expected_cs = %d' % (i + 1, cs, expected_cs))
 
     expected_cs_tab = [16642, 15772, 10029]
     expected_cs_tab_jpeg8 = [16621, 14725, 8988]
@@ -90,27 +84,19 @@ def test_mbtiles_2():
     for i in range(3):
         cs = ds.GetRasterBand(i + 1).GetOverview(0).Checksum()
         expected_cs = expected_cs_tab[i]
-        if cs != expected_cs and cs != expected_cs_tab_jpeg8[i] and cs != expected_cs_tab_jpeg9b[i]:
-            gdaltest.post_reason('for overview of band %d, cs = %d, different from expected_cs = %d' % (i + 1, cs, expected_cs))
-            return 'fail'
+        assert cs == expected_cs or cs == expected_cs_tab_jpeg8[i] or cs == expected_cs_tab_jpeg9b[i], \
+            ('for overview of band %d, cs = %d, different from expected_cs = %d' % (i + 1, cs, expected_cs))
 
-    if ds.GetProjectionRef().find('3857') == -1:
-        gdaltest.post_reason('projection_ref = %s' % ds.GetProjectionRef())
-        return 'fail'
+    assert ds.GetProjectionRef().find('3857') != -1, \
+        ('projection_ref = %s' % ds.GetProjectionRef())
 
     gt = ds.GetGeoTransform()
     expected_gt = (-20037508.342789244, 78271.516964020484, 0.0, 20037508.342789244, 0.0, -78271.516964020484)
     for i in range(6):
-        if abs(gt[i] - expected_gt[i]) > 1e-15:
-            gdaltest.post_reason('bad gt')
-            print(gt)
-            print(expected_gt)
-            return 'fail'
+        assert abs(gt[i] - expected_gt[i]) <= 1e-15, 'bad gt'
 
     md = ds.GetMetadata()
-    if md['bounds'] != '-180.0,-85,180,85':
-        gdaltest.post_reason('bad metadata')
-        return 'fail'
+    assert md['bounds'] == '-180.0,-85,180,85', 'bad metadata'
 
     ds = None
 
@@ -205,8 +191,7 @@ def test_mbtiles_http_jpeg_three_bands():
         {'/world_l1.mbtiles': open('data/world_l1.mbtiles', 'rb').read()})
     with webserver.install_http_handler(handler):
         ds = gdal.Open('/vsicurl/http://localhost:%d/world_l1.mbtiles' % gdaltest.webserver_port)
-    if ds is None:
-        return 'fail'
+    assert ds is not None
 
     return 'success'
 
@@ -232,8 +217,7 @@ def test_mbtiles_http_jpeg_single_band():
         {'/byte_jpeg.mbtiles': open('data/byte_jpeg.mbtiles', 'rb').read()})
     with webserver.install_http_handler(handler):
         ds = gdal.Open('/vsicurl/http://localhost:%d/byte_jpeg.mbtiles' % gdaltest.webserver_port)
-    if ds is None:
-        return 'fail'
+    assert ds is not None
 
     return 'success'
 
@@ -259,8 +243,7 @@ def test_mbtiles_http_png():
         {'/byte.mbtiles': open('data/byte.mbtiles', 'rb').read()})
     with webserver.install_http_handler(handler):
         ds = gdal.Open('/vsicurl/http://localhost:%d/byte.mbtiles' % gdaltest.webserver_port)
-    if ds is None:
-        return 'fail'
+    assert ds is not None
 
     return 'success'
 
@@ -294,31 +277,19 @@ def test_mbtiles_4():
         return 'skip'
 
     ds = gdal.Open('data/world_l1.mbtiles')
-    if ds is None:
-        return 'fail'
+    assert ds is not None
 
-    if ds.RasterCount != 4:
-        gdaltest.post_reason('expected 4 bands')
-        return 'fail'
+    assert ds.RasterCount == 4, 'expected 4 bands'
 
-    if ds.GetRasterBand(1).GetOverviewCount() != 1:
-        gdaltest.post_reason('did not get expected overview count')
-        return 'fail'
+    assert ds.GetRasterBand(1).GetOverviewCount() == 1, \
+        'did not get expected overview count'
 
-    if ds.RasterXSize != 512 or ds.RasterYSize != 510:
-        gdaltest.post_reason('bad dimensions')
-        print(ds.RasterXSize)
-        print(ds.RasterYSize)
-        return 'fail'
+    assert ds.RasterXSize == 512 and ds.RasterYSize == 510, 'bad dimensions'
 
     gt = ds.GetGeoTransform()
     expected_gt = (-20037508.342789244, 78271.516964020484, 0.0, 19971868.880408563, 0.0, -78271.516964020484)
     for i in range(6):
-        if abs(gt[i] - expected_gt[i]) > 1e-15:
-            gdaltest.post_reason('bad gt')
-            print(gt)
-            print(expected_gt)
-            return 'fail'
+        assert abs(gt[i] - expected_gt[i]) <= 1e-15, 'bad gt'
 
     ds = None
 
@@ -341,37 +312,21 @@ def test_mbtiles_5():
     src_ds = None
 
     ds = gdal.OpenEx('/vsimem/mbtiles_5.mbtiles', open_options=['BAND_COUNT=2'])
-    if ds.RasterXSize != 19 or ds.RasterYSize != 19:
-        print(ds.RasterXSize)
-        print(ds.RasterYSize)
-        return 'fail'
-    if ds.RasterCount != 2:
-        print(ds.RasterCount)
-        return 'fail'
+    assert ds.RasterXSize == 19 and ds.RasterYSize == 19
+    assert ds.RasterCount == 2
     got_gt = ds.GetGeoTransform()
     expected_gt = (-13095853.550435878, 76.437028285176254, 0.0, 4015708.8887064462, 0.0, -76.437028285176254)
     for i in range(6):
-        if abs(expected_gt[i] - got_gt[i]) > 1e-6:
-            print(got_gt)
-            print(expected_gt)
-            return 'fail'
+        assert abs(expected_gt[i] - got_gt[i]) <= 1e-6
     got_cs = ds.GetRasterBand(1).Checksum()
-    if got_cs != 4118:
-        print(got_cs)
-        return 'fail'
+    assert got_cs == 4118
     got_cs = ds.GetRasterBand(2).Checksum()
-    if got_cs != 4406:
-        print(got_cs)
-        return 'fail'
+    assert got_cs == 4406
     got_md = ds.GetMetadata()
     expected_md = {'ZOOM_LEVEL': '11', 'minzoom': '11', 'maxzoom': '11', 'name': 'mbtiles_5', 'format': 'png', 'bounds': '-117.6420540294745,33.89160566594387,-117.6290077648261,33.90243460427036', 'version': '1.1', 'type': 'overlay', 'description': 'mbtiles_5'}
-    if set(got_md.keys()) != set(expected_md.keys()):
-        print(got_md)
-        return 'fail'
+    assert set(got_md.keys()) == set(expected_md.keys())
     for key in got_md:
-        if key != 'bounds' and got_md[key] != expected_md[key]:
-            print(got_md)
-            return 'fail'
+        assert key == 'bounds' or got_md[key] == expected_md[key]
     ds = None
 
     gdal.Unlink('/vsimem/mbtiles_5.mbtiles')
@@ -405,14 +360,10 @@ def test_mbtiles_6():
 
     ds = gdal.Open('tmp/mbtiles_6.mbtiles')
     got_cs = ds.GetRasterBand(1).Checksum()
-    if got_cs == 0:
-        print(got_cs)
-        return 'fail'
+    assert got_cs != 0
     got_md = ds.GetMetadata()
     expected_md = {'ZOOM_LEVEL': '11', 'minzoom': '11', 'maxzoom': '11', 'format': 'jpg', 'version': 'version', 'type': 'baselayer', 'name': 'name', 'description': 'description'}
-    if got_md != expected_md:
-        print(got_md)
-        return 'fail'
+    assert got_md == expected_md
     ds = None
 
     gdal.Unlink('tmp/mbtiles_6.mbtiles')
@@ -455,17 +406,11 @@ def test_mbtiles_7():
     ds = None
 
     ds = gdal.Open('/vsimem/mbtiles_7.mbtiles')
-    if ds.GetRasterBand(1).GetOverviewCount() != 1:
-        print(ds.GetRasterBand(1).GetOverviewCount())
-        return 'fail'
+    assert ds.GetRasterBand(1).GetOverviewCount() == 1
     expected_ovr_cs = [21179, 22577, 11996, 17849]
     got_ovr_cs = [ds.GetRasterBand(i + 1).GetOverview(0).Checksum() for i in range(ds.RasterCount)]
-    if expected_ovr_cs != got_ovr_cs:
-        print(got_ovr_cs)
-        return 'fail'
-    if ds.GetMetadataItem('minzoom') != '0':
-        print(ds.GetMetadata())
-        return 'fail'
+    assert expected_ovr_cs == got_ovr_cs
+    assert ds.GetMetadataItem('minzoom') == '0', ds.GetMetadata()
     ds = None
 
     ds = gdal.Open('/vsimem/mbtiles_7.mbtiles', gdal.GA_Update)
@@ -473,12 +418,8 @@ def test_mbtiles_7():
     ds = None
 
     ds = gdal.Open('/vsimem/mbtiles_7.mbtiles')
-    if ds.GetRasterBand(1).GetOverviewCount() != 0:
-        print(ds.GetRasterBand(1).GetOverviewCount())
-        return 'fail'
-    if ds.GetMetadataItem('minzoom') != '1':
-        print(ds.GetMetadata())
-        return 'fail'
+    assert ds.GetRasterBand(1).GetOverviewCount() == 0
+    assert ds.GetMetadataItem('minzoom') == '1', ds.GetMetadata()
     ds = None
 
     gdal.Unlink('/vsimem/mbtiles_7.mbtiles')
@@ -505,15 +446,10 @@ def test_mbtiles_8():
     expected_cs = [993, 50461, 64354]
     out_ds = gdal.Open('/vsimem/mbtiles_8.mbtiles')
     got_cs = [out_ds.GetRasterBand(i + 1).Checksum() for i in range(3)]
-    if got_cs != expected_cs:
-        print('Got %s, expected %s' % (str(got_cs), str(expected_cs)))
-        return 'fail'
+    assert got_cs == expected_cs
     got_ct = out_ds.GetRasterBand(1).GetColorTable()
-    if got_ct is not None:
-        return 'fail'
-    if out_ds.GetRasterBand(1).GetBlockSize() != [256, 256]:
-        print(out_ds.GetRasterBand(1).GetBlockSize())
-        return 'fail'
+    assert got_ct is None
+    assert out_ds.GetRasterBand(1).GetBlockSize() == [256, 256]
     out_ds = None
 
     # 512 pixel tiles
@@ -525,14 +461,10 @@ def test_mbtiles_8():
     expected_cs = [60844, 7388, 53813]
     out_ds = gdal.Open('/vsimem/mbtiles_8.mbtiles')
     got_cs = [out_ds.GetRasterBand(i + 1).Checksum() for i in range(3)]
-    if got_cs != expected_cs:
-        print('Got %s, expected %s' % (str(got_cs), str(expected_cs)))
-        return 'fail'
+    assert got_cs == expected_cs
     got_ct = out_ds.GetRasterBand(1).GetColorTable()
-    if got_ct is not None:
-        return 'fail'
-    if out_ds.GetRasterBand(1).GetBlockSize() != [512, 512]:
-        return 'fail'
+    assert got_ct is None
+    assert out_ds.GetRasterBand(1).GetBlockSize() == [512, 512]
     out_ds = None
 
     gdal.Unlink('/vsimem/mbtiles_8.mbtiles')
@@ -559,11 +491,8 @@ def test_mbtiles_9():
 
     with gdaltest.error_handler():
         ds = gdal.Open('/vsimem/mbtiles_9.mbtiles')
-    if ds.RasterXSize != 256 or ds.RasterYSize != 256:
-        return 'fail'
-    if abs(ds.GetGeoTransform()[0] - -13110479.091473430395126) > 1e-6:
-        print(ds.GetGeoTransform())
-        return 'fail'
+    assert ds.RasterXSize == 256 and ds.RasterYSize == 256
+    assert abs(ds.GetGeoTransform()[0] - -13110479.091473430395126) <= 1e-6
     ds = None
 
     gdal.Unlink('/vsimem/mbtiles_9.mbtiles')
@@ -589,9 +518,7 @@ def test_mbtiles_10():
 
     ds = gdal.Open('/vsimem/mbtiles_10.mbtiles')
     cs = ds.GetRasterBand(1).Checksum()
-    if cs != 29925:
-        print(cs)
-        return 'fail'
+    assert cs == 29925
     ds = None
 
     gdal.Unlink('/vsimem/mbtiles_10.mbtiles')
@@ -612,9 +539,7 @@ def test_mbtiles_11():
     if gdal.GetDriverByName('PNG') is None:
         return 'skip'
     ds = gdal.Open('data/byte.mbtiles.sql')
-    if ds.GetRasterBand(1).Checksum() != 4118:
-        gdaltest.post_reason('validation failed')
-        return 'fail'
+    assert ds.GetRasterBand(1).Checksum() == 4118, 'validation failed'
 
     return 'success'
 
@@ -627,8 +552,7 @@ def test_mbtiles_raster_open_in_vector_mode():
         return 'skip'
 
     ds = ogr.Open('data/byte.mbtiles')
-    if ds is not None:
-        return 'fail'
+    assert ds is None
 
     return 'success'
 
@@ -643,8 +567,7 @@ def test_mbtiles_create():
     filename = '/vsimem/mbtiles_create.mbtiles'
     gdaltest.mbtiles_drv.Create(filename, 1, 1, 1)
     with gdaltest.error_handler():
-        if gdal.Open(filename) is not None:
-            return 'fail'
+        assert gdal.Open(filename) is None
 
     # Nominal case
     gdal.Unlink(filename)
@@ -656,21 +579,18 @@ def test_mbtiles_create():
     # Cannot modify geotransform once set"
     with gdaltest.error_handler():
         ret = ds.SetGeoTransform(src_ds.GetGeoTransform())
-    if ret == 0:
-        return 'fail'
+    assert ret != 0
     ds = None
 
     ds = gdal.Open('data/byte.mbtiles')
     # SetGeoTransform() not supported on read-only dataset"
     with gdaltest.error_handler():
         ret = ds.SetGeoTransform(src_ds.GetGeoTransform())
-    if ret == 0:
-        return 'fail'
+    assert ret != 0
     # SetProjection() not supported on read-only dataset
     with gdaltest.error_handler():
         ret = ds.SetProjection(src_ds.GetProjectionRef())
-    if ret == 0:
-        return 'fail'
+    assert ret != 0
     ds = None
 
     gdal.Unlink(filename)
@@ -678,8 +598,7 @@ def test_mbtiles_create():
     # Only EPSG:3857 supported on MBTiles dataset
     with gdaltest.error_handler():
         ret = ds.SetProjection('LOCAL_CS["foo"]')
-    if ret == 0:
-        return 'fail'
+    assert ret != 0
     ds = None
 
     gdal.Unlink(filename)
@@ -687,8 +606,7 @@ def test_mbtiles_create():
     # Only north-up non rotated geotransform supported
     with gdaltest.error_handler():
         ret = ds.SetGeoTransform([0, 1, 0, 0, 0, 1])
-    if ret == 0:
-        return 'fail'
+    assert ret != 0
     ds = None
 
     gdal.Unlink(filename)
@@ -696,8 +614,7 @@ def test_mbtiles_create():
     # Could not find an appropriate zoom level that matches raster pixel size
     with gdaltest.error_handler():
         ret = ds.SetGeoTransform([0, 1, 0, 0, 0, -1])
-    if ret == 0:
-        return 'fail'
+    assert ret != 0
     ds = None
 
     gdal.Unlink(filename)
diff --git a/autotest/gdrivers/mem.py b/autotest/gdrivers/mem.py
index df13093ef5ab..db12914e294a 100755
--- a/autotest/gdrivers/mem.py
+++ b/autotest/gdrivers/mem.py
@@ -48,13 +48,9 @@ def test_mem_1():
     gdaltest.mem_ds = drv.Create('mem_1.mem', 50, 3)
     ds = gdaltest.mem_ds
 
-    if ds.GetProjection() != '':
-        gdaltest.post_reason('projection wrong')
-        return 'fail'
+    assert ds.GetProjection() == '', 'projection wrong'
 
-    if ds.GetGeoTransform(can_return_null=True) is not None:
-        gdaltest.post_reason('geotransform wrong')
-        return 'fail'
+    assert ds.GetGeoTransform(can_return_null=True) is None, 'geotransform wrong'
 
     raw_data = array.array('f', list(range(150))).tostring()
     ds.WriteRaster(0, 0, 50, 3, raw_data,
@@ -82,41 +78,22 @@ def test_mem_1():
     #######################################################
     # Verify dataset.
 
-    if band.GetNoDataValue() != -1.0:
-        gdaltest.post_reason('no data is wrong')
-        return 'fail'
+    assert band.GetNoDataValue() == -1.0, 'no data is wrong'
 
-    if ds.GetProjection() != wkt:
-        gdaltest.post_reason('projection wrong')
-        return 'fail'
+    assert ds.GetProjection() == wkt, 'projection wrong'
 
-    if ds.GetGeoTransform() != gt:
-        gdaltest.post_reason('geotransform wrong')
-        return 'fail'
+    assert ds.GetGeoTransform() == gt, 'geotransform wrong'
 
-    if band.Checksum() != 1531:
-        gdaltest.post_reason('checksum wrong')
-        print(band.Checksum())
-        return 'fail'
+    assert band.Checksum() == 1531, 'checksum wrong'
 
-    if ds.GetGCPCount() != 1:
-        gdaltest.post_reason('GetGCPCount wrong')
-        return 'fail'
+    assert ds.GetGCPCount() == 1, 'GetGCPCount wrong'
 
-    if len(ds.GetGCPs()) != 1:
-        gdaltest.post_reason('GetGCPs wrong')
-        return 'fail'
+    assert len(ds.GetGCPs()) == 1, 'GetGCPs wrong'
 
-    if ds.GetGCPProjection() != wkt_gcp:
-        gdaltest.post_reason('GetGCPProjection wrong')
-        return 'fail'
+    assert ds.GetGCPProjection() == wkt_gcp, 'GetGCPProjection wrong'
 
-    if band.DeleteNoDataValue() != 0:
-        gdaltest.post_reason('wrong return code')
-        return 'fail'
-    if band.GetNoDataValue() is not None:
-        gdaltest.post_reason('got nodata value whereas none was expected')
-        return 'fail'
+    assert band.DeleteNoDataValue() == 0, 'wrong return code'
+    assert band.GetNoDataValue() is None, 'got nodata value whereas none was expected'
 
     gdaltest.mem_ds = None
 
@@ -131,9 +108,7 @@ def test_mem_2():
     gdal.PushErrorHandler('CPLQuietErrorHandler')
     ds = gdal.Open('MEM:::')
     gdal.PopErrorHandler()
-    if ds is not None:
-        gdaltest.post_reason('opening MEM dataset should have failed.')
-        return 'fail'
+    assert ds is None, 'opening MEM dataset should have failed.'
 
     try:
         import ctypes
@@ -212,8 +187,7 @@ def test_mem_3():
 
     drv = gdal.GetDriverByName('MEM')
     ds = drv.Create('MEM:::', 1, 1, 1)
-    if ds is None:
-        return 'fail'
+    assert ds is not None
     ds = None
 
     return 'success'
@@ -230,19 +204,15 @@ def test_mem_4():
     expected_cs = [0, 0, 0]
     for i in range(3):
         cs = ds.GetRasterBand(i + 1).Checksum()
-        if cs != expected_cs[i]:
-            gdaltest.post_reason('did not get expected checksum for band %d' % (i + 1))
-            print(cs)
-            return 'fail'
+        assert cs == expected_cs[i], \
+            ('did not get expected checksum for band %d' % (i + 1))
 
     ds.GetRasterBand(1).Fill(255)
     expected_cs = [57182, 0, 0]
     for i in range(3):
         cs = ds.GetRasterBand(i + 1).Checksum()
-        if cs != expected_cs[i]:
-            gdaltest.post_reason('did not get expected checksum for band %d after fill' % (i + 1))
-            print(cs)
-            return 'fail'
+        assert cs == expected_cs[i], \
+            ('did not get expected checksum for band %d after fill' % (i + 1))
 
     ds = None
 
@@ -260,23 +230,18 @@ def test_mem_5():
     expected_cs = [0, 0, 0]
     for i in range(3):
         cs = ds.GetRasterBand(i + 1).Checksum()
-        if cs != expected_cs[i]:
-            gdaltest.post_reason('did not get expected checksum for band %d' % (i + 1))
-            print(cs)
-            return 'fail'
+        assert cs == expected_cs[i], \
+            ('did not get expected checksum for band %d' % (i + 1))
 
     ds.GetRasterBand(1).Fill(255)
     expected_cs = [57182, 0, 0]
     for i in range(3):
         cs = ds.GetRasterBand(i + 1).Checksum()
-        if cs != expected_cs[i]:
-            gdaltest.post_reason('did not get expected checksum for band %d after fill' % (i + 1))
-            print(cs)
-            return 'fail'
+        assert cs == expected_cs[i], \
+            ('did not get expected checksum for band %d after fill' % (i + 1))
 
-    if ds.GetMetadataItem('INTERLEAVE', 'IMAGE_STRUCTURE') != 'PIXEL':
-        gdaltest.post_reason('did not get expected INTERLEAVE value')
-        return 'fail'
+    assert ds.GetMetadataItem('INTERLEAVE', 'IMAGE_STRUCTURE') == 'PIXEL', \
+        'did not get expected INTERLEAVE value'
 
     ds = None
 
@@ -296,36 +261,31 @@ def test_mem_6():
     # Multiplication overflow
     with gdaltest.error_handler():
         ds = drv.Create('', 1, 1, 0x7FFFFFFF, gdal.GDT_Float64)
-    if ds is not None:
-        return 'fail'
+    assert ds is None
     ds = None
 
     # Multiplication overflow
     with gdaltest.error_handler():
         ds = drv.Create('', 0x7FFFFFFF, 0x7FFFFFFF, 16)
-    if ds is not None:
-        return 'fail'
+    assert ds is None
     ds = None
 
     # Multiplication overflow
     with gdaltest.error_handler():
         ds = drv.Create('', 0x7FFFFFFF, 0x7FFFFFFF, 1, gdal.GDT_Float64)
-    if ds is not None:
-        return 'fail'
+    assert ds is None
     ds = None
 
     # Out of memory error
     with gdaltest.error_handler():
         ds = drv.Create('', 0x7FFFFFFF, 0x7FFFFFFF, 1, options=['INTERLEAVE=PIXEL'])
-    if ds is not None:
-        return 'fail'
+    assert ds is None
     ds = None
 
     # Out of memory error
     with gdaltest.error_handler():
         ds = drv.Create('', 0x7FFFFFFF, 0x7FFFFFFF, 1)
-    if ds is not None:
-        return 'fail'
+    assert ds is None
     ds = None
 
     # 32 bit overflow on 32-bit builds, or possible out of memory error
@@ -337,8 +297,7 @@ def test_mem_6():
     ds = drv.Create('', 0x7FFFFFFF, 0x7FFFFFFF, 0)
     with gdaltest.error_handler():
         ret = ds.AddBand(gdal.GDT_Float64)
-    if ret == 0:
-        return 'fail'
+    assert ret != 0
 
     return 'success'
 
@@ -351,8 +310,7 @@ def test_mem_7():
     drv = gdal.GetDriverByName('MEM')
     ds = drv.Create('MEM:::', 1, 1, 1)
     ds.AddBand(gdal.GDT_Byte, [])
-    if ds.RasterCount != 2:
-        return 'fail'
+    assert ds.RasterCount == 2
     ds = None
 
     return 'success'
@@ -371,9 +329,7 @@ def test_mem_8():
     hist = ds.GetRasterBand(1).GetDefaultHistogram(force=0)
     ds = None
 
-    if hist != (1.0, 2.0, 2, [3000000000, 4]):
-        print(hist)
-        return 'fail'
+    assert hist == (1.0, 2.0, 2, [3000000000, 4])
 
     return 'success'
 
@@ -400,44 +356,30 @@ def test_mem_9():
 
         ref_data = src_ds.GetRasterBand(2).ReadRaster(20, 8, 4, 5, buf_pixel_space=3, buf_line_space=100)
         got_data = out_ds.GetRasterBand(2).ReadRaster(20, 8, 4, 5, buf_pixel_space=3, buf_line_space=100)
-        if ref_data != got_data:
-            print(interleave)
-            return 'fail'
+        assert ref_data == got_data, interleave
 
         ref_data = src_ds.ReadRaster(20, 8, 4, 5)
         got_data = out_ds.ReadRaster(20, 8, 4, 5)
-        if ref_data != got_data:
-            print(interleave)
-            return 'fail'
+        assert ref_data == got_data, interleave
 
         ref_data = src_ds.ReadRaster(20, 8, 4, 5, buf_pixel_space=3, buf_band_space=1)
         got_data = out_ds.ReadRaster(20, 8, 4, 5, buf_pixel_space=3, buf_band_space=1)
-        if ref_data != got_data:
-            print(interleave)
-            return 'fail'
+        assert ref_data == got_data, interleave
 
         out_ds.WriteRaster(20, 8, 4, 5, got_data, buf_pixel_space=3, buf_band_space=1)
         got_data = out_ds.ReadRaster(20, 8, 4, 5, buf_pixel_space=3, buf_band_space=1)
-        if ref_data != got_data:
-            print(interleave)
-            return 'fail'
+        assert ref_data == got_data, interleave
 
         ref_data = src_ds.ReadRaster(20, 8, 4, 5, buf_pixel_space=3, buf_line_space=100, buf_band_space=1)
         got_data = out_ds.ReadRaster(20, 8, 4, 5, buf_pixel_space=3, buf_line_space=100, buf_band_space=1)
-        if ref_data != got_data:
-            print(interleave)
-            return 'fail'
+        assert ref_data == got_data, interleave
 
         ref_data = src_ds.ReadRaster(20, 20, 4, 5, buf_type=gdal.GDT_Int32, buf_pixel_space=12, buf_band_space=4)
         got_data = out_ds.ReadRaster(20, 20, 4, 5, buf_type=gdal.GDT_Int32, buf_pixel_space=12, buf_band_space=4)
-        if ref_data != got_data:
-            print(interleave)
-            return 'fail'
+        assert ref_data == got_data, interleave
         out_ds.WriteRaster(20, 20, 4, 5, got_data, buf_type=gdal.GDT_Int32, buf_pixel_space=12, buf_band_space=4)
         got_data = out_ds.ReadRaster(20, 20, 4, 5, buf_type=gdal.GDT_Int32, buf_pixel_space=12, buf_band_space=4)
-        if ref_data != got_data:
-            print(interleave)
-            return 'fail'
+        assert ref_data == got_data, interleave
 
         # Test IReadBlock
         ref_data = src_ds.GetRasterBand(1).ReadRaster(0, 10, src_ds.RasterXSize, 1)
@@ -445,44 +387,33 @@ def test_mem_9():
         # to make that unnecessary
         out_ds.FlushCache()
         got_data = out_ds.GetRasterBand(1).ReadBlock(0, 10)
-        if ref_data != got_data:
-            print(interleave)
-            return 'fail'
+        assert ref_data == got_data, interleave
 
         # Test IRasterIO(GF_Write,)
         ref_data = src_ds.GetRasterBand(1).ReadRaster(2, 3, 4, 5)
         out_ds.GetRasterBand(1).WriteRaster(6, 7, 4, 5, ref_data)
         got_data = out_ds.GetRasterBand(1).ReadRaster(6, 7, 4, 5)
-        if ref_data != got_data:
-            return 'fail'
+        assert ref_data == got_data
 
         # Test IRasterIO(GF_Write, change data type) + IWriteBlock() + IRasterIO(GF_Read, change data type)
         ref_data = src_ds.GetRasterBand(1).ReadRaster(10, 11, 4, 5, buf_type=gdal.GDT_Int32)
         out_ds.GetRasterBand(1).WriteRaster(10, 11, 4, 5, ref_data, buf_type=gdal.GDT_Int32)
         got_data = out_ds.GetRasterBand(1).ReadRaster(10, 11, 4, 5, buf_type=gdal.GDT_Int32)
-        if ref_data != got_data:
-            print(interleave)
-            return 'fail'
+        assert ref_data == got_data, interleave
 
         ref_data = src_ds.GetRasterBand(1).ReadRaster(10, 11, 4, 5)
         got_data = out_ds.GetRasterBand(1).ReadRaster(10, 11, 4, 5)
-        if ref_data != got_data:
-            print(interleave)
-            return 'fail'
+        assert ref_data == got_data, interleave
 
         # Test IRasterIO(GF_Write, resampling) + IWriteBlock() + IRasterIO(GF_Read, resampling)
         ref_data = src_ds.GetRasterBand(1).ReadRaster(10, 11, 4, 5)
         ref_data_zoomed = src_ds.GetRasterBand(1).ReadRaster(10, 11, 4, 5, 8, 10)
         out_ds.GetRasterBand(1).WriteRaster(10, 11, 8, 10, ref_data, 4, 5)
         got_data = out_ds.GetRasterBand(1).ReadRaster(10, 11, 8, 10)
-        if ref_data_zoomed != got_data:
-            print(interleave)
-            return 'fail'
+        assert ref_data_zoomed == got_data, interleave
 
         got_data = out_ds.GetRasterBand(1).ReadRaster(10, 11, 8, 10, 4, 5)
-        if ref_data != got_data:
-            print(interleave)
-            return 'fail'
+        assert ref_data == got_data, interleave
 
     return 'success'
 
@@ -499,121 +430,80 @@ def test_mem_10():
 
     # Requesting overviews when they are not
     ds = gdal.GetDriverByName('MEM').Create('', 1, 1)
-    if ds.GetRasterBand(1).GetOverviewCount() != 0:
-        return 'fail'
-    if ds.GetRasterBand(1).GetOverview(-1) is not None:
-        return 'fail'
-    if ds.GetRasterBand(1).GetOverview(0) is not None:
-        return 'fail'
+    assert ds.GetRasterBand(1).GetOverviewCount() == 0
+    assert ds.GetRasterBand(1).GetOverview(-1) is None
+    assert ds.GetRasterBand(1).GetOverview(0) is None
 
     # Single band case
     ds = gdal.GetDriverByName('MEM').CreateCopy('', gdal.Open('data/byte.tif'))
     for _ in range(2):
         ret = ds.BuildOverviews('NEAR', [2])
-        if ret != 0:
-            return 'fail'
-        if ds.GetRasterBand(1).GetOverviewCount() != 1:
-            return 'fail'
+        assert ret == 0
+        assert ds.GetRasterBand(1).GetOverviewCount() == 1
         cs = ds.GetRasterBand(1).GetOverview(0).Checksum()
-        if cs != 1087:
-            print(cs)
-            return 'fail'
+        assert cs == 1087
 
     ret = ds.BuildOverviews('NEAR', [4])
-    if ret != 0:
-        return 'fail'
-    if ds.GetRasterBand(1).GetOverviewCount() != 2:
-        return 'fail'
+    assert ret == 0
+    assert ds.GetRasterBand(1).GetOverviewCount() == 2
     cs = ds.GetRasterBand(1).GetOverview(0).Checksum()
-    if cs != 1087:
-        print(cs)
-        return 'fail'
+    assert cs == 1087
     cs = ds.GetRasterBand(1).GetOverview(1).Checksum()
-    if cs != 328:
-        print(cs)
-        return 'fail'
+    assert cs == 328
 
     ret = ds.BuildOverviews('NEAR', [2, 4])
-    if ret != 0:
-        return 'fail'
-    if ds.GetRasterBand(1).GetOverviewCount() != 2:
-        return 'fail'
+    assert ret == 0
+    assert ds.GetRasterBand(1).GetOverviewCount() == 2
     cs = ds.GetRasterBand(1).GetOverview(0).Checksum()
-    if cs != 1087:
-        print(cs)
-        return 'fail'
+    assert cs == 1087
     cs = ds.GetRasterBand(1).GetOverview(1).Checksum()
-    if cs != 328:
-        print(cs)
-        return 'fail'
+    assert cs == 328
 
     # Test that average in one or several steps give the same result
     ds.GetRasterBand(1).GetOverview(0).Fill(0)
     ds.GetRasterBand(1).GetOverview(1).Fill(0)
 
     ret = ds.BuildOverviews('AVERAGE', [2, 4])
-    if ret != 0:
-        return 'fail'
-    if ds.GetRasterBand(1).GetOverviewCount() != 2:
-        return 'fail'
+    assert ret == 0
+    assert ds.GetRasterBand(1).GetOverviewCount() == 2
     cs = ds.GetRasterBand(1).GetOverview(0).Checksum()
-    if cs != 1152:
-        print(cs)
-        return 'fail'
+    assert cs == 1152
     cs = ds.GetRasterBand(1).GetOverview(1).Checksum()
-    if cs != 240:
-        print(cs)
-        return 'fail'
+    assert cs == 240
 
     ds.GetRasterBand(1).GetOverview(0).Fill(0)
     ds.GetRasterBand(1).GetOverview(1).Fill(0)
 
     ret = ds.BuildOverviews('AVERAGE', [2])
     ret = ds.BuildOverviews('AVERAGE', [4])
-    if ret != 0:
-        return 'fail'
-    if ds.GetRasterBand(1).GetOverviewCount() != 2:
-        return 'fail'
+    assert ret == 0
+    assert ds.GetRasterBand(1).GetOverviewCount() == 2
     cs = ds.GetRasterBand(1).GetOverview(0).Checksum()
-    if cs != 1152:
-        print(cs)
-        return 'fail'
+    assert cs == 1152
     cs = ds.GetRasterBand(1).GetOverview(1).Checksum()
-    if cs != 240:
-        print(cs)
-        return 'fail'
+    assert cs == 240
 
     ds = None
 
     # Multiple band case
     ds = gdal.GetDriverByName('MEM').CreateCopy('', gdal.Open('data/rgbsmall.tif'))
     ret = ds.BuildOverviews('NEAR', [2])
-    if ret != 0:
-        return 'fail'
+    assert ret == 0
     cs = ds.GetRasterBand(1).GetOverview(0).Checksum()
-    if cs != 5057:
-        print(cs)
-        return 'fail'
+    assert cs == 5057
     cs = ds.GetRasterBand(2).GetOverview(0).Checksum()
-    if cs != 5304:
-        print(cs)
-        return 'fail'
+    assert cs == 5304
     cs = ds.GetRasterBand(3).GetOverview(0).Checksum()
-    if cs != 5304:
-        print(cs)
-        return 'fail'
+    assert cs == 5304
     ds = None
 
     # Clean overviews
     ds = gdal.GetDriverByName('MEM').CreateCopy('', gdal.Open('data/byte.tif'))
     ret = ds.BuildOverviews('NEAR', [2])
-    if ret != 0:
-        return 'fail'
+    assert ret == 0
     ret = ds.BuildOverviews('NONE', [])
-    if ret != 0:
-        return 'fail'
-    if ds.GetRasterBand(1).GetOverviewCount() != 0:
-        return 'fail'
+    assert ret == 0
+    assert ds.GetRasterBand(1).GetOverviewCount() == 0
     ds = None
 
     return 'success'
@@ -626,59 +516,47 @@ def test_mem_11():
 
     # Error case: building overview on a 0 band dataset
     ds = gdal.GetDriverByName('MEM').Create('', 1, 1, 0)
-    if ds.CreateMaskBand(gdal.GMF_PER_DATASET) == 0:
-        return 'fail'
+    assert ds.CreateMaskBand(gdal.GMF_PER_DATASET) != 0
 
     # Per dataset mask on single band dataset
     ds = gdal.GetDriverByName('MEM').Create('', 1, 1)
-    if ds.CreateMaskBand(gdal.GMF_PER_DATASET) != 0:
-        return 'fail'
-    if ds.GetRasterBand(1).GetMaskFlags() != gdal.GMF_PER_DATASET:
-        return 'fail'
+    assert ds.CreateMaskBand(gdal.GMF_PER_DATASET) == 0
+    assert ds.GetRasterBand(1).GetMaskFlags() == gdal.GMF_PER_DATASET
     mask = ds.GetRasterBand(1).GetMaskBand()
     cs = mask.Checksum()
-    if cs != 0:
-        return 'fail'
+    assert cs == 0
     mask.Fill(255)
     cs = mask.Checksum()
-    if cs != 3:
-        return 'fail'
+    assert cs == 3
 
     # Check that the per dataset mask is shared by all bands
     ds = gdal.GetDriverByName('MEM').Create('', 1, 1, 2)
-    if ds.CreateMaskBand(gdal.GMF_PER_DATASET) != 0:
-        return 'fail'
+    assert ds.CreateMaskBand(gdal.GMF_PER_DATASET) == 0
     mask1 = ds.GetRasterBand(1).GetMaskBand()
     mask1.Fill(255)
     mask2 = ds.GetRasterBand(2).GetMaskBand()
     cs = mask2.Checksum()
-    if cs != 3:
-        return 'fail'
+    assert cs == 3
 
     # Same but call it on band 2
     ds = gdal.GetDriverByName('MEM').Create('', 1, 1, 2)
-    if ds.GetRasterBand(2).CreateMaskBand(gdal.GMF_PER_DATASET) != 0:
-        return 'fail'
+    assert ds.GetRasterBand(2).CreateMaskBand(gdal.GMF_PER_DATASET) == 0
     mask2 = ds.GetRasterBand(2).GetMaskBand()
     mask2.Fill(255)
     mask1 = ds.GetRasterBand(1).GetMaskBand()
     cs = mask1.Checksum()
-    if cs != 3:
-        return 'fail'
+    assert cs == 3
 
     # Per band masks
     ds = gdal.GetDriverByName('MEM').Create('', 1, 1, 2)
-    if ds.GetRasterBand(1).CreateMaskBand(0) != 0:
-        return 'fail'
-    if ds.GetRasterBand(2).CreateMaskBand(0) != 0:
-        return 'fail'
+    assert ds.GetRasterBand(1).CreateMaskBand(0) == 0
+    assert ds.GetRasterBand(2).CreateMaskBand(0) == 0
     mask1 = ds.GetRasterBand(1).GetMaskBand()
     mask2 = ds.GetRasterBand(2).GetMaskBand()
     mask2.Fill(255)
     cs1 = mask1.Checksum()
     cs2 = mask2.Checksum()
-    if cs1 != 0 or cs2 != 3:
-        return 'fail'
+    assert cs1 == 0 and cs2 == 3
 
     return 'success'
 
@@ -694,15 +572,11 @@ def test_mem_12():
     ds.GetRasterBand(1).GetMaskBand().Fill(127)
     ds.BuildOverviews('NEAR', [2])
     cs = ds.GetRasterBand(1).GetOverview(0).GetMaskBand().Checksum()
-    if cs != 267:
-        print(cs)
-        return 'fail'
+    assert cs == 267
 
     # Default mask
     cs = ds.GetRasterBand(2).GetOverview(0).GetMaskBand().Checksum()
-    if cs != 283:
-        print(cs)
-        return 'fail'
+    assert cs == 283
 
     # Test on per-dataset mask
     ds = gdal.GetDriverByName('MEM').Create('', 10, 10, 2)
@@ -710,13 +584,9 @@ def test_mem_12():
     ds.GetRasterBand(1).GetMaskBand().Fill(127)
     ds.BuildOverviews('NEAR', [2])
     cs = ds.GetRasterBand(1).GetOverview(0).GetMaskBand().Checksum()
-    if cs != 267:
-        print(cs)
-        return 'fail'
+    assert cs == 267
     cs2 = ds.GetRasterBand(2).GetOverview(0).GetMaskBand().Checksum()
-    if cs2 != cs:
-        print(cs2)
-        return 'fail'
+    assert cs2 == cs
 
     return 'success'
 
@@ -728,11 +598,9 @@ def test_mem_rat():
 
     ds = gdal.GetDriverByName('MEM').Create('', 1, 1)
     ds.GetRasterBand(1).SetDefaultRAT(gdal.RasterAttributeTable())
-    if ds.GetRasterBand(1).GetDefaultRAT() is None:
-        return 'fail'
+    assert ds.GetRasterBand(1).GetDefaultRAT() is not None
     ds.GetRasterBand(1).SetDefaultRAT(None)
-    if ds.GetRasterBand(1).GetDefaultRAT() is not None:
-        return 'fail'
+    assert ds.GetRasterBand(1).GetDefaultRAT() is None
 
     return 'success'
 
@@ -744,11 +612,9 @@ def test_mem_categorynames():
 
     ds = gdal.GetDriverByName('MEM').Create('', 1, 1)
     ds.GetRasterBand(1).SetCategoryNames(['foo'])
-    if ds.GetRasterBand(1).GetCategoryNames() != ['foo']:
-        return 'fail'
+    assert ds.GetRasterBand(1).GetCategoryNames() == ['foo']
     ds.GetRasterBand(1).SetCategoryNames([])
-    if ds.GetRasterBand(1).GetCategoryNames() is not None:
-        return 'fail'
+    assert ds.GetRasterBand(1).GetCategoryNames() is None
 
     return 'success'
 
@@ -762,11 +628,9 @@ def test_mem_colortable():
     ct = gdal.ColorTable()
     ct.SetColorEntry(0, (255, 255, 255, 255))
     ds.GetRasterBand(1).SetColorTable(ct)
-    if ds.GetRasterBand(1).GetColorTable().GetCount() != 1:
-        return 'fail'
+    assert ds.GetRasterBand(1).GetColorTable().GetCount() == 1
     ds.GetRasterBand(1).SetColorTable(None)
-    if ds.GetRasterBand(1).GetColorTable() is not None:
-        return 'fail'
+    assert ds.GetRasterBand(1).GetColorTable() is None
 
     return 'success'
 
diff --git a/autotest/gdrivers/mg4lidar.py b/autotest/gdrivers/mg4lidar.py
index 3411d5ff4f6d..5413a78b68b5 100755
--- a/autotest/gdrivers/mg4lidar.py
+++ b/autotest/gdrivers/mg4lidar.py
@@ -62,9 +62,7 @@ def test_mg4lidar_1():
             return 'skip'
 
     ds = gdal.Open('tmp/cache/GDAL_MG4Lidar_Src/Tetons_200k.view')
-    if ds is None:
-        gdaltest.post_reason('could not open dataset')
-        return 'fail'
+    assert ds is not None, 'could not open dataset'
 
     prj = ds.GetProjectionRef()
     if prj.find('NAD83 / UTM zone 12N') == -1:
@@ -75,10 +73,7 @@ def test_mg4lidar_1():
     gt = ds.GetGeoTransform()
     ref_gt = (504489.919999999983702, 3.078227571115974, 0, 4795848.389999999664724, 0, -3.078259860787739)
     for i in range(6):
-        if abs(gt[i] - ref_gt[i]) > 1e-6:
-            gdaltest.post_reason('did not get expected geotransform')
-            print(gt)
-            return 'fail'
+        assert abs(gt[i] - ref_gt[i]) <= 1e-6, 'did not get expected geotransform'
 
     cs = ds.GetRasterBand(1).Checksum()
     if cs != 13216:
diff --git a/autotest/gdrivers/mrf.py b/autotest/gdrivers/mrf.py
index d8ad6ca1cbb7..9468d3bd65b1 100755
--- a/autotest/gdrivers/mrf.py
+++ b/autotest/gdrivers/mrf.py
@@ -151,11 +151,7 @@ def test_mrf_overview_near_fact_2():
 
         ds = gdal.Open('/vsimem/out.mrf')
         cs = ds.GetRasterBand(1).GetOverview(0).Checksum()
-        if cs != expected_cs:
-            print(dt)
-            print(cs)
-            print(expected_cs)
-            return 'fail'
+        assert cs == expected_cs, dt
         ds = None
 
         gdal.Unlink('/vsimem/out.mrf')
@@ -184,11 +180,7 @@ def test_mrf_overview_near_with_nodata_fact_2():
         ds = gdal.Open('/vsimem/out.mrf')
         cs = ds.GetRasterBand(1).GetOverview(0).Checksum()
         expected_cs = 1117
-        if cs != expected_cs:
-            print(dt)
-            print(cs)
-            print(expected_cs)
-            return 'fail'
+        assert cs == expected_cs, dt
         ds = None
 
         gdal.Unlink('/vsimem/out.mrf')
@@ -217,11 +209,7 @@ def test_mrf_overview_avg_fact_2():
 
         ds = gdal.Open('/vsimem/out.mrf')
         cs = ds.GetRasterBand(1).GetOverview(0).Checksum()
-        if cs != expected_cs:
-            print(dt)
-            print(cs)
-            print(expected_cs)
-            return 'fail'
+        assert cs == expected_cs, dt
         ds = None
 
         gdal.Unlink('/vsimem/out.mrf')
@@ -251,11 +239,7 @@ def test_mrf_overview_avg_with_nodata_fact_2():
 
         ds = gdal.Open('/vsimem/out.mrf')
         cs = ds.GetRasterBand(1).GetOverview(0).Checksum()
-        if cs != expected_cs:
-            print(dt)
-            print(cs)
-            print(expected_cs)
-            return 'fail'
+        assert cs == expected_cs, dt
         ds = None
 
         gdal.Unlink('/vsimem/out.mrf')
@@ -278,10 +262,7 @@ def test_mrf_overview_near_fact_3():
     ds = gdal.Open('/vsimem/out.mrf')
     cs = ds.GetRasterBand(1).GetOverview(0).Checksum()
     expected_cs = 478
-    if cs != expected_cs:
-        print(cs)
-        print(expected_cs)
-        return 'fail'
+    assert cs == expected_cs
     ds = None
 
     gdal.Unlink('/vsimem/out.mrf')
@@ -304,10 +285,7 @@ def test_mrf_overview_avg_fact_3():
     ds = gdal.Open('/vsimem/out.mrf')
     cs = ds.GetRasterBand(1).GetOverview(0).Checksum()
     expected_cs = 658
-    if cs != expected_cs:
-        print(cs)
-        print(expected_cs)
-        return 'fail'
+    assert cs == expected_cs
     ds = None
 
     gdal.Unlink('/vsimem/out.mrf')
@@ -337,11 +315,7 @@ def test_mrf_overview_avg_with_nodata_fact_3():
 
         ds = gdal.Open('/vsimem/out.mrf')
         cs = ds.GetRasterBand(1).GetOverview(0).Checksum()
-        if cs != expected_cs:
-            print(dt)
-            print(cs)
-            print(expected_cs)
-            return 'fail'
+        assert cs == expected_cs, dt
         ds = None
 
         gdal.Unlink('/vsimem/out.mrf')
@@ -362,9 +336,7 @@ def test_mrf_overview_partial_block():
 
     ds = gdal.Open('/vsimem/out.mrf')
     cs = ds.GetRasterBand(1).GetOverview(0).Checksum()
-    if cs != 1087:
-        print(cs)
-        return 'fail'
+    assert cs == 1087
     ds = None
 
     gdal.Unlink('/vsimem/out.mrf')
@@ -387,21 +359,16 @@ def test_mrf_overview_near_implicit_level():
 
     ds = gdal.Open('/vsimem/out.mrf')
     cs = ds.GetRasterBand(1).GetOverview(1).Checksum()
-    if cs != 328:
-        print(cs)
-        return 'fail'
+    assert cs == 328
     ds = None
 
     with gdaltest.error_handler():
         ds = gdal.Open('/vsimem/out.mrf:MRF:L2')
-    if ds is not None:
-        return 'fail'
+    assert ds is None
 
     ds = gdal.Open('/vsimem/out.mrf:MRF:L1')
     cs = ds.GetRasterBand(1).Checksum()
-    if cs != 328:
-        print(cs)
-        return 'fail'
+    assert cs == 328
     ds = None
 
     gdal.Unlink('/vsimem/out.mrf')
@@ -423,10 +390,7 @@ def test_mrf_overview_external():
     ds = gdal.Open('/vsimem/out.mrf')
     cs = ds.GetRasterBand(1).GetOverview(0).Checksum()
     expected_cs = 1087
-    if cs != expected_cs:
-        print(cs)
-        print(expected_cs)
-        return 'fail'
+    assert cs == expected_cs
     ds = None
 
     gdal.Unlink('/vsimem/out.mrf')
@@ -445,15 +409,10 @@ def test_mrf_lerc_nodata():
                    noData=107, creationOptions=['COMPRESS=LERC'])
     ds = gdal.Open('/vsimem/out.mrf')
     nodata = ds.GetRasterBand(1).GetNoDataValue()
-    if nodata != 107:
-        print(nodata)
-        return 'fail'
+    assert nodata == 107
     cs = ds.GetRasterBand(1).Checksum()
     expected_cs = 4672
-    if cs != expected_cs:
-        print(cs)
-        print(expected_cs)
-        return 'fail'
+    assert cs == expected_cs
     ds = None
 
     gdal.Unlink('/vsimem/out.mrf')
@@ -472,10 +431,7 @@ def test_mrf_lerc_with_huffman():
     ds = gdal.Open('/vsimem/out.mrf')
     cs = ds.GetRasterBand(1).Checksum()
     expected_cs = 31204
-    if cs != expected_cs:
-        print(cs)
-        print(expected_cs)
-        return 'fail'
+    assert cs == expected_cs
     ds = None
 
     gdal.Unlink('/vsimem/out.mrf')
@@ -496,10 +452,7 @@ def test_mrf_cached_source():
     with gdaltest.error_handler():
         cs = ds.GetRasterBand(1).Checksum()
     expected_cs = 0
-    if cs != expected_cs:
-        print(cs)
-        print(expected_cs)
-        return 'fail'
+    assert cs == expected_cs
     ds = None
 
     gdal.Unlink('/vsimem/out.mrf')
@@ -517,20 +470,14 @@ def test_mrf_cached_source():
     ds = gdal.Open('tmp/out.mrf')
     cs = ds.GetRasterBand(1).Checksum()
     expected_cs = 4672
-    if cs != expected_cs:
-        print(cs)
-        print(expected_cs)
-        return 'fail'
+    assert cs == expected_cs
     ds = None
 
     gdal.Unlink('tmp/byte.tif')
     ds = gdal.Open('tmp/out.mrf')
     cs = ds.GetRasterBand(1).Checksum()
     expected_cs = 4672
-    if cs != expected_cs:
-        print(cs)
-        print(expected_cs)
-        return 'fail'
+    assert cs == expected_cs
     ds = None
 
     # Caching MRF in mp_safe mode
@@ -559,20 +506,14 @@ def test_mrf_cached_source():
     ds = gdal.Open('tmp/out.mrf')
     cs = ds.GetRasterBand(1).Checksum()
     expected_cs = 4672
-    if cs != expected_cs:
-        print(cs)
-        print(expected_cs)
-        return 'fail'
+    assert cs == expected_cs
     ds = None
 
     gdal.Unlink('tmp/byte.tif')
     ds = gdal.Open('tmp/out.mrf')
     cs = ds.GetRasterBand(1).Checksum()
     expected_cs = 4672
-    if cs != expected_cs:
-        print(cs)
-        print(expected_cs)
-        return 'fail'
+    assert cs == expected_cs
     ds = None
 
     # Cloning MRF
@@ -593,10 +534,7 @@ def test_mrf_cached_source():
     ds = gdal.Open('tmp/cloning.mrf')
     cs = ds.GetRasterBand(1).Checksum()
     expected_cs = 4672
-    if cs != expected_cs:
-        print(cs)
-        print(expected_cs)
-        return 'fail'
+    assert cs == expected_cs
     ds = None
 
     gdal.Unlink('tmp/out.mrf')
@@ -608,10 +546,7 @@ def test_mrf_cached_source():
     ds = gdal.Open('tmp/cloning.mrf')
     cs = ds.GetRasterBand(1).Checksum()
     expected_cs = 4672
-    if cs != expected_cs:
-        print(cs)
-        print(expected_cs)
-        return 'fail'
+    assert cs == expected_cs
     ds = None
 
     gdal.Unlink('tmp/cloning.mrf')
@@ -651,34 +586,24 @@ def test_mrf_versioned():
     ds = gdal.Open('/vsimem/out.mrf')
     cs = ds.GetRasterBand(1).Checksum()
     expected_cs = 0
-    if cs != expected_cs:
-        print(cs)
-        print(expected_cs)
-        return 'fail'
+    assert cs == expected_cs
     ds = None
 
     ds = gdal.Open('/vsimem/out.mrf:MRF:V0')
     cs = ds.GetRasterBand(1).Checksum()
     expected_cs = 0
-    if cs != expected_cs:
-        print(cs)
-        print(expected_cs)
-        return 'fail'
+    assert cs == expected_cs
     ds = None
 
     ds = gdal.Open('/vsimem/out.mrf:MRF:V1')
     cs = ds.GetRasterBand(1).Checksum()
     expected_cs = 4672
-    if cs != expected_cs:
-        print(cs)
-        print(expected_cs)
-        return 'fail'
+    assert cs == expected_cs
     ds = None
 
     with gdaltest.error_handler():
         ds = gdal.Open('/vsimem/out.mrf:MRF:V2')
-    if ds is not None:
-        return 'fail'
+    assert ds is None
 
     gdal.Unlink('/vsimem/out.mrf')
     gdal.Unlink('/vsimem/out.mrf.aux.xml')
diff --git a/autotest/gdrivers/mrsid.py b/autotest/gdrivers/mrsid.py
index fa711eeff193..2350ebba3fd6 100755
--- a/autotest/gdrivers/mrsid.py
+++ b/autotest/gdrivers/mrsid.py
@@ -36,6 +36,7 @@
 
 
 import gdaltest
+import pytest
 
 ###############################################################################
 # Read a simple byte file, checking projections and geotransform.
@@ -121,9 +122,8 @@ def test_mrsid_1():
 
     if prj.find('North_American_Datum_1927') == -1 or \
        prj.find('Mercator_1SP') == -1:
-        gdaltest.post_reason('did not get expected projection')
         print(got_prj)
-        return 'fail'
+        pytest.fail('did not get expected projection')
 
     if got_prj != prj:
         print('Warning: did not get exactly expected projection. Got %s' % got_prj)
@@ -163,9 +163,7 @@ def test_mrsid_2():
 
     mean = float(total) / len(data)
 
-    if mean < 95 or mean > 105:
-        gdaltest.post_reason('image mean out of range.')
-        return 'fail'
+    assert mean >= 95 and mean <= 105, 'image mean out of range.'
 
     return 'success'
 
@@ -181,9 +179,7 @@ def test_mrsid_3():
     ds = gdal.Open('data/mercator.sid')
 
     band = ds.GetRasterBand(1)
-    if band.GetOverviewCount() != 4:
-        gdaltest.post_reason('did not get expected overview count')
-        return 'fail'
+    assert band.GetOverviewCount() == 4, 'did not get expected overview count'
 
     new_stat = band.GetOverview(3).GetStatistics(0, 1)
 
@@ -195,8 +191,7 @@ def test_mrsid_3():
             print('')
             print('old = ', check_stat)
             print('new = ', new_stat)
-            gdaltest.post_reason('Statistics differ.')
-            return 'fail'
+            pytest.fail('Statistics differ.')
 
     return 'success'
 
@@ -347,18 +342,11 @@ def test_mrsid_8():
 
     ds = gdal.Open('tmp/mercator.sid')
 
-    if new_srs != ds.GetProjectionRef():
-        print(ds.GetProjectionRef())
-        gdaltest.post_reason('SRS Override failed.')
-        return 'fail'
+    assert new_srs == ds.GetProjectionRef(), 'SRS Override failed.'
 
-    if new_gt != ds.GetGeoTransform():
-        gdaltest.post_reason('Geotransform Override failed.')
-        return 'fail'
+    assert new_gt == ds.GetGeoTransform(), 'Geotransform Override failed.'
 
-    if ds.GetRasterBand(1).GetNoDataValue() != 255:
-        gdaltest.post_reason('Nodata override failed.')
-        return 'fail'
+    assert ds.GetRasterBand(1).GetNoDataValue() == 255, 'Nodata override failed.'
 
     ds = None
 
@@ -384,8 +372,7 @@ def test_mrsid_9():
     gdal.VSIFCloseL(f)
 
     ds = gdal.Open('/vsimem/mrsid_9.sid')
-    if ds is None:
-        return 'fail'
+    assert ds is not None
     ds = None
 
     gdal.Unlink('/vsimem/mrsid_9.sid')
@@ -409,8 +396,7 @@ def test_mrsid_10():
     gdal.VSIFCloseL(f)
 
     ds = gdal.Open('/vsimem/mrsid_10.jp2')
-    if ds is None:
-        return 'fail'
+    assert ds is not None
     ds = None
 
     gdal.Unlink('/vsimem/mrsid_10.jp2')
@@ -428,15 +414,8 @@ def test_mrsid_11():
     ds = gdal.Open('data/byte_without_geotransform.jp2')
 
     geotransform = ds.GetGeoTransform()
-    if abs(geotransform[0] - 440720) > 0.1 \
-            or abs(geotransform[1] - 60) > 0.001 \
-            or abs(geotransform[2] - 0) > 0.001 \
-            or abs(geotransform[3] - 3751320) > 0.1 \
-            or abs(geotransform[4] - 0) > 0.001 \
-            or abs(geotransform[5] - -60) > 0.001:
-        print(geotransform)
-        gdaltest.post_reason('geotransform differs from expected')
-        return 'fail'
+    assert abs(geotransform[0] - 440720) <= 0.1 and abs(geotransform[1] - 60) <= 0.001 and abs(geotransform[2] - 0) <= 0.001 and abs(geotransform[3] - 3751320) <= 0.1 and abs(geotransform[4] - 0) <= 0.001 and abs(geotransform[5] - -60) <= 0.001, \
+        'geotransform differs from expected'
 
     ds = None
 
@@ -561,8 +540,7 @@ def test_mrsid_online_4():
     if maxdiff > 1:
         print(ds.GetRasterBand(1).Checksum())
         print(ds_ref.GetRasterBand(1).Checksum())
-        gdaltest.post_reason('Image too different from reference')
-        return 'fail'
+        pytest.fail('Image too different from reference')
 
     return 'success'
 
diff --git a/autotest/gdrivers/netcdf.py b/autotest/gdrivers/netcdf.py
index 5d0eac472000..13af0b28bd84 100755
--- a/autotest/gdrivers/netcdf.py
+++ b/autotest/gdrivers/netcdf.py
@@ -183,16 +183,13 @@ def netcdf_test_deflate(ifile, checksum, zlevel=1, timeout=None):
     ofile2 = 'tmp/' + os.path.basename(ifile) + '-2.nc'
     ofile2_opts = ['FORMAT=NC4C', 'COMPRESS=DEFLATE', 'ZLEVEL=' + str(zlevel)]
 
-    if not os.path.exists(ifile):
-        gdaltest.post_reason('ifile %s does not exist' % ifile)
-        return 'fail'
+    assert os.path.exists(ifile), ('ifile %s does not exist' % ifile)
 
     result1 = netcdf_test_copy_timeout(ifile, 1, checksum, ofile1, ofile1_opts, 'NETCDF', timeout)
 
     result2 = netcdf_test_copy_timeout(ifile, 1, checksum, ofile2, ofile2_opts, 'NETCDF', timeout)
 
-    if result1 == 'fail' or result2 == 'fail':
-        return 'fail'
+    assert not (result1 == 'fail' or result2 == 'fail')
 
     # make sure compressed file is smaller than uncompressed files
     try:
@@ -202,9 +199,8 @@ def netcdf_test_deflate(ifile, checksum, zlevel=1, timeout=None):
         gdaltest.post_reason('Error getting file sizes.')
         return 'fail'
 
-    if size2 >= size1:
-        gdaltest.post_reason('Compressed file is not smaller than reference, check your netcdf-4, HDF5 and zlib installation')
-        return 'fail'
+    assert size2 < size1, \
+        'Compressed file is not smaller than reference, check your netcdf-4, HDF5 and zlib installation'
 
     return 'success'
 
@@ -216,54 +212,38 @@ def netcdf_check_vars(ifile, vals_global=None, vals_band=None):
 
     src_ds = gdal.Open(ifile)
 
-    if src_ds is None:
-        gdaltest.post_reason('could not open dataset ' + ifile)
-        return 'fail'
+    assert src_ds is not None, ('could not open dataset ' + ifile)
 
     metadata_global = src_ds.GetMetadata()
-    if metadata_global is None:
-        gdaltest.post_reason('could not get global metadata from ' + ifile)
-        return 'fail'
+    assert metadata_global is not None, ('could not get global metadata from ' + ifile)
 
     missval = src_ds.GetRasterBand(1).GetNoDataValue()
-    if missval != 1:
-        gdaltest.post_reason('got invalid nodata value %s for Band' % str(missval))
-        return 'fail'
+    assert missval == 1, ('got invalid nodata value %s for Band' % str(missval))
 
     metadata_band = src_ds.GetRasterBand(1).GetMetadata()
-    if metadata_band is None:
-        gdaltest.post_reason('could not get Band metadata')
-        return 'fail'
+    assert metadata_band is not None, 'could not get Band metadata'
 
     metadata = metadata_global
     vals = vals_global
     if vals is None:
         vals = dict()
     for k, v in vals.items():
-        if k not in metadata:
-            gdaltest.post_reason("missing metadata [%s]" % (str(k)))
-            return 'fail'
+        assert k in metadata, ("missing metadata [%s]" % (str(k)))
         # strip { and } as new driver uses these for array values
         mk = metadata[k].lstrip('{ ').rstrip('} ')
-        if mk != v:
-            gdaltest.post_reason("invalid value [%s] for metadata [%s]=[%s]"
+        assert mk == v, ("invalid value [%s] for metadata [%s]=[%s]"
                                  % (str(mk), str(k), str(v)))
-            return 'fail'
 
     metadata = metadata_band
     vals = vals_band
     if vals is None:
         vals = dict()
     for k, v in vals.items():
-        if k not in metadata:
-            gdaltest.post_reason("missing metadata [%s]" % (str(k)))
-            return 'fail'
+        assert k in metadata, ("missing metadata [%s]" % (str(k)))
         # strip { and } as new driver uses these for array values
         mk = metadata[k].lstrip('{ ').rstrip('} ')
-        if mk != v:
-            gdaltest.post_reason("invalid value [%s] for metadata [%s]=[%s]"
+        assert mk == v, ("invalid value [%s] for metadata [%s]=[%s]"
                                  % (str(mk), str(k), str(v)))
-            return 'fail'
 
     return 'success'
 
@@ -336,8 +316,7 @@ def test_netcdf_2():
     # Test that in raster-only mode, update isn't supported (not sure what would be missing for that...)
     with gdaltest.error_handler():
         ds = gdal.Open('tmp/netcdf2.nc', gdal.GA_Update)
-    if ds is not None:
-        return 'fail'
+    assert ds is None
 
     gdaltest.clean_tmp()
 
@@ -355,9 +334,8 @@ def test_netcdf_3():
     bnd = ds.GetRasterBand(1)
     minmax = bnd.ComputeRasterMinMax()
 
-    if abs(minmax[0] - (-0.675758)) > 0.000001 or abs(minmax[1] - 1.0) > 0.000001:
-        gdaltest.post_reason('Wrong min or max.')
-        return 'fail'
+    assert abs(minmax[0] - (-0.675758)) <= 0.000001 and abs(minmax[1] - 1.0) <= 0.000001, \
+        'Wrong min or max.'
 
     bnd = None
     ds = None
@@ -426,10 +404,8 @@ def test_netcdf_6():
     sr.ImportFromWkt(prj)
     lat_origin = sr.GetProjParm('latitude_of_origin')
 
-    if lat_origin != 25:
-        gdaltest.post_reason('Latitude of origin does not match expected:\n%f'
+    assert lat_origin == 25, ('Latitude of origin does not match expected:\n%f'
                              % lat_origin)
-        return 'fail'
 
     ds = None
 
@@ -453,10 +429,9 @@ def test_netcdf_7():
     std_p1 = sr.GetProjParm('standard_parallel_1')
     std_p2 = sr.GetProjParm('standard_parallel_2')
 
-    if std_p1 != 33.0 or std_p2 != 45.0:
-        gdaltest.post_reason('Standard Parallels do not match expected:\n%f,%f'
+    assert std_p1 == 33.0 and std_p2 == 45.0, \
+        ('Standard Parallels do not match expected:\n%f,%f'
                              % (std_p1, std_p2))
-        return 'fail'
 
     ds = None
     sr = None
@@ -480,19 +455,14 @@ def test_netcdf_8():
     srs.ImportFromWkt(ds.GetProjection())
 
     proj = srs.GetAttrValue('PROJECTION')
-    if proj != 'Albers_Conic_Equal_Area':
-        gdaltest.post_reason('Projection does not match expected : ' + proj)
-        return 'fail'
+    assert proj == 'Albers_Conic_Equal_Area', \
+        ('Projection does not match expected : ' + proj)
 
     param = srs.GetProjParm('latitude_of_center')
-    if param != 37.5:
-        gdaltest.post_reason('Got wrong parameter value (%g)' % param)
-        return 'fail'
+    assert param == 37.5, ('Got wrong parameter value (%g)' % param)
 
     param = srs.GetProjParm('longitude_of_center')
-    if param != -96:
-        gdaltest.post_reason('Got wrong parameter value (%g)' % param)
-        return 'fail'
+    assert param == -96, ('Got wrong parameter value (%g)' % param)
 
     ds = None
 
@@ -515,10 +485,8 @@ def test_netcdf_9():
     sr.ImportFromWkt(prj)
     spheroid = sr.GetAttrValue('SPHEROID')
 
-    if spheroid != 'WGS 84':
-        gdaltest.post_reason('Incorrect spheroid read from file\n%s'
+    assert spheroid == 'WGS 84', ('Incorrect spheroid read from file\n%s'
                              % (spheroid))
-        return 'fail'
 
     ds = None
     sr = None
@@ -551,9 +519,8 @@ def test_netcdf_10():
         sr = osr.SpatialReference()
         sr.ImportFromWkt(prj)
         # new driver uses UNIT vattribute instead of scaling values
-        if not (sr.GetAttrValue("PROJCS|UNIT", 1) == "1000" and gt == gt2):
-            gdaltest.post_reason('Incorrect geotransform, got ' + str(gt))
-            return 'fail'
+        assert (sr.GetAttrValue("PROJCS|UNIT", 1) == "1000" and gt == gt2), \
+            ('Incorrect geotransform, got ' + str(gt))
 
     ds = None
 
@@ -572,10 +539,7 @@ def test_netcdf_11():
 
     gt = ds.GetGeoTransform()
 
-    if gt != (-0.5, 1.0, 0.0, 10.5, 0.0, -1.0):
-
-        gdaltest.post_reason('Incorrect geotransform')
-        return 'fail'
+    assert gt == (-0.5, 1.0, 0.0, 10.5, 0.0, -1.0), 'Incorrect geotransform'
 
     ds = None
 
@@ -595,9 +559,8 @@ def test_netcdf_12():
     scale = ds.GetRasterBand(1).GetScale()
     offset = ds.GetRasterBand(1).GetOffset()
 
-    if scale != 0.01 or offset != 1.5:
-        gdaltest.post_reason('Incorrect scale(%f) or offset(%f)' % (scale, offset))
-        return 'fail'
+    assert scale == 0.01 and offset == 1.5, \
+        ('Incorrect scale(%f) or offset(%f)' % (scale, offset))
 
     ds = None
 
@@ -617,9 +580,7 @@ def test_netcdf_13():
     scale = ds.GetRasterBand(1).GetScale()
     offset = ds.GetRasterBand(1).GetOffset()
 
-    if scale is not None or offset is not None:
-        gdaltest.post_reason('Incorrect scale or offset')
-        return 'fail'
+    assert scale is None and offset is None, 'Incorrect scale or offset'
 
     ds = None
 
@@ -639,9 +600,8 @@ def test_netcdf_14():
     scale = ds.GetRasterBand(1).GetScale()
     offset = ds.GetRasterBand(1).GetOffset()
 
-    if scale != 0.01 or offset != 1.5:
-        gdaltest.post_reason('Incorrect scale(%f) or offset(%f)' % (scale, offset))
-        return 'fail'
+    assert scale == 0.01 and offset == 1.5, \
+        ('Incorrect scale(%f) or offset(%f)' % (scale, offset))
 
     ds = None
 
@@ -653,9 +613,8 @@ def test_netcdf_14():
     scale = ds.GetRasterBand(1).GetScale()
     offset = ds.GetRasterBand(1).GetOffset()
 
-    if scale != 0.1 or offset != 2.5:
-        gdaltest.post_reason('Incorrect scale(%f) or offset(%f)' % (scale, offset))
-        return 'fail'
+    assert scale == 0.1 and offset == 2.5, \
+        ('Incorrect scale(%f) or offset(%f)' % (scale, offset))
 
     return 'success'
 
@@ -671,8 +630,7 @@ def test_netcdf_15():
 
     if gdaltest.netcdf_drv_has_nc2:
         ds = gdal.Open('data/trmm-nc2.nc')
-        if ds is None:
-            return 'fail'
+        assert ds is not None
         ds = None
         return 'success'
     else:
@@ -702,15 +660,11 @@ def test_netcdf_16():
             name = ds.GetDriver().GetDescription()
             ds = None
             # return fail if did not open with the netCDF driver (i.e. HDF5Image)
-            if name != 'netCDF':
-                gdaltest.post_reason('netcdf driver did not open file')
-                return 'fail'
+            assert name == 'netCDF', 'netcdf driver did not open file'
 
         # test with Identify()
         name = gdal.IdentifyDriver(ifile).GetDescription()
-        if name != 'netCDF':
-            gdaltest.post_reason('netcdf driver did not identify file')
-            return 'fail'
+        assert name == 'netCDF', 'netcdf driver did not identify file'
 
     else:
         return 'skip'
@@ -744,15 +698,11 @@ def test_netcdf_17():
             name = ds.GetDriver().GetDescription()
             ds = None
             # return fail if opened with the netCDF driver
-            if name == 'netCDF':
-                gdaltest.post_reason('netcdf driver opened hdf5 file')
-                return 'fail'
+            assert name != 'netCDF', 'netcdf driver opened hdf5 file'
 
         # test with Identify()
         name = gdal.IdentifyDriver(ifile).GetDescription()
-        if name == 'netCDF':
-            gdaltest.post_reason('netcdf driver was identified for hdf5 file')
-            return 'fail'
+        assert name != 'netCDF', 'netcdf driver was identified for hdf5 file'
 
     else:
         return 'skip'
@@ -780,13 +730,11 @@ def test_netcdf_18():
             name = ds.GetDriver().GetDescription()
             ds = None
             # return fail if did not open with the netCDF driver (i.e. HDF5Image)
-            if name != 'netCDF':
-                return 'fail'
+            assert name == 'netCDF'
 
         # test with Identify()
         name = gdal.IdentifyDriver(ifile).GetDescription()
-        if name != 'netCDF':
-            return 'fail'
+        assert name == 'netCDF'
 
     else:
         return 'skip'
@@ -869,9 +817,8 @@ def test_netcdf_21():
             gdaltest.post_reason('gdalwarp execution failed')
             return 'fail'
 
-        if (err != '' or ret != ''):
-            gdaltest.post_reason('gdalwarp returned error\n' + str(ret) + ' ' + str(err))
-            return 'fail'
+        assert not (err != '' or ret != ''), \
+            ('gdalwarp returned error\n' + str(ret) + ' ' + str(err))
 
     # test compression of the file, with a conservative timeout of 60 seconds
     return netcdf_test_deflate(bigfile, 26695, 6, 60)
@@ -930,15 +877,11 @@ def test_netcdf_23():
         name = ds.GetDriver().GetDescription()
         ds = None
         # return fail if opened with the netCDF driver
-        if name == 'netCDF':
-            gdaltest.post_reason('netcdf driver opened hdf4 file')
-            return 'fail'
+        assert name != 'netCDF', 'netcdf driver opened hdf4 file'
 
     # test with Identify()
     name = gdal.IdentifyDriver(ifile).GetDescription()
-    if name == 'netCDF':
-        gdaltest.post_reason('netcdf driver was identified for hdf4 file')
-        return 'fail'
+    assert name != 'netCDF', 'netcdf driver was identified for hdf4 file'
 
     return 'success'
 
@@ -1133,17 +1076,14 @@ def netcdf_test_4dfile(ofile):
 
     # test result file has 8 bands and 0 subdasets (instead of 0 bands and 8 subdatasets)
     ds = gdal.Open(ofile)
-    if ds is None:
-        gdaltest.post_reason('open of copy failed')
-        return 'fail'
+    assert ds is not None, 'open of copy failed'
     md = ds.GetMetadata('SUBDATASETS')
     subds_count = 0
     if md is not None:
         subds_count = len(md) / 2
-    if ds.RasterCount != 8 or subds_count != 0:
-        gdaltest.post_reason('copy has %d bands (expected 8) and has %d subdatasets'
+    assert ds.RasterCount == 8 and subds_count == 0, \
+        ('copy has %d bands (expected 8) and has %d subdatasets'
                              ' (expected 0)' % (ds.RasterCount, subds_count))
-        return 'fail'
     ds = None
 
     # get file header with ncdump (if available)
@@ -1156,9 +1096,7 @@ def netcdf_test_4dfile(ofile):
         print('NOTICE: ncdump not found')
         return 'success'
     (ret, err) = gdaltest.runexternal_out_and_err('ncdump -h ' + ofile)
-    if ret == '' or err != '':
-        gdaltest.post_reason('ncdump failed')
-        return 'fail'
+    assert ret != '' and err == '', 'ncdump failed'
 
     # simple dimension tests using ncdump output
     err = ""
@@ -1175,9 +1113,7 @@ def netcdf_test_4dfile(ofile):
     # uncomment this to get full header in output
     # if err != '':
     #    err = err + ret
-    if err != '':
-        gdaltest.post_reason(err)
-        return 'fail'
+    assert err == ''
 
     return 'success'
 
@@ -1231,9 +1167,8 @@ def test_netcdf_29():
         gdaltest.post_reason('gdalwarp execution failed')
         return 'fail'
 
-    if (err != '' or ret != ''):
-        gdaltest.post_reason('gdalwarp returned error\n' + str(ret) + ' ' + str(err))
-        return 'fail'
+    assert not (err != '' or ret != ''), \
+        ('gdalwarp returned error\n' + str(ret) + ' ' + str(err))
 
     # copy vrt to netcdf, with proper dimension rolling
     result = netcdf_test_copy(ofile1, 0, None, ofile)
@@ -1282,9 +1217,7 @@ def test_netcdf_31():
 
     gt1 = (-80.0, 0.25, 0.0, -19.5, 0.0, -0.25)
 
-    if gt != gt1:
-        gdaltest.post_reason('Incorrect geotransform, got ' + str(gt))
-        return 'fail'
+    assert gt == gt1, ('Incorrect geotransform, got ' + str(gt))
 
     ds = None
 
@@ -1396,20 +1329,14 @@ def test_netcdf_35():
 
     # test long metadata is copied correctly
     ds = gdal.Open(ofile)
-    if ds is None:
-        gdaltest.post_reason('open of copy failed')
-        return 'fail'
+    assert ds is not None, 'open of copy failed'
     md = ds.GetMetadata('')
-    if 'U#bla' not in md:
-        gdaltest.post_reason('U#bla metadata absent')
-        return 'fail'
+    assert 'U#bla' in md, 'U#bla metadata absent'
     bla = md['U#bla']
-    if not len(bla) == 9591:
-        gdaltest.post_reason('U#bla metadata is of length %d, expecting %d' % (len(bla), 9591))
-        return 'fail'
-    if not bla[-4:] == '_bla':
-        gdaltest.post_reason('U#bla metadata ends with [%s], expecting [%s]' % (bla[-4:], '_bla'))
-        return 'fail'
+    assert len(bla) == 9591, \
+        ('U#bla metadata is of length %d, expecting %d' % (len(bla), 9591))
+    assert bla[-4:] == '_bla', \
+        ('U#bla metadata ends with [%s], expecting [%s]' % (bla[-4:], '_bla'))
 
     return 'success'
 
@@ -1425,18 +1352,13 @@ def test_netcdf_36():
     ifile = 'data/netcdf_fixes.nc'
 
     ds = gdal.Open(ifile)
-    if ds is None:
-        gdaltest.post_reason('open failed')
-        return 'fail'
+    assert ds is not None, 'open failed'
 
     gt = ds.GetGeoTransform()
-    if gt is None:
-        gdaltest.post_reason('got no GeoTransform')
-        return 'fail'
+    assert gt is not None, 'got no GeoTransform'
     gt_expected = (-3.498749944898817, 0.0025000042385525173, 0.0, 46.61749818589952, 0.0, -0.001666598849826389)
-    if gt != gt_expected:
-        gdaltest.post_reason('got GeoTransform %s, expected %s' % (str(gt), str(gt_expected)))
-        return 'fail'
+    assert gt == gt_expected, \
+        ('got GeoTransform %s, expected %s' % (str(gt), str(gt_expected)))
 
     return 'success'
 
@@ -1453,18 +1375,13 @@ def test_netcdf_36_lonwrap():
     ifile = 'data/nc_lonwrap.nc'
 
     ds = gdal.Open(ifile)
-    if ds is None:
-        gdaltest.post_reason('open failed')
-        return 'fail'
+    assert ds is not None, 'open failed'
 
     gt = ds.GetGeoTransform()
-    if gt is None:
-        gdaltest.post_reason('got no GeoTransform')
-        return 'fail'
+    assert gt is not None, 'got no GeoTransform'
     gt_expected = (-2.25, 2.5, 0.0, 16.25, 0.0, -2.5)
-    if gt != gt_expected:
-        gdaltest.post_reason('got GeoTransform %s, expected %s' % (str(gt), str(gt_expected)))
-        return 'fail'
+    assert gt == gt_expected, \
+        ('got GeoTransform %s, expected %s' % (str(gt), str(gt_expected)))
 
     return 'success'
 
@@ -1483,28 +1400,19 @@ def test_netcdf_37():
     gdal.PushErrorHandler('CPLQuietErrorHandler')
     ds = gdal.Open(ifile)
     gdal.PopErrorHandler()
-    if ds is None:
-        gdaltest.post_reason('open failed')
-        return 'fail'
+    assert ds is not None, 'open failed'
 
     gt = ds.GetGeoTransform()
-    if gt is None:
-        gdaltest.post_reason('got no GeoTransform')
-        return 'fail'
+    assert gt is not None, 'got no GeoTransform'
     gt_expected = (-1.875, 3.75, 0.0, 89.01354337620016, 0.0, -3.7088976406750063)
-    if gt != gt_expected:
-        gdaltest.post_reason('got GeoTransform %s, expected %s' % (str(gt), str(gt_expected)))
-        return 'fail'
+    assert gt == gt_expected, \
+        ('got GeoTransform %s, expected %s' % (str(gt), str(gt_expected)))
 
     md = ds.GetMetadata('GEOLOCATION2')
-    if not md or 'Y_VALUES' not in md:
-        gdaltest.post_reason('did not get 1D geolocation')
-        return 'fail'
+    assert md and 'Y_VALUES' in md, 'did not get 1D geolocation'
     y_vals = md['Y_VALUES']
-    if not y_vals.startswith('{-87.15909455586265,-83.47893666931698,') \
-            or not y_vals.endswith(',83.47893666931698,87.15909455586265}'):
-        gdaltest.post_reason('got incorrect values in 1D geolocation')
-        return 'fail'
+    assert y_vals.startswith('{-87.15909455586265,-83.47893666931698,') and y_vals.endswith(',83.47893666931698,87.15909455586265}'), \
+        'got incorrect values in 1D geolocation'
 
     return 'success'
 
@@ -1522,18 +1430,13 @@ def test_netcdf_38():
     gdal.PushErrorHandler('CPLQuietErrorHandler')
     ds = gdal.Open(ifile)
     gdal.PopErrorHandler()
-    if ds is None:
-        gdaltest.post_reason('open failed')
-        return 'fail'
+    assert ds is not None, 'open failed'
 
     gt = ds.GetGeoTransform()
-    if gt is None:
-        gdaltest.post_reason('got no GeoTransform')
-        return 'fail'
+    assert gt is not None, 'got no GeoTransform'
     gt_expected = (-1659.3478178136488, 13.545000861672793, 0.0, 2330.054725283668, 0.0, -13.54499744233631)
-    if gt != gt_expected:
-        gdaltest.post_reason('got GeoTransform %s, expected %s' % (str(gt), str(gt_expected)))
-        return 'fail'
+    assert gt == gt_expected, \
+        ('got GeoTransform %s, expected %s' % (str(gt), str(gt_expected)))
 
     return 'success'
 
@@ -1558,9 +1461,7 @@ def test_netcdf_39():
 
     gdal.Unlink('tmp/two_vars_scale_offset.nc')
     gdal.Unlink('tmp/netcdf_39.vrt')
-    if cs != 65463:
-        print(cs)
-        return 'fail'
+    assert cs == 65463
 
     shutil.copy('data/two_vars_scale_offset.nc', 'tmp')
     src_ds = gdal.Open('NETCDF:"tmp/two_vars_scale_offset.nc":z')
@@ -1574,9 +1475,7 @@ def test_netcdf_39():
 
     gdal.Unlink('tmp/two_vars_scale_offset.nc')
     gdal.Unlink('tmp/netcdf_39.vrt')
-    if cs != 65463:
-        print(cs)
-        return 'fail'
+    assert cs == 65463
 
     shutil.copy('data/two_vars_scale_offset.nc', 'tmp')
     src_ds = gdal.Open('NETCDF:"%s/tmp/two_vars_scale_offset.nc":z' % os.getcwd())
@@ -1590,9 +1489,7 @@ def test_netcdf_39():
 
     gdal.Unlink('tmp/two_vars_scale_offset.nc')
     gdal.Unlink('tmp/netcdf_39.vrt')
-    if cs != 65463:
-        print(cs)
-        return 'fail'
+    assert cs == 65463
 
     src_ds = gdal.Open('NETCDF:"%s/data/two_vars_scale_offset.nc":z' % os.getcwd())
     out_ds = gdal.GetDriverByName('VRT').CreateCopy('tmp/netcdf_39.vrt', src_ds)
@@ -1604,9 +1501,7 @@ def test_netcdf_39():
     ds = None
 
     gdal.Unlink('tmp/netcdf_39.vrt')
-    if cs != 65463:
-        print(cs)
-        return 'fail'
+    assert cs == 65463
 
     return 'success'
 
@@ -1632,12 +1527,8 @@ def test_netcdf_41():
 
     with gdaltest.error_handler():
         ds = gdal.Open('data/byte_no_cf.nc')
-    if ds.GetGeoTransform() != (440720, 60, 0, 3751320, 0, -60):
-        print(ds.GetGeoTransform())
-        return 'fail'
-    if ds.GetProjectionRef().find('26711') < 0:
-        print(ds.GetGeoTransform())
-        return 'fail'
+    assert ds.GetGeoTransform() == (440720, 60, 0, 3751320, 0, -60)
+    assert ds.GetProjectionRef().find('26711') >= 0, ds.GetGeoTransform()
 
     return 'success'
 
@@ -1668,7 +1559,7 @@ def test_netcdf_42():
     gdaltest.netcdf_drv.CreateCopy('tmp/netcdf_42.nc', src_ds)
 
     ds = gdal.Open('tmp/netcdf_42.nc')
-    if ds.GetMetadata('GEOLOCATION') != {
+    assert (ds.GetMetadata('GEOLOCATION') == {
         'LINE_OFFSET': '0',
         'X_DATASET': 'NETCDF:"tmp/netcdf_42.nc":lon',
         'PIXEL_STEP': '1',
@@ -1677,19 +1568,13 @@ def test_netcdf_42():
         'X_BAND': '1',
         'LINE_STEP': '1',
         'Y_DATASET': 'NETCDF:"tmp/netcdf_42.nc":lat',
-            'Y_BAND': '1'}:
-        print(ds.GetMetadata('GEOLOCATION'))
-        return 'fail'
+            'Y_BAND': '1'})
 
     ds = gdal.Open('NETCDF:"tmp/netcdf_42.nc":lon')
-    if ds.GetRasterBand(1).Checksum() != 36043:
-        print(ds.GetRasterBand(1).Checksum())
-        return 'fail'
+    assert ds.GetRasterBand(1).Checksum() == 36043
 
     ds = gdal.Open('NETCDF:"tmp/netcdf_42.nc":lat')
-    if ds.GetRasterBand(1).Checksum() != 33501:
-        print(ds.GetRasterBand(1).Checksum())
-        return 'fail'
+    assert ds.GetRasterBand(1).Checksum() == 33501
 
     return 'success'
 
@@ -1706,7 +1591,7 @@ def test_netcdf_43():
     gdaltest.netcdf_drv.CreateCopy('tmp/netcdf_43.nc', src_ds, options=['WRITE_LONLAT=YES'])
 
     ds = gdal.Open('tmp/netcdf_43.nc')
-    if ds.GetMetadata('GEOLOCATION') != {
+    assert (ds.GetMetadata('GEOLOCATION') == {
         'LINE_OFFSET': '0',
         'X_DATASET': 'NETCDF:"tmp/netcdf_43.nc":lon',
         'PIXEL_STEP': '1',
@@ -1715,9 +1600,7 @@ def test_netcdf_43():
         'X_BAND': '1',
         'LINE_STEP': '1',
         'Y_DATASET': 'NETCDF:"tmp/netcdf_43.nc":lat',
-            'Y_BAND': '1'}:
-        print(ds.GetMetadata('GEOLOCATION'))
-        return 'fail'
+            'Y_BAND': '1'})
 
     return 'success'
 
@@ -1734,9 +1617,8 @@ def test_netcdf_44():
         return 'skip'
 
     for f, md5 in ('data/ushort.nc', 18), ('data/uint.nc', 10):
-        if (netcdf_test_copy(f, 1, md5, 'tmp/netcdf_44.nc', ['FORMAT=NC4']) !=
-                'success'):
-            return 'fail'
+        assert (not (netcdf_test_copy(f, 1, md5, 'tmp/netcdf_44.nc', ['FORMAT=NC4']) !=
+                'success'))
 
     return 'success'
 
@@ -1751,13 +1633,11 @@ def test_netcdf_45():
 
     # Test that a vector cannot be opened in raster-only mode
     ds = gdal.OpenEx('data/test_ogr_nc3.nc', gdal.OF_RASTER)
-    if ds is not None:
-        return 'fail'
+    assert ds is None
 
     # Test that a raster cannot be opened in vector-only mode
     ds = gdal.OpenEx('data/cf-bug636.nc', gdal.OF_VECTOR)
-    if ds is not None:
-        return 'fail'
+    assert ds is None
 
     ds = gdal.OpenEx('data/test_ogr_nc3.nc', gdal.OF_VECTOR)
 
@@ -1773,9 +1653,7 @@ def test_netcdf_45():
 "POINT (1 2)",,,,,,,,,,,,,,,,,,,,
 ,,,,,,,,,,,,,,,,,,,,
 """
-    if content != expected_content:
-        print(content)
-        return 'fail'
+    assert content == expected_content
 
     fp = gdal.VSIFOpenL('/vsimem/netcdf_45.csvt', 'rb')
     if fp is not None:
@@ -1783,9 +1661,7 @@ def test_netcdf_45():
         gdal.VSIFCloseL(fp)
     expected_content = """WKT,Integer,Integer,Real,Real,String(1),String(3),String,Date,DateTime,DateTime,Integer64,Integer64,Integer(Boolean),Integer(Boolean),Real(Float32),Real(Float32),Integer(Int16),Integer(Int16),Real,Integer
 """
-    if content != expected_content:
-        print(content)
-        return 'fail'
+    assert content == expected_content
     gdal.Unlink('/vsimem/netcdf_45.csv')
     gdal.Unlink('/vsimem/netcdf_45.csvt')
     gdal.Unlink('/vsimem/netcdf_45.prj')
@@ -1806,9 +1682,7 @@ def test_netcdf_46():
 
     ret = gdaltest.runexternal(test_cli_utilities.get_test_ogrsf_path() + ' -ro data/test_ogr_nc3.nc')
 
-    if ret.find('INFO') == -1 or ret.find('ERROR') != -1:
-        print(ret)
-        return 'fail'
+    assert ret.find('INFO') != -1 and ret.find('ERROR') == -1
 
     return 'success'
 
@@ -1827,8 +1701,7 @@ def test_netcdf_47():
     # Test that a vector cannot be opened in raster-only mode
     with gdaltest.error_handler():
         ds = gdal.OpenEx('data/test_ogr_nc4.nc', gdal.OF_RASTER)
-    if ds is not None:
-        return 'fail'
+    assert ds is None
 
     ds = gdal.OpenEx('data/test_ogr_nc4.nc', gdal.OF_VECTOR)
 
@@ -1844,9 +1717,7 @@ def test_netcdf_47():
 "POINT (1 2)",,,,,,,,,,,,,,,,,,,,,,,,,,,
 ,,,,,,,,,,,,,,,,,,,,,,,,,,,
 """
-    if content != expected_content:
-        print(content)
-        return 'fail'
+    assert content == expected_content
 
     fp = gdal.VSIFOpenL('/vsimem/netcdf_47.csvt', 'rb')
     if fp is not None:
@@ -1854,9 +1725,7 @@ def test_netcdf_47():
         gdal.VSIFCloseL(fp)
     expected_content = """WKT,Integer,Integer,Real,Real,String(3),String,Date,DateTime,DateTime,Integer64,Integer64,Integer(Boolean),Integer(Boolean),Real(Float32),Real(Float32),Integer(Int16),Integer(Int16),Real,Integer,Integer,Integer,Integer,Integer,Integer64,Integer64,Real,Real
 """
-    if content != expected_content:
-        print(content)
-        return 'fail'
+    assert content == expected_content
     gdal.Unlink('/vsimem/netcdf_47.csv')
     gdal.Unlink('/vsimem/netcdf_47.csvt')
     gdal.Unlink('/vsimem/netcdf_47.prj')
@@ -1875,11 +1744,9 @@ def test_netcdf_48():
     with gdaltest.error_handler():
         ds = gdal.OpenEx('data/test_ogr_no_xyz_var.nc', gdal.OF_VECTOR)
     lyr = ds.GetLayer(0)
-    if lyr.GetGeomType() != ogr.wkbNone:
-        return 'fail'
+    assert lyr.GetGeomType() == ogr.wkbNone
     f = lyr.GetNextFeature()
-    if f['int32'] != 1:
-        return 'fail'
+    assert f['int32'] == 1
 
     return 'success'
 
@@ -1905,9 +1772,7 @@ def test_netcdf_49():
 "POINT (1 2)",
 ,,
 """
-    if content != expected_content:
-        print(content)
-        return 'fail'
+    assert content == expected_content
 
     gdal.Unlink('/vsimem/netcdf_49.csv')
 
@@ -1934,25 +1799,17 @@ def test_netcdf_50():
     out_f.SetFID(-1)
     src_json = src_f.ExportToJson()
     out_json = out_f.ExportToJson()
-    if src_json != out_json:
-        print(src_json)
-        print(out_json)
-        return 'fail'
+    assert src_json == out_json
     out_ds = None
 
     out_ds = gdal.OpenEx('tmp/netcdf_50.nc', gdal.OF_VECTOR)
     out_lyr = out_ds.GetLayer(0)
     srs = out_lyr.GetSpatialRef().ExportToWkt()
-    if srs.find('PROJCS["OSGB 1936') < 0:
-        print(srs)
-        return 'fail'
+    assert srs.find('PROJCS["OSGB 1936') >= 0
     out_f = out_lyr.GetNextFeature()
     out_f.SetFID(-1)
     out_json = out_f.ExportToJson()
-    if src_json != out_json:
-        print(src_json)
-        print(out_json)
-        return 'fail'
+    assert src_json == out_json
     out_ds = None
 
     gdal.Unlink('tmp/netcdf_50.nc')
@@ -1986,9 +1843,7 @@ def test_netcdf_51():
 "POINT Z (1 2 0)",,,,,,,,,,,,,,,,,,,,
 ,,,,,,,,,,,,,,,,,,,,
 """
-    if content != expected_content:
-        print(content)
-        return 'fail'
+    assert content == expected_content
 
     fp = gdal.VSIFOpenL('/vsimem/netcdf_51.csvt', 'rb')
     if fp is not None:
@@ -1996,28 +1851,23 @@ def test_netcdf_51():
         gdal.VSIFCloseL(fp)
     expected_content = """WKT,Integer,Integer,Real,Real,String(1),String(3),String,Date,DateTime,DateTime,Integer64,Integer64,Integer(Boolean),Integer(Boolean),Real(Float32),Real(Float32),Integer(Int16),Integer(Int16),Real,Integer
 """
-    if content != expected_content:
-        print(content)
-        return 'fail'
+    assert content == expected_content
 
     ds = gdal.OpenEx('tmp/netcdf_51.nc', gdal.OF_VECTOR | gdal.OF_UPDATE)
     lyr = ds.GetLayer(0)
     lyr.CreateField(ogr.FieldDefn('extra', ogr.OFTInteger))
     lyr.CreateField(ogr.FieldDefn('extra_str', ogr.OFTString))
     f = lyr.GetNextFeature()
-    if f is None:
-        return 'fail'
+    assert f is not None
     f['extra'] = 5
     f['extra_str'] = 'foobar'
-    if lyr.CreateFeature(f) != 0:
-        return 'fail'
+    assert lyr.CreateFeature(f) == 0
     ds = None
 
     ds = gdal.OpenEx('tmp/netcdf_51.nc', gdal.OF_VECTOR)
     lyr = ds.GetLayer(0)
     f = lyr.GetFeature(lyr.GetFeatureCount())
-    if f['int32'] != 1 or f['extra'] != 5 or f['extra_str'] != 'foobar':
-        return 'fail'
+    assert f['int32'] == 1 and f['extra'] == 5 and f['extra_str'] == 'foobar'
     f = None
     ds = None
 
@@ -2061,9 +1911,7 @@ def test_netcdf_51_no_gdal_tags():
 "POINT Z (1 2 0)",,,,,,,,,,,,,,,,,,,,
 ,,,,,,,,,,,,,,,,,,,,
 """
-    if content != expected_content:
-        print(content)
-        return 'fail'
+    assert content == expected_content
 
     fp = gdal.VSIFOpenL('/vsimem/netcdf_51_no_gdal_tags.csvt', 'rb')
     if fp is not None:
@@ -2071,9 +1919,7 @@ def test_netcdf_51_no_gdal_tags():
         gdal.VSIFCloseL(fp)
     expected_content = """WKT,Integer,Integer,Real,Real,String(1),String(3),String(10),Date,DateTime,DateTime,Real,Real,Integer,Integer,Real(Float32),Real(Float32),Integer(Int16),Integer(Int16),Real,Integer
 """
-    if content != expected_content:
-        print(content)
-        return 'fail'
+    assert content == expected_content
 
     gdal.Unlink('tmp/netcdf_51_no_gdal_tags.nc')
     gdal.Unlink('tmp/netcdf_51_no_gdal_tags.csv')
@@ -2113,9 +1959,7 @@ def test_netcdf_52():
 "POINT Z (1 2 0)",,,,,,,,,,,,,,,,,,,,,,,,,,,
 ,,,,,,,,,,,,,,,,,,,,,,,,,,,
 """
-    if content != expected_content:
-        print(content)
-        return 'fail'
+    assert content == expected_content
 
     fp = gdal.VSIFOpenL('/vsimem/netcdf_52.csvt', 'rb')
     if fp is not None:
@@ -2123,26 +1967,21 @@ def test_netcdf_52():
         gdal.VSIFCloseL(fp)
     expected_content = """WKT,Integer,Integer,Real,Real,String(3),String,Date,DateTime,DateTime,Integer64,Integer64,Integer(Boolean),Integer(Boolean),Real(Float32),Real(Float32),Integer(Int16),Integer(Int16),Real,Integer,Integer,Integer,Integer,Integer,Integer64,Integer64,Real,Real
 """
-    if content != expected_content:
-        print(content)
-        return 'fail'
+    assert content == expected_content
 
     ds = gdal.OpenEx('tmp/netcdf_52.nc', gdal.OF_VECTOR | gdal.OF_UPDATE)
     lyr = ds.GetLayer(0)
     lyr.CreateField(ogr.FieldDefn('extra', ogr.OFTInteger))
     f = lyr.GetNextFeature()
-    if f is None:
-        return 'fail'
+    assert f is not None
     f['extra'] = 5
-    if lyr.CreateFeature(f) != 0:
-        return 'fail'
+    assert lyr.CreateFeature(f) == 0
     ds = None
 
     ds = gdal.OpenEx('tmp/netcdf_52.nc', gdal.OF_VECTOR)
     lyr = ds.GetLayer(0)
     f = lyr.GetFeature(lyr.GetFeatureCount())
-    if f['int32'] != 1 or f['extra'] != 5:
-        return 'fail'
+    assert f['int32'] == 1 and f['extra'] == 5
     f = None
     ds = None
 
@@ -2184,25 +2023,17 @@ def test_netcdf_53():
     out_f.SetFID(-1)
     src_json = src_f.ExportToJson()
     out_json = out_f.ExportToJson()
-    if src_json != out_json:
-        print(src_json)
-        print(out_json)
-        return 'fail'
+    assert src_json == out_json
     out_ds = None
 
     out_ds = gdal.OpenEx('tmp/netcdf_53.nc', gdal.OF_VECTOR)
     out_lyr = out_ds.GetLayer(0)
     srs = out_lyr.GetSpatialRef().ExportToWkt()
-    if srs.find('PROJCS["OSGB 1936') < 0:
-        print(srs)
-        return 'fail'
+    assert srs.find('PROJCS["OSGB 1936') >= 0
     out_f = out_lyr.GetNextFeature()
     out_f.SetFID(-1)
     out_json = out_f.ExportToJson()
-    if src_json != out_json:
-        print(src_json)
-        print(out_json)
-        return 'fail'
+    assert src_json == out_json
     out_ds = None
 
     gdal.Unlink('tmp/netcdf_53.nc')
@@ -2226,14 +2057,12 @@ def test_netcdf_54():
     ds = gdal.OpenEx('tmp/netcdf_54.nc', gdal.OF_VECTOR | gdal.OF_UPDATE)
     lyr = ds.GetLayer(0)
     f = lyr.GetNextFeature()
-    if f is None:
-        return 'fail'
+    assert f is not None
     f['int32'] += 1
     f.SetFID(-1)
     f.ExportToJson()
     src_json = f.ExportToJson()
-    if lyr.CreateFeature(f) != 0:
-        return 'fail'
+    assert lyr.CreateFeature(f) == 0
     ds = None
 
     ds = gdal.OpenEx('tmp/netcdf_54.nc', gdal.OF_VECTOR)
@@ -2246,10 +2075,7 @@ def test_netcdf_54():
 
     gdal.Unlink('tmp/netcdf_54.nc')
 
-    if src_json != out_json:
-        print(src_json)
-        print(out_json)
-        return 'fail'
+    assert src_json == out_json
 
     return 'success'
 
@@ -2270,14 +2096,12 @@ def test_netcdf_55():
     ds = gdal.OpenEx('tmp/netcdf_55.nc', gdal.OF_VECTOR | gdal.OF_UPDATE)
     lyr = ds.GetLayer(0)
     f = lyr.GetNextFeature()
-    if f is None:
-        return 'fail'
+    assert f is not None
     f['twodimstringchar'] = 'abcd'
     f.SetFID(-1)
     f.ExportToJson()
     src_json = f.ExportToJson()
-    if lyr.CreateFeature(f) != 0:
-        return 'fail'
+    assert lyr.CreateFeature(f) == 0
     ds = None
 
     ds = gdal.OpenEx('tmp/netcdf_55.nc', gdal.OF_VECTOR)
@@ -2290,10 +2114,7 @@ def test_netcdf_55():
 
     gdal.Unlink('tmp/netcdf_55.nc')
 
-    if src_json != out_json:
-        print(src_json)
-        print(out_json)
-        return 'fail'
+    assert src_json == out_json
 
     return 'success'
 
@@ -2315,8 +2136,7 @@ def test_netcdf_56():
     f.SetGeometry(ogr.CreateGeometryFromWkt('POINT (1 2)'))
     with gdaltest.error_handler():
         ret = lyr.CreateFeature(f)
-    if ret != 0:
-        return 'fail'
+    assert ret == 0
     ds = None
 
     ds = gdal.OpenEx('tmp/netcdf_56.nc', gdal.OF_VECTOR)
@@ -2347,15 +2167,13 @@ def test_netcdf_57():
 
     with gdaltest.error_handler():
         ds = ogr.GetDriverByName('netCDF').CreateDataSource('/not_existing_dir/invalid_subdir', options=['MULTIPLE_LAYERS=SEPARATE_FILES'])
-    if ds is not None:
-        return 'fail'
+    assert ds is None
 
     open('tmp/netcdf_57', 'wb').close()
 
     with gdaltest.error_handler():
         ds = ogr.GetDriverByName('netCDF').CreateDataSource('/not_existing_dir/invalid_subdir', options=['MULTIPLE_LAYERS=SEPARATE_FILES'])
-    if ds is not None:
-        return 'fail'
+    assert ds is None
 
     os.unlink('tmp/netcdf_57')
 
@@ -2372,8 +2190,7 @@ def test_netcdf_57():
         ds = ogr.Open('tmp/netcdf_57/lyr%d.nc' % ilayer)
         lyr = ds.GetLayer(0)
         f = lyr.GetNextFeature()
-        if f['lyr_id'] != ilayer:
-            return 'fail'
+        assert f['lyr_id'] == ilayer
         ds = None
 
     shutil.rmtree('tmp/netcdf_57')
@@ -2406,8 +2223,7 @@ def test_netcdf_58():
     for ilayer in range(2):
         lyr = ds.GetLayer(ilayer)
         f = lyr.GetNextFeature()
-        if f['lyr_id'] != 'lyr_%d' % ilayer:
-            return 'fail'
+        assert f['lyr_id'] == 'lyr_%d' % ilayer
     ds = None
 
     gdal.Unlink('tmp/netcdf_58.nc')
@@ -2428,9 +2244,7 @@ def test_netcdf_59():
 
     unit = ds.GetRasterBand(1).GetUnitType()
 
-    if unit != 'm/s':
-        gdaltest.post_reason('Incorrect unit(%s)' % unit)
-        return 'fail'
+    assert unit == 'm/s', ('Incorrect unit(%s)' % unit)
 
     ds = None
 
@@ -2451,12 +2265,10 @@ def test_netcdf_60():
 
     # Test that a vector cannot be opened in raster-only mode
     ds = gdal.OpenEx('data/profile.nc', gdal.OF_RASTER)
-    if ds is not None:
-        return 'fail'
+    assert ds is None
 
     ds = gdal.OpenEx('data/profile.nc', gdal.OF_VECTOR)
-    if ds is None:
-        return 'fail'
+    assert ds is not None
 
     with gdaltest.error_handler():
         gdal.VectorTranslate('/vsimem/netcdf_60.csv', ds, format='CSV', layerCreationOptions=['LINEFORMAT=LF', 'GEOMETRY=AS_WKT', 'STRING_QUOTING=IF_NEEDED'])
@@ -2471,9 +2283,7 @@ def test_netcdf_60():
 "POINT Z (2 49 200)",1,3,Palo Alto,baw
 "POINT Z (3 50 100)",2,4,Santa Fe,baz2
 """
-    if content != expected_content:
-        print(content)
-        return 'fail'
+    assert content == expected_content
 
     gdal.Unlink('/vsimem/netcdf_60.csv')
 
@@ -2506,9 +2316,7 @@ def test_netcdf_61():
 "POINT Z (2 49 200)",1,3,Palo Alto,baw
 "POINT Z (3 50 100)",2,4,Santa Fe,baz2
 """
-    if content != expected_content:
-        print(content)
-        return 'fail'
+    assert content == expected_content
 
     gdal.Unlink('/vsimem/netcdf_61.csv')
     gdal.Unlink('/vsimem/netcdf_61.nc')
@@ -2538,9 +2346,7 @@ def test_netcdf_62():
 "POINT Z (2 49 200)",1,3,Palo Alto,baw
 "POINT Z (3 50 100)",2,4,Santa Fe,baz2
 """
-    if content != expected_content:
-        print(content)
-        return 'fail'
+    assert content == expected_content
 
     gdal.Unlink('/vsimem/netcdf_62.csv')
 
@@ -2559,15 +2365,13 @@ def test_netcdf_62_ncdump_check():
         err = None
     if err is not None and 'netcdf library version' in err:
         (ret, err) = gdaltest.runexternal_out_and_err('ncdump -h tmp/netcdf_62.nc')
-        if ret.find('profile = 2') < 0 or \
-           ret.find('record = UNLIMITED') < 0 or \
-           ret.find('profile:cf_role = "profile_id"') < 0 or \
-           ret.find('parentIndex:instance_dimension = "profile"') < 0 or \
-           ret.find(':featureType = "profile"') < 0 or \
-           ret.find('char station(profile') < 0 or \
-           ret.find('char foo(record') < 0:
-            print(ret)
-            return 'fail'
+        assert (ret.find('profile = 2') >= 0 and \
+           ret.find('record = UNLIMITED') >= 0 and \
+           ret.find('profile:cf_role = "profile_id"') >= 0 and \
+           ret.find('parentIndex:instance_dimension = "profile"') >= 0 and \
+           ret.find(':featureType = "profile"') >= 0 and \
+           ret.find('char station(profile') >= 0 and \
+           ret.find('char foo(record') >= 0)
     else:
         return 'skip'
 
@@ -2615,9 +2419,7 @@ def test_netcdf_63():
 "POINT Z (2 49 200)",1,3,Palo Alto,baw
 "POINT Z (3 50 100)",2,4,Santa Fe,baz2
 """
-    if content != expected_content:
-        print(content)
-        return 'fail'
+    assert content == expected_content
 
     gdal.Unlink('/vsimem/netcdf_63.csv')
 
@@ -2639,14 +2441,12 @@ def test_netcdf_63_ncdump_check():
         err = None
     if err is not None and 'netcdf library version' in err:
         (ret, err) = gdaltest.runexternal_out_and_err('ncdump -h tmp/netcdf_63.nc')
-        if ret.find('profile = UNLIMITED') < 0 or \
-           ret.find('record = UNLIMITED') < 0 or \
-           ret.find('profile:cf_role = "profile_id"') < 0 or \
-           ret.find('parentIndex:instance_dimension = "profile"') < 0 or \
-           ret.find(':featureType = "profile"') < 0 or \
-           ret.find('char station(record') < 0:
-            print(ret)
-            return 'fail'
+        assert (ret.find('profile = UNLIMITED') >= 0 and \
+           ret.find('record = UNLIMITED') >= 0 and \
+           ret.find('profile:cf_role = "profile_id"') >= 0 and \
+           ret.find('parentIndex:instance_dimension = "profile"') >= 0 and \
+           ret.find(':featureType = "profile"') >= 0 and \
+           ret.find('char station(record') >= 0)
     else:
         gdal.Unlink('/vsimem/netcdf_63.nc')
         return 'skip'
@@ -2679,9 +2479,7 @@ def test_netcdf_64():
 "POINT Z (2 49 200)",0,3,Palo Alto,baw
 "POINT Z (3 50 100)",1,4,Santa Fe,baz2
 """
-    if content != expected_content:
-        print(content)
-        return 'fail'
+    assert content == expected_content
 
     gdal.Unlink('/vsimem/netcdf_64.csv')
     gdal.Unlink('/vsimem/netcdf_64.nc')
@@ -2818,9 +2616,7 @@ def test_netcdf_66():
 "POINT Z (2 49 200)",1,3,Palo Alto,baw
 "POINT Z (3 50 100)",2,4,Santa Fe,baz2
 """
-    if content != expected_content:
-        print(content)
-        return 'fail'
+    assert content == expected_content
 
     gdal.Unlink('/vsimem/netcdf_66.csv')
 
@@ -2839,16 +2635,14 @@ def test_netcdf_66_ncdump_check():
         err = None
     if err is not None and 'netcdf library version' in err:
         (ret, err) = gdaltest.runexternal_out_and_err('ncdump -h tmp/netcdf_66.nc')
-        if ret.find('char my_station(obs, my_station_max_width)') < 0 or \
-           ret.find('my_station:long_name = "my station attribute"') < 0 or \
-           ret.find('lon:my_extra_lon_attribute = "foo"') < 0 or \
-           ret.find('lat:long_name') >= 0 or \
-           ret.find('id:my_extra_attribute = 5.23') < 0 or \
-           ret.find('profile:cf_role = "profile_id"') < 0 or \
-           ret.find('parentIndex:instance_dimension = "profile"') < 0 or \
-           ret.find(':featureType = "profile"') < 0:
-            print(ret)
-            return 'fail'
+        assert (ret.find('char my_station(obs, my_station_max_width)') >= 0 and \
+           ret.find('my_station:long_name = "my station attribute"') >= 0 and \
+           ret.find('lon:my_extra_lon_attribute = "foo"') >= 0 and \
+           ret.find('lat:long_name') < 0 and \
+           ret.find('id:my_extra_attribute = 5.23') >= 0 and \
+           ret.find('profile:cf_role = "profile_id"') >= 0 and \
+           ret.find('parentIndex:instance_dimension = "profile"') >= 0 and \
+           ret.find(':featureType = "profile"') >= 0)
     else:
         gdal.Unlink('/vsimem/netcdf_66.nc')
         return 'skip'
@@ -2904,9 +2698,7 @@ def test_netcdf_68():
 
     ds = gdal.Open('data/srid.nc')
     wkt = ds.GetProjectionRef()
-    if wkt.find('6933') < 0:
-        print(wkt)
-        return 'fail'
+    assert wkt.find('6933') >= 0
 
     return 'success'
 
@@ -2920,8 +2712,7 @@ def test_netcdf_69():
         return 'skip'
 
     ds = gdal.Open('data/test6645.nc')
-    if ds is None:
-        return 'fail'
+    assert ds is not None
 
     return 'success'
 
@@ -2937,9 +2728,7 @@ def test_netcdf_70():
     ds = gdal.Open('data/test6759.nc')
     gt = ds.GetGeoTransform()
     expected_gt = [304250.0, 250.0, 0.0, 4952500.0, 0.0, -250.0]
-    if max(abs(gt[i] - expected_gt[i]) for i in range(6)) > 1e-3:
-        print(gt)
-        return 'fail'
+    assert max(abs(gt[i] - expected_gt[i]) for i in range(6)) <= 1e-3
 
     return 'success'
 
@@ -2956,9 +2745,7 @@ def test_netcdf_71():
     ds = gdal.Open('data/test_coord_scale_offset.nc')
     gt = ds.GetGeoTransform()
     expected_gt = (-690769.999174516, 1015.8812500000931, 0.0, 2040932.1838741193, 0.0, 1015.8812499996275)
-    if max(abs(gt[i] - expected_gt[i]) for i in range(6)) > 1e-3:
-        print(gt)
-        return 'fail'
+    assert max(abs(gt[i] - expected_gt[i]) for i in range(6)) <= 1e-3
 
     return 'success'
 
@@ -2976,9 +2763,7 @@ def test_netcdf_72():
 
     ds = gdal.Open('data/int64dim.nc')
     mdi = ds.GetRasterBand(1).GetMetadataItem('NETCDF_DIM_TIME')
-    if mdi != '123456789012':
-        print(mdi)
-        return 'fail'
+    assert mdi == '123456789012'
 
     return 'success'
 
@@ -2994,9 +2779,7 @@ def test_netcdf_73():
     ds = gdal.Open('data/geos_rad.nc')
     gt = ds.GetGeoTransform()
     expected_gt = (-5979486.362104082, 1087179.4077774752, 0.0, -5979487.123448145, 0.0, 1087179.4077774752)
-    if max([abs(gt[i] - expected_gt[i]) for i in range(6)]) > 1:
-        print(gt)
-        return 'fail'
+    assert max([abs(gt[i] - expected_gt[i]) for i in range(6)]) <= 1
 
     return 'success'
 
@@ -3012,9 +2795,7 @@ def test_netcdf_74():
     ds = gdal.Open('data/geos_microradian.nc')
     gt = ds.GetGeoTransform()
     expected_gt = (-5739675.119757546, 615630.8078590936, 0.0, -1032263.7666924844, 0.0, 615630.8078590936)
-    if max([abs(gt[i] - expected_gt[i]) for i in range(6)]) > 1:
-        print(gt)
-        return 'fail'
+    assert max([abs(gt[i] - expected_gt[i]) for i in range(6)]) <= 1
 
     return 'success'
 
@@ -3086,13 +2867,10 @@ def test_netcdf_77():
 
     ds = gdal.Open('data/fake_Oa01_radiance.nc')
     subdatasets = ds.GetMetadata('SUBDATASETS')
-    if len(subdatasets) != 2 * 2:
-        print(subdatasets)
-        return 'fail'
+    assert len(subdatasets) == 2 * 2
 
     ds = gdal.Open('NETCDF:"data/fake_Oa01_radiance.nc":Oa01_radiance')
-    if ds.GetMetadata('GEOLOCATION'):
-        return 'fail'
+    assert not ds.GetMetadata('GEOLOCATION')
 
     return 'success'
 
@@ -3107,13 +2885,10 @@ def test_netcdf_78():
         return 'skip'
 
     ds = gdal.Open('data/byte_with_valid_range.nc')
-    if ds.GetRasterBand(1).GetNoDataValue() != 240:
-        return 'fail'
+    assert ds.GetRasterBand(1).GetNoDataValue() == 240
     data = ds.GetRasterBand(1).ReadRaster()
     data = struct.unpack('B' * 4, data)
-    if data != (128, 129, 126, 127):
-        print(data)
-        return 'fail'
+    assert data == (128, 129, 126, 127)
 
     return 'success'
 
@@ -3128,13 +2903,10 @@ def test_netcdf_79():
         return 'skip'
 
     ds = gdal.Open('data/byte_with_neg_fillvalue_and_unsigned_hint.nc')
-    if ds.GetRasterBand(1).GetNoDataValue() != 240:
-        return 'fail'
+    assert ds.GetRasterBand(1).GetNoDataValue() == 240
     data = ds.GetRasterBand(1).ReadRaster()
     data = struct.unpack('B' * 4, data)
-    if data != (128, 129, 126, 127):
-        print(data)
-        return 'fail'
+    assert data == (128, 129, 126, 127)
 
     return 'success'
 
@@ -3161,25 +2933,17 @@ def test_netcdf_81():
 
     ds = gdal.Open('data/rotated_pole.nc')
 
-    if ds.RasterXSize != 137 or ds.RasterYSize != 108:
-        gdaltest.post_reason('Did not get expected dimensions')
-        print(ds.RasterXSize)
-        print(ds.RasterYSize)
-        return 'fail'
+    assert ds.RasterXSize == 137 and ds.RasterYSize == 108, \
+        'Did not get expected dimensions'
 
     projection = ds.GetProjectionRef()
     expected_projection = """PROJCS["unnamed",GEOGCS["unknown",DATUM["unknown",SPHEROID["Spheroid",6367470,594.3130483479559]],PRIMEM["Greenwich",0],UNIT["degree",0.0174532925199433]],PROJECTION["Rotated_pole"],EXTENSION["PROJ4","+proj=ob_tran +o_proj=longlat +lon_0=18 +o_lon_p=0 +o_lat_p=39.25 +a=6367470 +b=6367470 +to_meter=0.0174532925199 +wktext"]]"""
-    if projection != expected_projection:
-        gdaltest.post_reason('Did not get expected projection')
-        print(projection)
-        return 'fail'
+    assert projection == expected_projection, 'Did not get expected projection'
 
     gt = ds.GetGeoTransform()
     expected_gt = (-35.47, 0.44, 0.0, 23.65, 0.0, -0.44)
-    if max([abs(gt[i] - expected_gt[i]) for i in range(6)]) > 1e-3:
-        gdaltest.post_reason('Did not get expected geotransform')
-        print(gt)
-        return 'fail'
+    assert max([abs(gt[i] - expected_gt[i]) for i in range(6)]) <= 1e-3, \
+        'Did not get expected geotransform'
 
     return 'success'
 
@@ -3205,10 +2969,7 @@ def test_netcdf_82():
         'y#standard_name': 'projection_y_coordinate',
         'NETCDF_DIM_extra_dim_with_var_of_different_name_DEF': '{2,6}'
     }
-    if md != expected_md:
-        gdaltest.post_reason('Did not get expected metadata')
-        print(md)
-        return 'fail'
+    assert md == expected_md, 'Did not get expected metadata'
 
     md = ds.GetRasterBand(1).GetMetadata()
     expected_md = {
@@ -3217,10 +2978,7 @@ def test_netcdf_82():
         'NETCDF_DIM_extra_dim_without_variable': '1',
         'NETCDF_VARNAME': 'data'
     }
-    if md != expected_md:
-        gdaltest.post_reason('Did not get expected metadata')
-        print(md)
-        return 'fail'
+    assert md == expected_md, 'Did not get expected metadata'
 
     return 'success'
 
@@ -3243,8 +3001,7 @@ def test_netcdf_uffd():
         'reduce-cgcms.nc'
     ]
     for netcdf_file in netcdf_files:
-        if uffd_compare(netcdf_file) is not True:
-            return 'fail'
+        assert uffd_compare(netcdf_file) is True
 
     return 'success'
 
diff --git a/autotest/gdrivers/netcdf_cf.py b/autotest/gdrivers/netcdf_cf.py
index a1a3b26347d1..e0b2259805ae 100755
--- a/autotest/gdrivers/netcdf_cf.py
+++ b/autotest/gdrivers/netcdf_cf.py
@@ -38,6 +38,7 @@
 
 
 import gdaltest
+import pytest
 
 ###############################################################################
 # Netcdf CF compliance Functions
@@ -184,10 +185,8 @@ def netcdf_cf_check_file(ifile, version='auto', silent=True):
 
     # There should be a ERRORS detected summary
     if 'ERRORS detected' not in ret:
-        gdaltest.post_reason('ERROR with command - ' + command)
-        print(ret)
         print(err)
-        return 'fail'
+        pytest.fail('ERROR with command - ' + command)
 
     output_all = ret
     output_err = ''
@@ -660,10 +659,8 @@ def test_netcdf_cf_5():
         sr.ImportFromWkt(prj)
         lat_origin = sr.GetProjParm('latitude_of_origin')
 
-        if lat_origin != 60:
-            gdaltest.post_reason('Latitude of origin in %s does not match expected: %f'
+        assert lat_origin == 60, ('Latitude of origin in %s does not match expected: %f'
                                  % (ifile, lat_origin))
-            return 'fail'
 
     return 'success'
 
diff --git a/autotest/gdrivers/nitf.py b/autotest/gdrivers/nitf.py
index a85406f8cc84..49c6c3ef00c4 100755
--- a/autotest/gdrivers/nitf.py
+++ b/autotest/gdrivers/nitf.py
@@ -41,6 +41,7 @@
 
 
 import gdaltest
+import pytest
 
 ###############################################################################
 # Write/Read test of simple byte reference data.
@@ -131,48 +132,29 @@ def nitf_check_created_file(checksum1, checksum2, checksum3, set_inverted_color_
 
     chksum = ds.GetRasterBand(1).Checksum()
     chksum_expect = checksum1
-    if chksum != chksum_expect:
-        gdaltest.post_reason('Did not get expected chksum for band 1')
-        print(chksum, chksum_expect)
-        return 'fail'
+    assert chksum == chksum_expect, 'Did not get expected chksum for band 1'
 
     chksum = ds.GetRasterBand(2).Checksum()
     chksum_expect = checksum2
-    if chksum != chksum_expect:
-        gdaltest.post_reason('Did not get expected chksum for band 2')
-        print(chksum, chksum_expect)
-        return 'fail'
+    assert chksum == chksum_expect, 'Did not get expected chksum for band 2'
 
     chksum = ds.GetRasterBand(3).Checksum()
     chksum_expect = checksum3
-    if chksum != chksum_expect:
-        gdaltest.post_reason('Did not get expected chksum for band 3')
-        print(chksum, chksum_expect)
-        return 'fail'
+    assert chksum == chksum_expect, 'Did not get expected chksum for band 3'
 
     geotransform = ds.GetGeoTransform()
-    if abs(geotransform[0] - 100) > 0.1 \
-            or abs(geotransform[1] - 0.1) > 0.001 \
-            or abs(geotransform[2] - 0) > 0.001 \
-            or abs(geotransform[3] - 30.0) > 0.1 \
-            or abs(geotransform[4] - 0) > 0.001 \
-            or abs(geotransform[5] - -0.1) > 0.001:
-        print(geotransform)
-        gdaltest.post_reason('geotransform differs from expected')
-        return 'fail'
+    assert abs(geotransform[0] - 100) <= 0.1 and abs(geotransform[1] - 0.1) <= 0.001 and abs(geotransform[2] - 0) <= 0.001 and abs(geotransform[3] - 30.0) <= 0.1 and abs(geotransform[4] - 0) <= 0.001 and abs(geotransform[5] - -0.1) <= 0.001, \
+        'geotransform differs from expected'
 
     if set_inverted_color_interp:
-        if ds.GetRasterBand(1).GetRasterColorInterpretation() != gdal.GCI_BlueBand:
-            gdaltest.post_reason('Got wrong color interpretation.')
-            return 'fail'
+        assert ds.GetRasterBand(1).GetRasterColorInterpretation() == gdal.GCI_BlueBand, \
+            'Got wrong color interpretation.'
 
-        if ds.GetRasterBand(2).GetRasterColorInterpretation() != gdal.GCI_GreenBand:
-            gdaltest.post_reason('Got wrong color interpretation.')
-            return 'fail'
+        assert ds.GetRasterBand(2).GetRasterColorInterpretation() == gdal.GCI_GreenBand, \
+            'Got wrong color interpretation.'
 
-        if ds.GetRasterBand(3).GetRasterColorInterpretation() != gdal.GCI_RedBand:
-            gdaltest.post_reason('Got wrong color interpretation.')
-            return 'fail'
+        assert ds.GetRasterBand(3).GetRasterColorInterpretation() == gdal.GCI_RedBand, \
+            'Got wrong color interpretation.'
 
     ds = None
 
@@ -216,28 +198,13 @@ def test_nitf_8():
 
     chksum = ds.GetRasterBand(1).Checksum()
     chksum_expect = 12033
-    if chksum != chksum_expect:
-        gdaltest.post_reason('Did not get expected chksum for band 1')
-        print(chksum, chksum_expect)
-        return 'fail'
+    assert chksum == chksum_expect, 'Did not get expected chksum for band 1'
 
     md = ds.GetMetadata()
-    if md['NITF_FHDR'] != 'NSIF01.00':
-        gdaltest.post_reason('Got wrong FHDR value')
-        return 'fail'
+    assert md['NITF_FHDR'] == 'NSIF01.00', 'Got wrong FHDR value'
 
-    if md['NITF_BLOCKA_BLOCK_INSTANCE_01'] != '01' \
-       or md['NITF_BLOCKA_BLOCK_COUNT'] != '01' \
-       or md['NITF_BLOCKA_N_GRAY_01'] != '00000' \
-       or md['NITF_BLOCKA_L_LINES_01'] != '01000' \
-       or md['NITF_BLOCKA_LAYOVER_ANGLE_01'] != '000' \
-       or md['NITF_BLOCKA_SHADOW_ANGLE_01'] != '000' \
-       or md['NITF_BLOCKA_FRLC_LOC_01'] != '+41.319331+020.078400' \
-       or md['NITF_BLOCKA_LRLC_LOC_01'] != '+41.317083+020.126072' \
-       or md['NITF_BLOCKA_LRFC_LOC_01'] != '+41.281634+020.122570' \
-       or md['NITF_BLOCKA_FRFC_LOC_01'] != '+41.283881+020.074924':
-        gdaltest.post_reason('BLOCKA metadata has unexpected value.')
-        return 'fail'
+    assert md['NITF_BLOCKA_BLOCK_INSTANCE_01'] == '01' and md['NITF_BLOCKA_BLOCK_COUNT'] == '01' and md['NITF_BLOCKA_N_GRAY_01'] == '00000' and md['NITF_BLOCKA_L_LINES_01'] == '01000' and md['NITF_BLOCKA_LAYOVER_ANGLE_01'] == '000' and md['NITF_BLOCKA_SHADOW_ANGLE_01'] == '000' and md['NITF_BLOCKA_FRLC_LOC_01'] == '+41.319331+020.078400' and md['NITF_BLOCKA_LRLC_LOC_01'] == '+41.317083+020.126072' and md['NITF_BLOCKA_LRFC_LOC_01'] == '+41.281634+020.122570' and md['NITF_BLOCKA_FRFC_LOC_01'] == '+41.283881+020.074924', \
+        'BLOCKA metadata has unexpected value.'
 
     return 'success'
 
@@ -258,15 +225,11 @@ def test_nitf_9():
     (exp_mean, exp_stddev) = (65.9532, 46.9026375565)
     (mean, stddev) = ds.GetRasterBand(1).ComputeBandStats()
 
-    if abs(exp_mean - mean) > 0.1 or abs(exp_stddev - stddev) > 0.1:
-        print(mean, stddev)
-        gdaltest.post_reason('did not get expected mean or standard dev.')
-        return 'fail'
+    assert abs(exp_mean - mean) <= 0.1 and abs(exp_stddev - stddev) <= 0.1, \
+        'did not get expected mean or standard dev.'
 
     md = ds.GetMetadata('IMAGE_STRUCTURE')
-    if md['COMPRESSION'] != 'JPEG':
-        gdaltest.post_reason('Did not get expected compression value.')
-        return 'fail'
+    assert md['COMPRESSION'] == 'JPEG', 'Did not get expected compression value.'
 
     return 'success'
 
@@ -280,8 +243,7 @@ def test_nitf_10():
     src_ds = gdal.Open('tmp/nitf9.ntf')
     expected_cs = src_ds.GetRasterBand(2).Checksum()
     src_ds = None
-    if expected_cs != 22296 and expected_cs != 22259:
-        return 'fail'
+    assert expected_cs == 22296 or expected_cs == 22259
 
     tst = gdaltest.GDALTest('NITF', '../tmp/nitf9.ntf', 2, expected_cs)
     return tst.testCreateCopy()
@@ -322,21 +284,16 @@ def test_nitf_12():
 
     expectedBlockA = '010000001000000000                +41.319331+020.078400+41.317083+020.126072+41.281634+020.122570+41.283881+020.074924     '
 
-    if mdTRE['BLOCKA'] != expectedBlockA:
-        gdaltest.post_reason('did not find expected BLOCKA from metadata.')
-        return 'fail'
+    assert mdTRE['BLOCKA'] == expectedBlockA, \
+        'did not find expected BLOCKA from metadata.'
 
-    if blockA != expectedBlockA:
-        gdaltest.post_reason('did not find expected BLOCKA from metadata item.')
-        return 'fail'
+    assert blockA == expectedBlockA, 'did not find expected BLOCKA from metadata item.'
 
-    if mdCGM['SEGMENT_COUNT'] != '0':
-        gdaltest.post_reason('did not find expected SEGMENT_COUNT from metadata.')
-        return 'fail'
+    assert mdCGM['SEGMENT_COUNT'] == '0', \
+        'did not find expected SEGMENT_COUNT from metadata.'
 
-    if segmentCount != '0':
-        gdaltest.post_reason('did not find expected SEGMENT_COUNT from metadata item.')
-        return 'fail'
+    assert segmentCount == '0', \
+        'did not find expected SEGMENT_COUNT from metadata item.'
 
     return 'success'
 
@@ -372,27 +329,15 @@ def test_nitf_14():
 
     chksum = ds.GetRasterBand(1).Checksum()
     chksum_expect = 55964
-    if chksum != chksum_expect:
-        gdaltest.post_reason('Did not get expected chksum for band 1')
-        print(chksum, chksum_expect)
-        return 'fail'
+    assert chksum == chksum_expect, 'Did not get expected chksum for band 1'
 
     geotransform = ds.GetGeoTransform()
-    if abs(geotransform[0] - 400000) > .1 \
-            or abs(geotransform[1] - 10) > 0.001 \
-            or abs(geotransform[2] - 0) > 0.001 \
-            or abs(geotransform[3] - 6000000) > .1 \
-            or abs(geotransform[4] - 0) > 0.001 \
-            or abs(geotransform[5] - -10) > 0.001:
-        print(geotransform)
-        gdaltest.post_reason('geotransform differs from expected')
-        return 'fail'
+    assert abs(geotransform[0] - 400000) <= .1 and abs(geotransform[1] - 10) <= 0.001 and abs(geotransform[2] - 0) <= 0.001 and abs(geotransform[3] - 6000000) <= .1 and abs(geotransform[4] - 0) <= 0.001 and abs(geotransform[5] - -10) <= 0.001, \
+        'geotransform differs from expected'
 
     prj = ds.GetProjectionRef()
-    if prj.find('UTM Zone 11, Southern Hemisphere') == -1:
-        print(prj)
-        gdaltest.post_reason('Coordinate system not UTM Zone 11, Southern Hemisphere')
-        return 'fail'
+    assert prj.find('UTM Zone 11, Southern Hemisphere') != -1, \
+        'Coordinate system not UTM Zone 11, Southern Hemisphere'
 
     ds = None
 
@@ -441,8 +386,7 @@ def test_nitf_18():
     ds = gdal.Open("data/U_0006A.NTF")
     gdal.PopErrorHandler()
 
-    if ds.RasterCount != 0:
-        return 'fail'
+    assert ds.RasterCount == 0
 
     return 'success'
 
@@ -469,8 +413,7 @@ def test_nitf_20():
     ds = gdal.Open("data/U_0002A.NTF")
     gdal.PopErrorHandler()
 
-    if ds is not None:
-        return 'fail'
+    assert ds is None
 
     return 'success'
 
@@ -496,13 +439,9 @@ def test_nitf_21():
 
     ds = None
 
-    if mdTEXT['DATA_0'] != 'A':
-        gdaltest.post_reason('did not find expected DATA_0 from metadata.')
-        return 'fail'
+    assert mdTEXT['DATA_0'] == 'A', 'did not find expected DATA_0 from metadata.'
 
-    if data0 != 'A':
-        gdaltest.post_reason('did not find expected DATA_0 from metadata item.')
-        return 'fail'
+    assert data0 == 'A', 'did not find expected DATA_0 from metadata item.'
 
     return 'success'
 
@@ -721,13 +660,11 @@ def test_nitf_29():
     ds = gdal.Open('tmp/test_29.ntf')
 
     ct = ds.GetRasterBand(1).GetRasterColorTable()
-    if ct.GetCount() != 129 or \
-       ct.GetColorEntry(0) != (255, 255, 255, 255) or \
-       ct.GetColorEntry(1) != (255, 255, 0, 255) or \
-       ct.GetColorEntry(2) != (255, 0, 255, 255) or \
-       ct.GetColorEntry(3) != (0, 255, 255, 255):
-        gdaltest.post_reason('Wrong color table entry.')
-        return 'fail'
+    assert (ct.GetCount() == 129 and \
+       ct.GetColorEntry(0) == (255, 255, 255, 255) and \
+       ct.GetColorEntry(1) == (255, 255, 0, 255) and \
+       ct.GetColorEntry(2) == (255, 0, 255, 255) and \
+       ct.GetColorEntry(3) == (0, 255, 255, 255)), 'Wrong color table entry.'
 
     new_ds = drv.CreateCopy('tmp/test_29_copy.ntf', ds)
     del new_ds
@@ -736,13 +673,11 @@ def test_nitf_29():
     ds = gdal.Open('tmp/test_29_copy.ntf')
 
     ct = ds.GetRasterBand(1).GetRasterColorTable()
-    if ct.GetCount() != 130 or \
-       ct.GetColorEntry(0) != (255, 255, 255, 255) or \
-       ct.GetColorEntry(1) != (255, 255, 0, 255) or \
-       ct.GetColorEntry(2) != (255, 0, 255, 255) or \
-       ct.GetColorEntry(3) != (0, 255, 255, 255):
-        gdaltest.post_reason('Wrong color table entry.')
-        return 'fail'
+    assert (ct.GetCount() == 130 and \
+       ct.GetColorEntry(0) == (255, 255, 255, 255) and \
+       ct.GetColorEntry(1) == (255, 255, 0, 255) and \
+       ct.GetColorEntry(2) == (255, 0, 255, 255) and \
+       ct.GetColorEntry(3) == (0, 255, 255, 255)), 'Wrong color table entry.'
 
     ds = None
 
@@ -759,28 +694,13 @@ def test_nitf_30():
 
     chksum = ds.GetRasterBand(1).Checksum()
     chksum_expect = 12033
-    if chksum != chksum_expect:
-        gdaltest.post_reason('Did not get expected chksum for band 1')
-        print(chksum, chksum_expect)
-        return 'fail'
+    assert chksum == chksum_expect, 'Did not get expected chksum for band 1'
 
     md = ds.GetMetadata()
-    if md['NITF_FHDR'] != 'NSIF01.00':
-        gdaltest.post_reason('Got wrong FHDR value')
-        return 'fail'
+    assert md['NITF_FHDR'] == 'NSIF01.00', 'Got wrong FHDR value'
 
-    if md['NITF_BLOCKA_BLOCK_INSTANCE_01'] != '01' \
-       or md['NITF_BLOCKA_BLOCK_COUNT'] != '01' \
-       or md['NITF_BLOCKA_N_GRAY_01'] != '00000' \
-       or md['NITF_BLOCKA_L_LINES_01'] != '01000' \
-       or md['NITF_BLOCKA_LAYOVER_ANGLE_01'] != '000' \
-       or md['NITF_BLOCKA_SHADOW_ANGLE_01'] != '000' \
-       or md['NITF_BLOCKA_FRLC_LOC_01'] != '+41.319331+020.078400' \
-       or md['NITF_BLOCKA_LRLC_LOC_01'] != '+41.317083+020.126072' \
-       or md['NITF_BLOCKA_LRFC_LOC_01'] != '+41.281634+020.122570' \
-       or md['NITF_BLOCKA_FRFC_LOC_01'] != '+41.283881+020.074924':
-        gdaltest.post_reason('BLOCKA metadata has unexpected value.')
-        return 'fail'
+    assert md['NITF_BLOCKA_BLOCK_INSTANCE_01'] == '01' and md['NITF_BLOCKA_BLOCK_COUNT'] == '01' and md['NITF_BLOCKA_N_GRAY_01'] == '00000' and md['NITF_BLOCKA_L_LINES_01'] == '01000' and md['NITF_BLOCKA_LAYOVER_ANGLE_01'] == '000' and md['NITF_BLOCKA_SHADOW_ANGLE_01'] == '000' and md['NITF_BLOCKA_FRLC_LOC_01'] == '+41.319331+020.078400' and md['NITF_BLOCKA_LRLC_LOC_01'] == '+41.317083+020.126072' and md['NITF_BLOCKA_LRFC_LOC_01'] == '+41.281634+020.122570' and md['NITF_BLOCKA_FRFC_LOC_01'] == '+41.283881+020.074924', \
+        'BLOCKA metadata has unexpected value.'
 
     ds = None
 
@@ -804,19 +724,8 @@ def test_nitf_30():
     ds = None
     gdal.GetDriverByName('NITF').Delete('/vsimem/nitf30_override.ntf')
 
-    if md['NITF_BLOCKA_BLOCK_INSTANCE_01'] != '01' \
-       or md['NITF_BLOCKA_BLOCK_COUNT'] != '01' \
-       or md['NITF_BLOCKA_N_GRAY_01'] != '00000' \
-       or md['NITF_BLOCKA_L_LINES_01'] != '01000' \
-       or md['NITF_BLOCKA_LAYOVER_ANGLE_01'] != '000' \
-       or md['NITF_BLOCKA_SHADOW_ANGLE_01'] != '000' \
-       or md['NITF_BLOCKA_FRLC_LOC_01'] != '+42.319331+020.078400' \
-       or md['NITF_BLOCKA_LRLC_LOC_01'] != '+42.317083+020.126072' \
-       or md['NITF_BLOCKA_LRFC_LOC_01'] != '+42.281634+020.122570' \
-       or md['NITF_BLOCKA_FRFC_LOC_01'] != '+42.283881+020.074924':
-        gdaltest.post_reason('BLOCKA metadata has unexpected value.')
-        print(md)
-        return 'fail'
+    assert md['NITF_BLOCKA_BLOCK_INSTANCE_01'] == '01' and md['NITF_BLOCKA_BLOCK_COUNT'] == '01' and md['NITF_BLOCKA_N_GRAY_01'] == '00000' and md['NITF_BLOCKA_L_LINES_01'] == '01000' and md['NITF_BLOCKA_LAYOVER_ANGLE_01'] == '000' and md['NITF_BLOCKA_SHADOW_ANGLE_01'] == '000' and md['NITF_BLOCKA_FRLC_LOC_01'] == '+42.319331+020.078400' and md['NITF_BLOCKA_LRLC_LOC_01'] == '+42.317083+020.126072' and md['NITF_BLOCKA_LRFC_LOC_01'] == '+42.281634+020.122570' and md['NITF_BLOCKA_FRFC_LOC_01'] == '+42.283881+020.074924', \
+        'BLOCKA metadata has unexpected value.'
 
     # Test overriding src BLOCKA metadata with TRE=BLOCKA= creation option
     gdal.GetDriverByName('NITF').CreateCopy('/vsimem/nitf30_override.ntf', src_ds,
@@ -827,19 +736,8 @@ def test_nitf_30():
     ds = None
     gdal.GetDriverByName('NITF').Delete('/vsimem/nitf30_override.ntf')
 
-    if md['NITF_BLOCKA_BLOCK_INSTANCE_01'] != '01' \
-       or md['NITF_BLOCKA_BLOCK_COUNT'] != '01' \
-       or md['NITF_BLOCKA_N_GRAY_01'] != '00000' \
-       or md['NITF_BLOCKA_L_LINES_01'] != '01000' \
-       or md['NITF_BLOCKA_LAYOVER_ANGLE_01'] != '000' \
-       or md['NITF_BLOCKA_SHADOW_ANGLE_01'] != '000' \
-       or md['NITF_BLOCKA_FRLC_LOC_01'] != '+42.319331+020.078400' \
-       or md['NITF_BLOCKA_LRLC_LOC_01'] != '+42.317083+020.126072' \
-       or md['NITF_BLOCKA_LRFC_LOC_01'] != '+42.281634+020.122570' \
-       or md['NITF_BLOCKA_FRFC_LOC_01'] != '+42.283881+020.074924':
-        gdaltest.post_reason('BLOCKA metadata has unexpected value.')
-        print(md)
-        return 'fail'
+    assert md['NITF_BLOCKA_BLOCK_INSTANCE_01'] == '01' and md['NITF_BLOCKA_BLOCK_COUNT'] == '01' and md['NITF_BLOCKA_N_GRAY_01'] == '00000' and md['NITF_BLOCKA_L_LINES_01'] == '01000' and md['NITF_BLOCKA_LAYOVER_ANGLE_01'] == '000' and md['NITF_BLOCKA_SHADOW_ANGLE_01'] == '000' and md['NITF_BLOCKA_FRLC_LOC_01'] == '+42.319331+020.078400' and md['NITF_BLOCKA_LRLC_LOC_01'] == '+42.317083+020.126072' and md['NITF_BLOCKA_LRFC_LOC_01'] == '+42.281634+020.122570' and md['NITF_BLOCKA_FRFC_LOC_01'] == '+42.283881+020.074924', \
+        'BLOCKA metadata has unexpected value.'
 
     # Test that gdal_translate -ullr doesn't propagate BLOCKA
     gdal.Translate('/vsimem/nitf30_no_src_md.ntf', src_ds, format='NITF', outputBounds=[2, 49, 3, 50])
@@ -847,9 +745,8 @@ def test_nitf_30():
     md = ds.GetMetadata()
     ds = None
     gdal.GetDriverByName('NITF').Delete('/vsimem/nitf30_no_src_md.ntf')
-    if 'NITF_BLOCKA_BLOCK_INSTANCE_01' in md:
-        gdaltest.post_reason('unexpectdly found BLOCKA metadata.')
-        return 'fail'
+    assert 'NITF_BLOCKA_BLOCK_INSTANCE_01' not in md, \
+        'unexpectdly found BLOCKA metadata.'
 
     # Test USE_SRC_NITF_METADATA=NO
     gdal.GetDriverByName('NITF').CreateCopy('/vsimem/nitf30_no_src_md.ntf', src_ds,
@@ -858,9 +755,8 @@ def test_nitf_30():
     md = ds.GetMetadata()
     ds = None
     gdal.GetDriverByName('NITF').Delete('/vsimem/nitf30_no_src_md.ntf')
-    if 'NITF_BLOCKA_BLOCK_INSTANCE_01' in md:
-        gdaltest.post_reason('unexpectdly found BLOCKA metadata.')
-        return 'fail'
+    assert 'NITF_BLOCKA_BLOCK_INSTANCE_01' not in md, \
+        'unexpectdly found BLOCKA metadata.'
 
     return 'success'
 
@@ -877,25 +773,17 @@ def test_nitf_31():
     ds = gdal.Open('tmp/test_create.ntf')
 
     md = ds.GetMetadata('TRE')
-    if len(md) != 2:
-        gdaltest.post_reason('Did not get expected TRE count')
-        print(md)
-        return 'fail'
+    assert len(md) == 2, 'Did not get expected TRE count'
 
     # Check that the leading space in the CUSTOM metadata item is preserved (#3088, #3204)
     try:
-        if ds.GetMetadataItem('CUSTOM', 'TRE') != ' Test TRE1\\0MORE':
-            gdaltest.post_reason('Did not get expected TRE contents')
-            print(ds.GetMetadataItem('CUSTOM', 'TRE'))
-            return 'fail'
+        assert ds.GetMetadataItem('CUSTOM', 'TRE') == ' Test TRE1\\0MORE', \
+            'Did not get expected TRE contents'
     except:
         pass
 
-    if md['CUSTOM'] != ' Test TRE1\\0MORE' \
-       or md['TOTEST'] != 'SecondTRE':
-        gdaltest.post_reason('Did not get expected TRE contents')
-        print(md)
-        return 'fail'
+    assert md['CUSTOM'] == ' Test TRE1\\0MORE' and md['TOTEST'] == 'SecondTRE', \
+        'Did not get expected TRE contents'
 
     ds = None
     return nitf_check_created_file(32498, 42602, 38982)
@@ -953,18 +841,12 @@ def test_nitf_35():
 with a newline."""
 
     md = ds.GetMetadata('TEXT')
-    if md['DATA_0'] != exp_text:
-        gdaltest.post_reason('Did not get expected TEXT metadata.')
-        print(md)
-        return 'fail'
+    assert md['DATA_0'] == exp_text, 'Did not get expected TEXT metadata.'
 
     exp_text = """Also, a second text segment is created."""
 
     md = ds.GetMetadata('TEXT')
-    if md['DATA_1'] != exp_text:
-        gdaltest.post_reason('Did not get expected TEXT metadata.')
-        print(md)
-        return 'fail'
+    assert md['DATA_1'] == exp_text, 'Did not get expected TEXT metadata.'
 
     ds = None
 
@@ -986,42 +868,32 @@ def test_nitf_36():
 
     ds = gdal.Open('tmp/nitf36.ntf')
 
-    if ds.GetRasterBand(1).GetMinimum() is not None:
-        gdaltest.post_reason('Did not expect to have minimum value at that point.')
-        return 'fail'
+    assert ds.GetRasterBand(1).GetMinimum() is None, \
+        'Did not expect to have minimum value at that point.'
 
     (_, _, mean, stddev) = ds.GetRasterBand(1).GetStatistics(False, False)
-    if stddev >= 0:
-        gdaltest.post_reason('Did not expect to have statistics at that point.')
-        return 'fail'
+    assert stddev < 0, 'Did not expect to have statistics at that point.'
 
     (exp_mean, exp_stddev) = (65.4208, 47.254550335)
     (_, _, mean, stddev) = ds.GetRasterBand(1).GetStatistics(False, True)
 
-    if abs(exp_mean - mean) > 0.1 or abs(exp_stddev - stddev) > 0.1:
-        print(mean, stddev)
-        gdaltest.post_reason('did not get expected mean or standard dev.')
-        return 'fail'
+    assert abs(exp_mean - mean) <= 0.1 and abs(exp_stddev - stddev) <= 0.1, \
+        'did not get expected mean or standard dev.'
 
     md = ds.GetMetadata('IMAGE_STRUCTURE')
-    if md['COMPRESSION'] != 'JPEG':
-        gdaltest.post_reason('Did not get expected compression value.')
-        return 'fail'
+    assert md['COMPRESSION'] == 'JPEG', 'Did not get expected compression value.'
 
     ds = None
 
     # Check that statistics are persisted (#3985)
     ds = gdal.Open('tmp/nitf36.ntf')
 
-    if ds.GetRasterBand(1).GetMinimum() is None:
-        gdaltest.post_reason('Should have minimum value at that point.')
-        return 'fail'
+    assert ds.GetRasterBand(1).GetMinimum() is not None, \
+        'Should have minimum value at that point.'
 
     (_, _, mean, stddev) = ds.GetRasterBand(1).GetStatistics(False, False)
-    if abs(exp_mean - mean) > 0.1 or abs(exp_stddev - stddev) > 0.1:
-        print(mean, stddev)
-        gdaltest.post_reason('Should have statistics at that point.')
-        return 'fail'
+    assert abs(exp_mean - mean) <= 0.1 and abs(exp_stddev - stddev) <= 0.1, \
+        'Should have statistics at that point.'
 
     ds = None
 
@@ -1043,8 +915,7 @@ def test_nitf_37():
     ds = None
 
     ds = gdal.Open('tmp/nitf37.ntf')
-    if ds.RasterCount != 69999:
-        return 'fail'
+    assert ds.RasterCount == 69999
     ds = None
 
     return 'success'
@@ -1073,23 +944,16 @@ def test_nitf_38():
     ds = None
 
     ds = gdal.Open('NITF_IM:0:tmp/nitf38.ntf')
-    if ds.GetRasterBand(1).Checksum() != 0:
-        return 'fail'
+    assert ds.GetRasterBand(1).Checksum() == 0
     ds = None
 
     ds = gdal.Open('NITF_IM:998:tmp/nitf38.ntf')
     cs = ds.GetRasterBand(1).Checksum()
-    if cs != expected_cs:
-        print(cs)
-        gdaltest.post_reason('bad checksum for image of 998th subdataset')
-        return 'fail'
+    assert cs == expected_cs, 'bad checksum for image of 998th subdataset'
 
     # Check the overview
     cs = ds.GetRasterBand(1).GetOverview(0).Checksum()
-    if cs != 1087:
-        print(cs)
-        gdaltest.post_reason('bad checksum for overview of image of 998th subdataset')
-        return 'fail'
+    assert cs == 1087, 'bad checksum for overview of image of 998th subdataset'
 
     out_ds = gdal.GetDriverByName('VRT').CreateCopy('tmp/nitf38.vrt', ds)
     out_ds = None
@@ -1100,9 +964,7 @@ def test_nitf_38():
     ds = None
 
     gdal.Unlink('tmp/nitf38.vrt')
-    if cs != expected_cs:
-        print(cs)
-        return 'fail'
+    assert cs == expected_cs
 
     ds = gdal.Open('NITF_IM:998:%s/tmp/nitf38.ntf' % os.getcwd())
     out_ds = gdal.GetDriverByName('VRT').CreateCopy('%s/tmp/nitf38.vrt' % os.getcwd(), ds)
@@ -1114,9 +976,7 @@ def test_nitf_38():
     ds = None
 
     gdal.Unlink('tmp/nitf38.vrt')
-    if cs != expected_cs:
-        print(cs)
-        return 'fail'
+    assert cs == expected_cs
 
     ds = gdal.Open('NITF_IM:998:%s/tmp/nitf38.ntf' % os.getcwd())
     out_ds = gdal.GetDriverByName('VRT').CreateCopy('tmp/nitf38.vrt', ds)
@@ -1128,9 +988,7 @@ def test_nitf_38():
     ds = None
 
     gdal.Unlink('tmp/nitf38.vrt')
-    if cs != expected_cs:
-        print(cs)
-        return 'fail'
+    assert cs == expected_cs
 
     return 'success'
 
@@ -1151,15 +1009,11 @@ def test_nitf_39():
     (exp_mean, exp_stddev) = (65.4208, 47.254550335)
     (mean, stddev) = ds.GetRasterBand(1).ComputeBandStats()
 
-    if abs(exp_mean - mean) > 0.1 or abs(exp_stddev - stddev) > 0.1:
-        print(mean, stddev)
-        gdaltest.post_reason('did not get expected mean or standard dev.')
-        return 'fail'
+    assert abs(exp_mean - mean) <= 0.1 and abs(exp_stddev - stddev) <= 0.1, \
+        'did not get expected mean or standard dev.'
 
     md = ds.GetMetadata('IMAGE_STRUCTURE')
-    if md['COMPRESSION'] != 'JPEG':
-        gdaltest.post_reason('Did not get expected compression value.')
-        return 'fail'
+    assert md['COMPRESSION'] == 'JPEG', 'Did not get expected compression value.'
 
     ds = None
 
@@ -1190,8 +1044,7 @@ def test_nitf_40():
 
     # Check that we can fetch it at the right value
     ds = gdal.Open('tmp/nitf40.ntf')
-    if ds.GetRasterBand(1).ReadRaster(x, y, 1, 1) != data:
-        return 'fail'
+    assert ds.GetRasterBand(1).ReadRaster(x, y, 1, 1) == data
     ds = None
 
     # Check that it is indeed at a very far offset, and that the NITF driver
@@ -1216,9 +1069,7 @@ def test_nitf_40():
     fd.close()
 
     val = struct.unpack('B' * 1, bytes_read)[0]
-    if val != 123:
-        gdaltest.post_reason('Bad value at offset %d : %d' % (offset, val))
-        return 'fail'
+    assert val == 123, ('Bad value at offset %d : %d' % (offset, val))
 
     return 'success'
 
@@ -1246,12 +1097,9 @@ def test_nitf_41():
         pass
 
     ds = gdal.Open('data/U_4017A.NTF')
-    if ds.GetRasterBand(1).DataType != gdal.GDT_UInt16:
-        return 'fail'
+    assert ds.GetRasterBand(1).DataType == gdal.GDT_UInt16
     stats = ds.GetRasterBand(1).GetStatistics(0, 1)
-    if stats[2] < 2385 or stats[2] > 2386:
-        print(stats)
-        return 'fail'
+    assert stats[2] >= 2385 and stats[2] <= 2386
     ds = None
 
     try:
@@ -1282,12 +1130,9 @@ def test_nitf_42():
     del out_ds
 
     ds = gdal.Open('tmp/nitf42.ntf')
-    if ds.GetRasterBand(1).DataType != gdal.GDT_UInt16:
-        return 'fail'
+    assert ds.GetRasterBand(1).DataType == gdal.GDT_UInt16
     stats = ds.GetRasterBand(1).GetStatistics(0, 1)
-    if stats[2] < 2385 or stats[2] > 2386:
-        print(stats)
-        return 'fail'
+    assert stats[2] >= 2385 and stats[2] <= 2386
     ds = None
 
     return 'success'
@@ -1360,11 +1205,9 @@ def test_nitf_44():
 
     if 'GetBlockSize' in dir(gdal.Band):
         (blockx, _) = ds.GetRasterBand(1).GetBlockSize()
-        if blockx != 10000:
-            return 'fail'
+        assert blockx == 10000
 
-    if ds.GetRasterBand(1).Checksum() != 57182:
-        return 'fail'
+    assert ds.GetRasterBand(1).Checksum() == 57182
     ds = None
 
     return 'success'
@@ -1389,10 +1232,7 @@ def test_nitf_45():
 
     ds = gdal.Open('NITF_IM:1:tmp/nitf45.ntf')
     cs = ds.GetRasterBand(1).GetOverview(0).Checksum()
-    if cs != 1086:
-        print(cs)
-        gdaltest.post_reason('did not get expected checksum for overview of subdataset')
-        return 'fail'
+    assert cs == 1086, 'did not get expected checksum for overview of subdataset'
 
     ds = None
 
@@ -1476,15 +1316,11 @@ def test_nitf_47():
     ds = gdal.Open('data/rset.ntf.r0')
 
     band = ds.GetRasterBand(2)
-    if band.GetOverviewCount() != 2:
-        gdaltest.post_reason('did not get the expected number of rset overviews.')
-        return 'fail'
+    assert band.GetOverviewCount() == 2, \
+        'did not get the expected number of rset overviews.'
 
     cs = band.GetOverview(1).Checksum()
-    if cs != 1297:
-        print(cs)
-        gdaltest.post_reason('did not get expected checksum for overview of subdataset')
-        return 'fail'
+    assert cs == 1297, 'did not get expected checksum for overview of subdataset'
 
     ds = None
 
@@ -1513,15 +1349,11 @@ def test_nitf_48():
     ds = None
 
     ds = gdal.Open('tmp/rset.ntf.r0')
-    if ds.GetRasterBand(1).GetOverviewCount() != 1:
-        gdaltest.post_reason('did not get the expected number of rset overviews.')
-        return 'fail'
+    assert ds.GetRasterBand(1).GetOverviewCount() == 1, \
+        'did not get the expected number of rset overviews.'
 
     cs = ds.GetRasterBand(1).GetOverview(0).Checksum()
-    if cs != 2328:
-        print(cs)
-        gdaltest.post_reason('did not get expected checksum for overview of subdataset')
-        return 'fail'
+    assert cs == 2328, 'did not get expected checksum for overview of subdataset'
 
     ds = None
 
@@ -1670,10 +1502,8 @@ def test_nitf_51():
 
             for i in range(xsize):
                 if arr[i] != (1 << nbpp) - 1:
-                    gdaltest.post_reason('did not get expected data')
                     print('xsize = %d, nbpp = %d' % (xsize, nbpp))
-                    print(arr)
-                    return 'fail'
+                    pytest.fail('did not get expected data')
 
     return 'success'
 
@@ -1694,15 +1524,11 @@ def test_nitf_52():
     gt = ds.GetGeoTransform()
     ds = None
 
-    if wkt != """PROJCS["unnamed",GEOGCS["EUROPEAN 1950, Mean (3 Param)",DATUM["EUROPEAN 1950, Mean (3 Param)",SPHEROID["International 1924            ",6378388,297],TOWGS84[-87,-98,-121,0,0,0,0]],PRIMEM["Greenwich",0],UNIT["degree",0.0174532925199433]],PROJECTION["Albers_Conic_Equal_Area"],PARAMETER["standard_parallel_1",0],PARAMETER["standard_parallel_2",0],PARAMETER["latitude_of_center",0],PARAMETER["longitude_of_center",0],PARAMETER["false_easting",0],PARAMETER["false_northing",0]]""":
-        gdaltest.post_reason('did not get expected SRS')
-        print(wkt)
-        return 'fail'
+    assert wkt == """PROJCS["unnamed",GEOGCS["EUROPEAN 1950, Mean (3 Param)",DATUM["EUROPEAN 1950, Mean (3 Param)",SPHEROID["International 1924            ",6378388,297],TOWGS84[-87,-98,-121,0,0,0,0]],PRIMEM["Greenwich",0],UNIT["degree",0.0174532925199433]],PROJECTION["Albers_Conic_Equal_Area"],PARAMETER["standard_parallel_1",0],PARAMETER["standard_parallel_2",0],PARAMETER["latitude_of_center",0],PARAMETER["longitude_of_center",0],PARAMETER["false_easting",0],PARAMETER["false_northing",0]]""", \
+        'did not get expected SRS'
 
-    if gt != (100000.0, 10.0, 0.0, 5000000.0, 0.0, -10.0):
-        gdaltest.post_reason('did not get expected geotransform')
-        print(gt)
-        return 'fail'
+    assert gt == (100000.0, 10.0, 0.0, 5000000.0, 0.0, -10.0), \
+        'did not get expected geotransform'
 
     return 'success'
 
@@ -1732,15 +1558,11 @@ def test_nitf_53():
     gt = ds.GetGeoTransform()
     ds = None
 
-    if wkt.find("""PROJCS["UTM Zone 31, Northern Hemisphere",GEOGCS["WGS 84""") != 0:
-        gdaltest.post_reason('did not get expected SRS')
-        print(wkt)
-        return 'fail'
+    assert wkt.find("""PROJCS["UTM Zone 31, Northern Hemisphere",GEOGCS["WGS 84""") == 0, \
+        'did not get expected SRS'
 
-    if gt != (205000.0, 10000.0, 0.0, 5445000.0, 0.0, -10000.0):
-        gdaltest.post_reason('did not get expected geotransform')
-        print(gt)
-        return 'fail'
+    assert gt == (205000.0, 10000.0, 0.0, 5445000.0, 0.0, -10000.0), \
+        'did not get expected geotransform'
 
     return 'success'
 
@@ -1760,9 +1582,7 @@ def test_nitf_54():
     md = ds.GetMetadata('RPC')
     ds = None
 
-    if md is None or 'HEIGHT_OFF' not in md:
-        print(md)
-        return 'fail'
+    assert md is not None and 'HEIGHT_OFF' in md
 
     return 'success'
 
@@ -1782,9 +1602,7 @@ def test_nitf_55():
     md = ds.GetMetadata()
     ds = None
 
-    if md is None or 'ICHIP_SCALE_FACTOR' not in md:
-        print(md)
-        return 'fail'
+    assert md is not None and 'ICHIP_SCALE_FACTOR' in md
 
     return 'success'
 
@@ -1804,9 +1622,7 @@ def test_nitf_56():
     md = ds.GetMetadata()
     ds = None
 
-    if md is None or 'NITF_USE00A_ANGLE_TO_NORTH' not in md:
-        print(md)
-        return 'fail'
+    assert md is not None and 'NITF_USE00A_ANGLE_TO_NORTH' in md
 
     return 'success'
 
@@ -1849,9 +1665,7 @@ def test_nitf_58():
     md = ds.GetMetadata()
     ds = None
 
-    if md is None or 'NITF_STDIDC_ACQUISITION_DATE' not in md:
-        print(md)
-        return 'fail'
+    assert md is not None and 'NITF_STDIDC_ACQUISITION_DATE' in md
 
     return 'success'
 
@@ -1871,9 +1685,7 @@ def test_nitf_read_IMRFCA_IMASDA():
     md = ds.GetMetadata('RPC')
     ds = None
     gdal.Unlink(tmpfile)
-    if md is None or md == {}:
-        print(md)
-        return 'fail'
+    assert not (md is None or md == {})
 
     # Only IMRFCA
     gdal.GetDriverByName('NITF').Create(tmpfile, 1, 1, options=['TRE=IMRFCA=' + IMRFCA])
@@ -1881,9 +1693,7 @@ def test_nitf_read_IMRFCA_IMASDA():
     md = ds.GetMetadata('RPC')
     ds = None
     gdal.Unlink(tmpfile)
-    if md != {}:
-        print(md)
-        return 'fail'
+    assert md == {}
 
     # Only IMASDA
     gdal.GetDriverByName('NITF').Create(tmpfile, 1, 1, options=['TRE=IMASDA=' + IMASDA])
@@ -1891,9 +1701,7 @@ def test_nitf_read_IMRFCA_IMASDA():
     md = ds.GetMetadata('RPC')
     ds = None
     gdal.Unlink(tmpfile)
-    if md != {}:
-        print(md)
-        return 'fail'
+    assert md == {}
 
     # Too short IMRFCA
     with gdaltest.error_handler():
@@ -1902,9 +1710,7 @@ def test_nitf_read_IMRFCA_IMASDA():
     md = ds.GetMetadata('RPC')
     ds = None
     gdal.Unlink(tmpfile)
-    if md != {}:
-        print(md)
-        return 'fail'
+    assert md == {}
 
     # Too short IMASDA
     with gdaltest.error_handler():
@@ -1913,9 +1719,7 @@ def test_nitf_read_IMRFCA_IMASDA():
     md = ds.GetMetadata('RPC')
     ds = None
     gdal.Unlink(tmpfile)
-    if md != {}:
-        print(md)
-        return 'fail'
+    assert md == {}
 
     return 'success'
 
@@ -1935,15 +1739,11 @@ def test_nitf_59():
     gt = ds.GetGeoTransform()
     ds = None
 
-    if wkt.find("""PROJCS["UTM Zone 31, Northern Hemisphere",GEOGCS["WGS 84""") != 0:
-        gdaltest.post_reason('did not get expected SRS')
-        print(wkt)
-        return 'fail'
+    assert wkt.find("""PROJCS["UTM Zone 31, Northern Hemisphere",GEOGCS["WGS 84""") == 0, \
+        'did not get expected SRS'
 
-    if gt != (149999.5, 1.0, 0.0, 4500000.5, 0.0, -1.0):
-        gdaltest.post_reason('did not get expected geotransform')
-        print(gt)
-        return 'fail'
+    assert gt == (149999.5, 1.0, 0.0, 4500000.5, 0.0, -1.0), \
+        'did not get expected geotransform'
 
     return 'success'
 
@@ -1961,17 +1761,12 @@ def test_nitf_60():
     gt = ds.GetGeoTransform()
     ds = None
 
-    if wkt != """PROJCS["unnamed",GEOGCS["unnamed ellipse",DATUM["unknown",SPHEROID["unnamed",6378137,0]],PRIMEM["Greenwich",0],UNIT["degree",0.0174532925199433]],PROJECTION["Azimuthal_Equidistant"],PARAMETER["latitude_of_center",90],PARAMETER["longitude_of_center",0],PARAMETER["false_easting",0],PARAMETER["false_northing",0],UNIT["Meter",1]]""":
-        gdaltest.post_reason('did not get expected SRS')
-        print(wkt)
-        return 'fail'
+    assert wkt == """PROJCS["unnamed",GEOGCS["unnamed ellipse",DATUM["unknown",SPHEROID["unnamed",6378137,0]],PRIMEM["Greenwich",0],UNIT["degree",0.0174532925199433]],PROJECTION["Azimuthal_Equidistant"],PARAMETER["latitude_of_center",90],PARAMETER["longitude_of_center",0],PARAMETER["false_easting",0],PARAMETER["false_northing",0],UNIT["Meter",1]]""", \
+        'did not get expected SRS'
 
     ref_gt = [1036422.8453166834, 149.94543479697344, 0.0, 345474.28177222813, 0.0, -149.94543479697404]
     for i in range(6):
-        if abs(gt[i] - ref_gt[i]) > 1e-6:
-            gdaltest.post_reason('did not get expected geotransform')
-            print(gt)
-            return 'fail'
+        assert abs(gt[i] - ref_gt[i]) <= 1e-6, 'did not get expected geotransform'
 
     return 'success'
 
@@ -1988,14 +1783,9 @@ def test_nitf_61():
     xml_tre = ds.GetMetadata('xml:TRE')[0]
     ds = None
 
-    if md is None or 'RSMDCA' not in md or 'RSMECA' not in md or 'RSMPCA' not in md or 'RSMIDA' not in md:
-        print(md)
-        return 'fail'
+    assert md is not None and 'RSMDCA' in md and 'RSMECA' in md and 'RSMPCA' in md and 'RSMIDA' in md
 
-    if xml_tre.find('<tre name="RSMDCA"') == -1:
-        gdaltest.post_reason('did not get expected xml:TRE')
-        print(xml_tre[0])
-        return 'fail'
+    assert xml_tre.find('<tre name="RSMDCA"') != -1, 'did not get expected xml:TRE'
 
     return 'success'
 
@@ -2017,9 +1807,8 @@ def test_nitf_62():
 
     got_comments = md['NITF_IMAGE_COMMENTS']
     if len(got_comments) != 160 or got_comments.find(comments) == -1:
-        gdaltest.post_reason('did not get expected comments')
         print("'%s'" % got_comments)
-        return 'fail'
+        pytest.fail('did not get expected comments')
 
     return 'success'
 
@@ -2045,9 +1834,7 @@ def test_nitf_63():
 
     ds = gdal.Open('tmp/nitf63.ntf', gdal.GA_Update)
     md = ds.GetMetadata()
-    if md['NITF_IMODE'] != 'P':
-        gdaltest.post_reason('wrong IMODE')
-        return 'fail'
+    assert md['NITF_IMODE'] == 'P', 'wrong IMODE'
     ds.GetRasterBand(1).Fill(0)
     ds.GetRasterBand(2).Fill(127)
     ds.GetRasterBand(3).Fill(255)
@@ -2059,9 +1846,8 @@ def test_nitf_63():
     cs3 = ds.GetRasterBand(3).Checksum()
     ds = None
 
-    if cs1 != 0 or cs2 != 14186 or cs3 != 15301:
-        gdaltest.post_reason('did not get expected checksums : (%d, %d, %d) instead of (0, 14186, 15301)' % (cs1, cs2, cs3))
-        return 'fail'
+    assert cs1 == 0 and cs2 == 14186 and cs3 == 15301, \
+        ('did not get expected checksums : (%d, %d, %d) instead of (0, 14186, 15301)' % (cs1, cs2, cs3))
 
     return 'success'
 
@@ -2085,10 +1871,8 @@ def test_nitf_64():
     expected_gt = (2.123270588235294, 0.12345882352941177, 0.0, 49.123729411764707, 0.0, -0.12345882352941176)
     got_gt = ds.GetGeoTransform()
     for i in range(6):
-        if abs(expected_gt[i] - got_gt[i]) > 1e-10:
-            gdaltest.post_reason('did not get expected GT in ICORDS=D mode')
-            print(got_gt)
-            return 'fail'
+        assert abs(expected_gt[i] - got_gt[i]) <= 1e-10, \
+            'did not get expected GT in ICORDS=D mode'
     ds = None
 
     ds = gdal.GetDriverByName('NITF').CreateCopy('/vsimem/nitf_64.ntf', src_ds, options=['ICORDS=G'])
@@ -2099,10 +1883,8 @@ def test_nitf_64():
     expected_gt = (2.1235495642701521, 0.12345642701525053, 0.0, 49.123394880174288, 0.0, -0.12345642701525052)
     got_gt = ds.GetGeoTransform()
     for i in range(6):
-        if abs(expected_gt[i] - got_gt[i]) > 1e-10:
-            gdaltest.post_reason('did not get expected GT in ICORDS=G mode')
-            print(got_gt)
-            return 'fail'
+        assert abs(expected_gt[i] - got_gt[i]) <= 1e-10, \
+            'did not get expected GT in ICORDS=G mode'
     ds = None
 
     ds = gdal.GetDriverByName('NITF').CreateCopy('/vsimem/nitf_64.ntf', src_ds, options=['SDE_TRE=YES'])
@@ -2113,10 +1895,8 @@ def test_nitf_64():
     expected_gt = (2.123456789, 0.1234567901234568, 0.0, 49.123456789000002, 0.0, -0.12345679012345678)
     got_gt = ds.GetGeoTransform()
     for i in range(6):
-        if abs(expected_gt[i] - got_gt[i]) > 1e-10:
-            gdaltest.post_reason('did not get expected GT in SDE_TRE mode')
-            print(got_gt)
-            return 'fail'
+        assert abs(expected_gt[i] - got_gt[i]) <= 1e-10, \
+            'did not get expected GT in SDE_TRE mode'
     ds = None
 
     src_ds = None
@@ -2141,9 +1921,7 @@ def test_nitf_65():
 
     gdal.Unlink('/vsimem/nitf_65.ntf')
 
-    if block_xsize != 10000:
-        print(block_xsize)
-        return 'fail'
+    assert block_xsize == 10000
 
     return 'success'
 
@@ -2163,9 +1941,7 @@ def test_nitf_66():
 
     gdal.Unlink('/vsimem/nitf_66.ntf')
 
-    if block_ysize != 10000:
-        print(block_ysize)
-        return 'fail'
+    assert block_ysize == 10000
 
     return 'success'
 
@@ -2189,9 +1965,7 @@ def test_nitf_67():
     gdal.Unlink('/vsimem/nitf_67.ntf')
     gdal.Unlink('/vsimem/nitf_67.ntf.aux.xml')
 
-    if cs != 4672:
-        print(cs)
-        return 'fail'
+    assert cs == 4672
 
     return 'success'
 
@@ -2202,15 +1976,11 @@ def test_nitf_67():
 def test_nitf_68():
 
     ds = gdal.Open('data/rgb.ntf')
-    if len(ds.GetMetadata('NITF_METADATA')) != 2:
-        print(ds.GetMetadata('NITF_METADATA'))
-        return 'fail'
+    assert len(ds.GetMetadata('NITF_METADATA')) == 2
     ds = None
 
     ds = gdal.Open('data/rgb.ntf')
-    if not ds.GetMetadataItem('NITFFileHeader', 'NITF_METADATA'):
-        print(ds.GetMetadataItem('NITFFileHeader', 'NITF_METADATA'))
-        return 'fail'
+    assert ds.GetMetadataItem('NITFFileHeader', 'NITF_METADATA')
     ds = None
 
     return 'success'
@@ -2265,32 +2035,24 @@ def test_nitf_69():
     # Check
 
     # Upper-left
-    if abs(got_gcps[0].GCPPixel - 0.5) > 1e-5 or abs(got_gcps[0].GCPLine - 0.5) > 1e-5 or \
-       abs(got_gcps[0].GCPX - 2) > 1e-5 or abs(got_gcps[0].GCPY - 49) > 1e-5:
-        gdaltest.post_reason('wrong gcp')
-        print(got_gcps[0])
-        return 'fail'
+    assert (abs(got_gcps[0].GCPPixel - 0.5) <= 1e-5 and abs(got_gcps[0].GCPLine - 0.5) <= 1e-5 and \
+       abs(got_gcps[0].GCPX - 2) <= 1e-5 and abs(got_gcps[0].GCPY - 49) <= 1e-5), \
+        'wrong gcp'
 
     # Upper-right
-    if abs(got_gcps[1].GCPPixel - 19.5) > 1e-5 or abs(got_gcps[1].GCPLine - 0.5) > 1e-5 or \
-       abs(got_gcps[1].GCPX - 3) > 1e-5 or abs(got_gcps[1].GCPY - 49.5) > 1e-5:
-        gdaltest.post_reason('wrong gcp')
-        print(got_gcps[1])
-        return 'fail'
+    assert (abs(got_gcps[1].GCPPixel - 19.5) <= 1e-5 and abs(got_gcps[1].GCPLine - 0.5) <= 1e-5 and \
+       abs(got_gcps[1].GCPX - 3) <= 1e-5 and abs(got_gcps[1].GCPY - 49.5) <= 1e-5), \
+        'wrong gcp'
 
     # Lower-right
-    if abs(got_gcps[2].GCPPixel - 19.5) > 1e-5 or abs(got_gcps[2].GCPLine - 19.5) > 1e-5 or \
-       abs(got_gcps[2].GCPX - 3) > 1e-5 or abs(got_gcps[2].GCPY - 48) > 1e-5:
-        gdaltest.post_reason('wrong gcp')
-        print(got_gcps[2])
-        return 'fail'
+    assert (abs(got_gcps[2].GCPPixel - 19.5) <= 1e-5 and abs(got_gcps[2].GCPLine - 19.5) <= 1e-5 and \
+       abs(got_gcps[2].GCPX - 3) <= 1e-5 and abs(got_gcps[2].GCPY - 48) <= 1e-5), \
+        'wrong gcp'
 
     # Lower-left
-    if abs(got_gcps[3].GCPPixel - 0.5) > 1e-5 or abs(got_gcps[3].GCPLine - 19.5) > 1e-5 or \
-       abs(got_gcps[3].GCPX - 2) > 1e-5 or abs(got_gcps[3].GCPY - 48) > 1e-5:
-        gdaltest.post_reason('wrong gcp')
-        print(got_gcps[3])
-        return 'fail'
+    assert (abs(got_gcps[3].GCPPixel - 0.5) <= 1e-5 and abs(got_gcps[3].GCPLine - 19.5) <= 1e-5 and \
+       abs(got_gcps[3].GCPX - 2) <= 1e-5 and abs(got_gcps[3].GCPY - 48) <= 1e-5), \
+        'wrong gcp'
 
     return 'success'
 
@@ -2323,10 +2085,7 @@ def test_nitf_70():
     gdal.GetDriverByName('NITF').Delete('tmp/nitf_70.ntf')
     gdal.GetDriverByName('GTiff').Delete('tmp/nitf_70.tif')
 
-    if cs != cs_ref:
-        print(cs)
-        print(cs_ref)
-        return 'fail'
+    assert cs == cs_ref
 
     return 'success'
 
@@ -2376,9 +2135,7 @@ def test_nitf_71():
   </tre>
 </tres>
 """
-    if data != expected_data:
-        print(data)
-        return 'fail'
+    assert data == expected_data
 
     return 'success'
 
@@ -2391,19 +2148,13 @@ def compare_rpc(src_md, md):
     for key in src_md:
         if key == 'ERR_BIAS' or key == 'ERR_RAND':
             continue
-        if key not in md:
-            gdaltest.post_reason('fail: %s missing' % key)
-            print(md)
-            return 'fail'
+        assert key in md, ('fail: %s missing' % key)
         if 'COEFF' in key:
             expected = [float(v) for v in src_md[key].strip().split(' ')]
             found = [float(v) for v in md[key].strip().split(' ')]
             if expected != found:
-                gdaltest.post_reason('fail: %s value is not the one expected' % key)
                 print(md)
-                print(found)
-                print(expected)
-                return 'fail'
+                pytest.fail('fail: %s value is not the one expected' % key)
         elif float(src_md[key]) != float(md[key]):
             gdaltest.post_reason('fail: %s value is not the one expected' % key)
             print(md)
@@ -2438,9 +2189,7 @@ def test_nitf_72():
 
     gdal.GetDriverByName('NITF').CreateCopy('/vsimem/nitf_72.ntf', src_ds)
 
-    if gdal.GetLastErrorMsg() != '':
-        gdaltest.post_reason('fail: did not expect warning')
-        return 'fail'
+    assert gdal.GetLastErrorMsg() == '', 'fail: did not expect warning'
 
     if gdal.VSIStatL('/vsimem/nitf_72.ntf.aux.xml') is not None:
         gdaltest.post_reason('fail: PAM file not expected')
@@ -2457,14 +2206,10 @@ def test_nitf_72():
 
     gdal.GetDriverByName('NITF').Delete('/vsimem/nitf_72.ntf')
 
-    if not compare_rpc(src_md, md):
-        return 'fail'
+    assert compare_rpc(src_md, md)
 
     expected_RPC00B_max_precision = '11234.562345.6734567845678-89.8765-179.1234-987698765467890-12.3456-123.4567-1234+0.000000E+0+9.876543E+9+9.876543E-9-9.876543E+9-9.876543E-9+0.000000E+0+9.876543E+9+9.876543E-9-9.876543E+9-9.876543E-9+0.000000E+0+9.876543E+9+9.876543E-9-9.876543E+9-9.876543E-9+0.000000E+0+9.876543E+9+9.876543E-9-9.876543E+9-9.876543E-9+1.000000E+0+9.876543E+9+9.876543E-9-9.876543E+9-9.876543E-9+0.000000E+0+9.876543E+9+9.876543E-9-9.876543E+9-9.876543E-9+0.000000E+0+9.876543E+9+9.876543E-9-9.876543E+9-9.876543E-9+0.000000E+0+9.876543E+9+9.876543E-9-9.876543E+9-9.876543E-9+2.000000E+0+9.876543E+9+9.876543E-9-9.876543E+9-9.876543E-9+0.000000E+0+9.876543E+9+9.876543E-9-9.876543E+9-9.876543E-9+0.000000E+0+9.876543E+9+9.876543E-9-9.876543E+9-9.876543E-9+0.000000E+0+9.876543E+9+9.876543E-9-9.876543E+9-9.876543E-9+3.000000E+0+9.876543E+9+9.876543E-9-9.876543E+9-9.876543E-9+0.000000E+0+9.876543E+9+9.876543E-9-9.876543E+9-9.876543E-9+0.000000E+0+9.876543E+9+9.876543E-9-9.876543E+9-9.876543E-9+0.000000E+0+9.876543E+9+9.876543E-9-9.876543E+9-9.876543E-9'
-    if RPC00B != expected_RPC00B_max_precision:
-        gdaltest.post_reason('fail: did not get expected RPC00B')
-        print(RPC00B)
-        return 'fail'
+    assert RPC00B == expected_RPC00B_max_precision, 'fail: did not get expected RPC00B'
 
     # Test without ERR_BIAS and ERR_RAND
     src_ds = gdal.GetDriverByName('MEM').Create('', 1, 1)
@@ -2475,9 +2220,7 @@ def test_nitf_72():
 
     gdal.GetDriverByName('NITF').CreateCopy('/vsimem/nitf_72.ntf', src_ds)
 
-    if gdal.GetLastErrorMsg() != '':
-        gdaltest.post_reason('fail: did not expect warning')
-        return 'fail'
+    assert gdal.GetLastErrorMsg() == '', 'fail: did not expect warning'
 
     if gdal.VSIStatL('/vsimem/nitf_72.ntf.aux.xml') is not None:
         gdaltest.post_reason('fail: PAM file not expected')
@@ -2493,10 +2236,7 @@ def test_nitf_72():
     ds = None
 
     expected_RPC00B = '10000.000000.0034567845678-89.8765-179.1234-987698765467890-12.3456-123.4567-1234+0.000000E+0+9.876543E+9+9.876543E-9-9.876543E+9-9.876543E-9+0.000000E+0+9.876543E+9+9.876543E-9-9.876543E+9-9.876543E-9+0.000000E+0+9.876543E+9+9.876543E-9-9.876543E+9-9.876543E-9+0.000000E+0+9.876543E+9+9.876543E-9-9.876543E+9-9.876543E-9+1.000000E+0+9.876543E+9+9.876543E-9-9.876543E+9-9.876543E-9+0.000000E+0+9.876543E+9+9.876543E-9-9.876543E+9-9.876543E-9+0.000000E+0+9.876543E+9+9.876543E-9-9.876543E+9-9.876543E-9+0.000000E+0+9.876543E+9+9.876543E-9-9.876543E+9-9.876543E-9+2.000000E+0+9.876543E+9+9.876543E-9-9.876543E+9-9.876543E-9+0.000000E+0+9.876543E+9+9.876543E-9-9.876543E+9-9.876543E-9+0.000000E+0+9.876543E+9+9.876543E-9-9.876543E+9-9.876543E-9+0.000000E+0+9.876543E+9+9.876543E-9-9.876543E+9-9.876543E-9+3.000000E+0+9.876543E+9+9.876543E-9-9.876543E+9-9.876543E-9+0.000000E+0+9.876543E+9+9.876543E-9-9.876543E+9-9.876543E-9+0.000000E+0+9.876543E+9+9.876543E-9-9.876543E+9-9.876543E-9+0.000000E+0+9.876543E+9+9.876543E-9-9.876543E+9-9.876543E-9'
-    if RPC00B != expected_RPC00B:
-        gdaltest.post_reason('fail: did not get expected RPC00B')
-        print(RPC00B)
-        return 'fail'
+    assert RPC00B == expected_RPC00B, 'fail: did not get expected RPC00B'
 
     # Test that direct RPC00B copy works
     src_nitf_ds = gdal.Open('/vsimem/nitf_72.ntf')
@@ -2507,10 +2247,7 @@ def test_nitf_72():
     md = ds.GetMetadata('RPC')
     RPC00B = ds.GetMetadataItem('RPC00B', 'TRE')
     ds = None
-    if RPC00B != expected_RPC00B:
-        gdaltest.post_reason('fail: did not get expected RPC00B')
-        print(RPC00B)
-        return 'fail'
+    assert RPC00B == expected_RPC00B, 'fail: did not get expected RPC00B'
 
     gdal.GetDriverByName('NITF').Delete('/vsimem/nitf_72.ntf')
     gdal.GetDriverByName('NITF').Delete('/vsimem/nitf_72_copy.ntf')
@@ -2518,9 +2255,8 @@ def test_nitf_72():
     # Test that RPC00B = NO works
     gdal.GetDriverByName('NITF').CreateCopy('/vsimem/nitf_72.ntf', src_ds, options=['RPC00B=NO'])
 
-    if gdal.VSIStatL('/vsimem/nitf_72.ntf.aux.xml') is None:
-        gdaltest.post_reason('fail: PAM file was expected')
-        return 'fail'
+    assert gdal.VSIStatL('/vsimem/nitf_72.ntf.aux.xml') is not None, \
+        'fail: PAM file was expected'
 
     ds = gdal.Open('/vsimem/nitf_72.ntf')
     md = ds.GetMetadata('RPC')
@@ -2528,10 +2264,7 @@ def test_nitf_72():
     ds = None
 
     gdal.GetDriverByName('NITF').Delete('/vsimem/nitf_72.ntf')
-    if RPC00B is not None:
-        gdaltest.post_reason('fail: did not expect RPC00B')
-        print(RPC00B)
-        return 'fail'
+    assert RPC00B is None, 'fail: did not expect RPC00B'
 
     src_ds = gdal.GetDriverByName('MEM').Create('', 1, 1)
     # Test padding
@@ -2557,9 +2290,7 @@ def test_nitf_72():
 
     gdal.GetDriverByName('NITF').CreateCopy('/vsimem/nitf_72.ntf', src_ds)
 
-    if gdal.GetLastErrorMsg() != '':
-        gdaltest.post_reason('fail: did not expect warning')
-        return 'fail'
+    assert gdal.GetLastErrorMsg() == '', 'fail: did not expect warning'
 
     if gdal.VSIStatL('/vsimem/nitf_72.ntf.aux.xml') is not None:
         gdaltest.post_reason('fail: PAM file not expected')
@@ -2576,14 +2307,10 @@ def test_nitf_72():
 
     gdal.GetDriverByName('NITF').Delete('/vsimem/nitf_72.ntf')
 
-    if not compare_rpc(src_md, md):
-        return 'fail'
+    assert compare_rpc(src_md, md)
 
     expected_RPC00B = '10123.000234.0000345604567+08.0000+017.0000+098709876506789+12.0000+109.0000+0034+0.000000E+0+9.870000E+9+9.876543E-9-9.876543E+9-9.876543E-9+0.000000E+0+9.876543E+9+9.876543E-9-9.876543E+9-9.876543E-9+0.000000E+0+9.876543E+9+9.876543E-9-9.876543E+9-9.876543E-9+0.000000E+0+9.876543E+9+9.876543E-9-9.876543E+9-9.876543E-9+1.000000E+0+9.876543E+9+9.876543E-9-9.876543E+9-9.876543E-9+0.000000E+0+9.876543E+9+9.876543E-9-9.876543E+9-9.876543E-9+0.000000E+0+9.876543E+9+9.876543E-9-9.876543E+9-9.876543E-9+0.000000E+0+9.876543E+9+9.876543E-9-9.876543E+9-9.876543E-9+2.000000E+0+9.876543E+9+9.876543E-9-9.876543E+9-9.876543E-9+0.000000E+0+9.876543E+9+9.876543E-9-9.876543E+9-9.876543E-9+0.000000E+0+9.876543E+9+9.876543E-9-9.876543E+9-9.876543E-9+0.000000E+0+9.876543E+9+9.876543E-9-9.876543E+9-9.876543E-9+3.000000E+0+9.876543E+9+9.876543E-9-9.876543E+9-9.876543E-9+0.000000E+0+9.876543E+9+9.876543E-9-9.876543E+9-9.876543E-9+0.000000E+0+9.876543E+9+9.876543E-9-9.876543E+9-9.876543E-9+0.000000E+0+9.876543E+9+9.876543E-9-9.876543E+9-9.876543E-9'
-    if RPC00B != expected_RPC00B:
-        gdaltest.post_reason('fail: did not get expected RPC00B')
-        print(RPC00B)
-        return 'fail'
+    assert RPC00B == expected_RPC00B, 'fail: did not get expected RPC00B'
 
     # Test loss of precision
     for key in ('LINE_OFF', 'SAMP_OFF', 'LAT_OFF', 'LONG_OFF', 'HEIGHT_OFF', 'LINE_SCALE', 'SAMP_SCALE', 'LAT_SCALE', 'LONG_SCALE', 'HEIGHT_SCALE'):
@@ -2598,18 +2325,13 @@ def test_nitf_72():
 
         with gdaltest.error_handler():
             ds = gdal.GetDriverByName('NITF').CreateCopy('/vsimem/nitf_72.ntf', src_ds)
-        if ds is None:
-            gdaltest.post_reason('fail: expected a dataset')
-            return 'fail'
+        assert ds is not None, 'fail: expected a dataset'
         ds = None
 
-        if gdal.GetLastErrorMsg() == '':
-            gdaltest.post_reason('fail: expected a warning')
-            return 'fail'
+        assert gdal.GetLastErrorMsg() != '', 'fail: expected a warning'
 
-        if gdal.VSIStatL('/vsimem/nitf_72.ntf.aux.xml') is None:
-            gdaltest.post_reason('fail: PAM file was expected')
-            return 'fail'
+        assert gdal.VSIStatL('/vsimem/nitf_72.ntf.aux.xml') is not None, \
+            'fail: PAM file was expected'
         gdal.Unlink('/vsimem/nitf_72.ntf.aux.xml')
 
         ds = gdal.Open('/vsimem/nitf_72.ntf')
@@ -2619,10 +2341,8 @@ def test_nitf_72():
 
         gdal.GetDriverByName('NITF').Delete('/vsimem/nitf_72.ntf')
 
-        if RPC00B != expected_RPC00B_max_precision:
-            gdaltest.post_reason('fail: did not get expected RPC00B')
-            print(RPC00B)
-            return 'fail'
+        assert RPC00B == expected_RPC00B_max_precision, \
+            'fail: did not get expected RPC00B'
 
     # Test loss of precision on coefficient lines
     src_ds = gdal.GetDriverByName('MEM').Create('', 1, 1)
@@ -2632,18 +2352,13 @@ def test_nitf_72():
 
     with gdaltest.error_handler():
         ds = gdal.GetDriverByName('NITF').CreateCopy('/vsimem/nitf_72.ntf', src_ds)
-    if ds is None:
-        gdaltest.post_reason('fail: expected a dataset')
-        return 'fail'
+    assert ds is not None, 'fail: expected a dataset'
     ds = None
 
-    if gdal.GetLastErrorMsg() == '':
-        gdaltest.post_reason('fail: expected a warning')
-        return 'fail'
+    assert gdal.GetLastErrorMsg() != '', 'fail: expected a warning'
 
-    if gdal.VSIStatL('/vsimem/nitf_72.ntf.aux.xml') is None:
-        gdaltest.post_reason('fail: PAM file was expected')
-        return 'fail'
+    assert gdal.VSIStatL('/vsimem/nitf_72.ntf.aux.xml') is not None, \
+        'fail: PAM file was expected'
     gdal.Unlink('/vsimem/nitf_72.ntf.aux.xml')
 
     ds = gdal.Open('/vsimem/nitf_72.ntf')
@@ -2654,23 +2369,18 @@ def test_nitf_72():
     gdal.GetDriverByName('NITF').Delete('/vsimem/nitf_72.ntf')
 
     expected_RPC00B = '11234.562345.6734567845678-89.8765-179.1234-987698765467890-12.3456-123.4567-1234+0.000000E+0+0.000000E+0+9.876543E-9-9.876543E+9-9.876543E-9+0.000000E+0+9.876543E+9+9.876543E-9-9.876543E+9-9.876543E-9+0.000000E+0+9.876543E+9+9.876543E-9-9.876543E+9-9.876543E-9+0.000000E+0+9.876543E+9+9.876543E-9-9.876543E+9-9.876543E-9+1.000000E+0+9.876543E+9+9.876543E-9-9.876543E+9-9.876543E-9+0.000000E+0+9.876543E+9+9.876543E-9-9.876543E+9-9.876543E-9+0.000000E+0+9.876543E+9+9.876543E-9-9.876543E+9-9.876543E-9+0.000000E+0+9.876543E+9+9.876543E-9-9.876543E+9-9.876543E-9+2.000000E+0+9.876543E+9+9.876543E-9-9.876543E+9-9.876543E-9+0.000000E+0+9.876543E+9+9.876543E-9-9.876543E+9-9.876543E-9+0.000000E+0+9.876543E+9+9.876543E-9-9.876543E+9-9.876543E-9+0.000000E+0+9.876543E+9+9.876543E-9-9.876543E+9-9.876543E-9+3.000000E+0+9.876543E+9+9.876543E-9-9.876543E+9-9.876543E-9+0.000000E+0+9.876543E+9+9.876543E-9-9.876543E+9-9.876543E-9+0.000000E+0+9.876543E+9+9.876543E-9-9.876543E+9-9.876543E-9+0.000000E+0+9.876543E+9+9.876543E-9-9.876543E+9-9.876543E-9'
-    if RPC00B != expected_RPC00B:
-        gdaltest.post_reason('fail: did not get expected RPC00B')
-        print(RPC00B)
-        return 'fail'
+    assert RPC00B == expected_RPC00B, 'fail: did not get expected RPC00B'
 
     # Test RPCTXT creation option
     with gdaltest.error_handler():
         gdal.GetDriverByName('NITF').CreateCopy('/vsimem/nitf_72.ntf', src_ds, options=['RPCTXT=YES'])
 
-    if gdal.VSIStatL('/vsimem/nitf_72.ntf.aux.xml') is None:
-        gdaltest.post_reason('fail: PAM file was expected')
-        return 'fail'
+    assert gdal.VSIStatL('/vsimem/nitf_72.ntf.aux.xml') is not None, \
+        'fail: PAM file was expected'
     gdal.Unlink('/vsimem/nitf_72.ntf.aux.xml')
 
-    if gdal.VSIStatL('/vsimem/nitf_72_RPC.TXT') is None:
-        gdaltest.post_reason('fail: rpc.txt file was expected')
-        return 'fail'
+    assert gdal.VSIStatL('/vsimem/nitf_72_RPC.TXT') is not None, \
+        'fail: rpc.txt file was expected'
 
     ds = gdal.Open('/vsimem/nitf_72.ntf')
     md = ds.GetMetadata('RPC')
@@ -2678,19 +2388,13 @@ def test_nitf_72():
     fl = ds.GetFileList()
     ds = None
 
-    if '/vsimem/nitf_72_RPC.TXT' not in fl:
-        gdaltest.post_reason('fail: _RPC.TXT file not reported in file list')
-        print(fl)
-        return 'fail'
+    assert '/vsimem/nitf_72_RPC.TXT' in fl, \
+        'fail: _RPC.TXT file not reported in file list'
 
     # Check that we get full precision from the _RPC.TXT file
-    if not compare_rpc(src_md, md):
-        return 'fail'
+    assert compare_rpc(src_md, md)
 
-    if RPC00B != expected_RPC00B:
-        gdaltest.post_reason('fail: did not get expected RPC00B')
-        print(RPC00B)
-        return 'fail'
+    assert RPC00B == expected_RPC00B, 'fail: did not get expected RPC00B'
 
     # Test out of range
     for key in ('LINE_OFF', 'SAMP_OFF', 'LAT_OFF', 'LONG_OFF', 'HEIGHT_OFF', 'LINE_SCALE', 'SAMP_SCALE', 'LAT_SCALE', 'LONG_SCALE', 'HEIGHT_SCALE'):
@@ -2705,9 +2409,7 @@ def test_nitf_72():
 
         with gdaltest.error_handler():
             ds = gdal.GetDriverByName('NITF').CreateCopy('/vsimem/nitf_72.ntf', src_ds)
-        if ds is not None:
-            gdaltest.post_reason('fail: expected failure for %s' % key)
-            return 'fail'
+        assert ds is None, ('fail: expected failure for %s' % key)
 
     # Test out of rangeon coefficient lines
     src_ds = gdal.GetDriverByName('MEM').Create('', 1, 1)
@@ -2717,9 +2419,7 @@ def test_nitf_72():
 
     with gdaltest.error_handler():
         ds = gdal.GetDriverByName('NITF').CreateCopy('/vsimem/nitf_72.ntf', src_ds)
-    if ds is not None:
-        gdaltest.post_reason('fail: expected failure')
-        return 'fail'
+    assert ds is None, 'fail: expected failure'
 
     return 'success'
 
@@ -2766,9 +2466,7 @@ def test_nitf_74():
   </tre>
 </tres>
 """
-    if data != expected_data:
-        print(data)
-        return 'fail'
+    assert data == expected_data
 
     return 'success'
 
@@ -2964,9 +2662,7 @@ def test_nitf_75():
 </tres>
 """
 
-    if data != expected_data:
-        print(data)
-        return 'fail'
+    assert data == expected_data
 
     return 'success'
 
@@ -2978,9 +2674,7 @@ def test_nitf_read_C4():
 
     ds = gdal.Open('data/RPFTOC01.ON2')
     cs = ds.GetRasterBand(1).Checksum()
-    if cs != 53599:
-        print(cs)
-        return 'fail'
+    assert cs == 53599
 
     return 'success'
 
@@ -3014,9 +2708,7 @@ def test_nitf_online_2():
     ds = gdal.Open('tmp/cache/U_0001a.ntf')
 
     md = ds.GetMetadata('SUBDATASETS')
-    if 'SUBDATASET_1_NAME' not in md:
-        gdaltest.post_reason('missing SUBDATASET_1_NAME metadata')
-        return 'fail'
+    assert 'SUBDATASET_1_NAME' in md, 'missing SUBDATASET_1_NAME metadata'
     ds = None
 
     return 'success'
@@ -3046,11 +2738,8 @@ def test_nitf_online_4():
     # check that the RPF attribute metadata was carried through.
     ds = gdal.Open('tmp/cache/001zc013.on1')
     md = ds.GetMetadata()
-    if md['NITF_RPF_CurrencyDate'] != '19950720' \
-       or md['NITF_RPF_ProductionDate'] != '19950720' \
-       or md['NITF_RPF_SignificantDate'] != '19890629':
-        gdaltest.post_reason('RPF attribute metadata not captured (#3413)')
-        return 'fail'
+    assert md['NITF_RPF_CurrencyDate'] == '19950720' and md['NITF_RPF_ProductionDate'] == '19950720' and md['NITF_RPF_SignificantDate'] == '19890629', \
+        'RPF attribute metadata not captured (#3413)'
 
     ds = None
 
@@ -3095,23 +2784,19 @@ def test_nitf_online_7():
             return 'skip'
 
         ds = gdal.Open('tmp/cache/' + filename)
-        if ds.RasterCount != 6:
-            return 'fail'
+        assert ds.RasterCount == 6
 
         checksums = [48385, 48385, 40551, 54223, 48385, 33094]
         colorInterpretations = [gdal.GCI_Undefined, gdal.GCI_Undefined, gdal.GCI_RedBand, gdal.GCI_BlueBand, gdal.GCI_Undefined, gdal.GCI_GreenBand]
 
         for i in range(6):
             cs = ds.GetRasterBand(i + 1).Checksum()
-            if cs != checksums[i]:
-                gdaltest.post_reason('got checksum %d for image %s'
+            assert cs == checksums[i], ('got checksum %d for image %s'
                                      % (cs, filename))
-                return 'fail'
 
-            if ds.GetRasterBand(i + 1).GetRasterColorInterpretation() != colorInterpretations[i]:
-                gdaltest.post_reason('got wrong color interp for image %s'
+            assert ds.GetRasterBand(i + 1).GetRasterColorInterpretation() == colorInterpretations[i], \
+                ('got wrong color interp for image %s'
                                      % filename)
-                return 'fail'
         ds = None
 
     return 'success'
@@ -3160,9 +2845,7 @@ def test_nitf_online_10():
 
     ds = None
 
-    if mdCGM['SEGMENT_COUNT'] != '8':
-        gdaltest.post_reason('wrong SEGMENT_COUNT.')
-        return 'fail'
+    assert mdCGM['SEGMENT_COUNT'] == '8', 'wrong SEGMENT_COUNT.'
 
     tab = [
         ('SEGMENT_0_SLOC_ROW', '0'),
@@ -3192,9 +2875,7 @@ def test_nitf_online_10():
     ]
 
     for item in tab:
-        if mdCGM[item[0]] != item[1]:
-            gdaltest.post_reason('wrong value for %s.' % item[0])
-            return 'fail'
+        assert mdCGM[item[0]] == item[1], ('wrong value for %s.' % item[0])
 
     return 'success'
 
@@ -3213,21 +2894,16 @@ def test_nitf_online_11():
 
     ds = None
 
-    if mdTEXT['DATA_0'] != 'This is test text file 01.\r\n':
-        gdaltest.post_reason('did not find expected DATA_0 from metadata.')
-        return 'fail'
-    if mdTEXT['DATA_1'] != 'This is test text file 02.\r\n':
-        gdaltest.post_reason('did not find expected DATA_1 from metadata.')
-        return 'fail'
-    if mdTEXT['DATA_2'] != 'This is test text file 03.\r\n':
-        gdaltest.post_reason('did not find expected DATA_2 from metadata.')
-        return 'fail'
-    if mdTEXT['DATA_3'] != 'This is test text file 04.\r\n':
-        gdaltest.post_reason('did not find expected DATA_3 from metadata.')
-        return 'fail'
-    if mdTEXT['DATA_4'] != 'This is test text file 05.\r\n':
-        gdaltest.post_reason('did not find expected DATA_4 from metadata.')
-        return 'fail'
+    assert mdTEXT['DATA_0'] == 'This is test text file 01.\r\n', \
+        'did not find expected DATA_0 from metadata.'
+    assert mdTEXT['DATA_1'] == 'This is test text file 02.\r\n', \
+        'did not find expected DATA_1 from metadata.'
+    assert mdTEXT['DATA_2'] == 'This is test text file 03.\r\n', \
+        'did not find expected DATA_2 from metadata.'
+    assert mdTEXT['DATA_3'] == 'This is test text file 04.\r\n', \
+        'did not find expected DATA_3 from metadata.'
+    assert mdTEXT['DATA_4'] == 'This is test text file 05.\r\n', \
+        'did not find expected DATA_4 from metadata.'
 
     return 'success'
 
@@ -3262,9 +2938,7 @@ def test_nitf_online_13():
 
     ds = None
 
-    if mdCGM['SEGMENT_COUNT'] != '3':
-        gdaltest.post_reason('wrong SEGMENT_COUNT.')
-        return 'fail'
+    assert mdCGM['SEGMENT_COUNT'] == '3', 'wrong SEGMENT_COUNT.'
 
     tab = [
         ('SEGMENT_2_SLOC_ROW', '0'),
@@ -3276,9 +2950,7 @@ def test_nitf_online_13():
     ]
 
     for item in tab:
-        if mdCGM[item[0]] != item[1]:
-            gdaltest.post_reason('wrong value for %s.' % item[0])
-            return 'fail'
+        assert mdCGM[item[0]] == item[1], ('wrong value for %s.' % item[0])
 
     tab = [
         ('NITF_IDLVL', '3'),
@@ -3290,10 +2962,8 @@ def test_nitf_online_13():
     ]
 
     for item in tab:
-        if md[item[0]] != item[1]:
-            gdaltest.post_reason('wrong value for %s, got %s instead of %s.'
+        assert md[item[0]] == item[1], ('wrong value for %s, got %s instead of %s.'
                                  % (item[0], md[item[0]], item[1]))
-            return 'fail'
 
     return 'success'
 
@@ -3322,12 +2992,9 @@ def test_nitf_online_14():
         return 'skip'
 
     ds = gdal.Open('tmp/cache/U_4020h.ntf')
-    if ds.GetRasterBand(1).DataType != gdal.GDT_UInt16:
-        return 'fail'
+    assert ds.GetRasterBand(1).DataType == gdal.GDT_UInt16
     stats = ds.GetRasterBand(1).GetStatistics(0, 1)
-    if stats[2] < 2607 or stats[2] > 2608:
-        print(stats)
-        return 'fail'
+    assert stats[2] >= 2607 and stats[2] <= 2608
     ds = None
 
     try:
@@ -3515,35 +3182,23 @@ def test_nitf_online_18():
 
     # If we have functioning coordinate transformer.
     if prj[:6] == 'PROJCS':
-        if prj.find('Azimuthal_Equidistant') == -1:
-            gdaltest.post_reason('wrong projection?')
-            return 'fail'
+        assert prj.find('Azimuthal_Equidistant') != -1, 'wrong projection?'
         expected_gt = (-1669792.3618991028, 724.73626818537502, 0.0, -556597.45396636717, 0.0, -724.73626818537434)
-        if not gdaltest.geotransform_equals(gt, expected_gt, 1.0):
-            gdaltest.post_reason('did not get expected geotransform.')
-            return 'fail'
+        assert gdaltest.geotransform_equals(gt, expected_gt, 1.0), \
+            'did not get expected geotransform.'
 
     # If we do not have a functioning coordinate transformer.
     else:
-        if prj != '' \
-                or not gdaltest.geotransform_equals(gt, (0, 1, 0, 0, 0, 1), 0.00000001):
-            print(gt)
-            print(prj)
-            gdaltest.post_reason('did not get expected empty gt/projection')
-            return 'fail'
+        assert prj == '' and gdaltest.geotransform_equals(gt, (0, 1, 0, 0, 0, 1), 0.00000001), \
+            'did not get expected empty gt/projection'
 
         prj = ds.GetGCPProjection()
-        if prj[:6] != 'GEOGCS':
-            gdaltest.post_reason('did not get expected geographic srs')
-            return 'fail'
+        assert prj[:6] == 'GEOGCS', 'did not get expected geographic srs'
 
         gcps = ds.GetGCPs()
         gcp3 = gcps[3]
-        if gcp3.GCPPixel != 0 or gcp3.GCPLine != 1536 \
-                or abs(gcp3.GCPX + 45) > 0.0000000001 \
-                or abs(gcp3.GCPY - 68.78679656) > 0.00000001:
-            gdaltest.post_reason('did not get expected gcp.')
-            return 'fail'
+        assert gcp3.GCPPixel == 0 and gcp3.GCPLine == 1536 and abs(gcp3.GCPX + 45) <= 0.0000000001 and abs(gcp3.GCPY - 68.78679656) <= 0.00000001, \
+            'did not get expected gcp.'
 
     ds = None
 
@@ -3580,11 +3235,8 @@ def test_nitf_online_20():
     # smaller than really available
     ds = gdal.Open('tmp/cache/0000M033.GN3')
     md = ds.GetMetadata()
-    if md['NITF_RPF_CurrencyDate'] != '19941201' \
-       or md['NITF_RPF_ProductionDate'] != '19980511' \
-       or md['NITF_RPF_SignificantDate'] != '19850305':
-        gdaltest.post_reason('RPF attribute metadata not captured (#3413)')
-        return 'fail'
+    assert md['NITF_RPF_CurrencyDate'] == '19941201' and md['NITF_RPF_ProductionDate'] == '19980511' and md['NITF_RPF_SignificantDate'] == '19850305', \
+        'RPF attribute metadata not captured (#3413)'
 
     return 'success'
 
@@ -3603,10 +3255,8 @@ def test_nitf_online_21():
     ds = None
 
     # If we get NS3321A, it means we are not exploiting the header from the STREAMING_FILE_HEADER DE segment
-    if md['NITF_OSTAID'] != 'I_3321A':
-        gdaltest.post_reason('did not get expected OSTAID value')
-        print(md['NITF_OSTAID'])
-        return 'fail'
+    assert md['NITF_OSTAID'] == 'I_3321A', \
+        'did not get expected OSTAID value'
 
     return 'success'
 
@@ -3634,10 +3284,8 @@ def test_nitf_online_22():
     ]
 
     for item in tab:
-        if md[item[0]] != item[1]:
-            gdaltest.post_reason('(1) wrong value for %s, got %s instead of %s.'
+        assert md[item[0]] == item[1], ('(1) wrong value for %s, got %s instead of %s.'
                                  % (item[0], md[item[0]], item[1]))
-            return 'fail'
 
     ds = gdal.Open('NITF_IM:2:tmp/cache/U_0001C.NTF')
     md = ds.GetMetadata()
@@ -3653,10 +3301,8 @@ def test_nitf_online_22():
     ]
 
     for item in tab:
-        if md[item[0]] != item[1]:
-            gdaltest.post_reason('(2) wrong value for %s, got %s instead of %s.'
+        assert md[item[0]] == item[1], ('(2) wrong value for %s, got %s instead of %s.'
                                  % (item[0], md[item[0]], item[1]))
-            return 'fail'
 
     ds = gdal.Open('NITF_IM:3:tmp/cache/U_0001C.NTF')
     md = ds.GetMetadata()
@@ -3672,10 +3318,8 @@ def test_nitf_online_22():
     ]
 
     for item in tab:
-        if md[item[0]] != item[1]:
-            gdaltest.post_reason('(3) wrong value for %s, got %s instead of %s.'
+        assert md[item[0]] == item[1], ('(3) wrong value for %s, got %s instead of %s.'
                                  % (item[0], md[item[0]], item[1]))
-            return 'fail'
 
     ds = gdal.Open('NITF_IM:4:tmp/cache/U_0001C.NTF')
     md = ds.GetMetadata()
@@ -3691,10 +3335,8 @@ def test_nitf_online_22():
     ]
 
     for item in tab:
-        if md[item[0]] != item[1]:
-            gdaltest.post_reason('(4) wrong value for %s, got %s instead of %s.'
+        assert md[item[0]] == item[1], ('(4) wrong value for %s, got %s instead of %s.'
                                  % (item[0], md[item[0]], item[1]))
-            return 'fail'
 
     return 'success'
 
@@ -3729,20 +3371,16 @@ def test_nitf_online_24():
     gdal.SetConfigOption('NITF_OPEN_UNDERLYING_DS', 'NO')
     ds = gdal.Open('/vsizip/tmp/cache/ECRG_Sample.zip/ECRG_Sample/EPF/clfc/2/000000009s0013.lf2')
     gdal.SetConfigOption('NITF_OPEN_UNDERLYING_DS', oldval)
-    if ds is None:
-        return 'fail'
+    assert ds is not None
     xml_tre = ds.GetMetadata('xml:TRE')[0]
     ds = None
 
-    if xml_tre.find('<tre name="GEOPSB"') == -1 or \
+    assert (not (xml_tre.find('<tre name="GEOPSB"') == -1 or \
        xml_tre.find('<tre name="J2KLRA"') == -1 or \
        xml_tre.find('<tre name="GEOLOB"') == -1 or \
        xml_tre.find('<tre name="BNDPLB"') == -1 or \
        xml_tre.find('<tre name="ACCPOB"') == -1 or \
-       xml_tre.find('<tre name="SOURCB"') == -1:
-        gdaltest.post_reason('did not get expected xml:TRE')
-        print(xml_tre)
-        return 'fail'
+       xml_tre.find('<tre name="SOURCB"') == -1)), 'did not get expected xml:TRE'
 
     return 'success'
 
@@ -3763,10 +3401,7 @@ def test_nitf_online_25():
     xml_tre = ds.GetMetadata('xml:TRE')[0]
     ds = None
 
-    if xml_tre.find('<tre name="PIAPRD"') == -1:
-        gdaltest.post_reason('did not get expected xml:TRE')
-        print(xml_tre)
-        return 'fail'
+    assert xml_tre.find('<tre name="PIAPRD"') != -1, 'did not get expected xml:TRE'
 
     return 'success'
 
diff --git a/autotest/gdrivers/ntv2.py b/autotest/gdrivers/ntv2.py
index 8ead21d1f7d9..2f14566d4c2b 100755
--- a/autotest/gdrivers/ntv2.py
+++ b/autotest/gdrivers/ntv2.py
@@ -82,14 +82,10 @@ def test_ntv2_5():
     src_ds = gdal.Open('data/test_ntv2_le.gsb')
     gdal.GetDriverByName('NTv2').Create('/vsimem/ntv2_5.gsb', 1, 1, 4, gdal.GDT_Float32, options=['ENDIANNESS=LE'])
     ds = gdal.GetDriverByName('NTv2').CreateCopy('/vsimem/ntv2_5.gsb', src_ds, options=['APPEND_SUBDATASET=YES'])
-    if ds.GetRasterBand(2).Checksum() != 10:
-        print(ds.GetRasterBand(2).Checksum())
-        return 'fail'
+    assert ds.GetRasterBand(2).Checksum() == 10
     ds = None
     ds = gdal.Open('NTv2:1:/vsimem/ntv2_5.gsb')
-    if ds.GetRasterBand(2).Checksum() != 10:
-        print(ds.GetRasterBand(2).Checksum())
-        return 'fail'
+    assert ds.GetRasterBand(2).Checksum() == 10
     ds = None
     gdal.GetDriverByName('NTv2').Delete('/vsimem/ntv2_5.gsb')
 
@@ -104,14 +100,10 @@ def test_ntv2_6():
     src_ds = gdal.Open('data/test_ntv2_le.gsb')
     gdal.GetDriverByName('NTv2').Create('/vsimem/ntv2_6.gsb', 1, 1, 4, gdal.GDT_Float32, options=['ENDIANNESS=BE'])
     ds = gdal.GetDriverByName('NTv2').CreateCopy('/vsimem/ntv2_6.gsb', src_ds, options=['APPEND_SUBDATASET=YES'])
-    if ds.GetRasterBand(2).Checksum() != 10:
-        print(ds.GetRasterBand(2).Checksum())
-        return 'fail'
+    assert ds.GetRasterBand(2).Checksum() == 10
     ds = None
     ds = gdal.Open('NTv2:1:/vsimem/ntv2_6.gsb')
-    if ds.GetRasterBand(2).Checksum() != 10:
-        print(ds.GetRasterBand(2).Checksum())
-        return 'fail'
+    assert ds.GetRasterBand(2).Checksum() == 10
     ds = None
     gdal.GetDriverByName('NTv2').Delete('/vsimem/ntv2_6.gsb')
 
@@ -125,13 +117,11 @@ def test_ntv2_7():
 
     with gdaltest.error_handler():
         ds = gdal.GetDriverByName('NTv2').Create('/does/not/exist.gsb', 1, 1, 4, gdal.GDT_Float32)
-    if ds is not None:
-        return 'fail'
+    assert ds is None
 
     with gdaltest.error_handler():
         ds = gdal.GetDriverByName('NTv2').Create('/does/not/exist.gsb', 1, 1, 4, gdal.GDT_Float32, options=['APPEND_SUBDATASET=YES'])
-    if ds is not None:
-        return 'fail'
+    assert ds is None
 
     return 'success'
 
diff --git a/autotest/gdrivers/ozi.py b/autotest/gdrivers/ozi.py
index 9eb4e8beba3b..f4c3346b1cc1 100755
--- a/autotest/gdrivers/ozi.py
+++ b/autotest/gdrivers/ozi.py
@@ -57,8 +57,7 @@ def test_ozi_online_1():
             return 'skip'
 
     ds = gdal.Open('tmp/cache/Europe 2001_OZF.map')
-    if ds is None:
-        return 'fail'
+    assert ds is not None
 
     if False:  # pylint: disable=using-constant-test
         gt = ds.GetGeoTransform()
@@ -66,41 +65,24 @@ def test_ozi_online_1():
 
         expected_gt = (-1841870.2731215316, 3310.9550245520159, -13.025246304875619, 8375316.4662204208, -16.912440131236657, -3264.1162527118681)
         for i in range(6):
-            if abs(gt[i] - expected_gt[i]) > 1e-7:
-                gdaltest.post_reason('bad geotransform')
-                print(gt)
-                print(expected_gt)
-                return 'fail'
+            assert abs(gt[i] - expected_gt[i]) <= 1e-7, 'bad geotransform'
 
     else:
         gcps = ds.GetGCPs()
 
-        if len(gcps) != 4:
-            gdaltest.post_reason('did not get expected gcp count.')
-            print(len(gcps))
-            return 'fail'
+        assert len(gcps) == 4, 'did not get expected gcp count.'
 
         gcp0 = gcps[0]
-        if gcp0.GCPPixel != 61 or gcp0.GCPLine != 436 \
-                or abs(gcp0.GCPX - (-1653990.4525324)) > 0.001 \
-                or abs(gcp0.GCPY - 6950885.0402214) > 0.001:
-            gdaltest.post_reason('did not get expected gcp.')
-            print(gcp0)
-            return 'fail'
+        assert gcp0.GCPPixel == 61 and gcp0.GCPLine == 436 and abs(gcp0.GCPX - (-1653990.4525324)) <= 0.001 and abs(gcp0.GCPY - 6950885.0402214) <= 0.001, \
+            'did not get expected gcp.'
 
         wkt = ds.GetGCPProjection()
 
     expected_wkt = 'PROJCS["unnamed",GEOGCS["WGS 84",DATUM["WGS_1984",SPHEROID["WGS 84",6378137,298.257223563,AUTHORITY["EPSG","7030"]],AUTHORITY["EPSG","6326"]],PRIMEM["Greenwich",0,AUTHORITY["EPSG","8901"]],UNIT["degree",0.0174532925199433,AUTHORITY["EPSG","9122"]],AUTHORITY["EPSG","4326"]],PROJECTION["Lambert_Conformal_Conic_2SP"],PARAMETER["standard_parallel_1",40],PARAMETER["standard_parallel_2",56],PARAMETER["latitude_of_origin",4],PARAMETER["central_meridian",10],PARAMETER["false_easting",0],PARAMETER["false_northing",0],UNIT["Meter",1]]'
-    if wkt != expected_wkt:
-        gdaltest.post_reason('bad WKT')
-        print(wkt)
-        return 'fail'
+    assert wkt == expected_wkt, 'bad WKT'
 
     cs = ds.GetRasterBand(1).Checksum()
-    if cs != 16025:
-        gdaltest.post_reason('bad checksum')
-        print(cs)
-        return 'fail'
+    assert cs == 16025, 'bad checksum'
 
     return 'success'
 
diff --git a/autotest/gdrivers/pcidsk.py b/autotest/gdrivers/pcidsk.py
index b4efb150fceb..d8b49650cea8 100755
--- a/autotest/gdrivers/pcidsk.py
+++ b/autotest/gdrivers/pcidsk.py
@@ -75,14 +75,10 @@ def test_pcidsk_4():
     ds = gdal.Open('data/utm.pix')
 
     band = ds.GetRasterBand(1)
-    if band.GetOverviewCount() != 1:
-        gdaltest.post_reason('did not get expected overview count')
-        return 'fail'
+    assert band.GetOverviewCount() == 1, 'did not get expected overview count'
 
     cs = band.GetOverview(0).Checksum()
-    if cs != 8368:
-        gdaltest.post_reason('wrong overview checksum (%d)' % cs)
-        return 'fail'
+    assert cs == 8368, ('wrong overview checksum (%d)' % cs)
 
     return 'success'
 
@@ -184,9 +180,7 @@ def test_pcidsk_7():
 
     ct = band.GetColorTable()
 
-    if ct is not None:
-        gdaltest.post_reason('Got color table unexpectedly.')
-        return 'fail'
+    assert ct is None, 'Got color table unexpectedly.'
 
     ct = gdal.ColorTable()
     ct.SetColorEntry(0, (0, 255, 0, 255))
@@ -196,9 +190,8 @@ def test_pcidsk_7():
 
     ct = band.GetColorTable()
 
-    if ct.GetColorEntry(1) != (255, 0, 255, 255):
-        gdaltest.post_reason('Got wrong color table entry immediately.')
-        return 'fail'
+    assert ct.GetColorEntry(1) == (255, 0, 255, 255), \
+        'Got wrong color table entry immediately.'
 
     ct = None
     band = None
@@ -211,25 +204,16 @@ def test_pcidsk_7():
 
     ct = band.GetColorTable()
 
-    if ct.GetColorEntry(1) != (255, 0, 255, 255):
-        gdaltest.post_reason('Got wrong color table entry after reopen.')
-        return 'fail'
+    assert ct.GetColorEntry(1) == (255, 0, 255, 255), \
+        'Got wrong color table entry after reopen.'
 
-    if band.GetColorInterpretation() != gdal.GCI_PaletteIndex:
-        gdaltest.post_reason('Not a palette?')
-        return 'fail'
+    assert band.GetColorInterpretation() == gdal.GCI_PaletteIndex, 'Not a palette?'
 
-    if band.SetColorTable(None) != 0:
-        gdaltest.post_reason('SetColorTable failed.')
-        return 'fail'
+    assert band.SetColorTable(None) == 0, 'SetColorTable failed.'
 
-    if band.GetColorTable() is not None:
-        gdaltest.post_reason('color table still exists!')
-        return 'fail'
+    assert band.GetColorTable() is None, 'color table still exists!'
 
-    if band.GetColorInterpretation() != gdal.GCI_Undefined:
-        gdaltest.post_reason('Paletted?')
-        return 'fail'
+    assert band.GetColorInterpretation() == gdal.GCI_Undefined, 'Paletted?'
 
     return 'success'
 
@@ -265,8 +249,7 @@ def pcidsk_9():
     gdal.PushErrorHandler('CPLQuietErrorHandler')
     ds = gdal.Open('/vsimem/pcidsk_9.pix')
     gdal.PopErrorHandler()
-    if ds is not None:
-        return 'fail'
+    assert ds is None
     ds = None
 
     gdal.Unlink('/vsimem/pcidsk_9.pix')
@@ -291,14 +274,10 @@ def test_pcidsk_10():
     band = ds.GetRasterBand(1)
     ds.BuildOverviews('NEAR', [2])
 
-    if band.GetOverviewCount() != 1:
-        gdaltest.post_reason('did not get expected overview count')
-        return 'fail'
+    assert band.GetOverviewCount() == 1, 'did not get expected overview count'
 
     cs = band.GetOverview(0).Checksum()
-    if cs != 1087:
-        gdaltest.post_reason('wrong overview checksum (%d)' % cs)
-        return 'fail'
+    assert cs == 1087, ('wrong overview checksum (%d)' % cs)
 
     ds = None
 
@@ -358,10 +337,7 @@ def test_pcidsk_13():
 
     gdal.GetDriverByName('PCIDSK').Delete('/vsimem/pcidsk_13.pix')
 
-    if cs != 4645:
-        gdaltest.post_reason('bad checksum')
-        print(cs)
-        return 'fail'
+    assert cs == 4645, 'bad checksum'
 
     return 'success'
 
@@ -387,10 +363,7 @@ def test_pcidsk_14():
 
     gdal.GetDriverByName('PCIDSK').Delete('/vsimem/pcidsk_14.pix')
 
-    if desc != 'mydescription':
-        gdaltest.post_reason('bad description')
-        print(desc)
-        return 'fail'
+    assert desc == 'mydescription', 'bad description'
 
     return 'success'
 
@@ -408,20 +381,16 @@ def test_pcidsk_15():
     ds = None
 
     ds = gdal.Open('/vsimem/pcidsk_15.pix')
-    if ds.RasterCount != 1:
-        return 'fail'
-    if ds.GetLayerCount() != 1:
-        return 'fail'
+    assert ds.RasterCount == 1
+    assert ds.GetLayerCount() == 1
 
     ds2 = gdal.GetDriverByName('PCIDSK').CreateCopy('/vsimem/pcidsk_15_2.pix', ds)
     ds2 = None
     ds = None
 
     ds = gdal.Open('/vsimem/pcidsk_15_2.pix')
-    if ds.RasterCount != 1:
-        return 'fail'
-    if ds.GetLayerCount() != 1:
-        return 'fail'
+    assert ds.RasterCount == 1
+    assert ds.GetLayerCount() == 1
     ds = None
 
     # One vector layer only
@@ -430,20 +399,16 @@ def test_pcidsk_15():
     ds = None
 
     ds = gdal.OpenEx('/vsimem/pcidsk_15.pix')
-    if ds.RasterCount != 0:
-        return 'fail'
-    if ds.GetLayerCount() != 1:
-        return 'fail'
+    assert ds.RasterCount == 0
+    assert ds.GetLayerCount() == 1
 
     ds2 = gdal.GetDriverByName('PCIDSK').CreateCopy('/vsimem/pcidsk_15_2.pix', ds)
     ds2 = None
     ds = None
 
     ds = gdal.OpenEx('/vsimem/pcidsk_15_2.pix')
-    if ds.RasterCount != 0:
-        return 'fail'
-    if ds.GetLayerCount() != 1:
-        return 'fail'
+    assert ds.RasterCount == 0
+    assert ds.GetLayerCount() == 1
     ds = None
 
     # Zero raster band and vector layer
@@ -451,20 +416,16 @@ def test_pcidsk_15():
     ds = None
 
     ds = gdal.OpenEx('/vsimem/pcidsk_15.pix')
-    if ds.RasterCount != 0:
-        return 'fail'
-    if ds.GetLayerCount() != 0:
-        return 'fail'
+    assert ds.RasterCount == 0
+    assert ds.GetLayerCount() == 0
 
     ds2 = gdal.GetDriverByName('PCIDSK').CreateCopy('/vsimem/pcidsk_15_2.pix', ds)
     del ds2
     ds = None
 
     ds = gdal.OpenEx('/vsimem/pcidsk_15_2.pix')
-    if ds.RasterCount != 0:
-        return 'fail'
-    if ds.GetLayerCount() != 0:
-        return 'fail'
+    assert ds.RasterCount == 0
+    assert ds.GetLayerCount() == 0
     ds = None
 
     gdal.GetDriverByName('PCIDSK').Delete('/vsimem/pcidsk_15.pix')
@@ -481,11 +442,9 @@ def test_pcidsk_external_ovr():
     ds = gdal.Open('/vsimem/test.pix')
     ds.BuildOverviews('NEAR', [2])
     ds = None
-    if gdal.VSIStatL('/vsimem/test.pix.ovr') is None:
-        return 'fail'
+    assert gdal.VSIStatL('/vsimem/test.pix.ovr') is not None
     ds = gdal.Open('/vsimem/test.pix')
-    if ds.GetRasterBand(1).GetOverviewCount() != 1:
-        return 'fail'
+    assert ds.GetRasterBand(1).GetOverviewCount() == 1
     ds = None
 
     gdal.GetDriverByName('PCIDSK').Delete('/vsimem/test.pix')
@@ -502,11 +461,9 @@ def test_pcidsk_external_ovr_rrd():
     with gdaltest.config_option('USE_RRD', 'YES'):
         ds.BuildOverviews('NEAR', [2])
     ds = None
-    if gdal.VSIStatL('/vsimem/test.aux') is None:
-        return 'fail'
+    assert gdal.VSIStatL('/vsimem/test.aux') is not None
     ds = gdal.Open('/vsimem/test.pix')
-    if ds.GetRasterBand(1).GetOverviewCount() != 1:
-        return 'fail'
+    assert ds.GetRasterBand(1).GetOverviewCount() == 1
     ds = None
 
     gdal.GetDriverByName('PCIDSK').Delete('/vsimem/test.pix')
@@ -538,21 +495,15 @@ def test_pcidsk_online_1():
         return 'false'
 
     band = ds.GetRasterBand(20)
-    if band.GetDescription() != 'Training site for type 2 crop':
-        gdaltest.post_reason('did not get expected band 20 description')
-        return 'fail'
+    assert band.GetDescription() == 'Training site for type 2 crop', \
+        'did not get expected band 20 description'
 
     exp_checksum = 2057
     checksum = band.Checksum()
-    if exp_checksum != checksum:
-        print(checksum)
-        gdaltest.post_reason('did not get right bitmap checksum.')
-        return 'fail'
+    assert exp_checksum == checksum, 'did not get right bitmap checksum.'
 
     md = band.GetMetadata('IMAGE_STRUCTURE')
-    if md['NBITS'] != '1':
-        gdaltest.post_reason('did not get expected NBITS=1 metadata.')
-        return 'fail'
+    assert md['NBITS'] == '1', 'did not get expected NBITS=1 metadata.'
 
     return 'success'
 
diff --git a/autotest/gdrivers/pcraster.py b/autotest/gdrivers/pcraster.py
index 0f42a5bb65d9..d7333708d56b 100755
--- a/autotest/gdrivers/pcraster.py
+++ b/autotest/gdrivers/pcraster.py
@@ -61,15 +61,11 @@ def test_pcraster_2():
 
     gt = ds.GetGeoTransform()
 
-    if gt[0] != 182140.0 or gt[1] != 10 or gt[2] != 0 \
-       or gt[3] != 327880.0 or gt[4] != 0 or gt[5] != -10:
-        gdaltest.post_reason('PCRaster geotransform wrong.')
-        return 'fail'
+    assert gt[0] == 182140.0 and gt[1] == 10 and gt[2] == 0 and gt[3] == 327880.0 and gt[4] == 0 and gt[5] == -10, \
+        'PCRaster geotransform wrong.'
 
     band1 = ds.GetRasterBand(1)
-    if band1.GetNoDataValue() != 255:
-        gdaltest.post_reason('PCRaster NODATA value wrong or missing.')
-        return 'fail'
+    assert band1.GetNoDataValue() == 255, 'PCRaster NODATA value wrong or missing.'
 
     return 'success'
 
diff --git a/autotest/gdrivers/pdf.py b/autotest/gdrivers/pdf.py
index 1b82863e6c41..cd28e2a8cdb1 100755
--- a/autotest/gdrivers/pdf.py
+++ b/autotest/gdrivers/pdf.py
@@ -34,6 +34,7 @@
 from osgeo import gdal
 from osgeo import ogr
 from osgeo import osr
+import pytest
 
 sys.path.append('../osr')
 
@@ -125,13 +126,9 @@ def pdf_online_1():
         return 'skip'
 
     ds = gdal.Open('tmp/cache/Cherrydale_eDOQQ_1m_0_033_R1C1.pdf')
-    if ds is None:
-        return 'fail'
+    assert ds is not None
 
-    if ds.RasterXSize != 1241:
-        gdaltest.post_reason('bad dimensions')
-        print(ds.RasterXSize)
-        return 'fail'
+    assert ds.RasterXSize == 1241, 'bad dimensions'
 
     gt = ds.GetGeoTransform()
     wkt = ds.GetProjectionRef()
@@ -148,22 +145,13 @@ def pdf_online_1():
             # The remote file has been updated...
             other_expected_gt = (-77.112328333299928, 9.1666560000165691e-06, 0.0, 38.897842488371978, 0.0, -9.1666560000046903e-06)
             for j in range(6):
-                if abs(gt[j] - other_expected_gt[j]) > 1e-15:
-                    gdaltest.post_reason('bad geotransform')
-                    print(gt)
-                    print(other_expected_gt)
-                    return 'fail'
-
-    if wkt.find('GEOGCS["WGS 84"') != 0:
-        gdaltest.post_reason('bad WKT')
-        print(wkt)
-        return 'fail'
+                assert abs(gt[j] - other_expected_gt[j]) <= 1e-15, 'bad geotransform'
+
+    assert wkt.find('GEOGCS["WGS 84"') == 0, 'bad WKT'
 
     if pdf_checksum_available():
         cs = ds.GetRasterBand(1).Checksum()
-        if cs == 0:
-            gdaltest.post_reason('bad checksum')
-            return 'fail'
+        assert cs != 0, 'bad checksum'
 
     return 'success'
 
@@ -181,8 +169,7 @@ def pdf_online_2():
         return 'skip'
 
     ds = gdal.Open('PDF:1:tmp/cache/Cherrydale_eDOQQ_1m_0_033_R1C1.pdf')
-    if ds is None:
-        return 'fail'
+    assert ds is not None
 
     gt = ds.GetGeoTransform()
     wkt = ds.GetProjectionRef()
@@ -199,15 +186,9 @@ def pdf_online_2():
             # The remote file has been updated...
             other_expected_gt = (-77.112328333299928, 9.1666560000165691e-06, 0.0, 38.897842488371978, 0.0, -9.1666560000046903e-06)
             for j in range(6):
-                if abs(gt[j] - other_expected_gt[j]) > 1e-15:
-                    gdaltest.post_reason('bad geotransform')
-                    print(gt)
-                    print(other_expected_gt)
-                    return 'fail'
-
-    if wkt.find('GEOGCS["WGS 84"') != 0:
-        print(wkt)
-        return 'fail'
+                assert abs(gt[j] - other_expected_gt[j]) <= 1e-15, 'bad geotransform'
+
+    assert wkt.find('GEOGCS["WGS 84"') == 0
 
     return 'success'
 
@@ -223,8 +204,7 @@ def pdf_1():
     gdal.SetConfigOption('GDAL_PDF_DPI', '200')
     ds = gdal.Open('data/adobe_style_geospatial.pdf')
     gdal.SetConfigOption('GDAL_PDF_DPI', None)
-    if ds is None:
-        return 'fail'
+    assert ds is not None
 
     gt = ds.GetGeoTransform()
     wkt = ds.GetProjectionRef()
@@ -235,25 +215,15 @@ def pdf_1():
         expected_gt = (333274.61654367246, 31.764802242655662, 0.0, 4940391.7593506984, 0.0, -31.794745501708238)
 
     for i in range(6):
-        if abs(gt[i] - expected_gt[i]) > 1e-6:
-            gdaltest.post_reason('bad geotransform')
-            print(gt)
-            print(expected_gt)
-            return 'fail'
+        assert abs(gt[i] - expected_gt[i]) <= 1e-6, 'bad geotransform'
 
     expected_wkt = 'PROJCS["WGS_1984_UTM_Zone_20N",GEOGCS["GCS_WGS_1984",DATUM["WGS_1984",SPHEROID["WGS_84",6378137.0,298.257223563]],PRIMEM["Greenwich",0.0],UNIT["Degree",0.0174532925199433]],PROJECTION["Transverse_Mercator"],PARAMETER["False_Easting",500000.0],PARAMETER["False_Northing",0.0],PARAMETER["Central_Meridian",-63.0],PARAMETER["Scale_Factor",0.9996],PARAMETER["Latitude_Of_Origin",0.0],UNIT["Meter",1.0]]'
-    if wkt != expected_wkt:
-        gdaltest.post_reason('bad WKT')
-        print(wkt)
-        return 'fail'
+    assert wkt == expected_wkt, 'bad WKT'
 
     if pdf_checksum_available():
         cs = ds.GetRasterBand(1).Checksum()
         # if cs != 17740 and cs != 19346:
-        if cs == 0:
-            gdaltest.post_reason('bad checksum')
-            print(cs)
-            return 'fail'
+        assert cs != 0, 'bad checksum'
 
     neatline = ds.GetMetadataItem('NEATLINE')
     got_geom = ogr.CreateGeometryFromWkt(neatline)
@@ -263,9 +233,8 @@ def pdf_1():
         expected_geom = ogr.CreateGeometryFromWkt('POLYGON ((338304.150125828920864 4896673.639421294443309,338304.177293475600891 4933414.799376524984837,382774.271384406310972 4933414.546264361590147,382774.767329963855445 4896674.273581005632877,338304.150125828920864 4896673.639421294443309))')
 
     if ogrtest.check_feature_geometry(got_geom, expected_geom) != 0:
-        gdaltest.post_reason('bad neatline')
         print(neatline)
-        return 'fail'
+        pytest.fail('bad neatline')
 
     return 'success'
 
@@ -370,9 +339,8 @@ def pdf_ogcbp_lcc():
     sr1 = osr.SpatialReference(wkt)
     sr2 = osr.SpatialReference(out_wkt)
     if sr1.IsSame(sr2) == 0:
-        gdaltest.post_reason('wrong wkt')
         print(sr2.ExportToPrettyWkt())
-        return 'fail'
+        pytest.fail('wrong wkt')
 
     return 'success'
 
@@ -515,16 +483,11 @@ def pdf_rgba_default_compression(options_param=None):
     if cs4 < 0:
         return 'skip'
 
-    if content.find('Type = dictionary, Num = 3, Gen = 0') != 0 or \
-       content.find('      Type = dictionary, Num = 3, Gen = 0') < 0:
-        gdaltest.post_reason('wrong object dump')
-        print(content)
-        return 'fail'
+    assert (content.find('Type = dictionary, Num = 3, Gen = 0') == 0 and \
+       content.find('      Type = dictionary, Num = 3, Gen = 0') >= 0), \
+        'wrong object dump'
 
-    if cs4 == 0:
-        gdaltest.post_reason('wrong checksum')
-        print(cs4)
-        return 'fail'
+    assert cs4 != 0, 'wrong checksum'
 
     if cs1 != src_cs1 or cs2 != src_cs2 or cs3 != src_cs3 or cs4 != src_cs4:
         print(cs1)
@@ -638,13 +601,9 @@ def pdf_xmp():
 
     gdal.GetDriverByName('PDF').Delete('tmp/pdf_xmp.pdf')
 
-    if ref_md[0] != got_md[0]:
-        print(got_md[0])
-        return 'fail'
+    assert ref_md[0] == got_md[0]
 
-    if len(base_md) != 2:  # NEATLINE and DPI
-        print(base_md)
-        return 'fail'
+    assert len(base_md) == 2
 
     return 'success'
 
@@ -684,15 +643,12 @@ def pdf_info():
     gdal.GetDriverByName('PDF').Delete('tmp/pdf_info.pdf')
     gdal.GetDriverByName('PDF').Delete('tmp/pdf_info_2.pdf')
 
-    if md['AUTHOR'] != val or \
-       md['CREATOR'] != 'creator' or \
-       md['KEYWORDS'] != 'keywords' or \
-       md['PRODUCER'] != 'producer' or \
-       md['SUBJECT'] != 'subject' or \
-       md['TITLE'] != 'title':
-        gdaltest.post_reason("metadata doesn't match")
-        print(md)
-        return 'fail'
+    assert (md['AUTHOR'] == val and \
+       md['CREATOR'] == 'creator' and \
+       md['KEYWORDS'] == 'keywords' and \
+       md['PRODUCER'] == 'producer' and \
+       md['SUBJECT'] == 'subject' and \
+       md['TITLE'] == 'title'), "metadata doesn't match"
 
     return 'success'
 
@@ -718,8 +674,7 @@ def pdf_update_gt():
     ds.SetGeoTransform([2, 1, 0, 49, 0, -1])
     ds = None
 
-    if os.path.exists('tmp/pdf_update_gt.pdf.aux.xml'):
-        return 'fail'
+    assert not os.path.exists('tmp/pdf_update_gt.pdf.aux.xml')
 
     # Check geotransform
     ds = gdal.Open('tmp/pdf_update_gt.pdf')
@@ -728,10 +683,7 @@ def pdf_update_gt():
 
     expected_gt = [2, 1, 0, 49, 0, -1]
     for i in range(6):
-        if abs(gt[i] - expected_gt[i]) > 1e-8:
-            gdaltest.post_reason('did not get expected gt')
-            print(gt)
-            return 'fail'
+        assert abs(gt[i] - expected_gt[i]) <= 1e-8, 'did not get expected gt'
 
     # Clear geotransform
     ds = gdal.Open('tmp/pdf_update_gt.pdf', gdal.GA_Update)
@@ -745,10 +697,7 @@ def pdf_update_gt():
 
     expected_gt = [0.0, 1.0, 0.0, 0.0, 0.0, 1.0]
     for i in range(6):
-        if abs(gt[i] - expected_gt[i]) > 1e-8:
-            gdaltest.post_reason('did not get expected gt')
-            print(gt)
-            return 'fail'
+        assert abs(gt[i] - expected_gt[i]) <= 1e-8, 'did not get expected gt'
 
     # Set geotransform again
     ds = gdal.Open('tmp/pdf_update_gt.pdf', gdal.GA_Update)
@@ -763,10 +712,7 @@ def pdf_update_gt():
 
     expected_gt = [3, 1, 0, 50, 0, -1]
     for i in range(6):
-        if abs(gt[i] - expected_gt[i]) > 1e-8:
-            gdaltest.post_reason('did not get expected gt')
-            print(gt)
-            return 'fail'
+        assert abs(gt[i] - expected_gt[i]) <= 1e-8, 'did not get expected gt'
 
     gdaltest.pdf_drv.Delete('tmp/pdf_update_gt.pdf')
 
@@ -796,10 +742,7 @@ def pdf_update_info():
     author = ds.GetMetadataItem('AUTHOR')
     ds = None
 
-    if author != 'author':
-        gdaltest.post_reason('did not get expected metadata')
-        print(author)
-        return 'fail'
+    assert author == 'author', 'did not get expected metadata'
 
     # Update info
     ds = gdal.Open('tmp/pdf_update_info.pdf', gdal.GA_Update)
@@ -811,10 +754,7 @@ def pdf_update_info():
     author = ds.GetMetadataItem('AUTHOR')
     ds = None
 
-    if author != 'author2':
-        gdaltest.post_reason('did not get expected metadata')
-        print(author)
-        return 'fail'
+    assert author == 'author2', 'did not get expected metadata'
 
     # Clear info
     ds = gdal.Open('tmp/pdf_update_info.pdf', gdal.GA_Update)
@@ -823,19 +763,15 @@ def pdf_update_info():
 
     # Check PAM doesn't exist
     if os.path.exists('tmp/pdf_update_info.pdf.aux.xml'):
-        gdaltest.post_reason('did not expected .aux.xml')
         print(author)
-        return 'fail'
+        pytest.fail('did not expected .aux.xml')
 
     # Check
     ds = gdal.Open('tmp/pdf_update_info.pdf')
     author = ds.GetMetadataItem('AUTHOR')
     ds = None
 
-    if author is not None:
-        gdaltest.post_reason('did not get expected metadata')
-        print(author)
-        return 'fail'
+    assert author is None, 'did not get expected metadata'
 
     gdaltest.pdf_drv.Delete('tmp/pdf_update_info.pdf')
 
@@ -865,10 +801,7 @@ def pdf_update_xmp():
     xmp = ds.GetMetadata('xml:XMP')[0]
     ds = None
 
-    if xmp != "<?xpacket begin='a'/><a/>":
-        gdaltest.post_reason('did not get expected metadata')
-        print(xmp)
-        return 'fail'
+    assert xmp == "<?xpacket begin='a'/><a/>", 'did not get expected metadata'
 
     # Update info
     ds = gdal.Open('tmp/pdf_update_xmp.pdf', gdal.GA_Update)
@@ -880,15 +813,11 @@ def pdf_update_xmp():
     xmp = ds.GetMetadata('xml:XMP')[0]
     ds = None
 
-    if xmp != "<?xpacket begin='a'/><a_updated/>":
-        gdaltest.post_reason('did not get expected metadata')
-        print(xmp)
-        return 'fail'
+    assert xmp == "<?xpacket begin='a'/><a_updated/>", 'did not get expected metadata'
 
     # Check PAM doesn't exist
-    if os.path.exists('tmp/pdf_update_xmp.pdf.aux.xml'):
-        gdaltest.post_reason('did not expected .aux.xml')
-        return 'fail'
+    assert not os.path.exists('tmp/pdf_update_xmp.pdf.aux.xml'), \
+        'did not expected .aux.xml'
 
     # Clear info
     ds = gdal.Open('tmp/pdf_update_xmp.pdf', gdal.GA_Update)
@@ -900,10 +829,7 @@ def pdf_update_xmp():
     xmp = ds.GetMetadata('xml:XMP')
     ds = None
 
-    if xmp is not None:
-        gdaltest.post_reason('did not get expected metadata')
-        print(xmp)
-        return 'fail'
+    assert xmp is None, 'did not get expected metadata'
 
     gdaltest.pdf_drv.Delete('tmp/pdf_update_xmp.pdf')
 
@@ -979,26 +905,14 @@ def pdf_update_gcps(dpi=300):
 
     ds = None
 
-    if got_wkt == '':
-        gdaltest.post_reason('did not expect null GetProjectionRef')
-        print(got_wkt)
-        return 'fail'
+    assert got_wkt != '', 'did not expect null GetProjectionRef'
 
-    if got_gcp_wkt != '':
-        gdaltest.post_reason('did not expect non null GetGCPProjection')
-        print(got_gcp_wkt)
-        return 'fail'
+    assert got_gcp_wkt == '', 'did not expect non null GetGCPProjection'
 
     for i in range(6):
-        if abs(got_gt[i] - src_gt[i]) > 1e-8:
-            gdaltest.post_reason('did not get expected gt')
-            print(got_gt)
-            return 'fail'
-
-    if got_gcp_count != 0:
-        gdaltest.post_reason('did not expect GCPs')
-        print(got_gcp_count)
-        return 'fail'
+        assert abs(got_gt[i] - src_gt[i]) <= 1e-8, 'did not get expected gt'
+
+    assert got_gcp_count == 0, 'did not expect GCPs'
 
     got_geom = ogr.CreateGeometryFromWkt(got_neatline)
     expected_lr = ogr.Geometry(ogr.wkbLinearRing)
@@ -1009,10 +923,9 @@ def pdf_update_gcps(dpi=300):
     expected_geom.AddGeometry(expected_lr)
 
     if ogrtest.check_feature_geometry(got_geom, expected_geom, max_error=max_error) != 0:
-        gdaltest.post_reason('bad neatline')
         print('got : %s' % got_neatline)
         print('expected : %s' % expected_geom.ExportToWkt())
-        return 'fail'
+        pytest.fail('bad neatline')
 
     gdaltest.pdf_drv.Delete(out_filename)
 
@@ -1100,37 +1013,22 @@ def pdf_set_5_gcps_ogc_bp(dpi=300):
     got_neatline = ds.GetMetadataItem('NEATLINE')
     ds = None
 
-    if got_wkt != '':
-        gdaltest.post_reason('did not expect non null GetProjectionRef')
-        print(got_wkt)
-        return 'fail'
+    assert got_wkt == '', 'did not expect non null GetProjectionRef'
 
-    if got_gcp_wkt == '':
-        gdaltest.post_reason('did not expect null GetGCPProjection')
-        print(got_gcp_wkt)
-        return 'fail'
+    assert got_gcp_wkt != '', 'did not expect null GetGCPProjection'
 
     expected_gt = [0, 1, 0, 0, 0, 1]
     for i in range(6):
-        if abs(got_gt[i] - expected_gt[i]) > 1e-8:
-            gdaltest.post_reason('did not get expected gt')
-            print(got_gt)
-            return 'fail'
-
-    if got_gcp_count != len(gcp):
-        gdaltest.post_reason('did not get expected GCP count')
-        print(got_gcp_count)
-        return 'fail'
+        assert abs(got_gt[i] - expected_gt[i]) <= 1e-8, 'did not get expected gt'
+
+    assert got_gcp_count == len(gcp), 'did not get expected GCP count'
 
     for i in range(got_gcp_count):
-        if abs(got_gcps[i].GCPX - vrt_gcps[i].GCPX) > 1e-5 or \
-           abs(got_gcps[i].GCPY - vrt_gcps[i].GCPY) > 1e-5 or \
-           abs(got_gcps[i].GCPPixel - vrt_gcps[i].GCPPixel) > 1e-5 or \
-           abs(got_gcps[i].GCPLine - vrt_gcps[i].GCPLine) > 1e-5:
-            gdaltest.post_reason('did not get expected GCP (%d)' % i)
-            print(got_gcps[i])
-            print(vrt_gcps[i])
-            return 'fail'
+        assert (abs(got_gcps[i].GCPX - vrt_gcps[i].GCPX) <= 1e-5 and \
+           abs(got_gcps[i].GCPY - vrt_gcps[i].GCPY) <= 1e-5 and \
+           abs(got_gcps[i].GCPPixel - vrt_gcps[i].GCPPixel) <= 1e-5 and \
+           abs(got_gcps[i].GCPLine - vrt_gcps[i].GCPLine) <= 1e-5), \
+            ('did not get expected GCP (%d)' % i)
 
     got_geom = ogr.CreateGeometryFromWkt(got_neatline)
     # Not sure this is really what we want, but without any geotransform, we cannot
@@ -1138,10 +1036,9 @@ def pdf_set_5_gcps_ogc_bp(dpi=300):
     expected_geom = ogr.CreateGeometryFromWkt('POLYGON ((2 8,2 10,2 18,16 18,16 8,2 8))')
 
     if ogrtest.check_feature_geometry(got_geom, expected_geom) != 0:
-        gdaltest.post_reason('bad neatline')
         print('got : %s' % got_neatline)
         print('expected : %s' % expected_geom.ExportToWkt())
-        return 'fail'
+        pytest.fail('bad neatline')
 
     gdaltest.pdf_drv.Delete(out_filename)
 
@@ -1184,20 +1081,15 @@ def pdf_set_neatline(geo_encoding, dpi=300):
     ds = None
 
     for i in range(6):
-        if abs(got_gt[i] - expected_gt[i]) > 1e-7:
-            gdaltest.post_reason('did not get expected gt')
-            print(got_gt)
-            print(expected_gt)
-            return 'fail'
+        assert abs(got_gt[i] - expected_gt[i]) <= 1e-7, 'did not get expected gt'
 
     got_geom = ogr.CreateGeometryFromWkt(got_neatline)
     expected_geom = ogr.CreateGeometryFromWkt(neatline)
 
     if ogrtest.check_feature_geometry(got_geom, expected_geom, max_error=max_error) != 0:
-        gdaltest.post_reason('bad neatline')
         print('got : %s' % got_neatline)
         print('expected : %s' % expected_geom.ExportToWkt())
-        return 'fail'
+        pytest.fail('bad neatline')
 
     # Test SetMetadataItem()
     ds = gdal.Open(out_filename, gdal.GA_Update)
@@ -1219,20 +1111,17 @@ def pdf_set_neatline(geo_encoding, dpi=300):
     gdal.SetConfigOption('GDAL_PDF_GEO_ENCODING', None)
 
     for i in range(6):
-        if (expected_gt[i] == 0 and abs(got_gt[i] - expected_gt[i]) > 1e-7) or \
-           (expected_gt[i] != 0 and abs((got_gt[i] - expected_gt[i]) / expected_gt[i]) > 1e-7):
-            gdaltest.post_reason('did not get expected gt')
-            print(got_gt)
-            return 'fail'
+        assert (not (expected_gt[i] == 0 and abs(got_gt[i] - expected_gt[i]) > 1e-7) or \
+           (expected_gt[i] != 0 and abs((got_gt[i] - expected_gt[i]) / expected_gt[i]) > 1e-7)), \
+            'did not get expected gt'
 
     got_geom = ogr.CreateGeometryFromWkt(got_neatline)
     expected_geom = ogr.CreateGeometryFromWkt(neatline)
 
     if ogrtest.check_feature_geometry(got_geom, expected_geom, max_error=max_error) != 0:
-        gdaltest.post_reason('bad neatline')
         print('got : %s' % got_neatline)
         print('expected : %s' % expected_geom.ExportToWkt())
-        return 'fail'
+        pytest.fail('bad neatline')
 
     gdaltest.pdf_drv.Delete(out_filename)
 
@@ -1272,9 +1161,7 @@ def pdf_check_identity_iso32000():
 
     gdaltest.pdf_drv.Delete(out_filename)
 
-    if data_ref != data_got:
-        gdaltest.post_reason('content does not match reference content')
-        return 'fail'
+    assert data_ref == data_got, 'content does not match reference content'
 
     return 'success'
 
@@ -1306,9 +1193,7 @@ def pdf_check_identity_ogc_bp():
 
     gdaltest.pdf_drv.Delete(out_filename)
 
-    if data_ref != data_got:
-        gdaltest.post_reason('content does not match reference content')
-        return 'fail'
+    assert data_ref == data_got, 'content does not match reference content'
 
     return 'success'
 
@@ -1330,10 +1215,8 @@ def pdf_layers():
     ds = None
 
     # if layers != ['LAYER_00_INIT_STATE=ON', 'LAYER_00_NAME=New_Data_Frame', 'LAYER_01_INIT_STATE=ON', 'LAYER_01_NAME=New_Data_Frame.Graticule', 'LAYER_02_INIT_STATE=ON', 'LAYER_02_NAME=Layers', 'LAYER_03_INIT_STATE=ON', 'LAYER_03_NAME=Layers.Measured_Grid', 'LAYER_04_INIT_STATE=ON', 'LAYER_04_NAME=Layers.Graticule']:
-    if layers != ['LAYER_00_NAME=New_Data_Frame', 'LAYER_01_NAME=New_Data_Frame.Graticule', 'LAYER_02_NAME=Layers', 'LAYER_03_NAME=Layers.Measured_Grid', 'LAYER_04_NAME=Layers.Graticule']:
-        gdaltest.post_reason('did not get expected layers')
-        print(layers)
-        return 'fail'
+    assert layers == ['LAYER_00_NAME=New_Data_Frame', 'LAYER_01_NAME=New_Data_Frame.Graticule', 'LAYER_02_NAME=Layers', 'LAYER_03_NAME=Layers.Measured_Grid', 'LAYER_04_NAME=Layers.Graticule'], \
+        'did not get expected layers'
 
     if not pdf_checksum_available():
         return 'skip'
@@ -1345,9 +1228,7 @@ def pdf_layers():
     ds = None
     gdal.SetConfigOption('GDAL_PDF_LAYERS_OFF', None)
 
-    if cs2 == cs1:
-        gdaltest.post_reason('did not get expected checksum')
-        return 'fail'
+    assert cs2 != cs1, 'did not get expected checksum'
 
     # Turn the other layer on
     gdal.SetConfigOption('GDAL_PDF_LAYERS', 'Layers')
@@ -1357,18 +1238,14 @@ def pdf_layers():
     gdal.SetConfigOption('GDAL_PDF_LAYERS', None)
 
     # So the end result must be identical
-    if cs3 != cs2:
-        gdaltest.post_reason('did not get expected checksum')
-        return 'fail'
+    assert cs3 == cs2, 'did not get expected checksum'
 
     # Turn another sublayer on
     ds = gdal.OpenEx('data/adobe_style_geospatial.pdf', open_options=['LAYERS=Layers.Measured_Grid'])
     cs4 = ds.GetRasterBand(1).Checksum()
     ds = None
 
-    if cs4 == cs1 or cs4 == cs2:
-        gdaltest.post_reason('did not get expected checksum')
-        return 'fail'
+    assert not (cs4 == cs1 or cs4 == cs2), 'did not get expected checksum'
 
     return 'success'
 
@@ -1409,10 +1286,8 @@ def pdf_custom_layout():
     gdal.GetDriverByName('PDF').Delete('tmp/pdf_custom_layout.pdf')
 
     if pdf_is_poppler() or pdf_is_pdfium():
-        if layers != ['LAYER_00_NAME=byte_tif', 'LAYER_01_NAME=Footpage_and_logo']:
-            gdaltest.post_reason('did not get expected layers')
-            print(layers)
-            return 'fail'
+        assert layers == ['LAYER_00_NAME=byte_tif', 'LAYER_01_NAME=Footpage_and_logo'], \
+            'did not get expected layers'
 
     return 'success'
 
@@ -1476,14 +1351,10 @@ def pdf_extra_rasters():
     os.unlink('tmp/subbyte.vrt')
 
     if pdf_is_poppler() or pdf_is_pdfium():
-        if layers != ['LAYER_00_NAME=byte_tif', 'LAYER_01_NAME=subbyte']:
-            gdaltest.post_reason('did not get expected layers')
-            print(layers)
-            return 'fail'
-    if pdf_is_poppler() and (cs != 7926 and cs != 8177 and cs != 8174 and cs != 8165):
-        gdaltest.post_reason('bad checksum')
-        print(cs)
-        return 'fail'
+        assert layers == ['LAYER_00_NAME=byte_tif', 'LAYER_01_NAME=subbyte'], \
+            'did not get expected layers'
+    assert not (pdf_is_poppler() and (cs != 7926 and cs != 8177 and cs != 8174 and cs != 8165)), \
+        'bad checksum'
 
     return 'success'
 
@@ -1561,14 +1432,10 @@ def pdf_write_ogr():
             for j in range(i + 1, len(rendering_options)):
                 if cs_tab[i] == cs_tab[j] and cs_tab[i] >= 0 and cs_tab[j] >= 0:
                     print('Checksum %s: %d' % (roi, cs_tab[i]))
-                    print('Checksum %s: %d' % (rendering_options[j], cs_tab[j]))
-                    return 'fail'
+                    pytest.fail('Checksum %s: %d' % (rendering_options[j], cs_tab[j]))
 
         # And test that RASTER,VECTOR,TEXT is the default rendering
-        if abs(cs_tab[len(rendering_options) - 1]) != cs_ref:
-            print(cs_ref)
-            print(cs_tab[len(rendering_options) - 1])
-            return 'fail'
+        assert abs(cs_tab[len(rendering_options) - 1]) == cs_ref
 
     gdal.GetDriverByName('PDF').Delete('tmp/pdf_write_ogr.pdf')
 
@@ -1576,16 +1443,11 @@ def pdf_write_ogr():
     gdal.Unlink('tmp/test.vrt')
 
     if pdf_is_poppler() or pdf_is_pdfium():
-        if layers != ['LAYER_00_NAME=A_Layer', 'LAYER_01_NAME=A_Layer.Text']:
-            gdaltest.post_reason('did not get expected layers')
-            print(layers)
-            return 'fail'
+        assert layers == ['LAYER_00_NAME=A_Layer', 'LAYER_01_NAME=A_Layer.Text'], \
+            'did not get expected layers'
 
     # Should have filtered out id = 4
-    if feature_count != 3:
-        gdaltest.post_reason('did not get expected feature count')
-        print(feature_count)
-        return 'fail'
+    assert feature_count == 3, 'did not get expected feature count'
 
     return 'success'
 
@@ -1648,10 +1510,7 @@ def pdf_write_ogr_with_reprojection():
     gdal.Unlink('tmp/test.vrt')
 
     # Should have filtered out id = 6
-    if feature_count != 5:
-        gdaltest.post_reason('did not get expected feature count')
-        print(feature_count)
-        return 'fail'
+    assert feature_count == 5, 'did not get expected feature count'
 
     return 'success'
 
@@ -1674,12 +1533,9 @@ def pdf_jpeg_direct_copy():
 
     ds = gdal.Open('tmp/pdf_jpeg_direct_copy.pdf')
     # No XMP at PDF level
-    if ds.GetMetadata('xml:XMP') is not None:
-        return 'fail'
-    if ds.RasterXSize != 20:
-        return 'fail'
-    if pdf_checksum_available() and ds.GetRasterBand(1).Checksum() == 0:
-        return 'fail'
+    assert ds.GetMetadata('xml:XMP') is None
+    assert ds.RasterXSize == 20
+    assert not (pdf_checksum_available() and ds.GetRasterBand(1).Checksum() == 0)
     ds = None
 
     # But we can find the original XMP from the JPEG file !
@@ -1690,8 +1546,7 @@ def pdf_jpeg_direct_copy():
 
     gdal.Unlink('tmp/pdf_jpeg_direct_copy.pdf')
 
-    if offset == -1:
-        return 'fail'
+    assert offset != -1
 
     return 'success'
 
@@ -1726,12 +1581,9 @@ def pdf_jpeg_in_vrt_direct_copy():
 
     ds = gdal.Open('tmp/pdf_jpeg_in_vrt_direct_copy.pdf')
     # No XMP at PDF level
-    if ds.GetMetadata('xml:XMP') is not None:
-        return 'fail'
-    if ds.RasterXSize != 20:
-        return 'fail'
-    if pdf_checksum_available() and ds.GetRasterBand(1).Checksum() == 0:
-        return 'fail'
+    assert ds.GetMetadata('xml:XMP') is None
+    assert ds.RasterXSize == 20
+    assert not (pdf_checksum_available() and ds.GetRasterBand(1).Checksum() == 0)
     ds = None
 
     # But we can find the original XMP from the JPEG file !
@@ -1742,8 +1594,7 @@ def pdf_jpeg_in_vrt_direct_copy():
 
     gdal.Unlink('tmp/pdf_jpeg_in_vrt_direct_copy.pdf')
 
-    if offset == -1:
-        return 'fail'
+    assert offset != -1
 
     return 'success'
 
@@ -1781,15 +1632,9 @@ def pdf_georef_on_image(src_filename='data/byte.tif'):
 
     gdal.GetDriverByName('PDF').Delete('tmp/pdf_georef_on_image.pdf')
 
-    if got_wkt == '':
-        gdaltest.post_reason('did not get projection')
-        return 'fail'
+    assert got_wkt != '', 'did not get projection'
 
-    if pdf_checksum_available() and src_cs != got_cs:
-        gdaltest.post_reason('did not get same checksum')
-        print(src_cs)
-        print(got_cs)
-        return 'fail'
+    assert not pdf_checksum_available() or src_cs == got_cs, 'did not get same checksum'
 
     return 'success'
 
@@ -1816,14 +1661,9 @@ def pdf_write_huge():
         ds = gdaltest.pdf_drv.CreateCopy(tmp_filename, src_ds)
         ds = None
         ds = gdal.Open(tmp_filename)
-        if int(ds.GetMetadataItem('DPI')) != 96:
-            print(ds.GetMetadataItem('DPI'))
-            return 'fail'
-        if ds.RasterXSize != src_ds.RasterXSize or \
-                ds.RasterYSize != src_ds.RasterYSize:
-            print(ds.RasterXSize)
-            print(ds.RasterYSize)
-            return 'fail'
+        assert int(ds.GetMetadataItem('DPI')) == 96
+        assert (ds.RasterXSize == src_ds.RasterXSize and \
+                ds.RasterYSize == src_ds.RasterYSize)
         ds = None
 
         gdal.ErrorReset()
@@ -1831,13 +1671,10 @@ def pdf_write_huge():
         ds = gdaltest.pdf_drv.CreateCopy(tmp_filename, src_ds, options=['DPI=72'])
         gdal.PopErrorHandler()
         msg = gdal.GetLastErrorMsg()
-        if msg == '':
-            return 'fail'
+        assert msg != ''
         ds = None
         ds = gdal.Open(tmp_filename)
-        if int(ds.GetMetadataItem('DPI')) != 72:
-            print(ds.GetMetadataItem('DPI'))
-            return 'fail'
+        assert int(ds.GetMetadataItem('DPI')) == 72
         ds = None
 
         src_ds = None
@@ -1849,13 +1686,10 @@ def pdf_write_huge():
         ds = gdaltest.pdf_drv.CreateCopy(tmp_filename, src_ds, options=[option])
         gdal.PopErrorHandler()
         msg = gdal.GetLastErrorMsg()
-        if msg == '':
-            return 'fail'
+        assert msg != ''
         ds = None
         ds = gdal.Open(tmp_filename)
-        if int(ds.GetMetadataItem('DPI')) != 72:
-            print(ds.GetMetadataItem('DPI'))
-            return 'fail'
+        assert int(ds.GetMetadataItem('DPI')) == 72
         ds = None
 
         src_ds = None
@@ -1888,25 +1722,17 @@ def pdf_overviews():
     ds.GetRasterBand(1).GetOverview(-1)
     ds.GetRasterBand(1).GetOverview(10)
     if before >= 1:
-        if not pdf_is_pdfium():
-            gdaltest.post_reason('No overview expected at this point!')
-            return 'fail'
+        assert pdf_is_pdfium(), 'No overview expected at this point!'
         cs = ds.GetRasterBand(1).GetOverview(0).Checksum()
-        if cs != 5934:
-            print(cs)
-            return 'fail'
+        assert cs == 5934
     elif pdf_is_pdfium():
         gdaltest.post_reason('Overview expected at this point!')
         return 'fail'
     ds.BuildOverviews('NONE', [2])
     after = ds.GetRasterBand(1).GetOverviewCount()
-    if after != 1:
-        print(after)
-        return 'fail'
+    assert after == 1
     cs = ds.GetRasterBand(1).GetOverview(0).Checksum()
-    if cs != 0:
-        print(cs)
-        return 'fail'
+    assert cs == 0
     ds = None
 
     gdaltest.pdf_drv.Delete(tmp_filename)
@@ -1928,19 +1754,16 @@ def pdf_password():
     # No password
     with gdaltest.error_handler():
         ds = gdal.Open('data/byte_enc.pdf')
-    if ds is not None:
-        return 'fail'
+    assert ds is None
 
     # Wrong password
     with gdaltest.error_handler():
         ds = gdal.OpenEx('data/byte_enc.pdf', open_options=['USER_PWD=wrong_password'])
-    if ds is not None:
-        return 'fail'
+    assert ds is None
 
     # Correct password
     ds = gdal.OpenEx('data/byte_enc.pdf', open_options=['USER_PWD=user_password'])
-    if ds is None:
-        return 'fail'
+    assert ds is not None
 
     import test_cli_utilities
     if test_cli_utilities.get_gdal_translate_path() is None:
@@ -1954,15 +1777,13 @@ def pdf_password():
     open('tmp/password.txt', 'wb').write('wrong_password'.encode('ASCII'))
     ret = os.system(cmd_line)
     os.unlink('tmp/password.txt')
-    if ret == 0:
-        return 'fail'
+    assert ret != 0
 
     # Test ASK_INTERACTIVE with correct password
     open('tmp/password.txt', 'wb').write('user_password'.encode('ASCII'))
     ret = os.system(cmd_line)
     os.unlink('tmp/password.txt')
-    if ret != 0:
-        return 'fail'
+    assert ret == 0
 
     return 'success'
 
@@ -1983,39 +1804,26 @@ def pdf_multipage():
     ds = gdal.Open('data/byte_and_rgbsmall_2pages.pdf')
     subdatasets = ds.GetSubDatasets()
     expected_subdatasets = [('PDF:1:data/byte_and_rgbsmall_2pages.pdf', 'Page 1 of data/byte_and_rgbsmall_2pages.pdf'), ('PDF:2:data/byte_and_rgbsmall_2pages.pdf', 'Page 2 of data/byte_and_rgbsmall_2pages.pdf')]
-    if subdatasets != expected_subdatasets:
-        gdaltest.post_reason('did not get expected subdatasets')
-        print(subdatasets)
-        print(expected_subdatasets)
-        return 'fail'
+    assert subdatasets == expected_subdatasets, 'did not get expected subdatasets'
     ds = None
 
     ds = gdal.Open('PDF:1:data/byte_and_rgbsmall_2pages.pdf')
-    if ds.RasterXSize != 20:
-        gdaltest.post_reason('wrong width')
-        print(ds.RasterXSize)
-        return 'fail'
+    assert ds.RasterXSize == 20, 'wrong width'
 
     ds2 = gdal.Open('PDF:2:data/byte_and_rgbsmall_2pages.pdf')
-    if ds2.RasterXSize != 50:
-        gdaltest.post_reason('wrong width')
-        print(ds2.RasterXSize)
-        return 'fail'
+    assert ds2.RasterXSize == 50, 'wrong width'
 
     with gdaltest.error_handler():
         ds3 = gdal.Open('PDF:0:data/byte_and_rgbsmall_2pages.pdf')
-    if ds3 is not None:
-        return 'fail'
+    assert ds3 is None
 
     with gdaltest.error_handler():
         ds3 = gdal.Open('PDF:3:data/byte_and_rgbsmall_2pages.pdf')
-    if ds3 is not None:
-        return 'fail'
+    assert ds3 is None
 
     with gdaltest.error_handler():
         ds = gdal.Open('PDF:1:/does/not/exist.pdf')
-    if ds is not None:
-        return 'fail'
+    assert ds is None
 
     return 'success'
 
@@ -2031,13 +1839,10 @@ def pdf_metadata():
     gdal.Translate('tmp/pdf_metadata.pdf', 'data/byte.tif', format='PDF', metadataOptions=['FOO=BAR'])
     ds = gdal.Open('tmp/pdf_metadata.pdf')
     md = ds.GetMetadata()
-    if 'FOO' not in md:
-        print(md)
-        return 'fail'
+    assert 'FOO' in md
     ds = None
     ds = gdal.Open('tmp/pdf_metadata.pdf')
-    if ds.GetMetadataItem('FOO') != 'BAR':
-        return 'fail'
+    assert ds.GetMetadataItem('FOO') == 'BAR'
     ds = None
 
     gdal.GetDriverByName('PDF').Delete('tmp/pdf_metadata.pdf')
@@ -2057,19 +1862,15 @@ def pdf_pam_georef():
 
     # Default behaviour should result in no PAM file
     gdaltest.pdf_drv.CreateCopy('tmp/pdf_pam_georef.pdf', src_ds)
-    if os.path.exists('tmp/pdf_pam_georef.pdf.aux.xml'):
-        return 'fail'
+    assert not os.path.exists('tmp/pdf_pam_georef.pdf.aux.xml')
 
     # Now disable internal georeferencing, so georef should go to PAM
     gdaltest.pdf_drv.CreateCopy('tmp/pdf_pam_georef.pdf', src_ds, options=['GEO_ENCODING=NONE'])
-    if not os.path.exists('tmp/pdf_pam_georef.pdf.aux.xml'):
-        return 'fail'
+    assert os.path.exists('tmp/pdf_pam_georef.pdf.aux.xml')
 
     ds = gdal.Open('tmp/pdf_pam_georef.pdf')
-    if ds.GetGeoTransform() != src_ds.GetGeoTransform():
-        return 'fail'
-    if ds.GetProjectionRef() != src_ds.GetProjectionRef():
-        return 'fail'
+    assert ds.GetGeoTransform() == src_ds.GetGeoTransform()
+    assert ds.GetProjectionRef() == src_ds.GetProjectionRef()
     ds = None
 
     gdal.GetDriverByName('PDF').Delete('tmp/pdf_pam_georef.pdf')
diff --git a/autotest/gdrivers/pds.py b/autotest/gdrivers/pds.py
index 460501adfe24..10751b8f0996 100755
--- a/autotest/gdrivers/pds.py
+++ b/autotest/gdrivers/pds.py
@@ -35,6 +35,7 @@
 
 
 import gdaltest
+import pytest
 
 ###############################################################################
 # Read a truncated and modified version of http://download.osgeo.org/gdal/data/pds/mc02.img
@@ -79,17 +80,13 @@ def test_pds_2():
     gdal.SetConfigOption('PDS_LineProjOffset_Shift', None)
 
     ds = gdal.Open('data/fl73n003_truncated.img')
-    if ds.GetRasterBand(1).GetNoDataValue() != 7:
-        return 'fail'
-    if ds.GetRasterBand(1).GetScale() != 0.2:
-        return 'fail'
-    if ds.GetRasterBand(1).GetOffset() != -20.2:
-        return 'fail'
+    assert ds.GetRasterBand(1).GetNoDataValue() == 7
+    assert ds.GetRasterBand(1).GetScale() == 0.2
+    assert ds.GetRasterBand(1).GetOffset() == -20.2
 
     # Per #3939 we would also like to test a dataset with MISSING_CONSTANT.
     ds = gdal.Open('data/fl73n003_alt_truncated.img')
-    if ds.GetRasterBand(1).GetNoDataValue() != 7:
-        return 'fail'
+    assert ds.GetRasterBand(1).GetNoDataValue() == 7
 
     return 'success'
 
@@ -109,8 +106,7 @@ def test_pds_3():
     tst.testOpen(check_gt=gt_expected)
 
     ds = gdal.Open('data/EN0001426030M_truncated.IMG')
-    if ds.GetRasterBand(1).GetNoDataValue() != 0:
-        return 'fail'
+    assert ds.GetRasterBand(1).GetNoDataValue() == 0
 
     gdal.PopErrorHandler()
 
@@ -162,18 +158,14 @@ def test_pds_6():
 
     ds = gdal.Open('data/ESP_013951_1955_RED.LBL')
 
-    if len(ds.GetFileList()) != 2:
-        gdaltest.post_reason('failed to get expected file list.')
-        print(ds.GetFileList())
-        return 'fail'
+    assert len(ds.GetFileList()) == 2, 'failed to get expected file list.'
 
     expected_wkt = 'PROJCS["EQUIRECTANGULAR MARS",GEOGCS["GCS_MARS",DATUM["D_MARS",SPHEROID["MARS_localRadius",3394839.8133163,0]],PRIMEM["Reference_Meridian",0],UNIT["degree",0.0174532925199433]],PROJECTION["Equirectangular"],PARAMETER["latitude_of_origin",0],PARAMETER["central_meridian",180],PARAMETER["standard_parallel_1",15],PARAMETER["false_easting",0],PARAMETER["false_northing",0]]'
     wkt = ds.GetProjection()
     if expected_wkt != wkt:
         print('Got: ', wkt)
         print('Exp: ', expected_wkt)
-        gdaltest.post_reason('did not get expected coordinate system.')
-        return 'fail'
+        pytest.fail('did not get expected coordinate system.')
 
     return 'success'
 
@@ -250,12 +242,9 @@ def test_pds_9():
     ds = gdal.Open('data/PDS_WITH_ZIP_IMG.LBL')
     got_nd = ds.GetRasterBand(1).GetNoDataValue()
     expected_nd = -3.40282265508890445e+38
-    if abs((got_nd - expected_nd) / expected_nd) > 1e-5:
-        print(got_nd)
-        return 'fail'
+    assert abs((got_nd - expected_nd) / expected_nd) <= 1e-5
 
-    if not ds.GetProjectionRef():
-        return 'fail'
+    assert ds.GetProjectionRef()
 
     return 'success'
 
@@ -288,13 +277,10 @@ def test_pds_10():
 
     ds = gdal.Open('/vsimem/pds_10')
 
-    if ds.GetMetadataItem('NOTE') != '((1,2,3))':
-        print(ds.GetMetadataItem('NOTE'))
-        return 'fail'
+    assert ds.GetMetadataItem('NOTE') == '((1,2,3))'
 
-    if ds.GetMetadataItem('PRODUCT_ID') != '({1,2},{3,4})':
-        print(ds.GetMetadataItem('NOTE'))
-        return 'fail'
+    assert ds.GetMetadataItem('PRODUCT_ID') == '({1,2},{3,4})', \
+        ds.GetMetadataItem('NOTE')
 
     gdal.FileFromMemBuffer('/vsimem/pds_10',
                            """PDS_VERSION_ID                       = "PDS3"
diff --git a/autotest/gdrivers/pds4.py b/autotest/gdrivers/pds4.py
index de2bbe53b0a6..5ea1c259cf0b 100755
--- a/autotest/gdrivers/pds4.py
+++ b/autotest/gdrivers/pds4.py
@@ -72,8 +72,7 @@ def validate_xml(filename):
         'VALIDATE=YES',
         'FAIL_IF_VALIDATION_ERROR=YES',
         'CONFIG_FILE=<Configuration><AllowRemoteSchemaDownload>false</AllowRemoteSchemaDownload><SchemaCache><Directory>tmp/cache</Directory></SchemaCache></Configuration>'])
-    if ds is None:
-        return 'fail'
+    assert ds is not None
     return 'success'
 
 ###############################################################################
@@ -209,21 +208,14 @@ def test_pds4_8():
             ds = None
 
         ret = validate_xml(filename)
-        if ret == 'fail':
-            gdaltest.post_reason('validation of file for %s failed' % proj4)
-            return 'fail'
+        assert ret != 'fail', ('validation of file for %s failed' % proj4)
 
         ds = gdal.Open(filename)
         wkt = ds.GetProjectionRef()
         sr = osr.SpatialReference()
         sr.SetFromUserInput(wkt)
         got_proj4 = sr.ExportToProj4().strip()
-        if got_proj4 != proj4:
-            gdaltest.post_reason('got %s, expected %s' % (got_proj4, proj4))
-            print('')
-            print(got_proj4)
-            print(proj4)
-            return 'fail'
+        assert got_proj4 == proj4, ''
 
     # longlat doesn't roundtrip as such
     ds = gdal.GetDriverByName('PDS4').Create(filename, 1, 1)
@@ -239,19 +231,10 @@ def test_pds4_8():
     sr.SetFromUserInput(wkt)
     got_proj4 = sr.ExportToProj4().strip()
     proj4 = '+proj=eqc +lat_ts=0 +lat_0=0 +lon_0=0 +x_0=0 +y_0=0 +a=2439400 +b=2439400 +units=m +no_defs'
-    if got_proj4 != proj4:
-        gdaltest.post_reason('got %s, expected %s' % (got_proj4, proj4))
-        print('')
-        print(got_proj4)
-        print(proj4)
-        return 'fail'
+    assert got_proj4 == proj4, ''
     got_gt = ds.GetGeoTransform()
     expected_gt = (85151.12354629935, 42575.561773149675, 0.0, 2086202.5268843342, 0.0, -85151.12354629935)
-    if max([abs(got_gt[i] - expected_gt[i]) for i in range(6)]) > 1:
-        print('')
-        print(got_gt)
-        print(expected_gt)
-        return 'fail'
+    assert max([abs(got_gt[i] - expected_gt[i]) for i in range(6)]) <= 1, ''
     ds = None
 
     gdal.GetDriverByName('PDS4').Delete(filename)
@@ -265,14 +248,10 @@ def test_pds4_9():
 
     ds = gdal.Open('data/byte_pds4.xml')
     ndv = ds.GetRasterBand(1).GetNoDataValue()
-    if ndv != 74:
-        print(ndv)
-        return 'fail'
+    assert ndv == 74
 
     cs = ds.GetRasterBand(1).GetMaskBand().Checksum()
-    if cs != 4800:
-        print(cs)
-        return 'fail'
+    assert cs == 4800
     ds = None
 
     filename = '/vsimem/out.xml'
@@ -281,20 +260,14 @@ def test_pds4_9():
         gdal.Translate(filename, 'data/byte_pds4.xml', format='PDS4')
 
     ret = validate_xml(filename)
-    if ret == 'fail':
-        gdaltest.post_reason('validation failed')
-        return 'fail'
+    assert ret != 'fail', 'validation failed'
 
     ds = gdal.Open(filename)
     ndv = ds.GetRasterBand(1).GetNoDataValue()
-    if ndv != 74:
-        print(ndv)
-        return 'fail'
+    assert ndv == 74
 
     cs = ds.GetRasterBand(1).GetMaskBand().Checksum()
-    if cs != 4800:
-        print(cs)
-        return 'fail'
+    assert cs == 4800
 
     ds = None
 
@@ -307,25 +280,17 @@ def test_pds4_9():
                            creationOptions=['IMAGE_FORMAT=' + frmt])
 
         ret = validate_xml(filename)
-        if ret == 'fail':
-            gdaltest.post_reason('validation failed')
-            return 'fail'
+        assert ret != 'fail', 'validation failed'
 
         ds = gdal.Open(filename)
         ndv = ds.GetRasterBand(1).GetNoDataValue()
-        if ndv != 75:
-            print(ndv)
-            return 'fail'
+        assert ndv == 75
 
         flag = ds.GetRasterBand(1).GetMaskFlags()
-        if flag != 0:
-            print(flag)
-            return 'fail'
+        assert flag == 0
 
         cs = ds.GetRasterBand(1).GetMaskBand().Checksum()
-        if cs != 4833:
-            print(cs)
-            return 'fail'
+        assert cs == 4833
 
         ds = None
 
@@ -337,16 +302,11 @@ def test_pds4_9():
                                             'IMAGE_FORMAT=' + frmt])
 
         ret = validate_xml(filename)
-        if ret == 'fail':
-            gdaltest.post_reason('validation failed')
-            return 'fail'
+        assert ret != 'fail', 'validation failed'
 
         ds = gdal.Open(filename)
         ndv = ds.GetRasterBand(1).GetNoDataValue()
-        if ndv != 74:
-            print(frmt)
-            print(ndv)
-            return 'fail'
+        assert ndv == 74, frmt
 
         ds = None
 
@@ -359,10 +319,7 @@ def test_pds4_9():
 
         ds = gdal.Open(filename)
         cs = ds.GetRasterBand(1).Checksum()
-        if cs != 1:
-            print(frmt)
-            print(cs)
-            return 'fail'
+        assert cs == 1, frmt
         ds = None
 
         # Test setting nodata and then explicit Fill()
@@ -375,10 +332,7 @@ def test_pds4_9():
 
         ds = gdal.Open(filename)
         cs = ds.GetRasterBand(1).Checksum()
-        if cs != 1:
-            print(frmt)
-            print(cs)
-            return 'fail'
+        assert cs == 1, frmt
         ds = None
 
     template = '/vsimem/template.xml'
@@ -437,15 +391,11 @@ def test_pds4_9():
 
     ds = gdal.Open(filename)
     ndv = ds.GetRasterBand(1).GetNoDataValue()
-    if ndv != 10:
-        print(ndv)
-        return 'fail'
+    assert ndv == 10
     ds = None
 
     ret = validate_xml(filename)
-    if ret == 'fail':
-        gdaltest.post_reason('validation failed')
-        return 'fail'
+    assert ret != 'fail', 'validation failed'
 
     # Special_Constants with just saturated_constant
     gdal.FileFromMemBuffer(template, """
@@ -503,15 +453,11 @@ def test_pds4_9():
 
     ds = gdal.Open(filename)
     ndv = ds.GetRasterBand(1).GetNoDataValue()
-    if ndv != 10:
-        print(ndv)
-        return 'fail'
+    assert ndv == 10
     ds = None
 
     ret = validate_xml(filename)
-    if ret == 'fail':
-        gdaltest.post_reason('validation failed')
-        return 'fail'
+    assert ret != 'fail', 'validation failed'
 
     gdal.GetDriverByName('PDS4').Delete(filename)
     gdal.Unlink(template)
@@ -537,13 +483,9 @@ def test_pds4_10():
 
         ds = gdal.Open(filename2)
         scale = ds.GetRasterBand(1).GetScale()
-        if scale != 2:
-            print(scale)
-            return 'fail'
+        assert scale == 2
         offset = ds.GetRasterBand(1).GetOffset()
-        if offset != 3:
-            print(offset)
-            return 'fail'
+        assert offset == 3
         ds = None
 
         gdal.GetDriverByName('PDS4').Delete(filename)
@@ -574,19 +516,11 @@ def test_pds4_11():
 
         with gdaltest.config_option('PDS4_FORCE_MASK', 'YES'):
             ds = gdal.Open(filename)
-        if ds.GetRasterBand(1).DataType != dt:
-            print(ds.GetRasterBand(1).DataType)
-            print(dt)
-            return 'fail'
+        assert ds.GetRasterBand(1).DataType == dt
         got_data = ds.GetRasterBand(1).ReadRaster(0, 0, 1, 1)
-        if got_data != data:
-            print(dt)
-            return 'fail'
+        assert got_data == data, dt
         cs = ds.GetRasterBand(1).GetMaskBand().Checksum()
-        if cs != 3:
-            print(dt)
-            print(cs)
-            return 'fail'
+        assert cs == 3, dt
         ds = None
 
     gdal.GetDriverByName('PDS4').Delete(filename)
@@ -622,30 +556,14 @@ def test_pds4_12():
     if f:
         data = gdal.VSIFReadL(1, 10000, f).decode('ascii')
         gdal.VSIFCloseL(f)
-    if data.find('<logical_identifier>logical_identifier</logical_identifier>') < 0:
-        print(data)
-        return 'fail'
-    if data.find('<cart:west_bounding_coordinate unit="deg">1</cart:west_bounding_coordinate>') < 0:
-        print(data)
-        return 'fail'
-    if data.find('<cart:east_bounding_coordinate unit="deg">3</cart:east_bounding_coordinate>') < 0:
-        print(data)
-        return 'fail'
-    if data.find('<cart:north_bounding_coordinate unit="deg">4</cart:north_bounding_coordinate>') < 0:
-        print(data)
-        return 'fail'
-    if data.find('<cart:south_bounding_coordinate unit="deg">2</cart:south_bounding_coordinate>') < 0:
-        print(data)
-        return 'fail'
-    if data.find('<cart:latitude_type>planetographic</cart:latitude_type>') < 0:
-        print(data)
-        return 'fail'
-    if data.find('<cart:longitude_direction>Positive West</cart:longitude_direction>') < 0:
-        print(data)
-        return 'fail'
-    if data.find('<file_name>myimage.raw</file_name>') < 0:
-        print(data)
-        return 'fail'
+    assert data.find('<logical_identifier>logical_identifier</logical_identifier>') >= 0
+    assert data.find('<cart:west_bounding_coordinate unit="deg">1</cart:west_bounding_coordinate>') >= 0
+    assert data.find('<cart:east_bounding_coordinate unit="deg">3</cart:east_bounding_coordinate>') >= 0
+    assert data.find('<cart:north_bounding_coordinate unit="deg">4</cart:north_bounding_coordinate>') >= 0
+    assert data.find('<cart:south_bounding_coordinate unit="deg">2</cart:south_bounding_coordinate>') >= 0
+    assert data.find('<cart:latitude_type>planetographic</cart:latitude_type>') >= 0
+    assert data.find('<cart:longitude_direction>Positive West</cart:longitude_direction>') >= 0
+    assert data.find('<file_name>myimage.raw</file_name>') >= 0
 
     gdal.GetDriverByName('PDS4').Delete(filename)
 
@@ -665,58 +583,44 @@ def test_pds4_13():
                        'Image file byte_pds4.img, array second_sds'),
                       ('PDS4:data/byte_pds4_multi_sds.xml:2:1',
                        'Image file byte_pds4.img, array third_sds')]
-    if subds != expected_subds:
-        print(subds)
-        return 'fail'
+    assert subds == expected_subds
 
     ds = gdal.Open('PDS4:data/byte_pds4_multi_sds.xml:1:1')
     cs = ds.GetRasterBand(1).Checksum()
-    if cs != 2315:
-        print(cs)
-        return 'fail'
+    assert cs == 2315
 
     ds = gdal.Open('PDS4:data/byte_pds4_multi_sds.xml:1:2')
     cs = ds.GetRasterBand(1).Checksum()
-    if cs != 2302:
-        print(cs)
-        return 'fail'
+    assert cs == 2302
 
     ds = gdal.Open('PDS4:data/byte_pds4_multi_sds.xml:2:1')
     cs = ds.GetRasterBand(1).Checksum()
-    if cs != 3496:
-        print(cs)
-        return 'fail'
+    assert cs == 3496
 
     ds = gdal.Open(os.path.join(os.getcwd(), 'data', 'byte_pds4_multi_sds.xml'))
     subds_name = ds.GetSubDatasets()[0][0]
     ds = gdal.Open(subds_name)
-    if ds is None:
-        return 'fail'
+    assert ds is not None
 
     with gdaltest.error_handler():
         ds = gdal.Open('PDS4:c:\do_not\exist.xml:1:1')
-    if ds is not None:
-        return 'fail'
+    assert ds is None
 
     with gdaltest.error_handler():
         ds = gdal.Open('PDS4:i_do_not_exist.xml')
-    if ds is not None:
-        return 'fail'
+    assert ds is None
 
     with gdaltest.error_handler():
         ds = gdal.Open('PDS4:i_do_not_exist.xml:1:1')
-    if ds is not None:
-        return 'fail'
+    assert ds is None
 
     with gdaltest.error_handler():
         ds = gdal.Open('PDS4:data/byte_pds4_multi_sds.xml:3:1')
-    if ds is not None:
-        return 'fail'
+    assert ds is None
 
     with gdaltest.error_handler():
         ds = gdal.Open('PDS4:data/byte_pds4_multi_sds.xml:1:3')
-    if ds is not None:
-        return 'fail'
+    assert ds is None
 
     return 'success'
 
@@ -731,8 +635,7 @@ def test_pds4_14():
     gdal.FileFromMemBuffer(filename, "Product_Observational http://pds.nasa.gov/pds4/pds/v1")
     with gdaltest.error_handler():
         ds = gdal.Open(filename)
-    if ds is not None:
-        return 'fail'
+    assert ds is None
 
     gdal.FileFromMemBuffer(filename, """
 <Product_Observational xmlns="http://pds.nasa.gov/pds4/pds/v1">
@@ -804,8 +707,7 @@ def test_pds4_14():
 </Product_Observational>""")
     with gdaltest.error_handler():
         ds = gdal.Open(filename)
-    if ds is not None:
-        return 'fail'
+    assert ds is None
 
     gdal.FileFromMemBuffer(filename, """
 <Product_Observational xmlns="http://pds.nasa.gov/pds4/pds/v1">
@@ -839,8 +741,7 @@ def test_pds4_14():
 </Product_Observational>""")
     with gdaltest.error_handler():
         ds = gdal.Open(filename)
-    if ds is not None:
-        return 'fail'
+    assert ds is None
 
     gdal.FileFromMemBuffer(filename, """
 <Product_Observational xmlns="http://pds.nasa.gov/pds4/pds/v1">
@@ -869,8 +770,7 @@ def test_pds4_14():
 </Product_Observational>""")
     with gdaltest.error_handler():
         ds = gdal.Open(filename)
-    if ds is not None:
-        return 'fail'
+    assert ds is None
 
     gdal.FileFromMemBuffer(filename, """
 <Product_Observational xmlns="http://pds.nasa.gov/pds4/pds/v1">
@@ -899,8 +799,7 @@ def test_pds4_14():
 </Product_Observational>""")
     with gdaltest.error_handler():
         ds = gdal.Open(filename)
-    if ds is not None:
-        return 'fail'
+    assert ds is None
 
     gdal.FileFromMemBuffer(filename, """
 <Product_Observational xmlns="http://pds.nasa.gov/pds4/pds/v1">
@@ -929,8 +828,7 @@ def test_pds4_14():
 </Product_Observational>""")
     with gdaltest.error_handler():
         ds = gdal.Open(filename)
-    if ds is not None:
-        return 'fail'
+    assert ds is None
 
     gdal.Unlink(filename)
 
@@ -938,31 +836,27 @@ def test_pds4_14():
     with gdaltest.error_handler():
         ds = gdal.GetDriverByName('PDS4').Create('/vsimem/out.xml', 1, 1,
                                                  options=['INTERLEAVE=INVALID'])
-    if ds is not None:
-        return 'fail'
+    assert ds is None
 
     # INTERLEAVE=BIL not supported for GeoTIFF in PDS4
     with gdaltest.error_handler():
         ds = gdal.GetDriverByName('PDS4').Create('/vsimem/out.xml', 1, 1,
                                                  options=['INTERLEAVE=BIL',
                                                           'IMAGE_FORMAT=GEOTIFF'])
-    if ds is not None:
-        return 'fail'
+    assert ds is None
 
     # Cannot create GeoTIFF file
     with gdaltest.error_handler():
         ds = gdal.GetDriverByName('PDS4').Create('/i/do_not/exist.xml', 1, 1,
                                                  options=['IMAGE_FORMAT=GEOTIFF'])
-    if ds is not None:
-        return 'fail'
+    assert ds is None
 
     gdal.Translate('/vsimem/test.tif', 'data/byte.tif')
     # Output file has same name as input file
     with gdaltest.error_handler():
         ds = gdal.Translate('/vsimem/test.xml', '/vsimem/test.tif',
                             format='PDS4', creationOptions=['IMAGE_FORMAT=GEOTIFF'])
-    if ds is not None:
-        return 'fail'
+    assert ds is None
     gdal.Unlink('/vsimem/test.tif')
 
     template = '/vsimem/template.xml'
@@ -974,9 +868,7 @@ def test_pds4_14():
     gdal.ErrorReset()
     with gdaltest.error_handler():
         ds = None
-    if gdal.GetLastErrorMsg() != 'Cannot find Product_Observational element in template':
-        print(gdal.GetLastErrorMsg())
-        return 'fail'
+    assert gdal.GetLastErrorMsg() == 'Cannot find Product_Observational element in template'
 
     # Missing Target_Identification
     gdal.FileFromMemBuffer(template, """
@@ -993,9 +885,7 @@ def test_pds4_14():
     gdal.ErrorReset()
     with gdaltest.error_handler():
         ds = None
-    if gdal.GetLastErrorMsg() != 'Cannot find Target_Identification element in template':
-        print(gdal.GetLastErrorMsg())
-        return 'fail'
+    assert gdal.GetLastErrorMsg() == 'Cannot find Target_Identification element in template'
 
     # Missing Observation_Area
     gdal.FileFromMemBuffer(template, """
@@ -1008,9 +898,7 @@ def test_pds4_14():
     gdal.ErrorReset()
     with gdaltest.error_handler():
         ds = None
-    if gdal.GetLastErrorMsg() != 'Cannot find Observation_Area in template':
-        print(gdal.GetLastErrorMsg())
-        return 'fail'
+    assert gdal.GetLastErrorMsg() == 'Cannot find Observation_Area in template'
 
     # Unexpected content found after Observation_Area in template
     gdal.FileFromMemBuffer(template, """
@@ -1026,9 +914,7 @@ def test_pds4_14():
     gdal.ErrorReset()
     with gdaltest.error_handler():
         ds = None
-    if gdal.GetLastErrorMsg() != 'Unexpected content found after Observation_Area in template':
-        print(gdal.GetLastErrorMsg())
-        return 'fail'
+    assert gdal.GetLastErrorMsg() == 'Unexpected content found after Observation_Area in template'
 
     gdal.Unlink(template)
     gdal.Unlink(filename)
@@ -1048,17 +934,13 @@ def test_pds4_15():
                                             options=['TEMPLATE=data/byte_pds4.xml'])
 
     ret = validate_xml(filename)
-    if ret == 'fail':
-        gdaltest.post_reason('validation failed')
-        return 'fail'
+    assert ret != 'fail', 'validation failed'
 
     f = gdal.VSIFOpenL(filename, 'rb')
     if f:
         data = gdal.VSIFReadL(1, 10000, f).decode('ascii')
         gdal.VSIFCloseL(f)
-    if data.find('<cart:Cartography>') >= 0:
-        print(data)
-        return 'fail'
+    assert data.find('<cart:Cartography>') < 0
 
     gdal.GetDriverByName('PDS4').Delete(filename)
 
@@ -1126,23 +1008,15 @@ def test_pds4_16():
         ds = None
 
     ret = validate_xml(filename)
-    if ret == 'fail':
-        gdaltest.post_reason('validation failed')
-        return 'fail'
+    assert ret != 'fail', 'validation failed'
 
     f = gdal.VSIFOpenL(filename, 'rb')
     if f:
         data = gdal.VSIFReadL(1, 10000, f).decode('ascii')
         gdal.VSIFCloseL(f)
-    if data.find('http://pds.nasa.gov/pds4/pds/v1 https://pds.nasa.gov/pds4/pds/v1/PDS4_PDS_1800.xsd http://pds.nasa.gov/pds4/cart/v1 https://pds.nasa.gov/pds4/cart/v1/PDS4_CART_1700.xsd"') < 0:
-        print(data)
-        return 'fail'
-    if data.find('xmlns:cart="http://pds.nasa.gov/pds4/cart/v1"') < 0:
-        print(data)
-        return 'fail'
-    if data.find('<cart:Cartography>') < 0:
-        print(data)
-        return 'fail'
+    assert data.find('http://pds.nasa.gov/pds4/pds/v1 https://pds.nasa.gov/pds4/pds/v1/PDS4_PDS_1800.xsd http://pds.nasa.gov/pds4/cart/v1 https://pds.nasa.gov/pds4/cart/v1/PDS4_CART_1700.xsd"') >= 0
+    assert data.find('xmlns:cart="http://pds.nasa.gov/pds4/cart/v1"') >= 0
+    assert data.find('<cart:Cartography>') >= 0
 
     gdal.GetDriverByName('PDS4').Delete(filename)
     gdal.Unlink(template)
@@ -1161,45 +1035,35 @@ def test_pds4_17():
         gdal.GetDriverByName('PDS4').Create(filename, 1, 1, 1, options=['ARRAY_TYPE=Array_2D'])
 
     ret = validate_xml(filename)
-    if ret == 'fail':
-        gdaltest.post_reason('validation failed')
-        return 'fail'
+    assert ret != 'fail', 'validation failed'
 
     f = gdal.VSIFOpenL(filename, 'rb')
     if f:
         data = gdal.VSIFReadL(1, 10000, f).decode('ascii')
         gdal.VSIFCloseL(f)
-    if data.find('<Array_2D>') < 0 or data.find('<axes>2</axes>') < 0 or \
-       data.find('<axis_name>Band</axis_name>') >= 0 or \
-       data.find('<sequence_number>3</sequence_number>') >= 0:
-        print(data)
-        return 'fail'
+    assert (data.find('<Array_2D>') >= 0 and data.find('<axes>2</axes>') >= 0 and \
+       data.find('<axis_name>Band</axis_name>') < 0 and \
+       data.find('<sequence_number>3</sequence_number>') < 0)
 
     gdal.GetDriverByName('PDS4').Delete(filename)
 
     # Test multi-band creation with Array_2D
     with gdaltest.error_handler():
         ds = gdal.GetDriverByName('PDS4').Create(filename, 1, 1, 2, options=['ARRAY_TYPE=Array_2D'])
-    if ds is not None:
-        gdaltest.post_reason('expected failure')
-        return 'fail'
+    assert ds is None, 'expected failure'
 
     # Test multi-band creation with Array_3D_Spectrum
     with gdaltest.error_handler():
         gdal.GetDriverByName('PDS4').Create(filename, 1, 1, 2, options=['ARRAY_TYPE=Array_3D_Spectrum'])
 
     ret = validate_xml(filename)
-    if ret == 'fail':
-        gdaltest.post_reason('validation failed')
-        return 'fail'
+    assert ret != 'fail', 'validation failed'
 
     f = gdal.VSIFOpenL(filename, 'rb')
     if f:
         data = gdal.VSIFReadL(1, 10000, f).decode('ascii')
         gdal.VSIFCloseL(f)
-    if data.find('<Array_3D_Spectrum>') < 0 or data.find('<axes>3</axes>') < 0:
-        print(data)
-        return 'fail'
+    assert data.find('<Array_3D_Spectrum>') >= 0 and data.find('<axes>3</axes>') >= 0
 
     gdal.GetDriverByName('PDS4').Delete(filename)
 
@@ -1225,11 +1089,9 @@ def test_pds4_18():
     if f:
         data = gdal.VSIFReadL(1, 10000, f).decode('ascii')
         gdal.VSIFCloseL(f)
-    if data.find('<cart:semi_major_radius unit="m">1</cart:semi_major_radius>') < 0 or \
-       data.find('<cart:semi_minor_radius unit="m">1</cart:semi_minor_radius>') < 0 or \
-       data.find('<cart:polar_radius unit="m">2</cart:polar_radius>') < 0:
-        print(data)
-        return 'fail'
+    assert (data.find('<cart:semi_major_radius unit="m">1</cart:semi_major_radius>') >= 0 and \
+       data.find('<cart:semi_minor_radius unit="m">1</cart:semi_minor_radius>') >= 0 and \
+       data.find('<cart:polar_radius unit="m">2</cart:polar_radius>') >= 0)
 
     gdal.GetDriverByName('PDS4').Delete(filename)
 
diff --git a/autotest/gdrivers/plmosaic.py b/autotest/gdrivers/plmosaic.py
index 1c654457fa6a..5d56288d793b 100755
--- a/autotest/gdrivers/plmosaic.py
+++ b/autotest/gdrivers/plmosaic.py
@@ -65,8 +65,7 @@ def test_plmosaic_2():
     ds = gdal.OpenEx('PLMosaic:', gdal.OF_RASTER)
     gdal.SetConfigOption('PL_URL', None)
     gdal.PopErrorHandler()
-    if ds is not None:
-        return 'fail'
+    assert ds is None
 
     return 'success'
 
@@ -84,8 +83,7 @@ def test_plmosaic_3():
     ds = gdal.OpenEx('PLMosaic:', gdal.OF_RASTER, open_options=['API_KEY=foo'])
     gdal.SetConfigOption('PL_URL', None)
     gdal.PopErrorHandler()
-    if ds is not None:
-        return 'fail'
+    assert ds is None
 
     return 'success'
 
@@ -105,8 +103,7 @@ def test_plmosaic_4():
     ds = gdal.OpenEx('PLMosaic:', gdal.OF_RASTER, open_options=['API_KEY=foo'])
     gdal.SetConfigOption('PL_URL', None)
     gdal.PopErrorHandler()
-    if ds is not None:
-        return 'fail'
+    assert ds is None
 
     return 'success'
 
@@ -126,8 +123,7 @@ def test_plmosaic_5():
     ds = gdal.OpenEx('PLMosaic:', gdal.OF_RASTER, open_options=['API_KEY=foo'])
     gdal.SetConfigOption('PL_URL', None)
     gdal.PopErrorHandler()
-    if ds is not None:
-        return 'fail'
+    assert ds is None
 
     return 'success'
 
@@ -147,8 +143,7 @@ def test_plmosaic_6():
     ds = gdal.OpenEx('PLMosaic:', gdal.OF_RASTER, open_options=['API_KEY=foo'])
     gdal.SetConfigOption('PL_URL', None)
     gdal.PopErrorHandler()
-    if ds is not None:
-        return 'fail'
+    assert ds is None
 
     return 'success'
 
@@ -168,8 +163,7 @@ def test_plmosaic_7():
     gdal.SetConfigOption('PL_URL', '/vsimem/root')
     ds = gdal.OpenEx('PLMosaic:', gdal.OF_RASTER, open_options=['API_KEY=foo'])
     gdal.SetConfigOption('PL_URL', None)
-    if ds is not None:
-        return 'fail'
+    assert ds is None
     ds = None
 
     return 'success'
@@ -224,9 +218,7 @@ def test_plmosaic_8():
     gdal.SetConfigOption('PL_URL', '/vsimem/root')
     ds = gdal.OpenEx('PLMosaic:', gdal.OF_RASTER, open_options=['API_KEY=foo'])
     gdal.SetConfigOption('PL_URL', None)
-    if ds.GetMetadata("SUBDATASETS") != {'SUBDATASET_2_NAME': 'PLMOSAIC:mosaic=another_mosaic_name', 'SUBDATASET_2_DESC': 'Mosaic another_mosaic_name', 'SUBDATASET_1_NAME': 'PLMOSAIC:mosaic=my_mosaic_name', 'SUBDATASET_1_DESC': 'Mosaic my_mosaic_name'}:
-        print(ds.GetMetadata("SUBDATASETS"))
-        return 'fail'
+    assert ds.GetMetadata("SUBDATASETS") == {'SUBDATASET_2_NAME': 'PLMOSAIC:mosaic=another_mosaic_name', 'SUBDATASET_2_DESC': 'Mosaic another_mosaic_name', 'SUBDATASET_1_NAME': 'PLMOSAIC:mosaic=my_mosaic_name', 'SUBDATASET_1_DESC': 'Mosaic my_mosaic_name'}
     ds = None
 
     return 'success'
@@ -245,9 +237,7 @@ def test_plmosaic_9():
     ds = gdal.OpenEx('PLMosaic:', gdal.OF_RASTER, open_options=['API_KEY=foo', 'MOSAIC=does_not_exist'])
     gdal.SetConfigOption('PL_URL', None)
     gdal.PopErrorHandler()
-    if ds is not None or gdal.GetLastErrorMsg().find('/vsimem/root/?name__is=does_not_exist') < 0:
-        print(gdal.GetLastErrorMsg())
-        return 'fail'
+    assert ds is None and gdal.GetLastErrorMsg().find('/vsimem/root/?name__is=does_not_exist') >= 0
 
     return 'success'
 
@@ -266,9 +256,7 @@ def test_plmosaic_9bis():
     ds = gdal.OpenEx('PLMosaic:', gdal.OF_RASTER, open_options=['API_KEY=foo', 'MOSAIC=my_mosaic'])
     gdal.PopErrorHandler()
     gdal.SetConfigOption('PL_URL', None)
-    if ds is not None or gdal.GetLastErrorMsg().find('JSON parsing error') < 0:
-        print(gdal.GetLastErrorMsg())
-        return 'fail'
+    assert ds is None and gdal.GetLastErrorMsg().find('JSON parsing error') >= 0
 
     return 'success'
 
@@ -287,9 +275,7 @@ def test_plmosaic_9ter():
     ds = gdal.OpenEx('PLMosaic:', gdal.OF_RASTER, open_options=['API_KEY=foo', 'MOSAIC=my_mosaic'])
     gdal.PopErrorHandler()
     gdal.SetConfigOption('PL_URL', None)
-    if ds is not None or gdal.GetLastErrorMsg().find('No mosaic my_mosaic') < 0:
-        print(gdal.GetLastErrorMsg())
-        return 'fail'
+    assert ds is None and gdal.GetLastErrorMsg().find('No mosaic my_mosaic') >= 0
 
     return 'success'
 
@@ -313,9 +299,7 @@ def test_plmosaic_10():
     ds = gdal.OpenEx('PLMosaic:', gdal.OF_RASTER, open_options=['API_KEY=foo', 'MOSAIC=my_mosaic'])
     gdal.PopErrorHandler()
     gdal.SetConfigOption('PL_URL', None)
-    if ds is not None or gdal.GetLastErrorMsg().find('Missing required parameter') < 0:
-        print(gdal.GetLastErrorMsg())
-        return 'fail'
+    assert ds is None and gdal.GetLastErrorMsg().find('Missing required parameter') >= 0
 
     return 'success'
 
@@ -345,9 +329,7 @@ def test_plmosaic_11():
     ds = gdal.OpenEx('PLMosaic:', gdal.OF_RASTER, open_options=['API_KEY=foo', 'MOSAIC=my_mosaic'])
     gdal.PopErrorHandler()
     gdal.SetConfigOption('PL_URL', None)
-    if ds is not None or gdal.GetLastErrorMsg().find('Unsupported coordinate_system') < 0:
-        print(gdal.GetLastErrorMsg())
-        return 'fail'
+    assert ds is None and gdal.GetLastErrorMsg().find('Unsupported coordinate_system') >= 0
 
     return 'success'
 
@@ -377,9 +359,7 @@ def test_plmosaic_12():
     ds = gdal.OpenEx('PLMosaic:', gdal.OF_RASTER, open_options=['API_KEY=foo', 'MOSAIC=my_mosaic'])
     gdal.PopErrorHandler()
     gdal.SetConfigOption('PL_URL', None)
-    if ds is not None or gdal.GetLastErrorMsg().find('Unsupported data_type') < 0:
-        print(gdal.GetLastErrorMsg())
-        return 'fail'
+    assert ds is None and gdal.GetLastErrorMsg().find('Unsupported data_type') >= 0
 
     return 'success'
 
@@ -409,9 +389,7 @@ def test_plmosaic_13():
     ds = gdal.OpenEx('PLMosaic:', gdal.OF_RASTER, open_options=['API_KEY=foo', 'MOSAIC=my_mosaic'])
     gdal.PopErrorHandler()
     gdal.SetConfigOption('PL_URL', None)
-    if ds is not None or gdal.GetLastErrorMsg().find('Unsupported resolution') < 0:
-        print(gdal.GetLastErrorMsg())
-        return 'fail'
+    assert ds is None and gdal.GetLastErrorMsg().find('Unsupported resolution') >= 0
 
     return 'success'
 
@@ -441,9 +419,7 @@ def test_plmosaic_14():
     ds = gdal.OpenEx('PLMosaic:', gdal.OF_RASTER, open_options=['API_KEY=foo', 'MOSAIC=my_mosaic'])
     gdal.PopErrorHandler()
     gdal.SetConfigOption('PL_URL', None)
-    if ds is not None or gdal.GetLastErrorMsg().find('Unsupported quad_size') < 0:
-        print(gdal.GetLastErrorMsg())
-        return 'fail'
+    assert ds is None and gdal.GetLastErrorMsg().find('Unsupported quad_size') >= 0
 
     return 'success'
 
@@ -479,14 +455,9 @@ def test_plmosaic_15():
     ds = gdal.OpenEx('PLMosaic:', gdal.OF_RASTER, open_options=['API_KEY=foo', 'MOSAIC=my_mosaic', 'CACHE_PATH=tmp'])
     gdal.PopErrorHandler()
     gdal.SetConfigOption('PL_URL', None)
-    if gdal.GetLastErrorMsg().find('Invalid _links.tiles') < 0:
-        print(gdal.GetLastErrorMsg())
-        return 'fail'
-    if ds.GetRasterBand(1).GetOverviewCount() != 0:
-        print(ds.GetRasterBand(1).GetOverviewCount())
-        return 'fail'
-    if ds.GetRasterBand(1).GetOverview(0) is not None:
-        return 'fail'
+    assert gdal.GetLastErrorMsg().find('Invalid _links.tiles') >= 0
+    assert ds.GetRasterBand(1).GetOverviewCount() == 0
+    assert ds.GetRasterBand(1).GetOverview(0) is None
     ds = None
 
     return 'success'
@@ -544,19 +515,13 @@ def test_plmosaic_16():
     ds = gdal.OpenEx('PLMosaic:api_key=foo,unsupported_option=val', gdal.OF_RASTER)
     gdal.PopErrorHandler()
     gdal.SetConfigOption('PL_URL', None)
-    if ds is not None or gdal.GetLastErrorMsg().find('Unsupported option unsupported_option') < 0:
-        print(gdal.GetLastErrorMsg())
-        return 'fail'
+    assert ds is None and gdal.GetLastErrorMsg().find('Unsupported option unsupported_option') >= 0
 
     gdal.SetConfigOption('PL_URL', '/vsimem/root')
     ds = gdal.OpenEx('PLMosaic:', gdal.OF_RASTER, open_options=['API_KEY=foo'])
     gdal.SetConfigOption('PL_URL', None)
-    if ds.GetMetadata("SUBDATASETS") != {}:
-        print(ds.GetMetadata("SUBDATASETS"))
-        return 'fail'
-    if ds.GetMetadata() != {'LAST_ACQUIRED': 'last_date', 'NAME': 'my_mosaic', 'FIRST_ACQUIRED': 'first_date'}:
-        print(ds.GetMetadata())
-        return 'fail'
+    assert ds.GetMetadata("SUBDATASETS") == {}
+    assert ds.GetMetadata() == {'LAST_ACQUIRED': 'last_date', 'NAME': 'my_mosaic', 'FIRST_ACQUIRED': 'first_date'}
     ds = None
 
     return 'success'
@@ -573,39 +538,21 @@ def test_plmosaic_17():
     gdal.SetConfigOption('PL_URL', '/vsimem/root')
     ds = gdal.OpenEx('PLMosaic:', gdal.OF_RASTER, open_options=['API_KEY=foo', 'MOSAIC=my_mosaic', 'CACHE_PATH=tmp'])
     gdal.SetConfigOption('PL_URL', None)
-    if ds is None:
-        return 'fail'
-    if ds.GetMetadata() != {'LAST_ACQUIRED': 'last_date', 'NAME': 'my_mosaic', 'FIRST_ACQUIRED': 'first_date'}:
-        print(ds.GetMetadata())
-        return 'fail'
-    if ds.GetProjectionRef().find('3857') < 0:
-        print(ds.GetProjectionRef())
-        return 'fail'
-    if ds.RasterXSize != 8388608:
-        print(ds.RasterXSize)
-        return 'fail'
-    if ds.RasterYSize != 8388608:
-        print(ds.RasterYSize)
-        return 'fail'
+    assert ds is not None
+    assert ds.GetMetadata() == {'LAST_ACQUIRED': 'last_date', 'NAME': 'my_mosaic', 'FIRST_ACQUIRED': 'first_date'}
+    assert ds.GetProjectionRef().find('3857') >= 0
+    assert ds.RasterXSize == 8388608
+    assert ds.RasterYSize == 8388608
     got_gt = ds.GetGeoTransform()
     expected_gt = (-20037508.34, 4.7773142671600004, 0.0, 20037508.34, 0.0, -4.7773142671600004)
     for i in range(6):
-        if abs(got_gt[i] - expected_gt[i]) > 1e-8:
-            print(ds.GetGeoTransform())
-            return 'fail'
-    if ds.GetMetadataItem('INTERLEAVE', 'IMAGE_STRUCTURE') != 'PIXEL':
-        print(ds.GetMetadata('IMAGE_STRUCTURE'))
-        print(ds.GetMetadataItem('INTERLEAVE', 'IMAGE_STRUCTURE'))
-        return 'fail'
-    if ds.GetRasterBand(1).GetOverviewCount() != 15:
-        print(ds.GetRasterBand(1).GetOverviewCount())
-        return 'fail'
-    if ds.GetRasterBand(1).GetOverview(-1) is not None:
-        return 'fail'
-    if ds.GetRasterBand(1).GetOverview(ds.GetRasterBand(1).GetOverviewCount()) is not None:
-        return 'fail'
-    if ds.GetRasterBand(1).GetOverview(0) is None:
-        return 'fail'
+        assert abs(got_gt[i] - expected_gt[i]) <= 1e-8, ds.GetGeoTransform()
+    assert ds.GetMetadataItem('INTERLEAVE', 'IMAGE_STRUCTURE') == 'PIXEL', \
+        ds.GetMetadata('IMAGE_STRUCTURE')
+    assert ds.GetRasterBand(1).GetOverviewCount() == 15
+    assert ds.GetRasterBand(1).GetOverview(-1) is None
+    assert ds.GetRasterBand(1).GetOverview(ds.GetRasterBand(1).GetOverviewCount()) is None
+    assert ds.GetRasterBand(1).GetOverview(0) is not None
 
     try:
         shutil.rmtree('tmp/plmosaic_cache')
@@ -615,18 +562,15 @@ def test_plmosaic_17():
     for i in range(12):
         # Read at one nonexistent position.
         ds.GetRasterBand(1).ReadRaster(4096 * i, 0, 1, 1)
-        if gdal.GetLastErrorMsg() != '':
-            return 'fail'
+        assert gdal.GetLastErrorMsg() == ''
     for i in range(11, -1, -1):
         # Again in the same quad, but in different block, to test cache
         ds.GetRasterBand(1).ReadRaster(4096 * i + 256, 0, 1, 1)
-        if gdal.GetLastErrorMsg() != '':
-            return 'fail'
+        assert gdal.GetLastErrorMsg() == ''
     for i in range(12):
         # Again in the same quad, but in different block, to test cache
         ds.GetRasterBand(1).ReadRaster(4096 * i + 512, 256, 1, 1)
-        if gdal.GetLastErrorMsg() != '':
-            return 'fail'
+        assert gdal.GetLastErrorMsg() == ''
 
     ds.FlushCache()
 
@@ -659,9 +603,7 @@ def test_plmosaic_17():
 
     val = ds.GetRasterBand(1).ReadRaster(0, 0, 1, 1)
     val = struct.unpack('B', val)[0]
-    if val != 255:
-        print(val)
-        return 'fail'
+    assert val == 255
 
     os.stat('tmp/plmosaic_cache/my_mosaic/my_mosaic_0-2047.tif')
 
@@ -675,9 +617,7 @@ def test_plmosaic_17():
     tmp_ds = None
     val = ds.GetRasterBand(1).ReadRaster(0, 0, 1, 1)
     val = struct.unpack('B', val)[0]
-    if val != 255:
-        print(val)
-        return 'fail'
+    assert val == 255
 
     ds = None
 
@@ -690,9 +630,7 @@ def test_plmosaic_17():
 
     val = ds.GetRasterBand(1).ReadRaster(0, 0, 1, 1)
     val = struct.unpack('B', val)[0]
-    if val != 255:
-        print(val)
-        return 'fail'
+    assert val == 255
     ds = None
 
     # Read again from file cache but the metatile has changed in between
@@ -707,9 +645,7 @@ def test_plmosaic_17():
 
     val = ds.ReadRaster(0, 0, 1, 1)
     val = struct.unpack('B' * 4, val)
-    if val != (254, 0, 0, 0):
-        print(val)
-        return 'fail'
+    assert val == (254, 0, 0, 0)
 
     return 'success'
 
@@ -729,15 +665,11 @@ def test_plmosaic_18():
     gdal.SetConfigOption('PL_URL', None)
 
     ret = ds.GetRasterBand(1).GetMetadataItem('Pixel_0_0', 'LocationInfo')
-    if ret != """<LocationInfo />
-""":
-        print(ret)
-        return 'fail'
+    assert ret == """<LocationInfo />
+"""
     old_ret = ret
     ret = ds.GetRasterBand(1).GetMetadataItem('Pixel_0_0', 'LocationInfo')
-    if ret != old_ret:
-        print(ret)
-        return 'fail'
+    assert ret == old_ret
 
     gdal.FileFromMemBuffer('/vsimem/root/my_mosaic_id/quads/0-2047/items', """{
     "items": [
@@ -748,16 +680,14 @@ def test_plmosaic_18():
     ds.FlushCache()
 
     ret = ds.GetRasterBand(1).GetMetadataItem('Pixel_0_0', 'LocationInfo')
-    if ret != """<LocationInfo>
+    assert ret == """<LocationInfo>
   <Scenes>
     <Scene>
       <link>foo</link>
     </Scene>
   </Scenes>
 </LocationInfo>
-""":
-        print(ret)
-        return 'fail'
+"""
     ds = None
 
     return 'success'
@@ -778,15 +708,11 @@ def test_plmosaic_19():
     val = ds.ReadRaster(0, 0, 1, 1)
     gdal.PopErrorHandler()
     val = struct.unpack('B' * 4, val)
-    if val != (254, 0, 0, 0):
-        print(val)
-        return 'fail'
+    assert val == (254, 0, 0, 0)
 
     val = ds.ReadRaster(256, 0, 1, 1)
     val = struct.unpack('B' * 4, val)
-    if val != (254, 0, 0, 0):
-        print(val)
-        return 'fail'
+    assert val == (254, 0, 0, 0)
     ds = None
 
     return 'success'
@@ -805,15 +731,11 @@ def test_plmosaic_20():
     gdal.SetConfigOption('PL_URL', None)
     val = ds.ReadRaster(0, 0, 1, 1)
     val = struct.unpack('B' * 4, val)
-    if val != (254, 0, 0, 0):
-        print(val)
-        return 'fail'
+    assert val == (254, 0, 0, 0)
 
     val = ds.ReadRaster(256, 0, 1, 1)
     val = struct.unpack('B' * 4, val)
-    if val != (254, 0, 0, 0):
-        print(val)
-        return 'fail'
+    assert val == (254, 0, 0, 0)
     ds = None
 
     return 'success'
@@ -835,22 +757,19 @@ def test_plmosaic_21():
     gdal.PushErrorHandler()
     ds.ReadRaster(256, 512, 1, 1)
     gdal.PopErrorHandler()
-    if gdal.GetLastErrorMsg() == '':
-        return 'fail'
+    assert gdal.GetLastErrorMsg() != ''
 
     gdal.ErrorReset()
     gdal.PushErrorHandler()
     ds.GetRasterBand(1).ReadRaster(256, 512, 1, 1)
     gdal.PopErrorHandler()
-    if gdal.GetLastErrorMsg() == '':
-        return 'fail'
+    assert gdal.GetLastErrorMsg() != ''
 
     gdal.ErrorReset()
     gdal.PushErrorHandler()
     ds.GetRasterBand(1).ReadBlock(1, 2)
     gdal.PopErrorHandler()
-    if gdal.GetLastErrorMsg() == '':
-        return 'fail'
+    assert gdal.GetLastErrorMsg() != ''
 
     gdal.FileFromMemBuffer('/vsimem/root/?name__is=mosaic_uint16', """{
 "mosaics": [{
@@ -878,9 +797,7 @@ def test_plmosaic_21():
     ds = gdal.OpenEx('PLMosaic:', gdal.OF_RASTER, open_options=['API_KEY=foo', 'MOSAIC=mosaic_uint16', 'CACHE_PATH=', 'USE_TILES=YES'])
     gdal.SetConfigOption('PL_URL', None)
     gdal.PopErrorHandler()
-    if gdal.GetLastErrorMsg().find('Cannot use tile API for full resolution data on non Byte mosaic') < 0:
-        print(gdal.GetLastErrorMsg())
-        return 'fail'
+    assert gdal.GetLastErrorMsg().find('Cannot use tile API for full resolution data on non Byte mosaic') >= 0
 
     gdal.FileFromMemBuffer('/vsimem/root/?name__is=mosaic_without_tiles', """{
 "mosaics": [{
@@ -905,9 +822,7 @@ def test_plmosaic_21():
     ds = gdal.OpenEx('PLMosaic:', gdal.OF_RASTER, open_options=['API_KEY=foo', 'MOSAIC=mosaic_without_tiles', 'CACHE_PATH=', 'USE_TILES=YES'])
     gdal.SetConfigOption('PL_URL', None)
     gdal.PopErrorHandler()
-    if gdal.GetLastErrorMsg().find('Cannot find tile definition, so use_tiles will be ignored') < 0:
-        print(gdal.GetLastErrorMsg())
-        return 'fail'
+    assert gdal.GetLastErrorMsg().find('Cannot find tile definition, so use_tiles will be ignored') >= 0
 
     return 'success'
 
@@ -968,18 +883,12 @@ def test_plmosaic_with_bbox():
     gdal.SetConfigOption('PL_URL', '/vsimem/root')
     ds = gdal.OpenEx('PLMosaic:', gdal.OF_RASTER, open_options=['API_KEY=foo'])
     gdal.SetConfigOption('PL_URL', None)
-    if ds.RasterXSize != 233472:
-        print(ds.RasterXSize)
-        return 'fail'
-    if ds.RasterYSize != 286720:
-        print(ds.RasterYSize)
-        return 'fail'
+    assert ds.RasterXSize == 233472
+    assert ds.RasterYSize == 286720
     got_gt = ds.GetGeoTransform()
     expected_gt = (-11134123.286585508, 4.77731426716, 0.0, 4872401.930333553, 0.0, -4.77731426716)
     for i in range(6):
-        if abs(got_gt[i] - expected_gt[i]) > 1e-8:
-            print(got_gt)
-            return 'fail'
+        assert abs(got_gt[i] - expected_gt[i]) <= 1e-8
 
     # Good GeoTIFF
     tmp_ds = gdal.GetDriverByName('GTiff').Create('/vsimem/root/my_mosaic_id/quads/455-1272/full', 4096, 4096, 4, options=['INTERLEAVE=BAND', 'SPARSE_OK=YES'])
@@ -988,9 +897,7 @@ def test_plmosaic_with_bbox():
 
     val = ds.GetRasterBand(1).ReadRaster(0, 0, 1, 1)
     val = struct.unpack('B', val)[0]
-    if val != 125:
-        print(val)
-        return 'fail'
+    assert val == 125
 
     gdal.FileFromMemBuffer('/vsimem/root/my_mosaic_id/quads/455-1272/items', """{
     "items": [
@@ -999,16 +906,14 @@ def test_plmosaic_with_bbox():
 }""")
 
     ret = ds.GetRasterBand(1).GetMetadataItem('Pixel_0_0', 'LocationInfo')
-    if ret != """<LocationInfo>
+    assert ret == """<LocationInfo>
   <Scenes>
     <Scene>
       <link>bar</link>
     </Scene>
   </Scenes>
 </LocationInfo>
-""":
-        print(ret)
-        return 'fail'
+"""
 
     return 'success'
 
diff --git a/autotest/gdrivers/png.py b/autotest/gdrivers/png.py
index 86facd8a1b0f..2618a6d368e8 100755
--- a/autotest/gdrivers/png.py
+++ b/autotest/gdrivers/png.py
@@ -35,6 +35,7 @@
 
 
 import gdaltest
+import pytest
 
 ###############################################################################
 # Read test of simple byte reference data.
@@ -63,17 +64,12 @@ def test_png_3():
 
     ds = gdal.Open('data/test.png')
     cm = ds.GetRasterBand(1).GetRasterColorTable()
-    if cm.GetCount() != 16 \
-       or cm.GetColorEntry(0) != (255, 255, 255, 0) \
-       or cm.GetColorEntry(1) != (255, 255, 208, 255):
-        gdaltest.post_reason('Wrong colormap entries')
-        return 'fail'
+    assert cm.GetCount() == 16 and cm.GetColorEntry(0) == (255, 255, 255, 0) and cm.GetColorEntry(1) == (255, 255, 208, 255), \
+        'Wrong colormap entries'
 
     cm = None
 
-    if int(ds.GetRasterBand(1).GetNoDataValue()) != 0:
-        gdaltest.post_reason('Wrong nodata value.')
-        return 'fail'
+    assert int(ds.GetRasterBand(1).GetNoDataValue()) == 0, 'Wrong nodata value.'
 
     # This geotransform test is also verifying the fix for bug 1414, as
     # the world file is in a mixture of numeric representations for the
@@ -86,9 +82,7 @@ def test_png_3():
         if abs(gt[i] - gt_expected[i]) > 0.0001:
             print('expected:', gt_expected)
             print('got:', gt)
-
-            gdaltest.post_reason('Mixed locale world file read improperly.')
-            return 'fail'
+            pytest.fail('Mixed locale world file read improperly.')
 
     return 'success'
 
@@ -138,9 +132,7 @@ def test_png_7():
     md = dstds.GetMetadata()
     dstds = None
 
-    if md['NODATA_VALUES'] != '32639 32639 32639':
-        gdaltest.post_reason('NODATA_VALUES wrong')
-        return 'fail'
+    assert md['NODATA_VALUES'] == '32639 32639 32639', 'NODATA_VALUES wrong'
 
     dstds = None
 
@@ -159,20 +151,14 @@ def test_png_8():
     ds_src = gdal.Open('data/idat_broken.png')
 
     md = ds_src.GetMetadata()
-    if md:
-        gdaltest.post_reason('metadata list not expected')
-        return 'fail'
+    assert not md, 'metadata list not expected'
 
     # Number of bands has been preserved
-    if ds_src.RasterCount != 4:
-        gdaltest.post_reason('wrong number of bands')
-        return 'fail'
+    assert ds_src.RasterCount == 4, 'wrong number of bands'
 
     # No reading is performed, so we expect valid reference
     b = ds_src.GetRasterBand(1)
-    if b is None:
-        gdaltest.post_reason('band 1 is missing')
-        return 'fail'
+    assert b is not None, 'band 1 is missing'
 
     # We're not interested in returned value but internal state of GDAL.
     gdal.PushErrorHandler('CPLQuietErrorHandler')
@@ -180,9 +166,7 @@ def test_png_8():
     err = gdal.GetLastErrorNo()
     gdal.PopErrorHandler()
 
-    if err == 0:
-        gdaltest.post_reason('error condition expected')
-        return 'fail'
+    assert err != 0, 'error condition expected'
 
     gdal.PushErrorHandler('CPLQuietErrorHandler')
     ds_dst = drv.CreateCopy('tmp/idat_broken.png', ds_src)
@@ -190,13 +174,9 @@ def test_png_8():
     gdal.PopErrorHandler()
     ds_src = None
 
-    if err == 0:
-        gdaltest.post_reason('error condition expected')
-        return 'fail'
+    assert err != 0, 'error condition expected'
 
-    if ds_dst is not None:
-        gdaltest.post_reason('dataset not expected')
-        return 'fail'
+    assert ds_dst is None, 'dataset not expected'
 
     os.remove('tmp/idat_broken.png')
 
@@ -220,16 +200,13 @@ def test_png_10():
 
     src_ds = gdal.Open('data/byte.tif')
     ds = gdal.GetDriverByName('PNG').CreateCopy('/vsistdout_redirect//vsimem/tmp.png', src_ds)
-    if ds.GetRasterBand(1).Checksum() != 0:
-        return 'fail'
+    assert ds.GetRasterBand(1).Checksum() == 0
     src_ds = None
     ds = None
 
     ds = gdal.Open('/vsimem/tmp.png')
-    if ds is None:
-        return 'fail'
-    if ds.GetRasterBand(1).Checksum() != 4672:
-        return 'fail'
+    assert ds is not None
+    assert ds.GetRasterBand(1).Checksum() == 4672
 
     gdal.Unlink('/vsimem/tmp.png')
 
@@ -260,24 +237,21 @@ def test_png_12():
     tmp_ds = gdal.GetDriverByName('Mem').Create('', ds.RasterXSize, ds.RasterYSize, ds.RasterCount)
     tmp_ds.WriteRaster(0, 0, ds.RasterXSize, ds.RasterYSize, data)
     got_cs = [tmp_ds.GetRasterBand(i + 1).Checksum() for i in range(ds.RasterCount)]
-    if cs != got_cs:
-        return 'fail'
+    assert cs == got_cs
 
     # Pixel interleaved
     data = ds.ReadRaster(0, 0, ds.RasterXSize, ds.RasterYSize, buf_pixel_space=ds.RasterCount, buf_band_space=1)
     tmp_ds = gdal.GetDriverByName('Mem').Create('', ds.RasterXSize, ds.RasterYSize, ds.RasterCount)
     tmp_ds.WriteRaster(0, 0, ds.RasterXSize, ds.RasterYSize, data, buf_pixel_space=ds.RasterCount, buf_band_space=1)
     got_cs = [tmp_ds.GetRasterBand(i + 1).Checksum() for i in range(ds.RasterCount)]
-    if cs != got_cs:
-        return 'fail'
+    assert cs == got_cs
 
     # Pixel interleaved with padding
     data = ds.ReadRaster(0, 0, ds.RasterXSize, ds.RasterYSize, buf_pixel_space=5, buf_band_space=1)
     tmp_ds = gdal.GetDriverByName('Mem').Create('', ds.RasterXSize, ds.RasterYSize, ds.RasterCount)
     tmp_ds.WriteRaster(0, 0, ds.RasterXSize, ds.RasterYSize, data, buf_pixel_space=5, buf_band_space=1)
     got_cs = [tmp_ds.GetRasterBand(i + 1).Checksum() for i in range(ds.RasterCount)]
-    if cs != got_cs:
-        return 'fail'
+    assert cs == got_cs
 
     return 'success'
 
@@ -293,13 +267,10 @@ def test_png_13():
     src_ds.SetMetadataItem('DESCRIPTION', 'will be overridden by creation option')
     out_ds = gdal.GetDriverByName('PNG').CreateCopy('/vsimem/tmp.png', src_ds, options=['WRITE_METADATA_AS_TEXT=YES', 'DESCRIPTION=my desc'])
     md = out_ds.GetMetadata()
-    if len(md) != 3 or md['foo'] != 'bar' or md['Copyright'] != 'copyright value' or md['Description'] != 'my desc':
-        print(md)
-        return 'fail'
+    assert len(md) == 3 and md['foo'] == 'bar' and md['Copyright'] == 'copyright value' and md['Description'] == 'my desc'
     out_ds = None
     # check that no PAM file is created
-    if gdal.VSIStatL('/vsimem/tmp.png.aux.xml') == 0:
-        return 'fail'
+    assert gdal.VSIStatL('/vsimem/tmp.png.aux.xml') != 0
     gdal.Unlink('/vsimem/tmp.png')
     return 'success'
 
@@ -317,26 +288,19 @@ def test_png_14():
     nbits = out_ds.GetRasterBand(1).GetMetadataItem('NBITS', 'IMAGE_STRUCTURE')
     gdal.Unlink('/vsimem/tmp.png')
 
-    if cs != expected_cs:
-        print(cs)
-        return 'fail'
+    assert cs == expected_cs
 
-    if nbits != '1':
-        print(nbits)
-        return 'fail'
+    assert nbits == '1'
 
     # check that no PAM file is created
-    if gdal.VSIStatL('/vsimem/tmp.png.aux.xml') == 0:
-        return 'fail'
+    assert gdal.VSIStatL('/vsimem/tmp.png.aux.xml') != 0
 
     # Test explicit NBITS
     gdal.GetDriverByName('PNG').CreateCopy('/vsimem/tmp.png', src_ds, options=['NBITS=2'])
     out_ds = gdal.Open('/vsimem/tmp.png')
     nbits = out_ds.GetRasterBand(1).GetMetadataItem('NBITS', 'IMAGE_STRUCTURE')
     gdal.Unlink('/vsimem/tmp.png')
-    if nbits != '2':
-        print(nbits)
-        return 'fail'
+    assert nbits == '2'
 
     # Test (wrong) explicit NBITS
     with gdaltest.error_handler():
@@ -344,9 +308,7 @@ def test_png_14():
     out_ds = gdal.Open('/vsimem/tmp.png')
     nbits = out_ds.GetRasterBand(1).GetMetadataItem('NBITS', 'IMAGE_STRUCTURE')
     gdal.Unlink('/vsimem/tmp.png')
-    if nbits is not None:
-        print(nbits)
-        return 'fail'
+    assert nbits is None
 
     return 'success'
 
diff --git a/autotest/gdrivers/png_profile.py b/autotest/gdrivers/png_profile.py
index fd892f83f134..84ba56c51057 100755
--- a/autotest/gdrivers/png_profile.py
+++ b/autotest/gdrivers/png_profile.py
@@ -62,8 +62,7 @@ def test_png_copy_icc():
     ds = None
     ds2 = None
 
-    if md['SOURCE_ICC_PROFILE'] != icc:
-        return 'fail'
+    assert md['SOURCE_ICC_PROFILE'] == icc
 
     try:
         os.stat('tmp/icc_test.png.aux.xml')
@@ -82,8 +81,7 @@ def test_png_copy_icc():
     except OSError:
         pass
 
-    if md['SOURCE_ICC_PROFILE'] != icc:
-        return 'fail'
+    assert md['SOURCE_ICC_PROFILE'] == icc
 
     # Check again with GetMetadataItem()
     ds2 = gdal.Open('tmp/icc_test.png')
@@ -96,8 +94,7 @@ def test_png_copy_icc():
     except OSError:
         pass
 
-    if source_icc_profile != icc:
-        return 'fail'
+    assert source_icc_profile == icc
 
     driver_tiff.Delete('tmp/icc_test.tiff')
     driver.Delete('tmp/icc_test.png')
@@ -132,8 +129,7 @@ def test_png_copy_options_icc():
     ds = None
     ds2 = None
 
-    if md['SOURCE_ICC_PROFILE'] != icc:
-        return 'fail'
+    assert md['SOURCE_ICC_PROFILE'] == icc
 
     # Check again with dataset from Open()
     ds2 = gdal.Open('tmp/icc_test.png')
@@ -141,8 +137,7 @@ def test_png_copy_options_icc():
     ds = None
     ds2 = None
 
-    if md['SOURCE_ICC_PROFILE'] != icc:
-        return 'fail'
+    assert md['SOURCE_ICC_PROFILE'] == icc
 
     driver_tiff.Delete('tmp/icc_test.tiff')
     driver.Delete('tmp/icc_test.png')
@@ -177,8 +172,7 @@ def test_png_copy_options_colorimetric_data():
     source_whitepoint2 = eval('(' + md['SOURCE_WHITEPOINT'] + ')')
 
     for i in range(0, 3):
-        if abs(source_whitepoint2[i] - source_whitepoint[i]) > 0.0001:
-            return 'fail'
+        assert abs(source_whitepoint2[i] - source_whitepoint[i]) <= 0.0001
 
     source_primaries2 = [
         eval('(' + md['SOURCE_PRIMARIES_RED'] + ')'),
@@ -187,11 +181,9 @@ def test_png_copy_options_colorimetric_data():
 
     for j in range(0, 3):
         for i in range(0, 3):
-            if abs(source_primaries2[j][i] - source_primaries[j][i]) > 0.0001:
-                return 'fail'
+            assert abs(source_primaries2[j][i] - source_primaries[j][i]) <= 0.0001
 
-    if float(md['PNG_GAMMA']) != 1.5:
-        return 'fail'
+    assert float(md['PNG_GAMMA']) == 1.5
 
     # Check again with dataset from Open()
     ds2 = gdal.Open('tmp/icc_test.png')
@@ -202,8 +194,7 @@ def test_png_copy_options_colorimetric_data():
     source_whitepoint2 = eval('(' + md['SOURCE_WHITEPOINT'] + ')')
 
     for i in range(0, 3):
-        if abs(source_whitepoint2[i] - source_whitepoint[i]) > 0.0001:
-            return 'fail'
+        assert abs(source_whitepoint2[i] - source_whitepoint[i]) <= 0.0001
 
     source_primaries2 = [
         eval('(' + md['SOURCE_PRIMARIES_RED'] + ')'),
@@ -212,11 +203,9 @@ def test_png_copy_options_colorimetric_data():
 
     for j in range(0, 3):
         for i in range(0, 3):
-            if abs(source_primaries2[j][i] - source_primaries[j][i]) > 0.0001:
-                return 'fail'
+            assert abs(source_primaries2[j][i] - source_primaries[j][i]) <= 0.0001
 
-    if float(md['PNG_GAMMA']) != 1.5:
-        return 'fail'
+    assert float(md['PNG_GAMMA']) == 1.5
 
     driver_tiff.Delete('tmp/icc_test.tiff')
     driver.Delete('tmp/icc_test.png')
@@ -254,8 +243,7 @@ def test_png_copy_colorimetric_data():
     source_whitepoint2 = eval('(' + md['SOURCE_WHITEPOINT'] + ')')
 
     for i in range(0, 3):
-        if abs(source_whitepoint2[i] - source_whitepoint[i]) > 0.0001:
-            return 'fail'
+        assert abs(source_whitepoint2[i] - source_whitepoint[i]) <= 0.0001
 
     source_primaries2 = [
         eval('(' + md['SOURCE_PRIMARIES_RED'] + ')'),
@@ -264,11 +252,9 @@ def test_png_copy_colorimetric_data():
 
     for j in range(0, 3):
         for i in range(0, 3):
-            if abs(source_primaries2[j][i] - source_primaries[j][i]) > 0.0001:
-                return 'fail'
+            assert abs(source_primaries2[j][i] - source_primaries[j][i]) <= 0.0001
 
-    if float(md['PNG_GAMMA']) != 1.5:
-        return 'fail'
+    assert float(md['PNG_GAMMA']) == 1.5
 
     # Check again with dataset from Open()
     ds2 = gdal.Open('tmp/icc_test.png')
@@ -279,8 +265,7 @@ def test_png_copy_colorimetric_data():
     source_whitepoint2 = eval('(' + md['SOURCE_WHITEPOINT'] + ')')
 
     for i in range(0, 3):
-        if abs(source_whitepoint2[i] - source_whitepoint[i]) > 0.0001:
-            return 'fail'
+        assert abs(source_whitepoint2[i] - source_whitepoint[i]) <= 0.0001
 
     source_primaries2 = [
         eval('(' + md['SOURCE_PRIMARIES_RED'] + ')'),
@@ -289,11 +274,9 @@ def test_png_copy_colorimetric_data():
 
     for j in range(0, 3):
         for i in range(0, 3):
-            if abs(source_primaries2[j][i] - source_primaries[j][i]) > 0.0001:
-                return 'fail'
+            assert abs(source_primaries2[j][i] - source_primaries[j][i]) <= 0.0001
 
-    if float(md['PNG_GAMMA']) != 1.5:
-        return 'fail'
+    assert float(md['PNG_GAMMA']) == 1.5
 
     driver_tiff.Delete('tmp/icc_test.tiff')
     driver.Delete('tmp/icc_test.png')
@@ -318,8 +301,7 @@ def test_png_sRGB():
     ds = None
     ds2 = None
 
-    if md['SOURCE_ICC_PROFILE_NAME'] != 'sRGB':
-        return 'fail'
+    assert md['SOURCE_ICC_PROFILE_NAME'] == 'sRGB'
 
     # Check again with dataset from Open()
     ds2 = gdal.Open('tmp/icc_test.png')
@@ -327,8 +309,7 @@ def test_png_sRGB():
     ds = None
     ds2 = None
 
-    if md['SOURCE_ICC_PROFILE_NAME'] != 'sRGB':
-        return 'fail'
+    assert md['SOURCE_ICC_PROFILE_NAME'] == 'sRGB'
 
     driver_tiff.Delete('tmp/icc_test.tiff')
     driver.Delete('tmp/icc_test.png')
diff --git a/autotest/gdrivers/postgisraster.py b/autotest/gdrivers/postgisraster.py
index 92f410749edf..be9ecdac1e45 100755
--- a/autotest/gdrivers/postgisraster.py
+++ b/autotest/gdrivers/postgisraster.py
@@ -130,8 +130,7 @@ def test_postgisraster_test_open_error2():
     # removed mode, as it defaults to one raster per row
     with gdaltest.error_handler():
         ds = gdal.Open(gdaltest.postgisraster_connection_string + "table='utm'")
-    if ds is None:
-        return 'fail'
+    assert ds is not None
     return 'success'
 
 ###############################################################################
@@ -329,8 +328,7 @@ def test_postgisraster_test_create_copy_and_delete():
 
         new_ds = gdaltest.postgisrasterDriver.CreateCopy(gdaltest.postgisraster_connection_string + "table='small_world_copy'", src_ds, strict=True)
 
-        if new_ds is None:
-            return 'fail'
+        assert new_ds is not None
 
     deleted = gdaltest.postgisrasterDriver.Delete(gdaltest.postgisraster_connection_string + "table='small_world_copy'")
 
@@ -365,17 +363,13 @@ def test_postgisraster_test_create_copy_and_delete_phases():
 
         ds = gdal.Open(gdaltest.postgisraster_connection_string + "table='small_world_copy' mode=2")
         cs = [ds.GetRasterBand(i + 1).Checksum() for i in range(3)]
-        if cs != [30111, 32302, 40026]:
-            print(cs)
-            return 'fail'
+        assert cs == [30111, 32302, 40026]
         ds = None
 
         # should delete all raster parts over 50
         deleted = gdaltest.postgisrasterDriver.Delete(gdaltest.postgisraster_connection_string + "table='small_world_copy' where='rid>50'")
 
-        if deleted:
-            gdaltest.post_reason('Delete returned an error.')
-            return 'fail'
+        assert not deleted, 'Delete returned an error.'
 
         src_ds = gdal.Open(gdaltest.postgisraster_connection_string + "table='small_world_copy'")
 
@@ -397,9 +391,7 @@ def test_postgisraster_test_create_copy_and_delete_phases():
 
         deleted = gdaltest.postgisrasterDriver.Delete(gdaltest.postgisraster_connection_string + "table='small_world_copy' where='rid<=25'")
 
-        if deleted:
-            gdaltest.post_reason('Delete returned an error.')
-            return 'fail'
+        assert not deleted, 'Delete returned an error.'
 
         src_ds = gdal.Open(gdaltest.postgisraster_connection_string + "table='small_world_copy'")
 
@@ -420,9 +412,7 @@ def test_postgisraster_test_create_copy_and_delete_phases():
 
         deleted = gdaltest.postgisrasterDriver.Delete(gdaltest.postgisraster_connection_string + "table='small_world_copy'")
 
-        if deleted:
-            gdaltest.post_reason('Delete returned an error.')
-            return 'fail'
+        assert not deleted, 'Delete returned an error.'
 
     return 'success'
 
@@ -444,16 +434,12 @@ def test_postgisraster_test_norid():
         if k[-4:] == 'NAME':
             # Ensure the subdataset has upperleftx and upperlefty coords,
             # as there is no unique key on the table
-            if src_md[k].find('ST_UpperLeftX') < 0 or src_md[k].find('ST_UpperLeftY') < 0:
-                print(src_md[k])
-                return 'fail'
+            assert src_md[k].find('ST_UpperLeftX') >= 0 and src_md[k].find('ST_UpperLeftY') >= 0
 
     with gdaltest.error_handler():
         ds = gdal.Open(gdaltest.postgisraster_connection_string + "table='small_world_noid' mode=2")
     cs = [ds.GetRasterBand(i + 1).Checksum() for i in range(3)]
-    if cs != [30111, 32302, 40026]:
-        print(cs)
-        return 'fail'
+    assert cs == [30111, 32302, 40026]
 
     return 'success'
 
@@ -478,16 +464,12 @@ def test_postgisraster_test_serial():
         if k[-4:] == 'NAME':
             # Ensure the subdataset has upperleftx and upperlefty coords,
             # as there is no unique key on the table
-            if not re.search("where='\"serialid\" = \d+'", src_md[k]):
-                print(k, ':', src_md[k])
-                return 'fail'
+            assert re.search("where='\"serialid\" = \d+'", src_md[k]), (k, ':', src_md[k])
 
     with gdaltest.error_handler():
         ds = gdal.Open(gdaltest.postgisraster_connection_string + "table='small_world_serial' mode=2")
     cs = [ds.GetRasterBand(i + 1).Checksum() for i in range(3)]
-    if cs != [30111, 32302, 40026]:
-        print(cs)
-        return 'fail'
+    assert cs == [30111, 32302, 40026]
 
     return 'success'
 
@@ -512,16 +494,12 @@ def test_postgisraster_test_unique():
         if k[-4:] == 'NAME':
             # Ensure the subdataset has upperleftx and upperlefty coords,
             # as there is no unique key on the table
-            if not re.search("where='\"uniq\" = \d+'", src_md[k]):
-                print(k, ':', src_md[k])
-                return 'fail'
+            assert re.search("where='\"uniq\" = \d+'", src_md[k]), (k, ':', src_md[k])
 
     with gdaltest.error_handler():
         ds = gdal.Open(gdaltest.postgisraster_connection_string + "table='small_world_unique' mode=2")
     cs = [ds.GetRasterBand(i + 1).Checksum() for i in range(3)]
-    if cs != [30111, 32302, 40026]:
-        print(cs)
-        return 'fail'
+    assert cs == [30111, 32302, 40026]
 
     return 'success'
 
@@ -532,9 +510,7 @@ def test_postgisraster_test_constraint():
         return 'skip'
     ds = gdal.Open(gdaltest.postgisraster_connection_string + "table='small_world_constraint' mode=2")
     cs = [ds.GetRasterBand(i + 1).Checksum() for i in range(3)]
-    if cs != [30111, 32302, 40026]:
-        print(cs)
-        return 'fail'
+    assert cs == [30111, 32302, 40026]
 
     return 'success'
 
@@ -545,9 +521,7 @@ def test_postgisraster_test_constraint_with_spi():
         return 'skip'
     ds = gdal.Open(gdaltest.postgisraster_connection_string + "table='small_world_constraint_with_spi' mode=2")
     cs = [ds.GetRasterBand(i + 1).Checksum() for i in range(3)]
-    if cs != [30111, 32302, 40026]:
-        print(cs)
-        return 'fail'
+    assert cs == [30111, 32302, 40026]
 
     return 'success'
 
@@ -572,9 +546,7 @@ def test_postgisraster_test_outdb():
     ds = gdal.Open(gdaltest.postgisraster_connection_string + "table='small_world_outdb_constraint' mode=2")
     cs = [ds.GetRasterBand(i + 1).Checksum() for i in range(3)]
     expected_cs = [30111, 32302, 40026] if has_guc else [0, 0, 0]
-    if cs != expected_cs:
-        print(cs)
-        return 'fail'
+    assert cs == expected_cs
 
     return 'success'
 
@@ -585,9 +557,7 @@ def test_postgisraster_test_outdb_client_side():
         return 'skip'
     ds = gdal.Open(gdaltest.postgisraster_connection_string + "table='small_world_outdb_constraint' mode=2 outdb_resolution=client_side")
     cs = [ds.GetRasterBand(i + 1).Checksum() for i in range(3)]
-    if cs != [30111, 32302, 40026]:
-        print(cs)
-        return 'fail'
+    assert cs == [30111, 32302, 40026]
 
     return 'success'
 
@@ -599,9 +569,7 @@ def test_postgisraster_test_outdb_client_side_force_ireadblock():
     ds = gdal.Open(gdaltest.postgisraster_connection_string + "table='small_world_outdb_constraint' mode=2 outdb_resolution=client_side")
     with gdaltest.SetCacheMax(0):
         cs = [ds.GetRasterBand(i + 1).Checksum() for i in range(3)]
-    if cs != [30111, 32302, 40026]:
-        print(cs)
-        return 'fail'
+    assert cs == [30111, 32302, 40026]
 
     return 'success'
 
@@ -612,9 +580,7 @@ def test_postgisraster_test_outdb_client_side_if_possible():
         return 'skip'
     ds = gdal.Open(gdaltest.postgisraster_connection_string + "table='small_world_outdb_constraint' mode=2 outdb_resolution=client_side_if_possible")
     cs = [ds.GetRasterBand(i + 1).Checksum() for i in range(3)]
-    if cs != [30111, 32302, 40026]:
-        print(cs)
-        return 'fail'
+    assert cs == [30111, 32302, 40026]
 
     return 'success'
 
diff --git a/autotest/gdrivers/prf.py b/autotest/gdrivers/prf.py
index 1f57769678d9..7457a7c8d46d 100755
--- a/autotest/gdrivers/prf.py
+++ b/autotest/gdrivers/prf.py
@@ -29,6 +29,7 @@
 
 import gdaltest
 from osgeo import gdal
+import pytest
 
 ###############################################################################
 
@@ -43,39 +44,25 @@ def test_prf_2():
 
     ds = gdal.Open('./data/PRF/dem.x-dem')
 
-    if ds.RasterXSize != 4330:
-        gdaltest.post_reason('Invalid dataset width')
-        return 'fail'
+    assert ds.RasterXSize == 4330, 'Invalid dataset width'
 
-    if ds.RasterYSize != 4663:
-        gdaltest.post_reason('Invalid dataset height')
-        return 'fail'
+    assert ds.RasterYSize == 4663, 'Invalid dataset height'
 
     unittype = ds.GetRasterBand(1).GetUnitType()
-    if unittype != 'm':
-        gdaltest.post_reason('Failed to read elevation units from x-dem')
-        print(unittype)
-        return 'fail'
+    assert unittype == 'm', 'Failed to read elevation units from x-dem'
 
     datatype = ds.GetRasterBand(1).DataType
-    if datatype != gdal.GDT_Float32:
-        gdaltest.post_reason('Failed to read datatype')
-        return 'fail'
+    assert datatype == gdal.GDT_Float32, 'Failed to read datatype'
 
     expectedOvCount = 1
     if ds.GetRasterBand(1).GetOverviewCount() != expectedOvCount:
-        gdaltest.post_reason('did not get expected number of overviews')
         print('Overview count must be %d' % expectedOvCount)
         print('But GetOverviewCount returned %d' % ds.GetRasterBand(1).GetOverviewCount())
-        return 'fail'
+        pytest.fail('did not get expected number of overviews')
 
     overview = ds.GetRasterBand(1).GetOverview(0)
-    if overview.XSize != 1082:
-        gdaltest.post_reason('Invalid dataset width %d' % overview.XSize)
-        return 'fail'
-    if overview.YSize != 1165:
-        gdaltest.post_reason('Invalid dataset height %d' % overview.YSize)
-        return 'fail'
+    assert overview.XSize == 1082, ('Invalid dataset width %d' % overview.XSize)
+    assert overview.YSize == 1165, ('Invalid dataset height %d' % overview.YSize)
 
     ds = None
 
@@ -88,10 +75,9 @@ def test_prf_3():
 
     expectedOvCount = 0
     if ds.GetRasterBand(1).GetOverviewCount() != expectedOvCount:
-        gdaltest.post_reason('did not get expected number of overviews')
         print('Overview count must be %d' % expectedOvCount)
         print('But GetOverviewCount returned %d' % ds.GetRasterBand(1).GetOverviewCount())
-        return 'fail'
+        pytest.fail('did not get expected number of overviews')
 
     ds = None
 
diff --git a/autotest/gdrivers/rasdaman.py b/autotest/gdrivers/rasdaman.py
index dc06f83e0c17..5cfdb7e9dfd8 100755
--- a/autotest/gdrivers/rasdaman.py
+++ b/autotest/gdrivers/rasdaman.py
@@ -62,9 +62,7 @@ def test_rasdaman_1():
         return 'skip'
 
     cs = ds.GetRasterBand(1).Checksum()
-    if cs != 61774:
-        gdaltest.post_reason('did not get expected checksum')
-        return 'fail'
+    assert cs == 61774, 'did not get expected checksum'
 
     return 'success'
 
diff --git a/autotest/gdrivers/rasterlite.py b/autotest/gdrivers/rasterlite.py
index a6025571f444..7264a4e9d762 100755
--- a/autotest/gdrivers/rasterlite.py
+++ b/autotest/gdrivers/rasterlite.py
@@ -89,43 +89,32 @@ def test_rasterlite_2():
             return 'skip'
         return 'fail'
 
-    if ds.RasterCount != 3:
-        gdaltest.post_reason('expected 3 bands')
-        return 'fail'
+    assert ds.RasterCount == 3, 'expected 3 bands'
 
-    if ds.GetRasterBand(1).GetOverviewCount() != 0:
-        gdaltest.post_reason('did not expect overview')
-        return 'fail'
+    assert ds.GetRasterBand(1).GetOverviewCount() == 0, 'did not expect overview'
 
     cs = ds.GetRasterBand(1).Checksum()
     expected_cs = 11746
-    if cs != expected_cs and cs != 11751:
-        gdaltest.post_reason('for band 1, cs = %d, different from expected_cs = %d' % (cs, expected_cs))
-        return 'fail'
+    assert cs == expected_cs or cs == 11751, \
+        ('for band 1, cs = %d, different from expected_cs = %d' % (cs, expected_cs))
 
     cs = ds.GetRasterBand(2).Checksum()
     expected_cs = 19843
-    if cs != expected_cs and cs != 20088 and cs != 20083:
-        gdaltest.post_reason('for band 2, cs = %d, different from expected_cs = %d' % (cs, expected_cs))
-        return 'fail'
+    assert cs == expected_cs or cs == 20088 or cs == 20083, \
+        ('for band 2, cs = %d, different from expected_cs = %d' % (cs, expected_cs))
 
     cs = ds.GetRasterBand(3).Checksum()
     expected_cs = 48911
-    if cs != expected_cs and cs != 47978:
-        gdaltest.post_reason('for band 3, cs = %d, different from expected_cs = %d' % (cs, expected_cs))
-        return 'fail'
+    assert cs == expected_cs or cs == 47978, \
+        ('for band 3, cs = %d, different from expected_cs = %d' % (cs, expected_cs))
 
-    if ds.GetProjectionRef().find('WGS_1984') == -1:
-        gdaltest.post_reason('projection_ref = %s' % ds.GetProjectionRef())
-        return 'fail'
+    assert ds.GetProjectionRef().find('WGS_1984') != -1, \
+        ('projection_ref = %s' % ds.GetProjectionRef())
 
     gt = ds.GetGeoTransform()
     expected_gt = (-180.0, 360. / ds.RasterXSize, 0.0, 90.0, 0.0, -180. / ds.RasterYSize)
     for i in range(6):
-        if abs(gt[i] - expected_gt[i]) > 1e-15:
-            print(gt)
-            print(expected_gt)
-            return 'fail'
+        assert abs(gt[i] - expected_gt[i]) <= 1e-15
 
     ds = None
 
@@ -142,31 +131,24 @@ def test_rasterlite_3():
 
     ds = gdal.Open('RASTERLITE:data/rasterlite_pyramids.sqlite,table=test')
 
-    if ds.RasterCount != 3:
-        gdaltest.post_reason('expected 3 bands')
-        return 'fail'
+    assert ds.RasterCount == 3, 'expected 3 bands'
 
-    if ds.GetRasterBand(1).GetOverviewCount() != 1:
-        gdaltest.post_reason('expected 1 overview')
-        return 'fail'
+    assert ds.GetRasterBand(1).GetOverviewCount() == 1, 'expected 1 overview'
 
     cs = ds.GetRasterBand(1).GetOverview(0).Checksum()
     expected_cs = 59551
-    if cs != expected_cs and cs != 59833:
-        gdaltest.post_reason('for overview of band 1, cs = %d, different from expected_cs = %d' % (cs, expected_cs))
-        return 'fail'
+    assert cs == expected_cs or cs == 59833, \
+        ('for overview of band 1, cs = %d, different from expected_cs = %d' % (cs, expected_cs))
 
     cs = ds.GetRasterBand(2).GetOverview(0).Checksum()
     expected_cs = 59603
-    if cs != expected_cs and cs != 59588:
-        gdaltest.post_reason('for overview of band 2, cs = %d, different from expected_cs = %d' % (cs, expected_cs))
-        return 'fail'
+    assert cs == expected_cs or cs == 59588, \
+        ('for overview of band 2, cs = %d, different from expected_cs = %d' % (cs, expected_cs))
 
     cs = ds.GetRasterBand(3).GetOverview(0).Checksum()
     expected_cs = 42173
-    if cs != expected_cs and cs != 42361:
-        gdaltest.post_reason('for overview of band 3, cs = %d, different from expected_cs = %d' % (cs, expected_cs))
-        return 'fail'
+    assert cs == expected_cs or cs == 42361, \
+        ('for overview of band 3, cs = %d, different from expected_cs = %d' % (cs, expected_cs))
 
     ds = None
 
@@ -183,25 +165,17 @@ def test_rasterlite_4():
 
     ds = gdal.Open('RASTERLITE:data/rasterlite_pct.sqlite,minx=0,miny=0,maxx=180,maxy=90')
 
-    if ds.RasterCount != 1:
-        gdaltest.post_reason('expected 1 band')
-        return 'fail'
+    assert ds.RasterCount == 1, 'expected 1 band'
 
-    if ds.RasterXSize != 169 or ds.RasterYSize != 85:
-        print(ds.RasterXSize)
-        print(ds.RasterYSize)
-        return 'fail'
+    assert ds.RasterXSize == 169 and ds.RasterYSize == 85
 
     ct = ds.GetRasterBand(1).GetRasterColorTable()
-    if ct is None:
-        gdaltest.post_reason('did not get color table')
-        return 'fail'
+    assert ct is not None, 'did not get color table'
 
     cs = ds.GetRasterBand(1).Checksum()
     expected_cs = 36473
-    if cs != expected_cs:
-        gdaltest.post_reason('for band 1, cs = %d, different from expected_cs = %d' % (cs, expected_cs))
-        return 'fail'
+    assert cs == expected_cs, \
+        ('for band 1, cs = %d, different from expected_cs = %d' % (cs, expected_cs))
 
     ds = None
 
@@ -218,32 +192,25 @@ def test_rasterlite_5():
 
     ds = gdal.Open('RASTERLITE:data/rasterlite_pct.sqlite,bands=3')
 
-    if ds.RasterCount != 3:
-        gdaltest.post_reason('expected 3 bands')
-        return 'fail'
+    assert ds.RasterCount == 3, 'expected 3 bands'
 
     ct = ds.GetRasterBand(1).GetRasterColorTable()
-    if ct is not None:
-        gdaltest.post_reason('did not expect color table')
-        return 'fail'
+    assert ct is None, 'did not expect color table'
 
     cs = ds.GetRasterBand(1).Checksum()
     expected_cs = 506
-    if cs != expected_cs:
-        gdaltest.post_reason('for band 1, cs = %d, different from expected_cs = %d' % (cs, expected_cs))
-        return 'fail'
+    assert cs == expected_cs, \
+        ('for band 1, cs = %d, different from expected_cs = %d' % (cs, expected_cs))
 
     cs = ds.GetRasterBand(2).Checksum()
     expected_cs = 3842
-    if cs != expected_cs:
-        gdaltest.post_reason('for band 2, cs = %d, different from expected_cs = %d' % (cs, expected_cs))
-        return 'fail'
+    assert cs == expected_cs, \
+        ('for band 2, cs = %d, different from expected_cs = %d' % (cs, expected_cs))
 
     cs = ds.GetRasterBand(3).Checksum()
     expected_cs = 59282
-    if cs != expected_cs:
-        gdaltest.post_reason('for band 3, cs = %d, different from expected_cs = %d' % (cs, expected_cs))
-        return 'fail'
+    assert cs == expected_cs, \
+        ('for band 3, cs = %d, different from expected_cs = %d' % (cs, expected_cs))
 
     ds = None
 
@@ -278,24 +245,18 @@ def test_rasterlite_6():
     # Test now CreateCopy()
     src_ds = gdal.Open('data/byte.tif')
     ds = gdal.GetDriverByName('RASTERLITE').CreateCopy('RASTERLITE:tmp/byte.sqlite,table=byte', src_ds)
-    if ds is None:
-        return 'fail'
+    assert ds is not None
 
-    if ds.GetRasterBand(1).Checksum() != src_ds.GetRasterBand(1).Checksum():
-        gdaltest.post_reason('Wrong checksum')
-        print(ds.GetRasterBand(1).Checksum())
-        return 'fail'
+    assert ds.GetRasterBand(1).Checksum() == src_ds.GetRasterBand(1).Checksum(), \
+        'Wrong checksum'
 
     gt = ds.GetGeoTransform()
     expected_gt = src_ds.GetGeoTransform()
     for i in range(6):
-        if abs(gt[i] - expected_gt[i] > 1e-5):
-            gdaltest.post_reason('Expected : %s\nGot : %s' % (expected_gt, gt))
-            return 'fail'
+        assert not abs(gt[i] - expected_gt[i] > 1e-5), \
+            ('Expected : %s\nGot : %s' % (expected_gt, gt))
 
-    if ds.GetProjectionRef().find('NAD27 / UTM zone 11N') == -1:
-        gdaltest.post_reason('Wrong SRS')
-        return 'fail'
+    assert ds.GetProjectionRef().find('NAD27 / UTM zone 11N') != -1, 'Wrong SRS'
 
     src_ds = None
     ds = None
@@ -319,29 +280,21 @@ def test_rasterlite_7():
     # Resampling method is not taken into account
     ds.BuildOverviews('NEAREST', overviewlist=[2, 4])
 
-    if ds.GetRasterBand(1).GetOverview(0).Checksum() != 1192:
-        gdaltest.post_reason('Wrong checksum for overview 0')
-        print(ds.GetRasterBand(1).GetOverview(0).Checksum())
-        return 'fail'
+    assert ds.GetRasterBand(1).GetOverview(0).Checksum() == 1192, \
+        'Wrong checksum for overview 0'
 
-    if ds.GetRasterBand(1).GetOverview(1).Checksum() != 233:
-        gdaltest.post_reason('Wrong checksum for overview 1')
-        print(ds.GetRasterBand(1).GetOverview(1).Checksum())
-        return 'fail'
+    assert ds.GetRasterBand(1).GetOverview(1).Checksum() == 233, \
+        'Wrong checksum for overview 1'
 
     # Reopen and test
     ds = None
     ds = gdal.Open('tmp/byte.sqlite')
 
-    if ds.GetRasterBand(1).GetOverview(0).Checksum() != 1192:
-        gdaltest.post_reason('Wrong checksum for overview 0')
-        print(ds.GetRasterBand(1).GetOverview(0).Checksum())
-        return 'fail'
+    assert ds.GetRasterBand(1).GetOverview(0).Checksum() == 1192, \
+        'Wrong checksum for overview 0'
 
-    if ds.GetRasterBand(1).GetOverview(1).Checksum() != 233:
-        gdaltest.post_reason('Wrong checksum for overview 1')
-        print(ds.GetRasterBand(1).GetOverview(1).Checksum())
-        return 'fail'
+    assert ds.GetRasterBand(1).GetOverview(1).Checksum() == 233, \
+        'Wrong checksum for overview 1'
 
     return 'success'
 
@@ -361,8 +314,7 @@ def test_rasterlite_8():
 
     ds.BuildOverviews(overviewlist=[])
 
-    if ds.GetRasterBand(1).GetOverviewCount() != 0:
-        return 'fail'
+    assert ds.GetRasterBand(1).GetOverviewCount() == 0
 
     return 'success'
 
@@ -427,15 +379,11 @@ def test_rasterlite_11():
     ds = None
     ds = gdal.Open('tmp/byte.sqlite')
 
-    if ds.GetRasterBand(1).GetOverview(0).Checksum() != 1152:
-        gdaltest.post_reason('Wrong checksum for overview 0')
-        print(ds.GetRasterBand(1).GetOverview(0).Checksum())
-        return 'fail'
+    assert ds.GetRasterBand(1).GetOverview(0).Checksum() == 1152, \
+        'Wrong checksum for overview 0'
 
-    if ds.GetRasterBand(1).GetOverview(1).Checksum() != 215:
-        gdaltest.post_reason('Wrong checksum for overview 1')
-        print(ds.GetRasterBand(1).GetOverview(1).Checksum())
-        return 'fail'
+    assert ds.GetRasterBand(1).GetOverview(1).Checksum() == 215, \
+        'Wrong checksum for overview 1'
 
     return 'success'
 
@@ -452,9 +400,7 @@ def test_rasterlite_12():
         return 'skip'
 
     ds = gdal.Open('data/byte.rasterlite')
-    if ds.GetRasterBand(1).Checksum() != 4672:
-        gdaltest.post_reason('validation failed')
-        return 'fail'
+    assert ds.GetRasterBand(1).Checksum() == 4672, 'validation failed'
     return 'success'
 
 ###############################################################################
@@ -473,9 +419,7 @@ def test_rasterlite_13():
         return 'skip'
 
     ds = gdal.Open('data/byte.rasterlite.sql')
-    if ds.GetRasterBand(1).Checksum() != 4672:
-        gdaltest.post_reason('validation failed')
-        return 'fail'
+    assert ds.GetRasterBand(1).Checksum() == 4672, 'validation failed'
     return 'success'
 
 ###############################################################################
diff --git a/autotest/gdrivers/rda.py b/autotest/gdrivers/rda.py
index b79ca8096cde..50dd5380df79 100755
--- a/autotest/gdrivers/rda.py
+++ b/autotest/gdrivers/rda.py
@@ -71,20 +71,17 @@ def test_rda_bad_connection_string():
     # Bad json
     with gdaltest.error_handler():
         ds = gdal.Open('graph-id node-id')
-    if ds is not None:
-        return 'fail'
+    assert ds is None
 
     # Missing graph-id
     with gdaltest.error_handler():
         ds = gdal.Open('"graph-id node-id"')
-    if ds is not None:
-        return 'fail'
+    assert ds is None
 
     # Missing node-id
     with gdaltest.error_handler():
         ds = gdal.Open('{"graph-id": "node-id"}')
-    if ds is not None:
-        return 'fail'
+    assert ds is None
 
     return 'success'
 
@@ -98,8 +95,7 @@ def test_rda_missing_credentials():
 
     with gdaltest.error_handler():
         ds = gdal.Open('{"graph-id":"foo","node-id":"bar"}')
-    if ds is not None:
-        return 'fail'
+    assert ds is None
 
     return 'success'
 
@@ -120,8 +116,7 @@ def test_rda_failed_authentication():
                                   'GBDX_PASSWORD': 'password'}):
         with gdaltest.error_handler():
             ds = gdal.Open('{"graph-id":"foo","node-id":"bar"}')
-    if ds is not None:
-        return 'fail'
+    assert ds is None
 
     # invalid URL
     with gdaltest.config_options({'GBDX_AUTH_URL': '/vsimem/auth_url',
@@ -129,8 +124,7 @@ def test_rda_failed_authentication():
                                   'GBDX_PASSWORD': 'password'}):
         with gdaltest.error_handler():
             ds = gdal.Open('{"graph-id":"foo","node-id":"bar"}')
-    if ds is not None:
-        return 'fail'
+    assert ds is None
 
     # 404
     handler = webserver.SequentialHandler()
@@ -141,8 +135,7 @@ def test_rda_failed_authentication():
                                       'GBDX_PASSWORD': 'password'}):
             with gdaltest.error_handler():
                 ds = gdal.Open('{"graph-id":"foo","node-id":"bar"}')
-    if ds is not None:
-        return 'fail'
+    assert ds is None
 
     # Invalid json
     handler = webserver.SequentialHandler()
@@ -153,8 +146,7 @@ def test_rda_failed_authentication():
                                       'GBDX_PASSWORD': 'password'}):
             with gdaltest.error_handler():
                 ds = gdal.Open('{"graph-id":"foo","node-id":"bar"}')
-    if ds is not None:
-        return 'fail'
+    assert ds is None
 
     # No access token
     handler = webserver.SequentialHandler()
@@ -165,8 +157,7 @@ def test_rda_failed_authentication():
                                       'GBDX_PASSWORD': 'password'}):
             with gdaltest.error_handler():
                 ds = gdal.Open('{"graph-id":"foo","node-id":"bar"}')
-    if ds is not None:
-        return 'fail'
+    assert ds is None
 
     return 'success'
 
@@ -192,8 +183,7 @@ def test_rda_error_metadata():
                                       'GBDX_PASSWORD': 'password'}):
             with gdaltest.error_handler():
                 ds = gdal.Open('{"graph-id":"foo","node-id":"bar"}')
-    if ds is not None:
-        return 'fail'
+    assert ds is None
 
     # 404 with payload
     handler = webserver.SequentialHandler()
@@ -207,8 +197,7 @@ def test_rda_error_metadata():
                                       'GBDX_PASSWORD': 'password'}):
             with gdaltest.error_handler():
                 ds = gdal.Open('{"graph-id":"foo","node-id":"bar"}')
-    if ds is not None:
-        return 'fail'
+    assert ds is None
 
     # invalid json
     handler = webserver.SequentialHandler()
@@ -222,8 +211,7 @@ def test_rda_error_metadata():
                                       'GBDX_PASSWORD': 'password'}):
             with gdaltest.error_handler():
                 ds = gdal.Open('{"graph-id":"foo","node-id":"bar"}')
-    if ds is not None:
-        return 'fail'
+    assert ds is None
 
     # a lot of missing elements
     handler = webserver.SequentialHandler()
@@ -235,8 +223,7 @@ def test_rda_error_metadata():
                                       'GBDX_PASSWORD': 'password'}):
             with gdaltest.error_handler():
                 ds = gdal.Open('{"graph-id":"foo","node-id":"bar"}')
-    if ds is not None:
-        return 'fail'
+    assert ds is None
 
     # Bad dataType
     handler = webserver.SequentialHandler()
@@ -271,8 +258,7 @@ def test_rda_error_metadata():
                                       'GBDX_PASSWORD': 'password'}):
             with gdaltest.error_handler():
                 ds = gdal.Open('{"graph-id":"foo","node-id":"bar"}')
-    if ds is not None:
-        return 'fail'
+    assert ds is None
 
     # Huge numBands
     handler = webserver.SequentialHandler()
@@ -307,8 +293,7 @@ def test_rda_error_metadata():
                                       'GBDX_PASSWORD': 'password'}):
             with gdaltest.error_handler():
                 ds = gdal.Open('{"graph-id":"foo","node-id":"bar"}')
-    if ds is not None:
-        return 'fail'
+    assert ds is None
 
     # Invalid dataset dimensions
     handler = webserver.SequentialHandler()
@@ -343,8 +328,7 @@ def test_rda_error_metadata():
                                       'GBDX_PASSWORD': 'password'}):
             with gdaltest.error_handler():
                 ds = gdal.Open('{"graph-id":"foo","node-id":"bar"}')
-    if ds is not None:
-        return 'fail'
+    assert ds is None
 
     return 'success'
 
@@ -403,14 +387,10 @@ def test_rda_graph_nominal():
     with webserver.install_http_handler(handler):
         with gdaltest.config_options(config_options):
             ds = gdal.Open('{"graph-id":"foo","node-id":"bar","options":{"delete-on-close":false}}')
-    if ds is None:
-        return 'fail'
-    if ds.RasterCount != 3:
-        return 'fail'
-    if ds.RasterXSize != 320:
-        return 'fail'
-    if ds.RasterYSize != 300:
-        return 'fail'
+    assert ds is not None
+    assert ds.RasterCount == 3
+    assert ds.RasterXSize == 320
+    assert ds.RasterYSize == 300
     expected_md = {
         'SENSOR_NAME': 'SENSOR_NAME',
         'CLOUD_COVER': '1.2',
@@ -423,14 +403,10 @@ def test_rda_graph_nominal():
         'SAT_ELEVATION': '5.2'
     }
     got_md = ds.GetMetadata()
-    if got_md != expected_md:
-        print(got_md)
-        return 'fail'
-    if ds.GetRasterBand(1).GetColorInterpretation() != gdal.GCI_RedBand:
-        return 'fail'
+    assert got_md == expected_md
+    assert ds.GetRasterBand(1).GetColorInterpretation() == gdal.GCI_RedBand
 
-    if ds.GetProjectionRef() != '':
-        return 'fail'
+    assert ds.GetProjectionRef() == ''
 
     ds = None
 
@@ -440,14 +416,10 @@ def test_rda_graph_nominal():
             with open('tmp/rda_test1.dgrda', "w") as fd:
                 fd.write('{"graph-id":"foo","node-id":"bar","options":{"delete-on-close":false}}')
             ds = gdal.Open('tmp/rda_test1.dgrda')
-    if ds is None:
-        return 'fail'
-    if ds.RasterCount != 3:
-        return 'fail'
-    if ds.RasterXSize != 320:
-        return 'fail'
-    if ds.RasterYSize != 300:
-        return 'fail'
+    assert ds is not None
+    assert ds.RasterCount == 3
+    assert ds.RasterXSize == 320
+    assert ds.RasterYSize == 300
     expected_md = {
         'SENSOR_NAME': 'SENSOR_NAME',
         'CLOUD_COVER': '1.2',
@@ -460,14 +432,10 @@ def test_rda_graph_nominal():
         'SAT_ELEVATION': '5.2'
     }
     got_md = ds.GetMetadata()
-    if got_md != expected_md:
-        print(got_md)
-        return 'fail'
-    if ds.GetRasterBand(1).GetColorInterpretation() != gdal.GCI_RedBand:
-        return 'fail'
+    assert got_md == expected_md
+    assert ds.GetRasterBand(1).GetColorInterpretation() == gdal.GCI_RedBand
 
-    if ds.GetProjectionRef() != '':
-        return 'fail'
+    assert ds.GetProjectionRef() == ''
 
     try:
         os.remove('tmp/rda_test1.dgrda')
@@ -478,10 +446,8 @@ def test_rda_graph_nominal():
     # Retry without any network setup to test caching
     with gdaltest.config_options(config_options):
         ds = gdal.Open('{"graph-id":"foo","node-id":"bar","options":{"delete-on-close":false}}')
-    if ds is None:
-        return 'fail'
-    if ds.RasterCount != 3:
-        return 'fail'
+    assert ds is not None
+    assert ds.RasterCount == 3
 
     gdal.RmdirRecursive('/vsimem/cache_dir')
 
@@ -494,15 +460,11 @@ def test_rda_graph_nominal():
     with webserver.install_http_handler(handler):
         with gdaltest.config_options(config_options):
             ds = gdal.Open('{"graph-id":"foo","node-id":"bar","options":{"delete-on-close":false}}')
-        if ds is None:
-            return 'fail'
-        if ds.GetProjectionRef().find('32631') < 0:
-            return 'fail'
+        assert ds is not None
+        assert ds.GetProjectionRef().find('32631') >= 0
 
     got_gt = ds.GetGeoTransform()
-    if got_gt != (125.0, 1.0, 0.0, 462.0, 0.0, 2.0):
-        print(got_gt)
-        return 'fail'
+    assert got_gt == (125.0, 1.0, 0.0, 462.0, 0.0, 2.0)
 
     ds = None
 
@@ -510,9 +472,7 @@ def test_rda_graph_nominal():
     with gdaltest.config_options(config_options):
         ds = gdal.Open('{"graph-id":"foo","node-id":"bar","options":{"delete-on-close":false}}')
     got_gt = ds.GetGeoTransform()
-    if got_gt != (125.0, 1.0, 0.0, 462.0, 0.0, 2.0):
-        print(got_gt)
-        return 'fail'
+    assert got_gt == (125.0, 1.0, 0.0, 462.0, 0.0, 2.0)
 
     gdal.RmdirRecursive('/vsimem/cache_dir')
 
@@ -525,10 +485,8 @@ def test_rda_graph_nominal():
     with webserver.install_http_handler(handler):
         with gdaltest.config_options(config_options):
             ds = gdal.Open('{"graph-id":"foo","node-id":"bar","options":{"delete-on-close":false}}')
-        if ds is None:
-            return 'fail'
-        if ds.GetMetadata('RPC') != {}:
-            return 'fail'
+        assert ds is not None
+        assert ds.GetMetadata('RPC') == {}
 
     gdal.RmdirRecursive('/vsimem/cache_dir')
 
@@ -543,10 +501,8 @@ def test_rda_graph_nominal():
     with webserver.install_http_handler(handler):
         with gdaltest.config_options(config_options):
             ds = gdal.Open('{"graph-id":"foo","node-id":"bar","options":{"delete-on-close":false}}')
-        if ds is None:
-            return 'fail'
-        if ds.GetMetadata('RPC') != {}:
-            return 'fail'
+        assert ds is not None
+        assert ds.GetMetadata('RPC') == {}
 
     tile_ds = gdal.GetDriverByName('GTiff').Create('/vsimem/tile_00.tif', 256, 256, 3)
     tile_ds.GetRasterBand(1).Fill(255)
@@ -595,36 +551,26 @@ def test_rda_graph_nominal():
     handler.add('GET', '/rda_api/tile/foo/bar/1/1.tif', 200, {}, tile11_data)
     with webserver.install_http_handler(handler):
         cs = [ds.GetRasterBand(i + 1).Checksum() for i in range(3)]
-    if cs != [54287, 50451, 21110]:
-        print(cs)
-        return 'fail'
+    assert cs == [54287, 50451, 21110]
 
     # Retry without any network setup to test caching
     with gdaltest.config_options(config_options):
         ds = gdal.Open('{"graph-id":"foo","node-id":"bar","options":{"delete-on-close":false}}')
     cs = [ds.GetRasterBand(i + 1).Checksum() for i in range(3)]
-    if cs != [54287, 50451, 21110]:
-        print(cs)
-        return 'fail'
+    assert cs == [54287, 50451, 21110]
 
     data = struct.unpack('B' * (320 * 300 * 3), ds.ReadRaster())
-    if data[0] != 255:
-        return 'fail'
+    assert data[0] == 255
 
-    if data[0 + 320 * 300] != 250:
-        return 'fail'
+    assert data[0 + 320 * 300] == 250
 
-    if data[0 + 320 * 300 * 2] != 245:
-        return 'fail'
+    assert data[0 + 320 * 300 * 2] == 245
 
-    if data[319] != 240:
-        return 'fail'
+    assert data[319] == 240
 
-    if data[320 * 299] != 225:
-        return 'fail'
+    assert data[320 * 299] == 225
 
-    if data[320 * 299 + 319] != 210:
-        return 'fail'
+    assert data[320 * 299 + 319] == 210
 
     ds = None
 
@@ -678,18 +624,15 @@ def test_rda_graph_nominal():
         data = ds.GetRasterBand(1).ReadBlock(0, 0)
 
     data = struct.unpack('B' * (256 * 256), data)
-    if data[0] != 255:
-        return 'fail'
-    if data[256 * (256 - 2)] != 225:
-        return 'fail'
+    assert data[0] == 255
+    assert data[256 * (256 - 2)] == 225
 
 
     # Try IReadBlock() when data for other bands is already cached
     ds.GetRasterBand(1).FlushCache()
     data = ds.GetRasterBand(1).ReadBlock(0, 0)
     data = struct.unpack('B' * (256 * 256), data)
-    if data[0] != 255:
-        return 'fail'
+    assert data[0] == 255
 
     gdal.RmdirRecursive('/vsimem/cache_dir')
 
@@ -704,8 +647,7 @@ def test_rda_graph_nominal():
             ds = gdal.Open('{"graph-id":"foo","node-id":"bar","options":{"delete-on-close":false}}')
             with gdaltest.error_handler():
                 data = ds.GetRasterBand(1).ReadBlock(0, 0)
-                if data is not None:
-                    return 'fail'
+                assert data is None
 
     gdal.RmdirRecursive('/vsimem/cache_dir')
 
@@ -758,26 +700,19 @@ def test_rda_template_nominal():
     with webserver.install_http_handler(handler):
         with gdaltest.config_options(config_options):
             ds = gdal.Open('{"template-id": "foo","params": [{"nodeId": "bar"}],"options":{"delete-on-close":false}}')
-    if ds is None:
-        return 'fail'
-    if ds.RasterCount != 3:
-        return 'fail'
-    if ds.RasterXSize != 320:
-        return 'fail'
-    if ds.RasterYSize != 300:
-        return 'fail'
-    if ds.GetProjectionRef() != '':
-        return 'fail'
+    assert ds is not None
+    assert ds.RasterCount == 3
+    assert ds.RasterXSize == 320
+    assert ds.RasterYSize == 300
+    assert ds.GetProjectionRef() == ''
 
     ds = None
 
     # Retry without any network setup to test caching
     with gdaltest.config_options(config_options):
         ds = gdal.Open('{"template-id": "foo","params": [{"nodeId": "bar"}],"options":{"delete-on-close":false}}')
-    if ds is None:
-        return 'fail'
-    if ds.RasterCount != 3:
-        return 'fail'
+    assert ds is not None
+    assert ds.RasterCount == 3
 
     gdal.RmdirRecursive('/vsimem/cache_dir')
 
@@ -790,15 +725,11 @@ def test_rda_template_nominal():
     with webserver.install_http_handler(handler):
         with gdaltest.config_options(config_options):
             ds = gdal.Open('{"template-id": "foo","params": [{"nodeId": "bar"}],"options":{"delete-on-close":false}}')
-        if ds is None:
-            return 'fail'
-        if ds.GetProjectionRef().find('32631') < 0:
-            return 'fail'
+        assert ds is not None
+        assert ds.GetProjectionRef().find('32631') >= 0
 
     got_gt = ds.GetGeoTransform()
-    if got_gt != (125.0, 1.0, 0.0, 462.0, 0.0, 2.0):
-        print(got_gt)
-        return 'fail'
+    assert got_gt == (125.0, 1.0, 0.0, 462.0, 0.0, 2.0)
 
     ds = None
 
@@ -806,9 +737,7 @@ def test_rda_template_nominal():
     with gdaltest.config_options(config_options):
         ds = gdal.Open('{"template-id": "foo","params": [{"nodeId": "bar"}],"options":{"delete-on-close":false}}')
     got_gt = ds.GetGeoTransform()
-    if got_gt != (125.0, 1.0, 0.0, 462.0, 0.0, 2.0):
-        print(got_gt)
-        return 'fail'
+    assert got_gt == (125.0, 1.0, 0.0, 462.0, 0.0, 2.0)
 
     gdal.RmdirRecursive('/vsimem/cache_dir')
 
@@ -864,36 +793,26 @@ def test_rda_template_nominal():
             ds = gdal.Open('{"template-id": "foo","params": [{"nodeId": "bar"}],"options":{"delete-on-close":false}}')
 
         cs = [ds.GetRasterBand(i + 1).Checksum() for i in range(3)]
-        if cs != [54287, 50451, 21110]:
-            print(cs)
-            return 'fail'
+        assert cs == [54287, 50451, 21110]
 
     # Retry without any network setup to test caching
     with gdaltest.config_options(config_options):
         ds = gdal.Open('{"template-id": "foo","params": [{"nodeId": "bar"}],"options":{"delete-on-close":false}}')
     cs = [ds.GetRasterBand(i + 1).Checksum() for i in range(3)]
-    if cs != [54287, 50451, 21110]:
-        print(cs)
-        return 'fail'
+    assert cs == [54287, 50451, 21110]
 
     data = struct.unpack('B' * (320 * 300 * 3), ds.ReadRaster())
-    if data[0] != 255:
-        return 'fail'
+    assert data[0] == 255
 
-    if data[0 + 320 * 300] != 250:
-        return 'fail'
+    assert data[0 + 320 * 300] == 250
 
-    if data[0 + 320 * 300 * 2] != 245:
-        return 'fail'
+    assert data[0 + 320 * 300 * 2] == 245
 
-    if data[319] != 240:
-        return 'fail'
+    assert data[319] == 240
 
-    if data[320 * 299] != 225:
-        return 'fail'
+    assert data[320 * 299] == 225
 
-    if data[320 * 299 + 319] != 210:
-        return 'fail'
+    assert data[320 * 299 + 319] == 210
 
     ds = None
 
@@ -979,26 +898,19 @@ def test_rda_template_image_reference_nominal():
     with webserver.install_http_handler(handler):
         with gdaltest.config_options(config_options):
             ds = gdal.Open('{"templateId": "foo", "nodeId": "bar", "parameters": {"p1": "baz"},"options":{"delete-on-close":false}}')
-    if ds is None:
-        return 'fail'
-    if ds.RasterCount != 3:
-        return 'fail'
-    if ds.RasterXSize != 320:
-        return 'fail'
-    if ds.RasterYSize != 300:
-        return 'fail'
-    if ds.GetProjectionRef() != '':
-        return 'fail'
+    assert ds is not None
+    assert ds.RasterCount == 3
+    assert ds.RasterXSize == 320
+    assert ds.RasterYSize == 300
+    assert ds.GetProjectionRef() == ''
 
     ds = None
 
     # Retry without any network setup to test caching
     with gdaltest.config_options(config_options):
         ds = gdal.Open('{"templateId": "foo", "nodeId": "bar", "parameters": {"p1": "baz"},"options":{"delete-on-close":false}}')
-    if ds is None:
-        return 'fail'
-    if ds.RasterCount != 3:
-        return 'fail'
+    assert ds is not None
+    assert ds.RasterCount == 3
 
     gdal.RmdirRecursive('/vsimem/cache_dir')
 
@@ -1011,15 +923,11 @@ def test_rda_template_image_reference_nominal():
     with webserver.install_http_handler(handler):
         with gdaltest.config_options(config_options):
             ds = gdal.Open('{"templateId": "foo", "nodeId": "bar", "parameters": {"p1": "baz"},"options":{"delete-on-close":false}}')
-        if ds is None:
-            return 'fail'
-        if ds.GetProjectionRef().find('32631') < 0:
-            return 'fail'
+        assert ds is not None
+        assert ds.GetProjectionRef().find('32631') >= 0
 
     got_gt = ds.GetGeoTransform()
-    if got_gt != (125.0, 1.0, 0.0, 462.0, 0.0, 2.0):
-        print(got_gt)
-        return 'fail'
+    assert got_gt == (125.0, 1.0, 0.0, 462.0, 0.0, 2.0)
 
     ds = None
 
@@ -1027,9 +935,7 @@ def test_rda_template_image_reference_nominal():
     with gdaltest.config_options(config_options):
         ds = gdal.Open('{"templateId": "foo", "nodeId": "bar", "parameters": {"p1": "baz"},"options":{"delete-on-close":false}}')
     got_gt = ds.GetGeoTransform()
-    if got_gt != (125.0, 1.0, 0.0, 462.0, 0.0, 2.0):
-        print(got_gt)
-        return 'fail'
+    assert got_gt == (125.0, 1.0, 0.0, 462.0, 0.0, 2.0)
 
     gdal.RmdirRecursive('/vsimem/cache_dir')
 
@@ -1085,36 +991,26 @@ def test_rda_template_image_reference_nominal():
             ds = gdal.Open('{"templateId": "foo", "nodeId": "bar", "parameters": {"p1": "baz"},"options":{"delete-on-close":false}}')
 
         cs = [ds.GetRasterBand(i + 1).Checksum() for i in range(3)]
-        if cs != [54287, 50451, 21110]:
-            print(cs)
-            return 'fail'
+        assert cs == [54287, 50451, 21110]
 
     # Retry without any network setup to test caching
     with gdaltest.config_options(config_options):
         ds = gdal.Open('{"templateId": "foo", "nodeId": "bar", "parameters": {"p1": "baz"},"options":{"delete-on-close":false}}')
     cs = [ds.GetRasterBand(i + 1).Checksum() for i in range(3)]
-    if cs != [54287, 50451, 21110]:
-        print(cs)
-        return 'fail'
+    assert cs == [54287, 50451, 21110]
 
     data = struct.unpack('B' * (320 * 300 * 3), ds.ReadRaster())
-    if data[0] != 255:
-        return 'fail'
+    assert data[0] == 255
 
-    if data[0 + 320 * 300] != 250:
-        return 'fail'
+    assert data[0 + 320 * 300] == 250
 
-    if data[0 + 320 * 300 * 2] != 245:
-        return 'fail'
+    assert data[0 + 320 * 300 * 2] == 245
 
-    if data[319] != 240:
-        return 'fail'
+    assert data[319] == 240
 
-    if data[320 * 299] != 225:
-        return 'fail'
+    assert data[320 * 299] == 225
 
-    if data[320 * 299 + 319] != 210:
-        return 'fail'
+    assert data[320 * 299 + 319] == 210
 
     ds = None
 
@@ -1172,8 +1068,7 @@ def test_rda_read_gbdx_config():
     with webserver.install_http_handler(handler):
         with gdaltest.config_options(config_options):
             ds = gdal.Open('{"graph-id":"foo","node-id":"bar","options":{"delete-on-close":false}}')
-    if ds is None:
-        return 'fail'
+    assert ds is not None
 
     gdal.Unlink('/vsimem/.gbdx-config')
 
@@ -1252,8 +1147,7 @@ def test_rda_download_queue():
     handler = webserver.SequentialHandler()
     with webserver.install_http_handler(handler):
         data = ds.ReadRaster(0, 1, 4, 2)
-    if data != ref_data:
-        return 'fail'
+    assert data == ref_data
 
     return 'success'
 
@@ -1311,8 +1205,7 @@ def test_rda_rpc():
         with gdaltest.config_options(config_options):
             ds = gdal.Open('{"graph-id":"foo","node-id":"bar","options":{"delete-on-close":false}}')
         md = ds.GetMetadata('RPC')
-    if md != {}:
-        return 'fail'
+    assert md == {}
 
     gdal.RmdirRecursive('/vsimem/cache_dir')
 
@@ -1327,8 +1220,7 @@ def test_rda_rpc():
             ds = gdal.Open('{"graph-id":"foo","node-id":"bar","options":{"delete-on-close":false}}')
         with gdaltest.error_handler():
             md = ds.GetMetadata('RPC')
-    if md != {}:
-        return 'fail'
+    assert md == {}
 
     gdal.RmdirRecursive('/vsimem/cache_dir')
 
@@ -1344,16 +1236,12 @@ def test_rda_rpc():
     expected_md = {'HEIGHT_OFF': '151', 'SAMP_OFF': '13775', 'LINE_NUM_COEFF': '0.00346238799999999984 -0.00331988499999999985 -1.00417299999999998 -0.000569458199999999968 0.00138283000000000004 1.97361499999999982e-06 0.000360684200000000019 -0.000828726199999999967 -0.00134833700000000002 3.39903600000000002e-07 -1.43147900000000003e-06 1.05879399999999997e-06 2.70590600000000004e-05 -9.73226600000000015e-08 -2.98801499999999988e-05 -0.000120552999999999996 -2.95605399999999987e-05 2.81748900000000025e-07 0 -1.66303899999999993e-08', 'LONG_OFF': '2.19589999999999996', 'MIN_LAT': '48.6908414600000015', 'MAX_LONG': '2.31489579000000001', 'LINE_SCALE': '13314', 'SAMP_NUM_COEFF': '-0.0036275840000000001 1.01546899999999996 -0.0016947380000000001 -0.0107358999999999996 -0.00195866699999999987 0.000532514199999999951 -0.000400355199999999985 0.00366687099999999993 0.0002035126 -5.42788399999999972e-06 -1.176796e-06 -1.53613099999999988e-05 -6.90779199999999995e-05 -1.67062600000000002e-05 7.90828899999999939e-05 -4.44276200000000027e-06 1.14346699999999995e-07 3.32255499999999999e-06 8.62453100000000019e-07 1.74167099999999993e-07', 'LONG_SCALE': '0.120300000000000004', 'SAMP_DEN_COEFF': '1 -3.70703199999999978e-05 0.00197828100000000014 -0.000580411299999999963 -4.49799400000000022e-05 -2.65957199999999999e-06 9.73095999999999941e-07 -1.25065499999999997e-05 4.71401100000000002e-05 -1.69761699999999998e-05 -6.04184799999999996e-08 0 2.17301699999999993e-07 5.60807800000000004e-08 -2.6601939999999999e-07 -2.02055599999999998e-07 -6.34738299999999952e-08 1.32195600000000006e-08 -8.62653499999999976e-08 1.90874699999999984e-08', 'MIN_LONG': '2.07724377999999987', 'SAMP_SCALE': '13776', 'MAX_LAT': '48.8406507799999972', 'LAT_SCALE': '0.0749999999999999972', 'LAT_OFF': '48.7657000000000025', 'LINE_OFF': '13313', 'LINE_DEN_COEFF': '1 0.00139346600000000011 0.002175939 0.000361590300000000006 1.18845299999999999e-05 -5.55040999999999947e-07 -2.20758000000000013e-06 1.68834400000000011e-05 -6.33621000000000011e-05 2.9116880000000001e-05 -2.33314100000000006e-08 1.36765299999999997e-07 1.00699499999999992e-06 8.29065599999999946e-08 -7.30275400000000041e-07 -0.0001959288 2.55592200000000014e-08 2.07427299999999992e-08 6.76678700000000044e-07 2.106776e-08', 'HEIGHT_SCALE': '500'}
     for key in expected_md:
         if not key.endswith('_COEFF'):
-            if abs(float(expected_md[key]) - float(md[key])) > 1e-8 * abs(float(expected_md[key])):
-                print(key, md)
-                return 'fail'
+            assert abs(float(expected_md[key]) - float(md[key])) <= 1e-8 * abs(float(expected_md[key]))
         else:
             expected_vals = [float(v) for v in expected_md[key].split(' ')]
             got_vals = [float(v) for v in md[key].split(' ')]
             for x in range(20):
-                if abs(expected_vals[x] - got_vals[x]) > 1e-8 * abs(expected_vals[x]):
-                    print(key, md)
-                    return 'fail'
+                assert abs(expected_vals[x] - got_vals[x]) <= 1e-8 * abs(expected_vals[x]), (key, md)
     ds = None
     gdal.RmdirRecursive('/vsimem/cache_dir')
 
@@ -1420,8 +1308,7 @@ def test_rda_real_cache_dir():
         with gdaltest.config_options(config_options):
             gdal.Open('{"graph-id":"foo","node-id":"bar","options":{"delete-on-close":false}}')
 
-    if not os.path.exists(cached_file):
-        return 'fail'
+    assert os.path.exists(cached_file)
     gdal.RmdirRecursive(os.path.join(home, '.gdal', 'rda_cache', 'foo'))
 
     handler = webserver.SequentialHandler()
@@ -1432,8 +1319,7 @@ def test_rda_real_cache_dir():
         with gdaltest.config_options(config_options):
             gdal.Open('{"graph-id":"foo","node-id":"bar"}')
 
-    if os.path.exists(os.path.join(home, '.gdal', 'rda_cache', 'foo')):
-        return 'fail'
+    assert not os.path.exists(os.path.join(home, '.gdal', 'rda_cache', 'foo'))
 
     # 493 = 0755
     gdal.MkdirRecursive(os.path.join(home, '.gdal', 'rda_cache', 'foo', 'baz'), 493)
@@ -1446,8 +1332,7 @@ def test_rda_real_cache_dir():
         with gdaltest.config_options(config_options):
             gdal.Open('{"graph-id":"foo","node-id":"bar"}')
 
-    if not os.path.exists(os.path.join(home, '.gdal', 'rda_cache', 'foo', 'baz')):
-        return 'fail'
+    assert os.path.exists(os.path.join(home, '.gdal', 'rda_cache', 'foo', 'baz'))
 
     gdal.RmdirRecursive(os.path.join(home, '.gdal', 'rda_cache', 'foo'))
 
@@ -1576,8 +1461,7 @@ def test_rda_bad_tile():
             ds = gdal.Open('{"graph-id":"foo","node-id":"bar"}')
         with gdaltest.error_handler():
             data = ds.ReadRaster()
-        if data is not None:
-            return 'fail'
+        assert data is None
     ds = None
 
     gdal.RmdirRecursive('/vsimem/cache_dir')
@@ -1591,8 +1475,7 @@ def test_rda_bad_tile():
             ds = gdal.Open('{"graph-id":"foo","node-id":"bar"}')
         with gdaltest.error_handler():
             data = ds.GetRasterBand(1).ReadBlock(0, 0)
-        if data is not None:
-            return 'fail'
+        assert data is None
     ds = None
 
     gdal.RmdirRecursive('/vsimem/cache_dir')
@@ -1606,8 +1489,7 @@ def test_rda_bad_tile():
             ds = gdal.Open('{"graph-id":"foo","node-id":"bar"}')
         with gdaltest.error_handler():
             data = ds.ReadRaster()
-        if data is not None:
-            return 'fail'
+        assert data is None
     ds = None
 
     gdal.RmdirRecursive('/vsimem/cache_dir')
@@ -1621,8 +1503,7 @@ def test_rda_bad_tile():
             ds = gdal.Open('{"graph-id":"foo","node-id":"bar"}')
         with gdaltest.error_handler():
             data = ds.GetRasterBand(1).ReadBlock(0, 0)
-        if data is not None:
-            return 'fail'
+        assert data is None
     ds = None
 
     return 'success'
diff --git a/autotest/gdrivers/rl2.py b/autotest/gdrivers/rl2.py
index 2df7ba3c6e85..c8b35c829cf8 100755
--- a/autotest/gdrivers/rl2.py
+++ b/autotest/gdrivers/rl2.py
@@ -61,56 +61,39 @@ def test_rl2_2():
 
     ds = gdal.Open('data/byte.rl2')
 
-    if ds.RasterCount != 1:
-        gdaltest.post_reason('expected 1 band')
-        return 'fail'
+    assert ds.RasterCount == 1, 'expected 1 band'
 
-    if ds.GetRasterBand(1).GetOverviewCount() != 0:
-        gdaltest.post_reason('did not expect overview')
-        return 'fail'
+    assert ds.GetRasterBand(1).GetOverviewCount() == 0, 'did not expect overview'
 
     cs = ds.GetRasterBand(1).Checksum()
-    if cs != 4672:
-        print(cs)
-        return 'fail'
+    assert cs == 4672
 
     gt = ds.GetGeoTransform()
     expected_gt = (440720.0, 60.0, 0.0, 3751320.0, 0.0, -60.0)
     for i in range(6):
-        if abs(gt[i] - expected_gt[i]) > 1e-15:
-            print(gt)
-            print(expected_gt)
-            return 'fail'
+        assert abs(gt[i] - expected_gt[i]) <= 1e-15
 
     wkt = ds.GetProjectionRef()
-    if wkt.find('26711') < 0:
-        return 'fail'
+    assert wkt.find('26711') >= 0
 
-    if ds.GetRasterBand(1).GetColorInterpretation() != gdal.GCI_GrayIndex:
-        return 'fail'
+    assert ds.GetRasterBand(1).GetColorInterpretation() == gdal.GCI_GrayIndex
 
-    if ds.GetRasterBand(1).GetMinimum() != 74:
-        return 'fail'
+    assert ds.GetRasterBand(1).GetMinimum() == 74
 
-    if ds.GetRasterBand(1).GetOverview(-1) is not None:
-        return 'fail'
+    assert ds.GetRasterBand(1).GetOverview(-1) is None
 
-    if ds.GetRasterBand(1).GetOverview(0) is not None:
-        return 'fail'
+    assert ds.GetRasterBand(1).GetOverview(0) is None
 
     subds = ds.GetSubDatasets()
     expected_subds = []
-    if subds != expected_subds:
-        return 'fail'
+    assert subds == expected_subds
 
     gdal.SetConfigOption('RL2_SHOW_ALL_PYRAMID_LEVELS', 'YES')
     ds = gdal.Open('data/byte.rl2')
     gdal.SetConfigOption('RL2_SHOW_ALL_PYRAMID_LEVELS', None)
 
     cs = ds.GetRasterBand(1).GetOverview(0).Checksum()
-    if cs != 1087:
-        print(cs)
-        return 'fail'
+    assert cs == 1087
 
     return 'success'
 
@@ -125,49 +108,34 @@ def test_rl2_3():
 
     ds = gdal.Open('data/small_world.rl2')
 
-    if ds.GetRasterBand(1).GetColorInterpretation() != gdal.GCI_RedBand:
-        return 'fail'
+    assert ds.GetRasterBand(1).GetColorInterpretation() == gdal.GCI_RedBand
 
     ds.GetRasterBand(1).GetNoDataValue()
 
     cs = ds.GetRasterBand(1).Checksum()
-    if cs != 25550:
-        print(cs)
-        return 'fail'
+    assert cs == 25550
 
     cs = ds.GetRasterBand(2).Checksum()
-    if cs != 28146:
-        print(cs)
-        return 'fail'
+    assert cs == 28146
 
-    if ds.GetRasterBand(1).GetOverviewCount() != 2:
-        return 'fail'
+    assert ds.GetRasterBand(1).GetOverviewCount() == 2
 
     cs = ds.GetRasterBand(1).GetOverview(1).Checksum()
-    if cs != 51412:
-        print(cs)
-        return 'fail'
+    assert cs == 51412
 
     subds = ds.GetSubDatasets()
     expected_subds = [('RASTERLITE2:data/small_world.rl2:small_world:1:world_west', 'Coverage small_world, section world_west / 1'), ('RASTERLITE2:data/small_world.rl2:small_world:2:world_east', 'Coverage small_world, section world_east / 2')]
-    if subds != expected_subds:
-        print(subds)
-        return 'fail'
+    assert subds == expected_subds
 
     ds = gdal.Open('RASTERLITE2:data/small_world.rl2:small_world:1:world_west')
 
     cs = ds.GetRasterBand(1).Checksum()
-    if cs != 3721:
-        print(cs)
-        return 'fail'
+    assert cs == 3721
 
-    if ds.GetRasterBand(1).GetOverviewCount() != 1:
-        return 'fail'
+    assert ds.GetRasterBand(1).GetOverviewCount() == 1
 
     cs = ds.GetRasterBand(1).GetOverview(0).Checksum()
-    if cs != 35686:
-        print(cs)
-        return 'fail'
+    assert cs == 35686
 
     return 'success'
 
@@ -182,29 +150,20 @@ def test_rl2_4():
 
     ds = gdal.Open('data/small_world_pct.rl2')
 
-    if ds.GetRasterBand(1).GetColorInterpretation() != gdal.GCI_PaletteIndex:
-        return 'fail'
+    assert ds.GetRasterBand(1).GetColorInterpretation() == gdal.GCI_PaletteIndex
 
     cs = ds.GetRasterBand(1).Checksum()
-    if cs != 14890:
-        print(cs)
-        return 'fail'
+    assert cs == 14890
 
     pct = ds.GetRasterBand(1).GetColorTable()
-    if pct.GetCount() != 256:
-        return 'fail'
-    if pct.GetColorEntry(1) != (176, 184, 176, 255):
-        print(pct.GetColorEntry(1))
-        return 'fail'
+    assert pct.GetCount() == 256
+    assert pct.GetColorEntry(1) == (176, 184, 176, 255)
 
     pct = ds.GetRasterBand(1).GetColorTable()
-    if pct.GetCount() != 256:
-        return 'fail'
+    assert pct.GetCount() == 256
 
     cs = ds.GetRasterBand(1).GetOverview(0).Checksum()
-    if cs != 35614:
-        print(cs)
-        return 'fail'
+    assert cs == 35614
 
     return 'success'
 
@@ -221,9 +180,7 @@ def test_rl2_5():
 
     subds = ds.GetSubDatasets()
     expected_subds = [('RASTERLITE2:data/multi_type.rl2:uint8', 'Coverage uint8'), ('RASTERLITE2:data/multi_type.rl2:int8', 'Coverage int8'), ('RASTERLITE2:data/multi_type.rl2:uint16', 'Coverage uint16'), ('RASTERLITE2:data/multi_type.rl2:int16', 'Coverage int16'), ('RASTERLITE2:data/multi_type.rl2:uint32', 'Coverage uint32'), ('RASTERLITE2:data/multi_type.rl2:int32', 'Coverage int32'), ('RASTERLITE2:data/multi_type.rl2:float', 'Coverage float'), ('RASTERLITE2:data/multi_type.rl2:double', 'Coverage double'), ('RASTERLITE2:data/multi_type.rl2:1bit', 'Coverage 1bit'), ('RASTERLITE2:data/multi_type.rl2:2bit', 'Coverage 2bit'), ('RASTERLITE2:data/multi_type.rl2:4bit', 'Coverage 4bit')]
-    if subds != expected_subds:
-        print(subds)
-        return 'fail'
+    assert subds == expected_subds
 
     tests = [('RASTERLITE2:data/multi_type.rl2:uint8', gdal.GDT_Byte, 4672),
              ('RASTERLITE2:data/multi_type.rl2:int8', gdal.GDT_Byte, 4575),
@@ -236,17 +193,11 @@ def test_rl2_5():
              ('RASTERLITE2:data/multi_type.rl2:1bit', gdal.GDT_Byte, 4873)]
     for (subds_name, dt, expected_cs) in tests:
         ds = gdal.Open(subds_name)
-        if ds.GetRasterBand(1).DataType != dt:
-            print(subds_name)
-            return 'fail'
+        assert ds.GetRasterBand(1).DataType == dt, subds_name
         cs = ds.GetRasterBand(1).Checksum()
-        if cs != expected_cs:
-            print(cs)
-            return 'fail'
+        assert cs == expected_cs
         if subds_name == 'RASTERLITE2:data/multi_type.rl2:int8':
-            if ds.GetRasterBand(1).GetMetadataItem('PIXELTYPE', 'IMAGE_STRUCTURE') != 'SIGNEDBYTE':
-                print(ds.GetRasterBand(1).GetMetadataItem('PIXELTYPE', 'IMAGE_STRUCTURE'))
-                return 'fail'
+            assert ds.GetRasterBand(1).GetMetadataItem('PIXELTYPE', 'IMAGE_STRUCTURE') == 'SIGNEDBYTE'
 
     return 'success'
 
@@ -461,9 +412,8 @@ def test_rl2_20():
         options = ['PIXEL_TYPE=' + pixel_type, 'COMPRESS=' + compress]
         with gdaltest.error_handler():
             out_ds = gdaltest.rl2_drv.CreateCopy('/vsimem/rl2_20.rl2', src_ds, options=options)
-        if out_ds is not None:
-            gdaltest.post_reason('Expected error for %s, band=%d, dt=%d, %s, nbits=%s' % (pixel_type, band_count, dt, compress, nbits))
-            return 'fail'
+        assert out_ds is None, \
+            ('Expected error for %s, band=%d, dt=%d, %s, nbits=%s' % (pixel_type, band_count, dt, compress, nbits))
 
     gdal.Unlink('/vsimem/rl2_20.rl2')
 
@@ -503,12 +453,10 @@ def test_rl2_21():
         if quality is not None:
             options += ['QUALITY=' + str(quality)]
         out_ds = gdaltest.rl2_drv.CreateCopy('/vsimem/rl2_21.rl2', src_ds, options=options)
-        if out_ds is None:
-            gdaltest.post_reason('Got error with %s, quality=%d' % (compress, quality))
-            return 'fail'
-        if out_ds.GetMetadataItem('COMPRESSION', 'IMAGE_STRUCTURE').find(compress) < 0:
-            gdaltest.post_reason('Compression %s does not seem to have been applied' % compress)
-            return 'fail'
+        assert out_ds is not None, \
+            ('Got error with %s, quality=%d' % (compress, quality))
+        assert out_ds.GetMetadataItem('COMPRESSION', 'IMAGE_STRUCTURE').find(compress) >= 0, \
+            ('Compression %s does not seem to have been applied' % compress)
 
     gdal.Unlink('/vsimem/rl2_21.rl2')
 
@@ -529,30 +477,22 @@ def test_rl2_22():
     ds.CreateLayer('foo', None, ogr.wkbPoint)
     ds = None
     ds = gdaltest.rl2_drv.CreateCopy('/vsimem/rl2_22.rl2', src_ds, options=['APPEND_SUBDATASET=YES', 'COVERAGE=byte'])
-    if ds.GetRasterBand(1).Checksum() != 4672:
-        print(ds.GetRasterBand(1).Checksum())
-        return 'fail'
+    assert ds.GetRasterBand(1).Checksum() == 4672
     ds = None
     ds = gdal.OpenEx('/vsimem/rl2_22.rl2')
-    if ds.RasterXSize != 20:
-        return 'fail'
-    if ds.GetLayerCount() != 1:
-        return 'fail'
+    assert ds.RasterXSize == 20
+    assert ds.GetLayerCount() == 1
 
     left_ds = gdal.Translate('left', src_ds, srcWin=[0, 0, 10, 20], format='MEM')
     right_ds = gdal.Translate('', src_ds, srcWin=[10, 0, 10, 20], format='MEM')
 
     gdaltest.rl2_drv.CreateCopy('/vsimem/rl2_22.rl2', left_ds, options=['COVERAGE=left_right'])
     ds = gdaltest.rl2_drv.CreateCopy('/vsimem/rl2_22.rl2', right_ds, options=['APPEND_SUBDATASET=YES', 'COVERAGE=left_right', 'SECTION=right'])
-    if ds.GetRasterBand(1).Checksum() != 4672:
-        print(ds.GetRasterBand(1).Checksum())
-        return 'fail'
+    assert ds.GetRasterBand(1).Checksum() == 4672
 
     src_ds = gdal.Open('data/rgbsmall.tif')
     ds = gdaltest.rl2_drv.CreateCopy('/vsimem/rl2_22.rl2', src_ds, options=['APPEND_SUBDATASET=YES', 'COVERAGE=rgbsmall'])
-    if ds.GetRasterBand(1).Checksum() != src_ds.GetRasterBand(1).Checksum():
-        print(ds.GetRasterBand(1).Checksum())
-        return 'fail'
+    assert ds.GetRasterBand(1).Checksum() == src_ds.GetRasterBand(1).Checksum()
     ds = None
 
     gdal.Unlink('/vsimem/rl2_22.rl2')
@@ -572,22 +512,14 @@ def test_rl2_23():
     src_ds = gdal.Translate('', src_ds, format='MEM', width=2048, height=2048)
     ds = gdaltest.rl2_drv.CreateCopy('/vsimem/rl2_23.rl2', src_ds)
     ret = ds.BuildOverviews('NEAR', [2])
-    if ret != 0:
-        return 'fail'
-    if ds.GetRasterBand(1).GetOverviewCount() != 5:
-        print(ds.GetRasterBand(1).GetOverviewCount())
-        return 'fail'
+    assert ret == 0
+    assert ds.GetRasterBand(1).GetOverviewCount() == 5
     cs = ds.GetRasterBand(1).GetOverview(0).Checksum()
-    if cs == 0:
-        print(cs)
-        return 'fail'
+    assert cs != 0
     ret = ds.BuildOverviews('NONE', [])
-    if ret != 0:
-        return 'fail'
+    assert ret == 0
     ds = gdal.Open('/vsimem/rl2_23.rl2')
-    if ds.GetRasterBand(1).GetOverviewCount() == 5:
-        print(ds.GetRasterBand(1).GetOverviewCount())
-        return 'fail'
+    assert ds.GetRasterBand(1).GetOverviewCount() != 5
     ds = None
 
     gdal.Unlink('/vsimem/rl2_23.rl2')
@@ -607,9 +539,7 @@ def test_rl2_24():
         return 'skip'
 
     ds = gdal.Open('data/byte.rl2.sql')
-    if ds.GetRasterBand(1).Checksum() != 4672:
-        gdaltest.post_reason('validation failed')
-        return 'fail'
+    assert ds.GetRasterBand(1).Checksum() == 4672, 'validation failed'
     return 'success'
 
 ###############################################################################
@@ -622,8 +552,7 @@ def test_rl2_error_create():
         return 'skip'
 
     with gdaltest.error_handler():
-        if gdaltest.rl2_drv.Create('/vsimem/out.db', 1, 1) is not None:
-            return 'fail'
+        assert gdaltest.rl2_drv.Create('/vsimem/out.db', 1, 1) is None
     return 'success'
 
 
diff --git a/autotest/gdrivers/rmf.py b/autotest/gdrivers/rmf.py
index 2fbf4a16a540..8312b58f7dd3 100755
--- a/autotest/gdrivers/rmf.py
+++ b/autotest/gdrivers/rmf.py
@@ -153,15 +153,11 @@ def test_rmf_11():
     test_fn = '/vsigzip/data/overviews.rsw.gz'
     src_ds = gdal.Open(test_fn)
 
-    if src_ds is None:
-        gdaltest.post_reason('Failed to open test dataset.')
-        return 'fail'
+    assert src_ds is not None, 'Failed to open test dataset.'
 
     band1 = src_ds.GetRasterBand(1)
 
-    if band1.GetOverviewCount() != 3:
-        gdaltest.post_reason('overviews is missing')
-        return 'fail'
+    assert band1.GetOverviewCount() == 3, 'overviews is missing'
 
     ovr_n = (0, 1, 2)
     ovr_size = (256, 64, 16)
@@ -229,36 +225,26 @@ def test_rmf_12d():
 def rmf_build_ov(source, testid, options, ov_sizes, crs, reopen=False, pass_count=1):
 
     rmf_drv = gdal.GetDriverByName('RMF')
-    if rmf_drv is None:
-        gdaltest.post_reason('RMF driver not found.')
-        return 'fail'
+    assert rmf_drv is not None, 'RMF driver not found.'
 
     src_ds = gdal.Open('data/' + source, gdal.GA_ReadOnly)
 
-    if src_ds is None:
-        gdaltest.post_reason('Failed to open test dataset.')
-        return 'fail'
+    assert src_ds is not None, 'Failed to open test dataset.'
 
     test_ds_name = 'tmp/ov-' + testid + '.tst'
     src_ds = rmf_drv.CreateCopy(test_ds_name, src_ds, options=options)
-    if src_ds is None:
-        gdaltest.post_reason('Failed to create test dataset copy.')
-        return 'fail'
+    assert src_ds is not None, 'Failed to create test dataset copy.'
 
     for _ in range(pass_count):
         if reopen:
             src_ds = None
             src_ds = gdal.Open(test_ds_name, gdal.GA_Update)
 
-            if src_ds is None:
-                gdaltest.post_reason('Failed to open test dataset.')
-                return 'fail'
+            assert src_ds is not None, 'Failed to open test dataset.'
 
         reopen = True
         err = src_ds.BuildOverviews(overviewlist=[2, 4])
-        if err != 0:
-            gdaltest.post_reason('BuildOverviews reports an error')
-            return 'fail'
+        assert err == 0, 'BuildOverviews reports an error'
 
         src_ds = None
         src_ds = gdal.Open(test_ds_name, gdal.GA_ReadOnly)
@@ -266,9 +252,7 @@ def rmf_build_ov(source, testid, options, ov_sizes, crs, reopen=False, pass_coun
         for iBand in range(src_ds.RasterCount):
             band = src_ds.GetRasterBand(iBand + 1)
 
-            if band.GetOverviewCount() != 2:
-                gdaltest.post_reason('overviews missing')
-                return 'fail'
+            assert band.GetOverviewCount() == 2, 'overviews missing'
 
             for iOverview in range(band.GetOverviewCount()):
                 ovr_band = band.GetOverview(iOverview)
@@ -444,48 +428,32 @@ def test_rmf_24():
 
 def test_rmf_25():
     rmf_drv = gdal.GetDriverByName('RMF')
-    if rmf_drv is None:
-        gdaltest.post_reason('RMF driver not found.')
-        return 'fail'
+    assert rmf_drv is not None, 'RMF driver not found.'
 
     src_ds = gdal.Open('data/byte.rsw', gdal.GA_ReadOnly)
 
-    if src_ds is None:
-        gdaltest.post_reason('Failed to open test dataset.')
-        return 'fail'
+    assert src_ds is not None, 'Failed to open test dataset.'
 
     test_ds_name = 'tmp/nodata.rsw'
     test_ds = rmf_drv.CreateCopy(test_ds_name, src_ds)
-    if test_ds is None:
-        gdaltest.post_reason('Failed to create test dataset copy.')
-        return 'fail'
+    assert test_ds is not None, 'Failed to create test dataset copy.'
 
     test_ds.GetRasterBand(1).SetNoDataValue(33)
     nd = test_ds.GetRasterBand(1).GetNoDataValue()
-    if nd != 33:
-        gdaltest.post_reason('Invalid NoData value after CreateCopy.')
-        return 'fail'
+    assert nd == 33, 'Invalid NoData value after CreateCopy.'
     test_ds = None
 
     test_ds = gdal.Open(test_ds_name, gdal.GA_Update)
-    if test_ds is None:
-        gdaltest.post_reason('Failed to reopen test dataset.')
-        return 'fail'
+    assert test_ds is not None, 'Failed to reopen test dataset.'
     nd = test_ds.GetRasterBand(1).GetNoDataValue()
-    if nd != 33:
-        gdaltest.post_reason('Invalid NoData value after dataset reopen.')
-        return 'fail'
+    assert nd == 33, 'Invalid NoData value after dataset reopen.'
     test_ds.GetRasterBand(1).SetNoDataValue(55)
     test_ds = None
 
     test_ds = gdal.Open(test_ds_name, gdal.GA_ReadOnly)
-    if test_ds is None:
-        gdaltest.post_reason('Failed to reopen test dataset.')
-        return 'fail'
+    assert test_ds is not None, 'Failed to reopen test dataset.'
     nd = test_ds.GetRasterBand(1).GetNoDataValue()
-    if nd != 55:
-        gdaltest.post_reason('Invalid NoData value after dataset update.')
-        return 'fail'
+    assert nd == 55, 'Invalid NoData value after dataset update.'
 
     test_ds = None
     os.remove(test_ds_name)
@@ -497,54 +465,36 @@ def test_rmf_25():
 
 def test_rmf_26():
     rmf_drv = gdal.GetDriverByName('RMF')
-    if rmf_drv is None:
-        gdaltest.post_reason('RMF driver not found.')
-        return 'fail'
+    assert rmf_drv is not None, 'RMF driver not found.'
 
     src_ds = gdal.Open('data/float64.mtw', gdal.GA_ReadOnly)
 
-    if src_ds is None:
-        gdaltest.post_reason('Failed to open test dataset.')
-        return 'fail'
+    assert src_ds is not None, 'Failed to open test dataset.'
 
     test_ds_name = 'tmp/unit.mtw'
     test_ds = rmf_drv.CreateCopy(test_ds_name, src_ds, options=['MTW=YES'])
-    if test_ds is None:
-        gdaltest.post_reason('Failed to create test dataset copy.')
-        return 'fail'
+    assert test_ds is not None, 'Failed to create test dataset copy.'
 
     test_ds.GetRasterBand(1).SetUnitType('cm')
     unittype = test_ds.GetRasterBand(1).GetUnitType()
-    if unittype != 'cm':
-        gdaltest.post_reason('Invalid UnitType after CreateCopy.')
-        return 'fail'
+    assert unittype == 'cm', 'Invalid UnitType after CreateCopy.'
     test_ds = None
 
     test_ds = gdal.Open(test_ds_name, gdal.GA_Update)
-    if test_ds is None:
-        gdaltest.post_reason('Failed to reopen test dataset.')
-        return 'fail'
+    assert test_ds is not None, 'Failed to reopen test dataset.'
     unittype = test_ds.GetRasterBand(1).GetUnitType()
-    if unittype != 'cm':
-        gdaltest.post_reason('Invalid UnitType after dataset reopen.')
-        return 'fail'
+    assert unittype == 'cm', 'Invalid UnitType after dataset reopen.'
     test_ds.GetRasterBand(1).SetUnitType('mm')
     test_ds = None
 
     test_ds = gdal.Open(test_ds_name, gdal.GA_ReadOnly)
-    if test_ds is None:
-        gdaltest.post_reason('Failed to reopen test dataset.')
-        return 'fail'
+    assert test_ds is not None, 'Failed to reopen test dataset.'
     unittype = test_ds.GetRasterBand(1).GetUnitType()
-    if unittype != 'mm':
-        gdaltest.post_reason('Invalid UnitType after dataset update.')
-        return 'fail'
+    assert unittype == 'mm', 'Invalid UnitType after dataset update.'
 
     test_ds.GetRasterBand(1).SetUnitType('ft')
     unittype = test_ds.GetRasterBand(1).GetUnitType()
-    if unittype != 'mm':
-        gdaltest.post_reason('Invalid UnitType after dataset update.')
-        return 'fail'
+    assert unittype == 'mm', 'Invalid UnitType after dataset update.'
 
     test_ds = None
     os.remove(test_ds_name)
@@ -564,25 +514,20 @@ def test_rmf_27():
     cs2 = [51009, 27640, 37765] # osx, clang
 
     ds = gdal.Open('data/jpeg-in-rmf.rsw', gdal.GA_ReadOnly)
-    if ds is None:
-        gdaltest.post_reason('Failed to open test dataset.')
-        return 'fail'
+    assert ds is not None, 'Failed to open test dataset.'
 
     md = ds.GetMetadata('IMAGE_STRUCTURE')
-    if md['COMPRESSION'] != 'JPEG':
-        gdaltest.post_reason('"COMPRESSION" value is "%s" but expected "JPEG"' %
+    assert md['COMPRESSION'] == 'JPEG', \
+        ('"COMPRESSION" value is "%s" but expected "JPEG"' %
                               md['COMPRESSION'])
-        return 'fail'
 
     cs = [0, 0, 0]
     for iBand in range(ds.RasterCount):
         band = ds.GetRasterBand(iBand + 1)
         cs[iBand] = band.Checksum()
 
-    if cs != cs1 and cs != cs2:
-        gdaltest.post_reason('Invalid checksum %s expected %s or %s.' %
+    assert cs == cs1 or cs == cs2, ('Invalid checksum %s expected %s or %s.' %
                              (str(cs), str(cs1), str(cs2)))
-        return 'fail'
 
     return 'success'
 
@@ -594,15 +539,12 @@ def test_rmf_27():
 def test_rmf_28a():
 
     ds = gdal.Open('data/byte-lzw.rsw', gdal.GA_ReadOnly)
-    if ds is None:
-        gdaltest.post_reason('Failed to open test dataset.')
-        return 'fail'
+    assert ds is not None, 'Failed to open test dataset.'
 
     md = ds.GetMetadata('IMAGE_STRUCTURE')
-    if md['COMPRESSION'] != 'LZW':
-        gdaltest.post_reason('"COMPRESSION" value is "%s" but expected "LZW"' %
+    assert md['COMPRESSION'] == 'LZW', \
+        ('"COMPRESSION" value is "%s" but expected "LZW"' %
                               md['COMPRESSION'])
-        return 'fail'
 
     return 'success'
 
@@ -610,15 +552,12 @@ def test_rmf_28a():
 def test_rmf_28b():
 
     ds = gdal.Open('data/t100.mtw', gdal.GA_ReadOnly)
-    if ds is None:
-        gdaltest.post_reason('Failed to open test dataset.')
-        return 'fail'
+    assert ds is not None, 'Failed to open test dataset.'
 
     md = ds.GetMetadata('IMAGE_STRUCTURE')
-    if md['COMPRESSION'] != 'RMF_DEM':
-        gdaltest.post_reason('"COMPRESSION" value is "%s" but expected "RMF_DEM"' %
+    assert md['COMPRESSION'] == 'RMF_DEM', \
+        ('"COMPRESSION" value is "%s" but expected "RMF_DEM"' %
                               md['COMPRESSION'])
-        return 'fail'
 
     return 'success'
 
@@ -629,20 +568,14 @@ def test_rmf_28b():
 def test_rmf_29():
 
     rmf_drv = gdal.GetDriverByName('RMF')
-    if rmf_drv is None:
-        gdaltest.post_reason('RMF driver not found.')
-        return 'fail'
+    assert rmf_drv is not None, 'RMF driver not found.'
 
     ds = gdal.Open('data/byte.rsw', gdal.GA_ReadOnly)
-    if ds is None:
-        gdaltest.post_reason('Failed to open test dataset.')
-        return 'fail'
+    assert ds is not None, 'Failed to open test dataset.'
 
     test_ds_name = 'tmp/epsg.rsw'
     test_ds = rmf_drv.CreateCopy(test_ds_name, ds)
-    if test_ds is None:
-        gdaltest.post_reason('Failed to create test dataset copy.')
-        return 'fail'
+    assert test_ds is not None, 'Failed to create test dataset copy.'
 
     sr = osr.SpatialReference()
     sr.SetFromUserInput('EPSG:3388')
@@ -651,17 +584,13 @@ def test_rmf_29():
     ds = None
 
     test_ds = gdal.Open(test_ds_name, gdal.GA_ReadOnly)
-    if test_ds is None:
-        gdaltest.post_reason('Failed to open test dataset.')
-        return 'fail'
+    assert test_ds is not None, 'Failed to open test dataset.'
 
     wkt = test_ds.GetProjectionRef()
     sr = osr.SpatialReference()
     sr.SetFromUserInput(wkt)
-    if str(sr.GetAuthorityCode(None)) != '3388':
-        gdaltest.post_reason('EPSG code is %s expected 3388.' %
+    assert str(sr.GetAuthorityCode(None)) == '3388', ('EPSG code is %s expected 3388.' %
                              str(sr.GetAuthorityCode(None)))
-        return 'fail'
 
     return 'success'
 
@@ -676,17 +605,13 @@ def test_rmf_30():
                    format='GTiff')
 
     ds = gdal.Open(ds_name)
-    if ds is None:
-        gdaltest.post_reason('Can\'t open ' + ds_name)
-        return 'fail'
+    assert ds is not None, ('Can\'t open ' + ds_name)
     expected_cs = [40503, 41429, 40238]
     cs = [ds.GetRasterBand(1).Checksum(),
           ds.GetRasterBand(2).Checksum(),
           ds.GetRasterBand(3).Checksum()]
-    if cs != expected_cs:
-        gdaltest.post_reason('Invalid checksum %s expected %s.' %
+    assert cs == expected_cs, ('Invalid checksum %s expected %s.' %
                              (str(cs), str(expected_cs)))
-        return 'fail'
     return 'success'
 
 
@@ -717,19 +642,16 @@ def test_rmf_31c():
                    format='RMF', options='-co COMPRESS=JPEG')
 
     ds = gdal.Open(ds_name)
-    if ds is None:
-        gdaltest.post_reason('Can\'t open ' + ds_name)
-        return 'fail'
+    assert ds is not None, ('Can\'t open ' + ds_name)
     expected_cs1 = [25789, 27405, 31974]
     expected_cs2 = [23764, 25264, 33585] # osx
     cs = [ds.GetRasterBand(1).Checksum(),
           ds.GetRasterBand(2).Checksum(),
           ds.GetRasterBand(3).Checksum()]
 
-    if cs != expected_cs1 and cs != expected_cs2:
-        gdaltest.post_reason('Invalid checksum %s expected %s or %s.' %
+    assert cs == expected_cs1 or cs == expected_cs2, \
+        ('Invalid checksum %s expected %s or %s.' %
                              (str(cs), str(expected_cs1), str(expected_cs2)))
-        return 'fail'
     return 'success'
 
 
@@ -756,9 +678,7 @@ def test_rmf_31e():
     sy = 8*stripeSize
     tst_name = 'tmp/rmf_31e.tif'
     tst_ds = drv.Create(tst_name, sx, sy, 1, gdal.GDT_Int32 )
-    if tst_ds is None:
-        gdaltest.post_reason('Can\'t create ' + tst_name)
-        return 'fail'
+    assert tst_ds is not None, ('Can\'t create ' + tst_name)
 
     # No deltas
     buff = numpy.zeros((sx, stripeSize), dtype = numpy.int32)
@@ -790,9 +710,7 @@ def test_rmf_31e():
 
     tst_ds = None
     tst_ds = gdal.Open(tst_name)
-    if tst_ds is None:
-        gdaltest.post_reason('Can\'t open ' + tst_name)
-        return 'fail'
+    assert tst_ds is not None, ('Can\'t open ' + tst_name)
 
     cs = tst_ds.GetRasterBand(1).Checksum()
     tst_ds = None
diff --git a/autotest/gdrivers/roipac.py b/autotest/gdrivers/roipac.py
index 7ff1b4697406..a7bc880dea3e 100755
--- a/autotest/gdrivers/roipac.py
+++ b/autotest/gdrivers/roipac.py
@@ -67,8 +67,7 @@ def test_roipac_2():
 
     ds = gdal.Open('data/srtm.dem')
     val = ds.GetMetadataItem('YMAX', 'ROI_PAC')
-    if val != '9':
-        return 'fail'
+    assert val == '9'
 
     return 'success'
 
@@ -99,11 +98,9 @@ def test_roipac_5():
     ds = gdal.Open('data/srtm.dem')
     band = ds.GetRasterBand(1)
     offset = band.GetOffset()
-    if offset != 1:
-        return 'fail'
+    assert offset == 1
     scale = band.GetScale()
-    if scale != 2:
-        return 'fail'
+    assert scale == 2
 
     return 'success'
 
diff --git a/autotest/gdrivers/rpftoc.py b/autotest/gdrivers/rpftoc.py
index 1c135869c05d..2c01e1356bcf 100755
--- a/autotest/gdrivers/rpftoc.py
+++ b/autotest/gdrivers/rpftoc.py
@@ -64,15 +64,13 @@ def test_rpftoc_2():
 def test_rpftoc_3():
     ds = gdal.Open('data/A.TOC')
     md = ds.GetMetadata('SUBDATASETS')
-    if 'SUBDATASET_1_NAME' not in md or md['SUBDATASET_1_NAME'] != 'NITF_TOC_ENTRY:CADRG_ONC_1,000,000_2_0:data/A.TOC':
-        gdaltest.post_reason('missing SUBDATASET_1_NAME metadata')
-        return 'fail'
+    assert 'SUBDATASET_1_NAME' in md and md['SUBDATASET_1_NAME'] == 'NITF_TOC_ENTRY:CADRG_ONC_1,000,000_2_0:data/A.TOC', \
+        'missing SUBDATASET_1_NAME metadata'
 
     ds = gdal.Open('NITF_TOC_ENTRY:CADRG_ONC_1,000,000_2_0:data/A.TOC')
     md = ds.GetMetadata()
-    if 'FILENAME_0' not in md or (md['FILENAME_0'] != 'data/RPFTOC01.ON2' and md['FILENAME_0'] != 'data\\RPFTOC01.ON2'):
-        gdaltest.post_reason('missing SUBDATASET_1_NAME metadata')
-        return 'fail'
+    assert 'FILENAME_0' in md and not (md['FILENAME_0'] != 'data/RPFTOC01.ON2' and md['FILENAME_0'] != 'data\\RPFTOC01.ON2'), \
+        'missing SUBDATASET_1_NAME metadata'
 
     return 'success'
 
@@ -89,19 +87,15 @@ def test_rpftoc_4():
     ds = gdal.Open('NITF_TOC_ENTRY:CADRG_ONC_1,000,000_2_0:tmp/A.TOC')
     err = ds.BuildOverviews(overviewlist=[2, 4])
 
-    if err != 0:
-        gdaltest.post_reason('BuildOverviews reports an error')
-        return 'fail'
+    assert err == 0, 'BuildOverviews reports an error'
 
-    if ds.GetRasterBand(1).GetOverviewCount() != 2:
-        gdaltest.post_reason('Overview missing on target file.')
-        return 'fail'
+    assert ds.GetRasterBand(1).GetOverviewCount() == 2, \
+        'Overview missing on target file.'
 
     ds = None
     ds = gdal.Open('NITF_TOC_ENTRY:CADRG_ONC_1,000,000_2_0:tmp/A.TOC')
-    if ds.GetRasterBand(1).GetOverviewCount() != 2:
-        gdaltest.post_reason('Overview missing on target file after re-open.')
-        return 'fail'
+    assert ds.GetRasterBand(1).GetOverviewCount() == 2, \
+        'Overview missing on target file after re-open.'
 
     ds = None
 
diff --git a/autotest/gdrivers/rraster.py b/autotest/gdrivers/rraster.py
index 8754f8881bc5..fd02ee6fae08 100755
--- a/autotest/gdrivers/rraster.py
+++ b/autotest/gdrivers/rraster.py
@@ -54,11 +54,8 @@ def test_rraster_1(filename='data/byte_rraster.grd', check_prj=None):
 
     ds = gdal.Open(filename)
     md = ds.GetMetadata()
-    if md != {'CREATOR': "R package 'raster'", 'CREATED': '2016-06-25 17:32:47'}:
-        print(md)
-        return 'fail'
-    if ds.GetRasterBand(1).GetDescription() != 'byte':
-        return 'fail'
+    assert md == {'CREATOR': "R package 'raster'", 'CREATED': '2016-06-25 17:32:47'}
+    assert ds.GetRasterBand(1).GetDescription() == 'byte'
     return 'success'
 
 ###############################################################################
@@ -68,9 +65,7 @@ def test_rraster_1_copy():
 
     filename = '/vsimem/byte_rraster.grd'
     gdal.Translate(filename, 'data/byte_rraster.grd', format='RRASTER')
-    if gdal.VSIStatL(filename + '.aux.xml'):
-        gdaltest.post_reason('did not expect .aux.xml')
-        return 'fail'
+    assert not gdal.VSIStatL(filename + '.aux.xml'), 'did not expect .aux.xml'
     sr = osr.SpatialReference()
     sr.SetFromUserInput('+proj=utm +zone=11 +ellps=clrk66 +nadgrids=@conus,@alaska,@ntv2_0.gsb,@ntv1_can.dat +units=m +no_defs')
     ret = test_rraster_1(filename, check_prj=sr.ExportToWkt())
@@ -143,8 +138,7 @@ def test_rraster_rgba(filename='data/rgba_rraster.grd'):
                    'colorInterpretation': 'Alpha',
                    'description': 'alpha'}]
     }
-    if not _is_dict_included_in_dict(info, expected_info):
-        return 'fail'
+    assert _is_dict_included_in_dict(info, expected_info)
 
     return 'success'
 
@@ -158,9 +152,7 @@ def test_rraster_rgba_copy():
     for creationOptions in [[], ['INTERLEAVE=BIP'], ['INTERLEAVE=BIL'], ['INTERLEAVE=BSQ']]:
         gdal.Translate(filename, 'data/rgba_rraster.grd', format='RRASTER',
                        creationOptions=creationOptions)
-        if gdal.VSIStatL(filename + '.aux.xml'):
-            gdaltest.post_reason('did not expect .aux.xml')
-            return 'fail'
+        assert not gdal.VSIStatL(filename + '.aux.xml'), 'did not expect .aux.xml'
         ret = test_rraster_rgba(filename)
         gdal.GetDriverByName('RRASTER').Delete(filename)
         if ret != 'success':
@@ -185,8 +177,7 @@ def test_rraster_ct_rgb(filename='data/byte_rraster_ct_rgb.grd'):
                                   'palette': 'RGB'},
                    'type': 'Byte'}]
     }
-    if not _is_dict_included_in_dict(info, expected_info):
-        return 'fail'
+    assert _is_dict_included_in_dict(info, expected_info)
 
     return 'success'
 
@@ -197,9 +188,7 @@ def test_rraster_ct_rgb_copy():
 
     filename = '/vsimem/byte_rraster_ct_rgb.grd'
     gdal.Translate(filename, 'data/byte_rraster_ct_rgb.grd', format='RRASTER')
-    if gdal.VSIStatL(filename + '.aux.xml'):
-        gdaltest.post_reason('did not expect .aux.xml')
-        return 'fail'
+    assert not gdal.VSIStatL(filename + '.aux.xml'), 'did not expect .aux.xml'
     ret = test_rraster_ct_rgb(filename)
     gdal.GetDriverByName('RRASTER').Delete(filename)
 
@@ -221,8 +210,7 @@ def test_rraster_ct_rgba(filename='data/byte_rraster_ct_rgba.grd'):
                                   'palette': 'RGB'},
                    'type': 'Byte'}]
     }
-    if not _is_dict_included_in_dict(info, expected_info):
-        return 'fail'
+    assert _is_dict_included_in_dict(info, expected_info)
 
     return 'success'
 
@@ -233,9 +221,7 @@ def test_rraster_ct_rgba_copy():
 
     filename = '/vsimem/byte_rraster_ct_rgba.grd'
     gdal.Translate(filename, 'data/byte_rraster_ct_rgba.grd', format='RRASTER')
-    if gdal.VSIStatL(filename + '.aux.xml'):
-        gdaltest.post_reason('did not expect .aux.xml')
-        return 'fail'
+    assert not gdal.VSIStatL(filename + '.aux.xml'), 'did not expect .aux.xml'
     ret = test_rraster_ct_rgba(filename)
     gdal.GetDriverByName('RRASTER').Delete(filename)
 
@@ -317,8 +303,7 @@ def test_rraster_rat(filename='data/byte_rraster_rat.grd'):
                                'baw'],
                          'index': 1}]}
     }
-    if not _is_dict_included_in_dict(info, expected_info):
-        return 'fail'
+    assert _is_dict_included_in_dict(info, expected_info)
 
     return 'success'
 
@@ -329,9 +314,7 @@ def test_rraster_rat_copy():
 
     filename = '/vsimem/byte_rraster_rat.grd'
     gdal.Translate(filename, 'data/byte_rraster_rat.grd', format='RRASTER')
-    if gdal.VSIStatL(filename + '.aux.xml'):
-        gdaltest.post_reason('did not expect .aux.xml')
-        return 'fail'
+    assert not gdal.VSIStatL(filename + '.aux.xml'), 'did not expect .aux.xml'
     ret = test_rraster_rat(filename)
     gdal.GetDriverByName('RRASTER').Delete(filename)
 
@@ -349,10 +332,8 @@ def test_rraster_signedbyte():
     gdal.Translate(filename2, filename, format='RRASTER')
 
     ds = gdal.Open(filename2)
-    if ds.GetRasterBand(1).GetMetadataItem('PIXELTYPE', 'IMAGE_STRUCTURE') != 'SIGNEDBYTE':
-        return 'fail'
-    if ds.GetRasterBand(1).GetMinimum() != -124:
-        return 'fail'
+    assert ds.GetRasterBand(1).GetMetadataItem('PIXELTYPE', 'IMAGE_STRUCTURE') == 'SIGNEDBYTE'
+    assert ds.GetRasterBand(1).GetMinimum() == -124
     ds = None
 
     gdal.GetDriverByName('RRASTER').Delete(filename)
@@ -376,12 +357,10 @@ def test_rraster_datatypes():
         src_ds = gdal.Open(srcfilename)
         gdal.Translate(filename, src_ds, format='RRASTER')
         ds = gdal.Open(filename)
-        if ds.GetRasterBand(1).DataType != src_ds.GetRasterBand(1).DataType:
-            print(srcfilename)
-            return 'fail'
-        if ds.GetRasterBand(1).Checksum() != src_ds.GetRasterBand(1).Checksum():
-            print(srcfilename)
-            return 'fail'
+        assert ds.GetRasterBand(1).DataType == src_ds.GetRasterBand(1).DataType, \
+            srcfilename
+        assert ds.GetRasterBand(1).Checksum() == src_ds.GetRasterBand(1).Checksum(), \
+            srcfilename
 
     gdal.GetDriverByName('RRASTER').Delete(filename)
 
@@ -401,10 +380,8 @@ def test_rraster_nodata_and_metadata():
     ds.SetMetadataItem('CREATED', 'Today')
     ds = None
     ds = gdal.Open(filename)
-    if ds.GetMetadata() != {'CREATOR': 'GDAL', 'CREATED': 'Today'}:
-        return 'fail'
-    if ds.GetRasterBand(1).GetNoDataValue() != 1:
-        return 'fail'
+    assert ds.GetMetadata() == {'CREATOR': 'GDAL', 'CREATED': 'Today'}
+    assert ds.GetRasterBand(1).GetNoDataValue() == 1
     ds = None
 
     gdal.GetDriverByName('RRASTER').Delete(filename)
@@ -420,13 +397,11 @@ def test_rraster_update():
     gdal.Translate(filename, 'data/byte_rraster.grd', format='RRASTER')
     gdal.Open(filename, gdal.GA_Update)
     ds = gdal.Open(filename, gdal.GA_Update)
-    if ds.GetRasterBand(1).Checksum() != 4672:
-        return 'fail'
+    assert ds.GetRasterBand(1).Checksum() == 4672
     ds.GetRasterBand(1).Fill(0)
     ds = None
     ds = gdal.Open(filename)
-    if ds.GetRasterBand(1).Checksum() != 0:
-        return 'fail'
+    assert ds.GetRasterBand(1).Checksum() == 0
     ds = None
 
     gdal.GetDriverByName('RRASTER').Delete(filename)
@@ -446,14 +421,10 @@ def test_rraster_colorinterpretation():
     ds.GetRasterBand(4).SetColorInterpretation(gdal.GCI_AlphaBand)
     ds = None
     ds = gdal.Open(filename)
-    if ds.GetRasterBand(1).GetColorInterpretation() != gdal.GCI_RedBand:
-        return 'fail'
-    if ds.GetRasterBand(2).GetColorInterpretation() != gdal.GCI_GreenBand:
-        return 'fail'
-    if ds.GetRasterBand(3).GetColorInterpretation() != gdal.GCI_BlueBand:
-        return 'fail'
-    if ds.GetRasterBand(4).GetColorInterpretation() != gdal.GCI_AlphaBand:
-        return 'fail'
+    assert ds.GetRasterBand(1).GetColorInterpretation() == gdal.GCI_RedBand
+    assert ds.GetRasterBand(2).GetColorInterpretation() == gdal.GCI_GreenBand
+    assert ds.GetRasterBand(3).GetColorInterpretation() == gdal.GCI_BlueBand
+    assert ds.GetRasterBand(4).GetColorInterpretation() == gdal.GCI_AlphaBand
     ds = None
 
     gdal.GetDriverByName('RRASTER').Delete(filename)
diff --git a/autotest/gdrivers/rs2.py b/autotest/gdrivers/rs2.py
index d84120607564..d6c8db58819f 100755
--- a/autotest/gdrivers/rs2.py
+++ b/autotest/gdrivers/rs2.py
@@ -71,9 +71,7 @@ def test_rs2_3():
                     'SAMP_NUM_COEFF': 'pixelNumeratorCoefficients',
                     'SAMP_OFF': 'pixelOffset',
                     'SAMP_SCALE': 'pixelScale'}
-    if got_rpc != expected_rpc:
-        print(got_rpc)
-        return 'fail'
+    assert got_rpc == expected_rpc
     return 'success'
 
 
diff --git a/autotest/gdrivers/saga.py b/autotest/gdrivers/saga.py
index 0917b53a358e..54de12aad16a 100755
--- a/autotest/gdrivers/saga.py
+++ b/autotest/gdrivers/saga.py
@@ -151,16 +151,10 @@ def test_saga_6():
         # Read raw data into tuple of float numbers
         import struct
         value = struct.unpack('d' * 1, data)[0]
-        if value != expected_nodata[i]:
-            print(value)
-            gdaltest.post_reason('did not get expected pixel value')
-            return 'fail'
+        assert value == expected_nodata[i], 'did not get expected pixel value'
 
         nodata = ds.GetRasterBand(1).GetNoDataValue()
-        if nodata != expected_nodata[i]:
-            print(nodata)
-            gdaltest.post_reason('did not get expected nodata value')
-            return 'fail'
+        assert nodata == expected_nodata[i], 'did not get expected nodata value'
 
         ds = None
 
diff --git a/autotest/gdrivers/sdts.py b/autotest/gdrivers/sdts.py
index f0ab691f0144..8ab0195b5595 100755
--- a/autotest/gdrivers/sdts.py
+++ b/autotest/gdrivers/sdts.py
@@ -53,8 +53,7 @@ def test_sdts_1():
     ds = gdal.Open('data/STDS_1107834_truncated/1107CATD.DDF')
     md = ds.GetMetadata()
 
-    if md['TITLE'] != 'ALANSON, MI-24000':
-        return 'fail'
+    assert md['TITLE'] == 'ALANSON, MI-24000'
 
     return 'success'
 
diff --git a/autotest/gdrivers/sentinel2.py b/autotest/gdrivers/sentinel2.py
index b7cbd430c4c9..cae88f102aaf 100755
--- a/autotest/gdrivers/sentinel2.py
+++ b/autotest/gdrivers/sentinel2.py
@@ -45,8 +45,7 @@ def test_sentinel2_l1c_1():
     filename_xml = 'data/fake_sentinel2_l1c/S2A_OPER_PRD_MSIL1C.SAFE/S2A_OPER_MTD_SAFL1C.xml'
     gdal.ErrorReset()
     ds = gdal.Open(filename_xml)
-    if ds is None or gdal.GetLastErrorMsg() != '':
-        return 'fail'
+    assert ds is not None and gdal.GetLastErrorMsg() == ''
 
     expected_md = {'CLOUD_COVERAGE_ASSESSMENT': '0.0',
                    'DATATAKE_1_DATATAKE_SENSING_START': '2015-12-31T23:59:59.999Z',
@@ -101,17 +100,15 @@ def test_sentinel2_l1c_1():
         os.system('sh -c "cd data/fake_sentinel2_l1c && zip -r ../../tmp/S2A_OPER_PRD_MSIL1C.zip S2A_OPER_PRD_MSIL1C.SAFE >/dev/null" && cd ../..')
         if os.path.exists('tmp/S2A_OPER_PRD_MSIL1C.zip'):
             ds = gdal.Open('tmp/S2A_OPER_PRD_MSIL1C.zip')
-            if ds is None:
-                return 'fail'
+            assert ds is not None
             os.unlink('tmp/S2A_OPER_PRD_MSIL1C.zip')
 
     # Try opening the 4 subdatasets
     for i in range(4):
         gdal.ErrorReset()
         ds = gdal.Open(got_md['SUBDATASET_%d_NAME' % (i + 1)])
-        if ds is None or gdal.GetLastErrorMsg() != '':
-            print(got_md['SUBDATASET_%d_NAME' % (i + 1)])
-            return 'fail'
+        assert ds is not None and gdal.GetLastErrorMsg() == '', \
+            got_md['SUBDATASET_%d_NAME' % (i + 1)]
 
     # Try various invalid subdataset names
     for name in ['SENTINEL2_L1C:',
@@ -125,9 +122,7 @@ def test_sentinel2_l1c_1():
                  'SENTINEL2_L1C:%s:10m:EPSG_32633' % filename_xml]:
         with gdaltest.error_handler():
             ds = gdal.Open(name)
-        if ds is not None:
-            print(name)
-            return 'fail'
+        assert ds is None, name
 
     return 'success'
 
@@ -140,8 +135,7 @@ def test_sentinel2_l1c_2():
     filename_xml = 'data/fake_sentinel2_l1c/S2A_OPER_PRD_MSIL1C.SAFE/S2A_OPER_MTD_SAFL1C.xml'
     gdal.ErrorReset()
     ds = gdal.Open('SENTINEL2_L1C:%s:10m:EPSG_32632' % filename_xml)
-    if ds is None or gdal.GetLastErrorMsg() != '':
-        return 'fail'
+    assert ds is not None and gdal.GetLastErrorMsg() == ''
 
     expected_md = {'CLOUD_COVERAGE_ASSESSMENT': '0.0',
                    'DATATAKE_1_DATATAKE_SENSING_START': '2015-12-31T23:59:59.999Z',
@@ -176,21 +170,14 @@ def test_sentinel2_l1c_2():
         pprint.pprint(got_md)
         return 'fail'
 
-    if ds.RasterXSize != 20984 or ds.RasterYSize != 20980:
-        print(ds.RasterXSize)
-        print(ds.RasterYSize)
-        return 'fail'
+    assert ds.RasterXSize == 20984 and ds.RasterYSize == 20980
 
-    if ds.GetProjectionRef().find('32632') < 0:
-        return 'fail'
+    assert ds.GetProjectionRef().find('32632') >= 0
 
     got_gt = ds.GetGeoTransform()
-    if got_gt != (699960.0, 10.0, 0.0, 5100060.0, 0.0, -10.0):
-        print(got_gt)
-        return 'fail'
+    assert got_gt == (699960.0, 10.0, 0.0, 5100060.0, 0.0, -10.0)
 
-    if ds.RasterCount != 4:
-        return 'fail'
+    assert ds.RasterCount == 4
 
     vrt = ds.GetMetadata('xml:VRT')[0]
     placement_vrt = """<SimpleSource>
@@ -207,12 +194,9 @@ def test_sentinel2_l1c_2():
       <SrcRect xOff="0" yOff="0" xSize="10980" ySize="10980" />
       <DstRect xOff="10004" yOff="10000" xSize="10980" ySize="10980" />
     </SimpleSource>"""
-    if vrt.find(placement_vrt) < 0:
-        print(vrt)
-        return 'fail'
+    assert vrt.find(placement_vrt) >= 0
 
-    if ds.GetMetadata('xml:SENTINEL2') is None:
-        return 'fail'
+    assert ds.GetMetadata('xml:SENTINEL2') is not None
 
     band = ds.GetRasterBand(1)
     got_md = band.GetMetadata()
@@ -228,19 +212,15 @@ def test_sentinel2_l1c_2():
         pprint.pprint(got_md)
         return 'fail'
 
-    if band.GetColorInterpretation() != gdal.GCI_RedBand:
-        return 'fail'
+    assert band.GetColorInterpretation() == gdal.GCI_RedBand
 
-    if band.DataType != gdal.GDT_UInt16:
-        return 'fail'
+    assert band.DataType == gdal.GDT_UInt16
 
-    if band.GetMetadataItem('NBITS', 'IMAGE_STRUCTURE') != '12':
-        return 'fail'
+    assert band.GetMetadataItem('NBITS', 'IMAGE_STRUCTURE') == '12'
 
     band = ds.GetRasterBand(4)
 
-    if band.GetColorInterpretation() != gdal.GCI_Undefined:
-        return 'fail'
+    assert band.GetColorInterpretation() == gdal.GCI_Undefined
 
     got_md = band.GetMetadata()
     expected_md = {'BANDNAME': 'B8',
@@ -265,21 +245,17 @@ def test_sentinel2_l1c_3():
 
     filename_xml = 'data/fake_sentinel2_l1c/S2A_OPER_PRD_MSIL1C.SAFE/S2A_OPER_MTD_SAFL1C.xml'
     ds = gdal.OpenEx('SENTINEL2_L1C:%s:60m:EPSG_32632' % filename_xml, open_options=['ALPHA=YES'])
-    if ds is None:
-        return 'fail'
+    assert ds is not None
 
-    if ds.RasterCount != 4:
-        return 'fail'
+    assert ds.RasterCount == 4
 
     band = ds.GetRasterBand(4)
 
-    if band.GetColorInterpretation() != gdal.GCI_AlphaBand:
-        return 'fail'
+    assert band.GetColorInterpretation() == gdal.GCI_AlphaBand
 
     gdal.ErrorReset()
     cs = band.Checksum()
-    if cs != 0 or gdal.GetLastErrorMsg() != '':
-        return 'fail'
+    assert cs == 0 and gdal.GetLastErrorMsg() == ''
 
     band.ReadRaster()
 
@@ -293,11 +269,9 @@ def test_sentinel2_l1c_4():
 
     filename_xml = 'data/fake_sentinel2_l1c/S2A_OPER_PRD_MSIL1C.SAFE/S2A_OPER_MTD_SAFL1C.xml'
     ds = gdal.OpenEx('SENTINEL2_L1C:%s:PREVIEW:EPSG_32632' % filename_xml)
-    if ds is None:
-        return 'fail'
+    assert ds is not None
 
-    if ds.RasterCount != 3:
-        return 'fail'
+    assert ds.RasterCount == 3
 
     fl = ds.GetFileList()
     # main XML + 2 granule XML + 2 jp2
@@ -307,11 +281,9 @@ def test_sentinel2_l1c_4():
         return 'fail'
 
     band = ds.GetRasterBand(1)
-    if band.GetColorInterpretation() != gdal.GCI_RedBand:
-        return 'fail'
+    assert band.GetColorInterpretation() == gdal.GCI_RedBand
 
-    if band.DataType != gdal.GDT_Byte:
-        return 'fail'
+    assert band.DataType == gdal.GDT_Byte
 
     return 'success'
 
@@ -328,13 +300,11 @@ def test_sentinel2_l1c_5():
 
     with gdaltest.error_handler():
         ds = gdal.Open('/vsimem/test.xml')
-    if ds is not None:
-        return 'fail'
+    assert ds is None
 
     with gdaltest.error_handler():
         ds = gdal.Open('SENTINEL2_L1C:/vsimem/test.xml:10m:EPSG_32632')
-    if ds is not None:
-        return 'fail'
+    assert ds is None
 
     # File is OK, but granule MTD are missing
     gdal.FileFromMemBuffer('/vsimem/test.xml',
@@ -407,14 +377,12 @@ def test_sentinel2_l1c_5():
     gdal.ErrorReset()
     with gdaltest.error_handler():
         gdal.Open('/vsimem/test.xml')
-    if gdal.GetLastErrorMsg() == '':
-        return 'fail'
+    assert gdal.GetLastErrorMsg() != ''
 
     gdal.ErrorReset()
     with gdaltest.error_handler():
         ds = gdal.Open('SENTINEL2_L1C:/vsimem/test.xml:10m:EPSG_32632')
-    if ds is not None:
-        return 'fail'
+    assert ds is None
 
     # No Product_Info
     gdal.FileFromMemBuffer('/vsimem/test.xml',
@@ -426,14 +394,12 @@ def test_sentinel2_l1c_5():
     gdal.ErrorReset()
     with gdaltest.error_handler():
         ds = gdal.Open('/vsimem/test.xml')
-    if ds is not None:
-        return 'fail'
+    assert ds is None
 
     gdal.ErrorReset()
     with gdaltest.error_handler():
         ds = gdal.Open('SENTINEL2_L1C:/vsimem/test.xml:10m:EPSG_32632')
-    if ds is not None:
-        return 'fail'
+    assert ds is None
 
     # No Product_Organisation
     gdal.FileFromMemBuffer('/vsimem/test.xml',
@@ -446,14 +412,12 @@ def test_sentinel2_l1c_5():
     gdal.ErrorReset()
     with gdaltest.error_handler():
         ds = gdal.Open('/vsimem/test.xml')
-    if ds is not None:
-        return 'fail'
+    assert ds is None
 
     gdal.ErrorReset()
     with gdaltest.error_handler():
         ds = gdal.Open('SENTINEL2_L1C:/vsimem/test.xml:10m:EPSG_32632')
-    if ds is not None:
-        return 'fail'
+    assert ds is None
 
     # No Band_List
     gdal.FileFromMemBuffer('/vsimem/test.xml',
@@ -469,8 +433,7 @@ def test_sentinel2_l1c_5():
     gdal.ErrorReset()
     with gdaltest.error_handler():
         ds = gdal.Open('/vsimem/test.xml')
-    if ds is not None:
-        return 'fail'
+    assert ds is None
 
     # No valid bands
     gdal.FileFromMemBuffer('/vsimem/test.xml',
@@ -491,8 +454,7 @@ def test_sentinel2_l1c_5():
     gdal.ErrorReset()
     with gdaltest.error_handler():
         ds = gdal.Open('/vsimem/test.xml')
-    if ds is not None:
-        return 'fail'
+    assert ds is None
 
     gdal.Unlink('/vsimem/test.xml')
 
@@ -512,14 +474,12 @@ def test_sentinel2_l1c_6():
     filename_xml = '\\\\?\\' + os.getcwd() + '\\' + filename_xml
     gdal.ErrorReset()
     ds = gdal.Open(filename_xml)
-    if ds is None or gdal.GetLastErrorMsg() != '':
-        return 'fail'
+    assert ds is not None and gdal.GetLastErrorMsg() == ''
 
     subds_name = ds.GetMetadataItem('SUBDATASET_1_NAME', 'SUBDATASETS')
     gdal.ErrorReset()
     ds = gdal.Open(subds_name)
-    if ds is None or gdal.GetLastErrorMsg() != '':
-        return 'fail'
+    assert ds is not None and gdal.GetLastErrorMsg() == ''
 
     return 'success'
 
@@ -588,9 +548,7 @@ def test_sentinel2_l1c_7():
 
     ds = gdal.Open('SENTINEL2_L1C:/vsimem/test.xml:60m:EPSG_32753')
     nbits = ds.GetRasterBand(1).GetMetadataItem('NBITS', 'IMAGE_STRUCTURE')
-    if nbits != '10':
-        print(nbits)
-        return 'fail'
+    assert nbits == '10'
 
     gdal.Unlink('/vsimem/test.xml')
     gdal.Unlink('/vsimem/GRANULE/S2A_OPER_MSI_L1C_bla_N01.03/IMG_DATA/S2A_OPER_MSI_L1C_bla_B01.jp2')
@@ -606,8 +564,7 @@ def test_sentinel2_l1c_tile_1():
     filename_xml = 'data/fake_sentinel2_l1c/S2A_OPER_PRD_MSIL1C.SAFE/GRANULE/S2A_OPER_MSI_L1C_T32TQR_N01.03/S2A_OPER_MTD_L1C_T32TQR.xml'
     gdal.ErrorReset()
     ds = gdal.Open(filename_xml)
-    if ds is None or gdal.GetLastErrorMsg() != '':
-        return 'fail'
+    assert ds is not None and gdal.GetLastErrorMsg() == ''
 
     expected_md = {'CLOUDY_PIXEL_PERCENTAGE': '0',
                    'DATASTRIP_ID': 'S2A_OPER_MSI_L1C_DS_MTI__20151231T235959_S20151231T235959_N01.03',
@@ -664,9 +621,8 @@ def test_sentinel2_l1c_tile_1():
     for i in range(4):
         gdal.ErrorReset()
         ds = gdal.Open(got_md['SUBDATASET_%d_NAME' % (i + 1)])
-        if ds is None or gdal.GetLastErrorMsg() != '':
-            print(got_md['SUBDATASET_%d_NAME' % (i + 1)])
-            return 'fail'
+        assert ds is not None and gdal.GetLastErrorMsg() == '', \
+            got_md['SUBDATASET_%d_NAME' % (i + 1)]
 
     # Try various invalid subdataset names
     for name in ['SENTINEL2_L1C_TILE:',
@@ -675,9 +631,7 @@ def test_sentinel2_l1c_tile_1():
                  'SENTINEL2_L1C_TILE:%s:' % filename_xml]:
         with gdaltest.error_handler():
             ds = gdal.Open(name)
-        if ds is not None:
-            print(name)
-            return 'fail'
+        assert ds is None, name
 
     return 'success'
 
@@ -692,8 +646,7 @@ def test_sentinel2_l1c_tile_2():
     gdal.SetConfigOption('SENTINEL2_USE_MAIN_MTD', 'NO')  # Simulate absence of main MTD file
     ds = gdal.Open(filename_xml)
     gdal.SetConfigOption('SENTINEL2_USE_MAIN_MTD', None)
-    if ds is None or gdal.GetLastErrorMsg() != '':
-        return 'fail'
+    assert ds is not None and gdal.GetLastErrorMsg() == ''
 
     expected_md = {'CLOUDY_PIXEL_PERCENTAGE': '0',
                    'DATASTRIP_ID': 'S2A_OPER_MSI_L1C_DS_MTI__20151231T235959_S20151231T235959_N01.03',
@@ -732,8 +685,7 @@ def test_sentinel2_l1c_tile_3():
     filename_xml = 'data/fake_sentinel2_l1c/S2A_OPER_PRD_MSIL1C.SAFE/GRANULE/S2A_OPER_MSI_L1C_T32TQR_N01.03/S2A_OPER_MTD_L1C_T32TQR.xml'
     gdal.ErrorReset()
     ds = gdal.Open('SENTINEL2_L1C_TILE:%s:10m' % filename_xml)
-    if ds is None or gdal.GetLastErrorMsg() != '':
-        return 'fail'
+    assert ds is not None and gdal.GetLastErrorMsg() == ''
 
     expected_md = {'CLOUDY_PIXEL_PERCENTAGE': '0',
                    'DATASTRIP_ID': 'S2A_OPER_MSI_L1C_DS_MTI__20151231T235959_S20151231T235959_N01.03',
@@ -772,21 +724,14 @@ def test_sentinel2_l1c_tile_3():
         pprint.pprint(got_md)
         return 'fail'
 
-    if ds.RasterXSize != 10980 or ds.RasterYSize != 10980:
-        print(ds.RasterXSize)
-        print(ds.RasterYSize)
-        return 'fail'
+    assert ds.RasterXSize == 10980 and ds.RasterYSize == 10980
 
-    if ds.GetProjectionRef().find('32632') < 0:
-        return 'fail'
+    assert ds.GetProjectionRef().find('32632') >= 0
 
     got_gt = ds.GetGeoTransform()
-    if got_gt != (699960.0, 10.0, 0.0, 5100060.0, 0.0, -10.0):
-        print(got_gt)
-        return 'fail'
+    assert got_gt == (699960.0, 10.0, 0.0, 5100060.0, 0.0, -10.0)
 
-    if ds.RasterCount != 4:
-        return 'fail'
+    assert ds.RasterCount == 4
 
     vrt = ds.GetMetadata('xml:VRT')[0]
     placement_vrt = """<SimpleSource>
@@ -796,12 +741,9 @@ def test_sentinel2_l1c_tile_3():
       <SrcRect xOff="0" yOff="0" xSize="10980" ySize="10980" />
       <DstRect xOff="0" yOff="0" xSize="10980" ySize="10980" />
     </SimpleSource>"""
-    if vrt.find(placement_vrt) < 0:
-        print(vrt)
-        return 'fail'
+    assert vrt.find(placement_vrt) >= 0
 
-    if ds.GetMetadata('xml:SENTINEL2') is None:
-        return 'fail'
+    assert ds.GetMetadata('xml:SENTINEL2') is not None
 
     band = ds.GetRasterBand(1)
     got_md = band.GetMetadata()
@@ -817,19 +759,15 @@ def test_sentinel2_l1c_tile_3():
         pprint.pprint(got_md)
         return 'fail'
 
-    if band.GetColorInterpretation() != gdal.GCI_RedBand:
-        return 'fail'
+    assert band.GetColorInterpretation() == gdal.GCI_RedBand
 
-    if band.DataType != gdal.GDT_UInt16:
-        return 'fail'
+    assert band.DataType == gdal.GDT_UInt16
 
-    if band.GetMetadataItem('NBITS', 'IMAGE_STRUCTURE') != '12':
-        return 'fail'
+    assert band.GetMetadataItem('NBITS', 'IMAGE_STRUCTURE') == '12'
 
     band = ds.GetRasterBand(4)
 
-    if band.GetColorInterpretation() != gdal.GCI_Undefined:
-        return 'fail'
+    assert band.GetColorInterpretation() == gdal.GCI_Undefined
 
     got_md = band.GetMetadata()
     expected_md = {'BANDNAME': 'B8',
@@ -857,8 +795,7 @@ def test_sentinel2_l1c_tile_4():
     gdal.SetConfigOption('SENTINEL2_USE_MAIN_MTD', 'NO')  # Simulate absence of main MTD file
     ds = gdal.OpenEx('SENTINEL2_L1C_TILE:%s:10m' % filename_xml, open_options=['ALPHA=YES'])
     gdal.SetConfigOption('SENTINEL2_USE_MAIN_MTD', None)
-    if ds is None or gdal.GetLastErrorMsg() != '':
-        return 'fail'
+    assert ds is not None and gdal.GetLastErrorMsg() == ''
 
     expected_md = {'CLOUDY_PIXEL_PERCENTAGE': '0',
                    'DATASTRIP_ID': 'S2A_OPER_MSI_L1C_DS_MTI__20151231T235959_S20151231T235959_N01.03',
@@ -872,21 +809,14 @@ def test_sentinel2_l1c_tile_4():
         pprint.pprint(got_md)
         return 'fail'
 
-    if ds.RasterXSize != 10980 or ds.RasterYSize != 10980:
-        print(ds.RasterXSize)
-        print(ds.RasterYSize)
-        return 'fail'
+    assert ds.RasterXSize == 10980 and ds.RasterYSize == 10980
 
-    if ds.GetProjectionRef().find('32632') < 0:
-        return 'fail'
+    assert ds.GetProjectionRef().find('32632') >= 0
 
     got_gt = ds.GetGeoTransform()
-    if got_gt != (699960.0, 10.0, 0.0, 5100060.0, 0.0, -10.0):
-        print(got_gt)
-        return 'fail'
+    assert got_gt == (699960.0, 10.0, 0.0, 5100060.0, 0.0, -10.0)
 
-    if ds.RasterCount != 5:
-        return 'fail'
+    assert ds.RasterCount == 5
 
     vrt = ds.GetMetadata('xml:VRT')[0]
     placement_vrt = """<SimpleSource>
@@ -896,12 +826,9 @@ def test_sentinel2_l1c_tile_4():
       <SrcRect xOff="0" yOff="0" xSize="10980" ySize="10980" />
       <DstRect xOff="0" yOff="0" xSize="10980" ySize="10980" />
     </SimpleSource>"""
-    if vrt.find(placement_vrt) < 0:
-        print(vrt)
-        return 'fail'
+    assert vrt.find(placement_vrt) >= 0
 
-    if ds.GetMetadata('xml:SENTINEL2') is None:
-        return 'fail'
+    assert ds.GetMetadata('xml:SENTINEL2') is not None
 
     band = ds.GetRasterBand(1)
     got_md = band.GetMetadata()
@@ -915,19 +842,15 @@ def test_sentinel2_l1c_tile_4():
         pprint.pprint(got_md)
         return 'fail'
 
-    if band.GetColorInterpretation() != gdal.GCI_RedBand:
-        return 'fail'
+    assert band.GetColorInterpretation() == gdal.GCI_RedBand
 
-    if band.DataType != gdal.GDT_UInt16:
-        return 'fail'
+    assert band.DataType == gdal.GDT_UInt16
 
-    if band.GetMetadataItem('NBITS', 'IMAGE_STRUCTURE') != '12':
-        return 'fail'
+    assert band.GetMetadataItem('NBITS', 'IMAGE_STRUCTURE') == '12'
 
     band = ds.GetRasterBand(5)
 
-    if band.GetColorInterpretation() != gdal.GCI_AlphaBand:
-        return 'fail'
+    assert band.GetColorInterpretation() == gdal.GCI_AlphaBand
 
     return 'success'
 
@@ -940,24 +863,16 @@ def test_sentinel2_l1c_tile_5():
     filename_xml = 'data/fake_sentinel2_l1c/S2A_OPER_PRD_MSIL1C.SAFE/GRANULE/S2A_OPER_MSI_L1C_T32TQR_N01.03/S2A_OPER_MTD_L1C_T32TQR.xml'
     gdal.ErrorReset()
     ds = gdal.Open('SENTINEL2_L1C_TILE:%s:PREVIEW' % filename_xml)
-    if ds is None or gdal.GetLastErrorMsg() != '':
-        return 'fail'
+    assert ds is not None and gdal.GetLastErrorMsg() == ''
 
-    if ds.RasterXSize != 343 or ds.RasterYSize != 343:
-        print(ds.RasterXSize)
-        print(ds.RasterYSize)
-        return 'fail'
+    assert ds.RasterXSize == 343 and ds.RasterYSize == 343
 
-    if ds.GetProjectionRef().find('32632') < 0:
-        return 'fail'
+    assert ds.GetProjectionRef().find('32632') >= 0
 
     got_gt = ds.GetGeoTransform()
-    if got_gt != (699960.0, 320.0, 0.0, 5100060.0, 0.0, -320.0):
-        print(got_gt)
-        return 'fail'
+    assert got_gt == (699960.0, 320.0, 0.0, 5100060.0, 0.0, -320.0)
 
-    if ds.RasterCount != 3:
-        return 'fail'
+    assert ds.RasterCount == 3
 
     vrt = ds.GetMetadata('xml:VRT')[0]
     placement_vrt = """<SimpleSource>
@@ -967,9 +882,7 @@ def test_sentinel2_l1c_tile_5():
       <SrcRect xOff="0" yOff="0" xSize="343" ySize="343" />
       <DstRect xOff="0" yOff="0" xSize="343" ySize="343" />
     </SimpleSource>"""
-    if vrt.find(placement_vrt) < 0:
-        print(vrt)
-        return 'fail'
+    assert vrt.find(placement_vrt) >= 0
 
     return 'success'
 
@@ -986,13 +899,11 @@ def test_sentinel2_l1c_tile_6():
 
     with gdaltest.error_handler():
         ds = gdal.Open('/vsimem/test.xml')
-    if ds is not None:
-        return 'fail'
+    assert ds is None
 
     with gdaltest.error_handler():
         ds = gdal.Open('SENTINEL2_L1C_TILE:/vsimem/test.xml:10m')
-    if ds is not None:
-        return 'fail'
+    assert ds is None
 
     gdal.FileFromMemBuffer('/vsimem/GRANULE/S2A_OPER_MSI_L1C_bla_N01.03/S2A_OPER_MTD_L1C_bla.xml',
                            """<?xml version="1.0" encoding="UTF-8" standalone="no"?>
@@ -1024,8 +935,7 @@ def test_sentinel2_l1c_tile_6():
 
     with gdaltest.error_handler():
         ds = gdal.Open('SENTINEL2_L1C_TILE:/vsimem/GRANULE/S2A_OPER_MSI_L1C_bla_N01.03/S2A_OPER_MTD_L1C_bla.xml:10m')
-    if ds is not None:
-        return 'fail'
+    assert ds is None
 
     gdal.Unlink('/vsimem/test.xml')
     gdal.Unlink('/vsimem/S2A_OPER_MSI_L1C_bla_N01.03/S2A_OPER_MTD_L1C_bla.xml')
@@ -1041,8 +951,7 @@ def test_sentinel2_l1b_1():
     filename_xml = 'data/fake_sentinel2_l1b/S2B_OPER_PRD_MSIL1B.SAFE/S2B_OPER_MTD_SAFL1B.xml'
     gdal.ErrorReset()
     ds = gdal.Open(filename_xml)
-    if ds is None or gdal.GetLastErrorMsg() != '':
-        return 'fail'
+    assert ds is not None and gdal.GetLastErrorMsg() == ''
 
     expected_md = {'CLOUD_COVERAGE_ASSESSMENT': '0.0',
                    'DATATAKE_1_DATATAKE_SENSING_START': '2015-12-31T23:59:59.999Z',
@@ -1091,9 +1000,8 @@ def test_sentinel2_l1b_1():
     for i in range(3):
         gdal.ErrorReset()
         ds = gdal.Open(got_md['SUBDATASET_%d_NAME' % (i + 1)])
-        if ds is None or gdal.GetLastErrorMsg() != '':
-            print(got_md['SUBDATASET_%d_NAME' % (i + 1)])
-            return 'fail'
+        assert ds is not None and gdal.GetLastErrorMsg() == '', \
+            got_md['SUBDATASET_%d_NAME' % (i + 1)]
 
     # Try various invalid subdataset names
     for name in ['SENTINEL2_L1B:',
@@ -1103,9 +1011,7 @@ def test_sentinel2_l1b_1():
                  'SENTINEL2_L1B:%s:30m' % filename_xml]:
         with gdaltest.error_handler():
             ds = gdal.Open(name)
-        if ds is not None:
-            print(name)
-            return 'fail'
+        assert ds is None, name
 
     return 'success'
 
@@ -1118,8 +1024,7 @@ def test_sentinel2_l1b_2():
     filename_xml = 'data/fake_sentinel2_l1b/S2B_OPER_PRD_MSIL1B.SAFE/GRANULE/S2B_OPER_MSI_L1B_N01.03/S2B_OPER_MTD_L1B.xml'
     gdal.ErrorReset()
     ds = gdal.Open(filename_xml)
-    if ds is None or gdal.GetLastErrorMsg() != '':
-        return 'fail'
+    assert ds is not None and gdal.GetLastErrorMsg() == ''
 
     expected_md = {'CLOUDY_PIXEL_PERCENTAGE': '0',
                    'DATASTRIP_ID': 'S2B_OPER_MSI_L1B_DS_MTI__20151231T235959_S20151231T235959_N01.03',
@@ -1180,8 +1085,7 @@ def test_sentinel2_l1b_2():
         ds = gdal.Open('S2B_OPER_MTD_L1B.xml')
     finally:
         os.chdir(cwd)
-    if ds is None or gdal.GetLastErrorMsg() != '':
-        return 'fail'
+    assert ds is not None and gdal.GetLastErrorMsg() == ''
     got_md = ds.GetMetadata()
     if got_md != expected_md:
         import pprint
@@ -1198,8 +1102,7 @@ def test_sentinel2_l1b_3():
 
     gdal.ErrorReset()
     ds = gdal.Open('SENTINEL2_L1B:data/fake_sentinel2_l1b/S2B_OPER_PRD_MSIL1B.SAFE/GRANULE/S2B_OPER_MSI_L1B_N01.03/S2B_OPER_MTD_L1B.xml:60m')
-    if ds is None or gdal.GetLastErrorMsg() != '':
-        return 'fail'
+    assert ds is not None and gdal.GetLastErrorMsg() == ''
 
     expected_md = {'CLOUDY_PIXEL_PERCENTAGE': '0',
                    'DATASTRIP_ID': 'S2B_OPER_MSI_L1B_DS_MTI__20151231T235959_S20151231T235959_N01.03',
@@ -1241,61 +1144,44 @@ def test_sentinel2_l1b_3():
         pprint.pprint(got_md)
         return 'fail'
 
-    if ds.RasterXSize != 1276 or ds.RasterYSize != 384:
-        print(ds.RasterXSize)
-        print(ds.RasterYSize)
-        return 'fail'
+    assert ds.RasterXSize == 1276 and ds.RasterYSize == 384
 
-    if ds.GetGCPProjection().find('4326') < 0:
-        return 'fail'
+    assert ds.GetGCPProjection().find('4326') >= 0
 
     gcps = ds.GetGCPs()
-    if len(gcps) != 5:
-        print(len(gcps))
-        return 'fail'
-
-    if gcps[0].GCPPixel != 0 or \
-       gcps[0].GCPLine != 0 or \
-       gcps[0].GCPX != 11 or \
-       gcps[0].GCPY != 46 or \
-       gcps[0].GCPZ != 1:
-        print(gcps[0])
-        return 'fail'
-
-    if gcps[1].GCPPixel != 0 or \
-       gcps[1].GCPLine != 384 or \
-       gcps[1].GCPX != 11 or \
-       gcps[1].GCPY != 45 or \
-       gcps[1].GCPZ != 2:
-        print(gcps[1])
-        return 'fail'
-
-    if gcps[2].GCPPixel != 1276 or \
-       gcps[2].GCPLine != 384 or \
-       gcps[2].GCPX != 13 or \
-       gcps[2].GCPY != 45 or \
-       gcps[2].GCPZ != 3:
-        print(gcps[2])
-        return 'fail'
-
-    if gcps[3].GCPPixel != 1276 or \
-       gcps[3].GCPLine != 0 or \
-       gcps[3].GCPX != 13 or \
-       gcps[3].GCPY != 46 or \
-       gcps[3].GCPZ != 4:
-        print(gcps[3])
-        return 'fail'
-
-    if gcps[4].GCPPixel != 1276. / 2 or \
-       gcps[4].GCPLine != 384. / 2 or \
-       gcps[4].GCPX != 12 or \
-       gcps[4].GCPY != 45.5 or \
-       gcps[4].GCPZ != 2.5:
-        print(gcps[4])
-        return 'fail'
-
-    if ds.RasterCount != 3:
-        return 'fail'
+    assert len(gcps) == 5
+
+    assert (gcps[0].GCPPixel == 0 and \
+       gcps[0].GCPLine == 0 and \
+       gcps[0].GCPX == 11 and \
+       gcps[0].GCPY == 46 and \
+       gcps[0].GCPZ == 1)
+
+    assert (gcps[1].GCPPixel == 0 and \
+       gcps[1].GCPLine == 384 and \
+       gcps[1].GCPX == 11 and \
+       gcps[1].GCPY == 45 and \
+       gcps[1].GCPZ == 2)
+
+    assert (gcps[2].GCPPixel == 1276 and \
+       gcps[2].GCPLine == 384 and \
+       gcps[2].GCPX == 13 and \
+       gcps[2].GCPY == 45 and \
+       gcps[2].GCPZ == 3)
+
+    assert (gcps[3].GCPPixel == 1276 and \
+       gcps[3].GCPLine == 0 and \
+       gcps[3].GCPX == 13 and \
+       gcps[3].GCPY == 46 and \
+       gcps[3].GCPZ == 4)
+
+    assert (gcps[4].GCPPixel == 1276. / 2 and \
+       gcps[4].GCPLine == 384. / 2 and \
+       gcps[4].GCPX == 12 and \
+       gcps[4].GCPY == 45.5 and \
+       gcps[4].GCPZ == 2.5)
+
+    assert ds.RasterCount == 3
 
     vrt = ds.GetMetadata('xml:VRT')[0]
     placement_vrt = """<SimpleSource>
@@ -1305,12 +1191,9 @@ def test_sentinel2_l1b_3():
       <SrcRect xOff="0" yOff="0" xSize="1276" ySize="384" />
       <DstRect xOff="0" yOff="0" xSize="1276" ySize="384" />
     </SimpleSource>"""
-    if vrt.find(placement_vrt) < 0:
-        print(vrt)
-        return 'fail'
+    assert vrt.find(placement_vrt) >= 0
 
-    if ds.GetMetadata('xml:SENTINEL2') is None:
-        return 'fail'
+    assert ds.GetMetadata('xml:SENTINEL2') is not None
 
     band = ds.GetRasterBand(1)
     got_md = band.GetMetadata()
@@ -1324,11 +1207,9 @@ def test_sentinel2_l1b_3():
         pprint.pprint(got_md)
         return 'fail'
 
-    if band.DataType != gdal.GDT_UInt16:
-        return 'fail'
+    assert band.DataType == gdal.GDT_UInt16
 
-    if band.GetMetadataItem('NBITS', 'IMAGE_STRUCTURE') != '12':
-        return 'fail'
+    assert band.GetMetadataItem('NBITS', 'IMAGE_STRUCTURE') == '12'
 
     return 'success'
 
@@ -1397,8 +1278,7 @@ def test_sentinel2_l1b_4():
 </n1:Level-1B_Granule_ID>
 """)
     ds = gdal.Open('SENTINEL2_L1B:/vsimem/foo/GRANULE/S2B_OPER_MTD_L1B_N01.03/S2B_OPER_MTD_L1B.xml:60m')
-    if ds.RasterXSize != 500:
-        return 'fail'
+    assert ds.RasterXSize == 500
 
     # With standard granule metadata (with Granule_Dimensions)
     gdal.FileFromMemBuffer('/vsimem/foo/GRANULE/S2B_OPER_MTD_L1B_N01.03/S2B_OPER_MTD_L1B.xml',
@@ -1429,10 +1309,8 @@ def test_sentinel2_l1b_4():
     ds = None
 
     ds = gdal.OpenEx('SENTINEL2_L1B:/vsimem/foo/GRANULE/S2B_OPER_MTD_L1B_N01.03/S2B_OPER_MTD_L1B.xml:60m', open_options=['ALPHA=YES'])
-    if ds is None:
-        return 'fail'
-    if ds.RasterCount != 2:
-        return 'fail'
+    assert ds is not None
+    assert ds.RasterCount == 2
     ds = None
 
     gdal.Unlink('/vsimem/foo/GRANULE/S2B_OPER_MTD_L1B_N01.03/S2B_OPER_MTD_L1B.xml')
@@ -1453,8 +1331,7 @@ def test_sentinel2_l1b_5():
 
     with gdaltest.error_handler():
         ds = gdal.Open('/vsimem/test.xml')
-    if ds is not None:
-        return 'fail'
+    assert ds is None
 
     # No Product_Info
     gdal.FileFromMemBuffer('/vsimem/test.xml',
@@ -1466,8 +1343,7 @@ def test_sentinel2_l1b_5():
     gdal.ErrorReset()
     with gdaltest.error_handler():
         ds = gdal.Open('/vsimem/test.xml')
-    if ds is not None:
-        return 'fail'
+    assert ds is None
 
     # No Product_Organisation
     gdal.FileFromMemBuffer('/vsimem/test.xml',
@@ -1480,14 +1356,12 @@ def test_sentinel2_l1b_5():
     gdal.ErrorReset()
     with gdaltest.error_handler():
         ds = gdal.Open('/vsimem/test.xml')
-    if ds is not None:
-        return 'fail'
+    assert ds is None
 
     gdal.ErrorReset()
     with gdaltest.error_handler():
         ds = gdal.Open('SENTINEL2_L1B:/vsimem/test.xml:10m')
-    if ds is not None:
-        return 'fail'
+    assert ds is None
 
     # No Band_List
     gdal.FileFromMemBuffer('/vsimem/test.xml',
@@ -1503,8 +1377,7 @@ def test_sentinel2_l1b_5():
     gdal.ErrorReset()
     with gdaltest.error_handler():
         ds = gdal.Open('/vsimem/test.xml')
-    if ds is not None:
-        return 'fail'
+    assert ds is None
 
     # No valid bands
     gdal.FileFromMemBuffer('/vsimem/test.xml',
@@ -1525,8 +1398,7 @@ def test_sentinel2_l1b_5():
     gdal.ErrorReset()
     with gdaltest.error_handler():
         ds = gdal.Open('/vsimem/test.xml')
-    if ds is not None:
-        return 'fail'
+    assert ds is None
 
     # Invalid XML
     gdal.FileFromMemBuffer('/vsimem/test.xml',
@@ -1535,14 +1407,12 @@ def test_sentinel2_l1b_5():
 
     with gdaltest.error_handler():
         ds = gdal.Open('/vsimem/test.xml')
-    if ds is not None:
-        return 'fail'
+    assert ds is None
 
     gdal.ErrorReset()
     with gdaltest.error_handler():
         ds = gdal.Open('SENTINEL2_L1B:/vsimem/test.xml:10m')
-    if ds is not None:
-        return 'fail'
+    assert ds is None
 
     # No Granule_Dimensions
     gdal.FileFromMemBuffer('/vsimem/test.xml',
@@ -1556,8 +1426,7 @@ def test_sentinel2_l1b_5():
     gdal.ErrorReset()
     with gdaltest.error_handler():
         ds = gdal.Open('SENTINEL2_L1B:/vsimem/test.xml:10m')
-    if ds is not None:
-        return 'fail'
+    assert ds is None
 
     # No ROWS
     gdal.FileFromMemBuffer('/vsimem/test.xml',
@@ -1577,8 +1446,7 @@ def test_sentinel2_l1b_5():
     gdal.ErrorReset()
     with gdaltest.error_handler():
         ds = gdal.Open('SENTINEL2_L1B:/vsimem/test.xml:10m')
-    if ds is not None:
-        return 'fail'
+    assert ds is None
 
     # No NCOLS
     gdal.FileFromMemBuffer('/vsimem/test.xml',
@@ -1598,8 +1466,7 @@ def test_sentinel2_l1b_5():
     gdal.ErrorReset()
     with gdaltest.error_handler():
         ds = gdal.Open('SENTINEL2_L1B:/vsimem/test.xml:10m')
-    if ds is not None:
-        return 'fail'
+    assert ds is None
 
     # Not the desired resolution
     gdal.FileFromMemBuffer('/vsimem/test.xml',
@@ -1615,8 +1482,7 @@ def test_sentinel2_l1b_5():
     gdal.ErrorReset()
     with gdaltest.error_handler():
         ds = gdal.Open('SENTINEL2_L1B:/vsimem/test.xml:10m')
-    if ds is not None:
-        return 'fail'
+    assert ds is None
     gdal.Unlink('/vsimem/test.xml')
 
     gdal.Unlink('/vsimem/test.xml')
@@ -1632,8 +1498,7 @@ def test_sentinel2_l2a_1():
     filename_xml = 'data/fake_sentinel2_l2a/S2A_USER_PRD_MSIL2A.SAFE/S2A_USER_MTD_SAFL2A.xml'
     gdal.ErrorReset()
     ds = gdal.Open(filename_xml)
-    if ds is None or gdal.GetLastErrorMsg() != '':
-        return 'fail'
+    assert ds is not None and gdal.GetLastErrorMsg() == ''
 
     expected_md = {'AOT_RETRIEVAL_ACCURACY': '0',
                    'BARE_SOILS_PERCENTAGE': '0',
@@ -1705,9 +1570,8 @@ def test_sentinel2_l2a_1():
     for i in range(2):
         gdal.ErrorReset()
         ds = gdal.Open(got_md['SUBDATASET_%d_NAME' % (i + 1)])
-        if ds is None or gdal.GetLastErrorMsg() != '':
-            print(got_md['SUBDATASET_%d_NAME' % (i + 1)])
-            return 'fail'
+        assert ds is not None and gdal.GetLastErrorMsg() == '', \
+            got_md['SUBDATASET_%d_NAME' % (i + 1)]
 
     # Try various invalid subdataset names
     for name in ['SENTINEL2_L2A:',
@@ -1721,9 +1585,7 @@ def test_sentinel2_l2a_1():
                  'SENTINEL2_L2A:%s:10m:EPSG_32633' % filename_xml]:
         with gdaltest.error_handler():
             ds = gdal.Open(name)
-        if ds is not None:
-            print(name)
-            return 'fail'
+        assert ds is None, name
 
     return 'success'
 
@@ -1736,8 +1598,7 @@ def test_sentinel2_l2a_2():
     filename_xml = 'data/fake_sentinel2_l2a/S2A_USER_PRD_MSIL2A.SAFE/S2A_USER_MTD_SAFL2A.xml'
     gdal.ErrorReset()
     ds = gdal.Open('SENTINEL2_L2A:%s:60m:EPSG_32632' % filename_xml)
-    if ds is None or gdal.GetLastErrorMsg() != '':
-        return 'fail'
+    assert ds is not None and gdal.GetLastErrorMsg() == ''
 
     expected_md = {'AOT_RETRIEVAL_ACCURACY': '0',
                    'BARE_SOILS_PERCENTAGE': '0',
@@ -1794,22 +1655,14 @@ def test_sentinel2_l2a_2():
         pprint.pprint(got_md)
         return 'fail'
 
-    if ds.RasterXSize != 1830 or ds.RasterYSize != 1830:
-        print(ds.RasterXSize)
-        print(ds.RasterYSize)
-        return 'fail'
+    assert ds.RasterXSize == 1830 and ds.RasterYSize == 1830
 
-    if ds.GetProjectionRef().find('32632') < 0:
-        return 'fail'
+    assert ds.GetProjectionRef().find('32632') >= 0
 
     got_gt = ds.GetGeoTransform()
-    if got_gt != (699960.0, 60.0, 0.0, 5100060.0, 0.0, -60.0):
-        print(got_gt)
-        return 'fail'
+    assert got_gt == (699960.0, 60.0, 0.0, 5100060.0, 0.0, -60.0)
 
-    if ds.RasterCount != 17:
-        print(ds.RasterCount)
-        return 'fail'
+    assert ds.RasterCount == 17
 
     vrt = ds.GetMetadata('xml:VRT')[0]
     placement_vrt = """<SimpleSource>
@@ -1819,12 +1672,9 @@ def test_sentinel2_l2a_2():
       <SrcRect xOff="0" yOff="0" xSize="1830" ySize="1830" />
       <DstRect xOff="0" yOff="0" xSize="1830" ySize="1830" />
     </SimpleSource>"""
-    if vrt.find(placement_vrt) < 0:
-        print(vrt)
-        return 'fail'
+    assert vrt.find(placement_vrt) >= 0
 
-    if ds.GetMetadata('xml:SENTINEL2') is None:
-        return 'fail'
+    assert ds.GetMetadata('xml:SENTINEL2') is not None
 
     band = ds.GetRasterBand(1)
     got_md = band.GetMetadata()
@@ -1840,13 +1690,11 @@ def test_sentinel2_l2a_2():
         pprint.pprint(got_md)
         return 'fail'
 
-    if band.DataType != gdal.GDT_UInt16:
-        return 'fail'
+    assert band.DataType == gdal.GDT_UInt16
 
     band = ds.GetRasterBand(13)
 
-    if band.GetColorInterpretation() != gdal.GCI_Undefined:
-        return 'fail'
+    assert band.GetColorInterpretation() == gdal.GCI_Undefined
 
     got_md = band.GetMetadata()
     expected_md = {'BANDNAME': 'AOT'}
@@ -1859,8 +1707,7 @@ def test_sentinel2_l2a_2():
     for i in range(ds.RasterCount):
         if ds.GetRasterBand(i + 1).GetMetadataItem('BANDNAME') == 'SCL':
             scl_band = i + 1
-    if scl_band == 0:
-        return 'fail'
+    assert scl_band != 0
     band = ds.GetRasterBand(scl_band)
     expected_categories = ['NODATA',
                            'SATURATED_DEFECTIVE',
@@ -1895,13 +1742,11 @@ def test_sentinel2_l2a_3():
 
     with gdaltest.error_handler():
         ds = gdal.Open('/vsimem/test.xml')
-    if ds is not None:
-        return 'fail'
+    assert ds is None
 
     with gdaltest.error_handler():
         ds = gdal.Open('SENTINEL2_L2A:/vsimem/test.xml:10m:EPSG_32632')
-    if ds is not None:
-        return 'fail'
+    assert ds is None
 
     # File is OK, but granule MTD are missing
     gdal.FileFromMemBuffer('/vsimem/test.xml',
@@ -1945,14 +1790,12 @@ def test_sentinel2_l2a_3():
     gdal.ErrorReset()
     with gdaltest.error_handler():
         gdal.Open('/vsimem/test.xml')
-    if gdal.GetLastErrorMsg() == '':
-        return 'fail'
+    assert gdal.GetLastErrorMsg() != ''
 
     gdal.ErrorReset()
     with gdaltest.error_handler():
         ds = gdal.Open('SENTINEL2_L2A:/vsimem/test.xml:10m:EPSG_32632')
-    if ds is not None:
-        return 'fail'
+    assert ds is None
 
     gdal.Unlink('/vsimem/test.xml')
 
@@ -1967,8 +1810,7 @@ def test_sentinel2_l2a_4():
     filename_xml = 'data/fake_sentinel2_l2a_MSIL2A/S2A_MSIL2A_20180818T094031_N0208_R036_T34VFJ_20180818T120345.SAFE/MTD_MSIL2A.xml'
     gdal.ErrorReset()
     ds = gdal.Open(filename_xml)
-    if ds is None or gdal.GetLastErrorMsg() != '':
-        return 'fail'
+    assert ds is not None and gdal.GetLastErrorMsg() == ''
 
     expected_md = {
                     'AOT_QUANTIFICATION_VALUE': '1000.0',
@@ -2052,9 +1894,8 @@ def test_sentinel2_l2a_4():
     for i in range(2):
         gdal.ErrorReset()
         ds = gdal.Open(got_md['SUBDATASET_%d_NAME' % (i + 1)])
-        if ds is None or gdal.GetLastErrorMsg() != '':
-            print(got_md['SUBDATASET_%d_NAME' % (i + 1)])
-            return 'fail'
+        assert ds is not None and gdal.GetLastErrorMsg() == '', \
+            got_md['SUBDATASET_%d_NAME' % (i + 1)]
 
     # Try various invalid subdataset names
     for name in ['SENTINEL2_L2A:',
@@ -2068,9 +1909,7 @@ def test_sentinel2_l2a_4():
                  'SENTINEL2_L2A:%s:10m:EPSG_32633' % filename_xml]:
         with gdaltest.error_handler():
             ds = gdal.Open(name)
-        if ds is not None:
-            print(name)
-            return 'fail'
+        assert ds is None, name
 
     return 'success'
 
@@ -2084,8 +1923,7 @@ def test_sentinel2_l2a_5():
     filename_xml = 'data/fake_sentinel2_l2a_MSIL2A/S2A_MSIL2A_20180818T094031_N0208_R036_T34VFJ_20180818T120345.SAFE/MTD_MSIL2A.xml'
     gdal.ErrorReset()
     ds = gdal.Open('SENTINEL2_L2A:%s:60m:EPSG_32634' % filename_xml)
-    if ds is None or gdal.GetLastErrorMsg() != '':
-        return 'fail'
+    assert ds is not None and gdal.GetLastErrorMsg() == ''
 
     expected_md = {
                     'AOT_QUANTIFICATION_VALUE': '1000.0',
@@ -2141,22 +1979,14 @@ def test_sentinel2_l2a_5():
         pprint.pprint(got_md)
         return 'fail'
 
-    if ds.RasterXSize != 1830 or ds.RasterYSize != 1830:
-        print(ds.RasterXSize)
-        print(ds.RasterYSize)
-        return 'fail'
+    assert ds.RasterXSize == 1830 and ds.RasterYSize == 1830
 
-    if ds.GetProjectionRef().find('32634') < 0:
-        return 'fail'
+    assert ds.GetProjectionRef().find('32634') >= 0
 
     got_gt = ds.GetGeoTransform()
-    if got_gt != (600000.0, 60.0, 0.0, 6400020.0, 0.0, -60.0):
-        print(got_gt)
-        return 'fail'
+    assert got_gt == (600000.0, 60.0, 0.0, 6400020.0, 0.0, -60.0)
 
-    if ds.RasterCount != 2:
-        print(ds.RasterCount)
-        return 'fail'
+    assert ds.RasterCount == 2
 
     vrt = ds.GetMetadata('xml:VRT')[0]
     placement_vrt = """<SimpleSource>
@@ -2166,12 +1996,9 @@ def test_sentinel2_l2a_5():
       <SrcRect xOff="0" yOff="0" xSize="1830" ySize="1830" />
       <DstRect xOff="0" yOff="0" xSize="1830" ySize="1830" />
     </SimpleSource>"""
-    if vrt.find(placement_vrt) < 0:
-        print(vrt)
-        return 'fail'
+    assert vrt.find(placement_vrt) >= 0
 
-    if ds.GetMetadata('xml:SENTINEL2') is None:
-        return 'fail'
+    assert ds.GetMetadata('xml:SENTINEL2') is not None
 
     band = ds.GetRasterBand(1)
     got_md = band.GetMetadata()
@@ -2187,8 +2014,7 @@ def test_sentinel2_l2a_5():
         pprint.pprint(got_md)
         return 'fail'
 
-    if band.DataType != gdal.GDT_UInt16:
-        return 'fail'
+    assert band.DataType == gdal.GDT_UInt16
 
     return 'success'
 
@@ -2201,8 +2027,7 @@ def test_sentinel2_l2a_6():
     filename_xml = 'data/fake_sentinel2_l2a_MSIL2Ap/S2A_MSIL2A_20170823T094031_N0205_R036_T34VFJ_20170823T094252.SAFE/MTD_MSIL2A.xml'
     gdal.ErrorReset()
     ds = gdal.Open(filename_xml)
-    if ds is None or gdal.GetLastErrorMsg() != '':
-        return 'fail'
+    assert ds is not None and gdal.GetLastErrorMsg() == ''
 
     expected_md = {
                     'AOT_RETRIEVAL_ACCURACY': '0.0',
@@ -2291,9 +2116,8 @@ def test_sentinel2_l2a_6():
     for i in range(2):
         gdal.ErrorReset()
         ds = gdal.Open(got_md['SUBDATASET_%d_NAME' % (i + 1)])
-        if ds is None or gdal.GetLastErrorMsg() != '':
-            print(got_md['SUBDATASET_%d_NAME' % (i + 1)])
-            return 'fail'
+        assert ds is not None and gdal.GetLastErrorMsg() == '', \
+            got_md['SUBDATASET_%d_NAME' % (i + 1)]
 
     # Try various invalid subdataset names
     for name in ['SENTINEL2_L2A:',
@@ -2307,9 +2131,7 @@ def test_sentinel2_l2a_6():
                  'SENTINEL2_L2A:%s:10m:EPSG_32633' % filename_xml]:
         with gdaltest.error_handler():
             ds = gdal.Open(name)
-        if ds is not None:
-            print(name)
-            return 'fail'
+        assert ds is None, name
 
     return 'success'
 
@@ -2323,8 +2145,7 @@ def test_sentinel2_l2a_7():
     filename_xml = 'data/fake_sentinel2_l2a_MSIL2Ap/S2A_MSIL2A_20170823T094031_N0205_R036_T34VFJ_20170823T094252.SAFE/MTD_MSIL2A.xml'
     gdal.ErrorReset()
     ds = gdal.Open('SENTINEL2_L2A:%s:60m:EPSG_32634' % filename_xml)
-    if ds is None or gdal.GetLastErrorMsg() != '':
-        return 'fail'
+    assert ds is not None and gdal.GetLastErrorMsg() == ''
 
     expected_md = {
                     'AOT_RETRIEVAL_ACCURACY': '0.0',
@@ -2385,22 +2206,14 @@ def test_sentinel2_l2a_7():
         pprint.pprint(got_md)
         return 'fail'
 
-    if ds.RasterXSize != 1830 or ds.RasterYSize != 1830:
-        print(ds.RasterXSize)
-        print(ds.RasterYSize)
-        return 'fail'
+    assert ds.RasterXSize == 1830 and ds.RasterYSize == 1830
 
-    if ds.GetProjectionRef().find('32634') < 0:
-        return 'fail'
+    assert ds.GetProjectionRef().find('32634') >= 0
 
     got_gt = ds.GetGeoTransform()
-    if got_gt != (600000.0, 60.0, 0.0, 6400020.0, 0.0, -60.0):
-        print(got_gt)
-        return 'fail'
+    assert got_gt == (600000.0, 60.0, 0.0, 6400020.0, 0.0, -60.0)
 
-    if ds.RasterCount != 2:
-        print(ds.RasterCount)
-        return 'fail'
+    assert ds.RasterCount == 2
 
     vrt = ds.GetMetadata('xml:VRT')[0]
     placement_vrt = """<SimpleSource>
@@ -2410,12 +2223,9 @@ def test_sentinel2_l2a_7():
       <SrcRect xOff="0" yOff="0" xSize="1830" ySize="1830" />
       <DstRect xOff="0" yOff="0" xSize="1830" ySize="1830" />
     </SimpleSource>"""
-    if vrt.find(placement_vrt) < 0:
-        print(vrt)
-        return 'fail'
+    assert vrt.find(placement_vrt) >= 0
 
-    if ds.GetMetadata('xml:SENTINEL2') is None:
-        return 'fail'
+    assert ds.GetMetadata('xml:SENTINEL2') is not None
 
     band = ds.GetRasterBand(1)
     got_md = band.GetMetadata()
@@ -2431,8 +2241,7 @@ def test_sentinel2_l2a_7():
         pprint.pprint(got_md)
         return 'fail'
 
-    if band.DataType != gdal.GDT_UInt16:
-        return 'fail'
+    assert band.DataType == gdal.GDT_UInt16
 
     return 'success'
 
@@ -2446,8 +2255,7 @@ def test_sentinel2_l1c_safe_compact_1():
     filename_xml = 'data/fake_sentinel2_l1c_safecompact/S2A_MSIL1C_test.SAFE/MTD_MSIL1C.xml'
     gdal.ErrorReset()
     ds = gdal.Open(filename_xml)
-    if ds is None or gdal.GetLastErrorMsg() != '':
-        return 'fail'
+    assert ds is not None and gdal.GetLastErrorMsg() == ''
 
     expected_md = {'CLOUD_COVERAGE_ASSESSMENT': '0.0',
                    'DATATAKE_1_DATATAKE_SENSING_START': '2015-12-31T23:59:59.999Z',
@@ -2501,9 +2309,8 @@ def test_sentinel2_l1c_safe_compact_1():
     for i in range(4):
         gdal.ErrorReset()
         ds = gdal.Open(got_md['SUBDATASET_%d_NAME' % (i + 1)])
-        if ds is None or gdal.GetLastErrorMsg() != '':
-            print(got_md['SUBDATASET_%d_NAME' % (i + 1)])
-            return 'fail'
+        assert ds is not None and gdal.GetLastErrorMsg() == '', \
+            got_md['SUBDATASET_%d_NAME' % (i + 1)]
 
     # Try various invalid subdataset names
     for name in ['SENTINEL2_L1C:',
@@ -2517,17 +2324,14 @@ def test_sentinel2_l1c_safe_compact_1():
                  'SENTINEL2_L1C:%s:10m:EPSG_32633' % filename_xml]:
         with gdaltest.error_handler():
             ds = gdal.Open(name)
-        if ds is not None:
-            print(name)
-            return 'fail'
+        assert ds is None, name
 
     # Try opening a zip file as distributed from https://scihub.esa.int/
     if not sys.platform.startswith('win'):
         os.system('sh -c "cd data/fake_sentinel2_l1c_safecompact && zip -r ../../tmp/S2A_MSIL1C_test.zip S2A_OPER_PRD_MSIL1C.SAFE >/dev/null" && cd ../..')
         if os.path.exists('tmp/S2A_MSIL1C_test.zip'):
             ds = gdal.Open('tmp/S2A_MSIL1C_test.zip')
-            if ds is None:
-                return 'fail'
+            assert ds is not None
             os.unlink('tmp/S2A_MSIL1C_test.zip')
 
     return 'success'
@@ -2541,8 +2345,7 @@ def test_sentinel2_l1c_safe_compact_2():
     filename_xml = 'data/fake_sentinel2_l1c_safecompact/S2A_MSIL1C_test.SAFE/MTD_MSIL1C.xml'
     gdal.ErrorReset()
     ds = gdal.Open('SENTINEL2_L1C:%s:10m:EPSG_32632' % filename_xml)
-    if ds is None or gdal.GetLastErrorMsg() != '':
-        return 'fail'
+    assert ds is not None and gdal.GetLastErrorMsg() == ''
 
     expected_md = {'CLOUD_COVERAGE_ASSESSMENT': '0.0',
                    'DATATAKE_1_DATATAKE_SENSING_START': '2015-12-31T23:59:59.999Z',
@@ -2577,21 +2380,14 @@ def test_sentinel2_l1c_safe_compact_2():
         pprint.pprint(got_md)
         return 'fail'
 
-    if ds.RasterXSize != 10980 or ds.RasterYSize != 10980:
-        print(ds.RasterXSize)
-        print(ds.RasterYSize)
-        return 'fail'
+    assert ds.RasterXSize == 10980 and ds.RasterYSize == 10980
 
-    if ds.GetProjectionRef().find('32632') < 0:
-        return 'fail'
+    assert ds.GetProjectionRef().find('32632') >= 0
 
     got_gt = ds.GetGeoTransform()
-    if got_gt != (699960.0, 10.0, 0.0, 5100060.0, 0.0, -10.0):
-        print(got_gt)
-        return 'fail'
+    assert got_gt == (699960.0, 10.0, 0.0, 5100060.0, 0.0, -10.0)
 
-    if ds.RasterCount != 4:
-        return 'fail'
+    assert ds.RasterCount == 4
 
     vrt = ds.GetMetadata('xml:VRT')[0]
     placement_vrt = """<SimpleSource>
@@ -2602,12 +2398,9 @@ def test_sentinel2_l1c_safe_compact_2():
       <DstRect xOff="0" yOff="0" xSize="10980" ySize="10980" />
     </SimpleSource>
 """
-    if vrt.find(placement_vrt) < 0:
-        print(vrt)
-        return 'fail'
+    assert vrt.find(placement_vrt) >= 0
 
-    if ds.GetMetadata('xml:SENTINEL2') is None:
-        return 'fail'
+    assert ds.GetMetadata('xml:SENTINEL2') is not None
 
     band = ds.GetRasterBand(1)
     got_md = band.GetMetadata()
@@ -2623,19 +2416,15 @@ def test_sentinel2_l1c_safe_compact_2():
         pprint.pprint(got_md)
         return 'fail'
 
-    if band.GetColorInterpretation() != gdal.GCI_RedBand:
-        return 'fail'
+    assert band.GetColorInterpretation() == gdal.GCI_RedBand
 
-    if band.DataType != gdal.GDT_UInt16:
-        return 'fail'
+    assert band.DataType == gdal.GDT_UInt16
 
-    if band.GetMetadataItem('NBITS', 'IMAGE_STRUCTURE') != '12':
-        return 'fail'
+    assert band.GetMetadataItem('NBITS', 'IMAGE_STRUCTURE') == '12'
 
     band = ds.GetRasterBand(4)
 
-    if band.GetColorInterpretation() != gdal.GCI_Undefined:
-        return 'fail'
+    assert band.GetColorInterpretation() == gdal.GCI_Undefined
 
     got_md = band.GetMetadata()
     expected_md = {'BANDNAME': 'B8',
@@ -2660,11 +2449,9 @@ def test_sentinel2_l1c_safe_compact_3():
 
     filename_xml = 'data/fake_sentinel2_l1c_safecompact/S2A_MSIL1C_test.SAFE/MTD_MSIL1C.xml'
     ds = gdal.OpenEx('SENTINEL2_L1C:%s:TCI:EPSG_32632' % filename_xml)
-    if ds is None:
-        return 'fail'
+    assert ds is not None
 
-    if ds.RasterCount != 3:
-        return 'fail'
+    assert ds.RasterCount == 3
 
     fl = ds.GetFileList()
     # main XML + 1 granule XML + 1 jp2
@@ -2674,11 +2461,9 @@ def test_sentinel2_l1c_safe_compact_3():
         return 'fail'
 
     band = ds.GetRasterBand(1)
-    if band.GetColorInterpretation() != gdal.GCI_RedBand:
-        return 'fail'
+    assert band.GetColorInterpretation() == gdal.GCI_RedBand
 
-    if band.DataType != gdal.GDT_Byte:
-        return 'fail'
+    assert band.DataType == gdal.GDT_Byte
 
     return 'success'
 
diff --git a/autotest/gdrivers/snodas.py b/autotest/gdrivers/snodas.py
index f86916f5450f..602664710fc8 100755
--- a/autotest/gdrivers/snodas.py
+++ b/autotest/gdrivers/snodas.py
@@ -58,15 +58,9 @@ def test_snodas_1():
     if ret == 'success':
         ds = gdal.Open('data/fake_snodas.hdr')
         ds.GetFileList()
-        if ds.GetRasterBand(1).GetNoDataValue() != -9999:
-            print(ds.GetRasterBand(1).GetNoDataValue())
-            return 'fail'
-        if ds.GetRasterBand(1).GetMinimum() != 0:
-            print(ds.GetRasterBand(1).GetMinimum())
-            return 'fail'
-        if ds.GetRasterBand(1).GetMaximum() != 429:
-            print(ds.GetRasterBand(1).GetMaximum())
-            return 'fail'
+        assert ds.GetRasterBand(1).GetNoDataValue() == -9999
+        assert ds.GetRasterBand(1).GetMinimum() == 0
+        assert ds.GetRasterBand(1).GetMaximum() == 429
 
     return ret
 
diff --git a/autotest/gdrivers/srp.py b/autotest/gdrivers/srp.py
index ae49b07792dd..f9db3cf1a8bd 100755
--- a/autotest/gdrivers/srp.py
+++ b/autotest/gdrivers/srp.py
@@ -50,20 +50,14 @@ def test_srp_1(filename='USRP_PCB0/FKUSRP01.IMG'):
     ret = tst.testOpen(check_prj=srs.ExportToWkt(), check_gt=(500000.0, 5.0, 0.0, 5000000.0, 0.0, -5.0))
 
     ds = gdal.Open('data/' + filename)
-    if ds.GetRasterBand(1).GetColorInterpretation() != gdal.GCI_PaletteIndex:
-        return 'fail'
+    assert ds.GetRasterBand(1).GetColorInterpretation() == gdal.GCI_PaletteIndex
 
     ct = ds.GetRasterBand(1).GetColorTable()
-    if ct.GetCount() != 4:
-        return 'fail'
+    assert ct.GetCount() == 4
 
-    if ct.GetColorEntry(0) != (0, 0, 0, 255):
-        print(ct.GetColorEntry(0))
-        return 'fail'
+    assert ct.GetColorEntry(0) == (0, 0, 0, 255)
 
-    if ct.GetColorEntry(1) != (255, 0, 0, 255):
-        print(ct.GetColorEntry(1))
-        return 'fail'
+    assert ct.GetColorEntry(1) == (255, 0, 0, 255)
 
     expected_md = ['SRP_CLASSIFICATION=U',
                    'SRP_CREATIONDATE=20120505',
@@ -77,10 +71,7 @@ def test_srp_1(filename='USRP_PCB0/FKUSRP01.IMG'):
     got_md = ds.GetMetadata()
     for md in expected_md:
         (key, value) = md.split('=')
-        if key not in got_md or got_md[key] != value:
-            gdaltest.post_reason('did not find %s' % md)
-            print(got_md)
-            return 'fail'
+        assert key in got_md and got_md[key] == value, ('did not find %s' % md)
 
     return 'success'
 
@@ -118,14 +109,10 @@ def test_srp_5():
     ds = gdal.Open('data/USRP_PCB0/TRANSH01.THF')
     gdal.SetConfigOption('SRP_SINGLE_GEN_IN_THF_AS_DATASET', None)
     subdatasets = ds.GetMetadata('SUBDATASETS')
-    if subdatasets['SUBDATASET_1_NAME'] != 'SRP:data/USRP_PCB0/FKUSRP01.GEN,data/USRP_PCB0/FKUSRP01.IMG' and \
-       subdatasets['SUBDATASET_1_NAME'] != 'SRP:data/USRP_PCB0\\FKUSRP01.GEN,data/USRP_PCB0\\FKUSRP01.IMG':
-        print(subdatasets)
-        return 'fail'
-    if subdatasets['SUBDATASET_1_DESC'] != 'SRP:data/USRP_PCB0/FKUSRP01.GEN,data/USRP_PCB0/FKUSRP01.IMG' and \
-       subdatasets['SUBDATASET_1_DESC'] != 'SRP:data/USRP_PCB0\\FKUSRP01.GEN,data/USRP_PCB0\\FKUSRP01.IMG':
-        print(subdatasets)
-        return 'fail'
+    assert (subdatasets['SUBDATASET_1_NAME'] == 'SRP:data/USRP_PCB0/FKUSRP01.GEN,data/USRP_PCB0/FKUSRP01.IMG' or \
+       subdatasets['SUBDATASET_1_NAME'] == 'SRP:data/USRP_PCB0\\FKUSRP01.GEN,data/USRP_PCB0\\FKUSRP01.IMG')
+    assert (subdatasets['SUBDATASET_1_DESC'] == 'SRP:data/USRP_PCB0/FKUSRP01.GEN,data/USRP_PCB0/FKUSRP01.IMG' or \
+       subdatasets['SUBDATASET_1_DESC'] == 'SRP:data/USRP_PCB0\\FKUSRP01.GEN,data/USRP_PCB0\\FKUSRP01.IMG')
 
     expected_md = ['SRP_CLASSIFICATION=U',
                    'SRP_CREATIONDATE=20120505',
@@ -135,10 +122,7 @@ def test_srp_5():
     got_md = ds.GetMetadata()
     for md in expected_md:
         (key, value) = md.split('=')
-        if key not in got_md or got_md[key] != value:
-            gdaltest.post_reason('did not find %s' % md)
-            print(got_md)
-            return 'fail'
+        assert key in got_md and got_md[key] == value, ('did not find %s' % md)
 
     return 'success'
 
diff --git a/autotest/gdrivers/srtmhgt.py b/autotest/gdrivers/srtmhgt.py
index d9c39002c0d2..687d5450c499 100755
--- a/autotest/gdrivers/srtmhgt.py
+++ b/autotest/gdrivers/srtmhgt.py
@@ -69,9 +69,7 @@ def test_srtmhgt_1():
     band = dsDst.GetRasterBand(1)
     chksum = band.Checksum()
 
-    if chksum != 60918:
-        gdaltest.post_reason('Wrong checksum. Checksum found %d' % chksum)
-        return 'fail'
+    assert chksum == 60918, ('Wrong checksum. Checksum found %d' % chksum)
 
     return 'success'
 
@@ -88,9 +86,7 @@ def test_srtmhgt_2():
     band = dsDst.GetRasterBand(1)
     chksum = band.Checksum()
 
-    if chksum != 60918:
-        gdaltest.post_reason('Wrong checksum. Checksum found %d' % chksum)
-        return 'fail'
+    assert chksum == 60918, ('Wrong checksum. Checksum found %d' % chksum)
     dsDst = None
 
     # Test update support
@@ -99,9 +95,7 @@ def test_srtmhgt_2():
                       dsDst.ReadRaster())
     dsDst.FlushCache()
 
-    if chksum != 60918:
-        gdaltest.post_reason('Wrong checksum. Checksum found %d' % chksum)
-        return 'fail'
+    assert chksum == 60918, ('Wrong checksum. Checksum found %d' % chksum)
     dsDst = None
 
     return 'success'
@@ -121,9 +115,7 @@ def test_srtmhgt_3():
     band = dsDst.GetRasterBand(1)
     chksum = band.Checksum()
 
-    if chksum != 60918:
-        gdaltest.post_reason('Wrong checksum. Checksum found %d' % chksum)
-        return 'fail'
+    assert chksum == 60918, ('Wrong checksum. Checksum found %d' % chksum)
 
     return 'success'
 
@@ -140,15 +132,12 @@ def test_srtmhgt_4():
     gdal.VSIFCloseL(f)
 
     ds = gdal.Open('/vsimem/N43W080.SRTMSWBD.raw.zip')
-    if ds is None:
-        return 'fail'
+    assert ds is not None
     cs = ds.GetRasterBand(1).Checksum()
     ds = None
     gdal.Unlink('/vsimem/N43W080.SRTMSWBD.raw.zip')
 
-    if cs != 3636:
-        gdaltest.post_reason('Wrong checksum. Checksum found %d' % cs)
-        return 'fail'
+    assert cs == 3636, ('Wrong checksum. Checksum found %d' % cs)
 
     return 'success'
 
diff --git a/autotest/gdrivers/terragen.py b/autotest/gdrivers/terragen.py
index d2c737735730..3ca13b9b81d5 100755
--- a/autotest/gdrivers/terragen.py
+++ b/autotest/gdrivers/terragen.py
@@ -51,8 +51,7 @@ def test_terragen_2():
     gdal.Translate('/vsimem/out.ter', 'data/float32.tif', options='-of TERRAGEN -co MINUSERPIXELVALUE=74 -co MAXUSERPIXELVALUE=255')
     gdal.Translate('/vsimem/out.tif', '/vsimem/out.ter', options='-unscale')
     ds = gdal.Open('/vsimem/out.tif')
-    if ds.GetRasterBand(1).Checksum() != 4672:
-        return 'fail'
+    assert ds.GetRasterBand(1).Checksum() == 4672
     ds = None
     gdal.GetDriverByName('TERRAGEN').Delete('/vsimem/out.ter')
     gdal.GetDriverByName('TERRAGEN').Delete('/vsimem/out.tif')
diff --git a/autotest/gdrivers/tiff_profile.py b/autotest/gdrivers/tiff_profile.py
index 921f7c178689..8dcb3da2fcf2 100755
--- a/autotest/gdrivers/tiff_profile.py
+++ b/autotest/gdrivers/tiff_profile.py
@@ -65,8 +65,7 @@ def test_tiff_write_icc():
     except OSError:
         pass
 
-    if md['SOURCE_ICC_PROFILE'] != icc:
-        return 'fail'
+    assert md['SOURCE_ICC_PROFILE'] == icc
 
     # Check again with dataset from Open()
     ds = gdal.Open('tmp/icc_test.tiff')
@@ -79,8 +78,7 @@ def test_tiff_write_icc():
     except OSError:
         pass
 
-    if md['SOURCE_ICC_PROFILE'] != icc:
-        return 'fail'
+    assert md['SOURCE_ICC_PROFILE'] == icc
 
     # Check again with GetMetadataItem()
     ds = gdal.Open('tmp/icc_test.tiff')
@@ -93,8 +91,7 @@ def test_tiff_write_icc():
     except OSError:
         pass
 
-    if source_icc_profile != icc:
-        return 'fail'
+    assert source_icc_profile == icc
 
     driver.Delete('tmp/icc_test.tiff')
 
@@ -123,8 +120,7 @@ def test_tiff_copy_icc():
     ds = None
     ds2 = None
 
-    if md['SOURCE_ICC_PROFILE'] != icc:
-        return 'fail'
+    assert md['SOURCE_ICC_PROFILE'] == icc
 
     # Check again with dataset from Open()
     ds2 = gdal.Open('tmp/icc_test2.tiff')
@@ -132,8 +128,7 @@ def test_tiff_copy_icc():
     ds = None
     ds2 = None
 
-    if md['SOURCE_ICC_PROFILE'] != icc:
-        return 'fail'
+    assert md['SOURCE_ICC_PROFILE'] == icc
 
     driver.Delete('tmp/icc_test.tiff')
     driver.Delete('tmp/icc_test2.tiff')
@@ -163,8 +158,7 @@ def test_tiff_copy_options_icc():
     ds = None
     ds2 = None
 
-    if md['SOURCE_ICC_PROFILE'] != icc:
-        return 'fail'
+    assert md['SOURCE_ICC_PROFILE'] == icc
 
     # Check again with dataset from Open()
     ds2 = gdal.Open('tmp/icc_test2.tiff')
@@ -172,8 +166,7 @@ def test_tiff_copy_options_icc():
     ds = None
     ds2 = None
 
-    if md['SOURCE_ICC_PROFILE'] != icc:
-        return 'fail'
+    assert md['SOURCE_ICC_PROFILE'] == icc
 
     driver.Delete('tmp/icc_test.tiff')
     driver.Delete('tmp/icc_test2.tiff')
@@ -215,8 +208,7 @@ def test_tiff_copy_options_colorimetric_data():
     source_whitepoint2 = eval('(' + md['SOURCE_WHITEPOINT'] + ')')
 
     for i in range(0, 3):
-        if abs(source_whitepoint2[i] - source_whitepoint[i]) > 0.0001:
-            return 'fail'
+        assert abs(source_whitepoint2[i] - source_whitepoint[i]) <= 0.0001
 
     source_primaries2 = [
         eval('(' + md['SOURCE_PRIMARIES_RED'] + ')'),
@@ -225,16 +217,14 @@ def test_tiff_copy_options_colorimetric_data():
 
     for j in range(0, 3):
         for i in range(0, 3):
-            if abs(source_primaries2[j][i] - source_primaries[j][i]) > 0.0001:
-                return 'fail'
+            assert abs(source_primaries2[j][i] - source_primaries[j][i]) <= 0.0001
 
     tifftag_transferfunction2 = (
         eval('[' + md['TIFFTAG_TRANSFERFUNCTION_RED'] + ']'),
         eval('[' + md['TIFFTAG_TRANSFERFUNCTION_GREEN'] + ']'),
         eval('[' + md['TIFFTAG_TRANSFERFUNCTION_BLUE'] + ']'))
 
-    if tifftag_transferfunction2 != tifftag_transferfunction:
-        return 'fail'
+    assert tifftag_transferfunction2 == tifftag_transferfunction
 
     # Check again with dataset from Open()
     ds2 = gdal.Open('tmp/icc_test2.tiff')
@@ -245,8 +235,7 @@ def test_tiff_copy_options_colorimetric_data():
     source_whitepoint2 = eval('(' + md['SOURCE_WHITEPOINT'] + ')')
 
     for i in range(0, 3):
-        if abs(source_whitepoint2[i] - source_whitepoint[i]) > 0.0001:
-            return 'fail'
+        assert abs(source_whitepoint2[i] - source_whitepoint[i]) <= 0.0001
 
     source_primaries2 = [
         eval('(' + md['SOURCE_PRIMARIES_RED'] + ')'),
@@ -255,16 +244,14 @@ def test_tiff_copy_options_colorimetric_data():
 
     for j in range(0, 3):
         for i in range(0, 3):
-            if abs(source_primaries2[j][i] - source_primaries[j][i]) > 0.0001:
-                return 'fail'
+            assert abs(source_primaries2[j][i] - source_primaries[j][i]) <= 0.0001
 
     tifftag_transferfunction2 = (
         eval('[' + md['TIFFTAG_TRANSFERFUNCTION_RED'] + ']'),
         eval('[' + md['TIFFTAG_TRANSFERFUNCTION_GREEN'] + ']'),
         eval('[' + md['TIFFTAG_TRANSFERFUNCTION_BLUE'] + ']'))
 
-    if tifftag_transferfunction2 != tifftag_transferfunction:
-        return 'fail'
+    assert tifftag_transferfunction2 == tifftag_transferfunction
 
     driver.Delete('tmp/icc_test.tiff')
     driver.Delete('tmp/icc_test2.tiff')
@@ -304,8 +291,7 @@ def test_tiff_copy_colorimetric_data():
     source_whitepoint2 = eval('(' + md['SOURCE_WHITEPOINT'] + ')')
 
     for i in range(0, 3):
-        if abs(source_whitepoint2[i] - source_whitepoint[i]) > 0.0001:
-            return 'fail'
+        assert abs(source_whitepoint2[i] - source_whitepoint[i]) <= 0.0001
 
     source_primaries2 = [
         eval('(' + md['SOURCE_PRIMARIES_RED'] + ')'),
@@ -314,16 +300,14 @@ def test_tiff_copy_colorimetric_data():
 
     for j in range(0, 3):
         for i in range(0, 3):
-            if abs(source_primaries2[j][i] - source_primaries[j][i]) > 0.0001:
-                return 'fail'
+            assert abs(source_primaries2[j][i] - source_primaries[j][i]) <= 0.0001
 
     tifftag_transferfunction2 = (
         eval('[' + md['TIFFTAG_TRANSFERFUNCTION_RED'] + ']'),
         eval('[' + md['TIFFTAG_TRANSFERFUNCTION_GREEN'] + ']'),
         eval('[' + md['TIFFTAG_TRANSFERFUNCTION_BLUE'] + ']'))
 
-    if tifftag_transferfunction2 != tifftag_transferfunction:
-        return 'fail'
+    assert tifftag_transferfunction2 == tifftag_transferfunction
 
     # Check again with dataset from Open()
     ds2 = gdal.Open('tmp/icc_test2.tiff')
@@ -334,8 +318,7 @@ def test_tiff_copy_colorimetric_data():
     source_whitepoint2 = eval('(' + md['SOURCE_WHITEPOINT'] + ')')
 
     for i in range(0, 3):
-        if abs(source_whitepoint2[i] - source_whitepoint[i]) > 0.0001:
-            return 'fail'
+        assert abs(source_whitepoint2[i] - source_whitepoint[i]) <= 0.0001
 
     source_primaries2 = [
         eval('(' + md['SOURCE_PRIMARIES_RED'] + ')'),
@@ -344,16 +327,14 @@ def test_tiff_copy_colorimetric_data():
 
     for j in range(0, 3):
         for i in range(0, 3):
-            if abs(source_primaries2[j][i] - source_primaries[j][i]) > 0.0001:
-                return 'fail'
+            assert abs(source_primaries2[j][i] - source_primaries[j][i]) <= 0.0001
 
     tifftag_transferfunction2 = (
         eval('[' + md['TIFFTAG_TRANSFERFUNCTION_RED'] + ']'),
         eval('[' + md['TIFFTAG_TRANSFERFUNCTION_GREEN'] + ']'),
         eval('[' + md['TIFFTAG_TRANSFERFUNCTION_BLUE'] + ']'))
 
-    if tifftag_transferfunction2 != tifftag_transferfunction:
-        return 'fail'
+    assert tifftag_transferfunction2 == tifftag_transferfunction
 
     driver.Delete('tmp/icc_test.tiff')
     driver.Delete('tmp/icc_test2.tiff')
@@ -384,16 +365,14 @@ def test_tiff_update_icc():
     md = ds.GetMetadata("COLOR_PROFILE")
     ds = None
 
-    if md['SOURCE_ICC_PROFILE'] != icc:
-        return 'fail'
+    assert md['SOURCE_ICC_PROFILE'] == icc
 
     # Reopen the file to verify it was written.
     ds = gdal.Open('tmp/icc_test.tiff')
     md = ds.GetMetadata("COLOR_PROFILE")
     ds = None
 
-    if md['SOURCE_ICC_PROFILE'] != icc:
-        return 'fail'
+    assert md['SOURCE_ICC_PROFILE'] == icc
 
     driver.Delete('tmp/icc_test.tiff')
 
@@ -428,8 +407,7 @@ def test_tiff_update_colorimetric():
     source_whitepoint2 = eval('(' + md['SOURCE_WHITEPOINT'] + ')')
 
     for i in range(0, 3):
-        if abs(source_whitepoint2[i] - source_whitepoint[i]) > 0.0001:
-            return 'fail'
+        assert abs(source_whitepoint2[i] - source_whitepoint[i]) <= 0.0001
 
     source_primaries2 = [
         eval('(' + md['SOURCE_PRIMARIES_RED'] + ')'),
@@ -438,16 +416,14 @@ def test_tiff_update_colorimetric():
 
     for j in range(0, 3):
         for i in range(0, 3):
-            if abs(source_primaries2[j][i] - source_primaries[j][i]) > 0.0001:
-                return 'fail'
+            assert abs(source_primaries2[j][i] - source_primaries[j][i]) <= 0.0001
 
     tifftag_transferfunction2 = (
         eval('[' + md['TIFFTAG_TRANSFERFUNCTION_RED'] + ']'),
         eval('[' + md['TIFFTAG_TRANSFERFUNCTION_GREEN'] + ']'),
         eval('[' + md['TIFFTAG_TRANSFERFUNCTION_BLUE'] + ']'))
 
-    if tifftag_transferfunction2 != tifftag_transferfunction:
-        return 'fail'
+    assert tifftag_transferfunction2 == tifftag_transferfunction
 
     # Reopen the file to verify it was written.
     ds = gdal.Open('tmp/icc_test.tiff')
@@ -457,8 +433,7 @@ def test_tiff_update_colorimetric():
     source_whitepoint2 = eval('(' + md['SOURCE_WHITEPOINT'] + ')')
 
     for i in range(0, 3):
-        if abs(source_whitepoint2[i] - source_whitepoint[i]) > 0.0001:
-            return 'fail'
+        assert abs(source_whitepoint2[i] - source_whitepoint[i]) <= 0.0001
 
     source_primaries2 = [
         eval('(' + md['SOURCE_PRIMARIES_RED'] + ')'),
@@ -467,16 +442,14 @@ def test_tiff_update_colorimetric():
 
     for j in range(0, 3):
         for i in range(0, 3):
-            if abs(source_primaries2[j][i] - source_primaries[j][i]) > 0.0001:
-                return 'fail'
+            assert abs(source_primaries2[j][i] - source_primaries[j][i]) <= 0.0001
 
     tifftag_transferfunction2 = (
         eval('[' + md['TIFFTAG_TRANSFERFUNCTION_RED'] + ']'),
         eval('[' + md['TIFFTAG_TRANSFERFUNCTION_GREEN'] + ']'),
         eval('[' + md['TIFFTAG_TRANSFERFUNCTION_BLUE'] + ']'))
 
-    if tifftag_transferfunction2 != tifftag_transferfunction:
-        return 'fail'
+    assert tifftag_transferfunction2 == tifftag_transferfunction
 
     driver.Delete('tmp/icc_test.tiff')
 
diff --git a/autotest/gdrivers/til.py b/autotest/gdrivers/til.py
index 549863473f71..5b62de8e9f2a 100755
--- a/autotest/gdrivers/til.py
+++ b/autotest/gdrivers/til.py
@@ -58,20 +58,13 @@ def test_til_2():
     ds = gdal.Open('data/testtil.til')
     filelist = ds.GetFileList()
 
-    if len(filelist) != 3:
-        gdaltest.post_reason('did not get expected file list.')
-        return 'fail'
+    assert len(filelist) == 3, 'did not get expected file list.'
 
     md = ds.GetMetadata('IMAGERY')
-    if 'SATELLITEID' not in md:
-        print('SATELLITEID not present in IMAGERY Domain')
-        return 'fail'
-    if 'CLOUDCOVER' not in md:
-        print('CLOUDCOVER not present in IMAGERY Domain')
-        return 'fail'
-    if 'ACQUISITIONDATETIME' not in md:
-        print('ACQUISITIONDATETIME not present in IMAGERY Domain')
-        return 'fail'
+    assert 'SATELLITEID' in md, 'SATELLITEID not present in IMAGERY Domain'
+    assert 'CLOUDCOVER' in md, 'CLOUDCOVER not present in IMAGERY Domain'
+    assert 'ACQUISITIONDATETIME' in md, \
+        'ACQUISITIONDATETIME not present in IMAGERY Domain'
 
     ds = None
 
@@ -98,20 +91,13 @@ def test_til_3():
     ds = gdal.Open('data/testtil2.til')
     filelist = ds.GetFileList()
 
-    if len(filelist) != 3:
-        gdaltest.post_reason('did not get expected file list.')
-        return 'fail'
+    assert len(filelist) == 3, 'did not get expected file list.'
 
     md = ds.GetMetadata('IMAGERY')
-    if 'SATELLITEID' not in md:
-        print('SATELLITEID not present in IMAGERY Domain')
-        return 'fail'
-    if 'CLOUDCOVER' not in md:
-        print('CLOUDCOVER not present in IMAGERY Domain')
-        return 'fail'
-    if 'ACQUISITIONDATETIME' not in md:
-        print('ACQUISITIONDATETIME not present in IMAGERY Domain')
-        return 'fail'
+    assert 'SATELLITEID' in md, 'SATELLITEID not present in IMAGERY Domain'
+    assert 'CLOUDCOVER' in md, 'CLOUDCOVER not present in IMAGERY Domain'
+    assert 'ACQUISITIONDATETIME' in md, \
+        'ACQUISITIONDATETIME not present in IMAGERY Domain'
 
     ds = None
 
diff --git a/autotest/gdrivers/usgsdem.py b/autotest/gdrivers/usgsdem.py
index b95cf3317e71..575d6f637e5b 100755
--- a/autotest/gdrivers/usgsdem.py
+++ b/autotest/gdrivers/usgsdem.py
@@ -35,6 +35,7 @@
 
 
 import gdaltest
+import pytest
 
 ###############################################################################
 # Test truncated version of http://download.osgeo.org/gdal/data/usgsdem/022gdeme
@@ -108,14 +109,11 @@ def test_usgsdem_5():
             print('')
             print('old = ', gt1)
             print('new = ', gt2)
-            gdaltest.post_reason('Geotransform differs.')
-            return 'fail'
+            pytest.fail('Geotransform differs.')
 
     srs = osr.SpatialReference()
     srs.SetWellKnownGeogCS('WGS84')
-    if ds2.GetProjectionRef() != srs.ExportToWkt():
-        gdaltest.post_reason('Bad SRS.')
-        return 'fail'
+    assert ds2.GetProjectionRef() == srs.ExportToWkt(), 'Bad SRS.'
 
     ds2 = None
 
@@ -149,8 +147,7 @@ def test_usgsdem_6():
     data1 = f1.read()
     data2 = f2.read()
 
-    if data1 != data2:
-        return 'fail'
+    assert data1 == data2
 
     f1.close()
     f2.close()
@@ -171,11 +168,7 @@ def test_usgsdem_7():
                                                      options=['PRODUCT=CDED50K', 'TOPLEFT=80w,44n', 'RESAMPLE=Nearest', 'ZRESOLUTION=1.1', 'INTERNALNAME=GDAL'])
     gdal.PopErrorHandler()
 
-    if ds2.RasterXSize != 1201 or ds2.RasterYSize != 1201:
-        gdaltest.post_reason('Bad image dimensions.')
-        print(ds2.RasterXSize)
-        print(ds2.RasterYSize)
-        return 'fail'
+    assert ds2.RasterXSize == 1201 and ds2.RasterYSize == 1201, 'Bad image dimensions.'
 
     expected_gt = (-80.000104166666674, 0.000208333333333, 0, 44.000104166666667, 0, -0.000208333333333)
     got_gt = ds2.GetGeoTransform()
@@ -184,14 +177,11 @@ def test_usgsdem_7():
             print('')
             print('expected = ', expected_gt)
             print('got = ', got_gt)
-            gdaltest.post_reason('Geotransform differs.')
-            return 'fail'
+            pytest.fail('Geotransform differs.')
 
     srs = osr.SpatialReference()
     srs.SetWellKnownGeogCS('NAD83')
-    if ds2.GetProjectionRef() != srs.ExportToWkt():
-        gdaltest.post_reason('Bad SRS.')
-        return 'fail'
+    assert ds2.GetProjectionRef() == srs.ExportToWkt(), 'Bad SRS.'
 
     ds2 = None
 
diff --git a/autotest/gdrivers/vicar.py b/autotest/gdrivers/vicar.py
index 68086937b20c..0f6914c41e00 100755
--- a/autotest/gdrivers/vicar.py
+++ b/autotest/gdrivers/vicar.py
@@ -34,6 +34,7 @@
 
 
 import gdaltest
+import pytest
 
 ###############################################################################
 # Read truncated VICAR file
@@ -58,32 +59,19 @@ def test_vicar_1():
     expected_gt = (-53985.0, 25.0, 0.0, -200805.0, 0.0, -25.0)
     got_gt = ds.GetGeoTransform()
     for i in range(6):
-        if abs(got_gt[i] - expected_gt[i]) > 1e-8:
-            print(got_gt)
-            print(expected_gt)
-            return 'fail'
-
-    if ds.GetRasterBand(1).GetNoDataValue() != 0:
-        return 'fail'
-    if abs(ds.GetRasterBand(1).GetScale() - 2.34) > 1e-5:
-        print(ds.GetRasterBand(1).GetScale())
-        return 'fail'
-    if abs(ds.GetRasterBand(1).GetOffset() - 4.56) > 1e-5:
-        return 'fail'
+        assert abs(got_gt[i] - expected_gt[i]) <= 1e-8
+
+    assert ds.GetRasterBand(1).GetNoDataValue() == 0
+    assert abs(ds.GetRasterBand(1).GetScale() - 2.34) <= 1e-5
+    assert abs(ds.GetRasterBand(1).GetOffset() - 4.56) <= 1e-5
 
     expected_md = {'DLRTO8.REFLECTANCE_OFFSET': '4.56', 'PRODUCT_TYPE': 'IMAGE', 'PIXEL-SHIFT-BUG': 'CORRECTED', 'M94_ORBIT.STOP_TIME': 'stop_time', 'FILE.EVENT_TYPE': 'EVENT_TYPE', 'M94_CAMERAS.MACROPIXEL_SIZE': '1', 'M94_INSTRUMENT.DETECTOR_ID': 'MEX_HRSC_NADIR', 'HRORTHO.SPICE_FILE_NAME': 'SPICE_FILE_NAME', 'DLRTO8.RADIANCE_SCALING_FACTOR': '1.23', 'CONVERSION_DETAILS': 'http://www.lpi.usra.edu/meetings/lpsc2014/pdf/1088.pdf', 'HRORTHO.GEOMETRIC_CALIB_FILE_NAME': 'calib_file_name', 'HRORTHO.EXTORI_FILE_NAME': "extori'_file_name", 'M94_INSTRUMENT.MISSION_PHASE_NAME': 'MISSION_PHASE_NAME', 'HRCONVER.MISSING_FRAMES': '0', 'DLRTO8.RADIANCE_OFFSET': '1.23', 'HRCONVER.OVERFLOW_FRAMES': '0', 'SPACECRAFT_NAME': 'MARS EXPRESS', 'HRFOOT.BEST_GROUND_SAMPLING_DISTANCE': '1.23', 'M94_ORBIT.START_TIME': 'start_time', 'HRORTHO.DTM_NAME': 'dtm_name', 'DLRTO8.REFLECTANCE_SCALING_FACTOR': '2.34', 'HRCONVER.ERROR_FRAMES': '1'}
     md = ds.GetMetadata()
     if len(md) != len(expected_md):
-        print(md)
-        print(len(md))
-        print(len(expected_md))
         print(sorted(md.keys()))
-        print(sorted(expected_md.keys()))
-        return 'fail'
+        pytest.fail(sorted(expected_md.keys()))
     for key in expected_md:
-        if md[key] != expected_md[key]:
-            print(md)
-            return 'fail'
+        assert md[key] == expected_md[key]
 
     return 'success'
 
diff --git a/autotest/gdrivers/vrtderived.py b/autotest/gdrivers/vrtderived.py
index 79d60bd12a12..9682d25346d3 100755
--- a/autotest/gdrivers/vrtderived.py
+++ b/autotest/gdrivers/vrtderived.py
@@ -37,6 +37,7 @@
 
 
 import gdaltest
+import pytest
 
 
 def _xmlsearch(root, nodetype, name):
@@ -76,9 +77,7 @@ def test_vrtderived_1():
         '  <SourceProperties RasterXSize="20" RasterYSize="20" DataType="Byte" '
         'BlockXSize="20" BlockYSize="20" />\n'
         '</SimpleSource>\n')
-    if md_read['source_0'] != expected_md_read:
-        print(md_read['source_0'])
-        return 'fail'
+    assert md_read['source_0'] == expected_md_read
 
     xmlstring = open(filename).read()
     gdal.Unlink(filename)
@@ -87,9 +86,7 @@ def test_vrtderived_1():
     node = _xmlsearch(node, gdal.CXT_Element, 'VRTRasterBand')
     node = _xmlsearch(node, gdal.CXT_Attribute, 'subClass')
     node = _xmlsearch(node, gdal.CXT_Text, 'VRTDerivedRasterBand')
-    if node is None:
-        gdaltest.post_reason('invalid subclass')
-        return 'fail'
+    assert node is not None, 'invalid subclass'
 
     return 'success'
 
@@ -119,12 +116,10 @@ def test_vrtderived_2():
     vrt_ds.GetRasterBand(1).SetMetadata(md, 'vrt_sources')
     with gdaltest.error_handler():
         cs = vrt_ds.GetRasterBand(1).Checksum()
-    if cs != 0:
-        return 'fail'
+    assert cs == 0
     with gdaltest.error_handler():
         ret = vrt_ds.GetRasterBand(1).WriteRaster(0, 0, 1, 1, ' ')
-    if ret == 0:
-        return 'fail'
+    assert ret != 0
     vrt_ds = None
 
     xmlstring = open(filename).read()
@@ -134,14 +129,10 @@ def test_vrtderived_2():
     node = _xmlsearch(node, gdal.CXT_Element, 'VRTRasterBand')
     pixelfunctiontype = _xmlsearch(node, gdal.CXT_Element, 'PixelFunctionType')
     pixelfunctiontype = _xmlsearch(pixelfunctiontype, gdal.CXT_Text, 'dummy')
-    if pixelfunctiontype is None:
-        gdaltest.post_reason('incorrect PixelFunctionType value')
-        return 'fail'
+    assert pixelfunctiontype is not None, 'incorrect PixelFunctionType value'
     pixelfunctionlanguage = _xmlsearch(node, gdal.CXT_Element, 'PixelFunctionLanguage')
     pixelfunctionlanguage = _xmlsearch(pixelfunctionlanguage, gdal.CXT_Text, 'Python')
-    if pixelfunctionlanguage is None:
-        gdaltest.post_reason('incorrect PixelFunctionLanguage value')
-        return 'fail'
+    assert pixelfunctionlanguage is not None, 'incorrect PixelFunctionLanguage value'
 
     return 'success'
 
@@ -178,9 +169,7 @@ def test_vrtderived_3():
     node = _xmlsearch(node, gdal.CXT_Element, 'VRTRasterBand')
     node = _xmlsearch(node, gdal.CXT_Element, 'SourceTransferType')
     node = _xmlsearch(node, gdal.CXT_Text, 'Byte')
-    if node is None:
-        gdaltest.post_reason('incorrect SourceTransferType value')
-        return 'fail'
+    assert node is not None, 'incorrect SourceTransferType value'
 
     return 'success'
 
@@ -200,9 +189,7 @@ def test_vrtderived_4():
     gdal.PushErrorHandler('CPLQuietErrorHandler')
     ret = vrt_ds.AddBand(gdal.GDT_Byte, options)
     gdal.PopErrorHandler()
-    if ret == 0:
-        gdaltest.post_reason('invalid SourceTransferType value not detected')
-        return 'fail'
+    assert ret != 0, 'invalid SourceTransferType value not detected'
 
     return 'success'
 
@@ -222,10 +209,7 @@ def test_vrtderived_5():
     ds = gdal.Open('data/n43_hillshade.vrt')
     cs = ds.GetRasterBand(1).Checksum()
     gdal.SetConfigOption('GDAL_VRT_ENABLE_PYTHON', None)
-    if cs != 50577:
-        gdaltest.post_reason('invalid checksum')
-        print(cs)
-        return 'fail'
+    assert cs == 50577, 'invalid checksum'
 
     return 'success'
 
@@ -245,10 +229,7 @@ def test_vrtderived_6():
     ds = gdal.Open('data/python_ones.vrt')
     cs = ds.GetRasterBand(1).Checksum()
     gdal.SetConfigOption('GDAL_VRT_ENABLE_PYTHON', None)
-    if cs != 10000:
-        gdaltest.post_reason('invalid checksum')
-        print(cs)
-        return 'fail'
+    assert cs == 10000, 'invalid checksum'
 
     return 'success'
 
@@ -299,10 +280,7 @@ def test_vrtderived_7():
     ret, err = gdaltest.runexternal_out_and_err(test_cli_utilities.get_gdalinfo_path() + ' -checksum data/n43_hillshade.vrt --config GDAL_VRT_ENABLE_PYTHON YES --config PYTHONSO foo')
     if gdal.GetConfigOption('CPL_DEBUG') is not None:
         print(err)
-    if ret.find('Checksum=0') < 0:
-        print(ret)
-        print(err)
-        return 'fail'
+    assert ret.find('Checksum=0') >= 0, err
 
     # Valid shared object name, but without Python symbols
     libgdal_so = gdaltest.find_lib('gdal')
@@ -310,10 +288,7 @@ def test_vrtderived_7():
         ret, err = gdaltest.runexternal_out_and_err(test_cli_utilities.get_gdalinfo_path() + ' -checksum data/n43_hillshade.vrt --config GDAL_VRT_ENABLE_PYTHON YES --config PYTHONSO "%s"' % libgdal_so)
         if gdal.GetConfigOption('CPL_DEBUG') is not None:
             print(err)
-        if ret.find('Checksum=0') < 0:
-            print(ret)
-            print(err)
-            return 'fail'
+        assert ret.find('Checksum=0') >= 0, err
 
     return 'success'
 
@@ -334,18 +309,12 @@ def test_vrtderived_8():
     with gdaltest.error_handler():
         cs = ds.GetRasterBand(1).Checksum()
     gdal.SetConfigOption('GDAL_VRT_ENABLE_PYTHON', None)
-    if cs != 0:
-        gdaltest.post_reason('invalid checksum')
-        print(cs)
-        return 'fail'
+    assert cs == 0, 'invalid checksum'
 
     ds = gdal.Open('data/n43_hillshade.vrt')
     with gdaltest.error_handler():
         cs = ds.GetRasterBand(1).Checksum()
-    if cs != 0:
-        gdaltest.post_reason('invalid checksum')
-        print(cs)
-        return 'fail'
+    assert cs == 0, 'invalid checksum'
 
     return 'success'
 
@@ -369,8 +338,7 @@ def test_vrtderived_9():
   </VRTRasterBand>
 </VRTDataset>
 """)
-    if ds is not None:
-        return 'fail'
+    assert ds is None
 
     # Unsupported PixelFunctionLanguage
     with gdaltest.error_handler():
@@ -381,8 +349,7 @@ def test_vrtderived_9():
   </VRTRasterBand>
 </VRTDataset>
 """)
-    if ds is not None:
-        return 'fail'
+    assert ds is None
 
     # PixelFunctionCode can only be used with Python
     with gdaltest.error_handler():
@@ -397,8 +364,7 @@ def identity(in_ar, out_ar, xoff, yoff, xsize, ysize, raster_xsize, raster_ysize
   </VRTRasterBand>
 </VRTDataset>
 """)
-    if ds is not None:
-        return 'fail'
+    assert ds is None
 
     # PixelFunctionArguments can only be used with Python
     with gdaltest.error_handler():
@@ -409,8 +375,7 @@ def identity(in_ar, out_ar, xoff, yoff, xsize, ysize, raster_xsize, raster_ysize
   </VRTRasterBand>
 </VRTDataset>
 """)
-    if ds is not None:
-        return 'fail'
+    assert ds is None
 
     # BufferRadius can only be used with Python
     with gdaltest.error_handler():
@@ -421,8 +386,7 @@ def identity(in_ar, out_ar, xoff, yoff, xsize, ysize, raster_xsize, raster_ysize
   </VRTRasterBand>
 </VRTDataset>
 """)
-    if ds is not None:
-        return 'fail'
+    assert ds is None
 
     # Invalid BufferRadius
     with gdaltest.error_handler():
@@ -434,8 +398,7 @@ def identity(in_ar, out_ar, xoff, yoff, xsize, ysize, raster_xsize, raster_ysize
   </VRTRasterBand>
 </VRTDataset>
 """)
-    if ds is not None:
-        return 'fail'
+    assert ds is None
 
     # Error at Python code compilation (indentation error)
     ds = gdal.Open("""<VRTDataset rasterXSize="10" rasterYSize="10">
@@ -455,10 +418,8 @@ def identity(in_ar, out_ar, xoff, yoff, xsize, ysize, raster_xsize, raster_ysize
         cs = ds.GetRasterBand(1).Checksum()
     gdal.SetConfigOption('GDAL_VRT_ENABLE_PYTHON', None)
     if cs != 0:
-        gdaltest.post_reason('invalid checksum')
-        print(cs)
         print(gdal.GetLastErrorMsg())
-        return 'fail'
+        pytest.fail('invalid checksum')
 
     # Error at run time (in global code)
     ds = gdal.Open("""<VRTDataset rasterXSize="10" rasterYSize="10">
@@ -479,10 +440,8 @@ def identity(in_ar, out_ar, xoff, yoff, xsize, ysize, raster_xsize, raster_ysize
         cs = ds.GetRasterBand(1).Checksum()
     gdal.SetConfigOption('GDAL_VRT_ENABLE_PYTHON', None)
     if cs != 0:
-        gdaltest.post_reason('invalid checksum')
-        print(cs)
         print(gdal.GetLastErrorMsg())
-        return 'fail'
+        pytest.fail('invalid checksum')
 
     # Error at run time (in pixel function)
     ds = gdal.Open("""<VRTDataset rasterXSize="10" rasterYSize="10">
@@ -502,10 +461,8 @@ def identity(in_ar, out_ar, xoff, yoff, xsize, ysize, raster_xsize, raster_ysize
         cs = ds.GetRasterBand(1).Checksum()
     gdal.SetConfigOption('GDAL_VRT_ENABLE_PYTHON', None)
     if cs != 0:
-        gdaltest.post_reason('invalid checksum')
-        print(cs)
         print(gdal.GetLastErrorMsg())
-        return 'fail'
+        pytest.fail('invalid checksum')
 
     # User exception
     ds = gdal.Open("""<VRTDataset rasterXSize="10" rasterYSize="10">
@@ -525,10 +482,8 @@ def identity(in_ar, out_ar, xoff, yoff, xsize, ysize, raster_xsize, raster_ysize
         cs = ds.GetRasterBand(1).Checksum()
     gdal.SetConfigOption('GDAL_VRT_ENABLE_PYTHON', None)
     if cs != 0:
-        gdaltest.post_reason('invalid checksum')
-        print(cs)
         print(gdal.GetLastErrorMsg())
-        return 'fail'
+        pytest.fail('invalid checksum')
 
     # unknown_function
     ds = gdal.Open("""<VRTDataset rasterXSize="10" rasterYSize="10">
@@ -548,10 +503,8 @@ def identity(in_ar, out_ar, xoff, yoff, xsize, ysize, raster_xsize, raster_ysize
         cs = ds.GetRasterBand(1).Checksum()
     gdal.SetConfigOption('GDAL_VRT_ENABLE_PYTHON', None)
     if cs != 0:
-        gdaltest.post_reason('invalid checksum')
-        print(cs)
         print(gdal.GetLastErrorMsg())
-        return 'fail'
+        pytest.fail('invalid checksum')
 
     # uncallable object
     ds = gdal.Open("""<VRTDataset rasterXSize="10" rasterYSize="10">
@@ -570,10 +523,8 @@ def identity(in_ar, out_ar, xoff, yoff, xsize, ysize, raster_xsize, raster_ysize
         cs = ds.GetRasterBand(1).Checksum()
     gdal.SetConfigOption('GDAL_VRT_ENABLE_PYTHON', None)
     if cs != 0:
-        gdaltest.post_reason('invalid checksum')
-        print(cs)
         print(gdal.GetLastErrorMsg())
-        return 'fail'
+        pytest.fail('invalid checksum')
 
     # unknown_module
     ds = gdal.Open("""<VRTDataset rasterXSize="10" rasterYSize="10">
@@ -588,10 +539,8 @@ def identity(in_ar, out_ar, xoff, yoff, xsize, ysize, raster_xsize, raster_ysize
         cs = ds.GetRasterBand(1).Checksum()
         gdal.SetConfigOption('GDAL_VRT_ENABLE_PYTHON', None)
     if cs != 0:
-        gdaltest.post_reason('invalid checksum')
-        print(cs)
         print(gdal.GetLastErrorMsg())
-        return 'fail'
+        pytest.fail('invalid checksum')
 
     return 'success'
 
@@ -614,10 +563,8 @@ def my_func(in_ar, out_ar, xoff, yoff, xsize, ysize, raster_xsize, raster_ysize,
     with gdaltest.error_handler():
         cs = ds.GetRasterBand(1).Checksum()
     if cs != 0:
-        gdaltest.post_reason('invalid checksum')
-        print(cs)
         print(gdal.GetLastErrorMsg())
-        return 'fail'
+        pytest.fail('invalid checksum')
 
     # untrusted function
     ds = gdal.Open("""<VRTDataset rasterXSize="10" rasterYSize="10">
@@ -635,10 +582,8 @@ def my_func(in_ar, out_ar, xoff, yoff, xsize, ysize, raster_xsize, raster_ysize,
     with gdaltest.error_handler():
         cs = ds.GetRasterBand(1).Checksum()
     if cs != 0:
-        gdaltest.post_reason('invalid checksum')
-        print(cs)
         print(gdal.GetLastErrorMsg())
-        return 'fail'
+        pytest.fail('invalid checksum')
 
     # GDAL_VRT_ENABLE_PYTHON not set to YES
     ds = gdal.Open("""<VRTDataset rasterXSize="10" rasterYSize="10">
@@ -651,10 +596,8 @@ def my_func(in_ar, out_ar, xoff, yoff, xsize, ysize, raster_xsize, raster_ysize,
     with gdaltest.error_handler():
         cs = ds.GetRasterBand(1).Checksum()
     if cs != 0:
-        gdaltest.post_reason('invalid checksum')
-        print(cs)
         print(gdal.GetLastErrorMsg())
-        return 'fail'
+        pytest.fail('invalid checksum')
 
     return 'success'
 
@@ -689,20 +632,16 @@ def test_vrtderived_10():
     cs = ds.GetRasterBand(1).Checksum()
     gdal.SetConfigOption('GDAL_VRT_ENABLE_PYTHON', None)
     if cs != 100:
-        gdaltest.post_reason('invalid checksum')
-        print(cs)
         print(gdal.GetLastErrorMsg())
-        return 'fail'
+        pytest.fail('invalid checksum')
 
     # GDAL_VRT_TRUSTED_MODULES not defined
     ds = gdal.Open(content)
     with gdaltest.error_handler():
         cs = ds.GetRasterBand(1).Checksum()
     if cs != 0:
-        gdaltest.post_reason('invalid checksum')
-        print(cs)
         print(gdal.GetLastErrorMsg())
-        return 'fail'
+        pytest.fail('invalid checksum')
 
     # GDAL_VRT_PYTHON_TRUSTED_MODULES *NOT* matching our module
     for val in ['vrtderive',
@@ -716,10 +655,8 @@ def test_vrtderived_10():
             cs = ds.GetRasterBand(1).Checksum()
         gdal.SetConfigOption('GDAL_VRT_PYTHON_TRUSTED_MODULES', None)
         if cs != 0:
-            gdaltest.post_reason('invalid checksum')
-            print(cs)
             print(gdal.GetLastErrorMsg())
-            return 'fail'
+            pytest.fail('invalid checksum')
 
     # GDAL_VRT_PYTHON_TRUSTED_MODULES matching our module
     for val in ['foo,vrtderived,bar',
@@ -732,10 +669,8 @@ def test_vrtderived_10():
         cs = ds.GetRasterBand(1).Checksum()
         gdal.SetConfigOption('GDAL_VRT_PYTHON_TRUSTED_MODULES', None)
         if cs != 100:
-            gdaltest.post_reason('invalid checksum')
-            print(cs)
             print(gdal.GetLastErrorMsg())
-            return 'fail'
+            pytest.fail('invalid checksum')
 
     return 'success'
 
@@ -765,10 +700,7 @@ def test_vrtderived_11():
     os.unlink('tmp/n43_hillshade.vrt')
     os.unlink('tmp/n43.dt0')
 
-    if cs != 50577:
-        gdaltest.post_reason('invalid checksum')
-        print(cs)
-        return 'fail'
+    assert cs == 50577, 'invalid checksum'
 
     return 'success'
 
@@ -805,11 +737,9 @@ def test_vrtderived_12():
         else:
             expected_cs = 100
         if cs != expected_cs:
-            gdaltest.post_reason('invalid checksum')
             print(dt)
-            print(cs)
             print(gdal.GetLastErrorMsg())
-            return 'fail'
+            pytest.fail('invalid checksum')
 
     # Same for SourceTransferType
     for dt in ["CInt16", "CInt32"]:
@@ -827,11 +757,9 @@ def test_vrtderived_12():
             cs = ds.GetRasterBand(1).Checksum()
         gdal.SetConfigOption('GDAL_VRT_ENABLE_PYTHON', None)
         if cs != 0:
-            gdaltest.post_reason('invalid checksum')
             print(dt)
-            print(cs)
             print(gdal.GetLastErrorMsg())
-            return 'fail'
+            pytest.fail('invalid checksum')
 
     return 'success'
 
@@ -855,10 +783,7 @@ def test_vrtderived_13():
     ds = None
     gdal.Unlink('/vsimem/vrtderived_13.tif')
 
-    if cs != 10000:
-        gdaltest.post_reason('invalid checksum')
-        print(cs)
-        return 'fail'
+    assert cs == 10000, 'invalid checksum'
 
     return 'success'
 
@@ -881,20 +806,12 @@ def test_vrtderived_14():
     hist = ds.GetRasterBand(1).GetHistogram()
     gdal.SetConfigOption('GDAL_VRT_ENABLE_PYTHON', None)
 
-    if (my_min, my_max) != (1.0, 1.0):
-        gdaltest.post_reason('invalid ComputeRasterMinMax')
-        print(my_min, my_max)
-        return 'fail'
+    assert (my_min, my_max) == (1.0, 1.0), 'invalid ComputeRasterMinMax'
 
-    if (my_min2, my_max2, mean, stddev) != (1.0, 1.0, 1.0, 0.0):
-        gdaltest.post_reason('invalid ComputeStatistics')
-        print(my_min2, my_max2, mean, stddev)
-        return 'fail'
+    assert (my_min2, my_max2, mean, stddev) == (1.0, 1.0, 1.0, 0.0), \
+        'invalid ComputeStatistics'
 
-    if hist[1] != 10000:
-        gdaltest.post_reason('invalid GetHistogram')
-        print(hist)
-        return 'fail'
+    assert hist[1] == 10000, 'invalid GetHistogram'
 
     ds = None
     gdal.GetDriverByName('VRT').Delete('/vsimem/vrtderived_14.vrt')
diff --git a/autotest/gdrivers/vrtfilt.py b/autotest/gdrivers/vrtfilt.py
index 5231015bd481..328346ee5b80 100755
--- a/autotest/gdrivers/vrtfilt.py
+++ b/autotest/gdrivers/vrtfilt.py
@@ -87,8 +87,7 @@ def test_vrtfilt_3():
         return 'skip'
 
     vrt_ds.GetRasterBand(1).SetMetadataItem('source_0', filterSourceXML, 'vrt_sources')
-    if vrt_ds.GetRasterBand(1).Checksum() != 21890:
-        return 'fail'
+    assert vrt_ds.GetRasterBand(1).Checksum() == 21890
 
     return 'success'
 
@@ -117,8 +116,7 @@ def test_vrtfilt_4():
         return 'skip'
 
     vrt_ds.GetRasterBand(1).SetMetadataItem('source_0', filterSourceXML, 'new_vrt_sources')
-    if vrt_ds.GetRasterBand(1).Checksum() != 21890:
-        return 'fail'
+    assert vrt_ds.GetRasterBand(1).Checksum() == 21890
 
     return 'success'
 
@@ -145,8 +143,7 @@ def test_vrtfilt_5():
     md['source_0'] = filterSourceXML
 
     vrt_ds.GetRasterBand(1).SetMetadata(md, 'vrt_sources')
-    if vrt_ds.GetRasterBand(1).Checksum() != 21890:
-        return 'fail'
+    assert vrt_ds.GetRasterBand(1).Checksum() == 21890
 
     return 'success'
 
diff --git a/autotest/gdrivers/vrtmask.py b/autotest/gdrivers/vrtmask.py
index 30b23c5f342b..43b9580a361e 100755
--- a/autotest/gdrivers/vrtmask.py
+++ b/autotest/gdrivers/vrtmask.py
@@ -67,16 +67,11 @@ def test_vrtmask_1():
 </VRTDataset>"""
 
     ds = gdal.Open(vrt_string)
-    if ds.GetRasterBand(1).GetMaskFlags() != gdal.GMF_PER_DATASET:
-        gdaltest.post_reason('did not get expected mask flags')
-        print(ds.GetRasterBand(1).GetMaskFlags())
-        return 'fail'
+    assert ds.GetRasterBand(1).GetMaskFlags() == gdal.GMF_PER_DATASET, \
+        'did not get expected mask flags'
 
     cs = ds.GetRasterBand(1).GetMaskBand().Checksum()
-    if cs != 4672:
-        gdaltest.post_reason('did not get expected mask band checksum')
-        print(cs)
-        return 'fail'
+    assert cs == 4672, 'did not get expected mask band checksum'
 
     ds = None
 
@@ -113,16 +108,10 @@ def test_vrtmask_2():
 </VRTDataset>"""
 
     ds = gdal.Open(vrt_string)
-    if ds.GetRasterBand(1).GetMaskFlags() != 0:
-        gdaltest.post_reason('did not get expected mask flags')
-        print(ds.GetRasterBand(1).GetMaskFlags())
-        return 'fail'
+    assert ds.GetRasterBand(1).GetMaskFlags() == 0, 'did not get expected mask flags'
 
     cs = ds.GetRasterBand(1).GetMaskBand().Checksum()
-    if cs != 4873:
-        gdaltest.post_reason('did not get expected mask band checksum')
-        print(cs)
-        return 'fail'
+    assert cs == 4873, 'did not get expected mask band checksum'
 
     ds = None
 
@@ -155,11 +144,7 @@ def test_vrtmask_3():
 
     os.remove('tmp/vrtmask_3.vrt')
 
-    if msk_cs != expected_msk_cs:
-        gdaltest.post_reason('did not get expected mask band checksum')
-        print(msk_cs)
-        print(expected_msk_cs)
-        return 'fail'
+    assert msk_cs == expected_msk_cs, 'did not get expected mask band checksum'
 
     return 'success'
 
@@ -189,11 +174,7 @@ def test_vrtmask_4():
 
     os.remove('tmp/vrtmask_4.vrt')
 
-    if msk_cs != expected_msk_cs:
-        gdaltest.post_reason('did not get expected mask band checksum')
-        print(msk_cs)
-        print(expected_msk_cs)
-        return 'fail'
+    assert msk_cs == expected_msk_cs, 'did not get expected mask band checksum'
 
     return 'success'
 
@@ -220,11 +201,7 @@ def test_vrtmask_5():
 
     os.remove('tmp/vrtmask_5.vrt')
 
-    if msk_cs != expected_msk_cs:
-        gdaltest.post_reason('did not get expected mask band checksum')
-        print(msk_cs)
-        print(expected_msk_cs)
-        return 'fail'
+    assert msk_cs == expected_msk_cs, 'did not get expected mask band checksum'
 
     return 'success'
 
@@ -252,11 +229,7 @@ def test_vrtmask_6():
 
     os.remove('tmp/vrtmask_6.vrt')
 
-    if msk_cs != expected_msk_cs:
-        gdaltest.post_reason('did not get expected mask band checksum')
-        print(msk_cs)
-        print(expected_msk_cs)
-        return 'fail'
+    assert msk_cs == expected_msk_cs, 'did not get expected mask band checksum'
 
     return 'success'
 
@@ -303,17 +276,9 @@ def test_vrtmask_7():
         pass
     os.remove('tmp/vrtmask_7_rgbmask.vrt')
 
-    if alpha_cs != expected_msk_cs:
-        gdaltest.post_reason('did not get expected alpha band checksum')
-        print(alpha_cs)
-        print(expected_msk_cs)
-        return 'fail'
+    assert alpha_cs == expected_msk_cs, 'did not get expected alpha band checksum'
 
-    if msk_cs != expected_msk_cs:
-        gdaltest.post_reason('did not get expected mask band checksum')
-        print(msk_cs)
-        print(expected_msk_cs)
-        return 'fail'
+    assert msk_cs == expected_msk_cs, 'did not get expected mask band checksum'
 
     return 'success'
 
@@ -337,9 +302,7 @@ def test_vrtmask_8():
 
     os.remove('tmp/vrtmask_8.vrt')
 
-    if flags != gdal.GMF_ALL_VALID:
-        print(flags)
-        return 'fail'
+    assert flags == gdal.GMF_ALL_VALID
 
     return 'success'
 
@@ -363,14 +326,9 @@ def test_vrtmask_9():
 
     os.remove('tmp/vrtmask_9_src.tif')
     os.remove('tmp/vrtmask_9_dst.tif')
-    if err != '':
-        gdaltest.post_reason('unexpected output on standard err')
-        print(err)
-        return 'fail'
+    assert err == '', 'unexpected output on standard err'
 
-    if flags != gdal.GMF_ALL_VALID:
-        print(flags)
-        return 'fail'
+    assert flags == gdal.GMF_ALL_VALID
 
     return 'success'
 
@@ -397,8 +355,7 @@ def test_vrtmask_10():
     os.remove('tmp/vrtmask_10_2.vrt')
     os.remove('tmp/vrtmask_10_3.tif')
 
-    if cs_ref != cs_got:
-        return 'fail'
+    assert cs_ref == cs_got
 
     return 'success'
 
@@ -412,32 +369,25 @@ def test_vrtmask_11():
     ds.CreateMaskBand(gdal.GMF_PER_DATASET)
     with gdaltest.error_handler():
         ret = ds.GetRasterBand(1).CreateMaskBand(0)
-    if ret == 0:
-        gdaltest.post_reason('expected an error, but got success')
-        return 'fail'
+    assert ret != 0, 'expected an error, but got success'
 
     # This VRT dataset has already a mask band
     ds = gdal.Translate('', 'data/byte.tif', format='VRT')
     ds.CreateMaskBand(gdal.GMF_PER_DATASET)
     with gdaltest.error_handler():
         ret = ds.CreateMaskBand(gdal.GMF_PER_DATASET)
-    if ret == 0:
-        gdaltest.post_reason('expected an error, but got success')
-        return 'fail'
+    assert ret != 0, 'expected an error, but got success'
 
     # This VRT band has already a mask band
     ds = gdal.Translate('', 'data/byte.tif', format='VRT')
     ds.GetRasterBand(1).CreateMaskBand(0)
     with gdaltest.error_handler():
         ret = ds.GetRasterBand(1).CreateMaskBand(0)
-    if ret == 0:
-        gdaltest.post_reason('expected an error, but got success')
-        return 'fail'
+    assert ret != 0, 'expected an error, but got success'
 
     ds = gdal.Translate('', 'data/byte.tif', format='VRT')
     ret = ds.GetRasterBand(1).CreateMaskBand(gdal.GMF_PER_DATASET)
-    if ret != 0:
-        return 'fail'
+    assert ret == 0
 
     return 'success'
 
diff --git a/autotest/gdrivers/vrtovr.py b/autotest/gdrivers/vrtovr.py
index 13e29087d270..cf2a11d5f804 100755
--- a/autotest/gdrivers/vrtovr.py
+++ b/autotest/gdrivers/vrtovr.py
@@ -58,22 +58,14 @@ def test_vrtovr_1():
 </VRTDataset>"""
 
     ds = gdal.Open(vrt_string)
-    if ds.GetRasterBand(1).GetOverviewCount() != 1:
-        gdaltest.post_reason('did not get expected overview count')
-        print(ds.GetRasterBand(1).GetOverviewCount())
-        return 'fail'
+    assert ds.GetRasterBand(1).GetOverviewCount() == 1, \
+        'did not get expected overview count'
 
     cs = ds.GetRasterBand(1).GetOverview(0).Checksum()
-    if cs != 4672:
-        gdaltest.post_reason('did not get expected overview checksum')
-        print(cs)
-        return 'fail'
+    assert cs == 4672, 'did not get expected overview checksum'
 
     fl = ds.GetFileList()
-    if fl != ['data/byte.tif', 'data/int16.tif']:
-        gdaltest.post_reason('did not get expected file list')
-        print(fl)
-        return 'fail'
+    assert fl == ['data/byte.tif', 'data/int16.tif'], 'did not get expected file list'
 
     ds = None
 
@@ -111,16 +103,11 @@ def test_vrtovr_2():
     ds = None
 
     ds = gdal.Open("/vsimem/vrtovr_2.vrt")
-    if ds.GetRasterBand(1).GetOverviewCount() != 1:
-        gdaltest.post_reason('did not get expected overview count')
-        print(ds.GetRasterBand(1).GetOverviewCount())
-        return 'fail'
+    assert ds.GetRasterBand(1).GetOverviewCount() == 1, \
+        'did not get expected overview count'
 
     cs = ds.GetRasterBand(1).GetOverview(0).Checksum()
-    if cs != 4672:
-        gdaltest.post_reason('did not get expected overview checksum')
-        print(cs)
-        return 'fail'
+    assert cs == 4672, 'did not get expected overview checksum'
 
     ds = None
 
@@ -148,13 +135,10 @@ def test_vrtovr_none():
 </VRTDataset>"""
 
     ds = gdal.Open(vrt_string)
-    if ds.GetRasterBand(1).GetOverviewCount() != 0:
-        gdaltest.post_reason('did not get expected overview count')
-        print(ds.GetRasterBand(1).GetOverviewCount())
-        return 'fail'
+    assert ds.GetRasterBand(1).GetOverviewCount() == 0, \
+        'did not get expected overview count'
 
-    if ds.GetRasterBand(1).GetOverview(0):
-        return 'fail'
+    assert not ds.GetRasterBand(1).GetOverview(0)
 
     return 'success'
 
@@ -182,20 +166,15 @@ def test_vrtovr_errors():
 </VRTDataset>"""
 
     ds = gdal.Open(vrt_string)
-    if ds.GetRasterBand(1).GetOverviewCount() != 1:
-        gdaltest.post_reason('did not get expected overview count')
-        print(ds.GetRasterBand(1).GetOverviewCount())
-        return 'fail'
+    assert ds.GetRasterBand(1).GetOverviewCount() == 1, \
+        'did not get expected overview count'
 
-    if ds.GetRasterBand(1).GetOverview(-1):
-        return 'fail'
+    assert not ds.GetRasterBand(1).GetOverview(-1)
 
-    if ds.GetRasterBand(1).GetOverview(1):
-        return 'fail'
+    assert not ds.GetRasterBand(1).GetOverview(1)
 
     with gdaltest.error_handler():
-        if ds.GetRasterBand(1).GetOverview(0):
-            return 'fail'
+        assert not ds.GetRasterBand(1).GetOverview(0)
 
     return 'success'
 
diff --git a/autotest/gdrivers/vrtpansharpen.py b/autotest/gdrivers/vrtpansharpen.py
index a1cbafec32d9..bf5c3ab94f62 100755
--- a/autotest/gdrivers/vrtpansharpen.py
+++ b/autotest/gdrivers/vrtpansharpen.py
@@ -34,6 +34,7 @@
 
 
 import gdaltest
+import pytest
 
 ###############################################################################
 # Error cases
@@ -69,8 +70,7 @@ def test_vrtpansharpen_1():
     </VRTRasterBand>
 </VRTDataset>""")
     gdal.PopErrorHandler()
-    if vrt_ds is not None:
-        return 'fail'
+    assert vrt_ds is None
 
     # PanchroBand missing
     gdal.PushErrorHandler()
@@ -107,8 +107,7 @@ def test_vrtpansharpen_1():
     </PansharpeningOptions>
 </VRTDataset>""")
     gdal.PopErrorHandler()
-    if vrt_ds is not None:
-        return 'fail'
+    assert vrt_ds is None
 
     # PanchroBand.SourceFilename missing
     gdal.PushErrorHandler()
@@ -147,8 +146,7 @@ def test_vrtpansharpen_1():
     </PansharpeningOptions>
 </VRTDataset>""")
     gdal.PopErrorHandler()
-    if vrt_ds is not None:
-        return 'fail'
+    assert vrt_ds is None
 
     # Invalid dataset name
     gdal.PushErrorHandler()
@@ -189,8 +187,7 @@ def test_vrtpansharpen_1():
     </PansharpeningOptions>
 </VRTDataset>""")
     gdal.PopErrorHandler()
-    if vrt_ds is not None:
-        return 'fail'
+    assert vrt_ds is None
 
     # Inconsistent declared VRT dimensions with panchro dataset.
     gdal.PushErrorHandler()
@@ -231,8 +228,7 @@ def test_vrtpansharpen_1():
     </PansharpeningOptions>
 </VRTDataset>""")
     gdal.PopErrorHandler()
-    if vrt_ds is not None:
-        return 'fail'
+    assert vrt_ds is None
 
     # VRTRasterBand of unrecognized subclass 'blabla'
     gdal.PushErrorHandler()
@@ -273,8 +269,7 @@ def test_vrtpansharpen_1():
     </PansharpeningOptions>
 </VRTDataset>""")
     gdal.PopErrorHandler()
-    if vrt_ds is not None:
-        return 'fail'
+    assert vrt_ds is None
 
     # Algorithm unsupported_alg unsupported
     gdal.PushErrorHandler()
@@ -315,8 +310,7 @@ def test_vrtpansharpen_1():
     </PansharpeningOptions>
 </VRTDataset>""")
     gdal.PopErrorHandler()
-    if vrt_ds is not None:
-        return 'fail'
+    assert vrt_ds is None
 
     # 10 invalid band of tmp/small_world_pan.tif
     gdal.PushErrorHandler()
@@ -357,8 +351,7 @@ def test_vrtpansharpen_1():
     </PansharpeningOptions>
 </VRTDataset>""")
     gdal.PopErrorHandler()
-    if vrt_ds is not None:
-        return 'fail'
+    assert vrt_ds is None
 
     # SpectralBand.dstBand = '-1' invalid
     gdal.PushErrorHandler()
@@ -399,8 +392,7 @@ def test_vrtpansharpen_1():
     </PansharpeningOptions>
 </VRTDataset>""")
     gdal.PopErrorHandler()
-    if vrt_ds is not None:
-        return 'fail'
+    assert vrt_ds is None
 
     # SpectralBand.SourceFilename missing
     gdal.PushErrorHandler()
@@ -440,8 +432,7 @@ def test_vrtpansharpen_1():
     </PansharpeningOptions>
 </VRTDataset>""")
     gdal.PopErrorHandler()
-    if vrt_ds is not None:
-        return 'fail'
+    assert vrt_ds is None
 
     # Invalid dataset name
     gdal.PushErrorHandler()
@@ -482,8 +473,7 @@ def test_vrtpansharpen_1():
     </PansharpeningOptions>
 </VRTDataset>""")
     gdal.PopErrorHandler()
-    if vrt_ds is not None:
-        return 'fail'
+    assert vrt_ds is None
 
     # 10 invalid band of data/small_world.tif
     gdal.PushErrorHandler()
@@ -524,8 +514,7 @@ def test_vrtpansharpen_1():
     </PansharpeningOptions>
 </VRTDataset>""")
     gdal.PopErrorHandler()
-    if vrt_ds is not None:
-        return 'fail'
+    assert vrt_ds is None
 
     # Another spectral band is already mapped to output band 1
     gdal.PushErrorHandler()
@@ -566,8 +555,7 @@ def test_vrtpansharpen_1():
     </PansharpeningOptions>
 </VRTDataset>""")
     gdal.PopErrorHandler()
-    if vrt_ds is not None:
-        return 'fail'
+    assert vrt_ds is None
 
     # No spectral band defined
     gdal.PushErrorHandler()
@@ -596,8 +584,7 @@ def test_vrtpansharpen_1():
     </PansharpeningOptions>
 </VRTDataset>""")
     gdal.PopErrorHandler()
-    if vrt_ds is not None:
-        return 'fail'
+    assert vrt_ds is None
 
     # Hole in SpectralBand.dstBand numbering
     gdal.PushErrorHandler()
@@ -629,8 +616,7 @@ def test_vrtpansharpen_1():
     </PansharpeningOptions>
 </VRTDataset>""")
     gdal.PopErrorHandler()
-    if vrt_ds is not None:
-        return 'fail'
+    assert vrt_ds is None
 
     # Band 4 of type VRTPansharpenedRasterBand, but no corresponding SpectralBand
     gdal.PushErrorHandler()
@@ -673,8 +659,7 @@ def test_vrtpansharpen_1():
     </PansharpeningOptions>
 </VRTDataset>""")
     gdal.PopErrorHandler()
-    if vrt_ds is not None:
-        return 'fail'
+    assert vrt_ds is None
 
     # SpectralBand.dstBand = '3' invalid
     gdal.PushErrorHandler()
@@ -712,8 +697,7 @@ def test_vrtpansharpen_1():
     </PansharpeningOptions>
 </VRTDataset>""")
     gdal.PopErrorHandler()
-    if vrt_ds is not None:
-        return 'fail'
+    assert vrt_ds is None
 
     # 2 weights defined, but 3 input spectral bands
     gdal.PushErrorHandler()
@@ -754,8 +738,7 @@ def test_vrtpansharpen_1():
     </PansharpeningOptions>
 </VRTDataset>""")
     gdal.PopErrorHandler()
-    if vrt_ds is not None:
-        return 'fail'
+    assert vrt_ds is None
 
     # Dimensions of input spectral band 1 different from first spectral band
     gdal.PushErrorHandler()
@@ -776,8 +759,7 @@ def test_vrtpansharpen_1():
     </PansharpeningOptions>
 </VRTDataset>""")
     gdal.PopErrorHandler()
-    if vrt_ds is not None:
-        return 'fail'
+    assert vrt_ds is None
 
     # Just warnings
     # Warning 1: Pan dataset and data/byte.tif do not seem to have same projection. Results might be incorrect
@@ -799,10 +781,8 @@ def test_vrtpansharpen_1():
     </PansharpeningOptions>
 </VRTDataset>""")
     gdal.PopErrorHandler()
-    if vrt_ds is None:
-        return 'fail'
-    if gdal.GetLastErrorMsg() == '':
-        return 'fail'
+    assert vrt_ds is not None
+    assert gdal.GetLastErrorMsg() != ''
 
     # Just warnings
     # No spectral band is mapped to an output band
@@ -837,17 +817,14 @@ def test_vrtpansharpen_1():
     </PansharpeningOptions>
 </VRTDataset>""")
     gdal.PopErrorHandler()
-    if vrt_ds is None:
-        return 'fail'
-    if gdal.GetLastErrorMsg() == '':
-        return 'fail'
+    assert vrt_ds is not None
+    assert gdal.GetLastErrorMsg() != ''
 
     # Unsupported
     gdal.PushErrorHandler()
     ret = vrt_ds.AddBand(gdal.GDT_Byte)
     gdal.PopErrorHandler()
-    if ret == 0:
-        return 'fail'
+    assert ret != 0
 
     return 'success'
 
@@ -898,38 +875,26 @@ def test_vrtpansharpen_2():
         </SpectralBand>
     </PansharpeningOptions>
 </VRTDataset>""")
-    if vrt_ds is None:
-        return 'fail'
-    if vrt_ds.GetFileList() != ['tmp/small_world_pan.tif', 'data/small_world.tif']:
-        print(vrt_ds.GetFileList())
-        return 'fail'
-    if vrt_ds.GetRasterBand(1).GetMetadataItem('NBITS', 'IMAGE_STRUCTURE') is not None:
-        return 'fail'
+    assert vrt_ds is not None
+    assert vrt_ds.GetFileList() == ['tmp/small_world_pan.tif', 'data/small_world.tif']
+    assert vrt_ds.GetRasterBand(1).GetMetadataItem('NBITS', 'IMAGE_STRUCTURE') is None
     cs = [vrt_ds.GetRasterBand(i + 1).Checksum() for i in range(vrt_ds.RasterCount)]
-    if cs not in ([4735, 10000, 9742], [4731, 9991, 9734]):
-        print(cs)
-        return 'fail'
-    if vrt_ds.GetRasterBand(1).GetOverviewCount() != 0:
-        return 'fail'
-    if vrt_ds.GetRasterBand(1).GetOverview(-1) is not None:
-        return 'fail'
-    if vrt_ds.GetRasterBand(1).GetOverview(0) is not None:
-        return 'fail'
+    assert cs in ([4735, 10000, 9742], [4731, 9991, 9734])
+    assert vrt_ds.GetRasterBand(1).GetOverviewCount() == 0
+    assert vrt_ds.GetRasterBand(1).GetOverview(-1) is None
+    assert vrt_ds.GetRasterBand(1).GetOverview(0) is None
 
     # Check VRTPansharpenedDataset::IRasterIO() in non-resampling case
     data = vrt_ds.ReadRaster()
     tmp_ds = gdal.GetDriverByName('MEM').Create('', 800, 400, 3)
     tmp_ds.WriteRaster(0, 0, 800, 400, data)
     cs = [tmp_ds.GetRasterBand(i + 1).Checksum() for i in range(tmp_ds.RasterCount)]
-    if cs not in ([4735, 10000, 9742], [4731, 9991, 9734]):
-        print(cs)
-        return 'fail'
+    assert cs in ([4735, 10000, 9742], [4731, 9991, 9734])
 
     # Check VRTPansharpenedDataset::IRasterIO() in resampling case
     data = vrt_ds.ReadRaster(0, 0, 800, 400, 400, 200)
     ref_data = tmp_ds.ReadRaster(0, 0, 800, 400, 400, 200)
-    if data != ref_data:
-        return 'fail'
+    assert data == ref_data
 
     # Compact case
     vrt_ds = gdal.Open("""<VRTDataset subClass="VRTPansharpenedDataset">
@@ -952,12 +917,9 @@ def test_vrtpansharpen_2():
         </SpectralBand>
     </PansharpeningOptions>
 </VRTDataset>""")
-    if vrt_ds is None:
-        return 'fail'
+    assert vrt_ds is not None
     cs = [vrt_ds.GetRasterBand(i + 1).Checksum() for i in range(vrt_ds.RasterCount)]
-    if cs not in ([4735, 10000, 9742], [4731, 9991, 9734]):
-        print(cs)
-        return 'fail'
+    assert cs in ([4735, 10000, 9742], [4731, 9991, 9734])
 
     # Expose pan band too
     vrt_ds = gdal.Open("""<VRTDataset rasterXSize="800" rasterYSize="400" subClass="VRTPansharpenedDataset">
@@ -1004,13 +966,10 @@ def test_vrtpansharpen_2():
         </SpectralBand>
     </PansharpeningOptions>
 </VRTDataset>""")
-    if vrt_ds is None:
-        return 'fail'
+    assert vrt_ds is not None
     # gdal.GetDriverByName('GTiff').CreateCopy('out1.tif', vrt_ds)
     cs = [vrt_ds.GetRasterBand(i + 1).Checksum() for i in range(vrt_ds.RasterCount)]
-    if cs not in ([50261, 4735, 10000, 9742], [50261, 4731, 9991, 9734]):
-        print(cs)
-        return 'fail'
+    assert cs in ([50261, 4735, 10000, 9742], [50261, 4731, 9991, 9734])
 
     # Same, but everything scrambled, and with spectral bands not in
     # the same dataset
@@ -1058,13 +1017,10 @@ def test_vrtpansharpen_2():
         </SpectralBand>
     </PansharpeningOptions>
 </VRTDataset>""")
-    if vrt_ds is None:
-        return 'fail'
+    assert vrt_ds is not None
     # gdal.GetDriverByName('GTiff').CreateCopy('out2.tif', vrt_ds)
     cs = [vrt_ds.GetRasterBand(i + 1).Checksum() for i in range(vrt_ds.RasterCount)]
-    if cs not in ([50261, 4735, 10000, 9742], [50261, 4727, 9998, 9732]):
-        print(cs)
-        return 'fail'
+    assert cs in ([50261, 4735, 10000, 9742], [50261, 4727, 9998, 9732])
 
     return 'success'
 
@@ -1101,14 +1057,10 @@ def test_vrtpansharpen_3():
 
     # Test when only Pan band has overviews
     vrt_ds = gdal.Open(xml)
-    if vrt_ds.GetRasterBand(1).GetOverviewCount() != 1:
-        return 'fail'
-    if vrt_ds.GetRasterBand(1).GetOverview(0) is None:
-        return 'fail'
+    assert vrt_ds.GetRasterBand(1).GetOverviewCount() == 1
+    assert vrt_ds.GetRasterBand(1).GetOverview(0) is not None
     cs = [vrt_ds.GetRasterBand(i + 1).GetOverview(0).Checksum() for i in range(vrt_ds.RasterCount)]
-    if cs not in ([7123, 7445, 5025], [7120, 7440, 5025]):
-        print(cs)
-        return 'fail'
+    assert cs in ([7123, 7445, 5025], [7120, 7440, 5025])
 
     # Check VRTPansharpenedDataset::IRasterIO() in resampling case with overviews
     data = vrt_ds.ReadRaster(0, 0, 800, 400, 400, 200)
@@ -1117,15 +1069,12 @@ def test_vrtpansharpen_3():
     data2 += vrt_ds.GetRasterBand(2).ReadRaster(0, 0, 800, 400, 400, 200)
     data2 += vrt_ds.GetRasterBand(3).ReadRaster(0, 0, 800, 400, 400, 200)
 
-    if data != data2:
-        return 'fail'
+    assert data == data2
 
     tmp_ds = gdal.GetDriverByName('MEM').Create('', 400, 200, 3)
     tmp_ds.WriteRaster(0, 0, 400, 200, data)
     cs = [tmp_ds.GetRasterBand(i + 1).Checksum() for i in range(tmp_ds.RasterCount)]
-    if cs not in ([7123, 7445, 5025], [7120, 7440, 5025]):
-        print(cs)
-        return 'fail'
+    assert cs in ([7123, 7445, 5025], [7120, 7440, 5025])
 
     vrt_ds = None
 
@@ -1135,14 +1084,10 @@ def test_vrtpansharpen_3():
 
     # Test when both Pan and spectral bands have overviews
     vrt_ds = gdal.Open(xml)
-    if vrt_ds.GetRasterBand(1).GetOverviewCount() != 1:
-        return 'fail'
-    if vrt_ds.GetRasterBand(1).GetOverview(0) is None:
-        return 'fail'
+    assert vrt_ds.GetRasterBand(1).GetOverviewCount() == 1
+    assert vrt_ds.GetRasterBand(1).GetOverview(0) is not None
     cs = [vrt_ds.GetRasterBand(i + 1).GetOverview(0).Checksum() for i in range(vrt_ds.RasterCount)]
-    if cs not in ([18033, 18395, 16824], [18033, 18395, 16822]):
-        print(cs)
-        return 'fail'
+    assert cs in ([18033, 18395, 16824], [18033, 18395, 16822])
 
     vrt_ds = None
 
@@ -1185,10 +1130,7 @@ def test_vrtpansharpen_4():
             expected_cs = [4724, 4720]
         else:
             expected_cs = [4735, 4731]
-        if cs not in expected_cs:
-            print(gdal.GetDataTypeName(dt))
-            print(cs)
-            return 'fail'
+        assert cs in expected_cs, gdal.GetDataTypeName(dt)
 
     return 'success'
 
@@ -1262,15 +1204,9 @@ def test_vrtpansharpen_5():
         tmp_ds.WriteRaster(0, 0, 800, 400, data)
         cs = tmp_ds.GetRasterBand(1).Checksum()
         if dt == gdal.GDT_UInt16:
-            if cs not in (4553, 4549):
-                print(gdal.GetDataTypeName(dt))
-                print(cs)
-                return 'fail'
+            assert cs in (4553, 4549), gdal.GetDataTypeName(dt)
         else:
-            if cs != 4450:
-                print(gdal.GetDataTypeName(dt))
-                print(cs)
-                return 'fail'
+            assert cs == 4450, gdal.GetDataTypeName(dt)
 
     return 'success'
 
@@ -1338,8 +1274,7 @@ def test_vrtpansharpen_6():
         </VRTDataset>"""
 
             vrt_ds = gdal.Open(xml)
-            if vrt_ds.GetRasterBand(1).GetMetadataItem('NBITS', 'IMAGE_STRUCTURE') != str(nbits):
-                return 'fail'
+            assert vrt_ds.GetRasterBand(1).GetMetadataItem('NBITS', 'IMAGE_STRUCTURE') == str(nbits)
 
             ar = vrt_ds.GetRasterBand(1).ReadAsArray()
             if dt == gdal.GDT_Byte:
@@ -1351,9 +1286,7 @@ def test_vrtpansharpen_6():
 
             if list(ar[0]) != expected_ar:
                 print(gdal.GetDataTypeName(dt))
-                print(i)
-                print(list(ar[0]))
-                return 'fail'
+                pytest.fail(i)
             vrt_ds = None
 
             gdal.Unlink('/vsimem/ms.tif')
@@ -1386,11 +1319,7 @@ def test_vrtpansharpen_7():
     </PansharpeningOptions>
 </VRTDataset>"""
     ds = gdal.Open(xml)
-    if ds.GetGeoTransform() != (100.0, 1.0, 0.0, 100.0, 0.0, -1.0) or ds.RasterXSize != 40 or ds.RasterYSize != 60:
-        print(ds.GetGeoTransform())
-        print(ds.RasterXSize)
-        print(ds.RasterYSize)
-        return 'fail'
+    assert ds.GetGeoTransform() == (100.0, 1.0, 0.0, 100.0, 0.0, -1.0) and ds.RasterXSize == 40 and ds.RasterYSize == 60
     ds = None
 
     xml = """<VRTDataset subClass="VRTPansharpenedDataset">
@@ -1405,11 +1334,7 @@ def test_vrtpansharpen_7():
     </PansharpeningOptions>
 </VRTDataset>"""
     ds = gdal.Open(xml)
-    if ds.GetGeoTransform() != (100.0, 1.0, 0.0, 100.0, 0.0, -1.0) or ds.RasterXSize != 40 or ds.RasterYSize != 60:
-        print(ds.GetGeoTransform())
-        print(ds.RasterXSize)
-        print(ds.RasterYSize)
-        return 'fail'
+    assert ds.GetGeoTransform() == (100.0, 1.0, 0.0, 100.0, 0.0, -1.0) and ds.RasterXSize == 40 and ds.RasterYSize == 60
     ds = None
 
     xml = """<VRTDataset subClass="VRTPansharpenedDataset">
@@ -1427,13 +1352,8 @@ def test_vrtpansharpen_7():
     gdal.PushErrorHandler()
     ds = gdal.Open(xml)
     gdal.PopErrorHandler()
-    if ds.GetGeoTransform() != (100.0, 1.0, 0.0, 100.0, 0.0, -1.0) or ds.RasterXSize != 40 or ds.RasterYSize != 60:
-        print(ds.GetGeoTransform())
-        print(ds.RasterXSize)
-        print(ds.RasterYSize)
-        return 'fail'
-    if gdal.GetLastErrorMsg() != '':
-        return 'fail'
+    assert ds.GetGeoTransform() == (100.0, 1.0, 0.0, 100.0, 0.0, -1.0) and ds.RasterXSize == 40 and ds.RasterYSize == 60
+    assert gdal.GetLastErrorMsg() == ''
     ds = None
 
     xml = """<VRTDataset subClass="VRTPansharpenedDataset">
@@ -1448,11 +1368,7 @@ def test_vrtpansharpen_7():
     </PansharpeningOptions>
 </VRTDataset>"""
     ds = gdal.Open(xml)
-    if ds.GetGeoTransform() != (120.0, 1.0, 0.0, 80.0, 0.0, -1.0) or ds.RasterXSize != 10 or ds.RasterYSize != 40:
-        print(ds.GetGeoTransform())
-        print(ds.RasterXSize)
-        print(ds.RasterYSize)
-        return 'fail'
+    assert ds.GetGeoTransform() == (120.0, 1.0, 0.0, 80.0, 0.0, -1.0) and ds.RasterXSize == 10 and ds.RasterYSize == 40
     ds = None
 
     xml = """<VRTDataset subClass="VRTPansharpenedDataset">
@@ -1470,13 +1386,8 @@ def test_vrtpansharpen_7():
     gdal.PushErrorHandler()
     ds = gdal.Open(xml)
     gdal.PopErrorHandler()
-    if ds.GetGeoTransform() != (120.0, 1.0, 0.0, 80.0, 0.0, -1.0) or ds.RasterXSize != 20 or ds.RasterYSize != 40:
-        print(ds.GetGeoTransform())
-        print(ds.RasterXSize)
-        print(ds.RasterYSize)
-        return 'fail'
-    if gdal.GetLastErrorMsg() == '':
-        return 'fail'
+    assert ds.GetGeoTransform() == (120.0, 1.0, 0.0, 80.0, 0.0, -1.0) and ds.RasterXSize == 20 and ds.RasterYSize == 40
+    assert gdal.GetLastErrorMsg() != ''
     ds = None
 
     xml = """<VRTDataset subClass="VRTPansharpenedDataset">
@@ -1492,13 +1403,8 @@ def test_vrtpansharpen_7():
 </VRTDataset>"""
     gdal.ErrorReset()
     ds = gdal.Open(xml)
-    if ds.GetGeoTransform() != (120.0, 1.0, 0.0, 80.0, 0.0, -1.0) or ds.RasterXSize != 20 or ds.RasterYSize != 40:
-        print(ds.GetGeoTransform())
-        print(ds.RasterXSize)
-        print(ds.RasterYSize)
-        return 'fail'
-    if gdal.GetLastErrorMsg() != '':
-        return 'fail'
+    assert ds.GetGeoTransform() == (120.0, 1.0, 0.0, 80.0, 0.0, -1.0) and ds.RasterXSize == 20 and ds.RasterYSize == 40
+    assert gdal.GetLastErrorMsg() == ''
     ds = None
 
     # Empty intersection
@@ -1520,8 +1426,7 @@ def test_vrtpansharpen_7():
     gdal.PushErrorHandler()
     ds = gdal.Open(xml)
     gdal.PopErrorHandler()
-    if ds is not None:
-        return 'fail'
+    assert ds is None
     ds = None
 
     gdal.GetDriverByName('GTiff').Delete('/vsimem/vrtpansharpen_7_pan.tif')
@@ -1574,14 +1479,7 @@ def test_vrtpansharpen_8():
 
     gdal.Unlink('tmp/vrtpansharpen_8.vrt')
 
-    if cs1 != expected_cs1 or cs2 != expected_cs2 or cs3 != expected_cs3:
-        print(cs1)
-        print(expected_cs1)
-        print(cs2)
-        print(expected_cs2)
-        print(cs3)
-        print(expected_cs3)
-        return 'fail'
+    assert cs1 == expected_cs1 and cs2 == expected_cs2 and cs3 == expected_cs3
 
     return 'success'
 
@@ -1613,12 +1511,9 @@ def test_vrtpansharpen_9():
         </SpectralBand>
     </PansharpeningOptions>
 </VRTDataset>""")
-    if vrt_ds is None:
-        return 'fail'
+    assert vrt_ds is not None
     cs = [vrt_ds.GetRasterBand(i + 1).Checksum() for i in range(vrt_ds.RasterCount)]
-    if cs not in ([6950, 11745, 8965],):
-        print(cs)
-        return 'fail'
+    assert cs in ([6950, 11745, 8965],)
 
     # Implicit nodata
     ds = gdal.GetDriverByName('GTiff').Create('/vsimem/small_world_pan_nodata.tif', 800, 400)
@@ -1653,12 +1548,9 @@ def test_vrtpansharpen_9():
         </SpectralBand>
     </PansharpeningOptions>
 </VRTDataset>""")
-    if vrt_ds is None:
-        return 'fail'
+    assert vrt_ds is not None
     cs = [vrt_ds.GetRasterBand(i + 1).Checksum() for i in range(vrt_ds.RasterCount)]
-    if cs not in ([6950, 11745, 8965],):
-        print(cs)
-        return 'fail'
+    assert cs in ([6950, 11745, 8965],)
 
     gdal.Unlink('/vsimem/small_world_pan_nodata.tif')
     gdal.Unlink('/vsimem/small_world_nodata.tif')
@@ -1706,9 +1598,7 @@ def test_vrtpansharpen_10():
         </PansharpeningOptions>
     </VRTDataset>""")
     cs = [vrt_ds.GetRasterBand(i + 1).Checksum() for i in range(vrt_ds.RasterCount)]
-    if cs != [62009, 62009, 62009, 62009]:
-        print(cs)
-        return 'fail'
+    assert cs == [62009, 62009, 62009, 62009]
 
     # Actually go through the optimized impl
     data = vrt_ds.ReadRaster()
@@ -1717,8 +1607,7 @@ def test_vrtpansharpen_10():
     tmp_ds = gdal.GetDriverByName('MEM').Create('', vrt_ds.RasterXSize, vrt_ds.RasterYSize, vrt_ds.RasterCount, gdal.GDT_Int32)
     tmp_ds.WriteRaster(0, 0, vrt_ds.RasterXSize, vrt_ds.RasterYSize, data_int32)
     ref_data = tmp_ds.ReadRaster(buf_type=gdal.GDT_UInt16)
-    if data != ref_data:
-        return 'fail'
+    assert data == ref_data
 
     # 4 bands -> 3 bands
     vrt_ds = gdal.Open("""<VRTDataset subClass="VRTPansharpenedDataset">
@@ -1747,9 +1636,7 @@ def test_vrtpansharpen_10():
         </PansharpeningOptions>
     </VRTDataset>""")
     cs = [vrt_ds.GetRasterBand(i + 1).Checksum() for i in range(vrt_ds.RasterCount)]
-    if cs != [62009, 62009, 62009]:
-        print(cs)
-        return 'fail'
+    assert cs == [62009, 62009, 62009]
 
     # Actually go through the optimized impl
     data = vrt_ds.ReadRaster()
@@ -1758,8 +1645,7 @@ def test_vrtpansharpen_10():
     tmp_ds = gdal.GetDriverByName('MEM').Create('', vrt_ds.RasterXSize, vrt_ds.RasterYSize, vrt_ds.RasterCount, gdal.GDT_Int32)
     tmp_ds.WriteRaster(0, 0, vrt_ds.RasterXSize, vrt_ds.RasterYSize, data_int32)
     ref_data = tmp_ds.ReadRaster(buf_type=gdal.GDT_UInt16)
-    if data != ref_data:
-        return 'fail'
+    assert data == ref_data
 
     # 3 bands
     vrt_ds = gdal.Open("""<VRTDataset subClass="VRTPansharpenedDataset">
@@ -1784,9 +1670,7 @@ def test_vrtpansharpen_10():
         </PansharpeningOptions>
     </VRTDataset>""")
     cs = [vrt_ds.GetRasterBand(i + 1).Checksum() for i in range(vrt_ds.RasterCount)]
-    if cs != [62009, 62009, 62009]:
-        print(cs)
-        return 'fail'
+    assert cs == [62009, 62009, 62009]
 
     # Actually go through the optimized impl
     data = vrt_ds.ReadRaster()
@@ -1795,8 +1679,7 @@ def test_vrtpansharpen_10():
     tmp_ds = gdal.GetDriverByName('MEM').Create('', vrt_ds.RasterXSize, vrt_ds.RasterYSize, vrt_ds.RasterCount, gdal.GDT_Int32)
     tmp_ds.WriteRaster(0, 0, vrt_ds.RasterXSize, vrt_ds.RasterYSize, data_int32)
     ref_data = tmp_ds.ReadRaster(buf_type=gdal.GDT_UInt16)
-    if data != ref_data:
-        return 'fail'
+    assert data == ref_data
 
     return 'success'
 
@@ -1819,12 +1702,9 @@ def test_vrtpansharpen_11():
             </SpectralBand>
         </PansharpeningOptions>
     </VRTDataset>""", pan_ds.GetRasterBand(1), [ms_ds.GetRasterBand(i + 1) for i in range(3)])
-    if vrt_ds is None:
-        return 'fail'
+    assert vrt_ds is not None
     cs = [vrt_ds.GetRasterBand(i + 1).Checksum() for i in range(vrt_ds.RasterCount)]
-    if cs not in([4735, 10000, 9742], [4731, 9991, 9734]):
-        print(cs)
-        return 'fail'
+    assert cs in([4735, 10000, 9742], [4731, 9991, 9734])
 
     # Also test with completely anonymous datasets
     pan_mem_ds = gdal.GetDriverByName('MEM').CreateCopy('', pan_ds)
@@ -1842,12 +1722,9 @@ def test_vrtpansharpen_11():
             </SpectralBand>
         </PansharpeningOptions>
     </VRTDataset>""", pan_mem_ds.GetRasterBand(1), [ms_mem_ds.GetRasterBand(i + 1) for i in range(3)])
-    if vrt_ds is None:
-        return 'fail'
+    assert vrt_ds is not None
     cs = [vrt_ds.GetRasterBand(i + 1).Checksum() for i in range(vrt_ds.RasterCount)]
-    if cs not in([4735, 10000, 9742], [4731, 9991, 9734]):
-        print(cs)
-        return 'fail'
+    assert cs in([4735, 10000, 9742], [4731, 9991, 9734])
     vrt_ds = None
 
     # Check that wrapping with VRT works (when gt are not compatible)
@@ -1866,19 +1743,14 @@ def test_vrtpansharpen_11():
             </SpectralBand>
         </PansharpeningOptions>
     </VRTDataset>""", pan_mem_ds.GetRasterBand(1), [ms_mem_ds.GetRasterBand(i + 1) for i in range(3)])
-    if vrt_ds.GetGeoTransform() != (100.0, 1.0, 0.0, 100.0, 0.0, -1.0) or vrt_ds.RasterXSize != 40 or vrt_ds.RasterYSize != 60:
-        print(vrt_ds.GetGeoTransform())
-        print(vrt_ds.RasterXSize)
-        print(vrt_ds.RasterYSize)
-        return 'fail'
+    assert vrt_ds.GetGeoTransform() == (100.0, 1.0, 0.0, 100.0, 0.0, -1.0) and vrt_ds.RasterXSize == 40 and vrt_ds.RasterYSize == 60
     vrt_ds = None
 
     # Test error cases as well
     gdal.PushErrorHandler()
     vrt_ds = gdal.CreatePansharpenedVRT("""<invalid_xml""", pan_mem_ds.GetRasterBand(1), [ms_mem_ds.GetRasterBand(i + 1) for i in range(3)])
     gdal.PopErrorHandler()
-    if vrt_ds is not None:
-        return 'fail'
+    assert vrt_ds is None
 
     # Not enough bands
     gdal.PushErrorHandler()
@@ -1891,8 +1763,7 @@ def test_vrtpansharpen_11():
         </PansharpeningOptions>
     </VRTDataset>""", pan_mem_ds.GetRasterBand(1), [ms_mem_ds.GetRasterBand(i + 1) for i in range(3)])
     gdal.PopErrorHandler()
-    if vrt_ds is not None:
-        return 'fail'
+    assert vrt_ds is None
 
     # Too many bands
     gdal.PushErrorHandler()
@@ -1909,8 +1780,7 @@ def test_vrtpansharpen_11():
         </PansharpeningOptions>
     </VRTDataset>""", pan_mem_ds.GetRasterBand(1), [ms_mem_ds.GetRasterBand(i + 1) for i in range(3)])
     gdal.PopErrorHandler()
-    if vrt_ds is not None:
-        return 'fail'
+    assert vrt_ds is None
 
     return 'success'
 
diff --git a/autotest/gdrivers/vrtrawlink.py b/autotest/gdrivers/vrtrawlink.py
index b0f14d703978..595a357fa00a 100755
--- a/autotest/gdrivers/vrtrawlink.py
+++ b/autotest/gdrivers/vrtrawlink.py
@@ -67,16 +67,12 @@ def test_vrtrawlink_2():
     ]
 
     result = ds.AddBand(gdal.GDT_Byte, options)
-    if result != gdal.CE_None:
-        gdaltest.post_reason('AddBand() returned error code')
-        return 'fail'
+    assert result == gdal.CE_None, 'AddBand() returned error code'
 
     band = ds.GetRasterBand(1)
     chksum = band.Checksum()
 
-    if chksum != 12481:
-        gdaltest.post_reason('Wrong checksum')
-        return 'fail'
+    assert chksum == 12481, 'Wrong checksum'
 
     # Force it to be written to disk.
     ds = None
@@ -94,14 +90,9 @@ def test_vrtrawlink_3():
     band = gdaltest.rawlink_ds.GetRasterBand(1)
     chksum = band.Checksum()
 
-    if chksum != 12481:
-        gdaltest.post_reason('Wrong checksum')
-        return 'fail'
+    assert chksum == 12481, 'Wrong checksum'
 
-    if len(filelist) != 2:
-        gdaltest.post_reason('Wrong filelist')
-        print(filelist)
-        return 'fail'
+    assert len(filelist) == 2, 'Wrong filelist'
 
     return 'success'
 
@@ -126,9 +117,7 @@ def test_vrtrawlink_4():
     ]
 
     result = gdaltest.rawlink_ds.AddBand(gdal.GDT_UInt16, options)
-    if result != gdal.CE_None:
-        gdaltest.post_reason('AddBand() returned error code')
-        return 'fail'
+    assert result == gdal.CE_None, 'AddBand() returned error code'
 
     # write out some simple data.
     band_1 = gdaltest.rawlink_ds.GetRasterBand(1)
@@ -142,9 +131,7 @@ def test_vrtrawlink_4():
     # Verify it seems to be right.
     chksum = band.Checksum()
 
-    if chksum != 12481:
-        gdaltest.post_reason('Wrong checksum')
-        return 'fail'
+    assert chksum == 12481, 'Wrong checksum'
 
     band_1 = None
     band = None
@@ -156,15 +143,11 @@ def test_vrtrawlink_4():
     band = gdaltest.rawlink_ds.GetRasterBand(2)
     chksum = band.Checksum()
 
-    if chksum != 12481:
-        gdaltest.post_reason('Wrong checksum')
-        return 'fail'
+    assert chksum == 12481, 'Wrong checksum'
 
     # verify file length.
     statinfo = os.stat('tmp/rawlink.dat')
-    if statinfo.st_size != 3354:
-        gdaltest.post_reason('data file is wrong size')
-        return 'fail'
+    assert statinfo.st_size == 3354, 'data file is wrong size'
 
     return 'success'
 
@@ -189,9 +172,7 @@ def test_vrtrawlink_5():
     ]
 
     result = ds.AddBand(gdal.GDT_UInt16, options)
-    if result != gdal.CE_None:
-        gdaltest.post_reason('AddBand() returned error code')
-        return 'fail'
+    assert result == gdal.CE_None, 'AddBand() returned error code'
 
     gdaltest.rawlink_ds.FlushCache()
 
@@ -204,15 +185,11 @@ def test_vrtrawlink_5():
     node = _xmlsearch(node, gdal.CXT_Element, 'SourceFilename')
     node = _xmlsearch(node, gdal.CXT_Attribute, 'relativeToVRT')
 
-    if node is None or node[2][1] != "1":
-        gdaltest.post_reason('incorrect relativeToVRT value')
-        return 'fail'
+    assert node is not None and node[2][1] == "1", 'incorrect relativeToVRT value'
 
-    if xmlstring.find('<ImageOffset>100</ImageOffset>') < 0 or \
-       xmlstring.find('<PixelOffset>3</PixelOffset>') < 0 or \
-       xmlstring.find('<LineOffset>93</LineOffset>') < 0:
-        print(xmlstring)
-        return 'fail'
+    assert (xmlstring.find('<ImageOffset>100</ImageOffset>') >= 0 and \
+       xmlstring.find('<PixelOffset>3</PixelOffset>') >= 0 and \
+       xmlstring.find('<LineOffset>93</LineOffset>') >= 0)
 
     return 'success'
 
@@ -237,9 +214,7 @@ def test_vrtrawlink_6():
     ]
 
     result = ds.AddBand(gdal.GDT_UInt16, options)
-    if result != gdal.CE_None:
-        gdaltest.post_reason('AddBand() returned error code')
-        return 'fail'
+    assert result == gdal.CE_None, 'AddBand() returned error code'
 
     ds.FlushCache()
 
@@ -247,19 +222,13 @@ def test_vrtrawlink_6():
     ds = None
 
     ds = gdal.Open('tmp/rawlink.vrt')
-    if ds is None:
-        gdaltest.post_reason('unable to open the dataset: "tmp/rawlink.vrt"')
-        return 'fail'
+    assert ds is not None, 'unable to open the dataset: "tmp/rawlink.vrt"'
 
     b = ds.GetRasterBand(1)
-    if b is None:
-        gdaltest.post_reason('unable to open the raster band #1')
-        return 'fail'
+    assert b is not None, 'unable to open the raster band #1'
 
-    if not os.path.exists('tmp/rawlink6.dat'):
-        gdaltest.post_reason(
-            'tha raw file is not in the expected location ("tmp/rawlink6.dat")')
-        return 'fail'
+    assert os.path.exists('tmp/rawlink6.dat'), \
+        'tha raw file is not in the expected location ("tmp/rawlink6.dat")'
 
     return 'success'
 
@@ -284,9 +253,7 @@ def test_vrtrawlink_7():
     ]
 
     result = ds.AddBand(gdal.GDT_UInt16, options)
-    if result != gdal.CE_None:
-        gdaltest.post_reason('AddBand() returned error code')
-        return 'fail'
+    assert result == gdal.CE_None, 'AddBand() returned error code'
 
     ds.FlushCache()
 
@@ -296,14 +263,10 @@ def test_vrtrawlink_7():
     os.chdir('tmp')
     try:
         ds = gdal.Open('rawlink.vrt')
-        if ds is None:
-            gdaltest.post_reason('unable to open the dataset: "rawlink.vrt"')
-            return 'fail'
+        assert ds is not None, 'unable to open the dataset: "rawlink.vrt"'
 
         b = ds.GetRasterBand(1)
-        if b is None:
-            gdaltest.post_reason('unable to open the raster band #1')
-            return 'fail'
+        assert b is not None, 'unable to open the raster band #1'
     finally:
         os.chdir('..')
 
@@ -326,9 +289,7 @@ def test_vrtrawlink_8():
             <ByteOrder>LSB</ByteOrder>
         </VRTRasterBand>
         </VRTDataset>""")
-        if ds or gdal.GetLastErrorMsg().find('Image file is too small') < 0:
-            print(gdal.GetLastErrorMsg())
-            return 'fail'
+        assert not (ds or gdal.GetLastErrorMsg().find('Image file is too small') < 0)
 
     return 'success'
 
@@ -344,9 +305,7 @@ def test_vrtrawlink_9():
         <SourceFilename relativetoVRT="0">i/do/not/exist</SourceFilename>
     </VRTRasterBand>
     </VRTDataset>""")
-    if ds or gdal.GetLastErrorMsg().find('Unable to open') < 0:
-        print(gdal.GetLastErrorMsg())
-        return 'fail'
+    assert not (ds or gdal.GetLastErrorMsg().find('Unable to open') < 0)
 
     return 'success'
 
@@ -363,9 +322,7 @@ def test_vrtrawlink_10():
         <ByteOrder>invalid</ByteOrder>
     </VRTRasterBand>
     </VRTDataset>""")
-    if ds or gdal.GetLastErrorMsg().find('ByteOrder') < 0:
-        print(gdal.GetLastErrorMsg())
-        return 'fail'
+    assert not (ds or gdal.GetLastErrorMsg().find('ByteOrder') < 0)
 
     return 'success'
 
diff --git a/autotest/gdrivers/vrtwarp.py b/autotest/gdrivers/vrtwarp.py
index 3ae343a2b43d..67fe4641aa3d 100755
--- a/autotest/gdrivers/vrtwarp.py
+++ b/autotest/gdrivers/vrtwarp.py
@@ -35,6 +35,7 @@
 
 
 import gdaltest
+import pytest
 
 ###############################################################################
 # Verify reading from simple existing warp definition.
@@ -64,10 +65,8 @@ def test_vrtwarp_2():
 
     checksum = gdaltest.vrtwarp_ds.GetRasterBand(2).Checksum()
     expected = 21504
-    if checksum != expected:
-        gdaltest.post_reason('Got checksum of %d instead of expected %d.'
+    assert checksum == expected, ('Got checksum of %d instead of expected %d.'
                              % (checksum, expected))
-        return 'fail'
 
     return 'success'
 
@@ -89,10 +88,8 @@ def test_vrtwarp_3():
     gdaltest.vrtwarp_ds = None
     gdal.GetDriverByName('VRT').Delete('tmp/warp.vrt')
 
-    if checksum != expected:
-        gdaltest.post_reason('Got checksum of %d instead of expected %d.'
+    assert checksum == expected, ('Got checksum of %d instead of expected %d.'
                              % (checksum, expected))
-        return 'fail'
 
     return 'success'
 
@@ -115,15 +112,10 @@ def test_vrtwarp_4():
     tmp_ds = None
 
     for i in range(3):
-        if vrtwarp_ds.GetRasterBand(1).GetOverviewCount() != 2:
-            return 'fail'
-        if vrtwarp_ds.GetRasterBand(1).Checksum() != cs_main:
-            print(i)
-            return 'fail'
-        if vrtwarp_ds.GetRasterBand(1).GetOverview(0).Checksum() != cs_ov0:
-            return 'fail'
-        if vrtwarp_ds.GetRasterBand(1).GetOverview(1).Checksum() != cs_ov1:
-            return 'fail'
+        assert vrtwarp_ds.GetRasterBand(1).GetOverviewCount() == 2
+        assert vrtwarp_ds.GetRasterBand(1).Checksum() == cs_main, i
+        assert vrtwarp_ds.GetRasterBand(1).GetOverview(0).Checksum() == cs_ov0
+        assert vrtwarp_ds.GetRasterBand(1).GetOverview(1).Checksum() == cs_ov1
         if i == 0:
             vrtwarp_ds.SetDescription('tmp/vrtwarp_4.vrt')
             vrtwarp_ds = None
@@ -146,16 +138,11 @@ def test_vrtwarp_4():
     ds = None
 
     vrtwarp_ds = gdal.Open('tmp/vrtwarp_4.vrt')
-    if vrtwarp_ds.GetRasterBand(1).GetOverviewCount() != 3:
-        return 'fail'
-    if vrtwarp_ds.GetRasterBand(1).Checksum() != cs_main:
-        return 'fail'
-    if vrtwarp_ds.GetRasterBand(1).GetOverview(0).Checksum() != cs_ov0:
-        return 'fail'
-    if vrtwarp_ds.GetRasterBand(1).GetOverview(1).Checksum() != cs_ov1:
-        return 'fail'
-    if vrtwarp_ds.GetRasterBand(1).GetOverview(2).Checksum() != expected_cs_ov2:
-        return 'fail'
+    assert vrtwarp_ds.GetRasterBand(1).GetOverviewCount() == 3
+    assert vrtwarp_ds.GetRasterBand(1).Checksum() == cs_main
+    assert vrtwarp_ds.GetRasterBand(1).GetOverview(0).Checksum() == cs_ov0
+    assert vrtwarp_ds.GetRasterBand(1).GetOverview(1).Checksum() == cs_ov1
+    assert vrtwarp_ds.GetRasterBand(1).GetOverview(2).Checksum() == expected_cs_ov2
     vrtwarp_ds = None
 
     gdal.Unlink('tmp/vrtwarp_4.vrt')
@@ -192,14 +179,10 @@ def test_vrtwarp_5():
     vrtwarp_ds = gdal.AutoCreateWarpedVRT(tmp_ds)
     vrtwarp_ds.SetMetadataItem('SrcOvrLevel', 'AUTO-1')
     tmp_ds = None
-    if vrtwarp_ds.GetRasterBand(1).GetOverviewCount() != 2:
-        return 'fail'
-    if vrtwarp_ds.GetRasterBand(1).Checksum() != cs_main:
-        return 'fail'
-    if vrtwarp_ds.GetRasterBand(1).GetOverview(0).Checksum() != expected_cs_ov0:
-        return 'fail'
-    if vrtwarp_ds.GetRasterBand(1).GetOverview(1).Checksum() != expected_cs_ov1:
-        return 'fail'
+    assert vrtwarp_ds.GetRasterBand(1).GetOverviewCount() == 2
+    assert vrtwarp_ds.GetRasterBand(1).Checksum() == cs_main
+    assert vrtwarp_ds.GetRasterBand(1).GetOverview(0).Checksum() == expected_cs_ov0
+    assert vrtwarp_ds.GetRasterBand(1).GetOverview(1).Checksum() == expected_cs_ov1
     vrtwarp_ds = None
 
     gdal.Unlink('tmp/vrtwarp_5.tif')
@@ -244,14 +227,10 @@ def test_vrtwarp_6():
 
     vrtwarp_ds = gdal.Open('tmp/vrtwarp_6.vrt')
 
-    if vrtwarp_ds.GetRasterBand(1).GetOverviewCount() != 2:
-        return 'fail'
-    if vrtwarp_ds.GetRasterBand(1).Checksum() != cs_main:
-        return 'fail'
-    if vrtwarp_ds.GetRasterBand(1).GetOverview(0).Checksum() != cs_ov0:
-        return 'fail'
-    if vrtwarp_ds.GetRasterBand(1).GetOverview(1).Checksum() != cs_ov1:
-        return 'fail'
+    assert vrtwarp_ds.GetRasterBand(1).GetOverviewCount() == 2
+    assert vrtwarp_ds.GetRasterBand(1).Checksum() == cs_main
+    assert vrtwarp_ds.GetRasterBand(1).GetOverview(0).Checksum() == cs_ov0
+    assert vrtwarp_ds.GetRasterBand(1).GetOverview(1).Checksum() == cs_ov1
 
     gdal.Unlink('tmp/vrtwarp_6.vrt')
     gdal.Unlink('tmp/vrtwarp_6.tif')
@@ -291,15 +270,10 @@ def test_vrtwarp_7():
     tmp_ds = None
 
     vrtwarp_ds = gdal.Warp('tmp/vrtwarp_7.vrt', 'tmp/vrtwarp_7.tif', options='-overwrite -of VRT -tps')
-    if vrtwarp_ds.GetRasterBand(1).GetOverviewCount() != 2:
-        return 'fail'
-    if vrtwarp_ds.GetRasterBand(1).Checksum() != cs_main:
-        print(cs_main)
-        return 'fail'
-    if vrtwarp_ds.GetRasterBand(1).GetOverview(0).Checksum() != cs_ov0:
-        return 'fail'
-    if vrtwarp_ds.GetRasterBand(1).GetOverview(1).Checksum() != cs_ov1:
-        return 'fail'
+    assert vrtwarp_ds.GetRasterBand(1).GetOverviewCount() == 2
+    assert vrtwarp_ds.GetRasterBand(1).Checksum() == cs_main
+    assert vrtwarp_ds.GetRasterBand(1).GetOverview(0).Checksum() == cs_ov0
+    assert vrtwarp_ds.GetRasterBand(1).GetOverview(1).Checksum() == cs_ov1
     vrtwarp_ds = None
 
     gdal.Unlink('tmp/vrtwarp_7.vrt')
@@ -324,15 +298,11 @@ def test_vrtwarp_8():
     ds = None
 
     vrtwarp_ds = gdal.Warp('tmp/vrtwarp_8.vrt', 'tmp/vrtwarp_8.tif', options='-overwrite -of VRT -rpc')
-    if vrtwarp_ds.GetRasterBand(1).GetOverviewCount() != 1:
-        return 'fail'
-    if vrtwarp_ds.GetRasterBand(1).Checksum() != expected_cs_main:
-        return 'fail'
+    assert vrtwarp_ds.GetRasterBand(1).GetOverviewCount() == 1
+    assert vrtwarp_ds.GetRasterBand(1).Checksum() == expected_cs_main
     if vrtwarp_ds.GetRasterBand(1).GetOverview(0).Checksum() != 1214:
         print(vrtwarp_ds.GetRasterBand(1).GetOverview(0).XSize)
-        print(vrtwarp_ds.GetRasterBand(1).GetOverview(0).YSize)
-        print(vrtwarp_ds.GetRasterBand(1).GetOverview(0).Checksum())
-        return 'fail'
+        pytest.fail(vrtwarp_ds.GetRasterBand(1).GetOverview(0).YSize)
     vrtwarp_ds = None
 
     gdal.Unlink('tmp/vrtwarp_8.vrt')
@@ -384,15 +354,11 @@ def test_vrtwarp_9():
     ds = None
 
     vrtwarp_ds = gdal.Warp('tmp/vrtwarp_9.vrt', 'tmp/sstgeo.vrt', options='-overwrite -of VRT -geoloc')
-    if vrtwarp_ds.GetRasterBand(1).GetOverviewCount() != 1:
-        return 'fail'
-    if vrtwarp_ds.GetRasterBand(1).Checksum() != expected_cs_main:
-        return 'fail'
+    assert vrtwarp_ds.GetRasterBand(1).GetOverviewCount() == 1
+    assert vrtwarp_ds.GetRasterBand(1).Checksum() == expected_cs_main
     if vrtwarp_ds.GetRasterBand(1).GetOverview(0).Checksum() != 63859:
         print(vrtwarp_ds.GetRasterBand(1).GetOverview(0).XSize)
-        print(vrtwarp_ds.GetRasterBand(1).GetOverview(0).YSize)
-        print(vrtwarp_ds.GetRasterBand(1).GetOverview(0).Checksum())
-        return 'fail'
+        pytest.fail(vrtwarp_ds.GetRasterBand(1).GetOverview(0).YSize)
     vrtwarp_ds = None
 
     gdal.Unlink('tmp/vrtwarp_9.vrt')
@@ -430,14 +396,10 @@ def test_vrtwarp_10():
     vrtwarp_ds = gdal.AutoCreateWarpedVRT(tmp_ds)
     vrtwarp_ds.SetMetadataItem('SrcOvrLevel', 'NONE')
     tmp_ds = None
-    if vrtwarp_ds.GetRasterBand(1).GetOverviewCount() != 2:
-        return 'fail'
-    if vrtwarp_ds.GetRasterBand(1).Checksum() != cs_main:
-        return 'fail'
-    if vrtwarp_ds.GetRasterBand(1).GetOverview(0).Checksum() != expected_cs_ov0:
-        return 'fail'
-    if vrtwarp_ds.GetRasterBand(1).GetOverview(1).Checksum() != expected_cs_ov1:
-        return 'fail'
+    assert vrtwarp_ds.GetRasterBand(1).GetOverviewCount() == 2
+    assert vrtwarp_ds.GetRasterBand(1).Checksum() == cs_main
+    assert vrtwarp_ds.GetRasterBand(1).GetOverview(0).Checksum() == expected_cs_ov0
+    assert vrtwarp_ds.GetRasterBand(1).GetOverview(1).Checksum() == expected_cs_ov1
     vrtwarp_ds = None
 
     gdal.Unlink('tmp/vrtwarp_10.tif')
@@ -456,11 +418,7 @@ def test_vrtwarp_11():
     cs3 = ds.GetRasterBand(3).Checksum()
     ds = None
 
-    if cs1 != 22122 or cs2 != 56685 or cs3 != 22122:
-        print(cs1)
-        print(cs2)
-        print(cs3)
-        return 'fail'
+    assert cs1 == 22122 and cs2 == 56685 and cs3 == 22122
 
     return 'success'
 
@@ -472,9 +430,7 @@ def test_vrtwarp_read_vrt_of_warped_vrt():
 
     ds = gdal.Open('data/vrt_of_warped_vrt.vrt')
     cs = ds.GetRasterBand(1).Checksum()
-    if cs != 4672:
-        print(cs)
-        return 'fail'
+    assert cs == 4672
 
     return 'success'
 
diff --git a/autotest/gdrivers/wcs.py b/autotest/gdrivers/wcs.py
index 293ba6da31d3..1aa7772a5728 100755
--- a/autotest/gdrivers/wcs.py
+++ b/autotest/gdrivers/wcs.py
@@ -97,35 +97,21 @@ def test_wcs_3():
     if gdaltest.wcs_drv is None or gdaltest.wcs_ds is None:
         return 'skip'
 
-    if gdaltest.wcs_ds.RasterXSize != 983 \
-       or gdaltest.wcs_ds.RasterYSize != 598 \
-       or gdaltest.wcs_ds.RasterCount != 3:
-        gdaltest.post_reason('wrong size or bands')
-        print(gdaltest.wcs_ds.RasterXSize)
-        print(gdaltest.wcs_ds.RasterYSize)
-        print(gdaltest.wcs_ds.RasterCount)
-        return 'fail'
+    assert gdaltest.wcs_ds.RasterXSize == 983 and gdaltest.wcs_ds.RasterYSize == 598 and gdaltest.wcs_ds.RasterCount == 3, \
+        'wrong size or bands'
 
     wkt = gdaltest.wcs_ds.GetProjectionRef()
-    if wkt[:14] != 'GEOGCS["WGS 84':
-        gdaltest.post_reason('Got wrong SRS: ' + wkt)
-        return 'fail'
+    assert wkt[:14] == 'GEOGCS["WGS 84', ('Got wrong SRS: ' + wkt)
 
     gt = gdaltest.wcs_ds.GetGeoTransform()
     expected_gt = (-130.85167999999999, 0.070036907426246159, 0.0, 54.114100000000001, 0.0, -0.055867725752508368)
     for i in range(6):
-        if abs(gt[i] - expected_gt[i]) > 0.00001:
-            gdaltest.post_reason('wrong geotransform')
-            print(gt)
-            return 'fail'
+        assert abs(gt[i] - expected_gt[i]) <= 0.00001, 'wrong geotransform'
 
-    if gdaltest.wcs_ds.GetRasterBand(1).GetOverviewCount() < 1:
-        gdaltest.post_reason('no overviews!')
-        return 'fail'
+    assert gdaltest.wcs_ds.GetRasterBand(1).GetOverviewCount() >= 1, 'no overviews!'
 
-    if gdaltest.wcs_ds.GetRasterBand(1).DataType != gdal.GDT_Byte:
-        gdaltest.post_reason('wrong band data type')
-        return 'fail'
+    assert gdaltest.wcs_ds.GetRasterBand(1).DataType == gdal.GDT_Byte, \
+        'wrong band data type'
 
     return 'success'
 
@@ -139,9 +125,7 @@ def test_wcs_4():
         return 'skip'
 
     cs = gdaltest.wcs_ds.GetRasterBand(1).Checksum()
-    if cs != 58765:
-        gdaltest.post_reason('Wrong checksum: ' + str(cs))
-        return 'fail'
+    assert cs == 58765, ('Wrong checksum: ' + str(cs))
 
     return 'success'
 
@@ -162,18 +146,10 @@ def wcs_5():
 
     ds = gdal.Open(fn)
 
-    if ds is None:
-        gdaltest.post_reason('open failed.')
-        return 'fail'
+    assert ds is not None, 'open failed.'
 
-    if ds.RasterXSize != 983 \
-       or ds.RasterYSize != 598 \
-       or ds.RasterCount != 3:
-        gdaltest.post_reason('wrong size or bands')
-        print(ds.RasterXSize)
-        print(ds.RasterYSize)
-        print(ds.RasterCount)
-        return 'fail'
+    assert ds.RasterXSize == 983 and ds.RasterYSize == 598 and ds.RasterCount == 3, \
+        'wrong size or bands'
 
     ds = None
 
@@ -207,35 +183,20 @@ def old_wcs_3():
     if gdaltest.wcs_drv is None or gdaltest.wcs_ds is None:
         return 'skip'
 
-    if gdaltest.wcs_ds.RasterXSize != 43200 \
-       or gdaltest.wcs_ds.RasterYSize != 21600 \
-       or gdaltest.wcs_ds.RasterCount != 1:
-        gdaltest.post_reason('wrong size or bands')
-        return 'fail'
+    assert gdaltest.wcs_ds.RasterXSize == 43200 and gdaltest.wcs_ds.RasterYSize == 21600 and gdaltest.wcs_ds.RasterCount == 1, \
+        'wrong size or bands'
 
     wkt = gdaltest.wcs_ds.GetProjectionRef()
-    if wkt[:12] != 'GEOGCS["NAD8':
-        gdaltest.post_reason('Got wrong SRS: ' + wkt)
-        return 'fail'
+    assert wkt[:12] == 'GEOGCS["NAD8', ('Got wrong SRS: ' + wkt)
 
     gt = gdaltest.wcs_ds.GetGeoTransform()
-    if abs(gt[0] - -180.0041667) > 0.00001 \
-       or abs(gt[3] - 90.004167) > 0.00001 \
-       or abs(gt[1] - 0.00833333) > 0.00001 \
-       or abs(gt[2] - 0) > 0.00001 \
-       or abs(gt[5] - -0.00833333) > 0.00001 \
-       or abs(gt[4] - 0) > 0.00001:
-        gdaltest.post_reason('wrong geotransform')
-        print(gt)
-        return 'fail'
-
-    if gdaltest.wcs_ds.GetRasterBand(1).GetOverviewCount() < 1:
-        gdaltest.post_reason('no overviews!')
-        return 'fail'
-
-    if gdaltest.wcs_ds.GetRasterBand(1).DataType < gdal.GDT_Int16:
-        gdaltest.post_reason('wrong band data type')
-        return 'fail'
+    assert abs(gt[0] - -180.0041667) <= 0.00001 and abs(gt[3] - 90.004167) <= 0.00001 and abs(gt[1] - 0.00833333) <= 0.00001 and abs(gt[2] - 0) <= 0.00001 and abs(gt[5] - -0.00833333) <= 0.00001 and abs(gt[4] - 0) <= 0.00001, \
+        'wrong geotransform'
+
+    assert gdaltest.wcs_ds.GetRasterBand(1).GetOverviewCount() >= 1, 'no overviews!'
+
+    assert gdaltest.wcs_ds.GetRasterBand(1).DataType >= gdal.GDT_Int16, \
+        'wrong band data type'
 
     return 'success'
 
@@ -249,9 +210,7 @@ def old_wcs_4():
         return 'skip'
 
     cs = gdaltest.wcs_ds.GetRasterBand(1).Checksum(0, 0, 100, 100)
-    if cs != 10469:
-        gdaltest.post_reason('Wrong checksum: ' + str(cs))
-        return 'fail'
+    assert cs == 10469, ('Wrong checksum: ' + str(cs))
 
     return 'success'
 
@@ -268,15 +227,10 @@ def old_wcs_5():
 
     ds = gdal.Open(fn)
 
-    if ds is None:
-        gdaltest.post_reason('open failed.')
-        return 'fail'
+    assert ds is not None, 'open failed.'
 
-    if ds.RasterXSize != 43200 \
-       or ds.RasterYSize != 21600 \
-       or ds.RasterCount != 1:
-        gdaltest.post_reason('wrong size or bands')
-        return 'fail'
+    assert ds.RasterXSize == 43200 and ds.RasterYSize == 21600 and ds.RasterCount == 1, \
+        'wrong size or bands'
 
     ds = None
 
diff --git a/autotest/gdrivers/webp.py b/autotest/gdrivers/webp.py
index 3e2e0f8b9682..9e0805cdd591 100755
--- a/autotest/gdrivers/webp.py
+++ b/autotest/gdrivers/webp.py
@@ -58,10 +58,8 @@ def test_webp_2():
 
     ds = gdal.Open('data/rgbsmall.webp')
     cs = ds.GetRasterBand(1).Checksum()
-    if cs != 21464 and cs != 21450 and cs != 21459:
-        gdaltest.post_reason('did not get expected checksum on band 1')
-        print(cs)
-        return 'fail'
+    assert cs == 21464 or cs == 21450 or cs == 21459, \
+        'did not get expected checksum on band 1'
 
     return 'success'
 
@@ -83,10 +81,8 @@ def test_webp_3():
     gdal.Unlink('/vsimem/webp_3.webp.aux.xml')
 
     # 21502 is for libwebp 0.3.0
-    if cs1 != 21464 and cs1 != 21502 and cs1 != 21695 and cs1 != 21700:
-        gdaltest.post_reason('did not get expected checksum on band 1')
-        print(cs1)
-        return 'fail'
+    assert cs1 == 21464 or cs1 == 21502 or cs1 == 21695 or cs1 == 21700, \
+        'did not get expected checksum on band 1'
 
     return 'success'
 
@@ -112,15 +108,10 @@ def test_webp_4():
     gdal.Unlink('/vsimem/webp_4.webp')
 
     # 22849 is for libwebp 0.3.0
-    if cs1 not in (22001, 22849, 34422, 36652, 36658, 45319):
-        gdaltest.post_reason('did not get expected checksum on band 1')
-        print(cs1)
-        return 'fail'
+    assert cs1 in (22001, 22849, 34422, 36652, 36658, 45319), \
+        'did not get expected checksum on band 1'
 
-    if cs4 != 10807:  # lossless alpha
-        gdaltest.post_reason('did not get expected checksum on band 4')
-        print(cs4)
-        return 'fail'
+    assert cs4 == 10807, 'did not get expected checksum on band 4'
 
     return 'success'
 
@@ -145,15 +136,10 @@ def test_webp_5():
     out_ds = None
     gdal.Unlink('/vsimem/webp_5.webp')
 
-    if cs1 != 12603 and cs1 != 18536 and cs1 != 14800:
-        gdaltest.post_reason('did not get expected checksum on band 1')
-        print(cs1)
-        return 'fail'
+    assert cs1 == 12603 or cs1 == 18536 or cs1 == 14800, \
+        'did not get expected checksum on band 1'
 
-    if cs4 != 10807:
-        gdaltest.post_reason('did not get expected checksum on band 4')
-        print(cs4)
-        return 'fail'
+    assert cs4 == 10807, 'did not get expected checksum on band 4'
 
     return 'success'
 
diff --git a/autotest/gdrivers/wms.py b/autotest/gdrivers/wms.py
index a01219d304b2..8cc834e61fbb 100755
--- a/autotest/gdrivers/wms.py
+++ b/autotest/gdrivers/wms.py
@@ -39,6 +39,7 @@
 
 
 import gdaltest
+import pytest
 
 ###############################################################################
 # Verify we have the driver.
@@ -90,35 +91,20 @@ def wms_3():
     if not gdaltest.wms_srv1_ok:
         return 'skip'
 
-    if gdaltest.wms_ds.RasterXSize != 36000 \
-       or gdaltest.wms_ds.RasterYSize != 14500 \
-       or gdaltest.wms_ds.RasterCount != 3:
-        gdaltest.post_reason('wrong size or bands')
-        return 'fail'
+    assert gdaltest.wms_ds.RasterXSize == 36000 and gdaltest.wms_ds.RasterYSize == 14500 and gdaltest.wms_ds.RasterCount == 3, \
+        'wrong size or bands'
 
     wkt = gdaltest.wms_ds.GetProjectionRef()
-    if wkt[:14] != 'GEOGCS["WGS 84':
-        gdaltest.post_reason('Got wrong SRS: ' + wkt)
-        return 'fail'
+    assert wkt[:14] == 'GEOGCS["WGS 84', ('Got wrong SRS: ' + wkt)
 
     gt = gdaltest.wms_ds.GetGeoTransform()
-    if abs(gt[0] - -180) > 0.00001 \
-       or abs(gt[3] - 85) > 0.00001 \
-       or abs(gt[1] - 0.01) > 0.00001 \
-       or abs(gt[2] - 0) > 0.00001 \
-       or abs(gt[5] - -0.01) > 0.00001 \
-       or abs(gt[4] - 0) > 0.00001:
-        gdaltest.post_reason('wrong geotransform')
-        print(gt)
-        return 'fail'
+    assert abs(gt[0] - -180) <= 0.00001 and abs(gt[3] - 85) <= 0.00001 and abs(gt[1] - 0.01) <= 0.00001 and abs(gt[2] - 0) <= 0.00001 and abs(gt[5] - -0.01) <= 0.00001 and abs(gt[4] - 0) <= 0.00001, \
+        'wrong geotransform'
 
-    if gdaltest.wms_ds.GetRasterBand(1).GetOverviewCount() < 1:
-        gdaltest.post_reason('no overviews!')
-        return 'fail'
+    assert gdaltest.wms_ds.GetRasterBand(1).GetOverviewCount() >= 1, 'no overviews!'
 
-    if gdaltest.wms_ds.GetRasterBand(1).DataType < gdal.GDT_Byte:
-        gdaltest.post_reason('wrong band data type')
-        return 'fail'
+    assert gdaltest.wms_ds.GetRasterBand(1).DataType >= gdal.GDT_Byte, \
+        'wrong band data type'
 
     return 'success'
 
@@ -148,9 +134,7 @@ def wms_4():
         print(msg)
         return 'skip'
 
-    if cs != 57182:
-        gdaltest.post_reason('Wrong checksum: ' + str(cs))
-        return 'fail'
+    assert cs == 57182, ('Wrong checksum: ' + str(cs))
 
     return 'success'
 
@@ -170,15 +154,10 @@ def test_wms_5():
 
     ds = gdal.Open(fn)
 
-    if ds is None:
-        gdaltest.post_reason('open failed.')
-        return 'fail'
+    assert ds is not None, 'open failed.'
 
-    if ds.RasterXSize != 2666666 \
-       or ds.RasterYSize != 1333333 \
-       or ds.RasterCount != 3:
-        gdaltest.post_reason('wrong size or bands')
-        return 'fail'
+    assert ds.RasterXSize == 2666666 and ds.RasterYSize == 1333333 and ds.RasterCount == 3, \
+        'wrong size or bands'
 
     ds = None
 
@@ -200,15 +179,10 @@ def test_wms_6():
 
     ds = gdal.Open(fn)
 
-    if ds is None:
-        gdaltest.post_reason('open failed.')
-        return 'fail'
+    assert ds is not None, 'open failed.'
 
-    if ds.RasterXSize != 268435456 \
-       or ds.RasterYSize != 134217728 \
-       or ds.RasterCount != 3:
-        gdaltest.post_reason('wrong size or bands')
-        return 'fail'
+    assert ds.RasterXSize == 268435456 and ds.RasterYSize == 134217728 and ds.RasterCount == 3, \
+        'wrong size or bands'
 
     ds = None
 
@@ -252,23 +226,12 @@ def test_wms_7():
 
     ds = gdal.Open(tms)
 
-    if ds is None:
-        gdaltest.post_reason('open failed.')
-        return 'fail'
+    assert ds is not None, 'open failed.'
 
-    if ds.RasterXSize != 268435456 \
-       or ds.RasterYSize != 134217728 \
-       or ds.RasterCount != 3:
-        gdaltest.post_reason('wrong size or bands')
-        print(ds.RasterXSize)
-        print(ds.RasterYSize)
-        return 'fail'
+    assert ds.RasterXSize == 268435456 and ds.RasterYSize == 134217728 and ds.RasterCount == 3, \
+        'wrong size or bands'
 
-    if ds.GetRasterBand(1).GetOverview(18).XSize != 512 \
-       or ds.GetRasterBand(1).GetOverview(18).YSize != 256:
-        print(ds.GetRasterBand(1).GetOverview(18).XSize)
-        print(ds.GetRasterBand(1).GetOverview(18).YSize)
-        return 'fail'
+    assert ds.GetRasterBand(1).GetOverview(18).XSize == 512 and ds.GetRasterBand(1).GetOverview(18).YSize == 256
 
     ds.GetRasterBand(1).GetOverview(18).ReadRaster(0, 0, 512, 256)
 
@@ -391,15 +354,11 @@ def test_wms_8():
 
     ds = gdal.Open(tms)
 
-    if ds is None:
-        gdaltest.post_reason('open failed.')
-        return 'fail'
+    assert ds is not None, 'open failed.'
 
     # Check cache metadata item
     cache_path = ds.GetMetadataItem("CACHE_PATH")
-    if not cache_path:
-        gdaltest.post_reason('did not get expected cache path metadata item')
-        return 'fail'
+    assert cache_path, 'did not get expected cache path metadata item'
 
     cache_subfolder = hashlib.md5(server_url_mask.encode('utf-8')).hexdigest()
 
@@ -432,9 +391,7 @@ def test_wms_8():
     cached_data = ds.GetRasterBand(1).GetOverview(ovr_upper_level).ReadRaster(0, 0, 512, 512)
     ds = None
 
-    if data != cached_data:
-        gdaltest.post_reason('data != cached_data')
-        return 'fail'
+    assert data == cached_data, 'data != cached_data'
 
     # Replace the cache with fake data
     for expected_file in expected_files:
@@ -450,9 +407,7 @@ def test_wms_8():
     ds = gdal.Open(tms)
     cs = ds.GetRasterBand(1).GetOverview(ovr_upper_level).Checksum()
     ds = None
-    if cs != 0:
-        gdaltest.post_reason('cs != 0')
-        return 'fail'
+    assert cs == 0, 'cs != 0'
 
     # Test with GDAL_DEFAULT_WMS_CACHE_PATH
     # Now, we should read from the cache
@@ -461,9 +416,7 @@ def test_wms_8():
     cs = ds.GetRasterBand(1).GetOverview(ovr_upper_level).Checksum()
     ds = None
     gdal.SetConfigOption("GDAL_DEFAULT_WMS_CACHE_PATH", None)
-    if cs != 0:
-        gdaltest.post_reason('cs != 0')
-        return 'fail'
+    assert cs == 0, 'cs != 0'
 
     # Check maxsize and expired tags
     tms_expires = """<GDAL_WMS>
@@ -499,8 +452,7 @@ def test_wms_8():
 
     # tiles should be overwritten by new ones
     for expected_file in expected_files:
-        if os.path.getmtime(expected_file) <= mod_time:
-            return 'fail'
+        assert os.path.getmtime(expected_file) > mod_time
 
     return 'success'
 
@@ -533,10 +485,7 @@ def wms_9():
     expected_cs = 5478
     cs = ds.GetRasterBand(1).GetOverview(9).Checksum()
 
-    if cs != expected_cs:
-        gdaltest.post_reason('Did not get expected SRTM checksum.')
-        print(cs)
-        return 'fail'
+    assert cs == expected_cs, 'Did not get expected SRTM checksum.'
 
     ds = None
 
@@ -556,23 +505,16 @@ def wms_10():
 
     name = "WMS:http://sedac.ciesin.columbia.edu/mapserver/map/GPWv3?"
     ds = gdal.Open(name)
-    if ds is None:
-        gdaltest.post_reason('open of %s failed.' % name)
-        return 'fail'
+    assert ds is not None, ('open of %s failed.' % name)
 
     subdatasets = ds.GetMetadata("SUBDATASETS")
-    if not subdatasets:
-        gdaltest.post_reason('did not get expected subdataset count')
-        print(subdatasets)
-        return 'fail'
+    assert subdatasets, 'did not get expected subdataset count'
 
     ds = None
 
     name = subdatasets['SUBDATASET_1_NAME']
     ds = gdal.Open(name)
-    if ds is None:
-        gdaltest.post_reason('open of %s failed.' % name)
-        return 'fail'
+    assert ds is not None, ('open of %s failed.' % name)
 
     ds = None
 
@@ -596,23 +538,16 @@ def test_wms_11():
 
     name = "WMS:http://onearth.jpl.nasa.gov/wms.cgi?request=GetTileService"
     ds = gdal.Open(name)
-    if ds is None:
-        gdaltest.post_reason('open of %s failed.' % name)
-        return 'fail'
+    assert ds is not None, ('open of %s failed.' % name)
 
     subdatasets = ds.GetMetadata("SUBDATASETS")
-    if not subdatasets:
-        gdaltest.post_reason('did not get expected subdataset count')
-        print(subdatasets)
-        return 'fail'
+    assert subdatasets, 'did not get expected subdataset count'
 
     ds = None
 
     name = subdatasets['SUBDATASET_1_NAME']
     ds = gdal.Open(name)
-    if ds is None:
-        gdaltest.post_reason('open of %s failed.' % name)
-        return 'fail'
+    assert ds is not None, ('open of %s failed.' % name)
 
     ds = None
 
@@ -639,10 +574,7 @@ def test_wms_12():
         return 'fail'
 
     subdatasets = ds.GetMetadata("SUBDATASETS")
-    if not subdatasets:
-        gdaltest.post_reason('did not get expected subdataset count')
-        print(subdatasets)
-        return 'fail'
+    assert subdatasets, 'did not get expected subdataset count'
 
     ds = None
 
@@ -695,38 +627,23 @@ def test_wms_14():
     if ds is None:
         return' fail'
 
-    if ds.RasterXSize != 134217728 \
-       or ds.RasterYSize != 134217728 \
-       or ds.RasterCount != 3:
-        gdaltest.post_reason('wrong size or bands')
-        return 'fail'
+    assert ds.RasterXSize == 134217728 and ds.RasterYSize == 134217728 and ds.RasterCount == 3, \
+        'wrong size or bands'
 
     wkt = ds.GetProjectionRef()
-    if wkt.find('PROJCS["Google Maps Global Mercator"') != 0:
-        gdaltest.post_reason('Got wrong SRS: ' + wkt)
-        return 'fail'
+    assert wkt.find('PROJCS["Google Maps Global Mercator"') == 0, \
+        ('Got wrong SRS: ' + wkt)
 
     gt = ds.GetGeoTransform()
-    if abs(gt[0] - -20037508.34278924,) > 0.00001 \
-       or abs(gt[3] - 20037508.34278924,) > 0.00001 \
-       or abs(gt[1] - 0.2985821417389697) > 0.00001 \
-       or abs(gt[2] - 0) > 0.00001 \
-       or abs(gt[5] - -0.2985821417389697,) > 0.00001 \
-       or abs(gt[4] - 0) > 0.00001:
-        gdaltest.post_reason('wrong geotransform')
-        print(gt)
-        return 'fail'
+    assert abs(gt[0] - -20037508.34278924,) <= 0.00001 and abs(gt[3] - 20037508.34278924,) <= 0.00001 and abs(gt[1] - 0.2985821417389697) <= 0.00001 and abs(gt[2] - 0) <= 0.00001 and abs(gt[5] - -0.2985821417389697,) <= 0.00001 and abs(gt[4] - 0) <= 0.00001, \
+        'wrong geotransform'
 
-    if ds.GetRasterBand(1).GetOverviewCount() != 18:
-        gdaltest.post_reason('bad overview count')
-        print(ds.GetRasterBand(1).GetOverviewCount())
-        return 'fail'
+    assert ds.GetRasterBand(1).GetOverviewCount() == 18, 'bad overview count'
 
     (block_xsize, block_ysize) = ds.GetRasterBand(1).GetBlockSize()
     if block_xsize != 256 or block_ysize != 256:
-        gdaltest.post_reason('bad block size')
         print("(%d, %d)" % (block_xsize, block_ysize))
-        return 'fail'
+        pytest.fail('bad block size')
 
     return 'success'
 
@@ -750,38 +667,22 @@ def test_wms_15():
     if ds is None:
         return' fail'
 
-    if ds.RasterXSize != 1073741824 \
-       or ds.RasterYSize != 1073741824 \
-       or ds.RasterCount != 3:
-        gdaltest.post_reason('wrong size or bands')
-        return 'fail'
+    assert ds.RasterXSize == 1073741824 and ds.RasterYSize == 1073741824 and ds.RasterCount == 3, \
+        'wrong size or bands'
 
     wkt = ds.GetProjectionRef()
-    if wkt.find('PROJCS["WGS 84 / Pseudo-Mercator"') != 0:
-        gdaltest.post_reason('Got wrong SRS: ' + wkt)
-        return 'fail'
+    assert wkt.find('PROJCS["WGS 84 / Pseudo-Mercator"') == 0, ('Got wrong SRS: ' + wkt)
 
     gt = ds.GetGeoTransform()
-    if abs(gt[0] - -20037508.342787001) > 0.00001 \
-       or abs(gt[3] - 20037508.342787001) > 0.00001 \
-       or abs(gt[1] - 0.037322767717361482) > 0.00001 \
-       or abs(gt[2] - 0) > 0.00001 \
-       or abs(gt[5] - -0.037322767717361482) > 0.00001 \
-       or abs(gt[4] - 0) > 0.00001:
-        gdaltest.post_reason('wrong geotransform')
-        print(gt)
-        return 'fail'
+    assert abs(gt[0] - -20037508.342787001) <= 0.00001 and abs(gt[3] - 20037508.342787001) <= 0.00001 and abs(gt[1] - 0.037322767717361482) <= 0.00001 and abs(gt[2] - 0) <= 0.00001 and abs(gt[5] - -0.037322767717361482) <= 0.00001 and abs(gt[4] - 0) <= 0.00001, \
+        'wrong geotransform'
 
-    if ds.GetRasterBand(1).GetOverviewCount() != 22:
-        gdaltest.post_reason('bad overview count')
-        print(ds.GetRasterBand(1).GetOverviewCount())
-        return 'fail'
+    assert ds.GetRasterBand(1).GetOverviewCount() == 22, 'bad overview count'
 
     (block_xsize, block_ysize) = ds.GetRasterBand(1).GetBlockSize()
     if block_xsize != 256 or block_ysize != 256:
-        gdaltest.post_reason('bad block size')
         print("(%d, %d)" % (block_xsize, block_ysize))
-        return 'fail'
+        pytest.fail('bad block size')
 
     ds = None
     gdal.Unlink("/vsimem/wms.xml")
@@ -807,10 +708,7 @@ def test_wms_16():
         return 'fail'
 
     subdatasets = ds.GetMetadata("SUBDATASETS")
-    if not subdatasets:
-        gdaltest.post_reason('did not get expected subdataset count')
-        print(subdatasets)
-        return 'fail'
+    assert subdatasets, 'did not get expected subdataset count'
 
     ds = None
 
@@ -819,14 +717,11 @@ def test_wms_16():
         if key[-5:] == '_NAME' and subdatasets[key].find('bugsites') != -1:
             name = subdatasets[key]
             break
-    if name is None:
-        return 'fail'
+    assert name is not None
 
     name = 'http://demo.opengeo.org/geoserver/wms?SERVICE=WMS&request=GetMap&version=1.1.1&layers=og:bugsites&styles=&srs=EPSG:26713&bbox=599351.50000000,4914096.00000000,608471.00000000,4920512.00000000'
     ds = gdal.Open(name)
-    if ds is None:
-        gdaltest.post_reason('open of %s failed.' % name)
-        return 'fail'
+    assert ds is not None, ('open of %s failed.' % name)
 
     # Matches feature of "WFS:http://demo.opengeo.org/geoserver/wfs?SRSNAME=EPSG:900913" og:bugsites
     # OGRFeature(og:bugsites):68846
@@ -858,17 +753,11 @@ def test_wms_16():
 
     # Ask again. Should be cached
     val_again = ds.GetRasterBand(1).GetMetadataItem(pixel, "LocationInfo")
-    if val_again != val:
-        gdaltest.post_reason('expected a value')
-        print(val_again)
-        return 'fail'
+    assert val_again == val, 'expected a value'
 
     # Ask another band. Should be cached
     val2 = ds.GetRasterBand(2).GetMetadataItem(pixel, "LocationInfo")
-    if val2 != val:
-        gdaltest.post_reason('expected a value')
-        print(val2)
-        return 'fail'
+    assert val2 == val, 'expected a value'
 
     # Ask an overview band
     val2 = ds.GetRasterBand(1).GetOverview(0).GetMetadataItem(pixel, "LocationInfo")
@@ -900,13 +789,10 @@ def wms_17():
 
     name = '<GDAL_WMS><Service name="TiledWMS"><ServerUrl>http://onmoon.lmmp.nasa.gov/sites/wms.cgi?</ServerUrl><TiledGroupName>King Crater DEM Color Confidence, LMMP</TiledGroupName></Service></GDAL_WMS>'
     ds = gdal.Open(name)
-    if ds is None:
-        gdaltest.post_reason('open of %s failed.' % name)
-        return 'fail'
+    assert ds is not None, ('open of %s failed.' % name)
 
     band = ds.GetRasterBand(1)
-    if band.GetColorTable() is None:
-        return 'fail'
+    assert band.GetColorTable() is not None
 
     ds = None
 
@@ -928,15 +814,10 @@ def test_wms_18():
 
     ds = gdal.Open(fn)
 
-    if ds is None:
-        gdaltest.post_reason('open failed.')
-        return 'fail'
+    assert ds is not None, 'open failed.'
 
-    if ds.RasterXSize != 512 \
-       or ds.RasterYSize != 512 \
-       or ds.RasterCount != 3:
-        gdaltest.post_reason('wrong size or bands')
-        return 'fail'
+    assert ds.RasterXSize == 512 and ds.RasterYSize == 512 and ds.RasterCount == 3, \
+        'wrong size or bands'
 
     # todo: add locationinfo test
 
@@ -946,10 +827,7 @@ def test_wms_18():
 
     expected_cs = 12824
     cs = ds.GetRasterBand(1).Checksum()
-    if cs != expected_cs:
-        gdaltest.post_reason('Did not get expected SRTM checksum.')
-        print(cs)
-        return 'fail'
+    assert cs == expected_cs, 'Did not get expected SRTM checksum.'
 
     ds = None
 
@@ -972,18 +850,12 @@ def test_wms_19():
         gdaltest.post_reason('open failed.')
         return 'fail'
 
-    if ds.RasterXSize != 86400 \
-       or ds.RasterYSize != 43200 \
-       or ds.RasterCount != 3:
-        gdaltest.post_reason('wrong size or bands')
-        return 'fail'
+    assert ds.RasterXSize == 86400 and ds.RasterYSize == 43200 and ds.RasterCount == 3, \
+        'wrong size or bands'
 
     # Expected checksum seems to change over time. Hum...
     cs = ds.GetRasterBand(1).GetOverview(ds.GetRasterBand(1).GetOverviewCount() - 1).Checksum()
-    if cs == 0:
-        gdaltest.post_reason('Did not get expected checksum.')
-        print(cs)
-        return 'fail'
+    assert cs != 0, 'Did not get expected checksum.'
 
     ds = None
 
diff --git a/autotest/gdrivers/wmts.py b/autotest/gdrivers/wmts.py
index 0584e544a822..55bcf99c6e8b 100755
--- a/autotest/gdrivers/wmts.py
+++ b/autotest/gdrivers/wmts.py
@@ -69,26 +69,22 @@ def test_wmts_2():
     gdal.PushErrorHandler()
     ds = gdal.Open('WMTS:')
     gdal.PopErrorHandler()
-    if ds is not None:
-        return 'fail'
+    assert ds is None
 
     gdal.PushErrorHandler()
     ds = gdal.Open('<GDAL_WMTS>')
     gdal.PopErrorHandler()
-    if ds is not None:
-        return 'fail'
+    assert ds is None
 
     gdal.PushErrorHandler()
     ds = gdal.Open('<GDAL_WMTSxxx/>')
     gdal.PopErrorHandler()
-    if ds is not None:
-        return 'fail'
+    assert ds is None
 
     gdal.PushErrorHandler()
     ds = gdal.Open('<GDAL_WMTS></GDAL_WMTS>')
     gdal.PopErrorHandler()
-    if ds is not None:
-        return 'fail'
+    assert ds is None
 
     return 'success'
 
@@ -104,8 +100,7 @@ def test_wmts_3():
     gdal.PushErrorHandler()
     ds = gdal.Open('WMTS:https://non_existing')
     gdal.PopErrorHandler()
-    if ds is not None:
-        return 'fail'
+    assert ds is None
 
     return 'success'
 
@@ -121,8 +116,7 @@ def test_wmts_4():
     gdal.PushErrorHandler()
     ds = gdal.Open('WMTS:/vsimem/non_existing')
     gdal.PopErrorHandler()
-    if ds is not None:
-        return 'fail'
+    assert ds is None
 
     return 'success'
 
@@ -140,8 +134,7 @@ def test_wmts_5():
     gdal.PushErrorHandler()
     ds = gdal.Open('WMTS:/vsimem/invalid_getcapabilities.xml')
     gdal.PopErrorHandler()
-    if ds is not None:
-        return 'fail'
+    assert ds is None
 
     return 'success'
 
@@ -159,8 +152,7 @@ def test_wmts_6():
     gdal.PushErrorHandler()
     ds = gdal.Open('WMTS:/vsimem/invalid_getcapabilities.xml')
     gdal.PopErrorHandler()
-    if ds is not None:
-        return 'fail'
+    assert ds is None
 
     return 'success'
 
@@ -178,8 +170,7 @@ def test_wmts_7():
     gdal.PushErrorHandler()
     ds = gdal.Open('WMTS:/vsimem/empty_getcapabilities.xml')
     gdal.PopErrorHandler()
-    if ds is not None:
-        return 'fail'
+    assert ds is None
 
     return 'success'
 
@@ -203,8 +194,7 @@ def test_wmts_8():
     gdal.PushErrorHandler()
     ds = gdal.Open('WMTS:/vsimem/missing.xml')
     gdal.PopErrorHandler()
-    if ds is not None:
-        return 'fail'
+    assert ds is None
 
     return 'success'
 
@@ -235,8 +225,7 @@ def test_wmts_9():
     gdal.PushErrorHandler()
     ds = gdal.Open('WMTS:/vsimem/missing_tms.xml')
     gdal.PopErrorHandler()
-    if ds is not None:
-        return 'fail'
+    assert ds is None
 
     return 'success'
 
@@ -270,8 +259,7 @@ def test_wmts_10():
     gdal.PushErrorHandler()
     ds = gdal.Open('WMTS:/vsimem/missing_SupportedCRS.xml')
     gdal.PopErrorHandler()
-    if ds is not None:
-        return 'fail'
+    assert ds is None
 
     return 'success'
 
@@ -306,8 +294,7 @@ def test_wmts_11():
     gdal.PushErrorHandler()
     ds = gdal.Open('WMTS:/vsimem/no_tilematrix.xml')
     gdal.PopErrorHandler()
-    if ds is not None:
-        return 'fail'
+    assert ds is None
 
     return 'success'
 
@@ -343,8 +330,7 @@ def test_wmts_12():
     gdal.PushErrorHandler()
     ds = gdal.Open('WMTS:/vsimem/missing_required_element_in_tilematrix.xml')
     gdal.PopErrorHandler()
-    if ds is not None:
-        return 'fail'
+    assert ds is None
 
     return 'success'
 
@@ -387,8 +373,7 @@ def test_wmts_12bis():
     gdal.PushErrorHandler()
     ds = gdal.Open('WMTS:/vsimem/wmts_12bis.xml')
     gdal.PopErrorHandler()
-    if ds is not None:
-        return 'fail'
+    assert ds is None
 
     return 'success'
 
@@ -430,41 +415,26 @@ def test_wmts_13():
 </Capabilities>""")
 
     ds = gdal.Open('WMTS:/vsimem/minimal.xml')
-    if ds is None:
-        return 'fail'
-    if ds.RasterXSize != 256:
-        return 'fail'
-    if ds.RasterYSize != 256:
-        return 'fail'
+    assert ds is not None
+    assert ds.RasterXSize == 256
+    assert ds.RasterYSize == 256
     got_gt = ds.GetGeoTransform()
     expected_gt = (-20037508.342799999, 156543.03392811998, 0.0, 20037508.342799999, 0.0, -156543.03392811998)
     for i in range(6):
-        if abs(got_gt[i] - expected_gt[i]) > 1e-8:
-            print(got_gt)
-            return 'fail'
-    if ds.GetProjectionRef().find('3857') < 0:
-        return 'fail'
-    if ds.RasterCount != 4:
-        return 'fail'
+        assert abs(got_gt[i] - expected_gt[i]) <= 1e-8
+    assert ds.GetProjectionRef().find('3857') >= 0
+    assert ds.RasterCount == 4
     for i in range(4):
-        if ds.GetRasterBand(i + 1).GetColorInterpretation() != gdal.GCI_RedBand + i:
-            return 'fail'
-    if ds.GetRasterBand(1).GetOverviewCount() != 0:
-        return 'fail'
-    if ds.GetRasterBand(1).GetOverview(0) is not None:
-        return 'fail'
+        assert ds.GetRasterBand(i + 1).GetColorInterpretation() == gdal.GCI_RedBand + i
+    assert ds.GetRasterBand(1).GetOverviewCount() == 0
+    assert ds.GetRasterBand(1).GetOverview(0) is None
     gdal.PushErrorHandler()
     cs = ds.GetRasterBand(1).Checksum()
     gdal.PopErrorHandler()
-    if cs != 0:
-        return 'fail'
-    if ds.GetSubDatasets() != []:
-        print(ds.GetSubDatasets())
-        return 'fail'
-    if ds.GetRasterBand(1).GetMetadataItem('Pixel_0_0', 'LocationInfo') is not None:
-        return 'fail'
-    if ds.GetRasterBand(1).GetMetadataItem('foo') is not None:
-        return 'fail'
+    assert cs == 0
+    assert ds.GetSubDatasets() == []
+    assert ds.GetRasterBand(1).GetMetadataItem('Pixel_0_0', 'LocationInfo') is None
+    assert ds.GetRasterBand(1).GetMetadataItem('foo') is None
 
     for connection_str in ['WMTS:/vsimem/minimal.xml,layer=',
                            'WMTS:/vsimem/minimal.xml,style=',
@@ -473,9 +443,7 @@ def test_wmts_13():
                            'WMTS:/vsimem/minimal.xml,zoom_level=',
                            'WMTS:/vsimem/minimal.xml,layer=,style=,tilematrixset=']:
         ds = gdal.Open(connection_str)
-        if ds is None:
-            print(connection_str)
-            return 'fail'
+        assert ds is not None, connection_str
         ds = None
 
     for connection_str in ['WMTS:/vsimem/minimal.xml,layer=foo',
@@ -486,9 +454,7 @@ def test_wmts_13():
         gdal.PushErrorHandler()
         ds = gdal.Open(connection_str)
         gdal.PopErrorHandler()
-        if ds is not None:
-            print(connection_str)
-            return 'fail'
+        assert ds is None, connection_str
         ds = None
 
     ds = gdal.Open('WMTS:/vsimem/minimal.xml')
@@ -498,18 +464,15 @@ def test_wmts_13():
     tmp_ds = gdal.GetDriverByName('PNG').CreateCopy('/vsimem/0/0/0.png', tmp_ds)
     for i in range(4):
         cs = ds.GetRasterBand(i + 1).Checksum()
-        if cs != tmp_ds.GetRasterBand(i + 1).Checksum():
-            return 'fail'
+        assert cs == tmp_ds.GetRasterBand(i + 1).Checksum()
 
     ref_data = tmp_ds.ReadRaster(0, 0, 256, 256)
     got_data = ds.ReadRaster(0, 0, ds.RasterXSize, ds.RasterYSize, 256, 256)
-    if ref_data != got_data:
-        return 'fail'
+    assert ref_data == got_data
 
     ref_data = tmp_ds.GetRasterBand(1).ReadRaster(0, 0, 256, 256)
     got_data = ds.GetRasterBand(1).ReadRaster(0, 0, ds.RasterXSize, ds.RasterYSize, 256, 256)
-    if ref_data != got_data:
-        return 'fail'
+    assert ref_data == got_data
 
     ds = None
     wmts_CleanCache()
@@ -611,29 +574,21 @@ def test_wmts_14():
 </Capabilities>""")
 
     ds = gdal.Open('WMTS:/vsimem/nominal.xml')
-    if ds is None:
-        return 'fail'
-    if ds.GetSubDatasets() != [('WMTS:/vsimem/nominal.xml,layer=lyr1,tilematrixset=tms,style="style=auto"',
+    assert ds is not None
+    assert (ds.GetSubDatasets() == [('WMTS:/vsimem/nominal.xml,layer=lyr1,tilematrixset=tms,style="style=auto"',
                                 'Layer My layer1, tile matrix set tms, style "Default style"'),
                                ('WMTS:/vsimem/nominal.xml,layer=lyr1,tilematrixset=tms,style=another_style',
                                 'Layer My layer1, tile matrix set tms, style "Another style"'),
                                ('WMTS:/vsimem/nominal.xml,layer=lyr1,tilematrixset=another_tms,style="style=auto"',
                                 'Layer My layer1, tile matrix set another_tms, style "Default style"'),
                                ('WMTS:/vsimem/nominal.xml,layer=lyr1,tilematrixset=another_tms,style=another_style',
-                                'Layer My layer1, tile matrix set another_tms, style "Another style"')]:
-        print(ds.GetSubDatasets())
-        return 'fail'
-    if ds.RasterXSize != 67108864:
-        return 'fail'
+                                'Layer My layer1, tile matrix set another_tms, style "Another style"')])
+    assert ds.RasterXSize == 67108864
     gdal.PushErrorHandler()
     res = ds.GetRasterBand(1).GetMetadataItem('Pixel_1_2', 'LocationInfo')
     gdal.PopErrorHandler()
-    if res != '':
-        print(res)
-        return 'fail'
-    if ds.GetMetadata() != {'ABSTRACT': 'My abstract', 'TITLE': 'My layer1'}:
-        print(ds.GetMetadata())
-        return 'fail'
+    assert res == ''
+    assert ds.GetMetadata() == {'ABSTRACT': 'My abstract', 'TITLE': 'My layer1'}
 
     gdal.PushErrorHandler()
     gdaltest.wmts_drv.CreateCopy('/vsimem/gdal_nominal.xml', gdal.GetDriverByName('MEM').Create('', 1, 1))
@@ -645,7 +600,7 @@ def test_wmts_14():
     f = gdal.VSIFOpenL('/vsimem/gdal_nominal.xml', 'rb')
     data = gdal.VSIFReadL(1, 10000, f).decode('ascii')
     gdal.VSIFCloseL(f)
-    if data != """<GDAL_WMTS>
+    assert data == """<GDAL_WMTS>
   <GetCapabilitiesUrl>/vsimem/nominal.xml</GetCapabilitiesUrl>
   <Layer>lyr1</Layer>
   <Style>style=auto</Style>
@@ -662,34 +617,25 @@ def test_wmts_14():
   <ZeroBlockHttpCodes>204,404</ZeroBlockHttpCodes>
   <ZeroBlockOnServerException>true</ZeroBlockOnServerException>
 </GDAL_WMTS>
-""":
-        print(data)
-        return 'fail'
+"""
 
     ds = gdal.Open('/vsimem/gdal_nominal.xml')
     gdal.FileFromMemBuffer('/vsimem/2011-10-04/style=auto/tms/tm_18/0/0/2/1.txt', 'foo')
     res = ds.GetRasterBand(1).GetMetadataItem('Pixel_1_2', 'LocationInfo')
-    if res != '<LocationInfo>foo</LocationInfo>':
-        print(res)
-        return 'fail'
+    assert res == '<LocationInfo>foo</LocationInfo>'
     res = ds.GetRasterBand(1).GetMetadataItem('Pixel_1_2', 'LocationInfo')
-    if res != '<LocationInfo>foo</LocationInfo>':
-        print(res)
-        return 'fail'
+    assert res == '<LocationInfo>foo</LocationInfo>'
 
     ds = gdal.Open('<GDAL_WMTS><GetCapabilitiesUrl>/vsimem/nominal.xml</GetCapabilitiesUrl></GDAL_WMTS>')
-    if ds is None:
-        return 'fail'
+    assert ds is not None
 
     ds = gdal.Open('WMTS:/vsimem/gdal_nominal.xml')
-    if ds is None:
-        return 'fail'
+    assert ds is not None
 
     for open_options in [['URL=/vsimem/nominal.xml'],
                          ['URL=/vsimem/nominal.xml', 'STYLE=style=auto', 'TILEMATRIXSET=tms']]:
         ds = gdal.OpenEx('WMTS:', open_options=open_options)
-        if ds is None:
-            return 'fail'
+        assert ds is not None
 
     for open_options in [['URL=/vsimem/nominal.xml', 'STYLE=x', 'TILEMATRIXSET=y'],
                          ['URL=/vsimem/nominal.xml', 'STYLE=style=auto', 'TILEMATRIX=30'],
@@ -697,44 +643,29 @@ def test_wmts_14():
         gdal.PushErrorHandler()
         ds = gdal.OpenEx('WMTS:', open_options=open_options)
         gdal.PopErrorHandler()
-        if ds is not None:
-            return 'fail'
+        assert ds is None
 
     ds = gdal.Open('WMTS:/vsimem/nominal.xml')
     gdal.FileFromMemBuffer('/vsimem/2011-10-04/style=auto/tms/tm_18/0/0/2/1.txt', '<?xml version="1.0" encoding="UTF-8"?><xml_content/>')
     res = ds.GetRasterBand(1).GetMetadataItem('Pixel_1_2', 'LocationInfo')
-    if res != """<LocationInfo><xml_content />
-</LocationInfo>""":
-        print(res)
-        return 'fail'
+    assert res == """<LocationInfo><xml_content />
+</LocationInfo>"""
 
     ds = gdal.Open('WMTS:/vsimem/gdal_nominal.xml,tilematrix=tm_0')
-    if ds is None:
-        return 'fail'
-    if ds.RasterXSize != 256:
-        print(ds.RasterXSize)
-        return 'fail'
+    assert ds is not None
+    assert ds.RasterXSize == 256
 
     ds = gdal.OpenEx('WMTS:/vsimem/gdal_nominal.xml', open_options=['tilematrix=tm_0'])
-    if ds is None:
-        return 'fail'
-    if ds.RasterXSize != 256:
-        print(ds.RasterXSize)
-        return 'fail'
+    assert ds is not None
+    assert ds.RasterXSize == 256
 
     ds = gdal.Open('WMTS:/vsimem/gdal_nominal.xml,zoom_level=0')
-    if ds is None:
-        return 'fail'
-    if ds.RasterXSize != 256:
-        print(ds.RasterXSize)
-        return 'fail'
+    assert ds is not None
+    assert ds.RasterXSize == 256
 
     ds = gdal.OpenEx('WMTS:/vsimem/gdal_nominal.xml', open_options=['zoom_level=0'])
-    if ds is None:
-        return 'fail'
-    if ds.RasterXSize != 256:
-        print(ds.RasterXSize)
-        return 'fail'
+    assert ds is not None
+    assert ds.RasterXSize == 256
 
     gdal.FileFromMemBuffer('/vsimem/gdal_nominal.xml', """<GDAL_WMTS>
   <GetCapabilitiesUrl>/vsimem/nominal.xml</GetCapabilitiesUrl>
@@ -755,11 +686,8 @@ def test_wmts_14():
   <ZeroBlockOnServerException>true</ZeroBlockOnServerException>
 </GDAL_WMTS>""")
     ds = gdal.Open('WMTS:/vsimem/gdal_nominal.xml')
-    if ds is None:
-        return 'fail'
-    if ds.RasterXSize != 256:
-        print(ds.RasterXSize)
-        return 'fail'
+    assert ds is not None
+    assert ds.RasterXSize == 256
 
     gdal.FileFromMemBuffer('/vsimem/gdal_nominal.xml', """<GDAL_WMTS>
   <GetCapabilitiesUrl>/vsimem/nominal.xml</GetCapabilitiesUrl>
@@ -780,11 +708,8 @@ def test_wmts_14():
   <ZeroBlockOnServerException>true</ZeroBlockOnServerException>
 </GDAL_WMTS>""")
     ds = gdal.Open('WMTS:/vsimem/gdal_nominal.xml')
-    if ds is None:
-        return 'fail'
-    if ds.RasterXSize != 256:
-        print(ds.RasterXSize)
-        return 'fail'
+    assert ds is not None
+    assert ds.RasterXSize == 256
 
     return 'success'
 
@@ -894,16 +819,12 @@ def test_wmts_15():
 </Capabilities>""")
 
     ds = gdal.Open('/vsimem/nominal_kvp.xml?service=WMTS&request=GetCapabilities')
-    if ds is None:
-        return 'fail'
-    if ds.RasterXSize != 67108864:
-        return 'fail'
+    assert ds is not None
+    assert ds.RasterXSize == 67108864
     gdal.PushErrorHandler()
     res = ds.GetRasterBand(1).GetMetadataItem('Pixel_1_2', 'LocationInfo')
     gdal.PopErrorHandler()
-    if res != '':
-        print(res)
-        return 'fail'
+    assert res == ''
 
     gdaltest.wmts_drv.CreateCopy('/vsimem/gdal_nominal_kvp.xml', ds)
     ds = None
@@ -911,31 +832,25 @@ def test_wmts_15():
     ds = gdal.Open('/vsimem/gdal_nominal_kvp.xml')
     gdal.FileFromMemBuffer('/vsimem/nominal_kvp.xml?service=WMTS&request=GetFeatureInfo&version=1.0.0&layer=lyr1&style=default_style&InfoFormat=text/plain&TileMatrixSet=tms&TileMatrix=18&TileRow=0&TileCol=0&J=2&I=1&time=2011-10-04', 'bar')
     res = ds.GetRasterBand(1).GetMetadataItem('Pixel_1_2', 'LocationInfo')
-    if res != '<LocationInfo>bar</LocationInfo>':
-        print(res)
-        return 'fail'
+    assert res == '<LocationInfo>bar</LocationInfo>'
 
     ds = gdal.Open('WMTS:/vsimem/gdal_nominal_kvp.xml')
-    if ds is None:
-        return 'fail'
+    assert ds is not None
     tmp_ds = gdal.GetDriverByName('MEM').Create('', 256, 256, 4)
     for i in range(4):
         tmp_ds.GetRasterBand(i + 1).Fill((i + 1) * 255 / 4)
     tmp_ds = gdal.GetDriverByName('PNG').CreateCopy('/vsimem/nominal_kvp.xml?service=WMTS&request=GetTile&version=1.0.0&layer=lyr1&style=default_style&format=image/png&TileMatrixSet=tms&TileMatrix=0&TileRow=0&TileCol=0&time=2011-10-04', tmp_ds)
     for i in range(4):
         cs = ds.GetRasterBand(i + 1).GetOverview(0).Checksum()
-        if cs != tmp_ds.GetRasterBand(i + 1).Checksum():
-            return 'fail'
+        assert cs == tmp_ds.GetRasterBand(i + 1).Checksum()
 
     ref_data = tmp_ds.ReadRaster(0, 0, 256, 256)
     got_data = ds.ReadRaster(0, 0, ds.RasterXSize, ds.RasterYSize, 256, 256)
-    if ref_data != got_data:
-        return 'fail'
+    assert ref_data == got_data
 
     ref_data = tmp_ds.GetRasterBand(1).ReadRaster(0, 0, 256, 256)
     got_data = ds.GetRasterBand(1).ReadRaster(0, 0, ds.RasterXSize, ds.RasterYSize, 256, 256)
-    if ref_data != got_data:
-        return 'fail'
+    assert ref_data == got_data
 
     ds = None
     wmts_CleanCache()
@@ -1007,23 +922,14 @@ def test_wmts_16():
 </Capabilities>""")
 
     ds = gdal.Open('WMTS:/vsimem/wmts_16.xml')
-    if ds is None:
-        return 'fail'
-    if ds.RasterXSize != 512:
-        print(ds.RasterXSize)
-        return 'fail'
-    if ds.RasterYSize != 256:
-        print(ds.RasterYSize)
-        return 'fail'
+    assert ds is not None
+    assert ds.RasterXSize == 512
+    assert ds.RasterYSize == 256
     got_gt = ds.GetGeoTransform()
     expected_gt = (-90, 0.3515625, 0.0, 90.0, 0.0, -0.3515625)
     for i in range(6):
-        if abs(got_gt[i] - expected_gt[i]) > 1e-8:
-            print(got_gt)
-            return 'fail'
-    if ds.GetProjectionRef().find('4326') < 0 or ds.GetProjectionRef().find('AXIS') >= 0:
-        print(ds.GetProjectionRef())
-        return 'fail'
+        assert abs(got_gt[i] - expected_gt[i]) <= 1e-8
+    assert ds.GetProjectionRef().find('4326') >= 0 and ds.GetProjectionRef().find('AXIS') < 0
 
     return 'success'
 
@@ -1092,23 +998,14 @@ def test_wmts_17():
 </Capabilities>""")
 
     ds = gdal.Open('WMTS:/vsimem/wmts_17.xml')
-    if ds is None:
-        return 'fail'
-    if ds.RasterXSize != 512:
-        print(ds.RasterXSize)
-        return 'fail'
-    if ds.RasterYSize != 256:
-        print(ds.RasterYSize)
-        return 'fail'
+    assert ds is not None
+    assert ds.RasterXSize == 512
+    assert ds.RasterYSize == 256
     got_gt = ds.GetGeoTransform()
     expected_gt = (-90, 0.3515625, 0.0, 90.0, 0.0, -0.3515625)
     for i in range(6):
-        if abs(got_gt[i] - expected_gt[i]) > 1e-8:
-            print(got_gt)
-            return 'fail'
-    if ds.GetProjectionRef().find('4326') < 0 or ds.GetProjectionRef().find('AXIS') >= 0:
-        print(ds.GetProjectionRef())
-        return 'fail'
+        assert abs(got_gt[i] - expected_gt[i]) <= 1e-8
+    assert ds.GetProjectionRef().find('4326') >= 0 and ds.GetProjectionRef().find('AXIS') < 0
 
     return 'success'
 
@@ -1177,23 +1074,14 @@ def test_wmts_18():
 </Capabilities>""")
 
     ds = gdal.Open('WMTS:/vsimem/wmts_18.xml')
-    if ds is None:
-        return 'fail'
-    if ds.RasterXSize != 512:
-        print(ds.RasterXSize)
-        return 'fail'
-    if ds.RasterYSize != 256:
-        print(ds.RasterYSize)
-        return 'fail'
+    assert ds is not None
+    assert ds.RasterXSize == 512
+    assert ds.RasterYSize == 256
     got_gt = ds.GetGeoTransform()
     expected_gt = (-90, 0.3515625, 0.0, 90.0, 0.0, -0.3515625)
     for i in range(6):
-        if abs(got_gt[i] - expected_gt[i]) > 1e-8:
-            print(got_gt)
-            return 'fail'
-    if ds.GetProjectionRef().find('4326') < 0 or ds.GetProjectionRef().find('AXIS') >= 0:
-        print(ds.GetProjectionRef())
-        return 'fail'
+        assert abs(got_gt[i] - expected_gt[i]) <= 1e-8
+    assert ds.GetProjectionRef().find('4326') >= 0 and ds.GetProjectionRef().find('AXIS') < 0
 
     return 'success'
 
@@ -1267,23 +1155,14 @@ def test_wmts_19():
 </Capabilities>""")
 
     ds = gdal.Open('WMTS:/vsimem/wmts_19.xml')
-    if ds is None:
-        return 'fail'
-    if ds.RasterXSize != 512:
-        print(ds.RasterXSize)
-        return 'fail'
-    if ds.RasterYSize != 256:
-        print(ds.RasterYSize)
-        return 'fail'
+    assert ds is not None
+    assert ds.RasterXSize == 512
+    assert ds.RasterYSize == 256
     got_gt = ds.GetGeoTransform()
     expected_gt = (-90, 0.3515625, 0.0, 90.0, 0.0, -0.3515625)
     for i in range(6):
-        if abs(got_gt[i] - expected_gt[i]) > 1e-8:
-            print(got_gt)
-            return 'fail'
-    if ds.GetProjectionRef().find('4326') < 0 or ds.GetProjectionRef().find('AXIS') >= 0:
-        print(ds.GetProjectionRef())
-        return 'fail'
+        assert abs(got_gt[i] - expected_gt[i]) <= 1e-8
+    assert ds.GetProjectionRef().find('4326') >= 0 and ds.GetProjectionRef().find('AXIS') < 0
 
     return 'success'
 
@@ -1361,23 +1240,14 @@ def test_wmts_20():
 </Capabilities>""")
 
     ds = gdal.Open('WMTS:/vsimem/wmts_20.xml')
-    if ds is None:
-        return 'fail'
-    if ds.RasterXSize != 512:
-        print(ds.RasterXSize)
-        return 'fail'
-    if ds.RasterYSize != 256:
-        print(ds.RasterYSize)
-        return 'fail'
+    assert ds is not None
+    assert ds.RasterXSize == 512
+    assert ds.RasterYSize == 256
     got_gt = ds.GetGeoTransform()
     expected_gt = (-90, 0.3515625, 0.0, 90.0, 0.0, -0.3515625)
     for i in range(6):
-        if abs(got_gt[i] - expected_gt[i]) > 1e-8:
-            print(got_gt)
-            return 'fail'
-    if ds.GetProjectionRef().find('4326') < 0 or ds.GetProjectionRef().find('AXIS') >= 0:
-        print(ds.GetProjectionRef())
-        return 'fail'
+        assert abs(got_gt[i] - expected_gt[i]) <= 1e-8
+    assert ds.GetProjectionRef().find('4326') >= 0 and ds.GetProjectionRef().find('AXIS') < 0
 
     return 'success'
 
@@ -1451,23 +1321,14 @@ def test_wmts_21():
 </Capabilities>""")
 
     ds = gdal.Open('WMTS:/vsimem/wmts_21.xml,extendbeyonddateline=yes')
-    if ds is None:
-        return 'fail'
-    if ds.RasterXSize != 512:
-        print(ds.RasterXSize)
-        return 'fail'
-    if ds.RasterYSize != 256:
-        print(ds.RasterYSize)
-        return 'fail'
+    assert ds is not None
+    assert ds.RasterXSize == 512
+    assert ds.RasterYSize == 256
     got_gt = ds.GetGeoTransform()
     expected_gt = (90, 0.3515625, 0.0, 0.0, 0.0, -0.3515625)
     for i in range(6):
-        if abs(got_gt[i] - expected_gt[i]) > 1e-8:
-            print(got_gt)
-            return 'fail'
-    if ds.GetProjectionRef().find('4326') < 0 or ds.GetProjectionRef().find('AXIS') >= 0:
-        print(ds.GetProjectionRef())
-        return 'fail'
+        assert abs(got_gt[i] - expected_gt[i]) <= 1e-8
+    assert ds.GetProjectionRef().find('4326') >= 0 and ds.GetProjectionRef().find('AXIS') < 0
 
     tmp_ds = gdal.GetDriverByName('MEM').Create('', 256, 256, 4)
     for i in range(4):
@@ -1479,11 +1340,9 @@ def test_wmts_21():
         tmp_ds.GetRasterBand(i + 1).Fill(128)
     tmp0_ds = gdal.GetDriverByName('PNG').CreateCopy('/vsimem/wmts_21/default_style/tms/GoogleCRS84Quad:2/1/0.png', tmp_ds)
 
-    if ds.GetRasterBand(1).ReadRaster(0, 0, 256, 256) != tmp3_ds.GetRasterBand(1).ReadRaster(0, 0, 256, 256):
-        return 'fail'
+    assert ds.GetRasterBand(1).ReadRaster(0, 0, 256, 256) == tmp3_ds.GetRasterBand(1).ReadRaster(0, 0, 256, 256)
 
-    if ds.GetRasterBand(1).ReadRaster(256, 0, 256, 256) != tmp0_ds.GetRasterBand(1).ReadRaster(0, 0, 256, 256):
-        return 'fail'
+    assert ds.GetRasterBand(1).ReadRaster(256, 0, 256, 256) == tmp0_ds.GetRasterBand(1).ReadRaster(0, 0, 256, 256)
 
     return 'success'
 
@@ -1534,23 +1393,14 @@ def test_wmts_22():
 </Capabilities>""")
 
     ds = gdal.Open('WMTS:/vsimem/wmts_22.xml')
-    if ds is None:
-        return 'fail'
-    if ds.RasterXSize != 2097152:
-        print(ds.RasterXSize)
-        return 'fail'
-    if ds.RasterYSize != 2097152:
-        print(ds.RasterYSize)
-        return 'fail'
+    assert ds is not None
+    assert ds.RasterXSize == 2097152
+    assert ds.RasterYSize == 2097152
     got_gt = ds.GetGeoTransform()
     expected_gt = (-548576.0, 1.0000000000004, 0.0, 8388608.0, 0.0, -1.0000000000004)
     for i in range(6):
-        if abs(got_gt[i] - expected_gt[i]) > 1e-8:
-            print(got_gt)
-            return 'fail'
-    if ds.GetProjectionRef().find('3067') < 0:
-        print(ds.GetProjectionRef())
-        return 'fail'
+        assert abs(got_gt[i] - expected_gt[i]) <= 1e-8
+    assert ds.GetProjectionRef().find('3067') >= 0
 
     return 'success'
 ###############################################################################
@@ -1593,31 +1443,20 @@ def wmts_23(imagetype, expected_cs):
 </Capabilities>""")
 
     tmp_ds = gdal.Open('data/wms/' + imagetype + '.png')
-    if tmp_ds is None:
-        gdaltest.post_reason('fail - cannot open tmp_ds')
-        return 'fail'
+    assert tmp_ds is not None, 'fail - cannot open tmp_ds'
 
     tile0_ds = gdal.GetDriverByName('PNG').CreateCopy(serviceUrl + '/0/0/0.png', tmp_ds)
-    if tile0_ds is None:
-        gdaltest.post_reason('fail - cannot create tile0')
-        return 'fail'
+    assert tile0_ds is not None, 'fail - cannot create tile0'
 
     ds = gdal.Open('WMTS:' + inputXml)
-    if ds is None:
-        return 'fail'
+    assert ds is not None
 
-    if ds.RasterXSize != 128:
-        print(ds.RasterXSize)
-        return 'fail'
-    if ds.RasterYSize != 128:
-        print(ds.RasterYSize)
-        return 'fail'
+    assert ds.RasterXSize == 128
+    assert ds.RasterYSize == 128
 
     for i in range(4):
         cs = ds.GetRasterBand(i + 1).Checksum()
-        if cs != expected_cs[i]:
-            print(cs)
-            return 'fail'
+        assert cs == expected_cs[i]
 
     return 'success'
 
@@ -1691,8 +1530,7 @@ def test_wmts_invalid_global_to_tm_reprojection():
 </Capabilities>""")
 
     ds = gdal.Open('WMTS:' + inputXml)
-    if ds.RasterXSize != 512 or ds.RasterYSize != 1024:
-        return 'fail'
+    assert ds.RasterXSize == 512 and ds.RasterYSize == 1024
     ds = None
 
     gdal.Unlink(inputXml)
@@ -1959,13 +1797,9 @@ def test_wmts_check_no_overflow_zoom_level():
 </Capabilities>""")
 
     ds = gdal.Open(inputXml)
-    if ds.RasterXSize != 1073741766 or ds.RasterYSize != 1070224430:
-        print(ds.RasterXSize, ds.RasterYSize)
-        return 'fail'
+    assert ds.RasterXSize == 1073741766 and ds.RasterYSize == 1070224430
     count_levels = 1 + ds.GetRasterBand(1).GetOverviewCount()
-    if count_levels != 23: # there are 24 in total, but we discard the one labelled 23
-        print(count_levels)
-        return 'fail'
+    assert count_levels == 23
     ds = None
 
     gdal.Unlink(inputXml)
diff --git a/autotest/gdrivers/xyz.py b/autotest/gdrivers/xyz.py
index 8950ccf20537..aaee59699139 100755
--- a/autotest/gdrivers/xyz.py
+++ b/autotest/gdrivers/xyz.py
@@ -57,9 +57,7 @@ def test_xyz_2():
     expected_cs = src_ds.GetRasterBand(1).Checksum()
     ds = None
     gdal.GetDriverByName('XYZ').Delete('tmp/float.xyz')
-    if got_cs != expected_cs and got_cs != 24387:
-        print(got_cs)
-        return 'fail'
+    assert got_cs == expected_cs or got_cs == 24387
     return 'success'
 
 ###############################################################################
@@ -85,21 +83,13 @@ def test_xyz_3():
     gdal.FileFromMemBuffer('/vsimem/grid.xyz', content)
     ds = gdal.Open('/vsimem/grid.xyz')
     buf = ds.ReadRaster(0, 2, 2, 1)
-    if struct.unpack('B' * 2, buf) != (69, 70):
-        print(buf)
-        return 'fail'
+    assert struct.unpack('B' * 2, buf) == (69, 70)
     buf = ds.ReadRaster(0, 1, 2, 1)
-    if struct.unpack('B' * 2, buf) != (67, 68):
-        print(buf)
-        return 'fail'
+    assert struct.unpack('B' * 2, buf) == (67, 68)
     buf = ds.ReadRaster(0, 0, 2, 1)
-    if struct.unpack('B' * 2, buf) != (65, 66):
-        print(buf)
-        return 'fail'
+    assert struct.unpack('B' * 2, buf) == (65, 66)
     buf = ds.ReadRaster(0, 2, 2, 1)
-    if struct.unpack('B' * 2, buf) != (69, 70):
-        print(buf)
-        return 'fail'
+    assert struct.unpack('B' * 2, buf) == (69, 70)
     ds = None
     gdal.Unlink('/vsimem/grid.xyz')
     return 'success'
@@ -133,20 +123,13 @@ def test_xyz_4():
     got_gt = ds.GetGeoTransform()
     expected_gt = (440660.0, 60.0, 0.0, 3751350.0, 0.0, -120.0)
     for i in range(6):
-        if abs(got_gt[i] - expected_gt[i]) > 1e-5:
-            print(got_gt)
-            print(expected_gt)
-            return 'fail'
-
-    if ds.GetRasterBand(1).GetMinimum() != 1:
-        return 'fail'
-    if ds.GetRasterBand(1).GetMaximum() != 7:
-        return 'fail'
-    if ds.GetRasterBand(1).GetNoDataValue() != 0:
-        return 'fail'
+        assert abs(got_gt[i] - expected_gt[i]) <= 1e-5
+
+    assert ds.GetRasterBand(1).GetMinimum() == 1
+    assert ds.GetRasterBand(1).GetMaximum() == 7
+    assert ds.GetRasterBand(1).GetNoDataValue() == 0
     for i in [0, 1, 2, 1, 0, 2, 0, 2, 0, 1, 2]:
-        if not xyz_4_checkline(ds, i, expected[i]):
-            return 'fail'
+        assert xyz_4_checkline(ds, i, expected[i])
     ds = None
     gdal.Unlink('/vsimem/grid.xyz')
     return 'success'
@@ -167,18 +150,14 @@ def test_xyz_5():
     gdal.FileFromMemBuffer('/vsimem/grid.xyz', content)
 
     ds = gdal.Open('/vsimem/grid.xyz')
-    if ds.RasterXSize != 3 or ds.RasterYSize != 2:
-        return 'fail'
+    assert ds.RasterXSize == 3 and ds.RasterYSize == 2
     got_gt = ds.GetGeoTransform()
     expected_gt = (-0.25, 0.5, 0.0, 0.5, 0.0, 1.0)
     ds = None
     gdal.Unlink('/vsimem/grid.xyz')
 
     for i in range(6):
-        if abs(got_gt[i] - expected_gt[i]) > 1e-5:
-            print(got_gt)
-            print(expected_gt)
-            return 'fail'
+        assert abs(got_gt[i] - expected_gt[i]) <= 1e-5
 
     return 'success'
 
@@ -198,18 +177,14 @@ def test_xyz_6():
     gdal.FileFromMemBuffer('/vsimem/grid.xyz', content)
 
     ds = gdal.Open('/vsimem/grid.xyz')
-    if ds.RasterXSize != 3 or ds.RasterYSize != 2:
-        return 'fail'
+    assert ds.RasterXSize == 3 and ds.RasterYSize == 2
     got_gt = ds.GetGeoTransform()
     expected_gt = (-0.25, 0.5, 0.0, 0.5, 0.0, 1.0)
     ds = None
     gdal.Unlink('/vsimem/grid.xyz')
 
     for i in range(6):
-        if abs(got_gt[i] - expected_gt[i]) > 1e-5:
-            print(got_gt)
-            print(expected_gt)
-            return 'fail'
+        assert abs(got_gt[i] - expected_gt[i]) <= 1e-5
 
     return 'success'
 
@@ -239,8 +214,7 @@ def test_xyz_7():
     gdal.FileFromMemBuffer('/vsimem/grid.xyz', content)
 
     ds = gdal.Open('/vsimem/grid.xyz')
-    if ds.RasterXSize != 3 or ds.RasterYSize != 5:
-        return 'fail'
+    assert ds.RasterXSize == 3 and ds.RasterYSize == 5
     got_gt = ds.GetGeoTransform()
     expected_gt = (354.46666625, 0.0333335, 0.0, 51.5125, 0.0, -0.025)
     cs = ds.GetRasterBand(1).Checksum()
@@ -248,14 +222,9 @@ def test_xyz_7():
     gdal.Unlink('/vsimem/grid.xyz')
 
     for i in range(6):
-        if abs(got_gt[i] - expected_gt[i]) > 1e-8:
-            print(got_gt)
-            print(expected_gt)
-            return 'fail'
+        assert abs(got_gt[i] - expected_gt[i]) <= 1e-8
 
-    if cs != 146:
-        print(cs)
-        return 'fail'
+    assert cs == 146
 
     return 'success'
 
@@ -274,15 +243,12 @@ def test_xyz_8():
     gdal.FileFromMemBuffer('/vsimem/grid.xyz', content)
 
     ds = gdal.Open('/vsimem/grid.xyz')
-    if ds.RasterXSize != 4 or ds.RasterYSize != 2:
-        return 'fail'
+    assert ds.RasterXSize == 4 and ds.RasterYSize == 2
     cs = ds.GetRasterBand(1).Checksum()
     ds = None
     gdal.Unlink('/vsimem/grid.xyz')
 
-    if cs != 35:
-        print(cs)
-        return 'fail'
+    assert cs == 35
 
     return 'success'
 
diff --git a/autotest/gnm/gnm_test.py b/autotest/gnm/gnm_test.py
index 814368305e37..aa1e111d9df5 100755
--- a/autotest/gnm/gnm_test.py
+++ b/autotest/gnm/gnm_test.py
@@ -63,17 +63,11 @@ def test_gnm_filenetwork_create():
     ds = ogrtest.drv.Create('tmp/', 0, 0, 0, gdal.GDT_Unknown, options=['net_name=test_gnm', 'net_description=Test file based GNM', 'net_srs=EPSG:4326'])
     # cast to GNM
     dn = gnm.CastToNetwork(ds)
-    if dn is None:
-        return 'fail'
-    if dn.GetVersion() != 100:
-        gdaltest.post_reason('GNM: Check GNM version failed')
-        return 'fail'
-    if dn.GetName() != 'test_gnm':
-        gdaltest.post_reason('GNM: Check GNM name failed')
-        return 'fail'
-    if dn.GetDescription() != 'Test file based GNM':
-        gdaltest.post_reason('GNM: Check GNM description failed')
-        return 'fail'
+    assert dn is not None
+    assert dn.GetVersion() == 100, 'GNM: Check GNM version failed'
+    assert dn.GetName() == 'test_gnm', 'GNM: Check GNM name failed'
+    assert dn.GetDescription() == 'Test file based GNM', \
+        'GNM: Check GNM description failed'
 
     dn = None
     ogrtest.have_gnm = 1
@@ -91,17 +85,11 @@ def test_gnm_filenetwork_open():
     ds = gdal.OpenEx('tmp/test_gnm')
     # cast to GNM
     dn = gnm.CastToNetwork(ds)
-    if dn is None:
-        return 'fail'
-    if dn.GetVersion() != 100:
-        gdaltest.post_reason('GNM: Check GNM version failed')
-        return 'fail'
-    if dn.GetName() != 'test_gnm':
-        gdaltest.post_reason('GNM: Check GNM name failed')
-        return 'fail'
-    if dn.GetDescription() != 'Test file based GNM':
-        gdaltest.post_reason('GNM: Check GNM description failed')
-        return 'fail'
+    assert dn is not None
+    assert dn.GetVersion() == 100, 'GNM: Check GNM version failed'
+    assert dn.GetName() == 'test_gnm', 'GNM: Check GNM name failed'
+    assert dn.GetDescription() == 'Test file based GNM', \
+        'GNM: Check GNM description failed'
 
     dn = None
     return 'success'
@@ -121,9 +109,7 @@ def test_gnm_import():
     dspipes = gdal.OpenEx('data/pipes.shp', gdal.OF_VECTOR)
     lyrpipes = dspipes.GetLayerByIndex(0)
     new_lyr = ds.CopyLayer(lyrpipes, 'pipes')
-    if new_lyr is None:
-        gdaltest.post_reason('failed to import pipes')
-        return 'fail'
+    assert new_lyr is not None, 'failed to import pipes'
     dspipes = None
     new_lyr = None
 
@@ -131,15 +117,11 @@ def test_gnm_import():
     dswells = gdal.OpenEx('data/wells.shp', gdal.OF_VECTOR)
     lyrwells = dswells.GetLayerByIndex(0)
     new_lyr = ds.CopyLayer(lyrwells, 'wells')
-    if new_lyr is None:
-        gdaltest.post_reason('failed to import wells')
-        return 'fail'
+    assert new_lyr is not None, 'failed to import wells'
     dswells = None
     new_lyr = None
 
-    if ds.GetLayerCount() != 2:
-        gdaltest.post_reason('expected 2 layers')
-        return 'fail'
+    assert ds.GetLayerCount() == 2, 'expected 2 layers'
 
     ds = None
     return 'success'
@@ -155,14 +137,10 @@ def test_gnm_autoconnect():
 
     ds = gdal.OpenEx('tmp/test_gnm')
     dgn = gnm.CastToGenericNetwork(ds)
-    if dgn is None:
-        gdaltest.post_reason('cast to GNMGenericNetwork failed')
-        return 'fail'
+    assert dgn is not None, 'cast to GNMGenericNetwork failed'
 
     ret = dgn.ConnectPointsByLines(['pipes', 'wells'], 0.000001, 1, 1, gnm.GNM_EDGE_DIR_BOTH)
-    if ret != 0:
-        gdaltest.post_reason('failed to connect')
-        return 'fail'
+    assert ret == 0, 'failed to connect'
 
     dgn = None
     return 'success'
@@ -178,14 +156,10 @@ def test_gnm_graph_dijkstra():
 
     ds = gdal.OpenEx('tmp/test_gnm')
     dn = gnm.CastToNetwork(ds)
-    if dn is None:
-        gdaltest.post_reason('cast to GNMNetwork failed')
-        return 'fail'
+    assert dn is not None, 'cast to GNMNetwork failed'
 
     lyr = dn.GetPath(61, 50, gnm.GATDijkstraShortestPath)
-    if lyr is None:
-        gdaltest.post_reason('failed to get path')
-        return 'fail'
+    assert lyr is not None, 'failed to get path'
 
     if lyr.GetFeatureCount() == 0:
         dn.ReleaseResultSet(lyr)
@@ -209,14 +183,10 @@ def test_gnm_graph_kshortest():
 
     ds = gdal.OpenEx('tmp/test_gnm')
     dn = gnm.CastToNetwork(ds)
-    if dn is None:
-        gdaltest.post_reason('cast to GNMNetwork failed')
-        return 'fail'
+    assert dn is not None, 'cast to GNMNetwork failed'
 
     lyr = dn.GetPath(61, 50, gnm.GATKShortestPath, options=['num_paths=3'])
-    if lyr is None:
-        gdaltest.post_reason('failed to get path')
-        return 'fail'
+    assert lyr is not None, 'failed to get path'
 
     if lyr.GetFeatureCount() < 20:
         dn.ReleaseResultSet(lyr)
@@ -238,14 +208,10 @@ def test_gnm_graph_connectedcomponents():
 
     ds = gdal.OpenEx('tmp/test_gnm')
     dn = gnm.CastToNetwork(ds)
-    if dn is None:
-        gdaltest.post_reason('cast to GNMNetwork failed')
-        return 'fail'
+    assert dn is not None, 'cast to GNMNetwork failed'
 
     lyr = dn.GetPath(61, 50, gnm.GATConnectedComponents)
-    if lyr is None:
-        gdaltest.post_reason('failed to get path')
-        return 'fail'
+    assert lyr is not None, 'failed to get path'
 
     if lyr.GetFeatureCount() == 0:
         dn.ReleaseResultSet(lyr)
diff --git a/autotest/ogr/ogr_arcgen.py b/autotest/ogr/ogr_arcgen.py
index 95183d8b90d0..9d724d2bf81a 100755
--- a/autotest/ogr/ogr_arcgen.py
+++ b/autotest/ogr/ogr_arcgen.py
@@ -42,22 +42,14 @@
 def test_ogr_arcgen_points():
 
     ds = ogr.Open('data/points.gen')
-    if ds is None:
-        gdaltest.post_reason('cannot open dataset')
-        return 'fail'
+    assert ds is not None, 'cannot open dataset'
 
-    if ds.GetLayerCount() != 1:
-        gdaltest.post_reason('bad layer count')
-        return 'fail'
+    assert ds.GetLayerCount() == 1, 'bad layer count'
 
     lyr = ds.GetLayer(0)
-    if lyr is None:
-        gdaltest.post_reason('cannot find layer')
-        return 'fail'
+    assert lyr is not None, 'cannot find layer'
 
-    if lyr.GetGeomType() != ogr.wkbPoint:
-        gdaltest.post_reason('bad layer geometry type')
-        return 'fail'
+    assert lyr.GetGeomType() == ogr.wkbPoint, 'bad layer geometry type'
 
     feat = lyr.GetNextFeature()
     if feat.GetField(0) != 1:
@@ -79,22 +71,14 @@ def test_ogr_arcgen_points():
 def test_ogr_arcgen_points25d():
 
     ds = ogr.Open('data/points25d.gen')
-    if ds is None:
-        gdaltest.post_reason('cannot open dataset')
-        return 'fail'
+    assert ds is not None, 'cannot open dataset'
 
-    if ds.GetLayerCount() != 1:
-        gdaltest.post_reason('bad layer count')
-        return 'fail'
+    assert ds.GetLayerCount() == 1, 'bad layer count'
 
     lyr = ds.GetLayer(0)
-    if lyr is None:
-        gdaltest.post_reason('cannot find layer')
-        return 'fail'
+    assert lyr is not None, 'cannot find layer'
 
-    if lyr.GetGeomType() != ogr.wkbPoint25D:
-        gdaltest.post_reason('bad layer geometry type')
-        return 'fail'
+    assert lyr.GetGeomType() == ogr.wkbPoint25D, 'bad layer geometry type'
 
     feat = lyr.GetNextFeature()
     if feat.GetField(0) != 1:
@@ -116,18 +100,12 @@ def test_ogr_arcgen_points25d():
 def test_ogr_arcgen_lines():
 
     ds = ogr.Open('data/lines.gen')
-    if ds is None:
-        gdaltest.post_reason('cannot open dataset')
-        return 'fail'
+    assert ds is not None, 'cannot open dataset'
 
     lyr = ds.GetLayer(0)
-    if lyr is None:
-        gdaltest.post_reason('cannot find layer')
-        return 'fail'
+    assert lyr is not None, 'cannot find layer'
 
-    if lyr.GetGeomType() != ogr.wkbLineString:
-        gdaltest.post_reason('bad layer geometry type')
-        return 'fail'
+    assert lyr.GetGeomType() == ogr.wkbLineString, 'bad layer geometry type'
 
     feat = lyr.GetNextFeature()
     if feat.GetField(0) != 1:
@@ -149,18 +127,12 @@ def test_ogr_arcgen_lines():
 def test_ogr_arcgen_lines25d():
 
     ds = ogr.Open('data/lines25d.gen')
-    if ds is None:
-        gdaltest.post_reason('cannot open dataset')
-        return 'fail'
+    assert ds is not None, 'cannot open dataset'
 
     lyr = ds.GetLayer(0)
-    if lyr is None:
-        gdaltest.post_reason('cannot find layer')
-        return 'fail'
+    assert lyr is not None, 'cannot find layer'
 
-    if lyr.GetGeomType() != ogr.wkbLineString25D:
-        gdaltest.post_reason('bad layer geometry type')
-        return 'fail'
+    assert lyr.GetGeomType() == ogr.wkbLineString25D, 'bad layer geometry type'
 
     feat = lyr.GetNextFeature()
     if feat.GetField(0) != 1:
@@ -182,18 +154,12 @@ def test_ogr_arcgen_lines25d():
 def test_ogr_arcgen_polygons():
 
     ds = ogr.Open('data/polygons.gen')
-    if ds is None:
-        gdaltest.post_reason('cannot open dataset')
-        return 'fail'
+    assert ds is not None, 'cannot open dataset'
 
     lyr = ds.GetLayer(0)
-    if lyr is None:
-        gdaltest.post_reason('cannot find layer')
-        return 'fail'
+    assert lyr is not None, 'cannot find layer'
 
-    if lyr.GetGeomType() != ogr.wkbPolygon:
-        gdaltest.post_reason('bad layer geometry type')
-        return 'fail'
+    assert lyr.GetGeomType() == ogr.wkbPolygon, 'bad layer geometry type'
 
     feat = lyr.GetNextFeature()
     if feat.GetField(0) != 1:
@@ -215,18 +181,12 @@ def test_ogr_arcgen_polygons():
 def test_ogr_arcgen_polygons25d():
 
     ds = ogr.Open('data/polygons25d.gen')
-    if ds is None:
-        gdaltest.post_reason('cannot open dataset')
-        return 'fail'
+    assert ds is not None, 'cannot open dataset'
 
     lyr = ds.GetLayer(0)
-    if lyr is None:
-        gdaltest.post_reason('cannot find layer')
-        return 'fail'
+    assert lyr is not None, 'cannot find layer'
 
-    if lyr.GetGeomType() != ogr.wkbPolygon25D:
-        gdaltest.post_reason('bad layer geometry type')
-        return 'fail'
+    assert lyr.GetGeomType() == ogr.wkbPolygon25D, 'bad layer geometry type'
 
     feat = lyr.GetNextFeature()
     if feat.GetField(0) != 1:
diff --git a/autotest/ogr/ogr_avc.py b/autotest/ogr/ogr_avc.py
index ac54d0357e29..2fe3b07e861c 100755
--- a/autotest/ogr/ogr_avc.py
+++ b/autotest/ogr/ogr_avc.py
@@ -46,15 +46,13 @@ def check_content(ds):
     expect = ['1', '2', '3', '4', '5', '6', '7']
 
     tr = ogrtest.check_features_against_list(lyr, 'UserID', expect)
-    if not tr:
-        return 'fail'
+    assert tr
 
     lyr.ResetReading()
 
     feat = lyr.GetNextFeature()
-    if ogrtest.check_feature_geometry(feat, 'LINESTRING (340099.875 4100200.0,340400.0625 4100399.5,340900.125 4100200.0,340700.03125 4100199.5)',
-                                      max_error=0.01) != 0:
-        return 'fail'
+    assert (ogrtest.check_feature_geometry(feat, 'LINESTRING (340099.875 4100200.0,340400.0625 4100399.5,340900.125 4100200.0,340700.03125 4100199.5)',
+                                      max_error=0.01) == 0)
 
     return 'success'
 
@@ -66,9 +64,7 @@ def test_ogr_avc_1():
 
     # Example given at Annex A of http://avce00.maptools.org/docs/v7_e00_cover.html
     avc_ds = ogr.Open('data/test.e00')
-    if avc_ds.GetLayer(0).GetSpatialRef() is None:
-        gdaltest.post_reason('expected SRS')
-        return 'fail'
+    assert avc_ds.GetLayer(0).GetSpatialRef() is not None, 'expected SRS'
 
     if avc_ds is not None:
         return check_content(avc_ds)
@@ -81,9 +77,7 @@ def test_ogr_avc_1():
 def test_ogr_avc_2():
 
     avc_ds = ogr.Open('data/testavc/testavc')
-    if avc_ds.GetLayer(0).GetSpatialRef() is None:
-        gdaltest.post_reason('expected SRS')
-        return 'fail'
+    assert avc_ds.GetLayer(0).GetSpatialRef() is not None, 'expected SRS'
 
     if avc_ds is not None:
         return check_content(avc_ds)
@@ -100,13 +94,9 @@ def test_ogr_avc_3():
     gdal.PopErrorHandler()
     last_error_msg = gdal.GetLastErrorMsg()
 
-    if avc_ds is not None:
-        gdaltest.post_reason('expected failure')
-        return 'fail'
+    assert avc_ds is None, 'expected failure'
 
-    if last_error_msg == '':
-        gdaltest.post_reason('expected error message')
-        return 'fail'
+    assert last_error_msg != '', 'expected error message'
 
     return 'success'
 
@@ -124,15 +114,9 @@ def test_ogr_avc_4():
         for f in lyr:
             count += 1
             last_feature = f
-        if count != 80:
-            print(filename)
-            print(count)
-            return 'fail'
+        assert count == 80, filename
         count = lyr.GetFeatureCount()
-        if count != 80:
-            print(filename)
-            print(count)
-            return 'fail'
+        assert count == 80, filename
         if last_feature.GetFieldCount() != 7:
             print(filename)
             f.DumpReadable()
@@ -162,15 +146,9 @@ def test_ogr_avc_5():
         for f in lyr:
             count += 1
             last_feature = f
-        if count != 3:
-            print(filename)
-            print(count)
-            return 'fail'
+        assert count == 3, filename
         count = lyr.GetFeatureCount()
-        if count != 3:
-            print(filename)
-            print(count)
-            return 'fail'
+        assert count == 3, filename
         if last_feature.GetFieldCount() != 5:
             print(filename)
             f.DumpReadable()
diff --git a/autotest/ogr/ogr_basic_test.py b/autotest/ogr/ogr_basic_test.py
index 3b808af98df7..b9e970df3a97 100755
--- a/autotest/ogr/ogr_basic_test.py
+++ b/autotest/ogr/ogr_basic_test.py
@@ -43,8 +43,7 @@ def test_ogr_basic_1():
 
     gdaltest.ds = ogr.Open('data/poly.shp')
 
-    if gdaltest.ds is None:
-        return 'fail'
+    assert gdaltest.ds is not None
 
     return 'success'
 
@@ -56,20 +55,15 @@ def test_ogr_basic_2():
 
     gdaltest.lyr = gdaltest.ds.GetLayerByName('poly')
 
-    if gdaltest.lyr.GetName() != 'poly':
-        return 'fail'
-    if gdaltest.lyr.GetGeomType() != ogr.wkbPolygon:
-        return 'fail'
+    assert gdaltest.lyr.GetName() == 'poly'
+    assert gdaltest.lyr.GetGeomType() == ogr.wkbPolygon
 
-    if gdaltest.lyr.GetLayerDefn().GetName() != 'poly':
-        return 'fail'
-    if gdaltest.lyr.GetLayerDefn().GetGeomType() != ogr.wkbPolygon:
-        return 'fail'
+    assert gdaltest.lyr.GetLayerDefn().GetName() == 'poly'
+    assert gdaltest.lyr.GetLayerDefn().GetGeomType() == ogr.wkbPolygon
 
     count = gdaltest.lyr.GetFeatureCount()
-    if count != 10:
-        gdaltest.post_reason('Got wrong count with GetFeatureCount() - %d, expecting 10' % count)
-        return 'fail'
+    assert count == 10, \
+        ('Got wrong count with GetFeatureCount() - %d, expecting 10' % count)
 
     # Now actually iterate through counting the features and ensure they agree.
     gdaltest.lyr.ResetReading()
@@ -80,9 +74,8 @@ def test_ogr_basic_2():
         count2 = count2 + 1
         feat = gdaltest.lyr.GetNextFeature()
 
-    if count2 != 10:
-        gdaltest.post_reason('Got wrong count with GetNextFeature() - %d, expecting 10' % count2)
-        return 'fail'
+    assert count2 == 10, \
+        ('Got wrong count with GetNextFeature() - %d, expecting 10' % count2)
 
     return 'success'
 
@@ -115,22 +108,19 @@ def test_ogr_basic_3():
     gdaltest.lyr.ResetReading()
 
     count = gdaltest.lyr.GetFeatureCount()
-    if count != 1:
-        gdaltest.post_reason('Got wrong feature count with spatial filter, expected 1, got %d' % count)
-        return 'fail'
+    assert count == 1, \
+        ('Got wrong feature count with spatial filter, expected 1, got %d' % count)
 
     feat1 = gdaltest.lyr.GetNextFeature()
     feat2 = gdaltest.lyr.GetNextFeature()
 
-    if feat1 is None or feat2 is not None:
-        gdaltest.post_reason('Got too few or too many features with spatial filter.')
-        return 'fail'
+    assert feat1 is not None and feat2 is None, \
+        'Got too few or too many features with spatial filter.'
 
     gdaltest.lyr.SetSpatialFilter(None)
     count = gdaltest.lyr.GetFeatureCount()
-    if count != 10:
-        gdaltest.post_reason('Clearing spatial query may not have worked properly, getting\n%d features instead of expected 10 features.' % count)
-        return 'fail'
+    assert count == 10, \
+        ('Clearing spatial query may not have worked properly, getting\n%d features instead of expected 10 features.' % count)
 
     return 'success'
 
@@ -140,13 +130,10 @@ def test_ogr_basic_3():
 
 def test_ogr_basic_4():
     driver = gdaltest.ds.GetDriver()
-    if driver is None:
-        gdaltest.post_reason('GetDriver() returns None')
-        return 'fail'
+    assert driver is not None, 'GetDriver() returns None'
 
-    if driver.GetName() != 'ESRI Shapefile':
-        gdaltest.post_reason('Got wrong driver name: ' + driver.GetName())
-        return 'fail'
+    assert driver.GetName() == 'ESRI Shapefile', \
+        ('Got wrong driver name: ' + driver.GetName())
 
     return 'success'
 
@@ -164,13 +151,9 @@ def test_ogr_basic_5():
 
     gdaltest.lyr.SetAttributeFilter(None)
 
-    if feat1 is None or feat2 is not None:
-        gdaltest.post_reason('unexpected result count.')
-        return 'fail'
+    assert feat1 is not None and feat2 is None, 'unexpected result count.'
 
-    if feat1.GetFID() != 3:
-        gdaltest.post_reason('got wrong feature.')
-        return 'fail'
+    assert feat1.GetFID() == 3, 'got wrong feature.'
 
     return 'success'
 
@@ -180,11 +163,9 @@ def test_ogr_basic_5():
 def test_ogr_basic_6():
 
     # Put inside try/except for OG python bindings
-    if ogr.Open('') is not None:
-        return 'fail'
+    assert ogr.Open('') is None
 
-    if ogr.Open('non_existing') is not None:
-        return 'fail'
+    assert ogr.Open('non_existing') is None
 
     return 'success'
 
@@ -196,8 +177,7 @@ def test_ogr_basic_7():
 
     feat_defn = ogr.FeatureDefn()
     feat = ogr.Feature(feat_defn)
-    if not feat.Equal(feat):
-        return 'fail'
+    assert feat.Equal(feat)
 
     try:
         feat.SetFieldIntegerList
@@ -205,8 +185,7 @@ def test_ogr_basic_7():
         return 'skip'
 
     feat_clone = feat.Clone()
-    if not feat.Equal(feat_clone):
-        return 'fail'
+    assert feat.Equal(feat_clone)
 
     # We MUST delete now as we are changing the feature defn afterwards!
     # Crash guaranteed otherwise
@@ -420,9 +399,7 @@ def test_ogr_basic_9():
                        ]
 
     for geom_type_tuple in geom_type_tuples:
-        if ogr.GeometryTypeToName(geom_type_tuple[0]) != geom_type_tuple[1]:
-            print('Got %s, expected %s' % (ogr.GeometryTypeToName(geom_type_tuple[0]), geom_type_tuple[1]))
-            return 'fail'
+        assert ogr.GeometryTypeToName(geom_type_tuple[0]) == geom_type_tuple[1]
 
     return 'success'
 
@@ -438,9 +415,7 @@ def test_ogr_basic_10():
 
     ret = gdaltest.runexternal(test_cli_utilities.get_test_ogrsf_path() + ' -all_drivers')
 
-    if ret.find('INFO') == -1 or ret.find('ERROR') != -1:
-        print(ret)
-        return 'fail'
+    assert ret.find('INFO') != -1 and ret.find('ERROR') == -1
 
     return 'success'
 
@@ -472,12 +447,10 @@ def test_ogr_basic_12():
 
     # boolean integer
     feat_def = ogr.FeatureDefn()
-    if ogr.GetFieldSubTypeName(ogr.OFSTBoolean) != 'Boolean':
-        return 'fail'
+    assert ogr.GetFieldSubTypeName(ogr.OFSTBoolean) == 'Boolean'
     field_def = ogr.FieldDefn('fld', ogr.OFTInteger)
     field_def.SetSubType(ogr.OFSTBoolean)
-    if field_def.GetSubType() != ogr.OFSTBoolean:
-        return 'fail'
+    assert field_def.GetSubType() == ogr.OFSTBoolean
     feat_def.AddFieldDefn(field_def)
 
     f = ogr.Feature(feat_def)
@@ -487,10 +460,8 @@ def test_ogr_basic_12():
     gdal.PushErrorHandler('CPLQuietErrorHandler')
     f.SetField('fld', 2)
     gdal.PopErrorHandler()
-    if gdal.GetLastErrorMsg() == '':
-        return 'fail'
-    if f.GetField('fld') != 1:
-        return 'fail'
+    assert gdal.GetLastErrorMsg() != ''
+    assert f.GetField('fld') == 1
 
     f.SetField('fld', '0')
     f.SetField('fld', '1')
@@ -498,27 +469,22 @@ def test_ogr_basic_12():
     gdal.PushErrorHandler('CPLQuietErrorHandler')
     f.SetField('fld', '2')
     gdal.PopErrorHandler()
-    if gdal.GetLastErrorMsg() == '':
-        return 'fail'
-    if f.GetField('fld') != 1:
-        return 'fail'
+    assert gdal.GetLastErrorMsg() != ''
+    assert f.GetField('fld') == 1
 
     gdal.ErrorReset()
     gdal.PushErrorHandler('CPLQuietErrorHandler')
     field_def = ogr.FieldDefn('fld', ogr.OFTString)
     field_def.SetSubType(ogr.OFSTBoolean)
     gdal.PopErrorHandler()
-    if gdal.GetLastErrorMsg() == '':
-        return 'fail'
-    if field_def.GetSubType() != ogr.OFSTNone:
-        return 'fail'
+    assert gdal.GetLastErrorMsg() != ''
+    assert field_def.GetSubType() == ogr.OFSTNone
 
     # boolean list
     feat_def = ogr.FeatureDefn()
     field_def = ogr.FieldDefn('fld', ogr.OFTIntegerList)
     field_def.SetSubType(ogr.OFSTBoolean)
-    if field_def.GetSubType() != ogr.OFSTBoolean:
-        return 'fail'
+    assert field_def.GetSubType() == ogr.OFSTBoolean
     feat_def.AddFieldDefn(field_def)
 
     f = ogr.Feature(feat_def)
@@ -527,20 +493,15 @@ def test_ogr_basic_12():
     gdal.PushErrorHandler('CPLQuietErrorHandler')
     f.SetFieldIntegerList(0, [0, 1, 2, 1])
     gdal.PopErrorHandler()
-    if gdal.GetLastErrorMsg() == '':
-        return 'fail'
-    if f.GetField('fld') != [0, 1, 1, 1]:
-        print(f.GetField('fld'))
-        return 'fail'
+    assert gdal.GetLastErrorMsg() != ''
+    assert f.GetField('fld') == [0, 1, 1, 1]
 
     # int16 integer
     feat_def = ogr.FeatureDefn()
-    if ogr.GetFieldSubTypeName(ogr.OFSTInt16) != 'Int16':
-        return 'fail'
+    assert ogr.GetFieldSubTypeName(ogr.OFSTInt16) == 'Int16'
     field_def = ogr.FieldDefn('fld', ogr.OFTInteger)
     field_def.SetSubType(ogr.OFSTInt16)
-    if field_def.GetSubType() != ogr.OFSTInt16:
-        return 'fail'
+    assert field_def.GetSubType() == ogr.OFSTInt16
     feat_def.AddFieldDefn(field_def)
 
     f = ogr.Feature(feat_def)
@@ -550,51 +511,41 @@ def test_ogr_basic_12():
     gdal.PushErrorHandler('CPLQuietErrorHandler')
     f.SetField('fld', -32769)
     gdal.PopErrorHandler()
-    if gdal.GetLastErrorMsg() == '':
-        return 'fail'
-    if f.GetField('fld') != -32768:
-        return 'fail'
+    assert gdal.GetLastErrorMsg() != ''
+    assert f.GetField('fld') == -32768
     gdal.ErrorReset()
     gdal.PushErrorHandler('CPLQuietErrorHandler')
     f.SetField('fld', 32768)
     gdal.PopErrorHandler()
-    if gdal.GetLastErrorMsg() == '':
-        return 'fail'
-    if f.GetField('fld') != 32767:
-        return 'fail'
+    assert gdal.GetLastErrorMsg() != ''
+    assert f.GetField('fld') == 32767
 
     gdal.ErrorReset()
     gdal.PushErrorHandler('CPLQuietErrorHandler')
     field_def = ogr.FieldDefn('fld', ogr.OFTString)
     field_def.SetSubType(ogr.OFSTInt16)
     gdal.PopErrorHandler()
-    if gdal.GetLastErrorMsg() == '':
-        return 'fail'
-    if field_def.GetSubType() != ogr.OFSTNone:
-        return 'fail'
+    assert gdal.GetLastErrorMsg() != ''
+    assert field_def.GetSubType() == ogr.OFSTNone
 
     # float32
     feat_def = ogr.FeatureDefn()
-    if ogr.GetFieldSubTypeName(ogr.OFSTFloat32) != 'Float32':
-        return 'fail'
+    assert ogr.GetFieldSubTypeName(ogr.OFSTFloat32) == 'Float32'
     field_def = ogr.FieldDefn('fld', ogr.OFTReal)
     field_def.SetSubType(ogr.OFSTFloat32)
-    if field_def.GetSubType() != ogr.OFSTFloat32:
-        return 'fail'
+    assert field_def.GetSubType() == ogr.OFSTFloat32
     feat_def.AddFieldDefn(field_def)
 
     if False:  # pylint: disable=using-constant-test
         f = ogr.Feature(feat_def)
         gdal.ErrorReset()
         f.SetField('fld', '1.23')
-        if gdal.GetLastErrorMsg() != '':
-            return 'fail'
+        assert gdal.GetLastErrorMsg() == ''
         gdal.ErrorReset()
         gdal.PushErrorHandler('CPLQuietErrorHandler')
         f.SetField('fld', 1.230000000001)
         gdal.PopErrorHandler()
-        if gdal.GetLastErrorMsg() == '':
-            return 'fail'
+        assert gdal.GetLastErrorMsg() != ''
         if abs(f.GetField('fld') - 1.23) < 1e-8:
             f.DumpReadable()
             return 'fail'
@@ -604,10 +555,8 @@ def test_ogr_basic_12():
     field_def = ogr.FieldDefn('fld', ogr.OFSTFloat32)
     field_def.SetSubType(ogr.OFSTInt16)
     gdal.PopErrorHandler()
-    if gdal.GetLastErrorMsg() == '':
-        return 'fail'
-    if field_def.GetSubType() != ogr.OFSTNone:
-        return 'fail'
+    assert gdal.GetLastErrorMsg() != ''
+    assert field_def.GetSubType() == ogr.OFSTNone
 
     return 'success'
 
@@ -646,10 +595,7 @@ def test_ogr_basic_13():
     for (val, expected_ret) in tests:
         f = ogr.Feature(feat_defn)
         f.SetField('date', val)
-        if f.GetField('date') != expected_ret:
-            print(val)
-            print(f.GetField('date'))
-            return 'fail'
+        assert f.GetField('date') == expected_ret, val
 
     return 'success'
 
@@ -664,8 +610,7 @@ def test_ogr_basic_14():
     ds = ogr.Open('.')
     os.chdir('../..')
 
-    if ds is not None:
-        return 'fail'
+    assert ds is None
 
     os.rmdir('tmp/ogr_basic_14')
 
@@ -686,9 +631,7 @@ def test_ogr_basic_15():
         lyr.CreateFeature(ogr.Feature(lyr.GetLayerDefn()))
     except RuntimeError as e:
         ok = str(e).find('CreateFeature : unsupported operation on a read-only datasource') >= 0
-        if not ok:
-            print('Got: %s' + str(e))
-            return 'fail'
+        assert ok, ('Got: %s' + str(e))
         return 'success'
     finally:
         if used_exceptions_before == 0:
@@ -715,8 +658,7 @@ def ogr_basic_16_gen_list(N):
 
 def test_ogr_basic_16():
 
-    if list(ogr_basic_16_gen_list(2)) != [0, 1]:
-        return 'fail'
+    assert list(ogr_basic_16_gen_list(2)) == [0, 1]
 
     return 'success'
 
@@ -753,19 +695,13 @@ def test_ogr_basic_dataset_slice():
     ds.CreateLayer('lyr3')
 
     lyrs = [lyr.GetName() for lyr in ds[1:3]]
-    if lyrs != ['lyr2', 'lyr3']:
-        print(lyrs)
-        return 'fail'
+    assert lyrs == ['lyr2', 'lyr3']
 
     lyrs = [lyr.GetName() for lyr in ds[0:4]]
-    if lyrs != ['lyr1', 'lyr2', 'lyr3']:
-        print(lyrs)
-        return 'fail'
+    assert lyrs == ['lyr1', 'lyr2', 'lyr3']
 
     lyrs = [lyr.GetName() for lyr in ds[0:3:2]]
-    if lyrs != ['lyr1', 'lyr3']:
-        print(lyrs)
-        return 'fail'
+    assert lyrs == ['lyr1', 'lyr3']
 
     return 'success'
 
diff --git a/autotest/ogr/ogr_bna.py b/autotest/ogr/ogr_bna.py
index 2fa0c6e4c552..2cfb1e3ae406 100755
--- a/autotest/ogr/ogr_bna.py
+++ b/autotest/ogr/ogr_bna.py
@@ -50,19 +50,16 @@ def test_ogr_bna_1():
     expect = ['PID5', 'PID4']
 
     tr = ogrtest.check_features_against_list(lyr, 'Primary ID', expect)
-    if not tr:
-        return 'fail'
+    assert tr
 
     lyr.ResetReading()
     feat = lyr.GetNextFeature()
-    if ogrtest.check_feature_geometry(feat, 'POINT (573.736 476.563)',
-                                      max_error=0.0001) != 0:
-        return 'fail'
+    assert (ogrtest.check_feature_geometry(feat, 'POINT (573.736 476.563)',
+                                      max_error=0.0001) == 0)
 
     feat = lyr.GetNextFeature()
-    if ogrtest.check_feature_geometry(feat, 'POINT (532.991 429.121)',
-                                      max_error=0.0001) != 0:
-        return 'fail'
+    assert (ogrtest.check_feature_geometry(feat, 'POINT (532.991 429.121)',
+                                      max_error=0.0001) == 0)
 
     return 'success'
 
@@ -79,13 +76,11 @@ def test_ogr_bna_2():
     expect = ['PID3']
 
     tr = ogrtest.check_features_against_list(lyr, 'Primary ID', expect)
-    if not tr:
-        return 'fail'
+    assert tr
 
     lyr.ResetReading()
     feat = lyr.GetNextFeature()
-    if ogrtest.check_feature_geometry(feat, 'LINESTRING (224.598 307.425,333.043 341.461,396.629 304.952)', max_error=0.0001) != 0:
-        return 'fail'
+    assert ogrtest.check_feature_geometry(feat, 'LINESTRING (224.598 307.425,333.043 341.461,396.629 304.952)', max_error=0.0001) == 0
 
     return 'success'
 
@@ -102,26 +97,20 @@ def test_ogr_bna_3():
     expect = ['PID2', 'PID1', 'PID7', 'PID8', 'PID9', 'PID10']
 
     tr = ogrtest.check_features_against_list(lyr, 'Primary ID', expect)
-    if not tr:
-        return 'fail'
+    assert tr
     lyr.ResetReading()
     feat = lyr.GetNextFeature()
     feat = lyr.GetNextFeature()
     feat = lyr.GetNextFeature()
-    if ogrtest.check_feature_geometry(feat, 'MULTIPOLYGON (((0 0,1 0,1 1,0 1,0 0)))', max_error=0.0001) != 0:
-        return 'fail'
+    assert ogrtest.check_feature_geometry(feat, 'MULTIPOLYGON (((0 0,1 0,1 1,0 1,0 0)))', max_error=0.0001) == 0
     feat = lyr.GetFeature(2)
-    if ogrtest.check_feature_geometry(feat, 'MULTIPOLYGON (((0 0,1 0,1 1,0 1,0 0)))', max_error=0.0001) != 0:
-        return 'fail'
+    assert ogrtest.check_feature_geometry(feat, 'MULTIPOLYGON (((0 0,1 0,1 1,0 1,0 0)))', max_error=0.0001) == 0
     feat = lyr.GetFeature(3)
-    if ogrtest.check_feature_geometry(feat, 'POLYGON ((0 0,0 10,10 10,10 0,0 0),(2 2,2 8,8 8,8 2,2 2))', max_error=0.0001) != 0:
-        return 'fail'
+    assert ogrtest.check_feature_geometry(feat, 'POLYGON ((0 0,0 10,10 10,10 0,0 0),(2 2,2 8,8 8,8 2,2 2))', max_error=0.0001) == 0
     feat = lyr.GetFeature(4)
-    if ogrtest.check_feature_geometry(feat, 'MULTIPOLYGON (((0 0,0 10,10 10,10 0,0 0)))', max_error=0.0001) != 0:
-        return 'fail'
+    assert ogrtest.check_feature_geometry(feat, 'MULTIPOLYGON (((0 0,0 10,10 10,10 0,0 0)))', max_error=0.0001) == 0
     feat = lyr.GetFeature(5)
-    if ogrtest.check_feature_geometry(feat, 'MULTIPOLYGON (((0 0,0 10,10 10,10 0,0 0)))', max_error=0.0001) != 0:
-        return 'fail'
+    assert ogrtest.check_feature_geometry(feat, 'MULTIPOLYGON (((0 0,0 10,10 10,10 0,0 0)))', max_error=0.0001) == 0
 
     return 'success'
 
@@ -138,8 +127,7 @@ def test_ogr_bna_4():
     expect = ['PID6']
 
     tr = ogrtest.check_features_against_list(lyr, 'Primary ID', expect)
-    if not tr:
-        return 'fail'
+    assert tr
 
     lyr.ResetReading()
     lyr.GetNextFeature()
@@ -152,19 +140,16 @@ def test_ogr_bna_4():
 
 def ogr_bna_check_content(lyr1, lyr2):
 
-    if lyr1.GetFeatureCount() != lyr2.GetFeatureCount():
-        return 'fail'
+    assert lyr1.GetFeatureCount() == lyr2.GetFeatureCount()
 
     feat1 = lyr1.GetNextFeature()
     feat2 = lyr2.GetNextFeature()
     while feat1 is not None:
         for i in range(lyr1.GetLayerDefn().GetFieldCount()):
-            if feat1.GetField(i) != feat2.GetField(i):
-                return 'fail'
+            assert feat1.GetField(i) == feat2.GetField(i)
 
-        if ogrtest.check_feature_geometry(feat1, feat2.GetGeometryRef(),
-                                          max_error=0.000000001) != 0:
-            return 'fail'
+        assert (ogrtest.check_feature_geometry(feat1, feat2.GetGeometryRef(),
+                                          max_error=0.000000001) == 0)
 
         feat1 = lyr1.GetNextFeature()
         feat2 = lyr2.GetNextFeature()
@@ -192,9 +177,7 @@ def ogr_bna_write(creation_options):
 
         while feat is not None:
             dst_feat.SetFrom(feat)
-            if dst_lyr.CreateFeature(dst_feat) != 0:
-                gdaltest.post_reason('CreateFeature failed.')
-                return 'fail'
+            assert dst_lyr.CreateFeature(dst_feat) == 0, 'CreateFeature failed.'
 
             feat = src_lyr.GetNextFeature()
 
@@ -225,18 +208,14 @@ def test_ogr_bna_6():
     ret = ogr_bna_write(['LINEFORMAT=LF', 'MULTILINE=NO', 'COORDINATE_PRECISION=3'])
 
     size = os.stat('tmp/out.bna').st_size
-    if size != 1601:
-        gdaltest.post_reason('Got size %d. Expected %d' % (size, 1601))
-        return 'fail'
+    assert size == 1601, ('Got size %d. Expected %d' % (size, 1601))
 
     os.remove('tmp/out.bna')
 
     ret = ogr_bna_write(['LINEFORMAT=CRLF', 'MULTILINE=NO', 'COORDINATE_PRECISION=3'])
 
     size = os.stat('tmp/out.bna').st_size
-    if size != 1611:
-        gdaltest.post_reason('Got size %d. Expected %d' % (size, 1611))
-        return 'fail'
+    assert size == 1611, ('Got size %d. Expected %d' % (size, 1611))
 
     return 'success'
 
diff --git a/autotest/ogr/ogr_cad.py b/autotest/ogr/ogr_cad.py
index dbf66df144a9..bebd37285367 100755
--- a/autotest/ogr/ogr_cad.py
+++ b/autotest/ogr/ogr_cad.py
@@ -63,70 +63,51 @@ def test_ogr_cad_2():
 
     gdaltest.cad_ds = gdal.OpenEx('data/cad/ellipse_r2000.dwg', allowed_drivers=['CAD'])
 
-    if gdaltest.cad_ds is None:
-        return 'fail'
+    assert gdaltest.cad_ds is not None
 
-    if gdaltest.cad_ds.GetLayerCount() != 1:
-        gdaltest.post_reason('expected exactly one layer.')
-        return 'fail'
+    assert gdaltest.cad_ds.GetLayerCount() == 1, 'expected exactly one layer.'
 
     gdaltest.cad_layer = gdaltest.cad_ds.GetLayer(0)
 
-    if gdaltest.cad_layer.GetName() != '0':
-        gdaltest.post_reason('layer name is expected to be default = 0.')
-        return 'fail'
+    assert gdaltest.cad_layer.GetName() == '0', \
+        'layer name is expected to be default = 0.'
 
     defn = gdaltest.cad_layer.GetLayerDefn()
-    if defn.GetFieldCount() != 5:
-        gdaltest.post_reason('did not get expected number of fields in defn. got %d'
+    assert defn.GetFieldCount() == 5, \
+        ('did not get expected number of fields in defn. got %d'
                              % defn.GetFieldCount())
-        return 'fail'
 
     fc = gdaltest.cad_layer.GetFeatureCount()
-    if fc != 1:
-        gdaltest.post_reason('did not get expected feature count, got %d' % fc)
-        return 'fail'
+    assert fc == 1, ('did not get expected feature count, got %d' % fc)
 
     gdaltest.cad_layer.ResetReading()
 
     feat = gdaltest.cad_layer.GetNextFeature()
 
-    if feat is None:
-        gdaltest.post_reason('cad feature 0 get failed.')
-        return 'fail'
+    assert feat is not None, 'cad feature 0 get failed.'
 
-    if feat.cadgeom_type != 'CADEllipse':
-        gdaltest.post_reason('cad geometry type is wrong. Expected CADEllipse, got: %s'
+    assert feat.cadgeom_type == 'CADEllipse', \
+        ('cad geometry type is wrong. Expected CADEllipse, got: %s'
                              % feat.cadgeom_type)
-        return 'fail'
 
-    if feat.GetFID() != 0:
-        gdaltest.post_reason('did not get expected FID for feature 0.')
-        return 'fail'
+    assert feat.GetFID() == 0, 'did not get expected FID for feature 0.'
 
-    if feat.thickness != 0:
-        gdaltest.post_reason('did not get expected thickness. expected 0, got: %f'
+    assert feat.thickness == 0, ('did not get expected thickness. expected 0, got: %f'
                              % feat.thickness)
-        return 'fail'
 
-    if feat.extentity_data is not None:
-        gdaltest.post_reason('expected feature ExtendedEntityData to be null.')
-        return 'fail'
+    assert feat.extentity_data is None, \
+        'expected feature ExtendedEntityData to be null.'
 
     expected_style = 'PEN(c:#FFFFFFFF,w:5px)'
-    if feat.GetStyleString() != expected_style:
-        gdaltest.post_reason('got unexpected style string on feature 0:\n%s\ninstead of:\n%s.'
+    assert feat.GetStyleString() == expected_style, \
+        ('got unexpected style string on feature 0:\n%s\ninstead of:\n%s.'
                              % (feat.GetStyleString(), expected_style))
-        return 'fail'
 
     geom = feat.GetGeometryRef()
-    if geom is None:
-        gdaltest.post_reason('cad geometry is None.')
-        return 'fail'
+    assert geom is not None, 'cad geometry is None.'
 
-    if geom.GetGeometryType() != ogr.wkbLineString25D:
-        gdaltest.post_reason('did not get expected geometry type.')
-        return 'fail'
+    assert geom.GetGeometryType() == ogr.wkbLineString25D, \
+        'did not get expected geometry type.'
 
     gdaltest.cad_ds = None
     return 'success'
@@ -141,153 +122,121 @@ def test_ogr_cad_3():
 
     gdaltest.cad_ds = gdal.OpenEx('data/cad/triple_circles_r2000.dwg', allowed_drivers=['CAD'])
 
-    if gdaltest.cad_ds is None:
-        return 'fail'
+    assert gdaltest.cad_ds is not None
 
-    if gdaltest.cad_ds.GetLayerCount() != 3:
-        gdaltest.post_reason('expected 3 layers.')
-        return 'fail'
+    assert gdaltest.cad_ds.GetLayerCount() == 3, 'expected 3 layers.'
 
     # test first layer and circle
     gdaltest.cad_layer = gdaltest.cad_ds.GetLayer(0)
 
-    if gdaltest.cad_layer.GetName() != '0':
-        gdaltest.post_reason('layer name is expected to be default = 0.')
-        return 'fail'
+    assert gdaltest.cad_layer.GetName() == '0', \
+        'layer name is expected to be default = 0.'
 
     defn = gdaltest.cad_layer.GetLayerDefn()
-    if defn.GetFieldCount() != 5:
-        gdaltest.post_reason('did not get expected number of fields in defn. got %d'
+    assert defn.GetFieldCount() == 5, \
+        ('did not get expected number of fields in defn. got %d'
                              % defn.GetFieldCount())
-        return 'fail'
 
     fc = gdaltest.cad_layer.GetFeatureCount()
-    if fc != 1:
-        gdaltest.post_reason('did not get expected feature count, got %d' % fc)
-        return 'fail'
+    assert fc == 1, ('did not get expected feature count, got %d' % fc)
 
     gdaltest.cad_layer.ResetReading()
 
     feat = gdaltest.cad_layer.GetNextFeature()
 
-    if feat.cadgeom_type != 'CADCircle':
-        gdaltest.post_reason('cad geometry type is wrong. Expected CADCircle, got: %s'
+    assert feat.cadgeom_type == 'CADCircle', \
+        ('cad geometry type is wrong. Expected CADCircle, got: %s'
                              % feat.cadgeom_type)
-        return 'fail'
 
-    if feat.thickness != 1.2:
-        gdaltest.post_reason('did not get expected thickness. expected 1.2, got: %f'
+    assert feat.thickness == 1.2, \
+        ('did not get expected thickness. expected 1.2, got: %f'
                              % feat.thickness)
-        return 'fail'
 
-    if feat.extentity_data is not None:
-        gdaltest.post_reason('expected feature ExtendedEntityData to be null.')
-        return 'fail'
+    assert feat.extentity_data is None, \
+        'expected feature ExtendedEntityData to be null.'
 
     expected_style = 'PEN(c:#FFFFFFFF,w:5px)'
-    if feat.GetStyleString() != expected_style:
-        gdaltest.post_reason('Got unexpected style string on feature 0:\n%s\ninstead of:\n%s.'
+    assert feat.GetStyleString() == expected_style, \
+        ('Got unexpected style string on feature 0:\n%s\ninstead of:\n%s.'
                              % (feat.GetStyleString(), expected_style))
-        return 'fail'
 
     geom = feat.GetGeometryRef()
-    if geom.GetGeometryType() != ogr.wkbCircularStringZ:
-        gdaltest.post_reason('did not get expected geometry type.')
-        return 'fail'
+    assert geom.GetGeometryType() == ogr.wkbCircularStringZ, \
+        'did not get expected geometry type.'
 
     # test second layer and circle
     gdaltest.cad_layer = gdaltest.cad_ds.GetLayer(1)
 
-    if gdaltest.cad_layer.GetName() != '1':
-        gdaltest.post_reason('layer name is expected to be 1.')
-        return 'fail'
+    assert gdaltest.cad_layer.GetName() == '1', 'layer name is expected to be 1.'
 
     defn = gdaltest.cad_layer.GetLayerDefn()
-    if defn.GetFieldCount() != 5:
-        gdaltest.post_reason('did not get expected number of fields in defn. got %d'
+    assert defn.GetFieldCount() == 5, \
+        ('did not get expected number of fields in defn. got %d'
                              % defn.GetFieldCount())
-        return 'fail'
 
     fc = gdaltest.cad_layer.GetFeatureCount()
-    if fc != 1:
-        gdaltest.post_reason('did not get expected feature count, got %d' % fc)
-        return 'fail'
+    assert fc == 1, ('did not get expected feature count, got %d' % fc)
 
     gdaltest.cad_layer.ResetReading()
 
     feat = gdaltest.cad_layer.GetNextFeature()
 
-    if feat.cadgeom_type != 'CADCircle':
-        gdaltest.post_reason('cad geometry type is wrong. Expected CADCircle, got: %s'
+    assert feat.cadgeom_type == 'CADCircle', \
+        ('cad geometry type is wrong. Expected CADCircle, got: %s'
                              % feat.cadgeom_type)
-        return 'fail'
 
-    if feat.thickness != 0.8:
-        gdaltest.post_reason('did not get expected thickness. expected 0.8, got: %f'
+    assert feat.thickness == 0.8, \
+        ('did not get expected thickness. expected 0.8, got: %f'
                              % feat.thickness)
-        return 'fail'
 
-    if feat.extentity_data is not None:
-        gdaltest.post_reason('expected feature ExtendedEntityData to be null.')
-        return 'fail'
+    assert feat.extentity_data is None, \
+        'expected feature ExtendedEntityData to be null.'
 
     expected_style = 'PEN(c:#FFFFFFFF,w:5px)'
-    if feat.GetStyleString() != expected_style:
-        gdaltest.post_reason('Got unexpected style string on feature 0:\n%s\ninstead of:\n%s.'
+    assert feat.GetStyleString() == expected_style, \
+        ('Got unexpected style string on feature 0:\n%s\ninstead of:\n%s.'
                              % (feat.GetStyleString(), expected_style))
-        return 'fail'
 
     geom = feat.GetGeometryRef()
-    if geom.GetGeometryType() != ogr.wkbCircularStringZ:
-        gdaltest.post_reason('did not get expected geometry type.')
-        return 'fail'
+    assert geom.GetGeometryType() == ogr.wkbCircularStringZ, \
+        'did not get expected geometry type.'
 
     # test third layer and circle
     gdaltest.cad_layer = gdaltest.cad_ds.GetLayer(2)
 
-    if gdaltest.cad_layer.GetName() != '2':
-        gdaltest.post_reason('layer name is expected to be 2.')
-        return 'fail'
+    assert gdaltest.cad_layer.GetName() == '2', 'layer name is expected to be 2.'
 
     defn = gdaltest.cad_layer.GetLayerDefn()
-    if defn.GetFieldCount() != 5:
-        gdaltest.post_reason('did not get expected number of fields in defn. got %d'
+    assert defn.GetFieldCount() == 5, \
+        ('did not get expected number of fields in defn. got %d'
                              % defn.GetFieldCount())
-        return 'fail'
 
     fc = gdaltest.cad_layer.GetFeatureCount()
-    if fc != 1:
-        gdaltest.post_reason('did not get expected feature count, got %d' % fc)
-        return 'fail'
+    assert fc == 1, ('did not get expected feature count, got %d' % fc)
 
     gdaltest.cad_layer.ResetReading()
 
     feat = gdaltest.cad_layer.GetNextFeature()
 
-    if feat.cadgeom_type != 'CADCircle':
-        gdaltest.post_reason('cad geometry type is wrong. Expected CADCircle, got: %s'
+    assert feat.cadgeom_type == 'CADCircle', \
+        ('cad geometry type is wrong. Expected CADCircle, got: %s'
                              % feat.cadgeom_type)
-        return 'fail'
 
-    if feat.thickness != 1.8:
-        gdaltest.post_reason('did not get expected thickness. expected 1.8, got: %f'
+    assert feat.thickness == 1.8, \
+        ('did not get expected thickness. expected 1.8, got: %f'
                              % feat.thickness)
-        return 'fail'
 
-    if feat.extentity_data is not None:
-        gdaltest.post_reason('expected feature ExtendedEntityData to be null.')
-        return 'fail'
+    assert feat.extentity_data is None, \
+        'expected feature ExtendedEntityData to be null.'
 
     expected_style = 'PEN(c:#FFFFFFFF,w:5px)'
-    if feat.GetStyleString() != expected_style:
-        gdaltest.post_reason('Got unexpected style string on feature 0:\n%s\ninstead of:\n%s.'
+    assert feat.GetStyleString() == expected_style, \
+        ('Got unexpected style string on feature 0:\n%s\ninstead of:\n%s.'
                              % (feat.GetStyleString(), expected_style))
-        return 'fail'
 
     geom = feat.GetGeometryRef()
-    if geom.GetGeometryType() != ogr.wkbCircularStringZ:
-        gdaltest.post_reason('did not get expected geometry type.')
-        return 'fail'
+    assert geom.GetGeometryType() == ogr.wkbCircularStringZ, \
+        'did not get expected geometry type.'
 
     gdaltest.cad_ds = None
     return 'success'
@@ -302,21 +251,16 @@ def test_ogr_cad_4():
 
     gdaltest.cad_ds = gdal.OpenEx('data/cad/point2d_r2000.dwg', allowed_drivers=['CAD'])
 
-    if gdaltest.cad_ds.GetLayerCount() != 1:
-        gdaltest.post_reason('expected exactly one layer.')
-        return 'fail'
+    assert gdaltest.cad_ds.GetLayerCount() == 1, 'expected exactly one layer.'
 
     gdaltest.cad_layer = gdaltest.cad_ds.GetLayer(0)
 
-    if gdaltest.cad_layer.GetFeatureCount() != 1:
-        gdaltest.post_reason('expected exactly one feature.')
-        return 'fail'
+    assert gdaltest.cad_layer.GetFeatureCount() == 1, 'expected exactly one feature.'
 
     feat = gdaltest.cad_layer.GetNextFeature()
 
-    if ogrtest.check_feature_geometry(feat, 'POINT (50 50 0)'):
-        gdaltest.post_reason('got feature which does not fit expectations.')
-        return 'fail'
+    assert not ogrtest.check_feature_geometry(feat, 'POINT (50 50 0)'), \
+        'got feature which does not fit expectations.'
 
     gdaltest.cad_ds = None
     return 'success'
@@ -331,21 +275,16 @@ def test_ogr_cad_5():
 
     gdaltest.cad_ds = gdal.OpenEx('data/cad/line_r2000.dwg', allowed_drivers=['CAD'])
 
-    if gdaltest.cad_ds.GetLayerCount() != 1:
-        gdaltest.post_reason('expected exactly one layer.')
-        return 'fail'
+    assert gdaltest.cad_ds.GetLayerCount() == 1, 'expected exactly one layer.'
 
     gdaltest.cad_layer = gdaltest.cad_ds.GetLayer(0)
 
-    if gdaltest.cad_layer.GetFeatureCount() != 1:
-        gdaltest.post_reason('expected exactly one feature.')
-        return 'fail'
+    assert gdaltest.cad_layer.GetFeatureCount() == 1, 'expected exactly one feature.'
 
     feat = gdaltest.cad_layer.GetNextFeature()
 
-    if ogrtest.check_feature_geometry(feat, 'LINESTRING (50 50 0,100 100 0)'):
-        gdaltest.post_reason('got feature which does not fit expectations.')
-        return 'fail'
+    assert not ogrtest.check_feature_geometry(feat, 'LINESTRING (50 50 0,100 100 0)'), \
+        'got feature which does not fit expectations.'
 
     gdaltest.cad_ds = None
     return 'success'
@@ -361,21 +300,16 @@ def test_ogr_cad_6():
 
     gdaltest.cad_ds = gdal.OpenEx('data/cad/text_mtext_attdef_r2000.dwg', allowed_drivers=['CAD'])
 
-    if gdaltest.cad_ds.GetLayerCount() != 1:
-        gdaltest.post_reason('expected exactly one layer.')
-        return 'fail'
+    assert gdaltest.cad_ds.GetLayerCount() == 1, 'expected exactly one layer.'
 
     gdaltest.cad_layer = gdaltest.cad_ds.GetLayer(0)
 
-    if gdaltest.cad_layer.GetFeatureCount() != 3:
-        gdaltest.post_reason('expected 3 features, got: %d'
+    assert gdaltest.cad_layer.GetFeatureCount() == 3, ('expected 3 features, got: %d'
                              % gdaltest.cad_layer.GetFeatureCount())
-        return 'fail'
 
     feat = gdaltest.cad_layer.GetNextFeature()
 
-    if ogrtest.check_feature_geometry(feat, 'POINT(0.7413 1.7794 0)'):
-        return 'fail'
+    assert not ogrtest.check_feature_geometry(feat, 'POINT(0.7413 1.7794 0)')
 
     expected_style = 'LABEL(f:"Arial",t:"Русские буквы",c:#FFFFFFFF)'
     if feat.GetStyleString() != expected_style:
@@ -395,14 +329,12 @@ def test_ogr_cad_7():
 
     feat = gdaltest.cad_layer.GetNextFeature()
 
-    if ogrtest.check_feature_geometry(feat, 'POINT(2.8139 5.7963 0)'):
-        return 'fail'
+    assert not ogrtest.check_feature_geometry(feat, 'POINT(2.8139 5.7963 0)')
 
     expected_style = 'LABEL(f:"Arial",t:"English letters",c:#FFFFFFFF)'
-    if feat.GetStyleString() != expected_style:
-        gdaltest.post_reason('Got unexpected style string:\n%s\ninstead of:\n%s.'
+    assert feat.GetStyleString() == expected_style, \
+        ('Got unexpected style string:\n%s\ninstead of:\n%s.'
                              % (feat.GetStyleString(), expected_style))
-        return 'fail'
 
     return 'success'
 
@@ -416,14 +348,12 @@ def test_ogr_cad_8():
 
     feat = gdaltest.cad_layer.GetNextFeature()
 
-    if ogrtest.check_feature_geometry(feat, 'POINT(4.98953601938918 2.62670161690571 0)'):
-        return 'fail'
+    assert not ogrtest.check_feature_geometry(feat, 'POINT(4.98953601938918 2.62670161690571 0)')
 
     expected_style = 'LABEL(f:"Arial",t:"TESTTAG",c:#FFFFFFFF)'
-    if feat.GetStyleString() != expected_style:
-        gdaltest.post_reason('Got unexpected style string:\n%s\ninstead of:\n%s.'
+    assert feat.GetStyleString() == expected_style, \
+        ('Got unexpected style string:\n%s\ninstead of:\n%s.'
                              % (feat.GetStyleString(), expected_style))
-        return 'fail'
 
     return 'success'
 
@@ -437,11 +367,9 @@ def test_ogr_cad_9():
 
     with gdaltest.error_handler():
         ds = gdal.OpenEx('data/AC1018_signature.dwg', allowed_drivers=['CAD'])
-    if ds is not None:
-        return 'fail'
+    assert ds is None
     msg = gdal.GetLastErrorMsg()
-    if msg.find('does not support this version') < 0:
-        return 'fail'
+    assert msg.find('does not support this version') >= 0
 
     return 'success'
 
diff --git a/autotest/ogr/ogr_carto.py b/autotest/ogr/ogr_carto.py
index 20a3802db68c..619d11b5c794 100755
--- a/autotest/ogr/ogr_carto.py
+++ b/autotest/ogr/ogr_carto.py
@@ -71,8 +71,7 @@ def test_ogr_carto_vsimem():
     gdal.PushErrorHandler()
     ds = ogr.Open('CARTO:foo')
     gdal.PopErrorHandler()
-    if ds is not None:
-        return 'fail'
+    assert ds is None
 
     gdal.FileFromMemBuffer('/vsimem/carto&POSTFIELDS=q=SELECT current_schema() LIMIT 500 OFFSET 0',
                            """Content-Type: text/html\r
@@ -81,136 +80,101 @@ def test_ogr_carto_vsimem():
     gdal.PushErrorHandler()
     ds = ogr.Open('CARTO:foo')
     gdal.PopErrorHandler()
-    if ds is not None or gdal.GetLastErrorMsg().find('HTML error page') < 0:
-        print(gdal.GetLastErrorMsg())
-        return 'fail'
+    assert ds is None and gdal.GetLastErrorMsg().find('HTML error page') >= 0
 
     gdal.FileFromMemBuffer('/vsimem/carto&POSTFIELDS=q=SELECT current_schema() LIMIT 500 OFFSET 0',
                            """""")
     ds = ogr.Open('CARTO:foo')
-    if ds is not None:
-        print(gdal.GetLastErrorMsg())
-        return 'fail'
+    assert ds is None, gdal.GetLastErrorMsg()
 
     gdal.FileFromMemBuffer('/vsimem/carto&POSTFIELDS=q=SELECT current_schema() LIMIT 500 OFFSET 0',
                            """{""")
     gdal.PushErrorHandler()
     ds = ogr.Open('CARTO:foo')
     gdal.PopErrorHandler()
-    if ds is not None or gdal.GetLastErrorMsg().find('JSON parsing error') < 0:
-        print(gdal.GetLastErrorMsg())
-        return 'fail'
+    assert ds is None and gdal.GetLastErrorMsg().find('JSON parsing error') >= 0
 
     gdal.FileFromMemBuffer('/vsimem/carto&POSTFIELDS=q=SELECT current_schema() LIMIT 500 OFFSET 0',
                            """ "not_expected_json" """)
     ds = ogr.Open('CARTO:foo')
-    if ds is not None:
-        print(gdal.GetLastErrorMsg())
-        return 'fail'
+    assert ds is None, gdal.GetLastErrorMsg()
 
     gdal.FileFromMemBuffer('/vsimem/carto&POSTFIELDS=q=SELECT current_schema() LIMIT 500 OFFSET 0',
                            """{ "error" : [ "bla"] }""")
     gdal.PushErrorHandler()
     ds = ogr.Open('CARTO:foo')
     gdal.PopErrorHandler()
-    if ds is not None or gdal.GetLastErrorMsg().find('Error returned by server : bla') < 0:
-        print(gdal.GetLastErrorMsg())
-        return 'fail'
+    assert ds is None and gdal.GetLastErrorMsg().find('Error returned by server : bla') >= 0
 
     gdal.FileFromMemBuffer('/vsimem/carto&POSTFIELDS=q=SELECT current_schema() LIMIT 500 OFFSET 0',
                            """{ "fields" : null } """)
     ds = ogr.Open('CARTO:foo')
-    if ds is not None:
-        print(gdal.GetLastErrorMsg())
-        return 'fail'
+    assert ds is None, gdal.GetLastErrorMsg()
 
     gdal.FileFromMemBuffer('/vsimem/carto&POSTFIELDS=q=SELECT current_schema() LIMIT 500 OFFSET 0',
                            """{ "fields" : "invalid" } """)
     ds = ogr.Open('CARTO:foo')
-    if ds is not None:
-        print(gdal.GetLastErrorMsg())
-        return 'fail'
+    assert ds is None, gdal.GetLastErrorMsg()
 
     gdal.FileFromMemBuffer('/vsimem/carto&POSTFIELDS=q=SELECT current_schema() LIMIT 500 OFFSET 0',
                            """{ "fields" : {} } """)
     ds = ogr.Open('CARTO:foo')
-    if ds is not None:
-        print(gdal.GetLastErrorMsg())
-        return 'fail'
+    assert ds is None, gdal.GetLastErrorMsg()
 
     gdal.FileFromMemBuffer('/vsimem/carto&POSTFIELDS=q=SELECT current_schema() LIMIT 500 OFFSET 0',
                            """{ "fields" : { "foo": "invalid" } } """)
     ds = ogr.Open('CARTO:foo')
-    if ds is not None:
-        print(gdal.GetLastErrorMsg())
-        return 'fail'
+    assert ds is None, gdal.GetLastErrorMsg()
 
     gdal.FileFromMemBuffer('/vsimem/carto&POSTFIELDS=q=SELECT current_schema() LIMIT 500 OFFSET 0',
                            """{ "fields" : { "foo": {} } } """)
     ds = ogr.Open('CARTO:foo')
-    if ds is not None:
-        print(gdal.GetLastErrorMsg())
-        return 'fail'
+    assert ds is None, gdal.GetLastErrorMsg()
 
     gdal.FileFromMemBuffer('/vsimem/carto&POSTFIELDS=q=SELECT current_schema() LIMIT 500 OFFSET 0',
                            """{ "fields" : { "foo": { "type" : null } } } """)
     ds = ogr.Open('CARTO:foo')
-    if ds is not None:
-        print(gdal.GetLastErrorMsg())
-        return 'fail'
+    assert ds is None, gdal.GetLastErrorMsg()
 
     gdal.FileFromMemBuffer('/vsimem/carto&POSTFIELDS=q=SELECT current_schema() LIMIT 500 OFFSET 0',
                            """{ "fields" : { "foo": { "type" : {} } } } """)
     ds = ogr.Open('CARTO:foo')
-    if ds is not None:
-        print(gdal.GetLastErrorMsg())
-        return 'fail'
+    assert ds is None, gdal.GetLastErrorMsg()
 
     gdal.FileFromMemBuffer('/vsimem/carto&POSTFIELDS=q=SELECT current_schema() LIMIT 500 OFFSET 0',
                            """{ "fields" : { "foo": { "type" : "string" } } } """)
     ds = ogr.Open('CARTO:foo')
-    if ds is not None:
-        print(gdal.GetLastErrorMsg())
-        return 'fail'
+    assert ds is None, gdal.GetLastErrorMsg()
 
     gdal.FileFromMemBuffer('/vsimem/carto&POSTFIELDS=q=SELECT current_schema() LIMIT 500 OFFSET 0',
                            """{"rows":[ {"field1": "foo", "field2": "bar"} ],"fields":{"field1":{"type":"string"}, "field2":{"type":"string"}}}""")
     ds = ogr.Open('CARTO:foo')
-    if ds is not None:
-        print(gdal.GetLastErrorMsg())
-        return 'fail'
+    assert ds is None, gdal.GetLastErrorMsg()
 
     gdal.FileFromMemBuffer('/vsimem/carto&POSTFIELDS=q=SELECT current_schema() LIMIT 500 OFFSET 0',
                            """{"rows":[],"fields":{"current_schema":{"type":"string"}}}""")
     gdal.PushErrorHandler()
     ds = ogr.Open('CARTO:foo')
     gdal.PopErrorHandler()
-    if ds is not None:
-        print(gdal.GetLastErrorMsg())
-        return 'fail'
+    assert ds is None, gdal.GetLastErrorMsg()
 
     gdal.FileFromMemBuffer('/vsimem/carto&POSTFIELDS=q=SELECT current_schema() LIMIT 500 OFFSET 0',
                            """{"rows":[{"current_schema":"public"}],"fields":{"current_schema":{"type":"unknown(19)"}}}""")
     gdal.PushErrorHandler()
     ds = ogr.Open('CARTO:foo')
     gdal.PopErrorHandler()
-    if ds is not None:
-        print(gdal.GetLastErrorMsg())
-        return 'fail'
+    assert ds is None, gdal.GetLastErrorMsg()
 
     gdal.FileFromMemBuffer('/vsimem/carto&POSTFIELDS=q=SELECT CDB_UserTables() LIMIT 500 OFFSET 0',
                            """{"rows":[{"cdb_usertables":"table1"}],"fields":{"cdb_usertables":{"type":"string"}}}""")
     ds = ogr.Open('CARTO:foo')
-    if ds is None or ds.GetLayerCount() != 1:
-        print(gdal.GetLastErrorMsg())
-        return 'fail'
+    assert ds is not None and ds.GetLayerCount() == 1, gdal.GetLastErrorMsg()
 
     gdal.PushErrorHandler()
     lyr_defn = ds.GetLayer(0).GetLayerDefn()
     gdal.PopErrorHandler()
 
-    if lyr_defn.GetFieldCount() != 0:
-        return 'fail'
+    assert lyr_defn.GetFieldCount() == 0
 
     # Empty layer
     gdal.FileFromMemBuffer('/vsimem/carto&POSTFIELDS=q=SELECT * FROM "table1" LIMIT 0',
@@ -218,8 +182,7 @@ def test_ogr_carto_vsimem():
     ds = ogr.Open('CARTO:foo')
     lyr = ds.GetLayer(0)
     lyr_defn = lyr.GetLayerDefn()
-    if lyr_defn.GetFieldCount() != 0:
-        return 'fail'
+    assert lyr_defn.GetFieldCount() == 0
 
     gdal.FileFromMemBuffer('/vsimem/carto&POSTFIELDS=q=SELECT * FROM "table1" LIMIT 500 OFFSET 0',
                            """{"rows":[{}],"fields":{}}}""")
@@ -234,21 +197,16 @@ def test_ogr_carto_vsimem():
     ds = ogr.Open('CARTO:foo')
     lyr = ds.GetLayer(0)
     lyr_defn = lyr.GetLayerDefn()
-    if lyr_defn.GetFieldCount() != 4:
-        return 'fail'
-    if lyr_defn.GetFieldDefn(0).GetName() != 'strfield' or \
-       lyr_defn.GetFieldDefn(0).GetType() != ogr.OFTString:
-        return 'fail'
-    if lyr_defn.GetFieldDefn(1).GetName() != 'realfield' or \
-       lyr_defn.GetFieldDefn(1).GetType() != ogr.OFTReal:
-        return 'fail'
-    if lyr_defn.GetFieldDefn(2).GetName() != 'boolfield' or \
-       lyr_defn.GetFieldDefn(2).GetType() != ogr.OFTInteger or \
-       lyr_defn.GetFieldDefn(2).GetSubType() != ogr.OFSTBoolean:
-        return 'fail'
-    if lyr_defn.GetFieldDefn(3).GetName() != 'datefield' or \
-       lyr_defn.GetFieldDefn(3).GetType() != ogr.OFTDateTime:
-        return 'fail'
+    assert lyr_defn.GetFieldCount() == 4
+    assert (lyr_defn.GetFieldDefn(0).GetName() == 'strfield' and \
+       lyr_defn.GetFieldDefn(0).GetType() == ogr.OFTString)
+    assert (lyr_defn.GetFieldDefn(1).GetName() == 'realfield' and \
+       lyr_defn.GetFieldDefn(1).GetType() == ogr.OFTReal)
+    assert (lyr_defn.GetFieldDefn(2).GetName() == 'boolfield' and \
+       lyr_defn.GetFieldDefn(2).GetType() == ogr.OFTInteger and \
+       lyr_defn.GetFieldDefn(2).GetSubType() == ogr.OFSTBoolean)
+    assert (lyr_defn.GetFieldDefn(3).GetName() == 'datefield' and \
+       lyr_defn.GetFieldDefn(3).GetType() == ogr.OFTDateTime)
 
     gdal.FileFromMemBuffer('/vsimem/carto&POSTFIELDS=q=SELECT "strfield", "realfield", "boolfield", "datefield" FROM "table1" LIMIT 500 OFFSET 0',
                            """{"rows":[{ "strfield": "foo", "realfield": 1.23, "boolfield": true, "datefield": "2015-04-24T12:34:56.123Z" }],"fields":{"strfield":{"type":"string"}, "realfield":{"type":"number"}, "boolfield":{"type":"boolean"}, "datefield":{"type":"date"}}}""")
@@ -267,8 +225,7 @@ def test_ogr_carto_vsimem():
     gdal.PushErrorHandler()
     lyr_defn = ds.GetLayer(0).GetLayerDefn()
     gdal.PopErrorHandler()
-    if lyr_defn.GetFieldCount() != 0:
-        return 'fail'
+    assert lyr_defn.GetFieldCount() == 0
 
     get_full_details_fields_url = """/vsimem/carto&POSTFIELDS=q=SELECT a.attname, t.typname, a.attlen, format_type(a.atttypid,a.atttypmod), a.attnum, a.attnotnull, i.indisprimary, pg_get_expr(def.adbin, c.oid) AS defaultexpr, postgis_typmod_dims(a.atttypmod) dim, postgis_typmod_srid(a.atttypmod) srid, postgis_typmod_type(a.atttypmod)::text geomtyp, srtext FROM pg_class c JOIN pg_attribute a ON a.attnum > 0 AND a.attrelid = c.oid AND c.relname = 'table1' JOIN pg_type t ON a.atttypid = t.oid JOIN pg_namespace n ON c.relnamespace=n.oid AND n.nspname= 'public' LEFT JOIN pg_index i ON c.oid = i.indrelid AND i.indisprimary = 't' AND a.attnum = ANY(i.indkey) LEFT JOIN pg_attrdef def ON def.adrelid = c.oid AND def.adnum = a.attnum LEFT JOIN spatial_ref_sys srs ON srs.srid = postgis_typmod_srid(a.atttypmod) ORDER BY a.attnum LIMIT 500 OFFSET 0&api_key=foo"""
     gdal.FileFromMemBuffer(get_full_details_fields_url, '')
@@ -276,8 +233,7 @@ def test_ogr_carto_vsimem():
     gdal.PushErrorHandler()
     lyr_defn = ds.GetLayer(0).GetLayerDefn()
     gdal.PopErrorHandler()
-    if lyr_defn.GetFieldCount() != 0:
-        return 'fail'
+    assert lyr_defn.GetFieldCount() == 0
 
     gdal.FileFromMemBuffer(get_full_details_fields_url,
                            """{"rows":[{"attname":"foo"}], "fields":{"attname":{"type":"string"}}}""")
@@ -286,14 +242,12 @@ def test_ogr_carto_vsimem():
     gdal.PushErrorHandler()
     lyr_defn = lyr.GetLayerDefn()
     gdal.PopErrorHandler()
-    if lyr_defn.GetFieldCount() != 1:
-        return 'fail'
+    assert lyr_defn.GetFieldCount() == 1
 
     gdal.PushErrorHandler()
     f = lyr.GetFeature(0)
     gdal.PopErrorHandler()
-    if f is not None:
-        return 'fail'
+    assert f is None
 
     gdal.FileFromMemBuffer(get_full_details_fields_url,
                            """{"rows":[{"attname":"strfield", "typname":"varchar", "attnotnull": true, "defaultexpr": "def_value"},
@@ -323,35 +277,27 @@ def test_ogr_carto_vsimem():
     ds = ogr.Open('CARTO:foo')
     lyr = ds.GetLayer(0)
     lyr_defn = lyr.GetLayerDefn()
-    if lyr_defn.GetFieldCount() != 5:
-        return 'fail'
-    if lyr_defn.GetFieldDefn(0).GetName() != 'strfield' or \
-       lyr_defn.GetFieldDefn(0).GetType() != ogr.OFTString or \
-       lyr_defn.GetFieldDefn(0).IsNullable() or \
-       lyr_defn.GetFieldDefn(0).GetDefault() != 'def_value':
-        return 'fail'
-    if lyr_defn.GetGeomFieldCount() != 1:
-        return 'fail'
-    if lyr_defn.GetGeomFieldDefn(0).GetName() != 'my_geom':
-        return 'fail'
-    if lyr_defn.GetGeomFieldDefn(0).GetType() != ogr.wkbPoint25D:
-        return 'fail'
-    if lyr_defn.GetGeomFieldDefn(0).GetSpatialRef().ExportToWkt().find('4326') < 0:
-        return 'fail'
+    assert lyr_defn.GetFieldCount() == 5
+    assert (lyr_defn.GetFieldDefn(0).GetName() == 'strfield' and \
+       lyr_defn.GetFieldDefn(0).GetType() == ogr.OFTString and not \
+       lyr_defn.GetFieldDefn(0).IsNullable() and \
+       lyr_defn.GetFieldDefn(0).GetDefault() == 'def_value')
+    assert lyr_defn.GetGeomFieldCount() == 1
+    assert lyr_defn.GetGeomFieldDefn(0).GetName() == 'my_geom'
+    assert lyr_defn.GetGeomFieldDefn(0).GetType() == ogr.wkbPoint25D
+    assert lyr_defn.GetGeomFieldDefn(0).GetSpatialRef().ExportToWkt().find('4326') >= 0
 
     gdal.PushErrorHandler()
     fc = lyr.GetFeatureCount()
     gdal.PopErrorHandler()
-    if fc != 0:
-        return 'fail'
+    assert fc == 0
 
     gdal.FileFromMemBuffer("""/vsimem/carto&POSTFIELDS=q=SELECT COUNT(*) FROM "table1"&api_key=foo""",
                            """{}""")
     gdal.PushErrorHandler()
     fc = lyr.GetFeatureCount()
     gdal.PopErrorHandler()
-    if fc != 0:
-        return 'fail'
+    assert fc == 0
 
     gdal.FileFromMemBuffer("""/vsimem/carto&POSTFIELDS=q=SELECT COUNT(*) FROM "table1"&api_key=foo""",
                            """{"rows":[{"foo":1}],
@@ -359,20 +305,17 @@ def test_ogr_carto_vsimem():
     gdal.PushErrorHandler()
     fc = lyr.GetFeatureCount()
     gdal.PopErrorHandler()
-    if fc != 0:
-        return 'fail'
+    assert fc == 0
 
     gdal.FileFromMemBuffer("""/vsimem/carto&POSTFIELDS=q=SELECT COUNT(*) FROM "table1"&api_key=foo""",
                            """{"rows":[{"count":9876543210}],
             "fields":{"count":{"type":"number"}}}""")
-    if lyr.GetFeatureCount() != 9876543210:
-        return 'fail'
+    assert lyr.GetFeatureCount() == 9876543210
 
     gdal.PushErrorHandler()
     extent = lyr.GetExtent()
     gdal.PopErrorHandler()
-    if extent != (0, 0, 0, 0):
-        return 'fail'
+    assert extent == (0, 0, 0, 0)
 
     gdal.FileFromMemBuffer("""/vsimem/carto&POSTFIELDS=q=SELECT ST_Extent("my_geom") FROM "table1"&api_key=foo""",
                            """{"rows":[{"foo":1}],
@@ -381,8 +324,7 @@ def test_ogr_carto_vsimem():
     gdal.PushErrorHandler()
     extent = lyr.GetExtent()
     gdal.PopErrorHandler()
-    if extent != (0, 0, 0, 0):
-        return 'fail'
+    assert extent == (0, 0, 0, 0)
 
     gdal.FileFromMemBuffer("""/vsimem/carto&POSTFIELDS=q=SELECT ST_Extent("my_geom") FROM "table1"&api_key=foo""",
                            """{"rows":[{"st_extent":""}],
@@ -391,8 +333,7 @@ def test_ogr_carto_vsimem():
     gdal.PushErrorHandler()
     lyr.GetExtent()
     gdal.PopErrorHandler()
-    if gdal.GetLastErrorMsg() == '':
-        return 'fail'
+    assert gdal.GetLastErrorMsg() != ''
 
     gdal.FileFromMemBuffer("""/vsimem/carto&POSTFIELDS=q=SELECT ST_Extent("my_geom") FROM "table1"&api_key=foo""",
                            """{"rows":[{"st_extent":"("}],
@@ -401,8 +342,7 @@ def test_ogr_carto_vsimem():
     gdal.PushErrorHandler()
     lyr.GetExtent()
     gdal.PopErrorHandler()
-    if gdal.GetLastErrorMsg() == '':
-        return 'fail'
+    assert gdal.GetLastErrorMsg() != ''
 
     gdal.FileFromMemBuffer("""/vsimem/carto&POSTFIELDS=q=SELECT ST_Extent("my_geom") FROM "table1"&api_key=foo""",
                            """{"rows":[{"st_extent":"BOX()"}],
@@ -411,21 +351,17 @@ def test_ogr_carto_vsimem():
     gdal.PushErrorHandler()
     lyr.GetExtent()
     gdal.PopErrorHandler()
-    if gdal.GetLastErrorMsg() == '':
-        return 'fail'
+    assert gdal.GetLastErrorMsg() != ''
 
     gdal.FileFromMemBuffer("""/vsimem/carto&POSTFIELDS=q=SELECT ST_Extent("my_geom") FROM "table1"&api_key=foo""",
                            """{"rows":[{"st_extent":"BOX(0,1,2,3)"}],
             "fields":{"st_extent":{"type":"string"}}}""")
-    if lyr.GetExtent() != (0.0, 2.0, 1.0, 3.0):
-        print(lyr.GetExtent())
-        return 'fail'
+    assert lyr.GetExtent() == (0.0, 2.0, 1.0, 3.0)
 
     gdal.PushErrorHandler()
     f = lyr.GetFeature(0)
     gdal.PopErrorHandler()
-    if f is not None:
-        return 'fail'
+    assert f is None
 
     gdal.FileFromMemBuffer("""/vsimem/carto&POSTFIELDS=q=SELECT "cartodb_id", "my_geom", "strfield", "intfield", "doublefield", "boolfield", "datetimefield" FROM "table1" WHERE "cartodb_id" = 0&api_key=foo""",
                            """""")
@@ -433,44 +369,38 @@ def test_ogr_carto_vsimem():
     gdal.PushErrorHandler()
     f = lyr.GetFeature(0)
     gdal.PopErrorHandler()
-    if f is not None:
-        return 'fail'
+    assert f is None
 
     gdal.FileFromMemBuffer("""/vsimem/carto&POSTFIELDS=q=SELECT "cartodb_id", "my_geom", "strfield", "intfield", "doublefield", "boolfield", "datetimefield" FROM "table1" WHERE "cartodb_id" = 0&api_key=foo""",
                            """{"rows":[{"st_extent":"BOX(0,1,2,3)"}],
             "fields":{"st_extent":{"type":"string"}}}""")
 
     f = lyr.GetFeature(0)
-    if f.GetFID() != -1 or not f.IsFieldNull(0):
-        return 'fail'
+    assert f.GetFID() == -1 and f.IsFieldNull(0)
 
     gdal.FileFromMemBuffer("""/vsimem/carto&POSTFIELDS=q=SELECT "cartodb_id", "my_geom", "strfield", "intfield", "doublefield", "boolfield", "datetimefield" FROM "table1" WHERE "cartodb_id" = 0&api_key=foo""",
                            """{"rows":[{"cartodb_id":0}],
             "fields":{"cartodb_id":{"type":"numeric"}}}""")
 
     f = lyr.GetFeature(0)
-    if f.GetFID() != 0:
-        return 'fail'
+    assert f.GetFID() == 0
 
     lyr.ResetReading()
     gdal.PushErrorHandler()
     f = lyr.GetNextFeature()
     gdal.PopErrorHandler()
-    if f is not None:
-        return 'fail'
+    assert f is None
 
     gdal.FileFromMemBuffer("""/vsimem/carto&POSTFIELDS=q=SELECT "cartodb_id", "my_geom", "strfield", "intfield", "doublefield", "boolfield", "datetimefield" FROM "table1" WHERE "cartodb_id" >= 0 ORDER BY "cartodb_id" ASC LIMIT 500&api_key=foo""",
                            """{"rows":[{"cartodb_id":0}],
             "fields":{"cartodb_id":{"type":"numeric"}}}""")
     lyr.ResetReading()
     f = lyr.GetNextFeature()
-    if f.GetFID() != 0:
-        return 'fail'
+    assert f.GetFID() == 0
     gdal.PushErrorHandler()
     f = lyr.GetNextFeature()
     gdal.PopErrorHandler()
-    if f is not None:
-        return 'fail'
+    assert f is None
 
     gdal.SetConfigOption('CARTO_PAGE_SIZE', '2')
     gdal.FileFromMemBuffer("""/vsimem/carto&POSTFIELDS=q=SELECT "cartodb_id", "my_geom", "strfield", "intfield", "doublefield", "boolfield", "datetimefield" FROM "table1" WHERE "cartodb_id" >= 0 ORDER BY "cartodb_id" ASC LIMIT 2&api_key=foo""",
@@ -478,59 +408,50 @@ def test_ogr_carto_vsimem():
             "fields":{"cartodb_id":{"type":"numeric"}}}""")
     lyr.ResetReading()
     f = lyr.GetNextFeature()
-    if f.GetFID() != 0:
-        return 'fail'
+    assert f.GetFID() == 0
     f = lyr.GetNextFeature()
-    if f.GetFID() != 10:
-        return 'fail'
+    assert f.GetFID() == 10
 
     gdal.FileFromMemBuffer("""/vsimem/carto&POSTFIELDS=q=SELECT "cartodb_id", "my_geom", "strfield", "intfield", "doublefield", "boolfield", "datetimefield" FROM "table1" WHERE "cartodb_id" >= 11 ORDER BY "cartodb_id" ASC LIMIT 2&api_key=foo""",
                            """{"rows":[{"cartodb_id":12}],
             "fields":{"cartodb_id":{"type":"numeric"}}}""")
     f = lyr.GetNextFeature()
-    if f.GetFID() != 12:
-        return 'fail'
+    assert f.GetFID() == 12
     gdal.ErrorReset()
     f = lyr.GetNextFeature()
-    if f is not None or gdal.GetLastErrorMsg() != '':
-        return 'fail'
+    assert f is None and gdal.GetLastErrorMsg() == ''
 
     lyr.SetAttributeFilter('strfield is NULL')
 
     gdal.PushErrorHandler()
     fc = lyr.GetFeatureCount()
     gdal.PopErrorHandler()
-    if fc != 0:
-        return 'fail'
+    assert fc == 0
 
     gdal.FileFromMemBuffer("""/vsimem/carto&POSTFIELDS=q=SELECT "cartodb_id", "my_geom", "strfield", "intfield", "doublefield", "boolfield", "datetimefield" FROM "table1" WHERE (strfield is NULL) AND "cartodb_id" >= 0 ORDER BY "cartodb_id" ASC LIMIT 2&api_key=foo""",
                            """{"rows":[{"cartodb_id":0}],
             "fields":{"cartodb_id":{"type":"numeric"}}}""")
     lyr.ResetReading()
     f = lyr.GetNextFeature()
-    if f is None:
-        return 'fail'
+    assert f is not None
     gdal.FileFromMemBuffer("""/vsimem/carto&POSTFIELDS=q=SELECT "cartodb_id", "my_geom", "strfield", "intfield", "doublefield", "boolfield", "datetimefield" FROM "table1" WHERE (strfield is NULL) AND "cartodb_id" >= 1 ORDER BY "cartodb_id" ASC LIMIT 2&api_key=foo""",
                            """{"rows":[],
             "fields":{"cartodb_id":{"type":"numeric"}}}""")
     gdal.ErrorReset()
     f = lyr.GetNextFeature()
-    if f is not None or gdal.GetLastErrorMsg() != '':
-        return 'fail'
+    assert f is None and gdal.GetLastErrorMsg() == ''
 
     gdal.FileFromMemBuffer("""/vsimem/carto&POSTFIELDS=q=SELECT COUNT(*) FROM "table1" WHERE (strfield is NULL)&api_key=foo""",
                            """{"rows":[{"count":9876543210}],
             "fields":{"count":{"type":"number"}}}""")
-    if lyr.GetFeatureCount() != 9876543210:
-        return 'fail'
+    assert lyr.GetFeatureCount() == 9876543210
 
     lyr.SetSpatialFilterRect(-180, -90, 180, 90)
 
     gdal.PushErrorHandler()
     fc = lyr.GetFeatureCount()
     gdal.PopErrorHandler()
-    if fc != 0:
-        return 'fail'
+    assert fc == 0
 
     gdal.FileFromMemBuffer("""/vsimem/carto&POSTFIELDS=q=SELECT "cartodb_id", "my_geom", "strfield", "intfield", "doublefield", "boolfield", "datetimefield" FROM "table1" WHERE ("my_geom" %26%26 'BOX3D(-180 -90, 180 90)'::box3d) AND (strfield is NULL) AND "cartodb_id" >= 0 ORDER BY "cartodb_id" ASC LIMIT 2&api_key=foo""",
                            """{"rows":[{"cartodb_id":20, "my_geom": "010100000000000000000000400000000000804840" }],
@@ -538,20 +459,17 @@ def test_ogr_carto_vsimem():
 
     lyr.ResetReading()
     f = lyr.GetNextFeature()
-    if f is None or f.GetGeometryRef().ExportToWkt() != 'POINT (2 49)':
-        return 'fail'
+    assert f is not None and f.GetGeometryRef().ExportToWkt() == 'POINT (2 49)'
 
     gdal.PushErrorHandler()
     fc = lyr.GetFeatureCount()
     gdal.PopErrorHandler()
-    if fc != 1:
-        return 'fail'
+    assert fc == 1
 
     gdal.FileFromMemBuffer("""/vsimem/carto&POSTFIELDS=q=SELECT COUNT(*) FROM "table1" WHERE ("my_geom" %26%26 'BOX3D(-180 -90, 180 90)'::box3d) AND (strfield is NULL)&api_key=foo""",
                            """{"rows":[{"count":9876543210}],
             "fields":{"count":{"type":"number"}}}""")
-    if lyr.GetFeatureCount() != 9876543210:
-        return 'fail'
+    assert lyr.GetFeatureCount() == 9876543210
 
     # Not permitted in read-only mode
     f = ogr.Feature(lyr.GetLayerDefn())
@@ -577,8 +495,7 @@ def test_ogr_carto_vsimem():
     gdal.PushErrorHandler()
     lyr.GetNextFeature()
     gdal.PopErrorHandler()
-    if gdal.GetLastErrorMsg() == '':
-        return 'fail'
+    assert gdal.GetLastErrorMsg() != ''
 
     gdal.FileFromMemBuffer("""/vsimem/carto&POSTFIELDS=q=SELECT cdb_cartodbfytable('my_layer')&api_key=foo""",
                            """{"rows":[],
@@ -605,22 +522,19 @@ def test_ogr_carto_vsimem():
     gdal.PushErrorHandler()
     ret = lyr.CreateFeature(f)
     gdal.PopErrorHandler()
-    if ret == 0:
-        return 'fail'
+    assert ret != 0
     f = None
 
     fld_defn = ogr.FieldDefn('INTFIELD', ogr.OFTInteger)
     # No server answer
     with gdaltest.error_handler():
         ret = lyr.CreateField(fld_defn)
-    if ret == 0:
-        return 'fail'
+    assert ret != 0
 
     gdal.FileFromMemBuffer("""/vsimem/carto&POSTFIELDS=q=ALTER TABLE "my_layer" ADD COLUMN "intfield" INTEGER&api_key=foo""",
                            """{"rows":[],
             "fields":{}}""")
-    if lyr.CreateField(fld_defn) != 0:
-        return 'fail'
+    assert lyr.CreateField(fld_defn) == 0
 
     fld_defn = ogr.FieldDefn('boolfield', ogr.OFTInteger)
     fld_defn.SetSubType(ogr.OFSTBoolean)
@@ -628,38 +542,32 @@ def test_ogr_carto_vsimem():
     gdal.FileFromMemBuffer("""/vsimem/carto&POSTFIELDS=q=ALTER TABLE "my_layer" ADD COLUMN "boolfield" BOOLEAN&api_key=foo""",
                            """{"rows":[],
             "fields":{}}""")
-    if lyr.CreateField(fld_defn) != 0:
-        return 'fail'
+    assert lyr.CreateField(fld_defn) == 0
 
     # Invalid field
     with gdaltest.error_handler():
-        if lyr.DeleteField(-1) == 0:
-            return 'fail'
+        assert lyr.DeleteField(-1) != 0
 
     # No server answer
     with gdaltest.error_handler():
-        if lyr.DeleteField(0) == 0:
-            return 'fail'
+        assert lyr.DeleteField(0) != 0
 
     gdal.FileFromMemBuffer("""/vsimem/carto&POSTFIELDS=q=ALTER TABLE "my_layer" DROP COLUMN "boolfield"&api_key=foo""",
                            """{"rows":[],
             "fields":{}}""")
     fld_pos = lyr.GetLayerDefn().GetFieldIndex(fld_defn.GetName())
-    if lyr.DeleteField(fld_pos) != 0:
-        return 'fail'
+    assert lyr.DeleteField(fld_pos) == 0
 
     gdal.FileFromMemBuffer("""/vsimem/carto&POSTFIELDS=q=ALTER TABLE "my_layer" ADD COLUMN "boolfield" BOOLEAN&api_key=foo""",
                            """{"rows":[],
             "fields":{}}""")
-    if lyr.CreateField(fld_defn) != 0:
-        return 'fail'
+    assert lyr.CreateField(fld_defn) == 0
 
     f = ogr.Feature(lyr.GetLayerDefn())
     gdal.PushErrorHandler()
     ret = lyr.CreateFeature(f)
     gdal.PopErrorHandler()
-    if ret == 0:
-        return 'fail'
+    assert ret != 0
 
     f = ogr.Feature(lyr.GetLayerDefn())
     f.SetField('strfield', 'foo')
@@ -670,66 +578,56 @@ def test_ogr_carto_vsimem():
                            """{"rows":[ {"cartodb_id": 1} ],
             "fields":{"cartodb_id":{"type":"integer"}}}""")
     ret = lyr.CreateFeature(f)
-    if ret != 0 or f.GetFID() != 1:
-        return 'fail'
+    assert ret == 0 and f.GetFID() == 1
 
     f.SetFID(-1)
     gdal.PushErrorHandler()
     ret = lyr.SetFeature(f)
     gdal.PopErrorHandler()
-    if ret == 0:
-        return 'fail'
+    assert ret != 0
 
     f.SetFID(3)
     gdal.PushErrorHandler()
     ret = lyr.SetFeature(f)
     gdal.PopErrorHandler()
-    if ret == 0:
-        return 'fail'
+    assert ret != 0
 
     gdal.FileFromMemBuffer("""/vsimem/carto&POSTFIELDS=q=UPDATE "my_layer" SET "strfield" = 'foo', "intfield" = 1, "boolfield" = 't', "the_geom" = '0101000020E610000000000000000000400000000000804840' WHERE "cartodb_id" = 3&api_key=foo""",
                            """{"total_rows": 0}""")
     ret = lyr.SetFeature(f)
-    if ret != ogr.OGRERR_NON_EXISTING_FEATURE:
-        return 'fail'
+    assert ret == ogr.OGRERR_NON_EXISTING_FEATURE
 
     gdal.FileFromMemBuffer("""/vsimem/carto&POSTFIELDS=q=UPDATE "my_layer" SET "strfield" = 'foo', "intfield" = 1, "boolfield" = 't', "the_geom" = '0101000020E610000000000000000000400000000000804840' WHERE "cartodb_id" = 3&api_key=foo""",
                            """{"total_rows": 1}""")
     ret = lyr.SetFeature(f)
-    if ret != 0:
-        return 'fail'
+    assert ret == 0
 
     f = ogr.Feature(lyr.GetLayerDefn())
     gdal.PushErrorHandler()
     ret = lyr.CreateFeature(f)
     gdal.PopErrorHandler()
-    if ret == 0:
-        return 'fail'
+    assert ret != 0
 
     gdal.FileFromMemBuffer("""/vsimem/carto&POSTFIELDS=q=INSERT INTO "my_layer" DEFAULT VALUES RETURNING "cartodb_id"&api_key=foo""",
                            """{"rows":[ {"cartodb_id": 4} ],
             "fields":{"cartodb_id":{"type":"integer"}}}""")
     ret = lyr.CreateFeature(f)
-    if ret != 0 or f.GetFID() != 4:
-        return 'fail'
+    assert ret == 0 and f.GetFID() == 4
 
     gdal.PushErrorHandler()
     ret = lyr.DeleteFeature(0)
     gdal.PopErrorHandler()
-    if ret == 0:
-        return 'fail'
+    assert ret != 0
 
     gdal.FileFromMemBuffer("""/vsimem/carto&POSTFIELDS=q=DELETE FROM "my_layer" WHERE "cartodb_id" = 0&api_key=foo""",
                            """{"total_rows": 0}""")
     ret = lyr.DeleteFeature(0)
-    if ret != ogr.OGRERR_NON_EXISTING_FEATURE:
-        return 'fail'
+    assert ret == ogr.OGRERR_NON_EXISTING_FEATURE
 
     gdal.FileFromMemBuffer("""/vsimem/carto&POSTFIELDS=q=DELETE FROM "my_layer" WHERE "cartodb_id" = 0&api_key=foo""",
                            """{"total_rows": 1}""")
     ret = lyr.DeleteFeature(0)
-    if ret != 0:
-        return 'fail'
+    assert ret == 0
 
     gdal.FileFromMemBuffer("""/vsimem/carto&POSTFIELDS=q=SELECT cdb_cartodbfytable('my_layer')&api_key=foo""",
                            """{"rows":[],
@@ -749,8 +647,7 @@ def test_ogr_carto_vsimem():
     f = ogr.Feature(lyr.GetLayerDefn())
     f.SetField('strfield', 'foo')
     ret = lyr.CreateFeature(f)
-    if ret != 0 or f.GetFID() != 11:
-        return 'fail'
+    assert ret == 0 and f.GetFID() == 11
 
     f = ogr.Feature(lyr.GetLayerDefn())
 
@@ -811,35 +708,30 @@ def test_ogr_carto_vsimem():
     with gdaltest.tempfile("""/vsimem/carto&POSTFIELDS=q=SELECT nextval('table1_cartodb_id_seq') AS nextid&api_key=foo""",
                            """{"rows":[{"nextid":11}],"fields":{"nextid":{"type":"number"}}}"""):
         ret = lyr.CreateFeature(f)
-    if ret != 0 or f.GetFID() != 11:
-        return 'fail'
+    assert ret == 0 and f.GetFID() == 11
 
     f = ogr.Feature(lyr.GetLayerDefn())
     f.SetField('strfield', 'bar')
     ret = lyr.CreateFeature(f)
-    if ret != 0 or f.GetFID() != 12:
-        return 'fail'
+    assert ret == 0 and f.GetFID() == 12
 
     f = ogr.Feature(lyr.GetLayerDefn())
     f.SetField('strfield', 'baz')
     ret = lyr.CreateFeature(f)
-    if ret != 0 or f.GetFID() != 13:
-        return 'fail'
+    assert ret == 0 and f.GetFID() == 13
 
     gdal.ErrorReset()
     with gdaltest.tempfile("""/vsimem/carto&POSTFIELDS=q=BEGIN;INSERT INTO "table1" ("strfield", "cartodb_id") VALUES ('foo', 11);INSERT INTO "table1" ("strfield", "intfield", "doublefield", "boolfield", "datetimefield", "my_geom") VALUES ('bar', NULL, NULL, NULL, NULL, NULL), ('baz', NULL, NULL, NULL, NULL, NULL);COMMIT;&api_key=foo""",
                            """{"rows":[], "fields":{}}"""):
         ds = None
-    if gdal.GetLastErrorMsg() != '':
-        return 'fail'
+    assert gdal.GetLastErrorMsg() == ''
 
     ds = gdal.OpenEx('CARTO:foo', gdal.OF_VECTOR | gdal.OF_UPDATE, open_options=['COPY_MODE=NO'])
 
     gdal.PushErrorHandler()
     lyr = ds.CreateLayer('table1')
     gdal.PopErrorHandler()
-    if lyr is not None:
-        return 'fail'
+    assert lyr is None
 
     with gdaltest.tempfile("""/vsimem/carto&POSTFIELDS=q=DROP TABLE "table1"&api_key=foo""",
                            """{"rows":[], "fields":{}}"""):
@@ -849,16 +741,14 @@ def test_ogr_carto_vsimem():
     f.SetGeometry(ogr.CreateGeometryFromWkt('POLYGON((0 0,0 1,1 0,0 0))'))
     with gdaltest.tempfile("""/vsimem/carto&POSTFIELDS=q=CREATE TABLE "table1" ( cartodb_id SERIAL,the_geom Geometry(MULTIPOLYGON,0),PRIMARY KEY (cartodb_id) );DROP SEQUENCE IF EXISTS "table1_cartodb_id_seq" CASCADE;CREATE SEQUENCE "table1_cartodb_id_seq" START 1;ALTER SEQUENCE "table1_cartodb_id_seq" OWNED BY "table1".cartodb_id;ALTER TABLE "table1" ALTER COLUMN cartodb_id SET DEFAULT nextval('"table1_cartodb_id_seq"')&api_key=foo""",
                            """{"rows":[], "fields":{}}"""):
-        if lyr.CreateFeature(f) != 0:
-            return 'fail'
+        assert lyr.CreateFeature(f) == 0
 
     gdal.ErrorReset()
     with gdaltest.tempfile("""/vsimem/carto&POSTFIELDS=q=BEGIN;INSERT INTO "table1" ("the_geom") VALUES ('0106000020E61000000100000001030000000100000004000000000000000000000000000000000000000000000000000000000000000000F03F000000000000F03F000000000000000000000000000000000000000000000000');COMMIT;&api_key=foo""",
                            """{"rows":[],
             "fields":{}}"""):
         ds = None
-    if gdal.GetLastErrorMsg() != '':
-        return 'fail'
+    assert gdal.GetLastErrorMsg() == ''
 
     ds = gdal.OpenEx('CARTO:foo', gdal.OF_VECTOR | gdal.OF_UPDATE, open_options=['COPY_MODE=NO'])
 
@@ -873,10 +763,8 @@ def test_ogr_carto_vsimem():
                            """{"rows":[], "fields":{}}"""):
         with gdaltest.tempfile("""/vsimem/carto&POSTFIELDS=q=BEGIN;INSERT INTO "table1" ("cartodb_id") VALUES (100);COMMIT;&api_key=foo""",
                                """{"rows":[], "fields":{}}"""):
-            if lyr.CreateFeature(f) != 0:
-                return 'fail'
-            if f.GetFID() != 100:
-                return 'fail'
+            assert lyr.CreateFeature(f) == 0
+            assert f.GetFID() == 100
             ds = None
 
     ds = ogr.Open('CARTO:foo', update=1)
@@ -884,16 +772,13 @@ def test_ogr_carto_vsimem():
     gdal.PushErrorHandler()
     ret = ds.DeleteLayer(0)
     gdal.PopErrorHandler()
-    if ret == 0:
-        return 'fail'
+    assert ret != 0
 
     gdal.ErrorReset()
     ds = gdal.OpenEx('CARTO:foo', gdal.OF_VECTOR | gdal.OF_UPDATE, open_options=['COPY_MODE=YES'])
-    if ds is None:
-        return 'fail'
+    assert ds is not None
     lyr = ds.GetLayerByName('table1')
-    if lyr is None:
-        return 'fail'
+    assert lyr is not None
 
     with gdaltest.tempfile("""/vsimem/carto/copyfrom?q=COPY%20"table1"%20("strfield","my_geom","cartodb_id")%20FROM%20STDIN%20WITH%20(FORMAT%20text,%20ENCODING%20UTF8)&api_key=foo&POSTFIELDS=copytest\t0101000020E610000000000000000059400000000000005940\t11\n\\.\n""","""{}"""):
 
@@ -902,14 +787,12 @@ def test_ogr_carto_vsimem():
             f = ogr.Feature(lyr.GetLayerDefn())
             f.SetField('strfield', 'copytest')
             f.SetGeometry(ogr.CreateGeometryFromWkt('POINT(100 100)'))
-            if lyr.CreateFeature(f) != 0:
-                return 'fail'
+            assert lyr.CreateFeature(f) == 0
 
             f = ogr.Feature(lyr.GetLayerDefn())
             f.SetField('intfield', 12)
             f.SetGeometry(ogr.CreateGeometryFromWkt('POINT(100 100)'))
-            if lyr.CreateFeature(f) != 0:
-                return 'fail'
+            assert lyr.CreateFeature(f) == 0
 
             ds = None # force flush
 
@@ -919,8 +802,7 @@ def test_ogr_carto_vsimem():
     with gdaltest.tempfile("""/vsimem/carto&POSTFIELDS=q=DROP TABLE "table1"&api_key=foo""",
                            """{"rows":[], "fields":{}}"""):
         ds.ExecuteSQL('DELLAYER:table1')
-    if gdal.GetLastErrorMsg() != '' or ds.GetLayerByName('table1') is not None:
-        return 'fail'
+    assert gdal.GetLastErrorMsg() == '' and ds.GetLayerByName('table1') is None
 
     with gdaltest.tempfile('/vsimem/carto&POSTFIELDS=q=SELECT current_schema() LIMIT 500 OFFSET 0&api_key=foo',
                            """{"rows":[{"current_schema":"my_schema"}],"fields":{"current_schema":{"type":"unknown(19)"}}}"""):
@@ -929,8 +811,7 @@ def test_ogr_carto_vsimem():
             with gdaltest.tempfile("""/vsimem/carto&POSTFIELDS=q=SELECT c.relname FROM pg_class c, pg_namespace n WHERE c.relkind in ('r', 'v') AND c.relname !~ '^pg_' AND c.relnamespace=n.oid AND n.nspname = 'my_schema' LIMIT 500 OFFSET 0&api_key=foo""",
                                    """{"rows":[{"relname": "a_layer"}],"fields":{"relname":{"type":"string"}}}"""):
                 ds = ogr.Open('CARTO:foo')
-    if ds.GetLayerByName('a_layer') is None:
-        return 'fail'
+    assert ds.GetLayerByName('a_layer') is not None
 
 
 
@@ -980,9 +861,7 @@ def test_ogr_carto_test_ogrsf():
 
     ret = gdaltest.runexternal(test_cli_utilities.get_test_ogrsf_path() + ' --config CARTO_HTTPS NO --config CARTO_PAGE_SIZE 300 -ro "CARTO:gdalautotest2 tables=tm_world_borders_simpl_0_3"')
 
-    if ret.find('INFO') == -1 or ret.find('ERROR') != -1:
-        print(ret)
-        return 'fail'
+    assert ret.find('INFO') != -1 and ret.find('ERROR') == -1
 
     return 'success'
 
@@ -1018,8 +897,7 @@ def ogr_carto_rw_1():
         return 'skip'
 
     ds = ogr.Open(ogrtest.carto_connection, update=1)
-    if ds is None:
-        return 'fail'
+    assert ds is not None
 
     a_uuid = str(uuid.uuid1()).replace('-', '_')
     lyr_name = "LAYER_" + a_uuid
@@ -1044,8 +922,7 @@ def ogr_carto_rw_1():
     f = ogr.Feature(lyr.GetLayerDefn())
 
     ret = lyr.CreateFeature(f)
-    if ret != 0:
-        return 'fail'
+    assert ret == 0
 
     f.SetFID(-1)
     f.SetField('STRFIELD', "fo'o")
@@ -1056,15 +933,13 @@ def ogr_carto_rw_1():
     f.SetField('bool', 0)
     f.SetGeometry(ogr.CreateGeometryFromWkt('POINT (1 2)'))
     ret = lyr.CreateFeature(f)
-    if ret != 0:
-        return 'fail'
+    assert ret == 0
 
     f.SetField('intfield', 456)
     f.SetField('bool', 1)
     f.SetGeometry(ogr.CreateGeometryFromWkt('POINT (3 4)'))
     ret = lyr.SetFeature(f)
-    if ret != 0:
-        return 'fail'
+    assert ret == 0
     fid = f.GetFID()
 
     ds = None
@@ -1075,15 +950,13 @@ def ogr_carto_rw_1():
     for lyr in ds:
         if lyr.GetName() == lyr_name:
             found = True
-    if not found:
-        return 'fail'
+    assert found
     lyr = ds.GetLayerByName(lyr_name)
     found = False
     for i in range(lyr.GetLayerDefn().GetFieldCount()):
         if lyr.GetLayerDefn().GetFieldDefn(i).GetName() == 'strfield':
             found = True
-    if not found:
-        return 'fail'
+    assert found
     f = lyr.GetFeature(fid)
     if f.GetField('strfield') != "fo'o" or \
        f.GetField('intfield') != 456 or \
diff --git a/autotest/ogr/ogr_cloudant.py b/autotest/ogr/ogr_cloudant.py
index 249dcfc899dc..cfda17131733 100755
--- a/autotest/ogr/ogr_cloudant.py
+++ b/autotest/ogr/ogr_cloudant.py
@@ -79,18 +79,13 @@ def test_ogr_cloudant_GetFeatureCount():
         return 'skip'
 
     ds = ogr.Open('cloudant:%s/%s' % (ogrtest.cloudant_test_server, ogrtest.cloudant_test_layer))
-    if ds is None:
-        return 'fail'
+    assert ds is not None
 
     lyr = ds.GetLayer(0)
-    if lyr is None:
-        return 'fail'
+    assert lyr is not None
 
     count = lyr.GetFeatureCount()
-    if count != 52:
-        gdaltest.post_reason('did not get expected feature count')
-        print(count)
-        return 'fail'
+    assert count == 52, 'did not get expected feature count'
 
     return 'success'
 
@@ -103,17 +98,13 @@ def test_ogr_cloudant_GetNextFeature():
         return 'skip'
 
     ds = ogr.Open('cloudant:%s/%s' % (ogrtest.cloudant_test_server, ogrtest.cloudant_test_layer))
-    if ds is None:
-        return 'fail'
+    assert ds is not None
 
     lyr = ds.GetLayer(0)
-    if lyr is None:
-        return 'fail'
+    assert lyr is not None
 
     feat = lyr.GetNextFeature()
-    if feat is None:
-        gdaltest.post_reason('did not get expected feature')
-        return 'fail'
+    assert feat is not None, 'did not get expected feature'
     if feat.GetField('_id') != '0400000US01':
         gdaltest.post_reason('did not get expected feature')
         feat.DumpReadable()
@@ -130,12 +121,10 @@ def test_ogr_cloudant_GetSpatialRef():
         return 'skip'
 
     ds = ogr.Open('cloudant:%s/%s' % (ogrtest.cloudant_test_server, ogrtest.cloudant_test_layer))
-    if ds is None:
-        return 'fail'
+    assert ds is not None
 
     lyr = ds.GetLayer(0)
-    if lyr is None:
-        return 'fail'
+    assert lyr is not None
 
     sr = lyr.GetSpatialRef()
 
@@ -153,22 +142,16 @@ def test_ogr_cloudant_GetExtent():
         return 'skip'
 
     ds = ogr.Open('cloudant:%s/%s' % (ogrtest.cloudant_test_server, ogrtest.cloudant_test_layer))
-    if ds is None:
-        return 'fail'
+    assert ds is not None
 
     lyr = ds.GetLayer(0)
-    if lyr is None:
-        return 'fail'
+    assert lyr is not None
 
     extent = lyr.GetExtent()
-    if extent is None:
-        gdaltest.post_reason('did not get expected extent')
-        return 'fail'
+    assert extent is not None, 'did not get expected extent'
 
-    if extent != (-179.14734, 179.77847, 17.884813, 71.352561):
-        gdaltest.post_reason('did not get expected extent')
-        print(extent)
-        return 'fail'
+    assert extent == (-179.14734, 179.77847, 17.884813, 71.352561), \
+        'did not get expected extent'
 
     return 'success'
 
@@ -184,19 +167,15 @@ def test_ogr_cloudant_SetSpatialFilter():
         return 'skip'
 
     ds = ogr.Open('cloudant:%s/%s' % (ogrtest.cloudant_test_server, ogrtest.cloudant_test_layer))
-    if ds is None:
-        return 'fail'
+    assert ds is not None
 
     lyr = ds.GetLayer(0)
-    if lyr is None:
-        return 'fail'
+    assert lyr is not None
 
     lyr.SetSpatialFilterRect(-104.9847, 39.7392, -104.9847, 39.7392)
 
     feat = lyr.GetNextFeature()
-    if feat is None:
-        gdaltest.post_reason('did not get expected feature')
-        return 'fail'
+    assert feat is not None, 'did not get expected feature'
     if feat.GetField('NAME') != 'Colorado':
         gdaltest.post_reason('did not get expected feature')
         feat.DumpReadable()
diff --git a/autotest/ogr/ogr_couchdb.py b/autotest/ogr/ogr_couchdb.py
index 61a0904b50dd..14817d984c69 100755
--- a/autotest/ogr/ogr_couchdb.py
+++ b/autotest/ogr/ogr_couchdb.py
@@ -77,8 +77,7 @@ def test_ogr_couchdb_1():
                          layerName=ogrtest.couchdb_temp_layer_name,
                          layerCreationOptions=['UPDATE_PERMISSIONS=ALL'])
     ds = ogr.Open('couchdb:%s' % ogrtest.couchdb_test_server, update=1)
-    if ds is None:
-        return 'fail'
+    assert ds is not None
     lyr = ds.GetLayerByName(ogrtest.couchdb_temp_layer_name)
     f = lyr.GetNextFeature()
     if f['AREA'] != 215229.266 or f['EAS_ID'] != '168' or f.GetGeometryRef() is None:
@@ -97,8 +96,7 @@ def test_ogr_couchdb_2():
         return 'skip'
 
     ds = ogr.Open('couchdb:%s' % ogrtest.couchdb_test_server, update=1)
-    if ds is None:
-        return 'fail'
+    assert ds is not None
     lyr = ds.CreateLayer(ogrtest.couchdb_temp_layer_name, geom_type=ogr.wkbNone, options=['UPDATE_PERMISSIONS=ALL'])
     lyr.CreateField(ogr.FieldDefn('str_field', ogr.OFTString))
 
@@ -139,8 +137,7 @@ def test_ogr_couchdb_cleanup():
         return 'skip'
 
     ds = ogr.Open('couchdb:%s' % ogrtest.couchdb_test_server, update=1)
-    if ds is None:
-        return 'fail'
+    assert ds is not None
     ds.ExecuteSQL('DELLAYER:' + ogrtest.couchdb_temp_layer_name)
 
     return 'success'
diff --git a/autotest/ogr/ogr_csv.py b/autotest/ogr/ogr_csv.py
index ab187208bff0..9878569412ad 100755
--- a/autotest/ogr/ogr_csv.py
+++ b/autotest/ogr/ogr_csv.py
@@ -62,8 +62,7 @@ def ogr_csv_check_layer(lyr, expect_code_as_numeric):
         expect = ['8901', '8902', '8903', '8904']
 
     tr = ogrtest.check_features_against_list(lyr, 'PRIME_MERIDIAN_CODE', expect)
-    if not tr:
-        return 'fail'
+    assert tr
 
     lyr.ResetReading()
 
@@ -72,8 +71,7 @@ def ogr_csv_check_layer(lyr, expect_code_as_numeric):
               'Instituto Geografico "Augustin Cadazzi" (IGAC); Bogota']
 
     tr = ogrtest.check_features_against_list(lyr, 'INFORMATION_SOURCE', expect)
-    if not tr:
-        return 'fail'
+    assert tr
 
     lyr.ResetReading()
 
@@ -89,19 +87,15 @@ def test_ogr_csv_2():
         return 'skip'
 
     with gdaltest.error_handler():
-        if gdaltest.csv_ds.CreateLayer('foo') is not None:
-            return 'fail'
-        if gdaltest.csv_ds.DeleteLayer(0) == 0:
-            return 'fail'
+        assert gdaltest.csv_ds.CreateLayer('foo') is None
+        assert gdaltest.csv_ds.DeleteLayer(0) != 0
 
     lyr = gdaltest.csv_ds.GetLayerByName('prime_meridian')
 
     f = ogr.Feature(lyr.GetLayerDefn())
     with gdaltest.error_handler():
-        if lyr.CreateField(ogr.FieldDefn('foo')) == 0:
-            return 'fail'
-        if lyr.CreateFeature(f) == 0:
-            return 'fail'
+        assert lyr.CreateField(ogr.FieldDefn('foo')) != 0
+        assert lyr.CreateFeature(f) != 0
 
     return ogr_csv_check_layer(lyr, False)
 
@@ -172,14 +166,12 @@ def test_ogr_csv_3():
     # No longer valid since we have editing capabilities
     if False:  # pylint: disable=using-constant-test
         # Check that we cannot add a new field now
-        if gdaltest.csv_lyr1.TestCapability(ogr.OLCCreateField) != 0:
-            return 'fail'
+        assert gdaltest.csv_lyr1.TestCapability(ogr.OLCCreateField) == 0
         field_defn = ogr.FieldDefn('dummy', ogr.OFTString)
         gdal.PushErrorHandler('CPLQuietErrorHandler')
         ret = gdaltest.csv_lyr1.CreateField(field_defn)
         gdal.PopErrorHandler()
-        if ret == 0:
-            return 'fail'
+        assert ret != 0
 
     return 'success'
 
@@ -231,27 +223,19 @@ def test_ogr_csv_7():
         return 'skip'
 
     lyr = gdaltest.csv_tmpds.GetLayer(0)
-    if lyr.GetName() != 'pm1':
-        gdaltest.post_reason('unexpected name for first layer')
-        return 'fail'
+    assert lyr.GetName() == 'pm1', 'unexpected name for first layer'
 
     gdaltest.csv_lyr1 = None
     err = gdaltest.csv_tmpds.DeleteLayer(0)
 
-    if err != 0:
-        gdaltest.post_reason('got error code from DeleteLayer')
-        return 'fail'
+    assert err == 0, 'got error code from DeleteLayer'
 
-    if gdaltest.csv_tmpds.GetLayerCount() != 1 \
-       or gdaltest.csv_tmpds.GetLayer(0).GetName() != 'pm2':
-        gdaltest.post_reason('Layer not destroyed properly?')
-        return 'fail'
+    assert gdaltest.csv_tmpds.GetLayerCount() == 1 and gdaltest.csv_tmpds.GetLayer(0).GetName() == 'pm2', \
+        'Layer not destroyed properly?'
 
     with gdaltest.error_handler():
-        if gdaltest.csv_tmpds.DeleteLayer(-1) == 0:
-            return 'fail'
-        if gdaltest.csv_tmpds.DeleteLayer(gdaltest.csv_tmpds.GetLayerCount()) == 0:
-            return 'fail'
+        assert gdaltest.csv_tmpds.DeleteLayer(-1) != 0
+        assert gdaltest.csv_tmpds.DeleteLayer(gdaltest.csv_tmpds.GetLayerCount()) != 0
 
     gdaltest.csv_tmpds = None
 
@@ -297,8 +281,7 @@ def test_ogr_csv_9():
     expect = ['8901', '8902', '8903', '8904', '7000']
 
     tr = ogrtest.check_features_against_list(lyr, 'PRIME_MERIDIAN_CODE', expect)
-    if not tr:
-        return 'fail'
+    assert tr
 
     lyr.ResetReading()
 
@@ -308,8 +291,7 @@ def test_ogr_csv_9():
               'This is a newline test\n']
 
     tr = ogrtest.check_features_against_list(lyr, 'INFORMATION_SOURCE', expect)
-    if not tr:
-        return 'fail'
+    assert tr
 
     lyr.ResetReading()
 
@@ -326,52 +308,40 @@ def test_ogr_csv_10():
 
     lyr = gdaltest.csv_ds.GetLayerByName('prime_meridian')
 
-    if lyr.TestCapability('SequentialWrite'):
-        gdaltest.post_reason('should not have write access to readonly layer')
-        return 'fail'
+    assert not lyr.TestCapability('SequentialWrite'), \
+        'should not have write access to readonly layer'
 
-    if lyr.TestCapability('RandomRead'):
-        gdaltest.post_reason('CSV files do not efficiently support '
+    assert not lyr.TestCapability('RandomRead'), \
+        ('CSV files do not efficiently support '
                              'random reading.')
-        return 'fail'
 
-    if lyr.TestCapability('FastGetExtent'):
-        gdaltest.post_reason('CSV files do not support getextent')
-        return 'fail'
+    assert not lyr.TestCapability('FastGetExtent'), 'CSV files do not support getextent'
 
-    if lyr.TestCapability('FastFeatureCount'):
-        gdaltest.post_reason('CSV files do not support fast feature count')
-        return 'fail'
+    assert not lyr.TestCapability('FastFeatureCount'), \
+        'CSV files do not support fast feature count'
 
-    if not ogr.GetDriverByName('CSV').TestCapability('DeleteDataSource'):
-        gdaltest.post_reason('CSV files do support DeleteDataSource')
-        return 'fail'
+    assert ogr.GetDriverByName('CSV').TestCapability('DeleteDataSource'), \
+        'CSV files do support DeleteDataSource'
 
-    if not ogr.GetDriverByName('CSV').TestCapability('CreateDataSource'):
-        gdaltest.post_reason('CSV files do support CreateDataSource')
-        return 'fail'
+    assert ogr.GetDriverByName('CSV').TestCapability('CreateDataSource'), \
+        'CSV files do support CreateDataSource'
 
-    if gdaltest.csv_ds.TestCapability('CreateLayer'):
-        gdaltest.post_reason('readonly datasource should not CreateLayer')
-        return 'fail'
+    assert not gdaltest.csv_ds.TestCapability('CreateLayer'), \
+        'readonly datasource should not CreateLayer'
 
-    if gdaltest.csv_ds.TestCapability('DeleteLayer'):
-        gdaltest.post_reason('should not have deletelayer on readonly ds.')
-        return 'fail'
+    assert not gdaltest.csv_ds.TestCapability('DeleteLayer'), \
+        'should not have deletelayer on readonly ds.'
 
     lyr = gdaltest.csv_tmpds.GetLayer(0)
 
-    if not lyr.TestCapability('SequentialWrite'):
-        gdaltest.post_reason('should have write access to updatable layer')
-        return 'fail'
+    assert lyr.TestCapability('SequentialWrite'), \
+        'should have write access to updatable layer'
 
-    if not gdaltest.csv_tmpds.TestCapability('CreateLayer'):
-        gdaltest.post_reason('should have createlayer on updatable ds.')
-        return 'fail'
+    assert gdaltest.csv_tmpds.TestCapability('CreateLayer'), \
+        'should have createlayer on updatable ds.'
 
-    if not gdaltest.csv_tmpds.TestCapability('DeleteLayer'):
-        gdaltest.post_reason('should have deletelayer on updatable ds.')
-        return 'fail'
+    assert gdaltest.csv_tmpds.TestCapability('DeleteLayer'), \
+        'should have deletelayer on updatable ds.'
 
     return 'success'
 
@@ -384,83 +354,61 @@ def ogr_csv_check_testcsvt(lyr):
 
     expect = [12, None]
     tr = ogrtest.check_features_against_list(lyr, 'INTCOL', expect)
-    if not tr:
-        return 'fail'
+    assert tr
 
     lyr.ResetReading()
 
     expect = [5.7, None]
     tr = ogrtest.check_features_against_list(lyr, 'REALCOL', expect)
-    if not tr:
-        return 'fail'
+    assert tr
 
     lyr.ResetReading()
 
     expect = ['foo', '']
     tr = ogrtest.check_features_against_list(lyr, 'STRINGCOL', expect)
-    if not tr:
-        return 'fail'
+    assert tr
 
     lyr.ResetReading()
     feat = lyr.GetNextFeature()
-    if feat.GetFieldAsString('DATETIME') != '2008/12/25 11:22:33':
-        print(feat.GetFieldAsString('DATETIME'))
-        return 'fail'
+    assert feat.GetFieldAsString('DATETIME') == '2008/12/25 11:22:33'
 
     feat = lyr.GetNextFeature()
-    if feat.GetFieldAsString('DATETIME') != '':
-        print(feat.GetFieldAsString('DATETIME'))
-        return 'fail'
+    assert feat.GetFieldAsString('DATETIME') == ''
 
     lyr.ResetReading()
     feat = lyr.GetNextFeature()
-    if feat.GetFieldAsString('DATE') != '2008/12/25':
-        print(feat.GetFieldAsString('DATE'))
-        return 'fail'
+    assert feat.GetFieldAsString('DATE') == '2008/12/25'
 
     feat = lyr.GetNextFeature()
-    if feat.GetFieldAsString('DATE') != '':
-        print(feat.GetFieldAsString('DATE'))
-        return 'fail'
+    assert feat.GetFieldAsString('DATE') == ''
 
     lyr.ResetReading()
     feat = lyr.GetNextFeature()
-    if feat.GetFieldAsString('TIME') != '11:22:33':
-        print(feat.GetFieldAsString('TIME'))
-        return 'fail'
+    assert feat.GetFieldAsString('TIME') == '11:22:33'
 
     feat = lyr.GetNextFeature()
-    if feat.GetFieldAsString('TIME') != '':
-        print(feat.GetFieldAsString('TIME'))
-        return 'fail'
+    assert feat.GetFieldAsString('TIME') == ''
 
-    if lyr.GetLayerDefn().GetFieldDefn(0).GetWidth() != 5:
-        gdaltest.post_reason('Field 0 : expecting width = 5')
-        return 'fail'
+    assert lyr.GetLayerDefn().GetFieldDefn(0).GetWidth() == 5, \
+        'Field 0 : expecting width = 5'
 
-    if lyr.GetLayerDefn().GetFieldDefn(1).GetWidth() != 10:
-        gdaltest.post_reason('Field 1 : expecting width = 10')
-        return 'fail'
+    assert lyr.GetLayerDefn().GetFieldDefn(1).GetWidth() == 10, \
+        'Field 1 : expecting width = 10'
 
-    if lyr.GetLayerDefn().GetFieldDefn(1).GetPrecision() != 7:
-        gdaltest.post_reason('Field 1 : expecting precision = 7')
-        return 'fail'
+    assert lyr.GetLayerDefn().GetFieldDefn(1).GetPrecision() == 7, \
+        'Field 1 : expecting precision = 7'
 
-    if lyr.GetLayerDefn().GetFieldDefn(2).GetWidth() != 15:
-        gdaltest.post_reason('Field 2 : expecting width = 15')
-        return 'fail'
+    assert lyr.GetLayerDefn().GetFieldDefn(2).GetWidth() == 15, \
+        'Field 2 : expecting width = 15'
 
-    if lyr.GetLayerDefn().GetFieldDefn(6).GetType() != ogr.OFTDateTime:
-        gdaltest.post_reason('Field DATETIME : wrong type')
-        return 'fail'
+    assert lyr.GetLayerDefn().GetFieldDefn(6).GetType() == ogr.OFTDateTime, \
+        'Field DATETIME : wrong type'
 
-    if lyr.GetLayerDefn().GetFieldDefn(7).GetType() != ogr.OFTDate:
-        gdaltest.post_reason('Field DATETIME : wrong type')
-        return 'fail'
+    assert lyr.GetLayerDefn().GetFieldDefn(7).GetType() == ogr.OFTDate, \
+        'Field DATETIME : wrong type'
 
-    if lyr.GetLayerDefn().GetFieldDefn(8).GetType() != ogr.OFTTime:
-        gdaltest.post_reason('Field DATETIME : wrong type')
-        return 'fail'
+    assert lyr.GetLayerDefn().GetFieldDefn(8).GetType() == ogr.OFTTime, \
+        'Field DATETIME : wrong type'
 
     lyr.ResetReading()
 
@@ -479,8 +427,7 @@ def test_ogr_csv_11():
     gdaltest.csv_ds = None
     gdaltest.csv_ds = ogr.Open('data/testcsvt.csv')
 
-    if gdaltest.csv_ds is None:
-        return 'fail'
+    assert gdaltest.csv_ds is not None
 
     lyr = gdaltest.csv_ds.GetLayerByName('testcsvt')
 
@@ -527,8 +474,7 @@ def test_ogr_csv_12():
         feat = srclyr.GetNextFeature()
 
     with gdaltest.error_handler():
-        if gdaltest.csv_tmpds.CreateLayer('testcsvt_copy') is not None:
-            return 'fail'
+        assert gdaltest.csv_tmpds.CreateLayer('testcsvt_copy') is None
 
     #######################################################
     # Closes everything and reopen
@@ -539,8 +485,7 @@ def test_ogr_csv_12():
 
     #######################################################
     # Checks copy
-    if gdaltest.csv_ds is None:
-        return 'fail'
+    assert gdaltest.csv_ds is not None
 
     lyr = gdaltest.csv_ds.GetLayerByName('testcsvt_copy')
 
@@ -565,8 +510,7 @@ def test_ogr_csv_13():
     lyr.CreateField(field_defn)
 
     # Some applications expect the WKT column not to be exposed. Check it
-    if lyr.GetLayerDefn().GetFieldCount() != 1:
-        return 'fail'
+    assert lyr.GetLayerDefn().GetFieldCount() == 1
 
     dst_feat = ogr.Feature(feature_def=lyr.GetLayerDefn())
     dst_feat.SetGeometry(ogr.CreateGeometryFromWkt('POINT(1 2)'))
@@ -634,85 +578,71 @@ def test_ogr_csv_13():
 
     expect = ['POINT (1 2)']
     tr = ogrtest.check_features_against_list(lyr, 'WKT', expect)
-    if not tr:
-        return 'fail'
+    assert tr
 
     lyr.ResetReading()
     expect = ['avalue']
     tr = ogrtest.check_features_against_list(lyr, 'ADATA', expect)
-    if not tr:
-        return 'fail'
+    assert tr
 
     # Test as_wkt_no_field
     lyr = gdaltest.csv_tmpds.GetLayerByName('as_wkt_no_field')
 
     expect = ['POINT (1 2)']
     tr = ogrtest.check_features_against_list(lyr, 'WKT', expect)
-    if not tr:
-        return 'fail'
+    assert tr
 
     # Test AS_XY
     lyr = gdaltest.csv_tmpds.GetLayerByName('as_xy')
 
-    if lyr.GetLayerDefn().GetFieldDefn(0).GetName() != 'X':
-        return 'fail'
+    assert lyr.GetLayerDefn().GetFieldDefn(0).GetName() == 'X'
 
     expect = [1, None]
     tr = ogrtest.check_features_against_list(lyr, 'X', expect)
-    if not tr:
-        return 'fail'
+    assert tr
 
     lyr.ResetReading()
     expect = [2, None]
     tr = ogrtest.check_features_against_list(lyr, 'Y', expect)
-    if not tr:
-        return 'fail'
+    assert tr
 
     lyr.ResetReading()
     expect = ['avalue', 'avalue']
     tr = ogrtest.check_features_against_list(lyr, 'ADATA', expect)
-    if not tr:
-        return 'fail'
+    assert tr
 
     # Test AS_YX
     lyr = gdaltest.csv_tmpds.GetLayerByName('as_yx')
 
-    if lyr.GetLayerDefn().GetFieldDefn(0).GetName() != 'Y':
-        return 'fail'
+    assert lyr.GetLayerDefn().GetFieldDefn(0).GetName() == 'Y'
 
     expect = [1]
     tr = ogrtest.check_features_against_list(lyr, 'X', expect)
-    if not tr:
-        return 'fail'
+    assert tr
 
     lyr.ResetReading()
     expect = [2]
     tr = ogrtest.check_features_against_list(lyr, 'Y', expect)
-    if not tr:
-        return 'fail'
+    assert tr
 
     # Test AS_XYZ
     lyr = gdaltest.csv_tmpds.GetLayerByName('as_xyz')
 
-    if lyr.GetLayerDefn().GetFieldDefn(0).GetName() != 'X':
-        return 'fail'
+    assert lyr.GetLayerDefn().GetFieldDefn(0).GetName() == 'X'
 
     expect = [1]
     tr = ogrtest.check_features_against_list(lyr, 'X', expect)
-    if not tr:
-        return 'fail'
+    assert tr
 
     lyr.ResetReading()
     expect = [2]
     tr = ogrtest.check_features_against_list(lyr, 'Y', expect)
-    if not tr:
-        return 'fail'
+    assert tr
 
     lyr.ResetReading()
     expect = [3]
     tr = ogrtest.check_features_against_list(lyr, 'Z', expect)
-    if not tr:
-        return 'fail'
+    assert tr
 
     return 'success'
 
@@ -772,23 +702,19 @@ def test_ogr_csv_17():
     csv_ds = ogr.Open('data/wkt.csv')
     csv_lyr = csv_ds.GetLayer(0)
 
-    if csv_lyr.GetLayerDefn().GetGeomType() != ogr.wkbUnknown:
-        gdaltest.post_reason('did not get wktUnknown for geometry type.')
-        return 'fail'
+    assert csv_lyr.GetLayerDefn().GetGeomType() == ogr.wkbUnknown, \
+        'did not get wktUnknown for geometry type.'
 
     feat = csv_lyr.GetNextFeature()
-    if feat.GetField('WKT') != 'POLYGON((6.25 1.25,7.25 1.25,7.25 2.25,6.25 2.25,6.25 1.25))':
-        gdaltest.post_reason('feature 1: expected wkt value')
-        return 'fail'
+    assert feat.GetField('WKT') == 'POLYGON((6.25 1.25,7.25 1.25,7.25 2.25,6.25 2.25,6.25 1.25))', \
+        'feature 1: expected wkt value'
 
-    if ogrtest.check_feature_geometry(feat, 'POLYGON((6.25 1.25,7.25 1.25,7.25 2.25,6.25 2.25,6.25 1.25))'):
-        return 'fail'
+    assert not ogrtest.check_feature_geometry(feat, 'POLYGON((6.25 1.25,7.25 1.25,7.25 2.25,6.25 2.25,6.25 1.25))')
 
     feat = csv_lyr.GetNextFeature()
 
     feat = csv_lyr.GetNextFeature()
-    if ogrtest.check_feature_geometry(feat, 'POLYGON((1.001 1.001,3.999 3.999,3.2 1.6,1.001 1.001))'):
-        return 'fail'
+    assert not ogrtest.check_feature_geometry(feat, 'POLYGON((1.001 1.001,3.999 3.999,3.2 1.6,1.001 1.001))')
 
     return 'success'
 
@@ -823,27 +749,21 @@ def test_ogr_csv_19():
     gdaltest.csv_ds = None
     gdaltest.csv_ds = ogr.Open('data/testnull.csv')
 
-    if gdaltest.csv_ds is None:
-        return 'fail'
+    assert gdaltest.csv_ds is not None
 
     lyr = gdaltest.csv_ds.GetLayerByName('testnull')
 
     lyr.ResetReading()
     with gdaltest.error_handler():
-        if not ogrtest.check_features_against_list(lyr, 'INTCOL', [12]):
-            return 'fail'
+        assert ogrtest.check_features_against_list(lyr, 'INTCOL', [12])
     lyr.ResetReading()
-    if not ogrtest.check_features_against_list(lyr, 'REALCOL', [5.7]):
-        return 'fail'
+    assert ogrtest.check_features_against_list(lyr, 'REALCOL', [5.7])
     lyr.ResetReading()
-    if not ogrtest.check_features_against_list(lyr, 'INTCOL2', [None]):
-        return 'fail'
+    assert ogrtest.check_features_against_list(lyr, 'INTCOL2', [None])
     lyr.ResetReading()
-    if not ogrtest.check_features_against_list(lyr, 'REALCOL2', [None]):
-        return 'fail'
+    assert ogrtest.check_features_against_list(lyr, 'REALCOL2', [None])
     lyr.ResetReading()
-    if not ogrtest.check_features_against_list(lyr, 'STRINGCOL', ['foo']):
-        return 'fail'
+    assert ogrtest.check_features_against_list(lyr, 'STRINGCOL', ['foo'])
 
     return 'success'
 
@@ -859,44 +779,36 @@ def test_ogr_csv_20():
     gdaltest.csv_ds = None
 
     gdaltest.csv_ds = ogr.Open('data/testnumheader1.csv')
-    if gdaltest.csv_ds is None:
-        return 'fail'
+    assert gdaltest.csv_ds is not None
 
     lyr = gdaltest.csv_ds.GetLayerByName('testnumheader1')
-    if lyr is None:
-        return 'fail'
+    assert lyr is not None
     lyr.ResetReading()
 
     expect = ['1 - 2', '2-3']
     got = [lyr.GetLayerDefn().GetFieldDefn(0).GetNameRef(),
            lyr.GetLayerDefn().GetFieldDefn(1).GetNameRef()]
-    if got[0] != expect[0]:
-        print('column 0 got name %s expected %s' % (str(got[0]), str(expect[0])))
-        return 'fail'
-    if got[1] != expect[1]:
-        print('column 1 got name %s expected %s' % (str(got[1]), str(expect[1])))
-        return 'fail'
+    assert got[0] == expect[0], \
+        ('column 0 got name %s expected %s' % (str(got[0]), str(expect[0])))
+    assert got[1] == expect[1], \
+        ('column 1 got name %s expected %s' % (str(got[1]), str(expect[1])))
 
     gdaltest.csv_ds = None
 
     gdaltest.csv_ds = ogr.Open('data/testnumheader2.csv')
-    if gdaltest.csv_ds is None:
-        return 'fail'
+    assert gdaltest.csv_ds is not None
 
     lyr = gdaltest.csv_ds.GetLayerByName('testnumheader2')
-    if lyr is None:
-        return 'fail'
+    assert lyr is not None
     lyr.ResetReading()
 
     expect = ['field_1', 'field_2']
     got = [lyr.GetLayerDefn().GetFieldDefn(0).GetNameRef(),
            lyr.GetLayerDefn().GetFieldDefn(1).GetNameRef()]
-    if got[0] != expect[0]:
-        print('column 0 got name %s expected %s' % (str(got[0]), str(expect[0])))
-        return 'fail'
-    if got[1] != expect[1]:
-        print('column 1 got name %s expected %s' % (str(got[1]), str(expect[1])))
-        return 'fail'
+    assert got[0] == expect[0], \
+        ('column 0 got name %s expected %s' % (str(got[0]), str(expect[0])))
+    assert got[1] == expect[1], \
+        ('column 1 got name %s expected %s' % (str(got[1]), str(expect[1])))
 
     return 'success'
 
@@ -912,38 +824,32 @@ def test_ogr_csv_21():
     gdaltest.csv_ds = None
 
     gdaltest.csv_ds = ogr.Open('data/testquoteheader1.csv')
-    if gdaltest.csv_ds is None:
-        return 'fail'
+    assert gdaltest.csv_ds is not None
 
     lyr = gdaltest.csv_ds.GetLayerByName('testquoteheader1')
-    if lyr is None:
-        return 'fail'
+    assert lyr is not None
     lyr.ResetReading()
 
     expect = ['test', '2000', '2000.12']
     for i in range(0, 3):
         got = lyr.GetLayerDefn().GetFieldDefn(i).GetNameRef()
-        if got != expect[i]:
-            print('column %d got name %s expected %s' % (i, str(got), str(expect[i])))
-            return 'fail'
+        assert got == expect[i], \
+            ('column %d got name %s expected %s' % (i, str(got), str(expect[i])))
 
     gdaltest.csv_ds = None
 
     gdaltest.csv_ds = ogr.Open('data/testquoteheader2.csv')
-    if gdaltest.csv_ds is None:
-        return 'fail'
+    assert gdaltest.csv_ds is not None
 
     lyr = gdaltest.csv_ds.GetLayerByName('testquoteheader2')
-    if lyr is None:
-        return 'fail'
+    assert lyr is not None
     lyr.ResetReading()
 
     expect = ['field_1', 'field_2', 'field_3']
     for i in range(0, 3):
         got = lyr.GetLayerDefn().GetFieldDefn(i).GetNameRef()
-        if got != expect[i]:
-            print('column %d got name %s expected %s' % (i, str(got), str(expect[i])))
-            return 'fail'
+        assert got == expect[i], \
+            ('column %d got name %s expected %s' % (i, str(got), str(expect[i])))
 
     return 'success'
 
@@ -957,10 +863,7 @@ def test_ogr_csv_22():
     lyr = ds.GetLayer(0)
     fld0_name = lyr.GetLayerDefn().GetFieldDefn(0).GetNameRef()
 
-    if fld0_name != 'id':
-        gdaltest.post_reason('bad field name')
-        print(fld0_name)
-        return 'fail'
+    assert fld0_name == 'id', 'bad field name'
 
     return 'success'
 
@@ -988,9 +891,7 @@ def test_ogr_csv_23():
         exec("ogrtest.ret = (data[:6] == b'\\xef\\xbb\\xbfWKT')")
     else:
         ogrtest.ret = (data[:6] == '\xef\xbb\xbfWKT')
-    if not ogrtest.ret:
-        gdaltest.post_reason("No UTF8 BOM header on output")
-        return 'fail'
+    assert ogrtest.ret, "No UTF8 BOM header on output"
 
     # create a CSV file without UTF8 BOM
     ds = ogr.Open('tmp/csvwrk', update=1)
@@ -1009,9 +910,7 @@ def test_ogr_csv_23():
     ds = None
 
     data = open('tmp/csvwrk/utf8no.csv', 'rb').read()
-    if data[:3] == '\xef\xbb\xbfWKT':
-        gdaltest.post_reason("Found UTF8 BOM header on output!")
-        return 'fail'
+    assert data[:3] != '\xef\xbb\xbfWKT', "Found UTF8 BOM header on output!"
 
     return 'success'
 
@@ -1040,14 +939,11 @@ def test_ogr_csv_24():
 
     ds = ogr.Open('/vsimem/single.csv')
     lyr = ds.GetLayer(0)
-    if lyr.GetLayerDefn().GetFieldCount() != 1:
-        return 'fail'
+    assert lyr.GetLayerDefn().GetFieldCount() == 1
     feat = lyr.GetNextFeature()
-    if feat.GetField(0) != '':
-        return 'fail'
+    assert feat.GetField(0) == ''
     feat = lyr.GetNextFeature()
-    if feat.GetField(0) != 'bar':
-        return 'fail'
+    assert feat.GetField(0) == 'bar'
     ds = None
 
     gdal.Unlink('/vsimem/single.csv')
@@ -1074,9 +970,8 @@ def test_ogr_csv_25():
     EXPECTED = 'foo,\n"windows newline:\r\nlinux newline:\nend of string:"\n'
 
     data = open('tmp/csvwrk/newlines.csv', 'rb').read().decode('ascii')
-    if data != EXPECTED:
-        gdaltest.post_reason("Newlines changed:\n\texpected=%s\n\tgot=     %s" % (repr(EXPECTED), repr(data)))
-        return 'fail'
+    assert data == EXPECTED, \
+        ("Newlines changed:\n\texpected=%s\n\tgot=     %s" % (repr(EXPECTED), repr(data)))
 
     return 'success'
 
@@ -1107,9 +1002,7 @@ def test_ogr_csv_26():
     EXPECTED = 'foo,\n10.5000000000000000000000000\n'
 
     data = open('tmp/csvwrk/num_padding.csv', 'rb').read().decode('ascii')
-    if data != EXPECTED:
-        gdaltest.post_reason("expected=%s got= %s" % (repr(EXPECTED), repr(data)))
-        return 'fail'
+    assert data == EXPECTED, ("expected=%s got= %s" % (repr(EXPECTED), repr(data)))
 
     return 'success'
 
@@ -1122,8 +1015,7 @@ def test_ogr_csv_27():
     ds = ogr.Open('data/test_eurostat.tsv')
     lyr = ds.GetLayer(0)
     layer_defn = lyr.GetLayerDefn()
-    if layer_defn.GetFieldCount() != 8:
-        return 'fail'
+    assert layer_defn.GetFieldCount() == 8
 
     expected_fields = [('unit', ogr.OFTString),
                        ('geo', ogr.OFTString),
@@ -1136,14 +1028,8 @@ def test_ogr_csv_27():
     i = 0
     for expected_field in expected_fields:
         fld = layer_defn.GetFieldDefn(i)
-        if fld.GetName() != expected_field[0]:
-            print(fld.GetName())
-            print(expected_field[0])
-            return 'fail'
-        if fld.GetType() != expected_field[1]:
-            print(fld.GetType())
-            print(expected_field[1])
-            return 'fail'
+        assert fld.GetName() == expected_field[0]
+        assert fld.GetType() == expected_field[1]
         i = i + 1
 
     feat = lyr.GetNextFeature()
@@ -1179,9 +1065,7 @@ def test_ogr_csv_28():
 
     os.unlink('tmp/ogr_csv_28.csv')
 
-    if data != '1,2\n':
-        print(data)
-        return 'fail'
+    assert data == '1,2\n'
 
     return 'success'
 
@@ -1192,16 +1076,12 @@ def test_ogr_csv_28():
 def test_ogr_csv_29():
 
     ds = ogr.GetDriverByName('CSV').CreateDataSource('tmp/ogr_csv_29', options=['GEOMETRY=AS_WKT'])
-    if ds.TestCapability(ogr.ODsCCurveGeometries) != 1:
-        return 'fail'
+    assert ds.TestCapability(ogr.ODsCCurveGeometries) == 1
     lyr = ds.CreateLayer('test', geom_type=ogr.wkbNone)
-    if lyr.CreateGeomField(ogr.GeomFieldDefn("geom__WKT_lyr1_EPSG_4326", ogr.wkbPoint)) != 0:
-        return 'fail'
-    if lyr.CreateGeomField(ogr.GeomFieldDefn("geom__WKT_lyr2_EPSG_32632", ogr.wkbPolygon)) != 0:
-        return 'fail'
+    assert lyr.CreateGeomField(ogr.GeomFieldDefn("geom__WKT_lyr1_EPSG_4326", ogr.wkbPoint)) == 0
+    assert lyr.CreateGeomField(ogr.GeomFieldDefn("geom__WKT_lyr2_EPSG_32632", ogr.wkbPolygon)) == 0
     with gdaltest.error_handler():
-        if lyr.CreateGeomField(ogr.GeomFieldDefn("geom__WKT_lyr2_EPSG_32632", ogr.wkbPolygon)) == 0:
-            return 'fail'
+        assert lyr.CreateGeomField(ogr.GeomFieldDefn("geom__WKT_lyr2_EPSG_32632", ogr.wkbPolygon)) != 0
     ds = None
 
     ds = ogr.Open('tmp/ogr_csv_29', update=1)
@@ -1214,14 +1094,11 @@ def test_ogr_csv_29():
 
     ds = ogr.Open('tmp/ogr_csv_29')
     lyr = ds.GetLayerByName('test')
-    if lyr.GetLayerDefn().GetGeomFieldCount() != 2:
-        return 'fail'
+    assert lyr.GetLayerDefn().GetGeomFieldCount() == 2
     srs = lyr.GetLayerDefn().GetGeomFieldDefn(0).GetSpatialRef()
-    if srs.GetAuthorityCode(None) != '4326':
-        return 'fail'
+    assert srs.GetAuthorityCode(None) == '4326'
     srs = lyr.GetLayerDefn().GetGeomFieldDefn(1).GetSpatialRef()
-    if srs.GetAuthorityCode(None) != '32632':
-        return 'fail'
+    assert srs.GetAuthorityCode(None) == '32632'
     feat = lyr.GetNextFeature()
     geom = feat.GetGeomFieldRef('geom__WKT_lyr1_EPSG_4326')
     if geom.ExportToWkt() != 'POINT (1 2)':
@@ -1247,9 +1124,7 @@ def test_ogr_csv_30():
 
     ret = gdaltest.runexternal(test_cli_utilities.get_test_ogrsf_path() + ' tmp/ogr_csv_29')
 
-    if ret.find('INFO') == -1 or ret.find('ERROR') != -1:
-        print(ret)
-        return 'fail'
+    assert ret.find('INFO') != -1 and ret.find('ERROR') == -1
 
     return 'success'
 
@@ -1273,9 +1148,7 @@ def test_ogr_csv_31():
         f.DumpReadable()
         return 'fail'
 
-    if lyr.GetFeatureCount() != 10:
-        print(lyr.GetFeatureCount())
-        return 'fail'
+    assert lyr.GetFeatureCount() == 10
 
     return 'success'
 
@@ -1293,12 +1166,8 @@ def test_ogr_csv_32():
     col_values = ['', '1.5', '1', '1.5', '2', '', '2014-09-27 19:01:00', '2014-09-27', '2014-09-27 20:00:00',
                   '2014-09-27', '12:34:56', 'a', 'a', '1', '1', '1.5', '2014-09-27 19:01:00', '2014-09-27', '19:01:00', '2014-09-27T00:00:00Z']
     for i in range(lyr.GetLayerDefn().GetFieldCount()):
-        if lyr.GetLayerDefn().GetFieldDefn(i).GetType() != ogr.OFTString or \
-           lyr.GetLayerDefn().GetFieldDefn(i).GetWidth() != 0:
-            print(i)
-            print(lyr.GetLayerDefn().GetFieldDefn(i).GetType())
-            print(lyr.GetLayerDefn().GetFieldDefn(i).GetWidth())
-            return 'fail'
+        assert (lyr.GetLayerDefn().GetFieldDefn(i).GetType() == ogr.OFTString and \
+           lyr.GetLayerDefn().GetFieldDefn(i).GetWidth() == 0)
         if f.GetField(i) != col_values[i]:
             print(i)
             f.DumpReadable()
@@ -1310,12 +1179,8 @@ def test_ogr_csv_32():
     lyr = ds.GetLayer(0)
     f = lyr.GetNextFeature()
     for i in range(lyr.GetLayerDefn().GetFieldCount()):
-        if lyr.GetLayerDefn().GetFieldDefn(i).GetType() != ogr.OFTString or \
-           lyr.GetLayerDefn().GetFieldDefn(i).GetWidth() != 0:
-            print(i)
-            print(lyr.GetLayerDefn().GetFieldDefn(i).GetType())
-            print(lyr.GetLayerDefn().GetFieldDefn(i).GetWidth())
-            return 'fail'
+        assert (lyr.GetLayerDefn().GetFieldDefn(i).GetType() == ogr.OFTString and \
+           lyr.GetLayerDefn().GetFieldDefn(i).GetWidth() == 0)
         if f.GetField(i) != col_values[i]:
             print(i)
             f.DumpReadable()
@@ -1332,12 +1197,8 @@ def test_ogr_csv_32():
     col_values = ['', 1.5, 1, 1.5, 2, '', '2014/09/27 19:01:00', '2014/09/27', '2014/09/27 20:00:00',
                   '2014/09/27', '12:34:56', 'a', 'a', '1', 1, 1.5, '2014/09/27 19:01:00', '2014/09/27', '19:01:00', '2014/09/27 00:00:00+00']
     for i in range(lyr.GetLayerDefn().GetFieldCount()):
-        if lyr.GetLayerDefn().GetFieldDefn(i).GetType() != col_type[i] or \
-           lyr.GetLayerDefn().GetFieldDefn(i).GetWidth() != 0:
-            print(i)
-            print(lyr.GetLayerDefn().GetFieldDefn(i).GetType())
-            print(lyr.GetLayerDefn().GetFieldDefn(i).GetWidth())
-            return 'fail'
+        assert (lyr.GetLayerDefn().GetFieldDefn(i).GetType() == col_type[i] and \
+           lyr.GetLayerDefn().GetFieldDefn(i).GetWidth() == 0)
         if f.GetField(i) != col_values[i]:
             print(i)
             f.DumpReadable()
@@ -1347,8 +1208,7 @@ def test_ogr_csv_32():
     ds = gdal.OpenEx('data/testtypeautodetect.csv', gdal.OF_VECTOR,
                      open_options=['AUTODETECT_TYPE=YES', 'AUTODETECT_SIZE_LIMIT=300'])
     lyr = ds.GetLayer(0)
-    if lyr.GetLayerDefn().GetFieldDefn(lyr.GetLayerDefn().GetFieldIndex('str3')).GetType() != ogr.OFTInteger:
-        return 'fail'
+    assert lyr.GetLayerDefn().GetFieldDefn(lyr.GetLayerDefn().GetFieldIndex('str3')).GetType() == ogr.OFTInteger
 
     # We limit to the first 2 lines
     ds = gdal.OpenEx('data/testtypeautodetect.csv', gdal.OF_VECTOR,
@@ -1361,12 +1221,8 @@ def test_ogr_csv_32():
     col_values = ['', 1.5, 1, 1.5, 2, None, '2014/09/27 19:01:00', '2014/09/27 00:00:00', '2014/09/27 20:00:00',
                   '2014/09/27', '12:34:56', 'a', 'a', '1', '1', '1.5', '2014-09-27 19:01:00', '2014-09-27', '19:01:00', '2014/09/27 00:00:00+00']
     for i in range(lyr.GetLayerDefn().GetFieldCount()):
-        if lyr.GetLayerDefn().GetFieldDefn(i).GetType() != col_type[i] or \
-           lyr.GetLayerDefn().GetFieldDefn(i).GetWidth() != 0:
-            print(i)
-            print(lyr.GetLayerDefn().GetFieldDefn(i).GetType())
-            print(lyr.GetLayerDefn().GetFieldDefn(i).GetWidth())
-            return 'fail'
+        assert (lyr.GetLayerDefn().GetFieldDefn(i).GetType() == col_type[i] and \
+           lyr.GetLayerDefn().GetFieldDefn(i).GetWidth() == 0)
         if f.GetField(i) != col_values[i]:
             print(i)
             f.DumpReadable()
@@ -1381,14 +1237,9 @@ def test_ogr_csv_32():
     col_precision = [0, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]
 
     for i in range(lyr.GetLayerDefn().GetFieldCount()):
-        if lyr.GetLayerDefn().GetFieldDefn(i).GetType() != col_type[i] or \
-           lyr.GetLayerDefn().GetFieldDefn(i).GetWidth() != col_width[i] or \
-           lyr.GetLayerDefn().GetFieldDefn(i).GetPrecision() != col_precision[i]:
-            print(i)
-            print(lyr.GetLayerDefn().GetFieldDefn(i).GetType())
-            print(lyr.GetLayerDefn().GetFieldDefn(i).GetWidth())
-            print(lyr.GetLayerDefn().GetFieldDefn(i).GetPrecision())
-            return 'fail'
+        assert (lyr.GetLayerDefn().GetFieldDefn(i).GetType() == col_type[i] and \
+           lyr.GetLayerDefn().GetFieldDefn(i).GetWidth() == col_width[i] and \
+           lyr.GetLayerDefn().GetFieldDefn(i).GetPrecision() == col_precision[i])
         if f.GetField(i) != col_values[i]:
             print(i)
             f.DumpReadable()
@@ -1403,14 +1254,9 @@ def test_ogr_csv_32():
     col_precision = [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]
 
     for i in range(lyr.GetLayerDefn().GetFieldCount()):
-        if lyr.GetLayerDefn().GetFieldDefn(i).GetType() != col_type[i] or \
-           lyr.GetLayerDefn().GetFieldDefn(i).GetWidth() != col_width[i] or \
-           lyr.GetLayerDefn().GetFieldDefn(i).GetPrecision() != col_precision[i]:
-            print(i)
-            print(lyr.GetLayerDefn().GetFieldDefn(i).GetType())
-            print(lyr.GetLayerDefn().GetFieldDefn(i).GetWidth())
-            print(lyr.GetLayerDefn().GetFieldDefn(i).GetPrecision())
-            return 'fail'
+        assert (lyr.GetLayerDefn().GetFieldDefn(i).GetType() == col_type[i] and \
+           lyr.GetLayerDefn().GetFieldDefn(i).GetWidth() == col_width[i] and \
+           lyr.GetLayerDefn().GetFieldDefn(i).GetPrecision() == col_precision[i])
         if f.GetField(i) != col_values[i]:
             print(i)
             f.DumpReadable()
@@ -1427,12 +1273,8 @@ def test_ogr_csv_32():
                   '2014/09/27 00:00:00+00', '2014-09-27T00:00:00Z']
 
     for i in range(lyr.GetLayerDefn().GetFieldCount()):
-        if lyr.GetLayerDefn().GetFieldDefn(i).GetType() != ogr.OFTString and \
-           lyr.GetLayerDefn().GetFieldDefn(i + 1).GetNameRef() != lyr.GetLayerDefn().GetFieldDefn(i).GetNameRef() + '_original':
-            print(i)
-            print(lyr.GetLayerDefn().GetFieldDefn(i).GetNameRef())
-            print(lyr.GetLayerDefn().GetFieldDefn(i + 1).GetNameRef())
-            return 'fail'
+        assert (lyr.GetLayerDefn().GetFieldDefn(i).GetType() == ogr.OFTString or \
+           lyr.GetLayerDefn().GetFieldDefn(i + 1).GetNameRef() == lyr.GetLayerDefn().GetFieldDefn(i).GetNameRef() + '_original')
         if f.GetField(i) != col_values[i]:
             print(i)
             f.DumpReadable()
@@ -1487,11 +1329,8 @@ def test_ogr_csv_33():
     f = lyr.GetNextFeature()
     col_values = [1, 1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 1, 'y']
     for i in range(lyr.GetLayerDefn().GetFieldCount()):
-        if (i < 10 and lyr.GetLayerDefn().GetFieldDefn(i).GetSubType() != ogr.OFSTBoolean) or \
-           (i >= 10 and lyr.GetLayerDefn().GetFieldDefn(i).GetSubType() == ogr.OFSTBoolean):
-            print(i)
-            print(lyr.GetLayerDefn().GetFieldDefn(i).GetSubType())
-            return 'fail'
+        assert (not (i < 10 and lyr.GetLayerDefn().GetFieldDefn(i).GetSubType() != ogr.OFSTBoolean) or \
+           (i >= 10 and lyr.GetLayerDefn().GetFieldDefn(i).GetSubType() == ogr.OFSTBoolean))
         if f.GetField(i) != col_values[i]:
             print(i)
             f.DumpReadable()
@@ -1519,15 +1358,12 @@ def test_ogr_csv_33():
 
     ds = ogr.Open('/vsimem/subtypes.csv')
     lyr = ds.GetLayer(0)
-    if lyr.GetLayerDefn().GetFieldDefn(0).GetType() != ogr.OFTInteger or \
-       lyr.GetLayerDefn().GetFieldDefn(0).GetSubType() != ogr.OFSTBoolean:
-        return 'fail'
-    if lyr.GetLayerDefn().GetFieldDefn(1).GetType() != ogr.OFTInteger or \
-       lyr.GetLayerDefn().GetFieldDefn(1).GetSubType() != ogr.OFSTInt16:
-        return 'fail'
-    if lyr.GetLayerDefn().GetFieldDefn(2).GetType() != ogr.OFTReal or \
-       lyr.GetLayerDefn().GetFieldDefn(2).GetSubType() != ogr.OFSTFloat32:
-        return 'fail'
+    assert (lyr.GetLayerDefn().GetFieldDefn(0).GetType() == ogr.OFTInteger and \
+       lyr.GetLayerDefn().GetFieldDefn(0).GetSubType() == ogr.OFSTBoolean)
+    assert (lyr.GetLayerDefn().GetFieldDefn(1).GetType() == ogr.OFTInteger and \
+       lyr.GetLayerDefn().GetFieldDefn(1).GetSubType() == ogr.OFSTInt16)
+    assert (lyr.GetLayerDefn().GetFieldDefn(2).GetType() == ogr.OFTReal and \
+       lyr.GetLayerDefn().GetFieldDefn(2).GetSubType() == ogr.OFSTFloat32)
     f = lyr.GetNextFeature()
     if f.GetField(0) != 1 or f.GetField(1) != -32768 or f.GetField(2) != 1.23:
         f.DumpReadable()
@@ -1623,9 +1459,7 @@ def test_ogr_csv_35():
     data = gdal.VSIFReadL(1, 10000, f).decode('ascii')
     gdal.VSIFCloseL(f)
 
-    if data.find('FIELD_1 "FIELD 2"') < 0 or data.find('VAL1 "VAL 2"') < 0:
-        print(data)
-        return 'fail'
+    assert data.find('FIELD_1 "FIELD 2"') >= 0 and data.find('VAL1 "VAL 2"') >= 0
 
     gdal.Unlink('/vsimem/ogr_csv_35.csv')
 
@@ -1705,16 +1539,14 @@ def test_ogr_csv_36():
     ds = gdal.OpenEx('/vsimem/ogr_csv_36.csv', gdal.OF_VECTOR,
                      open_options=['GEOM_POSSIBLE_NAMES=bla'])
     lyr = ds.GetLayer(0)
-    if lyr.GetLayerDefn().GetGeomFieldCount() != 0:
-        return 'fail'
+    assert lyr.GetLayerDefn().GetGeomFieldCount() == 0
     ds = None
 
     # Check KEEP_GEOM_COLUMNS=NO
     ds = gdal.OpenEx('/vsimem/ogr_csv_36.csv', gdal.OF_VECTOR,
                      open_options=['GEOM_POSSIBLE_NAMES=mygeometry', 'KEEP_GEOM_COLUMNS=NO'])
     lyr = ds.GetLayer(0)
-    if lyr.GetLayerDefn().GetFieldCount() != 2:
-        return 'fail'
+    assert lyr.GetLayerDefn().GetFieldCount() == 2
     f = lyr.GetNextFeature()
     if f.GetGeometryRef().ExportToWkt() != 'POINT (1 2)' or f['id'] != '1' or f['format'] != 'wkt':
         f.DumpReadable()
@@ -1777,8 +1609,7 @@ def test_ogr_csv_37():
     ds = gdal.OpenEx('/vsimem/ogr_csv_37.csv', gdal.OF_VECTOR,
                      open_options=['X_POSSIBLE_NAMES=long,x', 'Y_POSSIBLE_NAMES=lat,y', 'KEEP_GEOM_COLUMNS=NO'])
     lyr = ds.GetLayer(0)
-    if lyr.GetLayerDefn().GetFieldCount() != 3:
-        return 'fail'
+    assert lyr.GetLayerDefn().GetFieldCount() == 3
     f = lyr.GetNextFeature()
     if f.GetGeometryRef().ExportToWkt() != 'POINT (2 49)' or f['id'] != '1' or f['other'] != 'a':
         f.DumpReadable()
@@ -1808,10 +1639,8 @@ def test_ogr_csv_38():
 
     ds = ogr.Open('/vsimem/ogr_csv_38.csv')
     lyr = ds.GetLayer(0)
-    if lyr.GetLayerDefn().GetGeomFieldDefn(0).GetName() != 'mygeom':
-        return 'fail'
-    if lyr.GetLayerDefn().GetGeomFieldDefn(0).GetSpatialRef().ExportToWkt().find('4326') < 0:
-        return 'fail'
+    assert lyr.GetLayerDefn().GetGeomFieldDefn(0).GetName() == 'mygeom'
+    assert lyr.GetLayerDefn().GetGeomFieldDefn(0).GetSpatialRef().ExportToWkt().find('4326') >= 0
     f = lyr.GetNextFeature()
     if f.GetGeometryRef().ExportToWkt() != 'POINT (2 49)':
         f.DumpReadable()
@@ -1930,8 +1759,7 @@ def test_ogr_csv_42():
     lyr.CreateField(ogr.FieldDefn('foo', ogr.OFTInteger))
     f = ogr.Feature(lyr.GetLayerDefn())
     f.SetField('id', 1)
-    if lyr.CreateFeature(f) != 0:
-        return 'fail'
+    assert lyr.CreateFeature(f) == 0
     ds = None
 
     gdal.Unlink('/vsimem/ogr_csv_42.csv')
@@ -1949,8 +1777,7 @@ def test_ogr_csv_43():
     f = ogr.Feature(lyr.GetLayerDefn())
     f.SetField('id', 1)
     f.SetGeometry(ogr.CreateGeometryFromWkt('POINT(2 49)'))
-    if lyr.CreateFeature(f) != 0:
-        return 'fail'
+    assert lyr.CreateFeature(f) == 0
     f = None
     lyr.SetNextByIndex(0)
     f = lyr.GetNextFeature()
@@ -1959,19 +1786,14 @@ def test_ogr_csv_43():
         return 'fail'
     f = None
 
-    if lyr.TestCapability(ogr.OLCCreateField) != 1:
-        return 'fail'
-    if lyr.CreateField(ogr.FieldDefn('foo', ogr.OFTString)) != 0:
-        return 'fail'
+    assert lyr.TestCapability(ogr.OLCCreateField) == 1
+    assert lyr.CreateField(ogr.FieldDefn('foo', ogr.OFTString)) == 0
     with gdaltest.error_handler():
-        if lyr.CreateField(ogr.FieldDefn('foo', ogr.OFTString)) == 0:
-            return 'fail'
+        assert lyr.CreateField(ogr.FieldDefn('foo', ogr.OFTString)) != 0
     f = lyr.GetFeature(1)
     f.SetField('foo', 'bar')
-    if lyr.TestCapability(ogr.OLCRandomWrite) != 1:
-        return 'fail'
-    if lyr.SetFeature(f) != 0:
-        return 'fail'
+    assert lyr.TestCapability(ogr.OLCRandomWrite) == 1
+    assert lyr.SetFeature(f) == 0
     f = lyr.GetFeature(1)
     if f['id'] != 1 or f['foo'] != 'bar' or f.GetGeometryRef().ExportToWkt() != 'POINT (2 49)':
         f.DumpReadable()
@@ -1982,24 +1804,19 @@ def test_ogr_csv_43():
         f.DumpReadable()
         return 'fail'
     f = lyr.GetNextFeature()
-    if f is not None:
-        return 'fail'
-    if lyr.GetFeatureCount() != 1:
-        return 'fail'
+    assert f is None
+    assert lyr.GetFeatureCount() == 1
     f = ogr.Feature(lyr.GetLayerDefn())
     f.SetField('id', 2)
     f.SetGeometry(ogr.CreateGeometryFromWkt('POINT(3 50)'))
     f.SetField('foo', 'baz')
-    if lyr.CreateFeature(f) != 0:
-        return 'fail'
-    if f.GetFID() != 2:
-        return 'fail'
+    assert lyr.CreateFeature(f) == 0
+    assert f.GetFID() == 2
     f = lyr.GetFeature(2)
     if f['id'] != 2 or f['foo'] != 'baz' or f.GetGeometryRef().ExportToWkt() != 'POINT (3 50)':
         f.DumpReadable()
         return 'fail'
-    if lyr.GetFeatureCount() != 2:
-        return 'fail'
+    assert lyr.GetFeatureCount() == 2
     lyr.SetNextByIndex(1)
     f = lyr.GetNextFeature()
     if f['id'] != 2:
@@ -2020,47 +1837,31 @@ def test_ogr_csv_43():
         f.DumpReadable()
         return 'fail'
     f = None
-    if lyr.TestCapability(ogr.OLCDeleteField) != 1:
-        return 'fail'
+    assert lyr.TestCapability(ogr.OLCDeleteField) == 1
     with gdaltest.error_handler():
-        if lyr.DeleteField(-1) == 0:
-            return 'fail'
-    if lyr.DeleteField(lyr.GetLayerDefn().GetFieldIndex('foo')) != 0:
-        return 'fail'
-    if lyr.TestCapability(ogr.OLCDeleteFeature) != 1:
-        return 'fail'
-    if lyr.DeleteFeature(2) != 0:
-        return 'fail'
-    if lyr.DeleteFeature(2) != ogr.OGRERR_NON_EXISTING_FEATURE:
-        return 'fail'
-    if lyr.DeleteFeature(3) != ogr.OGRERR_NON_EXISTING_FEATURE:
-        return 'fail'
-    if lyr.GetFeature(2) is not None:
-        return 'fail'
-    if lyr.GetFeature(3) is not None:
-        return 'fail'
+        assert lyr.DeleteField(-1) != 0
+    assert lyr.DeleteField(lyr.GetLayerDefn().GetFieldIndex('foo')) == 0
+    assert lyr.TestCapability(ogr.OLCDeleteFeature) == 1
+    assert lyr.DeleteFeature(2) == 0
+    assert lyr.DeleteFeature(2) == ogr.OGRERR_NON_EXISTING_FEATURE
+    assert lyr.DeleteFeature(3) == ogr.OGRERR_NON_EXISTING_FEATURE
+    assert lyr.GetFeature(2) is None
+    assert lyr.GetFeature(3) is None
     lyr.ResetReading()
     f = lyr.GetNextFeature()
-    if f is None:
-        return 'fail'
+    assert f is not None
     f = lyr.GetNextFeature()
-    if f is not None:
-        return 'fail'
+    assert f is None
     f = ogr.Feature(lyr.GetLayerDefn())
     f['id'] = 3
-    if lyr.CreateFeature(f) != 0:
-        return 'fail'
-    if f.GetFID() != 3:
-        return 'fail'
+    assert lyr.CreateFeature(f) == 0
+    assert f.GetFID() == 3
     f = None
-    if lyr.CreateField(ogr.FieldDefn('foo', ogr.OFTString)) != 0:
-        return 'fail'
+    assert lyr.CreateField(ogr.FieldDefn('foo', ogr.OFTString)) == 0
     f = lyr.GetFeature(1)
-    if f['foo'] == 'bar':
-        return 'fail'
+    assert f['foo'] != 'bar'
     f = lyr.GetFeature(3)
-    if f.GetFID() != 3:
-        return 'fail'
+    assert f.GetFID() == 3
     f = None
     ds = None
 
@@ -2071,21 +1872,16 @@ def test_ogr_csv_43():
         f.DumpReadable()
         return 'fail'
     f = None
-    if lyr.DeleteField(lyr.GetLayerDefn().GetFieldIndex('foo')) != 0:
-        return 'fail'
+    assert lyr.DeleteField(lyr.GetLayerDefn().GetFieldIndex('foo')) == 0
     f = ogr.Feature(lyr.GetLayerDefn())
     f.SetGeometry(ogr.CreateGeometryFromWkt('POINT(4 51)'))
-    if lyr.CreateFeature(f) != 0:
-        return 'fail'
+    assert lyr.CreateFeature(f) == 0
     if f.GetFID() != 3:
         f.DumpReadable()
         return 'fail'
-    if lyr.GetExtent() != (2.0, 4.0, 49.0, 51.0):
-        return 'fail'
-    if lyr.DeleteFeature(f.GetFID()) != 0:
-        return 'fail'
-    if lyr.GetFeatureCount() != 2:
-        return 'fail'
+    assert lyr.GetExtent() == (2.0, 4.0, 49.0, 51.0)
+    assert lyr.DeleteFeature(f.GetFID()) == 0
+    assert lyr.GetFeatureCount() == 2
 
     with gdaltest.error_handler():
         lyr.SetSpatialFilter(-1, None)
@@ -2095,59 +1891,42 @@ def test_ogr_csv_43():
     lyr.SetSpatialFilterRect(0, 0, 0, 100, 100)
     lyr.SetSpatialFilter(0, lyr.GetSpatialFilter())
     lyr.SetSpatialFilter(lyr.GetSpatialFilter())
-    if lyr.GetFeatureCount() != 1:
-        return 'fail'
-    if lyr.GetExtent() != (2.0, 2.0, 49.0, 49.0):
-        return 'fail'
-    if lyr.GetExtent(geom_field=0) != (2.0, 2.0, 49.0, 49.0):
-        return 'fail'
+    assert lyr.GetFeatureCount() == 1
+    assert lyr.GetExtent() == (2.0, 2.0, 49.0, 49.0)
+    assert lyr.GetExtent(geom_field=0) == (2.0, 2.0, 49.0, 49.0)
     with gdaltest.error_handler():
         lyr.GetExtent(geom_field=-1)
     lyr.SetAttributeFilter(None)
 
-    if lyr.TestCapability(ogr.OLCCurveGeometries) != 1:
-        return 'fail'
-    if lyr.TestCapability(ogr.OLCTransactions) != 0:
-        return 'fail'
+    assert lyr.TestCapability(ogr.OLCCurveGeometries) == 1
+    assert lyr.TestCapability(ogr.OLCTransactions) == 0
     lyr.StartTransaction()
     lyr.RollbackTransaction()
     lyr.CommitTransaction()
 
-    if lyr.GetGeometryColumn() != '':
-        return 'fail'
-    if lyr.GetFIDColumn() != '':
-        return 'fail'
+    assert lyr.GetGeometryColumn() == ''
+    assert lyr.GetFIDColumn() == ''
 
-    if lyr.TestCapability(ogr.OLCReorderFields) != 1:
-        return 'fail'
-    if lyr.ReorderFields([0, 1]) != 0:
-        return 'fail'
+    assert lyr.TestCapability(ogr.OLCReorderFields) == 1
+    assert lyr.ReorderFields([0, 1]) == 0
     with gdaltest.error_handler():
-        if lyr.ReorderFields([0, -1]) == 0:
-            return 'fail'
+        assert lyr.ReorderFields([0, -1]) != 0
 
-    if lyr.TestCapability(ogr.OLCAlterFieldDefn) != 1:
-        return 'fail'
+    assert lyr.TestCapability(ogr.OLCAlterFieldDefn) == 1
     fld_defn = lyr.GetLayerDefn().GetFieldDefn(0)
-    if lyr.AlterFieldDefn(0, fld_defn, 0) != 0:
-        return 'fail'
+    assert lyr.AlterFieldDefn(0, fld_defn, 0) == 0
     with gdaltest.error_handler():
-        if lyr.AlterFieldDefn(-1, fld_defn, 0) == 0:
-            return 'fail'
+        assert lyr.AlterFieldDefn(-1, fld_defn, 0) != 0
 
     f = lyr.GetFeature(2)
     f.SetGeomField(0, ogr.CreateGeometryFromWkt('POINT (1 2)'))
-    if lyr.SetFeature(f) != 0:
-        return 'fail'
+    assert lyr.SetFeature(f) == 0
     f = None
-    if lyr.TestCapability(ogr.OLCCreateGeomField) != 1:
-        return 'fail'
-    if lyr.CreateGeomField(ogr.GeomFieldDefn('geom__WKT_2')) != 0:
-        return 'fail'
+    assert lyr.TestCapability(ogr.OLCCreateGeomField) == 1
+    assert lyr.CreateGeomField(ogr.GeomFieldDefn('geom__WKT_2')) == 0
     f = lyr.GetFeature(2)
     f.SetGeomField(1, ogr.CreateGeometryFromWkt('POINT (3 4)'))
-    if lyr.SetFeature(f) != 0:
-        return 'fail'
+    assert lyr.SetFeature(f) == 0
 
     f = None
     ds = None
@@ -2158,15 +1937,11 @@ def test_ogr_csv_43():
     if f['WKT'] != 'POINT (1 2)' or f['_WKT_2'] != 'POINT (3 4)':
         f.DumpReadable()
         return 'fail'
-    if lyr.SetFeature(f) != 0:
-        return 'fail'
+    assert lyr.SetFeature(f) == 0
     f = None
-    if lyr.DeleteFeature(2) != 0:
-        return 'fail'
-    if lyr.GetFeature(2) is not None:
-        return 'fail'
-    if lyr.DeleteFeature(2) != ogr.OGRERR_NON_EXISTING_FEATURE:
-        return 'fail'
+    assert lyr.DeleteFeature(2) == 0
+    assert lyr.GetFeature(2) is None
+    assert lyr.DeleteFeature(2) == ogr.OGRERR_NON_EXISTING_FEATURE
     ds = None
 
     gdal.Unlink('/vsimem/ogr_csv_43.csv')
@@ -2185,8 +1960,7 @@ def test_ogr_csv_44():
     f = ogr.Feature(lyr.GetLayerDefn())
     f.SetField('id', 1)
     f.SetGeometry(ogr.CreateGeometryFromWkt('POINT(2 49)'))
-    if lyr.CreateFeature(f) != 0:
-        return 'fail'
+    assert lyr.CreateFeature(f) == 0
     f = None
     f = lyr.GetFeature(1)
     if f['id'] != 1 or f.GetGeometryRef().ExportToWkt() != 'POINT (2 49)':
@@ -2194,8 +1968,7 @@ def test_ogr_csv_44():
         return 'fail'
     f = ogr.Feature(lyr.GetLayerDefn())
     f.SetField('id', 2)
-    if lyr.CreateFeature(f) != 0:
-        return 'fail'
+    assert lyr.CreateFeature(f) == 0
     f = lyr.GetFeature(2)
     if f['id'] != 2 or f.GetGeometryRef() is not None:
         f.DumpReadable()
@@ -2223,8 +1996,7 @@ def test_ogr_csv_45():
 
     ds2 = ogr.Open('/vsimem/ogr_csv_45.csv')
     lyr2 = ds2.GetLayer(0)
-    if lyr2.GetLayerDefn().GetFieldCount() != 3:
-        return 'fail'
+    assert lyr2.GetLayerDefn().GetFieldCount() == 3
     ds2 = None
 
     ds = None
@@ -2263,8 +2035,7 @@ def test_ogr_csv_46():
 
     ds = ogr.Open('/vsimem/ogr_csv_46.csv')
     lyr = ds.GetLayer(0)
-    if lyr.GetLayerDefn().GetFieldCount() != 4:
-        return 'fail'
+    assert lyr.GetLayerDefn().GetFieldCount() == 4
     f = lyr.GetNextFeature()
     if f['id'] != '1' or f['X'] != '10' or f['Y'] != '20' or f['Z'] != '3':
         f.DumpReadable()
@@ -2281,8 +2052,7 @@ def test_ogr_csv_46():
 
     ds = ogr.Open('/vsimem/ogr_csv_46.csv')
     lyr = ds.GetLayer(0)
-    if lyr.GetLayerDefn().GetFieldCount() != 4:
-        return 'fail'
+    assert lyr.GetLayerDefn().GetFieldCount() == 4
     f = lyr.GetNextFeature()
     if f['id'] != '1' or f['X'] != '-10' or f['Y'] != '-20' or f['Z'] != '3':
         f.DumpReadable()
@@ -2299,8 +2069,7 @@ def test_ogr_csv_46():
 
     ds = ogr.Open('/vsimem/ogr_csv_46.csv')
     lyr = ds.GetLayer(0)
-    if lyr.GetLayerDefn().GetFieldCount() != 4:
-        return 'fail'
+    assert lyr.GetLayerDefn().GetFieldCount() == 4
     f = lyr.GetNextFeature()
     if f['id'] != '1' or f['X'] != '-1' or f['Y'] != '-2' or f['Z'] != '-3':
         f.DumpReadable()
@@ -2318,11 +2087,9 @@ def test_ogr_csv_46():
 def test_ogr_csv_47():
 
     ds = ogr.GetDriverByName('CSV').CreateDataSource('/vsimem/ogr_csv_47.csv')
-    if ds.TestCapability(ogr.ODsCMeasuredGeometries) != 1:
-        return 'fail'
+    assert ds.TestCapability(ogr.ODsCMeasuredGeometries) == 1
     lyr = ds.CreateLayer('ogr_csv_47', options=['GEOMETRY=AS_WKT'])
-    if lyr.TestCapability(ogr.OLCMeasuredGeometries) != 1:
-        return 'fail'
+    assert lyr.TestCapability(ogr.OLCMeasuredGeometries) == 1
     lyr.CreateField(ogr.FieldDefn('id', ogr.OFTInteger))
     f = ogr.Feature(lyr.GetLayerDefn())
     f['id'] = 1
@@ -2361,17 +2128,13 @@ def test_ogr_csv_48():
     data = gdal.VSIFReadL(1, 10000, f).decode('ascii')
     gdal.VSIFCloseL(f)
 
-    if data.find('stringlist,intlist,int64list,reallist\n"[ ""a"", """" ]",[ 1 ],[ 1234567890123 ],[ 0.125') != 0:
-        print(data)
-        return 'fail'
+    assert data.find('stringlist,intlist,int64list,reallist\n"[ ""a"", """" ]",[ 1 ],[ 1234567890123 ],[ 0.125') == 0
 
     f = gdal.VSIFOpenL('/vsimem/ogr_csv_48_out.csvt', 'rb')
     data = gdal.VSIFReadL(1, 10000, f).decode('ascii')
     gdal.VSIFCloseL(f)
 
-    if data.find('JSonStringList,JSonIntegerList,JSonInteger64List,JSonRealList') != 0:
-        print(data)
-        return 'fail'
+    assert data.find('JSonStringList,JSonIntegerList,JSonInteger64List,JSonRealList') == 0
 
     gdal.Unlink('/vsimem/ogr_csv_48.csv')
     gdal.Unlink('/vsimem/ogr_csv_48.csvt')
@@ -2428,9 +2191,7 @@ def test_ogr_csv_string_quoting_always():
     data = gdal.VSIFReadL(1, 10000, f).decode('ascii')
     gdal.VSIFCloseL(f)
 
-    if data.find('"AREA","EAS_ID","PRFEDEA"\n215229.266,"168","35043411"') != 0:
-        print(data)
-        return 'fail'
+    assert data.find('"AREA","EAS_ID","PRFEDEA"\n215229.266,"168","35043411"') == 0
 
     ds = gdal.OpenEx('/vsimem/ogr_csv_string_quoting_always.csv', gdal.OF_UPDATE | gdal.OF_VECTOR)
     gdal.VectorTranslate(ds, 'data/poly.shp',
@@ -2442,9 +2203,7 @@ def test_ogr_csv_string_quoting_always():
     data = gdal.VSIFReadL(1, 10000, f).decode('ascii')
     gdal.VSIFCloseL(f)
 
-    if data.find('"AREA","EAS_ID","PRFEDEA"\n215229.266,"168","35043411"\n247328.172,"179","35043423"') != 0:
-        print(data)
-        return 'fail'
+    assert data.find('"AREA","EAS_ID","PRFEDEA"\n215229.266,"168","35043411"\n247328.172,"179","35043423"') == 0
 
     gdal.Unlink('/vsimem/ogr_csv_string_quoting_always.csv')
     gdal.Unlink('/vsimem/ogr_csv_string_quoting_always.csvt')
@@ -2475,9 +2234,7 @@ def test_ogr_csv_string_quoting_if_ambiguous():
     data = gdal.VSIFReadL(1, 10000, f).decode('ascii')
     gdal.VSIFCloseL(f)
 
-    if data.find('"00123",x,"1.25"') < 0:
-        print(data)
-        return 'fail'
+    assert data.find('"00123",x,"1.25"') >= 0
 
     gdal.Unlink('/vsimem/ogr_csv_string_quoting_if_ambiguous.csv')
 
@@ -2507,9 +2264,7 @@ def test_ogr_csv_string_quoting_if_needed():
     data = gdal.VSIFReadL(1, 10000, f).decode('ascii')
     gdal.VSIFCloseL(f)
 
-    if data.find('00123,x,1.25') < 0:
-        print(data)
-        return 'fail'
+    assert data.find('00123,x,1.25') >= 0
 
     gdal.Unlink('/vsimem/ogr_csv_string_quoting_if_needed.csv')
 
@@ -2536,9 +2291,7 @@ def test_ogr_csv_iter_and_set_feature():
 
     gdal.Unlink('/vsimem/ogr_csv_iter_and_set_feature.csv')
 
-    if count != 2:
-        print(count)
-        return 'fail'
+    assert count == 2
 
     return 'success'
 
diff --git a/autotest/ogr/ogr_csw.py b/autotest/ogr/ogr_csw.py
index 1a69504c6cc9..40ed75b23cc1 100755
--- a/autotest/ogr/ogr_csw.py
+++ b/autotest/ogr/ogr_csw.py
@@ -73,9 +73,7 @@ def test_ogr_csw_pycsw():
         return 'skip'
     lyr = ds.GetLayer(0)
     f = lyr.GetNextFeature()
-    if f is None:
-        gdaltest.post_reason('did not get expected layer name')
-        return 'fail'
+    assert f is not None, 'did not get expected layer name'
 
     return 'success'
 
@@ -86,8 +84,7 @@ def test_ogr_csw_vsimem_fail_because_not_enabled():
     gdal.PushErrorHandler()
     ds = ogr.Open('CSW:/vsimem/csw_endpoint')
     gdal.PopErrorHandler()
-    if ds is not None:
-        return 'fail'
+    assert ds is None
 
     return 'success'
 
@@ -99,8 +96,7 @@ def test_ogr_csw_vsimem_fail_because_no_get_capabilities():
     gdal.PushErrorHandler()
     ds = ogr.Open('CSW:/vsimem/csw_endpoint')
     gdal.PopErrorHandler()
-    if ds is not None:
-        return 'fail'
+    assert ds is None
 
     return 'success'
 
@@ -115,11 +111,8 @@ def test_ogr_csw_vsimem_fail_because_empty_response():
     gdal.PushErrorHandler()
     ds = ogr.Open('CSW:/vsimem/csw_endpoint')
     gdal.PopErrorHandler()
-    if ds is not None:
-        return 'fail'
-    if gdal.GetLastErrorMsg().find('Empty content returned by server') < 0:
-        print(gdal.GetLastErrorMsg())
-        return 'fail'
+    assert ds is None
+    assert gdal.GetLastErrorMsg().find('Empty content returned by server') >= 0
 
     return 'success'
 
@@ -134,11 +127,8 @@ def test_ogr_csw_vsimem_fail_because_no_CSW_Capabilities():
     gdal.PushErrorHandler()
     ds = ogr.Open('CSW:/vsimem/csw_endpoint')
     gdal.PopErrorHandler()
-    if ds is not None:
-        return 'fail'
-    if gdal.GetLastErrorMsg().find('Cannot find Capabilities.version') < 0:
-        print(gdal.GetLastErrorMsg())
-        return 'fail'
+    assert ds is None
+    assert gdal.GetLastErrorMsg().find('Cannot find Capabilities.version') >= 0
 
     return 'success'
 
@@ -153,11 +143,8 @@ def test_ogr_csw_vsimem_fail_because_exception():
     gdal.PushErrorHandler()
     ds = ogr.Open('CSW:/vsimem/csw_endpoint')
     gdal.PopErrorHandler()
-    if ds is not None:
-        return 'fail'
-    if gdal.GetLastErrorMsg().find('Error returned by server : <ServiceExceptionReport/>') < 0:
-        print(gdal.GetLastErrorMsg())
-        return 'fail'
+    assert ds is None
+    assert gdal.GetLastErrorMsg().find('Error returned by server : <ServiceExceptionReport/>') >= 0
 
     return 'success'
 
@@ -172,11 +159,8 @@ def test_ogr_csw_vsimem_fail_because_invalid_xml_capabilities():
     gdal.PushErrorHandler()
     ds = ogr.Open('CSW:/vsimem/csw_endpoint')
     gdal.PopErrorHandler()
-    if ds is not None:
-        return 'fail'
-    if gdal.GetLastErrorMsg().find('Invalid XML content : <invalid_xml') < 0:
-        print(gdal.GetLastErrorMsg())
-        return 'fail'
+    assert ds is None
+    assert gdal.GetLastErrorMsg().find('Invalid XML content : <invalid_xml') >= 0
 
     return 'success'
 
@@ -193,11 +177,8 @@ def test_ogr_csw_vsimem_fail_because_missing_version():
     gdal.PushErrorHandler()
     ds = ogr.Open('CSW:/vsimem/csw_endpoint')
     gdal.PopErrorHandler()
-    if ds is not None:
-        return 'fail'
-    if gdal.GetLastErrorMsg().find('Cannot find Capabilities.version') < 0:
-        print(gdal.GetLastErrorMsg())
-        return 'fail'
+    assert ds is None
+    assert gdal.GetLastErrorMsg().find('Cannot find Capabilities.version') >= 0
 
     return 'success'
 
@@ -213,27 +194,22 @@ def test_ogr_csw_vsimem_csw_minimal_instance():
 <Capabilities version="2.0.2"/>
 """)
     ds = ogr.Open('CSW:/vsimem/csw_endpoint')
-    if ds is None:
-        return 'fail'
+    assert ds is not None
     ds.TestCapability('foo')
-    if ds.GetLayerCount() != 1:
-        return 'fail'
-    if ds.GetLayer(-1) is not None or ds.GetLayer(1) is not None:
-        return 'fail'
+    assert ds.GetLayerCount() == 1
+    assert ds.GetLayer(-1) is None and ds.GetLayer(1) is None
 
     lyr = ds.GetLayer(0)
     lyr.TestCapability('foo')
     gdal.PushErrorHandler()
     f = lyr.GetNextFeature()
     gdal.PopErrorHandler()
-    if f is not None:
-        return 'fail'
+    assert f is None
 
     gdal.PushErrorHandler()
     fc = lyr.GetFeatureCount()
     gdal.PopErrorHandler()
-    if fc != 0:
-        return 'fail'
+    assert fc == 0
 
     gdal.FileFromMemBuffer("""/vsimem/csw_endpoint&POSTFIELDS=<?xml version="1.0" encoding="UTF-8"?><csw:GetRecords resultType="results" service="CSW" version="2.0.2" startPosition="1" maxRecords="500" xmlns:csw="http://www.opengis.net/cat/csw/2.0.2" xmlns:gml="http://www.opengis.net/gml" xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:dct="http://purl.org/dc/terms/" xmlns:ogc="http://www.opengis.net/ogc" xmlns:ows="http://www.opengis.net/ows" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.opengis.net/cat/csw/2.0.2 http://schemas.opengis.net/csw/2.0.2/CSW-discovery.xsd"><csw:Query typeNames="csw:Record"><csw:ElementSetName>full</csw:ElementSetName></csw:Query></csw:GetRecords>""",
                            """""")
@@ -241,9 +217,7 @@ def test_ogr_csw_vsimem_csw_minimal_instance():
     gdal.PushErrorHandler()
     f = lyr.GetNextFeature()
     gdal.PopErrorHandler()
-    if f is not None or gdal.GetLastErrorMsg().find('Empty content returned by server') < 0:
-        print(gdal.GetLastErrorMsg())
-        return 'fail'
+    assert f is None and gdal.GetLastErrorMsg().find('Empty content returned by server') >= 0
 
     gdal.FileFromMemBuffer("""/vsimem/csw_endpoint&POSTFIELDS=<?xml version="1.0" encoding="UTF-8"?><csw:GetRecords resultType="results" service="CSW" version="2.0.2" startPosition="1" maxRecords="500" xmlns:csw="http://www.opengis.net/cat/csw/2.0.2" xmlns:gml="http://www.opengis.net/gml" xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:dct="http://purl.org/dc/terms/" xmlns:ogc="http://www.opengis.net/ogc" xmlns:ows="http://www.opengis.net/ows" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.opengis.net/cat/csw/2.0.2 http://schemas.opengis.net/csw/2.0.2/CSW-discovery.xsd"><csw:Query typeNames="csw:Record"><csw:ElementSetName>full</csw:ElementSetName></csw:Query></csw:GetRecords>""",
                            """<invalid_xml""")
@@ -251,9 +225,7 @@ def test_ogr_csw_vsimem_csw_minimal_instance():
     gdal.PushErrorHandler()
     f = lyr.GetNextFeature()
     gdal.PopErrorHandler()
-    if f is not None or gdal.GetLastErrorMsg().find('Error: cannot parse') < 0:
-        print(gdal.GetLastErrorMsg())
-        return 'fail'
+    assert f is None and gdal.GetLastErrorMsg().find('Error: cannot parse') >= 0
 
     gdal.FileFromMemBuffer("""/vsimem/csw_endpoint&POSTFIELDS=<?xml version="1.0" encoding="UTF-8"?><csw:GetRecords resultType="results" service="CSW" version="2.0.2" startPosition="1" maxRecords="500" xmlns:csw="http://www.opengis.net/cat/csw/2.0.2" xmlns:gml="http://www.opengis.net/gml" xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:dct="http://purl.org/dc/terms/" xmlns:ogc="http://www.opengis.net/ogc" xmlns:ows="http://www.opengis.net/ows" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.opengis.net/cat/csw/2.0.2 http://schemas.opengis.net/csw/2.0.2/CSW-discovery.xsd"><csw:Query typeNames="csw:Record"><csw:ElementSetName>full</csw:ElementSetName></csw:Query></csw:GetRecords>""",
                            """<dummy_xml/>""")
@@ -261,9 +233,7 @@ def test_ogr_csw_vsimem_csw_minimal_instance():
     gdal.PushErrorHandler()
     f = lyr.GetNextFeature()
     gdal.PopErrorHandler()
-    if f is not None or gdal.GetLastErrorMsg().find('Error: cannot parse') < 0:
-        print(gdal.GetLastErrorMsg())
-        return 'fail'
+    assert f is None and gdal.GetLastErrorMsg().find('Error: cannot parse') >= 0
 
     gdal.FileFromMemBuffer("""/vsimem/csw_endpoint&POSTFIELDS=<?xml version="1.0" encoding="UTF-8"?><csw:GetRecords resultType="results" service="CSW" version="2.0.2" startPosition="1" maxRecords="500" xmlns:csw="http://www.opengis.net/cat/csw/2.0.2" xmlns:gml="http://www.opengis.net/gml" xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:dct="http://purl.org/dc/terms/" xmlns:ogc="http://www.opengis.net/ogc" xmlns:ows="http://www.opengis.net/ows" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.opengis.net/cat/csw/2.0.2 http://schemas.opengis.net/csw/2.0.2/CSW-discovery.xsd"><csw:Query typeNames="csw:Record"><csw:ElementSetName>full</csw:ElementSetName></csw:Query></csw:GetRecords>""",
                            """<ServiceExceptionReport/>""")
@@ -271,9 +241,7 @@ def test_ogr_csw_vsimem_csw_minimal_instance():
     gdal.PushErrorHandler()
     f = lyr.GetNextFeature()
     gdal.PopErrorHandler()
-    if f is not None or gdal.GetLastErrorMsg().find('Error returned by server') < 0:
-        print(gdal.GetLastErrorMsg())
-        return 'fail'
+    assert f is None and gdal.GetLastErrorMsg().find('Error returned by server') >= 0
 
     gdal.FileFromMemBuffer("""/vsimem/csw_endpoint&POSTFIELDS=<?xml version="1.0" encoding="UTF-8"?><csw:GetRecords resultType="results" service="CSW" version="2.0.2" startPosition="1" maxRecords="500" xmlns:csw="http://www.opengis.net/cat/csw/2.0.2" xmlns:gml="http://www.opengis.net/gml" xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:dct="http://purl.org/dc/terms/" xmlns:ogc="http://www.opengis.net/ogc" xmlns:ows="http://www.opengis.net/ows" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.opengis.net/cat/csw/2.0.2 http://schemas.opengis.net/csw/2.0.2/CSW-discovery.xsd"><csw:Query typeNames="csw:Record"><csw:ElementSetName>full</csw:ElementSetName></csw:Query></csw:GetRecords>""",
                            """<?xml version="1.0" encoding="UTF-8" standalone="no"?>
@@ -314,8 +282,7 @@ def test_ogr_csw_vsimem_csw_minimal_instance():
 """)
     lyr.ResetReading()
     f = lyr.GetNextFeature()
-    if f is None:
-        return 'fail'
+    assert f is not None
     if f['identifier'] != 'an_identifier' or f['other_identifiers'] != ['another_identifier'] or \
        f['subject'] != 'a_subject' or f['other_subjects'] != ['another_subject'] or \
        f['references'] != 'http://foo/' or f['other_references'] != ['http://bar/'] or \
@@ -324,24 +291,20 @@ def test_ogr_csw_vsimem_csw_minimal_instance():
         f.DumpReadable()
         return 'fail'
     f = lyr.GetNextFeature()
-    if f is None:
-        return 'fail'
+    assert f is not None
     gdal.PushErrorHandler()
     f = lyr.GetNextFeature()
     gdal.PopErrorHandler()
-    if f is not None:
-        return 'fail'
+    assert f is None
 
     gdal.PushErrorHandler()
     fc = lyr.GetFeatureCount()
     gdal.PopErrorHandler()
-    if fc != 2:
-        return 'fail'
+    assert fc == 2
 
     lyr.ResetReading()
     f = lyr.GetNextFeature()
-    if f is None:
-        return 'fail'
+    assert f is not None
     gdal.FileFromMemBuffer("""/vsimem/csw_endpoint&POSTFIELDS=<?xml version="1.0" encoding="UTF-8"?><csw:GetRecords resultType="results" service="CSW" version="2.0.2" startPosition="3" maxRecords="500" xmlns:csw="http://www.opengis.net/cat/csw/2.0.2" xmlns:gml="http://www.opengis.net/gml" xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:dct="http://purl.org/dc/terms/" xmlns:ogc="http://www.opengis.net/ogc" xmlns:ows="http://www.opengis.net/ows" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.opengis.net/cat/csw/2.0.2 http://schemas.opengis.net/csw/2.0.2/CSW-discovery.xsd"><csw:Query typeNames="csw:Record"><csw:ElementSetName>full</csw:ElementSetName></csw:Query></csw:GetRecords>""",
                            """<?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <csw:GetRecordsResponse
@@ -360,11 +323,9 @@ def test_ogr_csw_vsimem_csw_minimal_instance():
 </csw:GetRecordsResponse>
 """)
     f = lyr.GetNextFeature()
-    if f is None:
-        return 'fail'
+    assert f is not None
     f = lyr.GetNextFeature()
-    if f is None:
-        return 'fail'
+    assert f is not None
 
     gdal.FileFromMemBuffer("""/vsimem/csw_endpoint&POSTFIELDS=<?xml version="1.0" encoding="UTF-8"?><csw:GetRecords resultType="results" service="CSW" version="2.0.2" startPosition="4" maxRecords="500" xmlns:csw="http://www.opengis.net/cat/csw/2.0.2" xmlns:gml="http://www.opengis.net/gml" xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:dct="http://purl.org/dc/terms/" xmlns:ogc="http://www.opengis.net/ogc" xmlns:ows="http://www.opengis.net/ows" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.opengis.net/cat/csw/2.0.2 http://schemas.opengis.net/csw/2.0.2/CSW-discovery.xsd"><csw:Query typeNames="csw:Record"><csw:ElementSetName>full</csw:ElementSetName></csw:Query></csw:GetRecords>""",
                            """<?xml version="1.0" encoding="UTF-8" standalone="no"?>
@@ -382,44 +343,35 @@ def test_ogr_csw_vsimem_csw_minimal_instance():
 </csw:GetRecordsResponse>
 """)
     f = lyr.GetNextFeature()
-    if f is not None:
-        return 'fail'
+    assert f is None
 
     gdal.FileFromMemBuffer("""/vsimem/csw_endpoint&POSTFIELDS=<?xml version="1.0" encoding="UTF-8"?><csw:GetRecords resultType="hits" service="CSW" version="2.0.2" xmlns:csw="http://www.opengis.net/cat/csw/2.0.2" xmlns:gml="http://www.opengis.net/gml" xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:dct="http://purl.org/dc/terms/" xmlns:ogc="http://www.opengis.net/ogc" xmlns:ows="http://www.opengis.net/ows" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.opengis.net/cat/csw/2.0.2 http://schemas.opengis.net/csw/2.0.2/CSW-discovery.xsd"><csw:Query typeNames="csw:Record"><csw:ElementSetName>full</csw:ElementSetName></csw:Query></csw:GetRecords>""",
                            """""")
     gdal.PushErrorHandler()
     fc = lyr.GetFeatureCount()
     gdal.PopErrorHandler()
-    if fc != 3:
-        print(gdal.GetLastErrorMsg())
-        return 'fail'
+    assert fc == 3, gdal.GetLastErrorMsg()
 
     gdal.FileFromMemBuffer("""/vsimem/csw_endpoint&POSTFIELDS=<?xml version="1.0" encoding="UTF-8"?><csw:GetRecords resultType="hits" service="CSW" version="2.0.2" xmlns:csw="http://www.opengis.net/cat/csw/2.0.2" xmlns:gml="http://www.opengis.net/gml" xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:dct="http://purl.org/dc/terms/" xmlns:ogc="http://www.opengis.net/ogc" xmlns:ows="http://www.opengis.net/ows" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.opengis.net/cat/csw/2.0.2 http://schemas.opengis.net/csw/2.0.2/CSW-discovery.xsd"><csw:Query typeNames="csw:Record"><csw:ElementSetName>full</csw:ElementSetName></csw:Query></csw:GetRecords>""",
                            """<dummy_xml/>""")
     gdal.PushErrorHandler()
     fc = lyr.GetFeatureCount()
     gdal.PopErrorHandler()
-    if fc != 3:
-        print(gdal.GetLastErrorMsg())
-        return 'fail'
+    assert fc == 3, gdal.GetLastErrorMsg()
 
     gdal.FileFromMemBuffer("""/vsimem/csw_endpoint&POSTFIELDS=<?xml version="1.0" encoding="UTF-8"?><csw:GetRecords resultType="hits" service="CSW" version="2.0.2" xmlns:csw="http://www.opengis.net/cat/csw/2.0.2" xmlns:gml="http://www.opengis.net/gml" xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:dct="http://purl.org/dc/terms/" xmlns:ogc="http://www.opengis.net/ogc" xmlns:ows="http://www.opengis.net/ows" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.opengis.net/cat/csw/2.0.2 http://schemas.opengis.net/csw/2.0.2/CSW-discovery.xsd"><csw:Query typeNames="csw:Record"><csw:ElementSetName>full</csw:ElementSetName></csw:Query></csw:GetRecords>""",
                            """<invalid_xml>""")
     gdal.PushErrorHandler()
     fc = lyr.GetFeatureCount()
     gdal.PopErrorHandler()
-    if fc != 3:
-        print(gdal.GetLastErrorMsg())
-        return 'fail'
+    assert fc == 3, gdal.GetLastErrorMsg()
 
     gdal.FileFromMemBuffer("""/vsimem/csw_endpoint&POSTFIELDS=<?xml version="1.0" encoding="UTF-8"?><csw:GetRecords resultType="hits" service="CSW" version="2.0.2" xmlns:csw="http://www.opengis.net/cat/csw/2.0.2" xmlns:gml="http://www.opengis.net/gml" xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:dct="http://purl.org/dc/terms/" xmlns:ogc="http://www.opengis.net/ogc" xmlns:ows="http://www.opengis.net/ows" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.opengis.net/cat/csw/2.0.2 http://schemas.opengis.net/csw/2.0.2/CSW-discovery.xsd"><csw:Query typeNames="csw:Record"><csw:ElementSetName>full</csw:ElementSetName></csw:Query></csw:GetRecords>""",
                            """<ServiceExceptionReport/>""")
     gdal.PushErrorHandler()
     fc = lyr.GetFeatureCount()
     gdal.PopErrorHandler()
-    if fc != 3:
-        print(gdal.GetLastErrorMsg())
-        return 'fail'
+    assert fc == 3, gdal.GetLastErrorMsg()
 
     gdal.FileFromMemBuffer("""/vsimem/csw_endpoint&POSTFIELDS=<?xml version="1.0" encoding="UTF-8"?><csw:GetRecords resultType="hits" service="CSW" version="2.0.2" xmlns:csw="http://www.opengis.net/cat/csw/2.0.2" xmlns:gml="http://www.opengis.net/gml" xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:dct="http://purl.org/dc/terms/" xmlns:ogc="http://www.opengis.net/ogc" xmlns:ows="http://www.opengis.net/ows" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.opengis.net/cat/csw/2.0.2 http://schemas.opengis.net/csw/2.0.2/CSW-discovery.xsd"><csw:Query typeNames="csw:Record"><csw:ElementSetName>full</csw:ElementSetName></csw:Query></csw:GetRecords>""",
                            """<?xml version="1.0" encoding="UTF-8" standalone="no"?>
@@ -437,8 +389,7 @@ def test_ogr_csw_vsimem_csw_minimal_instance():
 </csw:GetRecordsResponse>
 """)
     fc = lyr.GetFeatureCount()
-    if fc != 200:
-        return 'fail'
+    assert fc == 200
 
     lyr.SetAttributeFilter("identifier = 'an_identifier'")
     lyr.SetSpatialFilterRect(-180, -90, 180, 90)
@@ -460,8 +411,7 @@ def test_ogr_csw_vsimem_csw_minimal_instance():
 </csw:GetRecordsResponse>
 """)
     f = lyr.GetNextFeature()
-    if f is None:
-        return 'fail'
+    assert f is not None
 
     gdal.FileFromMemBuffer("""/vsimem/csw_endpoint&POSTFIELDS=<?xml version="1.0" encoding="UTF-8"?><csw:GetRecords resultType="hits" service="CSW" version="2.0.2" xmlns:csw="http://www.opengis.net/cat/csw/2.0.2" xmlns:gml="http://www.opengis.net/gml" xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:dct="http://purl.org/dc/terms/" xmlns:ogc="http://www.opengis.net/ogc" xmlns:ows="http://www.opengis.net/ows" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.opengis.net/cat/csw/2.0.2 http://schemas.opengis.net/csw/2.0.2/CSW-discovery.xsd"><csw:Query typeNames="csw:Record"><csw:ElementSetName>full</csw:ElementSetName><csw:Constraint version="1.1.0"><ogc:Filter><ogc:And><ogc:BBOX><ogc:PropertyName>ows:BoundingBox</ogc:PropertyName><gml:Envelope srsName="urn:ogc:def:crs:EPSG::4326"><gml:lowerCorner>-90 -180</gml:lowerCorner><gml:upperCorner>90 180</gml:upperCorner></gml:Envelope></ogc:BBOX><ogc:PropertyIsEqualTo><ogc:PropertyName>dc:identifier</ogc:PropertyName><ogc:Literal>an_identifier</ogc:Literal></ogc:PropertyIsEqualTo></ogc:And></ogc:Filter></csw:Constraint></csw:Query></csw:GetRecords>""",
                            """<?xml version="1.0" encoding="UTF-8" standalone="no"?>
@@ -479,8 +429,7 @@ def test_ogr_csw_vsimem_csw_minimal_instance():
 </csw:GetRecordsResponse>
 """)
     fc = lyr.GetFeatureCount()
-    if fc != 300:
-        return 'fail'
+    assert fc == 300
 
     lyr.SetAttributeFilter("identifier = 'an_identifier' AND " +
                            "references = 'http://foo/' AND " +
@@ -509,8 +458,7 @@ def test_ogr_csw_vsimem_csw_output_schema_csw():
     gdal.PushErrorHandler()
     f = lyr.GetNextFeature()
     gdal.PopErrorHandler()
-    if f is not None:
-        return 'fail'
+    assert f is None
 
     gdal.FileFromMemBuffer("""/vsimem/csw_endpoint&POSTFIELDS=<?xml version="1.0" encoding="UTF-8"?><csw:GetRecords resultType="results" service="CSW" version="2.0.2" outputSchema="http://www.opengis.net/cat/csw/2.0.2" startPosition="1" maxRecords="500" xmlns:csw="http://www.opengis.net/cat/csw/2.0.2" xmlns:gml="http://www.opengis.net/gml" xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:dct="http://purl.org/dc/terms/" xmlns:ogc="http://www.opengis.net/ogc" xmlns:ows="http://www.opengis.net/ows" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.opengis.net/cat/csw/2.0.2 http://schemas.opengis.net/csw/2.0.2/CSW-discovery.xsd"><csw:Query typeNames="csw:Record"><csw:ElementSetName>full</csw:ElementSetName></csw:Query></csw:GetRecords>""",
                            """<csw:GetRecordsResponse/>""")
@@ -518,8 +466,7 @@ def test_ogr_csw_vsimem_csw_output_schema_csw():
     gdal.PushErrorHandler()
     f = lyr.GetNextFeature()
     gdal.PopErrorHandler()
-    if f is not None:
-        return 'fail'
+    assert f is None
 
     gdal.FileFromMemBuffer("""/vsimem/csw_endpoint&POSTFIELDS=<?xml version="1.0" encoding="UTF-8"?><csw:GetRecords resultType="results" service="CSW" version="2.0.2" outputSchema="http://www.opengis.net/cat/csw/2.0.2" startPosition="1" maxRecords="500" xmlns:csw="http://www.opengis.net/cat/csw/2.0.2" xmlns:gml="http://www.opengis.net/gml" xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:dct="http://purl.org/dc/terms/" xmlns:ogc="http://www.opengis.net/ogc" xmlns:ows="http://www.opengis.net/ows" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.opengis.net/cat/csw/2.0.2 http://schemas.opengis.net/csw/2.0.2/CSW-discovery.xsd"><csw:Query typeNames="csw:Record"><csw:ElementSetName>full</csw:ElementSetName></csw:Query></csw:GetRecords>""",
                            """<?xml version="1.0" encoding="UTF-8" standalone="no"?>
diff --git a/autotest/ogr/ogr_db2.py b/autotest/ogr/ogr_db2.py
index e20cd2d56002..2285dee6ca83 100755
--- a/autotest/ogr/ogr_db2.py
+++ b/autotest/ogr/ogr_db2.py
@@ -89,18 +89,14 @@ def test_ogr_db2_GetFeatureCount():
 
     ds = ogr.Open(ogrtest.db2_test_server)
 
-    if ds is None:
-        return 'fail'
+    assert ds is not None
 
     lyr = ds.GetLayer(0)
 
-    if lyr is None:
-        return 'fail'
+    assert lyr is not None
 
     count = lyr.GetFeatureCount()
-    if count != 5:
-        gdaltest.post_reason('did not get expected feature count')
-        return 'fail'
+    assert count == 5, 'did not get expected feature count'
 
     return 'success'
 
@@ -115,26 +111,19 @@ def test_ogr_db2_GetSpatialRef():
 
     ds = ogr.Open(ogrtest.db2_test_server)
 
-    if ds is None:
-        return 'fail'
+    assert ds is not None
 
     lyr = ds.GetLayer(0)
 
-    if lyr is None:
-        return 'fail'
+    assert lyr is not None
 
     sr = lyr.GetSpatialRef()
 
-    if sr is None:
-        gdaltest.post_reason('did not get expected srs')
-        return 'fail'
+    assert sr is not None, 'did not get expected srs'
 
     txt = sr.ExportToWkt()
 
-    if txt.find('GEOGCS[\"GCS_WGS_1984') == -1:
-        gdaltest.post_reason('did not get expected srs')
-        print(txt)
-        return 'fail'
+    assert txt.find('GEOGCS[\"GCS_WGS_1984') != -1, 'did not get expected srs'
 
     return 'success'
 
@@ -148,23 +137,17 @@ def test_ogr_db2_GetExtent():
 
     ds = ogr.Open(ogrtest.db2_test_server)
 
-    if ds is None:
-        return 'fail'
+    assert ds is not None
 
     lyr = ds.GetLayer(0)
 
-    if lyr is None:
-        return 'fail'
+    assert lyr is not None
 
     extent = lyr.GetExtent()
-    if extent is None:
-        gdaltest.post_reason('did not get extent')
-        return 'fail'
+    assert extent is not None, 'did not get extent'
 
-    if extent != (-122.030745, -121.95672, 37.278665, 37.440885):
-        gdaltest.post_reason('did not get expected extent')
-        print(extent)
-        return 'fail'
+    assert extent == (-122.030745, -121.95672, 37.278665, 37.440885), \
+        'did not get expected extent'
 
     return 'success'
 
@@ -179,18 +162,14 @@ def test_ogr_db2_GetFeature():
 
     ds = ogr.Open(ogrtest.db2_test_server)
 
-    if ds is None:
-        return 'fail'
+    assert ds is not None
 
     lyr = ds.GetLayer(0)
 
-    if lyr is None:
-        return 'fail'
+    assert lyr is not None
 
     feat = lyr.GetFeature(5)
-    if feat is None:
-        gdaltest.post_reason('did not get a feature')
-        return 'fail'
+    assert feat is not None, 'did not get a feature'
 
     if feat.GetField('ZIP') != '95008':
         gdaltest.post_reason('did not get expected feature')
@@ -210,28 +189,21 @@ def test_ogr_db2_SetSpatialFilter():
 
     ds = ogr.Open(ogrtest.db2_test_server)
 
-    if ds is None:
-        return 'fail'
+    assert ds is not None
 
     lyr = ds.GetLayer(0)
 
-    if lyr is None:
-        return 'fail'
+    assert lyr is not None
 
 # set a query envelope so we only get one feature
     lyr.SetSpatialFilterRect(-122.02, 37.42, -122.01, 37.43)
 
     count = lyr.GetFeatureCount()
 
-    if count != 1:
-        gdaltest.post_reason('did not get expected feature count (1)')
-        print(count)
-        return 'fail'
+    assert count == 1, 'did not get expected feature count (1)'
 
     feat = lyr.GetNextFeature()
-    if feat is None:
-        gdaltest.post_reason('did not get a feature')
-        return 'fail'
+    assert feat is not None, 'did not get a feature'
 
     if feat.GetField('ZIP') != '94089':
         gdaltest.post_reason('did not get expected feature')
@@ -244,10 +216,7 @@ def test_ogr_db2_SetSpatialFilter():
 
     count = lyr.GetFeatureCount()
 
-    if count != 3:
-        gdaltest.post_reason('did not get expected feature count (3)')
-        print(count)
-        return 'fail'
+    assert count == 3, 'did not get expected feature count (3)'
 
 # iterate through the features to make sure we get the same count
     count = 0
@@ -256,10 +225,7 @@ def test_ogr_db2_SetSpatialFilter():
         count = count + 1
         feat = lyr.GetNextFeature()
 
-    if count != 3:
-        gdaltest.post_reason('did not get expected feature count (3)')
-        print(count)
-        return 'fail'
+    assert count == 3, 'did not get expected feature count (3)'
 
     return 'success'
 
@@ -275,8 +241,7 @@ def test_ogr_db2_capabilities():
 
     ds = ogr.Open(ogrtest.db2_test_server)
 
-    if ds is None:
-        return 'fail'
+    assert ds is not None
 
     layer = ds.GetLayer()
     capabilities = [
diff --git a/autotest/ogr/ogr_db2_hack.py b/autotest/ogr/ogr_db2_hack.py
index c7e9ea7cffe7..3b99970f1f7f 100755
--- a/autotest/ogr/ogr_db2_hack.py
+++ b/autotest/ogr/ogr_db2_hack.py
@@ -47,18 +47,14 @@ def test_ogr_db2_hack_1():
     wkb = geom.ExportToWkb(byte_order=ogr.wkbXDR).decode('latin1')
     geom.Destroy()
 
-    if wkb[0] != '0':
-        gdaltest.post_reason('WKB wkbXDR point geometry has wrong byte order')
-        return 'fail'
+    assert wkb[0] == '0', 'WKB wkbXDR point geometry has wrong byte order'
 
     # NDR Case.
     geom = ogr.CreateGeometryFromWkt('POINT(10 20)')
     wkb = geom.ExportToWkb(byte_order=ogr.wkbNDR).decode('latin1')
     geom.Destroy()
 
-    if wkb[0] != '1':
-        gdaltest.post_reason('WKB wkbNDR point geometry has wrong byte order')
-        return 'fail'
+    assert wkb[0] == '1', 'WKB wkbNDR point geometry has wrong byte order'
 
     return 'success'
 
@@ -68,27 +64,22 @@ def test_ogr_db2_hack_1():
 
 def test_ogr_db2_hack_2():
 
-    if ogr.SetGenerate_DB2_V72_BYTE_ORDER(0) != 0:
-        gdaltest.post_reason('SetGenerate to turn off hack failed!')
-        return 'fail'
+    assert ogr.SetGenerate_DB2_V72_BYTE_ORDER(0) == 0, \
+        'SetGenerate to turn off hack failed!'
 
     # XDR Case.
     geom = ogr.CreateGeometryFromWkt('POINT(10 20)')
     wkb = geom.ExportToWkb(byte_order=ogr.wkbXDR).decode('latin1')
     geom.Destroy()
 
-    if wkb[0] != chr(0):
-        gdaltest.post_reason('WKB wkbXDR point geometry has wrong byte order')
-        return 'fail'
+    assert wkb[0] == chr(0), 'WKB wkbXDR point geometry has wrong byte order'
 
     # NDR Case.
     geom = ogr.CreateGeometryFromWkt('POINT(10 20)')
     wkb = geom.ExportToWkb(byte_order=ogr.wkbNDR).decode('latin1')
     geom.Destroy()
 
-    if wkb[0] != chr(1):
-        gdaltest.post_reason('WKB wkbNDR point geometry has wrong byte order')
-        return 'fail'
+    assert wkb[0] == chr(1), 'WKB wkbNDR point geometry has wrong byte order'
 
     return 'success'
 
@@ -108,20 +99,16 @@ def test_ogr_db2_hack_3():
     geom.Destroy()
 
     # Check primary byte order value.
-    if wkb.decode('latin1')[0] != '0' and wkb.decode('latin1')[0] != '1':
-        gdaltest.post_reason('corrupt primary geometry byte order')
-        return 'fail'
+    assert wkb.decode('latin1')[0] == '0' or wkb.decode('latin1')[0] == '1', \
+        'corrupt primary geometry byte order'
 
     # Check component geometry byte order
-    if wkb.decode('latin1')[9] != '0' and wkb.decode('latin1')[9] != '1':
-        gdaltest.post_reason('corrupt sub-geometry byte order')
-        return 'fail'
+    assert wkb.decode('latin1')[9] == '0' or wkb.decode('latin1')[9] == '1', \
+        'corrupt sub-geometry byte order'
 
     geom = ogr.CreateGeometryFromWkb(wkb)
-    if geom.ExportToWkt() != wkt:
-        gdaltest.post_reason('Conversion to/from DB2 format seems to have '
+    assert geom.ExportToWkt() == wkt, ('Conversion to/from DB2 format seems to have '
                              'corrupted geometry.')
-        return 'fail'
 
     geom.Destroy()
 
diff --git a/autotest/ogr/ogr_dgn.py b/autotest/ogr/ogr_dgn.py
index e8c71e280254..520e4f902224 100755
--- a/autotest/ogr/ogr_dgn.py
+++ b/autotest/ogr/ogr_dgn.py
@@ -39,9 +39,7 @@
 def test_ogr_dgn_1():
 
     gdaltest.dgn_ds = ogr.Open('data/smalltest.dgn')
-    if gdaltest.dgn_ds is None:
-        gdaltest.post_reason('failed to open test file.')
-        return 'fail'
+    assert gdaltest.dgn_ds is not None, 'failed to open test file.'
 
     gdaltest.dgn_lyr = gdaltest.dgn_ds.GetLayer(0)
 
@@ -56,20 +54,15 @@ def test_ogr_dgn_2():
         return 'skip'
 
     feat = gdaltest.dgn_lyr.GetNextFeature()
-    if feat.GetField('Type') != 17 or feat.GetField('Level') != 1:
-        gdaltest.post_reason('feature 1: expected attributes')
-        return 'fail'
+    assert feat.GetField('Type') == 17 and feat.GetField('Level') == 1, \
+        'feature 1: expected attributes'
 
-    if feat.GetField('Text') != 'Demo Text':
-        gdaltest.post_reason('feature 1: expected text')
-        return 'fail'
+    assert feat.GetField('Text') == 'Demo Text', 'feature 1: expected text'
 
-    if ogrtest.check_feature_geometry(feat, 'POINT (0.73650000 4.21980000)'):
-        return 'fail'
+    assert not ogrtest.check_feature_geometry(feat, 'POINT (0.73650000 4.21980000)')
 
-    if feat.GetStyleString() != 'LABEL(t:"Demo Text",c:#ffffff,s:1.000g,f:ENGINEERING)':
-        gdaltest.post_reason('Style string different than expected.')
-        return 'fail'
+    assert feat.GetStyleString() == 'LABEL(t:"Demo Text",c:#ffffff,s:1.000g,f:ENGINEERING)', \
+        'Style string different than expected.'
 
     return 'success'
 
@@ -82,30 +75,21 @@ def test_ogr_dgn_3():
         return 'skip'
 
     feat = gdaltest.dgn_lyr.GetNextFeature()
-    if feat.GetField('Type') != 15 or feat.GetField('Level') != 2:
-        gdaltest.post_reason('feature 2: expected attributes')
-        return 'fail'
+    assert feat.GetField('Type') == 15 and feat.GetField('Level') == 2, \
+        'feature 2: expected attributes'
 
     geom = feat.GetGeometryRef()
-    if geom.GetCoordinateDimension() != 2:
-        gdaltest.post_reason('expected 2d circle.')
-        return 'fail'
+    assert geom.GetCoordinateDimension() == 2, 'expected 2d circle.'
 
-    if geom.GetGeometryName() != 'LINESTRING':
-        gdaltest.post_reason('Expected circle to be translated as LINESTRING.')
-        return 'fail'
+    assert geom.GetGeometryName() == 'LINESTRING', \
+        'Expected circle to be translated as LINESTRING.'
 
-    if geom.GetPointCount() < 15:
-        gdaltest.post_reason('Unexpected small number of circle interpolation points.')
-        return 'fail'
+    assert geom.GetPointCount() >= 15, \
+        'Unexpected small number of circle interpolation points.'
 
     genvelope = geom.GetEnvelope()
-    if genvelope[0] < 0.328593 or genvelope[0] > 0.328594 \
-       or genvelope[1] < 9.68780 or genvelope[1] > 9.68781 \
-       or genvelope[2] < -0.09611 or genvelope[2] > -0.09610 \
-       or genvelope[3] < 9.26310 or genvelope[3] > 9.26311:
-        gdaltest.post_reason('geometry extents seem odd')
-        return 'fail'
+    assert genvelope[0] >= 0.328593 and genvelope[0] <= 0.328594 and genvelope[1] >= 9.68780 and genvelope[1] <= 9.68781 and genvelope[2] >= -0.09611 and genvelope[2] <= -0.09610 and genvelope[3] >= 9.26310 and genvelope[3] <= 9.26311, \
+        'geometry extents seem odd'
 
     return 'success'
 
@@ -118,19 +102,15 @@ def test_ogr_dgn_4():
         return 'skip'
 
     feat = gdaltest.dgn_lyr.GetNextFeature()
-    if feat.GetField('Type') != 6 or feat.GetField('Level') != 2 \
-       or feat.GetField('ColorIndex') != 83:
-        gdaltest.post_reason('feature 3: expected attributes')
-        return 'fail'
+    assert feat.GetField('Type') == 6 and feat.GetField('Level') == 2 and feat.GetField('ColorIndex') == 83, \
+        'feature 3: expected attributes'
 
     wkt = 'POLYGON ((4.53550000 3.31700000,4.38320000 2.65170000,4.94410000 2.52350000,4.83200000 3.33310000,4.53550000 3.31700000))'
 
-    if ogrtest.check_feature_geometry(feat, wkt):
-        return 'fail'
+    assert not ogrtest.check_feature_geometry(feat, wkt)
 
-    if feat.GetStyleString() != 'BRUSH(fc:#b40000,id:"ogr-brush-0")':
-        gdaltest.post_reason('Style string different than expected.')
-        return 'fail'
+    assert feat.GetStyleString() == 'BRUSH(fc:#b40000,id:"ogr-brush-0")', \
+        'Style string different than expected.'
 
     gdaltest.dgn_lyr.ResetReading()
 
@@ -193,9 +173,7 @@ def test_ogr_dgn_7():
     feat = gdaltest.dgn_lyr.GetNextFeature()
     while feat is not None:
         dst_feat.SetFrom(feat)
-        if dgn2_lyr.CreateFeature(dst_feat) != 0:
-            gdaltest.post_reason('CreateFeature failed.')
-            return 'fail'
+        assert dgn2_lyr.CreateFeature(dst_feat) == 0, 'CreateFeature failed.'
 
         feat = gdaltest.dgn_lyr.GetNextFeature()
 
@@ -223,63 +201,45 @@ def test_ogr_dgn_8():
 
     # Test first first, a text element.
     feat = dgn2_lyr.GetNextFeature()
-    if feat.GetField('Type') != 17 or feat.GetField('Level') != 1:
-        gdaltest.post_reason('feature 1: expected attributes')
-        return 'fail'
+    assert feat.GetField('Type') == 17 and feat.GetField('Level') == 1, \
+        'feature 1: expected attributes'
 
-    if feat.GetField('Text') != 'Demo Text':
-        gdaltest.post_reason('feature 1: expected text')
-        return 'fail'
+    assert feat.GetField('Text') == 'Demo Text', 'feature 1: expected text'
 
-    if ogrtest.check_feature_geometry(feat, 'POINT (0.73650000 4.21980000)'):
-        return 'fail'
+    assert not ogrtest.check_feature_geometry(feat, 'POINT (0.73650000 4.21980000)')
 
-    if feat.GetStyleString() != 'LABEL(t:"Demo Text",c:#ffffff,s:1.000g,f:ENGINEERING)':
-        gdaltest.post_reason('feature 1: Style string different than expected.')
-        return 'fail'
+    assert feat.GetStyleString() == 'LABEL(t:"Demo Text",c:#ffffff,s:1.000g,f:ENGINEERING)', \
+        'feature 1: Style string different than expected.'
 
     # Check second element, a circle.
 
     feat = dgn2_lyr.GetNextFeature()
-    if feat.GetField('Type') != 12 or feat.GetField('Level') != 2:
-        gdaltest.post_reason('feature 2: expected attributes')
-        return 'fail'
+    assert feat.GetField('Type') == 12 and feat.GetField('Level') == 2, \
+        'feature 2: expected attributes'
 
     geom = feat.GetGeometryRef()
-    if geom.GetCoordinateDimension() != 2:
-        gdaltest.post_reason('feature 2: expected 2d circle.')
-        return 'fail'
+    assert geom.GetCoordinateDimension() == 2, 'feature 2: expected 2d circle.'
 
-    if geom.GetGeometryName() != 'MULTILINESTRING':
-        gdaltest.post_reason('feature 2: Expected MULTILINESTRING.')
-        return 'fail'
+    assert geom.GetGeometryName() == 'MULTILINESTRING', \
+        'feature 2: Expected MULTILINESTRING.'
 
     genvelope = geom.GetEnvelope()
-    if genvelope[0] < 0.3285 or genvelope[0] > 0.3287 \
-       or genvelope[1] < 9.6878 or genvelope[1] > 9.6879 \
-       or genvelope[2] < -0.0962 or genvelope[2] > -0.0960 \
-       or genvelope[3] < 9.26310 or genvelope[3] > 9.2632:
-        gdaltest.post_reason('feature 2: geometry extents seem odd')
-        print(genvelope)
-        return 'fail'
+    assert genvelope[0] >= 0.3285 and genvelope[0] <= 0.3287 and genvelope[1] >= 9.6878 and genvelope[1] <= 9.6879 and genvelope[2] >= -0.0962 and genvelope[2] <= -0.0960 and genvelope[3] >= 9.26310 and genvelope[3] <= 9.2632, \
+        'feature 2: geometry extents seem odd'
 
     # Check 3rd feature, a polygon
 
     feat = dgn2_lyr.GetNextFeature()
-    if feat.GetField('Type') != 6 or feat.GetField('Level') != 2 \
-       or feat.GetField('ColorIndex') != 83:
-        gdaltest.post_reason('feature 3: expected attributes')
-        return 'fail'
+    assert feat.GetField('Type') == 6 and feat.GetField('Level') == 2 and feat.GetField('ColorIndex') == 83, \
+        'feature 3: expected attributes'
 
     wkt = 'POLYGON ((4.53550000 3.31700000,4.38320000 2.65170000,4.94410000 2.52350000,4.83200000 3.33310000,4.53550000 3.31700000))'
 
-    if ogrtest.check_feature_geometry(feat, wkt):
-        return 'fail'
+    assert not ogrtest.check_feature_geometry(feat, wkt)
 
     # should be: 'BRUSH(fc:#b40000,id:"ogr-brush-0")'
-    if feat.GetStyleString() != 'PEN(id:"ogr-pen-0",c:#b40000)':
-        gdaltest.post_reason('feature 3: Style string different than expected: ' + feat.GetStyleString())
-        return 'fail'
+    assert feat.GetStyleString() == 'PEN(id:"ogr-pen-0",c:#b40000)', \
+        ('feature 3: Style string different than expected: ' + feat.GetStyleString())
 
     dgn2_ds = None
 
@@ -295,14 +255,12 @@ def test_ogr_dgn_online_1():
         return 'skip'
 
     ds = ogr.Open('tmp/cache/DGNSample_v7.dgn')
-    if ds is None:
-        return 'fail'
+    assert ds is not None
     lyr = ds.GetLayer(0)
     feat = lyr.GetFeature(35)
     wkt = 'LINESTRING (82.9999500717185 23.2084166997284,83.0007450788903 23.2084495986816,83.00081490524 23.2068095339824,82.9999503769036 23.2067737968078)'
 
-    if ogrtest.check_feature_geometry(feat, wkt):
-        return 'fail'
+    assert not ogrtest.check_feature_geometry(feat, wkt)
 
     return 'success'
 
diff --git a/autotest/ogr/ogr_dgnv8.py b/autotest/ogr/ogr_dgnv8.py
index 6d659c0e7e10..cfe4711fe2c7 100755
--- a/autotest/ogr/ogr_dgnv8.py
+++ b/autotest/ogr/ogr_dgnv8.py
@@ -48,9 +48,7 @@ def test_ogr_dgnv8_1():
         return 'skip'
 
     ds = ogr.Open('data/test_dgnv8.dgn')
-    if ds is None:
-        gdaltest.post_reason('failed to open test file.')
-        return 'fail'
+    assert ds is not None, 'failed to open test file.'
 
     return 'success'
 
@@ -91,17 +89,13 @@ def test_ogr_dgnv8_3():
 
     ret = gdaltest.runexternal(test_cli_utilities.get_test_ogrsf_path() + ' -ro data/test_dgnv8.dgn')
 
-    if ret.find('INFO') == -1 or ret.find('ERROR') != -1:
-        print(ret)
-        return 'fail'
+    assert ret.find('INFO') != -1 and ret.find('ERROR') == -1
 
     shutil.copy('data/test_dgnv8.dgn', 'tmp/test_dgnv8.dgn')
     ret = gdaltest.runexternal(test_cli_utilities.get_test_ogrsf_path() + ' tmp/test_dgnv8.dgn')
     os.unlink('tmp/test_dgnv8.dgn')
 
-    if ret.find('INFO') == -1 or ret.find('ERROR') != -1:
-        print(ret)
-        return 'fail'
+    assert ret.find('INFO') != -1 and ret.find('ERROR') == -1
 
     return 'success'
 
@@ -162,24 +156,17 @@ def test_ogr_dgnv8_5():
     ds = None
     ds = ogr.Open(tmp_dgn)
     got_md = ds.GetMetadata_List('DGN')
-    if got_md != options:
-        print(got_md)
-        return 'fail'
+    assert got_md == options
     ds = None
 
     tmp2_dgn = 'tmp/ogr_dgnv8_5_2.dgn'
     gdaltest.dgnv8_drv.CreateDataSource(tmp2_dgn, options=['SEED=' + tmp_dgn, 'TITLE=another_title'])
     ds = ogr.Open(tmp2_dgn)
-    if ds.GetMetadataItem('TITLE', 'DGN') != 'another_title' or ds.GetMetadataItem('APPLICATION', 'DGN') != 'application':
-        print(ds.GetMetadata('DGN'))
-        return 'fail'
+    assert ds.GetMetadataItem('TITLE', 'DGN') == 'another_title' and ds.GetMetadataItem('APPLICATION', 'DGN') == 'application', \
+        ds.GetMetadata('DGN')
     lyr = ds.GetLayer(0)
-    if lyr.GetName() != 'my_layer':
-        print(lyr.GetName())
-        return 'fail'
-    if lyr.GetFeatureCount() != 0:
-        print(lyr.GetFeatureCount())
-        return 'fail'
+    assert lyr.GetName() == 'my_layer'
+    assert lyr.GetFeatureCount() == 0
     ds = None
 
     ds = gdaltest.dgnv8_drv.CreateDataSource(tmp2_dgn, options=['SEED=' + tmp_dgn])
@@ -190,12 +177,8 @@ def test_ogr_dgnv8_5():
     ds = None
     ds = ogr.Open(tmp2_dgn, update=1)
     lyr = ds.GetLayer(0)
-    if lyr.GetName() != 'a_layer':
-        print(lyr.GetName())
-        return 'fail'
-    if lyr.GetFeatureCount() != 1:
-        print(lyr.GetFeatureCount())
-        return 'fail'
+    assert lyr.GetName() == 'a_layer'
+    assert lyr.GetFeatureCount() == 1
     f = lyr.GetNextFeature()
     if f.GetGeometryRef().ExportToWkt() != 'POINT (2 3)':
         f.DumpReadable()
diff --git a/autotest/ogr/ogr_dods.py b/autotest/ogr/ogr_dods.py
index dc2f4678c288..1f1831bb7fa1 100755
--- a/autotest/ogr/ogr_dods.py
+++ b/autotest/ogr/ogr_dods.py
@@ -54,8 +54,7 @@ def ogr_dods_1():
 
     gdaltest.dods_ds = ogr.Open('DODS:' + srv)
 
-    if gdaltest.dods_ds is None:
-        return 'fail'
+    assert gdaltest.dods_ds is not None
 
     try:
         gdaltest.dods_profiles = gdaltest.dods_ds.GetLayerByName('profiles')
@@ -84,17 +83,11 @@ def ogr_dods_2():
     gdaltest.dods_profiles.ResetReading()
     feat = gdaltest.dods_profiles.GetNextFeature()
 
-    if feat.GetField('time') != -1936483200000:
-        gdaltest.post_reason('time wrong')
-        return 'fail'
+    assert feat.GetField('time') == -1936483200000, 'time wrong'
 
-    if feat.GetField('profile.depth') != [0, 10, 20, 30, 39]:
-        gdaltest.post_reason('depth wrong')
-        return 'fail'
+    assert feat.GetField('profile.depth') == [0, 10, 20, 30, 39], 'depth wrong'
 
-    if ogrtest.check_feature_geometry(feat, 'POINT (4.30000019 5.36999989)')\
-            != 0:
-        return 'fail'
+    assert ogrtest.check_feature_geometry(feat, 'POINT (4.30000019 5.36999989)') == 0
 
     feat.Destroy()
 
@@ -120,8 +113,7 @@ def ogr_dods_3():
     expect = [0, 10, 20, 30, 39]
     tr = ogrtest.check_features_against_list(gdaltest.dods_normalized,
                                              'depth', expect)
-    if tr == 0:
-        return 'fail'
+    assert tr != 0
 
     expected = [14.8100004196167, 14.8100004196167, 14.8100004196167, 14.60999965667725, 14.60999965667725]
 
@@ -129,17 +121,11 @@ def ogr_dods_3():
     for i in range(5):
         feat = gdaltest.dods_normalized.GetNextFeature()
 
-        if feat.GetField('time') != -1936483200000:
-            gdaltest.post_reason('time wrong')
-            return 'fail'
+        assert feat.GetField('time') == -1936483200000, 'time wrong'
 
-        if abs(feat.GetField('T_20') - expected[i]) > 0.001:
-            gdaltest.post_reason('T_20 wrong')
-            return 'fail'
+        assert abs(feat.GetField('T_20') - expected[i]) <= 0.001, 'T_20 wrong'
 
-        if ogrtest.check_feature_geometry(feat, 'POINT (4.30000019 5.36999989)')\
-                != 0:
-            return 'fail'
+        assert ogrtest.check_feature_geometry(feat, 'POINT (4.30000019 5.36999989)') == 0
 
         feat.Destroy()
         feat = None
@@ -165,19 +151,14 @@ def ogr_dods_4():
     gdaltest.dods_lines.ResetReading()
     feat = gdaltest.dods_lines.GetNextFeature()
 
-    if feat.GetField('time') != -1936483200000:
-        gdaltest.post_reason('time wrong')
-        return 'fail'
+    assert feat.GetField('time') == -1936483200000, 'time wrong'
 
-    if feat.GetField('profile.depth') != [0, 10, 20, 30, 39]:
-        gdaltest.post_reason('depth wrong')
-        return 'fail'
+    assert feat.GetField('profile.depth') == [0, 10, 20, 30, 39], 'depth wrong'
 
     wkt_geom = 'LINESTRING (0.00000000 14.81000042,10.00000000 14.81000042,20.00000000 14.81000042,30.00000000 14.60999966,39.00000000 14.60999966)'
 
-    if ogrtest.check_feature_geometry(feat, wkt_geom) != 0:
-        print(feat.GetGeometryRef().ExportToWkt())
-        return 'fail'
+    assert ogrtest.check_feature_geometry(feat, wkt_geom) == 0, \
+        feat.GetGeometryRef().ExportToWkt()
 
     feat.Destroy()
 
@@ -204,15 +185,13 @@ def ogr_dods_5():
         return 'skip'
 
     grid_ds = ogr.Open('DODS:' + srv)
-    if grid_ds is None:
-        return 'fail'
+    assert grid_ds is not None
 
     lat_lyr = grid_ds.GetLayerByName('latitude')
 
     expect = [-0.53166663646698]
     tr = ogrtest.check_features_against_list(lat_lyr, 'latitude', expect)
-    if tr == 0:
-        return 'fail'
+    assert tr != 0
 
     return 'success'
 
diff --git a/autotest/ogr/ogr_dxf.py b/autotest/ogr/ogr_dxf.py
index 5f5d0bcccdae..f1a5bebcf04b 100644
--- a/autotest/ogr/ogr_dxf.py
+++ b/autotest/ogr/ogr_dxf.py
@@ -39,6 +39,7 @@
 import gdaltest
 from osgeo import gdal
 from osgeo import ogr
+import pytest
 
 ###############################################################################
 # Check some general things to see if they meet expectations.
@@ -48,28 +49,20 @@ def test_ogr_dxf_1():
 
     gdaltest.dxf_ds = ogr.Open('data/assorted.dxf')
 
-    if gdaltest.dxf_ds is None:
-        return 'fail'
+    assert gdaltest.dxf_ds is not None
 
-    if gdaltest.dxf_ds.GetLayerCount() != 1:
-        gdaltest.post_reason('expected exactly one layer!')
-        return 'fail'
+    assert gdaltest.dxf_ds.GetLayerCount() == 1, 'expected exactly one layer!'
 
     gdaltest.dxf_layer = gdaltest.dxf_ds.GetLayer(0)
 
-    if gdaltest.dxf_layer.GetName() != 'entities':
-        gdaltest.post_reason('did not get expected layer name.')
-        return 'fail'
+    assert gdaltest.dxf_layer.GetName() == 'entities', \
+        'did not get expected layer name.'
 
     defn = gdaltest.dxf_layer.GetLayerDefn()
-    if defn.GetFieldCount() != 6:
-        gdaltest.post_reason('did not get expected number of fields.')
-        return 'fail'
+    assert defn.GetFieldCount() == 6, 'did not get expected number of fields.'
 
     fc = gdaltest.dxf_layer.GetFeatureCount()
-    if fc != 22:
-        gdaltest.post_reason('did not get expected feature count, got %d' % fc)
-        return 'fail'
+    assert fc == 22, ('did not get expected feature count, got %d' % fc)
 
     # Setup the utf-8 string.
     if version_info >= (3, 0, 0):
@@ -97,52 +90,37 @@ def test_ogr_dxf_2():
 
     feat = gdaltest.dxf_layer.GetNextFeature()
 
-    if feat.Layer != '0':
-        gdaltest.post_reason('did not get expected layer for feature 0')
-        return 'fail'
+    assert feat.Layer == '0', 'did not get expected layer for feature 0'
 
-    if feat.PaperSpace != None:
-        gdaltest.post_reason( 'did not get expected PaperSpace for feature 0' )
-        return 'fail'
+    assert feat.PaperSpace == None, 'did not get expected PaperSpace for feature 0'
 
-    if feat.GetFID() != 0:
-        gdaltest.post_reason('did not get expected fid for feature 0')
-        return 'fail'
+    assert feat.GetFID() == 0, 'did not get expected fid for feature 0'
 
-    if feat.SubClasses != 'AcDbEntity:AcDbEllipse':
-        gdaltest.post_reason('did not get expected SubClasses on feature 0.')
-        return 'fail'
+    assert feat.SubClasses == 'AcDbEntity:AcDbEllipse', \
+        'did not get expected SubClasses on feature 0.'
 
-    if feat.LineType != 'ByLayer':
-        gdaltest.post_reason('Did not get expected LineType')
-        return 'fail'
+    assert feat.LineType == 'ByLayer', 'Did not get expected LineType'
 
-    if feat.EntityHandle != '43':
-        gdaltest.post_reason('did not get expected EntityHandle')
-        return 'fail'
+    assert feat.EntityHandle == '43', 'did not get expected EntityHandle'
 
     if feat.GetStyleString() != 'PEN(c:#000000)':
         print('%s' % feat.GetStyleString())
-        gdaltest.post_reason('did not get expected style string on feat 0.')
-        return 'fail'
+        pytest.fail('did not get expected style string on feat 0.')
 
     geom = feat.GetGeometryRef()
-    if geom.GetGeometryType() != ogr.wkbLineString25D:
-        gdaltest.post_reason('did not get expected geometry type.')
-        return 'fail'
+    assert geom.GetGeometryType() == ogr.wkbLineString25D, \
+        'did not get expected geometry type.'
 
     envelope = geom.GetEnvelope()
     area = (envelope[1] - envelope[0]) * (envelope[3] - envelope[2])
     exp_area = 1596.12
 
-    if area < exp_area - 0.5 or area > exp_area + 0.5:
-        gdaltest.post_reason('envelope area not as expected, got %g.' % area)
-        return 'fail'
+    assert area >= exp_area - 0.5 and area <= exp_area + 0.5, \
+        ('envelope area not as expected, got %g.' % area)
 
-    if abs(geom.GetX(0) - 73.25) > 0.001 or abs(geom.GetY(0) - 139.75) > 0.001:
-        gdaltest.post_reason('first point (%g,%g) not expected location.'
+    assert abs(geom.GetX(0) - 73.25) <= 0.001 and abs(geom.GetY(0) - 139.75) <= 0.001, \
+        ('first point (%g,%g) not expected location.'
                              % (geom.GetX(0), geom.GetY(0)))
-        return 'fail'
 
     return 'success'
 
@@ -160,14 +138,12 @@ def test_ogr_dxf_3():
     area = (envelope[1] - envelope[0]) * (envelope[3] - envelope[2])
     exp_area = 311.864
 
-    if area < exp_area - 0.5 or area > exp_area + 0.5:
-        gdaltest.post_reason('envelope area not as expected, got %g.' % area)
-        return 'fail'
+    assert area >= exp_area - 0.5 and area <= exp_area + 0.5, \
+        ('envelope area not as expected, got %g.' % area)
 
-    if abs(geom.GetX(0) - 61.133) > 0.01 or abs(geom.GetY(0) - 103.592) > 0.01:
-        gdaltest.post_reason('first point (%g,%g) not expected location.'
+    assert abs(geom.GetX(0) - 61.133) <= 0.01 and abs(geom.GetY(0) - 103.592) <= 0.01, \
+        ('first point (%g,%g) not expected location.'
                              % (geom.GetX(0), geom.GetY(0)))
-        return 'fail'
 
     return 'success'
 
@@ -179,8 +155,7 @@ def test_ogr_dxf_4():
 
     feat = gdaltest.dxf_layer.GetNextFeature()
 
-    if ogrtest.check_feature_geometry(feat, 'POINT (83.5 160.0 0)'):
-        return 'fail'
+    assert not ogrtest.check_feature_geometry(feat, 'POINT (83.5 160.0 0)')
 
     return 'success'
 
@@ -192,12 +167,10 @@ def test_ogr_dxf_5():
 
     feat = gdaltest.dxf_layer.GetNextFeature()
 
-    if ogrtest.check_feature_geometry(feat, 'LINESTRING (97.0 159.5 0,108.5 132.25 0)'):
-        return 'fail'
+    assert not ogrtest.check_feature_geometry(feat, 'LINESTRING (97.0 159.5 0,108.5 132.25 0)')
 
-    if feat.GetGeometryRef().GetGeometryType() == ogr.wkbLineString:
-        gdaltest.post_reason('not keeping 3D linestring as 3D')
-        return 'fail'
+    assert feat.GetGeometryRef().GetGeometryType() != ogr.wkbLineString, \
+        'not keeping 3D linestring as 3D'
 
     return 'success'
 
@@ -209,17 +182,13 @@ def test_ogr_dxf_6():
 
     feat = gdaltest.dxf_layer.GetNextFeature()
 
-    if ogrtest.check_feature_geometry(feat, 'POINT (84 126)'):
-        return 'fail'
+    assert not ogrtest.check_feature_geometry(feat, 'POINT (84 126)')
 
-    if feat.GetGeometryRef().GetGeometryType() == ogr.wkbPoint25D:
-        gdaltest.post_reason('not keeping 2D text as 2D')
-        return 'fail'
+    assert feat.GetGeometryRef().GetGeometryType() != ogr.wkbPoint25D, \
+        'not keeping 2D text as 2D'
 
-    if feat.GetStyleString() != 'LABEL(f:"Arial",t:"Test",a:30,s:5g,p:7,c:#000000)':
-        print(feat.GetStyleString())
-        gdaltest.post_reason('got wrong style string')
-        return 'fail'
+    assert feat.GetStyleString() == 'LABEL(f:"Arial",t:"Test",a:30,s:5g,p:7,c:#000000)', \
+        'got wrong style string'
 
     return 'success'
 
@@ -239,13 +208,11 @@ def test_ogr_dxf_7():
 
     if area < exp_area - 0.5 or area > exp_area + 0.5:
         print(envelope)
-        gdaltest.post_reason('envelope area not as expected, got %g.' % area)
-        return 'fail'
+        pytest.fail('envelope area not as expected, got %g.' % area)
 
-    if abs(geom.GetX(0) - 115.258) > 0.01 or abs(geom.GetY(0) - 107.791) > 0.01:
-        gdaltest.post_reason('first point (%g,%g) not expected location.'
+    assert abs(geom.GetX(0) - 115.258) <= 0.01 and abs(geom.GetY(0) - 107.791) <= 0.01, \
+        ('first point (%g,%g) not expected location.'
                              % (geom.GetX(0), geom.GetY(0)))
-        return 'fail'
 
     return 'success'
 
@@ -258,53 +225,43 @@ def test_ogr_dxf_8():
     # Check that this line is in PaperSpace
     feat = gdaltest.dxf_layer.GetNextFeature()
 
-    if feat.GetField('PaperSpace') != 1:
-        gdaltest.post_reason( 'did not get expected PaperSpace' )
-        return 'fail'
+    assert feat.GetField('PaperSpace') == 1, 'did not get expected PaperSpace'
 
     # Dimension lines
     feat = gdaltest.dxf_layer.GetNextFeature()
     geom = feat.GetGeometryRef()
 
-    if geom.GetGeometryType() != ogr.wkbMultiLineString:
-        gdaltest.post_reason('did not get expected geometry type.')
-        return 'fail'
+    assert geom.GetGeometryType() == ogr.wkbMultiLineString, \
+        'did not get expected geometry type.'
 
-    if ogrtest.check_feature_geometry(feat, 'MULTILINESTRING ((63.8628719444825 149.209935992088,24.3419606685507 111.934531038653),(72.3255686642474 140.237438265109,63.0051995752285 150.119275371538),(32.8046573883157 102.962033311673,23.4842882992968 112.843870418103))'):
-        return 'fail'
+    assert not ogrtest.check_feature_geometry(feat, 'MULTILINESTRING ((63.8628719444825 149.209935992088,24.3419606685507 111.934531038653),(72.3255686642474 140.237438265109,63.0051995752285 150.119275371538),(32.8046573883157 102.962033311673,23.4842882992968 112.843870418103))')
 
     # Dimension arrowheads
     feat = gdaltest.dxf_layer.GetNextFeature()
     geom = feat.GetGeometryRef()
 
-    if geom.GetGeometryType() != ogr.wkbPolygon25D:
-        gdaltest.post_reason('did not get expected geometry type.')
-        return 'fail'
+    assert geom.GetGeometryType() == ogr.wkbPolygon25D, \
+        'did not get expected geometry type.'
 
-    if ogrtest.check_feature_geometry(feat, 'POLYGON Z ((61.7583023958313 147.797704380064 0,63.8628719444825 149.209935992088 0,62.3300839753339 147.191478127097 0,61.7583023958313 147.797704380064 0))'):
-        return 'fail'
+    assert not ogrtest.check_feature_geometry(feat, 'POLYGON Z ((61.7583023958313 147.797704380064 0,63.8628719444825 149.209935992088 0,62.3300839753339 147.191478127097 0,61.7583023958313 147.797704380064 0))')
 
     feat = gdaltest.dxf_layer.GetNextFeature()
     geom = feat.GetGeometryRef()
 
-    if geom.GetGeometryType() != ogr.wkbPolygon25D:
-        gdaltest.post_reason('did not get expected geometry type.')
-        return 'fail'
+    assert geom.GetGeometryType() == ogr.wkbPolygon25D, \
+        'did not get expected geometry type.'
 
-    if ogrtest.check_feature_geometry(feat, 'POLYGON Z ((26.4465302172018 113.346762650677 0,24.3419606685507 111.934531038653 0,25.8747486376992 113.952988903644 0,26.4465302172018 113.346762650677 0))'):
-        return 'fail'
+    assert not ogrtest.check_feature_geometry(feat, 'POLYGON Z ((26.4465302172018 113.346762650677 0,24.3419606685507 111.934531038653 0,25.8747486376992 113.952988903644 0,26.4465302172018 113.346762650677 0))')
 
     # Dimension text
     feat = gdaltest.dxf_layer.GetNextFeature()
     geom = feat.GetGeometryRef()
 
-    if ogrtest.check_feature_geometry(feat, 'POINT (42.815907752635709 131.936242584545397)'):
-        return 'fail'
+    assert not ogrtest.check_feature_geometry(feat, 'POINT (42.815907752635709 131.936242584545397)')
 
     expected_style = 'LABEL(f:"Arial",t:"54.33",p:5,a:43.3,s:2.5g,c:#000000)'
-    if feat.GetStyleString() != expected_style:
-        gdaltest.post_reason('Got unexpected style string:\n%s\ninstead of:\n%s' % (feat.GetStyleString(), expected_style))
-        return 'fail'
+    assert feat.GetStyleString() == expected_style, \
+        ('Got unexpected style string:\n%s\ninstead of:\n%s' % (feat.GetStyleString(), expected_style))
 
     return 'success'
 
@@ -322,39 +279,30 @@ def test_ogr_dxf_9():
     feat = gdaltest.dxf_layer.GetNextFeature()
     geom = feat.GetGeometryRef()
 
-    if geom.GetGeometryType() != ogr.wkbMultiLineString25D:
-        gdaltest.post_reason('did not get expected geometry type.')
-        return 'fail'
+    assert geom.GetGeometryType() == ogr.wkbMultiLineString25D, \
+        'did not get expected geometry type.'
 
-    if ogrtest.check_feature_geometry(feat, 'MULTILINESTRING ((79.069506278985116 121.003652476272777 0,79.716898725419625 118.892590150942851 0),(79.716898725419625 118.892590150942851 0,78.140638855839953 120.440702522851453 0),(78.140638855839953 120.440702522851453 0,80.139111190485622 120.328112532167196 0),(80.139111190485622 120.328112532167196 0,78.619146316248077 118.920737648613908 0),(78.619146316248077 118.920737648613908 0,79.041358781314059 120.975504978601705 0))'):
-        return 'fail'
+    assert not ogrtest.check_feature_geometry(feat, 'MULTILINESTRING ((79.069506278985116 121.003652476272777 0,79.716898725419625 118.892590150942851 0),(79.716898725419625 118.892590150942851 0,78.140638855839953 120.440702522851453 0),(78.140638855839953 120.440702522851453 0,80.139111190485622 120.328112532167196 0),(80.139111190485622 120.328112532167196 0,78.619146316248077 118.920737648613908 0),(78.619146316248077 118.920737648613908 0,79.041358781314059 120.975504978601705 0))')
 
     # First of two MTEXTs
     feat = gdaltest.dxf_layer.GetNextFeature()
-    if feat.GetField('Text') != gdaltest.sample_text:
-        gdaltest.post_reason('Did not get expected first mtext.')
-        return 'fail'
+    assert feat.GetField('Text') == gdaltest.sample_text, \
+        'Did not get expected first mtext.'
 
     expected_style = 'LABEL(f:"Arial",t:"' + gdaltest.sample_style + '",a:45,s:0.5g,p:5,c:#000000)'
-    if feat.GetStyleString() != expected_style:
-        gdaltest.post_reason('Got unexpected style string:\n%s\ninstead of:\n%s.' % (feat.GetStyleString(), expected_style))
-        return 'fail'
+    assert feat.GetStyleString() == expected_style, \
+        ('Got unexpected style string:\n%s\ninstead of:\n%s.' % (feat.GetStyleString(), expected_style))
 
-    if ogrtest.check_feature_geometry(feat, 'POINT (77.602201427662891 120.775897075866169 0)'):
-        return 'fail'
+    assert not ogrtest.check_feature_geometry(feat, 'POINT (77.602201427662891 120.775897075866169 0)')
 
     # Second of two MTEXTs
     feat = gdaltest.dxf_layer.GetNextFeature()
-    if feat.GetField('Text') != 'Second':
-        gdaltest.post_reason('Did not get expected second mtext.')
-        return 'fail'
+    assert feat.GetField('Text') == 'Second', 'Did not get expected second mtext.'
 
-    if feat.GetField('SubClasses') != 'AcDbEntity:AcDbMText':
-        gdaltest.post_reason('Did not get expected subclasses.')
-        return 'fail'
+    assert feat.GetField('SubClasses') == 'AcDbEntity:AcDbMText', \
+        'Did not get expected subclasses.'
 
-    if ogrtest.check_feature_geometry(feat, 'POINT (79.977331629005178 119.698291706738644 0)'):
-        return 'fail'
+    assert not ogrtest.check_feature_geometry(feat, 'POINT (79.977331629005178 119.698291706738644 0)')
 
     return 'success'
 
@@ -374,20 +322,16 @@ def test_ogr_dxf_10():
     feat = ocs_lyr.GetNextFeature()
     geom = feat.GetGeometryRef()
 
-    if geom.GetGeometryType() != ogr.wkbLineString25D:
-        print(geom.GetGeometryType())
-        gdaltest.post_reason('did not get expected geometry type.')
-        return 'fail'
+    assert geom.GetGeometryType() == ogr.wkbLineString25D, \
+        'did not get expected geometry type.'
 
-    if ogrtest.check_feature_geometry(feat, 'LINESTRING (600325.567999998573214 3153021.253000000491738 562.760000000052969,600255.215999998385087 3151973.98600000096485 536.950000000069849,597873.927999997511506 3152247.628000000491738 602.705000000089058)'):
-        return 'fail'
+    assert not ogrtest.check_feature_geometry(feat, 'LINESTRING (600325.567999998573214 3153021.253000000491738 562.760000000052969,600255.215999998385087 3151973.98600000096485 536.950000000069849,597873.927999997511506 3152247.628000000491738 602.705000000089058)')
 
     # LWPOLYLINE in OCS with bulge
     feat = ocs_lyr.GetFeature(12)
 
-    if ogrtest.check_feature_geometry(feat, 'LINESTRING Z (611415.459819656 3139300.00002682 1807.37309215522,611245.079665823 3139720.59876424 1807.37309215522,611245.079665823 3139720.59876424 1807.37309215522,611244.054791235 3139723.12875936 1807.27984293229,611243.034695086 3139725.64695847 1807.00053001486,611242.024133533 3139728.14162057 1806.53645568869,611241.027818282 3139730.6011144 1805.88978368251,611240.050394615 3139733.01397265 1805.06352907972,611239.096419732 3139735.36894547 1804.06154426071,611238.170341503 3139737.65505289 1802.88850094122,611237.276477734 3139739.86163602 1801.54986839073,611236.418996029 3139741.97840675 1800.0518879321,611235.601894365 3139743.99549572 1798.40154384175,611234.828982446 3139745.90349832 1796.60653078564,611234.103863944 3139747.69351857 1794.67521794327,611233.429919697 3139749.35721058 1792.61660998662,611232.810291944 3139750.88681743 1790.44030509629,611232.247869676 3139752.27520739 1788.15645021029,611231.745275164 3139753.51590716 1785.77569371438,611231.304851737 3139754.60313201 1783.30913579435,611230.928652852 3139755.5318128 1780.76827668182,611230.618432521 3139756.29761959 1778.16496303489,611230.375637135 3139756.89698184 1775.51133270351,611230.201398719 3139757.32710505 1772.81975813727,611230.096529651 3139757.58598378 1770.10278869926,611230.06151888 3139757.67241101 1767.37309215522,611230.06151892 3139757.67241089 1661.18408370228,611230.06151892 3139757.67241089 1661.18408370228,611230.026508154 3139757.75883812 1658.45438717061,611229.921639091 3139758.01771683 1655.73741774404,611229.74740068 3139758.44784002 1653.04584318824,611229.5046053 3139759.04720226 1650.39221286628,611229.194384975 3139759.81300904 1647.78889922769,611228.818186096 3139760.74168982 1645.24804012238,611228.377762675 3139761.82891465 1642.78148220841,611227.87516817 3139763.0696144 1640.40072571739,611227.312745909 3139764.45800435 1638.11687083509,611226.693118163 3139765.98761118 1635.94056594722,611226.019173923 3139767.65130317 1633.88195799181,611225.294055428 3139769.4413234 1631.95064514943,611224.521143516 3139771.34932599 1630.15563209209,611223.704041858 3139773.36641494 1628.50528799927,611222.84656016 3139775.48318565 1627.00730753696,611221.952696397 3139777.68976876 1625.66867498157,611221.026618175 3139779.97587617 1624.49563165602,611220.072643298 3139782.33084897 1623.49364682979,611219.095219637 3139784.74370721 1622.66739221866,611218.098904392 3139787.20320102 1622.02072020306,611217.088342845 3139789.69786311 1621.55664586644,' +
-                                      '611216.0682467 3139792.21606221 1621.27733293758,611215.043372117 3139794.74605732 1621.18408370228,610905.973331759 3140557.71325641 1621.18408370228,610905.973331759 3140557.71325641 1621.18408370228,610904.948457176 3140560.24325151 1621.2773329396,610903.928361033 3140562.76145061 1621.55664587034,610902.917799487 3140565.2561127 1622.02072020868,610901.921484243 3140567.71560651 1622.66739222582,610900.944060583 3140570.12846474 1623.49364683831,610899.990085707 3140572.48343755 1624.49563166573,610899.064007486 3140574.76954495 1625.66867499227,610898.170143725 3140576.97612806 1627.00730754846,610897.312662028 3140579.09289877 1628.50528801138,610896.495560372 3140581.10998771 1630.1556321046,610895.722648461 3140583.0179903 1631.95064516215,610894.997529967 3140584.80801053 1633.88195800453,610894.323585729 3140586.47170251 1635.94056595974,610893.703957984 3140588.00130935 1638.1168708472,610893.141535724 3140589.38969929 1640.4007257289,610892.63894122 3140590.63039904 1642.78148221912,610892.198517801 3140591.71762387 1645.2480401321,610891.822318923 3140592.64630464 1647.78889923622,610891.5120986 3140593.41211142 1650.39221287345,610891.269303221 3140594.01147366 1653.04584319386,610891.095064811 3140594.44159685 1655.73741774794,610890.99019575 3140594.70047556 1658.45438717264,610890.955184986 3140594.78690278 1661.18408370228,610890.955185021 3140594.78690272 1752.31638281001,610890.955185021 3140594.78690271 1752.31638281001,610890.920174252 3140594.87332995 1755.04607934987,610890.815305187 3140595.13220867 1757.76304878401,610890.641066773 3140595.56233187 1760.45462334672,610890.398271389 3140596.16169412 1763.10825367492,610890.088051061 3140596.92750091 1765.71156731903,610889.711852178 3140597.85618169 1768.25242642912,610889.271428753 3140598.94340654 1770.71898434711,610888.768834244 3140600.1841063 1773.09974084137,610888.206411978 3140601.57249626 1775.38359572612,610887.586784228 3140603.1021031 1777.55990061562,610886.912839984 3140604.7657951 1779.61850857185,610886.187721485 3140606.55581535 1781.54982141423,610885.414809569 3140608.46381795 1783.34483447076,610884.597707907 3140610.48090691 1784.99517856195,610883.740226205 3140612.59767763 1786.49315902182,610882.846362438 3140614.80426075 1787.83179157397,610881.920284211 3140617.09036817 1789.0048348955,610880.96630933 3140619.44534098 1790.00681971696,610879.988885665 3140621.85819923 1790.83307432256,610878.992570417 3140624.31769305 1791.47974633192,610877.982008866 3140626.81235515 1791.94382066162,610876.961912718 3140629.33055426 1792.22313358291,610875.937038132 3140631.86054938 1792.31638281001,610699.99993399 3141066.17711854 1792.31638281001)'):
-        return 'fail'
+    assert (not ogrtest.check_feature_geometry(feat, 'LINESTRING Z (611415.459819656 3139300.00002682 1807.37309215522,611245.079665823 3139720.59876424 1807.37309215522,611245.079665823 3139720.59876424 1807.37309215522,611244.054791235 3139723.12875936 1807.27984293229,611243.034695086 3139725.64695847 1807.00053001486,611242.024133533 3139728.14162057 1806.53645568869,611241.027818282 3139730.6011144 1805.88978368251,611240.050394615 3139733.01397265 1805.06352907972,611239.096419732 3139735.36894547 1804.06154426071,611238.170341503 3139737.65505289 1802.88850094122,611237.276477734 3139739.86163602 1801.54986839073,611236.418996029 3139741.97840675 1800.0518879321,611235.601894365 3139743.99549572 1798.40154384175,611234.828982446 3139745.90349832 1796.60653078564,611234.103863944 3139747.69351857 1794.67521794327,611233.429919697 3139749.35721058 1792.61660998662,611232.810291944 3139750.88681743 1790.44030509629,611232.247869676 3139752.27520739 1788.15645021029,611231.745275164 3139753.51590716 1785.77569371438,611231.304851737 3139754.60313201 1783.30913579435,611230.928652852 3139755.5318128 1780.76827668182,611230.618432521 3139756.29761959 1778.16496303489,611230.375637135 3139756.89698184 1775.51133270351,611230.201398719 3139757.32710505 1772.81975813727,611230.096529651 3139757.58598378 1770.10278869926,611230.06151888 3139757.67241101 1767.37309215522,611230.06151892 3139757.67241089 1661.18408370228,611230.06151892 3139757.67241089 1661.18408370228,611230.026508154 3139757.75883812 1658.45438717061,611229.921639091 3139758.01771683 1655.73741774404,611229.74740068 3139758.44784002 1653.04584318824,611229.5046053 3139759.04720226 1650.39221286628,611229.194384975 3139759.81300904 1647.78889922769,611228.818186096 3139760.74168982 1645.24804012238,611228.377762675 3139761.82891465 1642.78148220841,611227.87516817 3139763.0696144 1640.40072571739,611227.312745909 3139764.45800435 1638.11687083509,611226.693118163 3139765.98761118 1635.94056594722,611226.019173923 3139767.65130317 1633.88195799181,611225.294055428 3139769.4413234 1631.95064514943,611224.521143516 3139771.34932599 1630.15563209209,611223.704041858 3139773.36641494 1628.50528799927,611222.84656016 3139775.48318565 1627.00730753696,611221.952696397 3139777.68976876 1625.66867498157,611221.026618175 3139779.97587617 1624.49563165602,611220.072643298 3139782.33084897 1623.49364682979,611219.095219637 3139784.74370721 1622.66739221866,611218.098904392 3139787.20320102 1622.02072020306,611217.088342845 3139789.69786311 1621.55664586644,' +
+                                      '611216.0682467 3139792.21606221 1621.27733293758,611215.043372117 3139794.74605732 1621.18408370228,610905.973331759 3140557.71325641 1621.18408370228,610905.973331759 3140557.71325641 1621.18408370228,610904.948457176 3140560.24325151 1621.2773329396,610903.928361033 3140562.76145061 1621.55664587034,610902.917799487 3140565.2561127 1622.02072020868,610901.921484243 3140567.71560651 1622.66739222582,610900.944060583 3140570.12846474 1623.49364683831,610899.990085707 3140572.48343755 1624.49563166573,610899.064007486 3140574.76954495 1625.66867499227,610898.170143725 3140576.97612806 1627.00730754846,610897.312662028 3140579.09289877 1628.50528801138,610896.495560372 3140581.10998771 1630.1556321046,610895.722648461 3140583.0179903 1631.95064516215,610894.997529967 3140584.80801053 1633.88195800453,610894.323585729 3140586.47170251 1635.94056595974,610893.703957984 3140588.00130935 1638.1168708472,610893.141535724 3140589.38969929 1640.4007257289,610892.63894122 3140590.63039904 1642.78148221912,610892.198517801 3140591.71762387 1645.2480401321,610891.822318923 3140592.64630464 1647.78889923622,610891.5120986 3140593.41211142 1650.39221287345,610891.269303221 3140594.01147366 1653.04584319386,610891.095064811 3140594.44159685 1655.73741774794,610890.99019575 3140594.70047556 1658.45438717264,610890.955184986 3140594.78690278 1661.18408370228,610890.955185021 3140594.78690272 1752.31638281001,610890.955185021 3140594.78690271 1752.31638281001,610890.920174252 3140594.87332995 1755.04607934987,610890.815305187 3140595.13220867 1757.76304878401,610890.641066773 3140595.56233187 1760.45462334672,610890.398271389 3140596.16169412 1763.10825367492,610890.088051061 3140596.92750091 1765.71156731903,610889.711852178 3140597.85618169 1768.25242642912,610889.271428753 3140598.94340654 1770.71898434711,610888.768834244 3140600.1841063 1773.09974084137,610888.206411978 3140601.57249626 1775.38359572612,610887.586784228 3140603.1021031 1777.55990061562,610886.912839984 3140604.7657951 1779.61850857185,610886.187721485 3140606.55581535 1781.54982141423,610885.414809569 3140608.46381795 1783.34483447076,610884.597707907 3140610.48090691 1784.99517856195,610883.740226205 3140612.59767763 1786.49315902182,610882.846362438 3140614.80426075 1787.83179157397,610881.920284211 3140617.09036817 1789.0048348955,610880.96630933 3140619.44534098 1790.00681971696,610879.988885665 3140621.85819923 1790.83307432256,610878.992570417 3140624.31769305 1791.47974633192,610877.982008866 3140626.81235515 1791.94382066162,610876.961912718 3140629.33055426 1792.22313358291,610875.937038132 3140631.86054938 1792.31638281001,610699.99993399 3141066.17711854 1792.31638281001)'))
 
     ocs_lyr = None
     ocs_ds = None
@@ -406,16 +350,14 @@ def test_ogr_dxf_11():
     # Check first point.
     feat = eo_lyr.GetNextFeature()
 
-    if ogrtest.check_feature_geometry(feat,
-                                      'POINT (672500.0 242000.0 539.986)'):
-        return 'fail'
+    assert (not ogrtest.check_feature_geometry(feat,
+                                      'POINT (672500.0 242000.0 539.986)'))
 
     # Check second point.
     feat = eo_lyr.GetNextFeature()
 
-    if ogrtest.check_feature_geometry(feat,
-                                      'POINT (672750.0 242000.0 558.974)'):
-        return 'fail'
+    assert (not ogrtest.check_feature_geometry(feat,
+                                      'POINT (672750.0 242000.0 558.974)'))
 
     eo_lyr = None
     eo_ds = None
@@ -464,45 +406,39 @@ def test_ogr_dxf_12():
     # Check first feature
     feat = lyr.GetNextFeature()
 
-    if ogrtest.check_feature_geometry(feat,
-                                      'LINESTRING(10 12, 60 65)'):
-        print(feat.GetGeometryRef().ExportToWkt())
-        return 'fail'
+    assert (not ogrtest.check_feature_geometry(feat,
+                                      'LINESTRING(10 12, 60 65)')), \
+        feat.GetGeometryRef().ExportToWkt()
 
-    if feat.GetGeometryRef().GetGeometryType() != ogr.wkbLineString:
-        gdaltest.post_reason('not linestring 2D')
-        return 'fail'
+    assert feat.GetGeometryRef().GetGeometryType() == ogr.wkbLineString, \
+        'not linestring 2D'
     feat = None
 
     # Check second feature
     feat = lyr.GetNextFeature()
 
-    if ogrtest.check_feature_geometry(feat,
-                                      'POLYGON((0 0,100 0,100 100,0 0))'):
-        print(feat.GetGeometryRef().ExportToWkt())
-        return 'fail'
+    assert (not ogrtest.check_feature_geometry(feat,
+                                      'POLYGON((0 0,100 0,100 100,0 0))')), \
+        feat.GetGeometryRef().ExportToWkt()
 
-    if feat.GetGeometryRef().GetGeometryType() != ogr.wkbPolygon:
-        gdaltest.post_reason('not keeping polygon 2D')
-        return 'fail'
+    assert feat.GetGeometryRef().GetGeometryType() == ogr.wkbPolygon, \
+        'not keeping polygon 2D'
     feat = None
 
     # Check third feature
     feat = lyr.GetNextFeature()
 
-    if ogrtest.check_feature_geometry(feat,
-                                      'LINESTRING(1 2 10,3 4 10)'):
-        print(feat.GetGeometryRef().ExportToWkt())
-        return 'fail'
+    assert (not ogrtest.check_feature_geometry(feat,
+                                      'LINESTRING(1 2 10,3 4 10)')), \
+        feat.GetGeometryRef().ExportToWkt()
     feat = None
 
     # Check fourth feature
     feat = lyr.GetNextFeature()
 
-    if ogrtest.check_feature_geometry(feat,
-                                      'LINESTRING(1 2 -10,3 4 10)'):
-        print(feat.GetGeometryRef().ExportToWkt())
-        return 'fail'
+    assert (not ogrtest.check_feature_geometry(feat,
+                                      'LINESTRING(1 2 -10,3 4 10)')), \
+        feat.GetGeometryRef().ExportToWkt()
     feat = None
 
     lyr = None
@@ -525,22 +461,18 @@ def test_ogr_dxf_13():
 
     feat = layer.GetNextFeature()
 
-    if feat.Layer != '1':
-        gdaltest.post_reason('did not get expected layer for feature 0')
-        return 'fail'
+    assert feat.Layer == '1', 'did not get expected layer for feature 0'
 
     geom = feat.GetGeometryRef()
-    if geom.GetGeometryType() != ogr.wkbLineString25D:
-        gdaltest.post_reason('did not get expected geometry type.')
-        return 'fail'
+    assert geom.GetGeometryType() == ogr.wkbLineString25D, \
+        'did not get expected geometry type.'
 
     envelope = geom.GetEnvelope()
     area = (envelope[1] - envelope[0]) * (envelope[3] - envelope[2])
     exp_area = 1350.43
 
-    if area < exp_area - 0.5 or area > exp_area + 0.5:
-        gdaltest.post_reason('envelope area not as expected, got %g.' % area)
-        return 'fail'
+    assert area >= exp_area - 0.5 and area <= exp_area + 0.5, \
+        ('envelope area not as expected, got %g.' % area)
 
     # Check for specific number of points from tessellated arc(s).
     # Note that this number depends on the tessellation algorithm and
@@ -551,15 +483,12 @@ def test_ogr_dxf_13():
     # only that more points are returned than in the original polyline, and
     # that the points lie along (or reasonably close to) said path.
 
-    if geom.GetPointCount() != 146:
-        gdaltest.post_reason('did not get expected number of points, got %d' % geom.GetPointCount())
-        return 'fail'
+    assert geom.GetPointCount() == 146, \
+        ('did not get expected number of points, got %d' % geom.GetPointCount())
 
-    if abs(geom.GetX(0) - 251297.8179) > 0.001 \
-       or abs(geom.GetY(0) - 412226.8286) > 0.001:
-        gdaltest.post_reason('first point (%g,%g) not expected location.'
+    assert abs(geom.GetX(0) - 251297.8179) <= 0.001 and abs(geom.GetY(0) - 412226.8286) <= 0.001, \
+        ('first point (%g,%g) not expected location.'
                              % (geom.GetX(0), geom.GetY(0)))
-        return 'fail'
 
     # Other possible tests:
     # Polylines with no explicit Z coordinates (e.g., no attribute 38 for
@@ -589,32 +518,25 @@ def test_ogr_dxf_14():
 
     feat = layer.GetNextFeature()
 
-    if feat.Layer != '1':
-        gdaltest.post_reason('did not get expected layer for feature 0')
-        return 'fail'
+    assert feat.Layer == '1', 'did not get expected layer for feature 0'
 
     geom = feat.GetGeometryRef()
-    if geom.GetGeometryType() != ogr.wkbLineString:
-        gdaltest.post_reason('did not get expected geometry type.')
-        return 'fail'
+    assert geom.GetGeometryType() == ogr.wkbLineString, \
+        'did not get expected geometry type.'
 
     envelope = geom.GetEnvelope()
     area = (envelope[1] - envelope[0]) * (envelope[3] - envelope[2])
     exp_area = 1350.43
 
-    if area < exp_area - 0.5 or area > exp_area + 0.5:
-        gdaltest.post_reason('envelope area not as expected, got %g.' % area)
-        return 'fail'
+    assert area >= exp_area - 0.5 and area <= exp_area + 0.5, \
+        ('envelope area not as expected, got %g.' % area)
 
-    if geom.GetPointCount() != 146:
-        gdaltest.post_reason('did not get expected number of points, got %d' % geom.GetPointCount())
-        return 'fail'
+    assert geom.GetPointCount() == 146, \
+        ('did not get expected number of points, got %d' % geom.GetPointCount())
 
-    if abs(geom.GetX(0) - 251297.8179) > 0.001 \
-       or abs(geom.GetY(0) - 412226.8286) > 0.001:
-        gdaltest.post_reason('first point (%g,%g) not expected location.'
+    assert abs(geom.GetX(0) - 251297.8179) <= 0.001 and abs(geom.GetY(0) - 412226.8286) <= 0.001, \
+        ('first point (%g,%g) not expected location.'
                              % (geom.GetX(0), geom.GetY(0)))
-        return 'fail'
 
     ds = None
 
@@ -652,35 +574,26 @@ def test_ogr_dxf_15():
     # Check first feature
     feat = lyr.GetNextFeature()
 
-    if ogrtest.check_feature_geometry(feat,
-                                      'LINESTRING(10 12, 60 65)'):
-        print(feat.GetGeometryRef().ExportToWkt())
-        return 'fail'
+    assert (not ogrtest.check_feature_geometry(feat,
+                                      'LINESTRING(10 12, 60 65)')), \
+        feat.GetGeometryRef().ExportToWkt()
 
-    if feat.GetGeometryRef().GetGeometryType() == ogr.wkbLineString25D:
-        gdaltest.post_reason('not linestring 2D')
-        return 'fail'
+    assert feat.GetGeometryRef().GetGeometryType() != ogr.wkbLineString25D, \
+        'not linestring 2D'
 
-    if feat.GetField('Layer') != 'abc':
-        gdaltest.post_reason('Did not get expected layer, abc.')
-        return 'fail'
+    assert feat.GetField('Layer') == 'abc', 'Did not get expected layer, abc.'
 
     # Check second point.
     feat = lyr.GetNextFeature()
 
-    if ogrtest.check_feature_geometry(feat,
-                                      'POLYGON((0 0,100 0,100 100,0 0))'):
-        print(feat.GetGeometryRef().ExportToWkt())
-        return 'fail'
+    assert (not ogrtest.check_feature_geometry(feat,
+                                      'POLYGON((0 0,100 0,100 100,0 0))')), \
+        feat.GetGeometryRef().ExportToWkt()
 
-    if feat.GetGeometryRef().GetGeometryType() == ogr.wkbPolygon25D:
-        gdaltest.post_reason('not keeping polygon 2D')
-        return 'fail'
+    assert feat.GetGeometryRef().GetGeometryType() != ogr.wkbPolygon25D, \
+        'not keeping polygon 2D'
 
-    if feat.GetField('Layer') != '0':
-        print(feat.GetField('Layer'))
-        gdaltest.post_reason('Did not get expected layer, 0.')
-        return 'fail'
+    assert feat.GetField('Layer') == '0', 'Did not get expected layer, 0.'
 
     lyr = None
     ds = None
@@ -699,18 +612,13 @@ def test_ogr_dxf_15():
 
     abc_off = txt_2.find('abc\n')
 
-    if txt_2[16:abc_off] + '0' + txt_2[abc_off + 3:] != txt_1[16:]:
-        print(txt_2[abc_off] + '0' + txt_2[abc_off + 3:])
-        print(txt_1)
-        gdaltest.post_reason('Layer abc does not seem to match layer 0.')
-        return 'fail'
+    assert txt_2[16:abc_off] + '0' + txt_2[abc_off + 3:] == txt_1[16:], \
+        'Layer abc does not seem to match layer 0.'
 
     # Check that $HANDSEED was set as expected.
     start_seed = outdxf.find('$HANDSEED')
     handseed = outdxf[start_seed + 10 + 4:start_seed + 10 + 4 + 8]
-    if handseed != '00000053':
-        gdaltest.post_reason('Did not get expected HANDSEED, got %s.' % handseed)
-        return 'fail'
+    assert handseed == '00000053', ('Did not get expected HANDSEED, got %s.' % handseed)
 
     os.unlink('tmp/dxf_14.dxf')
 
@@ -726,18 +634,13 @@ def test_ogr_dxf_16():
 
     dxf_ds = ogr.Open('data/assorted.dxf')
 
-    if dxf_ds is None:
-        return 'fail'
+    assert dxf_ds is not None
 
-    if dxf_ds.GetLayerCount() != 2:
-        gdaltest.post_reason('expected exactly two layers!')
-        return 'fail'
+    assert dxf_ds.GetLayerCount() == 2, 'expected exactly two layers!'
 
     dxf_layer = dxf_ds.GetLayer(1)
 
-    if dxf_layer.GetName() != 'entities':
-        gdaltest.post_reason('did not get expected layer name.')
-        return 'fail'
+    assert dxf_layer.GetName() == 'entities', 'did not get expected layer name.'
 
     # read through till we encounter the block reference.
     feat = dxf_layer.GetNextFeature()
@@ -745,21 +648,14 @@ def test_ogr_dxf_16():
         feat = dxf_layer.GetNextFeature()
 
     # check contents.
-    if feat.GetField('BlockName') != 'STAR':
-        gdaltest.post_reason('Did not get blockname!')
-        return 'fail'
+    assert feat.GetField('BlockName') == 'STAR', 'Did not get blockname!'
 
-    if feat.GetField('BlockAngle') != 0.0:
-        gdaltest.post_reason('Did not get expected angle.')
-        return 'fail'
+    assert feat.GetField('BlockAngle') == 0.0, 'Did not get expected angle.'
 
-    if feat.GetField('BlockScale') != [1.0, 1.0, 1.0]:
-        print(feat.GetField('BlockScale'))
-        gdaltest.post_reason('Did not get expected BlockScale')
-        return 'fail'
+    assert feat.GetField('BlockScale') == [1.0, 1.0, 1.0], \
+        'Did not get expected BlockScale'
 
-    if ogrtest.check_feature_geometry(feat, 'POINT (79.097653776656188 119.962195062443342 0)'):
-        return 'fail'
+    assert not ogrtest.check_feature_geometry(feat, 'POINT (79.097653776656188 119.962195062443342 0)')
 
     feat = None
 
@@ -767,46 +663,34 @@ def test_ogr_dxf_16():
 
     dxf_layer = dxf_ds.GetLayer(0)
 
-    if dxf_layer.GetName() != 'blocks':
-        gdaltest.post_reason('did not get expected layer name.')
-        return 'fail'
+    assert dxf_layer.GetName() == 'blocks', 'did not get expected layer name.'
 
     # STAR geometry
     feat = dxf_layer.GetNextFeature()
 
-    if feat.GetField('Block') != 'STAR':
-        gdaltest.post_reason('Did not get expected block name.')
-        return 'fail'
+    assert feat.GetField('Block') == 'STAR', 'Did not get expected block name.'
 
-    if ogrtest.check_feature_geometry(feat, 'MULTILINESTRING ((-0.028147497671066 1.041457413829428 0,0.619244948763444 -1.069604911500494 0),(0.619244948763444 -1.069604911500494 0,-0.957014920816232 0.478507460408116 0),(-0.957014920816232 0.478507460408116 0,1.041457413829428 0.365917469723853 0),(1.041457413829428 0.365917469723853 0,-0.478507460408116 -1.041457413829428 0),(-0.478507460408116 -1.041457413829428 0,-0.056294995342131 1.013309916158363 0))'):
-        return 'fail'
+    assert not ogrtest.check_feature_geometry(feat, 'MULTILINESTRING ((-0.028147497671066 1.041457413829428 0,0.619244948763444 -1.069604911500494 0),(0.619244948763444 -1.069604911500494 0,-0.957014920816232 0.478507460408116 0),(-0.957014920816232 0.478507460408116 0,1.041457413829428 0.365917469723853 0),(1.041457413829428 0.365917469723853 0,-0.478507460408116 -1.041457413829428 0),(-0.478507460408116 -1.041457413829428 0,-0.056294995342131 1.013309916158363 0))')
 
     # First MTEXT
     feat = dxf_layer.GetNextFeature()
-    if feat.GetField('Text') != gdaltest.sample_text:
-        gdaltest.post_reason('Did not get expected first mtext.')
-        return 'fail'
+    assert feat.GetField('Text') == gdaltest.sample_text, \
+        'Did not get expected first mtext.'
 
     expected_style = 'LABEL(f:"Arial",t:"' + gdaltest.sample_style + '",a:45,s:0.5g,p:5,c:#000000)'
-    if feat.GetStyleString() != expected_style:
-        gdaltest.post_reason('Got unexpected style string:\n%s\ninstead of:\n%s.' % (feat.GetStyleString(), expected_style))
-        return 'fail'
+    assert feat.GetStyleString() == expected_style, \
+        ('Got unexpected style string:\n%s\ninstead of:\n%s.' % (feat.GetStyleString(), expected_style))
 
-    if ogrtest.check_feature_geometry(feat, 'POINT (-1.495452348993292 0.813702013422821 0)'):
-        return 'fail'
+    assert not ogrtest.check_feature_geometry(feat, 'POINT (-1.495452348993292 0.813702013422821 0)')
 
     # Second MTEXT
     feat = dxf_layer.GetNextFeature()
-    if feat.GetField('Text') != 'Second':
-        gdaltest.post_reason('Did not get expected second mtext.')
-        return 'fail'
+    assert feat.GetField('Text') == 'Second', 'Did not get expected second mtext.'
 
-    if feat.GetField('SubClasses') != 'AcDbEntity:AcDbMText':
-        gdaltest.post_reason('Did not get expected subclasses.')
-        return 'fail'
+    assert feat.GetField('SubClasses') == 'AcDbEntity:AcDbMText', \
+        'Did not get expected subclasses.'
 
-    if ogrtest.check_feature_geometry(feat, 'POINT (0.879677852348995 -0.263903355704699 0)'):
-        return 'fail'
+    assert not ogrtest.check_feature_geometry(feat, 'POINT (0.879677852348995 -0.263903355704699 0)')
 
     feat = None
 
@@ -902,55 +786,44 @@ def test_ogr_dxf_17():
 
     # Check first feature.
     feat = lyr.GetNextFeature()
-    if feat.GetField('SubClasses') != 'AcDbEntity:AcDbBlockReference':
-        gdaltest.post_reason('Got wrong subclasses for feature 1.')
-        return 'fail'
+    assert feat.GetField('SubClasses') == 'AcDbEntity:AcDbBlockReference', \
+        'Got wrong subclasses for feature 1.'
 
-    if ogrtest.check_feature_geometry(feat, 'MULTILINESTRING ((200 100,201 101),(201 100,200 101))'):
-        print('Feature 1')
-        return 'fail'
+    assert not ogrtest.check_feature_geometry(feat, 'MULTILINESTRING ((200 100,201 101),(201 100,200 101))'), \
+        'Feature 1'
 
     # Check 2nd feature.
     feat = lyr.GetNextFeature()
-    if feat.GetField('SubClasses') != 'AcDbEntity:AcDbPoint':
-        gdaltest.post_reason('Got wrong subclasses for feature 2.')
-        return 'fail'
+    assert feat.GetField('SubClasses') == 'AcDbEntity:AcDbPoint', \
+        'Got wrong subclasses for feature 2.'
 
-    if ogrtest.check_feature_geometry(feat, 'POINT (300 50)'):
-        print('Feature 2')
-        return 'fail'
+    assert not ogrtest.check_feature_geometry(feat, 'POINT (300 50)'), 'Feature 2'
 
     # Check 3rd feature.
     feat = lyr.GetNextFeature()
-    if feat.GetField('SubClasses') != 'AcDbEntity:AcDbBlockReference':
-        gdaltest.post_reason('Got wrong subclasses for feature 3.')
-        return 'fail'
+    assert feat.GetField('SubClasses') == 'AcDbEntity:AcDbBlockReference', \
+        'Got wrong subclasses for feature 3.'
 
-    if ogrtest.check_feature_geometry(feat, 'MULTILINESTRING ((249.971852502328943 201.04145741382942 0,250.619244948763452 198.930395088499495 0),(250.619244948763452 198.930395088499495 0,249.042985079183779 200.47850746040811 0),(249.042985079183779 200.47850746040811 0,251.04145741382942 200.365917469723854 0),(251.04145741382942 200.365917469723854 0,249.52149253959189 198.95854258617058 0),(249.52149253959189 198.95854258617058 0,249.943705004657858 201.013309916158363 0))'):
-        print('Feature 3')
-        return 'fail'
+    assert not ogrtest.check_feature_geometry(feat, 'MULTILINESTRING ((249.971852502328943 201.04145741382942 0,250.619244948763452 198.930395088499495 0),(250.619244948763452 198.930395088499495 0,249.042985079183779 200.47850746040811 0),(249.042985079183779 200.47850746040811 0,251.04145741382942 200.365917469723854 0),(251.04145741382942 200.365917469723854 0,249.52149253959189 198.95854258617058 0),(249.52149253959189 198.95854258617058 0,249.943705004657858 201.013309916158363 0))'), \
+        'Feature 3'
 
     # Check 4th feature (scaled and rotated)
     feat = lyr.GetNextFeature()
-    if feat.GetField('SubClasses') != 'AcDbEntity:AcDbBlockReference':
-        gdaltest.post_reason('Got wrong subclasses for feature 4.')
-        return 'fail'
+    assert feat.GetField('SubClasses') == 'AcDbEntity:AcDbBlockReference', \
+        'Got wrong subclasses for feature 4.'
 
-    if ogrtest.check_feature_geometry(feat, 'MULTILINESTRING ((300 100,300.964101615137736 106.330127018922198), (303.464101615137736 102.0,297.5 104.330127018922198))'):
-        print('Feature 4')
-        return 'fail'
+    assert not ogrtest.check_feature_geometry(feat, 'MULTILINESTRING ((300 100,300.964101615137736 106.330127018922198), (303.464101615137736 102.0,297.5 104.330127018922198))'), \
+        'Feature 4'
 
     # Check 5th feature
     feat = lyr.GetNextFeature()
-    if ogrtest.check_feature_geometry(feat, 'MULTIPOLYGON (((360 110,360 120,370 120,370 110,360 110)),((360 90,360 80,370 80,370 90,360 90)))'):
-        print('Feature 5')
-        return 'fail'
+    assert not ogrtest.check_feature_geometry(feat, 'MULTIPOLYGON (((360 110,360 120,370 120,370 110,360 110)),((360 90,360 80,370 80,370 90,360 90)))'), \
+        'Feature 5'
 
     # Check 6th feature
     feat = lyr.GetNextFeature()
-    if ogrtest.check_feature_geometry(feat, 'GEOMETRYCOLLECTION (POINT (401 102),LINESTRING (400 100,401 101))'):
-        print('Feature 5')
-        return 'fail'
+    assert not ogrtest.check_feature_geometry(feat, 'GEOMETRYCOLLECTION (POINT (401 102),LINESTRING (400 100,401 101))'), \
+        'Feature 5'
 
     # Cleanup
 
@@ -1015,68 +888,45 @@ def test_ogr_dxf_18():
 
     # Check first feature.
     feat = lyr.GetNextFeature()
-    if feat.GetField('Linetype') != 'DASHED':
-        gdaltest.post_reason('Got wrong linetype. (1)')
-        return 'fail'
+    assert feat.GetField('Linetype') == 'DASHED', 'Got wrong linetype. (1)'
 
-    if feat.GetStyleString() != 'PEN(c:#ffff00,w:2g,p:"12.7g 6.1234567892g")':
-        print(feat.GetStyleString())
-        gdaltest.post_reason("got wrong style string (1)")
-        return 'fail'
+    assert feat.GetStyleString() == 'PEN(c:#ffff00,w:2g,p:"12.7g 6.1234567892g")', \
+        "got wrong style string (1)"
 
-    if ogrtest.check_feature_geometry(feat, 'LINESTRING (0 0,25 25)'):
-        return 'fail'
+    assert not ogrtest.check_feature_geometry(feat, 'LINESTRING (0 0,25 25)')
 
     # Check second feature.
     feat = lyr.GetNextFeature()
-    if feat.GetField('Linetype') != 'DOTTED':
-        gdaltest.post_reason('Got wrong linetype. (2)')
-        return 'fail'
+    assert feat.GetField('Linetype') == 'DOTTED', 'Got wrong linetype. (2)'
 
-    if feat.GetStyleString() != 'PEN(c:#ffff00,w:2g,p:"0g 4g")':
-        print(feat.GetStyleString())
-        gdaltest.post_reason("got wrong style string (2)")
-        return 'fail'
+    assert feat.GetStyleString() == 'PEN(c:#ffff00,w:2g,p:"0g 4g")', \
+        "got wrong style string (2)"
 
-    if ogrtest.check_feature_geometry(feat, 'LINESTRING (5 5,30 30)'):
-        return 'fail'
+    assert not ogrtest.check_feature_geometry(feat, 'LINESTRING (5 5,30 30)')
 
     # Check third feature.
     feat = lyr.GetNextFeature()
-    if feat.GetField('Linetype') != 'AutoLineType-1':
-        gdaltest.post_reason('Got wrong linetype. (3)')
-        return 'fail'
+    assert feat.GetField('Linetype') == 'AutoLineType-1', 'Got wrong linetype. (3)'
 
-    if feat.GetStyleString() != 'PEN(c:#ffff00,w:2g,p:"3g 4g")':
-        print(feat.GetStyleString())
-        gdaltest.post_reason("got wrong style string (3)")
-        return 'fail'
+    assert feat.GetStyleString() == 'PEN(c:#ffff00,w:2g,p:"3g 4g")', \
+        "got wrong style string (3)"
 
-    if ogrtest.check_feature_geometry(feat, 'LINESTRING (5 5,40 30)'):
-        return 'fail'
+    assert not ogrtest.check_feature_geometry(feat, 'LINESTRING (5 5,40 30)')
 
     # Check fourth feature.
     feat = lyr.GetNextFeature()
-    if feat.GetField('Linetype') != 'DASHED':
-        gdaltest.post_reason('Got wrong linetype. (4)')
-        return 'fail'
+    assert feat.GetField('Linetype') == 'DASHED', 'Got wrong linetype. (4)'
 
     # TODO why did the lineweight go AWOL here?
-    if feat.GetStyleString() != 'PEN(c:#ffff00,p:"6.35g 3.0617283946g")':
-        print(feat.GetStyleString())
-        gdaltest.post_reason("got wrong style string (4)")
-        return 'fail'
+    assert feat.GetStyleString() == 'PEN(c:#ffff00,p:"6.35g 3.0617283946g")', \
+        "got wrong style string (4)"
 
     # Check fifth feature.
     feat = lyr.GetNextFeature()
-    if feat.GetField('Linetype') != 'AutoLineType-1':
-        gdaltest.post_reason('Got wrong linetype. (5)')
-        return 'fail'
+    assert feat.GetField('Linetype') == 'AutoLineType-1', 'Got wrong linetype. (5)'
 
-    if feat.GetStyleString() != 'PEN(c:#ffff00,w:0.01g,p:"6g 8g")':
-        print(feat.GetStyleString())
-        gdaltest.post_reason("got wrong style string (5)")
-        return 'fail'
+    assert feat.GetStyleString() == 'PEN(c:#ffff00,w:0.01g,p:"6g 8g")', \
+        "got wrong style string (5)"
 
     # Cleanup
 
@@ -1116,12 +966,10 @@ def test_ogr_dxf_19():
 
     # Check first feature.
     feat = lyr.GetNextFeature()
-    if feat.GetField('SubClasses') != 'AcDbEntity:AcDbBlockReference':
-        gdaltest.post_reason('Got wrong subclasses for feature 1.')
-        return 'fail'
+    assert feat.GetField('SubClasses') == 'AcDbEntity:AcDbBlockReference', \
+        'Got wrong subclasses for feature 1.'
 
-    if ogrtest.check_feature_geometry(feat, 'MULTILINESTRING ((249.971852502328943 201.04145741382942 0,250.619244948763452 198.930395088499495 0),(250.619244948763452 198.930395088499495 0,249.042985079183779 200.47850746040811 0),(249.042985079183779 200.47850746040811 0,251.04145741382942 200.365917469723854 0),(251.04145741382942 200.365917469723854 0,249.52149253959189 198.95854258617058 0),(249.52149253959189 198.95854258617058 0,249.943705004657858 201.013309916158363 0))'):
-        return 'fail'
+    assert not ogrtest.check_feature_geometry(feat, 'MULTILINESTRING ((249.971852502328943 201.04145741382942 0,250.619244948763452 198.930395088499495 0),(250.619244948763452 198.930395088499495 0,249.042985079183779 200.47850746040811 0),(249.042985079183779 200.47850746040811 0,251.04145741382942 200.365917469723854 0),(251.04145741382942 200.365917469723854 0,249.52149253959189 198.95854258617058 0),(249.52149253959189 198.95854258617058 0,249.943705004657858 201.013309916158363 0))')
 
     # Cleanup
 
@@ -1143,8 +991,7 @@ def test_ogr_dxf_20():
 
     feat = lyr.GetNextFeature()
 
-    if ogrtest.check_feature_geometry(feat, 'LINESTRING (10.75 62.75,20.637752769146068 63.434832501489716,29.283239084385464 63.396838394381845,36.766943814562865 62.711565975596599,43.169351828522906 61.454563542054103,48.570947995110252 59.70137939067456,53.05221718316956 57.527561818378146,56.693644261545501 55.008659122085049,59.575714099082703 52.220219598715438,61.778911564625851 49.237791545189509,63.383721527019588 46.136923258427423,64.470628855108572 42.993163035349369,65.120118417737459 39.882059172875508,65.412419131869868 36.878358785215056,65.417809785093752 34.025663008687722,65.193643595004147 31.327113252708507,64.796409941597645 28.783146935042897,64.282598204870823 26.394201473456341,63.708697764820236 24.16071428571431,63.131198001442392 22.083122789582241,62.606588294733939 20.161864402825621,62.191358024691354 18.397376543209894,61.941996571311265 16.790096628500525,61.914993314590184 15.340462076462975,62.166837634524704 14.0489103048627,62.754018911111373 12.915878731465167,63.723652286703427 11.940700981548817,65.053571428571416 11.114552964042769,66.690557841792398 10.424954275262921,68.581246558980226 9.859407264767562,70.672272612748785 9.405414282114966,72.910271035711943 9.050477676863418,75.241876860483572 8.782099798571203,77.613725119677511 8.587782996796603,79.97245084590763 8.4550296210979,82.264689071787842 8.371342021033378,84.437074829931987 8.324222546161321,86.436243152953921 8.301173546040012,88.208926721776336 8.289771106365336,89.722559658784164 8.293223374005688,90.990763736417563 8.349615688917151,92.033410218878885 8.501752503862612,92.870370370370395 8.792438271604945,93.521515455094473 9.264477444907039,94.006716737253413 9.960674476531764,94.345845481049565 10.923833819242011,94.558772950685281 12.196759925800654,94.665370410362868 13.82225724897058,94.685509124284636 15.843130241514663,94.639060356652948 18.302183356195791,94.545895371670113 21.242221045776841,94.421471763308503 24.702030018356666,94.215205541358216 28.660279617432039,93.825673773330607 33.049360720184715,93.15014577259474 37.800473760933045,92.085890852519697 42.844819173995376,90.530178326474584 48.113597393690064,88.380277507828495 53.538008854335445,85.533457709950525 59.049253990249873,81.886988246209697 64.578533235751706,77.338138429975174 70.057047025159264,71.784177574615995 75.415995792790937,65.122374993501282 80.586579972965055,57.25 85.5)'):
-        return 'fail'
+    assert not ogrtest.check_feature_geometry(feat, 'LINESTRING (10.75 62.75,20.637752769146068 63.434832501489716,29.283239084385464 63.396838394381845,36.766943814562865 62.711565975596599,43.169351828522906 61.454563542054103,48.570947995110252 59.70137939067456,53.05221718316956 57.527561818378146,56.693644261545501 55.008659122085049,59.575714099082703 52.220219598715438,61.778911564625851 49.237791545189509,63.383721527019588 46.136923258427423,64.470628855108572 42.993163035349369,65.120118417737459 39.882059172875508,65.412419131869868 36.878358785215056,65.417809785093752 34.025663008687722,65.193643595004147 31.327113252708507,64.796409941597645 28.783146935042897,64.282598204870823 26.394201473456341,63.708697764820236 24.16071428571431,63.131198001442392 22.083122789582241,62.606588294733939 20.161864402825621,62.191358024691354 18.397376543209894,61.941996571311265 16.790096628500525,61.914993314590184 15.340462076462975,62.166837634524704 14.0489103048627,62.754018911111373 12.915878731465167,63.723652286703427 11.940700981548817,65.053571428571416 11.114552964042769,66.690557841792398 10.424954275262921,68.581246558980226 9.859407264767562,70.672272612748785 9.405414282114966,72.910271035711943 9.050477676863418,75.241876860483572 8.782099798571203,77.613725119677511 8.587782996796603,79.97245084590763 8.4550296210979,82.264689071787842 8.371342021033378,84.437074829931987 8.324222546161321,86.436243152953921 8.301173546040012,88.208926721776336 8.289771106365336,89.722559658784164 8.293223374005688,90.990763736417563 8.349615688917151,92.033410218878885 8.501752503862612,92.870370370370395 8.792438271604945,93.521515455094473 9.264477444907039,94.006716737253413 9.960674476531764,94.345845481049565 10.923833819242011,94.558772950685281 12.196759925800654,94.665370410362868 13.82225724897058,94.685509124284636 15.843130241514663,94.639060356652948 18.302183356195791,94.545895371670113 21.242221045776841,94.421471763308503 24.702030018356666,94.215205541358216 28.660279617432039,93.825673773330607 33.049360720184715,93.15014577259474 37.800473760933045,92.085890852519697 42.844819173995376,90.530178326474584 48.113597393690064,88.380277507828495 53.538008854335445,85.533457709950525 59.049253990249873,81.886988246209697 64.578533235751706,77.338138429975174 70.057047025159264,71.784177574615995 75.415995792790937,65.122374993501282 80.586579972965055,57.25 85.5)')
     ds = None
 
     return 'success'
@@ -1160,8 +1007,7 @@ def test_ogr_dxf_21():
 
     feat = lyr.GetNextFeature()
 
-    if ogrtest.check_feature_geometry(feat, 'LINESTRING (5 2 3,4.990256201039297 1.720974105023499 3,4.961072274966281 1.443307596159738 3,4.912590402935223 1.168353236728963 3,4.845046783753276 0.897450576732003 3,4.758770483143634 0.631919426697325 3,4.654181830570403 0.373053427696799 3,4.531790371435708 0.122113748856437 3,4.392192384625703 -0.11967705693282 3,4.23606797749979 -0.351141009169893 3,4.064177772475912 -0.571150438746157 3,3.877359201354605 -0.778633481835989 3,3.676522425435433 -0.972579301909577 3,3.462645901302633 -1.152043014426888 3,3.236771613882987 -1.316150290220167 3,3.0 -1.464101615137754 3,2.75348458715631 -1.595176185196668 3,2.498426373663648 -1.70873541826715 3,2.23606797749979 -1.804226065180614 3,1.967687582398672 -1.881182905103986 3,1.694592710667722 -1.939231012048832 3,1.418113853070614 -1.978087581473093 3,1.139597986810004 -1.997563308076383 3,0.860402013189997 -1.997563308076383 3,0.581886146929387 -1.978087581473094 3,0.305407289332279 -1.939231012048832 3,0.032312417601329 -1.881182905103986 3,-0.236067977499789 -1.804226065180615 3,-0.498426373663648 -1.70873541826715 3,-0.75348458715631 -1.595176185196668 3,-1.0 -1.464101615137755 3,-1.236771613882987 -1.316150290220167 3,-1.462645901302633 -1.152043014426888 3,-1.676522425435433 -0.972579301909577 3,-1.877359201354605 -0.778633481835989 3,-2.064177772475912 -0.571150438746158 3,-2.236067977499789 -0.351141009169893 3,-2.392192384625704 -0.11967705693282 3,-2.531790371435707 0.122113748856436 3,-2.654181830570403 0.373053427696798 3,-2.758770483143633 0.631919426697324 3,-2.845046783753275 0.897450576732001 3,-2.912590402935223 1.168353236728963 3,-2.961072274966281 1.443307596159737 3,-2.990256201039297 1.720974105023498 3,-3.0 2.0 3,-2.990256201039297 2.279025894976499 3,-2.961072274966281 2.556692403840262 3,-2.912590402935223 2.831646763271036 3,-2.845046783753276 3.102549423267996 3,-2.758770483143634 3.368080573302675 3,-2.654181830570404 3.626946572303199 3,-2.531790371435708 3.877886251143563 3,-2.392192384625704 4.119677056932819 3,-2.23606797749979 4.351141009169892 3,-2.064177772475912 4.571150438746157 3,-1.877359201354604 4.778633481835989 3,-1.676522425435434 4.972579301909576 3,-1.462645901302632 5.152043014426889 3,-1.236771613882989 5.316150290220166 3,-1.0 5.464101615137753 3,-0.753484587156311 5.595176185196667 3,-0.498426373663649 5.70873541826715 3,-0.23606797749979 5.804226065180615 3,0.032312417601329 5.881182905103985 3,0.305407289332279 5.939231012048833 3,0.581886146929387 5.978087581473094 3,0.860402013189993 5.997563308076383 3,1.139597986810005 5.997563308076383 3,1.418113853070612 5.978087581473094 3,1.69459271066772 5.939231012048833 3,1.96768758239867 5.881182905103986 3,2.236067977499789 5.804226065180615 3,2.498426373663648 5.70873541826715 3,2.75348458715631 5.595176185196668 3,3.0 5.464101615137754 3,3.236771613882985 5.316150290220168 3,3.462645901302634 5.152043014426887 3,3.676522425435431 4.972579301909578 3,3.877359201354603 4.778633481835991 3,4.064177772475912 4.571150438746159 3,4.23606797749979 4.351141009169893 3,4.392192384625702 4.119677056932823 3,4.531790371435708 3.877886251143563 3,4.654181830570404 3.626946572303201 3,4.758770483143634 3.368080573302675 3,4.845046783753275 3.102549423267999 3,4.912590402935223 2.831646763271039 3,4.961072274966281 2.556692403840263 3,4.990256201039298 2.279025894976499 3,5.0 2.0 3)'):
-        return 'fail'
+    assert not ogrtest.check_feature_geometry(feat, 'LINESTRING (5 2 3,4.990256201039297 1.720974105023499 3,4.961072274966281 1.443307596159738 3,4.912590402935223 1.168353236728963 3,4.845046783753276 0.897450576732003 3,4.758770483143634 0.631919426697325 3,4.654181830570403 0.373053427696799 3,4.531790371435708 0.122113748856437 3,4.392192384625703 -0.11967705693282 3,4.23606797749979 -0.351141009169893 3,4.064177772475912 -0.571150438746157 3,3.877359201354605 -0.778633481835989 3,3.676522425435433 -0.972579301909577 3,3.462645901302633 -1.152043014426888 3,3.236771613882987 -1.316150290220167 3,3.0 -1.464101615137754 3,2.75348458715631 -1.595176185196668 3,2.498426373663648 -1.70873541826715 3,2.23606797749979 -1.804226065180614 3,1.967687582398672 -1.881182905103986 3,1.694592710667722 -1.939231012048832 3,1.418113853070614 -1.978087581473093 3,1.139597986810004 -1.997563308076383 3,0.860402013189997 -1.997563308076383 3,0.581886146929387 -1.978087581473094 3,0.305407289332279 -1.939231012048832 3,0.032312417601329 -1.881182905103986 3,-0.236067977499789 -1.804226065180615 3,-0.498426373663648 -1.70873541826715 3,-0.75348458715631 -1.595176185196668 3,-1.0 -1.464101615137755 3,-1.236771613882987 -1.316150290220167 3,-1.462645901302633 -1.152043014426888 3,-1.676522425435433 -0.972579301909577 3,-1.877359201354605 -0.778633481835989 3,-2.064177772475912 -0.571150438746158 3,-2.236067977499789 -0.351141009169893 3,-2.392192384625704 -0.11967705693282 3,-2.531790371435707 0.122113748856436 3,-2.654181830570403 0.373053427696798 3,-2.758770483143633 0.631919426697324 3,-2.845046783753275 0.897450576732001 3,-2.912590402935223 1.168353236728963 3,-2.961072274966281 1.443307596159737 3,-2.990256201039297 1.720974105023498 3,-3.0 2.0 3,-2.990256201039297 2.279025894976499 3,-2.961072274966281 2.556692403840262 3,-2.912590402935223 2.831646763271036 3,-2.845046783753276 3.102549423267996 3,-2.758770483143634 3.368080573302675 3,-2.654181830570404 3.626946572303199 3,-2.531790371435708 3.877886251143563 3,-2.392192384625704 4.119677056932819 3,-2.23606797749979 4.351141009169892 3,-2.064177772475912 4.571150438746157 3,-1.877359201354604 4.778633481835989 3,-1.676522425435434 4.972579301909576 3,-1.462645901302632 5.152043014426889 3,-1.236771613882989 5.316150290220166 3,-1.0 5.464101615137753 3,-0.753484587156311 5.595176185196667 3,-0.498426373663649 5.70873541826715 3,-0.23606797749979 5.804226065180615 3,0.032312417601329 5.881182905103985 3,0.305407289332279 5.939231012048833 3,0.581886146929387 5.978087581473094 3,0.860402013189993 5.997563308076383 3,1.139597986810005 5.997563308076383 3,1.418113853070612 5.978087581473094 3,1.69459271066772 5.939231012048833 3,1.96768758239867 5.881182905103986 3,2.236067977499789 5.804226065180615 3,2.498426373663648 5.70873541826715 3,2.75348458715631 5.595176185196668 3,3.0 5.464101615137754 3,3.236771613882985 5.316150290220168 3,3.462645901302634 5.152043014426887 3,3.676522425435431 4.972579301909578 3,3.877359201354603 4.778633481835991 3,4.064177772475912 4.571150438746159 3,4.23606797749979 4.351141009169893 3,4.392192384625702 4.119677056932823 3,4.531790371435708 3.877886251143563 3,4.654181830570404 3.626946572303201 3,4.758770483143634 3.368080573302675 3,4.845046783753275 3.102549423267999 3,4.912590402935223 2.831646763271039 3,4.961072274966281 2.556692403840263 3,4.990256201039298 2.279025894976499 3,5.0 2.0 3)')
     ds = None
 
     return 'success'
@@ -1277,13 +1123,8 @@ def test_ogr_dxf_23():
 
     feat = lyr.GetNextFeature()
     style = feat.GetStyleString()
-    if style != 'BRUSH(fc:#ff0000)':
-        gdaltest.post_reason('bad style')
-        print(style)
-        return 'fail'
-    if ogrtest.check_feature_geometry(feat, wkt):
-        gdaltest.post_reason('bad geometry')
-        return 'fail'
+    assert style == 'BRUSH(fc:#ff0000)', 'bad style'
+    assert not ogrtest.check_feature_geometry(feat, wkt), 'bad geometry'
 
     ds = None
 
@@ -1303,18 +1144,15 @@ def test_ogr_dxf_24():
     gdal.SetConfigOption('OGR_ARC_STEPSIZE', '45')
     feat = lyr.GetNextFeature()
     gdal.SetConfigOption('OGR_ARC_STEPSIZE', None)
-    if ogrtest.check_feature_geometry(feat, 'POLYGON ((2 1,1.646446609406726 0.853553390593274,1.5 0.5,1.646446609406726 0.146446609406726,2 0,2.0 0.0,2.146446609406726 -0.353553390593274,2.5 -0.5,2.853553390593274 -0.353553390593274,3.0 -0.0,3 0,3.353553390593274 0.146446609406726,3.5 0.5,3.353553390593274 0.853553390593273,3 1,2.853553390593274 1.353553390593274,2.5 1.5,2.146446609406726 1.353553390593274,2 1))'):
-        return 'fail'
+    assert not ogrtest.check_feature_geometry(feat, 'POLYGON ((2 1,1.646446609406726 0.853553390593274,1.5 0.5,1.646446609406726 0.146446609406726,2 0,2.0 0.0,2.146446609406726 -0.353553390593274,2.5 -0.5,2.853553390593274 -0.353553390593274,3.0 -0.0,3 0,3.353553390593274 0.146446609406726,3.5 0.5,3.353553390593274 0.853553390593273,3 1,2.853553390593274 1.353553390593274,2.5 1.5,2.146446609406726 1.353553390593274,2 1))')
 
     gdal.SetConfigOption('OGR_ARC_STEPSIZE', '45')
     feat = lyr.GetNextFeature()
     gdal.SetConfigOption('OGR_ARC_STEPSIZE', None)
-    if ogrtest.check_feature_geometry(feat, 'POLYGON ((0.0 0.0 0,-0.353553390593274 0.146446609406726 0,-0.5 0.5 0,-0.353553390593274 0.853553390593274 0,-0.0 1.0 0,0.0 1.0 0,0.146446609406726 1.353553390593274 0,0.5 1.5 0,0.853553390593274 1.353553390593274 0,1.0 1.0 0,1.0 1.0 0,1.353553390593274 0.853553390593274 0,1.5 0.5 0,1.353553390593274 0.146446609406727 0,1.0 0.0 0,1 0 0,0.853553390593274 -0.353553390593274 0,0.5 -0.5 0,0.146446609406726 -0.353553390593274 0,0.0 -0.0 0,0.0 0.0 0))'):
-        return 'fail'
+    assert not ogrtest.check_feature_geometry(feat, 'POLYGON ((0.0 0.0 0,-0.353553390593274 0.146446609406726 0,-0.5 0.5 0,-0.353553390593274 0.853553390593274 0,-0.0 1.0 0,0.0 1.0 0,0.146446609406726 1.353553390593274 0,0.5 1.5 0,0.853553390593274 1.353553390593274 0,1.0 1.0 0,1.0 1.0 0,1.353553390593274 0.853553390593274 0,1.5 0.5 0,1.353553390593274 0.146446609406727 0,1.0 0.0 0,1 0 0,0.853553390593274 -0.353553390593274 0,0.5 -0.5 0,0.146446609406726 -0.353553390593274 0,0.0 -0.0 0,0.0 0.0 0))')
 
     feat = lyr.GetNextFeature()
-    if ogrtest.check_feature_geometry(feat, 'POLYGON ((-1 -1,-1 0,0 0,-1 -1))'):
-        return 'fail'
+    assert not ogrtest.check_feature_geometry(feat, 'POLYGON ((-1 -1,-1 0,0 0,-1 -1))')
     ds = None
 
     return 'success'
@@ -1369,8 +1207,7 @@ def test_ogr_dxf_27():
     gdal.FileFromMemBuffer('/vsimem/a_dxf_without_extension', open('data/solid.dxf').read())
 
     ds = ogr.Open('/vsimem/a_dxf_without_extension')
-    if ds is None:
-        return 'fail'
+    assert ds is not None
 
     gdal.Unlink('/vsimem/a_dxf_without_extension')
 
@@ -2482,13 +2319,11 @@ def test_ogr_dxf_33():
 
     # Polyface mesh (POLYLINE)
     feat = layer.GetNextFeature()
-    if feat.Layer != '0':
-        return 'fail'
+    assert feat.Layer == '0'
 
     geom = feat.GetGeometryRef()
-    if geom.GetGeometryType() != ogr.wkbPolyhedralSurfaceZ:
-        gdaltest.post_reason('did not get expected geometry type; got %s instead of wkbPolyhedralSurface' % geom.GetGeometryType())
-        return 'fail'
+    assert geom.GetGeometryType() == ogr.wkbPolyhedralSurfaceZ, \
+        ('did not get expected geometry type; got %s instead of wkbPolyhedralSurface' % geom.GetGeometryType())
 
     wkt_string = geom.ExportToIsoWkt()
     wkt_string_expected = 'POLYHEDRALSURFACE Z (((0 0 0,1 0 0,1 1 0,0 1 0,0 0 0)),((0 0 0,1 0 0,1 0 1,0 0 1,0 0 0)),((1 0 0,1 1 0,1 1 1,1 0 1,1 0 0)),((1 1 0,1 1 1,0 1 1,0 1 0,1 1 0)),((0 0 0,0 1 0,0 1 1,0 0 1,0 0 0)),((0 0 1,1 0 1,1 1 1,0 1 1,0 0 1)))'
@@ -2498,22 +2333,20 @@ def test_ogr_dxf_33():
         return 'fail'
 
     faces = geom.GetGeometryCount()
-    if faces != 6:
-        gdaltest.post_reason('did not get expected number of faces, got %d instead of %d' % (faces, 6))
-        return 'fail'
+    assert faces == 6, \
+        ('did not get expected number of faces, got %d instead of %d' % (faces, 6))
 
     # Cylinder (CIRCLE with thickness)
     feat = layer.GetNextFeature()
-    if ogrtest.check_feature_geometry(feat, 'POLYHEDRALSURFACE Z (((2.8 -0.0 1e-31,2.79902562010393 -0.0 -0.0279025894976501,2.79610722749663 -0.0 -0.0556692403840262,2.79125904029352 -0.0 -0.0831646763271037,2.78450467837533 -0.0 -0.1102549423268,2.77587704831436 -0.0 -0.136808057330267,2.76541818305704 -0.0 -0.16269465723032,2.75317903714357 -0.0 -0.187788625114356,2.73921923846257 -0.0 -0.211967705693282,2.72360679774998 0.0 -0.235114100916989,2.70641777724759 0.0 -0.257115043874616,2.68773592013546 0.0 -0.277863348183599,2.66765224254354 0.0 -0.297257930190958,2.64626459013026 0.0 -0.315204301442689,2.6236771613883 0.0 -0.331615029022017,2.6 0.0 -0.346410161513775,2.57534845871563 0.0 -0.359517618519667,2.54984263736636 0.0 -0.370873541826715,2.52360679774998 0.0 -0.380422606518061,2.49676875823987 0.0 -0.388118290510399,2.46945927106677 0.0 -0.393923101204883,2.44181138530706 0.0 -0.397808758147309,2.413959798681 0.0 -0.399756330807638,2.386040201319 0.0 -0.399756330807638,2.35818861469294 0.0 -0.397808758147309,2.33054072893323 0.0 -0.393923101204883,2.30323124176013 0.0 -0.388118290510399,2.27639320225002 0.0 -0.380422606518061,2.25015736263363 0.0 -0.370873541826715,2.22465154128437 0.0 -0.359517618519667,2.2 0.0 -0.346410161513776,2.1763228386117 0.0 -0.331615029022017,2.15373540986974 0.0 -0.315204301442689,2.13234775745646 0.0 -0.297257930190958,2.11226407986454 0.0 -0.277863348183599,2.09358222275241 0.0 -0.257115043874616,2.07639320225002 0.0 -0.235114100916989,2.06078076153743 0.0 -0.211967705693282,2.04682096285643 0.0 -0.187788625114356,2.03458181694296 0.0 -0.16269465723032,2.02412295168564 0.0 -0.136808057330268,2.01549532162467 0.0 -0.1102549423268,2.00874095970648 0.0 -0.0831646763271037,2.00389277250337 0.0 -0.0556692403840263,2.00097437989607 0.0 -0.0279025894976502,' +
+    assert (not ogrtest.check_feature_geometry(feat, 'POLYHEDRALSURFACE Z (((2.8 -0.0 1e-31,2.79902562010393 -0.0 -0.0279025894976501,2.79610722749663 -0.0 -0.0556692403840262,2.79125904029352 -0.0 -0.0831646763271037,2.78450467837533 -0.0 -0.1102549423268,2.77587704831436 -0.0 -0.136808057330267,2.76541818305704 -0.0 -0.16269465723032,2.75317903714357 -0.0 -0.187788625114356,2.73921923846257 -0.0 -0.211967705693282,2.72360679774998 0.0 -0.235114100916989,2.70641777724759 0.0 -0.257115043874616,2.68773592013546 0.0 -0.277863348183599,2.66765224254354 0.0 -0.297257930190958,2.64626459013026 0.0 -0.315204301442689,2.6236771613883 0.0 -0.331615029022017,2.6 0.0 -0.346410161513775,2.57534845871563 0.0 -0.359517618519667,2.54984263736636 0.0 -0.370873541826715,2.52360679774998 0.0 -0.380422606518061,2.49676875823987 0.0 -0.388118290510399,2.46945927106677 0.0 -0.393923101204883,2.44181138530706 0.0 -0.397808758147309,2.413959798681 0.0 -0.399756330807638,2.386040201319 0.0 -0.399756330807638,2.35818861469294 0.0 -0.397808758147309,2.33054072893323 0.0 -0.393923101204883,2.30323124176013 0.0 -0.388118290510399,2.27639320225002 0.0 -0.380422606518061,2.25015736263363 0.0 -0.370873541826715,2.22465154128437 0.0 -0.359517618519667,2.2 0.0 -0.346410161513776,2.1763228386117 0.0 -0.331615029022017,2.15373540986974 0.0 -0.315204301442689,2.13234775745646 0.0 -0.297257930190958,2.11226407986454 0.0 -0.277863348183599,2.09358222275241 0.0 -0.257115043874616,2.07639320225002 0.0 -0.235114100916989,2.06078076153743 0.0 -0.211967705693282,2.04682096285643 0.0 -0.187788625114356,2.03458181694296 0.0 -0.16269465723032,2.02412295168564 0.0 -0.136808057330268,2.01549532162467 0.0 -0.1102549423268,2.00874095970648 0.0 -0.0831646763271037,2.00389277250337 0.0 -0.0556692403840263,2.00097437989607 0.0 -0.0279025894976502,' +
                                       '2.0 0.0 -4.8985871965894e-17,2.00097437989607 0.0 0.0279025894976499,2.00389277250337 0.0 0.0556692403840262,2.00874095970648 0.0 0.0831646763271036,2.01549532162467 0.0 0.1102549423268,2.02412295168564 0.0 0.136808057330267,2.03458181694296 0.0 0.16269465723032,2.04682096285643 0.0 0.187788625114356,2.06078076153743 0.0 0.211967705693282,2.07639320225002 0.0 0.235114100916989,2.09358222275241 0.0 0.257115043874616,2.11226407986454 0.0 0.277863348183599,2.13234775745646 0.0 0.297257930190958,2.15373540986974 0.0 0.315204301442689,2.1763228386117 -0.0 0.331615029022017,2.2 -0.0 0.346410161513775,2.22465154128437 -0.0 0.359517618519667,2.25015736263363 -0.0 0.370873541826715,2.27639320225002 -0.0 0.380422606518061,2.30323124176013 -0.0 0.388118290510399,2.33054072893323 -0.0 0.393923101204883,2.35818861469294 -0.0 0.397808758147309,2.386040201319 -0.0 0.399756330807638,2.413959798681 -0.0 0.399756330807638,2.44181138530706 -0.0 0.397808758147309,2.46945927106677 -0.0 0.393923101204883,2.49676875823987 -0.0 0.388118290510399,2.52360679774998 -0.0 0.380422606518061,2.54984263736636 -0.0 0.370873541826715,2.57534845871563 -0.0 0.359517618519667,2.6 -0.0 0.346410161513775,2.6236771613883 -0.0 0.331615029022017,2.64626459013026 -0.0 0.315204301442689,2.66765224254354 -0.0 0.297257930190958,2.68773592013546 -0.0 0.277863348183599,2.70641777724759 -0.0 0.257115043874616,2.72360679774998 -0.0 0.235114100916989,2.73921923846257 -0.0 0.211967705693282,2.75317903714357 -0.0 0.187788625114356,2.76541818305704 -0.0 0.16269465723032,2.77587704831436 -0.0 0.136808057330267,2.78450467837533 -0.0 0.1102549423268,2.79125904029352 -0.0 0.0831646763271039,2.79610722749663 -0.0 0.0556692403840264,2.79902562010393 -0.0 0.0279025894976499,2.8 -0.0 1e-31)),' +
                                       '((2.8 1.8 3.6e-16,2.79902562010393 1.8 -0.0279025894976498,2.79610722749663 1.8 -0.0556692403840258,2.79125904029352 1.8 -0.0831646763271034,2.78450467837533 1.8 -0.110254942326799,2.77587704831436 1.8 -0.136808057330267,2.76541818305704 1.8 -0.16269465723032,2.75317903714357 1.8 -0.187788625114356,2.73921923846257 1.8 -0.211967705693282,2.72360679774998 1.8 -0.235114100916989,2.70641777724759 1.8 -0.257115043874615,2.68773592013546 1.8 -0.277863348183599,2.66765224254354 1.8 -0.297257930190957,2.64626459013026 1.8 -0.315204301442689,2.6236771613883 1.8 -0.331615029022016,2.6 1.8 -0.346410161513775,2.57534845871563 1.8 -0.359517618519667,2.54984263736636 1.8 -0.370873541826715,2.52360679774998 1.8 -0.380422606518061,2.49676875823987 1.8 -0.388118290510398,2.46945927106677 1.8 -0.393923101204883,2.44181138530706 1.8 -0.397808758147309,2.413959798681 1.8 -0.399756330807638,2.386040201319 1.8 -0.399756330807638,2.35818861469294 1.8 -0.397808758147309,2.33054072893323 1.8 -0.393923101204883,2.30323124176013 1.8 -0.388118290510398,2.27639320225002 1.8 -0.380422606518061,2.25015736263363 1.8 -0.370873541826715,2.22465154128437 1.8 -0.359517618519666,2.2 1.8 -0.346410161513775,2.1763228386117 1.8 -0.331615029022016,2.15373540986974 1.8 -0.315204301442689,2.13234775745646 1.8 -0.297257930190957,2.11226407986454 1.8 -0.277863348183599,2.09358222275241 1.8 -0.257115043874615,2.07639320225002 1.8 -0.235114100916989,2.06078076153743 1.8 -0.211967705693282,2.04682096285643 1.8 -0.187788625114356,2.03458181694296 1.8 -0.16269465723032,2.02412295168564 1.8 -0.136808057330267,2.01549532162467 1.8 -0.1102549423268,2.00874095970648 1.8 -0.0831646763271034,2.00389277250337 1.8 -0.0556692403840259,2.00097437989607 1.8 -0.0279025894976499,2.0 1.8 3.11014128034106e-16,' +
                                       '2.00097437989607 1.8 0.0279025894976503,2.00389277250337 1.8 0.0556692403840266,2.00874095970648 1.8 0.083164676327104,2.01549532162467 1.8 0.1102549423268,2.02412295168564 1.8 0.136808057330268,2.03458181694296 1.8 0.16269465723032,2.04682096285643 1.8 0.187788625114357,2.06078076153743 1.8 0.211967705693282,2.07639320225002 1.8 0.23511410091699,2.09358222275241 1.8 0.257115043874616,2.11226407986454 1.8 0.277863348183599,2.13234775745646 1.8 0.297257930190958,2.15373540986974 1.8 0.315204301442689,2.1763228386117 1.8 0.331615029022017,2.2 1.8 0.346410161513776,2.22465154128437 1.8 0.359517618519667,2.25015736263363 1.8 0.370873541826715,2.27639320225002 1.8 0.380422606518062,2.30323124176013 1.8 0.388118290510399,2.33054072893323 1.8 0.393923101204884,2.35818861469294 1.8 0.39780875814731,2.386040201319 1.8 0.399756330807639,2.413959798681 1.8 0.399756330807639,2.44181138530706 1.8 0.39780875814731,2.46945927106677 1.8 0.393923101204884,2.49676875823987 1.8 0.388118290510399,2.52360679774998 1.8 0.380422606518062,2.54984263736636 1.8 0.370873541826715,2.57534845871563 1.8 0.359517618519667,2.6 1.8 0.346410161513776,2.6236771613883 1.8 0.331615029022017,2.64626459013026 1.8 0.315204301442689,2.66765224254354 1.8 0.297257930190958,2.68773592013546 1.8 0.277863348183599,2.70641777724759 1.8 0.257115043874616,2.72360679774998 1.8 0.23511410091699,2.73921923846257 1.8 0.211967705693283,2.75317903714357 1.8 0.187788625114357,2.76541818305704 1.8 0.16269465723032,2.77587704831436 1.8 0.136808057330268,2.78450467837533 1.8 0.1102549423268,2.79125904029352 1.8 0.0831646763271043,2.79610722749663 1.8 0.0556692403840267,2.79902562010393 1.8 0.0279025894976503,2.8 1.8 3.6e-16)),' +
                                       '((2.0 0.0 -4.8985871965894e-17,2.00097437989607 0.0 -0.0279025894976502,2.00389277250337 0.0 -0.0556692403840263,2.00874095970648 0.0 -0.0831646763271037,2.01549532162467 0.0 -0.1102549423268,2.02412295168564 0.0 -0.136808057330268,2.03458181694296 0.0 -0.16269465723032,2.04682096285643 0.0 -0.187788625114356,2.06078076153743 0.0 -0.211967705693282,2.07639320225002 0.0 -0.235114100916989,2.09358222275241 0.0 -0.257115043874616,2.11226407986454 0.0 -0.277863348183599,2.13234775745646 0.0 -0.297257930190958,2.15373540986974 0.0 -0.315204301442689,2.1763228386117 0.0 -0.331615029022017,2.2 0.0 -0.346410161513776,2.22465154128437 0.0 -0.359517618519667,2.25015736263363 0.0 -0.370873541826715,2.27639320225002 0.0 -0.380422606518061,2.30323124176013 0.0 -0.388118290510399,2.33054072893323 0.0 -0.393923101204883,2.35818861469294 0.0 -0.397808758147309,2.386040201319 0.0 -0.399756330807638,2.413959798681 0.0 -0.399756330807638,2.44181138530706 0.0 -0.397808758147309,2.46945927106677 0.0 -0.393923101204883,2.49676875823987 0.0 -0.388118290510399,2.52360679774998 0.0 -0.380422606518061,2.54984263736636 0.0 -0.370873541826715,2.57534845871563 0.0 -0.359517618519667,2.6 0.0 -0.346410161513775,2.6236771613883 0.0 -0.331615029022017,2.64626459013026 0.0 -0.315204301442689,2.66765224254354 0.0 -0.297257930190958,2.68773592013546 0.0 -0.277863348183599,2.70641777724759 0.0 -0.257115043874616,2.72360679774998 0.0 -0.235114100916989,2.73921923846257 -0.0 -0.211967705693282,2.75317903714357 -0.0 -0.187788625114356,2.76541818305704 -0.0 -0.16269465723032,2.77587704831436 -0.0 -0.136808057330267,2.78450467837533 -0.0 -0.1102549423268,2.79125904029352 -0.0 -0.0831646763271037,2.79610722749663 -0.0 -0.0556692403840262,2.79902562010393 -0.0 -0.0279025894976501,' +
                                       '2.8 -0.0 1e-31,2.8 1.8 3.6e-16,2.79902562010393 1.8 -0.0279025894976498,2.79610722749663 1.8 -0.0556692403840258,2.79125904029352 1.8 -0.0831646763271034,2.78450467837533 1.8 -0.110254942326799,2.77587704831436 1.8 -0.136808057330267,2.76541818305704 1.8 -0.16269465723032,2.75317903714357 1.8 -0.187788625114356,2.73921923846257 1.8 -0.211967705693282,2.72360679774998 1.8 -0.235114100916989,2.70641777724759 1.8 -0.257115043874615,2.68773592013546 1.8 -0.277863348183599,2.66765224254354 1.8 -0.297257930190957,2.64626459013026 1.8 -0.315204301442689,2.6236771613883 1.8 -0.331615029022016,2.6 1.8 -0.346410161513775,2.57534845871563 1.8 -0.359517618519667,2.54984263736636 1.8 -0.370873541826715,2.52360679774998 1.8 -0.380422606518061,2.49676875823987 1.8 -0.388118290510398,2.46945927106677 1.8 -0.393923101204883,2.44181138530706 1.8 -0.397808758147309,2.413959798681 1.8 -0.399756330807638,2.386040201319 1.8 -0.399756330807638,2.35818861469294 1.8 -0.397808758147309,2.33054072893323 1.8 -0.393923101204883,2.30323124176013 1.8 -0.388118290510398,2.27639320225002 1.8 -0.380422606518061,2.25015736263363 1.8 -0.370873541826715,2.22465154128437 1.8 -0.359517618519666,2.2 1.8 -0.346410161513775,2.1763228386117 1.8 -0.331615029022016,2.15373540986974 1.8 -0.315204301442689,2.13234775745646 1.8 -0.297257930190957,2.11226407986454 1.8 -0.277863348183599,2.09358222275241 1.8 -0.257115043874615,2.07639320225002 1.8 -0.235114100916989,2.06078076153743 1.8 -0.211967705693282,2.04682096285643 1.8 -0.187788625114356,2.03458181694296 1.8 -0.16269465723032,2.02412295168564 1.8 -0.136808057330267,2.01549532162467 1.8 -0.1102549423268,2.00874095970648 1.8 -0.0831646763271034,2.00389277250337 1.8 -0.0556692403840259,2.00097437989607 1.8 -0.0279025894976499,2.0 1.8 3.11014128034106e-16,2.0 0.0 -4.8985871965894e-17)),' +
                                       '((2.8 -0.0 1e-31,2.79902562010393 -0.0 0.0279025894976499,2.79610722749663 -0.0 0.0556692403840264,2.79125904029352 -0.0 0.0831646763271039,2.78450467837533 -0.0 0.1102549423268,2.77587704831436 -0.0 0.136808057330267,2.76541818305704 -0.0 0.16269465723032,2.75317903714357 -0.0 0.187788625114356,2.73921923846257 -0.0 0.211967705693282,2.72360679774998 -0.0 0.235114100916989,2.70641777724759 -0.0 0.257115043874616,2.68773592013546 -0.0 0.277863348183599,2.66765224254354 -0.0 0.297257930190958,2.64626459013026 -0.0 0.315204301442689,2.6236771613883 -0.0 0.331615029022017,2.6 -0.0 0.346410161513775,2.57534845871563 -0.0 0.359517618519667,2.54984263736636 -0.0 0.370873541826715,2.52360679774998 -0.0 0.380422606518061,2.49676875823987 -0.0 0.388118290510399,2.46945927106677 -0.0 0.393923101204883,2.44181138530706 -0.0 0.397808758147309,2.413959798681 -0.0 0.399756330807638,2.386040201319 -0.0 0.399756330807638,2.35818861469294 -0.0 0.397808758147309,2.33054072893323 -0.0 0.393923101204883,2.30323124176013 -0.0 0.388118290510399,2.27639320225002 -0.0 0.380422606518061,2.25015736263363 -0.0 0.370873541826715,2.22465154128437 -0.0 0.359517618519667,2.2 -0.0 0.346410161513775,2.1763228386117 -0.0 0.331615029022017,2.15373540986974 0.0 0.315204301442689,2.13234775745646 0.0 0.297257930190958,2.11226407986454 0.0 0.277863348183599,2.09358222275241 0.0 0.257115043874616,2.07639320225002 0.0 0.235114100916989,2.06078076153743 0.0 0.211967705693282,2.04682096285643 0.0 0.187788625114356,2.03458181694296 0.0 0.16269465723032,2.02412295168564 0.0 0.136808057330267,2.01549532162467 0.0 0.1102549423268,2.00874095970648 0.0 0.0831646763271036,2.00389277250337 0.0 0.0556692403840262,2.00097437989607 0.0 0.0279025894976499,' +
-                                      '2.0 0.0 -4.8985871965894e-17,2.0 1.8 3.11014128034106e-16,2.00097437989607 1.8 0.0279025894976503,2.00389277250337 1.8 0.0556692403840266,2.00874095970648 1.8 0.083164676327104,2.01549532162467 1.8 0.1102549423268,2.02412295168564 1.8 0.136808057330268,2.03458181694296 1.8 0.16269465723032,2.04682096285643 1.8 0.187788625114357,2.06078076153743 1.8 0.211967705693282,2.07639320225002 1.8 0.23511410091699,2.09358222275241 1.8 0.257115043874616,2.11226407986454 1.8 0.277863348183599,2.13234775745646 1.8 0.297257930190958,2.15373540986974 1.8 0.315204301442689,2.1763228386117 1.8 0.331615029022017,2.2 1.8 0.346410161513776,2.22465154128437 1.8 0.359517618519667,2.25015736263363 1.8 0.370873541826715,2.27639320225002 1.8 0.380422606518062,2.30323124176013 1.8 0.388118290510399,2.33054072893323 1.8 0.393923101204884,2.35818861469294 1.8 0.39780875814731,2.386040201319 1.8 0.399756330807639,2.413959798681 1.8 0.399756330807639,2.44181138530706 1.8 0.39780875814731,2.46945927106677 1.8 0.393923101204884,2.49676875823987 1.8 0.388118290510399,2.52360679774998 1.8 0.380422606518062,2.54984263736636 1.8 0.370873541826715,2.57534845871563 1.8 0.359517618519667,2.6 1.8 0.346410161513776,2.6236771613883 1.8 0.331615029022017,2.64626459013026 1.8 0.315204301442689,2.66765224254354 1.8 0.297257930190958,2.68773592013546 1.8 0.277863348183599,2.70641777724759 1.8 0.257115043874616,2.72360679774998 1.8 0.23511410091699,2.73921923846257 1.8 0.211967705693283,2.75317903714357 1.8 0.187788625114357,2.76541818305704 1.8 0.16269465723032,2.77587704831436 1.8 0.136808057330268,2.78450467837533 1.8 0.1102549423268,2.79125904029352 1.8 0.0831646763271043,2.79610722749663 1.8 0.0556692403840267,2.79902562010393 1.8 0.0279025894976503,2.8 1.8 3.6e-16,2.8 -0.0 1e-31)))'):
-        gdaltest.post_reason('wrong geometry for cylinder')
-        return 'fail'
+                                      '2.0 0.0 -4.8985871965894e-17,2.0 1.8 3.11014128034106e-16,2.00097437989607 1.8 0.0279025894976503,2.00389277250337 1.8 0.0556692403840266,2.00874095970648 1.8 0.083164676327104,2.01549532162467 1.8 0.1102549423268,2.02412295168564 1.8 0.136808057330268,2.03458181694296 1.8 0.16269465723032,2.04682096285643 1.8 0.187788625114357,2.06078076153743 1.8 0.211967705693282,2.07639320225002 1.8 0.23511410091699,2.09358222275241 1.8 0.257115043874616,2.11226407986454 1.8 0.277863348183599,2.13234775745646 1.8 0.297257930190958,2.15373540986974 1.8 0.315204301442689,2.1763228386117 1.8 0.331615029022017,2.2 1.8 0.346410161513776,2.22465154128437 1.8 0.359517618519667,2.25015736263363 1.8 0.370873541826715,2.27639320225002 1.8 0.380422606518062,2.30323124176013 1.8 0.388118290510399,2.33054072893323 1.8 0.393923101204884,2.35818861469294 1.8 0.39780875814731,2.386040201319 1.8 0.399756330807639,2.413959798681 1.8 0.399756330807639,2.44181138530706 1.8 0.39780875814731,2.46945927106677 1.8 0.393923101204884,2.49676875823987 1.8 0.388118290510399,2.52360679774998 1.8 0.380422606518062,2.54984263736636 1.8 0.370873541826715,2.57534845871563 1.8 0.359517618519667,2.6 1.8 0.346410161513776,2.6236771613883 1.8 0.331615029022017,2.64626459013026 1.8 0.315204301442689,2.66765224254354 1.8 0.297257930190958,2.68773592013546 1.8 0.277863348183599,2.70641777724759 1.8 0.257115043874616,2.72360679774998 1.8 0.23511410091699,2.73921923846257 1.8 0.211967705693283,2.75317903714357 1.8 0.187788625114357,2.76541818305704 1.8 0.16269465723032,2.77587704831436 1.8 0.136808057330268,2.78450467837533 1.8 0.1102549423268,2.79125904029352 1.8 0.0831646763271043,2.79610722749663 1.8 0.0556692403840267,2.79902562010393 1.8 0.0279025894976503,2.8 1.8 3.6e-16,2.8 -0.0 1e-31)))')), \
+        'wrong geometry for cylinder'
 
     # 3DSOLID, plain
     feat = layer.GetNextFeature()
@@ -2589,9 +2422,8 @@ def test_ogr_dxf_34():
     expected_wkt = 'POLYGON ((0 0,0 1,1 0,0 0))'
     received_wkt = geom.ExportToWkt()
 
-    if expected_wkt != received_wkt:
-        gdaltest.post_reason('did not get expected geometry back: got %s' % received_wkt)
-        return 'fail'
+    assert expected_wkt == received_wkt, \
+        ('did not get expected geometry back: got %s' % received_wkt)
     ds = None
 
     gdal.Unlink('tmp/triangle_test.dxf')
@@ -2701,8 +2533,7 @@ def test_ogr_dxf_35():
         "13.3027626235603 8.26630944469236 0," + \
         "10.0 5.0 0," + \
         "10.0 5.0 0))"""
-    if ogrtest.check_feature_geometry(feat, expected_wkt) != 0:
-        return 'fail'
+    assert ogrtest.check_feature_geometry(feat, expected_wkt) == 0
 
     return 'success'
 
@@ -2716,8 +2547,7 @@ def test_ogr_dxf_36():
     ds = ogr.Open('data/insert_only.dxf')
     gdal.SetConfigOption('DXF_MERGE_BLOCK_GEOMETRIES', None)
     lyr = ds.GetLayer(0)
-    if lyr.GetFeatureCount() != 5:
-        return 'fail'
+    assert lyr.GetFeatureCount() == 5
 
     return 'success'
 
@@ -2747,8 +2577,7 @@ def test_ogr_dxf_37():
 
     # Check first feature
     feat = lyr.GetNextFeature()
-    if feat is None:
-        return 'fail'
+    assert feat is not None
     ds = None
 
     gdal.Unlink('/vsimem/ogr_dxf_37.dxf')
@@ -2918,9 +2747,8 @@ def test_ogr_dxf_42():
     # Inlining, merging
     ds = ogr.Open('data/block-insert-order.dxf')
     lyr = ds.GetLayer(0)
-    if lyr.GetFeatureCount() != 2:
-        gdaltest.post_reason('Defaults: Expected 2 features, found %d' % lyr.GetFeatureCount())
-        return 'fail'
+    assert lyr.GetFeatureCount() == 2, \
+        ('Defaults: Expected 2 features, found %d' % lyr.GetFeatureCount())
 
     # No inlining, merging
     gdal.SetConfigOption('DXF_INLINE_BLOCKS', 'FALSE')
@@ -2928,9 +2756,8 @@ def test_ogr_dxf_42():
     gdal.SetConfigOption('DXF_INLINE_BLOCKS', None)
 
     lyr = ds.GetLayerByName('entities')
-    if lyr.GetFeatureCount() != 2:
-        gdaltest.post_reason('No inlining: Expected 2 features on entities, found %d' % lyr.GetFeatureCount())
-        return 'fail'
+    assert lyr.GetFeatureCount() == 2, \
+        ('No inlining: Expected 2 features on entities, found %d' % lyr.GetFeatureCount())
 
     f = lyr.GetNextFeature()
     if ogrtest.check_feature_geometry(f, 'POINT Z (8.0 2.5 6)') != 0:
@@ -2945,9 +2772,8 @@ def test_ogr_dxf_42():
         return 'fail'
 
     lyr = ds.GetLayerByName('blocks')
-    if lyr.GetFeatureCount() != 6:
-        gdaltest.post_reason('No inlining: Expected 6 feature on blocks, found %d' % lyr.GetFeatureCount())
-        return 'fail'
+    assert lyr.GetFeatureCount() == 6, \
+        ('No inlining: Expected 6 feature on blocks, found %d' % lyr.GetFeatureCount())
 
     f = lyr.GetFeature(3)
     if ogrtest.check_feature_geometry(f, 'POINT Z (5 5 0)') != 0:
@@ -2961,24 +2787,13 @@ def test_ogr_dxf_42():
         f.DumpReadable()
         return 'fail'
 
-    if f.GetField('BlockName') != 'BLOCK4':
-        gdaltest.post_reason('Wrong BlockName')
-        return 'fail'
-    if f.GetField('BlockScale') != [0.4, 1.0, 1.5]:
-        gdaltest.post_reason('Wrong BlockScale')
-        return 'fail'
-    if f.GetField('BlockAngle') != 40:
-        gdaltest.post_reason('Wrong BlockAngle')
-        return 'fail'
-    if f.GetField('BlockOCSNormal') != [0.6, 0.565685424949238, 0.565685424949238]:
-        gdaltest.post_reason('Wrong BlockOCSNormal')
-        return 'fail'
-    if f.GetField('BlockOCSCoords') != [5, 5, 0]:
-        gdaltest.post_reason('Wrong BlockOCSCoords')
-        return 'fail'
-    if f.GetField('Block') != 'BLOCK3':
-        gdaltest.post_reason('Wrong Block')
-        return 'fail'
+    assert f.GetField('BlockName') == 'BLOCK4', 'Wrong BlockName'
+    assert f.GetField('BlockScale') == [0.4, 1.0, 1.5], 'Wrong BlockScale'
+    assert f.GetField('BlockAngle') == 40, 'Wrong BlockAngle'
+    assert f.GetField('BlockOCSNormal') == [0.6, 0.565685424949238, 0.565685424949238], \
+        'Wrong BlockOCSNormal'
+    assert f.GetField('BlockOCSCoords') == [5, 5, 0], 'Wrong BlockOCSCoords'
+    assert f.GetField('Block') == 'BLOCK3', 'Wrong Block'
 
     # Inlining, no merging
     gdal.SetConfigOption('DXF_MERGE_BLOCK_GEOMETRIES', 'FALSE')
@@ -2986,9 +2801,8 @@ def test_ogr_dxf_42():
     gdal.SetConfigOption('DXF_MERGE_BLOCK_GEOMETRIES', None)
 
     lyr = ds.GetLayer(0)
-    if lyr.GetFeatureCount() != 4:
-        gdaltest.post_reason('Merging: Expected 4 features, found %d' % lyr.GetFeatureCount())
-        return 'fail'
+    assert lyr.GetFeatureCount() == 4, \
+        ('Merging: Expected 4 features, found %d' % lyr.GetFeatureCount())
 
     return 'success'
 
@@ -3000,8 +2814,7 @@ def test_ogr_dxf_43():
 
     ds = ogr.Open('data/insert-recursive-pair.dxf')
     lyr = ds.GetLayer(0)
-    if lyr.GetFeatureCount() != 1:
-        return 'fail'
+    assert lyr.GetFeatureCount() == 1
 
     return 'success'
 
@@ -3016,8 +2829,7 @@ def test_ogr_dxf_44():
         lyr = ds.GetLayer(0)
         with gdaltest.error_handler():
             lyr.GetFeatureCount()
-        if gdal.GetLastErrorMsg().find('DXF_MAX_BSPLINE_CONTROL_POINTS') < 0:
-            return 'fail'
+        assert gdal.GetLastErrorMsg().find('DXF_MAX_BSPLINE_CONTROL_POINTS') >= 0
 
     ds = ogr.Open('data/leader-mleader.dxf')
     lyr = ds.GetLayer(0)
@@ -3072,9 +2884,8 @@ def test_ogr_dxf_44():
     # Check that the very long text string in the MTEXT entity associated
     # to this LEADER is captured correctly
     f = lyr.GetNextFeature()
-    if len(f.GetField('Text')) != 319:
-        gdaltest.post_reason('Wrong text length: got %d' % len(f.GetField('Text')))
-        return 'fail'
+    assert len(f.GetField('Text')) == 319, \
+        ('Wrong text length: got %d' % len(f.GetField('Text')))
 
     # MULTILEADER with custom arrowhead
     f = lyr.GetNextFeature()
@@ -3110,22 +2921,19 @@ def test_ogr_dxf_44():
     for x in range(3):
         f = lyr.GetNextFeature()
         geom = f.GetGeometryRef()
-        if geom.GetGeometryType() != ogr.wkbLineString25D:
-            gdaltest.post_reason('Unexpected LEADER geometry, expected wkbLineString25D on iteration %d' % x)
-            return 'fail'
+        assert geom.GetGeometryType() == ogr.wkbLineString25D, \
+            ('Unexpected LEADER geometry, expected wkbLineString25D on iteration %d' % x)
 
     for x in range(2):
         f = lyr.GetNextFeature()
         geom = f.GetGeometryRef()
-        if geom.GetGeometryType() != ogr.wkbMultiLineString:
-            gdaltest.post_reason('Unexpected MULTILEADER geometry, expected wkbMultiLineString on iteration %d' % x)
-            return 'fail'
+        assert geom.GetGeometryType() == ogr.wkbMultiLineString, \
+            ('Unexpected MULTILEADER geometry, expected wkbMultiLineString on iteration %d' % x)
 
         f = lyr.GetNextFeature()
         geom = f.GetGeometryRef()
-        if geom.GetGeometryType() != ogr.wkbPoint:
-            gdaltest.post_reason('Unexpected MULTILEADER geometry, expected wkbPoint on iteration %d' % x)
-            return 'fail'
+        assert geom.GetGeometryType() == ogr.wkbPoint, \
+            ('Unexpected MULTILEADER geometry, expected wkbPoint on iteration %d' % x)
 
     # MULTILEADER with multiple leader lines and formatted text
     f = lyr.GetNextFeature()
@@ -3243,44 +3051,28 @@ def test_ogr_dxf_45():
     lyr = ds.GetLayer(0)
 
     feat = lyr.GetNextFeature()
-    if feat.GetField('Linetype') != 'DASHED2':
-        gdaltest.post_reason('Got wrong linetype (1)')
-        return 'fail'
+    assert feat.GetField('Linetype') == 'DASHED2', 'Got wrong linetype (1)'
 
-    if feat.GetStyleString() != 'PEN(c:#000000,p:"12.5g 6.25g")':
-        print(feat.GetStyleString())
-        gdaltest.post_reason('Got wrong style string (1)')
-        return 'fail'
+    assert feat.GetStyleString() == 'PEN(c:#000000,p:"12.5g 6.25g")', \
+        'Got wrong style string (1)'
 
     feat = lyr.GetNextFeature()
-    if feat.GetField('Linetype') != 'DASHED2':
-        gdaltest.post_reason('Got wrong linetype (2)')
-        return 'fail'
+    assert feat.GetField('Linetype') == 'DASHED2', 'Got wrong linetype (2)'
 
-    if feat.GetStyleString() != 'PEN(c:#000000,p:"0.625g 0.3125g")':
-        print(feat.GetStyleString())
-        gdaltest.post_reason('Got wrong style string (2)')
-        return 'fail'
+    assert feat.GetStyleString() == 'PEN(c:#000000,p:"0.625g 0.3125g")', \
+        'Got wrong style string (2)'
 
     feat = lyr.GetNextFeature()
-    if feat.GetField('Linetype') != 'DASHED2_FLIPPED':
-        gdaltest.post_reason('Got wrong linetype (3)')
-        return 'fail'
+    assert feat.GetField('Linetype') == 'DASHED2_FLIPPED', 'Got wrong linetype (3)'
 
-    if feat.GetStyleString() != 'PEN(c:#000000,p:"0.625g 0.3125g")':
-        print(feat.GetStyleString())
-        gdaltest.post_reason('Got wrong style string (3)')
-        return 'fail'
+    assert feat.GetStyleString() == 'PEN(c:#000000,p:"0.625g 0.3125g")', \
+        'Got wrong style string (3)'
 
     feat = lyr.GetNextFeature()
-    if feat.GetField('Linetype') != 'Drain_Pipe_Inv_100':
-        gdaltest.post_reason('Got wrong linetype (4)')
-        return 'fail'
+    assert feat.GetField('Linetype') == 'Drain_Pipe_Inv_100', 'Got wrong linetype (4)'
 
-    if feat.GetStyleString() != 'PEN(c:#000000,p:"35g 22.5g")':
-        print(feat.GetStyleString())
-        gdaltest.post_reason('Got wrong style string (4)')
-        return 'fail'
+    assert feat.GetStyleString() == 'PEN(c:#000000,p:"35g 22.5g")', \
+        'Got wrong style string (4)'
 
     return 'success'
 
@@ -3542,9 +3334,8 @@ def test_ogr_dxf_49():
     # Inline blocks mode
     ds = ogr.Open('data/attrib.dxf')
     lyr = ds.GetLayer(0)
-    if lyr.GetFeatureCount() != 6:
-        gdaltest.post_reason('Wrong feature count, got %d' % lyr.GetFeatureCount())
-        return 'fail'
+    assert lyr.GetFeatureCount() == 6, \
+        ('Wrong feature count, got %d' % lyr.GetFeatureCount())
 
     f = lyr.GetFeature(1)
     if f.GetField('Text') != 'super test':
@@ -3558,9 +3349,7 @@ def test_ogr_dxf_49():
 
     f = lyr.GetFeature(4)
     geom = f.GetGeometryRef()
-    if geom.GetGeometryType() != ogr.wkbLineString25D:
-        gdaltest.post_reason('Expected LINESTRING Z')
-        return 'fail'
+    assert geom.GetGeometryType() == ogr.wkbLineString25D, 'Expected LINESTRING Z'
 
     f = lyr.GetFeature(5)
     if f.GetField('Text') != '':
@@ -3848,8 +3637,7 @@ def test_ogr_dxf_write_geometry_collection_of_unsupported_type():
     f.SetGeometryDirectly(ogr.CreateGeometryFromWkt('GEOMETRYCOLLECTION(TIN EMPTY)'))
     with gdaltest.error_handler():
         ret = lyr.CreateFeature(f)
-    if ret == 0:
-        return 'fail'
+    assert ret != 0
     ds = None
     gdal.Unlink(tmpfile)
 
diff --git a/autotest/ogr/ogr_edigeo.py b/autotest/ogr/ogr_edigeo.py
index 5718f73f1df5..753b008a26ef 100755
--- a/autotest/ogr/ogr_edigeo.py
+++ b/autotest/ogr/ogr_edigeo.py
@@ -66,9 +66,7 @@ def test_ogr_edigeo_1():
         return 'skip'
 
     ds = ogr.Open('tmp/cache/E000AB01.THF')
-    if ds.GetLayerCount() != 24:
-        print(ds.GetLayerCount())
-        return 'fail'
+    assert ds.GetLayerCount() == 24
 
     layers = [('BATIMENT_id', ogr.wkbPolygon, 107),
               ('BORNE_id', ogr.wkbPoint, 5),
@@ -91,15 +89,10 @@ def test_ogr_edigeo_1():
 
     for l in layers:
         lyr = ds.GetLayerByName(l[0])
-        if lyr.GetLayerDefn().GetGeomType() != l[1]:
-            return 'fail'
-        if lyr.GetFeatureCount() != l[2]:
-            print(lyr.GetFeatureCount())
-            return 'fail'
+        assert lyr.GetLayerDefn().GetGeomType() == l[1]
+        assert lyr.GetFeatureCount() == l[2]
         if l[1] != ogr.wkbNone:
-            if lyr.GetSpatialRef().ExportToWkt().find('Lambert_Conformal_Conic_1SP') == -1:
-                print(lyr.GetSpatialRef().ExportToWkt())
-                return 'fail'
+            assert lyr.GetSpatialRef().ExportToWkt().find('Lambert_Conformal_Conic_1SP') != -1
 
     lyr = ds.GetLayerByName('BORNE_id')
     feat = lyr.GetNextFeature()
diff --git a/autotest/ogr/ogr_eeda.py b/autotest/ogr/ogr_eeda.py
index ef82017e317a..1bcd9f40db10 100644
--- a/autotest/ogr/ogr_eeda.py
+++ b/autotest/ogr/ogr_eeda.py
@@ -86,23 +86,15 @@ def test_eeda_2():
 
     lyr = ds.GetLayer(0)
 
-    if lyr.TestCapability(ogr.OLCStringsAsUTF8) != 1:
-        return 'fail'
+    assert lyr.TestCapability(ogr.OLCStringsAsUTF8) == 1
 
-    if lyr.TestCapability('foo') != 0:
-        return 'fail'
+    assert lyr.TestCapability('foo') == 0
 
-    if lyr.GetLayerDefn().GetFieldCount() != 8 + 7 + 4:
-        print(lyr.GetLayerDefn().GetFieldCount())
-        return 'fail'
+    assert lyr.GetLayerDefn().GetFieldCount() == 8 + 7 + 4
 
-    if lyr.GetExtent() != (-180.0, 180.0, -90.0, 90.0):
-        print(lyr.GetExtent())
-        return 'fail'
+    assert lyr.GetExtent() == (-180.0, 180.0, -90.0, 90.0)
 
-    if lyr.GetFeatureCount() != -1:
-        print(lyr.GetFeatureCount())
-        return 'fail'
+    assert lyr.GetFeatureCount() == -1
 
     gdal.FileFromMemBuffer('/vsimem/ee/projects/earthengine-public/assets/collection:listImages', json.dumps({
         'assets': [
@@ -197,8 +189,7 @@ def test_eeda_2():
         return 'fail'
 
     f = lyr.GetNextFeature()
-    if f is not None:
-        return 'fail'
+    assert f is None
 
     lyr.ResetReading()
 
@@ -218,8 +209,7 @@ def test_eeda_2():
     }))
 
     f = lyr.GetNextFeature()
-    if f.GetField('name') != 'projects/earthengine-public/assets/collection/raw_filter':
-        return 'fail'
+    assert f.GetField('name') == 'projects/earthengine-public/assets/collection/raw_filter'
 
     lyr.SetAttributeFilter(None)
     lyr.SetAttributeFilter("time >= '1980-01-01T00:00:00Z' AND " +
@@ -262,8 +252,7 @@ def test_eeda_2():
     f = lyr.GetNextFeature()
     gdal.Unlink(ogrtest.eeda_drv_tmpfile)
 
-    if f.GetField('name') != 'projects/earthengine-public/assets/collection/filtered_feature':
-        return 'fail'
+    assert f.GetField('name') == 'projects/earthengine-public/assets/collection/filtered_feature'
 
     lyr.SetSpatialFilter(None)
 
@@ -286,8 +275,7 @@ def test_eeda_2():
     f = lyr.GetNextFeature()
     gdal.Unlink(ogrtest.eeda_drv_tmpfile)
 
-    if f.GetField('name') != 'projects/earthengine-public/assets/collection/filtered_feature':
-        return 'fail'
+    assert f.GetField('name') == 'projects/earthengine-public/assets/collection/filtered_feature'
 
     # Test time equality with day granularity
     lyr.SetAttributeFilter("time = '1980-01-01'")
@@ -308,8 +296,7 @@ def test_eeda_2():
     f = lyr.GetNextFeature()
     gdal.Unlink(ogrtest.eeda_drv_tmpfile)
 
-    if f.GetField('name') != 'projects/earthengine-public/assets/collection/filtered_feature':
-        return 'fail'
+    assert f.GetField('name') == 'projects/earthengine-public/assets/collection/filtered_feature'
 
     ds = None
 
@@ -333,9 +320,7 @@ def test_eeda_3():
 
     lyr = ds.GetLayer(0)
 
-    if lyr.GetLayerDefn().GetFieldCount() != 8 + 7 + 4:
-        print(lyr.GetLayerDefn().GetFieldCount())
-        return 'fail'
+    assert lyr.GetLayerDefn().GetFieldCount() == 8 + 7 + 4
     ds = None
 
     gdal.SetConfigOption('EEDA_BEARER', None)
@@ -363,8 +348,7 @@ def test_eeda_4():
             }
         ]
     }))
-    if not ogr.Open('EEDA:users/foo').GetLayer(0):
-        return 'fail'
+    assert ogr.Open('EEDA:users/foo').GetLayer(0)
     gdal.Unlink(ogrtest.eeda_drv_tmpfile)
 
     # Project asset ID ("projects/**").
@@ -377,8 +361,7 @@ def test_eeda_4():
         ]
     }))
     ds = ogr.Open('EEDA:projects/foo')
-    if not ds.GetLayer(0):
-        return 'fail'
+    assert ds.GetLayer(0)
     gdal.Unlink(ogrtest.eeda_drv_tmpfile)
     ds = None
 
@@ -392,8 +375,7 @@ def test_eeda_4():
         ]
     }))
     ds = ogr.Open('EEDA:projects/foo/bar/baz')
-    if not ds.GetLayer(0):
-        return 'fail'
+    assert ds.GetLayer(0)
     gdal.Unlink(ogrtest.eeda_drv_tmpfile)
     ds = None
 
@@ -407,8 +389,7 @@ def test_eeda_4():
         ]
     }))
     ds = ogr.Open('EEDA:foo')
-    if not ds.GetLayer(0):
-        return 'fail'
+    assert ds.GetLayer(0)
     gdal.Unlink(ogrtest.eeda_drv_tmpfile)
     ds = None
 
@@ -422,8 +403,7 @@ def test_eeda_4():
         ]
     }))
     ds = ogr.Open('EEDA:projects/foo/assets/bar')
-    if not ds.GetLayer(0):
-        return 'fail'
+    assert ds.GetLayer(0)
     gdal.Unlink(ogrtest.eeda_drv_tmpfile)
     ds = None
 
diff --git a/autotest/ogr/ogr_elasticsearch.py b/autotest/ogr/ogr_elasticsearch.py
index 888a9168d6e6..4027d7d68920 100755
--- a/autotest/ogr/ogr_elasticsearch.py
+++ b/autotest/ogr/ogr_elasticsearch.py
@@ -67,54 +67,36 @@ def test_ogr_elasticsearch_nonexistent_server():
     with gdaltest.error_handler():
         ds = ogrtest.elasticsearch_drv.CreateDataSource(
             '/vsimem/nonexistent_host')
-    if ds is not None:
-        gdaltest.post_reason(
-            'managed to open nonexistent ElasticSearch datastore.')
-        return 'fail'
+    assert ds is None, 'managed to open nonexistent ElasticSearch datastore.'
 
     with gdaltest.error_handler():
         ds = ogrtest.elasticsearch_drv.Open('ES:/vsimem/nonexistent_host')
-    if ds is not None:
-        gdaltest.post_reason(
-            'managed to open nonexistent ElasticSearch datastore.')
-        return 'fail'
+    assert ds is None, 'managed to open nonexistent ElasticSearch datastore.'
 
     gdal.FileFromMemBuffer("/vsimem/fakeelasticsearch", """{}""")
 
     with gdaltest.error_handler():
         ds = ogrtest.elasticsearch_drv.Open('ES:/vsimem/fakeelasticsearch')
-    if ds is not None:
-        gdaltest.post_reason(
-            'managed to open invalid ElasticSearch datastore.')
-        return 'fail'
+    assert ds is None, 'managed to open invalid ElasticSearch datastore.'
 
     gdal.FileFromMemBuffer("/vsimem/fakeelasticsearch", """{"version":null}""")
 
     with gdaltest.error_handler():
         ds = ogrtest.elasticsearch_drv.Open('ES:/vsimem/fakeelasticsearch')
-    if ds is not None:
-        gdaltest.post_reason(
-            'managed to open invalid ElasticSearch datastore.')
-        return 'fail'
+    assert ds is None, 'managed to open invalid ElasticSearch datastore.'
 
     gdal.FileFromMemBuffer("/vsimem/fakeelasticsearch", """{"version":{}}""")
 
     with gdaltest.error_handler():
         ds = ogrtest.elasticsearch_drv.Open('ES:/vsimem/fakeelasticsearch')
-    if ds is not None:
-        gdaltest.post_reason(
-            'managed to open invalid ElasticSearch datastore.')
-        return 'fail'
+    assert ds is None, 'managed to open invalid ElasticSearch datastore.'
 
     gdal.FileFromMemBuffer("/vsimem/fakeelasticsearch",
                            """{"version":{"number":null}}""")
 
     with gdaltest.error_handler():
         ds = ogrtest.elasticsearch_drv.Open('ES:/vsimem/fakeelasticsearch')
-    if ds is not None:
-        gdaltest.post_reason(
-            'managed to open invalid ElasticSearch datastore.')
-        return 'fail'
+    assert ds is None, 'managed to open invalid ElasticSearch datastore.'
 
     return 'success'
 
@@ -131,34 +113,25 @@ def test_ogr_elasticsearch_1():
 
     ds = ogrtest.elasticsearch_drv.CreateDataSource(
         "/vsimem/fakeelasticsearch")
-    if ds is None:
-        gdaltest.post_reason('did not managed to open ElasticSearch datastore')
-        return 'fail'
+    assert ds is not None, 'did not managed to open ElasticSearch datastore'
 
-    if ds.TestCapability(ogr.ODsCCreateLayer) == 0:
-        return 'fail'
-    if ds.TestCapability(ogr.ODsCDeleteLayer) == 0:
-        return 'fail'
-    if ds.TestCapability(ogr.ODsCCreateGeomFieldAfterCreateLayer) == 0:
-        return 'fail'
+    assert ds.TestCapability(ogr.ODsCCreateLayer) != 0
+    assert ds.TestCapability(ogr.ODsCDeleteLayer) != 0
+    assert ds.TestCapability(ogr.ODsCCreateGeomFieldAfterCreateLayer) != 0
 
     # Failed index creation
     with gdaltest.error_handler():
         lyr = ds.CreateLayer('foo', srs=ogrtest.srs_wgs84, options=['FID='])
-    if lyr is not None:
-        return 'fail'
-    if gdal.GetLastErrorType() != gdal.CE_Failure:
-        return 'fail'
+    assert lyr is None
+    assert gdal.GetLastErrorType() == gdal.CE_Failure
     gdal.ErrorReset()
 
     # Successful index creation
     gdal.FileFromMemBuffer(
         '/vsimem/fakeelasticsearch/foo&CUSTOMREQUEST=PUT', '{}')
     lyr = ds.CreateLayer('foo', srs=ogrtest.srs_wgs84, options=['FID='])
-    if lyr is None:
-        return 'fail'
-    if gdal.GetLastErrorType() != gdal.CE_None:
-        return 'fail'
+    assert lyr is not None
+    assert gdal.GetLastErrorType() == gdal.CE_None
 
     gdal.FileFromMemBuffer(
         '/vsimem/fakeelasticsearch/foo/FeatureCollection/_mapping&POSTFIELDS'
@@ -168,8 +141,7 @@ def test_ogr_elasticsearch_1():
     # OVERWRITE an nonexistent layer.
     lyr = ds.CreateLayer('foo', geom_type=ogr.wkbNone,
                          options=['OVERWRITE=TRUE', 'FID='])
-    if gdal.GetLastErrorType() != gdal.CE_None:
-        return 'fail'
+    assert gdal.GetLastErrorType() == gdal.CE_None
 
     # Simulate failed overwrite
     gdal.FileFromMemBuffer('/vsimem/fakeelasticsearch/foo',
@@ -177,8 +149,7 @@ def test_ogr_elasticsearch_1():
     with gdaltest.error_handler():
         lyr = ds.CreateLayer('foo', geom_type=ogr.wkbNone,
                              options=['OVERWRITE=TRUE'])
-    if gdal.GetLastErrorType() != gdal.CE_Failure:
-        return 'fail'
+    assert gdal.GetLastErrorType() == gdal.CE_Failure
     gdal.ErrorReset()
 
     # Successful overwrite
@@ -188,37 +159,28 @@ def test_ogr_elasticsearch_1():
         '/vsimem/fakeelasticsearch/foo/FeatureCollection/&POSTFIELDS={ }', '{}')
     lyr = ds.CreateLayer('foo', geom_type=ogr.wkbNone, options=[
                          'OVERWRITE=TRUE', 'BULK_INSERT=NO', 'FID='])
-    if gdal.GetLastErrorType() != gdal.CE_None:
-        return 'fail'
+    assert gdal.GetLastErrorType() == gdal.CE_None
 
-    if lyr.TestCapability(ogr.OLCFastFeatureCount) == 0:
-        return 'fail'
-    if lyr.TestCapability(ogr.OLCStringsAsUTF8) == 0:
-        return 'fail'
-    if lyr.TestCapability(ogr.OLCSequentialWrite) == 0:
-        return 'fail'
-    if lyr.TestCapability(ogr.OLCCreateField) == 0:
-        return 'fail'
-    if lyr.TestCapability(ogr.OLCCreateGeomField) == 0:
-        return 'fail'
+    assert lyr.TestCapability(ogr.OLCFastFeatureCount) != 0
+    assert lyr.TestCapability(ogr.OLCStringsAsUTF8) != 0
+    assert lyr.TestCapability(ogr.OLCSequentialWrite) != 0
+    assert lyr.TestCapability(ogr.OLCCreateField) != 0
+    assert lyr.TestCapability(ogr.OLCCreateGeomField) != 0
 
     feat = ogr.Feature(lyr.GetLayerDefn())
 
     gdal.FileFromMemBuffer(
         '/vsimem/fakeelasticsearch/foo/FeatureCollection/&POSTFIELDS={ "properties": { } }', '{}')
     ret = lyr.CreateFeature(feat)
-    if ret != 0:
-        return 'fail'
+    assert ret == 0
     feat = None
 
     gdal.FileFromMemBuffer('/vsimem/fakeelasticsearch/foo&CUSTOMREQUEST=PUT',
                            '{"error":"IndexAlreadyExistsException[[foo] already exists]","status":400}')
     with gdaltest.error_handler():
         lyr = ds.CreateLayer('foo', srs=ogrtest.srs_wgs84)
-    if gdal.GetLastErrorType() != gdal.CE_Failure:
-        return 'fail'
-    if lyr is not None:
-        return 'fail'
+    assert gdal.GetLastErrorType() == gdal.CE_Failure
+    assert lyr is None
 
     gdal.FileFromMemBuffer(
         """/vsimem/fakeelasticsearch/foo/FeatureCollection/_mapping&POSTFIELDS={ "FeatureCollection": { "properties": { "type": { "type": "string" }, "properties": { "properties": { } }, "geometry": { "type": "geo_shape" } } } }""", "")
@@ -229,8 +191,7 @@ def test_ogr_elasticsearch_1():
     ds.DeleteLayer(-1)
     ds.DeleteLayer(10)
     ret = ds.DeleteLayer(0)
-    if ret != 0:
-        return 'fail'
+    assert ret == 0
 
     gdal.FileFromMemBuffer(
         '/vsimem/fakeelasticsearch/foo2&CUSTOMREQUEST=PUT', '{}')
@@ -255,8 +216,7 @@ def test_ogr_elasticsearch_1():
     lyr.CreateField(ogr.FieldDefn('binary_field', ogr.OFTBinary))
 
     ret = lyr.SyncToDisk()
-    if ret != 0:
-        return 'fail'
+    assert ret == 0
 
     feat = ogr.Feature(lyr.GetLayerDefn())
     feat.SetField('str_field', 'a')
@@ -277,17 +237,14 @@ def test_ogr_elasticsearch_1():
     # Simulate server error
     with gdaltest.error_handler():
         ret = lyr.CreateFeature(feat)
-    if ret == 0:
-        return 'fail'
+    assert ret != 0
 
     # Success
     gdal.FileFromMemBuffer(
         '/vsimem/fakeelasticsearch/foo2/FeatureCollection/&POSTFIELDS={ "geometry": { "type": "POINT", "coordinates": [ 0.0, 1.0 ] }, "type": "Feature", "properties": { "str_field": "a", "int_field": 1, "int64_field": 123456789012, "real_field": 2.34, "boolean_field": true, "strlist_field": [ "a", "b" ], "intlist_field": [ 1, 2 ], "int64list_field": [ 123456789012, 2 ], "reallist_field": [ 1.23, 4.56 ], "date_field": "2015\/08\/12", "datetime_field": "2015\/08\/12 12:34:56.789", "time_field": "12:34:56.789", "binary_field": "ASNGV4mrze8=" } }', '{ "_id": "my_id" }')
     ret = lyr.CreateFeature(feat)
-    if ret != 0:
-        return 'fail'
-    if feat['_id'] != 'my_id':
-        return 'fail'
+    assert ret == 0
+    assert feat['_id'] == 'my_id'
 
     # DateTime with TZ
     gdal.FileFromMemBuffer(
@@ -295,8 +252,7 @@ def test_ogr_elasticsearch_1():
     feat = ogr.Feature(lyr.GetLayerDefn())
     feat['datetime_field'] = '2015/08/12 12:34:56.789+0300'
     ret = lyr.CreateFeature(feat)
-    if ret != 0:
-        return 'fail'
+    assert ret == 0
 
     # CreateFeature() with _id set
     gdal.FileFromMemBuffer(
@@ -304,28 +260,24 @@ def test_ogr_elasticsearch_1():
     feat = ogr.Feature(lyr.GetLayerDefn())
     feat['_id'] = 'my_id2'
     ret = lyr.CreateFeature(feat)
-    if ret != 0:
-        return 'fail'
+    assert ret == 0
 
     # Failed SetFeature because of missing _id
     feat = ogr.Feature(lyr.GetLayerDefn())
     with gdaltest.error_handler():
         ret = lyr.SetFeature(feat)
-    if ret == 0:
-        return 'fail'
+    assert ret != 0
 
     # Simulate server error
     feat['_id'] = 'my_id'
     with gdaltest.error_handler():
         ret = lyr.SetFeature(feat)
-    if ret == 0:
-        return 'fail'
+    assert ret != 0
 
     gdal.FileFromMemBuffer(
         '/vsimem/fakeelasticsearch/foo2/FeatureCollection/my_id&POSTFIELDS={ "properties": { } }', '{}')
     ret = lyr.SetFeature(feat)
-    if ret != 0:
-        return 'fail'
+    assert ret == 0
 
     # With explicit GEOM_MAPPING_TYPE=GEO_POINT
     gdal.FileFromMemBuffer(
@@ -340,8 +292,7 @@ def test_ogr_elasticsearch_1():
     feat = ogr.Feature(lyr.GetLayerDefn())
     feat.SetGeometry(ogr.CreateGeometryFromWkt('LINESTRING(0 0,1 1)'))
     ret = lyr.CreateFeature(feat)
-    if ret != 0:
-        return 'fail'
+    assert ret == 0
     feat = None
 
     # Test explicit MAPPING first with error case
@@ -350,16 +301,14 @@ def test_ogr_elasticsearch_1():
     with gdaltest.error_handler():
         lyr = ds.CreateLayer('foo4', srs=ogrtest.srs_wgs84, options=[
                              'MAPPING={ "FeatureCollection": { "properties": {} }}'])
-    if lyr is not None:
-        return 'fail'
+    assert lyr is None
 
     # Test successful explicit MAPPING with inline JSon mapping
     gdal.FileFromMemBuffer(
         '/vsimem/fakeelasticsearch/foo4/FeatureCollection/_mapping&POSTFIELDS={ "FeatureCollection": { "properties": {} }}', '{}')
     lyr = ds.CreateLayer('foo4', srs=ogrtest.srs_wgs84, options=[
                          'MAPPING={ "FeatureCollection": { "properties": {} }}'])
-    if lyr is None:
-        return 'fail'
+    assert lyr is not None
 
     # Test successful explicit MAPPING with reference to file with mapping
     gdal.FileFromMemBuffer(
@@ -369,8 +318,7 @@ def test_ogr_elasticsearch_1():
     lyr = ds.CreateLayer('foo4', srs=ogrtest.srs_wgs84,
                          options=['MAPPING=/vsimem/map.txt'])
     gdal.Unlink('/vsimem/map.txt')
-    if lyr is None:
-        return 'fail'
+    assert lyr is not None
 
     # Test successful explicit INDEX_DEFINITION with inline JSon mapping
     gdal.FileFromMemBuffer(
@@ -379,8 +327,7 @@ def test_ogr_elasticsearch_1():
         '/vsimem/fakeelasticsearch/foo4/FeatureCollection/_mapping&POSTFIELDS={}', '{}')
     lyr = ds.CreateLayer('foo4', srs=ogrtest.srs_wgs84, options=[
                          'INDEX_DEFINITION={}', 'MAPPING={}'])
-    if lyr is None:
-        return 'fail'
+    assert lyr is not None
 
     # Test successful explicit INDEX_DEFINITION with reference to file
     gdal.FileFromMemBuffer('/vsimem/map.txt', '{"foo":"bar"}')
@@ -389,8 +336,7 @@ def test_ogr_elasticsearch_1():
     lyr = ds.CreateLayer('foo4', srs=ogrtest.srs_wgs84,
                          options=['INDEX_DEFINITION=/vsimem/map.txt', 'MAPPING={}'])
     gdal.Unlink('/vsimem/map.txt')
-    if lyr is None:
-        return 'fail'
+    assert lyr is not None
 
     return 'success'
 
@@ -404,9 +350,7 @@ def test_ogr_elasticsearch_2():
 
     ds = ogrtest.elasticsearch_drv.CreateDataSource(
         "/vsimem/fakeelasticsearch")
-    if ds is None:
-        gdaltest.post_reason('did not managed to open ElasticSearch datastore')
-        return 'fail'
+    assert ds is not None, 'did not managed to open ElasticSearch datastore'
 
     gdal.FileFromMemBuffer(
         '/vsimem/fakeelasticsearch/foo&CUSTOMREQUEST=PUT', '{}')
@@ -422,8 +366,7 @@ def test_ogr_elasticsearch_2():
 
     gdal.FileFromMemBuffer('/vsimem/fakeelasticsearch/foo/FeatureCollection/&POSTFIELDS={ "geometry": { "type": "geometrycollection", "geometries": [ { "type": "point", "coordinates": [ 0.0, 1.0 ] }, { "type": "linestring", "coordinates": [ [ 0.0, 1.0 ], [ 2.0, 3.0 ] ] }, { "type": "polygon", "coordinates": [ [ [ 0.0, 0.0 ], [ 0.0, 10.0 ], [ 10.0, 10.0 ], [ 0.0, 0.0 ] ], [ [ 1.0, 1.0 ], [ 1.0, 9.0 ], [ 9.0, 9.0 ], [ 1.0, 1.0 ] ] ] }, { "type": "multipoint", "coordinates": [ [ 0.0, 1.0 ], [ 2.0, 3.0 ] ] }, { "type": "multilinestring", "coordinates": [ [ [ 0.0, 1.0 ], [ 2.0, 3.0 ] ], [ [ 4.0, 5.0 ], [ 6.0, 7.0 ] ] ] }, { "type": "multipolygon", "coordinates": [ [ [ [ 0.0, 0.0 ], [ 0.0, 10.0 ], [ 10.0, 10.0 ], [ 0.0, 0.0 ] ], [ [ 1.0, 1.0 ], [ 1.0, 9.0 ], [ 9.0, 9.0 ], [ 1.0, 1.0 ] ] ], [ [ [ -1.0, -1.0 ], [ -1.0, -9.0 ], [ -9.0, -9.0 ], [ -1.0, -1.0 ] ] ] ] } ] }, "type": "Feature", "properties": { } }', '{}')
     ret = lyr.CreateFeature(feat)
-    if ret != 0:
-        return 'fail'
+    assert ret == 0
     feat = None
 
     # Same but with explicit GEOM_MAPPING_TYPE=GEO_SHAPE
@@ -437,8 +380,7 @@ def test_ogr_elasticsearch_2():
         '/vsimem/fakeelasticsearch/foo/FeatureCollection/_mapping&POSTFIELDS={ "FeatureCollection": { "properties": { "type": { "type": "string" }, "properties": { "properties": { } }, "geometry": { "type": "geo_shape", "precision": "1m" } } } }', '{}')
 
     ret = lyr.CreateFeature(feat)
-    if ret != 0:
-        return 'fail'
+    assert ret == 0
     feat = None
 
     return 'success'
@@ -453,9 +395,7 @@ def test_ogr_elasticsearch_3():
 
     ds = ogrtest.elasticsearch_drv.CreateDataSource(
         "/vsimem/fakeelasticsearch")
-    if ds is None:
-        gdaltest.post_reason('did not managed to open ElasticSearch datastore')
-        return 'fail'
+    assert ds is not None, 'did not managed to open ElasticSearch datastore'
 
     gdal.FileFromMemBuffer(
         '/vsimem/fakeelasticsearch/name_laundering&CUSTOMREQUEST=PUT', '{}')
@@ -466,19 +406,16 @@ def test_ogr_elasticsearch_3():
         'NAME/laundering', srs=ogrtest.srs_wgs84, options=['FID='])
     feat = ogr.Feature(lyr.GetLayerDefn())
     ret = lyr.CreateFeature(feat)
-    if ret != 0:
-        return 'fail'
+    assert ret == 0
     feat = None
 
     with gdaltest.error_handler():
         ret = lyr.SyncToDisk()
-    if ret == 0:
-        return 'fail'
+    assert ret != 0
 
     feat = ogr.Feature(lyr.GetLayerDefn())
     ret = lyr.CreateFeature(feat)
-    if ret != 0:
-        return 'fail'
+    assert ret == 0
     feat = None
 
     gdal.FileFromMemBuffer("""/vsimem/fakeelasticsearch/_bulk&POSTFIELDS={"index" :{"_index":"name_laundering", "_type":"FeatureCollection"}}
@@ -486,8 +423,7 @@ def test_ogr_elasticsearch_3():
 
 """, '{}')
     ret = lyr.SyncToDisk()
-    if ret != 0:
-        return 'fail'
+    assert ret == 0
 
     ds = None
 
@@ -503,18 +439,14 @@ def test_ogr_elasticsearch_4():
 
     with gdaltest.error_handler():
         ds = ogr.Open('ES:/vsimem/fakeelasticsearch')
-    if ds is None:
-        return 'fail'
+    assert ds is not None
 
     # Test case where there's no index
     gdal.FileFromMemBuffer(
         """/vsimem/fakeelasticsearch/_cat/indices?h=i""", '\n')
     ds = ogr.Open('ES:/vsimem/fakeelasticsearch')
-    if ds is None:
-        return 'fail'
-    if ds.GetLayerCount() != 0:
-        print(ds.GetLayerCount())
-        return 'fail'
+    assert ds is not None
+    assert ds.GetLayerCount() == 0
 
     # Test opening a layer by name
     gdal.FileFromMemBuffer("""/vsimem/fakeelasticsearch/a_layer/_mapping?pretty""", """
@@ -583,42 +515,33 @@ def test_ogr_elasticsearch_4():
 """)
 
     ds = ogr.Open('ES:/vsimem/fakeelasticsearch')
-    if ds is None:
-        return 'fail'
+    assert ds is not None
     lyr = ds.GetLayerByName('a_layer')
-    if lyr is None:
-        return 'fail'
+    assert lyr is not None
     lyr = ds.GetLayerByName('a_layer')
-    if lyr is None:
-        return 'fail'
+    assert lyr is not None
     with gdaltest.error_handler():
         lyr = ds.GetLayerByName('not_a_layer')
-    if lyr is not None:
-        return 'fail'
+    assert lyr is None
     ds = None
 
     # Test LAYER open option
     ds = gdal.OpenEx('ES:/vsimem/fakeelasticsearch',
                      open_options=['LAYER=a_layer'])
-    if ds.GetLayerCount() != 1:
-        print(ds.GetLayerCount())
-        return 'fail'
+    assert ds.GetLayerCount() == 1
     ds = None
 
     with gdaltest.error_handler():
         ds = gdal.OpenEx('ES:/vsimem/fakeelasticsearch',
                          open_options=['LAYER=not_a_layer'])
-    if ds is not None:
-        return 'fail'
+    assert ds is None
     ds = None
 
     # Test GetLayerByName() and GetLayerCount()
     ds = ogr.Open('ES:/vsimem/fakeelasticsearch')
     lyr = ds.GetLayerByName('a_layer')
     lyr = ds.GetLayerByName('a_layer')
-    if ds.GetLayerCount() != 1:
-        print(ds.GetLayerCount())
-        return 'fail'
+    assert ds.GetLayerCount() == 1
     ds = None
 
     # Test GetLayerCount()
@@ -626,23 +549,17 @@ def test_ogr_elasticsearch_4():
         """/vsimem/fakeelasticsearch/_cat/indices?h=i""", 'a_layer  \n')
 
     ds = ogr.Open('ES:/vsimem/fakeelasticsearch')
-    if ds is None:
-        return 'fail'
-    if ds.GetLayerCount() != 1:
-        print(ds.GetLayerCount())
-        return 'fail'
+    assert ds is not None
+    assert ds.GetLayerCount() == 1
     lyr = ds.GetLayer(0)
 
     with gdaltest.error_handler():
         lyr_defn = lyr.GetLayerDefn()
     idx = lyr_defn.GetFieldIndex("strlist_field")
-    if lyr_defn.GetFieldDefn(idx).GetType() != ogr.OFTStringList:
-        return 'fail'
+    assert lyr_defn.GetFieldDefn(idx).GetType() == ogr.OFTStringList
     idx = lyr_defn.GetGeomFieldIndex("a_geoshape")
-    if lyr_defn.GetGeomFieldDefn(idx).GetType() != ogr.wkbLineString:
-        return 'fail'
-    if lyr.GetFIDColumn() != 'my_fid':
-        return 'fail'
+    assert lyr_defn.GetGeomFieldDefn(idx).GetType() == ogr.wkbLineString
+    assert lyr.GetFIDColumn() == 'my_fid'
 
     gdal.FileFromMemBuffer("""/vsimem/fakeelasticsearch/a_layer/FeatureCollection/_count?pretty""", """{
 }""")
@@ -668,21 +585,18 @@ def test_ogr_elasticsearch_4():
     }
 }""")
     fc = lyr.GetFeatureCount()
-    if fc != 3:
-        return 'fail'
+    assert fc == 3
 
     with gdaltest.error_handler():
         f = lyr.GetNextFeature()
-    if f is not None:
-        return 'fail'
+    assert f is None
 
     gdal.FileFromMemBuffer("""/vsimem/fakeelasticsearch/a_layer/FeatureCollection/_search?scroll=1m&size=100""", """{
 
 }""")
     lyr.ResetReading()
     f = lyr.GetNextFeature()
-    if f is not None:
-        return 'fail'
+    assert f is None
 
     gdal.FileFromMemBuffer("""/vsimem/fakeelasticsearch/a_layer/FeatureCollection/_search?scroll=1m&size=100""", """{
     "hits": null
@@ -748,9 +662,7 @@ def test_ogr_elasticsearch_4():
     ds = ogr.Open('ES:/vsimem/fakeelasticsearch')
     lyr = ds.GetLayer(0)
 
-    if lyr.GetLayerDefn().GetFieldCount() != 15:
-        print(lyr.GetLayerDefn().GetFieldCount())
-        return 'fail'
+    assert lyr.GetLayerDefn().GetFieldCount() == 15
 
     gdal.FileFromMemBuffer("""/vsimem/fakeelasticsearch/a_layer/FeatureCollection/_search?scroll=1m&size=100""", """{
     "_scroll_id": "my_scrollid",
@@ -802,8 +714,7 @@ def test_ogr_elasticsearch_4():
 
     lyr.ResetReading()
     f = lyr.GetNextFeature()
-    if f is None:
-        return 'fail'
+    assert f is not None
     if f.GetFID() != 5 or f['_id'] != 'my_id' or f['str_field'] != 'foo' or f['int_field'] != 1 or f['int64_field'] != 123456789012 or \
        f['double_field'] != 1.23 or f['float_field'] != 3.45 or f['boolean_field'] != 1 or \
        f['binary_field'] != '0123465789ABCDEF' or f['dt_field'] != '2015/08/12 12:34:56.789' or \
@@ -820,8 +731,7 @@ def test_ogr_elasticsearch_4():
     lyr.ResetReading()
     lyr.GetNextFeature()
     f = lyr.GetNextFeature()
-    if f is None:
-        return 'fail'
+    assert f is not None
 
     gdal.FileFromMemBuffer("""/vsimem/fakeelasticsearch/_search/scroll?scroll=1m&scroll_id=my_scrollid""", """{
     "hits":
@@ -839,8 +749,7 @@ def test_ogr_elasticsearch_4():
     }
 }""")
     f = lyr.GetNextFeature()
-    if f['int_field'] != 2:
-        return 'fail'
+    assert f['int_field'] == 2
 
     gdal.FileFromMemBuffer("""/vsimem/fakeelasticsearch/_search/scroll?scroll=1m&scroll_id=my_scrollid""", """{
     "hits":
@@ -849,11 +758,9 @@ def test_ogr_elasticsearch_4():
     }
 }""")
     f = lyr.GetNextFeature()
-    if f is not None:
-        return 'fail'
+    assert f is None
     f = lyr.GetNextFeature()
-    if f is not None:
-        return 'fail'
+    assert f is None
 
     lyr.SetSpatialFilterRect(1, 48, 3, 50)
     lyr.ResetReading()
@@ -877,8 +784,7 @@ def test_ogr_elasticsearch_4():
     }
 }""")
     f = lyr.GetNextFeature()
-    if f['int_field'] != 3:
-        return 'fail'
+    assert f['int_field'] == 3
 
     lyr.SetSpatialFilterRect(1, 1, 48, 3, 50)
     lyr.ResetReading()
@@ -902,8 +808,7 @@ def test_ogr_elasticsearch_4():
     }
 }""")
     f = lyr.GetNextFeature()
-    if f['int_field'] != 4:
-        return 'fail'
+    assert f['int_field'] == 4
 
     gdal.FileFromMemBuffer("""/vsimem/fakeelasticsearch/a_layer/FeatureCollection/_search?pretty&POSTFIELDS={ "size": 0, "query": { "constant_score" : { "filter": { "geo_bounding_box": { "a_geopoint.coordinates": { "top_left": { "lat": 50.0, "lon": 1.0 }, "bottom_right": { "lat": 48.0, "lon": 3.0 } } } } } } }""", """{
     "hits":
@@ -912,8 +817,7 @@ def test_ogr_elasticsearch_4():
     }
 }""")
     fc = lyr.GetFeatureCount()
-    if fc != 10:
-        return 'fail'
+    assert fc == 10
 
     lyr.SetSpatialFilter(None)
     lyr.SetSpatialFilterRect(-180, -90, 180, 90)
@@ -943,8 +847,7 @@ def test_ogr_elasticsearch_4():
     }
 }""")
     f = lyr.GetNextFeature()
-    if f['int_field'] != 5:
-        return 'fail'
+    assert f['int_field'] == 5
     lyr.SetAttributeFilter(None)
 
     sql_lyr = ds.ExecuteSQL("{ 'FOO' : 'BAR' }", dialect='ES')
@@ -1039,41 +942,33 @@ def test_ogr_elasticsearch_4():
   }
 }""")
     bbox = lyr.GetExtent(geom_field=1)
-    if bbox != (1.0, 2.0, 9.0, 10.0):
-        print(bbox)
-        return 'fail'
+    assert bbox == (1.0, 2.0, 9.0, 10.0)
 
     # Operations not available in read-only mode
     with gdaltest.error_handler():
         ret = lyr.CreateField(ogr.FieldDefn('foo', ogr.OFTString))
-    if ret == 0:
-        return 'fail'
+    assert ret != 0
 
     with gdaltest.error_handler():
         ret = lyr.CreateGeomField(ogr.GeomFieldDefn('shape', ogr.wkbPoint))
-    if ret == 0:
-        return 'fail'
+    assert ret != 0
 
     with gdaltest.error_handler():
         ret = lyr.CreateFeature(ogr.Feature(lyr.GetLayerDefn()))
-    if ret == 0:
-        return 'fail'
+    assert ret != 0
 
     lyr.ResetReading()
     with gdaltest.error_handler():
         ret = lyr.SetFeature(lyr.GetNextFeature())
-    if ret == 0:
-        return 'fail'
+    assert ret != 0
 
     with gdaltest.error_handler():
         lyr = ds.CreateLayer('will_not_work')
-    if lyr is not None:
-        return 'fail'
+    assert lyr is None
 
     with gdaltest.error_handler():
         ret = ds.DeleteLayer(0)
-    if ret == 0:
-        return 'fail'
+    assert ret != 0
 
     return 'success'
 
@@ -1105,8 +1000,7 @@ def test_ogr_elasticsearch_5():
     gdal.FileFromMemBuffer(
         '/vsimem/fakeelasticsearch/non_geojson/my_mapping/&POSTFIELDS={ "ogc_fid": 5, "str": "foo" }', '{}')
     ret = lyr.CreateFeature(feat)
-    if ret != 0:
-        return 'fail'
+    assert ret == 0
     feat = None
 
     ds = None
@@ -1215,8 +1109,7 @@ def test_ogr_elasticsearch_5():
     }
 }""")
     index = lyr.GetLayerDefn().GetFieldIndex('another_field')
-    if index < 0:
-        return 'fail'
+    assert index >= 0
     f = lyr.GetNextFeature()
     if f['str_field'] != 'foo' or \
        f['superobject.subfield'] != '5' or \
@@ -1234,8 +1127,7 @@ def test_ogr_elasticsearch_5():
     gdal.FileFromMemBuffer(
         """/vsimem/fakeelasticsearch/non_geojson/my_mapping/my_id&POSTFIELDS={ "a_geoshape": { "type": "linestring", "coordinates": [ [ 2.0, 49.0 ], [ 3.0, 50.0 ] ] }, "a_geopoint": { "type": "POINT", "coordinates": [ 2.0, 49.0 ] }, "another_geopoint": [ 2.5, 49.5 ], "superobject": { "another_geoshape": { "type": "point", "coordinates": [ 3.0, 50.0 ] }, "another_geoshape2": { "type": "point", "coordinates": [ 2.0, 50.0 ] }, "subfield": "5", "subobject": { "subfield": "foo", "another_subfield": 6 } }, "str_field": "foo" }""", "{}")
     ret = lyr.SetFeature(f)
-    if ret != 0:
-        return 'fail'
+    assert ret == 0
 
     f = lyr.GetNextFeature()
     if f['another_geopoint'].ExportToWkt() != 'POINT (2.1 49.1)':
@@ -1285,8 +1177,7 @@ def test_ogr_elasticsearch_5():
                      'FEATURE_COUNT_TO_ESTABLISH_FEATURE_DEFN=0', 'FLATTEN_NESTED_ATTRIBUTES=FALSE'])
     lyr = ds.GetLayer(0)
     index = lyr.GetLayerDefn().GetFieldIndex('another_field')
-    if index >= 0:
-        return 'fail'
+    assert index < 0
     f = lyr.GetNextFeature()
     if f['str_field'] != 'foo' or \
        f['superobject'] != '{ "subfield": 5, "subobject": { "subfield": "foo", "another_subfield": 6 }, "another_geoshape": { "type": "point", "coordinates": [ 3, 50 ] }, "another_geoshape2": { "type": "point", "coordinates": [ 2, 50 ] } }' or \
@@ -1313,8 +1204,7 @@ def test_ogr_elasticsearch_5():
     gdal.FileFromMemBuffer(
         """/vsimem/fakeelasticsearch/non_geojson/my_mapping/my_id&POSTFIELDS={ "foo": "bar" }""", "{}")
     ret = lyr.SetFeature(f)
-    if ret != 0:
-        return 'fail'
+    assert ret == 0
 
     return 'success'
 
@@ -1438,16 +1328,13 @@ def test_ogr_elasticsearch_7():
     ds = None
 
     f = gdal.VSIFOpenL('/vsimem/map.txt', 'rb')
-    if f is None:
-        return 'fail'
+    assert f is not None
     data = gdal.VSIFReadL(1, 10000, f).decode('ascii')
     gdal.VSIFCloseL(f)
 
     gdal.Unlink('/vsimem/map.txt')
 
-    if data != '{ "FeatureCollection": { "properties": { "type": { "type": "string" }, "properties": { "properties": { } }, "geometry": { "type": "geo_shape" } } } }':
-        print(data)
-        return 'fail'
+    assert data == '{ "FeatureCollection": { "properties": { "type": { "type": "string" }, "properties": { "properties": { } }, "geometry": { "type": "geo_shape" } } } }'
 
     return 'success'
 
@@ -1472,9 +1359,7 @@ def test_ogr_elasticsearch_8():
     gdal.ErrorReset()
     with gdaltest.error_handler():
         lyr = ds.CreateLayer('no_srs')
-    if gdal.GetLastErrorType() != gdal.CE_Warning:
-        gdaltest.post_reason('warning expected')
-        return 'fail'
+    assert gdal.GetLastErrorType() == gdal.CE_Warning, 'warning expected'
     f = ogr.Feature(lyr.GetLayerDefn())
     f.SetGeometry(ogr.CreateGeometryFromWkt('POINT (-100 -200)'))
     gdal.FileFromMemBuffer(
@@ -1487,11 +1372,8 @@ def test_ogr_elasticsearch_8():
     gdal.ErrorReset()
     with gdaltest.error_handler():
         ret = lyr.CreateFeature(f)
-    if gdal.GetLastErrorType() != gdal.CE_Warning:
-        gdaltest.post_reason('warning expected')
-        return 'fail'
-    if ret != 0:
-        return 'fail'
+    assert gdal.GetLastErrorType() == gdal.CE_Warning, 'warning expected'
+    assert ret == 0
 
     # Non EPSG-4326 SRS
     other_srs = osr.SpatialReference()
@@ -1508,8 +1390,7 @@ def test_ogr_elasticsearch_8():
 
 """, "{}")
     ret = lyr.CreateFeature(f)
-    if ret != 0:
-        return 'fail'
+    assert ret == 0
 
     return 'success'
 
@@ -1593,8 +1474,7 @@ def test_ogr_elasticsearch_9():
 }""")
 
     count = lyr.GetFeatureCount()
-    if count != 2:
-        return 'fail'
+    assert count == 2
 
     gdal.FileFromMemBuffer("""/vsimem/fakeelasticsearch/a_layer/FeatureCollection/_search?scroll=1m&size=100&POSTFIELDS={ "query": { "constant_score" : { "filter": { "geo_shape": { "a_geoshape": { "shape": { "type": "envelope", "coordinates": [ [ 2.0, 50.0 ], [ 3.0, 49.0 ] ] } } } } } } }""",
                            """{
@@ -1618,8 +1498,7 @@ def test_ogr_elasticsearch_9():
     }
 }""")
     f = lyr.GetNextFeature()
-    if f is None:
-        return 'fail'
+    assert f is not None
 
     return 'success'
 
@@ -1703,8 +1582,7 @@ def test_ogr_elasticsearch_10():
     }
 }""")
     f = lyr.GetNextFeature()
-    if f is None:
-        return 'fail'
+    assert f is not None
 
     lyr.SetAttributeFilter("text_field = 'foo'")
     gdal.FileFromMemBuffer("""/vsimem/fakeelasticsearch/a_layer/FeatureCollection/_search?scroll=1m&size=100&POSTFIELDS={ "query": { "constant_score" : { "filter": { "match": { "properties.text_field": "foo" } } } } }""",
@@ -1725,8 +1603,7 @@ def test_ogr_elasticsearch_10():
     }
 }""")
     f = lyr.GetNextFeature()
-    if f is None:
-        return 'fail'
+    assert f is not None
 
     lyr.SetAttributeFilter("text_field_with_raw = 'foo'")
     gdal.FileFromMemBuffer("""/vsimem/fakeelasticsearch/a_layer/FeatureCollection/_search?scroll=1m&size=100&POSTFIELDS={ "query": { "constant_score" : { "filter": { "term": { "properties.text_field_with_raw.raw": "foo" } } } } }""",
@@ -1747,8 +1624,7 @@ def test_ogr_elasticsearch_10():
     }
 }""")
     f = lyr.GetNextFeature()
-    if f is None:
-        return 'fail'
+    assert f is not None
 
     lyr.SetAttributeFilter("\"_id\" = 'my_id2'")
     gdal.FileFromMemBuffer("""/vsimem/fakeelasticsearch/a_layer/FeatureCollection/_search?scroll=1m&size=100&POSTFIELDS={ "query": { "constant_score" : { "filter": { "ids": { "values": [ "my_id2" ] } } } } }""",
@@ -1768,8 +1644,7 @@ def test_ogr_elasticsearch_10():
     }
 }""")
     f = lyr.GetNextFeature()
-    if f is None:
-        return 'fail'
+    assert f is not None
 
     lyr.SetAttributeFilter("keyword_field != 'foo'")
     gdal.FileFromMemBuffer("""/vsimem/fakeelasticsearch/a_layer/FeatureCollection/_search?scroll=1m&size=100&POSTFIELDS={ "query": { "constant_score" : { "filter": { "bool": { "must_not": { "term": { "properties.keyword_field": "foo" } } } } } } }""",
@@ -1790,8 +1665,7 @@ def test_ogr_elasticsearch_10():
     }
 }""")
     f = lyr.GetNextFeature()
-    if f is None:
-        return 'fail'
+    assert f is not None
 
     lyr.SetAttributeFilter("keyword_field IS NULL")
     gdal.FileFromMemBuffer("""/vsimem/fakeelasticsearch/a_layer/FeatureCollection/_search?scroll=1m&size=100&POSTFIELDS={ "query": { "constant_score" : { "filter": { "bool": { "must_not": { "exists": { "field": "properties.keyword_field" } } } } } } }""",
@@ -1811,8 +1685,7 @@ def test_ogr_elasticsearch_10():
     }
 }""")
     f = lyr.GetNextFeature()
-    if f is None:
-        return 'fail'
+    assert f is not None
 
     lyr.SetAttributeFilter("keyword_field BETWEEN 'bar' AND 'foo'")
     gdal.FileFromMemBuffer("""/vsimem/fakeelasticsearch/a_layer/FeatureCollection/_search?scroll=1m&size=100&POSTFIELDS={ "query": { "constant_score" : { "filter": { "range": { "properties.keyword_field": { "gte": "bar", "lte": "foo" } } } } } }""",
@@ -1833,8 +1706,7 @@ def test_ogr_elasticsearch_10():
     }
 }""")
     f = lyr.GetNextFeature()
-    if f is None:
-        return 'fail'
+    assert f is not None
 
     lyr.SetAttributeFilter("keyword_field IN ('foo', 'bar')")
     gdal.FileFromMemBuffer("""/vsimem/fakeelasticsearch/a_layer/FeatureCollection/_search?scroll=1m&size=100&POSTFIELDS={ "query": { "constant_score" : { "filter": { "terms": { "properties.keyword_field": [ "foo", "bar" ] } } } } }""",
@@ -1855,8 +1727,7 @@ def test_ogr_elasticsearch_10():
     }
 }""")
     f = lyr.GetNextFeature()
-    if f is None:
-        return 'fail'
+    assert f is not None
 
     lyr.SetAttributeFilter("text_field IN ('foo', 'bar')")
     gdal.FileFromMemBuffer("""/vsimem/fakeelasticsearch/a_layer/FeatureCollection/_search?scroll=1m&size=100&POSTFIELDS={ "query": { "constant_score" : { "filter": { "bool": { "should": [ { "match": { "properties.text_field": "foo" } }, { "match": { "properties.text_field": "bar" } } ] } } } } }""",
@@ -1877,8 +1748,7 @@ def test_ogr_elasticsearch_10():
     }
 }""")
     f = lyr.GetNextFeature()
-    if f is None:
-        return 'fail'
+    assert f is not None
 
     lyr.SetAttributeFilter("text_field_with_raw IN ('foo', 'bar')")
     gdal.FileFromMemBuffer("""/vsimem/fakeelasticsearch/a_layer/FeatureCollection/_search?scroll=1m&size=100&POSTFIELDS={ "query": { "constant_score" : { "filter": { "terms": { "properties.text_field_with_raw.raw": [ "foo", "bar" ] } } } } }""",
@@ -1899,8 +1769,7 @@ def test_ogr_elasticsearch_10():
     }
 }""")
     f = lyr.GetNextFeature()
-    if f is None:
-        return 'fail'
+    assert f is not None
 
     lyr.SetAttributeFilter("\"_id\" IN ('my_id', 'bar')")
     gdal.FileFromMemBuffer("""/vsimem/fakeelasticsearch/a_layer/FeatureCollection/_search?scroll=1m&size=100&POSTFIELDS={ "query": { "constant_score" : { "filter": { "ids": { "values": [ "my_id", "bar" ] } } } } }""",
@@ -1921,8 +1790,7 @@ def test_ogr_elasticsearch_10():
     }
 }""")
     f = lyr.GetNextFeature()
-    if f is None:
-        return 'fail'
+    assert f is not None
 
     lyr.SetAttributeFilter(
         "int_field >= 2 OR long_field >= 9876543210 OR double_field <= 3.123456")
@@ -1946,8 +1814,7 @@ def test_ogr_elasticsearch_10():
     }
 }""")
     f = lyr.GetNextFeature()
-    if f is None:
-        return 'fail'
+    assert f is not None
 
     lyr.SetAttributeFilter("dt_field > '2016/01/01 12:34:56.123'")
     gdal.FileFromMemBuffer("""/vsimem/fakeelasticsearch/a_layer/FeatureCollection/_search?scroll=1m&size=100&POSTFIELDS={ "query": { "constant_score" : { "filter": { "range": { "properties.dt_field": { "gt": "2016\/01\/01 12:34:56.123" } } } } } }""",
@@ -1968,8 +1835,7 @@ def test_ogr_elasticsearch_10():
     }
 }""")
     f = lyr.GetNextFeature()
-    if f is None:
-        return 'fail'
+    assert f is not None
 
     lyr.SetAttributeFilter("NOT dt_field < '2016/01/01 12:34:56.123'")
     gdal.FileFromMemBuffer("""/vsimem/fakeelasticsearch/a_layer/FeatureCollection/_search?scroll=1m&size=100&POSTFIELDS={ "query": { "constant_score" : { "filter": { "bool": { "must_not": { "range": { "properties.dt_field": { "lt": "2016\/01\/01 12:34:56.123" } } } } } } } }""",
@@ -1990,8 +1856,7 @@ def test_ogr_elasticsearch_10():
     }
 }""")
     f = lyr.GetNextFeature()
-    if f is None:
-        return 'fail'
+    assert f is not None
 
     lyr.SetAttributeFilter("keyword_field LIKE '_o%'")
     gdal.FileFromMemBuffer("""/vsimem/fakeelasticsearch/a_layer/FeatureCollection/_search?scroll=1m&size=100&POSTFIELDS={ "query": { "constant_score" : { "filter": { "wildcard": { "properties.keyword_field": "?o*" } } } } }""",
@@ -2012,8 +1877,7 @@ def test_ogr_elasticsearch_10():
     }
 }""")
     f = lyr.GetNextFeature()
-    if f is None:
-        return 'fail'
+    assert f is not None
 
     # Evaluated client-side since the pattern uses ? or *
     lyr.SetAttributeFilter("text_field LIKE '?*'")
@@ -2035,8 +1899,7 @@ def test_ogr_elasticsearch_10():
     }
 }""")
     f = lyr.GetNextFeature()
-    if f is None:
-        return 'fail'
+    assert f is not None
 
     # Evaluated client-side since the field is analyzed
     lyr.SetAttributeFilter("text_field LIKE '_Z%'")
@@ -2058,8 +1921,7 @@ def test_ogr_elasticsearch_10():
     }
 }""")
     f = lyr.GetNextFeature()
-    if f is None:
-        return 'fail'
+    assert f is not None
 
     lyr.SetAttributeFilter("text_field_with_raw LIKE '_xo%' ESCAPE 'x'")
     gdal.FileFromMemBuffer("""/vsimem/fakeelasticsearch/a_layer/FeatureCollection/_search?scroll=1m&size=100&POSTFIELDS={ "query": { "constant_score" : { "filter": { "wildcard": { "properties.text_field_with_raw.raw": "?o*" } } } } }""",
@@ -2080,8 +1942,7 @@ def test_ogr_elasticsearch_10():
     }
 }""")
     f = lyr.GetNextFeature()
-    if f is None:
-        return 'fail'
+    assert f is not None
 
     lyr.SetAttributeFilter("keyword_field = 'foo' AND 1 = 1")
     gdal.FileFromMemBuffer("""/vsimem/fakeelasticsearch/a_layer/FeatureCollection/_search?scroll=1m&size=100&POSTFIELDS={ "query": { "constant_score" : { "filter": { "term": { "properties.keyword_field": "foo" } } } } }""",
@@ -2102,13 +1963,11 @@ def test_ogr_elasticsearch_10():
     }
 }""")
     f = lyr.GetNextFeature()
-    if f is None:
-        return 'fail'
+    assert f is not None
 
     lyr.SetAttributeFilter("1 = 1 AND keyword_field = 'foo'")
     f = lyr.GetNextFeature()
-    if f is None:
-        return 'fail'
+    assert f is not None
 
     lyr.SetAttributeFilter("keyword_field = 'bar' OR 1 = 0")
     gdal.FileFromMemBuffer("""/vsimem/fakeelasticsearch/a_layer/FeatureCollection/_search?scroll=1m&size=100""",
@@ -2129,8 +1988,7 @@ def test_ogr_elasticsearch_10():
     }
 }""")
     f = lyr.GetNextFeature()
-    if f is None:
-        return 'fail'
+    assert f is not None
 
     lyr.SetAttributeFilter("keyword_field = 'foo2'")
     lyr.SetSpatialFilterRect(2, 49, 2, 49)
@@ -2156,15 +2014,13 @@ def test_ogr_elasticsearch_10():
     }
 }""")
     f = lyr.GetNextFeature()
-    if f is None:
-        return 'fail'
+    assert f is not None
 
     # SQL with WHERE
     sql_lyr = ds.ExecuteSQL(
         "SELECT * FROM a_layer WHERE keyword_field = 'foo'")
     f = sql_lyr.GetNextFeature()
-    if f is None:
-        return 'fail'
+    assert f is not None
     ds.ReleaseResultSet(sql_lyr)
 
     # SQL with WHERE and ORDER BY
@@ -2188,8 +2044,7 @@ def test_ogr_elasticsearch_10():
     }
 }""")
     f = sql_lyr.GetNextFeature()
-    if f is None:
-        return 'fail'
+    assert f is not None
     ds.ReleaseResultSet(sql_lyr)
 
     # SQL with ORDER BY only
@@ -2212,8 +2067,7 @@ def test_ogr_elasticsearch_10():
     }
 }""")
     f = sql_lyr.GetNextFeature()
-    if f is None:
-        return 'fail'
+    assert f is not None
     ds.ReleaseResultSet(sql_lyr)
 
     # SQL with ORDER BY on a text field with a raw sub-field
@@ -2236,8 +2090,7 @@ def test_ogr_elasticsearch_10():
     }
 }""")
     f = sql_lyr.GetNextFeature()
-    if f is None:
-        return 'fail'
+    assert f is not None
     ds.ReleaseResultSet(sql_lyr)
 
     return 'success'
@@ -2362,17 +2215,14 @@ def test_ogr_elasticsearch_11():
     f = ogr.Feature(lyr.GetLayerDefn())
     f.SetFieldNull('str_field')
     ret = lyr.CreateFeature(f)
-    if ret != 0:
-        return 'fail'
+    assert ret == 0
     f = None
 
     f = ogr.Feature(lyr.GetLayerDefn())
     ret = lyr.CreateFeature(f)
-    if ret != 0:
-        return 'fail'
+    assert ret == 0
     f = None
-    if lyr.SyncToDisk() != 0:
-        return 'fail'
+    assert lyr.SyncToDisk() == 0
 
     return 'success'
 
@@ -2418,8 +2268,7 @@ def test_ogr_elasticsearch_authentication():
 
     ds = gdal.OpenEx('ES:/vsimem/fakeelasticsearch',
                      open_options=['USERPWD=user:pwd'])
-    if ds is None:
-        return 'fail'
+    assert ds is not None
 
     return 'success'
 
diff --git a/autotest/ogr/ogr_factory.py b/autotest/ogr/ogr_factory.py
index 7ccdd3ed4d61..7f6252738c68 100755
--- a/autotest/ogr/ogr_factory.py
+++ b/autotest/ogr/ogr_factory.py
@@ -37,6 +37,7 @@
 import gdaltest
 from osgeo import gdal
 from osgeo import ogr
+import pytest
 
 
 def save_as_csv(geom, filename):
@@ -53,8 +54,7 @@ def test_ogr_factory_1():
 
     expected_geom = 'LINESTRING (21.75 33.031088913245533 40,22.374083449152831 32.648634669593925 40,22.972155943227843 32.237161430239802 40,23.537664874825239 31.801177382099848 40,24.064414409750082 31.345459257641004 40,24.546633369868303 30.875 40,24.979038463342047 30.394954059253475 40,25.356892169480634 29.910580919184319 40,25.676054644008637 29.427187473276717 40,25.933029076066084 28.95006988128063 40,26.125 28.484455543377237 40,26.249864142195264 28.035445827688662 40,26.306253464980482 27.607960178621322 40,26.293550155134998 27.206682218403525 40,26.211893392779814 26.836008432340218 40,26.062177826491073 26.5 40)'
 
-    if ogrtest.check_feature_geometry(geom, expected_geom):
-        return 'fail'
+    assert not ogrtest.check_feature_geometry(geom, expected_geom)
     return 'success'
 
 ###############################################################################
@@ -69,9 +69,7 @@ def test_ogr_factory_2():
     src_geom = ogr.CreateGeometryFromWkt(src_wkt)
     dst_geom = ogr.ForceToPolygon(src_geom)
 
-    if ogrtest.check_feature_geometry(dst_geom, exp_wkt):
-        print(dst_geom.ExportToWkt())
-        return 'fail'
+    assert not ogrtest.check_feature_geometry(dst_geom, exp_wkt), dst_geom.ExportToWkt()
 
     src_wkt = 'MULTISURFACE (((0 0,100 0,100 100,0 0)))'
     exp_wkt = 'POLYGON((0 0,100 0,100 100,0 0))'
@@ -79,9 +77,7 @@ def test_ogr_factory_2():
     src_geom = ogr.CreateGeometryFromWkt(src_wkt)
     dst_geom = ogr.ForceToPolygon(src_geom)
 
-    if ogrtest.check_feature_geometry(dst_geom, exp_wkt):
-        print(dst_geom.ExportToWkt())
-        return 'fail'
+    assert not ogrtest.check_feature_geometry(dst_geom, exp_wkt), dst_geom.ExportToWkt()
 
     src_wkt = 'CURVEPOLYGON ((0 0,100 0,100 100,0 0))'
     exp_wkt = 'POLYGON((0 0,100 0,100 100,0 0))'
@@ -89,9 +85,7 @@ def test_ogr_factory_2():
     src_geom = ogr.CreateGeometryFromWkt(src_wkt)
     dst_geom = ogr.ForceToPolygon(src_geom)
 
-    if ogrtest.check_feature_geometry(dst_geom, exp_wkt):
-        print(dst_geom.ExportToWkt())
-        return 'fail'
+    assert not ogrtest.check_feature_geometry(dst_geom, exp_wkt), dst_geom.ExportToWkt()
 
     src_wkt = 'CURVEPOLYGON (CIRCULARSTRING(0 0,0 1,0 2,1 2,2 2,2 1,2 0,1 0,0 0))'
     exp_wkt = 'POLYGON ((0 0,0 1,0 2,1 2,2 2,2 1,2 0,1 0,0 0))'
@@ -99,9 +93,7 @@ def test_ogr_factory_2():
     src_geom = ogr.CreateGeometryFromWkt(src_wkt)
     dst_geom = ogr.ForceToPolygon(src_geom)
 
-    if ogrtest.check_feature_geometry(dst_geom, exp_wkt):
-        print(dst_geom.ExportToWkt())
-        return 'fail'
+    assert not ogrtest.check_feature_geometry(dst_geom, exp_wkt), dst_geom.ExportToWkt()
 
     return 'success'
 
@@ -117,9 +109,7 @@ def test_ogr_factory_3():
     src_geom = ogr.CreateGeometryFromWkt(src_wkt)
     dst_geom = ogr.ForceToMultiPolygon(src_geom)
 
-    if ogrtest.check_feature_geometry(dst_geom, exp_wkt):
-        print(dst_geom.ExportToWkt())
-        return 'fail'
+    assert not ogrtest.check_feature_geometry(dst_geom, exp_wkt), dst_geom.ExportToWkt()
 
     src_wkt = 'GEOMETRYCOLLECTION(POLYGON((0 0,100 0,100 100,0 0)))'
     exp_wkt = 'MULTIPOLYGON (((0 0,100 0,100 100,0 0)))'
@@ -127,9 +117,7 @@ def test_ogr_factory_3():
     src_geom = ogr.CreateGeometryFromWkt(src_wkt)
     dst_geom = ogr.ForceToMultiPolygon(src_geom)
 
-    if ogrtest.check_feature_geometry(dst_geom, exp_wkt):
-        print(dst_geom.ExportToWkt())
-        return 'fail'
+    assert not ogrtest.check_feature_geometry(dst_geom, exp_wkt), dst_geom.ExportToWkt()
 
     src_wkt = 'CURVEPOLYGON ((0 0,100 0,100 100,0 0))'
     exp_wkt = 'MULTIPOLYGON (((0 0,100 0,100 100,0 0)))'
@@ -137,9 +125,7 @@ def test_ogr_factory_3():
     src_geom = ogr.CreateGeometryFromWkt(src_wkt)
     dst_geom = ogr.ForceToMultiPolygon(src_geom)
 
-    if ogrtest.check_feature_geometry(dst_geom, exp_wkt):
-        print(dst_geom.ExportToWkt())
-        return 'fail'
+    assert not ogrtest.check_feature_geometry(dst_geom, exp_wkt), dst_geom.ExportToWkt()
 
     src_wkt = 'MULTISURFACE (((0 0,100 0,100 100,0 0)))'
     exp_wkt = 'MULTIPOLYGON (((0 0,100 0,100 100,0 0)))'
@@ -147,9 +133,7 @@ def test_ogr_factory_3():
     src_geom = ogr.CreateGeometryFromWkt(src_wkt)
     dst_geom = ogr.ForceToMultiPolygon(src_geom)
 
-    if ogrtest.check_feature_geometry(dst_geom, exp_wkt):
-        print(dst_geom.ExportToWkt())
-        return 'fail'
+    assert not ogrtest.check_feature_geometry(dst_geom, exp_wkt), dst_geom.ExportToWkt()
 
     return 'success'
 
@@ -165,9 +149,7 @@ def test_ogr_factory_4():
     src_geom = ogr.CreateGeometryFromWkt(src_wkt)
     dst_geom = ogr.ForceToMultiPoint(src_geom)
 
-    if ogrtest.check_feature_geometry(dst_geom, exp_wkt):
-        print(dst_geom.ExportToWkt())
-        return 'fail'
+    assert not ogrtest.check_feature_geometry(dst_geom, exp_wkt), dst_geom.ExportToWkt()
 
     src_wkt = 'GEOMETRYCOLLECTION(POINT(2 5 3),POINT(4 5 5))'
     exp_wkt = 'MULTIPOINT(2 5 3,4 5 5)'
@@ -175,9 +157,7 @@ def test_ogr_factory_4():
     src_geom = ogr.CreateGeometryFromWkt(src_wkt)
     dst_geom = ogr.ForceToMultiPoint(src_geom)
 
-    if ogrtest.check_feature_geometry(dst_geom, exp_wkt):
-        print(dst_geom.ExportToWkt())
-        return 'fail'
+    assert not ogrtest.check_feature_geometry(dst_geom, exp_wkt), dst_geom.ExportToWkt()
 
     return 'success'
 
@@ -193,9 +173,7 @@ def test_ogr_factory_5():
     src_geom = ogr.CreateGeometryFromWkt(src_wkt)
     dst_geom = ogr.ForceToMultiLineString(src_geom)
 
-    if ogrtest.check_feature_geometry(dst_geom, exp_wkt):
-        print(dst_geom.ExportToWkt())
-        return 'fail'
+    assert not ogrtest.check_feature_geometry(dst_geom, exp_wkt), dst_geom.ExportToWkt()
 
     src_wkt = 'GEOMETRYCOLLECTION(LINESTRING(2 5,10 20),LINESTRING(0 0,10 10))'
     exp_wkt = 'MULTILINESTRING((2 5,10 20),(0 0,10 10))'
@@ -203,9 +181,7 @@ def test_ogr_factory_5():
     src_geom = ogr.CreateGeometryFromWkt(src_wkt)
     dst_geom = ogr.ForceToMultiLineString(src_geom)
 
-    if ogrtest.check_feature_geometry(dst_geom, exp_wkt):
-        print(dst_geom.ExportToWkt())
-        return 'fail'
+    assert not ogrtest.check_feature_geometry(dst_geom, exp_wkt), dst_geom.ExportToWkt()
 
     src_wkt = 'POLYGON((2 5,10 20),(0 0,10 10))'
     exp_wkt = 'MULTILINESTRING((2 5,10 20),(0 0,10 10))'
@@ -213,9 +189,7 @@ def test_ogr_factory_5():
     src_geom = ogr.CreateGeometryFromWkt(src_wkt)
     dst_geom = ogr.ForceToMultiLineString(src_geom)
 
-    if ogrtest.check_feature_geometry(dst_geom, exp_wkt):
-        print(dst_geom.ExportToWkt())
-        return 'fail'
+    assert not ogrtest.check_feature_geometry(dst_geom, exp_wkt), dst_geom.ExportToWkt()
 
     src_wkt = 'MULTIPOLYGON(((2 5,10 20),(0 0,10 10)),((2 5,10 20)))'
     exp_wkt = 'MULTILINESTRING((2 5,10 20),(0 0,10 10),(2 5,10 20))'
@@ -223,9 +197,7 @@ def test_ogr_factory_5():
     src_geom = ogr.CreateGeometryFromWkt(src_wkt)
     dst_geom = ogr.ForceToMultiLineString(src_geom)
 
-    if ogrtest.check_feature_geometry(dst_geom, exp_wkt):
-        print(dst_geom.ExportToWkt())
-        return 'fail'
+    assert not ogrtest.check_feature_geometry(dst_geom, exp_wkt), dst_geom.ExportToWkt()
     return 'success'
 
 
@@ -307,9 +279,7 @@ def test_ogr_factory_7():
     src_geom = ogr.CreateGeometryFromWkt(src_wkt)
     dst_geom = ogr.ForceToLineString(src_geom)
 
-    if ogrtest.check_feature_geometry(dst_geom, exp_wkt):
-        print(dst_geom.ExportToWkt())
-        return 'fail'
+    assert not ogrtest.check_feature_geometry(dst_geom, exp_wkt), dst_geom.ExportToWkt()
 
     src_wkt = 'MULTILINESTRING((2 5,10 20))'
     exp_wkt = 'LINESTRING(2 5,10 20)'
@@ -317,9 +287,7 @@ def test_ogr_factory_7():
     src_geom = ogr.CreateGeometryFromWkt(src_wkt)
     dst_geom = ogr.ForceToLineString(src_geom)
 
-    if ogrtest.check_feature_geometry(dst_geom, exp_wkt):
-        print(dst_geom.ExportToWkt())
-        return 'fail'
+    assert not ogrtest.check_feature_geometry(dst_geom, exp_wkt), dst_geom.ExportToWkt()
 
     src_wkt = 'MULTICURVE((2 5,10 20))'
     exp_wkt = 'LINESTRING(2 5,10 20)'
@@ -327,9 +295,7 @@ def test_ogr_factory_7():
     src_geom = ogr.CreateGeometryFromWkt(src_wkt)
     dst_geom = ogr.ForceToLineString(src_geom)
 
-    if ogrtest.check_feature_geometry(dst_geom, exp_wkt):
-        print(dst_geom.ExportToWkt())
-        return 'fail'
+    assert not ogrtest.check_feature_geometry(dst_geom, exp_wkt), dst_geom.ExportToWkt()
 
     src_wkt = 'MULTICURVE(COMPOUNDCURVE((2 5,10 20)))'
     exp_wkt = 'LINESTRING(2 5,10 20)'
@@ -337,9 +303,7 @@ def test_ogr_factory_7():
     src_geom = ogr.CreateGeometryFromWkt(src_wkt)
     dst_geom = ogr.ForceToLineString(src_geom)
 
-    if ogrtest.check_feature_geometry(dst_geom, exp_wkt):
-        print(dst_geom.ExportToWkt())
-        return 'fail'
+    assert not ogrtest.check_feature_geometry(dst_geom, exp_wkt), dst_geom.ExportToWkt()
 
     src_wkt = 'MULTILINESTRING((2 5,10 20),(3 4,30 40))'
     exp_wkt = 'MULTILINESTRING((2 5,10 20),(3 4,30 40))'
@@ -347,9 +311,7 @@ def test_ogr_factory_7():
     src_geom = ogr.CreateGeometryFromWkt(src_wkt)
     dst_geom = ogr.ForceToLineString(src_geom)
 
-    if ogrtest.check_feature_geometry(dst_geom, exp_wkt):
-        print(dst_geom.ExportToWkt())
-        return 'fail'
+    assert not ogrtest.check_feature_geometry(dst_geom, exp_wkt), dst_geom.ExportToWkt()
 
     src_wkt = 'MULTILINESTRING((2 5,10 20),(10 20,30 40))'
     exp_wkt = 'LINESTRING (2 5,10 20,30 40)'
@@ -357,9 +319,7 @@ def test_ogr_factory_7():
     src_geom = ogr.CreateGeometryFromWkt(src_wkt)
     dst_geom = ogr.ForceToLineString(src_geom)
 
-    if ogrtest.check_feature_geometry(dst_geom, exp_wkt):
-        print(dst_geom.ExportToWkt())
-        return 'fail'
+    assert not ogrtest.check_feature_geometry(dst_geom, exp_wkt), dst_geom.ExportToWkt()
 
     src_wkt = 'GEOMETRYCOLLECTION(LINESTRING(2 5,10 20),LINESTRING(10 20,30 40))'
     exp_wkt = 'LINESTRING (2 5,10 20,30 40)'
@@ -367,9 +327,7 @@ def test_ogr_factory_7():
     src_geom = ogr.CreateGeometryFromWkt(src_wkt)
     dst_geom = ogr.ForceToLineString(src_geom)
 
-    if ogrtest.check_feature_geometry(dst_geom, exp_wkt):
-        print(dst_geom.ExportToWkt())
-        return 'fail'
+    assert not ogrtest.check_feature_geometry(dst_geom, exp_wkt), dst_geom.ExportToWkt()
 
     src_wkt = 'MULTILINESTRING((2 5,10 20),(10 20))'
     exp_wkt = 'MULTILINESTRING((2 5,10 20),(10 20))'
@@ -377,9 +335,7 @@ def test_ogr_factory_7():
     src_geom = ogr.CreateGeometryFromWkt(src_wkt)
     dst_geom = ogr.ForceToLineString(src_geom)
 
-    if ogrtest.check_feature_geometry(dst_geom, exp_wkt):
-        print(dst_geom.ExportToWkt())
-        return 'fail'
+    assert not ogrtest.check_feature_geometry(dst_geom, exp_wkt), dst_geom.ExportToWkt()
 
     src_wkt = 'MULTILINESTRING((2 5,10 20),(10 20,30 40),(30 40,50 60))'
     exp_wkt = 'LINESTRING (2 5,10 20,30 40,50 60)'
@@ -387,9 +343,7 @@ def test_ogr_factory_7():
     src_geom = ogr.CreateGeometryFromWkt(src_wkt)
     dst_geom = ogr.ForceToLineString(src_geom)
 
-    if ogrtest.check_feature_geometry(dst_geom, exp_wkt):
-        print(dst_geom.ExportToWkt())
-        return 'fail'
+    assert not ogrtest.check_feature_geometry(dst_geom, exp_wkt), dst_geom.ExportToWkt()
 
     src_wkt = 'POLYGON ((0 0,0 1,1 1,1 0,0 0))'
     exp_wkt = 'LINESTRING (0 0,0 1,1 1,1 0,0 0)'
@@ -397,9 +351,7 @@ def test_ogr_factory_7():
     src_geom = ogr.CreateGeometryFromWkt(src_wkt)
     dst_geom = ogr.ForceToLineString(src_geom)
 
-    if ogrtest.check_feature_geometry(dst_geom, exp_wkt):
-        print(dst_geom.ExportToWkt())
-        return 'fail'
+    assert not ogrtest.check_feature_geometry(dst_geom, exp_wkt), dst_geom.ExportToWkt()
 
     src_wkt = 'CURVEPOLYGON ((0 0,0 1,1 1,1 0,0 0))'
     exp_wkt = 'LINESTRING (0 0,0 1,1 1,1 0,0 0)'
@@ -407,9 +359,7 @@ def test_ogr_factory_7():
     src_geom = ogr.CreateGeometryFromWkt(src_wkt)
     dst_geom = ogr.ForceToLineString(src_geom)
 
-    if ogrtest.check_feature_geometry(dst_geom, exp_wkt):
-        print(dst_geom.ExportToWkt())
-        return 'fail'
+    assert not ogrtest.check_feature_geometry(dst_geom, exp_wkt), dst_geom.ExportToWkt()
 
     src_wkt = 'CURVEPOLYGON (COMPOUNDCURVE((0 0,0 1,1 1,1 0,0 0)))'
     exp_wkt = 'LINESTRING (0 0,0 1,1 1,1 0,0 0)'
@@ -417,9 +367,7 @@ def test_ogr_factory_7():
     src_geom = ogr.CreateGeometryFromWkt(src_wkt)
     dst_geom = ogr.ForceToLineString(src_geom)
 
-    if ogrtest.check_feature_geometry(dst_geom, exp_wkt):
-        print(dst_geom.ExportToWkt())
-        return 'fail'
+    assert not ogrtest.check_feature_geometry(dst_geom, exp_wkt), dst_geom.ExportToWkt()
 
     return 'success'
 
@@ -592,8 +540,7 @@ def test_ogr_factory_8():
         if ogrtest.check_feature_geometry(dst_geom, exp_wkt):
             print(src_wkt)
             print(target_type)
-            print(dst_geom.ExportToWkt())
-            return 'fail'
+            pytest.fail(dst_geom.ExportToWkt())
 
     return 'success'
 
diff --git a/autotest/ogr/ogr_feature.py b/autotest/ogr/ogr_feature.py
index bff89a400941..fe00eeeb3211 100755
--- a/autotest/ogr/ogr_feature.py
+++ b/autotest/ogr/ogr_feature.py
@@ -147,49 +147,35 @@ def test_ogr_feature_cp_integer():
     dst_feature.SetFrom(src_feature)
     gdal.PopErrorHandler()
 
-    if not check(dst_feature, 'field_integer', 17):
-        return 'fail'
+    assert check(dst_feature, 'field_integer', 17)
 
-    if not check(dst_feature, 'field_integer64', 2147483647):
-        return 'fail'
+    assert check(dst_feature, 'field_integer64', 2147483647)
 
-    if not check(dst_feature, 'field_real', 18):
-        return 'fail'
+    assert check(dst_feature, 'field_real', 18)
 
-    if not check(dst_feature, 'field_string', 0):
-        return 'fail'
+    assert check(dst_feature, 'field_string', 0)
 
-    if not check(dst_feature, 'field_binary', None):
-        return 'fail'
+    assert check(dst_feature, 'field_binary', None)
 
-    if not check(dst_feature, 'field_date', None):
-        return 'fail'
+    assert check(dst_feature, 'field_date', None)
 
-    if not check(dst_feature, 'field_time', None):
-        return 'fail'
+    assert check(dst_feature, 'field_time', None)
 
-    if not check(dst_feature, 'field_datetime', None):
-        return 'fail'
+    assert check(dst_feature, 'field_datetime', None)
 
-    if not check(dst_feature, 'field_integerlist', 15):
-        return 'fail'
+    assert check(dst_feature, 'field_integerlist', 15)
 
-    if not check(dst_feature, 'field_integer64list', 2147483647):
-        return 'fail'
+    assert check(dst_feature, 'field_integer64list', 2147483647)
 
-    if not check(dst_feature, 'field_reallist', 17):
-        return 'fail'
+    assert check(dst_feature, 'field_reallist', 17)
 
-    if not check(dst_feature, 'field_stringlist', None):
-        return 'fail'
+    assert check(dst_feature, 'field_stringlist', None)
 
     vals = []
     for val in dst_feature:
         vals.append(val)
-    if vals != [17, 2147483647, 18, 0, None, None, None, None, 15,
-                2147483647, 17, None]:
-        print(vals)
-        return 'fail'
+    assert (vals == [17, 2147483647, 18, 0, None, None, None, None, 15,
+                2147483647, 17, None])
 
     return 'success'
 
@@ -205,47 +191,34 @@ def test_ogr_feature_cp_integer64():
     dst_feature = mk_dst_feature(src_feature, ogr.OFTInteger64)
     dst_feature.SetFrom(src_feature)
 
-    if not check(dst_feature, 'field_integer', 17):
-        return 'fail'
+    assert check(dst_feature, 'field_integer', 17)
 
-    if not check(dst_feature, 'field_integer64', 9876543210):
-        return 'fail'
+    assert check(dst_feature, 'field_integer64', 9876543210)
 
     gdal.PushErrorHandler()
     int32_ovflw = dst_feature.GetFieldAsInteger('field_integer64')
     gdal.PopErrorHandler()
-    if int32_ovflw != 2147483647:
-        return 'fail'
+    assert int32_ovflw == 2147483647
 
-    if not check(dst_feature, 'field_real', 18):
-        return 'fail'
+    assert check(dst_feature, 'field_real', 18)
 
-    if not check(dst_feature, 'field_string', 0):
-        return 'fail'
+    assert check(dst_feature, 'field_string', 0)
 
-    if not check(dst_feature, 'field_binary', None):
-        return 'fail'
+    assert check(dst_feature, 'field_binary', None)
 
-    if not check(dst_feature, 'field_date', None):
-        return 'fail'
+    assert check(dst_feature, 'field_date', None)
 
-    if not check(dst_feature, 'field_time', None):
-        return 'fail'
+    assert check(dst_feature, 'field_time', None)
 
-    if not check(dst_feature, 'field_datetime', None):
-        return 'fail'
+    assert check(dst_feature, 'field_datetime', None)
 
-    if not check(dst_feature, 'field_integerlist', 15):
-        return 'fail'
+    assert check(dst_feature, 'field_integerlist', 15)
 
-    if not check(dst_feature, 'field_integer64list', 9876543210):
-        return 'fail'
+    assert check(dst_feature, 'field_integer64list', 9876543210)
 
-    if not check(dst_feature, 'field_reallist', 17):
-        return 'fail'
+    assert check(dst_feature, 'field_reallist', 17)
 
-    if not check(dst_feature, 'field_stringlist', None):
-        return 'fail'
+    assert check(dst_feature, 'field_stringlist', None)
 
     return 'success'
 
@@ -262,35 +235,25 @@ def test_ogr_feature_cp_real():
     with gdaltest.error_handler():
         dst_feature.SetFrom(src_feature)
 
-    if not check(dst_feature, 'field_integer', 17.0):
-        return 'fail'
+    assert check(dst_feature, 'field_integer', 17.0)
 
-    if not check(dst_feature, 'field_real', 18.4):
-        return 'fail'
+    assert check(dst_feature, 'field_real', 18.4)
 
-    if not check(dst_feature, 'field_string', 0):
-        return 'fail'
+    assert check(dst_feature, 'field_string', 0)
 
-    if not check(dst_feature, 'field_binary', None):
-        return 'fail'
+    assert check(dst_feature, 'field_binary', None)
 
-    if not check(dst_feature, 'field_date', None):
-        return 'fail'
+    assert check(dst_feature, 'field_date', None)
 
-    if not check(dst_feature, 'field_time', None):
-        return 'fail'
+    assert check(dst_feature, 'field_time', None)
 
-    if not check(dst_feature, 'field_datetime', None):
-        return 'fail'
+    assert check(dst_feature, 'field_datetime', None)
 
-    if not check(dst_feature, 'field_integerlist', 15.0):
-        return 'fail'
+    assert check(dst_feature, 'field_integerlist', 15.0)
 
-    if not check(dst_feature, 'field_reallist', 17.5):
-        return 'fail'
+    assert check(dst_feature, 'field_reallist', 17.5)
 
-    if not check(dst_feature, 'field_stringlist', None):
-        return 'fail'
+    assert check(dst_feature, 'field_stringlist', None)
 
     return 'success'
 
@@ -304,41 +267,29 @@ def test_ogr_feature_cp_string():
     dst_feature = mk_dst_feature(src_feature, ogr.OFTString)
     dst_feature.SetFrom(src_feature)
 
-    if not check(dst_feature, 'field_integer', '17'):
-        return 'fail'
+    assert check(dst_feature, 'field_integer', '17')
 
-    if not check(dst_feature, 'field_integer64', '9876543210'):
-        return 'fail'
+    assert check(dst_feature, 'field_integer64', '9876543210')
 
-    if not check(dst_feature, 'field_real', '18.4'):
-        return 'fail'
+    assert check(dst_feature, 'field_real', '18.4')
 
-    if not check(dst_feature, 'field_string', 'abc def'):
-        return 'fail'
+    assert check(dst_feature, 'field_string', 'abc def')
 
-    if not check(dst_feature, 'field_binary', '0123465789ABCDEF'):
-        return 'fail'
+    assert check(dst_feature, 'field_binary', '0123465789ABCDEF')
 
-    if not check(dst_feature, 'field_date', '2011/11/11'):
-        return 'fail'
+    assert check(dst_feature, 'field_date', '2011/11/11')
 
-    if not check(dst_feature, 'field_time', '14:10:35'):
-        return 'fail'
+    assert check(dst_feature, 'field_time', '14:10:35')
 
-    if not check(dst_feature, 'field_datetime', '2011/11/11 14:10:35.123'):
-        return 'fail'
+    assert check(dst_feature, 'field_datetime', '2011/11/11 14:10:35.123')
 
-    if not check(dst_feature, 'field_integerlist', '(3:10,20,30)'):
-        return 'fail'
+    assert check(dst_feature, 'field_integerlist', '(3:10,20,30)')
 
-    if not check(dst_feature, 'field_integer64list', '(1:9876543210)'):
-        return 'fail'
+    assert check(dst_feature, 'field_integer64list', '(1:9876543210)')
 
-    if not check(dst_feature, 'field_reallist', '(2:123.5,567)'):
-        return 'fail'
+    assert check(dst_feature, 'field_reallist', '(2:123.5,567)')
 
-    if not check(dst_feature, 'field_stringlist', '(2:abc,def)'):
-        return 'fail'
+    assert check(dst_feature, 'field_stringlist', '(2:abc,def)')
 
     return 'success'
 
@@ -352,49 +303,35 @@ def test_ogr_feature_cp_binary():
     dst_feature = mk_dst_feature(src_feature, ogr.OFTBinary)
     dst_feature.SetFrom(src_feature)
 
-    if not check(dst_feature, 'field_integer', None):
-        return 'fail'
+    assert check(dst_feature, 'field_integer', None)
 
-    if not check(dst_feature, 'field_integer64', None):
-        return 'fail'
+    assert check(dst_feature, 'field_integer64', None)
 
-    if not check(dst_feature, 'field_real', None):
-        return 'fail'
+    assert check(dst_feature, 'field_real', None)
 
-    if not check(dst_feature, 'field_string', None):
-        return 'fail'
+    assert check(dst_feature, 'field_string', None)
 
-    if not check(dst_feature, 'field_binary', '0123465789ABCDEF'):
-        return 'fail'
+    assert check(dst_feature, 'field_binary', '0123465789ABCDEF')
 
     expected = '\x01\x23\x46\x57\x89\xAB\xCD\xEF'
     if sys.version_info >= (3, 0, 0):
         expected = expected.encode('LATIN1')
-    if dst_feature.GetFieldAsBinary('field_binary') != expected:
-        return 'fail'
-    if dst_feature.GetFieldAsBinary(dst_feature.GetDefnRef().GetFieldIndex('field_binary')) != expected:
-        return 'fail'
+    assert dst_feature.GetFieldAsBinary('field_binary') == expected
+    assert dst_feature.GetFieldAsBinary(dst_feature.GetDefnRef().GetFieldIndex('field_binary')) == expected
 
-    if not check(dst_feature, 'field_date', None):
-        return 'fail'
+    assert check(dst_feature, 'field_date', None)
 
-    if not check(dst_feature, 'field_time', None):
-        return 'fail'
+    assert check(dst_feature, 'field_time', None)
 
-    if not check(dst_feature, 'field_datetime', None):
-        return 'fail'
+    assert check(dst_feature, 'field_datetime', None)
 
-    if not check(dst_feature, 'field_integerlist', None):
-        return 'fail'
+    assert check(dst_feature, 'field_integerlist', None)
 
-    if not check(dst_feature, 'field_integer64list', None):
-        return 'fail'
+    assert check(dst_feature, 'field_integer64list', None)
 
-    if not check(dst_feature, 'field_reallist', None):
-        return 'fail'
+    assert check(dst_feature, 'field_reallist', None)
 
-    if not check(dst_feature, 'field_stringlist', None):
-        return 'fail'
+    assert check(dst_feature, 'field_stringlist', None)
 
     return 'success'
 
@@ -408,41 +345,29 @@ def test_ogr_feature_cp_date():
     dst_feature = mk_dst_feature(src_feature, ogr.OFTDate)
     dst_feature.SetFrom(src_feature)
 
-    if not check(dst_feature, 'field_integer', None):
-        return 'fail'
+    assert check(dst_feature, 'field_integer', None)
 
-    if not check(dst_feature, 'field_integer64', None):
-        return 'fail'
+    assert check(dst_feature, 'field_integer64', None)
 
-    if not check(dst_feature, 'field_real', None):
-        return 'fail'
+    assert check(dst_feature, 'field_real', None)
 
-    if not check(dst_feature, 'field_string', None):
-        return 'fail'
+    assert check(dst_feature, 'field_string', None)
 
-    if not check(dst_feature, 'field_binary', None):
-        return 'fail'
+    assert check(dst_feature, 'field_binary', None)
 
-    if not check(dst_feature, 'field_date', '2011/11/11'):
-        return 'fail'
+    assert check(dst_feature, 'field_date', '2011/11/11')
 
-    if not check(dst_feature, 'field_time', '0000/00/00'):
-        return 'fail'
+    assert check(dst_feature, 'field_time', '0000/00/00')
 
-    if not check(dst_feature, 'field_datetime', '2011/11/11'):
-        return 'fail'
+    assert check(dst_feature, 'field_datetime', '2011/11/11')
 
-    if not check(dst_feature, 'field_integerlist', None):
-        return 'fail'
+    assert check(dst_feature, 'field_integerlist', None)
 
-    if not check(dst_feature, 'field_integer64list', None):
-        return 'fail'
+    assert check(dst_feature, 'field_integer64list', None)
 
-    if not check(dst_feature, 'field_reallist', None):
-        return 'fail'
+    assert check(dst_feature, 'field_reallist', None)
 
-    if not check(dst_feature, 'field_stringlist', None):
-        return 'fail'
+    assert check(dst_feature, 'field_stringlist', None)
 
     return 'success'
 
@@ -456,41 +381,29 @@ def test_ogr_feature_cp_time():
     dst_feature = mk_dst_feature(src_feature, ogr.OFTTime)
     dst_feature.SetFrom(src_feature)
 
-    if not check(dst_feature, 'field_integer', None):
-        return 'fail'
+    assert check(dst_feature, 'field_integer', None)
 
-    if not check(dst_feature, 'field_integer64', None):
-        return 'fail'
+    assert check(dst_feature, 'field_integer64', None)
 
-    if not check(dst_feature, 'field_real', None):
-        return 'fail'
+    assert check(dst_feature, 'field_real', None)
 
-    if not check(dst_feature, 'field_string', None):
-        return 'fail'
+    assert check(dst_feature, 'field_string', None)
 
-    if not check(dst_feature, 'field_binary', None):
-        return 'fail'
+    assert check(dst_feature, 'field_binary', None)
 
-    if not check(dst_feature, 'field_date', '00:00:00'):
-        return 'fail'
+    assert check(dst_feature, 'field_date', '00:00:00')
 
-    if not check(dst_feature, 'field_time', '14:10:35'):
-        return 'fail'
+    assert check(dst_feature, 'field_time', '14:10:35')
 
-    if not check(dst_feature, 'field_datetime', '14:10:35.123'):
-        return 'fail'
+    assert check(dst_feature, 'field_datetime', '14:10:35.123')
 
-    if not check(dst_feature, 'field_integerlist', None):
-        return 'fail'
+    assert check(dst_feature, 'field_integerlist', None)
 
-    if not check(dst_feature, 'field_integer64list', None):
-        return 'fail'
+    assert check(dst_feature, 'field_integer64list', None)
 
-    if not check(dst_feature, 'field_reallist', None):
-        return 'fail'
+    assert check(dst_feature, 'field_reallist', None)
 
-    if not check(dst_feature, 'field_stringlist', None):
-        return 'fail'
+    assert check(dst_feature, 'field_stringlist', None)
 
     return 'success'
 
@@ -504,41 +417,29 @@ def test_ogr_feature_cp_datetime():
     dst_feature = mk_dst_feature(src_feature, ogr.OFTDateTime)
     dst_feature.SetFrom(src_feature)
 
-    if not check(dst_feature, 'field_integer', None):
-        return 'fail'
+    assert check(dst_feature, 'field_integer', None)
 
-    if not check(dst_feature, 'field_integer64', None):
-        return 'fail'
+    assert check(dst_feature, 'field_integer64', None)
 
-    if not check(dst_feature, 'field_real', None):
-        return 'fail'
+    assert check(dst_feature, 'field_real', None)
 
-    if not check(dst_feature, 'field_string', None):
-        return 'fail'
+    assert check(dst_feature, 'field_string', None)
 
-    if not check(dst_feature, 'field_binary', None):
-        return 'fail'
+    assert check(dst_feature, 'field_binary', None)
 
-    if not check(dst_feature, 'field_date', '2011/11/11 00:00:00'):
-        return 'fail'
+    assert check(dst_feature, 'field_date', '2011/11/11 00:00:00')
 
-    if not check(dst_feature, 'field_time', '0000/00/00 14:10:35'):
-        return 'fail'
+    assert check(dst_feature, 'field_time', '0000/00/00 14:10:35')
 
-    if not check(dst_feature, 'field_datetime', '2011/11/11 14:10:35.123'):
-        return 'fail'
+    assert check(dst_feature, 'field_datetime', '2011/11/11 14:10:35.123')
 
-    if not check(dst_feature, 'field_integerlist', None):
-        return 'fail'
+    assert check(dst_feature, 'field_integerlist', None)
 
-    if not check(dst_feature, 'field_integer64list', None):
-        return 'fail'
+    assert check(dst_feature, 'field_integer64list', None)
 
-    if not check(dst_feature, 'field_reallist', None):
-        return 'fail'
+    assert check(dst_feature, 'field_reallist', None)
 
-    if not check(dst_feature, 'field_stringlist', None):
-        return 'fail'
+    assert check(dst_feature, 'field_stringlist', None)
 
     return 'success'
 
@@ -554,41 +455,29 @@ def test_ogr_feature_cp_integerlist():
     dst_feature.SetFrom(src_feature)
     gdal.PopErrorHandler()
 
-    if not check(dst_feature, 'field_integer', [17]):
-        return 'fail'
+    assert check(dst_feature, 'field_integer', [17])
 
-    if not check(dst_feature, 'field_integer64', [2147483647]):
-        return 'fail'
+    assert check(dst_feature, 'field_integer64', [2147483647])
 
-    if not check(dst_feature, 'field_real', [18]):
-        return 'fail'
+    assert check(dst_feature, 'field_real', [18])
 
-    if not check(dst_feature, 'field_string', None):
-        return 'fail'
+    assert check(dst_feature, 'field_string', None)
 
-    if not check(dst_feature, 'field_binary', None):
-        return 'fail'
+    assert check(dst_feature, 'field_binary', None)
 
-    if not check(dst_feature, 'field_date', None):
-        return 'fail'
+    assert check(dst_feature, 'field_date', None)
 
-    if not check(dst_feature, 'field_time', None):
-        return 'fail'
+    assert check(dst_feature, 'field_time', None)
 
-    if not check(dst_feature, 'field_datetime', None):
-        return 'fail'
+    assert check(dst_feature, 'field_datetime', None)
 
-    if not check(dst_feature, 'field_integerlist', [10, 20, 30]):
-        return 'fail'
+    assert check(dst_feature, 'field_integerlist', [10, 20, 30])
 
-    if not check(dst_feature, 'field_integer64list', [2147483647]):
-        return 'fail'
+    assert check(dst_feature, 'field_integer64list', [2147483647])
 
-    if not check(dst_feature, 'field_reallist', [123, 567]):
-        return 'fail'
+    assert check(dst_feature, 'field_reallist', [123, 567])
 
-    if not check(dst_feature, 'field_stringlist', None):
-        return 'fail'
+    assert check(dst_feature, 'field_stringlist', None)
 
     return 'success'
 
@@ -602,41 +491,29 @@ def test_ogr_feature_cp_integer64list():
     dst_feature = mk_dst_feature(src_feature, ogr.OFTInteger64List)
     dst_feature.SetFrom(src_feature)
 
-    if not check(dst_feature, 'field_integer', [17]):
-        return 'fail'
+    assert check(dst_feature, 'field_integer', [17])
 
-    if not check(dst_feature, 'field_integer64', [9876543210]):
-        return 'fail'
+    assert check(dst_feature, 'field_integer64', [9876543210])
 
-    if not check(dst_feature, 'field_real', [18]):
-        return 'fail'
+    assert check(dst_feature, 'field_real', [18])
 
-    if not check(dst_feature, 'field_string', None):
-        return 'fail'
+    assert check(dst_feature, 'field_string', None)
 
-    if not check(dst_feature, 'field_binary', None):
-        return 'fail'
+    assert check(dst_feature, 'field_binary', None)
 
-    if not check(dst_feature, 'field_date', None):
-        return 'fail'
+    assert check(dst_feature, 'field_date', None)
 
-    if not check(dst_feature, 'field_time', None):
-        return 'fail'
+    assert check(dst_feature, 'field_time', None)
 
-    if not check(dst_feature, 'field_datetime', None):
-        return 'fail'
+    assert check(dst_feature, 'field_datetime', None)
 
-    if not check(dst_feature, 'field_integerlist', [10, 20, 30]):
-        return 'fail'
+    assert check(dst_feature, 'field_integerlist', [10, 20, 30])
 
-    if not check(dst_feature, 'field_integer64list', [9876543210]):
-        return 'fail'
+    assert check(dst_feature, 'field_integer64list', [9876543210])
 
-    if not check(dst_feature, 'field_reallist', [123, 567]):
-        return 'fail'
+    assert check(dst_feature, 'field_reallist', [123, 567])
 
-    if not check(dst_feature, 'field_stringlist', None):
-        return 'fail'
+    assert check(dst_feature, 'field_stringlist', None)
 
     return 'success'
 
@@ -650,41 +527,29 @@ def test_ogr_feature_cp_reallist():
     dst_feature = mk_dst_feature(src_feature, ogr.OFTRealList)
     dst_feature.SetFrom(src_feature)
 
-    if not check(dst_feature, 'field_integer', [17.0]):
-        return 'fail'
+    assert check(dst_feature, 'field_integer', [17.0])
 
-    if not check(dst_feature, 'field_integer64', [9876543210.0]):
-        return 'fail'
+    assert check(dst_feature, 'field_integer64', [9876543210.0])
 
-    if not check(dst_feature, 'field_real', [18.4]):
-        return 'fail'
+    assert check(dst_feature, 'field_real', [18.4])
 
-    if not check(dst_feature, 'field_string', None):
-        return 'fail'
+    assert check(dst_feature, 'field_string', None)
 
-    if not check(dst_feature, 'field_binary', None):
-        return 'fail'
+    assert check(dst_feature, 'field_binary', None)
 
-    if not check(dst_feature, 'field_date', None):
-        return 'fail'
+    assert check(dst_feature, 'field_date', None)
 
-    if not check(dst_feature, 'field_time', None):
-        return 'fail'
+    assert check(dst_feature, 'field_time', None)
 
-    if not check(dst_feature, 'field_datetime', None):
-        return 'fail'
+    assert check(dst_feature, 'field_datetime', None)
 
-    if not check(dst_feature, 'field_integerlist', [10.0, 20.0, 30.0]):
-        return 'fail'
+    assert check(dst_feature, 'field_integerlist', [10.0, 20.0, 30.0])
 
-    if not check(dst_feature, 'field_integer64list', [9876543210.0]):
-        return 'fail'
+    assert check(dst_feature, 'field_integer64list', [9876543210.0])
 
-    if not check(dst_feature, 'field_reallist', [123.5, 567.0]):
-        return 'fail'
+    assert check(dst_feature, 'field_reallist', [123.5, 567.0])
 
-    if not check(dst_feature, 'field_stringlist', None):
-        return 'fail'
+    assert check(dst_feature, 'field_stringlist', None)
 
     return 'success'
 
@@ -698,41 +563,29 @@ def test_ogr_feature_cp_stringlist():
     dst_feature = mk_dst_feature(src_feature, ogr.OFTStringList)
     dst_feature.SetFrom(src_feature)
 
-    if not check(dst_feature, 'field_integer', ["17"]):
-        return 'fail'
+    assert check(dst_feature, 'field_integer', ["17"])
 
-    if not check(dst_feature, 'field_integer64', ["9876543210"]):
-        return 'fail'
+    assert check(dst_feature, 'field_integer64', ["9876543210"])
 
-    if not check(dst_feature, 'field_real', ["18.4"]):
-        return 'fail'
+    assert check(dst_feature, 'field_real', ["18.4"])
 
-    if not check(dst_feature, 'field_string', ['abc def']):
-        return 'fail'
+    assert check(dst_feature, 'field_string', ['abc def'])
 
-    if not check(dst_feature, 'field_binary', ['0123465789ABCDEF']):
-        return 'fail'
+    assert check(dst_feature, 'field_binary', ['0123465789ABCDEF'])
 
-    if not check(dst_feature, 'field_date', ['2011/11/11']):
-        return 'fail'
+    assert check(dst_feature, 'field_date', ['2011/11/11'])
 
-    if not check(dst_feature, 'field_time', ['14:10:35']):
-        return 'fail'
+    assert check(dst_feature, 'field_time', ['14:10:35'])
 
-    if not check(dst_feature, 'field_datetime', ['2011/11/11 14:10:35.123']):
-        return 'fail'
+    assert check(dst_feature, 'field_datetime', ['2011/11/11 14:10:35.123'])
 
-    if not check(dst_feature, 'field_integerlist', ['10', '20', '30']):
-        return 'fail'
+    assert check(dst_feature, 'field_integerlist', ['10', '20', '30'])
 
-    if not check(dst_feature, 'field_integer64list', ['9876543210']):
-        return 'fail'
+    assert check(dst_feature, 'field_integer64list', ['9876543210'])
 
-    if not check(dst_feature, 'field_reallist', ['123.5', '567']):
-        return 'fail'
+    assert check(dst_feature, 'field_reallist', ['123.5', '567'])
 
-    if not check(dst_feature, 'field_stringlist', ['abc', 'def']):
-        return 'fail'
+    assert check(dst_feature, 'field_stringlist', ['abc', 'def'])
 
     return 'success'
 
@@ -754,20 +607,16 @@ def test_ogr_feature_unicode():
 
     src_feature = ogr.Feature(feat_def)
     src_feature.SetField('field_string', 'abc def'.decode('utf-8'))
-    if src_feature.GetField('field_string') != 'abc def':
-        return 'fail'
-    if src_feature.GetField('field_string'.decode('utf-8')) != 'abc def':
-        return 'fail'
+    assert src_feature.GetField('field_string') == 'abc def'
+    assert src_feature.GetField('field_string'.decode('utf-8')) == 'abc def'
 
     src_feature = ogr.Feature(feat_def)
     src_feature.SetField('field_string'.decode('utf-8'), 'abc def'.decode('utf-8'))
-    if src_feature.GetField('field_string') != 'abc def':
-        return 'fail'
+    assert src_feature.GetField('field_string') == 'abc def'
 
     src_feature = ogr.Feature(feat_def)
     src_feature.SetField('field_integer64'.decode('utf-8'), 1)
-    if src_feature.GetField('field_integer64') != 1:
-        return 'fail'
+    assert src_feature.GetField('field_integer64') == 1
 
     return 'success'
 
@@ -780,8 +629,7 @@ def test_ogr_feature_64bit_fid():
     feat_def = ogr.FeatureDefn('test')
     f = ogr.Feature(feat_def)
     f.SetFID(123456789012345)
-    if f.GetFID() != 123456789012345:
-        return 'fail'
+    assert f.GetFID() == 123456789012345
     return 'success'
 
 ###############################################################################
@@ -815,34 +663,28 @@ def test_ogr_feature_nullable_validate():
     # No fields
     feat_def = ogr.FeatureDefn('test')
     f = ogr.Feature(feat_def)
-    if f.Validate() != 1:
-        return 'fail'
+    assert f.Validate() == 1
 
     # Field with default parameter and empty feature
     feat_def = ogr.FeatureDefn('test')
     field_def = ogr.FieldDefn('field_string', ogr.OFTString)
-    if field_def.IsNullable() != 1:
-        return 'fail'
-    if feat_def.GetGeomFieldDefn(0).IsNullable() != 1:
-        return 'fail'
+    assert field_def.IsNullable() == 1
+    assert feat_def.GetGeomFieldDefn(0).IsNullable() == 1
     feat_def.AddFieldDefn(field_def)
     f = ogr.Feature(feat_def)
-    if f.Validate() != 1:
-        return 'fail'
+    assert f.Validate() == 1
 
     # Field with not NULL constraint and empty feature
     feat_def = ogr.FeatureDefn('test')
     field_def = ogr.FieldDefn('field_string', ogr.OFTString)
     field_def.SetNullable(0)
-    if field_def.IsNullable() != 0:
-        return 'fail'
+    assert field_def.IsNullable() == 0
     feat_def.AddFieldDefn(field_def)
     f = ogr.Feature(feat_def)
     gdal.PushErrorHandler()
     ret = f.Validate()
     gdal.PopErrorHandler()
-    if ret != 0:
-        return 'fail'
+    assert ret == 0
 
     # Field with not NULL constraint and non-empty feature
     feat_def = ogr.FeatureDefn('test')
@@ -851,8 +693,7 @@ def test_ogr_feature_nullable_validate():
     feat_def.AddFieldDefn(field_def)
     f = ogr.Feature(feat_def)
     f.SetField(0, 'foo')
-    if f.Validate() != 1:
-        return 'fail'
+    assert f.Validate() == 1
 
     # Field with width constraint that is met
     feat_def = ogr.FeatureDefn('test')
@@ -861,8 +702,7 @@ def test_ogr_feature_nullable_validate():
     feat_def.AddFieldDefn(field_def)
     f = ogr.Feature(feat_def)
     f.SetField(0, 'foo')
-    if f.Validate() != 1:
-        return 'fail'
+    assert f.Validate() == 1
 
     # Field with width constraint that is not met
     feat_def = ogr.FeatureDefn('test')
@@ -874,21 +714,18 @@ def test_ogr_feature_nullable_validate():
     gdal.PushErrorHandler()
     ret = f.Validate()
     gdal.PopErrorHandler()
-    if ret != 0:
-        return 'fail'
+    assert ret == 0
 
     # Geometry field with not-null geometry constraint that is met
     feat_def = ogr.FeatureDefn('test')
     feat_def.SetGeomType(ogr.wkbNone)
     gfield_def = ogr.GeomFieldDefn('test', ogr.wkbUnknown)
     gfield_def.SetNullable(0)
-    if gfield_def.IsNullable() != 0:
-        return 'fail'
+    assert gfield_def.IsNullable() == 0
     feat_def.AddGeomFieldDefn(gfield_def)
     f = ogr.Feature(feat_def)
     f.SetGeometry(ogr.CreateGeometryFromWkt('POINT(0 1)'))
-    if f.Validate() != 1:
-        return 'fail'
+    assert f.Validate() == 1
 
     # Geometry field with not-null geometry constraint that is not met
     feat_def = ogr.FeatureDefn('test')
@@ -900,16 +737,14 @@ def test_ogr_feature_nullable_validate():
     gdal.PushErrorHandler()
     ret = f.Validate()
     gdal.PopErrorHandler()
-    if ret != 0:
-        return 'fail'
+    assert ret == 0
 
     # Geometry field with Point geometry type that is met
     feat_def = ogr.FeatureDefn('test')
     feat_def.SetGeomType(ogr.wkbPoint)
     f = ogr.Feature(feat_def)
     f.SetGeometry(ogr.CreateGeometryFromWkt('POINT(0 1)'))
-    if f.Validate() != 1:
-        return 'fail'
+    assert f.Validate() == 1
 
     # Geometry field with LineString geometry type that is not met
     feat_def = ogr.FeatureDefn('test')
@@ -919,8 +754,7 @@ def test_ogr_feature_nullable_validate():
     gdal.PushErrorHandler()
     ret = f.Validate()
     gdal.PopErrorHandler()
-    if ret != 0:
-        return 'fail'
+    assert ret == 0
 
     return 'success'
 
@@ -933,38 +767,29 @@ def test_ogr_feature_default():
     feat_def = ogr.FeatureDefn('test')
     field_def = ogr.FieldDefn('field_string', ogr.OFTString)
 
-    if field_def.GetDefault() is not None:
-        return 'fail'
-    if field_def.IsDefaultDriverSpecific():
-        return 'fail'
+    assert field_def.GetDefault() is None
+    assert not field_def.IsDefaultDriverSpecific()
 
     field_def.SetDefault("(some_expr)")
-    if field_def.GetDefault() != "(some_expr)":
-        return 'fail'
-    if not field_def.IsDefaultDriverSpecific():
-        return 'fail'
+    assert field_def.GetDefault() == "(some_expr)"
+    assert field_def.IsDefaultDriverSpecific()
 
     field_def.SetDefault("'a")
-    if field_def.GetDefault() != "'a":
-        return 'fail'
+    assert field_def.GetDefault() == "'a"
 
     gdal.PushErrorHandler()
     field_def.SetDefault("'a''")
     gdal.PopErrorHandler()
-    if field_def.GetDefault() is not None:
-        return 'fail'
+    assert field_def.GetDefault() is None
 
     gdal.PushErrorHandler()
     field_def.SetDefault("'a'b'")
     gdal.PopErrorHandler()
-    if field_def.GetDefault() is not None:
-        return 'fail'
+    assert field_def.GetDefault() is None
 
     field_def.SetDefault("'a''b'''")
-    if field_def.GetDefault() != "'a''b'''":
-        return 'fail'
-    if field_def.IsDefaultDriverSpecific():
-        return 'fail'
+    assert field_def.GetDefault() == "'a''b'''"
+    assert not field_def.IsDefaultDriverSpecific()
     feat_def.AddFieldDefn(field_def)
 
     field_def = ogr.FieldDefn('field_datetime', ogr.OFTDateTime)
@@ -1009,37 +834,26 @@ def test_ogr_feature_native_data():
 
     feat_def = ogr.FeatureDefn('test')
     f = ogr.Feature(feat_def)
-    if f.GetNativeData() is not None:
-        return 'fail'
-    if f.GetNativeMediaType() is not None:
-        return 'fail'
+    assert f.GetNativeData() is None
+    assert f.GetNativeMediaType() is None
 
     f.SetNativeData('native_data')
-    if f.GetNativeData() != 'native_data':
-        return 'fail'
+    assert f.GetNativeData() == 'native_data'
     f.SetNativeMediaType('native_media_type')
-    if f.GetNativeMediaType() != 'native_media_type':
-        print(f.GetNativeMediaType())
-        return 'fail'
+    assert f.GetNativeMediaType() == 'native_media_type'
 
     f2 = ogr.Feature(feat_def)
     f2.SetFrom(f)
-    if f2.GetNativeData() != 'native_data':
-        return 'fail'
-    if f2.GetNativeMediaType() != 'native_media_type':
-        return 'fail'
+    assert f2.GetNativeData() == 'native_data'
+    assert f2.GetNativeMediaType() == 'native_media_type'
 
     f_clone = f.Clone()
-    if f_clone.GetNativeData() != 'native_data':
-        return 'fail'
-    if f_clone.GetNativeMediaType() != 'native_media_type':
-        return 'fail'
+    assert f_clone.GetNativeData() == 'native_data'
+    assert f_clone.GetNativeMediaType() == 'native_media_type'
     f_clone.SetNativeData(None)
     f_clone.SetNativeMediaType(None)
-    if f_clone.GetNativeData() is not None:
-        return 'fail'
-    if f_clone.GetNativeMediaType() is not None:
-        return 'fail'
+    assert f_clone.GetNativeData() is None
+    assert f_clone.GetNativeMediaType() is None
 
     ds = ogr.GetDriverByName('Memory').CreateDataSource('')
     lyr = ds.CreateLayer('test')
@@ -1057,24 +871,12 @@ def test_ogr_feature_native_data():
     for dialect in dialects:
         sql_lyr = ds.ExecuteSQL('SELECT * FROM %s' % lyr.GetName(), dialect=dialect)
         native_data = sql_lyr.GetMetadataItem('NATIVE_DATA', 'NATIVE_DATA')
-        if native_data != 'native_data':
-            print(dialect)
-            print(native_data)
-            return 'fail'
+        assert native_data == 'native_data', dialect
         native_media_type = sql_lyr.GetMetadataItem('NATIVE_MEDIA_TYPE', 'NATIVE_DATA')
-        if native_media_type != 'native_media_type':
-            print(dialect)
-            print(native_media_type)
-            return 'fail'
+        assert native_media_type == 'native_media_type', dialect
         f = sql_lyr.GetNextFeature()
-        if f.GetNativeData() != 'native_data':
-            print(dialect)
-            print(f.GetNativeData())
-            return 'fail'
-        if f.GetNativeMediaType() != 'native_media_type':
-            print(dialect)
-            print(f.GetNativeMediaType())
-            return 'fail'
+        assert f.GetNativeData() == 'native_data', dialect
+        assert f.GetNativeMediaType() == 'native_media_type', dialect
         ds.ReleaseResultSet(sql_lyr)
 
     return 'success'
@@ -1092,8 +894,7 @@ def test_ogr_feature_set_geometry_self():
     f.SetGeometryDirectly(f.GetGeometryRef())
     f.SetGeometry(f.GetGeometryRef())
     f.SetGeometry(f.GetGeometryRef())
-    if f.GetGeometryRef().ExportToWkt() != 'POINT (2 49)':
-        return 'fail'
+    assert f.GetGeometryRef().ExportToWkt() == 'POINT (2 49)'
 
     return 'success'
 
@@ -1107,19 +908,14 @@ def test_ogr_feature_null_field():
     field_def = ogr.FieldDefn('field_string', ogr.OFTString)
     feat_def.AddFieldDefn(field_def)
     f = ogr.Feature(feat_def)
-    if f.IsFieldNull(feat_def.GetFieldIndex("field_string")):
-        return 'fail'
-    if f.IsFieldNull("field_string"):
-        return 'fail'
+    assert not f.IsFieldNull(feat_def.GetFieldIndex("field_string"))
+    assert not f.IsFieldNull("field_string")
     f.SetFieldNull(feat_def.GetFieldIndex("field_string"))
-    if f.IsFieldNull(feat_def.GetFieldIndex("field_string")) == 0:
-        return 'fail'
+    assert f.IsFieldNull(feat_def.GetFieldIndex("field_string")) != 0
     f.SetField("field_string", "foo")
-    if f.IsFieldNull("field_string"):
-        return 'fail'
+    assert not f.IsFieldNull("field_string")
     f.SetFieldNull("field_string")
-    if f.IsFieldNull(feat_def.GetFieldIndex("field_string")) == 0:
-        return 'fail'
+    assert f.IsFieldNull(feat_def.GetFieldIndex("field_string")) != 0
     f = None
 
     field_def = ogr.FieldDefn('field_binary', ogr.OFTBinary)
@@ -1143,37 +939,25 @@ def test_ogr_feature_null_field():
     f.field_integer64list = [9876543210]
     f.field_reallist = [123.5, 567.0]
     f.field_stringlist = ['abc', 'def']
-    if f.IsFieldNull('field_binary') != 0:
-        return 'fail'
-    if f.IsFieldNull('field_integerlist') != 0:
-        return 'fail'
-    if f.IsFieldNull('field_integer64list') != 0:
-        return 'fail'
-    if f.IsFieldNull('field_reallist') != 0:
-        return 'fail'
-    if f.IsFieldNull('field_stringlist') != 0:
-        return 'fail'
+    assert f.IsFieldNull('field_binary') == 0
+    assert f.IsFieldNull('field_integerlist') == 0
+    assert f.IsFieldNull('field_integer64list') == 0
+    assert f.IsFieldNull('field_reallist') == 0
+    assert f.IsFieldNull('field_stringlist') == 0
     f.SetField('field_binary', None)
     f.SetFieldNull('field_integerlist')
     f.SetFieldNull('field_integer64list')
     f.SetFieldNull('field_reallist')
     f.SetFieldNull('field_stringlist')
-    if f.IsFieldNull('field_binary') == 0:
-        return 'fail'
-    if f.IsFieldNull('field_integerlist') == 0:
-        return 'fail'
-    if f.IsFieldNull('field_integer64list') == 0:
-        return 'fail'
-    if f.IsFieldNull('field_reallist') == 0:
-        return 'fail'
-    if f.IsFieldNull('field_stringlist') == 0:
-        return 'fail'
+    assert f.IsFieldNull('field_binary') != 0
+    assert f.IsFieldNull('field_integerlist') != 0
+    assert f.IsFieldNull('field_integer64list') != 0
+    assert f.IsFieldNull('field_reallist') != 0
+    assert f.IsFieldNull('field_stringlist') != 0
 
     f_clone = f.Clone()
-    if f_clone.IsFieldNull('field_binary') == 0:
-        return 'fail'
-    if not f.Equal(f_clone):
-        return 'fail'
+    assert f_clone.IsFieldNull('field_binary') != 0
+    assert f.Equal(f_clone)
 
     f = None
 
diff --git a/autotest/ogr/ogr_fgdb.py b/autotest/ogr/ogr_fgdb.py
index 7e2032033f88..b5576900ab65 100755
--- a/autotest/ogr/ogr_fgdb.py
+++ b/autotest/ogr/ogr_fgdb.py
@@ -39,6 +39,7 @@
 from osgeo import gdal
 from osgeo import ogr
 from osgeo import osr
+import pytest
 
 ###############################################################################
 # Test if driver is available
@@ -174,9 +175,7 @@ def test_ogr_fgdb_1():
     for data in datalist:
         lyr = ds.GetLayerByName(data[0])
         if data[1] != ogr.wkbNone:
-            if lyr.GetSpatialRef().IsSame(srs) != 1:
-                print(lyr.GetSpatialRef())
-                return 'fail'
+            assert lyr.GetSpatialRef().IsSame(srs) == 1
         feat = lyr.GetNextFeature()
         if data[1] != ogr.wkbNone:
             try:
@@ -208,33 +207,26 @@ def test_ogr_fgdb_1():
             return 'fail'
 
         sql_lyr = ds.ExecuteSQL("GetLayerDefinition %s" % lyr.GetName())
-        if sql_lyr is None:
-            return 'fail'
+        assert sql_lyr is not None
         feat = sql_lyr.GetNextFeature()
-        if feat is None:
-            return 'fail'
+        assert feat is not None
         feat = sql_lyr.GetNextFeature()
-        if feat is not None:
-            return 'fail'
+        assert feat is None
         lyr.ResetReading()
         lyr.TestCapability("foo")
         ds.ReleaseResultSet(sql_lyr)
 
         sql_lyr = ds.ExecuteSQL("GetLayerMetadata %s" % lyr.GetName())
-        if sql_lyr is None:
-            return 'fail'
+        assert sql_lyr is not None
         feat = sql_lyr.GetNextFeature()
-        if feat is None:
-            return 'fail'
+        assert feat is not None
         ds.ReleaseResultSet(sql_lyr)
 
     sql_lyr = ds.ExecuteSQL("GetLayerDefinition foo")
-    if sql_lyr is not None:
-        return 'fail'
+    assert sql_lyr is None
 
     sql_lyr = ds.ExecuteSQL("GetLayerMetadata foo")
-    if sql_lyr is not None:
-        return 'fail'
+    assert sql_lyr is None
 
     ds = None
 
@@ -251,21 +243,14 @@ def test_ogr_fgdb_DeleteField():
     ds = ogr.Open("tmp/test.gdb", update=1)
     lyr = ds.GetLayerByIndex(0)
 
-    if lyr.GetLayerDefn().GetFieldDefn(lyr.GetLayerDefn().GetFieldIndex('smallint')).GetSubType() != ogr.OFSTInt16:
-        return 'fail'
-    if lyr.GetLayerDefn().GetFieldDefn(lyr.GetLayerDefn().GetFieldIndex('smallint2')).GetSubType() != ogr.OFSTInt16:
-        return 'fail'
-    if lyr.GetLayerDefn().GetFieldDefn(lyr.GetLayerDefn().GetFieldIndex('float')).GetSubType() != ogr.OFSTFloat32:
-        return 'fail'
-    if lyr.GetLayerDefn().GetFieldDefn(lyr.GetLayerDefn().GetFieldIndex('float2')).GetSubType() != ogr.OFSTFloat32:
-        return 'fail'
+    assert lyr.GetLayerDefn().GetFieldDefn(lyr.GetLayerDefn().GetFieldIndex('smallint')).GetSubType() == ogr.OFSTInt16
+    assert lyr.GetLayerDefn().GetFieldDefn(lyr.GetLayerDefn().GetFieldIndex('smallint2')).GetSubType() == ogr.OFSTInt16
+    assert lyr.GetLayerDefn().GetFieldDefn(lyr.GetLayerDefn().GetFieldIndex('float')).GetSubType() == ogr.OFSTFloat32
+    assert lyr.GetLayerDefn().GetFieldDefn(lyr.GetLayerDefn().GetFieldIndex('float2')).GetSubType() == ogr.OFSTFloat32
 
-    if lyr.GetLayerDefn().GetFieldDefn(lyr.GetLayerDefn().GetFieldIndex('smallint')).GetWidth() != 0:
-        return 'fail'
-    if lyr.GetLayerDefn().GetFieldDefn(lyr.GetLayerDefn().GetFieldIndex('str')).GetWidth() != 0:
-        return 'fail'
-    if lyr.DeleteField(lyr.GetLayerDefn().GetFieldIndex('str')) != 0:
-        return 'fail'
+    assert lyr.GetLayerDefn().GetFieldDefn(lyr.GetLayerDefn().GetFieldIndex('smallint')).GetWidth() == 0
+    assert lyr.GetLayerDefn().GetFieldDefn(lyr.GetLayerDefn().GetFieldIndex('str')).GetWidth() == 0
+    assert lyr.DeleteField(lyr.GetLayerDefn().GetFieldIndex('str')) == 0
 
     # Needed since FileGDB v1.4, otherwise crash/error ...
     if True:  # pylint: disable=using-constant-test
@@ -281,27 +266,22 @@ def test_ogr_fgdb_DeleteField():
 
     # Test updating non-existing feature
     feat.SetFID(-10)
-    if lyr.SetFeature(feat) != ogr.OGRERR_NON_EXISTING_FEATURE:
-        gdaltest.post_reason('Expected failure of SetFeature().')
-        return 'fail'
+    assert lyr.SetFeature(feat) == ogr.OGRERR_NON_EXISTING_FEATURE, \
+        'Expected failure of SetFeature().'
 
     # Test deleting non-existing feature
-    if lyr.DeleteFeature(-10) != ogr.OGRERR_NON_EXISTING_FEATURE:
-        gdaltest.post_reason('Expected failure of DeleteFeature().')
-        return 'fail'
+    assert lyr.DeleteFeature(-10) == ogr.OGRERR_NON_EXISTING_FEATURE, \
+        'Expected failure of DeleteFeature().'
 
     feat = None
     ds = None
 
     ds = ogr.Open("tmp/test.gdb")
     lyr = ds.GetLayerByIndex(0)
-    if lyr.GetLayerDefn().GetFieldDefn(lyr.GetLayerDefn().GetFieldIndex('str2')).GetWidth() != 80:
-        return 'fail'
-    if lyr.GetLayerDefn().GetFieldIndex('str') != -1:
-        return 'fail'
+    assert lyr.GetLayerDefn().GetFieldDefn(lyr.GetLayerDefn().GetFieldIndex('str2')).GetWidth() == 80
+    assert lyr.GetLayerDefn().GetFieldIndex('str') == -1
     feat = lyr.GetNextFeature()
-    if feat.GetFieldAsString("str2") != "foo2_\xc3\xa9":
-        return 'fail'
+    assert feat.GetFieldAsString("str2") == "foo2_\xc3\xa9"
     ds = None
 
     return 'success'
@@ -320,9 +300,7 @@ def test_ogr_fgdb_2():
 
     ret = gdaltest.runexternal(test_cli_utilities.get_test_ogrsf_path() + ' -ro tmp/test.gdb --config OGR_SKIP OpenFileGDB')
 
-    if ret.find('INFO') == -1 or ret.find('ERROR') != -1:
-        print(ret)
-        return 'fail'
+    assert ret.find('INFO') != -1 and ret.find('ERROR') == -1
 
     return 'success'
 
@@ -346,9 +324,7 @@ def test_ogr_fgdb_3():
     gdaltest.runexternal(test_cli_utilities.get_ogr2ogr_path() + ' -f filegdb tmp/poly.gdb data/poly.shp -nlt MULTIPOLYGON -a_srs None')
 
     ds = ogr.Open('tmp/poly.gdb')
-    if ds is None or ds.GetLayerCount() == 0:
-        gdaltest.post_reason('ogr2ogr failed')
-        return 'fail'
+    assert not (ds is None or ds.GetLayerCount() == 0), 'ogr2ogr failed'
     ds = None
 
     if test_cli_utilities.get_test_ogrsf_path() is None:
@@ -357,9 +333,7 @@ def test_ogr_fgdb_3():
     ret = gdaltest.runexternal(test_cli_utilities.get_test_ogrsf_path() + ' tmp/poly.gdb')
     # print ret
 
-    if ret.find('INFO') == -1 or ret.find('ERROR') != -1:
-        print(ret)
-        return 'fail'
+    assert ret.find('INFO') != -1 and ret.find('ERROR') == -1
 
     return 'success'
 
@@ -381,11 +355,9 @@ def test_ogr_fgdb_sql():
 
     sql_lyr = ds.ExecuteSQL("SELECT * FROM POLY WHERE EAS_ID = 170", dialect='FileGDB')
     feat = sql_lyr.GetNextFeature()
-    if feat is None:
-        return 'fail'
+    assert feat is not None
     feat = sql_lyr.GetNextFeature()
-    if feat is not None:
-        return 'fail'
+    assert feat is None
     feat = None
     ds.ReleaseResultSet(sql_lyr)
     ds = None
@@ -428,9 +400,7 @@ def test_ogr_fgdb_4():
         lyr = ds.GetLayerByName('layer_to_remove')
         ds = None
 
-        if lyr is not None:
-            gdaltest.post_reason('failed at iteration %d' % j)
-            return 'fail'
+        assert lyr is None, ('failed at iteration %d' % j)
 
     return 'success'
 
@@ -442,9 +412,8 @@ def test_ogr_fgdb_5():
     if ogrtest.fgdb_drv is None:
         return 'skip'
 
-    if ogrtest.fgdb_drv.DeleteDataSource("tmp/test.gdb") != 0:
-        gdaltest.post_reason('DeleteDataSource() failed')
-        return 'fail'
+    assert ogrtest.fgdb_drv.DeleteDataSource("tmp/test.gdb") == 0, \
+        'DeleteDataSource() failed'
 
     try:
         os.stat("tmp/test.gdb")
@@ -472,8 +441,7 @@ def test_ogr_fgdb_6():
     ds = None
 
     ds = ogr.Open('tmp/test.gdb')
-    if ds.GetLayerCount() != 2:
-        return 'fail'
+    assert ds.GetLayerCount() == 2
     ds = None
 
     return 'success'
@@ -508,8 +476,7 @@ def test_ogr_fgdb_7():
 
     lyr.ResetReading()
     feat = lyr.GetNextFeature()
-    if feat.GetField(0) != 0:
-        return 'fail'
+    assert feat.GetField(0) == 0
     ds = None
 
     gdal.SetConfigOption('FGDB_BULK_LOAD', None)
@@ -549,9 +516,8 @@ def test_ogr_fgdb_8():
                       'A1234567890123456789012345678901234567890123456789012345678901_1',
                       'A1234567890123456789012345678901234567890123456789012345678901_2']
     for i in range(5):
-        if lyr_defn.GetFieldIndex(expected_names[i]) != i:
-            gdaltest.post_reason('did not find %s' % expected_names[i])
-            return 'fail'
+        assert lyr_defn.GetFieldIndex(expected_names[i]) == i, \
+            ('did not find %s' % expected_names[i])
 
     return 'success'
 
@@ -597,9 +563,7 @@ def test_ogr_fgdb_9():
                       _160char[0:158] + '_1',
                       _160char[0:158] + '_2']
     for i, exp_name in enumerate(expected_names):
-        if ds.GetLayerByIndex(i).GetName() != exp_name:
-            gdaltest.post_reason('did not find %s' % exp_name)
-            return 'fail'
+        assert ds.GetLayerByIndex(i).GetName() == exp_name, ('did not find %s' % exp_name)
 
     return 'success'
 
@@ -683,20 +647,15 @@ def test_ogr_fgdb_10():
 
     ds = ogr.Open('tmp/test.gdb')
     lyr = ds.GetLayerByName("srs_exact_4326")
-    if lyr.GetSpatialRef().ExportToWkt().find('4326') == -1:
-        return 'fail'
+    assert lyr.GetSpatialRef().ExportToWkt().find('4326') != -1
     lyr = ds.GetLayerByName("srs_approx_4326")
-    if lyr.GetSpatialRef().ExportToWkt().find('4326') == -1:
-        return 'fail'
+    assert lyr.GetSpatialRef().ExportToWkt().find('4326') != -1
     lyr = ds.GetLayerByName("srs_exact_2193")
-    if lyr.GetSpatialRef().ExportToWkt().find('2193') == -1:
-        return 'fail'
+    assert lyr.GetSpatialRef().ExportToWkt().find('2193') != -1
     lyr = ds.GetLayerByName("srs_approx_2193")
-    if lyr.GetSpatialRef().ExportToWkt().find('2193') == -1:
-        return 'fail'
+    assert lyr.GetSpatialRef().ExportToWkt().find('2193') != -1
     lyr = ds.GetLayerByName("srs_approx_4230")
-    if lyr.GetSpatialRef().ExportToWkt().find('4230') == -1:
-        return 'fail'
+    assert lyr.GetSpatialRef().ExportToWkt().find('4230') != -1
     ds = None
 
     return 'success'
@@ -783,8 +742,7 @@ def test_ogr_fgdb_12():
         return 'skip'
 
     ds = ogr.Open('tmp/non_existing.gdb')
-    if ds is not None:
-        return 'fail'
+    assert ds is None
 
     gdal.Unlink('tmp/dummy.gdb')
     try:
@@ -796,8 +754,7 @@ def test_ogr_fgdb_12():
     f.close()
 
     ds = ogr.Open('tmp/dummy.gdb')
-    if ds is not None:
-        return 'fail'
+    assert ds is None
 
     os.unlink('tmp/dummy.gdb')
 
@@ -806,8 +763,7 @@ def test_ogr_fgdb_12():
     gdal.PushErrorHandler('CPLQuietErrorHandler')
     ds = ogr.Open('tmp/dummy.gdb')
     gdal.PopErrorHandler()
-    if ds is not None:
-        return 'fail'
+    assert ds is None
 
     shutil.rmtree('tmp/dummy.gdb')
 
@@ -824,8 +780,7 @@ def test_ogr_fgdb_13():
     gdal.PushErrorHandler('CPLQuietErrorHandler')
     ds = ogrtest.fgdb_drv.CreateDataSource('tmp/foo')
     gdal.PopErrorHandler()
-    if ds is not None:
-        return 'fail'
+    assert ds is None
 
     f = open('tmp/dummy.gdb', 'wb')
     f.close()
@@ -833,8 +788,7 @@ def test_ogr_fgdb_13():
     gdal.PushErrorHandler('CPLQuietErrorHandler')
     ds = ogrtest.fgdb_drv.CreateDataSource('tmp/dummy.gdb')
     gdal.PopErrorHandler()
-    if ds is not None:
-        return 'fail'
+    assert ds is None
 
     os.unlink('tmp/dummy.gdb')
 
@@ -848,14 +802,12 @@ def test_ogr_fgdb_13():
     gdal.PushErrorHandler('CPLQuietErrorHandler')
     ds = ogrtest.fgdb_drv.CreateDataSource(name)
     gdal.PopErrorHandler()
-    if ds is not None:
-        return 'fail'
+    assert ds is None
 
     gdal.PushErrorHandler('CPLQuietErrorHandler')
     ret = ogrtest.fgdb_drv.DeleteDataSource(name)
     gdal.PopErrorHandler()
-    if ret == 0:
-        return 'fail'
+    assert ret != 0
 
     return 'success'
 
@@ -869,11 +821,9 @@ def test_ogr_fgdb_14():
 
     for _ in range(3):
         ds1 = ogr.Open("tmp/test.gdb")
-        if ds1 is None:
-            return 'fail'
+        assert ds1 is not None
         ds2 = ogr.Open("tmp/test.gdb")
-        if ds2 is None:
-            return 'fail'
+        assert ds2 is not None
         ds2 = None
         ds1 = None
 
@@ -898,10 +848,7 @@ def test_ogr_fgdb_15():
     sr = osr.SpatialReference()
     sr.ImportFromEPSG(3005)
     expected_wkt = sr.ExportToWkt()
-    if got_wkt != expected_wkt:
-        print(got_wkt)
-        print(expected_wkt)
-        return 'fail'
+    assert got_wkt == expected_wkt
     ds = None
 
     return 'success'
@@ -960,8 +907,7 @@ def test_ogr_fgdb_17():
     sr = osr.SpatialReference()
     sr.ImportFromEPSG(4326)
     lyr = ds.CreateLayer('test', geom_type=ogr.wkbPoint, srs=sr, options=['GEOMETRY_NULLABLE=NO'])
-    if lyr.GetLayerDefn().GetGeomFieldDefn(0).IsNullable() != 0:
-        return 'fail'
+    assert lyr.GetLayerDefn().GetGeomFieldDefn(0).IsNullable() == 0
     field_defn = ogr.FieldDefn('field_not_nullable', ogr.OFTString)
     field_defn.SetNullable(0)
     lyr.CreateField(field_defn)
@@ -972,8 +918,7 @@ def test_ogr_fgdb_17():
     f.SetField('field_not_nullable', 'not_null')
     f.SetGeometryDirectly(ogr.CreateGeometryFromWkt('POINT(0 0)'))
     ret = lyr.CreateFeature(f)
-    if ret != 0:
-        return 'fail'
+    assert ret == 0
     f = None
 
     # Error case: missing geometry
@@ -982,8 +927,7 @@ def test_ogr_fgdb_17():
     gdal.PushErrorHandler()
     ret = lyr.CreateFeature(f)
     gdal.PopErrorHandler()
-    if ret == 0:
-        return 'fail'
+    assert ret != 0
     f = None
 
     # Error case: missing non-nullable field
@@ -992,20 +936,16 @@ def test_ogr_fgdb_17():
     gdal.PushErrorHandler()
     ret = lyr.CreateFeature(f)
     gdal.PopErrorHandler()
-    if ret == 0:
-        return 'fail'
+    assert ret != 0
     f = None
 
     ds = None
 
     ds = ogr.Open('tmp/test.gdb', update=1)
     lyr = ds.GetLayerByName('test')
-    if lyr.GetLayerDefn().GetFieldDefn(lyr.GetLayerDefn().GetFieldIndex('field_not_nullable')).IsNullable() != 0:
-        return 'fail'
-    if lyr.GetLayerDefn().GetFieldDefn(lyr.GetLayerDefn().GetFieldIndex('field_nullable')).IsNullable() != 1:
-        return 'fail'
-    if lyr.GetLayerDefn().GetGeomFieldDefn(0).IsNullable() != 0:
-        return 'fail'
+    assert lyr.GetLayerDefn().GetFieldDefn(lyr.GetLayerDefn().GetFieldIndex('field_not_nullable')).IsNullable() == 0
+    assert lyr.GetLayerDefn().GetFieldDefn(lyr.GetLayerDefn().GetFieldIndex('field_nullable')).IsNullable() == 1
+    assert lyr.GetLayerDefn().GetGeomFieldDefn(0).IsNullable() == 0
 
     ds = None
 
@@ -1070,16 +1010,11 @@ def ogr_fgdb_18_test_results():
 
     ds = ogr.Open('tmp/test.gdb', update=1)
     lyr = ds.GetLayerByName('test')
-    if lyr.GetLayerDefn().GetFieldDefn(lyr.GetLayerDefn().GetFieldIndex('field_string')).GetDefault() != "'a''b'":
-        return 'fail'
+    assert lyr.GetLayerDefn().GetFieldDefn(lyr.GetLayerDefn().GetFieldIndex('field_string')).GetDefault() == "'a''b'"
     if ogrtest.openfilegdb_drv is not None:
-        if lyr.GetLayerDefn().GetFieldDefn(lyr.GetLayerDefn().GetFieldIndex('field_int')).GetDefault() != '123':
-            return 'fail'
-        if lyr.GetLayerDefn().GetFieldDefn(lyr.GetLayerDefn().GetFieldIndex('field_real')).GetDefault() != '1.23':
-            print(lyr.GetLayerDefn().GetFieldDefn(lyr.GetLayerDefn().GetFieldIndex('field_real')).GetDefault())
-            return 'fail'
-    if lyr.GetLayerDefn().GetFieldDefn(lyr.GetLayerDefn().GetFieldIndex('field_nodefault')).GetDefault() is not None:
-        return 'fail'
+        assert lyr.GetLayerDefn().GetFieldDefn(lyr.GetLayerDefn().GetFieldIndex('field_int')).GetDefault() == '123'
+        assert lyr.GetLayerDefn().GetFieldDefn(lyr.GetLayerDefn().GetFieldIndex('field_real')).GetDefault() == '1.23'
+    assert lyr.GetLayerDefn().GetFieldDefn(lyr.GetLayerDefn().GetFieldIndex('field_nodefault')).GetDefault() is None
     # if lyr.GetLayerDefn().GetFieldDefn(lyr.GetLayerDefn().GetFieldIndex('field_datetime')).GetDefault() != 'CURRENT_TIMESTAMP':
     #    gdaltest.post_reason('fail')
     #    return 'fail'
@@ -1151,52 +1086,45 @@ def test_ogr_fgdb_19():
     gdal.PushErrorHandler()
     ret = ds.StartTransaction(force=True)
     gdal.PopErrorHandler()
-    if ret == 0:
-        return 'fail'
+    assert ret != 0
     ds = None
 
     (bPerLayerCopyingForTransaction, ds) = ogr_fgdb_19_open_update('tmp/test.gdb')
 
-    if ds.TestCapability(ogr.ODsCEmulatedTransactions) != 1:
-        return 'fail'
+    assert ds.TestCapability(ogr.ODsCEmulatedTransactions) == 1
 
     # Error case: try in non-forced mode
     gdal.PushErrorHandler()
     ret = ds.StartTransaction(force=False)
     gdal.PopErrorHandler()
-    if ret == 0:
-        return 'fail'
+    assert ret != 0
 
     # Error case: try StartTransaction() with a ExecuteSQL layer still active
     sql_lyr = ds.ExecuteSQL('SELECT * FROM test')
     gdal.PushErrorHandler()
     ret = ds.StartTransaction(force=True)
     gdal.PopErrorHandler()
-    if ret == 0:
-        return 'fail'
+    assert ret != 0
     ds.ReleaseResultSet(sql_lyr)
 
     # Error case: call CommitTransaction() while there is no transaction
     gdal.PushErrorHandler()
     ret = ds.CommitTransaction()
     gdal.PopErrorHandler()
-    if ret == 0:
-        return 'fail'
+    assert ret != 0
 
     # Error case: call RollbackTransaction() while there is no transaction
     gdal.PushErrorHandler()
     ret = ds.RollbackTransaction()
     gdal.PopErrorHandler()
-    if ret == 0:
-        return 'fail'
+    assert ret != 0
 
     # Error case: try StartTransaction() with another active connection
     ds2 = ogr.Open('tmp/test.gdb', update=1)
     gdal.PushErrorHandler()
     ret = ds2.StartTransaction(force=True)
     gdal.PopErrorHandler()
-    if ret == 0:
-        return 'fail'
+    assert ret != 0
     ds2 = None
 
     # Successful StartTransaction() finally!
@@ -1207,8 +1135,7 @@ def test_ogr_fgdb_19():
     layer_created_before_transaction = ds.CreateLayer('layer_created_before_transaction', geom_type=ogr.wkbNone)
     layer_created_before_transaction_defn = layer_created_before_transaction.GetLayerDefn()
 
-    if ds.StartTransaction(force=True) != 0:
-        return 'fail'
+    assert ds.StartTransaction(force=True) == 0
 
     try:
         os.stat('tmp/test.gdb.ogredited')
@@ -1221,47 +1148,38 @@ def test_ogr_fgdb_19():
         pass
 
     ret = lyr.CreateField(ogr.FieldDefn('foobar', ogr.OFTString))
-    if ret != 0:
-        return 'fail'
+    assert ret == 0
 
     ret = lyr.DeleteField(lyr.GetLayerDefn().GetFieldIndex('foobar'))
-    if ret != 0:
-        return 'fail'
+    assert ret == 0
 
     gdal.PushErrorHandler()
     ret = lyr.CreateGeomField(ogr.GeomFieldDefn('foobar', ogr.wkbPoint))
     gdal.PopErrorHandler()
-    if ret == 0:
-        return 'fail'
+    assert ret != 0
 
     gdal.PushErrorHandler()
     ret = lyr.ReorderFields([i for i in range(lyr.GetLayerDefn().GetFieldCount())])
     gdal.PopErrorHandler()
-    if ret == 0:
-        return 'fail'
+    assert ret != 0
 
     gdal.PushErrorHandler()
     ret = lyr.AlterFieldDefn(0, ogr.FieldDefn('foo', ogr.OFTString), 0)
     gdal.PopErrorHandler()
-    if ret == 0:
-        return 'fail'
+    assert ret != 0
 
     f = ogr.Feature(lyr_defn)
     f.SetField('field_string', 'foo')
     lyr.CreateFeature(f)
     lyr.SetFeature(f)
     fid = f.GetFID()
-    if fid <= 0:
-        print(fid)
-        return 'fail'
+    assert fid > 0
     lyr.ResetReading()
     for i in range(fid):
         f = lyr.GetNextFeature()
-    if f.GetFID() != fid or f.GetField('field_string') != 'foo':
-        return 'fail'
+    assert f.GetFID() == fid and f.GetField('field_string') == 'foo'
     f = lyr.GetFeature(fid)
-    if f.GetFID() != fid or f.GetField('field_string') != 'foo':
-        return 'fail'
+    assert f.GetFID() == fid and f.GetField('field_string') == 'foo'
 
     f = ogr.Feature(layer_created_before_transaction_defn)
     layer_created_before_transaction.CreateFeature(f)
@@ -1270,16 +1188,14 @@ def test_ogr_fgdb_19():
     gdal.PushErrorHandler()
     ret = ds.StartTransaction(force=True)
     gdal.PopErrorHandler()
-    if ret == 0:
-        return 'fail'
+    assert ret != 0
 
     # Error case: try CommitTransaction() with a ExecuteSQL layer still active
     sql_lyr = ds.ExecuteSQL('SELECT * FROM test')
     gdal.PushErrorHandler()
     ret = ds.CommitTransaction()
     gdal.PopErrorHandler()
-    if ret == 0:
-        return 'fail'
+    assert ret != 0
     ds.ReleaseResultSet(sql_lyr)
 
     # Error case: try RollbackTransaction() with a ExecuteSQL layer still active
@@ -1287,13 +1203,11 @@ def test_ogr_fgdb_19():
     gdal.PushErrorHandler()
     ret = ds.RollbackTransaction()
     gdal.PopErrorHandler()
-    if ret == 0:
-        return 'fail'
+    assert ret != 0
     ds.ReleaseResultSet(sql_lyr)
 
     # Test that CommitTransaction() works
-    if ds.CommitTransaction() != 0:
-        return 'fail'
+    assert ds.CommitTransaction() == 0
 
     try:
         os.stat('tmp/test.gdb.ogredited')
@@ -1309,19 +1223,15 @@ def test_ogr_fgdb_19():
 
     lst = gdal.ReadDir('tmp/test.gdb')
     for filename in lst:
-        if filename.find('.tmp') >= 0:
-            print(lst)
-            return 'fail'
+        assert filename.find('.tmp') < 0, lst
 
     lyr_tmp = ds.GetLayer(0)
     lyr_tmp = ds.GetLayer(0)
     new_count = lyr_tmp.GetFeatureCount()
-    if new_count != old_count + 1:
-        return 'fail'
+    assert new_count == old_count + 1
     old_count = new_count
 
-    if layer_created_before_transaction.GetFeatureCount() != 1:
-        return 'fail'
+    assert layer_created_before_transaction.GetFeatureCount() == 1
 
     for i in range(ds.GetLayerCount()):
         if ds.GetLayer(i).GetName() == layer_created_before_transaction.GetName():
@@ -1333,20 +1243,16 @@ def test_ogr_fgdb_19():
     lyr_count = ds.GetLayerCount()
     ds.CreateLayer('layer_tmp', geom_type=ogr.wkbNone)
     ret = ds.StartTransaction(force=True)
-    if ret != 0:
-        return 'fail'
+    assert ret == 0
     ds.DeleteLayer(ds.GetLayerCount() - 1)
-    if ds.CommitTransaction() != 0:
-        return 'fail'
+    assert ds.CommitTransaction() == 0
 
     new_lyr_count = ds.GetLayerCount()
-    if new_lyr_count != lyr_count:
-        return 'fail'
+    assert new_lyr_count == lyr_count
 
     # Test that RollbackTransaction() works
     ret = ds.StartTransaction(force=True)
-    if ret != 0:
-        return 'fail'
+    assert ret == 0
 
     f = ogr.Feature(lyr_defn)
     lyr.CreateFeature(f)
@@ -1354,8 +1260,7 @@ def test_ogr_fgdb_19():
     layer_created_during_transaction = ds.CreateLayer('layer_created_during_transaction', geom_type=ogr.wkbNone)
     layer_created_during_transaction.CreateField(ogr.FieldDefn('foo', ogr.OFTString))
 
-    if ds.RollbackTransaction() != 0:
-        return 'fail'
+    assert ds.RollbackTransaction() == 0
 
     try:
         os.stat('tmp/test.gdb.ogredited')
@@ -1369,17 +1274,12 @@ def test_ogr_fgdb_19():
     except OSError:
         pass
 
-    if lyr.GetFeatureCount() != old_count:
-        print(lyr.GetFeatureCount())
-        print(old_count)
-        return 'fail'
+    assert lyr.GetFeatureCount() == old_count
 
     # Cannot retrieve the layer any more from fresh
-    if ds.GetLayerByName('layer_created_during_transaction') is not None:
-        return 'fail'
+    assert ds.GetLayerByName('layer_created_during_transaction') is None
     # Pointer is in ghost state
-    if layer_created_during_transaction.GetLayerDefn().GetFieldCount() != 0:
-        return 'fail'
+    assert layer_created_during_transaction.GetLayerDefn().GetFieldCount() == 0
 
     # Simulate an error case where StartTransaction() cannot copy backup files
     lyr_count = ds.GetLayerCount()
@@ -1388,13 +1288,9 @@ def test_ogr_fgdb_19():
     ret = ds.StartTransaction(force=True)
     gdal.PopErrorHandler()
     gdal.SetConfigOption('FGDB_SIMUL_FAIL', None)
-    if ret == 0:
-        return 'fail'
+    assert ret != 0
 
-    if ds.GetLayerCount() != lyr_count:
-        print(lyr_count)
-        print(ds.GetLayerCount())
-        return 'fail'
+    assert ds.GetLayerCount() == lyr_count
 
     # Simulate an error case where StartTransaction() cannot reopen database
     gdal.SetConfigOption('FGDB_SIMUL_FAIL', 'CASE2')
@@ -1402,11 +1298,9 @@ def test_ogr_fgdb_19():
     ret = ds.StartTransaction(force=True)
     gdal.PopErrorHandler()
     gdal.SetConfigOption('FGDB_SIMUL_FAIL', None)
-    if ret == 0:
-        return 'fail'
+    assert ret != 0
 
-    if ds.GetLayerCount() != 0:
-        return 'fail'
+    assert ds.GetLayerCount() == 0
     shutil.rmtree('tmp/test.gdb.ogredited')
 
     # Test method on ghost datasource and layer
@@ -1478,8 +1372,7 @@ def test_ogr_fgdb_19():
         layer_tmp = ds.CreateLayer('layer_tmp', geom_type=ogr.wkbNone)
         layer_tmp.CreateField(ogr.FieldDefn('foo', ogr.OFTString))
 
-        if ds.StartTransaction(force=True) != 0:
-            return 'fail'
+        assert ds.StartTransaction(force=True) == 0
 
         ds.DeleteLayer(ds.GetLayerCount() - 1)
 
@@ -1488,8 +1381,7 @@ def test_ogr_fgdb_19():
         ret = ds.CommitTransaction()
         gdal.PopErrorHandler()
         gdal.SetConfigOption('FGDB_SIMUL_FAIL', None)
-        if ret == 0:
-            return 'fail'
+        assert ret != 0
 
         ds = None
 
@@ -1497,9 +1389,7 @@ def test_ogr_fgdb_19():
 
         lst = gdal.ReadDir('tmp/test.gdb')
         for filename in lst:
-            if filename.find('.tmp') >= 0:
-                print(lst)
-                return 'fail'
+            assert filename.find('.tmp') < 0, lst
 
         # Test an error case where we simulate a failure in renaming
         # a file in original directory
@@ -1510,8 +1400,7 @@ def test_ogr_fgdb_19():
                 ds.DeleteLayer(i)
                 break
 
-        if ds.StartTransaction(force=True) != 0:
-            return 'fail'
+        assert ds.StartTransaction(force=True) == 0
 
         lyr = ds.GetLayer(0)
         f = lyr.GetNextFeature()
@@ -1523,8 +1412,7 @@ def test_ogr_fgdb_19():
         ret = ds.CommitTransaction()
         gdal.PopErrorHandler()
         gdal.SetConfigOption('FGDB_SIMUL_FAIL', None)
-        if ret == 0:
-            return 'fail'
+        assert ret != 0
 
         ds = None
 
@@ -1532,16 +1420,13 @@ def test_ogr_fgdb_19():
 
         lst = gdal.ReadDir('tmp/test.gdb')
         for filename in lst:
-            if filename.find('.tmp') >= 0:
-                print(lst)
-                return 'fail'
+            assert filename.find('.tmp') < 0, lst
 
         # Test an error case where we simulate a failure in moving
         # a file into original directory
         (bPerLayerCopyingForTransaction, ds) = ogr_fgdb_19_open_update('tmp/test.gdb')
 
-        if ds.StartTransaction(force=True) != 0:
-            return 'fail'
+        assert ds.StartTransaction(force=True) == 0
 
         lyr = ds.GetLayer(0)
         f = lyr.GetNextFeature()
@@ -1553,8 +1438,7 @@ def test_ogr_fgdb_19():
         ret = ds.CommitTransaction()
         gdal.PopErrorHandler()
         gdal.SetConfigOption('FGDB_SIMUL_FAIL', None)
-        if ret == 0:
-            return 'fail'
+        assert ret != 0
 
         ds = None
 
@@ -1570,8 +1454,7 @@ def test_ogr_fgdb_19():
         for case in ('CASE4', 'CASE5'):
             (bPerLayerCopyingForTransaction, ds) = ogr_fgdb_19_open_update('tmp/test.gdb')
 
-            if ds.StartTransaction(force=True) != 0:
-                return 'fail'
+            assert ds.StartTransaction(force=True) == 0
 
             lyr = ds.GetLayer(0)
             f = lyr.GetNextFeature()
@@ -1583,9 +1466,7 @@ def test_ogr_fgdb_19():
             ret = ds.CommitTransaction()
             gdal.PopErrorHandler()
             gdal.SetConfigOption('FGDB_SIMUL_FAIL', None)
-            if ret != 0:
-                print(case)
-                return 'fail'
+            assert ret == 0, case
 
             ds = None
 
@@ -1611,16 +1492,14 @@ def test_ogr_fgdb_19():
         lyr = ds.GetLayer(0)
         lyr_defn = lyr.GetLayerDefn()
 
-        if ds.StartTransaction(force=True) != 0:
-            return 'fail'
+        assert ds.StartTransaction(force=True) == 0
 
         gdal.SetConfigOption('FGDB_SIMUL_FAIL', 'CASE1')
         gdal.PushErrorHandler()
         ret = ds.CommitTransaction()
         gdal.PopErrorHandler()
         gdal.SetConfigOption('FGDB_SIMUL_FAIL', None)
-        if ret == 0:
-            return 'fail'
+        assert ret != 0
 
         ds = None
 
@@ -1629,16 +1508,14 @@ def test_ogr_fgdb_19():
         lyr = ds.GetLayer(0)
         lyr_defn = lyr.GetLayerDefn()
 
-        if ds.StartTransaction(force=True) != 0:
-            return 'fail'
+        assert ds.StartTransaction(force=True) == 0
 
         gdal.SetConfigOption('FGDB_SIMUL_FAIL', 'CASE2')
         gdal.PushErrorHandler()
         ret = ds.CommitTransaction()
         gdal.PopErrorHandler()
         gdal.SetConfigOption('FGDB_SIMUL_FAIL', None)
-        if ret == 0:
-            return 'fail'
+        assert ret != 0
 
         ds = None
         os.rename('tmp/test.gdb.ogrtmp', 'tmp/test.gdb')
@@ -1648,16 +1525,14 @@ def test_ogr_fgdb_19():
         lyr = ds.GetLayer(0)
         lyr_defn = lyr.GetLayerDefn()
 
-        if ds.StartTransaction(force=True) != 0:
-            return 'fail'
+        assert ds.StartTransaction(force=True) == 0
 
         gdal.SetConfigOption('FGDB_SIMUL_FAIL', 'CASE3')
         gdal.PushErrorHandler()
         ret = ds.CommitTransaction()
         gdal.PopErrorHandler()
         gdal.SetConfigOption('FGDB_SIMUL_FAIL', None)
-        if ret != 0:
-            return 'fail'
+        assert ret == 0
 
         ds = None
         shutil.rmtree('tmp/test.gdb.ogrtmp')
@@ -1667,19 +1542,16 @@ def test_ogr_fgdb_19():
     lyr = ds.GetLayer(0)
     lyr_defn = lyr.GetLayerDefn()
 
-    if ds.StartTransaction(force=True) != 0:
-        return 'fail'
+    assert ds.StartTransaction(force=True) == 0
 
     gdal.SetConfigOption('FGDB_SIMUL_FAIL', 'CASE_REOPEN')
     gdal.PushErrorHandler()
     ret = ds.CommitTransaction()
     gdal.PopErrorHandler()
     gdal.SetConfigOption('FGDB_SIMUL_FAIL', None)
-    if ret == 0:
-        return 'fail'
+    assert ret != 0
 
-    if ds.GetLayerCount() != 0:
-        return 'fail'
+    assert ds.GetLayerCount() == 0
 
     ds = None
 
@@ -1688,16 +1560,14 @@ def test_ogr_fgdb_19():
     lyr = ds.GetLayer(0)
     lyr_defn = lyr.GetLayerDefn()
 
-    if ds.StartTransaction(force=True) != 0:
-        return 'fail'
+    assert ds.StartTransaction(force=True) == 0
 
     gdal.SetConfigOption('FGDB_SIMUL_FAIL', 'CASE1')
     gdal.PushErrorHandler()
     ret = ds.RollbackTransaction()
     gdal.PopErrorHandler()
     gdal.SetConfigOption('FGDB_SIMUL_FAIL', None)
-    if ret == 0:
-        return 'fail'
+    assert ret != 0
 
     ds = None
     shutil.rmtree('tmp/test.gdb.ogredited')
@@ -1707,19 +1577,16 @@ def test_ogr_fgdb_19():
     lyr = ds.GetLayer(0)
     lyr_defn = lyr.GetLayerDefn()
 
-    if ds.StartTransaction(force=True) != 0:
-        return 'fail'
+    assert ds.StartTransaction(force=True) == 0
 
     gdal.SetConfigOption('FGDB_SIMUL_FAIL', 'CASE2')
     gdal.PushErrorHandler()
     ret = ds.RollbackTransaction()
     gdal.PopErrorHandler()
     gdal.SetConfigOption('FGDB_SIMUL_FAIL', None)
-    if ret == 0:
-        return 'fail'
+    assert ret != 0
 
-    if ds.GetLayerCount() != 0:
-        return 'fail'
+    assert ds.GetLayerCount() == 0
 
     ds = None
 
@@ -1787,15 +1654,13 @@ def test_ogr_fgdb_20():
     f = ogr.Feature(lyr.GetLayerDefn())
     f.SetField('id', 1)
     ret = lyr.CreateFeature(f)
-    if ret != 0 or f.GetFID() != 1 or lyr.GetMetadataItem('1', 'MAP_OGR_FID_TO_FGDB_FID') is not None:
-        return 'fail'
+    assert ret == 0 and f.GetFID() == 1 and lyr.GetMetadataItem('1', 'MAP_OGR_FID_TO_FGDB_FID') is None
 
     # Existing FID
     gdal.PushErrorHandler()
     ret = lyr.CreateFeature(f)
     gdal.PopErrorHandler()
-    if ret == 0:
-        return 'fail'
+    assert ret != 0
 
     for invalid_fid in [-2, 0, 9876543210]:
         f = ogr.Feature(lyr.GetLayerDefn())
@@ -1803,9 +1668,7 @@ def test_ogr_fgdb_20():
         gdal.PushErrorHandler()
         ret = lyr.CreateFeature(f)
         gdal.PopErrorHandler()
-        if ret == 0:
-            print(invalid_fid)
-            return 'fail'
+        assert ret != 0, invalid_fid
 
     f = ogr.Feature(lyr.GetLayerDefn())
     f.SetFID(2)
@@ -1825,8 +1688,7 @@ def test_ogr_fgdb_20():
     gdal.PushErrorHandler()
     ret = lyr.CreateFeature(f)
     gdal.PopErrorHandler()
-    if ret == 0:
-        return 'fail'
+    assert ret != 0
     ds2 = None
 
     ret = lyr.CreateFeature(f)
@@ -1839,28 +1701,23 @@ def test_ogr_fgdb_20():
     gdal.PushErrorHandler()
     ds2 = ogr.Open('tmp/test.gdb', update=1)
     gdal.PopErrorHandler()
-    if ds2 is not None:
-        return 'fail'
+    assert ds2 is None
     ds2 = None
 
     # Existing FID, but only in OGR space
     gdal.PushErrorHandler()
     ret = lyr.CreateFeature(f)
     gdal.PopErrorHandler()
-    if ret == 0:
-        return 'fail'
+    assert ret != 0
 
     # This FID exists as a FGDB ID, but should not be user visible.
     f.SetFID(3)
     ret = lyr.SetFeature(f)
-    if ret != ogr.OGRERR_NON_EXISTING_FEATURE:
-        return 'fail'
+    assert ret == ogr.OGRERR_NON_EXISTING_FEATURE
     ret = lyr.DeleteFeature(3)
-    if ret != ogr.OGRERR_NON_EXISTING_FEATURE:
-        return 'fail'
+    assert ret == ogr.OGRERR_NON_EXISTING_FEATURE
     ret = lyr.GetFeature(3)
-    if ret is not None:
-        return 'fail'
+    assert ret is None
 
     # Trying to set OGR FID = 3 --> FileGDB FID = 4
     f = ogr.Feature(lyr.GetLayerDefn())
@@ -1880,16 +1737,14 @@ def test_ogr_fgdb_20():
                 f = lyr.GetNextFeature()
             else:
                 f = lyr.GetFeature(fid)
-            if f is None:
-                return 'fail'
+            assert f is not None
             if f.GetFID() != fid or f.GetField('id') != fid:
                 f.DumpReadable()
                 print(fid)
                 return 'fail'
             got_fgdb_fid = lyr.GetMetadataItem(str(f.GetFID()), 'MAP_OGR_FID_TO_FGDB_FID')
             if got_fgdb_fid is None:
-                if fgdb_fid is not None:
-                    return 'fail'
+                assert fgdb_fid is None
             elif int(got_fgdb_fid) != fgdb_fid:
                 print(got_fgdb_fid)
                 print(fgdb_fid)
@@ -1905,29 +1760,23 @@ def test_ogr_fgdb_20():
         f = ogr.Feature(lyr.GetLayerDefn())
         f.SetFID(invalid_fid)
         ret = lyr.SetFeature(f)
-        if ret != ogr.OGRERR_NON_EXISTING_FEATURE:
-            return 'fail'
+        assert ret == ogr.OGRERR_NON_EXISTING_FEATURE
         ret = lyr.DeleteFeature(invalid_fid)
-        if ret != ogr.OGRERR_NON_EXISTING_FEATURE:
-            return 'fail'
+        assert ret == ogr.OGRERR_NON_EXISTING_FEATURE
 
     f = lyr.GetFeature(3)
     f.SetField('str', '3')
     ret = lyr.SetFeature(f)
-    if ret != 0:
-        return 'fail'
+    assert ret == 0
 
     f = lyr.GetFeature(3)
-    if f.GetField('str') != '3':
-        return 'fail'
+    assert f.GetField('str') == '3'
 
     ret = lyr.DeleteFeature(1)
-    if ret != 0:
-        return 'fail'
+    assert ret == 0
 
     ret = lyr.DeleteFeature(3)
-    if ret != 0:
-        return 'fail'
+    assert ret == 0
 
     for (fid, fgdb_fid) in [(3, 5), (2049, 6), (10, 7), (7, 8), (9, None), (8, 10), (12, 11)]:
         f = ogr.Feature(lyr.GetLayerDefn())
@@ -1953,8 +1802,7 @@ def test_ogr_fgdb_20():
     expected = [(2, None), (4, 3), (3, 5), (2049, 6), (10, 7), (7, 8), (9, None), (8, 10)]
     for (fid, fgdb_fid) in expected:
         f = lyr.GetNextFeature()
-        if f is None:
-            return 'fail'
+        assert f is not None
         if f.GetFID() != fid or f.GetField('id') != fid or str(lyr.GetMetadataItem(str(fid), 'MAP_OGR_FID_TO_FGDB_FID')) != str(fgdb_fid):
             f.DumpReadable()
             print(fid)
@@ -1999,8 +1847,7 @@ def test_ogr_fgdb_20():
     gdal.PushErrorHandler()
     ret = lyr.CreateFeature(f)
     gdal.PopErrorHandler()
-    if ret == 0:
-        return 'fail'
+    assert ret != 0
 
     ds.ReleaseResultSet(sql_lyr)
 
@@ -2038,18 +1885,13 @@ def test_ogr_fgdb_20():
     for update in [0, 1]:
         ds = ogr.Open('tmp/test.gdb', update=update)
         lyr = ds.GetLayerByName('ogr_fgdb_20')
-        if lyr.GetFeatureCount() != 10:
-            print(lyr.GetFeatureCount())
-            return 'fail'
+        assert lyr.GetFeatureCount() == 10
         lyr.ResetReading()
         expected = [2, 3, 4, 7, 8, 9, 10, 12, 13, 2049]
         for fid in expected:
             f = lyr.GetNextFeature()
-            if gdal.GetLastErrorType() != 0:
-                return 'fail'
-            if f is None:
-                print(fid)
-                return 'fail'
+            assert gdal.GetLastErrorType() == 0
+            assert f is not None, fid
             if f.GetFID() != fid or f.GetField('id') != fid:
                 f.DumpReadable()
                 print(fid)
@@ -2066,11 +1908,9 @@ def test_ogr_fgdb_20():
 
         lyr = ds.GetLayerByName('ogr_fgdb_20_simple')
         f = lyr.GetNextFeature()
-        if f.GetFID() != 2:
-            return 'fail'
+        assert f.GetFID() == 2
         f = lyr.GetNextFeature()
-        if f.GetFID() != 3:
-            return 'fail'
+        assert f.GetFID() == 3
 
         # Check attribute index
         lyr = ds.GetLayerByName('ogr_fgdb_20_indexes')
@@ -2079,10 +1919,7 @@ def test_ogr_fgdb_20():
             lyr.SetAttributeFilter('id = %d' % fid)
             lyr.ResetReading()
             f = lyr.GetNextFeature()
-            if f.GetFID() != fid:
-                print(f.GetFID())
-                print(fid)
-                return 'fail'
+            assert f.GetFID() == fid
 
         # Check spatial index
         lyr.SetAttributeFilter(None)
@@ -2092,10 +1929,7 @@ def test_ogr_fgdb_20():
                 lyr.SetSpatialFilterRect(i - 0.01, -0.01, i + 0.01, 0.01)
                 lyr.ResetReading()
                 f = lyr.GetNextFeature()
-                if f.GetFID() != fid:
-                    print(f.GetFID())
-                    print(fid)
-                    return 'fail'
+                assert f.GetFID() == fid
 
     # Insert new features
     ds = ogr.Open('tmp/test.gdb', update=1)
@@ -2132,18 +1966,13 @@ def test_ogr_fgdb_20():
     for update in [0, 1]:
         ds = ogr.Open('tmp/test.gdb', update=update)
         lyr = ds.GetLayerByName('ogr_fgdb_20')
-        if lyr.GetFeatureCount() != 16:
-            print(lyr.GetFeatureCount())
-            return 'fail'
+        assert lyr.GetFeatureCount() == 16
         lyr.ResetReading()
         expected = [2, 3, 4, 7, 8, 9, 10, 12, 13, 2049, 8191, 16384, 1000000, 1000001, 10000000, 10000001]
         for fid in expected:
             f = lyr.GetNextFeature()
-            if gdal.GetLastErrorType() != 0:
-                return 'fail'
-            if f is None:
-                print(fid)
-                return 'fail'
+            assert gdal.GetLastErrorType() == 0
+            assert f is not None, fid
             if f.GetFID() != fid or f.GetField('id') != fid:
                 f.DumpReadable()
                 print(fid)
@@ -2172,36 +2001,23 @@ def test_ogr_fgdb_20():
         gdal.SetConfigOption('FGDB_SIMUL_FAIL_REOPEN', None)
         gdal.PopErrorHandler()
         if case == 'CASE3':
-            if sql_lyr is None:
-                print(case)
-                return 'fail'
+            assert sql_lyr is not None, case
             ds.ReleaseResultSet(sql_lyr)
         else:
-            if sql_lyr is not None:
-                print(case)
-                return 'fail'
+            assert sql_lyr is None, case
 
         # Everything will fail, but hopefully without crashing
         lyr.ResetReading()
-        if lyr.GetNextFeature() is not None:
-            return 'fail'
-        if lyr.GetFeature(1) is not None:
-            return 'fail'
-        if lyr.DeleteFeature(1) == 0:
-            return 'fail'
-        if lyr.CreateFeature(f) == 0:
-            return 'fail'
-        if lyr.SetFeature(f) == 0:
-            return 'fail'
+        assert lyr.GetNextFeature() is None
+        assert lyr.GetFeature(1) is None
+        assert lyr.DeleteFeature(1) != 0
+        assert lyr.CreateFeature(f) != 0
+        assert lyr.SetFeature(f) != 0
         if case != 'CASE3':
-            if ds.CreateLayer('bar', geom_type=ogr.wkbNone) is not None:
-                return 'fail'
-            if ds.DeleteLayer(0) == 0:
-                return 'fail'
+            assert ds.CreateLayer('bar', geom_type=ogr.wkbNone) is None
+            assert ds.DeleteLayer(0) != 0
         sql_lyr = ds.ExecuteSQL('SELECT * FROM foo')
-        if case != 'CASE3' and sql_lyr is not None:
-            print(case)
-            return 'fail'
+        assert case == 'CASE3' or sql_lyr is None
         ds.ReleaseResultSet(sql_lyr)
 
         ds = None
@@ -2275,10 +2091,7 @@ def test_ogr_fgdb_21():
         elif expected_geom_type == ogr.wkbPolygonZM:
             expected_geom_type = ogr.wkbMultiPolygonZM
 
-        if lyr.GetGeomType() != expected_geom_type:
-            print(data)
-            print(lyr.GetGeomType())
-            return 'fail'
+        assert lyr.GetGeomType() == expected_geom_type, data
         feat = lyr.GetNextFeature()
         try:
             expected_wkt = data[3]
@@ -2313,8 +2126,7 @@ def test_ogr_fgdb_22():
         f_ref = lyr_ref.GetNextFeature()
         if ogrtest.check_feature_geometry(f, f_ref.GetGeometryRef()) != 0:
             print(f.GetGeometryRef().ExportToWkt())
-            print(f_ref.GetGeometryRef().ExportToWkt())
-            return 'fail'
+            pytest.fail(f_ref.GetGeometryRef().ExportToWkt())
 
     lyr = ds.GetLayerByName('polygon')
     ds_ref = ogr.Open('data/curves_polygon.csv')
@@ -2323,8 +2135,7 @@ def test_ogr_fgdb_22():
         f_ref = lyr_ref.GetNextFeature()
         if ogrtest.check_feature_geometry(f, f_ref.GetGeometryRef()) != 0:
             print(f.GetGeometryRef().ExportToWkt())
-            print(f_ref.GetGeometryRef().ExportToWkt())
-            return 'fail'
+            pytest.fail(f_ref.GetGeometryRef().ExportToWkt())
 
     ds = ogr.Open('data/curve_circle_by_center.gdb')
     lyr = ds.GetLayer(0)
@@ -2334,8 +2145,7 @@ def test_ogr_fgdb_22():
         f_ref = lyr_ref.GetNextFeature()
         if ogrtest.check_feature_geometry(f, f_ref.GetGeometryRef()) != 0:
             print(f.GetGeometryRef().ExportToWkt())
-            print(f_ref.GetGeometryRef().ExportToWkt())
-            return 'fail'
+            pytest.fail(f_ref.GetGeometryRef().ExportToWkt())
 
     return 'success'
 
@@ -2351,8 +2161,7 @@ def test_ogr_fgdb_23():
     os.chdir('data/curves.gdb')
     ds = ogr.Open('.')
     os.chdir('../..')
-    if ds is None:
-        return 'fail'
+    assert ds is not None
 
     return 'success'
 
@@ -2371,8 +2180,7 @@ def test_ogr_fgdb_24():
         f_ref = lyr_ref.GetNextFeature()
         if ogrtest.check_feature_geometry(f, f_ref.GetGeometryRef()) != 0:
             print(f.GetGeometryRef().ExportToIsoWkt())
-            print(f_ref.GetGeometryRef().ExportToIsoWkt())
-            return 'fail'
+            pytest.fail(f_ref.GetGeometryRef().ExportToIsoWkt())
 
     ds = ogr.Open('data/filegdb_polygonzm_nan_m_with_curves.gdb')
     lyr = ds.GetLayer(0)
@@ -2382,8 +2190,7 @@ def test_ogr_fgdb_24():
         f_ref = lyr_ref.GetNextFeature()
         if ogrtest.check_feature_geometry(f, f_ref.GetGeometryRef()) != 0:
             print(f.GetGeometryRef().ExportToIsoWkt())
-            print(f_ref.GetGeometryRef().ExportToIsoWkt())
-            return 'fail'
+            pytest.fail(f_ref.GetGeometryRef().ExportToIsoWkt())
 
     return 'success'
 
@@ -2395,15 +2202,13 @@ def test_ogr_fgdb_25():
 
     ds = ogr.Open('data/curves.gdb')
     sql_lyr = ds.ExecuteSQL('SELECT OBJECTID FROM polygon WHERE OBJECTID = 2')
-    if sql_lyr is None:
-        return 'fail'
+    assert sql_lyr is not None
     f = sql_lyr.GetNextFeature()
     if f.GetFID() != 2:
         f.DumpReadable()
         return 'fail'
     f = sql_lyr.GetNextFeature()
-    if f is not None:
-        return 'fail'
+    assert f is None
     ds.ReleaseResultSet(sql_lyr)
 
     lyr = ds.GetLayerByName('polygon')
diff --git a/autotest/ogr/ogr_fgdb_stress_test.py b/autotest/ogr/ogr_fgdb_stress_test.py
index 8155297b91a9..25a75d6a2acf 100755
--- a/autotest/ogr/ogr_fgdb_stress_test.py
+++ b/autotest/ogr/ogr_fgdb_stress_test.py
@@ -125,9 +125,7 @@ def ogr_fgdb_stress_test_1():
                 # So to ensure lyr_ref will use the same FID as the tested layer
                 fid = f.GetFID()
                 # print("created %d" % fid)
-            if ret[0] != ret[1]:
-                print(ret)
-                return 'fail'
+            assert ret[0] == ret[1]
             if ret[0] == 0:
                 nfeatures_created += 1
         # For some odd reason, the .spx file is no longer updated when doing
@@ -146,9 +144,7 @@ def ogr_fgdb_stress_test_1():
                 # gdal.PushErrorHandler()
                 ret.append(lyr.SetFeature(f))
                 # gdal.PopErrorHandler()
-            if ret[0] != ret[1]:
-                print(ret)
-                return 'fail'
+            assert ret[0] == ret[1]
         # Same for DeleteFeature()
         elif nfeatures_created >= 2:
             ret = []
@@ -159,9 +155,7 @@ def ogr_fgdb_stress_test_1():
                 # gdal.PushErrorHandler()
                 ret.append(lyr.DeleteFeature(fid))
                 # gdal.PopErrorHandler()
-            if ret[0] != ret[1]:
-                print(ret)
-                return 'fail'
+            assert ret[0] == ret[1]
 
     if in_transaction:
         ds_test.CommitTransaction()
@@ -185,8 +179,7 @@ def ogr_fgdb_stress_test_2():
     while True:
         f_test = lyr_test.GetNextFeature()
         f_ref = lyr_ref.GetNextFeature()
-        if (f_test is None and f_ref is not None) or (f_test is not None and f_ref is None):
-            return 'fail'
+        assert not (f_test is None and f_ref is not None) or (f_test is not None and f_ref is None)
         if f_test is None:
             break
         if f_test.GetFID() != f_ref.GetFID() or \
@@ -199,11 +192,7 @@ def ogr_fgdb_stress_test_2():
     for val in range(1000):
         lyr_test.SetAttributeFilter("str = '%d'" % val)
         lyr_ref.SetAttributeFilter("str = '%d'" % val)
-        if lyr_test.GetFeatureCount() != lyr_ref.GetFeatureCount():
-            print(val)
-            print(lyr_test.GetFeatureCount())
-            print(lyr_ref.GetFeatureCount())
-            return 'fail'
+        assert lyr_test.GetFeatureCount() == lyr_ref.GetFeatureCount(), val
 
     # sys.exit(0)
 
diff --git a/autotest/ogr/ogr_geoconcept.py b/autotest/ogr/ogr_geoconcept.py
index c1602c7bb7a4..7321d81a12aa 100755
--- a/autotest/ogr/ogr_geoconcept.py
+++ b/autotest/ogr/ogr_geoconcept.py
@@ -46,21 +46,14 @@ def test_ogr_gxt_1():
 
     gdaltest.gxt_ds = ogr.Open('data/expected_000_GRD.gxt')
 
-    if gdaltest.gxt_ds is None:
-        return 'fail'
+    assert gdaltest.gxt_ds is not None
 
-    if gdaltest.gxt_ds.GetLayerCount() != 1:
-        gdaltest.post_reason('Got wrong layer count.')
-        return 'fail'
+    assert gdaltest.gxt_ds.GetLayerCount() == 1, 'Got wrong layer count.'
 
     lyr = gdaltest.gxt_ds.GetLayer(0)
-    if lyr.GetName() != '000_GRD.000_GRD':
-        gdaltest.post_reason('got unexpected layer name.')
-        return 'fail'
+    assert lyr.GetName() == '000_GRD.000_GRD', 'got unexpected layer name.'
 
-    if lyr.GetFeatureCount() != 10:
-        gdaltest.post_reason('got wrong feature count.')
-        return 'fail'
+    assert lyr.GetFeatureCount() == 10, 'got wrong feature count.'
 
     expect = ['000-2007-0050-7130-LAMB93',
               '000-2007-0595-7130-LAMB93',
@@ -74,24 +67,20 @@ def test_ogr_gxt_1():
               '000-2007-0050-6585-LAMB93']
 
     tr = ogrtest.check_features_against_list(lyr, 'idSel', expect)
-    if not tr:
-        return 'fail'
+    assert tr
 
     lyr.ResetReading()
 
     feat = lyr.GetNextFeature()
 
-    if ogrtest.check_feature_geometry(feat,
+    assert (ogrtest.check_feature_geometry(feat,
                                       'MULTIPOLYGON (((50000 7130000,600000 7130000,600000 6580000,50000 6580000,50000 7130000)))',
-                                      max_error=0.000000001) != 0:
-        return 'fail'
+                                      max_error=0.000000001) == 0)
 
     srs = osr.SpatialReference()
     srs.SetFromUserInput('PROJCS["Lambert 93",GEOGCS["unnamed",DATUM["ITRS-89",SPHEROID["GRS 80",6378137,298.257222099657],TOWGS84[0,0,0,0,0,0,0]],PRIMEM["Greenwich",0],UNIT["degree",0.0174532925199433]],PROJECTION["Lambert_Conformal_Conic_2SP"],PARAMETER["standard_parallel_1",44],PARAMETER["standard_parallel_2",49],PARAMETER["latitude_of_origin",46.5],PARAMETER["central_meridian",3],PARAMETER["false_easting",700000],PARAMETER["false_northing",6600000]]')
 
-    if not lyr.GetSpatialRef().IsSame(srs):
-        gdaltest.post_reason('SRS is not the one expected.')
-        return 'fail'
+    assert lyr.GetSpatialRef().IsSame(srs), 'SRS is not the one expected.'
 
     return 'success'
 
@@ -103,21 +92,14 @@ def test_ogr_gxt_2():
 
     gdaltest.gxt_ds = ogr.Open('data/expected_000_GRD_TAB.txt')
 
-    if gdaltest.gxt_ds is None:
-        return 'fail'
+    assert gdaltest.gxt_ds is not None
 
-    if gdaltest.gxt_ds.GetLayerCount() != 1:
-        gdaltest.post_reason('Got wrong layer count.')
-        return 'fail'
+    assert gdaltest.gxt_ds.GetLayerCount() == 1, 'Got wrong layer count.'
 
     lyr = gdaltest.gxt_ds.GetLayer(0)
-    if lyr.GetName() != '000_GRD.000_GRD':
-        gdaltest.post_reason('got unexpected layer name.')
-        return 'fail'
+    assert lyr.GetName() == '000_GRD.000_GRD', 'got unexpected layer name.'
 
-    if lyr.GetFeatureCount() != 5:
-        gdaltest.post_reason('got wrong feature count.')
-        return 'fail'
+    assert lyr.GetFeatureCount() == 5, 'got wrong feature count.'
 
     expect = ['000-2007-0050-7130-LAMB93',
               '000-2007-0595-7130-LAMB93',
@@ -126,17 +108,15 @@ def test_ogr_gxt_2():
               '000-2007-0050-6585-LAMB93']
 
     tr = ogrtest.check_features_against_list(lyr, 'idSel', expect)
-    if not tr:
-        return 'fail'
+    assert tr
 
     lyr.ResetReading()
 
     feat = lyr.GetNextFeature()
 
-    if ogrtest.check_feature_geometry(feat,
+    assert (ogrtest.check_feature_geometry(feat,
                                       'MULTIPOLYGON (((50000 7130000,600000 7130000,600000 6580000,50000 6580000,50000 7130000)))',
-                                      max_error=0.000000001) != 0:
-        return 'fail'
+                                      max_error=0.000000001) == 0)
 
     return 'success'
 
@@ -176,9 +156,7 @@ def test_ogr_gxt_3():
     feat = src_lyr.GetNextFeature()
     while feat is not None:
         dst_feat.SetFrom(feat)
-        if gxt_lyr.CreateFeature(dst_feat) != 0:
-            gdaltest.post_reason('CreateFeature failed.')
-            return 'fail'
+        assert gxt_lyr.CreateFeature(dst_feat) == 0, 'CreateFeature failed.'
 
         feat = src_lyr.GetNextFeature()
 
@@ -188,45 +166,38 @@ def test_ogr_gxt_3():
     gdaltest.gxt_ds = ogr.Open('tmp/tmp.gxt')
     gxt_lyr = gdaltest.gxt_ds.GetLayerByName('points.points')
 
-    if not gxt_lyr.GetSpatialRef().IsSame(srs):
-        gdaltest.post_reason('Output SRS is not the one expected.')
-        return 'fail'
+    assert gxt_lyr.GetSpatialRef().IsSame(srs), 'Output SRS is not the one expected.'
 
     expect = ['PID1', 'PID2']
 
     tr = ogrtest.check_features_against_list(gxt_lyr, 'Primary_ID', expect)
-    if not tr:
-        return 'fail'
+    assert tr
 
     gxt_lyr.ResetReading()
 
     expect = ['SID1', 'SID2']
 
     tr = ogrtest.check_features_against_list(gxt_lyr, 'Secondary_ID', expect)
-    if not tr:
-        return 'fail'
+    assert tr
 
     gxt_lyr.ResetReading()
 
     expect = ['TID1', None]
 
     tr = ogrtest.check_features_against_list(gxt_lyr, 'Third_ID', expect)
-    if not tr:
-        return 'fail'
+    assert tr
 
     gxt_lyr.ResetReading()
 
     feat = gxt_lyr.GetNextFeature()
 
-    if ogrtest.check_feature_geometry(feat, 'POINT(0 1)',
-                                      max_error=0.000000001) != 0:
-        return 'fail'
+    assert (ogrtest.check_feature_geometry(feat, 'POINT(0 1)',
+                                      max_error=0.000000001) == 0)
 
     feat = gxt_lyr.GetNextFeature()
 
-    if ogrtest.check_feature_geometry(feat, 'POINT(2 3)',
-                                      max_error=0.000000001) != 0:
-        return 'fail'
+    assert (ogrtest.check_feature_geometry(feat, 'POINT(2 3)',
+                                      max_error=0.000000001) == 0)
 
     return 'success'
 
diff --git a/autotest/ogr/ogr_geojson.py b/autotest/ogr/ogr_geojson.py
index d3505a4f6f02..49e3aaacb02f 100755
--- a/autotest/ogr/ogr_geojson.py
+++ b/autotest/ogr/ogr_geojson.py
@@ -40,6 +40,7 @@
 
 import gdaltest
 import ogrtest
+import pytest
 ###############################################################################
 # Test utilities
 
@@ -221,24 +222,17 @@ def test_ogr_geojson_2():
         return 'skip'
 
     ds = ogr.Open('data/point.geojson')
-    if ds is None:
-        gdaltest.post_reason('Failed to open datasource')
-        return 'fail'
+    assert ds is not None, 'Failed to open datasource'
 
-    if ds.GetLayerCount() is not 1:
-        gdaltest.post_reason('Wrong number of layers')
-        return 'fail'
+    assert ds.GetLayerCount() is 1, 'Wrong number of layers'
 
     lyr = ds.GetLayerByName('point')
-    if lyr is None:
-        gdaltest.post_reason('Missing layer called point')
-        return 'fail'
+    assert lyr is not None, 'Missing layer called point'
 
     extent = (100.0, 100.0, 0.0, 0.0)
 
     rc = validate_layer(lyr, 'point', 1, ogr.wkbPoint, 0, extent)
-    if not rc:
-        return 'fail'
+    assert rc
 
     lyr = None
 
@@ -254,24 +248,17 @@ def test_ogr_geojson_3():
         return 'skip'
 
     ds = ogr.Open('data/linestring.geojson')
-    if ds is None:
-        gdaltest.post_reason('Failed to open datasource')
-        return 'fail'
+    assert ds is not None, 'Failed to open datasource'
 
-    if ds.GetLayerCount() is not 1:
-        gdaltest.post_reason('Wrong number of layers')
-        return 'fail'
+    assert ds.GetLayerCount() is 1, 'Wrong number of layers'
 
     lyr = ds.GetLayerByName('linestring')
-    if lyr is None:
-        gdaltest.post_reason('Missing layer called linestring')
-        return 'fail'
+    assert lyr is not None, 'Missing layer called linestring'
 
     extent = (100.0, 101.0, 0.0, 1.0)
 
     rc = validate_layer(lyr, 'linestring', 1, ogr.wkbLineString, 0, extent)
-    if not rc:
-        return 'fail'
+    assert rc
 
     lyr = None
 
@@ -287,24 +274,17 @@ def test_ogr_geojson_4():
         return 'skip'
 
     ds = ogr.Open('data/polygon.geojson')
-    if ds is None:
-        gdaltest.post_reason('Failed to open datasource')
-        return 'fail'
+    assert ds is not None, 'Failed to open datasource'
 
-    if ds.GetLayerCount() is not 1:
-        gdaltest.post_reason('Wrong number of layers')
-        return 'fail'
+    assert ds.GetLayerCount() is 1, 'Wrong number of layers'
 
     lyr = ds.GetLayerByName('polygon')
-    if lyr is None:
-        gdaltest.post_reason('Missing layer called polygon')
-        return 'fail'
+    assert lyr is not None, 'Missing layer called polygon'
 
     extent = (100.0, 101.0, 0.0, 1.0)
 
     rc = validate_layer(lyr, 'polygon', 1, ogr.wkbPolygon, 0, extent)
-    if not rc:
-        return 'fail'
+    assert rc
 
     lyr = None
 
@@ -320,24 +300,17 @@ def test_ogr_geojson_5():
         return 'skip'
 
     ds = ogr.Open('data/geometrycollection.geojson')
-    if ds is None:
-        gdaltest.post_reason('Failed to open datasource')
-        return 'fail'
+    assert ds is not None, 'Failed to open datasource'
 
-    if ds.GetLayerCount() is not 1:
-        gdaltest.post_reason('Wrong number of layers')
-        return 'fail'
+    assert ds.GetLayerCount() is 1, 'Wrong number of layers'
 
     lyr = ds.GetLayerByName('geometrycollection')
-    if lyr is None:
-        gdaltest.post_reason('Missing layer called geometrycollection')
-        return 'fail'
+    assert lyr is not None, 'Missing layer called geometrycollection'
 
     extent = (100.0, 102.0, 0.0, 1.0)
 
     rc = validate_layer(lyr, 'geometrycollection', 1, ogr.wkbGeometryCollection, 0, extent)
-    if not rc:
-        return 'fail'
+    assert rc
 
     lyr = None
 
@@ -353,24 +326,17 @@ def test_ogr_geojson_6():
         return 'skip'
 
     ds = ogr.Open('data/multipoint.geojson')
-    if ds is None:
-        gdaltest.post_reason('Failed to open datasource')
-        return 'fail'
+    assert ds is not None, 'Failed to open datasource'
 
-    if ds.GetLayerCount() is not 1:
-        gdaltest.post_reason('Wrong number of layers')
-        return 'fail'
+    assert ds.GetLayerCount() is 1, 'Wrong number of layers'
 
     lyr = ds.GetLayerByName('multipoint')
-    if lyr is None:
-        gdaltest.post_reason('Missing layer called multipoint')
-        return 'fail'
+    assert lyr is not None, 'Missing layer called multipoint'
 
     extent = (100.0, 101.0, 0.0, 1.0)
 
     rc = validate_layer(lyr, 'multipoint', 1, ogr.wkbMultiPoint, 0, extent)
-    if not rc:
-        return 'fail'
+    assert rc
 
     lyr = None
 
@@ -386,24 +352,17 @@ def test_ogr_geojson_7():
         return 'skip'
 
     ds = ogr.Open('data/multilinestring.geojson')
-    if ds is None:
-        gdaltest.post_reason('Failed to open datasource')
-        return 'fail'
+    assert ds is not None, 'Failed to open datasource'
 
-    if ds.GetLayerCount() is not 1:
-        gdaltest.post_reason('Wrong number of layers')
-        return 'fail'
+    assert ds.GetLayerCount() is 1, 'Wrong number of layers'
 
     lyr = ds.GetLayerByName('multilinestring')
-    if lyr is None:
-        gdaltest.post_reason('Missing layer called multilinestring')
-        return 'fail'
+    assert lyr is not None, 'Missing layer called multilinestring'
 
     extent = (100.0, 103.0, 0.0, 3.0)
 
     rc = validate_layer(lyr, 'multilinestring', 1, ogr.wkbMultiLineString, 0, extent)
-    if not rc:
-        return 'fail'
+    assert rc
 
     lyr = None
 
@@ -419,24 +378,17 @@ def test_ogr_geojson_8():
         return 'skip'
 
     ds = ogr.Open('data/multipolygon.geojson')
-    if ds is None:
-        gdaltest.post_reason('Failed to open datasource')
-        return 'fail'
+    assert ds is not None, 'Failed to open datasource'
 
-    if ds.GetLayerCount() is not 1:
-        gdaltest.post_reason('Wrong number of layers')
-        return 'fail'
+    assert ds.GetLayerCount() is 1, 'Wrong number of layers'
 
     lyr = ds.GetLayerByName('multipolygon')
-    if lyr is None:
-        gdaltest.post_reason('Missing layer called multipolygon')
-        return 'fail'
+    assert lyr is not None, 'Missing layer called multipolygon'
 
     extent = (100.0, 103.0, 0.0, 3.0)
 
     rc = validate_layer(lyr, 'multipolygon', 1, ogr.wkbMultiPolygon, 0, extent)
-    if not rc:
-        return 'fail'
+    assert rc
 
     lyr = None
 
@@ -464,14 +416,10 @@ def test_ogr_geojson_9():
         test = gdaltest.tests[i]
 
         rc = copy_shape_to_geojson(test[0])
-        if not rc:
-            gdaltest.post_reason('Failed making copy of ' + test[0] + '.shp')
-            return 'fail'
+        assert rc, ('Failed making copy of ' + test[0] + '.shp')
 
         rc = verify_geojson_copy(test[0], test[1], test[2])
-        if not rc:
-            gdaltest.post_reason('Verification of copy of ' + test[0] + '.shp failed')
-            return 'fail'
+        assert rc, ('Verification of copy of ' + test[0] + '.shp failed')
 
     return 'success'
 
@@ -497,14 +445,10 @@ def test_ogr_geojson_10():
         test = gdaltest.tests[i]
 
         rc = copy_shape_to_geojson(test[0], '/vsigzip/')
-        if not rc:
-            gdaltest.post_reason('Failed making copy of ' + test[0] + '.shp')
-            return 'fail'
+        assert rc, ('Failed making copy of ' + test[0] + '.shp')
 
         rc = verify_geojson_copy(test[0], test[1], test[2])
-        if not rc:
-            gdaltest.post_reason('Verification of copy of ' + test[0] + '.shp failed')
-            return 'fail'
+        assert rc, ('Verification of copy of ' + test[0] + '.shp failed')
 
     return 'success'
 
@@ -517,39 +461,28 @@ def test_ogr_geojson_11():
         return 'skip'
 
     ds = ogr.Open('data/srs_name.geojson')
-    if ds is None:
-        gdaltest.post_reason('Failed to open datasource')
-        return 'fail'
+    assert ds is not None, 'Failed to open datasource'
 
-    if ds.GetLayerCount() is not 1:
-        gdaltest.post_reason('Wrong number of layers')
-        return 'fail'
+    assert ds.GetLayerCount() is 1, 'Wrong number of layers'
 
     lyr = ds.GetLayerByName('srs_name')
-    if lyr is None:
-        gdaltest.post_reason('Missing layer called srs_name')
-        return 'fail'
+    assert lyr is not None, 'Missing layer called srs_name'
 
     extent = (100.0, 102.0, 0.0, 1.0)
 
     rc = validate_layer(lyr, 'srs_name', 1, ogr.wkbGeometryCollection, 0, extent)
-    if not rc:
-        return 'fail'
+    assert rc
 
     ref = lyr.GetSpatialRef()
     pcs = int(ref.GetAuthorityCode('PROJCS'))
-    if pcs != 26915:
-        gdaltest.post_reason('Spatial reference was not valid')
-        return 'fail'
+    assert pcs == 26915, 'Spatial reference was not valid'
 
     feature = lyr.GetNextFeature()
     geometry = feature.GetGeometryRef().GetGeometryRef(0)
 
     srs = geometry.GetSpatialReference()
     pcs = int(srs.GetAuthorityCode('PROJCS'))
-    if pcs != 26916:
-        gdaltest.post_reason('Spatial reference for individual geometry was not valid')
-        return 'fail'
+    assert pcs == 26916, 'Spatial reference for individual geometry was not valid'
 
     lyr = None
 
@@ -573,9 +506,7 @@ def test_ogr_geojson_12():
         return 'skip'
 
     ret = gdaltest.runexternal(test_cli_utilities.get_ogrinfo_path() + ' -ro -al \'{"type": "Point","coordinates": [100.0, 0.0]}\'')
-    if ret.find(' POINT (100 0)') == -1:
-        print(ret)
-        return 'fail'
+    assert ret.find(' POINT (100 0)') != -1
 
     return 'success'
 
@@ -591,9 +522,7 @@ def test_ogr_geojson_13():
     test = ['gjpoint', [1], ['Point 1']]
 
     rc = copy_shape_to_geojson(test[0], '/vsistdout/')
-    if not rc:
-        gdaltest.post_reason('Failed making copy of ' + test[0] + '.shp')
-        return 'fail'
+    assert rc, ('Failed making copy of ' + test[0] + '.shp')
 
     return 'success'
 
@@ -659,16 +588,12 @@ def test_ogr_geojson_15():
     if out != expected_out:
         out_json = json.loads(out)
         expected_out_json = json.loads(expected_out)
-        if out_json != expected_out_json:
-            print(out)
-            return 'fail'
+        assert out_json == expected_out_json, out
 
     out = feature.ExportToJson(as_object=True)
     expected_out = {'geometry': {'type': 'Point', 'coordinates': [1.0, 2.0]}, 'type': 'Feature', 'properties': {'foo': 'bar', "boolfield": True}, 'id': 0}
 
-    if out != expected_out:
-        print(out)
-        return 'fail'
+    assert out == expected_out
 
     return 'success'
 
@@ -682,31 +607,22 @@ def test_ogr_geojson_16():
         return 'skip'
 
     ds = ogr.Open('data/esripoint.json')
-    if ds is None:
-        gdaltest.post_reason('Failed to open datasource')
-        return 'fail'
+    assert ds is not None, 'Failed to open datasource'
 
-    if ds.GetLayerCount() is not 1:
-        gdaltest.post_reason('Wrong number of layers')
-        return 'fail'
+    assert ds.GetLayerCount() is 1, 'Wrong number of layers'
 
     lyr = ds.GetLayerByName('esripoint')
-    if lyr is None:
-        gdaltest.post_reason('Missing layer called esripoint')
-        return 'fail'
+    assert lyr is not None, 'Missing layer called esripoint'
 
     extent = (2, 2, 49, 49)
 
     rc = validate_layer(lyr, 'esripoint', 1, ogr.wkbPoint, 4, extent)
-    if not rc:
-        return 'fail'
+    assert rc
 
     ref = lyr.GetSpatialRef()
     gcs = int(ref.GetAuthorityCode('GEOGCS'))
 
-    if gcs != 4326:
-        gdaltest.post_reason("Spatial reference was not valid")
-        return 'fail'
+    assert gcs == 4326, "Spatial reference was not valid"
 
     feature = lyr.GetNextFeature()
     ref_geom = ogr.CreateGeometryFromWkt('POINT(2 49)')
@@ -745,21 +661,16 @@ def test_ogr_geojson_17():
         return 'skip'
 
     ds = ogr.Open('data/esrilinestring.json')
-    if ds is None:
-        gdaltest.post_reason('Failed to open datasource')
-        return 'fail'
+    assert ds is not None, 'Failed to open datasource'
 
-    if ds.GetLayerCount() is not 1:
-        gdaltest.post_reason('Wrong number of layers')
-        return 'fail'
+    assert ds.GetLayerCount() is 1, 'Wrong number of layers'
 
     lyr = ds.GetLayer(0)
 
     extent = (2, 3, 49, 50)
 
     rc = validate_layer(lyr, None, 1, ogr.wkbLineString, 0, extent)
-    if not rc:
-        return 'fail'
+    assert rc
 
     feature = lyr.GetNextFeature()
     ref_geom = ogr.CreateGeometryFromWkt('LINESTRING (2 49,3 50)')
@@ -804,21 +715,16 @@ def test_ogr_geojson_18():
         return 'skip'
 
     ds = ogr.Open('data/esripolygon.json')
-    if ds is None:
-        gdaltest.post_reason('Failed to open datasource')
-        return 'fail'
+    assert ds is not None, 'Failed to open datasource'
 
-    if ds.GetLayerCount() is not 1:
-        gdaltest.post_reason('Wrong number of layers')
-        return 'fail'
+    assert ds.GetLayerCount() is 1, 'Wrong number of layers'
 
     lyr = ds.GetLayer(0)
 
     extent = (-3, 3, 49, 50)
 
     rc = validate_layer(lyr, None, 1, ogr.wkbPolygon, 0, extent)
-    if not rc:
-        return 'fail'
+    assert rc
 
     feature = lyr.GetNextFeature()
     ref_geom = ogr.CreateGeometryFromWkt('MULTIPOLYGON (((2 49,2 50,3 50,3 49,2 49),(2.1 49.1,2.1 49.9,2.9 49.9,2.9 49.1,2.1 49.1)),((-2 49,-2 50,-3 50,-3 49,-2 49)))')
@@ -830,9 +736,7 @@ def test_ogr_geojson_18():
     ds = None
 
     ds = ogr.Open('data/esripolygonempty.json')
-    if ds is None:
-        gdaltest.post_reason('Failed to open datasource')
-        return 'fail'
+    assert ds is not None, 'Failed to open datasource'
     lyr = ds.GetLayer(0)
     feature = lyr.GetNextFeature()
     if feature.GetGeometryRef().ExportToWkt() != 'POLYGON EMPTY':
@@ -854,21 +758,16 @@ def test_ogr_geojson_19():
         return 'skip'
 
     ds = ogr.Open('data/esrimultipoint.json')
-    if ds is None:
-        gdaltest.post_reason('Failed to open datasource')
-        return 'fail'
+    assert ds is not None, 'Failed to open datasource'
 
-    if ds.GetLayerCount() is not 1:
-        gdaltest.post_reason('Wrong number of layers')
-        return 'fail'
+    assert ds.GetLayerCount() is 1, 'Wrong number of layers'
 
     lyr = ds.GetLayer(0)
 
     extent = (2, 3, 49, 50)
 
     rc = validate_layer(lyr, None, 1, ogr.wkbMultiPoint, 4, extent)
-    if not rc:
-        return 'fail'
+    assert rc
 
     feature = lyr.GetNextFeature()
     ref_geom = ogr.CreateGeometryFromWkt('MULTIPOINT (2 49,3 50)')
@@ -909,8 +808,7 @@ def test_ogr_geojson_20():
         if ds is None:
             print(gj)
             print(data.decode('LATIN1'))
-            gdaltest.post_reason('Failed to open datasource')
-            return 'fail'
+            pytest.fail('Failed to open datasource')
         ds = None
 
         gdal.Unlink('/vsimem/testgj')
@@ -931,9 +829,7 @@ def test_ogr_geojson_21():
  "geometry": {"type":"Point","coordinates":[1,2]},
  "properties": {"_id":"aid", "_rev":"arev", "type":"Feature",
                 "properties":{"intvalue" : 2, "floatvalue" : 3.2, "strvalue" : "foo", "properties": { "foo": "bar"}}}}]}""")
-    if ds is None:
-        gdaltest.post_reason('Failed to open datasource')
-        return 'fail'
+    assert ds is not None, 'Failed to open datasource'
 
     lyr = ds.GetLayerByName('OGRGeoJSON')
 
@@ -969,9 +865,7 @@ def test_ogr_geojson_22():
  "geometry": {"type":"Point","coordinates":[3,4]},
  "properties": {"_id":"aid2", "_rev":"arev2", "type":"Feature",
                 "properties":{"intvalue" : 3.5, "str2value" : "bar"}}}]}""")
-    if ds is None:
-        gdaltest.post_reason('Failed to open datasource')
-        return 'fail'
+    assert ds is not None, 'Failed to open datasource'
 
     lyr = ds.GetLayerByName('OGRGeoJSON')
 
@@ -1026,10 +920,7 @@ def test_ogr_geojson_23():
     sr_got = lyr.GetSpatialRef()
     ds = None
 
-    if sr_got.ExportToWkt() != sr.ExportToWkt():
-        gdaltest.post_reason('did not get expected SRS')
-        print(sr_got)
-        return 'fail'
+    assert sr_got.ExportToWkt() == sr.ExportToWkt(), 'did not get expected SRS'
 
     fp = gdal.VSIFOpenL('/vsimem/ogr_geojson_23.json', 'rb')
     data = gdal.VSIFReadL(1, 10000, fp).decode('ascii')
@@ -1037,15 +928,10 @@ def test_ogr_geojson_23():
 
     gdal.Unlink('/vsimem/ogr_geojson_23.json')
 
-    if data.find('"bbox": [ 1, 10, 2, 20 ]') == -1:
-        gdaltest.post_reason('did not find global bbox')
-        print(data)
-        return 'fail'
+    assert data.find('"bbox": [ 1, 10, 2, 20 ]') != -1, 'did not find global bbox'
 
-    if data.find('"bbox": [ 1.0, 10.0, 1.0, 10.0 ]') == -1:
-        gdaltest.post_reason('did not find first feature bbox')
-        print(data)
-        return 'fail'
+    assert data.find('"bbox": [ 1.0, 10.0, 1.0, 10.0 ]') != -1, \
+        'did not find first feature bbox'
 
     return 'success'
 
@@ -1081,14 +967,10 @@ def test_ogr_geojson_24():
             ds = ogr.Open('/vsimem/ogr_geojson_24.js')
             gdal.Unlink('/vsimem/ogr_geojson_24.js')
 
-        if ds is None:
-            gdaltest.post_reason('Failed to open datasource')
-            return 'fail'
+        assert ds is not None, 'Failed to open datasource'
 
         lyr = ds.GetLayerByName('layerFoo')
-        if lyr is None:
-            gdaltest.post_reason('cannot find layer')
-            return 'fail'
+        assert lyr is not None, 'cannot find layer'
 
         feature = lyr.GetNextFeature()
         ref_geom = ogr.CreateGeometryFromWkt('POINT (2 49)')
@@ -1098,9 +980,7 @@ def test_ogr_geojson_24():
             return 'fail'
 
         lyr = ds.GetLayerByName('layerBar')
-        if lyr is None:
-            gdaltest.post_reason('cannot find layer')
-            return 'fail'
+        assert lyr is not None, 'cannot find layer'
 
         feature = lyr.GetNextFeature()
         ref_geom = ogr.CreateGeometryFromWkt('POINT (2 49)')
@@ -1124,14 +1004,11 @@ def test_ogr_geojson_25():
 
     ds = ogr.Open('data/topojson1.topojson')
     lyr = ds.GetLayer(0)
-    if lyr.GetName() != 'a_layer':
-        return 'fail'
+    assert lyr.GetName() == 'a_layer'
     feat = lyr.GetNextFeature()
-    if ogrtest.check_feature_geometry(feat, 'LINESTRING (100 1000,110 1000,110 1100)') != 0:
-        return 'fail'
+    assert ogrtest.check_feature_geometry(feat, 'LINESTRING (100 1000,110 1000,110 1100)') == 0
     lyr = ds.GetLayer(1)
-    if lyr.GetName() != 'TopoJSON':
-        return 'fail'
+    assert lyr.GetName() == 'TopoJSON'
     expected_results = [
         (None, None, 'POINT EMPTY'),
         (None, None, 'POINT EMPTY'),
@@ -1169,8 +1046,7 @@ def test_ogr_geojson_25():
         (None, None, 'MULTILINESTRING ((100 1000,110 1000,110 1100,100 1100,100 1000))'),
         (None, None, 'MULTILINESTRING ((100 1000,110 1000,110 1100,100 1100,100 1000),(101 1010,101 1090,109 1090,109 1010,101 1010))'),
     ]
-    if lyr.GetFeatureCount() != len(expected_results):
-        return 'fail'
+    assert lyr.GetFeatureCount() == len(expected_results)
     for i, exp_result in enumerate(expected_results):
         feat = lyr.GetNextFeature()
         if feat.GetField('id') != exp_result[0] or \
@@ -1185,32 +1061,24 @@ def test_ogr_geojson_25():
 
     ds = ogr.Open('data/topojson2.topojson')
     lyr = ds.GetLayer(0)
-    if lyr.GetName() != 'a_layer':
-        return 'fail'
+    assert lyr.GetName() == 'a_layer'
     feat = lyr.GetNextFeature()
-    if ogrtest.check_feature_geometry(feat, 'LINESTRING (100 1000,110 1000,110 1100)') != 0:
-        return 'fail'
+    assert ogrtest.check_feature_geometry(feat, 'LINESTRING (100 1000,110 1000,110 1100)') == 0
     lyr = ds.GetLayer(1)
-    if lyr.GetName() != 'TopoJSON':
-        return 'fail'
+    assert lyr.GetName() == 'TopoJSON'
     feat = lyr.GetNextFeature()
-    if ogrtest.check_feature_geometry(feat, 'LINESTRING (100 1000,110 1000,110 1100)') != 0:
-        return 'fail'
+    assert ogrtest.check_feature_geometry(feat, 'LINESTRING (100 1000,110 1000,110 1100)') == 0
     ds = None
 
     ds = ogr.Open('data/topojson3.topojson')
     lyr = ds.GetLayer(0)
-    if lyr.GetName() != 'a_layer':
-        return 'fail'
+    assert lyr.GetName() == 'a_layer'
     feat = lyr.GetNextFeature()
-    if ogrtest.check_feature_geometry(feat, 'LINESTRING (0 0,10 0,0 10,10 0,0 0)') != 0:
-        return 'fail'
+    assert ogrtest.check_feature_geometry(feat, 'LINESTRING (0 0,10 0,0 10,10 0,0 0)') == 0
     lyr = ds.GetLayer(1)
-    if lyr.GetName() != 'TopoJSON':
-        return 'fail'
+    assert lyr.GetName() == 'TopoJSON'
     feat = lyr.GetNextFeature()
-    if ogrtest.check_feature_geometry(feat, 'LINESTRING (0 0,10 0,0 10,10 0,0 0)') != 0:
-        return 'fail'
+    assert ogrtest.check_feature_geometry(feat, 'LINESTRING (0 0,10 0,0 10,10 0,0 0)') == 0
     ds = None
 
     return 'success'
@@ -1232,13 +1100,10 @@ def test_ogr_geojson_26():
  "geometry": {"type":"Point","coordinates":[3,4]},
  "properties": { "intvalue" : 1234567890123, "intlist" : [1, 1234567890123] }},
  ]}""")
-    if ds is None:
-        gdaltest.post_reason('Failed to open datasource')
-        return 'fail'
+    assert ds is not None, 'Failed to open datasource'
 
     lyr = ds.GetLayerByName('OGRGeoJSON')
-    if lyr.GetMetadataItem(ogr.OLMD_FID64) is None:
-        return 'fail'
+    assert lyr.GetMetadataItem(ogr.OLMD_FID64) is not None
 
     feature = lyr.GetNextFeature()
     if feature.GetFID() != 1:
@@ -1283,9 +1148,7 @@ def test_ogr_geojson_26():
 
     gdal.Unlink('/vsimem/ogr_geojson_26.json')
 
-    if data.find('{ "type": "Feature", "id": 1234567890123, "properties": { "int64": 1234567890123, "int64list": [ 1234567890123 ] }, "geometry": null }') < 0:
-        print(data)
-        return 'fail'
+    assert data.find('{ "type": "Feature", "id": 1234567890123, "properties": { "int64": 1234567890123, "int64list": [ 1234567890123 ] }, "geometry": null }') >= 0
 
     return 'success'
 
@@ -1310,9 +1173,7 @@ def test_ogr_geojson_27():
  "properties": { "intvalue" : 12345678901231234567890123 }},
  ]}""")
     gdal.PopErrorHandler()
-    if ds is None:
-        gdaltest.post_reason('Failed to open datasource')
-        return 'fail'
+    assert ds is not None, 'Failed to open datasource'
 
     lyr = ds.GetLayerByName('OGRGeoJSON')
 
@@ -1341,13 +1202,9 @@ def test_ogr_geojson_28():
         return 'skip'
 
     ds = ogr.Open('data/esrizpoint.json')
-    if ds is None:
-        gdaltest.post_reason('Failed to open datasource')
-        return 'fail'
+    assert ds is not None, 'Failed to open datasource'
 
-    if ds.GetLayerCount() is not 1:
-        gdaltest.post_reason('Wrong number of layers')
-        return 'fail'
+    assert ds.GetLayerCount() is 1, 'Wrong number of layers'
 
     lyr = ds.GetLayer(0)
 
@@ -1355,15 +1212,12 @@ def test_ogr_geojson_28():
     extent = (2, 2, 49, 49, 1, 1)
 
     rc = validate_layer(lyr, None, 1, ogr.wkbPoint, 4, extent)
-    if not rc:
-        return 'fail'
+    assert rc
 
     ref = lyr.GetSpatialRef()
     gcs = int(ref.GetAuthorityCode('GEOGCS'))
 
-    if gcs != 4326:
-        gdaltest.post_reason("Spatial reference was not valid")
-        return 'fail'
+    assert gcs == 4326, "Spatial reference was not valid"
 
     feature = lyr.GetNextFeature()
     ref_geom = ogr.CreateGeometryFromWkt('POINT(2 49 1)')
@@ -1402,13 +1256,9 @@ def test_ogr_geojson_29():
         return 'skip'
 
     ds = ogr.Open('data/esrizlinestring.json')
-    if ds is None:
-        gdaltest.post_reason('Failed to open datasource')
-        return 'fail'
+    assert ds is not None, 'Failed to open datasource'
 
-    if ds.GetLayerCount() is not 1:
-        gdaltest.post_reason('Wrong number of layers')
-        return 'fail'
+    assert ds.GetLayerCount() is 1, 'Wrong number of layers'
 
     lyr = ds.GetLayer(0)
 
@@ -1416,8 +1266,7 @@ def test_ogr_geojson_29():
     extent = (2, 3, 49, 50, 1, 2)
 
     rc = validate_layer(lyr, None, 1, ogr.wkbLineString, 0, extent)
-    if not rc:
-        return 'fail'
+    assert rc
 
     feature = lyr.GetNextFeature()
     ref_geom = ogr.CreateGeometryFromWkt('LINESTRING (2 49 1,3 50 2)')
@@ -1440,13 +1289,9 @@ def test_ogr_geojson_30():
         return 'skip'
 
     ds = ogr.Open('data/esrizmultipoint.json')
-    if ds is None:
-        gdaltest.post_reason('Failed to open datasource')
-        return 'fail'
+    assert ds is not None, 'Failed to open datasource'
 
-    if ds.GetLayerCount() is not 1:
-        gdaltest.post_reason('Wrong number of layers')
-        return 'fail'
+    assert ds.GetLayerCount() is 1, 'Wrong number of layers'
 
     lyr = ds.GetLayer(0)
 
@@ -1454,8 +1299,7 @@ def test_ogr_geojson_30():
     extent = (2, 3, 49, 50, 1, 2)
 
     rc = validate_layer(lyr, None, 1, ogr.wkbMultiPoint, 4, extent)
-    if not rc:
-        return 'fail'
+    assert rc
 
     feature = lyr.GetNextFeature()
     ref_geom = ogr.CreateGeometryFromWkt('MULTIPOINT (2 49 1,3 50 2)')
@@ -1478,13 +1322,9 @@ def test_ogr_geojson_31():
         return 'skip'
 
     ds = ogr.Open('data/esrizpolygon.json')
-    if ds is None:
-        gdaltest.post_reason('Failed to open datasource')
-        return 'fail'
+    assert ds is not None, 'Failed to open datasource'
 
-    if ds.GetLayerCount() is not 1:
-        gdaltest.post_reason('Wrong number of layers')
-        return 'fail'
+    assert ds.GetLayerCount() is 1, 'Wrong number of layers'
 
     lyr = ds.GetLayer(0)
 
@@ -1492,8 +1332,7 @@ def test_ogr_geojson_31():
     extent = (2, 3, 49, 50, 1, 4)
 
     rc = validate_layer(lyr, None, 1, ogr.wkbPolygon, 0, extent)
-    if not rc:
-        return 'fail'
+    assert rc
 
     feature = lyr.GetNextFeature()
     ref_geom = ogr.CreateGeometryFromWkt('POLYGON ((2 49 1,2 50 2,3 50 3,3 49 4,2 49 1))')
@@ -1516,21 +1355,16 @@ def test_ogr_geojson_32():
         return 'skip'
 
     ds = ogr.Open('data/esrihasmnozmultipoint.json')
-    if ds is None:
-        gdaltest.post_reason('Failed to open datasource')
-        return 'fail'
+    assert ds is not None, 'Failed to open datasource'
 
-    if ds.GetLayerCount() is not 1:
-        gdaltest.post_reason('Wrong number of layers')
-        return 'fail'
+    assert ds.GetLayerCount() is 1, 'Wrong number of layers'
 
     lyr = ds.GetLayer(0)
 
     extent = (2, 3, 49, 50)
 
     rc = validate_layer(lyr, None, 1, ogr.wkbMultiPoint, 4, extent)
-    if not rc:
-        return 'fail'
+    assert rc
 
     feature = lyr.GetNextFeature()
     ref_geom = ogr.CreateGeometryFromWkt('MULTIPOINT M ((2 49 1),(3 50 2))')
@@ -1553,21 +1387,16 @@ def test_ogr_geojson_33():
         return 'skip'
 
     ds = ogr.Open('data/esriinvalidhaszmultipoint.json')
-    if ds is None:
-        gdaltest.post_reason('Failed to open datasource')
-        return 'fail'
+    assert ds is not None, 'Failed to open datasource'
 
-    if ds.GetLayerCount() is not 1:
-        gdaltest.post_reason('Wrong number of layers')
-        return 'fail'
+    assert ds.GetLayerCount() is 1, 'Wrong number of layers'
 
     lyr = ds.GetLayer(0)
 
     extent = (2, 3, 49, 50)
 
     rc = validate_layer(lyr, None, 1, ogr.wkbMultiPoint, 4, extent)
-    if not rc:
-        return 'fail'
+    assert rc
 
     feature = lyr.GetNextFeature()
     ref_geom = ogr.CreateGeometryFromWkt('MULTIPOINT (2 49,3 50)')
@@ -1590,21 +1419,16 @@ def test_ogr_geojson_34():
         return 'skip'
 
     ds = ogr.Open('data/esrizmmultipoint.json')
-    if ds is None:
-        gdaltest.post_reason('Failed to open datasource')
-        return 'fail'
+    assert ds is not None, 'Failed to open datasource'
 
-    if ds.GetLayerCount() is not 1:
-        gdaltest.post_reason('Wrong number of layers')
-        return 'fail'
+    assert ds.GetLayerCount() is 1, 'Wrong number of layers'
 
     lyr = ds.GetLayer(0)
 
     extent = (2, 3, 49, 50)
 
     rc = validate_layer(lyr, None, 1, ogr.wkbMultiPoint, 4, extent)
-    if not rc:
-        return 'fail'
+    assert rc
 
     feature = lyr.GetNextFeature()
     ref_geom = ogr.CreateGeometryFromWkt('MULTIPOINT ZM ((2 49 1 100),(3 50 2 100))')
@@ -1709,13 +1533,9 @@ def test_ogr_geojson_35():
 
     gdal.Unlink('/vsimem/ogr_geojson_35.json')
 
-    if data.find('-1.79') == -1 and data.find('e+308') == -1:
-        print(data)
-        return 'fail'
+    assert not (data.find('-1.79') == -1 and data.find('e+308') == -1)
     for ident in range(2, 8):
-        if data.find('{ "type": "Feature", "id": %d, "properties": { }, "geometry": null }' % ident) == -1:
-            print(data)
-            return 'fail'
+        assert data.find('{ "type": "Feature", "id": %d, "properties": { }, "geometry": null }' % ident) != -1
 
     return 'success'
 
@@ -1729,9 +1549,7 @@ def test_ogr_geojson_36():
         return 'skip'
 
     ds = ogr.Open('data/point_with_utf8bom.json')
-    if ds is None:
-        gdaltest.post_reason('Failed to open datasource')
-        return 'fail'
+    assert ds is not None, 'Failed to open datasource'
     ds = None
 
     return 'success'
@@ -1752,16 +1570,12 @@ def test_ogr_geojson_37():
 ] }""")
     lyr = ds.GetLayer(0)
     feat_defn = lyr.GetLayerDefn()
-    if feat_defn.GetFieldDefn(feat_defn.GetFieldIndex('bool')).GetType() != ogr.OFTInteger or \
-       feat_defn.GetFieldDefn(feat_defn.GetFieldIndex('bool')).GetSubType() != ogr.OFSTBoolean:
-        return 'fail'
-    if feat_defn.GetFieldDefn(feat_defn.GetFieldIndex('not_bool')).GetSubType() != ogr.OFSTNone:
-        return 'fail'
-    if feat_defn.GetFieldDefn(feat_defn.GetFieldIndex('bool_list')).GetType() != ogr.OFTIntegerList or \
-       feat_defn.GetFieldDefn(feat_defn.GetFieldIndex('bool_list')).GetSubType() != ogr.OFSTBoolean:
-        return 'fail'
-    if feat_defn.GetFieldDefn(feat_defn.GetFieldIndex('notbool_list')).GetSubType() != ogr.OFSTNone:
-        return 'fail'
+    assert (feat_defn.GetFieldDefn(feat_defn.GetFieldIndex('bool')).GetType() == ogr.OFTInteger and \
+       feat_defn.GetFieldDefn(feat_defn.GetFieldIndex('bool')).GetSubType() == ogr.OFSTBoolean)
+    assert feat_defn.GetFieldDefn(feat_defn.GetFieldIndex('not_bool')).GetSubType() == ogr.OFSTNone
+    assert (feat_defn.GetFieldDefn(feat_defn.GetFieldIndex('bool_list')).GetType() == ogr.OFTIntegerList and \
+       feat_defn.GetFieldDefn(feat_defn.GetFieldIndex('bool_list')).GetSubType() == ogr.OFSTBoolean)
+    assert feat_defn.GetFieldDefn(feat_defn.GetFieldIndex('notbool_list')).GetSubType() == ogr.OFSTNone
     f = lyr.GetNextFeature()
     if f.GetField('bool') != 0 or f.GetField('bool_list') != [0, 1]:
         f.DumpReadable()
@@ -1782,9 +1596,7 @@ def test_ogr_geojson_37():
 
     gdal.Unlink('/vsimem/ogr_geojson_37.json')
 
-    if data.find('"bool": false, "not_bool": 0, "bool_list": [ false, true ], "notbool_list": [ 0, 3 ]') < 0:
-        print(data)
-        return 'fail'
+    assert data.find('"bool": false, "not_bool": 0, "bool_list": [ false, true ], "notbool_list": [ 0, 3 ]') >= 0
 
     return 'success'
 
@@ -1804,18 +1616,12 @@ def test_ogr_geojson_38():
 ] }""")
     lyr = ds.GetLayer(0)
     feat_defn = lyr.GetLayerDefn()
-    if feat_defn.GetFieldDefn(feat_defn.GetFieldIndex('dt')).GetType() != ogr.OFTDateTime:
-        return 'fail'
-    if feat_defn.GetFieldDefn(feat_defn.GetFieldIndex('dt2')).GetType() != ogr.OFTDateTime:
-        return 'fail'
-    if feat_defn.GetFieldDefn(feat_defn.GetFieldIndex('date')).GetType() != ogr.OFTDate:
-        return 'fail'
-    if feat_defn.GetFieldDefn(feat_defn.GetFieldIndex('time')).GetType() != ogr.OFTTime:
-        return 'fail'
-    if feat_defn.GetFieldDefn(feat_defn.GetFieldIndex('no_dt')).GetType() != ogr.OFTString:
-        return 'fail'
-    if feat_defn.GetFieldDefn(feat_defn.GetFieldIndex('no_dt2')).GetType() != ogr.OFTString:
-        return 'fail'
+    assert feat_defn.GetFieldDefn(feat_defn.GetFieldIndex('dt')).GetType() == ogr.OFTDateTime
+    assert feat_defn.GetFieldDefn(feat_defn.GetFieldIndex('dt2')).GetType() == ogr.OFTDateTime
+    assert feat_defn.GetFieldDefn(feat_defn.GetFieldIndex('date')).GetType() == ogr.OFTDate
+    assert feat_defn.GetFieldDefn(feat_defn.GetFieldIndex('time')).GetType() == ogr.OFTTime
+    assert feat_defn.GetFieldDefn(feat_defn.GetFieldIndex('no_dt')).GetType() == ogr.OFTString
+    assert feat_defn.GetFieldDefn(feat_defn.GetFieldIndex('no_dt2')).GetType() == ogr.OFTString
     f = lyr.GetNextFeature()
     if f.GetField('dt') != '2014/11/20 12:34:56+01' or f.GetField('dt2') != '2014/11/20 00:00:00' or \
        f.GetField('date') != '2014/11/20' or f.GetField('time') != '12:34:56':
@@ -1843,8 +1649,7 @@ def test_ogr_geojson_39():
 ] }""")
     lyr = ds.GetLayer(0)
     feat_defn = lyr.GetLayerDefn()
-    if feat_defn.GetFieldDefn(0).GetName() != 'id' or feat_defn.GetFieldDefn(0).GetType() != ogr.OFTString:
-        return 'fail'
+    assert feat_defn.GetFieldDefn(0).GetName() == 'id' and feat_defn.GetFieldDefn(0).GetType() == ogr.OFTString
     feat = lyr.GetNextFeature()
     if feat.GetField('id') != 'foo' or feat.GetField('bar') != 'baz':
         feat.DumpReadable()
@@ -1856,8 +1661,7 @@ def test_ogr_geojson_39():
 ] }""")
     lyr = ds.GetLayer(0)
     feat_defn = lyr.GetLayerDefn()
-    if feat_defn.GetFieldDefn(0).GetName() != 'id' or feat_defn.GetFieldDefn(0).GetType() != ogr.OFTInteger:
-        return 'fail'
+    assert feat_defn.GetFieldDefn(0).GetName() == 'id' and feat_defn.GetFieldDefn(0).GetType() == ogr.OFTInteger
     feat = lyr.GetNextFeature()
     if feat.GetField('id') != 6:
         feat.DumpReadable()
@@ -1870,8 +1674,7 @@ def test_ogr_geojson_39():
 ] }""")
     lyr = ds.GetLayer(0)
     feat_defn = lyr.GetLayerDefn()
-    if feat_defn.GetFieldDefn(0).GetName() != 'id' or feat_defn.GetFieldDefn(0).GetType() != ogr.OFTInteger:
-        return 'fail'
+    assert feat_defn.GetFieldDefn(0).GetName() == 'id' and feat_defn.GetFieldDefn(0).GetType() == ogr.OFTInteger
     feat = lyr.GetNextFeature()
     if feat.GetField('id') != 6:
         feat.DumpReadable()
@@ -1883,8 +1686,7 @@ def test_ogr_geojson_39():
 ] }""")
     lyr = ds.GetLayer(0)
     feat_defn = lyr.GetLayerDefn()
-    if feat_defn.GetFieldDefn(0).GetName() != 'id' or feat_defn.GetFieldDefn(0).GetType() != ogr.OFTString:
-        return 'fail'
+    assert feat_defn.GetFieldDefn(0).GetName() == 'id' and feat_defn.GetFieldDefn(0).GetType() == ogr.OFTString
     feat = lyr.GetNextFeature()
     if feat.GetField('id') != 'baz':
         feat.DumpReadable()
@@ -1896,8 +1698,7 @@ def test_ogr_geojson_39():
 ] }""")
     lyr = ds.GetLayer(0)
     feat_defn = lyr.GetLayerDefn()
-    if feat_defn.GetFieldDefn(0).GetName() != 'ID' or feat_defn.GetFieldDefn(0).GetType() != ogr.OFTInteger:
-        return 'fail'
+    assert feat_defn.GetFieldDefn(0).GetName() == 'ID' and feat_defn.GetFieldDefn(0).GetType() == ogr.OFTInteger
     feat = lyr.GetNextFeature()
     if feat.GetFID() != 1 or feat.GetField('ID') != 2:
         feat.DumpReadable()
@@ -1911,9 +1712,7 @@ def test_ogr_geojson_39():
 { "type": "Feature", "id" : 1, "properties": { "foo": "baz" }, "geometry": null },
 { "type": "Feature", "id" : 2, "properties": { "foo": "baw" }, "geometry": null }
 ] }""")
-    if gdal.GetLastErrorMsg() == '':
-        gdaltest.post_reason('expected warning')
-        return 'fail'
+    assert gdal.GetLastErrorMsg() != '', 'expected warning'
     lyr = ds.GetLayer(0)
     feat_defn = lyr.GetLayerDefn()
     feat = lyr.GetNextFeature()
@@ -1935,8 +1734,7 @@ def test_ogr_geojson_39():
 ] }""")
     lyr = ds.GetLayer(0)
     feat_defn = lyr.GetLayerDefn()
-    if feat_defn.GetFieldDefn(0).GetName() != 'id' or feat_defn.GetFieldDefn(0).GetType() != ogr.OFTInteger:
-        return 'fail'
+    assert feat_defn.GetFieldDefn(0).GetName() == 'id' and feat_defn.GetFieldDefn(0).GetType() == ogr.OFTInteger
     feat = lyr.GetNextFeature()
     if feat.GetField('id') != -1:
         feat.DumpReadable()
@@ -1949,8 +1747,7 @@ def test_ogr_geojson_39():
 ] }""")
     lyr = ds.GetLayer(0)
     feat_defn = lyr.GetLayerDefn()
-    if feat_defn.GetFieldDefn(0).GetName() != 'id' or feat_defn.GetFieldDefn(0).GetType() != ogr.OFTInteger64:
-        return 'fail'
+    assert feat_defn.GetFieldDefn(0).GetName() == 'id' and feat_defn.GetFieldDefn(0).GetType() == ogr.OFTInteger64
     feat = lyr.GetNextFeature()
     if feat.GetField('id') != -1234567890123:
         feat.DumpReadable()
@@ -1963,8 +1760,7 @@ def test_ogr_geojson_39():
 ] }""")
     lyr = ds.GetLayer(0)
     feat_defn = lyr.GetLayerDefn()
-    if feat_defn.GetFieldDefn(0).GetName() != 'id' or feat_defn.GetFieldDefn(0).GetType() != ogr.OFTInteger64:
-        return 'fail'
+    assert feat_defn.GetFieldDefn(0).GetName() == 'id' and feat_defn.GetFieldDefn(0).GetType() == ogr.OFTInteger64
     feat = lyr.GetNextFeature()
     if feat.GetField('id') != -2:
         feat.DumpReadable()
@@ -1977,8 +1773,7 @@ def test_ogr_geojson_39():
 ] }""")
     lyr = ds.GetLayer(0)
     feat_defn = lyr.GetLayerDefn()
-    if feat_defn.GetFieldDefn(1).GetName() != 'id' or feat_defn.GetFieldDefn(1).GetType() != ogr.OFTInteger:
-        return 'fail'
+    assert feat_defn.GetFieldDefn(1).GetName() == 'id' and feat_defn.GetFieldDefn(1).GetType() == ogr.OFTInteger
     feat = lyr.GetNextFeature()
     if feat.GetField('id') != 1:
         feat.DumpReadable()
@@ -1992,8 +1787,7 @@ def test_ogr_geojson_39():
 ] }""")
     lyr = ds.GetLayer(0)
     feat_defn = lyr.GetLayerDefn()
-    if feat_defn.GetFieldDefn(0).GetName() != 'id' or feat_defn.GetFieldDefn(0).GetType() != ogr.OFTString:
-        return 'fail'
+    assert feat_defn.GetFieldDefn(0).GetName() == 'id' and feat_defn.GetFieldDefn(0).GetType() == ogr.OFTString
     feat = lyr.GetNextFeature()
     if feat.GetField('id') != '-2':
         feat.DumpReadable()
@@ -2065,25 +1859,21 @@ def test_ogr_geojson_41():
 
     # Check that by default we return a WGS 84 SRS
     g = ogr.CreateGeometryFromJson("{ 'type': 'Point', 'coordinates' : [ 2, 49] }")
-    if g.ExportToWkt() != 'POINT (2 49)':
-        return 'fail'
+    assert g.ExportToWkt() == 'POINT (2 49)'
     srs = g.GetSpatialReference()
     g = None
 
-    if srs.ExportToWkt().find('WGS 84') < 0:
-        return 'fail'
+    assert srs.ExportToWkt().find('WGS 84') >= 0
 
     # But if a crs object is set (allowed originally, but not recommended!), we use it
     g = ogr.CreateGeometryFromJson('{ "type": "Point", "coordinates" : [ 2, 49], "crs": { "type": "name", "properties": { "name": "urn:ogc:def:crs:EPSG::4322" } } }')
     srs = g.GetSpatialReference()
-    if srs.ExportToWkt().find('4322') < 0:
-        return 'fail'
+    assert srs.ExportToWkt().find('4322') >= 0
 
     # But if a crs object is set to null, set no crs
     g = ogr.CreateGeometryFromJson('{ "type": "Point", "coordinates" : [ 2, 49], "crs": null }')
     srs = g.GetSpatialReference()
-    if srs:
-        return 'fail'
+    assert not srs
 
     return 'success'
 
@@ -2121,11 +1911,9 @@ def test_ogr_geojson_42():
     ds = ogr.Open('/vsimem/geojson/test.json?resultRecordCount=1')
     lyr = ds.GetLayer(0)
     f = lyr.GetNextFeature()
-    if f is None or f.GetFID() != 1:
-        return 'fail'
+    assert f is not None and f.GetFID() == 1
     f = lyr.GetNextFeature()
-    if f is not None:
-        return 'fail'
+    assert f is None
     ds = None
     gdal.Unlink('/vsimem/geojson/test.json?resultRecordCount=1')
 
@@ -2135,11 +1923,9 @@ def test_ogr_geojson_42():
     gdal.PopErrorHandler()
     lyr = ds.GetLayer(0)
     f = lyr.GetNextFeature()
-    if f is None or f.GetFID() != 1:
-        return 'fail'
+    assert f is not None and f.GetFID() == 1
     f = lyr.GetNextFeature()
-    if f is not None:
-        return 'fail'
+    assert f is None
     ds = None
     gdal.Unlink('/vsimem/geojson/test.json?resultRecordCount=10')
 
@@ -2149,15 +1935,12 @@ def test_ogr_geojson_42():
     ds = ogr.Open('/vsimem/geojson/test.json?')
     lyr = ds.GetLayer(0)
     f = lyr.GetNextFeature()
-    if f is None or f.GetFID() != 1:
-        return 'fail'
+    assert f is not None and f.GetFID() == 1
     f = lyr.GetNextFeature()
-    if f is not None:
-        return 'fail'
+    assert f is None
     lyr.ResetReading()
     f = lyr.GetNextFeature()
-    if f is None or f.GetFID() != 1:
-        return 'fail'
+    assert f is not None and f.GetFID() == 1
 
     resultOffset1 = """
 { "type":"FeatureCollection",
@@ -2176,46 +1959,35 @@ def test_ogr_geojson_42():
     } ] }"""
     gdal.FileFromMemBuffer('/vsimem/geojson/test.json?resultRecordCount=1&resultOffset=1', resultOffset1)
     f = lyr.GetNextFeature()
-    if f is None or f.GetFID() != 2:
-        return 'fail'
+    assert f is not None and f.GetFID() == 2
     f = lyr.GetNextFeature()
-    if f is not None:
-        return 'fail'
+    assert f is None
 
     gdal.PushErrorHandler()
     fc = lyr.GetFeatureCount()
     gdal.PopErrorHandler()
-    if fc != 2:
-        return 'fail'
+    assert fc == 2
 
     gdal.FileFromMemBuffer('/vsimem/geojson/test.json?resultRecordCount=1&returnCountOnly=true',
                            """{ "count": 123456}""")
     fc = lyr.GetFeatureCount()
-    if fc != 123456:
-        return 'fail'
+    assert fc == 123456
 
     gdal.PushErrorHandler()
     extent = lyr.GetExtent()
     gdal.PopErrorHandler()
-    if extent != (2, 2, 49, 49):
-        print(extent)
-        return 'fail'
+    assert extent == (2, 2, 49, 49)
 
     gdal.FileFromMemBuffer('/vsimem/geojson/test.json?resultRecordCount=1&returnExtentOnly=true&f=geojson',
                            """{"type":"FeatureCollection","bbox":[1, 2, 3, 4],"features":[]}""")
     extent = lyr.GetExtent()
-    if extent != (1.0, 3.0, 2.0, 4.0):
-        print(extent)
-        return 'fail'
+    assert extent == (1.0, 3.0, 2.0, 4.0)
 
-    if lyr.TestCapability(ogr.OLCFastFeatureCount) != 1:
-        return 'fail'
+    assert lyr.TestCapability(ogr.OLCFastFeatureCount) == 1
 
-    if lyr.TestCapability(ogr.OLCFastGetExtent) != 0:
-        return 'fail'
+    assert lyr.TestCapability(ogr.OLCFastGetExtent) == 0
 
-    if lyr.TestCapability('foo') != 0:
-        return 'fail'
+    assert lyr.TestCapability('foo') == 0
 
     # Test scrolling with ESRI json
     resultOffset0 = """
@@ -2274,11 +2046,9 @@ def test_ogr_geojson_42():
     ds = ogr.Open('/vsimem/geojson/test.json?resultRecordCount=1')
     lyr = ds.GetLayer(0)
     f = lyr.GetNextFeature()
-    if f is None or f.GetFID() != 1:
-        return 'fail'
+    assert f is not None and f.GetFID() == 1
     f = lyr.GetNextFeature()
-    if f is None or f.GetFID() != 20:
-        return 'fail'
+    assert f is not None and f.GetFID() == 20
     ds = None
     gdal.Unlink('/vsimem/geojson/test.json?resultRecordCount=1')
     gdal.Unlink('/vsimem/geojson/test.json?resultRecordCount=1&resultOffset=1')
@@ -2295,9 +2065,7 @@ def test_ogr_geojson_43():
 
     ds = ogr.Open("""{"type": "FeatureCollection", "features":[
 {"type": "Feature", "properties": {"foo": "bar"}}]}""")
-    if ds is None:
-        gdaltest.post_reason('Failed to open datasource')
-        return 'fail'
+    assert ds is not None, 'Failed to open datasource'
 
     lyr = ds.GetLayerByName('OGRGeoJSON')
 
@@ -2343,13 +2111,9 @@ def test_ogr_geojson_45():
             ds = gdal.OpenEx('/vsimem/ogr_geojson_45.json', gdal.OF_VECTOR, open_options=['NATIVE_DATA=YES'])
         lyr = ds.GetLayer(0)
         native_data = lyr.GetMetadataItem("NATIVE_DATA", "NATIVE_DATA")
-        if native_data != '{ "foo": "bar", "bar": "baz" }':
-            print(native_data)
-            return 'fail'
+        assert native_data == '{ "foo": "bar", "bar": "baz" }'
         native_media_type = lyr.GetMetadataItem("NATIVE_MEDIA_TYPE", "NATIVE_DATA")
-        if native_media_type != 'application/vnd.geo+json':
-            print(native_media_type)
-            return 'fail'
+        assert native_media_type == 'application/vnd.geo+json'
         f = lyr.GetNextFeature()
         native_data = f.GetNativeData()
         if i == 0:
@@ -2358,13 +2122,9 @@ def test_ogr_geojson_45():
                 '{ "type": "Feature", "foo": [ "bar", "baz", 1.0, true, false, [ ], { } ], "properties": { "myprop": "myvalue" }, "geometry": null }']
         else:
             expected = ['{"type":"Feature","foo":["bar","baz",1.0,true,false,[],{}],"properties":{"myprop":"myvalue"},"geometry":null}']
-        if native_data not in expected:
-            print(native_data)
-            return 'fail'
+        assert native_data in expected
         native_media_type = f.GetNativeMediaType()
-        if native_media_type != 'application/vnd.geo+json':
-            print(native_media_type)
-            return 'fail'
+        assert native_media_type == 'application/vnd.geo+json'
         ds = None
         if i == 1:
             gdal.Unlink('/vsimem/ogr_geojson_45.json')
@@ -2394,18 +2154,16 @@ def test_ogr_geojson_45():
 
     gdal.Unlink('/vsimem/ogr_geojson_45.json')
 
-    if data.find('"bbox": [ 0, 1, 2, 0, 1, 2 ],') < 0 or \
-       data.find('"foo": "bar"') < 0 or data.find('"bar": "baz"') < 0 or \
-       data.find('"foo_feature": "bar_feature"') < 0 or \
-       data.find('"foo_gc": "bar_gc"') < 0 or \
-       data.find('"foo_point": "bar_point"') < 0 or data.find('3') < 0 or \
-       data.find('"foo_linestring": "bar_linestring"') < 0 or data.find('4') < 0 or \
-       data.find('"foo_multipoint": "bar_multipoint"') < 0 or data.find('5') < 0 or \
-       data.find('"foo_multilinestring": "bar_multilinestring"') < 0 or data.find('6') < 0 or \
-       data.find('"foo_polygon": "bar_polygon"') < 0 or data.find('7') < 0 or \
-       data.find('"foo_multipolygon": "bar_multipolygon"') < 0 or data.find('8') < 0:
-        print(data)
-        return 'fail'
+    assert (data.find('"bbox": [ 0, 1, 2, 0, 1, 2 ],') >= 0 and \
+       data.find('"foo": "bar"') >= 0 and data.find('"bar": "baz"') >= 0 and \
+       data.find('"foo_feature": "bar_feature"') >= 0 and \
+       data.find('"foo_gc": "bar_gc"') >= 0 and \
+       data.find('"foo_point": "bar_point"') >= 0 and data.find('3') >= 0 and \
+       data.find('"foo_linestring": "bar_linestring"') >= 0 and data.find('4') >= 0 and \
+       data.find('"foo_multipoint": "bar_multipoint"') >= 0 and data.find('5') >= 0 and \
+       data.find('"foo_multilinestring": "bar_multilinestring"') >= 0 and data.find('6') >= 0 and \
+       data.find('"foo_polygon": "bar_polygon"') >= 0 and data.find('7') >= 0 and \
+       data.find('"foo_multipolygon": "bar_multipolygon"') >= 0 and data.find('8') >= 0)
 
     # Test native support with string id
     src_ds = gdal.OpenEx("""{
@@ -2430,9 +2188,7 @@ def test_ogr_geojson_45():
 ]
 }
 """
-    if json.loads(got) != json.loads(expected):
-        print(got)
-        return 'fail'
+    assert json.loads(got) == json.loads(expected)
 
     # Test native support with numeric id
     src_ds = gdal.OpenEx("""{
@@ -2457,9 +2213,7 @@ def test_ogr_geojson_45():
 ]
 }
 """
-    if json.loads(got) != json.loads(expected):
-        print(got)
-        return 'fail'
+    assert json.loads(got) == json.loads(expected)
 
     return 'success'
 
@@ -2485,9 +2239,7 @@ def test_ogr_geojson_46():
 
     gdal.Unlink('/vsimem/ogr_geojson_46.json')
 
-    if data.find('{ "myprop": { "a": "b" } }') < 0:
-        print(data)
-        return 'fail'
+    assert data.find('{ "myprop": { "a": "b" } }') >= 0
 
     return 'success'
 
@@ -2502,8 +2254,7 @@ def test_ogr_geojson_47():
     # ERROR 6: Update from inline definition not supported
     with gdaltest.error_handler():
         ds = ogr.Open('{"type": "FeatureCollection", "features":[]}', update=1)
-    if ds is not None:
-        return 'fail'
+    assert ds is None
 
     gdal.FileFromMemBuffer('/vsimem/ogr_geojson_47.json',
                            """{"type": "FeatureCollection", "foo": "bar",
@@ -2525,11 +2276,9 @@ def test_ogr_geojson_47():
         data = None
 
     # we don't want crs if there's no in the source
-    if data.find('"foo": "bar"') < 0 or data.find('"bar": "baz"') < 0 or \
-       data.find('crs') >= 0 or \
-       data.find('"myprop": "another_value"') < 0:
-        print(data)
-        return 'fail'
+    assert (data.find('"foo": "bar"') >= 0 and data.find('"bar": "baz"') >= 0 and \
+       data.find('crs') < 0 and \
+       data.find('"myprop": "another_value"') >= 0)
 
     # Test append support
     ds = ogr.Open('/vsimem/ogr_geojson_47.json', update=1)
@@ -2561,8 +2310,7 @@ def test_ogr_geojson_47():
 
     ds = ogr.Open('/vsimem/ogr_geojson_47.json')
     lyr = ds.GetLayer(0)
-    if lyr.GetFeatureCount() != 4:
-        return 'fail'
+    assert lyr.GetFeatureCount() == 4
     ds = None
 
     fp = gdal.VSIFOpenL('/vsimem/ogr_geojson_47.json', 'rb')
@@ -2573,13 +2321,11 @@ def test_ogr_geojson_47():
         data = None
 
     # we don't want crs if there's no in the source
-    if data.find('"foo": "bar"') < 0 or data.find('"bar": "baz"') < 0 or \
-       data.find('crs') >= 0 or \
-       data.find('"myprop": "another_value"') < 0 or \
-       data.find('"myprop": "value_of_point_4_5"') < 0 or \
-       data.find('id') >= 0:
-        print(data)
-        return 'fail'
+    assert (data.find('"foo": "bar"') >= 0 and data.find('"bar": "baz"') >= 0 and \
+       data.find('crs') < 0 and \
+       data.find('"myprop": "another_value"') >= 0 and \
+       data.find('"myprop": "value_of_point_4_5"') >= 0 and \
+       data.find('id') < 0)
 
     gdal.Unlink('/vsimem/ogr_geojson_47.json')
 
@@ -2592,8 +2338,7 @@ def test_ogr_geojson_47():
     ds = None
     ds = ogr.Open('/vsimem/ogr_geojson_47.json')
     lyr = ds.GetLayer(0)
-    if lyr.GetFeatureCount() != 1:
-        return 'fail'
+    assert lyr.GetFeatureCount() == 1
     ds = None
 
     # Test appending to array ending with non feature
@@ -2605,8 +2350,7 @@ def test_ogr_geojson_47():
     ds = None
     ds = ogr.Open('/vsimem/ogr_geojson_47.json')
     lyr = ds.GetLayer(0)
-    if lyr.GetFeatureCount() != 1:
-        return 'fail'
+    assert lyr.GetFeatureCount() == 1
     ds = None
 
     # Test appending to feature collection not ending with "features"
@@ -2618,8 +2362,7 @@ def test_ogr_geojson_47():
     ds = None
     ds = ogr.Open('/vsimem/ogr_geojson_47.json')
     lyr = ds.GetLayer(0)
-    if lyr.GetFeatureCount() != 1:
-        return 'fail'
+    assert lyr.GetFeatureCount() == 1
     ds = None
 
     fp = gdal.VSIFOpenL('/vsimem/ogr_geojson_47.json', 'rb')
@@ -2629,9 +2372,7 @@ def test_ogr_geojson_47():
     else:
         data = None
 
-    if data.find('something') < 0:
-        print(data)
-        return 'fail'
+    assert data.find('something') >= 0
 
     # Test appending to feature collection with "bbox"
     gdal.FileFromMemBuffer('/vsimem/ogr_geojson_47.json', """{ "type": "FeatureCollection", "bbox": [0,0,0,0], "features": [ { "type": "Feature", "geometry": { "type": "Point", "coordinates": [0,0]} } ]}""")
@@ -2642,8 +2383,7 @@ def test_ogr_geojson_47():
     ds = None
     ds = ogr.Open('/vsimem/ogr_geojson_47.json')
     lyr = ds.GetLayer(0)
-    if lyr.GetFeatureCount() != 2:
-        return 'fail'
+    assert lyr.GetFeatureCount() == 2
     ds = None
 
     fp = gdal.VSIFOpenL('/vsimem/ogr_geojson_47.json', 'rb')
@@ -2653,9 +2393,7 @@ def test_ogr_geojson_47():
     else:
         data = None
 
-    if data.find('bbox') < 0:
-        print(data)
-        return 'fail'
+    assert data.find('bbox') >= 0
 
     gdal.Unlink('/vsimem/ogr_geojson_47.json')
 
@@ -2691,13 +2429,11 @@ def test_ogr_geojson_48():
     gdal.Unlink('/vsimem/ogr_geojson_48.json')
 
     # we don't want crs if there's no in the source
-    if data.find('"bar": "baz"') < 0 or \
-       data.find('"bbox": [ 3.0, 50.0, 3.0, 50.0 ]') < 0 or \
-       data.find('crs') >= 0 or \
-       data.find('FeatureCollection') >= 0 or \
-       data.find('"myprop": "another_value"') < 0:
-        print(data)
-        return 'fail'
+    assert (data.find('"bar": "baz"') >= 0 and \
+       data.find('"bbox": [ 3.0, 50.0, 3.0, 50.0 ]') >= 0 and \
+       data.find('crs') < 0 and \
+       data.find('FeatureCollection') < 0 and \
+       data.find('"myprop": "another_value"') >= 0)
 
     return 'success'
 
@@ -2715,8 +2451,7 @@ def test_ogr_geojson_49():
     # Test read support
     ds = gdal.OpenEx('/vsimem/ogr_geojson_49.json', open_options=['ARRAY_AS_STRING=YES'])
     lyr = ds.GetLayer(0)
-    if lyr.GetLayerDefn().GetFieldDefn(0).GetType() != ogr.OFTString:
-        return 'fail'
+    assert lyr.GetLayerDefn().GetFieldDefn(0).GetType() == ogr.OFTString
     f = lyr.GetNextFeature()
     if f['foo'] != '[ "bar" ]':
         f.DumpReadable()
@@ -2754,9 +2489,7 @@ def test_ogr_geojson_50():
 
     gdal.Unlink('/vsimem/ogr_geojson_50.json')
 
-    if data.find('1.23456789012456') < 0 and data.find('5268.813 ') < 0:
-        print(data)
-        return 'fail'
+    assert data.find('1.23456789012456') >= 0 or data.find('5268.813 ') >= 0
 
     # If SIGNIFICANT_FIGURES is explicitly specified, and COORDINATE_PRECISION not,
     # then it also applies to coordinates
@@ -2775,9 +2508,7 @@ def test_ogr_geojson_50():
 
     gdal.Unlink('/vsimem/ogr_geojson_50.json')
 
-    if data.find('1.23456789012456') < 0 and data.find('-5') < 0:
-        print(data)
-        return 'fail'
+    assert data.find('1.23456789012456') >= 0 or data.find('-5') >= 0
 
     # If SIGNIFICANT_FIGURES is explicitly specified, and COORDINATE_PRECISION too,
     # then SIGNIFICANT_FIGURES only applies to non-coordinates floating point values.
@@ -2797,9 +2528,7 @@ def test_ogr_geojson_50():
 
     gdal.Unlink('/vsimem/ogr_geojson_50.json')
 
-    if data.find('0.00001234') < 0 or data.find('1.23456789012456') < 0:
-        print(data)
-        return 'fail'
+    assert data.find('0.00001234') >= 0 and data.find('1.23456789012456') >= 0
 
     return 'success'
 
@@ -2851,33 +2580,19 @@ def test_ogr_geojson_51():
 
     gdal.Unlink('/vsimem/ogr_geojson_51.json')
 
-    if data.find('{ "id": 1 }, "geometry": null') < 0:
-        print(data)
-        return 'fail'
+    assert data.find('{ "id": 1 }, "geometry": null') >= 0
 
-    if data.find('{ "id": 2 }, "geometry": { "type": "LineString", "coordinates": [ ] } }') < 0:
-        print(data)
-        return 'fail'
+    assert data.find('{ "id": 2 }, "geometry": { "type": "LineString", "coordinates": [ ] } }') >= 0
 
-    if data.find('{ "id": 3 }, "geometry": { "type": "Polygon", "coordinates": [ ] } }') < 0:
-        print(data)
-        return 'fail'
+    assert data.find('{ "id": 3 }, "geometry": { "type": "Polygon", "coordinates": [ ] } }') >= 0
 
-    if data.find('{ "id": 4 }, "geometry": { "type": "MultiPoint", "coordinates": [ ] } }') < 0:
-        print(data)
-        return 'fail'
+    assert data.find('{ "id": 4 }, "geometry": { "type": "MultiPoint", "coordinates": [ ] } }') >= 0
 
-    if data.find('{ "id": 5 }, "geometry": { "type": "MultiLineString", "coordinates": [ ] } }') < 0:
-        print(data)
-        return 'fail'
+    assert data.find('{ "id": 5 }, "geometry": { "type": "MultiLineString", "coordinates": [ ] } }') >= 0
 
-    if data.find('{ "id": 6 }, "geometry": { "type": "MultiPolygon", "coordinates": [ ] } }') < 0:
-        print(data)
-        return 'fail'
+    assert data.find('{ "id": 6 }, "geometry": { "type": "MultiPolygon", "coordinates": [ ] } }') >= 0
 
-    if data.find('{ "id": 7 }, "geometry": { "type": "GeometryCollection", "geometries": [ ] } }') < 0:
-        print(data)
-        return 'fail'
+    assert data.find('{ "id": 7 }, "geometry": { "type": "GeometryCollection", "geometries": [ ] } }') >= 0
 
     return 'success'
 
@@ -2890,34 +2605,22 @@ def test_ogr_geojson_52():
         return 'skip'
 
     ds = ogr.Open('data/nullvalues.geojson')
-    if ds is None:
-        gdaltest.post_reason('Failed to open datasource')
-        return 'fail'
+    assert ds is not None, 'Failed to open datasource'
 
-    if ds.GetLayerCount() is not 1:
-        gdaltest.post_reason('Wrong number of layers')
-        return 'fail'
+    assert ds.GetLayerCount() is 1, 'Wrong number of layers'
 
     lyr = ds.GetLayerByName('nullvalues')
-    if lyr is None:
-        gdaltest.post_reason('Missing layer called nullvalues')
-        return 'fail'
+    assert lyr is not None, 'Missing layer called nullvalues'
 
     fld = lyr.GetLayerDefn().GetFieldDefn(0)
-    if fld.GetNameRef() != 'int':
-        return 'fail'
-    if fld.GetType() != ogr.OFTInteger:
-        return 'fail'
+    assert fld.GetNameRef() == 'int'
+    assert fld.GetType() == ogr.OFTInteger
     fld = lyr.GetLayerDefn().GetFieldDefn(1)
-    if fld.GetNameRef() != 'string':
-        return 'fail'
-    if fld.GetType() != ogr.OFTString:
-        return 'fail'
+    assert fld.GetNameRef() == 'string'
+    assert fld.GetType() == ogr.OFTString
     fld = lyr.GetLayerDefn().GetFieldDefn(2)
-    if fld.GetNameRef() != 'double':
-        return 'fail'
-    if fld.GetType() != ogr.OFTReal:
-        return 'fail'
+    assert fld.GetNameRef() == 'double'
+    assert fld.GetType() == ogr.OFTReal
 
     return 'success'
 
@@ -2942,9 +2645,7 @@ def test_ogr_geojson_53():
 
     gdal.Unlink('/vsimem/ogr_geojson_53.json')
 
-    if data.find('{ "type": "Point", "coordinates": [ 1.0, 2.0, 3.0 ] }') < 0:
-        print(data)
-        return 'fail'
+    assert data.find('{ "type": "Point", "coordinates": [ 1.0, 2.0, 3.0 ] }') >= 0
 
     return 'success'
 
@@ -2968,27 +2669,19 @@ def test_ogr_geojson_54():
     lyr = ds.GetLayer(0)
 
     fld = lyr.GetLayerDefn().GetFieldDefn(0)
-    if fld.GetType() != ogr.OFTInteger:
-        return 'fail'
+    assert fld.GetType() == ogr.OFTInteger
     fld = lyr.GetLayerDefn().GetFieldDefn(1)
-    if fld.GetType() != ogr.OFTString:
-        return 'fail'
+    assert fld.GetType() == ogr.OFTString
     fld = lyr.GetLayerDefn().GetFieldDefn(2)
-    if fld.GetType() != ogr.OFTReal:
-        return 'fail'
+    assert fld.GetType() == ogr.OFTReal
     fld = lyr.GetLayerDefn().GetFieldDefn(3)
-    if fld.GetType() != ogr.OFTDateTime:
-        return 'fail'
+    assert fld.GetType() == ogr.OFTDateTime
     fld = lyr.GetLayerDefn().GetFieldDefn(4)
-    if fld.GetType() != ogr.OFTInteger:
-        return 'fail'
-    if fld.GetSubType() != ogr.OFSTBoolean:
-        return 'fail'
-    if fld.GetWidth() != 1:
-        return 'fail'
+    assert fld.GetType() == ogr.OFTInteger
+    assert fld.GetSubType() == ogr.OFSTBoolean
+    assert fld.GetWidth() == 1
     fld = lyr.GetLayerDefn().GetFieldDefn(5)
-    if fld.GetType() != ogr.OFTString:
-        return 'fail'
+    assert fld.GetType() == ogr.OFTString
     return 'success'
 
 ###############################################################################
@@ -3028,9 +2721,7 @@ def test_ogr_geojson_55():
 ]
 }
 """
-    if json.loads(got) != json.loads(expected):
-        print(got)
-        return 'fail'
+    assert json.loads(got) == json.loads(expected)
 
     # Test polygon winding order
     gdal.VectorTranslate('/vsimem/out.json', """{
@@ -3053,9 +2744,7 @@ def test_ogr_geojson_55():
 ]
 }
 """
-    if json.loads(got) != json.loads(expected):
-        print(got)
-        return 'fail'
+    assert json.loads(got) == json.loads(expected)
 
     # Test foreign member
     src_ds = gdal.OpenEx("""{
@@ -3104,9 +2793,7 @@ def test_ogr_geojson_55():
 ]
 }
 """
-    if json.loads(got) != json.loads(expected):
-        print(got)
-        return 'fail'
+    assert json.loads(got) == json.loads(expected)
 
     return 'success'
 
@@ -3148,9 +2835,7 @@ def test_ogr_geojson_56():
 ]
 }
 """
-    if json.loads(got) != json.loads(expected):
-        print(got)
-        return 'fail'
+    assert json.loads(got) == json.loads(expected)
 
     # Test geometries across the antimeridian
     gdal.VectorTranslate('/vsimem/out.json', """{
@@ -3178,9 +2863,7 @@ def test_ogr_geojson_56():
 ]
 }
 """
-    if json.loads(got) != json.loads(expected):
-        print(got)
-        return 'fail'
+    assert json.loads(got) == json.loads(expected)
 
     return 'success'
 
@@ -3215,9 +2898,7 @@ def test_ogr_geojson_57():
 ]
 }
 """
-    if json.loads(got) != json.loads(expected):
-        print(got)
-        return 'fail'
+    assert json.loads(got) == json.loads(expected)
 
     # Polar case: EPSG:3995: WGS 84 / Arctic Polar Stereographic
     src_ds = gdal.GetDriverByName('Memory').Create('', 0, 0, 0)
@@ -3244,9 +2925,7 @@ def test_ogr_geojson_57():
 ]
 }
 """
-    if json.loads(got) != json.loads(expected):
-        print(got)
-        return 'fail'
+    assert json.loads(got) == json.loads(expected)
 
     # Polar case: slice of spherical cap (not intersecting antimeridian, west hemisphere)
     src_ds = gdal.GetDriverByName('Memory').Create('', 0, 0, 0)
@@ -3269,9 +2948,7 @@ def test_ogr_geojson_57():
 ]
 }
 """
-    if json.loads(got) != json.loads(expected):
-        print(got)
-        return 'fail'
+    assert json.loads(got) == json.loads(expected)
 
     # Polar case: slice of spherical cap (not intersecting antimeridian, east hemisphere)
     src_ds = gdal.GetDriverByName('Memory').Create('', 0, 0, 0)
@@ -3294,9 +2971,7 @@ def test_ogr_geojson_57():
 ]
 }
 """
-    if json.loads(got) != json.loads(expected):
-        print(got)
-        return 'fail'
+    assert json.loads(got) == json.loads(expected)
 
     # Polar case: slice of spherical cap crossing the antimeridian
     src_ds = gdal.GetDriverByName('Memory').Create('', 0, 0, 0)
@@ -3319,9 +2994,7 @@ def test_ogr_geojson_57():
 ]
 }
 """
-    if json.loads(got) != json.loads(expected):
-        print(got)
-        return 'fail'
+    assert json.loads(got) == json.loads(expected)
 
     # Polar case: EPSG:3031: WGS 84 / Antarctic Polar Stereographic
     src_ds = gdal.GetDriverByName('Memory').Create('', 0, 0, 0)
@@ -3344,9 +3017,7 @@ def test_ogr_geojson_57():
 ]
 }
 """
-    if json.loads(got) != json.loads(expected):
-        print(got)
-        return 'fail'
+    assert json.loads(got) == json.loads(expected)
 
     # Antimeridian case: EPSG:32660: WGS 84 / UTM zone 60N with polygon and line crossing
     src_ds = gdal.GetDriverByName('Memory').Create('', 0, 0, 0)
@@ -3390,9 +3061,7 @@ def test_ogr_geojson_57():
 }
 """
 
-    if json.loads(got) != json.loads(expected) and json.loads(got) != json.loads(expected2):
-        print(got)
-        return 'fail'
+    assert json.loads(got) == json.loads(expected) or json.loads(got) == json.loads(expected2)
 
     # Antimeridian case: EPSG:32660: WGS 84 / UTM zone 60N wit polygon on west of antimeridian
     src_ds = gdal.GetDriverByName('Memory').Create('', 0, 0, 0)
@@ -3415,9 +3084,7 @@ def test_ogr_geojson_57():
 ]
 }
 """
-    if json.loads(got) != json.loads(expected):
-        print(got)
-        return 'fail'
+    assert json.loads(got) == json.loads(expected)
 
     return 'success'
 
@@ -3430,23 +3097,17 @@ def test_ogr_geojson_58():
         return 'skip'
 
     ds = ogr.Open('{ "type": "FeatureCollection", "name": "layer_name", "features": []}')
-    if ds is None:
-        gdaltest.post_reason('Failed to open datasource')
-        return 'fail'
+    assert ds is not None, 'Failed to open datasource'
 
     lyr = ds.GetLayerByName('layer_name')
-    if lyr is None:
-        gdaltest.post_reason('Missing layer called layer_name')
-        return 'fail'
+    assert lyr is not None, 'Missing layer called layer_name'
     ds = None
 
     ds = ogr.GetDriverByName('GeoJSON').CreateDataSource('/vsimem/ogr_geojson_58.json')
     lyr = ds.CreateLayer('foo')
     ds = None
     ds = ogr.Open('/vsimem/ogr_geojson_58.json')
-    if ds.GetLayerByName('foo') is None:
-        gdaltest.post_reason('Missing layer called foo')
-        return 'fail'
+    assert ds.GetLayerByName('foo') is not None, 'Missing layer called foo'
     ds = None
     gdal.Unlink('/vsimem/ogr_geojson_58.json')
 
@@ -3461,14 +3122,11 @@ def test_ogr_geojson_59():
         return 'skip'
 
     ds = ogr.Open('{ "type": "FeatureCollection", "description": "my_description", "features": []}')
-    if ds is None:
-        gdaltest.post_reason('Failed to open datasource')
-        return 'fail'
+    assert ds is not None, 'Failed to open datasource'
 
     lyr = ds.GetLayer(0)
-    if lyr.GetMetadataItem('DESCRIPTION') != 'my_description':
-        gdaltest.post_reason('Did not get DESCRIPTION')
-        return 'fail'
+    assert lyr.GetMetadataItem('DESCRIPTION') == 'my_description', \
+        'Did not get DESCRIPTION'
     ds = None
 
     ds = ogr.GetDriverByName('GeoJSON').CreateDataSource('/vsimem/ogr_geojson_59.json')
@@ -3476,9 +3134,7 @@ def test_ogr_geojson_59():
     ds = None
     ds = ogr.Open('/vsimem/ogr_geojson_59.json')
     lyr = ds.GetLayerByName('foo')
-    if lyr.GetMetadataItem('DESCRIPTION') != 'my desc':
-        gdaltest.post_reason('Did not get DESCRIPTION')
-        return 'fail'
+    assert lyr.GetMetadataItem('DESCRIPTION') == 'my desc', 'Did not get DESCRIPTION'
     ds = None
     gdal.Unlink('/vsimem/ogr_geojson_59.json')
 
@@ -3518,11 +3174,9 @@ def test_ogr_geojson_60():
     gdal.VSIFCloseL(fp)
 
     gdal.Unlink('/vsimem/ogr_geojson_60.json')
-    if data.find('"properties": { "foo": "bar" }') < 0 or \
-       data.find('"properties": { "foo": null }') < 0 or \
-       data.find('"properties": { }') < 0:
-        print(data)
-        return 'fail'
+    assert (data.find('"properties": { "foo": "bar" }') >= 0 and \
+       data.find('"properties": { "foo": null }') >= 0 and \
+       data.find('"properties": { }') >= 0)
 
     return 'success'
 
@@ -3537,15 +3191,13 @@ def test_ogr_geojson_61():
                            """{ "type": "FeatureCollection", "features": [""")
     with gdaltest.error_handler():
         ds = gdal.OpenEx('/vsimem/ogr_geojson_61.json')
-    if ds is not None:
-        return 'fail'
+    assert ds is None
     gdal.Unlink('/vsimem/ogr_geojson_61.json')
 
     # Invalid single geometry
     with gdaltest.error_handler():
         ds = gdal.OpenEx("""{ "type": "Point", "x" : { "coordinates" : null } } """)
-    if ds is not None:
-        return 'fail'
+    assert ds is None
 
     # Empty property name
     gdal.FileFromMemBuffer('/vsimem/ogr_geojson_61.json',
@@ -3553,8 +3205,7 @@ def test_ogr_geojson_61():
     ds = gdal.OpenEx('/vsimem/ogr_geojson_61.json')
     lyr = ds.GetLayer(0)
     f = lyr.GetNextFeature()
-    if f.GetField("") != 1:
-        return 'fail'
+    assert f.GetField("") == 1
     ds = None
     gdal.Unlink('/vsimem/ogr_geojson_61.json')
 
@@ -3582,8 +3233,7 @@ def test_ogr_geojson_62():
     ds = gdal.OpenEx("""{ "type": "FeatureCollection", "crs": { "type":"name", "properties":{"name": "urn:ogc:def:crs:EPSG::32631"} }, "features":[] }""")
     lyr = ds.GetLayer(0)
     srs = lyr.GetSpatialRef()
-    if srs.ExportToWkt().find('32631') < 0:
-        return 'fail'
+    assert srs.ExportToWkt().find('32631') >= 0
 
     # crs type=EPSG (not even documented in GJ2008 spec!) tests. Just for coverage completeness
     gdal.OpenEx("""{ "type": "FeatureCollection", "crs": { "type":"EPSG" }, "features":[] }""")
@@ -3603,8 +3253,7 @@ def test_ogr_geojson_62():
     ds = gdal.OpenEx("""{ "type": "FeatureCollection", "crs": { "type":"EPSG", "properties":{"code": 32631} }, "features":[] }""")
     lyr = ds.GetLayer(0)
     srs = lyr.GetSpatialRef()
-    if srs.ExportToWkt().find('32631') < 0:
-        return 'fail'
+    assert srs.ExportToWkt().find('32631') >= 0
 
     # crs type=link tests
     gdal.OpenEx("""{ "type": "FeatureCollection", "crs": { "type":"link" }, "features":[] }""")
@@ -3639,8 +3288,7 @@ def test_ogr_geojson_62():
     ds = gdal.OpenEx("""{ "type": "FeatureCollection", "crs": { "type":"OGC", "properties":{"urn": "urn:ogc:def:crs:EPSG::32631"} }, "features":[] }""")
     lyr = ds.GetLayer(0)
     srs = lyr.GetSpatialRef()
-    if srs.ExportToWkt().find('32631') < 0:
-        return 'fail'
+    assert srs.ExportToWkt().find('32631') >= 0
 
     return 'success'
 
@@ -3663,24 +3311,20 @@ def test_ogr_geojson_63():
 def test_ogr_geojson_64():
 
     g = ogr.CreateGeometryFromWkt('POINT ZM(1 2 3 4)')
-    if ogrtest.check_feature_geometry(ogr.CreateGeometryFromJson(g.ExportToJson()),
-                                      ogr.CreateGeometryFromWkt('POINT Z(1 2 3)')) != 0:
-        return 'fail'
+    assert (ogrtest.check_feature_geometry(ogr.CreateGeometryFromJson(g.ExportToJson()),
+                                      ogr.CreateGeometryFromWkt('POINT Z(1 2 3)')) == 0)
 
     g = ogr.CreateGeometryFromWkt('POINT M(1 2 3)')
-    if ogrtest.check_feature_geometry(ogr.CreateGeometryFromJson(g.ExportToJson()),
-                                      ogr.CreateGeometryFromWkt('POINT (1 2)')) != 0:
-        return 'fail'
+    assert (ogrtest.check_feature_geometry(ogr.CreateGeometryFromJson(g.ExportToJson()),
+                                      ogr.CreateGeometryFromWkt('POINT (1 2)')) == 0)
 
     g = ogr.CreateGeometryFromWkt('LINESTRING ZM(1 2 3 4,5 6 7 8)')
-    if ogrtest.check_feature_geometry(ogr.CreateGeometryFromJson(g.ExportToJson()),
-                                      ogr.CreateGeometryFromWkt('LINESTRING Z(1 2 3,5 6 7)')) != 0:
-        return 'fail'
+    assert (ogrtest.check_feature_geometry(ogr.CreateGeometryFromJson(g.ExportToJson()),
+                                      ogr.CreateGeometryFromWkt('LINESTRING Z(1 2 3,5 6 7)')) == 0)
 
     g = ogr.CreateGeometryFromWkt('LINESTRING M(1 2 3,4 5 6)')
-    if ogrtest.check_feature_geometry(ogr.CreateGeometryFromJson(g.ExportToJson()),
-                                      ogr.CreateGeometryFromWkt('LINESTRING (1 2,4 5)')) != 0:
-        return 'fail'
+    assert (ogrtest.check_feature_geometry(ogr.CreateGeometryFromJson(g.ExportToJson()),
+                                      ogr.CreateGeometryFromWkt('LINESTRING (1 2,4 5)')) == 0)
 
     return 'success'
 
@@ -3705,9 +3349,7 @@ def test_ogr_geojson_65():
     f = lyr.GetNextFeature()
     srs = f.GetGeometryRef().GetSpatialReference()
     pcs = int(srs.GetAuthorityCode('PROJCS'))
-    if pcs != 32631:
-        gdaltest.post_reason('Spatial reference for individual geometry was not valid')
-        return 'fail'
+    assert pcs == 32631, 'Spatial reference for individual geometry was not valid'
 
     return 'success'
 
@@ -3732,8 +3374,7 @@ def test_ogr_geojson_66():
 }
 ]}""")
     lyr = ds.GetLayer(0)
-    if lyr.GetLayerDefn().GetFieldCount() != 0:
-        return 'fail'
+    assert lyr.GetLayerDefn().GetFieldCount() == 0
 
     return 'success'
 
@@ -3744,13 +3385,10 @@ def test_ogr_geojson_66():
 def test_ogr_geojson_67():
 
     ds = ogr.Open('data/grenada.geojson')
-    if ds is None:
-        return 'fail'
-    if ds.GetDriver().GetName() != 'GeoJSON':
-        return 'fail'
+    assert ds is not None
+    assert ds.GetDriver().GetName() == 'GeoJSON'
     lyr = ds.GetLayer(0)
-    if lyr.GetFeatureCount() != 1:
-        return 'fail'
+    assert lyr.GetFeatureCount() == 1
     return 'success'
 
 
@@ -3760,13 +3398,10 @@ def test_ogr_geojson_67():
 def test_ogr_geojson_68():
 
     ds = ogr.Open('data/esrijsonstartingwithfeaturesgeometry.json')
-    if ds is None:
-        return 'fail'
-    if ds.GetDriver().GetName() != 'ESRIJSON':
-        return 'fail'
+    assert ds is not None
+    assert ds.GetDriver().GetName() == 'ESRIJSON'
     lyr = ds.GetLayer(0)
-    if lyr.GetFeatureCount() != 1:
-        return 'fail'
+    assert lyr.GetFeatureCount() == 1
     return 'success'
 
 ###############################################################################
@@ -3776,99 +3411,75 @@ def test_ogr_geojson_id_field_and_id_type():
 
     gdal.VectorTranslate('/vsimem/out.json', 'data/poly.shp', options='-f GeoJSON -lco ID_TYPE=String -preserve_fid -limit 1 -fid 2')
     got = read_file('/vsimem/out.json')
-    if got.find('"id": "2", "properties": { "AREA": 261752.781, "EAS_ID": 171, "PRFEDEA": "35043414" }') < 0:
-        print(got)
-        return 'fail'
+    assert got.find('"id": "2", "properties": { "AREA": 261752.781, "EAS_ID": 171, "PRFEDEA": "35043414" }') >= 0
 
     gdal.VectorTranslate('/vsimem/out.json', 'data/poly.shp', options='-f GeoJSON -lco ID_TYPE=Integer -preserve_fid -limit 1 -fid 2')
     got = read_file('/vsimem/out.json')
-    if got.find('"id": 2, "properties": { "AREA": 261752.781, "EAS_ID": 171, "PRFEDEA": "35043414" }') < 0:
-        print(got)
-        return 'fail'
+    assert got.find('"id": 2, "properties": { "AREA": 261752.781, "EAS_ID": 171, "PRFEDEA": "35043414" }') >= 0
 
     gdal.VectorTranslate('/vsimem/out.json', 'data/poly.shp', format='GeoJSON', layerCreationOptions=['ID_FIELD=EAS_ID'], limit=1)
     got = read_file('/vsimem/out.json')
-    if got.find('"id": 168, "properties": { "AREA": 215229.266, "PRFEDEA": "35043411" }') < 0:
-        print(got)
-        return 'fail'
+    assert got.find('"id": 168, "properties": { "AREA": 215229.266, "PRFEDEA": "35043411" }') >= 0
 
     src_ds = gdal.OpenEx('/vsimem/out.json', open_options=['NATIVE_DATA=YES'])
     gdal.VectorTranslate('/vsimem/out2.json', src_ds, format='GeoJSON')
     src_ds = None
     got = read_file('/vsimem/out2.json')
     gdal.Unlink('/vsimem/out2.json')
-    if got.find('"id": 168, "properties": { "AREA": 215229.266, "PRFEDEA": "35043411" }') < 0:
-        print(got)
-        return 'fail'
+    assert got.find('"id": 168, "properties": { "AREA": 215229.266, "PRFEDEA": "35043411" }') >= 0
 
     src_ds = gdal.OpenEx('/vsimem/out.json', open_options=['NATIVE_DATA=YES'])
     gdal.VectorTranslate('/vsimem/out2.json', src_ds, format='GeoJSON', layerCreationOptions=['ID_TYPE=String'])
     src_ds = None
     got = read_file('/vsimem/out2.json')
     gdal.Unlink('/vsimem/out2.json')
-    if got.find('"id": "168", "properties": { "AREA": 215229.266, "PRFEDEA": "35043411" }') < 0:
-        print(got)
-        return 'fail'
+    assert got.find('"id": "168", "properties": { "AREA": 215229.266, "PRFEDEA": "35043411" }') >= 0
 
     src_ds = gdal.OpenEx('/vsimem/out.json', open_options=['NATIVE_DATA=YES'])
     gdal.VectorTranslate('/vsimem/out2.json', src_ds, format='GeoJSON', layerCreationOptions=['ID_TYPE=Integer'])
     src_ds = None
     got = read_file('/vsimem/out2.json')
     gdal.Unlink('/vsimem/out2.json')
-    if got.find('"id": 168, "properties": { "AREA": 215229.266, "PRFEDEA": "35043411" }') < 0:
-        print(got)
-        return 'fail'
+    assert got.find('"id": 168, "properties": { "AREA": 215229.266, "PRFEDEA": "35043411" }') >= 0
 
     gdal.Unlink('/vsimem/out.json')
 
     gdal.VectorTranslate('/vsimem/out.json', 'data/poly.shp', format='GeoJSON', layerCreationOptions=['ID_FIELD=EAS_ID', 'ID_TYPE=String'], limit=1)
     got = read_file('/vsimem/out.json')
-    if got.find('"id": "168", "properties": { "AREA": 215229.266, "PRFEDEA": "35043411" }') < 0:
-        print(got)
-        return 'fail'
+    assert got.find('"id": "168", "properties": { "AREA": 215229.266, "PRFEDEA": "35043411" }') >= 0
 
     src_ds = gdal.OpenEx('/vsimem/out.json', open_options=['NATIVE_DATA=YES'])
     gdal.VectorTranslate('/vsimem/out2.json', src_ds, format='GeoJSON')
     src_ds = None
     got = read_file('/vsimem/out2.json')
     gdal.Unlink('/vsimem/out2.json')
-    if got.find('"id": "168", "properties": { "AREA": 215229.266, "PRFEDEA": "35043411" }') < 0:
-        print(got)
-        return 'fail'
+    assert got.find('"id": "168", "properties": { "AREA": 215229.266, "PRFEDEA": "35043411" }') >= 0
 
     src_ds = gdal.OpenEx('/vsimem/out.json', open_options=['NATIVE_DATA=YES'])
     gdal.VectorTranslate('/vsimem/out2.json', src_ds, format='GeoJSON', layerCreationOptions=['ID_TYPE=String'])
     src_ds = None
     got = read_file('/vsimem/out2.json')
     gdal.Unlink('/vsimem/out2.json')
-    if got.find('"id": "168", "properties": { "AREA": 215229.266, "PRFEDEA": "35043411" }') < 0:
-        print(got)
-        return 'fail'
+    assert got.find('"id": "168", "properties": { "AREA": 215229.266, "PRFEDEA": "35043411" }') >= 0
 
     src_ds = gdal.OpenEx('/vsimem/out.json', open_options=['NATIVE_DATA=YES'])
     gdal.VectorTranslate('/vsimem/out2.json', src_ds, format='GeoJSON', layerCreationOptions=['ID_TYPE=Integer'])
     src_ds = None
     got = read_file('/vsimem/out2.json')
     gdal.Unlink('/vsimem/out2.json')
-    if got.find('"id": 168, "properties": { "AREA": 215229.266, "PRFEDEA": "35043411" }') < 0:
-        print(got)
-        return 'fail'
+    assert got.find('"id": 168, "properties": { "AREA": 215229.266, "PRFEDEA": "35043411" }') >= 0
 
     gdal.Unlink('/vsimem/out.json')
 
     gdal.VectorTranslate('/vsimem/out.json', 'data/poly.shp', format='GeoJSON', layerCreationOptions=['ID_FIELD=PRFEDEA'], limit=1)
     got = read_file('/vsimem/out.json')
     gdal.Unlink('/vsimem/out.json')
-    if got.find('"id": "35043411", "properties": { "AREA": 215229.266, "EAS_ID": 168 }') < 0:
-        print(got)
-        return 'fail'
+    assert got.find('"id": "35043411", "properties": { "AREA": 215229.266, "EAS_ID": 168 }') >= 0
 
     gdal.VectorTranslate('/vsimem/out.json', 'data/poly.shp', format='GeoJSON', layerCreationOptions=['ID_FIELD=PRFEDEA', 'ID_TYPE=Integer'], limit=1)
     got = read_file('/vsimem/out.json')
     gdal.Unlink('/vsimem/out.json')
-    if got.find('"id": 35043411, "properties": { "AREA": 215229.266, "EAS_ID": 168 }') < 0:
-        print(got)
-        return 'fail'
+    assert got.find('"id": 35043411, "properties": { "AREA": 215229.266, "EAS_ID": 168 }') >= 0
 
     return 'success'
 
@@ -3879,23 +3490,17 @@ def test_ogr_geojson_geom_export_failure():
 
     g = ogr.CreateGeometryFromWkt('POINT EMPTY')
     geojson = g.ExportToJson()
-    if geojson is not None:
-        print(geojson)
-        return 'fail'
+    assert geojson is None
 
     g = ogr.CreateGeometryFromWkt('GEOMETRYCOLLECTION(TIN EMPTY)')
     geojson = json.loads(g.ExportToJson())
-    if geojson != {"type": "GeometryCollection", "geometries": None}:
-        print(geojson)
-        return 'fail'
+    assert geojson == {"type": "GeometryCollection", "geometries": None}
 
     g = ogr.Geometry(ogr.wkbLineString)
     g.AddPoint_2D(float('nan'), 0)
     with gdaltest.error_handler():
         geojson = g.ExportToJson()
-    if geojson is not None:
-        print(geojson)
-        return 'fail'
+    assert geojson is None
 
     g = ogr.Geometry(ogr.wkbPolygon)
     lr = ogr.Geometry(ogr.wkbLinearRing)
@@ -3912,9 +3517,7 @@ def test_ogr_geojson_geom_export_failure():
     g.AddGeometry(lr)
     with gdaltest.error_handler():
         geojson = g.ExportToJson()
-    if geojson is not None:
-        print(geojson)
-        return 'fail'
+    assert geojson is None
 
     return 'success'
 
@@ -3933,8 +3536,7 @@ def test_ogr_geojson_starting_with_crs():
 "coordinates": [500000,4500000]},
 "properties": {
 }}]}""")
-    if ds is None:
-        return 'fail'
+    assert ds is not None
 
     return 'success'
 
@@ -3964,8 +3566,7 @@ def test_ogr_geojson_append_flush():
     lyr = ds2.GetLayer(0)
     lyr.GetNextFeature()
     f = lyr.GetNextFeature()
-    if f is None or f['x'] != 10:
-        return 'fail'
+    assert f is not None and f['x'] == 10
 
     ds = None
     ds2 = None
@@ -3980,9 +3581,7 @@ def test_ogr_geojson_append_flush():
 def test_ogr_geojson_empty_geometrycollection():
 
     g = ogr.CreateGeometryFromJson('{"type": "GeometryCollection", "geometries": []}')
-    if g.ExportToWkt() != 'GEOMETRYCOLLECTION EMPTY':
-        print(g.ExportToWkt())
-        return 'fail'
+    assert g.ExportToWkt() == 'GEOMETRYCOLLECTION EMPTY'
     return 'success'
 
 
@@ -4011,8 +3610,7 @@ def test_ogr_esrijson_without_geometryType():
 """)
     lyr = ds.GetLayer(0)
     f = lyr.GetNextFeature()
-    if f.GetGeometryRef() is None:
-        return 'fail'
+    assert f.GetGeometryRef() is not None
 
     return 'success'
 
@@ -4101,9 +3699,7 @@ def test_ogr_geojson_non_finite():
     lyr = ds.GetLayer(0)
     f = lyr.GetNextFeature()
     for i in range(3):
-        if lyr.GetLayerDefn().GetFieldDefn(i).GetType() != ogr.OFTReal:
-            print(i)
-            return 'fail'
+        assert lyr.GetLayerDefn().GetFieldDefn(i).GetType() == ogr.OFTReal
 
     if f['inf_prop'] != float('inf'):
         f.DumpReadable()
@@ -4123,15 +3719,13 @@ def test_ogr_geojson_non_finite():
         gdal.VectorTranslate(tmpfilename, json_content, options='-f GeoJSON')
     ds = ogr.Open(tmpfilename)
     lyr = ds.GetLayer(0)
-    if lyr.GetLayerDefn().GetFieldCount() != 0:
-        return 'fail'
+    assert lyr.GetLayerDefn().GetFieldCount() == 0
     ds = None
 
     gdal.VectorTranslate(tmpfilename, json_content, options='-f GeoJSON -lco WRITE_NON_FINITE_VALUES=YES')
     ds = ogr.Open(tmpfilename)
     lyr = ds.GetLayer(0)
-    if lyr.GetLayerDefn().GetFieldCount() != 3:
-        return 'fail'
+    assert lyr.GetLayerDefn().GetFieldCount() == 3
     f = lyr.GetNextFeature()
     if f['inf_prop'] != float('inf'):
         f.DumpReadable()
diff --git a/autotest/ogr/ogr_geojsonseq.py b/autotest/ogr/ogr_geojsonseq.py
index 2b41c676eeb5..d44f340c28b7 100755
--- a/autotest/ogr/ogr_geojsonseq.py
+++ b/autotest/ogr/ogr_geojsonseq.py
@@ -56,12 +56,10 @@ def _ogr_geojsonseq_create(filename, lco, expect_rs):
     f.SetGeometry(ogr.CreateGeometryFromWkt('POINT(3 4)'))
     lyr.CreateFeature(f)
 
-    if ds.TestCapability(ogr.ODsCCreateLayer):
-        return 'fail'
+    assert not ds.TestCapability(ogr.ODsCCreateLayer)
 
     with gdaltest.error_handler():
-        if ds.CreateLayer('foo') is not None:
-            return 'fail'
+        assert ds.CreateLayer('foo') is None
 
     ds = None
 
@@ -69,11 +67,9 @@ def _ogr_geojsonseq_create(filename, lco, expect_rs):
     first = gdal.VSIFReadL(1, 1, f).decode('ascii')
     gdal.VSIFCloseL(f)
     if expect_rs:
-        if first != '\x1e':
-            return 'fail'
+        assert first == '\x1e'
     else:
-        if first != '{':
-            return 'fail'
+        assert first == '{'
 
     ds = ogr.Open(filename)
     lyr = ds.GetLayer(0)
@@ -86,8 +82,7 @@ def _ogr_geojsonseq_create(filename, lco, expect_rs):
     if f['foo'] != 'baz' or f.GetGeometryRef().ExportToWkt() != 'POINT (3 4)':
         f.DumpReadable()
         return 'fail'
-    if lyr.GetNextFeature() is not None:
-        return 'fail'
+    assert lyr.GetNextFeature() is None
     ds = None
 
     ogr.GetDriverByName('GeoJSONSeq').DeleteDataSource(filename)
@@ -112,9 +107,7 @@ def test_ogr_geojsonseq_inline():
     ds = ogr.Open("""{"type":"Feature","properties":{},"geometry":null}
 {"type":"Feature","properties":{},"geometry":null}""")
     lyr = ds.GetLayer(0)
-    if lyr.GetFeatureCount() != 2:
-        print(lyr.GetFeatureCount())
-        return 'fail'
+    assert lyr.GetFeatureCount() == 2
     return 'success'
 
 
@@ -122,9 +115,7 @@ def test_ogr_geojsonseq_prefix():
 
     ds = ogr.Open("""GeoJSONSeq:data/test.geojsonl""")
     lyr = ds.GetLayer(0)
-    if lyr.GetFeatureCount() != 2:
-        print(lyr.GetFeatureCount())
-        return 'fail'
+    assert lyr.GetFeatureCount() == 2
     return 'success'
 
 
@@ -134,9 +125,7 @@ def test_ogr_geojsonseq_seq_geometries():
         ds = ogr.Open("""{"type":"Point","coordinates":[2,49]}
     {"type":"Point","coordinates":[3,50]}""")
         lyr = ds.GetLayer(0)
-        if lyr.GetFeatureCount() != 2:
-            print(lyr.GetFeatureCount())
-            return 'fail'
+        assert lyr.GetFeatureCount() == 2
         f = lyr.GetNextFeature()
         if f.GetGeometryRef().ExportToWkt() != 'POINT (2 49)':
             f.DumpReadable()
@@ -185,8 +174,7 @@ def test_ogr_geojsonseq_read_rs_json_pretty():
     if f['foo'] != 'baz' or f.GetGeometryRef().ExportToWkt() != 'POINT (3 4)':
         f.DumpReadable()
         return 'fail'
-    if lyr.GetNextFeature() is not None:
-        return 'fail'
+    assert lyr.GetNextFeature() is None
     return 'success'
 
 
@@ -199,9 +187,7 @@ def test_ogr_geojsonseq_test_ogrsf():
     ret = gdaltest.runexternal(
         test_cli_utilities.get_test_ogrsf_path() + ' -ro data/test.geojsonl')
 
-    if ret.find('INFO') == -1 or ret.find('ERROR') != -1:
-        print(ret)
-        return 'fail'
+    assert ret.find('INFO') != -1 and ret.find('ERROR') == -1
 
     return 'success'
 
diff --git a/autotest/ogr/ogr_geom.py b/autotest/ogr/ogr_geom.py
index 3c53c137b30e..2db39eded9d0 100755
--- a/autotest/ogr/ogr_geom.py
+++ b/autotest/ogr/ogr_geom.py
@@ -38,6 +38,7 @@
 from osgeo import ogr
 from osgeo import osr
 from osgeo import gdal
+import pytest
 
 ###############################################################################
 # Test Area calculation for a MultiPolygon (which exercises lower level
@@ -50,15 +51,11 @@ def test_ogr_geom_area():
     geom = ogr.CreateGeometryFromWkt(geom_wkt)
 
     area = geom.GetArea()
-    if abs(area - 99.5) > 0.00000000001:
-        gdaltest.post_reason('GetArea() result wrong, got %g.' % area)
-        return 'fail'
+    assert abs(area - 99.5) <= 0.00000000001, ('GetArea() result wrong, got %g.' % area)
 
     # OGR >= 1.8.0
     area = geom.Area()
-    if abs(area - 99.5) > 0.00000000001:
-        gdaltest.post_reason('Area() result wrong, got %g.' % area)
-        return 'fail'
+    assert abs(area - 99.5) <= 0.00000000001, ('Area() result wrong, got %g.' % area)
 
     return 'success'
 
@@ -77,9 +74,7 @@ def test_ogr_geom_area_linearring():
     geom.AddPoint_2D(0, 0)
 
     area = geom.GetArea()
-    if abs(area - 100.0) > 0.00000000001:
-        gdaltest.post_reason('Area result wrong, got %g.' % area)
-        return 'fail'
+    assert abs(area - 100.0) <= 0.00000000001, ('Area result wrong, got %g.' % area)
 
     return 'success'
 
@@ -94,9 +89,7 @@ def test_ogr_geom_area_geometrycollection():
     geom = ogr.CreateGeometryFromWkt(geom_wkt)
 
     area = geom.Area()
-    if abs(area - 1) > 0.00000000001:
-        gdaltest.post_reason('Area() result wrong, got %g.' % area)
-        return 'fail'
+    assert abs(area - 1) <= 0.00000000001, ('Area() result wrong, got %g.' % area)
 
     return 'success'
 
@@ -116,9 +109,7 @@ def test_ogr_geom_area_linearring_big_offset():
     geom.AddPoint_2D(BIGOFFSET + 0, BIGOFFSET + 0)
 
     area = geom.GetArea()
-    if abs(area - 100.0) > 0.00000000001:
-        gdaltest.post_reason('Area result wrong, got %g.' % area)
-        return 'fail'
+    assert abs(area - 100.0) <= 0.00000000001, ('Area result wrong, got %g.' % area)
 
     return 'success'
 
@@ -132,15 +123,12 @@ def test_ogr_geom_area_triangle():
     geom = ogr.CreateGeometryFromWkt(geom_wkt)
 
     area = geom.GetArea()
-    if abs(area - 4999.5) < 0.00000000001:
-        gdaltest.post_reason('GetArea() result wrong, got %g.' % area)
-        return 'fail'
+    assert abs(area - 4999.5) >= 0.00000000001, \
+        ('GetArea() result wrong, got %g.' % area)
 
     # OGR >= 1.8.0
     area = geom.Area()
-    if abs(area - 4999.5) < 0.00000000001:
-        gdaltest.post_reason('Area() result wrong, got %g.' % area)
-        return 'fail'
+    assert abs(area - 4999.5) >= 0.00000000001, ('Area() result wrong, got %g.' % area)
 
     return 'success'
 
@@ -150,19 +138,13 @@ def test_ogr_geom_is_empty():
     geom_wkt = 'LINESTRING EMPTY'
     geom = ogr.CreateGeometryFromWkt(geom_wkt)
 
-    if not geom.IsEmpty():
-        gdaltest.post_reason("IsEmpty returning false for an empty geometry")
-        return 'fail'
+    assert geom.IsEmpty(), "IsEmpty returning false for an empty geometry"
 
     geom_wkt = 'POINT( 1 2 )'
     geom = ogr.CreateGeometryFromWkt(geom_wkt)
-    if not geom:
-        gdaltest.post_reason("A geometry could not be created from wkt: %s" % geom_wkt)
-        return 'fail'
+    assert geom, ("A geometry could not be created from wkt: %s" % geom_wkt)
 
-    if geom.IsEmpty():
-        gdaltest.post_reason("IsEmpty returning true for a non-empty geometry")
-        return 'fail'
+    assert not geom.IsEmpty(), "IsEmpty returning true for a non-empty geometry"
     return 'success'
 
 ###############################################################################
@@ -174,26 +156,18 @@ def test_ogr_geom_is_empty_triangle():
     geom_wkt = 'TRIANGLE EMPTY'
     geom = ogr.CreateGeometryFromWkt(geom_wkt)
 
-    if not geom.IsEmpty():
-        gdaltest.post_reason("IsEmpty returning false for an empty geometry")
-        return 'fail'
+    assert geom.IsEmpty(), "IsEmpty returning false for an empty geometry"
 
     geom = ogr.CreateGeometryFromWkb(geom.ExportToWkb())
 
-    if not geom.IsEmpty():
-        gdaltest.post_reason("IsEmpty returning false for an empty geometry")
-        return 'fail'
+    assert geom.IsEmpty(), "IsEmpty returning false for an empty geometry"
 
     geom_wkt = 'TRIANGLE((0 0,100 0,0 100,0 0))'
 
     geom = ogr.CreateGeometryFromWkt(geom_wkt)
-    if not geom:
-        gdaltest.post_reason("A geometry could not be created from wkt: %s" % geom_wkt)
-        return 'fail'
+    assert geom, ("A geometry could not be created from wkt: %s" % geom_wkt)
 
-    if geom.IsEmpty():
-        gdaltest.post_reason("IsEmpty returning true for a non-empty geometry")
-        return 'fail'
+    assert not geom.IsEmpty(), "IsEmpty returning true for a non-empty geometry"
     return 'success'
 
 
@@ -204,9 +178,7 @@ def test_ogr_geom_pickle():
     with gdaltest.error_handler():
         g = pickle.loads(p)
 
-    if not geom.Equal(g):
-        gdaltest.post_reason("pickled geometries were not equal")
-        return 'fail'
+    assert geom.Equal(g), "pickled geometries were not equal"
 
     return 'success'
 
@@ -227,35 +199,23 @@ def test_ogr_geom_polyhedral_surface():
     wkb_string = ps.ExportToWkb(ogr.wkbXDR)
     geom = ogr.CreateGeometryFromWkb(wkb_string)
     wkt_string = geom.ExportToWkt()
-    if wkt_string != wkt_original:
-        gdaltest.post_reason("Failure in Wkb methods of PolyhedralSurface")
-        return 'fail'
+    assert wkt_string == wkt_original, "Failure in Wkb methods of PolyhedralSurface"
 
     wkt_string = geom.Clone().ExportToWkt()
-    if wkt_string != wkt_original:
-        gdaltest.post_reason("Failure in Clone()")
-        return 'fail'
+    assert wkt_string == wkt_original, "Failure in Clone()"
 
     polygon_wkt = ogr.ForceTo(geom.Clone(), ogr.wkbPolygon).ExportToWkt()
-    if polygon_wkt != wkt_original:
-        print(polygon_wkt)
-        return 'fail'
+    assert polygon_wkt == wkt_original
 
     polygon_wkt = ogr.ForceTo(geom.Clone(), ogr.wkbMultiPolygon).ExportToWkt()
-    if polygon_wkt != 'MULTIPOLYGON (((0 0 0,0 0 1,0 1 1,0 1 0,0 0 0)),((0 0 0,0 1 0,1 1 0,1 0 0,0 0 0)),((0 0 0,1 0 0,1 0 1,0 0 1,0 0 0)),((1 1 0,1 1 1,1 0 1,1 0 0,1 1 0)),((0 1 0,0 1 1,1 1 1,1 1 0,0 1 0)),((0 0 1,1 0 1,1 1 1,0 1 1,0 0 1)))':
-        print(polygon_wkt)
-        return 'fail'
+    assert polygon_wkt == 'MULTIPOLYGON (((0 0 0,0 0 1,0 1 1,0 1 0,0 0 0)),((0 0 0,0 1 0,1 1 0,1 0 0,0 0 0)),((0 0 0,1 0 0,1 0 1,0 0 1,0 0 0)),((1 1 0,1 1 1,1 0 1,1 0 0,1 1 0)),((0 1 0,0 1 1,1 1 1,1 1 0,0 1 0)),((0 0 1,1 0 1,1 1 1,0 1 1,0 0 1)))'
 
     if ogrtest.have_sfcgal():
         area = ps.Area()
-        if area != 6.0:
-            gdaltest.post_reason("Wrong area of PolyhedralSurface")
-            return 'fail'
+        assert area == 6.0, "Wrong area of PolyhedralSurface"
 
     size = ps.WkbSize()
-    if size != 807:
-        gdaltest.post_reason("Wrong WkbSize() of PolyhedralSurface")
-        return 'fail'
+    assert size == 807, "Wrong WkbSize() of PolyhedralSurface"
 
     # if ogrtest.have_sfcgal():
     #    geom = ps.DelaunayTriangulation(0.0,True)
@@ -268,23 +228,17 @@ def test_ogr_geom_polyhedral_surface():
 
     if ogrtest.have_geos() or ogrtest.have_sfcgal():
         geom = ogr.CreateGeometryFromWkb(wkb_string)
-        if not ps.Contains(geom):
-            gdaltest.post_reason("Failure in Contains() of PolyhedralSurface")
-            return 'fail'
+        assert ps.Contains(geom), "Failure in Contains() of PolyhedralSurface"
 
-    if ps.IsEmpty():
-        gdaltest.post_reason("Failure in IsEmpty() of PolyhedralSurface")
-        return 'fail'
+    assert not ps.IsEmpty(), "Failure in IsEmpty() of PolyhedralSurface"
 
     ps.Empty()
     wkt_string = ps.ExportToWkt()
-    if wkt_string != 'POLYHEDRALSURFACE Z EMPTY':
-        gdaltest.post_reason("Failure in Empty() of PolyhedralSurface")
-        return 'fail'
+    assert wkt_string == 'POLYHEDRALSURFACE Z EMPTY', \
+        "Failure in Empty() of PolyhedralSurface"
 
     g = ogr.CreateGeometryFromWkt('POLYHEDRALSURFACE (((0 0 0,0 0 1,0 1 1,0 1 0,0 0 0)))')
-    if g.Equals(g) == 0:
-        return 'fail'
+    assert g.Equals(g) != 0
 
     for wkt in ['MULTIPOLYGON (((0 0 0,0 0 1,0 1 1,0 1 0,0 0 0)))',
                 'POLYHEDRALSURFACE (((0 0 0,0 0 1,0 1 1,0 0 0)))',
@@ -292,26 +246,21 @@ def test_ogr_geom_polyhedral_surface():
                 'POLYHEDRALSURFACE EMPTY']:
         g2 = ogr.CreateGeometryFromWkt(wkt)
         if g.Equals(g2):
-            gdaltest.post_reason("Unexpected true Equals() return")
             print(wkt)
-            return 'fail'
+            pytest.fail("Unexpected true Equals() return")
 
     # Error
-    if g.AddGeometry(ogr.CreateGeometryFromWkt('POINT (0 0)')) == 0:
-        return 'fail'
+    assert g.AddGeometry(ogr.CreateGeometryFromWkt('POINT (0 0)')) != 0
 
     # Error
-    if g.AddGeometryDirectly(ogr.CreateGeometryFromWkt('POINT (0 0)')) == 0:
-        return 'fail'
+    assert g.AddGeometryDirectly(ogr.CreateGeometryFromWkt('POINT (0 0)')) != 0
 
     # Test dimension promotion
     g = ogr.CreateGeometryFromWkt('POLYHEDRALSURFACE EMPTY')
     g.AddGeometryDirectly(ogr.CreateGeometryFromWkt('POLYGON ZM ((0 0 1 2,0 1 1 2,1 1 1 2,0 0 1 2))'))
     g.AddGeometryDirectly(ogr.CreateGeometryFromWkt('POLYGON ((10 10,10 11,11 11,10 10))'))
     wkt = g.ExportToIsoWkt()
-    if wkt != 'POLYHEDRALSURFACE ZM (((0 0 1 2,0 1 1 2,1 1 1 2,0 0 1 2)),((10 10 0 0,10 11 0 0,11 11 0 0,10 10 0 0)))':
-        print(wkt)
-        return 'fail'
+    assert wkt == 'POLYHEDRALSURFACE ZM (((0 0 1 2,0 1 1 2,1 1 1 2,0 0 1 2)),((10 10 0 0,10 11 0 0,11 11 0 0,10 10 0 0)))'
 
     return 'success'
 
@@ -329,9 +278,7 @@ def test_ogr_geom_tin():
     for i in range(0, tin.GetGeometryCount()):
         geom = tin.GetGeometryRef(i)
         wkt_geom = geom.ExportToWkt()
-        if polygon_wkt[i] != wkt_geom:
-            gdaltest.post_reason("Failure in getting geometries of TIN")
-            return 'fail'
+        assert polygon_wkt[i] == wkt_geom, "Failure in getting geometries of TIN"
 
     wkt_original = 'TIN Z (((0 0 0,0 0 1,0 1 0,0 0 0)),((0 0 0,0 1 0,1 1 0,0 0 0)))'
     tin = ogr.CreateGeometryFromWkt(wkt_original)
@@ -339,25 +286,17 @@ def test_ogr_geom_tin():
     wkb_string = tin.ExportToWkb(ogr.wkbXDR)
     geom = ogr.CreateGeometryFromWkb(wkb_string)
     wkt_string = geom.ExportToWkt()
-    if wkt_string != wkt_original:
-        gdaltest.post_reason("Failure in Wkb methods of TIN")
-        return 'fail'
+    assert wkt_string == wkt_original, "Failure in Wkb methods of TIN"
 
     wkt_string = geom.Clone().ExportToWkt()
-    if wkt_string != wkt_original:
-        gdaltest.post_reason("Failure in Clone()")
-        return 'fail'
+    assert wkt_string == wkt_original, "Failure in Clone()"
 
     if ogrtest.have_sfcgal():
         area = 12.3 * tin.Area()
-        if area != 12.3:
-            gdaltest.post_reason("Wrong area of TIN")
-            return 'fail'
+        assert area == 12.3, "Wrong area of TIN"
 
     size = tin.WkbSize()
-    if size != 227:
-        gdaltest.post_reason("Wrong WkbSize() of TIN")
-        return 'fail'
+    assert size == 227, "Wrong WkbSize() of TIN"
 
     # geom = tin.DelaunayTriangulation(0.0,True)
     # wkt_geom_dt = 'MULTILINESTRING ((0 1 0,1 1 0),(0 0 0,0 1 0),(0 0 0,1 1 0))'
@@ -372,33 +311,26 @@ def test_ogr_geom_tin():
     #    gdaltest.post_reason ("Failure in Contains() of TIN")
     #    return 'fail'
 
-    if tin.IsEmpty():
-        gdaltest.post_reason("Failure in IsEmpty() of TIN")
-        return 'fail'
+    assert not tin.IsEmpty(), "Failure in IsEmpty() of TIN"
 
     tin.Empty()
     wkt_string = tin.ExportToWkt()
-    if wkt_string != 'TIN Z EMPTY':
-        gdaltest.post_reason("Failure in Empty() of TIN")
-        return 'fail'
+    assert wkt_string == 'TIN Z EMPTY', "Failure in Empty() of TIN"
 
     wrong_polygon = ogr.CreateGeometryFromWkt('POLYGON ((0 0 0,0 1 0,1 1 0,0 0 1))')
     geom_count = tin.GetGeometryCount()
     gdal.PushErrorHandler('CPLQuietErrorHandler')
     x = tin.AddGeometry(wrong_polygon)
     gdal.PopErrorHandler()
-    if tin.GetGeometryCount() != geom_count:
-        gdaltest.post_reason("Added wrong geometry in TIN, error has code " + str(x))
-        return 'fail'
+    assert tin.GetGeometryCount() == geom_count, \
+        ("Added wrong geometry in TIN, error has code " + str(x))
 
     if ogrtest.have_geos() or ogrtest.have_sfcgal():
         point = tin.PointOnSurface()
         point_wkt = point.ExportToWkt()
         point_correct_wkt = 'POINT EMPTY'
-        if point_wkt != point_correct_wkt:
-            gdaltest.post_reason("Wrong Point Obtained for PointOnSurface() in TIN")
-            print(point_wkt)
-            return 'fail'
+        assert point_wkt == point_correct_wkt, \
+            "Wrong Point Obtained for PointOnSurface() in TIN"
 
     tin = ogr.CreateGeometryFromWkt(wkt_original)
     # point = tin.PointOnSurface()
@@ -410,36 +342,29 @@ def test_ogr_geom_tin():
     #    return 'fail'
 
     tin.FlattenTo2D()
-    if tin.IsValid():
-        gdaltest.post_reason("Problem with IsValid() in TIN")
-        return 'fail'
+    assert not tin.IsValid(), "Problem with IsValid() in TIN"
 
     # 4 points
     invalid_wkt = 'TIN (((0 0,0 1,1 1,1 0,0 0)))'
     with gdaltest.error_handler():
         g = ogr.CreateGeometryFromWkt(invalid_wkt)
-    if g is not None:
-        return 'fail'
+    assert g is None
 
     # hole
     invalid_wkt = 'TIN(((0 0,0 1,1 1,0 0),(0.1 0.1,0.1 0.2,0.2 0.2,0.1 0.1)))'
     with gdaltest.error_handler():
         g = ogr.CreateGeometryFromWkt(invalid_wkt)
-    if g is not None:
-        return 'fail'
+    assert g is None
 
     invalid_wkt = 'TIN (POLYGON((0 0,0 1,1 1,0 0)))'
     with gdaltest.error_handler():
         g = ogr.CreateGeometryFromWkt(invalid_wkt)
-    if g is not None:
-        return 'fail'
+    assert g is None
 
     # Add a POLYGON that can be cast as a TRIANGLE
     g = ogr.Geometry(ogr.wkbTIN)
-    if g.AddGeometry(ogr.CreateGeometryFromWkt('POLYGON ((0 0,0 1,1 1,0 0))')) != 0:
-        return 'fail'
-    if g.ExportToIsoWkt() != 'TIN (((0 0,0 1,1 1,0 0)))':
-        return 'fail'
+    assert g.AddGeometry(ogr.CreateGeometryFromWkt('POLYGON ((0 0,0 1,1 1,0 0))')) == 0
+    assert g.ExportToIsoWkt() == 'TIN (((0 0,0 1,1 1,0 0)))'
 
     return 'success'
 
@@ -456,14 +381,12 @@ def test_ogr_geom_boundary_point():
     geom = ogr.CreateGeometryFromWkt(geom_wkt)
 
     bnd = geom.GetBoundary()
-    if bnd.GetGeometryType() != ogr.wkbGeometryCollection:
-        gdaltest.post_reason('GetBoundary not reported as GEOMETRYCOLLECTION EMPTY')
-        return 'fail'
+    assert bnd.GetGeometryType() == ogr.wkbGeometryCollection, \
+        'GetBoundary not reported as GEOMETRYCOLLECTION EMPTY'
 
     bnd = geom.Boundary()
-    if bnd.GetGeometryType() != ogr.wkbGeometryCollection:
-        gdaltest.post_reason('Boundary not reported as GEOMETRYCOLLECTION EMPTY')
-        return 'fail'
+    assert bnd.GetGeometryType() == ogr.wkbGeometryCollection, \
+        'Boundary not reported as GEOMETRYCOLLECTION EMPTY'
 
     return 'success'
 
@@ -480,9 +403,8 @@ def test_ogr_geom_boundary_multipoint():
     geom = ogr.CreateGeometryFromWkt(geom_wkt)
 
     bnd = geom.GetBoundary()
-    if bnd.GetGeometryType() != ogr.wkbGeometryCollection:
-        gdaltest.post_reason('Boundary not reported as GEOMETRYCOLLECTION EMPTY')
-        return 'fail'
+    assert bnd.GetGeometryType() == ogr.wkbGeometryCollection, \
+        'Boundary not reported as GEOMETRYCOLLECTION EMPTY'
 
     return 'success'
 
@@ -499,26 +421,20 @@ def test_ogr_geom_boundary_linestring():
     geom = ogr.CreateGeometryFromWkt(geom_wkt)
 
     bnd = geom.GetBoundary()
-    if bnd.GetGeometryType() != ogr.wkbMultiPoint:
-        gdaltest.post_reason('Boundary not reported as MULTIPOINT')
-        print(bnd)
-        return 'fail'
+    assert bnd.GetGeometryType() == ogr.wkbMultiPoint, \
+        'Boundary not reported as MULTIPOINT'
 
-    if bnd.GetGeometryCount() != 2:
-        gdaltest.post_reason('Boundary not reported as MULTIPOINT consisting of 2 points')
-        return 'fail'
+    assert bnd.GetGeometryCount() == 2, \
+        'Boundary not reported as MULTIPOINT consisting of 2 points'
 
     geom_wkt = 'LINESTRING(0 0, 1 0, 1 1, 0 1, 0 0)'
     geom = ogr.CreateGeometryFromWkt(geom_wkt)
 
     bnd = geom.GetBoundary()
-    if bnd.GetGeometryType() != ogr.wkbMultiPoint:
-        gdaltest.post_reason('Boundary not reported as MULTIPOINT')
-        return 'fail'
+    assert bnd.GetGeometryType() == ogr.wkbMultiPoint, \
+        'Boundary not reported as MULTIPOINT'
 
-    if bnd.GetGeometryCount() != 0:
-        gdaltest.post_reason('Boundary not reported as MULTIPOINT EMPTY')
-        return 'fail'
+    assert bnd.GetGeometryCount() == 0, 'Boundary not reported as MULTIPOINT EMPTY'
 
     return 'success'
 
@@ -535,10 +451,8 @@ def test_ogr_geom_boundary_polygon():
     geom = ogr.CreateGeometryFromWkt(geom_wkt)
 
     bnd = geom.GetBoundary()
-    if bnd.GetGeometryType() != ogr.wkbLineString:
-        gdaltest.post_reason('Boundary not reported as non-empty LINESTRING')
-        print(bnd)
-        return 'fail'
+    assert bnd.GetGeometryType() == ogr.wkbLineString, \
+        'Boundary not reported as non-empty LINESTRING'
 
     return 'success'
 
@@ -568,8 +482,7 @@ def test_ogr_geom_build_from_edges_1():
 
     try:
         poly = ogr.BuildPolygonFromEdges(link_coll)
-        if poly is None:
-            return 'fail'
+        assert poly is not None
     except:
         return 'fail'
 
@@ -600,8 +513,7 @@ def test_ogr_geom_build_from_edges_2():
 
     try:
         poly = ogr.BuildPolygonFromEdges(link_coll)
-        if poly is None:
-            return 'fail'
+        assert poly is not None
     except:
         return 'fail'
 
@@ -621,8 +533,7 @@ def test_ogr_geom_build_from_edges_3():
         gdal.PushErrorHandler('CPLQuietErrorHandler')
         poly = ogr.BuildPolygonFromEdges(src_geom)
         gdal.PopErrorHandler()
-        if poly is not None:
-            return 'fail'
+        assert poly is None
     except:
         pass
 
@@ -631,8 +542,7 @@ def test_ogr_geom_build_from_edges_3():
         gdal.PushErrorHandler('CPLQuietErrorHandler')
         poly = ogr.BuildPolygonFromEdges(src_geom)
         gdal.PopErrorHandler()
-        if poly is not None:
-            return 'fail'
+        assert poly is None
     except:
         pass
 
@@ -673,12 +583,9 @@ def test_ogr_geom_build_from_edges_4():
 
     try:
         poly = ogr.BuildPolygonFromEdges(link_coll)
-        if poly is None:
-            return 'fail'
+        assert poly is not None
         wkt = poly.ExportToWkt()
-        if wkt != 'POLYGON ((0 0,0 10,10 10,10 0,0 0),(1 1,1 2,2 2,2 1,1 1))':
-            print(wkt)
-            return 'fail'
+        assert wkt == 'POLYGON ((0 0,0 10,10 10,10 0,0 0),(1 1,1 2,2 2,2 1,1 1))'
     except:
         return 'fail'
 
@@ -693,8 +600,7 @@ def test_ogr_geom_area_empty_linearring():
     geom = ogr.Geometry(type=ogr.wkbLinearRing)
 
     area = geom.GetArea()
-    if area != 0:
-        return 'fail'
+    assert area == 0
 
     return 'success'
 
@@ -717,17 +623,15 @@ def test_ogr_geom_transform_to():
     sr2.ImportFromEPSG(32631)
     ret = geom.TransformTo(sr2)
 
-    if ret != 0 or abs(geom.GetX() - 426857) > 1 or abs(geom.GetY() - 5427937) > 1:
-        print(geom.ExportToWkt())
-        return 'fail'
+    assert ret == 0 and abs(geom.GetX() - 426857) <= 1 and abs(geom.GetY() - 5427937) <= 1, \
+        geom.ExportToWkt()
 
     # Geometry without SRS
     geom = ogr.CreateGeometryFromWkt('POINT(2 49)')
     gdal.ErrorReset()
     with gdaltest.error_handler():
         ret = geom.TransformTo(sr2)
-    if ret == 0 or gdal.GetLastErrorMsg() == '':
-        return 'fail'
+    assert not (ret == 0 or gdal.GetLastErrorMsg() == '')
 
     return 'success'
 
@@ -752,9 +656,8 @@ def test_ogr_geom_transform():
 
     geom.Transform(ct)
 
-    if abs(geom.GetX() - 426857) > 1 or abs(geom.GetY() - 5427937) > 1:
-        print(geom.ExportToWkt())
-        return 'fail'
+    assert abs(geom.GetX() - 426857) <= 1 and abs(geom.GetY() - 5427937) <= 1, \
+        geom.ExportToWkt()
 
     return 'success'
 
@@ -767,14 +670,10 @@ def test_ogr_geom_closerings():
     geom = ogr.CreateGeometryFromWkt('POLYGON((0 0,0 1,1 1,1 0))')
     geom.CloseRings()
 
-    if geom.ExportToWkt() != 'POLYGON ((0 0,0 1,1 1,1 0,0 0))':
-        print(geom.ExportToWkt())
-        return 'fail'
+    assert geom.ExportToWkt() == 'POLYGON ((0 0,0 1,1 1,1 0,0 0))'
 
     geom.CloseRings()
-    if geom.ExportToWkt() != 'POLYGON ((0 0,0 1,1 1,1 0,0 0))':
-        print(geom.ExportToWkt())
-        return 'fail'
+    assert geom.ExportToWkt() == 'POLYGON ((0 0,0 1,1 1,1 0,0 0))'
 
     return 'success'
 
@@ -787,16 +686,12 @@ def test_ogr_geom_segmentize():
     geom = ogr.CreateGeometryFromWkt('LINESTRING(0 0,0 10)')
     geom.Segmentize(1.00001)
 
-    if geom.ExportToWkt() != 'LINESTRING (0 0,0 1,0 2,0 3,0 4,0 5,0 6,0 7,0 8,0 9,0 10)':
-        print(geom.ExportToWkt())
-        return 'fail'
+    assert geom.ExportToWkt() == 'LINESTRING (0 0,0 1,0 2,0 3,0 4,0 5,0 6,0 7,0 8,0 9,0 10)'
 
     geom = ogr.CreateGeometryFromWkt('LINESTRING(0 0 1,0 10 1)')
     geom.Segmentize(1.00001)
 
-    if geom.ExportToWkt() != 'LINESTRING (0 0 1,0 1 1,0 2 1,0 3 1,0 4 1,0 5 1,0 6 1,0 7 1,0 8 1,0 9 1,0 10 1)':
-        print(geom.ExportToWkt())
-        return 'fail'
+    assert geom.ExportToWkt() == 'LINESTRING (0 0 1,0 1 1,0 2 1,0 3 1,0 4 1,0 5 1,0 6 1,0 7 1,0 8 1,0 9 1,0 10 1)'
 
     # Check segmentize symmetry : do exact binary comparison.
     in_wkt = 'LINESTRING (0 0,1.2 1,2 0)'
@@ -807,12 +702,8 @@ def test_ogr_geom_segmentize():
     g2.Segmentize(0.25)
     for i in range(g1.GetPointCount()):
         if g1.GetPoint(i) != g2.GetPoint(g1.GetPointCount() - 1 - i):
-            print(i)
             print('%.18g' % (g1.GetPoint(i)[0] - g2.GetPoint(g1.GetPointCount() - 1 - i)[0]))
-            print('%.18g' % (g1.GetPoint(i)[1] - g2.GetPoint(g1.GetPointCount() - 1 - i)[1]))
-            print(g1)
-            print(g2)
-            return 'fail'
+            pytest.fail('%.18g' % (g1.GetPoint(i)[1] - g2.GetPoint(g1.GetPointCount() - 1 - i)[1]))
 
     return 'success'
 
@@ -826,33 +717,23 @@ def test_ogr_geom_value():
 
     p = geom.Value(-1e-3)
     expected_p = ogr.CreateGeometryFromWkt('POINT (2 3)')
-    if ogrtest.check_feature_geometry(p, expected_p) != 0:
-        print(p)
-        return 'fail'
+    assert ogrtest.check_feature_geometry(p, expected_p) == 0
 
     p = geom.Value(geom.Length() / 4)
     expected_p = ogr.CreateGeometryFromWkt('POINT (3.5 3)')
-    if ogrtest.check_feature_geometry(p, expected_p) != 0:
-        print(p)
-        return 'fail'
+    assert ogrtest.check_feature_geometry(p, expected_p) == 0
 
     p = geom.Value(geom.Length() / 2)
     expected_p = ogr.CreateGeometryFromWkt('POINT (5 3)')
-    if ogrtest.check_feature_geometry(p, expected_p) != 0:
-        print(p)
-        return 'fail'
+    assert ogrtest.check_feature_geometry(p, expected_p) == 0
 
     p = geom.Value(3 * geom.Length() / 4)
     expected_p = ogr.CreateGeometryFromWkt('POINT (5 1.5)')
-    if ogrtest.check_feature_geometry(p, expected_p) != 0:
-        print(p)
-        return 'fail'
+    assert ogrtest.check_feature_geometry(p, expected_p) == 0
 
     p = geom.Value(geom.Length() + 1e-3)
     expected_p = ogr.CreateGeometryFromWkt('POINT (5 0)')
-    if ogrtest.check_feature_geometry(p, expected_p) != 0:
-        print(p)
-        return 'fail'
+    assert ogrtest.check_feature_geometry(p, expected_p) == 0
 
     return 'success'
 
@@ -865,22 +746,14 @@ def test_ogr_geom_flattenTo2D():
     geom = ogr.CreateGeometryFromWkt('POINT (1 2 3)')
 
     # Point is 0 dimension, LineString 1, ...
-    if geom.GetDimension() != 0:
-        print(geom.GetDimension())
-        return 'fail'
+    assert geom.GetDimension() == 0
 
-    if geom.GetCoordinateDimension() != 3:
-        print(geom.GetCoordinateDimension())
-        return 'fail'
+    assert geom.GetCoordinateDimension() == 3
 
     geom.FlattenTo2D()
-    if geom.GetCoordinateDimension() != 2:
-        print(geom.GetCoordinateDimension())
-        return 'fail'
+    assert geom.GetCoordinateDimension() == 2
 
-    if geom.ExportToWkt() != 'POINT (1 2)':
-        print(geom.ExportToWkt())
-        return 'fail'
+    assert geom.ExportToWkt() == 'POINT (1 2)'
 
     return 'success'
 
@@ -893,22 +766,14 @@ def test_ogr_geom_flattenTo2D_triangle():
     geom = ogr.CreateGeometryFromWkt('TRIANGLE ((0 0 0,100 0 100,0 100 100,0 0 0))')
 
     # Point is 0 dimension, LineString 1, ...
-    if geom.GetDimension() != 2:
-        print(geom.GetDimension())
-        return 'fail'
+    assert geom.GetDimension() == 2
 
-    if geom.GetCoordinateDimension() != 3:
-        print(geom.GetCoordinateDimension())
-        return 'fail'
+    assert geom.GetCoordinateDimension() == 3
 
     geom.FlattenTo2D()
-    if geom.GetCoordinateDimension() != 2:
-        print(geom.GetCoordinateDimension())
-        return 'fail'
+    assert geom.GetCoordinateDimension() == 2
 
-    if geom.ExportToWkt() != 'TRIANGLE ((0 0,100 0,0 100,0 0))':
-        print(geom.ExportToWkt())
-        return 'fail'
+    assert geom.ExportToWkt() == 'TRIANGLE ((0 0,100 0,0 100,0 0))'
 
     return 'success'
 
@@ -918,72 +783,61 @@ def test_ogr_geom_flattenTo2D_triangle():
 def test_ogr_geom_linestring_limits():
 
     geom = ogr.CreateGeometryFromWkt('LINESTRING EMPTY')
-    if geom.Length() != 0:
-        return 'fail'
+    assert geom.Length() == 0
 
     gdal.ErrorReset()
     gdal.PushErrorHandler('CPLQuietErrorHandler')
     geom.GetPoint(-1)
     gdal.PopErrorHandler()
-    if gdal.GetLastErrorType() == 0:
-        return 'fail'
+    assert gdal.GetLastErrorType() != 0
 
     gdal.ErrorReset()
     gdal.PushErrorHandler('CPLQuietErrorHandler')
     geom.GetPoint(0)
     gdal.PopErrorHandler()
-    if gdal.GetLastErrorType() == 0:
-        return 'fail'
+    assert gdal.GetLastErrorType() != 0
 
     gdal.ErrorReset()
     gdal.PushErrorHandler('CPLQuietErrorHandler')
     geom.GetPoint_2D(-1)
     gdal.PopErrorHandler()
-    if gdal.GetLastErrorType() == 0:
-        return 'fail'
+    assert gdal.GetLastErrorType() != 0
 
     gdal.ErrorReset()
     gdal.PushErrorHandler('CPLQuietErrorHandler')
     geom.GetPoint_2D(0)
     gdal.PopErrorHandler()
-    if gdal.GetLastErrorType() == 0:
-        return 'fail'
+    assert gdal.GetLastErrorType() != 0
 
     gdal.ErrorReset()
     gdal.PushErrorHandler('CPLQuietErrorHandler')
     geom.SetPoint(-1, 5, 6, 7)
     gdal.PopErrorHandler()
-    if gdal.GetLastErrorType() == 0:
-        return 'fail'
+    assert gdal.GetLastErrorType() != 0
 
     gdal.ErrorReset()
     gdal.PushErrorHandler('CPLQuietErrorHandler')
     geom.SetPoint_2D(-1, 5, 6)
     gdal.PopErrorHandler()
-    if gdal.GetLastErrorType() == 0:
-        return 'fail'
+    assert gdal.GetLastErrorType() != 0
 
     if False:  # pylint: disable=using-constant-test
         gdal.ErrorReset()
         gdal.PushErrorHandler('CPLQuietErrorHandler')
         geom.SetPoint(2147000000, 5, 6, 7)
         gdal.PopErrorHandler()
-        if gdal.GetLastErrorType() == 0:
-            return 'fail'
+        assert gdal.GetLastErrorType() != 0
 
         gdal.ErrorReset()
         gdal.PushErrorHandler('CPLQuietErrorHandler')
         geom.SetPoint_2D(2147000000, 5, 6)
         gdal.PopErrorHandler()
-        if gdal.GetLastErrorType() == 0:
-            return 'fail'
+        assert gdal.GetLastErrorType() != 0
 
     geom = ogr.CreateGeometryFromWkt('LINESTRING(0 0)')
-    if geom.Length() != 0:
-        return 'fail'
+    assert geom.Length() == 0
     geom = ogr.CreateGeometryFromWkt('LINESTRING(0 0, 1 0)')
-    if geom.Length() != 1:
-        return 'fail'
+    assert geom.Length() == 1
 
     return 'success'
 
@@ -994,10 +848,7 @@ def test_ogr_geom_coord_round():
 
     geom = ogr.CreateGeometryFromWkt('POINT(370441.860 5591000.590)')
     wkt = geom.ExportToWkt()
-    if wkt != 'POINT (370441.86 5591000.59)':
-        gdaltest.post_reason('did not get expected WKT')
-        print(wkt)
-        return 'fail'
+    assert wkt == 'POINT (370441.86 5591000.59)', 'did not get expected WKT'
 
     return 'success'
 
@@ -1008,10 +859,7 @@ def test_ogr_geom_coord_round_2():
 
     geom = ogr.CreateGeometryFromWkt('POINT(1.0 169.600374)')
     wkt = geom.ExportToWkt()
-    if wkt != 'POINT (1.0 169.600374)':
-        gdaltest.post_reason('did not get expected WKT')
-        print(wkt)
-        return 'fail'
+    assert wkt == 'POINT (1.0 169.600374)', 'did not get expected WKT'
 
     return 'success'
 
@@ -1026,9 +874,7 @@ def test_ogr_geom_area_point():
 
     with gdaltest.error_handler():
         area = geom.Area()
-    if area != 0:
-        gdaltest.post_reason('Area() result wrong, got %g.' % area)
-        return 'fail'
+    assert area == 0, ('Area() result wrong, got %g.' % area)
 
     return 'success'
 
@@ -1044,9 +890,7 @@ def test_ogr_geom_length_point():
 
     with gdaltest.error_handler():
         length = geom.Length()
-    if length != 0:
-        gdaltest.post_reason('Length() result wrong, got %g.' % length)
-        return 'fail'
+    assert length == 0, ('Length() result wrong, got %g.' % length)
 
     return 'success'
 
@@ -1061,9 +905,7 @@ def test_ogr_geom_length_multilinestring():
     geom = ogr.CreateGeometryFromWkt(geom_wkt)
 
     length = geom.Length()
-    if abs(length - 2) > 0.00000000001:
-        gdaltest.post_reason('Length() result wrong, got %g.' % length)
-        return 'fail'
+    assert abs(length - 2) <= 0.00000000001, ('Length() result wrong, got %g.' % length)
 
     return 'success'
 
@@ -1078,9 +920,7 @@ def test_ogr_geom_length_geometrycollection():
     geom = ogr.CreateGeometryFromWkt(geom_wkt)
 
     length = geom.Length()
-    if abs(length - 4) > 0.00000000001:
-        gdaltest.post_reason('Length() result wrong, got %g.' % length)
-        return 'fail'
+    assert abs(length - 4) <= 0.00000000001, ('Length() result wrong, got %g.' % length)
 
     return 'success'
 
@@ -1092,51 +932,29 @@ def test_ogr_geom_getpoints():
 
     geom = ogr.CreateGeometryFromWkt('LINESTRING(0 1,2 3)')
     points = geom.GetPoints()
-    if points != [(0.0, 1.0), (2.0, 3.0)]:
-        gdaltest.post_reason('did not get expected points (1)')
-        print(points)
-        return 'fail'
+    assert points == [(0.0, 1.0), (2.0, 3.0)], 'did not get expected points (1)'
     points = geom.GetPoints(nCoordDimension=3)
-    if points != [(0.0, 1.0, 0.0), (2.0, 3.0, 0.0)]:
-        gdaltest.post_reason('did not get expected points (2)')
-        print(points)
-        return 'fail'
+    assert points == [(0.0, 1.0, 0.0), (2.0, 3.0, 0.0)], \
+        'did not get expected points (2)'
 
     geom = ogr.CreateGeometryFromWkt('LINESTRING(0 1 2,3 4 5)')
     points = geom.GetPoints()
-    if points != [(0.0, 1.0, 2.0), (3.0, 4.0, 5.0)]:
-        gdaltest.post_reason('did not get expected points (3)')
-        print(points)
-        return 'fail'
+    assert points == [(0.0, 1.0, 2.0), (3.0, 4.0, 5.0)], \
+        'did not get expected points (3)'
     points = geom.GetPoints(nCoordDimension=2)
-    if points != [(0.0, 1.0), (3.0, 4.0)]:
-        gdaltest.post_reason('did not get expected points (4)')
-        print(points)
-        return 'fail'
+    assert points == [(0.0, 1.0), (3.0, 4.0)], 'did not get expected points (4)'
 
     geom = ogr.CreateGeometryFromWkt('POINT(0 1)')
     points = geom.GetPoints()
-    if points != [(0.0, 1.0)]:
-        gdaltest.post_reason('did not get expected points (5)')
-        print(points)
-        return 'fail'
+    assert points == [(0.0, 1.0)], 'did not get expected points (5)'
     points = geom.GetPoints(nCoordDimension=3)
-    if points != [(0.0, 1.0, 0.0)]:
-        gdaltest.post_reason('did not get expected points (6)')
-        print(points)
-        return 'fail'
+    assert points == [(0.0, 1.0, 0.0)], 'did not get expected points (6)'
 
     geom = ogr.CreateGeometryFromWkt('POINT(0 1 2)')
     points = geom.GetPoints()
-    if points != [(0.0, 1.0, 2.0)]:
-        gdaltest.post_reason('did not get expected points (7)')
-        print(points)
-        return 'fail'
+    assert points == [(0.0, 1.0, 2.0)], 'did not get expected points (7)'
     points = geom.GetPoints(nCoordDimension=2)
-    if points != [(0.0, 1.0)]:
-        gdaltest.post_reason('did not get expected points (8)')
-        print(points)
-        return 'fail'
+    assert points == [(0.0, 1.0)], 'did not get expected points (8)'
 
     return 'success'
 
@@ -1150,8 +968,7 @@ def test_ogr_geom_empty():
     g1.Empty()
     wkt = g1.ExportToWkt()
 
-    if wkt != 'POLYGON EMPTY':
-        return 'fail'
+    assert wkt == 'POLYGON EMPTY'
 
     return 'success'
 
@@ -1165,8 +982,7 @@ def test_ogr_geom_empty_triangle():
     g1.Empty()
     wkt = g1.ExportToWkt()
 
-    if wkt != 'TRIANGLE EMPTY':
-        return 'fail'
+    assert wkt == 'TRIANGLE EMPTY'
 
     return 'success'
 
@@ -1181,18 +997,16 @@ def test_ogr_geom_mixed_coordinate_dimension():
     expected_wkt = 'MULTIPOLYGON (((1 2 -4,1 3 -3,2 3 -3,2 2 -3,1 2 -6)),((-1 -2 0,-1 -3 0,-2 -3 0,-2 -2 0,-1 -2 0,50 60 0)))'
     g = ogr.CreateGeometryFromWkt(wkt)
     got_wkt = g.ExportToWkt()
-    if got_wkt != expected_wkt:
-        gdaltest.post_reason('for %s: got %s, expected %s' % (wkt, got_wkt, expected_wkt))
-        return 'fail'
+    assert got_wkt == expected_wkt, \
+        ('for %s: got %s, expected %s' % (wkt, got_wkt, expected_wkt))
 
     # first part is 3D, second part is 2D of same length, except the last point which is 3D
     wkt = 'MULTIPOLYGON (((1 2 -4,1 3 -3,2 3 -3,2 2 -3,1 2 -6)),((-1 -2,-1 -3,-2 -3,-2 -2,-1 -2,50 60 7)))'
     expected_wkt = 'MULTIPOLYGON (((1 2 -4,1 3 -3,2 3 -3,2 2 -3,1 2 -6)),((-1 -2 0,-1 -3 0,-2 -3 0,-2 -2 0,-1 -2 0,50 60 7)))'
     g = ogr.CreateGeometryFromWkt(wkt)
     got_wkt = g.ExportToWkt()
-    if got_wkt != expected_wkt:
-        gdaltest.post_reason('for %s: got %s, expected %s' % (wkt, got_wkt, expected_wkt))
-        return 'fail'
+    assert got_wkt == expected_wkt, \
+        ('for %s: got %s, expected %s' % (wkt, got_wkt, expected_wkt))
 
     return 'success'
 
@@ -1205,74 +1019,42 @@ def test_ogr_geom_getenvelope3d():
     g = ogr.CreateGeometryFromWkt('POINT EMPTY')
     envelope = g.GetEnvelope3D()
     expected_envelope = (0.0, 0.0, 0.0, 0.0, 0.0, 0.0)
-    if envelope != expected_envelope:
-        gdaltest.post_reason('did not get expected envelope (1)')
-        print(envelope)
-        print(expected_envelope)
-        return 'fail'
+    assert envelope == expected_envelope, 'did not get expected envelope (1)'
 
     g = ogr.CreateGeometryFromWkt('POINT(1 2)')
     envelope = g.GetEnvelope3D()
     expected_envelope = (1.0, 1.0, 2.0, 2.0, 0.0, 0.0)
-    if envelope != expected_envelope:
-        gdaltest.post_reason('did not get expected envelope (2)')
-        print(envelope)
-        print(expected_envelope)
-        return 'fail'
+    assert envelope == expected_envelope, 'did not get expected envelope (2)'
 
     g = ogr.CreateGeometryFromWkt('POINT(1 2 3)')
     envelope = g.GetEnvelope3D()
     expected_envelope = (1.0, 1.0, 2.0, 2.0, 3.0, 3.0)
-    if envelope != expected_envelope:
-        gdaltest.post_reason('did not get expected envelope (3)')
-        print(envelope)
-        print(expected_envelope)
-        return 'fail'
+    assert envelope == expected_envelope, 'did not get expected envelope (3)'
 
     g = ogr.CreateGeometryFromWkt('POLYGON EMPTY')
     envelope = g.GetEnvelope3D()
     expected_envelope = (0.0, 0.0, 0.0, 0.0, 0.0, 0.0)
-    if envelope != expected_envelope:
-        gdaltest.post_reason('did not get expected envelope (4)')
-        print(envelope)
-        print(expected_envelope)
-        return 'fail'
+    assert envelope == expected_envelope, 'did not get expected envelope (4)'
 
     g = ogr.CreateGeometryFromWkt('LINESTRING(1 2,3 4)')
     envelope = g.GetEnvelope3D()
     expected_envelope = (1, 3, 2, 4, 0, 0)
-    if envelope != expected_envelope:
-        gdaltest.post_reason('did not get expected envelope (5)')
-        print(envelope)
-        print(expected_envelope)
-        return 'fail'
+    assert envelope == expected_envelope, 'did not get expected envelope (5)'
 
     g = ogr.CreateGeometryFromWkt('MULTIPOLYGON(((1 2 3,-1 2 3,-1 -2 3,-1 2 3,1 2 3),(0.1 0.2 0.3,-0.1 0.2 0.3,-0.1 -0.2 0.3,-0.1 0.2 0.3,0.1 0.2 0.3)),((10 20 -30,-10 20 -30,-10 -20 -30,-10 20 -30,10 20 -30)))')
     envelope = g.GetEnvelope3D()
     expected_envelope = (-10, 10, -20, 20, -30, 3.0)
-    if envelope != expected_envelope:
-        gdaltest.post_reason('did not get expected envelope (6)')
-        print(envelope)
-        print(expected_envelope)
-        return 'fail'
+    assert envelope == expected_envelope, 'did not get expected envelope (6)'
 
     g = ogr.CreateGeometryFromWkt('MULTIPOLYGON EMPTY')
     envelope = g.GetEnvelope3D()
     expected_envelope = (0.0, 0.0, 0.0, 0.0, 0.0, 0.0)
-    if envelope != expected_envelope:
-        gdaltest.post_reason('did not get expected envelope (7)')
-        print(envelope)
-        print(expected_envelope)
-        return 'fail'
+    assert envelope == expected_envelope, 'did not get expected envelope (7)'
 
     g = ogr.CreateGeometryFromWkt('TRIANGLE ((0 0 0,100 0 100,0 100 100,0 0 0))')
     envelope = g.GetEnvelope3D()
     expected_envelope = (0.0, 100.0, 0.0, 100.0, 0.0, 100.0)
-    if envelope != expected_envelope:
-        gdaltest.post_reason('did not get expected envelope (8)')
-        print(envelope)
-        print(expected_envelope)
-        return 'fail'
+    assert envelope == expected_envelope, 'did not get expected envelope (8)'
 
     return 'success'
 
@@ -1288,15 +1070,11 @@ def test_ogr_geom_z_empty():
         in_wkt = geom + ' Z EMPTY'
         g1 = ogr.CreateGeometryFromWkt(in_wkt)
         out_wkt = g1.ExportToIsoWkt()
-        if in_wkt != out_wkt:
-            print(out_wkt)
-            return 'fail'
+        assert in_wkt == out_wkt
 
         g2 = ogr.CreateGeometryFromWkb(g1.ExportToIsoWkb())
         out_wkt = g2.ExportToIsoWkt()
-        if in_wkt != out_wkt:
-            print(out_wkt)
-            return 'fail'
+        assert in_wkt == out_wkt
 
     return 'success'
 
@@ -1320,25 +1098,16 @@ def test_ogr_geom_getlineargeometry():
         in_wkt = geom_in + ' EMPTY'
         g = ogr.CreateGeometryFromWkt(in_wkt)
         g2 = g.GetLinearGeometry()
-        if geom_in != geom_out and not g.HasCurveGeometry():
-            print(g)
-            return 'fail'
-        if g2.ExportToWkt() != geom_out + ' EMPTY':
-            print(g)
-            print(g2)
-            return 'fail'
+        assert geom_in == geom_out or g.HasCurveGeometry()
+        assert g2.ExportToWkt() == geom_out + ' EMPTY', g
 
     g = ogr.CreateGeometryFromWkt('GEOMETRYCOLLECTION(POINT (0 1))')
-    if g.HasCurveGeometry():
-        return 'fail'
-    if g.HasCurveGeometry(True):
-        return 'fail'
+    assert not g.HasCurveGeometry()
+    assert not g.HasCurveGeometry(True)
 
     g = ogr.CreateGeometryFromWkt('GEOMETRYCOLLECTION(CIRCULARSTRING (0 0,0 1,0 0))')
-    if not g.HasCurveGeometry():
-        return 'fail'
-    if not g.HasCurveGeometry(True):
-        return 'fail'
+    assert g.HasCurveGeometry()
+    assert g.HasCurveGeometry(True)
 
     return 'success'
 
@@ -1363,18 +1132,13 @@ def test_ogr_geom_getdimension():
                         ('POLYHEDRALSURFACE EMPTY', 2),
                         ('TIN EMPTY', 2)]:
         g = ogr.CreateGeometryFromWkt(geom)
-        if g.GetDimension() != dim:
-            print(g)
-            print(dim)
-            return 'fail'
+        assert g.GetDimension() == dim
 
     g = ogr.CreateGeometryFromWkt('GEOMETRYCOLLECTION(LINESTRING EMPTY, POINT (0 1))')
-    if g.GetDimension() != 1:
-        return 'fail'
+    assert g.GetDimension() == 1
 
     g = ogr.CreateGeometryFromWkt('GEOMETRYCOLLECTION(POINT (0 1), LINESTRING EMPTY, POLYGON EMPTY)')
-    if g.GetDimension() != 2:
-        return 'fail'
+    assert g.GetDimension() == 2
 
     return 'success'
 
@@ -1390,24 +1154,16 @@ def test_ogr_geom_triangle():
     wkb_string = geom.ExportToWkb(ogr.wkbXDR)
     geom = ogr.CreateGeometryFromWkb(wkb_string)
     wkt_string = geom.ExportToWkt()
-    if wkt_string != wkt_original:
-        gdaltest.post_reason("Failure in Wkb methods of Triangle")
-        return 'fail'
+    assert wkt_string == wkt_original, "Failure in Wkb methods of Triangle"
 
     wkt_string = geom.Clone().ExportToWkt()
-    if wkt_string != wkt_original:
-        gdaltest.post_reason("Failure in Clone()")
-        return 'fail'
+    assert wkt_string == wkt_original, "Failure in Clone()"
 
     polygon_wkt = ogr.ForceTo(geom.Clone(), ogr.wkbPolygon).ExportToWkt()
-    if polygon_wkt != 'POLYGON ((0 0,0 1,1 1,0 0))':
-        print(polygon_wkt)
-        return 'fail'
+    assert polygon_wkt == 'POLYGON ((0 0,0 1,1 1,0 0))'
 
     polygon_wkt = ogr.ForceTo(geom.Clone(), ogr.wkbMultiPolygon).ExportToWkt()
-    if polygon_wkt != 'MULTIPOLYGON (((0 0,0 1,1 1,0 0)))':
-        print(polygon_wkt)
-        return 'fail'
+    assert polygon_wkt == 'MULTIPOLYGON (((0 0,0 1,1 1,0 0)))'
 
     return 'success'
 
@@ -1420,36 +1176,27 @@ def test_ogr_geom_triangle_invalid_wkt():
     geom_wkt = 'TRIANGLE (0 0)'
     with gdaltest.error_handler():
         geom = ogr.CreateGeometryFromWkt(geom_wkt)
-    if geom is not None:
-        return 'fail'
+    assert geom is None
 
     geom_wkt = 'TRIANGLE ((0 0))'
     with gdaltest.error_handler():
         geom = ogr.CreateGeometryFromWkt(geom_wkt)
-    if geom is not None:
-        print(geom)
-        return 'fail'
+    assert geom is None
 
     geom_wkt = 'TRIANGLE ((0 0,0 1,1 1,1 0))'
     with gdaltest.error_handler():
         geom = ogr.CreateGeometryFromWkt(geom_wkt)
-    if geom is not None:
-        print(geom)
-        return 'fail'
+    assert geom is None
 
     geom_wkt = 'TRIANGLE ((0 0,0 1,1 1,1 0,0 0))'
     with gdaltest.error_handler():
         geom = ogr.CreateGeometryFromWkt(geom_wkt)
-    if geom is not None:
-        print(geom)
-        return 'fail'
+    assert geom is None
 
     geom_wkt = 'TRIANGLE ((0 0,0 1,1 1,0 0),(0 0,0 1,1 1,0 0))'
     with gdaltest.error_handler():
         geom = ogr.CreateGeometryFromWkt(geom_wkt)
-    if geom is not None:
-        print(geom)
-        return 'fail'
+    assert geom is None
 
     return 'success'
 
@@ -1464,15 +1211,13 @@ def test_ogr_geom_triangle_sfcgal():
 
     g1 = ogr.CreateGeometryFromWkt('TRIANGLE ((0 0,100 0 100,0 100 100,0 0))')
     g2 = ogr.CreateGeometryFromWkt('TRIANGLE ((-1 -1,100 0 100,0 100 100,-1 -1))')
-    if not g2.Intersects(g1):
-        return 'fail'
+    assert g2.Intersects(g1)
 
     g1 = ogr.CreateGeometryFromWkt('TRIANGLE ((0 0,1 0,0 1,0 0))')
     g2 = ogr.CreateGeometryFromWkt('TRIANGLE ((0 0,1 0,1 1,0 0))')
     g3 = g1.Intersection(g2)
     g4 = ogr.CreateGeometryFromWkt('TRIANGLE ((0.5 0.5 0,0 0 0,1 0 0,0.5 0.5 0))')
-    if not g4.Equals(g3):
-        return 'fail'
+    assert g4.Equals(g3)
 
     return 'success'
 
@@ -1486,44 +1231,32 @@ def test_ogr_geom_circularstring():
 
     # Test export/import Wkt
     g1 = ogr.CreateGeometryFromWkt(in_wkt)
-    if g1.GetGeometryType() != ogr.wkbCircularString:
-        return 'fail'
+    assert g1.GetGeometryType() == ogr.wkbCircularString
     out_wkt = g1.ExportToWkt()
-    if in_wkt != out_wkt:
-        print(out_wkt)
-        return 'fail'
+    assert in_wkt == out_wkt
 
     if ogrtest.have_geos():
-        if not g1.IsValid():
-            return 'fail'
+        assert g1.IsValid()
 
     # Test GetEnvelope()
     env = g1.GetEnvelope()
     expected_env = (0.0, 2.0, -1.0, 1.0)
     for i in range(4):
-        if abs(env[i] - expected_env[i]) > 1e-8:
-            print(env)
-            return 'fail'
+        assert abs(env[i] - expected_env[i]) <= 1e-8
 
     # Test Length()
     length = g1.Length()
     expected_length = 1.5 * math.pi
-    if abs(length - expected_length) > 1e-8:
-        print(length)
-        return 'fail'
+    assert abs(length - expected_length) <= 1e-8
 
     # Test Value()
     p = g1.Value(-1)
     expected_p = ogr.CreateGeometryFromWkt('POINT (0 0)')
-    if ogrtest.check_feature_geometry(p, expected_p) != 0:
-        print(p)
-        return 'fail'
+    assert ogrtest.check_feature_geometry(p, expected_p) == 0
 
     p = g1.Value(0)
     expected_p = ogr.CreateGeometryFromWkt('POINT (0 0)')
-    if ogrtest.check_feature_geometry(p, expected_p) != 0:
-        print(p)
-        return 'fail'
+    assert ogrtest.check_feature_geometry(p, expected_p) == 0
 
     p = g1.Value(length / 6.0)
     expected_p = ogr.CreateGeometryFromWkt('POINT (0.292893218813453 0.707106781186548)')
@@ -1532,60 +1265,42 @@ def test_ogr_geom_circularstring():
 
     p = g1.Value(length / 3.0)
     expected_p = ogr.CreateGeometryFromWkt('POINT (1 1)')
-    if ogrtest.check_feature_geometry(p, expected_p) != 0:
-        print(p)
-        return 'fail'
+    assert ogrtest.check_feature_geometry(p, expected_p) == 0
 
     p = g1.Value(length / 2.0)
     expected_p = ogr.CreateGeometryFromWkt('POINT (1.707106781186547 0.707106781186547)')
-    if ogrtest.check_feature_geometry(p, expected_p) != 0:
-        print(p)
-        return 'fail'
+    assert ogrtest.check_feature_geometry(p, expected_p) == 0
 
     p = g1.Value(2 * length / 3.0)
     expected_p = ogr.CreateGeometryFromWkt('POINT (2 0)')
-    if ogrtest.check_feature_geometry(p, expected_p) != 0:
-        print(p)
-        return 'fail'
+    assert ogrtest.check_feature_geometry(p, expected_p) == 0
 
     p = g1.Value(length)
     expected_p = ogr.CreateGeometryFromWkt('POINT (1 -1)')
-    if ogrtest.check_feature_geometry(p, expected_p) != 0:
-        print(p)
-        return 'fail'
+    assert ogrtest.check_feature_geometry(p, expected_p) == 0
 
     p = g1.Value(length + 1)
     expected_p = ogr.CreateGeometryFromWkt('POINT (1 -1)')
-    if ogrtest.check_feature_geometry(p, expected_p) != 0:
-        print(p)
-        return 'fail'
+    assert ogrtest.check_feature_geometry(p, expected_p) == 0
 
     # Test export/import Wkb
     g2 = ogr.CreateGeometryFromWkb(g1.ExportToWkb())
     out_wkt = g2.ExportToWkt()
-    if in_wkt != out_wkt:
-        print(out_wkt)
-        return 'fail'
+    assert in_wkt == out_wkt
 
     # With Z
     in_wkt = 'CIRCULARSTRING Z (0 0 10,1 1 20,2 0 30)'
     g1 = ogr.CreateGeometryFromWkt(in_wkt)
-    if g1.GetGeometryType() != ogr.wkbCircularStringZ:
-        return 'fail'
+    assert g1.GetGeometryType() == ogr.wkbCircularStringZ
     out_wkt = g1.ExportToWkt()
-    if in_wkt != out_wkt:
-        print(out_wkt)
-        return 'fail'
+    assert in_wkt == out_wkt
 
     wkb = g1.ExportToWkb()
     isowkb = g1.ExportToIsoWkb()
-    if wkb != isowkb:
-        return 'fail'
+    assert wkb == isowkb
     g2 = ogr.CreateGeometryFromWkb(wkb)
     out_wkt = g2.ExportToWkt()
-    if in_wkt != out_wkt:
-        print(out_wkt)
-        return 'fail'
+    assert in_wkt == out_wkt
 
     # Test stroking
     gdal.SetConfigOption('OGR_STROKE_CURVE', 'TRUE')
@@ -1596,9 +1311,7 @@ def test_ogr_geom_circularstring():
     gdal.SetConfigOption('OGR_ARC_STEPSIZE', None)
 
     expected_g = ogr.CreateGeometryFromWkt('LINESTRING (0 0,0.218168517531969 0.623489801858729,0.777479066043687 0.974927912181831,1.433883739117561 0.900968867902435,1.900968867902463 0.433883739117562,1.974927912181821 -0.222520933956316,1.623489801858719 -0.78183148246804,1 -1)')
-    if ogrtest.check_feature_geometry(g1, expected_g) != 0:
-        print(g1)
-        return 'fail'
+    assert ogrtest.check_feature_geometry(g1, expected_g) == 0
 
     in_wkt = 'CIRCULARSTRING (0 0,1 1,1 -1)'
     g1 = ogr.CreateGeometryFromWkt(in_wkt)
@@ -1610,44 +1323,33 @@ def test_ogr_geom_circularstring():
     gdal.SetConfigOption('OGR_STROKE_CURVE', 'FALSE')
     gdal.SetConfigOption('OGR_ARC_STEPSIZE', None)
 
-    if ogrtest.check_feature_geometry(g2, expected_g) != 0:
-        print(g2)
-        return 'fail'
+    assert ogrtest.check_feature_geometry(g2, expected_g) == 0
 
     # Test HasCurveGeometry
-    if not g1.HasCurveGeometry():
-        return 'fail'
-    if not g1.HasCurveGeometry(True):
-        return 'fail'
+    assert g1.HasCurveGeometry()
+    assert g1.HasCurveGeometry(True)
 
     # Test GetLinearGeometry
     g2 = g1.GetLinearGeometry(45)
-    if ogrtest.check_feature_geometry(g2, expected_g) != 0:
-        print(g2)
-        return 'fail'
+    assert ogrtest.check_feature_geometry(g2, expected_g) == 0
 
     # Test ForceToLineString
     gdal.SetConfigOption('OGR_ARC_STEPSIZE', '45')
     g2 = ogr.ForceToLineString(g1)
     gdal.SetConfigOption('OGR_ARC_STEPSIZE', None)
-    if ogrtest.check_feature_geometry(g2, expected_g) != 0:
-        print(g2)
-        return 'fail'
+    assert ogrtest.check_feature_geometry(g2, expected_g) == 0
 
     # Test ForceToMultiLineString
     gdal.SetConfigOption('OGR_ARC_STEPSIZE', '45')
     expected_g2 = ogr.CreateGeometryFromWkt('MULTILINESTRING ((0 0,0.218168517531969 0.623489801858729,0.777479066043687 0.974927912181831,1.433883739117561 0.900968867902435,1.900968867902463 0.433883739117562,1.974927912181821 -0.222520933956316,1.623489801858719 -0.78183148246804,1 -1))')
     g2 = ogr.ForceToMultiLineString(g1)
     gdal.SetConfigOption('OGR_ARC_STEPSIZE', None)
-    if ogrtest.check_feature_geometry(g2, expected_g2) != 0:
-        print(g2)
-        return 'fail'
+    assert ogrtest.check_feature_geometry(g2, expected_g2) == 0
 
     # Test GEOS operations
     if ogrtest.have_geos():
         g2 = g1.Intersection(g1)
-        if g2 is None:
-            return 'fail'
+        assert g2 is not None
 
     # Test CIRCULARSTRING wrapped in a GEOMETRYCOLLECTION
     in_wkt = 'GEOMETRYCOLLECTION(CIRCULARSTRING (0 0,1 1,1 -1))'
@@ -1656,24 +1358,19 @@ def test_ogr_geom_circularstring():
     # Test GEOS operations
     if ogrtest.have_geos():
         g2 = g1.Intersection(g1)
-        if g2 is None:
-            return 'fail'
+        assert g2 is not None
 
     # Test ForceToLineString
     gdal.SetConfigOption('OGR_ARC_STEPSIZE', '45')
     g2 = ogr.ForceToLineString(g1)
     gdal.SetConfigOption('OGR_ARC_STEPSIZE', None)
-    if ogrtest.check_feature_geometry(g2, expected_g) != 0:
-        print(g2)
-        return 'fail'
+    assert ogrtest.check_feature_geometry(g2, expected_g) == 0
 
     # Test ForceToMultiLineString
     gdal.SetConfigOption('OGR_ARC_STEPSIZE', '45')
     g2 = ogr.ForceToMultiLineString(g1)
     gdal.SetConfigOption('OGR_ARC_STEPSIZE', None)
-    if ogrtest.check_feature_geometry(g2, expected_g2) != 0:
-        print(g2)
-        return 'fail'
+    assert ogrtest.check_feature_geometry(g2, expected_g2) == 0
 
     # Test stroking of full circle with 3 points. ISO draft
     # mentions that this should define a full circle, but there's an
@@ -1684,44 +1381,32 @@ def test_ogr_geom_circularstring():
     g1 = ogr.CreateGeometryFromWkt(in_wkt)
     expected_g = ogr.CreateGeometryFromWkt('LINESTRING (0 0,0.116977778440514 -0.321393804843282,0.413175911166547 -0.49240387650611,0.75 -0.433012701892224,0.969846310392967 -0.171010071662835,0.969846310392967 0.171010071662835,0.75 0.433012701892224,0.413175911166547 0.49240387650611,0.116977778440514 0.321393804843282,0 0)')
     g2 = g1.GetLinearGeometry(45)
-    if ogrtest.check_feature_geometry(g2, expected_g) != 0:
-        print(g2)
-        return 'fail'
+    assert ogrtest.check_feature_geometry(g2, expected_g) == 0
 
     length = g1.Length()
     expected_length = 2 * math.pi * 0.5
-    if abs(length - expected_length) > 1e-8:
-        print(length)
-        return 'fail'
+    assert abs(length - expected_length) <= 1e-8
 
     # Test stroking of full circle (well defined)
     in_wkt = 'CIRCULARSTRING (0 0,0.5 0.5,1.0 0.0,0.5 -0.5,0.0 0.0)'
     g1 = ogr.CreateGeometryFromWkt(in_wkt)
     expected_g = ogr.CreateGeometryFromWkt('LINESTRING (0 0,0.049515566048791 0.216941869558781,0.188255099070638 0.390915741234018,0.388739533021848 0.48746395609092,0.611260466978166 0.48746395609092,0.811744900929369 0.390915741234018,0.950484433951232 0.216941869558781,1 0,0.950484433951232 -0.216941869558781,0.811744900929369 -0.390915741234018,0.611260466978166 -0.48746395609092,0.388739533021848 -0.48746395609092,0.188255099070638 -0.390915741234018,0.049515566048791 -0.216941869558781,0 0)')
     g2 = g1.GetLinearGeometry(45)
-    if ogrtest.check_feature_geometry(g2, expected_g) != 0:
-        print(g2)
-        return 'fail'
+    assert ogrtest.check_feature_geometry(g2, expected_g) == 0
 
     length = g1.Length()
     expected_length = 2 * math.pi * 0.5
-    if abs(length - expected_length) > 1e-8:
-        print(length)
-        return 'fail'
+    assert abs(length - expected_length) <= 1e-8
 
     # Check segmentize
     g1.Segmentize(0.5)
     expected_g = ogr.CreateGeometryFromWkt('CIRCULARSTRING (0 0,0.146446609406726 0.353553390593274,0.5 0.5,0.853553390593274 0.353553390593274,1 0,0.853553390593274 -0.353553390593274,0.5 -0.5,0.146446609406726 -0.353553390593274,0 0)')
-    if ogrtest.check_feature_geometry(g1, expected_g) != 0:
-        print(g1)
-        return 'fail'
+    assert ogrtest.check_feature_geometry(g1, expected_g) == 0
 
     # Sanity check: the length must remain the same
     length = g1.Length()
     expected_length = 2 * math.pi * 0.5
-    if abs(length - expected_length) > 1e-8:
-        print(length)
-        return 'fail'
+    assert abs(length - expected_length) <= 1e-8
 
     # Check segmentize symmetry : do exact binary comparison
     in_wkt = 'CIRCULARSTRING (0 0,1.2 1,2 0)'
@@ -1732,112 +1417,80 @@ def test_ogr_geom_circularstring():
     g2.Segmentize(0.25)
     for i in range(g1.GetPointCount()):
         if g1.GetPoint(i) != g2.GetPoint(g1.GetPointCount() - 1 - i):
-            print(i)
             print('%.18g' % (g1.GetPoint(i)[0] - g2.GetPoint(g1.GetPointCount() - 1 - i)[0]))
-            print('%.18g' % (g1.GetPoint(i)[1] - g2.GetPoint(g1.GetPointCount() - 1 - i)[1]))
-            print(g1)
-            print(g2)
-            return 'fail'
+            pytest.fail('%.18g' % (g1.GetPoint(i)[1] - g2.GetPoint(g1.GetPointCount() - 1 - i)[1]))
 
     # Test stroking of full circle with Z
     in_wkt = 'CIRCULARSTRING (0 0 1,1 0 2,0 0 1)'
     g1 = ogr.CreateGeometryFromWkt(in_wkt)
     expected_g = ogr.CreateGeometryFromWkt('LINESTRING (0 0 1,0.116977778440514 -0.321393804843282 1,0.413175911166547 -0.49240387650611 1,0.75 -0.433012701892224 1,0.969846310392967 -0.171010071662835 1,0.969846310392967 0.171010071662835 1,0.75 0.433012701892224 1,0.413175911166547 0.49240387650611 1,0.116977778440514 0.321393804843282 1,0 0 1)')
     g2 = g1.GetLinearGeometry(45)
-    if ogrtest.check_feature_geometry(g2, expected_g) != 0:
-        print(g2)
-        return 'fail'
+    assert ogrtest.check_feature_geometry(g2, expected_g) == 0
 
     # Check segmentize
     g1.Segmentize(0.5)
     expected_g = ogr.CreateGeometryFromWkt('CIRCULARSTRING Z (0 0 1,0.146446609406726 -0.353553390593274 1.25,0.5 -0.5 1.5,0.853553390593274 -0.353553390593274 1.75,1 0 2,0.853553390593274 0.353553390593274 1.75,0.5 0.5 1.5,0.146446609406727 0.353553390593274 1.25,0 0 1)')
-    if ogrtest.check_feature_geometry(g1, expected_g) != 0:
-        print(g1)
-        return 'fail'
+    assert ogrtest.check_feature_geometry(g1, expected_g) == 0
 
     # Same as above but reverse order
     in_wkt = 'CIRCULARSTRING (0 0,0.5 -0.5,1.0 0.0,0.5 0.5,0.0 0.0)'
     g1 = ogr.CreateGeometryFromWkt(in_wkt)
     expected_g = ogr.CreateGeometryFromWkt('LINESTRING (0 0,0.049515566048791 -0.216941869558781,0.188255099070638 -0.390915741234018,0.388739533021848 -0.48746395609092,0.611260466978166 -0.48746395609092,0.811744900929369 -0.390915741234018,0.950484433951232 -0.216941869558781,1 0,0.950484433951232 0.216941869558781,0.811744900929369 0.390915741234018,0.611260466978166 0.48746395609092,0.388739533021848 0.48746395609092,0.188255099070638 0.390915741234018,0.049515566048791 0.216941869558781,0 0)')
     g2 = g1.GetLinearGeometry(45)
-    if ogrtest.check_feature_geometry(g2, expected_g) != 0:
-        print(g2)
-        return 'fail'
+    assert ogrtest.check_feature_geometry(g2, expected_g) == 0
 
     length = g1.Length()
     expected_length = 2 * math.pi * 0.5
-    if abs(length - expected_length) > 1e-8:
-        print(length)
-        return 'fail'
+    assert abs(length - expected_length) <= 1e-8
 
     # Test stroking of a circular string with 3 colinear points
     in_wkt = 'CIRCULARSTRING (0 0,1 1,2 2)'
     g1 = ogr.CreateGeometryFromWkt(in_wkt)
     expected_g = ogr.CreateGeometryFromWkt('LINESTRING (0 0,1 1,2 2)')
     g2 = g1.GetLinearGeometry(45)
-    if ogrtest.check_feature_geometry(g2, expected_g) != 0:
-        print(g2)
-        return 'fail'
+    assert ogrtest.check_feature_geometry(g2, expected_g) == 0
 
     length = g1.Length()
     expected_length = 2 * math.sqrt(2)
-    if abs(length - expected_length) > 1e-8:
-        print(length)
-        return 'fail'
+    assert abs(length - expected_length) <= 1e-8
 
     # Test Value()
     p = g1.Value(length / 4.0)
     expected_p = ogr.CreateGeometryFromWkt('POINT (0.5 0.5)')
-    if ogrtest.check_feature_geometry(p, expected_p) != 0:
-        print(p)
-        return 'fail'
+    assert ogrtest.check_feature_geometry(p, expected_p) == 0
     p = g1.Value(3.0 * length / 4.0)
     expected_p = ogr.CreateGeometryFromWkt('POINT (1.5 1.5)')
-    if ogrtest.check_feature_geometry(p, expected_p) != 0:
-        print(p)
-        return 'fail'
+    assert ogrtest.check_feature_geometry(p, expected_p) == 0
 
     # Check segmentize
     g1.Segmentize(0.5)
     expected_g = ogr.CreateGeometryFromWkt('CIRCULARSTRING (0 0,0.166666666666667 0.166666666666667,0.333333333333333 0.333333333333333,0.5 0.5,0.666666666666667 0.666666666666667,0.833333333333333 0.833333333333333,1 1,1.166666666666667 1.166666666666667,1.333333333333333 1.333333333333333,1.5 1.5,1.666666666666667 1.666666666666667,1.833333333333333 1.833333333333333,2 2)')
-    if ogrtest.check_feature_geometry(g1, expected_g) != 0:
-        print(g1)
-        return 'fail'
+    assert ogrtest.check_feature_geometry(g1, expected_g) == 0
 
     # Sanity check: the length must remain the same
     length = g1.Length()
     expected_length = 2 * math.sqrt(2)
-    if abs(length - expected_length) > 1e-8:
-        print(length)
-        return 'fail'
+    assert abs(length - expected_length) <= 1e-8
 
     # Same with Z
     in_wkt = 'CIRCULARSTRING (0 0 1,1 1 2,2 2 1)'
     g1 = ogr.CreateGeometryFromWkt(in_wkt)
     expected_g = ogr.CreateGeometryFromWkt('LINESTRING (0 0 1,1 1 2,2 2 1)')
     g2 = g1.GetLinearGeometry(45)
-    if ogrtest.check_feature_geometry(g2, expected_g) != 0:
-        print(g2)
-        return 'fail'
+    assert ogrtest.check_feature_geometry(g2, expected_g) == 0
 
     # Check segmentize
     g1.Segmentize(0.5)
     expected_g = ogr.CreateGeometryFromWkt('CIRCULARSTRING Z (0 0 1,0.166666666666667 0.166666666666667 1.166666666666667,0.333333333333333 0.333333333333333 1.333333333333333,0.5 0.5 1.5,0.666666666666667 0.666666666666667 1.666666666666667,0.833333333333333 0.833333333333333 1.833333333333333,1 1 2,1.166666666666667 1.166666666666667 1.833333333333333,1.333333333333333 1.333333333333333 1.666666666666667,1.5 1.5 1.5,1.666666666666667 1.666666666666667 1.333333333333333,1.833333333333333 1.833333333333333 1.166666666666667,2 2 1)')
-    if ogrtest.check_feature_geometry(g1, expected_g) != 0:
-        print(g1)
-        return 'fail'
+    assert ogrtest.check_feature_geometry(g1, expected_g) == 0
 
     # Test Value()
     p = g1.Value(length / 4.0)
     expected_p = ogr.CreateGeometryFromWkt('POINT (0.5 0.5 1.5)')
-    if ogrtest.check_feature_geometry(p, expected_p) != 0:
-        print(p)
-        return 'fail'
+    assert ogrtest.check_feature_geometry(p, expected_p) == 0
     p = g1.Value(3.0 * length / 4.0)
     expected_p = ogr.CreateGeometryFromWkt('POINT (1.5 1.5 1.5)')
-    if ogrtest.check_feature_geometry(p, expected_p) != 0:
-        print(p)
-        return 'fail'
+    assert ogrtest.check_feature_geometry(p, expected_p) == 0
     in_wkt = 'CIRCULARSTRING (0 0,1 1,1 -1)'
 
     # Test GetEnvelope() in various cases
@@ -1857,9 +1510,7 @@ def test_ogr_geom_circularstring():
     env = g1.GetEnvelope()
     expected_env = (cx + r * math.cos(a0), cx + r * math.cos(a2), cy + r * math.sin(a2), cy + r * math.sin(a0))
     for i in range(4):
-        if abs(env[i] - expected_env[i]) > 1e-8:
-            print(env)
-            return 'fail'
+        assert abs(env[i] - expected_env[i]) <= 1e-8
 
     # From quadrant 0 to quadrant -1
     a0 = math.pi / 3
@@ -1873,9 +1524,7 @@ def test_ogr_geom_circularstring():
     env = g1.GetEnvelope()
     expected_env = (cx + r * math.cos(a0), cx + r, cy + r * math.sin(a2), cy + r * math.sin(a0))
     for i in range(4):
-        if abs(env[i] - expected_env[i]) > 1e-8:
-            print(env)
-            return 'fail'
+        assert abs(env[i] - expected_env[i]) <= 1e-8
 
     # From quadrant 0 to quadrant 3
     a0 = math.pi / 3
@@ -1889,9 +1538,7 @@ def test_ogr_geom_circularstring():
     env = g1.GetEnvelope()
     expected_env = (cx - r, cx + r * math.cos(a2), cy - r, cy + r)
     for i in range(4):
-        if abs(env[i] - expected_env[i]) > 1e-8:
-            print(env)
-            return 'fail'
+        assert abs(env[i] - expected_env[i]) <= 1e-8
 
     # From quadrant 0 to quadrant 4
     a0 = math.pi / 3
@@ -1905,9 +1552,7 @@ def test_ogr_geom_circularstring():
     env = g1.GetEnvelope()
     expected_env = (cx - r, cx + r, cy - r, cy + r)
     for i in range(4):
-        if abs(env[i] - expected_env[i]) > 1e-8:
-            print(env)
-            return 'fail'
+        assert abs(env[i] - expected_env[i]) <= 1e-8
 
     # Full circle
     a0 = math.pi / 3
@@ -1921,36 +1566,25 @@ def test_ogr_geom_circularstring():
     env = g1.GetEnvelope()
     expected_env = (cx - r, cx + r, cy - r, cy + r)
     for i in range(4):
-        if abs(env[i] - expected_env[i]) > 1e-8:
-            print(env)
-            return 'fail'
+        assert abs(env[i] - expected_env[i]) <= 1e-8
 
     # Error case : not enough points
     in_wkt = 'CIRCULARSTRING (0 0)'
     gdal.PushErrorHandler('CPLQuietErrorHandler')
     g = ogr.CreateGeometryFromWkt(in_wkt)
     gdal.PopErrorHandler()
-    if g is not None:
-        return 'fail'
+    assert g is None
 
     # EMPTY
     for in_wkt in ['CIRCULARSTRING EMPTY', 'CIRCULARSTRING Z EMPTY']:
         g1 = ogr.CreateGeometryFromWkt(in_wkt)
         out_wkt = g1.ExportToWkt()
-        if in_wkt != out_wkt:
-            print(in_wkt)
-            print(out_wkt)
-            return 'fail'
-        if g1.Length() != 0.0:
-            print(in_wkt)
-            return 'fail'
+        assert in_wkt == out_wkt
+        assert g1.Length() == 0.0, in_wkt
 
         g2 = ogr.CreateGeometryFromWkb(g1.ExportToWkb())
         out_wkt = g2.ExportToWkt()
-        if in_wkt != out_wkt:
-            print(in_wkt)
-            print(out_wkt)
-            return 'fail'
+        assert in_wkt == out_wkt
 
     return 'success'
 
@@ -1962,152 +1596,105 @@ def test_ogr_geom_compoundcurve():
 
     in_wkt = 'COMPOUNDCURVE (CIRCULARSTRING (0 0,1 1,1 -1))'
     g1 = ogr.CreateGeometryFromWkt(in_wkt)
-    if g1.GetGeometryType() != ogr.wkbCompoundCurve:
-        return 'fail'
+    assert g1.GetGeometryType() == ogr.wkbCompoundCurve
     out_wkt = g1.ExportToWkt()
-    if in_wkt != out_wkt:
-        print(out_wkt)
-        return 'fail'
+    assert in_wkt == out_wkt
 
-    if g1.GetGeometryCount() != 1:
-        return 'fail'
-    if g1.GetGeometryRef(0).ExportToWkt() != 'CIRCULARSTRING (0 0,1 1,1 -1)':
-        return 'fail'
+    assert g1.GetGeometryCount() == 1
+    assert g1.GetGeometryRef(0).ExportToWkt() == 'CIRCULARSTRING (0 0,1 1,1 -1)'
 
     env = g1.GetEnvelope()
     expected_env = (0.0, 2.0, -1.0, 1.0)
     for i in range(4):
-        if abs(env[i] - expected_env[i]) > 1e-8:
-            print(env)
-            return 'fail'
+        assert abs(env[i] - expected_env[i]) <= 1e-8
 
     length = g1.Length()
     expected_length = 1.5 * math.pi
-    if abs(length - expected_length) > 1e-8:
-        print(length)
-        return 'fail'
+    assert abs(length - expected_length) <= 1e-8
 
     g2 = ogr.CreateGeometryFromWkb(g1.ExportToWkb())
     out_wkt = g2.ExportToWkt()
-    if in_wkt != out_wkt:
-        print(out_wkt)
-        return 'fail'
+    assert in_wkt == out_wkt
 
     g1 = ogr.CreateGeometryFromWkt(in_wkt)
-    if not g1.HasCurveGeometry():
-        return 'fail'
-    if not g1.HasCurveGeometry(True):
-        return 'fail'
+    assert g1.HasCurveGeometry()
+    assert g1.HasCurveGeometry(True)
 
     # CreateGeometryFromWkt of LINESTRING
     in_wkt = 'COMPOUNDCURVE ((0 0,0 10))'
     g1 = ogr.CreateGeometryFromWkt(in_wkt)
-    if not g1.HasCurveGeometry():
-        return 'fail'
-    if g1.HasCurveGeometry(True):
-        return 'fail'
+    assert g1.HasCurveGeometry()
+    assert not g1.HasCurveGeometry(True)
 
     # With Z
     in_wkt = 'COMPOUNDCURVE Z (CIRCULARSTRING Z (0 0 10,1 1 20,2 0 30),(2 0 30,0 0 10))'
     g1 = ogr.CreateGeometryFromWkt(in_wkt)
-    if g1.GetGeometryType() != ogr.wkbCompoundCurveZ:
-        return 'fail'
+    assert g1.GetGeometryType() == ogr.wkbCompoundCurveZ
     out_wkt = g1.ExportToWkt()
-    if in_wkt != out_wkt:
-        print(out_wkt)
-        return 'fail'
+    assert in_wkt == out_wkt
 
     env = g1.GetEnvelope()
     expected_env = (0.0, 2.0, 0.0, 1.0)
     for i in range(4):
-        if abs(env[i] - expected_env[i]) > 1e-8:
-            print(env)
-            return 'fail'
+        assert abs(env[i] - expected_env[i]) <= 1e-8
 
     env = g1.GetEnvelope3D()
     expected_env = (0.0, 2.0, 0.0, 1.0, 10, 30)
     for i in range(6):
-        if abs(env[i] - expected_env[i]) > 1e-8:
-            print(env)
-            return 'fail'
+        assert abs(env[i] - expected_env[i]) <= 1e-8
 
     # Test Value()
     p = g1.Value(-1e-3)
     expected_p = ogr.CreateGeometryFromWkt('POINT (0 0 10)')
-    if ogrtest.check_feature_geometry(p, expected_p) != 0:
-        print(p)
-        return 'fail'
+    assert ogrtest.check_feature_geometry(p, expected_p) == 0
 
     p = g1.Value(math.pi / 2.0)
     expected_p = ogr.CreateGeometryFromWkt('POINT (1 1 20)')
-    if ogrtest.check_feature_geometry(p, expected_p) != 0:
-        print(p)
-        return 'fail'
+    assert ogrtest.check_feature_geometry(p, expected_p) == 0
 
     p = g1.Value(math.pi)
     expected_p = ogr.CreateGeometryFromWkt('POINT (2 0 30)')
-    if ogrtest.check_feature_geometry(p, expected_p) != 0:
-        print(p)
-        return 'fail'
+    assert ogrtest.check_feature_geometry(p, expected_p) == 0
 
     p = g1.Value(math.pi + 1)
     expected_p = ogr.CreateGeometryFromWkt('POINT (1 0 20)')
-    if ogrtest.check_feature_geometry(p, expected_p) != 0:
-        print(p)
-        return 'fail'
+    assert ogrtest.check_feature_geometry(p, expected_p) == 0
 
     p = g1.Value(math.pi + 2 + 1e-3)
     expected_p = ogr.CreateGeometryFromWkt('POINT (0 0 10)')
-    if ogrtest.check_feature_geometry(p, expected_p) != 0:
-        print(p)
-        return 'fail'
+    assert ogrtest.check_feature_geometry(p, expected_p) == 0
 
     wkb = g1.ExportToWkb()
     isowkb = g1.ExportToIsoWkb()
-    if wkb != isowkb:
-        return 'fail'
+    assert wkb == isowkb
     g2 = ogr.CreateGeometryFromWkb(wkb)
     out_wkt = g2.ExportToWkt()
-    if in_wkt != out_wkt:
-        print(out_wkt)
-        return 'fail'
+    assert in_wkt == out_wkt
 
     # Several parts
     in_wkt = 'COMPOUNDCURVE (CIRCULARSTRING (0 0,1 1,1 -1),(1 -1,0 0))'
     g1 = ogr.CreateGeometryFromWkt(in_wkt)
-    if g1.GetGeometryType() != ogr.wkbCompoundCurve:
-        return 'fail'
+    assert g1.GetGeometryType() == ogr.wkbCompoundCurve
     out_wkt = g1.ExportToWkt()
-    if in_wkt != out_wkt:
-        print(out_wkt)
-        return 'fail'
+    assert in_wkt == out_wkt
 
-    if not g1.Equals(g1):
-        return 'fail'
+    assert g1.Equals(g1)
 
-    if not g1.Equals(g1.Clone()):
-        return 'fail'
+    assert g1.Equals(g1.Clone())
 
-    if g1.Equals(ogr.CreateGeometryFromWkt('POINT(0 0)')):
-        return 'fail'
+    assert not g1.Equals(ogr.CreateGeometryFromWkt('POINT(0 0)'))
 
-    if g1.Equals(ogr.CreateGeometryFromWkt('COMPOUNDCURVE (CIRCULARSTRING (0 0,1 1,1 -1))')):
-        return 'fail'
+    assert not g1.Equals(ogr.CreateGeometryFromWkt('COMPOUNDCURVE (CIRCULARSTRING (0 0,1 1,1 -1))'))
 
-    if g1.Equals(ogr.CreateGeometryFromWkt('COMPOUNDCURVE (CIRCULARSTRING (0 0,1 1,1 -1),(1 -1,0 1))')):
-        return 'fail'
+    assert not g1.Equals(ogr.CreateGeometryFromWkt('COMPOUNDCURVE (CIRCULARSTRING (0 0,1 1,1 -1),(1 -1,0 1))'))
 
     length = g1.Length()
     expected_length = 1.5 * math.pi + math.sqrt(2)
-    if abs(length - expected_length) > 1e-8:
-        print(length)
-        return 'fail'
+    assert abs(length - expected_length) <= 1e-8
 
     g2 = ogr.CreateGeometryFromWkb(g1.ExportToWkb())
     out_wkt = g2.ExportToWkt()
-    if in_wkt != out_wkt:
-        print(out_wkt)
-        return 'fail'
+    assert in_wkt == out_wkt
 
     # Test stroking
     gdal.SetConfigOption('OGR_STROKE_CURVE', 'TRUE')
@@ -2118,9 +1705,7 @@ def test_ogr_geom_compoundcurve():
     gdal.SetConfigOption('OGR_ARC_STEPSIZE', None)
 
     expected_g = ogr.CreateGeometryFromWkt('LINESTRING (0 0,0.218168517531969 0.623489801858729,0.777479066043687 0.974927912181831,1.433883739117561 0.900968867902435,1.900968867902463 0.433883739117562,1.974927912181821 -0.222520933956316,1.623489801858719 -0.78183148246804,1 -1)')
-    if ogrtest.check_feature_geometry(g1, expected_g) != 0:
-        print(g1)
-        return 'fail'
+    assert ogrtest.check_feature_geometry(g1, expected_g) == 0
 
     in_wkt = 'COMPOUNDCURVE (CIRCULARSTRING (0 0,1 1,1 -1))'
     g1 = ogr.CreateGeometryFromWkt(in_wkt)
@@ -2133,117 +1718,93 @@ def test_ogr_geom_compoundcurve():
     gdal.SetConfigOption('OGR_ARC_STEPSIZE', None)
 
     expected_g = ogr.CreateGeometryFromWkt('LINESTRING (0 0,0.218168517531969 0.623489801858729,0.777479066043687 0.974927912181831,1.433883739117561 0.900968867902435,1.900968867902463 0.433883739117562,1.974927912181821 -0.222520933956316,1.623489801858719 -0.78183148246804,1 -1)')
-    if ogrtest.check_feature_geometry(g2, expected_g) != 0:
-        print(g2)
-        return 'fail'
+    assert ogrtest.check_feature_geometry(g2, expected_g) == 0
 
     g2 = g1.GetLinearGeometry(45)
-    if ogrtest.check_feature_geometry(g2, expected_g) != 0:
-        print(g2)
-        return 'fail'
+    assert ogrtest.check_feature_geometry(g2, expected_g) == 0
 
-    if not g1.HasCurveGeometry():
-        return 'fail'
+    assert g1.HasCurveGeometry()
 
-    if not g1.HasCurveGeometry(True):
-        return 'fail'
+    assert g1.HasCurveGeometry(True)
 
     g2 = g1.GetLinearGeometry(45)
-    if ogrtest.check_feature_geometry(g2, expected_g) != 0:
-        print(g2)
-        return 'fail'
+    assert ogrtest.check_feature_geometry(g2, expected_g) == 0
 
     gdal.SetConfigOption('OGR_ARC_STEPSIZE', '45')
     g2 = ogr.ForceToLineString(g1)
     gdal.SetConfigOption('OGR_ARC_STEPSIZE', None)
-    if ogrtest.check_feature_geometry(g2, expected_g) != 0:
-        print(g2)
-        return 'fail'
+    assert ogrtest.check_feature_geometry(g2, expected_g) == 0
 
     gdal.SetConfigOption('OGR_ARC_STEPSIZE', '45')
     expected_g = ogr.CreateGeometryFromWkt('MULTILINESTRING ((0 0,0.218168517531969 0.623489801858729,0.777479066043687 0.974927912181831,1.433883739117561 0.900968867902435,1.900968867902463 0.433883739117562,1.974927912181821 -0.222520933956316,1.623489801858719 -0.78183148246804,1 -1))')
     g2 = ogr.ForceToMultiLineString(g1)
     gdal.SetConfigOption('OGR_ARC_STEPSIZE', None)
-    if ogrtest.check_feature_geometry(g2, expected_g) != 0:
-        print(g2)
-        return 'fail'
+    assert ogrtest.check_feature_geometry(g2, expected_g) == 0
 
     # Check segmentize
     g1.Segmentize(0.5)
     expected_g = ogr.CreateGeometryFromWkt('COMPOUNDCURVE (CIRCULARSTRING (0 0,0.076120467488713 0.38268343236509,0.292893218813453 0.707106781186548,0.61731656763491 0.923879532511287,1 1,1.38268343236509 0.923879532511287,1.707106781186547 0.707106781186547,1.923879532511287 0.38268343236509,2 0,1.923879532511287 -0.38268343236509,1.707106781186547 -0.707106781186547,1.38268343236509 -0.923879532511287,1 -1))')
-    if ogrtest.check_feature_geometry(g1, expected_g) != 0:
-        print(g1)
-        return 'fail'
+    assert ogrtest.check_feature_geometry(g1, expected_g) == 0
 
     # Error case : not enough points
     in_wkt = 'COMPOUNDCURVE ((0 0))'
     gdal.PushErrorHandler('CPLQuietErrorHandler')
     g = ogr.CreateGeometryFromWkt(in_wkt)
     gdal.PopErrorHandler()
-    if g is not None:
-        return 'fail'
+    assert g is None
 
     # Error case : invalid curve
     in_wkt = 'COMPOUNDCURVE (COMPOUNDCURVE EMPTY)'
     gdal.PushErrorHandler('CPLQuietErrorHandler')
     g = ogr.CreateGeometryFromWkt(in_wkt)
     gdal.PopErrorHandler()
-    if g is not None:
-        return 'fail'
+    assert g is None
 
     # Error case : non contiguous curves
     in_wkt = 'COMPOUNDCURVE ((0 0,1 1),(2 2,3 3))'
     gdal.PushErrorHandler('CPLQuietErrorHandler')
     g = ogr.CreateGeometryFromWkt(in_wkt)
     gdal.PopErrorHandler()
-    if g is not None:
-        return 'fail'
+    assert g is None
 
     # Error case : non contiguous curves
     in_wkt = 'COMPOUNDCURVE (EMPTY,(2 2,3 3))'
     gdal.PushErrorHandler('CPLQuietErrorHandler')
     g = ogr.CreateGeometryFromWkt(in_wkt)
     gdal.PopErrorHandler()
-    if g is not None:
-        return 'fail'
+    assert g is None
 
     # Error case : non contiguous curves
     in_wkt = 'COMPOUNDCURVE ((2 2,3 3), EMPTY)'
     gdal.PushErrorHandler('CPLQuietErrorHandler')
     g = ogr.CreateGeometryFromWkt(in_wkt)
     gdal.PopErrorHandler()
-    if g is not None:
-        return 'fail'
+    assert g is None
 
     g = ogr.Geometry(ogr.wkbCompoundCurve)
     g.AddGeometry(ogr.CreateGeometryFromWkt('LINESTRING(0 0,1 1)'))
-    if g.ExportToWkt() != 'COMPOUNDCURVE ((0 0,1 1))':
-        return 'fail'
+    assert g.ExportToWkt() == 'COMPOUNDCURVE ((0 0,1 1))'
 
     gdal.PushErrorHandler('CPLQuietErrorHandler')
     g.AddGeometry(ogr.CreateGeometryFromWkt('LINESTRING(0 0,1 1)'))
     gdal.PopErrorHandler()
-    if g.ExportToWkt() != 'COMPOUNDCURVE ((0 0,1 1),(1 1,0 0))':
-        return 'fail'
+    assert g.ExportToWkt() == 'COMPOUNDCURVE ((0 0,1 1),(1 1,0 0))'
 
     g = ogr.Geometry(ogr.wkbCompoundCurve)
     g.AddGeometryDirectly(ogr.CreateGeometryFromWkt('LINESTRING(0 0,1 1)'))
-    if g.ExportToWkt() != 'COMPOUNDCURVE ((0 0,1 1))':
-        return 'fail'
+    assert g.ExportToWkt() == 'COMPOUNDCURVE ((0 0,1 1))'
 
     gdal.PushErrorHandler('CPLQuietErrorHandler')
     g.AddGeometryDirectly(ogr.CreateGeometryFromWkt('LINESTRING(0 0,1 1)'))
     gdal.PopErrorHandler()
-    if g.ExportToWkt() != 'COMPOUNDCURVE ((0 0,1 1),(1 1,0 0))':
-        return 'fail'
+    assert g.ExportToWkt() == 'COMPOUNDCURVE ((0 0,1 1),(1 1,0 0))'
 
     # Cannot add compoundcurve in compoundcurve
     g = ogr.Geometry(ogr.wkbCompoundCurve)
     gdal.PushErrorHandler('CPLQuietErrorHandler')
     g.AddGeometryDirectly(ogr.CreateGeometryFromWkt('COMPOUNDCURVE((1 1,2 2))'))
     gdal.PopErrorHandler()
-    if g.ExportToWkt() != 'COMPOUNDCURVE EMPTY':
-        return 'fail'
+    assert g.ExportToWkt() == 'COMPOUNDCURVE EMPTY'
 
     # Check that discretization is not sensitive to winding order
     g1 = ogr.CreateGeometryFromWkt('COMPOUNDCURVE((-1 0,0 1),CIRCULARSTRING (0 1,0.25 0,0.1 -0.5),(0.1 -0.5,-1 0))')
@@ -2256,12 +1817,8 @@ def test_ogr_geom_compoundcurve():
         # The curves must be exactly the same, despite our stealth mode
         if g2.GetX(i) != g3.GetX(p_count - 1 - i) or \
            g2.GetY(i) != g3.GetY(p_count - 1 - i):
-            print(g2)
-            print(g3)
-            print(i)
             print(abs(g2.GetX(i) - g3.GetX(p_count - 1 - i)))
-            print(abs(g2.GetY(i) - g3.GetY(p_count - 1 - i)))
-            return 'fail'
+            pytest.fail(abs(g2.GetY(i) - g3.GetY(p_count - 1 - i)))
 
     # Test Transform
     sr = osr.SpatialReference()
@@ -2282,28 +1839,18 @@ def test_ogr_geom_compoundcurve():
         gdal.PushErrorHandler('CPLQuietErrorHandler')
         g = ogr.CreateGeometryFromWkb(wkb)
         gdal.PopErrorHandler()
-        if g is not None:
-            print(wkb)
-            return 'fail'
+        assert g is None, wkb
 
     # EMPTY
     for in_wkt in ['COMPOUNDCURVE EMPTY', 'COMPOUNDCURVE Z EMPTY']:
         g1 = ogr.CreateGeometryFromWkt(in_wkt)
         out_wkt = g1.ExportToWkt()
-        if in_wkt != out_wkt:
-            print(in_wkt)
-            print(out_wkt)
-            return 'fail'
-        if g1.Length() != 0.0:
-            print(in_wkt)
-            return 'fail'
+        assert in_wkt == out_wkt
+        assert g1.Length() == 0.0, in_wkt
 
         g2 = ogr.CreateGeometryFromWkb(g1.ExportToWkb())
         out_wkt = g2.ExportToWkt()
-        if in_wkt != out_wkt:
-            print(in_wkt)
-            print(out_wkt)
-            return 'fail'
+        assert in_wkt == out_wkt
 
     return 'success'
 
@@ -2315,66 +1862,46 @@ def test_ogr_geom_curvepolygon():
 
     in_wkt = 'CURVEPOLYGON (CIRCULARSTRING (0 0,1 0,0 0))'
     g1 = ogr.CreateGeometryFromWkt(in_wkt)
-    if g1.GetGeometryType() != ogr.wkbCurvePolygon:
-        return 'fail'
+    assert g1.GetGeometryType() == ogr.wkbCurvePolygon
     out_wkt = g1.ExportToWkt()
-    if in_wkt != out_wkt:
-        print(out_wkt)
-        return 'fail'
+    assert in_wkt == out_wkt
 
     if ogrtest.have_geos():
         p1 = g1.PointOnSurface()
-        if (p1.GetX() - 0.5) * (p1.GetX() - 0.5) + p1.GetY() * p1.GetY() > 0.5 * 0.5:
-            print(p1)
-            return 'fail'
+        assert (p1.GetX() - 0.5) * (p1.GetX() - 0.5) + p1.GetY() * p1.GetY() <= 0.5 * 0.5
 
     env = g1.GetEnvelope()
     expected_env = (0.0, 1.0, -0.5, 0.5)
     for i in range(4):
-        if abs(env[i] - expected_env[i]) > 1e-8:
-            print(env)
-            return 'fail'
+        assert abs(env[i] - expected_env[i]) <= 1e-8
 
     area = g1.Area()
     expected_area = math.pi * 0.5 * 0.5
-    if abs(area - expected_area) > 1e-8:
-        print(area)
-        print(expected_area)
-        return 'fail'
+    assert abs(area - expected_area) <= 1e-8
 
     g2 = ogr.CreateGeometryFromWkb(g1.ExportToWkb())
     out_wkt = g2.ExportToWkt()
-    if in_wkt != out_wkt:
-        print(out_wkt)
-        return 'fail'
+    assert in_wkt == out_wkt
 
     # CURVEPOLYGON of LINESTRING
     in_wkt = 'CURVEPOLYGON ((0 0,0 10,10 10,10 0,0 0))'
     g1 = ogr.CreateGeometryFromWkt(in_wkt)
-    if not g1.HasCurveGeometry():
-        return 'fail'
-    if g1.HasCurveGeometry(True):
-        return 'fail'
+    assert g1.HasCurveGeometry()
+    assert not g1.HasCurveGeometry(True)
 
     # With Z
     in_wkt = 'CURVEPOLYGON Z (CIRCULARSTRING Z (0 0 10,1 0 10,0 0 10))'
     g1 = ogr.CreateGeometryFromWkt(in_wkt)
-    if g1.GetGeometryType() != ogr.wkbCurvePolygonZ:
-        return 'fail'
+    assert g1.GetGeometryType() == ogr.wkbCurvePolygonZ
     out_wkt = g1.ExportToWkt()
-    if in_wkt != out_wkt:
-        print(out_wkt)
-        return 'fail'
+    assert in_wkt == out_wkt
 
     wkb = g1.ExportToWkb()
     isowkb = g1.ExportToIsoWkb()
-    if wkb != isowkb:
-        return 'fail'
+    assert wkb == isowkb
     g2 = ogr.CreateGeometryFromWkb(wkb)
     out_wkt = g2.ExportToWkt()
-    if in_wkt != out_wkt:
-        print(out_wkt)
-        return 'fail'
+    assert in_wkt == out_wkt
 
     # Test stroking
     gdal.SetConfigOption('OGR_STROKE_CURVE', 'TRUE')
@@ -2385,9 +1912,7 @@ def test_ogr_geom_curvepolygon():
     gdal.SetConfigOption('OGR_ARC_STEPSIZE', None)
 
     expected_g = ogr.CreateGeometryFromWkt('POLYGON ((0 0,0.116977778440514 -0.321393804843282,0.413175911166547 -0.49240387650611,0.75 -0.433012701892224,0.969846310392967 -0.171010071662835,0.969846310392967 0.171010071662835,0.75 0.433012701892224,0.413175911166547 0.49240387650611,0.116977778440514 0.321393804843282,0 0))')
-    if ogrtest.check_feature_geometry(g1, expected_g) != 0:
-        print(g1)
-        return 'fail'
+    assert ogrtest.check_feature_geometry(g1, expected_g) == 0
 
     in_wkt = 'CURVEPOLYGON (CIRCULARSTRING (0 0,1 0,0 0))'
     g1 = ogr.CreateGeometryFromWkt(in_wkt)
@@ -2399,146 +1924,113 @@ def test_ogr_geom_curvepolygon():
     gdal.SetConfigOption('OGR_STROKE_CURVE', 'FALSE')
     gdal.SetConfigOption('OGR_ARC_STEPSIZE', None)
 
-    if ogrtest.check_feature_geometry(g2, expected_g) != 0:
-        print(g2)
-        return 'fail'
+    assert ogrtest.check_feature_geometry(g2, expected_g) == 0
 
     # Test HasCurveGeometry
-    if not g1.HasCurveGeometry():
-        return 'fail'
-    if not g1.HasCurveGeometry(True):
-        return 'fail'
+    assert g1.HasCurveGeometry()
+    assert g1.HasCurveGeometry(True)
 
     # Test GetLinearGeometry
     g2 = g1.GetLinearGeometry(45)
-    if ogrtest.check_feature_geometry(g2, expected_g) != 0:
-        print(g2)
-        return 'fail'
+    assert ogrtest.check_feature_geometry(g2, expected_g) == 0
 
     # Test ForceToPolygon
     gdal.SetConfigOption('OGR_ARC_STEPSIZE', '45')
     g2 = ogr.ForceToPolygon(g1)
     gdal.SetConfigOption('OGR_ARC_STEPSIZE', None)
-    if ogrtest.check_feature_geometry(g2, expected_g) != 0:
-        print(g2)
-        return 'fail'
+    assert ogrtest.check_feature_geometry(g2, expected_g) == 0
 
     # Test ForceToMultiPolygon
     gdal.SetConfigOption('OGR_ARC_STEPSIZE', '45')
     expected_g2 = ogr.CreateGeometryFromWkt('MULTIPOLYGON (((0 0,0.116977778440514 -0.321393804843282,0.413175911166547 -0.49240387650611,0.75 -0.433012701892224,0.969846310392967 -0.171010071662835,0.969846310392967 0.171010071662835,0.75 0.433012701892224,0.413175911166547 0.49240387650611,0.116977778440514 0.321393804843282,0 0)))')
     g2 = ogr.ForceToMultiPolygon(g1)
     gdal.SetConfigOption('OGR_ARC_STEPSIZE', None)
-    if ogrtest.check_feature_geometry(g2, expected_g2) != 0:
-        print(g2)
-        return 'fail'
+    assert ogrtest.check_feature_geometry(g2, expected_g2) == 0
 
     # Test ForceToMultiLineString
     gdal.SetConfigOption('OGR_ARC_STEPSIZE', '45')
     g2 = ogr.ForceToMultiLineString(g1)
     gdal.SetConfigOption('OGR_ARC_STEPSIZE', None)
     expected_g3 = ogr.CreateGeometryFromWkt('MULTILINESTRING ((0 0,0.116977778440514 -0.321393804843282,0.413175911166547 -0.49240387650611,0.75 -0.433012701892224,0.969846310392967 -0.171010071662835,0.969846310392967 0.171010071662835,0.75 0.433012701892224,0.413175911166547 0.49240387650611,0.116977778440514 0.321393804843282,0 0))')
-    if ogrtest.check_feature_geometry(g2, expected_g3) != 0:
-        print(g2)
-        return 'fail'
+    assert ogrtest.check_feature_geometry(g2, expected_g3) == 0
 
     # Test GEOS operations
     if ogrtest.have_geos():
         g2 = g1.Intersection(g1)
-        if g2 is None:
-            return 'fail'
+        assert g2 is not None
 
     # Test CURVEPOLYGON and COMPOUNDCURVE, CIRCULARSTRING, LINESTRING
     in_wkt = 'CURVEPOLYGON (COMPOUNDCURVE (CIRCULARSTRING (0 0,1 1,2 0),(2 0,0 0)),(0.1 0.1,0.1 0.2,0.2 0.2,0.2 0.1,0.1 0.1),CIRCULARSTRING (0.25 0.25,0.75 0.25,0.25 0.25))'
     g1 = ogr.CreateGeometryFromWkt(in_wkt)
     g2 = ogr.CreateGeometryFromWkb(g1.ExportToWkb())
-    if g2.ExportToWkt() != in_wkt:
-        print(g2)
-        return 'fail'
+    assert g2.ExportToWkt() == in_wkt
 
     # Test CURVEPOLYGON wrapped in a GEOMETRYCOLLECTION
     in_wkt = 'GEOMETRYCOLLECTION(CURVEPOLYGON(CIRCULARSTRING (0 0,1 0,0 0)))'
     g1 = ogr.CreateGeometryFromWkt(in_wkt)
     g2 = ogr.CreateGeometryFromWkb(g1.ExportToWkb())
-    if not g1.Equals(g2):
-        print(g2)
-        return 'fail'
+    assert g1.Equals(g2)
 
     # Test GEOS operations
     if ogrtest.have_geos():
         g2 = g1.Intersection(g1)
-        if g2 is None:
-            return 'fail'
+        assert g2 is not None
 
     # Test ForceToPolygon
     gdal.SetConfigOption('OGR_ARC_STEPSIZE', '45')
     g2 = ogr.ForceToPolygon(g1)
     gdal.SetConfigOption('OGR_ARC_STEPSIZE', None)
-    if ogrtest.check_feature_geometry(g2, expected_g) != 0:
-        print(g2)
-        return 'fail'
+    assert ogrtest.check_feature_geometry(g2, expected_g) == 0
 
     # Test ForceToMultiPolygon
     gdal.SetConfigOption('OGR_ARC_STEPSIZE', '45')
     g2 = ogr.ForceToMultiPolygon(g1)
     gdal.SetConfigOption('OGR_ARC_STEPSIZE', None)
-    if ogrtest.check_feature_geometry(g2, expected_g2) != 0:
-        print(g2)
-        return 'fail'
+    assert ogrtest.check_feature_geometry(g2, expected_g2) == 0
 
     # Error case : not enough points
     in_wkt = 'CURVEPOLYGON ((0 0,0 1,0 0))'
     gdal.PushErrorHandler('CPLQuietErrorHandler')
     g = ogr.CreateGeometryFromWkt(in_wkt)
     gdal.PopErrorHandler()
-    if g is not None:
-        return 'fail'
+    assert g is None
 
     # Error case : wrong sub-geometry type
     in_wkt = 'CURVEPOLYGON (POINT EMPTY)'
     gdal.PushErrorHandler('CPLQuietErrorHandler')
     g = ogr.CreateGeometryFromWkt(in_wkt)
     gdal.PopErrorHandler()
-    if g is not None:
-        return 'fail'
+    assert g is None
 
     # Error case: non closed ring
     in_wkt = 'CURVEPOLYGON ((0 0,0 1,1 1,1 0))'
     gdal.PushErrorHandler('CPLQuietErrorHandler')
     g = ogr.CreateGeometryFromWkt(in_wkt)
     gdal.PopErrorHandler()
-    if g is not None:
-        return 'fail'
+    assert g is None
 
     # Area
     g = ogr.CreateGeometryFromWkt('CURVEPOLYGON ((0 0,1 1,1 0,0 0))')
-    if g.Area() != 0.5:
-        return 'fail'
+    assert g.Area() == 0.5
 
     g = ogr.CreateGeometryFromWkt('CURVEPOLYGON (COMPOUNDCURVE((0 0,1 1,1 0,0 0)))')
-    if g.Area() != 0.5:
-        return 'fail'
+    assert g.Area() == 0.5
 
     g = ogr.CreateGeometryFromWkt('CURVEPOLYGON (COMPOUNDCURVE((0 0,1 1),(1 1,1 0,0 0)))')
-    if g.Area() != 0.5:
-        return 'fail'
+    assert g.Area() == 0.5
 
     g = ogr.CreateGeometryFromWkt('CURVEPOLYGON ((100000000 100000000,100000001 100000001,100000001 100000000,100000000 100000000))')
-    if g.Area() != 0.5:
-        return 'fail'
+    assert g.Area() == 0.5
 
     # Equals
     g1 = ogr.CreateGeometryFromWkt('CURVEPOLYGON ((0 0,1 1,1 0,0 0),CIRCULARSTRING(0.75 0.5,0.85 0.5,0.75 0.5))')
-    if not g1.Equals(g1):
-        return 'fail'
+    assert g1.Equals(g1)
 
-    if not g1.Equals(g1.Clone()):
-        return 'fail'
+    assert g1.Equals(g1.Clone())
 
-    if g1.Equals(ogr.CreateGeometryFromWkt('POINT(0 0)')):
-        return 'fail'
+    assert not g1.Equals(ogr.CreateGeometryFromWkt('POINT(0 0)'))
 
-    if g1.Equals(ogr.CreateGeometryFromWkt('CURVEPOLYGON ((0 0,1 1,1 0,0 0))')):
-        return 'fail'
+    assert not g1.Equals(ogr.CreateGeometryFromWkt('CURVEPOLYGON ((0 0,1 1,1 0,0 0))'))
 
     # Intersects optimizations on a circle
     g1 = ogr.CreateGeometryFromWkt('CURVEPOLYGON (CIRCULARSTRING (0 0,2 0,0 0))')
@@ -2551,97 +2043,68 @@ def test_ogr_geom_curvepolygon():
     res = res & g1.Contains(p1)
     res = res & p1.Within(g1)
     gdal.SetConfigOption('OGR_ARC_STEPSIZE', None)
-    if not res:
-        return 'fail'
+    assert res
 
     # Test point slightly outside circle
     p2 = ogr.CreateGeometryFromWkt('POINT (%.16g %.16g)' % (1 + math.cos(math.pi / 6) + 1e-4, math.sin(math.pi / 6)))
-    if p2.Within(g1):
-        return 'fail'
+    assert not p2.Within(g1)
 
     # Full circle defined by 2 arcs
     g1 = ogr.CreateGeometryFromWkt('CURVEPOLYGON (CIRCULARSTRING (0 0,1 1,2 0,1 -1,0 0))')
-    if not p1.Within(g1):
-        return 'fail'
+    assert p1.Within(g1)
 
     # Same but in reverse order
     g1 = ogr.CreateGeometryFromWkt('CURVEPOLYGON (CIRCULARSTRING (0 0,1 -1,2 0,1 1,0 0))')
-    if not p1.Within(g1):
-        return 'fail'
+    assert p1.Within(g1)
 
     # This is not a circle
     p2 = ogr.CreateGeometryFromWkt('POINT (%.16g %.16g)' % (1 + math.cos(math.pi / 6) - 1e-2, math.sin(math.pi / 6)))
     g1 = ogr.CreateGeometryFromWkt('CURVEPOLYGON (CIRCULARSTRING (0 0,1 1,2 0,1 1,0 0))')
-    if p2.Within(g1):
-        return 'fail'
+    assert not p2.Within(g1)
 
     # Test area on circle in 2 pieces
     g1 = ogr.CreateGeometryFromWkt('CURVEPOLYGON (CIRCULARSTRING (0 0,1 1,2 0,1 -1,0 0))')
     area = g1.Area()
     expected_area = math.pi
-    if abs(area - expected_area) > 1e-10:
-        print(area)
-        print(expected_area)
-        return 'fail'
+    assert abs(area - expected_area) <= 1e-10
 
     # Test area on hippodrome
     g1 = ogr.CreateGeometryFromWkt('CURVEPOLYGON (CIRCULARSTRING (0 0,1 1,2 0,2 -1,2 -2,1 -3,0 -2,0 -1,0 0))')
     area = g1.Area()
     expected_area = math.pi + 2 * 2
-    if abs(area - expected_area) > 1e-10:
-        print(area)
-        print(expected_area)
-        return 'fail'
+    assert abs(area - expected_area) <= 1e-10
 
     # Same hippodrome but with different WKT
     g1 = ogr.CreateGeometryFromWkt('CURVEPOLYGON (COMPOUNDCURVE(CIRCULARSTRING (0 0,1 1,2 0),(2 0,2 -2),CIRCULARSTRING(2 -2,1 -3,0 -2),(0 -2,0 0)))')
     area = g1.Area()
     expected_area = math.pi + 2 * 2
-    if abs(area - expected_area) > 1e-10:
-        print(area)
-        print(expected_area)
-        return 'fail'
+    assert abs(area - expected_area) <= 1e-10
 
     # Similar, but with concave part (does not trigger optimization)
     g1 = ogr.CreateGeometryFromWkt('CURVEPOLYGON (COMPOUNDCURVE(CIRCULARSTRING (0 0,1 1,2 0),(2 0,2 -2),CIRCULARSTRING(2 -2,1 -1,0 -2),(0 -2,0 0)))')
     area = g1.Area()
     expected_area = 2 * 2
-    if abs(area - expected_area) > 1e-10:
-        print(area)
-        print(expected_area)
-        return 'fail'
+    assert abs(area - expected_area) <= 1e-10
 
     # EMPTY
     for in_wkt in ['CURVEPOLYGON EMPTY', 'CURVEPOLYGON Z EMPTY']:
         g1 = ogr.CreateGeometryFromWkt(in_wkt)
         out_wkt = g1.ExportToWkt()
-        if in_wkt != out_wkt:
-            print(in_wkt)
-            print(out_wkt)
-            return 'fail'
-        if g1.Area() != 0.0:
-            print(in_wkt)
-            return 'fail'
+        assert in_wkt == out_wkt
+        assert g1.Area() == 0.0, in_wkt
 
         g2 = ogr.CreateGeometryFromWkb(g1.ExportToWkb())
         out_wkt = g2.ExportToWkt()
-        if in_wkt != out_wkt:
-            print(in_wkt)
-            print(out_wkt)
-            return 'fail'
+        assert in_wkt == out_wkt
 
     # Empty CircularString
     g = ogr.Geometry(ogr.wkbCurvePolygon)
     g.AddGeometry(ogr.Geometry(ogr.wkbCircularString))
-    if g.Area() != 0:
-        print(g.Area())
-        return 'fail'
+    assert g.Area() == 0
 
     # Non-convex CircularString
     g = ogr.CreateGeometryFromWkt('CURVEPOLYGON( COMPOUNDCURVE( CIRCULARSTRING(0 0,0.5 -0.5,1 0,1.5 0.5,2 0), (2 0,2 1,0 1,0 0) ) )')
-    if abs(g.Area() - 2.0) > 1e-10:
-        print(g.Area())
-        return 'fail'
+    assert abs(g.Area() - 2.0) <= 1e-10
 
     return 'success'
 
@@ -2654,101 +2117,72 @@ def test_ogr_geom_multicurve():
     # Simple test
     in_wkt = 'MULTICURVE (CIRCULARSTRING (0 0,1 0,0 0))'
     g1 = ogr.CreateGeometryFromWkt(in_wkt)
-    if g1.GetGeometryType() != ogr.wkbMultiCurve:
-        return 'fail'
+    assert g1.GetGeometryType() == ogr.wkbMultiCurve
     out_wkt = g1.ExportToWkt()
-    if in_wkt != out_wkt:
-        print(out_wkt)
-        return 'fail'
+    assert in_wkt == out_wkt
 
-    if g1.GetDimension() != 1:
-        print(g1.GetDimension())
-        return 'fail'
+    assert g1.GetDimension() == 1
 
     env = g1.GetEnvelope()
     expected_env = (0.0, 1.0, -0.5, 0.5)
     for i in range(4):
-        if abs(env[i] - expected_env[i]) > 1e-8:
-            print(env)
-            return 'fail'
+        assert abs(env[i] - expected_env[i]) <= 1e-8
 
     length = g1.Length()
     expected_length = 2 * math.pi * 0.5
-    if abs(length - expected_length) > 1e-8:
-        print(length)
-        return 'fail'
+    assert abs(length - expected_length) <= 1e-8
 
     g2 = ogr.CreateGeometryFromWkb(g1.ExportToWkb())
     out_wkt = g2.ExportToWkt()
-    if in_wkt != out_wkt:
-        print(out_wkt)
-        return 'fail'
+    assert in_wkt == out_wkt
 
-    if not g1.HasCurveGeometry():
-        return 'fail'
-    if not g1.HasCurveGeometry(True):
-        return 'fail'
+    assert g1.HasCurveGeometry()
+    assert g1.HasCurveGeometry(True)
 
     # MULTICURVE of LINESTRING
     in_wkt = 'MULTICURVE ((0 0,1 0))'
     g1 = ogr.CreateGeometryFromWkt(in_wkt)
-    if not g1.HasCurveGeometry():
-        return 'fail'
-    if g1.HasCurveGeometry(True):
-        return 'fail'
+    assert g1.HasCurveGeometry()
+    assert not g1.HasCurveGeometry(True)
 
     # Z
     in_wkt = 'MULTICURVE Z (CIRCULARSTRING Z (0 0 10,1 0 10,0 0 10))'
     g1 = ogr.CreateGeometryFromWkt(in_wkt)
-    if g1.GetGeometryType() != ogr.wkbMultiCurveZ:
-        return 'fail'
+    assert g1.GetGeometryType() == ogr.wkbMultiCurveZ
     out_wkt = g1.ExportToWkt()
-    if in_wkt != out_wkt:
-        print(out_wkt)
-        return 'fail'
+    assert in_wkt == out_wkt
 
     g2 = ogr.CreateGeometryFromWkb(g1.ExportToWkb())
     out_wkt = g2.ExportToWkt()
-    if in_wkt != out_wkt:
-        print(out_wkt)
-        return 'fail'
+    assert in_wkt == out_wkt
 
     # WKT with all possible sub geometries
     in_wkt = 'MULTICURVE (CIRCULARSTRING (0 0,1 0,0 0),(0 0,1 1),COMPOUNDCURVE ((0 0,1 1),CIRCULARSTRING (1 1,2 2,3 3)))'
     g1 = ogr.CreateGeometryFromWkt(in_wkt)
     out_wkt = g1.ExportToWkt()
-    if in_wkt != out_wkt:
-        print(out_wkt)
-        return 'fail'
+    assert in_wkt == out_wkt
 
     g2 = ogr.CreateGeometryFromWkb(g1.ExportToWkb())
     out_wkt = g2.ExportToWkt()
-    if in_wkt != out_wkt:
-        print(out_wkt)
-        return 'fail'
+    assert in_wkt == out_wkt
 
     # Test ForceToMultiLineString
     gdal.SetConfigOption('OGR_ARC_STEPSIZE', '45')
     g2 = ogr.ForceToMultiLineString(g1)
     gdal.SetConfigOption('OGR_ARC_STEPSIZE', None)
     expected_g = 'MULTILINESTRING ((0 0,0.116977778440514 -0.321393804843282,0.413175911166547 -0.49240387650611,0.75 -0.433012701892224,0.969846310392967 -0.171010071662835,0.969846310392967 0.171010071662835,0.75 0.433012701892224,0.413175911166547 0.49240387650611,0.116977778440514 0.321393804843282,0 0),(0 0,1 1),(0 0,1 1,2 2,3 3))'
-    if ogrtest.check_feature_geometry(g2, expected_g) != 0:
-        print(g2)
-        return 'fail'
+    assert ogrtest.check_feature_geometry(g2, expected_g) == 0
 
     # Test GetLinearGeometry
     g2 = g1.GetLinearGeometry(45)
-    if ogrtest.check_feature_geometry(g2, expected_g) != 0:
-        print(g2)
-        return 'fail'
+    assert ogrtest.check_feature_geometry(g2, expected_g) == 0
 
     # Error case : wrong sub-geometry type
     in_wkt = 'MULTILINESTRING (POINT EMPTY)'
     gdal.PushErrorHandler('CPLQuietErrorHandler')
     g = ogr.CreateGeometryFromWkt(in_wkt)
     gdal.PopErrorHandler()
-    if g is not None:
-        return 'fail'
+    assert g is None
 
     return 'success'
 
@@ -2761,115 +2195,82 @@ def test_ogr_geom_multisurface():
     # Simple test
     in_wkt = 'MULTISURFACE (CURVEPOLYGON (CIRCULARSTRING (0 0,1 0,0 0)))'
     g1 = ogr.CreateGeometryFromWkt(in_wkt)
-    if g1.GetGeometryType() != ogr.wkbMultiSurface:
-        return 'fail'
+    assert g1.GetGeometryType() == ogr.wkbMultiSurface
     out_wkt = g1.ExportToWkt()
-    if in_wkt != out_wkt:
-        print(out_wkt)
-        return 'fail'
+    assert in_wkt == out_wkt
 
-    if g1.GetDimension() != 2:
-        print(g1.GetDimension())
-        return 'fail'
+    assert g1.GetDimension() == 2
 
     env = g1.GetEnvelope()
     expected_env = (0.0, 1.0, -0.5, 0.5)
     for i in range(4):
-        if abs(env[i] - expected_env[i]) > 1e-8:
-            print(env)
-            return 'fail'
+        assert abs(env[i] - expected_env[i]) <= 1e-8
 
     area = g1.Area()
     expected_area = math.pi * 0.5 * 0.5
-    if abs(area - expected_area) > 1e-8:
-        print(area)
-        return 'fail'
+    assert abs(area - expected_area) <= 1e-8
 
     g2 = ogr.CreateGeometryFromWkb(g1.ExportToWkb())
     out_wkt = g2.ExportToWkt()
-    if in_wkt != out_wkt:
-        print(out_wkt)
-        return 'fail'
+    assert in_wkt == out_wkt
 
-    if not g1.HasCurveGeometry():
-        return 'fail'
-    if not g1.HasCurveGeometry(True):
-        return 'fail'
+    assert g1.HasCurveGeometry()
+    assert g1.HasCurveGeometry(True)
 
     # Z
     in_wkt = 'MULTISURFACE Z (CURVEPOLYGON Z (CIRCULARSTRING Z (0 0 10,1 0 10,0 0 10)))'
     g1 = ogr.CreateGeometryFromWkt(in_wkt)
-    if g1.GetGeometryType() != ogr.wkbMultiSurfaceZ:
-        return 'fail'
+    assert g1.GetGeometryType() == ogr.wkbMultiSurfaceZ
     out_wkt = g1.ExportToWkt()
-    if in_wkt != out_wkt:
-        print(out_wkt)
-        return 'fail'
+    assert in_wkt == out_wkt
 
     g2 = ogr.CreateGeometryFromWkb(g1.ExportToWkb())
     out_wkt = g2.ExportToWkt()
-    if in_wkt != out_wkt:
-        print(out_wkt)
-        return 'fail'
+    assert in_wkt == out_wkt
 
     # MULTISURFACE of POLYGON
     in_wkt = 'MULTISURFACE (((0 0,0 10,10 10,10 0,0 0)))'
     g1 = ogr.CreateGeometryFromWkt(in_wkt)
-    if not g1.HasCurveGeometry():
-        return 'fail'
-    if g1.HasCurveGeometry(True):
-        return 'fail'
+    assert g1.HasCurveGeometry()
+    assert not g1.HasCurveGeometry(True)
 
     # WKT with all possible sub geometries
     in_wkt = 'MULTISURFACE (((0 0,0 10,10 10,10 0,0 0)),CURVEPOLYGON (CIRCULARSTRING (0 0,1 0,0 0)))'
     g1 = ogr.CreateGeometryFromWkt(in_wkt)
     out_wkt = g1.ExportToWkt()
-    if in_wkt != out_wkt:
-        print(out_wkt)
-        return 'fail'
+    assert in_wkt == out_wkt
 
     g2 = ogr.CreateGeometryFromWkb(g1.ExportToWkb())
     out_wkt = g2.ExportToWkt()
-    if in_wkt != out_wkt:
-        print(out_wkt)
-        return 'fail'
+    assert in_wkt == out_wkt
 
     # Test ForceToMultiPolygon
     gdal.SetConfigOption('OGR_ARC_STEPSIZE', '45')
     g2 = ogr.ForceToMultiPolygon(g1)
     gdal.SetConfigOption('OGR_ARC_STEPSIZE', None)
     expected_g = 'MULTIPOLYGON (((0 0,0 10,10 10,10 0,0 0)),((0 0,0.116977778440514 -0.321393804843282,0.413175911166547 -0.49240387650611,0.75 -0.433012701892224,0.969846310392967 -0.171010071662835,0.969846310392967 0.171010071662835,0.75 0.433012701892224,0.413175911166547 0.49240387650611,0.116977778440514 0.321393804843282,0 0)))'
-    if ogrtest.check_feature_geometry(g2, expected_g) != 0:
-        print(g2)
-        return 'fail'
+    assert ogrtest.check_feature_geometry(g2, expected_g) == 0
 
     # Test GetLinearGeometry
     g2 = g1.GetLinearGeometry(45)
-    if ogrtest.check_feature_geometry(g2, expected_g) != 0:
-        print(g2)
-        return 'fail'
+    assert ogrtest.check_feature_geometry(g2, expected_g) == 0
     # Check that GetLinearGeometry() is idem-potent on MULTIPOLYGON
     g3 = g2.GetLinearGeometry(45)
-    if not g3.Equals(g2):
-        print(g3)
-        return 'fail'
+    assert g3.Equals(g2)
 
     # PointOnSurface
     if ogrtest.have_geos():
         in_wkt = 'MULTISURFACE (((0 0,0 10,10 10,10 0,0 0),(1 1,1 9,9 9,9 1,1 1)),((10 0,10 10,20 10,20 0,10 0),(11 1,11 9,19 9,19 1,11 1)))'
         g1 = ogr.CreateGeometryFromWkt(in_wkt)
         p1 = g1.PointOnSurface()
-        if p1.ExportToWkt() != 'POINT (0.5 5.0)':
-            print(p1)
-            return 'fail'
+        assert p1.ExportToWkt() == 'POINT (0.5 5.0)'
 
     # Error case : wrong sub-geometry type
     in_wkt = 'MULTIPOLYGON (POINT EMPTY)'
     gdal.PushErrorHandler('CPLQuietErrorHandler')
     g = ogr.CreateGeometryFromWkt(in_wkt)
     gdal.PopErrorHandler()
-    if g is not None:
-        return 'fail'
+    assert g is None
 
     return 'success'
 
@@ -2889,56 +2290,43 @@ def test_ogr_geom_getcurvegeometry():
         in_wkt = geom + ' EMPTY'
         g = ogr.CreateGeometryFromWkt(in_wkt)
         g2 = g.GetCurveGeometry()
-        if g2.ExportToWkt() != in_wkt:
-            print(g)
-            print(g2)
-            return 'fail'
+        assert g2.ExportToWkt() == in_wkt, g
 
     g = ogr.CreateGeometryFromWkt('GEOMETRYCOLLECTION(POINT (0 1))')
     g2 = g.GetCurveGeometry()
-    if not g.Equals(g2):
-        return 'fail'
+    assert g.Equals(g2)
 
     g = ogr.CreateGeometryFromWkt('GEOMETRYCOLLECTION(LINESTRING (0 0,0 1,0 0))')
     g2 = g.GetCurveGeometry()
-    if not g.Equals(g2):
-        return 'fail'
+    assert g.Equals(g2)
 
     g = ogr.CreateGeometryFromWkt('POLYGON((0 0,0 1,1 1,1 0,0 0))')
     g2 = g.GetCurveGeometry()
-    if not g.Equals(g2):
-        return 'fail'
+    assert g.Equals(g2)
 
     g = ogr.CreateGeometryFromWkt('POLYGON Z ((0 0 10,0 1 10,1 1 10,1 0 10,0 0 10))')
     g2 = g.GetCurveGeometry()
-    if not g.Equals(g2):
-        return 'fail'
+    assert g.Equals(g2)
 
     # CircularString with large step
     g1 = ogr.CreateGeometryFromWkt('CIRCULARSTRING (0 0,1 1,2 0)')
     g2 = g1.GetLinearGeometry(15)
     g3 = g2.GetCurveGeometry()
-    if g3.GetGeometryType() != ogr.wkbCircularString or \
-       g1.GetPoint(0) != g3.GetPoint(0) or g1.GetPoint(2) != g3.GetPoint(2) or \
-       abs((g3.GetX(1) - 1) * (g3.GetX(1) - 1) + g3.GetY(1) * g3.GetY(1) - 1) > 1e-8:
-        print(g3)
-        return 'fail'
+    assert (g3.GetGeometryType() == ogr.wkbCircularString and \
+       g1.GetPoint(0) == g3.GetPoint(0) and g1.GetPoint(2) == g3.GetPoint(2) and \
+       abs((g3.GetX(1) - 1) * (g3.GetX(1) - 1) + g3.GetY(1) * g3.GetY(1) - 1) <= 1e-8)
 
     # CurvePolygon with large step
     g1 = ogr.CreateGeometryFromWkt('CURVEPOLYGON( CIRCULARSTRING (0 0,1 1,0 0))')
     g2 = g1.GetLinearGeometry(15)
     g3 = g2.GetCurveGeometry()
-    if not g3.Equals(g1):
-        print(g3)
-        return 'fail'
+    assert g3.Equals(g1)
 
     # This is a straight line
     g1 = ogr.CreateGeometryFromWkt('CIRCULARSTRING (1 2,3 4,5 6)')
     g2 = g1.GetLinearGeometry()
     g3 = g2.GetCurveGeometry()
-    if g3.ExportToWkt() != 'LINESTRING (1 2,3 4,5 6)':
-        print(g3)
-        return 'fail'
+    assert g3.ExportToWkt() == 'LINESTRING (1 2,3 4,5 6)'
 
     # "Random" arcs
     for wkt in ['CIRCULARSTRING (1 2,3 1,5 6)',
@@ -2957,10 +2345,7 @@ def test_ogr_geom_getcurvegeometry():
         g1 = ogr.CreateGeometryFromWkt(wkt)
         g2 = g1.GetLinearGeometry()
         g3 = g2.GetCurveGeometry()
-        if not g3.Equals(g1):
-            print(g1)
-            print(g3)
-            return 'fail'
+        assert g3.Equals(g1)
 
     # Really random arcs with coordinates in the [-1000,1000] range
     for i in range(1000):
@@ -3022,24 +2407,18 @@ def test_ogr_geom_getcurvegeometry():
     g1 = ogr.CreateGeometryFromWkt('CIRCULARSTRING (0 0,0.5 -0.5,1 0,0.5 0.5,0 0)')
     g2 = g1.GetLinearGeometry()
     g3 = g2.GetCurveGeometry()
-    if not g3.Equals(g1):
-        print(g3)
-        return 'fail'
+    assert g3.Equals(g1)
 
     # 3 points full circle
     g1 = ogr.CreateGeometryFromWkt('CIRCULARSTRING (0 0,1 0,0 0)')
     g2 = g1.GetLinearGeometry()
     g3 = g2.GetCurveGeometry()
-    if g3.GetGeometryType() != ogr.wkbCircularString or \
-       g1.GetPoint(0) != g3.GetPoint(0) or \
-       g1.GetPoint(1) != g3.GetPoint(2) or \
-       g1.GetPoint(2) != g3.GetPoint(4) or \
-       abs((g3.GetX(1) - 0.5) * (g3.GetX(1) - 0.5) + g3.GetY(1) * g3.GetY(1) - 0.5 * 0.5) > 1e-12 or \
-       abs((g3.GetX(3) - 0.5) * (g3.GetX(3) - 0.5) + g3.GetY(3) * g3.GetY(3) - 0.5 * 0.5) > 1e-12:
-        print(g3)
-        # print(abs((g3.GetX(1) - 0.5)*(g3.GetX(1) - 0.5)+g3.GetY(1)*g3.GetY(1) - 0.5*0.5))
-        # print(abs((g3.GetX(3) - 0.5)*(g3.GetX(3) - 0.5)+g3.GetY(3)*g3.GetY(3) - 0.5*0.5))
-        return 'fail'
+    assert (g3.GetGeometryType() == ogr.wkbCircularString and \
+       g1.GetPoint(0) == g3.GetPoint(0) and \
+       g1.GetPoint(1) == g3.GetPoint(2) and \
+       g1.GetPoint(2) == g3.GetPoint(4) and \
+       abs((g3.GetX(1) - 0.5) * (g3.GetX(1) - 0.5) + g3.GetY(1) * g3.GetY(1) - 0.5 * 0.5) <= 1e-12 and \
+       abs((g3.GetX(3) - 0.5) * (g3.GetX(3) - 0.5) + g3.GetY(3) * g3.GetY(3) - 0.5 * 0.5) <= 1e-12)
 
     # 3 points full circle in a CurvePolygon
     for wkt in ['CURVEPOLYGON( CIRCULARSTRING (0 0,1 0,0 0))',
@@ -3049,147 +2428,110 @@ def test_ogr_geom_getcurvegeometry():
         g1 = ogr.CreateGeometryFromWkt(wkt)
         g2 = g1.GetLinearGeometry()
         g3 = g2.GetCurveGeometry()
-        if not g3.Equals(g1):
-            print(g1)
-            print(g3)
-            return 'fail'
+        assert g3.Equals(g1)
 
     # 2 curves in the CircularString
     g1 = ogr.CreateGeometryFromWkt('CIRCULARSTRING (0 0,1 1,2 0,3 -1,4 0)')
     g2 = g1.GetLinearGeometry()
     g3 = g2.GetCurveGeometry()
-    if not g3.Equals(g1):
-        print(g3)
-        return 'fail'
+    assert g3.Equals(g1)
 
     # 3 curves in the CircularString
     g1 = ogr.CreateGeometryFromWkt('CIRCULARSTRING (0 0,1 1,2 0,3 -1,4 0,5 1,6 0)')
     g2 = g1.GetLinearGeometry()
     g3 = g2.GetCurveGeometry()
-    if not g3.Equals(g1):
-        print(g3)
-        return 'fail'
+    assert g3.Equals(g1)
 
     # CircularString, LineString, CircularString
     g1 = ogr.CreateGeometryFromWkt('COMPOUNDCURVE (CIRCULARSTRING (0 0,1 1,2 0),(2 0,3 0,4 0),CIRCULARSTRING (4 0,5 1,6 0))')
     g2 = g1.GetLinearGeometry()
     g3 = g2.GetCurveGeometry()
-    if not g3.Equals(g1):
-        print(g3)
-        return 'fail'
+    assert g3.Equals(g1)
 
     # LineString, CircularString, LineString, CircularString, LineString
     g1 = ogr.CreateGeometryFromWkt('COMPOUNDCURVE ((-1 0,-0.5 0.5,0 0),CIRCULARSTRING (0 0,1 1,2 0),(2 0,3 0,4 0),CIRCULARSTRING (4 0,5 1,6 0),(6 0,7 0))')
     g2 = g1.GetLinearGeometry()
     g3 = g2.GetCurveGeometry()
-    if not g3.Equals(g1):
-        print(g3)
-        return 'fail'
+    assert g3.Equals(g1)
 
     # Check with default discretization method
     g1 = ogr.CreateGeometryFromWkt('CIRCULARSTRING (0 0,1.2 1.0,2 0)')
     g2 = ogr.CreateGeometryFromWkt('LINESTRING (0 0,0.000997093138961 0.068920262501281,0.006738548124866 0.137608197923873,0.017197098230267 0.205737600590167,0.032323074784779 0.272984917348872,0.052044643056421 0.339030784160355,0.076268143401735 0.403561542787492,0.104878536064531 0.466270730389102,0.137739947510866 0.526860534941749,0.174696315705653 0.585043209577972,0.215572131266425 0.640542439124111,0.260173270974444 0.693094652347904,0.30828791968472 0.742450273683876,0.359687576256715 0.788374908491942,0.414128138728451 0.830650456220319,0.471351063580441 0.869076146186235,0.531084593583979 0.903469491055406,0.593045048402615 0.933667153492107,0.656938171817632 0.959525721864054,0.722460529179411 0.980922391318168,0.789300948448056 0.99775554699276,0.857141997979641 1.009945246596371,0.925661494039921 1.017433600061489,0.994534030886182 1.020185044470095,1.063432526150724 1.01818651294542,1.132029774186796 1.01144749670781,1.2 1.0,1.267547127648721 0.983752320094182,1.333803428245673 0.962854851656094,1.398449236893265 0.937408418110045,1.461172658788815 0.907535790143504,1.521671074014578 0.873381093378847,1.579652597579492 0.835109113014538,1.634837487668428 0.792904498790658,1.686959495304612 0.746970874114522,1.73576714891352 0.697529853644598,1.781024967590663 0.644819974072535,1.822514597219645 0.589095543261942,1.860035863959079 0.53062541329644,1.89340774001566 0.469691683356621,1.922469217043826 0.406588338684124,1.94708008295817 0.341619832199361,1.967121598410718 0.27509961561613,1.982497069669296 0.207348627140011,1.993132315133044 0.138693743046887,1.998976023234287 0.069466200612231,2 0)')
     g3 = g2.GetCurveGeometry()
-    if not g3.Equals(g1):
-        print(g3)
-        return 'fail'
+    assert g3.Equals(g1)
 
     # Check with alternate discretization method : ROUND_ANGLE_METHOD
     g1 = ogr.CreateGeometryFromWkt('CIRCULARSTRING (0 0,1.2 1.0,2 0)')
     g2 = ogr.CreateGeometryFromWkt('LINESTRING (0 0,-0.000199980003999 0.02,0.002236456877416 0.089770423644023,0.009533897446083 0.159200932797352,0.021656789305088 0.227953268998521,0.038546070943884 0.295692477776518,0.060119459480029 0.362088540515299,0.086271851533127 0.426817982271309,0.116875835277923 0.489565447710894,0.151782311181914 0.550025237489786,0.190821218403283 0.607902797589577,0.233802363310224 0.662916154355295,0.280516346085201 0.7147972882427,0.330735580899807 0.763293439582565,0.384215404690045 0.80816834000038,0.440695269130182 0.849203363492117,0.499900009998002 0.886198591548151,0.561541187747236 0.918973787136141,0.62531849275604 0.947369272797732,0.690921208405283 0.971246708581086,0.758029724858684 0.990489766019218,0.826317096169807 1.005004694870594,0.895450633129846 1.014720779860886,0.965093524096011 1.019590685200679,1.034906475903993 1.019590685200679,1.104549366870158 1.014720779860886,1.173682903830197 1.005004694870593,1.2 1.0,1.241970275141317 0.990489766019217,1.309078791594718 0.971246708581085,1.374681507243961 0.947369272797731,1.438458812252765 0.91897378713614,1.500099990002 0.886198591548151,1.559304730869819 0.849203363492116,1.615784595309956 0.808168340000379,1.669264419100194 0.763293439582565,1.7194836539148 0.714797288242699,1.766197636689777 0.662916154355294,1.809178781596718 0.607902797589576,1.848217688818087 0.550025237489785,1.883124164722078 0.489565447710893,1.913728148466874 0.426817982271308,1.939880540519971 0.362088540515298,1.961453929056117 0.295692477776516,1.978343210694912 0.227953268998519,1.990466102553917 0.15920093279735,1.997763543122584 0.089770423644022,2.000199980003999 0.02,2 0)')
     g3 = g2.GetCurveGeometry()
-    if not g3.Equals(g1):
-        print(g3)
-        return 'fail'
+    assert g3.Equals(g1)
 
     # Check with PostgreSQL output of SELECT ST_CurveToLine(ST_GeomFromText('CIRCULARSTRING (0 0,1.2 1.0,2 0)'))
     g1 = ogr.CreateGeometryFromWkt('CIRCULARSTRING (0 0,1.2 1.0,2 0)')
     g2 = ogr.CreateGeometryFromWkt('LINESTRING (0 0,0.000223190308279 0.049091765203314,0.002854930521212 0.098113445796116,0.007888880546112 0.146946944256066,0.015312913156447 0.195474616408063,0.025109143207391 0.243579554839372,0.037253970722702 0.291145870539817,0.051718137749134 0.338058972088558,0.068466798841411 0.384205841714863,0.08745960500795 0.429475307567812,0.108650800915124 0.473758311539029,0.131989335115863 0.516948171993215,0.157418983037062 0.558940840773549,0.184878482429505 0.599635153862819,0.214301680953989 0.638933075096389,0.245617695548099 0.676739932339917,0.27875108318972 0.712964645562815,0.31362202264588 0.747519946258017,0.350146506769097 0.780322587679462,0.388236544877951 0.811293545390794,0.427800374734344 0.840358207642151,0.46874268360677 0.867446555116406,0.510964837887032 0.892493329611833,0.554365120707246 0.915438191254836,0.598838976984681 0.936225863863983,0.644279265304116 0.954806268115175,0.690576516030889 0.971134642187118,0.737619195032841 0.985171649596477,0.785293972375802 0.996883473962907,0.833485995345338 1.006241900475673,0.88207916513699 1.013224383865605,0.930956416548473 1.017814102718623,0.98 1.02,1.029091765203309 1.019776809691721,1.078113445796111 1.017145069478788,1.12694694425606 1.012111119453889,1.175474616408058 1.004687086843554,1.223579554839367 0.994890856792611,1.271145870539812 0.9827460292773,1.318058972088553 0.968281862250867,1.364205841714858 0.951533201158591,1.409475307567807 0.932540394992052,1.453758311539024 0.911349199084878,1.49694817199321 0.88801066488414,1.538940840773545 0.862581016962941,1.579635153862814 0.835121517570498,1.618933075096384 0.805698319046015,1.656739932339913 0.774382304451905,1.692964645562811 0.741248916810284,1.727519946258013 0.706377977354124,1.760322587679458 0.669853493230907,1.791293545390791 0.631763455122053,1.820358207642148 0.59219962526566,1.847446555116403 0.551257316393235,1.872493329611831 0.509035162112973,1.895438191254833 0.465634879292759,1.916225863863981 0.421161023015324,1.934806268115173 0.37572073469589,1.951134642187117 0.329423483969116,1.965171649596476 0.282380804967164,1.976883473962906 0.234706027624203,1.986241900475672 0.186514004654668,1.993224383865604 0.137920834863015,1.997814102718623 0.089043583451532,2.0 0.04,2 0)')
     g3 = g2.GetCurveGeometry()
     g1_expected = ogr.CreateGeometryFromWkt('CIRCULARSTRING (0 0,0.98 1.02,2 0)')
-    if not g3.Equals(g1_expected):
-        print(g3)
-        return 'fail'
+    assert g3.Equals(g1_expected)
 
     # Test default ( implicit option ADD_INTERMEDIATE_POINT=STEALTH )
     g1 = ogr.CreateGeometryFromWkt('CIRCULARSTRING (0 0,1.2 1.0,2 0)')
     g2 = g1.GetLinearGeometry()
     g3 = g2.GetCurveGeometry()
-    if not g3.Equals(g1):
-        print(g3)
-        return 'fail'
+    assert g3.Equals(g1)
 
     # Test with Z
     g1 = ogr.CreateGeometryFromWkt('CIRCULARSTRING (0 0 1,1 1 2,2 0 3)')
     g2 = g1.GetLinearGeometry()
     g3 = g2.GetCurveGeometry()
-    if not g3.Equals(g1):
-        print(g3)
-        return 'fail'
+    assert g3.Equals(g1)
 
     g1 = ogr.CreateGeometryFromWkt('CIRCULARSTRING (2 0 3,1 1 2,0 0 1)')
     g2 = g1.GetLinearGeometry()
     g3 = g2.GetCurveGeometry()
-    if not g3.Equals(g1):
-        print(g3)
-        return 'fail'
+    assert g3.Equals(g1)
 
     # Test option ADD_INTERMEDIATE_POINT=STEALTH
     g1 = ogr.CreateGeometryFromWkt('CIRCULARSTRING (0 0,1.2 1.0,2 0)')
     g2 = g1.GetLinearGeometry(options=['ADD_INTERMEDIATE_POINT=STEALTH'])
     g3 = g2.GetCurveGeometry()
-    if not g3.Equals(g1):
-        print(g3)
-        return 'fail'
+    assert g3.Equals(g1)
 
     # Test option ADD_INTERMEDIATE_POINT=YES
     g1 = ogr.CreateGeometryFromWkt('CIRCULARSTRING (0 0,1.2 1.0,2 0)')
     g2 = g1.GetLinearGeometry(options=['ADD_INTERMEDIATE_POINT=YES'])
     g3 = g2.GetCurveGeometry()
-    if not g3.Equals(g1):
-        print(g3)
-        return 'fail'
+    assert g3.Equals(g1)
 
     # Test with big coordinates. The points are (2,49),(3,50),(4,49) reprojected from EPSG:4326 to EPSG:32631
     g1 = ogr.CreateGeometryFromWkt('CIRCULARSTRING (426857.987717275 5427937.52346616,500000.000000001 5538630.70286887,573142.012282726 5427937.52346616)')
     g2 = g1.GetLinearGeometry()
     g3 = g2.GetCurveGeometry()
-    if ogrtest.check_feature_geometry(g3, g1) != 0:
-        print(g3)
-        return 'fail'
+    assert ogrtest.check_feature_geometry(g3, g1) == 0
 
     # Same with integer coordinates
     g1 = ogr.CreateGeometryFromWkt('CIRCULARSTRING (426858 5427938,500000 5538632,573142 5427938)')
     g2 = g1.GetLinearGeometry()
     g3 = g2.GetCurveGeometry()
-    if not g3.Equals(g1):
-        print(g3)
-        return 'fail'
+    assert g3.Equals(g1)
 
     # Test option ADD_INTERMEDIATE_POINT=FALSE
     g1 = ogr.CreateGeometryFromWkt('CIRCULARSTRING (0 0,1.2 1.0,2 0)')
     g2 = g1.GetLinearGeometry(options=['ADD_INTERMEDIATE_POINT=FALSE'])
     g3 = g2.GetCurveGeometry()
     g1_expected = ogr.CreateGeometryFromWkt('CIRCULARSTRING (0 0,1.0 1.020199980003999,2 0)')
-    if ogrtest.check_feature_geometry(g3, g1_expected) != 0:
-        print(g3)
-        return 'fail'
+    assert ogrtest.check_feature_geometry(g3, g1_expected) == 0
 
     # Test with unrecognized options
     gdal.PushErrorHandler('CPLQuietErrorHandler')
     g2_new = g1.GetLinearGeometry(options=['bla', 'ADD_INTERMEDIATE_POINT=FALSE', 'foo=bar'])
     gdal.PopErrorHandler()
-    if not g2_new.Equals(g2):
-        print(g2_new)
-        return 'fail'
+    assert g2_new.Equals(g2)
 
     # Add repeated point at end of line
     g2 = g1.GetLinearGeometry()
     g2.AddPoint_2D(2 - 1e-9, 0)
     g3 = g2.GetCurveGeometry()
-    if not g3.Equals(g1):
-        print(g3)
-        return 'fail'
+    assert g3.Equals(g1)
 
     # Add repeated point at end of line
     g2 = g1.GetLinearGeometry()
@@ -3198,9 +2540,7 @@ def test_ogr_geom_getcurvegeometry():
     for i in range(g2.GetPointCount()):
         g2_new.AddPoint_2D(g2.GetX(i), g2.GetY(i))
     g3 = g2_new.GetCurveGeometry()
-    if not g3.Equals(g1):
-        print(g3)
-        return 'fail'
+    assert g3.Equals(g1)
 
     # Test various configurations
     for (wkt, eps) in [('CIRCULARSTRING (0 0,0.5 0.5,0 1,-0.5 0.5,0 0)', 0),
@@ -3226,72 +2566,52 @@ def test_ogr_geom_getcurvegeometry():
         g1 = ogr.CreateGeometryFromWkt(wkt)
         g2 = g1.GetLinearGeometry()
         g3 = g2.GetCurveGeometry()
-        if (eps == 0 and not g3.Equals(g1)) or (eps > 0 and ogrtest.check_feature_geometry(g3, g1, eps) != 0):
-            print('')
-            print(g1)
-            print(g3)
-            print(ogrtest.check_feature_geometry(g3, g1, 1e-6))
-            return 'fail'
+        assert not (eps == 0 and not g3.Equals(g1)) or (eps > 0 and ogrtest.check_feature_geometry(g3, g1, eps) != 0), \
+            ''
 
     # Test with GEOMETRYCOLLECTION container
     g1 = ogr.CreateGeometryFromWkt('GEOMETRYCOLLECTION(CIRCULARSTRING (0 0,0.5 0.5,0 1,-0.5 0.5,0 0))')
     g2 = g1.GetLinearGeometry()
     g3 = g2.GetCurveGeometry()
-    if not g3.Equals(g1):
-        print(g3)
-        return 'fail'
+    assert g3.Equals(g1)
 
     # Test with MULTICURVE container
     g1 = ogr.CreateGeometryFromWkt('MULTICURVE(CIRCULARSTRING (0 0,0.5 0.5,0 1,-0.5 0.5,0 0))')
     g2 = g1.GetLinearGeometry()
     g3 = g2.GetCurveGeometry()
-    if not g3.Equals(g1):
-        print(g3)
-        return 'fail'
+    assert g3.Equals(g1)
 
     # Test with MULTISURFACE container
     g1 = ogr.CreateGeometryFromWkt('MULTISURFACE(CURVEPOLYGON(COMPOUNDCURVE(CIRCULARSTRING (0 0,0.5 0.5,1 0),(1 0,0 0))))')
     g2 = g1.GetLinearGeometry()
     g3 = g2.GetCurveGeometry()
-    if not g3.Equals(g1):
-        print(g3)
-        return 'fail'
+    assert g3.Equals(g1)
 
     if ogrtest.have_geos():
         g1 = ogr.CreateGeometryFromWkt('CURVEPOLYGON(CIRCULARSTRING (0 0,2 0,0 0))')
         g2 = ogr.CreateGeometryFromWkt('CURVEPOLYGON(CIRCULARSTRING (1 0,3 1,1 0))')
         g3 = g1.Intersection(g2)
-        if g3.GetGeometryType() != ogr.wkbCurvePolygon:
-            print(g3)
-            return 'fail'
+        assert g3.GetGeometryType() == ogr.wkbCurvePolygon
 
         g1 = ogr.CreateGeometryFromWkt('CURVEPOLYGON(CIRCULARSTRING (0 0,2 0,0 0))')
         g2 = ogr.CreateGeometryFromWkt('CURVEPOLYGON((1 -1,1 1,3 1,3 -1,1 -1))')
         g3 = g1.Intersection(g2)
-        if g3.GetGeometryType() != ogr.wkbCurvePolygon:
-            print(g3)
-            return 'fail'
+        assert g3.GetGeometryType() == ogr.wkbCurvePolygon
 
         g1 = ogr.CreateGeometryFromWkt('CURVEPOLYGON(CIRCULARSTRING (0 0,2 0,0 0))')
         g2 = ogr.CreateGeometryFromWkt('CURVEPOLYGON(CIRCULARSTRING (3 0,5 0,3 0))')
         g3 = g1.Union(g2)
-        if g3.ExportToWkt() != 'MULTISURFACE (CURVEPOLYGON (CIRCULARSTRING (0 0,2 0,0 0)),CURVEPOLYGON (CIRCULARSTRING (3 0,5 0,3 0)))':
-            print(g3)
-            return 'fail'
+        assert g3.ExportToWkt() == 'MULTISURFACE (CURVEPOLYGON (CIRCULARSTRING (0 0,2 0,0 0)),CURVEPOLYGON (CIRCULARSTRING (3 0,5 0,3 0)))'
 
         g1 = ogr.CreateGeometryFromWkt('CIRCULARSTRING (0 0,1 1,2 0))')
         g2 = ogr.CreateGeometryFromWkt('CIRCULARSTRING (2 0,1 -1,0 0))')
         g3 = g1.Union(g2)
-        if g3.ExportToWkt() != 'MULTICURVE (CIRCULARSTRING (0 0,1 1,2 0),CIRCULARSTRING (2 0,1 -1,0 0))':
-            print(g3)
-            return 'fail'
+        assert g3.ExportToWkt() == 'MULTICURVE (CIRCULARSTRING (0 0,1 1,2 0),CIRCULARSTRING (2 0,1 -1,0 0))'
 
         g1 = ogr.CreateGeometryFromWkt('POINT(1 2)')
         g1 = g1.Buffer(0.5)
         g1 = g1.GetCurveGeometry()
-        if g1.ExportToWkt() != 'CURVEPOLYGON (CIRCULARSTRING (1.5 2.0,0.5 2.0,1.5 2.0))':
-            print(g1)
-            return 'fail'
+        assert g1.ExportToWkt() == 'CURVEPOLYGON (CIRCULARSTRING (1.5 2.0,0.5 2.0,1.5 2.0))'
 
     return 'success'
 
@@ -3311,9 +2631,7 @@ def test_ogr_geom_gt_functions():
               (ogr.wkbCircularStringM, 0),
               (ogr.wkbCircularStringZM, 1)]
     for (gt, res) in tuples:
-        if ogr.GT_HasZ(gt) != res:
-            print(gt)
-            return 'fail'
+        assert ogr.GT_HasZ(gt) == res
 
     # GT_SetZ
     tuples = [(ogr.wkbPoint, ogr.wkbPoint25D),
@@ -3325,9 +2643,7 @@ def test_ogr_geom_gt_functions():
               (ogr.wkbCircularStringM, ogr.wkbCircularStringZM),
               (ogr.wkbCircularStringZM, ogr.wkbCircularStringZM)]
     for (gt, res) in tuples:
-        if ogr.GT_SetZ(gt) != res:
-            print(gt)
-            return 'fail'
+        assert ogr.GT_SetZ(gt) == res
 
     # GT_HasM
     tuples = [(ogr.wkbPoint, 0),
@@ -3339,9 +2655,7 @@ def test_ogr_geom_gt_functions():
               (ogr.wkbCircularStringM, 1),
               (ogr.wkbCircularStringZM, 1)]
     for (gt, res) in tuples:
-        if ogr.GT_HasM(gt) != res:
-            print(gt)
-            return 'fail'
+        assert ogr.GT_HasM(gt) == res
 
     # GT_SetM
     tuples = [(ogr.wkbPoint, ogr.wkbPointM),
@@ -3353,9 +2667,7 @@ def test_ogr_geom_gt_functions():
               (ogr.wkbCircularStringM, ogr.wkbCircularStringM),
               (ogr.wkbCircularStringZM, ogr.wkbCircularStringZM)]
     for (gt, res) in tuples:
-        if ogr.GT_SetM(gt) != res:
-            print(gt)
-            return 'fail'
+        assert ogr.GT_SetM(gt) == res
 
     # OGR_GT_SetModifier
     tuples = [(ogr.wkbPoint, 0, 0, ogr.wkbPoint),
@@ -3377,9 +2689,7 @@ def test_ogr_geom_gt_functions():
               (ogr.wkbCircularString, 0, 0, ogr.wkbCircularString),
               (ogr.wkbCircularStringZ, 0, 0, ogr.wkbCircularString)]
     for (gt, modZ, modM, res) in tuples:
-        if ogr.GT_SetModifier(gt, modZ, modM) != res:
-            print(gt)
-            return 'fail'
+        assert ogr.GT_SetModifier(gt, modZ, modM) == res
 
     # GT_Flatten
     tuples = [(ogr.wkbPoint, ogr.wkbPoint),
@@ -3392,9 +2702,7 @@ def test_ogr_geom_gt_functions():
               (ogr.wkbCircularStringM, ogr.wkbCircularString),
               (ogr.wkbCircularStringZM, ogr.wkbCircularString)]
     for (gt, res) in tuples:
-        if ogr.GT_Flatten(gt) != res:
-            print(gt)
-            return 'fail'
+        assert ogr.GT_Flatten(gt) == res
 
     # GT_IsSubClassOf
     tuples = [(ogr.wkbPoint, ogr.wkbPoint, 1),
@@ -3413,10 +2721,7 @@ def test_ogr_geom_gt_functions():
               (ogr.wkbPolyhedralSurface, ogr.wkbTIN, 0),
              ]
     for (gt, gt2, res) in tuples:
-        if ogr.GT_IsSubClassOf(gt, gt2) != res:
-            print(gt)
-            print(gt2)
-            return 'fail'
+        assert ogr.GT_IsSubClassOf(gt, gt2) == res
 
     # GT_IsCurve
     tuples = [(ogr.wkbPoint, 0),
@@ -3435,9 +2740,7 @@ def test_ogr_geom_gt_functions():
               (ogr.wkbPolyhedralSurface, 0),
               (ogr.wkbTIN, 0)]
     for (gt, res) in tuples:
-        if ogr.GT_IsCurve(gt) != res:
-            print(gt)
-            return 'fail'
+        assert ogr.GT_IsCurve(gt) == res
 
     # GT_IsSurface
     tuples = [(ogr.wkbPoint, 0),
@@ -3454,9 +2757,7 @@ def test_ogr_geom_gt_functions():
               (ogr.wkbPolyhedralSurface, 1),
               (ogr.wkbTIN, 1)]
     for (gt, res) in tuples:
-        if ogr.GT_IsSurface(gt) != res:
-            print(gt)
-            return 'fail'
+        assert ogr.GT_IsSurface(gt) == res
 
     # GT_GetCollection
     tuples = [(ogr.wkbPoint, ogr.wkbMultiPoint),
@@ -3469,9 +2770,7 @@ def test_ogr_geom_gt_functions():
               (ogr.wkbLineString, ogr.wkbMultiLineString),
               (ogr.wkbPolygon, ogr.wkbMultiPolygon)]
     for (gt, res) in tuples:
-        if ogr.GT_GetCollection(gt) != res:
-            print(gt)
-            return 'fail'
+        assert ogr.GT_GetCollection(gt) == res
 
     # GT_IsNonLinear
     tuples = [(ogr.wkbPoint, 0),
@@ -3490,9 +2789,7 @@ def test_ogr_geom_gt_functions():
               (ogr.wkbPolygon, 0),
               (ogr.wkbTriangle, 0)]
     for (gt, res) in tuples:
-        if ogr.GT_IsNonLinear(gt) != res:
-            print(gt)
-            return 'fail'
+        assert ogr.GT_IsNonLinear(gt) == res
 
     # GT_GetCurve
     tuples = [(ogr.wkbPoint, ogr.wkbPoint),
@@ -3512,9 +2809,7 @@ def test_ogr_geom_gt_functions():
               (ogr.wkbMultiCurve, ogr.wkbMultiCurve),
               (ogr.wkbMultiSurface, ogr.wkbMultiSurface)]
     for (gt, res) in tuples:
-        if ogr.GT_GetCurve(gt) != res:
-            print(gt)
-            return 'fail'
+        assert ogr.GT_GetCurve(gt) == res
 
     # GT_GetLinear
     tuples = [(ogr.wkbPoint, ogr.wkbPoint),
@@ -3534,9 +2829,7 @@ def test_ogr_geom_gt_functions():
               (ogr.wkbMultiCurve, ogr.wkbMultiLineString),
               (ogr.wkbMultiSurface, ogr.wkbMultiPolygon)]
     for (gt, res) in tuples:
-        if ogr.GT_GetLinear(gt) != res:
-            print(gt)
-            return 'fail'
+        assert ogr.GT_GetLinear(gt) == res
 
     return 'success'
 
@@ -3598,48 +2891,31 @@ def test_ogr_geom_equals():
     p_empty = ogr.Geometry(ogr.wkbPoint)
     p_0 = ogr.CreateGeometryFromWkt('POINT (0 0)')
     p_1 = ogr.CreateGeometryFromWkt('POINT (1 1)')
-    if not p_empty.Equals(p_empty):
-        return 'fail'
-    if not p_0.Equals(p_0):
-        return 'fail'
-    if not p_0.Equals(p_0.Clone()):
-        return 'fail'
-    if p_empty.Equals(p_0):
-        return 'fail'
-    if p_0.Equals(p_empty):
-        return 'fail'
-    if p_0.Equals(p_1):
-        return 'fail'
+    assert p_empty.Equals(p_empty)
+    assert p_0.Equals(p_0)
+    assert p_0.Equals(p_0.Clone())
+    assert not p_empty.Equals(p_0)
+    assert not p_0.Equals(p_empty)
+    assert not p_0.Equals(p_1)
 
     l_empty = ogr.Geometry(ogr.wkbLineString)
     l_0_1 = ogr.CreateGeometryFromWkt('LINESTRING (0 0,1 1)')
     l_0_1_2 = ogr.CreateGeometryFromWkt('LINESTRING (0 0,1 1,2 2)')
-    if not l_0_1.Equals(l_0_1):
-        return 'fail'
-    if not l_0_1.Equals(l_0_1.Clone()):
-        return 'fail'
-    if l_empty.Equals(l_0_1):
-        return 'fail'
-    if l_0_1.Equals(l_empty):
-        return 'fail'
-    if l_0_1.Equals(l_0_1_2):
-        return 'fail'
+    assert l_0_1.Equals(l_0_1)
+    assert l_0_1.Equals(l_0_1.Clone())
+    assert not l_empty.Equals(l_0_1)
+    assert not l_0_1.Equals(l_empty)
+    assert not l_0_1.Equals(l_0_1_2)
 
     gc_empty = ogr.Geometry(ogr.wkbGeometryCollection)
     gc_p_0 = ogr.CreateGeometryFromWkt('GEOMETRYCOLLECTION (POINT (0 0))')
     gc_p_1 = ogr.CreateGeometryFromWkt('GEOMETRYCOLLECTION (POINT (1 1))')
-    if not gc_empty.Equals(gc_empty):
-        return 'fail'
-    if not gc_p_0.Equals(gc_p_0):
-        return 'fail'
-    if not gc_p_0.Equals(gc_p_0.Clone()):
-        return 'fail'
-    if gc_empty.Equals(gc_p_0):
-        return 'fail'
-    if gc_p_0.Equals(gc_empty):
-        return 'fail'
-    if gc_p_0.Equals(gc_p_1):
-        return 'fail'
+    assert gc_empty.Equals(gc_empty)
+    assert gc_p_0.Equals(gc_p_0)
+    assert gc_p_0.Equals(gc_p_0.Clone())
+    assert not gc_empty.Equals(gc_p_0)
+    assert not gc_p_0.Equals(gc_empty)
+    assert not gc_p_0.Equals(gc_p_1)
 
     return 'success'
 
@@ -3685,59 +2961,37 @@ def test_ogr_geom_measured_geometries_to_2D_or_3D():
         geom2 = ogr.CreateGeometryFromWkb(wkb)
         if not geom.Equals(geom2):
             print(before)
-            print(geom2.ExportToIsoWkt())
-            return 'fail'
+            pytest.fail(geom2.ExportToIsoWkt())
 
         geom = ogr.CreateGeometryFromWkt(before)
         geom.FlattenTo2D()
-        if geom.ExportToIsoWkt() != after_2D:
-            print(before)
-            print(after_2D)
-            print(geom.ExportToIsoWkt())
-            return 'fail'
+        assert geom.ExportToIsoWkt() == after_2D, before
 
         geom = ogr.CreateGeometryFromWkt(before)
         geom.SetCoordinateDimension(2)
-        if geom.ExportToIsoWkt() != after_2D:
-            print(before)
-            print(after_2D)
-            print(geom.ExportToIsoWkt())
-            return 'fail'
+        assert geom.ExportToIsoWkt() == after_2D, before
 
         geom = ogr.CreateGeometryFromWkt(before)
         geom.SetCoordinateDimension(3)
-        if geom.ExportToIsoWkt() != after_3D:
-            print(before)
-            print(after_3D)
-            print(geom.ExportToIsoWkt())
-            return 'fail'
+        assert geom.ExportToIsoWkt() == after_3D, before
 
         # Test no-op
         geom = ogr.CreateGeometryFromWkt(before)
         geom.Set3D(geom.Is3D())
         geom.SetMeasured(geom.IsMeasured())
-        if geom.ExportToIsoWkt() != before:
-            print(before)
-            print(geom.ExportToIsoWkt())
-            return 'fail'
+        assert geom.ExportToIsoWkt() == before
 
-    if ogr.CreateGeometryFromWkt('POINT (1 2)').CoordinateDimension() != 2:
-        return 'fail'
+    assert ogr.CreateGeometryFromWkt('POINT (1 2)').CoordinateDimension() == 2
 
-    if ogr.CreateGeometryFromWkt('POINT M (1 2 3)').CoordinateDimension() != 3:
-        return 'fail'
+    assert ogr.CreateGeometryFromWkt('POINT M (1 2 3)').CoordinateDimension() == 3
 
-    if ogr.CreateGeometryFromWkt('POINT Z (1 2 3)').CoordinateDimension() != 3:
-        return 'fail'
+    assert ogr.CreateGeometryFromWkt('POINT Z (1 2 3)').CoordinateDimension() == 3
 
-    if ogr.CreateGeometryFromWkt('POINT ZM (1 2 3 4)').CoordinateDimension() != 4:
-        return 'fail'
+    assert ogr.CreateGeometryFromWkt('POINT ZM (1 2 3 4)').CoordinateDimension() == 4
 
     # Unrelated test. Test old-style unqualified non-bracketted ZM import
     g = ogr.CreateGeometryFromWkt('MULTIPOINT (1 2 3 4)')
-    if g.ExportToIsoWkt() != 'MULTIPOINT ZM ((1 2 3 4))':
-        print(g.ExportToIsoWkt())
-        return 'fail'
+    assert g.ExportToIsoWkt() == 'MULTIPOINT ZM ((1 2 3 4))'
 
     return 'success'
 
@@ -3752,11 +3006,7 @@ def test_ogr_geom_postgis_ewkt_xym():
                ]
     for (before, after) in list_wkt:
         geom = ogr.CreateGeometryFromWkt(before)
-        if geom.ExportToIsoWkt() != after:
-            print(before)
-            print(after)
-            print(geom.ExportToIsoWkt())
-            return 'fail'
+        assert geom.ExportToIsoWkt() == after, before
 
     return 'success'
 
@@ -3776,11 +3026,7 @@ def test_ogr_geom_curve_surface():
              [ogr.wkbSurfaceZM, "3D Measured Surface"]]
 
     for (wkb_type, name) in tests:
-        if ogr.GeometryTypeToName(wkb_type) != name:
-            print(wkb_type)
-            print(name)
-            print(ogr.GeometryTypeToName(wkb_type))
-            return 'fail'
+        assert ogr.GeometryTypeToName(wkb_type) == name
 
     return 'success'
 
@@ -3829,9 +3075,7 @@ def test_ogr_geom_import_corrupted_wkb():
                         g = ogr.CreateGeometryFromWkb(str(wkb))
                 if g:
                     g2 = ogr.CreateGeometryFromWkb(g.ExportToIsoWkb())
-                    if not g.Equals(g2):
-                        print(wkt, i, method)
-                        return 'fail'
+                    assert g.Equals(g2), (wkt, i, method)
                 wkb[i] = init_val
 
         # Test truncation of the WKB
@@ -3841,9 +3085,7 @@ def test_ogr_geom_import_corrupted_wkb():
                     g = ogr.CreateGeometryFromWkb(bytes(wkb[0:i]))
                 else:
                     g = ogr.CreateGeometryFromWkb(str(wkb[0:i]))
-            if g is not None:
-                print(wkt, i)
-                return 'fail'
+            assert g is None, (wkt, i)
 
     return 'success'
 
@@ -3873,49 +3115,31 @@ def test_ogr_geom_triangle_ps_tin_conversion():
             wkt_expected = wkt_target
             if (g.GetGeometryType() == ogr.wkbTIN or g.GetGeometryType() == ogr.wkbPolyhedralSurface) and g2.GetGeometryType() == ogr.wkbCurvePolygon:
                 wkt_expected = wkt
-            if got_wkt != wkt_expected:
-                print(wkt, wkt_target, got_wkt, wkt_expected)
-                return 'fail'
+            assert got_wkt == wkt_expected, (wkt, wkt_target, got_wkt, wkt_expected)
 
     g = ogr.ForceTo(ogr.CreateGeometryFromWkt('POLYGON ((0 0,0 1,1 1,1 0,0 0))'), ogr.wkbTriangle)
-    if g.GetGeometryType() != ogr.wkbPolygon:
-        print(g.ExportToWkt())
-        return 'fail'
+    assert g.GetGeometryType() == ogr.wkbPolygon, g.ExportToWkt()
 
     g = ogr.ForceTo(ogr.CreateGeometryFromWkt('POLYHEDRALSURFACE (((0 0,0 1,1 1,1 0,0 0)))'), ogr.wkbTIN)
-    if g.GetGeometryType() != ogr.wkbPolyhedralSurface:
-        print(g.ExportToWkt())
-        return 'fail'
+    assert g.GetGeometryType() == ogr.wkbPolyhedralSurface, g.ExportToWkt()
 
     g = ogr.ForceTo(ogr.CreateGeometryFromWkt('GEOMETRYCOLLECTION (POLYHEDRALSURFACE (((0 0,0 1,1 1,1 0,0 0))))'), ogr.wkbMultiPolygon)
-    if g.ExportToWkt() != 'MULTIPOLYGON (((0 0,0 1,1 1,1 0,0 0)))':
-        print(g.ExportToWkt())
-        return 'fail'
+    assert g.ExportToWkt() == 'MULTIPOLYGON (((0 0,0 1,1 1,1 0,0 0)))'
 
     g = ogr.ForceTo(ogr.CreateGeometryFromWkt('GEOMETRYCOLLECTION (TRIANGLE ((0 0,0 1,1 1,0 0)))'), ogr.wkbMultiPolygon)
-    if g.ExportToWkt() != 'MULTIPOLYGON (((0 0,0 1,1 1,0 0)))':
-        print(g.ExportToWkt())
-        return 'fail'
+    assert g.ExportToWkt() == 'MULTIPOLYGON (((0 0,0 1,1 1,0 0)))'
 
     g = ogr.ForceTo(ogr.CreateGeometryFromWkt('MULTIPOLYGON (((0 0,0 1,1 1,0 0)))'), ogr.wkbGeometryCollection)
-    if g.ExportToWkt() != 'GEOMETRYCOLLECTION (POLYGON ((0 0,0 1,1 1,0 0)))':
-        print(g.ExportToWkt())
-        return 'fail'
+    assert g.ExportToWkt() == 'GEOMETRYCOLLECTION (POLYGON ((0 0,0 1,1 1,0 0)))'
 
     g = ogr.ForceTo(ogr.CreateGeometryFromWkt('TRIANGLE ((0 0,0 1,1 1,0 0))'), ogr.wkbGeometryCollection)
-    if g.ExportToWkt() != 'GEOMETRYCOLLECTION (TRIANGLE ((0 0,0 1,1 1,0 0)))':
-        print(g.ExportToWkt())
-        return 'fail'
+    assert g.ExportToWkt() == 'GEOMETRYCOLLECTION (TRIANGLE ((0 0,0 1,1 1,0 0)))'
 
     g = ogr.ForceTo(ogr.CreateGeometryFromWkt('TIN (((0 0,0 1,1 1,0 0)))'), ogr.wkbGeometryCollection)
-    if g.ExportToWkt() != 'GEOMETRYCOLLECTION (POLYGON ((0 0,0 1,1 1,0 0)))':
-        print(g.ExportToWkt())
-        return 'fail'
+    assert g.ExportToWkt() == 'GEOMETRYCOLLECTION (POLYGON ((0 0,0 1,1 1,0 0)))'
 
     g = ogr.ForceTo(ogr.CreateGeometryFromWkt('POLYHEDRALSURFACE (((0 0,0 1,1 1,0 0)))'), ogr.wkbGeometryCollection)
-    if g.ExportToWkt() != 'GEOMETRYCOLLECTION (POLYGON ((0 0,0 1,1 1,0 0)))':
-        print(g.ExportToWkt())
-        return 'fail'
+    assert g.ExportToWkt() == 'GEOMETRYCOLLECTION (POLYGON ((0 0,0 1,1 1,0 0)))'
 
     return 'success'
 
@@ -3926,15 +3150,11 @@ def test_ogr_geom_multipoint_envelope_bug():
 
     g = ogr.CreateGeometryFromWkt('MULTIPOINT(0 0,1 1)')
     minx, maxx, miny, maxy = g.GetEnvelope()
-    if (minx, maxx, miny, maxy) != (0, 1, 0, 1):
-        print(minx, maxx, miny, maxy)
-        return 'fail'
+    assert (minx, maxx, miny, maxy) == (0, 1, 0, 1)
 
     g = ogr.CreateGeometryFromWkt('MULTIPOINT(0 0 0,1 1 1)')
     minx, maxx, miny, maxy, minz, maxz = g.GetEnvelope3D()
-    if (minx, maxx, miny, maxy, minz, maxz) != (0, 1, 0, 1, 0, 1):
-        print(minx, maxx, miny, maxy, minz, maxz)
-        return 'fail'
+    assert (minx, maxx, miny, maxy, minz, maxz) == (0, 1, 0, 1, 0, 1)
 
     return 'success'
 
@@ -3946,8 +3166,7 @@ def test_ogr_geom_polygon_empty_ring():
     g = ogr.Geometry(ogr.wkbPolygon)
     g2 = ogr.Geometry(ogr.wkbLinearRing)
     g.AddGeometryDirectly(g2)
-    if not g.IsEmpty():
-        return 'fail'
+    assert g.IsEmpty()
 
     return 'success'
 
@@ -3962,10 +3181,8 @@ def test_ogr_geom_polygon_intersects_point():
     poly = ogr.CreateGeometryFromWkt('POLYGON((0 0,5 5,10 0,0 0))')
     point = ogr.Geometry(ogr.wkbPoint)
     point.AddPoint(10, 0)
-    if poly.Intersects(point) != 1:
-        return 'fail'
-    if poly.Contains(point) != 0:
-        return 'fail'
+    assert poly.Intersects(point) == 1
+    assert poly.Contains(point) == 0
 
     return 'success'
 
@@ -3992,9 +3209,7 @@ def test_ogr_geom_geometrycollection():
                 'GEOMETRYCOLLECTION (TIN EMPTY)']
     for wkt in wkt_list:
         g = ogr.CreateGeometryFromWkt(wkt)
-        if g.ExportToWkt() != wkt:
-            print(g.ExportToWkt(), wkt)
-            return 'fail'
+        assert g.ExportToWkt() == wkt
 
     return 'success'
 
@@ -4008,18 +3223,12 @@ def test_ogr_geom_assignspatialref():
     sr = osr.SpatialReference()
     sr.ImportFromEPSG(4326)
     g.AssignSpatialReference(sr)
-    if g.GetGeometryRef(0).GetSpatialReference().ExportToWkt() != sr.ExportToWkt():
-        return 'fail'
-    if g.GetGeometryRef(0).GetGeometryRef(0).GetSpatialReference().ExportToWkt() != sr.ExportToWkt():
-        return 'fail'
-    if g.GetGeometryRef(1).GetSpatialReference().ExportToWkt() != sr.ExportToWkt():
-        return 'fail'
-    if g.GetGeometryRef(1).GetGeometryRef(0).GetSpatialReference().ExportToWkt() != sr.ExportToWkt():
-        return 'fail'
-    if g.GetGeometryRef(2).GetSpatialReference().ExportToWkt() != sr.ExportToWkt():
-        return 'fail'
-    if g.GetGeometryRef(2).GetGeometryRef(0).GetSpatialReference().ExportToWkt() != sr.ExportToWkt():
-        return 'fail'
+    assert g.GetGeometryRef(0).GetSpatialReference().ExportToWkt() == sr.ExportToWkt()
+    assert g.GetGeometryRef(0).GetGeometryRef(0).GetSpatialReference().ExportToWkt() == sr.ExportToWkt()
+    assert g.GetGeometryRef(1).GetSpatialReference().ExportToWkt() == sr.ExportToWkt()
+    assert g.GetGeometryRef(1).GetGeometryRef(0).GetSpatialReference().ExportToWkt() == sr.ExportToWkt()
+    assert g.GetGeometryRef(2).GetSpatialReference().ExportToWkt() == sr.ExportToWkt()
+    assert g.GetGeometryRef(2).GetGeometryRef(0).GetSpatialReference().ExportToWkt() == sr.ExportToWkt()
 
     return 'success'
 
@@ -4030,9 +3239,7 @@ def test_ogr_geom_swapxy():
 
     g = ogr.CreateGeometryFromWkt('GEOMETRYCOLLECTION(POINT(1 2),LINESTRING(1 2,2 3),POLYGON((0 0,0 1,1 1,0 0)),COMPOUNDCURVE(CIRCULARSTRING(0 0,1 1,2 0)),POLYHEDRALSURFACE(((0 0,0 1,1 1,0 0))))')
     g.SwapXY()
-    if g.ExportToWkt() != 'GEOMETRYCOLLECTION (POINT (2 1),LINESTRING (2 1,3 2),POLYGON ((0 0,1 0,1 1,0 0)),COMPOUNDCURVE (CIRCULARSTRING (0 0,1 1,0 2)),POLYHEDRALSURFACE (((0 0,1 0,1 1,0 0))))':
-        print(g)
-        return 'fail'
+    assert g.ExportToWkt() == 'GEOMETRYCOLLECTION (POINT (2 1),LINESTRING (2 1,3 2),POLYGON ((0 0,1 0,1 1,0 0)),COMPOUNDCURVE (CIRCULARSTRING (0 0,1 1,0 2)),POLYHEDRALSURFACE (((0 0,1 0,1 1,0 0))))'
 
     return 'success'
 
@@ -4043,86 +3250,52 @@ def test_ogr_geom_remove_geometry():
 
     # With GEOMETRYCOLLECTION
     g = ogr.CreateGeometryFromWkt('GEOMETRYCOLLECTION (POINT (1 2),LINESTRING (1 2,2 3),POINT (3 4))')
-    if g.RemoveGeometry(3) == 0 or g.RemoveGeometry(-2) == 0:
-        return 'fail'
+    assert not (g.RemoveGeometry(3) == 0 or g.RemoveGeometry(-2) == 0)
 
-    if g.RemoveGeometry(1) != 0:
-        return 'fail'
-    if g.ExportToWkt() != 'GEOMETRYCOLLECTION (POINT (1 2),POINT (3 4))':
-        print(g)
-        return 'fail'
+    assert g.RemoveGeometry(1) == 0
+    assert g.ExportToWkt() == 'GEOMETRYCOLLECTION (POINT (1 2),POINT (3 4))'
 
-    if g.RemoveGeometry(1) != 0:
-        return 'fail'
-    if g.ExportToWkt() != 'GEOMETRYCOLLECTION (POINT (1 2))':
-        print(g)
-        return 'fail'
+    assert g.RemoveGeometry(1) == 0
+    assert g.ExportToWkt() == 'GEOMETRYCOLLECTION (POINT (1 2))'
 
-    if g.RemoveGeometry(0) != 0:
-        return 'fail'
-    if g.ExportToWkt() != 'GEOMETRYCOLLECTION EMPTY':
-        print(g)
-        return 'fail'
+    assert g.RemoveGeometry(0) == 0
+    assert g.ExportToWkt() == 'GEOMETRYCOLLECTION EMPTY'
 
     g = ogr.CreateGeometryFromWkt('GEOMETRYCOLLECTION (POINT (1 2),LINESTRING (1 2,2 3),POINT (3 4))')
-    if g.RemoveGeometry(-1) != 0:
-        return 'fail'
-    if g.ExportToWkt() != 'GEOMETRYCOLLECTION EMPTY':
-        print(g)
-        return 'fail'
+    assert g.RemoveGeometry(-1) == 0
+    assert g.ExportToWkt() == 'GEOMETRYCOLLECTION EMPTY'
 
     # With POLYHEDRALSURFACE/TIN
     g = ogr.CreateGeometryFromWkt('TIN (((0 0,0 1,1 1,0 0)),((0 0,1 0,1 1,0 0)))')
-    if g.RemoveGeometry(2) == 0 or g.RemoveGeometry(-2) == 0:
-        return 'fail'
+    assert not (g.RemoveGeometry(2) == 0 or g.RemoveGeometry(-2) == 0)
 
-    if g.RemoveGeometry(1) != 0:
-        return 'fail'
-    if g.ExportToWkt() != 'TIN (((0 0,0 1,1 1,0 0)))':
-        print(g)
-        return 'fail'
+    assert g.RemoveGeometry(1) == 0
+    assert g.ExportToWkt() == 'TIN (((0 0,0 1,1 1,0 0)))'
 
-    if g.RemoveGeometry(0) != 0:
-        return 'fail'
-    if g.ExportToWkt() != 'TIN EMPTY':
-        print(g)
-        return 'fail'
+    assert g.RemoveGeometry(0) == 0
+    assert g.ExportToWkt() == 'TIN EMPTY'
 
     g = ogr.CreateGeometryFromWkt('TIN (((0 0,0 1,1 1,0 0)),((0 0,1 0,1 1,0 0)))')
-    if g.RemoveGeometry(-1) != 0:
-        return 'fail'
-    if g.ExportToWkt() != 'TIN EMPTY':
-        print(g)
-        return 'fail'
+    assert g.RemoveGeometry(-1) == 0
+    assert g.ExportToWkt() == 'TIN EMPTY'
 
     # With POLYGON
     g = ogr.CreateGeometryFromWkt('POLYGON ((0 0,0 10,10 10,10 0,0 0),(1 1,1 9,9 9,1 1))')
-    if g.RemoveGeometry(2) == 0 or g.RemoveGeometry(-2) == 0:
-        return 'fail'
+    assert not (g.RemoveGeometry(2) == 0 or g.RemoveGeometry(-2) == 0)
 
-    if g.RemoveGeometry(1) != 0:
-        return 'fail'
-    if g.ExportToWkt() != 'POLYGON ((0 0,0 10,10 10,10 0,0 0))':
-        print(g)
-        return 'fail'
+    assert g.RemoveGeometry(1) == 0
+    assert g.ExportToWkt() == 'POLYGON ((0 0,0 10,10 10,10 0,0 0))'
 
-    if g.RemoveGeometry(0) != 0:
-        return 'fail'
-    if g.ExportToWkt() != 'POLYGON EMPTY':
-        print(g)
-        return 'fail'
+    assert g.RemoveGeometry(0) == 0
+    assert g.ExportToWkt() == 'POLYGON EMPTY'
 
     g = ogr.CreateGeometryFromWkt('POLYGON ((0 0,0 10,10 10,10 0,0 0),(1 1,1 9,9 9,1 1))')
-    if g.RemoveGeometry(-1) != 0:
-        return 'fail'
-    if g.ExportToWkt() != 'POLYGON EMPTY':
-        print(g)
-        return 'fail'
+    assert g.RemoveGeometry(-1) == 0
+    assert g.ExportToWkt() == 'POLYGON EMPTY'
 
     # Unsupported type
     g = ogr.CreateGeometryFromWkt('POINT (0 0)')
-    if g.RemoveGeometry(0) == 0:
-        return 'fail'
+    assert g.RemoveGeometry(0) != 0
 
     return 'success'
 
@@ -4154,8 +3327,7 @@ def test_ogr_geom_sfcgal():
 def test_ogr_geom_cannot_add_triangle_to_multisurface():
 
     g = ogr.Geometry(ogr.wkbMultiSurface)
-    if g.AddGeometry(ogr.Geometry(ogr.wkbTriangle)) == 0:
-        return 'fail'
+    assert g.AddGeometry(ogr.Geometry(ogr.wkbTriangle)) != 0
     return 'success'
 
 ###############################################################################
@@ -4164,9 +3336,7 @@ def test_ogr_geom_cannot_add_triangle_to_multisurface():
 def test_ogr_geom_force_polygonzm_to_linestring():
     g = ogr.CreateGeometryFromWkt('POLYGON ZM ((0 0 10 20,0 1 30 40,1 1 50 60,0 0 10 70))')
     wkt = ogr.ForceToLineString(g).ExportToIsoWkt()
-    if wkt != 'LINESTRING ZM (0 0 10 20,0 1 30 40,1 1 50 60,0 0 10 70)':
-        print(wkt)
-        return 'fail'
+    assert wkt == 'LINESTRING ZM (0 0 10 20,0 1 30 40,1 1 50 60,0 0 10 70)'
     return 'success'
 
 ###############################################################################
diff --git a/autotest/ogr/ogr_georss.py b/autotest/ogr/ogr_georss.py
index 9d377624f90b..456170bd9243 100755
--- a/autotest/ogr/ogr_georss.py
+++ b/autotest/ogr/ogr_georss.py
@@ -37,6 +37,7 @@
 from osgeo import ogr
 from osgeo import osr
 from osgeo import gdal
+import pytest
 
 
 def test_ogr_georss_init():
@@ -91,20 +92,16 @@ def ogr_georss_test_atom(filename):
     ds = ogr.Open(filename)
     lyr = ds.GetLayerByName('georss')
 
-    if lyr.GetSpatialRef() is not None:
-        gdaltest.post_reason('No spatial ref expected')
-        return 'fail'
+    assert lyr.GetSpatialRef() is None, 'No spatial ref expected'
 
     feat = lyr.GetNextFeature()
 
     for field_value in gdaltest.atom_field_values:
-        if feat.GetFieldAsString(field_value[0]) != field_value[1]:
-            gdaltest.post_reason('For field "%s", got "%s" instead of "%s"' % (field_value[0], feat.GetFieldAsString(field_value[0]), field_value[1]))
-            return 'fail'
+        assert feat.GetFieldAsString(field_value[0]) == field_value[1], \
+            ('For field "%s", got "%s" instead of "%s"' % (field_value[0], feat.GetFieldAsString(field_value[0]), field_value[1]))
 
-    if feat.GetFieldAsString('content').find('<div xmlns="http://www.w3.org/1999/xhtml">') == -1:
-        gdaltest.post_reason('For field "%s", got "%s"' % ('content', feat.GetFieldAsString('content')))
-        return 'fail'
+    assert feat.GetFieldAsString('content').find('<div xmlns="http://www.w3.org/1999/xhtml">') != -1, \
+        ('For field "%s", got "%s"' % ('content', feat.GetFieldAsString('content')))
 
     return 'success'
 
@@ -147,9 +144,7 @@ def test_ogr_georss_1bis():
         dst_feat.SetField(field_value[0], field_value[1])
     dst_feat.SetField('content', '<div xmlns="http://www.w3.org/1999/xhtml"><p><i>[Update: The Atom draft is finished.]</i></p></div>')
 
-    if lyr.CreateFeature(dst_feat) != 0:
-        gdaltest.post_reason('CreateFeature failed.')
-        return 'fail'
+    assert lyr.CreateFeature(dst_feat) == 0, 'CreateFeature failed.'
 
     ds = None
 
@@ -173,17 +168,15 @@ def ogr_georss_test_rss(filename, only_first_feature):
         return 'skip'
 
     ds = ogr.Open(filename)
-    if ds is None:
-        return 'fail'
+    assert ds is not None
 
     lyr = ds.GetLayer(0)
 
     srs = osr.SpatialReference()
     srs.SetWellKnownGeogCS('WGS84')
 
-    if lyr.GetSpatialRef() is None or not lyr.GetSpatialRef().IsSame(srs):
-        gdaltest.post_reason('SRS is not the one expected.')
-        return 'fail'
+    assert lyr.GetSpatialRef() is not None and lyr.GetSpatialRef().IsSame(srs), \
+        'SRS is not the one expected.'
 
     if lyr.GetSpatialRef().ExportToWkt().find('AXIS["Latitude",NORTH],AXIS["Longitude",EAST]') != -1:
         lyr.GetSpatialRef().ExportToWkt()
@@ -192,49 +185,34 @@ def ogr_georss_test_rss(filename, only_first_feature):
 
     feat = lyr.GetNextFeature()
     expected_wkt = 'POINT (2 49)'
-    if feat.GetGeometryRef().ExportToWkt() != expected_wkt:
-        print(('%s' % feat.GetGeometryRef().ExportToWkt()))
-        return 'fail'
-    if feat.GetFieldAsString('title') != 'A point':
-        return 'fail'
-    if feat.GetFieldAsString('author') != 'Author':
-        return 'fail'
-    if feat.GetFieldAsString('link') != 'http://gdal.org':
-        return 'fail'
-    if feat.GetFieldAsString('pubDate') != '2008/12/07 20:13:00+02':
-        return 'fail'
-    if feat.GetFieldAsString('category') != 'First category':
-        return 'fail'
-    if feat.GetFieldAsString('category_domain') != 'first_domain':
-        return 'fail'
-    if feat.GetFieldAsString('category2') != 'Second category':
-        return 'fail'
-    if feat.GetFieldAsString('category2_domain') != 'second_domain':
-        return 'fail'
+    assert feat.GetGeometryRef().ExportToWkt() == expected_wkt, \
+        ('%s' % feat.GetGeometryRef().ExportToWkt())
+    assert feat.GetFieldAsString('title') == 'A point'
+    assert feat.GetFieldAsString('author') == 'Author'
+    assert feat.GetFieldAsString('link') == 'http://gdal.org'
+    assert feat.GetFieldAsString('pubDate') == '2008/12/07 20:13:00+02'
+    assert feat.GetFieldAsString('category') == 'First category'
+    assert feat.GetFieldAsString('category_domain') == 'first_domain'
+    assert feat.GetFieldAsString('category2') == 'Second category'
+    assert feat.GetFieldAsString('category2_domain') == 'second_domain'
 
     feat = lyr.GetNextFeature()
     expected_wkt = 'LINESTRING (2 48,2.1 48.1,2.2 48.0)'
-    if only_first_feature is False and feat.GetGeometryRef().ExportToWkt() != expected_wkt:
-        print(('%s' % feat.GetGeometryRef().ExportToWkt()))
-        return 'fail'
-    if feat.GetFieldAsString('title') != 'A line':
-        return 'fail'
+    assert only_first_feature is not False or feat.GetGeometryRef().ExportToWkt() == expected_wkt, \
+        ('%s' % feat.GetGeometryRef().ExportToWkt())
+    assert feat.GetFieldAsString('title') == 'A line'
 
     feat = lyr.GetNextFeature()
     expected_wkt = 'POLYGON ((2 50,2.1 50.1,2.2 48.1,2.1 46.1,2 50))'
-    if only_first_feature is False and feat.GetGeometryRef().ExportToWkt() != expected_wkt:
-        print(('%s' % feat.GetGeometryRef().ExportToWkt()))
-        return 'fail'
-    if feat.GetFieldAsString('title') != 'A polygon':
-        return 'fail'
+    assert only_first_feature is not False or feat.GetGeometryRef().ExportToWkt() == expected_wkt, \
+        ('%s' % feat.GetGeometryRef().ExportToWkt())
+    assert feat.GetFieldAsString('title') == 'A polygon'
 
     feat = lyr.GetNextFeature()
     expected_wkt = 'POLYGON ((2 49,2.0 49.5,2.2 49.5,2.2 49.0,2 49))'
-    if only_first_feature is False and feat.GetGeometryRef().ExportToWkt() != expected_wkt:
-        print(('%s' % feat.GetGeometryRef().ExportToWkt()))
-        return 'fail'
-    if feat.GetFieldAsString('title') != 'A box':
-        return 'fail'
+    assert only_first_feature is not False or feat.GetGeometryRef().ExportToWkt() == expected_wkt, \
+        ('%s' % feat.GetGeometryRef().ExportToWkt())
+    assert feat.GetFieldAsString('title') == 'A box'
 
     return 'success'
 
@@ -291,9 +269,7 @@ def ogr_georss_create(filename, options):
     dst_feat.SetField('category2_domain', 'second_domain')
     dst_feat.SetGeometry(ogr.CreateGeometryFromWkt('POINT (2 49)'))
 
-    if lyr.CreateFeature(dst_feat) != 0:
-        gdaltest.post_reason('CreateFeature failed.')
-        return 'fail'
+    assert lyr.CreateFeature(dst_feat) == 0, 'CreateFeature failed.'
 
     dst_feat = ogr.Feature(feature_def=lyr.GetLayerDefn())
     dst_feat.SetField('title', 'A line')
@@ -302,9 +278,7 @@ def ogr_georss_create(filename, options):
     dst_feat.SetField('pubDate', '2008/12/07 20:13:00+02')
     dst_feat.SetGeometry(ogr.CreateGeometryFromWkt('LINESTRING (2 48,2.1 48.1,2.2 48.0)'))
 
-    if lyr.CreateFeature(dst_feat) != 0:
-        gdaltest.post_reason('CreateFeature failed.')
-        return 'fail'
+    assert lyr.CreateFeature(dst_feat) == 0, 'CreateFeature failed.'
 
     dst_feat = ogr.Feature(feature_def=lyr.GetLayerDefn())
     dst_feat.SetField('title', 'A polygon')
@@ -313,9 +287,7 @@ def ogr_georss_create(filename, options):
     dst_feat.SetField('pubDate', '2008/12/07 20:13:00+02')
     dst_feat.SetGeometry(ogr.CreateGeometryFromWkt('POLYGON ((2 50,2.1 50.1,2.2 48.1,2.1 46.1,2 50))'))
 
-    if lyr.CreateFeature(dst_feat) != 0:
-        gdaltest.post_reason('CreateFeature failed.')
-        return 'fail'
+    assert lyr.CreateFeature(dst_feat) == 0, 'CreateFeature failed.'
 
     dst_feat = ogr.Feature(feature_def=lyr.GetLayerDefn())
     dst_feat.SetField('title', 'A box')
@@ -324,9 +296,7 @@ def ogr_georss_create(filename, options):
     dst_feat.SetField('pubDate', '2008/12/07 20:13:00+02')
     dst_feat.SetGeometry(ogr.CreateGeometryFromWkt('POLYGON ((2 49,2.0 49.5,2.2 49.5,2.2 49.0,2 49))'))
 
-    if lyr.CreateFeature(dst_feat) != 0:
-        gdaltest.post_reason('CreateFeature failed.')
-        return 'fail'
+    assert lyr.CreateFeature(dst_feat) == 0, 'CreateFeature failed.'
 
     ds = None
 
@@ -341,9 +311,7 @@ def test_ogr_georss_4():
     ogr_georss_create('tmp/test_rss2.xml', [])
 
     content = open('tmp/test_rss2.xml').read()
-    if content.find('<georss:point>49 2') == -1:
-        print(('%s' % content))
-        return 'fail'
+    assert content.find('<georss:point>49 2') != -1, ('%s' % content)
 
     return 'success'
 
@@ -364,9 +332,8 @@ def test_ogr_georss_6():
     ogr_georss_create('tmp/test_rss2.xml', ['GEOM_DIALECT=GML'])
 
     content = open('tmp/test_rss2.xml').read()
-    if content.find('<georss:where><gml:Point><gml:pos>49 2') == -1:
-        print(('%s' % content))
-        return 'fail'
+    assert content.find('<georss:where><gml:Point><gml:pos>49 2') != -1, \
+        ('%s' % content)
 
     return 'success'
 
@@ -389,9 +356,8 @@ def test_ogr_georss_8():
     ogr_georss_create('tmp/test_rss2.xml', ['GEOM_DIALECT=W3C_GEO'])
 
     content = open('tmp/test_rss2.xml').read()
-    if content.find('<geo:lat>49') == -1 or content.find('<geo:long>2') == -1:
-        print(('%s' % content))
-        return 'fail'
+    assert not (content.find('<geo:lat>49') == -1 or content.find('<geo:long>2') == -1), \
+        ('%s' % content)
 
     return 'success'
 
@@ -423,9 +389,7 @@ def test_ogr_georss_10():
     except:
         lyr = None
     gdal.PopErrorHandler()
-    if lyr is not None:
-        gdaltest.post_reason('should not have accepted EPSG:32631 with GEOM_DIALECT != GML')
-        return 'fail'
+    assert lyr is None, 'should not have accepted EPSG:32631 with GEOM_DIALECT != GML'
 
     ds = None
 
@@ -440,16 +404,13 @@ def test_ogr_georss_10():
     dst_feat = ogr.Feature(feature_def=lyr.GetLayerDefn())
     dst_feat.SetGeometry(ogr.CreateGeometryFromWkt('POINT (500000 4000000)'))
 
-    if lyr.CreateFeature(dst_feat) != 0:
-        gdaltest.post_reason('CreateFeature failed.')
-        return 'fail'
+    assert lyr.CreateFeature(dst_feat) == 0, 'CreateFeature failed.'
 
     ds = None
 
     content = open('tmp/test32631.rss').read()
-    if content.find('<georss:where><gml:Point srsName="urn:ogc:def:crs:EPSG::32631"><gml:pos>500000 4000000') == -1:
-        print(('%s' % content))
-        return 'fail'
+    assert content.find('<georss:where><gml:Point srsName="urn:ogc:def:crs:EPSG::32631"><gml:pos>500000 4000000') != -1, \
+        ('%s' % content)
 
     return 'success'
 
@@ -470,20 +431,17 @@ def test_ogr_georss_11():
     srs = osr.SpatialReference()
     srs.ImportFromEPSG(32631)
 
-    if lyr.GetSpatialRef() is None or not lyr.GetSpatialRef().IsSame(srs):
-        gdaltest.post_reason('SRS is not the one expected.')
-        return 'fail'
+    assert lyr.GetSpatialRef() is not None and lyr.GetSpatialRef().IsSame(srs), \
+        'SRS is not the one expected.'
 
     if lyr.GetSpatialRef().ExportToWkt().find('AXIS["Easting",EAST],AXIS["Northing",NORTH]') == -1:
         print(('%s' % lyr.GetSpatialRef().ExportToWkt()))
-        gdaltest.post_reason('AXIS definition expected is AXIS["Easting",EAST],AXIS["Northing",NORTH]!')
-        return 'fail'
+        pytest.fail('AXIS definition expected is AXIS["Easting",EAST],AXIS["Northing",NORTH]!')
 
     feat = lyr.GetNextFeature()
     expected_wkt = 'POINT (500000 4000000)'
-    if feat.GetGeometryRef().ExportToWkt() != expected_wkt:
-        print(('%s' % feat.GetGeometryRef().ExportToWkt()))
-        return 'fail'
+    assert feat.GetGeometryRef().ExportToWkt() == expected_wkt, \
+        ('%s' % feat.GetGeometryRef().ExportToWkt())
 
     return 'success'
 
@@ -500,24 +458,21 @@ def test_ogr_georss_12():
     gdal.PushErrorHandler('CPLQuietErrorHandler')
     ds = ogr.Open('tmp/broken.rss')
     gdal.PopErrorHandler()
-    if ds is not None:
-        return 'fail'
+    assert ds is None
 
     open('tmp/broken.rss', 'wt').write('<?xml version="1.0"?><rss><channel><item><georss:box>49 2 49.5</georss:box></item></channel></rss>')
     ds = ogr.Open('tmp/broken.rss')
     gdal.PushErrorHandler('CPLQuietErrorHandler')
     feat = ds.GetLayer(0).GetNextFeature()
     gdal.PopErrorHandler()
-    if feat.GetGeometryRef() is not None:
-        return 'fail'
+    assert feat.GetGeometryRef() is None
 
     open('tmp/broken.rss', 'wt').write('<?xml version="1.0"?><rss><channel><item><georss:where><gml:LineString><gml:posList>48 2 48.1 2.1 48</gml:posList></gml:LineString></georss:where></item></channel></rss>')
     ds = ogr.Open('tmp/broken.rss')
     gdal.PushErrorHandler('CPLQuietErrorHandler')
     feat = ds.GetLayer(0).GetNextFeature()
     gdal.PopErrorHandler()
-    if feat.GetGeometryRef() is not None:
-        return 'fail'
+    assert feat.GetGeometryRef() is None
 
     return 'success'
 
@@ -542,22 +497,14 @@ def test_ogr_georss_13():
     dst_feat.SetField('field2', 'val2')
     dst_feat.SetField('ogr_field3', 'val3')
 
-    if lyr.CreateFeature(dst_feat) != 0:
-        gdaltest.post_reason('CreateFeature failed.')
-        return 'fail'
+    assert lyr.CreateFeature(dst_feat) == 0, 'CreateFeature failed.'
 
     ds = None
 
     content = open('tmp/nonstandard.rss').read()
-    if content.find('<myns:field>val</myns:field>') == -1:
-        print(('%s' % content))
-        return 'fail'
-    if content.find('<ogr:field2>val2</ogr:field2>') == -1:
-        print(('%s' % content))
-        return 'fail'
-    if content.find('<ogr:field3>val3</ogr:field3>') == -1:
-        print(('%s' % content))
-        return 'fail'
+    assert content.find('<myns:field>val</myns:field>') != -1, ('%s' % content)
+    assert content.find('<ogr:field2>val2</ogr:field2>') != -1, ('%s' % content)
+    assert content.find('<ogr:field3>val3</ogr:field3>') != -1, ('%s' % content)
 
     return 'success'
 
@@ -575,15 +522,12 @@ def test_ogr_georss_14():
 
     feat = lyr.GetNextFeature()
 
-    if feat.GetFieldAsString('myns_field') != 'val':
-        print(('Expected %s. Got %s' % ('val', feat.GetFieldAsString('myns_field'))))
-        return 'fail'
-    if feat.GetFieldAsString('ogr_field2') != 'val2':
-        print(('Expected %s. Got %s' % ('val2', feat.GetFieldAsString('ogr_field2'))))
-        return 'fail'
-    if feat.GetFieldAsString('ogr_field3') != 'val3':
-        print(('Expected %s. Got %s' % ('val3', feat.GetFieldAsString('ogr_field3'))))
-        return 'fail'
+    assert feat.GetFieldAsString('myns_field') == 'val', \
+        ('Expected %s. Got %s' % ('val', feat.GetFieldAsString('myns_field')))
+    assert feat.GetFieldAsString('ogr_field2') == 'val2', \
+        ('Expected %s. Got %s' % ('val2', feat.GetFieldAsString('ogr_field2')))
+    assert feat.GetFieldAsString('ogr_field3') == 'val3', \
+        ('Expected %s. Got %s' % ('val3', feat.GetFieldAsString('ogr_field3')))
 
     return 'success'
 
@@ -623,9 +567,8 @@ def test_ogr_georss_15():
 
     feat = lyr.GetNextFeature()
 
-    if feat.GetFieldAsString('title') != 'item title':
-        print(('Expected %s. Got %s' % ('item title', feat.GetFieldAsString('title'))))
-        return 'fail'
+    assert feat.GetFieldAsString('title') == 'item title', \
+        ('Expected %s. Got %s' % ('item title', feat.GetFieldAsString('title')))
 
     # Release memory associated to the in-memory file
     gdal.Unlink('/vsimem/georssinmem')
diff --git a/autotest/ogr/ogr_geos.py b/autotest/ogr/ogr_geos.py
index eba53c158d18..cfe3ec335b0a 100755
--- a/autotest/ogr/ogr_geos.py
+++ b/autotest/ogr/ogr_geos.py
@@ -49,8 +49,7 @@ def test_ogr_geos_union():
 
     result = pnt1.Union(pnt2)
 
-    if ogrtest.check_feature_geometry(result, 'MULTIPOINT (10 20,30 20)'):
-        return 'fail'
+    assert not ogrtest.check_feature_geometry(result, 'MULTIPOINT (10 20,30 20)')
 
     return 'success'
 
@@ -68,9 +67,8 @@ def test_ogr_geos_intersection():
 
     result = g1.Intersection(g2)
 
-    if ogrtest.check_feature_geometry(result, 'POLYGON ((0 0,5 5,10 0,0 0))'):
-        gdaltest.post_reason('Got: %s' % result.ExportToWkt())
-        return 'fail'
+    assert not ogrtest.check_feature_geometry(result, 'POLYGON ((0 0,5 5,10 0,0 0))'), \
+        ('Got: %s' % result.ExportToWkt())
 
     return 'success'
 
@@ -88,10 +86,9 @@ def test_ogr_geos_difference():
 
     result = g1.Difference(g2)
 
-    if ogrtest.check_feature_geometry(result,
-                                      'POLYGON ((5 5,10 10,10 0,5 5))'):
-        gdaltest.post_reason('Got: %s' % result.ExportToWkt())
-        return 'fail'
+    assert (not ogrtest.check_feature_geometry(result,
+                                      'POLYGON ((5 5,10 10,10 0,5 5))')), \
+        ('Got: %s' % result.ExportToWkt())
 
     return 'success'
 
@@ -109,10 +106,9 @@ def test_ogr_geos_symmetric_difference():
 
     result = g1.SymmetricDifference(g2)
 
-    if ogrtest.check_feature_geometry(result,
-                                      'MULTIPOLYGON (((5 5,0 0,0 10,5 5)),((5 5,10 10,10 0,5 5)))'):
-        gdaltest.post_reason('Got: %s' % result.ExportToWkt())
-        return 'fail'
+    assert (not ogrtest.check_feature_geometry(result,
+                                      'MULTIPOLYGON (((5 5,0 0,0 10,5 5)),((5 5,10 10,10 0,5 5)))')), \
+        ('Got: %s' % result.ExportToWkt())
 
     return 'success'
 
@@ -130,10 +126,9 @@ def test_ogr_geos_sym_difference():
 
     result = g1.SymDifference(g2)
 
-    if ogrtest.check_feature_geometry(result,
-                                      'MULTIPOLYGON (((5 5,0 0,0 10,5 5)),((5 5,10 10,10 0,5 5)))'):
-        gdaltest.post_reason('Got: %s' % result.ExportToWkt())
-        return 'fail'
+    assert (not ogrtest.check_feature_geometry(result,
+                                      'MULTIPOLYGON (((5 5,0 0,0 10,5 5)),((5 5,10 10,10 0,5 5)))')), \
+        ('Got: %s' % result.ExportToWkt())
 
     return 'success'
 
@@ -151,18 +146,14 @@ def test_ogr_geos_intersect():
 
     result = g1.Intersect(g2)
 
-    if result == 0:
-        gdaltest.post_reason('wrong result (got false)')
-        return 'fail'
+    assert result != 0, 'wrong result (got false)'
 
     g1 = ogr.CreateGeometryFromWkt('LINESTRING(0 0, 10 10)')
     g2 = ogr.CreateGeometryFromWkt('POLYGON((20 20, 20 30, 30 20, 20 20))')
 
     result = g1.Intersect(g2)
 
-    if result != 0:
-        gdaltest.post_reason('wrong result (got true)')
-        return 'fail'
+    assert result == 0, 'wrong result (got true)'
 
     return 'success'
 
@@ -180,18 +171,14 @@ def test_ogr_geos_disjoint():
 
     result = g1.Disjoint(g2)
 
-    if result != 0:
-        gdaltest.post_reason('wrong result (got true)')
-        return 'fail'
+    assert result == 0, 'wrong result (got true)'
 
     g1 = ogr.CreateGeometryFromWkt('LINESTRING(0 0, 10 10)')
     g2 = ogr.CreateGeometryFromWkt('POLYGON((20 20, 20 30, 30 20, 20 20))')
 
     result = g1.Disjoint(g2)
 
-    if result == 0:
-        gdaltest.post_reason('wrong result (got false)')
-        return 'fail'
+    assert result != 0, 'wrong result (got false)'
 
     return 'success'
 
@@ -209,18 +196,14 @@ def test_ogr_geos_touches():
 
     result = g1.Touches(g2)
 
-    if result == 0:
-        gdaltest.post_reason('wrong result (got false)')
-        return 'fail'
+    assert result != 0, 'wrong result (got false)'
 
     g1 = ogr.CreateGeometryFromWkt('LINESTRING(0 0, 10 10)')
     g2 = ogr.CreateGeometryFromWkt('POLYGON((20 20, 20 30, 30 20, 20 20))')
 
     result = g1.Touches(g2)
 
-    if result != 0:
-        gdaltest.post_reason('wrong result (got true)')
-        return 'fail'
+    assert result == 0, 'wrong result (got true)'
 
     return 'success'
 
@@ -238,18 +221,14 @@ def test_ogr_geos_crosses():
 
     result = g1.Crosses(g2)
 
-    if result == 0:
-        gdaltest.post_reason('wrong result (got false)')
-        return 'fail'
+    assert result != 0, 'wrong result (got false)'
 
     g1 = ogr.CreateGeometryFromWkt('LINESTRING(0 0, 10 10)')
     g2 = ogr.CreateGeometryFromWkt('LINESTRING(0 0, 0 10)')
 
     result = g1.Crosses(g2)
 
-    if result != 0:
-        gdaltest.post_reason('wrong result (got true)')
-        return 'fail'
+    assert result == 0, 'wrong result (got true)'
 
     return 'success'
 
@@ -266,15 +245,11 @@ def test_ogr_geos_within():
 
     result = g1.Within(g2)
 
-    if result == 0:
-        gdaltest.post_reason('wrong result (got false)')
-        return 'fail'
+    assert result != 0, 'wrong result (got false)'
 
     result = g2.Within(g1)
 
-    if result != 0:
-        gdaltest.post_reason('wrong result (got true)')
-        return 'fail'
+    assert result == 0, 'wrong result (got true)'
 
     return 'success'
 
@@ -291,15 +266,11 @@ def test_ogr_geos_contains():
 
     result = g2.Contains(g1)
 
-    if result == 0:
-        gdaltest.post_reason('wrong result (got false)')
-        return 'fail'
+    assert result != 0, 'wrong result (got false)'
 
     result = g1.Contains(g2)
 
-    if result != 0:
-        gdaltest.post_reason('wrong result (got true)')
-        return 'fail'
+    assert result == 0, 'wrong result (got true)'
 
     return 'success'
 
@@ -317,18 +288,14 @@ def test_ogr_geos_overlaps():
     result = g2.Overlaps(g1)
 
     # g1 and g2 intersect, but their intersection is equal to g1
-    if result != 0:
-        gdaltest.post_reason('wrong result (got true)')
-        return 'fail'
+    assert result == 0, 'wrong result (got true)'
 
     g1 = ogr.CreateGeometryFromWkt('POLYGON((0 0, 10 10, 10 0, 0 0))')
     g2 = ogr.CreateGeometryFromWkt('POLYGON((0 -5,10 5,10 -5,0 -5))')
 
     result = g2.Overlaps(g1)
 
-    if result == 0:
-        gdaltest.post_reason('wrong result (got false)')
-        return 'fail'
+    assert result != 0, 'wrong result (got false)'
 
     return 'success'
 
@@ -344,10 +311,9 @@ def test_ogr_geos_buffer():
 
     result = g1.Buffer(1.0, 3)
 
-    if ogrtest.check_feature_geometry(result,
-                                      'POLYGON ((0 -1,-0.555570233019607 -0.831469612302542,-0.923879532511288 -0.382683432365087,-0.98078528040323 0.19509032201613,-0.707106781186547 0.707106781186547,9.292893218813452 10.707106781186548,9.690983005625053 10.951056516295154,10.156434465040231 10.987688340595138,10.587785252292473 10.809016994374947,10.891006524188368 10.453990499739547,11 10,11 0,10.866025403784439 -0.5,10.5 -0.866025403784439,10 -1,0 -1))') != 0:
-        gdaltest.post_reason('Got: %s' % result.ExportToWkt())
-        return 'fail'
+    assert (ogrtest.check_feature_geometry(result,
+                                      'POLYGON ((0 -1,-0.555570233019607 -0.831469612302542,-0.923879532511288 -0.382683432365087,-0.98078528040323 0.19509032201613,-0.707106781186547 0.707106781186547,9.292893218813452 10.707106781186548,9.690983005625053 10.951056516295154,10.156434465040231 10.987688340595138,10.587785252292473 10.809016994374947,10.891006524188368 10.453990499739547,11 10,11 0,10.866025403784439 -0.5,10.5 -0.866025403784439,10 -1,0 -1))') == 0), \
+        ('Got: %s' % result.ExportToWkt())
 
     return 'success'
 
@@ -363,19 +329,17 @@ def test_ogr_geos_centroid():
 
     centroid = g1.Centroid()
 
-    if ogrtest.check_feature_geometry(centroid,
-                                      'POINT(6.666666667 3.333333333)') != 0:
-        gdaltest.post_reason('Got: %s' % centroid.ExportToWkt())
-        return 'fail'
+    assert (ogrtest.check_feature_geometry(centroid,
+                                      'POINT(6.666666667 3.333333333)') == 0), \
+        ('Got: %s' % centroid.ExportToWkt())
 
 # Test with a self intersecting polygon too.
 # This particular polygon has two triangles. The right triangle is larger.
     g2 = ogr.CreateGeometryFromWkt('POLYGON((0 0, 0 2, 2 -0.1, 2 2.1, 0 0))')
     centroid2 = g2.Centroid()
 
-    if ogrtest.check_feature_geometry(centroid2, 'POINT (8.0 1.0)') != 0:
-        gdaltest.post_reason('Got: %s' % centroid2.ExportToWkt())
-        return 'fail'
+    assert ogrtest.check_feature_geometry(centroid2, 'POINT (8.0 1.0)') == 0, \
+        ('Got: %s' % centroid2.ExportToWkt())
 
     return 'success'
 
@@ -391,10 +355,9 @@ def test_ogr_geos_centroid_multipolygon():
 
     centroid = g1.Centroid()
 
-    if ogrtest.check_feature_geometry(centroid,
-                                      'POINT (1.5 0.5)') != 0:
-        gdaltest.post_reason('Got: %s' % centroid.ExportToWkt())
-        return 'fail'
+    assert (ogrtest.check_feature_geometry(centroid,
+                                      'POINT (1.5 0.5)') == 0), \
+        ('Got: %s' % centroid.ExportToWkt())
 
     return 'success'
 
@@ -410,9 +373,7 @@ def test_ogr_geos_centroid_point_empty():
 
     centroid = g1.Centroid()
 
-    if centroid.ExportToWkt() != 'POINT EMPTY':
-        gdaltest.post_reason('Got: %s' % centroid.ExportToWkt())
-        return 'fail'
+    assert centroid.ExportToWkt() == 'POINT EMPTY', ('Got: %s' % centroid.ExportToWkt())
 
     return 'success'
 
@@ -429,9 +390,8 @@ def test_ogr_geos_simplify_linestring():
     gdal.ErrorReset()
     simplify = g1.Simplify(5)
 
-    if simplify.ExportToWkt() != 'LINESTRING (0 0,10 0)':
-        gdaltest.post_reason('Got: %s' % simplify.ExportToWkt())
-        return 'fail'
+    assert simplify.ExportToWkt() == 'LINESTRING (0 0,10 0)', \
+        ('Got: %s' % simplify.ExportToWkt())
 
     return 'success'
 
@@ -448,9 +408,8 @@ def test_ogr_geos_simplifypreservetopology_linestring():
     gdal.ErrorReset()
     simplify = g1.SimplifyPreserveTopology(5)
 
-    if simplify.ExportToWkt() != 'LINESTRING (0 0,10 0)':
-        gdaltest.post_reason('Got: %s' % simplify.ExportToWkt())
-        return 'fail'
+    assert simplify.ExportToWkt() == 'LINESTRING (0 0,10 0)', \
+        ('Got: %s' % simplify.ExportToWkt())
 
     return 'success'
 
@@ -467,9 +426,8 @@ def test_ogr_geos_unioncascaded():
     gdal.ErrorReset()
     cascadedunion = g1.UnionCascaded()
 
-    if cascadedunion.ExportToWkt() != 'POLYGON ((0 0,0 1,0.5 1.0,0.5 1.5,1.5 1.5,1.5 0.5,1.0 0.5,1 0,0 0))':
-        gdaltest.post_reason('Got: %s' % cascadedunion.ExportToWkt())
-        return 'fail'
+    assert cascadedunion.ExportToWkt() == 'POLYGON ((0 0,0 1,0.5 1.0,0.5 1.5,1.5 1.5,1.5 0.5,1.0 0.5,1 0,0 0))', \
+        ('Got: %s' % cascadedunion.ExportToWkt())
 
     return 'success'
 
@@ -485,9 +443,8 @@ def test_ogr_geos_convexhull():
 
     convexhull = g1.ConvexHull()
 
-    if convexhull.ExportToWkt() != 'POLYGON ((0 0,0 1,1 1,1 0,0 0))':
-        gdaltest.post_reason('Got: %s' % convexhull.ExportToWkt())
-        return 'fail'
+    assert convexhull.ExportToWkt() == 'POLYGON ((0 0,0 1,1 1,1 0,0 0))', \
+        ('Got: %s' % convexhull.ExportToWkt())
 
     return 'success'
 
@@ -504,9 +461,8 @@ def test_ogr_geos_distance():
 
     distance = g1.Distance(g2)
 
-    if abs(distance - 1) > 0.00000000001:
-        gdaltest.post_reason('Distance() result wrong, got %g.' % distance)
-        return 'fail'
+    assert abs(distance - 1) <= 0.00000000001, \
+        ('Distance() result wrong, got %g.' % distance)
 
     return 'success'
 
@@ -522,8 +478,7 @@ def test_ogr_geos_isring():
 
     isring = g1.IsRing()
 
-    if isring != 1:
-        return 'fail'
+    assert isring == 1
 
     return 'success'
 
@@ -539,8 +494,7 @@ def test_ogr_geos_issimple_true():
 
     isring = g1.IsSimple()
 
-    if isring != 1:
-        return 'fail'
+    assert isring == 1
 
     return 'success'
 
@@ -556,8 +510,7 @@ def test_ogr_geos_issimple_false():
 
     isring = g1.IsSimple()
 
-    if isring != 0:
-        return 'fail'
+    assert isring == 0
 
     return 'success'
 
@@ -573,8 +526,7 @@ def test_ogr_geos_isvalid_true():
 
     isring = g1.IsValid()
 
-    if isring != 1:
-        return 'fail'
+    assert isring == 1
 
     return 'success'
 
@@ -590,8 +542,7 @@ def test_ogr_geos_isvalid_true_linestringM():
 
     isring = g1.IsValid()
 
-    if isring != 1:
-        return 'fail'
+    assert isring == 1
 
     return 'success'
 
@@ -607,8 +558,7 @@ def test_ogr_geos_isvalid_true_circularStringM():
 
     isring = g1.IsValid()
 
-    if isring != 1:
-        return 'fail'
+    assert isring == 1
 
     return 'success'
 
@@ -624,8 +574,7 @@ def test_ogr_geos_isvalid_true_triangle():
 
     isring = g1.IsValid()
 
-    if isring != 1:
-        return 'fail'
+    assert isring == 1
 
     return 'success'
 
@@ -642,8 +591,7 @@ def test_ogr_geos_isvalid_false():
     with gdaltest.error_handler():
         isring = g1.IsValid()
 
-    if isring != 0:
-        return 'fail'
+    assert isring == 0
 
     return 'success'
 
@@ -659,8 +607,7 @@ def test_ogr_geos_pointonsurface():
 
     pointonsurface = g1.PointOnSurface()
 
-    if pointonsurface.Within(g1) != 1:
-        return 'fail'
+    assert pointonsurface.Within(g1) == 1
 
     return 'success'
 
@@ -677,13 +624,11 @@ def test_ogr_geos_DelaunayTriangulation():
     gdal.ErrorReset()
     triangulation = g1.DelaunayTriangulation()
     if triangulation is None:
-        if gdal.GetLastErrorMsg() == '':
-            return 'fail'
+        assert gdal.GetLastErrorMsg() != ''
         return 'skip'
 
-    if triangulation.ExportToWkt() != 'GEOMETRYCOLLECTION (POLYGON ((0 1,0 0,1 0,0 1)),POLYGON ((0 1,1 0,1 1,0 1)))':
-        gdaltest.post_reason('Got: %s' % triangulation.ExportToWkt())
-        return 'fail'
+    assert triangulation.ExportToWkt() == 'GEOMETRYCOLLECTION (POLYGON ((0 1,0 0,1 0,0 1)),POLYGON ((0 1,1 0,1 1,0 1)))', \
+        ('Got: %s' % triangulation.ExportToWkt())
 
     return 'success'
 
@@ -697,21 +642,16 @@ def test_ogr_geos_polygonize():
 
     g = ogr.CreateGeometryFromWkt('MULTILINESTRING((0 0,0 1,1 1),(1 1,0 0))')
     got = g.Polygonize()
-    if got.ExportToWkt() != 'GEOMETRYCOLLECTION (POLYGON ((0 0,0 1,1 1,0 0)))':
-        gdaltest.post_reason('Got: %s' % got.ExportToWkt())
-        return 'fail'
+    assert got.ExportToWkt() == 'GEOMETRYCOLLECTION (POLYGON ((0 0,0 1,1 1,0 0)))', \
+        ('Got: %s' % got.ExportToWkt())
 
     g = ogr.CreateGeometryFromWkt('POINT EMPTY')
     got = g.Polygonize()
-    if got is not None:
-        gdaltest.post_reason('Got: %s' % got.ExportToWkt())
-        return 'fail'
+    assert got is None, ('Got: %s' % got.ExportToWkt())
 
     g = ogr.CreateGeometryFromWkt('GEOMETRYCOLLECTION(POINT EMPTY)')
     got = g.Polygonize()
-    if got is not None:
-        gdaltest.post_reason('Got: %s' % got.ExportToWkt())
-        return 'fail'
+    assert got is None, ('Got: %s' % got.ExportToWkt())
 
     return 'success'
 
diff --git a/autotest/ogr/ogr_gft.py b/autotest/ogr/ogr_gft.py
index f998a4580f4d..ee879e42cb92 100755
--- a/autotest/ogr/ogr_gft.py
+++ b/autotest/ogr/ogr_gft.py
@@ -80,12 +80,10 @@ def test_ogr_gft_read():
     gdal.SetConfigOption('GFT_AUTH', old_auth)
     gdal.SetConfigOption('GFT_ACCESS_TOKEN', old_access)
     gdal.SetConfigOption('GFT_REFRESH_TOKEN', old_refresh)
-    if ds is None:
-        return 'fail'
+    assert ds is not None
 
     lyr = ds.GetLayer(0)
-    if lyr is None:
-        return 'fail'
+    assert lyr is not None
 
     lyr.SetSpatialFilterRect(67, 31.5, 67.5, 32)
     lyr.SetAttributeFilter("'Attack on' = 'ENEMY'")
@@ -100,15 +98,12 @@ def test_ogr_gft_read():
         return 'fail'
 
     sql_lyr = ds.ExecuteSQL("SELECT Latitude, Longitude FROM " + table_id + " WHERE ST_INTERSECTS('Latitude', RECTANGLE(LATLNG(31.5,67.0), LATLNG(32.0,67.5))) AND 'Attack on' = 'ENEMY'")
-    if sql_lyr is None:
-        gdaltest.post_reason('SQL request failed')
-        return 'fail'
+    assert sql_lyr is not None, 'SQL request failed'
     sql_lyr_count = sql_lyr.GetFeatureCount()
     ds.ReleaseResultSet(sql_lyr)
 
-    if sql_lyr_count != count:
-        gdaltest.post_reason('did not get expected feature count. Got %d, expected %d' % (sql_lyr_count, count))
-        return 'fail'
+    assert sql_lyr_count == count, \
+        ('did not get expected feature count. Got %d, expected %d' % (sql_lyr_count, count))
 
     return 'success'
 
@@ -145,15 +140,11 @@ def test_ogr_gft_write():
     expected_wkt = "POLYGON ((0 0,0 1,1 1,1 0),(0.25 0.25,0.25 0.75,0.75 0.75,0.75 0.25))"
     geom = ogr.CreateGeometryFromWkt(expected_wkt)
     feat.SetGeometry(geom)
-    if lyr.CreateFeature(feat) != 0:
-        gdaltest.post_reason('CreateFeature() failed')
-        return 'fail'
+    assert lyr.CreateFeature(feat) == 0, 'CreateFeature() failed'
 
     fid = feat.GetFID()
     feat.SetField('strcol', 'bar')
-    if lyr.SetFeature(feat) != 0:
-        gdaltest.post_reason('SetFeature() failed')
-        return 'fail'
+    assert lyr.SetFeature(feat) == 0, 'SetFeature() failed'
 
     lyr.ResetReading()
     feat = lyr.GetNextFeature()
@@ -168,18 +159,12 @@ def test_ogr_gft_write():
         feat.DumpReadable()
         return 'fail'
     got_wkt = feat.GetGeometryRef().ExportToWkt()
-    if got_wkt != expected_wkt:
-        gdaltest.post_reason('did not get expected geometry')
-        print(got_wkt)
-        return 'fail'
+    assert got_wkt == expected_wkt, 'did not get expected geometry'
 
-    if lyr.GetFeatureCount() != 1:
-        gdaltest.post_reason('GetFeatureCount() did not returned expected value')
-        return 'fail'
+    assert lyr.GetFeatureCount() == 1, \
+        'GetFeatureCount() did not returned expected value'
 
-    if lyr.DeleteFeature(feat.GetFID()) != 0:
-        gdaltest.post_reason('DeleteFeature() failed')
-        return 'fail'
+    assert lyr.DeleteFeature(feat.GetFID()) == 0, 'DeleteFeature() failed'
 
     ds.ExecuteSQL('DELLAYER:%s' % table_name)
 
diff --git a/autotest/ogr/ogr_gml_fgd_read.py b/autotest/ogr/ogr_gml_fgd_read.py
index b1f0b1b6992a..265039d56e36 100755
--- a/autotest/ogr/ogr_gml_fgd_read.py
+++ b/autotest/ogr/ogr_gml_fgd_read.py
@@ -66,28 +66,21 @@ def test_ogr_gml_fgd_1():
     gdaltest.have_gml_fgd_reader = 1
 
     # check number of layers
-    if ds.GetLayerCount() != 1:
-        gdaltest.post_reason('Wrong layer count')
-        return 'fail'
+    assert ds.GetLayerCount() == 1, 'Wrong layer count'
 
     lyr = ds.GetLayer(0)
 
     # check the SRS
     sr = osr.SpatialReference()
     sr.ImportFromEPSG(6668)   # JGD2011
-    if not sr.IsSame(lyr.GetSpatialRef()):
-        gdaltest.post_reason('Wrong SRS')
-        return 'fail'
+    assert sr.IsSame(lyr.GetSpatialRef()), 'Wrong SRS'
 
     # check the first feature
     feat = lyr.GetNextFeature()
-    if ogrtest.check_feature_geometry(feat, 'POINT (133.123456789 34.123456789)'):
-        gdaltest.post_reason('Wrong geometry')
-        return 'fail'
+    assert not ogrtest.check_feature_geometry(feat, 'POINT (133.123456789 34.123456789)'), \
+        'Wrong geometry'
 
-    if feat.GetField('devDate') != '2015-01-07':
-        gdaltest.post_reason('Wrong attribute value')
-        return 'fail'
+    assert feat.GetField('devDate') == '2015-01-07', 'Wrong attribute value'
 
     return 'success'
 
@@ -103,30 +96,22 @@ def test_ogr_gml_fgd_2():
     ds = ogr.Open(_fgd_dir + 'BldA.xml')
 
     # check number of layers
-    if ds.GetLayerCount() != 1:
-        gdaltest.post_reason('Wrong layer count')
-        return 'fail'
+    assert ds.GetLayerCount() == 1, 'Wrong layer count'
 
     lyr = ds.GetLayer(0)
 
     # check the SRS
     sr = osr.SpatialReference()
     sr.ImportFromEPSG(6668)   # JGD2011
-    if not sr.IsSame(lyr.GetSpatialRef()):
-        gdaltest.post_reason('Wrong SRS')
-        return 'fail'
+    assert sr.IsSame(lyr.GetSpatialRef()), 'Wrong SRS'
 
     wkt = 'POLYGON ((139.718509733734 35.6952171397133,139.718444177734 35.6953121947133,139.718496754142 35.6953498949667,139.718550483734 35.6952359447133,139.718509733734 35.6952171397133))'
 
     # check the first feature
     feat = lyr.GetNextFeature()
-    if ogrtest.check_feature_geometry(feat, wkt):
-        gdaltest.post_reason('Wrong geometry')
-        return 'fail'
+    assert not ogrtest.check_feature_geometry(feat, wkt), 'Wrong geometry'
 
-    if feat.GetField('devDate') != '2017-03-07':
-        gdaltest.post_reason('Wrong attribute value')
-        return 'fail'
+    assert feat.GetField('devDate') == '2017-03-07', 'Wrong attribute value'
 
     return 'success'
 
diff --git a/autotest/ogr/ogr_gml_geom.py b/autotest/ogr/ogr_gml_geom.py
index d21a10e89231..f88e5a707dbe 100755
--- a/autotest/ogr/ogr_gml_geom.py
+++ b/autotest/ogr/ogr_gml_geom.py
@@ -58,9 +58,7 @@ def test_gml_geom(unit):
 
     gml = geom_wkt.ExportToGML()
 
-    if gml is None or not gml:
-        gdaltest.post_reason('Conversion to GML failed.')
-        return 'fail'
+    assert gml is not None and gml, 'Conversion to GML failed.'
 
     ######################################################################
     # Create geometry from GML.
@@ -83,10 +81,8 @@ def test_gml_geom(unit):
 def test_gml_space_test():
     gml = '<gml:LineString xmlns:foo="http://bar"><gml:coordinates xmlns:foo="http://bar" decimal="." cs="," ts=" ">189999.99995605,624999.99998375 200000.00005735,624999.99998375 200000.00005735,612499.99997125 195791.3593843,612499.99997125 193327.3749823,612499.99997125 189999.99995605,612499.99997125 189999.99995605,619462.31247125 189999.99995605,624999.99998375 \n</gml:coordinates></gml:LineString>'
     geom = ogr.CreateGeometryFromGML(gml)
-    if geom is None or geom.GetGeometryType() is not ogr.wkbLineString \
-       or geom.GetPointCount() != 8:
-        gdaltest.post_reason('GML not correctly parsed')
-        return 'fail'
+    assert geom is not None and geom.GetGeometryType() is ogr.wkbLineString and geom.GetPointCount() == 8, \
+        'GML not correctly parsed'
 
     return 'success'
 
@@ -100,9 +96,7 @@ def test_gml_pos_point():
 
     geom = ogr.CreateGeometryFromGML(gml)
 
-    if geom.ExportToWkt() != 'POINT (31 29 16)':
-        gdaltest.post_reason('<gml:pos> not correctly parsed')
-        return 'fail'
+    assert geom.ExportToWkt() == 'POINT (31 29 16)', '<gml:pos> not correctly parsed'
 
     return 'success'
 
@@ -135,9 +129,8 @@ def test_gml_pos_polygon():
 
     geom = ogr.CreateGeometryFromGML(gml)
 
-    if geom.ExportToWkt() != 'POLYGON ((0 0,4 0,4 4,0 4,0 0),(1 1,2 1,2 2,1 2,1 1))':
-        gdaltest.post_reason('<gml:Polygon> not correctly parsed')
-        return 'fail'
+    assert geom.ExportToWkt() == 'POLYGON ((0 0,4 0,4 4,0 4,0 0),(1 1,2 1,2 2,1 2,1 1))', \
+        '<gml:Polygon> not correctly parsed'
 
     return 'success'
 
@@ -151,9 +144,8 @@ def test_gml_posList_line():
 
     geom = ogr.CreateGeometryFromGML(gml)
 
-    if geom.ExportToWkt() != 'LINESTRING (31 42,53 64,55 76)':
-        gdaltest.post_reason('<gml:posList> not correctly parsed')
-        return 'fail'
+    assert geom.ExportToWkt() == 'LINESTRING (31 42,53 64,55 76)', \
+        '<gml:posList> not correctly parsed'
 
     return 'success'
 
@@ -167,9 +159,8 @@ def test_gml_posList_line3d():
 
     geom = ogr.CreateGeometryFromGML(gml)
 
-    if geom.ExportToWkt() != 'LINESTRING (31 42 1,53 64 2,55 76 3)':
-        gdaltest.post_reason('<gml:posList> not correctly parsed')
-        return 'fail'
+    assert geom.ExportToWkt() == 'LINESTRING (31 42 1,53 64 2,55 76 3)', \
+        '<gml:posList> not correctly parsed'
 
     return 'success'
 
@@ -184,9 +175,8 @@ def test_gml_posList_line3d_2():
 
     geom = ogr.CreateGeometryFromGML(gml)
 
-    if geom.ExportToWkt() != 'LINESTRING (31 42 1,53 64 2,55 76 3)':
-        gdaltest.post_reason('<gml:posList> not correctly parsed')
-        return 'fail'
+    assert geom.ExportToWkt() == 'LINESTRING (31 42 1,53 64 2,55 76 3)', \
+        '<gml:posList> not correctly parsed'
 
     return 'success'
 
@@ -199,9 +189,8 @@ def test_gml_polygon():
     gml = '<Polygon><exterior><LinearRing><posList>0 0 4 0 4 4 0 4 0 0</posList></LinearRing></exterior><interior xmlns:foo="http://bar"><LinearRing><posList xmlns:foo="http://bar">1 1 2 1 2 2 1 2 1 1</posList></LinearRing></interior></Polygon>'
     geom = ogr.CreateGeometryFromGML(gml)
 
-    if geom.ExportToWkt() != 'POLYGON ((0 0,4 0,4 4,0 4,0 0),(1 1,2 1,2 2,1 2,1 1))':
-        gdaltest.post_reason('<gml:Polygon> not correctly parsed')
-        return 'fail'
+    assert geom.ExportToWkt() == 'POLYGON ((0 0,4 0,4 4,0 4,0 0),(1 1,2 1,2 2,1 2,1 1))', \
+        '<gml:Polygon> not correctly parsed'
 
     return 'success'
 
@@ -239,13 +228,10 @@ def test_gml_out_point_srs():
 
     gml = _CreateGMLWithSRSFromWkt(wkt, 4326)
 
-    if gml is None or not gml:
-        gdaltest.post_reason('Conversion to GML failed.')
-        return 'fail'
+    assert gml is not None and gml, 'Conversion to GML failed.'
 
-    if gml[0:31] != '<gml:Point srsName="EPSG:4326">':
-        gdaltest.post_reason('No srsName attribute in GML output')
-        return 'fail'
+    assert gml[0:31] == '<gml:Point srsName="EPSG:4326">', \
+        'No srsName attribute in GML output'
 
     return 'success'
 
@@ -259,13 +245,10 @@ def test_gml_out_point3d_srs():
 
     gml = _CreateGMLWithSRSFromWkt(wkt, 4326)
 
-    if gml is None or not gml:
-        gdaltest.post_reason('Conversion to GML failed.')
-        return 'fail'
+    assert gml is not None and gml, 'Conversion to GML failed.'
 
-    if gml[0:31] != '<gml:Point srsName="EPSG:4326">':
-        gdaltest.post_reason('No srsName attribute in GML output')
-        return 'fail'
+    assert gml[0:31] == '<gml:Point srsName="EPSG:4326">', \
+        'No srsName attribute in GML output'
 
     return 'success'
 
@@ -279,13 +262,10 @@ def test_gml_out_linestring_srs():
 
     gml = _CreateGMLWithSRSFromWkt(wkt, 4326)
 
-    if gml is None or not gml:
-        gdaltest.post_reason('Conversion to GML failed.')
-        return 'fail'
+    assert gml is not None and gml, 'Conversion to GML failed.'
 
-    if gml[0:36] != '<gml:LineString srsName="EPSG:4326">':
-        gdaltest.post_reason('No srsName attribute in GML output')
-        return 'fail'
+    assert gml[0:36] == '<gml:LineString srsName="EPSG:4326">', \
+        'No srsName attribute in GML output'
 
     return 'success'
 
@@ -299,13 +279,10 @@ def test_gml_out_polygon_srs():
 
     gml = _CreateGMLWithSRSFromWkt(wkt, 4326)
 
-    if gml is None or not gml:
-        gdaltest.post_reason('Conversion to GML failed.')
-        return 'fail'
+    assert gml is not None and gml, 'Conversion to GML failed.'
 
-    if gml[0:33] != '<gml:Polygon srsName="EPSG:4326">':
-        gdaltest.post_reason('No srsName attribute in GML output')
-        return 'fail'
+    assert gml[0:33] == '<gml:Polygon srsName="EPSG:4326">', \
+        'No srsName attribute in GML output'
 
     return 'success'
 
@@ -319,13 +296,10 @@ def test_gml_out_multipoint_srs():
 
     gml = _CreateGMLWithSRSFromWkt(wkt, 4326)
 
-    if gml is None or not gml:
-        gdaltest.post_reason('Conversion to GML failed.')
-        return 'fail'
+    assert gml is not None and gml, 'Conversion to GML failed.'
 
-    if gml[0:36] != '<gml:MultiPoint srsName="EPSG:4326">':
-        gdaltest.post_reason('No srsName attribute in GML output')
-        return 'fail'
+    assert gml[0:36] == '<gml:MultiPoint srsName="EPSG:4326">', \
+        'No srsName attribute in GML output'
 
     return 'success'
 
@@ -339,13 +313,10 @@ def test_gml_out_multilinestring_srs():
 
     gml = _CreateGMLWithSRSFromWkt(wkt, 4326)
 
-    if gml is None or not gml:
-        gdaltest.post_reason('Conversion to GML failed.')
-        return 'fail'
+    assert gml is not None and gml, 'Conversion to GML failed.'
 
-    if gml[0:41] != '<gml:MultiLineString srsName="EPSG:4326">':
-        gdaltest.post_reason('No srsName attribute in GML output')
-        return 'fail'
+    assert gml[0:41] == '<gml:MultiLineString srsName="EPSG:4326">', \
+        'No srsName attribute in GML output'
 
     return 'success'
 
@@ -359,20 +330,14 @@ def test_gml_out_multipolygon_srs():
 
     gml = _CreateGMLWithSRSFromWkt(wkt, 4326)
 
-    if gml is None or not gml:
-        gdaltest.post_reason('Conversion to GML failed.')
-        return 'fail'
+    assert gml is not None and gml, 'Conversion to GML failed.'
 
-    if gml[0:38] != '<gml:MultiPolygon srsName="EPSG:4326">':
-        gdaltest.post_reason('No srsName attribute in GML output')
-        print(gml)
-        return 'fail'
+    assert gml[0:38] == '<gml:MultiPolygon srsName="EPSG:4326">', \
+        'No srsName attribute in GML output'
 
     # Verify we have no other srsName's on subelements.
-    if gml[39:].find('srsName') != -1:
-        gdaltest.post_reason('Got extra srsName attributes on subelements.')
-        print(gml)
-        return 'fail'
+    assert gml[39:].find('srsName') == -1, \
+        'Got extra srsName attributes on subelements.'
 
     return 'success'
 
@@ -386,14 +351,10 @@ def test_gml_out_geometrycollection_srs():
 
     gml = _CreateGMLWithSRSFromWkt(wkt, 4326)
 
-    if gml is None or not gml:
-        gdaltest.post_reason('Conversion to GML failed.')
-        return 'fail'
+    assert gml is not None and gml, 'Conversion to GML failed.'
 
-    if gml[0:39] != '<gml:MultiGeometry srsName="EPSG:4326">':
-        gdaltest.post_reason('No srsName attribute in GML output')
-        print(gml)
-        return 'fail'
+    assert gml[0:39] == '<gml:MultiGeometry srsName="EPSG:4326">', \
+        'No srsName attribute in GML output'
 
     return 'success'
 
@@ -416,10 +377,8 @@ def test_gml_Box():
 
     geom = ogr.CreateGeometryFromGML(gml)
 
-    if geom.ExportToWkt() != 'POLYGON ((1 2 0,3 2 0,3 4 0,1 4 0,1 2 0))':
-        gdaltest.post_reason('<gml:Box> not correctly parsed')
-        print(geom.ExportToWkt())
-        return 'fail'
+    assert geom.ExportToWkt() == 'POLYGON ((1 2 0,3 2 0,3 4 0,1 4 0,1 2 0))', \
+        '<gml:Box> not correctly parsed'
 
     return 'success'
 
@@ -436,10 +395,8 @@ def test_gml_Envelope():
 
     geom = ogr.CreateGeometryFromGML(gml)
 
-    if geom.ExportToWkt() != 'POLYGON ((1 2,3 2,3 4,1 4,1 2))':
-        gdaltest.post_reason('<gml:Envelope> not correctly parsed')
-        print(geom.ExportToWkt())
-        return 'fail'
+    assert geom.ExportToWkt() == 'POLYGON ((1 2,3 2,3 4,1 4,1 2))', \
+        '<gml:Envelope> not correctly parsed'
 
     return 'success'
 
@@ -459,10 +416,8 @@ def test_gml_Curve():
 
     geom = ogr.CreateGeometryFromGML(gml)
 
-    if geom.ExportToWkt() != 'LINESTRING (1 2,3 4)':
-        gdaltest.post_reason('<gml:Curve> not correctly parsed')
-        print(geom.ExportToWkt())
-        return 'fail'
+    assert geom.ExportToWkt() == 'LINESTRING (1 2,3 4)', \
+        '<gml:Curve> not correctly parsed'
 
     return 'success'
 
@@ -487,10 +442,8 @@ def test_gml_Curve_with_pointProperty():
 
     geom = ogr.CreateGeometryFromGML(gml)
 
-    if geom.ExportToWkt() != 'LINESTRING (1 2,3 4)':
-        gdaltest.post_reason('<gml:Curve> not correctly parsed')
-        print(geom.ExportToWkt())
-        return 'fail'
+    assert geom.ExportToWkt() == 'LINESTRING (1 2,3 4)', \
+        '<gml:Curve> not correctly parsed'
 
     return 'success'
 
@@ -515,10 +468,8 @@ def test_gml_MultiCurve():
 
     geom = ogr.CreateGeometryFromGML(gml)
 
-    if geom.ExportToWkt() != 'MULTILINESTRING ((1 2,2 3),(3 4,4 5))':
-        gdaltest.post_reason('<gml:MultiCurve> not correctly parsed')
-        print(geom.ExportToWkt())
-        return 'fail'
+    assert geom.ExportToWkt() == 'MULTILINESTRING ((1 2,2 3),(3 4,4 5))', \
+        '<gml:MultiCurve> not correctly parsed'
 
     return 'success'
 
@@ -598,10 +549,8 @@ def test_gml_MultiSurface():
 
     geom = ogr.CreateGeometryFromGML(gml)
 
-    if geom.ExportToWkt() != 'MULTIPOLYGON (((1 2,3 4,5 6,1 2),(2 3,4 5,6 7,2 3),(3 4,5 6,7 8,3 4)),((4 5,6 7,8 9,4 5)))':
-        gdaltest.post_reason('<gml:MultiSurface> not correctly parsed')
-        print(geom.ExportToWkt())
-        return 'fail'
+    assert geom.ExportToWkt() == 'MULTIPOLYGON (((1 2,3 4,5 6,1 2),(2 3,4 5,6 7,2 3),(3 4,5 6,7 8,3 4)),((4 5,6 7,8 9,4 5)))', \
+        '<gml:MultiSurface> not correctly parsed'
 
     return 'success'
 
@@ -652,10 +601,8 @@ def test_gml_MultiSurface_surfaceMembers():
 
     geom = ogr.CreateGeometryFromGML(gml)
 
-    if geom.ExportToWkt() != 'MULTIPOLYGON (((1 2,3 4,5 6,1 2),(2 3,4 5,6 7,2 3)),((3 4,5 6,7 8,3 4)),((30 40,50 60,70 80,30 40)))':
-        gdaltest.post_reason('<gml:MultiSurface> not correctly parsed')
-        print(geom.ExportToWkt())
-        return 'fail'
+    assert geom.ExportToWkt() == 'MULTIPOLYGON (((1 2,3 4,5 6,1 2),(2 3,4 5,6 7,2 3)),((3 4,5 6,7 8,3 4)),((30 40,50 60,70 80,30 40)))', \
+        '<gml:MultiSurface> not correctly parsed'
 
     return 'success'
 
@@ -675,10 +622,8 @@ def test_gml_MultiCurve_curveMembers():
 
     geom = ogr.CreateGeometryFromGML(gml)
 
-    if geom.ExportToWkt() != 'MULTILINESTRING ((0 0,1 1))':
-        gdaltest.post_reason('<gml:MultiCurve> not correctly parsed')
-        print(geom.ExportToWkt())
-        return 'fail'
+    assert geom.ExportToWkt() == 'MULTILINESTRING ((0 0,1 1))', \
+        '<gml:MultiCurve> not correctly parsed'
 
     return 'success'
 
@@ -697,10 +642,8 @@ def test_gml_MultiGeometry_geometryMembers():
 
     geom = ogr.CreateGeometryFromGML(gml)
 
-    if geom.ExportToWkt() != 'GEOMETRYCOLLECTION (LINESTRING (0 0,1 1))':
-        gdaltest.post_reason('<gml:MultiGeometry> not correctly parsed')
-        print(geom.ExportToWkt())
-        return 'fail'
+    assert geom.ExportToWkt() == 'GEOMETRYCOLLECTION (LINESTRING (0 0,1 1))', \
+        '<gml:MultiGeometry> not correctly parsed'
 
     return 'success'
 
@@ -723,10 +666,8 @@ def test_gml_CompositeCurve_curveMembers():
 
     geom = ogr.CreateGeometryFromGML(gml)
 
-    if geom.ExportToWkt() != 'LINESTRING (0 0,1 1,2 2)':
-        gdaltest.post_reason('<gml:CompositeCurve> not correctly parsed')
-        print(geom.ExportToWkt())
-        return 'fail'
+    assert geom.ExportToWkt() == 'LINESTRING (0 0,1 1,2 2)', \
+        '<gml:CompositeCurve> not correctly parsed'
 
     return 'success'
 
@@ -749,10 +690,8 @@ def test_gml_MultiCurve_pointMembers():
 
     geom = ogr.CreateGeometryFromGML(gml)
 
-    if geom.ExportToWkt() != 'MULTIPOINT (0 0,1 1)':
-        gdaltest.post_reason('<gml:MultiPoint> not correctly parsed')
-        print(geom.ExportToWkt())
-        return 'fail'
+    assert geom.ExportToWkt() == 'MULTIPOINT (0 0,1 1)', \
+        '<gml:MultiPoint> not correctly parsed'
 
     return 'success'
 ###############################################################################
@@ -779,10 +718,8 @@ def test_gml_Solid():
 
     geom = ogr.CreateGeometryFromGML(gml)
 
-    if geom.ExportToWkt() != 'POLYHEDRALSURFACE Z (((1 2 0,3 4 0,5 6 0,1 2 0)))':
-        gdaltest.post_reason('<gml:Solid> not correctly parsed')
-        print(geom.ExportToWkt())
-        return 'fail'
+    assert geom.ExportToWkt() == 'POLYHEDRALSURFACE Z (((1 2 0,3 4 0,5 6 0,1 2 0)))', \
+        '<gml:Solid> not correctly parsed'
 
     return 'success'
 
@@ -808,10 +745,8 @@ def test_gml_OrientableSurface():
 
     geom = ogr.CreateGeometryFromGML(gml)
 
-    if geom.ExportToWkt() != 'POLYGON ((-213.475 24.989 0,-213.475 24.989 8,-215.704 25.077 8,-215.704 25.077 0,-213.475 24.989 0))':
-        gdaltest.post_reason('<gml:OrientableSurface> not correctly parsed')
-        print(geom.ExportToWkt())
-        return 'fail'
+    assert geom.ExportToWkt() == 'POLYGON ((-213.475 24.989 0,-213.475 24.989 8,-215.704 25.077 8,-215.704 25.077 0,-213.475 24.989 0))', \
+        '<gml:OrientableSurface> not correctly parsed'
 
     return 'success'
 
@@ -831,10 +766,8 @@ def test_gml_Triangle():
 
     geom = ogr.CreateGeometryFromGML(gml)
 
-    if geom.ExportToWkt() != 'TRIANGLE ((0 0,0 1,1 1,0 0))':
-        gdaltest.post_reason('<gml:Triangle> not correctly parsed')
-        print(geom.ExportToWkt())
-        return 'fail'
+    assert geom.ExportToWkt() == 'TRIANGLE ((0 0,0 1,1 1,0 0))', \
+        '<gml:Triangle> not correctly parsed'
 
     # check the conversion of Triangle from OGR -> GML
     wkt_original = 'TRIANGLE ((0 0,0 1,0 1,0 0))'
@@ -843,9 +776,8 @@ def test_gml_Triangle():
     gml_string = triangle.ExportToGML(opts)
 
     if gml_string != '<gml:Triangle><gml:exterior><gml:LinearRing><gml:posList>0 0 0 1 0 1 0 0</gml:posList></gml:LinearRing></gml:exterior></gml:Triangle>':
-        gdaltest.post_reason('incorrect conversion from OGR -> GML for OGRTriangle')
         print(geom.ExportToWkt())
-        return 'fail'
+        pytest.fail('incorrect conversion from OGR -> GML for OGRTriangle')
 
     return 'success'
 
@@ -865,10 +797,8 @@ def test_gml_Rectangle():
 
     geom = ogr.CreateGeometryFromGML(gml)
 
-    if geom.ExportToWkt() != 'POLYGON ((0 0,0 1,1 1,1 0,0 0))':
-        gdaltest.post_reason('<gml:Rectangle> not correctly parsed')
-        print(geom.ExportToWkt())
-        return 'fail'
+    assert geom.ExportToWkt() == 'POLYGON ((0 0,0 1,1 1,1 0,0 0))', \
+        '<gml:Rectangle> not correctly parsed'
 
     return 'success'
 
@@ -908,10 +838,8 @@ def test_gml_PolyhedralSurface():
 
     # NOTE - this is actually an invalid PolyhedralSurface
     # need to assert geom.IsValid() == True to determine the validity of the geometry
-    if geom.ExportToWkt() != 'POLYHEDRALSURFACE Z (((1 2 3,4 5 6,7 8 9,1 2 3)),((10 11 12,13 14 15,16 17 18,10 11 12),(19 20 21,22 23 24,25 26 27,19 20 21)))':
-        gdaltest.post_reason('<gml:PolyhedralSurface> not correctly parsed')
-        print(geom.ExportToWkt())
-        return 'fail'
+    assert geom.ExportToWkt() == 'POLYHEDRALSURFACE Z (((1 2 3,4 5 6,7 8 9,1 2 3)),((10 11 12,13 14 15,16 17 18,10 11 12),(19 20 21,22 23 24,25 26 27,19 20 21)))', \
+        '<gml:PolyhedralSurface> not correctly parsed'
 
     # 1 patch and 2 rings
     gml = """<gml:PolyhedralSurface>
@@ -936,10 +864,8 @@ def test_gml_PolyhedralSurface():
 
     # NOTE - this is actually an invalid PolyhedralSurface
     # need to assert geom.IsValid() == True to determine the validity of the geometry
-    if geom.ExportToWkt() != 'POLYHEDRALSURFACE Z (((1 2 3,4 5 6,7 8 9,1 2 3)),((10 11 12,13 14 15,16 17 18,10 11 12)))':
-        gdaltest.post_reason('<gml:PolyhedralSurface> not correctly parsed')
-        print(geom.ExportToWkt())
-        return 'fail'
+    assert geom.ExportToWkt() == 'POLYHEDRALSURFACE Z (((1 2 3,4 5 6,7 8 9,1 2 3)),((10 11 12,13 14 15,16 17 18,10 11 12)))', \
+        '<gml:PolyhedralSurface> not correctly parsed'
 
     # Variations of empty PolyhedralSurface
     gml_strings = ['<gml:PolyhedralSurface></gml:PolyhedralSurface>',
@@ -955,10 +881,8 @@ def test_gml_PolyhedralSurface():
 
     for string in gml_strings:
         geom = ogr.CreateGeometryFromGML(string)
-        if geom.ExportToWkt() != 'POLYHEDRALSURFACE EMPTY':
-            gdaltest.post_reason('Empty <gml:PolyhedralSurface> not correctly parsed')
-            print(geom.ExportToWkt())
-            return 'fail'
+        assert geom.ExportToWkt() == 'POLYHEDRALSURFACE EMPTY', \
+            'Empty <gml:PolyhedralSurface> not correctly parsed'
 
     # Conversion from OGR -> GML
     wkt_original = 'POLYHEDRALSURFACE Z (((0 0 0,0 0 1,0 1 1,0 1 0,0 0 0)),\
@@ -971,15 +895,13 @@ def test_gml_PolyhedralSurface():
     opts = ["FORMAT=GML3"]
     string = ps.ExportToGML(opts)
     if string != '<gml:PolyhedralSurface><gml:polygonPatches><gml:PolygonPatch><gml:exterior><gml:LinearRing><gml:posList srsDimension="3">0 0 0 0 0 1 0 1 1 0 1 0 0 0 0</gml:posList></gml:LinearRing></gml:exterior></gml:PolygonPatch><gml:PolygonPatch><gml:exterior><gml:LinearRing><gml:posList srsDimension="3">0 0 0 0 1 0 1 1 0 1 0 0 0 0 0</gml:posList></gml:LinearRing></gml:exterior></gml:PolygonPatch><gml:PolygonPatch><gml:exterior><gml:LinearRing><gml:posList srsDimension="3">0 0 0 1 0 0 1 0 1 0 0 1 0 0 0</gml:posList></gml:LinearRing></gml:exterior></gml:PolygonPatch><gml:PolygonPatch><gml:exterior><gml:LinearRing><gml:posList srsDimension="3">1 1 0 1 1 1 1 0 1 1 0 0 1 1 0</gml:posList></gml:LinearRing></gml:exterior></gml:PolygonPatch><gml:PolygonPatch><gml:exterior><gml:LinearRing><gml:posList srsDimension="3">0 1 0 0 1 1 1 1 1 1 1 0 0 1 0</gml:posList></gml:LinearRing></gml:exterior></gml:PolygonPatch><gml:PolygonPatch><gml:exterior><gml:LinearRing><gml:posList srsDimension="3">0 0 1 1 0 1 1 1 1 0 1 1 0 0 1</gml:posList></gml:LinearRing></gml:exterior></gml:PolygonPatch></gml:polygonPatches></gml:PolyhedralSurface>':
-        gdaltest.post_reason('incorrect parsing of OGR -> GML for PolyhedralSurface')
         print(geom.ExportToWkt())
-        return 'fail'
+        pytest.fail('incorrect parsing of OGR -> GML for PolyhedralSurface')
 
     g2 = ogr.CreateGeometryFromGML(string)
     if g2.Equals(ps) != 1:
-        gdaltest.post_reason('incorrect round-tripping')
         print(geom.ExportToWkt())
-        return 'fail'
+        pytest.fail('incorrect round-tripping')
 
     # empty geometry
     wkt_original = 'POLYHEDRALSURFACE EMPTY'
@@ -987,9 +909,8 @@ def test_gml_PolyhedralSurface():
     opts = ["FORMAT=GML3"]
     string = ps.ExportToGML(opts)
     if string != '<gml:PolyhedralSurface><gml:polygonPatches></gml:polygonPatches></gml:PolyhedralSurface>':
-        gdaltest.post_reason('incorrect parsing of OGR -> GML for empty PolyhedralSurface')
         print(geom.ExportToWkt())
-        return 'fail'
+        pytest.fail('incorrect parsing of OGR -> GML for empty PolyhedralSurface')
 
     # several polygon patches (and test that non elements such as comments are parsed OK)
     gml = """<gml:PolyhedralSurface>
@@ -1016,10 +937,8 @@ def test_gml_PolyhedralSurface():
             </gml:PolyhedralSurface>"""
 
     geom = ogr.CreateGeometryFromGML(gml)
-    if geom.ExportToWkt() != 'GEOMETRYCOLLECTION (POLYHEDRALSURFACE (((1 2 3,4 5 6,7 8 9,1 2 3))),POLYHEDRALSURFACE (((1 2 3,4 5 6,7 8 9,1 2 3))))':
-        gdaltest.post_reason('<gml:PolyhedralSurface> not correctly parsed')
-        print(geom.ExportToWkt())
-        return 'fail'
+    assert geom.ExportToWkt() == 'GEOMETRYCOLLECTION (POLYHEDRALSURFACE (((1 2 3,4 5 6,7 8 9,1 2 3))),POLYHEDRALSURFACE (((1 2 3,4 5 6,7 8 9,1 2 3))))', \
+        '<gml:PolyhedralSurface> not correctly parsed'
 
     # Test PolyhedralSurface with curve section (which we linearize since the SF PolyhedralSurface doesn't support curves)
     gml = """<gml:PolyhedralSurface>
@@ -1049,10 +968,8 @@ def test_gml_PolyhedralSurface():
             </gml:PolyhedralSurface>"""
 
     geom = ogr.CreateGeometryFromGML(gml)
-    if geom.ExportToWkt().find('POLYHEDRALSURFACE (((0 -1,0 1,') < 0:
-        gdaltest.post_reason('<gml:PolyhedralSurface> not correctly parsed')
-        print(geom.ExportToWkt())
-        return 'fail'
+    assert geom.ExportToWkt().find('POLYHEDRALSURFACE (((0 -1,0 1,') >= 0, \
+        '<gml:PolyhedralSurface> not correctly parsed'
 
     return 'success'
 
@@ -1078,10 +995,8 @@ def test_gml_Tin():
 
     # NOTE - this is actually an invalid TIN surface, as the triangle is incorrect
     # need to assert geom.IsValid() == True to determine the validity of the geometry
-    if geom.ExportToWkt() != 'TIN Z (((0 0 1,0 1 1,1 1 1,1 0 1,0 0 1)))':
-        gdaltest.post_reason('<gml:Tin> not correctly parsed')
-        print(geom.ExportToWkt())
-        return 'fail'
+    assert geom.ExportToWkt() == 'TIN Z (((0 0 1,0 1 1,1 1 1,1 0 1,0 0 1)))', \
+        '<gml:Tin> not correctly parsed'
 
     # Test for gml:TriangulatedSurface
     gml = """<gml:TriangulatedSurface>
@@ -1105,10 +1020,8 @@ def test_gml_Tin():
 
     geom = ogr.CreateGeometryFromGML(gml)
 
-    if geom.ExportToWkt() != 'TIN Z (((0 0 0,0 0 1,0 1 0,0 0 0)),((0 0 0,0 1 0,1 1 0,0 0 0)))':
-        gdaltest.post_reason('<gml:Tin> not correctly parsed')
-        print(geom.ExportToWkt())
-        return 'fail'
+    assert geom.ExportToWkt() == 'TIN Z (((0 0 0,0 0 1,0 1 0,0 0 0)),((0 0 0,0 1 0,1 1 0,0 0 0)))', \
+        '<gml:Tin> not correctly parsed'
 
     # substituting gml:trianglePatches for gml:patches
     gml = """<gml:TriangulatedSurface>
@@ -1132,10 +1045,8 @@ def test_gml_Tin():
 
     geom = ogr.CreateGeometryFromGML(gml)
 
-    if geom.ExportToWkt() != 'TIN Z (((0 0 0,0 0 1,0 1 0,0 0 0)),((0 0 0,0 1 0,1 1 0,0 0 0)))':
-        gdaltest.post_reason('<gml:Tin> not correctly parsed')
-        print(geom.ExportToWkt())
-        return 'fail'
+    assert geom.ExportToWkt() == 'TIN Z (((0 0 0,0 0 1,0 1 0,0 0 0)),((0 0 0,0 1 0,1 1 0,0 0 0)))', \
+        '<gml:Tin> not correctly parsed'
 
     # Part 2 - Create GML File from OGR Geometries
     wkt_original = 'TIN Z (((0 0 0,0 0 1,0 1 0,0 0 0)),((0 0 0,0 1 0,1 1 0,0 0 0)))'
@@ -1145,9 +1056,8 @@ def test_gml_Tin():
     gml_string = tin.ExportToGML(opts)
 
     if gml_string != '<gml:TriangulatedSurface><gml:patches><gml:Triangle><gml:exterior><gml:LinearRing><gml:posList srsDimension="3">0 0 0 0 0 1 0 1 0 0 0 0</gml:posList></gml:LinearRing></gml:exterior></gml:Triangle><gml:Triangle><gml:exterior><gml:LinearRing><gml:posList srsDimension="3">0 0 0 0 1 0 1 1 0 0 0 0</gml:posList></gml:LinearRing></gml:exterior></gml:Triangle></gml:patches></gml:TriangulatedSurface>':
-        gdaltest.post_reason('OGRGeometry::TriangulatedSurface incorrectly converted')
         print(geom.ExportToWkt())
-        return 'fail'
+        pytest.fail('OGRGeometry::TriangulatedSurface incorrectly converted')
 
     return 'success'
 
@@ -1185,13 +1095,9 @@ def test_gml_ConcatenatedDeduplication():
     geom = ogr.CreateGeometryFromGML(gml)
 
     expected_wkt = 'CURVEPOLYGON (COMPOUNDCURVE ((0 -1,0 1),CIRCULARSTRING (0 1,1 0,0 -1)))'
-    if ogrtest.check_feature_geometry(geom, ogr.CreateGeometryFromWkt(expected_wkt)) != 0:
-        print(geom)
-        return 'fail'
+    assert ogrtest.check_feature_geometry(geom, ogr.CreateGeometryFromWkt(expected_wkt)) == 0
 
-    if ogrtest.have_geos() and not geom.IsValid():
-        gdaltest.post_reason('geometry not valid')
-        return 'fail'
+    assert not ogrtest.have_geos() or geom.IsValid(), 'geometry not valid'
 
     return 'success'
 
@@ -1204,18 +1110,12 @@ def gml_out_precision():
     geom = ogr.CreateGeometryFromWkt('POINT(93538.15 1.23456789)')
     expected_gml = '<gml:Point><gml:coordinates>93538.15,1.23456789</gml:coordinates></gml:Point>'
     got_gml = geom.ExportToGML()
-    if got_gml != expected_gml:
-        gdaltest.post_reason('did not get expected gml')
-        print(got_gml)
-        return 'fail'
+    assert got_gml == expected_gml, 'did not get expected gml'
 
     geom = ogr.CreateGeometryFromWkt('POINT(93538.55 1234567.89)')
     expected_gml = '<gml:Point><gml:coordinates>93538.55,1234567.89</gml:coordinates></gml:Point>'
     got_gml = geom.ExportToGML()
-    if got_gml != expected_gml:
-        gdaltest.post_reason('did not get expected gml')
-        print(got_gml)
-        return 'fail'
+    assert got_gml == expected_gml, 'did not get expected gml'
 
     return 'success'
 
@@ -1381,18 +1281,16 @@ def test_gml_invalid_geoms():
         geom = ogr.CreateGeometryFromGML(gml)
         gdal.PopErrorHandler()
         if geom is None:
-            if expected_wkt is not None:
-                gdaltest.post_reason('did not get expected result for %s. Got None instead of %s' % (gml, expected_wkt))
-                return 'fail'
+            assert expected_wkt is None, \
+                ('did not get expected result for %s. Got None instead of %s' % (gml, expected_wkt))
         else:
             wkt = geom.ExportToWkt()
             if expected_wkt is None:
                 gdaltest.post_reason('did not get expected result for %s. Got %s instead of None' % (gml, wkt))
                 return 'fail'
             else:
-                if wkt != expected_wkt:
-                    gdaltest.post_reason('did not get expected result for %s. Got %s instead of %s' % (gml, wkt, expected_wkt))
-                    return 'fail'
+                assert wkt == expected_wkt, \
+                    ('did not get expected result for %s. Got %s instead of %s' % (gml, wkt, expected_wkt))
 
     return 'success'
 
@@ -1422,9 +1320,7 @@ def test_gml_write_gml3_geometries():
             gml_out = geom.ExportToGML(['FORMAT=GML3', 'GML3_LINESTRING_ELEMENT=curve'])
         else:
             gml_out = geom.ExportToGML(['FORMAT=GML3'])
-        if gml_out != gml_in:
-            gdaltest.post_reason('got %s, instead of %s' % (gml_out, gml_in))
-            return 'fail'
+        assert gml_out == gml_in, ('got %s, instead of %s' % (gml_out, gml_in))
 
     return 'success'
 
@@ -1447,63 +1343,49 @@ def test_gml_write_gml3_srs():
     geom.AssignSpatialReference(sr32631)
     gml3 = geom.ExportToGML(options=['FORMAT=GML3'])
     expected_gml = '<gml:Point srsName="urn:ogc:def:crs:EPSG::32631"><gml:pos>500000 4500000</gml:pos></gml:Point>'
-    if gml3 != expected_gml:
-        gdaltest.post_reason('got %s, instead of %s' % (gml3, expected_gml))
-        return 'fail'
+    assert gml3 == expected_gml, ('got %s, instead of %s' % (gml3, expected_gml))
 
     # Should perform the needed coordinate order swapping
     geom = ogr.CreateGeometryFromWkt('POINT(2 49)')
     geom.AssignSpatialReference(srlonglat)
     gml3 = geom.ExportToGML(options=['FORMAT=GML3'])
     expected_gml = '<gml:Point srsName="urn:ogc:def:crs:EPSG::4326"><gml:pos>49 2</gml:pos></gml:Point>'
-    if gml3 != expected_gml:
-        gdaltest.post_reason('got %s, instead of %s' % (gml3, expected_gml))
-        return 'fail'
+    assert gml3 == expected_gml, ('got %s, instead of %s' % (gml3, expected_gml))
 
     # Should not change the coordinate order.
     geom = ogr.CreateGeometryFromWkt('POINT(49 2)')
     geom.AssignSpatialReference(srlatlong)
     gml3 = geom.ExportToGML(options=['FORMAT=GML3'])
     expected_gml = '<gml:Point srsName="urn:ogc:def:crs:EPSG::4326"><gml:pos>49 2</gml:pos></gml:Point>'
-    if gml3 != expected_gml:
-        gdaltest.post_reason('got %s, instead of %s' % (gml3, expected_gml))
-        return 'fail'
+    assert gml3 == expected_gml, ('got %s, instead of %s' % (gml3, expected_gml))
 
     # Legacy SRS format
     geom = ogr.CreateGeometryFromWkt('POINT(2 49)')
     geom.AssignSpatialReference(srlonglat)
     gml3 = geom.ExportToGML(options=['FORMAT=GML3', 'GML3_LONGSRS=NO'])
     expected_gml = '<gml:Point srsName="EPSG:4326"><gml:pos>2 49</gml:pos></gml:Point>'
-    if gml3 != expected_gml:
-        gdaltest.post_reason('got %s, instead of %s' % (gml3, expected_gml))
-        return 'fail'
+    assert gml3 == expected_gml, ('got %s, instead of %s' % (gml3, expected_gml))
 
     # Test SRSNAME_FORMAT=SHORT
     geom = ogr.CreateGeometryFromWkt('POINT(2 49)')
     geom.AssignSpatialReference(srlonglat)
     gml3 = geom.ExportToGML(options=['FORMAT=GML3', 'SRSNAME_FORMAT=SHORT'])
     expected_gml = '<gml:Point srsName="EPSG:4326"><gml:pos>2 49</gml:pos></gml:Point>'
-    if gml3 != expected_gml:
-        gdaltest.post_reason('got %s, instead of %s' % (gml3, expected_gml))
-        return 'fail'
+    assert gml3 == expected_gml, ('got %s, instead of %s' % (gml3, expected_gml))
 
     # Test SRSNAME_FORMAT=SRSNAME_FORMAT
     geom = ogr.CreateGeometryFromWkt('POINT(2 49)')
     geom.AssignSpatialReference(srlonglat)
     gml3 = geom.ExportToGML(options=['FORMAT=GML3', 'SRSNAME_FORMAT=OGC_URN'])
     expected_gml = '<gml:Point srsName="urn:ogc:def:crs:EPSG::4326"><gml:pos>49 2</gml:pos></gml:Point>'
-    if gml3 != expected_gml:
-        gdaltest.post_reason('got %s, instead of %s' % (gml3, expected_gml))
-        return 'fail'
+    assert gml3 == expected_gml, ('got %s, instead of %s' % (gml3, expected_gml))
 
     # Test SRSNAME_FORMAT=OGC_URL
     geom = ogr.CreateGeometryFromWkt('POINT(2 49)')
     geom.AssignSpatialReference(srlonglat)
     gml3 = geom.ExportToGML(options=['FORMAT=GML3', 'SRSNAME_FORMAT=OGC_URL'])
     expected_gml = '<gml:Point srsName="http://www.opengis.net/def/crs/EPSG/0/4326"><gml:pos>49 2</gml:pos></gml:Point>'
-    if gml3 != expected_gml:
-        gdaltest.post_reason('got %s, instead of %s' % (gml3, expected_gml))
-        return 'fail'
+    assert gml3 == expected_gml, ('got %s, instead of %s' % (gml3, expected_gml))
 
     return 'success'
 
@@ -1518,9 +1400,7 @@ def test_gml_nested():
     gml += '</gml:geometryMember></gml:MultiGeometry>' * 31
 
     geom = ogr.CreateGeometryFromGML(gml)
-    if geom is None:
-        gdaltest.post_reason('expected a geometry')
-        return 'fail'
+    assert geom is not None, 'expected a geometry'
 
     gml = '<gml:MultiGeometry><gml:geometryMember>' * 32
     gml += '<gml:MultiPolygon></gml:MultiPolygon>'
@@ -1529,9 +1409,7 @@ def test_gml_nested():
     gdal.PushErrorHandler('CPLQuietErrorHandler')
     geom = ogr.CreateGeometryFromGML(gml)
     gdal.PopErrorHandler()
-    if geom is not None:
-        gdaltest.post_reason('expected None')
-        return 'fail'
+    assert geom is None, 'expected None'
 
     return 'success'
 
@@ -1545,10 +1423,8 @@ def test_gml_SimplePolygon():
 
     geom = ogr.CreateGeometryFromGML(gml)
 
-    if geom.ExportToWkt() != 'POLYGON ((0 0,1 0,1 1,0 1,0 0))':
-        gdaltest.post_reason('<gmlce:SimplePolygon> not correctly parsed')
-        print(geom.ExportToWkt())
-        return 'fail'
+    assert geom.ExportToWkt() == 'POLYGON ((0 0,1 0,1 1,0 1,0 0))', \
+        '<gmlce:SimplePolygon> not correctly parsed'
 
     return 'success'
 
@@ -1562,10 +1438,8 @@ def test_gml_SimpleRectangle():
 
     geom = ogr.CreateGeometryFromGML(gml)
 
-    if geom.ExportToWkt() != 'POLYGON ((0 0,1 0,1 1,0 1,0 0))':
-        gdaltest.post_reason('<gmlce:SimpleRectangle> not correctly parsed')
-        print(geom.ExportToWkt())
-        return 'fail'
+    assert geom.ExportToWkt() == 'POLYGON ((0 0,1 0,1 1,0 1,0 0))', \
+        '<gmlce:SimpleRectangle> not correctly parsed'
 
     return 'success'
 
@@ -1579,10 +1453,8 @@ def test_gml_SimpleTriangle():
 
     geom = ogr.CreateGeometryFromGML(gml)
 
-    if geom.ExportToWkt() != 'TRIANGLE ((0 0,1 0,1 1,0 0))':
-        gdaltest.post_reason('<gmlce:SimpleTriangle> not correctly parsed')
-        print(geom.ExportToWkt())
-        return 'fail'
+    assert geom.ExportToWkt() == 'TRIANGLE ((0 0,1 0,1 1,0 0))', \
+        '<gmlce:SimpleTriangle> not correctly parsed'
 
     return 'success'
 
@@ -1596,10 +1468,8 @@ def test_gml_SimpleMultiPoint():
 
     geom = ogr.CreateGeometryFromGML(gml)
 
-    if geom.ExportToWkt() != 'MULTIPOINT (0 1,2 3)':
-        gdaltest.post_reason('<gmlce:SimpleMultiPoint> not correctly parsed')
-        print(geom.ExportToWkt())
-        return 'fail'
+    assert geom.ExportToWkt() == 'MULTIPOINT (0 1,2 3)', \
+        '<gmlce:SimpleMultiPoint> not correctly parsed'
 
     return 'success'
 
@@ -1656,9 +1526,7 @@ def test_gml_CompositeCurveInRing():
 
     geom = ogr.CreateGeometryFromGML(gml)
 
-    if geom.ExportToWkt() != 'POLYGON ((0 0,0 1,1 1,0 0))':
-        print(geom.ExportToWkt())
-        return 'fail'
+    assert geom.ExportToWkt() == 'POLYGON ((0 0,0 1,1 1,0 0))'
 
     return 'success'
 
@@ -1695,9 +1563,7 @@ def test_gml_CompositeSurface_in_surfaceMembers():
 
     geom = ogr.CreateGeometryFromGML(gml)
 
-    if geom.ExportToWkt() != 'MULTIPOLYGON (((0 0,0 1,1 1,1 0,0 0)),((2 0,2 1,3 1,3 0,2 0)))':
-        print(geom.ExportToWkt())
-        return 'fail'
+    assert geom.ExportToWkt() == 'MULTIPOLYGON (((0 0,0 1,1 1,1 0,0 0)),((2 0,2 1,3 1,3 0,2 0)))'
 
     return 'success'
 
@@ -1751,9 +1617,7 @@ def test_gml_MultiSurfaceOfSurfaceOfPolygonPatchWithInteriorRing():
 
     geom = ogr.CreateGeometryFromGML(gml)
 
-    if geom.ExportToWkt() != 'MULTIPOLYGON (((0 0,0 1,1 1,1 0,0 0),(0.25 0.25,0.25 0.75,0.75 0.75,0.75 0.25,0.25 0.25)),((0 0,0 -1,-1 -1,-1 0,0 0)))':
-        print(geom.ExportToWkt())
-        return 'fail'
+    assert geom.ExportToWkt() == 'MULTIPOLYGON (((0 0,0 1,1 1,1 0,0 0),(0.25 0.25,0.25 0.75,0.75 0.75,0.75 0.25,0.25 0.25)),((0 0,0 -1,-1 -1,-1 0,0 0)))'
 
     return 'success'
 
@@ -1787,9 +1651,8 @@ def test_gml_Coordinates_ts_cs_decimal():
             gdaltest.post_reason('did not get expected result for %s. Got %s instead of None' % (gml, wkt))
             return 'fail'
         else:
-            if wkt != expected_wkt:
-                gdaltest.post_reason('did not get expected result for %s. Got %s instead of %s' % (gml, wkt, expected_wkt))
-                return 'fail'
+            assert wkt == expected_wkt, \
+                ('did not get expected result for %s. Got %s instead of %s' % (gml, wkt, expected_wkt))
 
     return 'success'
 
@@ -1831,9 +1694,8 @@ def test_gml_with_xml_header_and_comments():
             gdaltest.post_reason('did not get expected result for %s. Got %s instead of None' % (gml, wkt))
             return 'fail'
         else:
-            if wkt != expected_wkt:
-                gdaltest.post_reason('did not get expected result for %s. Got %s instead of %s' % (gml, wkt, expected_wkt))
-                return 'fail'
+            assert wkt == expected_wkt, \
+                ('did not get expected result for %s. Got %s instead of %s' % (gml, wkt, expected_wkt))
 
     return 'success'
 
@@ -1859,9 +1721,7 @@ def test_gml_srsDimension_topgeometry():
 
     geom = ogr.CreateGeometryFromGML(gml)
 
-    if geom.ExportToWkt() != 'POLYGON ((0 0 10,0 1 10,1 1 10,1 0 10,0 0 10))':
-        print(geom.ExportToWkt())
-        return 'fail'
+    assert geom.ExportToWkt() == 'POLYGON ((0 0 10,0 1 10,1 1 10,1 0 10,0 0 10))'
 
     return 'success'
 
@@ -1874,20 +1734,14 @@ def test_gml_Arc():
     gml = "<gml:Arc><gml:posList>1 0 0 1 -1 0</gml:posList></gml:Arc>"
     geom = ogr.CreateGeometryFromGML(gml)
 
-    if ogrtest.check_feature_geometry(geom, ogr.CreateGeometryFromWkt('CIRCULARSTRING (1 0,0 1,-1 0)')) != 0:
-        print(geom)
-        return 'fail'
+    assert ogrtest.check_feature_geometry(geom, ogr.CreateGeometryFromWkt('CIRCULARSTRING (1 0,0 1,-1 0)')) == 0
 
     gml2 = geom.ExportToGML(['FORMAT=GML3'])
     expected_gml2 = '<gml:Curve><gml:segments><gml:ArcString><gml:posList>1 0 0 1 -1 0</gml:posList></gml:ArcString></gml:segments></gml:Curve>'
-    if gml2 != expected_gml2:
-        print(gml2)
-        return 'fail'
+    assert gml2 == expected_gml2
 
     geom2 = ogr.CreateGeometryFromGML(gml2)
-    if not geom.Equals(geom2):
-        print(geom2)
-        return 'fail'
+    assert geom.Equals(geom2)
 
     return 'success'
 
@@ -1900,9 +1754,7 @@ def test_gml_ArcByBulge():
     gml = "<gml:ArcByBulge><gml:posList>2 0 -2 0</gml:posList><gml:bulge>2</gml:bulge><gml:normal>-1</gml:normal></gml:ArcByBulge>"
     geom = ogr.CreateGeometryFromGML(gml)
 
-    if ogrtest.check_feature_geometry(geom, ogr.CreateGeometryFromWkt('CIRCULARSTRING (2 0,0 2,-2 0)')) != 0:
-        print(geom)
-        return 'fail'
+    assert ogrtest.check_feature_geometry(geom, ogr.CreateGeometryFromWkt('CIRCULARSTRING (2 0,0 2,-2 0)')) == 0
 
     return 'success'
 
@@ -1915,9 +1767,7 @@ def test_gml_ArcByCenterPoint():
     gml = "<gml:ArcByCenterPoint><gml:pos>1 2</gml:pos><gml:radius>2</gml:radius><gml:startAngle>90</gml:startAngle><gml:endAngle>270</gml:endAngle></gml:ArcByCenterPoint>"
     geom = ogr.CreateGeometryFromGML(gml)
 
-    if ogrtest.check_feature_geometry(geom, ogr.CreateGeometryFromWkt('CIRCULARSTRING (1 4,-1 2,1 0)')) != 0:
-        print(geom)
-        return 'fail'
+    assert ogrtest.check_feature_geometry(geom, ogr.CreateGeometryFromWkt('CIRCULARSTRING (1 4,-1 2,1 0)')) == 0
 
     return 'success'
 
@@ -1977,9 +1827,7 @@ def test_gml_CompoundCurve_of_ArcByCenterPoint():
 </Surface>"""
     geom = ogr.CreateGeometryFromGML(gml)
 
-    if ogrtest.check_feature_geometry(geom, ogr.CreateGeometryFromWkt('POLYGON ((-80.4 33.86,-80.27 33.63,-80.305028054229538 33.622017309598967,-80.335422529369936 33.613343178471617,-80.366464292754429 33.606448070493634,-80.398003921948742 33.601365147653873,-80.429889693662162 33.598118851265042,-80.461968286017793 33.596724788982847,-80.494085487001527 33.597189662699385,-80.52608690656875 33.599511237590342,-80.557818688893789 33.603678352435914,-80.589128223167393 33.609670971175497,-80.619864849221443 33.617460275496377,-80.63 33.62,-80.39 33.85))')) != 0:
-        print(geom)
-        return 'fail'
+    assert ogrtest.check_feature_geometry(geom, ogr.CreateGeometryFromWkt('POLYGON ((-80.4 33.86,-80.27 33.63,-80.305028054229538 33.622017309598967,-80.335422529369936 33.613343178471617,-80.366464292754429 33.606448070493634,-80.398003921948742 33.601365147653873,-80.429889693662162 33.598118851265042,-80.461968286017793 33.596724788982847,-80.494085487001527 33.597189662699385,-80.52608690656875 33.599511237590342,-80.557818688893789 33.603678352435914,-80.589128223167393 33.609670971175497,-80.619864849221443 33.617460275496377,-80.63 33.62,-80.39 33.85))')) == 0
 
     return 'success'
 
@@ -1992,9 +1840,7 @@ def test_gml_CircleByCenterPoint():
     gml = "<gml:CircleByCenterPoint><gml:pos>1 2</gml:pos><gml:radius>2</gml:radius></gml:CircleByCenterPoint>"
     geom = ogr.CreateGeometryFromGML(gml)
 
-    if ogrtest.check_feature_geometry(geom, ogr.CreateGeometryFromWkt('CIRCULARSTRING (-1 2,3 2,-1 2)')) != 0:
-        print(geom)
-        return 'fail'
+    assert ogrtest.check_feature_geometry(geom, ogr.CreateGeometryFromWkt('CIRCULARSTRING (-1 2,3 2,-1 2)')) == 0
 
     return 'success'
 
@@ -2011,28 +1857,20 @@ def test_gml_Circle():
     geom = ogr.CreateGeometryFromGML(gml)
 
     expected_wkt = 'CIRCULARSTRING (-1 0,0 1,-0.707106781186547 -0.707106781186548,-0.923879532511287 -0.38268343236509,-1 0)'
-    if ogrtest.check_feature_geometry(geom, ogr.CreateGeometryFromWkt(expected_wkt)) != 0:
-        print(geom)
-        return 'fail'
+    assert ogrtest.check_feature_geometry(geom, ogr.CreateGeometryFromWkt(expected_wkt)) == 0
 
     geom = ogr.CreateGeometryFromWkt('CIRCULARSTRING (0 0,2 0,0 0)')
     gml2 = geom.ExportToGML(['FORMAT=GML3'])
     expected_gml2 = '<gml:Curve><gml:segments><gml:Circle><gml:posList>0 0 1 1 2 0</gml:posList></gml:Circle></gml:segments></gml:Curve>'
-    if gml2 != expected_gml2:
-        print(gml2)
-        return 'fail'
+    assert gml2 == expected_gml2
 
     geom2 = ogr.CreateGeometryFromGML(gml2)
-    if geom2.ExportToWkt() != 'CIRCULARSTRING (0 0,1 1,2 0,1 -1,0 0)':
-        print(geom2)
-        return 'fail'
+    assert geom2.ExportToWkt() == 'CIRCULARSTRING (0 0,1 1,2 0,1 -1,0 0)'
 
     geom = ogr.CreateGeometryFromWkt('CIRCULARSTRING (0 0 10,2 0 10,0 0 10)')
     gml2 = geom.ExportToGML(['FORMAT=GML3'])
     expected_gml2 = '<gml:Curve><gml:segments><gml:Circle><gml:posList srsDimension="3">0 0 10 1 1 10 2 0 10</gml:posList></gml:Circle></gml:segments></gml:Curve>'
-    if gml2 != expected_gml2:
-        print(gml2)
-        return 'fail'
+    assert gml2 == expected_gml2
 
     gml = """<gml:PolygonPatch>
                 <gml:exterior>
@@ -2053,9 +1891,7 @@ def test_gml_Circle():
     geom = ogr.CreateGeometryFromGML(gml)
 
     expected_wkt = 'CURVEPOLYGON ( CIRCULARSTRING (-1 0,0 1,-0.707106781186547 -0.707106781186548,-0.923879532511287 -0.38268343236509,-1 0))'
-    if ogrtest.check_feature_geometry(geom, ogr.CreateGeometryFromWkt(expected_wkt)) != 0:
-        print(geom)
-        return 'fail'
+    assert ogrtest.check_feature_geometry(geom, ogr.CreateGeometryFromWkt(expected_wkt)) == 0
 
     return 'success'
 
@@ -2067,26 +1903,18 @@ def test_gml_ArcString():
 
     gml = """<gml:ArcString><gml:posList srsDimension="2">-2 0 -1 -1 0 0</gml:posList></gml:ArcString>"""
     geom = ogr.CreateGeometryFromGML(gml)
-    if geom.ExportToWkt() != 'CIRCULARSTRING (-2 0,-1 -1,0 0)':
-        print(geom.ExportToWkt())
-        return 'fail'
+    assert geom.ExportToWkt() == 'CIRCULARSTRING (-2 0,-1 -1,0 0)'
 
     gml = """<gml:ArcString><gml:posList srsDimension="2">-2 0 -1 -1 0 0 1 -1 2 0 0 2 -2 0</gml:posList></gml:ArcString>"""
     geom = ogr.CreateGeometryFromGML(gml)
-    if geom.ExportToWkt() != 'CIRCULARSTRING (-2 0,-1 -1,0 0,1 -1,2 0,0 2,-2 0)':
-        print(geom.ExportToWkt())
-        return 'fail'
+    assert geom.ExportToWkt() == 'CIRCULARSTRING (-2 0,-1 -1,0 0,1 -1,2 0,0 2,-2 0)'
 
     gml2 = geom.ExportToGML(['FORMAT=GML3'])
     expected_gml2 = '<gml:Curve><gml:segments><gml:ArcString><gml:posList>-2 0 -1 -1 0 0 1 -1 2 0 0 2 -2 0</gml:posList></gml:ArcString></gml:segments></gml:Curve>'
-    if gml2 != expected_gml2:
-        print(gml2)
-        return 'fail'
+    assert gml2 == expected_gml2
 
     geom2 = ogr.CreateGeometryFromGML(gml2)
-    if geom2.ExportToWkt() != 'CIRCULARSTRING (-2 0,-1 -1,0 0,1 -1,2 0,0 2,-2 0)':
-        print(geom2)
-        return 'fail'
+    assert geom2.ExportToWkt() == 'CIRCULARSTRING (-2 0,-1 -1,0 0,1 -1,2 0,0 2,-2 0)'
 
     return 'success'
 
@@ -2100,30 +1928,21 @@ def test_gml_OGRCompoundCurve():
     geom = ogr.CreateGeometryFromWkt(wkt)
     gml = geom.ExportToGML(['FORMAT=GML3'])
     expected_gml = '<gml:CompositeCurve><gml:curveMember><gml:LineString><gml:posList>0 0 1 1 2 0</gml:posList></gml:LineString></gml:curveMember></gml:CompositeCurve>'
-    if gml != expected_gml:
-        print(gml)
-        return 'fail'
+    assert gml == expected_gml
 
     # CompositeCurve of LineStringSegment
     gml = expected_gml
     geom = ogr.CreateGeometryFromGML(gml)
     # We simplify it in LINESTRING
-    if geom.ExportToWkt() != 'LINESTRING (0 0,1 1,2 0)':
-        # if geom.ExportToWkt() != wkt
-        print(geom.ExportToWkt())
-        return 'fail'
+    assert geom.ExportToWkt() == 'LINESTRING (0 0,1 1,2 0)'
 
     # CompositeCurve of Arc
     gml = """<gml:CompositeCurve><gml:curveMember><gml:Curve><gml:segments><gml:ArcString><gml:posList>0 0 1 1 2 0</gml:posList></gml:ArcString></gml:segments></gml:Curve></gml:curveMember></gml:CompositeCurve>"""
     geom = ogr.CreateGeometryFromGML(gml)
-    if geom.ExportToWkt() != 'COMPOUNDCURVE (CIRCULARSTRING (0 0,1 1,2 0))':
-        print(geom.ExportToWkt())
-        return 'fail'
+    assert geom.ExportToWkt() == 'COMPOUNDCURVE (CIRCULARSTRING (0 0,1 1,2 0))'
 
     gml2 = geom.ExportToGML(['FORMAT=GML3'])
-    if gml2 != gml:
-        print(gml2)
-        return 'fail'
+    assert gml2 == gml
 
     # CompositeCurve of 3 arcs
     gml = """<gml:CompositeCurve>
@@ -2132,9 +1951,7 @@ def test_gml_OGRCompoundCurve():
     <gml:curveMember><gml:Curve><gml:segments><gml:Arc><gml:posList>4 0 5 1 6 0</gml:posList></gml:Arc></gml:segments></gml:Curve></gml:curveMember>
     </gml:CompositeCurve>"""
     geom = ogr.CreateGeometryFromGML(gml)
-    if geom.ExportToWkt() != 'COMPOUNDCURVE (CIRCULARSTRING (0 0,1 1,2 0),CIRCULARSTRING (2 0,3 1,4 0),CIRCULARSTRING (4 0,5 1,6 0))':
-        print(geom.ExportToWkt())
-        return 'fail'
+    assert geom.ExportToWkt() == 'COMPOUNDCURVE (CIRCULARSTRING (0 0,1 1,2 0),CIRCULARSTRING (2 0,3 1,4 0),CIRCULARSTRING (4 0,5 1,6 0))'
 
     # Alternative syntax : Curve with 3 Arc segments
     gml = """<gml:Curve><gml:segments>
@@ -2143,9 +1960,7 @@ def test_gml_OGRCompoundCurve():
             <gml:Arc><gml:posList>4 0 5 1 6 0</gml:posList></gml:Arc>
             </gml:segments></gml:Curve>"""
     geom = ogr.CreateGeometryFromGML(gml)
-    if geom.ExportToWkt() != 'COMPOUNDCURVE (CIRCULARSTRING (0 0,1 1,2 0),CIRCULARSTRING (2 0,3 1,4 0),CIRCULARSTRING (4 0,5 1,6 0))':
-        print(geom.ExportToWkt())
-        return 'fail'
+    assert geom.ExportToWkt() == 'COMPOUNDCURVE (CIRCULARSTRING (0 0,1 1,2 0),CIRCULARSTRING (2 0,3 1,4 0),CIRCULARSTRING (4 0,5 1,6 0))'
 
     # Curve with LineStringSegment and Arc segments
     gml = """<gml:Curve><gml:segments>
@@ -2153,9 +1968,7 @@ def test_gml_OGRCompoundCurve():
             <gml:LineStringSegment><gml:posList>0 0 -1 0 0 0</gml:posList></gml:LineStringSegment>
             </gml:segments></gml:Curve>"""
     geom = ogr.CreateGeometryFromGML(gml)
-    if geom.ExportToWkt() != 'COMPOUNDCURVE (CIRCULARSTRING (0 0,1 0,0 0),(0 0,-1 0,0 0))':
-        print(geom.ExportToWkt())
-        return 'fail'
+    assert geom.ExportToWkt() == 'COMPOUNDCURVE (CIRCULARSTRING (0 0,1 0,0 0),(0 0,-1 0,0 0))'
 
     # Composite curve of a LineString and a (Composite) Curve with an Arc and a LineString
     gml = """<gml:CompositeCurve>
@@ -2168,9 +1981,7 @@ def test_gml_OGRCompoundCurve():
     </gml:curveMember>
     </gml:CompositeCurve>"""
     geom = ogr.CreateGeometryFromGML(gml)
-    if geom.ExportToWkt() != 'COMPOUNDCURVE ((0 0,1 0,0 0),CIRCULARSTRING (0 0,1 0,0 0),(0 0,-1 0,0 0))':
-        print(geom.ExportToWkt())
-        return 'fail'
+    assert geom.ExportToWkt() == 'COMPOUNDCURVE ((0 0,1 0,0 0),CIRCULARSTRING (0 0,1 0,0 0),(0 0,-1 0,0 0))'
 
     return 'success'
 
@@ -2183,44 +1994,33 @@ def test_gml_OGRCurvePolygon():
     # Test one CircularString
     gml = """<gml:Polygon><gml:exterior><gml:Ring><gml:curveMember><gml:Arc><gml:posList>0 0 1 0 0 0</gml:posList></gml:Arc></gml:curveMember></gml:Ring></gml:exterior></gml:Polygon>"""
     geom = ogr.CreateGeometryFromGML(gml)
-    if geom.ExportToWkt() != 'CURVEPOLYGON (CIRCULARSTRING (0 0,1 0,0 0))':
-        print(geom.ExportToWkt())
-        return 'fail'
+    assert geom.ExportToWkt() == 'CURVEPOLYGON (CIRCULARSTRING (0 0,1 0,0 0))'
 
     gml2 = geom.ExportToGML(['FORMAT=GML3'])
     expected_gml2 = '<gml:Polygon><gml:exterior><gml:Curve><gml:segments><gml:Circle><gml:posList>0 0 0.5 0.5 1 0</gml:posList></gml:Circle></gml:segments></gml:Curve></gml:exterior></gml:Polygon>'
-    if gml2 != expected_gml2:
-        print(gml2)
-        return 'fail'
+    assert gml2 == expected_gml2
 
     # Test two CircularString
     gml = """<gml:Polygon><gml:exterior><gml:Ring><gml:curveMember><gml:Arc><gml:posList>0 0 1 0 0 0</gml:posList></gml:Arc></gml:curveMember></gml:Ring></gml:exterior><gml:interior><gml:Ring><gml:curveMember><gml:Arc><gml:posList>0.25 0 0.75 0 0.25 0</gml:posList></gml:Arc></gml:curveMember></gml:Ring></gml:interior></gml:Polygon>"""
     geom = ogr.CreateGeometryFromGML(gml)
-    if geom.ExportToWkt() != 'CURVEPOLYGON (CIRCULARSTRING (0 0,1 0,0 0),CIRCULARSTRING (0.25 0.0,0.75 0.0,0.25 0.0))':
-        print(geom.ExportToWkt())
-        return 'fail'
+    assert geom.ExportToWkt() == 'CURVEPOLYGON (CIRCULARSTRING (0 0,1 0,0 0),CIRCULARSTRING (0.25 0.0,0.75 0.0,0.25 0.0))'
 
     # Test a LinearRing followed by a CircularString
     gml = """<gml:Polygon><gml:exterior><gml:LinearRing><gml:posList>-2 -2 -2 2 2 2 2 -2 -2 -2</gml:posList></gml:LinearRing></gml:exterior><gml:interior><gml:Ring><gml:curveMember><gml:Arc><gml:posList>0.25 0 0.75 0 0.25 0</gml:posList></gml:Arc></gml:curveMember></gml:Ring></gml:interior></gml:Polygon>"""
     geom = ogr.CreateGeometryFromGML(gml)
-    if geom.ExportToWkt() != 'CURVEPOLYGON ((-2 -2,-2 2,2 2,2 -2,-2 -2),CIRCULARSTRING (0.25 0.0,0.75 0.0,0.25 0.0))':
-        print(geom.ExportToWkt())
-        return 'fail'
+    assert geom.ExportToWkt() == 'CURVEPOLYGON ((-2 -2,-2 2,2 2,2 -2,-2 -2),CIRCULARSTRING (0.25 0.0,0.75 0.0,0.25 0.0))'
 
     # Test a CircularString followed by a LinearRing
     gml = """<gml:Polygon><gml:exterior><gml:Ring><gml:curveMember><gml:Circle><gml:posList>-1 0 1 2 3 0</gml:posList></gml:Circle></gml:curveMember></gml:Ring></gml:exterior><gml:interior><gml:LinearRing><gml:posList>-2 -2 -2 2 2 2 2 -2 -2 -2</gml:posList></gml:LinearRing></gml:interior></gml:Polygon>"""
     geom = ogr.CreateGeometryFromGML(gml)
-    if ogrtest.check_feature_geometry(geom, 'CURVEPOLYGON (CIRCULARSTRING (-1 0,1 2,3 0,1.0 -2.0,-1 0),(-2 -2,-2 2,2 2,2 -2,-2 -2))') != 0:
-        print(geom.ExportToWkt())
-        return 'fail'
+    assert ogrtest.check_feature_geometry(geom, 'CURVEPOLYGON (CIRCULARSTRING (-1 0,1 2,3 0,1.0 -2.0,-1 0),(-2 -2,-2 2,2 2,2 -2,-2 -2))') == 0, \
+        geom.ExportToWkt()
 
     gml2 = geom.ExportToGML(['FORMAT=GML3'])
     geom2 = ogr.CreateGeometryFromGML(gml)
     expected_gml2 = '<gml:Polygon><gml:exterior><gml:Curve><gml:segments><gml:ArcString><gml:posList>-1 0 1 2 3 0 1 -2 -1 0</gml:posList></gml:ArcString></gml:segments></gml:Curve></gml:exterior><gml:interior><gml:LineString><gml:posList>-2 -2 -2 2 2 2 2 -2 -2 -2</gml:posList></gml:LineString></gml:interior></gml:Polygon>'
     expected_geom2 = ogr.CreateGeometryFromGML(expected_gml2)
-    if ogrtest.check_feature_geometry(geom2, expected_geom2) != 0:
-        print(gml2)
-        return 'fail'
+    assert ogrtest.check_feature_geometry(geom2, expected_geom2) == 0, gml2
 
     return 'success'
 
@@ -2246,10 +2046,8 @@ def test_gml_OGRMultiSurface():
 </gml:MultiSurface>"""
 
     geom = ogr.CreateGeometryFromGML(gml)
-    if geom.ExportToWkt() != 'MULTISURFACE (CURVEPOLYGON (CIRCULARSTRING (0 0,1 1,1 -1,0.292893218813453 -0.707106781186548,0 0)))':
-        gdaltest.post_reason('<gml:MultiSurface> not correctly parsed')
-        print(geom.ExportToWkt())
-        return 'fail'
+    assert geom.ExportToWkt() == 'MULTISURFACE (CURVEPOLYGON (CIRCULARSTRING (0 0,1 1,1 -1,0.292893218813453 -0.707106781186548,0 0)))', \
+        '<gml:MultiSurface> not correctly parsed'
 
     # MultiSurface of Polygon and CurvePolygon
     gml = """<gml:MultiSurface>
@@ -2270,10 +2068,8 @@ def test_gml_OGRMultiSurface():
 </gml:MultiSurface>"""
 
     geom = ogr.CreateGeometryFromGML(gml)
-    if geom.ExportToWkt() != 'MULTISURFACE (((0 0,0 1,1 1,0 0)),CURVEPOLYGON (CIRCULARSTRING (0 0,1 1,1 -1,0.292893218813453 -0.707106781186548,0 0)))':
-        gdaltest.post_reason('<gml:MultiSurface> not correctly parsed')
-        print(geom.ExportToWkt())
-        return 'fail'
+    assert geom.ExportToWkt() == 'MULTISURFACE (((0 0,0 1,1 1,0 0)),CURVEPOLYGON (CIRCULARSTRING (0 0,1 1,1 -1,0.292893218813453 -0.707106781186548,0 0)))', \
+        '<gml:MultiSurface> not correctly parsed'
 
     # MultiSurface of CurvePolygon and Polygon
     gml = """<gml:MultiSurface>
@@ -2294,17 +2090,13 @@ def test_gml_OGRMultiSurface():
 </gml:MultiSurface>"""
 
     geom = ogr.CreateGeometryFromGML(gml)
-    if geom.ExportToWkt() != 'MULTISURFACE (CURVEPOLYGON (CIRCULARSTRING (0 0,1 1,1 -1,0.292893218813453 -0.707106781186548,0 0)),((0 0,0 1,1 1,0 0)))':
-        gdaltest.post_reason('<gml:MultiSurface> not correctly parsed')
-        print(geom.ExportToWkt())
-        return 'fail'
+    assert geom.ExportToWkt() == 'MULTISURFACE (CURVEPOLYGON (CIRCULARSTRING (0 0,1 1,1 -1,0.292893218813453 -0.707106781186548,0 0)),((0 0,0 1,1 1,0 0)))', \
+        '<gml:MultiSurface> not correctly parsed'
 
     geom = ogr.CreateGeometryFromWkt('MULTISURFACE (CURVEPOLYGON((0 0,0 1,1 1,1 0,0 0)))')
     gml2 = geom.ExportToGML(['FORMAT=GML3'])
     expected_gml2 = '<gml:MultiSurface><gml:surfaceMember><gml:Polygon><gml:exterior><gml:LinearRing><gml:posList>0 0 0 1 1 1 1 0 0 0</gml:posList></gml:LinearRing></gml:exterior></gml:Polygon></gml:surfaceMember></gml:MultiSurface>'
-    if gml2 != expected_gml2:
-        print(gml2)
-        return 'fail'
+    assert gml2 == expected_gml2
 
     return 'success'
 
@@ -2318,15 +2110,11 @@ def test_gml_OGRMultiCurve():
     gml = """<gml:MultiCurve><gml:curveMember><gml:Curve><gml:segments><gml:ArcString><gml:posList>0 0 1 1 1 -1</gml:posList></gml:ArcString></gml:segments></gml:Curve></gml:curveMember></gml:MultiCurve>"""
 
     geom = ogr.CreateGeometryFromGML(gml)
-    if geom.ExportToWkt() != 'MULTICURVE (CIRCULARSTRING (0 0,1 1,1 -1))':
-        gdaltest.post_reason('<gml:MultiCurve> not correctly parsed')
-        print(geom.ExportToWkt())
-        return 'fail'
+    assert geom.ExportToWkt() == 'MULTICURVE (CIRCULARSTRING (0 0,1 1,1 -1))', \
+        '<gml:MultiCurve> not correctly parsed'
 
     gml2 = geom.ExportToGML(['FORMAT=GML3'])
-    if gml2 != gml:
-        print(gml2)
-        return 'fail'
+    assert gml2 == gml
 
     # MultiCurve of LineString and Arc
     gml = """<gml:MultiCurve>
@@ -2341,10 +2129,8 @@ def test_gml_OGRMultiCurve():
 </gml:MultiCurve>"""
 
     geom = ogr.CreateGeometryFromGML(gml)
-    if geom.ExportToWkt() != 'MULTICURVE ((0 0,1 1,1 -1),CIRCULARSTRING (0 0,1 1,1 -1))':
-        gdaltest.post_reason('<gml:MultiCurve> not correctly parsed')
-        print(geom.ExportToWkt())
-        return 'fail'
+    assert geom.ExportToWkt() == 'MULTICURVE ((0 0,1 1,1 -1),CIRCULARSTRING (0 0,1 1,1 -1))', \
+        '<gml:MultiCurve> not correctly parsed'
 
     # MultiCurve of Arc and LineString
     gml = """<gml:MultiCurve>
@@ -2359,10 +2145,8 @@ def test_gml_OGRMultiCurve():
 </gml:MultiCurve>"""
 
     geom = ogr.CreateGeometryFromGML(gml)
-    if geom.ExportToWkt() != 'MULTICURVE (CIRCULARSTRING (0 0,1 1,1 -1),(0 0,1 1,1 -1))':
-        gdaltest.post_reason('<gml:MultiCurve> not correctly parsed')
-        print(geom.ExportToWkt())
-        return 'fail'
+    assert geom.ExportToWkt() == 'MULTICURVE (CIRCULARSTRING (0 0,1 1,1 -1),(0 0,1 1,1 -1))', \
+        '<gml:MultiCurve> not correctly parsed'
 
     # MultiCurve of CompositeCurve
     gml = """<gml:MultiCurve>
@@ -2381,10 +2165,8 @@ def test_gml_OGRMultiCurve():
 </gml:MultiCurve>"""
 
     geom = ogr.CreateGeometryFromGML(gml)
-    if geom.ExportToWkt() != 'MULTICURVE (COMPOUNDCURVE (CIRCULARSTRING (0 0,1 1,1 -1),(1 -1,1 1,1 -1)))':
-        gdaltest.post_reason('<gml:MultiCurve> not correctly parsed')
-        print(geom.ExportToWkt())
-        return 'fail'
+    assert geom.ExportToWkt() == 'MULTICURVE (COMPOUNDCURVE (CIRCULARSTRING (0 0,1 1,1 -1),(1 -1,1 1,1 -1)))', \
+        '<gml:MultiCurve> not correctly parsed'
 
     return 'success'
 
@@ -2397,23 +2179,17 @@ def test_gml_write_gml_ns():
     geom = ogr.CreateGeometryFromWkt('POINT(500000 4500000)')
     gml = geom.ExportToGML(options=['NAMESPACE_DECL=YES'])
     expected_gml = '<gml:Point xmlns:gml="http://www.opengis.net/gml"><gml:coordinates>500000,4500000</gml:coordinates></gml:Point>'
-    if gml != expected_gml:
-        gdaltest.post_reason('got %s, instead of %s' % (gml, expected_gml))
-        return 'fail'
+    assert gml == expected_gml, ('got %s, instead of %s' % (gml, expected_gml))
 
     geom = ogr.CreateGeometryFromWkt('POINT(500000 4500000)')
     gml = geom.ExportToGML(options=['FORMAT=GML3', 'NAMESPACE_DECL=YES'])
     expected_gml = '<gml:Point xmlns:gml="http://www.opengis.net/gml"><gml:pos>500000 4500000</gml:pos></gml:Point>'
-    if gml != expected_gml:
-        gdaltest.post_reason('got %s, instead of %s' % (gml, expected_gml))
-        return 'fail'
+    assert gml == expected_gml, ('got %s, instead of %s' % (gml, expected_gml))
 
     geom = ogr.CreateGeometryFromWkt('POINT(500000 4500000)')
     gml = geom.ExportToGML(options=['FORMAT=GML32', 'GMLID=foo', 'NAMESPACE_DECL=YES'])
     expected_gml = '<gml:Point xmlns:gml="http://www.opengis.net/gml/3.2" gml:id="foo"><gml:pos>500000 4500000</gml:pos></gml:Point>'
-    if gml != expected_gml:
-        gdaltest.post_reason('got %s, instead of %s' % (gml, expected_gml))
-        return 'fail'
+    assert gml == expected_gml, ('got %s, instead of %s' % (gml, expected_gml))
 
     return 'success'
 
diff --git a/autotest/ogr/ogr_gml_read.py b/autotest/ogr/ogr_gml_read.py
index cc5833dbf31d..dae301442d3a 100755
--- a/autotest/ogr/ogr_gml_read.py
+++ b/autotest/ogr/ogr_gml_read.py
@@ -40,6 +40,7 @@
 from osgeo import gdal
 from osgeo import ogr
 from osgeo import osr
+import pytest
 
 ###############################################################################
 # Test reading geometry and attribute from ionic wfs gml file.
@@ -59,26 +60,19 @@ def test_ogr_gml_1():
 
     gdaltest.have_gml_reader = 1
 
-    if gml_ds.GetLayerCount() != 1:
-        gdaltest.post_reason('wrong number of layers')
-        return 'fail'
+    assert gml_ds.GetLayerCount() == 1, 'wrong number of layers'
 
     lyr = gml_ds.GetLayerByName('GEM')
     feat = lyr.GetNextFeature()
 
-    if feat.GetField('Name') != 'Aartselaar':
-        gdaltest.post_reason('Wrong name field value')
-        return 'fail'
+    assert feat.GetField('Name') == 'Aartselaar', 'Wrong name field value'
 
     wkt = 'POLYGON ((44038 511549,44015 511548,43994 511522,43941 511539,43844 511514,43754 511479,43685 511521,43594 511505,43619 511452,43645 511417,4363 511387,437 511346,43749 511298,43808 511229,43819 511205,4379 511185,43728 511167,43617 511175,43604 511151,43655 511125,43746 511143,43886 511154,43885 511178,43928 511186,43977 511217,4404 511223,44008 511229,44099 51131,44095 511335,44106 51135,44127 511379,44124 511435,44137 511455,44105 511467,44098 511484,44086 511499,4407 511506,44067 511535,44038 511549))'
 
-    if ogrtest.check_feature_geometry(feat, wkt):
-        return 'fail'
+    assert not ogrtest.check_feature_geometry(feat, wkt)
 
     feat = lyr.GetNextFeature()
-    if feat is not None:
-        gdaltest.post_reason('got unexpected feature.')
-        return 'fail'
+    assert feat is None, 'got unexpected feature.'
 
     return 'success'
 
@@ -95,26 +89,19 @@ def test_ogr_gml_2():
 
     gml_ds = ogr.Open('tmp/ionic_wfs.gml')
 
-    if gml_ds.GetLayerCount() != 1:
-        gdaltest.post_reason('wrong number of layers')
-        return 'fail'
+    assert gml_ds.GetLayerCount() == 1, 'wrong number of layers'
 
     lyr = gml_ds.GetLayerByName('GEM')
     feat = lyr.GetNextFeature()
 
-    if feat.GetField('Name') != 'Aartselaar':
-        gdaltest.post_reason('Wrong name field value')
-        return 'fail'
+    assert feat.GetField('Name') == 'Aartselaar', 'Wrong name field value'
 
     wkt = 'POLYGON ((44038 511549,44015 511548,43994 511522,43941 511539,43844 511514,43754 511479,43685 511521,43594 511505,43619 511452,43645 511417,4363 511387,437 511346,43749 511298,43808 511229,43819 511205,4379 511185,43728 511167,43617 511175,43604 511151,43655 511125,43746 511143,43886 511154,43885 511178,43928 511186,43977 511217,4404 511223,44008 511229,44099 51131,44095 511335,44106 51135,44127 511379,44124 511435,44137 511455,44105 511467,44098 511484,44086 511499,4407 511506,44067 511535,44038 511549))'
 
-    if ogrtest.check_feature_geometry(feat, wkt):
-        return 'fail'
+    assert not ogrtest.check_feature_geometry(feat, wkt)
 
     feat = lyr.GetNextFeature()
-    if feat is not None:
-        gdaltest.post_reason('got unexpected feature.')
-        return 'fail'
+    assert feat is None, 'got unexpected feature.'
 
     return 'success'
 
@@ -128,30 +115,21 @@ def test_ogr_gml_3():
 
     gml_ds = ogr.Open('data/rnf_eg.gml')
 
-    if gml_ds.GetLayerCount() != 1:
-        gdaltest.post_reason('wrong number of layers')
-        return 'fail'
+    assert gml_ds.GetLayerCount() == 1, 'wrong number of layers'
 
     lyr = gml_ds.GetLayerByName('RoadSegment')
     feat = lyr.GetNextFeature()
 
-    if feat.GetField('ngd_id') != 817792:
-        gdaltest.post_reason('Wrong ngd_id field value')
-        return 'fail'
+    assert feat.GetField('ngd_id') == 817792, 'Wrong ngd_id field value'
 
-    if feat.GetField('type') != 'HWY':
-        gdaltest.post_reason('Wrong type field value')
-        return 'fail'
+    assert feat.GetField('type') == 'HWY', 'Wrong type field value'
 
     wkt = 'LINESTRING (-63.500411040289066 46.240122507771368,-63.501009714909742 46.240344881690326,-63.502170462373471 46.241041855639622,-63.505862621395394 46.24195250605576,-63.506719184531178 46.242002742901576,-63.507197272602212 46.241931577811606,-63.508403092799554 46.241752283460158,-63.509946573455622 46.241745397977233)'
 
-    if ogrtest.check_feature_geometry(feat, wkt):
-        return 'fail'
+    assert not ogrtest.check_feature_geometry(feat, wkt)
 
     feat = lyr.GetNextFeature()
-    if feat is not None:
-        gdaltest.post_reason('got unexpected feature.')
-        return 'fail'
+    assert feat is None, 'got unexpected feature.'
 
     return 'success'
 
@@ -166,43 +144,31 @@ def test_ogr_gml_4():
 
     gml_ds = ogr.Open('data/bom.gml')
 
-    if gml_ds.GetLayerCount() != 1:
-        gdaltest.post_reason('wrong number of layers')
-        return 'fail'
+    assert gml_ds.GetLayerCount() == 1, 'wrong number of layers'
 
     lyr = gml_ds.GetLayerByName('CartographicText')
 
-    if lyr.GetFeatureCount() != 3:
-        gdaltest.post_reason('wrong number of features')
-        return 'fail'
+    assert lyr.GetFeatureCount() == 3, 'wrong number of features'
 
     # Test 1st feature
     feat = lyr.GetNextFeature()
 
-    if feat.GetField('featureCode') != 10198:
-        gdaltest.post_reason('Wrong featureCode field value')
-        return 'fail'
+    assert feat.GetField('featureCode') == 10198, 'Wrong featureCode field value'
 
-    if feat.GetField('anchorPosition') != 8:
-        gdaltest.post_reason('Wrong anchorPosition field value')
-        return 'fail'
+    assert feat.GetField('anchorPosition') == 8, 'Wrong anchorPosition field value'
 
     wkt = 'POINT (347243.85 461299.5)'
 
-    if ogrtest.check_feature_geometry(feat, wkt):
-        return 'fail'
+    assert not ogrtest.check_feature_geometry(feat, wkt)
 
     # Test 2nd feature
     feat = lyr.GetNextFeature()
 
-    if feat.GetField('featureCode') != 10069:
-        gdaltest.post_reason('Wrong featureCode field value')
-        return 'fail'
+    assert feat.GetField('featureCode') == 10069, 'Wrong featureCode field value'
 
     wkt = 'POINT (347251.45 461250.85)'
 
-    if ogrtest.check_feature_geometry(feat, wkt):
-        return 'fail'
+    assert not ogrtest.check_feature_geometry(feat, wkt)
 
     return 'success'
 
@@ -271,24 +237,16 @@ def test_ogr_gml_7():
     ldefn = lyr.GetLayerDefn()
 
     # Test fix for #2969
-    if lyr.GetFeatureCount() != 5:
-        gdaltest.post_reason('Bad feature count')
-        return 'fail'
+    assert lyr.GetFeatureCount() == 5, 'Bad feature count'
 
     try:
         ldefn.GetFieldDefn(0).GetFieldTypeName
     except:
         return 'skip'
 
-    if ldefn.GetFieldDefn(0).GetFieldTypeName(ldefn.GetFieldDefn(0).GetType())\
-       != 'Real':
-        return 'fail'
-    if ldefn.GetFieldDefn(1).GetFieldTypeName(ldefn.GetFieldDefn(1).GetType())\
-       != 'Integer':
-        return 'fail'
-    if ldefn.GetFieldDefn(2).GetFieldTypeName(ldefn.GetFieldDefn(2).GetType())\
-       != 'String':
-        return 'fail'
+    assert ldefn.GetFieldDefn(0).GetFieldTypeName(ldefn.GetFieldDefn(0).GetType()) == 'Real'
+    assert ldefn.GetFieldDefn(1).GetFieldTypeName(ldefn.GetFieldDefn(1).GetType()) == 'Integer'
+    assert ldefn.GetFieldDefn(2).GetFieldTypeName(ldefn.GetFieldDefn(2).GetType()) == 'String'
 
     return 'success'
 
@@ -305,13 +263,9 @@ def test_ogr_gml_8():
     lyr = gml_ds.GetLayer()
     feat = lyr.GetNextFeature()
     if sys.version_info >= (3, 0, 0):
-        if feat.GetFieldAsString('name') != '\xc4\x80liamanu'.encode('latin1').decode('utf-8'):
-            print(feat.GetFieldAsString('name'))
-            return 'fail'
+        assert feat.GetFieldAsString('name') == '\xc4\x80liamanu'.encode('latin1').decode('utf-8')
     else:
-        if feat.GetFieldAsString('name') != '\xc4\x80liamanu':
-            print(feat.GetFieldAsString('name'))
-            return 'fail'
+        assert feat.GetFieldAsString('name') == '\xc4\x80liamanu'
 
     return 'success'
 
@@ -337,19 +291,14 @@ def test_ogr_gml_9():
     ret = lyr.CreateFeature(dst_feat)
     gdal.PopErrorHandler()
 
-    if ret != 0:
-        gdaltest.post_reason('CreateFeature failed.')
-        return 'fail'
+    assert ret == 0, 'CreateFeature failed.'
 
     ds = None
 
     ds = ogr.Open('tmp/broken_utf8.gml')
     lyr = ds.GetLayerByName('test')
     feat = lyr.GetNextFeature()
-    if feat.GetField('test') != '?bad':
-        gdaltest.post_reason('Unexpected content.')
-        print(feat.GetField('test'))
-        return 'fail'
+    assert feat.GetField('test') == '?bad', 'Unexpected content.'
     ds = None
 
     os.remove('tmp/broken_utf8.gml')
@@ -392,9 +341,7 @@ def test_ogr_gml_10():
 
     ret = lyr.CreateFeature(dst_feat)
 
-    if ret != 0:
-        gdaltest.post_reason('CreateFeature failed.')
-        return 'fail'
+    assert ret == 0, 'CreateFeature failed.'
 
     ds = None
 
@@ -402,50 +349,33 @@ def test_ogr_gml_10():
     lyr = ds.GetLayerByName('test')
     feat = lyr.GetNextFeature()
 
-    if feat.GetFieldDefnRef(feat.GetFieldIndex('string')).GetType() != ogr.OFTString:
-        gdaltest.post_reason('String type is reported wrong. Got ' + str(feat.GetFieldDefnRef(feat.GetFieldIndex('string')).GetType()))
-        return 'fail'
-    if feat.GetFieldDefnRef(feat.GetFieldIndex('date')).GetType() != ogr.OFTString:
-        gdaltest.post_reason('Date type is not reported as OFTString. Got ' + str(feat.GetFieldDefnRef(feat.GetFieldIndex('date')).GetType()))
-        return 'fail'
-    if feat.GetFieldDefnRef(feat.GetFieldIndex('real')).GetType() != ogr.OFTReal:
-        gdaltest.post_reason('Real type is reported wrong. Got ' + str(feat.GetFieldDefnRef(feat.GetFieldIndex('real')).GetType()))
-        return 'fail'
-    if feat.GetFieldDefnRef(feat.GetFieldIndex('float')).GetType() != ogr.OFTReal:
-        gdaltest.post_reason('Float type is not reported as OFTReal. Got ' + str(feat.GetFieldDefnRef(feat.GetFieldIndex('float')).GetType()))
-        return 'fail'
-    if feat.GetFieldDefnRef(feat.GetFieldIndex('integer')).GetType() != ogr.OFTInteger:
-        gdaltest.post_reason('Integer type is reported wrong. Got ' + str(feat.GetFieldDefnRef(feat.GetFieldIndex('integer')).GetType()))
-        return 'fail'
-
-    if feat.GetField('string') != 'test string of length 24':
-        gdaltest.post_reason('Unexpected string content.' + feat.GetField('string'))
-        return 'fail'
-    if feat.GetField('date') != '2003/04/22':
-        gdaltest.post_reason('Unexpected string content.' + feat.GetField('date'))
-        return 'fail'
-    if feat.GetFieldAsDouble('real') != 12.34:
-        gdaltest.post_reason('Unexpected real content.')
-        return 'fail'
-    if feat.GetField('float') != 1234.5678:
-        gdaltest.post_reason('Unexpected float content.')
-        return 'fail'
-    if feat.GetField('integer') != 1234:
-        gdaltest.post_reason('Unexpected integer content.')
-        return 'fail'
-
-    if lyr.GetLayerDefn().GetFieldDefn(lyr.GetLayerDefn().GetFieldIndex('string')).GetWidth() != 100:
-        gdaltest.post_reason('Unexpected width of string field.')
-        return 'fail'
-    if lyr.GetLayerDefn().GetFieldDefn(lyr.GetLayerDefn().GetFieldIndex('real')).GetWidth() != 4:
-        gdaltest.post_reason('Unexpected width of real field.')
-        return 'fail'
-    if lyr.GetLayerDefn().GetFieldDefn(lyr.GetLayerDefn().GetFieldIndex('real')).GetPrecision() != 2:
-        gdaltest.post_reason('Unexpected precision of real field.')
-        return 'fail'
-    if lyr.GetLayerDefn().GetFieldDefn(lyr.GetLayerDefn().GetFieldIndex('integer')).GetWidth() != 5:
-        gdaltest.post_reason('Unexpected width of integer field.')
-        return 'fail'
+    assert feat.GetFieldDefnRef(feat.GetFieldIndex('string')).GetType() == ogr.OFTString, \
+        ('String type is reported wrong. Got ' + str(feat.GetFieldDefnRef(feat.GetFieldIndex('string')).GetType()))
+    assert feat.GetFieldDefnRef(feat.GetFieldIndex('date')).GetType() == ogr.OFTString, \
+        ('Date type is not reported as OFTString. Got ' + str(feat.GetFieldDefnRef(feat.GetFieldIndex('date')).GetType()))
+    assert feat.GetFieldDefnRef(feat.GetFieldIndex('real')).GetType() == ogr.OFTReal, \
+        ('Real type is reported wrong. Got ' + str(feat.GetFieldDefnRef(feat.GetFieldIndex('real')).GetType()))
+    assert feat.GetFieldDefnRef(feat.GetFieldIndex('float')).GetType() == ogr.OFTReal, \
+        ('Float type is not reported as OFTReal. Got ' + str(feat.GetFieldDefnRef(feat.GetFieldIndex('float')).GetType()))
+    assert feat.GetFieldDefnRef(feat.GetFieldIndex('integer')).GetType() == ogr.OFTInteger, \
+        ('Integer type is reported wrong. Got ' + str(feat.GetFieldDefnRef(feat.GetFieldIndex('integer')).GetType()))
+
+    assert feat.GetField('string') == 'test string of length 24', \
+        ('Unexpected string content.' + feat.GetField('string'))
+    assert feat.GetField('date') == '2003/04/22', \
+        ('Unexpected string content.' + feat.GetField('date'))
+    assert feat.GetFieldAsDouble('real') == 12.34, 'Unexpected real content.'
+    assert feat.GetField('float') == 1234.5678, 'Unexpected float content.'
+    assert feat.GetField('integer') == 1234, 'Unexpected integer content.'
+
+    assert lyr.GetLayerDefn().GetFieldDefn(lyr.GetLayerDefn().GetFieldIndex('string')).GetWidth() == 100, \
+        'Unexpected width of string field.'
+    assert lyr.GetLayerDefn().GetFieldDefn(lyr.GetLayerDefn().GetFieldIndex('real')).GetWidth() == 4, \
+        'Unexpected width of real field.'
+    assert lyr.GetLayerDefn().GetFieldDefn(lyr.GetLayerDefn().GetFieldIndex('real')).GetPrecision() == 2, \
+        'Unexpected precision of real field.'
+    assert lyr.GetLayerDefn().GetFieldDefn(lyr.GetLayerDefn().GetFieldIndex('integer')).GetWidth() == 5, \
+        'Unexpected width of integer field.'
     ds = None
 
     os.remove('tmp/fields.gml')
@@ -479,21 +409,16 @@ def test_ogr_gml_11():
 
     ds = ogr.Open('data/testgeometryelementpath.gml')
     lyr = ds.GetLayer(0)
-    if lyr.GetGeometryColumn() != 'location1container|location1':
-        gdaltest.post_reason('did not get expected geometry column name')
-        return 'fail'
+    assert lyr.GetGeometryColumn() == 'location1container|location1', \
+        'did not get expected geometry column name'
 
     feat = lyr.GetNextFeature()
-    if feat.GetField('attrib1') != 'attrib1_value':
-        gdaltest.post_reason('did not get expected value for attrib1')
-        return 'fail'
-    if feat.GetField('attrib2') != 'attrib2_value':
-        gdaltest.post_reason('did not get expected value for attrib2')
-        return 'fail'
+    assert feat.GetField('attrib1') == 'attrib1_value', \
+        'did not get expected value for attrib1'
+    assert feat.GetField('attrib2') == 'attrib2_value', \
+        'did not get expected value for attrib2'
     geom = feat.GetGeometryRef()
-    if geom.ExportToWkt() != 'POINT (3 50)':
-        gdaltest.post_reason('did not get expected geometry')
-        return 'fail'
+    assert geom.ExportToWkt() == 'POINT (3 50)', 'did not get expected geometry'
     ds = None
     return 'success'
 
@@ -508,21 +433,16 @@ def test_ogr_gml_12():
 
     ds = ogr.Open('/vsizip/data/testgeometryelementpath.zip/testgeometryelementpath.gml')
     lyr = ds.GetLayer(0)
-    if lyr.GetGeometryColumn() != 'location1container|location1':
-        gdaltest.post_reason('did not get expected geometry column name')
-        return 'fail'
+    assert lyr.GetGeometryColumn() == 'location1container|location1', \
+        'did not get expected geometry column name'
 
     feat = lyr.GetNextFeature()
-    if feat.GetField('attrib1') != 'attrib1_value':
-        gdaltest.post_reason('did not get expected value for attrib1')
-        return 'fail'
-    if feat.GetField('attrib2') != 'attrib2_value':
-        gdaltest.post_reason('did not get expected value for attrib2')
-        return 'fail'
+    assert feat.GetField('attrib1') == 'attrib1_value', \
+        'did not get expected value for attrib1'
+    assert feat.GetField('attrib2') == 'attrib2_value', \
+        'did not get expected value for attrib2'
     geom = feat.GetGeometryRef()
-    if geom.ExportToWkt() != 'POINT (3 50)':
-        gdaltest.post_reason('did not get expected geometry')
-        return 'fail'
+    assert geom.ExportToWkt() == 'POINT (3 50)', 'did not get expected geometry'
     ds = None
     return 'success'
 
@@ -539,18 +459,14 @@ def test_ogr_gml_13():
         ds = ogr.Open('data/testlistfields.gml')
         lyr = ds.GetLayer(0)
         feat = lyr.GetNextFeature()
-        if feat.GetFieldAsStringList(feat.GetFieldIndex('attrib1')) != ['value1', 'value2']:
-            gdaltest.post_reason('did not get expected value for attrib1')
-            return 'fail'
-        if feat.GetField(feat.GetFieldIndex('attrib2')) != 'value3':
-            gdaltest.post_reason('did not get expected value for attrib2')
-            return 'fail'
-        if feat.GetFieldAsIntegerList(feat.GetFieldIndex('attrib3')) != [4, 5]:
-            gdaltest.post_reason('did not get expected value for attrib3')
-            return 'fail'
-        if feat.GetFieldAsDoubleList(feat.GetFieldIndex('attrib4')) != [6.1, 7.1]:
-            gdaltest.post_reason('did not get expected value for attrib4')
-            return 'fail'
+        assert feat.GetFieldAsStringList(feat.GetFieldIndex('attrib1')) == ['value1', 'value2'], \
+            'did not get expected value for attrib1'
+        assert feat.GetField(feat.GetFieldIndex('attrib2')) == 'value3', \
+            'did not get expected value for attrib2'
+        assert feat.GetFieldAsIntegerList(feat.GetFieldIndex('attrib3')) == [4, 5], \
+            'did not get expected value for attrib3'
+        assert feat.GetFieldAsDoubleList(feat.GetFieldIndex('attrib4')) == [6.1, 7.1], \
+            'did not get expected value for attrib4'
         ds = None
     gdal.Unlink('data/testlistfields.gfs')
 
@@ -603,9 +519,7 @@ def test_ogr_gml_14():
     except (IOError, OSError):
         return 'fail'
 
-    if text != expectedtext:
-        print('Problem with file 1')
-        return 'fail'
+    assert text == expectedtext, 'Problem with file 1'
 
     try:
         fp = open('tmp/cache/xlink2resolved.gml', 'r')
@@ -618,9 +532,7 @@ def test_ogr_gml_14():
     except (IOError, OSError):
         return 'fail'
 
-    if text != expectedtext:
-        print('Problem with file 2')
-        return 'fail'
+    assert text == expectedtext, 'Problem with file 2'
 
     return 'success'
 
@@ -639,9 +551,7 @@ def test_ogr_gml_15():
 
     ret = gdaltest.runexternal(test_cli_utilities.get_test_ogrsf_path() + ' -ro data/test_point.gml')
 
-    if ret.find('INFO') == -1 or ret.find('ERROR') != -1:
-        print(ret)
-        return 'fail'
+    assert ret.find('INFO') != -1 and ret.find('ERROR') == -1
 
     return 'success'
 
@@ -680,18 +590,12 @@ def test_ogr_gml_17():
     lyr = ds.GetLayer(0)
     sr = lyr.GetSpatialRef()
     got_wkt = sr.ExportToWkt()
-    if got_wkt.find('GEOGCS["WGS 84"') == -1:
-        gdaltest.post_reason('did not get expected SRS')
-        print(got_wkt)
-        return 'fail'
+    assert got_wkt.find('GEOGCS["WGS 84"') != -1, 'did not get expected SRS'
 
     feat = lyr.GetNextFeature()
     geom = feat.GetGeometryRef()
     got_wkt = geom.ExportToWkt()
-    if got_wkt != 'POINT (2.09 34.12)':
-        gdaltest.post_reason('did not get expected geometry')
-        print(got_wkt)
-        return 'fail'
+    assert got_wkt == 'POINT (2.09 34.12)', 'did not get expected geometry'
 
     return 'success'
 
@@ -708,18 +612,12 @@ def test_ogr_gml_18():
     lyr = ds.GetLayer(0)
     sr = lyr.GetSpatialRef()
     got_wkt = sr.ExportToWkt()
-    if got_wkt.find('GEOGCS["WGS 84"') == -1:
-        gdaltest.post_reason('did not get expected SRS')
-        print(got_wkt)
-        return 'fail'
+    assert got_wkt.find('GEOGCS["WGS 84"') != -1, 'did not get expected SRS'
 
     feat = lyr.GetNextFeature()
     geom = feat.GetGeometryRef()
     got_wkt = geom.ExportToWkt()
-    if got_wkt != 'POINT (2.09 34.12)':
-        gdaltest.post_reason('did not get expected geometry')
-        print(got_wkt)
-        return 'fail'
+    assert got_wkt == 'POINT (2.09 34.12)', 'did not get expected geometry'
 
     return 'success'
 
@@ -745,19 +643,14 @@ def test_ogr_gml_19():
     lyr = ds.GetLayer(0)
     sr = lyr.GetSpatialRef()
     got_wkt = sr.ExportToWkt()
-    if got_wkt.find('GEOGCS["WGS 84"') == -1 or \
-       got_wkt.find('AXIS["Latitude",NORTH],AXIS["Longitude",EAST]') == -1:
-        gdaltest.post_reason('did not get expected SRS')
-        print(got_wkt)
-        return 'fail'
+    assert (not (got_wkt.find('GEOGCS["WGS 84"') == -1 or \
+       got_wkt.find('AXIS["Latitude",NORTH],AXIS["Longitude",EAST]') == -1)), \
+        'did not get expected SRS'
 
     feat = lyr.GetNextFeature()
     geom = feat.GetGeometryRef()
     got_wkt = geom.ExportToWkt()
-    if got_wkt != 'POINT (34.12 2.09)':
-        gdaltest.post_reason('did not get expected geometry')
-        print(got_wkt)
-        return 'fail'
+    assert got_wkt == 'POINT (34.12 2.09)', 'did not get expected geometry'
 
     return 'success'
 
@@ -785,28 +678,21 @@ def test_ogr_gml_20():
         return 'skip'
 
     idx = ldefn.GetFieldIndex("gml_id")
-    if idx == -1:
-        gdaltest.post_reason('did not get expected column "gml_id"')
-        return 'fail'
+    assert idx != -1, 'did not get expected column "gml_id"'
 
     idx = ldefn.GetFieldIndex("cat")
     fddefn = ldefn.GetFieldDefn(idx)
-    if fddefn.GetFieldTypeName(fddefn.GetType()) != 'Integer64':
-        gdaltest.post_reason('did not get expected column type for col "cat"')
-        return 'fail'
+    assert fddefn.GetFieldTypeName(fddefn.GetType()) == 'Integer64', \
+        'did not get expected column type for col "cat"'
     idx = ldefn.GetFieldIndex("str1")
     fddefn = ldefn.GetFieldDefn(idx)
-    if fddefn.GetFieldTypeName(fddefn.GetType()) != 'String':
-        gdaltest.post_reason('did not get expected column type for col "str1"')
-        return 'fail'
+    assert fddefn.GetFieldTypeName(fddefn.GetType()) == 'String', \
+        'did not get expected column type for col "str1"'
 
-    if lyr.GetGeometryColumn() != 'the_geom':
-        gdaltest.post_reason('did not get expected geometry column name')
-        return 'fail'
+    assert lyr.GetGeometryColumn() == 'the_geom', \
+        'did not get expected geometry column name'
 
-    if ldefn.GetGeomType() != ogr.wkbPoint:
-        gdaltest.post_reason('did not get expected geometry type')
-        return 'fail'
+    assert ldefn.GetGeomType() == ogr.wkbPoint, 'did not get expected geometry type'
 
     ds = None
 
@@ -857,9 +743,8 @@ def test_ogr_gml_21(frmt='GML3'):
     ds = ogr.Open('tmp/gml_21.gml')
     lyr = ds.GetLayer(0)
     feat = lyr.GetNextFeature()
-    if feat.GetGeometryRef().ExportToWkt() != 'POINT (2 49)':
-        gdaltest.post_reason('did not get expected geometry')
-        return 'fail'
+    assert feat.GetGeometryRef().ExportToWkt() == 'POINT (2 49)', \
+        'did not get expected geometry'
     ds = None
 
     # Test that .gml and .xsd are identical to what is expected
@@ -874,9 +759,8 @@ def test_ogr_gml_21(frmt='GML3'):
         line1 = line1.strip()
         line2 = line2.strip()
         if line1 != line2:
-            gdaltest.post_reason('.gml file not identical to expected')
             print(open('tmp/gml_21.gml', 'rt').read())
-            return 'fail'
+            pytest.fail('.gml file not identical to expected')
         line1 = f1.readline()
         line2 = f2.readline()
     f1.close()
@@ -895,9 +779,8 @@ def test_ogr_gml_21(frmt='GML3'):
         line1 = line1.strip()
         line2 = line2.strip()
         if line1 != line2:
-            gdaltest.post_reason('.xsd file not identical to expected')
             print(open('tmp/gml_21.xsd', 'rt').read())
-            return 'fail'
+            pytest.fail('.xsd file not identical to expected')
         line1 = f1.readline()
         line2 = f2.readline()
     f1.close()
@@ -924,18 +807,11 @@ def test_ogr_gml_22():
 
     ds = ogr.Open('data/paris_typical_strike_demonstration.xml')
     lyr = ds.GetLayerByName('RouteGeometry')
-    if lyr is None:
-        gdaltest.post_reason('cannot find RouteGeometry')
-        return 'fail'
+    assert lyr is not None, 'cannot find RouteGeometry'
     lyr = ds.GetLayerByName('RouteInstruction')
-    if lyr is None:
-        gdaltest.post_reason('cannot find RouteInstruction')
-        return 'fail'
+    assert lyr is not None, 'cannot find RouteInstruction'
     count = lyr.GetFeatureCount()
-    if count != 9:
-        gdaltest.post_reason('did not get expected feature count')
-        print(count)
-        return 'fail'
+    assert count == 9, 'did not get expected feature count'
 
     ds = None
     return 'success'
@@ -963,25 +839,17 @@ def test_ogr_gml_23():
     lyr = ds.GetLayer(0)
     sr = lyr.GetSpatialRef()
     got_wkt = sr.ExportToWkt()
-    if got_wkt.find('GEOGCS["WGS 84"') == -1 or \
-       got_wkt.find('AXIS["Latitude",NORTH],AXIS["Longitude",EAST]') != -1:
-        gdaltest.post_reason('did not get expected SRS')
-        print(got_wkt)
-        return 'fail'
+    assert (got_wkt.find('GEOGCS["WGS 84"') != -1 and \
+       got_wkt.find('AXIS["Latitude",NORTH],AXIS["Longitude",EAST]') == -1), \
+        'did not get expected SRS'
 
     feat = lyr.GetNextFeature()
     geom = feat.GetGeometryRef()
     got_wkt = geom.ExportToWkt()
-    if got_wkt != 'POINT (2 49)':
-        gdaltest.post_reason('did not get expected geometry')
-        print(got_wkt)
-        return 'fail'
+    assert got_wkt == 'POINT (2 49)', 'did not get expected geometry'
 
     extent = lyr.GetExtent()
-    if extent != (2.0, 3.0, 49.0, 50.0):
-        gdaltest.post_reason('did not get expected layer extent')
-        print(extent)
-        return 'fail'
+    assert extent == (2.0, 3.0, 49.0, 50.0), 'did not get expected layer extent'
 
     return 'success'
 
@@ -1018,16 +886,10 @@ def test_ogr_gml_24():
     feat = lyr.GetNextFeature()
     geom = feat.GetGeometryRef()
     got_wkt = geom.ExportToWkt()
-    if got_wkt != 'POINT (2 49)':
-        gdaltest.post_reason('did not get expected geometry')
-        print(got_wkt)
-        return 'fail'
+    assert got_wkt == 'POINT (2 49)', 'did not get expected geometry'
 
     extent = lyr.GetExtent()
-    if extent != (2.0, 3.0, 49.0, 50.0):
-        gdaltest.post_reason('did not get expected layer extent')
-        print(extent)
-        return 'fail'
+    assert extent == (2.0, 3.0, 49.0, 50.0), 'did not get expected layer extent'
 
     return 'success'
 
@@ -1058,10 +920,8 @@ def test_ogr_gml_25():
     feat = lyr.GetNextFeature()
     geom = feat.GetGeometryRef()
     got_wkt = geom.ExportToWkt()
-    if got_wkt != 'POLYGON ((14 21,6 21,6 9,14 9,22 9,22 21,14 21))':
-        gdaltest.post_reason('did not get expected geometry')
-        print(got_wkt)
-        return 'fail'
+    assert got_wkt == 'POLYGON ((14 21,6 21,6 9,14 9,22 9,22 21,14 21))', \
+        'did not get expected geometry'
 
     return 'success'
 
@@ -1083,15 +943,13 @@ def test_ogr_gml_26():
     f = open('tmp/ogr_gml_26.gml', 'rt')
     content = f.read()
     f.close()
-    if content.find("<gml:coord><gml:X>478315.53125</gml:X><gml:Y>4762880.5</gml:Y><gml:Z>158</gml:Z></gml:coord>") == -1:
-        return 'fail'
+    assert content.find("<gml:coord><gml:X>478315.53125</gml:X><gml:Y>4762880.5</gml:Y><gml:Z>158</gml:Z></gml:coord>") != -1
 
     ds = ogr.Open('tmp/ogr_gml_26.gml')
 
     lyr = ds.GetLayer(0)
 
-    if lyr.GetGeomType() != ogr.wkbPolygon25D:
-        return 'fail'
+    assert lyr.GetGeomType() == ogr.wkbPolygon25D
 
     ds = None
 
@@ -1115,16 +973,13 @@ def test_ogr_gml_27():
     f = open('tmp/ogr_gml_27.gml', 'rt')
     content = f.read()
     f.close()
-    if content.find("<gml:lowerCorner>478315.53125 4762880.5 158</gml:lowerCorner>") == -1:
-        return 'fail'
+    assert content.find("<gml:lowerCorner>478315.53125 4762880.5 158</gml:lowerCorner>") != -1
 
     ds = ogr.Open('tmp/ogr_gml_27.gml')
 
     lyr = ds.GetLayer(0)
 
-    if lyr.GetGeomType() != ogr.wkbPolygon25D:
-        print(lyr.GetGeomType())
-        return 'fail'
+    assert lyr.GetGeomType() == ogr.wkbPolygon25D
 
     ds = None
 
@@ -1148,23 +1003,20 @@ def test_ogr_gml_28():
     # Try with .xsd
     ds = ogr.Open('tmp/ogr_gml_28.gml')
     lyr = ds.GetLayer(0)
-    if lyr.GetGeomType() != ogr.wkbNone:
-        return 'fail'
+    assert lyr.GetGeomType() == ogr.wkbNone
     ds = None
 
     os.unlink('tmp/ogr_gml_28.xsd')
 
     ds = ogr.Open('tmp/ogr_gml_28.gml')
     lyr = ds.GetLayer(0)
-    if lyr.GetGeomType() != ogr.wkbNone:
-        return 'fail'
+    assert lyr.GetGeomType() == ogr.wkbNone
     ds = None
 
     # Try with .gfs
     ds = ogr.Open('tmp/ogr_gml_28.gml')
     lyr = ds.GetLayer(0)
-    if lyr.GetGeomType() != ogr.wkbNone:
-        return 'fail'
+    assert lyr.GetGeomType() == ogr.wkbNone
     ds = None
 
     return 'success'
@@ -1187,17 +1039,14 @@ def test_ogr_gml_29():
 
     for j, expected_result in enumerate(expected_results):
         lyr = ds.GetLayer(j)
-        if lyr.GetGeomType() != expected_result[0]:
-            gdaltest.post_reason('layer %d, did not get expected layer geometry type' % j)
-            return 'fail'
+        assert lyr.GetGeomType() == expected_result[0], \
+            ('layer %d, did not get expected layer geometry type' % j)
         for _ in range(2):
             feat = lyr.GetNextFeature()
             geom = feat.GetGeometryRef()
             got_wkt = geom.ExportToWkt()
-            if got_wkt != expected_result[1]:
-                gdaltest.post_reason('layer %d, did not get expected geometry' % j)
-                print(got_wkt)
-                return 'fail'
+            assert got_wkt == expected_result[1], \
+                ('layer %d, did not get expected geometry' % j)
 
     ds = None
 
@@ -1241,17 +1090,9 @@ def test_ogr_gml_30():
     gdal.Unlink("/vsimem/ogr_gml_30.gml")
     gdal.Unlink("/vsimem/ogr_gml_30.gfs")
 
-    if len(field1) != 2050:
-        gdaltest.post_reason('did not get expected len(field1)')
-        print(field1)
-        print(len(field1))
-        return 'fail'
+    assert len(field1) == 2050, 'did not get expected len(field1)'
 
-    if len(geom_wkt) != 2060:
-        gdaltest.post_reason('did not get expected len(geom_wkt)')
-        print(geom_wkt)
-        print(len(geom_wkt))
-        return 'fail'
+    assert len(geom_wkt) == 2060, 'did not get expected len(geom_wkt)'
 
     return 'success'
 
@@ -1276,16 +1117,12 @@ def test_ogr_gml_31():
     lyr = ds.GetLayer(1)
     feat = lyr.GetNextFeature()
     feat = lyr.GetNextFeature()
-    if feat.GetFID() != 1:
-        gdaltest.post_reason('did not get feature when reading directly second layer')
-        return 'fail'
+    assert feat.GetFID() == 1, 'did not get feature when reading directly second layer'
 
     lyr = ds.GetLayer(0)
     feat = lyr.GetNextFeature()
     feat = lyr.GetNextFeature()
-    if feat.GetFID() != 1:
-        gdaltest.post_reason('did not get feature when reading back first layer')
-        return 'fail'
+    assert feat.GetFID() == 1, 'did not get feature when reading back first layer'
 
     return 'success'
 
@@ -1312,9 +1149,7 @@ def test_ogr_gml_32():
     lyr = ds.GetLayer(1)
     feat = lyr.GetNextFeature()
     feat = lyr.GetNextFeature()
-    if feat.GetFID() != 1:
-        gdaltest.post_reason('did not get feature when reading directly second layer')
-        return 'fail'
+    assert feat.GetFID() == 1, 'did not get feature when reading directly second layer'
 
     ds = None
 
@@ -1324,9 +1159,8 @@ def test_ogr_gml_32():
 
     data = str(data)
 
-    if data.find("<SequentialLayers>true</SequentialLayers>") == -1:
-        gdaltest.post_reason('did not find <SequentialLayers>true</SequentialLayers> in .gfs')
-        return 'fail'
+    assert data.find("<SequentialLayers>true</SequentialLayers>") != -1, \
+        'did not find <SequentialLayers>true</SequentialLayers> in .gfs'
 
     gdal.Unlink("/vsimem/ogr_gml_31.gml")
     gdal.Unlink("/vsimem/ogr_gml_31.gfs")
@@ -1369,9 +1203,7 @@ def test_ogr_gml_33():
         else:
             fid = feat.GetFID()
         expected_fid = read_seq[1]
-        if fid != expected_fid:
-            gdaltest.post_reason('failed at step %d' % i)
-            return 'fail'
+        assert fid == expected_fid, ('failed at step %d' % i)
 
     return 'success'
 
@@ -1397,9 +1229,7 @@ def test_ogr_gml_34():
     ds = ogr.Open('/vsimem/ogr_gml_34.gml')
     lyr = ds.GetLayer(0)
     feat = lyr.GetNextFeature()
-    if feat.GetFieldAsString('name') != '\xc4\x80liamanu<&':
-        print(feat.GetFieldAsString('name'))
-        return 'fail'
+    assert feat.GetFieldAsString('name') == '\xc4\x80liamanu<&'
     ds = None
 
     gdal.Unlink('/vsimem/ogr_gml_34.gml')
@@ -1448,29 +1278,20 @@ def test_ogr_gml_35():
     except OSError:
         pass
 
-    if gdal.GetLastErrorMsg() != '':
-        gdaltest.post_reason('did not expect error')
-        return 'fail'
-    if ds.GetLayerCount() != 3:
-        # We have an extra layer : ResolvedNodes
-        gdaltest.post_reason('expected 3 layers, got %d' % ds.GetLayerCount())
-        return 'fail'
+    assert gdal.GetLastErrorMsg() == '', 'did not expect error'
+    assert ds.GetLayerCount() == 3, ('expected 3 layers, got %d' % ds.GetLayerCount())
 
     lyr = ds.GetLayerByName('Suolo')
     feat = lyr.GetNextFeature()
     wkt = 'MULTIPOLYGON (((-0.1 0.6,-0.0 0.7,0.2 0.7,0.3 0.6,0.5 0.6,0.5 0.8,0.7 0.8,0.8 0.6,0.9 0.6,0.9 0.4,0.7 0.3,0.7 0.2,0.9 0.1,0.9 -0.1,0.6 -0.2,0.3 -0.2,0.2 -0.2,-0.1 0.0,-0.1 0.1,-0.1 0.2,0.1 0.3,0.1 0.4,-0.0 0.4,-0.1 0.5,-0.1 0.6)))'
-    if ogrtest.check_feature_geometry(feat, wkt):
-        print(feat.GetGeometryRef())
-        return 'fail'
+    assert not ogrtest.check_feature_geometry(feat, wkt), feat.GetGeometryRef()
 
     ds = None
 
     ds = ogr.Open('tmp/GmlTopo-sample.xml')
     lyr = ds.GetLayerByName('Suolo')
     feat = lyr.GetNextFeature()
-    if ogrtest.check_feature_geometry(feat, wkt):
-        print(feat.GetGeometryRef())
-        return 'fail'
+    assert not ogrtest.check_feature_geometry(feat, wkt), feat.GetGeometryRef()
 
     ds = None
 
@@ -1505,9 +1326,7 @@ def test_ogr_gml_36(GML_FACE_HOLE_NEGATIVE='NO'):
     ds = ogr.Open('tmp/GmlTopo-sample.xml')
     gdal.SetConfigOption('GML_SKIP_RESOLVE_ELEMS', None)
     gdal.SetConfigOption('GML_FACE_HOLE_NEGATIVE', None)
-    if gdal.GetLastErrorMsg() != '':
-        gdaltest.post_reason('did not expect error')
-        return 'fail'
+    assert gdal.GetLastErrorMsg() == '', 'did not expect error'
 
     lyr = ds.GetLayerByName('Suolo')
     feat = lyr.GetNextFeature()
@@ -1515,9 +1334,7 @@ def test_ogr_gml_36(GML_FACE_HOLE_NEGATIVE='NO'):
         wkt = 'MULTIPOLYGON (((-0.1 0.6,-0.0 0.7,0.2 0.7,0.3 0.6,0.5 0.6,0.5 0.8,0.7 0.8,0.8 0.6,0.9 0.6,0.9 0.4,0.7 0.3,0.7 0.2,0.9 0.1,0.9 -0.1,0.6 -0.2,0.3 -0.2,0.2 -0.2,-0.1 0.0,-0.1 0.1,-0.1 0.2,0.1 0.3,0.1 0.4,-0.0 0.4,-0.1 0.5,-0.1 0.6)))'
     else:
         wkt = 'POLYGON ((-0.1 0.6,-0.0 0.7,0.2 0.7,0.3 0.6,0.5 0.6,0.5 0.8,0.7 0.8,0.8 0.6,0.9 0.6,0.9 0.4,0.7 0.3,0.7 0.2,0.9 0.1,0.9 -0.1,0.6 -0.2,0.3 -0.2,0.2 -0.2,-0.1 0.0,-0.1 0.1,-0.1 0.2,0.1 0.3,0.1 0.4,-0.0 0.4,-0.1 0.5,-0.1 0.6),(0.2 0.2,0.2 0.4,0.4 0.4,0.5 0.2,0.5 0.1,0.5 0.0,0.2 0.0,0.2 0.2),(0.6 0.1,0.8 0.1,0.8 -0.1,0.6 -0.1,0.6 0.1))'
-    if ogrtest.check_feature_geometry(feat, wkt):
-        print(feat.GetGeometryRef())
-        return 'fail'
+    assert not ogrtest.check_feature_geometry(feat, wkt), feat.GetGeometryRef()
 
     ds = None
 
@@ -1526,9 +1343,7 @@ def test_ogr_gml_36(GML_FACE_HOLE_NEGATIVE='NO'):
     gdal.SetConfigOption('GML_FACE_HOLE_NEGATIVE', None)
     lyr = ds.GetLayerByName('Suolo')
     feat = lyr.GetNextFeature()
-    if ogrtest.check_feature_geometry(feat, wkt):
-        print(feat.GetGeometryRef())
-        return 'fail'
+    assert not ogrtest.check_feature_geometry(feat, wkt), feat.GetGeometryRef()
 
     ds = None
 
@@ -1585,16 +1400,12 @@ def test_ogr_gml_38(resolver='HUGE'):
         except OSError:
             pass
 
-    if gdal.GetLastErrorMsg() != '':
-        gdaltest.post_reason('did not expect error')
-        return 'fail'
+    assert gdal.GetLastErrorMsg() == '', 'did not expect error'
 
     lyr = ds.GetLayerByName('Suolo')
     feat = lyr.GetNextFeature()
     wkt = 'MULTIPOLYGON (((0.9 0.6,0.9 0.4,0.7 0.3,0.7 0.2,0.9 0.1,0.9 -0.1,0.6 -0.2,0.3 -0.2,0.2 -0.2,-0.1 0.0,-0.1 0.1,-0.1 0.2,0.1 0.3,0.1 0.4,-0.0 0.4,-0.1 0.5,-0.1 0.6,-0.0 0.7,0.2 0.7,0.3 0.6,0.5 0.6,0.5 0.8,0.7 0.8,0.8 0.6,0.9 0.6),(0.6 0.1,0.6 -0.1,0.8 -0.1,0.8 0.1,0.6 0.1),(0.2 0.4,0.2 0.2,0.2 0.0,0.5 0.0,0.5 0.1,0.5 0.2,0.4 0.4,0.2 0.4)))'
-    if ogrtest.check_feature_geometry(feat, wkt):
-        print(feat.GetGeometryRef())
-        return 'fail'
+    assert not ogrtest.check_feature_geometry(feat, wkt), feat.GetGeometryRef()
 
     ds = None
 
@@ -1619,8 +1430,7 @@ def test_ogr_gml_40():
     ds = ogr.Open('data/testLookForSimpleType.xml')
     lyr = ds.GetLayer(0)
     fld_defn = lyr.GetLayerDefn().GetFieldDefn(lyr.GetLayerDefn().GetFieldIndex('CITYNAME'))
-    if fld_defn.GetWidth() != 26:
-        return 'fail'
+    assert fld_defn.GetWidth() == 26
 
     return 'success'
 
@@ -1651,8 +1461,7 @@ def test_ogr_gml_41():
     ds.ReleaseResultSet(lyr)
 
     if val == 0:
-        if gdal.GetLastErrorMsg().find('not implemented due to missing libxml2 support') == -1:
-            return 'fail'
+        assert gdal.GetLastErrorMsg().find('not implemented due to missing libxml2 support') != -1
         return 'skip'
 
     gdaltest.have_gml_validation = True
@@ -1690,8 +1499,7 @@ def test_ogr_gml_42():
 
     ds.ReleaseResultSet(lyr)
 
-    if val == 0:
-        return 'fail'
+    assert val != 0
 
     return 'success'
 
@@ -1709,8 +1517,7 @@ def test_ogr_gml_43():
         return 'skip'
 
     ds = ogr.Open('data/wfs_typefeature.gml')
-    if ds is None:
-        return 'fail'
+    assert ds is not None
     ds = None
 
     try:
@@ -1725,9 +1532,7 @@ def test_ogr_gml_43():
         else:
             can_download_schema = gdal.GetDriverByName('HTTP') is not None
 
-        if can_download_schema:
-            gdaltest.post_reason('.gfs found, but schema could be downloaded')
-            return 'fail'
+        assert not can_download_schema, '.gfs found, but schema could be downloaded'
 
     return 'success'
 
@@ -1777,8 +1582,7 @@ def test_ogr_gml_44():
     lyr = ds.GetLayer(0)
 
     # fid and dbl
-    if lyr.GetLayerDefn().GetFieldCount() != 2:
-        return 'fail'
+    assert lyr.GetLayerDefn().GetFieldCount() == 2
 
     ds = None
 
@@ -1835,8 +1639,7 @@ def test_ogr_gml_45():
     gdal.Unlink('/vsimem/ogr_gml_45.gml')
     gdal.Unlink('/vsimem/ogr_gml_45.xsd')
 
-    if val == 0:
-        return 'fail'
+    assert val != 0
 
     return 'success'
 
@@ -1945,8 +1748,7 @@ def test_ogr_gml_46():
             gdal.Unlink('/vsimem/ogr_gml_46.gml')
             gdal.Unlink('/vsimem/ogr_gml_46.xsd')
 
-            if val == 0:
-                return 'fail'
+            assert val != 0
 
         # Only minor schema changes
         if frmt == 'GML3Deegree':
@@ -1982,9 +1784,7 @@ def test_ogr_gml_47():
         ds.ReleaseResultSet(lyr)
         ds = None
 
-        if val == 0:
-            gdaltest.post_reason('validation failed for file=%s' % filename)
-            return 'fail'
+        assert val != 0, ('validation failed for file=%s' % filename)
 
     return 'success'
 
@@ -2010,11 +1810,9 @@ def test_ogr_gml_48():
     ds = ogr.Open('data/schema_with_geom_in_complextype.xml')
     lyr = ds.GetLayer(0)
 
-    if lyr.GetGeomType() != ogr.wkbUnknown:
-        return 'fail'
+    assert lyr.GetGeomType() == ogr.wkbUnknown
 
-    if lyr.GetLayerDefn().GetFieldDefn(0).GetType() != ogr.OFTString:
-        return 'fail'
+    assert lyr.GetLayerDefn().GetFieldDefn(0).GetType() == ogr.OFTString
 
     ds = None
 
@@ -2044,16 +1842,14 @@ def test_ogr_gml_49():
     ds = ogr.Open('/vsimem/ogr_gml_49.gml')
     lyr = ds.GetLayer(0)
     feat = lyr.GetNextFeature()
-    if feat.GetGeometryRef().GetGeometryType() != ogr.wkbPolygon:
-        return 'fail'
+    assert feat.GetGeometryRef().GetGeometryType() == ogr.wkbPolygon
     ds = None
 
     # Now with .gfs file present (#6247)
     ds = ogr.Open('/vsimem/ogr_gml_49.gml')
     lyr = ds.GetLayer(0)
     feat = lyr.GetNextFeature()
-    if feat.GetGeometryRef().GetGeometryType() != ogr.wkbPolygon:
-        return 'fail'
+    assert feat.GetGeometryRef().GetGeometryType() == ogr.wkbPolygon
     ds = None
 
     gdal.Unlink('/vsimem/ogr_gml_49.gml')
@@ -2125,29 +1921,18 @@ def test_ogr_gml_51():
         f = open('tmp/ogr_gml_51.gml', 'rt')
         content = f.read()
         f.close()
-        if content.find("<FeatureCollection") == -1:
-            print(content)
-            return 'fail'
+        assert content.find("<FeatureCollection") != -1
         if frmt == 'GML3':
-            if content.find("<featureMember>") == -1:
-                print(content)
-                return 'fail'
-        if content.find("""<poly""") == -1:
-            print(content)
-            return 'fail'
-        if content.find("""<AREA>215229.266</AREA>""") == -1:
-            print(content)
-            return 'fail'
+            assert content.find("<featureMember>") != -1
+        assert content.find("""<poly""") != -1
+        assert content.find("""<AREA>215229.266</AREA>""") != -1
 
-        if content.find("""<gml:boundedBy><gml:Envelope><gml:lowerCorner>479647""") != -1:
-            print(content)
-            return 'fail'
+        assert content.find("""<gml:boundedBy><gml:Envelope><gml:lowerCorner>479647""") == -1
 
         ds = ogr.Open('tmp/ogr_gml_51.gml')
         lyr = ds.GetLayer(0)
         feat = lyr.GetNextFeature()
-        if feat is None:
-            return 'fail'
+        assert feat is not None
         ds = None
 
     return 'success'
@@ -2171,15 +1956,11 @@ def test_ogr_gml_52():
         ds = ogr.Open('data/fake_mtkgml.xml')
 
         lyr = ds.GetLayerByName('A')
-        if lyr.GetGeomType() != ogr.wkbPoint25D:
-            return 'fail'
+        assert lyr.GetGeomType() == ogr.wkbPoint25D
         srs = lyr.GetSpatialRef()
-        if srs is None:
-            return 'fail'
+        assert srs is not None
         wkt = srs.ExportToWkt()
-        if wkt.find('3067') < 0:
-            print(wkt)
-            return 'fail'
+        assert wkt.find('3067') >= 0
 
         feat = lyr.GetNextFeature()
         if feat.GetField('gid') != '1' or \
@@ -2192,19 +1973,16 @@ def test_ogr_gml_52():
             return 'fail'
 
         lyr = ds.GetLayerByName('B')
-        if lyr.GetGeomType() != ogr.wkbPolygon25D:
-            return 'fail'
+        assert lyr.GetGeomType() == ogr.wkbPolygon25D
         srs = lyr.GetSpatialRef()
-        if srs is None:
-            return 'fail'
+        assert srs is not None
         feat = lyr.GetNextFeature()
         if ogrtest.check_feature_geometry(feat, 'POLYGON ((280000 7000000 0,281000 7000000 0,281000 7001000 0,280000 7001000 0,280000 7000000 0))') != 0:
             feat.DumpReadable()
             return 'fail'
 
         lyr = ds.GetLayerByName('C')
-        if lyr.GetGeomType() != ogr.wkbLineString25D:
-            return 'fail'
+        assert lyr.GetGeomType() == ogr.wkbLineString25D
         feat = lyr.GetNextFeature()
         if ogrtest.check_feature_geometry(feat, 'LINESTRING (280000 7000000 0,281000 7000000 0,281000 7001000 0,280000 7001000 0,280000 7000000 0)') != 0:
             feat.DumpReadable()
@@ -2226,8 +2004,7 @@ def test_ogr_gml_53():
         return 'skip'
 
     ds = ogr.Open('data/archsites.xsd')
-    if ds is not None:
-        return 'fail'
+    assert ds is None
     ds = None
 
     return 'success'
@@ -2244,14 +2021,12 @@ def test_ogr_gml_54():
     gdal.Unlink('data/empty.gfs')
 
     ds = ogr.Open('data/empty.gml')
-    if ds is None:
-        return 'fail'
+    assert ds is not None
     ds = None
 
     # with .gfs now
     ds = ogr.Open('data/empty.gml')
-    if ds is None:
-        return 'fail'
+    assert ds is not None
     ds = None
 
     gdal.Unlink('data/empty.gfs')
@@ -2270,8 +2045,7 @@ def test_ogr_gml_55():
 
     ds = ogr.Open('data/ogr_gml_55.gml')
     lyr = ds.GetLayer(0)
-    if lyr.GetLayerDefn().GetFieldDefn(0).GetType() != ogr.OFTString:
-        return 'fail'
+    assert lyr.GetLayerDefn().GetFieldDefn(0).GetType() == ogr.OFTString
     ds = None
 
     try:
@@ -2298,39 +2072,27 @@ def test_ogr_gml_56():
     ds = ogr.Open('data/ogr_gml_56.gml')
     gdal.SetConfigOption('GML_REGISTRY', None)
     lyr = ds.GetLayerByName('mainFeature')
-    if lyr.GetSpatialRef() is None:
-        return 'fail'
+    assert lyr.GetSpatialRef() is not None
     feat = lyr.GetNextFeature()
-    if feat.GetFieldAsString(feat.GetFieldIndex('subFeatureProperty_href')) != '#subFeature.0':
-        return 'fail'
-    if feat.GetFieldAsStringList(feat.GetFieldIndex('subFeatureRepeatedProperty_href')) != ['#subFeatureRepeated.0', '#subFeatureRepeated.1']:
-        return 'fail'
-    if feat.GetGeomFieldRef(0).ExportToWkt() != 'POLYGON ((0 0,0 1,1 1,1 0,0 0))':
-        return 'fail'
-    if feat.GetGeomFieldRef(1).ExportToWkt() != 'POINT (10 10)':
-        return 'fail'
+    assert feat.GetFieldAsString(feat.GetFieldIndex('subFeatureProperty_href')) == '#subFeature.0'
+    assert feat.GetFieldAsStringList(feat.GetFieldIndex('subFeatureRepeatedProperty_href')) == ['#subFeatureRepeated.0', '#subFeatureRepeated.1']
+    assert feat.GetGeomFieldRef(0).ExportToWkt() == 'POLYGON ((0 0,0 1,1 1,1 0,0 0))'
+    assert feat.GetGeomFieldRef(1).ExportToWkt() == 'POINT (10 10)'
 
     lyr = ds.GetLayerByName('subFeature')
-    if lyr.GetLayerDefn().GetGeomFieldCount() != 0:
-        return 'fail'
+    assert lyr.GetLayerDefn().GetGeomFieldCount() == 0
     feat = lyr.GetNextFeature()
-    if feat.GetFieldAsStringList(feat.GetFieldIndex('subFeatureRepeatedProperty_href')) != ['#subFeatureRepeated.2']:
-        return 'fail'
-    if feat.GetField('foo') != 'bar':
-        return 'fail'
+    assert feat.GetFieldAsStringList(feat.GetFieldIndex('subFeatureRepeatedProperty_href')) == ['#subFeatureRepeated.2']
+    assert feat.GetField('foo') == 'bar'
 
     lyr = ds.GetLayerByName('subFeatureRepeated')
     feat = lyr.GetNextFeature()
-    if feat.GetField('gml_id') != 'subFeatureRepeated.2':
-        return 'fail'
-    if feat.GetField('bar') != 'baz':
-        return 'fail'
+    assert feat.GetField('gml_id') == 'subFeatureRepeated.2'
+    assert feat.GetField('bar') == 'baz'
     feat = lyr.GetNextFeature()
-    if feat.GetField('gml_id') != 'subFeatureRepeated.0':
-        return 'fail'
+    assert feat.GetField('gml_id') == 'subFeatureRepeated.0'
     feat = lyr.GetNextFeature()
-    if feat.GetField('gml_id') != 'subFeatureRepeated.1':
-        return 'fail'
+    assert feat.GetField('gml_id') == 'subFeatureRepeated.1'
     ds = None
 
     try:
@@ -2355,11 +2117,9 @@ def test_ogr_gml_57():
         if i == 3:
             options = ['FORMAT=GML3.2']
         ds = ogr.GetDriverByName('GML').CreateDataSource('/vsimem/ogr_gml_57.gml', options=options)
-        if ds.TestCapability(ogr.ODsCCreateGeomFieldAfterCreateLayer) != 1:
-            return 'fail'
+        assert ds.TestCapability(ogr.ODsCCreateGeomFieldAfterCreateLayer) == 1
         lyr = ds.CreateLayer('myLayer', geom_type=ogr.wkbNone)
-        if lyr.TestCapability(ogr.OLCCreateGeomField) != 1:
-            return 'fail'
+        assert lyr.TestCapability(ogr.OLCCreateGeomField) == 1
         geomfielddefn = ogr.GeomFieldDefn('first_geometry', ogr.wkbPoint)
         if i == 1 or i == 2:
             sr = osr.SpatialReference()
@@ -2391,16 +2151,11 @@ def test_ogr_gml_57():
         ds = ogr.Open('/vsimem/ogr_gml_57.gml')
         lyr = ds.GetLayer(0)
         feat = lyr.GetNextFeature()
-        if i == 1 and feat.GetGeomFieldRef(0).GetSpatialReference().ExportToWkt().find('32630') < 0:
-            return 'fail'
-        if i == 1 and feat.GetGeomFieldRef(1).GetSpatialReference().ExportToWkt().find('32630') < 0:
-            return 'fail'
-        if i == 2 and feat.GetGeomFieldRef(1).GetSpatialReference().ExportToWkt().find('32631') < 0:
-            return 'fail'
-        if feat.GetGeomFieldRef(0).ExportToWkt() != 'POINT (0 1)':
-            return 'fail'
-        if feat.GetGeomFieldRef(1).ExportToWkt() != 'LINESTRING (2 3,4 5)':
-            return 'fail'
+        assert not (i == 1 and feat.GetGeomFieldRef(0).GetSpatialReference().ExportToWkt().find('32630') < 0)
+        assert not (i == 1 and feat.GetGeomFieldRef(1).GetSpatialReference().ExportToWkt().find('32630') < 0)
+        assert not (i == 2 and feat.GetGeomFieldRef(1).GetSpatialReference().ExportToWkt().find('32631') < 0)
+        assert feat.GetGeomFieldRef(0).ExportToWkt() == 'POINT (0 1)'
+        assert feat.GetGeomFieldRef(1).ExportToWkt() == 'LINESTRING (2 3,4 5)'
         ds = None
 
         gdal.Unlink('/vsimem/ogr_gml_57.gml')
@@ -2422,16 +2177,11 @@ def test_ogr_gml_58():
     ds = ogr.Open('data/inspire_cadastralparcel.xml')
     lyr = ds.GetLayer(0)
     lyr_defn = lyr.GetLayerDefn()
-    if lyr_defn.GetGeomFieldCount() != 2:
-        return 'fail'
-    if lyr_defn.GetGeomFieldDefn(0).GetName() != 'geometry':
-        return 'fail'
-    if lyr_defn.GetGeomFieldDefn(0).GetType() != ogr.wkbMultiPolygon:
-        return 'fail'
-    if lyr_defn.GetGeomFieldDefn(1).GetName() != 'referencePoint':
-        return 'fail'
-    if lyr_defn.GetGeomFieldDefn(1).GetType() != ogr.wkbPoint:
-        return 'fail'
+    assert lyr_defn.GetGeomFieldCount() == 2
+    assert lyr_defn.GetGeomFieldDefn(0).GetName() == 'geometry'
+    assert lyr_defn.GetGeomFieldDefn(0).GetType() == ogr.wkbMultiPolygon
+    assert lyr_defn.GetGeomFieldDefn(1).GetName() == 'referencePoint'
+    assert lyr_defn.GetGeomFieldDefn(1).GetType() == ogr.wkbPoint
 
     feat = lyr.GetNextFeature()
     expected = [('gml_id', 'CadastralParcel-01'),
@@ -2449,15 +2199,9 @@ def test_ogr_gml_58():
                 ('administrativeUnit_href', '#AU.1'),
                 ('zoning_href', '#CZ.1')]
     for (key, val) in expected:
-        if feat.GetField(key) != val:
-            print(key)
-            print(val)
-            print(feat.GetField(key))
-            return 'fail'
-    if feat.GetGeomFieldRef(0).ExportToWkt() != 'MULTIPOLYGON (((2 49,2 50,3 50,3 49)))':
-        return 'fail'
-    if feat.GetGeomFieldRef(1).ExportToWkt() != 'POINT (2.5 49.5)':
-        return 'fail'
+        assert feat.GetField(key) == val
+    assert feat.GetGeomFieldRef(0).ExportToWkt() == 'MULTIPOLYGON (((2 49,2 50,3 50,3 49)))'
+    assert feat.GetGeomFieldRef(1).ExportToWkt() == 'POINT (2.5 49.5)'
 
     feat = lyr.GetNextFeature()
     expected = [('gml_id', 'CadastralParcel-02'),
@@ -2475,15 +2219,9 @@ def test_ogr_gml_58():
                 ('administrativeUnit_href', None),
                 ('zoning_href', None)]
     for (key, val) in expected:
-        if feat.GetField(key) != val:
-            print(key)
-            print(val)
-            print(feat.GetField(key))
-            return 'fail'
-    if feat.GetGeomFieldRef(0).ExportToWkt() != 'MULTIPOLYGON (((2 49,2 50,3 50,3 49)))':
-        return 'fail'
-    if feat.GetGeomFieldRef(1) is not None:
-        return 'fail'
+        assert feat.GetField(key) == val
+    assert feat.GetGeomFieldRef(0).ExportToWkt() == 'MULTIPOLYGON (((2 49,2 50,3 50,3 49)))'
+    assert feat.GetGeomFieldRef(1) is None
     feat = None
     lyr = None
     ds = None
@@ -2491,8 +2229,7 @@ def test_ogr_gml_58():
     ds = ogr.Open('data/inspire_basicpropertyunit.xml')
     lyr = ds.GetLayer(0)
     lyr_defn = lyr.GetLayerDefn()
-    if lyr_defn.GetGeomFieldCount() != 0:
-        return 'fail'
+    assert lyr_defn.GetGeomFieldCount() == 0
 
     feat = lyr.GetNextFeature()
     expected = [('gml_id', 'BasicPropertyUnit-01'),
@@ -2507,11 +2244,7 @@ def test_ogr_gml_58():
                 ('endLifespanVersion', '2003-01-01T00:00:00.0Z'),
                 ('administrativeUnit_href', '#AU.1')]
     for (key, val) in expected:
-        if feat.GetField(key) != val:
-            print(key)
-            print(val)
-            print(feat.GetField(key))
-            return 'fail'
+        assert feat.GetField(key) == val
 
     feat = lyr.GetNextFeature()
     expected = [('gml_id', 'BasicPropertyUnit-02'),
@@ -2526,11 +2259,7 @@ def test_ogr_gml_58():
                 ('endLifespanVersion', None),
                 ('administrativeUnit_href', None)]
     for (key, val) in expected:
-        if feat.GetField(key) != val:
-            print(key)
-            print(val)
-            print(feat.GetField(key))
-            return 'fail'
+        assert feat.GetField(key) == val
     feat = None
     lyr = None
     ds = None
@@ -2538,12 +2267,9 @@ def test_ogr_gml_58():
     ds = ogr.Open('data/inspire_cadastralboundary.xml')
     lyr = ds.GetLayer(0)
     lyr_defn = lyr.GetLayerDefn()
-    if lyr_defn.GetGeomFieldCount() != 1:
-        return 'fail'
-    if lyr_defn.GetGeomFieldDefn(0).GetName() != 'geometry':
-        return 'fail'
-    if lyr_defn.GetGeomFieldDefn(0).GetType() != ogr.wkbLineString:
-        return 'fail'
+    assert lyr_defn.GetGeomFieldCount() == 1
+    assert lyr_defn.GetGeomFieldDefn(0).GetName() == 'geometry'
+    assert lyr_defn.GetGeomFieldDefn(0).GetType() == ogr.wkbLineString
 
     feat = lyr.GetNextFeature()
     expected = [('gml_id', 'CadastralBoundary-01'),
@@ -2557,13 +2283,8 @@ def test_ogr_gml_58():
                 ('validTo', '2003-01-01T00:00:00.0Z'),
                 ('parcel_href', ['#Parcel.1', '#Parcel.2'])]
     for (key, val) in expected:
-        if feat.GetField(key) != val:
-            print(key)
-            print(val)
-            print(feat.GetField(key))
-            return 'fail'
-    if feat.GetGeomFieldRef(0).ExportToWkt() != 'LINESTRING (2 49,3 50)':
-        return 'fail'
+        assert feat.GetField(key) == val
+    assert feat.GetGeomFieldRef(0).ExportToWkt() == 'LINESTRING (2 49,3 50)'
 
     feat = lyr.GetNextFeature()
     expected = [('gml_id', 'CadastralBoundary-02'),
@@ -2577,13 +2298,8 @@ def test_ogr_gml_58():
                 ('validTo', None),
                 ('parcel_href', None)]
     for (key, val) in expected:
-        if feat.GetField(key) != val:
-            print(key)
-            print(val)
-            print(feat.GetField(key))
-            return 'fail'
-    if feat.GetGeomFieldRef(0).ExportToWkt() != 'LINESTRING (2 49,3 50)':
-        return 'fail'
+        assert feat.GetField(key) == val
+    assert feat.GetGeomFieldRef(0).ExportToWkt() == 'LINESTRING (2 49,3 50)'
     feat = None
     lyr = None
     ds = None
@@ -2591,16 +2307,11 @@ def test_ogr_gml_58():
     ds = ogr.Open('data/inspire_cadastralzoning.xml')
     lyr = ds.GetLayer(0)
     lyr_defn = lyr.GetLayerDefn()
-    if lyr_defn.GetGeomFieldCount() != 2:
-        return 'fail'
-    if lyr_defn.GetGeomFieldDefn(0).GetName() != 'geometry':
-        return 'fail'
-    if lyr_defn.GetGeomFieldDefn(0).GetType() != ogr.wkbMultiPolygon:
-        return 'fail'
-    if lyr_defn.GetGeomFieldDefn(1).GetName() != 'referencePoint':
-        return 'fail'
-    if lyr_defn.GetGeomFieldDefn(1).GetType() != ogr.wkbPoint:
-        return 'fail'
+    assert lyr_defn.GetGeomFieldCount() == 2
+    assert lyr_defn.GetGeomFieldDefn(0).GetName() == 'geometry'
+    assert lyr_defn.GetGeomFieldDefn(0).GetType() == ogr.wkbMultiPolygon
+    assert lyr_defn.GetGeomFieldDefn(1).GetName() == 'referencePoint'
+    assert lyr_defn.GetGeomFieldDefn(1).GetType() == ogr.wkbPoint
 
     feat = lyr.GetNextFeature()
     expected = [('gml_id', 'CadastralZoning-01'),
@@ -2625,15 +2336,9 @@ def test_ogr_gml_58():
                 ('validTo', '2003-01-01T00:00:00.0Z'),
                 ('upperLevelUnit_href', '#ulu.1')]
     for (key, val) in expected:
-        if feat.GetField(key) != val:
-            print(key)
-            print(val)
-            print(feat.GetField(key))
-            return 'fail'
-    if feat.GetGeomFieldRef(0).ExportToWkt() != 'MULTIPOLYGON (((2 49,2 50,3 50,3 49)))':
-        return 'fail'
-    if feat.GetGeomFieldRef(1).ExportToWkt() != 'POINT (2.5 49.5)':
-        return 'fail'
+        assert feat.GetField(key) == val
+    assert feat.GetGeomFieldRef(0).ExportToWkt() == 'MULTIPOLYGON (((2 49,2 50,3 50,3 49)))'
+    assert feat.GetGeomFieldRef(1).ExportToWkt() == 'POINT (2.5 49.5)'
 
     feat = lyr.GetNextFeature()
     expected = [('gml_id', 'CadastralZoning-02'),
@@ -2658,15 +2363,9 @@ def test_ogr_gml_58():
                 ('validTo', None),
                 ('upperLevelUnit_href', None)]
     for (key, val) in expected:
-        if feat.GetField(key) != val:
-            print(key)
-            print(val)
-            print(feat.GetField(key))
-            return 'fail'
-    if feat.GetGeomFieldRef(0).ExportToWkt() != 'MULTIPOLYGON (((2 49,2 50,3 50,3 49)))':
-        return 'fail'
-    if feat.GetGeomFieldRef(1) is not None:
-        return 'fail'
+        assert feat.GetField(key) == val
+    assert feat.GetGeomFieldRef(0).ExportToWkt() == 'MULTIPOLYGON (((2 49,2 50,3 50,3 49)))'
+    assert feat.GetGeomFieldRef(1) is None
     feat = None
     lyr = None
     ds = None
@@ -2705,11 +2404,7 @@ def test_ogr_gml_59():
                 ('name_others_lang', ['de']),
                 ('name_others', ['Deutsche name'])]
     for (key, val) in expected:
-        if feat.GetField(key) != val:
-            print(key)
-            print(val)
-            print(feat.GetField(key))
-            return 'fail'
+        assert feat.GetField(key) == val
     feat = None
     lyr = None
     ds = None
@@ -2732,17 +2427,13 @@ def test_ogr_gml_60():
     for _ in range(2):
         ds = ogr.Open('data/wfs_200_multiplelayers.gml')
         lyr = ds.GetLayerByName('road')
-        if lyr.GetFeatureCount() != 1:
-            return 'fail'
+        assert lyr.GetFeatureCount() == 1
         feat = lyr.GetNextFeature()
-        if feat.GetField('gml_id') != 'road.21':
-            return 'fail'
+        assert feat.GetField('gml_id') == 'road.21'
         lyr = ds.GetLayerByName('popplace')
-        if lyr.GetFeatureCount() != 1:
-            return 'fail'
+        assert lyr.GetFeatureCount() == 1
         feat = lyr.GetNextFeature()
-        if feat.GetField('gml_id') != 'popplace.BACMK':
-            return 'fail'
+        assert feat.GetField('gml_id') == 'popplace.BACMK'
         ds = None
 
     gdal.Unlink('data/wfs_200_multiplelayers.gfs')
@@ -2775,9 +2466,7 @@ def test_ogr_gml_61():
 
     ds = ogr.Open('data/gmlsubfeature.gml')
     lyr = ds.GetLayer(0)
-    if lyr.GetFeatureCount() != 2:
-        gdaltest.post_reason('did not get expected geometry column name')
-        return 'fail'
+    assert lyr.GetFeatureCount() == 2, 'did not get expected geometry column name'
 
     feat = lyr.GetNextFeature()
     if feat.GetField('gml_id') != 'Object.1' or feat.GetField('foo') != 'bar':
@@ -2816,8 +2505,7 @@ def test_ogr_gml_62():
     # Default behaviour
     ds = ogr.Open('tmp/gmlattributes.gml')
     lyr = ds.GetLayer(0)
-    if lyr.GetLayerDefn().GetFieldCount() != 1:
-        return 'fail'
+    assert lyr.GetLayerDefn().GetFieldCount() == 1
     ds = None
 
     # Test GML_ATTRIBUTES_TO_OGR_FIELDS=YES
@@ -2831,9 +2519,7 @@ def test_ogr_gml_62():
         if i == 0:
             gdal.SetConfigOption('GML_ATTRIBUTES_TO_OGR_FIELDS', None)
         lyr = ds.GetLayer(0)
-        if lyr.GetLayerDefn().GetFieldCount() != 4:
-            print(i)
-            return 'fail'
+        assert lyr.GetLayerDefn().GetFieldCount() == 4, i
         feat = lyr.GetNextFeature()
         if feat.GetField('element_attr1') != '1' or \
                 feat.GetField('element2_attr1') != 'a' or \
@@ -2877,17 +2563,14 @@ def test_ogr_gml_63():
 
     # check number of layers
     nlayers = ds.GetLayerCount()
-    if nlayers != 14:
-        return 'fail'
+    assert nlayers == 14
 
     # check name of first layer
     lyr = ds.GetLayer(0)
-    if lyr.GetName() != 'Staty':
-        return 'fail'
+    assert lyr.GetName() == 'Staty'
 
     # check geometry column name
-    if lyr.GetGeometryColumn() != 'DefinicniBod':
-        return 'fail'
+    assert lyr.GetGeometryColumn() == 'DefinicniBod'
 
     ds = None
 
@@ -2896,16 +2579,14 @@ def test_ogr_gml_63():
 
     # check number of layers
     nlayers = ds.GetLayerCount()
-    if nlayers != 11:
-        return 'fail'
+    assert nlayers == 11
 
     # check number of features
     nfeatures = 0
     for i in range(nlayers):
         lyr = ds.GetLayer(i)
         nfeatures += lyr.GetFeatureCount()
-    if nfeatures != 7:
-        return 'fail'
+    assert nfeatures == 7
 
     return 'success'
 
@@ -2925,9 +2606,7 @@ def test_ogr_gml_64():
             gdal.SetConfigOption('GML_PARSER', None)
             lyr = ds.GetLayer(0)
             feat = lyr.GetNextFeature()
-            if feat is None:
-                print(parser)
-                return 'fail'
+            assert feat is not None, parser
 
     return 'success'
 
@@ -2958,8 +2637,7 @@ def test_ogr_gml_65():
         data = gdal.VSIFReadL(1, 10000, f).decode('ascii')
         gdal.VSIFCloseL(f)
 
-        if data.find(expected) < 0:
-            return 'fail'
+        assert data.find(expected) >= 0
 
         ds = ogr.Open(filename)
         lyr = ds.GetLayer(0)
@@ -3118,8 +2796,7 @@ def test_ogr_gml_66():
         ds = ogr.Open(filename)
 
         lyr = ds.GetLayerByName('compoundcurve')
-        if lyr.GetGeomType() != ogr.wkbCompoundCurve:
-            return 'fail'
+        assert lyr.GetGeomType() == ogr.wkbCompoundCurve
         feat = lyr.GetNextFeature()
         if feat.GetGeometryRef().ExportToWkt() != 'COMPOUNDCURVE (CIRCULARSTRING (0 0,1 1,2 0))':
             feat.DumpReadable()
@@ -3134,8 +2811,7 @@ def test_ogr_gml_66():
             return 'fail'
 
         lyr = ds.GetLayerByName('curvepolygon')
-        if lyr.GetGeomType() != ogr.wkbCurvePolygon:
-            return 'fail'
+        assert lyr.GetGeomType() == ogr.wkbCurvePolygon
         feat = lyr.GetNextFeature()
         if feat.GetGeometryRef().ExportToWkt() != 'CURVEPOLYGON (CIRCULARSTRING (0 0,0.5 0.5,1 0,0.5 -0.5,0 0))':
             feat.DumpReadable()
@@ -3146,8 +2822,7 @@ def test_ogr_gml_66():
             return 'fail'
 
         lyr = ds.GetLayerByName('multisurface')
-        if lyr.GetGeomType() != ogr.wkbMultiSurface:
-            return 'fail'
+        assert lyr.GetGeomType() == ogr.wkbMultiSurface
         feat = lyr.GetNextFeature()
         if feat.GetGeometryRef().ExportToWkt() != 'MULTISURFACE (CURVEPOLYGON (CIRCULARSTRING (0 0,0.5 0.5,1 0,0.5 -0.5,0 0)))':
             feat.DumpReadable()
@@ -3158,8 +2833,7 @@ def test_ogr_gml_66():
             return 'fail'
 
         lyr = ds.GetLayerByName('multicurve')
-        if lyr.GetGeomType() != ogr.wkbMultiCurve:
-            return 'fail'
+        assert lyr.GetGeomType() == ogr.wkbMultiCurve
         feat = lyr.GetNextFeature()
         if feat.GetGeometryRef().ExportToWkt() != 'MULTICURVE (CIRCULARSTRING (0 0,0.5 0.5,1 0,0.5 -0.5,0 0))':
             feat.DumpReadable()
@@ -3170,33 +2844,28 @@ def test_ogr_gml_66():
             return 'fail'
 
         lyr = ds.GetLayerByName('polygon')
-        if lyr.GetGeomType() != ogr.wkbPolygon:
-            return 'fail'
+        assert lyr.GetGeomType() == ogr.wkbPolygon
         feat = lyr.GetNextFeature()
         if feat.GetGeometryRef().ExportToWkt() != 'POLYGON ((0 0,0 1,1 1,0 0))':
             feat.DumpReadable()
             return 'fail'
 
         lyr = ds.GetLayerByName('linestring')
-        if lyr.GetGeomType() != ogr.wkbLineString:
-            return 'fail'
+        assert lyr.GetGeomType() == ogr.wkbLineString
         feat = lyr.GetNextFeature()
         if feat.GetGeometryRef().ExportToWkt() != 'LINESTRING (0 0,0 1,1 1,0 0)':
             feat.DumpReadable()
             return 'fail'
 
         lyr = ds.GetLayerByName('multipolygon')
-        if lyr.GetGeomType() != ogr.wkbMultiPolygon:
-            print(lyr.GetGeomType())
-            return 'fail'
+        assert lyr.GetGeomType() == ogr.wkbMultiPolygon
         feat = lyr.GetNextFeature()
         if feat.GetGeometryRef().ExportToWkt() != 'MULTIPOLYGON (((0 0,0 1,1 1,0 0)))':
             feat.DumpReadable()
             return 'fail'
 
         lyr = ds.GetLayerByName('multilinestring')
-        if lyr.GetGeomType() != ogr.wkbMultiLineString:
-            return 'fail'
+        assert lyr.GetGeomType() == ogr.wkbMultiLineString
         feat = lyr.GetNextFeature()
         if feat.GetGeometryRef().ExportToWkt() != 'MULTILINESTRING ((0 0,0 1,1 1,0 0))':
             feat.DumpReadable()
@@ -3204,9 +2873,7 @@ def test_ogr_gml_66():
 
         lyr = ds.GetLayerByName('compoundcurve_untyped')
         if i != 0:
-            if lyr.GetGeomType() != ogr.wkbCompoundCurve:
-                print(lyr.GetGeomType())
-                return 'fail'
+            assert lyr.GetGeomType() == ogr.wkbCompoundCurve
             feat = lyr.GetNextFeature()
             if feat.GetGeometryRef().ExportToWkt() != 'COMPOUNDCURVE ((0 0,1 1,2 0))':
                 feat.DumpReadable()
@@ -3223,8 +2890,7 @@ def test_ogr_gml_66():
 
         lyr = ds.GetLayerByName('curvepolygon_untyped')
         if i != 0:
-            if lyr.GetGeomType() != ogr.wkbCurvePolygon:
-                return 'fail'
+            assert lyr.GetGeomType() == ogr.wkbCurvePolygon
             feat = lyr.GetNextFeature()
             if feat.GetGeometryRef().ExportToWkt() != 'CURVEPOLYGON ((0 0,0 1,1 1,0 0))':
                 feat.DumpReadable()
@@ -3241,8 +2907,7 @@ def test_ogr_gml_66():
 
         lyr = ds.GetLayerByName('multisurface_untyped')
         if i != 0:
-            if lyr.GetGeomType() != ogr.wkbMultiSurface:
-                return 'fail'
+            assert lyr.GetGeomType() == ogr.wkbMultiSurface
             feat = lyr.GetNextFeature()
             if feat.GetGeometryRef().ExportToWkt() != 'MULTISURFACE (((0 0,0 1,1 1,0 0)))':
                 feat.DumpReadable()
@@ -3259,8 +2924,7 @@ def test_ogr_gml_66():
 
         lyr = ds.GetLayerByName('multicurve_untyped')
         if i != 0:
-            if lyr.GetGeomType() != ogr.wkbMultiCurve:
-                return 'fail'
+            assert lyr.GetGeomType() == ogr.wkbMultiCurve
             feat = lyr.GetNextFeature()
             if feat.GetGeometryRef().ExportToWkt() != 'MULTICURVE ((0 0,0 1,1 1,0 0))':
                 feat.DumpReadable()
@@ -3339,30 +3003,24 @@ def test_ogr_gml_67():
 
         ds = ogr.Open(filename)
         lyr = ds.GetLayer(0)
-        if lyr.GetLayerDefn().GetFieldDefn(lyr.GetLayerDefn().GetFieldIndex('b1')).GetType() != ogr.OFTInteger or \
-           lyr.GetLayerDefn().GetFieldDefn(lyr.GetLayerDefn().GetFieldIndex('b1')).GetSubType() != ogr.OFSTBoolean:
-            print(i)
-            return 'fail'
-        if lyr.GetLayerDefn().GetFieldDefn(lyr.GetLayerDefn().GetFieldIndex('bool_list')).GetType() != ogr.OFTIntegerList or \
-           lyr.GetLayerDefn().GetFieldDefn(lyr.GetLayerDefn().GetFieldIndex('bool_list')).GetSubType() != ogr.OFSTBoolean:
-            print(i)
-            return 'fail'
+        assert (lyr.GetLayerDefn().GetFieldDefn(lyr.GetLayerDefn().GetFieldIndex('b1')).GetType() == ogr.OFTInteger and \
+           lyr.GetLayerDefn().GetFieldDefn(lyr.GetLayerDefn().GetFieldIndex('b1')).GetSubType() == ogr.OFSTBoolean), \
+            i
+        assert (lyr.GetLayerDefn().GetFieldDefn(lyr.GetLayerDefn().GetFieldIndex('bool_list')).GetType() == ogr.OFTIntegerList and \
+           lyr.GetLayerDefn().GetFieldDefn(lyr.GetLayerDefn().GetFieldIndex('bool_list')).GetSubType() == ogr.OFSTBoolean), \
+            i
         if i == 0:
-            if lyr.GetLayerDefn().GetFieldDefn(lyr.GetLayerDefn().GetFieldIndex('short')).GetType() != ogr.OFTInteger or \
-                    lyr.GetLayerDefn().GetFieldDefn(lyr.GetLayerDefn().GetFieldIndex('short')).GetSubType() != ogr.OFSTInt16:
-                print(i)
-                return 'fail'
+            assert (lyr.GetLayerDefn().GetFieldDefn(lyr.GetLayerDefn().GetFieldIndex('short')).GetType() == ogr.OFTInteger and \
+                    lyr.GetLayerDefn().GetFieldDefn(lyr.GetLayerDefn().GetFieldIndex('short')).GetSubType() == ogr.OFSTInt16), \
+                i
         if i == 0:
-            if lyr.GetLayerDefn().GetFieldDefn(lyr.GetLayerDefn().GetFieldIndex('float')).GetType() != ogr.OFTReal or \
-                    lyr.GetLayerDefn().GetFieldDefn(lyr.GetLayerDefn().GetFieldIndex('float')).GetSubType() != ogr.OFSTFloat32:
-                print(i)
-                return 'fail'
-        if lyr.GetLayerDefn().GetFieldDefn(lyr.GetLayerDefn().GetFieldIndex('int64')).GetType() != ogr.OFTInteger64:
-            print(i)
-            return 'fail'
-        if lyr.GetLayerDefn().GetFieldDefn(lyr.GetLayerDefn().GetFieldIndex('int64list')).GetType() != ogr.OFTInteger64List:
-            print(i)
-            return 'fail'
+            assert (lyr.GetLayerDefn().GetFieldDefn(lyr.GetLayerDefn().GetFieldIndex('float')).GetType() == ogr.OFTReal and \
+                    lyr.GetLayerDefn().GetFieldDefn(lyr.GetLayerDefn().GetFieldIndex('float')).GetSubType() == ogr.OFSTFloat32), \
+                i
+        assert lyr.GetLayerDefn().GetFieldDefn(lyr.GetLayerDefn().GetFieldIndex('int64')).GetType() == ogr.OFTInteger64, \
+            i
+        assert lyr.GetLayerDefn().GetFieldDefn(lyr.GetLayerDefn().GetFieldIndex('int64list')).GetType() == ogr.OFTInteger64List, \
+            i
         f = lyr.GetNextFeature()
         if f.GetField('b1') != 1 or f.GetField('b2') != 0 or f.GetFieldAsString('bool_list') != '(2:1,0)' or f.GetField('short') != -32768 or f.GetField('float') != 1.23:
             print(i)
@@ -3397,17 +3055,13 @@ def test_ogr_gml_68():
                         'MULTIPOLYGON (((0 0,0 1,1 1,1 0,0 0)),((10 0,10 1,11 1,11 0,10 0)))']
 
     lyr = ds.GetLayer(0)
-    if lyr.GetGeomType() != ogr.wkbMultiPolygon:
-        gdaltest.post_reason(' did not get expected layer geometry type')
-        return 'fail'
+    assert lyr.GetGeomType() == ogr.wkbMultiPolygon, \
+        ' did not get expected layer geometry type'
     for i in range(2):
         feat = lyr.GetNextFeature()
         geom = feat.GetGeometryRef()
         got_wkt = geom.ExportToWkt()
-        if got_wkt != expected_results[i]:
-            gdaltest.post_reason('did not get expected geometry')
-            print(got_wkt)
-            return 'fail'
+        assert got_wkt == expected_results[i], 'did not get expected geometry'
 
     ds = None
 
@@ -3446,8 +3100,7 @@ def test_ogr_gml_69():
     gdal.PushErrorHandler()
     ret = lyr.CreateFeature(f)
     gdal.PopErrorHandler()
-    if ret == 0:
-        return 'fail'
+    assert ret != 0
     f = None
 
     # Error case: missing non-nullable field
@@ -3456,22 +3109,17 @@ def test_ogr_gml_69():
     gdal.PushErrorHandler()
     ret = lyr.CreateFeature(f)
     gdal.PopErrorHandler()
-    if ret == 0:
-        return 'fail'
+    assert ret != 0
     f = None
 
     ds = None
 
     ds = gdal.OpenEx('/vsimem/ogr_gml_69.gml', open_options=['EMPTY_AS_NULL=NO'])
     lyr = ds.GetLayerByName('test')
-    if lyr.GetLayerDefn().GetFieldDefn(lyr.GetLayerDefn().GetFieldIndex('field_not_nullable')).IsNullable() != 0:
-        return 'fail'
-    if lyr.GetLayerDefn().GetFieldDefn(lyr.GetLayerDefn().GetFieldIndex('field_nullable')).IsNullable() != 1:
-        return 'fail'
-    if lyr.GetLayerDefn().GetGeomFieldDefn(lyr.GetLayerDefn().GetGeomFieldIndex('geomfield_not_nullable')).IsNullable() != 0:
-        return 'fail'
-    if lyr.GetLayerDefn().GetGeomFieldDefn(lyr.GetLayerDefn().GetGeomFieldIndex('geomfield_nullable')).IsNullable() != 1:
-        return 'fail'
+    assert lyr.GetLayerDefn().GetFieldDefn(lyr.GetLayerDefn().GetFieldIndex('field_not_nullable')).IsNullable() == 0
+    assert lyr.GetLayerDefn().GetFieldDefn(lyr.GetLayerDefn().GetFieldIndex('field_nullable')).IsNullable() == 1
+    assert lyr.GetLayerDefn().GetGeomFieldDefn(lyr.GetLayerDefn().GetGeomFieldIndex('geomfield_not_nullable')).IsNullable() == 0
+    assert lyr.GetLayerDefn().GetGeomFieldDefn(lyr.GetLayerDefn().GetGeomFieldIndex('geomfield_nullable')).IsNullable() == 1
     ds = None
 
     gdal.Unlink("/vsimem/ogr_gml_69.gml")
@@ -3522,13 +3170,9 @@ def test_ogr_gml_70():
 
 def ogr_gml_71_helper(ds):
 
-    if ds.GetLayerCount() != 1:
-        print(ds.GetLayerCount())
-        return 'fail'
+    assert ds.GetLayerCount() == 1
     lyr = ds.GetLayer(0)
-    if lyr.GetName() != 'join_table1_table2':
-        print(lyr.GetName())
-        return 'fail'
+    assert lyr.GetName() == 'join_table1_table2'
     fields = [('table1.gml_id', ogr.OFTString),
               ('table1.foo', ogr.OFTInteger),
               ('table1.bar', ogr.OFTInteger),
@@ -3536,28 +3180,14 @@ def ogr_gml_71_helper(ds):
               ('table2.bar', ogr.OFTInteger),
               ('table2.baz', ogr.OFTString)]
     layer_defn = lyr.GetLayerDefn()
-    if layer_defn.GetFieldCount() != len(fields):
-        print(layer_defn.GetFieldCount())
-        return 'fail'
+    assert layer_defn.GetFieldCount() == len(fields)
     for i, field in enumerate(fields):
         fld_defn = layer_defn.GetFieldDefn(i)
-        if fld_defn.GetName() != field[0]:
-            print(i)
-            print(fld_defn.GetName())
-            return 'fail'
-        if fld_defn.GetType() != field[1]:
-            print(i)
-            print(fld_defn.GetType())
-            return 'fail'
-    if layer_defn.GetGeomFieldCount() != 2:
-        print(layer_defn.GetGeomFieldCount())
-        return 'fail'
-    if layer_defn.GetGeomFieldDefn(0).GetName() != 'table1.geometry':
-        print(layer_defn.GetGeomFieldDefn(0).GetName())
-        return 'fail'
-    if layer_defn.GetGeomFieldDefn(1).GetName() != 'table2.geometry':
-        print(layer_defn.GetGeomFieldDefn(1).GetName())
-        return 'fail'
+        assert fld_defn.GetName() == field[0], i
+        assert fld_defn.GetType() == field[1], i
+    assert layer_defn.GetGeomFieldCount() == 2
+    assert layer_defn.GetGeomFieldDefn(0).GetName() == 'table1.geometry'
+    assert layer_defn.GetGeomFieldDefn(1).GetName() == 'table2.geometry'
     f = lyr.GetNextFeature()
     if f.GetField('table1.gml_id') != 'table1-1' or \
        f.GetField('table1.foo') != 1 or \
@@ -3644,9 +3274,7 @@ def test_ogr_gml_72():
     ds = None
 
     ds = ogr.Open('/vsimem/ogr_gml_72.gml')
-    if ds.GetMetadata() != {'NAME': 'name', 'DESCRIPTION': 'description'}:
-        print(ds.GetMetadata())
-        return 'fail'
+    assert ds.GetMetadata() == {'NAME': 'name', 'DESCRIPTION': 'description'}
     ds = None
 
     gdal.Unlink("/vsimem/ogr_gml_72.gml")
@@ -3658,9 +3286,7 @@ def test_ogr_gml_72():
     ds = None
 
     ds = ogr.Open('/vsimem/ogr_gml_72.gml')
-    if ds.GetMetadata() != {'NAME': 'name', 'DESCRIPTION': 'description'}:
-        print(ds.GetMetadata())
-        return 'fail'
+    assert ds.GetMetadata() == {'NAME': 'name', 'DESCRIPTION': 'description'}
     ds = None
 
     gdal.Unlink("/vsimem/ogr_gml_72.gml")
@@ -3688,18 +3314,13 @@ def test_ogr_gml_73():
         lyr = ds.GetLayer(i)
         sr = lyr.GetSpatialRef()
         got_wkt = sr.ExportToWkt()
-        if got_wkt.find('4326') < 0:
-            gdaltest.post_reason('did not get expected SRS')
-            print(got_wkt)
-            return 'fail'
+        assert got_wkt.find('4326') >= 0, 'did not get expected SRS'
 
         feat = lyr.GetNextFeature()
         geom = feat.GetGeometryRef()
         got_wkt = geom.ExportToWkt()
-        if got_wkt != 'POLYGON ((-180 -90,-180 90,180 90,180 -90,-180 -90))':
-            gdaltest.post_reason('did not get expected geometry')
-            print(got_wkt)
-            return 'fail'
+        assert got_wkt == 'POLYGON ((-180 -90,-180 90,180 90,180 -90,-180 -90))', \
+            'did not get expected geometry'
 
     ds = None
 
@@ -3722,13 +3343,8 @@ def test_ogr_gml_74():
     # With .xsd
     ds = gdal.OpenEx('data/expected_gml_gml32.gml', open_options=['FORCE_SRS_DETECTION=YES'])
     lyr = ds.GetLayer(0)
-    if lyr.GetSpatialRef() is None:
-        gdaltest.post_reason('did not get expected SRS')
-        return 'fail'
-    if lyr.GetFeatureCount() != 2:
-        gdaltest.post_reason('did not get expected feature count')
-        print(lyr.GetFeatureCount())
-        return 'fail'
+    assert lyr.GetSpatialRef() is not None, 'did not get expected SRS'
+    assert lyr.GetFeatureCount() == 2, 'did not get expected feature count'
 
     shutil.copy('data/expected_gml_gml32.gml', 'tmp/ogr_gml_74.gml')
     if os.path.exists('tmp/ogr_gml_74.gfs'):
@@ -3737,24 +3353,14 @@ def test_ogr_gml_74():
     # Without .xsd or .gfs
     ds = gdal.OpenEx('tmp/ogr_gml_74.gml', open_options=['FORCE_SRS_DETECTION=YES'])
     lyr = ds.GetLayer(0)
-    if lyr.GetSpatialRef() is None:
-        gdaltest.post_reason('did not get expected SRS')
-        return 'fail'
-    if lyr.GetFeatureCount() != 2:
-        gdaltest.post_reason('did not get expected feature count')
-        print(lyr.GetFeatureCount())
-        return 'fail'
+    assert lyr.GetSpatialRef() is not None, 'did not get expected SRS'
+    assert lyr.GetFeatureCount() == 2, 'did not get expected feature count'
 
     # With .gfs
     ds = gdal.OpenEx('tmp/ogr_gml_74.gml', open_options=['FORCE_SRS_DETECTION=YES'])
     lyr = ds.GetLayer(0)
-    if lyr.GetSpatialRef() is None:
-        gdaltest.post_reason('did not get expected SRS')
-        return 'fail'
-    if lyr.GetFeatureCount() != 2:
-        gdaltest.post_reason('did not get expected feature count')
-        print(lyr.GetFeatureCount())
-        return 'fail'
+    assert lyr.GetSpatialRef() is not None, 'did not get expected SRS'
+    assert lyr.GetFeatureCount() == 2, 'did not get expected feature count'
     ds = None
 
     os.unlink('tmp/ogr_gml_74.gml')
@@ -3799,8 +3405,7 @@ def test_ogr_gml_75():
 </Capabilities>""")
 
     ds = ogr.Open('/vsimem/ogr_gml_75.xml')
-    if ds is not None:
-        return 'fail'
+    assert ds is None
     gdal.Unlink('/vsimem/ogr_gml_75.xml')
 
     return 'success'
@@ -3856,25 +3461,21 @@ def test_ogr_gml_77():
 
     ds = ogr.Open('/vsimem/ogr_gml_77.xml')
     lyr = ds.GetLayer(0)
-    if lyr.GetSpatialRef().ExportToWkt().find('AXIS') >= 0:
-        return 'fail'
+    assert lyr.GetSpatialRef().ExportToWkt().find('AXIS') < 0
     f = lyr.GetNextFeature()
-    if f.GetGeometryRef().ExportToWkt() != 'POINT (2 49)':
-        return 'fail'
+    assert f.GetGeometryRef().ExportToWkt() == 'POINT (2 49)'
     ds = None
 
     ds = gdal.OpenEx('/vsimem/ogr_gml_77.xml', open_options=['SWAP_COORDINATES=YES'])
     lyr = ds.GetLayer(0)
     f = lyr.GetNextFeature()
-    if f.GetGeometryRef().ExportToWkt() != 'POINT (2 49)':
-        return 'fail'
+    assert f.GetGeometryRef().ExportToWkt() == 'POINT (2 49)'
     ds = None
 
     ds = gdal.OpenEx('/vsimem/ogr_gml_77.xml', open_options=['SWAP_COORDINATES=NO'])
     lyr = ds.GetLayer(0)
     f = lyr.GetNextFeature()
-    if f.GetGeometryRef().ExportToWkt() != 'POINT (49 2)':
-        return 'fail'
+    assert f.GetGeometryRef().ExportToWkt() == 'POINT (49 2)'
     ds = None
 
     gdal.Unlink('/vsimem/ogr_gml_77.xml')
@@ -3908,25 +3509,21 @@ def test_ogr_gml_78():
 
     ds = ogr.Open('/vsimem/ogr_gml_78.xml')
     lyr = ds.GetLayer(0)
-    if lyr.GetSpatialRef().ExportToWkt().find('AXIS') >= 0:
-        return 'fail'
+    assert lyr.GetSpatialRef().ExportToWkt().find('AXIS') < 0
     f = lyr.GetNextFeature()
-    if f.GetGeometryRef().ExportToWkt() != 'POINT (2 49)':
-        return 'fail'
+    assert f.GetGeometryRef().ExportToWkt() == 'POINT (2 49)'
     ds = None
 
     ds = gdal.OpenEx('/vsimem/ogr_gml_78.xml', open_options=['SWAP_COORDINATES=YES'])
     lyr = ds.GetLayer(0)
     f = lyr.GetNextFeature()
-    if f.GetGeometryRef().ExportToWkt() != 'POINT (49 2)':
-        return 'fail'
+    assert f.GetGeometryRef().ExportToWkt() == 'POINT (49 2)'
     ds = None
 
     ds = gdal.OpenEx('/vsimem/ogr_gml_78.xml', open_options=['SWAP_COORDINATES=NO'])
     lyr = ds.GetLayer(0)
     f = lyr.GetNextFeature()
-    if f.GetGeometryRef().ExportToWkt() != 'POINT (2 49)':
-        return 'fail'
+    assert f.GetGeometryRef().ExportToWkt() == 'POINT (2 49)'
     ds = None
 
     gdal.Unlink('/vsimem/ogr_gml_78.xml')
@@ -3963,10 +3560,8 @@ def test_ogr_gml_79():
             data = gdal.VSIFReadL(1, 10000, f).decode('utf-8')
             gdal.VSIFCloseL(f)
 
-        if data.find(expected_srsname) < 0 or data.find(expected_coords) < 0:
-            print(srsname_format)
-            print(data)
-            return 'fail'
+        assert data.find(expected_srsname) >= 0 and data.find(expected_coords) >= 0, \
+            srsname_format
 
     gdal.Unlink('/vsimem/ogr_gml_79.xml')
     gdal.Unlink('/vsimem/ogr_gml_79.xsd')
@@ -4061,28 +3656,21 @@ def test_ogr_gml_82():
 
     ds = ogr.Open('/vsimem/ogr_gml_82.gml')
     lyr = ds.GetLayer(0)
-    if lyr.GetFeatureCount() != 10:
-        return 'fail'
+    assert lyr.GetFeatureCount() == 10
     ds = None
 
     f = gdal.VSIFOpenL("/vsimem/ogr_gml_82.gml", "rb")
     if f is not None:
         data = gdal.VSIFReadL(1, 10000, f).decode('utf-8')
         gdal.VSIFCloseL(f)
-    if data.find('gml:FeatureCollection') < 0:
-        print(data)
-        return 'fail'
+    assert data.find('gml:FeatureCollection') >= 0
 
     f = gdal.VSIFOpenL("/vsimem/ogr_gml_82.xsd", "rb")
     if f is not None:
         data = gdal.VSIFReadL(1, 10000, f).decode('utf-8')
         gdal.VSIFCloseL(f)
-    if data.find('name = "FeatureCollection"') >= 0:
-        print(data)
-        return 'fail'
-    if data.find('gmlsf') >= 0:
-        print(data)
-        return 'fail'
+    assert data.find('name = "FeatureCollection"') < 0
+    assert data.find('gmlsf') < 0
 
     gdal.Unlink('/vsimem/ogr_gml_82.gml')
     gdal.Unlink('/vsimem/ogr_gml_82.xsd')
diff --git a/autotest/ogr/ogr_gmlas.py b/autotest/ogr/ogr_gmlas.py
index 4e7ff84e1df7..8a7d2aa63914 100755
--- a/autotest/ogr/ogr_gmlas.py
+++ b/autotest/ogr/ogr_gmlas.py
@@ -98,8 +98,7 @@ def test_ogr_gmlas_basic():
         gdal.SetConfigOption('GDAL_XML_VALIDATION', 'NO')
 
     ds = ogr.Open('GMLAS:data/gmlas/gmlas_test1.xml')
-    if ds is None:
-        return 'fail'
+    assert ds is not None
     ds = None
 
     # Skip tests when -fsanitize is used
@@ -131,9 +130,7 @@ def test_ogr_gmlas_test_ogrsf():
 
     ret = gdaltest.runexternal(test_cli_utilities.get_test_ogrsf_path() + ' -ro GMLAS:data/gmlas/gmlas_test1.xml')
 
-    if ret.find('INFO') == -1 or ret.find('ERROR') != -1:
-        print(ret)
-        return 'fail'
+    assert ret.find('INFO') != -1 and ret.find('ERROR') == -1
 
     return 'success'
 
@@ -160,8 +157,7 @@ def test_ogr_gmlas_virtual_file():
 </xs:schema>""")
 
     ds = gdal.OpenEx('GMLAS:/vsimem/ogr_gmlas_8.xml')
-    if ds is None:
-        return 'fail'
+    assert ds is not None
 
     gdal.Unlink('/vsimem/ogr_gmlas_8.xml')
     gdal.Unlink('/vsimem/ogr_gmlas_8.xsd')
@@ -178,8 +174,7 @@ def test_ogr_gmlas_datafile_with_xsd_option():
         return 'skip'
 
     ds = gdal.OpenEx('GMLAS:data/gmlas/gmlas_test1.xml', open_options=['XSD=data/gmlas/gmlas_test1.xsd'])
-    if ds is None:
-        return 'fail'
+    assert ds is not None
 
     return 'success'
 
@@ -193,8 +188,7 @@ def test_ogr_gmlas_no_datafile_with_xsd_option():
         return 'skip'
 
     ds = gdal.OpenEx('GMLAS:', open_options=['XSD=data/gmlas/gmlas_test1.xsd'])
-    if ds is None:
-        return 'fail'
+    assert ds is not None
 
     return 'success'
 
@@ -209,11 +203,8 @@ def test_ogr_gmlas_no_datafile_xsd_which_is_not_xsd():
 
     with gdaltest.error_handler():
         ds = gdal.OpenEx('GMLAS:', open_options=['XSD=data/gmlas/gmlas_test1.xml'])
-    if ds is not None:
-        return 'fail'
-    if gdal.GetLastErrorMsg().find("invalid content in 'schema' element") < 0:
-        print(gdal.GetLastErrorMsg())
-        return 'fail'
+    assert ds is None
+    assert gdal.GetLastErrorMsg().find("invalid content in 'schema' element") >= 0
 
     return 'success'
 
@@ -228,11 +219,8 @@ def test_ogr_gmlas_no_datafile_no_xsd():
 
     with gdaltest.error_handler():
         ds = gdal.OpenEx('GMLAS:')
-    if ds is not None:
-        return 'fail'
-    if gdal.GetLastErrorMsg().find('XSD open option must be provided when no XML data file is passed') < 0:
-        print(gdal.GetLastErrorMsg())
-        return 'fail'
+    assert ds is None
+    assert gdal.GetLastErrorMsg().find('XSD open option must be provided when no XML data file is passed') >= 0
 
     return 'success'
 
@@ -247,11 +235,8 @@ def test_ogr_gmlas_non_existing_gml():
 
     with gdaltest.error_handler():
         ds = gdal.OpenEx('GMLAS:/vsimem/i_do_not_exist.gml')
-    if ds is not None:
-        return 'fail'
-    if gdal.GetLastErrorMsg().find('Cannot open /vsimem/i_do_not_exist.gml') < 0:
-        print(gdal.GetLastErrorMsg())
-        return 'fail'
+    assert ds is None
+    assert gdal.GetLastErrorMsg().find('Cannot open /vsimem/i_do_not_exist.gml') >= 0
 
     return 'success'
 
@@ -266,11 +251,8 @@ def test_ogr_gmlas_non_existing_xsd():
 
     with gdaltest.error_handler():
         ds = gdal.OpenEx('GMLAS:', open_options=['XSD=/vsimem/i_do_not_exist.xsd'])
-    if ds is not None:
-        return 'fail'
-    if gdal.GetLastErrorMsg().find('Cannot resolve /vsimem/i_do_not_exist.xsd') < 0:
-        print(gdal.GetLastErrorMsg())
-        return 'fail'
+    assert ds is None
+    assert gdal.GetLastErrorMsg().find('Cannot resolve /vsimem/i_do_not_exist.xsd') >= 0
 
     return 'success'
 
@@ -288,11 +270,8 @@ def test_ogr_gmlas_gml_without_schema_location():
 
     with gdaltest.error_handler():
         ds = gdal.OpenEx('GMLAS:/vsimem/ogr_gmlas_gml_without_schema_location.xml')
-    if ds is not None:
-        return 'fail'
-    if gdal.GetLastErrorMsg().find('No schema locations found when analyzing data file: XSD open option must be provided') < 0:
-        print(gdal.GetLastErrorMsg())
-        return 'fail'
+    assert ds is None
+    assert gdal.GetLastErrorMsg().find('No schema locations found when analyzing data file: XSD open option must be provided') >= 0
 
     gdal.Unlink('/vsimem/ogr_gmlas_gml_without_schema_location.xml')
 
@@ -309,11 +288,8 @@ def test_ogr_gmlas_invalid_schema():
 
     with gdaltest.error_handler():
         ds = gdal.OpenEx('GMLAS:data/gmlas/gmlas_invalid_schema.xml')
-    if ds is not None:
-        return 'fail'
-    if gdal.GetLastErrorMsg().find('invalid content') < 0:
-        print(gdal.GetLastErrorMsg())
-        return 'fail'
+    assert ds is None
+    assert gdal.GetLastErrorMsg().find('invalid content') >= 0
 
     return 'success'
 
@@ -330,11 +306,8 @@ def test_ogr_gmlas_invalid_xml():
     lyr = ds.GetLayer(0)
     with gdaltest.error_handler():
         f = lyr.GetNextFeature()
-    if f is not None:
-        return 'fail'
-    if gdal.GetLastErrorMsg().find('input ended before all started tags were ended') < 0:
-        print(gdal.GetLastErrorMsg())
-        return 'fail'
+    assert f is None
+    assert gdal.GetLastErrorMsg().find('input ended before all started tags were ended') >= 0
 
     return 'success'
 
@@ -348,9 +321,7 @@ def test_ogr_gmlas_gml_Reference():
         return 'skip'
 
     ds = ogr.Open('GMLAS:data/gmlas/gmlas_test_targetelement.xml')
-    if ds.GetLayerCount() != 3:
-        print(ds.GetLayerCount())
-        return 'fail'
+    assert ds.GetLayerCount() == 3
 
     lyr = ds.GetLayerByName('main_elt')
     with gdaltest.error_handler():
@@ -377,27 +348,20 @@ def test_ogr_gmlas_same_element_in_different_ns():
         return 'skip'
 
     ds = gdal.OpenEx('GMLAS:data/gmlas/gmlas_same_element_in_different_ns.xml')
-    if ds is None:
-        return 'fail'
+    assert ds is not None
     # for i in range(ds.GetLayerCount()):
     #    print(ds.GetLayer(i).GetName())
 
-    if ds.GetLayerCount() != 5:
-        print(ds.GetLayerCount())
-        return 'fail'
+    assert ds.GetLayerCount() == 5
     lyr = ds.GetLayerByName('elt')
     f = lyr.GetNextFeature()
     if f.IsFieldSet('abstractElt_other_ns_realizationOfAbstractElt_pkid') == 0:
         f.DumpReadable()
         return 'fail'
-    if ds.GetLayerByName('myns_realizationOfAbstractElt') is None:
-        return 'fail'
-    if ds.GetLayerByName('other_ns_realizationOfAbstractElt') is None:
-        return 'fail'
-    if ds.GetLayerByName('elt_elt2_abstractElt_myns_realizationOfAbstractElt') is None:
-        return 'fail'
-    if ds.GetLayerByName('elt_elt2_abstractElt_other_ns_realizationOfAbstractElt') is None:
-        return 'fail'
+    assert ds.GetLayerByName('myns_realizationOfAbstractElt') is not None
+    assert ds.GetLayerByName('other_ns_realizationOfAbstractElt') is not None
+    assert ds.GetLayerByName('elt_elt2_abstractElt_myns_realizationOfAbstractElt') is not None
+    assert ds.GetLayerByName('elt_elt2_abstractElt_other_ns_realizationOfAbstractElt') is not None
 
     return 'success'
 
@@ -411,8 +375,7 @@ def test_ogr_gmlas_corner_case_relative_path():
         return 'skip'
 
     ds = ogr.Open('GMLAS:../ogr/data/gmlas/gmlas_test1.xml')
-    if ds is None:
-        return 'fail'
+    assert ds is not None
 
     return 'success'
 
@@ -432,12 +395,9 @@ def test_ogr_gmlas_unexpected_repeated_element():
     if f is None or f['foo'] != 'foo_again':  # somewhat arbitrary to keep the latest one!
         f.DumpReadable()
         return 'fail'
-    if gdal.GetLastErrorMsg().find('Unexpected element myns:main_elt/myns:foo') < 0:
-        print(gdal.GetLastErrorMsg())
-        return 'fail'
+    assert gdal.GetLastErrorMsg().find('Unexpected element myns:main_elt/myns:foo') >= 0
     f = lyr.GetNextFeature()
-    if f is not None:
-        return 'fail'
+    assert f is None
     ds = None
 
     return 'success'
@@ -458,12 +418,9 @@ def test_ogr_gmlas_unexpected_repeated_element_variant():
     if f is None or f['foo'] != 'foo_again':  # somewhat arbitrary to keep the latest one!
         f.DumpReadable()
         return 'fail'
-    if gdal.GetLastErrorMsg().find('Unexpected element myns:main_elt/myns:foo') < 0:
-        print(gdal.GetLastErrorMsg())
-        return 'fail'
+    assert gdal.GetLastErrorMsg().find('Unexpected element myns:main_elt/myns:foo') >= 0
     f = lyr.GetNextFeature()
-    if f is not None:
-        return 'fail'
+    assert f is None
     ds = None
 
     return 'success'
@@ -482,9 +439,7 @@ def test_ogr_gmlas_geometryproperty():
     lyr = ds.GetLayer(0)
     with gdaltest.error_handler():
         geom_field_count = lyr.GetLayerDefn().GetGeomFieldCount()
-    if geom_field_count != 15:
-        print(geom_field_count)
-        return 'fail'
+    assert geom_field_count == 15
     f = lyr.GetNextFeature()
     if f['geometryProperty_xml'] != ' <gml:Point gml:id="poly.geom.Geometry" srsName="urn:ogc:def:crs:EPSG::4326"> <gml:pos>49 2</gml:pos> </gml:Point> ':
         f.DumpReadable()
@@ -504,9 +459,7 @@ def test_ogr_gmlas_geometryproperty():
         return 'fail'
     geom_idx = lyr.GetLayerDefn().GetGeomFieldIndex('geometryProperty')
     sr = lyr.GetLayerDefn().GetGeomFieldDefn(geom_idx).GetSpatialRef()
-    if sr is None or sr.ExportToWkt().find('4326') < 0 or sr.ExportToWkt().find('AXIS') >= 0:
-        print(sr)
-        return 'fail'
+    assert not (sr is None or sr.ExportToWkt().find('4326') < 0 or sr.ExportToWkt().find('AXIS') >= 0)
     wkt = f.GetGeomFieldRef(geom_idx).ExportToWkt()
     # Axis swapping
     if wkt != 'POINT (2 49)':
@@ -518,29 +471,21 @@ def test_ogr_gmlas_geometryproperty():
         return 'fail'
     geom_idx = lyr.GetLayerDefn().GetGeomFieldIndex('pointProperty')
     sr = lyr.GetLayerDefn().GetGeomFieldDefn(geom_idx).GetSpatialRef()
-    if sr is None or sr.ExportToWkt().find('4326') < 0 or sr.ExportToWkt().find('AXIS') >= 0:
-        print(sr)
-        return 'fail'
+    assert not (sr is None or sr.ExportToWkt().find('4326') < 0 or sr.ExportToWkt().find('AXIS') >= 0)
     wkt = f.GetGeomFieldRef(geom_idx).ExportToWkt()
     if wkt != 'POINT (3 50)':
         f.DumpReadable()
         return 'fail'
     geom_idx = lyr.GetLayerDefn().GetGeomFieldIndex('lineStringProperty')
     sr = lyr.GetLayerDefn().GetGeomFieldDefn(geom_idx).GetSpatialRef()
-    if sr is None or sr.ExportToWkt().find('4326') < 0 or sr.ExportToWkt().find('AXIS') >= 0:
-        print(sr)
-        return 'fail'
-    if lyr.GetLayerDefn().GetGeomFieldDefn(geom_idx).GetType() != ogr.wkbLineString:
-        print(lyr.GetLayerDefn().GetGeomFieldDefn(geom_idx).GetType())
-        return 'fail'
+    assert not (sr is None or sr.ExportToWkt().find('4326') < 0 or sr.ExportToWkt().find('AXIS') >= 0)
+    assert lyr.GetLayerDefn().GetGeomFieldDefn(geom_idx).GetType() == ogr.wkbLineString
     wkt = f.GetGeomFieldRef(geom_idx).ExportToWkt()
     if wkt != 'LINESTRING (2 49)':
         f.DumpReadable()
         return 'fail'
     geom_idx = lyr.GetLayerDefn().GetGeomFieldIndex('pointPropertyRepeated')
-    if lyr.GetLayerDefn().GetGeomFieldDefn(geom_idx).GetType() != ogr.wkbUnknown:
-        print(lyr.GetLayerDefn().GetGeomFieldDefn(geom_idx).GetType())
-        return 'fail'
+    assert lyr.GetLayerDefn().GetGeomFieldDefn(geom_idx).GetType() == ogr.wkbUnknown
     wkt = f.GetGeomFieldRef(geom_idx).ExportToWkt()
     if wkt != 'GEOMETRYCOLLECTION (POINT (0 1),POINT (1 2),POINT (3 4))':
         f.DumpReadable()
@@ -619,9 +564,7 @@ def test_ogr_gmlas_abstractgeometry():
     ds = gdal.OpenEx('GMLAS:data/gmlas/gmlas_abstractgeometry_gml32.gml', open_options=[
         'CONFIG_FILE=<Configuration><LayerBuildingRules><GML><IncludeGeometryXML>true</IncludeGeometryXML></GML></LayerBuildingRules></Configuration>'])
     lyr = ds.GetLayer(0)
-    if lyr.GetLayerDefn().GetGeomFieldCount() != 2:
-        print(lyr.GetLayerDefn().GetGeomFieldCount())
-        return 'fail'
+    assert lyr.GetLayerDefn().GetGeomFieldCount() == 2
     f = lyr.GetNextFeature()
     if f['AbstractGeometry_xml'] != '<gml:Point gml:id="test.geom.0"><gml:pos>0 1</gml:pos></gml:Point>':
         f.DumpReadable()
@@ -663,8 +606,7 @@ def test_ogr_gmlas_validate():
 
     # By default check we are silent about validation error
     ds = gdal.OpenEx('GMLAS:data/gmlas/gmlas_validate.xml')
-    if ds is None:
-        return 'fail'
+    assert ds is not None
     myhandler = MyHandler()
     gdal.PushErrorHandler(myhandler.error_handler)
     gdal.SetConfigOption('GMLAS_WARN_UNEXPECTED', None)
@@ -672,34 +614,25 @@ def test_ogr_gmlas_validate():
     lyr.GetFeatureCount()
     gdal.SetConfigOption('GMLAS_WARN_UNEXPECTED', 'YES')
     gdal.PopErrorHandler()
-    if myhandler.error_list:
-        print(myhandler.error_list)
-        return 'fail'
+    assert not myhandler.error_list
 
     ds = gdal.OpenEx('GMLAS:data/gmlas/gmlas_validate.xml')
-    if ds is None:
-        return 'fail'
+    assert ds is not None
     myhandler = MyHandler()
     gdal.PushErrorHandler(myhandler.error_handler)
     lyr = ds.GetLayer(0)
     lyr.GetFeatureCount()
     gdal.PopErrorHandler()
     # Unexpected element with xpath=myns:main_elt/myns:bar (subxpath=myns:main_elt/myns:bar) found
-    if len(myhandler.error_list) < 2:
-        print(myhandler.error_list)
-        return 'fail'
+    assert len(myhandler.error_list) >= 2
 
     # Enable validation on a doc without validation errors
     myhandler = MyHandler()
     gdal.PushErrorHandler(myhandler.error_handler)
     ds = gdal.OpenEx('GMLAS:data/gmlas/gmlas_test1.xml', open_options=['VALIDATE=YES'])
     gdal.PopErrorHandler()
-    if ds is None:
-        print(myhandler.error_list)
-        return 'fail'
-    if myhandler.error_list:
-        print(myhandler.error_list)
-        return 'fail'
+    assert ds is not None, myhandler.error_list
+    assert not myhandler.error_list
 
     # Enable validation on a doc without validation error, and with explicit XSD
     gdal.FileFromMemBuffer('/vsimem/gmlas_test1.xml',
@@ -710,48 +643,32 @@ def test_ogr_gmlas_validate():
         'XSD=' + os.getcwd() + '/data/gmlas/gmlas_test1.xsd', 'VALIDATE=YES'])
     gdal.PopErrorHandler()
     gdal.Unlink('/vsimem/gmlas_test1.xml')
-    if ds is None:
-        print(myhandler.error_list)
-        return 'fail'
-    if myhandler.error_list:
-        print(myhandler.error_list)
-        return 'fail'
+    assert ds is not None, myhandler.error_list
+    assert not myhandler.error_list
 
     # Validation errors, but do not prevent dataset opening
     myhandler = MyHandler()
     gdal.PushErrorHandler(myhandler.error_handler)
     ds = gdal.OpenEx('GMLAS:data/gmlas/gmlas_validate.xml', open_options=['VALIDATE=YES'])
     gdal.PopErrorHandler()
-    if ds is None:
-        return 'fail'
-    if len(myhandler.error_list) != 5:
-        print(myhandler.error_list)
-        print(len(myhandler.error_list))
-        return 'fail'
+    assert ds is not None
+    assert len(myhandler.error_list) == 5
 
     # Validation errors and do prevent dataset opening
     myhandler = MyHandler()
     gdal.PushErrorHandler(myhandler.error_handler)
     ds = gdal.OpenEx('GMLAS:data/gmlas/gmlas_validate.xml', open_options=['VALIDATE=YES', 'FAIL_IF_VALIDATION_ERROR=YES'])
     gdal.PopErrorHandler()
-    if ds is not None:
-        return 'fail'
-    if len(myhandler.error_list) != 6:
-        print(myhandler.error_list)
-        print(len(myhandler.error_list))
-        return 'fail'
+    assert ds is None
+    assert len(myhandler.error_list) == 6
 
     # Test that validation without doc doesn't crash
     myhandler = MyHandler()
     gdal.PushErrorHandler(myhandler.error_handler)
     ds = gdal.OpenEx('GMLAS:', open_options=['XSD=data/gmlas/gmlas_test1.xsd', 'VALIDATE=YES'])
     gdal.PopErrorHandler()
-    if ds is None:
-        print(myhandler.error_list)
-        return 'fail'
-    if myhandler.error_list:
-        print(myhandler.error_list)
-        return 'fail'
+    assert ds is not None, myhandler.error_list
+    assert not myhandler.error_list
 
     return 'success'
 
@@ -805,16 +722,14 @@ def test_ogr_gmlas_conf():
     # Non existing file
     with gdaltest.error_handler():
         ds = gdal.OpenEx('GMLAS:data/gmlas/gmlas_test1.xml', open_options=['CONFIG_FILE=not_existing'])
-    if ds is not None:
-        return 'fail'
+    assert ds is None
 
     # Broken conf file
     gdal.FileFromMemBuffer('/vsimem/my_conf.xml', "<broken>")
     with gdaltest.error_handler():
         ds = gdal.OpenEx('GMLAS:data/gmlas/gmlas_test1.xml', open_options=['CONFIG_FILE=/vsimem/my_conf.xml'])
     gdal.Unlink('/vsimem/my_conf.xml')
-    if ds is not None:
-        return 'fail'
+    assert ds is None
 
     # Valid XML, but not validating
     gdal.FileFromMemBuffer('/vsimem/my_conf.xml', "<not_validating/>")
@@ -825,17 +740,14 @@ def test_ogr_gmlas_conf():
     # Inlined conf file + UseArrays = false
     ds = gdal.OpenEx('GMLAS:data/gmlas/gmlas_test1.xml', open_options=[
         'CONFIG_FILE=<Configuration><LayerBuildingRules><UseArrays>false</UseArrays></LayerBuildingRules></Configuration>'])
-    if ds is None:
-        return 'fail'
+    assert ds is not None
     lyr = ds.GetLayerByName('main_elt_string_array')
-    if lyr.GetFeatureCount() != 2:
-        return 'fail'
+    assert lyr.GetFeatureCount() == 2
 
     # AlwaysGenerateOGRId = true
     ds = gdal.OpenEx('GMLAS:data/gmlas/gmlas_test1.xml', open_options=[
         'CONFIG_FILE=<Configuration><LayerBuildingRules><AlwaysGenerateOGRId>true</AlwaysGenerateOGRId></LayerBuildingRules></Configuration>'])
-    if ds is None:
-        return 'fail'
+    assert ds is not None
     lyr = ds.GetLayerByName('main_elt')
     f = lyr.GetNextFeature()
     if f['ogr_pkid'].find('main_elt_1') < 0 or \
@@ -846,12 +758,10 @@ def test_ogr_gmlas_conf():
     # IncludeGeometryXML = false
     ds = gdal.OpenEx('GMLAS:data/gmlas/gmlas_geometryproperty_gml32.gml', open_options=[
         'CONFIG_FILE=<Configuration><LayerBuildingRules><GML><IncludeGeometryXML>false</IncludeGeometryXML></GML></LayerBuildingRules></Configuration>'])
-    if ds is None:
-        return 'fail'
+    assert ds is not None
     lyr = ds.GetLayer(0)
     with gdaltest.error_handler():
-        if lyr.GetLayerDefn().GetFieldIndex('geometryProperty_xml') >= 0:
-            return 'fail'
+        assert lyr.GetLayerDefn().GetFieldIndex('geometryProperty_xml') < 0
     f = lyr.GetNextFeature()
     geom_idx = lyr.GetLayerDefn().GetGeomFieldIndex('geometryProperty')
     wkt = f.GetGeomFieldRef(geom_idx).ExportToWkt()
@@ -862,28 +772,20 @@ def test_ogr_gmlas_conf():
     # ExposeMetadataLayers = true
     ds = gdal.OpenEx('GMLAS:data/gmlas/gmlas_abstractgeometry_gml32.gml', open_options=[
         'CONFIG_FILE=<Configuration><ExposeMetadataLayers>true</ExposeMetadataLayers></Configuration>'])
-    if ds is None:
-        return 'fail'
-    if ds.GetLayerCount() != 5:
-        print(ds.GetLayerCount())
-        return 'fail'
+    assert ds is not None
+    assert ds.GetLayerCount() == 5
     # Test override with open option
     ds = gdal.OpenEx('GMLAS:data/gmlas/gmlas_abstractgeometry_gml32.gml', open_options=[
         'EXPOSE_METADATA_LAYERS=NO',
         'CONFIG_FILE=<Configuration><ExposeMetadataLayers>true</ExposeMetadataLayers></Configuration>'])
-    if ds is None:
-        return 'fail'
-    if ds.GetLayerCount() != 1:
-        print(ds.GetLayerCount())
-        return 'fail'
+    assert ds is not None
+    assert ds.GetLayerCount() == 1
 
     # Turn on validation and error on validation
     with gdaltest.error_handler():
         ds = gdal.OpenEx('GMLAS:data/gmlas/gmlas_validate.xml', open_options=[
             'CONFIG_FILE=<Configuration><Validation enabled="true"><FailIfError>true</FailIfError></Validation></Configuration>'])
-    if ds is not None or gdal.GetLastErrorMsg().find('Validation') < 0:
-        print(gdal.GetLastErrorMsg())
-        return 'fail'
+    assert ds is None and gdal.GetLastErrorMsg().find('Validation') >= 0
 
     return 'success'
 
@@ -917,10 +819,7 @@ def test_ogr_gmlas_conf_ignored_xpath():
                             <XPath>%s</XPath>
                         </IgnoredXPaths>
                     </Configuration>""" % xpath])
-        if gdal.GetLastErrorMsg().find('XPath syntax') < 0:
-            print(xpath)
-            print(gdal.GetLastErrorMsg())
-            return 'fail'
+        assert gdal.GetLastErrorMsg().find('XPath syntax') >= 0, xpath
 
     # Test duplicating mapping
     with gdaltest.error_handler():
@@ -934,9 +833,7 @@ def test_ogr_gmlas_conf_ignored_xpath():
                         </Namespaces>
                     </IgnoredXPaths>
                 </Configuration>"""])
-    if gdal.GetLastErrorMsg().find('Prefix ns was already mapped') < 0:
-        print(gdal.GetLastErrorMsg())
-        return 'fail'
+    assert gdal.GetLastErrorMsg().find('Prefix ns was already mapped') >= 0
 
     # Test XPath with implicit namespace, and warning
     ds = gdal.OpenEx('GMLAS:data/gmlas/gmlas_test1.xml', open_options=[
@@ -946,16 +843,12 @@ def test_ogr_gmlas_conf_ignored_xpath():
                     <XPath>@otherns:id</XPath>
                 </IgnoredXPaths>
             </Configuration>"""])
-    if ds is None:
-        return 'fail'
+    assert ds is not None
     lyr = ds.GetLayerByName('main_elt')
-    if lyr.GetLayerDefn().GetFieldIndex('otherns_id') >= 0:
-        return 'fail'
+    assert lyr.GetLayerDefn().GetFieldIndex('otherns_id') < 0
     with gdaltest.error_handler():
         lyr.GetNextFeature()
-    if gdal.GetLastErrorMsg().find('Attribute with xpath=myns:main_elt/@otherns:id found in document but ignored') < 0:
-        print(gdal.GetLastErrorMsg())
-        return 'fail'
+    assert gdal.GetLastErrorMsg().find('Attribute with xpath=myns:main_elt/@otherns:id found in document but ignored') >= 0
 
     # Test XPath with explicit namespace, and warning suppression
     ds = gdal.OpenEx('GMLAS:data/gmlas/gmlas_test1.xml', open_options=[
@@ -967,13 +860,10 @@ def test_ogr_gmlas_conf_ignored_xpath():
                     <XPath warnIfIgnoredXPathFoundInDocInstance="false">@other_ns:id</XPath>
                 </IgnoredXPaths>
             </Configuration>"""])
-    if ds is None:
-        return 'fail'
+    assert ds is not None
     lyr = ds.GetLayerByName('main_elt')
     lyr.GetNextFeature()
-    if gdal.GetLastErrorMsg() != '':
-        print(gdal.GetLastErrorMsg())
-        return 'fail'
+    assert gdal.GetLastErrorMsg() == ''
 
     # Test various XPath syntaxes
     ds = gdal.OpenEx('GMLAS:', open_options=[
@@ -993,27 +883,19 @@ def test_ogr_gmlas_conf_ignored_xpath():
                     <XPath>foo/myns:long</XPath> <!-- no match -->
                 </IgnoredXPaths>
             </Configuration>"""])
-    if ds is None:
-        return 'fail'
+    assert ds is not None
     lyr = ds.GetLayerByName('main_elt')
 
     # Ignored fields
-    if lyr.GetLayerDefn().GetFieldIndex('optionalStrAttr') >= 0:
-        return 'fail'
-    if lyr.GetLayerDefn().GetFieldIndex('fixedValUnset') >= 0:
-        return 'fail'
-    if lyr.GetLayerDefn().GetFieldIndex('base_int') >= 0:
-        return 'fail'
-    if lyr.GetLayerDefn().GetFieldIndex('string') >= 0:
-        return 'fail'
-    if lyr.GetLayerDefn().GetFieldIndex('string_array') >= 0:
-        return 'fail'
+    assert lyr.GetLayerDefn().GetFieldIndex('optionalStrAttr') < 0
+    assert lyr.GetLayerDefn().GetFieldIndex('fixedValUnset') < 0
+    assert lyr.GetLayerDefn().GetFieldIndex('base_int') < 0
+    assert lyr.GetLayerDefn().GetFieldIndex('string') < 0
+    assert lyr.GetLayerDefn().GetFieldIndex('string_array') < 0
 
     # Present fields
-    if lyr.GetLayerDefn().GetFieldIndex('int_array') < 0:
-        return 'fail'
-    if lyr.GetLayerDefn().GetFieldIndex('long') < 0:
-        return 'fail'
+    assert lyr.GetLayerDefn().GetFieldIndex('int_array') >= 0
+    assert lyr.GetLayerDefn().GetFieldIndex('long') >= 0
 
     return 'success'
 
@@ -1106,9 +988,7 @@ def test_ogr_gmlas_cache():
     with gdaltest.error_handler():
         ds = gdal.OpenEx('GMLAS:/vsimem/ogr_gmlas_cache.xml', open_options=[
             'CONFIG_FILE=<Configuration><AllowRemoteSchemaDownload>false</AllowRemoteSchemaDownload><SchemaCache><Directory>/vsimem/my/gmlas_cache</Directory></SchemaCache></Configuration>'])
-    if ds is not None or gdal.GetLastErrorMsg().find('Cannot resolve') < 0:
-        print(gdal.GetLastErrorMsg())
-        return 'fail'
+    assert ds is None and gdal.GetLastErrorMsg().find('Cannot resolve') >= 0
 
     # Test invalid cache directory
     with gdaltest.error_handler():
@@ -1161,10 +1041,8 @@ def test_ogr_gmlas_cache():
     # Now re-open with the webserver turned off
     ds = gdal.OpenEx('GMLAS:/vsimem/ogr_gmlas_cache.xml', open_options=[
         'CONFIG_FILE=<Configuration><SchemaCache><Directory>/vsimem/my/gmlas_cache</Directory></SchemaCache></Configuration>'])
-    if ds is None:
-        return 'fail'
-    if ds.GetLayerCount() != 1:
-        return 'fail'
+    assert ds is not None
+    assert ds.GetLayerCount() == 1
 
     # Re try but ask for refresh
     with gdaltest.error_handler():
@@ -1182,9 +1060,7 @@ def test_ogr_gmlas_cache():
     with gdaltest.error_handler():
         ds = gdal.OpenEx('GMLAS:/vsimem/ogr_gmlas_cache.xml', open_options=[
             'CONFIG_FILE=<Configuration><SchemaCache><Directory>/vsimem/my/gmlas_cache</Directory></SchemaCache></Configuration>'])
-    if ds is not None or gdal.GetLastErrorMsg().find('Cannot resolve') < 0:
-        print(gdal.GetLastErrorMsg())
-        return 'fail'
+    assert ds is None and gdal.GetLastErrorMsg().find('Cannot resolve') >= 0
 
     # Cleanup
     gdal.Unlink('/vsimem/ogr_gmlas_cache.xml')
@@ -1262,8 +1138,7 @@ def test_ogr_gmlas_instantiate_only_gml_feature():
 
     ds = gdal.OpenEx('GMLAS:',
                      open_options=['XSD=data/gmlas/gmlas_instantiate_only_gml_feature.xsd'])
-    if ds.GetLayerCount() != 1:
-        return 'fail'
+    assert ds.GetLayerCount() == 1
     ds = None
 
     return 'success'
@@ -1303,32 +1178,25 @@ def test_ogr_gmlas_dataset_getnextfeature():
 
     ds = gdal.OpenEx('GMLAS:data/gmlas/gmlas_test1.xml')
 
-    if ds.TestCapability(ogr.ODsCRandomLayerRead) != 1:
-        return 'fail'
+    assert ds.TestCapability(ogr.ODsCRandomLayerRead) == 1
 
     count = 0
     last_l = None
     while True:
         f, lyr = ds.GetNextFeature()
         if f is None:
-            if lyr is not None:
-                return 'fail'
+            assert lyr is None
             break
         count += 1
         last_l = lyr
 
     base_count = 59
-    if count != base_count:
-        print(count)
-        return 'fail'
+    assert count == base_count
 
-    if last_l.GetName() != 'main_elt':
-        print(last_l.GetName())
-        return 'fail'
+    assert last_l.GetName() == 'main_elt'
 
     f, lyr = ds.GetNextFeature()
-    if f is not None or lyr is not None:
-        return 'fail'
+    assert f is None and lyr is None
 
     ds.ResetReading()
     last_pct = 0
@@ -1336,12 +1204,9 @@ def test_ogr_gmlas_dataset_getnextfeature():
         f, l, pct = ds.GetNextFeature(include_pct=True)
         last_pct = pct
         if f is None:
-            if l is not None:
-                return 'fail'
+            assert l is None
             break
-    if last_pct != 1.0:
-        print(last_pct - 1.0)
-        return 'fail'
+    assert last_pct == 1.0
 
     ds = gdal.OpenEx('GMLAS:data/gmlas/gmlas_test1.xml', open_options=['EXPOSE_METADATA_LAYERS=YES'])
     fc_map = {}
@@ -1357,8 +1222,7 @@ def test_ogr_gmlas_dataset_getnextfeature():
     while True:
         f, lyr = ds.GetNextFeature()
         if f is None:
-            if lyr is not None:
-                return 'fail'
+            assert lyr is None
             break
         count += 1
 
@@ -1367,13 +1231,10 @@ def test_ogr_gmlas_dataset_getnextfeature():
     expected_count += fc_map['_ogr_layers_metadata']
     expected_count += fc_map['_ogr_layer_relationships']
     expected_count += fc_map['_ogr_other_metadata']
-    if count != expected_count:
-        print(count)
-        return 'fail'
+    assert count == expected_count
 
     f, lyr = ds.GetNextFeature()
-    if f is not None or lyr is not None:
-        return 'fail'
+    assert f is None and lyr is None
 
     ds.ResetReading()
 
@@ -1381,15 +1242,11 @@ def test_ogr_gmlas_dataset_getnextfeature():
     while True:
         f, lyr = ds.GetNextFeature()
         if f is None:
-            if lyr is not None:
-                return 'fail'
+            assert lyr is None
             break
         count += 1
 
-    if count != expected_count:
-        print(count)
-        print(expected_count)
-        return 'fail'
+    assert count == expected_count
 
     for layers in [['_ogr_fields_metadata'],
                    ['_ogr_layers_metadata'],
@@ -1409,19 +1266,14 @@ def test_ogr_gmlas_dataset_getnextfeature():
         while True:
             f, lyr = ds.GetNextFeature()
             if f is None:
-                if lyr is not None:
-                    return 'fail'
+                assert lyr is None
                 break
             count += 1
 
-        if count != expected_count:
-            print(count)
-            print(expected_count)
-            return 'fail'
+        assert count == expected_count
 
         f, lyr = ds.GetNextFeature()
-        if f is not None or lyr is not None:
-            return 'fail'
+        assert f is None and lyr is None
 
     # Test iterating over metadata layers on XSD-only based dataset
     ds = gdal.OpenEx('GMLAS:', open_options=['XSD=data/gmlas/gmlas_test1.xsd', 'EXPOSE_METADATA_LAYERS=YES'])
@@ -1430,15 +1282,12 @@ def test_ogr_gmlas_dataset_getnextfeature():
     while True:
         f, lyr = ds.GetNextFeature()
         if f is None:
-            if lyr is not None:
-                return 'fail'
+            assert lyr is None
             break
         count += 1
         last_l = lyr
 
-    if count == 0:
-        print(count)
-        return 'fail'
+    assert count != 0
 
     return 'success'
 
@@ -1459,8 +1308,7 @@ def test_ogr_gmlas_inline_identifier():
             print(ds.GetLayer(i).GetName())
         return 'fail'
     lyr = ds.GetLayer(0)
-    if lyr.GetLayerDefn().GetFieldIndex('identifier_foo') < 0:
-        return 'fail'
+    assert lyr.GetLayerDefn().GetFieldIndex('identifier_foo') >= 0
 
     return 'success'
 
@@ -1474,15 +1322,11 @@ def test_ogr_gmlas_avoid_same_name_inlined_classes():
         return 'skip'
 
     ds = gdal.OpenEx('GMLAS:', open_options=['XSD=data/gmlas/gmlas_avoid_same_name_inlined_classes.xsd'])
-    if ds.GetLayerCount() != 3:
-        print(ds.GetLayerCount())
-        return 'fail'
+    assert ds.GetLayerCount() == 3
     lyr = ds.GetLayerByName('myFeature_ns1_dt')
-    if lyr is None:
-        return 'fail'
+    assert lyr is not None
     lyr = ds.GetLayerByName('myFeature_ns2_dt')
-    if lyr is None:
-        return 'fail'
+    assert lyr is not None
 
     return 'success'
 
@@ -1501,9 +1345,7 @@ def test_ogr_gmlas_validate_ignored_fixed_attribute():
                 open_options=['VALIDATE=YES',
                               'CONFIG_FILE=<Configuration><IgnoredXPaths><XPath>@bar</XPath></IgnoredXPaths></Configuration>'])
     gdal.PopErrorHandler()
-    if myhandler.error_list:
-        print(myhandler.error_list)
-        return 'fail'
+    assert not myhandler.error_list
 
     return 'success'
 
@@ -1519,16 +1361,14 @@ def test_ogr_gmlas_remove_unused_layers_and_fields():
     ds = gdal.OpenEx('GMLAS:data/gmlas/gmlas_remove_unused_layers_and_fields.xml',
                      open_options=['REMOVE_UNUSED_LAYERS=YES',
                                    'REMOVE_UNUSED_FIELDS=YES'])
-    if ds.GetLayerCount() != 1:
-        return 'fail'
+    assert ds.GetLayerCount() == 1
     lyr = ds.GetLayer(0)
     f = lyr.GetNextFeature()
     if lyr.GetLayerDefn().GetFieldCount() != 4:
         print(lyr.GetLayerDefn().GetFieldCount())
         f.DumpReadable()
         return 'fail'
-    if f['used1'] != 'foo' or f['used2'] != 'bar' or f['nillable_nilReason'] != 'unknown':
-        return 'fail'
+    assert f['used1'] == 'foo' and f['used2'] == 'bar' and f['nillable_nilReason'] == 'unknown'
 
     lyr = ds.GetLayerByName('_ogr_layers_metadata')
     if lyr.GetFeatureCount() != 1:
@@ -2105,49 +1945,27 @@ def test_ogr_gmlas_identifier_truncation():
         'XSD=data/gmlas/gmlas_identifier_truncation.xsd',
         'CONFIG_FILE=<Configuration><LayerBuildingRules><IdentifierMaxLength>10</IdentifierMaxLength><PostgreSQLIdentifierLaundering>false</PostgreSQLIdentifierLaundering></LayerBuildingRules></Configuration>'])
     lyr = ds.GetLayerByName('v_l_i_clas')
-    if lyr is None:
-        print(ds.GetLayer(0).GetName())
-        return 'fail'
+    assert lyr is not None, ds.GetLayer(0).GetName()
     s = lyr.GetLayerDefn().GetFieldDefn(1).GetName()
-    if s != 'v_l_idTifi':
-        print(s)
-        return 'fail'
+    assert s == 'v_l_idTifi'
     s = lyr.GetLayerDefn().GetFieldDefn(2).GetName()
-    if s != 'an_lo_ide1':
-        print(s)
-        return 'fail'
+    assert s == 'an_lo_ide1'
     s = lyr.GetLayerDefn().GetFieldDefn(3).GetName()
-    if s != 'an_lo_ide2':
-        print(s)
-        return 'fail'
+    assert s == 'an_lo_ide2'
     s = lyr.GetLayerDefn().GetFieldDefn(4).GetName()
-    if s != 'x':
-        print(s)
-        return 'fail'
+    assert s == 'x'
     s = lyr.GetLayerDefn().GetFieldDefn(5).GetName()
-    if s != 'noTCAMELCa':
-        print(s)
-        return 'fail'
+    assert s == 'noTCAMELCa'
     s = lyr.GetLayerDefn().GetFieldDefn(6).GetName()
-    if s != 'suuuuuuuuu':
-        print(s)
-        return 'fail'
+    assert s == 'suuuuuuuuu'
     s = lyr.GetLayerDefn().GetFieldDefn(7).GetName()
-    if s != '_r_l_o_n_g':
-        print(s)
-        return 'fail'
+    assert s == '_r_l_o_n_g'
     lyr = ds.GetLayerByName('a_l_i_cla1')
-    if lyr is None:
-        print(ds.GetLayer(1).GetName())
-        return 'fail'
+    assert lyr is not None, ds.GetLayer(1).GetName()
     lyr = ds.GetLayerByName('a_l_i_cla2')
-    if lyr is None:
-        print(ds.GetLayer(2).GetName())
-        return 'fail'
+    assert lyr is not None, ds.GetLayer(2).GetName()
     lyr = ds.GetLayerByName('y')
-    if lyr is None:
-        print(ds.GetLayer(3).GetName())
-        return 'fail'
+    assert lyr is not None, ds.GetLayer(3).GetName()
     ds = None
 
     return 'success'
@@ -2165,21 +1983,13 @@ def test_ogr_gmlas_identifier_case_ambiguity():
         'XSD=data/gmlas/gmlas_identifier_case_ambiguity.xsd',
         'CONFIG_FILE=<Configuration><LayerBuildingRules><PostgreSQLIdentifierLaundering>false</PostgreSQLIdentifierLaundering></LayerBuildingRules></Configuration>'])
     lyr = ds.GetLayerByName('differentcase1')
-    if lyr is None:
-        print(ds.GetLayer(0).GetName())
-        return 'fail'
+    assert lyr is not None, ds.GetLayer(0).GetName()
     s = lyr.GetLayerDefn().GetFieldDefn(1).GetName()
-    if s != 'differentcase1':
-        print(s)
-        return 'fail'
+    assert s == 'differentcase1'
     s = lyr.GetLayerDefn().GetFieldDefn(2).GetName()
-    if s != 'DifferentCASE2':
-        print(s)
-        return 'fail'
+    assert s == 'DifferentCASE2'
     lyr = ds.GetLayerByName('DifferentCASE2')
-    if lyr is None:
-        print(ds.GetLayer(0).GetName())
-        return 'fail'
+    assert lyr is not None, ds.GetLayer(0).GetName()
     ds = None
 
     return 'success'
@@ -2205,8 +2015,7 @@ def test_ogr_gmlas_writer():
     tmp_ds = None
     gdal.Unlink('/vsimem/ogr_gmlas_writer.db')
 
-    if ret_ds is None:
-        return 'fail'
+    assert ret_ds is not None
 
     return 'success'
 
@@ -2227,9 +2036,7 @@ def test_ogr_gmlas_writer_check_xml_xsd():
     pos = got.find('http://myns ') + len('http://myns ')
     pos_end = got.find('"', pos)
     absolute_xsd = got[pos:pos_end]
-    if not absolute_xsd.endswith('gmlas_test1.xsd') or not os.path.exists(absolute_xsd):
-        print(absolute_xsd)
-        return 'fail'
+    assert absolute_xsd.endswith('gmlas_test1.xsd') and os.path.exists(absolute_xsd)
     got = got.replace(absolute_xsd, 'gmlas_test1.xsd')
 
     expected = open('data/gmlas/gmlas_test1_generated.xml', 'rt').read()
@@ -2249,9 +2056,7 @@ def test_ogr_gmlas_writer_check_xml_xsd():
     pos = got.find('schemaLocation="') + len('schemaLocation="')
     pos_end = got.find('"', pos)
     absolute_xsd = got[pos:pos_end]
-    if not absolute_xsd.endswith('gmlas_test1.xsd') or not os.path.exists(absolute_xsd):
-        print(absolute_xsd)
-        return 'fail'
+    assert absolute_xsd.endswith('gmlas_test1.xsd') and os.path.exists(absolute_xsd)
     got = got.replace(absolute_xsd, 'gmlas_test1.xsd')
 
     expected = open('data/gmlas/gmlas_test1_generated.xsd', 'rt').read()
@@ -2357,37 +2162,25 @@ def test_ogr_gmlas_writer_gml():
                                                           'LAYERS={SPATIAL_LAYERS}'])
     tmp_ds = None
 
-    if ret_ds is None:
-        return 'fail'
+    assert ret_ds is not None
 
     f = gdal.VSIFOpenL('/vsimem/ogr_gmlas_writer_gml.xml', 'rb')
-    if f is None:
-        return 'fail'
+    assert f is not None
     content = gdal.VSIFReadL(1, 10000, f).decode('utf-8')
     gdal.VSIFCloseL(f)
 
     gdal.Unlink('/vsimem/ogr_gmlas_writer_gml.xml')
     gdal.Unlink('/vsimem/ogr_gmlas_writer_gml.xsd')
 
-    if content.find('xmlns:gml="http://fake_gml32"') < 0:
-        print(content)
-        return 'fail'
+    assert content.find('xmlns:gml="http://fake_gml32"') >= 0
 
-    if content.find('<ogr:geometryProperty><gml:Point srsName="http://www.opengis.net/def/crs/EPSG/0/4326" gml:id="hash_test_1.geom0"><gml:pos>49 2</gml:pos></gml:Point></ogr:geometryProperty>') < 0:
-        print(content)
-        return 'fail'
+    assert content.find('<ogr:geometryProperty><gml:Point srsName="http://www.opengis.net/def/crs/EPSG/0/4326" gml:id="hash_test_1.geom0"><gml:pos>49 2</gml:pos></gml:Point></ogr:geometryProperty>') >= 0
 
-    if content.find('<ogr:pointProperty><gml:Point srsName="http://www.opengis.net/def/crs/EPSG/0/4326" gml:id="hash_test_1.geom2"><gml:pos>50 3</gml:pos></gml:Point></ogr:pointProperty>') < 0:
-        print(content)
-        return 'fail'
+    assert content.find('<ogr:pointProperty><gml:Point srsName="http://www.opengis.net/def/crs/EPSG/0/4326" gml:id="hash_test_1.geom2"><gml:pos>50 3</gml:pos></gml:Point></ogr:pointProperty>') >= 0
 
-    if content.find('      <ogr:pointPropertyRepeated><gml:Point gml:id="hash_test_1.geom13.0"><gml:pos>0 1</gml:pos></gml:Point></ogr:pointPropertyRepeated>') < 0:
-        print(content)
-        return 'fail'
+    assert content.find('      <ogr:pointPropertyRepeated><gml:Point gml:id="hash_test_1.geom13.0"><gml:pos>0 1</gml:pos></gml:Point></ogr:pointPropertyRepeated>') >= 0
 
-    if content.find('      <ogr:pointPropertyRepeated><gml:Point gml:id="hash_test_1.geom13.1"><gml:pos>1 2</gml:pos></gml:Point></ogr:pointPropertyRepeated>') < 0:
-        print(content)
-        return 'fail'
+    assert content.find('      <ogr:pointPropertyRepeated><gml:Point gml:id="hash_test_1.geom13.1"><gml:pos>1 2</gml:pos></gml:Point></ogr:pointPropertyRepeated>') >= 0
 
     return 'success'
 
@@ -2411,21 +2204,17 @@ def test_ogr_gmlas_writer_gml_assign_srs():
                                   reproject=False)
     tmp_ds = None
 
-    if ret_ds is None:
-        return 'fail'
+    assert ret_ds is not None
 
     f = gdal.VSIFOpenL('/vsimem/ogr_gmlas_writer_gml.xml', 'rb')
-    if f is None:
-        return 'fail'
+    assert f is not None
     content = gdal.VSIFReadL(1, 10000, f).decode('utf-8')
     gdal.VSIFCloseL(f)
 
     gdal.Unlink('/vsimem/ogr_gmlas_writer_gml.xml')
     gdal.Unlink('/vsimem/ogr_gmlas_writer_gml.xsd')
 
-    if content.find('http://www.opengis.net/def/crs/EPSG/0/32631') < 0:
-        print(content)
-        return 'fail'
+    assert content.find('http://www.opengis.net/def/crs/EPSG/0/32631') >= 0
 
     # No geometry, but to test that the proxied ExecuteSQL() works
 
@@ -2445,10 +2234,7 @@ def test_ogr_gmlas_writer_gml_assign_srs():
     tmp_ds = None
     gdal.Unlink('/vsimem/ogr_gmlas_writer.db')
 
-    if gdal.VSIStatL('/vsimem/gmlas_test1_generated_ref0.xml').size != gdal.VSIStatL('/vsimem/gmlas_test1_generated_asrs.xml').size:
-        print(gdal.VSIStatL('/vsimem/gmlas_test1_generated_ref0.xml').size)
-        print(gdal.VSIStatL('/vsimem/gmlas_test1_generated_asrs.xml').size)
-        return 'fail'
+    assert gdal.VSIStatL('/vsimem/gmlas_test1_generated_ref0.xml').size == gdal.VSIStatL('/vsimem/gmlas_test1_generated_asrs.xml').size
 
     gdal.Unlink('/vsimem/gmlas_test1_generated_ref0.xml')
     gdal.Unlink('/vsimem/gmlas_test1_generated_ref0.xsd')
@@ -2475,35 +2261,26 @@ def test_ogr_gmlas_writer_gml_original_xml():
                                   datasetCreationOptions=['WRAPPING=GMLAS_FEATURECOLLECTION'])
     tmp_ds = None
 
-    if ret_ds is None:
-        return 'fail'
+    assert ret_ds is not None
     ret_ds = None
 
     ds = gdal.OpenEx('GMLAS:/vsimem/ogr_gmlas_writer_gml.xml', open_options=['VALIDATE=YES'])
-    if ds is None or gdal.GetLastErrorMsg() != '':
-        return 'fail'
+    assert ds is not None and gdal.GetLastErrorMsg() == ''
     ds = None
 
     f = gdal.VSIFOpenL('/vsimem/ogr_gmlas_writer_gml.xml', 'rb')
-    if f is None:
-        return 'fail'
+    assert f is not None
     content = gdal.VSIFReadL(1, 10000, f).decode('utf-8')
     gdal.VSIFCloseL(f)
 
     gdal.Unlink('/vsimem/ogr_gmlas_writer_gml.xml')
     gdal.Unlink('/vsimem/ogr_gmlas_writer_gml.xsd')
 
-    if content.find('<ogr:geometryProperty> <gml:Point gml:id="poly.geom.Geometry" srsName="urn:ogc:def:crs:EPSG::4326"> <gml:pos>49 2</gml:pos> </gml:Point> </ogr:geometryProperty>') < 0:
-        print(content)
-        return 'fail'
+    assert content.find('<ogr:geometryProperty> <gml:Point gml:id="poly.geom.Geometry" srsName="urn:ogc:def:crs:EPSG::4326"> <gml:pos>49 2</gml:pos> </gml:Point> </ogr:geometryProperty>') >= 0
 
-    if content.find('      <ogr:pointPropertyRepeated><gml:Point gml:id="poly.geom.pointPropertyRepeated.1"><gml:pos>0 1</gml:pos></gml:Point></ogr:pointPropertyRepeated>') < 0:
-        print(content)
-        return 'fail'
+    assert content.find('      <ogr:pointPropertyRepeated><gml:Point gml:id="poly.geom.pointPropertyRepeated.1"><gml:pos>0 1</gml:pos></gml:Point></ogr:pointPropertyRepeated>') >= 0
 
-    if content.find('      <ogr:pointPropertyRepeated><gml:Point gml:id="poly.geom.pointPropertyRepeated.2"><gml:pos>1 2</gml:pos></gml:Point></ogr:pointPropertyRepeated>') < 0:
-        print(content)
-        return 'fail'
+    assert content.find('      <ogr:pointPropertyRepeated><gml:Point gml:id="poly.geom.pointPropertyRepeated.2"><gml:pos>1 2</gml:pos></gml:Point></ogr:pointPropertyRepeated>') >= 0
 
     return 'success'
 
@@ -2529,41 +2306,30 @@ def test_ogr_gmlas_writer_options():
                                                           'OUTPUT_XSD_FILENAME=/vsimem/my_schema.xsd'])
     tmp_ds = None
 
-    if ret_ds is None:
-        return 'fail'
+    assert ret_ds is not None
 
     f = gdal.VSIFOpenL('/vsimem/ogr_gmlas_writer_options.xml', 'rb')
-    if f is None:
-        return 'fail'
+    assert f is not None
     content = gdal.VSIFReadL(1, 10000, f).decode('utf-8')
     gdal.VSIFCloseL(f)
 
     gdal.Unlink('/vsimem/ogr_gmlas_writer_options.xml')
 
-    if gdal.VSIStatL('/vsimem/my_schema.xsd') is None:
-        return 'fail'
+    assert gdal.VSIStatL('/vsimem/my_schema.xsd') is not None
 
     gdal.Unlink('/vsimem/my_schema.xsd')
 
     # Test indentation size
-    if content.find('\n        <ogr:test gml:id="poly.0">') < 0:
-        print(content)
-        return 'fail'
+    assert content.find('\n        <ogr:test gml:id="poly.0">') >= 0
 
     # Test comment
-    if content.find('\n<!-- - - -a comment- - - -->') < 0:
-        print(content)
-        return 'fail'
+    assert content.find('\n<!-- - - -a comment- - - -->') >= 0
 
     # Test OUTPUT_XSD_FILENAME
-    if content.find('/vsimem/my_schema.xsd') < 0:
-        print(content)
-        return 'fail'
+    assert content.find('/vsimem/my_schema.xsd') >= 0
 
     # Test SRSNAME_FORMAT=OGC_URN
-    if content.find('<ogr:geometryProperty><gml:Point srsName="urn:ogc:def:crs:EPSG::4326" gml:id="hash_test_1.geom0"><gml:pos>49 2</gml:pos></gml:Point></ogr:geometryProperty>') < 0:
-        print(content)
-        return 'fail'
+    assert content.find('<ogr:geometryProperty><gml:Point srsName="urn:ogc:def:crs:EPSG::4326" gml:id="hash_test_1.geom0"><gml:pos>49 2</gml:pos></gml:Point></ogr:geometryProperty>') >= 0
 
     # Test TIMESTAMP option
     src_ds = gdal.OpenEx('GMLAS:data/gmlas/gmlas_geometryproperty_gml32_no_error.gml',
@@ -2574,24 +2340,19 @@ def test_ogr_gmlas_writer_options():
                                   datasetCreationOptions=['TIMESTAMP=1970-01-01T12:34:56Z', '@REOPEN_DATASET_WITH_GMLAS=NO'])
     tmp_ds = None
 
-    if ret_ds is None:
-        return 'fail'
+    assert ret_ds is not None
 
     f = gdal.VSIFOpenL('/vsimem/ogr_gmlas_writer_options.xml', 'rb')
-    if f is None:
-        return 'fail'
+    assert f is not None
     content = gdal.VSIFReadL(1, 10000, f).decode('utf-8')
     gdal.VSIFCloseL(f)
 
     gdal.Unlink('/vsimem/ogr_gmlas_writer_options.xml')
 
-    if gdal.VSIStatL('/vsimem/my_schema.xsd') is not None:
-        return 'fail'
+    assert gdal.VSIStatL('/vsimem/my_schema.xsd') is None
 
-    if content.find('timeStamp="1970-01-01T12:34:56Z"') < 0 or \
-       content.find('xsi:schemaLocation="http://www.opengis.net/wfs/2.0 http://schemas.opengis.net/wfs/2.0/wfs.xsd ') < 0:
-        print(content)
-        return 'fail'
+    assert (content.find('timeStamp="1970-01-01T12:34:56Z"') >= 0 and \
+       content.find('xsi:schemaLocation="http://www.opengis.net/wfs/2.0 http://schemas.opengis.net/wfs/2.0/wfs.xsd ') >= 0)
 
     # Test WFS20_SCHEMALOCATION option
     src_ds = gdal.OpenEx('GMLAS:data/gmlas/gmlas_geometryproperty_gml32_no_error.gml',
@@ -2602,8 +2363,7 @@ def test_ogr_gmlas_writer_options():
                                   datasetCreationOptions=['WFS20_SCHEMALOCATION=/vsimem/fake_wfs.xsd'])
     tmp_ds = None
 
-    if ret_ds is None:
-        return 'fail'
+    assert ret_ds is not None
 
     gdal.FileFromMemBuffer('/vsimem/fake_wfs.xsd',
                            """
@@ -2626,24 +2386,19 @@ def test_ogr_gmlas_writer_options():
     ds = gdal.OpenEx('GMLAS:/vsimem/ogr_gmlas_writer_options.xml', open_options=['VALIDATE=YES'])
     gdal.Unlink('/vsimem/fake_wfs.xsd')
 
-    if ds is None or gdal.GetLastErrorMsg() != '':
-        return 'fail'
+    assert ds is not None and gdal.GetLastErrorMsg() == ''
     ds = None
 
     f = gdal.VSIFOpenL('/vsimem/ogr_gmlas_writer_options.xml', 'rb')
-    if f is None:
-        return 'fail'
+    assert f is not None
     content = gdal.VSIFReadL(1, 10000, f).decode('utf-8')
     gdal.VSIFCloseL(f)
 
     gdal.Unlink('/vsimem/ogr_gmlas_writer_options.xml')
 
-    if gdal.VSIStatL('/vsimem/my_schema.xsd') is not None:
-        return 'fail'
+    assert gdal.VSIStatL('/vsimem/my_schema.xsd') is None
 
-    if content.find('xsi:schemaLocation="http://www.opengis.net/wfs/2.0 /vsimem/fake_wfs.xsd ') < 0:
-        print(content)
-        return 'fail'
+    assert content.find('xsi:schemaLocation="http://www.opengis.net/wfs/2.0 /vsimem/fake_wfs.xsd ') >= 0
 
     return 'success'
 
@@ -2659,9 +2414,7 @@ def test_ogr_gmlas_writer_errors():
     # Source dataset is empty
     with gdaltest.error_handler():
         ret_ds = gdal.VectorTranslate('/vsimem/valid.xml', gdal.GetDriverByName('Memory').Create('', 0, 0, 0, 0), format='GMLAS')
-    if ret_ds is not None or gdal.GetLastErrorMsg().find('Source dataset has no layers') < 0:
-        print(gdal.GetLastErrorMsg())
-        return 'fail'
+    assert ret_ds is None and gdal.GetLastErrorMsg().find('Source dataset has no layers') >= 0
 
     # Missing input schemas
     src_ds = gdal.OpenEx('GMLAS:data/gmlas/gmlas_geometryproperty_gml32_no_error.gml')
@@ -2669,17 +2422,13 @@ def test_ogr_gmlas_writer_errors():
     src_ds = None
     with gdaltest.error_handler():
         ret_ds = gdal.VectorTranslate('/vsimem/valid.xml', tmp_ds, format='GMLAS')
-    if ret_ds is not None or gdal.GetLastErrorMsg().find('Cannot establish schema since no INPUT_XSD creation option specified and no _ogr_other_metadata found in source dataset') < 0:
-        print(gdal.GetLastErrorMsg())
-        return 'fail'
+    assert ret_ds is None and gdal.GetLastErrorMsg().find('Cannot establish schema since no INPUT_XSD creation option specified and no _ogr_other_metadata found in source dataset') >= 0
 
     # Invalid input schema
     with gdaltest.error_handler():
         ret_ds = gdal.VectorTranslate('/vsimem/valid.xml', tmp_ds, format='GMLAS',
                                       datasetCreationOptions=['INPUT_XSD=/i_do_not/exist.xsd'])
-    if ret_ds is not None or gdal.GetLastErrorMsg().find('Cannot resolve /i_do_not/exist.xsd') < 0:
-        print(gdal.GetLastErrorMsg())
-        return 'fail'
+    assert ret_ds is None and gdal.GetLastErrorMsg().find('Cannot resolve /i_do_not/exist.xsd') >= 0
 
     # Invalid output .xml name
     src_ds = gdal.OpenEx('GMLAS:data/gmlas/gmlas_geometryproperty_gml32_no_error.gml',
@@ -2689,43 +2438,33 @@ def test_ogr_gmlas_writer_errors():
     with gdaltest.error_handler():
         ret_ds = gdal.VectorTranslate('/i_am/not/valid.xml', tmp_ds, format='GMLAS',
                                       datasetCreationOptions=['GENERATE_XSD=NO'])
-    if ret_ds is not None or gdal.GetLastErrorMsg().find('Cannot create /i_am/not/valid.xml') < 0:
-        print(gdal.GetLastErrorMsg())
-        return 'fail'
+    assert ret_ds is None and gdal.GetLastErrorMsg().find('Cannot create /i_am/not/valid.xml') >= 0
 
     # .xsd extension not allowed
     with gdaltest.error_handler():
         ret_ds = gdal.VectorTranslate('/i_am/not/valid.xsd', tmp_ds, format='GMLAS',
                                       datasetCreationOptions=['GENERATE_XSD=NO'])
-    if ret_ds is not None or gdal.GetLastErrorMsg().find('.xsd extension is not valid') < 0:
-        print(gdal.GetLastErrorMsg())
-        return 'fail'
+    assert ret_ds is None and gdal.GetLastErrorMsg().find('.xsd extension is not valid') >= 0
 
     # Invalid output .xsd name
     with gdaltest.error_handler():
         ret_ds = gdal.VectorTranslate('/vsimem/valid.xml', tmp_ds, format='GMLAS',
                                       datasetCreationOptions=['WRAPPING=GMLAS_FEATURECOLLECTION',
                                                               'OUTPUT_XSD_FILENAME=/i_am/not/valid.xsd'])
-    if ret_ds is not None or gdal.GetLastErrorMsg().find('Cannot create /i_am/not/valid.xsd') < 0:
-        print(gdal.GetLastErrorMsg())
-        return 'fail'
+    assert ret_ds is None and gdal.GetLastErrorMsg().find('Cannot create /i_am/not/valid.xsd') >= 0
     gdal.Unlink('/vsimem/valid.xml')
 
     # Invalid CONFIG_FILE
     with gdaltest.error_handler():
         ret_ds = gdal.VectorTranslate('/vsimem/valid.xml', tmp_ds, format='GMLAS',
                                       datasetCreationOptions=['CONFIG_FILE=/i/do_not/exist'])
-    if ret_ds is not None or gdal.GetLastErrorMsg().find('Loading of configuration failed') < 0:
-        print(gdal.GetLastErrorMsg())
-        return 'fail'
+    assert ret_ds is None and gdal.GetLastErrorMsg().find('Loading of configuration failed') >= 0
 
     # Invalid layer name
     with gdaltest.error_handler():
         ret_ds = gdal.VectorTranslate('/vsimem/valid.xml', tmp_ds, format='GMLAS',
                                       datasetCreationOptions=['LAYERS=foo'])
-    if ret_ds is not None or gdal.GetLastErrorMsg().find('Layer foo specified in LAYERS option does not exist') < 0:
-        print(gdal.GetLastErrorMsg())
-        return 'fail'
+    assert ret_ds is None and gdal.GetLastErrorMsg().find('Layer foo specified in LAYERS option does not exist') >= 0
     gdal.Unlink('/vsimem/valid.xml')
 
     # _ogr_layers_metadata not found
@@ -2733,9 +2472,7 @@ def test_ogr_gmlas_writer_errors():
     src_ds.CreateLayer('_ogr_other_metadata')
     with gdaltest.error_handler():
         ret_ds = gdal.VectorTranslate('/vsimem/valid.xml', src_ds, format='GMLAS')
-    if ret_ds is not None or gdal.GetLastErrorMsg().find('_ogr_layers_metadata not found') < 0:
-        print(gdal.GetLastErrorMsg())
-        return 'fail'
+    assert ret_ds is None and gdal.GetLastErrorMsg().find('_ogr_layers_metadata not found') >= 0
 
     # _ogr_fields_metadata not found
     src_ds = gdal.GetDriverByName('Memory').Create('', 0, 0, 0, 0)
@@ -2743,9 +2480,7 @@ def test_ogr_gmlas_writer_errors():
     src_ds.CreateLayer('_ogr_layers_metadata')
     with gdaltest.error_handler():
         ret_ds = gdal.VectorTranslate('/vsimem/valid.xml', src_ds, format='GMLAS')
-    if ret_ds is not None or gdal.GetLastErrorMsg().find('_ogr_fields_metadata not found') < 0:
-        print(gdal.GetLastErrorMsg())
-        return 'fail'
+    assert ret_ds is None and gdal.GetLastErrorMsg().find('_ogr_fields_metadata not found') >= 0
 
     # _ogr_layer_relationships not found
     src_ds = gdal.GetDriverByName('Memory').Create('', 0, 0, 0, 0)
@@ -2754,9 +2489,7 @@ def test_ogr_gmlas_writer_errors():
     src_ds.CreateLayer('_ogr_fields_metadata')
     with gdaltest.error_handler():
         ret_ds = gdal.VectorTranslate('/vsimem/valid.xml', src_ds, format='GMLAS')
-    if ret_ds is not None or gdal.GetLastErrorMsg().find('_ogr_layer_relationships not found') < 0:
-        print(gdal.GetLastErrorMsg())
-        return 'fail'
+    assert ret_ds is None and gdal.GetLastErrorMsg().find('_ogr_layer_relationships not found') >= 0
 
     # Cannot find field layer_name in _ogr_layers_metadata layer
     src_ds = gdal.GetDriverByName('Memory').Create('', 0, 0, 0, 0)
@@ -2766,9 +2499,7 @@ def test_ogr_gmlas_writer_errors():
     src_ds.CreateLayer('_ogr_layer_relationships')
     with gdaltest.error_handler():
         ret_ds = gdal.VectorTranslate('/vsimem/valid.xml', src_ds, format='GMLAS')
-    if ret_ds is not None or gdal.GetLastErrorMsg().find('Cannot find field layer_name in _ogr_layers_metadata layer') < 0:
-        print(gdal.GetLastErrorMsg())
-        return 'fail'
+    assert ret_ds is None and gdal.GetLastErrorMsg().find('Cannot find field layer_name in _ogr_layers_metadata layer') >= 0
     gdal.Unlink('/vsimem/valid.xml')
     gdal.Unlink('/vsimem/valid.xsd')
 
@@ -2790,14 +2521,11 @@ def test_ogr_gmlas_read_fake_gmljp2():
     while True:
         f, lyr = ds.GetNextFeature()
         if f is None:
-            if lyr is not None:
-                return 'fail'
+            assert lyr is None
             break
         count += 1
 
-    if count != 5:
-        print(count)
-        return 'fail'
+    assert count == 5
 
     return 'success'
 
@@ -2854,8 +2582,7 @@ def test_ogr_gmlas_typing_constraints():
     </TypingConstraints>
 </Configuration>"""])
     lyr = ds.GetLayer('main_elt_foo_bar')
-    if lyr.GetFeatureCount() != 2:
-        return 'fail'
+    assert lyr.GetFeatureCount() == 2
     lyr = ds.GetLayer('bar')
     f = lyr.GetNextFeature()
     if f.GetField('value') != 'baz':
@@ -2984,15 +2711,12 @@ def test_ogr_gmlas_swe_datarecord():
 
     gdal.ErrorReset()
     ds = gdal.OpenEx('GMLAS:data/gmlas/gmlas_swe_datarecord.xml', open_options=['VALIDATE=YES'])
-    if gdal.GetLastErrorMsg() != '':
-        return 'fail'
+    assert gdal.GetLastErrorMsg() == ''
     ds = None
 
     ds = gdal.OpenEx('GMLAS:data/gmlas/gmlas_swe_datarecord.xml')
     lyr = ds.GetLayerByName('main_elt_foo')
-    if lyr.GetLayerDefn().GetFieldCount() != 12:
-        print(lyr.GetLayerDefn().GetFieldCount())
-        return 'fail'
+    assert lyr.GetLayerDefn().GetFieldCount() == 12
     f = lyr.GetNextFeature()
     if f.GetField('mytime_value') != '2017/09/01 00:00:00' or \
        f.GetField('mycategory_value') != 'myvalue' or \
@@ -3028,8 +2752,7 @@ def test_ogr_gmlas_any_field_at_end_of_declaration():
     gdal.ErrorReset()
     with gdaltest.error_handler():
         f = lyr.GetNextFeature()
-    if gdal.GetLastErrorMsg() == '':
-        return 'fail'
+    assert gdal.GetLastErrorMsg() != ''
     if f.GetField('foo') != 'bar':
         f.DumpReadable()
         return 'fail'
diff --git a/autotest/ogr/ogr_gmt.py b/autotest/ogr/ogr_gmt.py
index e996a58398ff..a7967264d11e 100755
--- a/autotest/ogr/ogr_gmt.py
+++ b/autotest/ogr/ogr_gmt.py
@@ -45,8 +45,7 @@ def test_ogr_gmt_1():
     gmt_drv = ogr.GetDriverByName('GMT')
     gdaltest.gmt_ds = gmt_drv.CreateDataSource('tmp/tpoly.gmt')
 
-    if gdaltest.gmt_ds is None:
-        return 'fail'
+    assert gdaltest.gmt_ds is not None
 
     return 'success'
 
@@ -113,14 +112,12 @@ def test_ogr_gmt_3():
         orig_feat = gdaltest.poly_feat[i]
         read_feat = gdaltest.gmt_lyr.GetNextFeature()
 
-        if ogrtest.check_feature_geometry(read_feat, orig_feat.GetGeometryRef(),
-                                          max_error=0.000000001) != 0:
-            return 'fail'
+        assert (ogrtest.check_feature_geometry(read_feat, orig_feat.GetGeometryRef(),
+                                          max_error=0.000000001) == 0)
 
         for fld in range(3):
-            if orig_feat.GetField(fld) != read_feat.GetField(fld):
-                gdaltest.post_reason('Attribute %d does not match' % fld)
-                return 'fail'
+            assert orig_feat.GetField(fld) == read_feat.GetField(fld), \
+                ('Attribute %d does not match' % fld)
 
     gdaltest.poly_feat = None
     gdaltest.shp_ds = None
@@ -138,33 +135,24 @@ def test_ogr_gmt_4():
     ds = ogr.Open('data/test_multi.gmt')
     lyr = ds.GetLayer(0)
 
-    if lyr.GetLayerDefn().GetGeomType() != ogr.wkbMultiLineString:
-        gdaltest.post_reason('did not get expected multilinestring type.')
-        return 'fail'
+    assert lyr.GetLayerDefn().GetGeomType() == ogr.wkbMultiLineString, \
+        'did not get expected multilinestring type.'
 
     feat = lyr.GetNextFeature()
 
-    if ogrtest.check_feature_geometry(feat, 'MULTILINESTRING ((175 -45,176 -45),(180.0 -45.3,179.0 -45.4))'):
-        return 'fail'
+    assert not ogrtest.check_feature_geometry(feat, 'MULTILINESTRING ((175 -45,176 -45),(180.0 -45.3,179.0 -45.4))')
 
-    if feat.GetField('name') != 'feature 1':
-        gdaltest.post_reason('got wrong name, feature 1')
-        return 'fail'
+    assert feat.GetField('name') == 'feature 1', 'got wrong name, feature 1'
 
     feat = lyr.GetNextFeature()
 
-    if ogrtest.check_feature_geometry(feat, 'MULTILINESTRING ((175.1 -45.0,175.2 -45.1),(180.1 -45.3,180.0 -45.2))'):
-        return 'fail'
+    assert not ogrtest.check_feature_geometry(feat, 'MULTILINESTRING ((175.1 -45.0,175.2 -45.1),(180.1 -45.3,180.0 -45.2))')
 
-    if feat.GetField('name') != 'feature 2':
-        gdaltest.post_reason('got wrong name, feature 2')
-        return 'fail'
+    assert feat.GetField('name') == 'feature 2', 'got wrong name, feature 2'
 
     feat = lyr.GetNextFeature()
 
-    if feat is not None:
-        gdaltest.post_reason('did not get null feature when expected.')
-        return 'fail'
+    assert feat is None, 'did not get null feature when expected.'
 
     return 'success'
 
@@ -210,33 +198,24 @@ def test_ogr_gmt_5():
     ds = ogr.Open('tmp/mpoly.gmt')
     lyr = ds.GetLayer(0)
 
-    if lyr.GetLayerDefn().GetGeomType() != ogr.wkbMultiPolygon:
-        gdaltest.post_reason('did not get expected multipolygon type.')
-        return 'fail'
+    assert lyr.GetLayerDefn().GetGeomType() == ogr.wkbMultiPolygon, \
+        'did not get expected multipolygon type.'
 
     feat = lyr.GetNextFeature()
 
-    if ogrtest.check_feature_geometry(feat, 'MULTIPOLYGON(((0 0,0 10,10 10,0 10,0 0),(3 3,4 4, 3 4,3 3)),((12 0,14 0,12 3,12 0)))'):
-        return 'fail'
+    assert not ogrtest.check_feature_geometry(feat, 'MULTIPOLYGON(((0 0,0 10,10 10,0 10,0 0),(3 3,4 4, 3 4,3 3)),((12 0,14 0,12 3,12 0)))')
 
-    if feat.GetField('ID') != 15:
-        gdaltest.post_reason('got wrong id, first feature')
-        return 'fail'
+    assert feat.GetField('ID') == 15, 'got wrong id, first feature'
 
     feat = lyr.GetNextFeature()
 
-    if ogrtest.check_feature_geometry(feat, 'MULTIPOLYGON(((30 20,40 20,30 30,30 20)))'):
-        return 'fail'
+    assert not ogrtest.check_feature_geometry(feat, 'MULTIPOLYGON(((30 20,40 20,30 30,30 20)))')
 
-    if feat.GetField('ID') != 16:
-        gdaltest.post_reason('got wrong ID, second feature')
-        return 'fail'
+    assert feat.GetField('ID') == 16, 'got wrong ID, second feature'
 
     feat = lyr.GetNextFeature()
 
-    if feat is not None:
-        gdaltest.post_reason('did not get null feature when expected.')
-        return 'fail'
+    assert feat is None, 'did not get null feature when expected.'
 
     return 'success'
 
diff --git a/autotest/ogr/ogr_gpkg.py b/autotest/ogr/ogr_gpkg.py
index 96872de1a072..ae24e36a856a 100755
--- a/autotest/ogr/ogr_gpkg.py
+++ b/autotest/ogr/ogr_gpkg.py
@@ -108,14 +108,11 @@ def test_ogr_gpkg_1():
 
     gdaltest.gpkg_ds = gdaltest.gpkg_dr.CreateDataSource('tmp/gpkg_test.gpkg')
 
-    if gdaltest.gpkg_ds is None:
-        return 'fail'
+    assert gdaltest.gpkg_ds is not None
 
     gdaltest.gpkg_ds = None
 
-    if not validate('tmp/gpkg_test.gpkg'):
-        gdaltest.post_reason('validation failed')
-        return 'fail'
+    assert validate('tmp/gpkg_test.gpkg'), 'validation failed'
 
     return 'success'
 
@@ -133,8 +130,7 @@ def test_ogr_gpkg_2():
     # Check there a ogr_empty_table
     sql_lyr = gdaltest.gpkg_ds.ExecuteSQL("SELECT COUNT(*) FROM sqlite_master WHERE name = 'ogr_empty_table'")
     f = sql_lyr.GetNextFeature()
-    if f.GetField(0) != 1:
-        return 'fail'
+    assert f.GetField(0) == 1
     gdaltest.gpkg_ds.ReleaseResultSet(sql_lyr)
 
     # Should default to GPKG 1.2
@@ -168,17 +164,14 @@ def test_ogr_gpkg_3():
     srs4326.ImportFromEPSG(4326)
     lyr = gdaltest.gpkg_ds.CreateLayer('first_layer', geom_type=ogr.wkbPoint, srs=srs4326, options=['GEOMETRY_NAME=gpkg_geometry', 'SPATIAL_INDEX=NO'])
     # gdal.PopErrorHandler()
-    if lyr is None:
-        return 'fail'
+    assert lyr is not None
 
     # Test creating a layer with an existing name
     gdal.PushErrorHandler('CPLQuietErrorHandler')
     lyr = gdaltest.gpkg_ds.CreateLayer('a_layer', options=['SPATIAL_INDEX=NO'])
     lyr = gdaltest.gpkg_ds.CreateLayer('a_layer', options=['SPATIAL_INDEX=NO'])
     gdal.PopErrorHandler()
-    if lyr is not None:
-        gdaltest.post_reason('layer creation should have failed')
-        return 'fail'
+    assert lyr is None, 'layer creation should have failed'
 
     return 'success'
 
@@ -193,42 +186,32 @@ def test_ogr_gpkg_4():
 
     gdaltest.gpkg_ds = None
 
-    if not validate('tmp/gpkg_test.gpkg'):
-        gdaltest.post_reason('validation failed')
-        return 'fail'
+    assert validate('tmp/gpkg_test.gpkg'), 'validation failed'
 
     gdal.PushErrorHandler('CPLQuietErrorHandler')
     gdaltest.gpkg_ds = gdaltest.gpkg_dr.Open('tmp/gpkg_test.gpkg', update=1)
     gdal.PopErrorHandler()
 
-    if gdaltest.gpkg_ds is None:
-        return 'fail'
+    assert gdaltest.gpkg_ds is not None
 
     # Check there no ogr_empty_table
     sql_lyr = gdaltest.gpkg_ds.ExecuteSQL("SELECT COUNT(*) FROM sqlite_master WHERE name = 'ogr_empty_table'")
     f = sql_lyr.GetNextFeature()
-    if f.GetField(0) != 0:
-        return 'fail'
+    assert f.GetField(0) == 0
     gdaltest.gpkg_ds.ReleaseResultSet(sql_lyr)
 
-    if gdaltest.gpkg_ds.GetLayerCount() != 2:
-        gdaltest.post_reason('unexpected number of layers')
-        return 'fail'
+    assert gdaltest.gpkg_ds.GetLayerCount() == 2, 'unexpected number of layers'
 
     lyr0 = gdaltest.gpkg_ds.GetLayer(0)
 
-    if lyr0.GetFIDColumn() != 'fid':
-        gdaltest.post_reason('unexpected FID name for layer 0')
-        return 'fail'
+    assert lyr0.GetFIDColumn() == 'fid', 'unexpected FID name for layer 0'
 
     gdaltest.gpkg_ds = None
     gdaltest.gpkg_ds = gdaltest.gpkg_dr.Open('tmp/gpkg_test.gpkg', update=1)
 
     lyr0 = gdaltest.gpkg_ds.GetLayer(0)
 
-    if lyr0.GetName() != 'first_layer':
-        gdaltest.post_reason('unexpected layer name for layer 0')
-        return 'fail'
+    assert lyr0.GetName() == 'first_layer', 'unexpected layer name for layer 0'
 
     gdaltest.gpkg_ds = None
     gdaltest.gpkg_ds = gdaltest.gpkg_dr.Open('tmp/gpkg_test.gpkg', update=1)
@@ -236,17 +219,13 @@ def test_ogr_gpkg_4():
     lyr0 = gdaltest.gpkg_ds.GetLayer(0)
     lyr1 = gdaltest.gpkg_ds.GetLayer(1)
 
-    if lyr0.GetLayerDefn().GetGeomFieldDefn(0).GetName() != 'gpkg_geometry':
-        gdaltest.post_reason('unexpected geometry field name for layer 0')
-        return 'fail'
+    assert lyr0.GetLayerDefn().GetGeomFieldDefn(0).GetName() == 'gpkg_geometry', \
+        'unexpected geometry field name for layer 0'
 
-    if lyr1.GetName() != 'a_layer':
-        gdaltest.post_reason('unexpected layer name for layer 1')
-        return 'fail'
+    assert lyr1.GetName() == 'a_layer', 'unexpected layer name for layer 1'
 
     sql_lyr = gdaltest.gpkg_ds.ExecuteSQL("SELECT * FROM sqlite_master WHERE name = 'gpkg_extensions'")
-    if sql_lyr.GetFeatureCount() != 0:
-        return 'fail'
+    assert sql_lyr.GetFeatureCount() == 0
     gdaltest.gpkg_ds.ReleaseResultSet(sql_lyr)
 
     return 'success'
@@ -260,33 +239,21 @@ def test_ogr_gpkg_5():
     if gdaltest.gpkg_dr is None or gdaltest.gpkg_ds is None:
         return 'skip'
 
-    if gdaltest.gpkg_ds.GetLayerCount() != 2:
-        gdaltest.post_reason('unexpected number of layers')
-        return 'fail'
+    assert gdaltest.gpkg_ds.GetLayerCount() == 2, 'unexpected number of layers'
 
     with gdaltest.error_handler():
         ret = gdaltest.gpkg_ds.DeleteLayer(-1)
-    if ret == 0:
-        gdaltest.post_reason('expected error')
-        return 'fail'
+    assert ret != 0, 'expected error'
 
     with gdaltest.error_handler():
         ret = gdaltest.gpkg_ds.DeleteLayer(gdaltest.gpkg_ds.GetLayerCount())
-    if ret == 0:
-        gdaltest.post_reason('expected error')
-        return 'fail'
+    assert ret != 0, 'expected error'
 
-    if gdaltest.gpkg_ds.DeleteLayer(1) != 0:
-        gdaltest.post_reason('got error code from DeleteLayer(1)')
-        return 'fail'
+    assert gdaltest.gpkg_ds.DeleteLayer(1) == 0, 'got error code from DeleteLayer(1)'
 
-    if gdaltest.gpkg_ds.DeleteLayer(0) != 0:
-        gdaltest.post_reason('got error code from DeleteLayer(0)')
-        return 'fail'
+    assert gdaltest.gpkg_ds.DeleteLayer(0) == 0, 'got error code from DeleteLayer(0)'
 
-    if gdaltest.gpkg_ds.GetLayerCount() != 0:
-        gdaltest.post_reason('unexpected number of layers (not 0)')
-        return 'fail'
+    assert gdaltest.gpkg_ds.GetLayerCount() == 0, 'unexpected number of layers (not 0)'
 
     return 'success'
 
@@ -302,44 +269,33 @@ def test_ogr_gpkg_6():
     srs4326 = osr.SpatialReference()
     srs4326.ImportFromEPSG(4326)
     lyr = gdaltest.gpkg_ds.CreateLayer('field_test_layer', geom_type=ogr.wkbPoint, srs=srs4326)
-    if lyr is None:
-        return 'fail'
+    assert lyr is not None
 
     field_defn = ogr.FieldDefn('dummy', ogr.OFTString)
     lyr.CreateField(field_defn)
 
-    if lyr.GetLayerDefn().GetFieldDefn(0).GetType() != ogr.OFTString:
-        gdaltest.post_reason('wrong field type')
-        return 'fail'
+    assert lyr.GetLayerDefn().GetFieldDefn(0).GetType() == ogr.OFTString, \
+        'wrong field type'
 
     gdaltest.gpkg_ds = None
 
-    if not validate('tmp/gpkg_test.gpkg'):
-        gdaltest.post_reason('validation failed')
-        return 'fail'
+    assert validate('tmp/gpkg_test.gpkg'), 'validation failed'
 
     gdal.PushErrorHandler('CPLQuietErrorHandler')
     gdaltest.gpkg_ds = gdaltest.gpkg_dr.Open('tmp/gpkg_test.gpkg', update=1)
     gdal.PopErrorHandler()
 
-    if gdaltest.gpkg_ds is None:
-        return 'fail'
+    assert gdaltest.gpkg_ds is not None
 
-    if gdaltest.gpkg_ds.GetLayerCount() != 1:
-        return 'fail'
+    assert gdaltest.gpkg_ds.GetLayerCount() == 1
 
     lyr = gdaltest.gpkg_ds.GetLayer(0)
-    if lyr.GetName() != 'field_test_layer':
-        return 'fail'
+    assert lyr.GetName() == 'field_test_layer'
 
     field_defn_out = lyr.GetLayerDefn().GetFieldDefn(0)
-    if field_defn_out.GetType() != ogr.OFTString:
-        gdaltest.post_reason('wrong field type after reopen')
-        return 'fail'
+    assert field_defn_out.GetType() == ogr.OFTString, 'wrong field type after reopen'
 
-    if field_defn_out.GetName() != 'dummy':
-        gdaltest.post_reason('wrong field name after reopen')
-        return 'fail'
+    assert field_defn_out.GetName() == 'dummy', 'wrong field name after reopen'
 
     return 'success'
 
@@ -358,78 +314,60 @@ def test_ogr_gpkg_7():
     feat.SetGeometry(geom)
     feat.SetField('dummy', 'a dummy value')
 
-    if lyr.TestCapability(ogr.OLCSequentialWrite) != 1:
-        gdaltest.post_reason('lyr.TestCapability(ogr.OLCSequentialWrite) != 1')
-        return 'fail'
+    assert lyr.TestCapability(ogr.OLCSequentialWrite) == 1, \
+        'lyr.TestCapability(ogr.OLCSequentialWrite) != 1'
 
-    if lyr.CreateFeature(feat) != 0:
-        gdaltest.post_reason('cannot create feature')
-        return 'fail'
+    assert lyr.CreateFeature(feat) == 0, 'cannot create feature'
 
     # Read back what we just inserted
     lyr.ResetReading()
     feat_read = lyr.GetNextFeature()
-    if feat_read.GetField('dummy') != 'a dummy value':
-        gdaltest.post_reason('output does not match input')
-        return 'fail'
+    assert feat_read.GetField('dummy') == 'a dummy value', 'output does not match input'
 
     # Only inserted one thing, so second feature should return NULL
     feat_read = lyr.GetNextFeature()
-    if feat_read is not None:
-        gdaltest.post_reason('last call should return NULL')
-        return 'fail'
+    assert feat_read is None, 'last call should return NULL'
 
     # Add another feature
     geom = ogr.CreateGeometryFromWkt('POINT(100 100)')
     feat = ogr.Feature(lyr.GetLayerDefn())
     feat.SetGeometry(geom)
     feat.SetField('dummy', 'who you calling a dummy?')
-    if lyr.CreateFeature(feat) != 0:
-        gdaltest.post_reason('cannot create feature')
-        return 'fail'
+    assert lyr.CreateFeature(feat) == 0, 'cannot create feature'
 
-    if lyr.TestCapability(ogr.OLCRandomRead) != 1:
-        gdaltest.post_reason('lyr.TestCapability(ogr.OLCRandomRead) != 1')
-        return 'fail'
+    assert lyr.TestCapability(ogr.OLCRandomRead) == 1, \
+        'lyr.TestCapability(ogr.OLCRandomRead) != 1'
 
     # Random read a feature
     feat_read_random = lyr.GetFeature(feat.GetFID())
-    if feat_read_random.GetField('dummy') != 'who you calling a dummy?':
-        gdaltest.post_reason('random read output does not match input')
-        return 'fail'
+    assert feat_read_random.GetField('dummy') == 'who you calling a dummy?', \
+        'random read output does not match input'
 
-    if lyr.TestCapability(ogr.OLCRandomWrite) != 1:
-        gdaltest.post_reason('lyr.TestCapability(ogr.OLCRandomWrite) != 1')
-        return 'fail'
+    assert lyr.TestCapability(ogr.OLCRandomWrite) == 1, \
+        'lyr.TestCapability(ogr.OLCRandomWrite) != 1'
 
     # Random write a feature
     feat.SetField('dummy', 'i am no dummy')
     lyr.SetFeature(feat)
     feat_read_random = lyr.GetFeature(feat.GetFID())
-    if feat_read_random.GetField('dummy') != 'i am no dummy':
-        gdaltest.post_reason('random read output does not match random write input')
-        return 'fail'
+    assert feat_read_random.GetField('dummy') == 'i am no dummy', \
+        'random read output does not match random write input'
 
-    if lyr.TestCapability(ogr.OLCDeleteFeature) != 1:
-        gdaltest.post_reason('lyr.TestCapability(ogr.OLCDeleteFeature) != 1')
-        return 'fail'
+    assert lyr.TestCapability(ogr.OLCDeleteFeature) == 1, \
+        'lyr.TestCapability(ogr.OLCDeleteFeature) != 1'
 
     # Delete a feature
     lyr.DeleteFeature(feat.GetFID())
-    if lyr.GetFeatureCount() != 1:
-        gdaltest.post_reason('delete feature did not delete')
-        return 'fail'
+    assert lyr.GetFeatureCount() == 1, 'delete feature did not delete'
 
     # Test updating non-existing feature
     feat.SetFID(-10)
-    if lyr.SetFeature(feat) != ogr.OGRERR_NON_EXISTING_FEATURE:
-        gdaltest.post_reason('Expected failure of SetFeature().')
-        return 'fail'
+    assert lyr.SetFeature(feat) == ogr.OGRERR_NON_EXISTING_FEATURE, \
+        'Expected failure of SetFeature().'
 
     # Test deleting non-existing feature
-    if lyr.DeleteFeature(-10) != ogr.OGRERR_NON_EXISTING_FEATURE:
-        gdaltest.post_reason('Expected failure of DeleteFeature().')
-        return 'fail'
+    assert lyr.DeleteFeature(-10) == ogr.OGRERR_NON_EXISTING_FEATURE, \
+        'Expected failure of DeleteFeature().'
 
     # Delete the layer
     if gdaltest.gpkg_ds.DeleteLayer('field_test_layer') != 0:
@@ -458,8 +396,7 @@ def test_ogr_gpkg_8():
     srs.ImportFromEPSG(32631)
 
     lyr = gdaltest.gpkg_ds.CreateLayer('tbl_linestring', geom_type=ogr.wkbLineString, srs=srs)
-    if lyr is None:
-        return 'fail'
+    assert lyr is not None
 
     lyr.StartTransaction()
     lyr.CreateField(ogr.FieldDefn('fld_integer', ogr.OFTInteger))
@@ -496,30 +433,21 @@ def test_ogr_gpkg_8():
         feat.SetField('fld_float', 1.23)
         feat.SetField('fld_integer64', 1000000000000 + i)
 
-        if lyr.CreateFeature(feat) != 0:
-            gdaltest.post_reason('cannot create feature %d' % i)
-            return 'fail'
+        assert lyr.CreateFeature(feat) == 0, ('cannot create feature %d' % i)
     lyr.CommitTransaction()
 
     feat = ogr.Feature(lyr.GetLayerDefn())
-    if lyr.CreateFeature(feat) != 0:
-        gdaltest.post_reason('cannot insert empty')
-        return 'fail'
+    assert lyr.CreateFeature(feat) == 0, 'cannot insert empty'
 
     feat.SetFID(6)
-    if lyr.SetFeature(feat) != 0:
-        gdaltest.post_reason('cannot update with empty')
-        return 'fail'
+    assert lyr.SetFeature(feat) == 0, 'cannot update with empty'
 
     gdaltest.gpkg_ds = None
     gdaltest.gpkg_ds = gdaltest.gpkg_dr.Open('tmp/gpkg_test.gpkg', update=1)
     lyr = gdaltest.gpkg_ds.GetLayerByName('tbl_linestring')
-    if lyr.GetLayerDefn().GetFieldDefn(6).GetSubType() != ogr.OFSTBoolean:
-        return 'fail'
-    if lyr.GetLayerDefn().GetFieldDefn(7).GetSubType() != ogr.OFSTInt16:
-        return 'fail'
-    if lyr.GetLayerDefn().GetFieldDefn(8).GetSubType() != ogr.OFSTFloat32:
-        return 'fail'
+    assert lyr.GetLayerDefn().GetFieldDefn(6).GetSubType() == ogr.OFSTBoolean
+    assert lyr.GetLayerDefn().GetFieldDefn(7).GetSubType() == ogr.OFSTInt16
+    assert lyr.GetLayerDefn().GetFieldDefn(8).GetSubType() == ogr.OFSTFloat32
     feat = lyr.GetNextFeature()
     if feat.GetField(0) != 10 or feat.GetField(1) != 'test string 0 test' or \
        feat.GetField(2) != 3.14159 or feat.GetField(3) != '2014/05/17' or \
@@ -530,8 +458,7 @@ def test_ogr_gpkg_8():
         return 'fail'
 
     lyr = gdaltest.gpkg_ds.CreateLayer('tbl_polygon', geom_type=ogr.wkbPolygon, srs=srs)
-    if lyr is None:
-        return 'fail'
+    assert lyr is not None
 
     lyr.StartTransaction()
     lyr.CreateField(ogr.FieldDefn('fld_datetime', ogr.OFTDateTime))
@@ -546,21 +473,17 @@ def test_ogr_gpkg_8():
         feat.SetField('fld_string', 'my super string %d' % i)
         feat.SetField('fld_datetime', '2010-01-01')
 
-        if lyr.CreateFeature(feat) != 0:
-            gdaltest.post_reason('cannot create polygon feature %d' % i)
-            return 'fail'
+        assert lyr.CreateFeature(feat) == 0, ('cannot create polygon feature %d' % i)
     lyr.CommitTransaction()
 
     feat = lyr.GetFeature(3)
     geom_read = feat.GetGeometryRef()
-    if geom.ExportToWkt() != geom_read.ExportToWkt():
-        gdaltest.post_reason('geom output not equal to geom input')
-        return 'fail'
+    assert geom.ExportToWkt() == geom_read.ExportToWkt(), \
+        'geom output not equal to geom input'
 
     # Test out the 3D support...
     lyr = gdaltest.gpkg_ds.CreateLayer('tbl_polygon25d', geom_type=ogr.wkbPolygon25D, srs=srs)
-    if lyr is None:
-        return 'fail'
+    assert lyr is not None
 
     lyr.CreateField(ogr.FieldDefn('fld_string', ogr.OFTString))
     geom = ogr.CreateGeometryFromWkt('POLYGON((5 5 1, 10 5 2, 10 10 3, 5 104 , 5 5 1),(6 6 4, 6 7 5, 7 7 6, 7 6 7, 6 6 4))')
@@ -571,9 +494,8 @@ def test_ogr_gpkg_8():
     lyr.ResetReading()
     feat = lyr.GetNextFeature()
     geom_read = feat.GetGeometryRef()
-    if geom.ExportToWkt() != geom_read.ExportToWkt():
-        gdaltest.post_reason('3d geom output not equal to geom input')
-        return 'fail'
+    assert geom.ExportToWkt() == geom_read.ExportToWkt(), \
+        '3d geom output not equal to geom input'
 
     return 'success'
 
@@ -588,16 +510,10 @@ def test_ogr_gpkg_9():
 
     lyr = gdaltest.gpkg_ds.GetLayerByName('tbl_linestring')
     extent = lyr.GetExtent()
-    if extent != (5.0, 10.0, 5.0, 10.0):
-        gdaltest.post_reason('got bad extent')
-        print(extent)
-        return 'fail'
+    assert extent == (5.0, 10.0, 5.0, 10.0), 'got bad extent'
 
     fcount = lyr.GetFeatureCount()
-    if fcount != 11:
-        gdaltest.post_reason('got bad featurecount')
-        print(fcount)
-        return 'fail'
+    assert fcount == 11, 'got bad featurecount'
 
     return 'success'
 
@@ -619,11 +535,9 @@ def test_ogr_gpkg_11():
 
     gdaltest.gpkg_ds = ogr.Open('tmp/gpkg_test.gpkg', update=1)
     lyr = gdaltest.gpkg_ds.GetLayerByName('tbl_linestring_renamed')
-    if lyr is None:
-        return 'fail'
+    assert lyr is not None
     lyr.SetAttributeFilter('fld_integer = 10')
-    if lyr.GetFeatureCount() != 1:
-        return 'fail'
+    assert lyr.GetFeatureCount() == 1
 
     return 'success'
 
@@ -637,27 +551,17 @@ def test_ogr_gpkg_12():
         return 'skip'
 
     sql_lyr = gdaltest.gpkg_ds.ExecuteSQL('SELECT * FROM tbl_linestring_renamed')
-    if sql_lyr.GetFIDColumn() != 'fid':
-        return 'fail'
-    if sql_lyr.GetGeomType() != ogr.wkbLineString:
-        return 'fail'
-    if sql_lyr.GetGeometryColumn() != 'geom':
-        return 'fail'
-    if sql_lyr.GetSpatialRef().ExportToWkt().find('32631') < 0:
-        return 'fail'
+    assert sql_lyr.GetFIDColumn() == 'fid'
+    assert sql_lyr.GetGeomType() == ogr.wkbLineString
+    assert sql_lyr.GetGeometryColumn() == 'geom'
+    assert sql_lyr.GetSpatialRef().ExportToWkt().find('32631') >= 0
     feat = sql_lyr.GetNextFeature()
-    if feat.GetFID() != 1:
-        return 'fail'
-    if sql_lyr.GetFeatureCount() != 11:
-        return 'fail'
-    if sql_lyr.GetLayerDefn().GetFieldCount() != 10:
-        return 'fail'
-    if sql_lyr.GetLayerDefn().GetFieldDefn(6).GetSubType() != ogr.OFSTBoolean:
-        return 'fail'
-    if sql_lyr.GetLayerDefn().GetFieldDefn(7).GetSubType() != ogr.OFSTInt16:
-        return 'fail'
-    if sql_lyr.GetLayerDefn().GetFieldDefn(8).GetSubType() != ogr.OFSTFloat32:
-        return 'fail'
+    assert feat.GetFID() == 1
+    assert sql_lyr.GetFeatureCount() == 11
+    assert sql_lyr.GetLayerDefn().GetFieldCount() == 10
+    assert sql_lyr.GetLayerDefn().GetFieldDefn(6).GetSubType() == ogr.OFSTBoolean
+    assert sql_lyr.GetLayerDefn().GetFieldDefn(7).GetSubType() == ogr.OFSTInt16
+    assert sql_lyr.GetLayerDefn().GetFieldDefn(8).GetSubType() == ogr.OFSTFloat32
     gdaltest.gpkg_ds.ReleaseResultSet(sql_lyr)
 
     sql_lyr = gdaltest.gpkg_ds.ExecuteSQL(
@@ -674,41 +578,24 @@ def test_ogr_gpkg_12():
         'CAST(fld_binary as BLOB) as FLD_BINARY, '
         'CAST(fld_integer64 AS INTEGER) AS FLD_INTEGER64 '
         'FROM tbl_linestring_renamed')
-    if sql_lyr.GetFIDColumn() != 'FID':
-        print(sql_lyr.GetFIDColumn())
-        return 'fail'
-    if sql_lyr.GetGeometryColumn() != 'GEOM':
-        print(sql_lyr.GetGeometryColumn())
-        return 'fail'
-    if sql_lyr.GetLayerDefn().GetFieldCount() != 5:
-        print(sql_lyr.GetLayerDefn().GetFieldCount())
-        return 'fail'
-    if sql_lyr.GetLayerDefn().GetFieldDefn(0).GetName() != 'FLD_INTEGER':
-        return 'fail'
-    if sql_lyr.GetLayerDefn().GetFieldDefn(0).GetType() != ogr.OFTInteger:
-        return 'fail'
-    if sql_lyr.GetLayerDefn().GetFieldDefn(1).GetName() != 'FLD_STRING':
-        return 'fail'
-    if sql_lyr.GetLayerDefn().GetFieldDefn(1).GetType() != ogr.OFTString:
-        return 'fail'
-    if sql_lyr.GetLayerDefn().GetFieldDefn(2).GetName() != 'FLD_REAL':
-        return 'fail'
-    if sql_lyr.GetLayerDefn().GetFieldDefn(2).GetType() != ogr.OFTReal:
-        return 'fail'
-    if sql_lyr.GetLayerDefn().GetFieldDefn(3).GetName() != 'FLD_BINARY':
-        return 'fail'
-    if sql_lyr.GetLayerDefn().GetFieldDefn(3).GetType() != ogr.OFTBinary:
-        return 'fail'
-    if sql_lyr.GetLayerDefn().GetFieldDefn(4).GetName() != 'FLD_INTEGER64':
-        return 'fail'
-    if sql_lyr.GetLayerDefn().GetFieldDefn(4).GetType() != ogr.OFTInteger64:
-        return 'fail'
+    assert sql_lyr.GetFIDColumn() == 'FID'
+    assert sql_lyr.GetGeometryColumn() == 'GEOM'
+    assert sql_lyr.GetLayerDefn().GetFieldCount() == 5
+    assert sql_lyr.GetLayerDefn().GetFieldDefn(0).GetName() == 'FLD_INTEGER'
+    assert sql_lyr.GetLayerDefn().GetFieldDefn(0).GetType() == ogr.OFTInteger
+    assert sql_lyr.GetLayerDefn().GetFieldDefn(1).GetName() == 'FLD_STRING'
+    assert sql_lyr.GetLayerDefn().GetFieldDefn(1).GetType() == ogr.OFTString
+    assert sql_lyr.GetLayerDefn().GetFieldDefn(2).GetName() == 'FLD_REAL'
+    assert sql_lyr.GetLayerDefn().GetFieldDefn(2).GetType() == ogr.OFTReal
+    assert sql_lyr.GetLayerDefn().GetFieldDefn(3).GetName() == 'FLD_BINARY'
+    assert sql_lyr.GetLayerDefn().GetFieldDefn(3).GetType() == ogr.OFTBinary
+    assert sql_lyr.GetLayerDefn().GetFieldDefn(4).GetName() == 'FLD_INTEGER64'
+    assert sql_lyr.GetLayerDefn().GetFieldDefn(4).GetType() == ogr.OFTInteger64
     gdaltest.gpkg_ds.ReleaseResultSet(sql_lyr)
 
     sql_lyr = gdaltest.gpkg_ds.ExecuteSQL('SELECT * FROM tbl_linestring_renamed WHERE 0=1')
     feat = sql_lyr.GetNextFeature()
-    if feat is not None:
-        return 'fail'
+    assert feat is None
     gdaltest.gpkg_ds.ReleaseResultSet(sql_lyr)
 
     for sql in ['SELECT * FROM tbl_linestring_renamed LIMIT 1',
@@ -716,23 +603,17 @@ def test_ogr_gpkg_12():
                 'SELECT * FROM tbl_linestring_renamed UNION ALL SELECT * FROM tbl_linestring_renamed ORDER BY fld_integer LIMIT 1']:
         sql_lyr = gdaltest.gpkg_ds.ExecuteSQL(sql)
         feat = sql_lyr.GetNextFeature()
-        if feat is None:
-            return 'fail'
+        assert feat is not None
         feat = sql_lyr.GetNextFeature()
-        if feat is not None:
-            return 'fail'
-        if sql_lyr.GetFeatureCount() != 1:
-            return 'fail'
+        assert feat is None
+        assert sql_lyr.GetFeatureCount() == 1
         gdaltest.gpkg_ds.ReleaseResultSet(sql_lyr)
 
     sql_lyr = gdaltest.gpkg_ds.ExecuteSQL('SELECT sqlite_version()')
     feat = sql_lyr.GetNextFeature()
-    if feat is None:
-        return 'fail'
-    if sql_lyr.GetLayerDefn().GetFieldCount() != 1:
-        return 'fail'
-    if sql_lyr.GetLayerDefn().GetGeomFieldCount() != 0:
-        return 'fail'
+    assert feat is not None
+    assert sql_lyr.GetLayerDefn().GetFieldCount() == 1
+    assert sql_lyr.GetLayerDefn().GetGeomFieldCount() == 0
     gdaltest.gpkg_ds.ReleaseResultSet(sql_lyr)
 
     return 'success'
@@ -770,25 +651,19 @@ def test_ogr_gpkg_13():
 
     gdaltest.gpkg_ds = None
     gdaltest.gpkg_ds = ogr.Open('tmp/gpkg_test.gpkg', update=1)
-    if gdal.GetLastErrorMsg() != '':
-        gdaltest.post_reason('fail : warning NOT expected')
-        return 'fail'
-    if gdaltest.gpkg_ds.GetLayerCount() != 5:
-        return 'fail'
+    assert gdal.GetLastErrorMsg() == '', 'fail : warning NOT expected'
+    assert gdaltest.gpkg_ds.GetLayerCount() == 5
     lyr = gdaltest.gpkg_ds.GetLayer('non_spatial')
-    if lyr.GetGeomType() != ogr.wkbNone:
-        return 'fail'
+    assert lyr.GetGeomType() == ogr.wkbNone
     feat = lyr.GetNextFeature()
-    if not feat.IsFieldNull('fld_integer'):
-        return 'fail'
+    assert feat.IsFieldNull('fld_integer')
     feat = lyr.GetNextFeature()
     if feat.GetField('fld_integer') != 1:
         feat.DumpReadable()
         return 'fail'
 
     sql_lyr = gdaltest.gpkg_ds.ExecuteSQL("SELECT * FROM gpkg_extensions WHERE table_name IS NULL AND extension_name = 'gdal_aspatial'")
-    if sql_lyr.GetFeatureCount() != 1:
-        return 'fail'
+    assert sql_lyr.GetFeatureCount() == 1
     gdaltest.gpkg_ds.ReleaseResultSet(sql_lyr)
 
     return 'success'
@@ -806,8 +681,7 @@ def test_ogr_gpkg_14():
     sr.ImportFromEPSG(32631)
 
     lyr = gdaltest.gpkg_ds.CreateLayer('point_no_spi-but-with-dashes', geom_type=ogr.wkbPoint, options=['SPATIAL_INDEX=NO'], srs=sr)
-    if lyr.TestCapability(ogr.OLCFastSpatialFilter) != 0:
-        return 'fail'
+    assert lyr.TestCapability(ogr.OLCFastSpatialFilter) == 0
     feat = ogr.Feature(lyr.GetLayerDefn())
     feat.SetGeometry(ogr.CreateGeometryFromWkt('POINT(1000 30000000)'))
     lyr.CreateFeature(feat)
@@ -841,12 +715,10 @@ def test_ogr_gpkg_14():
     sql_lyr = gdaltest.gpkg_ds.ExecuteSQL('SELECT * FROM "point_no_spi-but-with-dashes"')
     res = sql_lyr.TestCapability(ogr.OLCFastSpatialFilter)
     gdaltest.gpkg_ds.ReleaseResultSet(sql_lyr)
-    if res != 0:
-        return 'fail'
+    assert res == 0
 
     lyr = gdaltest.gpkg_ds.CreateLayer('point-with-spi-and-dashes', geom_type=ogr.wkbPoint)
-    if lyr.TestCapability(ogr.OLCFastSpatialFilter) != 1:
-        return 'fail'
+    assert lyr.TestCapability(ogr.OLCFastSpatialFilter) == 1
     feat = ogr.Feature(lyr.GetLayerDefn())
     feat.SetGeometry(ogr.CreateGeometryFromWkt('POINT(1000 30000000)'))
     lyr.CreateFeature(feat)
@@ -870,18 +742,15 @@ def test_ogr_gpkg_14():
     sql_lyr = gdaltest.gpkg_ds.ExecuteSQL('SELECT * FROM "point-with-spi-and-dashes"')
     res = sql_lyr.TestCapability(ogr.OLCFastSpatialFilter)
     gdaltest.gpkg_ds.ReleaseResultSet(sql_lyr)
-    if res != 1:
-        return 'fail'
+    assert res == 1
 
     # Test spatial filer right away
     lyr.SetSpatialFilterRect(1000, 30000000, 1000, 30000000)
     lyr.ResetReading()
     f = lyr.GetNextFeature()
-    if f is None:
-        return 'fail'
+    assert f is not None
     f = lyr.GetNextFeature()
-    if f is not None:
-        return 'fail'
+    assert f is None
 
     return 'success'
 
@@ -927,9 +796,8 @@ def test_ogr_gpkg_15():
         feat = sql_lyr.GetNextFeature()
         got_result = feat.GetField(0)
         gdaltest.gpkg_ds.ReleaseResultSet(sql_lyr)
-        if got_result != expected_result:
-            print("expected_type=%s actual_type=%s expected_result=%d got_result=%d" % (expected_type, actual_type, expected_result, got_result))
-            return 'fail'
+        assert got_result == expected_result, \
+            ("expected_type=%s actual_type=%s expected_result=%d got_result=%d" % (expected_type, actual_type, expected_result, got_result))
 
     for (sql, expected_result) in [
             ("SELECT HasSpatialIndex('point-with-spi-and-dashes', 'geom')", 1),
@@ -964,9 +832,7 @@ def test_ogr_gpkg_15():
         feat = sql_lyr.GetNextFeature()
         got_result = feat.GetField(0)
         gdaltest.gpkg_ds.ReleaseResultSet(sql_lyr)
-        if got_result != expected_result:
-            print(sql)
-            return 'fail'
+        assert got_result == expected_result, sql
 
     # NULL argument
     sql_lyr = gdaltest.gpkg_ds.ExecuteSQL("SELECT SridFromAuthCRS(NULL, 4326)")
@@ -1244,12 +1110,8 @@ def test_ogr_gpkg_15():
     if has_spatialite_4_3_or_later:
         sql_lyr = gdaltest.gpkg_ds.ExecuteSQL(
             "SELECT ST_Buffer(geom, 0) FROM tbl_linestring_renamed")
-        if sql_lyr.GetGeomType() != ogr.wkbPolygon:
-            print(sql_lyr.GetGeomType())
-            return 'fail'
-        if sql_lyr.GetSpatialRef().ExportToWkt().find('32631') < 0:
-            print(sql_lyr.GetSpatialRef())
-            return 'fail'
+        assert sql_lyr.GetGeomType() == ogr.wkbPolygon
+        assert sql_lyr.GetSpatialRef().ExportToWkt().find('32631') >= 0
         gdaltest.gpkg_ds.ReleaseResultSet(sql_lyr)
 
     gdaltest.gpkg_ds = None
@@ -1277,9 +1139,7 @@ def test_ogr_gpkg_16():
     lyr = ds.GetLayer(0)
     lyr.GetLayerDefn()
     ds = None
-    if gdal.GetLastErrorMsg() != '':
-        gdaltest.post_reason('fail : warning NOT expected')
-        return 'fail'
+    assert gdal.GetLastErrorMsg() == '', 'fail : warning NOT expected'
 
     # Warning since we open as read-write
     ds = ogr.Open('/vsimem/ogr_gpk_16.gpkg', update=1)
@@ -1287,9 +1147,7 @@ def test_ogr_gpkg_16():
     gdal.PushErrorHandler('CPLQuietErrorHandler')
     lyr.GetLayerDefn()
     gdal.PopErrorHandler()
-    if gdal.GetLastErrorMsg() == '':
-        gdaltest.post_reason('fail : warning expected')
-        return 'fail'
+    assert gdal.GetLastErrorMsg() != '', 'fail : warning expected'
 
     ds.ExecuteSQL("UPDATE gpkg_extensions SET scope = 'read-write' WHERE extension_name = 'myext'")
     ds = None
@@ -1300,9 +1158,7 @@ def test_ogr_gpkg_16():
     gdal.PushErrorHandler('CPLQuietErrorHandler')
     lyr.GetLayerDefn()
     gdal.PopErrorHandler()
-    if gdal.GetLastErrorMsg() == '':
-        gdaltest.post_reason('fail : warning expected')
-        return 'fail'
+    assert gdal.GetLastErrorMsg() != '', 'fail : warning expected'
 
     # and also as read-write
     ds = ogr.Open('/vsimem/ogr_gpk_16.gpkg', update=1)
@@ -1310,9 +1166,7 @@ def test_ogr_gpkg_16():
     gdal.PushErrorHandler('CPLQuietErrorHandler')
     lyr.GetLayerDefn()
     gdal.PopErrorHandler()
-    if gdal.GetLastErrorMsg() == '':
-        gdaltest.post_reason('fail : warning expected')
-        return 'fail'
+    assert gdal.GetLastErrorMsg() != '', 'fail : warning expected'
     ds = None
 
     gdal.Unlink('/vsimem/ogr_gpk_16.gpkg')
@@ -1329,9 +1183,7 @@ def test_ogr_gpkg_16():
     gdal.PushErrorHandler('CPLQuietErrorHandler')
     lyr.GetLayerDefn()
     gdal.PopErrorHandler()
-    if gdal.GetLastErrorMsg() == '':
-        gdaltest.post_reason('fail : warning expected')
-        return 'fail'
+    assert gdal.GetLastErrorMsg() != '', 'fail : warning expected'
 
     gdal.Unlink('/vsimem/ogr_gpk_16.gpkg')
 
@@ -1346,17 +1198,13 @@ def test_ogr_gpkg_16():
     ds = ogr.Open('/vsimem/ogr_gpk_16.gpkg')
     lyr = ds.GetLayer(0)
     lyr.GetLayerDefn()
-    if gdal.GetLastErrorMsg() != '':
-        gdaltest.post_reason('fail : warning NOT expected')
-        return 'fail'
+    assert gdal.GetLastErrorMsg() == '', 'fail : warning NOT expected'
 
     # Warning since we open as read-write
     gdal.PushErrorHandler('CPLQuietErrorHandler')
     ds = ogr.Open('/vsimem/ogr_gpk_16.gpkg', update=1)
     gdal.PopErrorHandler()
-    if gdal.GetLastErrorMsg() == '':
-        gdaltest.post_reason('fail : warning expected')
-        return 'fail'
+    assert gdal.GetLastErrorMsg() != '', 'fail : warning expected'
 
     ds.ExecuteSQL("UPDATE gpkg_extensions SET scope = 'read-write' WHERE extension_name = 'myext'")
     ds = None
@@ -1365,17 +1213,13 @@ def test_ogr_gpkg_16():
     gdal.PushErrorHandler('CPLQuietErrorHandler')
     ds = ogr.Open('/vsimem/ogr_gpk_16.gpkg')
     gdal.PopErrorHandler()
-    if gdal.GetLastErrorMsg() == '':
-        gdaltest.post_reason('fail : warning expected')
-        return 'fail'
+    assert gdal.GetLastErrorMsg() != '', 'fail : warning expected'
 
     # and also as read-write
     gdal.PushErrorHandler('CPLQuietErrorHandler')
     ds = ogr.Open('/vsimem/ogr_gpk_16.gpkg', update=1)
     gdal.PopErrorHandler()
-    if gdal.GetLastErrorMsg() == '':
-        gdaltest.post_reason('fail : warning expected')
-        return 'fail'
+    assert gdal.GetLastErrorMsg() != '', 'fail : warning expected'
     ds = None
 
     gdal.Unlink('/vsimem/ogr_gpk_16.gpkg')
@@ -1394,8 +1238,7 @@ def test_ogr_gpkg_17():
     ds = gdaltest.gpkg_dr.CreateDataSource('/vsimem/ogr_gpkg_17.gpkg')
     sql_lyr = ds.ExecuteSQL("SELECT ogr_version()", dialect='INDIRECT_SQLITE')
     f = sql_lyr.GetNextFeature()
-    if f is None:
-        return 'fail'
+    assert f is not None
     ds.ReleaseResultSet(sql_lyr)
     ds = None
 
@@ -1419,26 +1262,19 @@ def test_ogr_gpkg_18():
     f = None
     ds = None
 
-    if not validate('/vsimem/ogr_gpkg_18.gpkg'):
-        gdaltest.post_reason('validation failed')
-        return 'fail'
+    assert validate('/vsimem/ogr_gpkg_18.gpkg'), 'validation failed'
 
     ds = ogr.Open('/vsimem/ogr_gpkg_18.gpkg')
-    if gdal.GetLastErrorMsg() != '':
-        gdaltest.post_reason('fail : warning NOT expected')
-        return 'fail'
+    assert gdal.GetLastErrorMsg() == '', 'fail : warning NOT expected'
 
     lyr = ds.GetLayer(0)
-    if lyr.GetGeomType() != ogr.wkbCircularString:
-        return 'fail'
+    assert lyr.GetGeomType() == ogr.wkbCircularString
     f = lyr.GetNextFeature()
     g = f.GetGeometryRef()
-    if g.GetGeometryType() != ogr.wkbCircularString:
-        return 'fail'
+    assert g.GetGeometryType() == ogr.wkbCircularString
 
     sql_lyr = ds.ExecuteSQL("SELECT * FROM gpkg_extensions WHERE table_name = 'wkbCircularString' AND extension_name = 'gpkg_geom_CIRCULARSTRING'")
-    if sql_lyr.GetFeatureCount() != 1:
-        return 'fail'
+    assert sql_lyr.GetFeatureCount() == 1
     ds.ReleaseResultSet(sql_lyr)
     ds = None
 
@@ -1453,22 +1289,18 @@ def test_ogr_gpkg_18():
     f = None
 
     sql_lyr = ds.ExecuteSQL("SELECT * FROM gpkg_extensions WHERE table_name = 'test' AND extension_name = 'gpkg_geom_CIRCULARSTRING'")
-    if sql_lyr.GetFeatureCount() != 1:
-        return 'fail'
+    assert sql_lyr.GetFeatureCount() == 1
     ds.ReleaseResultSet(sql_lyr)
 
     ds = None
 
     ds = ogr.Open('/vsimem/ogr_gpkg_18.gpkg')
-    if gdal.GetLastErrorMsg() != '':
-        gdaltest.post_reason('fail : warning NOT expected')
-        return 'fail'
+    assert gdal.GetLastErrorMsg() == '', 'fail : warning NOT expected'
 
     lyr = ds.GetLayer(0)
     f = lyr.GetNextFeature()
     g = f.GetGeometryRef()
-    if g.GetGeometryType() != ogr.wkbCircularString:
-        return 'fail'
+    assert g.GetGeometryType() == ogr.wkbCircularString
 
     ds = None
 
@@ -1477,8 +1309,7 @@ def test_ogr_gpkg_18():
     f = ogr.Feature(lyr.GetLayerDefn())
     f.SetGeometry(ogr.CreateGeometryFromWkt('CIRCULARSTRING(0 0,1 0,0 0)'))
     ret = lyr.CreateFeature(f)
-    if ret != 0 or gdal.GetLastErrorMsg() != '':
-        return 'fail'
+    assert ret == 0 and gdal.GetLastErrorMsg() == ''
     f = None
     ds = None
 
@@ -1488,15 +1319,12 @@ def test_ogr_gpkg_18():
         # Warning 1: Registering non-standard gpkg_geom_TRIANGLE extension
         ds.FlushCache()
     sql_lyr = ds.ExecuteSQL("SELECT * FROM gpkg_extensions WHERE table_name = 'test' AND extension_name = 'gpkg_geom_TRIANGLE'")
-    if sql_lyr.GetFeatureCount() != 1:
-        return 'fail'
+    assert sql_lyr.GetFeatureCount() == 1
     ds.ReleaseResultSet(sql_lyr)
     ds = None
 
     ret = validate('/vsimem/ogr_gpkg_18.gpkg', quiet=True)
-    if ret:
-        gdaltest.post_reason('validation unexpectedly succeeded')
-        return 'fail'
+    assert not ret, 'validation unexpectedly succeeded'
 
     # Test non-linear geometry in GeometryCollection
     ds = gdaltest.gpkg_dr.CreateDataSource('/vsimem/ogr_gpkg_18.gpkg')
@@ -1506,8 +1334,7 @@ def test_ogr_gpkg_18():
     lyr.CreateFeature(f)
     f = None
     sql_lyr = ds.ExecuteSQL("SELECT * FROM gpkg_extensions WHERE table_name = 'test' AND extension_name LIKE 'gpkg_geom_%'")
-    if sql_lyr.GetFeatureCount() != 1:
-        return 'fail'
+    assert sql_lyr.GetFeatureCount() == 1
     ds.ReleaseResultSet(sql_lyr)
     ds = None
 
@@ -1525,11 +1352,9 @@ def test_ogr_gpkg_19():
         return 'skip'
 
     ds = gdaltest.gpkg_dr.CreateDataSource('/vsimem/ogr_gpkg_19.gpkg')
-    if ds.GetMetadata():
-        return 'fail'
+    assert not ds.GetMetadata()
     lyr = ds.CreateLayer('test_without_md')
-    if lyr.GetMetadata():
-        return 'fail'
+    assert not lyr.GetMetadata()
 
     ds.SetMetadataItem('foo', 'bar')
 
@@ -1542,19 +1367,13 @@ def test_ogr_gpkg_19():
     ds = None
 
     ds = ogr.Open('/vsimem/ogr_gpkg_19.gpkg')
-    if ds.GetMetadataDomainList() != ['']:
-        print(ds.GetMetadataDomainList())
-        return 'fail'
+    assert ds.GetMetadataDomainList() == ['']
 
     ds = ogr.Open('/vsimem/ogr_gpkg_19.gpkg')
-    if len(ds.GetMetadata()) != 1:
-        print(ds.GetMetadata())
-        return 'fail'
+    assert len(ds.GetMetadata()) == 1
 
     ds = ogr.Open('/vsimem/ogr_gpkg_19.gpkg')
-    if ds.GetMetadataItem('foo') != 'bar':
-        print(ds.GetMetadata())
-        return 'fail'
+    assert ds.GetMetadataItem('foo') == 'bar', ds.GetMetadata()
     ds = None
 
     ds = ogr.Open('/vsimem/ogr_gpkg_19.gpkg', update=1)
@@ -1566,18 +1385,12 @@ def test_ogr_gpkg_19():
 
     ds = ogr.Open('/vsimem/ogr_gpkg_19.gpkg')
     lyr = ds.GetLayer('test_with_md')
-    if lyr.GetMetadataItem('IDENTIFIER') != 'ident':
-        print(lyr.GetMetadataItem('IDENTIFIER'))
-        return 'fail'
-    if lyr.GetMetadataItem('DESCRIPTION') != 'desc':
-        print(lyr.GetMetadataItem('DESCRIPTION'))
-        return 'fail'
+    assert lyr.GetMetadataItem('IDENTIFIER') == 'ident'
+    assert lyr.GetMetadataItem('DESCRIPTION') == 'desc'
 
     ds = ogr.Open('/vsimem/ogr_gpkg_19.gpkg', update=1)
     lyr = ds.GetLayer('test_with_md')
-    if lyr.GetMetadata() != {'IDENTIFIER': 'ident', 'DESCRIPTION': 'desc'}:
-        print(lyr.GetMetadata())
-        return 'fail'
+    assert lyr.GetMetadata() == {'IDENTIFIER': 'ident', 'DESCRIPTION': 'desc'}
     lyr.SetMetadataItem('IDENTIFIER', 'another_ident')
     lyr.SetMetadataItem('DESCRIPTION', 'another_desc')
     ds = None
@@ -1587,45 +1400,31 @@ def test_ogr_gpkg_19():
 
     ds = ogr.Open('/vsimem/ogr_gpkg_19.gpkg', update=1)
     lyr = ds.GetLayer('test_with_md')
-    if lyr.GetMetadata() != {'IDENTIFIER': 'another_ident', 'DESCRIPTION': 'another_desc'}:
-        print(lyr.GetMetadata())
-        return 'fail'
+    assert lyr.GetMetadata() == {'IDENTIFIER': 'another_ident', 'DESCRIPTION': 'another_desc'}
     lyr.SetMetadataItem('foo', 'bar')
     lyr.SetMetadataItem('bar', 'baz', 'another_domain')
     ds = None
 
     ds = ogr.Open('/vsimem/ogr_gpkg_19.gpkg', update=1)
     lyr = ds.GetLayer('test_with_md')
-    if lyr.GetMetadataDomainList() != ['', 'another_domain']:
-        print(lyr.GetMetadataDomainList())
-        return 'fail'
+    assert lyr.GetMetadataDomainList() == ['', 'another_domain']
     ds = None
 
     ds = ogr.Open('/vsimem/ogr_gpkg_19.gpkg', update=1)
     lyr = ds.GetLayer('test_with_md')
-    if lyr.GetMetadata() != {'IDENTIFIER': 'another_ident', 'foo': 'bar', 'DESCRIPTION': 'another_desc'}:
-        print(lyr.GetMetadata())
-        return 'fail'
-    if lyr.GetMetadata('another_domain') != {'bar': 'baz'}:
-        print(lyr.GetMetadata('another_domain'))
-        return 'fail'
+    assert lyr.GetMetadata() == {'IDENTIFIER': 'another_ident', 'foo': 'bar', 'DESCRIPTION': 'another_desc'}
+    assert lyr.GetMetadata('another_domain') == {'bar': 'baz'}
     lyr.SetMetadata(None)
     lyr.SetMetadata(None, 'another_domain')
     ds = None
 
     ds = ogr.Open('/vsimem/ogr_gpkg_19.gpkg', update=1)
     lyr = ds.GetLayer('test_with_md')
-    if lyr.GetMetadata() != {'IDENTIFIER': 'another_ident', 'DESCRIPTION': 'another_desc'}:
-        print(lyr.GetMetadata())
-        return 'fail'
-    if lyr.GetMetadataDomainList() != ['']:
-        print(lyr.GetMetadataDomainList())
-        return 'fail'
+    assert lyr.GetMetadata() == {'IDENTIFIER': 'another_ident', 'DESCRIPTION': 'another_desc'}
+    assert lyr.GetMetadataDomainList() == ['']
     ds = None
 
-    if not validate('/vsimem/ogr_gpkg_19.gpkg'):
-        gdaltest.post_reason('validation failed')
-        return 'fail'
+    assert validate('/vsimem/ogr_gpkg_19.gpkg'), 'validation failed'
 
     gdal.Unlink('/vsimem/ogr_gpkg_19.gpkg')
     gdal.Unlink('/vsimem/ogr_gpkg_19.gpkg.aux.xml')
@@ -1665,30 +1464,20 @@ def test_ogr_gpkg_20():
     sql_lyr = ds.ExecuteSQL("SELECT * FROM gpkg_spatial_ref_sys WHERE srs_name='my geogcs' AND srs_id = 100000 AND organization='MY_ORG' AND organization_coordsys_id=4326 AND description is NULL")
     fc = sql_lyr.GetFeatureCount()
     ds.ReleaseResultSet(sql_lyr)
-    if fc != 1:
-        print(fc)
-        return 'fail'
+    assert fc == 1
 
     sql_lyr = ds.ExecuteSQL("SELECT * FROM gpkg_spatial_ref_sys WHERE srs_name='another geogcs' AND srs_id = 100001 AND organization='NONE' AND organization_coordsys_id=100001 AND description is NULL")
     fc = sql_lyr.GetFeatureCount()
     ds.ReleaseResultSet(sql_lyr)
-    if fc != 1:
-        print(fc)
-        return 'fail'
+    assert fc == 1
 
     lyr = ds.GetLayer('my_org_4326')
-    if lyr.GetSpatialRef().ExportToWkt().find('my geogcs') < 0:
-        print(lyr.GetSpatialRef().ExportToWkt())
-        return 'fail'
+    assert lyr.GetSpatialRef().ExportToWkt().find('my geogcs') >= 0
     lyr = ds.GetLayer('without_org')
-    if lyr.GetSpatialRef().ExportToWkt().find('another geogcs') < 0:
-        print(lyr.GetSpatialRef().ExportToWkt())
-        return 'fail'
+    assert lyr.GetSpatialRef().ExportToWkt().find('another geogcs') >= 0
     ds = None
 
-    if not validate('/vsimem/ogr_gpkg_20.gpkg'):
-        gdaltest.post_reason('validation failed')
-        return 'fail'
+    assert validate('/vsimem/ogr_gpkg_20.gpkg'), 'validation failed'
 
     gdal.Unlink('/vsimem/ogr_gpkg_20.gpkg')
 
@@ -1758,14 +1547,12 @@ def test_ogr_gpkg_21():
 
     ds = ogr.Open('/vsimem/ogr_gpkg_21.gpkg', update=1)
     lyr = ds.GetLayer(0)
-    if lyr.GetLayerDefn().GetFieldDefn(0).GetWidth() != 2:
-        return 'fail'
+    assert lyr.GetLayerDefn().GetFieldDefn(0).GetWidth() == 2
     f = ogr.Feature(lyr.GetLayerDefn())
     f.SetField(0, 'ab')
     gdal.ErrorReset()
     lyr.CreateFeature(f)
-    if gdal.GetLastErrorMsg() != '':
-        return 'fail'
+    assert gdal.GetLastErrorMsg() == ''
 
     f = ogr.Feature(lyr.GetLayerDefn())
     f.SetFieldBinaryFromHexString(0, '41E9')
@@ -1773,8 +1560,7 @@ def test_ogr_gpkg_21():
     gdal.PushErrorHandler()
     lyr.CreateFeature(f)
     gdal.PopErrorHandler()
-    if gdal.GetLastErrorMsg() == '':
-        return 'fail'
+    assert gdal.GetLastErrorMsg() != ''
 
     f = ogr.Feature(lyr.GetLayerDefn())
     f.SetField(0, 'abc')
@@ -1782,12 +1568,10 @@ def test_ogr_gpkg_21():
     gdal.PushErrorHandler()
     lyr.CreateFeature(f)
     gdal.PopErrorHandler()
-    if gdal.GetLastErrorMsg() == '':
-        return 'fail'
+    assert gdal.GetLastErrorMsg() != ''
 
     f = lyr.GetFeature(f.GetFID())
-    if f.GetField(0) != 'abc':
-        return 'fail'
+    assert f.GetField(0) == 'abc'
 
     gdal.Unlink('/vsimem/ogr_gpkg_21.gpkg')
 
@@ -1803,12 +1587,10 @@ def test_ogr_gpkg_21():
     gdal.PushErrorHandler()
     lyr.CreateFeature(f)
     gdal.PopErrorHandler()
-    if gdal.GetLastErrorMsg() == '':
-        return 'fail'
+    assert gdal.GetLastErrorMsg() != ''
 
     f = lyr.GetFeature(f.GetFID())
-    if f.GetField(0) != 'A_':
-        return 'fail'
+    assert f.GetField(0) == 'A_'
 
     f = ogr.Feature(lyr.GetLayerDefn())
     f.SetField(0, 'abc')
@@ -1816,8 +1598,7 @@ def test_ogr_gpkg_21():
     gdal.PushErrorHandler()
     lyr.CreateFeature(f)
     gdal.PopErrorHandler()
-    if gdal.GetLastErrorMsg() == '':
-        return 'fail'
+    assert gdal.GetLastErrorMsg() != ''
 
     f = lyr.GetFeature(f.GetFID())
     if f.GetField(0) != 'ab':
@@ -1849,11 +1630,9 @@ def test_ogr_gpkg_22():
 
     ds = ogr.Open('/vsimem/ogr_gpkg_22.gpkg')
     lyr = ds.GetLayerByName('test')
-    if lyr.GetMetadataItem(ogr.OLMD_FID64) is None:
-        return 'fail'
+    assert lyr.GetMetadataItem(ogr.OLMD_FID64) is not None
     f = lyr.GetNextFeature()
-    if f.GetFID() != 1234567890123:
-        return 'fail'
+    assert f.GetFID() == 1234567890123
 
     gdal.Unlink('/vsimem/ogr_gpkg_22.gpkg')
 
@@ -1891,8 +1670,7 @@ def test_ogr_gpkg_23():
     gdal.PushErrorHandler()
     ret = lyr.CreateFeature(f)
     gdal.PopErrorHandler()
-    if ret == 0:
-        return 'fail'
+    assert ret != 0
     f = None
 
     # Error case: missing non-nullable field
@@ -1901,8 +1679,7 @@ def test_ogr_gpkg_23():
     gdal.PushErrorHandler()
     ret = lyr.CreateFeature(f)
     gdal.PopErrorHandler()
-    if ret == 0:
-        return 'fail'
+    assert ret != 0
     f = None
 
     # Nullable geometry field
@@ -1912,8 +1689,7 @@ def test_ogr_gpkg_23():
     gdal.PushErrorHandler()
     ret = lyr.CreateGeomField(ogr.GeomFieldDefn('foo', ogr.wkbPoint))
     gdal.PopErrorHandler()
-    if ret == 0:
-        return 'fail'
+    assert ret != 0
 
     f = ogr.Feature(lyr.GetLayerDefn())
     lyr.CreateFeature(f)
@@ -1936,22 +1712,18 @@ def test_ogr_gpkg_23():
     sql_lyr = ds.ExecuteSQL("SELECT * FROM gpkg_contents WHERE data_type = 'features'")
     fc = sql_lyr.GetFeatureCount()
     ds.ReleaseResultSet(sql_lyr)
-    if fc != 2:
-        return 'fail'
+    assert fc == 2
 
     sql_lyr = ds.ExecuteSQL("SELECT * FROM gpkg_extensions")
     fc = sql_lyr.GetFeatureCount()
     f = sql_lyr.GetNextFeature()
     ds.ReleaseResultSet(sql_lyr)
-    if fc != 2:  # r-tree and aspatial
-        print(fc)
-        return 'fail'
+    assert fc == 2
 
     sql_lyr = ds.ExecuteSQL("SELECT * FROM gpkg_geometry_columns")
     fc = sql_lyr.GetFeatureCount()
     ds.ReleaseResultSet(sql_lyr)
-    if fc != 2:
-        return 'fail'
+    assert fc == 2
 
     field_defn = ogr.GeomFieldDefn('geomfield_not_nullable', ogr.wkbPoint)
     field_defn.SetNullable(0)
@@ -1960,22 +1732,18 @@ def test_ogr_gpkg_23():
     sql_lyr = ds.ExecuteSQL("SELECT * FROM gpkg_contents WHERE data_type = 'features'")
     fc = sql_lyr.GetFeatureCount()
     ds.ReleaseResultSet(sql_lyr)
-    if fc != 3:
-        return 'fail'
+    assert fc == 3
 
     sql_lyr = ds.ExecuteSQL("SELECT * FROM gpkg_extensions")
     fc = sql_lyr.GetFeatureCount()
     f = sql_lyr.GetNextFeature()
     ds.ReleaseResultSet(sql_lyr)
-    if fc != 1:  # r-tree
-        print(fc)
-        return 'fail'
+    assert fc == 1
 
     sql_lyr = ds.ExecuteSQL("SELECT * FROM gpkg_geometry_columns")
     fc = sql_lyr.GetFeatureCount()
     ds.ReleaseResultSet(sql_lyr)
-    if fc != 3:
-        return 'fail'
+    assert fc == 3
 
     f = ogr.Feature(lyr.GetLayerDefn())
     f.SetField('field_not_nullable', 'not_null')
@@ -1985,8 +1753,7 @@ def test_ogr_gpkg_23():
 
     # Not Nullable geometry field
     lyr = ds.CreateLayer('test4', geom_type=ogr.wkbPoint, options=['GEOMETRY_NULLABLE=NO'])
-    if lyr.GetLayerDefn().GetGeomFieldDefn(0).IsNullable() != 0:
-        return 'fail'
+    assert lyr.GetLayerDefn().GetGeomFieldDefn(0).IsNullable() == 0
     f = ogr.Feature(lyr.GetLayerDefn())
     f.SetGeometryDirectly(ogr.CreateGeometryFromWkt('POINT(0 0)'))
     lyr.CreateFeature(f)
@@ -2001,32 +1768,23 @@ def test_ogr_gpkg_23():
     lyr = ds.GetLayerByName('test5')
     field_defn = ogr.GeomFieldDefn('', ogr.wkbPoint)
     with gdaltest.error_handler():
-        if lyr.CreateGeomField(field_defn) == 0:
-            return 'fail'
+        assert lyr.CreateGeomField(field_defn) != 0
 
     lyr = ds.GetLayerByName('test')
-    if lyr.GetLayerDefn().GetFieldDefn(lyr.GetLayerDefn().GetFieldIndex('field_not_nullable')).IsNullable() != 0:
-        return 'fail'
-    if lyr.GetLayerDefn().GetFieldDefn(lyr.GetLayerDefn().GetFieldIndex('field_nullable')).IsNullable() != 1:
-        return 'fail'
-    if lyr.GetLayerDefn().GetGeomFieldDefn(lyr.GetLayerDefn().GetGeomFieldIndex('geomfield_not_nullable')).IsNullable() != 0:
-        return 'fail'
+    assert lyr.GetLayerDefn().GetFieldDefn(lyr.GetLayerDefn().GetFieldIndex('field_not_nullable')).IsNullable() == 0
+    assert lyr.GetLayerDefn().GetFieldDefn(lyr.GetLayerDefn().GetFieldIndex('field_nullable')).IsNullable() == 1
+    assert lyr.GetLayerDefn().GetGeomFieldDefn(lyr.GetLayerDefn().GetGeomFieldIndex('geomfield_not_nullable')).IsNullable() == 0
 
     lyr = ds.GetLayerByName('test2')
-    if lyr.GetLayerDefn().GetGeomFieldDefn(0).IsNullable() != 1:
-        return 'fail'
+    assert lyr.GetLayerDefn().GetGeomFieldDefn(0).IsNullable() == 1
 
     lyr = ds.GetLayerByName('test3')
-    if lyr.GetLayerDefn().GetFieldDefn(lyr.GetLayerDefn().GetFieldIndex('field_not_nullable')).IsNullable() != 0:
-        return 'fail'
-    if lyr.GetLayerDefn().GetFieldDefn(lyr.GetLayerDefn().GetFieldIndex('field_nullable')).IsNullable() != 1:
-        return 'fail'
-    if lyr.GetLayerDefn().GetGeomFieldDefn(lyr.GetLayerDefn().GetGeomFieldIndex('geomfield_not_nullable')).IsNullable() != 0:
-        return 'fail'
+    assert lyr.GetLayerDefn().GetFieldDefn(lyr.GetLayerDefn().GetFieldIndex('field_not_nullable')).IsNullable() == 0
+    assert lyr.GetLayerDefn().GetFieldDefn(lyr.GetLayerDefn().GetFieldIndex('field_nullable')).IsNullable() == 1
+    assert lyr.GetLayerDefn().GetGeomFieldDefn(lyr.GetLayerDefn().GetGeomFieldIndex('geomfield_not_nullable')).IsNullable() == 0
 
     lyr = ds.GetLayerByName('test4')
-    if lyr.GetLayerDefn().GetGeomFieldDefn(0).IsNullable() != 0:
-        return 'fail'
+    assert lyr.GetLayerDefn().GetGeomFieldDefn(0).IsNullable() == 0
 
     ds = None
 
@@ -2112,28 +1870,16 @@ def test_ogr_gpkg_24():
 
     ds = ogr.Open('/vsimem/ogr_gpkg_24.gpkg', update=1)
     lyr = ds.GetLayerByName('test')
-    if lyr.GetLayerDefn().GetFieldDefn(lyr.GetLayerDefn().GetFieldIndex('field_string')).GetDefault() != "'a''b'":
-        return 'fail'
-    if lyr.GetLayerDefn().GetFieldDefn(lyr.GetLayerDefn().GetFieldIndex('field_int')).GetDefault() != '123':
-        return 'fail'
-    if lyr.GetLayerDefn().GetFieldDefn(lyr.GetLayerDefn().GetFieldIndex('field_real')).GetDefault() != '1.23':
-        return 'fail'
-    if lyr.GetLayerDefn().GetFieldDefn(lyr.GetLayerDefn().GetFieldIndex('field_nodefault')).GetDefault() is not None:
-        return 'fail'
+    assert lyr.GetLayerDefn().GetFieldDefn(lyr.GetLayerDefn().GetFieldIndex('field_string')).GetDefault() == "'a''b'"
+    assert lyr.GetLayerDefn().GetFieldDefn(lyr.GetLayerDefn().GetFieldIndex('field_int')).GetDefault() == '123'
+    assert lyr.GetLayerDefn().GetFieldDefn(lyr.GetLayerDefn().GetFieldIndex('field_real')).GetDefault() == '1.23'
+    assert lyr.GetLayerDefn().GetFieldDefn(lyr.GetLayerDefn().GetFieldIndex('field_nodefault')).GetDefault() is None
     # Translated from "(strftime('%Y-%m-%dT%H:%M:%fZ','now'))" to CURRENT_TIMESTAMP
-    if lyr.GetLayerDefn().GetFieldDefn(lyr.GetLayerDefn().GetFieldIndex('field_datetime')).GetDefault() != 'CURRENT_TIMESTAMP':
-        return 'fail'
-    if lyr.GetLayerDefn().GetFieldDefn(lyr.GetLayerDefn().GetFieldIndex('field_datetime2')).GetDefault() != "'2015/06/30 12:34:56'":
-        print(lyr.GetLayerDefn().GetFieldDefn(lyr.GetLayerDefn().GetFieldIndex('field_datetime2')).GetDefault())
-        return 'fail'
-    if lyr.GetLayerDefn().GetFieldDefn(lyr.GetLayerDefn().GetFieldIndex('field_datetime3')).GetDefault() != "CURRENT_TIMESTAMP":
-        print(lyr.GetLayerDefn().GetFieldDefn(lyr.GetLayerDefn().GetFieldIndex('field_datetime3')).GetDefault())
-        return 'fail'
-    if lyr.GetLayerDefn().GetFieldDefn(lyr.GetLayerDefn().GetFieldIndex('field_datetime4')).GetDefault() != "'2015/06/30 12:34:56.123'":
-        print(lyr.GetLayerDefn().GetFieldDefn(lyr.GetLayerDefn().GetFieldIndex('field_datetime4')).GetDefault())
-        return 'fail'
-    if lyr.GetLayerDefn().GetFieldDefn(lyr.GetLayerDefn().GetFieldIndex('field_date')).GetDefault() != "CURRENT_DATE":
-        return 'fail'
+    assert lyr.GetLayerDefn().GetFieldDefn(lyr.GetLayerDefn().GetFieldIndex('field_datetime')).GetDefault() == 'CURRENT_TIMESTAMP'
+    assert lyr.GetLayerDefn().GetFieldDefn(lyr.GetLayerDefn().GetFieldIndex('field_datetime2')).GetDefault() == "'2015/06/30 12:34:56'"
+    assert lyr.GetLayerDefn().GetFieldDefn(lyr.GetLayerDefn().GetFieldIndex('field_datetime3')).GetDefault() == "CURRENT_TIMESTAMP"
+    assert lyr.GetLayerDefn().GetFieldDefn(lyr.GetLayerDefn().GetFieldIndex('field_datetime4')).GetDefault() == "'2015/06/30 12:34:56.123'"
+    assert lyr.GetLayerDefn().GetFieldDefn(lyr.GetLayerDefn().GetFieldIndex('field_date')).GetDefault() == "CURRENT_DATE"
     # if lyr.GetLayerDefn().GetFieldDefn(lyr.GetLayerDefn().GetFieldIndex('field_time')).GetDefault() != "CURRENT_TIME":
     #    gdaltest.post_reason('fail')
     #    return 'fail'
@@ -2173,12 +1919,10 @@ def test_ogr_gpkg_25():
     gdal.PushErrorHandler()
     ret = lyr.CreateField(ogr.FieldDefn('myfid', ogr.OFTString))
     gdal.PopErrorHandler()
-    if ret == 0:
-        return 'fail'
+    assert ret != 0
 
     ret = lyr.CreateField(ogr.FieldDefn('myfid', ogr.OFTInteger))
-    if ret != 0:
-        return 'fail'
+    assert ret == 0
     lyr.CreateField(ogr.FieldDefn('str2', ogr.OFTString))
 
     feat = ogr.Feature(lyr.GetLayerDefn())
@@ -2186,16 +1930,13 @@ def test_ogr_gpkg_25():
     feat.SetField('myfid', 10)
     feat.SetField('str2', 'second string')
     ret = lyr.CreateFeature(feat)
-    if ret != 0:
-        return 'fail'
-    if feat.GetFID() != 10:
-        return 'fail'
+    assert ret == 0
+    assert feat.GetFID() == 10
 
     feat = ogr.Feature(lyr.GetLayerDefn())
     feat.SetField('str2', 'second string')
     ret = lyr.CreateFeature(feat)
-    if ret != 0:
-        return 'fail'
+    assert ret == 0
     if feat.GetFID() < 0:
         feat.DumpReadable()
         return 'fail'
@@ -2205,8 +1946,7 @@ def test_ogr_gpkg_25():
 
     feat.SetField('str', 'foo')
     ret = lyr.SetFeature(feat)
-    if ret != 0:
-        return 'fail'
+    assert ret == 0
 
     feat = ogr.Feature(lyr.GetLayerDefn())
     feat.SetFID(1)
@@ -2214,21 +1954,18 @@ def test_ogr_gpkg_25():
     gdal.PushErrorHandler()
     ret = lyr.CreateFeature(feat)
     gdal.PopErrorHandler()
-    if ret == 0:
-        return 'fail'
+    assert ret != 0
 
     gdal.PushErrorHandler()
     ret = lyr.SetFeature(feat)
     gdal.PopErrorHandler()
-    if ret == 0:
-        return 'fail'
+    assert ret != 0
 
     feat.UnsetField('myfid')
     gdal.PushErrorHandler()
     ret = lyr.SetFeature(feat)
     gdal.PopErrorHandler()
-    if ret == 0:
-        return 'fail'
+    assert ret != 0
 
     lyr.ResetReading()
     f = lyr.GetNextFeature()
@@ -2258,85 +1995,68 @@ def test_ogr_gpkg_26():
 
     ds = gdaltest.gpkg_dr.CreateDataSource('/vsimem/ogr_gpkg_26.gpkg')
 
-    if ds.TestCapability(ogr.ODsCTransactions) != 1:
-        return 'fail'
+    assert ds.TestCapability(ogr.ODsCTransactions) == 1
 
     ret = ds.StartTransaction()
-    if ret != 0:
-        return 'fail'
+    assert ret == 0
     gdal.PushErrorHandler()
     ret = ds.StartTransaction()
     gdal.PopErrorHandler()
-    if ret == 0:
-        return 'fail'
+    assert ret != 0
 
     lyr = ds.CreateLayer('test')
     lyr.CreateField(ogr.FieldDefn('foo', ogr.OFTString))
     ret = ds.RollbackTransaction()
-    if ret != 0:
-        return 'fail'
+    assert ret == 0
     gdal.PushErrorHandler()
     ret = ds.RollbackTransaction()
     gdal.PopErrorHandler()
-    if ret == 0:
-        return 'fail'
+    assert ret != 0
     ds = None
 
     ds = ogr.Open('/vsimem/ogr_gpkg_26.gpkg', update=1)
-    if ds.GetLayerCount() != 0:
-        return 'fail'
+    assert ds.GetLayerCount() == 0
     ret = ds.StartTransaction()
-    if ret != 0:
-        return 'fail'
+    assert ret == 0
     gdal.PushErrorHandler()
     ret = ds.StartTransaction()
     gdal.PopErrorHandler()
-    if ret == 0:
-        return 'fail'
+    assert ret != 0
 
     lyr = ds.CreateLayer('test')
     lyr.CreateField(ogr.FieldDefn('foo', ogr.OFTString))
     ret = ds.CommitTransaction()
-    if ret != 0:
-        return 'fail'
+    assert ret == 0
     gdal.PushErrorHandler()
     ret = ds.CommitTransaction()
     gdal.PopErrorHandler()
-    if ret == 0:
-        return 'fail'
+    assert ret != 0
     ds = None
 
     ds = ogr.Open('/vsimem/ogr_gpkg_26.gpkg', update=1)
-    if ds.GetLayerCount() != 1:
-        return 'fail'
+    assert ds.GetLayerCount() == 1
     lyr = ds.GetLayerByName('test')
 
     ds.StartTransaction()
     lyr.CreateFeature(ogr.Feature(lyr.GetLayerDefn()))
     lyr.ResetReading()
     f = lyr.GetNextFeature()
-    if f is None:
-        return 'fail'
-    if lyr.GetFeatureCount() != 1:
-        return 'fail'
+    assert f is not None
+    assert lyr.GetFeatureCount() == 1
     ds.RollbackTransaction()
-    if lyr.GetFeatureCount() != 0:
-        return 'fail'
+    assert lyr.GetFeatureCount() == 0
 
     ds.StartTransaction()
     lyr.CreateFeature(ogr.Feature(lyr.GetLayerDefn()))
     lyr.CreateFeature(ogr.Feature(lyr.GetLayerDefn()))
     lyr.ResetReading()
     f = lyr.GetNextFeature()
-    if f is None or f.GetFID() != 1:
-        return 'fail'
+    assert f is not None and f.GetFID() == 1
     ds.CommitTransaction()
     # the cursor is still valid after CommitTransaction(), which isn't the case for other backends such as PG !
     f = lyr.GetNextFeature()
-    if f is None or f.GetFID() != 2:
-        return 'fail'
-    if lyr.GetFeatureCount() != 2:
-        return 'fail'
+    assert f is not None and f.GetFID() == 2
+    assert lyr.GetFeatureCount() == 2
 
     ds.StartTransaction()
     lyr = ds.CreateLayer('test2', geom_type=ogr.wkbPoint)
@@ -2346,16 +2066,14 @@ def test_ogr_gpkg_26():
     f.SetGeometryDirectly(ogr.CreateGeometryFromWkt('POINT(0 0)'))
     ret = lyr.CreateFeature(f)
     ds.CommitTransaction()
-    if ret != 0:
-        return 'fail'
+    assert ret == 0
 
     ds.StartTransaction()
     f = ogr.Feature(lyr.GetLayerDefn())
     f.SetGeometryDirectly(ogr.CreateGeometryFromWkt('POINT(0 0)'))
     ret = lyr.CreateFeature(f)
     ds.CommitTransaction()
-    if ret != 0:
-        return 'fail'
+    assert ret == 0
 
     if False:  # pylint: disable=using-constant-test
         ds.StartTransaction()
@@ -2379,8 +2097,7 @@ def test_ogr_gpkg_26():
         ds.CommitTransaction()
         # For some reason fails with SQLite 3.6.X with 'failed to execute insert : callback requested query abort'
         # but not with later versions...
-        if ret != 0:
-            return 'fail'
+        assert ret == 0
 
     ds = None
 
@@ -2435,8 +2152,7 @@ def test_ogr_gpkg_28():
 
     srcDS = gdal.OpenEx('../ogr/data/poly.shp')
     ds = gdal.VectorTranslate('/vsimem/ogr_gpkg_28.gpkg', srcDS, format='GPKG', dstSRS='EPSG:4326')
-    if str(ds.GetLayer(0).GetSpatialRef()).find('1984') == -1:
-        return 'fail'
+    assert str(ds.GetLayer(0).GetSpatialRef()).find('1984') != -1
 
     ds = None
     gdaltest.gpkg_dr.DeleteDataSource('/vsimem/ogr_gpkg_28.gpkg')
@@ -2453,30 +2169,24 @@ def test_ogr_gpkg_29():
         return 'skip'
 
     ds = gdaltest.gpkg_dr.CreateDataSource('/vsimem/ogr_gpkg_29.gpkg')
-    if ds.TestCapability(ogr.ODsCMeasuredGeometries) != 1:
-        return 'fail'
+    assert ds.TestCapability(ogr.ODsCMeasuredGeometries) == 1
     lyr = ds.CreateLayer('pointm', geom_type=ogr.wkbPointM)
-    if lyr.TestCapability(ogr.OLCMeasuredGeometries) != 1:
-        return 'fail'
+    assert lyr.TestCapability(ogr.OLCMeasuredGeometries) == 1
     f = ogr.Feature(lyr.GetLayerDefn())
     f.SetGeometryDirectly(ogr.CreateGeometryFromWkt('POINT M (1 2 3)'))
     lyr.CreateFeature(f)
     lyr = ds.CreateLayer('pointzm', geom_type=ogr.wkbPointZM)
-    if lyr.TestCapability(ogr.OLCMeasuredGeometries) != 1:
-        return 'fail'
+    assert lyr.TestCapability(ogr.OLCMeasuredGeometries) == 1
     f = ogr.Feature(lyr.GetLayerDefn())
     f.SetGeometryDirectly(ogr.CreateGeometryFromWkt('POINT ZM (1 2 3 4)'))
     lyr.CreateFeature(f)
     ds = None
 
-    if not validate('/vsimem/ogr_gpkg_29.gpkg'):
-        gdaltest.post_reason('validation failed')
-        return 'fail'
+    assert validate('/vsimem/ogr_gpkg_29.gpkg'), 'validation failed'
 
     ds = ogr.Open('/vsimem/ogr_gpkg_29.gpkg', update=1)
     lyr = ds.GetLayerByName('pointm')
-    if lyr.GetGeomType() != ogr.wkbPointM:
-        return 'fail'
+    assert lyr.GetGeomType() == ogr.wkbPointM
     f = lyr.GetNextFeature()
     if f.GetGeometryRef().ExportToIsoWkt() != 'POINT M (1 2 3)':
         f.DumpReadable()
@@ -2486,8 +2196,7 @@ def test_ogr_gpkg_29():
     ds.ExecuteSQL("UPDATE pointm SET geom = x'4750000700000000000000000000F03F000000000000F03F000000000000004000000000000000400000000000000840000000000000084001D1070000000000000000F03F00000000000000400000000000000840'")
 
     lyr = ds.GetLayerByName('pointzm')
-    if lyr.GetGeomType() != ogr.wkbPointZM:
-        return 'fail'
+    assert lyr.GetGeomType() == ogr.wkbPointZM
     f = lyr.GetNextFeature()
     if f.GetGeometryRef().ExportToIsoWkt() != 'POINT ZM (1 2 3 4)':
         f.DumpReadable()
@@ -2501,15 +2210,13 @@ def test_ogr_gpkg_29():
     # Check again
     ds = ogr.Open('/vsimem/ogr_gpkg_29.gpkg')
     lyr = ds.GetLayerByName('pointm')
-    if lyr.GetGeomType() != ogr.wkbPointM:
-        return 'fail'
+    assert lyr.GetGeomType() == ogr.wkbPointM
     f = lyr.GetNextFeature()
     if f.GetGeometryRef().ExportToIsoWkt() != 'POINT M (1 2 3)':
         f.DumpReadable()
         return 'fail'
     lyr = ds.GetLayerByName('pointzm')
-    if lyr.GetGeomType() != ogr.wkbPointZM:
-        return 'fail'
+    assert lyr.GetGeomType() == ogr.wkbPointZM
     f = lyr.GetNextFeature()
     if f.GetGeometryRef().ExportToIsoWkt() != 'POINT ZM (1 2 3 4)':
         f.DumpReadable()
@@ -2531,18 +2238,14 @@ def test_ogr_gpkg_30():
 
     with gdaltest.error_handler():
         ds = gdaltest.gpkg_dr.CreateDataSource('/vsimem/ogr_gpkg_30.geopkg')
-    if ds is None:
-        return 'fail'
-    if gdal.GetLastErrorMsg() == '':
-        return 'fail'
+    assert ds is not None
+    assert gdal.GetLastErrorMsg() != ''
     ds = None
 
     with gdaltest.error_handler():
         ds = ogr.Open('/vsimem/ogr_gpkg_30.geopkg', update=1)
-    if ds is None:
-        return 'fail'
-    if gdal.GetLastErrorMsg() == '':
-        return 'fail'
+    assert ds is not None
+    assert gdal.GetLastErrorMsg() != ''
     ds = None
 
     with gdaltest.error_handler():
@@ -2578,16 +2281,12 @@ def test_ogr_gpkg_31():
 
     ds = ogr.Open('/vsimem/ogr_gpkg_31.gpkg')
     lyr = ds.GetLayerByName('curve')
-    if lyr.GetGeomType() != ogr.wkbCurve:
-        return 'fail'
+    assert lyr.GetGeomType() == ogr.wkbCurve
     lyr = ds.GetLayerByName('surface')
-    if lyr.GetGeomType() != ogr.wkbSurface:
-        return 'fail'
+    assert lyr.GetGeomType() == ogr.wkbSurface
     ds = None
 
-    if not validate('/vsimem/ogr_gpkg_31.gpkg'):
-        gdaltest.post_reason('validation failed')
-        return 'fail'
+    assert validate('/vsimem/ogr_gpkg_31.gpkg'), 'validation failed'
 
     gdaltest.gpkg_dr.DeleteDataSource('/vsimem/ogr_gpkg_31.gpkg')
 
@@ -2608,25 +2307,19 @@ def test_ogr_gpkg_32():
     ds = None
 
     ds = ogr.Open('/vsimem/ogr_gpkg_32.gpkg')
-    if ds.GetLayerCount() != 1:
-        return 'fail'
+    assert ds.GetLayerCount() == 1
     sql_lyr = ds.ExecuteSQL("SELECT * FROM gpkg_contents WHERE table_name != 'ogr_empty_table'")
-    if sql_lyr.GetFeatureCount() != 0:
-        return 'fail'
+    assert sql_lyr.GetFeatureCount() == 0
     ds.ReleaseResultSet(sql_lyr)
     sql_lyr = ds.ExecuteSQL("SELECT * FROM gpkg_geometry_columns WHERE table_name != 'ogr_empty_table'")
-    if sql_lyr.GetFeatureCount() != 0:
-        return 'fail'
+    assert sql_lyr.GetFeatureCount() == 0
     ds.ReleaseResultSet(sql_lyr)
     sql_lyr = ds.ExecuteSQL("SELECT * FROM sqlite_master WHERE name = 'gpkg_extensions'")
-    if sql_lyr.GetFeatureCount() != 0:
-        return 'fail'
+    assert sql_lyr.GetFeatureCount() == 0
     ds.ReleaseResultSet(sql_lyr)
     ds = None
 
-    if not validate('/vsimem/ogr_gpkg_32.gpkg'):
-        gdaltest.post_reason('validation failed')
-        return 'fail'
+    assert validate('/vsimem/ogr_gpkg_32.gpkg'), 'validation failed'
 
     gdaltest.gpkg_dr.DeleteDataSource('/vsimem/ogr_gpkg_32.gpkg')
 
@@ -2649,8 +2342,7 @@ def test_ogr_gpkg_33():
 
     ds = ogr.Open('/vsimem/ogr_gpkg_33.gpkg')
     sql_lyr = ds.ExecuteSQL("SELECT * FROM gpkg_contents WHERE last_change = '2000-01-01T:00:00:00.000Z' AND table_name != 'ogr_empty_table'")
-    if sql_lyr.GetFeatureCount() != 1:
-        return 'fail'
+    assert sql_lyr.GetFeatureCount() == 1
     ds.ReleaseResultSet(sql_lyr)
     ds = None
 
@@ -2670,9 +2362,7 @@ def test_ogr_gpkg_test_ogrsf():
     # Do integrity check first
     sql_lyr = gdaltest.gpkg_ds.ExecuteSQL("PRAGMA integrity_check")
     feat = sql_lyr.GetNextFeature()
-    if feat.GetField(0) != 'ok':
-        gdaltest.post_reason('integrity check failed')
-        return 'fail'
+    assert feat.GetField(0) == 'ok', 'integrity check failed'
     gdaltest.gpkg_ds.ReleaseResultSet(sql_lyr)
 
     import test_cli_utilities
@@ -2683,15 +2373,11 @@ def test_ogr_gpkg_test_ogrsf():
     # sys.exit(0)
     ret = gdaltest.runexternal(test_cli_utilities.get_test_ogrsf_path() + ' tmp/gpkg_test.gpkg --config OGR_SQLITE_SYNCHRONOUS OFF')
 
-    if ret.find('INFO') == -1 or ret.find('ERROR') != -1:
-        print(ret)
-        return 'fail'
+    assert ret.find('INFO') != -1 and ret.find('ERROR') == -1
 
     ret = gdaltest.runexternal(test_cli_utilities.get_test_ogrsf_path() + ' tmp/gpkg_test.gpkg -sql "select * from tbl_linestring_renamed" --config OGR_SQLITE_SYNCHRONOUS OFF')
 
-    if ret.find('INFO') == -1 or ret.find('ERROR') != -1:
-        print(ret)
-        return 'fail'
+    assert ret.find('INFO') != -1 and ret.find('ERROR') == -1
 
     return 'success'
 
@@ -2733,15 +2419,13 @@ def test_ogr_gpkg_34():
     content = gdal.VSIFReadL(1, 1000000, f).decode('latin1')
     gdal.VSIFCloseL(f)
 
-    if content.find(layer_name) < 0:
-        return 'fail'
+    assert content.find(layer_name) >= 0
 
     ds = ogr.Open(dbname, update=1)
     new_layer_name = """weird2'layer"name"""
     with gdaltest.error_handler():
         ds.ExecuteSQL('ALTER TABLE "weird\'layer""name" RENAME TO gpkg_contents')
-    if gdal.GetLastErrorMsg() == '':
-        return 'fail'
+    assert gdal.GetLastErrorMsg() != ''
     gdal.ErrorReset()
     ds.ExecuteSQL('ALTER TABLE "weird\'layer""name" RENAME TO "weird2\'layer""name"')
     ds.ExecuteSQL('VACUUM')
@@ -2752,19 +2436,16 @@ def test_ogr_gpkg_34():
     content = gdal.VSIFReadL(1, 1000000, f).decode('latin1')
     gdal.VSIFCloseL(f)
 
-    if content.find(layer_name) >= 0:
-        return 'fail'
+    assert content.find(layer_name) < 0
     layer_name = new_layer_name
 
     ds = ogr.Open(dbname, update=1)
     with gdaltest.error_handler():
         ds.ExecuteSQL('DELLAYER:does_not_exist')
-    if gdal.GetLastErrorMsg() == '':
-        return 'fail'
+    assert gdal.GetLastErrorMsg() != ''
     gdal.ErrorReset()
     ds.ExecuteSQL('DELLAYER:' + layer_name)
-    if gdal.GetLastErrorMsg() != '':
-        return 'fail'
+    assert gdal.GetLastErrorMsg() == ''
     ds.ExecuteSQL('VACUUM')
     ds = None
 
@@ -2773,8 +2454,7 @@ def test_ogr_gpkg_34():
     content = gdal.VSIFReadL(1, 1000000, f).decode('latin1')
     gdal.VSIFCloseL(f)
 
-    if content.find(layer_name) >= 0:
-        return 'fail'
+    assert content.find(layer_name) < 0
 
     gdaltest.gpkg_dr.DeleteDataSource(dbname)
 
@@ -2790,15 +2470,12 @@ def test_ogr_gpkg_34():
 
     ds = ogr.Open(dbname, update=1)
     ds.ExecuteSQL('DROP TABLE "weird2\'layer""name"')
-    if gdal.GetLastErrorMsg() != '':
-        return 'fail'
+    assert gdal.GetLastErrorMsg() == ''
     ds.ExecuteSQL('DROP TABLE another_layer_name')
-    if gdal.GetLastErrorMsg() != '':
-        return 'fail'
+    assert gdal.GetLastErrorMsg() == ''
     with gdaltest.error_handler():
         ds.ExecuteSQL('DROP TABLE "foobar"')
-    if gdal.GetLastErrorMsg() == '':
-        return 'fail'
+    assert gdal.GetLastErrorMsg() != ''
     gdal.ErrorReset()
     ds.ExecuteSQL('VACUUM')
     ds = None
@@ -2808,11 +2485,9 @@ def test_ogr_gpkg_34():
     content = gdal.VSIFReadL(1, 1000000, f).decode('latin1')
     gdal.VSIFCloseL(f)
 
-    if content.find(layer_name) >= 0:
-        return 'fail'
+    assert content.find(layer_name) < 0
 
-    if content.find('another_layer_name') >= 0:
-        return 'fail'
+    assert content.find('another_layer_name') < 0
 
     gdaltest.gpkg_dr.DeleteDataSource(dbname)
 
@@ -2866,23 +2541,18 @@ def test_ogr_gpkg_35():
     ds.ExecuteSQL("INSERT INTO gpkg_data_columns VALUES('test', 'bar_i_will_disappear', 'bar_constraints', NULL, NULL, NULL, NULL)")
     ds.ExecuteSQL("INSERT INTO gpkg_extensions VALUES('test', 'bar_i_will_disappear', 'extension_name', 'definition', 'scope')")
 
-    if lyr.TestCapability(ogr.OLCDeleteField) != 1:
-        return 'fail'
+    assert lyr.TestCapability(ogr.OLCDeleteField) == 1
 
     with gdaltest.error_handler():
         ret = lyr.DeleteField(-1)
-    if ret == 0:
-        return 'fail'
+    assert ret != 0
 
     with gdaltest.error_handler():
         ret = lyr.DeleteField(lyr.GetLayerDefn().GetFieldCount())
-    if ret == 0:
-        return 'fail'
+    assert ret != 0
 
-    if lyr.DeleteField(1) != 0:
-        return 'fail'
-    if lyr.GetLayerDefn().GetFieldCount() != 2:
-        return 'fail'
+    assert lyr.DeleteField(1) == 0
+    assert lyr.GetLayerDefn().GetFieldCount() == 2
 
     lyr.ResetReading()
     f = lyr.GetNextFeature()
@@ -2894,8 +2564,7 @@ def test_ogr_gpkg_35():
     lyr.StartTransaction()
     ret = lyr_nonspatial.DeleteField(1)
     lyr.CommitTransaction()
-    if ret != 0:
-        return 'fail'
+    assert ret == 0
     lyr_nonspatial.ResetReading()
     f = lyr_nonspatial.GetNextFeature()
     if f.GetFID() != 10 or f['foo'] != 'fooval' or f['baz'] != 'bazval':
@@ -2911,8 +2580,7 @@ def test_ogr_gpkg_35():
     lyr = ds.GetLayer(0)
     with gdaltest.error_handler():
         ret = lyr.DeleteField(0)
-    if ret == 0:
-        return 'fail'
+    assert ret != 0
     ds = None
 
     # Check that there is no more any reference to the layer
@@ -2920,8 +2588,7 @@ def test_ogr_gpkg_35():
     content = gdal.VSIFReadL(1, 1000000, f).decode('latin1')
     gdal.VSIFCloseL(f)
 
-    if content.find('bar_i_will_disappear') >= 0:
-        return 'fail'
+    assert content.find('bar_i_will_disappear') < 0
 
     gdaltest.gpkg_dr.DeleteDataSource(dbname)
 
@@ -2963,38 +2630,31 @@ def test_ogr_gpkg_36():
     ds.ExecuteSQL("INSERT INTO gpkg_extensions VALUES('test', 'foo', 'extension_name', 'definition', 'scope')")
     ds.ExecuteSQL("CREATE INDEX my_idx ON test(foo)")
 
-    if lyr.TestCapability(ogr.OLCAlterFieldDefn) != 1:
-        return 'fail'
+    assert lyr.TestCapability(ogr.OLCAlterFieldDefn) == 1
 
     with gdaltest.error_handler():
         ret = lyr.AlterFieldDefn(-1, ogr.FieldDefn('foo'), ogr.ALTER_ALL_FLAG)
-    if ret == 0:
-        return 'fail'
+    assert ret != 0
 
     with gdaltest.error_handler():
         ret = lyr.AlterFieldDefn(1, ogr.FieldDefn('foo'), ogr.ALTER_ALL_FLAG)
-    if ret == 0:
-        return 'fail'
+    assert ret != 0
 
     with gdaltest.error_handler():
         ret = lyr.AlterFieldDefn(0, ogr.FieldDefn(lyr.GetGeometryColumn()), ogr.ALTER_ALL_FLAG)
-    if ret == 0:
-        return 'fail'
+    assert ret != 0
 
     with gdaltest.error_handler():
         ret = lyr.AlterFieldDefn(0, ogr.FieldDefn(lyr.GetFIDColumn()), ogr.ALTER_ALL_FLAG)
-    if ret == 0:
-        return 'fail'
+    assert ret != 0
 
     with gdaltest.error_handler():
         ret = lyr.AlterFieldDefn(0, ogr.FieldDefn('baz'), ogr.ALTER_ALL_FLAG)
-    if ret == 0:
-        return 'fail'
+    assert ret != 0
 
     new_field_defn = ogr.FieldDefn('bar', ogr.OFTReal)
     new_field_defn.SetSubType(ogr.OFSTFloat32)
-    if lyr.AlterFieldDefn(0, new_field_defn, ogr.ALTER_ALL_FLAG) != 0:
-        return 'fail'
+    assert lyr.AlterFieldDefn(0, new_field_defn, ogr.ALTER_ALL_FLAG) == 0
 
     lyr.ResetReading()
     f = lyr.GetNextFeature()
@@ -3006,8 +2666,7 @@ def test_ogr_gpkg_36():
 
     lyr.StartTransaction()
     new_field_defn = ogr.FieldDefn('baw', ogr.OFTString)
-    if lyr.AlterFieldDefn(0, new_field_defn, ogr.ALTER_ALL_FLAG) != 0:
-        return 'fail'
+    assert lyr.AlterFieldDefn(0, new_field_defn, ogr.ALTER_ALL_FLAG) == 0
     lyr.CommitTransaction()
 
     lyr.ResetReading()
@@ -3021,8 +2680,7 @@ def test_ogr_gpkg_36():
     # Check that index has been recreated
     sql_lyr = ds.ExecuteSQL("SELECT * FROM sqlite_master WHERE name = 'my_idx'")
     f = sql_lyr.GetNextFeature()
-    if f is None:
-        return 'fail'
+    assert f is not None
     f = None
     ds.ReleaseResultSet(sql_lyr)
 
@@ -3035,8 +2693,7 @@ def test_ogr_gpkg_36():
     lyr = ds.GetLayer(0)
     with gdaltest.error_handler():
         ret = lyr.AlterFieldDefn(0, ogr.FieldDefn('foo'), ogr.ALTER_ALL_FLAG)
-    if ret == 0:
-        return 'fail'
+    assert ret != 0
     ds = None
 
     # Check that there is no more any reference to the layer
@@ -3044,8 +2701,7 @@ def test_ogr_gpkg_36():
     content = gdal.VSIFReadL(1, 1000000, f).decode('latin1')
     gdal.VSIFCloseL(f)
 
-    if content.find('foo') >= 0:
-        return 'fail'
+    assert content.find('foo') < 0
 
     gdaltest.gpkg_dr.DeleteDataSource(dbname)
 
@@ -3058,8 +2714,7 @@ def test_ogr_gpkg_36():
     gdal.Unlink(dbname)
     with gdaltest.error_handler():
         ret = lyr.AlterFieldDefn(0, ogr.FieldDefn('bar'), ogr.ALTER_ALL_FLAG)
-    if ret == 0:
-        return 'fail'
+    assert ret != 0
     with gdaltest.error_handler():
         ds = None
 
@@ -3104,20 +2759,16 @@ def test_ogr_gpkg_37():
     ds.ExecuteSQL("CREATE INDEX my_idx_foo ON test(foo)")
     ds.ExecuteSQL("CREATE INDEX my_idx_bar ON test(bar)")
 
-    if lyr.TestCapability(ogr.OLCReorderFields) != 1:
-        return 'fail'
+    assert lyr.TestCapability(ogr.OLCReorderFields) == 1
 
     with gdaltest.error_handler():
         ret = lyr.ReorderFields([-1, -1])
-    if ret == 0:
-        return 'fail'
+    assert ret != 0
 
-    if lyr.ReorderFields([1, 0]) != 0:
-        return 'fail'
+    assert lyr.ReorderFields([1, 0]) == 0
 
     lyr.ResetReading()
-    if lyr.GetLayerDefn().GetFieldIndex('foo') != 1 or lyr.GetLayerDefn().GetFieldIndex('bar') != 0:
-        return 'fail'
+    assert lyr.GetLayerDefn().GetFieldIndex('foo') == 1 and lyr.GetLayerDefn().GetFieldIndex('bar') == 0
     f = lyr.GetNextFeature()
     if f.GetFID() != 10 or f['foo'] != 'fooval' or f['bar'] != 'barval' or \
             f.GetGeometryRef().ExportToWkt() != 'POLYGON ((0 0,0 1,1 1,0 0))':
@@ -3126,8 +2777,7 @@ def test_ogr_gpkg_37():
 
     # Check that index has been recreated
     sql_lyr = ds.ExecuteSQL("SELECT * FROM sqlite_master WHERE name = 'my_idx_foo' OR name = 'my_idx_bar'")
-    if sql_lyr.GetFeatureCount() != 2:
-        return 'fail'
+    assert sql_lyr.GetFeatureCount() == 2
     ds.ReleaseResultSet(sql_lyr)
 
     ds = None
@@ -3137,8 +2787,7 @@ def test_ogr_gpkg_37():
     lyr = ds.GetLayer(0)
     with gdaltest.error_handler():
         ret = lyr.ReorderFields([1, 0])
-    if ret == 0:
-        return 'fail'
+    assert ret != 0
     ds = None
 
     gdaltest.gpkg_dr.DeleteDataSource(dbname)
@@ -3170,14 +2819,10 @@ def test_ogr_gpkg_38(options=['SPATIAL_INDEX=YES']):
     ds = ogr.Open(dbname, update=1)
     lyr = ds.GetLayer(0)
     extent = lyr.GetExtent(force=0, can_return_null=True)
-    if extent is not None:
-        print(extent)
-        return 'fail'
+    assert extent is None
     # Test that we can compute the extent of a layer that has none registered in gpkg_contents
     extent = lyr.GetExtent(force=1)
-    if extent != (1, 3, 2, 4):
-        print(extent)
-        return 'fail'
+    assert extent == (1, 3, 2, 4)
     sql_lyr = ds.ExecuteSQL('SELECT min_x, min_y, max_x, max_y FROM gpkg_contents')
     f = sql_lyr.GetNextFeature()
     if f['min_x'] != 1 or f['min_y'] != 2 or f['max_x'] != 3 or f['max_y'] != 4:
@@ -3185,9 +2830,7 @@ def test_ogr_gpkg_38(options=['SPATIAL_INDEX=YES']):
         return 'fail'
     ds.ReleaseResultSet(sql_lyr)
     extent = lyr.GetExtent(force=0)
-    if extent != (1, 3, 2, 4):
-        print(extent)
-        return 'fail'
+    assert extent == (1, 3, 2, 4)
 
     # Modify feature
     f = lyr.GetFeature(1)
@@ -3196,23 +2839,17 @@ def test_ogr_gpkg_38(options=['SPATIAL_INDEX=YES']):
 
     # The extent has grown
     extent = lyr.GetExtent(force=0)
-    if extent != (-3.0, 3.0, -4.0, 4.0):
-        print(extent)
-        return 'fail'
+    assert extent == (-3.0, 3.0, -4.0, 4.0)
 
     ds.ExecuteSQL('RECOMPUTE EXTENT ON test')
     extent = lyr.GetExtent(force=0)
-    if extent != (-3.0, -1.0, -4.0, -2.0):
-        print(extent)
-        return 'fail'
+    assert extent == (-3.0, -1.0, -4.0, -2.0)
     ds = None
 
     ds = ogr.Open(dbname)
     lyr = ds.GetLayer(0)
     extent = lyr.GetExtent(force=0)
-    if extent != (-3.0, -1.0, -4.0, -2.0):
-        print(extent)
-        return 'fail'
+    assert extent == (-3.0, -1.0, -4.0, -2.0)
     ds = None
 
     ds = ogr.Open(dbname, update=1)
@@ -3223,17 +2860,13 @@ def test_ogr_gpkg_38(options=['SPATIAL_INDEX=YES']):
     # This should cancel NULLify the extent in gpkg_contents
     ds.ExecuteSQL('RECOMPUTE EXTENT ON test')
     extent = lyr.GetExtent(force=0, can_return_null=True)
-    if extent is not None:
-        print(extent)
-        return 'fail'
+    assert extent is None
     ds = None
 
     ds = ogr.Open(dbname)
     lyr = ds.GetLayer(0)
     extent = lyr.GetExtent(force=0, can_return_null=True)
-    if extent is not None:
-        print(extent)
-        return 'fail'
+    assert extent is None
     ds = None
 
     gdaltest.gpkg_dr.DeleteDataSource(dbname)
@@ -3260,29 +2893,24 @@ def test_ogr_gpkg_39():
     ds.CreateLayer('test')
 
     lyr = ds.CreateLayer('test_with_explicit_identifier', options=['IDENTIFIER=explicit_identifier'])
-    if lyr is None:
-        return 'fail'
+    assert lyr is not None
 
     # Allow overwriting
     lyr = ds.CreateLayer('test_with_explicit_identifier', options=['IDENTIFIER=explicit_identifier', 'OVERWRITE=YES'])
-    if lyr is None:
-        return 'fail'
+    assert lyr is not None
 
     with gdaltest.error_handler():
         lyr = ds.CreateLayer('test2', options=['IDENTIFIER=test'])
-    if lyr is not None:
-        return 'fail'
+    assert lyr is None
 
     with gdaltest.error_handler():
         lyr = ds.CreateLayer('test2', options=['IDENTIFIER=explicit_identifier'])
-    if lyr is not None:
-        return 'fail'
+    assert lyr is None
 
     ds.ExecuteSQL("INSERT INTO gpkg_contents ( table_name, identifier, data_type ) VALUES ( 'some_table', 'another_identifier', 'some_data_type' )")
     with gdaltest.error_handler():
         lyr = ds.CreateLayer('test2', options=['IDENTIFIER=another_identifier'])
-    if lyr is not None:
-        return 'fail'
+    assert lyr is None
     ds = None
 
     gdaltest.gpkg_dr.DeleteDataSource(dbname)
@@ -3304,25 +2932,19 @@ def test_ogr_gpkg_40():
     ds = None
 
     ds = ogr.Open('/vsimem/ogr_gpkg_40.gpkg')
-    if ds.GetLayerCount() != 1:
-        return 'fail'
+    assert ds.GetLayerCount() == 1
     sql_lyr = ds.ExecuteSQL("SELECT * FROM gpkg_contents WHERE table_name != 'ogr_empty_table'")
-    if sql_lyr.GetFeatureCount() != 1:
-        return 'fail'
+    assert sql_lyr.GetFeatureCount() == 1
     ds.ReleaseResultSet(sql_lyr)
     sql_lyr = ds.ExecuteSQL("SELECT * FROM gpkg_geometry_columns WHERE table_name != 'ogr_empty_table'")
-    if sql_lyr.GetFeatureCount() != 0:
-        return 'fail'
+    assert sql_lyr.GetFeatureCount() == 0
     ds.ReleaseResultSet(sql_lyr)
     sql_lyr = ds.ExecuteSQL("SELECT * FROM sqlite_master WHERE name = 'gpkg_extensions'")
-    if sql_lyr.GetFeatureCount() != 0:
-        return 'fail'
+    assert sql_lyr.GetFeatureCount() == 0
     ds.ReleaseResultSet(sql_lyr)
     ds = None
 
-    if not validate('/vsimem/ogr_gpkg_40.gpkg'):
-        gdaltest.post_reason('validation failed')
-        return 'fail'
+    assert validate('/vsimem/ogr_gpkg_40.gpkg'), 'validation failed'
 
     gdaltest.gpkg_dr.DeleteDataSource('/vsimem/ogr_gpkg_40.gpkg')
 
@@ -3404,12 +3026,9 @@ def test_ogr_gpkg_42():
 
     ds = ogr.Open('/vsimem/ogr_gpkg_42.gpkg')
     lyr = ds.GetLayer(0)
-    if get_feature_count_from_gpkg_contents(ds) != 5:
-        return 'fail'
-    if not foo_has_trigger(ds):
-        return 'fail'
-    if lyr.TestCapability(ogr.OLCFastFeatureCount) == 0:
-        return 'fail'
+    assert get_feature_count_from_gpkg_contents(ds) == 5
+    assert foo_has_trigger(ds)
+    assert lyr.TestCapability(ogr.OLCFastFeatureCount) != 0
     ds = None
 
     ds = ogr.Open('/vsimem/ogr_gpkg_42.gpkg', update=1)
@@ -3419,57 +3038,42 @@ def test_ogr_gpkg_42():
     lyr.CreateFeature(f)
 
     # Has been invalidated for now
-    if get_feature_count_from_gpkg_contents(ds) is not None:
-        return 'fail'
+    assert get_feature_count_from_gpkg_contents(ds) is None
 
-    if foo_has_trigger(ds):
-        return 'fail'
+    assert not foo_has_trigger(ds)
 
     fc = lyr.GetFeatureCount()
-    if fc != 6:
-        print(fc)
-        return 'fail'
+    assert fc == 6
 
     ds.ExecuteSQL('DELETE FROM foo WHERE i = 1')
 
-    if not foo_has_trigger(ds):
-        return 'fail'
+    assert foo_has_trigger(ds)
 
-    if get_feature_count_from_gpkg_contents(ds) is not None:
-        return 'fail'
+    assert get_feature_count_from_gpkg_contents(ds) is None
 
     fc = lyr.GetFeatureCount()
-    if fc != 5:
-        print(fc)
-        return 'fail'
+    assert fc == 5
 
-    if get_feature_count_from_gpkg_contents(ds) != 5:
-        return 'fail'
+    assert get_feature_count_from_gpkg_contents(ds) == 5
 
     ds = None
 
     ds = ogr.Open('/vsimem/ogr_gpkg_42.gpkg', update=1)
     lyr = ds.GetLayer(0)
     fc = lyr.GetFeatureCount()
-    if fc != 5:
-        print(fc)
-        return 'fail'
+    assert fc == 5
     ds.ExecuteSQL('UPDATE gpkg_ogr_contents SET feature_count = NULL')
     ds = None
 
     ds = ogr.Open('/vsimem/ogr_gpkg_42.gpkg', update=1)
     lyr = ds.GetLayer(0)
-    if get_feature_count_from_gpkg_contents(ds) is not None:
-        return 'fail'
+    assert get_feature_count_from_gpkg_contents(ds) is None
     fc = lyr.GetFeatureCount()
-    if fc != 5:
-        print(fc)
-        return 'fail'
+    assert fc == 5
     ds = None
 
     ds = ogr.Open('/vsimem/ogr_gpkg_42.gpkg', update=1)
-    if get_feature_count_from_gpkg_contents(ds) != 5:
-        return 'fail'
+    assert get_feature_count_from_gpkg_contents(ds) == 5
 
     # So as to test that we really read from gpkg_ogr_contents
     ds.ExecuteSQL('UPDATE gpkg_ogr_contents SET feature_count = 5000')
@@ -3477,9 +3081,7 @@ def test_ogr_gpkg_42():
     ds = ogr.Open('/vsimem/ogr_gpkg_42.gpkg', update=1)
     lyr = ds.GetLayer(0)
     fc = lyr.GetFeatureCount()
-    if fc != 5000:
-        print(fc)
-        return 'fail'
+    assert fc == 5000
 
     # Test renaming
     ds.ExecuteSQL('ALTER TABLE foo RENAME TO bar')
@@ -3490,15 +3092,13 @@ def test_ogr_gpkg_42():
     val = f.GetField(0)
     f = None
     ds.ReleaseResultSet(sql_lyr)
-    if val != 5000:
-        return 'fail'
+    assert val == 5000
 
     # Test layer deletion
     ds.DeleteLayer(0)
     sql_lyr = ds.ExecuteSQL("SELECT feature_count FROM gpkg_ogr_contents WHERE table_name != 'ogr_empty_table'", dialect='DEBUG')
     f = sql_lyr.GetNextFeature()
-    if f is not None:
-        return 'fail'
+    assert f is None
     ds.ReleaseResultSet(sql_lyr)
     ds = None
 
@@ -3519,32 +3119,23 @@ def test_ogr_gpkg_42():
     sql_lyr = ds.ExecuteSQL('PRAGMA table_info(gpkg_contents)')
     fc = sql_lyr.GetFeatureCount()
     ds.ReleaseResultSet(sql_lyr)
-    if fc != 10:
-        return 'fail'
+    assert fc == 10
 
-    if foo_has_trigger(ds):
-        return 'fail'
+    assert not foo_has_trigger(ds)
 
     lyr = ds.GetLayer(0)
-    if lyr.TestCapability(ogr.OLCFastFeatureCount) != 0:
-        return 'fail'
+    assert lyr.TestCapability(ogr.OLCFastFeatureCount) == 0
     fc = lyr.GetFeatureCount()
-    if fc != 5:
-        print(fc)
-        return 'fail'
+    assert fc == 5
     f = ogr.Feature(lyr.GetLayerDefn())
     f.SetField(0, 10)
     lyr.CreateFeature(f)
     lyr = ds.GetLayer(0)
     fc = lyr.GetFeatureCount()
-    if fc != 6:
-        print(fc)
-        return 'fail'
+    assert fc == 6
     ds.ExecuteSQL('DELETE FROM foo WHERE i = 1')
     fc = lyr.GetFeatureCount()
-    if fc != 5:
-        print(fc)
-        return 'fail'
+    assert fc == 5
     ds = None
 
     gdaltest.gpkg_dr.DeleteDataSource('/vsimem/ogr_gpkg_42.gpkg')
@@ -3576,17 +3167,13 @@ def test_ogr_gpkg_43():
 
     with gdaltest.error_handler():
         ds = gdal.Open('/vsimem/ogr_gpkg_43.gpkg')
-    if len(ds.GetMetadata_List('SUBDATASETS')) != 2 * 1000:
-        print(len(ds.GetMetadata_List('SUBDATASETS')))
-        return 'fail'
+    assert len(ds.GetMetadata_List('SUBDATASETS')) == 2 * 1000
     ds = None
     gdal.SetConfigOption('OGR_TABLE_LIMIT', '1000')
     with gdaltest.error_handler():
         ds = ogr.Open('/vsimem/ogr_gpkg_43.gpkg')
     gdal.SetConfigOption('OGR_TABLE_LIMIT', None)
-    if ds.GetLayerCount() != 1000:
-        print(ds.GetLayerCount())
-        return 'fail'
+    assert ds.GetLayerCount() == 1000
     ds = None
 
     gdaltest.gpkg_dr.DeleteDataSource('/vsimem/ogr_gpkg_43.gpkg')
@@ -3608,24 +3195,17 @@ def test_ogr_gpkg_44():
     ds = None
     gdal.SetConfigOption('CREATE_METADATA_TABLES', None)
 
-    if not validate('/vsimem/ogr_gpkg_44.gpkg'):
-        gdaltest.post_reason('validation failed')
-        return 'fail'
+    assert validate('/vsimem/ogr_gpkg_44.gpkg'), 'validation failed'
 
     ds = ogr.Open('/vsimem/ogr_gpkg_44.gpkg')
     md = ds.GetMetadata()
-    if md != {}:
-        print(md)
-        return 'fail'
+    assert md == {}
     md = ds.GetLayer(0).GetMetadata()
-    if md != {}:
-        print(md)
-        return 'fail'
+    assert md == {}
     sql_lyr = ds.ExecuteSQL("SELECT * FROM sqlite_master WHERE name = 'gpkg_metadata'")
     fc = sql_lyr.GetFeatureCount()
     ds.ReleaseResultSet(sql_lyr)
-    if fc != 0:
-        return 'fail'
+    assert fc == 0
     ds = None
 
     ds = ogr.Open('/vsimem/ogr_gpkg_44.gpkg', update=1)
@@ -3634,9 +3214,7 @@ def test_ogr_gpkg_44():
 
     ds = ogr.Open('/vsimem/ogr_gpkg_44.gpkg')
     md = ds.GetMetadata()
-    if md != {'FOO': 'BAR'}:
-        print(md)
-        return 'fail'
+    assert md == {'FOO': 'BAR'}
     ds = None
 
     gdaltest.gpkg_dr.DeleteDataSource('/vsimem/ogr_gpkg_44.gpkg')
@@ -3658,10 +3236,8 @@ def test_ogr_gpkg_45():
     ds = None
     ds = ogr.Open('/vsimem/ogr_gpkg_45.gpkg')
     lyr = ds.GetLayer(0)
-    if lyr.GetFIDColumn() != '':
-        return 'fail'
-    if lyr.GetLayerDefn().GetFieldCount() != 2:
-        return 'fail'
+    assert lyr.GetFIDColumn() == ''
+    assert lyr.GetLayerDefn().GetFieldCount() == 2
     ds = None
 
     gdaltest.gpkg_dr.DeleteDataSource('/vsimem/ogr_gpkg_45.gpkg')
@@ -3701,12 +3277,8 @@ def test_ogr_gpkg_46():
 
     ds = ogr.Open('/vsimem/ogr_gpkg_46.gpkg', update=1)
     lyr = ds.GetLayerByName('my_view')
-    if lyr.GetLayerDefn().GetFieldCount() != 1:
-        print(lyr.GetLayerDefn().GetFieldCount())
-        return 'fail'
-    if lyr.GetGeometryColumn() != 'my_geom':
-        print(lyr.GetGeometryColumn())
-        return 'fail'
+    assert lyr.GetLayerDefn().GetFieldCount() == 1
+    assert lyr.GetGeometryColumn() == 'my_geom'
 
     # Operations not valid on a view
     with gdaltest.error_handler():
@@ -3730,22 +3302,16 @@ def test_ogr_gpkg_46():
 
     # Effectively test spatial index
     lyr.SetSpatialFilterRect(-0.5, -0.5, 0.5, 0.5)
-    if lyr.GetFeatureCount() != 1:
-        return 'fail'
+    assert lyr.GetFeatureCount() == 1
     f = lyr.GetNextFeature()
-    if f is None:
-        return 'fail'
+    assert f is not None
     f = lyr.GetNextFeature()
-    if f is not None:
-        return 'fail'
+    assert f is None
 
     # View with FID
     lyr = ds.GetLayerByName('my_view2')
-    if lyr.GetLayerDefn().GetFieldCount() != 1:
-        print(lyr.GetLayerDefn().GetFieldCount())
-        return 'fail'
-    if lyr.GetFIDColumn() != 'OGC_FID':
-        return 'fail'
+    assert lyr.GetLayerDefn().GetFieldCount() == 1
+    assert lyr.GetFIDColumn() == 'OGC_FID'
     f = lyr.GetNextFeature()
     if f.GetFID() != 1 or f.GetField(0) != 'bla':
         f.DumpReadable()
@@ -3753,9 +3319,7 @@ def test_ogr_gpkg_46():
 
     # View without valid rowid
     lyr = ds.GetLayerByName('my_view3')
-    if lyr.GetLayerDefn().GetFieldCount() != 2:
-        print(lyr.GetLayerDefn().GetFieldCount())
-        return 'fail'
+    assert lyr.GetLayerDefn().GetFieldCount() == 2
     f = lyr.GetNextFeature()
     if f.GetFID() != 0:
         f.DumpReadable()
@@ -3794,17 +3358,13 @@ def test_ogr_gpkg_47():
 
     with gdaltest.error_handler():
         ds = ogr.Open('/vsimem/ogr_gpkg_47.gpkg', update=1)
-    if ds is None:
-        return 'fail'
-    if gdal.GetLastErrorMsg() == '':
-        return 'fail'
+    assert ds is not None
+    assert gdal.GetLastErrorMsg() != ''
 
     gdal.SetConfigOption('GPKG_WARN_UNRECOGNIZED_APPLICATION_ID', 'NO')
     ogr.Open('/vsimem/ogr_gpkg_47.gpkg')
     gdal.SetConfigOption('GPKG_WARN_UNRECOGNIZED_APPLICATION_ID', None)
-    if gdal.GetLastErrorMsg() != '':
-        print(gdal.GetLastErrorMsg())
-        return 'fail'
+    assert gdal.GetLastErrorMsg() == ''
 
     gdaltest.gpkg_dr.CreateDataSource('/vsimem/ogr_gpkg_47.gpkg', options=['VERSION=1.2'])
     # Set wrong user_version
@@ -3815,17 +3375,14 @@ def test_ogr_gpkg_47():
 
     with gdaltest.error_handler():
         ds = ogr.Open('/vsimem/ogr_gpkg_47.gpkg', update=1)
-    if ds is None:
-        return 'fail'
-    if gdal.GetLastErrorMsg() == '':
-        return 'fail'
+    assert ds is not None
+    assert gdal.GetLastErrorMsg() != ''
     ds = None
 
     gdal.SetConfigOption('GPKG_WARN_UNRECOGNIZED_APPLICATION_ID', 'NO')
     ogr.Open('/vsimem/ogr_gpkg_47.gpkg')
     gdal.SetConfigOption('GPKG_WARN_UNRECOGNIZED_APPLICATION_ID', None)
-    if gdal.GetLastErrorMsg() != '':
-        return 'fail'
+    assert gdal.GetLastErrorMsg() == ''
 
     # Set GPKG 1.2.1
     gdaltest.gpkg_dr.CreateDataSource('/vsimem/ogr_gpkg_47.gpkg', options=['VERSION=1.2'])
@@ -3836,17 +3393,14 @@ def test_ogr_gpkg_47():
     gdal.VSIFCloseL(fp)
 
     ds = ogr.Open('/vsimem/ogr_gpkg_47.gpkg', update=1)
-    if ds is None:
-        return 'fail'
-    if gdal.GetLastErrorMsg() != '':
-        return 'fail'
+    assert ds is not None
+    assert gdal.GetLastErrorMsg() == ''
     ds = None
 
     gdal.SetConfigOption('GPKG_WARN_UNRECOGNIZED_APPLICATION_ID', 'NO')
     ogr.Open('/vsimem/ogr_gpkg_47.gpkg')
     gdal.SetConfigOption('GPKG_WARN_UNRECOGNIZED_APPLICATION_ID', None)
-    if gdal.GetLastErrorMsg() != '':
-        return 'fail'
+    assert gdal.GetLastErrorMsg() == ''
 
     # Set GPKG 1.3.0
     gdaltest.gpkg_dr.CreateDataSource('/vsimem/ogr_gpkg_47.gpkg', options=['VERSION=1.2'])
@@ -3858,16 +3412,13 @@ def test_ogr_gpkg_47():
 
     with gdaltest.error_handler():
         ds = ogr.Open('/vsimem/ogr_gpkg_47.gpkg', update=1)
-    if ds is None:
-        return 'fail'
-    if gdal.GetLastErrorMsg() == '':
-        return 'fail'
+    assert ds is not None
+    assert gdal.GetLastErrorMsg() != ''
 
     gdal.SetConfigOption('GPKG_WARN_UNRECOGNIZED_APPLICATION_ID', 'NO')
     ogr.Open('/vsimem/ogr_gpkg_47.gpkg')
     gdal.SetConfigOption('GPKG_WARN_UNRECOGNIZED_APPLICATION_ID', None)
-    if gdal.GetLastErrorMsg() != '':
-        return 'fail'
+    assert gdal.GetLastErrorMsg() == ''
 
     # Just for the sake of coverage testing in DEBUG mode
     with gdaltest.error_handler():
@@ -3903,8 +3454,7 @@ def test_ogr_gpkg_47():
     gdal.VSIFCloseL(fp)
     gdal.VSIFCloseL(fzip)
     ds = ogr.Open('/vsizip//vsimem/ogr_gpkg_47.zip')
-    if ds.GetDriver().GetName() != 'GPKG':
-        return 'fail'
+    assert ds.GetDriver().GetName() == 'GPKG'
     ds = None
 
     gdal.Unlink('/vsimem/ogr_gpkg_47.zip')
@@ -3949,8 +3499,7 @@ def test_ogr_gpkg_48():
     fld_defn.SetDefault('x')
     lyr.CreateField(fld_defn)
     f = ogr.Feature(lyr.GetLayerDefn())
-    if lyr.CreateFeature(f) != 0:
-        return 'fail'
+    assert lyr.CreateFeature(f) == 0
     lyr.ResetReading()
     f = lyr.GetNextFeature()
     if f.GetField('foo') != 'x':
@@ -3958,8 +3507,7 @@ def test_ogr_gpkg_48():
         return 'fail'
     f = ogr.Feature(lyr.GetLayerDefn())
     f.SetFID(1)
-    if lyr.SetFeature(f) != 0:
-        return 'fail'
+    assert lyr.SetFeature(f) == 0
     lyr.ResetReading()
     f = lyr.GetNextFeature()
     if f.GetField('foo') != 'x':
@@ -3990,8 +3538,7 @@ def test_ogr_gpkg_49():
     f = None
 
     field_defn = ogr.GeomFieldDefn('', ogr.wkbPoint)
-    if lyr.CreateGeomField(field_defn) != 0:
-        return 'fail'
+    assert lyr.CreateGeomField(field_defn) == 0
     ds = None
 
     gdaltest.gpkg_dr.DeleteDataSource('/vsimem/ogr_gpkg_49.gpkg')
@@ -4025,21 +3572,16 @@ def test_ogr_gpkg_50():
 
     ds = None
 
-    if not validate('/vsimem/ogr_gpkg_50.gpkg'):
-        gdaltest.post_reason('validation failed')
-        return 'fail'
+    assert validate('/vsimem/ogr_gpkg_50.gpkg'), 'validation failed'
 
     ds = ogr.Open('/vsimem/ogr_gpkg_50.gpkg')
     lyr = ds.GetLayer('test')
-    if not lyr.GetSpatialRef().IsSame(srs32631):
-        return 'fail'
+    assert lyr.GetSpatialRef().IsSame(srs32631)
     lyr = ds.GetLayer('without_org')
-    if not lyr.GetSpatialRef().IsSame(srs_without_org):
-        return 'fail'
+    assert lyr.GetSpatialRef().IsSame(srs_without_org)
     sql_lyr = ds.ExecuteSQL('SELECT definition_12_063 FROM gpkg_spatial_ref_sys WHERE srs_id = 32631')
     f = sql_lyr.GetNextFeature()
-    if f.GetField(0) != 'undefined':
-        return 'fail'
+    assert f.GetField(0) == 'undefined'
     ds.ReleaseResultSet(sql_lyr)
     ds = None
 
@@ -4062,8 +3604,7 @@ def test_ogr_gpkg_51():
     ds = ogr.Open('data/poly.gpkg.sql')
     lyr = ds.GetLayer(0)
     f = lyr.GetNextFeature()
-    if f is None:
-        return 'fail'
+    assert f is not None
 
     return 'success'
 
@@ -4080,8 +3621,7 @@ def test_ogr_gpkg_52():
     lyr = ds.GetLayer(0)
     with gdaltest.error_handler():
         f = lyr.GetNextFeature()
-    if f is None:
-        return 'fail'
+    assert f is not None
 
     return 'success'
 
@@ -4098,20 +3638,16 @@ def test_ogr_gpkg_53():
         return 'skip'
 
     ds = ogr.Open('data/poly_inconsistent_case.gpkg.sql')
-    if ds.GetLayerCount() != 1:
-        return 'fail'
+    assert ds.GetLayerCount() == 1
     lyr = ds.GetLayer(0)
     f = lyr.GetNextFeature()
-    if f is None:
-        return 'fail'
+    assert f is not None
 
     import test_cli_utilities
     if test_cli_utilities.get_test_ogrsf_path() is not None:
         ret = gdaltest.runexternal(test_cli_utilities.get_test_ogrsf_path() + ' data/poly_inconsistent_case.gpkg.sql')
 
-        if ret.find('INFO') == -1 or ret.find('ERROR') != -1:
-            print(ret)
-            return 'fail'
+        assert ret.find('INFO') != -1 and ret.find('ERROR') == -1
 
     return 'success'
 
@@ -4199,17 +3735,13 @@ def test_ogr_gpkg_55():
     gdal.ErrorReset()
     with gdaltest.error_handler():
         lyr.CreateFeature(f)
-    if gdal.GetLastErrorMsg() == '':
-        gdaltest.post_reason('should have warned')
-        return 'fail'
+    assert gdal.GetLastErrorMsg() != '', 'should have warned'
     f = None
     f = ogr.Feature(lyr.GetLayerDefn())
     f.SetGeometry(ogr.CreateGeometryFromWkt('POINT(1 1)'))
     gdal.ErrorReset()
     lyr.CreateFeature(f)
-    if gdal.GetLastErrorMsg() != '':
-        gdaltest.post_reason('should NOT have warned')
-        return 'fail'
+    assert gdal.GetLastErrorMsg() == '', 'should NOT have warned'
     f = None
     ds = None
 
@@ -4266,12 +3798,9 @@ def test_ogr_gpkg_57():
 
     with gdaltest.error_handler():
         ds = ogr.Open(tmpfile)
-    if ds.GetLayerCount() != 1:
-        gdaltest.post_reason('bad layer count')
-        return 'fail'
-    if gdal.GetLastErrorMsg().find('Table poly appearing several times') < 0:
-        gdaltest.post_reason('should NOT have warned')
-        return 'fail'
+    assert ds.GetLayerCount() == 1, 'bad layer count'
+    assert gdal.GetLastErrorMsg().find('Table poly appearing several times') >= 0, \
+        'should NOT have warned'
     ds = None
 
     gdal.Unlink(tmpfile)
@@ -4295,8 +3824,7 @@ def test_ogr_gpkg_58():
     ds = ogr.Open(out_filename)
     sql_lyr = ds.ExecuteSQL("SELECT HasSpatialIndex('poly', 'geom')")
     f = sql_lyr.GetNextFeature()
-    if f.GetField(0) != 1:
-        return 'fail'
+    assert f.GetField(0) == 1
     ds.ReleaseResultSet(sql_lyr)
     ds = None
 
@@ -4320,8 +3848,7 @@ def test_ogr_gpkg_59():
     ds = ogr.Open(out_filename, update=1)
     sql_lyr = ds.ExecuteSQL("SELECT CreateSpatialIndex('poly', 'geom')")
     f = sql_lyr.GetNextFeature()
-    if f.GetField(0) != 1:
-        return 'fail'
+    assert f.GetField(0) == 1
     ds.ReleaseResultSet(sql_lyr)
     ds = None
 
@@ -4361,9 +3888,7 @@ def test_ogr_gpkg_savepoint():
 
     ds = ogr.Open(filename)
     lyr = ds.GetLayer(0)
-    if lyr.GetFeatureCount() != 2:
-        print(lyr.GetFeatureCount())
-        return 'fail'
+    assert lyr.GetFeatureCount() == 2
     ds = None
 
     gdal.Unlink(filename)
@@ -4430,16 +3955,14 @@ def test_ogr_gpkg_json():
     fld_defn = ogr.FieldDefn('test_json', ogr.OFTString)
     fld_defn.SetSubType(ogr.OFSTJSON)
     lyr.CreateField(fld_defn)
-    if lyr.GetLayerDefn().GetFieldDefn(0).GetSubType() != ogr.OFSTJSON:
-        return 'fail'
+    assert lyr.GetLayerDefn().GetFieldDefn(0).GetSubType() == ogr.OFSTJSON
 
     ds.ReleaseResultSet(ds.ExecuteSQL('SELECT 1 FROM test')) # will crystalize
 
     fld_defn = ogr.FieldDefn('test2_json', ogr.OFTString)
     fld_defn.SetSubType(ogr.OFSTJSON)
     lyr.CreateField(fld_defn)
-    if lyr.GetLayerDefn().GetFieldDefn(1).GetSubType() != ogr.OFSTJSON:
-        return 'fail'
+    assert lyr.GetLayerDefn().GetFieldDefn(1).GetSubType() == ogr.OFSTJSON
 
     fld_defn = ogr.FieldDefn('test_string', ogr.OFTString)
     lyr.CreateField(fld_defn)
@@ -4448,46 +3971,36 @@ def test_ogr_gpkg_json():
 
     ds = ogr.Open(filename, update = 1)
     lyr = ds.GetLayer(0)
-    if lyr.GetLayerDefn().GetFieldDefn(0).GetSubType() != ogr.OFSTJSON:
-        return 'fail'
-    if lyr.GetLayerDefn().GetFieldDefn(1).GetSubType() != ogr.OFSTJSON:
-        return 'fail'
+    assert lyr.GetLayerDefn().GetFieldDefn(0).GetSubType() == ogr.OFSTJSON
+    assert lyr.GetLayerDefn().GetFieldDefn(1).GetSubType() == ogr.OFSTJSON
 
     # Demote field from JSON
     new_defn = ogr.FieldDefn('test_was_json_now_string', ogr.OFTString)
-    if lyr.AlterFieldDefn(lyr.GetLayerDefn().GetFieldIndex('test2_json'), new_defn, ogr.ALTER_ALL_FLAG) != 0:
-        return 'fail'
+    assert lyr.AlterFieldDefn(lyr.GetLayerDefn().GetFieldIndex('test2_json'), new_defn, ogr.ALTER_ALL_FLAG) == 0
 
     # Alter field to JSON
     new_defn = ogr.FieldDefn('test_was_string_now_json', ogr.OFTString)
     new_defn.SetSubType(ogr.OFSTJSON)
-    if lyr.AlterFieldDefn(lyr.GetLayerDefn().GetFieldIndex('test_string'), new_defn, ogr.ALTER_ALL_FLAG) != 0:
-        return 'fail'
+    assert lyr.AlterFieldDefn(lyr.GetLayerDefn().GetFieldIndex('test_string'), new_defn, ogr.ALTER_ALL_FLAG) == 0
 
     # Delete JSON field
-    if lyr.DeleteField(lyr.GetLayerDefn().GetFieldIndex('test_json')) != 0:
-        return 'fail'
+    assert lyr.DeleteField(lyr.GetLayerDefn().GetFieldIndex('test_json')) == 0
 
     ds = None
 
-    if not validate(filename):
-        gdaltest.post_reason('validation failed')
-        return 'fail'
+    assert validate(filename), 'validation failed'
 
     ds = ogr.Open(filename)
     lyr = ds.GetLayer(0)
-    if lyr.GetLayerDefn().GetFieldDefn(
-        lyr.GetLayerDefn().GetFieldIndex('test_was_json_now_string')).GetSubType() != ogr.OFSTNone:
-        return 'fail'
-    if lyr.GetLayerDefn().GetFieldDefn(
-        lyr.GetLayerDefn().GetFieldIndex('test_was_string_now_json')).GetSubType() != ogr.OFSTJSON:
-        return 'fail'
+    assert (lyr.GetLayerDefn().GetFieldDefn(
+        lyr.GetLayerDefn().GetFieldIndex('test_was_json_now_string')).GetSubType() == ogr.OFSTNone)
+    assert (lyr.GetLayerDefn().GetFieldDefn(
+        lyr.GetLayerDefn().GetFieldIndex('test_was_string_now_json')).GetSubType() == ogr.OFSTJSON)
 
     sql_lyr = ds.ExecuteSQL("SELECT 1 FROM gpkg_data_columns WHERE table_name = 'test'")
     fc = sql_lyr.GetFeatureCount()
     ds.ReleaseResultSet(sql_lyr)
-    if fc != 1: # only test_was_string_now_json remaining
-        return 'fail'
+    assert fc == 1
 
     ds = None
 
diff --git a/autotest/ogr/ogr_gpsbabel.py b/autotest/ogr/ogr_gpsbabel.py
index fcddac8a5763..475fbd919bd9 100755
--- a/autotest/ogr/ogr_gpsbabel.py
+++ b/autotest/ogr/ogr_gpsbabel.py
@@ -74,11 +74,9 @@ def test_ogr_gpsbabel_1():
         return 'skip'
 
     ds = ogr.Open('GPSBabel:nmea:data/nmea.txt')
-    if ds is None:
-        return 'fail'
+    assert ds is not None
 
-    if ds.GetLayerCount() != 2:
-        return 'fail'
+    assert ds.GetLayerCount() == 2
 
     return 'success'
 
@@ -92,11 +90,9 @@ def test_ogr_gpsbabel_2():
         return 'skip'
 
     ds = ogr.Open('data/nmea.txt')
-    if ds is None:
-        return 'fail'
+    assert ds is not None
 
-    if ds.GetLayerCount() != 2:
-        return 'fail'
+    assert ds.GetLayerCount() == 2
 
     return 'success'
 
@@ -137,12 +133,9 @@ def test_ogr_gpsbabel_3():
 
     gdal.Unlink('tmp/nmea.txt')
 
-    if res.find('$GPRMC') == -1 or \
+    assert (not (res.find('$GPRMC') == -1 or \
        res.find('$GPGGA') == -1 or \
-       res.find('$GPGSA') == -1:
-        gdaltest.post_reason('did not get expected result')
-        print(res)
-        return 'fail'
+       res.find('$GPGSA') == -1)), 'did not get expected result'
 
     return 'success'
 
diff --git a/autotest/ogr/ogr_gpx.py b/autotest/ogr/ogr_gpx.py
index 8f872dfa5e4d..73c946d050ce 100755
--- a/autotest/ogr/ogr_gpx.py
+++ b/autotest/ogr/ogr_gpx.py
@@ -50,9 +50,7 @@ def test_ogr_gpx_init():
     if not gdaltest.have_gpx:
         return 'skip'
 
-    if gdaltest.gpx_ds.GetLayerCount() != 5:
-        gdaltest.post_reason('wrong number of layers')
-        return 'fail'
+    assert gdaltest.gpx_ds.GetLayerCount() == 5, 'wrong number of layers'
 
     return 'success'
 
@@ -64,8 +62,7 @@ def test_ogr_gpx_1():
     if not gdaltest.have_gpx:
         return 'skip'
 
-    if gdaltest.gpx_ds is None:
-        return 'fail'
+    assert gdaltest.gpx_ds is not None
 
     lyr = gdaltest.gpx_ds.GetLayerByName('waypoints')
 
@@ -73,83 +70,72 @@ def test_ogr_gpx_1():
 
     with gdaltest.error_handler():
         tr = ogrtest.check_features_against_list(lyr, 'ele', expect)
-    if not tr:
-        return 'fail'
+    assert tr
 
     lyr.ResetReading()
 
     expect = ['waypoint name', None]
 
     tr = ogrtest.check_features_against_list(lyr, 'name', expect)
-    if not tr:
-        return 'fail'
+    assert tr
 
     lyr.ResetReading()
 
     expect = ['href', None]
 
     tr = ogrtest.check_features_against_list(lyr, 'link1_href', expect)
-    if not tr:
-        return 'fail'
+    assert tr
 
     lyr.ResetReading()
 
     expect = ['text', None]
 
     tr = ogrtest.check_features_against_list(lyr, 'link1_text', expect)
-    if not tr:
-        return 'fail'
+    assert tr
 
     lyr.ResetReading()
 
     expect = ['type', None]
 
     tr = ogrtest.check_features_against_list(lyr, 'link1_type', expect)
-    if not tr:
-        return 'fail'
+    assert tr
 
     lyr.ResetReading()
 
     expect = ['href2', None]
 
     tr = ogrtest.check_features_against_list(lyr, 'link2_href', expect)
-    if not tr:
-        return 'fail'
+    assert tr
 
     lyr.ResetReading()
 
     expect = ['text2', None]
 
     tr = ogrtest.check_features_against_list(lyr, 'link2_text', expect)
-    if not tr:
-        return 'fail'
+    assert tr
 
     lyr.ResetReading()
 
     expect = ['type2', None]
 
     tr = ogrtest.check_features_against_list(lyr, 'link2_type', expect)
-    if not tr:
-        return 'fail'
+    assert tr
 
     lyr.ResetReading()
 
     expect = ['2007/11/25 17:58:00+01', None]
 
     tr = ogrtest.check_features_against_list(lyr, 'time', expect)
-    if not tr:
-        return 'fail'
+    assert tr
 
     lyr.ResetReading()
     feat = lyr.GetNextFeature()
-    if ogrtest.check_feature_geometry(feat, 'POINT (1 0)',
-                                      max_error=0.0001) != 0:
-        return 'fail'
+    assert (ogrtest.check_feature_geometry(feat, 'POINT (1 0)',
+                                      max_error=0.0001) == 0)
 
     feat = lyr.GetNextFeature()
-    if ogrtest.check_feature_geometry(feat, 'POINT (4 3)',
-                                      max_error=0.0001) != 0:
-        return 'fail'
+    assert (ogrtest.check_feature_geometry(feat, 'POINT (4 3)',
+                                      max_error=0.0001) == 0)
 
     return 'success'
 
@@ -161,19 +147,16 @@ def test_ogr_gpx_2():
     if not gdaltest.have_gpx:
         return 'skip'
 
-    if gdaltest.gpx_ds is None:
-        return 'fail'
+    assert gdaltest.gpx_ds is not None
 
     lyr = gdaltest.gpx_ds.GetLayerByName('routes')
 
     lyr.ResetReading()
     feat = lyr.GetNextFeature()
-    if ogrtest.check_feature_geometry(feat, 'LINESTRING (6 5,9 8,12 11)', max_error=0.0001) != 0:
-        return 'fail'
+    assert ogrtest.check_feature_geometry(feat, 'LINESTRING (6 5,9 8,12 11)', max_error=0.0001) == 0
 
     feat = lyr.GetNextFeature()
-    if ogrtest.check_feature_geometry(feat, 'LINESTRING EMPTY', max_error=0.0001) != 0:
-        return 'fail'
+    assert ogrtest.check_feature_geometry(feat, 'LINESTRING EMPTY', max_error=0.0001) == 0
 
     return 'success'
 
@@ -185,21 +168,18 @@ def test_ogr_gpx_3():
     if not gdaltest.have_gpx:
         return 'skip'
 
-    if gdaltest.gpx_ds is None:
-        return 'fail'
+    assert gdaltest.gpx_ds is not None
 
     lyr = gdaltest.gpx_ds.GetLayerByName('route_points')
 
     expect = ['route point name', None, None]
 
     tr = ogrtest.check_features_against_list(lyr, 'name', expect)
-    if not tr:
-        return 'fail'
+    assert tr
 
     lyr.ResetReading()
     feat = lyr.GetNextFeature()
-    if ogrtest.check_feature_geometry(feat, 'POINT (6 5)', max_error=0.0001) != 0:
-        return 'fail'
+    assert ogrtest.check_feature_geometry(feat, 'POINT (6 5)', max_error=0.0001) == 0
 
     return 'success'
 
@@ -211,24 +191,20 @@ def test_ogr_gpx_4():
     if not gdaltest.have_gpx:
         return 'skip'
 
-    if gdaltest.gpx_ds is None:
-        return 'fail'
+    assert gdaltest.gpx_ds is not None
 
     lyr = gdaltest.gpx_ds.GetLayerByName('tracks')
 
     lyr.ResetReading()
     feat = lyr.GetNextFeature()
-    if ogrtest.check_feature_geometry(feat, 'MULTILINESTRING ((15 14,18 17),(21 20,24 23))', max_error=0.0001) != 0:
-        return 'fail'
+    assert ogrtest.check_feature_geometry(feat, 'MULTILINESTRING ((15 14,18 17),(21 20,24 23))', max_error=0.0001) == 0
 
     feat = lyr.GetNextFeature()
-    if ogrtest.check_feature_geometry(feat, 'MULTILINESTRING EMPTY', max_error=0.0001) != 0:
-        return 'fail'
+    assert ogrtest.check_feature_geometry(feat, 'MULTILINESTRING EMPTY', max_error=0.0001) == 0
 
     feat = lyr.GetNextFeature()
     f_geom = feat.GetGeometryRef()
-    if f_geom.ExportToWkt() != 'MULTILINESTRING EMPTY':
-        return 'fail'
+    assert f_geom.ExportToWkt() == 'MULTILINESTRING EMPTY'
 
     return 'success'
 
@@ -240,21 +216,18 @@ def test_ogr_gpx_5():
     if not gdaltest.have_gpx:
         return 'skip'
 
-    if gdaltest.gpx_ds is None:
-        return 'fail'
+    assert gdaltest.gpx_ds is not None
 
     lyr = gdaltest.gpx_ds.GetLayerByName('track_points')
 
     expect = ['track point name', None, None, None]
 
     tr = ogrtest.check_features_against_list(lyr, 'name', expect)
-    if not tr:
-        return 'fail'
+    assert tr
 
     lyr.ResetReading()
     feat = lyr.GetNextFeature()
-    if ogrtest.check_feature_geometry(feat, 'POINT (15 14)', max_error=0.0001) != 0:
-        return 'fail'
+    assert ogrtest.check_feature_geometry(feat, 'POINT (15 14)', max_error=0.0001) == 0
 
     return 'success'
 
@@ -293,9 +266,7 @@ def test_ogr_gpx_6():
     feat = gpx_lyr.GetNextFeature()
     while feat is not None:
         dst_feat.SetFrom(feat)
-        if gpx2_lyr.CreateFeature(dst_feat) != 0:
-            gdaltest.post_reason('CreateFeature failed.')
-            return 'fail'
+        assert gpx2_lyr.CreateFeature(dst_feat) == 0, 'CreateFeature failed.'
 
         feat = gpx_lyr.GetNextFeature()
 
@@ -311,9 +282,7 @@ def test_ogr_gpx_6():
     feat = gpx_lyr.GetNextFeature()
     while feat is not None:
         dst_feat.SetFrom(feat)
-        if gpx2_lyr.CreateFeature(dst_feat) != 0:
-            gdaltest.post_reason('CreateFeature failed.')
-            return 'fail'
+        assert gpx2_lyr.CreateFeature(dst_feat) == 0, 'CreateFeature failed.'
 
         feat = gpx_lyr.GetNextFeature()
 
@@ -329,9 +298,7 @@ def test_ogr_gpx_6():
     feat = gpx_lyr.GetNextFeature()
     while feat is not None:
         dst_feat.SetFrom(feat)
-        if gpx2_lyr.CreateFeature(dst_feat) != 0:
-            gdaltest.post_reason('CreateFeature failed.')
-            return 'fail'
+        assert gpx2_lyr.CreateFeature(dst_feat) == 0, 'CreateFeature failed.'
 
         feat = gpx_lyr.GetNextFeature()
 
@@ -383,9 +350,7 @@ def test_ogr_gpx_7():
     feat = bna_lyr.GetNextFeature()
     while feat is not None:
         dst_feat.SetFrom(feat)
-        if gpx_lyr.CreateFeature(dst_feat) != 0:
-            gdaltest.post_reason('CreateFeature failed.')
-            return 'fail'
+        assert gpx_lyr.CreateFeature(dst_feat) == 0, 'CreateFeature failed.'
 
         feat = bna_lyr.GetNextFeature()
 
@@ -398,24 +363,21 @@ def test_ogr_gpx_7():
     expect = ['PID1', 'PID2']
 
     tr = ogrtest.check_features_against_list(gpx_lyr, 'ogr_Primary_ID', expect)
-    if not tr:
-        return 'fail'
+    assert tr
 
     gpx_lyr.ResetReading()
 
     expect = ['SID1', 'SID2']
 
     tr = ogrtest.check_features_against_list(gpx_lyr, 'ogr_Secondary_ID', expect)
-    if not tr:
-        return 'fail'
+    assert tr
 
     gpx_lyr.ResetReading()
 
     expect = ['TID1', None]
 
     tr = ogrtest.check_features_against_list(gpx_lyr, 'ogr_Third_ID', expect)
-    if not tr:
-        return 'fail'
+    assert tr
 
     return 'success'
 
@@ -507,10 +469,7 @@ def test_ogr_gpx_8():
     f.close()
     f_ref.close()
 
-    if f_content.find(f_ref_content) == -1:
-        gdaltest.post_reason('did not get expected result')
-        print(f_content)
-        return 'fail'
+    assert f_content.find(f_ref_content) != -1, 'did not get expected result'
 
     return 'success'
 
diff --git a/autotest/ogr/ogr_grass.py b/autotest/ogr/ogr_grass.py
index eca1cb77aa34..21a444aba397 100755
--- a/autotest/ogr/ogr_grass.py
+++ b/autotest/ogr/ogr_grass.py
@@ -56,23 +56,15 @@ def test_ogr_grass_2():
         return 'skip'
 
     ds = ogr.Open('./data/PERMANENT/vector/point/head')
-    if ds is None:
-        gdaltest.post_reason('Cannot open datasource')
-        return 'fail'
+    assert ds is not None, 'Cannot open datasource'
 
     lyr = ds.GetLayerByName('1')
-    if lyr is None:
-        gdaltest.post_reason('Cannot find layer')
-        return 'fail'
+    assert lyr is not None, 'Cannot find layer'
 
     feat = lyr.GetNextFeature()
-    if feat.GetGeometryRef().ExportToWkt() != 'POINT (0 0)':
-        print(feat.GetGeometryRef().ExportToWkt())
-        return 'fail'
+    assert feat.GetGeometryRef().ExportToWkt() == 'POINT (0 0)'
 
-    if feat.GetFieldAsString('name') != 'my point':
-        print(feat.GetFieldAsString('name'))
-        return 'fail'
+    assert feat.GetFieldAsString('name') == 'my point'
 
     ds = None
 
diff --git a/autotest/ogr/ogr_gtm.py b/autotest/ogr/ogr_gtm.py
index 6ac241e85ed5..0181c85d37f1 100755
--- a/autotest/ogr/ogr_gtm.py
+++ b/autotest/ogr/ogr_gtm.py
@@ -51,9 +51,7 @@ def test_ogr_gtm_init():
     if not gdaltest.have_gtm:
         return 'skip'
 
-    if gdaltest.gtm_ds.GetLayerCount() != 2:
-        gdaltest.post_reason('wrong number of layers')
-        return 'fail'
+    assert gdaltest.gtm_ds.GetLayerCount() == 2, 'wrong number of layers'
 
     return 'success'
 
@@ -65,86 +63,54 @@ def test_ogr_gtm_read_1():
     if not gdaltest.have_gtm:
         return 'skip'
 
-    if gdaltest.gtm_ds is None:
-        return 'fail'
+    assert gdaltest.gtm_ds is not None
 
     lyr = gdaltest.gtm_ds.GetLayerByName('samplemap_waypoints')
 
-    if lyr.GetFeatureCount() != 3:
-        gdaltest.post_reason('wrong number of features')
-        return 'fail'
+    assert lyr.GetFeatureCount() == 3, 'wrong number of features'
 
     # Test 1st feature
     feat = lyr.GetNextFeature()
 
-    if feat.GetField('name') != 'WAY6':
-        gdaltest.post_reason('Wrong name field value')
-        return 'fail'
+    assert feat.GetField('name') == 'WAY6', 'Wrong name field value'
 
-    if feat.GetField('comment') != 'Santa Cruz Stadium':
-        gdaltest.post_reason('Wrong comment field value')
-        return 'fail'
+    assert feat.GetField('comment') == 'Santa Cruz Stadium', 'Wrong comment field value'
 
-    if feat.GetField('icon') != 92:
-        gdaltest.post_reason('Wrong icon field value')
-        return 'fail'
+    assert feat.GetField('icon') == 92, 'Wrong icon field value'
 
-    if feat.GetField('time') != '2009/12/18 17:32:41':
-        gdaltest.post_reason('Wrong time field value')
-        return 'fail'
+    assert feat.GetField('time') == '2009/12/18 17:32:41', 'Wrong time field value'
 
     wkt = 'POINT (-47.789974212646484 -21.201919555664062)'
-    if ogrtest.check_feature_geometry(feat, wkt):
-        gdaltest.post_reason('Unexpected geometry')
-        return 'fail'
+    assert not ogrtest.check_feature_geometry(feat, wkt), 'Unexpected geometry'
 
     # Test 2nd feature
     feat = lyr.GetNextFeature()
 
-    if feat.GetField('name') != 'WAY6':
-        gdaltest.post_reason('Wrong name field value')
-        return 'fail'
+    assert feat.GetField('name') == 'WAY6', 'Wrong name field value'
 
-    if feat.GetField('comment') != 'Joe\'s Goalkeeper Pub':
-        gdaltest.post_reason('Wrong comment field value')
-        return 'fail'
+    assert feat.GetField('comment') == 'Joe\'s Goalkeeper Pub', \
+        'Wrong comment field value'
 
-    if feat.GetField('icon') != 4:
-        gdaltest.post_reason('Wrong icon field value')
-        return 'fail'
+    assert feat.GetField('icon') == 4, 'Wrong icon field value'
 
-    if feat.GetField('time') != '2009/12/18 17:34:46':
-        gdaltest.post_reason('Wrong time field value')
-        return 'fail'
+    assert feat.GetField('time') == '2009/12/18 17:34:46', 'Wrong time field value'
 
     wkt = 'POINT (-47.909481048583984 -21.294229507446289)'
-    if ogrtest.check_feature_geometry(feat, wkt):
-        gdaltest.post_reason('Unexpected geometry')
-        return 'fail'
+    assert not ogrtest.check_feature_geometry(feat, wkt), 'Unexpected geometry'
 
     # Test 3rd feature
     feat = lyr.GetNextFeature()
 
-    if feat.GetField('name') != '33543400':
-        gdaltest.post_reason('Wrong name field value')
-        return 'fail'
+    assert feat.GetField('name') == '33543400', 'Wrong name field value'
 
-    if feat.GetField('comment') != 'City Hall':
-        gdaltest.post_reason('Wrong comment field value')
-        return 'fail'
+    assert feat.GetField('comment') == 'City Hall', 'Wrong comment field value'
 
-    if feat.GetField('icon') != 61:
-        gdaltest.post_reason('Wrong icon field value')
-        return 'fail'
+    assert feat.GetField('icon') == 61, 'Wrong icon field value'
 
-    if feat.GetField('time') is not None:
-        gdaltest.post_reason('Wrong time field value')
-        return 'fail'
+    assert feat.GetField('time') is None, 'Wrong time field value'
 
     wkt = 'POINT (-47.806097491943362 -21.176849600708007)'
-    if ogrtest.check_feature_geometry(feat, wkt):
-        gdaltest.post_reason('Unexpected geometry')
-        return 'fail'
+    assert not ogrtest.check_feature_geometry(feat, wkt), 'Unexpected geometry'
 
     return 'success'
 
@@ -156,29 +122,20 @@ def test_ogr_gtm_read_2():
     if not gdaltest.have_gtm:
         return 'skip'
 
-    if gdaltest.gtm_ds is None:
-        return 'fail'
+    assert gdaltest.gtm_ds is not None
 
     lyr = gdaltest.gtm_ds.GetLayerByName('samplemap_tracks')
 
-    if lyr.GetFeatureCount() != 3:
-        gdaltest.post_reason('wrong number of features')
-        return 'fail'
+    assert lyr.GetFeatureCount() == 3, 'wrong number of features'
 
     # Test 1st feature
     feat = lyr.GetNextFeature()
 
-    if feat.GetField('name') != 'San Sebastian Street':
-        gdaltest.post_reason('Wrong name field value')
-        return 'fail'
+    assert feat.GetField('name') == 'San Sebastian Street', 'Wrong name field value'
 
-    if feat.GetField('type') != 2:
-        gdaltest.post_reason('Wrong type field value')
-        return 'fail'
+    assert feat.GetField('type') == 2, 'Wrong type field value'
 
-    if feat.GetField('color') != 0:
-        gdaltest.post_reason('Wrong color field value')
-        return 'fail'
+    assert feat.GetField('color') == 0, 'Wrong color field value'
 
     # if feat.GetField('time') is not None:
     #    gdaltest.post_reason( 'Wrong time field value' )
@@ -188,24 +145,16 @@ def test_ogr_gtm_read_2():
           '-47.808151245117188 -21.177299499511719,' + \
           '-47.809136624130645 -21.176562836150087,' + \
           '-47.809931418108405 -21.175971104366582)'
-    if ogrtest.check_feature_geometry(feat, wkt):
-        gdaltest.post_reason('Unexpected geometry')
-        return 'fail'
+    assert not ogrtest.check_feature_geometry(feat, wkt), 'Unexpected geometry'
 
     # Test 2nd feature
     feat = lyr.GetNextFeature()
 
-    if feat.GetField('name') != 'Barao do Amazonas Street':
-        gdaltest.post_reason('Wrong name field value')
-        return 'fail'
+    assert feat.GetField('name') == 'Barao do Amazonas Street', 'Wrong name field value'
 
-    if feat.GetField('type') != 1:
-        gdaltest.post_reason('Wrong type field value')
-        return 'fail'
+    assert feat.GetField('type') == 1, 'Wrong type field value'
 
-    if feat.GetField('color') != 0:
-        gdaltest.post_reason('Wrong color field value')
-        return 'fail'
+    assert feat.GetField('color') == 0, 'Wrong color field value'
 
     # if feat.GetField('time') is not None:
     #    gdaltest.post_reason( 'Wrong time field value' )
@@ -215,23 +164,16 @@ def test_ogr_gtm_read_2():
         '-47.808151245117188 -21.177299499511719,' + \
         '-47.807561550927701 -21.176617693474089,' + \
         '-47.806959118447779 -21.175900153727685)'
-    if ogrtest.check_feature_geometry(feat, wkt):
-        return 'fail'
+    assert not ogrtest.check_feature_geometry(feat, wkt)
 
     # Test 3rd feature
     feat = lyr.GetNextFeature()
 
-    if feat.GetField('name') != 'Curupira Park':
-        gdaltest.post_reason('Wrong name field value')
-        return 'fail'
+    assert feat.GetField('name') == 'Curupira Park', 'Wrong name field value'
 
-    if feat.GetField('type') != 17:
-        gdaltest.post_reason('Wrong type field value')
-        return 'fail'
+    assert feat.GetField('type') == 17, 'Wrong type field value'
 
-    if feat.GetField('color') != 46848:
-        gdaltest.post_reason('Wrong color field value')
-        return 'fail'
+    assert feat.GetField('color') == 46848, 'Wrong color field value'
 
     # if feat.GetField('time') is not None:
     #    gdaltest.post_reason( 'Wrong time field value' )
@@ -245,9 +187,7 @@ def test_ogr_gtm_read_2():
         '-47.792263031005859 -21.194267272949219,' + \
         '-47.7894287109375 -21.194473266601562)'
 
-    if ogrtest.check_feature_geometry(feat, wkt):
-        gdaltest.post_reason('Unexpected geometry')
-        return 'fail'
+    assert not ogrtest.check_feature_geometry(feat, wkt), 'Unexpected geometry'
 
     return 'success'
 
@@ -268,18 +208,14 @@ def test_ogr_gtm_write_1():
     dst_feat.SetField('icon', 10)
     dst_feat.SetField('time', '2009/12/23 14:25:46')
     dst_feat.SetGeometry(ogr.CreateGeometryFromWkt('POINT (-21 -47)'))
-    if lyr.CreateFeature(dst_feat) != 0:
-        gdaltest.post_reason('CreateFeature failed.')
-        return 'fail'
+    assert lyr.CreateFeature(dst_feat) == 0, 'CreateFeature failed.'
 
     dst_feat = ogr.Feature(lyr.GetLayerDefn())
     dst_feat.SetField('name', 'WAY0000001')
     dst_feat.SetField('comment', 'Waypoint 1')
     dst_feat.SetField('icon', 31)
     dst_feat.SetGeometry(ogr.CreateGeometryFromWkt('POINT (-21.123 -47.231 800)'))
-    if lyr.CreateFeature(dst_feat) != 0:
-        gdaltest.post_reason('CreateFeature failed.')
-        return 'fail'
+    assert lyr.CreateFeature(dst_feat) == 0, 'CreateFeature failed.'
 
     lyr = ds.CreateLayer('gtm_tracks', geom_type=ogr.wkbLineString)
 
@@ -288,18 +224,14 @@ def test_ogr_gtm_write_1():
     dst_feat.SetField('type', 2)
     dst_feat.SetField('color', 0x0000FF)
     dst_feat.SetGeometry(ogr.CreateGeometryFromWkt('LINESTRING (-21.1 -47.1, -21.2 -47.2, -21.3 -47.3, -21.4 -47.4)'))
-    if lyr.CreateFeature(dst_feat) != 0:
-        gdaltest.post_reason('CreateFeature failed.')
-        return 'fail'
+    assert lyr.CreateFeature(dst_feat) == 0, 'CreateFeature failed.'
 
     dst_feat = ogr.Feature(lyr.GetLayerDefn())
     dst_feat.SetField('name', '2nd Street')
     dst_feat.SetField('type', 1)
     dst_feat.SetField('color', 0x000000)
     dst_feat.SetGeometry(ogr.CreateGeometryFromWkt('LINESTRING (-21.11 -47.1, -21.21 -47.2, -21.31 -47.3, -21.41 -47.4)'))
-    if lyr.CreateFeature(dst_feat) != 0:
-        gdaltest.post_reason('CreateFeature failed.')
-        return 'fail'
+    assert lyr.CreateFeature(dst_feat) == 0, 'CreateFeature failed.'
 
     dst_feat = ogr.Feature(lyr.GetLayerDefn())
     dst_feat.SetField('name', '3rd Street')
@@ -307,9 +239,7 @@ def test_ogr_gtm_write_1():
     dst_feat.SetField('color', 0x000000)
     dst_feat.SetGeometry(ogr.CreateGeometryFromWkt('MULTILINESTRING ((-21.12 -47.1, -21.22 -47.2, -21.32 -47.3, -21.42 -47.4),' +
                                                    '(-21.12 -47.1, -21.02 -47.0, -20.92 -46.9))'))
-    if lyr.CreateFeature(dst_feat) != 0:
-        gdaltest.post_reason('CreateFeature failed.')
-        return 'fail'
+    assert lyr.CreateFeature(dst_feat) == 0, 'CreateFeature failed.'
 
     ds = None
 
@@ -325,145 +255,87 @@ def test_ogr_gtm_check_write_1():
 
     ds = ogr.Open('tmp/gtm.gtm')
     lyr = ds.GetLayerByName('gtm_waypoints')
-    if lyr.GetFeatureCount() != 2:
-        gdaltest.post_reason('Bad feature count.')
-        return 'fail'
+    assert lyr.GetFeatureCount() == 2, 'Bad feature count.'
 
     # Test 1st waypoint
     feat = lyr.GetNextFeature()
 
-    if feat.GetField('name') != 'WAY0000000':
-        gdaltest.post_reason('Wrong name field value')
-        return 'fail'
+    assert feat.GetField('name') == 'WAY0000000', 'Wrong name field value'
 
-    if feat.GetField('comment') != 'Waypoint 0':
-        gdaltest.post_reason('Wrong comment field value')
-        return 'fail'
+    assert feat.GetField('comment') == 'Waypoint 0', 'Wrong comment field value'
 
-    if feat.GetField('icon') != 10:
-        gdaltest.post_reason('Wrong icon field value')
-        return 'fail'
+    assert feat.GetField('icon') == 10, 'Wrong icon field value'
 
-    if feat.GetField('time') != '2009/12/23 14:25:46':
-        gdaltest.post_reason('Wrong time field value')
-        return 'fail'
+    assert feat.GetField('time') == '2009/12/23 14:25:46', 'Wrong time field value'
 
     wkt = 'POINT (-21 -47)'
-    if ogrtest.check_feature_geometry(feat, wkt):
-        gdaltest.post_reason('Unexpected geometry')
-        return 'fail'
+    assert not ogrtest.check_feature_geometry(feat, wkt), 'Unexpected geometry'
 
     # Test 2nd waypoint
     feat = lyr.GetNextFeature()
 
-    if feat.GetField('name') != 'WAY0000001':
-        gdaltest.post_reason('Wrong name field value')
-        return 'fail'
+    assert feat.GetField('name') == 'WAY0000001', 'Wrong name field value'
 
-    if feat.GetField('comment') != 'Waypoint 1':
-        gdaltest.post_reason('Wrong comment field value')
-        return 'fail'
+    assert feat.GetField('comment') == 'Waypoint 1', 'Wrong comment field value'
 
-    if feat.GetField('icon') != 31:
-        gdaltest.post_reason('Wrong icon field value')
-        return 'fail'
+    assert feat.GetField('icon') == 31, 'Wrong icon field value'
 
-    if feat.GetField('time') is not None:
-        gdaltest.post_reason('Wrong time field value')
-        return 'fail'
+    assert feat.GetField('time') is None, 'Wrong time field value'
 
     wkt = 'POINT (-21.123 -47.231 800)'
-    if ogrtest.check_feature_geometry(feat, wkt):
-        gdaltest.post_reason('Unexpected geometry')
-        return 'fail'
+    assert not ogrtest.check_feature_geometry(feat, wkt), 'Unexpected geometry'
 
     # Test tracks
     lyr = ds.GetLayerByName('gtm_tracks')
-    if lyr.GetFeatureCount() != 4:  # The driver converts multiline
-                                    # into one line for each tuple
-                                    # element
-        gdaltest.post_reason('Bad feature count.')
-        return 'fail'
+    assert lyr.GetFeatureCount() == 4, 'Bad feature count.'
 
     # Test 1st track
     feat = lyr.GetNextFeature()
 
-    if feat.GetField('name') != '1st Street':
-        gdaltest.post_reason('Wrong name field value')
-        return 'fail'
+    assert feat.GetField('name') == '1st Street', 'Wrong name field value'
 
-    if feat.GetField('type') != 2:
-        gdaltest.post_reason('Wrong type field value')
-        return 'fail'
+    assert feat.GetField('type') == 2, 'Wrong type field value'
 
-    if feat.GetField('color') != 0x0000FF:
-        gdaltest.post_reason('Wrong color field value')
-        return 'fail'
+    assert feat.GetField('color') == 0x0000FF, 'Wrong color field value'
 
     wkt = 'LINESTRING (-21.1 -47.1, -21.2 -47.2, -21.3 -47.3, -21.4 -47.4)'
-    if ogrtest.check_feature_geometry(feat, wkt):
-        gdaltest.post_reason('Unexpected geometry')
-        return 'fail'
+    assert not ogrtest.check_feature_geometry(feat, wkt), 'Unexpected geometry'
 
     # Test 2nd track
     feat = lyr.GetNextFeature()
 
-    if feat.GetField('name') != '2nd Street':
-        gdaltest.post_reason('Wrong name field value')
-        return 'fail'
+    assert feat.GetField('name') == '2nd Street', 'Wrong name field value'
 
-    if feat.GetField('type') != 1:
-        gdaltest.post_reason('Wrong type field value')
-        return 'fail'
+    assert feat.GetField('type') == 1, 'Wrong type field value'
 
-    if feat.GetField('color') != 0x000000:
-        gdaltest.post_reason('Wrong color field value')
-        return 'fail'
+    assert feat.GetField('color') == 0x000000, 'Wrong color field value'
 
     wkt = 'LINESTRING (-21.11 -47.1, -21.21 -47.2, -21.31 -47.3, -21.41 -47.4)'
-    if ogrtest.check_feature_geometry(feat, wkt):
-        gdaltest.post_reason('Unexpected geometry')
-        return 'fail'
+    assert not ogrtest.check_feature_geometry(feat, wkt), 'Unexpected geometry'
 
     # Test 3rd track
     feat = lyr.GetNextFeature()
 
-    if feat.GetField('name') != '3rd Street':
-        gdaltest.post_reason('Wrong name field value')
-        return 'fail'
+    assert feat.GetField('name') == '3rd Street', 'Wrong name field value'
 
-    if feat.GetField('type') != 2:
-        gdaltest.post_reason('Wrong type field value')
-        return 'fail'
+    assert feat.GetField('type') == 2, 'Wrong type field value'
 
-    if feat.GetField('color') != 0x000000:
-        gdaltest.post_reason('Wrong color field value')
-        return 'fail'
+    assert feat.GetField('color') == 0x000000, 'Wrong color field value'
 
     wkt = 'LINESTRING (-21.12 -47.1, -21.22 -47.2, -21.32 -47.3, -21.42 -47.4)'
-    if ogrtest.check_feature_geometry(feat, wkt):
-        gdaltest.post_reason('Unexpected geometry')
-        return 'fail'
+    assert not ogrtest.check_feature_geometry(feat, wkt), 'Unexpected geometry'
 
     # Test 4th track
     feat = lyr.GetNextFeature()
 
-    if feat.GetField('name') != '3rd Street':
-        gdaltest.post_reason('Wrong name field value')
-        return 'fail'
+    assert feat.GetField('name') == '3rd Street', 'Wrong name field value'
 
-    if feat.GetField('type') != 2:
-        gdaltest.post_reason('Wrong type field value')
-        return 'fail'
+    assert feat.GetField('type') == 2, 'Wrong type field value'
 
-    if feat.GetField('color') != 0x000000:
-        gdaltest.post_reason('Wrong color field value')
-        return 'fail'
+    assert feat.GetField('color') == 0x000000, 'Wrong color field value'
 
     wkt = 'LINESTRING (-21.12 -47.1, -21.02 -47.0, -20.92 -46.9)'
-    if ogrtest.check_feature_geometry(feat, wkt):
-        gdaltest.post_reason('Unexpected geometry')
-        return 'fail'
+    assert not ogrtest.check_feature_geometry(feat, wkt), 'Unexpected geometry'
 
     return 'success'
 
diff --git a/autotest/ogr/ogr_htf.py b/autotest/ogr/ogr_htf.py
index c4531c01bbb4..246626477ce0 100755
--- a/autotest/ogr/ogr_htf.py
+++ b/autotest/ogr/ogr_htf.py
@@ -34,6 +34,7 @@
 import gdaltest
 import ogrtest
 from osgeo import ogr
+import pytest
 
 ###############################################################################
 # Basic test
@@ -42,62 +43,43 @@
 def test_ogr_htf_1():
 
     ds = ogr.Open('data/test.htf')
-    if ds is None:
-        gdaltest.post_reason('cannot open dataset')
-        return 'fail'
+    assert ds is not None, 'cannot open dataset'
 
     lyr = ds.GetLayer(0)
-    if lyr.GetName() != 'polygon':
-        gdaltest.post_reason('layer 0 is not polygon')
-        return 'fail'
+    assert lyr.GetName() == 'polygon', 'layer 0 is not polygon'
 
     lyr = ds.GetLayerByName('polygon')
-    if lyr is None:
-        gdaltest.post_reason('cannot find layer polygon')
-        return 'fail'
+    assert lyr is not None, 'cannot find layer polygon'
 
     feat = lyr.GetNextFeature()
     geom = feat.GetGeometryRef()
     if ogrtest.check_feature_geometry(feat, 'POLYGON ((320830 7678810,350840 7658030,308130 7595560,278310 7616820,320830 7678810))',
                                       max_error=0.0000001) != 0:
-        gdaltest.post_reason('did not get expected first geom')
         print(geom.ExportToWkt())
-        return 'fail'
+        pytest.fail('did not get expected first geom')
 
     feat = lyr.GetNextFeature()
     geom = feat.GetGeometryRef()
     if ogrtest.check_feature_geometry(feat, 'POLYGON ((320830 7678810,350840 7658030,308130 7595560,278310 7616820,320830 7678810),(0 0,0 1,1 1,0 0))',
                                       max_error=0.0000001) != 0:
-        gdaltest.post_reason('did not get expected first geom')
         print(geom.ExportToWkt())
-        return 'fail'
+        pytest.fail('did not get expected first geom')
 
-    if feat.GetField('IDENTIFIER') != 2:
-        gdaltest.post_reason('did not get expected identifier')
-        print(feat.GetField('IDENTIFIER'))
-        return 'fail'
+    assert feat.GetField('IDENTIFIER') == 2, 'did not get expected identifier'
 
     lyr = ds.GetLayerByName('sounding')
-    if lyr is None:
-        gdaltest.post_reason('cannot find layer sounding')
-        return 'fail'
+    assert lyr is not None, 'cannot find layer sounding'
 
-    if lyr.GetFeatureCount() != 2:
-        gdaltest.post_reason('did not get expected feature count')
-        return 'fail'
+    assert lyr.GetFeatureCount() == 2, 'did not get expected feature count'
 
     feat = lyr.GetNextFeature()
     geom = feat.GetGeometryRef()
     if ogrtest.check_feature_geometry(feat, 'POINT (278670 7616330)',
                                       max_error=0.0000001) != 0:
-        gdaltest.post_reason('did not get expected first geom')
         print(geom.ExportToWkt())
-        return 'fail'
+        pytest.fail('did not get expected first geom')
 
-    if feat.GetField('other3') != 'other3':
-        gdaltest.post_reason('did not get expected other3 val')
-        print(feat.GetField('other3'))
-        return 'fail'
+    assert feat.GetField('other3') == 'other3', 'did not get expected other3 val'
 
     return 'success'
 
@@ -113,15 +95,11 @@ def test_ogr_htf_2():
 
     ret = gdaltest.runexternal(test_cli_utilities.get_test_ogrsf_path() + ' -ro data/test.htf')
 
-    if ret.find('INFO') == -1 or ret.find('ERROR') != -1:
-        print(ret)
-        return 'fail'
+    assert ret.find('INFO') != -1 and ret.find('ERROR') == -1
 
     ret = gdaltest.runexternal(test_cli_utilities.get_test_ogrsf_path() + ' -ro data/test.htf metadata')
 
-    if ret.find('INFO') == -1 or ret.find('ERROR') != -1:
-        print(ret)
-        return 'fail'
+    assert ret.find('INFO') != -1 and ret.find('ERROR') == -1
 
     return 'success'
 
diff --git a/autotest/ogr/ogr_idrisi.py b/autotest/ogr/ogr_idrisi.py
index 31f9303ece09..719453f58596 100755
--- a/autotest/ogr/ogr_idrisi.py
+++ b/autotest/ogr/ogr_idrisi.py
@@ -42,36 +42,25 @@
 def test_ogr_idrisi_1():
 
     ds = ogr.Open('data/points.vct')
-    if ds is None:
-        return 'fail'
+    assert ds is not None
 
     lyr = ds.GetLayer(0)
-    if lyr.GetGeomType() != ogr.wkbPoint:
-        return 'fail'
+    assert lyr.GetGeomType() == ogr.wkbPoint
 
-    if lyr.GetLayerDefn().GetFieldDefn(1).GetName() != 'IntegerField':
-        return 'fail'
+    assert lyr.GetLayerDefn().GetFieldDefn(1).GetName() == 'IntegerField'
 
-    if lyr.GetLayerDefn().GetFieldDefn(1).GetType() != ogr.OFTInteger:
-        return 'fail'
+    assert lyr.GetLayerDefn().GetFieldDefn(1).GetType() == ogr.OFTInteger
 
     sr = lyr.GetSpatialRef()
-    if sr.ExportToWkt().find('PROJCS["UTM Zone 31, Northern Hemisphere"') != 0:
-        print(sr.ExportToWkt())
-        return 'fail'
+    assert sr.ExportToWkt().find('PROJCS["UTM Zone 31, Northern Hemisphere"') == 0
 
-    if lyr.GetFeatureCount() != 2:
-        return 'fail'
+    assert lyr.GetFeatureCount() == 2
 
-    if lyr.TestCapability(ogr.OLCFastFeatureCount) != 1:
-        return 'fail'
+    assert lyr.TestCapability(ogr.OLCFastFeatureCount) == 1
 
-    if lyr.TestCapability(ogr.OLCFastGetExtent) != 1:
-        return 'fail'
+    assert lyr.TestCapability(ogr.OLCFastGetExtent) == 1
 
-    if lyr.GetExtent() != (400000.0, 600000.0, 4000000.0, 5000000.0):
-        print(lyr.GetExtent())
-        return 'fail'
+    assert lyr.GetExtent() == (400000.0, 600000.0, 4000000.0, 5000000.0)
 
     feat = lyr.GetNextFeature()
     if feat.GetFieldAsDouble(0) != 1.0:
@@ -113,8 +102,7 @@ def test_ogr_idrisi_1():
     lyr.SetSpatialFilterRect(0, 0, 1, 1)
     lyr.ResetReading()
     feat = lyr.GetNextFeature()
-    if feat is not None:
-        return 'fail'
+    assert feat is None
 
     ds = None
 
@@ -127,25 +115,18 @@ def test_ogr_idrisi_1():
 def test_ogr_idrisi_2():
 
     ds = ogr.Open('data/lines.vct')
-    if ds is None:
-        return 'fail'
+    assert ds is not None
 
     lyr = ds.GetLayer(0)
-    if lyr.GetGeomType() != ogr.wkbLineString:
-        return 'fail'
+    assert lyr.GetGeomType() == ogr.wkbLineString
 
-    if lyr.GetFeatureCount() != 2:
-        return 'fail'
+    assert lyr.GetFeatureCount() == 2
 
-    if lyr.TestCapability(ogr.OLCFastFeatureCount) != 1:
-        return 'fail'
+    assert lyr.TestCapability(ogr.OLCFastFeatureCount) == 1
 
-    if lyr.TestCapability(ogr.OLCFastGetExtent) != 1:
-        return 'fail'
+    assert lyr.TestCapability(ogr.OLCFastGetExtent) == 1
 
-    if lyr.GetExtent() != (400000.0, 600000.0, 4000000.0, 5000000.0):
-        print(lyr.GetExtent())
-        return 'fail'
+    assert lyr.GetExtent() == (400000.0, 600000.0, 4000000.0, 5000000.0)
 
     feat = lyr.GetNextFeature()
     if feat.GetFieldAsDouble(0) != 10.0:
@@ -168,8 +149,7 @@ def test_ogr_idrisi_2():
     lyr.SetSpatialFilterRect(0, 0, 1, 1)
     lyr.ResetReading()
     feat = lyr.GetNextFeature()
-    if feat is not None:
-        return 'fail'
+    assert feat is None
 
     ds = None
 
@@ -182,25 +162,18 @@ def test_ogr_idrisi_2():
 def test_ogr_idrisi_3():
 
     ds = ogr.Open('data/polygons.vct')
-    if ds is None:
-        return 'fail'
+    assert ds is not None
 
     lyr = ds.GetLayer(0)
-    if lyr.GetGeomType() != ogr.wkbPolygon:
-        return 'fail'
+    assert lyr.GetGeomType() == ogr.wkbPolygon
 
-    if lyr.GetFeatureCount() != 2:
-        return 'fail'
+    assert lyr.GetFeatureCount() == 2
 
-    if lyr.TestCapability(ogr.OLCFastFeatureCount) != 1:
-        return 'fail'
+    assert lyr.TestCapability(ogr.OLCFastFeatureCount) == 1
 
-    if lyr.TestCapability(ogr.OLCFastGetExtent) != 1:
-        return 'fail'
+    assert lyr.TestCapability(ogr.OLCFastGetExtent) == 1
 
-    if lyr.GetExtent() != (400000.0, 600000.0, 4000000.0, 5000000.0):
-        print(lyr.GetExtent())
-        return 'fail'
+    assert lyr.GetExtent() == (400000.0, 600000.0, 4000000.0, 5000000.0)
 
     feat = lyr.GetNextFeature()
     if feat.GetFieldAsDouble(0) != 1.0:
@@ -223,8 +196,7 @@ def test_ogr_idrisi_3():
     lyr.SetSpatialFilterRect(0, 0, 1, 1)
     lyr.ResetReading()
     feat = lyr.GetNextFeature()
-    if feat is not None:
-        return 'fail'
+    assert feat is None
 
     ds = None
 
diff --git a/autotest/ogr/ogr_ili.py b/autotest/ogr/ogr_ili.py
index b31cac532d04..30347f6d45a5 100755
--- a/autotest/ogr/ogr_ili.py
+++ b/autotest/ogr/ogr_ili.py
@@ -33,6 +33,7 @@
 import ogrtest
 from osgeo import gdal
 from osgeo import ogr
+import pytest
 
 
 def cpl_debug_on():
@@ -75,20 +76,14 @@ def test_ogr_interlis1_2():
               'Bodenbedeckung__BoFlaechen_Form',
               'Bodenbedeckung__Strasse',
               'Bodenbedeckung__Gebaeude']
-    if ds.GetLayerCount() != len(layers):
-        gdaltest.post_reason('layer count wrong.')
-        return 'fail'
+    assert ds.GetLayerCount() == len(layers), 'layer count wrong.'
 
     for i in range(ds.GetLayerCount()):
-        if not ds.GetLayer(i).GetName() in layers:
-            gdaltest.post_reason('Did not get right layers')
-            return 'fail'
+        assert ds.GetLayer(i).GetName() in layers, 'Did not get right layers'
 
     lyr = ds.GetLayerByName('Bodenbedeckung__BoFlaechen')
 
-    if lyr.GetFeatureCount() != 3:
-        gdaltest.post_reason('feature count wrong.')
-        return 'fail'
+    assert lyr.GetFeatureCount() == 3, 'feature count wrong.'
 
     # Get 2nd feature
     feat = lyr.GetNextFeature()
@@ -96,9 +91,7 @@ def test_ogr_interlis1_2():
 
     field_values = [20, 1, 168.27, 170.85]
 
-    if feat.GetFieldCount() != len(field_values):
-        gdaltest.post_reason('field count wrong.')
-        return 'fail'
+    assert feat.GetFieldCount() == len(field_values), 'field count wrong.'
 
     for i in range(feat.GetFieldCount()):
         if feat.GetFieldAsString(i) != str(field_values[i]):
@@ -108,18 +101,12 @@ def test_ogr_interlis1_2():
             return 'fail'
 
     geom = feat.GetGeomFieldRef(0)
-    if geom.GetCoordinateDimension() != 2:
-        gdaltest.post_reason('dimension wrong.')
-        return 'fail'
+    assert geom.GetCoordinateDimension() == 2, 'dimension wrong.'
     geom = feat.GetGeomFieldRef(1)
-    if geom.GetCoordinateDimension() != 2:
-        gdaltest.post_reason('dimension wrong.')
-        return 'fail'
+    assert geom.GetCoordinateDimension() == 2, 'dimension wrong.'
 
     geom = feat.GetGeometryRef()
-    if geom.GetGeometryName() != 'POLYGON':
-        gdaltest.post_reason('Geometry of wrong type.')
-        return 'fail'
+    assert geom.GetGeometryName() == 'POLYGON', 'Geometry of wrong type.'
 
     return 'success'
 
@@ -135,28 +122,20 @@ def test_ogr_interlis1_3():
     ds = ogr.Open('data/ili/format-default.itf,data/ili/format-default.imd')
 
     layers = ['FormatTests__FormatTable']
-    if ds.GetLayerCount() != len(layers):
-        gdaltest.post_reason('layer count wrong.')
-        return 'fail'
+    assert ds.GetLayerCount() == len(layers), 'layer count wrong.'
 
     for i in range(ds.GetLayerCount()):
-        if not ds.GetLayer(i).GetName() in layers:
-            gdaltest.post_reason('Did not get right layers')
-            return 'fail'
+        assert ds.GetLayer(i).GetName() in layers, 'Did not get right layers'
 
     lyr = ds.GetLayerByName('FormatTests__FormatTable')
 
-    if lyr.GetFeatureCount() != 1:
-        gdaltest.post_reason('feature count wrong.')
-        return 'fail'
+    assert lyr.GetFeatureCount() == 1, 'feature count wrong.'
 
     feat = lyr.GetNextFeature()
 
     field_values = [0, 'aa bb', 'cc^dd', '', 1]
 
-    if feat.GetFieldCount() != len(field_values):
-        gdaltest.post_reason('field count wrong.')
-        return 'fail'
+    assert feat.GetFieldCount() == len(field_values), 'field count wrong.'
 
     for i in range(feat.GetFieldCount()):
         if feat.GetFieldAsString(i) != str(field_values[i]):
@@ -179,28 +158,20 @@ def test_ogr_interlis1_4():
     ds = ogr.Open('data/ili/format-test.itf,data/ili/format-test.imd')
 
     layers = ['FormatTests__FormatTable']
-    if ds.GetLayerCount() != len(layers):
-        gdaltest.post_reason('layer count wrong.')
-        return 'fail'
+    assert ds.GetLayerCount() == len(layers), 'layer count wrong.'
 
     for i in range(ds.GetLayerCount()):
-        if not ds.GetLayer(i).GetName() in layers:
-            gdaltest.post_reason('Did not get right layers')
-            return 'fail'
+        assert ds.GetLayer(i).GetName() in layers, 'Did not get right layers'
 
     lyr = ds.GetLayerByName('FormatTests__FormatTable')
 
-    if lyr.GetFeatureCount() != 1:
-        gdaltest.post_reason('feature count wrong.')
-        return 'fail'
+    assert lyr.GetFeatureCount() == 1, 'feature count wrong.'
 
     feat = lyr.GetNextFeature()
 
     field_values = [0, 'aa_bb', 'cc dd', '', 1]
 
-    if feat.GetFieldCount() != len(field_values):
-        gdaltest.post_reason('field count wrong.')
-        return 'fail'
+    assert feat.GetFieldCount() == len(field_values), 'field count wrong.'
 
     for i in range(feat.GetFieldCount()):
         if feat.GetFieldAsString(i) != str(field_values[i]):
@@ -254,9 +225,7 @@ def test_ogr_interlis1_5():
 ETOP
 EMOD
 ENDE"""
-        if expected not in itf:
-            gdaltest.post_reason("Interlis output doesn't match.")
-            return 'fail'
+        assert expected in itf, "Interlis output doesn't match."
 
     return 'success'
 
@@ -299,10 +268,7 @@ def test_ogr_interlis1_6():
 ETOP
 EMOD
 ENDE"""
-        if expected not in itf:
-            gdaltest.post_reason("Interlis output doesn't match.")
-            print(itf)
-            return 'fail'
+        assert expected in itf, "Interlis output doesn't match."
 
     return 'success'
 
@@ -318,20 +284,14 @@ def test_ogr_interlis1_7():
     ds = ogr.Open('data/ili/encoding-test.itf,data/ili/format-default.imd')
 
     layers = ['FormatTests__FormatTable']
-    if ds.GetLayerCount() != len(layers):
-        gdaltest.post_reason('layer count wrong.')
-        return 'fail'
+    assert ds.GetLayerCount() == len(layers), 'layer count wrong.'
 
     for i in range(ds.GetLayerCount()):
-        if not ds.GetLayer(i).GetName() in layers:
-            gdaltest.post_reason('Did not get right layers')
-            return 'fail'
+        assert ds.GetLayer(i).GetName() in layers, 'Did not get right layers'
 
     lyr = ds.GetLayerByName('FormatTests__FormatTable')
 
-    if lyr.GetFeatureCount() != 1:
-        gdaltest.post_reason('feature count wrong.')
-        return 'fail'
+    assert lyr.GetFeatureCount() == 1, 'feature count wrong.'
 
     feat = lyr.GetNextFeature()
 
@@ -339,9 +299,7 @@ def test_ogr_interlis1_7():
     # Python source code is UTF-8 encoded
     field_values = [0, 'äöü', 'ÄÖÜ', '', 1]
 
-    if feat.GetFieldCount() != len(field_values):
-        gdaltest.post_reason('field count wrong.')
-        return 'fail'
+    assert feat.GetFieldCount() == len(field_values), 'field count wrong.'
 
     for i in range(feat.GetFieldCount()):
         if feat.GetFieldAsString(i) != str(field_values[i]):
@@ -385,10 +343,7 @@ def test_ogr_interlis1_7():
         expected = expected.decode('utf8').encode('iso-8859-1')
     except:
         pass
-    if expected not in itf:
-        gdaltest.post_reason("Interlis output doesn't match.")
-        print(itf)
-        return 'fail'
+    assert expected in itf, "Interlis output doesn't match."
 
     return 'success'
 
@@ -403,32 +358,23 @@ def test_ogr_interlis1_9():
 
     ds = ogr.Open('data/ili/Beispiel-rename.vrt')
     layers = ['BoGebaeude']
-    if ds.GetLayerCount() != len(layers):
-        gdaltest.post_reason('layer count wrong.')
-        return 'fail'
+    assert ds.GetLayerCount() == len(layers), 'layer count wrong.'
 
     for i in range(ds.GetLayerCount()):
-        if not ds.GetLayer(i).GetName() in layers:
-            gdaltest.post_reason('Did not get right layers')
-            return 'fail'
+        assert ds.GetLayer(i).GetName() in layers, 'Did not get right layers'
 
     lyr = ds.GetLayerByName('BoGebaeude')
 
-    if lyr.GetLayerDefn().GetFieldDefn(0).GetNameRef() != 'AssekuranzNr':
-        gdaltest.post_reason('Wrong field name: ' + lyr.GetLayerDefn().GetFieldDefn(0).GetNameRef())
-        return 'fail'
+    assert lyr.GetLayerDefn().GetFieldDefn(0).GetNameRef() == 'AssekuranzNr', \
+        ('Wrong field name: ' + lyr.GetLayerDefn().GetFieldDefn(0).GetNameRef())
 
-    if lyr.GetFeatureCount() != 1:
-        gdaltest.post_reason('feature count wrong.')
-        return 'fail'
+    assert lyr.GetFeatureCount() == 1, 'feature count wrong.'
 
     feat = lyr.GetNextFeature()
 
     field_values = ['958', 10, 'POINT (148.41 175.96)']
 
-    if feat.GetFieldCount() != len(field_values) - 1:
-        gdaltest.post_reason('field count wrong.')
-        return 'fail'
+    assert feat.GetFieldCount() == len(field_values) - 1, 'field count wrong.'
 
     for i in range(feat.GetFieldCount()):
         if feat.GetFieldAsString(i) != str(field_values[i]):
@@ -455,17 +401,12 @@ def test_ogr_interlis1_10():
 
     lyr = ds.GetLayerByName('Bodenbedeckung__BoFlaechen')
 
-    if lyr.GetFeatureCount() != 3:
-        gdaltest.post_reason('feature count wrong.')
-        return 'fail'
+    assert lyr.GetFeatureCount() == 3, 'feature count wrong.'
 
     feat = lyr.GetNextFeature()
     geom_field_values = ['POLYGON ((146.92 174.98,138.68 187.51,147.04 193.0,149.79 188.82,158.15 194.31,163.64 185.96,146.92 174.98))', 'POINT (148.2 183.48)']
 
-    if feat.GetGeomFieldCount() != len(geom_field_values):
-        gdaltest.post_reason('geom field count wrong.')
-        print(feat.GetGeomFieldCount())
-        return 'fail'
+    assert feat.GetGeomFieldCount() == len(geom_field_values), 'geom field count wrong.'
 
     for i in range(feat.GetGeomFieldCount()):
         geom = feat.GetGeomFieldRef(i)
@@ -487,20 +428,14 @@ def test_ogr_interlis1_11():
     ds = ogr.Open('data/ili/multigeom.itf,data/ili/multigeom.imd')
 
     layers = ['MultigeomTests__MultigeomTable']
-    if ds.GetLayerCount() != len(layers):
-        gdaltest.post_reason('layer count wrong.')
-        return 'fail'
+    assert ds.GetLayerCount() == len(layers), 'layer count wrong.'
 
     for i in range(ds.GetLayerCount()):
-        if not ds.GetLayer(i).GetName() in layers:
-            gdaltest.post_reason('Did not get right layers')
-            return 'fail'
+        assert ds.GetLayer(i).GetName() in layers, 'Did not get right layers'
 
     lyr = ds.GetLayerByName('MultigeomTests__MultigeomTable')
 
-    if lyr.GetFeatureCount() != 1:
-        gdaltest.post_reason('feature count wrong.')
-        return 'fail'
+    assert lyr.GetFeatureCount() == 1, 'feature count wrong.'
 
     feat = lyr.GetNextFeature()
 
@@ -512,23 +447,15 @@ def test_ogr_interlis1_11():
     #        GeomPoint_0 (Real) = 148.41
     #        GeomPoint_1 (Real) = 175.96
 
-    if feat.GetFieldCount() != 5:
-        gdaltest.post_reason('field count wrong.')
-        print(feat.GetFieldCount())
-        return 'fail'
+    assert feat.GetFieldCount() == 5, 'field count wrong.'
 
     geom_columns = ['GeomLine', 'GeomPoint']
 
-    if feat.GetGeomFieldCount() != len(geom_columns):
-        gdaltest.post_reason('geom field count wrong.')
-        print(feat.GetGeomFieldCount())
-        return 'fail'
+    assert feat.GetGeomFieldCount() == len(geom_columns), 'geom field count wrong.'
 
     for i in range(feat.GetGeomFieldCount()):
         defn = lyr.GetLayerDefn().GetGeomFieldDefn(i)
-        if defn.GetName() != str(geom_columns[i]):
-            print("Geom field: " + defn.GetName())
-            return 'fail'
+        assert defn.GetName() == str(geom_columns[i]), ("Geom field: " + defn.GetName())
 
     return 'success'
 
@@ -544,20 +471,14 @@ def test_ogr_interlis1_12():
     ds = ogr.Open('data/ili/multicoord.itf,data/ili/multicoord.imd')
 
     layers = ['MulticoordTests__MulticoordTable']
-    if ds.GetLayerCount() != len(layers):
-        gdaltest.post_reason('layer count wrong.')
-        return 'fail'
+    assert ds.GetLayerCount() == len(layers), 'layer count wrong.'
 
     for i in range(ds.GetLayerCount()):
-        if not ds.GetLayer(i).GetName() in layers:
-            gdaltest.post_reason('Did not get right layers')
-            return 'fail'
+        assert ds.GetLayer(i).GetName() in layers, 'Did not get right layers'
 
     lyr = ds.GetLayerByName('MulticoordTests__MulticoordTable')
 
-    if lyr.GetFeatureCount() != 1:
-        gdaltest.post_reason('feature count wrong.')
-        return 'fail'
+    assert lyr.GetFeatureCount() == 1, 'feature count wrong.'
 
     feat = lyr.GetNextFeature()
 
@@ -568,16 +489,11 @@ def test_ogr_interlis1_12():
 
     geom_columns = ['coordPoint1', 'coordPoint2']
 
-    if feat.GetGeomFieldCount() != len(geom_columns):
-        gdaltest.post_reason('geom field count wrong.')
-        print(feat.GetGeomFieldCount())
-        return 'fail'
+    assert feat.GetGeomFieldCount() == len(geom_columns), 'geom field count wrong.'
 
     for i in range(feat.GetGeomFieldCount()):
         defn = lyr.GetLayerDefn().GetGeomFieldDefn(i)
-        if defn.GetName() != str(geom_columns[i]):
-            print("Geom field: " + defn.GetName())
-            return 'fail'
+        assert defn.GetName() == str(geom_columns[i]), ("Geom field: " + defn.GetName())
 
     return 'success'
 
@@ -601,34 +517,24 @@ def test_ogr_interlis1_13():
               'SURFC_TOP__Flaechenelement_Geometrie'
               ]
 
-    if ds.GetLayerCount() != len(layers):
-        gdaltest.post_reason('layer count wrong.')
-        return 'fail'
+    assert ds.GetLayerCount() == len(layers), 'layer count wrong.'
 
     for i in range(ds.GetLayerCount()):
-        if not ds.GetLayer(i).GetName() in layers:
-            gdaltest.post_reason('Did not get right layers')
-            return 'fail'
+        assert ds.GetLayer(i).GetName() in layers, 'Did not get right layers'
 
     lyr = ds.GetLayerByName('SURFC_TOP__SURFC_TBL_SHAPE')
 
-    if lyr.GetFeatureCount() != 5:
-        gdaltest.post_reason('feature count wrong.')
-        return 'fail'
+    assert lyr.GetFeatureCount() == 5, 'feature count wrong.'
 
     lyr = ds.GetLayerByName('SURFC_TOP__SURFC_TBL')
 
-    if lyr.GetFeatureCount() != 4:
-        gdaltest.post_reason('feature count wrong.')
-        return 'fail'
+    assert lyr.GetFeatureCount() == 4, 'feature count wrong.'
 
     feat = lyr.GetNextFeature()
 
     field_values = ['103', 1, 3, 1, 23, 25000, 20060111]
 
-    if feat.GetFieldCount() != len(field_values):
-        gdaltest.post_reason('field count wrong.')
-        return 'fail'
+    assert feat.GetFieldCount() == len(field_values), 'field count wrong.'
 
     for i in range(feat.GetFieldCount()):
         if feat.GetFieldAsString(i) != str(field_values[i]):
@@ -639,10 +545,7 @@ def test_ogr_interlis1_13():
 
     geom_field_values = ['CURVEPOLYGON (COMPOUNDCURVE ((598600.961 249487.174,598608.899 249538.768,598624.774 249594.331,598648.586 249630.05,598684.305 249661.8,598763.68 249685.612,598850.993 249685.612,598854.962 249618.143,598843.055 249550.675,598819.243 249514.956,598763.68 249479.237,598692.243 249447.487,598612.868 249427.643,598600.961 249487.174)))']
 
-    if feat.GetGeomFieldCount() != len(geom_field_values):
-        gdaltest.post_reason('geom field count wrong.')
-        print(feat.GetGeomFieldCount())
-        return 'fail'
+    assert feat.GetGeomFieldCount() == len(geom_field_values), 'geom field count wrong.'
 
     for i in range(feat.GetGeomFieldCount()):
         geom = feat.GetGeomFieldRef(i)
@@ -655,10 +558,7 @@ def test_ogr_interlis1_13():
     feat = lyr.GetNextFeature()
     geom_field_values = ['CURVEPOLYGON (COMPOUNDCURVE ((598131.445 249100.621,598170.131 249095.094,598200.448 249085.393),CIRCULARSTRING (598200.448 249085.393,598239.253 249062.352,598246.529 249044.162),(598246.529 249044.162,598245.316 249025.972,598229.552 249017.483,598165.28 249035.673,598134.963 249049.013,598130.273 249052.095,598131.445 249100.621)))']
 
-    if feat.GetGeomFieldCount() != len(geom_field_values):
-        gdaltest.post_reason('geom field count wrong.')
-        print(feat.GetGeomFieldCount())
-        return 'fail'
+    assert feat.GetGeomFieldCount() == len(geom_field_values), 'geom field count wrong.'
 
     for i in range(feat.GetGeomFieldCount()):
         geom = feat.GetGeomFieldRef(i)
@@ -672,9 +572,7 @@ def test_ogr_interlis1_13():
     feat = lyr.GetNextFeature()
     field_values = ['106', 3, 3, 1, 23, 25000, 20060111]
 
-    if feat.GetFieldCount() != len(field_values):
-        gdaltest.post_reason('field count wrong.')
-        return 'fail'
+    assert feat.GetFieldCount() == len(field_values), 'field count wrong.'
 
     for i in range(feat.GetFieldCount()):
         if feat.GetFieldAsString(i) != str(field_values[i]):
@@ -686,10 +584,7 @@ def test_ogr_interlis1_13():
     # FIXME: note this is an invalid curve polygon. The two rings are completely disjoint, so this should be a multisurface instead.
     geom_field_values = ['CURVEPOLYGON (COMPOUNDCURVE ((747951.24 265833.326,747955.101 265828.716,747954.975 265827.862,747951.166 265828.348,747951.24 265833.326)),COMPOUNDCURVE ((747925.762 265857.606,747927.618 265861.533,747928.237 265860.794,747930.956 265857.547,747925.762 265857.606)))']
 
-    if feat.GetGeomFieldCount() != len(geom_field_values):
-        gdaltest.post_reason('geom field count wrong.')
-        print(feat.GetGeomFieldCount())
-        return 'fail'
+    assert feat.GetGeomFieldCount() == len(geom_field_values), 'geom field count wrong.'
 
     for i in range(feat.GetGeomFieldCount()):
         geom = feat.GetGeomFieldRef(i)
@@ -773,9 +668,7 @@ def test_ogr_interlis1_13():
     #         return 'fail'
 
     lyr = ds.GetLayerByName('SURFC_TOP__Flaechenelement_Geometrie')
-    if lyr.GetFeatureCount() != 3:
-        gdaltest.post_reason('feature count wrong.')
-        return 'fail'
+    assert lyr.GetFeatureCount() == 3, 'feature count wrong.'
 
     feat = lyr.GetNextFeature()
 
@@ -798,9 +691,7 @@ def test_ogr_interlis1_13():
             return 'fail'
 
     lyr = ds.GetLayerByName('SURFC_TOP__Flaechenelement')
-    if lyr.GetFeatureCount() != 2:
-        gdaltest.post_reason('feature count wrong.')
-        return 'fail'
+    assert lyr.GetFeatureCount() == 2, 'feature count wrong.'
 
     feat = lyr.GetNextFeature()
 
@@ -859,34 +750,24 @@ def test_ogr_interlis1_13_linear():
               'SURFC_TOP__Flaechenelement_Geometrie'
               ]
 
-    if ds.GetLayerCount() != len(layers):
-        gdaltest.post_reason('layer count wrong.')
-        return 'fail'
+    assert ds.GetLayerCount() == len(layers), 'layer count wrong.'
 
     for i in range(ds.GetLayerCount()):
-        if not ds.GetLayer(i).GetName() in layers:
-            gdaltest.post_reason('Did not get right layers')
-            return 'fail'
+        assert ds.GetLayer(i).GetName() in layers, 'Did not get right layers'
 
     lyr = ds.GetLayerByName('SURFC_TOP__SURFC_TBL_SHAPE')
 
-    if lyr.GetFeatureCount() != 5:
-        gdaltest.post_reason('feature count wrong.')
-        return 'fail'
+    assert lyr.GetFeatureCount() == 5, 'feature count wrong.'
 
     lyr = ds.GetLayerByName('SURFC_TOP__SURFC_TBL')
 
-    if lyr.GetFeatureCount() != 4:
-        gdaltest.post_reason('feature count wrong.')
-        return 'fail'
+    assert lyr.GetFeatureCount() == 4, 'feature count wrong.'
 
     feat = lyr.GetNextFeature()
 
     field_values = ['103', 1, 3, 1, 23, 25000, 20060111]
 
-    if feat.GetFieldCount() != len(field_values):
-        gdaltest.post_reason('field count wrong.')
-        return 'fail'
+    assert feat.GetFieldCount() == len(field_values), 'field count wrong.'
 
     for i in range(feat.GetFieldCount()):
         if feat.GetFieldAsString(i) != str(field_values[i]):
@@ -897,10 +778,7 @@ def test_ogr_interlis1_13_linear():
 
     geom_field_values = ['POLYGON ((598600.961 249487.174,598608.899 249538.768,598624.774 249594.331,598648.586 249630.05,598684.305 249661.8,598763.68 249685.612,598850.993 249685.612,598854.962 249618.143,598843.055 249550.675,598819.243 249514.956,598763.68 249479.237,598692.243 249447.487,598612.868 249427.643,598600.961 249487.174))']
 
-    if feat.GetGeomFieldCount() != len(geom_field_values):
-        gdaltest.post_reason('geom field count wrong.')
-        print(feat.GetGeomFieldCount())
-        return 'fail'
+    assert feat.GetGeomFieldCount() == len(geom_field_values), 'geom field count wrong.'
 
     for i in range(feat.GetGeomFieldCount()):
         geom = feat.GetGeomFieldRef(i)
@@ -912,10 +790,7 @@ def test_ogr_interlis1_13_linear():
 
     geom_field_values = ['POLYGON ((598600.961 249487.174,598608.899 249538.768,598624.774 249594.331,598648.586 249630.05,598684.305 249661.8,598763.68 249685.612,598850.993 249685.612,598854.962 249618.143,598843.055 249550.675,598819.243 249514.956,598763.68 249479.237,598692.243 249447.487,598612.868 249427.643,598600.961 249487.174))']
 
-    if feat.GetGeomFieldCount() != len(geom_field_values):
-        gdaltest.post_reason('geom field count wrong.')
-        print(feat.GetGeomFieldCount())
-        return 'fail'
+    assert feat.GetGeomFieldCount() == len(geom_field_values), 'geom field count wrong.'
 
     for i in range(feat.GetGeomFieldCount()):
         geom = feat.GetGeomFieldRef(i)
@@ -930,9 +805,7 @@ def test_ogr_interlis1_13_linear():
     # field_values = ['106', 3, 3, 1, 23, 25000, 20060111]
     field_values = ['105', 3, 3, 1, 23, 25000, 20060111]
 
-    if feat.GetFieldCount() != len(field_values):
-        gdaltest.post_reason('field count wrong.')
-        return 'fail'
+    assert feat.GetFieldCount() == len(field_values), 'field count wrong.'
 
     for i in range(feat.GetFieldCount()):
         if feat.GetFieldAsString(i) != str(field_values[i]):
@@ -943,10 +816,7 @@ def test_ogr_interlis1_13_linear():
 
     geom_field_values = ['POLYGON ((598330.204 249028.397,598344.756 249057.501,598390.838 249074.479,598422.367 249081.755,598459.96 249093.882,598493.915 249101.158,598523.019 249106.008,598563.038 249084.18,598589.716 249042.949,598603.056 249011.42,598607.907 248966.551,598577.59 248960.487,598493.915 248983.528,598424.793 248996.868,598359.308 249010.207,598330.204 249028.397))']
 
-    if feat.GetGeomFieldCount() != len(geom_field_values):
-        gdaltest.post_reason('geom field count wrong.')
-        print(feat.GetGeomFieldCount())
-        return 'fail'
+    assert feat.GetGeomFieldCount() == len(geom_field_values), 'geom field count wrong.'
 
     for i in range(feat.GetGeomFieldCount()):
         geom = feat.GetGeomFieldRef(i)
@@ -955,9 +825,7 @@ def test_ogr_interlis1_13_linear():
             return 'fail'
 
     lyr = ds.GetLayerByName('SURFC_TOP__Flaechenelement_Geometrie')
-    if lyr.GetFeatureCount() != 3:
-        gdaltest.post_reason('feature count wrong.')
-        return 'fail'
+    assert lyr.GetFeatureCount() == 3, 'feature count wrong.'
 
     feat = lyr.GetNextFeature()
 
@@ -980,9 +848,7 @@ def test_ogr_interlis1_13_linear():
             return 'fail'
 
     lyr = ds.GetLayerByName('SURFC_TOP__Flaechenelement')
-    if lyr.GetFeatureCount() != 2:
-        gdaltest.post_reason('feature count wrong.')
-        return 'fail'
+    assert lyr.GetFeatureCount() == 2, 'feature count wrong.'
 
     feat = lyr.GetNextFeature()
 
@@ -1053,10 +919,7 @@ def test_ogr_interlis1_14():
 EMOD
 ENDE
 """
-        if expected not in itf:
-            gdaltest.post_reason("Interlis output doesn't match.")
-            print(itf)
-            return 'fail'
+        assert expected in itf, "Interlis output doesn't match."
 
     return 'success'
 
@@ -1070,8 +933,7 @@ def test_ogr_interlis2_1():
         return 'skip'
 
     ds = ogr.Open('data/ili/RoadsExdm2ien.xml')
-    if ds is None:
-        return 'fail'
+    assert ds is not None
 
     layers = ['RoadsExdm2ben.Roads.LandCover',
               'RoadsExdm2ben.Roads.Street',
@@ -1079,14 +941,10 @@ def test_ogr_interlis2_1():
               'RoadsExdm2ben.Roads.StreetNamePosition',
               'RoadsExdm2ien.RoadsExtended.RoadSign']
 
-    if ds.GetLayerCount() != len(layers):
-        gdaltest.post_reason('layer count wrong.')
-        return 'fail'
+    assert ds.GetLayerCount() == len(layers), 'layer count wrong.'
 
     for i in range(ds.GetLayerCount()):
-        if not ds.GetLayer(i).GetName() in layers:
-            gdaltest.post_reason('Did not get right layers')
-            return 'fail'
+        assert ds.GetLayer(i).GetName() in layers, 'Did not get right layers'
 
     return 'success'
 
@@ -1100,8 +958,7 @@ def test_ogr_interlis2_2():
         return 'skip'
 
     ds = ogr.Open('data/ili/RoadsExdm2ien.xml,data/ili/RoadsExdm2ien.imd')
-    if ds is None:
-        return 'fail'
+    assert ds is not None
 
     layers = ['RoadsExdm2ben.Roads.LAttrs',
               'RoadsExdm2ben.Roads.LandCover',
@@ -1110,19 +967,13 @@ def test_ogr_interlis2_2():
               'RoadsExdm2ien.RoadsExtended.StreetAxis',
               'RoadsExdm2ien.RoadsExtended.RoadSign']
 
-    if ds.GetLayerCount() != len(layers):
-        gdaltest.post_reason('layer count wrong.')
-        return 'fail'
+    assert ds.GetLayerCount() == len(layers), 'layer count wrong.'
 
     for i in range(ds.GetLayerCount()):
-        if not ds.GetLayer(i).GetName() in layers:
-            gdaltest.post_reason('Did not get right layers')
-            return 'fail'
+        assert ds.GetLayer(i).GetName() in layers, 'Did not get right layers'
 
     lyr = ds.GetLayerByName('RoadsExdm2ien.RoadsExtended.RoadSign')
-    if lyr.GetFeatureCount() != 4:
-        gdaltest.post_reason('feature count wrong.')
-        return 'fail'
+    assert lyr.GetFeatureCount() == 4, 'feature count wrong.'
 
     feat = lyr.GetNextFeature()
 
@@ -1141,16 +992,11 @@ def test_ogr_interlis2_2():
             return 'fail'
 
     geom = feat.GetGeometryRef()
-    if geom.GetCoordinateDimension() != 2:
-        gdaltest.post_reason('dimension wrong.')
-        return 'fail'
+    assert geom.GetCoordinateDimension() == 2, 'dimension wrong.'
 
     geom_field_values = ['POINT (69.389 92.056)']
 
-    if feat.GetGeomFieldCount() != len(geom_field_values):
-        gdaltest.post_reason('geom field count wrong.')
-        print(feat.GetGeomFieldCount())
-        return 'fail'
+    assert feat.GetGeomFieldCount() == len(geom_field_values), 'geom field count wrong.'
 
     for i in range(feat.GetGeomFieldCount()):
         geom = feat.GetGeomFieldRef(i)
@@ -1159,18 +1005,13 @@ def test_ogr_interlis2_2():
             return 'fail'
 
     lyr = ds.GetLayerByName('RoadsExdm2ien.RoadsExtended.StreetAxis')
-    if lyr.GetFeatureCount() != 7:
-        gdaltest.post_reason('feature count wrong.')
-        return 'fail'
+    assert lyr.GetFeatureCount() == 7, 'feature count wrong.'
 
     feat = lyr.GetNextFeature()
 
     geom_field_values = ['LINESTRING (55.6 37.649,15.573 25.785)']
 
-    if feat.GetGeomFieldCount() != len(geom_field_values):
-        gdaltest.post_reason('geom field count wrong.')
-        print(feat.GetGeomFieldCount())
-        return 'fail'
+    assert feat.GetGeomFieldCount() == len(geom_field_values), 'geom field count wrong.'
 
     for i in range(feat.GetGeomFieldCount()):
         geom = feat.GetGeomFieldRef(i)
@@ -1179,18 +1020,13 @@ def test_ogr_interlis2_2():
             return 'fail'
 
     lyr = ds.GetLayerByName('RoadsExdm2ben.Roads.LandCover')
-    if lyr.GetFeatureCount() != 12:
-        gdaltest.post_reason('feature count wrong.')
-        return 'fail'
+    assert lyr.GetFeatureCount() == 12, 'feature count wrong.'
 
     feat = lyr.GetNextFeature()
 
     geom_field_values = ['POLYGON ((39.038 60.315,41.2 59.302,43.362 60.315,44.713 66.268,45.794 67.662,48.766 67.408,53.36 64.115,56.197 62.595,57.818 63.862,58.899 68.928,55.927 72.348,47.955 75.515,42.281 75.388,39.308 73.235,36.741 69.688,35.525 66.268,35.661 63.735,37.957 61.455,39.038 60.315))']
 
-    if feat.GetGeomFieldCount() != len(geom_field_values):
-        gdaltest.post_reason('geom field count wrong.')
-        print(feat.GetGeomFieldCount())
-        return 'fail'
+    assert feat.GetGeomFieldCount() == len(geom_field_values), 'geom field count wrong.'
 
     for i in range(feat.GetGeomFieldCount()):
         geom = feat.GetGeomFieldRef(i)
@@ -1240,9 +1076,7 @@ def test_ogr_interlis2_3():
         expected = """<?xml version="1.0" encoding="utf-8" ?>
 <TRANSFER xmlns="http://www.interlis.ch/INTERLIS2.3">
 <HEADERSECTION SENDER="OGR/GDAL"""
-        if expected not in xtf:
-            gdaltest.post_reason("Interlis output doesn't match.")
-            return 'fail'
+        assert expected in xtf, "Interlis output doesn't match."
         expected = """<MODELS>
 <MODEL NAME="RoadsExdm2ben" URI="http://www.interlis.ch/models" VERSION="2005-06-16"/>
 <MODEL NAME="RoadsExdm2ien" URI="http://www.interlis.ch/models" VERSION="2005-06-16"/>
@@ -1291,10 +1125,7 @@ def test_ogr_interlis2_3():
 </TRANSFER>"""
         expected = expected.replace('.11499999999999', '.115')
         xtf = xtf.replace('.11499999999999', '.115')
-        if expected not in xtf:
-            gdaltest.post_reason("Interlis output doesn't match.")
-            print(xtf)
-            return 'fail'
+        assert expected in xtf, "Interlis output doesn't match."
     return 'success'
 
 ###############################################################################
@@ -1307,8 +1138,7 @@ def test_ogr_interlis2_4():
         return 'skip'
 
     ds = ogr.Open('data/ili/ch.bazl.sicherheitszonenplan.oereb_20131118.xtf,data/ili/ch.bazl.sicherheitszonenplan.oereb_20131118.imd')
-    if ds is None:
-        return 'fail'
+    assert ds is not None
 
     layers = ['chGeoId10.BFSNr_',
               'chGeoId10.Kanton_',
@@ -1338,19 +1168,13 @@ def test_ogr_interlis2_4():
               'OeREBKRM09trsfr.Transferstruktur.HinweisVorschrift',
               'OeREBKRM09vs.Vorschriften.Dokument']
 
-    if ds.GetLayerCount() != len(layers):
-        gdaltest.post_reason('layer count wrong.')
-        return 'fail'
+    assert ds.GetLayerCount() == len(layers), 'layer count wrong.'
 
     for i in range(ds.GetLayerCount()):
-        if not ds.GetLayer(i).GetName() in layers:
-            gdaltest.post_reason('Did not get right layers')
-            return 'fail'
+        assert ds.GetLayer(i).GetName() in layers, 'Did not get right layers'
 
     lyr = ds.GetLayerByName('OeREBKRM09trsfr.Transferstruktur.Geometrie')
-    if lyr.GetFeatureCount() != 36:
-        gdaltest.post_reason('feature count wrong.')
-        return 'fail'
+    assert lyr.GetFeatureCount() == 36, 'feature count wrong.'
 
     feat = lyr.GetNextFeature()
 
@@ -1371,10 +1195,7 @@ def test_ogr_interlis2_4():
             return 'fail'
 
     geom_field_values = [None, None, 'CURVEPOLYGON (COMPOUNDCURVE ((658593.928 254957.714,658511.628 254948.614,658418.028 254938.516,658106.426 254913.918,658192.222 254445.914,658771.228 254619.412,659667.232 254699.606,660369.238 254827.202,661016.442 255010.1,661279.644 255090.198,661866.648 255138.094,661784.45 255601.798,661211.146 255432.8,660320.54 255352.806,659523.436 255206.71,658703.528 254966.814,658624.228 254961.014,658593.928 254957.714)))']
-    if feat.GetGeomFieldCount() != len(geom_field_values):
-        gdaltest.post_reason('geom field count wrong.')
-        print(feat.GetGeomFieldCount())
-        return 'fail'
+    assert feat.GetGeomFieldCount() == len(geom_field_values), 'geom field count wrong.'
 
     for i in range(feat.GetGeomFieldCount()):
         geom = feat.GetGeomFieldRef(i)
@@ -1384,9 +1205,8 @@ def test_ogr_interlis2_4():
         else:
             ok = ogrtest.check_feature_geometry(geom, val) == 0
         if not ok:
-            gdaltest.post_reason('geom check failed.')
             print(geom)
-            return 'fail'
+            pytest.fail('geom check failed.')
 
     return 'success'
 
@@ -1409,9 +1229,7 @@ def test_ogr_interlis_arc1():
 
     # Read Area lines
     lyr = ds.GetLayerByName('Bodenbedeckung__BoFlaechen_Form')
-    if lyr.GetFeatureCount() != 4:
-        gdaltest.post_reason('feature count wrong.')
-        return 'fail'
+    assert lyr.GetFeatureCount() == 4, 'feature count wrong.'
 
     # Get 3rd feature
     feat = lyr.GetNextFeature()
@@ -1420,36 +1238,28 @@ def test_ogr_interlis_arc1():
 
     geom = feat.GetGeometryRef()
     length = geom.Length()
-    if abs(length - length_0_1_deg) > 0.001:
-        gdaltest.post_reason('Length() result wrong, got %g.' % length)
-        return 'fail'
+    assert abs(length - length_0_1_deg) <= 0.001, \
+        ('Length() result wrong, got %g.' % length)
     if ogrtest.check_feature_geometry(geom, 'MULTILINESTRING ((186.38 206.82,186.456637039593772 206.352374385077951,186.525513501820711 205.883542875348297,186.586610467027612 205.413634254015022,186.639911152487883 204.942777600139351,186.685400917071064 204.471102253228281,186.72306726518579 203.998737777656032,186.752899850289367 203.525813927088137,186.774890477674461 203.05246060886563,186.789033106731921 202.578807848280093,186.795323852631526 202.104985752892361,186.793760987376999 201.631124476756639,186.784344940257114 201.157354184717377,186.76707829777294 200.683805016597006,186.741965802895692 200.210607051507367,186.709014353764331 199.737890272066551,186.668233001808375 199.265784528717603,186.619632949244959 198.79441950407633,186.563227546008392 198.323924677271833,186.499032286083064 197.854429288403452,186.427064803254297 197.386062303034095,186.347344866240718 196.918952376778151,186.259894373302785 196.453227819933062,186.164737346189185 195.989016562249134,186.06189992355209 195.52644611780849,185.951410353787622 195.065643549954956,185.83329898723602 194.606735436434946,185.70759826788705 194.149847834589281,185.574342724430579 193.695106246756012,185.433568960797828 193.242635585782381,185.285315646106 192.792560140718678,185.129623504006275 192.345003542672174,184.966535301544326 191.900088730850229,184.796095837373258 191.457937918770739,184.618351929457248 191.018672560741805,184.433352402229474 190.582413318443258,184.241148073160701 190.149280027813774,184.04179173881127 189.71939166611989,183.835338160315558 189.292866319286958,183.621844048349857 188.869821149441094,183.401368047569093 188.450372362771276,183.173970720454207 188.03463517752968,182.939714530730242 187.622723792475853,182.698663826158707 187.214751355422749,182.450884820893378 186.810829932226596,182.196445577297681 186.411070475951391,181.935415987201822 186.015582796419011,181.667867752774299 185.624475530035824,181.3938743667604 185.237856109953981,181.113511092327798 184.855830736560137,180.826854942395556 184.478504348306132,180.53398465846837 184.105980592874374,180.234980689005141 183.73836179872157,179.929925167336449 183.375748946964421,179.618901889065427 183.018241643621849,179.301996289112111 182.665938092286495,178.979295418190276 182.318935067130923,178.650887918905909 181.977327886313986,178.316864001440962 181.64121038583832,177.97731541873506 181.310674893720687,177.632335441296135 180.985812204678922,177.282018831589056 180.666711555153569,176.9264618179877 180.353460598817009,176.565762068363227 180.046145382490039,176.200018663221243 179.744850322516839,175.829332068533375 179.449658181561944,175.453804108095909 179.160650045865594,175.073537935597386 178.877905303001143,174.688638006242371 178.601501620054449,174.299210048091453 178.331514922276227,173.905361033015623 178.068019372236421,173.507199147294131 177.811087349466078,173.104833761914023 177.560789430557605,172.698375402513165 177.317194369767066,172.28793571903222 177.080369080176723,171.873627455046488 176.850378615250492,171.455564416777605 176.627286151007837,171.033861441848018 176.411152968667096,170.60863436775486 176.202038437793476,170.18 176.0,140.69 156.63))') != 0:
-        gdaltest.post_reason('Ili curve not correctly read')
         print(geom.ExportToWkt())
-        return 'fail'
+        pytest.fail('Ili curve not correctly read')
     line = geom.GetGeometryRef(0)
     points = line.GetPoints()
-    if len(points) != 81:
-        gdaltest.post_reason('line point count wrong.')
-        return 'fail'
+    assert len(points) == 81, 'line point count wrong.'
 
     # Get 4th feature
     feat = lyr.GetNextFeature()
 
     geom = feat.GetGeometryRef()
     length = geom.Length()
-    if abs(length - 98.0243498288) > 0.001:
-        gdaltest.post_reason('Length() result wrong, got %g.' % length)
-        return 'fail'
+    assert abs(length - 98.0243498288) <= 0.001, \
+        ('Length() result wrong, got %g.' % length)
     if ogrtest.check_feature_geometry(geom, 'MULTILINESTRING ((186.38 206.82,194.26 208.19,194.360118941290381 207.583863387608318,194.450034548441351 206.976129417129414,194.52972141151983 206.366969832830335,194.599157011165488 205.756556781867374,194.658321725044487 205.145062765608571,194.707198833340925 204.532660590913991,194.745774523486006 203.919523321273999,194.774037894087058 203.305824227936654,194.791980957968889 202.691736740889581,194.799598644465704 202.077434399900056,194.796888800832647 201.463090805460496,194.783852192864259 200.848879569690297,194.760492504683469 200.234974267339538,194.72681633767931 199.621548386683543,194.682833208673372 199.00877528050475,194.628555547191326 198.396828117140075,194.56399869197773 197.785879831499159,194.489180886659568 197.176103076206317,194.40412327458759 196.567670172822517,194.308849892848201 195.960753063147394,194.203387665489544 195.355523260601302,194.087766395903571 194.752151801789267,193.962018758407766 194.150809198152245,193.826180289004668 193.55166538777118,193.680289375348337 192.954889687360236,193.524387245874067 192.360650744412823,193.358517958193232 191.769116489536799,193.182728386585921 191.180454089007952,192.997068208809623 190.594829897498101,192.80158989201297 190.012409411123343,192.596348677929171 189.433357220623265,192.381402567276353 188.857836964845745,192.156812303357555 188.28601128455918,191.922641354867636 187.718041776424769,191.678955898001703 187.15408894736899,191.425824797734066 186.594312169210724,191.163319588355051 186.038869633623079,190.891514453251119 185.48791830744446,190.610486203950103 184.941613888295223,190.320314258417028 184.400110760594515,190.021080618593231 183.863561951926357,189.71286984725154 183.332119089784072,189.395769044065645 182.805932358758554,189.069867821024644 182.285150458053948,188.735258277090878 181.769920559469,188.392034972181108 181.260388265836781,188.040294900434645 180.756697569857323,187.680137462819374 180.258990813403187,187.311664439032 179.767408647305245,186.934979958736193 179.282089991582296,186.550190472116782 178.803171996223654,186.157404719844607 178.330790002393741,185.756733702299215 177.865077504182381,185.348290648216761 177.406166110929888,184.932190982704896 176.954185509959615,184.508552294610098 176.50926343000171,184.077494303273824 176.071525605046162,183.639138824742957 175.641095738836128,183.193609737303603 175.218095469892404,182.741032946476452 174.802644337149076,182.281536349473726 174.394859746185801,181.815249799001293 173.994856936020341,181.34230506662422 173.60274894655592,180.86283580545566 173.21864658665433,180.376977512460115 172.84265840277655,179.884867490109144 172.47489064835824,179.38664480760778 172.115447253752762,178.882450261575258 171.764429796865414,178.372426336281904 171.421937474442501,177.856717163354887 171.08806707407345,177.335468481061952 170.762912946782279,176.808827593129507 170.446566980404867,176.276943327102316 170.13911857360651,175.739965992295737 169.840654610641622,175.198047337304331 169.551259436742839,174.651340507162928 169.271014834364934,174.1 169.0,145.08 149.94,140.69 156.63))') != 0:
-        gdaltest.post_reason('Ili curve not correctly read')
         print(geom.ExportToWkt())
-        return 'fail'
+        pytest.fail('Ili curve not correctly read')
     line = geom.GetGeometryRef(0)
     points = line.GetPoints()
-    if len(points) != 81:
-        gdaltest.post_reason('line point count wrong.')
-        return 'fail'
+    assert len(points) == 81, 'line point count wrong.'
 
     return 'success'
 
@@ -1465,17 +1275,12 @@ def test_ogr_interlis_arc2():
     ds = ogr.Open('data/ili/Beispiel.itf,data/ili/Beispiel.imd')
 
     lyr = ds.GetLayerByName('Bodenbedeckung__Strasse')
-    if lyr.GetFeatureCount() != 1:
-        gdaltest.post_reason('feature count wrong.')
-        return 'fail'
+    assert lyr.GetFeatureCount() == 1, 'feature count wrong.'
 
     feat = lyr.GetNextFeature()
     geom_field_values = ['MULTICURVE (COMPOUNDCURVE (CIRCULARSTRING (190.26 208.0,187 186,173.1 171.0),(173.1 171.0,141.08 152.94)))']
 
-    if feat.GetGeomFieldCount() != len(geom_field_values):
-        gdaltest.post_reason('geom field count wrong.')
-        print(feat.GetGeomFieldCount())
-        return 'fail'
+    assert feat.GetGeomFieldCount() == len(geom_field_values), 'geom field count wrong.'
 
     for i in range(feat.GetGeomFieldCount()):
         geom = feat.GetGeomFieldRef(i)
diff --git a/autotest/ogr/ogr_index_test.py b/autotest/ogr/ogr_index_test.py
index 3d6e96d22afb..49c45b257fed 100755
--- a/autotest/ogr/ogr_index_test.py
+++ b/autotest/ogr/ogr_index_test.py
@@ -98,9 +98,7 @@ def test_ogr_index_2():
     for i in range(20):
         ogrtest.quick_create_feature(gdaltest.s_lyr, [i, 'Value ' + str(i)], None)
 
-    if gdaltest.s_lyr.GetFeatureCount() != 20:
-        gdaltest.post_reason('FeatureCount wrong')
-        return 'fail'
+    assert gdaltest.s_lyr.GetFeatureCount() == 20, 'FeatureCount wrong'
 
     gdaltest.s_ds.Release()
     gdaltest.s_lyr = None
@@ -223,8 +221,7 @@ def test_ogr_index_9():
     expect = ['Value 5']
 
     tr = ogrtest.check_features_against_list(gdaltest.s_lyr, 'VALUE', expect)
-    if not tr:
-        return 'fail'
+    assert tr
 
     gdaltest.s_ds.Release()
 
@@ -253,10 +250,7 @@ def test_ogr_index_9():
     f = open('join_t.idm', 'rt')
     xml = f.read()
     f.close()
-    if xml.find('VALUE') == -1:
-        gdaltest.post_reason('VALUE column is not indexed (1)')
-        print(xml)
-        return 'fail'
+    assert xml.find('VALUE') != -1, 'VALUE column is not indexed (1)'
 
     # Close the dataset and re-open
     gdaltest.s_ds = ogr.OpenShared('join_t.dbf', update=1)
@@ -269,14 +263,8 @@ def test_ogr_index_9():
     f = open('join_t.idm', 'rt')
     xml = f.read()
     f.close()
-    if xml.find('VALUE') == -1:
-        gdaltest.post_reason('VALUE column is not indexed (2)')
-        print(xml)
-        return 'fail'
-    if xml.find('SKEY') == -1:
-        gdaltest.post_reason('SKEY column is not indexed (2)')
-        print(xml)
-        return 'fail'
+    assert xml.find('VALUE') != -1, 'VALUE column is not indexed (2)'
+    assert xml.find('SKEY') != -1, 'SKEY column is not indexed (2)'
 
     return 'success'
 
@@ -303,104 +291,87 @@ def test_ogr_index_10():
     lyr.SetAttributeFilter('intfield IN (1)')
     lyr.ResetReading()
     feat = lyr.GetNextFeature()
-    if feat is None:
-        return 'fail'
+    assert feat is not None
 
     lyr.SetAttributeFilter('intfield = 1')
     lyr.ResetReading()
     feat = lyr.GetNextFeature()
-    if feat is None:
-        return 'fail'
+    assert feat is not None
 
     lyr.SetAttributeFilter('intfield IN (2)')
     lyr.ResetReading()
     feat = lyr.GetNextFeature()
-    if feat is not None:
-        return 'fail'
+    assert feat is None
 
     lyr.SetAttributeFilter('intfield IN (1.0)')
     lyr.ResetReading()
     feat = lyr.GetNextFeature()
-    if feat is None:
-        return 'fail'
+    assert feat is not None
 
     lyr.SetAttributeFilter('intfield = 1.0')
     lyr.ResetReading()
     feat = lyr.GetNextFeature()
-    if feat is None:
-        return 'fail'
+    assert feat is not None
 
     lyr.SetAttributeFilter('intfield IN (1.1)')
     lyr.ResetReading()
     feat = lyr.GetNextFeature()
-    if feat is not None:
-        return 'fail'
+    assert feat is None
 
     lyr.SetAttributeFilter("intfield IN ('1')")
     lyr.ResetReading()
     feat = lyr.GetNextFeature()
-    if feat is None:
-        return 'fail'
+    assert feat is not None
 
     lyr.SetAttributeFilter('realfield IN (1.0)')
     lyr.ResetReading()
     feat = lyr.GetNextFeature()
-    if feat is None:
-        return 'fail'
+    assert feat is not None
 
     lyr.SetAttributeFilter('realfield = 1.0')
     lyr.ResetReading()
     feat = lyr.GetNextFeature()
-    if feat is None:
-        return 'fail'
+    assert feat is not None
 
     lyr.SetAttributeFilter('realfield IN (1.1)')
     lyr.ResetReading()
     feat = lyr.GetNextFeature()
-    if feat is not None:
-        return 'fail'
+    assert feat is None
 
     lyr.SetAttributeFilter('realfield IN (1)')
     lyr.ResetReading()
     feat = lyr.GetNextFeature()
-    if feat is None:
-        return 'fail'
+    assert feat is not None
 
     lyr.SetAttributeFilter('realfield = 1')
     lyr.ResetReading()
     feat = lyr.GetNextFeature()
-    if feat is None:
-        return 'fail'
+    assert feat is not None
 
     lyr.SetAttributeFilter('realfield IN (2)')
     lyr.ResetReading()
     feat = lyr.GetNextFeature()
-    if feat is not None:
-        return 'fail'
+    assert feat is None
 
     lyr.SetAttributeFilter("realfield IN ('1')")
     lyr.ResetReading()
     feat = lyr.GetNextFeature()
-    if feat is None:
-        return 'fail'
+    assert feat is not None
 
     lyr.SetAttributeFilter("strfield IN ('foo')")
     lyr.ResetReading()
     feat = lyr.GetNextFeature()
-    if feat is None:
-        return 'fail'
+    assert feat is not None
 
     lyr.SetAttributeFilter("strfield = 'foo'")
     lyr.ResetReading()
     feat = lyr.GetNextFeature()
-    if feat is None:
-        return 'fail'
+    assert feat is not None
 
     lyr.SetAttributeFilter("strfield IN ('bar')")
     lyr.ResetReading()
     feat = lyr.GetNextFeature()
-    if feat is not None:
-        return 'fail'
+    assert feat is None
 
     ds = None
 
@@ -415,10 +386,8 @@ def ogr_index_11_check(lyr, expected_fids):
     lyr.ResetReading()
     for expected_fid in expected_fids:
         feat = lyr.GetNextFeature()
-        if feat is None:
-            return 'fail'
-        if feat.GetFID() != expected_fid:
-            return 'fail'
+        assert feat is not None
+        assert feat.GetFID() == expected_fid
 
     return 'success'
 
diff --git a/autotest/ogr/ogr_ingres.py b/autotest/ogr/ogr_ingres.py
index f3cd42e71198..51f68d676f5c 100755
--- a/autotest/ogr/ogr_ingres.py
+++ b/autotest/ogr/ogr_ingres.py
@@ -117,14 +117,12 @@ def test_ogr_ingres_3():
         orig_feat = gdaltest.poly_feat[i]
         read_feat = gdaltest.ingres_lyr.GetNextFeature()
 
-        if ogrtest.check_feature_geometry(read_feat, orig_feat.GetGeometryRef(),
-                                          max_error=0.000000001) != 0:
-            return 'fail'
+        assert (ogrtest.check_feature_geometry(read_feat, orig_feat.GetGeometryRef(),
+                                          max_error=0.000000001) == 0)
 
         for fld in range(3):
-            if orig_feat.GetField(fld) != read_feat.GetField(fld):
-                gdaltest.post_reason('Attribute %d does not match' % fld)
-                return 'fail'
+            assert orig_feat.GetField(fld) == read_feat.GetField(fld), \
+                ('Attribute %d does not match' % fld)
 
     gdaltest.poly_feat = None
     gdaltest.shp_ds.Destroy()
@@ -224,18 +222,14 @@ def test_ogr_ingres_7():
     result = gdaltest.ingres_lyr.CreateField(field_defn)
     field_defn.Destroy()
 
-    if result is not 0:
-        gdaltest.post_reason('CreateField failed!')
-        return 'fail'
+    assert result is 0, 'CreateField failed!'
 
     ####################################################################
     # Apply a value to this field in one feature.
 
     gdaltest.ingres_lyr.SetAttributeFilter("prfedea = '35043423'")
     feat_read = gdaltest.ingres_lyr.GetNextFeature()
-    if feat_read is None:
-        gdaltest.post_reason('failed to read target feature!')
-        return 'fail'
+    assert feat_read is not None, 'failed to read target feature!'
 
     gdaltest.ingres_fid = feat_read.GetFID()
 
@@ -265,9 +259,8 @@ def test_ogr_ingres_8():
     if gdaltest.ingres_ds is None:
         return 'skip'
 
-    if not gdaltest.ingres_lyr.TestCapability('DeleteFeature'):
-        gdaltest.post_reason('DeleteFeature capability test failed.')
-        return 'fail'
+    assert gdaltest.ingres_lyr.TestCapability('DeleteFeature'), \
+        'DeleteFeature capability test failed.'
 
     old_count = gdaltest.ingres_lyr.GetFeatureCount()
 
@@ -275,9 +268,8 @@ def test_ogr_ingres_8():
     # Delete target feature.
 
     target_fid = gdaltest.ingres_fid
-    if gdaltest.ingres_lyr.DeleteFeature(target_fid) != 0:
-        gdaltest.post_reason('DeleteFeature returned error code.')
-        return 'fail'
+    assert gdaltest.ingres_lyr.DeleteFeature(target_fid) == 0, \
+        'DeleteFeature returned error code.'
 
     ####################################################################
     # Verify that count has dropped by one, and that the feature in question
@@ -287,9 +279,7 @@ def test_ogr_ingres_8():
         gdaltest.post_reason('got feature count of %d, not expected %d.'
                              % (new_count, old_count - 1))
 
-    if gdaltest.ingres_lyr.GetFeature(target_fid) is not None:
-        gdaltest.post_reason('Got deleted feature!')
-        return 'fail'
+    assert gdaltest.ingres_lyr.GetFeature(target_fid) is None, 'Got deleted feature!'
 
     return 'success'
 
diff --git a/autotest/ogr/ogr_jml.py b/autotest/ogr/ogr_jml.py
index 916dbed55147..0628e1eb44e0 100755
--- a/autotest/ogr/ogr_jml.py
+++ b/autotest/ogr/ogr_jml.py
@@ -60,14 +60,10 @@ def test_ogr_jml_1():
         return 'skip'
 
     ds = ogr.Open('data/test.jml')
-    if ds.GetLayerCount() != 1:
-        return 'fail'
-    if ds.GetLayer(1) is not None:
-        return 'fail'
-    if ds.TestCapability(ogr.ODsCCreateLayer) != 0:
-        return 'fail'
-    if ds.TestCapability(ogr.ODsCDeleteLayer) != 0:
-        return 'fail'
+    assert ds.GetLayerCount() == 1
+    assert ds.GetLayer(1) is None
+    assert ds.TestCapability(ogr.ODsCCreateLayer) == 0
+    assert ds.TestCapability(ogr.ODsCDeleteLayer) == 0
     lyr = ds.GetLayer(0)
     fields = [('first_property', ogr.OFTString),
               ('another_property', ogr.OFTString),
@@ -80,13 +76,10 @@ def test_ogr_jml_1():
               ('datetime', ogr.OFTDateTime),
               ('R_G_B', ogr.OFTString),
               ('not_ignored', ogr.OFTString)]
-    if lyr.GetLayerDefn().GetFieldCount() != len(fields):
-        return 'fail'
+    assert lyr.GetLayerDefn().GetFieldCount() == len(fields)
     for i, field in enumerate(fields):
         field_defn = lyr.GetLayerDefn().GetFieldDefn(i)
-        if field_defn.GetName() != field[0] or field_defn.GetType() != field[1]:
-            print(i)
-            return 'fail'
+        assert field_defn.GetName() == field[0] and field_defn.GetType() == field[1], i
     feat = lyr.GetNextFeature()
     if feat.GetField('first_property') != 'even' or \
        feat.GetField('another_property') != 'rouault' or \
@@ -142,7 +135,7 @@ def test_ogr_jml_2():
     data = gdal.VSIFReadL(1, 1000, f).decode('ascii')
     gdal.VSIFCloseL(f)
 
-    if data != """<?xml version='1.0' encoding='UTF-8'?>
+    assert data == """<?xml version='1.0' encoding='UTF-8'?>
 <JCSDataFile xmlns:gml="http://www.opengis.net/gml" xmlns:xsi="http://www.w3.org/2000/10/XMLSchema-instance" >
 <JCSGMLInputTemplate>
 <CollectionElement>featureCollection</CollectionElement>
@@ -160,9 +153,7 @@ def test_ogr_jml_2():
   </gml:boundedBy>
 </featureCollection>
 </JCSDataFile>
-""":
-        print(data)
-        return 'fail'
+"""
 
     gdal.Unlink('/vsimem/ogr_jml.jml')
 
@@ -181,23 +172,17 @@ def test_ogr_jml_2():
     with gdaltest.error_handler():
         lyr.CreateField(ogr.FieldDefn('time_as_str', ogr.OFTTime))
 
-    if lyr.TestCapability(ogr.OLCCreateField) != 1:
-        return 'fail'
-    if lyr.TestCapability(ogr.OLCSequentialWrite) != 1:
-        return 'fail'
-    if lyr.TestCapability(ogr.OLCRandomWrite) != 0:
-        return 'fail'
-    if lyr.TestCapability(ogr.OLCStringsAsUTF8) != 1:
-        return 'fail'
+    assert lyr.TestCapability(ogr.OLCCreateField) == 1
+    assert lyr.TestCapability(ogr.OLCSequentialWrite) == 1
+    assert lyr.TestCapability(ogr.OLCRandomWrite) == 0
+    assert lyr.TestCapability(ogr.OLCStringsAsUTF8) == 1
 
     # empty feature
     f = ogr.Feature(lyr.GetLayerDefn())
     lyr.CreateFeature(f)
 
-    if lyr.TestCapability(ogr.OLCCreateField) != 0:
-        return 'fail'
-    if lyr.CreateField(ogr.FieldDefn('that_wont_work')) == 0:
-        return 'fail'
+    assert lyr.TestCapability(ogr.OLCCreateField) == 0
+    assert lyr.CreateField(ogr.FieldDefn('that_wont_work')) != 0
 
     f = ogr.Feature(lyr.GetLayerDefn())
     f.SetField('str', 'fo<o')
@@ -222,7 +207,7 @@ def test_ogr_jml_2():
     data = gdal.VSIFReadL(1, 10000, f).decode('ascii')
     gdal.VSIFCloseL(f)
 
-    if data != """<?xml version='1.0' encoding='UTF-8'?>
+    assert data == """<?xml version='1.0' encoding='UTF-8'?>
 <JCSDataFile xmlns:gml="http://www.opengis.net/gml" xmlns:xsi="http://www.w3.org/2000/10/XMLSchema-instance" >
 <JCSGMLInputTemplate>
 <CollectionElement>featureCollection</CollectionElement>
@@ -327,9 +312,7 @@ def test_ogr_jml_2():
      </feature>
 </featureCollection>
 </JCSDataFile>
-""":
-        print(data)
-        return 'fail'
+"""
 
     gdal.Unlink('/vsimem/ogr_jml.jml')
 
@@ -354,9 +337,7 @@ def test_ogr_jml_2():
     data = gdal.VSIFReadL(1, 10000, f).decode('ascii')
     gdal.VSIFCloseL(f)
 
-    if data.find('112233') < 0 or data.find('445566') < 0:
-        print(data)
-        return 'fail'
+    assert data.find('112233') >= 0 and data.find('445566') >= 0
 
     gdal.Unlink('/vsimem/ogr_jml.jml')
 
@@ -372,9 +353,7 @@ def test_ogr_jml_2():
     data = gdal.VSIFReadL(1, 10000, f).decode('ascii')
     gdal.VSIFCloseL(f)
 
-    if data.find('R_G_B') >= 0:
-        print(data)
-        return 'fail'
+    assert data.find('R_G_B') < 0
 
     gdal.Unlink('/vsimem/ogr_jml.jml')
 
@@ -391,9 +370,7 @@ def test_ogr_jml_2():
     data = gdal.VSIFReadL(1, 10000, f).decode('ascii')
     gdal.VSIFCloseL(f)
 
-    if data.find('OGR_STYLE') < 0 or data.find('PEN(c:#445566)') < 0:
-        print(data)
-        return 'fail'
+    assert data.find('OGR_STYLE') >= 0 and data.find('PEN(c:#445566)') >= 0
 
     gdal.Unlink('/vsimem/ogr_jml.jml')
 
@@ -412,9 +389,7 @@ def test_ogr_jml_2():
     data = gdal.VSIFReadL(1, 10000, f).decode('ascii')
     gdal.VSIFCloseL(f)
 
-    if data.find('OGR_STYLE') < 0 or data.find('PEN(c:#445566)') < 0 or data.find('112233') < 0:
-        print(data)
-        return 'fail'
+    assert data.find('OGR_STYLE') >= 0 and data.find('PEN(c:#445566)') >= 0 and data.find('112233') >= 0
 
     gdal.Unlink('/vsimem/ogr_jml.jml')
 
@@ -435,9 +410,7 @@ def test_ogr_jml_3():
 
     ret = gdaltest.runexternal(test_cli_utilities.get_test_ogrsf_path() + ' -ro data/test.jml')
 
-    if ret.find('INFO') == -1 or ret.find('ERROR') != -1:
-        print(ret)
-        return 'fail'
+    assert ret.find('INFO') != -1 and ret.find('ERROR') == -1
 
     return 'success'
 
@@ -469,8 +442,7 @@ def test_ogr_jml_4():
     gdal.PushErrorHandler('CPLQuietErrorHandler')
     lyr.GetLayerDefn()
     gdal.PopErrorHandler()
-    if gdal.GetLastErrorType() == 0:
-        return 'fail'
+    assert gdal.GetLastErrorType() != 0
     ds = None
 
     # XML malformed in JCSGMLInputTemplate
@@ -492,8 +464,7 @@ def test_ogr_jml_4():
     gdal.PushErrorHandler('CPLQuietErrorHandler')
     lyr.GetLayerDefn()
     gdal.PopErrorHandler()
-    if gdal.GetLastErrorType() == 0:
-        return 'fail'
+    assert gdal.GetLastErrorType() != 0
     ds = None
 
     # XML malformed in featureCollection
@@ -521,8 +492,7 @@ def test_ogr_jml_4():
     gdal.PushErrorHandler('CPLQuietErrorHandler')
     lyr.GetLayerDefn().GetFieldCount()
     gdal.PopErrorHandler()
-    if gdal.GetLastErrorType() == 0:
-        return 'fail'
+    assert gdal.GetLastErrorType() != 0
     ds = None
 
     # XML malformed in featureCollection
@@ -551,8 +521,7 @@ def test_ogr_jml_4():
     gdal.PushErrorHandler('CPLQuietErrorHandler')
     lyr.GetLayerDefn().GetFieldCount()
     gdal.PopErrorHandler()
-    if gdal.GetLastErrorType() == 0:
-        return 'fail'
+    assert gdal.GetLastErrorType() != 0
     del ds
 
     # Invalid column definitions
@@ -620,8 +589,7 @@ def test_ogr_jml_4():
 
     ds = ogr.Open('/vsimem/ogr_jml.jml')
     lyr = ds.GetLayer(0)
-    if lyr.GetLayerDefn().GetFieldCount() != 0:
-        return 'fail'
+    assert lyr.GetLayerDefn().GetFieldCount() == 0
     lyr.GetNextFeature()
     ds = None
 
@@ -638,11 +606,9 @@ def test_ogr_jml_read_srs():
 
     ds = ogr.Open('data/one_point_srid_4326.jml')
     lyr = ds.GetLayer(0)
-    if lyr.GetSpatialRef().ExportToWkt().find('4326') < 0:
-        return 'fail'
+    assert lyr.GetSpatialRef().ExportToWkt().find('4326') >= 0
     f = lyr.GetNextFeature()
-    if f.GetGeometryRef() is None:
-        return 'fail'
+    assert f.GetGeometryRef() is not None
 
     return 'success'
 
diff --git a/autotest/ogr/ogr_join_test.py b/autotest/ogr/ogr_join_test.py
index 7dceca704427..4c4564c54c08 100755
--- a/autotest/ogr/ogr_join_test.py
+++ b/autotest/ogr/ogr_join_test.py
@@ -46,9 +46,8 @@ def test_ogr_join_1():
         'SELECT * FROM poly LEFT JOIN idlink ON poly.eas_id = idlink.eas_id')
 
     count = sql_lyr.GetFeatureCount()
-    if count != 10:
-        gdaltest.post_reason('Got wrong count with GetFeatureCount() - %d, expecting 10' % count)
-        return 'fail'
+    assert count == 10, \
+        ('Got wrong count with GetFeatureCount() - %d, expecting 10' % count)
 
     gdaltest.ds.ReleaseResultSet(sql_lyr)
 
@@ -253,9 +252,8 @@ def test_ogr_join_12():
         "SELECT * FROM poly LEFT JOIN 'data/idlink.dbf'.idlink ON poly.eas_id = idlink.eas_id")
 
     count = sql_lyr.GetFeatureCount()
-    if count != 10:
-        gdaltest.post_reason('Got wrong count with GetFeatureCount() - %d, expecting 10' % count)
-        return 'fail'
+    assert count == 10, \
+        ('Got wrong count with GetFeatureCount() - %d, expecting 10' % count)
 
     ds.ReleaseResultSet(sql_lyr)
 
@@ -329,13 +327,9 @@ def test_ogr_join_15():
     gdal.Unlink('/vsimem/ogr_join_14/third.csv')
     gdal.Unlink('/vsimem/ogr_join_14')
 
-    if val1 != 'c2':
-        print(val1)
-        return 'fail'
+    assert val1 == 'c2'
 
-    if val2 != 'c2':
-        print(val2)
-        return 'fail'
+    assert val2 == 'c2'
 
     return 'success'
 
@@ -353,8 +347,7 @@ def test_ogr_join_16():
         'WHERE idlink.name = \'_165\'')
     gdal.PopErrorHandler()
 
-    if gdal.GetLastErrorMsg().find('Cannot use field') != 0:
-        return 'fail'
+    assert gdal.GetLastErrorMsg().find('Cannot use field') == 0
 
     if sql_lyr is None:
         return 'success'
@@ -374,9 +367,7 @@ def test_ogr_join_17():
         'ORDER BY name')
     gdal.PopErrorHandler()
 
-    if gdal.GetLastErrorMsg().find('Cannot use field') != 0:
-        print(gdal.GetLastErrorMsg())
-        return 'fail'
+    assert gdal.GetLastErrorMsg().find('Cannot use field') == 0
 
     if sql_lyr is None:
         return 'success'
@@ -392,9 +383,8 @@ def test_ogr_join_18():
         'SELECT * FROM poly LEFT JOIN idlink ON idlink.eas_id = poly.eas_id')
 
     count = sql_lyr.GetFeatureCount()
-    if count != 10:
-        gdaltest.post_reason('Got wrong count with GetFeatureCount() - %d, expecting 10' % count)
-        return 'fail'
+    assert count == 10, \
+        ('Got wrong count with GetFeatureCount() - %d, expecting 10' % count)
 
     gdaltest.ds.ReleaseResultSet(sql_lyr)
 
@@ -412,9 +402,7 @@ def test_ogr_join_19():
         'SELECT * FROM poly LEFT JOIN idlink ON poly.foo = idlink.eas_id')
     gdal.PopErrorHandler()
 
-    if gdal.GetLastErrorMsg().find('"poly"."foo" not recognised as an available field') != 0:
-        print(gdal.GetLastErrorMsg())
-        return 'fail'
+    assert gdal.GetLastErrorMsg().find('"poly"."foo" not recognised as an available field') == 0
 
     if sql_lyr is None:
         return 'success'
@@ -432,9 +420,7 @@ def test_ogr_join_20():
         'SELECT * FROM poly LEFT JOIN idlink ON poly.eas_id = idlink.foo')
     gdal.PopErrorHandler()
 
-    if gdal.GetLastErrorMsg().find('"idlink"."foo" not recognised as an available field') != 0:
-        print(gdal.GetLastErrorMsg())
-        return 'fail'
+    assert gdal.GetLastErrorMsg().find('"idlink"."foo" not recognised as an available field') == 0
 
     if sql_lyr is None:
         return 'success'
@@ -454,9 +440,7 @@ def test_ogr_join_21():
         'LEFT JOIN idlink il2 ON p.eas_id = il2.eas_id')
     gdal.PopErrorHandler()
 
-    if gdal.GetLastErrorMsg().find('Field il2.eas_id in JOIN clause does not correspond to the primary table nor the joint (secondary) table') != 0:
-        print(gdal.GetLastErrorMsg())
-        return 'fail'
+    assert gdal.GetLastErrorMsg().find('Field il2.eas_id in JOIN clause does not correspond to the primary table nor the joint (secondary) table') == 0
 
     if sql_lyr is None:
         return 'success'
@@ -486,9 +470,7 @@ def test_ogr_join_22():
 
     ds = None
 
-    if val != '2':
-        print(val)
-        return 'fail'
+    assert val == '2'
 
     return 'success'
 
diff --git a/autotest/ogr/ogr_kml.py b/autotest/ogr/ogr_kml.py
index 67c2694e4547..d2947f3c1e4c 100755
--- a/autotest/ogr/ogr_kml.py
+++ b/autotest/ogr/ogr_kml.py
@@ -39,6 +39,7 @@
 from osgeo import ogr
 from osgeo import osr
 from osgeo import gdal
+import pytest
 
 ###############################################################################
 # Test basic open operation for KML datastore.
@@ -70,9 +71,7 @@ def test_ogr_kml_datastore():
     if not ogrtest.have_read_kml:
         return 'skip'
 
-    if ogrtest.kml_ds.GetLayerCount() != 6:
-        gdaltest.post_reason('wrong number of layers')
-        return 'fail'
+    assert ogrtest.kml_ds.GetLayerCount() == 6, 'wrong number of layers'
 
     return 'success'
 
@@ -86,49 +85,34 @@ def test_ogr_kml_attributes_1():
     if not ogrtest.have_read_kml:
         return 'skip'
 
-    if ogrtest.kml_ds is None:
-        gdaltest.post_reason('kml_ds is none')
-        return 'fail'
+    assert ogrtest.kml_ds is not None, 'kml_ds is none'
 
     lyr = ogrtest.kml_ds.GetLayerByName('Placemarks')
     feat = lyr.GetNextFeature()
 
-    if feat.GetField('Name') != 'Simple placemark':
-        gdaltest.post_reason('Wrong name field value')
-        return 'fail'
+    assert feat.GetField('Name') == 'Simple placemark', 'Wrong name field value'
 
     if feat.GetField('description')[:23] != 'Attached to the ground.':
-        gdaltest.post_reason('Wrong description field value')
         print('got: ', feat.GetField('description')[:23])
-        return 'fail'
+        pytest.fail('Wrong description field value')
 
     feat = lyr.GetNextFeature()
-    if feat is None:
-        gdaltest.post_reason('expected feature not found.')
-        return 'fail'
+    assert feat is not None, 'expected feature not found.'
 
-    if feat.GetField('Name') != 'Floating placemark':
-        gdaltest.post_reason('Wrong name field value')
-        return 'fail'
+    assert feat.GetField('Name') == 'Floating placemark', 'Wrong name field value'
 
     if feat.GetField('description')[:25] != 'Floats a defined distance':
-        gdaltest.post_reason('Wrong description field value')
         print('got: ', feat.GetField('description')[:25])
-        return 'fail'
+        pytest.fail('Wrong description field value')
 
     feat = lyr.GetNextFeature()
-    if feat is None:
-        gdaltest.post_reason('expected feature not found.')
-        return 'fail'
+    assert feat is not None, 'expected feature not found.'
 
-    if feat.GetField('Name') != 'Extruded placemark':
-        gdaltest.post_reason('Wrong name field value')
-        return 'fail'
+    assert feat.GetField('Name') == 'Extruded placemark', 'Wrong name field value'
 
     if feat.GetField('description') != 'Tethered to the ground by a customizable \"tail\"':
-        gdaltest.post_reason('Wrong description field value')
         print('got: ', feat.GetField('description'))
-        return 'fail'
+        pytest.fail('Wrong description field value')
 
     return 'success'
 
@@ -142,25 +126,17 @@ def test_ogr_kml_attributes_2():
     if not ogrtest.have_read_kml:
         return 'skip'
 
-    if ogrtest.kml_ds is None:
-        gdaltest.post_reason('kml_ds is none')
-        return 'fail'
+    assert ogrtest.kml_ds is not None, 'kml_ds is none'
 
     lyr = ogrtest.kml_ds.GetLayerByName('Highlighted Icon')
     feat = lyr.GetNextFeature()
 
-    if feat.GetField('Name') != 'Roll over this icon':
-        gdaltest.post_reason('Wrong name field value')
-        return 'fail'
+    assert feat.GetField('Name') == 'Roll over this icon', 'Wrong name field value'
 
-    if feat.GetField('description') != '':
-        gdaltest.post_reason('Wrong description field value')
-        return 'fail'
+    assert feat.GetField('description') == '', 'Wrong description field value'
 
     feat = lyr.GetNextFeature()
-    if feat is not None:
-        gdaltest.post_reason('unexpected feature found.')
-        return 'fail'
+    assert feat is None, 'unexpected feature found.'
 
     return 'success'
 
@@ -174,38 +150,26 @@ def test_ogr_kml_attributes_3():
     if not ogrtest.have_read_kml:
         return 'skip'
 
-    if ogrtest.kml_ds is None:
-        gdaltest.post_reason('kml_ds is none')
-        return 'fail'
+    assert ogrtest.kml_ds is not None, 'kml_ds is none'
 
     lyr = ogrtest.kml_ds.GetLayerByName('Paths')
     feat = lyr.GetNextFeature()
 
-    if feat.GetField('Name') != 'Tessellated':
-        gdaltest.post_reason('Wrong name field value')
-        return 'fail'
+    assert feat.GetField('Name') == 'Tessellated', 'Wrong name field value'
 
-    if feat.GetField('description') != 'If the <tessellate> tag has a value of 1, the line will contour to the underlying terrain':
-        gdaltest.post_reason('Wrong description field value')
-        return 'fail'
+    assert feat.GetField('description') == 'If the <tessellate> tag has a value of 1, the line will contour to the underlying terrain', \
+        'Wrong description field value'
 
     feat = lyr.GetNextFeature()
-    if feat is None:
-        gdaltest.post_reason('expected feature not found.')
-        return 'fail'
+    assert feat is not None, 'expected feature not found.'
 
-    if feat.GetField('Name') != 'Untessellated':
-        gdaltest.post_reason('Wrong name field value')
-        return 'fail'
+    assert feat.GetField('Name') == 'Untessellated', 'Wrong name field value'
 
-    if feat.GetField('description') != 'If the <tessellate> tag has a value of 0, the line follow a simple straight-line path from point to point':
-        gdaltest.post_reason('Wrong description field value')
-        return 'fail'
+    assert feat.GetField('description') == 'If the <tessellate> tag has a value of 0, the line follow a simple straight-line path from point to point', \
+        'Wrong description field value'
 
     feat = lyr.GetNextFeature()
-    if feat is None:
-        gdaltest.post_reason('expected feature not found.')
-        return 'fail'
+    assert feat is not None, 'expected feature not found.'
 
     return 'success'
 
@@ -219,9 +183,7 @@ def test_ogr_kml_attributes_4():
     if not ogrtest.have_read_kml:
         return 'skip'
 
-    if ogrtest.kml_ds is None:
-        gdaltest.post_reason('kml_ds is none')
-        return 'fail'
+    assert ogrtest.kml_ds is not None, 'kml_ds is none'
 
     lyr = ogrtest.kml_ds.GetLayerByName('Google Campus')
     feat = lyr.GetNextFeature()
@@ -230,13 +192,10 @@ def test_ogr_kml_attributes_4():
     while feat is not None:
         name = 'Building %d' % i
         if feat.GetField('Name') != name:
-            gdaltest.post_reason('Wrong name field value')
             print('Got: "%s"' % feat.GetField('name'))
-            return 'fail'
+            pytest.fail('Wrong name field value')
 
-        if feat.GetField('description') != '':
-            gdaltest.post_reason('Wrong description field value')
-            return 'fail'
+        assert feat.GetField('description') == '', 'Wrong description field value'
 
         i = i + 1
         feat = lyr.GetNextFeature()
@@ -253,9 +212,7 @@ def test_ogr_kml_point_read():
     if not ogrtest.have_read_kml:
         return 'skip'
 
-    if ogrtest.kml_ds is None:
-        gdaltest.post_reason('kml_ds is none')
-        return 'fail'
+    assert ogrtest.kml_ds is not None, 'kml_ds is none'
 
     lyr = ogrtest.kml_ds.GetLayerByName('Placemarks')
     lyr.ResetReading()
@@ -263,28 +220,21 @@ def test_ogr_kml_point_read():
 
     wkt = 'POINT(-122.0822035425683 37.42228990140251)'
 
-    if ogrtest.check_feature_geometry(feat, wkt):
-        return 'fail'
+    assert not ogrtest.check_feature_geometry(feat, wkt)
 
     feat = lyr.GetNextFeature()
-    if feat is None:
-        gdaltest.post_reason('expected feature not found.')
-        return 'fail'
+    assert feat is not None, 'expected feature not found.'
 
     wkt = 'POINT(-122.084075 37.4220033612141 50)'
 
-    if ogrtest.check_feature_geometry(feat, wkt):
-        return 'fail'
+    assert not ogrtest.check_feature_geometry(feat, wkt)
 
     feat = lyr.GetNextFeature()
-    if feat is None:
-        gdaltest.post_reason('expected feature not found.')
-        return 'fail'
+    assert feat is not None, 'expected feature not found.'
 
     wkt = 'POINT(-122.0857667006183 37.42156927867553 50)'
 
-    if ogrtest.check_feature_geometry(feat, wkt):
-        return 'fail'
+    assert not ogrtest.check_feature_geometry(feat, wkt)
 
     return 'success'
 
@@ -298,35 +248,26 @@ def test_ogr_kml_linestring_read():
     if not ogrtest.have_read_kml:
         return 'skip'
 
-    if ogrtest.kml_ds is None:
-        gdaltest.post_reason('kml_ds is none')
-        return 'fail'
+    assert ogrtest.kml_ds is not None, 'kml_ds is none'
 
     lyr = ogrtest.kml_ds.GetLayerByName('Paths')
     lyr.ResetReading()
     feat = lyr.GetNextFeature()
 
     wkt = 'LINESTRING (-112.081423783034495 36.106778704771372 0, -112.087026775269294 36.0905099328766 0)'
-    if ogrtest.check_feature_geometry(feat, wkt):
-        return 'fail'
+    assert not ogrtest.check_feature_geometry(feat, wkt)
 
     feat = lyr.GetNextFeature()
-    if feat is None:
-        gdaltest.post_reason('expected feature not found.')
-        return 'fail'
+    assert feat is not None, 'expected feature not found.'
 
     wkt = 'LINESTRING (-112.080622229594994 36.106734600079953 0,-112.085242575314993 36.090495986124218 0)'
-    if ogrtest.check_feature_geometry(feat, wkt):
-        return 'fail'
+    assert not ogrtest.check_feature_geometry(feat, wkt)
 
     feat = lyr.GetNextFeature()
-    if feat is None:
-        gdaltest.post_reason('expected feature not found.')
-        return 'fail'
+    assert feat is not None, 'expected feature not found.'
 
     wkt = 'LINESTRING (-112.265654928602004 36.094476726025462 2357,-112.266038452823807 36.093426088386707 2357,-112.266813901345301 36.092510587768807 2357,-112.267782683444494 36.091898273579957 2357,-112.268855751095202 36.091313794118697 2357,-112.269481071721899 36.090367720752099 2357,-112.269526855561097 36.089321714872852 2357,-112.269014456727604 36.088509160604723 2357,-112.268152881533894 36.087538135979557 2357,-112.2670588176031 36.086826852625677 2357,-112.265737458732104 36.086463123013033 2357)'
-    if ogrtest.check_feature_geometry(feat, wkt):
-        return 'fail'
+    assert not ogrtest.check_feature_geometry(feat, wkt)
 
     return 'success'
 
@@ -340,44 +281,32 @@ def test_ogr_kml_polygon_read():
     if not ogrtest.have_read_kml:
         return 'skip'
 
-    if ogrtest.kml_ds is None:
-        gdaltest.post_reason('kml_ds is none')
-        return 'fail'
+    assert ogrtest.kml_ds is not None, 'kml_ds is none'
 
     lyr = ogrtest.kml_ds.GetLayerByName('Google Campus')
     lyr.ResetReading()
     feat = lyr.GetNextFeature()
 
     wkt = 'POLYGON ((-122.084893845961204 37.422571240447859 17,-122.084958097919795 37.422119226268563 17,-122.084746957304702 37.42207183952619 17,-122.084572538096197 37.422090067296757 17,-122.084595488672306 37.422159327008949 17,-122.0838521118269 37.422272785643713 17,-122.083792243334997 37.422035391120843 17,-122.0835076656616 37.422090069571063 17,-122.083470946415204 37.422009873951609 17,-122.083122108574798 37.422104649494599 17,-122.082924737457205 37.422265039903863 17,-122.082933916938501 37.422312428430942 17,-122.083383735973698 37.422250460876178 17,-122.083360785424802 37.422341592287452 17,-122.083420455164202 37.42237075460644 17,-122.083659133885007 37.422512920110009 17,-122.083975843895203 37.422658730937812 17,-122.084237474333094 37.422651439725207 17,-122.0845036949503 37.422651438643499 17,-122.0848020460801 37.422611339163147 17,-122.084788275051494 37.422563950551208 17,-122.084893845961204 37.422571240447859 17))'
-    if ogrtest.check_feature_geometry(feat, wkt):
-        return 'fail'
+    assert not ogrtest.check_feature_geometry(feat, wkt)
 
     feat = lyr.GetNextFeature()
-    if feat is None:
-        gdaltest.post_reason('expected feature not found.')
-        return 'fail'
+    assert feat is not None, 'expected feature not found.'
 
     wkt = 'POLYGON ((-122.085741277148301 37.422270331552568 17,-122.085816976848093 37.422314088323461 17,-122.085852582875006 37.422303374697442 17,-122.085879994563896 37.422256861387893 17,-122.085886010140896 37.422231107613797 17,-122.085806915728796 37.422202501738553 17,-122.085837954265301 37.42214027058678 17,-122.085673264051906 37.422086902144081 17,-122.085602292640701 37.42214885429042 17,-122.085590277843593 37.422128290487002 17,-122.085584167223701 37.422081719672462 17,-122.085485206574106 37.42210455874995 17,-122.085506726435199 37.422142679498243 17,-122.085443071291493 37.422127838461719 17,-122.085099071490404 37.42251282407603 17,-122.085676981863202 37.422818153236513 17,-122.086016227378295 37.422449188587223 17,-122.085726032700407 37.422292396042529 17,-122.085741277148301 37.422270331552568 17))'
-    if ogrtest.check_feature_geometry(feat, wkt):
-        return 'fail'
+    assert not ogrtest.check_feature_geometry(feat, wkt)
 
     feat = lyr.GetNextFeature()
-    if feat is None:
-        gdaltest.post_reason('expected feature not found.')
-        return 'fail'
+    assert feat is not None, 'expected feature not found.'
 
     wkt = 'POLYGON ((-122.085786228724203 37.421362088869692 25,-122.085731299060299 37.421369359894811 25,-122.085731299291794 37.421409349109027 25,-122.085607707367899 37.421383901665649 25,-122.085580242651602 37.42137299550869 25,-122.085218622197104 37.421372995043157 25,-122.085227776563897 37.421616565082651 25,-122.085259818934702 37.421605658944031 25,-122.085259818549901 37.421682001560001 25,-122.085236931147804 37.421700178603459 25,-122.085264395782801 37.421761979825753 25,-122.085323903274599 37.421761980139067 25,-122.085355945432397 37.421852864451999 25,-122.085410875246296 37.421889218237339 25,-122.085479537935697 37.42189285337048 25,-122.085543622981902 37.421889217975462 25,-122.085626017804202 37.421860134999257 25,-122.085937287963006 37.421860134536047 25,-122.085942871866607 37.42160898590042 25,-122.085965546986102 37.421579927591438 25,-122.085864046234093 37.421471150029568 25,-122.0858548911215 37.421405713261841 25,-122.085809116276806 37.4214057134039 25,-122.085786228724203 37.421362088869692 25))'
-    if ogrtest.check_feature_geometry(feat, wkt):
-        return 'fail'
+    assert not ogrtest.check_feature_geometry(feat, wkt)
 
     feat = lyr.GetNextFeature()
-    if feat is None:
-        gdaltest.post_reason('expected feature not found.')
-        return 'fail'
+    assert feat is not None, 'expected feature not found.'
 
     wkt = 'POLYGON ((-122.084437112828397 37.421772530030907 19,-122.084511885574599 37.421911115428962 19,-122.0850470999805 37.421787551215353 19,-122.085071991339106 37.421436630231611 19,-122.084916406231997 37.421372378221157 19,-122.084219386816699 37.421372378016258 19,-122.084219386589993 37.421476171614962 19,-122.083808641999099 37.4214613409357 19,-122.083789972856394 37.421313064107963 19,-122.083279653469802 37.421293288405927 19,-122.083260981920702 37.421392139442979 19,-122.082937362173695 37.421372363998763 19,-122.082906242566693 37.421515697788713 19,-122.082850226966499 37.421762825764652 19,-122.082943578863507 37.421767769696352 19,-122.083217411188002 37.421792485526858 19,-122.0835970430103 37.421748007445601 19,-122.083945555677104 37.421693642376027 19,-122.084007789463698 37.421762838158529 19,-122.084113587521003 37.421748011043917 19,-122.084076247378405 37.421713412923751 19,-122.084144704773905 37.421678815345693 19,-122.084144704222993 37.421817206601972 19,-122.084250333307395 37.421817070044597 19,-122.084437112828397 37.421772530030907 19))'
-    if ogrtest.check_feature_geometry(feat, wkt):
-        return 'fail'
+    assert not ogrtest.check_feature_geometry(feat, wkt)
 
     return 'success'
 
@@ -397,13 +326,9 @@ def test_ogr_kml_write_1():
 
     dst_feat = ogr.Feature(lyr.GetLayerDefn())
     dst_feat.SetGeometry(ogr.CreateGeometryFromWkt('POINT (2 49)'))
-    if lyr.CreateFeature(dst_feat) != 0:
-        gdaltest.post_reason('CreateFeature failed.')
-        return 'fail'
-    if dst_feat.GetGeometryRef().ExportToWkt() != 'POINT (2 49)':
-        print(dst_feat.GetGeometryRef().ExportToWkt())
-        gdaltest.post_reason('CreateFeature changed the geometry.')
-        return 'fail'
+    assert lyr.CreateFeature(dst_feat) == 0, 'CreateFeature failed.'
+    assert dst_feat.GetGeometryRef().ExportToWkt() == 'POINT (2 49)', \
+        'CreateFeature changed the geometry.'
 
     lyr = ds.CreateLayer('test_wgs84')
 
@@ -411,51 +336,35 @@ def test_ogr_kml_write_1():
     dst_feat.SetField('name', 'my_name')
     dst_feat.SetField('description', 'my_description')
     dst_feat.SetGeometry(ogr.CreateGeometryFromWkt('POINT (2 49)'))
-    if lyr.CreateFeature(dst_feat) != 0:
-        gdaltest.post_reason('CreateFeature failed.')
-        return 'fail'
+    assert lyr.CreateFeature(dst_feat) == 0, 'CreateFeature failed.'
 
     dst_feat = ogr.Feature(lyr.GetLayerDefn())
     dst_feat.SetGeometry(ogr.CreateGeometryFromWkt('POINT (2 49 1)'))
-    if lyr.CreateFeature(dst_feat) != 0:
-        gdaltest.post_reason('CreateFeature failed.')
-        return 'fail'
+    assert lyr.CreateFeature(dst_feat) == 0, 'CreateFeature failed.'
 
     dst_feat = ogr.Feature(lyr.GetLayerDefn())
     dst_feat.SetGeometry(ogr.CreateGeometryFromWkt('LINESTRING (0 1,2 3)'))
-    if lyr.CreateFeature(dst_feat) != 0:
-        gdaltest.post_reason('CreateFeature failed.')
-        return 'fail'
+    assert lyr.CreateFeature(dst_feat) == 0, 'CreateFeature failed.'
 
     dst_feat = ogr.Feature(lyr.GetLayerDefn())
     dst_feat.SetGeometry(ogr.CreateGeometryFromWkt('POLYGON ((0 1,2 3,4 5,0 1),(0 1,2 3,4 5,0 1))'))
-    if lyr.CreateFeature(dst_feat) != 0:
-        gdaltest.post_reason('CreateFeature failed.')
-        return 'fail'
+    assert lyr.CreateFeature(dst_feat) == 0, 'CreateFeature failed.'
 
     dst_feat = ogr.Feature(lyr.GetLayerDefn())
     dst_feat.SetGeometry(ogr.CreateGeometryFromWkt('MULTIPOINT (2 49,2 49)'))
-    if lyr.CreateFeature(dst_feat) != 0:
-        gdaltest.post_reason('CreateFeature failed.')
-        return 'fail'
+    assert lyr.CreateFeature(dst_feat) == 0, 'CreateFeature failed.'
 
     dst_feat = ogr.Feature(lyr.GetLayerDefn())
     dst_feat.SetGeometry(ogr.CreateGeometryFromWkt('MULTILINESTRING ((0 1,2 3),(0 1,2 3))'))
-    if lyr.CreateFeature(dst_feat) != 0:
-        gdaltest.post_reason('CreateFeature failed.')
-        return 'fail'
+    assert lyr.CreateFeature(dst_feat) == 0, 'CreateFeature failed.'
 
     dst_feat = ogr.Feature(lyr.GetLayerDefn())
     dst_feat.SetGeometry(ogr.CreateGeometryFromWkt('MULTIPOLYGON (((0 1,2 3,4 5,0 1),(0 1,2 3,4 5,0 1)),((0 1,2 3,4 5,0 1),(0 1,2 3,4 5,0 1)))'))
-    if lyr.CreateFeature(dst_feat) != 0:
-        gdaltest.post_reason('CreateFeature failed.')
-        return 'fail'
+    assert lyr.CreateFeature(dst_feat) == 0, 'CreateFeature failed.'
 
     dst_feat = ogr.Feature(lyr.GetLayerDefn())
     dst_feat.SetGeometry(ogr.CreateGeometryFromWkt('GEOMETRYCOLLECTION (POINT (2 49 1),LINESTRING (0 1 0,2 3 0))'))
-    if lyr.CreateFeature(dst_feat) != 0:
-        gdaltest.post_reason('CreateFeature failed.')
-        return 'fail'
+    assert lyr.CreateFeature(dst_feat) == 0, 'CreateFeature failed.'
 
     ds = None
 
@@ -471,71 +380,44 @@ def test_ogr_kml_check_write_1():
         return 'skip'
 
     content = open('tmp/kml.kml').read()
-    if content.find('Schema') >= 0:
-        gdaltest.post_reason('Did not expect Schema tags.')
-        return 'fail'
+    assert content.find('Schema') < 0, 'Did not expect Schema tags.'
 
     ds = ogr.Open('tmp/kml.kml')
     lyr = ds.GetLayerByName('test_wgs84')
-    if lyr.GetFeatureCount() != 8:
-        gdaltest.post_reason('Bad feature count.')
-        return 'fail'
+    assert lyr.GetFeatureCount() == 8, 'Bad feature count.'
 
     feat = lyr.GetNextFeature()
-    if feat.GetField('name') != 'my_name':
-        print(feat.GetField('name'))
-        gdaltest.post_reason('Unexpected name.')
-        return 'fail'
-    if feat.GetField('description') != 'my_description':
-        print(feat.GetField('description'))
-        gdaltest.post_reason('Unexpected description.')
-        return 'fail'
-    if feat.GetGeometryRef().ExportToWkt() != 'POINT (2 49)':
-        print(feat.GetGeometryRef().ExportToWkt())
-        gdaltest.post_reason('Unexpected geometry.')
-        return 'fail'
+    assert feat.GetField('name') == 'my_name', 'Unexpected name.'
+    assert feat.GetField('description') == 'my_description', 'Unexpected description.'
+    assert feat.GetGeometryRef().ExportToWkt() == 'POINT (2 49)', 'Unexpected geometry.'
 
     feat = lyr.GetNextFeature()
-    if feat.GetGeometryRef().ExportToWkt() != 'POINT (2 49 1)':
-        print(feat.GetGeometryRef().ExportToWkt())
-        gdaltest.post_reason('Unexpected geometry.')
-        return 'fail'
+    assert feat.GetGeometryRef().ExportToWkt() == 'POINT (2 49 1)', \
+        'Unexpected geometry.'
 
     feat = lyr.GetNextFeature()
-    if feat.GetGeometryRef().ExportToWkt() != 'LINESTRING (0 1,2 3)':
-        print(feat.GetGeometryRef().ExportToWkt())
-        gdaltest.post_reason('Unexpected geometry.')
-        return 'fail'
+    assert feat.GetGeometryRef().ExportToWkt() == 'LINESTRING (0 1,2 3)', \
+        'Unexpected geometry.'
 
     feat = lyr.GetNextFeature()
-    if feat.GetGeometryRef().ExportToWkt() != 'POLYGON ((0 1,2 3,4 5,0 1),(0 1,2 3,4 5,0 1))':
-        print(feat.GetGeometryRef().ExportToWkt())
-        gdaltest.post_reason('Unexpected geometry.')
-        return 'fail'
+    assert feat.GetGeometryRef().ExportToWkt() == 'POLYGON ((0 1,2 3,4 5,0 1),(0 1,2 3,4 5,0 1))', \
+        'Unexpected geometry.'
 
     feat = lyr.GetNextFeature()
-    if feat.GetGeometryRef().ExportToWkt() != 'MULTIPOINT (2 49,2 49)':
-        print(feat.GetGeometryRef().ExportToWkt())
-        gdaltest.post_reason('Unexpected geometry.')
-        return 'fail'
+    assert feat.GetGeometryRef().ExportToWkt() == 'MULTIPOINT (2 49,2 49)', \
+        'Unexpected geometry.'
 
     feat = lyr.GetNextFeature()
-    if feat.GetGeometryRef().ExportToWkt() != 'MULTILINESTRING ((0 1,2 3),(0 1,2 3))':
-        print(feat.GetGeometryRef().ExportToWkt())
-        gdaltest.post_reason('Unexpected geometry.')
-        return 'fail'
+    assert feat.GetGeometryRef().ExportToWkt() == 'MULTILINESTRING ((0 1,2 3),(0 1,2 3))', \
+        'Unexpected geometry.'
 
     feat = lyr.GetNextFeature()
-    if feat.GetGeometryRef().ExportToWkt() != 'MULTIPOLYGON (((0 1,2 3,4 5,0 1),(0 1,2 3,4 5,0 1)),((0 1,2 3,4 5,0 1),(0 1,2 3,4 5,0 1)))':
-        print(feat.GetGeometryRef().ExportToWkt())
-        gdaltest.post_reason('Unexpected geometry.')
-        return 'fail'
+    assert feat.GetGeometryRef().ExportToWkt() == 'MULTIPOLYGON (((0 1,2 3,4 5,0 1),(0 1,2 3,4 5,0 1)),((0 1,2 3,4 5,0 1),(0 1,2 3,4 5,0 1)))', \
+        'Unexpected geometry.'
 
     feat = lyr.GetNextFeature()
-    if feat.GetGeometryRef().ExportToWkt() != 'GEOMETRYCOLLECTION (POINT (2 49 1),LINESTRING (0 1 0,2 3 0))':
-        print(feat.GetGeometryRef().ExportToWkt())
-        gdaltest.post_reason('Unexpected geometry.')
-        return 'fail'
+    assert feat.GetGeometryRef().ExportToWkt() == 'GEOMETRYCOLLECTION (POINT (2 49 1),LINESTRING (0 1 0,2 3 0))', \
+        'Unexpected geometry.'
 
     return 'success'
 
@@ -554,9 +436,8 @@ def test_ogr_kml_xml_attributes():
     feat = lyr.GetNextFeature()
 
     if feat.GetField('description') != 'Description<br></br><i attr="val">Interesting</i><br></br>':
-        gdaltest.post_reason('Wrong description field value')
         print('got: ', feat.GetField('description'))
-        return 'fail'
+        pytest.fail('Wrong description field value')
 
     return 'success'
 
@@ -593,9 +474,7 @@ def test_ogr_kml_test_ogrsf():
 
     ret = gdaltest.runexternal(test_cli_utilities.get_test_ogrsf_path() + ' --config OGR_SKIP LIBKML -ro data/samples.kml')
 
-    if ret.find("using driver `KML'") == -1 or ret.find('INFO') == -1 or ret.find('ERROR') != -1:
-        print(ret)
-        return 'fail'
+    assert not (ret.find("using driver `KML'") == -1 or ret.find('INFO') == -1 or ret.find('ERROR') != -1)
 
     return 'success'
 
@@ -616,8 +495,7 @@ def test_ogr_kml_interleaved_writing():
     gdal.Unlink('/vsimem/ogr_kml_interleaved_writing.kml')
 
     # CreateFeature() should fail
-    if ret == 0:
-        return 'fail'
+    assert ret != 0
 
     return 'success'
 
@@ -633,8 +511,7 @@ def test_ogr_kml_read_placemark():
     ds = ogr.Open('data/placemark.kml')
     lyr = ds.GetLayer(0)
     feat = lyr.GetNextFeature()
-    if feat is None:
-        return 'fail'
+    assert feat is not None
 
     return 'success'
 
@@ -648,9 +525,7 @@ def test_ogr_kml_read_empty():
         return 'skip'
 
     ds = ogr.Open('data/empty.kml')
-    if ds.GetLayerCount() != 0:
-        print(ds.GetLayerCount())
-        return 'fail'
+    assert ds.GetLayerCount() == 0
 
     return 'success'
 
@@ -664,17 +539,11 @@ def test_ogr_kml_read_emptylayers():
         return 'skip'
 
     ds = ogr.Open('data/emptylayers.kml')
-    if ds.GetLayerCount() != 2:
-        print(ds.GetLayerCount())
-        return 'fail'
+    assert ds.GetLayerCount() == 2
 
-    if ds.GetLayer(0).GetFeatureCount() != 0:
-        print(ds.GetLayer(0).GetFeatureCount())
-        return 'fail'
+    assert ds.GetLayer(0).GetFeatureCount() == 0
 
-    if ds.GetLayer(1).GetFeatureCount() != 0:
-        print(ds.GetLayer(1).GetFeatureCount())
-        return 'fail'
+    assert ds.GetLayer(1).GetFeatureCount() == 0
 
     return 'success'
 
@@ -685,13 +554,9 @@ def compare_output(content, expected_content):
     content_lines = content.strip().split('\n')
     expected_lines = expected_content.strip().split('\n')
 
-    if len(content_lines) != len(expected_lines):
-        print(content)
-        return 'fail'
+    assert len(content_lines) == len(expected_lines), content
     for i, content_line in enumerate(content_lines):
-        if content_line.strip() != expected_lines[i].strip():
-            print(content)
-            return 'fail'
+        assert content_line.strip() == expected_lines[i].strip(), content
 
     return 'success'
 
@@ -837,13 +702,9 @@ def test_ogr_kml_read_folder_with_subfolder_placemark():
         return 'skip'
 
     ds = ogr.Open('data/folder_with_subfolder_placemark.kml')
-    if ds.GetLayerCount() != 1:
-        print(ds.GetLayerCount())
-        return 'fail'
+    assert ds.GetLayerCount() == 1
 
-    if ds.GetLayer(0).GetFeatureCount() != 0:
-        print(ds.GetLayer(0).GetFeatureCount())
-        return 'fail'
+    assert ds.GetLayer(0).GetFeatureCount() == 0
 
     return 'success'
 
@@ -858,8 +719,7 @@ def test_ogr_kml_read_truncated():
 
     with gdaltest.error_handler():
         ds = ogr.Open('data/truncated.kml')
-    if ds is not None:
-        return 'fail'
+    assert ds is None
 
     return 'success'
 
@@ -873,13 +733,9 @@ def test_ogr_kml_read_weird_empty_folders():
         return 'skip'
 
     ds = ogr.Open('data/weird_empty_folders.kml')
-    if ds.GetLayerCount() != 1:
-        print(ds.GetLayerCount())
-        return 'fail'
+    assert ds.GetLayerCount() == 1
 
-    if ds.GetLayer(0).GetFeatureCount() != 0:
-        print(ds.GetLayer(0).GetFeatureCount())
-        return 'fail'
+    assert ds.GetLayer(0).GetFeatureCount() == 0
 
     return 'success'
 
@@ -894,8 +750,7 @@ def test_ogr_kml_read_junk_content_after_valid_doc():
 
     with gdaltest.error_handler():
         ds = ogr.Open('data/junk_content_after_valid_doc.kml')
-    if ds is not None:
-        return 'fail'
+    assert ds is None
 
     return 'success'
 
@@ -911,8 +766,7 @@ def test_ogr_kml_read_placemark_with_kml_prefix():
     ds = ogr.Open('data/placemark_with_kml_prefix.kml')
     lyr = ds.GetLayer(0)
     feat = lyr.GetNextFeature()
-    if feat is None:
-        return 'fail'
+    assert feat is not None
 
     return 'success'
 
@@ -927,13 +781,9 @@ def test_ogr_kml_read_duplicate_folder_name():
 
     ds = ogr.Open('data/duplicate_folder_name.kml')
     lyr = ds.GetLayer(0)
-    if lyr.GetName() != 'layer':
-        print(lyr.GetName())
-        return 'fail'
+    assert lyr.GetName() == 'layer'
     lyr = ds.GetLayer(1)
-    if lyr.GetName() != 'layer (#2)':
-        print(lyr.GetName())
-        return 'fail'
+    assert lyr.GetName() == 'layer (#2)'
 
     return 'success'
 
@@ -948,16 +798,12 @@ def test_ogr_kml_read_placemark_in_root_and_subfolder():
 
     ds = ogr.Open('data/placemark_in_root_and_subfolder.kml')
     lyr = ds.GetLayerByName('TopLevel')
-    if lyr is None:
-        return 'fail'
-    if lyr.GetFeatureCount() != 1:
-        return 'fail'
+    assert lyr is not None
+    assert lyr.GetFeatureCount() == 1
 
     lyr = ds.GetLayerByName('SubFolder1')
-    if lyr is None:
-        return 'fail'
-    if lyr.GetFeatureCount() != 1:
-        return 'fail'
+    assert lyr is not None
+    assert lyr.GetFeatureCount() == 1
 
     return 'success'
 
diff --git a/autotest/ogr/ogr_layer_algebra.py b/autotest/ogr/ogr_layer_algebra.py
index c87130b7a22b..cfee839b1680 100755
--- a/autotest/ogr/ogr_layer_algebra.py
+++ b/autotest/ogr/ogr_layer_algebra.py
@@ -169,22 +169,15 @@ def test_algebra_intersection():
 
     err = A.Intersection(B, C)
 
-    if err != 0:
-        gdaltest.post_reason('got non-zero result code ' + str(err) + ' from Layer.Intersection')
-        return 'fail'
+    assert err == 0, \
+        ('got non-zero result code ' + str(err) + ' from Layer.Intersection')
 
     C_defn = C.GetLayerDefn()
-    if C_defn.GetFieldCount() != 2 \
-       or C_defn.GetFieldDefn(0).GetName() != 'A' \
-       or C_defn.GetFieldDefn(0).GetType() != ogr.OFTInteger \
-       or C_defn.GetFieldDefn(1).GetName() != 'B' \
-       or C_defn.GetFieldDefn(1).GetType() != ogr.OFTString:
-        gdaltest.post_reason('Did not get expected output schema.')
-        return 'fail'
+    assert C_defn.GetFieldCount() == 2 and C_defn.GetFieldDefn(0).GetName() == 'A' and C_defn.GetFieldDefn(0).GetType() == ogr.OFTInteger and C_defn.GetFieldDefn(1).GetName() == 'B' and C_defn.GetFieldDefn(1).GetType() == ogr.OFTString, \
+        'Did not get expected output schema.'
 
-    if C.GetFeatureCount() != 2:
-        gdaltest.post_reason('Layer.Intersection returned ' + str(C.GetFeatureCount()) + ' features')
-        return 'fail'
+    assert C.GetFeatureCount() == 2, \
+        ('Layer.Intersection returned ' + str(C.GetFeatureCount()) + ' features')
 
     f1 = (ogr.Geometry(wkt='POLYGON ((2 3,3 3,3 2,2 2,2 3))'), 1, 'first')
     f2 = (ogr.Geometry(wkt='POLYGON ((5 2,5 3,6 3,6 2,5 2))'), 2, 'first')
@@ -197,13 +190,11 @@ def test_algebra_intersection():
 
         g = feat.GetGeometryRef()
         if g.Equals(f1[0]):
-            if feat.GetField('A') != f1[1] or feat.GetField('B') != f1[2]:
-                gdaltest.post_reason('Did not get expected field values.')
-                return 'fail'
+            assert feat.GetField('A') == f1[1] and feat.GetField('B') == f1[2], \
+                'Did not get expected field values.'
         elif g.Equals(f2[0]):
-            if feat.GetField('A') != f2[1] or feat.GetField('B') != f2[2]:
-                gdaltest.post_reason('Did not get expected field values.')
-                return 'fail'
+            assert feat.GetField('A') == f2[1] and feat.GetField('B') == f2[2], \
+                'Did not get expected field values.'
         else:
             gdaltest.post_reason('Layer.Intersection returned wrong geometry: ' + g.ExportToWkt())
             return 'fail'
@@ -215,13 +206,11 @@ def test_algebra_intersection():
 
     err = A.Intersection(B, C, options=['PROMOTE_TO_MULTI=YES'])
 
-    if err != 0:
-        gdaltest.post_reason('got non-zero result code ' + str(err) + ' from Layer.Intersection')
-        return 'fail'
+    assert err == 0, \
+        ('got non-zero result code ' + str(err) + ' from Layer.Intersection')
 
-    if C.GetFeatureCount() != 2:
-        gdaltest.post_reason('Layer.Intersection returned ' + str(C.GetFeatureCount()) + ' features')
-        return 'fail'
+    assert C.GetFeatureCount() == 2, \
+        ('Layer.Intersection returned ' + str(C.GetFeatureCount()) + ' features')
 
     f1 = (ogr.Geometry(wkt='MULTIPOLYGON (((2 3,3 3,3 2,2 2,2 3)))'), 1, 'first')
     f2 = (ogr.Geometry(wkt='MULTIPOLYGON (((5 2,5 3,6 3,6 2,5 2)))'), 2, 'first')
@@ -234,18 +223,11 @@ def test_algebra_intersection():
 
         g = feat.GetGeometryRef()
         if g.Equals(f1[0]):
-            if feat.GetField('A') != f1[1] or feat.GetField('B') != f1[2]:
-                gdaltest.post_reason('Did not get expected field values. (1)')
-                print(feat.GetField('A'))
-                print(feat.GetField('B'))
-                return 'fail'
+            assert feat.GetField('A') == f1[1] and feat.GetField('B') == f1[2], \
+                'Did not get expected field values. (1)'
         elif g.Equals(f2[0]):
-            if feat.GetField('A') != f2[1] or feat.GetField('B') != f2[2]:
-                gdaltest.post_reason('Did not get expected field values. (2)')
-                print(feat.GetField('A'))
-                print(feat.GetField('B'))
-                print(feat.GetField('B'))
-                return 'fail'
+            assert feat.GetField('A') == f2[1] and feat.GetField('B') == f2[2], \
+                'Did not get expected field values. (2)'
         else:
             gdaltest.post_reason('Layer.Intersection returned wrong geometry: ' + g.ExportToWkt())
             return 'fail'
@@ -256,13 +238,10 @@ def test_algebra_intersection():
 
     err = D1.Intersection(D2, C, ['KEEP_LOWER_DIMENSION_GEOMETRIES=NO'])
 
-    if err != 0:
-        gdaltest.post_reason('got non-zero result code ' + str(err) + ' from Layer.Intersection')
-        return 'fail'
+    assert err == 0, \
+        ('got non-zero result code ' + str(err) + ' from Layer.Intersection')
 
-    if not is_same(D1, C):
-        gdaltest.post_reason('D1 != C')
-        return 'fail'
+    assert is_same(D1, C), 'D1 != C'
 
     return 'success'
 
@@ -302,39 +281,32 @@ def test_algebra_KEEP_LOWER_DIMENSION_GEOMETRIES():
 
     layer3 = ds.CreateLayer('layer3a')
     layer1.Intersection(layer2, layer3, ['KEEP_LOWER_DIMENSION_GEOMETRIES=NO'])
-    if layer3.GetFeatureCount() != 0:
-        gdaltest.post_reason('Lower dimension geometries not removed in intersection')
-        return 'fail'
+    assert layer3.GetFeatureCount() == 0, \
+        'Lower dimension geometries not removed in intersection'
 
     layer3 = ds.CreateLayer('layer3b')
     layer1.Intersection(layer2, layer3, ['KEEP_LOWER_DIMENSION_GEOMETRIES=YES'])
-    if layer3.GetFeatureCount() != 2:
-        gdaltest.post_reason('Lower dimension geometries not kept in intersection')
-        return 'fail'
+    assert layer3.GetFeatureCount() == 2, \
+        'Lower dimension geometries not kept in intersection'
 
     layer3 = ds.CreateLayer('layer3c')
     layer1.Union(layer2, layer3, ['KEEP_LOWER_DIMENSION_GEOMETRIES=NO'])
-    if layer3.GetFeatureCount() != 4:
-        gdaltest.post_reason('Lower dimension geometries not removed in union')
-        return 'fail'
+    assert layer3.GetFeatureCount() == 4, \
+        'Lower dimension geometries not removed in union'
 
     layer3 = ds.CreateLayer('layer3d')
     layer1.Union(layer2, layer3, ['KEEP_LOWER_DIMENSION_GEOMETRIES=YES'])
-    if layer3.GetFeatureCount() != 6:
-        gdaltest.post_reason('Lower dimension geometries not kept in union')
-        return 'fail'
+    assert layer3.GetFeatureCount() == 6, 'Lower dimension geometries not kept in union'
 
     layer3 = ds.CreateLayer('layer3e')
     layer1.Identity(layer2, layer3, ['KEEP_LOWER_DIMENSION_GEOMETRIES=NO'])
-    if layer3.GetFeatureCount() != 2:
-        gdaltest.post_reason('Lower dimension geometries not removed in identity')
-        return 'fail'
+    assert layer3.GetFeatureCount() == 2, \
+        'Lower dimension geometries not removed in identity'
 
     layer3 = ds.CreateLayer('layer3f')
     layer1.Identity(layer2, layer3, ['KEEP_LOWER_DIMENSION_GEOMETRIES=YES'])
-    if layer3.GetFeatureCount() != 4:
-        gdaltest.post_reason('Lower dimension geometries not kept in identity')
-        return 'fail'
+    assert layer3.GetFeatureCount() == 4, \
+        'Lower dimension geometries not kept in identity'
 
     return 'success'
 
@@ -350,26 +322,20 @@ def test_algebra_union():
     err = A.Union(B, C)
 
     if ogrtest.have_geos():
-        if err != 0:
-            gdaltest.post_reason('got non-zero result code ' + str(err) + ' from Layer.Union')
-            return 'fail'
+        assert err == 0, ('got non-zero result code ' + str(err) + ' from Layer.Union')
 
-        if C.GetFeatureCount() != 5:
-            gdaltest.post_reason('Layer.Union returned ' + str(C.GetFeatureCount()) + ' features')
-            return 'fail'
+        assert C.GetFeatureCount() == 5, \
+            ('Layer.Union returned ' + str(C.GetFeatureCount()) + ' features')
 
     recreate_layer_C()
 
     err = A.Union(B, C, options=['PROMOTE_TO_MULTI=YES'])
 
     if ogrtest.have_geos():
-        if err != 0:
-            gdaltest.post_reason('got non-zero result code ' + str(err) + ' from Layer.Union')
-            return 'fail'
+        assert err == 0, ('got non-zero result code ' + str(err) + ' from Layer.Union')
 
-        if C.GetFeatureCount() != 5:
-            gdaltest.post_reason('Layer.Union returned ' + str(C.GetFeatureCount()) + ' features')
-            return 'fail'
+        assert C.GetFeatureCount() == 5, \
+            ('Layer.Union returned ' + str(C.GetFeatureCount()) + ' features')
 
     recreate_layer_C()
 
@@ -378,13 +344,9 @@ def test_algebra_union():
     err = D1.Union(D2, C, ['KEEP_LOWER_DIMENSION_GEOMETRIES=NO'])
 
     if ogrtest.have_geos():
-        if err != 0:
-            gdaltest.post_reason('got non-zero result code ' + str(err) + ' from Layer.Union')
-            return 'fail'
+        assert err == 0, ('got non-zero result code ' + str(err) + ' from Layer.Union')
 
-        if not is_same(D1, C):
-            gdaltest.post_reason('D1 != C')
-            return 'fail'
+        assert is_same(D1, C), 'D1 != C'
 
     recreate_layer_C()
 
@@ -393,13 +355,10 @@ def test_algebra_union():
     err = B.Union(pointInB, C)
 
     if ogrtest.have_geos():
-        if err != 0:
-            gdaltest.post_reason('got non-zero result code ' + str(err) + ' from Layer.Union')
-            return 'fail'
+        assert err == 0, ('got non-zero result code ' + str(err) + ' from Layer.Union')
 
-        if C.GetFeatureCount() != 2:
-            gdaltest.post_reason('Layer.Union returned ' + str(C.GetFeatureCount()) + ' features')
-            return 'fail'
+        assert C.GetFeatureCount() == 2, \
+            ('Layer.Union returned ' + str(C.GetFeatureCount()) + ' features')
 
     return 'success'
 
@@ -415,26 +374,20 @@ def test_algebra_symdifference():
     err = A.SymDifference(B, C)
 
     if ogrtest.have_geos():
-        if err != 0:
-            gdaltest.post_reason('got non-zero result code ' + str(err) + ' from Layer.SymDifference')
-            return 'fail'
+        assert err == 0, ('got non-zero result code ' + str(err) + ' from Layer.SymDifference')
 
-        if C.GetFeatureCount() != 3:
-            gdaltest.post_reason('Layer.SymDifference returned ' + str(C.GetFeatureCount()) + ' features')
-            return 'fail'
+        assert C.GetFeatureCount() == 3, \
+            ('Layer.SymDifference returned ' + str(C.GetFeatureCount()) + ' features')
 
     recreate_layer_C()
 
     err = A.SymDifference(B, C, options=['PROMOTE_TO_MULTI=YES'])
 
     if ogrtest.have_geos():
-        if err != 0:
-            gdaltest.post_reason('got non-zero result code ' + str(err) + ' from Layer.SymDifference')
-            return 'fail'
+        assert err == 0, ('got non-zero result code ' + str(err) + ' from Layer.SymDifference')
 
-        if C.GetFeatureCount() != 3:
-            gdaltest.post_reason('Layer.SymDifference returned ' + str(C.GetFeatureCount()) + ' features')
-            return 'fail'
+        assert C.GetFeatureCount() == 3, \
+            ('Layer.SymDifference returned ' + str(C.GetFeatureCount()) + ' features')
 
     recreate_layer_C()
 
@@ -443,13 +396,10 @@ def test_algebra_symdifference():
     err = D1.SymDifference(D2, C)
 
     if ogrtest.have_geos():
-        if err != 0:
-            gdaltest.post_reason('got non-zero result code ' + str(err) + ' from Layer.SymDifference')
-            return 'fail'
+        assert err == 0, ('got non-zero result code ' + str(err) + ' from Layer.SymDifference')
 
-    if C.GetFeatureCount() != 0:
-        gdaltest.post_reason('Layer.SymDifference returned ' + str(C.GetFeatureCount()) + ' features')
-        return 'fail'
+    assert C.GetFeatureCount() == 0, \
+        ('Layer.SymDifference returned ' + str(C.GetFeatureCount()) + ' features')
 
     return 'success'
 
@@ -465,26 +415,20 @@ def test_algebra_identify():
     err = A.Identity(B, C)
 
     if ogrtest.have_geos():
-        if err != 0:
-            gdaltest.post_reason('got non-zero result code ' + str(err) + ' from Layer.Identity')
-            return 'fail'
+        assert err == 0, ('got non-zero result code ' + str(err) + ' from Layer.Identity')
 
-        if C.GetFeatureCount() != 4:
-            gdaltest.post_reason('Layer.Identity returned ' + str(C.GetFeatureCount()) + ' features')
-            return 'fail'
+        assert C.GetFeatureCount() == 4, \
+            ('Layer.Identity returned ' + str(C.GetFeatureCount()) + ' features')
 
     recreate_layer_C()
 
     err = A.Identity(B, C, options=['PROMOTE_TO_MULTI=YES'])
 
     if ogrtest.have_geos():
-        if err != 0:
-            gdaltest.post_reason('got non-zero result code ' + str(err) + ' from Layer.Identity')
-            return 'fail'
+        assert err == 0, ('got non-zero result code ' + str(err) + ' from Layer.Identity')
 
-        if C.GetFeatureCount() != 4:
-            gdaltest.post_reason('Layer.Identity returned ' + str(C.GetFeatureCount()) + ' features')
-            return 'fail'
+        assert C.GetFeatureCount() == 4, \
+            ('Layer.Identity returned ' + str(C.GetFeatureCount()) + ' features')
 
     recreate_layer_C()
 
@@ -493,13 +437,9 @@ def test_algebra_identify():
     err = D1.Identity(D2, C, ['KEEP_LOWER_DIMENSION_GEOMETRIES=NO'])
 
     if ogrtest.have_geos():
-        if err != 0:
-            gdaltest.post_reason('got non-zero result code ' + str(err) + ' from Layer.Identity')
-            return 'fail'
+        assert err == 0, ('got non-zero result code ' + str(err) + ' from Layer.Identity')
 
-        if not is_same(D1, C):
-            gdaltest.post_reason('D1 != C')
-            return 'fail'
+        assert is_same(D1, C), 'D1 != C'
 
     return 'success'
 
@@ -515,26 +455,20 @@ def test_algebra_update():
     err = A.Update(B, C)
 
     if ogrtest.have_geos():
-        if err != 0:
-            gdaltest.post_reason('got non-zero result code ' + str(err) + ' from Layer.Update')
-            return 'fail'
+        assert err == 0, ('got non-zero result code ' + str(err) + ' from Layer.Update')
 
-        if C.GetFeatureCount() != 3:
-            gdaltest.post_reason('Layer.Update returned ' + str(C.GetFeatureCount()) + ' features')
-            return 'fail'
+        assert C.GetFeatureCount() == 3, \
+            ('Layer.Update returned ' + str(C.GetFeatureCount()) + ' features')
 
     recreate_layer_C()
 
     err = A.Update(B, C, options=['PROMOTE_TO_MULTI=YES'])
 
     if ogrtest.have_geos():
-        if err != 0:
-            gdaltest.post_reason('got non-zero result code ' + str(err) + ' from Layer.Update')
-            return 'fail'
+        assert err == 0, ('got non-zero result code ' + str(err) + ' from Layer.Update')
 
-        if C.GetFeatureCount() != 3:
-            gdaltest.post_reason('Layer.Update returned ' + str(C.GetFeatureCount()) + ' features')
-            return 'fail'
+        assert C.GetFeatureCount() == 3, \
+            ('Layer.Update returned ' + str(C.GetFeatureCount()) + ' features')
 
     recreate_layer_C()
 
@@ -543,13 +477,9 @@ def test_algebra_update():
     err = D1.Update(D2, C)
 
     if ogrtest.have_geos():
-        if err != 0:
-            gdaltest.post_reason('got non-zero result code ' + str(err) + ' from Layer.Update')
-            return 'fail'
+        assert err == 0, ('got non-zero result code ' + str(err) + ' from Layer.Update')
 
-        if not is_same(D1, C):
-            gdaltest.post_reason('D1 != C')
-            return 'fail'
+        assert is_same(D1, C), 'D1 != C'
 
     return 'success'
 
@@ -565,26 +495,20 @@ def test_algebra_clip():
     err = A.Clip(B, C)
 
     if ogrtest.have_geos():
-        if err != 0:
-            gdaltest.post_reason('got non-zero result code ' + str(err) + ' from Layer.Clip')
-            return 'fail'
+        assert err == 0, ('got non-zero result code ' + str(err) + ' from Layer.Clip')
 
-        if C.GetFeatureCount() != 2:
-            gdaltest.post_reason('Layer.Clip returned ' + str(C.GetFeatureCount()) + ' features')
-            return 'fail'
+        assert C.GetFeatureCount() == 2, \
+            ('Layer.Clip returned ' + str(C.GetFeatureCount()) + ' features')
 
     recreate_layer_C()
 
     err = A.Clip(B, C, options=['PROMOTE_TO_MULTI=YES'])
 
     if ogrtest.have_geos():
-        if err != 0:
-            gdaltest.post_reason('got non-zero result code ' + str(err) + ' from Layer.Clip')
-            return 'fail'
+        assert err == 0, ('got non-zero result code ' + str(err) + ' from Layer.Clip')
 
-        if C.GetFeatureCount() != 2:
-            gdaltest.post_reason('Layer.Clip returned ' + str(C.GetFeatureCount()) + ' features')
-            return 'fail'
+        assert C.GetFeatureCount() == 2, \
+            ('Layer.Clip returned ' + str(C.GetFeatureCount()) + ' features')
 
     recreate_layer_C()
 
@@ -593,13 +517,9 @@ def test_algebra_clip():
     err = D1.Update(D2, C)
 
     if ogrtest.have_geos():
-        if err != 0:
-            gdaltest.post_reason('got non-zero result code ' + str(err) + ' from Layer.Clip')
-            return 'fail'
+        assert err == 0, ('got non-zero result code ' + str(err) + ' from Layer.Clip')
 
-        if not is_same(D1, C):
-            gdaltest.post_reason('D1 != C')
-            return 'fail'
+        assert is_same(D1, C), 'D1 != C'
 
     return 'success'
 
@@ -615,26 +535,20 @@ def test_algebra_erase():
     err = A.Erase(B, C)
 
     if ogrtest.have_geos():
-        if err != 0:
-            gdaltest.post_reason('got non-zero result code ' + str(err) + ' from Layer.Erase')
-            return 'fail'
+        assert err == 0, ('got non-zero result code ' + str(err) + ' from Layer.Erase')
 
-        if C.GetFeatureCount() != 2:
-            gdaltest.post_reason('Layer.Erase returned ' + str(C.GetFeatureCount()) + ' features')
-            return 'fail'
+        assert C.GetFeatureCount() == 2, \
+            ('Layer.Erase returned ' + str(C.GetFeatureCount()) + ' features')
 
     recreate_layer_C()
 
     err = A.Erase(B, C, options=['PROMOTE_TO_MULTI=YES'])
 
     if ogrtest.have_geos():
-        if err != 0:
-            gdaltest.post_reason('got non-zero result code ' + str(err) + ' from Layer.Erase')
-            return 'fail'
+        assert err == 0, ('got non-zero result code ' + str(err) + ' from Layer.Erase')
 
-        if C.GetFeatureCount() != 2:
-            gdaltest.post_reason('Layer.Erase returned ' + str(C.GetFeatureCount()) + ' features')
-            return 'fail'
+        assert C.GetFeatureCount() == 2, \
+            ('Layer.Erase returned ' + str(C.GetFeatureCount()) + ' features')
 
     recreate_layer_C()
 
@@ -643,13 +557,10 @@ def test_algebra_erase():
     err = D1.Erase(D2, C)
 
     if ogrtest.have_geos():
-        if err != 0:
-            gdaltest.post_reason('got non-zero result code ' + str(err) + ' from Layer.Erase')
-            return 'fail'
+        assert err == 0, ('got non-zero result code ' + str(err) + ' from Layer.Erase')
 
-    if C.GetFeatureCount() != 0:
-        gdaltest.post_reason('Layer.Erase returned ' + str(C.GetFeatureCount()) + ' features')
-        return 'fail'
+    assert C.GetFeatureCount() == 0, \
+        ('Layer.Erase returned ' + str(C.GetFeatureCount()) + ' features')
 
     recreate_layer_C()
 
@@ -657,9 +568,8 @@ def test_algebra_erase():
 
     A.Erase(empty, C)
 
-    if C.GetFeatureCount() != A.GetFeatureCount():
-        gdaltest.post_reason('Layer.Erase returned ' + str(C.GetFeatureCount()) + ' features')
-        return 'fail'
+    assert C.GetFeatureCount() == A.GetFeatureCount(), \
+        ('Layer.Erase returned ' + str(C.GetFeatureCount()) + ' features')
 
     A.ResetReading()
     feat_a = A.GetNextFeature()
@@ -674,9 +584,8 @@ def test_algebra_erase():
 
     A.Erase(empty, C, options=['PROMOTE_TO_MULTI=YES'])
 
-    if C.GetFeatureCount() != A.GetFeatureCount():
-        gdaltest.post_reason('Layer.Erase returned ' + str(C.GetFeatureCount()) + ' features')
-        return 'fail'
+    assert C.GetFeatureCount() == A.GetFeatureCount(), \
+        ('Layer.Erase returned ' + str(C.GetFeatureCount()) + ' features')
 
     recreate_layer_C()
 
diff --git a/autotest/ogr/ogr_libkml.py b/autotest/ogr/ogr_libkml.py
index 000db62e2cfd..66df2752177f 100755
--- a/autotest/ogr/ogr_libkml.py
+++ b/autotest/ogr/ogr_libkml.py
@@ -37,6 +37,7 @@
 from osgeo import ogr
 from osgeo import osr
 from osgeo import gdal
+import pytest
 
 ###############################################################################
 # Test basic open operation for KML datastore.
@@ -68,10 +69,7 @@ def test_ogr_libkml_datastore():
     if not ogrtest.have_read_libkml:
         return 'skip'
 
-    if ogrtest.kml_ds.GetLayerCount() != 10:
-        gdaltest.post_reason('wrong number of layers')
-        print(ogrtest.kml_ds.GetLayerCount())
-        return 'fail'
+    assert ogrtest.kml_ds.GetLayerCount() == 10, 'wrong number of layers'
 
     return 'success'
 
@@ -85,49 +83,34 @@ def test_ogr_libkml_attributes_1():
     if not ogrtest.have_read_libkml:
         return 'skip'
 
-    if ogrtest.kml_ds is None:
-        gdaltest.post_reason('libkml_ds is none')
-        return 'fail'
+    assert ogrtest.kml_ds is not None, 'libkml_ds is none'
 
     lyr = ogrtest.kml_ds.GetLayerByName('Placemarks')
     feat = lyr.GetNextFeature()
 
-    if feat.GetField('Name') != 'Simple placemark':
-        gdaltest.post_reason('Wrong name field value')
-        return 'fail'
+    assert feat.GetField('Name') == 'Simple placemark', 'Wrong name field value'
 
     if feat.GetField('description')[:23] != 'Attached to the ground.':
-        gdaltest.post_reason('Wrong description field value')
         print('got: ', feat.GetField('description')[:23])
-        return 'fail'
+        pytest.fail('Wrong description field value')
 
     feat = lyr.GetNextFeature()
-    if feat is None:
-        gdaltest.post_reason('expected feature not found.')
-        return 'fail'
+    assert feat is not None, 'expected feature not found.'
 
-    if feat.GetField('Name') != 'Floating placemark':
-        gdaltest.post_reason('Wrong name field value')
-        return 'fail'
+    assert feat.GetField('Name') == 'Floating placemark', 'Wrong name field value'
 
     if feat.GetField('description')[:25] != 'Floats a defined distance':
-        gdaltest.post_reason('Wrong description field value')
         print('got: ', feat.GetField('description')[:25])
-        return 'fail'
+        pytest.fail('Wrong description field value')
 
     feat = lyr.GetNextFeature()
-    if feat is None:
-        gdaltest.post_reason('expected feature not found.')
-        return 'fail'
+    assert feat is not None, 'expected feature not found.'
 
-    if feat.GetField('Name') != 'Extruded placemark':
-        gdaltest.post_reason('Wrong name field value')
-        return 'fail'
+    assert feat.GetField('Name') == 'Extruded placemark', 'Wrong name field value'
 
     if feat.GetField('description') != 'Tethered to the ground by a customizable\n          \"tail\"':
-        gdaltest.post_reason('Wrong description field value')
         print('got: ', feat.GetField('description'))
-        return 'fail'
+        pytest.fail('Wrong description field value')
 
     return 'success'
 
@@ -141,26 +124,19 @@ def test_ogr_libkml_attributes_2():
     if not ogrtest.have_read_libkml:
         return 'skip'
 
-    if ogrtest.kml_ds is None:
-        gdaltest.post_reason('libkml_ds is none')
-        return 'fail'
+    assert ogrtest.kml_ds is not None, 'libkml_ds is none'
 
     lyr = ogrtest.kml_ds.GetLayerByName('Highlighted Icon')
     feat = lyr.GetNextFeature()
 
-    if feat.GetField('Name') != 'Roll over this icon':
-        gdaltest.post_reason('Wrong name field value')
-        return 'fail'
+    assert feat.GetField('Name') == 'Roll over this icon', 'Wrong name field value'
 
     if feat.GetField('description') is not None:
-        gdaltest.post_reason('Wrong description field value')
         print("'%s'" % feat.GetField('description'))
-        return 'fail'
+        pytest.fail('Wrong description field value')
 
     feat = lyr.GetNextFeature()
-    if feat is not None:
-        gdaltest.post_reason('unexpected feature found.')
-        return 'fail'
+    assert feat is None, 'unexpected feature found.'
 
     return 'success'
 
@@ -174,38 +150,26 @@ def test_ogr_libkml_attributes_3():
     if not ogrtest.have_read_libkml:
         return 'skip'
 
-    if ogrtest.kml_ds is None:
-        gdaltest.post_reason('libkml_ds is none')
-        return 'fail'
+    assert ogrtest.kml_ds is not None, 'libkml_ds is none'
 
     lyr = ogrtest.kml_ds.GetLayerByName('Paths')
     feat = lyr.GetNextFeature()
 
-    if feat.GetField('Name') != 'Tessellated':
-        gdaltest.post_reason('Wrong name field value')
-        return 'fail'
+    assert feat.GetField('Name') == 'Tessellated', 'Wrong name field value'
 
-    if feat.GetField('description') != 'If the <tessellate> tag has a value of 1, the line will contour to the underlying terrain':
-        gdaltest.post_reason('Wrong description field value')
-        return 'fail'
+    assert feat.GetField('description') == 'If the <tessellate> tag has a value of 1, the line will contour to the underlying terrain', \
+        'Wrong description field value'
 
     feat = lyr.GetNextFeature()
-    if feat is None:
-        gdaltest.post_reason('expected feature not found.')
-        return 'fail'
+    assert feat is not None, 'expected feature not found.'
 
-    if feat.GetField('Name') != 'Untessellated':
-        gdaltest.post_reason('Wrong name field value')
-        return 'fail'
+    assert feat.GetField('Name') == 'Untessellated', 'Wrong name field value'
 
-    if feat.GetField('description') != 'If the <tessellate> tag has a value of 0, the line follow a simple straight-line path from point to point':
-        gdaltest.post_reason('Wrong description field value')
-        return 'fail'
+    assert feat.GetField('description') == 'If the <tessellate> tag has a value of 0, the line follow a simple straight-line path from point to point', \
+        'Wrong description field value'
 
     feat = lyr.GetNextFeature()
-    if feat is None:
-        gdaltest.post_reason('expected feature not found.')
-        return 'fail'
+    assert feat is not None, 'expected feature not found.'
 
     return 'success'
 
@@ -219,9 +183,7 @@ def test_ogr_libkml_attributes_4():
     if not ogrtest.have_read_libkml:
         return 'skip'
 
-    if ogrtest.kml_ds is None:
-        gdaltest.post_reason('libkml_ds is none')
-        return 'fail'
+    assert ogrtest.kml_ds is not None, 'libkml_ds is none'
 
     lyr = ogrtest.kml_ds.GetLayerByName('Google Campus')
     feat = lyr.GetNextFeature()
@@ -230,13 +192,10 @@ def test_ogr_libkml_attributes_4():
     while feat is not None:
         name = 'Building %d' % i
         if feat.GetField('Name') != name:
-            gdaltest.post_reason('Wrong name field value')
             print('Got: "%s"' % feat.GetField('name'))
-            return 'fail'
+            pytest.fail('Wrong name field value')
 
-        if feat.GetField('description') is not None:
-            gdaltest.post_reason('Wrong description field value')
-            return 'fail'
+        assert feat.GetField('description') is None, 'Wrong description field value'
 
         i = i + 1
         feat = lyr.GetNextFeature()
@@ -253,9 +212,7 @@ def test_ogr_libkml_point_read():
     if not ogrtest.have_read_libkml:
         return 'skip'
 
-    if ogrtest.kml_ds is None:
-        gdaltest.post_reason('libkml_ds is none')
-        return 'fail'
+    assert ogrtest.kml_ds is not None, 'libkml_ds is none'
 
     lyr = ogrtest.kml_ds.GetLayerByName('Placemarks')
     lyr.ResetReading()
@@ -263,28 +220,21 @@ def test_ogr_libkml_point_read():
 
     wkt = 'POINT(-122.0822035425683 37.42228990140251)'
 
-    if ogrtest.check_feature_geometry(feat, wkt):
-        return 'fail'
+    assert not ogrtest.check_feature_geometry(feat, wkt)
 
     feat = lyr.GetNextFeature()
-    if feat is None:
-        gdaltest.post_reason('expected feature not found.')
-        return 'fail'
+    assert feat is not None, 'expected feature not found.'
 
     wkt = 'POINT(-122.084075 37.4220033612141 50)'
 
-    if ogrtest.check_feature_geometry(feat, wkt):
-        return 'fail'
+    assert not ogrtest.check_feature_geometry(feat, wkt)
 
     feat = lyr.GetNextFeature()
-    if feat is None:
-        gdaltest.post_reason('expected feature not found.')
-        return 'fail'
+    assert feat is not None, 'expected feature not found.'
 
     wkt = 'POINT(-122.0857667006183 37.42156927867553 50)'
 
-    if ogrtest.check_feature_geometry(feat, wkt):
-        return 'fail'
+    assert not ogrtest.check_feature_geometry(feat, wkt)
 
     return 'success'
 
@@ -298,35 +248,26 @@ def test_ogr_libkml_linestring_read():
     if not ogrtest.have_read_libkml:
         return 'skip'
 
-    if ogrtest.kml_ds is None:
-        gdaltest.post_reason('libkml_ds is none')
-        return 'fail'
+    assert ogrtest.kml_ds is not None, 'libkml_ds is none'
 
     lyr = ogrtest.kml_ds.GetLayerByName('Paths')
     lyr.ResetReading()
     feat = lyr.GetNextFeature()
 
     wkt = 'LINESTRING (-112.081423783034495 36.106778704771372 0, -112.087026775269294 36.0905099328766 0)'
-    if ogrtest.check_feature_geometry(feat, wkt):
-        return 'fail'
+    assert not ogrtest.check_feature_geometry(feat, wkt)
 
     feat = lyr.GetNextFeature()
-    if feat is None:
-        gdaltest.post_reason('expected feature not found.')
-        return 'fail'
+    assert feat is not None, 'expected feature not found.'
 
     wkt = 'LINESTRING (-112.080622229594994 36.106734600079953 0,-112.085242575314993 36.090495986124218 0)'
-    if ogrtest.check_feature_geometry(feat, wkt):
-        return 'fail'
+    assert not ogrtest.check_feature_geometry(feat, wkt)
 
     feat = lyr.GetNextFeature()
-    if feat is None:
-        gdaltest.post_reason('expected feature not found.')
-        return 'fail'
+    assert feat is not None, 'expected feature not found.'
 
     wkt = 'LINESTRING (-112.265654928602004 36.094476726025462 2357,-112.266038452823807 36.093426088386707 2357,-112.266813901345301 36.092510587768807 2357,-112.267782683444494 36.091898273579957 2357,-112.268855751095202 36.091313794118697 2357,-112.269481071721899 36.090367720752099 2357,-112.269526855561097 36.089321714872852 2357,-112.269014456727604 36.088509160604723 2357,-112.268152881533894 36.087538135979557 2357,-112.2670588176031 36.086826852625677 2357,-112.265737458732104 36.086463123013033 2357)'
-    if ogrtest.check_feature_geometry(feat, wkt):
-        return 'fail'
+    assert not ogrtest.check_feature_geometry(feat, wkt)
 
     return 'success'
 
@@ -340,44 +281,32 @@ def test_ogr_libkml_polygon_read():
     if not ogrtest.have_read_libkml:
         return 'skip'
 
-    if ogrtest.kml_ds is None:
-        gdaltest.post_reason('libkml_ds is none')
-        return 'fail'
+    assert ogrtest.kml_ds is not None, 'libkml_ds is none'
 
     lyr = ogrtest.kml_ds.GetLayerByName('Google Campus')
     lyr.ResetReading()
     feat = lyr.GetNextFeature()
 
     wkt = 'POLYGON ((-122.084893845961204 37.422571240447859 17,-122.084958097919795 37.422119226268563 17,-122.084746957304702 37.42207183952619 17,-122.084572538096197 37.422090067296757 17,-122.084595488672306 37.422159327008949 17,-122.0838521118269 37.422272785643713 17,-122.083792243334997 37.422035391120843 17,-122.0835076656616 37.422090069571063 17,-122.083470946415204 37.422009873951609 17,-122.083122108574798 37.422104649494599 17,-122.082924737457205 37.422265039903863 17,-122.082933916938501 37.422312428430942 17,-122.083383735973698 37.422250460876178 17,-122.083360785424802 37.422341592287452 17,-122.083420455164202 37.42237075460644 17,-122.083659133885007 37.422512920110009 17,-122.083975843895203 37.422658730937812 17,-122.084237474333094 37.422651439725207 17,-122.0845036949503 37.422651438643499 17,-122.0848020460801 37.422611339163147 17,-122.084788275051494 37.422563950551208 17,-122.084893845961204 37.422571240447859 17))'
-    if ogrtest.check_feature_geometry(feat, wkt):
-        return 'fail'
+    assert not ogrtest.check_feature_geometry(feat, wkt)
 
     feat = lyr.GetNextFeature()
-    if feat is None:
-        gdaltest.post_reason('expected feature not found.')
-        return 'fail'
+    assert feat is not None, 'expected feature not found.'
 
     wkt = 'POLYGON ((-122.085741277148301 37.422270331552568 17,-122.085816976848093 37.422314088323461 17,-122.085852582875006 37.422303374697442 17,-122.085879994563896 37.422256861387893 17,-122.085886010140896 37.422231107613797 17,-122.085806915728796 37.422202501738553 17,-122.085837954265301 37.42214027058678 17,-122.085673264051906 37.422086902144081 17,-122.085602292640701 37.42214885429042 17,-122.085590277843593 37.422128290487002 17,-122.085584167223701 37.422081719672462 17,-122.085485206574106 37.42210455874995 17,-122.085506726435199 37.422142679498243 17,-122.085443071291493 37.422127838461719 17,-122.085099071490404 37.42251282407603 17,-122.085676981863202 37.422818153236513 17,-122.086016227378295 37.422449188587223 17,-122.085726032700407 37.422292396042529 17,-122.085741277148301 37.422270331552568 17))'
-    if ogrtest.check_feature_geometry(feat, wkt):
-        return 'fail'
+    assert not ogrtest.check_feature_geometry(feat, wkt)
 
     feat = lyr.GetNextFeature()
-    if feat is None:
-        gdaltest.post_reason('expected feature not found.')
-        return 'fail'
+    assert feat is not None, 'expected feature not found.'
 
     wkt = 'POLYGON ((-122.085786228724203 37.421362088869692 25,-122.085731299060299 37.421369359894811 25,-122.085731299291794 37.421409349109027 25,-122.085607707367899 37.421383901665649 25,-122.085580242651602 37.42137299550869 25,-122.085218622197104 37.421372995043157 25,-122.085227776563897 37.421616565082651 25,-122.085259818934702 37.421605658944031 25,-122.085259818549901 37.421682001560001 25,-122.085236931147804 37.421700178603459 25,-122.085264395782801 37.421761979825753 25,-122.085323903274599 37.421761980139067 25,-122.085355945432397 37.421852864451999 25,-122.085410875246296 37.421889218237339 25,-122.085479537935697 37.42189285337048 25,-122.085543622981902 37.421889217975462 25,-122.085626017804202 37.421860134999257 25,-122.085937287963006 37.421860134536047 25,-122.085942871866607 37.42160898590042 25,-122.085965546986102 37.421579927591438 25,-122.085864046234093 37.421471150029568 25,-122.0858548911215 37.421405713261841 25,-122.085809116276806 37.4214057134039 25,-122.085786228724203 37.421362088869692 25))'
-    if ogrtest.check_feature_geometry(feat, wkt):
-        return 'fail'
+    assert not ogrtest.check_feature_geometry(feat, wkt)
 
     feat = lyr.GetNextFeature()
-    if feat is None:
-        gdaltest.post_reason('expected feature not found.')
-        return 'fail'
+    assert feat is not None, 'expected feature not found.'
 
     wkt = 'POLYGON ((-122.084437112828397 37.421772530030907 19,-122.084511885574599 37.421911115428962 19,-122.0850470999805 37.421787551215353 19,-122.085071991339106 37.421436630231611 19,-122.084916406231997 37.421372378221157 19,-122.084219386816699 37.421372378016258 19,-122.084219386589993 37.421476171614962 19,-122.083808641999099 37.4214613409357 19,-122.083789972856394 37.421313064107963 19,-122.083279653469802 37.421293288405927 19,-122.083260981920702 37.421392139442979 19,-122.082937362173695 37.421372363998763 19,-122.082906242566693 37.421515697788713 19,-122.082850226966499 37.421762825764652 19,-122.082943578863507 37.421767769696352 19,-122.083217411188002 37.421792485526858 19,-122.0835970430103 37.421748007445601 19,-122.083945555677104 37.421693642376027 19,-122.084007789463698 37.421762838158529 19,-122.084113587521003 37.421748011043917 19,-122.084076247378405 37.421713412923751 19,-122.084144704773905 37.421678815345693 19,-122.084144704222993 37.421817206601972 19,-122.084250333307395 37.421817070044597 19,-122.084437112828397 37.421772530030907 19))'
-    if ogrtest.check_feature_geometry(feat, wkt):
-        return 'fail'
+    assert not ogrtest.check_feature_geometry(feat, wkt)
 
     return 'success'
 
@@ -399,13 +328,9 @@ def ogr_libkml_write(filename):
 
         dst_feat = ogr.Feature(lyr.GetLayerDefn())
         dst_feat.SetGeometry(ogr.CreateGeometryFromWkt('POINT (2 49)'))
-        if lyr.CreateFeature(dst_feat) != 0:
-            gdaltest.post_reason('CreateFeature failed.')
-            return 'fail'
-        if dst_feat.GetGeometryRef().ExportToWkt() != 'POINT (2 49)':
-            print(dst_feat.GetGeometryRef().ExportToWkt())
-            gdaltest.post_reason('CreateFeature changed the geometry.')
-            return 'fail'
+        assert lyr.CreateFeature(dst_feat) == 0, 'CreateFeature failed.'
+        assert dst_feat.GetGeometryRef().ExportToWkt() == 'POINT (2 49)', \
+            'CreateFeature changed the geometry.'
 
     lyr = ds.CreateLayer('test_wgs84')
 
@@ -421,51 +346,35 @@ def ogr_libkml_write(filename):
     dst_feat.SetField('description', 'my_description')
     dst_feat.SetField('foo', 'bar')
     dst_feat.SetGeometry(ogr.CreateGeometryFromWkt('POINT (2 49)'))
-    if lyr.CreateFeature(dst_feat) != 0:
-        gdaltest.post_reason('CreateFeature failed.')
-        return 'fail'
+    assert lyr.CreateFeature(dst_feat) == 0, 'CreateFeature failed.'
 
     dst_feat = ogr.Feature(lyr.GetLayerDefn())
     dst_feat.SetGeometry(ogr.CreateGeometryFromWkt('POINT (2 49 1)'))
-    if lyr.CreateFeature(dst_feat) != 0:
-        gdaltest.post_reason('CreateFeature failed.')
-        return 'fail'
+    assert lyr.CreateFeature(dst_feat) == 0, 'CreateFeature failed.'
 
     dst_feat = ogr.Feature(lyr.GetLayerDefn())
     dst_feat.SetGeometry(ogr.CreateGeometryFromWkt('LINESTRING (0 1,2 3)'))
-    if lyr.CreateFeature(dst_feat) != 0:
-        gdaltest.post_reason('CreateFeature failed.')
-        return 'fail'
+    assert lyr.CreateFeature(dst_feat) == 0, 'CreateFeature failed.'
 
     dst_feat = ogr.Feature(lyr.GetLayerDefn())
     dst_feat.SetGeometry(ogr.CreateGeometryFromWkt('POLYGON ((0 0 0,0 1 0,1 1 0,1 0 0,0 0 0),(0.25 0.25 0,0.25 0.75 0,0.75 0.75 0,0.75 0.25 0,0.25 0.25 0))'))
-    if lyr.CreateFeature(dst_feat) != 0:
-        gdaltest.post_reason('CreateFeature failed.')
-        return 'fail'
+    assert lyr.CreateFeature(dst_feat) == 0, 'CreateFeature failed.'
 
     dst_feat = ogr.Feature(lyr.GetLayerDefn())
     dst_feat.SetGeometry(ogr.CreateGeometryFromWkt('MULTIPOINT (2 49,2 49)'))
-    if lyr.CreateFeature(dst_feat) != 0:
-        gdaltest.post_reason('CreateFeature failed.')
-        return 'fail'
+    assert lyr.CreateFeature(dst_feat) == 0, 'CreateFeature failed.'
 
     dst_feat = ogr.Feature(lyr.GetLayerDefn())
     dst_feat.SetGeometry(ogr.CreateGeometryFromWkt('MULTILINESTRING ((0 1,2 3),(0 1,2 3))'))
-    if lyr.CreateFeature(dst_feat) != 0:
-        gdaltest.post_reason('CreateFeature failed.')
-        return 'fail'
+    assert lyr.CreateFeature(dst_feat) == 0, 'CreateFeature failed.'
 
     dst_feat = ogr.Feature(lyr.GetLayerDefn())
     dst_feat.SetGeometry(ogr.CreateGeometryFromWkt('MULTIPOLYGON (((0 0 0,0 1 0,1 1 0,1 0 0,0 0 0),(0.25 0.25 0,0.25 0.75 0,0.75 0.75 0,0.75 0.25 0,0.25 0.25 0)),((-0.25 0.25 0,-0.25 0.75 0,-0.75 0.75 0,-0.75 0.25 0,-0.25 0.25 0)))'))
-    if lyr.CreateFeature(dst_feat) != 0:
-        gdaltest.post_reason('CreateFeature failed.')
-        return 'fail'
+    assert lyr.CreateFeature(dst_feat) == 0, 'CreateFeature failed.'
 
     dst_feat = ogr.Feature(lyr.GetLayerDefn())
     dst_feat.SetGeometry(ogr.CreateGeometryFromWkt('GEOMETRYCOLLECTION (POINT (2 49 1),LINESTRING (0 1,2 3))'))
-    if lyr.CreateFeature(dst_feat) != 0:
-        gdaltest.post_reason('CreateFeature failed.')
-        return 'fail'
+    assert lyr.CreateFeature(dst_feat) == 0, 'CreateFeature failed.'
 
     ds = None
 
@@ -485,69 +394,42 @@ def ogr_libkml_check_write(filename):
         lyr = ds.GetLayerByName('test_wgs84')
     else:
         lyr = ds.GetLayer(0)
-    if lyr.GetFeatureCount() != 8:
-        gdaltest.post_reason('Bad feature count.')
-        return 'fail'
+    assert lyr.GetFeatureCount() == 8, 'Bad feature count.'
 
     feat = lyr.GetNextFeature()
-    if feat.GetField('name') != 'my_name':
-        print(feat.GetField('name'))
-        gdaltest.post_reason('Unexpected name.')
-        return 'fail'
-    if feat.GetField('description') != 'my_description':
-        print(feat.GetField('description'))
-        gdaltest.post_reason('Unexpected description.')
-        return 'fail'
-    if feat.GetField('foo') != 'bar':
-        print(feat.GetField('foo'))
-        gdaltest.post_reason('Unexpected foo.')
-        return 'fail'
-    if feat.GetGeometryRef().ExportToWkt() != 'POINT (2 49 0)':
-        print(feat.GetGeometryRef().ExportToWkt())
-        gdaltest.post_reason('Unexpected geometry.')
-        return 'fail'
+    assert feat.GetField('name') == 'my_name', 'Unexpected name.'
+    assert feat.GetField('description') == 'my_description', 'Unexpected description.'
+    assert feat.GetField('foo') == 'bar', 'Unexpected foo.'
+    assert feat.GetGeometryRef().ExportToWkt() == 'POINT (2 49 0)', \
+        'Unexpected geometry.'
 
     feat = lyr.GetNextFeature()
-    if feat.GetGeometryRef().ExportToWkt() != 'POINT (2 49 1)':
-        print(feat.GetGeometryRef().ExportToWkt())
-        gdaltest.post_reason('Unexpected geometry.')
-        return 'fail'
+    assert feat.GetGeometryRef().ExportToWkt() == 'POINT (2 49 1)', \
+        'Unexpected geometry.'
 
     feat = lyr.GetNextFeature()
-    if feat.GetGeometryRef().ExportToWkt() != 'LINESTRING (0 1 0,2 3 0)':
-        print(feat.GetGeometryRef().ExportToWkt())
-        gdaltest.post_reason('Unexpected geometry.')
-        return 'fail'
+    assert feat.GetGeometryRef().ExportToWkt() == 'LINESTRING (0 1 0,2 3 0)', \
+        'Unexpected geometry.'
 
     feat = lyr.GetNextFeature()
-    if feat.GetGeometryRef().ExportToWkt() != 'POLYGON ((0 0 0,0 1 0,1 1 0,1 0 0,0 0 0),(0.25 0.25 0,0.25 0.75 0,0.75 0.75 0,0.75 0.25 0,0.25 0.25 0))':
-        print(feat.GetGeometryRef().ExportToWkt())
-        gdaltest.post_reason('Unexpected geometry.')
-        return 'fail'
+    assert feat.GetGeometryRef().ExportToWkt() == 'POLYGON ((0 0 0,0 1 0,1 1 0,1 0 0,0 0 0),(0.25 0.25 0,0.25 0.75 0,0.75 0.75 0,0.75 0.25 0,0.25 0.25 0))', \
+        'Unexpected geometry.'
 
     feat = lyr.GetNextFeature()
-    if feat.GetGeometryRef().ExportToWkt() != 'MULTIPOINT (2 49 0,2 49 0)':
-        print(feat.GetGeometryRef().ExportToWkt())
-        gdaltest.post_reason('Unexpected geometry.')
-        return 'fail'
+    assert feat.GetGeometryRef().ExportToWkt() == 'MULTIPOINT (2 49 0,2 49 0)', \
+        'Unexpected geometry.'
 
     feat = lyr.GetNextFeature()
-    if feat.GetGeometryRef().ExportToWkt() != 'MULTILINESTRING ((0 1 0,2 3 0),(0 1 0,2 3 0))':
-        print(feat.GetGeometryRef().ExportToWkt())
-        gdaltest.post_reason('Unexpected geometry.')
-        return 'fail'
+    assert feat.GetGeometryRef().ExportToWkt() == 'MULTILINESTRING ((0 1 0,2 3 0),(0 1 0,2 3 0))', \
+        'Unexpected geometry.'
 
     feat = lyr.GetNextFeature()
-    if feat.GetGeometryRef().ExportToWkt() != 'MULTIPOLYGON (((0 0 0,0 1 0,1 1 0,1 0 0,0 0 0),(0.25 0.25 0,0.25 0.75 0,0.75 0.75 0,0.75 0.25 0,0.25 0.25 0)),((-0.25 0.25 0,-0.25 0.75 0,-0.75 0.75 0,-0.75 0.25 0,-0.25 0.25 0)))':
-        print(feat.GetGeometryRef().ExportToWkt())
-        gdaltest.post_reason('Unexpected geometry.')
-        return 'fail'
+    assert feat.GetGeometryRef().ExportToWkt() == 'MULTIPOLYGON (((0 0 0,0 1 0,1 1 0,1 0 0,0 0 0),(0.25 0.25 0,0.25 0.75 0,0.75 0.75 0,0.75 0.25 0,0.25 0.25 0)),((-0.25 0.25 0,-0.25 0.75 0,-0.75 0.75 0,-0.75 0.25 0,-0.25 0.25 0)))', \
+        'Unexpected geometry.'
 
     feat = lyr.GetNextFeature()
-    if feat.GetGeometryRef().ExportToWkt() != 'GEOMETRYCOLLECTION (POINT (2 49 1),LINESTRING (0 1 0,2 3 0))':
-        print(feat.GetGeometryRef().ExportToWkt())
-        gdaltest.post_reason('Unexpected geometry.')
-        return 'fail'
+    assert feat.GetGeometryRef().ExportToWkt() == 'GEOMETRYCOLLECTION (POINT (2 49 1),LINESTRING (0 1 0,2 3 0))', \
+        'Unexpected geometry.'
 
     ds = None
 
@@ -614,9 +496,8 @@ def test_ogr_libkml_xml_attributes():
     feat = lyr.GetNextFeature()
 
     if feat.GetField('description').find('Description<br></br><i attr="val">Interesting</i><br></br>') != 0:
-        gdaltest.post_reason('Wrong description field value')
         print('got: %s ' % feat.GetField('description'))
-        return 'fail'
+        pytest.fail('Wrong description field value')
 
     ds = None
 
@@ -658,9 +539,7 @@ def test_ogr_libkml_test_ogrsf():
 
     ret = gdaltest.runexternal(test_cli_utilities.get_test_ogrsf_path() + ' --config OGR_SKIP KML -ro data/samples.kml')
 
-    if ret.find("using driver `LIBKML'") == -1 or ret.find('INFO') == -1 or ret.find('ERROR') != -1:
-        print(ret)
-        return 'fail'
+    assert not (ret.find("using driver `LIBKML'") == -1 or ret.find('INFO') == -1 or ret.find('ERROR') != -1)
 
     return 'success'
 
@@ -676,8 +555,7 @@ def test_ogr_libkml_read_placemark():
     ds = ogr.Open('data/placemark.kml')
     lyr = ds.GetLayer(0)
     feat = lyr.GetNextFeature()
-    if feat is None:
-        return 'fail'
+    assert feat is not None
 
     ds = None
 
@@ -693,9 +571,7 @@ def test_ogr_libkml_read_empty():
         return 'skip'
 
     ds = ogr.Open('data/empty.kml')
-    if ds.GetLayerCount() != 0:
-        print(ds.GetLayerCount())
-        return 'fail'
+    assert ds.GetLayerCount() == 0
 
     ds = None
 
@@ -711,18 +587,12 @@ def test_ogr_libkml_read_emptylayers():
         return 'skip'
 
     ds = ogr.Open('data/emptylayers.kml')
-    if ds.GetLayerCount() != 2:
-        print(ds.GetLayerCount())
-        return 'fail'
+    assert ds.GetLayerCount() == 2
 
     # --> One difference with the old KML driver
-    if ds.GetLayer(0).GetFeatureCount() != 1:
-        print(ds.GetLayer(0).GetFeatureCount())
-        return 'fail'
+    assert ds.GetLayer(0).GetFeatureCount() == 1
 
-    if ds.GetLayer(1).GetFeatureCount() != 0:
-        print(ds.GetLayer(1).GetFeatureCount())
-        return 'fail'
+    assert ds.GetLayer(1).GetFeatureCount() == 0
 
     ds = None
 
@@ -741,14 +611,11 @@ def test_ogr_libkml_read_emptylayers_without_folder():
         return 'skip'
 
     ds = ogr.Open('data/emptylayers_without_folder.kml')
-    if ds.GetLayerCount() != 1:
-        print(ds.GetLayerCount())
-        return 'fail'
+    assert ds.GetLayerCount() == 1
 
     # --> One difference with the old KML driver
-    if ds.GetLayer(0).GetName() != 'Test':
-        print("Layer name must be '" + ds.GetLayer(0).GetName() + "'.")
-        return 'fail'
+    assert ds.GetLayer(0).GetName() == 'Test', \
+        ("Layer name must be '" + ds.GetLayer(0).GetName() + "'.")
 
     ds = None
 
@@ -764,9 +631,7 @@ def test_ogr_libkml_read_schema():
         return 'skip'
 
     ds = ogr.Open('data/test_schema.kml')
-    if ds.GetLayerCount() != 4:
-        print(ds.GetLayerCount())
-        return 'fail'
+    assert ds.GetLayerCount() == 4
 
     lyr = ds.GetLayer(0)
     feat = lyr.GetNextFeature()
@@ -781,12 +646,10 @@ def test_ogr_libkml_read_schema():
         return 'fail'
 
     lyr = ds.GetLayer(2)
-    if lyr.GetLayerDefn().GetFieldIndex('foo') != -1:
-        return 'fail'
+    assert lyr.GetLayerDefn().GetFieldIndex('foo') == -1
 
     lyr = ds.GetLayer(3)
-    if lyr.GetLayerDefn().GetFieldIndex('foo') != -1:
-        return 'fail'
+    assert lyr.GetLayerDefn().GetFieldIndex('foo') == -1
 
     ds = None
 
@@ -904,15 +767,13 @@ def test_ogr_libkml_camera():
     data = data.decode('ascii')
     gdal.VSIFCloseL(f)
 
-    if data.find('<Camera>') == -1 or \
+    assert (not (data.find('<Camera>') == -1 or \
        data.find('<longitude>2</longitude>') == -1 or \
        data.find('<latitude>49</latitude>') == -1 or \
        data.find('<heading>70</heading>') == -1 or \
        data.find('<tilt>75</tilt>') == -1 or \
        data.find('<roll>10</roll>') == -1 or \
-       data.find('<altitudeMode>relativeToGround</altitudeMode>') == -1:
-        print(data)
-        return 'fail'
+       data.find('<altitudeMode>relativeToGround</altitudeMode>') == -1))
 
     ds = ogr.Open('/vsimem/ogr_libkml_camera.kml')
     lyr = ds.GetLayer(0)
@@ -959,23 +820,19 @@ def test_ogr_libkml_write_layer_lookat():
     data = data.decode('ascii')
     gdal.VSIFCloseL(f)
 
-    if data.find('<LookAt>') == -1 or \
+    assert (not (data.find('<LookAt>') == -1 or \
        data.find('<longitude>2</longitude>') == -1 or \
        data.find('<latitude>49</latitude>') == -1 or \
-       data.find('<range>150</range>') == -1:
-        print(data)
-        return 'fail'
+       data.find('<range>150</range>') == -1))
 
-    if data.find('<LookAt>') == -1 or \
+    assert (not (data.find('<LookAt>') == -1 or \
        data.find('<longitude>3</longitude>') == -1 or \
        data.find('<latitude>50</latitude>') == -1 or \
        data.find('<altitude>100</altitude>') == -1 or \
        data.find('<heading>70</heading>') == -1 or \
        data.find('<tilt>50</tilt>') == -1 or \
        data.find('<range>150</range>') == -1 or \
-       data.find('<altitudeMode>relativeToGround</altitudeMode>') == -1:
-        print(data)
-        return 'fail'
+       data.find('<altitudeMode>relativeToGround</altitudeMode>') == -1))
 
     return 'success'
 
@@ -999,16 +856,14 @@ def test_ogr_libkml_write_layer_camera():
     data = data.decode('ascii')
     gdal.VSIFCloseL(f)
 
-    if data.find('<Camera>') == -1 or \
+    assert (not (data.find('<Camera>') == -1 or \
        data.find('<longitude>3</longitude>') == -1 or \
        data.find('<latitude>50</latitude>') == -1 or \
        data.find('<altitude>100</altitude>') == -1 or \
        data.find('<heading>70</heading>') == -1 or \
        data.find('<tilt>50</tilt>') == -1 or \
        data.find('<roll>10</roll>') == -1 or \
-       data.find('<altitudeMode>relativeToGround</altitudeMode>') == -1:
-        print(data)
-        return 'fail'
+       data.find('<altitudeMode>relativeToGround</altitudeMode>') == -1))
 
     return 'success'
 
@@ -1071,9 +926,7 @@ def test_ogr_libkml_write_snippet():
     data = data.decode('ascii')
     gdal.VSIFCloseL(f)
 
-    if data.find('<snippet>test_snippet</snippet>') == -1:
-        print(data)
-        return 'fail'
+    assert data.find('<snippet>test_snippet</snippet>') != -1
 
     ds = ogr.Open("/vsimem/ogr_libkml_write_snippet.kml")
     lyr = ds.GetLayer(0)
@@ -1099,9 +952,7 @@ def test_ogr_libkml_write_atom_author():
     filepath = '/vsimem/ogr_libkml_write_atom_author.kml'
     ds = ogr.GetDriverByName('LIBKML').CreateDataSource(filepath,
                                                         options=['author_name=name', 'author_uri=http://foo', 'author_email=foo@bar.com'])
-    if ds is None:
-        gdaltest.post_reason('Unable to create %s.' % filepath)
-        return 'fail'
+    assert ds is not None, ('Unable to create %s.' % filepath)
     ds = None
 
     f = gdal.VSIFOpenL(filepath, 'rb')
@@ -1109,13 +960,11 @@ def test_ogr_libkml_write_atom_author():
     data = data.decode('ascii')
     gdal.VSIFCloseL(f)
 
-    if data.find('<kml xmlns="http://www.opengis.net/kml/2.2" xmlns:atom="http://www.w3.org/2005/Atom">') == -1 or \
+    assert (not (data.find('<kml xmlns="http://www.opengis.net/kml/2.2" xmlns:atom="http://www.w3.org/2005/Atom">') == -1 or \
        data.find('<atom:name>name</atom:name>') == -1 or \
        data.find('<atom:uri>http://foo</atom:uri>') == -1 or \
-       data.find('<atom:email>foo@bar.com</atom:email>') == -1:
-        print(data)
-        gdaltest.post_reason('failure to find an atom string')
-        return 'fail'
+       data.find('<atom:email>foo@bar.com</atom:email>') == -1)), \
+        'failure to find an atom string'
 
     return 'success'
 
@@ -1131,9 +980,7 @@ def test_ogr_libkml_write_atom_link():
     filepath = '/vsimem/ogr_libkml_write_atom_link.kml'
     ds = ogr.GetDriverByName('LIBKML').CreateDataSource(filepath,
                                                         options=['link=http://foo'])
-    if ds is None:
-        gdaltest.post_reason('Unable to create %s.' % filepath)
-        return 'fail'
+    assert ds is not None, ('Unable to create %s.' % filepath)
     ds = None
 
     f = gdal.VSIFOpenL(filepath, 'rb')
@@ -1141,10 +988,8 @@ def test_ogr_libkml_write_atom_link():
     data = data.decode('ascii')
     gdal.VSIFCloseL(f)
 
-    if data.find('<kml xmlns="http://www.opengis.net/kml/2.2" xmlns:atom="http://www.w3.org/2005/Atom">') == -1 or \
-       data.find('<atom:link href="http://foo" rel="related"/>') == -1:
-        print(data)
-        return 'fail'
+    assert (not (data.find('<kml xmlns="http://www.opengis.net/kml/2.2" xmlns:atom="http://www.w3.org/2005/Atom">') == -1 or \
+       data.find('<atom:link href="http://foo" rel="related"/>') == -1))
 
     return 'success'
 
@@ -1160,9 +1005,7 @@ def test_ogr_libkml_write_phonenumber():
     filepath = '/vsimem/ogr_libkml_write_phonenumber.kml'
     ds = ogr.GetDriverByName('LIBKML').CreateDataSource(filepath,
                                                         options=['phonenumber=tel:911'])
-    if ds is None:
-        gdaltest.post_reason('Unable to create %s.' % filepath)
-        return 'fail'
+    assert ds is not None, ('Unable to create %s.' % filepath)
     ds = None
 
     f = gdal.VSIFOpenL(filepath, 'rb')
@@ -1170,9 +1013,7 @@ def test_ogr_libkml_write_phonenumber():
     data = data.decode('ascii')
     gdal.VSIFCloseL(f)
 
-    if data.find('<phoneNumber>tel:911</phoneNumber>') == -1:
-        print(data)
-        return 'fail'
+    assert data.find('<phoneNumber>tel:911</phoneNumber>') != -1
 
     return 'success'
 
@@ -1201,25 +1042,21 @@ def test_ogr_libkml_write_region():
     data = data.decode('ascii')
     gdal.VSIFCloseL(f)
 
-    if data.find('<north>49</north>') == -1 or \
+    assert (not (data.find('<north>49</north>') == -1 or \
        data.find('<south>48</south>') == -1 or \
        data.find('<east>3</east>') == -1 or \
        data.find('<west>2</west>') == -1 or \
        data.find('<minLodPixels>256</minLodPixels>') == -1 or \
-       data.find('<maxLodPixels>-1</maxLodPixels>') == -1:
-        print(data)
-        return 'fail'
+       data.find('<maxLodPixels>-1</maxLodPixels>') == -1))
 
-    if data.find('<north>90</north>') == -1 or \
+    assert (not (data.find('<north>90</north>') == -1 or \
        data.find('<south>-90</south>') == -1 or \
        data.find('<east>180</east>') == -1 or \
        data.find('<west>-180</west>') == -1 or \
        data.find('<minLodPixels>128</minLodPixels>') == -1 or \
        data.find('<maxLodPixels>10000000</maxLodPixels>') == -1 or \
        data.find('<minFadeExtent>1</minFadeExtent>') == -1 or \
-       data.find('<maxFadeExtent>2</maxFadeExtent>') == -1:
-        print(data)
-        return 'fail'
+       data.find('<maxFadeExtent>2</maxFadeExtent>') == -1))
 
     return 'success'
 
@@ -1256,18 +1093,14 @@ def test_ogr_libkml_write_screenoverlay():
     data = data.decode('ascii')
     gdal.VSIFCloseL(f)
 
-    if data.find('<href>http://foo</href>') == -1 or \
-       data.find('<screenXY x="0.05" xunits="fraction" y="0.05" yunits="fraction"/>') == -1:
-        print(data)
-        return 'fail'
+    assert (not (data.find('<href>http://foo</href>') == -1 or \
+       data.find('<screenXY x="0.05" xunits="fraction" y="0.05" yunits="fraction"/>') == -1))
 
-    if data.find('<overlayXY x="10" xunits="pixels" y="20" yunits="pixels"/>') == -1 or \
+    assert (not (data.find('<overlayXY x="10" xunits="pixels" y="20" yunits="pixels"/>') == -1 or \
        data.find('<screenXY x="0.4" xunits="fraction" y="0.5" yunits="fraction"/>') == -1 or \
        data.find('<size x="1.1" xunits="fraction" y="1.2" yunits="fraction"/>') == -1 or \
        data.find('<name>name</name>') == -1 or \
-       data.find('<description>description</description>') == -1:
-        print(data)
-        return 'fail'
+       data.find('<description>description</description>') == -1))
 
     return 'success'
 
@@ -1315,7 +1148,7 @@ def test_ogr_libkml_write_model():
     data = data.decode('ascii')
     gdal.VSIFCloseL(f)
 
-    if data.find('<longitude>2</longitude>') == -1 or \
+    assert (not (data.find('<longitude>2</longitude>') == -1 or \
        data.find('<latitude>49</latitude>') == -1 or \
        data.find('<altitude>10</altitude>') == -1 or \
        data.find('<altitudeMode>relativeToGround</altitudeMode>') == -1 or \
@@ -1329,18 +1162,15 @@ def test_ogr_libkml_write_model():
        data.find('<y>1</y>') == -1 or \
        data.find('<z>1</z>') == -1 or \
        data.find('<href>http://makc.googlecode.com/svn/trunk/flash/sandy_flar2/cube.dae</href>') == -1 or \
-       data.find('<href>http://foo</href>') == -1:
-        print(data)
-        return 'fail'
+       data.find('<href>http://foo</href>') == -1))
 
     # This can only appear if HTTP resource is available and GDAL is built with curl/http support
     if gdal.GetDriverByName('HTTP') is not None and \
        (data.find('<targetHref>http://makc.googlecode.com/svn/trunk/flash/sandy_flar2/cube.gif</targetHref>') == -1 or
             data.find('<sourceHref>cube.gif</sourceHref>') == -1):
 
-        if gdaltest.gdalurlopen('http://makc.googlecode.com/svn/trunk/flash/sandy_flar2/cube.dae') is not None:
-            print(data)
-            return 'fail'
+        assert gdaltest.gdalurlopen('http://makc.googlecode.com/svn/trunk/flash/sandy_flar2/cube.dae') is None, \
+            data
 
     return 'success'
 
@@ -1446,15 +1276,13 @@ def test_ogr_libkml_read_write_style():
     lines_ref = [l.strip() for l in styles.split('\n')]
     if lines_got != lines_ref:
         print(data)
-        print(styles)
-        return 'fail'
+        pytest.fail(styles)
 
     lines_got = lines[lines.index('<Style id="styleMapExample">'):lines.index('</Document>')]
     lines_ref = [l.strip() for l in resolved_stylemap.split('\n')]
     if lines_got != lines_ref:
         print(data)
-        print(resolved_stylemap)
-        return 'fail'
+        pytest.fail(resolved_stylemap)
 
     # Test reading highlight style in StyleMap
     gdal.SetConfigOption('LIBKML_STYLEMAP_KEY', 'HIGHLIGHT')
@@ -1477,8 +1305,7 @@ def test_ogr_libkml_read_write_style():
     lines_ref = [l.strip() for l in resolved_stylemap_highlight.split('\n')]
     if lines_got != lines_ref:
         print(data)
-        print(resolved_stylemap_highlight)
-        return 'fail'
+        pytest.fail(resolved_stylemap_highlight)
 
     # Test writing feature style
     ds = ogr.GetDriverByName('LIBKML').CreateDataSource('/vsimem/ogr_libkml_read_write_style_write.kml')
@@ -1497,13 +1324,9 @@ def test_ogr_libkml_read_write_style():
     ds = ogr.Open('/vsimem/ogr_libkml_read_write_style_write.kml')
     lyr = ds.GetLayer(0)
     feat = lyr.GetNextFeature()
-    if feat.GetStyleString() != '@unknown_style':
-        print(feat.GetStyleString())
-        return 'fail'
+    assert feat.GetStyleString() == '@unknown_style'
     feat = lyr.GetNextFeature()
-    if feat.GetStyleString() != style_string:
-        print(feat.GetStyleString())
-        return 'fail'
+    assert feat.GetStyleString() == style_string
     ds = None
 
     f = gdal.VSIFOpenL('/vsimem/ogr_libkml_read_write_style_write.kml', 'rb')
@@ -1538,8 +1361,7 @@ def test_ogr_libkml_read_write_style():
     lines_ref = [l.strip() for l in expected_style.split('\n')]
     if lines_got != lines_ref:
         print(data)
-        print(resolved_stylemap_highlight)
-        return 'fail'
+        pytest.fail(resolved_stylemap_highlight)
 
     # Automatic StyleMap creation testing
     ds = ogr.GetDriverByName('LIBKML').CreateDataSource('/vsimem/ogr_libkml_read_write_style_write.kml')
@@ -1586,8 +1408,7 @@ def test_ogr_libkml_read_write_style():
     lines_ref = [l.strip() for l in expected_styles.split('\n')]
     if lines_got != lines_ref:
         print(data)
-        print(styles)
-        return 'fail'
+        pytest.fail(styles)
 
     return 'success'
 
@@ -1628,14 +1449,12 @@ def test_ogr_libkml_write_update():
             f = gdal.VSIFOpenL('/vsizip//vsimem/ogr_libkml_write_update.kmz', 'rb')
         else:
             f = gdal.VSIFOpenL('/vsimem/ogr_libkml_write_update_dir/doc.kml', 'rb')
-        if f is None:
-            gdaltest.post_reason('Unable to open the write_update file.')
-            return 'fail'
+        assert f is not None, 'Unable to open the write_update file.'
         data = gdal.VSIFReadL(1, 2048, f)
         data = data.decode('ascii')
         gdal.VSIFCloseL(f)
 
-        if data.find('<NetworkLinkControl>') == -1 or \
+        assert (not (data.find('<NetworkLinkControl>') == -1 or \
                 data.find('<Update>') == -1 or \
                 data.find('<targetHref>http://foo</targetHref>') == -1 or \
                 data.find('<Placemark/>') == -1 or \
@@ -1645,9 +1464,7 @@ def test_ogr_libkml_write_update():
                 data.find('<Change>') == -1 or \
                 data.find('<Placemark targetId="layer_to_edit.2"/>') == -1 or \
                 data.find('<Delete>') == -1 or \
-                data.find('<Placemark targetId="layer_to_edit.3"/>') == -1:
-            print(data)
-            return 'fail'
+                data.find('<Placemark targetId="layer_to_edit.3"/>') == -1))
 
     return 'success'
 
@@ -1679,9 +1496,7 @@ def test_ogr_libkml_write_networklinkcontrol():
             name = "/vsimem/ogr_libkml_write_networklinkcontrol_dir"
 
         ds = ogr.GetDriverByName('LIBKML').CreateDataSource(name, options=options)
-        if ds is None:
-            gdaltest.post_reason('Unable to create %s.' % name)
-            return 'fail'
+        assert ds is not None, ('Unable to create %s.' % name)
         ds = None
 
         if i == 0:
@@ -1690,22 +1505,19 @@ def test_ogr_libkml_write_networklinkcontrol():
             f = gdal.VSIFOpenL('/vsizip//vsimem/ogr_libkml_write_networklinkcontrol.kmz', 'rb')
         else:
             f = gdal.VSIFOpenL('/vsimem/ogr_libkml_write_networklinkcontrol_dir/doc.kml', 'rb')
-        if f is None:
-            return 'fail'
+        assert f is not None
         data = gdal.VSIFReadL(1, 2048, f)
         data = data.decode('ascii')
         gdal.VSIFCloseL(f)
 
-        if data.find('<minRefreshPeriod>3600</minRefreshPeriod>') == -1 or \
+        assert (not (data.find('<minRefreshPeriod>3600</minRefreshPeriod>') == -1 or \
                 data.find('<maxSessionLength>-1</maxSessionLength>') == -1 or \
                 data.find('<cookie>cookie</cookie>') == -1 or \
                 data.find('<message>message</message>') == -1 or \
                 data.find('<linkName>linkname</linkName>') == -1 or \
                 data.find('<linkDescription>linkdescription</linkDescription>') == -1 or \
                 data.find('<linkSnippet>linksnippet</linkSnippet>') == -1 or \
-                data.find('<expires>2014-12-31T23:59:59Z</expires>') == -1:
-            print(data)
-            return 'fail'
+                data.find('<expires>2014-12-31T23:59:59Z</expires>') == -1))
 
     return 'success'
 
@@ -1734,7 +1546,7 @@ def test_ogr_libkml_write_liststyle():
     data = data.decode('ascii')
     gdal.VSIFCloseL(f)
 
-    if data.find('<styleUrl>#root_doc_liststyle</styleUrl>') == -1 or \
+    assert (not (data.find('<styleUrl>#root_doc_liststyle</styleUrl>') == -1 or \
        data.find('<Style id="root_doc_liststyle">') == -1 or \
        data.find('<href>http://www.gdal.org/gdalicon.png</href>') == -1 or \
        data.find('<styleUrl>#test_liststyle</styleUrl>') == -1 or \
@@ -1743,9 +1555,7 @@ def test_ogr_libkml_write_liststyle():
        data.find('<listItemType>check</listItemType>') == -1 or \
        data.find('<listItemType>radioFolder</listItemType>') == -1 or \
        data.find('<listItemType>checkOffOnly</listItemType>') == -1 or \
-       data.find('<listItemType>checkHideChildren</listItemType>') == -1:
-        print(data)
-        return 'fail'
+       data.find('<listItemType>checkHideChildren</listItemType>') == -1))
 
     return 'success'
 
@@ -1801,7 +1611,7 @@ def test_ogr_libkml_write_networklink():
     data = data.decode('ascii')
     gdal.VSIFCloseL(f)
 
-    if data.find('<name>a network link</name>') == -1 or \
+    assert (not (data.find('<name>a network link</name>') == -1 or \
        data.find('<refreshVisibility>1</refreshVisibility>') == -1 or \
        data.find('<flyToView>1</flyToView>') == -1 or \
        data.find('<href>http://developers.google.com/kml/documentation/Point.kml</href>') == -1 or \
@@ -1813,9 +1623,7 @@ def test_ogr_libkml_write_networklink():
        data.find('<refreshMode>onExpire</refreshMode>') == -1 or \
        data.find('<viewRefreshMode>onRegion</viewRefreshMode>') == -1 or \
        data.find('<viewBoundScale>0.5</viewBoundScale>') == -1 or \
-       data.find('<viewFormat>BBOX=[bboxWest],[bboxSouth],[bboxEast],[bboxNorth]</viewFormat>') == -1:
-        print(data)
-        return 'fail'
+       data.find('<viewFormat>BBOX=[bboxWest],[bboxSouth],[bboxEast],[bboxNorth]</viewFormat>') == -1))
 
     return 'success'
 
@@ -1881,7 +1689,7 @@ def test_ogr_libkml_write_photooverlay():
     data = data.decode('ascii')
     gdal.VSIFCloseL(f)
 
-    if data.find('<Camera>') == -1 or \
+    assert (not (data.find('<Camera>') == -1 or \
        data.find('<longitude>2.2946</longitude>') == -1 or \
        data.find('<latitude>48.8583</latitude>') == -1 or \
        data.find('<altitude>20</altitude>') == -1 or \
@@ -1901,9 +1709,7 @@ def test_ogr_libkml_write_photooverlay():
        data.find('<tileSize>256</tileSize>') == -1 or \
        data.find('<maxWidth>512</maxWidth>') == -1 or \
        data.find('<maxHeight>512</maxHeight>') == -1 or \
-       data.find('<gridOrigin>upperLeft</gridOrigin>') == -1:
-        print(data)
-        return 'fail'
+       data.find('<gridOrigin>upperLeft</gridOrigin>') == -1))
 
     return 'success'
 
@@ -1932,16 +1738,13 @@ def test_ogr_libkml_read_write_data():
     data = data.decode('ascii')
     gdal.VSIFCloseL(f)
 
-    if data.find('<Data name="foo">') == -1 or \
-       data.find('<value>bar</value>') == -1:
-        print(data)
-        return 'fail'
+    assert (not (data.find('<Data name="foo">') == -1 or \
+       data.find('<value>bar</value>') == -1))
 
     ds = ogr.Open("/vsimem/ogr_libkml_read_write_data.kml")
     lyr = ds.GetLayer(0)
     feat = lyr.GetNextFeature()
-    if feat.GetField('foo') != 'bar':
-        return 'fail'
+    assert feat.GetField('foo') == 'bar'
 
     return 'success'
 
@@ -1964,13 +1767,11 @@ def test_ogr_libkml_write_folder():
     data = data.decode('ascii')
     gdal.VSIFCloseL(f)
 
-    if data.find('<Style id="test_liststyle">') == -1 or \
+    assert (not (data.find('<Style id="test_liststyle">') == -1 or \
        data.find('<href>http://foo</href>') == -1 or \
        data.find('<Folder id="test">') == -1 or \
        data.find('<styleUrl>#test_liststyle</styleUrl>') == -1 or \
-       data.find('<Folder id="test2">') == -1:
-        print(data)
-        return 'fail'
+       data.find('<Folder id="test2">') == -1))
 
     return 'success'
 
@@ -1993,7 +1794,7 @@ def test_ogr_libkml_write_container_properties():
     data = data.decode('ascii')
     gdal.VSIFCloseL(f)
 
-    if data.find('<name>ds_name</name>') == -1 or \
+    assert (not (data.find('<name>ds_name</name>') == -1 or \
        data.find('<visibility>1</visibility>') == -1 or \
        data.find('<open>1</open>') == -1 or \
        data.find('<snippet>ds_snippet</snippet>') == -1 or \
@@ -2002,9 +1803,7 @@ def test_ogr_libkml_write_container_properties():
        data.find('<visibility>0</visibility>') == -1 or \
        data.find('<open>0</open>') == -1 or \
        data.find('<snippet>lyr_snippet</snippet>') == -1 or \
-       data.find('<description>lyr_description</description>') == -1:
-        print(data)
-        return 'fail'
+       data.find('<description>lyr_description</description>') == -1))
 
     return 'success'
 
@@ -2042,8 +1841,7 @@ def test_ogr_libkml_read_placemark_with_kml_prefix():
     ds = ogr.Open('data/placemark_with_kml_prefix.kml')
     lyr = ds.GetLayer(0)
     feat = lyr.GetNextFeature()
-    if feat is None:
-        return 'fail'
+    assert feat is not None
 
     return 'success'
 
@@ -2058,13 +1856,9 @@ def test_ogr_libkml_read_duplicate_folder_name():
 
     ds = ogr.Open('data/duplicate_folder_name.kml')
     lyr = ds.GetLayer(0)
-    if lyr.GetName() != 'layer':
-        print(lyr.GetName())
-        return 'fail'
+    assert lyr.GetName() == 'layer'
     lyr = ds.GetLayer(1)
-    if lyr.GetName() != 'layer (#2)':
-        print(lyr.GetName())
-        return 'fail'
+    assert lyr.GetName() == 'layer (#2)'
 
     return 'success'
 
@@ -2079,16 +1873,12 @@ def test_ogr_libkml_read_placemark_in_root_and_subfolder():
 
     ds = ogr.Open('data/placemark_in_root_and_subfolder.kml')
     lyr = ds.GetLayerByName('TopLevel')
-    if lyr is None:
-        return 'fail'
-    if lyr.GetFeatureCount() != 1:
-        return 'fail'
+    assert lyr is not None
+    assert lyr.GetFeatureCount() == 1
 
     lyr = ds.GetLayerByName('SubFolder1')
-    if lyr is None:
-        return 'fail'
-    if lyr.GetFeatureCount() != 1:
-        return 'fail'
+    assert lyr is not None
+    assert lyr.GetFeatureCount() == 1
 
     return 'success'
 
@@ -2107,8 +1897,7 @@ def test_ogr_libkml_read_tab_separated_coord_triplet():
 
     wkt = 'LINESTRING Z (1 2 3,4 5 6)'
 
-    if ogrtest.check_feature_geometry(feat, wkt):
-        return 'fail'
+    assert not ogrtest.check_feature_geometry(feat, wkt)
 
     return 'success'
 
@@ -2127,8 +1916,7 @@ def test_ogr_libkml_read_kml_with_space_content_in_coordinates():
 
     wkt = 'LINESTRING EMPTY'
 
-    if ogrtest.check_feature_geometry(feat, wkt):
-        return 'fail'
+    assert not ogrtest.check_feature_geometry(feat, wkt)
 
     return 'success'
 
@@ -2187,8 +1975,7 @@ def test_ogr_libkml_update_existing_kml():
     ds = ogr.Open(filename)
     lyr = ds.GetLayer(0)
     fc_after = lyr.GetFeatureCount()
-    if fc_after != fc_before + 1:
-        return 'fail'
+    assert fc_after == fc_before + 1
 
     gdal.Unlink(filename)
     return 'success'
diff --git a/autotest/ogr/ogr_mem.py b/autotest/ogr/ogr_mem.py
index de05be3dc732..b145c5ddabba 100755
--- a/autotest/ogr/ogr_mem.py
+++ b/autotest/ogr/ogr_mem.py
@@ -46,8 +46,7 @@ def test_ogr_mem_1():
     mem_drv = ogr.GetDriverByName('Memory')
     gdaltest.mem_ds = mem_drv.CreateDataSource('wrk_in_memory')
 
-    if gdaltest.mem_ds is None:
-        return 'fail'
+    assert gdaltest.mem_ds is not None
 
     return 'success'
 
@@ -60,9 +59,8 @@ def test_ogr_mem_2():
     if gdaltest.mem_ds is None:
         return 'skip'
 
-    if gdaltest.mem_ds.TestCapability(ogr.ODsCCreateLayer) == 0:
-        gdaltest.post_reason('ODsCCreateLayer TestCapability failed.')
-        return 'fail'
+    assert gdaltest.mem_ds.TestCapability(ogr.ODsCCreateLayer) != 0, \
+        'ODsCCreateLayer TestCapability failed.'
 
     #######################################################
     # Create memory Layer
@@ -94,9 +92,7 @@ def test_ogr_mem_2():
 
         dst_feat.SetFrom(feat)
         ret = gdaltest.mem_lyr.CreateFeature(dst_feat)
-        if ret != 0:
-            gdaltest.post_reason('CreateFeature() failed.')
-            return 'fail'
+        assert ret == 0, 'CreateFeature() failed.'
 
         feat = shp_lyr.GetNextFeature()
 
@@ -121,14 +117,12 @@ def test_ogr_mem_3():
         orig_feat = gdaltest.poly_feat[i]
         read_feat = gdaltest.mem_lyr.GetNextFeature()
 
-        if ogrtest.check_feature_geometry(read_feat, orig_feat.GetGeometryRef(),
-                                          max_error=0.000000001) != 0:
-            return 'fail'
+        assert (ogrtest.check_feature_geometry(read_feat, orig_feat.GetGeometryRef(),
+                                          max_error=0.000000001) == 0)
 
         for fld in range(3):
-            if orig_feat.GetField(fld) != read_feat.GetField(fld):
-                gdaltest.post_reason('Attribute %d does not match' % fld)
-                return 'fail'
+            assert orig_feat.GetField(fld) == read_feat.GetField(fld), \
+                ('Attribute %d does not match' % fld)
 
     gdaltest.poly_feat = None
     gdaltest.shp_ds = None
@@ -166,8 +160,7 @@ def test_ogr_mem_4():
         gdaltest.mem_lyr.SetAttributeFilter("PRFEDEA = '%s'" % item)
         feat_read = gdaltest.mem_lyr.GetNextFeature()
 
-        if ogrtest.check_feature_geometry(feat_read, geom) != 0:
-            return 'fail'
+        assert ogrtest.check_feature_geometry(feat_read, geom) == 0
 
     return 'success'
 
@@ -229,9 +222,8 @@ def test_ogr_mem_7():
     gdaltest.mem_lyr.SetSpatialFilter(geom)
     geom.Destroy()
 
-    if gdaltest.mem_lyr.TestCapability(ogr.OLCFastSpatialFilter):
-        gdaltest.post_reason('OLCFastSpatialFilter capability test should have failed.')
-        return 'fail'
+    assert not gdaltest.mem_lyr.TestCapability(ogr.OLCFastSpatialFilter), \
+        'OLCFastSpatialFilter capability test should have failed.'
 
     tr = ogrtest.check_features_against_list(gdaltest.mem_lyr, 'eas_id',
                                              [158])
@@ -265,8 +257,7 @@ def test_ogr_mem_8():
     gdal.PushErrorHandler('CPLQuietErrorHandler')
     ret = gdaltest.mem_lyr.SetFeature(new_feat)
     gdal.PopErrorHandler()
-    if ret == 0:
-        return 'fail'
+    assert ret != 0
     new_feat = None
 
     ####################################################################
@@ -287,13 +278,11 @@ def test_ogr_mem_8():
 
 def test_ogr_mem_9():
 
-    if not gdaltest.mem_lyr.TestCapability(ogr.OLCDeleteFeature):
-        gdaltest.post_reason('OLCDeleteFeature capability test failed.')
-        return 'fail'
+    assert gdaltest.mem_lyr.TestCapability(ogr.OLCDeleteFeature), \
+        'OLCDeleteFeature capability test failed.'
 
-    if not gdaltest.mem_lyr.TestCapability(ogr.OLCFastFeatureCount):
-        gdaltest.post_reason('OLCFastFeatureCount capability test failed.')
-        return 'fail'
+    assert gdaltest.mem_lyr.TestCapability(ogr.OLCFastFeatureCount), \
+        'OLCFastFeatureCount capability test failed.'
 
     old_count = gdaltest.mem_lyr.GetFeatureCount()
 
@@ -301,13 +290,11 @@ def test_ogr_mem_9():
     # Delete target feature.
 
     target_fid = 2
-    if gdaltest.mem_lyr.DeleteFeature(target_fid) != 0:
-        gdaltest.post_reason('DeleteFeature returned error code.')
-        return 'fail'
+    assert gdaltest.mem_lyr.DeleteFeature(target_fid) == 0, \
+        'DeleteFeature returned error code.'
 
-    if gdaltest.mem_lyr.DeleteFeature(target_fid) == 0:
-        gdaltest.post_reason('DeleteFeature should have returned error code.')
-        return 'fail'
+    assert gdaltest.mem_lyr.DeleteFeature(target_fid) != 0, \
+        'DeleteFeature should have returned error code.'
 
     ####################################################################
     # Verify that count has dropped by one, and that the feature in question
@@ -317,21 +304,14 @@ def test_ogr_mem_9():
         gdaltest.post_reason('got feature count of %d, not expected %d.'
                              % (new_count, old_count - 1))
 
-    if not gdaltest.mem_lyr.TestCapability(ogr.OLCRandomRead):
-        gdaltest.post_reason('OLCRandomRead capability test failed.')
-        return 'fail'
+    assert gdaltest.mem_lyr.TestCapability(ogr.OLCRandomRead), \
+        'OLCRandomRead capability test failed.'
 
-    if gdaltest.mem_lyr.GetFeature(target_fid) is not None:
-        gdaltest.post_reason('Got deleted feature!')
-        return 'fail'
+    assert gdaltest.mem_lyr.GetFeature(target_fid) is None, 'Got deleted feature!'
 
-    if gdaltest.mem_lyr.GetFeature(-1) is not None:
-        gdaltest.post_reason('GetFeature() should have failed')
-        return 'fail'
+    assert gdaltest.mem_lyr.GetFeature(-1) is None, 'GetFeature() should have failed'
 
-    if gdaltest.mem_lyr.GetFeature(1000) is not None:
-        gdaltest.post_reason('GetFeature() should have failed')
-        return 'fail'
+    assert gdaltest.mem_lyr.GetFeature(1000) is None, 'GetFeature() should have failed'
 
     return 'success'
 
@@ -347,9 +327,8 @@ def test_ogr_mem_10():
     ds = d.CreateDataSource('xxxxxx')
 
     d2 = ds.GetDriver()
-    if d2 is None or d2.GetName() != 'Memory':
-        gdaltest.post_reason('Did not get expected driver name.')
-        return 'fail'
+    assert d2 is not None and d2.GetName() == 'Memory', \
+        'Did not get expected driver name.'
 
     return 'success'
 
@@ -359,9 +338,8 @@ def test_ogr_mem_10():
 
 def test_ogr_mem_11():
 
-    if gdaltest.mem_ds.TestCapability('DeleteLayer') == 0:
-        gdaltest.post_reason('Deletelayer TestCapability failed.')
-        return 'fail'
+    assert gdaltest.mem_ds.TestCapability('DeleteLayer') != 0, \
+        'Deletelayer TestCapability failed.'
 
     gdaltest.mem_ds.CreateLayer('extra')
     gdaltest.mem_ds.CreateLayer('extra2')
@@ -369,31 +347,21 @@ def test_ogr_mem_11():
 
     gdaltest.mem_lyr = None
     # Delete extra layer
-    if gdaltest.mem_ds.DeleteLayer(layer_count - 2) != 0:
-        gdaltest.post_reason('DeleteLayer() failed')
-        return 'fail'
+    assert gdaltest.mem_ds.DeleteLayer(layer_count - 2) == 0, 'DeleteLayer() failed'
 
-    if gdaltest.mem_ds.DeleteLayer(-1) == 0:
-        gdaltest.post_reason('DeleteLayer() should have failed')
-        return 'fail'
+    assert gdaltest.mem_ds.DeleteLayer(-1) != 0, 'DeleteLayer() should have failed'
 
-    if gdaltest.mem_ds.DeleteLayer(gdaltest.mem_ds.GetLayerCount()) == 0:
-        gdaltest.post_reason('DeleteLayer() should have failed')
-        return 'fail'
+    assert gdaltest.mem_ds.DeleteLayer(gdaltest.mem_ds.GetLayerCount()) != 0, \
+        'DeleteLayer() should have failed'
 
-    if gdaltest.mem_ds.GetLayer(-1) is not None:
-        gdaltest.post_reason('GetLayer() should have failed')
-        return 'fail'
+    assert gdaltest.mem_ds.GetLayer(-1) is None, 'GetLayer() should have failed'
 
-    if gdaltest.mem_ds.GetLayer(gdaltest.mem_ds.GetLayerCount()) is not None:
-        gdaltest.post_reason('GetLayer() should have failed')
-        return 'fail'
+    assert gdaltest.mem_ds.GetLayer(gdaltest.mem_ds.GetLayerCount()) is None, \
+        'GetLayer() should have failed'
 
     lyr = gdaltest.mem_ds.GetLayer(gdaltest.mem_ds.GetLayerCount() - 1)
 
-    if lyr.GetName() != 'extra2':
-        gdaltest.post_reason('delete layer seems iffy')
-        return 'fail'
+    assert lyr.GetName() == 'extra2', 'delete layer seems iffy'
 
     return 'success'
 
@@ -409,8 +377,7 @@ def test_ogr_mem_12():
     #######################################################
     # Create memory Layer
     lyr = gdaltest.mem_ds.GetLayerByName('tpoly')
-    if lyr is None:
-        return 'fail'
+    assert lyr is not None
 
     # Set the date of the first feature
     f = lyr.GetFeature(1)
@@ -421,9 +388,7 @@ def test_ogr_mem_12():
     expected = [2008, 3, 19, 16, 15, 0.0, 0]
     result = f.GetFieldAsDateTime(idx)
     for i, value in enumerate(result):
-        if value != expected[i]:
-            gdaltest.post_reason('%s != %s' % (result, expected))
-            return 'fail'
+        assert value == expected[i], ('%s != %s' % (result, expected))
     return 'success'
 
 ###############################################################################
@@ -451,19 +416,13 @@ def test_ogr_mem_13():
         return 'skip'
 
     feat.SetFieldStringList(0, ['a', 'b'])
-    if feat.GetFieldAsStringList(0) != ['a', 'b']:
-        print(feat.GetFieldAsStringList(0))
-        return 'fail'
+    assert feat.GetFieldAsStringList(0) == ['a', 'b']
 
     feat.SetFieldIntegerList(1, [2, 3])
-    if feat.GetFieldAsIntegerList(1) != [2, 3]:
-        print(feat.GetFieldAsIntegerList(1))
-        return 'fail'
+    assert feat.GetFieldAsIntegerList(1) == [2, 3]
 
     feat.SetFieldDoubleList(2, [4., 5.])
-    if feat.GetFieldAsDoubleList(2) != [4., 5.]:
-        print(feat.GetFieldAsDoubleList(2))
-        return 'fail'
+    assert feat.GetFieldAsDoubleList(2) == [4., 5.]
 
     return 'success'
 
@@ -489,39 +448,25 @@ def test_ogr_mem_14():
     feat.SetField(0, 'third feature')
     lyr.CreateFeature(feat)
 
-    if not lyr.TestCapability(ogr.OLCFastSetNextByIndex):
-        gdaltest.post_reason('OLCFastSetNextByIndex capability test failed.')
-        return 'fail'
+    assert lyr.TestCapability(ogr.OLCFastSetNextByIndex), \
+        'OLCFastSetNextByIndex capability test failed.'
 
-    if lyr.SetNextByIndex(1) != 0:
-        gdaltest.post_reason('SetNextByIndex() failed')
-        return 'fail'
+    assert lyr.SetNextByIndex(1) == 0, 'SetNextByIndex() failed'
     feat = lyr.GetNextFeature()
-    if feat.GetFieldAsString(0) != 'second feature':
-        gdaltest.post_reason('did not get expected feature')
-        return 'fail'
+    assert feat.GetFieldAsString(0) == 'second feature', 'did not get expected feature'
 
-    if lyr.SetNextByIndex(-1) == 0:
-        gdaltest.post_reason('SetNextByIndex() should have failed')
-        return 'fail'
+    assert lyr.SetNextByIndex(-1) != 0, 'SetNextByIndex() should have failed'
 
-    if lyr.SetNextByIndex(100) == 0:
-        gdaltest.post_reason('SetNextByIndex() should have failed')
-        return 'fail'
+    assert lyr.SetNextByIndex(100) != 0, 'SetNextByIndex() should have failed'
 
     lyr.SetAttributeFilter("foo != 'second feature'")
 
-    if lyr.TestCapability(ogr.OLCFastSetNextByIndex):
-        gdaltest.post_reason('OLCFastSetNextByIndex capability test should have failed.')
-        return 'fail'
+    assert not lyr.TestCapability(ogr.OLCFastSetNextByIndex), \
+        'OLCFastSetNextByIndex capability test should have failed.'
 
-    if lyr.SetNextByIndex(1) != 0:
-        gdaltest.post_reason('SetNextByIndex() failed')
-        return 'fail'
+    assert lyr.SetNextByIndex(1) == 0, 'SetNextByIndex() failed'
     feat = lyr.GetNextFeature()
-    if feat.GetFieldAsString(0) != 'third feature':
-        gdaltest.post_reason('did not get expected feature')
-        return 'fail'
+    assert feat.GetFieldAsString(0) == 'third feature', 'did not get expected feature'
 
     return 'success'
 
@@ -537,37 +482,28 @@ def test_ogr_mem_15():
     lyr.CreateFeature(f)
     f = None
 
-    if lyr.GetGeomType() != ogr.wkbCircularString:
-        return 'fail'
-    if lyr.GetLayerDefn().GetGeomType() != ogr.wkbCircularString:
-        return 'fail'
-    if lyr.GetLayerDefn().GetGeomFieldDefn(0).GetType() != ogr.wkbCircularString:
-        return 'fail'
+    assert lyr.GetGeomType() == ogr.wkbCircularString
+    assert lyr.GetLayerDefn().GetGeomType() == ogr.wkbCircularString
+    assert lyr.GetLayerDefn().GetGeomFieldDefn(0).GetType() == ogr.wkbCircularString
     f = lyr.GetNextFeature()
     g = f.GetGeometryRef()
-    if g.GetGeometryType() != ogr.wkbCircularString:
-        return 'fail'
+    assert g.GetGeometryType() == ogr.wkbCircularString
 
     # Test SetNonLinearGeometriesEnabledFlag(False)
     old_val = ogr.GetNonLinearGeometriesEnabledFlag()
     ogr.SetNonLinearGeometriesEnabledFlag(False)
-    if lyr.GetGeomType() != ogr.wkbLineString:
-        return 'fail'
-    if lyr.GetLayerDefn().GetGeomType() != ogr.wkbLineString:
-        return 'fail'
-    if lyr.GetLayerDefn().GetGeomFieldDefn(0).GetType() != ogr.wkbLineString:
-        return 'fail'
+    assert lyr.GetGeomType() == ogr.wkbLineString
+    assert lyr.GetLayerDefn().GetGeomType() == ogr.wkbLineString
+    assert lyr.GetLayerDefn().GetGeomFieldDefn(0).GetType() == ogr.wkbLineString
     lyr.ResetReading()
     f = lyr.GetNextFeature()
     g = f.GetGeometryRef()
-    if g.GetGeometryType() != ogr.wkbLineString:
-        return 'fail'
+    assert g.GetGeometryType() == ogr.wkbLineString
 
     lyr.ResetReading()
     f = lyr.GetNextFeature()
     g = f.GetGeomFieldRef(0)
-    if g.GetGeometryType() != ogr.wkbLineString:
-        return 'fail'
+    assert g.GetGeometryType() == ogr.wkbLineString
     ogr.SetNonLinearGeometriesEnabledFlag(old_val)
 
     return 'success'
@@ -581,95 +517,66 @@ def test_ogr_mem_16():
     lyr = gdaltest.mem_ds.CreateLayer('ogr_mem_16')
     f = ogr.Feature(lyr.GetLayerDefn())
     ret = lyr.CreateFeature(f)
-    if ret != 0:
-        return 'fail'
-    if f.GetFID() != 0:
-        return 'fail'
+    assert ret == 0
+    assert f.GetFID() == 0
 
     f = ogr.Feature(lyr.GetLayerDefn())
     ret = lyr.CreateFeature(f)
-    if ret != 0:
-        return 'fail'
-    if f.GetFID() != 1:
-        return 'fail'
+    assert ret == 0
+    assert f.GetFID() == 1
 
     f = ogr.Feature(lyr.GetLayerDefn())
     f.SetFID(100000000)
     ret = lyr.CreateFeature(f)
-    if ret != 0:
-        return 'fail'
+    assert ret == 0
 
     f = ogr.Feature(lyr.GetLayerDefn())
     f.SetFID(100000000)
     ret = lyr.SetFeature(f)
-    if ret != 0:
-        return 'fail'
-
-    if lyr.GetFeatureCount() != 3:
-        print(lyr.GetFeatureCount())
-        return 'fail'
-
-    if lyr.GetFeature(0) is None:
-        return 'fail'
-    if lyr.GetFeature(1) is None:
-        return 'fail'
-    if lyr.GetFeature(2) is not None:
-        return 'fail'
-    if lyr.GetFeature(100000000) is None:
-        return 'fail'
+    assert ret == 0
+
+    assert lyr.GetFeatureCount() == 3
+
+    assert lyr.GetFeature(0) is not None
+    assert lyr.GetFeature(1) is not None
+    assert lyr.GetFeature(2) is None
+    assert lyr.GetFeature(100000000) is not None
 
     lyr.ResetReading()
     f = lyr.GetNextFeature()
-    if f.GetFID() != 0:
-        return 'fail'
+    assert f.GetFID() == 0
     f = lyr.GetNextFeature()
-    if f.GetFID() != 1:
-        return 'fail'
+    assert f.GetFID() == 1
     f = lyr.GetNextFeature()
-    if f.GetFID() != 100000000:
-        return 'fail'
+    assert f.GetFID() == 100000000
     f = lyr.GetNextFeature()
-    if f is not None:
-        return 'fail'
+    assert f is None
 
     f = ogr.Feature(lyr.GetLayerDefn())
     f.SetFID(100000000)
     ret = lyr.CreateFeature(f)
-    if ret != 0:
-        return 'fail'
-    if f.GetFID() != 2:
-        print(f.GetFID())
-        return 'fail'
+    assert ret == 0
+    assert f.GetFID() == 2
 
-    if lyr.GetFeatureCount() != 4:
-        print(lyr.GetFeatureCount())
-        return 'fail'
+    assert lyr.GetFeatureCount() == 4
 
     ret = lyr.DeleteFeature(1)
-    if ret != 0:
-        return 'fail'
+    assert ret == 0
 
-    if lyr.GetFeatureCount() != 3:
-        print(lyr.GetFeatureCount())
-        return 'fail'
+    assert lyr.GetFeatureCount() == 3
 
     ret = lyr.DeleteFeature(1)
-    if ret == 0:
-        return 'fail'
+    assert ret != 0
 
-    if lyr.GetFeatureCount() != 3:
-        print(lyr.GetFeatureCount())
-        return 'fail'
+    assert lyr.GetFeatureCount() == 3
 
     # Test first feature with huge ID
     lyr = gdaltest.mem_ds.CreateLayer('ogr_mem_16_bis')
     f = ogr.Feature(lyr.GetLayerDefn())
     f.SetFID(1234567890123)
     ret = lyr.CreateFeature(f)
-    if ret != 0:
-        return 'fail'
-    if f.GetFID() != 1234567890123:
-        return 'fail'
+    assert ret == 0
+    assert f.GetFID() == 1234567890123
     f = None  # Important we must not have dangling references before modifying the schema !
 
     # Create a field so as to test OGRMemLayerIteratorMap
@@ -702,90 +609,52 @@ def test_ogr_mem_17():
     lyr.CreateFeature(f)
 
     f, lyr = ds.GetNextFeature()
-    if f is None or lyr.GetName() != 'ogr_mem_1':
-        print(f)
-        print(lyr.GetName())
-        return 'fail'
+    assert f is not None and lyr.GetName() == 'ogr_mem_1'
 
     f, lyr = ds.GetNextFeature()
-    if f is None or lyr.GetName() != 'ogr_mem_1':
-        print(f)
-        print(lyr.GetName())
-        return 'fail'
+    assert f is not None and lyr.GetName() == 'ogr_mem_1'
 
     f, lyr = ds.GetNextFeature()
-    if f is None or lyr.GetName() != 'ogr_mem_2':
-        print(f)
-        print(lyr.GetName())
-        return 'fail'
+    assert f is not None and lyr.GetName() == 'ogr_mem_2'
 
     f, lyr = ds.GetNextFeature()
-    if f is None or lyr.GetName() != 'ogr_mem_4':
-        print(f)
-        print(lyr.GetName())
-        return 'fail'
+    assert f is not None and lyr.GetName() == 'ogr_mem_4'
 
     f, lyr = ds.GetNextFeature()
-    if f is not None or lyr is not None:
-        return 'fail'
+    assert f is None and lyr is None
 
     f, lyr = ds.GetNextFeature()
-    if f is not None or lyr is not None:
-        return 'fail'
+    assert f is None and lyr is None
 
     ds.ResetReading()
 
     f, lyr = ds.GetNextFeature()
-    if f is None or lyr.GetName() != 'ogr_mem_1':
-        print(f)
-        print(lyr.GetName())
-        return 'fail'
+    assert f is not None and lyr.GetName() == 'ogr_mem_1'
 
     ds.ResetReading()
 
     f, lyr, pct = ds.GetNextFeature(include_pct=True)
-    if f is None or lyr.GetName() != 'ogr_mem_1' or pct != 0.25:
-        print(f)
-        print(lyr.GetName())
-        print(pct)
-        return 'fail'
+    assert f is not None and lyr.GetName() == 'ogr_mem_1' and pct == 0.25
 
     f, pct = ds.GetNextFeature(include_layer=False, include_pct=True)
-    if f is None or pct != 0.50:
-        print(f)
-        print(pct)
-        return 'fail'
+    assert f is not None and pct == 0.50
 
     f, pct = ds.GetNextFeature(include_layer=False, include_pct=True)
-    if f is None or pct != 0.75:
-        print(f)
-        print(pct)
-        return 'fail'
+    assert f is not None and pct == 0.75
 
     f, pct = ds.GetNextFeature(include_layer=False, include_pct=True)
-    if f is None or pct != 1.0:
-        print(f)
-        print(pct)
-        return 'fail'
+    assert f is not None and pct == 1.0
 
     f, pct = ds.GetNextFeature(include_layer=False, include_pct=True)
-    if f is not None or pct != 1.0:
-        print(f)
-        print(pct)
-        return 'fail'
+    assert f is None and pct == 1.0
 
     f, pct = ds.GetNextFeature(include_layer=False, include_pct=True)
-    if f is not None or pct != 1.0:
-        print(f)
-        print(pct)
-        return 'fail'
+    assert f is None and pct == 1.0
 
     ds.ResetReading()
 
     f = ds.GetNextFeature(include_layer=False)
-    if f is None:
-        print(f)
-        return 'fail'
+    assert f is not None
 
     return 'success'
 
diff --git a/autotest/ogr/ogr_mitab.py b/autotest/ogr/ogr_mitab.py
index 41de4104ceaf..f58d3d755131 100755
--- a/autotest/ogr/ogr_mitab.py
+++ b/autotest/ogr/ogr_mitab.py
@@ -40,6 +40,7 @@
 from osgeo import osr
 from osgeo import gdal
 import test_cli_utilities
+import pytest
 
 ###############################################################################
 # Create TAB file.
@@ -132,16 +133,14 @@ def test_ogr_mitab_3():
         orig_feat = gdaltest.poly_feat[i]
         read_feat = gdaltest.mapinfo_lyr.GetNextFeature()
 
-        if ogrtest.check_feature_geometry(read_feat,
+        assert (ogrtest.check_feature_geometry(read_feat,
                                           orig_feat.GetGeometryRef(),
-                                          max_error=0.02) != 0:
-            gdaltest.post_reason('Geometry check fail.  i=%d' % i)
-            return 'fail'
+                                          max_error=0.02) == 0), \
+            ('Geometry check fail.  i=%d' % i)
 
         for fld in range(3):
-            if orig_feat.GetField(fld) != read_feat.GetField(fld):
-                gdaltest.post_reason('Attribute %d does not match' % fld)
-                return 'fail'
+            assert orig_feat.GetField(fld) == read_feat.GetField(fld), \
+                ('Attribute %d does not match' % fld)
 
     gdaltest.poly_feat = None
     gdaltest.shp_ds = None
@@ -204,9 +203,8 @@ def test_ogr_mitab_6():
     srs = gdaltest.mapinfo_lyr.GetSpatialRef()
     datum_name = srs.GetAttrValue('PROJCS|GEOGCS|DATUM')
 
-    if datum_name != "New_Zealand_GD49":
-        gdaltest.post_reason("Datum name does not match (expected 'New_Zealand_GD49', got '%s')" % datum_name)
-        return 'fail'
+    assert datum_name == "New_Zealand_GD49", \
+        ("Datum name does not match (expected 'New_Zealand_GD49', got '%s')" % datum_name)
 
     return 'success'
 
@@ -295,14 +293,12 @@ def test_ogr_mitab_9():
         orig_feat = gdaltest.poly_feat[i]
         read_feat = gdaltest.mapinfo_lyr.GetNextFeature()
 
-        if ogrtest.check_feature_geometry(read_feat, orig_feat.GetGeometryRef(),
-                                          max_error=0.000000001) != 0:
-            return 'fail'
+        assert (ogrtest.check_feature_geometry(read_feat, orig_feat.GetGeometryRef(),
+                                          max_error=0.000000001) == 0)
 
         for fld in range(3):
-            if orig_feat.GetField(fld) != read_feat.GetField(fld):
-                gdaltest.post_reason('Attribute %d does not match' % fld)
-                return 'fail'
+            assert orig_feat.GetField(fld) == read_feat.GetField(fld), \
+                ('Attribute %d does not match' % fld)
 
     gdaltest.poly_feat = None
     gdaltest.shp_ds = None
@@ -322,24 +318,17 @@ def test_ogr_mitab_10():
 
     feat = lyr.GetNextFeature()
 
-    if feat.NAME != " S. 11th St.":
-        gdaltest.post_reason('name attribute wrong.')
-        return 'fail'
+    assert feat.NAME == " S. 11th St.", 'name attribute wrong.'
 
-    if feat.FLOODZONE != 10:
-        gdaltest.post_reason('FLOODZONE attribute wrong.')
-        return 'fail'
+    assert feat.FLOODZONE == 10, 'FLOODZONE attribute wrong.'
 
-    if ogrtest.check_feature_geometry(feat,
+    assert (ogrtest.check_feature_geometry(feat,
                                       'POLYGON ((407131.721 155322.441,407134.468 155329.616,407142.741 155327.242,407141.503 155322.467,407140.875 155320.049,407131.721 155322.441))',
-                                      max_error=0.000000001) != 0:
-        return 'fail'
+                                      max_error=0.000000001) == 0)
 
     feat = lyr.GetNextFeature()
 
-    if feat.OWNER != 'Guarino "Chucky" Sandra':
-        gdaltest.post_reason('owner attribute wrong.')
-        return 'fail'
+    assert feat.OWNER == 'Guarino "Chucky" Sandra', 'owner attribute wrong.'
 
     lyr = None
     ds = None
@@ -364,9 +353,8 @@ def test_ogr_mitab_11():
     ds = None
 
     pm_value = srs.GetAttrValue('PROJCS|GEOGCS|PRIMEM', 1)
-    if pm_value[:6] != '2.3372':
-        gdaltest.post_reason('got unexpected prime meridian, not paris: ' + pm_value)
-        return 'fail'
+    assert pm_value[:6] == '2.3372', \
+        ('got unexpected prime meridian, not paris: ' + pm_value)
 
     return 'success'
 
@@ -383,8 +371,7 @@ def test_ogr_mitab_12():
     lyr = ds.CreateLayer('testlyrdef')
     defn = lyr.GetLayerDefn()
 
-    if defn is None:
-        return 'fail'
+    assert defn is not None
 
     ogrtest.quick_create_layer_def(lyr, [('AREA', ogr.OFTReal)])
 
@@ -418,9 +405,7 @@ def test_ogr_mitab_13():
 
     # Check if the width and precision are as preserved.
     lyr = ds.GetLayer('testlyrdef')
-    if lyr is None:
-        gdaltest.post_reason('Layer missing.')
-        return 'fail'
+    assert lyr is not None, 'Layer missing.'
 
     defn = lyr.GetLayerDefn()
 
@@ -431,9 +416,8 @@ def test_ogr_mitab_13():
 
     for field in data:
         fld = defn.GetFieldDefn(defn.GetFieldIndex(field[0]))
-        if fld.GetType() != field[1] or fld.GetWidth() != field[2] or fld.GetPrecision() != field[3]:
-            gdaltest.post_reason(field[0] + ' field definition wrong.')
-            return 'fail'
+        assert fld.GetType() == field[1] and fld.GetWidth() == field[2] and fld.GetPrecision() == field[3], \
+            (field[0] + ' field definition wrong.')
 
     ds = None
 
@@ -468,9 +452,7 @@ def test_ogr_mitab_14():
 
     # Check if the width and precision are as preserved.
     lyr = ds.GetLayer('testlyrdef')
-    if lyr is None:
-        gdaltest.post_reason('Layer missing.')
-        return 'fail'
+    assert lyr is not None, 'Layer missing.'
 
     defn = lyr.GetLayerDefn()
 
@@ -484,9 +466,8 @@ def test_ogr_mitab_14():
         expected_with = field[2]
         if fld.GetType() == ogr.OFTInteger:
             expected_with = 0
-        if fld.GetType() != field[1] or fld.GetWidth() != expected_with or fld.GetPrecision() != field[3]:
-            gdaltest.post_reason(field[0] + ' field definition wrong.')
-            return 'fail'
+        assert fld.GetType() == field[1] and fld.GetWidth() == expected_with and fld.GetPrecision() == field[3], \
+            (field[0] + ' field definition wrong.')
 
     ds = None
 
@@ -506,8 +487,7 @@ def test_ogr_mitab_15():
     ds = ogr.Open('data/nomid.mif')
     lyr = ds.GetLayer(0)
     feat = lyr.GetNextFeature()
-    if feat is None:
-        return 'fail'
+    assert feat is not None
     ds = None
 
     # Test opening .mif without .mid even if there are declared attributes
@@ -546,8 +526,7 @@ def test_ogr_mitab_16():
     ds = None
 
     ds = ogr.Open('tmp/empty.mif')
-    if ds is None:
-        return 'fail'
+    assert ds is not None
     ds = None
 
     return 'success'
@@ -568,14 +547,10 @@ def test_ogr_mitab_17():
         return 'skip'
 
     ret = gdaltest.runexternal(test_cli_utilities.get_test_ogrsf_path() + ' tmp')
-    if ret.find('INFO') == -1 or ret.find('ERROR') != -1:
-        print(ret)
-        return 'fail'
+    assert ret.find('INFO') != -1 and ret.find('ERROR') == -1
 
     ret = gdaltest.runexternal(test_cli_utilities.get_test_ogrsf_path() + ' tmp/wrk.mif')
-    if ret.find('INFO') == -1 or ret.find('ERROR') != -1:
-        print(ret)
-        return 'fail'
+    assert ret.find('INFO') != -1 and ret.find('ERROR') == -1
 
     return 'success'
 
@@ -604,12 +579,9 @@ def test_ogr_mitab_18():
         wkt = sr_got.ExportToWkt()
         if wkt.find('2154') < 0:
             print(filename)
-            print(sr_got)
-            return 'fail'
+            pytest.fail(sr_got)
         proj4 = sr_got.ExportToProj4()
-        if proj4.find('+proj=lcc +lat_1=49 +lat_2=44 +lat_0=46.5 +lon_0=3 +x_0=700000 +y_0=6600000 +ellps=GRS80 +towgs84=0,0,0,0,0,0,0 +units=m +no_defs') != 0:
-            print(proj4)
-            return 'fail'
+        assert proj4.find('+proj=lcc +lat_1=49 +lat_2=44 +lat_0=46.5 +lon_0=3 +x_0=700000 +y_0=6600000 +ellps=GRS80 +towgs84=0,0,0,0,0,0,0 +units=m +no_defs') == 0
         ds = None
 
     ogr.GetDriverByName('MapInfo File').DeleteDataSource('/vsimem/ogr_mitab_18.tab')
@@ -710,11 +682,8 @@ def test_ogr_mitab_20():
             ds = ogr.Open('/vsimem/ogr_mitab_20.' + fmt)
             lyr = ds.GetLayer(0)
             feat = lyr.GetNextFeature()
-            if i == 6 and lyr.GetSpatialRef().ExportToWkt().find('49.00000000001') < 0:
-                print(fmt)
-                print(i)
-                print(lyr.GetSpatialRef().ExportToWkt())
-                return 'fail'
+            assert not (i == 6 and lyr.GetSpatialRef().ExportToWkt().find('49.00000000001') < 0), \
+                fmt
             # Strict text comparison to check precision
             if fmt == 'tab':
                 if i == 1 or i == 2 or i == 4:
@@ -838,8 +807,7 @@ def test_ogr_mitab_22():
                 feat.SetGeometryDirectly(ogr.CreateGeometryFromWkt("POINT (%d %d)" % (i, i)))
                 if lyr.CreateFeature(feat) != 0:
                     print(i)
-                    print(nb_features)
-                    return 'fail'
+                    pytest.fail(nb_features)
             ds = None
 
             for i in range(nb_features - (1 - j)):
@@ -850,18 +818,14 @@ def test_ogr_mitab_22():
                 feat.SetGeometryDirectly(ogr.CreateGeometryFromWkt("POINT (%d %d)" % (i + (1 - j), i + (1 - j))))
                 if lyr.CreateFeature(feat) != 0:
                     print(i)
-                    print(nb_features)
-                    return 'fail'
+                    pytest.fail(nb_features)
                 ds = None
 
             ds = ogr.Open(filename)
             lyr = ds.GetLayer(0)
             for i in range(nb_features):
                 f = lyr.GetNextFeature()
-                if f is None or f.GetField('ID') != i + 1:
-                    print(nb_features)
-                    print(i)
-                    return 'fail'
+                assert f is not None and f.GetField('ID') == i + 1, nb_features
             ds = None
 
     ogr.GetDriverByName('MapInfo File').DeleteDataSource(filename)
@@ -889,13 +853,9 @@ def test_ogr_mitab_23():
         lyr.ResetReading()
         for i in range(nb_features):
             f = lyr.GetNextFeature()
-            if f is None or f.GetField('ID') != i + 1:
-                print(nb_features)
-                print(i)
-                return 'fail'
+            assert f is not None and f.GetField('ID') == i + 1, nb_features
         f = lyr.GetNextFeature()
-        if f is not None:
-            return 'fail'
+        assert f is None
         ds = None
 
         ogr.GetDriverByName('MapInfo File').DeleteDataSource(filename)
@@ -923,13 +883,9 @@ def test_ogr_mitab_24():
         lyr.ResetReading()
         for i in range(int(nb_features / 2)):
             f = lyr.GetNextFeature()
-            if f is None or f.GetField('ID') != i + 1:
-                print(nb_features)
-                print(i)
-                return 'fail'
+            assert f is not None and f.GetField('ID') == i + 1, nb_features
         f = lyr.GetNextFeature()
-        if f is not None:
-            return 'fail'
+        assert f is None
 
         for i in range(int(nb_features / 2)):
             feat = ogr.Feature(lyr.GetLayerDefn())
@@ -940,13 +896,9 @@ def test_ogr_mitab_24():
         lyr.ResetReading()
         for i in range(nb_features):
             f = lyr.GetNextFeature()
-            if f is None or f.GetField('ID') != i + 1:
-                print(nb_features)
-                print(i)
-                return 'fail'
+            assert f is not None and f.GetField('ID') == i + 1, nb_features
         f = lyr.GetNextFeature()
-        if f is not None:
-            return 'fail'
+        assert f is None
 
         ds = None
 
@@ -990,9 +942,7 @@ def test_ogr_mitab_25():
         ds = None
         for ext in ('map', 'tab', 'dat', 'id'):
             mtime = os.stat(filename[0:-3] + ext).st_mtime
-            if mtime_dict[ext] != mtime:
-                print('mtime of .%s has changed !' % ext)
-                return 'fail'
+            assert mtime_dict[ext] == mtime, ('mtime of .%s has changed !' % ext)
 
         # Try by reading all features
         ds = ogr.Open(filename, update=1)
@@ -1001,9 +951,7 @@ def test_ogr_mitab_25():
         ds = None
         for ext in ('map', 'tab', 'dat', 'id'):
             mtime = os.stat(filename[0:-3] + ext).st_mtime
-            if mtime_dict[ext] != mtime:
-                print('mtime of .%s has changed !' % ext)
-                return 'fail'
+            assert mtime_dict[ext] == mtime, ('mtime of .%s has changed !' % ext)
 
         # Try by reading all features with a spatial index
         ds = ogr.Open(filename, update=1)
@@ -1013,15 +961,11 @@ def test_ogr_mitab_25():
         ds = None
         for ext in ('map', 'tab', 'dat', 'id'):
             mtime = os.stat(filename[0:-3] + ext).st_mtime
-            if mtime_dict[ext] != mtime:
-                print('mtime of .%s has changed !' % ext)
-                return 'fail'
+            assert mtime_dict[ext] == mtime, ('mtime of .%s has changed !' % ext)
 
         if test_cli_utilities.get_test_ogrsf_path() is not None:
             ret = gdaltest.runexternal(test_cli_utilities.get_test_ogrsf_path() + ' -ro -fsf ' + filename)
-            if ret.find('INFO') == -1 or ret.find('ERROR') != -1:
-                print(ret)
-                return 'fail'
+            assert ret.find('INFO') != -1 and ret.find('ERROR') == -1
 
         ogr.GetDriverByName('MapInfo File').DeleteDataSource(filename)
 
@@ -1051,46 +995,34 @@ def test_ogr_mitab_26():
                 lyr.CreateFeature(feat)
 
             if nb_features == 2:
-                if lyr.DeleteFeature(int(nb_features / 2)) != 0:
-                    print(j)
-                    print(nb_features)
-                    return 'fail'
+                assert lyr.DeleteFeature(int(nb_features / 2)) == 0, j
             else:
                 for k in range(int(nb_features / 2)):
-                    if lyr.DeleteFeature(int(nb_features / 4) + k) != 0:
-                        print(j)
-                        print(k)
-                        print(nb_features)
-                        return 'fail'
+                    assert lyr.DeleteFeature(int(nb_features / 4) + k) == 0, j
 
             if j == 1:
                 # Expected failure : already deleted feature
                 ret = lyr.DeleteFeature(int(nb_features / 2))
                 if ret != ogr.OGRERR_NON_EXISTING_FEATURE:
                     print(j)
-                    print(nb_features)
-                    return 'fail'
+                    pytest.fail(nb_features)
 
                 feat = lyr.GetFeature(int(nb_features / 2))
                 if feat is not None:
                     print(j)
-                    print(nb_features)
-                    return 'fail'
+                    pytest.fail(nb_features)
 
                 # Expected failure : illegal feature id
                 ret = lyr.DeleteFeature(nb_features + 1)
                 if ret != ogr.OGRERR_NON_EXISTING_FEATURE:
                     print(j)
-                    print(nb_features)
-                    return 'fail'
+                    pytest.fail(nb_features)
 
             ds = None
 
             ds = ogr.Open(filename)
             lyr = ds.GetLayer(0)
-            if lyr.GetFeatureCount() != nb_features / 2:
-                print(nb_features)
-                return 'fail'
+            assert lyr.GetFeatureCount() == nb_features / 2
             ds = None
 
             # This used to trigger a bug in DAT record deletion during implementation...
@@ -1102,9 +1034,7 @@ def test_ogr_mitab_26():
 
                 ds = ogr.Open(filename)
                 lyr = ds.GetLayer(0)
-                if lyr.GetFeatureCount() != nb_features / 2 - 1:
-                    print(nb_features)
-                    return 'fail'
+                assert lyr.GetFeatureCount() == nb_features / 2 - 1
                 ds = None
 
             ogr.GetDriverByName('MapInfo File').DeleteDataSource(filename)
@@ -1130,8 +1060,7 @@ def test_ogr_mitab_27():
     gdal.PushErrorHandler('CPLQuietErrorHandler')
     ret = lyr.SetFeature(f)
     gdal.PopErrorHandler()
-    if ret == 0:
-        return 'fail'
+    assert ret != 0
 
     # Invalid call : feature with FID <= 0
     f = ogr.Feature(lyr.GetLayerDefn())
@@ -1139,8 +1068,7 @@ def test_ogr_mitab_27():
     gdal.PushErrorHandler('CPLQuietErrorHandler')
     ret = lyr.SetFeature(f)
     gdal.PopErrorHandler()
-    if ret == 0:
-        return 'fail'
+    assert ret != 0
 
     f = ogr.Feature(lyr.GetLayerDefn())
     f.SetField('intfield', 1)
@@ -1156,8 +1084,7 @@ def test_ogr_mitab_27():
     gdal.PushErrorHandler('CPLQuietErrorHandler')
     ret = lyr.SetFeature(f)
     gdal.PopErrorHandler()
-    if ret == 0:
-        return 'fail'
+    assert ret != 0
 
     # Update previously created object with blank feature
     f = ogr.Feature(lyr.GetLayerDefn())
@@ -1209,8 +1136,7 @@ def test_ogr_mitab_27():
 
     f = lyr.GetFeature(1)
     # SetFeature() with identical feature : no-op
-    if lyr.SetFeature(f) != 0:
-        return 'fail'
+    assert lyr.SetFeature(f) == 0
     ds = None
 
     stat = gdal.VSIStatL(filename[0:-3] + "map")
@@ -1225,13 +1151,11 @@ def test_ogr_mitab_27():
     f = lyr.GetFeature(1)
     for _ in range(100):
         f.SetGeometryDirectly(ogr.CreateGeometryFromWkt('POINT (2 3)'))
-        if lyr.SetFeature(f) != 0:
-            return 'fail'
+        assert lyr.SetFeature(f) == 0
     ds = None
 
     stat = gdal.VSIStatL(filename[0:-3] + "map")
-    if stat.size != old_size:
-        return 'fail'
+    assert stat.size == old_size
 
     ds = ogr.Open(filename, update=1)
     lyr = ds.GetLayer(0)
@@ -1239,8 +1163,7 @@ def test_ogr_mitab_27():
     f = lyr.GetFeature(1)
     # SetFeature() with identical geometry : rewrite only attributes
     f.SetField('intfield', -1)
-    if lyr.SetFeature(f) != 0:
-        return 'fail'
+    assert lyr.SetFeature(f) == 0
 
     f = lyr.GetFeature(1)
     if f.GetField('intfield') != -1 or f.GetField('realfield') != 2.34 or f.GetField('stringfield') != 'foo' or \
@@ -1321,8 +1244,7 @@ def test_ogr_mitab_28():
         n = permutation[i]
         x_ref = int(n / N2)
         y_ref = n % N2
-        if abs(x - x_ref) + abs(y - y_ref) > 0.1:
-            return 'fail'
+        assert abs(x - x_ref) + abs(y - y_ref) <= 0.1
         i = i + 1
 
     # Check spatial index integrity
@@ -1330,8 +1252,7 @@ def test_ogr_mitab_28():
         x = int(n / N2)
         y = n % N2
         lyr.SetSpatialFilterRect(x - 0.5, y - 0.5, x + 0.5, y + 0.5)
-        if lyr.GetFeatureCount() != 1:
-            return 'fail'
+        assert lyr.GetFeatureCount() == 1
 
     ds = None
 
@@ -1387,9 +1308,7 @@ def test_ogr_mitab_29():
         lyr.SetSpatialFilterRect(x - 0.01, y - 0.01, x + 0.01, y + 0.01)
         if lyr.GetFeatureCount() != 1:
             print(n)
-            print(lyr.GetFeatureCount())
-            print(x - 0.01, y - 0.01, x + 0.01, y + 0.01)
-            return 'fail'
+            pytest.fail(x - 0.01, y - 0.01, x + 0.01, y + 0.01)
     ds = None
 
     ogr.GetDriverByName('MapInfo File').DeleteDataSource('tmp/compr_symb_deleted_records.tab')
@@ -1407,13 +1326,11 @@ def test_ogr_mitab_30(update=0):
     ds = ogr.GetDriverByName('MapInfo File').CreateDataSource(filename)
     lyr = ds.CreateLayer('test', options=['BOUNDS=0,0,100,100'])
     lyr.CreateField(ogr.FieldDefn('ID', ogr.OFTInteger))
-    if lyr.SyncToDisk() != 0:
-        return 'fail'
+    assert lyr.SyncToDisk() == 0
 
     ds2 = ogr.Open(filename)
     lyr2 = ds2.GetLayer(0)
-    if lyr2.GetFeatureCount() != 0 or lyr2.GetLayerDefn().GetFieldCount() != 1:
-        return 'fail'
+    assert lyr2.GetFeatureCount() == 0 and lyr2.GetLayerDefn().GetFieldCount() == 1
     ds2 = None
 
     # Check that the files are not updated in between
@@ -1428,12 +1345,10 @@ def test_ogr_mitab_30(update=0):
     if not sys.platform.startswith('linux'):
         time.sleep(1)
 
-    if lyr.SyncToDisk() != 0:
-        return 'fail'
+    assert lyr.SyncToDisk() == 0
     for ext in ('map', 'tab', 'dat', 'id'):
         stat2 = gdal.VSIStatL(filename[0:-3] + ext)
-        if stat[ext].size != stat2.size or stat[ext].mtime != stat2.mtime:
-            return 'fail'
+        assert stat[ext].size == stat2.size and stat[ext].mtime == stat2.mtime
 
     if update == 1:
         ds = None
@@ -1452,8 +1367,7 @@ def test_ogr_mitab_30(update=0):
 
         for i in range(2):
             ret = lyr.SyncToDisk()
-            if ret != 0:
-                return 'fail'
+            assert ret == 0
 
             if i == 0:
                 for ext in ('map', 'tab', 'dat', 'id'):
@@ -1462,17 +1376,12 @@ def test_ogr_mitab_30(update=0):
                 for ext in ('map', 'tab', 'dat', 'id'):
                     stat2 = gdal.VSIStatL(filename[0:-3] + ext)
                     if stat[ext].size != stat2.size:
-                        print(ext)
                         print(j)
-                        print(i)
-                        return 'fail'
+                        pytest.fail(i)
 
             ds2 = ogr.Open(filename)
             lyr2 = ds2.GetLayer(0)
-            if lyr2.GetFeatureCount() != j + 1:
-                print(j)
-                print(i)
-                return 'fail'
+            assert lyr2.GetFeatureCount() == j + 1, i
             feat2 = lyr2.GetFeature(j + 1)
             if feat2.GetField('ID') != j + 1 or feat2.GetGeometryRef().ExportToWkt() != 'POINT (%d %d)' % (j, j):
                 print(j)
@@ -1511,17 +1420,12 @@ def test_ogr_mitab_32():
     for update in (0, 1):
         ds = ogr.Open('data/aspatial-table.tab', update=update)
         lyr = ds.GetLayer(0)
-        if lyr.GetFeatureCount() != 2:
-            print(update)
-            return 'fail'
+        assert lyr.GetFeatureCount() == 2, update
         f = lyr.GetNextFeature()
-        if f.GetField('a') != 1 or f.GetField('b') != 2 or f.GetField('d') != 'hello':
-            print(update)
-            return 'fail'
+        assert f.GetField('a') == 1 and f.GetField('b') == 2 and f.GetField('d') == 'hello', \
+            update
         f = lyr.GetFeature(2)
-        if f.GetField('a') != 4:
-            print(update)
-            return 'fail'
+        assert f.GetField('a') == 4, update
     ds = None
 
     return 'success'
@@ -1536,13 +1440,9 @@ def test_ogr_mitab_33():
     for update in (0, 1):
         ds = ogr.Open('data/single_point_mapinfo.tab', update=update)
         lyr = ds.GetLayer(0)
-        if lyr.GetFeatureCount() != 1:
-            print(update)
-            return 'fail'
+        assert lyr.GetFeatureCount() == 1, update
         f = lyr.GetNextFeature()
-        if f.GetField('toto') != '':
-            print(update)
-            return 'fail'
+        assert f.GetField('toto') == '', update
     ds = None
 
     # Test adding a new object
@@ -1561,14 +1461,11 @@ def test_ogr_mitab_33():
 
     ds = ogr.Open('tmp/single_point_mapinfo.tab')
     lyr = ds.GetLayer(0)
-    if lyr.GetFeatureCount() != 2:
-        return 'fail'
+    assert lyr.GetFeatureCount() == 2
     f = lyr.GetNextFeature()
-    if f is None:
-        return 'fail'
+    assert f is not None
     f = lyr.GetNextFeature()
-    if f is None:
-        return 'fail'
+    assert f is not None
     ds = None
 
     # Test replacing the existing object
@@ -1588,11 +1485,9 @@ def test_ogr_mitab_33():
 
     ds = ogr.Open('tmp/single_point_mapinfo.tab')
     lyr = ds.GetLayer(0)
-    if lyr.GetFeatureCount() != 1:
-        return 'fail'
+    assert lyr.GetFeatureCount() == 1
     f = lyr.GetNextFeature()
-    if f is None:
-        return 'fail'
+    assert f is not None
     ds = None
 
     ogr.GetDriverByName('MapInfo File').DeleteDataSource('tmp/single_point_mapinfo.tab')
@@ -1632,16 +1527,13 @@ def test_ogr_mitab_34():
     lyr = ds.GetLayer(0)
     f = lyr.GetNextFeature()
     geom = f.GetGeometryRef()
-    if abs(geom.GetX(0) - -1000) > 1e-2 or abs(geom.GetY(0) - 3000) > 1e-2:
-        return 'fail'
+    assert abs(geom.GetX(0) - -1000) <= 1e-2 and abs(geom.GetY(0) - 3000) <= 1e-2
     for i in range(999):
-        if abs(geom.GetX(i + 1) - (i + 1)) > 1e-2 or abs(geom.GetY(i + 1) - (i + 1)) > 1e-2:
-            return 'fail'
+        assert abs(geom.GetX(i + 1) - (i + 1)) <= 1e-2 and abs(geom.GetY(i + 1) - (i + 1)) <= 1e-2
     f = lyr.GetNextFeature()
     geom = f.GetGeometryRef()
     for i in range(1000):
-        if abs(geom.GetX(i) - (i)) > 1e-2 or abs(geom.GetY(i) - (i)) > 1e-2:
-            return 'fail'
+        assert abs(geom.GetX(i) - (i)) <= 1e-2 and abs(geom.GetY(i) - (i)) <= 1e-2
     ds = None
 
     ogr.GetDriverByName('MapInfo File').DeleteDataSource(filename)
@@ -1710,20 +1602,14 @@ def test_ogr_mitab_35():
     # Local/non-earth
     srs = osr.SpatialReference()
     coordsys = get_coordsys_from_srs(srs)
-    if coordsys != 'CoordSys NonEarth Units "m"':
-        print(coordsys)
-        return 'fail'
+    assert coordsys == 'CoordSys NonEarth Units "m"'
 
     srs = osr.SpatialReference('LOCAL_CS["foo"]')
     coordsys = get_coordsys_from_srs(srs)
-    if coordsys != 'CoordSys NonEarth Units "m"':
-        print(coordsys)
-        return 'fail'
+    assert coordsys == 'CoordSys NonEarth Units "m"'
     srs = get_srs_from_coordsys(coordsys)
     wkt = srs.ExportToWkt()
-    if wkt != 'LOCAL_CS["Nonearth",UNIT["Meter",1.0]]':
-        print(wkt)
-        return 'fail'
+    assert wkt == 'LOCAL_CS["Nonearth",UNIT["Meter",1.0]]'
 
     # Test units
     for mif_unit in ['mi', 'km', 'in', 'ft', 'yd', 'mm', 'cm', 'm', 'survey ft', 'nmi', 'li', 'ch', 'rd']:
@@ -1731,45 +1617,29 @@ def test_ogr_mitab_35():
         srs = get_srs_from_coordsys(coordsys)
         # print(srs)
         got_coordsys = get_coordsys_from_srs(srs)
-        if coordsys != got_coordsys:
-            print(coordsys)
-            print(srs)
-            print(got_coordsys)
-            return 'fail'
+        assert coordsys == got_coordsys, srs
 
     # Geographic
     srs = osr.SpatialReference()
     srs.ImportFromEPSG(4326)
     coordsys = get_coordsys_from_srs(srs)
-    if coordsys != 'CoordSys Earth Projection 1, 104':
-        print(coordsys)
-        return 'fail'
+    assert coordsys == 'CoordSys Earth Projection 1, 104'
     srs = get_srs_from_coordsys(coordsys)
     wkt = srs.ExportToWkt()
-    if wkt != 'GEOGCS["unnamed",DATUM["WGS_1984",SPHEROID["WGS 84",6378137,298.257223563],TOWGS84[0,0,0,0,0,0,0]],PRIMEM["Greenwich",0],UNIT["degree",0.0174532925199433]]':
-        print(wkt)
-        return 'fail'
+    assert wkt == 'GEOGCS["unnamed",DATUM["WGS_1984",SPHEROID["WGS 84",6378137,298.257223563],TOWGS84[0,0,0,0,0,0,0]],PRIMEM["Greenwich",0],UNIT["degree",0.0174532925199433]]'
     coordsys = get_coordsys_from_srs(srs)
-    if coordsys != 'CoordSys Earth Projection 1, 104':
-        print(coordsys)
-        return 'fail'
+    assert coordsys == 'CoordSys Earth Projection 1, 104'
 
     # Projected
     srs = osr.SpatialReference()
     srs.ImportFromEPSG(32631)
     coordsys = get_coordsys_from_srs(srs)
-    if coordsys != 'CoordSys Earth Projection 8, 104, "m", 3, 0, 0.9996, 500000, 0':
-        print(coordsys)
-        return 'fail'
+    assert coordsys == 'CoordSys Earth Projection 8, 104, "m", 3, 0, 0.9996, 500000, 0'
     srs = get_srs_from_coordsys(coordsys)
     wkt = srs.ExportToWkt()
-    if wkt != 'PROJCS["unnamed",GEOGCS["unnamed",DATUM["WGS_1984",SPHEROID["WGS 84",6378137,298.257223563],TOWGS84[0,0,0,0,0,0,0]],PRIMEM["Greenwich",0],UNIT["degree",0.0174532925199433]],PROJECTION["Transverse_Mercator"],PARAMETER["latitude_of_origin",0],PARAMETER["central_meridian",3],PARAMETER["scale_factor",0.9996],PARAMETER["false_easting",500000],PARAMETER["false_northing",0],UNIT["Meter",1.0]]':
-        print(wkt)
-        return 'fail'
+    assert wkt == 'PROJCS["unnamed",GEOGCS["unnamed",DATUM["WGS_1984",SPHEROID["WGS 84",6378137,298.257223563],TOWGS84[0,0,0,0,0,0,0]],PRIMEM["Greenwich",0],UNIT["degree",0.0174532925199433]],PROJECTION["Transverse_Mercator"],PARAMETER["latitude_of_origin",0],PARAMETER["central_meridian",3],PARAMETER["scale_factor",0.9996],PARAMETER["false_easting",500000],PARAMETER["false_northing",0],UNIT["Meter",1.0]]'
     coordsys = get_coordsys_from_srs(srs)
-    if coordsys != 'CoordSys Earth Projection 8, 104, "m", 3, 0, 0.9996, 500000, 0':
-        print(coordsys)
-        return 'fail'
+    assert coordsys == 'CoordSys Earth Projection 8, 104, "m", 3, 0, 0.9996, 500000, 0'
 
     # Test round-tripping of projection methods
     for coordsys in ['CoordSys Earth Projection 1, 104',
@@ -1811,64 +1681,42 @@ def test_ogr_mitab_35():
         got_coordsys = get_coordsys_from_srs(srs)
         # if got_coordsys.find(' Bounds') >= 0:
         #    got_coordsys = got_coordsys[0:got_coordsys.find(' Bounds')]
-        if coordsys != got_coordsys:
-            print(coordsys)
-            print(srs)
-            print(got_coordsys)
-            return 'fail'
+        assert coordsys == got_coordsys, srs
 
     # Test TOWGS84
     srs = osr.SpatialReference()
     srs.ImportFromEPSG(4322)
     coordsys = get_coordsys_from_srs(srs)
-    if coordsys != 'CoordSys Earth Projection 1, 103':
-        print(coordsys)
-        return 'fail'
+    assert coordsys == 'CoordSys Earth Projection 1, 103'
     srs = get_srs_from_coordsys(coordsys)
     wkt = srs.ExportToWkt()
-    if wkt != 'GEOGCS["unnamed",DATUM["WGS_1972",SPHEROID["WGS 72",6378135,298.26],TOWGS84[0,8,10,0,0,0,0]],PRIMEM["Greenwich",0],UNIT["degree",0.0174532925199433]]':
-        print(wkt)
-        return 'fail'
+    assert wkt == 'GEOGCS["unnamed",DATUM["WGS_1972",SPHEROID["WGS 72",6378135,298.26],TOWGS84[0,8,10,0,0,0,0]],PRIMEM["Greenwich",0],UNIT["degree",0.0174532925199433]]'
     coordsys = get_coordsys_from_srs(srs)
-    if coordsys != 'CoordSys Earth Projection 1, 103':
-        print(coordsys)
-        return 'fail'
+    assert coordsys == 'CoordSys Earth Projection 1, 103'
 
     # Test Lambert 93
     srs = osr.SpatialReference()
     srs.ImportFromEPSG(2154)
     coordsys = get_coordsys_from_srs(srs)
-    if coordsys != 'CoordSys Earth Projection 3, 33, "m", 3, 46.5, 44, 49, 700000, 6600000':
-        print(coordsys)
-        return 'fail'
+    assert coordsys == 'CoordSys Earth Projection 3, 33, "m", 3, 46.5, 44, 49, 700000, 6600000'
     srs = get_srs_from_coordsys(coordsys)
     wkt = srs.ExportToWkt()
-    if wkt != 'PROJCS["RGF93 / Lambert-93",GEOGCS["RGF93",DATUM["Reseau_Geodesique_Francais_1993",SPHEROID["GRS 80",6378137,298.257222101],TOWGS84[0,0,0,0,0,0,0]],PRIMEM["Greenwich",0],UNIT["degree",0.0174532925199433]],PROJECTION["Lambert_Conformal_Conic_2SP"],PARAMETER["standard_parallel_1",49],PARAMETER["standard_parallel_2",44],PARAMETER["latitude_of_origin",46.5],PARAMETER["central_meridian",3],PARAMETER["false_easting",700000],PARAMETER["false_northing",6600000],UNIT["Meter",1.0],AUTHORITY["EPSG","2154"]]':
-        print(wkt)
-        return 'fail'
+    assert wkt == 'PROJCS["RGF93 / Lambert-93",GEOGCS["RGF93",DATUM["Reseau_Geodesique_Francais_1993",SPHEROID["GRS 80",6378137,298.257222101],TOWGS84[0,0,0,0,0,0,0]],PRIMEM["Greenwich",0],UNIT["degree",0.0174532925199433]],PROJECTION["Lambert_Conformal_Conic_2SP"],PARAMETER["standard_parallel_1",49],PARAMETER["standard_parallel_2",44],PARAMETER["latitude_of_origin",46.5],PARAMETER["central_meridian",3],PARAMETER["false_easting",700000],PARAMETER["false_northing",6600000],UNIT["Meter",1.0],AUTHORITY["EPSG","2154"]]'
     coordsys = get_coordsys_from_srs(srs)
-    if coordsys != 'CoordSys Earth Projection 3, 33, "m", 3, 46.5, 44, 49, 700000, 6600000':
-        print(coordsys)
-        return 'fail'
+    assert coordsys == 'CoordSys Earth Projection 3, 33, "m", 3, 46.5, 44, 49, 700000, 6600000'
 
     srs = osr.SpatialReference('PROJCS["RGF93 / Lambert-93",GEOGCS["RGF93",DATUM["Reseau_Geodesique_Francais_1993",SPHEROID["GRS 80",6378137,298.257222101],TOWGS84[0,0,0,0,0,0,0]],PRIMEM["Greenwich",0],UNIT["degree",0.0174532925199433]],PROJECTION["Lambert_Conformal_Conic_2SP"],PARAMETER["standard_parallel_1",49.00000000002],PARAMETER["standard_parallel_2",44],PARAMETER["latitude_of_origin",46.5],PARAMETER["central_meridian",3],PARAMETER["false_easting",700000],PARAMETER["false_northing",6600000],UNIT["Meter",1.0],AUTHORITY["EPSG","2154"]]')
     coordsys = get_coordsys_from_srs(srs)
-    if coordsys != 'CoordSys Earth Projection 3, 33, "m", 3, 46.5, 44, 49.00000000002, 700000, 6600000':
-        print(coordsys)
-        return 'fail'
+    assert coordsys == 'CoordSys Earth Projection 3, 33, "m", 3, 46.5, 44, 49.00000000002, 700000, 6600000'
     gdal.SetConfigOption('MITAB_BOUNDS_FILE', 'data/mitab_bounds.txt')
     coordsys = get_coordsys_from_srs(srs)
     gdal.SetConfigOption('MITAB_BOUNDS_FILE', None)
-    if coordsys != 'CoordSys Earth Projection 3, 33, "m", 3, 46.5, 44, 49.00000000002, 700000, 6600000 Bounds (75000, 6000000) (1275000, 7200000)':
-        print(coordsys)
-        return 'fail'
+    assert coordsys == 'CoordSys Earth Projection 3, 33, "m", 3, 46.5, 44, 49.00000000002, 700000, 6600000 Bounds (75000, 6000000) (1275000, 7200000)'
 
     # http://trac.osgeo.org/gdal/ticket/4115
     srs = get_srs_from_coordsys('CoordSys Earth Projection 10, 157, "m", 0')
     wkt = srs.ExportToWkt()
-    if wkt != 'PROJCS["WGS 84 / Pseudo-Mercator",GEOGCS["unnamed",DATUM["WGS_1984",SPHEROID["WGS 84 (MAPINFO Datum 157)",6378137.01,298.257223563],TOWGS84[0,0,0,0,0,0,0]],PRIMEM["Greenwich",0],UNIT["degree",0.0174532925199433]],PROJECTION["Mercator_1SP"],PARAMETER["central_meridian",0],PARAMETER["scale_factor",1],PARAMETER["false_easting",0],PARAMETER["false_northing",0],UNIT["Meter",1.0],EXTENSION["PROJ4","+proj=merc +a=6378137 +b=6378137 +lat_ts=0.0 +lon_0=0.0 +x_0=0.0 +y_0=0 +k=1.0 +units=m +nadgrids=@null +wktext  +no_defs"]]':
-        print(wkt)
-        return 'fail'
+    assert wkt == 'PROJCS["WGS 84 / Pseudo-Mercator",GEOGCS["unnamed",DATUM["WGS_1984",SPHEROID["WGS 84 (MAPINFO Datum 157)",6378137.01,298.257223563],TOWGS84[0,0,0,0,0,0,0]],PRIMEM["Greenwich",0],UNIT["degree",0.0174532925199433]],PROJECTION["Mercator_1SP"],PARAMETER["central_meridian",0],PARAMETER["scale_factor",1],PARAMETER["false_easting",0],PARAMETER["false_northing",0],UNIT["Meter",1.0],EXTENSION["PROJ4","+proj=merc +a=6378137 +b=6378137 +lat_ts=0.0 +lon_0=0.0 +x_0=0.0 +y_0=0 +k=1.0 +units=m +nadgrids=@null +wktext  +no_defs"]]'
     # We don't round-trip currently
 
     # MIF 999
@@ -1877,14 +1725,10 @@ def test_ogr_mitab_35():
             SPHEROID["WGS 72",6378135,298.26]],
         UNIT["degree",0.0174532925199433]]""")
     coordsys = get_coordsys_from_srs(srs)
-    if coordsys != 'CoordSys Earth Projection 1, 999, 1, 1, 2, 3':
-        print(coordsys)
-        return 'fail'
+    assert coordsys == 'CoordSys Earth Projection 1, 999, 1, 1, 2, 3'
     srs = get_srs_from_coordsys(coordsys)
     wkt = srs.ExportToWkt()
-    if wkt != 'GEOGCS["unnamed",DATUM["MIF 999,1,1,2,3",SPHEROID["WGS 72",6378135,298.26],TOWGS84[1,2,3,0,0,0,0]],PRIMEM["Greenwich",0],UNIT["degree",0.0174532925199433]]':
-        print(wkt)
-        return 'fail'
+    assert wkt == 'GEOGCS["unnamed",DATUM["MIF 999,1,1,2,3",SPHEROID["WGS 72",6378135,298.26],TOWGS84[1,2,3,0,0,0,0]],PRIMEM["Greenwich",0],UNIT["degree",0.0174532925199433]]'
 
     # MIF 9999
     srs = osr.SpatialReference("""GEOGCS["unnamed",
@@ -1892,14 +1736,10 @@ def test_ogr_mitab_35():
             SPHEROID["WGS 72",6378135,298.26]],
         UNIT["degree",0.0174532925199433]]""")
     coordsys = get_coordsys_from_srs(srs)
-    if coordsys != 'CoordSys Earth Projection 1, 9999, 1, 1, 2, 3, 4, 5, 6, 7, 3':
-        print(coordsys)
-        return 'fail'
+    assert coordsys == 'CoordSys Earth Projection 1, 9999, 1, 1, 2, 3, 4, 5, 6, 7, 3'
     srs = get_srs_from_coordsys(coordsys)
     wkt = srs.ExportToWkt()
-    if wkt != 'GEOGCS["unnamed",DATUM["MIF 9999,1,1,2,3,4,5,6,7,3",SPHEROID["WGS 72",6378135,298.26],TOWGS84[1,2,3,-4,-5,-6,7]],PRIMEM["non-Greenwich",3],UNIT["degree",0.0174532925199433]]':
-        print(wkt)
-        return 'fail'
+    assert wkt == 'GEOGCS["unnamed",DATUM["MIF 9999,1,1,2,3,4,5,6,7,3",SPHEROID["WGS 72",6378135,298.26],TOWGS84[1,2,3,-4,-5,-6,7]],PRIMEM["non-Greenwich",3],UNIT["degree",0.0174532925199433]]'
 
     return 'success'
 
@@ -1954,40 +1794,31 @@ def test_ogr_mitab_37():
 
     ds = ogr.Open('data/seamless.tab')
     lyr = ds.GetLayer(0)
-    if lyr.GetFeatureCount() != 4:
-        return 'fail'
+    assert lyr.GetFeatureCount() == 4
 
     f = lyr.GetNextFeature()
-    if f.GetFID() != 4294967297 or f.id != '1':
-        return 'fail'
+    assert f.GetFID() == 4294967297 and f.id == '1'
 
     f = lyr.GetNextFeature()
-    if f.GetFID() != 4294967298 or f.id != '2':
-        return 'fail'
+    assert f.GetFID() == 4294967298 and f.id == '2'
 
     f = lyr.GetNextFeature()
-    if f.GetFID() != 8589934593 or f.id != '3':
-        return 'fail'
+    assert f.GetFID() == 8589934593 and f.id == '3'
 
     f = lyr.GetNextFeature()
-    if f.GetFID() != 8589934594 or f.id != '4':
-        return 'fail'
+    assert f.GetFID() == 8589934594 and f.id == '4'
 
     f = lyr.GetFeature(4294967297)
-    if f.GetFID() != 4294967297 or f.id != '1':
-        return 'fail'
+    assert f.GetFID() == 4294967297 and f.id == '1'
 
     f = lyr.GetFeature(8589934594)
-    if f.GetFID() != 8589934594 or f.id != '4':
-        return 'fail'
+    assert f.GetFID() == 8589934594 and f.id == '4'
 
     f = lyr.GetFeature(8589934594 + 1)
-    if f is not None:
-        return 'fail'
+    assert f is None
 
     f = lyr.GetFeature(4294967297 * 2 + 1)
-    if f is not None:
-        return 'fail'
+    assert f is None
 
     return 'success'
 
@@ -2021,8 +1852,7 @@ def test_ogr_mitab_39():
         f = lyr.GetNextFeature()
         f_ref = lyr_ref.GetNextFeature()
         if f is None:
-            if f_ref is not None:
-                return 'fail'
+            assert f_ref is None
             break
         if ogrtest.check_feature_geometry(f, f_ref.GetGeometryRef()) != 0 or \
            f.GetStyleString() != f_ref.GetStyleString():
@@ -2068,8 +1898,7 @@ def test_ogr_mitab_41():
         f = lyr.GetNextFeature()
         f_ref = lyr_ref.GetNextFeature()
         if f is None:
-            if f_ref is not None:
-                return 'fail'
+            assert f_ref is None
             break
         if ogrtest.check_feature_geometry(f, f_ref.GetGeometryRef()) != 0 or \
            f.GetStyleString() != f_ref.GetStyleString():
@@ -2094,8 +1923,7 @@ def test_ogr_mitab_42():
         f = lyr.GetNextFeature()
         f_ref = lyr_ref.GetNextFeature()
         if f is None:
-            if f_ref is not None:
-                return 'fail'
+            assert f_ref is None
             break
         if ogrtest.check_feature_geometry(f, f_ref.GetGeometryRef()) != 0 or \
            f.GetStyleString() != f_ref.GetStyleString():
@@ -2116,20 +1944,15 @@ def test_ogr_mitab_43():
     gdal.VectorTranslate('/vsimem/all_geoms_block_32256.tab', src_ds, format='MapInfo File', datasetCreationOptions=['BLOCKSIZE=32256'])
     with gdaltest.error_handler():
         out_ds = gdal.VectorTranslate('/vsimem/all_geoms_block_invalid.tab', src_ds, format='MapInfo File', datasetCreationOptions=['BLOCKSIZE=32768'])
-    if out_ds is not None:
-        return 'fail'
+    assert out_ds is None
     gdal.Unlink('/vsimem/all_geoms_block_invalid.dat')
     src_ds = None
 
     size = gdal.VSIStatL('/vsimem/all_geoms_block_512.map').size
-    if size != 6144:
-        print(size)
-        return 'fail'
+    assert size == 6144
 
     size = gdal.VSIStatL('/vsimem/all_geoms_block_32256.map').size
-    if size != 161280:
-        print(size)
-        return 'fail'
+    assert size == 161280
 
     ds = ogr.Open('/vsimem/all_geoms_block_32256.tab')
     lyr = ds.GetLayer(0)
@@ -2140,8 +1963,7 @@ def test_ogr_mitab_43():
         f = lyr.GetNextFeature()
         f_ref = lyr_ref.GetNextFeature()
         if f is None:
-            if f_ref is not None:
-                return 'fail'
+            assert f_ref is None
             break
         if ogrtest.check_feature_geometry(f, f_ref.GetGeometryRef()) != 0 or \
            f.GetStyleString() != f_ref.GetStyleString():
@@ -2172,10 +1994,7 @@ def test_ogr_mitab_44():
     ds = ogr.Open('/vsimem/ogr_mitab_44.mif')
     lyr = ds.GetLayer(0)
     fld_defn = lyr.GetLayerDefn().GetFieldDefn(0)
-    if fld_defn.GetWidth() != 20 or fld_defn.GetPrecision() != 16:
-        print(fld_defn.GetWidth())
-        print(fld_defn.GetPrecision())
-        return 'fail'
+    assert fld_defn.GetWidth() == 20 and fld_defn.GetPrecision() == 16
     ds = None
 
     gdaltest.mapinfo_drv.DeleteDataSource('/vsimem/ogr_mitab_44.mif')
@@ -2204,16 +2023,12 @@ def test_ogr_mitab_45():
 
         ds = gdaltest.mapinfo_drv.CreateDataSource(dsName, options=['FORMAT=' + frmt])
 
-        if ds is None:
-            gdaltest.post_reason('Can\'t create dataset: ' + dsName)
-            return 'fail'
+        assert ds is not None, ('Can\'t create dataset: ' + dsName)
 
         for i in range(lyrCount):
             lyr = ds.CreateLayer(lyrNames[i], options=['ENCODING=CP1251'])
-            if lyr is None:
-                gdaltest.post_reason('Can\'t create layer ' + lyrNames[i] +
+            assert lyr is not None, ('Can\'t create layer ' + lyrNames[i] +
                                      ' for ' + dsName)
-                return 'fail'
 
             if lyr.TestCapability(ogr.OLCStringsAsUTF8) != 1:
                 gdaltest.post_reason('skipping test: recode is not possible')
@@ -2235,26 +2050,20 @@ def test_ogr_mitab_45():
 
         # reopen and check
         ds = ogr.Open(dsName)
-        if ds is None:
-            gdaltest.post_reason('Can\'t reopen dataset: ' + dsName)
-            return 'fail'
+        assert ds is not None, ('Can\'t reopen dataset: ' + dsName)
 
         for i in range(lyrCount):
             lyr = ds.GetLayer(i)
-            if lyr is None:
-                gdaltest.post_reason('Can\'t get layer ' + lyrNames[i] +
+            assert lyr is not None, ('Can\'t get layer ' + lyrNames[i] +
                                      ' from ' + dsName)
-                return 'fail'
 
             for fldN, expectedName in enumerate(fldNames):
                 fldName = lyr.GetLayerDefn().GetFieldDefn(fldN).GetName()
-                if fldName != expectedName:
-                    gdaltest.post_reason('Can\'t get field name\n' +
+                assert fldName == expectedName, ('Can\'t get field name\n' +
                                          ' result name:   "' + fldName + '"\n'
                                          ' expected name: "' + expectedName + '"\n'
                                          ' from layer : ' + lyrNames[i] +
                                          ' from dataset :' + dsName)
-                    return 'fail'
 
             for featName in featNames:
                 feat = lyr.GetNextFeature()
@@ -2262,22 +2071,20 @@ def test_ogr_mitab_45():
                     expectedValue = fldName + ' ' + featName
                     # column value by number
                     value = feat.GetField(fldN)
-                    if value != expectedValue:
-                        gdaltest.post_reason('Can\'t get field value by number\n' +
+                    assert value == expectedValue, \
+                        ('Can\'t get field value by number\n' +
                                              ' result value:   "' + value + '"\n'
                                              ' expected value: "' + expectedValue + '"\n'
                                              ' from layer : ' + lyrNames[i] +
                                              ' from dataset :' + dsName)
-                        return 'fail'
                     # column value by name
                     value = feat.GetField(fldNames[fldN])
-                    if value != expectedValue:
-                        gdaltest.post_reason('Can\'t get field value by name\n' +
+                    assert value == expectedValue, \
+                        ('Can\'t get field value by name\n' +
                                              ' result value:   "' + value + '"\n'
                                              ' expected value: "' + expectedValue + '"\n'
                                              ' from layer : ' + lyrNames[i] +
                                              ' from dataset :' + dsName)
-                        return 'fail'
 
         gdaltest.mapinfo_drv.DeleteDataSource(dsName)
 
@@ -2299,14 +2106,10 @@ def test_ogr_mitab_46():
     for dsName in dsNames:
 
         ds = ogr.Open(dsName)
-        if ds is None:
-            gdaltest.post_reason('Can\'t open dataset: ' + dsName)
-            return 'fail'
+        assert ds is not None, ('Can\'t open dataset: ' + dsName)
 
         lyr = ds.GetLayer(0)
-        if lyr is None:
-            gdaltest.post_reason('Can\'t get layer 0 from ' + dsName)
-            return 'fail'
+        assert lyr is not None, ('Can\'t get layer 0 from ' + dsName)
 
         if lyr.TestCapability(ogr.OLCStringsAsUTF8) != 1:
             gdaltest.post_reason('skipping test: recode is not possible')
@@ -2314,12 +2117,10 @@ def test_ogr_mitab_46():
 
         for fldN, expectedName in enumerate(fldNames):
             fldName = lyr.GetLayerDefn().GetFieldDefn(fldN).GetName()
-            if fldName != expectedName:
-                gdaltest.post_reason('Can\'t get field\n' +
+            assert fldName == expectedName, ('Can\'t get field\n' +
                                      ' result name:   "' + fldName + '"\n'
                                      ' expected name: "' + expectedName + '"\n'
                                      ' from dataset :' + dsName)
-                return 'fail'
 
         for featFldVal in fldVal:
             feat = lyr.GetNextFeature()
@@ -2327,20 +2128,16 @@ def test_ogr_mitab_46():
                 expectedValue = featFldVal[fldN]
                 # column value by number
                 value = feat.GetField(fldN)
-                if value != expectedValue:
-                    gdaltest.post_reason('Can\'t get field value by number\n' +
+                assert value == expectedValue, ('Can\'t get field value by number\n' +
                                          ' result value:   "' + value + '"\n'
                                          ' expected value: "' + expectedValue + '"\n'
                                          ' from dataset :' + dsName)
-                    return 'fail'
                 # column value by name
                 value = feat.GetField(fldName)
-                if value != expectedValue:
-                    gdaltest.post_reason('Can\'t get field value by name\n' +
+                assert value == expectedValue, ('Can\'t get field value by name\n' +
                                          ' result value:   "' + value + '"\n'
                                          ' expected value: "' + expectedValue + '"\n'
                                          ' from dataset :' + dsName)
-                    return 'fail'
 
     return 'success'
 
@@ -2353,8 +2150,7 @@ def test_ogr_mitab_47():
     ds = ogr.Open('data/poly_indexed.tab')
     lyr = ds.GetLayer(0)
     lyr.SetAttributeFilter("PRFEDEA = '35043413'")
-    if lyr.GetFeatureCount() != 1:
-        return 'fail'
+    assert lyr.GetFeatureCount() == 1
 
     for ext in ('tab', 'dat', 'map', 'id'):
         gdal.FileFromMemBuffer('/vsimem/poly_indexed.' + ext,
@@ -2362,8 +2158,7 @@ def test_ogr_mitab_47():
     ds = ogr.Open('/vsimem/poly_indexed.tab')
     lyr = ds.GetLayer(0)
     lyr.SetAttributeFilter("PRFEDEA = '35043413'")
-    if lyr.GetFeatureCount() != 1:
-        return 'fail'
+    assert lyr.GetFeatureCount() == 1
     ds = None
     for ext in ('tab', 'dat', 'map', 'id'):
         gdal.Unlink('/vsimem/poly_indexed.' + ext)
@@ -2426,9 +2221,7 @@ def test_ogr_mitab_48():
     PARAMETER["false_easting",234.358],
     PARAMETER["false_northing",4185861.369]]""")
 
-    if sr_got.IsSame(sr_expected) == 0:
-        print(sr_got)
-        return 'fail'
+    assert sr_got.IsSame(sr_expected) != 0
 
     return 'success'
 
@@ -2442,14 +2235,11 @@ def test_ogr_mitab_49_aspatial():
     lyr = ds.GetLayer(0)
 
     geom_type = lyr.GetLayerDefn().GetGeomType()
-    if geom_type != ogr.wkbNone:
-        return 'fail'
+    assert geom_type == ogr.wkbNone
 
-    if lyr.GetSpatialRef() is not None:
-        return 'fail'
+    assert lyr.GetSpatialRef() is None
 
-    if lyr.GetExtent(can_return_null=True) is not None:
-        return 'fail'
+    assert lyr.GetExtent(can_return_null=True) is None
 
     return 'success'
 
@@ -2478,18 +2268,14 @@ def test_ogr_mitab_tab_field_index_creation():
     lyr.CreateFeature(f)
     ds = None
 
-    if gdal.VSIStatL('/vsimem/' + layername + '.ind') is None:
-        gdaltest.post_reason('no ind file')
-        return 'fail'
+    assert gdal.VSIStatL('/vsimem/' + layername + '.ind') is not None, 'no ind file'
 
     ds = ogr.Open(filename)
     with gdaltest.error_handler():
         ds.ExecuteSQL('CREATE INDEX ON ' + layername + ' USING other_field')
     lyr = ds.GetLayer(0)
     lyr.SetAttributeFilter('id = 200')
-    if lyr.GetFeatureCount() != 1:
-        gdaltest.post_reason('bad feature count')
-        return 'fail'
+    assert lyr.GetFeatureCount() == 1, 'bad feature count'
     ds = None
 
     ogr.GetDriverByName('MapInfo File').DeleteDataSource(filename)
@@ -2504,9 +2290,7 @@ def test_ogr_mitab_tab_view():
 
     ds = ogr.Open('data/mitab/view_first_table_second_table.tab')
     lyr = ds.GetLayer(0)
-    if lyr.GetLayerDefn().GetFieldCount() != 2:
-        gdaltest.post_reason('bad field count')
-        return 'fail'
+    assert lyr.GetLayerDefn().GetFieldCount() == 2, 'bad field count'
     f = lyr.GetNextFeature()
     if f['ID'] != 100 or f['foo'] != 'foo':
         gdaltest.post_reason('bad feature')
@@ -2516,9 +2300,7 @@ def test_ogr_mitab_tab_view():
 
     ds = ogr.Open('data/mitab/view_select_all_first_table_second_table.tab')
     lyr = ds.GetLayer(0)
-    if lyr.GetLayerDefn().GetFieldCount() != 3:
-        gdaltest.post_reason('bad field count')
-        return 'fail'
+    assert lyr.GetLayerDefn().GetFieldCount() == 3, 'bad field count'
     f = lyr.GetNextFeature()
     if f['joint_field'] != 1 or f['ID'] != 100 or f['foo'] != 'foo':
         gdaltest.post_reason('bad feature')
@@ -2591,8 +2373,7 @@ def test_ogr_mitab_tab_write_field_name_with_dot():
     ds = ogr.Open(tmpfile)
     lyr = ds.GetLayer(0)
     f = lyr.GetNextFeature()
-    if f['with_dot'] != 1:
-        return 'fail'
+    assert f['with_dot'] == 1
     ds = None
 
     ogr.GetDriverByName('MapInfo File').DeleteDataSource(tmpfile)
diff --git a/autotest/ogr/ogr_mongodb.py b/autotest/ogr/ogr_mongodb.py
index 9543f5c0022d..dd0d47259e0b 100755
--- a/autotest/ogr/ogr_mongodb.py
+++ b/autotest/ogr/ogr_mongodb.py
@@ -127,22 +127,19 @@ def test_ogr_mongodb_1():
     gdal.PushErrorHandler()
     ds = ogr.Open("mongodb://")
     gdal.PopErrorHandler()
-    if ds is not None:
-        return 'fail'
+    assert ds is None
 
     # URI to non existent host.
     gdal.PushErrorHandler()
     ds = ogr.Open("mongodb://non_existing")
     gdal.PopErrorHandler()
-    if ds is not None:
-        return 'fail'
+    assert ds is None
 
     # Connect to non existent host.
     gdal.PushErrorHandler()
     ds = gdal.OpenEx('mongodb:', open_options=['HOST=non_existing'])
     gdal.PopErrorHandler()
-    if ds is not None:
-        return 'fail'
+    assert ds is None
 
     # All arguments split up
     open_options = []
@@ -153,8 +150,7 @@ def test_ogr_mongodb_1():
         open_options += ['USER=' + ogrtest.mongodb_test_user]
         open_options += ['PASSWORD=' + ogrtest.mongodb_test_password]
     ds = gdal.OpenEx('mongodb:', open_options=open_options)
-    if ds is None:
-        return 'fail'
+    assert ds is not None
 
     # Without DBNAME
     open_options = []
@@ -179,8 +175,7 @@ def test_ogr_mongodb_1():
         gdal.PushErrorHandler()
         ds = gdal.OpenEx('mongodb:', open_options=open_options)
         gdal.PopErrorHandler()
-        if ds is not None:
-            return 'fail'
+        assert ds is None
 
         open_options = []
         open_options += ['HOST=' + ogrtest.mongodb_test_host]
@@ -191,8 +186,7 @@ def test_ogr_mongodb_1():
         gdal.PushErrorHandler()
         ds = gdal.OpenEx('mongodb:', open_options=open_options)
         gdal.PopErrorHandler()
-        if ds is not None:
-            return 'fail'
+        assert ds is None
 
         open_options = []
         open_options += ['HOST=' + ogrtest.mongodb_test_host]
@@ -203,8 +197,7 @@ def test_ogr_mongodb_1():
         gdal.PushErrorHandler()
         ds = gdal.OpenEx('mongodb:', open_options=open_options)
         gdal.PopErrorHandler()
-        if ds is not None:
-            return 'fail'
+        assert ds is None
 
         open_options = []
         open_options += ['HOST=' + ogrtest.mongodb_test_host]
@@ -216,8 +209,7 @@ def test_ogr_mongodb_1():
         gdal.PushErrorHandler()
         ds = gdal.OpenEx('mongodb:', open_options=open_options)
         gdal.PopErrorHandler()
-        if ds is not None:
-            return 'fail'
+        assert ds is None
 
     # Test AUTH_JSON: invalid JSon
     gdal.PushErrorHandler()
@@ -228,8 +220,7 @@ def test_ogr_mongodb_1():
     open_options += ['AUTH_JSON={']
     ds = gdal.OpenEx('mongodb:', open_options=open_options)
     gdal.PopErrorHandler()
-    if ds is not None:
-        return 'fail'
+    assert ds is None
 
     # Test AUTH_JSON: missing mechanism
     gdal.PushErrorHandler()
@@ -240,8 +231,7 @@ def test_ogr_mongodb_1():
     open_options += ['AUTH_JSON={}']
     ds = gdal.OpenEx('mongodb:', open_options=open_options)
     gdal.PopErrorHandler()
-    if ds is not None:
-        return 'fail'
+    assert ds is None
 
     # Successful AUTH_JSON use
     if ogrtest.mongodb_test_user is not None:
@@ -252,8 +242,7 @@ def test_ogr_mongodb_1():
         open_options += ['AUTH_JSON={ "mechanism" : "SCRAM-SHA-1", "db": "%s", "user": "%s", "pwd": "%s" }' %
                          (ogrtest.mongodb_test_dbname, ogrtest.mongodb_test_user, ogrtest.mongodb_test_password)]
         ds = gdal.OpenEx('mongodb:', open_options=open_options)
-        if ds is None:
-            return 'fail'
+        assert ds is not None
 
     return 'success'
 
@@ -266,17 +255,13 @@ def test_ogr_mongodb_2():
         return 'skip'
 
     ogrtest.mongodb_ds = ogr.Open(ogrtest.mongodb_test_uri, update=1)
-    if ogrtest.mongodb_ds.GetLayerByName('not_existing') is not None:
-        return 'fail'
+    assert ogrtest.mongodb_ds.GetLayerByName('not_existing') is None
 
-    if ogrtest.mongodb_ds.TestCapability(ogr.ODsCCreateLayer) != 1:
-        return 'fail'
+    assert ogrtest.mongodb_ds.TestCapability(ogr.ODsCCreateLayer) == 1
 
-    if ogrtest.mongodb_ds.TestCapability(ogr.ODsCDeleteLayer) != 1:
-        return 'fail'
+    assert ogrtest.mongodb_ds.TestCapability(ogr.ODsCDeleteLayer) == 1
 
-    if ogrtest.mongodb_ds.TestCapability(ogr.ODsCCreateGeomFieldAfterCreateLayer) != 1:
-        return 'fail'
+    assert ogrtest.mongodb_ds.TestCapability(ogr.ODsCCreateGeomFieldAfterCreateLayer) == 1
 
     # Create layer
     a_uuid = str(uuid.uuid1()).replace('-', '_')
@@ -288,18 +273,15 @@ def test_ogr_mongodb_2():
     gdal.PushErrorHandler()
     ret = lyr.CreateGeomField(ogr.GeomFieldDefn('location.mygeom', ogr.wkbPoint))
     gdal.PopErrorHandler()
-    if ret == 0:
-        return 'fail'
+    assert ret != 0
 
     ret = lyr.CreateField(ogr.FieldDefn('str', ogr.OFTString))
-    if ret != 0:
-        return 'fail'
+    assert ret == 0
 
     gdal.PushErrorHandler()
     ret = lyr.CreateField(ogr.FieldDefn('str', ogr.OFTString))
     gdal.PopErrorHandler()
-    if ret == 0:
-        return 'fail'
+    assert ret != 0
 
     lyr.CreateField(ogr.FieldDefn('location.name', ogr.OFTString))
     bool_field = ogr.FieldDefn('bool', ogr.OFTInteger)
@@ -339,15 +321,12 @@ def test_ogr_mongodb_2():
     f['embed.embed2.real'] = 3.45
     f.SetFieldNull('str_is_null')
     f.SetGeometryDirectly(ogr.CreateGeometryFromWkt('POLYGON((2 49,2 50,3 50,3 49,2 49))'))
-    if lyr.CreateFeature(f) != 0:
-        return 'fail'
-    if f['_id'] is None:
-        return 'fail'
+    assert lyr.CreateFeature(f) == 0
+    assert f['_id'] is not None
     f_ref = f.Clone()
 
     # Test GetFeatureCount()
-    if lyr.GetFeatureCount() != 1:
-        return 'fail'
+    assert lyr.GetFeatureCount() == 1
 
     # Test GetNextFeature()
     lyr.ResetReading()
@@ -368,8 +347,7 @@ def test_ogr_mongodb_2():
 
     # Test SetFeature()
     f['bool'] = 0
-    if lyr.SetFeature(f) != 0:
-        return 'fail'
+    assert lyr.SetFeature(f) == 0
     f_ref = f.Clone()
     f = lyr.GetFeature(1)
     if f['bool'] != 0:
@@ -380,8 +358,7 @@ def test_ogr_mongodb_2():
     gdal.PushErrorHandler()
     ret = lyr.DeleteFeature(1)
     gdal.PopErrorHandler()
-    if ret == 0:
-        return 'fail'
+    assert ret != 0
 
     # Test Mongo filter
     lyr.SetAttributeFilter('{ "int": 1 }')
@@ -432,29 +409,25 @@ def test_ogr_mongodb_2():
     f = f_ref.Clone()
     f.SetFID(-1)
     f.SetGeometryDirectly(None)
-    if lyr.CreateFeature(f) != 0:
-        return 'fail'
+    assert lyr.CreateFeature(f) == 0
 
     # Duplicate key
     gdal.PushErrorHandler()
     ret = lyr.SyncToDisk()
     gdal.PopErrorHandler()
-    if ret == 0:
-        return 'fail'
+    assert ret != 0
 
     f['_id'] = None
     lyr.CreateFeature(f)
     ret = lyr.SyncToDisk()
-    if ret != 0:
-        return 'fail'
+    assert ret == 0
 
     # Missing _id
     f.UnsetField('_id')
     gdal.PushErrorHandler()
     ret = lyr.SetFeature(f)
     gdal.PopErrorHandler()
-    if ret == 0:
-        return 'fail'
+    assert ret != 0
 
     # MongoDB dialect of ExecuteSQL() with invalid JSON
     gdal.PushErrorHandler()
@@ -463,21 +436,17 @@ def test_ogr_mongodb_2():
 
     # MongoDB dialect of ExecuteSQL() with nonexistent command.
     sql_lyr = ogrtest.mongodb_ds.ExecuteSQL('{ "foo": 1 }', dialect='MongoDB')
-    if sql_lyr is None:
-        return 'fail'
+    assert sql_lyr is not None
     ogrtest.mongodb_ds.ReleaseResultSet(sql_lyr)
 
     # MongoDB dialect of ExecuteSQL() with existing commnand
     sql_lyr = ogrtest.mongodb_ds.ExecuteSQL('{ "listCommands" : 1 }',
                                             dialect='MongoDB')
-    if sql_lyr is None:
-        return 'fail'
+    assert sql_lyr is not None
     f = sql_lyr.GetNextFeature()
-    if f is None:
-        return 'fail'
+    assert f is not None
     f = sql_lyr.GetNextFeature()
-    if f is not None:
-        return 'fail'
+    assert f is None
     sql_lyr.GetLayerDefn()
     sql_lyr.ResetReading()
     sql_lyr.TestCapability('')
@@ -485,24 +454,21 @@ def test_ogr_mongodb_2():
 
     # Regular ExecuteSQL()
     sql_lyr = ogrtest.mongodb_ds.ExecuteSQL('SELECT * FROM ' + ogrtest.mongodb_layer_name)
-    if sql_lyr is None:
-        return 'fail'
+    assert sql_lyr is not None
     ogrtest.mongodb_ds.ReleaseResultSet(sql_lyr)
 
     # Test CreateLayer again with same name
     gdal.PushErrorHandler()
     lyr = ogrtest.mongodb_ds.CreateLayer(ogrtest.mongodb_layer_name)
     gdal.PopErrorHandler()
-    if lyr is not None:
-        return 'fail'
+    assert lyr is None
 
     ogrtest.mongodb_ds = gdal.OpenEx(ogrtest.mongodb_test_uri, gdal.OF_UPDATE,
                                      open_options=['FEATURE_COUNT_TO_ESTABLISH_FEATURE_DEFN=-1', 'BULK_INSERT=NO', 'JSON_FIELD=TRUE'])
 
     # Check after reopening
     lyr = ogrtest.mongodb_ds.GetLayerByName(ogrtest.mongodb_layer_name)
-    if lyr.TestCapability(ogr.OLCFastSpatialFilter) == 0:
-        return 'fail'
+    assert lyr.TestCapability(ogr.OLCFastSpatialFilter) != 0
     f = lyr.GetNextFeature()
     json_field = f['_json']
     # We cannot use feature.Equal() has the C++ layer defn has changed
@@ -532,8 +498,7 @@ def test_ogr_mongodb_2():
     lyr = ogrtest.mongodb_ds.CreateLayer(ogrtest.mongodb_layer_name_no_ogr_metadata, options=['GEOMETRY_NAME=location.mygeom', 'FID=', 'WRITE_OGR_METADATA=NO'])
     f = ogr.Feature(lyr.GetLayerDefn())
     f['_json'] = json_field
-    if lyr.CreateFeature(f) != 0:
-        return 'fail'
+    assert lyr.CreateFeature(f) == 0
 
     ogrtest.mongodb_layer_name_guess_types = ogrtest.mongodb_layer_name + "_guess_types"
     lyr = ogrtest.mongodb_ds.CreateLayer(ogrtest.mongodb_layer_name_guess_types, geom_type=ogr.wkbNone, options=['FID=', 'WRITE_OGR_METADATA=NO'])
@@ -572,8 +537,7 @@ def test_ogr_mongodb_2():
     f['_json'] += '"mixedlist": [true,1,{ "$numberLong" : "1234567890123456" },3.45],'
     f['_json'] += '"mixedlist2": [true,1,{ "$numberLong" : "1234567890123456" },3.45,"str"]'
     f['_json'] += '}'
-    if lyr.CreateFeature(f) != 0:
-        return 'fail'
+    assert lyr.CreateFeature(f) == 0
 
     f = ogr.Feature(lyr.GetLayerDefn())
     f['_json'] = '{'
@@ -602,8 +566,7 @@ def test_ogr_mongodb_2():
     f['_json'] += '"intlist_boollist" : [true], '
     f['_json'] += '"boollist_intlist" : [2]'
     f['_json'] += '}'
-    if lyr.CreateFeature(f) != 0:
-        return 'fail'
+    assert lyr.CreateFeature(f) == 0
 
     # This new features will not be taken into account by below the FEATURE_COUNT_TO_ESTABLISH_FEATURE_DEFN=2
     f = ogr.Feature(lyr.GetLayerDefn())
@@ -615,8 +578,7 @@ def test_ogr_mongodb_2():
     f['_json'] += '"int64list" : [1, { "$numberLong" : "1234567890123456" }, "1", { "$minKey": 1 },{ "$maxKey": 1 }, -1e300, 1e300, 1.23 ], '
     f['_json'] += '"reallist" : [1, { "$numberLong" : "1234567890123456" }, 1.0, "1", { "$minKey": 1 },{ "$maxKey": 1 }, { "$numberLong" : "1234567890123456" } ] '
     f['_json'] += '}'
-    if lyr.CreateFeature(f) != 0:
-        return 'fail'
+    assert lyr.CreateFeature(f) == 0
 
     f = ogr.Feature(lyr.GetLayerDefn())
     f['_json'] = '{'
@@ -624,8 +586,7 @@ def test_ogr_mongodb_2():
     f['_json'] += '"int64": { "$maxKey": 1 }, '
     f['_json'] += '"real": { "$maxKey": 1 } '
     f['_json'] += '}'
-    if lyr.CreateFeature(f) != 0:
-        return 'fail'
+    assert lyr.CreateFeature(f) == 0
 
     ogrtest.mongodb_layer_name_with_2d_index = ogrtest.mongodb_layer_name + "_with_2d_index"
     gdal.SetConfigOption('OGR_MONGODB_SPAT_INDEX_TYPE', '2d')
@@ -633,33 +594,26 @@ def test_ogr_mongodb_2():
     gdal.SetConfigOption('OGR_MONGODB_SPAT_INDEX_TYPE', None)
     f = ogr.Feature(lyr.GetLayerDefn())
     f.SetGeometryDirectly(ogr.CreateGeometryFromWkt('POINT(2 49)'))
-    if lyr.CreateFeature(f) != 0:
-        return 'fail'
+    assert lyr.CreateFeature(f) == 0
 
     ogrtest.mongodb_layer_name_no_spatial_index = ogrtest.mongodb_layer_name + "_no_spatial_index"
     for i in range(2):
         lyr = ogrtest.mongodb_ds.CreateLayer(ogrtest.mongodb_layer_name_no_spatial_index, options=['SPATIAL_INDEX=NO', 'OVERWRITE=YES'])
         f = ogr.Feature(lyr.GetLayerDefn())
         f.SetGeometryDirectly(ogr.CreateGeometryFromWkt('POINT(2 49)'))
-        if lyr.CreateFeature(f) != 0:
-            return 'fail'
+        assert lyr.CreateFeature(f) == 0
         ogrtest.mongodb_ds.ExecuteSQL('WRITE_OGR_METADATA ' + ogrtest.mongodb_layer_name_no_spatial_index)
 
     # Open "ghost" layer
     lyr = ogrtest.mongodb_ds.GetLayerByName('_ogr_metadata')
-    if lyr is None:
-        return 'fail'
+    assert lyr is not None
     lyr.SetAttributeFilter("layer LIKE '%s%%'" % ogrtest.mongodb_layer_name)
-    if lyr.GetFeatureCount() != 2:
-        print(lyr.GetFeatureCount())
-        return 'fail'
+    assert lyr.GetFeatureCount() == 2
 
-    if ogrtest.mongodb_ds.DeleteLayer(-1) == 0:
-        return 'fail'
+    assert ogrtest.mongodb_ds.DeleteLayer(-1) != 0
 
     lyr = ogrtest.mongodb_ds.GetLayerByName(ogrtest.mongodb_test_dbname + '.' + '_ogr_metadata')
-    if lyr is None:
-        return 'fail'
+    assert lyr is not None
 
     ogrtest.mongodb_ds = None
 
@@ -667,8 +621,7 @@ def test_ogr_mongodb_2():
     ogrtest.mongodb_ds = gdal.OpenEx(ogrtest.mongodb_test_uri, 0, open_options=['FEATURE_COUNT_TO_ESTABLISH_FEATURE_DEFN=2', 'JSON_FIELD=TRUE'])
 
     lyr = ogrtest.mongodb_ds.GetLayerByName(ogrtest.mongodb_layer_name_no_ogr_metadata)
-    if lyr.TestCapability(ogr.OLCFastSpatialFilter) != 0:
-        return 'fail'
+    assert lyr.TestCapability(ogr.OLCFastSpatialFilter) == 0
     f = lyr.GetNextFeature()
     for i in range(f_ref.GetDefnRef().GetFieldCount()):
         if f_ref.GetFieldDefnRef(i).GetNameRef() == "str_is_null":
@@ -738,12 +691,8 @@ def test_ogr_mongodb_2():
         ("mixedlist2", ogr.OFTStringList)]
     for (fieldname, fieldtype) in expected_fields:
         fld_defn = lyr.GetLayerDefn().GetFieldDefn(lyr.GetLayerDefn().GetFieldIndex(fieldname))
-        if fld_defn.GetType() != fieldtype:
-            print(fieldname)
-            print(fld_defn.GetType())
-            return 'fail'
-        if fld_defn.GetSubType() != ogr.OFSTNone:
-            return 'fail'
+        assert fld_defn.GetType() == fieldtype, fieldname
+        assert fld_defn.GetSubType() == ogr.OFSTNone
 
     f = lyr.GetNextFeature()
     f = lyr.GetNextFeature()
@@ -759,81 +708,67 @@ def test_ogr_mongodb_2():
         return 'fail'
 
     lyr = ogrtest.mongodb_ds.GetLayerByName(ogrtest.mongodb_layer_name_with_2d_index)
-    if lyr.TestCapability(ogr.OLCFastSpatialFilter) == 0:
-        return 'fail'
+    assert lyr.TestCapability(ogr.OLCFastSpatialFilter) != 0
     lyr.SetSpatialFilterRect(1.9, 48.9, 2.1, 49.1)
     lyr.ResetReading()
     f = lyr.GetNextFeature()
-    if f is None:
-        return 'fail'
+    assert f is not None
     lyr.SetSpatialFilterRect(1.9, 48.9, 1.95, 48.95)
     lyr.ResetReading()
     f = lyr.GetNextFeature()
-    if f is not None:
-        return 'fail'
+    assert f is None
 
     lyr = ogrtest.mongodb_ds.GetLayerByName(ogrtest.mongodb_layer_name_no_spatial_index)
-    if lyr.TestCapability(ogr.OLCFastSpatialFilter) != 0:
-        print(lyr.TestCapability(ogr.OLCFastSpatialFilter))
-        return 'fail'
+    assert lyr.TestCapability(ogr.OLCFastSpatialFilter) == 0
     lyr.SetSpatialFilterRect(1.9, 48.9, 2.1, 49.1)
     lyr.ResetReading()
     f = lyr.GetNextFeature()
-    if f is None:
-        return 'fail'
+    assert f is not None
 
     gdal.PushErrorHandler()
     lyr = ogrtest.mongodb_ds.CreateLayer('foo')
     gdal.PopErrorHandler()
-    if lyr is not None:
-        return 'fail'
+    assert lyr is None
 
     gdal.ErrorReset()
     gdal.PushErrorHandler()
     ogrtest.mongodb_ds.ExecuteSQL('WRITE_OGR_METADATA ' + ogrtest.mongodb_layer_name)
     gdal.PopErrorHandler()
-    if gdal.GetLastErrorMsg() == '':
-        return 'fail'
+    assert gdal.GetLastErrorMsg() != ''
 
     lyr_count_before = ogrtest.mongodb_ds.GetLayerCount()
     gdal.PushErrorHandler()
     ogrtest.mongodb_ds.ExecuteSQL('DELLAYER:' + ogrtest.mongodb_layer_name)
     gdal.PopErrorHandler()
-    if ogrtest.mongodb_ds.GetLayerCount() != lyr_count_before:
-        return 'fail'
+    assert ogrtest.mongodb_ds.GetLayerCount() == lyr_count_before
 
     lyr = ogrtest.mongodb_ds.GetLayerByName(ogrtest.mongodb_layer_name)
 
     gdal.PushErrorHandler()
     ret = lyr.CreateField(ogr.FieldDefn('foo', ogr.OFTString))
     gdal.PopErrorHandler()
-    if ret == 0:
-        return 'fail'
+    assert ret != 0
 
     gdal.PushErrorHandler()
     ret = lyr.CreateGeomField(ogr.GeomFieldDefn('foo', ogr.wkbPoint))
     gdal.PopErrorHandler()
-    if ret == 0:
-        return 'fail'
+    assert ret != 0
 
     f = ogr.Feature(lyr.GetLayerDefn())
     gdal.PushErrorHandler()
     ret = lyr.CreateFeature(f)
     gdal.PopErrorHandler()
-    if ret == 0:
-        return 'fail'
+    assert ret != 0
 
     gdal.PushErrorHandler()
     ret = lyr.SetFeature(f)
     gdal.PopErrorHandler()
-    if ret == 0:
-        return 'fail'
+    assert ret != 0
 
     gdal.PushErrorHandler()
     ret = lyr.DeleteFeature(1)
     gdal.PopErrorHandler()
-    if ret == 0:
-        return 'fail'
+    assert ret != 0
 
     return 'success'
 
@@ -850,9 +785,7 @@ def test_ogr_mongodb_3():
         return 'skip'
 
     ret = gdaltest.runexternal(test_cli_utilities.get_test_ogrsf_path() + ' -ro ' + ogrtest.mongodb_test_uri)
-    if ret.find('INFO') == -1 or ret.find('ERROR') != -1:
-        print(ret)
-        return 'fail'
+    assert ret.find('INFO') != -1 and ret.find('ERROR') == -1
 
     return 'success'
 
diff --git a/autotest/ogr/ogr_mssqlspatial.py b/autotest/ogr/ogr_mssqlspatial.py
index 8c15fadb4c69..3be9013ca58e 100755
--- a/autotest/ogr/ogr_mssqlspatial.py
+++ b/autotest/ogr/ogr_mssqlspatial.py
@@ -37,6 +37,7 @@
 from osgeo import gdal
 from osgeo import ogr
 from osgeo import osr
+import pytest
 
 ###############################################################################
 # Open Database.
@@ -125,13 +126,11 @@ def test_ogr_mssqlspatial_2():
 
     dst_feat = None
 
-    if gdaltest.mssqlspatial_lyr.GetFeatureCount() != shp_lyr.GetFeatureCount():
-        gdaltest.post_reason('not matching feature count')
-        return 'fail'
+    assert gdaltest.mssqlspatial_lyr.GetFeatureCount() == shp_lyr.GetFeatureCount(), \
+        'not matching feature count'
 
-    if not gdaltest.mssqlspatial_lyr.GetSpatialRef().IsSame(shp_lyr.GetSpatialRef()):
-        gdaltest.post_reason('not matching spatial ref')
-        return 'fail'
+    assert gdaltest.mssqlspatial_lyr.GetSpatialRef().IsSame(shp_lyr.GetSpatialRef()), \
+        'not matching spatial ref'
 
     return 'success'
 
@@ -143,14 +142,9 @@ def test_ogr_mssqlspatial_3():
     if gdaltest.mssqlspatial_ds is None:
         return 'skip'
 
-    if gdaltest.mssqlspatial_lyr.GetGeometryColumn() != 'ogr_geometry':
-        print(gdaltest.mssqlspatial_lyr.GetGeometryColumn())
-        return 'fail'
+    assert gdaltest.mssqlspatial_lyr.GetGeometryColumn() == 'ogr_geometry'
 
-    if gdaltest.mssqlspatial_lyr.GetFeatureCount() != 10:
-        gdaltest.post_reason('GetFeatureCount() returned %d instead of 10' %
-                             gdaltest.mssqlspatial_lyr.GetFeatureCount())
-        return 'fail'
+    assert gdaltest.mssqlspatial_lyr.GetFeatureCount() == 10
 
     expect = [168, 169, 166, 158, 165]
 
@@ -158,10 +152,7 @@ def test_ogr_mssqlspatial_3():
     tr = ogrtest.check_features_against_list(gdaltest.mssqlspatial_lyr,
                                              'eas_id', expect)
 
-    if gdaltest.mssqlspatial_lyr.GetFeatureCount() != 5:
-        gdaltest.post_reason('GetFeatureCount() returned %d instead of 5' %
-                             gdaltest.mssqlspatial_lyr.GetFeatureCount())
-        return 'fail'
+    assert gdaltest.mssqlspatial_lyr.GetFeatureCount() == 5
 
     gdaltest.mssqlspatial_lyr.SetAttributeFilter(None)
 
@@ -169,16 +160,13 @@ def test_ogr_mssqlspatial_3():
         orig_feat = gdaltest.poly_feat[i]
         read_feat = gdaltest.mssqlspatial_lyr.GetNextFeature()
 
-        if ogrtest.check_feature_geometry(read_feat, orig_feat.GetGeometryRef(),
-                                          max_error=0.001) != 0:
-            return 'fail'
+        assert (ogrtest.check_feature_geometry(read_feat, orig_feat.GetGeometryRef(),
+                                          max_error=0.001) == 0)
 
         for fld in range(3):
-            if orig_feat.GetField(fld) != read_feat.GetField(fld):
-                gdaltest.post_reason('Attribute %d does not match' % fld)
-                return 'fail'
-        if read_feat.GetField('INT64') != 1234567890123:
-            return 'fail'
+            assert orig_feat.GetField(fld) == read_feat.GetField(fld), \
+                ('Attribute %d does not match' % fld)
+        assert read_feat.GetField('INT64') == 1234567890123
 
         read_feat = None
         orig_feat = None
@@ -216,19 +204,16 @@ def test_ogr_mssqlspatial_4():
         dst_feat.SetGeometryDirectly(geom)
         dst_feat.SetField('PRFEDEA', item)
         dst_feat.SetFID(-1)
-        if gdaltest.mssqlspatial_lyr.CreateFeature(dst_feat) \
-           != ogr.OGRERR_NONE:
-            gdaltest.post_reason('CreateFeature failed creating feature ' +
+        assert gdaltest.mssqlspatial_lyr.CreateFeature(dst_feat) == ogr.OGRERR_NONE, \
+            ('CreateFeature failed creating feature ' +
                                  'from file "' + wkt_filename + '"')
-            return 'fail'
 
         ######################################################################
         # Before reading back the record, verify that the newly added feature 
         # is returned from the CreateFeature method with a newly assigned FID.
         
-        if dst_feat.GetFID() == -1:
-            gdaltest.post_reason('Assigned FID was not returned in the new feature')
-            return 'fail'
+        assert dst_feat.GetFID() != -1, \
+            'Assigned FID was not returned in the new feature'
 
         ######################################################################
         # Read back the feature and get the geometry.
@@ -240,8 +225,7 @@ def test_ogr_mssqlspatial_4():
         if ogrtest.check_feature_geometry(feat_read, geom) != 0:
             print(item)
             print(wkt)
-            print(geom_read)
-            return 'fail'
+            pytest.fail(geom_read)
 
         feat_read.Destroy()
 
@@ -265,9 +249,7 @@ def test_ogr_mssqlspatial_test_ogrsf():
 
     ret = gdaltest.runexternal(test_cli_utilities.get_test_ogrsf_path() + " -ro '" + gdaltest.mssqlspatial_dsname + "' tpoly")
 
-    if ret.find('INFO') == -1 or ret.find('ERROR') != -1:
-        print(ret)
-        return 'fail'
+    assert ret.find('INFO') != -1 and ret.find('ERROR') == -1
 
     return 'success'
 
@@ -308,43 +290,34 @@ def test_ogr_mssqlspatial_create_feature_in_unregistered_table():
     gdal.SetConfigOption('MSSQLSPATIAL_USE_GEOMETRY_COLUMNS',
                          use_geometry_columns)
 
-    if test_ds is None:
-        gdaltest.post_reason('cannot open data source')
-        return 'fail'
+    assert test_ds is not None, 'cannot open data source'
 
     # Get a layer backed by the newly created table and verify that (as it is
     # unregistered) it has no associated spatial-reference system
     unregistered_layer = test_ds.GetLayerByName('Unregistered');
-    if unregistered_layer is None:
-        gdaltest.post_reason('did not get Unregistered layer')
-        return 'fail'
+    assert unregistered_layer is not None, 'did not get Unregistered layer'
 
     unregistered_spatial_reference = unregistered_layer.GetSpatialRef()
-    if unregistered_spatial_reference is not None:
-        gdaltest.post_reason('layer Unregistered unexpectedly has an SRS')
-        return 'fail'
+    assert unregistered_spatial_reference is None, \
+        'layer Unregistered unexpectedly has an SRS'
 
     # Verify creating the feature in the layer succeeds despite the lack of an
     # associated spatial-reference system
-    if unregistered_layer.CreateFeature(feature) != ogr.OGRERR_NONE:
-        gdaltest.post_reason('CreateFeature failed')
-        return 'fail'
+    assert unregistered_layer.CreateFeature(feature) == ogr.OGRERR_NONE, \
+        'CreateFeature failed'
 
     # Verify the created feature received the spatial-reference system of the
     # original, as none was associated with the table
     unregistered_layer.ResetReading()
     created_feature = unregistered_layer.GetNextFeature()
-    if created_feature is None:
-        gdaltest.post_reason('did not get feature')
-        return 'fail'
+    assert created_feature is not None, 'did not get feature'
 
     created_feature_geometry = created_feature.GetGeometryRef()
     created_spatial_reference = created_feature_geometry.GetSpatialReference()
-    if not ((created_spatial_reference == spatial_reference)
+    assert ((created_spatial_reference == spatial_reference)
             or ((created_spatial_reference is not None)
-                and created_spatial_reference.IsSame(spatial_reference))):
-        gdaltest.post_reason('created-feature SRS does not match original')
-        return 'fail'
+                and created_spatial_reference.IsSame(spatial_reference))), \
+        'created-feature SRS does not match original'
 
     # Clean up
     test_ds.Destroy()
diff --git a/autotest/ogr/ogr_mvt.py b/autotest/ogr/ogr_mvt.py
index c069c42e999a..e2f3b2b4cf97 100644
--- a/autotest/ogr/ogr_mvt.py
+++ b/autotest/ogr/ogr_mvt.py
@@ -72,9 +72,7 @@ def test_ogr_mvt_datatypes():
     lyr = ds.GetLayer(0)
 
     count = lyr.GetLayerDefn().GetFieldCount()
-    if count != 16:
-        print(count)
-        return 'fail'
+    assert count == 16
 
     tab = []
     for i in range(lyr.GetLayerDefn().GetFieldCount()):
@@ -99,10 +97,7 @@ def test_ogr_mvt_datatypes():
         ('real_value', ogr.OFTReal, ogr.OFSTNone),
         ('string_value', ogr.OFTString, ogr.OFSTNone),
     ]
-    if tab != expected_tab:
-        print(tab)
-        print(expected_tab)
-        return 'fail'
+    assert tab == expected_tab
 
     f = lyr.GetNextFeature()
     if f['bool_false'] != 0 or \
@@ -140,13 +135,8 @@ def test_ogr_mvt_datatype_promotion():
     for layer_name, dt in tab:
         lyr = ds.GetLayerByName(layer_name)
         fld_defn = lyr.GetLayerDefn().GetFieldDefn(1)
-        if fld_defn.GetType() != dt:
-            print(layer_name)
-            print(fld_defn.GetType(), dt)
-            return 'fail'
-        if fld_defn.GetSubType() != ogr.OFSTNone:
-            print(layer_name)
-            return 'fail'
+        assert fld_defn.GetType() == dt, layer_name
+        assert fld_defn.GetSubType() == ogr.OFSTNone, layer_name
 
     return 'success'
 
@@ -159,40 +149,31 @@ def test_ogr_mvt_limit_cases():
         ds = ogr.Open('data/mvt/limit_cases.pbf')
 
     lyr = ds.GetLayerByName('empty')
-    if lyr.GetFeatureCount() != 0:
-        return 'fail'
+    assert lyr.GetFeatureCount() == 0
 
     lyr = ds.GetLayerByName('layer1')
-    if lyr.GetFeatureCount() != 7:
-        return 'fail'
+    assert lyr.GetFeatureCount() == 7
 
     f = lyr.GetFeature(1)
-    if f['mvt_id'] != 1:
-        return 'fail'
+    assert f['mvt_id'] == 1
 
     with gdaltest.error_handler():
         f = lyr.GetFeature(6)
-        if f['b'] != 1:
-            return 'fail'
+        assert f['b'] == 1
 
     lyr = ds.GetLayerByName('layer2')
-    if lyr.GetFeatureCount() != 0:
-        return 'fail'
+    assert lyr.GetFeatureCount() == 0
 
     lyr = ds.GetLayerByName('layer3')
-    if lyr.GetFeatureCount() != 0:
-        return 'fail'
+    assert lyr.GetFeatureCount() == 0
 
     lyr = ds.GetLayerByName('layer4')
-    if lyr.GetFeatureCount() != 0:
-        return 'fail'
+    assert lyr.GetFeatureCount() == 0
 
     lyr = ds.GetLayerByName('layer5')
-    if lyr.GetFeatureCount() != 1:
-        return 'fail'
+    assert lyr.GetFeatureCount() == 1
     f = lyr.GetNextFeature()
-    if f.GetGeometryRef().ExportToWkt() != 'POINT (2070 2690)':
-        return 'fail'
+    assert f.GetGeometryRef().ExportToWkt() == 'POINT (2070 2690)'
 
     return 'success'
 
@@ -342,8 +323,7 @@ def test_ogr_mvt_tileset_without_readdir():
         ds = gdal.OpenEx('data/mvt/linestring/0')
     lyr = ds.GetLayer(0)
     f = lyr.GetNextFeature()
-    if f is None:
-        return 'fail'
+    assert f is not None
 
     return 'success'
 
@@ -354,11 +334,9 @@ def test_ogr_mvt_tileset_tilegl():
 
     ds = ogr.Open('data/mvt/linestring_tilejson_gl/0')
     lyr = ds.GetLayer(0)
-    if lyr.GetLayerDefn().GetFieldCount() != 2:
-        return 'fail'
+    assert lyr.GetLayerDefn().GetFieldCount() == 2
     f = lyr.GetNextFeature()
-    if f is None:
-        return 'fail'
+    assert f is not None
 
     return 'success'
 
@@ -370,14 +348,11 @@ def test_ogr_mvt_tileset_without_metadata_file():
     ds = gdal.OpenEx('data/mvt/point_polygon/1',
                      open_options=['METADATA_FILE=', 'CLIP=NO'])
     lyr = ds.GetLayerByName('point')
-    if lyr.GetGeomType() != ogr.wkbMultiPoint:
-        return 'fail'
+    assert lyr.GetGeomType() == ogr.wkbMultiPoint
 
     lyr = ds.GetLayerByName('polygon2')
-    if lyr.GetGeomType() != ogr.wkbMultiPolygon:
-        return 'fail'
-    if lyr.GetLayerDefn().GetFieldCount() != 2:
-        return 'fail'
+    assert lyr.GetGeomType() == ogr.wkbMultiPolygon
+    assert lyr.GetLayerDefn().GetFieldCount() == 2
 
     return 'success'
 
@@ -389,11 +364,10 @@ def test_ogr_mvt_tileset_json_field():
     ds = gdal.OpenEx('data/mvt/datatypes/0',
                      open_options=['METADATA_FILE=', 'JSON_FIELD=YES', 'CLIP=NO'])
     lyr = ds.GetLayer(0)
-    if lyr.GetLayerDefn().GetFieldCount() != 2:
-        return 'fail'
+    assert lyr.GetLayerDefn().GetFieldCount() == 2
     f = lyr.GetNextFeature()
     d = json.loads(f.GetFieldAsString("json"))
-    if d != {
+    assert (d == {
             "bool_true": True,
             "bool_false": False,
             "pos_int_value": 1,
@@ -409,9 +383,7 @@ def test_ogr_mvt_tileset_json_field():
             "float_value": 1.25,
             "real_value": 1.23456789,
             "string_value": "str"
-    }:
-        print(f.GetFieldAsString("json"))
-        return 'fail'
+    }), f.GetFieldAsString("json")
 
     return 'success'
 
@@ -479,9 +451,7 @@ def test_ogr_mvt_test_ogrsf_pbf():
     ret = gdaltest.runexternal(test_cli_utilities.get_test_ogrsf_path() +
                                ' -ro data/mvt/datatypes/0/0/0.pbf')
 
-    if ret.find('INFO') == -1 or ret.find('ERROR') != -1:
-        print(ret)
-        return 'fail'
+    assert ret.find('INFO') != -1 and ret.find('ERROR') == -1
 
     return 'success'
 
@@ -497,9 +467,7 @@ def test_ogr_mvt_test_ogrsf_directory():
     ret = gdaltest.runexternal(test_cli_utilities.get_test_ogrsf_path() +
                                ' -ro data/mvt/datatypes/0')
 
-    if ret.find('INFO') == -1 or ret.find('ERROR') != -1:
-        print(ret)
-        return 'fail'
+    assert ret.find('INFO') != -1 and ret.find('ERROR') == -1
 
     return 'success'
 
@@ -538,11 +506,10 @@ def test_ogr_mvt_mbtiles_json_field():
     ds = gdal.OpenEx('data/mvt/datatypes.mbtiles',
                      open_options=['JSON_FIELD=YES', 'CLIP=NO'])
     lyr = ds.GetLayer(0)
-    if lyr.GetLayerDefn().GetFieldCount() != 2:
-        return 'fail'
+    assert lyr.GetLayerDefn().GetFieldCount() == 2
     f = lyr.GetNextFeature()
     d = json.loads(f.GetFieldAsString("json"))
-    if d != {'int64_value': 123456789012345,
+    assert (d == {'int64_value': 123456789012345,
              'string_value': 'str',
              'real_value': 1.23456789,
              'bool_false': False,
@@ -550,9 +517,7 @@ def test_ogr_mvt_mbtiles_json_field():
              'neg_int_value': -1,
              'bool_true': True,
              'float_value': 1.25
-             }:
-        print(f.GetFieldAsString("json"))
-        return 'fail'
+             }), f.GetFieldAsString("json")
 
     return 'success'
 
@@ -567,11 +532,10 @@ def test_ogr_mvt_mbtiles_json_field_auto():
     ds = gdal.OpenEx('data/mvt/datatypes_json_field_auto.mbtiles',
                      open_options=['CLIP=NO'])
     lyr = ds.GetLayer(0)
-    if lyr.GetLayerDefn().GetFieldCount() != 2:
-        return 'fail'
+    assert lyr.GetLayerDefn().GetFieldCount() == 2
     f = lyr.GetNextFeature()
     d = json.loads(f.GetFieldAsString("json"))
-    if d != {'int64_value': 123456789012345,
+    assert (d == {'int64_value': 123456789012345,
              'string_value': 'str',
              'real_value': 1.23456789,
              'bool_false': False,
@@ -579,9 +543,7 @@ def test_ogr_mvt_mbtiles_json_field_auto():
              'neg_int_value': -1,
              'bool_true': True,
              'float_value': 1.25
-             }:
-        print(f.GetFieldAsString("json"))
-        return 'fail'
+             }), f.GetFieldAsString("json")
 
     return 'success'
 
@@ -600,9 +562,7 @@ def test_ogr_mvt_mbtiles_test_ogrsf():
     ret = gdaltest.runexternal(test_cli_utilities.get_test_ogrsf_path() +
                                ' -ro data/mvt/point_polygon.mbtiles polygon2')
 
-    if ret.find('INFO') == -1 or ret.find('ERROR') != -1:
-        print(ret)
-        return 'fail'
+    assert ret.find('INFO') != -1 and ret.find('ERROR') == -1
 
     return 'success'
 
@@ -615,8 +575,7 @@ def test_ogr_mvt_mbtiles_open_vector_in_raster_mode():
         return 'skip'
 
     ds = gdal.OpenEx('data/mvt/datatypes.mbtiles', gdal.OF_RASTER)
-    if ds is not None:
-        return 'fail'
+    assert ds is None
 
     return 'success'
 
@@ -648,8 +607,7 @@ def test_ogr_mvt_polygon_larger_than_header():
                      open_options=['CLIP=NO'])
     lyr = ds.GetLayer(0)
     f = lyr.GetNextFeature()
-    if f is None:
-        return 'fail'
+    assert f is not None
 
     return 'success'
 
@@ -658,47 +616,40 @@ def test_ogr_mvt_polygon_larger_than_header():
 
 def test_ogr_mvt_errors():
 
-    if ogr.Open('MVT:/i_do_not/exist') is not None:
-        return 'fail'
+    assert ogr.Open('MVT:/i_do_not/exist') is None
 
     # Cannot detect Z in directory name
-    if ogr.Open('MVT:data') is not None:
-        return 'fail'
+    assert ogr.Open('MVT:data') is None
 
     # Invalid Z
     gdal.Mkdir('/vsimem/33', 0)
 
-    if ogr.Open('MVT:/vsimem/33') is not None:
-        return 'fail'
+    assert ogr.Open('MVT:/vsimem/33') is None
 
     gdal.Rmdir('/vsimem/33')
 
     # Inexisting metadata
     with gdaltest.error_handler():
-        if gdal.OpenEx('data/mvt/linestring/0/0/0.pbf',
-                       open_options=['METADATA_FILE=/i_do_not/exist']) is None:
-            return 'fail'
+        assert (gdal.OpenEx('data/mvt/linestring/0/0/0.pbf',
+                       open_options=['METADATA_FILE=/i_do_not/exist']) is not None)
 
     # Invalid metadata
     with gdaltest.error_handler():
-        if gdal.OpenEx('data/mvt/linestring/0/0/0.pbf',
-                       open_options=['METADATA_FILE=ogr_mvt.py']) is None:
-            return 'fail'
+        assert (gdal.OpenEx('data/mvt/linestring/0/0/0.pbf',
+                       open_options=['METADATA_FILE=ogr_mvt.py']) is not None)
 
     # Invalid metadata
     gdal.FileFromMemBuffer('/vsimem/my.json', '{}')
     with gdaltest.error_handler():
-        if gdal.OpenEx('data/mvt/linestring/0/0/0.pbf',
-                       open_options=['METADATA_FILE=/vsimem/my.json']) is None:
-            return 'fail'
+        assert (gdal.OpenEx('data/mvt/linestring/0/0/0.pbf',
+                       open_options=['METADATA_FILE=/vsimem/my.json']) is not None)
     gdal.Unlink('/vsimem/my.json')
 
     # Invalid metadata
     gdal.FileFromMemBuffer('/vsimem/my.json', '{ "json": "x y" }')
     with gdaltest.error_handler():
-        if gdal.OpenEx('data/mvt/linestring/0/0/0.pbf',
-                       open_options=['METADATA_FILE=/vsimem/my.json']) is None:
-            return 'fail'
+        assert (gdal.OpenEx('data/mvt/linestring/0/0/0.pbf',
+                       open_options=['METADATA_FILE=/vsimem/my.json']) is not None)
     gdal.Unlink('/vsimem/my.json')
 
     # Too big file
@@ -711,8 +662,7 @@ def test_ogr_mvt_errors():
     gdal.VSIFCloseL(f)
     ds = ogr.Open(tmpfilename)
     gdal.Unlink(tmpfilename)
-    if ds is not None:
-        return 'fail'
+    assert ds is None
 
     return 'success'
 
@@ -752,8 +702,7 @@ def test_ogr_mvt_http():
         ds = ogr.Open('MVT:http://127.0.0.1:%d/linestring/0' % gdaltest.webserver_port)
         lyr = ds.GetLayer(0)
         f = lyr.GetNextFeature()
-        if f is None:
-            return 'fail'
+        assert f is not None
 
     # No metadata file nor tile
     handler = webserver.SequentialHandler()
@@ -763,8 +712,7 @@ def test_ogr_mvt_http():
     with webserver.install_http_handler(handler):
         with gdaltest.error_handler():
             ds = ogr.Open('MVT:http://127.0.0.1:%d/linestring/0' % gdaltest.webserver_port)
-        if ds is not None:
-            return 'fail'
+        assert ds is None
 
     # No metadata file, but tiles
     handler = webserver.SequentialHandler()
@@ -778,8 +726,7 @@ def test_ogr_mvt_http():
         ds = ogr.Open('MVT:http://127.0.0.1:%d/linestring/0' % gdaltest.webserver_port)
         lyr = ds.GetLayer(0)
         f = lyr.GetNextFeature()
-        if f is None:
-            return 'fail'
+        assert f is not None
 
     # metadata.json file, but no tiles
     handler = webserver.SequentialHandler()
@@ -791,8 +738,7 @@ def test_ogr_mvt_http():
         ds = ogr.Open('MVT:http://127.0.0.1:%d/linestring/0' % gdaltest.webserver_port)
         lyr = ds.GetLayer(0)
         f = lyr.GetNextFeature()
-        if f is not None:
-            return 'fail'
+        assert f is None
 
     # No metadata.json file, but a linestring.json and no tiles
     handler = webserver.SequentialHandler()
@@ -805,8 +751,7 @@ def test_ogr_mvt_http():
         ds = ogr.Open('MVT:http://127.0.0.1:%d/linestring/0' % gdaltest.webserver_port)
         lyr = ds.GetLayer(0)
         f = lyr.GetNextFeature()
-        if f is not None:
-            return 'fail'
+        assert f is None
 
     # Open pbf file
     handler = webserver.SequentialHandler()
@@ -816,8 +761,7 @@ def test_ogr_mvt_http():
         ds = ogr.Open('MVT:http://127.0.0.1:%d/linestring/0/0/0.pbf' % gdaltest.webserver_port)
         lyr = ds.GetLayer(0)
         f = lyr.GetNextFeature()
-        if f is None:
-            return 'fail'
+        assert f is not None
 
     return 'success'
 
@@ -856,20 +800,17 @@ def test_ogr_mvt_write_one_layer():
     # Test empty layer: OK
     with gdaltest.error_handler():
         out_ds = gdal.VectorTranslate('/vsimem/outmvt', src_ds, format='MVT')
-    if out_ds is None:
-        return 'fail'
+    assert out_ds is not None
 
     # Cannot create directory
     with gdaltest.error_handler():
         out_ds = gdal.VectorTranslate('/i_dont/exist/outmvt', src_ds, format='MVT')
-    if out_ds is not None:
-        return 'fail'
+    assert out_ds is None
 
     # Directory already exists
     with gdaltest.error_handler():
         out_ds = gdal.VectorTranslate('/vsimem/outmvt', src_ds, format='MVT')
-    if out_ds is not None:
-        return 'fail'
+    assert out_ds is None
 
     gdal.RmdirRecursive('/vsimem/outmvt')
 
@@ -929,13 +870,11 @@ def test_ogr_mvt_write_one_layer():
     with gdaltest.error_handler():
         out_ds = gdal.VectorTranslate('/vsimem/outmvt', src_ds,
                                       options='-f MVT -preserve_fid')
-    if out_ds is None:
-        return 'fail'
+    assert out_ds is not None
     out_ds = None
 
     out_ds = ogr.Open('/vsimem/outmvt/0')
-    if out_ds is None:
-        return 'fail'
+    assert out_ds is not None
     out_lyr = out_ds.GetLayerByName('mylayer')
     out_f = out_lyr.GetNextFeature()
     if out_f['mvt_id'] != 123 or \
@@ -1004,16 +943,12 @@ def test_ogr_mvt_write_one_layer():
         return 'fail'
 
     out_ds = ogr.Open('/vsimem/outmvt/5')
-    if out_ds is None:
-        return 'fail'
+    assert out_ds is not None
     out_lyr = out_ds.GetLayerByName('mylayer')
-    if out_lyr.GetFeatureCount() != 9:
-        print(out_lyr.GetFeatureCount())
-        return 'fail'
+    assert out_lyr.GetFeatureCount() == 9
 
     f = gdal.VSIFOpenL('/vsimem/outmvt/metadata.json', 'rb')
-    if f is None:
-        return 'fail'
+    assert f is not None
     data = gdal.VSIFReadL(1, 100000, f).decode('ASCII')
     gdal.VSIFCloseL(f)
     data_json = json.loads(data)
@@ -1029,9 +964,7 @@ def test_ogr_mvt_write_one_layer():
         "format": "pbf",
     }
     for k in expected_json:
-        if k not in data_json or data_json[k] != expected_json[k]:
-            print(data)
-            return 'fail'
+        assert k in data_json and data_json[k] == expected_json[k], data
     json_json = json.loads(data_json['json'])
     expected_json_json = {
         "vector_layers": [
@@ -1132,9 +1065,7 @@ def test_ogr_mvt_write_one_layer():
         }
     }
 
-    if json_json != expected_json_json:
-        print(data_json['json'])
-        return 'fail'
+    assert json_json == expected_json_json, data_json['json']
 
     gdal.RmdirRecursive('/vsimem/outmvt')
 
@@ -1161,13 +1092,11 @@ def test_ogr_mvt_write_conf():
                         'maxzoom': 2}}
     out_ds = gdal.VectorTranslate('/vsimem/outmvt', src_ds,
                                   format='MVT', datasetCreationOptions=["CONF=%s" % json.dumps(conf)])
-    if out_ds is None:
-        return 'fail'
+    assert out_ds is not None
     out_ds = None
 
     out_ds = ogr.Open('/vsimem/outmvt/1')
-    if out_ds is None:
-        return 'fail'
+    assert out_ds is not None
     out_lyr = out_ds.GetLayerByName('TheLayer')
     out_f = out_lyr.GetNextFeature()
     if ogrtest.check_feature_geometry(out_f, 'MULTIPOINT (498980.920645632 997961.84129126)') != 0:
@@ -1175,8 +1104,7 @@ def test_ogr_mvt_write_conf():
         return 'fail'
 
     f = gdal.VSIFOpenL('/vsimem/outmvt/metadata.json', 'rb')
-    if f is None:
-        return 'fail'
+    assert f is not None
     data = gdal.VSIFReadL(1, 100000, f).decode('ASCII')
     gdal.VSIFCloseL(f)
     data_json = json.loads(data)
@@ -1207,9 +1135,7 @@ def test_ogr_mvt_write_conf():
         }
     }
 
-    if json_json != expected_json_json:
-        print(data_json['json'])
-        return 'fail'
+    assert json_json == expected_json_json, data_json['json']
 
     gdal.RmdirRecursive('/vsimem/outmvt')
 
@@ -1231,13 +1157,11 @@ def test_ogr_mvt_write_mbtiles():
     lyr.CreateFeature(f)
 
     out_ds = gdal.VectorTranslate('/vsimem/out.mbtiles', src_ds)
-    if out_ds is None:
-        return 'fail'
+    assert out_ds is not None
     out_ds = None
 
     out_ds = ogr.Open('/vsimem/out.mbtiles')
-    if out_ds is None:
-        return 'fail'
+    assert out_ds is not None
     out_lyr = out_ds.GetLayerByName('mylayer')
     out_f = out_lyr.GetNextFeature()
     if ogrtest.check_feature_geometry(out_f, 'MULTIPOINT ((499898.164985053 1000102.07808325))') != 0:
@@ -1274,13 +1198,11 @@ def test_ogr_mvt_write_limitations_max_size():
     with gdaltest.config_option('GDAL_NUM_THREADS', '1'):
         out_ds = gdal.VectorTranslate('/vsimem/out.mbtiles', src_ds,
                                       datasetCreationOptions=['MAX_SIZE=100', 'SIMPLIFICATION=1'])
-    if out_ds is None:
-        return 'fail'
+    assert out_ds is not None
     out_ds = None
 
     out_ds = ogr.Open('/vsimem/out.mbtiles')
-    if out_ds is None:
-        return 'fail'
+    assert out_ds is not None
     out_lyr = out_ds.GetLayerByName('mylayer')
     out_f = out_lyr.GetNextFeature()
     if ogrtest.check_feature_geometry(out_f, 'MULTILINESTRING ((498980.920645631 1007745.78091176,508764.860266133 1007745.78091176))') != 0:
@@ -1322,13 +1244,11 @@ def test_ogr_mvt_write_polygon_repaired():
     lyr.CreateFeature(f)
 
     out_ds = gdal.VectorTranslate('/vsimem/out.mbtiles', src_ds, datasetCreationOptions=['MAXZOOM=0'])
-    if out_ds is None:
-        return 'fail'
+    assert out_ds is not None
     out_ds = None
 
     out_ds = ogr.Open('/vsimem/out.mbtiles')
-    if out_ds is None:
-        return 'fail'
+    assert out_ds is not None
     out_lyr = out_ds.GetLayerByName('mylayer')
     out_f = out_lyr.GetNextFeature()
     if ogrtest.check_feature_geometry(out_f, 'MULTIPOLYGON (((0 0,0.0 498980.920645632,498980.920645632 498980.920645632,498980.920645632 0.0,0 0)))') != 0:
@@ -1366,13 +1286,11 @@ def test_ogr_mvt_write_conflicting_innner_ring():
     lyr.CreateFeature(f)
 
     out_ds = gdal.VectorTranslate('/vsimem/out.mbtiles', src_ds)
-    if out_ds is None:
-        return 'fail'
+    assert out_ds is not None
     out_ds = None
 
     out_ds = ogr.Open('/vsimem/out.mbtiles')
-    if out_ds is None:
-        return 'fail'
+    assert out_ds is not None
     out_lyr = out_ds.GetLayerByName('mylayer')
     out_f = out_lyr.GetNextFeature()
     if ogrtest.check_feature_geometry(out_f, 'MULTIPOLYGON (((-499898.164985052 1000102.07808325,-509987.852718695 1000102.07808325,-509987.852718695 1009886.01770375,-499898.164985052 1000102.07808325),(-502038.401777037 1001019.32242267,-509070.608379273 1008357.27713804,-509070.608379273 1001019.32242267,-502038.401777037 1001019.32242267)))') != 0:
@@ -1403,13 +1321,11 @@ def test_ogr_mvt_write_limitations_max_size_polygon():
 
     out_ds = gdal.VectorTranslate('/vsimem/out.mbtiles', src_ds,
                                   datasetCreationOptions=['MAX_SIZE=100'])
-    if out_ds is None:
-        return 'fail'
+    assert out_ds is not None
     out_ds = None
 
     out_ds = ogr.Open('/vsimem/out.mbtiles')
-    if out_ds is None:
-        return 'fail'
+    assert out_ds is not None
     out_lyr = out_ds.GetLayerByName('mylayer')
     out_f = out_lyr.GetNextFeature()
     if ogrtest.check_feature_geometry(out_f, 'MULTIPOLYGON (((498980.920645631 1007745.78091176,508764.860266133 1017529.72053227,508764.860266133 1007745.78091176,498980.920645631 1007745.78091176)))') != 0:
@@ -1442,13 +1358,11 @@ def test_ogr_mvt_write_limitations_max_features():
 
     out_ds = gdal.VectorTranslate('/vsimem/out.mbtiles', src_ds, format='MVT',
                                   datasetCreationOptions=['MAX_FEATURES=1'])
-    if out_ds is None:
-        return 'fail'
+    assert out_ds is not None
     out_ds = None
 
     out_ds = ogr.Open('/vsimem/out.mbtiles')
-    if out_ds is None:
-        return 'fail'
+    assert out_ds is not None
     out_lyr = out_ds.GetLayerByName('mylayer')
     out_f = out_lyr.GetNextFeature()
     if ogrtest.check_feature_geometry(out_f, 'POLYGON ((499898.164985053 1000102.07808325,509987.852718696 1100081.71108026,509987.852718696 1000102.07808325,499898.164985053 1000102.07808325))') != 0:
@@ -1483,16 +1397,13 @@ def test_ogr_mvt_write_custom_tiling_scheme():
 
     out_ds = gdal.VectorTranslate('/vsimem/out', src_ds, format='MVT',
                                   datasetCreationOptions=['TILING_SCHEME=EPSG:3067,-548576,8388608,2097152'])
-    if out_ds is None:
-        return 'fail'
+    assert out_ds is not None
     out_ds = None
 
     out_ds = ogr.Open('/vsimem/out/1')
-    if out_ds is None:
-        return 'fail'
+    assert out_ds is not None
     out_lyr = out_ds.GetLayerByName('mylayer')
-    if out_lyr.GetSpatialRef().ExportToWkt().find('3067') < 0:
-        return 'fail'
+    assert out_lyr.GetSpatialRef().ExportToWkt().find('3067') >= 0
     out_f = out_lyr.GetNextFeature()
     if ogrtest.check_feature_geometry(out_f, 'MULTILINESTRING ((-40160 7944704,21024 8044800))') != 0:
         out_f.DumpReadable()
@@ -1515,31 +1426,27 @@ def test_ogr_mvt_write_errors():
     gdal.RmdirRecursive('/vsimem/foo')
     with gdaltest.error_handler():
         ds = gdal.GetDriverByName('MVT').Create('/vsimem/foo', 1, 1)
-    if ds is not None:
-        return 'fail'
+    assert ds is None
 
     # should have mbtiles extension
     gdal.RmdirRecursive('/vsimem/foo.bar')
     with gdaltest.error_handler():
         ds = ogr.GetDriverByName('MVT').CreateDataSource('/vsimem/foo.bar',
                                                          options=['FORMAT=MBTILES'])
-    if ds is not None:
-        return 'fail'
+    assert ds is None
 
     # Cannot create temporary database
     gdal.RmdirRecursive('/vsimem/foo')
     with gdaltest.error_handler():
         ds = ogr.GetDriverByName('MVT').CreateDataSource('/vsimem/foo',
                                                          options=['TEMPORARY_DB=/i/do_not/exist.db'])
-    if ds is not None:
-        return 'fail'
+    assert ds is None
 
     # cannot create mbtiles file
     with gdaltest.error_handler():
         ds = ogr.GetDriverByName('MVT').CreateDataSource('/i/do_not/exist.mbtiles',
                                                          options=['TEMPORARY_DB=/vsimem/temp.db'])
-    if ds is not None:
-        return 'fail'
+    assert ds is None
     gdal.Unlink('/vsimem/temp.db')
 
     # invalid MINZOOM
@@ -1547,42 +1454,36 @@ def test_ogr_mvt_write_errors():
     with gdaltest.error_handler():
         ds = ogr.GetDriverByName('MVT').CreateDataSource('/vsimem/foo',
                                                          options=['MINZOOM=-1'])
-    if ds is not None:
-        return 'fail'
+    assert ds is None
     with gdaltest.error_handler():
         ds = ogr.GetDriverByName('MVT').CreateDataSource('/vsimem/foo',
                                                          options=['MINZOOM=30'])
-    if ds is not None:
-        return 'fail'
+    assert ds is None
 
     # invalid MAXZOOM
     gdal.RmdirRecursive('/vsimem/foo')
     with gdaltest.error_handler():
         ds = ogr.GetDriverByName('MVT').CreateDataSource('/vsimem/foo',
                                                          options=['MAXZOOM=-1'])
-    if ds is not None:
-        return 'fail'
+    assert ds is None
     with gdaltest.error_handler():
         ds = ogr.GetDriverByName('MVT').CreateDataSource('/vsimem/foo',
                                                          options=['MAXZOOM=30'])
-    if ds is not None:
-        return 'fail'
+    assert ds is None
 
     # invalid MINZOOM vs MAXZOOM
     gdal.RmdirRecursive('/vsimem/foo')
     with gdaltest.error_handler():
         ds = ogr.GetDriverByName('MVT').CreateDataSource('/vsimem/foo',
                                                          options=['MINZOOM=1', 'MAXZOOM=0'])
-    if ds is not None:
-        return 'fail'
+    assert ds is None
 
     # invalid MINZOOM for layer
     gdal.RmdirRecursive('/vsimem/foo')
     ds = ogr.GetDriverByName('MVT').CreateDataSource('/vsimem/foo')
     with gdaltest.error_handler():
         lyr = ds.CreateLayer('foo', options=['MINZOOM=-1'])
-    if lyr is not None:
-        return 'fail'
+    assert lyr is None
 
     # invalid CONF
     gdal.RmdirRecursive('/vsimem/foo')
@@ -1591,23 +1492,20 @@ def test_ogr_mvt_write_errors():
         ds = ogr.GetDriverByName('MVT').CreateDataSource('/vsimem/foo',
                                                          options=['CONF=/vsimem/invalid.json'])
     gdal.Unlink('/vsimem/invalid.json')
-    if ds is not None:
-        return 'fail'
+    assert ds is None
 
     # TILING_SCHEME not allowed with MBTILES
     with gdaltest.error_handler():
         ds = ogr.GetDriverByName('MVT').CreateDataSource('/vsimem/foo.mbtiles',
                                                          options=['TILING_SCHEME=EPSG:4326,-180,180,360'])
-    if ds is not None:
-        return 'fail'
+    assert ds is None
 
     # Invalid TILING_SCHEME
     gdal.RmdirRecursive('/vsimem/foo')
     with gdaltest.error_handler():
         ds = ogr.GetDriverByName('MVT').CreateDataSource('/vsimem/foo',
                                                          options=['TILING_SCHEME=EPSG:4326'])
-    if ds is not None:
-        return 'fail'
+    assert ds is None
 
     # Test failure in creating tile
     gdal.RmdirRecursive('tmp/tmpmvt')
@@ -1619,8 +1517,7 @@ def test_ogr_mvt_write_errors():
     lyr.CreateFeature(f)
     with gdaltest.error_handler():
         ds = None
-    if gdal.GetLastErrorMsg() == '':
-        return 'fail'
+    assert gdal.GetLastErrorMsg() != ''
     gdal.RmdirRecursive('tmp/tmpmvt')
 
     # Test failure in writing in temp db (multi-threaded)
@@ -1637,8 +1534,7 @@ def test_ogr_mvt_write_errors():
     with gdaltest.error_handler():
         lyr.CreateFeature(f)
         ds = None
-    if gdal.GetLastErrorMsg() == '':
-        return 'fail'
+    assert gdal.GetLastErrorMsg() != ''
     gdal.RmdirRecursive('tmp/tmpmvt')
 
     # Test failure in writing in temp db (single-threaded)
@@ -1656,8 +1552,7 @@ def test_ogr_mvt_write_errors():
     with gdaltest.error_handler():
         lyr.CreateFeature(f)
         ds = None
-    if gdal.GetLastErrorMsg() == '':
-        return 'fail'
+    assert gdal.GetLastErrorMsg() != ''
     gdal.RmdirRecursive('tmp/tmpmvt')
 
     # Test reprojection failure
@@ -1693,8 +1588,7 @@ def test_ogr_mvt_write_reuse_temp_db():
     with gdaltest.config_option('OGR_MVT_REMOVE_TEMP_FILE', 'NO'):
         gdal.VectorTranslate('/vsimem/out', src_ds, format='MVT')
 
-    if gdal.VSIStatL('/vsimem/out.temp.db') is None:
-        return 'fail'
+    assert gdal.VSIStatL('/vsimem/out.temp.db') is not None
 
     gdal.RmdirRecursive('/vsimem/out')
 
@@ -1702,12 +1596,10 @@ def test_ogr_mvt_write_reuse_temp_db():
         gdal.VectorTranslate('/vsimem/out', src_ds, format='MVT')
 
     out_ds = ogr.Open('/vsimem/out/5')
-    if out_ds is None:
-        return 'fail'
+    assert out_ds is not None
     out_lyr = out_ds.GetLayerByName('mylayer')
     out_f = out_lyr.GetNextFeature()
-    if out_f is None:
-        return 'fail'
+    assert out_f is not None
     out_ds = None
 
     gdal.RmdirRecursive('/vsimem/out')
diff --git a/autotest/ogr/ogr_mysql.py b/autotest/ogr/ogr_mysql.py
index 4fa643e462ca..9a9088cae82e 100755
--- a/autotest/ogr/ogr_mysql.py
+++ b/autotest/ogr/ogr_mysql.py
@@ -35,6 +35,7 @@
 from osgeo import ogr
 from osgeo import gdal
 from osgeo import osr
+import pytest
 
 # E. Rouault : this is almost a copy & paste from ogr_pg.py
 
@@ -124,13 +125,11 @@ def test_ogr_mysql_2():
 
     dst_feat.Destroy()
 
-    if gdaltest.mysql_lyr.GetFeatureCount() != shp_lyr.GetFeatureCount():
-        gdaltest.post_reason('not matching feature count')
-        return 'fail'
+    assert gdaltest.mysql_lyr.GetFeatureCount() == shp_lyr.GetFeatureCount(), \
+        'not matching feature count'
 
-    if not gdaltest.mysql_lyr.GetSpatialRef().IsSame(shp_lyr.GetSpatialRef()):
-        gdaltest.post_reason('not matching spatial ref')
-        return 'fail'
+    assert gdaltest.mysql_lyr.GetSpatialRef().IsSame(shp_lyr.GetSpatialRef()), \
+        'not matching spatial ref'
 
     return 'success'
 
@@ -142,12 +141,9 @@ def test_ogr_mysql_3():
     if gdaltest.mysql_ds is None:
         return 'skip'
 
-    if gdaltest.mysql_lyr.GetGeometryColumn() != 'SHAPE':
-        return 'fail'
+    assert gdaltest.mysql_lyr.GetGeometryColumn() == 'SHAPE'
 
-    if gdaltest.mysql_lyr.GetFeatureCount() != 10:
-        gdaltest.post_reason('GetFeatureCount() returned %d instead of 10' % gdaltest.mysql_lyr.GetFeatureCount())
-        return 'fail'
+    assert gdaltest.mysql_lyr.GetFeatureCount() == 10
 
     expect = [168, 169, 166, 158, 165]
 
@@ -155,9 +151,7 @@ def test_ogr_mysql_3():
     tr = ogrtest.check_features_against_list(gdaltest.mysql_lyr,
                                              'eas_id', expect)
 
-    if gdaltest.mysql_lyr.GetFeatureCount() != 5:
-        gdaltest.post_reason('GetFeatureCount() returned %d instead of 5' % gdaltest.mysql_lyr.GetFeatureCount())
-        return 'fail'
+    assert gdaltest.mysql_lyr.GetFeatureCount() == 5
 
     gdaltest.mysql_lyr.SetAttributeFilter(None)
 
@@ -165,16 +159,13 @@ def test_ogr_mysql_3():
         orig_feat = gdaltest.poly_feat[i]
         read_feat = gdaltest.mysql_lyr.GetNextFeature()
 
-        if ogrtest.check_feature_geometry(read_feat, orig_feat.GetGeometryRef(),
-                                          max_error=0.001) != 0:
-            return 'fail'
+        assert (ogrtest.check_feature_geometry(read_feat, orig_feat.GetGeometryRef(),
+                                          max_error=0.001) == 0)
 
         for fld in range(3):
-            if orig_feat.GetField(fld) != read_feat.GetField(fld):
-                gdaltest.post_reason('Attribute %d does not match' % fld)
-                return 'fail'
-        if read_feat.GetField('INT64') != 1234567890123:
-            return 'fail'
+            assert orig_feat.GetField(fld) == read_feat.GetField(fld), \
+                ('Attribute %d does not match' % fld)
+        assert read_feat.GetField('INT64') == 1234567890123
 
         read_feat.Destroy()
         orig_feat.Destroy()
@@ -240,8 +231,7 @@ def test_ogr_mysql_4():
             print('(before):', geom.ExportToWkt())
             geom.CloseRings()
             print('(after) :', geom.ExportToWkt())
-            if ogrtest.check_feature_geometry(feat_read, geom) != 0:
-                return 'fail'
+            assert ogrtest.check_feature_geometry(feat_read, geom) == 0
 
         feat_read.Destroy()
 
@@ -261,9 +251,7 @@ def test_ogr_mysql_5():
 
     sql_lyr = gdaltest.mysql_ds.ExecuteSQL('select distinct eas_id from tpoly order by eas_id desc')
 
-    if sql_lyr.GetFeatureCount() != 11:
-        gdaltest.post_reason('GetFeatureCount() returned %d instead of 11' % sql_lyr.GetFeatureCount())
-        return 'fail'
+    assert sql_lyr.GetFeatureCount() == 11
 
     tr = ogrtest.check_features_against_list(sql_lyr, 'eas_id', expect)
 
@@ -296,13 +284,9 @@ def test_ogr_mysql_6():
     sql_lyr.SetSpatialFilter(geom)
     geom.Destroy()
 
-    if sql_lyr.GetFeatureCount() != 0:
-        gdaltest.post_reason('GetFeatureCount() returned %d instead of 0' % sql_lyr.GetFeatureCount())
-        return 'fail'
+    assert sql_lyr.GetFeatureCount() == 0
 
-    if sql_lyr.GetNextFeature() is not None:
-        gdaltest.post_reason('GetNextFeature() did not return None')
-        return 'fail'
+    assert sql_lyr.GetNextFeature() is None, 'GetNextFeature() did not return None'
 
     gdaltest.mysql_ds.ReleaseResultSet(sql_lyr)
 
@@ -324,18 +308,14 @@ def test_ogr_mysql_7():
     gdaltest.mysql_lyr.SetSpatialFilter(geom)
     geom.Destroy()
 
-    if gdaltest.mysql_lyr.GetFeatureCount() != 1:
-        gdaltest.post_reason('GetFeatureCount() returned %d instead of 1' % gdaltest.mysql_lyr.GetFeatureCount())
-        return 'fail'
+    assert gdaltest.mysql_lyr.GetFeatureCount() == 1
 
     tr = ogrtest.check_features_against_list(gdaltest.mysql_lyr, 'eas_id',
                                              [158])
 
     gdaltest.mysql_lyr.SetAttributeFilter('eas_id = 158')
 
-    if gdaltest.mysql_lyr.GetFeatureCount() != 1:
-        gdaltest.post_reason('GetFeatureCount() returned %d instead of 1' % gdaltest.mysql_lyr.GetFeatureCount())
-        return 'fail'
+    assert gdaltest.mysql_lyr.GetFeatureCount() == 1
 
     gdaltest.mysql_lyr.SetAttributeFilter(None)
 
@@ -369,14 +349,11 @@ def test_ogr_mysql_8():
     gdaltest.mysql_lyr.SetAttributeFilter("PRFEDEA = 'CrazyKey'")
     feat_read = gdaltest.mysql_lyr.GetNextFeature()
 
-    if feat_read is None:
-        gdaltest.post_reason('creating crazy feature failed!')
-        return 'fail'
+    assert feat_read is not None, 'creating crazy feature failed!'
 
-    if feat_read.GetField('shortname') != 'Crazy"\'L':
-        gdaltest.post_reason('Vvalue not properly escaped or truncated:' +
+    assert feat_read.GetField('shortname') == 'Crazy"\'L', \
+        ('Vvalue not properly escaped or truncated:' +
                              feat_read.GetField('shortname'))
-        return 'fail'
 
     feat_read.Destroy()
 
@@ -410,20 +387,15 @@ def test_ogr_mysql_9():
     feat.Destroy()
 
     feat = gdaltest.mysql_lyr.GetFeature(fid)
-    if feat is None:
-        gdaltest.post_reason('GetFeature(%d) failed.' % fid)
-        return 'fail'
+    assert feat is not None, ('GetFeature(%d) failed.' % fid)
 
     shortname = feat.GetField('SHORTNAME')
-    if shortname[:5] != 'Reset':
-        gdaltest.post_reason('SetFeature() did not update SHORTNAME, got %s.'
+    assert shortname[:5] == 'Reset', ('SetFeature() did not update SHORTNAME, got %s.'
                              % shortname)
-        return 'fail'
 
     if ogrtest.check_feature_geometry(feat, 'POINT(5 6)') != 0:
         print(feat.GetGeometryRef())
-        gdaltest.post_reason('Geometry update failed')
-        return 'fail'
+        pytest.fail('Geometry update failed')
 
     # Test updating non-existing feature
     feat.SetFID(-10)
@@ -458,9 +430,7 @@ def test_ogr_mysql_10():
     fid = feat.GetFID()
     feat.Destroy()
 
-    if gdaltest.mysql_lyr.DeleteFeature(fid) != 0:
-        gdaltest.post_reason('DeleteFeature() method failed.')
-        return 'fail'
+    assert gdaltest.mysql_lyr.DeleteFeature(fid) == 0, 'DeleteFeature() method failed.'
 
     gdaltest.mysql_lyr.SetAttributeFilter("PRFEDEA = 'CrazyKey'")
     feat = gdaltest.mysql_lyr.GetNextFeature()
@@ -533,13 +503,10 @@ def test_ogr_mysql_17():
 
     count = gdaltest.mysql_ds.GetLayerCount()
     layer = gdaltest.mysql_ds.GetLayerByName('JunkTableName')
-    if layer is not None:
-        gdaltest.post_reason('got layer for non-existent table!')
-        return 'fail'
+    assert layer is None, 'got layer for non-existent table!'
 
-    if count != gdaltest.mysql_ds.GetLayerCount():
-        gdaltest.post_reason('layer count changed unexpectedly.')
-        return 'fail'
+    assert count == gdaltest.mysql_ds.GetLayerCount(), \
+        'layer count changed unexpectedly.'
 
     return 'success'
 
@@ -554,13 +521,10 @@ def ogr_mysql_18():
 
     count = gdaltest.mysql_ds.GetLayerCount()
     layer = gdaltest.mysql_ds.GetLayerByName('geometry_columns')
-    if layer is None:
-        gdaltest.post_reason('did not get geometry_columns layer')
-        return 'fail'
+    assert layer is not None, 'did not get geometry_columns layer'
 
-    if count + 1 != gdaltest.mysql_ds.GetLayerCount():
-        gdaltest.post_reason('layer count unexpectedly unchanged.')
-        return 'fail'
+    assert count + 1 == gdaltest.mysql_ds.GetLayerCount(), \
+        'layer count unexpectedly unchanged.'
 
     return 'success'
 
@@ -574,9 +538,7 @@ def test_ogr_mysql_19():
         return 'skip'
 
     layer = gdaltest.mysql_ds.GetLayerByName('tpoly')
-    if layer is None:
-        gdaltest.post_reason('did not get tpoly layer')
-        return 'fail'
+    assert layer is not None, 'did not get tpoly layer'
 
     extent = layer.GetExtent()
     expect = (478315.53125, 481645.3125, 4762880.5, 4765610.5)
@@ -587,9 +549,8 @@ def test_ogr_mysql_19():
     maxy = abs(extent[3] - expect[3])
 
     if max(minx, maxx, miny, maxy) > 0.0001:
-        gdaltest.post_reason('Extents do not match')
         print(extent)
-        return 'fail'
+        pytest.fail('Extents do not match')
 
     return 'success'
 
@@ -645,8 +606,7 @@ def test_ogr_mysql_21():
 
     layer.ResetReading()
     feat = layer.GetNextFeature()
-    if feat is not None:
-        return 'fail'
+    assert feat is None
 
     return 'success'
 
@@ -671,8 +631,7 @@ def test_ogr_mysql_22():
 
     layer.ResetReading()
     feat = layer.GetNextFeature()
-    if feat is None:
-        return 'fail'
+    assert feat is not None
 
     return 'success'
 
@@ -698,23 +657,16 @@ def test_ogr_mysql_23():
         gdaltest.mysql_lyr = gdaltest.mysql_ds.ExecuteSQL("SELECT ROUND(1.1,0) AS zero, ROUND(2.0, 0) AS widthonly, ROUND(1.1,1) AS onedecimal, ROUND(0.12345678901234567890123456789,29) AS twentynine, GeomFromText(CONVERT('POINT(1.0 2.0)',CHAR)) as the_geom;")
 
     feat = gdaltest.mysql_lyr.GetNextFeature()
-    if feat is None:
-        return 'fail'
+    assert feat is not None
 
     ######################################################
     # Check the values and the precisions
     for i in range(4):
-        if feat.GetFieldIndex(fields[i]) < 0:
-            print('field not found')
-            return 'fail'
-        if feat.GetField(feat.GetFieldIndex(fields[i])) != values[i]:
-            print('value not right')
-#            print feat.GetField( feat.GetFieldIndex(fields[i]) )
-            return 'fail'
-        if feat.GetFieldDefnRef(feat.GetFieldIndex(fields[i])).GetPrecision() != precision[i]:
-            print('precision not right')
-#            print feat.GetFieldDefnRef( feat.GetFieldIndex(fields[i]) ).GetPrecision()
-            return 'fail'
+        assert feat.GetFieldIndex(fields[i]) >= 0, 'field not found'
+        assert feat.GetField(feat.GetFieldIndex(fields[i])) == values[i], \
+            'value not right'
+        assert feat.GetFieldDefnRef(feat.GetFieldIndex(fields[i])).GetPrecision() == precision[i], \
+            'precision not right'
 
     gdaltest.mysql_ds.ReleaseResultSet(gdaltest.mysql_lyr)
     gdaltest.mysql_lyr = None
@@ -736,9 +688,7 @@ def test_ogr_mysql_24():
 
     ret = gdaltest.runexternal(test_cli_utilities.get_test_ogrsf_path() + " '" + gdaltest.mysql_connection_string + "' tpoly")
 
-    if ret.find('INFO') == -1 or ret.find('ERROR') != -1:
-        print(ret)
-        return 'fail'
+    assert ret.find('INFO') != -1 and ret.find('ERROR') == -1
 
     return 'success'
 
@@ -753,36 +703,29 @@ def test_ogr_mysql_72():
 
     # Regular layer with 32 bit IDs
     lyr = gdaltest.mysql_ds.CreateLayer('ogr_mysql_72', geom_type=ogr.wkbNone)
-    if lyr.GetMetadataItem(ogr.OLMD_FID64) is not None:
-        return 'fail'
+    assert lyr.GetMetadataItem(ogr.OLMD_FID64) is None
     lyr.CreateField(ogr.FieldDefn('foo'))
     f = ogr.Feature(lyr.GetLayerDefn())
     f.SetFID(123456789012345)
     f.SetField(0, 'bar')
-    if lyr.CreateFeature(f) != 0:
-        return 'fail'
+    assert lyr.CreateFeature(f) == 0
     f = lyr.GetFeature(123456789012345)
-    if f is None:
-        return 'fail'
+    assert f is not None
 
     lyr = gdaltest.mysql_ds.CreateLayer('ogr_mysql_72', geom_type=ogr.wkbNone, options=['FID64=YES', 'OVERWRITE=YES'])
-    if lyr.GetMetadataItem(ogr.OLMD_FID64) is None:
-        return 'fail'
+    assert lyr.GetMetadataItem(ogr.OLMD_FID64) is not None
     lyr.CreateField(ogr.FieldDefn('foo'))
     f = ogr.Feature(lyr.GetLayerDefn())
     f.SetFID(123456789012345)
     f.SetField(0, 'bar')
-    if lyr.CreateFeature(f) != 0:
-        return 'fail'
-    if lyr.SetFeature(f) != 0:
-        return 'fail'
+    assert lyr.CreateFeature(f) == 0
+    assert lyr.SetFeature(f) == 0
 
     gdaltest.mysql_ds = None
     # Test with normal protocol
     gdaltest.mysql_ds = ogr.Open(gdaltest.mysql_connection_string, update=1)
     lyr = gdaltest.mysql_ds.GetLayerByName('ogr_mysql_72')
-    if lyr.GetMetadataItem(ogr.OLMD_FID64) is None:
-        return 'fail'
+    assert lyr.GetMetadataItem(ogr.OLMD_FID64) is not None
     f = lyr.GetNextFeature()
     if f.GetFID() != 123456789012345:
         f.DumpReadable()
@@ -818,8 +761,7 @@ def test_ogr_mysql_25():
     gdal.PushErrorHandler()
     ret = lyr.CreateFeature(f)
     gdal.PopErrorHandler()
-    if ret == 0:
-        return 'fail'
+    assert ret != 0
     f = None
 
     # Error case: missing non-nullable field
@@ -830,19 +772,15 @@ def test_ogr_mysql_25():
         gdal.PushErrorHandler()
         ret = lyr.CreateFeature(f)
         gdal.PopErrorHandler()
-        if ret == 0:
-            return 'fail'
+        assert ret != 0
         f = None
 
     gdaltest.mysql_ds = None
     gdaltest.mysql_ds = ogr.Open(gdaltest.mysql_connection_string, update=1)
     lyr = gdaltest.mysql_ds.GetLayerByName('ogr_mysql_25')
-    if lyr.GetLayerDefn().GetFieldDefn(lyr.GetLayerDefn().GetFieldIndex('field_not_nullable')).IsNullable() != 0:
-        return 'fail'
-    if lyr.GetLayerDefn().GetFieldDefn(lyr.GetLayerDefn().GetFieldIndex('field_nullable')).IsNullable() != 1:
-        return 'fail'
-    if lyr.GetLayerDefn().GetGeomFieldDefn(0).IsNullable() != 0:
-        return 'fail'
+    assert lyr.GetLayerDefn().GetFieldDefn(lyr.GetLayerDefn().GetFieldIndex('field_not_nullable')).IsNullable() == 0
+    assert lyr.GetLayerDefn().GetFieldDefn(lyr.GetLayerDefn().GetFieldIndex('field_nullable')).IsNullable() == 1
+    assert lyr.GetLayerDefn().GetGeomFieldDefn(0).IsNullable() == 0
 
     return 'success'
 
@@ -901,20 +839,12 @@ def test_ogr_mysql_26():
     gdaltest.mysql_ds = None
     gdaltest.mysql_ds = ogr.Open(gdaltest.mysql_connection_string, update=1)
     lyr = gdaltest.mysql_ds.GetLayerByName('ogr_mysql_26')
-    if lyr.GetLayerDefn().GetFieldDefn(lyr.GetLayerDefn().GetFieldIndex('field_string')).GetDefault() != "'a''b'":
-        return 'fail'
-    if lyr.GetLayerDefn().GetFieldDefn(lyr.GetLayerDefn().GetFieldIndex('field_int')).GetDefault() != '123':
-        return 'fail'
-    if lyr.GetLayerDefn().GetFieldDefn(lyr.GetLayerDefn().GetFieldIndex('field_real')).GetDefault() != '1.23':
-        return 'fail'
-    if lyr.GetLayerDefn().GetFieldDefn(lyr.GetLayerDefn().GetFieldIndex('field_nodefault')).GetDefault() is not None:
-        return 'fail'
-    if lyr.GetLayerDefn().GetFieldDefn(lyr.GetLayerDefn().GetFieldIndex('field_datetime')).GetDefault() != 'CURRENT_TIMESTAMP':
-        print(lyr.GetLayerDefn().GetFieldDefn(lyr.GetLayerDefn().GetFieldIndex('field_datetime')).GetDefault())
-        return 'fail'
-    if lyr.GetLayerDefn().GetFieldDefn(lyr.GetLayerDefn().GetFieldIndex('field_datetime2')).GetDefault() != "'2015/06/30 12:34:56'":
-        print(lyr.GetLayerDefn().GetFieldDefn(lyr.GetLayerDefn().GetFieldIndex('field_datetime2')).GetDefault())
-        return 'fail'
+    assert lyr.GetLayerDefn().GetFieldDefn(lyr.GetLayerDefn().GetFieldIndex('field_string')).GetDefault() == "'a''b'"
+    assert lyr.GetLayerDefn().GetFieldDefn(lyr.GetLayerDefn().GetFieldIndex('field_int')).GetDefault() == '123'
+    assert lyr.GetLayerDefn().GetFieldDefn(lyr.GetLayerDefn().GetFieldIndex('field_real')).GetDefault() == '1.23'
+    assert lyr.GetLayerDefn().GetFieldDefn(lyr.GetLayerDefn().GetFieldIndex('field_nodefault')).GetDefault() is None
+    assert lyr.GetLayerDefn().GetFieldDefn(lyr.GetLayerDefn().GetFieldIndex('field_datetime')).GetDefault() == 'CURRENT_TIMESTAMP'
+    assert lyr.GetLayerDefn().GetFieldDefn(lyr.GetLayerDefn().GetFieldIndex('field_datetime2')).GetDefault() == "'2015/06/30 12:34:56'"
     # if lyr.GetLayerDefn().GetFieldDefn(lyr.GetLayerDefn().GetFieldIndex('field_date')).GetDefault() != "CURRENT_DATE":
     #    gdaltest.post_reason('fail')
     #    print(lyr.GetLayerDefn().GetFieldDefn(lyr.GetLayerDefn().GetFieldIndex('field_date')).GetDefault())
@@ -957,8 +887,7 @@ def test_ogr_mysql_longlat():
 
     lyr.SetSpatialFilterRect(149.5, 1.5, 150.5, 2.5)
     f = lyr.GetNextFeature()
-    if ogrtest.check_feature_geometry(f, geom) != 0:
-        return 'fail'
+    assert ogrtest.check_feature_geometry(f, geom) == 0
 
     extent = lyr.GetExtent()
     expect = (150.0, 150.0, 2.0, 2.0)
@@ -969,9 +898,8 @@ def test_ogr_mysql_longlat():
     maxy = abs(extent[3] - expect[3])
 
     if max(minx, maxx, miny, maxy) > 0.0001:
-        gdaltest.post_reason('Extents do not match')
         print(extent)
-        return 'fail'
+        pytest.fail('Extents do not match')
 
 
     return 'success'
diff --git a/autotest/ogr/ogr_nas.py b/autotest/ogr/ogr_nas.py
index e0504ee5f5e0..3329ee54e695 100755
--- a/autotest/ogr/ogr_nas.py
+++ b/autotest/ogr/ogr_nas.py
@@ -73,13 +73,9 @@ def test_ogr_nas_1():
         pass
 
     ds = ogr.Open('tmp/cache/BKG_NAS_Peine.xml')
-    if ds is None:
-        gdaltest.post_reason('could not open dataset')
-        return 'fail'
+    assert ds is not None, 'could not open dataset'
 
-    if ds.GetLayerCount() != 41:
-        gdaltest.post_reason('did not get expected layer count')
-        return 'fail'
+    assert ds.GetLayerCount() == 41, 'did not get expected layer count'
 
     lyr = ds.GetLayerByName('AX_Wohnplatz')
     feat = lyr.GetNextFeature()
@@ -133,14 +129,9 @@ def test_ogr_nas_2():
         pass
 
     ds = ogr.Open('tmp/cache/gm2566-testdaten-gid60-2008-11-11.xml')
-    if ds is None:
-        gdaltest.post_reason('could not open dataset')
-        return 'fail'
+    assert ds is not None, 'could not open dataset'
 
-    if ds.GetLayerCount() != 85:
-        gdaltest.post_reason('did not get expected layer count')
-        print(ds.GetLayerCount())
-        return 'fail'
+    assert ds.GetLayerCount() == 85, 'did not get expected layer count'
 
     lyr = ds.GetLayerByName('AX_Flurstueck')
 
@@ -148,8 +139,7 @@ def test_ogr_nas_2():
     feat = lyr.GetNextFeature()
     while feat is not None and feat.GetField('identifier') != 'urn:adv:oid:DERP1234000002Iz':
         feat = lyr.GetNextFeature()
-    if feat is None:
-        return 'fail'
+    assert feat is not None
 
     # expected_geom = 'POLYGON ((350821.045 5532031.37,350924.309 5532029.513,350938.493 5532026.622,350951.435 5532021.471,350978.7 5532007.18,351026.406 5531971.088,351032.251 5531951.162,351080.623 5531942.67,351154.886 5531963.718,351207.689 5532019.797,351211.063 5532044.067,351203.83 5532074.034,351165.959 5532114.315,351152.85 5532135.774,351141.396 5532140.355,351110.659 5532137.542,351080.17 5532132.742,351002.887 5532120.75,350925.682 5532108.264,350848.556 5532095.285,350771.515 5532081.814,350769.548 5532071.196,350812.194 5532034.716,350821.045 5532031.37))'
     expected_geom = 'CURVEPOLYGON (COMPOUNDCURVE ((350821.045 5532031.37,350924.309 5532029.513,350938.493 5532026.622,350951.435 5532021.471,350978.7 5532007.18,351026.406 5531971.088,351032.251 5531951.16199999955),(351032.251 5531951.16199999955,351080.623 5531942.67,351154.886 5531963.718),(351154.886 5531963.718,351207.689 5532019.797),(351207.689 5532019.797,351211.063 5532044.06699999981,351203.83 5532074.034,351165.959 5532114.315,351152.85 5532135.774),(351152.85 5532135.774,351141.396 5532140.355),CIRCULARSTRING (351141.396 5532140.355,351110.659 5532137.542,351080.17 5532132.74199999962),CIRCULARSTRING (351080.17 5532132.74199999962,351002.887 5532120.75,350925.682 5532108.264),CIRCULARSTRING (350925.682 5532108.264,350848.556 5532095.285,350771.515 5532081.814),(350771.515 5532081.814,350769.548 5532071.196,350812.194 5532034.716,350821.045 5532031.37)))'
@@ -174,14 +164,9 @@ def test_ogr_nas_3():
         return 'skip'
 
     ds = ogr.Open('data/empty_nas.xml')
-    if ds is None:
-        gdaltest.post_reason('could not open dataset')
-        return 'fail'
+    assert ds is not None, 'could not open dataset'
 
-    if ds.GetLayerCount() != 1:
-        gdaltest.post_reason('did not get expected layer count')
-        print(ds.GetLayerCount())
-        return 'fail'
+    assert ds.GetLayerCount() == 1, 'did not get expected layer count'
 
     ds = None
 
@@ -204,35 +189,24 @@ def test_ogr_nas_4():
         pass
 
     ds = ogr.Open('data/delete_nas.xml')
-    if ds is None:
-        gdaltest.post_reason('could not open dataset')
-        return 'fail'
+    assert ds is not None, 'could not open dataset'
 
-    if ds.GetLayerCount() != 2:
-        gdaltest.post_reason('did not get expected layer count')
-        print(ds.GetLayerCount())
-        return 'fail'
+    assert ds.GetLayerCount() == 2, 'did not get expected layer count'
 
     del_lyr = ds.GetLayerByName('Delete')
 
-    if del_lyr.GetFeatureCount() != 3:
-        gdaltest.post_reason('did not get expected number of features')
-        return 'fail'
+    assert del_lyr.GetFeatureCount() == 3, 'did not get expected number of features'
 
     del_lyr.ResetReading()
     feat = del_lyr.GetNextFeature()
 
-    if feat.GetField('context') != 'Delete':
-        gdaltest.post_reason('did not get expected context')
-        return 'fail'
+    assert feat.GetField('context') == 'Delete', 'did not get expected context'
 
-    if feat.GetField('typeName') != 'AX_Namensnummer':
-        gdaltest.post_reason('did not get expected typeName')
-        return 'fail'
+    assert feat.GetField('typeName') == 'AX_Namensnummer', \
+        'did not get expected typeName'
 
-    if feat.GetField('FeatureId') != 'DENW44AL00000HJU20100730T092847Z':
-        gdaltest.post_reason('did not get expected FeatureId')
-        return 'fail'
+    assert feat.GetField('FeatureId') == 'DENW44AL00000HJU20100730T092847Z', \
+        'did not get expected FeatureId'
 
     del_lyr = None
     ds = None
@@ -261,45 +235,30 @@ def test_ogr_nas_5():
         pass
 
     ds = ogr.Open('data/replace_nas.xml')
-    if ds is None:
-        gdaltest.post_reason('could not open dataset')
-        return 'fail'
+    assert ds is not None, 'could not open dataset'
 
-    if ds.GetLayerCount() != 3:
-        gdaltest.post_reason('did not get expected layer count')
-        print(ds.GetLayerCount())
-        return 'fail'
+    assert ds.GetLayerCount() == 3, 'did not get expected layer count'
 
     # Check the delete operation created for the replace
 
     del_lyr = ds.GetLayerByName('Delete')
 
-    if del_lyr.GetFeatureCount() != 1:
-        gdaltest.post_reason('did not get expected number of features')
-        return 'fail'
+    assert del_lyr.GetFeatureCount() == 1, 'did not get expected number of features'
 
     del_lyr.ResetReading()
     feat = del_lyr.GetNextFeature()
 
-    if feat.GetField('context') != 'Replace':
-        gdaltest.post_reason('did not get expected context')
-        return 'fail'
+    assert feat.GetField('context') == 'Replace', 'did not get expected context'
 
-    if feat.GetField('replacedBy') != 'DENW44AL00003IkM20110429T070635Z':
-        gdaltest.post_reason('did not get expected replacedBy')
-        return 'fail'
+    assert feat.GetField('replacedBy') == 'DENW44AL00003IkM20110429T070635Z', \
+        'did not get expected replacedBy'
 
-    if feat.GetField('safeToIgnore') != 'false':
-        gdaltest.post_reason('did not get expected safeToIgnore')
-        return 'fail'
+    assert feat.GetField('safeToIgnore') == 'false', 'did not get expected safeToIgnore'
 
-    if feat.GetField('typeName') != 'AX_Flurstueck':
-        gdaltest.post_reason('did not get expected typeName')
-        return 'fail'
+    assert feat.GetField('typeName') == 'AX_Flurstueck', 'did not get expected typeName'
 
-    if feat.GetField('FeatureId') != 'DENW44AL00003IkM20100809T071726Z':
-        gdaltest.post_reason('did not get expected FeatureId')
-        return 'fail'
+    assert feat.GetField('FeatureId') == 'DENW44AL00003IkM20100809T071726Z', \
+        'did not get expected FeatureId'
 
     del_lyr = None
 
@@ -307,20 +266,15 @@ def test_ogr_nas_5():
 
     lyr = ds.GetLayerByName('AX_Flurstueck')
 
-    if lyr.GetFeatureCount() != 1:
-        gdaltest.post_reason('did not get expected number of features')
-        return 'fail'
+    assert lyr.GetFeatureCount() == 1, 'did not get expected number of features'
 
     lyr.ResetReading()
     feat = lyr.GetNextFeature()
 
-    if feat.GetField('gml_id') != 'DENW44AL00003IkM20110429T070635Z':
-        gdaltest.post_reason('did not get expected gml_id')
-        return 'fail'
+    assert feat.GetField('gml_id') == 'DENW44AL00003IkM20110429T070635Z', \
+        'did not get expected gml_id'
 
-    if feat.GetField('stelle') != 5212:
-        gdaltest.post_reason('did not get expected stelle')
-        return 'fail'
+    assert feat.GetField('stelle') == 5212, 'did not get expected stelle'
 
     lyr = None
 
diff --git a/autotest/ogr/ogr_ntf.py b/autotest/ogr/ogr_ntf.py
index d154831c7356..9372cd91d186 100755
--- a/autotest/ogr/ogr_ntf.py
+++ b/autotest/ogr/ogr_ntf.py
@@ -104,8 +104,7 @@ def test_ogr_ntf_1():
             return 'skip'
 
     ds = ogr.Open('tmp/cache/SS.ntf')
-    if ds.GetLayerCount() != 5:
-        return 'fail'
+    assert ds.GetLayerCount() == 5
 
     layers = [('STRATEGI_POINT', ogr.wkbPoint, 9193),
               ('STRATEGI_LINE', ogr.wkbLineString, 8369),
@@ -115,20 +114,14 @@ def test_ogr_ntf_1():
 
     for l in layers:
         lyr = ds.GetLayerByName(l[0])
-        if lyr.GetLayerDefn().GetGeomType() != l[1]:
-            return 'fail'
-        if lyr.GetFeatureCount() != l[2]:
-            print(lyr.GetFeatureCount())
-            return 'fail'
+        assert lyr.GetLayerDefn().GetGeomType() == l[1]
+        assert lyr.GetFeatureCount() == l[2]
         if l[1] != ogr.wkbNone:
-            if lyr.GetSpatialRef().ExportToWkt().find('OSGB 1936') == -1:
-                return 'fail'
+            assert lyr.GetSpatialRef().ExportToWkt().find('OSGB 1936') != -1
 
     lyr = ds.GetLayerByName('STRATEGI_POINT')
     feat = lyr.GetNextFeature()
-    if feat.GetGeometryRef().ExportToWkt() != 'POINT (222904 127850)':
-        print(feat.GetGeometryRef().ExportToWkt())
-        return 'fail'
+    assert feat.GetGeometryRef().ExportToWkt() == 'POINT (222904 127850)'
 
     ds.Destroy()
 
@@ -154,8 +147,7 @@ def test_ogr_ntf_2():
             return 'skip'
 
     ds = ogr.Open('tmp/cache/Port_Talbot_NTF/SS78.ntf')
-    if ds.GetLayerCount() != 5:
-        return 'fail'
+    assert ds.GetLayerCount() == 5
 
     layers = [('MERIDIAN2_POINT', ogr.wkbPoint, 408),
               ('MERIDIAN2_LINE', ogr.wkbLineString, 513),
@@ -165,26 +157,18 @@ def test_ogr_ntf_2():
 
     for l in layers:
         lyr = ds.GetLayerByName(l[0])
-        if lyr.GetLayerDefn().GetGeomType() != l[1]:
-            return 'fail'
-        if lyr.GetFeatureCount() != l[2]:
-            print(lyr.GetFeatureCount())
-            return 'fail'
+        assert lyr.GetLayerDefn().GetGeomType() == l[1]
+        assert lyr.GetFeatureCount() == l[2]
         if l[1] != ogr.wkbNone:
-            if lyr.GetSpatialRef().ExportToWkt().find('OSGB 1936') == -1:
-                return 'fail'
+            assert lyr.GetSpatialRef().ExportToWkt().find('OSGB 1936') != -1
 
     lyr = ds.GetLayerByName('MERIDIAN2_POINT')
     feat = lyr.GetNextFeature()
-    if feat.GetGeometryRef().ExportToWkt() != 'POINT (275324 189274)':
-        print(feat.GetGeometryRef().ExportToWkt())
-        return 'fail'
+    assert feat.GetGeometryRef().ExportToWkt() == 'POINT (275324 189274)'
 
     lyr = ds.GetLayerByName('MERIDIAN2_LINE')
     feat = lyr.GetNextFeature()
-    if feat.GetGeometryRef().ExportToWkt() != 'LINESTRING (275324 189274,275233 189114,275153 189048)':
-        print(feat.GetGeometryRef().ExportToWkt())
-        return 'fail'
+    assert feat.GetGeometryRef().ExportToWkt() == 'LINESTRING (275324 189274,275233 189114,275153 189048)'
 
     ds.Destroy()
 
diff --git a/autotest/ogr/ogr_oci.py b/autotest/ogr/ogr_oci.py
index 599f861c3b60..e135b8570898 100755
--- a/autotest/ogr/ogr_oci.py
+++ b/autotest/ogr/ogr_oci.py
@@ -35,6 +35,7 @@
 from osgeo import ogr
 from osgeo import osr
 from osgeo import gdal
+import pytest
 
 ###############################################################################
 # Open ORACLE.
@@ -109,14 +110,12 @@ def test_ogr_oci_2():
     shp_lyr.ResetReading()
     feat = shp_lyr.GetNextFeature()
     feat.SetFID(-10)
-    if gdaltest.oci_lyr.SetFeature(feat) != ogr.OGRERR_NON_EXISTING_FEATURE:
-        gdaltest.post_reason('Expected failure of SetFeature().')
-        return 'fail'
+    assert gdaltest.oci_lyr.SetFeature(feat) == ogr.OGRERR_NON_EXISTING_FEATURE, \
+        'Expected failure of SetFeature().'
 
     # Test deleting non-existing feature
-    if gdaltest.oci_lyr.DeleteFeature(-10) != ogr.OGRERR_NON_EXISTING_FEATURE:
-        gdaltest.post_reason('Expected failure of DeleteFeature().')
-        return 'fail'
+    assert gdaltest.oci_lyr.DeleteFeature(-10) == ogr.OGRERR_NON_EXISTING_FEATURE, \
+        'Expected failure of DeleteFeature().'
 
     return 'success'
 
@@ -160,17 +159,15 @@ def test_ogr_oci_3():
         if ogrtest.check_feature_geometry(read_feat, orig_feat.GetGeometryRef(),
                                           max_error=0.000000001) != 0:
             print('expected:', orig_feat.GetGeometryRef().ExportToWkt())
-            print('got:', read_feat.GetGeometryRef().ExportToWkt())
-            return 'fail'
+            pytest.fail('got:', read_feat.GetGeometryRef().ExportToWkt())
 
         for fld in range(3):
             if orig_feat.GetField(fld) != read_feat.GetField(fld):
-                gdaltest.post_reason('Attribute %d does not match' % fld)
                 print('expected:')
                 print(orig_feat.DumpReadable())
                 print('got:')
                 print(read_feat.DumpReadable())
-                return 'fail'
+                pytest.fail('Attribute %d does not match' % fld)
 
         read_feat.Destroy()
         orig_feat.Destroy()
@@ -210,8 +207,7 @@ def test_ogr_oci_4():
 
         gdaltest.oci_lyr.SetAttributeFilter("PRFEDEA = '%s'" % item)
         feat_read = gdaltest.oci_lyr.GetNextFeature()
-        if ogrtest.check_feature_geometry(feat_read, geom) != 0:
-            return 'fail'
+        assert ogrtest.check_feature_geometry(feat_read, geom) == 0
 
         feat_read.Destroy()
 
@@ -231,8 +227,7 @@ def test_ogr_oci_5():
     expect = [None, 179, 173, 172, 171, 170, 169, 168, 166, 165, 158]
 
     sql_lyr = gdaltest.oci_ds.ExecuteSQL('select distinct eas_id from tpoly order by eas_id desc')
-    if sql_lyr.GetLayerDefn().GetGeomFieldCount() != 0:
-        return 'fail'
+    assert sql_lyr.GetLayerDefn().GetGeomFieldCount() == 0
 
     tr = ogrtest.check_features_against_list(sql_lyr, 'eas_id', expect)
 
@@ -250,8 +245,7 @@ def test_ogr_oci_6():
         return 'skip'
 
     sql_lyr = gdaltest.oci_ds.ExecuteSQL("select * from tpoly where prfedea = '2'")
-    if sql_lyr.GetLayerDefn().GetGeomFieldCount() != 1:
-        return 'fail'
+    assert sql_lyr.GetLayerDefn().GetGeomFieldCount() == 1
 
     tr = ogrtest.check_features_against_list(sql_lyr, 'prfedea', ['2'])
     if tr:
@@ -322,17 +316,14 @@ def test_ogr_oci_8():
     # oracle SRS.
     srs2 = oci_lyr2.GetSpatialRef()
 
-    if srs2.GetAuthorityCode('GEOGCS') != '8241':
-        gdaltest.post_reason('Did not get expected authority code')
-        return 'fail'
+    assert srs2.GetAuthorityCode('GEOGCS') == '8241', \
+        'Did not get expected authority code'
 
-    if srs2.GetAuthorityName('GEOGCS') != 'Oracle':
-        gdaltest.post_reason('Did not get expected authority name')
-        return 'fail'
+    assert srs2.GetAuthorityName('GEOGCS') == 'Oracle', \
+        'Did not get expected authority name'
 
-    if srs2.GetAttrValue('GEOGCS|DATUM') != 'Kertau 1948':
-        gdaltest.post_reason('Did not get expected datum name')
-        return 'fail'
+    assert srs2.GetAttrValue('GEOGCS|DATUM') == 'Kertau 1948', \
+        'Did not get expected datum name'
 
     return 'success'
 
@@ -368,17 +359,14 @@ def test_ogr_oci_9():
     # oracle SRS we expect.
     srs2 = oci_lyr2.GetSpatialRef()
 
-    if srs2.GetAuthorityCode('GEOGCS') != '4326':
-        gdaltest.post_reason('Did not get expected authority code')
-        return 'fail'
+    assert srs2.GetAuthorityCode('GEOGCS') == '4326', \
+        'Did not get expected authority code'
 
-    if srs2.GetAuthorityName('GEOGCS') != 'EPSG':
-        gdaltest.post_reason('Did not get expected authority name')
-        return 'fail'
+    assert srs2.GetAuthorityName('GEOGCS') == 'EPSG', \
+        'Did not get expected authority name'
 
-    if srs2.GetAttrValue('GEOGCS|DATUM') != 'WGS 84':
-        gdaltest.post_reason('Did not get expected datum name')
-        return 'fail'
+    assert srs2.GetAttrValue('GEOGCS|DATUM') == 'WGS 84', \
+        'Did not get expected datum name'
 
     return 'success'
 
@@ -644,19 +632,13 @@ def test_ogr_oci_16():
 
     lyr = None
 
-    if target_index == -1:
-        gdaltest.post_reason('did not find testsrs2 layer')
-        return 'fail'
+    assert target_index != -1, 'did not find testsrs2 layer'
 
     result = gdaltest.oci_ds.DeleteLayer(target_index)
-    if result != 0:
-        gdaltest.post_reason('DeleteLayer() failed.')
-        return 'fail'
+    assert result == 0, 'DeleteLayer() failed.'
 
     lyr = gdaltest.oci_ds.GetLayerByName('testsrs2')
-    if lyr is not None:
-        gdaltest.post_reason('apparently failed to remove testsrs2 layer')
-        return 'fail'
+    assert lyr is None, 'apparently failed to remove testsrs2 layer'
 
     return 'success'
 
@@ -712,21 +694,15 @@ def test_ogr_oci_17():
     oci_ds2 = ogr.Open(os.environ['OCI_DSNAME'])
 
     sql_lyr = oci_ds2.ExecuteSQL("select column_name from user_sdo_geom_metadata where table_name = 'XPOLY'")
-    if sql_lyr.GetFeatureCount() > 0:
-        gdaltest.post_reason('user_sdo_geom_metadata already populated!')
-        return 'fail'
+    assert sql_lyr.GetFeatureCount() <= 0, 'user_sdo_geom_metadata already populated!'
 
     oci_ds2.ReleaseResultSet(sql_lyr)
 
     result = gdaltest.oci_ds.SyncToDisk()
-    if result != 0:
-        gdaltest.post_reason('SyncToDisk() failed.')
-        return 'fail'
+    assert result == 0, 'SyncToDisk() failed.'
 
     sql_lyr = oci_ds2.ExecuteSQL("select column_name from user_sdo_geom_metadata where table_name = 'XPOLY'")
-    if sql_lyr.GetFeatureCount() == 0:
-        gdaltest.post_reason('user_sdo_geom_metadata still not populated!')
-        return 'fail'
+    assert sql_lyr.GetFeatureCount() != 0, 'user_sdo_geom_metadata still not populated!'
 
     oci_ds2.ReleaseResultSet(sql_lyr)
 
@@ -778,15 +754,9 @@ def test_ogr_oci_18():
             strgeomtype = strgeomtype + '3'
 
         lyr = oci_ds2.GetLayerByName('test_%s' % strgeomtype)
-        if lyr.GetGeomType() != geomtype:
-            print(wkt)
-            print(lyr.GetGeomType())
-            return 'fail'
+        assert lyr.GetGeomType() == geomtype, wkt
         feat = lyr.GetNextFeature()
-        if feat.GetGeometryRef().ExportToWkt() != wkt:
-            print(wkt)
-            print(feat.GetGeometryRef().ExportToWkt())
-            return 'fail'
+        assert feat.GetGeometryRef().ExportToWkt() == wkt
 
     dsname = os.environ['OCI_DSNAME']
     if dsname.find('@') < 0:
@@ -796,8 +766,7 @@ def test_ogr_oci_18():
 
     oci_ds2 = ogr.Open(dsname)
     lyr = oci_ds2.GetLayerByName('test_NONE')
-    if lyr.GetGeomType() != ogr.wkbNone:
-        return 'fail'
+    assert lyr.GetGeomType() == ogr.wkbNone
 
     return 'success'
 
@@ -820,10 +789,8 @@ def test_ogr_oci_19():
     lyr.SyncToDisk()
 
     sql_lyr = gdaltest.oci_ds.ExecuteSQL('SELECT MYDATE, MYDATETIME FROM testdate')
-    if sql_lyr.GetLayerDefn().GetFieldDefn(0).GetType() != ogr.OFTDate:
-        return 'fail'
-    if sql_lyr.GetLayerDefn().GetFieldDefn(1).GetType() != ogr.OFTDateTime:
-        return 'fail'
+    assert sql_lyr.GetLayerDefn().GetFieldDefn(0).GetType() == ogr.OFTDate
+    assert sql_lyr.GetLayerDefn().GetFieldDefn(1).GetType() == ogr.OFTDateTime
     f = sql_lyr.GetNextFeature()
     if f.GetField(0) != '2015/02/03' or f.GetField(1) != '2015/02/03 11:33:44':
         f.DumpReadable()
@@ -841,8 +808,7 @@ def test_ogr_oci_20():
     if gdaltest.oci_ds is None:
         return 'skip'
     lyr = gdaltest.oci_ds.CreateLayer('ogr_oci_20', geom_type=ogr.wkbPoint, options=['GEOMETRY_NULLABLE=NO', 'DIM=2'])
-    if lyr.GetLayerDefn().GetGeomFieldDefn(0).IsNullable() != 0:
-        return 'fail'
+    assert lyr.GetLayerDefn().GetGeomFieldDefn(0).IsNullable() == 0
     field_defn = ogr.FieldDefn('field_not_nullable', ogr.OFTString)
     field_defn.SetNullable(0)
     lyr.CreateField(field_defn)
@@ -854,8 +820,7 @@ def test_ogr_oci_20():
     f.SetGeometryDirectly(ogr.CreateGeometryFromWkt('POINT(0 1)'))
     ret = lyr.CreateFeature(f)
     f = None
-    if ret != 0:
-        return 'fail'
+    assert ret == 0
 
     # Error case: missing geometry
     f = ogr.Feature(lyr.GetLayerDefn())
@@ -863,8 +828,7 @@ def test_ogr_oci_20():
     gdal.PushErrorHandler()
     ret = lyr.CreateFeature(f)
     gdal.PopErrorHandler()
-    if ret == 0:
-        return 'fail'
+    assert ret != 0
     f = None
 
     # Error case: missing non-nullable field
@@ -873,48 +837,38 @@ def test_ogr_oci_20():
     gdal.PushErrorHandler()
     ret = lyr.CreateFeature(f)
     gdal.PopErrorHandler()
-    if ret == 0:
-        return 'fail'
+    assert ret != 0
     f = None
     lyr.SyncToDisk()
 
     # Test with nullable geometry
     lyr = gdaltest.oci_ds.CreateLayer('ogr_oci_20bis', geom_type=ogr.wkbPoint, options=['DIM=2'])
-    if lyr.GetLayerDefn().GetGeomFieldDefn(0).IsNullable() != 1:
-        return 'fail'
+    assert lyr.GetLayerDefn().GetGeomFieldDefn(0).IsNullable() == 1
     f = ogr.Feature(lyr.GetLayerDefn())
     f.SetGeometryDirectly(ogr.CreateGeometryFromWkt('POINT(0 1)'))
     ret = lyr.CreateFeature(f)
     f = None
-    if ret != 0:
-        return 'fail'
+    assert ret == 0
 
     f = ogr.Feature(lyr.GetLayerDefn())
     ret = lyr.CreateFeature(f)
     f = None
-    if ret != 0:
-        return 'fail'
+    assert ret == 0
     lyr.SyncToDisk()
 
     oci_ds2 = ogr.Open(os.environ['OCI_DSNAME'])
 
     lyr = oci_ds2.GetLayerByName('ogr_oci_20')
-    if lyr.GetLayerDefn().GetFieldDefn(lyr.GetLayerDefn().GetFieldIndex('field_not_nullable')).IsNullable() != 0:
-        return 'fail'
-    if lyr.GetLayerDefn().GetFieldDefn(lyr.GetLayerDefn().GetFieldIndex('field_nullable')).IsNullable() != 1:
-        return 'fail'
-    if lyr.GetLayerDefn().GetGeomFieldDefn(0).IsNullable() != 0:
-        return 'fail'
+    assert lyr.GetLayerDefn().GetFieldDefn(lyr.GetLayerDefn().GetFieldIndex('field_not_nullable')).IsNullable() == 0
+    assert lyr.GetLayerDefn().GetFieldDefn(lyr.GetLayerDefn().GetFieldIndex('field_nullable')).IsNullable() == 1
+    assert lyr.GetLayerDefn().GetGeomFieldDefn(0).IsNullable() == 0
 
     lyr = oci_ds2.GetLayerByName('ogr_oci_20bis')
-    if lyr.GetLayerDefn().GetGeomFieldDefn(0).IsNullable() != 1:
-        return 'fail'
+    assert lyr.GetLayerDefn().GetGeomFieldDefn(0).IsNullable() == 1
     feat = lyr.GetNextFeature()
-    if feat.GetGeometryRef() is None:
-        return 'fail'
+    assert feat.GetGeometryRef() is not None
     feat = lyr.GetNextFeature()
-    if feat.GetGeometryRef() is not None:
-        return 'fail'
+    assert feat.GetGeometryRef() is None
 
     return 'success'
 
@@ -981,19 +935,12 @@ def test_ogr_oci_21():
     oci_ds2 = ogr.Open(os.environ['OCI_DSNAME'])
 
     lyr = oci_ds2.GetLayerByName('ogr_oci_21')
-    if lyr.GetLayerDefn().GetFieldDefn(lyr.GetLayerDefn().GetFieldIndex('field_string')).GetDefault() != "'a''b'":
-        return 'fail'
-    if lyr.GetLayerDefn().GetFieldDefn(lyr.GetLayerDefn().GetFieldIndex('field_int')).GetDefault() != '123':
-        return 'fail'
-    if lyr.GetLayerDefn().GetFieldDefn(lyr.GetLayerDefn().GetFieldIndex('field_real')).GetDefault() != '1.23':
-        return 'fail'
-    if lyr.GetLayerDefn().GetFieldDefn(lyr.GetLayerDefn().GetFieldIndex('field_nodefault')).GetDefault() is not None:
-        return 'fail'
-    if lyr.GetLayerDefn().GetFieldDefn(lyr.GetLayerDefn().GetFieldIndex('field_datetime')).GetDefault() != 'CURRENT_TIMESTAMP':
-        return 'fail'
-    if lyr.GetLayerDefn().GetFieldDefn(lyr.GetLayerDefn().GetFieldIndex('field_datetime2')).GetDefault() != "'2015/06/30 12:34:56'":
-        print(lyr.GetLayerDefn().GetFieldDefn(lyr.GetLayerDefn().GetFieldIndex('field_datetime2')).GetDefault())
-        return 'fail'
+    assert lyr.GetLayerDefn().GetFieldDefn(lyr.GetLayerDefn().GetFieldIndex('field_string')).GetDefault() == "'a''b'"
+    assert lyr.GetLayerDefn().GetFieldDefn(lyr.GetLayerDefn().GetFieldIndex('field_int')).GetDefault() == '123'
+    assert lyr.GetLayerDefn().GetFieldDefn(lyr.GetLayerDefn().GetFieldIndex('field_real')).GetDefault() == '1.23'
+    assert lyr.GetLayerDefn().GetFieldDefn(lyr.GetLayerDefn().GetFieldIndex('field_nodefault')).GetDefault() is None
+    assert lyr.GetLayerDefn().GetFieldDefn(lyr.GetLayerDefn().GetFieldIndex('field_datetime')).GetDefault() == 'CURRENT_TIMESTAMP'
+    assert lyr.GetLayerDefn().GetFieldDefn(lyr.GetLayerDefn().GetFieldIndex('field_datetime2')).GetDefault() == "'2015/06/30 12:34:56'"
     # if lyr.GetLayerDefn().GetFieldDefn(lyr.GetLayerDefn().GetFieldIndex('field_date')).GetDefault() != "CURRENT_DATE":
     #    gdaltest.post_reason('fail')
     #    print(lyr.GetLayerDefn().GetFieldDefn(lyr.GetLayerDefn().GetFieldIndex('field_date')).GetDefault())
diff --git a/autotest/ogr/ogr_odbc.py b/autotest/ogr/ogr_odbc.py
index 868e3a82d2fd..75b5b1ec711a 100755
--- a/autotest/ogr/ogr_odbc.py
+++ b/autotest/ogr/ogr_odbc.py
@@ -75,28 +75,23 @@ def test_ogr_odbc_1():
 
     # Test with ODBC:user/pwd@dsn syntax
     ds = ogrtest.odbc_drv.Open('ODBC:user/pwd@DRIVER=Microsoft Access Driver (*.mdb);DBQ=tmp/odbc.mdb')
-    if ds is None:
-        return 'fail'
+    assert ds is not None
     ds = None
 
     # Test with ODBC:dsn syntax
     ds = ogrtest.odbc_drv.Open('ODBC:DRIVER=Microsoft Access Driver (*.mdb);DBQ=tmp/odbc.mdb')
-    if ds is None:
-        return 'fail'
+    assert ds is not None
     ds = None
 
     # Test with ODBC:dsn,table_list syntax
     ds = ogrtest.odbc_drv.Open('ODBC:DRIVER=Microsoft Access Driver (*.mdb);DBQ=tmp/odbc.mdb,test')
-    if ds is None:
-        return 'fail'
-    if ds.GetLayerCount() != 1:
-        return 'fail'
+    assert ds is not None
+    assert ds.GetLayerCount() == 1
     ds = None
 
     # Reopen and check
     ds = ogrtest.odbc_drv.Open('tmp/odbc.mdb')
-    if ds.GetLayerCount() != 2:
-        return 'fail'
+    assert ds.GetLayerCount() == 2
 
     lyr = ds.GetLayerByName('test')
     feat = lyr.GetNextFeature()
@@ -106,8 +101,7 @@ def test_ogr_odbc_1():
 
     lyr = ds.GetLayerByName('test_with_pk')
     # Test GetFeatureCount()
-    if lyr.GetFeatureCount() != 5:
-        return 'fail'
+    assert lyr.GetFeatureCount() == 5
 
     # Test GetFeature()
     feat = lyr.GetFeature(4)
@@ -148,9 +142,7 @@ def test_ogr_odbc_2():
 
     ret = gdaltest.runexternal(test_cli_utilities.get_test_ogrsf_path() + ' tmp/odbc.mdb')
 
-    if ret.find('INFO') == -1 or ret.find('ERROR') != -1:
-        print(ret)
-        return 'fail'
+    assert ret.find('INFO') != -1 and ret.find('ERROR') == -1
 
     return 'success'
 
diff --git a/autotest/ogr/ogr_ods.py b/autotest/ogr/ogr_ods.py
index 09fc51bc3cb7..332183e1454f 100755
--- a/autotest/ogr/ogr_ods.py
+++ b/autotest/ogr/ogr_ods.py
@@ -43,41 +43,25 @@
 
 def ogr_ods_check(ds):
 
-    if ds.TestCapability("foo") != 0:
-        return 'fail'
+    assert ds.TestCapability("foo") == 0
 
-    if ds.GetLayerCount() != 8:
-        gdaltest.post_reason('bad layer count')
-        return 'fail'
+    assert ds.GetLayerCount() == 8, 'bad layer count'
 
     lyr = ds.GetLayer(0)
-    if lyr.GetName() != 'Feuille1':
-        gdaltest.post_reason('bad layer name')
-        return 'fail'
+    assert lyr.GetName() == 'Feuille1', 'bad layer name'
 
-    if lyr.GetGeomType() != ogr.wkbNone:
-        gdaltest.post_reason('bad layer geometry type')
-        return 'fail'
+    assert lyr.GetGeomType() == ogr.wkbNone, 'bad layer geometry type'
 
-    if lyr.GetSpatialRef() is not None:
-        gdaltest.post_reason('bad spatial ref')
-        return 'fail'
+    assert lyr.GetSpatialRef() is None, 'bad spatial ref'
 
-    if lyr.GetFeatureCount() != 26:
-        print(lyr.GetFeatureCount())
-        return 'fail'
+    assert lyr.GetFeatureCount() == 26
 
-    if lyr.TestCapability("foo") != 0:
-        return 'fail'
+    assert lyr.TestCapability("foo") == 0
 
     lyr = ds.GetLayer(6)
-    if lyr.GetName() != 'Feuille7':
-        gdaltest.post_reason('bad layer name')
-        return 'fail'
+    assert lyr.GetName() == 'Feuille7', 'bad layer name'
 
-    if lyr.GetLayerDefn().GetFieldCount() != 12:
-        print(lyr.GetLayerDefn().GetFieldCount())
-        return 'fail'
+    assert lyr.GetLayerDefn().GetFieldCount() == 12
 
     type_array = [ogr.OFTString,
                   ogr.OFTInteger,
@@ -93,10 +77,7 @@ def ogr_ods_check(ds):
                   ogr.OFTDateTime]
 
     for i, typ in enumerate(type_array):
-        if lyr.GetLayerDefn().GetFieldDefn(i).GetType() != typ:
-            print(i)
-            print(lyr.GetLayerDefn().GetFieldDefn(i).GetType())
-            return 'fail'
+        assert lyr.GetLayerDefn().GetFieldDefn(i).GetType() == typ
 
     feat = lyr.GetNextFeature()
     if feat.GetFieldAsString(0) != 'val' or \
@@ -125,13 +106,10 @@ def test_ogr_ods_1():
     if drv is None:
         return 'skip'
 
-    if drv.TestCapability("foo") != 0:
-        return 'fail'
+    assert drv.TestCapability("foo") == 0
 
     ds = ogr.Open('data/test.ods')
-    if ds is None:
-        gdaltest.post_reason('cannot open dataset')
-        return 'fail'
+    assert ds is not None, 'cannot open dataset'
 
     return ogr_ods_check(ds)
 
@@ -145,49 +123,30 @@ def test_ogr_ods_kspread_1():
     if drv is None:
         return 'skip'
 
-    if drv.TestCapability("foo") != 0:
-        return 'fail'
+    assert drv.TestCapability("foo") == 0
 
     ds = ogr.Open('data/test_kspread.ods')
-    if ds is None:
-        gdaltest.post_reason('cannot open dataset')
-        return 'fail'
+    assert ds is not None, 'cannot open dataset'
 
-    if ds.TestCapability("foo") != 0:
-        return 'fail'
+    assert ds.TestCapability("foo") == 0
 
-    if ds.GetLayerCount() != 8:
-        gdaltest.post_reason('bad layer count')
-        return 'fail'
+    assert ds.GetLayerCount() == 8, 'bad layer count'
 
     lyr = ds.GetLayer(0)
-    if lyr.GetName() != 'Feuille1':
-        gdaltest.post_reason('bad layer name')
-        return 'fail'
+    assert lyr.GetName() == 'Feuille1', 'bad layer name'
 
-    if lyr.GetGeomType() != ogr.wkbNone:
-        gdaltest.post_reason('bad layer geometry type')
-        return 'fail'
+    assert lyr.GetGeomType() == ogr.wkbNone, 'bad layer geometry type'
 
-    if lyr.GetSpatialRef() is not None:
-        gdaltest.post_reason('bad spatial ref')
-        return 'fail'
+    assert lyr.GetSpatialRef() is None, 'bad spatial ref'
 
-    if lyr.GetFeatureCount() != 26:
-        print(lyr.GetFeatureCount())
-        return 'fail'
+    assert lyr.GetFeatureCount() == 26
 
-    if lyr.TestCapability("foo") != 0:
-        return 'fail'
+    assert lyr.TestCapability("foo") == 0
 
     lyr = ds.GetLayer(6)
-    if lyr.GetName() != 'Feuille7':
-        gdaltest.post_reason('bad layer name')
-        return 'fail'
+    assert lyr.GetName() == 'Feuille7', 'bad layer name'
 
-    if lyr.GetLayerDefn().GetFieldCount() != 12:
-        print(lyr.GetLayerDefn().GetFieldCount())
-        return 'fail'
+    assert lyr.GetLayerDefn().GetFieldCount() == 12
 
     type_array = [ogr.OFTString,
                   ogr.OFTInteger,
@@ -204,9 +163,7 @@ def test_ogr_ods_kspread_1():
                   ]
 
     for i, typ in enumerate(type_array):
-        if lyr.GetLayerDefn().GetFieldDefn(i).GetType() != typ:
-            print(i)
-            return 'fail'
+        assert lyr.GetLayerDefn().GetFieldDefn(i).GetType() == typ
 
     feat = lyr.GetNextFeature()
     if feat.GetFieldAsString(0) != 'val' or \
@@ -240,9 +197,7 @@ def test_ogr_ods_2():
 
     lyr = ds.GetLayerByName('Feuille7')
 
-    if lyr.GetFeatureCount() != 3:
-        print(lyr.GetFeatureCount())
-        return 'fail'
+    assert lyr.GetFeatureCount() == 3
 
     gdal.SetConfigOption('OGR_ODS_HEADERS', None)
 
@@ -263,8 +218,7 @@ def test_ogr_ods_3():
 
     lyr = ds.GetLayerByName('Feuille7')
 
-    if lyr.GetLayerDefn().GetFieldDefn(1).GetType() != ogr.OFTString:
-        return 'fail'
+    assert lyr.GetLayerDefn().GetFieldDefn(1).GetType() == ogr.OFTString
 
     gdal.SetConfigOption('OGR_ODS_FIELD_TYPES', None)
 
@@ -286,9 +240,7 @@ def test_ogr_ods_4():
 
     ret = gdaltest.runexternal(test_cli_utilities.get_test_ogrsf_path() + ' -ro data/test.ods')
 
-    if ret.find('INFO') == -1 or ret.find('ERROR') != -1:
-        print(ret)
-        return 'fail'
+    assert ret.find('INFO') != -1 and ret.find('ERROR') == -1
 
     return 'success'
 
@@ -330,9 +282,7 @@ def test_ogr_ods_6():
     filepath = '/vsimem/content_formulas.csv'
     with gdaltest.error_handler():
         out_ds = ogr.GetDriverByName('CSV').CopyDataSource(src_ds, filepath)
-    if out_ds is None:
-        gdaltest.post_reason('Unable to create %s.' % filepath)
-        return 'fail'
+    assert out_ds is not None, ('Unable to create %s.' % filepath)
     out_ds = None
     src_ds = None
 
@@ -357,9 +307,7 @@ def test_ogr_ods_6():
 "0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0"
 """.split()
 
-    if res != expected_res:
-        gdaltest.post_reason('did not get expected result: %s' % res)
-        return 'fail'
+    assert res == expected_res, ('did not get expected result: %s' % res)
 
     return 'success'
 
@@ -435,12 +383,10 @@ def test_ogr_ods_8():
 
     ds = ogr.Open('/vsimem/ogr_ods_8.ods')
     lyr = ds.GetLayer(0)
-    if lyr.GetLayerDefn().GetFieldDefn(0).GetType() != ogr.OFTInteger64:
-        return 'fail'
+    assert lyr.GetLayerDefn().GetFieldDefn(0).GetType() == ogr.OFTInteger64
     f = lyr.GetNextFeature()
     f = lyr.GetNextFeature()
-    if f.GetField(0) != 12345678901234:
-        return 'fail'
+    assert f.GetField(0) == 12345678901234
     ds = None
 
     gdal.Unlink('/vsimem/ogr_ods_8.ods')
@@ -473,8 +419,7 @@ def test_ogr_ods_9():
     ds = ogr.Open('/vsimem/ogr_ods_9.ods')
     lyr = ds.GetLayer(0)
     for i in range(3):
-        if lyr.GetLayerDefn().GetFieldDefn(i).GetType() != ogr.OFTDateTime:
-            return 'fail'
+        assert lyr.GetLayerDefn().GetFieldDefn(i).GetType() == ogr.OFTDateTime
     f = lyr.GetNextFeature()
     if f.GetField(0) != '2015/12/23 12:34:56.789':
         f.DumpReadable()
@@ -518,16 +463,12 @@ def test_ogr_ods_boolean():
 
     ds = ogr.Open(out_filename)
     lyr = ds.GetLayer(0)
-    if lyr.GetLayerDefn().GetFieldDefn(0).GetType() != ogr.OFTInteger:
-        return 'fail'
-    if lyr.GetLayerDefn().GetFieldDefn(0).GetSubType() != ogr.OFSTBoolean:
-        return 'fail'
+    assert lyr.GetLayerDefn().GetFieldDefn(0).GetType() == ogr.OFTInteger
+    assert lyr.GetLayerDefn().GetFieldDefn(0).GetSubType() == ogr.OFSTBoolean
     f = lyr.GetNextFeature()
-    if not f.GetField(0):
-        return 'fail'
+    assert f.GetField(0)
     f = lyr.GetNextFeature()
-    if f.GetField(0):
-        return 'fail'
+    assert not f.GetField(0)
     ds = None
 
     gdal.Unlink(out_filename)
diff --git a/autotest/ogr/ogr_ogdi.py b/autotest/ogr/ogr_ogdi.py
index 561f9322ca11..572be8290b2b 100755
--- a/autotest/ogr/ogr_ogdi.py
+++ b/autotest/ogr/ogr_ogdi.py
@@ -72,13 +72,8 @@ def test_ogr_ogdi_1():
 
     ds = ogr.Open(url_name)
     ogrtest.ogdi_ds = ds
-    if ds is None:
-        gdaltest.post_reason('cannot open ' + url_name)
-        return 'fail'
-    if ds.GetLayerCount() != 57:
-        print(ds.GetLayerCount())
-        gdaltest.post_reason('did not get expected layer count')
-        return 'fail'
+    assert ds is not None, ('cannot open ' + url_name)
+    assert ds.GetLayerCount() == 57, 'did not get expected layer count'
 
     layers = [('libref@libref(*)_line', ogr.wkbLineString, 15),
               ('libreft@libref(*)_text', ogr.wkbPoint, 4),
@@ -87,11 +82,8 @@ def test_ogr_ogdi_1():
 
     for l in layers:
         lyr = ds.GetLayerByName(l[0])
-        if lyr.GetLayerDefn().GetGeomType() != l[1]:
-            return 'fail'
-        if lyr.GetFeatureCount() != l[2]:
-            print(lyr.GetFeatureCount())
-            return 'fail'
+        assert lyr.GetLayerDefn().GetGeomType() == l[1]
+        assert lyr.GetFeatureCount() == l[2]
         # if l[1] != ogr.wkbNone:
         #    if lyr.GetSpatialRef().ExportToWkt().find('WGS 84') == -1:
         #        return 'fail'
@@ -102,9 +94,8 @@ def test_ogr_ogdi_1():
     wkt = 'LINESTRING (-97.570159912109375 31.242000579833984,-97.569938659667969 31.242116928100586,-97.562828063964844 31.245765686035156,-97.558868408203125 31.247797012329102,-97.555778503417969 31.249361038208008,-97.55413818359375 31.250171661376953)'
     ref_geom = ogr.CreateGeometryFromWkt(wkt)
 
-    if ogrtest.check_feature_geometry(feat, ref_geom) != 0:
-        print(feat.GetGeometryRef().ExportToWkt())
-        return 'fail'
+    assert ogrtest.check_feature_geometry(feat, ref_geom) == 0, \
+        feat.GetGeometryRef().ExportToWkt()
 
     return 'success'
 
@@ -125,9 +116,7 @@ def test_ogr_ogdi_2():
 
     ret = gdaltest.runexternal(test_cli_utilities.get_test_ogrsf_path() + ' --config OGR_OGDI_LAUNDER_LAYER_NAMES YES -ro "' + url_name + '" markersp_bnd contourl_elev polbnda_bnd extractp_ind')
 
-    if ret.find('INFO') == -1 or ret.find('ERROR') != -1:
-        print(ret)
-        return 'fail'
+    assert ret.find('INFO') != -1 and ret.find('ERROR') == -1
 
     return 'success'
 
@@ -157,25 +146,15 @@ def test_ogr_ogdi_3():
     feat10 = lyr1.GetFeature(0)
     feat11 = lyr1.GetFeature(1)
 
-    if not feat00.Equal(feat00_ref):
-        gdaltest.post_reason('features not equal')
-        return 'fail'
+    assert feat00.Equal(feat00_ref), 'features not equal'
 
-    if not feat01.Equal(feat01_ref):
-        gdaltest.post_reason('features not equal')
-        return 'fail'
+    assert feat01.Equal(feat01_ref), 'features not equal'
 
-    if not feat02.Equal(feat02_ref):
-        gdaltest.post_reason('features not equal')
-        return 'fail'
+    assert feat02.Equal(feat02_ref), 'features not equal'
 
-    if not feat10.Equal(feat10_ref):
-        gdaltest.post_reason('features not equal')
-        return 'fail'
+    assert feat10.Equal(feat10_ref), 'features not equal'
 
-    if not feat11.Equal(feat11_ref):
-        gdaltest.post_reason('features not equal')
-        return 'fail'
+    assert feat11.Equal(feat11_ref), 'features not equal'
 
     return 'success'
 
@@ -190,24 +169,16 @@ def test_ogr_ogdi_4():
 
     url_name = 'gltp:/vrf/' + os.getcwd() + '/data/vm2alv2_texash/texash'
     ds = ogr.Open(url_name)
-    if ds is None:
-        gdaltest.post_reason('cannot open dataset')
-        return 'fail'
+    assert ds is not None, 'cannot open dataset'
 
-    if ds.GetLayerCount() != 6:
-        print(ds.GetLayerCount())
-        gdaltest.post_reason('did not get expected layer count')
-        return 'fail'
+    assert ds.GetLayerCount() == 6, 'did not get expected layer count'
 
     layers = [('polbnda@bnd(*)_area', ogr.wkbPolygon, 6)]
 
     for l in layers:
         lyr = ds.GetLayerByName(l[0])
-        if lyr.GetLayerDefn().GetGeomType() != l[1]:
-            return 'fail'
-        if lyr.GetFeatureCount() != l[2]:
-            print(lyr.GetFeatureCount())
-            return 'fail'
+        assert lyr.GetLayerDefn().GetGeomType() == l[1]
+        assert lyr.GetFeatureCount() == l[2]
 
     lyr = ds.GetLayerByName('polbnda@bnd(*)_area')
     feat = lyr.GetNextFeature()
@@ -220,21 +191,15 @@ def test_ogr_ogdi_4():
     wkt = 'POLYGON ((-97.6672973632812 31.250171661377,-97.5832977294922 31.250171661377,-97.5780029296875 31.250171661377,-97.5780029296875 31.250171661377,-97.5780944824219 31.2494583129883,-97.5779724121094 31.2492084503174,-97.577751159668 31.24880027771,-97.5776443481445 31.2484683990479,-97.5775451660156 31.2482070922852,-97.5774078369141 31.2479457855225,-97.5772705078125 31.2477989196777,-97.5771331787109 31.2477321624756,-97.5768661499023 31.2476787567139,-97.5766830444336 31.2476959228516,-97.5763168334961 31.2477016448975,-97.576042175293 31.247673034668,-97.5757141113281 31.2475509643555,-97.5754852294922 31.2473278045654,-97.5752792358398 31.2470207214356,-97.5751190185547 31.2467250823975,-97.5750122070312 31.2465076446533,-97.5748443603516 31.2462825775147,-97.5746002197266 31.2460918426514,-97.5742874145508 31.2459144592285,-97.5739288330078 31.2458171844482,-97.5736083984375 31.2457542419434,-97.5731201171875 31.2456817626953,-97.5728302001953 31.245641708374,-97.5724792480469 31.2455806732178,-97.5721817016602 31.2454471588135,-97.5719223022461 31.2453022003174,-97.5717086791992 31.2450218200684,-97.5715408325195 31.2446899414062,-97.5713882446289 31.2445201873779,-97.5711669921875 31.2442722320557,-97.5710678100586 31.2440910339355,-97.5711975097656 31.2438926696777,-97.5713577270508 31.2437191009521,-97.5718154907227 31.2434253692627,-97.5724258422852 31.2431831359863,-97.5726470947266 31.2430419921875,-97.5728530883789 31.2427291870117,-97.5728759765625 31.2424869537354,-97.57275390625 31.2423858642578,-97.5727996826172 31.2423534393311,-97.5712738037109 31.2422771453857,-97.5710067749023 31.2422466278076,-97.5707092285156 31.2421951293945,-97.5702285766602 31.2420444488525,-97.5701599121094 31.242000579834,-97.5701599121094 31.242000579834,-97.5794296264648 31.2372093200684,-97.5909194946289 31.2314224243164,-97.6050415039062 31.2241363525391,-97.6213302612305 31.2157878875732,-97.6490707397461 31.201566696167,-97.6662445068359 31.1928386688232,-97.6803207397461 31.1855792999268,-97.6936721801758 31.1787204742432,-97.7042617797852 31.1732997894287,-97.7107391357422 31.1699485778809,-97.7178192138672 31.1663246154785,-97.7325134277344 31.1587982177734,-97.7502975463867 31.1499614715576,-97.7502975463867 31.1499614715576,-97.7502975463867 31.1671733856201,-97.7502975463867 31.1671733856201,-97.7502975463867 31.250171661377,-97.6672973632812 31.250171661377))'
     ref_geom = ogr.CreateGeometryFromWkt(wkt)
 
-    if ogrtest.check_feature_geometry(feat, ref_geom) != 0:
-        print(feat.GetGeometryRef().ExportToWkt())
-        return 'fail'
+    assert ogrtest.check_feature_geometry(feat, ref_geom) == 0, \
+        feat.GetGeometryRef().ExportToWkt()
 
     ds = None
 
     # Test opening one single layer
     ds = ogr.Open(url_name + ':polbnda@bnd(*):area')
-    if ds is None:
-        gdaltest.post_reason('cannot open dataset')
-        return 'fail'
-    if ds.GetLayerCount() != 1:
-        print(ds.GetLayerCount())
-        gdaltest.post_reason('did not get expected layer count')
-        return 'fail'
+    assert ds is not None, 'cannot open dataset'
+    assert ds.GetLayerCount() == 1, 'did not get expected layer count'
 
     return 'success'
 
@@ -255,9 +220,7 @@ def test_ogr_ogdi_5():
 
     ret = gdaltest.runexternal(test_cli_utilities.get_test_ogrsf_path() + ' --config OGR_OGDI_LAUNDER_LAYER_NAMES YES -ro "' + url_name + '"')
 
-    if ret.find('INFO') == -1 or ret.find('ERROR') != -1:
-        print(ret)
-        return 'fail'
+    assert ret.find('INFO') != -1 and ret.find('ERROR') == -1
 
     return 'success'
 
diff --git a/autotest/ogr/ogr_openair.py b/autotest/ogr/ogr_openair.py
index 243c084eba65..7ae5cc1a912e 100755
--- a/autotest/ogr/ogr_openair.py
+++ b/autotest/ogr/ogr_openair.py
@@ -34,6 +34,7 @@
 import gdaltest
 import ogrtest
 from osgeo import ogr
+import pytest
 
 ###############################################################################
 # Basic test
@@ -42,14 +43,10 @@
 def test_ogr_openair_1():
 
     ds = ogr.Open('data/openair_test.txt')
-    if ds is None:
-        gdaltest.post_reason('cannot open dataset')
-        return 'fail'
+    assert ds is not None, 'cannot open dataset'
 
     lyr = ds.GetLayerByName('airspaces')
-    if lyr is None:
-        gdaltest.post_reason('cannot find layer airspaces')
-        return 'fail'
+    assert lyr is not None, 'cannot find layer airspaces'
 
     feat = lyr.GetNextFeature()
     feat = lyr.GetNextFeature()
@@ -58,25 +55,19 @@ def test_ogr_openair_1():
     if ogrtest.check_feature_geometry(feat, 'POLYGON ((49.75 2.75,49.75 3.0,49.5 3.0,49.5 2.75,49.75 2.75))',
                                       max_error=0.0000001) != 0:
         print('did not get expected first geom')
-        print(geom.ExportToWkt())
-        return 'fail'
+        pytest.fail(geom.ExportToWkt())
     style = feat.GetStyleString()
-    if style != 'PEN(c:#0000FF,w:2pt,p:"5px 5px");BRUSH(fc:#00FF00)':
-        print('did not get expected style')
-        print(style)
-        return 'fail'
+    assert style == 'PEN(c:#0000FF,w:2pt,p:"5px 5px");BRUSH(fc:#00FF00)', \
+        'did not get expected style'
 
     lyr = ds.GetLayerByName('labels')
-    if lyr is None:
-        gdaltest.post_reason('cannot find layer labels')
-        return 'fail'
+    assert lyr is not None, 'cannot find layer labels'
     feat = lyr.GetNextFeature()
     geom = feat.GetGeometryRef()
     if ogrtest.check_feature_geometry(feat, 'POINT (49.2625 2.504166666666667)',
                                       max_error=0.0000001) != 0:
         print('did not get expected geom on labels layer')
-        print(geom.ExportToWkt())
-        return 'fail'
+        pytest.fail(geom.ExportToWkt())
 
     return 'success'
 
diff --git a/autotest/ogr/ogr_openfilegdb.py b/autotest/ogr/ogr_openfilegdb.py
index fa2ec8fbd047..2917def1587b 100755
--- a/autotest/ogr/ogr_openfilegdb.py
+++ b/autotest/ogr/ogr_openfilegdb.py
@@ -39,6 +39,7 @@
 from osgeo import gdal
 from osgeo import ogr
 from osgeo import osr
+import pytest
 
 ogrtest.openfilegdb_datalist = [["none", ogr.wkbNone, None],
                                 ["point", ogr.wkbPoint, "POINT (1 2)"],
@@ -292,22 +293,13 @@ def test_ogr_openfilegdb_1(filename='data/testopenfilegdb.gdb.zip', version10=Tr
             expected_geom_type = ogr.wkbMultiPolygon
         elif expected_geom_type == ogr.wkbPolygon25D:
             expected_geom_type = ogr.wkbMultiPolygon25D
-        if lyr.GetGeomType() != expected_geom_type:
-            print(lyr.GetName())
-            print(lyr.GetGeomType())
-            return 'fail'
-        if expected_geom_type is not ogr.wkbNone and lyr.GetLayerDefn().GetGeomFieldDefn(0).IsNullable() != 1:
-            return 'fail'
-        if lyr.GetLayerDefn().GetFieldDefn(lyr.GetLayerDefn().GetFieldIndex('str')).GetWidth() != 0:
-            return 'fail'
-        if lyr.GetLayerDefn().GetFieldDefn(lyr.GetLayerDefn().GetFieldIndex('smallint')).GetSubType() != ogr.OFSTInt16:
-            return 'fail'
-        if lyr.GetLayerDefn().GetFieldDefn(lyr.GetLayerDefn().GetFieldIndex('float')).GetSubType() != ogr.OFSTFloat32:
-            return 'fail'
+        assert lyr.GetGeomType() == expected_geom_type, lyr.GetName()
+        assert expected_geom_type is ogr.wkbNone or lyr.GetLayerDefn().GetGeomFieldDefn(0).IsNullable() == 1
+        assert lyr.GetLayerDefn().GetFieldDefn(lyr.GetLayerDefn().GetFieldIndex('str')).GetWidth() == 0
+        assert lyr.GetLayerDefn().GetFieldDefn(lyr.GetLayerDefn().GetFieldIndex('smallint')).GetSubType() == ogr.OFSTInt16
+        assert lyr.GetLayerDefn().GetFieldDefn(lyr.GetLayerDefn().GetFieldIndex('float')).GetSubType() == ogr.OFSTFloat32
         if data[1] != ogr.wkbNone:
-            if lyr.GetSpatialRef().IsSame(srs) != 1:
-                print(lyr.GetSpatialRef())
-                return 'fail'
+            assert lyr.GetSpatialRef().IsSame(srs) == 1
         feat = lyr.GetNextFeature()
         if data[1] != ogr.wkbNone:
             try:
@@ -337,34 +329,27 @@ def test_ogr_openfilegdb_1(filename='data/testopenfilegdb.gdb.zip', version10=Tr
 
         if version10:
             sql_lyr = ds.ExecuteSQL("GetLayerDefinition %s" % lyr.GetName())
-            if sql_lyr is None:
-                return 'fail'
+            assert sql_lyr is not None
             feat = sql_lyr.GetNextFeature()
-            if feat is None:
-                return 'fail'
+            assert feat is not None
             feat = sql_lyr.GetNextFeature()
-            if feat is not None:
-                return 'fail'
+            assert feat is None
             lyr.ResetReading()
             lyr.TestCapability("foo")
             ds.ReleaseResultSet(sql_lyr)
 
             sql_lyr = ds.ExecuteSQL("GetLayerMetadata %s" % lyr.GetName())
-            if sql_lyr is None:
-                return 'fail'
+            assert sql_lyr is not None
             feat = sql_lyr.GetNextFeature()
-            if feat is None:
-                return 'fail'
+            assert feat is not None
             ds.ReleaseResultSet(sql_lyr)
 
     if version10:
         sql_lyr = ds.ExecuteSQL("GetLayerDefinition foo")
-        if sql_lyr is not None:
-            return 'fail'
+        assert sql_lyr is None
 
         sql_lyr = ds.ExecuteSQL("GetLayerMetadata foo")
-        if sql_lyr is not None:
-            return 'fail'
+        assert sql_lyr is None
 
     if version10:
         for data in ogrtest.openfilegdb_datalist_m:
@@ -379,10 +364,7 @@ def test_ogr_openfilegdb_1(filename='data/testopenfilegdb.gdb.zip', version10=Tr
             elif expected_geom_type == ogr.wkbPolygonZM:
                 expected_geom_type = ogr.wkbMultiPolygonZM
 
-            if lyr.GetGeomType() != expected_geom_type:
-                print(data)
-                print(lyr.GetGeomType())
-                return 'fail'
+            assert lyr.GetGeomType() == expected_geom_type, data
             feat = lyr.GetNextFeature()
             try:
                 expected_wkt = data[3]
@@ -422,9 +404,7 @@ def test_ogr_openfilegdb_2(filename='data/testopenfilegdb.gdb.zip'):
 
     ret = gdaltest.runexternal(test_cli_utilities.get_test_ogrsf_path() + ' -ro ' + filename)
 
-    if ret.find('INFO') == -1 or ret.find('ERROR') != -1:
-        print(ret)
-        return 'fail'
+    assert ret.find('INFO') != -1 and ret.find('ERROR') == -1
 
     return 'success'
 
@@ -443,22 +423,17 @@ def test_ogr_openfilegdb_2_93():
 def test_ogr_openfilegdb_3():
 
     ds = ogr.Open('/vsizip/data/testopenfilegdb.gdb.zip/testopenfilegdb.gdb/a00000009.gdbtable')
-    if ds.GetLayerCount() != 1:
-        return 'fail'
+    assert ds.GetLayerCount() == 1
     lyr = ds.GetLayer(0)
-    if lyr.GetName() != 'none':
-        return 'fail'
+    assert lyr.GetName() == 'none'
 
     # Try opening a system table
     lyr = ds.GetLayerByName('GDB_SystemCatalog')
-    if lyr.GetName() != 'GDB_SystemCatalog':
-        return 'fail'
+    assert lyr.GetName() == 'GDB_SystemCatalog'
     feat = lyr.GetNextFeature()
-    if feat.GetField('Name') != 'GDB_SystemCatalog':
-        return 'fail'
+    assert feat.GetField('Name') == 'GDB_SystemCatalog'
     lyr = ds.GetLayerByName('GDB_SystemCatalog')
-    if lyr.GetName() != 'GDB_SystemCatalog':
-        return 'fail'
+    assert lyr.GetName() == 'GDB_SystemCatalog'
 
     ds = None
 
@@ -588,23 +563,14 @@ def test_ogr_openfilegdb_4():
         sql_lyr = ds.ExecuteSQL('GetLayerAttrIndexUse %s' % lyr.GetName())
         attr_index_use = int(sql_lyr.GetNextFeature().GetField(0))
         ds.ReleaseResultSet(sql_lyr)
-        if attr_index_use != expected_attr_index_use:
-            print(where_clause, fids, expected_attr_index_use)
-            print(attr_index_use)
-            return 'fail'
-        if lyr.GetFeatureCount() != len(fids):
-            print(where_clause, fids)
-            print(lyr.GetFeatureCount())
-            return 'fail'
+        assert attr_index_use == expected_attr_index_use, \
+            (where_clause, fids, expected_attr_index_use)
+        assert lyr.GetFeatureCount() == len(fids), (where_clause, fids)
         for fid in fids:
             feat = lyr.GetNextFeature()
-            if feat.GetFID() != fid:
-                print(where_clause, fids)
-                return 'fail'
+            assert feat.GetFID() == fid, (where_clause, fids)
         feat = lyr.GetNextFeature()
-        if feat is not None:
-            print(where_clause, fids)
-            return 'fail'
+        assert feat is None, (where_clause, fids)
 
     lyr = ds.GetLayerByName('none')
     tests = [('id = 1', [1]),
@@ -626,23 +592,14 @@ def test_ogr_openfilegdb_4():
         sql_lyr = ds.ExecuteSQL('GetLayerAttrIndexUse %s' % lyr.GetName())
         attr_index_use = int(sql_lyr.GetNextFeature().GetField(0))
         ds.ReleaseResultSet(sql_lyr)
-        if attr_index_use != expected_attr_index_use:
-            print(where_clause, fids, expected_attr_index_use)
-            print(attr_index_use)
-            return 'fail'
-        if lyr.GetFeatureCount() != len(fids):
-            print(where_clause, fids)
-            print(lyr.GetFeatureCount())
-            return 'fail'
+        assert attr_index_use == expected_attr_index_use, \
+            (where_clause, fids, expected_attr_index_use)
+        assert lyr.GetFeatureCount() == len(fids), (where_clause, fids)
         for fid in fids:
             feat = lyr.GetNextFeature()
-            if feat.GetFID() != fid:
-                print(where_clause, fids)
-                return 'fail'
+            assert feat.GetFID() == fid, (where_clause, fids)
         feat = lyr.GetNextFeature()
-        if feat is not None:
-            print(where_clause, fids)
-            return 'fail'
+        assert feat is None, (where_clause, fids)
 
     lyr = ds.GetLayerByName('big_layer')
     tests = [('real = 0', 86, 1),
@@ -657,21 +614,14 @@ def test_ogr_openfilegdb_4():
     for (where_clause, count, start) in tests:
 
         lyr.SetAttributeFilter(where_clause)
-        if lyr.GetFeatureCount() != count:
-            print(where_clause, count)
-            print(lyr.GetFeatureCount())
-            return 'fail'
+        assert lyr.GetFeatureCount() == count, (where_clause, count)
         for i in range(count):
             feat = lyr.GetNextFeature()
-            if feat is None or \
+            assert (not (feat is None or \
                (start is not None and
-                    feat.GetFID() != i * 4 + start):
-                print(where_clause, count)
-                return 'fail'
+                    feat.GetFID() != i * 4 + start))), (where_clause, count)
         feat = lyr.GetNextFeature()
-        if feat is not None:
-            print(where_clause, count)
-            return 'fail'
+        assert feat is None, (where_clause, count)
 
     ds = None
     return 'success'
@@ -696,8 +646,7 @@ def test_ogr_openfilegdb_5():
         return 'skip'
 
     ds = ogr.Open('tmp/testopenfilegdb.gdb')
-    if ds is None:
-        return 'fail'
+    assert ds is not None
 
     return 'success'
 
@@ -712,8 +661,7 @@ def test_ogr_openfilegdb_6():
     # With indices
     sql_lyr = ds.ExecuteSQL("select min(id), max(id), count(id), sum(id), avg(id), min(str), min(smallint), "
                             "avg(smallint), min(float), avg(float), min(real), avg(real), min(adate), avg(adate), min(guid), min(nullint), avg(nullint) from point")
-    if sql_lyr is None:
-        return 'fail'
+    assert sql_lyr is not None
     feat = sql_lyr.GetNextFeature()
     if feat.GetField('MIN_id') != 1 or \
        feat.GetField('MAX_id') != 5 or \
@@ -792,9 +740,7 @@ def test_ogr_openfilegdb_7():
                 print(sql, feat_count, first_fid)
                 return 'fail'
             continue
-        if sql_lyr is None:
-            print(sql, feat_count, first_fid)
-            return 'fail'
+        assert sql_lyr is not None, (sql, feat_count, first_fid)
         if expected_optimized:
             if sql_lyr.GetFeatureCount() != feat_count:
                 print(sql, feat_count, first_fid)
@@ -811,18 +757,14 @@ def test_ogr_openfilegdb_7():
         sql_lyr = ds.ExecuteSQL('GetLastSQLUsedOptimizedImplementation')
         optimized = int(sql_lyr.GetNextFeature().GetField(0))
         ds.ReleaseResultSet(sql_lyr)
-        if optimized != expected_optimized:
-            print(sql, feat_count, first_fid)
-            return 'fail'
+        assert optimized == expected_optimized, (sql, feat_count, first_fid)
 
         if optimized and sql.find('big_layer') < 0:
             import test_cli_utilities
             if test_cli_utilities.get_test_ogrsf_path() is not None:
                 ret = gdaltest.runexternal(test_cli_utilities.get_test_ogrsf_path() + ' -ro data/testopenfilegdb.gdb.zip -sql "%s"' % sql)
-                if ret.find('INFO') == -1 or ret.find('ERROR') != -1:
-                    print(sql, feat_count, first_fid)
-                    print(ret)
-                    return 'fail'
+                assert ret.find('INFO') != -1 and ret.find('ERROR') == -1, \
+                    (sql, feat_count, first_fid)
 
     return 'success'
 
@@ -847,10 +789,7 @@ def test_ogr_openfilegdb_8():
         dict_feat_count2[lyr.GetName()] = lyr.GetFeatureCount()
     gdal.SetConfigOption('OPENFILEGDB_IGNORE_GDBTABLX', None)
 
-    if dict_feat_count != dict_feat_count2:
-        print(dict_feat_count)
-        print(dict_feat_count2)
-        return 'fail'
+    assert dict_feat_count == dict_feat_count2
 
     lyr = ds.GetLayerByName('hole')
     # Not exactly in the order that one might expect, but logical when
@@ -881,12 +820,10 @@ def test_ogr_openfilegdb_9():
     shutil.copy('tmp/testopenfilegdb.gdb/a00000009.gdbtable', 'tmp/a00000009.gdbtable')
     shutil.copy('tmp/testopenfilegdb.gdb/a00000009.gdbtablx', 'tmp/a00000009.gdbtablx')
     ds = ogr.Open('tmp/a00000009.gdbtable')
-    if ds is None:
-        return 'fail'
+    assert ds is not None
     lyr = ds.GetLayer(0)
     feat = lyr.GetNextFeature()
-    if feat is None:
-        return 'fail'
+    assert feat is not None
 
     return 'success'
 
@@ -1080,29 +1017,22 @@ def test_ogr_openfilegdb_11():
     # Test building spatial index with GetFeatureCount()
     ds = ogr.Open('data/testopenfilegdb.gdb.zip')
     lyr = ds.GetLayerByName('several_polygons')
-    if get_spi_state(ds, lyr) != SPI_IN_BUILDING:
-        return 'fail'
+    assert get_spi_state(ds, lyr) == SPI_IN_BUILDING
     lyr.ResetReading()
-    if get_spi_state(ds, lyr) != SPI_IN_BUILDING:
-        return 'fail'
-    if lyr.TestCapability(ogr.OLCFastFeatureCount) != 1:
-        return 'fail'
+    assert get_spi_state(ds, lyr) == SPI_IN_BUILDING
+    assert lyr.TestCapability(ogr.OLCFastFeatureCount) == 1
     lyr.SetSpatialFilterRect(0.25, 0.25, 0.5, 0.5)
-    if lyr.GetFeatureCount() != 1:
-        return 'fail'
-    if get_spi_state(ds, lyr) != SPI_COMPLETED:
-        return 'fail'
+    assert lyr.GetFeatureCount() == 1
+    assert get_spi_state(ds, lyr) == SPI_COMPLETED
     # Should return cached value
-    if lyr.GetFeatureCount() != 1:
-        return 'fail'
+    assert lyr.GetFeatureCount() == 1
     # Should use index
     c = 0
     feat = lyr.GetNextFeature()
     while feat is not None:
         c = c + 1
         feat = lyr.GetNextFeature()
-    if c != 1:
-        return 'fail'
+    assert c == 1
     feat = None
     lyr = None
     ds = None
@@ -1113,15 +1043,12 @@ def test_ogr_openfilegdb_11():
     lyr.SetSpatialFilterRect(0.25, 0.25, 0.5, 0.5)
     c = 0
     feat = lyr.GetNextFeature()
-    if get_spi_state(ds, lyr) != SPI_IN_BUILDING:
-        return 'fail'
+    assert get_spi_state(ds, lyr) == SPI_IN_BUILDING
     while feat is not None:
         c = c + 1
         feat = lyr.GetNextFeature()
-    if c != 1:
-        return 'fail'
-    if get_spi_state(ds, lyr) != SPI_COMPLETED:
-        return 'fail'
+    assert c == 1
+    assert get_spi_state(ds, lyr) == SPI_COMPLETED
     feat = None
     lyr = None
     ds = None
@@ -1136,8 +1063,7 @@ def test_ogr_openfilegdb_11():
     ds = ogr.Open('data/testopenfilegdb.gdb.zip')
     lyr = ds.GetLayerByName('multipolygon')
     lyr.SetSpatialFilterRect(1.4, 0.4, 1.6, 0.6)
-    if lyr.GetFeatureCount() != expected_count:
-        return 'fail'
+    assert lyr.GetFeatureCount() == expected_count
     lyr = None
     ds = None
 
@@ -1151,10 +1077,8 @@ def test_ogr_openfilegdb_11():
     while feat is not None:
         c = c + 1
         feat = lyr.GetNextFeature()
-    if c != expected_count:
-        return 'fail'
-    if lyr.GetFeatureCount() != expected_count:
-        return 'fail'
+    assert c == expected_count
+    assert lyr.GetFeatureCount() == expected_count
     feat = None
     lyr = None
     ds = None
@@ -1165,40 +1089,30 @@ def test_ogr_openfilegdb_11():
     lyr.SetSpatialFilterRect(0.25, 0.25, 0.5, 0.5)
     feat = lyr.GetFeature(1)
     feat = lyr.GetFeature(1)
-    if get_spi_state(ds, lyr) != SPI_IN_BUILDING:
-        return 'fail'
+    assert get_spi_state(ds, lyr) == SPI_IN_BUILDING
     feat = lyr.GetNextFeature()
     while feat is not None:
         feat = lyr.GetNextFeature()
-    if get_spi_state(ds, lyr) != SPI_COMPLETED:
-        return 'fail'
+    assert get_spi_state(ds, lyr) == SPI_COMPLETED
     lyr.ResetReading()
     c = 0
     feat = lyr.GetNextFeature()
     while feat is not None:
         c = c + 1
         feat = lyr.GetNextFeature()
-    if c != 1:
-        return 'fail'
-    if get_spi_state(ds, lyr) != SPI_COMPLETED:
-        return 'fail'
+    assert c == 1
+    assert get_spi_state(ds, lyr) == SPI_COMPLETED
 
     # This will create an array of filtered features
     lyr.SetSpatialFilterRect(0.25, 0.25, 0.5, 0.5)
-    if lyr.TestCapability(ogr.OLCFastSetNextByIndex) != 1:
-        return 'fail'
+    assert lyr.TestCapability(ogr.OLCFastSetNextByIndex) == 1
     # Test SetNextByIndex() with filtered features
-    if lyr.SetNextByIndex(-1) == 0:
-        return 'fail'
-    if lyr.SetNextByIndex(1) == 0:
-        return 'fail'
-    if lyr.SetNextByIndex(0) != 0:
-        return 'fail'
+    assert lyr.SetNextByIndex(-1) != 0
+    assert lyr.SetNextByIndex(1) != 0
+    assert lyr.SetNextByIndex(0) == 0
     feat = lyr.GetNextFeature()
-    if feat.GetFID() != 1:
-        return 'fail'
-    if get_spi_state(ds, lyr) != SPI_COMPLETED:
-        return 'fail'
+    assert feat.GetFID() == 1
+    assert get_spi_state(ds, lyr) == SPI_COMPLETED
 
     feat = None
     lyr = None
@@ -1208,8 +1122,7 @@ def test_ogr_openfilegdb_11():
     ds = ogr.Open('data/testopenfilegdb.gdb.zip')
     lyr = ds.GetLayerByName('multipolygon')
     lyr.SetNextByIndex(3)
-    if get_spi_state(ds, lyr) != SPI_INVALID:
-        return 'fail'
+    assert get_spi_state(ds, lyr) == SPI_INVALID
     feat = None
     lyr = None
     ds = None
@@ -1219,8 +1132,7 @@ def test_ogr_openfilegdb_11():
     lyr = ds.GetLayerByName('multipolygon')
     feat = lyr.GetNextFeature()
     lyr.ResetReading()
-    if get_spi_state(ds, lyr) != SPI_INVALID:
-        return 'fail'
+    assert get_spi_state(ds, lyr) == SPI_INVALID
     feat = None
     lyr = None
     ds = None
@@ -1229,8 +1141,7 @@ def test_ogr_openfilegdb_11():
     ds = ogr.Open('data/testopenfilegdb.gdb.zip')
     lyr = ds.GetLayerByName('point')
     lyr.SetAttributeFilter('id = 1')
-    if get_spi_state(ds, lyr) != SPI_INVALID:
-        return 'fail'
+    assert get_spi_state(ds, lyr) == SPI_INVALID
     feat = None
     lyr = None
     ds = None
@@ -1248,10 +1159,7 @@ def test_ogr_openfilegdb_12():
     sr = osr.SpatialReference()
     sr.ImportFromEPSG(3005)
     expected_wkt = sr.ExportToWkt()
-    if got_wkt != expected_wkt:
-        print(got_wkt)
-        print(expected_wkt)
-        return 'fail'
+    assert got_wkt == expected_wkt
     ds = None
 
     return 'success'
@@ -1264,12 +1172,9 @@ def test_ogr_openfilegdb_13():
 
     ds = ogr.Open('/vsizip/data/ESSENCE_NAIPF_ORI_PROV_sub93.gdb.zip')
     lyr = ds.GetLayer(0)
-    if lyr.GetName() != 'DDE_ESSEN_NAIPF_ORI_VUE':
-        return 'fail'
-    if lyr.GetSpatialRef() is not None:
-        return 'fail'
-    if lyr.GetGeomType() != ogr.wkbNone:
-        return 'fail'
+    assert lyr.GetName() == 'DDE_ESSEN_NAIPF_ORI_VUE'
+    assert lyr.GetSpatialRef() is None
+    assert lyr.GetGeomType() == ogr.wkbNone
     f = lyr.GetNextFeature()
     if f.GetField('GEOCODE') != '-673985,22+745574,77':
         f.DumpReadable()
@@ -1286,12 +1191,9 @@ def test_ogr_openfilegdb_14():
 
     ds = ogr.Open('data/testopenfilegdb.gdb.zip')
     lyr = ds.GetLayerByName('testnotnullable')
-    if lyr.GetLayerDefn().GetFieldDefn(lyr.GetLayerDefn().GetFieldIndex('field_not_nullable')).IsNullable() != 0:
-        return 'fail'
-    if lyr.GetLayerDefn().GetFieldDefn(lyr.GetLayerDefn().GetFieldIndex('field_nullable')).IsNullable() != 1:
-        return 'fail'
-    if lyr.GetLayerDefn().GetGeomFieldDefn(0).IsNullable() != 0:
-        return 'fail'
+    assert lyr.GetLayerDefn().GetFieldDefn(lyr.GetLayerDefn().GetFieldIndex('field_not_nullable')).IsNullable() == 0
+    assert lyr.GetLayerDefn().GetFieldDefn(lyr.GetLayerDefn().GetFieldIndex('field_nullable')).IsNullable() == 1
+    assert lyr.GetLayerDefn().GetGeomFieldDefn(0).IsNullable() == 0
     ds = None
 
     return 'success'
@@ -1304,20 +1206,13 @@ def test_ogr_openfilegdb_15():
 
     ds = ogr.Open('data/test_default_val.gdb.zip')
     lyr = ds.GetLayer(0)
-    if lyr.GetLayerDefn().GetFieldDefn(lyr.GetLayerDefn().GetFieldIndex('STR')).GetDefault() != "'default_val'":
-        return 'fail'
-    if lyr.GetLayerDefn().GetFieldDefn(lyr.GetLayerDefn().GetFieldIndex('STR')).GetWidth() != 50:
-        return 'fail'
-    if lyr.GetLayerDefn().GetFieldDefn(lyr.GetLayerDefn().GetFieldIndex('INT32')).GetDefault() != "123456788":
-        return 'fail'
-    if lyr.GetLayerDefn().GetFieldDefn(lyr.GetLayerDefn().GetFieldIndex('INT16')).GetDefault() != "12345":
-        return 'fail'
-    if lyr.GetLayerDefn().GetFieldDefn(lyr.GetLayerDefn().GetFieldIndex('FLOAT32')).GetDefault().find('1.23') != 0:
-        return 'fail'
-    if lyr.GetLayerDefn().GetFieldDefn(lyr.GetLayerDefn().GetFieldIndex('FLOAT64')).GetDefault().find('1.23456') != 0:
-        return 'fail'
-    if lyr.GetLayerDefn().GetFieldDefn(lyr.GetLayerDefn().GetFieldIndex('DATETIME')).GetDefault() != "'2015/06/30 12:34:56'":
-        return 'fail'
+    assert lyr.GetLayerDefn().GetFieldDefn(lyr.GetLayerDefn().GetFieldIndex('STR')).GetDefault() == "'default_val'"
+    assert lyr.GetLayerDefn().GetFieldDefn(lyr.GetLayerDefn().GetFieldIndex('STR')).GetWidth() == 50
+    assert lyr.GetLayerDefn().GetFieldDefn(lyr.GetLayerDefn().GetFieldIndex('INT32')).GetDefault() == "123456788"
+    assert lyr.GetLayerDefn().GetFieldDefn(lyr.GetLayerDefn().GetFieldIndex('INT16')).GetDefault() == "12345"
+    assert lyr.GetLayerDefn().GetFieldDefn(lyr.GetLayerDefn().GetFieldIndex('FLOAT32')).GetDefault().find('1.23') == 0
+    assert lyr.GetLayerDefn().GetFieldDefn(lyr.GetLayerDefn().GetFieldIndex('FLOAT64')).GetDefault().find('1.23456') == 0
+    assert lyr.GetLayerDefn().GetFieldDefn(lyr.GetLayerDefn().GetFieldIndex('DATETIME')).GetDefault() == "'2015/06/30 12:34:56'"
     return 'success'
 
 
@@ -1330,25 +1225,18 @@ def test_ogr_openfilegdb_16():
     lyr = ds.GetLayer(0)
     for fid in [2, 3, 4, 7, 8, 9, 10, 2049, 8191, 16384, 10000000, 10000001]:
         f = lyr.GetNextFeature()
-        if f.GetFID() != fid:
-            print(f.GetFID())
-            print(fid)
-            return 'fail'
+        assert f.GetFID() == fid
 
     f = lyr.GetFeature(100000)
-    if f is not None:
-        return 'fail'
+    assert f is None
 
     f = lyr.GetFeature(10000000 - 1)
-    if f is not None:
-        return 'fail'
+    assert f is None
     f = lyr.GetNextFeature()
-    if f is not None:
-        return 'fail'
+    assert f is None
 
     f = lyr.GetFeature(16384)
-    if f is None:
-        return 'fail'
+    assert f is not None
 
     return 'success'
 
@@ -1361,8 +1249,7 @@ def test_ogr_openfilegdb_17():
     ds = ogr.Open('data/multilinestringzm_with_dummy_m_array.gdb.zip')
     lyr = ds.GetLayer(0)
     f = lyr.GetNextFeature()
-    if f.GetGeometryRef() is None:
-        return 'fail'
+    assert f.GetGeometryRef() is not None
 
     return 'success'
 
@@ -1380,8 +1267,7 @@ def test_ogr_openfilegdb_18():
         f_ref = lyr_ref.GetNextFeature()
         if ogrtest.check_feature_geometry(f, f_ref.GetGeometryRef()) != 0:
             print(f.GetGeometryRef().ExportToWkt())
-            print(f_ref.GetGeometryRef().ExportToWkt())
-            return 'fail'
+            pytest.fail(f_ref.GetGeometryRef().ExportToWkt())
 
     lyr = ds.GetLayerByName('polygon')
     ds_ref = ogr.Open('data/curves_polygon.csv')
@@ -1390,8 +1276,7 @@ def test_ogr_openfilegdb_18():
         f_ref = lyr_ref.GetNextFeature()
         if ogrtest.check_feature_geometry(f, f_ref.GetGeometryRef()) != 0:
             print(f.GetGeometryRef().ExportToWkt())
-            print(f_ref.GetGeometryRef().ExportToWkt())
-            return 'fail'
+            pytest.fail(f_ref.GetGeometryRef().ExportToWkt())
 
     ds = ogr.Open('data/curve_circle_by_center.gdb')
     lyr = ds.GetLayer(0)
@@ -1401,8 +1286,7 @@ def test_ogr_openfilegdb_18():
         f_ref = lyr_ref.GetNextFeature()
         if ogrtest.check_feature_geometry(f, f_ref.GetGeometryRef()) != 0:
             print(f.GetGeometryRef().ExportToWkt())
-            print(f_ref.GetGeometryRef().ExportToWkt())
-            return 'fail'
+            pytest.fail(f_ref.GetGeometryRef().ExportToWkt())
 
     return 'success'
 
@@ -1415,8 +1299,7 @@ def test_ogr_openfilegdb_19():
     os.chdir('data/curves.gdb')
     ds = ogr.Open('.')
     os.chdir('../..')
-    if ds is None:
-        return 'fail'
+    assert ds is not None
 
     return 'success'
 
@@ -1435,8 +1318,7 @@ def test_ogr_openfilegdb_20():
         f_ref = lyr_ref.GetNextFeature()
         if ogrtest.check_feature_geometry(f, f_ref.GetGeometryRef()) != 0:
             print(f.GetGeometryRef().ExportToIsoWkt())
-            print(f_ref.GetGeometryRef().ExportToIsoWkt())
-            return 'fail'
+            pytest.fail(f_ref.GetGeometryRef().ExportToIsoWkt())
 
     ds = ogr.Open('data/filegdb_polygonzm_nan_m_with_curves.gdb')
     lyr = ds.GetLayer(0)
@@ -1446,8 +1328,7 @@ def test_ogr_openfilegdb_20():
         f_ref = lyr_ref.GetNextFeature()
         if ogrtest.check_feature_geometry(f, f_ref.GetGeometryRef()) != 0:
             print(f.GetGeometryRef().ExportToIsoWkt())
-            print(f_ref.GetGeometryRef().ExportToIsoWkt())
-            return 'fail'
+            pytest.fail(f_ref.GetGeometryRef().ExportToIsoWkt())
 
     return 'success'
 
@@ -1459,15 +1340,13 @@ def test_ogr_openfilegdb_21():
 
     ds = ogr.Open('data/curves.gdb')
     sql_lyr = ds.ExecuteSQL('SELECT OBJECTID FROM polygon WHERE OBJECTID = 2')
-    if sql_lyr is None:
-        return 'fail'
+    assert sql_lyr is not None
     f = sql_lyr.GetNextFeature()
     if f.GetFID() != 2:
         f.DumpReadable()
         return 'fail'
     f = sql_lyr.GetNextFeature()
-    if f is not None:
-        return 'fail'
+    assert f is None
     ds.ReleaseResultSet(sql_lyr)
 
     lyr = ds.GetLayerByName('polygon')
diff --git a/autotest/ogr/ogr_osm.py b/autotest/ogr/ogr_osm.py
index 767c0c8c36c0..7eb06d05f675 100755
--- a/autotest/ogr/ogr_osm.py
+++ b/autotest/ogr/ogr_osm.py
@@ -62,19 +62,14 @@ def test_ogr_osm_1(filename='data/test.pbf'):
 
     # Test points
     lyr = ds.GetLayer('points')
-    if lyr.GetGeomType() != ogr.wkbPoint:
-        return 'fail'
+    assert lyr.GetGeomType() == ogr.wkbPoint
 
     sr = lyr.GetSpatialRef()
-    if sr.ExportToWkt().find('GEOGCS["WGS 84",DATUM["WGS_1984",') != 0 and \
-       sr.ExportToWkt().find('GEOGCS["GCS_WGS_1984",DATUM["WGS_1984"') != 0:
-        print(sr.ExportToWkt())
-        return 'fail'
+    assert (sr.ExportToWkt().find('GEOGCS["WGS 84",DATUM["WGS_1984",') == 0 or \
+       sr.ExportToWkt().find('GEOGCS["GCS_WGS_1984",DATUM["WGS_1984"') == 0)
 
     if filename == 'data/test.osm':
-        if lyr.GetExtent() != (2.0, 3.0, 49.0, 50.0):
-            print(lyr.GetExtent())
-            return 'fail'
+        assert lyr.GetExtent() == (2.0, 3.0, 49.0, 50.0)
 
     feat = lyr.GetNextFeature()
     if feat.GetFieldAsString('osm_id') != '3' or \
@@ -94,8 +89,7 @@ def test_ogr_osm_1(filename='data/test.pbf'):
 
     # Test lines
     lyr = ds.GetLayer('lines')
-    if lyr.GetGeomType() != ogr.wkbLineString:
-        return 'fail'
+    assert lyr.GetGeomType() == ogr.wkbLineString
 
     feat = lyr.GetNextFeature()
     if feat.GetFieldAsString('osm_id') != '1' or \
@@ -126,11 +120,9 @@ def test_ogr_osm_1(filename='data/test.pbf'):
     # Test multipolygons
     lyr = ds.GetLayer('multipolygons')
     if filename == 'tmp/ogr_osm_3':
-        if lyr.GetGeomType() != ogr.wkbPolygon:
-            return 'fail'
+        assert lyr.GetGeomType() == ogr.wkbPolygon
     else:
-        if lyr.GetGeomType() != ogr.wkbMultiPolygon:
-            return 'fail'
+        assert lyr.GetGeomType() == ogr.wkbMultiPolygon
 
     feat = lyr.GetNextFeature()
     if feat.GetFieldAsString('osm_id') != '1' or \
@@ -169,11 +161,9 @@ def test_ogr_osm_1(filename='data/test.pbf'):
     # Test multilinestrings
     lyr = ds.GetLayer('multilinestrings')
     if filename == 'tmp/ogr_osm_3':
-        if lyr.GetGeomType() != ogr.wkbLineString:
-            return 'fail'
+        assert lyr.GetGeomType() == ogr.wkbLineString
     else:
-        if lyr.GetGeomType() != ogr.wkbMultiLineString:
-            return 'fail'
+        assert lyr.GetGeomType() == ogr.wkbMultiLineString
 
     feat = lyr.GetNextFeature()
     if feat.GetFieldAsString('osm_id') != '3' or \
@@ -198,11 +188,9 @@ def test_ogr_osm_1(filename='data/test.pbf'):
     # Test other_relations
     lyr = ds.GetLayer('other_relations')
     if filename == 'tmp/ogr_osm_3':
-        if lyr is not None:
-            return 'fail'
+        assert lyr is None
     else:
-        if lyr.GetGeomType() != ogr.wkbGeometryCollection:
-            return 'fail'
+        assert lyr.GetGeomType() == ogr.wkbGeometryCollection
 
         feat = lyr.GetNextFeature()
         if feat.GetFieldAsString('osm_id') != '4' or \
@@ -221,18 +209,14 @@ def test_ogr_osm_1(filename='data/test.pbf'):
 
     if ds.GetDriver().GetName() == 'OSM':
         sql_lyr = ds.ExecuteSQL("GetBytesRead()")
-        if sql_lyr is None:
-            return 'fail'
+        assert sql_lyr is not None
         feat = sql_lyr.GetNextFeature()
-        if feat is None:
-            return 'fail'
+        assert feat is not None
         feat = sql_lyr.GetNextFeature()
-        if feat is not None:
-            return 'fail'
+        assert feat is None
         sql_lyr.ResetReading()
         feat = sql_lyr.GetNextFeature()
-        if feat is None:
-            return 'fail'
+        assert feat is not None
         sql_lyr.GetLayerDefn()
         sql_lyr.TestCapability("foo")
         ds.ReleaseResultSet(sql_lyr)
@@ -315,8 +299,7 @@ def test_ogr_osm_4():
         return 'skip'
 
     ds = ogr.Open('data/test.pbf')
-    if ds is None:
-        return 'fail'
+    assert ds is not None
 
     sql_lyr = ds.ExecuteSQL('SELECT * FROM points')
 
@@ -325,8 +308,7 @@ def test_ogr_osm_4():
 
     ds.ReleaseResultSet(sql_lyr)
 
-    if is_none:
-        return 'fail'
+    assert not is_none
 
     # Test spatial filter
 
@@ -334,9 +316,7 @@ def test_ogr_osm_4():
     lyr.SetSpatialFilterRect(0, 0, 0, 0)
     lyr.ResetReading()
     feat = lyr.GetNextFeature()
-    if feat is not None:
-        gdaltest.post_reason('Zero filter ')
-        return 'fail'
+    assert feat is None, 'Zero filter '
 
     with gdaltest.error_handler():
         lyr.SetSpatialFilter(None)
@@ -349,8 +329,7 @@ def test_ogr_osm_4():
 
         ds.ReleaseResultSet(sql_lyr)
 
-    if is_none:
-        return 'fail'
+    assert not is_none
 
     # Change layer
     sql_lyr = ds.ExecuteSQL('SELECT * FROM points')
@@ -360,8 +339,7 @@ def test_ogr_osm_4():
 
     ds.ReleaseResultSet(sql_lyr)
 
-    if is_none:
-        return 'fail'
+    assert not is_none
 
     return 'success'
 
@@ -375,8 +353,7 @@ def test_ogr_osm_5():
         return 'skip'
 
     ds = ogr.Open('data/test.pbf')
-    if ds is None:
-        return 'fail'
+    assert ds is not None
 
     tests = [['points', '3', True],
              ['points', 'foo', False],
@@ -394,9 +371,7 @@ def test_ogr_osm_5():
         feat = None
         ds.ReleaseResultSet(sql_lyr)
 
-        if not (test[2] ^ is_none):  # pylint: disable=superfluous-parens
-            print(test)
-            return 'fail'
+        assert (test[2] ^ is_none)
 
     sql_lyr = ds.ExecuteSQL("select * from multipolygons where type = 'multipolygon'")
     feat = sql_lyr.GetNextFeature()
@@ -404,9 +379,7 @@ def test_ogr_osm_5():
     feat = None
     ds.ReleaseResultSet(sql_lyr)
 
-    if is_none:
-        print(test)
-        return 'fail'
+    assert not is_none, test
 
     return 'success'
 
@@ -438,9 +411,7 @@ def test_ogr_osm_6():
 
     ogr.GetDriverByName('ESRI Shapefile').DeleteDataSource('tmp/ogr_osm_6')
 
-    if count != 3:
-        print(count)
-        return 'fail'
+    assert count == 3
 
     return 'success'
 
@@ -455,8 +426,7 @@ def test_ogr_osm_7():
         return 'skip'
 
     ds = ogr.Open('data/test.pbf')
-    if ds is None:
-        return 'fail'
+    assert ds is not None
 
     sql_lyr = ds.ExecuteSQL('SELECT * FROM points LIMIT 10', dialect='SQLite')
     if sql_lyr is None and gdal.GetLastErrorMsg().find('automatic extension loading failed') != 0:
@@ -464,8 +434,7 @@ def test_ogr_osm_7():
     count = sql_lyr.GetFeatureCount()
     ds.ReleaseResultSet(sql_lyr)
 
-    if count != 1:
-        return 'fail'
+    assert count == 1
 
     return 'success'
 
@@ -479,8 +448,7 @@ def test_ogr_osm_8():
         return 'skip'
 
     ds = ogr.Open('data/base-64.osm.pbf')
-    if ds is None:
-        return 'fail'
+    assert ds is not None
 
     lyr = ds.GetLayerByName('points')
     lyr.SetAttributeFilter("osm_id = '4294967934'")
@@ -527,16 +495,14 @@ def test_ogr_osm_10():
 
     # A file that does not exist.
     ds = ogr.Open('/nonexistent/foo.osm')
-    if ds is not None:
-        return 'fail'
+    assert ds is None
 
     # Empty .osm file
     f = gdal.VSIFOpenL('/vsimem/foo.osm', 'wb')
     gdal.VSIFCloseL(f)
 
     ds = ogr.Open('/vsimem/foo.osm')
-    if ds is not None:
-        return 'fail'
+    assert ds is None
 
     gdal.Unlink('/vsimem/foo.osm')
 
@@ -545,8 +511,7 @@ def test_ogr_osm_10():
     gdal.VSIFCloseL(f)
 
     ds = ogr.Open('/vsimem/foo.pbf')
-    if ds is not None:
-        return 'fail'
+    assert ds is None
 
     gdal.Unlink('/vsimem/foo.pbf')
 
@@ -563,8 +528,7 @@ def test_ogr_osm_10():
         gdal.PushErrorHandler('CPLQuietErrorHandler')
         feat = lyr.GetNextFeature()
         gdal.PopErrorHandler()
-        if gdal.GetLastErrorMsg() == '':
-            return 'fail'
+        assert gdal.GetLastErrorMsg() != ''
         ds = None
 
         gdal.Unlink('/vsimem/foo.osm')
@@ -581,8 +545,7 @@ def test_ogr_osm_10():
     gdal.PushErrorHandler('CPLQuietErrorHandler')
     feat = lyr.GetNextFeature()
     gdal.PopErrorHandler()
-    if gdal.GetLastErrorMsg() == '':
-        return 'fail'
+    assert gdal.GetLastErrorMsg() != ''
     ds = None
 
     gdal.Unlink('/vsimem/foo.pbf')
@@ -595,8 +558,7 @@ def test_ogr_osm_10():
         gdal.PushErrorHandler('CPLQuietErrorHandler')
         feat = lyr.GetNextFeature()
         gdal.PopErrorHandler()
-        if feat is not None or gdal.GetLastErrorMsg() == '':
-            return 'fail'
+        assert feat is None and gdal.GetLastErrorMsg() != ''
 
     return 'success'
 
@@ -649,9 +611,7 @@ def test_ogr_osm_12():
         while feat is not None:
             count = count + 1
             feat = lay.GetNextFeature()
-        if i == 1 and count != 1:
-            print(count)
-            return 'fail'
+        assert i != 1 or count == 1
     ds = None
 
     return 'success'
@@ -765,21 +725,16 @@ def test_ogr_osm_15():
 
     ds = gdal.OpenEx('data/test.pbf')
 
-    if ds.TestCapability(ogr.ODsCRandomLayerRead) != 1:
-        return 'fail'
+    assert ds.TestCapability(ogr.ODsCRandomLayerRead) == 1
 
     count = 0
     last_pct = 0
     while True:
         f, l, pct = ds.GetNextFeature(include_pct=True)
-        if pct < last_pct:
-            print(last_pct)
-            print(pct)
-            return 'fail'
+        assert pct >= last_pct
         last_pct = pct
         if f is None:
-            if l is not None:
-                return 'fail'
+            assert l is None
             break
         # f.DumpReadable()
         count += 1
@@ -788,39 +743,28 @@ def test_ogr_osm_15():
             print(l.GetName())
             return 'fail'
 
-    if count != 8:
-        print(count)
-        return 'fail'
+    assert count == 8
 
-    if last_pct != 1.0:
-        print(last_pct)
-        return 'fail'
+    assert last_pct == 1.0
 
     f, l, pct = ds.GetNextFeature(include_pct=True)
-    if f is not None or l is not None or pct != 1.0:
-        return 'fail'
+    assert f is None and l is None and pct == 1.0
 
     ds.ResetReading()
     for i in range(count):
         f, lyr = ds.GetNextFeature()
         # f.DumpReadable()
-        if f is None or lyr is None:
-            print(i)
-            return 'fail'
+        assert not (f is None or lyr is None), i
 
     ds.ResetReading()
     f, lyr = ds.GetNextFeature(callback=ogr_osm_15_progresscbk_return_false)
-    if f is not None or lyr is not None:
-        return 'fail'
+    assert f is None and lyr is None
 
     ds.ResetReading()
     pct_array = [0]
     f, lyr = ds.GetNextFeature(callback=ogr_osm_15_progresscbk_return_true, callback_data=pct_array)
-    if f is None or lyr is None:
-        return 'fail'
-    if pct_array[0] != 1.0:
-        print(pct_array)
-        return 'fail'
+    assert not (f is None or lyr is None)
+    assert pct_array[0] == 1.0
 
     # ds = gdal.OpenEx('/home/even/gdal/data/osm/france.osm.pbf')
     # ds.ExecuteSQL('SET interest_layers = relations')
@@ -890,9 +834,7 @@ def test_ogr_osm_17():
 
     ogr.GetDriverByName('ESRI Shapefile').DeleteDataSource('/vsimem/ogr_osm_17')
 
-    if layer_count != 4:
-        print(layer_count)
-        return 'fail'
+    assert layer_count == 4
 
     return 'success'
 
@@ -913,9 +855,7 @@ def test_ogr_osm_18():
         count += 1
     ds = None
 
-    if count != 2:
-        print(count)
-        return 'fail'
+    assert count == 2
 
     return 'success'
 
diff --git a/autotest/ogr/ogr_pcidsk.py b/autotest/ogr/ogr_pcidsk.py
index ff2ca3a16c97..d703dc17846d 100755
--- a/autotest/ogr/ogr_pcidsk.py
+++ b/autotest/ogr/ogr_pcidsk.py
@@ -62,8 +62,7 @@ def test_ogr_pcidsk_1():
 
     lyr.ResetReading()
     feat = lyr.GetNextFeature()
-    if feat is None:
-        return 'fail'
+    assert feat is not None
 
     lyr = ds.CreateLayer('fields', geom_type=ogr.wkbNone)
     lyr.CreateField(ogr.FieldDefn('strfield', ogr.OFTString))
@@ -82,24 +81,18 @@ def test_ogr_pcidsk_1():
     feat.SetField(0, 'bar')
     lyr.CreateFeature(feat)
 
-    if lyr.GetFeatureCount() != 2:
-        return 'fail'
+    assert lyr.GetFeatureCount() == 2
 
     lyr.DeleteFeature(1)
 
-    if lyr.GetFeatureCount() != 1:
-        return 'fail'
+    assert lyr.GetFeatureCount() == 1
 
     lyr.ResetReading()
     feat = lyr.GetNextFeature()
-    if feat is None:
-        return 'fail'
-    if feat.GetField(0) != 'foo':
-        return 'fail'
-    if feat.GetField(1) != 1:
-        return 'fail'
-    if feat.GetField(2) != 3.45:
-        return 'fail'
+    assert feat is not None
+    assert feat.GetField(0) == 'foo'
+    assert feat.GetField(1) == 1
+    assert feat.GetField(2) == 3.45
 
     for (wkt, layername, epsgcode) in wkts:
         geom = ogr.CreateGeometryFromWkt(wkt)
@@ -115,9 +108,7 @@ def test_ogr_pcidsk_1():
 
         lyr.ResetReading()
         feat = lyr.GetNextFeature()
-        if feat is None:
-            print(layername)
-            return 'fail'
+        assert feat is not None, layername
         if feat.GetGeometryRef().ExportToWkt() != wkt:
             feat.DumpReadable()
             print(layername)
@@ -138,48 +129,33 @@ def test_ogr_pcidsk_2():
         return 'skip'
 
     ds = ogr.Open('tmp/ogr_pcidsk_1.pix')
-    if ds.GetLayerCount() != 2 + len(wkts):
-        return 'fail'
+    assert ds.GetLayerCount() == 2 + len(wkts)
 
     lyr = ds.GetLayerByName('nothing')
-    if lyr.GetGeomType() != ogr.wkbNone:
-        return 'fail'
+    assert lyr.GetGeomType() == ogr.wkbNone
     feat = lyr.GetNextFeature()
-    if feat is None:
-        return 'fail'
+    assert feat is not None
 
     lyr = ds.GetLayerByName('fields')
     feat = lyr.GetNextFeature()
-    if feat is None:
-        return 'fail'
-    if feat.GetField(0) != 'foo':
-        return 'fail'
-    if feat.GetField(1) != 1:
-        return 'fail'
-    if feat.GetField(2) != 3.45:
-        return 'fail'
+    assert feat is not None
+    assert feat.GetField(0) == 'foo'
+    assert feat.GetField(1) == 1
+    assert feat.GetField(2) == 3.45
 
     for (wkt, layername, epsgcode) in wkts:
         geom = ogr.CreateGeometryFromWkt(wkt)
         lyr = ds.GetLayerByName(layername)
-        if lyr.GetGeomType() != geom.GetGeometryType():
-            print(layername)
-            return 'fail'
+        assert lyr.GetGeomType() == geom.GetGeometryType(), layername
 
         srs = lyr.GetSpatialRef()
         if epsgcode != 0:
             ref_srs = osr.SpatialReference()
             ref_srs.ImportFromEPSG(epsgcode)
-            if srs is None or ref_srs.IsSame(srs) != 1:
-                print(layername)
-                print(ref_srs)
-                print(srs)
-                return 'fail'
+            assert srs is not None and ref_srs.IsSame(srs) == 1, layername
 
         feat = lyr.GetNextFeature()
-        if feat is None:
-            print(layername)
-            return 'fail'
+        assert feat is not None, layername
         if feat.GetGeometryRef().ExportToWkt() != wkt:
             feat.DumpReadable()
             print(layername)
@@ -232,8 +208,7 @@ def test_ogr_pcidsk_4():
         return 'skip'
 
     ds = ogr.Open('../gdrivers/data/utm.pix')
-    if ds is not None:
-        return 'fail'
+    assert ds is None
     ds = None
 
     return 'success'
@@ -251,8 +226,7 @@ def test_ogr_pcidsk_5():
         return 'skip'
 
     ds = ogr.Open('../gdrivers/data/utm.pix', update=1)
-    if ds is None:
-        return 'fail'
+    assert ds is not None
     ds = None
 
     return 'success'
@@ -274,8 +248,7 @@ def test_ogr_pcidsk_add_field_to_non_empty_layer():
     lyr.CreateFeature(f)
     f = None
     with gdaltest.error_handler():
-        if lyr.CreateField(ogr.FieldDefn('bar', ogr.OFTString)) == 0:
-            return 'fail'
+        assert lyr.CreateField(ogr.FieldDefn('bar', ogr.OFTString)) != 0
     f = ogr.Feature(lyr.GetLayerDefn())
     f['foo'] = 'bar2'
     lyr.CreateFeature(f)
@@ -299,8 +272,7 @@ def test_ogr_pcidsk_too_many_layers():
     for i in range(1023):
         ds.CreateLayer('foo%d' % i)
     with gdaltest.error_handler():
-        if ds.CreateLayer('foo') is not None:
-            return 'fail'
+        assert ds.CreateLayer('foo') is None
     ds = None
 
     ogr.GetDriverByName('PCIDSK').DeleteDataSource(tmpfile)
@@ -320,16 +292,13 @@ def test_ogr_pcidsk_online_1():
         return 'skip'
 
     ds = ogr.Open('tmp/cache/polygon.pix')
-    if ds is None:
-        return 'fail'
+    assert ds is not None
 
     lyr = ds.GetLayer(0)
-    if lyr is None:
-        return 'fail'
+    assert lyr is not None
 
     feat = lyr.GetNextFeature()
-    if feat is None:
-        return 'fail'
+    assert feat is not None
 
     geom = 'POLYGON ((479819.84375 4765180.5 0,479690.1875 4765259.5 0,479647.0 4765369.5 0,479730.375 4765400.5 0,480039.03125 4765539.5 0,480035.34375 4765558.5 0,480159.78125 4765610.5 0,480202.28125 4765482.0 0,480365.0 4765015.5 0,480389.6875 4764950.0 0,480133.96875 4764856.5 0,480080.28125 4764979.5 0,480082.96875 4765049.5 0,480088.8125 4765139.5 0,480059.90625 4765239.5 0,480019.71875 4765319.5 0,479980.21875 4765409.5 0,479909.875 4765370.0 0,479859.875 4765270.0 0,479819.84375 4765180.5 0))'
     if ogrtest.check_feature_geometry(feat, geom) != 0:
@@ -356,9 +325,7 @@ def test_ogr_pcidsk_online_2():
 
     ret = gdaltest.runexternal(test_cli_utilities.get_test_ogrsf_path() + ' -ro tmp/cache/polygon.pix')
 
-    if ret.find('INFO') == -1 or ret.find('ERROR') != -1:
-        print(ret)
-        return 'fail'
+    assert ret.find('INFO') != -1 and ret.find('ERROR') == -1
 
     return 'success'
 
diff --git a/autotest/ogr/ogr_pdf.py b/autotest/ogr/ogr_pdf.py
index 38c6833b147c..c8f48de40cd9 100755
--- a/autotest/ogr/ogr_pdf.py
+++ b/autotest/ogr/ogr_pdf.py
@@ -119,9 +119,8 @@ def test_ogr_pdf_1(name='tmp/ogr_pdf_1.pdf', write_attributes='YES'):
 
     with open(name, 'rb') as f:
         data = f.read(8192)
-        if wantedstream.encode('utf-8') not in data:
-            gdaltest.post_reason('Wrong text data in written PDF stream')
-            return 'fail'
+        assert wantedstream.encode('utf-8') in data, \
+            'Wrong text data in written PDF stream'
 
     return 'success'
 
@@ -135,23 +134,17 @@ def test_ogr_pdf_2(name='tmp/ogr_pdf_1.pdf', has_attributes=True):
         return 'skip'
 
     ds = ogr.Open(name)
-    if ds is None:
-        return 'fail'
+    assert ds is not None
 
     lyr = ds.GetLayerByName('first_layer')
-    if lyr is None:
-        return 'fail'
+    assert lyr is not None
 
     if has_attributes:
-        if lyr.GetLayerDefn().GetFieldDefn(lyr.GetLayerDefn().GetFieldIndex('strfield')).GetType() != ogr.OFTString:
-            return 'fail'
-        if lyr.GetLayerDefn().GetFieldDefn(lyr.GetLayerDefn().GetFieldIndex('intfield')).GetType() != ogr.OFTInteger:
-            return 'fail'
-        if lyr.GetLayerDefn().GetFieldDefn(lyr.GetLayerDefn().GetFieldIndex('realfield')).GetType() != ogr.OFTReal:
-            return 'fail'
+        assert lyr.GetLayerDefn().GetFieldDefn(lyr.GetLayerDefn().GetFieldIndex('strfield')).GetType() == ogr.OFTString
+        assert lyr.GetLayerDefn().GetFieldDefn(lyr.GetLayerDefn().GetFieldIndex('intfield')).GetType() == ogr.OFTInteger
+        assert lyr.GetLayerDefn().GetFieldDefn(lyr.GetLayerDefn().GetFieldIndex('realfield')).GetType() == ogr.OFTReal
     else:
-        if lyr.GetLayerDefn().GetFieldCount() != 0:
-            return 'fail'
+        assert lyr.GetLayerDefn().GetFieldCount() == 0
 
     if has_attributes:
         feat = lyr.GetNextFeature()
@@ -249,13 +242,11 @@ def test_ogr_pdf_5():
 
     with gdaltest.config_option('OGR_PDF_READ_NON_STRUCTURED', 'YES'):
         ds = ogr.Open('data/drawing.pdf')
-    if ds is None:
-        return 'fail'
+    assert ds is not None
 
     # Note: the circle is wrongly drawned as a diamond
     lyr = ds.GetLayer(0)
-    if lyr.GetFeatureCount() != 8:
-        return 'fail'
+    assert lyr.GetFeatureCount() == 8
 
     return 'success'
 
@@ -286,29 +277,23 @@ def test_ogr_pdf_online_1():
     ]
 
     ds = ogr.Open('tmp/cache/webmap_urbansample.pdf')
-    if ds is None:
-        return 'fail'
+    assert ds is not None
 
-    if ds.GetLayerCount() != len(expected_layers):
-        print(ds.GetLayerCount())
-        return 'fail'
+    assert ds.GetLayerCount() == len(expected_layers)
 
     for i in range(ds.GetLayerCount()):
-        if ds.GetLayer(i).GetName() != expected_layers[i][0]:
-            print('%d : %s' % (i, ds.GetLayer(i).GetName()))
-            return 'fail'
+        assert ds.GetLayer(i).GetName() == expected_layers[i][0], \
+            ('%d : %s' % (i, ds.GetLayer(i).GetName()))
 
-        if ds.GetLayer(i).GetGeomType() != expected_layers[i][1]:
-            print('%d : %d' % (i, ds.GetLayer(i).GetGeomType()))
-            return 'fail'
+        assert ds.GetLayer(i).GetGeomType() == expected_layers[i][1], \
+            ('%d : %d' % (i, ds.GetLayer(i).GetGeomType()))
 
     lyr = ds.GetLayerByName('Water Points')
     feat = lyr.GetNextFeature()
     if ogrtest.check_feature_geometry(feat, ogr.CreateGeometryFromWkt('POINT (724431.316665166523308 7672947.212302438914776)')) != 0:
         feat.DumpReadable()
         return 'fail'
-    if feat.GetField('ID') != 'VL46':
-        return 'fail'
+    assert feat.GetField('ID') == 'VL46'
 
     return 'success'
 
@@ -362,8 +347,7 @@ def test_ogr_pdf_online_2():
     ]
 
     ds = ogr.Open('tmp/cache/340711752_Azusa_FSTopo.pdf')
-    if ds is None:
-        return 'fail'
+    assert ds is not None
 
     if ds.GetLayerCount() != len(expected_layers):
         print(ds.GetLayerCount())
@@ -372,13 +356,11 @@ def test_ogr_pdf_online_2():
         return 'fail'
 
     for i in range(ds.GetLayerCount()):
-        if ds.GetLayer(i).GetName() != expected_layers[i][0]:
-            print('%d : %s' % (i, ds.GetLayer(i).GetName()))
-            return 'fail'
+        assert ds.GetLayer(i).GetName() == expected_layers[i][0], \
+            ('%d : %s' % (i, ds.GetLayer(i).GetName()))
 
-        if ds.GetLayer(i).GetGeomType() != expected_layers[i][1]:
-            print('%d : %d' % (i, ds.GetLayer(i).GetGeomType()))
-            return 'fail'
+        assert ds.GetLayer(i).GetGeomType() == expected_layers[i][1], \
+            ('%d : %d' % (i, ds.GetLayer(i).GetGeomType()))
 
     return 'success'
 
diff --git a/autotest/ogr/ogr_pds.py b/autotest/ogr/ogr_pds.py
index da3d2f486588..a1713add3352 100755
--- a/autotest/ogr/ogr_pds.py
+++ b/autotest/ogr/ogr_pds.py
@@ -34,6 +34,7 @@
 import gdaltest
 import ogrtest
 from osgeo import ogr
+import pytest
 
 ###############################################################################
 # Basic test
@@ -42,18 +43,12 @@
 def test_ogr_pds_1():
 
     ds = ogr.Open('data/ap01578l.lbl')
-    if ds is None:
-        gdaltest.post_reason('cannot open dataset')
-        return 'fail'
+    assert ds is not None, 'cannot open dataset'
 
     lyr = ds.GetLayerByName('RAMAPPING')
-    if lyr is None:
-        gdaltest.post_reason('cannot find layer')
-        return 'fail'
+    assert lyr is not None, 'cannot find layer'
 
-    if lyr.GetFeatureCount() != 74786:
-        gdaltest.post_reason('did not get expected feature count')
-        return 'fail'
+    assert lyr.GetFeatureCount() == 74786, 'did not get expected feature count'
 
     with gdaltest.error_handler():
         feat = lyr.GetNextFeature()
@@ -64,8 +59,7 @@ def test_ogr_pds_1():
     if ogrtest.check_feature_geometry(feat, 'POINT (146.1325 -55.648)',
                                       max_error=0.000000001) != 0:
         print('did not get expected geom')
-        print(geom.ExportToWkt())
-        return 'fail'
+        pytest.fail(geom.ExportToWkt())
 
     with gdaltest.error_handler():
         feat = lyr.GetFeature(1)
diff --git a/autotest/ogr/ogr_pg.py b/autotest/ogr/ogr_pg.py
index b478398bec68..f4f2a9886c59 100755
--- a/autotest/ogr/ogr_pg.py
+++ b/autotest/ogr/ogr_pg.py
@@ -183,36 +183,24 @@ def test_ogr_pg_2(with_and_without_postgis):
     # Check capabilities
 
     if gdaltest.pg_has_postgis:
-        if not gdaltest.pg_lyr.TestCapability(ogr.OLCFastSpatialFilter):
-            return 'fail'
-        if not gdaltest.pg_lyr.TestCapability(ogr.OLCFastGetExtent):
-            return 'fail'
+        assert gdaltest.pg_lyr.TestCapability(ogr.OLCFastSpatialFilter)
+        assert gdaltest.pg_lyr.TestCapability(ogr.OLCFastGetExtent)
     else:
-        if gdaltest.pg_lyr.TestCapability(ogr.OLCFastSpatialFilter):
-            return 'fail'
-        if gdaltest.pg_lyr.TestCapability(ogr.OLCFastGetExtent):
-            return 'fail'
+        assert not gdaltest.pg_lyr.TestCapability(ogr.OLCFastSpatialFilter)
+        assert not gdaltest.pg_lyr.TestCapability(ogr.OLCFastGetExtent)
 
-    if not gdaltest.pg_lyr.TestCapability(ogr.OLCRandomRead):
-        return 'fail'
-    if not gdaltest.pg_lyr.TestCapability(ogr.OLCFastFeatureCount):
-        return 'fail'
-    if not gdaltest.pg_lyr.TestCapability(ogr.OLCFastSetNextByIndex):
-        return 'fail'
+    assert gdaltest.pg_lyr.TestCapability(ogr.OLCRandomRead)
+    assert gdaltest.pg_lyr.TestCapability(ogr.OLCFastFeatureCount)
+    assert gdaltest.pg_lyr.TestCapability(ogr.OLCFastSetNextByIndex)
     try:
         ogr.OLCStringsAsUTF8
-        if not gdaltest.pg_lyr.TestCapability(ogr.OLCStringsAsUTF8):
-            return 'fail'
+        assert gdaltest.pg_lyr.TestCapability(ogr.OLCStringsAsUTF8)
     except:
         pass
-    if not gdaltest.pg_lyr.TestCapability(ogr.OLCSequentialWrite):
-        return 'fail'
-    if not gdaltest.pg_lyr.TestCapability(ogr.OLCCreateField):
-        return 'fail'
-    if not gdaltest.pg_lyr.TestCapability(ogr.OLCRandomWrite):
-        return 'fail'
-    if not gdaltest.pg_lyr.TestCapability(ogr.OLCTransactions):
-        return 'fail'
+    assert gdaltest.pg_lyr.TestCapability(ogr.OLCSequentialWrite)
+    assert gdaltest.pg_lyr.TestCapability(ogr.OLCCreateField)
+    assert gdaltest.pg_lyr.TestCapability(ogr.OLCRandomWrite)
+    assert gdaltest.pg_lyr.TestCapability(ogr.OLCTransactions)
 
     ######################################################
     # Setup Schema
@@ -244,9 +232,8 @@ def test_ogr_pg_2(with_and_without_postgis):
         gdaltest.pg_lyr.CreateFeature(dst_feat)
         if gdaltest.pg_retrieve_fid:
             got_fid = dst_feat.GetFID()
-            if got_fid != expected_fid:
-                gdaltest.post_reason("didn't get expected fid : %d instead of %d" % (got_fid, expected_fid))
-                return 'fail'
+            assert got_fid == expected_fid, \
+                ("didn't get expected fid : %d instead of %d" % (got_fid, expected_fid))
 
         expected_fid = expected_fid + 1
 
@@ -267,9 +254,7 @@ def test_ogr_pg_19(with_and_without_postgis):
         return 'skip'
 
     layer = gdaltest.pg_ds.GetLayerByName('tpoly')
-    if layer is None:
-        gdaltest.post_reason('did not get tpoly layer')
-        return 'fail'
+    assert layer is not None, 'did not get tpoly layer'
 
     extent = layer.GetExtent()
     expect = (478315.53125, 481645.3125, 4762880.5, 4765610.5)
@@ -280,23 +265,20 @@ def test_ogr_pg_19(with_and_without_postgis):
     maxy = abs(extent[3] - expect[3])
 
     if max(minx, maxx, miny, maxy) > 0.0001:
-        gdaltest.post_reason('Extents do not match')
         print(extent)
-        return 'fail'
+        pytest.fail('Extents do not match')
 
     estimated_extent = layer.GetExtent(force=0)
     if not gdaltest.pg_has_postgis:
         # The OGRLayer default implementation in force = 0 returns error
         if estimated_extent != (0, 0, 0, 0):
-            gdaltest.post_reason('Wrong estimated extent')
             print(extent)
-            return 'fail'
+            pytest.fail('Wrong estimated extent')
     else:
         # Better testing needed ?
         if estimated_extent == (0, 0, 0, 0):
-            gdaltest.post_reason('Wrong estimated extent')
             print(extent)
-            return 'fail'
+            pytest.fail('Wrong estimated extent')
 
     return 'success'
 
@@ -319,9 +301,7 @@ def test_ogr_pg_19_2(with_and_without_postgis):
     miny = abs(extent[2] - expect[2])
     maxy = abs(extent[3] - expect[3])
 
-    if max(minx, maxx, miny, maxy) > 0.0001:
-        gdaltest.post_reason('Extents do not match')
-        return 'fail'
+    assert max(minx, maxx, miny, maxy) <= 0.0001, 'Extents do not match'
 
     gdaltest.pg_ds.ReleaseResultSet(sql_lyr)
 
@@ -334,9 +314,7 @@ def test_ogr_pg_3(with_and_without_postgis):
     if gdaltest.pg_ds is None:
         return 'skip'
 
-    if gdaltest.pg_lyr.GetFeatureCount() != 10:
-        gdaltest.post_reason('GetFeatureCount() returned %d instead of 10' % gdaltest.pg_lyr.GetFeatureCount())
-        return 'fail'
+    assert gdaltest.pg_lyr.GetFeatureCount() == 10
 
     expect = [168, 169, 166, 158, 165]
 
@@ -344,9 +322,7 @@ def test_ogr_pg_3(with_and_without_postgis):
     tr = ogrtest.check_features_against_list(gdaltest.pg_lyr,
                                              'eas_id', expect)
 
-    if gdaltest.pg_lyr.GetFeatureCount() != 5:
-        gdaltest.post_reason('GetFeatureCount() returned %d instead of 5' % gdaltest.pg_lyr.GetFeatureCount())
-        return 'fail'
+    assert gdaltest.pg_lyr.GetFeatureCount() == 5
 
     gdaltest.pg_lyr.SetAttributeFilter(None)
 
@@ -354,14 +330,12 @@ def test_ogr_pg_3(with_and_without_postgis):
         orig_feat = gdaltest.poly_feat[i]
         read_feat = gdaltest.pg_lyr.GetNextFeature()
 
-        if ogrtest.check_feature_geometry(read_feat, orig_feat.GetGeometryRef(),
-                                          max_error=0.001) != 0:
-            return 'fail'
+        assert (ogrtest.check_feature_geometry(read_feat, orig_feat.GetGeometryRef(),
+                                          max_error=0.001) == 0)
 
         for fld in range(3):
-            if orig_feat.GetField(fld) != read_feat.GetField(fld):
-                gdaltest.post_reason('Attribute %d does not match' % fld)
-                return 'fail'
+            assert orig_feat.GetField(fld) == read_feat.GetField(fld), \
+                ('Attribute %d does not match' % fld)
 
         read_feat.Destroy()
         orig_feat.Destroy()
@@ -406,8 +380,7 @@ def test_ogr_pg_4(with_and_without_postgis):
         if ogrtest.check_feature_geometry(feat_read, geom) != 0:
             print(item)
             print(wkt)
-            print(geom_read)
-            return 'fail'
+            pytest.fail(geom_read)
 
         feat_read.Destroy()
 
@@ -429,9 +402,7 @@ def test_ogr_pg_5(with_and_without_postgis):
 
     sql_lyr = gdaltest.pg_ds.ExecuteSQL('select distinct eas_id from tpoly order by eas_id desc')
 
-    if sql_lyr.GetFeatureCount() != 11:
-        gdaltest.post_reason('GetFeatureCount() returned %d instead of 11' % sql_lyr.GetFeatureCount())
-        return 'fail'
+    assert sql_lyr.GetFeatureCount() == 11
 
     tr = ogrtest.check_features_against_list(sql_lyr, 'eas_id', expect)
 
@@ -465,13 +436,9 @@ def test_ogr_pg_6(with_and_without_postgis):
     sql_lyr.SetSpatialFilter(geom)
     geom.Destroy()
 
-    if sql_lyr.GetFeatureCount() != 0:
-        gdaltest.post_reason('GetFeatureCount() returned %d instead of 0' % sql_lyr.GetFeatureCount())
-        return 'fail'
+    assert sql_lyr.GetFeatureCount() == 0
 
-    if sql_lyr.GetNextFeature() is not None:
-        gdaltest.post_reason('GetNextFeature() did not return None')
-        return 'fail'
+    assert sql_lyr.GetNextFeature() is None, 'GetNextFeature() did not return None'
 
     gdaltest.pg_ds.ReleaseResultSet(sql_lyr)
 
@@ -493,18 +460,14 @@ def test_ogr_pg_7(with_and_without_postgis):
     gdaltest.pg_lyr.SetSpatialFilter(geom)
     geom.Destroy()
 
-    if gdaltest.pg_lyr.GetFeatureCount() != 1:
-        gdaltest.post_reason('GetFeatureCount() returned %d instead of 1' % gdaltest.pg_lyr.GetFeatureCount())
-        return 'fail'
+    assert gdaltest.pg_lyr.GetFeatureCount() == 1
 
     tr = ogrtest.check_features_against_list(gdaltest.pg_lyr, 'eas_id',
                                              [158])
 
     gdaltest.pg_lyr.SetAttributeFilter('eas_id = 158')
 
-    if gdaltest.pg_lyr.GetFeatureCount() != 1:
-        gdaltest.post_reason('GetFeatureCount() returned %d instead of 1' % gdaltest.pg_lyr.GetFeatureCount())
-        return 'fail'
+    assert gdaltest.pg_lyr.GetFeatureCount() == 1
 
     gdaltest.pg_lyr.SetAttributeFilter(None)
 
@@ -536,14 +499,11 @@ def test_ogr_pg_8(with_and_without_postgis):
     gdaltest.pg_lyr.SetAttributeFilter("PRFEDEA = 'CrazyKey'")
     feat_read = gdaltest.pg_lyr.GetNextFeature()
 
-    if feat_read is None:
-        gdaltest.post_reason('creating crazy feature failed!')
-        return 'fail'
+    assert feat_read is not None, 'creating crazy feature failed!'
 
-    if feat_read.GetField('shortname') != 'Crazy"\'L':
-        gdaltest.post_reason('Vvalue not properly escaped or truncated:' +
+    assert feat_read.GetField('shortname') == 'Crazy"\'L', \
+        ('Vvalue not properly escaped or truncated:' +
                              feat_read.GetField('shortname'))
-        return 'fail'
 
     feat_read.Destroy()
 
@@ -577,20 +537,15 @@ def test_ogr_pg_9(with_and_without_postgis):
     feat.Destroy()
 
     feat = gdaltest.pg_lyr.GetFeature(fid)
-    if feat is None:
-        gdaltest.post_reason('GetFeature(%d) failed.' % fid)
-        return 'fail'
+    assert feat is not None, ('GetFeature(%d) failed.' % fid)
 
     shortname = feat.GetField('SHORTNAME')
-    if shortname[:5] != 'Reset':
-        gdaltest.post_reason('SetFeature() did not update SHORTNAME, got %s.'
+    assert shortname[:5] == 'Reset', ('SetFeature() did not update SHORTNAME, got %s.'
                              % shortname)
-        return 'fail'
 
     if ogrtest.check_feature_geometry(feat, 'POINT(5 6 7)') != 0:
         print(feat.GetGeometryRef())
-        gdaltest.post_reason('Geometry update failed')
-        return 'fail'
+        pytest.fail('Geometry update failed')
 
     feat.SetGeometryDirectly(None)
 
@@ -602,17 +557,13 @@ def test_ogr_pg_9(with_and_without_postgis):
     feat.Destroy()
 
     feat = gdaltest.pg_lyr.GetFeature(fid)
-    if feat.GetGeometryRef() is not None:
-        print(feat.GetGeometryRef())
-        gdaltest.post_reason('Geometry update failed. null geometry expected')
-        return 'fail'
+    assert feat.GetGeometryRef() is None, \
+        'Geometry update failed. null geometry expected'
 
     feat.SetFieldNull('SHORTNAME')
     gdaltest.pg_lyr.SetFeature(feat)
     feat = gdaltest.pg_lyr.GetFeature(fid)
-    if not feat.IsFieldNull('SHORTNAME'):
-        gdaltest.post_reason('SHORTNAME update failed. null value expected')
-        return 'fail'
+    assert feat.IsFieldNull('SHORTNAME'), 'SHORTNAME update failed. null value expected'
 
     # Test updating non-existing feature
     feat.SetFID(-10)
@@ -641,9 +592,7 @@ def test_ogr_pg_10(with_and_without_postgis):
     fid = feat.GetFID()
     feat.Destroy()
 
-    if gdaltest.pg_lyr.DeleteFeature(fid) != 0:
-        gdaltest.post_reason('DeleteFeature() method failed.')
-        return 'fail'
+    assert gdaltest.pg_lyr.DeleteFeature(fid) == 0, 'DeleteFeature() method failed.'
 
     gdaltest.pg_lyr.SetAttributeFilter("PRFEDEA = 'CrazyKey'")
     feat = gdaltest.pg_lyr.GetNextFeature()
@@ -655,9 +604,8 @@ def test_ogr_pg_10(with_and_without_postgis):
         return 'fail'
 
     # Test deleting non-existing feature
-    if gdaltest.pg_lyr.DeleteFeature(-10) != ogr.OGRERR_NON_EXISTING_FEATURE:
-        gdaltest.post_reason('Expected failure of DeleteFeature().')
-        return 'fail'
+    assert gdaltest.pg_lyr.DeleteFeature(-10) == ogr.OGRERR_NON_EXISTING_FEATURE, \
+        'Expected failure of DeleteFeature().'
 
     return 'success'
 
@@ -730,14 +678,12 @@ def test_ogr_pg_12(with_and_without_postgis):
         orig_feat = gdaltest.poly_feat[i]
         read_feat = gdaltest.pgc_lyr.GetNextFeature()
 
-        if ogrtest.check_feature_geometry(read_feat, orig_feat.GetGeometryRef(),
-                                          max_error=0.001) != 0:
-            return 'fail'
+        assert (ogrtest.check_feature_geometry(read_feat, orig_feat.GetGeometryRef(),
+                                          max_error=0.001) == 0)
 
         for fld in range(3):
-            if orig_feat.GetField(fld) != read_feat.GetField(fld):
-                gdaltest.post_reason('Attribute %d does not match' % fld)
-                return 'fail'
+            assert orig_feat.GetField(fld) == read_feat.GetField(fld), \
+                ('Attribute %d does not match' % fld)
 
         read_feat.Destroy()
         orig_feat.Destroy()
@@ -913,13 +859,9 @@ def test_ogr_pg_17(with_and_without_postgis):
     except:
         layer = None
 
-    if layer is not None:
-        gdaltest.post_reason('got layer for non-existent table!')
-        return 'fail'
+    assert layer is None, 'got layer for non-existent table!'
 
-    if count != gdaltest.pg_ds.GetLayerCount():
-        gdaltest.post_reason('layer count changed unexpectedly.')
-        return 'fail'
+    assert count == gdaltest.pg_ds.GetLayerCount(), 'layer count changed unexpectedly.'
 
     return 'success'
 
@@ -934,13 +876,10 @@ def test_ogr_pg_18(with_and_without_postgis):
 
     count = gdaltest.pg_ds.GetLayerCount()
     layer = gdaltest.pg_ds.GetLayerByName('geometry_columns')
-    if layer is None:
-        gdaltest.post_reason('did not get geometry_columns layer')
-        return 'fail'
+    assert layer is not None, 'did not get geometry_columns layer'
 
-    if count + 1 != gdaltest.pg_ds.GetLayerCount():
-        gdaltest.post_reason('layer count unexpectedly unchanged.')
-        return 'fail'
+    assert count + 1 == gdaltest.pg_ds.GetLayerCount(), \
+        'layer count unexpectedly unchanged.'
 
     return 'success'
 
@@ -996,18 +935,14 @@ def test_ogr_pg_20(with_and_without_postgis):
     # We need to re-read layers
     gdaltest.pg_ds.Destroy()
     gdaltest.pg_ds = ogr.Open('PG:' + gdaltest.pg_connection_string, update=1)
-    if gdaltest.pg_ds is None:
-        gdaltest.post_reason('can not re-open datasource')
-        return 'fail'
+    assert gdaltest.pg_ds is not None, 'can not re-open datasource'
 
     #
     # Test reading 4-dim geometries normalized to OGC WKT form.
     #
 
     layer = gdaltest.pg_ds.GetLayerByName('testgeom')
-    if layer is None:
-        gdaltest.post_reason('did not get testgeom layer')
-        return 'fail'
+    assert layer is not None, 'did not get testgeom layer'
 
     # Test updating the geometries
     for i in range(len(geometries)):
@@ -1018,16 +953,13 @@ def test_ogr_pg_20(with_and_without_postgis):
     for i, geoms in enumerate(geometries):
         feat = layer.GetFeature(i)
         geom = feat.GetGeometryRef()
-        if geom is None:
-            gdaltest.post_reason('did not get geometry, expected %s' % geoms[1])
-            return 'fail'
+        assert geom is not None, ('did not get geometry, expected %s' % geoms[1])
         wkt = geom.ExportToIsoWkt()
         feat.Destroy()
         feat = None
 
-        if wkt != geoms[1]:
-            gdaltest.post_reason('WKT do not match: expected %s, got %s' % (geoms[1], wkt))
-            return 'fail'
+        assert wkt == geoms[1], \
+            ('WKT do not match: expected %s, got %s' % (geoms[1], wkt))
 
     layer = None
 
@@ -1043,9 +975,7 @@ def test_ogr_pg_21(with_and_without_postgis):
         return 'skip'
 
     layer = gdaltest.pg_ds.ExecuteSQL("SELECT wkb_geometry FROM testgeom")
-    if layer is None:
-        gdaltest.post_reason('did not get testgeom layer')
-        return 'fail'
+    assert layer is not None, 'did not get testgeom layer'
 
     feat = layer.GetNextFeature()
     while feat is not None:
@@ -1090,23 +1020,19 @@ def test_ogr_pg_21_subgeoms(with_and_without_postgis):
     for i in range(8, 10):
         feat = layer.GetFeature(i)
         geom = feat.GetGeometryRef()
-        if geom is None:
-            gdaltest.post_reason('did not get the expected geometry')
-            return 'fail'
+        assert geom is not None, 'did not get the expected geometry'
         if geom.GetGeometryName() == "POLYHEDRALSURFACE":
             for j in range(0, geom.GetGeometryCount()):
                 sub_geom = geom.GetGeometryRef(j)
                 subgeom_wkt = sub_geom.ExportToIsoWkt()
-                if subgeom_wkt != subgeom_PS[j]:
-                    gdaltest.post_reason('did not get the expected subgeometry, expected %s' % (subgeom_PS[j]))
-                    return 'fail'
+                assert subgeom_wkt == subgeom_PS[j], \
+                    ('did not get the expected subgeometry, expected %s' % (subgeom_PS[j]))
         if geom.GetGeometryName() == "TIN":
             for j in range(0, geom.GetGeometryCount()):
                 sub_geom = geom.GetGeometryRef(j)
                 subgeom_wkt = sub_geom.ExportToIsoWkt()
-                if subgeom_wkt != subgeom_TIN[j]:
-                    gdaltest.post_reason('did not get the expected subgeometry, expected %s' % (subgeom_TIN[j]))
-                    return 'fail'
+                assert subgeom_wkt == subgeom_TIN[j], \
+                    ('did not get the expected subgeometry, expected %s' % (subgeom_TIN[j]))
         feat.Destroy()
         feat = None
 
@@ -1141,14 +1067,10 @@ def test_ogr_pg_21_3d_geometries():
     gdaltest.pg_ds = None
 
     gdaltest.pg_ds = ogr.Open('PG:' + gdaltest.pg_connection_string, update=1)
-    if gdaltest.pg_ds is None:
-        gdaltest.post_reason('Cannot open the dataset')
-        return 'fail'
+    assert gdaltest.pg_ds is not None, 'Cannot open the dataset'
 
     layer = gdaltest.pg_ds.GetLayerByName('zgeoms')
-    if layer is None:
-        gdaltest.post_reason('No layer received')
-        return 'fail'
+    assert layer is not None, 'No layer received'
 
     for i in range(0, 3):
         feat = layer.GetFeature(i)
@@ -1156,9 +1078,8 @@ def test_ogr_pg_21_3d_geometries():
 
         wkt = geom.ExportToIsoWkt()
 
-        if wkt != wkt_expected[i]:
-            gdaltest.post_reason('Unexpected WKT, expected %s and got %s' % (wkt_expected[i], wkt))
-            return 'fail'
+        assert wkt == wkt_expected[i], \
+            ('Unexpected WKT, expected %s and got %s' % (wkt_expected[i], wkt))
 
     gdaltest.pg_ds.ExecuteSQL("DROP TABLE zgeoms")
     return 'success'
@@ -1217,9 +1138,7 @@ def test_ogr_pg_22(with_and_without_postgis):
 
     found = ogr_pg_check_layer_in_list(gdaltest.pg_ds, layer_name)
 
-    if found is False:
-        gdaltest.post_reason('layer from schema \'' + schema_name + '\' not listed')
-        return 'fail'
+    assert found is not False, ('layer from schema \'' + schema_name + '\' not listed')
 
     return 'success'
 
@@ -1322,49 +1241,40 @@ def test_ogr_pg_23(with_and_without_postgis):
 def check_value_23(layer_defn, feat):
 
     field_defn = layer_defn.GetFieldDefn(layer_defn.GetFieldIndex("my_numeric5"))
-    if field_defn.GetWidth() != 5 or field_defn.GetPrecision() != 0 or field_defn.GetType() != ogr.OFTInteger:
-        gdaltest.post_reason('Wrong field defn for my_numeric5 : %d, %d, %d' % (field_defn.GetWidth(), field_defn.GetPrecision(), field_defn.GetType()))
-        return 'fail'
+    assert field_defn.GetWidth() == 5 and field_defn.GetPrecision() == 0 and field_defn.GetType() == ogr.OFTInteger, \
+        ('Wrong field defn for my_numeric5 : %d, %d, %d' % (field_defn.GetWidth(), field_defn.GetPrecision(), field_defn.GetType()))
 
     field_defn = layer_defn.GetFieldDefn(layer_defn.GetFieldIndex("my_numeric5_3"))
-    if field_defn.GetWidth() != 5 or field_defn.GetPrecision() != 3 or field_defn.GetType() != ogr.OFTReal:
-        gdaltest.post_reason('Wrong field defn for my_numeric5_3 : %d, %d, %d' % (field_defn.GetWidth(), field_defn.GetPrecision(), field_defn.GetType()))
-        return 'fail'
+    assert field_defn.GetWidth() == 5 and field_defn.GetPrecision() == 3 and field_defn.GetType() == ogr.OFTReal, \
+        ('Wrong field defn for my_numeric5_3 : %d, %d, %d' % (field_defn.GetWidth(), field_defn.GetPrecision(), field_defn.GetType()))
 
     field_defn = layer_defn.GetFieldDefn(layer_defn.GetFieldIndex("my_varchar10"))
-    if field_defn.GetWidth() != 10 or field_defn.GetPrecision() != 0:
-        gdaltest.post_reason('Wrong field defn for my_varchar10 : %d, %d, %d' % (field_defn.GetWidth(), field_defn.GetPrecision(), field_defn.GetType()))
-        return 'fail'
+    assert field_defn.GetWidth() == 10 and field_defn.GetPrecision() == 0, \
+        ('Wrong field defn for my_varchar10 : %d, %d, %d' % (field_defn.GetWidth(), field_defn.GetPrecision(), field_defn.GetType()))
 
     field_defn = layer_defn.GetFieldDefn(layer_defn.GetFieldIndex("my_bool"))
-    if field_defn.GetWidth() != 1 or field_defn.GetType() != ogr.OFTInteger or field_defn.GetSubType() != ogr.OFSTBoolean:
-        gdaltest.post_reason('Wrong field defn for my_bool : %d, %d, %d, %d' % (field_defn.GetWidth(), field_defn.GetPrecision(), field_defn.GetType(), field_defn.GetSubType()))
-        return 'fail'
+    assert field_defn.GetWidth() == 1 and field_defn.GetType() == ogr.OFTInteger and field_defn.GetSubType() == ogr.OFSTBoolean, \
+        ('Wrong field defn for my_bool : %d, %d, %d, %d' % (field_defn.GetWidth(), field_defn.GetPrecision(), field_defn.GetType(), field_defn.GetSubType()))
 
     field_defn = layer_defn.GetFieldDefn(layer_defn.GetFieldIndex("my_boolarray"))
-    if field_defn.GetType() != ogr.OFTIntegerList or field_defn.GetSubType() != ogr.OFSTBoolean:
-        gdaltest.post_reason('Wrong field defn for my_boolarray : %d, %d, %d, %d' % (field_defn.GetWidth(), field_defn.GetPrecision(), field_defn.GetType(), field_defn.GetSubType()))
-        return 'fail'
+    assert field_defn.GetType() == ogr.OFTIntegerList and field_defn.GetSubType() == ogr.OFSTBoolean, \
+        ('Wrong field defn for my_boolarray : %d, %d, %d, %d' % (field_defn.GetWidth(), field_defn.GetPrecision(), field_defn.GetType(), field_defn.GetSubType()))
 
     field_defn = layer_defn.GetFieldDefn(layer_defn.GetFieldIndex("my_int2"))
-    if field_defn.GetType() != ogr.OFTInteger or field_defn.GetSubType() != ogr.OFSTInt16:
-        gdaltest.post_reason('Wrong field defn for my_int2 : %d, %d, %d, %d' % (field_defn.GetWidth(), field_defn.GetPrecision(), field_defn.GetType(), field_defn.GetSubType()))
-        return 'fail'
+    assert field_defn.GetType() == ogr.OFTInteger and field_defn.GetSubType() == ogr.OFSTInt16, \
+        ('Wrong field defn for my_int2 : %d, %d, %d, %d' % (field_defn.GetWidth(), field_defn.GetPrecision(), field_defn.GetType(), field_defn.GetSubType()))
 
     field_defn = layer_defn.GetFieldDefn(layer_defn.GetFieldIndex("my_float4"))
-    if field_defn.GetType() != ogr.OFTReal or field_defn.GetSubType() != ogr.OFSTFloat32:
-        gdaltest.post_reason('Wrong field defn for my_float4 : %d, %d, %d, %d' % (field_defn.GetWidth(), field_defn.GetPrecision(), field_defn.GetType(), field_defn.GetSubType()))
-        return 'fail'
+    assert field_defn.GetType() == ogr.OFTReal and field_defn.GetSubType() == ogr.OFSTFloat32, \
+        ('Wrong field defn for my_float4 : %d, %d, %d, %d' % (field_defn.GetWidth(), field_defn.GetPrecision(), field_defn.GetType(), field_defn.GetSubType()))
 
     field_defn = layer_defn.GetFieldDefn(layer_defn.GetFieldIndex("my_int2array"))
-    if field_defn.GetType() != ogr.OFTIntegerList or field_defn.GetSubType() != ogr.OFSTInt16:
-        gdaltest.post_reason('Wrong field defn for my_int2array : %d, %d, %d, %d' % (field_defn.GetWidth(), field_defn.GetPrecision(), field_defn.GetType(), field_defn.GetSubType()))
-        return 'fail'
+    assert field_defn.GetType() == ogr.OFTIntegerList and field_defn.GetSubType() == ogr.OFSTInt16, \
+        ('Wrong field defn for my_int2array : %d, %d, %d, %d' % (field_defn.GetWidth(), field_defn.GetPrecision(), field_defn.GetType(), field_defn.GetSubType()))
 
     field_defn = layer_defn.GetFieldDefn(layer_defn.GetFieldIndex("my_float4array"))
-    if field_defn.GetType() != ogr.OFTRealList or field_defn.GetSubType() != ogr.OFSTFloat32:
-        gdaltest.post_reason('Wrong field defn for my_float4array : %d, %d, %d, %d' % (field_defn.GetWidth(), field_defn.GetPrecision(), field_defn.GetType(), field_defn.GetSubType()))
-        return 'fail'
+    assert field_defn.GetType() == ogr.OFTRealList and field_defn.GetSubType() == ogr.OFSTFloat32, \
+        ('Wrong field defn for my_float4array : %d, %d, %d, %d' % (field_defn.GetWidth(), field_defn.GetPrecision(), field_defn.GetType(), field_defn.GetSubType()))
 
     if abs(feat.my_numeric - 1.2) > 1e-8 or \
         feat.my_numeric5 != 12345 or \
@@ -1402,14 +1312,10 @@ def check_value_23(layer_defn, feat):
         return 'fail'
 
     geom = feat.GetGeometryRef()
-    if geom is None:
-        gdaltest.post_reason('geom is none')
-        return 'fail'
+    assert geom is not None, 'geom is none'
 
     wkt = geom.ExportToWkt()
-    if wkt != 'POINT (10 20)':
-        gdaltest.post_reason('Wrong WKT :' + wkt)
-        return 'fail'
+    assert wkt == 'POINT (10 20)', ('Wrong WKT :' + wkt)
 
     return 'success'
 
@@ -1495,13 +1401,10 @@ def test_ogr_pg_28(with_and_without_postgis):
     dst_feat = ogr.Feature(feature_def=dst_lyr.GetLayerDefn())
 
     feat = src_lyr.GetNextFeature()
-    if feat is None:
-        return 'fail'
+    assert feat is not None
 
     dst_feat.SetFrom(feat)
-    if dst_lyr.CreateFeature(dst_feat) != 0:
-        gdaltest.post_reason('CreateFeature failed.')
-        return 'fail'
+    assert dst_lyr.CreateFeature(dst_feat) == 0, 'CreateFeature failed.'
 
     dst_feat.Destroy()
 
@@ -1535,9 +1438,7 @@ def test_ogr_pg_29(with_and_without_postgis):
 
     geom = feat.GetGeometryRef()
     wkt = geom.ExportToWkt()
-    if wkt != 'POINT (10 20)':
-        gdaltest.post_reason('Wrong WKT :' + wkt)
-        return 'fail'
+    assert wkt == 'POINT (10 20)', ('Wrong WKT :' + wkt)
 
     feat = None
 
@@ -1577,13 +1478,10 @@ def test_ogr_pg_30(with_and_without_postgis):
     dst_feat = ogr.Feature(feature_def=dst_lyr.GetLayerDefn())
 
     feat = src_lyr.GetNextFeature()
-    if feat is None:
-        return 'fail'
+    assert feat is not None
 
     dst_feat.SetFrom(feat)
-    if dst_lyr.CreateFeature(dst_feat) != 0:
-        gdaltest.post_reason('CreateFeature failed.')
-        return 'fail'
+    assert dst_lyr.CreateFeature(dst_feat) == 0, 'CreateFeature failed.'
 
     dst_feat.Destroy()
 
@@ -1614,8 +1512,7 @@ def test_ogr_pg_31(with_and_without_postgis):
 
     ds = ogr.Open('PG:' + gdaltest.pg_connection_string + ' tables=tpoly,tpolycopy', update=1)
 
-    if ds is None or ds.GetLayerCount() != 2:
-        return 'fail'
+    assert ds is not None and ds.GetLayerCount() == 2
 
     sql_lyr = ds.ExecuteSQL('SELECT * FROM test_for_tables_equal_param')
     i = 0
@@ -1625,8 +1522,7 @@ def test_ogr_pg_31(with_and_without_postgis):
             break
         i = i + 1
     ds.ReleaseResultSet(sql_lyr)
-    if i != 501:
-        return 'fail'
+    assert i == 501
 
     ds.Destroy()
 
@@ -1702,9 +1598,7 @@ def test_ogr_pg_32(with_and_without_postgis):
     gdaltest.pg_lyr.CreateFeature(feat)
     feat = None
     sr = gdaltest.pg_lyr.GetSpatialRef()
-    if sr.ExportToWkt().find('26632') == -1:
-        gdaltest.post_reason('did not get expected SRS')
-        return 'fail'
+    assert sr.ExportToWkt().find('26632') != -1, 'did not get expected SRS'
 
     sql_lyr = gdaltest.pg_ds.ExecuteSQL("SELECT COUNT(*) FROM spatial_ref_sys")
     feat = sql_lyr.GetNextFeature()
@@ -1720,9 +1614,7 @@ def test_ogr_pg_32(with_and_without_postgis):
 
     sql_lyr = gdaltest.pg_ds.ExecuteSQL('SELECT * FROM testsrtext4')
     sr = sql_lyr.GetSpatialRef()
-    if sr.ExportToWkt().find('26632') == -1:
-        gdaltest.post_reason('did not get expected SRS')
-        return 'fail'
+    assert sr.ExportToWkt().find('26632') != -1, 'did not get expected SRS'
     gdaltest.pg_ds.ReleaseResultSet(sql_lyr)
 
     ######################################################
@@ -1745,12 +1637,8 @@ def test_ogr_pg_32(with_and_without_postgis):
             sr = lyr.GetSpatialRef()
             # sys.stderr.write('AFTER GetSpatialRef\n')
 
-        if sr.ExportToWkt().find('26632') == -1:
-            gdaltest.post_reason('did not get expected SRS')
-            return 'fail'
-        if geom_type != ogr.wkbPoint:
-            gdaltest.post_reason('did not get expected geom type')
-            return 'fail'
+        assert sr.ExportToWkt().find('26632') != -1, 'did not get expected SRS'
+        assert geom_type == ogr.wkbPoint, 'did not get expected geom type'
 
         ds = None
 
@@ -1783,9 +1671,7 @@ def test_ogr_pg_33(with_and_without_postgis):
         return 'skip'
 
     gdaltest.pg_lyr = gdaltest.pg_ds.GetLayerByName('tpoly')
-    if gdaltest.pg_lyr is None:
-        gdaltest.post_reason('did not get tpoly layer')
-        return 'fail'
+    assert gdaltest.pg_lyr is not None, 'did not get tpoly layer'
 
     dst_feat = ogr.Feature(feature_def=gdaltest.pg_lyr.GetLayerDefn())
     # eacute in UTF8 : 0xc3 0xa9
@@ -1821,9 +1707,7 @@ def test_ogr_pg_34(with_and_without_postgis):
         gdaltest.pg_ds.ExecuteSQL('SET client_encoding = LATIN1')
 
     gdaltest.pg_lyr = gdaltest.pg_ds.GetLayerByName('tpoly')
-    if gdaltest.pg_lyr is None:
-        gdaltest.post_reason('did not get tpoly layer')
-        return 'fail'
+    assert gdaltest.pg_lyr is not None, 'did not get tpoly layer'
 
     dst_feat = ogr.Feature(feature_def=gdaltest.pg_lyr.GetLayerDefn())
     # eacute in Latin1 : 0xe9
@@ -1895,29 +1779,20 @@ def test_ogr_pg_36(with_and_without_postgis):
     ds = ogr.Open('PG:' + gdaltest.pg_connection_string, update=1)
 
     found = ogr_pg_check_layer_in_list(ds, 'table36_inherited')
-    if found is False:
-        gdaltest.post_reason('layer table36_inherited not listed')
-        return 'fail'
+    assert found is not False, 'layer table36_inherited not listed'
 
     found = ogr_pg_check_layer_in_list(ds, 'table36_inherited2')
-    if found is False:
-        gdaltest.post_reason('layer table36_inherited2 not listed')
-        return 'fail'
+    assert found is not False, 'layer table36_inherited2 not listed'
 
     lyr = ds.GetLayerByName('table36_inherited2')
-    if lyr is None:
-        return 'fail'
-    if gdaltest.pg_has_postgis and lyr.GetGeomType() != ogr.wkbPoint:
-        gdaltest.post_reason('wrong geometry type for layer table36_inherited2')
-        print(lyr.GetGeomType())
-        return 'fail'
+    assert lyr is not None
+    assert not gdaltest.pg_has_postgis or lyr.GetGeomType() == ogr.wkbPoint, \
+        'wrong geometry type for layer table36_inherited2'
 
     lyr = ds.GetLayerByName('AutoTest-schema.table36_inherited2')
-    if lyr is None:
-        return 'fail'
-    if gdaltest.pg_has_postgis and lyr.GetGeomType() != ogr.wkbLineString:
-        gdaltest.post_reason('wrong geometry type for layer AutoTest-schema.table36_inherited2')
-        return 'fail'
+    assert lyr is not None
+    assert not gdaltest.pg_has_postgis or lyr.GetGeomType() == ogr.wkbLineString, \
+        'wrong geometry type for layer AutoTest-schema.table36_inherited2'
 
     ds.Destroy()
 
@@ -1932,15 +1807,11 @@ def test_ogr_pg_36_bis(with_and_without_postgis):
     ds = ogr.Open('PG:' + gdaltest.pg_connection_string + ' TABLES=table36_base', update=1)
 
     found = ogr_pg_check_layer_in_list(ds, 'table36_inherited')
-    if found is True:
-        gdaltest.post_reason('layer table36_inherited is listed but it should not')
-        return 'fail'
+    assert found is not True, 'layer table36_inherited is listed but it should not'
 
     lyr = ds.GetLayerByName('table36_inherited')
-    if lyr is None:
-        return 'fail'
-    if gdaltest.pg_has_postgis and lyr.GetGeomType() != ogr.wkbPoint:
-        return 'fail'
+    assert lyr is not None
+    assert not gdaltest.pg_has_postgis or lyr.GetGeomType() == ogr.wkbPoint
 
     ds.Destroy()
 
@@ -1963,15 +1834,11 @@ def test_ogr_pg_37(with_and_without_postgis):
     ds = ogr.Open('PG:' + gdaltest.pg_connection_string, update=1)
 
     found = ogr_pg_check_layer_in_list(ds, 'table37_inherited')
-    if found is False:
-        gdaltest.post_reason('layer table37_inherited not listed')
-        return 'fail'
+    assert found is not False, 'layer table37_inherited not listed'
 
     lyr = ds.GetLayerByName('table37_inherited')
-    if lyr is None:
-        return 'fail'
-    if gdaltest.pg_has_postgis and lyr.GetGeomType() != ogr.wkbPoint:
-        return 'fail'
+    assert lyr is not None
+    assert not gdaltest.pg_has_postgis or lyr.GetGeomType() == ogr.wkbPoint
 
     ds.Destroy()
 
@@ -1995,18 +1862,13 @@ def test_ogr_pg_38(with_and_without_postgis):
 
     # Check for the layer with the wkb_geometry column
     found = ogr_pg_check_layer_in_list(ds, 'table37_inherited')
-    if found is False:
-        gdaltest.post_reason('layer table37_inherited not listed')
-        return 'fail'
+    assert found is not False, 'layer table37_inherited not listed'
 
     lyr = ds.GetLayerByName('table37_inherited')
-    if lyr is None:
-        return 'fail'
+    assert lyr is not None
     gfld_defn = lyr.GetLayerDefn().GetGeomFieldDefn(lyr.GetLayerDefn().GetGeomFieldIndex("wkb_geometry"))
-    if gfld_defn is None:
-        return 'fail'
-    if gfld_defn.GetType() != ogr.wkbPoint:
-        return 'fail'
+    assert gfld_defn is not None
+    assert gfld_defn.GetType() == ogr.wkbPoint
     if lyr.GetLayerDefn().GetGeomFieldCount() != 3:
         print(lyr.GetLayerDefn().GetGeomFieldCount())
         for i in range(lyr.GetLayerDefn().GetGeomFieldCount()):
@@ -2015,26 +1877,17 @@ def test_ogr_pg_38(with_and_without_postgis):
 
     # Explicit query to 'table37_inherited(wkb_geometry)' should also work
     lyr = ds.GetLayerByName('table37_inherited(wkb_geometry)')
-    if lyr is None:
-        return 'fail'
+    assert lyr is not None
 
     lyr = ds.GetLayerByName('table37_inherited(pointBase)')
-    if lyr is None:
-        return 'fail'
-    if lyr.GetGeomType() != ogr.wkbPoint:
-        return 'fail'
-    if lyr.GetGeometryColumn() != 'pointBase':
-        gdaltest.post_reason('wrong geometry column name')
-        return 'fail'
+    assert lyr is not None
+    assert lyr.GetGeomType() == ogr.wkbPoint
+    assert lyr.GetGeometryColumn() == 'pointBase', 'wrong geometry column name'
 
     lyr = ds.GetLayerByName('table37_inherited(point25D)')
-    if lyr is None:
-        return 'fail'
-    if lyr.GetGeomType() != ogr.wkbPoint25D:
-        return 'fail'
-    if lyr.GetGeometryColumn() != 'point25D':
-        gdaltest.post_reason('wrong geometry column name')
-        return 'fail'
+    assert lyr is not None
+    assert lyr.GetGeomType() == ogr.wkbPoint25D
+    assert lyr.GetGeometryColumn() == 'point25D', 'wrong geometry column name'
 
     ds.Destroy()
 
@@ -2042,13 +1895,9 @@ def test_ogr_pg_38(with_and_without_postgis):
     ds = ogr.Open('PG:' + gdaltest.pg_connection_string + ' tables=table37_inherited(point25D)', update=1)
 
     lyr = ds.GetLayerByName('table37_inherited(point25D)')
-    if lyr is None:
-        return 'fail'
-    if lyr.GetGeomType() != ogr.wkbPoint25D:
-        return 'fail'
-    if lyr.GetGeometryColumn() != 'point25D':
-        gdaltest.post_reason('wrong geometry column name')
-        return 'fail'
+    assert lyr is not None
+    assert lyr.GetGeomType() == ogr.wkbPoint25D
+    assert lyr.GetGeometryColumn() == 'point25D', 'wrong geometry column name'
 
     ds.Destroy()
 
@@ -2066,9 +1915,7 @@ def test_ogr_pg_39(with_and_without_postgis):
         gdaltest.pg_ds.ExecuteSQL("CREATE VIEW testview AS SELECT * FROM table36_base")
         ds = ogr.Open('PG:' + gdaltest.pg_connection_string, update=1)
         found = ogr_pg_check_layer_in_list(ds, 'testview')
-        if found is False:
-            gdaltest.post_reason('layer testview not listed')
-            return 'fail'
+        assert found is not False, 'layer testview not listed'
         ds.Destroy()
         return 'success'
 
@@ -2080,28 +1927,20 @@ def test_ogr_pg_39(with_and_without_postgis):
     # Check for the layer
     ds = ogr.Open('PG:' + gdaltest.pg_connection_string, update=1)
     found = ogr_pg_check_layer_in_list(ds, 'testview')
-    if found is False:
-        gdaltest.post_reason('layer testview not listed')
-        return 'fail'
+    assert found is not False, 'layer testview not listed'
 
     lyr = ds.GetLayerByName('testview')
-    if lyr is None:
-        return 'fail'
+    assert lyr is not None
     if gdaltest.pg_has_postgis:
         gfld_defn = lyr.GetLayerDefn().GetGeomFieldDefn(lyr.GetLayerDefn().GetGeomFieldIndex("wkb_geometry"))
-        if gfld_defn is None:
-            return 'fail'
-        if gfld_defn.GetType() != ogr.wkbPoint:
-            return 'fail'
+        assert gfld_defn is not None
+        assert gfld_defn.GetType() == ogr.wkbPoint
 
     feat = lyr.GetNextFeature()
-    if feat is None:
-        gdaltest.post_reason('no feature')
-        return 'fail'
+    assert feat is not None, 'no feature'
 
-    if feat.GetGeomFieldRef("wkb_geometry") is None or feat.GetGeomFieldRef("wkb_geometry").ExportToWkt() != 'POINT (0 1)':
-        gdaltest.post_reason('bad geometry %s' % feat.GetGeometryRef().ExportToWkt())
-        return 'fail'
+    assert feat.GetGeomFieldRef("wkb_geometry") is not None and feat.GetGeomFieldRef("wkb_geometry").ExportToWkt() == 'POINT (0 1)', \
+        ('bad geometry %s' % feat.GetGeometryRef().ExportToWkt())
 
     ds.Destroy()
 
@@ -2113,31 +1952,22 @@ def test_ogr_pg_39(with_and_without_postgis):
     # Check for the layer
     ds = ogr.Open('PG:' + gdaltest.pg_connection_string, update=1)
     found = ogr_pg_check_layer_in_list(ds, 'testview')
-    if found is False:
-        gdaltest.post_reason('layer testview not listed')
-        return 'fail'
+    assert found is not False, 'layer testview not listed'
 
     lyr = ds.GetLayerByName('testview(point25D)')
-    if lyr is None:
-        return 'fail'
-    if gdaltest.pg_has_postgis and lyr.GetGeomType() != ogr.wkbPoint25D:
-        return 'fail'
+    assert lyr is not None
+    assert not gdaltest.pg_has_postgis or lyr.GetGeomType() == ogr.wkbPoint25D
 
     try:
-        if lyr.GetGeometryColumn() != 'point25D':
-            gdaltest.post_reason('wrong geometry column name')
-            return 'fail'
+        assert lyr.GetGeometryColumn() == 'point25D', 'wrong geometry column name'
     except:
         pass
 
     feat = lyr.GetNextFeature()
-    if feat is None:
-        gdaltest.post_reason('no feature')
-        return 'fail'
+    assert feat is not None, 'no feature'
 
-    if feat.GetGeometryRef() is None or feat.GetGeometryRef().ExportToWkt() != 'POINT (0 1 2)':
-        gdaltest.post_reason('bad geometry %s' % feat.GetGeometryRef().ExportToWkt())
-        return 'fail'
+    assert feat.GetGeometryRef() is not None and feat.GetGeometryRef().ExportToWkt() == 'POINT (0 1 2)', \
+        ('bad geometry %s' % feat.GetGeometryRef().ExportToWkt())
 
     ds.Destroy()
 
@@ -2152,8 +1982,7 @@ def test_ogr_pg_40(with_and_without_postgis):
         return 'skip'
 
     layer = gdaltest.pg_ds.GetLayerByName('tpoly')
-    if layer.GetFeature(0) is not None:
-        return 'fail'
+    assert layer.GetFeature(0) is None
 
     return 'success'
 
@@ -2169,37 +1998,22 @@ def test_ogr_pg_41(with_and_without_postgis):
 
     # tpoly without schema refers to the active schema, that is to say AutoTest-schema
     found = ogr_pg_check_layer_in_list(ds, 'tpoly')
-    if found is False:
-        gdaltest.post_reason('layer tpoly not listed')
-        return 'fail'
+    assert found is not False, 'layer tpoly not listed'
 
     layer = ds.GetLayerByName('tpoly')
-    if layer.GetFeatureCount() != 3:
-        gdaltest.post_reason('wrong feature count')
-        print(layer.GetFeatureCount())
-        return 'fail'
+    assert layer.GetFeatureCount() == 3, 'wrong feature count'
 
     found = ogr_pg_check_layer_in_list(ds, 'AutoTest-schema.tpoly')
-    if found is True:
-        gdaltest.post_reason('layer AutoTest-schema.tpoly is listed, but should not')
-        return 'fail'
+    assert found is not True, 'layer AutoTest-schema.tpoly is listed, but should not'
 
     layer = ds.GetLayerByName('AutoTest-schema.tpoly')
-    if layer.GetFeatureCount() != 3:
-        gdaltest.post_reason('wrong feature count')
-        print(layer.GetFeatureCount())
-        return 'fail'
+    assert layer.GetFeatureCount() == 3, 'wrong feature count'
 
     found = ogr_pg_check_layer_in_list(ds, 'public.tpoly')
-    if found is False:
-        gdaltest.post_reason('layer tpoly not listed')
-        return 'fail'
+    assert found is not False, 'layer tpoly not listed'
 
     layer = ds.GetLayerByName('public.tpoly')
-    if layer.GetFeatureCount() != 19:
-        gdaltest.post_reason('wrong feature count')
-        print(layer.GetFeatureCount())
-        return 'fail'
+    assert layer.GetFeatureCount() == 19, 'wrong feature count'
 
     gdal.PushErrorHandler('CPLQuietErrorHandler')
     gdaltest.pg_ds.ExecuteSQL('DELLAYER:test41')
@@ -2208,21 +2022,13 @@ def test_ogr_pg_41(with_and_without_postgis):
     ds.CreateLayer('test41')
 
     found = ogr_pg_check_layer_in_list(ds, 'test41')
-    if found is False:
-        gdaltest.post_reason('layer test41 not listed')
-        return 'fail'
+    assert found is not False, 'layer test41 not listed'
 
     layer = ds.GetLayerByName('test41')
-    if layer.GetFeatureCount() != 0:
-        gdaltest.post_reason('wrong feature count')
-        print(layer.GetFeatureCount())
-        return 'fail'
+    assert layer.GetFeatureCount() == 0, 'wrong feature count'
 
     layer = ds.GetLayerByName('AutoTest-schema.test41')
-    if layer.GetFeatureCount() != 0:
-        gdaltest.post_reason('wrong feature count')
-        print(layer.GetFeatureCount())
-        return 'fail'
+    assert layer.GetFeatureCount() == 0, 'wrong feature count'
 
     ds.Destroy()
 
@@ -2240,54 +2046,31 @@ def test_ogr_pg_42(with_and_without_postgis):
 
     # tpoly without schema refers to the active schema, that is to say AutoTest-schema
     found = ogr_pg_check_layer_in_list(ds, 'tpoly')
-    if found is False:
-        gdaltest.post_reason('layer tpoly not listed')
-        return 'fail'
+    assert found is not False, 'layer tpoly not listed'
 
     layer = ds.GetLayerByName('tpoly')
-    if layer.GetFeatureCount() != 3:
-        gdaltest.post_reason('wrong feature count')
-        print(layer.GetFeatureCount())
-        return 'fail'
+    assert layer.GetFeatureCount() == 3, 'wrong feature count'
 
     found = ogr_pg_check_layer_in_list(ds, 'AutoTest-schema.tpoly')
-    if found is True:
-        gdaltest.post_reason('layer AutoTest-schema.tpoly is listed, but should not')
-        return 'fail'
+    assert found is not True, 'layer AutoTest-schema.tpoly is listed, but should not'
 
     layer = ds.GetLayerByName('AutoTest-schema.tpoly')
-    if layer.GetFeatureCount() != 3:
-        gdaltest.post_reason('wrong feature count')
-        print(layer.GetFeatureCount())
-        return 'fail'
+    assert layer.GetFeatureCount() == 3, 'wrong feature count'
 
     found = ogr_pg_check_layer_in_list(ds, 'public.tpoly')
-    if found is True:
-        gdaltest.post_reason('layer public.tpoly is listed, but should not')
-        return 'fail'
+    assert found is not True, 'layer public.tpoly is listed, but should not'
 
     layer = ds.GetLayerByName('public.tpoly')
-    if layer.GetFeatureCount() != 19:
-        gdaltest.post_reason('wrong feature count')
-        print(layer.GetFeatureCount())
-        return 'fail'
+    assert layer.GetFeatureCount() == 19, 'wrong feature count'
 
     found = ogr_pg_check_layer_in_list(ds, 'test41')
-    if found is False:
-        gdaltest.post_reason('layer test41 not listed')
-        return 'fail'
+    assert found is not False, 'layer test41 not listed'
 
     layer = ds.GetLayerByName('test41')
-    if layer.GetFeatureCount() != 0:
-        gdaltest.post_reason('wrong feature count')
-        print(layer.GetFeatureCount())
-        return 'fail'
+    assert layer.GetFeatureCount() == 0, 'wrong feature count'
 
     layer = ds.GetLayerByName('AutoTest-schema.test41')
-    if layer.GetFeatureCount() != 0:
-        gdaltest.post_reason('wrong feature count')
-        print(layer.GetFeatureCount())
-        return 'fail'
+    assert layer.GetFeatureCount() == 0, 'wrong feature count'
 
     ds.Destroy()
 
@@ -2305,26 +2088,16 @@ def test_ogr_pg_43(with_and_without_postgis):
 
     # tpoly without schema refers to the active schema, that is to say public
     found = ogr_pg_check_layer_in_list(ds, 'tpoly')
-    if found is False:
-        gdaltest.post_reason('layer tpoly not listed')
-        return 'fail'
+    assert found is not False, 'layer tpoly not listed'
 
     layer = ds.GetLayerByName('tpoly')
-    if layer.GetFeatureCount() != 19:
-        gdaltest.post_reason('wrong feature count')
-        print(layer.GetFeatureCount())
-        return 'fail'
+    assert layer.GetFeatureCount() == 19, 'wrong feature count'
 
     found = ogr_pg_check_layer_in_list(ds, 'AutoTest-schema.tpoly')
-    if found is False:
-        gdaltest.post_reason('layer AutoTest-schema.tpoly not listed')
-        return 'fail'
+    assert found is not False, 'layer AutoTest-schema.tpoly not listed'
 
     layer = ds.GetLayerByName('AutoTest-schema.tpoly')
-    if layer.GetFeatureCount() != 3:
-        gdaltest.post_reason('wrong feature count')
-        print(layer.GetFeatureCount())
-        return 'fail'
+    assert layer.GetFeatureCount() == 3, 'wrong feature count'
 
     ds.Destroy()
 
@@ -2353,25 +2126,20 @@ def test_ogr_pg_44(with_and_without_postgis):
     geom = ogr.CreateGeometryFromWkt('POLYGON((0 0,0 1,1 1,1 0,0 0))')
     layer.SetSpatialFilter(geom)
     geom.Destroy()
-    if layer.GetFeatureCount() != 1:
-        return 'fail'
+    assert layer.GetFeatureCount() == 1
     feat = layer.GetNextFeature()
-    if feat.GetGeometryRef().ExportToWkt() != 'POINT (0.5 0.5 1)':
-        return 'fail'
+    assert feat.GetGeometryRef().ExportToWkt() == 'POINT (0.5 0.5 1)'
 
     feat = layer.GetFeature(1)
-    if feat.GetGeometryRef().ExportToWkt() != 'POINT (0.5 0.5 1)':
-        return 'fail'
+    assert feat.GetGeometryRef().ExportToWkt() == 'POINT (0.5 0.5 1)'
 
     sql_lyr = ds.ExecuteSQL('SELECT * FROM "select"')
     geom = ogr.CreateGeometryFromWkt('POLYGON((0 0,0 1,1 1,1 0,0 0))')
     sql_lyr.SetSpatialFilter(geom)
     geom.Destroy()
-    if sql_lyr.GetFeatureCount() != 1:
-        return 'fail'
+    assert sql_lyr.GetFeatureCount() == 1
     feat = sql_lyr.GetNextFeature()
-    if feat.GetGeometryRef().ExportToWkt() != 'POINT (0.5 0.5 1)':
-        return 'fail'
+    assert feat.GetGeometryRef().ExportToWkt() == 'POINT (0.5 0.5 1)'
     ds.ReleaseResultSet(sql_lyr)
 
     ds.Destroy()
@@ -2389,9 +2157,8 @@ def test_ogr_pg_45(with_and_without_postgis):
 
     lyr = gdaltest.pg_ds.GetLayerByName('tpoly')
 
-    if not lyr.TestCapability(ogr.OLCFastSetNextByIndex):
-        gdaltest.post_reason('OLCFastSetNextByIndex returned false')
-        return 'fail'
+    assert lyr.TestCapability(ogr.OLCFastSetNextByIndex), \
+        'OLCFastSetNextByIndex returned false'
 
     nb_feat = lyr.GetFeatureCount()
     tab_feat = [None for i in range(nb_feat)]
@@ -2400,14 +2167,11 @@ def test_ogr_pg_45(with_and_without_postgis):
 
     lyr.SetNextByIndex(2)
     feat = lyr.GetNextFeature()
-    if feat.GetFID() != tab_feat[2].GetFID():
-        gdaltest.post_reason('SetNextByIndex(2) did not return expected feature')
-        return 'fail'
+    assert feat.GetFID() == tab_feat[2].GetFID(), \
+        'SetNextByIndex(2) did not return expected feature'
 
     feat = lyr.GetNextFeature()
-    if feat.GetFID() != tab_feat[3].GetFID():
-        gdaltest.post_reason('did not get expected feature')
-        return 'fail'
+    assert feat.GetFID() == tab_feat[3].GetFID(), 'did not get expected feature'
 
     return 'success'
 
@@ -2446,9 +2210,8 @@ def test_ogr_pg_46(with_and_without_postgis):
     feat = sqllyr.GetNextFeature()
     while feat is not None:
         expected_val = count
-        if feat.GetFieldAsInteger(0) != expected_val:
-            gdaltest.post_reason('expected value was %d. Got %d' % (expected_val, feat.GetFieldAsInteger(0)))
-            return 'fail'
+        assert feat.GetFieldAsInteger(0) == expected_val, \
+            ('expected value was %d. Got %d' % (expected_val, feat.GetFieldAsInteger(0)))
         feat.SetField(0, -count)
         lyr.SetFeature(feat)
         feat.Destroy()
@@ -2457,17 +2220,14 @@ def test_ogr_pg_46(with_and_without_postgis):
 
         feat = sqllyr.GetNextFeature()
 
-    if count != nFeatures:
-        gdaltest.post_reason('did not get expected %d features' % nFeatures)
-        return 'fail'
+    assert count == nFeatures, ('did not get expected %d features' % nFeatures)
 
     # Check that 1 feature has been correctly updated
     sqllyr.SetNextByIndex(1)
     feat = sqllyr.GetNextFeature()
     expected_val = -1
-    if feat.GetFieldAsInteger(0) != expected_val:
-        gdaltest.post_reason('expected value was %d. Got %d' % (expected_val, feat.GetFieldAsInteger(0)))
-        return 'fail'
+    assert feat.GetFieldAsInteger(0) == expected_val, \
+        ('expected value was %d. Got %d' % (expected_val, feat.GetFieldAsInteger(0)))
     feat.Destroy()
 
     gdaltest.pg_ds.ReleaseResultSet(sqllyr)
@@ -2528,9 +2288,7 @@ def test_ogr_pg_47(with_and_without_postgis):
 
     # Check if the layer is listed
     found = ogr_pg_check_layer_in_list(gdaltest.pg_ds, 'test_geog')
-    if found is False:
-        gdaltest.post_reason('layer test_geog not listed')
-        return 'fail'
+    assert found is not False, 'layer test_geog not listed'
 
     # Check that the layer is recorder in geometry_columns table
     geography_columns_lyr = gdaltest.pg_ds.ExecuteSQL("SELECT * FROM geography_columns WHERE f_table_name = 'test_geog'")
@@ -2542,28 +2300,22 @@ def test_ogr_pg_47(with_and_without_postgis):
 
     # Get the layer by name
     lyr = gdaltest.pg_ds.GetLayerByName('test_geog')
-    if lyr.GetExtent() != (2.0, 2.0, 49.0, 49.0):
-        gdaltest.post_reason('bad extent for test_geog')
-        return 'fail'
+    assert lyr.GetExtent() == (2.0, 2.0, 49.0, 49.0), 'bad extent for test_geog'
 
     feat = lyr.GetNextFeature()
     geom = feat.GetGeometryRef()
-    if geom.ExportToWkt() != 'POINT (2 49)':
-        gdaltest.post_reason('bad geometry for test_geog')
-        return 'fail'
+    assert geom.ExportToWkt() == 'POINT (2 49)', 'bad geometry for test_geog'
     feat.Destroy()
 
     # Check with result set
     sql_lyr = gdaltest.pg_ds.ExecuteSQL('SELECT * FROM test_geog')
-    if sql_lyr.GetExtent() != (2.0, 2.0, 49.0, 49.0):
-        gdaltest.post_reason('bad extent for SELECT * FROM test_geog')
-        return 'fail'
+    assert sql_lyr.GetExtent() == (2.0, 2.0, 49.0, 49.0), \
+        'bad extent for SELECT * FROM test_geog'
 
     feat = sql_lyr.GetNextFeature()
     geom = feat.GetGeometryRef()
-    if geom.ExportToWkt() != 'POINT (2 49)':
-        gdaltest.post_reason('bad geometry for SELECT * FROM test_geog')
-        return 'fail'
+    assert geom.ExportToWkt() == 'POINT (2 49)', \
+        'bad geometry for SELECT * FROM test_geog'
     feat.Destroy()
     gdaltest.pg_ds.ReleaseResultSet(sql_lyr)
 
@@ -2571,9 +2323,8 @@ def test_ogr_pg_47(with_and_without_postgis):
     sql_lyr = gdaltest.pg_ds.ExecuteSQL('SELECT ST_AsText(my_geog) FROM test_geog')
     feat = sql_lyr.GetNextFeature()
     geom = feat.GetGeometryRef()
-    if geom.ExportToWkt() != 'POINT (2 49)':
-        gdaltest.post_reason('bad geometry for SELECT ST_AsText(my_geog) FROM test_geog')
-        return 'fail'
+    assert geom.ExportToWkt() == 'POINT (2 49)', \
+        'bad geometry for SELECT ST_AsText(my_geog) FROM test_geog'
     feat.Destroy()
     gdaltest.pg_ds.ReleaseResultSet(sql_lyr)
 
@@ -2581,9 +2332,8 @@ def test_ogr_pg_47(with_and_without_postgis):
     sql_lyr = gdaltest.pg_ds.ExecuteSQL('SELECT ST_AsBinary(my_geog) FROM test_geog')
     feat = sql_lyr.GetNextFeature()
     geom = feat.GetGeometryRef()
-    if geom.ExportToWkt() != 'POINT (2 49)':
-        gdaltest.post_reason('bad geometry for SELECT ST_AsBinary(my_geog) FROM test_geog')
-        return 'fail'
+    assert geom.ExportToWkt() == 'POINT (2 49)', \
+        'bad geometry for SELECT ST_AsBinary(my_geog) FROM test_geog'
     feat.Destroy()
     gdaltest.pg_ds.ReleaseResultSet(sql_lyr)
 
@@ -2609,15 +2359,11 @@ def test_ogr_pg_48(with_and_without_postgis):
     found = ogr_pg_check_layer_in_list(gdaltest.pg_ds, 'no_pk_table')
     if gdaltest.pg_has_postgis:
         # Non spatial table in a PostGIS db -> not listed ...
-        if found:
-            gdaltest.post_reason('layer no_pk_table unexpectedly listed')
-            return 'fail'
+        assert not found, 'layer no_pk_table unexpectedly listed'
 
         # ... but should be found on explicit request
         lyr = gdaltest.pg_ds.GetLayer('no_pk_table')
-        if lyr is None:
-            gdaltest.post_reason('could not get no_pk_table')
-            return 'fail'
+        assert lyr is not None, 'could not get no_pk_table'
 
         # Try again by setting PG_LIST_ALL_TABLES=YES
         gdal.SetConfigOption('PG_LIST_ALL_TABLES', 'YES')
@@ -2626,38 +2372,25 @@ def test_ogr_pg_48(with_and_without_postgis):
         gdal.SetConfigOption('PG_LIST_ALL_TABLES', None)
         found = ogr_pg_check_layer_in_list(gdaltest.pg_ds, 'no_pk_table')
 
-        if found is False:
-            gdaltest.post_reason('layer no_pk_table not listed')
-            return 'fail'
+        assert found is not False, 'layer no_pk_table not listed'
 
         # Test LIST_ALL_TABLES=YES open option
         gdaltest.pg_ds.Destroy()
         gdaltest.pg_ds = gdal.OpenEx('PG:' + gdaltest.pg_connection_string, gdal.OF_VECTOR | gdal.OF_UPDATE, open_options=['LIST_ALL_TABLES=YES'])
         found = ogr_pg_check_layer_in_list(gdaltest.pg_ds, 'no_pk_table')
 
-    if found is False:
-        gdaltest.post_reason('layer no_pk_table not listed')
-        return 'fail'
+    assert found is not False, 'layer no_pk_table not listed'
 
     lyr = gdaltest.pg_ds.GetLayer('no_pk_table')
-    if lyr is None:
-        gdaltest.post_reason('could not get no_pk_table')
-        return 'fail'
+    assert lyr is not None, 'could not get no_pk_table'
 
     sr = lyr.GetSpatialRef()
-    if sr is not None:
-        gdaltest.post_reason('did not get expected SRS')
-        return 'fail'
+    assert sr is None, 'did not get expected SRS'
 
     feat = lyr.GetNextFeature()
-    if feat is None:
-        gdaltest.post_reason('did not get feature')
-        return 'fail'
+    assert feat is not None, 'did not get feature'
 
-    if lyr.GetFIDColumn() != '':
-        gdaltest.post_reason('got a non NULL FID column')
-        print(lyr.GetFIDColumn())
-        return 'fail'
+    assert lyr.GetFIDColumn() == '', 'got a non NULL FID column'
 
     if feat.GetFID() != 0:
         gdaltest.post_reason('did not get expected FID')
@@ -2694,10 +2427,7 @@ def test_ogr_pg_49(with_and_without_postgis):
     feat = lyr.GetNextFeature()
     lyr.ResetReading()  # to close implicit transaction
 
-    if lyr.GetFIDColumn() != 'other_id':
-        print(lyr.GetFIDColumn())
-        gdaltest.post_reason('did not get expected FID column')
-        return 'fail'
+    assert lyr.GetFIDColumn() == 'other_id', 'did not get expected FID column'
 
     if feat.GetFID() != 10:
         gdaltest.post_reason('did not get expected FID')
@@ -2717,9 +2447,7 @@ def test_ogr_pg_50(with_and_without_postgis):
         return 'skip'
 
     gdaltest.pg_lyr = gdaltest.pg_ds.GetLayerByName('tpoly')
-    if gdaltest.pg_lyr is None:
-        gdaltest.post_reason('did not get tpoly layer')
-        return 'fail'
+    assert gdaltest.pg_lyr is not None, 'did not get tpoly layer'
 
     feature_def = gdaltest.pg_lyr.GetLayerDefn()
     dst_feat = ogr.Feature(feature_def)
@@ -2791,9 +2519,7 @@ def test_ogr_pg_51(with_and_without_postgis):
 
     ret = gdaltest.runexternal(test_cli_utilities.get_test_ogrsf_path() + ' "' + 'PG:' + gdaltest.pg_connection_string + '" tpoly testview')
 
-    if ret.find('INFO') == -1 or ret.find('ERROR') != -1:
-        print(ret)
-        return 'fail'
+    assert ret.find('INFO') != -1 and ret.find('ERROR') == -1
 
     return 'success'
 
@@ -2812,9 +2538,7 @@ def test_ogr_pg_52(with_and_without_postgis):
 
     ret = gdaltest.runexternal(test_cli_utilities.get_test_ogrsf_path() + ' "' + 'PG:' + gdaltest.pg_connection_string + '" -sql "SELECT * FROM tpoly"')
 
-    if ret.find('INFO') == -1 or ret.find('ERROR') != -1:
-        print(ret)
-        return 'fail'
+    assert ret.find('INFO') != -1 and ret.find('ERROR') == -1
 
     return 'success'
 
@@ -2839,21 +2563,17 @@ def test_ogr_pg_53(with_and_without_postgis):
 
     ds = ogr.Open('PG:' + gdaltest.pg_connection_string)
 
-    if gdaltest.pg_has_postgis is True and ogr_pg_check_layer_in_list(ds, 'no_geometry_table') is True:
-        gdaltest.post_reason('did not expected no_geometry_table to be listed at that point')
-        return 'fail'
+    assert not (gdaltest.pg_has_postgis is True and ogr_pg_check_layer_in_list(ds, 'no_geometry_table') is True), \
+        'did not expected no_geometry_table to be listed at that point'
 
     lyr = ds.GetLayerByName('no_geometry_table')
     feat = lyr.GetNextFeature()
-    if feat.GetField(0) != 'bar':
-        return 'fail'
+    assert feat.GetField(0) == 'bar'
 
     gdal.PushErrorHandler('CPLQuietErrorHandler')
     lyr = ds.CreateLayer('no_geometry_table', geom_type=ogr.wkbNone)
     gdal.PopErrorHandler()
-    if lyr is not None:
-        gdaltest.post_reason('layer creation should have failed')
-        return 'fail'
+    assert lyr is None, 'layer creation should have failed'
 
     lyr = ds.CreateLayer('no_geometry_table', geom_type=ogr.wkbNone, options=['OVERWRITE=YES'])
     field_defn = ogr.FieldDefn('baz')
@@ -2867,15 +2587,13 @@ def test_ogr_pg_53(with_and_without_postgis):
     lyr.CreateField(field_defn)
     field_defn = ogr.FieldDefn('baz')
     lyr.CreateField(field_defn)
-    if lyr is None:
-        return 'fail'
+    assert lyr is not None
 
     ds = None
 
     ds = ogr.Open('PG:' + gdaltest.pg_connection_string)
     lyr = ds.GetLayerByName('no_geometry_table')
-    if lyr.GetLayerDefn().GetFieldCount() != 2:
-        return 'fail'
+    assert lyr.GetLayerDefn().GetFieldCount() == 2
 
     return 'success'
 
@@ -2899,8 +2617,7 @@ def test_ogr_pg_53_bis(with_and_without_postgis):
     ds = ogr.Open('PG:' + gdaltest.pg_connection_string)
     lyr = ds.GetLayerByName('no_geometry_table')
     feat = lyr.GetNextFeature()
-    if feat.GetField(0) != 'baz':
-        return 'fail'
+    assert feat.GetField(0) == 'baz'
 
     return 'success'
 
@@ -2924,8 +2641,7 @@ def test_ogr_pg_54(with_and_without_postgis):
     gdaltest.pg_ds.ReleaseResultSet(sql_lyr)
 
     geom = feat.GetGeometryRef()
-    if geom.ExportToWkt() != 'POINT (0 1 2)':
-        return 'fail'
+    assert geom.ExportToWkt() == 'POINT (0 1 2)'
 
     return 'success'
 
@@ -2955,8 +2671,7 @@ def test_ogr_pg_55(with_and_without_postgis):
     layer = ds.GetLayerByName('ogr_pg_55')
     feat = layer.GetNextFeature()
     gdal.SetConfigOption('PG_USE_BASE64', old_val)
-    if feat.GetGeometryRef().ExportToWkt() != 'POINT (1 2 3)':
-        return 'fail'
+    assert feat.GetGeometryRef().ExportToWkt() == 'POINT (1 2 3)'
     ds = None
 
     return 'success'
@@ -3066,8 +2781,7 @@ def test_ogr_pg_57(with_and_without_postgis):
     ret = lyr.CreateFeature(feat)
     feat = None
 
-    if ret != 0:
-        return 'fail'
+    assert ret == 0
 
     return 'success'
 
@@ -3088,12 +2802,9 @@ def test_ogr_pg_58(with_and_without_postgis):
     lyr.CreateFeature(feat)
     feat = None
 
-    if lyr.TestCapability(ogr.OLCReorderFields) != 0:
-        return 'fail'
-    if lyr.TestCapability(ogr.OLCAlterFieldDefn) != 1:
-        return 'fail'
-    if lyr.TestCapability(ogr.OLCDeleteField) != 1:
-        return 'fail'
+    assert lyr.TestCapability(ogr.OLCReorderFields) == 0
+    assert lyr.TestCapability(ogr.OLCAlterFieldDefn) == 1
+    assert lyr.TestCapability(ogr.OLCDeleteField) == 1
 
     fd = ogr.FieldDefn('anotherstrcolumn', ogr.OFTString)
     fd.SetWidth(5)
@@ -3101,9 +2812,7 @@ def test_ogr_pg_58(with_and_without_postgis):
 
     lyr.ResetReading()
     feat = lyr.GetNextFeature()
-    if feat.GetField('anotherstrcolumn') != '12345':
-        gdaltest.post_reason('failed (1)')
-        return 'fail'
+    assert feat.GetField('anotherstrcolumn') == '12345', 'failed (1)'
 
     gdaltest.pg_ds = None
     gdaltest.pg_ds = ogr.Open('PG:' + gdaltest.pg_connection_string, update=1)
@@ -3111,23 +2820,18 @@ def test_ogr_pg_58(with_and_without_postgis):
 
     lyr.ResetReading()
     feat = lyr.GetNextFeature()
-    if feat.GetField('anotherstrcolumn') != '12345':
-        gdaltest.post_reason('failed (2)')
-        return 'fail'
+    assert feat.GetField('anotherstrcolumn') == '12345', 'failed (2)'
     feat = None
     lyr.ResetReading()  # to close implicit transaction
 
-    if lyr.DeleteField(lyr.GetLayerDefn().GetFieldIndex('anotherstrcolumn')) != 0:
-        gdaltest.post_reason('failed (3)')
-        return 'fail'
+    assert lyr.DeleteField(lyr.GetLayerDefn().GetFieldIndex('anotherstrcolumn')) == 0, \
+        'failed (3)'
 
     gdaltest.pg_ds = None
     gdaltest.pg_ds = ogr.Open('PG:' + gdaltest.pg_connection_string, update=1)
     lyr = gdaltest.pg_ds.GetLayer('ogr_pg_58')
 
-    if lyr.GetLayerDefn().GetFieldCount() != 1:
-        gdaltest.post_reason('failed (4)')
-        return 'fail'
+    assert lyr.GetLayerDefn().GetFieldCount() == 1, 'failed (4)'
 
     return 'success'
 
@@ -3155,9 +2859,7 @@ def test_ogr_pg_59(with_and_without_postgis):
     fc = lyr.GetFeatureCount()
     ds = None
 
-    if fc != 35:
-        gdaltest.post_reason('did not get expected feature count')
-        return 'fail'
+    assert fc == 35, 'did not get expected feature count'
 
     return 'success'
 
@@ -3180,23 +2882,16 @@ def test_ogr_pg_60(with_and_without_postgis):
     gdaltest.pg_ds = ogr.Open('PG:' + gdaltest.pg_connection_string,
                               update=1)
     lyr = gdaltest.pg_ds.GetLayerByName('ogr_pg_60')
-    if lyr.GetFIDColumn() != 'id':
-        gdaltest.post_reason('did not get expected name for FID column')
-        print(lyr.GetFIDColumn())
-        return 'fail'
+    assert lyr.GetFIDColumn() == 'id', 'did not get expected name for FID column'
 
     feat = ogr.Feature(lyr.GetLayerDefn())
     feat.SetFID(100)
     feat.SetField('name', 'a_name')
     lyr.CreateFeature(feat)
-    if feat.GetFID() != 100:
-        gdaltest.post_reason('bad FID value')
-        return 'fail'
+    assert feat.GetFID() == 100, 'bad FID value'
 
     feat = lyr.GetFeature(100)
-    if feat is None:
-        gdaltest.post_reason('did not get feature')
-        return 'fail'
+    assert feat is not None, 'did not get feature'
 
     return 'success'
 
@@ -3269,15 +2964,13 @@ def test_ogr_pg_62(with_and_without_postgis):
     sql_lyr = gdaltest.pg_ds.ExecuteSQL('SELECT * FROM testsrtext2')
     got_srs = sql_lyr.GetSpatialRef()
     gdaltest.pg_ds.ReleaseResultSet(sql_lyr)
-    if got_srs is None or got_srs.ExportToWkt().find('32631') == -1:
-        return 'fail'
+    assert not (got_srs is None or got_srs.ExportToWkt().find('32631') == -1)
 
     # Test a request on a table, but with a geometry column not in the table
     sql_lyr = gdaltest.pg_ds.ExecuteSQL("SELECT eas_id, GeomFromEWKT('SRID=4326;POINT(0 1)') FROM tpoly")
     got_srs = sql_lyr.GetSpatialRef()
     gdaltest.pg_ds.ReleaseResultSet(sql_lyr)
-    if got_srs is None or got_srs.ExportToWkt().find('4326') == -1:
-        return 'fail'
+    assert not (got_srs is None or got_srs.ExportToWkt().find('4326') == -1)
 
     return 'success'
 
@@ -3309,16 +3002,12 @@ def test_ogr_pg_63(with_and_without_postgis):
 
     ds = ogr.Open('PG:' + gdaltest.pg_connection_string)
     lyr = ds.GetLayerByName('ogr_pg_63')
-    if lyr.GetLayerDefn().GetFieldDefn(lyr.GetLayerDefn().GetFieldIndex('foo')).GetType() != ogr.OFTInteger64:
-        return 'fail'
-    if lyr.GetLayerDefn().GetFieldDefn(lyr.GetLayerDefn().GetFieldIndex('bar')).GetType() != ogr.OFTReal:
-        return 'fail'
+    assert lyr.GetLayerDefn().GetFieldDefn(lyr.GetLayerDefn().GetFieldIndex('foo')).GetType() == ogr.OFTInteger64
+    assert lyr.GetLayerDefn().GetFieldDefn(lyr.GetLayerDefn().GetFieldIndex('bar')).GetType() == ogr.OFTReal
 
     feat = lyr.GetNextFeature()
-    if feat.GetField('foo') != 123:
-        return 'fail'
-    if feat.GetField('baw') != 123456789012345:
-        return 'fail'
+    assert feat.GetField('foo') == 123
+    assert feat.GetField('baw') == 123456789012345
 
     return 'success'
 
@@ -3342,9 +3031,7 @@ def test_ogr_pg_64(with_and_without_postgis):
     feat.SetField('foo', '124')
     lyr.CreateFeature(feat)
 
-    if lyr.GetFeatureCount() != 2:
-        print(lyr.GetFeatureCount())
-        return 'fail'
+    assert lyr.GetFeatureCount() == 2
 
     ds = ogr.Open('PG:' + gdaltest.pg_connection_string, update=1)
     lyr = ds.GetLayerByName('ogr_pg_63')
@@ -3357,9 +3044,7 @@ def test_ogr_pg_64(with_and_without_postgis):
     gdal.SetConfigOption('OGR_TRUNCATE', None)
 
     # Just one feature because of truncation
-    if lyr.GetFeatureCount() != 1:
-        print(lyr.GetFeatureCount())
-        return 'fail'
+    assert lyr.GetFeatureCount() == 1
 
     return 'success'
 
@@ -3376,40 +3061,33 @@ def test_ogr_pg_65(with_and_without_postgis):
         return 'skip'
 
     ds = ogr.Open('PG:' + gdaltest.pg_connection_string, update=1)
-    if ds.TestCapability(ogr.ODsCCreateGeomFieldAfterCreateLayer) == 0:
-        return 'fail'
+    assert ds.TestCapability(ogr.ODsCCreateGeomFieldAfterCreateLayer) != 0
     lyr = ds.CreateLayer('ogr_pg_65', geom_type=ogr.wkbNone)
-    if lyr.TestCapability(ogr.OLCCreateGeomField) == 0:
-        return 'fail'
+    assert lyr.TestCapability(ogr.OLCCreateGeomField) != 0
 
     gfld_defn = ogr.GeomFieldDefn('geom1', ogr.wkbPoint)
     srs = osr.SpatialReference()
     srs.ImportFromEPSG(4326)
     gfld_defn.SetSpatialRef(srs)
-    if lyr.CreateGeomField(gfld_defn) != 0:
-        return 'fail'
+    assert lyr.CreateGeomField(gfld_defn) == 0
 
     gfld_defn = ogr.GeomFieldDefn('geom2', ogr.wkbLineString25D)
-    if lyr.CreateGeomField(gfld_defn) != 0:
-        return 'fail'
+    assert lyr.CreateGeomField(gfld_defn) == 0
 
     gfld_defn = ogr.GeomFieldDefn('geom3', ogr.wkbPoint)
     srs = osr.SpatialReference()
     srs.ImportFromEPSG(32631)
     gfld_defn.SetSpatialRef(srs)
-    if lyr.CreateGeomField(gfld_defn) != 0:
-        return 'fail'
+    assert lyr.CreateGeomField(gfld_defn) == 0
 
     lyr.CreateField(ogr.FieldDefn('intfield', ogr.OFTInteger))
     feat = ogr.Feature(lyr.GetLayerDefn())
     feat.SetField('intfield', 123)
     feat.SetGeomFieldDirectly('geom1', ogr.CreateGeometryFromWkt('POINT (1 2)'))
     feat.SetGeomFieldDirectly('geom2', ogr.CreateGeometryFromWkt('LINESTRING (3 4 5,6 7 8)'))
-    if lyr.CreateFeature(feat) != 0:
-        return 'fail'
+    assert lyr.CreateFeature(feat) == 0
     feat = ogr.Feature(lyr.GetLayerDefn())
-    if lyr.CreateFeature(feat) != 0:
-        return 'fail'
+    assert lyr.CreateFeature(feat) == 0
     lyr.ResetReading()
     feat = lyr.GetNextFeature()
     if feat.GetField('intfield') != 123 or \
@@ -3430,20 +3108,13 @@ def test_ogr_pg_65(with_and_without_postgis):
             lyr = ds.GetLayerByName('ogr_pg_65')
         else:
             lyr = ds.ExecuteSQL('SELECT * FROM ogr_pg_65')
-        if lyr.GetLayerDefn().GetGeomFieldDefn(0).GetName() != 'geom1':
-            return 'fail'
-        if i == 0 and lyr.GetLayerDefn().GetGeomFieldDefn(0).GetType() != ogr.wkbPoint:
-            return 'fail'
-        if lyr.GetLayerDefn().GetGeomFieldDefn(0).GetSpatialRef().ExportToWkt().find('4326') < 0:
-            return 'fail'
-        if lyr.GetLayerDefn().GetGeomFieldDefn(1).GetName() != 'geom2':
-            return 'fail'
-        if i == 0 and lyr.GetLayerDefn().GetGeomFieldDefn(1).GetType() != ogr.wkbLineString25D:
-            return 'fail'
-        if lyr.GetLayerDefn().GetGeomFieldDefn(1).GetSpatialRef() is not None:
-            return 'fail'
-        if i == 0 and lyr.GetLayerDefn().GetGeomFieldDefn(2).GetSpatialRef().ExportToWkt().find('32631') < 0:
-            return 'fail'
+        assert lyr.GetLayerDefn().GetGeomFieldDefn(0).GetName() == 'geom1'
+        assert i != 0 or lyr.GetLayerDefn().GetGeomFieldDefn(0).GetType() == ogr.wkbPoint
+        assert lyr.GetLayerDefn().GetGeomFieldDefn(0).GetSpatialRef().ExportToWkt().find('4326') >= 0
+        assert lyr.GetLayerDefn().GetGeomFieldDefn(1).GetName() == 'geom2'
+        assert i != 0 or lyr.GetLayerDefn().GetGeomFieldDefn(1).GetType() == ogr.wkbLineString25D
+        assert lyr.GetLayerDefn().GetGeomFieldDefn(1).GetSpatialRef() is None
+        assert not (i == 0 and lyr.GetLayerDefn().GetGeomFieldDefn(2).GetSpatialRef().ExportToWkt().find('32631') < 0)
         feat = lyr.GetNextFeature()
         if feat.GetField('intfield') != 123 or \
                 feat.GetGeomFieldRef('geom1').ExportToWkt() != 'POINT (1 2)' or \
@@ -3466,11 +3137,9 @@ def test_ogr_pg_65(with_and_without_postgis):
     feat = ogr.Feature(lyr.GetLayerDefn())
     feat.SetGeomFieldDirectly('geom1', ogr.CreateGeometryFromWkt('POINT (3 4)'))
     feat.SetGeomFieldDirectly('geom2', ogr.CreateGeometryFromWkt('LINESTRING (4 5 6,7 8 9)'))
-    if lyr.CreateFeature(feat) != 0:
-        return 'fail'
+    assert lyr.CreateFeature(feat) == 0
     feat = ogr.Feature(lyr.GetLayerDefn())
-    if lyr.CreateFeature(feat) != 0:
-        return 'fail'
+    assert lyr.CreateFeature(feat) == 0
     gdal.SetConfigOption('PG_USE_COPY', gdaltest.pg_use_copy)
 
     ds = ogr.Open('PG:' + gdaltest.pg_connection_string)
@@ -3491,12 +3160,9 @@ def test_ogr_pg_65(with_and_without_postgis):
         gdaltest.runexternal(test_cli_utilities.get_ogr2ogr_path() + ' -update "' + 'PG:' + gdaltest.pg_connection_string + '" "' + 'PG:' + gdaltest.pg_connection_string + '" ogr_pg_65 -nln ogr_pg_65_copied -overwrite')
         ds = ogr.Open('PG:' + gdaltest.pg_connection_string)
         lyr = ds.GetLayerByName('ogr_pg_65_copied')
-        if lyr.GetLayerDefn().GetGeomFieldDefn(0).GetSpatialRef().ExportToWkt().find('4326') < 0:
-            return 'fail'
-        if lyr.GetLayerDefn().GetGeomFieldDefn(1).GetSpatialRef() is not None:
-            return 'fail'
-        if lyr.GetLayerDefn().GetGeomFieldDefn(2).GetSpatialRef().ExportToWkt().find('32631') < 0:
-            return 'fail'
+        assert lyr.GetLayerDefn().GetGeomFieldDefn(0).GetSpatialRef().ExportToWkt().find('4326') >= 0
+        assert lyr.GetLayerDefn().GetGeomFieldDefn(1).GetSpatialRef() is None
+        assert lyr.GetLayerDefn().GetGeomFieldDefn(2).GetSpatialRef().ExportToWkt().find('32631') >= 0
 
     return 'success'
 
@@ -3518,9 +3184,7 @@ def test_ogr_pg_66(with_and_without_postgis):
 
     ret = gdaltest.runexternal(test_cli_utilities.get_test_ogrsf_path() + ' "' + 'PG:' + gdaltest.pg_connection_string + '" ogr_pg_65')
 
-    if ret.find('INFO') == -1 or ret.find('ERROR') != -1:
-        print(ret)
-        return 'fail'
+    assert ret.find('INFO') != -1 and ret.find('ERROR') == -1
 
     return 'success'
 
@@ -3542,8 +3206,7 @@ def test_ogr_pg_67(with_and_without_postgis):
 
     ds = ogr.Open('PG:' + gdaltest.pg_connection_string, update=1)
     lyr = ds.GetLayerByName('ogr_pg_67')
-    if lyr.GetSpatialRef() is not None:
-        return 'fail'
+    assert lyr.GetSpatialRef() is None
     feat = ogr.Feature(lyr.GetLayerDefn())
     lyr.CreateFeature(feat)
     feat = None
@@ -3551,22 +3214,19 @@ def test_ogr_pg_67(with_and_without_postgis):
 
     ds = ogr.Open('PG:' + gdaltest.pg_connection_string, update=1)
     lyr = ds.GetLayerByName('ogr_pg_67')
-    if lyr.GetSpatialRef() is not None:
-        return 'fail'
+    assert lyr.GetSpatialRef() is None
     ds.ExecuteSQL("ALTER TABLE ogr_pg_67 DROP CONSTRAINT enforce_srid_wkb_geometry")
     ds.ExecuteSQL("UPDATE ogr_pg_67 SET wkb_geometry = ST_GeomFromEWKT('SRID=4326;POINT(0 1)')")
     ds = None
 
     ds = ogr.Open('PG:' + gdaltest.pg_connection_string, update=1)
     lyr = ds.GetLayerByName('ogr_pg_67')
-    if lyr.GetSpatialRef() is None:
-        return 'fail'
+    assert lyr.GetSpatialRef() is not None
     ds = None
 
     ds = ogr.Open('PG:' + gdaltest.pg_connection_string + ' tables=fake', update=1)
     lyr = ds.GetLayerByName('ogr_pg_67')
-    if lyr.GetSpatialRef() is None:
-        return 'fail'
+    assert lyr.GetSpatialRef() is not None
     ds = None
 
     return 'success'
@@ -3615,11 +3275,9 @@ def test_ogr_pg_68(with_and_without_postgis):
 
     gdaltest.pg_ds.ExecuteSQL("GRANT SELECT ON geometry_columns TO %s" % current_user)
 
-    if got_srs is None:
-        return 'fail'
+    assert got_srs is not None
 
-    if got_srs2 is None:
-        return 'fail'
+    assert got_srs2 is not None
 
     return 'success'
 
@@ -3638,29 +3296,23 @@ def test_ogr_pg_69(with_and_without_postgis):
 
     gdaltest.pg_ds = None
     gdaltest.pg_ds = ogr.Open('PG:' + gdaltest.pg_connection_string)
-    if has_run_load_tables(gdaltest.pg_ds):
-        return 'fail'
+    assert not has_run_load_tables(gdaltest.pg_ds)
     gdaltest.pg_ds.GetLayerByName('tpoly')
-    if has_run_load_tables(gdaltest.pg_ds):
-        return 'fail'
+    assert not has_run_load_tables(gdaltest.pg_ds)
     sql_lyr = gdaltest.pg_ds.ExecuteSQL('SELECT * FROM tpoly')
-    if has_run_load_tables(gdaltest.pg_ds):
-        return 'fail'
+    assert not has_run_load_tables(gdaltest.pg_ds)
     feat = sql_lyr.GetNextFeature()
-    if has_run_load_tables(gdaltest.pg_ds):
-        return 'fail'
+    assert not has_run_load_tables(gdaltest.pg_ds)
     del feat
     gdaltest.pg_ds.ReleaseResultSet(sql_lyr)
 
     gdaltest.pg_ds.GetLayer(0)
-    if not has_run_load_tables(gdaltest.pg_ds):
-        return 'fail'
+    assert has_run_load_tables(gdaltest.pg_ds)
 
     # Test that we can find a layer with non lowercase
     gdaltest.pg_ds = None
     gdaltest.pg_ds = ogr.Open('PG:' + gdaltest.pg_connection_string)
-    if gdaltest.pg_ds.GetLayerByName('TPOLY') is None:
-        return 'fail'
+    assert gdaltest.pg_ds.GetLayerByName('TPOLY') is not None
 
     return 'success'
 
@@ -3679,16 +3331,14 @@ def test_ogr_pg_70(with_and_without_postgis):
 
     ds = ogr.Open('PG:' + gdaltest.pg_connection_string)
     lyr2 = ds.GetLayerByName('ogr_pg_70')
-    if lyr2 is None:
-        return 'fail'
+    assert lyr2 is not None
     ds = None
 
     lyr.CreateField(ogr.FieldDefn('foo', ogr.OFTString))
 
     ds = ogr.Open('PG:' + gdaltest.pg_connection_string)
     lyr2 = ds.GetLayerByName('ogr_pg_70')
-    if lyr2.GetLayerDefn().GetFieldCount() != 1:
-        return 'fail'
+    assert lyr2.GetLayerDefn().GetFieldCount() == 1
     ds = None
 
     gfld_defn = ogr.GeomFieldDefn('geom', ogr.wkbPoint)
@@ -3696,8 +3346,7 @@ def test_ogr_pg_70(with_and_without_postgis):
 
     ds = ogr.Open('PG:' + gdaltest.pg_connection_string)
     lyr2 = ds.GetLayerByName('ogr_pg_70')
-    if lyr2.GetLayerDefn().GetGeomFieldCount() != 2:
-        return 'fail'
+    assert lyr2.GetLayerDefn().GetGeomFieldCount() == 2
     ds = None
 
     if gdaltest.pg_has_postgis and gdaltest.pg_ds.GetLayerByName('geography_columns') is not None:
@@ -3711,11 +3360,9 @@ def test_ogr_pg_70(with_and_without_postgis):
 
         ds = ogr.Open('PG:' + gdaltest.pg_connection_string)
         lyr2 = ds.GetLayerByName('ogr_pg_70')
-        if lyr2.GetLayerDefn().GetGeomFieldCount() != 1:
-            return 'fail'
+        assert lyr2.GetLayerDefn().GetGeomFieldCount() == 1
         geography_columns_lyr = ds.ExecuteSQL("SELECT * FROM geography_columns WHERE f_table_name = 'ogr_pg_70' AND f_geography_column = 'my_geog'")
-        if geography_columns_lyr.GetFeatureCount() != 1:
-            return 'fail'
+        assert geography_columns_lyr.GetFeatureCount() == 1
         ds.ReleaseResultSet(geography_columns_lyr)
         ds = None
 
@@ -3792,10 +3439,7 @@ def test_ogr_pg_71(with_and_without_postgis):
         expected_wkt = wkt
         if not gdaltest.pg_has_postgis_2 and wkt.find('EMPTY') >= 0:
             expected_wkt = 'GEOMETRYCOLLECTION EMPTY'
-        if out_wkt != expected_wkt:
-            print(expected_wkt)
-            print(out_wkt)
-            return 'fail'
+        assert out_wkt == expected_wkt
 
         # Test parsing PostGIS WKT
         if gdaltest.pg_has_postgis_2:
@@ -3814,10 +3458,7 @@ def test_ogr_pg_71(with_and_without_postgis):
         expected_wkt = wkt
         if not gdaltest.pg_has_postgis_2 and wkt.find('EMPTY') >= 0:
             expected_wkt = 'GEOMETRYCOLLECTION EMPTY'
-        if out_wkt != expected_wkt:
-            print(expected_wkt)
-            print(out_wkt)
-            return 'fail'
+        assert out_wkt == expected_wkt
 
         g = ogr.CreateGeometryFromWkt(wkt)
         if g.GetCoordinateDimension() == 2:
@@ -3830,9 +3471,7 @@ def test_ogr_pg_71(with_and_without_postgis):
         f = ogr.Feature(active_lyr.GetLayerDefn())
         f.SetGeometry(g)
         ret = active_lyr.CreateFeature(f)
-        if ret != 0:
-            print(wkt)
-            return 'fail'
+        assert ret == 0, wkt
         fid = f.GetFID()
 
         # AsEWKT() in PostGIS 1.X does not like CIRCULARSTRING EMPTY
@@ -3847,10 +3486,7 @@ def test_ogr_pg_71(with_and_without_postgis):
         g = None
         f = None
 
-        if out_wkt != wkt:
-            print(wkt)
-            print(out_wkt)
-            return 'fail'
+        assert out_wkt == wkt
 
     return 'success'
 
@@ -3865,29 +3501,23 @@ def test_ogr_pg_72(with_and_without_postgis):
 
     # Regular layer with 32 bit IDs
     lyr = gdaltest.pg_ds.CreateLayer('ogr_pg_72')
-    if lyr.GetMetadataItem(ogr.OLMD_FID64) is not None:
-        return 'fail'
+    assert lyr.GetMetadataItem(ogr.OLMD_FID64) is None
     lyr.CreateField(ogr.FieldDefn('foo'))
     f = ogr.Feature(lyr.GetLayerDefn())
     f.SetFID(123456789012345)
     f.SetField(0, 'bar')
-    if lyr.CreateFeature(f) != 0:
-        return 'fail'
+    assert lyr.CreateFeature(f) == 0
     f = lyr.GetFeature(123456789012345)
-    if f is None:
-        return 'fail'
+    assert f is not None
 
     lyr = gdaltest.pg_ds.CreateLayer('ogr_pg_72', options=['FID64=YES', 'OVERWRITE=YES'])
-    if lyr.GetMetadataItem(ogr.OLMD_FID64) is None:
-        return 'fail'
+    assert lyr.GetMetadataItem(ogr.OLMD_FID64) is not None
     lyr.CreateField(ogr.FieldDefn('foo'))
     f = ogr.Feature(lyr.GetLayerDefn())
     f.SetFID(123456789012345)
     f.SetField(0, 'bar')
-    if lyr.CreateFeature(f) != 0:
-        return 'fail'
-    if lyr.SetFeature(f) != 0:
-        return 'fail'
+    assert lyr.CreateFeature(f) == 0
+    assert lyr.SetFeature(f) == 0
     gdaltest.pg_ds = None
     # Test with binary protocol
     # gdaltest.pg_ds = ogr.Open( 'PGB:' + gdaltest.pg_connection_string, update = 1 )
@@ -3904,8 +3534,7 @@ def test_ogr_pg_72(with_and_without_postgis):
     # Test with normal protocol
     gdaltest.pg_ds = ogr.Open('PG:' + gdaltest.pg_connection_string, update=1)
     lyr = gdaltest.pg_ds.GetLayerByName('ogr_pg_72')
-    if lyr.GetMetadataItem(ogr.OLMD_FID64) is None:
-        return 'fail'
+    assert lyr.GetMetadataItem(ogr.OLMD_FID64) is not None
     f = lyr.GetNextFeature()
     if f.GetFID() != 123456789012345:
         f.DumpReadable()
@@ -3952,8 +3581,7 @@ def test_ogr_pg_73(with_and_without_postgis):
     gdal.PushErrorHandler()
     ret = lyr.CreateFeature(f)
     gdal.PopErrorHandler()
-    if ret == 0:
-        return 'fail'
+    assert ret != 0
     f = None
 
     # Error case: missing non-nullable field
@@ -3962,8 +3590,7 @@ def test_ogr_pg_73(with_and_without_postgis):
     gdal.PushErrorHandler()
     ret = lyr.CreateFeature(f)
     gdal.PopErrorHandler()
-    if ret == 0:
-        return 'fail'
+    assert ret != 0
     f = None
 
     gdal.SetConfigOption('PG_USE_COPY', gdaltest.pg_use_copy)
@@ -3972,22 +3599,17 @@ def test_ogr_pg_73(with_and_without_postgis):
 
     ds = ogr.Open('PG:' + gdaltest.pg_connection_string, update=1)
     lyr = ds.GetLayerByName('ogr_pg_73')
-    if lyr.GetLayerDefn().GetFieldDefn(lyr.GetLayerDefn().GetFieldIndex('field_not_nullable')).IsNullable() != 0:
-        return 'fail'
-    if lyr.GetLayerDefn().GetFieldDefn(lyr.GetLayerDefn().GetFieldIndex('field_nullable')).IsNullable() != 1:
-        return 'fail'
-    if lyr.GetLayerDefn().GetGeomFieldDefn(lyr.GetLayerDefn().GetGeomFieldIndex('geomfield_not_nullable')).IsNullable() != 0:
-        return 'fail'
-    if lyr.GetLayerDefn().GetGeomFieldDefn(lyr.GetLayerDefn().GetGeomFieldIndex('geomfield_nullable')).IsNullable() != 1:
-        return 'fail'
+    assert lyr.GetLayerDefn().GetFieldDefn(lyr.GetLayerDefn().GetFieldIndex('field_not_nullable')).IsNullable() == 0
+    assert lyr.GetLayerDefn().GetFieldDefn(lyr.GetLayerDefn().GetFieldIndex('field_nullable')).IsNullable() == 1
+    assert lyr.GetLayerDefn().GetGeomFieldDefn(lyr.GetLayerDefn().GetGeomFieldIndex('geomfield_not_nullable')).IsNullable() == 0
+    assert lyr.GetLayerDefn().GetGeomFieldDefn(lyr.GetLayerDefn().GetGeomFieldIndex('geomfield_nullable')).IsNullable() == 1
 
     # Turn not null into nullable
     src_fd = lyr.GetLayerDefn().GetFieldDefn(lyr.GetLayerDefn().GetFieldIndex('field_not_nullable'))
     fd = ogr.FieldDefn('now_nullable', src_fd.GetType())
     fd.SetNullable(1)
     lyr.AlterFieldDefn(lyr.GetLayerDefn().GetFieldIndex('field_not_nullable'), fd, ogr.ALTER_ALL_FLAG)
-    if lyr.GetLayerDefn().GetFieldDefn(lyr.GetLayerDefn().GetFieldIndex('now_nullable')).IsNullable() != 1:
-        return 'fail'
+    assert lyr.GetLayerDefn().GetFieldDefn(lyr.GetLayerDefn().GetFieldIndex('now_nullable')).IsNullable() == 1
 
     # Turn nullable into not null, but remove NULL values first
     ds.ExecuteSQL("UPDATE ogr_pg_73 SET field_nullable = '' WHERE field_nullable IS NULL")
@@ -3996,18 +3618,13 @@ def test_ogr_pg_73(with_and_without_postgis):
     fd.SetName('now_not_nullable')
     fd.SetNullable(0)
     lyr.AlterFieldDefn(lyr.GetLayerDefn().GetFieldIndex('field_nullable'), fd, ogr.ALTER_ALL_FLAG)
-    if lyr.GetLayerDefn().GetFieldDefn(lyr.GetLayerDefn().GetFieldIndex('now_not_nullable')).IsNullable() != 0:
-        return 'fail'
+    assert lyr.GetLayerDefn().GetFieldDefn(lyr.GetLayerDefn().GetFieldIndex('now_not_nullable')).IsNullable() == 0
 
     sql_lyr = ds.ExecuteSQL('SELECT * FROM ogr_pg_73')
-    if sql_lyr.GetLayerDefn().GetFieldDefn(sql_lyr.GetLayerDefn().GetFieldIndex('now_not_nullable')).IsNullable() != 0:
-        return 'fail'
-    if sql_lyr.GetLayerDefn().GetFieldDefn(sql_lyr.GetLayerDefn().GetFieldIndex('now_nullable')).IsNullable() != 1:
-        return 'fail'
-    if sql_lyr.GetLayerDefn().GetGeomFieldDefn(sql_lyr.GetLayerDefn().GetGeomFieldIndex('geomfield_not_nullable')).IsNullable() != 0:
-        return 'fail'
-    if sql_lyr.GetLayerDefn().GetGeomFieldDefn(sql_lyr.GetLayerDefn().GetGeomFieldIndex('geomfield_nullable')).IsNullable() != 1:
-        return 'fail'
+    assert sql_lyr.GetLayerDefn().GetFieldDefn(sql_lyr.GetLayerDefn().GetFieldIndex('now_not_nullable')).IsNullable() == 0
+    assert sql_lyr.GetLayerDefn().GetFieldDefn(sql_lyr.GetLayerDefn().GetFieldIndex('now_nullable')).IsNullable() == 1
+    assert sql_lyr.GetLayerDefn().GetGeomFieldDefn(sql_lyr.GetLayerDefn().GetGeomFieldIndex('geomfield_not_nullable')).IsNullable() == 0
+    assert sql_lyr.GetLayerDefn().GetGeomFieldDefn(sql_lyr.GetLayerDefn().GetGeomFieldIndex('geomfield_nullable')).IsNullable() == 1
     ds.ReleaseResultSet(sql_lyr)
 
     return 'success'
@@ -4096,26 +3713,15 @@ def test_ogr_pg_74(with_and_without_postgis):
     ds = ogr.Open('PG:' + gdaltest.pg_connection_string, update=1)
     ds.ExecuteSQL('set timezone to "UTC"')
     lyr = ds.GetLayerByName('ogr_pg_74')
-    if lyr.GetLayerDefn().GetFieldDefn(lyr.GetLayerDefn().GetFieldIndex('field_string')).GetDefault() != "'a''b'":
-        return 'fail'
-    if lyr.GetLayerDefn().GetFieldDefn(lyr.GetLayerDefn().GetFieldIndex('field_int')).GetDefault() != '123':
-        return 'fail'
-    if lyr.GetLayerDefn().GetFieldDefn(lyr.GetLayerDefn().GetFieldIndex('field_real')).GetDefault() != '1.23':
-        return 'fail'
-    if lyr.GetLayerDefn().GetFieldDefn(lyr.GetLayerDefn().GetFieldIndex('field_nodefault')).GetDefault() is not None:
-        return 'fail'
-    if lyr.GetLayerDefn().GetFieldDefn(lyr.GetLayerDefn().GetFieldIndex('field_datetime')).GetDefault() != 'CURRENT_TIMESTAMP':
-        return 'fail'
-    if lyr.GetLayerDefn().GetFieldDefn(lyr.GetLayerDefn().GetFieldIndex('field_datetime2')).GetDefault() != "'2015/06/30 12:34:56'":
-        print(lyr.GetLayerDefn().GetFieldDefn(lyr.GetLayerDefn().GetFieldIndex('field_datetime2')).GetDefault())
-        return 'fail'
-    if lyr.GetLayerDefn().GetFieldDefn(lyr.GetLayerDefn().GetFieldIndex('field_datetime3')).GetDefault() != "'2015/06/30 12:34:56.123'":
-        print(lyr.GetLayerDefn().GetFieldDefn(lyr.GetLayerDefn().GetFieldIndex('field_datetime3')).GetDefault())
-        return 'fail'
-    if lyr.GetLayerDefn().GetFieldDefn(lyr.GetLayerDefn().GetFieldIndex('field_date')).GetDefault() != "CURRENT_DATE":
-        return 'fail'
-    if lyr.GetLayerDefn().GetFieldDefn(lyr.GetLayerDefn().GetFieldIndex('field_time')).GetDefault() != "CURRENT_TIME":
-        return 'fail'
+    assert lyr.GetLayerDefn().GetFieldDefn(lyr.GetLayerDefn().GetFieldIndex('field_string')).GetDefault() == "'a''b'"
+    assert lyr.GetLayerDefn().GetFieldDefn(lyr.GetLayerDefn().GetFieldIndex('field_int')).GetDefault() == '123'
+    assert lyr.GetLayerDefn().GetFieldDefn(lyr.GetLayerDefn().GetFieldIndex('field_real')).GetDefault() == '1.23'
+    assert lyr.GetLayerDefn().GetFieldDefn(lyr.GetLayerDefn().GetFieldIndex('field_nodefault')).GetDefault() is None
+    assert lyr.GetLayerDefn().GetFieldDefn(lyr.GetLayerDefn().GetFieldIndex('field_datetime')).GetDefault() == 'CURRENT_TIMESTAMP'
+    assert lyr.GetLayerDefn().GetFieldDefn(lyr.GetLayerDefn().GetFieldIndex('field_datetime2')).GetDefault() == "'2015/06/30 12:34:56'"
+    assert lyr.GetLayerDefn().GetFieldDefn(lyr.GetLayerDefn().GetFieldIndex('field_datetime3')).GetDefault() == "'2015/06/30 12:34:56.123'"
+    assert lyr.GetLayerDefn().GetFieldDefn(lyr.GetLayerDefn().GetFieldIndex('field_date')).GetDefault() == "CURRENT_DATE"
+    assert lyr.GetLayerDefn().GetFieldDefn(lyr.GetLayerDefn().GetFieldIndex('field_time')).GetDefault() == "CURRENT_TIME"
 
     f = lyr.GetNextFeature()
     if not f.IsFieldNull('field_string'):
@@ -4144,27 +3750,21 @@ def test_ogr_pg_74(with_and_without_postgis):
     fd = ogr.FieldDefn('field_string', src_fd.GetType())
     fd.SetDefault("'c'")
     lyr.AlterFieldDefn(lyr.GetLayerDefn().GetFieldIndex('field_string'), fd, ogr.ALTER_DEFAULT_FLAG)
-    if lyr.GetLayerDefn().GetFieldDefn(lyr.GetLayerDefn().GetFieldIndex('field_string')).GetDefault() != "'c'":
-        print(lyr.GetLayerDefn().GetFieldDefn(lyr.GetLayerDefn().GetFieldIndex('field_string')).GetDefault())
-        return 'fail'
+    assert lyr.GetLayerDefn().GetFieldDefn(lyr.GetLayerDefn().GetFieldIndex('field_string')).GetDefault() == "'c'"
 
     # Drop DEFAULT value
     src_fd = lyr.GetLayerDefn().GetFieldDefn(lyr.GetLayerDefn().GetFieldIndex('field_int'))
     fd = ogr.FieldDefn('field_int', src_fd.GetType())
     fd.SetDefault(None)
     lyr.AlterFieldDefn(lyr.GetLayerDefn().GetFieldIndex('field_int'), fd, ogr.ALTER_DEFAULT_FLAG)
-    if lyr.GetLayerDefn().GetFieldDefn(lyr.GetLayerDefn().GetFieldIndex('field_int')).GetDefault() is not None:
-        return 'fail'
+    assert lyr.GetLayerDefn().GetFieldDefn(lyr.GetLayerDefn().GetFieldIndex('field_int')).GetDefault() is None
 
     ds = None
     ds = ogr.Open('PG:' + gdaltest.pg_connection_string, update=1)
     ds.ExecuteSQL('set timezone to "UTC"')
     lyr = ds.GetLayerByName('ogr_pg_74')
-    if lyr.GetLayerDefn().GetFieldDefn(lyr.GetLayerDefn().GetFieldIndex('field_string')).GetDefault() != "'c'":
-        print(lyr.GetLayerDefn().GetFieldDefn(lyr.GetLayerDefn().GetFieldIndex('field_string')).GetDefault())
-        return 'fail'
-    if lyr.GetLayerDefn().GetFieldDefn(lyr.GetLayerDefn().GetFieldIndex('field_int')).GetDefault() is not None:
-        return 'fail'
+    assert lyr.GetLayerDefn().GetFieldDefn(lyr.GetLayerDefn().GetFieldIndex('field_string')).GetDefault() == "'c'"
+    assert lyr.GetLayerDefn().GetFieldDefn(lyr.GetLayerDefn().GetFieldIndex('field_int')).GetDefault() is None
 
     return 'success'
 
@@ -4186,12 +3786,10 @@ def test_ogr_pg_75(with_and_without_postgis):
     gdal.PushErrorHandler()
     ret = lyr.CreateField(ogr.FieldDefn('myfid', ogr.OFTString))
     gdal.PopErrorHandler()
-    if ret == 0:
-        return 'fail'
+    assert ret != 0
 
     ret = lyr.CreateField(ogr.FieldDefn('myfid', ogr.OFTInteger))
-    if ret != 0:
-        return 'fail'
+    assert ret == 0
     lyr.CreateField(ogr.FieldDefn('str2', ogr.OFTString))
 
     feat = ogr.Feature(lyr.GetLayerDefn())
@@ -4199,16 +3797,13 @@ def test_ogr_pg_75(with_and_without_postgis):
     feat.SetField('myfid', 10)
     feat.SetField('str2', 'second string')
     ret = lyr.CreateFeature(feat)
-    if ret != 0:
-        return 'fail'
-    if feat.GetFID() != 10:
-        return 'fail'
+    assert ret == 0
+    assert feat.GetFID() == 10
 
     feat = ogr.Feature(lyr.GetLayerDefn())
     feat.SetField('str2', 'second string')
     ret = lyr.CreateFeature(feat)
-    if ret != 0:
-        return 'fail'
+    assert ret == 0
     if feat.GetFID() < 0:
         feat.DumpReadable()
         return 'fail'
@@ -4218,8 +3813,7 @@ def test_ogr_pg_75(with_and_without_postgis):
 
     feat.SetField('str', 'foo')
     ret = lyr.SetFeature(feat)
-    if ret != 0:
-        return 'fail'
+    assert ret == 0
 
     feat = ogr.Feature(lyr.GetLayerDefn())
     feat.SetFID(1)
@@ -4227,31 +3821,26 @@ def test_ogr_pg_75(with_and_without_postgis):
     gdal.PushErrorHandler()
     ret = lyr.CreateFeature(feat)
     gdal.PopErrorHandler()
-    if ret == 0:
-        return 'fail'
+    assert ret != 0
 
     gdal.PushErrorHandler()
     ret = lyr.SetFeature(feat)
     gdal.PopErrorHandler()
-    if ret == 0:
-        return 'fail'
+    assert ret != 0
 
     feat.UnsetField('myfid')
     gdal.PushErrorHandler()
     ret = lyr.SetFeature(feat)
     gdal.PopErrorHandler()
-    if ret == 0:
-        return 'fail'
+    assert ret != 0
 
     feat = ogr.Feature(lyr.GetLayerDefn())
     feat.SetField('str', 'first string')
     feat.SetField('myfid', 12)
     feat.SetField('str2', 'second string')
     ret = lyr.CreateFeature(feat)
-    if ret != 0:
-        return 'fail'
-    if feat.GetFID() != 12:
-        return 'fail'
+    assert ret == 0
+    assert feat.GetFID() == 12
 
     lyr.ResetReading()
     f = lyr.GetNextFeature()
@@ -4283,13 +3872,10 @@ def test_ogr_pg_76(with_and_without_postgis):
     if gdaltest.pg_ds is None:
         return 'skip'
 
-    if gdaltest.pg_ds.TestCapability(ogr.ODsCTransactions) != 1:
-        return 'fail'
+    assert gdaltest.pg_ds.TestCapability(ogr.ODsCTransactions) == 1
 
     level = int(gdaltest.pg_ds.GetMetadataItem("nSoftTransactionLevel", "_DEBUG_"))
-    if level != 0:
-        print(level)
-        return 'fail'
+    assert level == 0
 
     if gdaltest.pg_has_postgis_2:
         gdaltest.pg_ds.StartTransaction()
@@ -4300,8 +3886,7 @@ def test_ogr_pg_76(with_and_without_postgis):
         f = sql_lyr.GetNextFeature()
         res = f.GetField(0)
         gdaltest.pg_ds.ReleaseResultSet(sql_lyr)
-        if res != 1:
-            return 'fail'
+        assert res == 1
 
         gdaltest.pg_ds.RollbackTransaction()
 
@@ -4310,9 +3895,7 @@ def test_ogr_pg_76(with_and_without_postgis):
         f = sql_lyr.GetNextFeature()
         res = f.GetField(0)
         gdaltest.pg_ds.ReleaseResultSet(sql_lyr)
-        if res != 0:
-            print(res)
-            return 'fail'
+        assert res == 0
 
     gdal.SetConfigOption('OGR_PG_CURSOR_PAGE', '1')
     lyr1 = gdaltest.pg_ds.CreateLayer('ogr_pg_76_lyr1', geom_type=ogr.wkbNone, options=['OVERWRITE=YES'])
@@ -4327,9 +3910,7 @@ def test_ogr_pg_76(with_and_without_postgis):
     lyr2.CreateFeature(ogr.Feature(lyr2.GetLayerDefn()))
 
     level = int(gdaltest.pg_ds.GetMetadataItem("nSoftTransactionLevel", "_DEBUG_"))
-    if level != 0:
-        print(level)
-        return 'fail'
+    assert level == 0
 
     ret = ogr_pg_76_scenario1(lyr1, lyr2)
     ret = ogr_pg_76_scenario2(lyr1, lyr2)
@@ -4344,74 +3925,50 @@ def test_ogr_pg_76(with_and_without_postgis):
 def ogr_pg_76_scenario1(lyr1, lyr2):
 
     (_, level, savepoint, usertransac) = ogr_pg_76_get_transaction_state(gdaltest.pg_ds)
-    if (level, savepoint, usertransac) != (0, 0, 0):
-        print(level, savepoint, usertransac)
-        return 'fail'
+    assert (level, savepoint, usertransac) == (0, 0, 0)
 
     f = lyr1.GetNextFeature()
-    if f is None or f.GetFID() != 1:
-        return 'fail'
+    assert f is not None and f.GetFID() == 1
     (lastcmd, level, savepoint, usertransac) = ogr_pg_76_get_transaction_state(gdaltest.pg_ds)
-    if (lastcmd, level, savepoint, usertransac) != ('BEGIN', 1, 0, 0):
-        print(lastcmd, level, savepoint, usertransac)
-        return 'fail'
+    assert (lastcmd, level, savepoint, usertransac) == ('BEGIN', 1, 0, 0)
 
     lyr1.SetAttributeFilter("foo is NULL")
     (lastcmd, level, savepoint, usertransac) = ogr_pg_76_get_transaction_state(gdaltest.pg_ds)
-    if (lastcmd, level, savepoint, usertransac) != ('COMMIT', 0, 0, 0):
-        print(lastcmd, level, savepoint, usertransac)
-        return 'fail'
+    assert (lastcmd, level, savepoint, usertransac) == ('COMMIT', 0, 0, 0)
 
     f = lyr1.GetNextFeature()
-    if f is None or f.GetFID() != 1:
-        return 'fail'
+    assert f is not None and f.GetFID() == 1
     (lastcmd, level, savepoint, usertransac) = ogr_pg_76_get_transaction_state(gdaltest.pg_ds)
-    if (lastcmd, level, savepoint, usertransac) != ('BEGIN', 1, 0, 0):
-        print(lastcmd, level, savepoint, usertransac)
-        return 'fail'
+    assert (lastcmd, level, savepoint, usertransac) == ('BEGIN', 1, 0, 0)
 
     f = lyr2.GetNextFeature()
-    if f is None or f.GetFID() != 1:
-        return 'fail'
+    assert f is not None and f.GetFID() == 1
     (lastcmd, level, savepoint, usertransac) = ogr_pg_76_get_transaction_state(gdaltest.pg_ds)
-    if (lastcmd, level, savepoint, usertransac) != ('', 2, 0, 0):
-        print(lastcmd, level, savepoint, usertransac)
-        return 'fail'
+    assert (lastcmd, level, savepoint, usertransac) == ('', 2, 0, 0)
 
     f = lyr1.GetNextFeature()
-    if f is None or f.GetFID() != 2:
-        return 'fail'
+    assert f is not None and f.GetFID() == 2
 
     # Check that GetFeature() doesn't reset the cursor
     f = lyr1.GetFeature(f.GetFID())
-    if f is None or f.GetFID() != 2:
-        return 'fail'
+    assert f is not None and f.GetFID() == 2
 
     f = lyr1.GetNextFeature()
-    if f is None or f.GetFID() != 3:
-        return 'fail'
+    assert f is not None and f.GetFID() == 3
     f = lyr2.GetNextFeature()
-    if f is None or f.GetFID() != 2:
-        return 'fail'
+    assert f is not None and f.GetFID() == 2
     (lastcmd, level, savepoint, usertransac) = ogr_pg_76_get_transaction_state(gdaltest.pg_ds)
-    if (lastcmd, level, savepoint, usertransac) != ('', 2, 0, 0):
-        print(lastcmd, level, savepoint, usertransac)
-        return 'fail'
+    assert (lastcmd, level, savepoint, usertransac) == ('', 2, 0, 0)
 
     lyr1.CreateFeature(ogr.Feature(lyr1.GetLayerDefn()))
 
     lyr1.ResetReading()
     (lastcmd, level, savepoint, usertransac) = ogr_pg_76_get_transaction_state(gdaltest.pg_ds)
-    if (lastcmd, level, savepoint, usertransac) != ('', 1, 0, 0):
-        print(lastcmd, level, savepoint, usertransac)
-        return 'fail'
+    assert (lastcmd, level, savepoint, usertransac) == ('', 1, 0, 0)
     lyr2.ResetReading()
     (lastcmd, level, savepoint, usertransac) = ogr_pg_76_get_transaction_state(gdaltest.pg_ds)
-    if (lastcmd, level, savepoint, usertransac) != ('COMMIT', 0, 0, 0):
-        print(lastcmd, level, savepoint, usertransac)
-        return 'fail'
-    if lyr1.GetFeatureCount() != 4:
-        return 'fail'
+    assert (lastcmd, level, savepoint, usertransac) == ('COMMIT', 0, 0, 0)
+    assert lyr1.GetFeatureCount() == 4
 
     return 'success'
 
@@ -4419,109 +3976,75 @@ def ogr_pg_76_scenario1(lyr1, lyr2):
 # Scenario 2 : a CreateFeature done in the middle of GetNextFeature(), themselves between a user transaction
 def ogr_pg_76_scenario2(lyr1, lyr2with_and_without_postgis):
 
-    if gdaltest.pg_ds.StartTransaction() != 0:
-        return 'fail'
+    assert gdaltest.pg_ds.StartTransaction() == 0
     (lastcmd, level, savepoint, usertransac) = ogr_pg_76_get_transaction_state(gdaltest.pg_ds)
-    if (lastcmd, level, savepoint, usertransac) != ('BEGIN', 1, 0, 1):
-        print(lastcmd, level, savepoint, usertransac)
-        return 'fail'
+    assert (lastcmd, level, savepoint, usertransac) == ('BEGIN', 1, 0, 1)
 
     # Try to re-enter a transaction
     gdal.ErrorReset()
     gdal.PushErrorHandler()
     ret = gdaltest.pg_ds.StartTransaction()
     gdal.PopErrorHandler()
-    if gdal.GetLastErrorMsg() == '' or ret == 0:
-        return 'fail'
+    assert not (gdal.GetLastErrorMsg() == '' or ret == 0)
     (lastcmd, level, savepoint, usertransac) = ogr_pg_76_get_transaction_state(gdaltest.pg_ds)
-    if (lastcmd, level, savepoint, usertransac) != ('', 1, 0, 1):
-        print(lastcmd, level, savepoint, usertransac)
-        return 'fail'
+    assert (lastcmd, level, savepoint, usertransac) == ('', 1, 0, 1)
 
     f = lyr1.GetNextFeature()
-    if f is None or f.GetFID() != 1:
-        return 'fail'
+    assert f is not None and f.GetFID() == 1
     (lastcmd, level, savepoint, usertransac) = ogr_pg_76_get_transaction_state(gdaltest.pg_ds)
-    if (lastcmd, level, savepoint, usertransac) != ('', 2, 0, 1):
-        print(lastcmd, level, savepoint, usertransac)
-        return 'fail'
+    assert (lastcmd, level, savepoint, usertransac) == ('', 2, 0, 1)
 
     f = lyr2.GetNextFeature()
-    if f is None or f.GetFID() != 1:
-        return 'fail'
+    assert f is not None and f.GetFID() == 1
     (lastcmd, level, savepoint, usertransac) = ogr_pg_76_get_transaction_state(gdaltest.pg_ds)
-    if (lastcmd, level, savepoint, usertransac) != ('', 3, 0, 1):
-        print(lastcmd, level, savepoint, usertransac)
-        return 'fail'
+    assert (lastcmd, level, savepoint, usertransac) == ('', 3, 0, 1)
 
     f = lyr1.GetNextFeature()
-    if f is None or f.GetFID() != 2:
-        return 'fail'
+    assert f is not None and f.GetFID() == 2
     f = lyr1.GetNextFeature()
-    if f is None or f.GetFID() != 3:
-        return 'fail'
+    assert f is not None and f.GetFID() == 3
     f = lyr2.GetNextFeature()
-    if f is None or f.GetFID() != 2:
-        return 'fail'
+    assert f is not None and f.GetFID() == 2
     (lastcmd, level, savepoint, usertransac) = ogr_pg_76_get_transaction_state(gdaltest.pg_ds)
-    if (lastcmd, level, savepoint, usertransac) != ('', 3, 0, 1):
-        print(lastcmd, level, savepoint, usertransac)
-        return 'fail'
+    assert (lastcmd, level, savepoint, usertransac) == ('', 3, 0, 1)
 
     lyr1.CreateFeature(ogr.Feature(lyr1.GetLayerDefn()))
 
     lyr1.ResetReading()
     (lastcmd, level, savepoint, usertransac) = ogr_pg_76_get_transaction_state(gdaltest.pg_ds)
-    if (lastcmd, level, savepoint, usertransac) != ('', 2, 0, 1):
-        print(lastcmd, level, savepoint, usertransac)
-        return 'fail'
+    assert (lastcmd, level, savepoint, usertransac) == ('', 2, 0, 1)
 
     lyr2.ResetReading()
     (lastcmd, level, savepoint, usertransac) = ogr_pg_76_get_transaction_state(gdaltest.pg_ds)
-    if (lastcmd, level, savepoint, usertransac) != ('', 1, 0, 1):
-        print(lastcmd, level, savepoint, usertransac)
-        return 'fail'
+    assert (lastcmd, level, savepoint, usertransac) == ('', 1, 0, 1)
 
-    if gdaltest.pg_ds.CommitTransaction() != 0:
-        return 'fail'
+    assert gdaltest.pg_ds.CommitTransaction() == 0
     (lastcmd, level, savepoint, usertransac) = ogr_pg_76_get_transaction_state(gdaltest.pg_ds)
-    if (lastcmd, level, savepoint, usertransac) != ('COMMIT', 0, 0, 0):
-        print(lastcmd, level, savepoint, usertransac)
-        return 'fail'
+    assert (lastcmd, level, savepoint, usertransac) == ('COMMIT', 0, 0, 0)
 
-    if gdaltest.pg_ds.StartTransaction() != 0:
-        return 'fail'
+    assert gdaltest.pg_ds.StartTransaction() == 0
 
-    if gdaltest.pg_ds.RollbackTransaction() != 0:
-        return 'fail'
+    assert gdaltest.pg_ds.RollbackTransaction() == 0
     (lastcmd, level, savepoint, usertransac) = ogr_pg_76_get_transaction_state(gdaltest.pg_ds)
-    if (lastcmd, level, savepoint, usertransac) != ('ROLLBACK', 0, 0, 0):
-        print(lastcmd, level, savepoint, usertransac)
-        return 'fail'
+    assert (lastcmd, level, savepoint, usertransac) == ('ROLLBACK', 0, 0, 0)
 
     # Try to re-commit a transaction
     gdal.ErrorReset()
     gdal.PushErrorHandler()
     ret = gdaltest.pg_ds.CommitTransaction()
     gdal.PopErrorHandler()
-    if gdal.GetLastErrorMsg() == '' or ret == 0:
-        return 'fail'
+    assert not (gdal.GetLastErrorMsg() == '' or ret == 0)
     (lastcmd, level, savepoint, usertransac) = ogr_pg_76_get_transaction_state(gdaltest.pg_ds)
-    if (lastcmd, level, savepoint, usertransac) != ('', 0, 0, 0):
-        print(lastcmd, level, savepoint, usertransac)
-        return 'fail'
+    assert (lastcmd, level, savepoint, usertransac) == ('', 0, 0, 0)
 
     # Try to rollback a non-transaction
     gdal.ErrorReset()
     gdal.PushErrorHandler()
     ret = gdaltest.pg_ds.RollbackTransaction()
     gdal.PopErrorHandler()
-    if gdal.GetLastErrorMsg() == '' or ret == 0:
-        return 'fail'
+    assert not (gdal.GetLastErrorMsg() == '' or ret == 0)
     (lastcmd, level, savepoint, usertransac) = ogr_pg_76_get_transaction_state(gdaltest.pg_ds)
-    if (lastcmd, level, savepoint, usertransac) != ('', 0, 0, 0):
-        print(lastcmd, level, savepoint, usertransac)
-        return 'fail'
+    assert (lastcmd, level, savepoint, usertransac) == ('', 0, 0, 0)
 
     return 'success'
 
@@ -4530,51 +4053,36 @@ def ogr_pg_76_scenario2(lyr1, lyr2with_and_without_postgis):
 
 def ogr_pg_76_scenario3(lyr1, lyr2with_and_without_postgis):
 
-    if gdaltest.pg_ds.StartTransaction() != 0:
-        return 'fail'
+    assert gdaltest.pg_ds.StartTransaction() == 0
     (lastcmd, level, savepoint, usertransac) = ogr_pg_76_get_transaction_state(gdaltest.pg_ds)
-    if (lastcmd, level, savepoint, usertransac) != ('BEGIN', 1, 0, 1):
-        print(lastcmd, level, savepoint, usertransac)
-        return 'fail'
+    assert (lastcmd, level, savepoint, usertransac) == ('BEGIN', 1, 0, 1)
 
     f = lyr1.GetNextFeature()
-    if f is None or f.GetFID() != 1:
-        return 'fail'
+    assert f is not None and f.GetFID() == 1
     (lastcmd, level, savepoint, usertransac) = ogr_pg_76_get_transaction_state(gdaltest.pg_ds)
-    if (lastcmd, level, savepoint, usertransac) != ('', 2, 0, 1):
-        print(lastcmd, level, savepoint, usertransac)
-        return 'fail'
+    assert (lastcmd, level, savepoint, usertransac) == ('', 2, 0, 1)
 
-    if gdaltest.pg_ds.CommitTransaction() != 0:
-        return 'fail'
+    assert gdaltest.pg_ds.CommitTransaction() == 0
     (lastcmd, level, savepoint, usertransac) = ogr_pg_76_get_transaction_state(gdaltest.pg_ds)
-    if (lastcmd, level, savepoint, usertransac) != ('COMMIT', 0, 0, 0):
-        print(lastcmd, level, savepoint, usertransac)
-        return 'fail'
+    assert (lastcmd, level, savepoint, usertransac) == ('COMMIT', 0, 0, 0)
 
     gdal.ErrorReset()
     gdal.PushErrorHandler()
     f = lyr1.GetNextFeature()
     gdal.PopErrorHandler()
-    if gdal.GetLastErrorMsg() == '' or f is not None:
-        return 'fail'
+    assert gdal.GetLastErrorMsg() != '' and f is None
 
     # Must re-issue an explicit ResetReading()
     lyr1.ResetReading()
 
     f = lyr1.GetNextFeature()
-    if f is None or f.GetFID() != 1:
-        return 'fail'
+    assert f is not None and f.GetFID() == 1
     (lastcmd, level, savepoint, usertransac) = ogr_pg_76_get_transaction_state(gdaltest.pg_ds)
-    if (lastcmd, level, savepoint, usertransac) != ('BEGIN', 1, 0, 0):
-        print(lastcmd, level, savepoint, usertransac)
-        return 'fail'
+    assert (lastcmd, level, savepoint, usertransac) == ('BEGIN', 1, 0, 0)
 
     lyr1.ResetReading()
     (lastcmd, level, savepoint, usertransac) = ogr_pg_76_get_transaction_state(gdaltest.pg_ds)
-    if (lastcmd, level, savepoint, usertransac) != ('COMMIT', 0, 0, 0):
-        print(lastcmd, level, savepoint, usertransac)
-        return 'fail'
+    assert (lastcmd, level, savepoint, usertransac) == ('COMMIT', 0, 0, 0)
 
     lyr2.ResetReading()
 
@@ -4586,85 +4094,57 @@ def ogr_pg_76_scenario3(lyr1, lyr2with_and_without_postgis):
 def ogr_pg_76_scenario4(lyr1, lyr2with_and_without_postgis):
 
     (lastcmd, level, savepoint, usertransac) = ogr_pg_76_get_transaction_state(gdaltest.pg_ds)
-    if (lastcmd, level, savepoint, usertransac) != ('', 0, 0, 0):
-        print(lastcmd, level, savepoint, usertransac)
-        return 'fail'
+    assert (lastcmd, level, savepoint, usertransac) == ('', 0, 0, 0)
 
     f = lyr1.GetNextFeature()
-    if f is None or f.GetFID() != 1:
-        return 'fail'
+    assert f is not None and f.GetFID() == 1
     (lastcmd, level, savepoint, usertransac) = ogr_pg_76_get_transaction_state(gdaltest.pg_ds)
-    if (lastcmd, level, savepoint, usertransac) != ('BEGIN', 1, 0, 0):
-        print(lastcmd, level, savepoint, usertransac)
-        return 'fail'
+    assert (lastcmd, level, savepoint, usertransac) == ('BEGIN', 1, 0, 0)
 
-    if gdaltest.pg_ds.StartTransaction() != 0:
-        return 'fail'
+    assert gdaltest.pg_ds.StartTransaction() == 0
     (lastcmd, level, savepoint, usertransac) = ogr_pg_76_get_transaction_state(gdaltest.pg_ds)
-    if (lastcmd, level, savepoint, usertransac) != ('SAVEPOINT ogr_savepoint', 2, 1, 1):
-        print(lastcmd, level, savepoint, usertransac)
-        return 'fail'
+    assert (lastcmd, level, savepoint, usertransac) == ('SAVEPOINT ogr_savepoint', 2, 1, 1)
 
     lyr1.CreateFeature(ogr.Feature(lyr1.GetLayerDefn()))
 
     f = lyr1.GetNextFeature()
-    if f is None or f.GetFID() != 2:
-        return 'fail'
+    assert f is not None and f.GetFID() == 2
     f = lyr2.GetNextFeature()
-    if f is None or f.GetFID() != 1:
-        return 'fail'
+    assert f is not None and f.GetFID() == 1
     (lastcmd, level, savepoint, usertransac) = ogr_pg_76_get_transaction_state(gdaltest.pg_ds)
-    if (lastcmd, level, savepoint, usertransac) != ('', 3, 1, 1):
-        print(lastcmd, level, savepoint, usertransac)
-        return 'fail'
+    assert (lastcmd, level, savepoint, usertransac) == ('', 3, 1, 1)
 
     # Check that it doesn't commit the transaction
     lyr1.SetAttributeFilter("foo is NULL")
     (lastcmd, level, savepoint, usertransac) = ogr_pg_76_get_transaction_state(gdaltest.pg_ds)
-    if (lastcmd, level, savepoint, usertransac) != ('', 2, 1, 1):
-        print(lastcmd, level, savepoint, usertransac)
-        return 'fail'
+    assert (lastcmd, level, savepoint, usertransac) == ('', 2, 1, 1)
 
     f = lyr1.GetNextFeature()
-    if f is None or f.GetFID() != 1:
-        return 'fail'
+    assert f is not None and f.GetFID() == 1
     (lastcmd, level, savepoint, usertransac) = ogr_pg_76_get_transaction_state(gdaltest.pg_ds)
-    if (lastcmd, level, savepoint, usertransac) != ('', 3, 1, 1):
-        print(lastcmd, level, savepoint, usertransac)
-        return 'fail'
+    assert (lastcmd, level, savepoint, usertransac) == ('', 3, 1, 1)
 
     f = lyr2.GetNextFeature()
-    if f is None or f.GetFID() != 2:
-        return 'fail'
+    assert f is not None and f.GetFID() == 2
 
-    if gdaltest.pg_ds.CommitTransaction() != 0:
-        return 'fail'
+    assert gdaltest.pg_ds.CommitTransaction() == 0
     (lastcmd, level, savepoint, usertransac) = ogr_pg_76_get_transaction_state(gdaltest.pg_ds)
-    if (lastcmd, level, savepoint, usertransac) != ('RELEASE SAVEPOINT ogr_savepoint', 2, 0, 0):
-        print(lastcmd, level, savepoint, usertransac)
-        return 'fail'
+    assert (lastcmd, level, savepoint, usertransac) == ('RELEASE SAVEPOINT ogr_savepoint', 2, 0, 0)
 
     lyr2.ResetReading()
 
-    if gdaltest.pg_ds.StartTransaction() != 0:
-        return 'fail'
+    assert gdaltest.pg_ds.StartTransaction() == 0
 
-    if gdaltest.pg_ds.RollbackTransaction() != 0:
-        return 'fail'
+    assert gdaltest.pg_ds.RollbackTransaction() == 0
     (lastcmd, level, savepoint, usertransac) = ogr_pg_76_get_transaction_state(gdaltest.pg_ds)
-    if (lastcmd, level, savepoint, usertransac) != ('ROLLBACK TO SAVEPOINT ogr_savepoint', 1, 0, 0):
-        print(lastcmd, level, savepoint, usertransac)
-        return 'fail'
+    assert (lastcmd, level, savepoint, usertransac) == ('ROLLBACK TO SAVEPOINT ogr_savepoint', 1, 0, 0)
 
     f = lyr1.GetNextFeature()
-    if f is None or f.GetFID() != 2:
-        return 'fail'
+    assert f is not None and f.GetFID() == 2
 
     lyr1.ResetReading()
     (lastcmd, level, savepoint, usertransac) = ogr_pg_76_get_transaction_state(gdaltest.pg_ds)
-    if (lastcmd, level, savepoint, usertransac) != ('COMMIT', 0, 0, 0):
-        print(lastcmd, level, savepoint, usertransac)
-        return 'fail'
+    assert (lastcmd, level, savepoint, usertransac) == ('COMMIT', 0, 0, 0)
 
     return 'success'
 
@@ -4699,14 +4179,12 @@ def test_ogr_pg_77(with_and_without_postgis):
     ds = ogr.Open('PG:' + gdaltest.pg_connection_string, update=1)
     lyr = ds.GetLayerByName('ogr_pg_77_1')
     feat = lyr.GetNextFeature()
-    if feat.GetField(0) != '1':
-        return 'fail'
+    assert feat.GetField(0) == '1'
     feat.SetField(0, 10)
     lyr.SetFeature(feat)
     lyr = ds.GetLayerByName('ogr_pg_77_2')
     feat = lyr.GetNextFeature()
-    if feat.GetField(0) != '2':
-        return 'fail'
+    assert feat.GetField(0) == '2'
     ds = None
 
     # Test fix for #6018
@@ -4715,8 +4193,7 @@ def test_ogr_pg_77(with_and_without_postgis):
     ds = ogr.Open('PG:' + gdaltest.pg_connection_string)
     lyr = ds.GetLayerByName('ogr_pg_77_1')
     feat = lyr.GetNextFeature()
-    if feat.GetField(0) != '1':
-        return 'fail'
+    assert feat.GetField(0) == '1'
     ds = None
 
     try:
@@ -4756,20 +4233,14 @@ def test_ogr_pg_78(with_and_without_postgis):
         lyr = gdaltest.pg_ds.GetLayer(i)
         if lyr.GetName() == 'ogr_pg_78':
             ogr_pg_78_found = True
-            if lyr.GetGeomType() != ogr.wkbPoint25D:
-                return 'fail'
-            if lyr.GetSpatialRef().ExportToWkt().find('4326') < 0:
-                return 'fail'
+            assert lyr.GetGeomType() == ogr.wkbPoint25D
+            assert lyr.GetSpatialRef().ExportToWkt().find('4326') >= 0
         if lyr.GetName() == 'ogr_pg_78_2':
             ogr_pg_78_2_found = True
-            if lyr.GetGeomType() != ogr.wkbPoint25D:
-                return 'fail'
-            if lyr.GetSpatialRef().ExportToWkt().find('4326') < 0:
-                return 'fail'
-    if not ogr_pg_78_found:
-        return 'fail'
-    if not ogr_pg_78_2_found:
-        return 'fail'
+            assert lyr.GetGeomType() == ogr.wkbPoint25D
+            assert lyr.GetSpatialRef().ExportToWkt().find('4326') >= 0
+    assert ogr_pg_78_found
+    assert ogr_pg_78_2_found
 
     gdaltest.pg_ds = None
     # Test with slow method
@@ -4807,10 +4278,8 @@ def test_ogr_pg_78(with_and_without_postgis):
             # if lyr.GetSpatialRef().ExportToWkt().find('4326') < 0:
             #    gdaltest.post_reason('fail')
             #    return 'fail'
-    if not ogr_pg_78_found:
-        return 'fail'
-    if not ogr_pg_78_2_found:
-        return 'fail'
+    assert ogr_pg_78_found
+    assert ogr_pg_78_2_found
 
     return 'success'
 
@@ -4835,15 +4304,12 @@ def test_ogr_pg_79(with_and_without_postgis):
         return 'fail'
     ds.ReleaseResultSet(sql_lyr)
     ret = ds.StartTransaction()
-    if ret != 0:
-        return 'fail'
+    assert ret == 0
     ret = ds.CommitTransaction()
-    if ret != 0:
-        return 'fail'
+    assert ret == 0
     gdal.ErrorReset()
     ds = None
-    if gdal.GetLastErrorMsg() != '':
-        return 'fail'
+    assert gdal.GetLastErrorMsg() == ''
 
     # random PRELUDE_STATEMENTS
     ds = gdal.OpenEx('PG:' + gdaltest.pg_connection_string,
@@ -4856,15 +4322,12 @@ def test_ogr_pg_79(with_and_without_postgis):
         return 'fail'
     ds.ReleaseResultSet(sql_lyr)
     ret = ds.StartTransaction()
-    if ret != 0:
-        return 'fail'
+    assert ret == 0
     ret = ds.CommitTransaction()
-    if ret != 0:
-        return 'fail'
+    assert ret == 0
     gdal.ErrorReset()
     ds = None
-    if gdal.GetLastErrorMsg() != '':
-        return 'fail'
+    assert gdal.GetLastErrorMsg() == ''
 
     # Test wrong PRELUDE_STATEMENTS
     with gdaltest.error_handler():
@@ -4872,8 +4335,7 @@ def test_ogr_pg_79(with_and_without_postgis):
                          gdal.OF_VECTOR | gdal.OF_UPDATE,
                          open_options=['PRELUDE_STATEMENTS=BEGIN;error SET LOCAL statement_timeout TO "1h";',
                                        'CLOSING_STATEMENTS=COMMIT;'])
-    if ds is not None:
-        return 'fail'
+    assert ds is None
 
     # Test wrong CLOSING_STATEMENTS
     ds = gdal.OpenEx('PG:' + gdaltest.pg_connection_string,
@@ -4883,8 +4345,7 @@ def test_ogr_pg_79(with_and_without_postgis):
     gdal.ErrorReset()
     with gdaltest.error_handler():
         ds = None
-    if gdal.GetLastErrorMsg() == '':
-        return 'fail'
+    assert gdal.GetLastErrorMsg() != ''
 
     return 'success'
 
@@ -4900,10 +4361,8 @@ def test_ogr_pg_80():
     gdal.ErrorReset()
     with gdaltest.error_handler():
         sql_lyr = gdaltest.pg_ds.ExecuteSQL('SELECT FROM')
-    if gdal.GetLastErrorMsg() == '':
-        return 'fail'
-    if sql_lyr is not None:
-        return 'fail'
+    assert gdal.GetLastErrorMsg() != ''
+    assert sql_lyr is None
 
     return 'success'
 
@@ -4966,9 +4425,7 @@ def test_ogr_pg_82():
 
     lyr = gdaltest.pg_ds.CreateLayer('ogr_pg_82', geom_type=ogr.wkbNone, options=['GEOMETRY_NAME=another_name'])
     lyr.CreateGeomField(ogr.GeomFieldDefn('my_geom', ogr.wkbPoint))
-    if lyr.GetLayerDefn().GetGeomFieldDefn(0).GetName() != 'another_name':
-        print(lyr.GetLayerDefn().GetGeomFieldDefn(0).GetName())
-        return 'fail'
+    assert lyr.GetLayerDefn().GetGeomFieldDefn(0).GetName() == 'another_name'
 
     return 'success'
 
@@ -5004,9 +4461,7 @@ def test_ogr_pg_83():
             geom = f.GetGeometryRef()
             if geom is not None:
                 got_wkt = geom.ExportToIsoWkt()
-        if got_wkt != expected_wkt:
-            print(geom_type, options, wkt, expected_wkt, got_wkt)
-            return 'fail'
+        assert got_wkt == expected_wkt, (geom_type, options, wkt, expected_wkt, got_wkt)
         lyr.ResetReading()  # flushes implicit transaction
 
         if 'GEOM_TYPE=geography' in options:
@@ -5032,9 +4487,7 @@ def test_ogr_pg_83():
             geom = f.GetGeometryRef()
             if geom is not None:
                 got_wkt = geom.ExportToIsoWkt()
-        if got_wkt != expected_wkt:
-            print(geom_type, options, wkt, expected_wkt, got_wkt)
-            return 'fail'
+        assert got_wkt == expected_wkt, (geom_type, options, wkt, expected_wkt, got_wkt)
         lyr.ResetReading()  # flushes implicit transaction
 
     return 'success'
@@ -5053,58 +4506,45 @@ def test_ogr_pg_84():
     # Test that SetMetadata() and SetMetadataItem() are without effect
     lyr.SetMetadata({'DESCRIPTION': 'bar'})
     lyr.SetMetadataItem('DESCRIPTION', 'baz')
-    if lyr.GetMetadataItem('DESCRIPTION') != 'foo':
-        return 'fail'
-    if lyr.GetMetadata_List() != ['DESCRIPTION=foo']:
-        print(lyr.GetMetadata())
-        return 'fail'
+    assert lyr.GetMetadataItem('DESCRIPTION') == 'foo'
+    assert lyr.GetMetadata_List() == ['DESCRIPTION=foo'], lyr.GetMetadata()
     ds = None
 
     ds = ogr.Open('PG:' + gdaltest.pg_connection_string, update=1)
     ds.GetLayerCount()  # load all layers
     lyr = ds.GetLayerByName('ogr_pg_84')
-    if lyr.GetMetadataItem('DESCRIPTION') != 'foo':
-        return 'fail'
-    if lyr.GetMetadata_List() != ['DESCRIPTION=foo']:
-        print(lyr.GetMetadata())
-        return 'fail'
+    assert lyr.GetMetadataItem('DESCRIPTION') == 'foo'
+    assert lyr.GetMetadata_List() == ['DESCRIPTION=foo'], lyr.GetMetadata()
     # Set with SetMetadata()
     lyr.SetMetadata(['DESCRIPTION=bar'])
     ds = None
 
     ds = ogr.Open('PG:' + gdaltest.pg_connection_string, update=1)
     lyr = ds.GetLayerByName('ogr_pg_84')  # load just this layer
-    if lyr.GetMetadataItem('DESCRIPTION') != 'bar':
-        return 'fail'
-    if lyr.GetMetadataDomainList() is None:
-        return 'fail'
+    assert lyr.GetMetadataItem('DESCRIPTION') == 'bar'
+    assert lyr.GetMetadataDomainList() is not None
     # Set with SetMetadataItem()
     lyr.SetMetadataItem('DESCRIPTION', 'baz')
     ds = None
 
     ds = ogr.Open('PG:' + gdaltest.pg_connection_string, update=1)
     lyr = ds.GetLayerByName('ogr_pg_84')
-    if lyr.GetMetadataDomainList() is None:
-        return 'fail'
-    if lyr.GetMetadataItem('DESCRIPTION') != 'baz':
-        return 'fail'
+    assert lyr.GetMetadataDomainList() is not None
+    assert lyr.GetMetadataItem('DESCRIPTION') == 'baz'
     # Unset with SetMetadataItem()
     lyr.SetMetadataItem('DESCRIPTION', None)
     ds = None
 
     ds = ogr.Open('PG:' + gdaltest.pg_connection_string)
     lyr = ds.GetLayerByName('ogr_pg_84')  # load just this layer
-    if lyr.GetMetadataDomainList() is not None:
-        return 'fail'
-    if lyr.GetMetadataItem('DESCRIPTION') is not None:
-        return 'fail'
+    assert lyr.GetMetadataDomainList() is None
+    assert lyr.GetMetadataItem('DESCRIPTION') is None
     ds = None
 
     ds = ogr.Open('PG:' + gdaltest.pg_connection_string)
     ds.GetLayerCount()  # load all layers
     lyr = ds.GetLayerByName('ogr_pg_84')  # load just this layer
-    if lyr.GetMetadataItem('DESCRIPTION') is not None:
-        return 'fail'
+    assert lyr.GetMetadataItem('DESCRIPTION') is None
     ds = None
 
     return 'success'
@@ -5133,11 +4573,9 @@ def test_ogr_pg_85():
     lyr.CreateFeature(f)
     lyr = ds.GetLayerByName('ogr_pg_85_2')
     feat_defn = lyr.GetLayerDefn()
-    if feat_defn.GetFieldCount() != 1:
-        return 'fail'
+    assert feat_defn.GetFieldCount() == 1
     f = ogr.Feature(feat_defn)
-    if lyr.CreateFeature(f) != 0:
-        return 'fail'
+    assert lyr.CreateFeature(f) == 0
     ds.CommitTransaction()
     ds = None
 
@@ -5161,9 +4599,7 @@ def test_ogr_pg_85():
     gdal.SetConfigOption('PG_USE_COPY', old_val)
 
     lyr = gdaltest.pg_ds.GetLayerByName('ogr_pg_85_2')
-    if lyr.GetFeatureCount() != 2:
-        print(lyr.GetFeatureCount())
-        return 'fail'
+    assert lyr.GetFeatureCount() == 2
 
     return 'success'
 
@@ -5228,16 +4664,14 @@ def test_ogr_pg_87():
     lyr = gdaltest.pg_ds.GetLayerByName('ogr_pg_87')
     f = ogr.Feature(lyr.GetLayerDefn())
     lyr.CreateFeature(f)
-    if f.GetFID() != 11:
-        return 'fail'
+    assert f.GetFID() == 11
 
     # Test updating of sequence after CreateFeatureViaInsert
     gdaltest.pg_ds = ogr.Open('PG:' + gdaltest.pg_connection_string, update=1)
     lyr = gdaltest.pg_ds.GetLayerByName('ogr_pg_87')
     f = ogr.Feature(lyr.GetLayerDefn())
     lyr.CreateFeature(f)
-    if f.GetFID() != 12:
-        return 'fail'
+    assert f.GetFID() == 12
 
     return 'success'
 
@@ -5260,16 +4694,14 @@ def test_ogr_pg_json():
 
     gdaltest.pg_ds = ogr.Open('PG:' + gdaltest.pg_connection_string, update=1)
     lyr = gdaltest.pg_ds.GetLayer('ogr_pg_json')
-    if lyr.GetLayerDefn().GetFieldDefn(0).GetSubType() != ogr.OFSTJSON:
-        return 'fail'
+    assert lyr.GetLayerDefn().GetFieldDefn(0).GetSubType() == ogr.OFSTJSON
     f = lyr.GetNextFeature()
     if f.GetField(0) != '{"a": "b"}':
         f.DumpReadable()
         return 'fail'
 
     sql_lyr = gdaltest.pg_ds.ExecuteSQL('SELECT * FROM ogr_pg_json')
-    if sql_lyr.GetLayerDefn().GetFieldDefn(0).GetSubType() != ogr.OFSTJSON:
-        return 'fail'
+    assert sql_lyr.GetLayerDefn().GetFieldDefn(0).GetSubType() == ogr.OFSTJSON
     gdaltest.pg_ds.ReleaseResultSet(sql_lyr)
 
     return 'success'
diff --git a/autotest/ogr/ogr_pgdump.py b/autotest/ogr/ogr_pgdump.py
index b787c30b4c9c..2aed1489097b 100755
--- a/autotest/ogr/ogr_pgdump.py
+++ b/autotest/ogr/ogr_pgdump.py
@@ -89,7 +89,7 @@ def test_ogr_pgdump_1():
     sql = f.read()
     f.close()
 
-    if sql.find("""DROP TABLE IF EXISTS "public"."tpoly" CASCADE;""") == -1 or \
+    assert (not (sql.find("""DROP TABLE IF EXISTS "public"."tpoly" CASCADE;""") == -1 or \
        sql.find("""DELETE FROM geometry_columns WHERE f_table_name = 'tpoly' AND f_table_schema = 'public';""") == -1 or \
        sql.find("""BEGIN;""") == -1 or \
        sql.find("""CREATE TABLE "public"."tpoly" ( "ogc_fid" SERIAL, CONSTRAINT "tpoly_pk" PRIMARY KEY ("ogc_fid") );""") == -1 or \
@@ -100,9 +100,7 @@ def test_ogr_pgdump_1():
        sql.find("""ALTER TABLE "public"."tpoly" ADD COLUMN "prfedea" VARCHAR;""") == -1 or \
        sql.find("""ALTER TABLE "public"."tpoly" ADD COLUMN "shortname" VARCHAR(8);""") == -1 or \
        sql.find("""INSERT INTO "public"."tpoly" ("wkb_geometry" , "area", "eas_id", "prfedea") VALUES ('01030000800100000005000000000000C01A481D4100000080072D5241000000000000000000000060AA461D4100000080FF2C524100000000000000000000006060461D41000000400C2D52410000000000000000000000A0DF471D4100000000142D52410000000000000000000000C01A481D4100000080072D52410000000000000000', 5268.813, 170, '35043413');""") == -1 or \
-       sql.find("""COMMIT;""") == -1:
-        print(sql)
-        return 'fail'
+       sql.find("""COMMIT;""") == -1))
 
     return 'success'
 
@@ -161,7 +159,7 @@ def test_ogr_pgdump_2():
     sql = f.read()
     f.close()
 
-    if sql.find("""DROP TABLE IF EXISTS "another_schema"."tpoly" CASCADE;""") == -1 or \
+    assert (not (sql.find("""DROP TABLE IF EXISTS "another_schema"."tpoly" CASCADE;""") == -1 or \
        sql.find("""DELETE FROM geometry_columns WHERE f_table_name = 'tpoly' AND f_table_schema = 'another_schema';""") == -1 or \
        sql.find("""BEGIN;""") == -1 or \
        sql.find("""CREATE TABLE "another_schema"."tpoly" ( "ogc_fid" SERIAL, CONSTRAINT "tpoly_pk" PRIMARY KEY ("ogc_fid") );""") == -1 or \
@@ -174,9 +172,7 @@ def test_ogr_pgdump_2():
        sql.find("""COPY "another_schema"."tpoly" ("the_geom", "area", "eas_id", "prfedea", "shortname") FROM STDIN;""") == -1 or \
        sql.find("0103000020E61000000100000005000000000000C01A481D4100000080072D524100000060AA461D4100000080FF2C52410000006060461D41000000400C2D5241000000A0DF471D4100000000142D5241000000C01A481D4100000080072D5241	5268.813	170	35043413	\\N") == -1 or \
        sql.find("""\.""") == -1 or \
-       sql.find("""COMMIT;""") == -1:
-        print(sql)
-        return 'fail'
+       sql.find("""COMMIT;""") == -1))
 
     return 'success'
 
@@ -246,7 +242,7 @@ def test_ogr_pgdump_3():
     sql = f.read()
     f.close()
 
-    if sql.find("""DROP TABLE IF EXISTS "another_schema"."tpoly" CASCADE;""") == -1 or \
+    assert (not (sql.find("""DROP TABLE IF EXISTS "another_schema"."tpoly" CASCADE;""") == -1 or \
        sql.find("""DELETE FROM geometry_columns""") != -1 or \
        sql.find("""BEGIN;""") == -1 or \
        sql.find("""CREATE TABLE "another_schema"."tpoly" (    "ogc_fid" SERIAL,    CONSTRAINT "tpoly_pk" PRIMARY KEY ("ogc_fid") );""") == -1 or \
@@ -260,9 +256,7 @@ def test_ogr_pgdump_3():
        sql.find("""\\N	215229.266	168	35043411	\\N""") == -1 or \
        sql.find("""	5268.813	170	35043413	\\N""") == -1 or \
        sql.find("""\\.""") == -1 or \
-       sql.find("""COMMIT;""") == -1:
-        print(sql)
-        return 'fail'
+       sql.find("""COMMIT;""") == -1))
 
     return 'success'
 
@@ -273,14 +267,12 @@ def test_ogr_pgdump_3():
 def test_ogr_pgdump_4():
 
     ds = ogr.GetDriverByName('PGDump').CreateDataSource('tmp/ogr_pgdump_4.sql', options=['LINEFORMAT=LF'])
-    if ds.TestCapability(ogr.ODsCCreateGeomFieldAfterCreateLayer) == 0:
-        return 'fail'
+    assert ds.TestCapability(ogr.ODsCCreateGeomFieldAfterCreateLayer) != 0
 
     ######################################################
     # Create Layer
     lyr = ds.CreateLayer('test', geom_type=ogr.wkbNone, options=['WRITE_EWKT_GEOM=YES'])
-    if lyr.TestCapability(ogr.OLCCreateGeomField) == 0:
-        return 'fail'
+    assert lyr.TestCapability(ogr.OLCCreateGeomField) != 0
 
     gfld_defn = ogr.GeomFieldDefn("point_nosrs", ogr.wkbPoint)
     lyr.CreateGeomField(gfld_defn)
@@ -305,15 +297,13 @@ def test_ogr_pgdump_4():
     sql = f.read()
     f.close()
 
-    if sql.find("""CREATE TABLE "public"."test" (    "ogc_fid" SERIAL,    CONSTRAINT "test_pk" PRIMARY KEY ("ogc_fid") )""") == -1 or \
+    assert (not (sql.find("""CREATE TABLE "public"."test" (    "ogc_fid" SERIAL,    CONSTRAINT "test_pk" PRIMARY KEY ("ogc_fid") )""") == -1 or \
        sql.find("""SELECT AddGeometryColumn('public','test','point_nosrs',-1,'POINT',2)""") == -1 or \
        sql.find("""CREATE INDEX "test_point_nosrs_geom_idx" ON "public"."test" USING GIST ("point_nosrs")""") == -1 or \
        sql.find("""SELECT AddGeometryColumn('public','test','poly',4326,'POLYGON',3)""") == -1 or \
        sql.find("""CREATE INDEX "test_poly_geom_idx" ON "public"."test" USING GIST ("poly")""") == -1 or \
        sql.find("""INSERT INTO "public"."test" DEFAULT VALUES""") == -1 or \
-       sql.find("""INSERT INTO "public"."test" ("point_nosrs" , "poly" ) VALUES (GeomFromEWKT('SRID=-1;POINT (1 2)'::TEXT) , GeomFromEWKT('SRID=4326;POLYGON ((0 0 0,0 1 0,1 1 0,1 0 0,0 0 0))'::TEXT) )""") == -1:
-        print(sql)
-        return 'fail'
+       sql.find("""INSERT INTO "public"."test" ("point_nosrs" , "poly" ) VALUES (GeomFromEWKT('SRID=-1;POINT (1 2)'::TEXT) , GeomFromEWKT('SRID=4326;POLYGON ((0 0 0,0 1 0,1 1 0,1 0 0,0 0 0))'::TEXT) )""") == -1))
 
     return 'success'
 
@@ -347,8 +337,7 @@ def test_ogr_pgdump_5():
     gdal.PushErrorHandler()
     ret = lyr.CreateFeature(f)
     gdal.PopErrorHandler()
-    if ret == 0:
-        return 'fail'
+    assert ret != 0
     f = None
 
     # Error case: missing non-nullable field
@@ -357,8 +346,7 @@ def test_ogr_pgdump_5():
     gdal.PushErrorHandler()
     ret = lyr.CreateFeature(f)
     gdal.PopErrorHandler()
-    if ret == 0:
-        return 'fail'
+    assert ret != 0
     f = None
 
     ds = None
@@ -369,11 +357,9 @@ def test_ogr_pgdump_5():
 
     gdal.Unlink('/vsimem/ogr_pgdump_5.sql')
 
-    if sql.find("""ALTER TABLE "public"."test" ADD COLUMN "field_not_nullable" VARCHAR NOT NULL;""") == -1 or \
+    assert (not (sql.find("""ALTER TABLE "public"."test" ADD COLUMN "field_not_nullable" VARCHAR NOT NULL;""") == -1 or \
        sql.find("""ALTER TABLE "public"."test" ADD COLUMN "field_nullable" VARCHAR;""") == -1 or \
-       sql.find("""ALTER TABLE "test" ALTER COLUMN "geomfield_not_nullable" SET NOT NULL;""") == -1:
-        print(sql)
-        return 'fail'
+       sql.find("""ALTER TABLE "test" ALTER COLUMN "geomfield_not_nullable" SET NOT NULL;""") == -1))
 
     return 'success'
 
@@ -457,7 +443,7 @@ def test_ogr_pgdump_6():
 
     gdal.Unlink('/vsimem/ogr_pgdump_6.sql')
 
-    if sql.find("""a\t456\t4.56\t\\N\t2015/06/30 12:34:56\t2015/06/30 12:34:56\t2015/06/30\t12:34:56""") < 0 or \
+    assert (not (sql.find("""a\t456\t4.56\t\\N\t2015/06/30 12:34:56\t2015/06/30 12:34:56\t2015/06/30\t12:34:56""") < 0 or \
        sql.find("""ALTER TABLE "public"."test" ADD COLUMN "field_string" VARCHAR DEFAULT 'a''b';""") == -1 or \
        sql.find("""ALTER TABLE "public"."test" ADD COLUMN "field_int" INTEGER DEFAULT 123;""") == -1 or \
        sql.find("""ALTER TABLE "public"."test" ADD COLUMN "field_real" FLOAT8 DEFAULT 1.23;""") == -1 or \
@@ -465,9 +451,7 @@ def test_ogr_pgdump_6():
        sql.find("""ALTER TABLE "public"."test" ADD COLUMN "field_datetime2" timestamp with time zone DEFAULT '2015/06/30 12:34:56+00'::timestamp with time zone;""") == -1 or \
        sql.find("""ALTER TABLE "public"."test" ADD COLUMN "field_date" date DEFAULT CURRENT_DATE;""") == -1 or \
        sql.find("""ALTER TABLE "public"."test" ADD COLUMN "field_time" time DEFAULT CURRENT_TIME;""") == -1 or \
-       sql.find("""b\t456\t4.56\t\\N\t2015/06/30 12:34:56\t2015/06/30 12:34:56\t2015/06/30\t12:34:56""") < 0:
-        print(sql)
-        return 'fail'
+       sql.find("""b\t456\t4.56\t\\N\t2015/06/30 12:34:56\t2015/06/30 12:34:56\t2015/06/30\t12:34:56""") < 0))
 
     return 'success'
 
@@ -484,12 +468,10 @@ def test_ogr_pgdump_7():
     gdal.PushErrorHandler()
     ret = lyr.CreateField(ogr.FieldDefn('myfid', ogr.OFTString))
     gdal.PopErrorHandler()
-    if ret == 0:
-        return 'fail'
+    assert ret != 0
 
     ret = lyr.CreateField(ogr.FieldDefn('myfid', ogr.OFTInteger))
-    if ret != 0:
-        return 'fail'
+    assert ret == 0
     lyr.CreateField(ogr.FieldDefn('str2', ogr.OFTString))
 
     feat = ogr.Feature(lyr.GetLayerDefn())
@@ -497,16 +479,13 @@ def test_ogr_pgdump_7():
     feat.SetField('myfid', 10)
     feat.SetField('str2', 'second string')
     ret = lyr.CreateFeature(feat)
-    if ret != 0:
-        return 'fail'
-    if feat.GetFID() != 10:
-        return 'fail'
+    assert ret == 0
+    assert feat.GetFID() == 10
 
     feat = ogr.Feature(lyr.GetLayerDefn())
     feat.SetField('str2', 'second string')
     ret = lyr.CreateFeature(feat)
-    if ret != 0:
-        return 'fail'
+    assert ret == 0
     if feat.GetFID() < 0:
         feat.DumpReadable()
         return 'fail'
@@ -526,8 +505,7 @@ def test_ogr_pgdump_7():
     gdal.PushErrorHandler()
     ret = lyr.CreateFeature(feat)
     gdal.PopErrorHandler()
-    if ret == 0:
-        return 'fail'
+    assert ret != 0
 
     # gdal.PushErrorHandler()
     # ret = lyr.SetFeature(feat)
@@ -549,10 +527,8 @@ def test_ogr_pgdump_7():
     feat.SetField('myfid', 12)
     feat.SetField('str2', 'second string')
     ret = lyr.CreateFeature(feat)
-    if ret != 0:
-        return 'fail'
-    if feat.GetFID() != 12:
-        return 'fail'
+    assert ret == 0
+    assert feat.GetFID() == 12
 
     ds = None
 
@@ -562,13 +538,11 @@ def test_ogr_pgdump_7():
 
     gdal.Unlink('/vsimem/ogr_pgdump_7.sql')
 
-    if sql.find("""CREATE TABLE "public"."test" (    "myfid" SERIAL,    CONSTRAINT "test_pk" PRIMARY KEY ("myfid") )""") < 0 or \
+    assert (not (sql.find("""CREATE TABLE "public"."test" (    "myfid" SERIAL,    CONSTRAINT "test_pk" PRIMARY KEY ("myfid") )""") < 0 or \
        sql.find("""ALTER TABLE "public"."test" ADD COLUMN "myfid" """) >= 0 or \
        sql.find("""INSERT INTO "public"."test" ("myfid" , "str", "str2") VALUES (10, 'first string', 'second string');""") == -1 or \
        sql.find("""INSERT INTO "public"."test" ("str2") VALUES ('second string');""") == -1 or \
-       sql.find("""INSERT INTO "public"."test" ("myfid" , "str", "str2") VALUES (12, 'first string', 'second string');""") == -1:
-        print(sql)
-        return 'fail'
+       sql.find("""INSERT INTO "public"."test" ("myfid" , "str", "str2") VALUES (12, 'first string', 'second string');""") == -1))
 
     return 'success'
 
@@ -585,12 +559,10 @@ def test_ogr_pgdump_8():
     gdal.PushErrorHandler()
     ret = lyr.CreateField(ogr.FieldDefn('myfid', ogr.OFTString))
     gdal.PopErrorHandler()
-    if ret == 0:
-        return 'fail'
+    assert ret != 0
 
     ret = lyr.CreateField(ogr.FieldDefn('myfid', ogr.OFTInteger))
-    if ret != 0:
-        return 'fail'
+    assert ret == 0
     lyr.CreateField(ogr.FieldDefn('str2', ogr.OFTString))
 
     feat = ogr.Feature(lyr.GetLayerDefn())
@@ -600,18 +572,15 @@ def test_ogr_pgdump_8():
     gdal.SetConfigOption('PG_USE_COPY', 'YES')
     ret = lyr.CreateFeature(feat)
     gdal.SetConfigOption('PG_USE_COPY', None)
-    if ret != 0:
-        return 'fail'
-    if feat.GetFID() != 10:
-        return 'fail'
+    assert ret == 0
+    assert feat.GetFID() == 10
 
     feat = ogr.Feature(lyr.GetLayerDefn())
     feat.SetField('str2', 'second string')
     gdal.SetConfigOption('PG_USE_COPY', 'YES')
     ret = lyr.CreateFeature(feat)
     gdal.SetConfigOption('PG_USE_COPY', None)
-    if ret != 0:
-        return 'fail'
+    assert ret == 0
     if feat.GetFID() < 0:
         feat.DumpReadable()
         return 'fail'
@@ -633,8 +602,7 @@ def test_ogr_pgdump_8():
     ret = lyr.CreateFeature(feat)
     gdal.SetConfigOption('PG_USE_COPY', None)
     gdal.PopErrorHandler()
-    if ret == 0:
-        return 'fail'
+    assert ret != 0
 
     # gdal.PushErrorHandler()
     # ret = lyr.SetFeature(feat)
@@ -658,10 +626,8 @@ def test_ogr_pgdump_8():
     gdal.SetConfigOption('PG_USE_COPY', 'YES')
     ret = lyr.CreateFeature(feat)
     gdal.SetConfigOption('PG_USE_COPY', None)
-    if ret != 0:
-        return 'fail'
-    if feat.GetFID() != 12:
-        return 'fail'
+    assert ret == 0
+    assert feat.GetFID() == 12
 
     ds = None
 
@@ -671,13 +637,11 @@ def test_ogr_pgdump_8():
 
     gdal.Unlink('/vsimem/ogr_pgdump_8.sql')
 
-    if sql.find("""CREATE TABLE "public"."test" (    "myfid" SERIAL,    CONSTRAINT "test_pk" PRIMARY KEY ("myfid") )""") < 0 or \
+    assert (not (sql.find("""CREATE TABLE "public"."test" (    "myfid" SERIAL,    CONSTRAINT "test_pk" PRIMARY KEY ("myfid") )""") < 0 or \
        sql.find("""ALTER TABLE "public"."test" ADD COLUMN "myfid" """) >= 0 or \
        sql.find("""10\tfirst string\tsecond string""") == -1 or \
        sql.find("""INSERT INTO "public"."test" ("str2") VALUES ('second string');""") == -1 or \
-       sql.find("""12\tfirst string\tsecond string""") == -1:
-        print(sql)
-        return 'fail'
+       sql.find("""12\tfirst string\tsecond string""") == -1))
 
     return 'success'
 
@@ -737,12 +701,10 @@ def test_ogr_pgdump_9(pg_use_copy='YES'):
         eofield = '\t'
     else:
         eofield = "'"
-    if sql.find("""01234%s""" % eofield) < 0 or \
-       sql.find("""ABCDE%s""" % eofield) < 0 or \
-       sql.find("""%s%s""" % (val5, eofield)) < 0 or \
-       sql.find("""%s%s""" % ('a' + val4, eofield)) < 0:
-        print(sql)
-        return 'fail'
+    assert (sql.find("""01234%s""" % eofield) >= 0 and \
+       sql.find("""ABCDE%s""" % eofield) >= 0 and \
+       sql.find("""%s%s""" % (val5, eofield)) >= 0 and \
+       sql.find("""%s%s""" % ('a' + val4, eofield)) >= 0)
 
     return 'success'
 
@@ -771,10 +733,8 @@ def test_ogr_pgdump_11():
     gdal.Unlink('/vsimem/ogr_pgdump_11.sql')
 
     # clang -m32 generates F8FF..., instead of F87F... for all other systems
-    if sql.find('0101000000000000000000F87F000000000000F87F') < 0 and \
-       sql.find('0101000000000000000000F8FF000000000000F8FF') < 0:
-        print(sql)
-        return 'fail'
+    assert (sql.find('0101000000000000000000F87F000000000000F87F') >= 0 or \
+       sql.find('0101000000000000000000F8FF000000000000F8FF') >= 0)
 
     return 'success'
 
@@ -798,9 +758,7 @@ def test_ogr_pgdump_12():
 
     gdal.Unlink('/vsimem/ogr_pgdump_12.sql')
 
-    if sql.find('another_name') < 0:
-        print(sql)
-        return 'fail'
+    assert sql.find('another_name') >= 0
 
     return 'success'
 
@@ -845,10 +803,7 @@ def test_ogr_pgdump_13():
         gdal.Unlink('/vsimem/ogr_pgdump_13.sql')
 
         for expected_string in expected_strings:
-            if sql.find(expected_string) < 0:
-                print(geom_type, options, wkt, expected_string)
-                print(sql)
-                return 'fail'
+            assert sql.find(expected_string) >= 0, (geom_type, options, wkt, expected_string)
 
         if 'GEOM_TYPE=geography' in options:
             continue
@@ -869,10 +824,7 @@ def test_ogr_pgdump_13():
         gdal.Unlink('/vsimem/ogr_pgdump_13.sql')
 
         for expected_string in expected_strings:
-            if sql.find(expected_string) < 0:
-                print(geom_type, options, wkt, expected_string)
-                print(sql)
-                return 'fail'
+            assert sql.find(expected_string) >= 0, (geom_type, options, wkt, expected_string)
 
     return 'success'
 
@@ -896,9 +848,7 @@ def test_ogr_pgdump_14():
 
     gdal.Unlink('/vsimem/ogr_pgdump_14.sql')
 
-    if sql.find("""COMMENT ON TABLE "public"."ogr_pgdump_14" IS 'foo';""") < 0 or sql.find('bar') >= 0 or sql.find('baz') >= 0:
-        print(sql)
-        return 'fail'
+    assert sql.find("""COMMENT ON TABLE "public"."ogr_pgdump_14" IS 'foo';""") >= 0 and sql.find('bar') < 0 and sql.find('baz') < 0
 
     # Set with SetMetadataItem()
     ds = ogr.GetDriverByName('PGDump').CreateDataSource('/vsimem/ogr_pgdump_14.sql', options=['LINEFORMAT=LF'])
@@ -911,9 +861,7 @@ def test_ogr_pgdump_14():
     gdal.VSIFCloseL(f)
 
     gdal.Unlink('/vsimem/ogr_pgdump_14.sql')
-    if sql.find("""COMMENT ON TABLE "public"."ogr_pgdump_14" IS 'bar';""") < 0:
-        print(sql)
-        return 'fail'
+    assert sql.find("""COMMENT ON TABLE "public"."ogr_pgdump_14" IS 'bar';""") >= 0
 
     # Set with SetMetadata()
     ds = ogr.GetDriverByName('PGDump').CreateDataSource('/vsimem/ogr_pgdump_14.sql', options=['LINEFORMAT=LF'])
@@ -926,9 +874,7 @@ def test_ogr_pgdump_14():
     gdal.VSIFCloseL(f)
 
     gdal.Unlink('/vsimem/ogr_pgdump_14.sql')
-    if sql.find("""COMMENT ON TABLE "public"."ogr_pgdump_14" IS 'baz';""") < 0:
-        print(sql)
-        return 'fail'
+    assert sql.find("""COMMENT ON TABLE "public"."ogr_pgdump_14" IS 'baz';""") >= 0
 
     return 'success'
 
@@ -955,10 +901,8 @@ def test_ogr_pgdump_15():
 
     gdal.Unlink('/vsimem/ogr_pgdump_15.sql')
 
-    if sql.find('INSERT INTO "public"."test" ("str") VALUES (NULL)') < 0 and \
-       sql.find('INSERT INTO "public"."test" DEFAULT VALUES') < 0:
-        print(sql)
-        return 'fail'
+    assert (sql.find('INSERT INTO "public"."test" ("str") VALUES (NULL)') >= 0 or \
+       sql.find('INSERT INTO "public"."test" DEFAULT VALUES') >= 0)
 
     return 'success'
 
@@ -986,9 +930,7 @@ def test_ogr_pgdump_16():
 
         gdal.Unlink('/vsimem/ogr_pgdump_16.sql')
 
-        if sql.find("""SELECT setval(pg_get_serial_sequence('"public"."test"', 'ogc_fid'), MAX("ogc_fid")) FROM "public"."test";""") < 0:
-            print(sql)
-            return 'fail'
+        assert sql.find("""SELECT setval(pg_get_serial_sequence('"public"."test"', 'ogc_fid'), MAX("ogc_fid")) FROM "public"."test";""") >= 0
 
     gdal.SetConfigOption('PG_USE_COPY', None)
 
diff --git a/autotest/ogr/ogr_pgeo.py b/autotest/ogr/ogr_pgeo.py
index 7e527483d689..7eb98e58e3e4 100755
--- a/autotest/ogr/ogr_pgeo.py
+++ b/autotest/ogr/ogr_pgeo.py
@@ -85,9 +85,7 @@ def ogr_pgeo_1(tested_driver='PGeo', other_driver='MDB'):
         gdaltest.post_reason('could not open DB. Driver probably misconfigured')
         return 'skip'
 
-    if ogrtest.pgeo_ds.GetLayerCount() != 3:
-        gdaltest.post_reason('did not get expected layer count')
-        return 'fail'
+    assert ogrtest.pgeo_ds.GetLayerCount() == 3, 'did not get expected layer count'
 
     lyr = ogrtest.pgeo_ds.GetLayer(0)
     feat = lyr.GetNextFeature()
@@ -104,10 +102,7 @@ def ogr_pgeo_1(tested_driver='PGeo', other_driver='MDB'):
         return 'fail'
 
     feat_count = lyr.GetFeatureCount()
-    if feat_count != 9418:
-        gdaltest.post_reason('did not get expected feature count')
-        print(feat_count)
-        return 'fail'
+    assert feat_count == 9418, 'did not get expected feature count'
 
     return 'success'
 
@@ -132,10 +127,7 @@ def ogr_pgeo_2():
     lyr.SetSpatialFilterRect(bbox[0], bbox[1], bbox[2], bbox[3])
 
     feat_count = lyr.GetFeatureCount()
-    if feat_count != 6957:
-        gdaltest.post_reason('did not get expected feature count')
-        print(feat_count)
-        return 'fail'
+    assert feat_count == 6957, 'did not get expected feature count'
 
     feat = lyr.GetNextFeature()
     if feat.GetField('OBJECTID') != 1 or \
@@ -148,10 +140,7 @@ def ogr_pgeo_2():
     # Check that geometry filter is well cleared
     lyr.SetSpatialFilter(None)
     feat_count = lyr.GetFeatureCount()
-    if feat_count != 9418:
-        gdaltest.post_reason('did not get expected feature count')
-        print(feat_count)
-        return 'fail'
+    assert feat_count == 9418, 'did not get expected feature count'
 
     return 'success'
 
@@ -167,10 +156,7 @@ def ogr_pgeo_3():
     lyr.SetAttributeFilter('OBJECTID=1')
 
     feat_count = lyr.GetFeatureCount()
-    if feat_count != 1:
-        gdaltest.post_reason('did not get expected feature count')
-        print(feat_count)
-        return 'fail'
+    assert feat_count == 1, 'did not get expected feature count'
 
     feat = lyr.GetNextFeature()
     if feat.GetField('OBJECTID') != 1 or \
@@ -183,10 +169,7 @@ def ogr_pgeo_3():
     # Check that attribute filter is well cleared (#3706)
     lyr.SetAttributeFilter(None)
     feat_count = lyr.GetFeatureCount()
-    if feat_count != 9418:
-        gdaltest.post_reason('did not get expected feature count')
-        print(feat_count)
-        return 'fail'
+    assert feat_count == 9418, 'did not get expected feature count'
 
     return 'success'
 
@@ -201,10 +184,7 @@ def ogr_pgeo_4():
     sql_lyr = ogrtest.pgeo_ds.ExecuteSQL('SELECT * FROM SDPipes WHERE OBJECTID = 1')
 
     feat_count = sql_lyr.GetFeatureCount()
-    if feat_count != 1:
-        gdaltest.post_reason('did not get expected feature count')
-        print(feat_count)
-        return 'fail'
+    assert feat_count == 1, 'did not get expected feature count'
 
     feat = sql_lyr.GetNextFeature()
     if feat.GetField('OBJECTID') != 1 or \
@@ -249,9 +229,7 @@ def ogr_pgeo_6():
 
     ret = gdaltest.runexternal(test_cli_utilities.get_test_ogrsf_path() + ' "tmp/cache/Autodesk Test.mdb"')
 
-    if ret.find('INFO') == -1 or ret.find('ERROR') != -1:
-        print(ret)
-        return 'fail'
+    assert ret.find('INFO') != -1 and ret.find('ERROR') == -1
 
     return 'success'
 
@@ -269,9 +247,7 @@ def ogr_pgeo_7():
 
     ret = gdaltest.runexternal(test_cli_utilities.get_test_ogrsf_path() + ' "tmp/cache/Autodesk Test.mdb" -sql "SELECT * FROM SDPipes"')
 
-    if ret.find('INFO') == -1 or ret.find('ERROR') != -1:
-        print(ret)
-        return 'fail'
+    assert ret.find('INFO') != -1 and ret.find('ERROR') == -1
 
     return 'success'
 
diff --git a/autotest/ogr/ogr_plscenes.py b/autotest/ogr/ogr_plscenes.py
index 112a3e1eb471..f12d02ece288 100755
--- a/autotest/ogr/ogr_plscenes.py
+++ b/autotest/ogr/ogr_plscenes.py
@@ -62,18 +62,13 @@ def test_ogr_plscenes_data_v1_catalog_no_paging():
     gdal.SetConfigOption('PL_URL', '/vsimem/data_v1/')
     ds = gdal.OpenEx('PLScenes:', gdal.OF_VECTOR, open_options=['VERSION=data_v1', 'API_KEY=foo'])
     gdal.SetConfigOption('PL_URL', None)
-    if ds is None:
-        return 'fail'
+    assert ds is not None
     with gdaltest.error_handler():
-        if ds.GetLayerByName('non_existing') is not None:
-            return 'fail'
-    if ds.GetLayerByName('PSScene3Band') is None:
-        return 'fail'
-    if ds.GetLayerCount() != 1:
-        return 'fail'
+        assert ds.GetLayerByName('non_existing') is None
+    assert ds.GetLayerByName('PSScene3Band') is not None
+    assert ds.GetLayerCount() == 1
     with gdaltest.error_handler():
-        if ds.GetLayerByName('non_existing') is not None:
-            return 'fail'
+        assert ds.GetLayerByName('non_existing') is None
 
     gdal.Unlink('/vsimem/data_v1/item-types')
 
@@ -93,23 +88,16 @@ def test_ogr_plscenes_data_v1_catalog_paging():
     gdal.SetConfigOption('PL_URL', '/vsimem/data_v1/')
     ds = gdal.OpenEx('PLScenes:', gdal.OF_VECTOR, open_options=['VERSION=data_v1', 'API_KEY=foo'])
     gdal.SetConfigOption('PL_URL', None)
-    if ds is None:
-        return 'fail'
+    assert ds is not None
     with gdaltest.error_handler():
-        if ds.GetLayerByName('non_existing') is not None:
-            return 'fail'
-    if ds.GetLayerByName('PSScene3Band') is None:
-        return 'fail'
+        assert ds.GetLayerByName('non_existing') is None
+    assert ds.GetLayerByName('PSScene3Band') is not None
     gdal.FileFromMemBuffer('/vsimem/data_v1/item-types/PSScene4Band', '{ "id": "PSScene4Band"} }')
-    if ds.GetLayerByName('PSScene4Band') is None:
-        return 'fail'
-    if ds.GetLayerCount() != 2:
-        return 'fail'
-    if ds.GetLayerByName('PSScene4Band') is None:
-        return 'fail'
+    assert ds.GetLayerByName('PSScene4Band') is not None
+    assert ds.GetLayerCount() == 2
+    assert ds.GetLayerByName('PSScene4Band') is not None
     with gdaltest.error_handler():
-        if ds.GetLayerByName('non_existing') is not None:
-            return 'fail'
+        assert ds.GetLayerByName('non_existing') is None
 
     gdal.Unlink('/vsimem/data_v1/item-types')
     gdal.Unlink('/vsimem/data_v1/item-types/page_2')
@@ -135,39 +123,29 @@ def test_ogr_plscenes_data_v1_nominal():
     gdal.SetConfigOption('PL_URL', '/vsimem/data_v1/')
     ds = gdal.OpenEx('PLScenes:', gdal.OF_VECTOR, open_options=['VERSION=data_v1', 'API_KEY=foo'])
     gdal.SetConfigOption('PL_URL', None)
-    if ds is None:
-        return 'fail'
+    assert ds is not None
 
     gdal.SetConfigOption('PL_URL', '/vsimem/data_v1/')
     ds = gdal.OpenEx('PLScenes:version=data_v1,api_key=foo,FOLLOW_LINKS=YES', gdal.OF_VECTOR)
     gdal.SetConfigOption('PL_URL', None)
-    if ds is None:
-        return 'fail'
+    assert ds is not None
 
     lyr = ds.GetLayer(0)
-    if lyr.GetName() != 'PSOrthoTile':
-        return 'fail'
-    if lyr.TestCapability(ogr.OLCFastFeatureCount) != 1 or \
-       lyr.TestCapability(ogr.OLCStringsAsUTF8) != 1 or \
-       lyr.TestCapability(ogr.OLCRandomRead) != 0:
-        return 'fail'
+    assert lyr.GetName() == 'PSOrthoTile'
+    assert (lyr.TestCapability(ogr.OLCFastFeatureCount) == 1 and \
+       lyr.TestCapability(ogr.OLCStringsAsUTF8) == 1 and \
+       lyr.TestCapability(ogr.OLCRandomRead) == 0)
     # Different serialization depending on libjson versions
     gdal.FileFromMemBuffer("""/vsimem/data_v1/stats&POSTFIELDS={"interval":"year","item_types":["PSOrthoTile"],"filter":{"type":"AndFilter","config":[{"type":"RangeFilter","field_name":"cloud_cover","config":{"gte":0.000000}}]}}""", """{ "buckets": [ { "count": 1 }, { "count": 1} ] }""")
     gdal.FileFromMemBuffer("""/vsimem/data_v1/stats&POSTFIELDS={"interval":"year","item_types":["PSOrthoTile"],"filter":{"type":"AndFilter","config":[{"type":"RangeFilter","field_name":"cloud_cover","config":{"gte":0}}]}}""", """{ "buckets": [ { "count": 1 }, { "count": 1} ] }""")
     gdal.FileFromMemBuffer("""/vsimem/data_v1/stats&POSTFIELDS={"interval":"year","item_types":["PSOrthoTile"],"filter":{"type":"AndFilter","config":[{"type":"RangeFilter","field_name":"cloud_cover","config":{"gte":0.0}}]}}""", """{ "buckets": [ { "count": 1 }, { "count": 1} ] }""")
-    if lyr.GetFeatureCount() != 2:
-        return 'fail'
-    if lyr.GetGeomType() != ogr.wkbMultiPolygon:
-        return 'fail'
+    assert lyr.GetFeatureCount() == 2
+    assert lyr.GetGeomType() == ogr.wkbMultiPolygon
     ext = lyr.GetExtent()
-    if ext != (-180.0, 180.0, -90.0, 90.0):
-        print(ext)
-        return 'fail'
+    assert ext == (-180.0, 180.0, -90.0, 90.0)
 
     field_count = lyr.GetLayerDefn().GetFieldCount()
-    if field_count != 68:
-        print(field_count)
-        return 'fail'
+    assert field_count == 68
 
     # Regular /items/ fetching
     gdal.FileFromMemBuffer("""/vsimem/data_v1/quick-search?_page_size=250&POSTFIELDS={"item_types":["PSOrthoTile"],"filter":{"type":"AndFilter","config":[]}}""",
@@ -267,12 +245,10 @@ def test_ogr_plscenes_data_v1_nominal():
         return 'fail'
 
     f = lyr.GetNextFeature()
-    if f is not None:
-        return 'fail'
+    assert f is None
 
     f = lyr.GetNextFeature()
-    if f is not None:
-        return 'fail'
+    assert f is None
 
     gdal.FileFromMemBuffer("""/vsimem/data_v1/quick-search?_page_size=250&POSTFIELDS={"item_types":["PSOrthoTile"],"filter":{"type":"AndFilter","config":[{"type":"GeometryFilter","field_name":"geometry","config":{"type":"Point","coordinates":[2.0,49.0]}}]}}""",
                            """{"features" : [ { "id": "id3", "geometry": { "type": "Point", "coordinates": [2,49]} } ] }""")
@@ -286,8 +262,7 @@ def test_ogr_plscenes_data_v1_nominal():
 
     # Cannot find /vsimem/data_v1/stats&POSTFIELDS={"interval":"year","item_types":["PSOrthoTile"],"filter":{"type":"AndFilter","config":[{"type":"GeometryFilter","field_name":"geometry","config":{"type":"Point","coordinates":[2.0,49.0]}}]}}
     with gdaltest.error_handler():
-        if lyr.GetFeatureCount() != 1:
-            return 'fail'
+        assert lyr.GetFeatureCount() == 1
 
     # Reset spatial filter
     lyr.SetSpatialFilter(0, None)
@@ -392,8 +367,7 @@ def test_ogr_plscenes_data_v1_nominal():
     with gdaltest.error_handler():
         ds_raster = gdal.OpenEx('PLScenes:', gdal.OF_RASTER, open_options=['VERSION=data_v1', 'API_KEY=foo', 'SCENE=id'])
     gdal.SetConfigOption('PL_URL', None)
-    if ds_raster is not None or gdal.GetLastErrorMsg().find('Missing catalog') < 0:
-        return 'fail'
+    assert ds_raster is None and gdal.GetLastErrorMsg().find('Missing catalog') >= 0
 
     # Invalid catalog
     gdal.SetConfigOption('PL_URL', '/vsimem/data_v1/')
@@ -408,8 +382,7 @@ def test_ogr_plscenes_data_v1_nominal():
     with gdaltest.error_handler():
         ds_raster = gdal.OpenEx('PLScenes:', gdal.OF_RASTER, open_options=['VERSION=data_v1', 'API_KEY=foo', 'ITEMTYPES=PSOrthoTile', 'SCENE=id'])
     gdal.SetConfigOption('PL_URL', None)
-    if ds_raster is not None:
-        return 'fail'
+    assert ds_raster is None
 
     # Inactive file, and activation link not working
     gdal.FileFromMemBuffer('/vsimem/data_v1/item-types/PSOrthoTile/items/id/assets',
@@ -427,8 +400,7 @@ def test_ogr_plscenes_data_v1_nominal():
     with gdaltest.error_handler():
         ds_raster = gdal.OpenEx('PLScenes:', gdal.OF_RASTER, open_options=['VERSION=data_v1', 'API_KEY=foo', 'ITEMTYPES=PSOrthoTile', 'SCENE=id', 'ACTIVATION_TIMEOUT=1', 'ASSET=analytic'])
     gdal.SetConfigOption('PL_URL', None)
-    if ds_raster is not None:
-        return 'fail'
+    assert ds_raster is None
 
     # File in activation
     gdal.FileFromMemBuffer('/vsimem/data_v1/item-types/PSOrthoTile/items/id/assets',
@@ -446,8 +418,7 @@ def test_ogr_plscenes_data_v1_nominal():
     with gdaltest.error_handler():
         ds_raster = gdal.OpenEx('PLScenes:', gdal.OF_RASTER, open_options=['VERSION=data_v1', 'API_KEY=foo', 'ITEMTYPES=PSOrthoTile', 'SCENE=id', 'ACTIVATION_TIMEOUT=1', 'ASSET=analytic'])
     gdal.SetConfigOption('PL_URL', None)
-    if ds_raster is not None:
-        return 'fail'
+    assert ds_raster is None
 
     gdal.FileFromMemBuffer('/vsimem/data_v1/item-types/PSOrthoTile/items/id/assets',
                            """{
@@ -468,8 +439,7 @@ def test_ogr_plscenes_data_v1_nominal():
     with gdaltest.error_handler():
         ds_raster = gdal.OpenEx('PLScenes:', gdal.OF_RASTER, open_options=['VERSION=data_v1', 'API_KEY=foo', 'ITEMTYPES=PSOrthoTile', 'SCENE=id', 'ACTIVATION_TIMEOUT=1', 'ASSET=analytic'])
     gdal.SetConfigOption('PL_URL', None)
-    if ds_raster is not None:
-        return 'fail'
+    assert ds_raster is None
 
     # JSon content for /vsimem/data_v1/item-types/PSOrthoTile/items/id/assets/analytic/my.tiff
     gdal.FileFromMemBuffer('/vsimem/data_v1/item-types/PSOrthoTile/items/id/assets/analytic/my.tiff',
@@ -478,8 +448,7 @@ def test_ogr_plscenes_data_v1_nominal():
     with gdaltest.error_handler():
         ds_raster = gdal.OpenEx('PLScenes:', gdal.OF_RASTER, open_options=['VERSION=data_v1', 'API_KEY=foo', 'ITEMTYPES=PSOrthoTile', 'SCENE=id', 'ACTIVATION_TIMEOUT=1', 'ASSET=analytic'])
     gdal.SetConfigOption('PL_URL', None)
-    if ds_raster is not None:
-        return 'fail'
+    assert ds_raster is None
 
     # Missing metadata
     gdal.FileFromMemBuffer('/vsimem/data_v1/item-types/PSOrthoTile/items/id/assets/analytic/my.tiff',
@@ -488,8 +457,7 @@ def test_ogr_plscenes_data_v1_nominal():
     with gdaltest.error_handler():
         ds_raster = gdal.OpenEx('PLScenes:', gdal.OF_RASTER, open_options=['VERSION=data_v1', 'API_KEY=foo', 'ITEMTYPES=PSOrthoTile', 'SCENE=id', 'ACTIVATION_TIMEOUT=1', 'ASSET=analytic'])
     gdal.SetConfigOption('PL_URL', None)
-    if ds_raster is None:
-        return 'fail'
+    assert ds_raster is not None
     ds_raster = None
 
     # Failed filter by scene id
@@ -498,8 +466,7 @@ def test_ogr_plscenes_data_v1_nominal():
     gdal.SetConfigOption('PL_URL', '/vsimem/data_v1/')
     ds_raster = gdal.OpenEx('PLScenes:', gdal.OF_RASTER, open_options=['VERSION=data_v1', 'API_KEY=foo', 'ITEMTYPES=PSOrthoTile', 'SCENE=id', 'ACTIVATION_TIMEOUT=1', 'ASSET=analytic'])
     gdal.SetConfigOption('PL_URL', None)
-    if ds_raster is None:
-        return 'fail'
+    assert ds_raster is not None
     ds_raster = None
 
     # Test metadata items attached to dataset
@@ -513,10 +480,8 @@ def test_ogr_plscenes_data_v1_nominal():
     gdal.SetConfigOption('PL_URL', '/vsimem/data_v1/')
     ds_raster = gdal.OpenEx('PLScenes:', gdal.OF_RASTER, open_options=['VERSION=data_v1', 'API_KEY=foo', 'ITEMTYPES=PSOrthoTile', 'SCENE=id', 'ACTIVATION_TIMEOUT=1', 'ASSET=analytic'])
     gdal.SetConfigOption('PL_URL', None)
-    if ds_raster is None:
-        return 'fail'
-    if ds_raster.GetMetadataItem('anomalous_pixels') != '1.23':
-        return 'fail'
+    assert ds_raster is not None
+    assert ds_raster.GetMetadataItem('anomalous_pixels') == '1.23'
     ds_raster = None
 
     # Test invalid ASSET
@@ -524,15 +489,13 @@ def test_ogr_plscenes_data_v1_nominal():
     with gdaltest.error_handler():
         ds_raster = gdal.OpenEx('PLScenes:', gdal.OF_RASTER, open_options=['VERSION=data_v1', 'API_KEY=foo', 'ITEMTYPES=PSOrthoTile', 'SCENE=id', 'ACTIVATION_TIMEOUT=1', 'ASSET=invalid'])
     gdal.SetConfigOption('PL_URL', None)
-    if ds_raster is not None:
-        return 'fail'
+    assert ds_raster is None
 
     # Test subdatasets
     gdal.SetConfigOption('PL_URL', '/vsimem/data_v1/')
     ds_raster = gdal.OpenEx('PLScenes:', gdal.OF_RASTER, open_options=['VERSION=data_v1', 'API_KEY=foo', 'ITEMTYPES=PSOrthoTile', 'ASSET=list', 'SCENE=id'])
     gdal.SetConfigOption('PL_URL', None)
-    if len(ds_raster.GetSubDatasets()) != 1:
-        return 'fail'
+    assert len(ds_raster.GetSubDatasets()) == 1
     ds_raster = None
 
     # Unsupported option
@@ -540,22 +503,19 @@ def test_ogr_plscenes_data_v1_nominal():
     with gdaltest.error_handler():
         ds_raster = gdal.OpenEx('PLScenes:unsupported=yes', gdal.OF_RASTER, open_options=['VERSION=data_v1', 'API_KEY=foo', 'ITEMTYPES=PSOrthoTile', 'SCENE=id'])
     gdal.SetConfigOption('PL_URL', None)
-    if ds_raster is not None:
-        return 'fail'
+    assert ds_raster is None
 
     # Test catalog with vector access
     gdal.SetConfigOption('PL_URL', '/vsimem/data_v1/')
     ds2 = gdal.OpenEx('PLScenes:', gdal.OF_VECTOR, open_options=['VERSION=data_v1', 'API_KEY=foo', 'ITEMTYPES=PSOrthoTile'])
     gdal.SetConfigOption('PL_URL', None)
-    if ds2 is None or ds2.GetLayerCount() != 1:
-        return 'fail'
+    assert ds2 is not None and ds2.GetLayerCount() == 1
 
     gdal.SetConfigOption('PL_URL', '/vsimem/data_v1/')
     with gdaltest.error_handler():
         ds2 = gdal.OpenEx('PLScenes:', gdal.OF_VECTOR, open_options=['VERSION=data_v1', 'API_KEY=foo', 'ITEMTYPES=invalid'])
     gdal.SetConfigOption('PL_URL', None)
-    if ds2 is not None:
-        return 'fail'
+    assert ds2 is None
 
     fl = gdal.ReadDir('/vsimem/data_v1')
     for filename in fl:
@@ -582,8 +542,7 @@ def test_ogr_plscenes_data_v1_errors():
     if old_key:
         gdal.SetConfigOption('PL_API_KEY', old_key)
     gdal.SetConfigOption('PL_URL', None)
-    if ds is not None:
-        return 'fail'
+    assert ds is None
 
     # Invalid option
     gdal.FileFromMemBuffer('/vsimem/data_v1/item-types', '{ "item-types": [] }')
@@ -591,8 +550,7 @@ def test_ogr_plscenes_data_v1_errors():
         gdal.SetConfigOption('PL_URL', '/vsimem/data_v1/')
         ds = gdal.OpenEx('PLScenes:version=data_v1,api_key=foo,invalid=invalid', gdal.OF_VECTOR)
         gdal.SetConfigOption('PL_URL', None)
-    if ds is not None:
-        return 'fail'
+    assert ds is None
 
     # Invalid JSON
     gdal.FileFromMemBuffer('/vsimem/data_v1/item-types', '{invalid_json')
@@ -600,8 +558,7 @@ def test_ogr_plscenes_data_v1_errors():
         gdal.SetConfigOption('PL_URL', '/vsimem/data_v1/')
         ds = gdal.OpenEx('PLScenes:', gdal.OF_VECTOR, open_options=['VERSION=data_v1', 'API_KEY=foo'])
         gdal.SetConfigOption('PL_URL', None)
-    if ds is not None:
-        return 'fail'
+    assert ds is None
 
     # Not an object
     gdal.FileFromMemBuffer('/vsimem/data_v1/item-types', 'false')
@@ -609,8 +566,7 @@ def test_ogr_plscenes_data_v1_errors():
         gdal.SetConfigOption('PL_URL', '/vsimem/data_v1/')
         ds = gdal.OpenEx('PLScenes:', gdal.OF_VECTOR, open_options=['VERSION=data_v1', 'API_KEY=foo'])
         gdal.SetConfigOption('PL_URL', None)
-    if ds is not None:
-        return 'fail'
+    assert ds is None
 
     # Lack of "item_types"
     gdal.FileFromMemBuffer('/vsimem/data_v1/item-types', '{}')
@@ -618,8 +574,7 @@ def test_ogr_plscenes_data_v1_errors():
         gdal.SetConfigOption('PL_URL', '/vsimem/data_v1/')
         ds = gdal.OpenEx('PLScenes:', gdal.OF_VECTOR, open_options=['VERSION=data_v1', 'API_KEY=foo'])
         gdal.SetConfigOption('PL_URL', None)
-    if ds is not None:
-        return 'fail'
+    assert ds is None
 
     # Invalid catalog objects
     gdal.FileFromMemBuffer('/vsimem/data_v1/item-types', """{"item_types": [{}, [], null, {"id":null},
@@ -627,8 +582,7 @@ def test_ogr_plscenes_data_v1_errors():
     gdal.SetConfigOption('PL_URL', '/vsimem/data_v1/')
     ds = gdal.OpenEx('PLScenes:', gdal.OF_VECTOR, open_options=['VERSION=data_v1', 'API_KEY=foo'])
     gdal.SetConfigOption('PL_URL', None)
-    if ds.GetLayerCount() != 1:
-        return 'fail'
+    assert ds.GetLayerCount() == 1
 
     # Invalid next URL
     gdal.FileFromMemBuffer('/vsimem/data_v1/item-types', '{"_links": { "_next": "/vsimem/inexisting" }, "item_types": [{"id": "my_catalog"}]}')
@@ -637,8 +591,7 @@ def test_ogr_plscenes_data_v1_errors():
     gdal.SetConfigOption('PL_URL', None)
     with gdaltest.error_handler():
         lyr_count = ds.GetLayerCount()
-    if lyr_count != 1:
-        return 'fail'
+    assert lyr_count == 1
 
     gdal.FileFromMemBuffer('/vsimem/data_v1/item-types', '{"item_types": [{"id": "PSScene3Band"}]}')
     gdal.SetConfigOption('PL_URL', '/vsimem/data_v1/')
@@ -689,17 +642,14 @@ def test_ogr_plscenes_data_v1_live():
     gdal.SetConfigOption('PLSCENES_PAGE_SIZE', '10')
     ds = ogr.Open('PLScenes:version=data_v1,FOLLOW_LINKS=YES')
     gdal.SetConfigOption('PLSCENES_PAGE_SIZE', None)
-    if ds is None:
-        return 'fail'
+    assert ds is not None
 
     lyr = ds.GetLayer(0)
-    if lyr is None:
-        return 'fail'
+    assert lyr is not None
 
     lyr.SetAttributeFilter("permissions = 'assets:download'")
     f = lyr.GetNextFeature()
-    if f is None:
-        return 'fail'
+    assert f is not None
     catalog = lyr.GetName()
     scene = f['id']
     f.DumpReadable()
@@ -715,12 +665,10 @@ def test_ogr_plscenes_data_v1_live():
         elif name.startswith('asset_') and name.endswith('_location') and f.GetFieldAsString(i) != '':
             asset_name = name[len('asset_'):-len('_location')]
             break
-    if asset_name is None:
-        return 'fail'
+    assert asset_name is not None
 
     acquired_field = lyr_defn.GetFieldIndex('acquired')
-    if acquired_field < 0 or lyr_defn.GetFieldDefn(acquired_field).GetType() != ogr.OFTDateTime:
-        return 'fail'
+    assert acquired_field >= 0 and lyr_defn.GetFieldDefn(acquired_field).GetType() == ogr.OFTDateTime
 
     if not f.IsFieldSet(acquired_field):
         f.DumpReadable()
@@ -756,16 +704,13 @@ def test_ogr_plscenes_data_v1_live():
 
     lyr.SetAttributeFilter(filtr)
     f = lyr.GetNextFeature()
-    if f is None:
-        return 'fail'
+    assert f is not None
 
     ds = None
 
     ds = gdal.Open('PLScenes:version=data_v1,itemtypes=%s,scene=%s,asset=%s' % (catalog, scene, asset_name))
-    if ds is None:
-        return 'fail'
-    if ds.RasterCount == 0:
-        return 'fail'
+    assert ds is not None
+    assert ds.RasterCount != 0
 
     return 'success'
 
diff --git a/autotest/ogr/ogr_rec.py b/autotest/ogr/ogr_rec.py
index 465666e04892..c575a8226a88 100755
--- a/autotest/ogr/ogr_rec.py
+++ b/autotest/ogr/ogr_rec.py
@@ -45,9 +45,7 @@ def test_ogr_rec_1():
 
     ret = gdaltest.runexternal(test_cli_utilities.get_test_ogrsf_path() + ' -ro data/test.rec')
 
-    if ret.find('INFO') == -1 or ret.find('ERROR') != -1:
-        print(ret)
-        return 'fail'
+    assert ret.find('INFO') != -1 and ret.find('ERROR') == -1
 
     return 'success'
 
diff --git a/autotest/ogr/ogr_rfc30.py b/autotest/ogr/ogr_rfc30.py
index 6d5868a7308f..b0f148b50d63 100755
--- a/autotest/ogr/ogr_rfc30.py
+++ b/autotest/ogr/ogr_rfc30.py
@@ -46,13 +46,9 @@ def ogr_rfc30_1_internal(filename, layer_name):
     ds = None
 
     ds = ogr.Open(filename)
-    if ds is None:
-        gdaltest.post_reason('cannot reopen datasource')
-        return 'fail'
+    assert ds is not None, 'cannot reopen datasource'
     lyr = ds.GetLayerByName(layer_name)
-    if lyr is None:
-        gdaltest.post_reason('cannot find layer')
-        return 'fail'
+    assert lyr is not None, 'cannot find layer'
     ds = None
 
     ogr.GetDriverByName('ESRI Shapefile').DeleteDataSource(filename)
diff --git a/autotest/ogr/ogr_rfc35_mem.py b/autotest/ogr/ogr_rfc35_mem.py
index 1fddc0348ff0..1921c84474f3 100755
--- a/autotest/ogr/ogr_rfc35_mem.py
+++ b/autotest/ogr/ogr_rfc35_mem.py
@@ -128,8 +128,7 @@ def CheckColumnOrder(lyr, expected_order):
 
     lyr_defn = lyr.GetLayerDefn()
     for i, exp_order in enumerate(expected_order):
-        if lyr_defn.GetFieldDefn(i).GetName() != exp_order:
-            return 'fail'
+        assert lyr_defn.GetFieldDefn(i).GetName() == exp_order
 
     return 'success'
 
@@ -147,8 +146,7 @@ def test_ogr_rfc35_mem_2():
 
     lyr = gdaltest.rfc35_mem_ds.GetLayer(0)
 
-    if lyr.TestCapability(ogr.OLCReorderFields) != 1:
-        return 'fail'
+    assert lyr.TestCapability(ogr.OLCReorderFields) == 1
 
     feat = ogr.Feature(lyr.GetLayerDefn())
     feat.SetField(0, 'foo3')
@@ -158,8 +156,7 @@ def test_ogr_rfc35_mem_2():
     lyr.CreateFeature(feat)
     feat = None
 
-    if lyr.ReorderField(1, 3) != 0:
-        return 'fail'
+    assert lyr.ReorderField(1, 3) == 0
     ret = Check(lyr, ['foo5', 'baz15', 'baw20', 'bar10'])
 
     lyr.ReorderField(3, 1)
@@ -186,8 +183,7 @@ def test_ogr_rfc35_mem_2():
     gdal.PushErrorHandler('CPLQuietErrorHandler')
     ret = lyr.ReorderFields([0, 0, 0, 0])
     gdal.PopErrorHandler()
-    if ret == 0:
-        return 'fail'
+    assert ret != 0
 
     return 'success'
 
@@ -207,14 +203,12 @@ def test_ogr_rfc35_mem_3():
     gdal.PushErrorHandler('CPLQuietErrorHandler')
     ret = lyr.AlterFieldDefn(-1, fd, ogr.ALTER_ALL_FLAG)
     gdal.PopErrorHandler()
-    if ret == 0:
-        return 'fail'
+    assert ret != 0
 
     gdal.PushErrorHandler('CPLQuietErrorHandler')
     ret = lyr.AlterFieldDefn(lyr_defn.GetFieldCount(), fd, ogr.ALTER_ALL_FLAG)
     gdal.PopErrorHandler()
-    if ret == 0:
-        return 'fail'
+    assert ret != 0
 
     lyr.AlterFieldDefn(lyr_defn.GetFieldIndex("baz15"), fd, ogr.ALTER_ALL_FLAG)
 
@@ -230,8 +224,7 @@ def test_ogr_rfc35_mem_3():
 
     lyr_defn = lyr.GetLayerDefn()
     fld_defn = lyr_defn.GetFieldDefn(lyr_defn.GetFieldIndex('baz5'))
-    if fld_defn.GetWidth() != 5:
-        return 'fail'
+    assert fld_defn.GetWidth() == 5
 
     ret = CheckFeatures(lyr, field3='baz5')
 
@@ -246,8 +239,7 @@ def test_ogr_rfc35_mem_4():
     lyr = gdaltest.rfc35_mem_ds.GetLayer(0)
     lyr_defn = lyr.GetLayerDefn()
 
-    if lyr.TestCapability(ogr.OLCAlterFieldDefn) != 1:
-        return 'fail'
+    assert lyr.TestCapability(ogr.OLCAlterFieldDefn) == 1
 
     fd = ogr.FieldDefn("intfield", ogr.OFTInteger)
     lyr.CreateField(fd)
@@ -265,8 +257,7 @@ def test_ogr_rfc35_mem_4():
 
     lyr.ResetReading()
     feat = lyr.GetNextFeature()
-    if feat.GetField("intfield") != 12345:
-        return 'fail'
+    assert feat.GetField("intfield") == 12345
     feat = None
 
     ret = CheckFeatures(lyr, field3='baz5')
@@ -276,8 +267,7 @@ def test_ogr_rfc35_mem_4():
 
     lyr.ResetReading()
     feat = lyr.GetNextFeature()
-    if feat.GetField("intfield") != 12345:
-        return 'fail'
+    assert feat.GetField("intfield") == 12345
     feat = None
 
     ret = CheckFeatures(lyr, field3='baz5')
@@ -288,8 +278,7 @@ def test_ogr_rfc35_mem_4():
     lyr.ResetReading()
     feat = lyr.GetNextFeature()
     # if feat.GetField("intfield") != 1234:
-    if feat.GetField("intfield") != 12345:
-        return 'fail'
+    assert feat.GetField("intfield") == 12345
     feat = None
 
     ret = CheckFeatures(lyr, field3='baz5')
@@ -301,8 +290,7 @@ def test_ogr_rfc35_mem_4():
     lyr.ResetReading()
     feat = lyr.GetNextFeature()
     # if feat.GetField("oldintfld") != '1234':
-    if feat.GetField("oldintfld") != '12345':
-        return 'fail'
+    assert feat.GetField("oldintfld") == '12345'
     feat = None
 
     ret = CheckFeatures(lyr, field3='baz5')
@@ -311,17 +299,14 @@ def test_ogr_rfc35_mem_4():
 
     fd = ogr.FieldDefn("intfield", ogr.OFTInteger)
     fd.SetWidth(10)
-    if lyr.CreateField(fd) != 0:
-        return 'fail'
+    assert lyr.CreateField(fd) == 0
 
-    if lyr.ReorderField(lyr_defn.GetFieldIndex("intfield"), 0) != 0:
-        return 'fail'
+    assert lyr.ReorderField(lyr_defn.GetFieldIndex("intfield"), 0) == 0
 
     lyr.ResetReading()
     feat = lyr.GetNextFeature()
     feat.SetField("intfield", 98765)
-    if lyr.SetFeature(feat) != 0:
-        return 'fail'
+    assert lyr.SetFeature(feat) == 0
     feat = None
 
     fd = ogr.FieldDefn("oldintfld", ogr.OFTString)
@@ -330,8 +315,7 @@ def test_ogr_rfc35_mem_4():
 
     lyr.ResetReading()
     feat = lyr.GetNextFeature()
-    if feat.GetField("oldintfld") != '98765':
-        return 'fail'
+    assert feat.GetField("oldintfld") == '98765'
     feat = None
 
     ret = CheckFeatures(lyr, field3='baz5')
@@ -347,41 +331,33 @@ def test_ogr_rfc35_mem_5():
     lyr = gdaltest.rfc35_mem_ds.GetLayer(0)
     lyr_defn = lyr.GetLayerDefn()
 
-    if lyr.TestCapability(ogr.OLCDeleteField) != 1:
-        return 'fail'
+    assert lyr.TestCapability(ogr.OLCDeleteField) == 1
 
     gdal.PushErrorHandler('CPLQuietErrorHandler')
     ret = lyr.DeleteField(-1)
     gdal.PopErrorHandler()
-    if ret == 0:
-        return 'fail'
+    assert ret != 0
 
     gdal.PushErrorHandler('CPLQuietErrorHandler')
     ret = lyr.DeleteField(lyr.GetLayerDefn().GetFieldCount())
     gdal.PopErrorHandler()
-    if ret == 0:
-        return 'fail'
+    assert ret != 0
 
-    if lyr.DeleteField(0) != 0:
-        return 'fail'
+    assert lyr.DeleteField(0) == 0
 
     ret = CheckFeatures(lyr, field3='baz5')
 
-    if lyr.DeleteField(lyr_defn.GetFieldIndex('baw20')) != 0:
-        return 'fail'
+    assert lyr.DeleteField(lyr_defn.GetFieldIndex('baw20')) == 0
 
     ret = CheckFeatures(lyr, field3='baz5', field4=None)
 
-    if lyr.DeleteField(lyr_defn.GetFieldIndex('baz5')) != 0:
-        return 'fail'
+    assert lyr.DeleteField(lyr_defn.GetFieldIndex('baz5')) == 0
 
     ret = CheckFeatures(lyr, field3=None, field4=None)
 
-    if lyr.DeleteField(lyr_defn.GetFieldIndex('foo5')) != 0:
-        return 'fail'
+    assert lyr.DeleteField(lyr_defn.GetFieldIndex('foo5')) == 0
 
-    if lyr.DeleteField(lyr_defn.GetFieldIndex('bar10')) != 0:
-        return 'fail'
+    assert lyr.DeleteField(lyr_defn.GetFieldIndex('bar10')) == 0
 
     ret = CheckFeatures(lyr, field1=None, field2=None, field3=None, field4=None)
 
diff --git a/autotest/ogr/ogr_rfc35_mitab.py b/autotest/ogr/ogr_rfc35_mitab.py
index f4416e9efdc0..85d728c863de 100755
--- a/autotest/ogr/ogr_rfc35_mitab.py
+++ b/autotest/ogr/ogr_rfc35_mitab.py
@@ -52,9 +52,8 @@ def CheckFileSize(src_filename):
     statBufDst = gdal.VSIStatL('/vsimem/CheckFileSize.dat', gdal.VSI_STAT_EXISTS_FLAG | gdal.VSI_STAT_NATURE_FLAG | gdal.VSI_STAT_SIZE_FLAG)
     ogr.GetDriverByName('MapInfo File').DeleteDataSource('/vsimem/CheckFileSize.tab')
 
-    if statBufSrc.size != statBufDst.size:
-        print('src_size = %d, dst_size = %d', statBufSrc.size, statBufDst.size)
-        return 'fail'
+    assert statBufSrc.size == statBufDst.size, \
+        ('src_size = %d, dst_size = %d', statBufSrc.size, statBufDst.size)
 
     return 'success'
 
@@ -147,8 +146,7 @@ def CheckColumnOrder(lyr, expected_order):
 
     lyr_defn = lyr.GetLayerDefn()
     for i, exp_order in enumerate(expected_order):
-        if lyr_defn.GetFieldDefn(i).GetName() != exp_order:
-            return 'fail'
+        assert lyr_defn.GetFieldDefn(i).GetName() == exp_order
 
     return 'success'
 
@@ -174,8 +172,7 @@ def test_ogr_rfc35_mitab_2():
     ds = ogr.Open('/vsimem/rfc35_test.tab', update=1)
     lyr = ds.GetLayer(0)
 
-    if lyr.TestCapability(ogr.OLCReorderFields) != 1:
-        return 'fail'
+    assert lyr.TestCapability(ogr.OLCReorderFields) == 1
 
     feat = ogr.Feature(lyr.GetLayerDefn())
     feat.SetField(0, 'foo3')
@@ -185,8 +182,7 @@ def test_ogr_rfc35_mitab_2():
     lyr.CreateFeature(feat)
     feat = None
 
-    if lyr.ReorderField(1, 3) != 0:
-        return 'fail'
+    assert lyr.ReorderField(1, 3) == 0
     # ds = None
     # ds = ogr.Open('/vsimem/rfc35_test.tab', update = 1)
     # lyr = ds.GetLayer(0)
@@ -261,8 +257,7 @@ def test_ogr_rfc35_mitab_2():
     gdal.PushErrorHandler('CPLQuietErrorHandler')
     ret = lyr.ReorderFields([0, 0, 0, 0])
     gdal.PopErrorHandler()
-    if ret == 0:
-        return 'fail'
+    assert ret != 0
 
     # ds = None
 
@@ -298,14 +293,12 @@ def test_ogr_rfc35_mitab_3():
     gdal.PushErrorHandler('CPLQuietErrorHandler')
     ret = lyr.AlterFieldDefn(-1, fd, ogr.ALTER_ALL_FLAG)
     gdal.PopErrorHandler()
-    if ret == 0:
-        return 'fail'
+    assert ret != 0
 
     gdal.PushErrorHandler('CPLQuietErrorHandler')
     ret = lyr.AlterFieldDefn(lyr_defn.GetFieldCount(), fd, ogr.ALTER_ALL_FLAG)
     gdal.PopErrorHandler()
-    if ret == 0:
-        return 'fail'
+    assert ret != 0
 
     lyr.AlterFieldDefn(lyr_defn.GetFieldIndex("baz15"), fd, ogr.ALTER_ALL_FLAG)
 
@@ -331,8 +324,7 @@ def test_ogr_rfc35_mitab_3():
     lyr = ds.GetLayer(0)
     lyr_defn = lyr.GetLayerDefn()
     fld_defn = lyr_defn.GetFieldDefn(lyr_defn.GetFieldIndex('baz5'))
-    if fld_defn.GetWidth() != 5:
-        return 'fail'
+    assert fld_defn.GetWidth() == 5
 
     ret = CheckFeatures(lyr, field3='baz5')
 
@@ -348,8 +340,7 @@ def test_ogr_rfc35_mitab_4():
     lyr = ds.GetLayer(0)
     lyr_defn = lyr.GetLayerDefn()
 
-    if lyr.TestCapability(ogr.OLCAlterFieldDefn) != 1:
-        return 'fail'
+    assert lyr.TestCapability(ogr.OLCAlterFieldDefn) == 1
 
     fd = ogr.FieldDefn("intfield", ogr.OFTInteger)
     lyr.CreateField(fd)
@@ -366,13 +357,11 @@ def test_ogr_rfc35_mitab_4():
     gdal.PushErrorHandler('CPLQuietErrorHandler')
     ret = lyr.AlterFieldDefn(lyr_defn.GetFieldIndex("intfield"), fd, ogr.ALTER_ALL_FLAG)
     gdal.PopErrorHandler()
-    if ret == 0:
-        return 'fail'
+    assert ret != 0
 
     lyr.ResetReading()
     feat = lyr.GetNextFeature()
-    if feat.GetField("intfield") != 12345:
-        return 'fail'
+    assert feat.GetField("intfield") == 12345
     feat = None
 
     ret = CheckFeatures(lyr, field3='baz5')
@@ -386,8 +375,7 @@ def test_ogr_rfc35_mitab_4():
 
         lyr.ResetReading()
         feat = lyr.GetNextFeature()
-        if feat.GetField("intfield") != 12345:
-            return 'fail'
+        assert feat.GetField("intfield") == 12345
         feat = None
 
         ret = CheckFeatures(lyr, field3='baz5')
@@ -407,8 +395,7 @@ def test_ogr_rfc35_mitab_4():
 
         lyr.ResetReading()
         feat = lyr.GetNextFeature()
-        if feat.GetField("intfield") != 1234:
-            return 'fail'
+        assert feat.GetField("intfield") == 1234
         feat = None
 
         ret = CheckFeatures(lyr, field3='baz5')
@@ -434,8 +421,7 @@ def test_ogr_rfc35_mitab_4():
 
     lyr.ResetReading()
     feat = lyr.GetNextFeature()
-    if feat.GetField("oldintfld") != '12345':
-        return 'fail'
+    assert feat.GetField("oldintfld") == '12345'
     feat = None
 
     ret = CheckFeatures(lyr, field3='baz5')
@@ -451,8 +437,7 @@ def test_ogr_rfc35_mitab_4():
 
     lyr.ResetReading()
     feat = lyr.GetNextFeature()
-    if feat.GetField("oldintfld") != '12345':
-        return 'fail'
+    assert feat.GetField("oldintfld") == '12345'
     feat = None
 
     ret = CheckFeatures(lyr, field3='baz5')
@@ -464,17 +449,14 @@ def test_ogr_rfc35_mitab_4():
 
     fd = ogr.FieldDefn("intfield", ogr.OFTInteger)
     fd.SetWidth(10)
-    if lyr.CreateField(fd) != 0:
-        return 'fail'
+    assert lyr.CreateField(fd) == 0
 
-    if lyr.ReorderField(lyr_defn.GetFieldIndex("intfield"), 0) != 0:
-        return 'fail'
+    assert lyr.ReorderField(lyr_defn.GetFieldIndex("intfield"), 0) == 0
 
     lyr.ResetReading()
     feat = lyr.GetNextFeature()
     feat.SetField("intfield", 98765)
-    if lyr.SetFeature(feat) != 0:
-        return 'fail'
+    assert lyr.SetFeature(feat) == 0
     feat = None
 
     fd = ogr.FieldDefn("oldintfld", ogr.OFTString)
@@ -483,8 +465,7 @@ def test_ogr_rfc35_mitab_4():
 
     lyr.ResetReading()
     feat = lyr.GetNextFeature()
-    if feat.GetField("oldintfld") != '98765':
-        return 'fail'
+    assert feat.GetField("oldintfld") == '98765'
     feat = None
 
     ret = CheckFeatures(lyr, field3='baz5')
@@ -500,8 +481,7 @@ def test_ogr_rfc35_mitab_4():
 
     lyr.ResetReading()
     feat = lyr.GetNextFeature()
-    if feat.GetField("oldintfld") != '98765':
-        return 'fail'
+    assert feat.GetField("oldintfld") == '98765'
     feat = None
 
     ret = CheckFeatures(lyr, field3='baz5')
@@ -521,31 +501,26 @@ def test_ogr_rfc35_mitab_5():
     lyr = ds.GetLayer(0)
     lyr_defn = lyr.GetLayerDefn()
 
-    if lyr.TestCapability(ogr.OLCDeleteField) != 1:
-        return 'fail'
+    assert lyr.TestCapability(ogr.OLCDeleteField) == 1
 
-    if lyr.DeleteField(0) != 0:
-        return 'fail'
+    assert lyr.DeleteField(0) == 0
 
     gdal.PushErrorHandler('CPLQuietErrorHandler')
     ret = lyr.DeleteField(-1)
     gdal.PopErrorHandler()
-    if ret == 0:
-        return 'fail'
+    assert ret != 0
 
     gdal.PushErrorHandler('CPLQuietErrorHandler')
     ret = lyr.DeleteField(lyr.GetLayerDefn().GetFieldCount())
     gdal.PopErrorHandler()
-    if ret == 0:
-        return 'fail'
+    assert ret != 0
 
     ret = CheckFeatures(lyr, field3='baz5')
     if ret != 'success':
         gdaltest.post_reason(ret)
         return ret
 
-    if lyr.DeleteField(lyr_defn.GetFieldIndex('baw20')) != 0:
-        return 'fail'
+    assert lyr.DeleteField(lyr_defn.GetFieldIndex('baw20')) == 0
 
     ds = None
 
@@ -564,23 +539,20 @@ def test_ogr_rfc35_mitab_5():
         gdaltest.post_reason(ret)
         return ret
 
-    if lyr.DeleteField(lyr_defn.GetFieldIndex('baz5')) != 0:
-        return 'fail'
+    assert lyr.DeleteField(lyr_defn.GetFieldIndex('baz5')) == 0
 
     ret = CheckFeatures(lyr, field3=None, field4=None)
     if ret != 'success':
         gdaltest.post_reason(ret)
         return ret
 
-    if lyr.DeleteField(lyr_defn.GetFieldIndex('foo5')) != 0:
-        return 'fail'
+    assert lyr.DeleteField(lyr_defn.GetFieldIndex('foo5')) == 0
 
     # We cannot delete the only one remaining field (well MapInfo prohibits that)
     gdal.PushErrorHandler('CPLQuietErrorHandler')
     ret = lyr.DeleteField(lyr_defn.GetFieldIndex('bar10'))
     gdal.PopErrorHandler()
-    if ret == 0:
-        return 'fail'
+    assert ret != 0
 
     ret = CheckFeatures(lyr, field1=None, field2=None, field3=None, field4=None)
     if ret != 'success':
diff --git a/autotest/ogr/ogr_rfc35_shape.py b/autotest/ogr/ogr_rfc35_shape.py
index a9540d481201..53ecff72b503 100755
--- a/autotest/ogr/ogr_rfc35_shape.py
+++ b/autotest/ogr/ogr_rfc35_shape.py
@@ -52,9 +52,8 @@ def CheckFileSize(src_filename):
     statBufDst = gdal.VSIStatL('/vsimem/CheckFileSize.dbf', gdal.VSI_STAT_EXISTS_FLAG | gdal.VSI_STAT_NATURE_FLAG | gdal.VSI_STAT_SIZE_FLAG)
     ogr.GetDriverByName('ESRI Shapefile').DeleteDataSource('/vsimem/CheckFileSize.dbf')
 
-    if statBufSrc.size != statBufDst.size:
-        print('src_size = %d, dst_size = %d', statBufSrc.size, statBufDst.size)
-        return 'fail'
+    assert statBufSrc.size == statBufDst.size, \
+        ('src_size = %d, dst_size = %d', statBufSrc.size, statBufDst.size)
 
     return 'success'
 
@@ -147,8 +146,7 @@ def CheckColumnOrder(lyr, expected_order):
 
     lyr_defn = lyr.GetLayerDefn()
     for i, exp_order in enumerate(expected_order):
-        if lyr_defn.GetFieldDefn(i).GetName() != exp_order:
-            return 'fail'
+        assert lyr_defn.GetFieldDefn(i).GetName() == exp_order
 
     return 'success'
 
@@ -174,8 +172,7 @@ def test_ogr_rfc35_shape_2():
     ds = ogr.Open('/vsimem/rfc35_test.dbf', update=1)
     lyr = ds.GetLayer(0)
 
-    if lyr.TestCapability(ogr.OLCReorderFields) != 1:
-        return 'fail'
+    assert lyr.TestCapability(ogr.OLCReorderFields) == 1
 
     feat = ogr.Feature(lyr.GetLayerDefn())
     feat.SetField(0, 'foo3')
@@ -185,8 +182,7 @@ def test_ogr_rfc35_shape_2():
     lyr.CreateFeature(feat)
     feat = None
 
-    if lyr.ReorderField(1, 3) != 0:
-        return 'fail'
+    assert lyr.ReorderField(1, 3) == 0
     ret = Check(lyr, ['foo5', 'baz15', 'baw20', 'bar10'])
 
     lyr.ReorderField(3, 1)
@@ -213,8 +209,7 @@ def test_ogr_rfc35_shape_2():
     gdal.PushErrorHandler('CPLQuietErrorHandler')
     ret = lyr.ReorderFields([0, 0, 0, 0])
     gdal.PopErrorHandler()
-    if ret == 0:
-        return 'fail'
+    assert ret != 0
 
     ds = None
 
@@ -244,14 +239,12 @@ def test_ogr_rfc35_shape_3():
     gdal.PushErrorHandler('CPLQuietErrorHandler')
     ret = lyr.AlterFieldDefn(-1, fd, ogr.ALTER_ALL_FLAG)
     gdal.PopErrorHandler()
-    if ret == 0:
-        return 'fail'
+    assert ret != 0
 
     gdal.PushErrorHandler('CPLQuietErrorHandler')
     ret = lyr.AlterFieldDefn(lyr_defn.GetFieldCount(), fd, ogr.ALTER_ALL_FLAG)
     gdal.PopErrorHandler()
-    if ret == 0:
-        return 'fail'
+    assert ret != 0
 
     lyr.AlterFieldDefn(lyr_defn.GetFieldIndex("baz15"), fd, ogr.ALTER_ALL_FLAG)
 
@@ -271,8 +264,7 @@ def test_ogr_rfc35_shape_3():
     lyr = ds.GetLayer(0)
     lyr_defn = lyr.GetLayerDefn()
     fld_defn = lyr_defn.GetFieldDefn(lyr_defn.GetFieldIndex('baz5'))
-    if fld_defn.GetWidth() != 5:
-        return 'fail'
+    assert fld_defn.GetWidth() == 5
 
     ret = CheckFeatures(lyr, field3='baz5')
 
@@ -288,8 +280,7 @@ def test_ogr_rfc35_shape_4():
     lyr = ds.GetLayer(0)
     lyr_defn = lyr.GetLayerDefn()
 
-    if lyr.TestCapability(ogr.OLCAlterFieldDefn) != 1:
-        return 'fail'
+    assert lyr.TestCapability(ogr.OLCAlterFieldDefn) == 1
 
     fd = ogr.FieldDefn("intfield", ogr.OFTInteger)
     lyr.CreateField(fd)
@@ -307,8 +298,7 @@ def test_ogr_rfc35_shape_4():
 
     lyr.ResetReading()
     feat = lyr.GetNextFeature()
-    if feat.GetField("intfield") != 12345:
-        return 'fail'
+    assert feat.GetField("intfield") == 12345
     feat = None
 
     ret = CheckFeatures(lyr, field3='baz5')
@@ -318,8 +308,7 @@ def test_ogr_rfc35_shape_4():
 
     lyr.ResetReading()
     feat = lyr.GetNextFeature()
-    if feat.GetField("intfield") != 12345:
-        return 'fail'
+    assert feat.GetField("intfield") == 12345
     feat = None
 
     ret = CheckFeatures(lyr, field3='baz5')
@@ -335,8 +324,7 @@ def test_ogr_rfc35_shape_4():
 
     lyr.ResetReading()
     feat = lyr.GetNextFeature()
-    if feat.GetField("intfield") != 1234:
-        return 'fail'
+    assert feat.GetField("intfield") == 1234
     feat = None
 
     ret = CheckFeatures(lyr, field3='baz5')
@@ -358,8 +346,7 @@ def test_ogr_rfc35_shape_4():
 
     lyr.ResetReading()
     feat = lyr.GetNextFeature()
-    if feat.GetField("oldintfld") != '1234':
-        return 'fail'
+    assert feat.GetField("oldintfld") == '1234'
     feat = None
 
     ret = CheckFeatures(lyr, field3='baz5')
@@ -372,8 +359,7 @@ def test_ogr_rfc35_shape_4():
 
     lyr.ResetReading()
     feat = lyr.GetNextFeature()
-    if feat.GetField("oldintfld") != '1234':
-        return 'fail'
+    assert feat.GetField("oldintfld") == '1234'
     feat = None
 
     ret = CheckFeatures(lyr, field3='baz5')
@@ -382,17 +368,14 @@ def test_ogr_rfc35_shape_4():
 
     fd = ogr.FieldDefn("intfield", ogr.OFTInteger)
     fd.SetWidth(10)
-    if lyr.CreateField(fd) != 0:
-        return 'fail'
+    assert lyr.CreateField(fd) == 0
 
-    if lyr.ReorderField(lyr_defn.GetFieldIndex("intfield"), 0) != 0:
-        return 'fail'
+    assert lyr.ReorderField(lyr_defn.GetFieldIndex("intfield"), 0) == 0
 
     lyr.ResetReading()
     feat = lyr.GetNextFeature()
     feat.SetField("intfield", 98765)
-    if lyr.SetFeature(feat) != 0:
-        return 'fail'
+    assert lyr.SetFeature(feat) == 0
     feat = None
 
     fd = ogr.FieldDefn("oldintfld", ogr.OFTString)
@@ -401,8 +384,7 @@ def test_ogr_rfc35_shape_4():
 
     lyr.ResetReading()
     feat = lyr.GetNextFeature()
-    if feat.GetField("oldintfld") != '98765':
-        return 'fail'
+    assert feat.GetField("oldintfld") == '98765'
     feat = None
 
     ret = CheckFeatures(lyr, field3='baz5')
@@ -415,8 +397,7 @@ def test_ogr_rfc35_shape_4():
 
     lyr.ResetReading()
     feat = lyr.GetNextFeature()
-    if feat.GetField("oldintfld") != '98765':
-        return 'fail'
+    assert feat.GetField("oldintfld") == '98765'
     feat = None
 
     ret = CheckFeatures(lyr, field3='baz5')
@@ -433,28 +414,23 @@ def test_ogr_rfc35_shape_5():
     lyr = ds.GetLayer(0)
     lyr_defn = lyr.GetLayerDefn()
 
-    if lyr.TestCapability(ogr.OLCDeleteField) != 1:
-        return 'fail'
+    assert lyr.TestCapability(ogr.OLCDeleteField) == 1
 
-    if lyr.DeleteField(0) != 0:
-        return 'fail'
+    assert lyr.DeleteField(0) == 0
 
     gdal.PushErrorHandler('CPLQuietErrorHandler')
     ret = lyr.DeleteField(-1)
     gdal.PopErrorHandler()
-    if ret == 0:
-        return 'fail'
+    assert ret != 0
 
     gdal.PushErrorHandler('CPLQuietErrorHandler')
     ret = lyr.DeleteField(lyr.GetLayerDefn().GetFieldCount())
     gdal.PopErrorHandler()
-    if ret == 0:
-        return 'fail'
+    assert ret != 0
 
     ret = CheckFeatures(lyr, field3='baz5')
 
-    if lyr.DeleteField(lyr_defn.GetFieldIndex('baw20')) != 0:
-        return 'fail'
+    assert lyr.DeleteField(lyr_defn.GetFieldIndex('baw20')) == 0
 
     ds = None
 
@@ -469,16 +445,13 @@ def test_ogr_rfc35_shape_5():
 
     ret = CheckFeatures(lyr, field3='baz5', field4=None)
 
-    if lyr.DeleteField(lyr_defn.GetFieldIndex('baz5')) != 0:
-        return 'fail'
+    assert lyr.DeleteField(lyr_defn.GetFieldIndex('baz5')) == 0
 
     ret = CheckFeatures(lyr, field3=None, field4=None)
 
-    if lyr.DeleteField(lyr_defn.GetFieldIndex('foo5')) != 0:
-        return 'fail'
+    assert lyr.DeleteField(lyr_defn.GetFieldIndex('foo5')) == 0
 
-    if lyr.DeleteField(lyr_defn.GetFieldIndex('bar10')) != 0:
-        return 'fail'
+    assert lyr.DeleteField(lyr_defn.GetFieldIndex('bar10')) == 0
 
     ret = CheckFeatures(lyr, field1=None, field2=None, field3=None, field4=None)
 
diff --git a/autotest/ogr/ogr_rfc35_sqlite.py b/autotest/ogr/ogr_rfc35_sqlite.py
index 821a4388e2a5..f72bf802c018 100755
--- a/autotest/ogr/ogr_rfc35_sqlite.py
+++ b/autotest/ogr/ogr_rfc35_sqlite.py
@@ -142,8 +142,7 @@ def CheckColumnOrder(lyr, expected_order):
 
     lyr_defn = lyr.GetLayerDefn()
     for i, exp_order in enumerate(expected_order):
-        if lyr_defn.GetFieldDefn(i).GetName() != exp_order:
-            return 'fail'
+        assert lyr_defn.GetFieldDefn(i).GetName() == exp_order
 
     return 'success'
 
@@ -164,8 +163,7 @@ def test_ogr_rfc35_sqlite_2():
 
     lyr = gdaltest.rfc35_sqlite_ds.GetLayer(0)
 
-    if lyr.TestCapability(ogr.OLCReorderFields) != 1:
-        return 'fail'
+    assert lyr.TestCapability(ogr.OLCReorderFields) == 1
 
     feat = ogr.Feature(lyr.GetLayerDefn())
     feat.SetField(0, 'foo3')
@@ -175,8 +173,7 @@ def test_ogr_rfc35_sqlite_2():
     lyr.CreateFeature(feat)
     feat = None
 
-    if lyr.ReorderField(1, 3) != 0:
-        return 'fail'
+    assert lyr.ReorderField(1, 3) == 0
 
     ret = Check(lyr, ['foo5', 'baz15', 'baw20', 'bar10'])
 
@@ -204,8 +201,7 @@ def test_ogr_rfc35_sqlite_2():
     gdal.PushErrorHandler('CPLQuietErrorHandler')
     ret = lyr.ReorderFields([0, 0, 0, 0])
     gdal.PopErrorHandler()
-    if ret == 0:
-        return 'fail'
+    assert ret != 0
 
     return 'success'
 
@@ -228,14 +224,12 @@ def test_ogr_rfc35_sqlite_3():
     gdal.PushErrorHandler('CPLQuietErrorHandler')
     ret = lyr.AlterFieldDefn(-1, fd, ogr.ALTER_ALL_FLAG)
     gdal.PopErrorHandler()
-    if ret == 0:
-        return 'fail'
+    assert ret != 0
 
     gdal.PushErrorHandler('CPLQuietErrorHandler')
     ret = lyr.AlterFieldDefn(lyr_defn.GetFieldCount(), fd, ogr.ALTER_ALL_FLAG)
     gdal.PopErrorHandler()
-    if ret == 0:
-        return 'fail'
+    assert ret != 0
 
     lyr.AlterFieldDefn(lyr_defn.GetFieldIndex("baz15"), fd, ogr.ALTER_ALL_FLAG)
 
@@ -251,8 +245,7 @@ def test_ogr_rfc35_sqlite_3():
 
     lyr_defn = lyr.GetLayerDefn()
     fld_defn = lyr_defn.GetFieldDefn(lyr_defn.GetFieldIndex('baz5'))
-    if fld_defn.GetWidth() != 5:
-        return 'fail'
+    assert fld_defn.GetWidth() == 5
 
     ret = CheckFeatures(lyr, field3='baz5')
 
@@ -270,8 +263,7 @@ def test_ogr_rfc35_sqlite_4():
     lyr = gdaltest.rfc35_sqlite_ds.GetLayer(0)
     lyr_defn = lyr.GetLayerDefn()
 
-    if lyr.TestCapability(ogr.OLCAlterFieldDefn) != 1:
-        return 'fail'
+    assert lyr.TestCapability(ogr.OLCAlterFieldDefn) == 1
 
     fd = ogr.FieldDefn("intfield", ogr.OFTInteger)
     lyr.CreateField(fd)
@@ -289,8 +281,7 @@ def test_ogr_rfc35_sqlite_4():
 
     lyr.ResetReading()
     feat = lyr.GetNextFeature()
-    if feat.GetField("intfield") != 12345:
-        return 'fail'
+    assert feat.GetField("intfield") == 12345
     feat = None
 
     ret = CheckFeatures(lyr, field3='baz5')
@@ -300,8 +291,7 @@ def test_ogr_rfc35_sqlite_4():
 
     lyr.ResetReading()
     feat = lyr.GetNextFeature()
-    if feat.GetField("intfield") != 12345:
-        return 'fail'
+    assert feat.GetField("intfield") == 12345
     feat = None
 
     ret = CheckFeatures(lyr, field3='baz5')
@@ -312,8 +302,7 @@ def test_ogr_rfc35_sqlite_4():
     lyr.ResetReading()
     feat = lyr.GetNextFeature()
     # if feat.GetField("intfield") != 1234:
-    if feat.GetField("intfield") != 12345:
-        return 'fail'
+    assert feat.GetField("intfield") == 12345
     feat = None
 
     ret = CheckFeatures(lyr, field3='baz5')
@@ -325,8 +314,7 @@ def test_ogr_rfc35_sqlite_4():
     lyr.ResetReading()
     feat = lyr.GetNextFeature()
     # if feat.GetField("oldintfld") != '1234':
-    if feat.GetField("oldintfld") != '12345':
-        return 'fail'
+    assert feat.GetField("oldintfld") == '12345'
     feat = None
 
     ret = CheckFeatures(lyr, field3='baz5')
@@ -335,17 +323,14 @@ def test_ogr_rfc35_sqlite_4():
 
     fd = ogr.FieldDefn("intfield", ogr.OFTInteger)
     fd.SetWidth(10)
-    if lyr.CreateField(fd) != 0:
-        return 'fail'
+    assert lyr.CreateField(fd) == 0
 
-    if lyr.ReorderField(lyr_defn.GetFieldIndex("intfield"), 0) != 0:
-        return 'fail'
+    assert lyr.ReorderField(lyr_defn.GetFieldIndex("intfield"), 0) == 0
 
     lyr.ResetReading()
     feat = lyr.GetNextFeature()
     feat.SetField("intfield", 98765)
-    if lyr.SetFeature(feat) != 0:
-        return 'fail'
+    assert lyr.SetFeature(feat) == 0
     feat = None
 
     fd = ogr.FieldDefn("oldintfld", ogr.OFTString)
@@ -354,8 +339,7 @@ def test_ogr_rfc35_sqlite_4():
 
     lyr.ResetReading()
     feat = lyr.GetNextFeature()
-    if feat.GetField("oldintfld") != '98765':
-        return 'fail'
+    assert feat.GetField("oldintfld") == '98765'
     feat = None
 
     ret = CheckFeatures(lyr, field3='baz5')
@@ -374,41 +358,33 @@ def test_ogr_rfc35_sqlite_5():
     lyr = gdaltest.rfc35_sqlite_ds.GetLayer(0)
     lyr_defn = lyr.GetLayerDefn()
 
-    if lyr.TestCapability(ogr.OLCDeleteField) != 1:
-        return 'fail'
+    assert lyr.TestCapability(ogr.OLCDeleteField) == 1
 
     gdal.PushErrorHandler('CPLQuietErrorHandler')
     ret = lyr.DeleteField(-1)
     gdal.PopErrorHandler()
-    if ret == 0:
-        return 'fail'
+    assert ret != 0
 
     gdal.PushErrorHandler('CPLQuietErrorHandler')
     ret = lyr.DeleteField(lyr.GetLayerDefn().GetFieldCount())
     gdal.PopErrorHandler()
-    if ret == 0:
-        return 'fail'
+    assert ret != 0
 
-    if lyr.DeleteField(0) != 0:
-        return 'fail'
+    assert lyr.DeleteField(0) == 0
 
     ret = CheckFeatures(lyr, field3='baz5')
 
-    if lyr.DeleteField(lyr_defn.GetFieldIndex('baw20')) != 0:
-        return 'fail'
+    assert lyr.DeleteField(lyr_defn.GetFieldIndex('baw20')) == 0
 
     ret = CheckFeatures(lyr, field3='baz5', field4=None)
 
-    if lyr.DeleteField(lyr_defn.GetFieldIndex('baz5')) != 0:
-        return 'fail'
+    assert lyr.DeleteField(lyr_defn.GetFieldIndex('baz5')) == 0
 
     ret = CheckFeatures(lyr, field3=None, field4=None)
 
-    if lyr.DeleteField(lyr_defn.GetFieldIndex('foo5')) != 0:
-        return 'fail'
+    assert lyr.DeleteField(lyr_defn.GetFieldIndex('foo5')) == 0
 
-    if lyr.DeleteField(lyr_defn.GetFieldIndex('bar10')) != 0:
-        return 'fail'
+    assert lyr.DeleteField(lyr_defn.GetFieldIndex('bar10')) == 0
 
     ret = CheckFeatures(lyr, field1=None, field2=None, field3=None, field4=None)
 
diff --git a/autotest/ogr/ogr_rfc41.py b/autotest/ogr/ogr_rfc41.py
index 619b03bc3200..357676090d78 100755
--- a/autotest/ogr/ogr_rfc41.py
+++ b/autotest/ogr/ogr_rfc41.py
@@ -46,50 +46,40 @@ def test_ogr_rfc41_1():
     gfld_defn = ogr.GeomFieldDefn()
 
     # Check default values
-    if gfld_defn.GetName() != '':
-        return 'fail'
-    if gfld_defn.GetType() != ogr.wkbUnknown:
-        return 'fail'
-    if gfld_defn.GetSpatialRef() is not None:
-        return 'fail'
-    if gfld_defn.IsIgnored() != 0:
-        return 'fail'
+    assert gfld_defn.GetName() == ''
+    assert gfld_defn.GetType() == ogr.wkbUnknown
+    assert gfld_defn.GetSpatialRef() is None
+    assert gfld_defn.IsIgnored() == 0
 
     # Test SetName() / GetName()
     gfld_defn.SetName('foo')
-    if gfld_defn.GetName() != 'foo':
-        return 'fail'
+    assert gfld_defn.GetName() == 'foo'
 
     # Test SetType() / GetType()
     gfld_defn.SetType(ogr.wkbPoint)
-    if gfld_defn.GetType() != ogr.wkbPoint:
-        return 'fail'
+    assert gfld_defn.GetType() == ogr.wkbPoint
 
     # Test SetSpatialRef() / GetSpatialRef()
     sr = osr.SpatialReference()
     gfld_defn.SetSpatialRef(sr)
     got_sr = gfld_defn.GetSpatialRef()
-    if got_sr.IsSame(sr) == 0:
-        return 'fail'
+    assert got_sr.IsSame(sr) != 0
 
     gfld_defn.SetSpatialRef(None)
-    if gfld_defn.GetSpatialRef() is not None:
-        return 'fail'
+    assert gfld_defn.GetSpatialRef() is None
 
     gfld_defn.SetSpatialRef(sr)
 
     # Test SetIgnored() / IsIgnored()
     gfld_defn.SetIgnored(1)
-    if gfld_defn.IsIgnored() != 1:
-        return 'fail'
+    assert gfld_defn.IsIgnored() == 1
 
     # Test setting invalid value
     old_val = gfld_defn.GetType()
     gdal.PushErrorHandler('CPLQuietErrorHandler')
     gfld_defn.SetType(-3)
     gdal.PopErrorHandler()
-    if gfld_defn.GetType() != old_val:
-        return 'fail'
+    assert gfld_defn.GetType() == old_val
 
     gfld_defn = None
 
@@ -103,123 +93,88 @@ def test_ogr_rfc41_2():
 
     # Check implicit geometry field creation
     feature_defn = ogr.FeatureDefn()
-    if feature_defn.GetGeomFieldCount() != 1:
-        return 'fail'
-    if feature_defn.GetGeomType() != ogr.wkbUnknown:
-        return 'fail'
+    assert feature_defn.GetGeomFieldCount() == 1
+    assert feature_defn.GetGeomType() == ogr.wkbUnknown
 
     # Test IsSame()
-    if feature_defn.IsSame(feature_defn) != 1:
-        return 'fail'
+    assert feature_defn.IsSame(feature_defn) == 1
     other_feature_defn = ogr.FeatureDefn()
-    if feature_defn.IsSame(other_feature_defn) != 1:
-        return 'fail'
+    assert feature_defn.IsSame(other_feature_defn) == 1
     other_feature_defn.GetGeomFieldDefn(0).SetSpatialRef(osr.SpatialReference())
-    if feature_defn.IsSame(other_feature_defn) != 0:
-        return 'fail'
+    assert feature_defn.IsSame(other_feature_defn) == 0
     feature_defn.GetGeomFieldDefn(0).SetSpatialRef(osr.SpatialReference())
-    if feature_defn.IsSame(other_feature_defn) != 1:
-        return 'fail'
+    assert feature_defn.IsSame(other_feature_defn) == 1
     other_feature_defn.GetGeomFieldDefn(0).SetSpatialRef(None)
-    if feature_defn.IsSame(other_feature_defn) != 0:
-        return 'fail'
+    assert feature_defn.IsSame(other_feature_defn) == 0
 
     feature_defn = None
     feature_defn = ogr.FeatureDefn()
 
     # Check changing geometry type
     feature_defn.SetGeomType(ogr.wkbPoint)
-    if feature_defn.GetGeomType() != ogr.wkbPoint:
-        return 'fail'
-    if feature_defn.GetGeomFieldDefn(0).GetType() != ogr.wkbPoint:
-        return 'fail'
+    assert feature_defn.GetGeomType() == ogr.wkbPoint
+    assert feature_defn.GetGeomFieldDefn(0).GetType() == ogr.wkbPoint
 
     # Check setting to wkbNone and implicitly destroying the field.
     for _ in range(2):
         feature_defn.SetGeomType(ogr.wkbNone)
-        if feature_defn.GetGeomFieldCount() != 0:
-            return 'fail'
-        if feature_defn.GetGeomType() != ogr.wkbNone:
-            return 'fail'
+        assert feature_defn.GetGeomFieldCount() == 0
+        assert feature_defn.GetGeomType() == ogr.wkbNone
 
     # Recreate the field
     for t in [ogr.wkbPoint, ogr.wkbLineString]:
         feature_defn.SetGeomType(t)
-        if feature_defn.GetGeomFieldCount() != 1:
-            return 'fail'
-        if feature_defn.GetGeomType() != t:
-            return 'fail'
-        if feature_defn.GetGeomFieldDefn(0).GetType() != t:
-            return 'fail'
+        assert feature_defn.GetGeomFieldCount() == 1
+        assert feature_defn.GetGeomType() == t
+        assert feature_defn.GetGeomFieldDefn(0).GetType() == t
 
     # Test setting invalid value
     old_val = feature_defn.GetGeomType()
     gdal.PushErrorHandler('CPLQuietErrorHandler')
     feature_defn.SetGeomType(-3)
     gdal.PopErrorHandler()
-    if feature_defn.GetGeomType() != old_val:
-        return 'fail'
+    assert feature_defn.GetGeomType() == old_val
 
     # Test SetIgnored() / IsIgnored()
-    if feature_defn.IsGeometryIgnored() != 0:
-        return 'fail'
-    if feature_defn.GetGeomFieldDefn(0).IsIgnored() != 0:
-        return 'fail'
+    assert feature_defn.IsGeometryIgnored() == 0
+    assert feature_defn.GetGeomFieldDefn(0).IsIgnored() == 0
     feature_defn.SetGeometryIgnored(1)
-    if feature_defn.IsGeometryIgnored() != 1:
-        return 'fail'
-    if feature_defn.GetGeomFieldDefn(0).IsIgnored() != 1:
-        return 'fail'
+    assert feature_defn.IsGeometryIgnored() == 1
+    assert feature_defn.GetGeomFieldDefn(0).IsIgnored() == 1
 
     # Test wrong index values for GetGeomFieldDefn()
     for idx in [-1, 1]:
         gdal.PushErrorHandler('CPLQuietErrorHandler')
         ret = feature_defn.GetGeomFieldDefn(idx)
         gdal.PopErrorHandler()
-        if ret is not None:
-            return 'fail'
+        assert ret is None
 
     # Test GetGeomFieldIndex()
-    if feature_defn.GetGeomFieldIndex("") != 0:
-        return 'fail'
-    if feature_defn.GetGeomFieldIndex("invalid") != -1:
-        return 'fail'
+    assert feature_defn.GetGeomFieldIndex("") == 0
+    assert feature_defn.GetGeomFieldIndex("invalid") == -1
 
     # Test AddGeomFieldDefn()
     gfld_defn = ogr.GeomFieldDefn('polygon_field', ogr.wkbPolygon)
     feature_defn.AddGeomFieldDefn(gfld_defn)
-    if feature_defn.GetGeomFieldCount() != 2:
-        return 'fail'
-    if feature_defn.GetGeomFieldIndex("polygon_field") != 1:
-        return 'fail'
-    if feature_defn.GetGeomFieldDefn(1).GetName() != 'polygon_field':
-        return 'fail'
+    assert feature_defn.GetGeomFieldCount() == 2
+    assert feature_defn.GetGeomFieldIndex("polygon_field") == 1
+    assert feature_defn.GetGeomFieldDefn(1).GetName() == 'polygon_field'
 
     # Test DeleteGeomFieldDefn() : error cases
-    if feature_defn.DeleteGeomFieldDefn(-1) == 0:
-        return 'fail'
-    if feature_defn.DeleteGeomFieldDefn(2) == 0:
-        return 'fail'
-    if feature_defn.GetGeomFieldCount() != 2:
-        return 'fail'
+    assert feature_defn.DeleteGeomFieldDefn(-1) != 0
+    assert feature_defn.DeleteGeomFieldDefn(2) != 0
+    assert feature_defn.GetGeomFieldCount() == 2
 
     # Test DeleteGeomFieldDefn() : valid cases
-    if feature_defn.DeleteGeomFieldDefn(0) != 0:
-        return 'fail'
-    if feature_defn.GetGeomFieldCount() != 1:
-        return 'fail'
-    if feature_defn.GetGeomFieldIndex("polygon_field") != 0:
-        return 'fail'
+    assert feature_defn.DeleteGeomFieldDefn(0) == 0
+    assert feature_defn.GetGeomFieldCount() == 1
+    assert feature_defn.GetGeomFieldIndex("polygon_field") == 0
 
-    if feature_defn.DeleteGeomFieldDefn(0) != 0:
-        return 'fail'
-    if feature_defn.GetGeomFieldCount() != 0:
-        return 'fail'
+    assert feature_defn.DeleteGeomFieldDefn(0) == 0
+    assert feature_defn.GetGeomFieldCount() == 0
 
-    if feature_defn.IsSame(feature_defn) != 1:
-        return 'fail'
-    if feature_defn.IsSame(ogr.FeatureDefn()) != 0:
-        return 'fail'
+    assert feature_defn.IsSame(feature_defn) == 1
+    assert feature_defn.IsSame(ogr.FeatureDefn()) == 0
 
     feature_defn = None
 
@@ -234,73 +189,45 @@ def test_ogr_rfc41_3():
     # Test with just one geometry field
     feature_defn = ogr.FeatureDefn()
     feature = ogr.Feature(feature_defn)
-    if feature.GetGeomFieldCount() != 1:
-        return 'fail'
-    if feature.GetGeomFieldDefnRef(0).GetName() != '':
-        return 'fail'
-    if feature.GetGeomFieldDefnRef(0).GetType() != ogr.wkbUnknown:
-        return 'fail'
-    if feature.GetGeomFieldIndex('') != 0:
-        return 'fail'
-    if feature.GetGeomFieldIndex('non_existing') != -1:
-        return 'fail'
-    if feature.GetGeomFieldRef(-1) is not None:
-        return 'fail'
-    if feature.GetGeomFieldRef(0) is not None:
-        return 'fail'
-    if feature.GetGeomFieldRef(1) is not None:
-        return 'fail'
+    assert feature.GetGeomFieldCount() == 1
+    assert feature.GetGeomFieldDefnRef(0).GetName() == ''
+    assert feature.GetGeomFieldDefnRef(0).GetType() == ogr.wkbUnknown
+    assert feature.GetGeomFieldIndex('') == 0
+    assert feature.GetGeomFieldIndex('non_existing') == -1
+    assert feature.GetGeomFieldRef(-1) is None
+    assert feature.GetGeomFieldRef(0) is None
+    assert feature.GetGeomFieldRef(1) is None
     feature_clone_without_geom = feature.Clone()
-    if not feature.Equal(feature_clone_without_geom):
-        return 'fail'
-    if feature.SetGeomField(0, ogr.Geometry(ogr.wkbPoint)) != 0:
-        return 'fail'
-    if feature.GetGeomFieldRef(0).ExportToWkt() != 'POINT EMPTY':
-        return 'fail'
-    if not feature.Equal(feature.Clone()):
-        return 'fail'
-    if feature.Equal(feature_clone_without_geom):
-        return 'fail'
+    assert feature.Equal(feature_clone_without_geom)
+    assert feature.SetGeomField(0, ogr.Geometry(ogr.wkbPoint)) == 0
+    assert feature.GetGeomFieldRef(0).ExportToWkt() == 'POINT EMPTY'
+    assert feature.Equal(feature.Clone())
+    assert not feature.Equal(feature_clone_without_geom)
     feature_clone_with_other_geom = feature.Clone()
     feature_clone_with_other_geom.SetGeometry(ogr.Geometry(ogr.wkbLineString))
-    if feature.Equal(feature_clone_with_other_geom):
-        return 'fail'
-    if feature.SetGeomFieldDirectly(-1, None) == 0:
-        return 'fail'
-    if feature.SetGeomFieldDirectly(0, ogr.Geometry(ogr.wkbLineString)) != 0:
-        return 'fail'
-    if feature.GetGeomFieldRef(0).ExportToWkt() != 'LINESTRING EMPTY':
-        return 'fail'
+    assert not feature.Equal(feature_clone_with_other_geom)
+    assert feature.SetGeomFieldDirectly(-1, None) != 0
+    assert feature.SetGeomFieldDirectly(0, ogr.Geometry(ogr.wkbLineString)) == 0
+    assert feature.GetGeomFieldRef(0).ExportToWkt() == 'LINESTRING EMPTY'
     feature_clone_with_geom = feature.Clone()
-    if feature.SetGeomFieldDirectly(0, None) != 0:
-        return 'fail'
-    if feature.GetGeomFieldRef(0) is not None:
-        return 'fail'
-    if feature.Equal(feature_clone_with_geom):
-        return 'fail'
+    assert feature.SetGeomFieldDirectly(0, None) == 0
+    assert feature.GetGeomFieldRef(0) is None
+    assert not feature.Equal(feature_clone_with_geom)
     feature = None
 
     # Test one a feature with 0 geometry field
     feature_defn = ogr.FeatureDefn()
     feature_defn.SetGeomType(ogr.wkbNone)
     feature = ogr.Feature(feature_defn)
-    if not feature.Equal(feature.Clone()):
-        return 'fail'
-    if feature.GetGeomFieldCount() != 0:
-        return 'fail'
+    assert feature.Equal(feature.Clone())
+    assert feature.GetGeomFieldCount() == 0
     # This used to work before RFC 41, but it no longer will
-    if feature.SetGeometry(ogr.Geometry(ogr.wkbPoint)) == 0:
-        return 'fail'
-    if feature.SetGeomField(0, ogr.Geometry(ogr.wkbPoint)) == 0:
-        return 'fail'
-    if feature.GetGeometryRef() is not None:
-        return 'fail'
-    if feature.GetGeomFieldRef(0) is not None:
-        return 'fail'
-    if feature.SetGeometryDirectly(ogr.Geometry(ogr.wkbPoint)) == 0:
-        return 'fail'
-    if feature.SetGeomFieldDirectly(0, ogr.Geometry(ogr.wkbPoint)) == 0:
-        return 'fail'
+    assert feature.SetGeometry(ogr.Geometry(ogr.wkbPoint)) != 0
+    assert feature.SetGeomField(0, ogr.Geometry(ogr.wkbPoint)) != 0
+    assert feature.GetGeometryRef() is None
+    assert feature.GetGeomFieldRef(0) is None
+    assert feature.SetGeometryDirectly(ogr.Geometry(ogr.wkbPoint)) != 0
+    assert feature.SetGeomFieldDirectly(0, ogr.Geometry(ogr.wkbPoint)) != 0
     feature = None
 
     # Test one a feature with several geometry fields
@@ -313,18 +240,13 @@ def test_ogr_rfc41_3():
     feature = ogr.Feature(feature_defn)
     feature.SetGeomField(0, ogr.Geometry(ogr.wkbPolygon))
     feature.SetGeomField(1, ogr.Geometry(ogr.wkbPoint))
-    if feature.GetGeomFieldRef(0).ExportToWkt() != 'POLYGON EMPTY':
-        return 'fail'
-    if feature.GetGeomFieldRef(1).ExportToWkt() != 'POINT EMPTY':
-        return 'fail'
-    if not feature.Equal(feature.Clone()):
-        return 'fail'
+    assert feature.GetGeomFieldRef(0).ExportToWkt() == 'POLYGON EMPTY'
+    assert feature.GetGeomFieldRef(1).ExportToWkt() == 'POINT EMPTY'
+    assert feature.Equal(feature.Clone())
     other_feature = ogr.Feature(feature_defn)
-    if feature.Equal(other_feature):
-        return 'fail'
+    assert not feature.Equal(other_feature)
     other_feature.SetFrom(feature)
-    if not feature.Equal(other_feature):
-        return 'fail'
+    assert feature.Equal(other_feature)
 
     # Test that in SetFrom() where target has a single geometry field,
     # we get the first geometry of the source even if we cannot find a
@@ -332,8 +254,7 @@ def test_ogr_rfc41_3():
     feature_defn_default = ogr.FeatureDefn()
     feature_default = ogr.Feature(feature_defn_default)
     feature_default.SetFrom(feature)
-    if feature_default.GetGeomFieldRef(0).ExportToWkt() != 'POLYGON EMPTY':
-        return 'fail'
+    assert feature_default.GetGeomFieldRef(0).ExportToWkt() == 'POLYGON EMPTY'
 
     return 'success'
 
@@ -344,16 +265,12 @@ def test_ogr_rfc41_3():
 def test_ogr_rfc41_4():
 
     ds = ogr.GetDriverByName('memory').CreateDataSource('')
-    if ds.TestCapability(ogr.ODsCCreateGeomFieldAfterCreateLayer) == 0:
-        return 'fail'
+    assert ds.TestCapability(ogr.ODsCCreateGeomFieldAfterCreateLayer) != 0
     sr = osr.SpatialReference()
     lyr = ds.CreateLayer('test', geom_type=ogr.wkbPoint, srs=sr)
-    if lyr.TestCapability(ogr.OLCCreateGeomField) == 0:
-        return 'fail'
-    if lyr.GetSpatialRef().IsSame(sr) == 0:
-        return 'fail'
-    if lyr.GetLayerDefn().GetGeomFieldDefn(0).GetSpatialRef().IsSame(sr) == 0:
-        return 'fail'
+    assert lyr.TestCapability(ogr.OLCCreateGeomField) != 0
+    assert lyr.GetSpatialRef().IsSame(sr) != 0
+    assert lyr.GetLayerDefn().GetGeomFieldDefn(0).GetSpatialRef().IsSame(sr) != 0
     lyr.GetLayerDefn().GetGeomFieldDefn(0).SetName('a_name')
     feat = ogr.Feature(lyr.GetLayerDefn())
     feat.SetGeometry(ogr.CreateGeometryFromWkt('POINT (1 2)'))
@@ -361,8 +278,7 @@ def test_ogr_rfc41_4():
     lyr.ResetReading()
     feat = lyr.GetNextFeature()
     geom = feat.GetGeometryRef()
-    if geom.GetSpatialReference().IsSame(sr) == 0:
-        return 'fail'
+    assert geom.GetSpatialReference().IsSame(sr) != 0
     feat = None
     lyr.CreateGeomField(ogr.GeomFieldDefn('another_geom_field', ogr.wkbPolygon))
     lyr.ResetReading()
@@ -372,57 +288,47 @@ def test_ogr_rfc41_4():
     lyr.ResetReading()
     feat = lyr.GetNextFeature()
     geom = feat.GetGeomFieldRef(0)
-    if geom.ExportToWkt() != 'POINT (1 2)':
-        return 'fail'
+    assert geom.ExportToWkt() == 'POINT (1 2)'
     geom = feat.GetGeomFieldRef('another_geom_field')
-    if geom.ExportToWkt() != 'POLYGON ((10 10,10 11,11 11,11 10,10 10))':
-        return 'fail'
+    assert geom.ExportToWkt() == 'POLYGON ((10 10,10 11,11 11,11 10,10 10))'
 
     # Test GetExtent()
     got_extent = lyr.GetExtent(geom_field=1)
-    if got_extent != (10.0, 11.0, 10.0, 11.0):
-        return 'fail'
+    assert got_extent == (10.0, 11.0, 10.0, 11.0)
     # Test invalid geometry field index
     gdal.ErrorReset()
     gdal.PushErrorHandler('CPLQuietErrorHandler')
     got_extent = lyr.GetExtent(geom_field=2)
     gdal.PopErrorHandler()
-    if gdal.GetLastErrorMsg() == '':
-        return 'fail'
+    assert gdal.GetLastErrorMsg() != ''
 
     # Test SetSpatialFilter()
     lyr.SetSpatialFilter(1, ogr.CreateGeometryFromWkt('POLYGON ((-10 10,-10 11,-11 11,-11 10,-10 10))'))
     lyr.ResetReading()
     feat = lyr.GetNextFeature()
-    if feat is not None:
-        return 'fail'
+    assert feat is None
     lyr.SetSpatialFilter(1, ogr.CreateGeometryFromWkt('POLYGON ((10 10,10 11,11 11,11 10,10 10))'))
     lyr.ResetReading()
     feat = lyr.GetNextFeature()
-    if feat is None:
-        return 'fail'
+    assert feat is not None
     lyr.SetSpatialFilterRect(1, 10, 10, 11, 11)
     lyr.ResetReading()
     feat = lyr.GetNextFeature()
-    if feat is None:
-        return 'fail'
+    assert feat is not None
     # Test invalid spatial filter index
     gdal.ErrorReset()
     gdal.PushErrorHandler('CPLQuietErrorHandler')
     lyr.SetSpatialFilterRect(2, 0, 0, 0, 0)
     gdal.PopErrorHandler()
-    if gdal.GetLastErrorMsg() == '':
-        return 'fail'
+    assert gdal.GetLastErrorMsg() != ''
 
     lyr.SetSpatialFilter(None)
     another_lyr = ds.CopyLayer(lyr, 'dup_test')
     dup_feat = another_lyr.GetNextFeature()
     geom = dup_feat.GetGeomFieldRef('a_name')
-    if geom.ExportToWkt() != 'POINT (1 2)':
-        return 'fail'
+    assert geom.ExportToWkt() == 'POINT (1 2)'
     geom = dup_feat.GetGeomFieldRef('another_geom_field')
-    if geom.ExportToWkt() != 'POLYGON ((10 10,10 11,11 11,11 10,10 10))':
-        return 'fail'
+    assert geom.ExportToWkt() == 'POLYGON ((10 10,10 11,11 11,11 10,10 10))'
 
     return 'success'
 
@@ -439,15 +345,11 @@ def test_ogr_rfc41_5():
 
     f = ogr.Feature(feature_defn)
 
-    if f['strfield'] is not None:
-        return 'fail'
-    if f.strfield is not None:
-        return 'fail'
+    assert f['strfield'] is None
+    assert f.strfield is None
 
-    if f['geomfield'] is not None:
-        return 'fail'
-    if f.geomfield is not None:
-        return 'fail'
+    assert f['geomfield'] is None
+    assert f.geomfield is None
 
     try:
         f['nonexistent_field']
@@ -469,34 +371,25 @@ def test_ogr_rfc41_5():
 
     # This works.  Default Python behaviour. Stored in a dictionary
     f.nonexistent_field = 'bar'
-    if f.nonexistent_field != 'bar':
-        return 'fail'
+    assert f.nonexistent_field == 'bar'
 
     f['strfield'] = 'foo'
-    if f['strfield'] != 'foo':
-        return 'fail'
-    if f.strfield != 'foo':
-        return 'fail'
+    assert f['strfield'] == 'foo'
+    assert f.strfield == 'foo'
 
     f.strfield = 'bar'
-    if f['strfield'] != 'bar':
-        return 'fail'
-    if f.strfield != 'bar':
-        return 'fail'
+    assert f['strfield'] == 'bar'
+    assert f.strfield == 'bar'
 
     wkt = 'POINT EMPTY'
     f['geomfield'] = ogr.CreateGeometryFromWkt(wkt)
-    if f['geomfield'].ExportToWkt() != wkt:
-        return 'fail'
-    if f.geomfield.ExportToWkt() != wkt:
-        return 'fail'
+    assert f['geomfield'].ExportToWkt() == wkt
+    assert f.geomfield.ExportToWkt() == wkt
 
     wkt2 = 'POLYGON EMPTY'
     f.geomfield = ogr.CreateGeometryFromWkt(wkt2)
-    if f['geomfield'].ExportToWkt() != wkt2:
-        return 'fail'
-    if f.geomfield.ExportToWkt() != wkt2:
-        return 'fail'
+    assert f['geomfield'].ExportToWkt() == wkt2
+    assert f.geomfield.ExportToWkt() == wkt2
 
     return 'success'
 
@@ -528,130 +421,102 @@ def test_ogr_rfc41_6():
                 'SELECT intfield, geomfield FROM poly',
                 'SELECT geomfield, intfield FROM poly']:
         sql_lyr = ds.ExecuteSQL(sql)
-        if sql_lyr.GetLayerDefn().GetGeomFieldDefn(0).GetType() != ogr.wkbPolygon:
-            return 'fail'
-        if sql_lyr.GetLayerDefn().GetGeomFieldDefn(0).GetSpatialRef() is None:
-            return 'fail'
+        assert sql_lyr.GetLayerDefn().GetGeomFieldDefn(0).GetType() == ogr.wkbPolygon
+        assert sql_lyr.GetLayerDefn().GetGeomFieldDefn(0).GetSpatialRef() is not None
         feat = sql_lyr.GetNextFeature()
-        if feat.GetField('intfield') != 1:
-            return 'fail'
-        if feat.GetGeomFieldRef('geomfield') is None:
-            return 'fail'
+        assert feat.GetField('intfield') == 1
+        assert feat.GetGeomFieldRef('geomfield') is not None
         feat = sql_lyr.GetNextFeature()
-        if feat.GetGeomFieldRef('geomfield') is not None:
-            return 'fail'
+        assert feat.GetGeomFieldRef('geomfield') is None
         feat = None
         ds.ReleaseResultSet(sql_lyr)
 
     # Test CAST(geometry_field AS GEOMETRY)
     sql_lyr = ds.ExecuteSQL('SELECT CAST(geomfield AS GEOMETRY) AS mygeom FROM poly WHERE CAST(geomfield AS GEOMETRY) IS NOT NULL')
-    if sql_lyr.GetLayerDefn().GetGeomFieldDefn(0).GetType() != ogr.wkbUnknown:
-        return 'fail'
-    if sql_lyr.GetLayerDefn().GetGeomFieldDefn(0).GetSpatialRef() is not None:
-        return 'fail'
+    assert sql_lyr.GetLayerDefn().GetGeomFieldDefn(0).GetType() == ogr.wkbUnknown
+    assert sql_lyr.GetLayerDefn().GetGeomFieldDefn(0).GetSpatialRef() is None
     feat = sql_lyr.GetNextFeature()
-    if feat.GetGeomFieldRef('mygeom') is None:
-        return 'fail'
+    assert feat.GetGeomFieldRef('mygeom') is not None
     feat = None
     ds.ReleaseResultSet(sql_lyr)
 
     # Test CAST(xxx AS GEOMETRY(POLYGON))
     sql_lyr = ds.ExecuteSQL('SELECT CAST(geomfield AS GEOMETRY(POLYGON)) AS mygeom FROM poly WHERE CAST(geomfield AS GEOMETRY(POLYGON)) IS NOT NULL')
-    if sql_lyr.GetLayerDefn().GetGeomFieldDefn(0).GetType() != ogr.wkbPolygon:
-        return 'fail'
-    if sql_lyr.GetLayerDefn().GetGeomFieldDefn(0).GetSpatialRef() is not None:
-        return 'fail'
+    assert sql_lyr.GetLayerDefn().GetGeomFieldDefn(0).GetType() == ogr.wkbPolygon
+    assert sql_lyr.GetLayerDefn().GetGeomFieldDefn(0).GetSpatialRef() is None
     feat = sql_lyr.GetNextFeature()
-    if feat.GetGeomFieldRef('mygeom') is None:
-        return 'fail'
+    assert feat.GetGeomFieldRef('mygeom') is not None
     feat = None
     ds.ReleaseResultSet(sql_lyr)
 
     # Test CAST(xxx AS GEOMETRY(POLYGON,4326))
     sql_lyr = ds.ExecuteSQL('SELECT CAST(geomfield AS GEOMETRY(POLYGON,4326)) AS mygeom FROM poly WHERE CAST(geomfield AS GEOMETRY(POLYGON,4326)) IS NOT NULL')
-    if sql_lyr.GetLayerDefn().GetGeomFieldDefn(0).GetType() != ogr.wkbPolygon:
-        return 'fail'
-    if sql_lyr.GetLayerDefn().GetGeomFieldDefn(0).GetSpatialRef().ExportToWkt().find('4326') < 0:
-        return 'fail'
+    assert sql_lyr.GetLayerDefn().GetGeomFieldDefn(0).GetType() == ogr.wkbPolygon
+    assert sql_lyr.GetLayerDefn().GetGeomFieldDefn(0).GetSpatialRef().ExportToWkt().find('4326') >= 0
     feat = sql_lyr.GetNextFeature()
-    if feat.GetGeomFieldRef('mygeom') is None:
-        return 'fail'
+    assert feat.GetGeomFieldRef('mygeom') is not None
     feat = None
     ds.ReleaseResultSet(sql_lyr)
 
     # Test CAST(a_multipolygon AS GEOMETRY(POLYGON))
     sql_lyr = ds.ExecuteSQL("SELECT CAST('MULTIPOLYGON (((0 0,0 1,1 1,1 0,0 0)))' AS GEOMETRY(POLYGON)) AS mygeom FROM poly")
     feat = sql_lyr.GetNextFeature()
-    if feat.GetGeomFieldRef('mygeom').ExportToWkt() != 'POLYGON ((0 0,0 1,1 1,1 0,0 0))':
-        return 'fail'
+    assert feat.GetGeomFieldRef('mygeom').ExportToWkt() == 'POLYGON ((0 0,0 1,1 1,1 0,0 0))'
     feat = None
     ds.ReleaseResultSet(sql_lyr)
 
     # Test CAST(a_polygon AS GEOMETRY(MULTIPOLYGON))
     sql_lyr = ds.ExecuteSQL("SELECT CAST('POLYGON ((0 0,0 1,1 1,1 0,0 0))' AS GEOMETRY(MULTIPOLYGON)) AS mygeom FROM poly")
     feat = sql_lyr.GetNextFeature()
-    if feat.GetGeomFieldRef('mygeom').ExportToWkt() != 'MULTIPOLYGON (((0 0,0 1,1 1,1 0,0 0)))':
-        return 'fail'
+    assert feat.GetGeomFieldRef('mygeom').ExportToWkt() == 'MULTIPOLYGON (((0 0,0 1,1 1,1 0,0 0)))'
     feat = None
     ds.ReleaseResultSet(sql_lyr)
 
     # Test CAST(a_multilinestring AS GEOMETRY(LINESTRING))
     sql_lyr = ds.ExecuteSQL("SELECT CAST('MULTILINESTRING ((0 0,0 1,1 1,1 0,0 0))' AS GEOMETRY(LINESTRING)) AS mygeom FROM poly")
     feat = sql_lyr.GetNextFeature()
-    if feat.GetGeomFieldRef('mygeom').ExportToWkt() != 'LINESTRING (0 0,0 1,1 1,1 0,0 0)':
-        return 'fail'
+    assert feat.GetGeomFieldRef('mygeom').ExportToWkt() == 'LINESTRING (0 0,0 1,1 1,1 0,0 0)'
     feat = None
     ds.ReleaseResultSet(sql_lyr)
 
     # Test CAST(a_linestring AS GEOMETRY(MULTILINESTRING))
     sql_lyr = ds.ExecuteSQL("SELECT CAST('LINESTRING (0 0,0 1,1 1,1 0,0 0)' AS GEOMETRY(MULTILINESTRING)) AS mygeom FROM poly")
     feat = sql_lyr.GetNextFeature()
-    if feat.GetGeomFieldRef('mygeom').ExportToWkt() != 'MULTILINESTRING ((0 0,0 1,1 1,1 0,0 0))':
-        return 'fail'
+    assert feat.GetGeomFieldRef('mygeom').ExportToWkt() == 'MULTILINESTRING ((0 0,0 1,1 1,1 0,0 0))'
     feat = None
     ds.ReleaseResultSet(sql_lyr)
 
     # Test expression with cast CHARACTER <--> GEOMETRY
     sql_lyr = ds.ExecuteSQL('SELECT CAST(CAST(geomfield AS CHARACTER) AS GEOMETRY) AS mygeom, intfield FROM poly')
-    if sql_lyr.GetLayerDefn().GetGeomFieldDefn(0).GetType() != ogr.wkbUnknown:
-        return 'fail'
-    if sql_lyr.GetLayerDefn().GetGeomFieldDefn(0).GetSpatialRef() is not None:
-        return 'fail'
+    assert sql_lyr.GetLayerDefn().GetGeomFieldDefn(0).GetType() == ogr.wkbUnknown
+    assert sql_lyr.GetLayerDefn().GetGeomFieldDefn(0).GetSpatialRef() is None
     feat = sql_lyr.GetNextFeature()
-    if feat.GetField('intfield') != 1:
-        return 'fail'
-    if feat.GetGeomFieldRef('mygeom') is None:
-        return 'fail'
+    assert feat.GetField('intfield') == 1
+    assert feat.GetGeomFieldRef('mygeom') is not None
     feat = None
     ds.ReleaseResultSet(sql_lyr)
 
     # Test CAST(NULL AS GEOMETRY)
     sql_lyr = ds.ExecuteSQL('SELECT CAST(NULL AS GEOMETRY) FROM poly')
-    if sql_lyr.GetLayerDefn().GetGeomFieldDefn(0).GetType() != ogr.wkbUnknown:
-        return 'fail'
+    assert sql_lyr.GetLayerDefn().GetGeomFieldDefn(0).GetType() == ogr.wkbUnknown
     feat = sql_lyr.GetNextFeature()
-    if feat.GetGeomFieldRef('') is not None:
-        return 'fail'
+    assert feat.GetGeomFieldRef('') is None
     feat = None
     ds.ReleaseResultSet(sql_lyr)
 
     # Test CAST(stringfield AS GEOMETRY)
     sql_lyr = ds.ExecuteSQL('SELECT CAST(wkt AS GEOMETRY) FROM poly')
-    if sql_lyr.GetLayerDefn().GetGeomFieldDefn(0).GetType() != ogr.wkbUnknown:
-        return 'fail'
+    assert sql_lyr.GetLayerDefn().GetGeomFieldDefn(0).GetType() == ogr.wkbUnknown
     feat = sql_lyr.GetNextFeature()
-    if feat.GetGeomFieldRef('wkt').ExportToWkt() != 'POINT (0 0)':
-        return 'fail'
+    assert feat.GetGeomFieldRef('wkt').ExportToWkt() == 'POINT (0 0)'
     feat = None
     ds.ReleaseResultSet(sql_lyr)
 
     # Test COUNT(geometry)
     sql_lyr = ds.ExecuteSQL('SELECT COUNT(geomfield) FROM poly')
     feat = sql_lyr.GetNextFeature()
-    if feat is None:
-        return 'fail'
-    if feat.GetField(0) != 1:
-        return 'fail'
+    assert feat is not None
+    assert feat.GetField(0) == 1
     feat = None
     ds.ReleaseResultSet(sql_lyr)
 
@@ -671,11 +536,9 @@ def test_ogr_rfc41_6():
         gdal.PushErrorHandler('CPLQuietErrorHandler')
         sql_lyr = ds.ExecuteSQL(sql)
         gdal.PopErrorHandler()
-        if gdal.GetLastErrorMsg().find(error_msg) != 0:
-            print('For %s, expected error %s, got %s' % (sql, error_msg, gdal.GetLastErrorMsg()))
-            return 'fail'
-        if sql_lyr is not None:
-            return 'fail'
+        assert gdal.GetLastErrorMsg().find(error_msg) == 0, \
+            ('For %s, expected error %s, got %s' % (sql, error_msg, gdal.GetLastErrorMsg()))
+        assert sql_lyr is None
 
     # Test invalid expressions with geometry
     for sql in ["SELECT geomfield + 'a' FROM poly",
@@ -692,54 +555,43 @@ def test_ogr_rfc41_6():
         gdal.PushErrorHandler('CPLQuietErrorHandler')
         sql_lyr = ds.ExecuteSQL(sql)
         gdal.PopErrorHandler()
-        if gdal.GetLastErrorMsg().find('Cannot use geometry field in this operation') != 0:
-            print(gdal.GetLastErrorMsg())
-            return 'fail'
-        if sql_lyr is not None:
-            return 'fail'
+        assert gdal.GetLastErrorMsg().find('Cannot use geometry field in this operation') == 0
+        assert sql_lyr is None
 
     # Test expression with geometry in WHERE
     sql_lyr = ds.ExecuteSQL('SELECT * FROM poly WHERE geomfield IS NOT NULL')
     feat = sql_lyr.GetNextFeature()
-    if feat.GetField('intfield') != 1:
-        return 'fail'
+    assert feat.GetField('intfield') == 1
     feat = sql_lyr.GetNextFeature()
-    if feat is not None:
-        return 'fail'
+    assert feat is None
     feat = None
     ds.ReleaseResultSet(sql_lyr)
 
     sql_lyr = ds.ExecuteSQL('SELECT * FROM poly WHERE geomfield IS NULL')
     feat = sql_lyr.GetNextFeature()
-    if feat.IsFieldSet(0):
-        return 'fail'
+    assert not feat.IsFieldSet(0)
     feat = sql_lyr.GetNextFeature()
-    if feat is not None:
-        return 'fail'
+    assert feat is None
     feat = None
     ds.ReleaseResultSet(sql_lyr)
 
     sql_lyr = ds.ExecuteSQL("SELECT * FROM poly WHERE CAST(geomfield AS CHARACTER) = 'POLYGON EMPTY'")
     feat = sql_lyr.GetNextFeature()
-    if feat is None:
-        return 'fail'
+    assert feat is not None
     feat = sql_lyr.GetNextFeature()
-    if feat is not None:
-        return 'fail'
+    assert feat is None
     feat = None
     ds.ReleaseResultSet(sql_lyr)
 
     sql_lyr = ds.ExecuteSQL('SELECT count(*) FROM poly WHERE geomfield IS NULL')
     feat = sql_lyr.GetNextFeature()
-    if feat.GetField(0) != 1:
-        return 'fail'
+    assert feat.GetField(0) == 1
     feat = None
     ds.ReleaseResultSet(sql_lyr)
 
     sql_lyr = ds.ExecuteSQL('SELECT count(*) FROM poly WHERE geomfield IS NOT NULL')
     feat = sql_lyr.GetNextFeature()
-    if feat.GetField(0) != 1:
-        return 'fail'
+    assert feat.GetField(0) == 1
     feat = None
     ds.ReleaseResultSet(sql_lyr)
 
@@ -754,14 +606,12 @@ def test_ogr_rfc41_6():
     sql_lyr = ds.ExecuteSQL("SELECT * FROM poly")
     sql_lyr.SetSpatialFilterRect(0, 0, 0, 0)
     feat = sql_lyr.GetNextFeature()
-    if feat is not None:
-        return 'fail'
+    assert feat is None
     feat = None
 
     sql_lyr.SetSpatialFilterRect(0, 1, 2, 1, 2)
     feat = sql_lyr.GetNextFeature()
-    if feat is None:
-        return 'fail'
+    assert feat is not None
     feat = None
 
     # Test invalid spatial filter index
@@ -769,28 +619,23 @@ def test_ogr_rfc41_6():
     gdal.PushErrorHandler('CPLQuietErrorHandler')
     sql_lyr.SetSpatialFilterRect(2, 0, 0, 0, 0)
     gdal.PopErrorHandler()
-    if gdal.GetLastErrorMsg() == '':
-        return 'fail'
+    assert gdal.GetLastErrorMsg() != ''
 
     # Test invalid geometry field index
     gdal.ErrorReset()
     gdal.PushErrorHandler('CPLQuietErrorHandler')
     sql_lyr.GetExtent(geom_field=2)
     gdal.PopErrorHandler()
-    if gdal.GetLastErrorMsg() == '':
-        return 'fail'
+    assert gdal.GetLastErrorMsg() != ''
 
     ds.ReleaseResultSet(sql_lyr)
 
     # Test querying several geometry fields
     sql_lyr = ds.ExecuteSQL('SELECT geomfield as geom1, geomfield as geom2 FROM poly')
     feat = sql_lyr.GetNextFeature()
-    if feat is None:
-        return 'fail'
-    if feat.GetGeomFieldRef('geom1') is None:
-        return 'fail'
-    if feat.GetGeomFieldRef('geom2') is None:
-        return 'fail'
+    assert feat is not None
+    assert feat.GetGeomFieldRef('geom1') is not None
+    assert feat.GetGeomFieldRef('geom2') is not None
     feat = None
     ds.ReleaseResultSet(sql_lyr)
 
@@ -807,37 +652,28 @@ def test_ogr_rfc41_6():
                 'SELECT secondarygeom, geomfield FROM poly']:
         sql_lyr = ds.ExecuteSQL(sql)
         feat = sql_lyr.GetNextFeature()
-        if feat.GetGeomFieldRef('geomfield').ExportToWkt() != 'POINT (1 2)':
-            return 'fail'
-        if feat.GetGeomFieldRef('secondarygeom').ExportToWkt() != 'POINT (10 100)':
-            return 'fail'
+        assert feat.GetGeomFieldRef('geomfield').ExportToWkt() == 'POINT (1 2)'
+        assert feat.GetGeomFieldRef('secondarygeom').ExportToWkt() == 'POINT (10 100)'
         feat = None
         ds.ReleaseResultSet(sql_lyr)
 
     # Check that we don't get an implicit geometry field
     sql_lyr = ds.ExecuteSQL('SELECT intfield FROM poly')
-    if sql_lyr.GetLayerDefn().GetGeomFieldCount() != 0:
-        return 'fail'
+    assert sql_lyr.GetLayerDefn().GetGeomFieldCount() == 0
     ds.ReleaseResultSet(sql_lyr)
 
     # Check GetExtent() and SetSpatialFilter()
     sql_lyr = ds.ExecuteSQL('SELECT * FROM poly')
-    if sql_lyr.GetExtent(geom_field=0) != (1.0, 1.0, 2.0, 2.0):
-        return 'fail'
-    if sql_lyr.GetExtent(geom_field=1) != (10.0, 10.0, 100.0, 100.0):
-        return 'fail'
+    assert sql_lyr.GetExtent(geom_field=0) == (1.0, 1.0, 2.0, 2.0)
+    assert sql_lyr.GetExtent(geom_field=1) == (10.0, 10.0, 100.0, 100.0)
     sql_lyr.SetSpatialFilterRect(0, 0.5, 1.5, 1.5, 2.5)
-    if sql_lyr.GetFeatureCount() != 1:
-        return 'fail'
+    assert sql_lyr.GetFeatureCount() == 1
     sql_lyr.SetSpatialFilterRect(0, 0, 0, 0.5, 0.5)
-    if sql_lyr.GetFeatureCount() != 0:
-        return 'fail'
+    assert sql_lyr.GetFeatureCount() == 0
     sql_lyr.SetSpatialFilterRect(1, 9, 99, 11, 101)
-    if sql_lyr.GetFeatureCount() != 1:
-        return 'fail'
+    assert sql_lyr.GetFeatureCount() == 1
     sql_lyr.SetSpatialFilterRect(1, 0, 0, 0.5, 0.5)
-    if sql_lyr.GetFeatureCount() != 0:
-        return 'fail'
+    assert sql_lyr.GetFeatureCount() == 0
     ds.ReleaseResultSet(sql_lyr)
 
     ds = None
@@ -898,18 +734,12 @@ def test_ogr_rfc41_8():
 
     # Check that we get the geometry columns, even with no features
     sql_lyr = ds.ExecuteSQL('SELECT * FROM mytable', dialect='SQLite')
-    if sql_lyr.GetLayerDefn().GetGeomFieldCount() != 2:
-        print(sql_lyr.GetLayerDefn().GetGeomFieldCount())
-        return 'fail'
-    if sql_lyr.GetLayerDefn().GetGeomFieldDefn(0).GetType() != ogr.wkbPolygon:
-        return 'fail'
-    if sql_lyr.GetLayerDefn().GetGeomFieldDefn(0).GetSpatialRef() is not None:
-        return 'fail'
-    if sql_lyr.GetLayerDefn().GetGeomFieldDefn(1).GetType() != ogr.wkbPoint25D:
-        return 'fail'
+    assert sql_lyr.GetLayerDefn().GetGeomFieldCount() == 2
+    assert sql_lyr.GetLayerDefn().GetGeomFieldDefn(0).GetType() == ogr.wkbPolygon
+    assert sql_lyr.GetLayerDefn().GetGeomFieldDefn(0).GetSpatialRef() is None
+    assert sql_lyr.GetLayerDefn().GetGeomFieldDefn(1).GetType() == ogr.wkbPoint25D
     srs = sql_lyr.GetLayerDefn().GetGeomFieldDefn(1).GetSpatialRef()
-    if srs.GetAuthorityCode(None) != '4326':
-        return 'fail'
+    assert srs.GetAuthorityCode(None) == '4326'
     ds.ReleaseResultSet(sql_lyr)
 
     # Test INSERT INTO request
diff --git a/autotest/ogr/ogr_s57.py b/autotest/ogr/ogr_s57.py
index 0d0e95ea43c7..b6beecbaa42d 100755
--- a/autotest/ogr/ogr_s57.py
+++ b/autotest/ogr/ogr_s57.py
@@ -53,9 +53,7 @@ def test_ogr_s57_1():
         gdal.SetConfigOption('OGR_S57_OPTIONS', '')
 
     gdaltest.s57_ds = ogr.Open('data/1B5X02NE.000')
-    if gdaltest.s57_ds is None:
-        gdaltest.post_reason('failed to open test file.')
-        return 'fail'
+    assert gdaltest.s57_ds is not None, 'failed to open test file.'
 
     return 'success'
 
@@ -82,26 +80,22 @@ def test_ogr_s57_2():
                   ('M_NSYS', ogr.wkbPolygon, 1),
                   ('M_QUAL', ogr.wkbPolygon, 1)]
 
-    if gdaltest.s57_ds.GetLayerCount() != len(layer_list):
-        gdaltest.post_reason('Did not get expected number of layers, likely cannot find support files.')
-        return 'fail'
+    assert gdaltest.s57_ds.GetLayerCount() == len(layer_list), \
+        'Did not get expected number of layers, likely cannot find support files.'
 
     for i, lyr_info in enumerate(layer_list):
         lyr = gdaltest.s57_ds.GetLayer(i)
 
-        if lyr.GetName() != lyr_info[0]:
-            gdaltest.post_reason('Expected layer %d to be %s but it was %s.'
+        assert lyr.GetName() == lyr_info[0], \
+            ('Expected layer %d to be %s but it was %s.'
                                  % (i + 1, lyr_info[0], lyr.GetName()))
-            return 'fail'
 
         count = lyr.GetFeatureCount(force=1)
-        if count != lyr_info[2]:
-            gdaltest.post_reason('Expected %d features in layer %s, but got %d.' % (lyr_info[2], lyr_info[0], count))
-            return 'fail'
+        assert count == lyr_info[2], \
+            ('Expected %d features in layer %s, but got %d.' % (lyr_info[2], lyr_info[0], count))
 
-        if lyr.GetLayerDefn().GetGeomType() != lyr_info[1]:
-            gdaltest.post_reason('Expected %d layer type in layer %s, but got %d.' % (lyr_info[1], lyr_info[0], lyr.GetLayerDefn().GetGeomType()))
-            return 'fail'
+        assert lyr.GetLayerDefn().GetGeomType() == lyr_info[1], \
+            ('Expected %d layer type in layer %s, but got %d.' % (lyr_info[1], lyr_info[0], lyr.GetLayerDefn().GetGeomType()))
 
     return 'success'
 
@@ -115,21 +109,14 @@ def test_ogr_s57_3():
 
     feat = gdaltest.s57_ds.GetLayerByName('COALNE').GetNextFeature()
 
-    if feat is None:
-        gdaltest.post_reason('Did not get expected COALNE feature at all.')
-        return 'fail'
+    assert feat is not None, 'Did not get expected COALNE feature at all.'
 
-    if feat.GetField('RCID') != 1 \
-            or feat.GetField('LNAM') != 'FFFF7F4F0FB002D3' \
-            or feat.GetField('OBJL') != 30 \
-            or feat.GetField('AGEN') != 65535:
-        gdaltest.post_reason('COALNE: did not get expected attributes')
-        return 'fail'
+    assert feat.GetField('RCID') == 1 and feat.GetField('LNAM') == 'FFFF7F4F0FB002D3' and feat.GetField('OBJL') == 30 and feat.GetField('AGEN') == 65535, \
+        'COALNE: did not get expected attributes'
 
     wkt = 'LINESTRING (60.97683400 -32.49442600,60.97718200 -32.49453800,60.97742400 -32.49477400,60.97774800 -32.49504000,60.97791600 -32.49547200,60.97793000 -32.49581800,60.97794400 -32.49617800,60.97804400 -32.49647600,60.97800200 -32.49703800,60.97800200 -32.49726600,60.97805800 -32.49749400,60.97812800 -32.49773200,60.97827000 -32.49794800,60.97910200 -32.49848600,60.97942600 -32.49866600)'
 
-    if ogrtest.check_feature_geometry(feat, wkt):
-        return 'fail'
+    assert not ogrtest.check_feature_geometry(feat, wkt)
 
     return 'success'
 
@@ -143,20 +130,14 @@ def test_ogr_s57_4():
 
     feat = gdaltest.s57_ds.GetLayerByName('M_QUAL').GetNextFeature()
 
-    if feat is None:
-        gdaltest.post_reason('Did not get expected M_QUAL feature at all.')
-        return 'fail'
+    assert feat is not None, 'Did not get expected M_QUAL feature at all.'
 
-    if feat.GetField('RCID') != 15 \
-            or feat.GetField('OBJL') != 308 \
-            or feat.GetField('AGEN') != 65535:
-        gdaltest.post_reason('M_QUAL: did not get expected attributes')
-        return 'fail'
+    assert feat.GetField('RCID') == 15 and feat.GetField('OBJL') == 308 and feat.GetField('AGEN') == 65535, \
+        'M_QUAL: did not get expected attributes'
 
     wkt = 'POLYGON ((60.97683400 -32.49534000,60.97683400 -32.49762000,60.97683400 -32.49866600,60.97869000 -32.49866600,60.97942600 -32.49866600,60.98215200 -32.49866600,60.98316600 -32.49866600,60.98316600 -32.49755800,60.98316600 -32.49477000,60.98316600 -32.49350000,60.98146800 -32.49350000,60.98029800 -32.49350000,60.97947400 -32.49350000,60.97901600 -32.49350000,60.97683400 -32.49350000,60.97683400 -32.49442600,60.97683400 -32.49469800,60.97683400 -32.49534000))'
 
-    if ogrtest.check_feature_geometry(feat, wkt):
-        return 'fail'
+    assert not ogrtest.check_feature_geometry(feat, wkt)
 
     return 'success'
 
@@ -170,20 +151,14 @@ def test_ogr_s57_5():
 
     feat = gdaltest.s57_ds.GetLayerByName('SOUNDG').GetNextFeature()
 
-    if feat is None:
-        gdaltest.post_reason('Did not get expected SOUNDG feature at all.')
-        return 'fail'
+    assert feat is not None, 'Did not get expected SOUNDG feature at all.'
 
-    if feat.GetField('RCID') != 20 \
-            or feat.GetField('OBJL') != 129 \
-            or feat.GetField('AGEN') != 65535:
-        gdaltest.post_reason('SOUNDG: did not get expected attributes')
-        return 'fail'
+    assert feat.GetField('RCID') == 20 and feat.GetField('OBJL') == 129 and feat.GetField('AGEN') == 65535, \
+        'SOUNDG: did not get expected attributes'
 
     wkt = 'MULTIPOINT (60.98164400 -32.49449000 3.400,60.98134400 -32.49642400 1.400,60.97814200 -32.49487400 -3.200,60.98071200 -32.49519600 1.200)'
 
-    if ogrtest.check_feature_geometry(feat, wkt):
-        return 'fail'
+    assert not ogrtest.check_feature_geometry(feat, wkt)
 
     gdaltest.s57_ds = None
 
@@ -199,14 +174,10 @@ def test_ogr_s57_6():
 
     feat = ds.GetLayerByName('FOGSIG').GetNextFeature()
 
-    if feat is None:
-        gdaltest.post_reason('Did not get expected FOGSIG feature at all.')
-        return 'fail'
+    assert feat is not None, 'Did not get expected FOGSIG feature at all.'
 
-    if feat.GetField('INFORM') != 'During South winds nautophone is not always heard in S direction from lighthouse' \
-       or len(feat.GetField('NINFOM')) < 1:
-        gdaltest.post_reason('FOGSIG: did not get expected attributes')
-        return 'fail'
+    assert feat.GetField('INFORM') == 'During South winds nautophone is not always heard in S direction from lighthouse' and len(feat.GetField('NINFOM')) >= 1, \
+        'FOGSIG: did not get expected attributes'
 
     return 'success'
 
@@ -220,14 +191,11 @@ def test_ogr_s57_7():
 
     feat = ds.GetLayerByName('ROADWY').GetNextFeature()
 
-    if feat is None:
-        gdaltest.post_reason('Did not get expected feature at all.')
-        return 'fail'
+    assert feat is not None, 'Did not get expected feature at all.'
 
     exp_wkt = 'MULTILINESTRING ((22.5659615 44.5541942,22.5652045 44.5531651,22.5654315 44.5517774,22.5663008 44.5510096,22.5656187 44.5500822,22.5654462 44.5495941,22.5637522 44.5486793,22.563408 44.5477286,22.5654087 44.5471198,22.5670327 44.5463937,22.5667729 44.5456512,22.5657613 44.544027,22.5636273 44.5411638,22.5623421 44.5400398,22.559403 44.5367489,22.5579112 44.534544,22.5566466 44.5309514,22.5563888 44.5295231,22.5549946 44.5285915,22.5541939 44.5259331,22.5526434 44.5237888),(22.5656187 44.5500822,22.5670219 44.5493519,22.5684077 44.5491452),(22.5350702 44.4918838,22.5329111 44.4935825,22.5318719 44.4964337,22.5249608 44.5027089,22.5254709 44.5031914,22.5295138 44.5052214,22.5331359 44.5077711,22.5362468 44.5092751,22.5408091 44.5115306,22.5441312 44.5127374,22.5461053 44.5132675,22.5465694 44.5149956),(22.5094658 44.4989464,22.5105135 44.4992481,22.5158217 44.4994216,22.5206067 44.4998907,22.523096 44.5009452,22.5249608 44.5027089),(22.5762962 44.4645734,22.5767653 44.4773213,22.5769802 44.4796618,22.5775485 44.4815858,22.5762434 44.4842544,22.5765836 44.4855091,22.5775087 44.4865991,22.5769145 44.4879336,22.5708196 44.4910838,22.5694028 44.4930833,22.5692354 44.4958977),(22.5763768 44.5029527,22.5799605 44.501315,22.5831172 44.5007428,22.584524 44.4999964,22.5848604 44.4999039),(22.5731362 44.5129105,22.5801378 44.5261859,22.5825748 44.5301187),(22.5093748 44.5311182,22.5107969 44.5285258,22.5108905 44.5267978,22.5076679 44.5223309))'
 
-    if ogrtest.check_feature_geometry(feat, exp_wkt):
-        return 'fail'
+    assert not ogrtest.check_feature_geometry(feat, exp_wkt)
 
     return 'success'
 
@@ -243,9 +211,7 @@ def test_ogr_s57_8():
 
     ret = gdaltest.runexternal(test_cli_utilities.get_test_ogrsf_path() + ' -ro data/1B5X02NE.000')
 
-    if ret.find('INFO') == -1 or ret.find('ERROR') != -1:
-        print(ret)
-        return 'fail'
+    assert ret.find('INFO') != -1 and ret.find('ERROR') == -1
 
     return 'success'
 
@@ -273,8 +239,7 @@ def test_ogr_s57_9():
     ds = None
 
     ds = ogr.Open('tmp/ogr_s57_9.000')
-    if ds is None:
-        return 'fail'
+    assert ds is not None
 
     gdaltest.s57_ds = ds
     test_ogr_s57_2()
@@ -291,11 +256,9 @@ def test_ogr_s57_9():
     gdal.SetConfigOption('OGR_S57_OPTIONS', None)
 
     ds = gdal.OpenEx('tmp/ogr_s57_9.000', open_options=['RETURN_PRIMITIVES=ON'])
-    if ds is None:
-        return 'fail'
+    assert ds is not None
 
-    if ds.GetLayerByName('IsolatedNode') is None:
-        return 'fail'
+    assert ds.GetLayerByName('IsolatedNode') is not None
 
     gdaltest.s57_ds = ds
     test_ogr_s57_4()
@@ -315,8 +278,7 @@ def test_ogr_s57_10():
     ds = ogr.Open('data/fake_s57.000')
     lyr = ds.GetLayer(0)
     f = lyr.GetNextFeature()
-    if f['DSID_EXPP'] != 2:
-        return 'fail'
+    assert f['DSID_EXPP'] == 2
     return 'success'
 
 ###############################################################################
@@ -329,8 +291,7 @@ def test_ogr_s57_11():
     ds = ogr.Open('data/fake_s57_variant_C151.000')
     lyr = ds.GetLayer(0)
     f = lyr.GetNextFeature()
-    if f['DSID_EXPP'] != 2:
-        return 'fail'
+    assert f['DSID_EXPP'] == 2
     return 'success'
 
 ###############################################################################
@@ -343,20 +304,16 @@ def test_ogr_s57_online_1():
         return 'skip'
 
     ds = ogr.Open('tmp/cache/1R5MK050.000')
-    if ds is None:
-        return 'fail'
+    assert ds is not None
 
     lyr = ds.GetLayerByName('BUISGL')
     feat = lyr.GetNextFeature()
 
-    if feat is None:
-        gdaltest.post_reason('Did not get expected feature at all.')
-        return 'fail'
+    assert feat is not None, 'Did not get expected feature at all.'
 
     exp_wkt = 'POLYGON ((5.6666667 53.0279027,5.6666667 53.0281667,5.6667012 53.0281685,5.666673 53.0282377,5.666788 53.0282616,5.6669018 53.0281507,5.6668145 53.0281138,5.6668121 53.0280649,5.6666686 53.0280248,5.6666713 53.0279647,5.6667572 53.0279713,5.6667568 53.0279089,5.6666667 53.0279027))'
 
-    if ogrtest.check_feature_geometry(feat, exp_wkt):
-        return 'fail'
+    assert not ogrtest.check_feature_geometry(feat, exp_wkt)
 
     feat = None
 
@@ -376,25 +333,18 @@ def test_ogr_s57_online_2():
     gdaltest.clean_tmp()
     shutil.copy('tmp/cache/GB5X01SW.000', 'tmp/GB5X01SW.000')
     ds = ogr.Open('tmp/GB5X01SW.000')
-    if ds is None:
-        return 'fail'
+    assert ds is not None
 
     lyr = ds.GetLayerByName('LIGHTS')
     feat = lyr.GetFeature(542)
 
-    if feat is None:
-        gdaltest.post_reason('Did not get expected feature at all.')
-        return 'fail'
+    assert feat is not None, 'Did not get expected feature at all.'
 
-    if feat.rver != 1:
-        gdaltest.post_reason('Did not get expected RVER value (%d).' % feat.rver)
-        return 'fail'
+    assert feat.rver == 1, ('Did not get expected RVER value (%d).' % feat.rver)
 
     lyr = ds.GetLayerByName('BOYCAR')
     feat = lyr.GetFeature(975)
-    if feat is not None:
-        gdaltest.post_reason('unexpected got feature id 975 before update!')
-        return 'fail'
+    assert feat is None, 'unexpected got feature id 975 before update!'
 
     feat = None
 
@@ -413,26 +363,19 @@ def test_ogr_s57_online_3():
 
     shutil.copy('tmp/cache/GB5X01SW.001', 'tmp/GB5X01SW.001')
     ds = ogr.Open('tmp/GB5X01SW.000')
-    if ds is None:
-        return 'fail'
+    assert ds is not None
 
     lyr = ds.GetLayerByName('LIGHTS')
     feat = lyr.GetFeature(542)
 
-    if feat is None:
-        gdaltest.post_reason('Did not get expected feature at all.')
-        return 'fail'
+    assert feat is not None, 'Did not get expected feature at all.'
 
-    if feat.rver != 2:
-        gdaltest.post_reason('Did not get expected RVER value (%d).' % feat.rver)
-        return 'fail'
+    assert feat.rver == 2, ('Did not get expected RVER value (%d).' % feat.rver)
 
     lyr = ds.GetLayerByName('BOYCAR')
     feat = lyr.GetFeature(975)
-    if feat is None:
-        gdaltest.post_reason('unexpected did not get feature id 975 '
+    assert feat is not None, ('unexpected did not get feature id 975 '
                              'after update!')
-        return 'fail'
 
     feat = None
 
diff --git a/autotest/ogr/ogr_sde.py b/autotest/ogr/ogr_sde.py
index 132f92aadf8f..e7f7fc120557 100755
--- a/autotest/ogr/ogr_sde.py
+++ b/autotest/ogr/ogr_sde.py
@@ -124,9 +124,7 @@ def test_ogr_sde_3():
     ds = ogr.Open(base, update=1)
 
     ds2 = ogr.Open(base, update=1)
-    if ds2 is not None:
-        gdaltest.post_reason('A locked version was able to be opened')
-        return 'fail'
+    assert ds2 is None, 'A locked version was able to be opened'
 
     ds.Destroy()
 
@@ -195,9 +193,8 @@ def test_ogr_sde_5():
     ds3 = ogr.Open(base)
     l3 = ds3.GetLayerByName('SDE.TPOLY')
     f3 = l3.GetFeature(1)
-    if f3.GetField("PRFEDEA") != "SDE.TESTING":
-        gdaltest.post_reason('versioned editing failed for child version SDE.TESTING')
-        return 'fail'
+    assert f3.GetField("PRFEDEA") == "SDE.TESTING", \
+        'versioned editing failed for child version SDE.TESTING'
 
     ds3.Destroy()
     del ds3
@@ -205,9 +202,8 @@ def test_ogr_sde_5():
     ds4 = ogr.Open(default)
     l4 = ds4.GetLayerByName('SDE.TPOLY')
     f4 = l4.GetFeature(1)
-    if f4.GetField("PRFEDEA") != "SDE.DEFAULT":
-        gdaltest.post_reason('versioned editing failed for parent version SDE.DEFAULT')
-        return 'fail'
+    assert f4.GetField("PRFEDEA") == "SDE.DEFAULT", \
+        'versioned editing failed for parent version SDE.DEFAULT'
 
     idx = f4.GetFieldIndex('WHEN')
     df = f4.GetField(idx)
diff --git a/autotest/ogr/ogr_sdts.py b/autotest/ogr/ogr_sdts.py
index 4314e2c1c41b..33a050a02fbb 100755
--- a/autotest/ogr/ogr_sdts.py
+++ b/autotest/ogr/ogr_sdts.py
@@ -33,6 +33,7 @@
 
 import gdaltest
 from osgeo import ogr
+import pytest
 
 ###############################################################################
 # Test reading
@@ -42,8 +43,7 @@ def test_ogr_sdts_1():
 
     gdaltest.sdts_ds = ogr.Open('data/D3607551_rd0s_1_sdts_truncated/TR01CATD.DDF')
 
-    if gdaltest.sdts_ds is None:
-        return 'fail'
+    assert gdaltest.sdts_ds is not None
 
     layers = [('ARDF', 164, ogr.wkbNone, [('ENTITY_LABEL', '1700005')]),
               ('ARDM', 21, ogr.wkbNone, [('ROUTE_NUMBER', 'SR 1200')]),
@@ -57,21 +57,16 @@ def test_ogr_sdts_1():
 
     for layer in layers:
         lyr = gdaltest.sdts_ds.GetLayerByName(layer[0])
-        if lyr is None:
-            gdaltest.post_reason('could not get layer %s' % (layer[0]))
-            return 'fail'
-        if lyr.GetFeatureCount() != layer[1]:
-            gdaltest.post_reason('wrong number of features for layer %s : %d. %d were expected ' % (layer[0], lyr.GetFeatureCount(), layer[1]))
-            return 'fail'
-        if lyr.GetLayerDefn().GetGeomType() != layer[2]:
-            return 'fail'
+        assert lyr is not None, ('could not get layer %s' % (layer[0]))
+        assert lyr.GetFeatureCount() == layer[1], \
+            ('wrong number of features for layer %s : %d. %d were expected ' % (layer[0], lyr.GetFeatureCount(), layer[1]))
+        assert lyr.GetLayerDefn().GetGeomType() == layer[2]
         feat_read = lyr.GetNextFeature()
         for item in layer[3]:
             if feat_read.GetFieldAsString(item[0]) != item[1]:
                 print(layer[0])
                 print('"%s"' % (item[1]))
-                print('"%s"' % (feat_read.GetField(item[0])))
-                return 'fail'
+                pytest.fail('"%s"' % (feat_read.GetField(item[0])))
 
     gdaltest.sdts_ds = None
 
diff --git a/autotest/ogr/ogr_segukooa.py b/autotest/ogr/ogr_segukooa.py
index af9a0368e418..3d5937609696 100755
--- a/autotest/ogr/ogr_segukooa.py
+++ b/autotest/ogr/ogr_segukooa.py
@@ -42,18 +42,12 @@
 def test_ogr_segp1_points():
 
     ds = ogr.Open('data/test.segp1')
-    if ds is None:
-        gdaltest.post_reason('cannot open dataset')
-        return 'fail'
+    assert ds is not None, 'cannot open dataset'
 
-    if ds.GetLayerCount() != 2:
-        gdaltest.post_reason('bad layer count')
-        return 'fail'
+    assert ds.GetLayerCount() == 2, 'bad layer count'
 
     lyr = ds.GetLayer(0)
-    if lyr.GetGeomType() != ogr.wkbPoint:
-        gdaltest.post_reason('bad layer geometry type')
-        return 'fail'
+    assert lyr.GetGeomType() == ogr.wkbPoint, 'bad layer geometry type'
 
     feat = lyr.GetNextFeature()
 
@@ -89,18 +83,12 @@ def test_ogr_segp1_points():
 def test_ogr_segp1_lines():
 
     ds = ogr.Open('data/test.segp1')
-    if ds is None:
-        gdaltest.post_reason('cannot open dataset')
-        return 'fail'
+    assert ds is not None, 'cannot open dataset'
 
-    if ds.GetLayerCount() != 2:
-        gdaltest.post_reason('bad layer count')
-        return 'fail'
+    assert ds.GetLayerCount() == 2, 'bad layer count'
 
     lyr = ds.GetLayer(1)
-    if lyr.GetGeomType() != ogr.wkbLineString:
-        gdaltest.post_reason('bad layer geometry type')
-        return 'fail'
+    assert lyr.GetGeomType() == ogr.wkbLineString, 'bad layer geometry type'
 
     feat = lyr.GetNextFeature()
 
@@ -137,18 +125,12 @@ def test_ogr_segp1_lines():
 def test_ogr_ukooa_points():
 
     ds = ogr.Open('data/test.ukooa')
-    if ds is None:
-        gdaltest.post_reason('cannot open dataset')
-        return 'fail'
+    assert ds is not None, 'cannot open dataset'
 
-    if ds.GetLayerCount() != 2:
-        gdaltest.post_reason('bad layer count')
-        return 'fail'
+    assert ds.GetLayerCount() == 2, 'bad layer count'
 
     lyr = ds.GetLayer(0)
-    if lyr.GetGeomType() != ogr.wkbPoint:
-        gdaltest.post_reason('bad layer geometry type')
-        return 'fail'
+    assert lyr.GetGeomType() == ogr.wkbPoint, 'bad layer geometry type'
 
     feat = lyr.GetNextFeature()
 
@@ -183,18 +165,12 @@ def test_ogr_ukooa_points():
 def test_ogr_ukooa_lines():
 
     ds = ogr.Open('data/test.ukooa')
-    if ds is None:
-        gdaltest.post_reason('cannot open dataset')
-        return 'fail'
+    assert ds is not None, 'cannot open dataset'
 
-    if ds.GetLayerCount() != 2:
-        gdaltest.post_reason('bad layer count')
-        return 'fail'
+    assert ds.GetLayerCount() == 2, 'bad layer count'
 
     lyr = ds.GetLayer(1)
-    if lyr.GetGeomType() != ogr.wkbLineString:
-        gdaltest.post_reason('bad layer geometry type')
-        return 'fail'
+    assert lyr.GetGeomType() == ogr.wkbLineString, 'bad layer geometry type'
 
     feat = lyr.GetNextFeature()
 
diff --git a/autotest/ogr/ogr_segy.py b/autotest/ogr/ogr_segy.py
index 43bbf95699ad..dd87a4967477 100755
--- a/autotest/ogr/ogr_segy.py
+++ b/autotest/ogr/ogr_segy.py
@@ -42,32 +42,20 @@
 def test_ogr_segy_1():
 
     ds = ogr.Open('data/segy/testsegy.segy')
-    if ds is None:
-        gdaltest.post_reason('cannot open dataset')
-        return 'fail'
+    assert ds is not None, 'cannot open dataset'
 
-    if ds.TestCapability("foo") != 0:
-        return 'fail'
+    assert ds.TestCapability("foo") == 0
 
-    if ds.GetLayerCount() != 2:
-        gdaltest.post_reason('bad layer count')
-        return 'fail'
+    assert ds.GetLayerCount() == 2, 'bad layer count'
 
     lyr = ds.GetLayer(0)
-    if lyr.GetGeomType() != ogr.wkbPoint:
-        gdaltest.post_reason('bad layer geometry type')
-        return 'fail'
+    assert lyr.GetGeomType() == ogr.wkbPoint, 'bad layer geometry type'
 
-    if lyr.GetSpatialRef() is not None:
-        gdaltest.post_reason('bad spatial ref')
-        return 'fail'
+    assert lyr.GetSpatialRef() is None, 'bad spatial ref'
 
-    if lyr.TestCapability("foo") != 0:
-        return 'fail'
+    assert lyr.TestCapability("foo") == 0
 
-    if lyr.GetLayerDefn().GetFieldCount() != 71:
-        print(lyr.GetLayerDefn().GetFieldCount())
-        return 'fail'
+    assert lyr.GetLayerDefn().GetFieldCount() == 71
 
     feat = lyr.GetNextFeature()
     if ogrtest.check_feature_geometry(feat, 'POINT (500000 4500000)',
@@ -77,32 +65,22 @@ def test_ogr_segy_1():
         return 'fail'
 
     feat = lyr.GetNextFeature()
-    if feat is not None:
-        return 'fail'
+    assert feat is None
 
     lyr = ds.GetLayer(1)
-    if lyr.GetGeomType() != ogr.wkbNone:
-        gdaltest.post_reason('bad layer geometry type')
-        return 'fail'
+    assert lyr.GetGeomType() == ogr.wkbNone, 'bad layer geometry type'
 
-    if lyr.GetSpatialRef() is not None:
-        gdaltest.post_reason('bad spatial ref')
-        return 'fail'
+    assert lyr.GetSpatialRef() is None, 'bad spatial ref'
 
-    if lyr.TestCapability("foo") != 0:
-        return 'fail'
+    assert lyr.TestCapability("foo") == 0
 
-    if lyr.GetLayerDefn().GetFieldCount() != 32:
-        print(lyr.GetLayerDefn().GetFieldCount())
-        return 'fail'
+    assert lyr.GetLayerDefn().GetFieldCount() == 32
 
     feat = lyr.GetNextFeature()
-    if feat is None:
-        return 'fail'
+    assert feat is not None
 
     feat = lyr.GetNextFeature()
-    if feat is not None:
-        return 'fail'
+    assert feat is None
 
     return 'success'
 
@@ -112,18 +90,12 @@ def test_ogr_segy_1():
 
 def test_ogr_segy_2():
     ds = ogr.Open('data/segy/ascii-header-with-nuls.sgy')
-    if ds is None:
-        gdaltest.post_reason('cannot open dataset')
-        return 'fail'
+    assert ds is not None, 'cannot open dataset'
 
-    if ds.GetLayerCount() != 2:
-        gdaltest.post_reason('bad layer count')
-        return 'fail'
+    assert ds.GetLayerCount() == 2, 'bad layer count'
 
     lyr = ds.GetLayer(0)
-    if lyr.GetGeomType() != ogr.wkbPoint:
-        gdaltest.post_reason('bad layer geometry type')
-        return 'fail'
+    assert lyr.GetGeomType() == ogr.wkbPoint, 'bad layer geometry type'
 
     # TODO(schwehr): Test the values of fields and data.
 
diff --git a/autotest/ogr/ogr_selafin.py b/autotest/ogr/ogr_selafin.py
index aa3c5bffc9d1..00e6f661b83a 100755
--- a/autotest/ogr/ogr_selafin.py
+++ b/autotest/ogr/ogr_selafin.py
@@ -67,9 +67,7 @@ def test_ogr_selafin_create_nodes():
     ref = osr.SpatialReference()
     ref.ImportFromEPSG(4326)
     layer = gdaltest.selafin_ds.CreateLayer('name', ref, geom_type=ogr.wkbPoint)
-    if layer is None:
-        gdaltest.post_reason('unable to create layer')
-        return 'fail'
+    assert layer is not None, 'unable to create layer'
     layer.CreateField(ogr.FieldDefn('value', ogr.OFTReal))
     dfn = layer.GetLayerDefn()
     for i in range(5):
@@ -79,13 +77,10 @@ def test_ogr_selafin_create_nodes():
             feat = ogr.Feature(dfn)
             feat.SetGeometry(pt)
             feat.SetField(0, (float)(i * 5 + j))
-            if layer.CreateFeature(feat) != 0:
-                gdaltest.post_reason('unable to create node feature')
-                return 'fail'
+            assert layer.CreateFeature(feat) == 0, 'unable to create node feature'
     # do some checks
-    if layer.GetFeatureCount() != 25:
-        gdaltest.post_reason('wrong number of features after point layer creation')
-        return 'fail'
+    assert layer.GetFeatureCount() == 25, \
+        'wrong number of features after point layer creation'
     # return
     del gdaltest.selafin_ds
     del layer
@@ -101,9 +96,7 @@ def test_ogr_selafin_create_elements():
     if gdaltest.selafin_ds is None:
         return 'skip'
     layerCount = gdaltest.selafin_ds.GetLayerCount()
-    if layerCount < 2:
-        gdaltest.post_reason('elements layer not created with nodes layer')
-        return 'fail'
+    assert layerCount >= 2, 'elements layer not created with nodes layer'
     for i in range(layerCount):
         name = gdaltest.selafin_ds.GetLayer(i).GetName()
         if '_e' in name:
@@ -124,9 +117,7 @@ def test_ogr_selafin_create_elements():
             pol.AddGeometry(poll)
             feat = ogr.Feature(dfn)
             feat.SetGeometry(pol)
-            if layere.CreateFeature(feat) != 0:
-                gdaltest.post_reason('unable to create element feature')
-                return 'fail'
+            assert layere.CreateFeature(feat) == 0, 'unable to create element feature'
     pol = ogr.Geometry(type=ogr.wkbPolygon)
     poll = ogr.Geometry(type=ogr.wkbLinearRing)
     poll.AddPoint_2D(4.0, 4.0)
@@ -137,19 +128,14 @@ def test_ogr_selafin_create_elements():
     pol.AddGeometry(poll)
     feat = ogr.Feature(dfn)
     feat.SetGeometry(pol)
-    if layere.CreateFeature(feat) != 0:
-        gdaltest.post_reason('unable to create element feature')
-        return 'fail'
+    assert layere.CreateFeature(feat) == 0, 'unable to create element feature'
     # do some checks
-    if gdaltest.selafin_ds.GetLayer(k).GetFeatureCount() != 28:
-        gdaltest.post_reason('wrong number of point features after elements layer creation')
-        return 'fail'
-    if math.fabs(layere.GetFeature(5).GetFieldAsDouble(0) - 9) > 0.01:
-        gdaltest.post_reason('wrong value of attribute in element layer')
-        return 'fail'
-    if math.fabs(layere.GetFeature(10).GetFieldAsDouble(0) - 15) > 0.01:
-        gdaltest.post_reason('wrong value of attribute in element layer')
-        return 'fail'
+    assert gdaltest.selafin_ds.GetLayer(k).GetFeatureCount() == 28, \
+        'wrong number of point features after elements layer creation'
+    assert math.fabs(layere.GetFeature(5).GetFieldAsDouble(0) - 9) <= 0.01, \
+        'wrong value of attribute in element layer'
+    assert math.fabs(layere.GetFeature(10).GetFieldAsDouble(0) - 15) <= 0.01, \
+        'wrong value of attribute in element layer'
     # return
     del gdaltest.selafin_ds
     return 'success'
@@ -164,9 +150,7 @@ def test_ogr_selafin_set_field():
     if gdaltest.selafin_ds is None:
         return 'skip'
     layerCount = gdaltest.selafin_ds.GetLayerCount()
-    if layerCount < 2:
-        gdaltest.post_reason('elements layer not created with nodes layer')
-        return 'fail'
+    assert layerCount >= 2, 'elements layer not created with nodes layer'
     for i in range(layerCount):
         name = gdaltest.selafin_ds.GetLayer(i).GetName()
         if '_e' in name:
@@ -185,9 +169,8 @@ def test_ogr_selafin_set_field():
         feat.SetField(0, (float)(val * 10))
         layern.SetFeature(feat)
     # do some checks
-    if math.fabs(layern.GetFeature(11).GetFieldAsDouble(0) - 110) > 0.01:
-        gdaltest.post_reason('wrong value of attribute in point layer')
-        return 'fail'
+    assert math.fabs(layern.GetFeature(11).GetFieldAsDouble(0) - 110) <= 0.01, \
+        'wrong value of attribute in point layer'
     # return
     del gdaltest.selafin_ds
     return 'success'
diff --git a/autotest/ogr/ogr_shape.py b/autotest/ogr/ogr_shape.py
index b3d3dda3b5e3..0587dd47991d 100755
--- a/autotest/ogr/ogr_shape.py
+++ b/autotest/ogr/ogr_shape.py
@@ -38,6 +38,7 @@
 from osgeo import gdal
 from osgeo import ogr
 from osgeo import osr
+import pytest
 
 ###############################################################################
 # Open Shapefile
@@ -119,14 +120,12 @@ def test_ogr_shape_3():
         orig_feat = gdaltest.poly_feat[i]
         read_feat = gdaltest.shape_lyr.GetNextFeature()
 
-        if ogrtest.check_feature_geometry(read_feat, orig_feat.GetGeometryRef(),
-                                          max_error=0.000000001) != 0:
-            return 'fail'
+        assert (ogrtest.check_feature_geometry(read_feat, orig_feat.GetGeometryRef(),
+                                          max_error=0.000000001) == 0)
 
         for fld in range(3):
-            if orig_feat.GetField(fld) != read_feat.GetField(fld):
-                gdaltest.post_reason('Attribute %d does not match' % fld)
-                return 'fail'
+            assert orig_feat.GetField(fld) == read_feat.GetField(fld), \
+                ('Attribute %d does not match' % fld)
 
     gdaltest.poly_feat = None
 
@@ -153,15 +152,11 @@ def test_ogr_shape_4():
 
     gdaltest.shape_lyr.SetAttributeFilter("PRFEDEA = 'nulled'")
     feat_read = gdaltest.shape_lyr.GetNextFeature()
-    if feat_read is None:
-        gdaltest.post_reason('Didnt get feature with null geometry back.')
-        return 'fail'
+    assert feat_read is not None, 'Didnt get feature with null geometry back.'
 
     if feat_read.GetGeometryRef() is not None:
-        print(feat_read.GetGeometryRef())
         print(feat_read.GetGeometryRef().ExportToWkt())
-        gdaltest.post_reason('Didnt get null geometry as expected.')
-        return 'fail'
+        pytest.fail('Didnt get null geometry as expected.')
 
     return 'success'
 
@@ -242,9 +237,7 @@ def test_ogr_shape_8():
     gdaltest.shape_lyr.SetAttributeFilter(None)
     gdaltest.shape_ds.ExecuteSQL('CREATE SPATIAL INDEX ON tpoly')
 
-    if not os.access('tmp/tpoly.qix', os.F_OK):
-        gdaltest.post_reason('tpoly.qix not created')
-        return 'fail'
+    assert os.access('tmp/tpoly.qix', os.F_OK), 'tpoly.qix not created'
 
     geom = ogr.CreateGeometryFromWkt(
         'LINESTRING(479505 4763195,480526 4762819)')
@@ -256,17 +249,14 @@ def test_ogr_shape_8():
 
     gdaltest.shape_lyr.SetSpatialFilter(None)
 
-    if not tr:
-        return 'fail'
+    assert tr
 
     # Test recreating while already existing
     gdaltest.shape_ds.ExecuteSQL('CREATE SPATIAL INDEX ON tpoly')
 
     gdaltest.shape_ds.ExecuteSQL('DROP SPATIAL INDEX ON tpoly')
 
-    if os.access('tmp/tpoly.qix', os.F_OK):
-        gdaltest.post_reason('tpoly.qix not deleted')
-        return 'fail'
+    assert not os.access('tmp/tpoly.qix', os.F_OK), 'tpoly.qix not deleted'
 
     return 'success'
 
@@ -322,8 +312,7 @@ def test_ogr_shape_11():
     tr = ogrtest.check_features_against_list(gdaltest.shape_lyr, 'FID',
                                              [])
 
-    if not tr:
-        return 'fail'
+    assert tr
 
     gdaltest.shape_lyr.SetAttributeFilter('FID = 4')
     gdaltest.shape_lyr.SetSpatialFilterRect(-400, 22, -120, 400)
@@ -351,34 +340,23 @@ def test_ogr_shape_12():
     feat = asm_lyr.GetNextFeature()
     geom = feat.GetGeometryRef()
 
-    if geom.GetCoordinateDimension() != 2:
-        gdaltest.post_reason('dimension wrong.')
-        return 'fail'
+    assert geom.GetCoordinateDimension() == 2, 'dimension wrong.'
 
-    if geom.GetGeometryName() != 'MULTIPOLYGON':
-        gdaltest.post_reason('Geometry of wrong type.')
-        return 'fail'
+    assert geom.GetGeometryName() == 'MULTIPOLYGON', 'Geometry of wrong type.'
 
-    if geom.GetGeometryCount() != 5:
-        gdaltest.post_reason('Did not get the expected number of polygons.')
-        return 'fail'
+    assert geom.GetGeometryCount() == 5, 'Did not get the expected number of polygons.'
 
     counts = [15, 11, 17, 20, 9]
     for i in range(5):
         poly = geom.GetGeometryRef(i)
-        if poly.GetGeometryName() != 'POLYGON':
-            gdaltest.post_reason('Did not get right type for polygons')
-            return 'fail'
+        assert poly.GetGeometryName() == 'POLYGON', \
+            'Did not get right type for polygons'
 
-        if poly.GetGeometryCount() != 1:
-            gdaltest.post_reason('polygon with more than one ring.')
-            return 'fail'
+        assert poly.GetGeometryCount() == 1, 'polygon with more than one ring.'
 
         pnt_count = poly.GetGeometryRef(0).GetPointCount()
-        if pnt_count != counts[i]:
-            gdaltest.post_reason(('Polygon %d has %d points instead of %d.' %
-                                  (i, pnt_count, counts[i])))
-            return 'fail'
+        assert pnt_count == counts[i], ('Polygon %d has %d points instead of %d.' %
+                                  (i, pnt_count, counts[i]))
 
     return 'success'
 
@@ -405,9 +383,7 @@ def test_ogr_shape_13():
         'POLYGON ((0 0, 0 60, 100 60, 100 0, 200 30, 0 0))')
     feat.SetGeometry(geom)
 
-    if gdaltest.shape_lyr.SetFeature(feat) != 0:
-        gdaltest.post_reason('SetFeature() failed.')
-        return 'fail'
+    assert gdaltest.shape_lyr.SetFeature(feat) == 0, 'SetFeature() failed.'
 
     ######################################################################
     # Update FID 8 (EAS_ID=165), making the polygon smaller.
@@ -419,9 +395,7 @@ def test_ogr_shape_13():
         'POLYGON ((0 0, 0 60, 100 60, 100 0, 0 0))')
     feat.SetGeometry(geom)
 
-    if gdaltest.shape_lyr.SetFeature(feat) != 0:
-        gdaltest.post_reason('SetFeature() failed.')
-        return 'fail'
+    assert gdaltest.shape_lyr.SetFeature(feat) == 0, 'SetFeature() failed.'
 
     return 'success'
 
@@ -443,26 +417,20 @@ def test_ogr_shape_14():
 
     feat = gdaltest.shape_lyr.GetFeature(9)
 
-    if feat.GetField('AREA') != 6000.0:
-        gdaltest.post_reason('AREA update failed, FID 9.')
-        return 'fail'
+    assert feat.GetField('AREA') == 6000.0, 'AREA update failed, FID 9.'
 
-    if ogrtest.check_feature_geometry(feat, 'POLYGON ((0 0, 0 60, 100 60, 100 0, 200 30, 0 0))') != 0:
-        gdaltest.post_reason('Geometry update failed, FID 9.')
-        return 'fail'
+    assert ogrtest.check_feature_geometry(feat, 'POLYGON ((0 0, 0 60, 100 60, 100 0, 200 30, 0 0))') == 0, \
+        'Geometry update failed, FID 9.'
 
     ######################################################################
     # Update FID 8 (EAS_ID=165), making the polygon smaller.
 
     feat = gdaltest.shape_lyr.GetFeature(8)
 
-    if feat.GetField('AREA') != 7000.0:
-        gdaltest.post_reason('AREA update failed, FID 8.')
-        return 'fail'
+    assert feat.GetField('AREA') == 7000.0, 'AREA update failed, FID 8.'
 
-    if ogrtest.check_feature_geometry(feat, 'POLYGON ((0 0, 0 60, 100 60, 100 0, 0 0))') != 0:
-        gdaltest.post_reason('Geometry update failed, FID 8.')
-        return 'fail'
+    assert ogrtest.check_feature_geometry(feat, 'POLYGON ((0 0, 0 60, 100 60, 100 0, 0 0))') == 0, \
+        'Geometry update failed, FID 8.'
 
     return 'success'
 
@@ -478,9 +446,7 @@ def test_ogr_shape_15():
     ######################################################################
     # Delete FID 9.
 
-    if gdaltest.shape_lyr.DeleteFeature(9) != 0:
-        gdaltest.post_reason('DeleteFeature failed.')
-        return 'fail'
+    assert gdaltest.shape_lyr.DeleteFeature(9) == 0, 'DeleteFeature failed.'
 
     ######################################################################
     # Count features, verifying that none are FID 9.
@@ -488,16 +454,12 @@ def test_ogr_shape_15():
     count = 0
     feat = gdaltest.shape_lyr.GetNextFeature()
     while feat is not None:
-        if feat.GetFID() == 9:
-            gdaltest.post_reason('Still an FID 9 in dataset.')
-            return 'fail'
+        assert feat.GetFID() != 9, 'Still an FID 9 in dataset.'
 
         count = count + 1
         feat = gdaltest.shape_lyr.GetNextFeature()
 
-    if count != 10:
-        gdaltest.post_reason('Did not get expected FID count.')
-        return 'fail'
+    assert count == 10, 'Did not get expected FID count.'
 
     return 'success'
 
@@ -526,13 +488,9 @@ def test_ogr_shape_16():
         count = count + 1
         feat = gdaltest.shape_lyr.GetNextFeature()
 
-    if count != 10:
-        gdaltest.post_reason('Did not get expected FID count.')
-        return 'fail'
+    assert count == 10, 'Did not get expected FID count.'
 
-    if got_9 == 0:
-        gdaltest.post_reason('Did not get FID 9 as expected.')
-        return 'fail'
+    assert got_9 != 0, 'Did not get FID 9 as expected.'
 
     feat = gdaltest.shape_lyr.GetFeature(9)
 
@@ -554,21 +512,15 @@ def test_ogr_shape_16_1():
 
     result = gdaltest.shape_lyr.CreateField(field_defn)
 
-    if result != 0:
-        gdaltest.post_reason('failed to create new field.')
-        return 'fail'
+    assert result == 0, 'failed to create new field.'
 
     ######################################################################
     # Check at least one feature.
 
     feat = gdaltest.shape_lyr.GetFeature(8)
-    if feat.EAS_ID != 165:
-        gdaltest.post_reason('Got wrong EAS_ID')
-        return 'fail'
+    assert feat.EAS_ID == 165, 'Got wrong EAS_ID'
 
-    if not feat.IsFieldNull('NEWFLD'):
-        gdaltest.post_reason('Expected NULL NEWFLD value!')
-        return 'fail'
+    assert feat.IsFieldNull('NEWFLD'), 'Expected NULL NEWFLD value!'
 
     return 'success'
 
@@ -587,9 +539,8 @@ def test_ogr_shape_17():
     shp_ds = ogr.Open('tmp/can_caps.shp', update=1)
     shp_lyr = shp_ds.GetLayer(0)
 
-    if shp_lyr.GetLayerDefn().GetFieldCount() != 0:
-        gdaltest.post_reason('Unexpectedly got attribute fields.')
-        return 'fail'
+    assert shp_lyr.GetLayerDefn().GetFieldCount() == 0, \
+        'Unexpectedly got attribute fields.'
 
     count = 0
     while 1:
@@ -603,17 +554,12 @@ def test_ogr_shape_17():
 
         count += 1
 
-    if count != 13:
-        gdaltest.post_reason('Got wrong number of features.')
-        return 'fail'
+    assert count == 13, 'Got wrong number of features.'
 
     # Create new feature without a DBF
     feat = ogr.Feature(shp_lyr.GetLayerDefn())
     shp_lyr.CreateFeature(feat)
-    if feat.GetFID() != 13:
-        print(feat.GetFID())
-        gdaltest.post_reason('Got wrong FID.')
-        return 'fail'
+    assert feat.GetFID() == 13, 'Got wrong FID.'
 
     shp_lyr = None
     shp_ds = None
@@ -634,9 +580,7 @@ def test_ogr_shape_18():
 
     srs_lyr = shp_lyr.GetSpatialRef()
 
-    if srs_lyr is None:
-        gdaltest.post_reason('Missing projection definition.')
-        return 'fail'
+    assert srs_lyr is not None, 'Missing projection definition.'
 
     # data/poly.shp has arbitrarily assigned EPSG:27700
     srs = osr.SpatialReference()
@@ -647,8 +591,7 @@ def test_ogr_shape_18():
         print('')
         print('expected = %s' % srs.ExportToPrettyWkt())
         print('existing = %s' % srs_lyr.ExportToPrettyWkt())
-        gdaltest.post_reason('Projections differ')
-        return 'fail'
+        pytest.fail('Projections differ')
 
     return 'success'
 
@@ -666,9 +609,8 @@ def test_ogr_shape_19():
 
     wkt = 'MULTIPOLYGON (((3115478.809630727861077 13939288.008583962917328,3134266.47213465673849 13971973.394036004319787,3176989.101938112173229 13957303.575368551537395,3198607.7820796193555 13921787.172278933227062,3169010.779504936654121 13891675.439224690198898,3120368.749186545144767 13897852.204979406669736,3115478.809630727861077 13939288.008583962917328),(3130405.993537959177047 13935427.529987264424562,3135038.567853996530175 13902742.144535223022103,3167209.22282647760585 13902227.414055664092302,3184452.693891727831215 13922559.267998272553086,3172871.258101634215564 13947781.061496697366238,3144561.081725850701332 13957818.305848112329841,3130405.993537959177047 13935427.529987264424562)),((3143016.890287171583623 13932596.512349685654044,3152282.038919246289879 13947266.331017138436437,3166179.761867358349264 13940060.104303302243352,3172099.162382294889539 13928221.303273428231478,3169268.144744716584682 13916897.23272311501205,3158201.439434182830155 13911235.197447959333658,3144818.446965630631894 13911749.927927518263459,3139928.507409813348204 13916382.502243556082249,3143016.890287171583623 13932596.512349685654044),(3149193.65604188805446 13926677.11183474957943,3150737.84748056717217 13918698.789401574060321,3158458.804673962760717 13919728.250360693782568,3164892.935668459162116 13923331.36371761187911,3163863.474709339439869 13928736.033752989023924,3157171.978475063573569 13935427.529987264424562,3149193.65604188805446 13926677.11183474957943)))'
 
-    if ogrtest.check_feature_geometry(feat, wkt,
-                                      max_error=0.00000001) != 0:
-        return 'fail'
+    assert (ogrtest.check_feature_geometry(feat, wkt,
+                                      max_error=0.00000001) == 0)
 
     return 'success'
 
@@ -687,30 +629,24 @@ def test_ogr_shape_20():
     lyr.ResetReading()
     feat = lyr.GetNextFeature()
 
-    if feat is None:
-        return 'fail'
-    if feat.GetGeometryRef() is not None:
-        return 'fail'
+    assert feat is not None
+    assert feat.GetGeometryRef() is None
 
     ds = ogr.Open('data/emptymultiline.shp')
     lyr = ds.GetLayer(0)
     lyr.ResetReading()
     feat = lyr.GetNextFeature()
 
-    if feat is None:
-        return 'fail'
-    if feat.GetGeometryRef() is not None:
-        return 'fail'
+    assert feat is not None
+    assert feat.GetGeometryRef() is None
 
     ds = ogr.Open('data/emptymultipoly.shp')
     lyr = ds.GetLayer(0)
     lyr.ResetReading()
     feat = lyr.GetNextFeature()
 
-    if feat is None:
-        return 'fail'
-    if feat.GetGeometryRef() is not None:
-        return 'fail'
+    assert feat is not None
+    assert feat.GetGeometryRef() is None
 
     return 'success'
 
@@ -736,8 +672,7 @@ def test_ogr_shape_21():
         feat = lyr.GetNextFeature()
         gdal.PopErrorHandler()
 
-        if feat.GetGeometryRef() is not None:
-            return 'fail'
+        assert feat.GetGeometryRef() is None
 
         # Test fix for #3665
         lyr.ResetReading()
@@ -747,8 +682,7 @@ def test_ogr_shape_21():
         feat = lyr.GetNextFeature()
         gdal.PopErrorHandler()
 
-        if feat is not None and feat.GetGeometryRef() is not None:
-            return 'fail'
+        assert feat is None or feat.GetGeometryRef() is None
 
     return 'success'
 
@@ -791,11 +725,10 @@ def test_ogr_shape_22():
     gdaltest.shape_ds = ogr.GetDriverByName('ESRI Shapefile').Open('tmp', update=1)
     gdaltest.shape_lyr = gdaltest.shape_ds.GetLayerByName('datatypes')
     feat_read = gdaltest.shape_lyr.GetNextFeature()
-    if feat_read.GetField('REAL') != 1.2 or \
-       feat_read.GetField('INTEGER') != 3 or \
-       feat_read.GetField('STRING') != 'aString' or \
-       feat_read.GetFieldAsString('DATE') != '2005/10/12':
-        return 'fail'
+    assert (feat_read.GetField('REAL') == 1.2 and \
+       feat_read.GetField('INTEGER') == 3 and \
+       feat_read.GetField('STRING') == 'aString' and \
+       feat_read.GetFieldAsString('DATE') == '2005/10/12')
 
     return 'success'
 
@@ -833,17 +766,15 @@ def ogr_shape_23_write_valid_and_invalid(layer_name, wkt, invalid_wkt, wkbType,
     gdaltest.shape_ds = ogr.GetDriverByName('ESRI Shapefile').Open('tmp', update=1)
 
     read_lyr = gdaltest.shape_ds.GetLayerByName(layer_name)
-    if read_lyr.GetFeatureCount() != 1:
-        return 'fail'
+    assert read_lyr.GetFeatureCount() == 1
     feat_read = read_lyr.GetNextFeature()
 
     if isEmpty and feat_read.GetGeometryRef() is None:
         return 'success'
 
-    if ogrtest.check_feature_geometry(feat_read, ogr.CreateGeometryFromWkt(wkt),
-                                      max_error=0.000000001) != 0:
-        print(feat_read.GetGeometryRef().ExportToWkt())
-        return 'fail'
+    assert (ogrtest.check_feature_geometry(feat_read, ogr.CreateGeometryFromWkt(wkt),
+                                      max_error=0.000000001) == 0), \
+        feat_read.GetGeometryRef().ExportToWkt()
 
     return 'success'
 
@@ -871,20 +802,16 @@ def ogr_shape_23_write_geom(layer_name, geom, expected_geom, wkbType):
     gdaltest.shape_ds = ogr.GetDriverByName('ESRI Shapefile').Open('tmp', update=1)
 
     read_lyr = gdaltest.shape_ds.GetLayerByName(layer_name)
-    if read_lyr.GetFeatureCount() != 1:
-        return 'fail'
+    assert read_lyr.GetFeatureCount() == 1
     feat_read = read_lyr.GetNextFeature()
 
     if expected_geom is None:
-        if feat_read.GetGeometryRef() is not None:
-            print(feat_read.GetGeometryRef().ExportToWkt())
-            return 'fail'
+        assert feat_read.GetGeometryRef() is None, feat_read.GetGeometryRef().ExportToWkt()
         return 'success'
 
-    if ogrtest.check_feature_geometry(feat_read, expected_geom,
-                                      max_error=0.000000001) != 0:
-        print(feat_read.GetGeometryRef().ExportToWkt())
-        return 'fail'
+    assert (ogrtest.check_feature_geometry(feat_read, expected_geom,
+                                      max_error=0.000000001) == 0), \
+        feat_read.GetGeometryRef().ExportToWkt()
 
     return 'success'
 
@@ -925,13 +852,11 @@ def test_ogr_shape_23():
     # Write a feature in a new layer (geometry type unset at layer creation)
 
     for item in test_geom_array:
-        if ogr_shape_23_write_valid_and_invalid(item[0], item[1], item[2], ogr.wkbUnknown, 0) != 'success':
-            gdaltest.post_reason('Test for layer %s failed' % item[0])
-            return 'fail'
+        assert ogr_shape_23_write_valid_and_invalid(item[0], item[1], item[2], ogr.wkbUnknown, 0) == 'success', \
+            ('Test for layer %s failed' % item[0])
     for item in test_empty_geom_array:
-        if ogr_shape_23_write_valid_and_invalid(item[0], item[1], item[2], ogr.wkbUnknown, 1) != 'success':
-            gdaltest.post_reason('Test for layer %s failed' % item[0])
-            return 'fail'
+        assert ogr_shape_23_write_valid_and_invalid(item[0], item[1], item[2], ogr.wkbUnknown, 1) == 'success', \
+            ('Test for layer %s failed' % item[0])
 
     #######################################################
     # Same test but use the wkb type when creating the layer
@@ -942,13 +867,11 @@ def test_ogr_shape_23():
     gdaltest.shape_ds = shape_drv.CreateDataSource('tmp')
 
     for item in test_geom_array:
-        if ogr_shape_23_write_valid_and_invalid(item[0], item[1], item[2], item[3], 0) != 'success':
-            gdaltest.post_reason('(2) Test for layer %s failed' % item[0])
-            return 'fail'
+        assert ogr_shape_23_write_valid_and_invalid(item[0], item[1], item[2], item[3], 0) == 'success', \
+            ('(2) Test for layer %s failed' % item[0])
     for item in test_empty_geom_array:
-        if ogr_shape_23_write_valid_and_invalid(item[0], item[1], item[2], item[3], 1) != 'success':
-            gdaltest.post_reason('(2) Test for layer %s failed' % item[0])
-            return 'fail'
+        assert ogr_shape_23_write_valid_and_invalid(item[0], item[1], item[2], item[3], 1) == 'success', \
+            ('(2) Test for layer %s failed' % item[0])
 
     #######################################################
     # Test writing of a geometrycollection
@@ -976,10 +899,9 @@ def test_ogr_shape_23():
     read_lyr = gdaltest.shape_ds.GetLayerByName(layer_name)
     feat_read = read_lyr.GetNextFeature()
 
-    if ogrtest.check_feature_geometry(feat_read, ogr.CreateGeometryFromWkt('MULTIPOLYGON(((0 0 0,0 10,10 10,0 0),(0.25 0.5,1 1,0.5 1,0.25 0.5)),((100 0,100 10,110 10,100 0),(100.25 0.5,100.5 1,100 1,100.25 0.5)))'),
-                                      max_error=0.000000001) != 0:
-        print(feat_read.GetGeometryRef().ExportToWkt())
-        return 'fail'
+    assert (ogrtest.check_feature_geometry(feat_read, ogr.CreateGeometryFromWkt('MULTIPOLYGON(((0 0 0,0 10,10 10,0 0),(0.25 0.5,1 1,0.5 1,0.25 0.5)),((100 0,100 10,110 10,100 0),(100.25 0.5,100.5 1,100 1,100.25 0.5)))'),
+                                      max_error=0.000000001) == 0), \
+        feat_read.GetGeometryRef().ExportToWkt()
 
     #######################################################
     # Test writing of a multipoint with an empty point inside
@@ -988,9 +910,8 @@ def test_ogr_shape_23():
     geom = ogr.CreateGeometryFromWkt(wkt)
     geom.AddGeometry(ogr.Geometry(type=ogr.wkbPoint))
 
-    if ogr_shape_23_write_geom(layer_name, geom, ogr.CreateGeometryFromWkt(geom.ExportToWkt()), ogr.wkbUnknown) != 'success':
-        gdaltest.post_reason('Test for layer %s failed' % layer_name)
-        return 'fail'
+    assert ogr_shape_23_write_geom(layer_name, geom, ogr.CreateGeometryFromWkt(geom.ExportToWkt()), ogr.wkbUnknown) == 'success', \
+        ('Test for layer %s failed' % layer_name)
 
     #######################################################
     # Test writing of a multilinestring with an empty linestring inside
@@ -999,9 +920,8 @@ def test_ogr_shape_23():
     geom = ogr.CreateGeometryFromWkt(wkt)
     geom.AddGeometry(ogr.Geometry(type=ogr.wkbLineString))
 
-    if ogr_shape_23_write_geom(layer_name, geom, ogr.CreateGeometryFromWkt(geom.ExportToWkt()), ogr.wkbUnknown) != 'success':
-        gdaltest.post_reason('Test for layer %s failed' % layer_name)
-        return 'fail'
+    assert ogr_shape_23_write_geom(layer_name, geom, ogr.CreateGeometryFromWkt(geom.ExportToWkt()), ogr.wkbUnknown) == 'success', \
+        ('Test for layer %s failed' % layer_name)
 
     #######################################################
     # Test writing of a polygon with an empty external ring
@@ -1016,9 +936,8 @@ def test_ogr_shape_23():
     ring.AddPoint_2D(0, 0)
     geom.AddGeometry(ring)
 
-    if ogr_shape_23_write_geom(layer_name, geom, None, ogr.wkbUnknown) != 'success':
-        gdaltest.post_reason('Test for layer %s failed' % layer_name)
-        return 'fail'
+    assert ogr_shape_23_write_geom(layer_name, geom, None, ogr.wkbUnknown) == 'success', \
+        ('Test for layer %s failed' % layer_name)
 
     #######################################################
     # Test writing of a polygon with an empty external ring
@@ -1027,9 +946,8 @@ def test_ogr_shape_23():
     geom = ogr.CreateGeometryFromWkt(wkt)
     geom.AddGeometry(ogr.Geometry(type=ogr.wkbLinearRing))
 
-    if ogr_shape_23_write_geom(layer_name, geom, ogr.CreateGeometryFromWkt(geom.ExportToWkt()), ogr.wkbUnknown) != 'success':
-        gdaltest.post_reason('Test for layer %s failed' % layer_name)
-        return 'fail'
+    assert ogr_shape_23_write_geom(layer_name, geom, ogr.CreateGeometryFromWkt(geom.ExportToWkt()), ogr.wkbUnknown) == 'success', \
+        ('Test for layer %s failed' % layer_name)
 
     #######################################################
     # Test writing of a multipolygon with an empty polygon and a polygon with an empty external ring
@@ -1041,9 +959,8 @@ def test_ogr_shape_23():
     poly.AddGeometry(ogr.Geometry(type=ogr.wkbLinearRing))
     geom.AddGeometry(poly)
 
-    if ogr_shape_23_write_geom(layer_name, geom, ogr.CreateGeometryFromWkt(geom.ExportToWkt()), ogr.wkbUnknown) != 'success':
-        gdaltest.post_reason('Test for layer %s failed' % layer_name)
-        return 'fail'
+    assert ogr_shape_23_write_geom(layer_name, geom, ogr.CreateGeometryFromWkt(geom.ExportToWkt()), ogr.wkbUnknown) == 'success', \
+        ('Test for layer %s failed' % layer_name)
 
     return 'success'
 
@@ -1060,9 +977,8 @@ def test_ogr_shape_24():
     wkt = 'MULTIPOLYGON(((0 0,0 10,10 10,0 0), (0 0,1 1,0 1,0 0)), ((100 100,100 200,200 200,200 100,100 100)))'
     geom = ogr.CreateGeometryFromWkt(wkt)
 
-    if ogr_shape_23_write_geom(layer_name, geom, ogr.CreateGeometryFromWkt(geom.ExportToWkt()), ogr.wkbUnknown) != 'success':
-        gdaltest.post_reason('Test for layer %s failed' % layer_name)
-        return 'fail'
+    assert ogr_shape_23_write_geom(layer_name, geom, ogr.CreateGeometryFromWkt(geom.ExportToWkt()), ogr.wkbUnknown) == 'success', \
+        ('Test for layer %s failed' % layer_name)
 
     return 'success'
 
@@ -1076,9 +992,8 @@ def test_ogr_shape_25():
     wkt = 'MULTIPOLYGON(((10 5, 5 5,5 0,0 0,0 10,10 10,10 5)),((10 5,10 0,5 0,5 4.9,10 5)), ((100 100,100 200,200 200,200 100,100 100)))'
     geom = ogr.CreateGeometryFromWkt(wkt)
 
-    if ogr_shape_23_write_geom(layer_name, geom, ogr.CreateGeometryFromWkt(geom.ExportToWkt()), ogr.wkbUnknown) != 'success':
-        gdaltest.post_reason('Test for layer %s failed' % layer_name)
-        return 'fail'
+    assert ogr_shape_23_write_geom(layer_name, geom, ogr.CreateGeometryFromWkt(geom.ExportToWkt()), ogr.wkbUnknown) == 'success', \
+        ('Test for layer %s failed' % layer_name)
 
     # Same test, but use OGR_ORGANIZE_POLYGONS=DEFAULT to avoid relying only on the winding order
     layer_name = 'touchingrings3'
@@ -1088,9 +1003,7 @@ def test_ogr_shape_25():
     gdal.SetConfigOption('OGR_ORGANIZE_POLYGONS', 'DEFAULT')
     ret = ogr_shape_23_write_geom(layer_name, geom, ogr.CreateGeometryFromWkt(geom.ExportToWkt()), ogr.wkbUnknown)
     gdal.SetConfigOption('OGR_ORGANIZE_POLYGONS', '')
-    if ret != 'success':
-        gdaltest.post_reason('Test for layer %s failed' % layer_name)
-        return 'fail'
+    assert ret == 'success', ('Test for layer %s failed' % layer_name)
 
     return 'success'
 
@@ -1105,9 +1018,7 @@ def test_ogr_shape_26():
     geom = ogr.CreateGeometryFromWkt(wkt)
 
     ret = ogr_shape_23_write_geom(layer_name, geom, ogr.CreateGeometryFromWkt(geom.ExportToWkt()), ogr.wkbUnknown)
-    if ret != 'success':
-        gdaltest.post_reason('Test for layer %s failed' % layer_name)
-        return 'fail'
+    assert ret == 'success', ('Test for layer %s failed' % layer_name)
 
     return 'success'
 
@@ -1183,16 +1094,12 @@ def test_ogr_shape_28():
     f.close()
 
     ds = ogr.Open('tmp/hugedbf.dbf', update=1)
-    if ds is None:
-        gdaltest.post_reason('Cannot open tmp/hugedbf.dbf')
-        return 'fail'
+    assert ds is not None, 'Cannot open tmp/hugedbf.dbf'
 
     # Check that the hand-written value can be read back
     lyr = ds.GetLayer(0)
     feat = lyr.GetFeature(23900000)
-    if feat.GetFieldAsString(0) != 'value_over_2GB':
-        print(feat.GetFieldAsString(0))
-        return 'fail'
+    assert feat.GetFieldAsString(0) == 'value_over_2GB'
 
     # Update with a new value
     feat.SetField(0, 'updated_value')
@@ -1205,12 +1112,10 @@ def test_ogr_shape_28():
     gdal.PushErrorHandler('CPLQuietErrorHandler')
     ret = lyr.CreateFeature(feat)
     gdal.PopErrorHandler()
-    if ret != 0:
-        return 'fail'
+    assert ret == 0
     feat = None
-    if gdal.GetLastErrorMsg().find('2GB file size limit reached') < 0:
-        gdaltest.post_reason('did not find expected warning')
-        return 'fail'
+    assert gdal.GetLastErrorMsg().find('2GB file size limit reached') >= 0, \
+        'did not find expected warning'
 
     ds = None
 
@@ -1220,9 +1125,7 @@ def test_ogr_shape_28():
     gdal.SetConfigOption('SHAPE_2GB_LIMIT', None)
     lyr = ds.GetLayer(0)
     feat = lyr.GetFeature(23900000)
-    if feat.GetFieldAsString(0) != 'updated_value':
-        print(feat.GetFieldAsString(0))
-        return 'fail'
+    assert feat.GetFieldAsString(0) == 'updated_value'
     feat = None
 
     # Test creating a feature over 2 GB file limit -> should fail
@@ -1231,12 +1134,10 @@ def test_ogr_shape_28():
     gdal.PushErrorHandler('CPLQuietErrorHandler')
     ret = lyr.CreateFeature(feat)
     gdal.PopErrorHandler()
-    if ret == 0:
-        return 'fail'
+    assert ret != 0
     feat = None
-    if gdal.GetLastErrorMsg().find('2GB file size limit reached') < 0:
-        gdaltest.post_reason('did not find expected warning')
-        return 'fail'
+    assert gdal.GetLastErrorMsg().find('2GB file size limit reached') >= 0, \
+        'did not find expected warning'
 
     ds = None
 
@@ -1264,19 +1165,12 @@ def test_ogr_shape_29():
 
     lst = gdal.ReadDir('tmp/UPPERCASE')
 
-    if len(lst) != 6:
-        print(lst)
-        return 'fail'
+    assert len(lst) == 6
 
     for filename in lst:
-        if filename not in ['.', '..', 'UPPERCASE.SHP', 'UPPERCASE.SHX', 'UPPERCASE.DBF', 'UPPERCASE.CPG']:
-            print(lst)
-            print(filename)
-            return 'fail'
-        if filename.find('packed') >= 0:
-            print(lst)
-            print(filename)
-            return 'fail'
+        assert filename in ['.', '..', 'UPPERCASE.SHP', 'UPPERCASE.SHX', 'UPPERCASE.DBF', 'UPPERCASE.CPG'], \
+            lst
+        assert filename.find('packed') < 0, lst
 
     return 'success'
 
@@ -1299,14 +1193,10 @@ def test_ogr_shape_30():
 
     lst = gdal.ReadDir('tmp/lowercase')
 
-    if len(lst) != 5:
-        print(lst)
-        return 'fail'
+    assert len(lst) == 5
 
     for filename in lst:
-        if filename not in ['.', '..', 'lowercase.shp', 'lowercase.shx', 'lowercase.dbf']:
-            print(lst)
-            return 'fail'
+        assert filename in ['.', '..', 'lowercase.shp', 'lowercase.shx', 'lowercase.dbf'], lst
 
     return 'success'
 
@@ -1379,8 +1269,7 @@ def test_ogr_shape_31():
             print('Expected ', expected_fields[i], ',but got', layer_defn.GetFieldDefn(i).GetNameRef())
             error_occurred = True
 
-    if error_occurred:
-        return 'fail'
+    assert not error_occurred
     return 'success'
 
 ###############################################################################
@@ -1422,9 +1311,7 @@ def test_ogr_shape_32():
         dst_feat = ogr.Feature(feature_def=gdaltest.shape_lyr.GetLayerDefn())
         dst_feat.SetGeometry(geom)
         ret = gdaltest.shape_lyr.CreateFeature(dst_feat)
-        if ret != 0 and n < 22845570:
-            print('File limit reached before 4GB!')
-            return 'fail'
+        assert ret == 0 or n >= 22845570, 'File limit reached before 4GB!'
 
         if (n % 22846) == 0:
             sys.stdout.write('\r%.1f%%   ' % (n / Decimal('228460.0')))
@@ -1440,13 +1327,10 @@ def test_ogr_shape_32():
 
     for i in [0, 1, read_lyr.GetFeatureCount() - 1]:
         feat_read = read_lyr.GetFeature(i)
-        if feat_read is None:
-            print('Could not retrieve geometry at FID', i)
-            return 'fail'
-        if ogrtest.check_feature_geometry(feat_read, ogr.CreateGeometryFromWkt('POLYGON((0 0,0 10,10 10,0 0),(0.25 0.5,1 1.1,0.5 1,0.25 0.5))'),
-                                          max_error=0.000000001) != 0:
-            print('Wrong geometry encountered at FID', i, ':', (feat_read.GetGeometryRef().ExportToWkt()))
-            return 'fail'
+        assert feat_read is not None, ('Could not retrieve geometry at FID', i)
+        assert (ogrtest.check_feature_geometry(feat_read, ogr.CreateGeometryFromWkt('POLYGON((0 0,0 10,10 10,0 0),(0.25 0.5,1 1.1,0.5 1,0.25 0.5))'),
+                                          max_error=0.000000001) == 0), \
+            ('Wrong geometry encountered at FID', i, ':', (feat_read.GetGeometryRef().ExportToWkt()))
 
     return 'success'
 
@@ -1461,10 +1345,9 @@ def test_ogr_shape_33():
     lyr = ds.GetLayer(0)
     feat_read = lyr.GetNextFeature()
 
-    if ogrtest.check_feature_geometry(feat_read, ogr.CreateGeometryFromWkt('MULTIPOLYGON( ((0 0,0 1,1 1,1 0,0 0)),((100000000000 100000000000,100000000000 100000000001,100000000001 100000000001,100000000001 100000000000,100000000000 100000000000)) )'),
-                                      max_error=0.000000001) != 0:
-        print('Wrong geometry : %s' % feat_read.GetGeometryRef().ExportToWkt())
-        return 'fail'
+    assert (ogrtest.check_feature_geometry(feat_read, ogr.CreateGeometryFromWkt('MULTIPOLYGON( ((0 0,0 1,1 1,1 0,0 0)),((100000000000 100000000000,100000000000 100000000001,100000000001 100000000001,100000000001 100000000000,100000000000 100000000000)) )'),
+                                      max_error=0.000000001) == 0), \
+        ('Wrong geometry : %s' % feat_read.GetGeometryRef().ExportToWkt())
 
     return 'success'
 
@@ -1488,10 +1371,9 @@ def test_ogr_shape_34():
     lyr = ds.GetLayer(0)
     feat_read = lyr.GetNextFeature()
 
-    if ogrtest.check_feature_geometry(feat_read, ogr.CreateGeometryFromWkt('MULTIPOLYGON( ((0 0,0 1,1 1,1 0,0 0)),((100000000000 100000000000,100000000000 100000000001,100000000001 100000000001,100000000001 100000000000,100000000000 100000000000)) )'),
-                                      max_error=0.000000001) != 0:
-        print('Wrong geometry : %s' % feat_read.GetGeometryRef().ExportToWkt())
-        return 'fail'
+    assert (ogrtest.check_feature_geometry(feat_read, ogr.CreateGeometryFromWkt('MULTIPOLYGON( ((0 0,0 1,1 1,1 0,0 0)),((100000000000 100000000000,100000000000 100000000001,100000000001 100000000001,100000000001 100000000000,100000000000 100000000000)) )'),
+                                      max_error=0.000000001) == 0), \
+        ('Wrong geometry : %s' % feat_read.GetGeometryRef().ExportToWkt())
 
     return 'success'
 
@@ -1515,16 +1397,12 @@ def test_ogr_shape_35():
     ds = ogr.Open('/vsimem/test35.shp')
     lyr = ds.GetLayer(0)
     srs_read = lyr.GetSpatialRef()
-    if srs_read.ExportToWkt() != srs.ExportToWkt():
-        gdaltest.post_reason('did not get expected SRS')
-        print(srs_read)
-        return 'fail'
+    assert srs_read.ExportToWkt() == srs.ExportToWkt(), 'did not get expected SRS'
     feat_read = lyr.GetNextFeature()
 
-    if ogrtest.check_feature_geometry(feat_read, ogr.CreateGeometryFromWkt('POINT(0 1)'),
-                                      max_error=0.000000001) != 0:
-        print('Wrong geometry : %s' % feat_read.GetGeometryRef().ExportToWkt())
-        return 'fail'
+    assert (ogrtest.check_feature_geometry(feat_read, ogr.CreateGeometryFromWkt('POINT(0 1)'),
+                                      max_error=0.000000001) == 0), \
+        ('Wrong geometry : %s' % feat_read.GetGeometryRef().ExportToWkt())
 
     return 'success'
 
@@ -1535,22 +1413,18 @@ def test_ogr_shape_35():
 def test_ogr_shape_36():
 
     ds = ogr.Open('/vsizip/data/poly.zip')
-    if ds is None:
-        return 'fail'
+    assert ds is not None
 
     lyr = ds.GetLayer(0)
 
     srs = lyr.GetSpatialRef()
     wkt = srs.ExportToWkt()
-    if wkt.find('OSGB') == -1:
-        gdaltest.post_reason('did not get expected SRS')
-        return 'fail'
+    assert wkt.find('OSGB') != -1, 'did not get expected SRS'
 
     feat_read = lyr.GetFeature(9)
-    if ogrtest.check_feature_geometry(feat_read, ogr.CreateGeometryFromWkt('POLYGON ((479750.6875 4764702.0,479658.59375 4764670.0,479640.09375 4764721.0,479735.90625 4764752.0,479750.6875 4764702.0))'),
-                                      max_error=0.000000001) != 0:
-        print('Wrong geometry : %s' % feat_read.GetGeometryRef().ExportToWkt())
-        return 'fail'
+    assert (ogrtest.check_feature_geometry(feat_read, ogr.CreateGeometryFromWkt('POLYGON ((479750.6875 4764702.0,479658.59375 4764670.0,479640.09375 4764721.0,479735.90625 4764752.0,479750.6875 4764702.0))'),
+                                      max_error=0.000000001) == 0), \
+        ('Wrong geometry : %s' % feat_read.GetGeometryRef().ExportToWkt())
 
     return 'success'
 
@@ -1561,31 +1435,26 @@ def test_ogr_shape_36():
 def test_ogr_shape_37():
 
     ds = ogr.Open('/vsitar/data/poly.tar.gz')
-    if ds is None:
-        return 'fail'
+    assert ds is not None
 
     lyr = ds.GetLayer(0)
 
     srs = lyr.GetSpatialRef()
     wkt = srs.ExportToWkt()
-    if wkt.find('OSGB') == -1:
-        gdaltest.post_reason('did not get expected SRS')
-        return 'fail'
+    assert wkt.find('OSGB') != -1, 'did not get expected SRS'
 
     for i in range(10):
         feat_read = lyr.GetNextFeature()
         if i == 9:
-            if ogrtest.check_feature_geometry(feat_read, ogr.CreateGeometryFromWkt('POLYGON ((479750.6875 4764702.0,479658.59375 4764670.0,479640.09375 4764721.0,479735.90625 4764752.0,479750.6875 4764702.0))'),
-                                              max_error=0.000000001) != 0:
-                print('Wrong geometry : %s' % feat_read.GetGeometryRef().ExportToWkt())
-                return 'fail'
+            assert (ogrtest.check_feature_geometry(feat_read, ogr.CreateGeometryFromWkt('POLYGON ((479750.6875 4764702.0,479658.59375 4764670.0,479640.09375 4764721.0,479735.90625 4764752.0,479750.6875 4764702.0))'),
+                                              max_error=0.000000001) == 0), \
+                ('Wrong geometry : %s' % feat_read.GetGeometryRef().ExportToWkt())
 
     lyr.ResetReading()
     feat_read = lyr.GetFeature(9)
-    if ogrtest.check_feature_geometry(feat_read, ogr.CreateGeometryFromWkt('POLYGON ((479750.6875 4764702.0,479658.59375 4764670.0,479640.09375 4764721.0,479735.90625 4764752.0,479750.6875 4764702.0))'),
-                                      max_error=0.000000001) != 0:
-        print('Wrong geometry : %s' % feat_read.GetGeometryRef().ExportToWkt())
-        return 'fail'
+    assert (ogrtest.check_feature_geometry(feat_read, ogr.CreateGeometryFromWkt('POLYGON ((479750.6875 4764702.0,479658.59375 4764670.0,479640.09375 4764721.0,479735.90625 4764752.0,479750.6875 4764702.0))'),
+                                      max_error=0.000000001) == 0), \
+        ('Wrong geometry : %s' % feat_read.GetGeometryRef().ExportToWkt())
 
     ds = None
     gdal.Unlink('data/poly.tar.gz.properties')
@@ -1599,31 +1468,26 @@ def test_ogr_shape_37():
 def test_ogr_shape_37_bis():
 
     ds = ogr.Open('/vsitar/data/poly.tar')
-    if ds is None:
-        return 'fail'
+    assert ds is not None
 
     lyr = ds.GetLayer(0)
 
     srs = lyr.GetSpatialRef()
     wkt = srs.ExportToWkt()
-    if wkt.find('OSGB') == -1:
-        gdaltest.post_reason('did not get expected SRS')
-        return 'fail'
+    assert wkt.find('OSGB') != -1, 'did not get expected SRS'
 
     for i in range(10):
         feat_read = lyr.GetNextFeature()
         if i == 9:
-            if ogrtest.check_feature_geometry(feat_read, ogr.CreateGeometryFromWkt('POLYGON ((479750.6875 4764702.0,479658.59375 4764670.0,479640.09375 4764721.0,479735.90625 4764752.0,479750.6875 4764702.0))'),
-                                              max_error=0.000000001) != 0:
-                print('Wrong geometry : %s' % feat_read.GetGeometryRef().ExportToWkt())
-                return 'fail'
+            assert (ogrtest.check_feature_geometry(feat_read, ogr.CreateGeometryFromWkt('POLYGON ((479750.6875 4764702.0,479658.59375 4764670.0,479640.09375 4764721.0,479735.90625 4764752.0,479750.6875 4764702.0))'),
+                                              max_error=0.000000001) == 0), \
+                ('Wrong geometry : %s' % feat_read.GetGeometryRef().ExportToWkt())
 
     lyr.ResetReading()
     feat_read = lyr.GetFeature(9)
-    if ogrtest.check_feature_geometry(feat_read, ogr.CreateGeometryFromWkt('POLYGON ((479750.6875 4764702.0,479658.59375 4764670.0,479640.09375 4764721.0,479735.90625 4764752.0,479750.6875 4764702.0))'),
-                                      max_error=0.000000001) != 0:
-        print('Wrong geometry : %s' % feat_read.GetGeometryRef().ExportToWkt())
-        return 'fail'
+    assert (ogrtest.check_feature_geometry(feat_read, ogr.CreateGeometryFromWkt('POLYGON ((479750.6875 4764702.0,479658.59375 4764670.0,479640.09375 4764721.0,479735.90625 4764752.0,479750.6875 4764702.0))'),
+                                      max_error=0.000000001) == 0), \
+        ('Wrong geometry : %s' % feat_read.GetGeometryRef().ExportToWkt())
 
     return 'success'
 
@@ -1639,9 +1503,7 @@ def test_ogr_shape_38():
     gdal.PopErrorHandler()
     ds = None
 
-    if lyr is not None:
-        gdaltest.post_reason('should not have created a new layer')
-        return 'fail'
+    assert lyr is None, 'should not have created a new layer'
 
     return 'success'
 
@@ -1656,10 +1518,9 @@ def test_ogr_shape_39():
     lyr = ds.GetLayer(0)
     feat_read = lyr.GetNextFeature()
 
-    if ogrtest.check_feature_geometry(feat_read, ogr.CreateGeometryFromWkt('GEOMETRYCOLLECTION (TIN (((5 4 10,0 0 5,10 0 5,5 4 10)),((5 4 10,10 0 5,10 8 5,5 4 10)),((5 4 10,10 8 5,0 8 5,5 4 10)),((5 4 10,0 8 5,0 0 5,5 4 10))),TIN (((10 0 5,10 0 0,10 8 5,10 0 5)),((10 0 0,10 8 5,10 8 0,10 0 0)),((10 8 5,10 8 0,0 8 5,10 8 5)),((10 8 0,0 8 5,0 8 0,10 8 0)),((0 8 5,0 8 0,0 0 5,0 8 5)),((0 8 0,0 0 5,0 0 0,0 8 0))),MULTIPOLYGON (((0 0 0,0 0 5,10 0 5,10 0 0,6 0 0,6 0 3,4 0 3,4 0 0,0 0 0),(1 0 2,3 0 2,3 0 4,1 0 4,1 0 2),(7 0 2,9 0 2,9 0 4,7 0 4,7 0 2))))'),
-                                      max_error=0.000000001) != 0:
-        print('Wrong geometry : %s' % feat_read.GetGeometryRef().ExportToWkt())
-        return 'fail'
+    assert (ogrtest.check_feature_geometry(feat_read, ogr.CreateGeometryFromWkt('GEOMETRYCOLLECTION (TIN (((5 4 10,0 0 5,10 0 5,5 4 10)),((5 4 10,10 0 5,10 8 5,5 4 10)),((5 4 10,10 8 5,0 8 5,5 4 10)),((5 4 10,0 8 5,0 0 5,5 4 10))),TIN (((10 0 5,10 0 0,10 8 5,10 0 5)),((10 0 0,10 8 5,10 8 0,10 0 0)),((10 8 5,10 8 0,0 8 5,10 8 5)),((10 8 0,0 8 5,0 8 0,10 8 0)),((0 8 5,0 8 0,0 0 5,0 8 5)),((0 8 0,0 0 5,0 0 0,0 8 0))),MULTIPOLYGON (((0 0 0,0 0 5,10 0 5,10 0 0,6 0 0,6 0 3,4 0 3,4 0 0,0 0 0),(1 0 2,3 0 2,3 0 4,1 0 4,1 0 2),(7 0 2,9 0 2,9 0 4,7 0 4,7 0 2))))'),
+                                      max_error=0.000000001) == 0), \
+        ('Wrong geometry : %s' % feat_read.GetGeometryRef().ExportToWkt())
 
     return 'success'
 
@@ -1689,14 +1550,10 @@ def test_ogr_shape_40():
     geom = ogr.CreateGeometryFromWkt('POINT (99 1)')
     feat.SetGeometry(geom)
     for f in indexfiles:
-        if not os.path.exists(os.path.join('tmp', f)):
-            print('SetFeature(): ' + f)
-            return 'fail'
+        assert os.path.exists(os.path.join('tmp', f)), ('SetFeature(): ' + f)
     gdaltest.shape_lyr.SetFeature(feat)
     for f in indexfiles:
-        if os.path.exists(os.path.join('tmp', f)):
-            print('SetFeature(): ' + f)
-            return 'fail'
+        assert not os.path.exists(os.path.join('tmp', f)), ('SetFeature(): ' + f)
 
     # Check if adding a feature removes the indices
     for i in range(2):
@@ -1714,14 +1571,10 @@ def test_ogr_shape_40():
     feat.SetFID(1)
 
     for f in indexfiles:
-        if not os.path.exists(os.path.join('tmp', f)):
-            print('CreateFeature(): ' + f)
-            return 'fail'
+        assert os.path.exists(os.path.join('tmp', f)), ('CreateFeature(): ' + f)
     gdaltest.shape_lyr.CreateFeature(feat)
     for f in indexfiles:
-        if os.path.exists(os.path.join('tmp', f)):
-            print('CreateFeature(): ' + f)
-            return 'fail'
+        assert not os.path.exists(os.path.join('tmp', f)), ('CreateFeature(): ' + f)
 
     # Check if deleting a feature removes the indices
     for i in range(2):
@@ -1732,16 +1585,10 @@ def test_ogr_shape_40():
     gdaltest.shape_ds.ExecuteSQL('CREATE SPATIAL INDEX ON gjpoint')
 
     for f in indexfiles:
-        if not os.path.exists(os.path.join('tmp', f)):
-            print('DeleteFeature(): ' + f)
-            return 'fail'
-    if gdaltest.shape_lyr.DeleteFeature(0) != 0:
-        gdaltest.post_reason('DeleteFeature failed.')
-        return 'fail'
+        assert os.path.exists(os.path.join('tmp', f)), ('DeleteFeature(): ' + f)
+    assert gdaltest.shape_lyr.DeleteFeature(0) == 0, 'DeleteFeature failed.'
     for f in indexfiles:
-        if os.path.exists(os.path.join('tmp', f)):
-            print('DeleteFeature(): ' + f)
-            return 'fail'
+        assert not os.path.exists(os.path.join('tmp', f)), ('DeleteFeature(): ' + f)
 
     return 'success'
 
@@ -1765,9 +1612,7 @@ def test_ogr_shape_41():
     os.remove('tmp/poly.shx')
     os.remove('tmp/poly.dbf')
 
-    if ret.find('INFO') == -1 or ret.find('ERROR') != -1:
-        print(ret)
-        return 'fail'
+    assert ret.find('INFO') != -1 and ret.find('ERROR') == -1
 
     return 'success'
 
@@ -1791,9 +1636,7 @@ def test_ogr_shape_42():
     os.remove('tmp/poly.shx')
     os.remove('tmp/poly.dbf')
 
-    if ret.find('INFO') == -1 or ret.find('ERROR') != -1:
-        print(ret)
-        return 'fail'
+    assert ret.find('INFO') != -1 and ret.find('ERROR') == -1
 
     return 'success'
 
@@ -1814,21 +1657,16 @@ def test_ogr_shape_43():
     conn.close()
 
     ds = ogr.Open('/vsizip//vsicurl/https://raw.githubusercontent.com/OSGeo/gdal/master/autotest/ogr/data/poly.zip')
-    if ds is None:
-        return 'fail'
+    assert ds is not None
 
     lyr = ds.GetLayer(0)
 
     srs = lyr.GetSpatialRef()
     wkt = srs.ExportToWkt()
-    if wkt.find('OSGB') == -1:
-        gdaltest.post_reason('did not get expected SRS')
-        return 'fail'
+    assert wkt.find('OSGB') != -1, 'did not get expected SRS'
 
     f = lyr.GetNextFeature()
-    if f is None:
-        gdaltest.post_reason('did not get expected feature')
-        return 'fail'
+    assert f is not None, 'did not get expected feature'
 
     return 'success'
 
@@ -1849,21 +1687,16 @@ def ogr_shape_44_DISABLED():
     conn.close()
 
     ds = ogr.Open('/vsicurl/https://raw.githubusercontent.com/OSGeo/gdal/master/autotest/ogr/data/testshp')
-    if ds is None:
-        return 'fail'
+    assert ds is not None
 
     lyr = ds.GetLayer(0)
 
     srs = lyr.GetSpatialRef()
     wkt = srs.ExportToWkt()
-    if wkt.find('OSGB') == -1:
-        gdaltest.post_reason('did not get expected SRS')
-        return 'fail'
+    assert wkt.find('OSGB') != -1, 'did not get expected SRS'
 
     f = lyr.GetNextFeature()
-    if f is None:
-        gdaltest.post_reason('did not get expected feature')
-        return 'fail'
+    assert f is not None, 'did not get expected feature'
 
     return 'success'
 
@@ -1879,57 +1712,36 @@ def test_ogr_shape_45():
 
     feat = shp_layer.GetNextFeature()
 
-    if feat.IsFieldSet('AREA'):
-        gdaltest.post_reason('got area despite request to ignore it.')
-        return 'fail'
+    assert not feat.IsFieldSet('AREA'), 'got area despite request to ignore it.'
 
-    if feat.GetFieldAsInteger('EAS_ID') != 168:
-        gdaltest.post_reason('missing or wrong eas_id')
-        return 'fail'
+    assert feat.GetFieldAsInteger('EAS_ID') == 168, 'missing or wrong eas_id'
 
     wkt = 'POLYGON ((479819.84375 4765180.5,479690.1875 4765259.5,479647.0 4765369.5,479730.375 4765400.5,480039.03125 4765539.5,480035.34375 4765558.5,480159.78125 4765610.5,480202.28125 4765482.0,480365.0 4765015.5,480389.6875 4764950.0,480133.96875 4764856.5,480080.28125 4764979.5,480082.96875 4765049.5,480088.8125 4765139.5,480059.90625 4765239.5,480019.71875 4765319.5,479980.21875 4765409.5,479909.875 4765370.0,479859.875 4765270.0,479819.84375 4765180.5))'
-    if ogrtest.check_feature_geometry(feat, wkt,
-                                      max_error=0.00000001) != 0:
-        return 'fail'
+    assert (ogrtest.check_feature_geometry(feat, wkt,
+                                      max_error=0.00000001) == 0)
 
     fd = shp_layer.GetLayerDefn()
     fld = fd.GetFieldDefn(0)  # area
-    if not fld.IsIgnored():
-        gdaltest.post_reason('AREA unexpectedly not marked as ignored.')
-        return 'fail'
+    assert fld.IsIgnored(), 'AREA unexpectedly not marked as ignored.'
 
     fld = fd.GetFieldDefn(1)  # eas_id
-    if fld.IsIgnored():
-        gdaltest.post_reason('EASI unexpectedly marked as ignored.')
-        return 'fail'
+    assert not fld.IsIgnored(), 'EASI unexpectedly marked as ignored.'
 
-    if fd.IsGeometryIgnored():
-        gdaltest.post_reason('geometry unexpectedly ignored.')
-        return 'fail'
+    assert not fd.IsGeometryIgnored(), 'geometry unexpectedly ignored.'
 
-    if fd.IsStyleIgnored():
-        gdaltest.post_reason('style unexpectedly ignored.')
-        return 'fail'
+    assert not fd.IsStyleIgnored(), 'style unexpectedly ignored.'
 
     fd.SetGeometryIgnored(1)
 
-    if not fd.IsGeometryIgnored():
-        gdaltest.post_reason('geometry unexpectedly not ignored.')
-        return 'fail'
+    assert fd.IsGeometryIgnored(), 'geometry unexpectedly not ignored.'
 
     feat = shp_layer.GetNextFeature()
 
-    if feat.GetGeometryRef() is not None:
-        gdaltest.post_reason('Unexpectedly got a geometry on feature 2.')
-        return 'fail'
+    assert feat.GetGeometryRef() is None, 'Unexpectedly got a geometry on feature 2.'
 
-    if feat.IsFieldSet('AREA'):
-        gdaltest.post_reason('got area despite request to ignore it.')
-        return 'fail'
+    assert not feat.IsFieldSet('AREA'), 'got area despite request to ignore it.'
 
-    if feat.GetFieldAsInteger('EAS_ID') != 179:
-        gdaltest.post_reason('missing or wrong eas_id')
-        return 'fail'
+    assert feat.GetFieldAsInteger('EAS_ID') == 179, 'missing or wrong eas_id'
 
     feat = None
     shp_layer = None
@@ -1952,13 +1764,11 @@ def test_ogr_shape_46():
     ds = None
 
     ds = ogr.Open('/vsimem/ogr_shape_46.shp')
-    if ds.GetLayerCount() != 1:
-        return 'fail'
+    assert ds.GetLayerCount() == 1
     ds = None
 
     ds = ogr.Open('/vsimem/this_one_i_care_46.shp')
-    if ds.GetLayerCount() != 1:
-        return 'fail'
+    assert ds.GetLayerCount() == 1
     ds = None
 
     return 'success'
@@ -1977,9 +1787,7 @@ def test_ogr_shape_47():
     os.symlink('/vsizip/data/poly.zip', 'tmp/poly.zip')
 
     ds = ogr.Open('tmp/poly.zip')
-    if ds is None:
-        gdaltest.post_reason('tmp/polyzip symlink does not open.')
-        return 'fail'
+    assert ds is not None, 'tmp/polyzip symlink does not open.'
     ds = None
 
     os.remove('tmp/poly.zip')
@@ -2002,24 +1810,21 @@ def test_ogr_shape_48():
     lyr.SetFeature(feat)
     extent = lyr.GetExtent()
     if extent != (1, 3, 2, 4):
-        gdaltest.post_reason('did not get expected extent (1)')
         print(lyr.GetExtent())
-        return 'fail'
+        pytest.fail('did not get expected extent (1)')
     ds.ExecuteSQL('RECOMPUTE EXTENT ON ogr_shape_48')
     extent = lyr.GetExtent()
     if extent != (3, 3, 4, 4):
-        gdaltest.post_reason('did not get expected extent (2)')
         print(lyr.GetExtent())
-        return 'fail'
+        pytest.fail('did not get expected extent (2)')
     ds = None
 
     ds = ogr.Open('/vsimem/ogr_shape_48.shp')
     lyr = ds.GetLayer(0)
     extent = lyr.GetExtent()
     if extent != (3, 3, 4, 4):
-        gdaltest.post_reason('did not get expected extent (3)')
         print(lyr.GetExtent())
-        return 'fail'
+        pytest.fail('did not get expected extent (3)')
     ds = None
 
     ogr.GetDriverByName('ESRI Shapefile').DeleteDataSource('/vsimem/ogr_shape_48.shp')
@@ -2035,9 +1840,8 @@ def test_ogr_shape_48():
     ds.ExecuteSQL('RECOMPUTE EXTENT ON ogr_shape_48')
     extent = lyr.GetExtent()
     if extent != (0, 1, 0, 1):
-        gdaltest.post_reason('did not get expected extent (4)')
         print(lyr.GetExtent())
-        return 'fail'
+        pytest.fail('did not get expected extent (4)')
     ds = None
     ogr.GetDriverByName('ESRI Shapefile').DeleteDataSource('/vsimem/ogr_shape_48.shp')
 
@@ -2053,9 +1857,8 @@ def test_ogr_shape_48():
     # FIXME: when we have a GetExtent3D
     extent = lyr.GetExtent()
     if extent != (0, 1, 0, 1):
-        gdaltest.post_reason('did not get expected extent (4)')
         print(lyr.GetExtent())
-        return 'fail'
+        pytest.fail('did not get expected extent (4)')
     ds = None
     ogr.GetDriverByName('ESRI Shapefile').DeleteDataSource('/vsimem/ogr_shape_48.shp')
 
@@ -2081,9 +1884,7 @@ def test_ogr_shape_49():
         exec("gdaltest.exp_name =  u'OSEBERG S\u00D8R'")
         gdaltest.exp_name = gdaltest.exp_name.encode('utf-8')
 
-    if name != gdaltest.exp_name:
-        gdaltest.post_reason('Did not get expected name, encoding problems?')
-        return 'fail'
+    assert name == gdaltest.exp_name, 'Did not get expected name, encoding problems?'
 
     return 'success'
 
@@ -2101,9 +1902,8 @@ def test_ogr_shape_50():
     reconv_possible = lyr.TestCapability(ogr.OLCStringsAsUTF8) == 1
 
     if gdal.GetLastErrorMsg().find('Recode from CP936 to UTF-8 not supported, treated as ISO-8859-1 to UTF-8.') != -1:
-        if reconv_possible:
-            gdaltest.post_reason('Recode failed, but TestCapability(OLCStringsAsUTF8) returns TRUE')
-            return 'fail'
+        assert not reconv_possible, \
+            'Recode failed, but TestCapability(OLCStringsAsUTF8) returns TRUE'
 
         gdaltest.post_reason('skipping test: iconv support needed')
         return 'skip'
@@ -2115,13 +1915,10 @@ def test_ogr_shape_50():
         exec("gdaltest.fieldname =  u'\u4e2d\u56fd'")
         gdaltest.fieldname = gdaltest.fieldname.encode('utf-8')
 
-    if lyr.GetLayerDefn().GetFieldIndex(gdaltest.fieldname) != 0:
-        print(lyr.GetLayerDefn().GetFieldDefn(0).GetNameRef())
-        return 'fail'
+    assert lyr.GetLayerDefn().GetFieldIndex(gdaltest.fieldname) == 0, \
+        lyr.GetLayerDefn().GetFieldDefn(0).GetNameRef()
 
-    if not reconv_possible:
-        gdaltest.post_reason('TestCapability(OLCStringsAsUTF8) should return TRUE')
-        return 'fail'
+    assert reconv_possible, 'TestCapability(OLCStringsAsUTF8) should return TRUE'
 
     return 'success'
 
@@ -2160,15 +1957,9 @@ def test_ogr_shape_51():
 
     ogr.GetDriverByName('ESRI Shapefile').DeleteDataSource('/vsimem/ogr_shape_51.shp')
 
-    if field_count != 1:
-        gdaltest.post_reason('did not get expected field count')
-        print(field_count)
-        return 'fail'
+    assert field_count == 1, 'did not get expected field count'
 
-    if value != 'bar':
-        gdaltest.post_reason('did not get expected value')
-        print(value)
-        return 'fail'
+    assert value == 'bar', 'did not get expected value'
 
     return 'success'
 
@@ -2184,10 +1975,9 @@ def test_ogr_shape_52():
     lyr = ds.GetLayer(0)
     feat = lyr.GetNextFeature()
 
-    if ogrtest.check_feature_geometry(feat, expected_geom,
-                                      max_error=0.000000001) != 0:
-        gdaltest.post_reason('failed reading geom')
-        return 'fail'
+    assert (ogrtest.check_feature_geometry(feat, expected_geom,
+                                      max_error=0.000000001) == 0), \
+        'failed reading geom'
 
     ds = None
 
@@ -2202,10 +1992,9 @@ def test_ogr_shape_52():
     lyr = ds.GetLayer(0)
     feat = lyr.GetNextFeature()
 
-    if ogrtest.check_feature_geometry(feat, expected_geom,
-                                      max_error=0.000000001) != 0:
-        gdaltest.post_reason('failed writing and reading back geom')
-        return 'fail'
+    assert (ogrtest.check_feature_geometry(feat, expected_geom,
+                                      max_error=0.000000001) == 0), \
+        'failed writing and reading back geom'
 
     ds = None
 
@@ -2222,8 +2011,7 @@ def test_ogr_shape_53():
 
     # Test ReorderFields() when there are no fields
     ret = lyr.ReorderFields([])
-    if ret != 0:
-        return 'fail'
+    assert ret == 0
 
     # Test REPACK when there are no features
     gdal.ErrorReset()
@@ -2231,8 +2019,7 @@ def test_ogr_shape_53():
     ret = ds.ExecuteSQL("REPACK ogr_shape_53")
     gdal.PopErrorHandler()
     # Should work without any error
-    if gdal.GetLastErrorMsg() != '':
-        return 'fail'
+    assert gdal.GetLastErrorMsg() == ''
 
     # Create a field
     fd = ogr.FieldDefn("foo", ogr.OFTString)
@@ -2243,8 +2030,7 @@ def test_ogr_shape_53():
     gdal.PushErrorHandler('CPLQuietErrorHandler')
     feat = lyr.GetFeature(-1)
     gdal.PopErrorHandler()
-    if feat is not None or gdal.GetLastErrorMsg() == '':
-        return 'fail'
+    assert feat is None and gdal.GetLastErrorMsg() != ''
 
     # SetFeature() on a invalid FID
     gdal.ErrorReset()
@@ -2253,8 +2039,7 @@ def test_ogr_shape_53():
     ret = lyr.SetFeature(feat)
     feat = None
     gdal.PopErrorHandler()
-    if ret == 0:
-        return 'fail'
+    assert ret != 0
 
     # SetFeature() on a invalid FID
     gdal.ErrorReset()
@@ -2264,48 +2049,42 @@ def test_ogr_shape_53():
     ret = lyr.SetFeature(feat)
     feat = None
     gdal.PopErrorHandler()
-    if ret == 0:
-        return 'fail'
+    assert ret != 0
 
     # DeleteFeature() on a invalid FID
     gdal.ErrorReset()
     gdal.PushErrorHandler('CPLQuietErrorHandler')
     ret = lyr.DeleteFeature(-1)
     gdal.PopErrorHandler()
-    if ret == 0:
-        return 'fail'
+    assert ret != 0
 
     feat = ogr.Feature(lyr.GetLayerDefn())
     lyr.CreateFeature(feat)
     feat = None
 
     ret = lyr.DeleteFeature(0)
-    if ret != 0:
-        return 'fail'
+    assert ret == 0
 
     # Try deleting an already deleted feature
     gdal.ErrorReset()
     gdal.PushErrorHandler('CPLQuietErrorHandler')
     ret = lyr.DeleteFeature(0)
     gdal.PopErrorHandler()
-    if ret == 0:
-        return 'fail'
+    assert ret != 0
 
     # Test DeleteField() on a invalid index
     gdal.ErrorReset()
     gdal.PushErrorHandler('CPLQuietErrorHandler')
     ret = lyr.DeleteField(-1)
     gdal.PopErrorHandler()
-    if ret == 0 or gdal.GetLastErrorMsg() == '':
-        return 'fail'
+    assert not (ret == 0 or gdal.GetLastErrorMsg() == '')
 
     # Test ReorderFields() with invalid permutation
     gdal.ErrorReset()
     gdal.PushErrorHandler('CPLQuietErrorHandler')
     ret = lyr.ReorderFields([1])
     gdal.PopErrorHandler()
-    if ret == 0 or gdal.GetLastErrorMsg() == '':
-        return 'fail'
+    assert not (ret == 0 or gdal.GetLastErrorMsg() == '')
 
     # Test AlterFieldDefn() on a invalid index
     gdal.ErrorReset()
@@ -2313,8 +2092,7 @@ def test_ogr_shape_53():
     fd = ogr.FieldDefn("foo2", ogr.OFTString)
     ret = lyr.AlterFieldDefn(-1, fd, 0)
     gdal.PopErrorHandler()
-    if ret == 0 or gdal.GetLastErrorMsg() == '':
-        return 'fail'
+    assert not (ret == 0 or gdal.GetLastErrorMsg() == '')
 
     # Test AlterFieldDefn() when attempting to convert from OFTString to something else
     gdal.ErrorReset()
@@ -2322,16 +2100,14 @@ def test_ogr_shape_53():
     fd = ogr.FieldDefn("foo", ogr.OFTInteger)
     ret = lyr.AlterFieldDefn(0, fd, ogr.ALTER_TYPE_FLAG)
     gdal.PopErrorHandler()
-    if ret == 0 or gdal.GetLastErrorMsg() == '':
-        return 'fail'
+    assert not (ret == 0 or gdal.GetLastErrorMsg() == '')
 
     # Test DROP SPATIAL INDEX ON layer without index
     gdal.ErrorReset()
     gdal.PushErrorHandler('CPLQuietErrorHandler')
     ret = ds.ExecuteSQL("DROP SPATIAL INDEX ON ogr_shape_53")
     gdal.PopErrorHandler()
-    if gdal.GetLastErrorMsg() == '':
-        return 'fail'
+    assert gdal.GetLastErrorMsg() != ''
 
     # Re-create a feature
     feat = ogr.Feature(lyr.GetLayerDefn())
@@ -2345,18 +2121,12 @@ def test_ogr_shape_53():
     ds = ogr.Open('/vsimem/ogr_shape_53.shp')
     lyr = ds.GetLayer(0)
 
-    if lyr.TestCapability(ogr.OLCSequentialWrite) != 0:
-        return 'fail'
-    if lyr.TestCapability(ogr.OLCDeleteFeature) != 0:
-        return 'fail'
-    if lyr.TestCapability(ogr.OLCCreateField) != 0:
-        return 'fail'
-    if lyr.TestCapability(ogr.OLCDeleteField) != 0:
-        return 'fail'
-    if lyr.TestCapability(ogr.OLCReorderFields) != 0:
-        return 'fail'
-    if lyr.TestCapability(ogr.OLCAlterFieldDefn) != 0:
-        return 'fail'
+    assert lyr.TestCapability(ogr.OLCSequentialWrite) == 0
+    assert lyr.TestCapability(ogr.OLCDeleteFeature) == 0
+    assert lyr.TestCapability(ogr.OLCCreateField) == 0
+    assert lyr.TestCapability(ogr.OLCDeleteField) == 0
+    assert lyr.TestCapability(ogr.OLCReorderFields) == 0
+    assert lyr.TestCapability(ogr.OLCAlterFieldDefn) == 0
 
     # Test CreateField()
     fd = ogr.FieldDefn("bar", ogr.OFTString)
@@ -2365,24 +2135,21 @@ def test_ogr_shape_53():
     gdal.PushErrorHandler('CPLQuietErrorHandler')
     ret = lyr.CreateField(fd)
     gdal.PopErrorHandler()
-    if ret == 0 or gdal.GetLastErrorMsg() == '':
-        return 'fail'
+    assert not (ret == 0 or gdal.GetLastErrorMsg() == '')
 
     # Test ReorderFields()
     gdal.ErrorReset()
     gdal.PushErrorHandler('CPLQuietErrorHandler')
     ret = lyr.ReorderFields([0])
     gdal.PopErrorHandler()
-    if ret == 0 or gdal.GetLastErrorMsg() == '':
-        return 'fail'
+    assert not (ret == 0 or gdal.GetLastErrorMsg() == '')
 
     # Test DeleteField()
     gdal.ErrorReset()
     gdal.PushErrorHandler('CPLQuietErrorHandler')
     ret = lyr.DeleteField(0)
     gdal.PopErrorHandler()
-    if ret == 0 or gdal.GetLastErrorMsg() == '':
-        return 'fail'
+    assert not (ret == 0 or gdal.GetLastErrorMsg() == '')
 
     # Test AlterFieldDefn()
     gdal.ErrorReset()
@@ -2390,8 +2157,7 @@ def test_ogr_shape_53():
     fd = ogr.FieldDefn("foo2", ogr.OFTString)
     ret = lyr.AlterFieldDefn(0, fd, 0)
     gdal.PopErrorHandler()
-    if ret == 0 or gdal.GetLastErrorMsg() == '':
-        return 'fail'
+    assert not (ret == 0 or gdal.GetLastErrorMsg() == '')
 
     # Test CreateFeature()
     feat = ogr.Feature(lyr.GetLayerDefn())
@@ -2400,16 +2166,14 @@ def test_ogr_shape_53():
     gdal.PushErrorHandler('CPLQuietErrorHandler')
     ret = lyr.CreateFeature(feat)
     gdal.PopErrorHandler()
-    if ret == 0 or gdal.GetLastErrorMsg() == '':
-        return 'fail'
+    assert not (ret == 0 or gdal.GetLastErrorMsg() == '')
 
     # Test DeleteFeature()
     gdal.ErrorReset()
     gdal.PushErrorHandler('CPLQuietErrorHandler')
     ret = lyr.DeleteFeature(0)
     gdal.PopErrorHandler()
-    if ret == 0 or gdal.GetLastErrorMsg() == '':
-        return 'fail'
+    assert not (ret == 0 or gdal.GetLastErrorMsg() == '')
 
     # Test SetFeature()
     feat = lyr.GetNextFeature()
@@ -2418,24 +2182,21 @@ def test_ogr_shape_53():
     gdal.PushErrorHandler('CPLQuietErrorHandler')
     ret = lyr.SetFeature(feat)
     gdal.PopErrorHandler()
-    if ret == 0 or gdal.GetLastErrorMsg() == '':
-        return 'fail'
+    assert not (ret == 0 or gdal.GetLastErrorMsg() == '')
 
     # Test REPACK
     gdal.ErrorReset()
     gdal.PushErrorHandler('CPLQuietErrorHandler')
     ret = ds.ExecuteSQL("REPACK ogr_shape_53")
     gdal.PopErrorHandler()
-    if gdal.GetLastErrorMsg() == '':
-        return 'fail'
+    assert gdal.GetLastErrorMsg() != ''
 
     # Test RECOMPUTE EXTENT ON
     gdal.ErrorReset()
     gdal.PushErrorHandler('CPLQuietErrorHandler')
     ret = ds.ExecuteSQL("RECOMPUTE EXTENT ON ogr_shape_53")
     gdal.PopErrorHandler()
-    if gdal.GetLastErrorMsg() == '':
-        return 'fail'
+    assert gdal.GetLastErrorMsg() != ''
 
     feat = None
     lyr = None
@@ -2450,8 +2211,7 @@ def test_ogr_shape_53():
     gdal.PushErrorHandler('CPLQuietErrorHandler')
     ret = lyr.DeleteFeature(0)
     gdal.PopErrorHandler()
-    if ret == 0 or gdal.GetLastErrorMsg() == '':
-        return 'fail'
+    assert not (ret == 0 or gdal.GetLastErrorMsg() == '')
 
     # Test REPACK
     ds.ExecuteSQL("REPACK ogr_shape_53")
@@ -2472,8 +2232,7 @@ def test_ogr_shape_53():
     gdal.PushErrorHandler('CPLQuietErrorHandler')
     ret = ds.ExecuteSQL("RECOMPUTE EXTENT ON ogr_shape_53")
     gdal.PopErrorHandler()
-    if gdal.GetLastErrorMsg() == '':
-        return 'fail'
+    assert gdal.GetLastErrorMsg() != ''
 
     lyr = None
     ds = None
@@ -2497,22 +2256,16 @@ def ogr_shape_54_create_layer(ds, layer_index):
 
 def ogr_shape_54_test_layer(ds, layer_index):
     lyr = ds.GetLayerByName('layer%03d' % layer_index)
-    if lyr is None:
-        gdaltest.post_reason('failed for layer %d' % layer_index)
-        return 'fail'
+    assert lyr is not None, ('failed for layer %d' % layer_index)
     lyr.ResetReading()
     feat = lyr.GetNextFeature()
-    if feat is None:
-        gdaltest.post_reason('failed for layer %d' % layer_index)
-        return 'fail'
-    if feat.GetField(0) != 'val%d' % layer_index:
-        gdaltest.post_reason('failed for layer %d' % layer_index)
-        return 'fail'
+    assert feat is not None, ('failed for layer %d' % layer_index)
+    assert feat.GetField(0) == 'val%d' % layer_index, \
+        ('failed for layer %d' % layer_index)
     if (layer_index % 2) == 0:
-        if feat.GetGeometryRef() is None or \
-           feat.GetGeometryRef().ExportToWkt() != 'POINT (%d %d)' % (layer_index, layer_index + 1):
-            gdaltest.post_reason('failed for layer %d' % layer_index)
-            return 'fail'
+        assert (feat.GetGeometryRef() is not None and \
+           feat.GetGeometryRef().ExportToWkt() == 'POINT (%d %d)' % (layer_index, layer_index + 1)), \
+            ('failed for layer %d' % layer_index)
 
     return 'success'
 
@@ -2594,8 +2347,7 @@ def test_ogr_shape_54():
         lyr.ResetReading()
         lyr.GetNextFeature()
         gdal.PopErrorHandler()
-        if gdal.GetLastErrorMsg() == '':
-            return 'fail'
+        assert gdal.GetLastErrorMsg() != ''
     gdal.ErrorReset()
 
     ideletedlayer = 1
@@ -2634,20 +2386,15 @@ def test_ogr_shape_55():
         ret = lyr.CreateField(ogr.FieldDefn('foo%d' % i, ogr.OFTInteger))
         if i == 255:
             gdal.PopErrorHandler()
-            if gdal.GetLastErrorMsg() == '':
-                gdaltest.post_reason('expecting a warning for 256th field added')
-                return 'fail'
-        if ret != 0:
-            gdaltest.post_reason('failed creating field foo%d' % i)
-            return 'fail'
+            assert gdal.GetLastErrorMsg() != '', \
+                'expecting a warning for 256th field added'
+        assert ret == 0, ('failed creating field foo%d' % i)
 
     i = max_field_count
     gdal.PushErrorHandler('CPLQuietErrorHandler')
     ret = lyr.CreateField(ogr.FieldDefn('foo%d' % i, ogr.OFTInteger))
     gdal.PopErrorHandler()
-    if ret == 0:
-        gdaltest.post_reason('should have failed creating field foo%d' % i)
-        return 'fail'
+    assert ret != 0, ('should have failed creating field foo%d' % i)
 
     feat = ogr.Feature(lyr.GetLayerDefn())
     for i in range(max_field_count):
@@ -2682,20 +2429,15 @@ def test_ogr_shape_56():
         ret = lyr.CreateField(ogr.FieldDefn('foo%d' % i, ogr.OFTString))
         if i == 255:
             gdal.PopErrorHandler()
-            if gdal.GetLastErrorMsg() == '':
-                gdaltest.post_reason('expecting a warning for 256th field added')
-                return 'fail'
-        if ret != 0:
-            gdaltest.post_reason('failed creating field foo%d' % i)
-            return 'fail'
+            assert gdal.GetLastErrorMsg() != '', \
+                'expecting a warning for 256th field added'
+        assert ret == 0, ('failed creating field foo%d' % i)
 
     i = max_field_count
     gdal.PushErrorHandler('CPLQuietErrorHandler')
     ret = lyr.CreateField(ogr.FieldDefn('foo%d' % i, ogr.OFTString))
     gdal.PopErrorHandler()
-    if ret == 0:
-        gdaltest.post_reason('should have failed creating field foo%d' % i)
-        return 'fail'
+    assert ret != 0, ('should have failed creating field foo%d' % i)
 
     feat = ogr.Feature(lyr.GetLayerDefn())
     for i in range(max_field_count):
@@ -2729,9 +2471,7 @@ def test_ogr_shape_57():
     lyr.CreateField(field_defn)
     gdal.PopErrorHandler()
     # print(gdal.GetLastErrorMsg())
-    if gdal.GetLastErrorMsg() == '':
-        gdaltest.post_reason('expecting a warning')
-        return 'fail'
+    assert gdal.GetLastErrorMsg() != '', 'expecting a warning'
 
     feat = ogr.Feature(lyr.GetLayerDefn())
     feat.SetField(0, '0123456789' * 27)
@@ -2741,9 +2481,7 @@ def test_ogr_shape_57():
     lyr.CreateFeature(feat)
     gdal.PopErrorHandler()
     # print(gdal.GetLastErrorMsg())
-    if gdal.GetLastErrorMsg() == '':
-        gdaltest.post_reason('expecting a warning')
-        return 'fail'
+    assert gdal.GetLastErrorMsg() != '', 'expecting a warning'
 
     ds = None
 
@@ -2794,11 +2532,8 @@ def test_ogr_shape_58():
         lyr.ResetReading()
         feat = lyr.GetNextFeature()
         geom_read = feat.GetGeometryRef()
-        if geom_read.ExportToWkt() != wkt:
-            gdaltest.post_reason(
-                'did not get expected geom for field %s' % layer_name)
-            print(geom_read.ExportToWkt())
-            return 'fail'
+        assert geom_read.ExportToWkt() == wkt, \
+            ('did not get expected geom for field %s' % layer_name)
 
     ds = None
 
@@ -2821,31 +2556,22 @@ def test_ogr_shape_59():
     feat = shp_lyr.GetNextFeature()
     geom = feat.GetGeometryRef()
 
-    if geom.GetGeometryName() != 'POINT':
-        print(geom.GetGeometryName())
-        gdaltest.post_reason('Geometry of wrong type.')
-        return 'fail'
+    assert geom.GetGeometryName() == 'POINT', 'Geometry of wrong type.'
 
-    if geom.GetCoordinateDimension() != 2:
-        gdaltest.post_reason('dimension wrong.')
-        return 'fail'
+    assert geom.GetCoordinateDimension() == 2, 'dimension wrong.'
 
     if geom.GetPointZM(0) != (1.0, 2.0, 0.0, 3.0):
         print(geom.GetPoint(0))
-        gdaltest.post_reason('Did not get right point result.')
-        return 'fail'
+        pytest.fail('Did not get right point result.')
 
     shp_ds = ogr.Open('data/arcm_with_m.shp')
     shp_lyr = shp_ds.GetLayer(0)
     feat = shp_lyr.GetNextFeature()
     geom = feat.GetGeometryRef()
-    if geom.ExportToIsoWkt() != 'LINESTRING M (0 0 10,1 1 20)':
-        print(geom.ExportToIsoWkt())
-        return 'fail'
+    assert geom.ExportToIsoWkt() == 'LINESTRING M (0 0 10,1 1 20)'
     feat = shp_lyr.GetNextFeature()
     geom = feat.GetGeometryRef()
-    if geom.ExportToIsoWkt() != 'MULTILINESTRING M ((0 0 10,1 1 20),(2 2 30,3 3 40))':
-        return 'fail'
+    assert geom.ExportToIsoWkt() == 'MULTILINESTRING M ((0 0 10,1 1 20),(2 2 30,3 3 40))'
     geom = None
     feat = None
 
@@ -2853,14 +2579,10 @@ def test_ogr_shape_59():
     shp_lyr = shp_ds.GetLayer(0)
     feat = shp_lyr.GetNextFeature()
     geom = feat.GetGeometryRef()
-    if geom.ExportToIsoWkt() != 'POLYGON M ((0 0 10,0 1 20,1 1 30,0 0 40))':
-        print(geom.ExportToIsoWkt())
-        return 'fail'
+    assert geom.ExportToIsoWkt() == 'POLYGON M ((0 0 10,0 1 20,1 1 30,0 0 40))'
     feat = shp_lyr.GetNextFeature()
     geom = feat.GetGeometryRef()
-    if geom.ExportToIsoWkt() != 'POLYGON M ((0 0 10,0 1 20,1 1 30,0 0 40),(0.25 0.25 50,0.75 0.75 60,0.25 0.75 70,0.25 0.25 80))':
-        print(geom.ExportToIsoWkt())
-        return 'fail'
+    assert geom.ExportToIsoWkt() == 'POLYGON M ((0 0 10,0 1 20,1 1 30,0 0 40),(0.25 0.25 50,0.75 0.75 60,0.25 0.75 70,0.25 0.25 80))'
     geom = None
     feat = None
 
@@ -2883,18 +2605,11 @@ def test_ogr_shape_60():
     feat = shp_lyr.GetNextFeature()
     geom = feat.GetGeometryRef()
 
-    if geom.GetGeometryName() != 'POINT':
-        gdaltest.post_reason('Geometry of wrong type.')
-        return 'fail'
+    assert geom.GetGeometryName() == 'POINT', 'Geometry of wrong type.'
 
-    if geom.GetCoordinateDimension() != 3:
-        gdaltest.post_reason('dimension wrong.')
-        return 'fail'
+    assert geom.GetCoordinateDimension() == 3, 'dimension wrong.'
 
-    if geom.GetPoint(0) != (1.0, 2.0, 3.0):
-        print(geom.GetPoint(0))
-        gdaltest.post_reason('Did not get right point result.')
-        return 'fail'
+    assert geom.GetPoint(0) == (1.0, 2.0, 3.0), 'Did not get right point result.'
 
     geom = None
     feat = None
@@ -2924,10 +2639,7 @@ def test_ogr_shape_61():
     feat = None
 
     field_defn = lyr.GetLayerDefn().GetFieldDefn(0)
-    if field_defn.GetWidth() != 80:
-        gdaltest.post_reason('did not get initial field size')
-        print(field_defn.GetWidth())
-        return 'fail'
+    assert field_defn.GetWidth() == 80, 'did not get initial field size'
 
     feat = ogr.Feature(lyr.GetLayerDefn())
     feat.SetField(0, '0123456789' * 9)
@@ -2936,38 +2648,23 @@ def test_ogr_shape_61():
     feat = None
 
     field_defn = lyr.GetLayerDefn().GetFieldDefn(0)
-    if field_defn.GetWidth() != 90:
-        gdaltest.post_reason('did not extend field')
-        print(field_defn.GetWidth())
-        return 'fail'
+    assert field_defn.GetWidth() == 90, 'did not extend field'
 
     field_defn = lyr.GetLayerDefn().GetFieldDefn(1)
-    if field_defn.GetWidth() != 2:
-        gdaltest.post_reason('did not extend field')
-        print(field_defn.GetWidth())
-        return 'fail'
+    assert field_defn.GetWidth() == 2, 'did not extend field'
 
     ds = None
 
     ds = ogr.Open(ds_name)
     lyr = ds.GetLayer(0)
     field_defn = lyr.GetLayerDefn().GetFieldDefn(0)
-    if field_defn.GetWidth() != 90:
-        gdaltest.post_reason('did not get expected field size')
-        print(field_defn.GetWidth())
-        return 'fail'
+    assert field_defn.GetWidth() == 90, 'did not get expected field size'
 
     feat = lyr.GetFeature(1)
     val = feat.GetFieldAsString(0)
-    if val != '0123456789' * 9:
-        gdaltest.post_reason('did not get expected field value')
-        print(val)
-        return 'fail'
+    assert val == '0123456789' * 9, 'did not get expected field value'
     val = feat.GetFieldAsInteger(1)
-    if val != 34:
-        gdaltest.post_reason('did not get expected field value')
-        print(val)
-        return 'fail'
+    assert val == 34, 'did not get expected field value'
 
     return 'success'
 
@@ -3008,10 +2705,7 @@ def test_ogr_shape_62():
 
     # Check
     field_defn = lyr.GetLayerDefn().GetFieldDefn(0)
-    if field_defn.GetWidth() != 4:
-        gdaltest.post_reason('did not get expected field size')
-        print(field_defn.GetWidth())
-        return 'fail'
+    assert field_defn.GetWidth() == 4, 'did not get expected field size'
 
     # Reopen file
     ds = ogr.Open(ds_name, update=1)
@@ -3025,15 +2719,9 @@ def test_ogr_shape_62():
     for expected_value in values:
         feat = lyr.GetNextFeature()
         got_val = feat.GetFieldAsString(0)
-        if got_val != expected_value:
-            gdaltest.post_reason('did not get expected value')
-            print(got_val)
-            return 'fail'
+        assert got_val == expected_value, 'did not get expected value'
         got_val = feat.GetFieldAsInteger(2)
-        if got_val != 12:
-            gdaltest.post_reason('did not get expected value')
-            print(got_val)
-            return 'fail'
+        assert got_val == 12, 'did not get expected value'
 
     ds = None
 
@@ -3048,12 +2736,10 @@ def test_ogr_shape_63():
     ds = ogr.GetDriverByName('ESRI Shapefile').CreateDataSource('/vsimem/ogr_shape_63.dbf')
     lyr = ds.CreateLayer('ogr_shape_63', geom_type=ogr.wkbNone)
     gdaltest.fieldname = '\xc3\xa9'
-    if lyr.CreateField(ogr.FieldDefn(gdaltest.fieldname, ogr.OFTString)) != 0:
-        return 'fail'
+    assert lyr.CreateField(ogr.FieldDefn(gdaltest.fieldname, ogr.OFTString)) == 0
 
     gdaltest.fieldname = '\xc3\xa9\xc3\xa9'
-    if lyr.AlterFieldDefn(0, ogr.FieldDefn(gdaltest.fieldname, ogr.OFTString), ogr.ALTER_NAME_FLAG) != 0:
-        return 'fail'
+    assert lyr.AlterFieldDefn(0, ogr.FieldDefn(gdaltest.fieldname, ogr.OFTString), ogr.ALTER_NAME_FLAG) == 0
 
     chinese_str = struct.pack('B' * 6, 229, 144, 141, 231, 167, 176)
     if sys.version_info >= (3, 0, 0):
@@ -3063,25 +2749,20 @@ def test_ogr_shape_63():
     ret = lyr.AlterFieldDefn(0, ogr.FieldDefn(chinese_str, ogr.OFTString), ogr.ALTER_NAME_FLAG)
     gdal.PopErrorHandler()
 
-    if ret == 0:
-        return 'fail'
+    assert ret != 0
 
     gdal.PushErrorHandler('CPLQuietErrorHandler')
     ret = lyr.CreateField(ogr.FieldDefn(chinese_str, ogr.OFTString))
     gdal.PopErrorHandler()
 
-    if ret == 0:
-        return 'fail'
+    assert ret != 0
 
     ds = None
 
     ds = ogr.Open('/vsimem/ogr_shape_63.dbf')
     lyr = ds.GetLayer(0)
-    if lyr.TestCapability(ogr.OLCStringsAsUTF8) != 1:
-        return 'fail'
-    if lyr.GetLayerDefn().GetFieldDefn(0).GetName() != gdaltest.fieldname:
-        print(gdaltest.fieldname)
-        return 'fail'
+    assert lyr.TestCapability(ogr.OLCStringsAsUTF8) == 1
+    assert lyr.GetLayerDefn().GetFieldDefn(0).GetName() == gdaltest.fieldname
     ds = None
 
     # Set an invalid encoding
@@ -3090,8 +2771,7 @@ def test_ogr_shape_63():
     ds = ogr.Open('/vsimem/ogr_shape_63.dbf')
     lyr = ds.GetLayer(0)
     # TestCapability(OLCStringsAsUTF8) should return FALSE
-    if lyr.TestCapability(ogr.OLCStringsAsUTF8) != 0:
-        return 'fail'
+    assert lyr.TestCapability(ogr.OLCStringsAsUTF8) == 0
     ds = None
 
     gdal.Unlink('/vsimem/ogr_shape_63.dbf')
@@ -3108,8 +2788,7 @@ def test_ogr_shape_64():
     ds = ogr.GetDriverByName('ESRI Shapefile').CreateDataSource('/vsimem/ogr_shape_64')
 
     lyr = ds.CreateLayer('a.b')
-    if lyr.GetName() != 'a.b':
-        return 'fail'
+    assert lyr.GetName() == 'a.b'
     lyr.CreateField(ogr.FieldDefn('foo', ogr.OFTString))
     feat = ogr.Feature(lyr.GetLayerDefn())
     feat.SetField('foo', 'bar')
@@ -3117,23 +2796,20 @@ def test_ogr_shape_64():
     feat = None
 
     lyr = ds.CreateLayer('a.c')
-    if lyr.GetName() != 'a.c':
-        return 'fail'
+    assert lyr.GetName() == 'a.c'
 
     # Test that we cannot create a duplicate layer
     gdal.PushErrorHandler('CPLQuietErrorHandler')
     lyr = ds.CreateLayer('a.b')
     gdal.PopErrorHandler()
-    if lyr is not None:
-        return 'fail'
+    assert lyr is None
 
     ds = None
 
     ds = ogr.Open('/vsimem/ogr_shape_64/a.b.shp')
     lyr = ds.GetLayer(0)
     feat = lyr.GetNextFeature()
-    if feat.GetFieldAsString('foo') != 'bar':
-        return 'fail'
+    assert feat.GetFieldAsString('foo') == 'bar'
     ds = None
 
     gdal.Unlink('/vsimem/ogr_shape_64/a.b.shp')
@@ -3159,9 +2835,7 @@ def test_ogr_shape_65():
     feat = None
     ds = None
 
-    if not gdaltest.isnan(val):
-        print(val)
-        return 'fail'
+    assert gdaltest.isnan(val)
 
     return 'success'
 
@@ -3175,31 +2849,27 @@ def test_ogr_shape_66():
     gdal.PushErrorHandler('CPLQuietErrorHandler')
     lyr = ds.CreateLayer('bar', geom_type=ogr.wkbNone)
     gdal.PopErrorHandler()
-    if lyr is not None:
-        return 'fail'
+    assert lyr is None
     ds = None
 
     ds = ogr.GetDriverByName('ESRI Shapefile').CreateDataSource('/i_dont_exist/bar.shp')
     gdal.PushErrorHandler('CPLQuietErrorHandler')
     lyr = ds.CreateLayer('bar', geom_type=ogr.wkbPoint)
     gdal.PopErrorHandler()
-    if lyr is not None:
-        return 'fail'
+    assert lyr is None
     ds = None
 
     gdal.PushErrorHandler('CPLQuietErrorHandler')
     ds = ogr.GetDriverByName('ESRI Shapefile').CreateDataSource('/i_dont_exist/bar')
     gdal.PopErrorHandler()
-    if ds is not None:
-        return 'fail'
+    assert ds is None
 
     f = open('tmp/foo', 'wb')
     f.close()
     gdal.PushErrorHandler('CPLQuietErrorHandler')
     ds = ogr.GetDriverByName('ESRI Shapefile').CreateDataSource('tmp/foo')
     gdal.PopErrorHandler()
-    if ds is not None:
-        return 'fail'
+    assert ds is None
     os.unlink('tmp/foo')
 
     return 'success'
@@ -3258,9 +2928,8 @@ def test_ogr_shape_68():
             expected_layer_count = 1
         else:
             expected_layer_count = 2
-        if ds.GetLayerCount() != expected_layer_count:
-            gdaltest.post_reason('expected %d layers, got %d' % (expected_layer_count, ds.GetLayerCount()))
-            return 'fail'
+        assert ds.GetLayerCount() == expected_layer_count, \
+            ('expected %d layers, got %d' % (expected_layer_count, ds.GetLayerCount()))
         if i == 1:
             lyr = ds.GetLayerByName('mixedcase')
         else:
@@ -3272,20 +2941,15 @@ def test_ogr_shape_68():
             ds.ExecuteSQL('REPACK MIXEDCASE')
 
         if sys.platform == 'win32':
-            if lyr.GetGeomType() != ogr.wkbPolygon:
-                return 'fail'
+            assert lyr.GetGeomType() == ogr.wkbPolygon
         else:
-            if lyr.GetGeomType() != ogr.wkbNone:
-                return 'fail'
+            assert lyr.GetGeomType() == ogr.wkbNone
             lyr = ds.GetLayerByName('mixedcase')
-            if lyr.GetGeomType() != ogr.wkbPolygon:
-                return 'fail'
+            assert lyr.GetGeomType() == ogr.wkbPolygon
             gdal.PushErrorHandler('CPLQuietErrorHandler')
             ret = lyr.DeleteFeature(0)
             gdal.PopErrorHandler()
-            if ret == 0:
-                gdaltest.post_reason('expected failure on DeleteFeature()')
-                return 'fail'
+            assert ret != 0, 'expected failure on DeleteFeature()'
             # gdal.ErrorReset()
             # gdal.PushErrorHandler('CPLQuietErrorHandler')
             ds.ExecuteSQL('REPACK mixedcase')
@@ -3304,19 +2968,14 @@ def test_ogr_shape_68():
         new_shx_size = os.stat('tmp/mixedcase/mixedcase.shx').st_size
         new_dbf_size = os.stat('tmp/mixedcase/MIXEDCASE.DBF').st_size
 
-        if new_dbf_size == ori_dbf_size:
-            return 'fail'
+        assert new_dbf_size != ori_dbf_size
 
         if sys.platform == 'win32':
-            if new_shp_size == ori_shp_size:
-                return 'fail'
-            if new_shx_size == ori_shx_size:
-                return 'fail'
+            assert new_shp_size != ori_shp_size
+            assert new_shx_size != ori_shx_size
         else:
-            if new_shp_size != ori_shp_size:
-                return 'fail'
-            if new_shx_size != ori_shx_size:
-                return 'fail'
+            assert new_shp_size == ori_shp_size
+            assert new_shx_size == ori_shx_size
 
     return 'success'
 
@@ -3339,11 +2998,9 @@ def test_ogr_shape_69():
 
     ds = ogr.Open('/vsimem/ogr_shape_69.shp')
     lyr = ds.GetLayer(0)
-    if lyr.GetLayerDefn().GetFieldDefn(0).GetType() != ogr.OFTReal:
-        return 'fail'
+    assert lyr.GetLayerDefn().GetFieldDefn(0).GetType() == ogr.OFTReal
     feat = lyr.GetNextFeature()
-    if feat.GetField(0) != 123456:
-        return 'fail'
+    assert feat.GetField(0) == 123456
     ds = None
 
     ogr.GetDriverByName('ESRI Shapefile').DeleteDataSource('/vsimem/ogr_shape_69.shp')
@@ -3387,8 +3044,7 @@ def test_ogr_shape_70():
 
     ogr.GetDriverByName('ESRI Shapefile').DeleteDataSource('tmp/ogr_shape_70.shp')
 
-    if errmsg == '':
-        return 'fail'
+    assert errmsg != ''
 
     return 'success'
 
@@ -3419,8 +3075,7 @@ def test_ogr_shape_71():
 
     ogr.GetDriverByName('ESRI Shapefile').DeleteDataSource('tmp/ogr_shape_71.shp')
 
-    if not ok:
-        return 'fail'
+    assert ok
 
     return 'success'
 
@@ -3455,8 +3110,7 @@ def test_ogr_shape_72():
     gdal.PushErrorHandler('CPLQuietErrorHandler')
     ret = lyr.CreateFeature(feat)
     gdal.PopErrorHandler()
-    if ret == 0:
-        return 'fail'
+    assert ret != 0
     ds = None
 
     f = open('tmp/ogr_shape_72.shp', 'rb+')
@@ -3475,8 +3129,7 @@ def test_ogr_shape_72():
     gdal.PushErrorHandler('CPLQuietErrorHandler')
     ret = lyr.CreateFeature(feat)
     gdal.PopErrorHandler()
-    if ret == 0:
-        return 'fail'
+    assert ret != 0
     ds = None
 
     # Test creating a feature over 2 GB file limit -> should succeed with warning
@@ -3488,18 +3141,15 @@ def test_ogr_shape_72():
     gdal.PushErrorHandler('CPLQuietErrorHandler')
     ret = lyr.CreateFeature(feat)
     gdal.PopErrorHandler()
-    if ret != 0:
-        return 'fail'
-    if gdal.GetLastErrorMsg().find('2GB file size limit reached') < 0:
-        gdaltest.post_reason('did not find expected warning')
-        return 'fail'
+    assert ret == 0
+    assert gdal.GetLastErrorMsg().find('2GB file size limit reached') >= 0, \
+        'did not find expected warning'
     ds = None
 
     ds = ogr.Open('tmp/ogr_shape_72.shp')
     lyr = ds.GetLayer(0)
     feat = lyr.GetFeature(1)
-    if feat.GetGeometryRef().ExportToWkt() != 'POINT (7 8)':
-        return 'fail'
+    assert feat.GetGeometryRef().ExportToWkt() == 'POINT (7 8)'
     ds = None
 
     return 'success'
@@ -3578,28 +3228,20 @@ def test_ogr_shape_74():
 def test_ogr_shape_75():
 
     ds = gdal.OpenEx('data/poly.shp')
-    if ds.GetFileList() != ['data/poly.shp', 'data/poly.shx', 'data/poly.dbf', 'data/poly.PRJ'] and \
-       ds.GetFileList() != ['data/poly.shp', 'data/poly.shx', 'data/poly.dbf', 'data/poly.prj']:
-        print(ds.GetFileList())
-        return 'fail'
+    assert (ds.GetFileList() == ['data/poly.shp', 'data/poly.shx', 'data/poly.dbf', 'data/poly.PRJ'] or \
+       ds.GetFileList() == ['data/poly.shp', 'data/poly.shx', 'data/poly.dbf', 'data/poly.prj'])
     ds = None
 
     ds = gdal.OpenEx('data/idlink.dbf')
-    if ds.GetFileList() != ['data/idlink.dbf']:
-        print(ds.GetFileList())
-        return 'fail'
+    assert ds.GetFileList() == ['data/idlink.dbf']
     ds = None
 
     ds = gdal.OpenEx('data/testpoly.shp')
-    if ds.GetFileList() != ['data/testpoly.shp', 'data/testpoly.shx', 'data/testpoly.dbf', 'data/testpoly.qix']:
-        print(ds.GetFileList())
-        return 'fail'
+    assert ds.GetFileList() == ['data/testpoly.shp', 'data/testpoly.shx', 'data/testpoly.dbf', 'data/testpoly.qix']
     ds = None
 
     ds = gdal.OpenEx('data/emptyshapefilewithsbn.shx')
-    if ds.GetFileList() != ['data/emptyshapefilewithsbn.shp', 'data/emptyshapefilewithsbn.shx', 'data/emptyshapefilewithsbn.sbn', 'data/emptyshapefilewithsbn.sbx']:
-        print(ds.GetFileList())
-        return 'fail'
+    assert ds.GetFileList() == ['data/emptyshapefilewithsbn.shp', 'data/emptyshapefilewithsbn.shx', 'data/emptyshapefilewithsbn.sbn', 'data/emptyshapefilewithsbn.sbx']
     ds = None
 
     return 'success'
@@ -3613,8 +3255,7 @@ def test_ogr_shape_76():
     ds = ogr.Open('data/prjwithutf8bom.shp')
     lyr = ds.GetLayer(0)
     sr = lyr.GetSpatialRef()
-    if sr.ExportToWkt().find('GEOGCS["NAD83"') != 0:
-        return 'fail'
+    assert sr.ExportToWkt().find('GEOGCS["NAD83"') == 0
 
     return 'success'
 
@@ -3628,8 +3269,7 @@ def test_ogr_shape_77():
     lyr = ds.GetLayer(0)
     feat = lyr.GetNextFeature()
     geom = feat.GetGeometryRef()
-    if geom.ExportToWkt() != 'LINESTRING (0 1,2 3)':
-        return 'fail'
+    assert geom.ExportToWkt() == 'LINESTRING (0 1,2 3)'
 
     return 'success'
 
@@ -3657,9 +3297,7 @@ def test_ogr_shape_78():
     f = ogr.Feature(lyr.GetLayerDefn())
     f.SetField('dblfield', (2**53) * 1.0)
     lyr.CreateFeature(f)
-    if gdal.GetLastErrorMsg() != '':
-        gdaltest.post_reason('got unexpected error/warning')
-        return 'fail'
+    assert gdal.GetLastErrorMsg() == '', 'got unexpected error/warning'
 
     # Field width too small
     gdal.ErrorReset()
@@ -3668,9 +3306,7 @@ def test_ogr_shape_78():
     gdal.PushErrorHandler('CPLQuietErrorHandler')
     lyr.CreateFeature(f)
     gdal.PopErrorHandler()
-    if gdal.GetLastErrorMsg() == '':
-        gdaltest.post_reason('did not get expected error/warning')
-        return 'fail'
+    assert gdal.GetLastErrorMsg() != '', 'did not get expected error/warning'
 
     # Likely precision loss
     gdal.ErrorReset()
@@ -3679,9 +3315,7 @@ def test_ogr_shape_78():
     gdal.PushErrorHandler('CPLQuietErrorHandler')
     lyr.CreateFeature(f)
     gdal.PopErrorHandler()
-    if gdal.GetLastErrorMsg() == '':
-        gdaltest.post_reason('did not get expected error/warning')
-        return 'fail'
+    assert gdal.GetLastErrorMsg() != '', 'did not get expected error/warning'
 
     gdal.ErrorReset()
     ds = None
@@ -3724,8 +3358,7 @@ def test_ogr_shape_79():
 
     ds = ogr.Open('/vsimem/ogr_shape_79.dbf')
     lyr = ds.GetLayer(0)
-    if lyr.GetLayerDefn().GetFieldCount() != 2:
-        return 'fail'
+    assert lyr.GetLayerDefn().GetFieldCount() == 2
     ds = None
 
     return 'success'
@@ -3739,9 +3372,7 @@ def test_ogr_shape_80():
     ds = ogr.Open('data/extentnan.shp')
     lyr = ds.GetLayer(0)
     extent = lyr.GetExtent()
-    if extent is not None and extent[0] != extent[0]:
-        print(extent)
-        return 'fail'
+    assert extent is None or extent[0] == extent[0]
     ds = None
     return 'success'
 
@@ -3775,8 +3406,7 @@ def test_ogr_shape_81():
     # Should be a no-op
     ds.ExecuteSQL('REPACK ogr_shape_81')
     size_after = gdal.VSIStatL('/vsimem/ogr_shape_81.shp').size
-    if size_after != size_before:
-        return 'fail'
+    assert size_after == size_before
 
     f = lyr.GetNextFeature()
     f.SetGeometry(ogr.CreateGeometryFromWkt('LINESTRING(2 2,3 3)'))
@@ -3785,37 +3415,32 @@ def test_ogr_shape_81():
     # Should be a no-op
     ds.ExecuteSQL('REPACK ogr_shape_81')
     size_after = gdal.VSIStatL('/vsimem/ogr_shape_81.shp').size
-    if size_after != size_before:
-        return 'fail'
+    assert size_after == size_before
 
     # Writes a longer geometry. So .shp will be extended
     f.SetGeometry(ogr.CreateGeometryFromWkt('LINESTRING(2 2,3 3,4 4)'))
     lyr.SetFeature(f)
     size_after = gdal.VSIStatL('/vsimem/ogr_shape_81.shp').size
-    if size_after == size_before:
-        return 'fail'
+    assert size_after != size_before
 
     # Should do something
     size_before = size_after
     ds.ExecuteSQL('REPACK ogr_shape_81')
     size_after = gdal.VSIStatL('/vsimem/ogr_shape_81.shp').size
-    if size_after == size_before:
-        return 'fail'
+    assert size_after != size_before
 
     # Writes a shorter geometry, so .shp should not change size.
     size_before = size_after
     f.SetGeometry(ogr.CreateGeometryFromWkt('LINESTRING(3 3,4 4)'))
     lyr.SetFeature(f)
     size_after = gdal.VSIStatL('/vsimem/ogr_shape_81.shp').size
-    if size_after != size_before:
-        return 'fail'
+    assert size_after == size_before
     size_before = size_after
 
     # Should do something
     ds.ExecuteSQL('REPACK ogr_shape_81')
     size_after = gdal.VSIStatL('/vsimem/ogr_shape_81.shp').size
-    if size_after == size_before:
-        return 'fail'
+    assert size_after != size_before
 
     ds = None
 
@@ -3839,9 +3464,7 @@ def test_ogr_shape_82():
 
     result = gdaltest.shape_lyr.CreateField(field_defn)
 
-    if result != 0:
-        gdaltest.post_reason('failed to create new field.')
-        return 'fail'
+    assert result == 0, 'failed to create new field.'
 
     # Insert feature with long string in Russian.  Shoe repair ad.
     feat = ogr.Feature(feature_def=gdaltest.shape_lyr.GetLayerDefn())
@@ -3885,16 +3508,10 @@ def test_ogr_shape_82():
 
     # Read strings and compare with correct values.
     feat = gdaltest.shape_lyr.GetFeature(0)  # rus
-    if feat.cut_field != result_rus:
-        gdaltest.post_reason('Wrong rus string cut')
-        return 'fail'
+    assert feat.cut_field == result_rus, 'Wrong rus string cut'
 
     feat = gdaltest.shape_lyr.GetFeature(1)  # en
-    if feat.cut_field != result_en:
-        gdaltest.post_reason('Wrong en string cut')
-        print(feat.cut_field)
-        print(result_en)
-        return 'fail'
+    assert feat.cut_field == result_en, 'Wrong en string cut'
 
     return 'success'
 
@@ -3906,16 +3523,14 @@ def test_ogr_shape_83():
 
     ds = ogr.GetDriverByName('ESRI Shapefile').CreateDataSource('/vsimem/ogr_shape_83.shp')
     lyr = ds.CreateLayer('ogr_shape_83', geom_type=ogr.wkbCurvePolygon)
-    if lyr.GetGeomType() != ogr.wkbPolygon:
-        return 'fail'
+    assert lyr.GetGeomType() == ogr.wkbPolygon
     f = ogr.Feature(lyr.GetLayerDefn())
     f.SetGeometry(ogr.CreateGeometryFromWkt('CURVEPOLYGON((0 0,0 1,1 1,1 0,0 0))'))
     lyr.CreateFeature(f)
     f = None
 
     f = lyr.GetFeature(0)
-    if f.GetGeometryRef().GetGeometryType() != ogr.wkbPolygon:
-        return 'fail'
+    assert f.GetGeometryRef().GetGeometryType() == ogr.wkbPolygon
     ds = None
 
     return 'success'
@@ -3934,8 +3549,7 @@ def test_ogr_shape_84():
     f = None
     ds = None
 
-    if gdal.VSIStatL('/vsimem/ogr_shape_84.qix') is None:
-        return 'fail'
+    assert gdal.VSIStatL('/vsimem/ogr_shape_84.qix') is not None
 
     return 'success'
 
@@ -3958,13 +3572,10 @@ def test_ogr_shape_85():
 
     ds = ogr.Open('/vsimem/ogr_shape_85.shp', update=1)
     lyr = ds.GetLayer(0)
-    if lyr.GetLayerDefn().GetFieldDefn(0).GetType() != ogr.OFTInteger:
-        return 'fail'
-    if lyr.GetLayerDefn().GetFieldDefn(1).GetType() != ogr.OFTInteger64:
-        return 'fail'
+    assert lyr.GetLayerDefn().GetFieldDefn(0).GetType() == ogr.OFTInteger
+    assert lyr.GetLayerDefn().GetFieldDefn(1).GetType() == ogr.OFTInteger64
     f = lyr.GetNextFeature()
-    if f.GetField(0) != 123456789 or f.GetField(1) != 123456789012345678:
-        return 'fail'
+    assert f.GetField(0) == 123456789 and f.GetField(1) == 123456789012345678
     # Passing from 9 to 10 figures causes "promotion" to Integer64
     f.SetField(0, 2000000000)
     # Passing from 18 to 19 figures causes "promotion" to Real
@@ -3974,25 +3585,19 @@ def test_ogr_shape_85():
 
     ds = ogr.Open('/vsimem/ogr_shape_85.shp')
     lyr = ds.GetLayer(0)
-    if lyr.GetLayerDefn().GetFieldDefn(0).GetType() != ogr.OFTInteger64:
-        return 'fail'
-    if lyr.GetLayerDefn().GetFieldDefn(1).GetType() != ogr.OFTReal:
-        return 'fail'
+    assert lyr.GetLayerDefn().GetFieldDefn(0).GetType() == ogr.OFTInteger64
+    assert lyr.GetLayerDefn().GetFieldDefn(1).GetType() == ogr.OFTReal
     f = lyr.GetNextFeature()
-    if f.GetField(0) != 2000000000 or f.GetField(1) != 9000000000000000000:
-        return 'fail'
+    assert f.GetField(0) == 2000000000 and f.GetField(1) == 9000000000000000000
     ds = None
 
     # Test open option ADJUST_TYPE
     ds = gdal.OpenEx('/vsimem/ogr_shape_85.shp', gdal.OF_VECTOR, open_options=['ADJUST_TYPE=YES'])
     lyr = ds.GetLayer(0)
-    if lyr.GetLayerDefn().GetFieldDefn(0).GetType() != ogr.OFTInteger:
-        return 'fail'
-    if lyr.GetLayerDefn().GetFieldDefn(1).GetType() != ogr.OFTInteger64:
-        return 'fail'
+    assert lyr.GetLayerDefn().GetFieldDefn(0).GetType() == ogr.OFTInteger
+    assert lyr.GetLayerDefn().GetFieldDefn(1).GetType() == ogr.OFTInteger64
     f = lyr.GetNextFeature()
-    if f.GetField(0) != 2000000000 or f.GetField(1) != 9000000000000000000:
-        return 'fail'
+    assert f.GetField(0) == 2000000000 and f.GetField(1) == 9000000000000000000
     ds = None
 
     ogr.GetDriverByName('ESRI Shapefile').DeleteDataSource('/vsimem/ogr_shape_85.shp')
@@ -4005,19 +3610,16 @@ def test_ogr_shape_85():
     lyr.CreateFeature(f)
     fd = ogr.FieldDefn("foo", ogr.OFTInteger64)
     ret = lyr.AlterFieldDefn(0, fd, ogr.ALTER_TYPE_FLAG)
-    if ret != 0:
-        return 'fail'
+    assert ret == 0
     f.SetField(0, 123456789012345678)
     lyr.SetFeature(f)
     ds = None
 
     ds = ogr.Open('/vsimem/ogr_shape_85.shp', update=1)
     lyr = ds.GetLayer(0)
-    if lyr.GetLayerDefn().GetFieldDefn(0).GetType() != ogr.OFTInteger64:
-        return 'fail'
+    assert lyr.GetLayerDefn().GetFieldDefn(0).GetType() == ogr.OFTInteger64
     f = lyr.GetNextFeature()
-    if f.GetField(0) != 123456789012345678:
-        return 'fail'
+    assert f.GetField(0) == 123456789012345678
     ds = None
 
     return 'success'
@@ -4034,8 +3636,7 @@ def test_ogr_shape_86():
     f = sql_lyr.GetNextFeature()
     val = f.GetField(0)
     ds.ReleaseResultSet(sql_lyr)
-    if val != 6:
-        return 'fail'
+    assert val == 6
 
     return 'success'
 
@@ -4048,8 +3649,7 @@ def test_ogr_shape_87():
     ds = ogr.Open('data/weird_header_length.dbf')
     lyr = ds.GetLayer(0)
     f = lyr.GetNextFeature()
-    if f.GetField(0) != 1:
-        return 'fail'
+    assert f.GetField(0) == 1
 
     return 'success'
 
@@ -4110,8 +3710,7 @@ def test_ogr_shape_89():
     lyr = ds.GetLayer(0)
     with gdaltest.error_handler():
         f = lyr.GetNextFeature()
-    if f is not None and f.GetGeometryRef() is not None:
-        return 'fail'
+    assert f is None or f.GetGeometryRef() is None
     ds = None
 
     f = gdal.VSIFOpenL('/vsimem/ogr_shape_89.shp', 'rb+')
@@ -4123,8 +3722,7 @@ def test_ogr_shape_89():
     lyr = ds.GetLayer(0)
     f = lyr.GetNextFeature()
     g = f.GetGeometryRef()
-    if g.GetPointCount() != 2:
-        return 'fail'
+    assert g.GetPointCount() == 2
 
     ds = None
 
@@ -4155,8 +3753,7 @@ def test_ogr_shape_90():
 
     ds = ogr.Open('/vsimem/ogr_shape_90.shp')
     lyr = ds.GetLayer(0)
-    if lyr.GetFeatureCount() != 1:
-        return 'fail'
+    assert lyr.GetFeatureCount() == 1
 
     # Now it is consistent
     f = gdal.VSIFOpenL('/vsimem/ogr_shape_90.shx', 'rb+')
@@ -4166,8 +3763,7 @@ def test_ogr_shape_90():
 
     ds = ogr.Open('/vsimem/ogr_shape_90.shp')
     lyr = ds.GetLayer(0)
-    if lyr.GetFeatureCount() != 1024 * 1024:
-        return 'fail'
+    assert lyr.GetFeatureCount() == 1024 * 1024
 
     ds = None
 
@@ -4201,9 +3797,7 @@ def test_ogr_shape_92():
     lyr = ds.GetLayer(0)
     f = lyr.GetNextFeature()
     wkt = f.GetGeometryRef().ExportToIsoWkt()
-    if wkt != 'MULTIPOINT Z ((0 1 2),(3 4 5))':
-        print(wkt)
-        return 'fail'
+    assert wkt == 'MULTIPOINT Z ((0 1 2),(3 4 5))'
 
     return 'success'
 
@@ -4217,9 +3811,7 @@ def test_ogr_shape_93():
     lyr = ds.GetLayer(0)
     f = lyr.GetNextFeature()
     wkt = f.GetGeometryRef().ExportToIsoWkt()
-    if wkt != 'POINT Z (1 2 3)':
-        print(wkt)
-        return 'fail'
+    assert wkt == 'POINT Z (1 2 3)'
 
     return 'success'
 
@@ -4269,9 +3861,8 @@ def test_ogr_shape_94():
             else:
                 lyr = ds.CreateLayer('ogr_shape_94', geom_type=geom_type)
             test_lyr_geom_type = ogr.GT_Flatten(geom_type) != ogr.wkbMultiLineString and ogr.GT_Flatten(geom_type) != ogr.wkbMultiPolygon
-            if test_lyr_geom_type and lyr.GetGeomType() != geom_type:
-                print(i, shpt, geom_type, wkt, lyr.GetGeomType())
-                return 'fail'
+            assert not test_lyr_geom_type or lyr.GetGeomType() == geom_type, \
+                (i, shpt, geom_type, wkt, lyr.GetGeomType())
             f = ogr.Feature(lyr.GetLayerDefn())
             f.SetGeometry(ogr.CreateGeometryFromWkt(wkt))
             lyr.CreateFeature(f)
@@ -4279,9 +3870,8 @@ def test_ogr_shape_94():
             ds = None
             ds = ogr.Open('/vsimem/ogr_shape_94.shp')
             lyr = ds.GetLayer(0)
-            if test_lyr_geom_type and lyr.GetGeomType() != geom_type:
-                print(shpt, geom_type, wkt, lyr.GetGeomType())
-                return 'fail'
+            assert not test_lyr_geom_type or lyr.GetGeomType() == geom_type, \
+                (shpt, geom_type, wkt, lyr.GetGeomType())
             f = lyr.GetNextFeature()
             if f.GetGeometryRef().ExportToIsoWkt() != wkt:
                 if expected_fail:
@@ -4302,36 +3892,25 @@ def test_ogr_shape_95():
 
     ds = gdal.OpenEx('data/pointzm_with_all_nodata_m.shp')
     lyr = ds.GetLayer(0)
-    if lyr.GetGeomType() != ogr.wkbPoint25D:
-        print(lyr.GetGeomType())
-        return 'fail'
+    assert lyr.GetGeomType() == ogr.wkbPoint25D
     f = lyr.GetNextFeature()
-    if f.GetGeometryRef().ExportToIsoWkt() != 'POINT Z (1 2 3)':
-        print(lyr.GetGeomType())
-        return 'fail'
+    assert f.GetGeometryRef().ExportToIsoWkt() == 'POINT Z (1 2 3)', lyr.GetGeomType()
 
     ds = gdal.OpenEx('data/pointzm_with_all_nodata_m.shp', open_options=['ADJUST_GEOM_TYPE=NO'])
     lyr = ds.GetLayer(0)
-    if lyr.GetGeomType() != ogr.wkbPointZM:
-        print(lyr.GetGeomType())
-        return 'fail'
+    assert lyr.GetGeomType() == ogr.wkbPointZM
     f = lyr.GetNextFeature()
-    if ogrtest.check_feature_geometry(f, ogr.CreateGeometryFromWkt('POINT ZM (1 2 3 -1.79769313486232e+308)')) != 0:
-        print(f.GetGeometryRef().ExportToIsoWkt())
-        return 'fail'
+    assert ogrtest.check_feature_geometry(f, ogr.CreateGeometryFromWkt('POINT ZM (1 2 3 -1.79769313486232e+308)')) == 0, \
+        f.GetGeometryRef().ExportToIsoWkt()
 
     # The shape with a non nodata M is the second one
     ds = gdal.OpenEx('data/pointzm_with_one_valid_m.shp', open_options=['ADJUST_GEOM_TYPE=FIRST_SHAPE'])
     lyr = ds.GetLayer(0)
-    if lyr.GetGeomType() != ogr.wkbPoint25D:
-        print(lyr.GetGeomType())
-        return 'fail'
+    assert lyr.GetGeomType() == ogr.wkbPoint25D
 
     ds = gdal.OpenEx('data/pointzm_with_one_valid_m.shp', open_options=['ADJUST_GEOM_TYPE=ALL_SHAPES'])
     lyr = ds.GetLayer(0)
-    if lyr.GetGeomType() != ogr.wkbPointZM:
-        print(lyr.GetGeomType())
-        return 'fail'
+    assert lyr.GetGeomType() == ogr.wkbPointZM
 
     return 'success'
 
@@ -4351,9 +3930,7 @@ def test_ogr_shape_96():
     ds = ogr.Open('/vsimem/ogr_shape_96.shp', update=1)
     lyr = ds.GetLayer(0)
     f = lyr.GetNextFeature()
-    if f.GetGeometryRef().ExportToIsoWkt() != 'POINT M (1 2 3)':
-        print(f.GetGeometryRef().ExportToIsoWkt())
-        return 'fail'
+    assert f.GetGeometryRef().ExportToIsoWkt() == 'POINT M (1 2 3)'
     f.SetGeometry(ogr.CreateGeometryFromWkt('POINT M (1 2 4)'))
     lyr.SetFeature(f)
     ds = None
@@ -4361,9 +3938,7 @@ def test_ogr_shape_96():
     ds = ogr.Open('/vsimem/ogr_shape_96.shp')
     lyr = ds.GetLayer(0)
     f = lyr.GetNextFeature()
-    if f.GetGeometryRef().ExportToIsoWkt() != 'POINT M (1 2 4)':
-        print(f.GetGeometryRef().ExportToIsoWkt())
-        return 'fail'
+    assert f.GetGeometryRef().ExportToIsoWkt() == 'POINT M (1 2 4)'
     ds = None
 
     ogr.GetDriverByName('ESRI Shapefile').DeleteDataSource('/vsimem/ogr_shape_96.shp')
@@ -4386,9 +3961,7 @@ def test_ogr_shape_97():
     ds = ogr.Open('/vsimem/ogr_shape_97.shp', update=1)
     lyr = ds.GetLayer(0)
     f = lyr.GetNextFeature()
-    if f.GetGeometryRef().ExportToIsoWkt() != 'POINT ZM (1 2 3 4)':
-        print(f.GetGeometryRef().ExportToIsoWkt())
-        return 'fail'
+    assert f.GetGeometryRef().ExportToIsoWkt() == 'POINT ZM (1 2 3 4)'
     f.SetGeometry(ogr.CreateGeometryFromWkt('POINT ZM (1 2 5 6)'))
     lyr.SetFeature(f)
     ds = None
@@ -4396,9 +3969,7 @@ def test_ogr_shape_97():
     ds = ogr.Open('/vsimem/ogr_shape_97.shp')
     lyr = ds.GetLayer(0)
     f = lyr.GetNextFeature()
-    if f.GetGeometryRef().ExportToIsoWkt() != 'POINT ZM (1 2 5 6)':
-        print(f.GetGeometryRef().ExportToIsoWkt())
-        return 'fail'
+    assert f.GetGeometryRef().ExportToIsoWkt() == 'POINT ZM (1 2 5 6)'
     ds = None
 
     ogr.GetDriverByName('ESRI Shapefile').DeleteDataSource('/vsimem/ogr_shape_97.shp')
@@ -4420,9 +3991,7 @@ def test_ogr_shape_98():
     shp_ds = ogr.Open('tmp/can_caps.shp', update=1)
     shp_lyr = shp_ds.GetLayer(0)
 
-    if shp_lyr.GetFeatureCount() != 13:
-        gdaltest.post_reason('Got wrong number of features.')
-        return 'fail'
+    assert shp_lyr.GetFeatureCount() == 13, 'Got wrong number of features.'
 
     shp_lyr = None
     shp_ds = None
@@ -4435,9 +4004,7 @@ def test_ogr_shape_98():
     os.remove('tmp/can_caps.shp')
     os.remove('tmp/can_caps.shx')
 
-    if ref_shx != got_shx:
-        gdaltest.post_reason('Rebuilt shx is different from original shx.')
-        return 'fail'
+    assert ref_shx == got_shx, 'Rebuilt shx is different from original shx.'
 
     return 'success'
 
@@ -4481,10 +4048,7 @@ def test_ogr_shape_99():
     AUTHORITY["EPSG","21781"]]"""
     ds = None
 
-    if got_wkt != expected_wkt:
-        gdaltest.post_reason('Projections differ')
-        print(got_wkt)
-        return 'fail'
+    assert got_wkt == expected_wkt, 'Projections differ'
 
     ogr.GetDriverByName('ESRI Shapefile').DeleteDataSource('/vsimem/ogr_shape_99.shp')
 
@@ -4532,15 +4096,10 @@ def test_ogr_shape_100():
 
         gdal.SetConfigOption('OGR_SHAPE_PACK_IN_PLACE', old_val)
 
-        if gdal.GetLastErrorMsg() != '':
-            print(variant)
-            return 'fail'
+        assert gdal.GetLastErrorMsg() == '', variant
 
         for ext in ['dbf', 'shp', 'shx', 'cpg']:
-            if gdal.VSIStatL('tmp/ogr_shape_100_packed.' + ext) is not None:
-                print(variant)
-                print(ext)
-                return 'fail'
+            assert gdal.VSIStatL('tmp/ogr_shape_100_packed.' + ext) is None, variant
 
         f = lyr.GetFeature(0)
         if f['foo'] != '2' or f.GetGeometryRef().ExportToWkt() != 'LINESTRING (1 1,2 2,3 3)':
@@ -4549,22 +4108,16 @@ def test_ogr_shape_100():
             return 'fail'
         with gdaltest.error_handler():
             f = lyr.GetFeature(1)
-        if f is not None:
-            print(variant)
-            return 'fail'
+        assert f is None, variant
         lyr.ResetReading()
-        if lyr.GetFeatureCount() != 1:
-            print(variant)
-            return 'fail'
+        assert lyr.GetFeatureCount() == 1, variant
         f = lyr.GetNextFeature()
         if f['foo'] != '2' or f.GetGeometryRef().ExportToWkt() != 'LINESTRING (1 1,2 2,3 3)':
             print(variant)
             f.DumpReadable()
             return 'fail'
         f = lyr.GetNextFeature()
-        if f is not None:
-            print(variant)
-            return 'fail'
+        assert f is None, variant
         f = ogr.Feature(lyr.GetLayerDefn())
         f.SetGeometry(ogr.CreateGeometryFromWkt('LINESTRING (3 3,4 4,5 5,6 6)'))
         f.SetField('foo', '3')
@@ -4574,9 +4127,7 @@ def test_ogr_shape_100():
 
         ds = ogr.Open('tmp/ogr_shape_100.shp')
         lyr = ds.GetLayer(0)
-        if lyr.GetFeatureCount() != 2:
-            print(variant)
-            return 'fail'
+        assert lyr.GetFeatureCount() == 2, variant
         f = lyr.GetNextFeature()
         if f['foo'] != '2' or f.GetGeometryRef().ExportToWkt() != 'LINESTRING (1 1,2 2,3 3)':
             print(variant)
@@ -4588,9 +4139,7 @@ def test_ogr_shape_100():
             f.DumpReadable()
             return 'fail'
         f = lyr.GetNextFeature()
-        if f is not None:
-            print(variant)
-            return 'fail'
+        assert f is None, variant
         ds = None
 
         ogr.GetDriverByName('ESRI Shapefile').DeleteDataSource('tmp/ogr_shape_100.shp')
@@ -4624,26 +4173,20 @@ def test_ogr_shape_101():
             ds = None
         else:
             ds.SyncToDisk()
-            if lyr.GetFeatureCount() != 1:
-                print(i)
-                return 'fail'
+            assert lyr.GetFeatureCount() == 1, i
             # No-op
             ds.ExecuteSQL('REPACK ogr_shape_101')
 
         ds_read = ogr.Open('/vsimem/ogr_shape_101.shp')
         lyr = ds_read.GetLayer(0)
-        if lyr.GetFeatureCount() != 1:
-            print(i)
-            return 'fail'
+        assert lyr.GetFeatureCount() == 1, i
         f = lyr.GetNextFeature()
         if f.GetFID() != 0 or f['foo'] != '2' or f.GetGeometryRef().ExportToWkt() != 'LINESTRING (1 1,2 2,3 3)':
             print(i)
             f.DumpReadable()
             return 'fail'
         f = lyr.GetNextFeature()
-        if f is not None:
-            print(i)
-            return 'fail'
+        assert f is None, i
 
         ds = None
         ds_read = None
@@ -4664,18 +4207,14 @@ def test_ogr_shape_101():
 
             ds = ogr.Open('/vsimem/ogr_shape_101.shp')
             lyr = ds.GetLayer(0)
-            if lyr.GetFeatureCount() != 1:
-                print(i)
-                return 'fail'
+            assert lyr.GetFeatureCount() == 1, i
             f = lyr.GetNextFeature()
             if f.GetFID() != 0 or f['foo'] != '3' or f.GetGeometryRef().ExportToWkt() != 'LINESTRING (3 3,4 4,5 5,6 6)':
                 print(i)
                 f.DumpReadable()
                 return 'fail'
             f = lyr.GetNextFeature()
-            if f is not None:
-                print(i)
-                return 'fail'
+            assert f is None, i
             ds = None
 
             # Test disabling auto-repack on update
@@ -4691,9 +4230,7 @@ def test_ogr_shape_101():
 
             ds = ogr.Open('/vsimem/ogr_shape_101.shp')
             lyr = ds.GetLayer(0)
-            if lyr.GetFeatureCount() != 2:
-                print(i)
-                return 'fail'
+            assert lyr.GetFeatureCount() == 2, i
             f = lyr.GetNextFeature()
             if f.GetFID() != 1 or f['foo'] != '4':
                 print(i)
@@ -4766,9 +4303,7 @@ def test_ogr_shape_103():
         lyr = ds.CreateLayer('ogr_shape_103', geom_type=ogr.wkbNone, options=options)
         ds = None
 
-        if not check_EOF(filename, expected=expected):
-            print(options)
-            return 'fail'
+        assert check_EOF(filename, expected=expected), options
 
         # Add field
         ds = gdal.OpenEx(filename, gdal.OF_UPDATE, open_options=options)
@@ -4776,8 +4311,7 @@ def test_ogr_shape_103():
         lyr.CreateField(ogr.FieldDefn('foo', ogr.OFTString))
         ds = None
 
-        if not check_EOF(filename, expected=expected):
-            return 'fail'
+        assert check_EOF(filename, expected=expected)
 
         # Add record
         ds = gdal.OpenEx(filename, gdal.OF_UPDATE, open_options=options)
@@ -4785,8 +4319,7 @@ def test_ogr_shape_103():
         lyr.CreateFeature(ogr.Feature(lyr.GetLayerDefn()))
         ds = None
 
-        if not check_EOF(filename, expected=expected):
-            return 'fail'
+        assert check_EOF(filename, expected=expected)
 
         # Add another field
         ds = gdal.OpenEx(filename, gdal.OF_UPDATE, open_options=options)
@@ -4794,8 +4327,7 @@ def test_ogr_shape_103():
         lyr.CreateField(ogr.FieldDefn('foo2', ogr.OFTString))
         ds = None
 
-        if not check_EOF(filename, expected=expected):
-            return 'fail'
+        assert check_EOF(filename, expected=expected)
 
         # Grow a field
         ds = gdal.OpenEx(filename, gdal.OF_UPDATE, open_options=options)
@@ -4806,8 +4338,7 @@ def test_ogr_shape_103():
         lyr.AlterFieldDefn(0, fd, ogr.ALTER_ALL_FLAG)
         ds = None
 
-        if not check_EOF(filename, expected=expected):
-            return 'fail'
+        assert check_EOF(filename, expected=expected)
 
         # Reorder fields
         ds = gdal.OpenEx(filename, gdal.OF_UPDATE, open_options=options)
@@ -4815,8 +4346,7 @@ def test_ogr_shape_103():
         lyr.ReorderFields([1, 0])
         ds = None
 
-        if not check_EOF(filename, expected=expected):
-            return 'fail'
+        assert check_EOF(filename, expected=expected)
 
         # Shrink a field
         ds = gdal.OpenEx(filename, gdal.OF_UPDATE, open_options=options)
@@ -4827,8 +4357,7 @@ def test_ogr_shape_103():
         lyr.AlterFieldDefn(0, fd, ogr.ALTER_ALL_FLAG)
         ds = None
 
-        if not check_EOF(filename, expected=expected):
-            return 'fail'
+        assert check_EOF(filename, expected=expected)
 
         # Remove a field
         ds = gdal.OpenEx(filename, gdal.OF_UPDATE, open_options=options)
@@ -4836,8 +4365,7 @@ def test_ogr_shape_103():
         lyr.DeleteField(0)
         ds = None
 
-        if not check_EOF(filename, expected=expected):
-            return 'fail'
+        assert check_EOF(filename, expected=expected)
 
         ogr.GetDriverByName('ESRI Shapefile').DeleteDataSource(filename)
 
@@ -4847,8 +4375,7 @@ def test_ogr_shape_103():
         lyr.CreateField(ogr.FieldDefn('foo', ogr.OFTString))
         ds = None
 
-        if not check_EOF(filename, expected=expected):
-            return 'fail'
+        assert check_EOF(filename, expected=expected)
         ogr.GetDriverByName('ESRI Shapefile').DeleteDataSource(filename)
 
         # Create file with two records
@@ -4859,8 +4386,7 @@ def test_ogr_shape_103():
         lyr.CreateFeature(ogr.Feature(lyr.GetLayerDefn()))
         ds = None
 
-        if not check_EOF(filename, expected=expected):
-            return 'fail'
+        assert check_EOF(filename, expected=expected)
 
         # Test editing a record that is not the last one
         ds = gdal.OpenEx(filename, gdal.OF_UPDATE, open_options=options)
@@ -4868,8 +4394,7 @@ def test_ogr_shape_103():
         lyr.SetFeature(lyr.GetNextFeature())
         ds = None
 
-        if not check_EOF(filename, expected=expected):
-            return 'fail'
+        assert check_EOF(filename, expected=expected)
 
         # Test editing the last record
         ds = gdal.OpenEx(filename, gdal.OF_UPDATE, open_options=options)
@@ -4878,8 +4403,7 @@ def test_ogr_shape_103():
         lyr.SetFeature(lyr.GetNextFeature())
         ds = None
 
-        if not check_EOF(filename, expected=expected):
-            return 'fail'
+        assert check_EOF(filename, expected=expected)
 
         ogr.GetDriverByName('ESRI Shapefile').DeleteDataSource(filename)
 
@@ -4894,8 +4418,7 @@ def test_ogr_shape_103():
     lyr.CreateFeature(ogr.Feature(lyr.GetLayerDefn()))
     ds.FlushCache()
 
-    if not check_EOF(filename):
-        return 'fail'
+    assert check_EOF(filename)
     ds = None
 
     ogr.GetDriverByName('ESRI Shapefile').DeleteDataSource(filename)
@@ -4913,8 +4436,7 @@ def test_ogr_shape_103():
     ds = None
 
     # To document our current behaviour. Could make sense to be changed.
-    if not check_EOF(filename, expected=False):
-        return 'fail'
+    assert check_EOF(filename, expected=False)
 
     ogr.GetDriverByName('ESRI Shapefile').DeleteDataSource(filename)
 
@@ -4974,11 +4496,9 @@ def test_ogr_shape_105():
 
     ds = ogr.Open('data/padding_after_field_defns.dbf')
     lyr = ds.GetLayer(0)
-    if lyr.GetLayerDefn().GetFieldCount() != 2:
-        return 'fail'
+    assert lyr.GetLayerDefn().GetFieldCount() == 2
     f = lyr.GetNextFeature()
-    if f['id'] != '1' or f['foo'] != '2':
-        return 'fail'
+    assert f['id'] == '1' and f['foo'] == '2'
 
     return 'success'
 
@@ -4998,9 +4518,7 @@ def test_ogr_shape_106():
     ds = None
 
     size = gdal.VSIStatL('/vsimem/ogr_shape_106.shp').size
-    if size != 188:
-        print(size)
-        return 'fail'
+    assert size == 188
 
     ds = ogr.Open('/vsimem/ogr_shape_106.shp', update=1)
     lyr = ds.GetLayer(0)
@@ -5011,9 +4529,7 @@ def test_ogr_shape_106():
     ds = None
 
     size = gdal.VSIStatL('/vsimem/ogr_shape_106.shp').size
-    if size != 188 + 2 * 8:
-        print(size)
-        return 'fail'
+    assert size == 188 + 2 * 8
 
     shape_drv.DeleteDataSource('/vsimem/ogr_shape_106.shp')
 
@@ -5100,8 +4616,7 @@ def test_ogr_shape_107():
     ds = None
 
     gdal.VectorTranslate(copy_filename, filename)
-    if not is_same(copy_filename, filename):
-        return'fail'
+    assert is_same(copy_filename, filename)
 
     shape_drv.DeleteDataSource(copy_filename)
     shape_drv.DeleteDataSource(filename)
@@ -5129,8 +4644,7 @@ def test_ogr_shape_107():
     ds = None
 
     gdal.VectorTranslate(copy_filename, filename)
-    if not is_same(copy_filename, filename):
-        return'fail'
+    assert is_same(copy_filename, filename)
 
     shape_drv.DeleteDataSource(copy_filename)
     shape_drv.DeleteDataSource(filename)
@@ -5148,9 +4662,7 @@ def test_ogr_shape_108():
     lyr.SetSpatialFilterRect(479750.6875, 4764702.0, 479750.6875, 4764702.0)
     expected_fc = lyr.GetFeatureCount()
     lyr.SetAttributeFilter("1=1")
-    if lyr.GetFeatureCount() != expected_fc:
-        print(lyr.GetFeatureCount(), expected_fc)
-        return'fail'
+    assert lyr.GetFeatureCount() == expected_fc
 
     return 'success'
 
@@ -5221,8 +4733,7 @@ def test_ogr_shape_111_delete_field_no_record():
 
     ds = ogr.Open(filename)
     lyr = ds.GetLayer(0)
-    if lyr.GetLayerDefn().GetFieldDefn(0).GetName() != 'field_1':
-        return 'fail'
+    assert lyr.GetLayerDefn().GetFieldDefn(0).GetName() == 'field_1'
     ds = None
 
     shape_drv.DeleteDataSource(filename)
diff --git a/autotest/ogr/ogr_shape_qix.py b/autotest/ogr/ogr_shape_qix.py
index 58030c7ee52e..54b3bbebe328 100755
--- a/autotest/ogr/ogr_shape_qix.py
+++ b/autotest/ogr/ogr_shape_qix.py
@@ -60,9 +60,8 @@ def check_qix_non_overlapping_geoms(lyr):
         lyr.ResetReading()
         feat = lyr.GetNextFeature()
         got_geom = feat.GetGeometryRef()
-        if got_geom.Equals(geom) == 0:
-            gdaltest.post_reason('expected %s. got %s' % (geom.ExportToWkt(), got_geom.ExportToWkt()))
-            return 'fail'
+        assert got_geom.Equals(geom) != 0, \
+            ('expected %s. got %s' % (geom.ExportToWkt(), got_geom.ExportToWkt()))
 
     # Get all geoms in a single gulp. We do not use exactly the extent bounds, because
     # there is an optimization in the shapefile driver to skip the spatial index in that
@@ -70,9 +69,7 @@ def check_qix_non_overlapping_geoms(lyr):
     lyr.SetSpatialFilterRect(extents[0] + 0.001, extents[2] + 0.001, extents[1] - 0.001, extents[3] - 0.001)
     lyr.ResetReading()
     fc = lyr.GetFeatureCount()
-    if fc != fc_ref:
-        gdaltest.post_reason('expected %d. got %d' % (fc_ref, fc))
-        return 'fail'
+    assert fc == fc_ref, ('expected %d. got %d' % (fc_ref, fc))
 
     return 'success'
 
@@ -207,9 +204,7 @@ def check_qix_random_geoms(lyr):
                 found_geom = True
             else:
                 feat = lyr.GetNextFeature()
-        if not found_geom:
-            gdaltest.post_reason('did not find geometry for %s' % (geom.ExportToWkt()))
-            return 'fail'
+        assert found_geom, ('did not find geometry for %s' % (geom.ExportToWkt()))
 
     # Get all geoms in a single gulp. We do not use exactly the extent bounds, because
     # there is an optimization in the shapefile driver to skip the spatial index in that
@@ -217,9 +212,7 @@ def check_qix_random_geoms(lyr):
     lyr.SetSpatialFilterRect(extents[0] + 0.001, extents[2] + 0.001, extents[1] - 0.001, extents[3] - 0.001)
     lyr.ResetReading()
     fc = lyr.GetFeatureCount()
-    if fc != fc_ref:
-        gdaltest.post_reason('expected %d. got %d' % (fc_ref, fc))
-        return 'fail'
+    assert fc == fc_ref, ('expected %d. got %d' % (fc_ref, fc))
 
     return 'success'
 
diff --git a/autotest/ogr/ogr_shape_sbn.py b/autotest/ogr/ogr_shape_sbn.py
index 02ffb2dd6e70..7d90c6a14973 100755
--- a/autotest/ogr/ogr_shape_sbn.py
+++ b/autotest/ogr/ogr_shape_sbn.py
@@ -66,9 +66,7 @@ def search_all_features(lyr):
                 found_geom = True
             else:
                 feat = lyr.GetNextFeature()
-        if not found_geom:
-            gdaltest.post_reason('did not find geometry for %s' % (geom.ExportToWkt()))
-            return 'fail'
+        assert found_geom, ('did not find geometry for %s' % (geom.ExportToWkt()))
 
     # Get all geoms in a single gulp. We do not use exactly the extent bounds, because
     # there is an optimization in the shapefile driver to skip the spatial index in that
@@ -97,9 +95,7 @@ def search_all_features(lyr):
         lyr.ResetReading()
         fc = fc + lyr.GetFeatureCount()
 
-    if fc != fc_ref:
-        gdaltest.post_reason('layer %s: expected %d. got %d' % (lyr.GetName(), fc_ref, fc))
-        return 'fail'
+    assert fc == fc_ref, ('layer %s: expected %d. got %d' % (lyr.GetName(), fc_ref, fc))
 
     return 'success'
 
diff --git a/autotest/ogr/ogr_sosi.py b/autotest/ogr/ogr_sosi.py
index b53e757a1968..d4d256cdbab7 100755
--- a/autotest/ogr/ogr_sosi.py
+++ b/autotest/ogr/ogr_sosi.py
@@ -52,9 +52,7 @@ def test_ogr_sosi_1():
 
     ret = gdaltest.runexternal(test_cli_utilities.get_test_ogrsf_path() + ' -ro tmp/cache/20BygnAnlegg.SOS')
 
-    if ret.find('INFO') == -1 or ret.find('ERROR') != -1:
-        print(ret)
-        return 'fail'
+    assert ret.find('INFO') != -1 and ret.find('ERROR') == -1
 
     return 'success'
 
diff --git a/autotest/ogr/ogr_sql_rfc28.py b/autotest/ogr/ogr_sql_rfc28.py
index f86c08d93729..8f8de6fd211b 100755
--- a/autotest/ogr/ogr_sql_rfc28.py
+++ b/autotest/ogr/ogr_sql_rfc28.py
@@ -50,9 +50,8 @@ def test_ogr_rfc28_1():
     gdaltest.lyr.SetAttributeFilter('160+7 > eas_id')
 
     count = gdaltest.lyr.GetFeatureCount()
-    if count != 3:
-        gdaltest.post_reason('Got wrong count with GetFeatureCount() - %d, expecting 3' % count)
-        return 'fail'
+    assert count == 3, \
+        ('Got wrong count with GetFeatureCount() - %d, expecting 3' % count)
 
     return 'success'
 
@@ -64,9 +63,8 @@ def test_ogr_rfc28_2():
     gdaltest.lyr.SetAttributeFilter("CONCAT('x',PRFEDEA) = 'x35043423'")
 
     count = gdaltest.lyr.GetFeatureCount()
-    if count != 1:
-        gdaltest.post_reason('Got wrong count with GetFeatureCount() - %d, expecting 1' % count)
-        return 'fail'
+    assert count == 1, \
+        ('Got wrong count with GetFeatureCount() - %d, expecting 1' % count)
 
     gdaltest.lyr.SetAttributeFilter('')
     return 'success'
@@ -79,9 +77,8 @@ def test_ogr_rfc28_3():
     gdaltest.lyr.SetAttributeFilter("'x'+PRFEDEA = 'x35043423'")
 
     count = gdaltest.lyr.GetFeatureCount()
-    if count != 1:
-        gdaltest.post_reason('Got wrong count with GetFeatureCount() - %d, expecting 1' % count)
-        return 'fail'
+    assert count == 1, \
+        ('Got wrong count with GetFeatureCount() - %d, expecting 1' % count)
 
     gdaltest.lyr.SetAttributeFilter('')
     return 'success'
@@ -94,9 +91,8 @@ def test_ogr_rfc28_4():
     gdaltest.lyr.SetAttributeFilter("EAS_ID % 5 = 1")
 
     count = gdaltest.lyr.GetFeatureCount()
-    if count != 2:
-        gdaltest.post_reason('Got wrong count with GetFeatureCount() - %d, expecting 2' % count)
-        return 'fail'
+    assert count == 2, \
+        ('Got wrong count with GetFeatureCount() - %d, expecting 2' % count)
 
     gdaltest.lyr.SetAttributeFilter('')
     return 'success'
@@ -109,9 +105,8 @@ def test_ogr_rfc28_5():
     gdaltest.lyr.SetAttributeFilter("EAS_ID % 5 = 1")
 
     count = gdaltest.lyr.GetFeatureCount()
-    if count != 2:
-        gdaltest.post_reason('Got wrong count with GetFeatureCount() - %d, expecting 2' % count)
-        return 'fail'
+    assert count == 2, \
+        ('Got wrong count with GetFeatureCount() - %d, expecting 2' % count)
 
     gdaltest.lyr.SetAttributeFilter('')
     return 'success'
@@ -124,9 +119,8 @@ def test_ogr_rfc28_6():
     gdaltest.lyr.SetAttributeFilter("\"EAS_ID\" = 166")
 
     count = gdaltest.lyr.GetFeatureCount()
-    if count != 1:
-        gdaltest.post_reason('Got wrong count with GetFeatureCount() - %d, expecting 1' % count)
-        return 'fail'
+    assert count == 1, \
+        ('Got wrong count with GetFeatureCount() - %d, expecting 1' % count)
 
     gdaltest.lyr.SetAttributeFilter('')
     return 'success'
@@ -140,9 +134,8 @@ def test_ogr_rfc28_7_wrong_quoting():
         ql = gdaltest.ds.ExecuteSQL("select eas_id from idlink where \"idlink.eas_id\" = 166")
 
     count = ql.GetFeatureCount()
-    if count != 1:
-        gdaltest.post_reason('Got wrong count with GetFeatureCount() - %d, expecting 1' % count)
-        return 'fail'
+    assert count == 1, \
+        ('Got wrong count with GetFeatureCount() - %d, expecting 1' % count)
 
     gdaltest.ds.ReleaseResultSet(ql)
     return 'success'
@@ -152,9 +145,8 @@ def test_ogr_rfc28_7_good_quoting():
     ql = gdaltest.ds.ExecuteSQL("select eas_id from idlink where idlink.eas_id = 166")
 
     count = ql.GetFeatureCount()
-    if count != 1:
-        gdaltest.post_reason('Got wrong count with GetFeatureCount() - %d, expecting 1' % count)
-        return 'fail'
+    assert count == 1, \
+        ('Got wrong count with GetFeatureCount() - %d, expecting 1' % count)
 
     gdaltest.ds.ReleaseResultSet(ql)
     return 'success'
@@ -168,9 +160,8 @@ def test_ogr_rfc28_8_wrong_quoting():
         ql = gdaltest.ds.ExecuteSQL("select \"idlink.eas_id\" from idlink where \"idlink.eas_id\" = 166")
 
     count = ql.GetFeatureCount()
-    if count != 1:
-        gdaltest.post_reason('Got wrong count with GetFeatureCount() - %d, expecting 1' % count)
-        return 'fail'
+    assert count == 1, \
+        ('Got wrong count with GetFeatureCount() - %d, expecting 1' % count)
 
     expect = [166]
     tr = ogrtest.check_features_against_list(ql, 'idlink.eas_id', expect)
@@ -184,9 +175,8 @@ def test_ogr_rfc28_8_good_quoting():
     ql = gdaltest.ds.ExecuteSQL("select idlink.eas_id from idlink where idlink.eas_id = 166")
 
     count = ql.GetFeatureCount()
-    if count != 1:
-        gdaltest.post_reason('Got wrong count with GetFeatureCount() - %d, expecting 1' % count)
-        return 'fail'
+    assert count == 1, \
+        ('Got wrong count with GetFeatureCount() - %d, expecting 1' % count)
 
     expect = [166]
     tr = ogrtest.check_features_against_list(ql, 'idlink.eas_id', expect)
@@ -205,9 +195,8 @@ def test_ogr_rfc28_9():
     lyr.SetAttributeFilter("\"Funky @Name\" = '32'")
 
     count = lyr.GetFeatureCount()
-    if count != 1:
-        gdaltest.post_reason('Got wrong count with GetFeatureCount() - %d, expecting 1' % count)
-        return 'fail'
+    assert count == 1, \
+        ('Got wrong count with GetFeatureCount() - %d, expecting 1' % count)
 
     expect = ['8902']
     tr = ogrtest.check_features_against_list(lyr, 'PRIME_MERIDIAN_CODE', expect)
@@ -223,9 +212,8 @@ def test_ogr_rfc28_10():
     lyr = ds.ExecuteSQL("SELECT * from oddname where \"Funky @Name\" = '32'")
 
     count = lyr.GetFeatureCount()
-    if count != 1:
-        gdaltest.post_reason('Got wrong count with GetFeatureCount() - %d, expecting 1' % count)
-        return 'fail'
+    assert count == 1, \
+        ('Got wrong count with GetFeatureCount() - %d, expecting 1' % count)
 
     expect = ['8902']
     tr = ogrtest.check_features_against_list(lyr, 'PRIME_MERIDIAN_CODE', expect)
@@ -242,9 +230,8 @@ def test_ogr_rfc28_11():
     lyr = ds.ExecuteSQL("SELECT \"Funky @Name\" from oddname where prime_meridian_code = '8902'")
 
     count = lyr.GetFeatureCount()
-    if count != 1:
-        gdaltest.post_reason('Got wrong count with GetFeatureCount() - %d, expecting 1' % count)
-        return 'fail'
+    assert count == 1, \
+        ('Got wrong count with GetFeatureCount() - %d, expecting 1' % count)
 
     expect = ['32']
     tr = ogrtest.check_features_against_list(lyr, 'Funky @Name', expect)
@@ -260,9 +247,8 @@ def test_ogr_rfc28_12():
     lyr = gdaltest.ds.ExecuteSQL("SELECT 'constant string', 'other' as abc, eas_id from idlink where eas_id = 165")
 
     count = lyr.GetFeatureCount()
-    if count != 1:
-        gdaltest.post_reason('Got wrong count with GetFeatureCount() - %d, expecting 1' % count)
-        return 'fail'
+    assert count == 1, \
+        ('Got wrong count with GetFeatureCount() - %d, expecting 1' % count)
 
     expect = ['other']
     tr = ogrtest.check_features_against_list(lyr, 'abc', expect)
@@ -289,9 +275,8 @@ def test_ogr_rfc28_13():
     gdaltest.lyr.SetAttributeFilter("SUBSTR(PRFEDEA,5,4) = '3423'")
 
     count = gdaltest.lyr.GetFeatureCount()
-    if count != 1:
-        gdaltest.post_reason('Got wrong count with GetFeatureCount() - %d, expecting 1' % count)
-        return 'fail'
+    assert count == 1, \
+        ('Got wrong count with GetFeatureCount() - %d, expecting 1' % count)
 
     gdaltest.lyr.SetAttributeFilter('')
     return 'success'
@@ -410,9 +395,8 @@ def test_ogr_rfc28_19():
 
     gdaltest.ds.ReleaseResultSet(sql_lyr)
 
-    if count != 8:
-        gdaltest.post_reason('Got wrong count with GetFeatureCount() - %d, expecting 8' % count)
-        return 'fail'
+    assert count == 8, \
+        ('Got wrong count with GetFeatureCount() - %d, expecting 8' % count)
 
     return 'success'
 
@@ -432,8 +416,7 @@ def test_ogr_rfc28_20():
 
     sql_lyr = ds.ExecuteSQL('select -intfield + 1 + 2 * 3 + 5 - 3 * 2 from my_layer')
     feat = sql_lyr.GetNextFeature()
-    if feat.GetField('FIELD_1') != 4:
-        return 'fail'
+    assert feat.GetField('FIELD_1') == 4
     ds.ReleaseResultSet(sql_lyr)
 
     ds = None
@@ -458,9 +441,8 @@ def test_ogr_rfc28_21():
 
     gdaltest.ds.ReleaseResultSet(sql_lyr)
 
-    if count_between != count_ge_and_le:
-        gdaltest.post_reason('Got wrong count with GetFeatureCount() - %d, expecting %d' % (count_between, count_ge_and_le))
-        return 'fail'
+    assert count_between == count_ge_and_le, \
+        ('Got wrong count with GetFeatureCount() - %d, expecting %d' % (count_between, count_ge_and_le))
 
     return 'success'
 
@@ -482,9 +464,8 @@ def test_ogr_rfc28_22():
 
     gdaltest.ds.ReleaseResultSet(sql_lyr)
 
-    if count_not_between != count_not_ge_and_le:
-        gdaltest.post_reason('Got wrong count with GetFeatureCount() - %d, expecting %d' % (count_not_between, count_not_ge_and_le))
-        return 'fail'
+    assert count_not_between == count_not_ge_and_le, \
+        ('Got wrong count with GetFeatureCount() - %d, expecting %d' % (count_not_between, count_not_ge_and_le))
 
     return 'success'
 
@@ -506,9 +487,8 @@ def test_ogr_rfc28_23():
 
     gdaltest.ds.ReleaseResultSet(sql_lyr)
 
-    if count_not_like1 != count_not_like2:
-        gdaltest.post_reason('Got wrong count with GetFeatureCount() - %d, expecting %d' % (count_not_like1, count_not_like2))
-        return 'fail'
+    assert count_not_like1 == count_not_like2, \
+        ('Got wrong count with GetFeatureCount() - %d, expecting %d' % (count_not_like1, count_not_like2))
 
     return 'success'
 
@@ -541,9 +521,8 @@ def test_ogr_rfc28_24():
 
     gdaltest.ds.ReleaseResultSet(sql_lyr)
 
-    if count != 10:
-        gdaltest.post_reason('Got wrong count with GetFeatureCount() - %d, expecting %d' % (count, 10))
-        return 'fail'
+    assert count == 10, \
+        ('Got wrong count with GetFeatureCount() - %d, expecting %d' % (count, 10))
 
     return 'success'
 
@@ -559,9 +538,8 @@ def test_ogr_rfc28_25():
 
     gdaltest.ds.ReleaseResultSet(sql_lyr)
 
-    if count != 1:
-        gdaltest.post_reason('Got wrong count with GetFeatureCount() - %d, expecting 1' % count)
-        return 'fail'
+    assert count == 1, \
+        ('Got wrong count with GetFeatureCount() - %d, expecting 1' % count)
 
     return 'success'
 
@@ -603,9 +581,8 @@ def ogr_rfc28_28_test(formula, expected_val):
     got = f.GetField(0)
     gdaltest.ds.ReleaseResultSet(sql_lyr)
 
-    if got != expected_val:
-        gdaltest.post_reason('bad result for %s : %s' % (formula, str(expected_val)))
-        return 'fail'
+    assert got == expected_val, \
+        ('bad result for %s : %s' % (formula, str(expected_val)))
 
     return 'success'
 
@@ -768,10 +745,8 @@ def test_ogr_rfc28_34():
     gdal.PushErrorHandler('CPLQuietErrorHandler')
     lyr = gdaltest.ds.ExecuteSQL("select foo.* from idlink")
     gdal.PopErrorHandler()
-    if gdal.GetLastErrorMsg().find(
-            'Table foo not recognised from foo.* definition') != 0:
-        print(gdal.GetLastErrorMsg())
-        return 'fail'
+    assert (gdal.GetLastErrorMsg().find(
+            'Table foo not recognised from foo.* definition') == 0)
 
     return 'success' if lyr is None else 'fail'
 
@@ -784,9 +759,7 @@ def test_ogr_rfc28_35():
     gdal.PushErrorHandler('CPLQuietErrorHandler')
     lyr = gdaltest.ds.ExecuteSQL("select distinct eas_id, distinct name from idlink")
     gdal.PopErrorHandler()
-    if gdal.GetLastErrorMsg().find('SQL Expression Parsing Error') != 0:
-        print(gdal.GetLastErrorMsg())
-        return 'fail'
+    assert gdal.GetLastErrorMsg().find('SQL Expression Parsing Error') == 0
 
     return 'success' if lyr is None else 'fail'
 
@@ -799,9 +772,7 @@ def test_ogr_rfc28_35_bis():
     gdal.PushErrorHandler('CPLQuietErrorHandler')
     lyr = gdaltest.ds.ExecuteSQL("select distinct eas_id, name from idlink")
     gdal.PopErrorHandler()
-    if gdal.GetLastErrorMsg().find('SELECT DISTINCT not supported on multiple columns') != 0:
-        print(gdal.GetLastErrorMsg())
-        return 'fail'
+    assert gdal.GetLastErrorMsg().find('SELECT DISTINCT not supported on multiple columns') == 0
 
     return 'success' if lyr is None else 'fail'
 
@@ -814,9 +785,7 @@ def test_ogr_rfc28_35_ter():
     gdal.PushErrorHandler('CPLQuietErrorHandler')
     lyr = gdaltest.ds.ExecuteSQL("select distinct * from idlink")
     gdal.PopErrorHandler()
-    if gdal.GetLastErrorMsg().find('SELECT DISTINCT not supported on multiple columns') != 0:
-        print(gdal.GetLastErrorMsg())
-        return 'fail'
+    assert gdal.GetLastErrorMsg().find('SELECT DISTINCT not supported on multiple columns') == 0
 
     return 'success' if lyr is None else 'fail'
 
@@ -832,9 +801,7 @@ def test_ogr_rfc28_36():
     if lyr is not None:
         lyr.GetNextFeature()
     gdal.PopErrorHandler()
-    if gdal.GetLastErrorMsg().find("Can't ORDER BY a DISTINCT list by more than one key") != 0:
-        print(gdal.GetLastErrorMsg())
-        return 'fail'
+    assert gdal.GetLastErrorMsg().find("Can't ORDER BY a DISTINCT list by more than one key") == 0
     gdaltest.ds.ReleaseResultSet(lyr)
     return 'success'
 
@@ -850,9 +817,7 @@ def test_ogr_rfc28_37():
     if lyr is not None:
         lyr.GetNextFeature()
     gdal.PopErrorHandler()
-    if gdal.GetLastErrorMsg().find("Only selected DISTINCT field can be used for ORDER BY") != 0:
-        print(gdal.GetLastErrorMsg())
-        return 'fail'
+    assert gdal.GetLastErrorMsg().find("Only selected DISTINCT field can be used for ORDER BY") == 0
     gdaltest.ds.ReleaseResultSet(lyr)
     return 'success'
 
@@ -866,21 +831,15 @@ def test_ogr_rfc28_38():
     gdal.PushErrorHandler('CPLQuietErrorHandler')
     lyr = gdaltest.ds.ExecuteSQL("SELECT SUBSTR(PRFEDEA) from poly")
     gdal.PopErrorHandler()
-    if gdal.GetLastErrorMsg().find("Expected 2 or 3 arguments to SUBSTR(), but got 1") != 0:
-        print(gdal.GetLastErrorMsg())
-        return 'fail'
-    if lyr is not None:
-        return 'fail'
+    assert gdal.GetLastErrorMsg().find("Expected 2 or 3 arguments to SUBSTR(), but got 1") == 0
+    assert lyr is None
 
     gdal.ErrorReset()
     gdal.PushErrorHandler('CPLQuietErrorHandler')
     lyr = gdaltest.ds.ExecuteSQL("SELECT SUBSTR(1,2) from poly")
     gdal.PopErrorHandler()
-    if gdal.GetLastErrorMsg().find("Wrong argument type for SUBSTR()") != 0:
-        print(gdal.GetLastErrorMsg())
-        return 'fail'
-    if lyr is not None:
-        return 'fail'
+    assert gdal.GetLastErrorMsg().find("Wrong argument type for SUBSTR()") == 0
+    assert lyr is None
 
     return 'success'
 
@@ -923,14 +882,11 @@ def test_ogr_rfc28_40():
 
     gdaltest.ds.ReleaseResultSet(lyr)
 
-    if not tr:
-        return 'fail'
+    assert tr
 
-    if not tr2:
-        return 'fail'
+    assert tr2
 
-    if not tr3:
-        return 'fail'
+    assert tr3
     return 'success'
 
 
@@ -949,14 +905,12 @@ def test_ogr_rfc28_41():
 
     sql_lyr = ds.ExecuteSQL('select * from my_layer')
     feat = sql_lyr.GetNextFeature()
-    if feat.GetField('a.b') != 2:
-        return 'fail'
+    assert feat.GetField('a.b') == 2
     ds.ReleaseResultSet(sql_lyr)
 
     sql_lyr = ds.ExecuteSQL('select l.* from my_layer l')
     feat = sql_lyr.GetNextFeature()
-    if feat.GetField('l.a.b') != 2:
-        return 'fail'
+    assert feat.GetField('l.a.b') == 2
     ds.ReleaseResultSet(sql_lyr)
 
     ds = None
@@ -987,22 +941,14 @@ def test_ogr_rfc28_42():
 
     # To b OR NOT to b... that's the question
     lyr = ds.ExecuteSQL("SELECT b, NOT b, 1 + b, CAST(1 AS BOOLEAN), b IS NOT NULL, short, 1 + short, CAST(1 + short as SMALLINT) FROM test WHERE b OR NOT b")
-    if lyr.GetLayerDefn().GetFieldDefn(0).GetSubType() != ogr.OFSTBoolean:
-        return 'fail'
-    if lyr.GetLayerDefn().GetFieldDefn(1).GetSubType() != ogr.OFSTBoolean:
-        return 'fail'
-    if lyr.GetLayerDefn().GetFieldDefn(2).GetSubType() != ogr.OFSTNone:
-        return 'fail'
-    if lyr.GetLayerDefn().GetFieldDefn(3).GetSubType() != ogr.OFSTBoolean:
-        return 'fail'
-    if lyr.GetLayerDefn().GetFieldDefn(4).GetSubType() != ogr.OFSTBoolean:
-        return 'fail'
-    if lyr.GetLayerDefn().GetFieldDefn(5).GetSubType() != ogr.OFSTInt16:
-        return 'fail'
-    if lyr.GetLayerDefn().GetFieldDefn(6).GetSubType() != ogr.OFSTNone:
-        return 'fail'
-    if lyr.GetLayerDefn().GetFieldDefn(7).GetSubType() != ogr.OFSTInt16:
-        return 'fail'
+    assert lyr.GetLayerDefn().GetFieldDefn(0).GetSubType() == ogr.OFSTBoolean
+    assert lyr.GetLayerDefn().GetFieldDefn(1).GetSubType() == ogr.OFSTBoolean
+    assert lyr.GetLayerDefn().GetFieldDefn(2).GetSubType() == ogr.OFSTNone
+    assert lyr.GetLayerDefn().GetFieldDefn(3).GetSubType() == ogr.OFSTBoolean
+    assert lyr.GetLayerDefn().GetFieldDefn(4).GetSubType() == ogr.OFSTBoolean
+    assert lyr.GetLayerDefn().GetFieldDefn(5).GetSubType() == ogr.OFSTInt16
+    assert lyr.GetLayerDefn().GetFieldDefn(6).GetSubType() == ogr.OFSTNone
+    assert lyr.GetLayerDefn().GetFieldDefn(7).GetSubType() == ogr.OFSTInt16
     f = lyr.GetNextFeature()
     if f.GetField('b') != 0 or f.GetField(1) != 1 or f.GetField(2) != 1 or \
        f.GetField(3) != 1 or f.GetField(4) != 1 or \
@@ -1016,19 +962,13 @@ def test_ogr_rfc28_42():
     gdaltest.ds.ReleaseResultSet(lyr)
 
     lyr = ds.ExecuteSQL("SELECT MIN(b), MAX(b), SUM(b) FROM test")
-    if lyr.GetLayerDefn().GetFieldDefn(0).GetSubType() != ogr.OFSTBoolean:
-        return 'fail'
-    if lyr.GetLayerDefn().GetFieldDefn(1).GetSubType() != ogr.OFSTBoolean:
-        return 'fail'
-    if lyr.GetLayerDefn().GetFieldDefn(2).GetSubType() != ogr.OFSTNone:
-        return 'fail'
+    assert lyr.GetLayerDefn().GetFieldDefn(0).GetSubType() == ogr.OFSTBoolean
+    assert lyr.GetLayerDefn().GetFieldDefn(1).GetSubType() == ogr.OFSTBoolean
+    assert lyr.GetLayerDefn().GetFieldDefn(2).GetSubType() == ogr.OFSTNone
     f = lyr.GetNextFeature()
-    if f.GetField('MIN_b') != 0:
-        return 'fail'
-    if f.GetField('MAX_b') != 1:
-        return 'fail'
-    if f.GetField('SUM_b') != 1:
-        return 'fail'
+    assert f.GetField('MIN_b') == 0
+    assert f.GetField('MAX_b') == 1
+    assert f.GetField('SUM_b') == 1
     gdaltest.ds.ReleaseResultSet(lyr)
 
     return 'success'
@@ -1052,10 +992,8 @@ def test_ogr_rfc28_43():
 
     lyr = ds.ExecuteSQL("SELECT 1000000000000, myint64, CAST(1 AS bigint), CAST(100000000000 AS bigint), CAST(1 AS numeric(15,0)) FROM test WHERE myint64 < -9999999999 or myint64 > 9999999999")
     f = lyr.GetNextFeature()
-    if lyr.GetLayerDefn().GetFieldDefn(2).GetType() != ogr.OFTInteger64:
-        return 'fail'
-    if lyr.GetLayerDefn().GetFieldDefn(3).GetType() != ogr.OFTInteger64:
-        return 'fail'
+    assert lyr.GetLayerDefn().GetFieldDefn(2).GetType() == ogr.OFTInteger64
+    assert lyr.GetLayerDefn().GetFieldDefn(3).GetType() == ogr.OFTInteger64
     if f.GetField(0) != 1000000000000 or f.GetField(1) != -1000000000000 or f.GetField(2) != 1 or f.GetField(3) != 100000000000 or f.GetField(4) != 1.0:
         f.DumpReadable()
         return 'fail'
@@ -1108,20 +1046,16 @@ def test_ogr_rfc28_44():
 
     gdal.ErrorReset()
     lyr = ds.ExecuteSQL("SELECT * FROM \"lyr.withpoint\" WHERE \"field.withpoint\" = 1")
-    if gdal.GetLastErrorMsg() != '':
-        return 'fail'
+    assert gdal.GetLastErrorMsg() == ''
     f = lyr.GetNextFeature()
-    if f is None:
-        return 'fail'
+    assert f is not None
     gdaltest.ds.ReleaseResultSet(lyr)
 
     gdal.ErrorReset()
     lyr = ds.ExecuteSQL("SELECT \"lyr.withpoint\".\"field.withpoint\", \"field.withpoint\" FROM \"lyr.withpoint\" WHERE \"lyr.withpoint\".\"field.withpoint\" = 1")
-    if gdal.GetLastErrorMsg() != '':
-        return 'fail'
+    assert gdal.GetLastErrorMsg() == ''
     f = lyr.GetNextFeature()
-    if f is None:
-        return 'fail'
+    assert f is not None
     gdaltest.ds.ReleaseResultSet(lyr)
 
     # Test our tolerance against lack of necessary quoting
@@ -1129,11 +1063,9 @@ def test_ogr_rfc28_44():
     gdal.PushErrorHandler()
     lyr = ds.ExecuteSQL("SELECT * FROM \"lyr.withpoint\" WHERE field.withpoint = 1")
     gdal.PopErrorHandler()
-    if gdal.GetLastErrorMsg() != 'Passed field name field.withpoint should have been surrounded by double quotes. Accepted since there is no ambiguity...':
-        return 'fail'
+    assert gdal.GetLastErrorMsg() == 'Passed field name field.withpoint should have been surrounded by double quotes. Accepted since there is no ambiguity...'
     f = lyr.GetNextFeature()
-    if f is None:
-        return 'fail'
+    assert f is not None
     gdaltest.ds.ReleaseResultSet(lyr)
 
     # Againg, but in a situation where there IS ambiguity
@@ -1145,21 +1077,17 @@ def test_ogr_rfc28_44():
     gdal.PushErrorHandler()
     lyr = ds.ExecuteSQL("SELECT * FROM \"lyr.withpoint\" JOIN field ON \"lyr.withpoint\".foo = field.id WHERE field.withpoint = 1")
     gdal.PopErrorHandler()
-    if gdal.GetLastErrorMsg() != '"field"."withpoint" not recognised as an available field.':
-        return 'fail'
-    if lyr is not None:
-        return 'fail'
+    assert gdal.GetLastErrorMsg() == '"field"."withpoint" not recognised as an available field.'
+    assert lyr is None
 
     # Test our tolerance against unnecessary quoting
     gdal.ErrorReset()
     gdal.PushErrorHandler()
     lyr = ds.ExecuteSQL("SELECT * FROM \"lyr.withpoint\" f WHERE \"f.foo\" = 2")
     gdal.PopErrorHandler()
-    if gdal.GetLastErrorMsg() != 'Passed field name f.foo should NOT have been surrounded by double quotes. Accepted since there is no ambiguity...':
-        return 'fail'
+    assert gdal.GetLastErrorMsg() == 'Passed field name f.foo should NOT have been surrounded by double quotes. Accepted since there is no ambiguity...'
     f = lyr.GetNextFeature()
-    if f is None:
-        return 'fail'
+    assert f is not None
     gdaltest.ds.ReleaseResultSet(lyr)
 
     return 'success'
@@ -1173,9 +1101,8 @@ def test_ogr_rfc28_45():
     ql = gdaltest.ds.ExecuteSQL("select eas_id from idlink as il where il.eas_id = 166")
 
     count = ql.GetFeatureCount()
-    if count != 1:
-        gdaltest.post_reason('Got wrong count with GetFeatureCount() - %d, expecting 1' % count)
-        return 'fail'
+    assert count == 1, \
+        ('Got wrong count with GetFeatureCount() - %d, expecting 1' % count)
 
     gdaltest.ds.ReleaseResultSet(ql)
     return 'success'
@@ -1204,9 +1131,7 @@ def test_ogr_rfc28_46():
     lyr.CreateFeature(feat)
 
     lyr.SetAttributeFilter('fid >= 2500000000')
-    if lyr.GetFeatureCount() != 2:
-        print(lyr.GetFeatureCount())
-        return 'fail'
+    assert lyr.GetFeatureCount() == 2
     lyr.SetAttributeFilter(None)
 
     # Explicit cast of fid to bigint needed in SELECT columns
@@ -1247,111 +1172,87 @@ def test_ogr_rfc28_47():
     lyr = gdaltest.ds.ExecuteSQL("SELECT * FROM POLY LIMIT 0")
     tr = ogrtest.check_features_against_list(lyr, 'EAS_ID', [])
     gdaltest.ds.ReleaseResultSet(lyr)
-    if not tr:
-        return 'fail'
+    assert tr
 
     lyr = gdaltest.ds.ExecuteSQL("SELECT * FROM POLY LIMIT 1")
-    if lyr.GetFeatureCount() != 1:
-        return 'fail'
+    assert lyr.GetFeatureCount() == 1
     tr = ogrtest.check_features_against_list(lyr, 'EAS_ID', [168])
     gdaltest.ds.ReleaseResultSet(lyr)
-    if not tr:
-        return 'fail'
+    assert tr
 
     lyr = gdaltest.ds.ExecuteSQL("SELECT * FROM POLY ORDER BY EAS_ID LIMIT 1")
-    if lyr.GetFeatureCount() != 1:
-        return 'fail'
+    assert lyr.GetFeatureCount() == 1
     tr = ogrtest.check_features_against_list(lyr, 'EAS_ID', [158])
     gdaltest.ds.ReleaseResultSet(lyr)
-    if not tr:
-        return 'fail'
+    assert tr
 
     lyr = gdaltest.ds.ExecuteSQL("SELECT * FROM POLY ORDER BY PRFEDEA LIMIT 1")
-    if lyr.GetFeatureCount() != 1:
-        return 'fail'
+    assert lyr.GetFeatureCount() == 1
     tr = ogrtest.check_features_against_list(lyr, 'PRFEDEA', ['35043369'])
     gdaltest.ds.ReleaseResultSet(lyr)
-    if not tr:
-        return 'fail'
+    assert tr
 
     lyr = gdaltest.ds.ExecuteSQL("SELECT * FROM POLY WHERE 0 ORDER BY EAS_ID LIMIT 1")
-    if lyr.GetNextFeature() is not None:
-        return 'fail'
+    assert lyr.GetNextFeature() is None
     gdaltest.ds.ReleaseResultSet(lyr)
 
     lyr = gdaltest.ds.ExecuteSQL("SELECT * FROM POLY WHERE EAS_ID = 168 LIMIT 11")
-    if lyr.GetFeatureCount() != 1:
-        return 'fail'
+    assert lyr.GetFeatureCount() == 1
     tr = ogrtest.check_features_against_list(lyr, 'EAS_ID', [168])
     gdaltest.ds.ReleaseResultSet(lyr)
-    if not tr:
-        return 'fail'
+    assert tr
 
     lyr = gdaltest.ds.ExecuteSQL("SELECT * FROM POLY WHERE EAS_ID = 168 OFFSET 0")
     tr = ogrtest.check_features_against_list(lyr, 'EAS_ID', [168])
     gdaltest.ds.ReleaseResultSet(lyr)
-    if not tr:
-        return 'fail'
+    assert tr
 
     lyr = gdaltest.ds.ExecuteSQL("SELECT * FROM POLY WHERE EAS_ID = 168 OFFSET 1")
-    if lyr.GetFeatureCount() != 0:
-        return 'fail'
+    assert lyr.GetFeatureCount() == 0
     tr = ogrtest.check_features_against_list(lyr, 'EAS_ID', [])
     gdaltest.ds.ReleaseResultSet(lyr)
-    if not tr:
-        return 'fail'
+    assert tr
 
     lyr = gdaltest.ds.ExecuteSQL("SELECT * FROM POLY OFFSET 10")
-    if lyr.GetFeatureCount() != 0:
-        return 'fail'
+    assert lyr.GetFeatureCount() == 0
     tr = ogrtest.check_features_against_list(lyr, 'EAS_ID', [])
     gdaltest.ds.ReleaseResultSet(lyr)
-    if not tr:
-        return 'fail'
+    assert tr
 
     lyr = gdaltest.ds.ExecuteSQL("SELECT * FROM POLY OFFSET 8")
-    if lyr.GetFeatureCount() != 2:
-        return 'fail'
+    assert lyr.GetFeatureCount() == 2
     tr = ogrtest.check_features_against_list(lyr, 'EAS_ID', [165, 170])
     gdaltest.ds.ReleaseResultSet(lyr)
-    if not tr:
-        return 'fail'
+    assert tr
 
     lyr = gdaltest.ds.ExecuteSQL("SELECT * FROM POLY LIMIT 1 OFFSET 8")
-    if lyr.GetFeatureCount() != 1:
-        return 'fail'
+    assert lyr.GetFeatureCount() == 1
     tr = ogrtest.check_features_against_list(lyr, 'EAS_ID', [165])
     gdaltest.ds.ReleaseResultSet(lyr)
-    if not tr:
-        return 'fail'
+    assert tr
 
     lyr = gdaltest.ds.ExecuteSQL("SELECT * FROM POLY LIMIT 2 OFFSET 8")
     lyr.SetNextByIndex(1)
     f = lyr.GetNextFeature()
-    if f['EAS_ID'] != 170:
-        return 'fail'
+    assert f['EAS_ID'] == 170
     f = lyr.GetNextFeature()
-    if f is not None:
-        return 'fail'
+    assert f is None
     gdaltest.ds.ReleaseResultSet(lyr)
 
     lyr = gdaltest.ds.ExecuteSQL("SELECT * FROM POLY ORDER BY EAS_ID DESC LIMIT 2")
     tr = ogrtest.check_features_against_list(lyr, 'EAS_ID', [179, 173])
     gdaltest.ds.ReleaseResultSet(lyr)
-    if not tr:
-        return 'fail'
+    assert tr
 
     lyr = gdaltest.ds.ExecuteSQL("SELECT * FROM POLY ORDER BY EAS_ID DESC LIMIT 1 OFFSET 1")
     tr = ogrtest.check_features_against_list(lyr, 'EAS_ID', [173])
     gdaltest.ds.ReleaseResultSet(lyr)
-    if not tr:
-        return 'fail'
+    assert tr
 
     lyr = gdaltest.ds.ExecuteSQL("SELECT DISTINCT EAS_ID FROM POLY ORDER BY EAS_ID DESC LIMIT 2 OFFSET 3")
     tr = ogrtest.check_features_against_list(lyr, 'EAS_ID', [171, 170])
     gdaltest.ds.ReleaseResultSet(lyr)
-    if not tr:
-        return 'fail'
+    assert tr
 
     return 'success'
 
@@ -1370,83 +1271,64 @@ def test_ogr_rfc28_48():
     lyr.CreateFeature(feat)
 
     with gdaltest.error_handler():
-        if lyr.SetAttributeFilter('dt >= 2500000000') == 0:
-            return 'fail'
+        assert lyr.SetAttributeFilter('dt >= 2500000000') != 0
 
     lyr.SetAttributeFilter("dt >= 'a'")
     with gdaltest.error_handler():
-        if lyr.GetFeatureCount() != 0:
-            return 'fail'
+        assert lyr.GetFeatureCount() == 0
 
     lyr.SetAttributeFilter("'a' <= dt")
     with gdaltest.error_handler():
-        if lyr.GetFeatureCount() != 0:
-            return 'fail'
+        assert lyr.GetFeatureCount() == 0
 
     lyr.SetAttributeFilter("dt BETWEEN dt AND 'a'")
     with gdaltest.error_handler():
-        if lyr.GetFeatureCount() != 0:
-            return 'fail'
+        assert lyr.GetFeatureCount() == 0
 
     lyr.SetAttributeFilter("dt >= '2017/02/17 11:06:34'")
-    if lyr.GetFeatureCount() != 1:
-        return 'fail'
+    assert lyr.GetFeatureCount() == 1
 
     lyr.SetAttributeFilter("dt >= '2017/02/17'")
-    if lyr.GetFeatureCount() != 1:
-        return 'fail'
+    assert lyr.GetFeatureCount() == 1
 
     lyr.SetAttributeFilter("dt >= '2017/02/17 11:06:35'")
-    if lyr.GetFeatureCount() != 0:
-        return 'fail'
+    assert lyr.GetFeatureCount() == 0
 
     lyr.SetAttributeFilter("dt > '2017/02/17 11:06:33'")
-    if lyr.GetFeatureCount() != 1:
-        return 'fail'
+    assert lyr.GetFeatureCount() == 1
 
     lyr.SetAttributeFilter("dt > '2017/02/17 11:06:34'")
-    if lyr.GetFeatureCount() != 0:
-        return 'fail'
+    assert lyr.GetFeatureCount() == 0
 
     lyr.SetAttributeFilter("dt <= '2017/02/17 11:06:34'")
-    if lyr.GetFeatureCount() != 1:
-        return 'fail'
+    assert lyr.GetFeatureCount() == 1
 
     lyr.SetAttributeFilter("dt <= '2017/02/17 11:06:33'")
-    if lyr.GetFeatureCount() != 0:
-        return 'fail'
+    assert lyr.GetFeatureCount() == 0
 
     lyr.SetAttributeFilter("dt < '2017/02/17 11:06:35'")
-    if lyr.GetFeatureCount() != 1:
-        return 'fail'
+    assert lyr.GetFeatureCount() == 1
 
     lyr.SetAttributeFilter("dt < '2017/02/17 11:06:34'")
-    if lyr.GetFeatureCount() != 0:
-        return 'fail'
+    assert lyr.GetFeatureCount() == 0
 
     lyr.SetAttributeFilter("dt = '2017/02/17 11:06:34'")
-    if lyr.GetFeatureCount() != 1:
-        return 'fail'
+    assert lyr.GetFeatureCount() == 1
 
     lyr.SetAttributeFilter("dt = '2017/02/17 11:06:34.001'")
-    if lyr.GetFeatureCount() != 0:
-        return 'fail'
+    assert lyr.GetFeatureCount() == 0
 
     lyr.SetAttributeFilter("dt BETWEEN dt AND dt")
-    if lyr.GetFeatureCount() != 1:
-        return 'fail'
+    assert lyr.GetFeatureCount() == 1
 
     lyr.SetAttributeFilter("dt BETWEEN '2017/02/17 11:06:33.999' AND '2017/02/17 11:06:34.001'")
-    if lyr.GetFeatureCount() != 1:
-        return 'fail'
+    assert lyr.GetFeatureCount() == 1
 
     lyr.SetAttributeFilter("dt BETWEEN '2017/02/17 11:06:34.001' AND dt")
-    if lyr.GetFeatureCount() != 0:
-        return 'fail'
+    assert lyr.GetFeatureCount() == 0
 
     lyr.SetAttributeFilter("dt BETWEEN dt AND '2017/02/17 11:06:33.999'")
-    if lyr.GetFeatureCount() != 0:
-        return 'fail'
+    assert lyr.GetFeatureCount() == 0
 
     return 'success'
 
@@ -1494,9 +1376,7 @@ def test_ogr_rfc28_int_overflows():
                 f = sql_lyr.GetNextFeature()
         else:
             f = sql_lyr.GetNextFeature()
-        if f.GetField(0) != res:
-            print(sql, res, f.GetField(0))
-            return 'fail'
+        assert f.GetField(0) == res, (sql, res, f.GetField(0))
         ds.ReleaseResultSet(sql_lyr)
 
     return 'success'
diff --git a/autotest/ogr/ogr_sql_sqlite.py b/autotest/ogr/ogr_sql_sqlite.py
index 0c6d49476da5..5aeda82ed5c7 100755
--- a/autotest/ogr/ogr_sql_sqlite.py
+++ b/autotest/ogr/ogr_sql_sqlite.py
@@ -43,6 +43,7 @@
 import gdaltest
 import ogrtest
 import webserver
+import pytest
 
 ###############################################################################
 # Detect OGR SQLite dialect availability
@@ -64,8 +65,7 @@ def ogr_sql_sqlite_available():
     ds = ogr.GetDriverByName("Memory").CreateDataSource("my_ds")
     sql_lyr = ds.ExecuteSQL("SELECT * FROM sqlite_master", dialect='SQLite')
     ds.ReleaseResultSet(sql_lyr)
-    if sql_lyr is None:
-        return 'fail'
+    assert sql_lyr is not None
     ogrtest.has_sqlite_dialect = True
     return True
 
@@ -165,18 +165,12 @@ def test_ogr_sql_sqlite_1():
 
         # Test SELECT
         sql_lyr = ds.ExecuteSQL("SELECT * FROM my_layer", dialect='SQLite')
-        if sql_lyr.GetLayerDefn().GetFieldDefn(sql_lyr.GetLayerDefn().GetFieldIndex('boolfield')).GetSubType() != ogr.OFSTBoolean:
-            return 'fail'
-        if sql_lyr.GetLayerDefn().GetFieldDefn(sql_lyr.GetLayerDefn().GetFieldIndex('int16field')).GetSubType() != ogr.OFSTInt16:
-            return 'fail'
-        if sql_lyr.GetLayerDefn().GetFieldDefn(sql_lyr.GetLayerDefn().GetFieldIndex('float32field')).GetSubType() != ogr.OFSTFloat32:
-            return 'fail'
-        if sql_lyr.GetLayerDefn().GetFieldDefn(sql_lyr.GetLayerDefn().GetFieldIndex('intlistfield')).GetType() != ogr.OFTIntegerList:
-            return 'fail'
-        if sql_lyr.GetLayerDefn().GetFieldDefn(sql_lyr.GetLayerDefn().GetFieldIndex('doublelistfield')).GetType() != ogr.OFTRealList:
-            return 'fail'
-        if sql_lyr.GetLayerDefn().GetFieldDefn(sql_lyr.GetLayerDefn().GetFieldIndex('strlistfield')).GetType() != ogr.OFTStringList:
-            return 'fail'
+        assert sql_lyr.GetLayerDefn().GetFieldDefn(sql_lyr.GetLayerDefn().GetFieldIndex('boolfield')).GetSubType() == ogr.OFSTBoolean
+        assert sql_lyr.GetLayerDefn().GetFieldDefn(sql_lyr.GetLayerDefn().GetFieldIndex('int16field')).GetSubType() == ogr.OFSTInt16
+        assert sql_lyr.GetLayerDefn().GetFieldDefn(sql_lyr.GetLayerDefn().GetFieldIndex('float32field')).GetSubType() == ogr.OFSTFloat32
+        assert sql_lyr.GetLayerDefn().GetFieldDefn(sql_lyr.GetLayerDefn().GetFieldIndex('intlistfield')).GetType() == ogr.OFTIntegerList
+        assert sql_lyr.GetLayerDefn().GetFieldDefn(sql_lyr.GetLayerDefn().GetFieldIndex('doublelistfield')).GetType() == ogr.OFTRealList
+        assert sql_lyr.GetLayerDefn().GetFieldDefn(sql_lyr.GetLayerDefn().GetFieldIndex('strlistfield')).GetType() == ogr.OFTStringList
         feat = sql_lyr.GetNextFeature()
         if feat.GetField('intfield') != 2 or \
            feat.GetField('int64field') != 234567890123 or \
@@ -226,9 +220,7 @@ def test_ogr_sql_sqlite_1():
                      "\"from\" = 'from_val'"]:
             sql_lyr = ds.ExecuteSQL("SELECT * FROM my_layer WHERE " + cond, dialect='SQLite')
             feat = sql_lyr.GetNextFeature()
-            if feat is None:
-                print(cond)
-                return 'fail'
+            assert feat is not None, cond
             feat = None
             ds.ReleaseResultSet(sql_lyr)
 
@@ -241,8 +233,7 @@ def test_ogr_sql_sqlite_1():
                      "\"from\" = 'other_val'"]:
             sql_lyr = ds.ExecuteSQL("SELECT * FROM my_layer WHERE " + cond, dialect='SQLite')
             feat = sql_lyr.GetNextFeature()
-            if feat is not None:
-                return 'fail'
+            assert feat is None
             feat = None
             ds.ReleaseResultSet(sql_lyr)
 
@@ -335,10 +326,7 @@ def test_ogr_sql_sqlite_2():
         feat.DumpReadable()
         return 'fail'
     got_srs = feat.GetGeometryRef().GetSpatialReference()
-    if got_srs is None or srs.IsSame(got_srs) == 0:
-        print(srs)
-        print(got_srs)
-        return 'fail'
+    assert not (got_srs is None or srs.IsSame(got_srs) == 0)
     feat = None
     ds.ReleaseResultSet(sql_lyr)
 
@@ -353,10 +341,7 @@ def test_ogr_sql_sqlite_2():
         feat.DumpReadable()
         return 'fail'
     got_srs = feat.GetGeometryRef().GetSpatialReference()
-    if got_srs is None or srs.IsSame(got_srs) == 0:
-        print(srs)
-        print(got_srs)
-        return 'fail'
+    assert not (got_srs is None or srs.IsSame(got_srs) == 0)
     feat = None
     ds.ReleaseResultSet(sql_lyr)
 
@@ -379,10 +364,7 @@ def test_ogr_sql_sqlite_2():
     sql_lyr = ds.ExecuteSQL("SELECT * FROM my_layer2", dialect='SQLite')
 
     layer_srs = sql_lyr.GetSpatialRef()
-    if layer_srs is None or srs.IsSame(layer_srs) == 0:
-        print(srs)
-        print(layer_srs)
-        return 'fail'
+    assert not (layer_srs is None or srs.IsSame(layer_srs) == 0)
 
     for _ in range(2):
         feat = sql_lyr.GetNextFeature()
@@ -390,10 +372,7 @@ def test_ogr_sql_sqlite_2():
             feat.DumpReadable()
             return 'fail'
         got_srs = feat.GetGeometryRef().GetSpatialReference()
-        if got_srs is None or srs.IsSame(got_srs) == 0:
-            print(srs)
-            print(got_srs)
-            return 'fail'
+        assert not (got_srs is None or srs.IsSame(got_srs) == 0)
         feat = None
 
     ds.ReleaseResultSet(sql_lyr)
@@ -425,9 +404,7 @@ def test_ogr_sql_sqlite_3():
         return 'fail'
     ds.ReleaseResultSet(sql_lyr)
 
-    if count != 10:
-        print(count)
-        return 'fail'
+    assert count == 10
 
     ds = None
 
@@ -448,9 +425,7 @@ def test_ogr_sql_sqlite_4():
     count = sql_lyr.GetFeatureCount()
     ds.ReleaseResultSet(sql_lyr)
 
-    if count != 10:
-        print(count)
-        return 'fail'
+    assert count == 10
 
     ds = None
 
@@ -489,9 +464,7 @@ def test_ogr_sql_sqlite_5():
 
     ds = None
 
-    if count != 1:
-        print(count)
-        return 'fail'
+    assert count == 1
 
     return 'success'
 
@@ -547,8 +520,7 @@ def test_ogr_sql_sqlite_7():
     # Test SELECT
     sql_lyr = ds.ExecuteSQL("SELECT * FROM my_layer", dialect='SQLite')
 
-    if sql_lyr.GetGeometryColumn() != 'GEOMETRY2':
-        return 'fail'
+    assert sql_lyr.GetGeometryColumn() == 'GEOMETRY2'
 
     feat = sql_lyr.GetNextFeature()
     if feat.GetField('intfield') != 1 or \
@@ -738,8 +710,7 @@ def test_ogr_sql_sqlite_13():
     geom = feat.GetGeometryRef()
     ds.ReleaseResultSet(sql_lyr)
 
-    if geom is not None:
-        return 'fail'
+    assert geom is None
 
     # Test on non existing layer
     gdal.PushErrorHandler('CPLQuietErrorHandler')
@@ -749,8 +720,7 @@ def test_ogr_sql_sqlite_13():
     geom = feat.GetGeometryRef()
     ds.ReleaseResultSet(sql_lyr)
 
-    if geom is not None:
-        return 'fail'
+    assert geom is None
 
     # Test ogr_layer_Extent()
     sql_lyr = ds.ExecuteSQL("SELECT ogr_layer_Extent('my_layer')", dialect='SQLite')
@@ -759,9 +729,7 @@ def test_ogr_sql_sqlite_13():
     feat = None
     ds.ReleaseResultSet(sql_lyr)
 
-    if geom_wkt != 'POLYGON ((0 1,2 1,2 3,0 3,0 1))':
-        print(geom_wkt)
-        return 'fail'
+    assert geom_wkt == 'POLYGON ((0 1,2 1,2 3,0 3,0 1))'
 
     # Test ogr_layer_FeatureCount()
     sql_lyr = ds.ExecuteSQL("SELECT ogr_layer_FeatureCount('my_layer') AS the_count", dialect='SQLite')
@@ -770,9 +738,7 @@ def test_ogr_sql_sqlite_13():
     feat = None
     ds.ReleaseResultSet(sql_lyr)
 
-    if count != 1:
-        print(count)
-        return 'fail'
+    assert count == 1
 
     # Test ogr_layer_Extent() on a non spatial layer
     sql_lyr = ds.ExecuteSQL("SELECT ogr_layer_Extent('non_spatial')", dialect='SQLite')
@@ -780,8 +746,7 @@ def test_ogr_sql_sqlite_13():
     geom = feat.GetGeometryRef()
     ds.ReleaseResultSet(sql_lyr)
 
-    if geom is not None:
-        return 'fail'
+    assert geom is None
 
     # Test ogr_layer_SRID()
     sql_lyr = ds.ExecuteSQL("SELECT ogr_layer_SRID('my_layer') AS the_srid", dialect='SQLite')
@@ -790,9 +755,7 @@ def test_ogr_sql_sqlite_13():
     feat = None
     ds.ReleaseResultSet(sql_lyr)
 
-    if the_srid != 4326:
-        print(the_srid)
-        return 'fail'
+    assert the_srid == 4326
 
     # Test ogr_layer_SRID() on a non spatial layer
     sql_lyr = ds.ExecuteSQL("SELECT ogr_layer_SRID('non_spatial') AS the_srid", dialect='SQLite')
@@ -801,8 +764,7 @@ def test_ogr_sql_sqlite_13():
     feat = None
     ds.ReleaseResultSet(sql_lyr)
 
-    if the_srid is not None:
-        return 'fail'
+    assert the_srid is None
 
     # Test ogr_layer_GeometryType()
     sql_lyr = ds.ExecuteSQL("SELECT ogr_layer_GeometryType('my_layer') AS the_geometrytype", dialect='SQLite')
@@ -811,9 +773,7 @@ def test_ogr_sql_sqlite_13():
     feat = None
     ds.ReleaseResultSet(sql_lyr)
 
-    if the_geometrytype != 'LINESTRING':
-        print(the_geometrytype)
-        return 'fail'
+    assert the_geometrytype == 'LINESTRING'
 
     # Test ogr_layer_GeometryType() on a non spatial layer
     sql_lyr = ds.ExecuteSQL("SELECT ogr_layer_GeometryType('non_spatial') AS the_geometrytype", dialect='SQLite')
@@ -822,8 +782,7 @@ def test_ogr_sql_sqlite_13():
     feat = None
     ds.ReleaseResultSet(sql_lyr)
 
-    if the_geometrytype is not None:
-        return 'fail'
+    assert the_geometrytype is None
 
     # Test on a external virtual table
     ds_shape = ogr.GetDriverByName("ESRI Shapefile").CreateDataSource('/vsimem/ogr_sql_sqlite_13.shp')
@@ -840,9 +799,7 @@ def test_ogr_sql_sqlite_13():
 
     ogr.GetDriverByName("ESRI Shapefile").DeleteDataSource('/vsimem/ogr_sql_sqlite_13.shp')
 
-    if the_srid_shp != 32631:
-        print(the_srid_shp)
-        return 'fail'
+    assert the_srid_shp == 32631
 
     ds = None
 
@@ -906,13 +863,11 @@ def ogr_sql_sqlite_14_and_15(sql):
         feat = None
 
     feat = sql_lyr.GetNextFeature()
-    if feat is not None:
-        return 'fail'
+    assert feat is None
 
     ds.ReleaseResultSet(sql_lyr)
 
-    if not (got_one and got_two):
-        return 'fail'
+    assert (got_one and got_two)
 
     return 'success'
 
@@ -1661,9 +1616,7 @@ def test_ogr_sql_sqlite_25():
     ds.ReleaseResultSet(sql_lyr)
 
     for fct in ["ST_AsText", "ST_GeomFromText", "ST_AsBinary", "ST_GeomFromWKB"]:
-        if not ogr_sql_sqlite_25_test_errors(ds, fct):
-            gdaltest.post_reason('fail with %s' % fct)
-            return 'fail'
+        assert ogr_sql_sqlite_25_test_errors(ds, fct), ('fail with %s' % fct)
 
     # Test ST_SRID
     sql_lyr = ds.ExecuteSQL("SELECT ST_SRID(ST_GeomFromText('POINT(0 0)',4326))", dialect='SQLite')
@@ -1671,9 +1624,7 @@ def test_ogr_sql_sqlite_25():
     val_sql = feat.GetField(0)
     ds.ReleaseResultSet(sql_lyr)
 
-    if val_sql != 4326:
-        print(val_sql)
-        return 'fail'
+    assert val_sql == 4326
 
     # Test ST_Area
     sql_lyr = ds.ExecuteSQL("SELECT ST_Area(ST_GeomFromText('%s')), ST_Area(null), ST_Area(x'00')" % 'POLYGON((0 0,0 1,1 1,1 0,0 0))', dialect='SQLite')
@@ -1686,17 +1637,11 @@ def test_ogr_sql_sqlite_25():
     geomA = ogr.CreateGeometryFromWkt('POLYGON((0 0,0 1,1 1,1 0,0 0))')
     val_ogr = geomA.GetArea()
 
-    if abs(val_sql - val_ogr) > 1e-5:
-        print(val_sql)
-        print(val_ogr)
-        return 'fail'
+    assert abs(val_sql - val_ogr) <= 1e-5
 
-    if val1_sql is not None:
-        print(val1_sql)
-        return 'fail'
+    assert val1_sql is None
 
-    if val2_sql is not None:
-        return 'fail'
+    assert val2_sql is None
 
     return 'success'
 
@@ -1729,9 +1674,7 @@ def test_ogr_sql_sqlite_26():
     geom = ogr.CreateGeometryFromWkt(geom1_wkt)
     geom_geos = geom.Buffer(0.1)
 
-    if geom_sql.Equals(geom_geos) == 0:
-        gdaltest.post_reason('fail with %s' % op_str)
-        return 'fail'
+    assert geom_sql.Equals(geom_geos) != 0, ('fail with %s' % op_str)
 
     for op_str in ["IsEmpty", "IsSimple", "IsValid"]:
         for wkt in ['POLYGON EMPTY', 'POINT(0 1)', 'POLYGON((0 0,1 1,0 1,1 0,0 0))']:
@@ -1771,9 +1714,7 @@ def test_ogr_sql_sqlite_26():
             geomB = ogr.CreateGeometryFromWkt(geomB_wkt)
             op = getattr(geomA, op_str)
             b_geos = op(geomB)
-            if b_sql != b_geos:
-                gdaltest.post_reason('fail with %s' % op_str)
-                return 'fail'
+            assert b_sql == b_geos, ('fail with %s' % op_str)
 
     for op_str in ["Intersection", "Difference", "Union", "SymDifference"]:
         for (geomA_wkt, geomB_wkt) in [(geom1_wkt, geom1_wkt),
@@ -1796,15 +1737,12 @@ def test_ogr_sql_sqlite_26():
                 # GEOS can return empty geometry collection, while spatialite
                 # does not
                 if geom_geos is not None and geom_geos.IsEmpty() == 0:
-                    gdaltest.post_reason('fail with %s' % op_str)
                     print(geomA_wkt)
                     print(geomB_wkt)
                     print(geom_geos.ExportToWkt())
-                    return 'fail'
+                    pytest.fail('fail with %s' % op_str)
             else:
-                if geom_sql.Equals(geom_geos) == 0:
-                    gdaltest.post_reason('fail with %s' % op_str)
-                    return 'fail'
+                assert geom_sql.Equals(geom_geos) != 0, ('fail with %s' % op_str)
 
     # Error cases
     op_str = 'Intersects'
@@ -1814,9 +1752,7 @@ def test_ogr_sql_sqlite_26():
         b0_sql = feat.GetField(0)
         b1_sql = feat.GetField(1)
         ds.ReleaseResultSet(sql_lyr)
-        if b0_sql > 0 or b1_sql > 0:
-            gdaltest.post_reason('fail with %s' % op_str)
-            return 'fail'
+        assert b0_sql <= 0 and b1_sql <= 0, ('fail with %s' % op_str)
 
     op_str = 'Intersection'
     for val in ['null', "'foo'", "x'00010203'"]:
@@ -1824,17 +1760,13 @@ def test_ogr_sql_sqlite_26():
         feat = sql_lyr.GetNextFeature()
         geom_sql = feat.GetGeometryRef()
         ds.ReleaseResultSet(sql_lyr)
-        if geom_sql is not None:
-            gdaltest.post_reason('fail with %s' % op_str)
-            return 'fail'
+        assert geom_sql is None, ('fail with %s' % op_str)
 
         sql_lyr = ds.ExecuteSQL("SELECT ST_%s(%s, ST_GeomFromText('%s'))" % (op_str, val, geom1_wkt), dialect='SQLite')
         feat = sql_lyr.GetNextFeature()
         geom_sql = feat.GetGeometryRef()
         ds.ReleaseResultSet(sql_lyr)
-        if geom_sql is not None:
-            gdaltest.post_reason('fail with %s' % op_str)
-            return 'fail'
+        assert geom_sql is None, ('fail with %s' % op_str)
 
     return 'success'
 
@@ -1857,21 +1789,17 @@ def test_ogr_sql_sqlite_27():
     feat.SetField(0, '2013/01/01 00:00:00')
     lyr.CreateFeature(feat)
     lyr = ds.ExecuteSQL("SELECT MIN(DATE), MAX(DATE) from test", dialect='SQLite')
-    if lyr.GetLayerDefn().GetFieldDefn(0).GetType() != ogr.OFTDateTime:
-        return 'fail'
-    if lyr.GetLayerDefn().GetFieldDefn(1).GetType() != ogr.OFTDateTime:
-        return 'fail'
+    assert lyr.GetLayerDefn().GetFieldDefn(0).GetType() == ogr.OFTDateTime
+    assert lyr.GetLayerDefn().GetFieldDefn(1).GetType() == ogr.OFTDateTime
     tr = ogrtest.check_features_against_list(lyr, 'MIN(DATE)', ['2013/01/01 00:00:00'])
     lyr.ResetReading()
     tr2 = ogrtest.check_features_against_list(lyr, 'MAX(DATE)', ['2013/12/31 23:59:59'])
 
     ds.ReleaseResultSet(lyr)
 
-    if not tr:
-        return 'fail'
+    assert tr
 
-    if not tr2:
-        return 'fail'
+    assert tr2
 
     return 'success'
 
@@ -1891,9 +1819,7 @@ def test_ogr_sql_sqlite_28():
         gdal.PushErrorHandler('CPLQuietErrorHandler')
         sql_lyr = ds.ExecuteSQL(sql, dialect='SQLite')
         gdal.PopErrorHandler()
-        if sql_lyr is not None:
-            print(sql)
-            return 'fail'
+        assert sql_lyr is None, sql
 
     # Invalid hstore syntax or empty result
     for sql in ["SELECT hstore_get_value('a', null)",
@@ -1943,13 +1869,9 @@ def test_ogr_sql_sqlite_29():
     ds.ReleaseResultSet(sql_lyr)
     ds = None
 
-    if geom_type != ogr.wkbCircularString:
-        print(geom_type)
-        return 'fail'
+    assert geom_type == ogr.wkbCircularString
 
-    if got_wkt != 'CIRCULARSTRING (0 0,1 0,0 0)':
-        print(got_wkt)
-        return 'fail'
+    assert got_wkt == 'CIRCULARSTRING (0 0,1 0,0 0)'
 
     return 'success'
 
@@ -1979,13 +1901,9 @@ def test_ogr_sql_sqlite_30():
     got_wkt = f.GetGeometryRef().ExportToIsoWkt()
     ds.ReleaseResultSet(sql_lyr)
 
-    if geom_type != ogr.wkbLineStringM:
-        print(geom_type)
-        return 'fail'
+    assert geom_type == ogr.wkbLineStringM
 
-    if got_wkt != 'LINESTRING M (1 2 3)':
-        print(got_wkt)
-        return 'fail'
+    assert got_wkt == 'LINESTRING M (1 2 3)'
 
     sql_lyr = ds.ExecuteSQL('select * from testzm', dialect='SQLite')
     geom_type = sql_lyr.GetGeomType()
@@ -1993,13 +1911,9 @@ def test_ogr_sql_sqlite_30():
     got_wkt = f.GetGeometryRef().ExportToIsoWkt()
     ds.ReleaseResultSet(sql_lyr)
 
-    if geom_type != ogr.wkbLineStringZM:
-        print(geom_type)
-        return 'fail'
+    assert geom_type == ogr.wkbLineStringZM
 
-    if got_wkt != 'LINESTRING ZM (1 2 3 4)':
-        print(got_wkt)
-        return 'fail'
+    assert got_wkt == 'LINESTRING ZM (1 2 3 4)'
 
     return 'success'
 
@@ -2025,8 +1939,7 @@ def test_ogr_sql_sqlite_31():
     value = f.GetField(0)
     ds.ReleaseResultSet(sql_lyr)
 
-    if value != 25:
-        return 'fail'
+    assert value == 25
 
     return 'success'
 
diff --git a/autotest/ogr/ogr_sql_test.py b/autotest/ogr/ogr_sql_test.py
index 9d6f952a386a..fbabb01d318e 100755
--- a/autotest/ogr/ogr_sql_test.py
+++ b/autotest/ogr/ogr_sql_test.py
@@ -46,15 +46,13 @@ def test_ogr_sql_1():
     gdaltest.lyr.SetAttributeFilter('eas_id < 167')
 
     count = gdaltest.lyr.GetFeatureCount()
-    if count != 3:
-        gdaltest.post_reason('Got wrong count with GetFeatureCount() - %d, expecting 3' % count)
-        return 'fail'
+    assert count == 3, \
+        ('Got wrong count with GetFeatureCount() - %d, expecting 3' % count)
 
     gdaltest.lyr.SetAttributeFilter('')
     count = gdaltest.lyr.GetFeatureCount()
-    if count != 10:
-        gdaltest.post_reason('Got wrong count with GetFeatureCount() - %d, expecting 10' % count)
-        return 'fail'
+    assert count == 10, \
+        ('Got wrong count with GetFeatureCount() - %d, expecting 10' % count)
 
     return 'success'
 
@@ -344,10 +342,7 @@ def test_ogr_sql_17():
 
     fld_def = sql_lyr.GetLayerDefn().GetFieldDefn(0)
 
-    if fld_def.GetName() != 'fid':
-        gdaltest.post_reason('got wrong fid field name')
-        print(fld_def.GetName())
-        return 'fail'
+    assert fld_def.GetName() == 'fid', 'got wrong fid field name'
 
     if fld_def.GetType() != ogr.OFTString:
         gdaltest.post_reason('got wrong fid field type')
@@ -359,10 +354,7 @@ def test_ogr_sql_17():
 
     fld_def = sql_lyr.GetLayerDefn().GetFieldDefn(1)
 
-    if fld_def.GetName() != 'data':
-        gdaltest.post_reason('got wrong data field name')
-        print(fld_def.GetName())
-        return 'fail'
+    assert fld_def.GetName() == 'data', 'got wrong data field name'
 
     if fld_def.GetType() != ogr.OFTReal:
         gdaltest.post_reason('got wrong data field type')
@@ -395,8 +387,7 @@ def test_ogr_sql_18():
     name = 'data/departs.vrt'
 
     ds = ogr.Open(name)
-    if ds is None:
-        return 'fail'
+    assert ds is not None
 
     sql = 'select * from D\303\251parts'
     sql_lyr = ds.ExecuteSQL(sql)
@@ -404,8 +395,7 @@ def test_ogr_sql_18():
         ds = None
         return 'fail'
     feat = sql_lyr.GetNextFeature()
-    if feat is None:
-        return 'fail'
+    assert feat is not None
     feat = None
 
     ds.ReleaseResultSet(sql_lyr)
@@ -417,8 +407,7 @@ def test_ogr_sql_18():
         ds = None
         return 'fail'
     feat = sql_lyr.GetNextFeature()
-    if feat is None:
-        return 'fail'
+    assert feat is not None
     feat = None
 
     ds.ReleaseResultSet(sql_lyr)
@@ -436,8 +425,7 @@ def test_ogr_sql_19():
     sql_lyr = gdaltest.ds.ExecuteSQL('')
     gdal.PopErrorHandler()
 
-    if sql_lyr is not None:
-        return 'fail'
+    assert sql_lyr is None
 
     return 'success'
 
@@ -459,8 +447,7 @@ def test_ogr_sql_20():
     mem_lyr.CreateFeature(feat)
 
     sql_lyr = mem_ds.ExecuteSQL("SELECT * from my_layer")
-    if sql_lyr.GetFeatureCount() != 2:
-        return 'fail'
+    assert sql_lyr.GetFeatureCount() == 2
     mem_ds.ReleaseResultSet(sql_lyr)
     mem_ds = None
 
@@ -476,10 +463,8 @@ def test_ogr_sql_21():
     mem_ds.CreateLayer("my_layer")
 
     sql_lyr = mem_ds.ExecuteSQL("SELECT *, fid from my_layer")
-    if sql_lyr.GetLayerDefn().GetFieldCount() != 1:
-        return 'fail'
-    if sql_lyr.GetLayerDefn().GetFieldDefn(0).GetName() != 'fid':
-        return 'fail'
+    assert sql_lyr.GetLayerDefn().GetFieldCount() == 1
+    assert sql_lyr.GetLayerDefn().GetFieldDefn(0).GetName() == 'fid'
     mem_ds.ReleaseResultSet(sql_lyr)
     mem_ds = None
 
@@ -500,16 +485,11 @@ def test_ogr_sql_22():
     mem_lyr.CreateFeature(feat)
 
     sql_lyr = mem_ds.ExecuteSQL("SELECT *, fid, *, my_layer.* from my_layer")
-    if sql_lyr.GetLayerDefn().GetFieldCount() != 4:
-        return 'fail'
-    if sql_lyr.GetLayerDefn().GetFieldDefn(0).GetName() != 'test':
-        return 'fail'
-    if sql_lyr.GetLayerDefn().GetFieldDefn(1).GetName() != 'fid':
-        return 'fail'
-    if sql_lyr.GetLayerDefn().GetFieldDefn(2).GetName() != 'test':
-        return 'fail'
-    if sql_lyr.GetLayerDefn().GetFieldDefn(3).GetName() != 'my_layer.test':
-        return 'fail'
+    assert sql_lyr.GetLayerDefn().GetFieldCount() == 4
+    assert sql_lyr.GetLayerDefn().GetFieldDefn(0).GetName() == 'test'
+    assert sql_lyr.GetLayerDefn().GetFieldDefn(1).GetName() == 'fid'
+    assert sql_lyr.GetLayerDefn().GetFieldDefn(2).GetName() == 'test'
+    assert sql_lyr.GetLayerDefn().GetFieldDefn(3).GetName() == 'my_layer.test'
     mem_ds.ReleaseResultSet(sql_lyr)
     mem_ds = None
 
@@ -536,8 +516,7 @@ def test_ogr_sql_23():
     mem_lyr.CreateFeature(feat)
 
     sql_lyr = mem_ds.ExecuteSQL("SELECT DISTINCT test from my_layer")
-    if sql_lyr.GetFeatureCount() != 2:
-        return 'fail'
+    assert sql_lyr.GetFeatureCount() == 2
     mem_ds.ReleaseResultSet(sql_lyr)
     mem_ds = None
 
@@ -587,13 +566,10 @@ def test_ogr_sql_25():
     mem_lyr.CreateFeature(feat)
 
     sql_lyr = mem_ds.ExecuteSQL("SELECT test, OGR_GEOM_AREA from my_layer WHERE OGR_GEOM_AREA > 0.9")
-    if sql_lyr.GetFeatureCount() != 1:
-        return 'fail'
+    assert sql_lyr.GetFeatureCount() == 1
     feat = sql_lyr.GetNextFeature()
-    if feat.GetFieldAsDouble('OGR_GEOM_AREA') != 1.0:
-        return 'fail'
-    if feat.GetFieldAsString('test') != '0':
-        return 'fail'
+    assert feat.GetFieldAsDouble('OGR_GEOM_AREA') == 1.0
+    assert feat.GetFieldAsString('test') == '0'
     mem_ds.ReleaseResultSet(sql_lyr)
 
     mem_ds = None
@@ -614,13 +590,10 @@ def test_ogr_sql_26():
     mem_lyr.CreateFeature(feat)
 
     sql_lyr = mem_ds.ExecuteSQL("SELECT 'literal_value' AS my_column, 'literal_value2' my_column2 FROM my_layer")
-    if sql_lyr.GetFeatureCount() != 1:
-        return 'fail'
+    assert sql_lyr.GetFeatureCount() == 1
     feat = sql_lyr.GetNextFeature()
-    if feat.GetFieldAsString('my_column') != 'literal_value':
-        return 'fail'
-    if feat.GetFieldAsString('my_column2') != 'literal_value2':
-        return 'fail'
+    assert feat.GetFieldAsString('my_column') == 'literal_value'
+    assert feat.GetFieldAsString('my_column2') == 'literal_value2'
     mem_ds.ReleaseResultSet(sql_lyr)
 
     mem_ds = None
@@ -820,9 +793,7 @@ def test_ogr_sql_28():
             gdaltest.post_reason('expected None result on "%s"' % query)
             ds.ReleaseResultSet(sql_lyr)
             return 'fail'
-        if gdal.GetLastErrorType() == 0:
-            gdaltest.post_reason('expected error on "%s"' % query)
-            return 'fail'
+        assert gdal.GetLastErrorType() != 0, ('expected error on "%s"' % query)
 
     ds = None
 
@@ -860,15 +831,9 @@ def test_ogr_sql_29():
 
     ds = None
 
-    if count_is_null != 1:
-        gdaltest.post_reason('IS NULL failed')
-        print(count_is_null)
-        return 'fail'
+    assert count_is_null == 1, 'IS NULL failed'
 
-    if count_is_not_null != 2:
-        gdaltest.post_reason('IS NOT NULL failed')
-        print(count_is_not_null)
-        return 'fail'
+    assert count_is_not_null == 2, 'IS NOT NULL failed'
 
     return 'success'
 
@@ -887,8 +852,7 @@ def test_ogr_sql_30():
 
     gdaltest.ds.ReleaseResultSet(sql_lyr)
 
-    if gdal.GetLastErrorMsg() != '':
-        return 'fail'
+    assert gdal.GetLastErrorMsg() == ''
 
     return 'success' if val_count == 10 else 'fail'
 
@@ -907,8 +871,7 @@ def test_ogr_sql_31():
 
     gdaltest.ds.ReleaseResultSet(sql_lyr)
 
-    if gdal.GetLastErrorMsg() != '':
-        return 'fail'
+    assert gdal.GetLastErrorMsg() == ''
 
     return 'success' if val is None else 'fail'
 
@@ -928,8 +891,7 @@ def test_ogr_sql_32():
 
     gdaltest.ds.ReleaseResultSet(sql_lyr)
 
-    if gdal.GetLastErrorMsg() != '':
-        return 'fail'
+    assert gdal.GetLastErrorMsg() == ''
 
     return 'success' if val is None else 'fail'
 
@@ -946,37 +908,31 @@ def test_ogr_sql_33():
     for extrakeyword in ('COLUMN ', ''):
         sql = 'ALTER TABLE my_layer ADD %smyfield NUMERIC(20, 8)' % extrakeyword
         ds.ExecuteSQL(sql)
-        if lyr.GetLayerDefn().GetFieldIndex('myfield') == -1 or \
-                lyr.GetLayerDefn().GetFieldDefn(lyr.GetLayerDefn().GetFieldIndex('myfield')).GetType() != ogr.OFTReal or \
-                lyr.GetLayerDefn().GetFieldDefn(lyr.GetLayerDefn().GetFieldIndex('myfield')).GetWidth() != 20 or \
-                lyr.GetLayerDefn().GetFieldDefn(lyr.GetLayerDefn().GetFieldIndex('myfield')).GetPrecision() != 8:
-            gdaltest.post_reason('%s failed' % sql)
-            return 'fail'
+        assert (lyr.GetLayerDefn().GetFieldIndex('myfield') != -1 and \
+                lyr.GetLayerDefn().GetFieldDefn(lyr.GetLayerDefn().GetFieldIndex('myfield')).GetType() == ogr.OFTReal and \
+                lyr.GetLayerDefn().GetFieldDefn(lyr.GetLayerDefn().GetFieldIndex('myfield')).GetWidth() == 20 and \
+                lyr.GetLayerDefn().GetFieldDefn(lyr.GetLayerDefn().GetFieldIndex('myfield')).GetPrecision() == 8), \
+            ('%s failed' % sql)
 
         sql = 'ALTER TABLE my_layer RENAME %smyfield TO "myfield 2"' % extrakeyword
         ds.ExecuteSQL(sql)
-        if lyr.GetLayerDefn().GetFieldIndex('myfield') != -1 or \
-                lyr.GetLayerDefn().GetFieldIndex('myfield 2') == -1:
-            gdaltest.post_reason('%s failed' % sql)
-            return 'fail'
+        assert (lyr.GetLayerDefn().GetFieldIndex('myfield') == -1 and \
+                lyr.GetLayerDefn().GetFieldIndex('myfield 2') != -1), \
+            ('%s failed' % sql)
 
         sql = 'ALTER TABLE my_layer ALTER %s"myfield 2" TYPE CHARACTER' % extrakeyword
         ds.ExecuteSQL(sql)
-        if lyr.GetLayerDefn().GetFieldDefn(lyr.GetLayerDefn().GetFieldIndex('myfield 2')).GetType() != ogr.OFTString:
-            gdaltest.post_reason('%s failed' % sql)
-            return 'fail'
+        assert lyr.GetLayerDefn().GetFieldDefn(lyr.GetLayerDefn().GetFieldIndex('myfield 2')).GetType() == ogr.OFTString, \
+            ('%s failed' % sql)
 
         sql = 'ALTER TABLE my_layer ALTER %s"myfield 2" TYPE CHARACTER(15)' % extrakeyword
         ds.ExecuteSQL(sql)
-        if lyr.GetLayerDefn().GetFieldDefn(lyr.GetLayerDefn().GetFieldIndex('myfield 2')).GetWidth() != 15:
-            gdaltest.post_reason('%s failed' % sql)
-            return 'fail'
+        assert lyr.GetLayerDefn().GetFieldDefn(lyr.GetLayerDefn().GetFieldIndex('myfield 2')).GetWidth() == 15, \
+            ('%s failed' % sql)
 
         sql = 'ALTER TABLE my_layer DROP %s"myfield 2"' % extrakeyword
         ds.ExecuteSQL(sql)
-        if lyr.GetLayerDefn().GetFieldIndex('myfield 2') != -1:
-            gdaltest.post_reason('%s failed' % sql)
-            return 'fail'
+        assert lyr.GetLayerDefn().GetFieldIndex('myfield 2') == -1, ('%s failed' % sql)
 
     ds = None
 
@@ -995,15 +951,12 @@ def test_ogr_sql_34():
 
     gdaltest.ds.ReleaseResultSet(sql_lyr)
 
-    if val != 1:
-        print(val)
-        return 'fail'
+    assert val == 1
 
     gdal.PushErrorHandler('CPLQuietErrorHandler')
     sql_lyr = gdaltest.ds.ExecuteSQL("select count(*) from poly where eas_id in ('a165')")
     gdal.PopErrorHandler()
-    if sql_lyr is not None:
-        return 'fail'
+    assert sql_lyr is None
 
     return 'success'
 
@@ -1236,14 +1189,12 @@ def test_ogr_sql_42():
     lyr.SetAttributeFilter("prfedea <> ''")
     feat = lyr.GetNextFeature()
     lyr.SetAttributeFilter(None)
-    if feat is None:
-        return 'fail'
+    assert feat is not None
 
     sql_lyr = gdaltest.ds.ExecuteSQL("SELECT * FROM poly WHERE prfedea <> ''")
     feat = sql_lyr.GetNextFeature()
     gdaltest.ds.ReleaseResultSet(sql_lyr)
-    if feat is None:
-        return 'fail'
+    assert feat is not None
 
     return 'success'
 
@@ -1277,9 +1228,7 @@ def test_ogr_sql_44():
         gdal.PushErrorHandler('CPLQuietErrorHandler')
         sql_lyr = gdaltest.ds.ExecuteSQL(sql)
         gdal.PopErrorHandler()
-        if sql_lyr is not None:
-            print(sql)
-            return 'fail'
+        assert sql_lyr is None, sql
 
     # Invalid hstore syntax or empty result
     for sql in ["SELECT hstore_get_value('a', null) FROM poly",
@@ -1343,22 +1292,18 @@ def test_ogr_sql_45():
 </OGRVRTDataSource>""")
     lyr = ds.GetLayer(0)
 
-    if lyr.GetFeatureCount() != 1000000000000:
-        return 'fail'
+    assert lyr.GetFeatureCount() == 1000000000000
 
     sql_lyr = ds.ExecuteSQL('SELECT COUNT(*) FROM poly')
     f = sql_lyr.GetNextFeature()
-    if f.GetField(0) != 1000000000000:
-        return 'fail'
+    assert f.GetField(0) == 1000000000000
     f = None
     ds.ReleaseResultSet(sql_lyr)
 
     sql_lyr = ds.ExecuteSQL('SELECT COUNT(AREA) FROM poly')
-    if sql_lyr.GetLayerDefn().GetFieldDefn(0).GetType() != ogr.OFTInteger:
-        return 'fail'
+    assert sql_lyr.GetLayerDefn().GetFieldDefn(0).GetType() == ogr.OFTInteger
     f = sql_lyr.GetNextFeature()
-    if f.GetField(0) != 10:
-        return 'fail'
+    assert f.GetField(0) == 10
     f = None
     ds.ReleaseResultSet(sql_lyr)
 
@@ -1390,8 +1335,7 @@ def test_ogr_sql_46():
         feat.DumpReadable()
         return 'fail'
     feat = sql_lyr.GetNextFeature()
-    if feat is not None:
-        return 'fail'
+    assert feat is None
     ds.ReleaseResultSet(sql_lyr)
 
     sql_lyr = ds.ExecuteSQL("select max(\"id\"), max(id), count(\"id\"), count(id) from \"test\"")
@@ -1405,29 +1349,25 @@ def test_ogr_sql_46():
     gdal.PushErrorHandler()
     sql_lyr = ds.ExecuteSQL("select * from 'test'")
     gdal.PopErrorHandler()
-    if sql_lyr is not None:
-        return 'fail'
+    assert sql_lyr is None
 
     # Not accepted
     gdal.PushErrorHandler()
     sql_lyr = ds.ExecuteSQL("select distinct 'id' from 'test'")
     gdal.PopErrorHandler()
-    if sql_lyr is not None:
-        return 'fail'
+    assert sql_lyr is None
 
     # Not accepted
     gdal.PushErrorHandler()
     sql_lyr = ds.ExecuteSQL("select max('id') from 'test'")
     gdal.PopErrorHandler()
-    if sql_lyr is not None:
-        return 'fail'
+    assert sql_lyr is None
 
     # Not accepted
     gdal.PushErrorHandler()
     sql_lyr = ds.ExecuteSQL("select id as 'id2' from 'test'")
     gdal.PopErrorHandler()
-    if sql_lyr is not None:
-        return 'fail'
+    assert sql_lyr is None
 
     return 'success'
 
@@ -1445,9 +1385,7 @@ def test_ogr_sql_47():
             new_val = f['text_value']
         else:
             new_val = ''
-        if new_val < prec_val:
-            print("new_val = '%s', prec_val = '%s'" % (new_val, prec_val))
-            return 'fail'
+        assert new_val >= prec_val, ("new_val = '%s', prec_val = '%s'" % (new_val, prec_val))
         prec_val = new_val
     ds.ReleaseResultSet(sql_lyr)
 
@@ -1477,8 +1415,7 @@ def test_ogr_sql_48():
             return 'fail'
         i = i + 1
     ds.ReleaseResultSet(sql_lyr)
-    if i != 1001:
-        return 'fail'
+    assert i == 1001
 
     return 'success'
 
diff --git a/autotest/ogr/ogr_sqlite.py b/autotest/ogr/ogr_sqlite.py
index 76fde9f4fba6..2599f5e9d490 100755
--- a/autotest/ogr/ogr_sqlite.py
+++ b/autotest/ogr/ogr_sqlite.py
@@ -94,24 +94,18 @@ def test_ogr_sqlite_2():
     gdal.PushErrorHandler('CPLQuietErrorHandler')
     lyr = gdaltest.sl_ds.CreateLayer('will_fail', options=['FORMAT=FOO'])
     gdal.PopErrorHandler()
-    if lyr is not None:
-        gdaltest.post_reason('layer creation should have failed')
-        return 'fail'
+    assert lyr is None, 'layer creation should have failed'
 
     # Test creating a layer with an existing name
     lyr = gdaltest.sl_ds.CreateLayer('a_layer')
     gdal.PushErrorHandler('CPLQuietErrorHandler')
     lyr = gdaltest.sl_ds.CreateLayer('a_layer')
     gdal.PopErrorHandler()
-    if lyr is not None:
-        gdaltest.post_reason('layer creation should have failed')
-        return 'fail'
+    assert lyr is None, 'layer creation should have failed'
 
     # Test OVERWRITE=YES
     lyr = gdaltest.sl_ds.CreateLayer('a_layer', options=['FID=my_fid', 'GEOMETRY_NAME=mygeom', 'OVERWRITE=YES'])
-    if lyr is None:
-        gdaltest.post_reason('layer creation should have succeeded')
-        return 'fail'
+    assert lyr is not None, 'layer creation should have succeeded'
 
     ######################################################
     # Create Layer
@@ -139,8 +133,7 @@ def test_ogr_sqlite_2():
     gdaltest.sl_ds = None
     gdaltest.sl_ds = ogr.Open('tmp/sqlite_test.db', update=1)
     gdaltest.sl_lyr = gdaltest.sl_ds.GetLayerByName('tpoly')
-    if gdaltest.sl_lyr.GetGeometryColumn() != 'GEOMETRY':
-        return 'fail'
+    assert gdaltest.sl_lyr.GetGeometryColumn() == 'GEOMETRY'
 
     for field_desc in fields:
         feature_def = gdaltest.sl_lyr.GetLayerDefn()
@@ -150,16 +143,12 @@ def test_ogr_sqlite_2():
                   (field_desc[0], field_defn.GetFieldTypeName(field_defn.GetType()),
                    field_defn.GetFieldTypeName(field_desc[1])))
     field_defn = feature_def.GetFieldDefn(feature_def.GetFieldIndex('fld_boolean'))
-    if field_defn.GetType() != ogr.OFTInteger or field_defn.GetSubType() != ogr.OFSTBoolean:
-        return 'fail'
+    assert field_defn.GetType() == ogr.OFTInteger and field_defn.GetSubType() == ogr.OFSTBoolean
     field_defn = feature_def.GetFieldDefn(feature_def.GetFieldIndex('INT64'))
-    if field_defn.GetType() != ogr.OFTInteger64:
-        return 'fail'
+    assert field_defn.GetType() == ogr.OFTInteger64
 
-    if gdaltest.sl_ds.GetLayerByName('a_layer').GetGeometryColumn() != 'mygeom':
-        return 'fail'
-    if gdaltest.sl_ds.GetLayerByName('a_layer').GetFIDColumn() != 'my_fid':
-        return 'fail'
+    assert gdaltest.sl_ds.GetLayerByName('a_layer').GetGeometryColumn() == 'mygeom'
+    assert gdaltest.sl_ds.GetLayerByName('a_layer').GetFIDColumn() == 'my_fid'
 
     ######################################################
     # Copy in poly.shp
@@ -197,9 +186,7 @@ def test_ogr_sqlite_3():
     if gdaltest.sl_ds is None:
         return 'skip'
 
-    if gdaltest.sl_lyr.GetFeatureCount() != 10:
-        gdaltest.post_reason('GetFeatureCount() returned %d instead of 10' % gdaltest.sl_lyr.GetFeatureCount())
-        return 'fail'
+    assert gdaltest.sl_lyr.GetFeatureCount() == 10
 
     expect = [168, 169, 166, 158, 165]
 
@@ -207,9 +194,7 @@ def test_ogr_sqlite_3():
     tr = ogrtest.check_features_against_list(gdaltest.sl_lyr,
                                              'eas_id', expect)
 
-    if gdaltest.sl_lyr.GetFeatureCount() != 5:
-        gdaltest.post_reason('GetFeatureCount() returned %d instead of 5' % gdaltest.sl_lyr.GetFeatureCount())
-        return 'fail'
+    assert gdaltest.sl_lyr.GetFeatureCount() == 5
 
     gdaltest.sl_lyr.SetAttributeFilter(None)
 
@@ -217,18 +202,14 @@ def test_ogr_sqlite_3():
         orig_feat = gdaltest.poly_feat[i]
         read_feat = gdaltest.sl_lyr.GetNextFeature()
 
-        if read_feat is None:
-            gdaltest.post_reason('Did not get as many features as expected.')
-            return 'fail'
+        assert read_feat is not None, 'Did not get as many features as expected.'
 
-        if ogrtest.check_feature_geometry(read_feat, orig_feat.GetGeometryRef(),
-                                          max_error=0.001) != 0:
-            return 'fail'
+        assert (ogrtest.check_feature_geometry(read_feat, orig_feat.GetGeometryRef(),
+                                          max_error=0.001) == 0)
 
         for fld in range(3):
-            if orig_feat.GetField(fld) != read_feat.GetField(fld):
-                gdaltest.post_reason('Attribute %d does not match' % fld)
-                return 'fail'
+            assert orig_feat.GetField(fld) == read_feat.GetField(fld), \
+                ('Attribute %d does not match' % fld)
         if read_feat.GetField('int64') != 1234567890123:
             read_feat.DumpReadable()
             return 'fail'
@@ -270,12 +251,9 @@ def test_ogr_sqlite_4():
         gdaltest.sl_lyr.SetAttributeFilter("PRFEDEA = '%s'" % item)
         feat_read = gdaltest.sl_lyr.GetNextFeature()
 
-        if feat_read is None:
-            gdaltest.post_reason('Did not get as many features as expected.')
-            return 'fail'
+        assert feat_read is not None, 'Did not get as many features as expected.'
 
-        if ogrtest.check_feature_geometry(feat_read, geom) != 0:
-            return 'fail'
+        assert ogrtest.check_feature_geometry(feat_read, geom) == 0
 
     return 'success'
 
@@ -292,9 +270,7 @@ def test_ogr_sqlite_5():
 
     sql_lyr = gdaltest.sl_ds.ExecuteSQL('select distinct eas_id from tpoly order by eas_id desc')
 
-    if sql_lyr.GetFeatureCount() != 11:
-        gdaltest.post_reason('GetFeatureCount() returned %d instead of 11' % sql_lyr.GetFeatureCount())
-        return 'fail'
+    assert sql_lyr.GetFeatureCount() == 11
 
     tr = ogrtest.check_features_against_list(sql_lyr, 'eas_id', expect)
 
@@ -340,18 +316,14 @@ def test_ogr_sqlite_7():
     gdaltest.sl_lyr.SetSpatialFilter(geom)
     geom.Destroy()
 
-    if gdaltest.sl_lyr.GetFeatureCount() != 1:
-        gdaltest.post_reason('GetFeatureCount() returned %d instead of 1' % gdaltest.sl_lyr.GetFeatureCount())
-        return 'fail'
+    assert gdaltest.sl_lyr.GetFeatureCount() == 1
 
     tr = ogrtest.check_features_against_list(gdaltest.sl_lyr, 'eas_id',
                                              [158])
 
     gdaltest.sl_lyr.SetAttributeFilter('eas_id = 158')
 
-    if gdaltest.sl_lyr.GetFeatureCount() != 1:
-        gdaltest.post_reason('GetFeatureCount() returned %d instead of 1' % gdaltest.sl_lyr.GetFeatureCount())
-        return 'fail'
+    assert gdaltest.sl_lyr.GetFeatureCount() == 1
 
     gdaltest.sl_lyr.SetAttributeFilter(None)
 
@@ -390,9 +362,7 @@ def test_ogr_sqlite_8():
     feat_read = gdaltest.sl_lyr.GetNextFeature()
     gdaltest.sl_lyr.SetAttributeFilter(None)
 
-    if feat_read is not None:
-        gdaltest.post_reason('Unexpectedly got rollbacktest feature.')
-        return 'fail'
+    assert feat_read is None, 'Unexpectedly got rollbacktest feature.'
 
     ######################################################################
     # Create it, and commit the transaction.
@@ -408,9 +378,7 @@ def test_ogr_sqlite_8():
     feat_read = gdaltest.sl_lyr.GetNextFeature()
     gdaltest.sl_lyr.SetAttributeFilter(None)
 
-    if feat_read is None:
-        gdaltest.post_reason('Failed to get committed feature.')
-        return 'fail'
+    assert feat_read is not None, 'Failed to get committed feature.'
 
     feat_read.Destroy()
     dst_feat.Destroy()
@@ -433,18 +401,14 @@ def test_ogr_sqlite_9():
     feat_read = gdaltest.sl_lyr.GetNextFeature()
     gdaltest.sl_lyr.SetAttributeFilter(None)
 
-    if feat_read is None:
-        gdaltest.post_reason('did not find eas_id 158!')
-        return 'fail'
+    assert feat_read is not None, 'did not find eas_id 158!'
 
     ######################################################################
     # Modify the PRFEDEA value, and reset it.
 
     feat_read.SetField('PRFEDEA', 'SetWorked')
     err = gdaltest.sl_lyr.SetFeature(feat_read)
-    if err != 0:
-        gdaltest.post_reason('SetFeature() reported error %d' % err)
-        return 'fail'
+    assert err == 0, ('SetFeature() reported error %d' % err)
 
     ######################################################################
     # Read feature with EAS_ID 158 and check that PRFEDEA was altered.
@@ -453,9 +417,7 @@ def test_ogr_sqlite_9():
     feat_read_2 = gdaltest.sl_lyr.GetNextFeature()
     gdaltest.sl_lyr.SetAttributeFilter(None)
 
-    if feat_read_2 is None:
-        gdaltest.post_reason('did not find eas_id 158!')
-        return 'fail'
+    assert feat_read_2 is not None, 'did not find eas_id 158!'
 
     if feat_read_2.GetField('PRFEDEA') != 'SetWorked':
         feat_read_2.DumpReadable()
@@ -464,14 +426,12 @@ def test_ogr_sqlite_9():
 
     # Test updating non-existing feature
     feat_read.SetFID(-10)
-    if gdaltest.sl_lyr.SetFeature(feat_read) != ogr.OGRERR_NON_EXISTING_FEATURE:
-        gdaltest.post_reason('Expected failure of SetFeature().')
-        return 'fail'
+    assert gdaltest.sl_lyr.SetFeature(feat_read) == ogr.OGRERR_NON_EXISTING_FEATURE, \
+        'Expected failure of SetFeature().'
 
     # Test deleting non-existing feature
-    if gdaltest.sl_lyr.DeleteFeature(-10) != ogr.OGRERR_NON_EXISTING_FEATURE:
-        gdaltest.post_reason('Expected failure of DeleteFeature().')
-        return 'fail'
+    assert gdaltest.sl_lyr.DeleteFeature(-10) == ogr.OGRERR_NON_EXISTING_FEATURE, \
+        'Expected failure of DeleteFeature().'
 
     feat_read.Destroy()
     feat_read_2.Destroy()
@@ -494,18 +454,14 @@ def test_ogr_sqlite_10():
     feat_read = gdaltest.sl_lyr.GetNextFeature()
     gdaltest.sl_lyr.SetAttributeFilter(None)
 
-    if feat_read is None:
-        gdaltest.post_reason('did not find eas_id 158!')
-        return 'fail'
+    assert feat_read is not None, 'did not find eas_id 158!'
 
     ######################################################################
     # Now read the feature by FID.
 
     feat_read_2 = gdaltest.sl_lyr.GetFeature(feat_read.GetFID())
 
-    if feat_read_2 is None:
-        gdaltest.post_reason('did not find FID %d' % feat_read.GetFID())
-        return 'fail'
+    assert feat_read_2 is not None, ('did not find FID %d' % feat_read.GetFID())
 
     if feat_read_2.GetField('PRFEDEA') != feat_read.GetField('PRFEDEA'):
         feat_read.DumpReadable()
@@ -544,8 +500,7 @@ def test_ogr_sqlite_11():
     gdaltest.sl_lyr = gdaltest.sl_ds.GetLayerByName('geomwkb')
 
     feat_read = gdaltest.sl_lyr.GetNextFeature()
-    if ogrtest.check_feature_geometry(feat_read, geom, max_error=0.001) != 0:
-        return 'fail'
+    assert ogrtest.check_feature_geometry(feat_read, geom, max_error=0.001) == 0
 
     gdaltest.sl_lyr.ResetReading()
 
@@ -580,8 +535,7 @@ def test_ogr_sqlite_12():
     gdaltest.sl_lyr = gdaltest.sl_ds.GetLayerByName('geomwkt')
 
     feat_read = gdaltest.sl_lyr.GetNextFeature()
-    if ogrtest.check_feature_geometry(feat_read, geom, max_error=0.001) != 0:
-        return 'fail'
+    assert ogrtest.check_feature_geometry(feat_read, geom, max_error=0.001) == 0
     feat_read = None
 
     gdaltest.sl_lyr.ResetReading()
@@ -589,13 +543,11 @@ def test_ogr_sqlite_12():
     sql_lyr = gdaltest.sl_ds.ExecuteSQL("select * from geomwkt")
 
     feat_read = sql_lyr.GetNextFeature()
-    if ogrtest.check_feature_geometry(feat_read, geom, max_error=0.001) != 0:
-        return 'fail'
+    assert ogrtest.check_feature_geometry(feat_read, geom, max_error=0.001) == 0
     feat_read = None
 
     feat_read = sql_lyr.GetFeature(0)
-    if ogrtest.check_feature_geometry(feat_read, geom, max_error=0.001) != 0:
-        return 'fail'
+    assert ogrtest.check_feature_geometry(feat_read, geom, max_error=0.001) == 0
     feat_read = None
 
     gdaltest.sl_ds.ReleaseResultSet(sql_lyr)
@@ -623,9 +575,7 @@ def test_ogr_sqlite_13():
     gdaltest.sl_ds = ogr.Open('tmp/sqlite_test.db', update=1)
     gdaltest.sl_lyr = gdaltest.sl_ds.GetLayerByName('wgs84layer')
 
-    if not gdaltest.sl_lyr.GetSpatialRef().IsSame(srs):
-        gdaltest.post_reason('SRS is not the one expected.')
-        return 'fail'
+    assert gdaltest.sl_lyr.GetSpatialRef().IsSame(srs), 'SRS is not the one expected.'
 
     ######################################################
     # Create second layer with very approximative EPSG:4326
@@ -636,8 +586,7 @@ def test_ogr_sqlite_13():
     # Must still be 1
     sql_lyr = gdaltest.sl_ds.ExecuteSQL("SELECT COUNT(*) AS count FROM spatial_ref_sys")
     feat = sql_lyr.GetNextFeature()
-    if feat.GetFieldAsInteger('count') != 1:
-        return 'fail'
+    assert feat.GetFieldAsInteger('count') == 1
     gdaltest.sl_ds.ReleaseResultSet(sql_lyr)
 
     return 'success'
@@ -684,11 +633,10 @@ def test_ogr_sqlite_14():
     gdaltest.sl_lyr.ResetReading()
     for _ in range(2):
         feat_read = gdaltest.sl_lyr.GetNextFeature()
-        if feat_read.GetField('INTEGER') != 1 or \
-           feat_read.GetField('FLOAT') != 1.2 or \
-           feat_read.GetField('STRING') != 'myString\'a' or \
-           feat_read.GetFieldAsString('BLOB') != '0001FF':
-            return 'fail'
+        assert (feat_read.GetField('INTEGER') == 1 and \
+           feat_read.GetField('FLOAT') == 1.2 and \
+           feat_read.GetField('STRING') == 'myString\'a' and \
+           feat_read.GetFieldAsString('BLOB') == '0001FF')
 
     gdaltest.sl_lyr.ResetReading()
 
@@ -742,28 +690,23 @@ def test_ogr_sqlite_15():
     gdal.PushErrorHandler('CPLQuietErrorHandler')
     lyr = gdaltest.sl_ds.CreateLayer('will_fail')
     gdal.PopErrorHandler()
-    if lyr is not None:
-        gdaltest.post_reason('layer creation should have failed')
-        return 'fail'
+    assert lyr is None, 'layer creation should have failed'
 
     gdaltest.sl_lyr = gdaltest.sl_ds.GetLayerByName('geomspatialite')
 
     for geom in geoms:
         feat_read = gdaltest.sl_lyr.GetNextFeature()
-        if ogrtest.check_feature_geometry(feat_read, geom, max_error=0.001) != 0:
-            return 'fail'
+        assert ogrtest.check_feature_geometry(feat_read, geom, max_error=0.001) == 0
 
     gdaltest.sl_lyr.ResetReading()
 
     sql_lyr = gdaltest.sl_ds.ExecuteSQL("select * from geomspatialite")
 
     feat_read = sql_lyr.GetNextFeature()
-    if ogrtest.check_feature_geometry(feat_read, geoms[0], max_error=0.001) != 0:
-        return 'fail'
+    assert ogrtest.check_feature_geometry(feat_read, geoms[0], max_error=0.001) == 0
 
     feat_read = sql_lyr.GetFeature(0)
-    if ogrtest.check_feature_geometry(feat_read, geoms[0], max_error=0.001) != 0:
-        return 'fail'
+    assert ogrtest.check_feature_geometry(feat_read, geoms[0], max_error=0.001) == 0
 
     gdaltest.sl_ds.ReleaseResultSet(sql_lyr)
 
@@ -808,50 +751,41 @@ def test_ogr_sqlite_16():
 
     feat = gdaltest.sl_lyr.GetNextFeature()
     geom = feat.GetGeometryRef()
-    if geom.ExportToWkt() != 'POINT (1 2)':
-        return 'fail'
+    assert geom.ExportToWkt() == 'POINT (1 2)'
 
     feat = gdaltest.sl_lyr.GetNextFeature()
     geom = feat.GetGeometryRef()
-    if geom.ExportToWkt() != 'LINESTRING EMPTY':
-        return 'fail'
+    assert geom.ExportToWkt() == 'LINESTRING EMPTY'
 
     feat = gdaltest.sl_lyr.GetNextFeature()
     geom = feat.GetGeometryRef()
-    if geom.ExportToWkt() != 'LINESTRING (1 2,3 4)':
-        return 'fail'
+    assert geom.ExportToWkt() == 'LINESTRING (1 2,3 4)'
 
     feat = gdaltest.sl_lyr.GetNextFeature()
     geom = feat.GetGeometryRef()
-    if geom.ExportToWkt() != 'POLYGON EMPTY':
-        return 'fail'
+    assert geom.ExportToWkt() == 'POLYGON EMPTY'
 
     feat = gdaltest.sl_lyr.GetNextFeature()
     geom = feat.GetGeometryRef()
-    if geom.ExportToWkt() != 'POLYGON ((1 2,3 4))':
-        return 'fail'
+    assert geom.ExportToWkt() == 'POLYGON ((1 2,3 4))'
 
     feat = gdaltest.sl_lyr.GetNextFeature()
     geom = feat.GetGeometryRef()
-    if geom.ExportToWkt() != 'GEOMETRYCOLLECTION EMPTY':
-        return 'fail'
+    assert geom.ExportToWkt() == 'GEOMETRYCOLLECTION EMPTY'
 
     feat = gdaltest.sl_lyr.GetNextFeature()
     geom = feat.GetGeometryRef()
-    if geom.ExportToWkt() != 'GEOMETRYCOLLECTION (POLYGON ((1 2,3 4)),POLYGON ((1 2,3 4)))':
-        return 'fail'
+    assert geom.ExportToWkt() == 'GEOMETRYCOLLECTION (POLYGON ((1 2,3 4)),POLYGON ((1 2,3 4)))'
 
     feat = gdaltest.sl_lyr.GetNextFeature()
     geom = feat.GetGeometryRef()
-    if geom.ExportToWkt() != 'POINT (1 2 3)':
-        return 'fail'
+    assert geom.ExportToWkt() == 'POINT (1 2 3)'
 
     # Test invalid geometries
     for _ in range(3):
         feat = gdaltest.sl_lyr.GetNextFeature()
         geom = feat.GetGeometryRef()
-        if geom is not None:
-            return 'fail'
+        assert geom is None
 
     gdaltest.sl_lyr.ResetReading()
 
@@ -873,16 +807,13 @@ def test_ogr_sqlite_17():
         ds = ogr.GetDriverByName('SQLite').CreateDataSource('tmp/spatialite_test.db', options=['SPATIALITE=YES'])
 
     if not gdaltest.has_spatialite:
-        if ds is not None:
-            return 'fail'
+        assert ds is None
         return 'success'
 
     gdal.PushErrorHandler('CPLQuietErrorHandler')
     lyr = ds.CreateLayer('will_fail', options=['FORMAT=WKB'])
     gdal.PopErrorHandler()
-    if lyr is not None:
-        gdaltest.post_reason('layer creation should have failed')
-        return 'fail'
+    assert lyr is None, 'layer creation should have failed'
 
     srs = osr.SpatialReference()
     srs.SetFromUserInput("""GEOGCS["GCS_WGS_1984",DATUM["WGS_1984",SPHEROID["WGS_1984",6378137,298.257223563]],PRIMEM["Greenwich",0],UNIT["Degree",0.017453292519943295]]""")
@@ -901,15 +832,11 @@ def test_ogr_sqlite_17():
     lyr = ds.GetLayerByName('geomspatialite')
 
     feat_read = lyr.GetNextFeature()
-    if ogrtest.check_feature_geometry(feat_read, geom, max_error=0.001) != 0:
-        return 'fail'
+    assert ogrtest.check_feature_geometry(feat_read, geom, max_error=0.001) == 0
 
     srs = lyr.GetSpatialRef()
     wkt = srs.ExportToWkt()
-    if wkt.find('4326') == -1:
-        gdaltest.post_reason('did not identify correctly SRS')
-        print(wkt)
-        return 'fail'
+    assert wkt.find('4326') != -1, 'did not identify correctly SRS'
 
     return 'success'
 
@@ -938,10 +865,7 @@ def test_ogr_sqlite_18():
     lyr = ds.GetLayerByName('nonepsgsrs')
     srs = lyr.GetSpatialRef()
     wkt = srs.ExportToWkt()
-    if wkt.find('VanDerGrinten') == -1:
-        gdaltest.post_reason('did not identify correctly SRS')
-        print(wkt)
-        return 'fail'
+    assert wkt.find('VanDerGrinten') != -1, 'did not identify correctly SRS'
 
     sql_lyr = ds.ExecuteSQL("SELECT * FROM spatial_ref_sys ORDER BY srid DESC LIMIT 1")
     feat = sql_lyr.GetNextFeature()
@@ -987,10 +911,7 @@ def test_ogr_sqlite_19():
     ds.ReleaseResultSet(sql_lyr)
 
     # Currently the injection of the EPSG DB as proj.4 strings adds 3915 entries
-    if nb_srs < 3915:
-        gdaltest.post_reason('did not get expected SRS count')
-        print(nb_srs)
-        return 'fail'
+    assert nb_srs >= 3915, 'did not get expected SRS count'
 
     return 'success'
 
@@ -1024,10 +945,7 @@ def test_ogr_sqlite_19_bis():
     nb_srs = feat.GetFieldAsInteger(0)
     ds.ReleaseResultSet(sql_lyr)
 
-    if nb_srs != 1:
-        gdaltest.post_reason('did not get expected SRS count')
-        print(nb_srs)
-        return 'fail'
+    assert nb_srs == 1, 'did not get expected SRS count'
 
     gdal.Unlink('/vsimem/spatialite_test_without_epsg.db')
 
@@ -1060,10 +978,7 @@ def test_ogr_sqlite_20():
     ds.ReleaseResultSet(sql_lyr)
 
     # Currently the injection of the EPSG DB as proj.4 strings adds 3945 entries
-    if nb_srs < 3945:
-        gdaltest.post_reason('did not get expected SRS count')
-        print(nb_srs)
-        return 'fail'
+    assert nb_srs >= 3945, 'did not get expected SRS count'
 
     return 'success'
 
@@ -1081,11 +996,7 @@ def test_ogr_sqlite_21():
 
     src_lyr_count = src_lyr.GetFeatureCount()
     copy_lyr_count = copy_lyr.GetFeatureCount()
-    if src_lyr_count != copy_lyr_count:
-        gdaltest.post_reason('did not get same number of features')
-        print(src_lyr_count)
-        print(copy_lyr_count)
-        return 'fail'
+    assert src_lyr_count == copy_lyr_count, 'did not get same number of features'
 
     return 'success'
 
@@ -1103,11 +1014,7 @@ def test_ogr_sqlite_22():
 
     src_lyr_count = src_lyr.GetFeatureCount()
     copy_lyr_count = copy_lyr.GetFeatureCount()
-    if src_lyr_count != copy_lyr_count:
-        gdaltest.post_reason('did not get same number of features')
-        print(src_lyr_count)
-        print(copy_lyr_count)
-        return 'fail'
+    assert src_lyr_count == copy_lyr_count, 'did not get same number of features'
 
     gdaltest.sl_ds.ReleaseResultSet(src_lyr)
 
@@ -1127,57 +1034,36 @@ def test_ogr_sqlite_23():
 
     feat = shp_layer.GetNextFeature()
 
-    if feat.IsFieldSet('AREA'):
-        gdaltest.post_reason('got area despite request to ignore it.')
-        return 'fail'
+    assert not feat.IsFieldSet('AREA'), 'got area despite request to ignore it.'
 
-    if feat.GetFieldAsInteger('EAS_ID') != 168:
-        gdaltest.post_reason('missing or wrong eas_id')
-        return 'fail'
+    assert feat.GetFieldAsInteger('EAS_ID') == 168, 'missing or wrong eas_id'
 
     wkt = 'POLYGON ((479819.84375 4765180.5,479690.1875 4765259.5,479647.0 4765369.5,479730.375 4765400.5,480039.03125 4765539.5,480035.34375 4765558.5,480159.78125 4765610.5,480202.28125 4765482.0,480365.0 4765015.5,480389.6875 4764950.0,480133.96875 4764856.5,480080.28125 4764979.5,480082.96875 4765049.5,480088.8125 4765139.5,480059.90625 4765239.5,480019.71875 4765319.5,479980.21875 4765409.5,479909.875 4765370.0,479859.875 4765270.0,479819.84375 4765180.5))'
-    if ogrtest.check_feature_geometry(feat, wkt,
-                                      max_error=0.00000001) != 0:
-        return 'fail'
+    assert (ogrtest.check_feature_geometry(feat, wkt,
+                                      max_error=0.00000001) == 0)
 
     fd = shp_layer.GetLayerDefn()
     fld = fd.GetFieldDefn(0)  # area
-    if not fld.IsIgnored():
-        gdaltest.post_reason('AREA unexpectedly not marked as ignored.')
-        return 'fail'
+    assert fld.IsIgnored(), 'AREA unexpectedly not marked as ignored.'
 
     fld = fd.GetFieldDefn(1)  # eas_id
-    if fld.IsIgnored():
-        gdaltest.post_reason('EASI unexpectedly marked as ignored.')
-        return 'fail'
+    assert not fld.IsIgnored(), 'EASI unexpectedly marked as ignored.'
 
-    if fd.IsGeometryIgnored():
-        gdaltest.post_reason('geometry unexpectedly ignored.')
-        return 'fail'
+    assert not fd.IsGeometryIgnored(), 'geometry unexpectedly ignored.'
 
-    if fd.IsStyleIgnored():
-        gdaltest.post_reason('style unexpectedly ignored.')
-        return 'fail'
+    assert not fd.IsStyleIgnored(), 'style unexpectedly ignored.'
 
     fd.SetGeometryIgnored(1)
 
-    if not fd.IsGeometryIgnored():
-        gdaltest.post_reason('geometry unexpectedly not ignored.')
-        return 'fail'
+    assert fd.IsGeometryIgnored(), 'geometry unexpectedly not ignored.'
 
     feat = shp_layer.GetNextFeature()
 
-    if feat.GetGeometryRef() is not None:
-        gdaltest.post_reason('Unexpectedly got a geometry on feature 2.')
-        return 'fail'
+    assert feat.GetGeometryRef() is None, 'Unexpectedly got a geometry on feature 2.'
 
-    if feat.IsFieldSet('AREA'):
-        gdaltest.post_reason('got area despite request to ignore it.')
-        return 'fail'
+    assert not feat.IsFieldSet('AREA'), 'got area despite request to ignore it.'
 
-    if feat.GetFieldAsInteger('EAS_ID') != 179:
-        gdaltest.post_reason('missing or wrong eas_id')
-        return 'fail'
+    assert feat.GetFieldAsInteger('EAS_ID') == 179, 'missing or wrong eas_id'
 
     return 'success'
 
@@ -1221,33 +1107,25 @@ def test_ogr_sqlite_24():
     lyr.SetAttributeFilter("OGR_GEOMETRY = 'POLYGON'")
     feat = lyr.GetNextFeature()
     ds.ReleaseResultSet(lyr)
-    if feat is None:
-        gdaltest.post_reason('a feature was expected (2)')
-        return 'fail'
+    assert feat is not None, 'a feature was expected (2)'
 
     lyr = ds.GetLayerByName('test')
     lyr.SetAttributeFilter("OGR_GEOMETRY = 'POLYGON'")
     gdal.PushErrorHandler('CPLQuietErrorHandler')
     feat = lyr.GetNextFeature()
     gdal.PopErrorHandler()
-    if feat is not None:
-        gdaltest.post_reason('a feature was not expected (3)')
-        return 'fail'
+    assert feat is None, 'a feature was not expected (3)'
 
     lyr = ds.ExecuteSQL('select OGR_GEOMETRY from test', dialect='OGRSQL')
     lyr.SetAttributeFilter("OGR_GEOMETRY = 'POLYGON'")
     feat = lyr.GetNextFeature()
     ds.ReleaseResultSet(lyr)
-    if feat is None:
-        gdaltest.post_reason('a feature was expected (4)')
-        return 'fail'
+    assert feat is not None, 'a feature was expected (4)'
 
     lyr = ds.ExecuteSQL("select OGR_GEOMETRY from test WHERE OGR_GEOMETRY = 'POLYGON'", dialect='OGRSQL')
     feat = lyr.GetNextFeature()
     ds.ReleaseResultSet(lyr)
-    if feat is None:
-        gdaltest.post_reason('a feature was expected (5)')
-        return 'fail'
+    assert feat is not None, 'a feature was expected (5)'
 
     ds = None
 
@@ -1293,11 +1171,9 @@ def test_ogr_sqlite_25():
         return 'fail'
 
     lyr = ds.GetLayerByName('polygon')
-    if lyr is None:
-        return 'fail'
+    assert lyr is not None
 
-    if lyr.GetLayerDefn().GetFieldCount() == 0:
-        return 'fail'
+    assert lyr.GetLayerDefn().GetFieldCount() != 0
 
     return 'success'
 
@@ -1312,17 +1188,13 @@ def test_ogr_sqlite_26():
 
     ds = ogr.GetDriverByName('SQLite').CreateDataSource(':memory:')
     sql_lyr = ds.ExecuteSQL('select count(*) from geometry_columns')
-    if sql_lyr is None:
-        gdaltest.post_reason('expected existing geometry_columns')
-        return 'fail'
+    assert sql_lyr is not None, 'expected existing geometry_columns'
 
     count = sql_lyr.GetFeatureCount()
     ds.ReleaseResultSet(sql_lyr)
     ds = None
 
-    if count != 1:
-        gdaltest.post_reason('expected existing geometry_columns')
-        return 'fail'
+    assert count == 1, 'expected existing geometry_columns'
 
     return 'success'
 
@@ -1362,16 +1234,12 @@ def test_ogr_sqlite_27():
             if pos != -1:
                 ret = ret[0:pos]
 
-    if ret.find('INFO') == -1 or ret.find('ERROR') != -1:
-        print(ret)
-        return 'fail'
+    assert ret.find('INFO') != -1 and ret.find('ERROR') == -1
 
     # Test on a result SQL layer
     ret = gdaltest.runexternal(test_cli_utilities.get_test_ogrsf_path() + ' -ro tmp/ogr_sqlite_27.sqlite -sql "SELECT * FROM poly"')
 
-    if ret.find('INFO') == -1 or ret.find('ERROR') != -1:
-        print(ret)
-        return 'fail'
+    assert ret.find('INFO') != -1 and ret.find('ERROR') == -1
 
     return 'success'
 
@@ -1393,32 +1261,24 @@ def test_ogr_sqlite_28():
     ret = gdaltest.runexternal(test_cli_utilities.get_test_ogrsf_path() + ' tmp/poly_spatialite.sqlite')
     os.unlink('tmp/poly_spatialite.sqlite')
 
-    if ret.find('INFO') == -1 or ret.find('ERROR') != -1:
-        print(ret)
-        return 'fail'
+    assert ret.find('INFO') != -1 and ret.find('ERROR') == -1
 
     # Test on a result SQL layer
     ret = gdaltest.runexternal(test_cli_utilities.get_test_ogrsf_path() + ' -ro data/poly_spatialite.sqlite -sql "SELECT * FROM poly"')
 
-    if ret.find('INFO') == -1 or ret.find('ERROR') != -1:
-        print(ret)
-        return 'fail'
+    assert ret.find('INFO') != -1 and ret.find('ERROR') == -1
 
     # Test with a Spatialite 4.0 DB
     shutil.copy('data/poly_spatialite4.sqlite', 'tmp/poly_spatialite4.sqlite')
     ret = gdaltest.runexternal(test_cli_utilities.get_test_ogrsf_path() + ' tmp/poly_spatialite4.sqlite')
     os.unlink('tmp/poly_spatialite4.sqlite')
 
-    if ret.find('INFO') == -1 or ret.find('ERROR') != -1:
-        print(ret)
-        return 'fail'
+    assert ret.find('INFO') != -1 and ret.find('ERROR') == -1
 
     # Generic test
     ret = gdaltest.runexternal(test_cli_utilities.get_test_ogrsf_path() + ' -driver SQLite -dsco SPATIALITE=YES')
 
-    if ret.find('INFO') == -1 or ret.find('ERROR') != -1:
-        print(ret)
-        return 'fail'
+    assert ret.find('INFO') != -1 and ret.find('ERROR') == -1
 
     return 'success'
 
@@ -1439,8 +1299,7 @@ def test_ogr_sqlite_29():
 
     lyr = ds.CreateLayer('test')
     feat = ogr.Feature(lyr.GetLayerDefn())
-    if lyr.CreateFeature(feat) != 0:
-        return 'fail'
+    assert lyr.CreateFeature(feat) == 0
 
     ds = None
 
@@ -1461,8 +1320,7 @@ def test_ogr_sqlite_30():
 
     # Test fix added in r24768
     feat = sql_lyr.GetNextFeature()
-    if feat is not None:
-        return 'fail'
+    assert feat is None
 
     gdaltest.sl_ds.ReleaseResultSet(sql_lyr)
 
@@ -1532,134 +1390,85 @@ def test_ogr_spatialite_2():
     lyr = ds.GetLayerByName('test_spatialfilter')
 
     extent = lyr.GetExtent()
-    if extent != (0.0, 9.0, 0.0, 9.0):
-        gdaltest.post_reason('got bad extent')
-        print(extent)
-        return 'fail'
+    assert extent == (0.0, 9.0, 0.0, 9.0), 'got bad extent'
 
     # Test caching
     extent = lyr.GetExtent()
-    if extent != (0.0, 9.0, 0.0, 9.0):
-        gdaltest.post_reason('got bad extent')
-        print(extent)
-        return 'fail'
+    assert extent == (0.0, 9.0, 0.0, 9.0), 'got bad extent'
 
     geom = ogr.CreateGeometryFromWkt(
         'POLYGON((2 2,2 8,8 8,8 2,2 2))')
     lyr.SetSpatialFilter(geom)
 
-    if lyr.TestCapability(ogr.OLCFastFeatureCount) is False:
-        gdaltest.post_reason('OLCFastFeatureCount failed')
-        return 'fail'
-    if lyr.TestCapability(ogr.OLCFastSpatialFilter) is False:
-        gdaltest.post_reason('OLCFastSpatialFilter failed')
-        return 'fail'
+    assert lyr.TestCapability(ogr.OLCFastFeatureCount) is not False, \
+        'OLCFastFeatureCount failed'
+    assert lyr.TestCapability(ogr.OLCFastSpatialFilter) is not False, \
+        'OLCFastSpatialFilter failed'
 
-    if lyr.GetFeatureCount() != 50:
-        gdaltest.post_reason('did not get expected feature count')
-        print(lyr.GetFeatureCount())
-        return 'fail'
+    assert lyr.GetFeatureCount() == 50, 'did not get expected feature count'
 
     # Test spatial filter with a SQL result layer without WHERE clause
     sql_lyr = ds.ExecuteSQL("SELECT * FROM 'test_spatialfilter'")
 
     extent = sql_lyr.GetExtent()
-    if extent != (0.0, 9.0, 0.0, 9.0):
-        gdaltest.post_reason('got bad extent')
-        print(extent)
-        return 'fail'
+    assert extent == (0.0, 9.0, 0.0, 9.0), 'got bad extent'
 
     # Test caching
     extent = sql_lyr.GetExtent()
-    if extent != (0.0, 9.0, 0.0, 9.0):
-        gdaltest.post_reason('got bad extent')
-        print(extent)
-        return 'fail'
+    assert extent == (0.0, 9.0, 0.0, 9.0), 'got bad extent'
 
-    if sql_lyr.TestCapability(ogr.OLCFastSpatialFilter) is False:
-        gdaltest.post_reason('OLCFastSpatialFilter failed')
-        return 'fail'
+    assert sql_lyr.TestCapability(ogr.OLCFastSpatialFilter) is not False, \
+        'OLCFastSpatialFilter failed'
     sql_lyr.SetSpatialFilter(geom)
-    if sql_lyr.TestCapability(ogr.OLCFastSpatialFilter) is False:
-        gdaltest.post_reason('OLCFastSpatialFilter failed')
-        return 'fail'
-    if sql_lyr.GetFeatureCount() != 50:
-        gdaltest.post_reason('did not get expected feature count')
-        print(sql_lyr.GetFeatureCount())
-        return 'fail'
+    assert sql_lyr.TestCapability(ogr.OLCFastSpatialFilter) is not False, \
+        'OLCFastSpatialFilter failed'
+    assert sql_lyr.GetFeatureCount() == 50, 'did not get expected feature count'
     ds.ReleaseResultSet(sql_lyr)
 
     # Test spatial filter with a SQL result layer with WHERE clause
     sql_lyr = ds.ExecuteSQL('SELECT * FROM test_spatialfilter WHERE 1=1')
-    if sql_lyr.TestCapability(ogr.OLCFastSpatialFilter) is False:
-        gdaltest.post_reason('OLCFastSpatialFilter failed')
-        return 'fail'
+    assert sql_lyr.TestCapability(ogr.OLCFastSpatialFilter) is not False, \
+        'OLCFastSpatialFilter failed'
     sql_lyr.SetSpatialFilter(geom)
-    if sql_lyr.TestCapability(ogr.OLCFastSpatialFilter) is False:
-        gdaltest.post_reason('OLCFastSpatialFilter failed')
-        return 'fail'
-    if sql_lyr.GetFeatureCount() != 50:
-        gdaltest.post_reason('did not get expected feature count')
-        print(sql_lyr.GetFeatureCount())
-        return 'fail'
+    assert sql_lyr.TestCapability(ogr.OLCFastSpatialFilter) is not False, \
+        'OLCFastSpatialFilter failed'
+    assert sql_lyr.GetFeatureCount() == 50, 'did not get expected feature count'
     ds.ReleaseResultSet(sql_lyr)
 
     # Test spatial filter with a SQL result layer with ORDER BY clause
     sql_lyr = ds.ExecuteSQL('SELECT * FROM test_spatialfilter ORDER BY intcol')
 
     extent = sql_lyr.GetExtent()
-    if extent != (0.0, 9.0, 0.0, 9.0):
-        gdaltest.post_reason('got bad extent')
-        print(extent)
-        return 'fail'
+    assert extent == (0.0, 9.0, 0.0, 9.0), 'got bad extent'
 
     # Test caching
     extent = sql_lyr.GetExtent()
-    if extent != (0.0, 9.0, 0.0, 9.0):
-        gdaltest.post_reason('got bad extent')
-        print(extent)
-        return 'fail'
+    assert extent == (0.0, 9.0, 0.0, 9.0), 'got bad extent'
 
-    if sql_lyr.TestCapability(ogr.OLCFastSpatialFilter) is False:
-        gdaltest.post_reason('OLCFastSpatialFilter failed')
-        return 'fail'
+    assert sql_lyr.TestCapability(ogr.OLCFastSpatialFilter) is not False, \
+        'OLCFastSpatialFilter failed'
     sql_lyr.SetSpatialFilter(geom)
-    if sql_lyr.TestCapability(ogr.OLCFastSpatialFilter) is False:
-        gdaltest.post_reason('OLCFastSpatialFilter failed')
-        return 'fail'
-    if sql_lyr.GetFeatureCount() != 50:
-        gdaltest.post_reason('did not get expected feature count')
-        print(sql_lyr.GetFeatureCount())
-        return 'fail'
+    assert sql_lyr.TestCapability(ogr.OLCFastSpatialFilter) is not False, \
+        'OLCFastSpatialFilter failed'
+    assert sql_lyr.GetFeatureCount() == 50, 'did not get expected feature count'
     ds.ReleaseResultSet(sql_lyr)
 
     # Test spatial filter with a SQL result layer with WHERE and ORDER BY clause
     sql_lyr = ds.ExecuteSQL('SELECT * FROM test_spatialfilter WHERE 1 = 1 ORDER BY intcol')
 
     extent = sql_lyr.GetExtent()
-    if extent != (0.0, 9.0, 0.0, 9.0):
-        gdaltest.post_reason('got bad extent')
-        print(extent)
-        return 'fail'
+    assert extent == (0.0, 9.0, 0.0, 9.0), 'got bad extent'
 
     # Test caching
     extent = sql_lyr.GetExtent()
-    if extent != (0.0, 9.0, 0.0, 9.0):
-        gdaltest.post_reason('got bad extent')
-        print(extent)
-        return 'fail'
+    assert extent == (0.0, 9.0, 0.0, 9.0), 'got bad extent'
 
-    if sql_lyr.TestCapability(ogr.OLCFastSpatialFilter) is False:
-        gdaltest.post_reason('OLCFastSpatialFilter failed')
-        return 'fail'
+    assert sql_lyr.TestCapability(ogr.OLCFastSpatialFilter) is not False, \
+        'OLCFastSpatialFilter failed'
     sql_lyr.SetSpatialFilter(geom)
-    if sql_lyr.TestCapability(ogr.OLCFastSpatialFilter) is False:
-        gdaltest.post_reason('OLCFastSpatialFilter failed')
-        return 'fail'
-    if sql_lyr.GetFeatureCount() != 50:
-        gdaltest.post_reason('did not get expected feature count')
-        print(sql_lyr.GetFeatureCount())
-        return 'fail'
+    assert sql_lyr.TestCapability(ogr.OLCFastSpatialFilter) is not False, \
+        'OLCFastSpatialFilter failed'
+    assert sql_lyr.GetFeatureCount() == 50, 'did not get expected feature count'
     ds.ReleaseResultSet(sql_lyr)
 
     # Remove spatial index
@@ -1671,9 +1480,7 @@ def test_ogr_spatialite_2():
     ret = feat.GetFieldAsInteger(0)
     ds.ReleaseResultSet(sql_lyr)
 
-    if ret != 1:
-        gdaltest.post_reason('DisableSpatialIndex failed')
-        return 'fail'
+    assert ret == 1, 'DisableSpatialIndex failed'
 
     ds.ExecuteSQL("VACUUM")
 
@@ -1688,14 +1495,10 @@ def test_ogr_spatialite_2():
     lyr.SetSpatialFilter(geom)
     geom.Destroy()
 
-    if lyr.TestCapability(ogr.OLCFastFeatureCount) is True:
-        return 'fail'
-    if lyr.TestCapability(ogr.OLCFastSpatialFilter) is True:
-        return 'fail'
+    assert lyr.TestCapability(ogr.OLCFastFeatureCount) is not True
+    assert lyr.TestCapability(ogr.OLCFastSpatialFilter) is not True
 
-    if lyr.GetFeatureCount() != 50:
-        print(lyr.GetFeatureCount())
-        return 'fail'
+    assert lyr.GetFeatureCount() == 50
 
     ds.Destroy()
 
@@ -1716,8 +1519,7 @@ def test_ogr_spatialite_3():
 
     ds = ogr.Open('tmp/spatialite_test.db')
     lyr = ds.GetLayerByName('testpoly')
-    if lyr is None:
-        return 'fail'
+    assert lyr is not None
 
     lyr.SetSpatialFilterRect(-400, 22, -120, 400)
 
@@ -1753,9 +1555,7 @@ def test_ogr_spatialite_4():
     lyr = ds.ExecuteSQL('SELECT * FROM geomspatialite')
     feat = lyr.GetNextFeature()
     geom = feat.GetGeometryRef()
-    if geom is None or geom.ExportToWkt() != 'POINT (0 1)':
-        print(geom)
-        return 'fail'
+    assert geom is not None and geom.ExportToWkt() == 'POINT (0 1)'
     feat.Destroy()
     ds.ReleaseResultSet(lyr)
 
@@ -1764,9 +1564,8 @@ def test_ogr_spatialite_4():
     nb_sqlite_master_objects_after = lyr.GetFeatureCount()
     ds.ReleaseResultSet(lyr)
 
-    if nb_sqlite_master_objects_before != nb_sqlite_master_objects_after:
-        print('nb_sqlite_master_objects_before=%d, nb_sqlite_master_objects_after=%d' % (nb_sqlite_master_objects_before, nb_sqlite_master_objects_after))
-        return 'fail'
+    assert nb_sqlite_master_objects_before == nb_sqlite_master_objects_after, \
+        ('nb_sqlite_master_objects_before=%d, nb_sqlite_master_objects_after=%d' % (nb_sqlite_master_objects_before, nb_sqlite_master_objects_after))
 
     # Add new feature
     lyr = ds.GetLayerByName('geomspatialite')
@@ -1780,9 +1579,8 @@ def test_ogr_spatialite_4():
     nb_idx_after = lyr.GetFeatureCount()
     ds.ReleaseResultSet(lyr)
 
-    if nb_idx_before + 1 != nb_idx_after:
-        print('nb_idx_before=%d, nb_idx_after=%d' % (nb_idx_before, nb_idx_after))
-        return 'fail'
+    assert nb_idx_before + 1 == nb_idx_after, \
+        ('nb_idx_before=%d, nb_idx_after=%d' % (nb_idx_before, nb_idx_after))
 
     return 'success'
 
@@ -1878,18 +1676,14 @@ def test_ogr_spatialite_5(bUseComprGeom=False):
     for wkt in geometries:
         geom = ogr.CreateGeometryFromWkt(wkt)
         lyr = ds.GetLayer(num_layer)
-        if lyr.GetGeomType() != geom.GetGeometryType():
-            gdaltest.post_reason('got %d, expected %d' % (lyr.GetGeomType(), geom.GetGeometryType()))
-            return 'fail'
+        assert lyr.GetGeomType() == geom.GetGeometryType()
         feat = lyr.GetNextFeature()
         got_wkt = feat.GetGeometryRef().ExportToIsoWkt()
         # Spatialite < 2.4 only supports 2D geometries
         if gdaltest.spatialite_version == '2.3.1' and (geom.GetGeometryType() & ogr.wkb25DBit) != 0:
             geom.SetCoordinateDimension(2)
             expected_wkt = geom.ExportToIsoWkt()
-            if got_wkt != expected_wkt:
-                gdaltest.post_reason('got %s, expected %s' % (got_wkt, expected_wkt))
-                return 'fail'
+            assert got_wkt == expected_wkt
         elif got_wkt != wkt:
             gdaltest.post_reason('got %s, expected %s' % (got_wkt, wkt))
             return 'fail'
@@ -2021,21 +1815,12 @@ def test_ogr_spatialite_6():
     ds = ogr.Open('tmp/ogr_spatialite_6.sqlite')
     lyr = ds.GetLayerByName(layername)
     view_lyr = ds.GetLayerByName(viewname)
-    if view_lyr.GetFIDColumn() != pkid_single:
-        print(view_lyr.GetGeometryColumn())
-        return 'fail'
-    if view_lyr.GetGeometryColumn() != thegeom_single:
-        print(view_lyr.GetGeometryColumn())
-        return 'fail'
-    if view_lyr.GetLayerDefn().GetFieldDefn(0).GetName() != "int'col":
-        print(view_lyr.GetLayerDefn().GetFieldDefn(0).GetName())
-        return 'fail'
-    if view_lyr.GetGeomType() != lyr.GetGeomType():
-        return 'fail'
-    if view_lyr.GetFeatureCount() != lyr.GetFeatureCount():
-        return 'fail'
-    if view_lyr.GetSpatialRef().IsSame(lyr.GetSpatialRef()) != 1:
-        return 'fail'
+    assert view_lyr.GetFIDColumn() == pkid_single, view_lyr.GetGeometryColumn()
+    assert view_lyr.GetGeometryColumn() == thegeom_single
+    assert view_lyr.GetLayerDefn().GetFieldDefn(0).GetName() == "int'col"
+    assert view_lyr.GetGeomType() == lyr.GetGeomType()
+    assert view_lyr.GetFeatureCount() == lyr.GetFeatureCount()
+    assert view_lyr.GetSpatialRef().IsSame(lyr.GetSpatialRef()) == 1
     feat = view_lyr.GetFeature(3)
     if feat.GetFieldAsInteger(0) != 34:
         feat.DumpReadable()
@@ -2084,19 +1869,15 @@ def test_ogr_spatialite_7():
         return 'skip'
 
     ds = ogr.Open('VirtualShape:data/poly.shp')
-    if ds is None:
-        return 'fail'
+    assert ds is not None
 
     lyr = ds.GetLayerByName('poly')
-    if lyr is None:
-        return 'fail'
+    assert lyr is not None
 
-    if lyr.GetGeomType() != ogr.wkbPolygon:
-        return 'fail'
+    assert lyr.GetGeomType() == ogr.wkbPolygon
 
     f = lyr.GetNextFeature()
-    if f.GetGeometryRef() is None:
-        return 'fail'
+    assert f.GetGeometryRef() is not None
 
     return 'success'
 
@@ -2162,20 +1943,13 @@ def test_ogr_spatialite_8():
 
     lyr = ds.GetLayerByName('test(geom1)')
     view_lyr = ds.GetLayerByName('view_test_geom1')
-    if lyr.GetLayerDefn().GetFieldCount() != 1:
-        return 'fail'
-    if view_lyr.GetLayerDefn().GetFieldCount() != 1:
-        return 'fail'
-    if lyr.GetGeometryColumn() != 'geom1':
-        return 'fail'
-    if view_lyr.GetGeometryColumn() != 'renamed_geom1':
-        return 'fail'
-    if lyr.GetGeomType() != ogr.wkbPoint:
-        return 'fail'
-    if view_lyr.GetGeomType() != lyr.GetGeomType():
-        return 'fail'
-    if view_lyr.GetFeatureCount() != lyr.GetFeatureCount():
-        return 'fail'
+    assert lyr.GetLayerDefn().GetFieldCount() == 1
+    assert view_lyr.GetLayerDefn().GetFieldCount() == 1
+    assert lyr.GetGeometryColumn() == 'geom1'
+    assert view_lyr.GetGeometryColumn() == 'renamed_geom1'
+    assert lyr.GetGeomType() == ogr.wkbPoint
+    assert view_lyr.GetGeomType() == lyr.GetGeomType()
+    assert view_lyr.GetFeatureCount() == lyr.GetFeatureCount()
     feat = view_lyr.GetFeature(1)
     if feat.GetFieldAsString(0) != 'bar':
         feat.DumpReadable()
@@ -2193,20 +1967,13 @@ def test_ogr_spatialite_8():
 
     lyr = ds.GetLayerByName('test(geom2)')
     view_lyr = ds.GetLayerByName('view_test_geom2')
-    if lyr.GetLayerDefn().GetFieldCount() != 1:
-        return 'fail'
-    if view_lyr.GetLayerDefn().GetFieldCount() != 1:
-        return 'fail'
-    if lyr.GetGeometryColumn() != 'geom2':
-        return 'fail'
-    if view_lyr.GetGeometryColumn() != 'renamed_geom2':
-        return 'fail'
-    if lyr.GetGeomType() != ogr.wkbLineString:
-        return 'fail'
-    if view_lyr.GetGeomType() != lyr.GetGeomType():
-        return 'fail'
-    if view_lyr.GetFeatureCount() != lyr.GetFeatureCount():
-        return 'fail'
+    assert lyr.GetLayerDefn().GetFieldCount() == 1
+    assert view_lyr.GetLayerDefn().GetFieldCount() == 1
+    assert lyr.GetGeometryColumn() == 'geom2'
+    assert view_lyr.GetGeometryColumn() == 'renamed_geom2'
+    assert lyr.GetGeomType() == ogr.wkbLineString
+    assert view_lyr.GetGeomType() == lyr.GetGeomType()
+    assert view_lyr.GetFeatureCount() == lyr.GetFeatureCount()
     feat = view_lyr.GetFeature(1)
     if feat.GetFieldAsString(0) != 'bar':
         feat.DumpReadable()
@@ -2233,22 +2000,15 @@ def test_ogr_spatialite_8():
 
     with gdaltest.error_handler():
         lyr = ds.GetLayerByName('invalid_layer_name(geom1)')
-    if lyr is not None:
-        return 'fail'
+    assert lyr is None
 
     lyr = ds.GetLayerByName('test')
-    if lyr.GetLayerDefn().GetFieldCount() != 1:
-        return 'fail'
-    if lyr.GetLayerDefn().GetGeomFieldCount() != 2:
-        return 'fail'
-    if lyr.GetLayerDefn().GetGeomFieldDefn(0).GetName() != 'geom1':
-        return 'fail'
-    if lyr.GetLayerDefn().GetGeomFieldDefn(1).GetName() != 'geom2':
-        return 'fail'
-    if lyr.GetLayerDefn().GetGeomFieldDefn(0).GetType() != ogr.wkbPoint:
-        return 'fail'
-    if lyr.GetLayerDefn().GetGeomFieldDefn(1).GetType() != ogr.wkbLineString:
-        return 'fail'
+    assert lyr.GetLayerDefn().GetFieldCount() == 1
+    assert lyr.GetLayerDefn().GetGeomFieldCount() == 2
+    assert lyr.GetLayerDefn().GetGeomFieldDefn(0).GetName() == 'geom1'
+    assert lyr.GetLayerDefn().GetGeomFieldDefn(1).GetName() == 'geom2'
+    assert lyr.GetLayerDefn().GetGeomFieldDefn(0).GetType() == ogr.wkbPoint
+    assert lyr.GetLayerDefn().GetGeomFieldDefn(1).GetType() == ogr.wkbLineString
     lyr.SetSpatialFilterRect(-1, -1, 10, 10)
     feat = lyr.GetNextFeature()
     if feat.GetFID() != 1:
@@ -2308,12 +2068,9 @@ def test_ogr_sqlite_31():
     ds = ogr.Open('tmp/ogr_sqlite_31.sqlite')
 
     lyr = ds.GetLayerByName('test(geom1)')
-    if lyr.GetLayerDefn().GetFieldCount() != 1:
-        return 'fail'
-    if lyr.GetGeometryColumn() != 'geom1':
-        return 'fail'
-    if lyr.GetGeomType() != ogr.wkbPoint:
-        return 'fail'
+    assert lyr.GetLayerDefn().GetFieldCount() == 1
+    assert lyr.GetGeometryColumn() == 'geom1'
+    assert lyr.GetGeomType() == ogr.wkbPoint
     lyr.SetSpatialFilterRect(-1, -1, 10, 10)
     feat = lyr.GetNextFeature()
     if feat.GetFID() != 1:
@@ -2325,12 +2082,9 @@ def test_ogr_sqlite_31():
     feat = None
 
     lyr = ds.GetLayerByName('test(geom2)')
-    if lyr.GetLayerDefn().GetFieldCount() != 1:
-        return 'fail'
-    if lyr.GetGeometryColumn() != 'geom2':
-        return 'fail'
-    if lyr.GetGeomType() != ogr.wkbLineString:
-        return 'fail'
+    assert lyr.GetLayerDefn().GetFieldCount() == 1
+    assert lyr.GetGeometryColumn() == 'geom2'
+    assert lyr.GetGeomType() == ogr.wkbLineString
     lyr.SetSpatialFilterRect(-1, -1, 10, 10)
     feat = lyr.GetNextFeature()
     if feat.GetFID() != 1:
@@ -2379,12 +2133,9 @@ def test_ogr_sqlite_32():
     ds = ogr.Open('tmp/ogr_sqlite_32.sqlite')
     lyr = ds.GetLayer(0)
 
-    if lyr.GetLayerDefn().GetFieldDefn(0).GetType() != ogr.OFTDateTime:
-        return 'fail'
-    if lyr.GetLayerDefn().GetFieldDefn(1).GetType() != ogr.OFTDate:
-        return 'fail'
-    if lyr.GetLayerDefn().GetFieldDefn(2).GetType() != ogr.OFTTime:
-        return 'fail'
+    assert lyr.GetLayerDefn().GetFieldDefn(0).GetType() == ogr.OFTDateTime
+    assert lyr.GetLayerDefn().GetFieldDefn(1).GetType() == ogr.OFTDate
+    assert lyr.GetLayerDefn().GetFieldDefn(2).GetType() == ogr.OFTTime
 
     feat = lyr.GetNextFeature()
     if feat.GetField('datetimefield') != '2012/08/23 21:24:00' or \
@@ -2441,9 +2192,7 @@ def test_ogr_sqlite_33():
         ds = ogr.Open('tmp/ogr_sqlite_33.sqlite')
         lyr = ds.GetLayerByName('test2')
         srs = lyr.GetSpatialRef()
-        if srs.ExportToWkt().find('4326') == -1:
-            print(i)
-            return 'fail'
+        assert srs.ExportToWkt().find('4326') != -1, i
 
         # 123456 should be referenced in geometry_columns...
         sql_lyr = ds.ExecuteSQL('SELECT * from geometry_columns WHERE srid=123456')
@@ -2452,9 +2201,7 @@ def test_ogr_sqlite_33():
         feat = None
         ds.ReleaseResultSet(sql_lyr)
 
-        if is_none:
-            print(i)
-            return 'fail'
+        assert not is_none, i
 
         # ... but not in spatial_ref_sys
         sql_lyr = ds.ExecuteSQL('SELECT * from spatial_ref_sys WHERE srid=123456')
@@ -2463,9 +2210,7 @@ def test_ogr_sqlite_33():
         feat = None
         ds.ReleaseResultSet(sql_lyr)
 
-        if not is_none:
-            print(i)
-            return 'fail'
+        assert is_none, i
 
         ds = None
 
@@ -2488,46 +2233,40 @@ def test_ogr_sqlite_34():
     feat = sql_lyr.GetNextFeature()
     val = feat.GetField(0)
     gdaltest.sl_ds.ReleaseResultSet(sql_lyr)
-    if val != 1:
-        return 'fail'
+    assert val == 1
 
     # Evaluates to FALSE
     sql_lyr = gdaltest.sl_ds.ExecuteSQL("SELECT 'b' REGEXP 'a'")
     feat = sql_lyr.GetNextFeature()
     val = feat.GetField(0)
     gdaltest.sl_ds.ReleaseResultSet(sql_lyr)
-    if val != 0:
-        return 'fail'
+    assert val == 0
 
     # NULL left-member
     sql_lyr = gdaltest.sl_ds.ExecuteSQL("SELECT NULL REGEXP 'a'")
     feat = sql_lyr.GetNextFeature()
     val = feat.GetField(0)
     gdaltest.sl_ds.ReleaseResultSet(sql_lyr)
-    if val != 0:
-        return 'fail'
+    assert val == 0
 
     # NULL regexp
     gdal.PushErrorHandler('CPLQuietErrorHandler')
     sql_lyr = gdaltest.sl_ds.ExecuteSQL("SELECT 'a' REGEXP NULL")
     gdal.PopErrorHandler()
-    if sql_lyr is not None:
-        return 'fail'
+    assert sql_lyr is None
 
     # Invalid regexp
     gdal.PushErrorHandler('CPLQuietErrorHandler')
     sql_lyr = gdaltest.sl_ds.ExecuteSQL("SELECT 'a' REGEXP '['")
     gdal.PopErrorHandler()
-    if sql_lyr is not None:
-        return 'fail'
+    assert sql_lyr is None
 
     # Adds another pattern
     sql_lyr = gdaltest.sl_ds.ExecuteSQL("SELECT 'b' REGEXP 'b'")
     feat = sql_lyr.GetNextFeature()
     val = feat.GetField(0)
     gdaltest.sl_ds.ReleaseResultSet(sql_lyr)
-    if val != 1:
-        return 'fail'
+    assert val == 1
 
     # Test cache
     for _ in range(2):
@@ -2537,8 +2276,7 @@ def test_ogr_sqlite_34():
             feat = sql_lyr.GetNextFeature()
             val = feat.GetField(0)
             gdaltest.sl_ds.ReleaseResultSet(sql_lyr)
-            if val != 1:
-                return 'fail'
+            assert val == 1
 
     return 'success'
 
@@ -2585,46 +2323,40 @@ def test_ogr_sqlite_35():
         sql_lyr.SetAttributeFilter("foo = 'bar'")
         sql_lyr.ResetReading()
         feat = sql_lyr.GetNextFeature()
-        if feat is None:
-            return 'fail'
+        assert feat is not None
         feat = None
 
         sql_lyr.SetAttributeFilter("foo = 'baz'")
         sql_lyr.ResetReading()
         feat = sql_lyr.GetNextFeature()
-        if feat is not None:
-            return 'fail'
+        assert feat is None
         feat = None
 
         sql_lyr.SetAttributeFilter(None)
         sql_lyr.ResetReading()
         feat = sql_lyr.GetNextFeature()
-        if feat is None:
-            return 'fail'
+        assert feat is not None
         feat = None
 
         sql_lyr.SetSpatialFilterRect(0, 0, 2, 2)
         sql_lyr.SetAttributeFilter("foo = 'bar'")
         sql_lyr.ResetReading()
         feat = sql_lyr.GetNextFeature()
-        if feat is None:
-            return 'fail'
+        assert feat is not None
         feat = None
 
         sql_lyr.SetSpatialFilterRect(1.5, 1.5, 2, 2)
         sql_lyr.SetAttributeFilter("foo = 'bar'")
         sql_lyr.ResetReading()
         feat = sql_lyr.GetNextFeature()
-        if feat is not None:
-            return 'fail'
+        assert feat is None
         feat = None
 
         sql_lyr.SetSpatialFilterRect(0, 0, 2, 2)
         sql_lyr.SetAttributeFilter(None)
         sql_lyr.ResetReading()
         feat = sql_lyr.GetNextFeature()
-        if feat is None:
-            return 'fail'
+        assert feat is not None
         feat = None
 
         ds.ReleaseResultSet(sql_lyr)
@@ -2662,11 +2394,9 @@ def test_ogr_sqlite_36():
 
     ds = ogr.Open('tmp/ogr_sqlite_36.sqlite')
     lyr = ds.GetLayer(0)
-    if lyr.GetMetadataItem(ogr.OLMD_FID64) is None:
-        return 'fail'
+    assert lyr.GetMetadataItem(ogr.OLMD_FID64) is not None
     f = lyr.GetNextFeature()
-    if f.GetFID() != 1234567890123:
-        return 'fail'
+    assert f.GetFID() == 1234567890123
 
     return 'success'
 
@@ -2708,8 +2438,7 @@ def test_ogr_sqlite_37():
     gdal.PushErrorHandler()
     ret = lyr.CreateFeature(f)
     gdal.PopErrorHandler()
-    if ret == 0:
-        return 'fail'
+    assert ret != 0
     f = None
 
     # Error case: missing non-nullable field
@@ -2718,30 +2447,24 @@ def test_ogr_sqlite_37():
     gdal.PushErrorHandler()
     ret = lyr.CreateFeature(f)
     gdal.PopErrorHandler()
-    if ret == 0:
-        return 'fail'
+    assert ret != 0
     f = None
 
     ds = None
 
     ds = ogr.Open('tmp/ogr_sqlite_37.sqlite', update=1)
     lyr = ds.GetLayerByName('test')
-    if lyr.GetLayerDefn().GetFieldDefn(lyr.GetLayerDefn().GetFieldIndex('field_not_nullable')).IsNullable() != 0:
-        return 'fail'
-    if lyr.GetLayerDefn().GetFieldDefn(lyr.GetLayerDefn().GetFieldIndex('field_nullable')).IsNullable() != 1:
-        return 'fail'
-    if lyr.GetLayerDefn().GetGeomFieldDefn(lyr.GetLayerDefn().GetGeomFieldIndex('geomfield_not_nullable')).IsNullable() != 0:
-        return 'fail'
-    if lyr.GetLayerDefn().GetGeomFieldDefn(lyr.GetLayerDefn().GetGeomFieldIndex('geomfield_nullable')).IsNullable() != 1:
-        return 'fail'
+    assert lyr.GetLayerDefn().GetFieldDefn(lyr.GetLayerDefn().GetFieldIndex('field_not_nullable')).IsNullable() == 0
+    assert lyr.GetLayerDefn().GetFieldDefn(lyr.GetLayerDefn().GetFieldIndex('field_nullable')).IsNullable() == 1
+    assert lyr.GetLayerDefn().GetGeomFieldDefn(lyr.GetLayerDefn().GetGeomFieldIndex('geomfield_not_nullable')).IsNullable() == 0
+    assert lyr.GetLayerDefn().GetGeomFieldDefn(lyr.GetLayerDefn().GetGeomFieldIndex('geomfield_nullable')).IsNullable() == 1
 
     # Turn not null into nullable
     src_fd = lyr.GetLayerDefn().GetFieldDefn(lyr.GetLayerDefn().GetFieldIndex('field_not_nullable'))
     fd = ogr.FieldDefn('now_nullable', src_fd.GetType())
     fd.SetNullable(1)
     lyr.AlterFieldDefn(lyr.GetLayerDefn().GetFieldIndex('field_not_nullable'), fd, ogr.ALTER_ALL_FLAG)
-    if lyr.GetLayerDefn().GetFieldDefn(lyr.GetLayerDefn().GetFieldIndex('now_nullable')).IsNullable() != 1:
-        return 'fail'
+    assert lyr.GetLayerDefn().GetFieldDefn(lyr.GetLayerDefn().GetFieldIndex('now_nullable')).IsNullable() == 1
 
     # Turn nullable into not null, but remove NULL values first
     ds.ExecuteSQL("UPDATE test SET field_nullable = '' WHERE field_nullable IS NULL")
@@ -2750,21 +2473,16 @@ def test_ogr_sqlite_37():
     fd.SetName('now_not_nullable')
     fd.SetNullable(0)
     lyr.AlterFieldDefn(lyr.GetLayerDefn().GetFieldIndex('field_nullable'), fd, ogr.ALTER_ALL_FLAG)
-    if lyr.GetLayerDefn().GetFieldDefn(lyr.GetLayerDefn().GetFieldIndex('now_not_nullable')).IsNullable() != 0:
-        return 'fail'
+    assert lyr.GetLayerDefn().GetFieldDefn(lyr.GetLayerDefn().GetFieldIndex('now_not_nullable')).IsNullable() == 0
 
     ds = None
 
     ds = ogr.Open('tmp/ogr_sqlite_37.sqlite')
     lyr = ds.GetLayerByName('test')
-    if lyr.GetLayerDefn().GetFieldDefn(lyr.GetLayerDefn().GetFieldIndex('now_not_nullable')).IsNullable() != 0:
-        return 'fail'
-    if lyr.GetLayerDefn().GetFieldDefn(lyr.GetLayerDefn().GetFieldIndex('now_nullable')).IsNullable() != 1:
-        return 'fail'
-    if lyr.GetLayerDefn().GetGeomFieldDefn(lyr.GetLayerDefn().GetGeomFieldIndex('geomfield_not_nullable')).IsNullable() != 0:
-        return 'fail'
-    if lyr.GetLayerDefn().GetGeomFieldDefn(lyr.GetLayerDefn().GetGeomFieldIndex('geomfield_nullable')).IsNullable() != 1:
-        return 'fail'
+    assert lyr.GetLayerDefn().GetFieldDefn(lyr.GetLayerDefn().GetFieldIndex('now_not_nullable')).IsNullable() == 0
+    assert lyr.GetLayerDefn().GetFieldDefn(lyr.GetLayerDefn().GetFieldIndex('now_nullable')).IsNullable() == 1
+    assert lyr.GetLayerDefn().GetGeomFieldDefn(lyr.GetLayerDefn().GetGeomFieldIndex('geomfield_not_nullable')).IsNullable() == 0
+    assert lyr.GetLayerDefn().GetGeomFieldDefn(lyr.GetLayerDefn().GetGeomFieldIndex('geomfield_nullable')).IsNullable() == 1
     ds = None
 
     return 'success'
@@ -2831,29 +2549,16 @@ def test_ogr_sqlite_38():
 
     ds = ogr.Open('tmp/ogr_sqlite_38.sqlite', update=1)
     lyr = ds.GetLayerByName('test')
-    if lyr.GetLayerDefn().GetFieldDefn(lyr.GetLayerDefn().GetFieldIndex('field_string')).GetDefault() != "'a''b'":
-        return 'fail'
-    if lyr.GetLayerDefn().GetFieldDefn(lyr.GetLayerDefn().GetFieldIndex('field_int')).GetDefault() != '123':
-        return 'fail'
-    if lyr.GetLayerDefn().GetFieldDefn(lyr.GetLayerDefn().GetFieldIndex('field_real')).GetDefault() != '1.23':
-        return 'fail'
-    if lyr.GetLayerDefn().GetFieldDefn(lyr.GetLayerDefn().GetFieldIndex('field_nodefault')).GetDefault() is not None:
-        return 'fail'
-    if lyr.GetLayerDefn().GetFieldDefn(lyr.GetLayerDefn().GetFieldIndex('field_datetime')).GetDefault() != 'CURRENT_TIMESTAMP':
-        return 'fail'
-    if lyr.GetLayerDefn().GetFieldDefn(lyr.GetLayerDefn().GetFieldIndex('field_datetime2')).GetDefault() != "'2015/06/30 12:34:56'":
-        print(lyr.GetLayerDefn().GetFieldDefn(lyr.GetLayerDefn().GetFieldIndex('field_datetime2')).GetDefault())
-        return 'fail'
-    if lyr.GetLayerDefn().GetFieldDefn(lyr.GetLayerDefn().GetFieldIndex('field_datetime3')).GetDefault() != "(strftime('%Y-%m-%dT%H:%M:%fZ','now'))":
-        print(lyr.GetLayerDefn().GetFieldDefn(lyr.GetLayerDefn().GetFieldIndex('field_datetime3')).GetDefault())
-        return 'fail'
-    if lyr.GetLayerDefn().GetFieldDefn(lyr.GetLayerDefn().GetFieldIndex('field_datetime4')).GetDefault() != "'2015/06/30 12:34:56.123'":
-        print(lyr.GetLayerDefn().GetFieldDefn(lyr.GetLayerDefn().GetFieldIndex('field_datetime4')).GetDefault())
-        return 'fail'
-    if lyr.GetLayerDefn().GetFieldDefn(lyr.GetLayerDefn().GetFieldIndex('field_date')).GetDefault() != "CURRENT_DATE":
-        return 'fail'
-    if lyr.GetLayerDefn().GetFieldDefn(lyr.GetLayerDefn().GetFieldIndex('field_time')).GetDefault() != "CURRENT_TIME":
-        return 'fail'
+    assert lyr.GetLayerDefn().GetFieldDefn(lyr.GetLayerDefn().GetFieldIndex('field_string')).GetDefault() == "'a''b'"
+    assert lyr.GetLayerDefn().GetFieldDefn(lyr.GetLayerDefn().GetFieldIndex('field_int')).GetDefault() == '123'
+    assert lyr.GetLayerDefn().GetFieldDefn(lyr.GetLayerDefn().GetFieldIndex('field_real')).GetDefault() == '1.23'
+    assert lyr.GetLayerDefn().GetFieldDefn(lyr.GetLayerDefn().GetFieldIndex('field_nodefault')).GetDefault() is None
+    assert lyr.GetLayerDefn().GetFieldDefn(lyr.GetLayerDefn().GetFieldIndex('field_datetime')).GetDefault() == 'CURRENT_TIMESTAMP'
+    assert lyr.GetLayerDefn().GetFieldDefn(lyr.GetLayerDefn().GetFieldIndex('field_datetime2')).GetDefault() == "'2015/06/30 12:34:56'"
+    assert lyr.GetLayerDefn().GetFieldDefn(lyr.GetLayerDefn().GetFieldIndex('field_datetime3')).GetDefault() == "(strftime('%Y-%m-%dT%H:%M:%fZ','now'))"
+    assert lyr.GetLayerDefn().GetFieldDefn(lyr.GetLayerDefn().GetFieldIndex('field_datetime4')).GetDefault() == "'2015/06/30 12:34:56.123'"
+    assert lyr.GetLayerDefn().GetFieldDefn(lyr.GetLayerDefn().GetFieldIndex('field_date')).GetDefault() == "CURRENT_DATE"
+    assert lyr.GetLayerDefn().GetFieldDefn(lyr.GetLayerDefn().GetFieldIndex('field_time')).GetDefault() == "CURRENT_TIME"
     f = lyr.GetNextFeature()
     if f.GetField('field_string') != 'a\'b' or f.GetField('field_int') != 123 or \
        f.GetField('field_real') != 1.23 or \
@@ -2870,27 +2575,21 @@ def test_ogr_sqlite_38():
     fd = ogr.FieldDefn('field_string', src_fd.GetType())
     fd.SetDefault("'c'")
     lyr.AlterFieldDefn(lyr.GetLayerDefn().GetFieldIndex('field_string'), fd, ogr.ALTER_DEFAULT_FLAG)
-    if lyr.GetLayerDefn().GetFieldDefn(lyr.GetLayerDefn().GetFieldIndex('field_string')).GetDefault() != "'c'":
-        print(lyr.GetLayerDefn().GetFieldDefn(lyr.GetLayerDefn().GetFieldIndex('field_string')).GetDefault())
-        return 'fail'
+    assert lyr.GetLayerDefn().GetFieldDefn(lyr.GetLayerDefn().GetFieldIndex('field_string')).GetDefault() == "'c'"
 
     # Drop DEFAULT value
     src_fd = lyr.GetLayerDefn().GetFieldDefn(lyr.GetLayerDefn().GetFieldIndex('field_int'))
     fd = ogr.FieldDefn('field_int', src_fd.GetType())
     fd.SetDefault(None)
     lyr.AlterFieldDefn(lyr.GetLayerDefn().GetFieldIndex('field_int'), fd, ogr.ALTER_DEFAULT_FLAG)
-    if lyr.GetLayerDefn().GetFieldDefn(lyr.GetLayerDefn().GetFieldIndex('field_int')).GetDefault() is not None:
-        return 'fail'
+    assert lyr.GetLayerDefn().GetFieldDefn(lyr.GetLayerDefn().GetFieldIndex('field_int')).GetDefault() is None
 
     ds = None
 
     ds = ogr.Open('tmp/ogr_sqlite_38.sqlite', update=1)
     lyr = ds.GetLayerByName('test')
-    if lyr.GetLayerDefn().GetFieldDefn(lyr.GetLayerDefn().GetFieldIndex('field_string')).GetDefault() != "'c'":
-        print(lyr.GetLayerDefn().GetFieldDefn(lyr.GetLayerDefn().GetFieldIndex('field_string')).GetDefault())
-        return 'fail'
-    if lyr.GetLayerDefn().GetFieldDefn(lyr.GetLayerDefn().GetFieldIndex('field_int')).GetDefault() is not None:
-        return 'fail'
+    assert lyr.GetLayerDefn().GetFieldDefn(lyr.GetLayerDefn().GetFieldIndex('field_string')).GetDefault() == "'c'"
+    assert lyr.GetLayerDefn().GetFieldDefn(lyr.GetLayerDefn().GetFieldIndex('field_int')).GetDefault() is None
 
     ds = None
 
@@ -2913,8 +2612,7 @@ def test_ogr_spatialite_9():
     lyr.SetSpatialFilterRect(1, 2, 1, 2)
     lyr.ResetReading()
     feat = lyr.GetNextFeature()
-    if feat is None:
-        return 'fail'
+    assert feat is not None
     ds = None
     ogr.GetDriverByName('SQLite').DeleteDataSource('/vsimem/ogr_spatialite_9.sqlite')
 
@@ -2954,14 +2652,10 @@ def test_ogr_spatialite_10():
 
     ds = ogr.Open('tmp/ogr_spatialite_10.sqlite')
     lyr = ds.GetLayerByName('test')
-    if lyr.GetLayerDefn().GetFieldDefn(lyr.GetLayerDefn().GetFieldIndex('field_not_nullable')).IsNullable() != 0:
-        return 'fail'
-    if lyr.GetLayerDefn().GetFieldDefn(lyr.GetLayerDefn().GetFieldIndex('field_nullable')).IsNullable() != 1:
-        return 'fail'
-    if lyr.GetLayerDefn().GetGeomFieldDefn(lyr.GetLayerDefn().GetGeomFieldIndex('geomfield_not_nullable')).IsNullable() != 0:
-        return 'fail'
-    if lyr.GetLayerDefn().GetGeomFieldDefn(lyr.GetLayerDefn().GetGeomFieldIndex('geomfield_nullable')).IsNullable() != 1:
-        return 'fail'
+    assert lyr.GetLayerDefn().GetFieldDefn(lyr.GetLayerDefn().GetFieldIndex('field_not_nullable')).IsNullable() == 0
+    assert lyr.GetLayerDefn().GetFieldDefn(lyr.GetLayerDefn().GetFieldIndex('field_nullable')).IsNullable() == 1
+    assert lyr.GetLayerDefn().GetGeomFieldDefn(lyr.GetLayerDefn().GetGeomFieldIndex('geomfield_not_nullable')).IsNullable() == 0
+    assert lyr.GetLayerDefn().GetGeomFieldDefn(lyr.GetLayerDefn().GetGeomFieldIndex('geomfield_nullable')).IsNullable() == 1
     ds = None
 
     return 'success'
@@ -2982,12 +2676,10 @@ def test_ogr_sqlite_39():
     gdal.PushErrorHandler()
     ret = lyr.CreateField(ogr.FieldDefn('myfid', ogr.OFTString))
     gdal.PopErrorHandler()
-    if ret == 0:
-        return 'fail'
+    assert ret != 0
 
     ret = lyr.CreateField(ogr.FieldDefn('myfid', ogr.OFTInteger))
-    if ret != 0:
-        return 'fail'
+    assert ret == 0
     lyr.CreateField(ogr.FieldDefn('str2', ogr.OFTString))
 
     feat = ogr.Feature(lyr.GetLayerDefn())
@@ -2995,16 +2687,13 @@ def test_ogr_sqlite_39():
     feat.SetField('myfid', 10)
     feat.SetField('str2', 'second string')
     ret = lyr.CreateFeature(feat)
-    if ret != 0:
-        return 'fail'
-    if feat.GetFID() != 10:
-        return 'fail'
+    assert ret == 0
+    assert feat.GetFID() == 10
 
     feat = ogr.Feature(lyr.GetLayerDefn())
     feat.SetField('str2', 'second string')
     ret = lyr.CreateFeature(feat)
-    if ret != 0:
-        return 'fail'
+    assert ret == 0
     if feat.GetFID() < 0:
         feat.DumpReadable()
         return 'fail'
@@ -3014,8 +2703,7 @@ def test_ogr_sqlite_39():
 
     feat.SetField('str', 'foo')
     ret = lyr.SetFeature(feat)
-    if ret != 0:
-        return 'fail'
+    assert ret == 0
 
     feat = ogr.Feature(lyr.GetLayerDefn())
     feat.SetFID(1)
@@ -3023,21 +2711,18 @@ def test_ogr_sqlite_39():
     gdal.PushErrorHandler()
     ret = lyr.CreateFeature(feat)
     gdal.PopErrorHandler()
-    if ret == 0:
-        return 'fail'
+    assert ret != 0
 
     gdal.PushErrorHandler()
     ret = lyr.SetFeature(feat)
     gdal.PopErrorHandler()
-    if ret == 0:
-        return 'fail'
+    assert ret != 0
 
     feat.UnsetField('myfid')
     gdal.PushErrorHandler()
     ret = lyr.SetFeature(feat)
     gdal.PopErrorHandler()
-    if ret == 0:
-        return 'fail'
+    assert ret != 0
 
     lyr.ResetReading()
     f = lyr.GetNextFeature()
@@ -3067,85 +2752,68 @@ def test_ogr_sqlite_40():
         options = []
     ds = ogr.GetDriverByName('SQLite').CreateDataSource('/vsimem/ogr_sqlite_40.sqlite', options=options)
 
-    if ds.TestCapability(ogr.ODsCTransactions) != 1:
-        return 'fail'
+    assert ds.TestCapability(ogr.ODsCTransactions) == 1
 
     ret = ds.StartTransaction()
-    if ret != 0:
-        return 'fail'
+    assert ret == 0
     gdal.PushErrorHandler()
     ret = ds.StartTransaction()
     gdal.PopErrorHandler()
-    if ret == 0:
-        return 'fail'
+    assert ret != 0
 
     lyr = ds.CreateLayer('test', geom_type=ogr.wkbPoint)
     lyr.CreateField(ogr.FieldDefn('foo', ogr.OFTString))
     ret = ds.RollbackTransaction()
-    if ret != 0:
-        return 'fail'
+    assert ret == 0
     gdal.PushErrorHandler()
     ret = ds.RollbackTransaction()
     gdal.PopErrorHandler()
-    if ret == 0:
-        return 'fail'
+    assert ret != 0
     ds = None
 
     ds = ogr.Open('/vsimem/ogr_sqlite_40.sqlite', update=1)
-    if ds.GetLayerCount() != 0:
-        return 'fail'
+    assert ds.GetLayerCount() == 0
     ret = ds.StartTransaction()
-    if ret != 0:
-        return 'fail'
+    assert ret == 0
     gdal.PushErrorHandler()
     ret = ds.StartTransaction()
     gdal.PopErrorHandler()
-    if ret == 0:
-        return 'fail'
+    assert ret != 0
 
     lyr = ds.CreateLayer('test', geom_type=ogr.wkbPoint)
     lyr.CreateField(ogr.FieldDefn('foo', ogr.OFTString))
     ret = ds.CommitTransaction()
-    if ret != 0:
-        return 'fail'
+    assert ret == 0
     gdal.PushErrorHandler()
     ret = ds.CommitTransaction()
     gdal.PopErrorHandler()
-    if ret == 0:
-        return 'fail'
+    assert ret != 0
     ds = None
 
     ds = ogr.Open('/vsimem/ogr_sqlite_40.sqlite', update=1)
-    if ds.GetLayerCount() != 1:
-        return 'fail'
+    assert ds.GetLayerCount() == 1
     lyr = ds.GetLayerByName('test')
 
     ds.StartTransaction()
     lyr.CreateFeature(ogr.Feature(lyr.GetLayerDefn()))
     lyr.ResetReading()
     f = lyr.GetNextFeature()
-    if f is None:
-        return 'fail'
-    if lyr.GetFeatureCount() != 1:
-        return 'fail'
+    assert f is not None
+    assert lyr.GetFeatureCount() == 1
     ds.RollbackTransaction()
-    if lyr.GetFeatureCount() != 0:
-        return 'fail'
+    assert lyr.GetFeatureCount() == 0
 
     ds.StartTransaction()
     lyr.CreateFeature(ogr.Feature(lyr.GetLayerDefn()))
     lyr.CreateFeature(ogr.Feature(lyr.GetLayerDefn()))
     lyr.ResetReading()
     f = lyr.GetNextFeature()
-    if f is None or f.GetFID() != 1:
-        return 'fail'
+    assert f is not None and f.GetFID() == 1
     ds.CommitTransaction()
     # the cursor is still valid after CommitTransaction(), which isn't the case for other backends such as PG !
     f = lyr.GetNextFeature()
-    if f is None or f.GetFID() != 2:
-        return 'fail'
-    if lyr.GetFeatureCount() != 2:
-        return 'fail'
+    assert f is not None and f.GetFID() == 2
+    assert lyr.GetFeatureCount() == 2
 
     ds.StartTransaction()
     lyr = ds.CreateLayer('test2', geom_type=ogr.wkbPoint)
@@ -3155,16 +2823,14 @@ def test_ogr_sqlite_40():
     f.SetGeometryDirectly(ogr.CreateGeometryFromWkt('POINT(0 0)'))
     ret = lyr.CreateFeature(f)
     ds.CommitTransaction()
-    if ret != 0:
-        return 'fail'
+    assert ret == 0
 
     ds.StartTransaction()
     f = ogr.Feature(lyr.GetLayerDefn())
     f.SetGeometryDirectly(ogr.CreateGeometryFromWkt('POINT(0 0)'))
     ret = lyr.CreateFeature(f)
     ds.CommitTransaction()
-    if ret != 0:
-        return 'fail'
+    assert ret == 0
 
     ds.StartTransaction()
     lyr = ds.CreateLayer('test3', geom_type=ogr.wkbPoint)
@@ -3185,8 +2851,7 @@ def test_ogr_sqlite_40():
     f.SetGeometryDirectly(ogr.CreateGeometryFromWkt('POINT(0 0)'))
     ret = lyr.CreateFeature(f)
     ds.CommitTransaction()
-    if ret != 0:
-        return 'fail'
+    assert ret == 0
 
     ds = None
 
@@ -3210,8 +2875,7 @@ def test_ogr_sqlite_41():
     ds = ogr.Open('/vsimem/ogr_sqlite_41.sqlite')
     lyr = ds.GetLayer(0)
     f = lyr.GetNextFeature()
-    if f['a_date'] != '2015/04/30 12:34:56':
-        return 'fail'
+    assert f['a_date'] == '2015/04/30 12:34:56'
 
     ds = None
 
@@ -3239,15 +2903,13 @@ def test_ogr_sqlite_42():
     sql_lyr = ds.ExecuteSQL('SELECT id FROM aab')
     sql_lyr.SetAttributeFilter('id = 1')
     f = sql_lyr.GetNextFeature()
-    if f is None:
-        return 'fail'
+    assert f is not None
     ds.ReleaseResultSet(sql_lyr)
 
     sql_lyr = ds.ExecuteSQL('SELECT id FROM "aab"')
     sql_lyr.SetAttributeFilter('id = 1')
     f = sql_lyr.GetNextFeature()
-    if f is None:
-        return 'fail'
+    assert f is not None
     ds.ReleaseResultSet(sql_lyr)
 
     lyr = ds.CreateLayer('with"quotes')
@@ -3260,16 +2922,14 @@ def test_ogr_sqlite_42():
     sql_lyr = ds.ExecuteSQL('SELECT id FROM "with""quotes"')
     sql_lyr.SetAttributeFilter('id = 1')
     f = sql_lyr.GetNextFeature()
-    if f is None:
-        return 'fail'
+    assert f is not None
     ds.ReleaseResultSet(sql_lyr)
 
     # Too complex to analyze
     sql_lyr = ds.ExecuteSQL('SELECT id FROM "with""quotes" UNION ALL SELECT id FROM aab')
     sql_lyr.SetAttributeFilter('id = 1')
     f = sql_lyr.GetNextFeature()
-    if f is None:
-        return 'fail'
+    assert f is not None
     ds.ReleaseResultSet(sql_lyr)
 
     ds = None
@@ -3293,8 +2953,7 @@ def test_ogr_sqlite_43():
         return 'skip'
 
     ds = ogr.Open('file:foo?mode=memory&cache=shared')
-    if ds is None:
-        return 'fail'
+    assert ds is not None
 
     return 'success'
 
@@ -3317,22 +2976,17 @@ def test_ogr_sqlite_44():
     gdal.VectorTranslate('/vsimem/ogr_sqlite_44_out.csv', '/vsimem/ogr_sqlite_44.sqlite', format='CSV', layerCreationOptions=['CREATE_CSVT=YES', 'LINEFORMAT=LF'])
 
     f = gdal.VSIFOpenL('/vsimem/ogr_sqlite_44_out.csv', 'rb')
-    if f is None:
-        return 'fail'
+    assert f is not None
     data = gdal.VSIFReadL(1, 10000, f).decode('ascii')
     gdal.VSIFCloseL(f)
 
-    if data.find('stringlist,intlist,int64list,reallist,wkt\n"[ ""a"", """" ]",[ 1 ],[ 1234567890123 ],[ 0.125') != 0:
-        print(data)
-        return 'fail'
+    assert data.find('stringlist,intlist,int64list,reallist,wkt\n"[ ""a"", """" ]",[ 1 ],[ 1234567890123 ],[ 0.125') == 0
 
     f = gdal.VSIFOpenL('/vsimem/ogr_sqlite_44_out.csvt', 'rb')
     data = gdal.VSIFReadL(1, 10000, f).decode('ascii')
     gdal.VSIFCloseL(f)
 
-    if data.find('JSonStringList,JSonIntegerList,JSonInteger64List,JSonRealList') != 0:
-        print(data)
-        return 'fail'
+    assert data.find('JSonStringList,JSonIntegerList,JSonInteger64List,JSonRealList') == 0
 
     gdal.Unlink('/vsimem/ogr_sqlite_44.csv')
     gdal.Unlink('/vsimem/ogr_sqlite_44.csvt')
@@ -3361,19 +3015,16 @@ def test_ogr_sqlite_45():
     ds.ReleaseResultSet(sql_lyr)
     sql_lyr = ds.ExecuteSQL('SELECT * FROM sqlite_master')
     ds.ReleaseResultSet(sql_lyr)
-    if not os.path.exists('tmp/ogr_sqlite_45.db-wal'):
-        return 'fail'
+    assert os.path.exists('tmp/ogr_sqlite_45.db-wal')
     shutil.copy('tmp/ogr_sqlite_45.db', 'tmp/ogr_sqlite_45_bis.db')
     shutil.copy('tmp/ogr_sqlite_45.db-shm', 'tmp/ogr_sqlite_45_bis.db-shm')
     shutil.copy('tmp/ogr_sqlite_45.db-wal', 'tmp/ogr_sqlite_45_bis.db-wal')
     ds = None
-    if os.path.exists('tmp/ogr_sqlite_45.db-wal'):
-        return 'fail'
+    assert not os.path.exists('tmp/ogr_sqlite_45.db-wal')
 
     ds = ogr.Open('tmp/ogr_sqlite_45_bis.db')
     ds = None
-    if os.path.exists('tmp/ogr_sqlite_45_bis.db-wal'):
-        return 'fail'
+    assert not os.path.exists('tmp/ogr_sqlite_45_bis.db-wal')
 
     gdal.Unlink('tmp/ogr_sqlite_45.db')
     gdal.Unlink('tmp/ogr_sqlite_45_bis.db')
@@ -3400,8 +3051,7 @@ def test_ogr_spatialite_11():
     lyr = ds.CreateLayer('test2', geom_type=ogr.wkbNone)
     with gdaltest.error_handler():
         res = lyr.CreateGeomField(ogr.GeomFieldDefn('foo', ogr.wkbCurvePolygon))
-    if res == 0:
-        return 'fail'
+    assert res != 0
 
     ds = None
 
@@ -3424,8 +3074,7 @@ def test_ogr_spatialite_12():
     ds = ogr.Open('data/poly_spatialite.sqlite.sql')
     lyr = ds.GetLayer(0)
     f = lyr.GetNextFeature()
-    if f is None:
-        return 'fail'
+    assert f is not None
 
     return 'success'
 
@@ -3453,8 +3102,7 @@ def test_ogr_sqlite_iterate_and_update():
         lyr.SetFeature(f)
     lyr.ResetReading()
     for f in lyr:
-        if not f['strfield'].endswith('_updated'):
-            return 'fail'
+        assert f['strfield'].endswith('_updated')
     ds = None
 
     gdal.Unlink(filename)
@@ -3585,8 +3233,7 @@ def test_ogr_sqlite_without_spatialite():
     import test_py_scripts
     ret = test_py_scripts.run_py_script_as_external_script('.', 'ogr_sqlite', ' -without_spatialite', display_live_on_parent_stdout=True)
 
-    if ret.find('Failed:    0') == -1:
-        return 'fail'
+    assert ret.find('Failed:    0') != -1
 
     return 'success'
 
diff --git a/autotest/ogr/ogr_style.py b/autotest/ogr/ogr_style.py
index a6aeb91e3290..df21c3cb6368 100755
--- a/autotest/ogr/ogr_style.py
+++ b/autotest/ogr/ogr_style.py
@@ -48,74 +48,57 @@ def test_ogr_style_styletable():
     gdal.PushErrorHandler('CPLQuietErrorHandler')
     ret = style_table.SaveStyleTable('/nonexistingdir/nonexistingfile')
     gdal.PopErrorHandler()
-    if ret != 0:
-        print(ret)
-        return 'fail'
-    if style_table.SaveStyleTable("/vsimem/out.txt") != 1:
-        return 'fail'
+    assert ret == 0
+    assert style_table.SaveStyleTable("/vsimem/out.txt") == 1
     style_table = None
 
     style_table = ogr.StyleTable()
     gdal.PushErrorHandler('CPLQuietErrorHandler')
     ret = style_table.LoadStyleTable('/nonexistent')
     gdal.PopErrorHandler()
-    if ret != 0:
-        return 'fail'
-    if style_table.LoadStyleTable('/vsimem/out.txt') != 1:
-        return 'fail'
+    assert ret == 0
+    assert style_table.LoadStyleTable('/vsimem/out.txt') == 1
 
     gdal.Unlink('/vsimem/out.txt')
 
     gdal.PushErrorHandler('CPLQuietErrorHandler')
     ret = style_table.Find("non_existing_style")
     gdal.PopErrorHandler()
-    if ret is not None:
-        return 'fail'
+    assert ret is None
 
-    if style_table.Find("style1_normal") != 'SYMBOL(id:"http://style1_normal",c:#67452301)':
-        return 'fail'
+    assert style_table.Find("style1_normal") == 'SYMBOL(id:"http://style1_normal",c:#67452301)'
 
     style = style_table.GetNextStyle()
-    if style != 'SYMBOL(id:"http://style1_normal",c:#67452301)':
-        return 'fail'
+    assert style == 'SYMBOL(id:"http://style1_normal",c:#67452301)'
     style_name = style_table.GetLastStyleName()
-    if style_name != 'style1_normal':
-        return 'fail'
+    assert style_name == 'style1_normal'
 
     style = style_table.GetNextStyle()
-    if style is not None:
-        return 'fail'
+    assert style is None
 
     style_table.ResetStyleStringReading()
     style = style_table.GetNextStyle()
-    if style is None:
-        return 'fail'
+    assert style is not None
 
     # GetStyleTable()/SetStyleTable() on data source
     ds = ogr.GetDriverByName('Memory').CreateDataSource('')
-    if ds.GetStyleTable() is not None:
-        return 'fail'
+    assert ds.GetStyleTable() is None
     ds.SetStyleTable(None)
-    if ds.GetStyleTable() is not None:
-        return 'fail'
+    assert ds.GetStyleTable() is None
     ds.SetStyleTable(style_table)
     style_table2 = ds.GetStyleTable()
     style = style_table2.GetNextStyle()
-    if style != 'SYMBOL(id:"http://style1_normal",c:#67452301)':
-        return 'fail'
+    assert style == 'SYMBOL(id:"http://style1_normal",c:#67452301)'
 
     # GetStyleTable()/SetStyleTable() on layer
     lyr = ds.CreateLayer('foo')
-    if lyr.GetStyleTable() is not None:
-        return 'fail'
+    assert lyr.GetStyleTable() is None
     lyr.SetStyleTable(None)
-    if lyr.GetStyleTable() is not None:
-        return 'fail'
+    assert lyr.GetStyleTable() is None
     lyr.SetStyleTable(style_table)
     style_table2 = lyr.GetStyleTable()
     style = style_table2.GetNextStyle()
-    if style != 'SYMBOL(id:"http://style1_normal",c:#67452301)':
-        return 'fail'
+    assert style == 'SYMBOL(id:"http://style1_normal",c:#67452301)'
 
     ds = None
 
diff --git a/autotest/ogr/ogr_sua.py b/autotest/ogr/ogr_sua.py
index c4c22c1c30c8..0b1cf9eb6303 100755
--- a/autotest/ogr/ogr_sua.py
+++ b/autotest/ogr/ogr_sua.py
@@ -34,6 +34,7 @@
 import gdaltest
 import ogrtest
 from osgeo import ogr
+import pytest
 
 ###############################################################################
 # Basic test
@@ -42,30 +43,24 @@
 def test_ogr_sua_1():
 
     ds = ogr.Open('data/za.sua')
-    if ds is None:
-        gdaltest.post_reason('cannot open dataset')
-        return 'fail'
+    assert ds is not None, 'cannot open dataset'
 
     lyr = ds.GetLayer(0)
-    if lyr is None:
-        gdaltest.post_reason('cannot find layer')
-        return 'fail'
+    assert lyr is not None, 'cannot find layer'
 
     feat = lyr.GetNextFeature()
     geom = feat.GetGeometryRef()
     if ogrtest.check_feature_geometry(feat, 'POLYGON ((24.760277777777777 -28.466666666666683,24.766895312434809 -28.46671727367243,24.773510850527718 -28.466869079419723,24.780122395865373 -28.467122038103,24.786727953485673 -28.467476073394735,24.793325530310469 -28.467931078467672,24.799913135516679 -28.468486916026166,24.806488781187785 -28.469143418346533,24.813050482985464 -28.469900387326192,24.819596260561802 -28.47075759454188,24.826124138325216 -28.47171478131645,24.832632145879771 -28.472771658795054,24.839118318703743 -28.47392790802968,24.845580698630823 -28.475183180072875,24.852017334528803 -28.476537096080108,24.858426282776776 -28.47798924742105,24.86480560789666 -28.479539195799475,24.871153383126547 -28.481186473381939,24.877467690931773 -28.482930582935339,24.883746623625481 -28.48477099797276,24.889988283903538 -28.486707162908274,24.896190785431472 -28.48873849322014,24.902352253349676 -28.490864375622735,24.908470824878808 -28.493084168246597,24.914544649847166 -28.495397200827426,24.920571891246279 -28.497802774903008,24.926550725747585 -28.500300164018839,24.932479344288705 -28.502888613941764,24.938355952571698 -28.505567342882131,24.944178771610126 -28.508335541723795,24.949946038264724 -28.511192374262492,24.955656005751909 -28.514136977452182,24.961306944165695 -28.517168461659423,24.966897141013046 -28.520285910925423,24.972424901704478 -28.523488383236369,24.977888550056022 -28.526774910801166,24.983286428814758 -28.530144500336959,24.988616900132001 -28.533596133362522,24.99387834606733 -28.537128766498796,24.999069169069763 -28.540741331777156,25.004187792453038 -28.544432736955102,25.009232660883608 -28.548201865839104,25.014202240830937 -28.552047578614662,25.019095021044684 -28.555968712183585,25.02390951301135 -28.559964080508252,25.028644251401499 -28.564032474962829,25.033297794511821 -28.568172664691346,25.037868724701763 -28.572383396972441,25.042355648839958 -28.576663397590849,25.046757198702647 -28.581011371215411,25.051072031428639 -28.585426001783489,25.055298829890791 -28.589905952891769,25.059436303127992 -28.594449868193294,25.063483186732412 -28.599056371800572,25.067438243238151 -28.603724068694731,25.071300262513763 -28.608451545140568,25.075068062113562 -28.613237369107495,25.078740487674832 -28.618080090695855,25.082316413248837 -28.622978242569175,25.085794741684015 -28.627930340391472,25.089174404927817 -28.632934883270281,25.092454364404489 -28.637990354204419,25.095633611313403 -28.643095220537134,25.098711166955503 -28.64824793441413,25.10168608305365 -28.653446933246229,25.104557442038406 -28.658690640176914,25.107324357344936 -28.663977464554407,25.109985973715663 -28.669305802407834,25.112541467439499 -28.674674036928209,25.114990046654459 -28.680080538952993,25.117330951578985 -28.685523667455101,25.119563454781961 -28.691001770035456,25.121686861395737 -28.696513183419484,25.123700509365641 -28.702056233957038,25.125603769666306 -28.707629238125719,25.127396046506441 -28.713230503037792,25.129076777527761 -28.718858326949757,25.130645434008265 -28.724510999775319,25.13210152102771 -28.730186803601043,25.133444577652867 -28.735884013204668,25.134674177090211 -28.741600896576003,25.135789926836566 -28.7473357154403,25.136791468828061 -28.753086725783632,25.137678479562659 -28.758852178380579,25.138450670228519 -28.764630319323757,25.139107786806342 -28.770419390555091,25.139649610175514 -28.776217630398676,25.140075956205322 -28.782023274095195,25.140386675823155 -28.787834554337508,25.140581655100206 -28.793649701807396,25.140660815291394 -28.799466945713419,25.140624112899374 -28.805284514329315,25.140471539698027 -28.811100635533307,25.140203122769478 -28.816913537347659,25.139818924509857 -28.822721448478802,25.139319042644907 -28.828522598857376,25.138703610206345 -28.834315220178425,25.137972795537667 -28.840097546441314,25.137126802248048 -28.845867814489324,25.136165869182687 -28.85162426454886,25.135090270371048 -28.857365140767754,25.133900314962272 -28.863088691752992,25.132596347160835 -28.868793171107171,25.131178746139458 -28.874476837963954,25.129647925945786 -28.880137957522209,25.128004335404732 -28.885774801578492,25.126248457993494 -28.891385649057952,25.124380811721167 -28.896968786543397,25.122401948989488 -28.902522508802292,25.120312456446726 -28.908045119311723,25.118112954838665 -28.913534930780742,25.11580409880861 -28.918990265670601,25.113386576755399 -28.924409456711885,25.110861110617904 -28.92979084741917,25.108228455676212 -28.935132792602516,25.105489400347579 -28.940433658875676,25.102644765960211 -28.94569182516129,25.099695406505884 -28.950905683192275,25.096642208420011 -28.956073638009698,25.093486090307582 -28.961194108456937,25.090228002679709 -28.96626552766962,25.086868927687608 -28.97128634356163,25.083409878829617 -28.976255019306763,25.079851900655964 -28.981170033815886,25.076196068457499 -28.986029882209536,25.072443487959553 -28.990833076285767,25.068595294982366 -28.995578144983043,25.064652655115509 -29.000263634838049,25.060616763368554 -29.004888110438372,25.05648884380911 -29.009450154869668,25.052270149197888 -29.013948370157522,25.04796196062637 -29.018381377703292,25.043565587113235 -29.022747818714564,25.039082365218423 -29.027046354629377,25.034513658643014 -29.031275667534388,25.029860857809823 -29.035434460576823,25.025125379446433 -29.039521458370103,25.020308666156058 -29.043535407392909,25.015412185972465 -29.047475076381517,25.010437431908937 -29.051339256715593,25.005385921523313 -29.055126762796746,25.000259196426232 -29.05883643242025,24.995058821820685 -29.062467127139698,24.98978638601983 -29.066017732624076,24.984443499974287 -29.069487159007593,24.979031796736475 -29.072874341232009,24.973552930996892 -29.076178239381264,24.96800857854516 -29.079397839008323,24.962400435777845 -29.082532151454132,24.95673021914298 -29.085580214158654,24.950999664626245 -29.088541090963787,24.945210527202558 -29.09141387240804,24.939364580306272 -29.094197676012925,24.933463615254794 -29.096891646561062,24.927509440705947 -29.09949495636549,24.921503882088025 -29.102006805530834,24.915448781031092 -29.104426422205322,24.909345994796006 -29.10675306282441,24.90319739567629 -29.108986012345341,24.897004870446018 -29.11112458447279,24.890770319697953 -29.113168121875631,24.884495657344228 -29.115115996394422,24.878182809944395 -29.116967609239822,24.871833716110423 -29.11872239118189,24.865450325918069 -29.120379802729857,24.859034600277788 -29.121939334302667,24.852588510335149 -29.123400506390141,24.846114036796582 -29.124762869704583,24.83961316938128 -29.1260260053228,24.8330879061436 -29.127189524818803,24.826540252848378 -29.128253070386421,24.819972222345168 -29.129216314952828,24.813385833911177 -29.1300789622818,24.806783112687896 -29.130840747067623,24.800166088946376 -29.131501435018961,24.793536797471898 -29.132060822933184,24.786897276912615 -29.132518738760538,24.780249569276663 -29.132875041658693,24.773595719053805 -29.133129622037345,24.766937772515039 -29.133282401592936,24.760277777777777 -29.13333333333334,24.753617783040514 -29.133282401592936,24.746959836501748 -29.133129622037345,24.740305986278891 -29.132875041658693,24.733658278642938 -29.132518738760538,24.727018758083656 -29.132060822933184,24.720389466609177 -29.131501435018961,24.713772442867658 -29.130840747067623,24.707169721644377 -29.1300789622818,24.700583333210385 -29.129216314952828,24.694015302707175 -29.128253070386421,24.687467649411953 -29.127189524818803,24.680942386174273 -29.1260260053228,24.674441518758972 -29.124762869704583,24.667967045220404 -29.123400506390141,24.661520955277766 -29.121939334302667,24.655105229637485 -29.120379802729857,24.64872183944513 -29.11872239118189,24.642372745611159 -29.116967609239822,24.636059898211325 -29.115115996394422,24.6297852358576 -29.113168121875631,24.623550685109535 -29.11112458447279,24.617358159879263 -29.108986012345341,24.611209560759548 -29.10675306282441,24.605106774524462 -29.104426422205322,24.599051673467528 -29.102006805530834,24.593046114849606 -29.09949495636549,24.587091940300759 -29.096891646561062,24.581190975249282 -29.094197676012925,24.575345028352995 -29.09141387240804,24.569555890929308 -29.088541090963787,24.563825336412574 -29.085580214158654,24.558155119777709 -29.082532151454132,24.552546977010394 -29.079397839008323,24.547002624558662 -29.076178239381264,24.541523758819078 -29.072874341232009,24.536112055581267 -29.069487159007593,24.530769169535724 -29.066017732624076,24.525496733734869 -29.062467127139698,24.520296359129322 -29.05883643242025,24.51516963403224 -29.055126762796746,24.510118123646617 -29.051339256715593,24.505143369583088 -29.047475076381517,24.500246889399495 -29.043535407392909,24.495430176109121 -29.039521458370103,24.490694697745731 -29.035434460576823,24.486041896912539 -29.031275667534388,24.48147319033713 -29.027046354629377,24.476989968442318 -29.022747818714564,24.472593594929183 -29.018381377703292,24.468285406357666 -29.013948370157522,24.464066711746444 -29.009450154869668,24.459938792187 -29.004888110438372,24.455902900440044 -29.000263634838049,24.451960260573188 -28.995578144983043,24.448112067596 -28.990833076285767,24.444359487098055 -28.986029882209536,24.44070365489959 -28.981170033815886,24.437145676725937 -28.976255019306763,24.433686627867946 -28.97128634356163,24.430327552875845 -28.96626552766962,24.427069465247971 -28.961194108456937,24.423913347135542 -28.956073638009698,24.42086014904967 -28.950905683192275,24.417910789595343 -28.94569182516129,24.415066155207974 -28.940433658875676,24.412327099879342 -28.935132792602516,24.409694444937649 -28.92979084741917,24.407168978800154 -28.924409456711885,24.404751456746943 -28.918990265670601,24.402442600716888 -28.913534930780742,24.400243099108827 -28.908045119311723,24.398153606566066 -28.902522508802292,24.396174743834386 -28.896968786543397,24.394307097562059 -28.891385649057952,24.392551220150821 -28.885774801578492,24.390907629609767 -28.880137957522209,24.389376809416095 -28.874476837963954,24.387959208394719 -28.868793171107171,24.386655240593281 -28.863088691752992,24.385465285184505 -28.857365140767754,24.384389686372867 -28.85162426454886,24.383428753306539 -28.845867814489324,24.382582760017886 -28.840097546441314,24.381851945350171 -28.834315220178425,24.381236512910647 -28.828522598857376,24.380736631045696 -28.822721448478802,24.380352432786076 -28.816913537347659,24.380084015857527 -28.811100635533307,24.379931442656179 -28.805284514329315,24.379894740264159 -28.799466945713419,24.379973900455347 -28.793649701807396,24.380168879732398 -28.787834554337508,24.380479599350231 -28.782023274095195,24.380905945380039 -28.776217630398676,24.381447768749211 -28.770419390555091,24.382104885327035 -28.764630319323757,24.382877075992894 -28.758852178380579,24.383764086727492 -28.753086725783632,24.384765628718988 -28.7473357154403,24.385881378465342 -28.741600896576003,24.387110977902687 -28.735884013204668,24.388454034527843 -28.730186803601043,24.389910121547288 -28.724510999775319,24.391478778027793 -28.718858326949757,24.393159509049113 -28.713230503037792,24.394951785889248 -28.707629238125719,24.396855046189913 -28.702056233957038,24.398868694159816 -28.696513183419484,24.400992100773593 -28.691001770035456,24.403224603976568 -28.685523667455101,24.405565508901095 -28.680080538952993,24.408014088116055 -28.674674036928209,24.410569581839891 -28.669305802407834,24.413231198210617 -28.663977464554407,24.415998113517148 -28.658690640176914,24.418869472501903 -28.653446933246229,24.42184438860005 -28.64824793441413,24.424921944242151 -28.643095220537134,24.428101191151065 -28.637990354204419,24.431381150627736 -28.632934883270281,24.434760813871538 -28.627930340391472,24.438239142306717 -28.622978242569175,24.441815067880722 -28.618080090695855,24.445487493441991 -28.613237369107495,24.449255293041791 -28.608451545140568,24.453117312317403 -28.603724068694731,24.457072368823141 -28.599056371800572,24.461119252427562 -28.594449868193294,24.465256725664762 -28.589905952891769,24.469483524126915 -28.585426001783489,24.473798356852907 -28.581011371215411,24.478199906715595 -28.576663397590849,24.48268683085379 -28.572383396972441,24.487257761043733 -28.568172664691346,24.491911304154055 -28.564032474962829,24.496646042544203 -28.559964080508252,24.501460534510869 -28.555968712183585,24.506353314724617 -28.552047578614662,24.511322894671945 -28.548201865839104,24.516367763102515 -28.544432736955102,24.52148638648579 -28.540741331777156,24.526677209488223 -28.537128766498796,24.531938655423552 -28.533596133362522,24.537269126740796 -28.530144500336959,24.542667005499531 -28.526774910801166,24.548130653851075 -28.523488383236369,24.553658414542507 -28.520285910925423,24.559248611389858 -28.517168461659423,24.564899549803645 -28.514136977452182,24.57060951729083 -28.511192374262492,24.576376783945427 -28.508335541723795,24.582199602983856 -28.505567342882131,24.588076211266849 -28.502888613941764,24.594004829807968 -28.500300164018839,24.599983664309274 -28.497802774903008,24.606010905708388 -28.495397200827426,24.612084730676745 -28.493084168246597,24.618203302205877 -28.490864375622735,24.624364770124082 -28.48873849322014,24.630567271652016 -28.486707162908274,24.636808931930073 -28.48477099797276,24.64308786462378 -28.482930582935339,24.649402172429006 -28.481186473381939,24.655749947658894 -28.479539195799475,24.662129272778778 -28.47798924742105,24.668538221026751 -28.476537096080108,24.674974856924731 -28.475183180072875,24.68143723685181 -28.47392790802968,24.687923409675783 -28.472771658795054,24.694431417230337 -28.47171478131645,24.700959294993751 -28.47075759454188,24.70750507257009 -28.469900387326192,24.714066774367769 -28.469143418346533,24.720642420038875 -28.468486916026166,24.727230025245085 -28.467931078467672,24.73382760206988 -28.467476073394735,24.740433159690181 -28.467122038103,24.747044705027836 -28.466869079419723,24.753660243120745 -28.46671727367243,24.760277777777777 -28.466666666666683))',
                                       max_error=0.0000001) != 0:
         print('did not get expected first geom')
-        print(geom.ExportToWkt())
-        return 'fail'
+        pytest.fail(geom.ExportToWkt())
 
     feat = lyr.GetNextFeature()
     geom = feat.GetGeometryRef()
     if ogrtest.check_feature_geometry(feat, 'POLYGON ((25.324444444444445 -28.735,25.324444444444445 -28.735,25.324444444444747 -28.735,25.3256844012835 -28.743637219488093,25.326752458414518 -28.752292221672775,25.327648242989319 -28.760962374913134,25.328371434292126 -28.769645042225264,25.328921763884399 -28.778337582080368,25.329299015739096 -28.787037349205164,25.329503026367707 -28.795741695383924,25.329533684919237 -28.804447970262672,25.329390933266499 -28.813153522154423,25.329074766083266 -28.821855698846022,25.328585230899417 -28.830551848405761,25.32792242813515 -28.839239319991876,25.327086511130251 -28.847915464661341,25.326077686158602 -28.856577636179196,25.324896212403537 -28.865223191827752,25.323542401945843 -28.873849493215474,25.322016619719491 -28.882453907085591,25.320319283456154 -28.891033806123644,25.31845086360034 -28.899586569764509,25.316411883234647 -28.908109584997732,25.314202917960664 -28.916600247171544,25.311824595781452 -28.925055960795305,25.309277596961152 -28.933474140339584,25.306562653857945 -28.941852211034359,25.303680550768494 -28.950187609664397,25.300632123720742 -28.958477785362163,25.29741826027432 -28.966720200397404,25.294039899300181 -28.974912330963704,25.290498030727949 -28.983051667961448,25.286793695305345 -28.991135717776984,25.282927984310767 -28.999162003057677,25.278902039273312 -29.007128063482853,25.274717051653134 -29.015031456530025,25.270374262533323 -29.022869758236496,25.265874962270246 -29.030640563955714,25.26122049013696 -29.038341489108532,25.256412233959036 -29.045970169928736,25.251451629715206 -29.053524264202991,25.246340161140221 -29.06100145200449,25.241079359298173 -29.068399436420506,25.23567080214746 -29.075715944273327,25.230116114090873 -29.082948726834402,25.224416965497046 -29.090095560531509,25.218575072228933 -29.097154247648504,25.212592195130505 -29.10412261701785,25.206470139518853 -29.110998524705039,25.200210754651753 -29.11777985468531,25.193815933175109 -29.124464519512046,25.187287610571182 -29.131050460976667,25.180627764570215 -29.137535650759972,25.173838414570472 -29.143918091074411,25.166921621027861 -29.150195815297337,25.159879484826497 -29.156366888594846,25.152714146662561 -29.162429408536127,25.145427786377269 -29.168381505697866,25.138022622300941 -29.174221344258754,25.130500910584292 -29.179947122583698,25.122864944495355 -29.185557073797725,25.115117053723321 -29.191049466349057,25.107259603657024 -29.196422604561548,25.099294994669837 -29.201674829175872,25.091225661355146 -29.206804517879718,25.083054071794677 -29.211810085826329,25.074782726776942 -29.216689986141546,25.066414159022649 -29.221442710419112,25.057950932399795 -29.226066789203841,25.049395641117307 -29.230560792462668,25.040750908918767 -29.234923330043529,25.032019388244304 -29.239153052121523,25.023203759421683 -29.243248649632577,25.014306729794193 -29.247208854694165,25.005331032890854 -29.251032441013166,24.996279427553059 -29.254718224280467,24.987154697052485 -29.258265062552468,24.977959648227149 -29.261671856618946,24.96869711057434 -29.264937550357544,24.959369935370919 -29.268061131074475,24.949980994740844 -29.271041629831515,24.940533180755306 -29.273878121758855,24.931029404524764 -29.276569726354225,24.921472595226302 -29.27911560776748,24.911865699212655 -29.281514975071246,24.902211679051732 -29.283767082516917,24.892513512561873 -29.285871229776419,24.882774191884664 -29.287826762169175,24.872996722502361 -29.289633070874672,24.863184122310912 -29.291289593130031,24.853339420578315 -29.292795812413047,24.843465657046142 -29.294151258610142,24.833565880890973 -29.295355508169479,24.823643149820615 -29.296408184238985,24.813700528987738 -29.297308956789578,24.803741090085058 -29.298057542722887,24.793767910343536 -29.298653705964284,24.783784071443542 -29.299097257540382,24.773792658660838 -29.299388055641543,24.763796759952577 -29.299526005669037,24.753799464358973 -29.299511060267122,24.743803861918728 -29.299343219339562,24.733813042177051 -29.299022530051275,24.723830092997549 -29.298549086814461,24.713858099961822 -29.297923031259401,24.703900145183407 -29.297144552190304,24.693959306309406 -29.296213885525674,24.684038655567267 -29.295131314223482,24.674141258801942 -29.293897168191322,24.664270174416327 -29.292511824181247,24.65442845241142 -29.290975705669538,24.644619133445421 -29.289289282721541,24.634845247808041 -29.287453071841185,24.625109814448344 -29.285467635805958,24.615415840038214 -29.283333583486638,24.605766317960285 -29.281051569652291,24.596164227391593 -29.278622294760709,24.586612532310763 -29.276046504733856,24.577114180572615 -29.273324990718947,24.567672102945274 -29.270458588834956,24.558289212193195 -29.267448179904818,24.548968402128249 -29.264294689173013,24.539712546687348 -29.260999086009392,24.530524499021816 -29.257562383598525,24.521407090592227 -29.253985638615347,24.512363130253711 -29.250269950886775,24.503395403389867 -29.246416463039765,24.494506670979664 -29.242426360135497,24.485699668772813 -29.238300869290413,24.476977106411617 -29.234041259283813,24.468341666547062 -29.229648840152166,24.459796004019395 -29.225124962770508,24.451342745027716 -29.220471018421009,24.442984486277584 -29.215688438348721,24.434723794192617 -29.210778693304832,24.426563204089472 -29.205743293077461,24.418505219398092 -29.200583786010426,24.410552310879975 -29.195301758509814,24.402706915859742 -29.189898834538667,24.394971437455574 -29.184376675100097,24.387348243856902 -29.178736977708979,24.379839667567335 -29.172981475852069,24.372448004707099 -29.167111938437387,24.365175514288836 -29.161130169232337,24.358024417543742 -29.155038006291477,24.350996897226008 -29.14883732137352,24.34409509694385 -29.142530019348044,24.337321120532131 -29.136118037592439,24.33067703138671 -29.129603345378626,24.324164851854118 -29.122987943250237,24.317786562621645 -29.116273862390543,24.311544102121797 -29.109463163980905,24.30543936594934 -29.10255793855049,24.2994742062996 -29.095560305316994,24.293650431416442 -29.088472411518978,24.287969805061284 -29.081296431740057,24.282434045985305 -29.074034567224615,24.277044827435564 -29.06668904518618,24.271803776659787 -29.059262118107824,24.266712474439807 -29.051756063035484,24.261772454629462 -29.044173180864007,24.256985203708833 -29.036515795616396,24.252352160375441 -29.02878625371649,24.247874715121878 -29.02098692325518,24.24355420984503 -29.013120193250629,24.239391937478619 -29.00518847290239,24.235389141624353 -28.997194190840176,24.231547016208346 -28.989139794367077,24.227866705162754 -28.981027748697628,24.224349302108447 -28.972860536191234,24.220995850059293 -28.964640655580638,24.217807341153009 -28.956370621196328,24.214784716384329 -28.948052962186651,24.211928865360008 -28.939690221734097,24.209240626079428 -28.931284956268058,24.206720784716541 -28.92283973467417,24.204370075425757 -28.914357137500531,24.202189180171864 -28.905839756161143,24.200178728561479 -28.897290192136808,24.198339297705129 -28.888711056173534,24.196671412087511 -28.880104967479028,24.195175543457147 -28.871474552917306,24.19385211072877 -28.862822446201619,24.192701479915275 -28.854151287086367,24.19172396405807 -28.845463720557575,24.190919823186178 -28.836762396022849,24.190289264288399 -28.828049966500572,24.189832441300496 -28.819329087808967,24.189549455112285 -28.810602417754893,24.189440353583787 -28.801872615323049,24.189505131591886 -28.793142339865469,24.189743731066635 -28.784414250291647,24.190156041080773 -28.775691004259812,24.190741897919008 -28.766975257369026,24.191501085191938 -28.758269662353158,24.192433333936325 -28.74957686827598,24.193538322762858 -28.740899519728529,24.194815678001433 -28.732240256028561,24.196264973852333 -28.723601710422116,24.197885732583238 -28.714986509287982,24.19967742470579 -28.706397271344827,24.201639469198703 -28.697836606861372,24.203771233721888 -28.68930711687004,24.206072034858177 -28.680811392383887,24.208541138376447 -28.672352013617413,24.211177759476751 -28.663931549211355,24.213981063100391 -28.655552555461597,24.2169501642021 -28.647217575552503,24.220084128082078 -28.638929138794964,24.223381970696099 -28.630689759869227,24.226842659002589 -28.622501938072631,24.230465111308209 -28.614368156572979,24.234248197645979 -28.606290881666965,24.238190740140944 -28.598272562044642,24.242291513417509 -28.590315628059457,24.246549244988177 -28.582422491004635,24.250962615689375 -28.574595542395741,24.255530260106084 -28.566837153259698,24.260250767015116 -28.559149673430525,24.265122679844414 -28.551535430851899,24.270144497143669 -28.543996730886917,24.275314673058389 -28.536535855634881,24.280631617835351 -28.529155063255686,24.286093698316382 -28.521856587301826,24.291699238459888 -28.514642636057971,24.297446519871226 -28.507515391888845,24.303333782336477 -28.500477010594921,24.309359224380383 -28.493529620776712,24.31552100381996 -28.486675323207294,24.321817238338735 -28.479916190213615,24.328246006069861 -28.473254265066558,24.334805346194791 -28.466691561380145,24.341493259533799 -28.4602300625194,24.348307709170513 -28.453871721018132,24.355246621064914 -28.447618458005579,24.362307884696193 -28.441472162642967,24.369489353694416 -28.435434691569711,24.376788846495483 -28.429507868359337,24.384204147000045 -28.423693482985684,24.391733005249641 -28.417993291298984,24.399373138086929 -28.412409014512306,24.407122229850941 -28.406942338698542,24.414977933080777 -28.401594914297746,24.422937869201576 -28.396368355635119,24.430999629236783 -28.391264240449956,24.43916077453795 -28.38628410943538,24.447418837487788 -28.381429465788997,24.455771322249223 -28.37670177477483,24.464215705504113 -28.372102463296528,24.472749437186824 -28.367632919481679,24.481369941250147 -28.363294492277845,24.490074616410581 -28.359088491059879,24.498860836925523 -28.355016185249198,24.50772595334951 -28.351078803944461,24.516667293338532 -28.347277535564402,24.525682162385579 -28.343613527502299,24.534767844672221 -28.340087885792698,24.543921603800779 -28.336701674789964,24.553140683623202 -28.333455916859251,24.562422309051517 -28.330351592079595,24.57176368682665 -28.327389637959214,24.581162006386851 -28.324570949163544,24.590614440635008 -28.3218963772552,24.60011814677102 -28.31936673044703,24.609670267145127 -28.316982773367286,24.619267930032869 -28.314745226837644,24.628908250528362 -28.312654767663972,24.63858833131291 -28.310712028439568,24.648305263544835 -28.308917597361543,24.658056127663254 -28.30727201805972,24.667837994267057 -28.305775789438641,24.677647924917796 -28.304429365532272,24.687482973026292 -28.303233155371913,24.697340184664604 -28.302187522866816,24.707216599457116 -28.301292786698056,24.717109251382755 -28.300549220225193,24.727015169673113 -28.299957051406295,24.736931379690652 -28.299516462730722,24.746854903656409 -28.299227591165192,24.756782761632255 -28.29909052811297,24.766711972434599 -28.299105319386072,24.776639554240347 -28.299271965190698,24.786562525734769 -28.299590420125625,24.796477906700915 -28.300060593194004,24.806382719171182 -28.300682347828001,24.816273988013755 -28.301455501926711,24.826148741958701 -28.302379827907302,24.836004014361414 -28.303455052768882,24.845836844098478 -28.304680858169917,24.855644276402057 -28.306056880518398,24.865423363765725 -28.307582711075085,24.875171166708189 -28.309257896070051,24.884884754678925 -28.311081936831783,24.894561206900327 -28.313054289929653,24.904197613154185 -28.315174367329107,24.913791074742456 -28.317441536559656,24.92333870518836 -28.31985512089615,24.932837631161526 -28.322414399552244,24.93611111111111 -28.323333333333334,24.93611111111111 -28.323333333333334,24.74 -28.466111111111111,24.74 -28.466111111111111,24.740000000006798 -28.466111111112809,24.746632430249097 -28.465871637044913,24.753268187622954 -28.465733642679226,24.759905272118928 -28.465697157550323,24.766541673734942 -28.465762180560702,24.77317539772077 -28.4659286799847,24.779804440348542 -28.466196593481584,24.786426802076775 -28.466565828117496,24.793040485511163 -28.467036260396483,24.799643496136763 -28.467607736300309,24.806233842740653 -28.468280071337446,24.812809538018556 -28.46905305060092,24.819368599277652 -28.469926428834924,24.825909048903572 -28.470899930510456,24.832428914991102 -28.471973249910022,24.838926231930369 -28.473146051220724,24.845399040894488 -28.474417968636757,24.85184539057164 -28.475788606470175,24.85826333757198 -28.477257539270838,24.864650947139452 -28.478824311954796,24.871006293602161 -28.480488439941709,24.877327461036565 -28.482249409300493,24.883612543751585 -28.484106676904105,24.889859646912562 -28.486059670592425,24.896066887037229 -28.488107789344113,24.902232392611545 -28.490250403456642,24.908354304611503 -28.492486854734935,24.91443077703882 -28.494816456688355,24.920459977479492 -28.49723849473618,24.926440087661302 -28.499752226420981,24.932369303955355 -28.502356881630817,24.938245837939125 -28.505051662829032,24.944067916906295 -28.50783574529251,24.949833784410384 -28.510708277357907,24.955541700766702 -28.51366838067581,24.961189943568936 -28.516715150472848,24.966776808222054 -28.519847655821607,24.972300608432882 -28.523064939918342,24.9777596767074 -28.526366020368442,24.983152364848348 -28.529749889479419,24.988477044467242 -28.533215514561434,24.993732107439818 -28.536761838235364,24.998915966414472 -28.540387778748141,25.004027055264203 -28.544092230295462,25.009063829563729 -28.547874063351784,25.014024767071181 -28.551732125007007,25.018908368153632 -28.555665239310756,25.023713156252619 -28.559672207623251,25.028437678344208 -28.563751808972938,25.033080505346668 -28.567902800421166,25.03764023257828 -28.572123917433132,25.042115480170764 -28.576413874255621,25.046504893485697 -28.580771364301086,25.050807143534044 -28.585195060537998,25.055020927375441 -28.589683615887409,25.059144968510566 -28.594235663625824,25.063178017286948 -28.598849817793635,25.067118851257888 -28.603524673609968,25.070966275578758 -28.608258807892824,25.074719123363518 -28.61305077948515,25.078376256041661 -28.617899129686265,25.081936563715608 -28.622802382688874,25.085398965501863 -28.627759046021239,25.088762409872622 -28.632767610994421,25.092025874965881 -28.637826553154852,25.095188368924873 -28.642934332741433,25.098248930184742 -28.648089395147835,25.101206627805809 -28.653290171388974,25.104060561732403 -28.658535078572456,25.106809863101081 -28.663822520374055,25.109453694502864 -28.669150887517645,25.111991250254196 -28.674518558259152,25.114421756659766 -28.679923898874449,25.116744472249401 -28.685365264151244,25.118958688020527 -28.690840997884379,25.121063727672666 -28.696349433375019,25.123058947821914 -28.701888893932889,25.124943738219745 -28.707457693382054,25.126717521933593 -28.713054136569667,25.128379755560044 -28.718676519877718,25.129929929402699 -28.724323131737549,25.131367567623556 -28.729992253147103,25.132692228430109 -28.735682158190684,25.13390350421783 -28.741391114561011,25.135001021699754 -28.747117384083495,25.135984442057644 -28.752859223242652,25.136853461048599 -28.75861488371028,25.137607809118133 -28.764382612875551,25.138247251504847 -28.770160654376411,25.138771588331661 -28.775947248632733,25.139180654678363 -28.781740633380437,25.139474320653182 -28.787539044207037,25.139652491459525 -28.793340715087666,25.139715107429993 -28.79914387892245,25.139662144076386 -28.804946768074032,25.139493612107152 -28.810747614905807,25.139444444444443 -28.811944444444446,25.139444444444443 -28.811944444444446,25.324444444444445 -28.735))',
                                       max_error=0.0000001) != 0:
         print('did not get expected second geom')
-        print(geom.ExportToWkt())
-        return 'fail'
+        pytest.fail(geom.ExportToWkt())
 
     return 'success'
 
diff --git a/autotest/ogr/ogr_svg.py b/autotest/ogr/ogr_svg.py
index f7af20ff7a68..b5ee5100beb3 100755
--- a/autotest/ogr/ogr_svg.py
+++ b/autotest/ogr/ogr_svg.py
@@ -49,9 +49,7 @@ def test_ogr_svg_init():
     if not gdaltest.have_svg:
         return 'skip'
 
-    if gdaltest.svg_ds.GetLayerCount() != 3:
-        gdaltest.post_reason('wrong number of layers')
-        return 'fail'
+    assert gdaltest.svg_ds.GetLayerCount() == 3, 'wrong number of layers'
 
     return 'success'
 
@@ -63,13 +61,10 @@ def test_ogr_svg_1():
     if not gdaltest.have_svg:
         return 'skip'
 
-    if gdaltest.svg_ds is None:
-        return 'fail'
+    assert gdaltest.svg_ds is not None
 
     lyr = gdaltest.svg_ds.GetLayerByName('points')
-    if lyr.GetFeatureCount() != 1:
-        gdaltest.post_reason('wrong number of features')
-        return 'fail'
+    assert lyr.GetFeatureCount() == 1, 'wrong number of features'
 
     feat = lyr.GetNextFeature()
 
@@ -83,9 +78,7 @@ def test_ogr_svg_1():
         return 'fail'
 
     lyr = gdaltest.svg_ds.GetLayerByName('lines')
-    if lyr.GetFeatureCount() != 1:
-        gdaltest.post_reason('wrong number of features')
-        return 'fail'
+    assert lyr.GetFeatureCount() == 1, 'wrong number of features'
 
     feat = lyr.GetNextFeature()
 
@@ -95,9 +88,7 @@ def test_ogr_svg_1():
         return 'fail'
 
     lyr = gdaltest.svg_ds.GetLayerByName('polygons')
-    if lyr.GetFeatureCount() != 1:
-        gdaltest.post_reason('wrong number of features')
-        return 'fail'
+    assert lyr.GetFeatureCount() == 1, 'wrong number of features'
 
     feat = lyr.GetNextFeature()
 
diff --git a/autotest/ogr/ogr_sxf.py b/autotest/ogr/ogr_sxf.py
index 65360e13410f..0a6d2a0f8ecf 100755
--- a/autotest/ogr/ogr_sxf.py
+++ b/autotest/ogr/ogr_sxf.py
@@ -59,9 +59,7 @@ def test_ogr_sxf_2():
 
     ret = gdaltest.runexternal(test_cli_utilities.get_test_ogrsf_path() + ' data/100_test.sxf')
 
-    if ret.find('INFO') == -1 or ret.find('ERROR') != -1:
-        print(ret)
-        return 'fail'
+    assert ret.find('INFO') != -1 and ret.find('ERROR') == -1
 
     return 'success'
 
diff --git a/autotest/ogr/ogr_tiger.py b/autotest/ogr/ogr_tiger.py
index e4f33cb5509e..3540fcb1e0f4 100755
--- a/autotest/ogr/ogr_tiger.py
+++ b/autotest/ogr/ogr_tiger.py
@@ -65,36 +65,29 @@ def test_ogr_tiger_1():
             return 'skip'
 
     ogrtest.tiger_ds = ogr.Open('tmp/cache/TGR01001')
-    if ogrtest.tiger_ds is None:
-        return 'fail'
+    assert ogrtest.tiger_ds is not None
 
     ogrtest.tiger_ds = None
     # also test opening with a filename (#4443)
     ogrtest.tiger_ds = ogr.Open('tmp/cache/TGR01001/TGR01001.RT1')
-    if ogrtest.tiger_ds is None:
-        return 'fail'
+    assert ogrtest.tiger_ds is not None
 
     # Check a few features.
     cc_layer = ogrtest.tiger_ds.GetLayerByName('CompleteChain')
-    if cc_layer.GetFeatureCount() != 19289:
-        gdaltest.post_reason('wrong cc feature count')
-        return 'fail'
+    assert cc_layer.GetFeatureCount() == 19289, 'wrong cc feature count'
 
     feat = cc_layer.GetNextFeature()
     feat = cc_layer.GetNextFeature()
     feat = cc_layer.GetNextFeature()
 
-    if feat.TLID != 2833200 or feat.FRIADDL is not None or feat.BLOCKL != 5000:
-        gdaltest.post_reason('wrong attribute on cc feature.')
-        return 'fail'
+    assert feat.TLID == 2833200 and feat.FRIADDL is None and feat.BLOCKL == 5000, \
+        'wrong attribute on cc feature.'
 
-    if ogrtest.check_feature_geometry(feat, 'LINESTRING (-86.4402 32.504137,-86.440313 32.504009,-86.440434 32.503884,-86.440491 32.503805,-86.44053 32.503757,-86.440578 32.503641,-86.440593 32.503515,-86.440588 32.503252,-86.440596 32.50298)', max_error=0.000001) != 0:
-        return 'fail'
+    assert ogrtest.check_feature_geometry(feat, 'LINESTRING (-86.4402 32.504137,-86.440313 32.504009,-86.440434 32.503884,-86.440491 32.503805,-86.44053 32.503757,-86.440578 32.503641,-86.440593 32.503515,-86.440588 32.503252,-86.440596 32.50298)', max_error=0.000001) == 0
 
     feat = ogrtest.tiger_ds.GetLayerByName('TLIDRange').GetNextFeature()
-    if feat.MODULE != 'TGR01001' or feat.TLMINID != 2822718:
-        gdaltest.post_reason('got wrong TLIDRange attributes')
-        return 'fail'
+    assert feat.MODULE == 'TGR01001' and feat.TLMINID == 2822718, \
+        'got wrong TLIDRange attributes'
 
     return 'success'
 
@@ -113,9 +106,7 @@ def test_ogr_tiger_2():
 
     ret = gdaltest.runexternal(test_cli_utilities.get_test_ogrsf_path() + ' -ro tmp/cache/TGR01001')
 
-    if ret.find('INFO') == -1 or ret.find('ERROR') != -1:
-        print(ret)
-        return 'fail'
+    assert ret.find('INFO') != -1 and ret.find('ERROR') == -1
 
     return 'success'
 
@@ -192,37 +183,29 @@ def test_ogr_tiger_4():
 
     # Try reading.
     ogrtest.tiger_ds = ogr.Open('/vsimem/tigertest/TGR01001.RT1')
-    if ogrtest.tiger_ds is None:
-        gdaltest.post_reason('fail to open.')
-        return 'fail'
+    assert ogrtest.tiger_ds is not None, 'fail to open.'
 
     ogrtest.tiger_ds = None
     # also test opening with a filename (#4443)
     ogrtest.tiger_ds = ogr.Open('tmp/cache/TGR01001/TGR01001.RT1')
-    if ogrtest.tiger_ds is None:
-        return 'fail'
+    assert ogrtest.tiger_ds is not None
 
     # Check a few features.
     cc_layer = ogrtest.tiger_ds.GetLayerByName('CompleteChain')
-    if cc_layer.GetFeatureCount() != 19289:
-        gdaltest.post_reason('wrong cc feature count')
-        return 'fail'
+    assert cc_layer.GetFeatureCount() == 19289, 'wrong cc feature count'
 
     feat = cc_layer.GetNextFeature()
     feat = cc_layer.GetNextFeature()
     feat = cc_layer.GetNextFeature()
 
-    if feat.TLID != 2833200 or feat.FRIADDL is not None or feat.BLOCKL != 5000:
-        gdaltest.post_reason('wrong attribute on cc feature.')
-        return 'fail'
+    assert feat.TLID == 2833200 and feat.FRIADDL is None and feat.BLOCKL == 5000, \
+        'wrong attribute on cc feature.'
 
-    if ogrtest.check_feature_geometry(feat, 'LINESTRING (-86.4402 32.504137,-86.440313 32.504009,-86.440434 32.503884,-86.440491 32.503805,-86.44053 32.503757,-86.440578 32.503641,-86.440593 32.503515,-86.440588 32.503252,-86.440596 32.50298)', max_error=0.000001) != 0:
-        return 'fail'
+    assert ogrtest.check_feature_geometry(feat, 'LINESTRING (-86.4402 32.504137,-86.440313 32.504009,-86.440434 32.503884,-86.440491 32.503805,-86.44053 32.503757,-86.440578 32.503641,-86.440593 32.503515,-86.440588 32.503252,-86.440596 32.50298)', max_error=0.000001) == 0
 
     feat = ogrtest.tiger_ds.GetLayerByName('TLIDRange').GetNextFeature()
-    if feat.MODULE != 'TGR01001' or feat.TLMINID != 2822718:
-        gdaltest.post_reason('got wrong TLIDRange attributes')
-        return 'fail'
+    assert feat.MODULE == 'TGR01001' and feat.TLMINID == 2822718, \
+        'got wrong TLIDRange attributes'
 
     # Try to recover memory from /vsimem.
     for filename in gdal.ReadDir('tmp/cache/TGR01001'):
diff --git a/autotest/ogr/ogr_vdv.py b/autotest/ogr/ogr_vdv.py
index 2a2435f9072f..d46ba4eb59bb 100755
--- a/autotest/ogr/ogr_vdv.py
+++ b/autotest/ogr/ogr_vdv.py
@@ -126,9 +126,7 @@ def test_ogr_idf_2():
 
     ret = gdaltest.runexternal(test_cli_utilities.get_test_ogrsf_path() + ' -ro data/test.idf')
 
-    if ret.find('INFO') == -1 or ret.find('ERROR') != -1:
-        print(ret)
-        return 'fail'
+    assert ret.find('INFO') != -1 and ret.find('ERROR') == -1
 
     return 'success'
 
@@ -251,9 +249,7 @@ def test_ogr_vdv_2(src_filename='tmp/test.x10'):
     got = gdal.VSIFReadL(1, 10000, f).decode('latin1')
     gdal.VSIFCloseL(f)
 
-    if got != expected:
-        print(got)
-        return 'fail'
+    assert got == expected
 
     gdal.Unlink(out_filename)
 
@@ -271,9 +267,7 @@ def test_ogr_vdv_3():
 
     ret = gdaltest.runexternal(test_cli_utilities.get_test_ogrsf_path() + ' -ro tmp/test.x10')
 
-    if ret.find('INFO') == -1 or ret.find('ERROR') != -1:
-        print(ret)
-        return 'fail'
+    assert ret.find('INFO') != -1 and ret.find('ERROR') == -1
 
     return 'success'
 
@@ -303,9 +297,7 @@ def test_ogr_vdv_6():
 
     ret = gdaltest.runexternal(test_cli_utilities.get_test_ogrsf_path() + ' -ro tmp/test_x10')
 
-    if ret.find('INFO') == -1 or ret.find('ERROR') != -1:
-        print(ret)
-        return 'fail'
+    assert ret.find('INFO') != -1 and ret.find('ERROR') == -1
 
     return 'success'
 
@@ -354,8 +346,7 @@ def test_ogr_vdv_7():
         gdal.PushErrorHandler()
         lyr = ds.CreateLayer('UNKNOWN', options=['PROFILE=' + profile, 'PROFILE_STRICT=' + str(strict)])
         gdal.PopErrorHandler()
-        if gdal.GetLastErrorMsg() == '':
-            return 'fail'
+        assert gdal.GetLastErrorMsg() != ''
         if strict and lyr is not None:
             return 'fail'
         elif not strict and lyr is None:
@@ -370,8 +361,7 @@ def test_ogr_vdv_7():
         gdal.PushErrorHandler()
         ret = lyr.CreateField(ogr.FieldDefn('UNKNOWN'))
         gdal.PopErrorHandler()
-        if gdal.GetLastErrorMsg() == '':
-            return 'fail'
+        assert gdal.GetLastErrorMsg() != ''
         if strict and ret == 0:
             return 'fail'
         elif not strict and ret != 0:
@@ -392,14 +382,12 @@ def test_ogr_vdv_8():
     gdal.PushErrorHandler()
     ds = ogr.GetDriverByName('VDV').CreateDataSource('/does/not_exist')
     gdal.PopErrorHandler()
-    if ds is not None:
-        return 'fail'
+    assert ds is None
 
     gdal.PushErrorHandler()
     ds = ogr.GetDriverByName('VDV').CreateDataSource('/does/not_exist', options=['SINGLE_FILE=FALSE'])
     gdal.PopErrorHandler()
-    if ds is not None:
-        return 'fail'
+    assert ds is None
 
     # Add layer in non writable directory
     if sys.platform.startswith('linux'):
@@ -422,8 +410,7 @@ def test_ogr_vdv_8():
             os.chmod('tmp/ogr_vdv_8', 493)
             ds = None
             shutil.rmtree('tmp/ogr_vdv_8')
-            if lyr is not None:
-                return 'fail'
+            assert lyr is None
 
     out_filename = '/vsimem/vdv/ogr_vdv_8.x10'
     ds = ogr.GetDriverByName('VDV').CreateDataSource(out_filename)
@@ -432,17 +419,13 @@ def test_ogr_vdv_8():
     gdal.PushErrorHandler()
     ds2 = ogr.GetDriverByName('VDV').CreateDataSource(out_filename)
     gdal.PopErrorHandler()
-    if ds2 is not None:
-        return 'fail'
+    assert ds2 is None
 
-    if ds.TestCapability(ogr.ODsCCreateLayer) != 1:
-        return 'fail'
+    assert ds.TestCapability(ogr.ODsCCreateLayer) == 1
 
     lyr1 = ds.CreateLayer("lyr1")
-    if lyr1.TestCapability(ogr.OLCSequentialWrite) != 1:
-        return 'fail'
-    if lyr1.TestCapability(ogr.OLCCreateField) != 1:
-        return 'fail'
+    assert lyr1.TestCapability(ogr.OLCSequentialWrite) == 1
+    assert lyr1.TestCapability(ogr.OLCCreateField) == 1
 
     lyr1.ResetReading()
 
@@ -453,31 +436,26 @@ def test_ogr_vdv_8():
     lyr1.CreateFeature(ogr.Feature(lyr1.GetLayerDefn()))
 
     # Layer structure is now frozen
-    if lyr1.TestCapability(ogr.OLCCreateField) != 0:
-        return 'fail'
+    assert lyr1.TestCapability(ogr.OLCCreateField) == 0
 
     gdal.PushErrorHandler()
     ret = lyr1.CreateField(ogr.FieldDefn('not_allowed'))
     gdal.PopErrorHandler()
-    if ret == 0:
-        return 'fail'
+    assert ret != 0
 
     lyr2 = ds.CreateLayer("lyr2")
     lyr2.CreateFeature(ogr.Feature(lyr2.GetLayerDefn()))
 
     # Test interleaved writing
 
-    if lyr1.TestCapability(ogr.OLCSequentialWrite) != 0:
-        return 'fail'
+    assert lyr1.TestCapability(ogr.OLCSequentialWrite) == 0
 
     gdal.PushErrorHandler()
     ret = lyr1.CreateFeature(ogr.Feature(lyr1.GetLayerDefn()))
     gdal.PopErrorHandler()
-    if ret == 0:
-        return 'fail'
+    assert ret != 0
 
-    if lyr1.GetFeatureCount() != 1:
-        return 'fail'
+    assert lyr1.GetFeatureCount() == 1
 
     ds = None
 
@@ -508,22 +486,18 @@ def test_ogr_vdv_8():
     got = gdal.VSIFReadL(1, 10000, f).decode('latin1')
     gdal.VSIFCloseL(f)
 
-    if got != expected:
-        print(got)
-        return 'fail'
+    assert got == expected
 
     # Test we are robust against missing end;
     ds = ogr.Open(out_filename)
     for i in range(2):
         lyr = ds.GetLayer(i)
-        if lyr.GetFeatureCount() != 1:
-            return 'fail'
+        assert lyr.GetFeatureCount() == 1
         lyr.ResetReading()
         fc = 0
         for f in lyr:
             fc += 1
-        if fc != 1:
-            return 'fail'
+        assert fc == 1
         lyr = None
     ds = None
 
@@ -542,9 +516,7 @@ def test_ogr_vdv_8():
     got = gdal.VSIFReadL(1, 10000, f).decode('latin1')
     gdal.VSIFCloseL(f)
 
-    if got != expected:
-        print(got)
-        return 'fail'
+    assert got == expected
 
     gdal.Unlink(out_filename)
 
diff --git a/autotest/ogr/ogr_vfk.py b/autotest/ogr/ogr_vfk.py
index 9f7d627b0137..3b1afaccc514 100755
--- a/autotest/ogr/ogr_vfk.py
+++ b/autotest/ogr/ogr_vfk.py
@@ -56,32 +56,23 @@ def test_ogr_vfk_1():
 
     gdaltest.vfk_ds = ogr.Open('data/bylany.vfk')
 
-    if gdaltest.vfk_ds is None:
-        return 'fail'
+    assert gdaltest.vfk_ds is not None
 
-    if gdaltest.vfk_ds.GetLayerCount() != 61:
-        gdaltest.post_reason('expected exactly 61 layers!')
-        return 'fail'
+    assert gdaltest.vfk_ds.GetLayerCount() == 61, 'expected exactly 61 layers!'
 
     gdaltest.vfk_layer_par = gdaltest.vfk_ds.GetLayer(0)
 
-    if gdaltest.vfk_layer_par is None:
-        gdaltest.post_reason('cannot get first layer')
-        return 'fail'
+    assert gdaltest.vfk_layer_par is not None, 'cannot get first layer'
 
-    if gdaltest.vfk_layer_par.GetName() != 'PAR':
-        gdaltest.post_reason('did not get expected layer name "PAR"')
-        return 'fail'
+    assert gdaltest.vfk_layer_par.GetName() == 'PAR', \
+        'did not get expected layer name "PAR"'
 
     defn = gdaltest.vfk_layer_par.GetLayerDefn()
-    if defn.GetFieldCount() != 28:
-        gdaltest.post_reason('did not get expected number of fields, got %d' % defn.GetFieldCount())
-        return 'fail'
+    assert defn.GetFieldCount() == 28, \
+        ('did not get expected number of fields, got %d' % defn.GetFieldCount())
 
     fc = gdaltest.vfk_layer_par.GetFeatureCount()
-    if fc != 1:
-        gdaltest.post_reason('did not get expected feature count, got %d' % fc)
-        return 'fail'
+    assert fc == 1, ('did not get expected feature count, got %d' % fc)
 
     return 'success'
 
@@ -98,22 +89,18 @@ def test_ogr_vfk_2():
 
     feat = gdaltest.vfk_layer_par.GetNextFeature()
 
-    if feat.GetFID() != 1:
-        gdaltest.post_reason('did not get expected fid for feature 1')
-        return 'fail'
+    assert feat.GetFID() == 1, 'did not get expected fid for feature 1'
 
     geom = feat.GetGeometryRef()
-    if geom.GetGeometryType() != ogr.wkbPolygon:
-        gdaltest.post_reason('did not get expected geometry type.')
-        return 'fail'
+    assert geom.GetGeometryType() == ogr.wkbPolygon, \
+        'did not get expected geometry type.'
 
     envelope = geom.GetEnvelope()
     area = (envelope[1] - envelope[0]) * (envelope[3] - envelope[2])
     exp_area = 2010.5
 
-    if area < exp_area - 0.5 or area > exp_area + 0.5:
-        gdaltest.post_reason('envelope area not as expected, got %g.' % area)
-        return 'fail'
+    assert area >= exp_area - 0.5 and area <= exp_area + 0.5, \
+        ('envelope area not as expected, got %g.' % area)
 
     return 'success'
 
@@ -128,9 +115,8 @@ def test_ogr_vfk_3():
 
     gdaltest.vfk_layer_sobr = gdaltest.vfk_ds.GetLayer(43)
 
-    if gdaltest.vfk_layer_sobr.GetName() != 'SOBR':
-        gdaltest.post_reason('did not get expected layer name "SOBR"')
-        return 'fail'
+    assert gdaltest.vfk_layer_sobr.GetName() == 'SOBR', \
+        'did not get expected layer name "SOBR"'
 
     gdaltest.vfk_layer_sobr.SetAttributeFilter("CISLO_BODU = '55'")
 
@@ -142,9 +128,7 @@ def test_ogr_vfk_3():
         feat = gdaltest.vfk_layer_sobr.GetNextFeature()
         count += 1
 
-    if count != 1:
-        gdaltest.post_reason('did not get expected number of features, got %d' % count)
-        return 'fail'
+    assert count == 1, ('did not get expected number of features, got %d' % count)
 
     return 'success'
 
@@ -159,16 +143,12 @@ def test_ogr_vfk_4():
 
     gdaltest.vfk_layer_sbp = gdaltest.vfk_ds.GetLayerByName('SBP')
 
-    if not gdaltest.vfk_layer_sbp:
-        gdaltest.post_reason('did not get expected layer name "SBP"')
-        return 'fail'
+    assert gdaltest.vfk_layer_sbp, 'did not get expected layer name "SBP"'
 
     feat = gdaltest.vfk_layer_sbp.GetFeature(5)
     length = int(feat.geometry().Length())
 
-    if length != 10:
-        gdaltest.post_reason('did not get expected length, got %d' % length)
-        return 'fail'
+    assert length == 10, ('did not get expected length, got %d' % length)
 
     return 'success'
 
@@ -183,15 +163,12 @@ def test_ogr_vfk_5():
 
     gdaltest.vfk_layer_hp = gdaltest.vfk_ds.GetLayerByName('HP')
 
-    if not gdaltest.vfk_layer_hp != 'HP':
-        gdaltest.post_reason('did not get expected layer name "HP"')
-        return 'fail'
+    assert gdaltest.vfk_layer_hp != 'HP', 'did not get expected layer name "HP"'
 
     geom_type = gdaltest.vfk_layer_hp.GetGeomType()
 
-    if geom_type != ogr.wkbLineString:
-        gdaltest.post_reason('did not get expected geometry type, got %d' % geom_type)
-        return 'fail'
+    assert geom_type == ogr.wkbLineString, \
+        ('did not get expected geometry type, got %d' % geom_type)
 
     return 'success'
 
@@ -209,32 +186,23 @@ def test_ogr_vfk_6():
     gdaltest.vfk_ds = None
     gdaltest.vfk_ds = ogr.Open('data/bylany.vfk')
 
-    if gdaltest.vfk_ds is None:
-        return 'fail'
+    assert gdaltest.vfk_ds is not None
 
-    if gdaltest.vfk_ds.GetLayerCount() != 61:
-        gdaltest.post_reason('expected exactly 61 layers!')
-        return 'fail'
+    assert gdaltest.vfk_ds.GetLayerCount() == 61, 'expected exactly 61 layers!'
 
     gdaltest.vfk_layer_par = gdaltest.vfk_ds.GetLayer(0)
 
-    if gdaltest.vfk_layer_par is None:
-        gdaltest.post_reason('cannot get first layer')
-        return 'fail'
+    assert gdaltest.vfk_layer_par is not None, 'cannot get first layer'
 
-    if gdaltest.vfk_layer_par.GetName() != 'PAR':
-        gdaltest.post_reason('did not get expected layer name "PAR"')
-        return 'fail'
+    assert gdaltest.vfk_layer_par.GetName() == 'PAR', \
+        'did not get expected layer name "PAR"'
 
     defn = gdaltest.vfk_layer_par.GetLayerDefn()
-    if defn.GetFieldCount() != 28:
-        gdaltest.post_reason('did not get expected number of fields, got %d' % defn.GetFieldCount())
-        return 'fail'
+    assert defn.GetFieldCount() == 28, \
+        ('did not get expected number of fields, got %d' % defn.GetFieldCount())
 
     fc = gdaltest.vfk_layer_par.GetFeatureCount()
-    if fc != 1:
-        gdaltest.post_reason('did not get expected feature count, got %d' % fc)
-        return 'fail'
+    assert fc == 1, ('did not get expected feature count, got %d' % fc)
 
     return 'success'
 
@@ -254,9 +222,8 @@ def test_ogr_vfk_7():
                              (2, "DATUM_VZNIKU", ogr.OFTString),
                              (22, "CENA_NEMOVITOSTI", ogr.OFTReal)):
         col = defn.GetFieldDefn(idx)
-        if col.GetName() != name or col.GetType() != ctype:
-            gdaltest.post_reason("PAR: '{}' column name/type mismatch".format(name))
-            return 'fail'
+        assert col.GetName() == name and col.GetType() == ctype, \
+            "PAR: '{}' column name/type mismatch".format(name)
 
     return 'success'
 
@@ -280,9 +247,8 @@ def test_ogr_vfk_8():
     count2 = vfk_ds_db.GetLayerCount()
     vfk_ds_db = None
 
-    if count1 != count2:
-        gdaltest.post_reason('layer count differs when opening DB by SQLite and VFK drivers')
-        return 'fail'
+    assert count1 == count2, \
+        'layer count differs when opening DB by SQLite and VFK drivers'
 
     del os.environ['OGR_VFK_DB_READ']
 
@@ -303,17 +269,14 @@ def test_ogr_vfk_9():
 
     vfk_layer_par = vfk_ds.GetLayerByName('PAR')
 
-    if not vfk_layer_par != 'PAR':
-        gdaltest.post_reason('did not get expected layer name "PAR"')
-        return 'fail'
+    assert vfk_layer_par != 'PAR', 'did not get expected layer name "PAR"'
 
     geom_type = vfk_layer_par.GetGeomType()
     vfk_layer_par = None
     vfk_ds = None
 
-    if geom_type != ogr.wkbNone:
-        gdaltest.post_reason('did not get expected geometry type, got %d' % geom_type)
-        return 'fail'
+    assert geom_type == ogr.wkbNone, \
+        ('did not get expected geometry type, got %d' % geom_type)
 
     return 'success'
 
@@ -332,9 +295,7 @@ def test_ogr_vfk_10():
 
     vfk_layer_par = vfk_ds.GetLayerByName('PAR')
 
-    if not vfk_layer_par != 'PAR':
-        gdaltest.post_reason('did not get expected layer name "PAR"')
-        return 'fail'
+    assert vfk_layer_par != 'PAR', 'did not get expected layer name "PAR"'
 
     vfk_layer_par.ResetReading()
     feat = vfk_layer_par.GetNextFeature()
@@ -342,9 +303,7 @@ def test_ogr_vfk_10():
     vfk_layer_par = None
     vfk_ds = None
 
-    if file_field != 'bylany.vfk':
-        gdaltest.post_reason('did not get expected file field value')
-        return 'fail'
+    assert file_field == 'bylany.vfk', 'did not get expected file field value'
 
     return 'success'
 
diff --git a/autotest/ogr/ogr_virtualogr.py b/autotest/ogr/ogr_virtualogr.py
index ad2f8365ebb2..2595021191ad 100755
--- a/autotest/ogr/ogr_virtualogr.py
+++ b/autotest/ogr/ogr_virtualogr.py
@@ -76,53 +76,39 @@ def test_ogr_virtualogr_1():
         return 'skip'
 
     # Invalid syntax
-    if ogr_virtualogr_run_sql("CREATE VIRTUAL TABLE poly USING VirtualOGR()"):
-        return 'fail'
+    assert not ogr_virtualogr_run_sql("CREATE VIRTUAL TABLE poly USING VirtualOGR()")
 
     # Nonexistent dataset
-    if ogr_virtualogr_run_sql("CREATE VIRTUAL TABLE poly USING VirtualOGR('foo')"):
-        return 'fail'
+    assert not ogr_virtualogr_run_sql("CREATE VIRTUAL TABLE poly USING VirtualOGR('foo')")
 
     # Dataset with 0 layer
-    if ogr_virtualogr_run_sql("CREATE VIRTUAL TABLE poly USING VirtualOGR('<OGRVRTDataSource></OGRVRTDataSource>')"):
-        return 'fail'
+    assert not ogr_virtualogr_run_sql("CREATE VIRTUAL TABLE poly USING VirtualOGR('<OGRVRTDataSource></OGRVRTDataSource>')")
 
     # Dataset with more than 1 layer
-    if ogr_virtualogr_run_sql("CREATE VIRTUAL TABLE poly USING VirtualOGR('data')"):
-        return 'fail'
+    assert not ogr_virtualogr_run_sql("CREATE VIRTUAL TABLE poly USING VirtualOGR('data')")
 
-    if not ogr_virtualogr_run_sql("CREATE VIRTUAL TABLE poly USING VirtualOGR('data/poly.shp')"):
-        return 'fail'
+    assert ogr_virtualogr_run_sql("CREATE VIRTUAL TABLE poly USING VirtualOGR('data/poly.shp')")
 
-    if not ogr_virtualogr_run_sql("CREATE VIRTUAL TABLE poly USING VirtualOGR('data/poly.shp', 0)"):
-        return 'fail'
+    assert ogr_virtualogr_run_sql("CREATE VIRTUAL TABLE poly USING VirtualOGR('data/poly.shp', 0)")
 
-    if not ogr_virtualogr_run_sql("CREATE VIRTUAL TABLE poly USING VirtualOGR('data/poly.shp', 1)"):
-        return 'fail'
+    assert ogr_virtualogr_run_sql("CREATE VIRTUAL TABLE poly USING VirtualOGR('data/poly.shp', 1)")
 
     # Invalid value for update_mode
-    if ogr_virtualogr_run_sql("CREATE VIRTUAL TABLE poly USING VirtualOGR('data/poly.shp', 'foo')"):
-        return 'fail'
+    assert not ogr_virtualogr_run_sql("CREATE VIRTUAL TABLE poly USING VirtualOGR('data/poly.shp', 'foo')")
 
     # Nonexistent layer
-    if ogr_virtualogr_run_sql("CREATE VIRTUAL TABLE poly USING VirtualOGR('data/poly.shp', 0, 'foo')"):
-        return 'fail'
+    assert not ogr_virtualogr_run_sql("CREATE VIRTUAL TABLE poly USING VirtualOGR('data/poly.shp', 0, 'foo')")
 
-    if not ogr_virtualogr_run_sql("CREATE VIRTUAL TABLE poly USING VirtualOGR('data/poly.shp', 0, 'poly')"):
-        return 'fail'
+    assert ogr_virtualogr_run_sql("CREATE VIRTUAL TABLE poly USING VirtualOGR('data/poly.shp', 0, 'poly')")
 
-    if not ogr_virtualogr_run_sql("CREATE VIRTUAL TABLE poly USING VirtualOGR('data/poly.shp', 0, 'poly', 0)"):
-        return 'fail'
+    assert ogr_virtualogr_run_sql("CREATE VIRTUAL TABLE poly USING VirtualOGR('data/poly.shp', 0, 'poly', 0)")
 
-    if not ogr_virtualogr_run_sql("CREATE VIRTUAL TABLE poly USING VirtualOGR('data/poly.shp', 0, 'poly', 1)"):
-        return 'fail'
+    assert ogr_virtualogr_run_sql("CREATE VIRTUAL TABLE poly USING VirtualOGR('data/poly.shp', 0, 'poly', 1)")
 
-    if not ogr_virtualogr_run_sql("CREATE VIRTUAL TABLE poly USING VirtualOGR('data/poly.shp', 0, 'poly', 1, 1)"):
-        return 'fail'
+    assert ogr_virtualogr_run_sql("CREATE VIRTUAL TABLE poly USING VirtualOGR('data/poly.shp', 0, 'poly', 1, 1)")
 
     # Too many arguments
-    if ogr_virtualogr_run_sql("CREATE VIRTUAL TABLE poly USING VirtualOGR('data/poly.shp', 0, 'poly', 1, 1, bla)"):
-        return 'fail'
+    assert not ogr_virtualogr_run_sql("CREATE VIRTUAL TABLE poly USING VirtualOGR('data/poly.shp', 0, 'poly', 1, 1, bla)")
 
     return 'success'
 
@@ -144,8 +130,7 @@ def test_ogr_virtualogr_2():
     # Check that foo isn't listed
     ds = ogr.Open('/vsimem/ogr_virtualogr_2.db')
     for i in range(ds.GetLayerCount()):
-        if ds.GetLayer(i).GetName() == 'foo':
-            return 'fail'
+        assert ds.GetLayer(i).GetName() != 'foo'
     ds = None
 
     # Check that it is listed if OGR_SQLITE_LIST_VIRTUAL_OGR=YES
@@ -156,8 +141,7 @@ def test_ogr_virtualogr_2():
     for i in range(ds.GetLayerCount()):
         if ds.GetLayer(i).GetName() == 'foo':
             found = True
-    if not found:
-        return 'fail'
+    assert found
     ds = None
 
     # Add suspicious trigger
@@ -170,8 +154,7 @@ def test_ogr_virtualogr_2():
     gdal.ErrorReset()
     ds = ogr.Open('/vsimem/ogr_virtualogr_2.db')
     for i in range(ds.GetLayerCount()):
-        if ds.GetLayer(i).GetName() == 'foo':
-            return 'fail'
+        assert ds.GetLayer(i).GetName() != 'foo'
     # An error will be triggered at the time the trigger is used
     gdal.PushErrorHandler('CPLQuietErrorHandler')
     ds.ExecuteSQL("INSERT INTO regular_table (bar) VALUES ('bar')")
@@ -200,9 +183,7 @@ def test_ogr_virtualogr_2():
 
     gdal.Unlink('/vsimem/ogr_virtualogr_2.db')
 
-    if did_not_get_error:
-        gdaltest.post_reason('expected a failure')
-        return 'fail'
+    assert not did_not_get_error, 'expected a failure'
 
     return 'success'
 
@@ -239,9 +220,7 @@ def test_ogr_virtualogr_3():
 
     if ret.find('skip') == 0:
         return 'skip'
-    if ret.find(gdal.VersionInfo('RELEASE_NAME')) < 0:
-        gdaltest.post_reason('fail : %s' % ret)
-        return 'fail'
+    assert ret.find(gdal.VersionInfo('RELEASE_NAME')) >= 0, ('fail : %s' % ret)
 
     return 'success'
 
@@ -267,8 +246,7 @@ def test_ogr_virtualogr_4():
     ds = None
     gdal.Unlink('/vsimem/ogr_virtualogr_4.db')
 
-    if ret != 10:
-        return 'fail'
+    assert ret == 10
 
     ds = ogr.GetDriverByName('SQLite').CreateDataSource('/vsimem/ogr_virtualogr_4.db')
     sql_lyr = ds.ExecuteSQL("SELECT ogr_datasource_load_layers('data/poly.shp', 0)")
@@ -279,8 +257,7 @@ def test_ogr_virtualogr_4():
     ds = None
     gdal.Unlink('/vsimem/ogr_virtualogr_4.db')
 
-    if ret != 10:
-        return 'fail'
+    assert ret == 10
 
     ds = ogr.GetDriverByName('SQLite').CreateDataSource('/vsimem/ogr_virtualogr_4.db')
     sql_lyr = ds.ExecuteSQL("SELECT ogr_datasource_load_layers('data/poly.shp', 0, 'prefix')")
@@ -291,8 +268,7 @@ def test_ogr_virtualogr_4():
     ds = None
     gdal.Unlink('/vsimem/ogr_virtualogr_4.db')
 
-    if ret != 10:
-        return 'fail'
+    assert ret == 10
 
     # Various error conditions
     ds = ogr.GetDriverByName('SQLite').CreateDataSource('/vsimem/ogr_virtualogr_4.db')
@@ -332,8 +308,7 @@ def test_ogr_virtualogr_5():
     gdal.PushErrorHandler('CPLQuietErrorHandler')
     sql_lyr = ds.ExecuteSQL("CREATE VIRTUAL TABLE lyr2 USING VirtualOGR('/vsimem/ogr_virtualogr_5.csv')", dialect='SQLITE')
     gdal.PopErrorHandler()
-    if sql_lyr is not None:
-        return 'fail'
+    assert sql_lyr is None
     ds = None
 
     gdal.Unlink('/vsimem/ogr_virtualogr_5.csv')
diff --git a/autotest/ogr/ogr_vrt.py b/autotest/ogr/ogr_vrt.py
index c9738154e34b..15c129acf116 100755
--- a/autotest/ogr/ogr_vrt.py
+++ b/autotest/ogr/ogr_vrt.py
@@ -65,36 +65,26 @@ def test_ogr_vrt_2():
     lyr = gdaltest.vrt_ds.GetLayerByName('test2')
 
     extent = lyr.GetExtent()
-    if extent != (12.5, 100.0, 17.0, 200.0):
-        gdaltest.post_reason('wrong extent')
-        print(extent)
-        return 'fail'
+    assert extent == (12.5, 100.0, 17.0, 200.0), 'wrong extent'
 
     expect = ['First', 'Second']
 
     tr = ogrtest.check_features_against_list(lyr, 'other', expect)
-    if not tr:
-        return 'fail'
+    assert tr
 
     lyr.ResetReading()
 
     feat = lyr.GetNextFeature()
-    if ogrtest.check_feature_geometry(feat, 'POINT(12.5 17 1.2)',
-                                      max_error=0.000000001) != 0:
-        return 'fail'
+    assert (ogrtest.check_feature_geometry(feat, 'POINT(12.5 17 1.2)',
+                                      max_error=0.000000001) == 0)
 
-    if feat.GetFID() != 0:
-        gdaltest.post_reason('Unexpected fid')
-        return 'fail'
+    assert feat.GetFID() == 0, 'Unexpected fid'
 
     feat = lyr.GetNextFeature()
-    if ogrtest.check_feature_geometry(feat, 'POINT(100 200)',
-                                      max_error=0.000000001) != 0:
-        return 'fail'
+    assert (ogrtest.check_feature_geometry(feat, 'POINT(100 200)',
+                                      max_error=0.000000001) == 0)
 
-    if feat.GetFID() != 1:
-        gdaltest.post_reason('Unexpected fid')
-        return 'fail'
+    assert feat.GetFID() == 1, 'Unexpected fid'
 
     return 'success'
 
@@ -113,28 +103,21 @@ def test_ogr_vrt_3():
     expect = ['First', 'Second']
 
     tr = ogrtest.check_features_against_list(lyr, 'other', expect)
-    if not tr:
-        return 'fail'
+    assert tr
 
     lyr.ResetReading()
 
     feat = lyr.GetNextFeature()
-    if ogrtest.check_feature_geometry(feat, 'POINT(12.5 17 1.2)',
-                                      max_error=0.000000001) != 0:
-        return 'fail'
+    assert (ogrtest.check_feature_geometry(feat, 'POINT(12.5 17 1.2)',
+                                      max_error=0.000000001) == 0)
 
-    if feat.GetFID() != 1:
-        gdaltest.post_reason('Unexpected fid')
-        return 'fail'
+    assert feat.GetFID() == 1, 'Unexpected fid'
 
     feat = lyr.GetNextFeature()
-    if ogrtest.check_feature_geometry(feat, 'POINT(100 200)',
-                                      max_error=0.000000001) != 0:
-        return 'fail'
+    assert (ogrtest.check_feature_geometry(feat, 'POINT(100 200)',
+                                      max_error=0.000000001) == 0)
 
-    if feat.GetFID() != 2:
-        gdaltest.post_reason('Unexpected fid')
-        return 'fail'
+    assert feat.GetFID() == 2, 'Unexpected fid'
 
     return 'success'
 
@@ -154,15 +137,13 @@ def test_ogr_vrt_4():
     expect = ['Second']
 
     tr = ogrtest.check_features_against_list(lyr, 'other', expect)
-    if not tr:
-        return 'fail'
+    assert tr
 
     lyr.ResetReading()
 
     feat = lyr.GetNextFeature()
-    if ogrtest.check_feature_geometry(feat, 'POINT(100 200)',
-                                      max_error=0.000000001) != 0:
-        return 'fail'
+    assert (ogrtest.check_feature_geometry(feat, 'POINT(100 200)',
+                                      max_error=0.000000001) == 0)
 
     lyr.SetSpatialFilter(None)
 
@@ -182,15 +163,13 @@ def test_ogr_vrt_5():
     expect = ['First']
 
     tr = ogrtest.check_features_against_list(lyr, 'other', expect)
-    if not tr:
-        return 'fail'
+    assert tr
 
     lyr.ResetReading()
 
     feat = lyr.GetNextFeature()
-    if ogrtest.check_feature_geometry(feat, 'POINT(12.5 17 1.2)',
-                                      max_error=0.000000001) != 0:
-        return 'fail'
+    assert (ogrtest.check_feature_geometry(feat, 'POINT(12.5 17 1.2)',
+                                      max_error=0.000000001) == 0)
 
     lyr.SetAttributeFilter(None)
 
@@ -209,9 +188,7 @@ def test_ogr_vrt_6():
     lyr.ResetReading()
 
     feat = lyr.GetFeature(2)
-    if feat.GetField('other') != 'Second':
-        gdaltest.post_reason('GetFeature() did not work properly.')
-        return 'fail'
+    assert feat.GetField('other') == 'Second', 'GetFeature() did not work properly.'
 
     return 'success'
 
@@ -229,28 +206,21 @@ def test_ogr_vrt_7():
     expect = ['First', 'Second']
 
     tr = ogrtest.check_features_against_list(lyr, 'other', expect)
-    if not tr:
-        return 'fail'
+    assert tr
 
     lyr.ResetReading()
 
     feat = lyr.GetNextFeature()
-    if ogrtest.check_feature_geometry(feat, 'POINT(12.5 17 1.2)',
-                                      max_error=0.000000001) != 0:
-        return 'fail'
+    assert (ogrtest.check_feature_geometry(feat, 'POINT(12.5 17 1.2)',
+                                      max_error=0.000000001) == 0)
 
-    if feat.GetFID() != 1:
-        gdaltest.post_reason('Unexpected fid')
-        return 'fail'
+    assert feat.GetFID() == 1, 'Unexpected fid'
 
     feat = lyr.GetNextFeature()
-    if ogrtest.check_feature_geometry(feat, 'POINT(100 200)',
-                                      max_error=0.000000001) != 0:
-        return 'fail'
+    assert (ogrtest.check_feature_geometry(feat, 'POINT(100 200)',
+                                      max_error=0.000000001) == 0)
 
-    if feat.GetFID() != 2:
-        gdaltest.post_reason('Unexpected fid')
-        return 'fail'
+    assert feat.GetFID() == 2, 'Unexpected fid'
 
     return 'success'
 
@@ -271,28 +241,21 @@ def test_ogr_vrt_8():
     expect = ['First', 'Second']
 
     tr = ogrtest.check_features_against_list(lyr, 'other', expect)
-    if not tr:
-        return 'fail'
+    assert tr
 
     lyr.ResetReading()
 
     feat = lyr.GetNextFeature()
-    if ogrtest.check_feature_geometry(feat, 'POINT(12.5 17 1.2)',
-                                      max_error=0.000000001) != 0:
-        return 'fail'
+    assert (ogrtest.check_feature_geometry(feat, 'POINT(12.5 17 1.2)',
+                                      max_error=0.000000001) == 0)
 
-    if feat.GetFID() != 1:
-        gdaltest.post_reason('Unexpected fid')
-        return 'fail'
+    assert feat.GetFID() == 1, 'Unexpected fid'
 
     feat = lyr.GetNextFeature()
-    if ogrtest.check_feature_geometry(feat, 'POINT(100 200)',
-                                      max_error=0.000000001) != 0:
-        return 'fail'
+    assert (ogrtest.check_feature_geometry(feat, 'POINT(100 200)',
+                                      max_error=0.000000001) == 0)
 
-    if feat.GetFID() != 2:
-        gdaltest.post_reason('Unexpected fid')
-        return 'fail'
+    assert feat.GetFID() == 2, 'Unexpected fid'
 
     return 'success'
 
@@ -310,18 +273,13 @@ def test_ogr_vrt_9():
     lyr.ResetReading()
 
     feat = lyr.GetNextFeature()
-    if feat.GetField('other') != 'Second':
-        gdaltest.post_reason('attribute filter did not work.')
-        return 'fail'
+    assert feat.GetField('other') == 'Second', 'attribute filter did not work.'
 
     sub_ds = ogr.OpenShared('data/flat.dbf')
     sub_layer = sub_ds.GetLayerByName('flat')
 
     sub_layer.ResetReading()
-    if sub_layer.GetFeatureCount() != 1:
-        print(sub_layer.GetFeatureCount())
-        gdaltest.post_reason('attribute filter not passed to sublayer.')
-        return 'fail'
+    assert sub_layer.GetFeatureCount() == 1, 'attribute filter not passed to sublayer.'
 
     lyr.SetAttributeFilter(None)
 
@@ -345,12 +303,9 @@ def test_ogr_vrt_10():
     src_ds = ogr.Open('data/testpoly.shp')
     src_lyr = src_ds.GetLayer(0)
 
-    if vrt_lyr.TestCapability(ogr.OLCFastFeatureCount) != src_lyr.TestCapability(ogr.OLCFastFeatureCount):
-        return 'fail'
-    if vrt_lyr.TestCapability(ogr.OLCFastGetExtent) != src_lyr.TestCapability(ogr.OLCFastGetExtent):
-        return 'fail'
-    if vrt_lyr.TestCapability(ogr.OLCRandomRead) != src_lyr.TestCapability(ogr.OLCRandomRead):
-        return 'fail'
+    assert vrt_lyr.TestCapability(ogr.OLCFastFeatureCount) == src_lyr.TestCapability(ogr.OLCFastFeatureCount)
+    assert vrt_lyr.TestCapability(ogr.OLCFastGetExtent) == src_lyr.TestCapability(ogr.OLCFastGetExtent)
+    assert vrt_lyr.TestCapability(ogr.OLCRandomRead) == src_lyr.TestCapability(ogr.OLCRandomRead)
 
     return 'success'
 
@@ -386,13 +341,9 @@ def test_ogr_vrt_11():
     vrt_lyr = vrt_ds.GetLayerByName('test')
 
     # Only val1, val2, style attributes should be reported
-    if vrt_lyr.GetLayerDefn().GetFieldCount() != 3:
-        print(vrt_lyr.GetLayerDefn().GetFieldCount())
-        return 'fail'
-    if vrt_lyr.GetLayerDefn().GetFieldDefn(0).GetNameRef() != 'val1':
-        return 'fail'
-    if vrt_lyr.GetLayerDefn().GetFieldDefn(1).GetNameRef() != 'val2':
-        return 'fail'
+    assert vrt_lyr.GetLayerDefn().GetFieldCount() == 3
+    assert vrt_lyr.GetLayerDefn().GetFieldDefn(0).GetNameRef() == 'val1'
+    assert vrt_lyr.GetLayerDefn().GetFieldDefn(1).GetNameRef() == 'val2'
 
     feat = vrt_lyr.GetNextFeature()
     if feat.GetStyleString() != 'PEN(c:#FF0000,w:5pt,p:"2px 1pt")':
@@ -411,8 +362,7 @@ def test_ogr_vrt_11():
     if geom.ExportToWkt() != 'POINT (3 50)':
         feat.DumpReadable()
         return 'fail'
-    if feat.GetFieldAsString('val1') != 'val21':
-        return 'fail'
+    assert feat.GetFieldAsString('val1') == 'val21'
 
     # The x and y fields are considered as string by default, so spatial
     # filter cannot be turned into attribute filter
@@ -420,10 +370,8 @@ def test_ogr_vrt_11():
     vrt_lyr.SetSpatialFilterRect(0, 40, 10, 49.5)
     ret = vrt_lyr.GetFeatureCount()
     gdal.PopErrorHandler()
-    if gdal.GetLastErrorMsg().find('not declared as numeric fields') == -1:
-        return 'fail'
-    if ret != 1:
-        return 'fail'
+    assert gdal.GetLastErrorMsg().find('not declared as numeric fields') != -1
+    assert ret == 1
 
     vrt_ds = None
 
@@ -435,18 +383,14 @@ def test_ogr_vrt_11():
     vrt_ds = ogr.Open(vrt_xml, update=1)
     vrt_lyr = vrt_ds.GetLayerByName('test')
     vrt_lyr.SetSpatialFilterRect(0, 40, 10, 49.5)
-    if vrt_lyr.GetFeatureCount() != 1:
-        return 'fail'
-    if gdal.GetLastErrorMsg() != '':
-        return 'fail'
+    assert vrt_lyr.GetFeatureCount() == 1
+    assert gdal.GetLastErrorMsg() == ''
 
     vrt_lyr.SetAttributeFilter("1 = 1")
-    if vrt_lyr.GetFeatureCount() != 1:
-        return 'fail'
+    assert vrt_lyr.GetFeatureCount() == 1
 
     vrt_lyr.SetAttributeFilter("1 = 0")
-    if vrt_lyr.GetFeatureCount() != 0:
-        return 'fail'
+    assert vrt_lyr.GetFeatureCount() == 0
 
     vrt_ds = None
 
@@ -488,10 +432,8 @@ def test_ogr_vrt_12():
     vrt_lyr.ResetReading()
     feat = vrt_lyr.GetFeature(2)
     geom = feat.GetGeometryRef()
-    if geom.ExportToWkt() != 'POINT (3 50)':
-        return 'fail'
-    if feat.GetFieldAsString('val1') != 'val21':
-        return 'fail'
+    assert geom.ExportToWkt() == 'POINT (3 50)'
+    assert feat.GetFieldAsString('val1') == 'val21'
 
     vrt_ds = None
 
@@ -531,10 +473,8 @@ def test_ogr_vrt_13():
     vrt_lyr.ResetReading()
     feat = vrt_lyr.GetFeature(1)
     geom = feat.GetGeometryRef()
-    if geom.ExportToWkt() != 'POINT (3 50)':
-        return 'fail'
-    if feat.GetFieldAsString('val1') != 'val21':
-        return 'fail'
+    assert geom.ExportToWkt() == 'POINT (3 50)'
+    assert feat.GetFieldAsString('val1') == 'val21'
 
     vrt_ds = None
 
@@ -595,29 +535,18 @@ def test_ogr_vrt_14():
     vrt_ds = ogr.Open(vrt_xml)
     vrt_lyr = vrt_ds.GetLayerByName('mytest')
 
-    if vrt_lyr.TestCapability(ogr.OLCFastSpatialFilter) != 1:
-        gdaltest.post_reason('Fast filter not set.')
-        return 'fail'
+    assert vrt_lyr.TestCapability(ogr.OLCFastSpatialFilter) == 1, 'Fast filter not set.'
 
     extent = vrt_lyr.GetExtent()
-    if extent != (2.0, 2.0, 49.0, 49.0):
-        gdaltest.post_reason('wrong extent')
-        print(extent)
-        return 'fail'
+    assert extent == (2.0, 2.0, 49.0, 49.0), 'wrong extent'
 
-    if vrt_lyr.GetFeatureCount() != 1:
-        gdaltest.post_reason('Feature count not one as expected.')
-        return 'fail'
+    assert vrt_lyr.GetFeatureCount() == 1, 'Feature count not one as expected.'
 
     feat = vrt_lyr.GetNextFeature()
-    if feat.GetFID() != 2:
-        gdaltest.post_reason('did not get fid 2.')
-        return 'fail'
+    assert feat.GetFID() == 2, 'did not get fid 2.'
 
     geom = feat.GetGeometryRef()
-    if geom.ExportToWkt() != 'POINT (2 49)':
-        gdaltest.post_reason('did not get expected point geometry.')
-        return 'fail'
+    assert geom.ExportToWkt() == 'POINT (2 49)', 'did not get expected point geometry.'
 
     vrt_lyr.SetSpatialFilterRect(1, 41, 3, 49.5)
     if vrt_lyr.GetFeatureCount() != 1:
@@ -631,14 +560,11 @@ def test_ogr_vrt_14():
         return 'fail'
 
     vrt_lyr.SetSpatialFilterRect(1, 41, 3, 48.5)
-    if vrt_lyr.GetFeatureCount() != 0:
-        gdaltest.post_reason('Did not get expected zero feature count.')
-        return 'fail'
+    assert vrt_lyr.GetFeatureCount() == 0, 'Did not get expected zero feature count.'
 
     vrt_lyr.SetSpatialFilter(None)
-    if vrt_lyr.GetFeatureCount() != 1:
-        gdaltest.post_reason('Did not get expected one feature count with no filter.')
-        return 'fail'
+    assert vrt_lyr.GetFeatureCount() == 1, \
+        'Did not get expected one feature count with no filter.'
 
     vrt_ds = None
     ogr.GetDriverByName('ESRI Shapefile').DeleteDataSource('tmp/test.shp')
@@ -673,31 +599,24 @@ def test_ogr_vrt_15():
     vrt_ds = ogr.Open(vrt_xml)
     vrt_lyr = vrt_ds.GetLayerByName('test')
 
-    if vrt_lyr.TestCapability(ogr.OLCFastSpatialFilter) != 0:
-        return 'fail'
+    assert vrt_lyr.TestCapability(ogr.OLCFastSpatialFilter) == 0
 
-    if vrt_lyr.GetFeatureCount() != 1:
-        return 'fail'
+    assert vrt_lyr.GetFeatureCount() == 1
 
     feat = vrt_lyr.GetNextFeature()
-    if feat.GetFID() != 3:
-        return 'fail'
+    assert feat.GetFID() == 3
 
     geom = feat.GetGeometryRef()
-    if geom.ExportToWkt() != 'POINT (2 49)':
-        return 'fail'
+    assert geom.ExportToWkt() == 'POINT (2 49)'
 
     vrt_lyr.SetSpatialFilterRect(1, 41, 3, 49.5)
-    if vrt_lyr.GetFeatureCount() != 1:
-        return 'fail'
+    assert vrt_lyr.GetFeatureCount() == 1
 
     vrt_lyr.SetSpatialFilterRect(1, 41, 3, 48.5)
-    if vrt_lyr.GetFeatureCount() != 0:
-        return 'fail'
+    assert vrt_lyr.GetFeatureCount() == 0
 
     vrt_lyr.SetSpatialFilter(None)
-    if vrt_lyr.GetFeatureCount() != 1:
-        return 'fail'
+    assert vrt_lyr.GetFeatureCount() == 1
 
     vrt_ds = None
 
@@ -737,19 +656,15 @@ def test_ogr_vrt_16():
     vrt_ds = ogr.Open(vrt_xml)
     vrt_lyr = vrt_ds.GetLayerByName('test')
 
-    if vrt_lyr.TestCapability(ogr.OLCFastSpatialFilter) != 0:
-        return 'fail'
+    assert vrt_lyr.TestCapability(ogr.OLCFastSpatialFilter) == 0
 
-    if vrt_lyr.GetFeatureCount() != 1:
-        return 'fail'
+    assert vrt_lyr.GetFeatureCount() == 1
 
     feat = vrt_lyr.GetNextFeature()
-    if feat.GetFID() != 3:
-        return 'fail'
+    assert feat.GetFID() == 3
 
     geom = feat.GetGeometryRef()
-    if geom.ExportToWkt() != 'POINT (2 49)':
-        return 'fail'
+    assert geom.ExportToWkt() == 'POINT (2 49)'
 
     vrt_lyr.SetSpatialFilterRect(1, 41, 3, 49.5)
     if vrt_lyr.GetFeatureCount() != 1:
@@ -761,12 +676,10 @@ def test_ogr_vrt_16():
         return 'fail'
 
     vrt_lyr.SetSpatialFilterRect(1, 41, 3, 48.5)
-    if vrt_lyr.GetFeatureCount() != 0:
-        return 'fail'
+    assert vrt_lyr.GetFeatureCount() == 0
 
     vrt_lyr.SetSpatialFilter(None)
-    if vrt_lyr.GetFeatureCount() != 1:
-        return 'fail'
+    assert vrt_lyr.GetFeatureCount() == 1
 
     vrt_ds = None
 
@@ -799,47 +712,28 @@ def test_ogr_vrt_17():
     vrt_ds = ogr.Open(vrt_xml)
     vrt_lyr = vrt_ds.GetLayerByName('test')
 
-    if vrt_lyr.GetLayerDefn().GetFieldCount() != 4:
-        gdaltest.post_reason('unexpected field count.')
-        return 'fail'
+    assert vrt_lyr.GetLayerDefn().GetFieldCount() == 4, 'unexpected field count.'
 
     flddef = vrt_lyr.GetLayerDefn().GetFieldDefn(0)
-    if flddef.GetName() != 'pm_code' \
-       or flddef.GetType() != ogr.OFTInteger \
-       or flddef.GetWidth() != 4 \
-       or flddef.GetPrecision() != 0:
-        gdaltest.post_reason('pm_code field definition wrong.')
-        return 'fail'
+    assert flddef.GetName() == 'pm_code' and flddef.GetType() == ogr.OFTInteger and flddef.GetWidth() == 4 and flddef.GetPrecision() == 0, \
+        'pm_code field definition wrong.'
 
     flddef = vrt_lyr.GetLayerDefn().GetFieldDefn(1)
-    if flddef.GetName() != 'prime_meridian_name' \
-       or flddef.GetType() != ogr.OFTString \
-       or flddef.GetWidth() != 24 \
-       or flddef.GetPrecision() != 0:
-        gdaltest.post_reason('prime_meridian_name field definition wrong.')
-        return 'fail'
+    assert flddef.GetName() == 'prime_meridian_name' and flddef.GetType() == ogr.OFTString and flddef.GetWidth() == 24 and flddef.GetPrecision() == 0, \
+        'prime_meridian_name field definition wrong.'
 
     flddef = vrt_lyr.GetLayerDefn().GetFieldDefn(2)
-    if flddef.GetName() != 'new_col' \
-       or flddef.GetType() != ogr.OFTReal \
-       or flddef.GetWidth() != 12 \
-       or flddef.GetPrecision() != 3:
-        gdaltest.post_reason('new_col field definition wrong.')
-        return 'fail'
+    assert flddef.GetName() == 'new_col' and flddef.GetType() == ogr.OFTReal and flddef.GetWidth() == 12 and flddef.GetPrecision() == 3, \
+        'new_col field definition wrong.'
 
     flddef = vrt_lyr.GetLayerDefn().GetFieldDefn(3)
-    if flddef.GetName() != 'DEPRECATED' \
-       or flddef.GetType() != ogr.OFTInteger \
-       or flddef.GetSubType() != ogr.OFSTBoolean:
-        gdaltest.post_reason('DEPRECATED field definition wrong.')
-        return 'fail'
+    assert flddef.GetName() == 'DEPRECATED' and flddef.GetType() == ogr.OFTInteger and flddef.GetSubType() == ogr.OFSTBoolean, \
+        'DEPRECATED field definition wrong.'
 
     feat = vrt_lyr.GetNextFeature()
 
-    if feat.GetField(0) != 8901 or feat.GetField(1) != "Greenwich" \
-       or feat.GetField(2) is not None:
-        gdaltest.post_reason('did not get expected field value(s).')
-        return 'fail'
+    assert feat.GetField(0) == 8901 and feat.GetField(1) == "Greenwich" and feat.GetField(2) is None, \
+        'did not get expected field value(s).'
 
     return 'success'
 
@@ -870,9 +764,7 @@ def test_ogr_vrt_18():
 
     feat = vrt_lyr.GetNextFeature()
 
-    if feat.GetField(0) != 8904:
-        gdaltest.post_reason('Attribute filter not working properly')
-        return 'fail'
+    assert feat.GetField(0) == 8904, 'Attribute filter not working properly'
 
     return 'success'
 
@@ -890,9 +782,7 @@ def test_ogr_vrt_19_optimized():
 
     ret = gdaltest.runexternal(test_cli_utilities.get_test_ogrsf_path() + ' -ro data/poly_vrt.vrt')
 
-    if ret.find('INFO') == -1 or ret.find('ERROR') != -1:
-        print(ret)
-        return 'fail'
+    assert ret.find('INFO') != -1 and ret.find('ERROR') == -1
 
     return 'success'
 
@@ -910,9 +800,7 @@ def test_ogr_vrt_19_nonoptimized():
 
     ret = gdaltest.runexternal(test_cli_utilities.get_test_ogrsf_path() + ' -ro data/poly_nonoptimized_vrt.vrt')
 
-    if ret.find('INFO') == -1 or ret.find('ERROR') != -1:
-        print(ret)
-        return 'fail'
+    assert ret.find('INFO') != -1 and ret.find('ERROR') == -1
 
     return 'success'
 
@@ -968,27 +856,17 @@ def test_ogr_vrt_20():
     vrt_ds = ogr.Open(vrt_xml, update=1)
     vrt_lyr = vrt_ds.GetLayerByName('mytest')
 
-    if vrt_lyr.TestCapability(ogr.OLCFastFeatureCount) != 1:
-        gdaltest.post_reason('Fast feature count not set.')
-        return 'fail'
+    assert vrt_lyr.TestCapability(ogr.OLCFastFeatureCount) == 1, \
+        'Fast feature count not set.'
 
-    if vrt_lyr.TestCapability(ogr.OLCFastSpatialFilter) != 1:
-        gdaltest.post_reason('Fast filter not set.')
-        return 'fail'
+    assert vrt_lyr.TestCapability(ogr.OLCFastSpatialFilter) == 1, 'Fast filter not set.'
 
-    if vrt_lyr.TestCapability(ogr.OLCFastGetExtent) != 1:
-        gdaltest.post_reason('Fast extent not set.')
-        return 'fail'
+    assert vrt_lyr.TestCapability(ogr.OLCFastGetExtent) == 1, 'Fast extent not set.'
 
     extent = vrt_lyr.GetExtent()
-    if extent != (-10.0, 2.0, 45.0, 49.0):
-        gdaltest.post_reason('wrong extent')
-        print(extent)
-        return 'fail'
+    assert extent == (-10.0, 2.0, 45.0, 49.0), 'wrong extent'
 
-    if vrt_lyr.GetFeatureCount() != 4:
-        gdaltest.post_reason('Feature count not 4 as expected.')
-        return 'fail'
+    assert vrt_lyr.GetFeatureCount() == 4, 'Feature count not 4 as expected.'
 
     vrt_lyr.SetSpatialFilterRect(1, 48.5, 3, 49.5)
     if vrt_lyr.GetFeatureCount() != 1:
@@ -1001,31 +879,22 @@ def test_ogr_vrt_20():
         gdaltest.post_reason('did not get one feature on rect spatial filter.')
         return 'fail'
 
-    if vrt_lyr.TestCapability(ogr.OLCFastFeatureCount) != 1:
-        gdaltest.post_reason('Fast feature count not set.')
-        return 'fail'
+    assert vrt_lyr.TestCapability(ogr.OLCFastFeatureCount) == 1, \
+        'Fast feature count not set.'
 
-    if vrt_lyr.TestCapability(ogr.OLCFastGetExtent) != 1:
-        gdaltest.post_reason('Fast extent not set.')
-        return 'fail'
+    assert vrt_lyr.TestCapability(ogr.OLCFastGetExtent) == 1, 'Fast extent not set.'
 
     extent = vrt_lyr.GetExtent()
     # the shapefile driver currently doesn't change the extent even in the
     # presence of a spatial filter, so that could change in the future
-    if extent != (-10.0, 2.0, 45.0, 49.0):
-        gdaltest.post_reason('wrong extent')
-        print(extent)
-        return 'fail'
+    assert extent == (-10.0, 2.0, 45.0, 49.0), 'wrong extent'
 
     vrt_lyr.SetSpatialFilterRect(1, 48, 3, 48.5)
-    if vrt_lyr.GetFeatureCount() != 0:
-        gdaltest.post_reason('Did not get expected zero feature count.')
-        return 'fail'
+    assert vrt_lyr.GetFeatureCount() == 0, 'Did not get expected zero feature count.'
 
     vrt_lyr.SetSpatialFilter(None)
-    if vrt_lyr.GetFeatureCount() != 4:
-        gdaltest.post_reason('Feature count not 4 as expected with no filter.')
-        return 'fail'
+    assert vrt_lyr.GetFeatureCount() == 4, \
+        'Feature count not 4 as expected with no filter.'
 
     vrt_lyr.ResetReading()
     feat = vrt_lyr.GetNextFeature()
@@ -1056,20 +925,17 @@ def ogr_vrt_21_internal():
 
     ds = ogr.Open('data/vrt_test.vrt')
     lyr = ds.GetLayerByName('test3')
-    if lyr.GetName() != 'test3':
-        return 'fail'
+    assert lyr.GetName() == 'test3'
     ds = None
 
     ds = ogr.Open('data/vrt_test.vrt')
     lyr = ds.GetLayerByName('test3')
-    if lyr.GetGeomType() != ogr.wkbPoint:
-        return 'fail'
+    assert lyr.GetGeomType() == ogr.wkbPoint
     ds = None
 
     ds = ogr.Open('data/vrt_test.vrt')
     lyr = ds.GetLayerByName('test3')
-    if lyr.GetSpatialRef().ExportToWkt().find('84') == -1:
-        return 'fail'
+    assert lyr.GetSpatialRef().ExportToWkt().find('84') != -1
     ds = None
 
     ds = ogr.Open('data/vrt_test.vrt')
@@ -1079,38 +945,32 @@ def ogr_vrt_21_internal():
 
     ds = ogr.Open('data/vrt_test.vrt')
     lyr = ds.GetLayerByName('test3')
-    if lyr.GetNextFeature() is None:
-        return 'fail'
+    assert lyr.GetNextFeature() is not None
     ds = None
 
     ds = ogr.Open('data/vrt_test.vrt')
     lyr = ds.GetLayerByName('test3')
-    if lyr.GetFeature(1) is None:
-        return 'fail'
+    assert lyr.GetFeature(1) is not None
     ds = None
 
     ds = ogr.Open('data/vrt_test.vrt')
     lyr = ds.GetLayerByName('test3')
-    if lyr.GetFeatureCount() == 0:
-        return 'fail'
+    assert lyr.GetFeatureCount() != 0
     ds = None
 
     ds = ogr.Open('data/vrt_test.vrt')
     lyr = ds.GetLayerByName('test3')
-    if lyr.SetNextByIndex(1) != 0:
-        return 'fail'
+    assert lyr.SetNextByIndex(1) == 0
     ds = None
 
     ds = ogr.Open('data/vrt_test.vrt')
     lyr = ds.GetLayerByName('test3')
-    if lyr.GetLayerDefn().GetFieldCount() == 0:
-        return 'fail'
+    assert lyr.GetLayerDefn().GetFieldCount() != 0
     ds = None
 
     ds = ogr.Open('data/vrt_test.vrt')
     lyr = ds.GetLayerByName('test3')
-    if lyr.SetAttributeFilter('') != 0:
-        return 'fail'
+    assert lyr.SetAttributeFilter('') == 0
     ds = None
 
     ds = ogr.Open('data/vrt_test.vrt')
@@ -1120,20 +980,17 @@ def ogr_vrt_21_internal():
 
     ds = ogr.Open('data/vrt_test.vrt')
     lyr = ds.GetLayerByName('test3')
-    if lyr.TestCapability(ogr.OLCFastFeatureCount) != 1:
-        return 'fail'
+    assert lyr.TestCapability(ogr.OLCFastFeatureCount) == 1
     ds = None
 
     ds = ogr.Open('data/vrt_test.vrt')
     lyr = ds.GetLayerByName('test3')
-    if lyr.GetExtent() is None:
-        return 'fail'
+    assert lyr.GetExtent() is not None
     ds = None
 
     ds = ogr.Open('data/vrt_test.vrt')
     lyr = ds.GetLayerByName('test3')
-    if lyr.GetFIDColumn() != 'fid':
-        return 'fail'
+    assert lyr.GetFIDColumn() == 'fid'
     ds = None
 
     feature_defn = ogr.FeatureDefn()
@@ -1181,20 +1038,17 @@ def ogr_vrt_22_internal():
 
     ds = ogr.Open('data/vrt_test.vrt')
     lyr = ds.GetLayerByName('test5')
-    if lyr.GetName() != 'test5':
-        return 'fail'
+    assert lyr.GetName() == 'test5'
     ds = None
 
     ds = ogr.Open('data/vrt_test.vrt')
     lyr = ds.GetLayerByName('test5')
-    if lyr.GetGeomType() != ogr.wkbPoint:
-        return 'fail'
+    assert lyr.GetGeomType() == ogr.wkbPoint
     ds = None
 
     ds = ogr.Open('data/vrt_test.vrt')
     lyr = ds.GetLayerByName('test5')
-    if lyr.GetSpatialRef().ExportToWkt().find('84') == -1:
-        return 'fail'
+    assert lyr.GetSpatialRef().ExportToWkt().find('84') != -1
     ds = None
 
     ds = ogr.Open('data/vrt_test.vrt')
@@ -1204,38 +1058,32 @@ def ogr_vrt_22_internal():
 
     ds = ogr.Open('data/vrt_test.vrt')
     lyr = ds.GetLayerByName('test5')
-    if lyr.GetNextFeature() is not None:
-        return 'fail'
+    assert lyr.GetNextFeature() is None
     ds = None
 
     ds = ogr.Open('data/vrt_test.vrt')
     lyr = ds.GetLayerByName('test5')
-    if lyr.GetFeature(1) is not None:
-        return 'fail'
+    assert lyr.GetFeature(1) is None
     ds = None
 
     ds = ogr.Open('data/vrt_test.vrt')
     lyr = ds.GetLayerByName('test5')
-    if lyr.GetFeatureCount() != 0:
-        return 'fail'
+    assert lyr.GetFeatureCount() == 0
     ds = None
 
     ds = ogr.Open('data/vrt_test.vrt')
     lyr = ds.GetLayerByName('test5')
-    if lyr.SetNextByIndex(1) == 0:
-        return 'fail'
+    assert lyr.SetNextByIndex(1) != 0
     ds = None
 
     ds = ogr.Open('data/vrt_test.vrt')
     lyr = ds.GetLayerByName('test5')
-    if lyr.GetLayerDefn().GetFieldCount() != 0:
-        return 'fail'
+    assert lyr.GetLayerDefn().GetFieldCount() == 0
     ds = None
 
     ds = ogr.Open('data/vrt_test.vrt')
     lyr = ds.GetLayerByName('test5')
-    if lyr.SetAttributeFilter('') == 0:
-        return 'fail'
+    assert lyr.SetAttributeFilter('') != 0
     ds = None
 
     ds = ogr.Open('data/vrt_test.vrt')
@@ -1245,14 +1093,12 @@ def ogr_vrt_22_internal():
 
     ds = ogr.Open('data/vrt_test.vrt')
     lyr = ds.GetLayerByName('test5')
-    if lyr.TestCapability(ogr.OLCFastFeatureCount) != 0:
-        return 'fail'
+    assert lyr.TestCapability(ogr.OLCFastFeatureCount) == 0
     ds = None
 
     ds = ogr.Open('data/vrt_test.vrt')
     lyr = ds.GetLayerByName('test5')
-    if lyr.GetFIDColumn() != '':
-        return 'fail'
+    assert lyr.GetFIDColumn() == ''
     ds = None
 
     ds = ogr.Open('data/vrt_test.vrt')
@@ -1337,17 +1183,14 @@ def test_ogr_vrt_23(shared_ds_flag=''):
     gdal.FileFromMemBuffer('/vsimem/rec2.vrt', rec2)
 
     ds = ogr.Open('/vsimem/rec1.vrt')
-    if ds is None:
-        return 'fail'
+    assert ds is not None
 
     gdal.ErrorReset()
     gdal.PushErrorHandler('CPLQuietErrorHandler')
     ds.GetLayer(0).GetLayerDefn()
     ds.GetLayer(0).GetFeatureCount()
     gdal.PopErrorHandler()
-    if gdal.GetLastErrorMsg() == '':
-        gdaltest.post_reason('error expected !')
-        return 'fail'
+    assert gdal.GetLastErrorMsg() != '', 'error expected !'
 
     gdal.Unlink('/vsimem/rec1.vrt')
     gdal.Unlink('/vsimem/rec2.vrt')
@@ -1378,17 +1221,14 @@ def test_ogr_vrt_24():
     gdal.FileFromMemBuffer('/vsimem/rec2.vrt', rec2)
 
     ds = ogr.Open('/vsimem/rec1.vrt')
-    if ds is None:
-        return 'fail'
+    assert ds is not None
 
     gdal.ErrorReset()
     gdal.PushErrorHandler('CPLQuietErrorHandler')
     ds.GetLayer(0).GetLayerDefn()
     ds.GetLayer(0).GetFeatureCount()
     gdal.PopErrorHandler()
-    if gdal.GetLastErrorMsg() == '':
-        gdaltest.post_reason('error expected !')
-        return 'fail'
+    assert gdal.GetLastErrorMsg() != '', 'error expected !'
 
     gdal.Unlink('/vsimem/rec1.vrt')
     gdal.Unlink('/vsimem/rec2.vrt')
@@ -1407,28 +1247,20 @@ def test_ogr_vrt_25():
     # test3 layer just declares fid, and implicit fields (so all source
     # fields are taken as VRT fields), we can report the fid column
     lyr = ds.GetLayerByName('test3')
-    if lyr.GetFIDColumn() != 'fid':
-        print(lyr.GetFIDColumn())
-        return 'fail'
+    assert lyr.GetFIDColumn() == 'fid'
 
     # test6 layer declares fid, and explicit fields without the fid
     lyr = ds.GetLayerByName('test6')
-    if lyr.GetFIDColumn() != 'fid':
-        print(lyr.GetFIDColumn())
-        return 'fail'
+    assert lyr.GetFIDColumn() == 'fid'
 
     # test7 layer just declares fid with an external visible name
     lyr = ds.GetLayerByName('test7')
-    if lyr.GetFIDColumn() != 'bar':
-        print(lyr.GetFIDColumn())
-        return 'fail'
+    assert lyr.GetFIDColumn() == 'bar'
 
     # test2 layer does not declare fid, and source layer has no fid column
     # so nothing to report
     lyr = ds.GetLayerByName('test2')
-    if lyr.GetFIDColumn() != '':
-        print(lyr.GetFIDColumn())
-        return 'fail'
+    assert lyr.GetFIDColumn() == ''
 
     ds = None
 
@@ -1459,8 +1291,7 @@ def test_ogr_vrt_26():
 </OGRVRTDataSource>""", update=1)
 
     lyr = vrt_ds.GetLayer(0)
-    if lyr.TestCapability(ogr.OLCTransactions) == 0:
-        return 'fail'
+    assert lyr.TestCapability(ogr.OLCTransactions) != 0
 
     lyr.StartTransaction()
     feat = ogr.Feature(lyr.GetLayerDefn())
@@ -1468,13 +1299,11 @@ def test_ogr_vrt_26():
     lyr.CreateFeature(feat)
     feat = None
 
-    if lyr.GetFeatureCount() != 1:
-        return 'fail'
+    assert lyr.GetFeatureCount() == 1
 
     lyr.RollbackTransaction()
 
-    if lyr.GetFeatureCount() != 0:
-        return 'fail'
+    assert lyr.GetFeatureCount() == 0
 
     lyr.StartTransaction()
     feat = ogr.Feature(lyr.GetLayerDefn())
@@ -1483,8 +1312,7 @@ def test_ogr_vrt_26():
     feat = None
     lyr.CommitTransaction()
 
-    if lyr.GetFeatureCount() != 1:
-        return 'fail'
+    assert lyr.GetFeatureCount() == 1
 
     vrt_ds = None
 
@@ -1516,8 +1344,7 @@ def test_ogr_vrt_27():
   </OGRVRTLayer>
 </OGRVRTDataSource>""")
 
-    if ds is None:
-        return 'fail'
+    assert ds is not None
 
     lyr = ds.GetLayer(0)
 
@@ -1526,8 +1353,7 @@ def test_ogr_vrt_27():
     feat = lyr.GetNextFeature()
     i = 0
     while feat is not None:
-        if ogrtest.check_feature_geometry(feat, wkt_list[i]) != 0:
-            return 'fail'
+        assert ogrtest.check_feature_geometry(feat, wkt_list[i]) == 0
         feat = lyr.GetNextFeature()
         i = i + 1
 
@@ -1545,20 +1371,17 @@ def test_ogr_vrt_28():
 
     with gdaltest.error_handler():
         ds = ogr.Open("<OGRVRTDataSource></foo>")
-    if ds is not None:
-        return 'fail'
+    assert ds is None
 
     gdal.FileFromMemBuffer('/vsimem/ogr_vrt_28_invalid.vrt', "<bla><OGRVRTDataSource></OGRVRTDataSource></bla>")
     with gdaltest.error_handler():
         ds = ogr.Open("/vsimem/ogr_vrt_28_invalid.vrt")
-    if ds is not None:
-        return 'fail'
+    assert ds is None
     gdal.Unlink("/vsimem/ogr_vrt_28_invalid.vrt")
 
     with gdaltest.error_handler():
         ds = ogr.Open("data/invalid.vrt")
-    if ds is None:
-        return 'fail'
+    assert ds is not None
 
     for i in range(ds.GetLayerCount()):
         gdal.ErrorReset()
@@ -1566,32 +1389,25 @@ def test_ogr_vrt_28():
         lyr = ds.GetLayer(i)
         lyr.GetNextFeature()
         gdal.PopErrorHandler()
-        if gdal.GetLastErrorMsg() == '':
-            gdaltest.post_reason('expected failure for layer %d of datasource %s' % (i, ds.GetName()))
-            return 'fail'
+        assert gdal.GetLastErrorMsg() != '', \
+            ('expected failure for layer %d of datasource %s' % (i, ds.GetName()))
 
     ds = None
 
     gdal.PushErrorHandler('CPLQuietErrorHandler')
     ogr.Open("<OGRVRTDataSource><OGRVRTLayer/></OGRVRTDataSource>")
     gdal.PopErrorHandler()
-    if gdal.GetLastErrorMsg() == '':
-        gdaltest.post_reason('expected error message on datasource opening')
-        return 'fail'
+    assert gdal.GetLastErrorMsg() != '', 'expected error message on datasource opening'
 
     gdal.PushErrorHandler('CPLQuietErrorHandler')
     ds = ogr.Open("data/invalid2.vrt")
     gdal.PopErrorHandler()
-    if gdal.GetLastErrorMsg() == '':
-        gdaltest.post_reason('expected error message on datasource opening')
-        return 'fail'
+    assert gdal.GetLastErrorMsg() != '', 'expected error message on datasource opening'
 
     gdal.PushErrorHandler('CPLQuietErrorHandler')
     ds = ogr.Open("data/invalid3.vrt")
     gdal.PopErrorHandler()
-    if gdal.GetLastErrorMsg() == '':
-        gdaltest.post_reason('expected error message on datasource opening')
-        return 'fail'
+    assert gdal.GetLastErrorMsg() != '', 'expected error message on datasource opening'
 
     return 'success'
 
@@ -1633,8 +1449,7 @@ def test_ogr_vrt_29():
     </OGRVRTWarpedLayer>
 </OGRVRTDataSource>""")
     gdal.PopErrorHandler()
-    if gdal.GetLastErrorMsg() == '':
-        return 'fail'
+    assert gdal.GetLastErrorMsg() != ''
 
     # Non-spatial layer
     gdal.PushErrorHandler('CPLQuietErrorHandler')
@@ -1647,8 +1462,7 @@ def test_ogr_vrt_29():
     </OGRVRTWarpedLayer>
 </OGRVRTDataSource>""")
     gdal.PopErrorHandler()
-    if gdal.GetLastErrorMsg() == '':
-        return 'fail'
+    assert gdal.GetLastErrorMsg() != ''
 
     # Missing TargetSRS
     gdal.PushErrorHandler('CPLQuietErrorHandler')
@@ -1660,8 +1474,7 @@ def test_ogr_vrt_29():
     </OGRVRTWarpedLayer>
 </OGRVRTDataSource>""")
     gdal.PopErrorHandler()
-    if gdal.GetLastErrorMsg() == '':
-        return 'fail'
+    assert gdal.GetLastErrorMsg() != ''
 
     # Invalid TargetSRS
     gdal.PushErrorHandler('CPLQuietErrorHandler')
@@ -1674,8 +1487,7 @@ def test_ogr_vrt_29():
     </OGRVRTWarpedLayer>
 </OGRVRTDataSource>""")
     gdal.PopErrorHandler()
-    if gdal.GetLastErrorMsg() == '':
-        return 'fail'
+    assert gdal.GetLastErrorMsg() != ''
 
     # Invalid SrcSRS
     gdal.PushErrorHandler('CPLQuietErrorHandler')
@@ -1689,8 +1501,7 @@ def test_ogr_vrt_29():
     </OGRVRTWarpedLayer>
 </OGRVRTDataSource>""")
     gdal.PopErrorHandler()
-    if gdal.GetLastErrorMsg() == '':
-        return 'fail'
+    assert gdal.GetLastErrorMsg() != ''
 
     # TargetSRS == source SRS
     ds = ogr.Open("""<OGRVRTDataSource>
@@ -1719,8 +1530,7 @@ def test_ogr_vrt_29():
 </OGRVRTDataSource>""")
     lyr = ds.GetLayer(0)
     bb = lyr.GetExtent()
-    if bb != (426857, 485608, 5427475, 5516874):
-        return 'fail'
+    assert bb == (426857, 485608, 5427475, 5516874)
     ds = None
 
     f = open('tmp/ogr_vrt_29.vrt', 'wt')
@@ -1740,19 +1550,13 @@ def test_ogr_vrt_29():
 
     sr = lyr.GetSpatialRef()
     got_wkt = sr.ExportToWkt()
-    if got_wkt.find('32631') == -1:
-        gdaltest.post_reason('did not get expected WKT')
-        print(got_wkt)
-        return 'fail'
+    assert got_wkt.find('32631') != -1, 'did not get expected WKT'
 
     bb = lyr.GetExtent()
     expected_bb = (426857.98771727527, 485607.2165091355, 5427475.0501426803, 5516873.8591036052)
 
     for i in range(4):
-        if abs(bb[i] - expected_bb[i]) > 1:
-            gdaltest.post_reason('did not get expected extent')
-            print(bb)
-            return 'fail'
+        assert abs(bb[i] - expected_bb[i]) <= 1, 'did not get expected extent'
 
     feat = lyr.GetNextFeature()
     if ogrtest.check_feature_geometry(feat, 'POINT(426857.987717275274917 5427937.523466162383556)') != 0:
@@ -1762,12 +1566,10 @@ def test_ogr_vrt_29():
     feat = lyr.GetNextFeature()
 
     feat.SetGeometry(None)
-    if lyr.SetFeature(feat) != 0:
-        return 'fail'
+    assert lyr.SetFeature(feat) == 0
 
     feat.SetGeometry(ogr.CreateGeometryFromWkt('POINT(500000 0)'))
-    if lyr.SetFeature(feat) != 0:
-        return 'fail'
+    assert lyr.SetFeature(feat) == 0
     feat = None
 
     lyr.SetSpatialFilterRect(499999, -1, 500001, 1)
@@ -1782,14 +1584,12 @@ def test_ogr_vrt_29():
     feat = ogr.Feature(lyr.GetLayerDefn())
     feat.SetField('id', -99)
     feat.SetGeometry(ogr.CreateGeometryFromWkt('POINT(500000 0)'))
-    if lyr.CreateFeature(feat) != 0:
-        return 'fail'
+    assert lyr.CreateFeature(feat) == 0
     feat = None
 
     feat = ogr.Feature(lyr.GetLayerDefn())
     feat.SetField('id', -100)
-    if lyr.CreateFeature(feat) != 0:
-        return 'fail'
+    assert lyr.CreateFeature(feat) == 0
     feat = None
 
     ds = None
@@ -1801,16 +1601,14 @@ def test_ogr_vrt_29():
     gdal.PushErrorHandler('CPLQuietErrorHandler')
     ret = lyr.DeleteFeature(1)
     gdal.PopErrorHandler()
-    if ret == 0:
-        return 'fail'
+    assert ret != 0
 
     feat = lyr.GetNextFeature()
     feat.SetGeometry(ogr.CreateGeometryFromWkt('POINT(500000 0)'))
     gdal.PushErrorHandler('CPLQuietErrorHandler')
     ret = lyr.SetFeature(feat)
     gdal.PopErrorHandler()
-    if ret == 0:
-        return 'fail'
+    assert ret != 0
     feat = None
 
     feat = ogr.Feature(lyr.GetLayerDefn())
@@ -1818,8 +1616,7 @@ def test_ogr_vrt_29():
     gdal.PushErrorHandler('CPLQuietErrorHandler')
     ret = lyr.CreateFeature(feat)
     gdal.PopErrorHandler()
-    if ret == 0:
-        return 'fail'
+    assert ret != 0
     feat = None
 
     ds = None
@@ -1901,8 +1698,7 @@ def test_ogr_vrt_29():
     gdal.PushErrorHandler('CPLQuietErrorHandler')
     ret = lyr.SetFeature(feat)
     gdal.PopErrorHandler()
-    if ret == 0:
-        return 'fail'
+    assert ret != 0
     feat = None
 
     feat = ogr.Feature(lyr.GetLayerDefn())
@@ -1910,8 +1706,7 @@ def test_ogr_vrt_29():
     gdal.PushErrorHandler('CPLQuietErrorHandler')
     ret = lyr.CreateFeature(feat)
     gdal.PopErrorHandler()
-    if ret == 0:
-        return 'fail'
+    assert ret != 0
     feat = None
 
     ds = None
@@ -1927,9 +1722,7 @@ def test_ogr_vrt_29():
 
         ret = gdaltest.runexternal(test_cli_utilities.get_test_ogrsf_path() + ' -ro tmp/ogr_vrt_29.vrt')
 
-        if ret.find('INFO') == -1 or ret.find('ERROR') != -1:
-            print(ret)
-            return 'fail'
+        assert ret.find('INFO') != -1 and ret.find('ERROR') == -1
 
     gdal.Unlink('tmp/ogr_vrt_29.shp')
     gdal.Unlink('tmp/ogr_vrt_29.shx')
@@ -2020,122 +1813,80 @@ def test_ogr_vrt_30():
         if check == 0:
             sr = lyr.GetSpatialRef()
             got_wkt = sr.ExportToWkt()
-            if got_wkt.find('GEOGCS["WGS 84"') == -1:
-                gdaltest.post_reason('did not get expected WKT')
-                print(got_wkt)
-                return 'fail'
+            assert got_wkt.find('GEOGCS["WGS 84"') != -1, 'did not get expected WKT'
         elif check == 1:
             bb = lyr.GetExtent()
             expected_bb = (2.0, 4.7999999999999998, 49.0, 49.799999999999997)
 
             for i in range(4):
-                if abs(bb[i] - expected_bb[i]) > 1:
-                    gdaltest.post_reason('did not get expected extent')
-                    print(bb)
-                    return 'fail'
+                assert abs(bb[i] - expected_bb[i]) <= 1, 'did not get expected extent'
         elif check == 2:
             feat_count = lyr.GetFeatureCount()
-            if feat_count != 2 * 5 * 5:
-                gdaltest.post_reason('did not get expected feature count')
-                print(feat_count)
-                return 'fail'
+            assert feat_count == 2 * 5 * 5, 'did not get expected feature count'
         elif check == 3:
-            if lyr.GetLayerDefn().GetFieldCount() != 3:
-                gdaltest.post_reason('did not get expected field count')
-                return 'fail'
-            if lyr.GetLayerDefn().GetFieldDefn(1).GetType() != ogr.OFTInteger64:
-                gdaltest.post_reason('did not get expected field type')
-                return 'fail'
+            assert lyr.GetLayerDefn().GetFieldCount() == 3, 'did not get expected field count'
+            assert lyr.GetLayerDefn().GetFieldDefn(1).GetType() == ogr.OFTInteger64, \
+                'did not get expected field type'
         elif check == 4:
             feat = lyr.GetNextFeature()
             i = 0
             while feat is not None:
                 if i < 5 * 5:
-                    if feat.GetFID() != i:
-                        gdaltest.post_reason('did not get expected value')
-                        print(feat.GetFID())
-                        return 'fail'
-                    if feat.GetFieldAsInteger("id1") != i:
-                        gdaltest.post_reason('did not get expected value')
-                        return 'fail'
-                    if feat.GetFieldAsInteger("id2") != 100 + i:
-                        gdaltest.post_reason('did not get expected value')
-                        return 'fail'
-                    if feat.IsFieldSet("id3"):
-                        gdaltest.post_reason('did not get expected value')
-                        return 'fail'
+                    assert feat.GetFID() == i, 'did not get expected value'
+                    assert feat.GetFieldAsInteger("id1") == i, \
+                        'did not get expected value'
+                    assert feat.GetFieldAsInteger("id2") == 100 + i, \
+                        'did not get expected value'
+                    assert not feat.IsFieldSet("id3"), 'did not get expected value'
                     if ogrtest.check_feature_geometry(feat, 'POINT(%f %f)' % (2 + int(i / 5) / 5.0, 49 + int(i % 5) / 5.0)) != 0:
                         gdaltest.post_reason('did not get expected value')
                         feat.DumpReadable()
                         return 'fail'
                 else:
-                    if feat.GetFID() != i:
-                        gdaltest.post_reason('did not get expected value')
-                        print(feat.GetFID())
-                        return 'fail'
-                    if feat.IsFieldSet("id1"):
-                        gdaltest.post_reason('did not get expected value')
-                        return 'fail'
-                    if feat.GetFieldAsInteger("id2") != 200 + i - 5 * 5:
-                        gdaltest.post_reason('did not get expected value')
-                        return 'fail'
-                    if feat.GetFieldAsInteger("id3") != 300 + i - 5 * 5:
-                        gdaltest.post_reason('did not get expected value')
-                        return 'fail'
-                    if ogrtest.check_feature_geometry(feat, 'POINT(%f %f)' % (4 + int((i - 5 * 5) / 5) / 5.0, 49 + int((i - 5 * 5) % 5) / 5.0)) != 0:
-                        gdaltest.post_reason('did not get expected value')
-                        return 'fail'
+                    assert feat.GetFID() == i, 'did not get expected value'
+                    assert not feat.IsFieldSet("id1"), 'did not get expected value'
+                    assert feat.GetFieldAsInteger("id2") == 200 + i - 5 * 5, \
+                        'did not get expected value'
+                    assert feat.GetFieldAsInteger("id3") == 300 + i - 5 * 5, \
+                        'did not get expected value'
+                    assert ogrtest.check_feature_geometry(feat, 'POINT(%f %f)' % (4 + int((i - 5 * 5) / 5) / 5.0, 49 + int((i - 5 * 5) % 5) / 5.0)) == 0, \
+                        'did not get expected value'
 
                 i = i + 1
                 feat = lyr.GetNextFeature()
 
         elif check == 5:
-            if lyr.GetGeomType() != ogr.wkbPoint:
-                gdaltest.post_reason('did not get expected geom type')
-                return 'fail'
+            assert lyr.GetGeomType() == ogr.wkbPoint, 'did not get expected geom type'
 
         elif check == 6:
-            if lyr.TestCapability(ogr.OLCFastFeatureCount) != 1:
-                gdaltest.post_reason('did not get expected capability')
-                return 'fail'
+            assert lyr.TestCapability(ogr.OLCFastFeatureCount) == 1, \
+                'did not get expected capability'
 
-            if lyr.TestCapability(ogr.OLCFastGetExtent) != 1:
-                gdaltest.post_reason('did not get expected capability')
-                return 'fail'
+            assert lyr.TestCapability(ogr.OLCFastGetExtent) == 1, \
+                'did not get expected capability'
 
-            if lyr.TestCapability(ogr.OLCFastSpatialFilter) != 1:
-                gdaltest.post_reason('did not get expected capability')
-                return 'fail'
+            assert lyr.TestCapability(ogr.OLCFastSpatialFilter) == 1, \
+                'did not get expected capability'
 
-            if lyr.TestCapability(ogr.OLCStringsAsUTF8) != 1:
-                gdaltest.post_reason('did not get expected capability')
-                return 'fail'
+            assert lyr.TestCapability(ogr.OLCStringsAsUTF8) == 1, \
+                'did not get expected capability'
 
-            if lyr.TestCapability(ogr.OLCIgnoreFields) != 1:
-                gdaltest.post_reason('did not get expected capability')
-                return 'fail'
+            assert lyr.TestCapability(ogr.OLCIgnoreFields) == 1, \
+                'did not get expected capability'
 
-            if lyr.TestCapability(ogr.OLCRandomWrite) != 0:
-                gdaltest.post_reason('did not get expected capability')
-                return 'fail'
+            assert lyr.TestCapability(ogr.OLCRandomWrite) == 0, \
+                'did not get expected capability'
 
-            if lyr.TestCapability(ogr.OLCSequentialWrite) != 0:
-                gdaltest.post_reason('did not get expected capability')
-                return 'fail'
+            assert lyr.TestCapability(ogr.OLCSequentialWrite) == 0, \
+                'did not get expected capability'
 
         elif check == 7:
             lyr.SetSpatialFilterRect(2.49, 49.29, 4.49, 49.69)
-            if lyr.GetFeatureCount() != 10:
-                print(lyr.GetFeatureCount())
-                gdaltest.post_reason('did not get expected feature count')
-                return 'fail'
+            assert lyr.GetFeatureCount() == 10, 'did not get expected feature count'
 
         elif check == 8:
             lyr.SetAttributeFilter('id1 = 0')
-            if lyr.GetFeatureCount() != 1:
-                print(lyr.GetFeatureCount())
-                gdaltest.post_reason('did not get expected feature count')
-                return 'fail'
+            assert lyr.GetFeatureCount() == 1, 'did not get expected feature count'
 
         elif check == 9:
             # CreateFeature() should fail
@@ -2144,9 +1895,7 @@ def test_ogr_vrt_30():
             gdal.PushErrorHandler('CPLQuietErrorHandler')
             ret = lyr.CreateFeature(feat)
             gdal.PopErrorHandler()
-            if ret == 0:
-                gdaltest.post_reason('should have failed')
-                return 'fail'
+            assert ret != 0, 'should have failed'
             feat = None
 
             # SetFeature() should fail
@@ -2156,9 +1905,7 @@ def test_ogr_vrt_30():
             gdal.PushErrorHandler('CPLQuietErrorHandler')
             ret = lyr.SetFeature(feat)
             gdal.PopErrorHandler()
-            if ret == 0:
-                gdaltest.post_reason('should have failed')
-                return 'fail'
+            assert ret != 0, 'should have failed'
             feat = None
 
             # Test feature existence : should fail
@@ -2166,9 +1913,7 @@ def test_ogr_vrt_30():
             lyr.ResetReading()
 
             feat = lyr.GetNextFeature()
-            if feat is not None:
-                gdaltest.post_reason('should have failed')
-                return 'fail'
+            assert feat is None, 'should have failed'
 
         ds = None
 
@@ -2177,15 +1922,11 @@ def test_ogr_vrt_30():
 
         ret = gdaltest.runexternal(test_cli_utilities.get_test_ogrsf_path() + ' -ro tmp/ogr_vrt_30.vrt --config OGR_VRT_MAX_OPENED 1')
 
-        if ret.find('INFO') == -1 or ret.find('ERROR') != -1:
-            print(ret)
-            return 'fail'
+        assert ret.find('INFO') != -1 and ret.find('ERROR') == -1
 
         ret = gdaltest.runexternal(test_cli_utilities.get_test_ogrsf_path() + ' tmp/ogr_vrt_30.vrt')
 
-        if ret.find('INFO') == -1 or ret.find('ERROR') != -1:
-            print(ret)
-            return 'fail'
+        assert ret.find('INFO') != -1 and ret.find('ERROR') == -1
 
     # Test various optional attributes
     f = open('tmp/ogr_vrt_30.vrt', 'wt')
@@ -2218,101 +1959,70 @@ def test_ogr_vrt_30():
         if check == 0:
             sr = lyr.GetSpatialRef()
             got_wkt = sr.ExportToWkt()
-            if got_wkt.find('WGS 72') == -1:
-                gdaltest.post_reason('did not get expected WKT')
-                print(got_wkt)
-                return 'fail'
+            assert got_wkt.find('WGS 72') != -1, 'did not get expected WKT'
 
         elif check == 1:
             bb = lyr.GetExtent()
             expected_bb = (-180.0, 180.0, -90.0, 90.0)
 
             for i in range(4):
-                if abs(bb[i] - expected_bb[i]) > 1:
-                    gdaltest.post_reason('did not get expected extent')
-                    print(bb)
-                    return 'fail'
+                assert abs(bb[i] - expected_bb[i]) <= 1, 'did not get expected extent'
 
         elif check == 2:
-            if lyr.GetFeatureCount() != 100:
-                gdaltest.post_reason('did not get expected feature count')
-                return 'fail'
+            assert lyr.GetFeatureCount() == 100, 'did not get expected feature count'
 
         elif check == 3:
-            if lyr.GetLayerDefn().GetFieldCount() != 2:
-                gdaltest.post_reason('did not get expected field count')
-                return 'fail'
+            assert lyr.GetLayerDefn().GetFieldCount() == 2, 'did not get expected field count'
 
         elif check == 4:
             feat = lyr.GetNextFeature()
             i = 0
             while feat is not None:
                 if i < 5 * 5:
-                    if feat.GetFID() != i:
-                        gdaltest.post_reason('did not get expected value')
-                        print(feat.GetFID())
-                        return 'fail'
-                    if feat.GetFieldAsString("source_layer") != 'ogr_vrt_30_1':
-                        gdaltest.post_reason('did not get expected value')
-                        return 'fail'
-                    if feat.GetFieldAsInteger("id2") != 100 + i:
-                        gdaltest.post_reason('did not get expected value')
-                        return 'fail'
+                    assert feat.GetFID() == i, 'did not get expected value'
+                    assert feat.GetFieldAsString("source_layer") == 'ogr_vrt_30_1', \
+                        'did not get expected value'
+                    assert feat.GetFieldAsInteger("id2") == 100 + i, \
+                        'did not get expected value'
 
                 else:
-                    if feat.GetFID() != i - 5 * 5:
-                        gdaltest.post_reason('did not get expected value')
-                        print(feat.GetFID())
-                        return 'fail'
-                    if feat.GetFieldAsString("source_layer") != 'ogr_vrt_30_2':
-                        gdaltest.post_reason('did not get expected value')
-                        return 'fail'
-                    if feat.GetFieldAsInteger("id2") != 200 + i - 5 * 5:
-                        gdaltest.post_reason('did not get expected value')
-                        return 'fail'
+                    assert feat.GetFID() == i - 5 * 5, 'did not get expected value'
+                    assert feat.GetFieldAsString("source_layer") == 'ogr_vrt_30_2', \
+                        'did not get expected value'
+                    assert feat.GetFieldAsInteger("id2") == 200 + i - 5 * 5, \
+                        'did not get expected value'
 
                 i = i + 1
                 feat = lyr.GetNextFeature()
 
         elif check == 5:
-            if lyr.GetGeomType() != ogr.wkbPoint25D:
-                gdaltest.post_reason('did not get expected geom type')
-                return 'fail'
+            assert lyr.GetGeomType() == ogr.wkbPoint25D, 'did not get expected geom type'
 
         elif check == 6:
-            if lyr.TestCapability(ogr.OLCFastFeatureCount) != 1:
-                gdaltest.post_reason('did not get expected capability')
-                return 'fail'
+            assert lyr.TestCapability(ogr.OLCFastFeatureCount) == 1, \
+                'did not get expected capability'
 
-            if lyr.TestCapability(ogr.OLCFastGetExtent) != 1:
-                gdaltest.post_reason('did not get expected capability')
-                return 'fail'
+            assert lyr.TestCapability(ogr.OLCFastGetExtent) == 1, \
+                'did not get expected capability'
 
-            if lyr.TestCapability(ogr.OLCFastSpatialFilter) != 1:
-                gdaltest.post_reason('did not get expected capability')
-                return 'fail'
+            assert lyr.TestCapability(ogr.OLCFastSpatialFilter) == 1, \
+                'did not get expected capability'
 
-            if lyr.TestCapability(ogr.OLCStringsAsUTF8) != 1:
-                gdaltest.post_reason('did not get expected capability')
-                return 'fail'
+            assert lyr.TestCapability(ogr.OLCStringsAsUTF8) == 1, \
+                'did not get expected capability'
 
-            if lyr.TestCapability(ogr.OLCIgnoreFields) != 1:
-                gdaltest.post_reason('did not get expected capability')
-                return 'fail'
+            assert lyr.TestCapability(ogr.OLCIgnoreFields) == 1, \
+                'did not get expected capability'
 
-            if lyr.TestCapability(ogr.OLCRandomWrite) != 1:
-                gdaltest.post_reason('did not get expected capability')
-                return 'fail'
+            assert lyr.TestCapability(ogr.OLCRandomWrite) == 1, \
+                'did not get expected capability'
 
-            if lyr.TestCapability(ogr.OLCSequentialWrite) != 1:
-                gdaltest.post_reason('did not get expected capability')
-                return 'fail'
+            assert lyr.TestCapability(ogr.OLCSequentialWrite) == 1, \
+                'did not get expected capability'
 
         elif check == 7:
             lyr.SetSpatialFilterRect(2.49, 49.29, 4.49, 49.69)
-            if lyr.GetFeatureCount() != 10:
-                gdaltest.post_reason('did not get expected feature count')
-                return 'fail'
+            assert lyr.GetFeatureCount() == 10, 'did not get expected feature count'
 
         elif check == 8:
             # invalid source_layer name with CreateFeature()
@@ -2322,9 +2032,7 @@ def test_ogr_vrt_30():
             gdal.PushErrorHandler('CPLQuietErrorHandler')
             ret = lyr.CreateFeature(feat)
             gdal.PopErrorHandler()
-            if ret == 0:
-                gdaltest.post_reason('should have failed')
-                return 'fail'
+            assert ret != 0, 'should have failed'
             feat = None
 
             # unset source_layer name with CreateFeature()
@@ -2333,9 +2041,7 @@ def test_ogr_vrt_30():
             gdal.PushErrorHandler('CPLQuietErrorHandler')
             ret = lyr.CreateFeature(feat)
             gdal.PopErrorHandler()
-            if ret == 0:
-                gdaltest.post_reason('should have failed')
-                return 'fail'
+            assert ret != 0, 'should have failed'
             feat = None
 
             # FID set with CreateFeature()
@@ -2346,42 +2052,32 @@ def test_ogr_vrt_30():
             gdal.PushErrorHandler('CPLQuietErrorHandler')
             ret = lyr.CreateFeature(feat)
             gdal.PopErrorHandler()
-            if ret == 0:
-                gdaltest.post_reason('should have failed')
-                return 'fail'
+            assert ret != 0, 'should have failed'
             feat = None
 
             # CreateFeature() OK
             feat = ogr.Feature(lyr.GetLayerDefn())
             feat.SetField('source_layer', 'ogr_vrt_30_2')
             feat.SetField('id2', 12345)
-            if lyr.CreateFeature(feat) != 0:
-                gdaltest.post_reason('should have succeeded')
-                return 'fail'
+            assert lyr.CreateFeature(feat) == 0, 'should have succeeded'
 
             # SetFeature() OK
             feat.SetField('id2', 45321)
-            if lyr.SetFeature(feat) != 0:
-                gdaltest.post_reason('should have succeeded')
-                return 'fail'
+            assert lyr.SetFeature(feat) == 0, 'should have succeeded'
 
             # invalid source_layer name with SetFeature()
             feat.SetField('source_layer', 'random_name')
             gdal.PushErrorHandler('CPLQuietErrorHandler')
             ret = lyr.SetFeature(feat)
             gdal.PopErrorHandler()
-            if ret == 0:
-                gdaltest.post_reason('should have failed')
-                return 'fail'
+            assert ret != 0, 'should have failed'
 
             # unset source_layer name with SetFeature()
             feat.UnsetField('source_layer')
             gdal.PushErrorHandler('CPLQuietErrorHandler')
             ret = lyr.SetFeature(feat)
             gdal.PopErrorHandler()
-            if ret == 0:
-                gdaltest.post_reason('should have failed')
-                return 'fail'
+            assert ret != 0, 'should have failed'
 
             # FID unset with SetFeature()
             feat = ogr.Feature(lyr.GetLayerDefn())
@@ -2390,43 +2086,33 @@ def test_ogr_vrt_30():
             gdal.PushErrorHandler('CPLQuietErrorHandler')
             ret = lyr.SetFeature(feat)
             gdal.PopErrorHandler()
-            if ret == 0:
-                gdaltest.post_reason('should have failed')
-                return 'fail'
+            assert ret != 0, 'should have failed'
             feat = None
 
             # Test feature existence (with passthru)
             lyr.SetAttributeFilter('id2 = 45321 AND OGR_GEOMETRY IS NULL')
 
-            if lyr.TestCapability(ogr.OLCFastFeatureCount) != 1:
-                gdaltest.post_reason('should have returned 1')
-                return 'fail'
+            assert lyr.TestCapability(ogr.OLCFastFeatureCount) == 1, \
+                'should have returned 1'
 
             lyr.ResetReading()
 
             feat = lyr.GetNextFeature()
-            if feat is None:
-                gdaltest.post_reason('should have succeeded')
-                return 'fail'
+            assert feat is not None, 'should have succeeded'
 
             # Test feature existence (without passthru)
             lyr.SetAttributeFilter("id2 = 45321 AND OGR_GEOMETRY IS NULL AND source_layer = 'ogr_vrt_30_2'")
 
-            if lyr.TestCapability(ogr.OLCFastFeatureCount) != 0:
-                gdaltest.post_reason('should have returned 0')
-                return 'fail'
+            assert lyr.TestCapability(ogr.OLCFastFeatureCount) == 0, \
+                'should have returned 0'
 
             lyr.ResetReading()
 
             feat = lyr.GetNextFeature()
-            if feat is None:
-                gdaltest.post_reason('should have succeeded')
-                return 'fail'
+            assert feat is not None, 'should have succeeded'
 
             # Test SyncToDisk()
-            if lyr.SyncToDisk() != 0:
-                gdaltest.post_reason('should have succeeded')
-                return 'fail'
+            assert lyr.SyncToDisk() == 0, 'should have succeeded'
 
         ds = None
 
@@ -2477,17 +2163,14 @@ def test_ogr_vrt_31(shared_ds_flag=''):
     gdal.FileFromMemBuffer('/vsimem/rec2.vrt', rec2)
 
     ds = ogr.Open('/vsimem/rec1.vrt')
-    if ds is None:
-        return 'fail'
+    assert ds is not None
 
     gdal.ErrorReset()
     gdal.PushErrorHandler('CPLQuietErrorHandler')
     ds.GetLayer(0).GetLayerDefn()
     ds.GetLayer(0).GetFeatureCount()
     gdal.PopErrorHandler()
-    if gdal.GetLastErrorMsg() == '':
-        gdaltest.post_reason('error expected !')
-        return 'fail'
+    assert gdal.GetLastErrorMsg() != '', 'error expected !'
 
     gdal.Unlink('/vsimem/rec1.vrt')
     gdal.Unlink('/vsimem/rec2.vrt')
@@ -2571,20 +2254,15 @@ def test_ogr_vrt_33():
         lyr = ds.GetLayer(0)
         for j in range(5):
             if j == 0:
-                if lyr.GetGeomType() != ogr.wkbPoint:
-                    return 'fail'
+                assert lyr.GetGeomType() == ogr.wkbPoint
             elif j == 1:
-                if lyr.GetSpatialRef().ExportToWkt().find('GEOGCS') != 0:
-                    return 'fail'
+                assert lyr.GetSpatialRef().ExportToWkt().find('GEOGCS') == 0
             elif j == 2:
-                if lyr.GetLayerDefn().GetGeomFieldDefn(1).GetType() != ogr.wkbPolygon:
-                    return 'fail'
+                assert lyr.GetLayerDefn().GetGeomFieldDefn(1).GetType() == ogr.wkbPolygon
             elif j == 3:
-                if lyr.GetExtent(geom_field=1) != (0, 1, 0, 1):
-                    return 'fail'
+                assert lyr.GetExtent(geom_field=1) == (0, 1, 0, 1)
             elif j == 4:
-                if lyr.GetLayerDefn().GetGeomFieldDefn(1).GetSpatialRef().ExportToWkt().find('PROJCS') != 0:
-                    return 'fail'
+                assert lyr.GetLayerDefn().GetGeomFieldDefn(1).GetSpatialRef().ExportToWkt().find('PROJCS') == 0
                 feat = lyr.GetNextFeature()
                 if feat.GetGeomFieldRef(0).ExportToWkt() != 'POINT (1 2)':
                     feat.DumpReadable()
@@ -2600,9 +2278,7 @@ def test_ogr_vrt_33():
             ret = gdaltest.runexternal(test_cli_utilities.get_test_ogrsf_path() + ' -ro tmp/ogr_vrt_33.vrt')
             os.unlink('tmp/ogr_vrt_33.vrt')
 
-            if ret.find('INFO') == -1 or ret.find('ERROR') != -1:
-                print(ret)
-                return 'fail'
+            assert ret.find('INFO') != -1 and ret.find('ERROR') == -1
 
     if ogrtest.have_geos():
         # Select only second field and change various attributes
@@ -2624,26 +2300,18 @@ def test_ogr_vrt_33():
             ds = ogr.Open(ds_str)
             lyr = ds.GetLayer(0)
             if i == 0:
-                if lyr.GetGeomType() != ogr.wkbPolygon25D:
-                    return 'fail'
+                assert lyr.GetGeomType() == ogr.wkbPolygon25D
             elif i == 1:
-                if lyr.GetSpatialRef().ExportToWkt().find('+proj=merc +a=6378137 +b=6378137 +lat_ts=0.0 +lon_0=0.0 +x_0=0.0 +y_0=0 +k=1.0 +units=m +nadgrids=@null +wktext +no_defs') < 0:
-                    return 'fail'
+                assert lyr.GetSpatialRef().ExportToWkt().find('+proj=merc +a=6378137 +b=6378137 +lat_ts=0.0 +lon_0=0.0 +x_0=0.0 +y_0=0 +k=1.0 +units=m +nadgrids=@null +wktext +no_defs') >= 0
             elif i == 2:
-                if lyr.GetGeometryColumn() != 'foo':
-                    return 'fail'
+                assert lyr.GetGeometryColumn() == 'foo'
             elif i == 3:
-                if lyr.TestCapability(ogr.OLCFastGetExtent) != 1:
-                    return 'fail'
-                if lyr.GetExtent(geom_field=0) != (1, 3, 2, 4):
-                    print(lyr.GetExtent(geom_field=0))
-                    return 'fail'
+                assert lyr.TestCapability(ogr.OLCFastGetExtent) == 1
+                assert lyr.GetExtent(geom_field=0) == (1, 3, 2, 4)
             elif i == 4:
-                if lyr.TestCapability(ogr.OLCFastFeatureCount) != 0:
-                    return 'fail'
+                assert lyr.TestCapability(ogr.OLCFastFeatureCount) == 0
             elif i == 5:
-                if lyr.GetLayerDefn().GetGeomFieldCount() != 1:
-                    return 'fail'
+                assert lyr.GetLayerDefn().GetGeomFieldCount() == 1
                 feat = lyr.GetNextFeature()
                 if feat.GetGeomFieldRef(0).ExportToWkt() != 'POLYGON ((0.5 1.0,1 1,1.0 0.5,0.5 0.5,0.5 1.0))':
                     feat.DumpReadable()
@@ -2656,9 +2324,7 @@ def test_ogr_vrt_33():
             ret = gdaltest.runexternal(test_cli_utilities.get_test_ogrsf_path() + ' -ro tmp/ogr_vrt_33.vrt')
             os.unlink('tmp/ogr_vrt_33.vrt')
 
-            if ret.find('INFO') == -1 or ret.find('ERROR') != -1:
-                print(ret)
-                return 'fail'
+            assert ret.find('INFO') != -1 and ret.find('ERROR') == -1
 
     # No geometry fields
     ds_str = """<OGRVRTDataSource>
@@ -2671,18 +2337,15 @@ def test_ogr_vrt_33():
         ds = ogr.Open(ds_str)
         lyr = ds.GetLayer(0)
         if i == 0:
-            if lyr.GetGeomType() != ogr.wkbNone:
-                return 'fail'
+            assert lyr.GetGeomType() == ogr.wkbNone
         elif i == 1:
-            if lyr.GetSpatialRef() is not None:
-                return 'fail'
+            assert lyr.GetSpatialRef() is None
         elif i == 2:
             lyr.TestCapability(ogr.OLCFastFeatureCount)
             lyr.TestCapability(ogr.OLCFastGetExtent)
             lyr.TestCapability(ogr.OLCFastSpatialFilter)
         elif i == 3:
-            if lyr.GetLayerDefn().GetGeomFieldCount() != 0:
-                return 'fail'
+            assert lyr.GetLayerDefn().GetGeomFieldCount() == 0
             feat = lyr.GetNextFeature()
             if feat.GetGeomFieldRef(0) is not None:
                 feat.DumpReadable()
@@ -2695,9 +2358,7 @@ def test_ogr_vrt_33():
         ret = gdaltest.runexternal(test_cli_utilities.get_test_ogrsf_path() + ' -ro tmp/ogr_vrt_33.vrt')
         os.unlink('tmp/ogr_vrt_33.vrt')
 
-        if ret.find('INFO') == -1 or ret.find('ERROR') != -1:
-            print(ret)
-            return 'fail'
+        assert ret.find('INFO') != -1 and ret.find('ERROR') == -1
 
     ds_str = """<OGRVRTDataSource>
     <OGRVRTLayer name="test">
@@ -2711,10 +2372,8 @@ def test_ogr_vrt_33():
 """
     ds = ogr.Open(ds_str)
     lyr = ds.GetLayer(0)
-    if lyr.GetLayerDefn().GetGeomFieldDefn(1).GetType() != ogr.wkbPoint:
-        return 'fail'
-    if lyr.GetLayerDefn().GetGeomFieldDefn(1).GetSpatialRef().ExportToWkt().find('4326') < 0:
-        return 'fail'
+    assert lyr.GetLayerDefn().GetGeomFieldDefn(1).GetType() == ogr.wkbPoint
+    assert lyr.GetLayerDefn().GetGeomFieldDefn(1).GetSpatialRef().ExportToWkt().find('4326') >= 0
     feat = lyr.GetNextFeature()
     if feat.GetGeomFieldRef(0).ExportToWkt() != 'POINT (1 2)':
         feat.DumpReadable()
@@ -2723,14 +2382,11 @@ def test_ogr_vrt_33():
         feat.DumpReadable()
         return 'fail'
     lyr.SetSpatialFilterRect(1, 0, 0, 0, 0)
-    if lyr.GetFeatureCount() != 0:
-        return 'fail'
+    assert lyr.GetFeatureCount() == 0
     lyr.SetSpatialFilterRect(1, -1.1, -2.1, -0.9, -1.9)
-    if lyr.GetFeatureCount() != 1:
-        return 'fail'
+    assert lyr.GetFeatureCount() == 1
     lyr.SetSpatialFilter(1, None)
-    if lyr.GetFeatureCount() != 1:
-        return 'fail'
+    assert lyr.GetFeatureCount() == 1
     lyr.SetIgnoredFields(['geom__WKT_EPSG_4326_POINT'])
     lyr.ResetReading()
     feat = lyr.GetNextFeature()
@@ -2753,9 +2409,7 @@ def test_ogr_vrt_33():
         ret = gdaltest.runexternal(test_cli_utilities.get_test_ogrsf_path() + ' -ro tmp/ogr_vrt_33.vrt')
         os.unlink('tmp/ogr_vrt_33.vrt')
 
-        if ret.find('INFO') == -1 or ret.find('ERROR') != -1:
-            print(ret)
-            return 'fail'
+        assert ret.find('INFO') != -1 and ret.find('ERROR') == -1
 
     # Warped layer without explicit WarpedGeomFieldName
     ds_str = """<OGRVRTDataSource>
@@ -2768,8 +2422,7 @@ def test_ogr_vrt_33():
 </OGRVRTDataSource>"""
     ds = ogr.Open(ds_str)
     lyr = ds.GetLayer(0)
-    if lyr.GetSpatialRef().ExportToWkt().find('32631') < 0:
-        return 'fail'
+    assert lyr.GetSpatialRef().ExportToWkt().find('32631') >= 0
     feat = lyr.GetNextFeature()
     if feat.GetGeomFieldRef(0).ExportToWkt().find('POINT') < 0 or \
        feat.GetGeomFieldRef(0).ExportToWkt() == 'POINT (1 2)' or \
@@ -2789,8 +2442,7 @@ def test_ogr_vrt_33():
 </OGRVRTDataSource>"""
     ds = ogr.Open(ds_str)
     lyr = ds.GetLayer(0)
-    if lyr.GetSpatialRef().ExportToWkt().find('32631') < 0:
-        return 'fail'
+    assert lyr.GetSpatialRef().ExportToWkt().find('32631') >= 0
     feat = lyr.GetNextFeature()
     if feat.GetGeomFieldRef(0).ExportToWkt().find('POINT') < 0 or \
        feat.GetGeomFieldRef(0).ExportToWkt() == 'POINT (1 2)' or \
@@ -2811,8 +2463,7 @@ def test_ogr_vrt_33():
     gdal.PushErrorHandler('CPLQuietErrorHandler')
     ogr.Open(ds_str)
     gdal.PopErrorHandler()
-    if gdal.GetLastErrorMsg() == '':
-        return 'fail'
+    assert gdal.GetLastErrorMsg() != ''
 
     # Warped layer with explicit WarpedGeomFieldName (that is the second field)
     ds_str = """<OGRVRTDataSource>
@@ -2826,8 +2477,7 @@ def test_ogr_vrt_33():
 </OGRVRTDataSource>"""
     ds = ogr.Open(ds_str)
     lyr = ds.GetLayer(0)
-    if lyr.GetLayerDefn().GetGeomFieldDefn(1).GetSpatialRef().ExportToWkt().find('4326') < 0:
-        return 'fail'
+    assert lyr.GetLayerDefn().GetGeomFieldDefn(1).GetSpatialRef().ExportToWkt().find('4326') >= 0
     feat = lyr.GetNextFeature()
     if feat.GetGeomFieldRef(1).ExportToWkt().find('POLYGON') < 0 or \
        feat.GetGeomFieldRef(1).ExportToWkt() == 'POLYGON ((0 0,0 1,1 1,1 0,0 0))' or \
@@ -2853,15 +2503,11 @@ def test_ogr_vrt_33():
                    ['geom__WKT_EPSG_32632_POLYGON', ogr.wkbPolygon, '32632'],
                    ['geom__WKT_EPSG_4326_LINESTRING', ogr.wkbLineString, '4326'],
                    ['geom__WKT_EPSG_32631_POINT', ogr.wkbPoint, '32631']]
-    if lyr.GetLayerDefn().GetGeomFieldCount() != len(geom_fields):
-        return 'fail'
+    assert lyr.GetLayerDefn().GetGeomFieldCount() == len(geom_fields)
     for i, geom_field in enumerate(geom_fields):
-        if lyr.GetLayerDefn().GetGeomFieldDefn(i).GetName() != geom_field[0]:
-            return 'fail'
-        if lyr.GetLayerDefn().GetGeomFieldDefn(i).GetType() != geom_field[1]:
-            return 'fail'
-        if lyr.GetLayerDefn().GetGeomFieldDefn(i).GetSpatialRef().ExportToWkt().find(geom_field[2]) < 0:
-            return 'fail'
+        assert lyr.GetLayerDefn().GetGeomFieldDefn(i).GetName() == geom_field[0]
+        assert lyr.GetLayerDefn().GetGeomFieldDefn(i).GetType() == geom_field[1]
+        assert lyr.GetLayerDefn().GetGeomFieldDefn(i).GetSpatialRef().ExportToWkt().find(geom_field[2]) >= 0
     feat = lyr.GetNextFeature()
     if feat.GetGeomFieldRef(0).ExportToWkt() != 'POINT (1 2)' or \
        feat.GetGeomFieldRef(1).ExportToWkt() != 'POLYGON ((0 0,0 1,1 1,1 0,0 0))' or \
@@ -2887,9 +2533,7 @@ def test_ogr_vrt_33():
         ret = gdaltest.runexternal(test_cli_utilities.get_test_ogrsf_path() + ' -ro tmp/ogr_vrt_33.vrt')
         os.unlink('tmp/ogr_vrt_33.vrt')
 
-        if ret.find('INFO') == -1 or ret.find('ERROR') != -1:
-            print(ret)
-            return 'fail'
+        assert ret.find('INFO') != -1 and ret.find('ERROR') == -1
 
     # UnionLayer with intersection strategy
 
@@ -2908,15 +2552,11 @@ def test_ogr_vrt_33():
     lyr = ds.GetLayer(0)
     geom_fields = [['geom__WKT_EPSG_4326_POINT', ogr.wkbPoint, '4326'],
                    ['geom__WKT_EPSG_32632_POLYGON', ogr.wkbPolygon, '32632']]
-    if lyr.GetLayerDefn().GetGeomFieldCount() != len(geom_fields):
-        return 'fail'
+    assert lyr.GetLayerDefn().GetGeomFieldCount() == len(geom_fields)
     for i, geom_field in enumerate(geom_fields):
-        if lyr.GetLayerDefn().GetGeomFieldDefn(i).GetName() != geom_field[0]:
-            return 'fail'
-        if lyr.GetLayerDefn().GetGeomFieldDefn(i).GetType() != geom_field[1]:
-            return 'fail'
-        if lyr.GetLayerDefn().GetGeomFieldDefn(i).GetSpatialRef().ExportToWkt().find(geom_field[2]) < 0:
-            return 'fail'
+        assert lyr.GetLayerDefn().GetGeomFieldDefn(i).GetName() == geom_field[0]
+        assert lyr.GetLayerDefn().GetGeomFieldDefn(i).GetType() == geom_field[1]
+        assert lyr.GetLayerDefn().GetGeomFieldDefn(i).GetSpatialRef().ExportToWkt().find(geom_field[2]) >= 0
     feat = lyr.GetNextFeature()
     if feat.GetGeomFieldRef(0).ExportToWkt() != 'POINT (1 2)' or \
        feat.GetGeomFieldRef(1).ExportToWkt() != 'POLYGON ((0 0,0 1,1 1,1 0,0 0))':
@@ -2938,9 +2578,7 @@ def test_ogr_vrt_33():
         ret = gdaltest.runexternal(test_cli_utilities.get_test_ogrsf_path() + ' -ro tmp/ogr_vrt_33.vrt')
         os.unlink('tmp/ogr_vrt_33.vrt')
 
-        if ret.find('INFO') == -1 or ret.find('ERROR') != -1:
-            print(ret)
-            return 'fail'
+        assert ret.find('INFO') != -1 and ret.find('ERROR') == -1
 
     # UnionLayer with FirstLayer strategy
 
@@ -2960,15 +2598,11 @@ def test_ogr_vrt_33():
     geom_fields = [['geom__WKT_EPSG_4326_POINT', ogr.wkbPoint, '4326'],
                    ['geom__WKT_EPSG_32632_POLYGON', ogr.wkbPolygon, '32632'],
                    ['geom__WKT_EPSG_4326_LINESTRING', ogr.wkbLineString, '4326']]
-    if lyr.GetLayerDefn().GetGeomFieldCount() != len(geom_fields):
-        return 'fail'
+    assert lyr.GetLayerDefn().GetGeomFieldCount() == len(geom_fields)
     for i, geom_field in enumerate(geom_fields):
-        if lyr.GetLayerDefn().GetGeomFieldDefn(i).GetName() != geom_field[0]:
-            return 'fail'
-        if lyr.GetLayerDefn().GetGeomFieldDefn(i).GetType() != geom_field[1]:
-            return 'fail'
-        if lyr.GetLayerDefn().GetGeomFieldDefn(i).GetSpatialRef().ExportToWkt().find(geom_field[2]) < 0:
-            return 'fail'
+        assert lyr.GetLayerDefn().GetGeomFieldDefn(i).GetName() == geom_field[0]
+        assert lyr.GetLayerDefn().GetGeomFieldDefn(i).GetType() == geom_field[1]
+        assert lyr.GetLayerDefn().GetGeomFieldDefn(i).GetSpatialRef().ExportToWkt().find(geom_field[2]) >= 0
     feat = lyr.GetNextFeature()
     if feat.GetGeomFieldRef(0).ExportToWkt() != 'POINT (1 2)' or \
        feat.GetGeomFieldRef(1).ExportToWkt() != 'POLYGON ((0 0,0 1,1 1,1 0,0 0))':
@@ -2990,9 +2624,7 @@ def test_ogr_vrt_33():
         ret = gdaltest.runexternal(test_cli_utilities.get_test_ogrsf_path() + ' -ro tmp/ogr_vrt_33.vrt')
         os.unlink('tmp/ogr_vrt_33.vrt')
 
-        if ret.find('INFO') == -1 or ret.find('ERROR') != -1:
-            print(ret)
-            return 'fail'
+        assert ret.find('INFO') != -1 and ret.find('ERROR') == -1
 
     # UnionLayer with explicit fields but without further information
 
@@ -3012,18 +2644,11 @@ def test_ogr_vrt_33():
     lyr = ds.GetLayer(0)
     geom_fields = [['geom__WKT_EPSG_32632_POLYGON', ogr.wkbPolygon, '32632'],
                    ['geom__WKT_EPSG_4326_POINT', ogr.wkbPoint, '4326']]
-    if lyr.GetLayerDefn().GetGeomFieldCount() != len(geom_fields):
-        return 'fail'
+    assert lyr.GetLayerDefn().GetGeomFieldCount() == len(geom_fields)
     for i, geom_field in enumerate(geom_fields):
-        if lyr.GetLayerDefn().GetGeomFieldDefn(i).GetName() != geom_field[0]:
-            return 'fail'
-        if lyr.GetLayerDefn().GetGeomFieldDefn(i).GetType() != geom_field[1]:
-            print(i)
-            print(lyr.GetLayerDefn().GetGeomFieldDefn(i).GetType())
-            print(geom_field[1])
-            return 'fail'
-        if lyr.GetLayerDefn().GetGeomFieldDefn(i).GetSpatialRef().ExportToWkt().find(geom_field[2]) < 0:
-            return 'fail'
+        assert lyr.GetLayerDefn().GetGeomFieldDefn(i).GetName() == geom_field[0]
+        assert lyr.GetLayerDefn().GetGeomFieldDefn(i).GetType() == geom_field[1]
+        assert lyr.GetLayerDefn().GetGeomFieldDefn(i).GetSpatialRef().ExportToWkt().find(geom_field[2]) >= 0
     feat = lyr.GetNextFeature()
     if feat.GetGeomFieldRef(0).ExportToWkt() != 'POLYGON ((0 0,0 1,1 1,1 0,0 0))' or \
        feat.GetGeomFieldRef(1).ExportToWkt() != 'POINT (1 2)':
@@ -3039,9 +2664,7 @@ def test_ogr_vrt_33():
         ret = gdaltest.runexternal(test_cli_utilities.get_test_ogrsf_path() + ' -ro tmp/ogr_vrt_33.vrt')
         os.unlink('tmp/ogr_vrt_33.vrt')
 
-        if ret.find('INFO') == -1 or ret.find('ERROR') != -1:
-            print(ret)
-            return 'fail'
+        assert ret.find('INFO') != -1 and ret.find('ERROR') == -1
 
     # UnionLayer with explicit fields with extra information
 
@@ -3069,22 +2692,13 @@ def test_ogr_vrt_33():
     lyr = ds.GetLayer(0)
     geom_fields = [['geom__WKT_EPSG_32632_POLYGON', ogr.wkbPolygon25D, '32632'],
                    ['geom__WKT_EPSG_4326_POINT', ogr.wkbPoint, '4322']]
-    if lyr.GetLayerDefn().GetGeomFieldCount() != len(geom_fields):
-        return 'fail'
+    assert lyr.GetLayerDefn().GetGeomFieldCount() == len(geom_fields)
     bb = lyr.GetExtent(geom_field=1)
-    if bb != (1, 3, 2, 4):
-        print(bb)
-        return 'fail'
+    assert bb == (1, 3, 2, 4)
     for i, geom_field in enumerate(geom_fields):
-        if lyr.GetLayerDefn().GetGeomFieldDefn(i).GetName() != geom_field[0]:
-            return 'fail'
-        if lyr.GetLayerDefn().GetGeomFieldDefn(i).GetType() != geom_field[1]:
-            print(i)
-            print(lyr.GetLayerDefn().GetGeomFieldDefn(i).GetType())
-            print(geom_field[1])
-            return 'fail'
-        if lyr.GetLayerDefn().GetGeomFieldDefn(i).GetSpatialRef().ExportToWkt().find(geom_field[2]) < 0:
-            return 'fail'
+        assert lyr.GetLayerDefn().GetGeomFieldDefn(i).GetName() == geom_field[0]
+        assert lyr.GetLayerDefn().GetGeomFieldDefn(i).GetType() == geom_field[1]
+        assert lyr.GetLayerDefn().GetGeomFieldDefn(i).GetSpatialRef().ExportToWkt().find(geom_field[2]) >= 0
     feat = lyr.GetNextFeature()
     if feat.GetGeomFieldRef(0).ExportToWkt() != 'POLYGON ((0 0,0 1,1 1,1 0,0 0))' or \
        feat.GetGeomFieldRef(1).ExportToWkt().find('POINT (') != 0 or \
@@ -3100,9 +2714,7 @@ def test_ogr_vrt_33():
         ret = gdaltest.runexternal(test_cli_utilities.get_test_ogrsf_path() + ' -ro tmp/ogr_vrt_33.vrt')
         os.unlink('tmp/ogr_vrt_33.vrt')
 
-        if ret.find('INFO') == -1 or ret.find('ERROR') != -1:
-            print(ret)
-            return 'fail'
+        assert ret.find('INFO') != -1 and ret.find('ERROR') == -1
 
     # UnionLayer with geometry fields disabled
 
@@ -3119,15 +2731,11 @@ def test_ogr_vrt_33():
 </OGRVRTDataSource>"""
     ds = ogr.Open(ds_str)
     lyr = ds.GetLayer(0)
-    if lyr.GetLayerDefn().GetGeomFieldCount() != 0:
-        print(lyr.GetLayerDefn().GetGeomFieldCount())
-        return 'fail'
-    if lyr.GetLayerDefn().GetFieldCount() != 6:
-        print(lyr.GetLayerDefn().GetGeomFieldCount())
-        return 'fail'
+    assert lyr.GetLayerDefn().GetGeomFieldCount() == 0
+    assert lyr.GetLayerDefn().GetFieldCount() == 6, \
+        lyr.GetLayerDefn().GetGeomFieldCount()
     feat = lyr.GetNextFeature()
-    if feat is None:
-        return 'fail'
+    assert feat is not None
 
     ds = None
 
@@ -3138,9 +2746,7 @@ def test_ogr_vrt_33():
         ret = gdaltest.runexternal(test_cli_utilities.get_test_ogrsf_path() + ' -ro tmp/ogr_vrt_33.vrt')
         os.unlink('tmp/ogr_vrt_33.vrt')
 
-        if ret.find('INFO') == -1 or ret.find('ERROR') != -1:
-            print(ret)
-            return 'fail'
+        assert ret.find('INFO') != -1 and ret.find('ERROR') == -1
 
     ds = ogr.Open('tmp/ogr_vrt_33')
     sql_lyr = ds.ExecuteSQL('SELECT * FROM test UNION ALL SELECT * FROM test2')
@@ -3148,15 +2754,11 @@ def test_ogr_vrt_33():
                    ['geom__WKT_EPSG_32632_POLYGON', ogr.wkbPolygon, '32632'],
                    ['geom__WKT_EPSG_4326_LINESTRING', ogr.wkbLineString, '4326'],
                    ['geom__WKT_EPSG_32631_POINT', ogr.wkbPoint, '32631']]
-    if sql_lyr.GetLayerDefn().GetGeomFieldCount() != len(geom_fields):
-        return 'fail'
+    assert sql_lyr.GetLayerDefn().GetGeomFieldCount() == len(geom_fields)
     for i, geom_field in enumerate(geom_fields):
-        if sql_lyr.GetLayerDefn().GetGeomFieldDefn(i).GetName() != geom_field[0]:
-            return 'fail'
-        if sql_lyr.GetLayerDefn().GetGeomFieldDefn(i).GetType() != geom_field[1]:
-            return 'fail'
-        if sql_lyr.GetLayerDefn().GetGeomFieldDefn(i).GetSpatialRef().ExportToWkt().find(geom_field[2]) < 0:
-            return 'fail'
+        assert sql_lyr.GetLayerDefn().GetGeomFieldDefn(i).GetName() == geom_field[0]
+        assert sql_lyr.GetLayerDefn().GetGeomFieldDefn(i).GetType() == geom_field[1]
+        assert sql_lyr.GetLayerDefn().GetGeomFieldDefn(i).GetSpatialRef().ExportToWkt().find(geom_field[2]) >= 0
     feat = sql_lyr.GetNextFeature()
     if feat.GetGeomFieldRef(0).ExportToWkt() != 'POINT (1 2)' or \
        feat.GetGeomFieldRef(1).ExportToWkt() != 'POLYGON ((0 0,0 1,1 1,1 0,0 0))' or \
@@ -3253,14 +2855,10 @@ def test_ogr_vrt_35():
 
     ds = ogr.Open('tmp/test.vrt')
     lyr = ds.GetLayerByName('test')
-    if lyr.GetLayerDefn().GetFieldDefn(0).IsNullable() != 0:
-        return 'fail'
-    if lyr.GetLayerDefn().GetFieldDefn(1).IsNullable() != 1:
-        return 'fail'
-    if lyr.GetLayerDefn().GetGeomFieldDefn(0).IsNullable() != 0:
-        return 'fail'
-    if lyr.GetLayerDefn().GetGeomFieldDefn(1).IsNullable() != 1:
-        return 'fail'
+    assert lyr.GetLayerDefn().GetFieldDefn(0).IsNullable() == 0
+    assert lyr.GetLayerDefn().GetFieldDefn(1).IsNullable() == 1
+    assert lyr.GetLayerDefn().GetGeomFieldDefn(0).IsNullable() == 0
+    assert lyr.GetLayerDefn().GetGeomFieldDefn(1).IsNullable() == 1
     ds = None
 
     # Implicit nullable
@@ -3275,14 +2873,10 @@ def test_ogr_vrt_35():
 
     ds = ogr.Open('tmp/test2.vrt')
     lyr = ds.GetLayerByName('test')
-    if lyr.GetLayerDefn().GetFieldDefn(0).IsNullable() != 0:
-        return 'fail'
-    if lyr.GetLayerDefn().GetFieldDefn(1).IsNullable() != 1:
-        return 'fail'
-    if lyr.GetLayerDefn().GetGeomFieldDefn(0).IsNullable() != 0:
-        return 'fail'
-    if lyr.GetLayerDefn().GetGeomFieldDefn(1).IsNullable() != 1:
-        return 'fail'
+    assert lyr.GetLayerDefn().GetFieldDefn(0).IsNullable() == 0
+    assert lyr.GetLayerDefn().GetFieldDefn(1).IsNullable() == 1
+    assert lyr.GetLayerDefn().GetGeomFieldDefn(0).IsNullable() == 0
+    assert lyr.GetLayerDefn().GetGeomFieldDefn(1).IsNullable() == 1
     ds = None
 
     os.unlink('tmp/test.csv')
@@ -3347,15 +2941,13 @@ def test_ogr_vrt_37():
         ds = ogr.Open('data/vrt_test.vrt')
 
     lyr = ds.GetLayerByName('test6')
-    if lyr.GetGeomType() != ogr.wkbNone:
-        return 'fail'
+    assert lyr.GetGeomType() == ogr.wkbNone
 
     with gdaltest.error_handler():
         ds = ogr.Open('data/vrt_test.vrt')
 
     lyr = ds.GetLayerByName('test6')
-    if lyr.GetLayerDefn().GetGeomFieldCount() != 0:
-        return 'fail'
+    assert lyr.GetLayerDefn().GetGeomFieldCount() == 0
 
     return 'success'
 
@@ -3405,9 +2997,8 @@ def test_ogr_vrt_38():
 
             ds = ogr.Open('/vsimem/ogr_vrt_38.vrt', update=1)
             lyr = ds.GetLayer(0)
-            if lyr.GetGeomType() != expected_geom_type:
-                print(type_str, qualifier, lyr.GetGeomType())
-                return 'fail'
+            assert lyr.GetGeomType() == expected_geom_type, \
+                (type_str, qualifier, lyr.GetGeomType())
 
     gdal.Unlink('/vsimem/ogr_vrt_38.vrt')
 
@@ -3481,9 +3072,7 @@ def test_ogr_vrt_40():
 
     ds = ogr.Open('/vsimem/ogr_vrt_40.vrt')
     lyr = ds.GetLayer(0)
-    if lyr.GetGeomType() != ogr.wkbPointZM:
-        print(lyr.GetGeomType())
-        return 'fail'
+    assert lyr.GetGeomType() == ogr.wkbPointZM
     f = lyr.GetNextFeature()
     if f.GetGeometryRef().ExportToIsoWkt() != 'POINT ZM (1 2 3 4)':
         f.DumpReadable()
diff --git a/autotest/ogr/ogr_wasp.py b/autotest/ogr/ogr_wasp.py
index 70f3ff587a53..9556fcdf11e1 100755
--- a/autotest/ogr/ogr_wasp.py
+++ b/autotest/ogr/ogr_wasp.py
@@ -69,9 +69,7 @@ def test_ogr_wasp_elevation_from_linestring_z():
                                          ref,
                                          geom_type=ogr.wkbLineString25D)
 
-    if layer is None:
-        gdaltest.post_reason('unable to create layer')
-        return 'fail'
+    assert layer is not None, 'unable to create layer'
 
     dfn = ogr.FeatureDefn()
 
@@ -82,9 +80,7 @@ def test_ogr_wasp_elevation_from_linestring_z():
         line.AddPoint(i, 0.5, i)
         line.AddPoint(i, 1, i)
         feat.SetGeometry(line)
-        if layer.CreateFeature(feat) != 0:
-            gdaltest.post_reason('unable to create feature')
-            return 'fail'
+        assert layer.CreateFeature(feat) == 0, 'unable to create feature'
 
     del gdaltest.wasp_ds
     del layer
@@ -97,20 +93,14 @@ def test_ogr_wasp_elevation_from_linestring_z():
     for line in f:
         if not i % 2:
             [h, n] = line.split()
-            if int(n) != 3:
-                gdaltest.post_reason('number of points should be 3 and is %s' % n)
-                return 'fail'
+            assert int(n) == 3, ('number of points should be 3 and is %s' % n)
 
-            if float(h) != j:
-                gdaltest.post_reason('altitude should be %d and is %s' % (j, h))
-                return 'fail'
+            assert float(h) == j, ('altitude should be %d and is %s' % (j, h))
 
             j += 1
         i += 1
 
-    if j != 10:
-        gdaltest.post_reason('nb of feature should be 10 and is %d' % j)
-        return 'fail'
+    assert j == 10, ('nb of feature should be 10 and is %d' % j)
 
     return 'success'
 
@@ -134,9 +124,7 @@ def test_ogr_wasp_elevation_from_linestring_z_toler():
     if not ogrtest.have_geos():
         gdal.PopErrorHandler()
 
-    if layer is None:
-        gdaltest.post_reason('unable to create layer')
-        return 'fail'
+    assert layer is not None, 'unable to create layer'
 
     dfn = ogr.FeatureDefn()
 
@@ -147,9 +135,7 @@ def test_ogr_wasp_elevation_from_linestring_z_toler():
         line.AddPoint(i, 0.5, i)
         line.AddPoint(i, 1, i)
         feat.SetGeometry(line)
-        if layer.CreateFeature(feat) != 0:
-            gdaltest.post_reason('unable to create feature')
-            return 'fail'
+        assert layer.CreateFeature(feat) == 0, 'unable to create feature'
 
     del gdaltest.wasp_ds
     del layer
@@ -170,16 +156,12 @@ def test_ogr_wasp_elevation_from_linestring_z_toler():
                     gdaltest.post_reason('number of points should be 3 and is %s' % n)
                     return 'fail'
 
-            if float(h) != j:
-                gdaltest.post_reason('altitude should be %d and is %s' % (j, h))
-                return 'fail'
+            assert float(h) == j, ('altitude should be %d and is %s' % (j, h))
 
             j += 1
         i += 1
 
-    if j != 10:
-        gdaltest.post_reason('nb of feature should be 10 and is %d' % j)
-        return 'fail'
+    assert j == 10, ('nb of feature should be 10 and is %d' % j)
 
     return 'success'
 
@@ -195,9 +177,7 @@ def test_ogr_wasp_elevation_from_linestring_field():
                                          options=['WASP_FIELDS=elevation'],
                                          geom_type=ogr.wkbLineString)
 
-    if layer is None:
-        gdaltest.post_reason('unable to create layer')
-        return 'fail'
+    assert layer is not None, 'unable to create layer'
 
     layer.CreateField(ogr.FieldDefn('elevation', ogr.OFTReal))
 
@@ -209,9 +189,7 @@ def test_ogr_wasp_elevation_from_linestring_field():
         line.AddPoint(i, 0.5)
         line.AddPoint(i, 1)
         feat.SetGeometry(line)
-        if layer.CreateFeature(feat) != 0:
-            gdaltest.post_reason('unable to create feature')
-            return 'fail'
+        assert layer.CreateFeature(feat) == 0, 'unable to create feature'
 
     del gdaltest.wasp_ds
     del layer
@@ -224,13 +202,9 @@ def test_ogr_wasp_elevation_from_linestring_field():
     for line in f:
         if not i % 2:
             [h, n] = line.split()
-            if int(n) != 3:
-                gdaltest.post_reason('number of points should be 3 and is %s' % n)
-                return 'fail'
+            assert int(n) == 3, ('number of points should be 3 and is %s' % n)
 
-            if float(h) != j:
-                gdaltest.post_reason('altitude should be %d and is %s' % (j, h))
-                return 'fail'
+            assert float(h) == j, ('altitude should be %d and is %s' % (j, h))
 
             j += 1
         i += 1
@@ -249,9 +223,7 @@ def test_ogr_wasp_roughness_from_linestring_fields():
                                          options=['WASP_FIELDS=z_left,z_right'],
                                          geom_type=ogr.wkbLineString)
 
-    if layer is None:
-        gdaltest.post_reason('unable to create layer')
-        return 'fail'
+    assert layer is not None, 'unable to create layer'
 
     layer.CreateField(ogr.FieldDefn('dummy', ogr.OFTString))
     layer.CreateField(ogr.FieldDefn('z_left', ogr.OFTReal))
@@ -267,9 +239,7 @@ def test_ogr_wasp_roughness_from_linestring_fields():
         line.AddPoint(i, 0.5)
         line.AddPoint(i, 1)
         feat.SetGeometry(line)
-        if layer.CreateFeature(feat) != 0:
-            gdaltest.post_reason('unable to create feature %d' % i)
-            return 'fail'
+        assert layer.CreateFeature(feat) == 0, ('unable to create feature %d' % i)
 
     del gdaltest.wasp_ds
     del layer
@@ -282,20 +252,15 @@ def test_ogr_wasp_roughness_from_linestring_fields():
     for line in f:
         if not i % 2:
             [l, r, n] = line.split()
-            if int(n) != 3:
-                gdaltest.post_reason('number of points should be 3 and is %s' % n)
-                return 'fail'
+            assert int(n) == 3, ('number of points should be 3 and is %s' % n)
 
-            if float(r) != j or float(l) != j - 1:
-                gdaltest.post_reason('roughness should be %d and %d and is %s and %s' % (j - 1, j, l, r))
-                return 'fail'
+            assert float(r) == j and float(l) == j - 1, \
+                ('roughness should be %d and %d and is %s and %s' % (j - 1, j, l, r))
 
             j += 1
         i += 1
 
-    if j != 10:
-        gdaltest.post_reason('nb of feature should be 10 and is %d' % j)
-        return 'fail'
+    assert j == 10, ('nb of feature should be 10 and is %d' % j)
 
     return 'success'
 
@@ -315,9 +280,7 @@ def test_ogr_wasp_roughness_from_polygon_z():
         gdal.PopErrorHandler()
 
     if layer is None:
-        if ogrtest.have_geos():
-            gdaltest.post_reason('unable to create layer')
-            return 'fail'
+        assert not ogrtest.have_geos(), 'unable to create layer'
         return 'success'
 
     dfn = ogr.FeatureDefn()
@@ -332,9 +295,7 @@ def test_ogr_wasp_roughness_from_polygon_z():
         poly = ogr.Geometry(type=ogr.wkbPolygon25D)
         poly.AddGeometry(ring)
         feat.SetGeometry(poly)
-        if layer.CreateFeature(feat) != 0:
-            gdaltest.post_reason('unable to create feature')
-            return 'fail'
+        assert layer.CreateFeature(feat) == 0, 'unable to create feature'
 
     del gdaltest.wasp_ds
     del layer
@@ -348,9 +309,7 @@ def test_ogr_wasp_roughness_from_polygon_z():
     for line in f:
         if not i % 2:
             [l, r, n] = [v for v in line.split()]
-            if int(n) != 2:
-                gdaltest.post_reason('number of points should be 2 and is %d' % int(n))
-                return 'fail'
+            assert int(n) == 2, ('number of points should be 2 and is %d' % int(n))
             if float(r) > float(l):
                 res.add((float(l), float(r)))
             else:
@@ -358,14 +317,10 @@ def test_ogr_wasp_roughness_from_polygon_z():
             j += 1
         i += 1
 
-    if j != 6:
-        gdaltest.post_reason('there should be 6 boundaries and there are %d' % j)
-        return 'fail'
+    assert j == 6, ('there should be 6 boundaries and there are %d' % j)
 
-    if res != set([(0, 1), (0, 5), (1, 2), (2, 3), (3, 4), (4, 5)]):
-        print(res)
-        gdaltest.post_reason('wrong values f=in boundaries')
-        return 'fail'
+    assert res == set([(0, 1), (0, 5), (1, 2), (2, 3), (3, 4), (4, 5)]), \
+        'wrong values f=in boundaries'
     return 'success'
 
 ###############################################################################
@@ -385,9 +340,7 @@ def test_ogr_wasp_roughness_from_polygon_field():
         gdal.PopErrorHandler()
 
     if layer is None:
-        if ogrtest.have_geos():
-            gdaltest.post_reason('unable to create layer')
-            return 'fail'
+        assert not ogrtest.have_geos(), 'unable to create layer'
         return 'success'
 
     layer.CreateField(ogr.FieldDefn('roughness', ogr.OFTReal))
@@ -404,9 +357,7 @@ def test_ogr_wasp_roughness_from_polygon_field():
         poly = ogr.Geometry(type=ogr.wkbPolygon)
         poly.AddGeometry(ring)
         feat.SetGeometry(poly)
-        if layer.CreateFeature(feat) != 0:
-            gdaltest.post_reason('unable to create feature')
-            return 'fail'
+        assert layer.CreateFeature(feat) == 0, 'unable to create feature'
 
     del gdaltest.wasp_ds
     del layer
@@ -420,9 +371,7 @@ def test_ogr_wasp_roughness_from_polygon_field():
     for line in f:
         if not i % 2:
             [l, r, n] = [v for v in line.split()]
-            if int(n) != 2:
-                gdaltest.post_reason('number of points should be 2 and is %d' % int(n))
-                return 'fail'
+            assert int(n) == 2, ('number of points should be 2 and is %d' % int(n))
             if float(r) > float(l):
                 res.add((float(l), float(r)))
             else:
@@ -430,14 +379,10 @@ def test_ogr_wasp_roughness_from_polygon_field():
             j += 1
         i += 1
 
-    if j != 6:
-        gdaltest.post_reason('there should be 6 boundaries and there are %d' % j)
-        return 'fail'
+    assert j == 6, ('there should be 6 boundaries and there are %d' % j)
 
-    if res != set([(0, 1), (0, 5), (1, 2), (2, 3), (3, 4), (4, 5)]):
-        print(res)
-        gdaltest.post_reason('wrong values f=in boundaries')
-        return 'fail'
+    assert res == set([(0, 1), (0, 5), (1, 2), (2, 3), (3, 4), (4, 5)]), \
+        'wrong values f=in boundaries'
     return 'success'
 
 ###############################################################################
@@ -458,9 +403,7 @@ def test_ogr_wasp_merge():
         gdal.PopErrorHandler()
 
     if layer is None:
-        if ogrtest.have_geos():
-            gdaltest.post_reason('unable to create layer')
-            return 'fail'
+        assert not ogrtest.have_geos(), 'unable to create layer'
         return 'success'
 
     dfn = ogr.FeatureDefn()
@@ -476,9 +419,7 @@ def test_ogr_wasp_merge():
         poly = ogr.Geometry(type=ogr.wkbPolygon25D)
         poly.AddGeometry(ring)
         feat.SetGeometry(poly)
-        if layer.CreateFeature(feat) != 0:
-            gdaltest.post_reason('unable to create feature')
-            return 'fail'
+        assert layer.CreateFeature(feat) == 0, 'unable to create feature'
 
     del gdaltest.wasp_ds
     del layer
@@ -492,9 +433,8 @@ def test_ogr_wasp_merge():
     for line in f:
         if not i % 2:
             [l, r, n] = [v for v in line.split()]
-            if int(n) != 2:
-                gdaltest.post_reason('number of points should be 2 and is %d (unwanted merge ?)' % int(n))
-                return 'fail'
+            assert int(n) == 2, \
+                ('number of points should be 2 and is %d (unwanted merge ?)' % int(n))
             if float(r) > float(l):
                 res.append((float(l), float(r)))
             else:
@@ -502,14 +442,9 @@ def test_ogr_wasp_merge():
             j += 1
         i += 1
 
-    if j != 6:
-        gdaltest.post_reason('there should be 6 boundaries and there are %d' % j)
-        return 'fail'
+    assert j == 6, ('there should be 6 boundaries and there are %d' % j)
 
-    if res != [(0, 1)] * 6:
-        print(res)
-        gdaltest.post_reason('wrong values f=in boundaries')
-        return 'fail'
+    assert res == [(0, 1)] * 6, 'wrong values f=in boundaries'
     return 'success'
 ###############################################################################
 # Read map file
@@ -522,8 +457,7 @@ def test_ogr_wasp_reading():
 
     ds = ogr.Open('tmp.map')
 
-    if ds is None or ds.GetLayerCount() != 1:
-        return 'fail'
+    assert ds is not None and ds.GetLayerCount() == 1
 
     layer = ds.GetLayer(0)
     feat = layer.GetNextFeature()
@@ -533,8 +467,7 @@ def test_ogr_wasp_reading():
         feat = layer.GetNextFeature()
         i += 1
 
-    if i != 10:
-        return 'fail'
+    assert i == 10
     return 'success'
 ###############################################################################
 # Cleanup
diff --git a/autotest/ogr/ogr_wfs.py b/autotest/ogr/ogr_wfs.py
index 9847394fe9f6..ddde4fdf38c1 100755
--- a/autotest/ogr/ogr_wfs.py
+++ b/autotest/ogr/ogr_wfs.py
@@ -94,30 +94,18 @@ def test_ogr_wfs_mapserver():
         gdaltest.post_reason('did not managed to open WFS datastore')
         return 'skip'
 
-    if ds.GetLayerCount() != 2:
-        gdaltest.post_reason('did not get expected layer count')
-        print(ds.GetLayerCount())
-        return 'fail'
+    assert ds.GetLayerCount() == 2, 'did not get expected layer count'
 
     lyr = ds.GetLayer(0)
-    if lyr.GetName() != 'park':
-        gdaltest.post_reason('did not get expected layer name')
-        print(lyr.GetName())
-        return 'fail'
+    assert lyr.GetName() == 'park', 'did not get expected layer name'
 
     sr = lyr.GetSpatialRef()
     sr2 = osr.SpatialReference()
     sr2.ImportFromEPSG(42304)
-    if not sr.IsSame(sr2):
-        gdaltest.post_reason('did not get expected SRS')
-        print(sr)
-        return 'fail'
+    assert sr.IsSame(sr2), 'did not get expected SRS'
 
     feat_count = lyr.GetFeatureCount()
-    if feat_count != 46:
-        gdaltest.post_reason('did not get expected feature count')
-        print(feat_count)
-        return 'fail'
+    assert feat_count == 46, 'did not get expected feature count'
 
     feat = lyr.GetNextFeature()
     geom = feat.GetGeometryRef()
@@ -145,28 +133,17 @@ def test_ogr_wfs_geoserver():
     gdaltest.geoserver_wfs = True
 
     ds = ogr.Open('WFS:http://demo.opengeo.org/geoserver/wfs?TYPENAME=za:za_points')
-    if ds is None:
-        gdaltest.post_reason('did not managed to open WFS datastore')
-        return 'fail'
+    assert ds is not None, 'did not managed to open WFS datastore'
 
-    if ds.GetLayerCount() != 1:
-        gdaltest.post_reason('did not get expected layer count')
-        print(ds.GetLayerCount())
-        return 'fail'
+    assert ds.GetLayerCount() == 1, 'did not get expected layer count'
 
     lyr = ds.GetLayer(0)
-    if lyr.GetName() != 'za:za_points':
-        gdaltest.post_reason('did not get expected layer name')
-        print(lyr.GetName())
-        return 'fail'
+    assert lyr.GetName() == 'za:za_points', 'did not get expected layer name'
 
     sr = lyr.GetSpatialRef()
     sr2 = osr.SpatialReference()
     sr2.ImportFromEPSG(4326)
-    if not sr.IsSame(sr2):
-        gdaltest.post_reason('did not get expected SRS')
-        print(sr)
-        return 'fail'
+    assert sr.IsSame(sr2), 'did not get expected SRS'
 
     feat_count = lyr.GetFeatureCount()
     if feat_count < 14000:
@@ -179,9 +156,7 @@ def test_ogr_wfs_geoserver():
         print(feat_count)
         return 'fail'
 
-    if not lyr.TestCapability(ogr.OLCFastFeatureCount):
-        gdaltest.post_reason('did not get OLCFastFeatureCount')
-        return 'fail'
+    assert lyr.TestCapability(ogr.OLCFastFeatureCount), 'did not get OLCFastFeatureCount'
 
     ds = ogr.Open('WFS:http://demo.opengeo.org/geoserver/wfs?TYPENAME=tiger:poi&MAXFEATURES=10&VERSION=1.1.0')
     if ds is None:
@@ -227,10 +202,8 @@ def test_ogr_wfs_geoserver():
     lyr = ds.GetLayer(0)
     lyr.SetAttributeFilter("MAINPAGE is not null and NAME >= 'a' and NAME LIKE 'mu%%eam'")
     feat_count = lyr.GetFeatureCount()
-    if feat_count != 1:
-        gdaltest.post_reason('did not get expected feature count after SetAttributeFilter (1)')
-        print(feat_count)
-        return 'fail'
+    assert feat_count == 1, \
+        'did not get expected feature count after SetAttributeFilter (1)'
     feat = lyr.GetNextFeature()
     if feat.GetField('gml_id') != 'poi.1':
         gdaltest.post_reason('did not get expected feature (3)')
@@ -241,10 +214,8 @@ def test_ogr_wfs_geoserver():
         # This GeoServer version doesn't understand <GmlObjectId>
         lyr.SetAttributeFilter("gml_id = 'poi.1'")
         feat_count = lyr.GetFeatureCount()
-        if feat_count != 1:
-            gdaltest.post_reason('did not get expected feature count after SetAttributeFilter (2)')
-            print(feat_count)
-            return 'fail'
+        assert feat_count == 1, \
+            'did not get expected feature count after SetAttributeFilter (2)'
         feat = lyr.GetNextFeature()
         if feat.GetField('gml_id') != 'poi.1':
             gdaltest.post_reason('did not get expected feature (4)')
@@ -266,30 +237,18 @@ def test_ogr_wfs_geoserver_json():
         return 'skip'
 
     ds = ogr.Open('WFS:http://demo.opengeo.org/geoserver/wfs?TYPENAME=za:za_points&MAXFEATURES=10&VERSION=1.1.0&OUTPUTFORMAT=json')
-    if ds is None:
-        gdaltest.post_reason('did not managed to open WFS datastore')
-        return 'fail'
+    assert ds is not None, 'did not managed to open WFS datastore'
 
-    if ds.GetLayerCount() != 1:
-        gdaltest.post_reason('did not get expected layer count')
-        print(ds.GetLayerCount())
-        return 'fail'
+    assert ds.GetLayerCount() == 1, 'did not get expected layer count'
 
     lyr = ds.GetLayer(0)
-    if lyr.GetName() != 'za:za_points':
-        gdaltest.post_reason('did not get expected layer name')
-        print(lyr.GetName())
-        return 'fail'
+    assert lyr.GetName() == 'za:za_points', 'did not get expected layer name'
 
     feat_count = lyr.GetFeatureCount()
-    if feat_count != 10:
-        gdaltest.post_reason('did not get expected feature count')
-        print(feat_count)
-        return 'fail'
+    assert feat_count == 10, 'did not get expected feature count'
 
-    if not lyr.TestCapability(ogr.OLCFastFeatureCount):
-        gdaltest.post_reason('did not get OLCFastFeatureCount')
-        return 'fail'
+    assert lyr.TestCapability(ogr.OLCFastFeatureCount), \
+        'did not get OLCFastFeatureCount'
 
     feat = lyr.GetNextFeature()
     # if feat.GetField('name') != 'Alexander Bay' or \
@@ -314,30 +273,18 @@ def test_ogr_wfs_geoserver_shapezip():
         return 'skip'
 
     ds = ogr.Open('WFS:http://demo.opengeo.org/geoserver/wfs?TYPENAME=za:za_points&MAXFEATURES=10&VERSION=1.1.0&OUTPUTFORMAT=SHAPE-ZIP')
-    if ds is None:
-        gdaltest.post_reason('did not managed to open WFS datastore')
-        return 'fail'
+    assert ds is not None, 'did not managed to open WFS datastore'
 
-    if ds.GetLayerCount() != 1:
-        gdaltest.post_reason('did not get expected layer count')
-        print(ds.GetLayerCount())
-        return 'fail'
+    assert ds.GetLayerCount() == 1, 'did not get expected layer count'
 
     lyr = ds.GetLayer(0)
-    if lyr.GetName() != 'za:za_points':
-        gdaltest.post_reason('did not get expected layer name')
-        print(lyr.GetName())
-        return 'fail'
+    assert lyr.GetName() == 'za:za_points', 'did not get expected layer name'
 
     feat_count = lyr.GetFeatureCount()
-    if feat_count != 10:
-        gdaltest.post_reason('did not get expected feature count')
-        print(feat_count)
-        return 'fail'
+    assert feat_count == 10, 'did not get expected feature count'
 
-    if not lyr.TestCapability(ogr.OLCFastFeatureCount):
-        gdaltest.post_reason('did not get OLCFastFeatureCount')
-        return 'fail'
+    assert lyr.TestCapability(ogr.OLCFastFeatureCount), \
+        'did not get OLCFastFeatureCount'
 
     feat = lyr.GetNextFeature()
     # if feat.GetField('name') != 'Alexander Bay' or \
@@ -373,18 +320,13 @@ def test_ogr_wfs_geoserver_paging():
     ds = ogr.Open('WFS:http://demo.opengeo.org/geoserver/wfs?TYPENAME=og:bugsites&VERSION=1.0.0')
     gdal.SetConfigOption('OGR_WFS_PAGING_ALLOWED', None)
     gdal.SetConfigOption('OGR_WFS_PAGE_SIZE', None)
-    if ds is None:
-        gdaltest.post_reason('did not managed to open WFS datastore')
-        return 'fail'
+    assert ds is not None, 'did not managed to open WFS datastore'
 
     lyr = ds.GetLayer(0)
     feature_count_wfs100 = lyr.GetFeatureCount()
     ds = None
 
-    if feature_count_wfs100 != feature_count_ref:
-        print(feature_count_wfs100)
-        print(feature_count_ref)
-        return 'fail'
+    assert feature_count_wfs100 == feature_count_ref
 
     # Test with WFS 1.1.0
     gdal.SetConfigOption('OGR_WFS_PAGING_ALLOWED', 'ON')
@@ -392,9 +334,7 @@ def test_ogr_wfs_geoserver_paging():
     ds = ogr.Open('WFS:http://demo.opengeo.org/geoserver/wfs?TYPENAME=og:bugsites&VERSION=1.1.0')
     gdal.SetConfigOption('OGR_WFS_PAGING_ALLOWED', None)
     gdal.SetConfigOption('OGR_WFS_PAGE_SIZE', None)
-    if ds is None:
-        gdaltest.post_reason('did not managed to open WFS datastore')
-        return 'fail'
+    assert ds is not None, 'did not managed to open WFS datastore'
 
     lyr = ds.GetLayer(0)
     feature_count_wfs110 = lyr.GetFeatureCount()
@@ -407,15 +347,9 @@ def test_ogr_wfs_geoserver_paging():
         feat = lyr.GetNextFeature()
     ds = None
 
-    if feature_count_wfs110 != feature_count_ref:
-        print(feature_count_wfs100)
-        print(feature_count_ref)
-        return 'fail'
+    assert feature_count_wfs110 == feature_count_ref, feature_count_wfs100
 
-    if feature_count_wfs110_at_hand != feature_count_ref:
-        print(feature_count_wfs110_at_hand)
-        print(feature_count_ref)
-        return 'fail'
+    assert feature_count_wfs110_at_hand == feature_count_ref
 
     return 'success'
 ###############################################################################
@@ -442,18 +376,12 @@ def test_ogr_wfs_deegree():
         return 'fail'
 
     lyr = ds.GetLayerByName('app:SGID024_Springs')
-    if lyr.GetName() != 'app:SGID024_Springs':
-        gdaltest.post_reason('did not get expected layer name')
-        print(lyr.GetName())
-        return 'fail'
+    assert lyr.GetName() == 'app:SGID024_Springs', 'did not get expected layer name'
 
     sr = lyr.GetSpatialRef()
     sr2 = osr.SpatialReference()
     sr2.ImportFromEPSG(26912)
-    if not sr.IsSame(sr2):
-        gdaltest.post_reason('did not get expected SRS')
-        print(sr)
-        return 'fail'
+    assert sr.IsSame(sr2), 'did not get expected SRS'
 
     feat = lyr.GetNextFeature()
     if feat.GetField('OBJECTID') != 1 or \
@@ -471,9 +399,8 @@ def test_ogr_wfs_deegree():
     if feat_count != 12:
         if gdal.GetLastErrorMsg().find('XML parsing of GML file failed') < 0 and \
            gdal.GetLastErrorMsg().find('No suitable driver found') < 0:
-            gdaltest.post_reason('did not get expected feature count after SetAttributeFilter')
             print(feat_count)
-            return 'fail'
+            pytest.fail('did not get expected feature count after SetAttributeFilter')
 
     # Test attribute filter with gml_id
     # lyr.SetAttributeFilter("gml_id = 'SGID024_Springs30' or gml_id = 'SGID024_Springs100'")
@@ -502,9 +429,7 @@ def test_ogr_wfs_test_ogrsf():
 
     ret = gdaltest.runexternal(test_cli_utilities.get_test_ogrsf_path() + ' -ro "WFS:http://demo.deegree.org:80/utah-workspace/services/wfs?ACCEPTVERSIONS=1.1.0&MAXFEATURES=10" app:SGID024_Springs')
 
-    if ret.find('INFO') == -1 or ret.find('ERROR') != -1:
-        print(ret)
-        return 'fail'
+    assert ret.find('INFO') != -1 and ret.find('ERROR') == -1
 
     return 'success'
 
@@ -627,8 +552,7 @@ def test_ogr_wfs_geoserver_wfst():
         return 'skip'
 
     ds = ogr.Open('WFS:http://demo.opengeo.org/geoserver/wfs?VERSION=1.1.0', update=1)
-    if ds is None:
-        return 'fail'
+    assert ds is not None
 
     lyr = ds.GetLayerByName('za:za_points')
     geom = ogr.CreateGeometryFromWkt('POINT(0 89.5)')
@@ -647,42 +571,30 @@ def test_ogr_wfs_geoserver_wfst():
     print('Feature %d created !' % feat.GetFID())
 
     feat.SetField('type', 'type_modified_by_ogr_wfs_8_test')
-    if lyr.SetFeature(feat) != 0:
-        gdaltest.post_reason('cannot update feature')
-        return 'fail'
+    assert lyr.SetFeature(feat) == 0, 'cannot update feature'
     print('Feature %d updated !' % feat.GetFID())
 
-    if lyr.DeleteFeature(feat.GetFID()) != 0:
-        gdaltest.post_reason('could not delete feature')
-        return 'fail'
+    assert lyr.DeleteFeature(feat.GetFID()) == 0, 'could not delete feature'
 
     print('Feature %d deleted !' % feat.GetFID())
 
     # Test transactions
-    if lyr.StartTransaction() != 0:
-        gdaltest.post_reason('CommitTransaction() failed')
-        return 'fail'
+    assert lyr.StartTransaction() == 0, 'CommitTransaction() failed'
 
     geom = ogr.CreateGeometryFromWkt('POINT(0 89.5)')
     feat = ogr.Feature(lyr.GetLayerDefn())
     feat.SetGeometry(geom)
     # feat.SetField('name', 'name_set_by_ogr_wfs_8_test')
     feat.SetField('type', 'type_set_by_ogr_wfs_8_test')
-    if lyr.CreateFeature(feat) != 0:
-        gdaltest.post_reason('cannot create feature')
-        return 'fail'
+    assert lyr.CreateFeature(feat) == 0, 'cannot create feature'
     geom = ogr.CreateGeometryFromWkt('POINT(0 89.5)')
     feat = ogr.Feature(lyr.GetLayerDefn())
     feat.SetGeometry(geom)
     # feat.SetField('name', 'name_set_by_ogr_wfs_8_test_2')
     feat.SetField('type', 'type_set_by_ogr_wfs_8_test_2')
-    if lyr.CreateFeature(feat) != 0:
-        gdaltest.post_reason('cannot create feature')
-        return 'fail'
+    assert lyr.CreateFeature(feat) == 0, 'cannot create feature'
 
-    if lyr.CommitTransaction() != 0:
-        gdaltest.post_reason('CommitTransaction() failed')
-        return 'fail'
+    assert lyr.CommitTransaction() == 0, 'CommitTransaction() failed'
 
     # Retrieve inserted features
     print('Retrieving created features gml:id')
@@ -696,9 +608,7 @@ def test_ogr_wfs_geoserver_wfst():
     count = sql_lyr.GetFeatureCount()
     ds.ReleaseResultSet(sql_lyr)
 
-    if count != 2:
-        gdaltest.post_reason('did not get expected feature count')
-        return 'fail'
+    assert count == 2, 'did not get expected feature count'
 
     # Delete a bunch of features
     print('Deleting created features')
@@ -720,8 +630,7 @@ def test_ogr_wfs_deegree_wfst():
         return 'skip'
 
     ds = ogr.Open('WFS:http://testing.deegree.org/deegree-wfs/services', update=1)
-    if ds is None:
-        return 'fail'
+    assert ds is not None
 
     lyr = ds.GetLayerByName('app:CountyBoundaries_edited')
     geom = ogr.CreateGeometryFromWkt('POINT(2 49)')
@@ -777,16 +686,12 @@ def test_ogr_wfs_ionic_wfst():
     feat.SetField('TOTAL_EMPLOYEES', '10')
 
     ret = lyr.CreateFeature(feat)
-    if ret != 0:
-        print('fail on CreateFeature')
-        return 'fail'
+    assert ret == 0, 'fail on CreateFeature'
 
     gmlid = feat.GetField('gml_id')
 
     ret = lyr.SetFeature(feat)
-    if ret != 0:
-        print('fail on SetFeature')
-        return 'fail'
+    assert ret == 0, 'fail on SetFeature'
 
     ds.ExecuteSQL("DELETE FROM wfs:BUSINESS WHERE gml_id = '%s'" % gmlid)
 
@@ -803,16 +708,14 @@ def test_ogr_wfs_ionic_sql():
         return 'skip'
 
     ds = ogr.Open('WFS:http://webservices.ionicsoft.com/ionicweb/wfs/BOSTON_ORA')
-    if ds is None:
-        return 'fail'
+    assert ds is not None
 
     lyr = ds.ExecuteSQL("SELECT name FROM \"wfs:BUSINESS\" WHERE total_employees = 105")
     count = lyr.GetFeatureCount()
 
     ds.ReleaseResultSet(lyr)
 
-    if count != 1:
-        return 'fail'
+    assert count == 1
 
     return 'success'
 
@@ -829,30 +732,20 @@ def test_ogr_wfs_xmldescriptionfile():
     index = feature_defn.GetFieldIndex('name')
     sr = lyr.GetSpatialRef()
 
-    if index != 1:
-        print(index)
-        return 'fail'
+    assert index == 1
 
     wkt = sr.ExportToWkt()
-    if wkt.find('WGS 84') == -1:
-        print(wkt)
-        return 'fail'
+    assert wkt.find('WGS 84') != -1
 
     layermetadata = ds.GetLayerByName('WFSLayerMetadata')
     count_layers = layermetadata.GetFeatureCount()
-    if count_layers != ds.GetLayerCount():
-        gdaltest.post_reason('count_layers != ds.GetLayerCount()')
-        print(count_layers)
-        print(ds.GetLayerCount())
-        return 'fail'
+    assert count_layers == ds.GetLayerCount(), 'count_layers != ds.GetLayerCount()'
 
     getcapabilitieslayer = ds.GetLayerByName('WFSGetCapabilities')
     getcapabilitieslayer_feat = getcapabilitieslayer.GetNextFeature()
     getcapabilitieslayer_content = getcapabilitieslayer_feat.GetFieldAsString(0)
-    if getcapabilitieslayer_content.find('<WFS_Capabilities') != 0:
-        gdaltest.post_reason('did not get expected result')
-        print(getcapabilitieslayer_content)
-        return 'fail'
+    assert getcapabilitieslayer_content.find('<WFS_Capabilities') == 0, \
+        'did not get expected result'
 
     ds = None
 
@@ -876,35 +769,27 @@ def test_ogr_wfs_xmldescriptionfile_to_be_updated():
 
     # Should only emit GetCapabilities and serialize it
     ds = ogr.Open('tmp/ogr_wfs_xmldescriptionfile_to_be_updated.xml')
-    if ds is None:
-        return 'fail'
+    assert ds is not None
     ds = None
 
     f = open('tmp/ogr_wfs_xmldescriptionfile_to_be_updated.xml', 'rt')
     content = f.read()
-    if content.find('WFS_Capabilities') == -1:
-        print(content)
-        gdaltest.post_reason('XML description file was not filled as expected')
-        return 'fail'
-    if content.find('<OGRWFSLayer') != -1:
-        print(content)
-        gdaltest.post_reason('XML description file was not filled as expected')
-        return 'fail'
+    assert content.find('WFS_Capabilities') != -1, \
+        'XML description file was not filled as expected'
+    assert content.find('<OGRWFSLayer') == -1, \
+        'XML description file was not filled as expected'
     f.close()
 
     # Should emit DescribeFeatureType and serialize its result
     ds = ogr.Open('tmp/ogr_wfs_xmldescriptionfile_to_be_updated.xml')
-    if ds is None:
-        return 'fail'
+    assert ds is not None
     ds.GetLayerByName('za:za_points').GetLayerDefn()
     ds = None
 
     f = open('tmp/ogr_wfs_xmldescriptionfile_to_be_updated.xml', 'rt')
     content = f.read()
-    if content.find('<OGRWFSLayer name="za:za_points">') == -1:
-        print(content)
-        gdaltest.post_reason('XML description file was not filled as expected')
-        return 'fail'
+    assert content.find('<OGRWFSLayer name="za:za_points">') != -1, \
+        'XML description file was not filled as expected'
     f.close()
 
     os.unlink('tmp/ogr_wfs_xmldescriptionfile_to_be_updated.xml')
@@ -949,8 +834,7 @@ def test_ogr_wfs_deegree_gml321():
     lyr = ds.GetLayerByName("ad:Address")
     gdal.ErrorReset()
     lyr.GetFeatureCount()
-    if gdal.GetLastErrorMsg() != '':
-        return 'fail'
+    assert gdal.GetLastErrorMsg() == ''
 
     return 'success'
 
@@ -973,9 +857,8 @@ def test_ogr_wfs_deegree_wfs200():
     count = lyr.GetFeatureCount()
     if count != 1:
         if gdal.GetLastErrorMsg().find('HTTP error code : 500') < 0:
-            gdaltest.post_reason("OBJECTID = 5 filter failed")
             print(count)
-            return 'fail'
+            pytest.fail("OBJECTID = 5 filter failed")
     else:
         feat = lyr.GetNextFeature()
         if feat.GetFieldAsInteger('OBJECTID') != 5:
@@ -1003,11 +886,8 @@ def test_ogr_wfs_deegree_wfs200():
     spatialfiltercount = lyr.GetFeatureCount()
     lyr.SetSpatialFilter(None)
     allcount = lyr.GetFeatureCount()
-    if allcount != spatialfiltercount or allcount == 0:
-        gdaltest.post_reason('spatialfiltercount != allcount')
-        print(spatialfiltercount)
-        print(allcount)
-        return 'fail'
+    assert allcount == spatialfiltercount and allcount != 0, \
+        'spatialfiltercount != allcount'
 
     return 'success'
 
@@ -1122,8 +1002,7 @@ def test_ogr_wfs_vsimem_fail_because_not_enabled(with_and_without_streaming):
     gdal.PushErrorHandler()
     ds = ogr.Open('WFS:/vsimem/wfs_endpoint')
     gdal.PopErrorHandler()
-    if ds is not None:
-        return 'fail'
+    assert ds is None
 
     return 'success'
 
@@ -1136,8 +1015,7 @@ def test_ogr_wfs_vsimem_fail_because_no_get_capabilities(with_and_without_stream
     gdal.PushErrorHandler()
     ds = ogr.Open('WFS:/vsimem/wfs_endpoint')
     gdal.PopErrorHandler()
-    if ds is not None:
-        return 'fail'
+    assert ds is None
 
     return 'success'
 
@@ -1153,11 +1031,8 @@ def test_ogr_wfs_vsimem_fail_because_empty_response(with_and_without_streaming):
     gdal.PushErrorHandler()
     ds = ogr.Open('WFS:/vsimem/wfs_endpoint')
     gdal.PopErrorHandler()
-    if ds is not None:
-        return 'fail'
-    if gdal.GetLastErrorMsg().find('Empty content returned by server') < 0:
-        print(gdal.GetLastErrorMsg())
-        return 'fail'
+    assert ds is None
+    assert gdal.GetLastErrorMsg().find('Empty content returned by server') >= 0
 
     return 'success'
 
@@ -1173,11 +1048,8 @@ def test_ogr_wfs_vsimem_fail_because_no_WFS_Capabilities(with_and_without_stream
     gdal.PushErrorHandler()
     ds = ogr.Open('WFS:/vsimem/wfs_endpoint')
     gdal.PopErrorHandler()
-    if ds is not None:
-        return 'fail'
-    if gdal.GetLastErrorMsg().find('Cannot find <WFS_Capabilities>') < 0:
-        print(gdal.GetLastErrorMsg())
-        return 'fail'
+    assert ds is None
+    assert gdal.GetLastErrorMsg().find('Cannot find <WFS_Capabilities>') >= 0
 
     return 'success'
 
@@ -1193,11 +1065,8 @@ def test_ogr_wfs_vsimem_fail_because_exception(with_and_without_streaming):
     gdal.PushErrorHandler()
     ds = ogr.Open('WFS:/vsimem/wfs_endpoint')
     gdal.PopErrorHandler()
-    if ds is not None:
-        return 'fail'
-    if gdal.GetLastErrorMsg().find('Error returned by server : <ServiceExceptionReport/>') < 0:
-        print(gdal.GetLastErrorMsg())
-        return 'fail'
+    assert ds is None
+    assert gdal.GetLastErrorMsg().find('Error returned by server : <ServiceExceptionReport/>') >= 0
 
     return 'success'
 
@@ -1213,11 +1082,8 @@ def test_ogr_wfs_vsimem_fail_because_invalid_xml_capabilities(with_and_without_s
     gdal.PushErrorHandler()
     ds = ogr.Open('WFS:/vsimem/wfs_endpoint')
     gdal.PopErrorHandler()
-    if ds is not None:
-        return 'fail'
-    if gdal.GetLastErrorMsg().find('Invalid XML content : <invalid_xml') < 0:
-        print(gdal.GetLastErrorMsg())
-        return 'fail'
+    assert ds is None
+    assert gdal.GetLastErrorMsg().find('Invalid XML content : <invalid_xml') >= 0
 
     return 'success'
 
@@ -1235,11 +1101,8 @@ def test_ogr_wfs_vsimem_fail_because_missing_featuretypelist(with_and_without_st
     gdal.PushErrorHandler()
     ds = ogr.Open('WFS:/vsimem/wfs_endpoint')
     gdal.PopErrorHandler()
-    if ds is not None:
-        return 'fail'
-    if gdal.GetLastErrorMsg().find('Cannot find <FeatureTypeList>') < 0:
-        print(gdal.GetLastErrorMsg())
-        return 'fail'
+    assert ds is None
+    assert gdal.GetLastErrorMsg().find('Cannot find <FeatureTypeList>') >= 0
 
     return 'success'
 
@@ -1255,11 +1118,8 @@ def test_ogr_wfs_vsimem_wfs110_open_getcapabilities_file(with_and_without_stream
     gdal.PushErrorHandler()
     ds = ogr.Open('/vsimem/caps.xml')
     gdal.PopErrorHandler()
-    if ds is not None:
-        return 'fail'
-    if gdal.GetLastErrorMsg().find('Parse error at EOF, not all elements have been closed') < 0:
-        print(gdal.GetLastErrorMsg())
-        return 'fail'
+    assert ds is None
+    assert gdal.GetLastErrorMsg().find('Parse error at EOF, not all elements have been closed') >= 0
 
     gdal.FileFromMemBuffer('/vsimem/caps.xml',
                            """<foo><WFS_Capabilities/></foo>
@@ -1268,11 +1128,8 @@ def test_ogr_wfs_vsimem_wfs110_open_getcapabilities_file(with_and_without_stream
     gdal.PushErrorHandler()
     ds = ogr.Open('/vsimem/caps.xml')
     gdal.PopErrorHandler()
-    if ds is not None:
-        return 'fail'
-    if gdal.GetLastErrorMsg().find('Cannot find <WFS_Capabilities>') < 0:
-        print(gdal.GetLastErrorMsg())
-        return 'fail'
+    assert ds is None
+    assert gdal.GetLastErrorMsg().find('Cannot find <WFS_Capabilities>') >= 0
 
     gdal.FileFromMemBuffer('/vsimem/caps.xml',
                            """<WFS_Capabilities version="1.1.0">
@@ -1288,11 +1145,8 @@ def test_ogr_wfs_vsimem_wfs110_open_getcapabilities_file(with_and_without_stream
     gdal.PushErrorHandler()
     ds = ogr.Open('/vsimem/caps.xml')
     gdal.PopErrorHandler()
-    if ds is not None:
-        return 'fail'
-    if gdal.GetLastErrorMsg().find('Cannot find base URL') < 0:
-        print(gdal.GetLastErrorMsg())
-        return 'fail'
+    assert ds is None
+    assert gdal.GetLastErrorMsg().find('Cannot find base URL') >= 0
 
     gdal.FileFromMemBuffer('/vsimem/caps.xml',
                            """<WFS_Capabilities version="1.1.0">
@@ -1314,10 +1168,8 @@ def test_ogr_wfs_vsimem_wfs110_open_getcapabilities_file(with_and_without_stream
 """)
 
     ds = ogr.Open('/vsimem/caps.xml')
-    if ds is None:
-        return 'fail'
-    if ds.GetLayerCount() != 1:
-        return 'fail'
+    assert ds is not None
+    assert ds.GetLayerCount() == 1
 
     return 'success'
 
@@ -1339,24 +1191,17 @@ def test_ogr_wfs_vsimem_wfs110_minimal_instance(with_and_without_streaming):
 </WFS_Capabilities>
 """)
     ds = ogr.Open('WFS:/vsimem/wfs_endpoint')
-    if ds is None:
-        return 'fail'
-    if ds.GetLayerCount() != 0:
-        return 'fail'
+    assert ds is not None
+    assert ds.GetLayerCount() == 0
 
-    if ds.GetMetadataDomainList() != ['', 'xml:capabilities']:
-        return 'fail'
-    if ds.GetMetadata() != {'TITLE': 'LDS Testing'}:
-        print(ds.GetMetadata())
-        return 'fail'
-    if len(ds.GetMetadata_List("xml:capabilities")) != 1:
-        return 'fail'
+    assert ds.GetMetadataDomainList() == ['', 'xml:capabilities']
+    assert ds.GetMetadata() == {'TITLE': 'LDS Testing'}
+    assert len(ds.GetMetadata_List("xml:capabilities")) == 1
 
     gdal.PushErrorHandler()
     ds = ogr.Open('WFS:/vsimem/wfs_endpoint', update=1)
     gdal.PopErrorHandler()
-    if ds is not None:
-        return 'fail'
+    assert ds is None
 
     return 'success'
 
@@ -1379,23 +1224,18 @@ def test_ogr_wfs_vsimem_wfs110_one_layer_missing_describefeaturetype(with_and_wi
 </WFS_Capabilities>
 """)
     ds = ogr.Open('WFS:/vsimem/wfs_endpoint')
-    if ds is None:
-        return 'fail'
-    if ds.GetLayerCount() != 1:
-        return 'fail'
+    assert ds is not None
+    assert ds.GetLayerCount() == 1
     lyr = ds.GetLayer(0)
-    if lyr.GetName() != 'my_layer':
-        return 'fail'
+    assert lyr.GetName() == 'my_layer'
 
     # Missing DescribeFeatureType
     gdal.ErrorReset()
     gdal.PushErrorHandler()
     lyr_defn = lyr.GetLayerDefn()
     gdal.PopErrorHandler()
-    if gdal.GetLastErrorMsg() == '':
-        return 'fail'
-    if lyr_defn.GetFieldCount() != 0:
-        return 'fail'
+    assert gdal.GetLastErrorMsg() != ''
+    assert lyr_defn.GetFieldCount() == 0
 
     lyr_defn = lyr.GetLayerDefn()
 
@@ -1419,10 +1259,8 @@ def test_ogr_wfs_vsimem_wfs110_one_layer_invalid_describefeaturetype(with_and_wi
     gdal.PushErrorHandler()
     lyr_defn = lyr.GetLayerDefn()
     gdal.PopErrorHandler()
-    if gdal.GetLastErrorMsg() == '':
-        return 'fail'
-    if lyr_defn.GetFieldCount() != 0:
-        return 'fail'
+    assert gdal.GetLastErrorMsg() != ''
+    assert lyr_defn.GetFieldCount() == 0
 
     return 'success'
 
@@ -1444,10 +1282,8 @@ def test_ogr_wfs_vsimem_wfs110_one_layer_describefeaturetype_missing_schema(with
     gdal.PushErrorHandler()
     lyr_defn = lyr.GetLayerDefn()
     gdal.PopErrorHandler()
-    if gdal.GetLastErrorMsg() == '':
-        return 'fail'
-    if lyr_defn.GetFieldCount() != 0:
-        return 'fail'
+    assert gdal.GetLastErrorMsg() != ''
+    assert lyr_defn.GetFieldCount() == 0
 
     return 'success'
 
@@ -1485,40 +1321,34 @@ def test_ogr_wfs_vsimem_wfs110_one_layer_describefeaturetype(with_and_without_st
 """)
 
     lyr_defn = lyr.GetLayerDefn()
-    if lyr_defn.GetFieldCount() != 8:
-        return 'fail'
-    if lyr_defn.GetGeomFieldCount() != 1:
-        return 'fail'
+    assert lyr_defn.GetFieldCount() == 8
+    assert lyr_defn.GetGeomFieldCount() == 1
 
     ds = gdal.OpenEx('WFS:/vsimem/wfs_endpoint', open_options=['EXPOSE_GML_ID=NO'])
     lyr = ds.GetLayer(0)
     lyr_defn = lyr.GetLayerDefn()
-    if lyr_defn.GetFieldCount() != 7:
-        return 'fail'
+    assert lyr_defn.GetFieldCount() == 7
 
     gdal.SetConfigOption('GML_EXPOSE_GML_ID', 'YES')
     ds = gdal.OpenEx('WFS:/vsimem/wfs_endpoint', open_options=['EXPOSE_GML_ID=NO'])
     gdal.SetConfigOption('GML_EXPOSE_GML_ID', None)
     lyr = ds.GetLayer(0)
     lyr_defn = lyr.GetLayerDefn()
-    if lyr_defn.GetFieldCount() != 7:
-        return 'fail'
+    assert lyr_defn.GetFieldCount() == 7
 
     gdal.SetConfigOption('GML_EXPOSE_GML_ID', 'NO')
     ds = gdal.OpenEx('WFS:/vsimem/wfs_endpoint', open_options=['EXPOSE_GML_ID=YES'])
     gdal.SetConfigOption('GML_EXPOSE_GML_ID', None)
     lyr = ds.GetLayer(0)
     lyr_defn = lyr.GetLayerDefn()
-    if lyr_defn.GetFieldCount() != 8:
-        return 'fail'
+    assert lyr_defn.GetFieldCount() == 8
 
     gdal.SetConfigOption('GML_EXPOSE_GML_ID', 'NO')
     ds = gdal.OpenEx('WFS:/vsimem/wfs_endpoint')
     gdal.SetConfigOption('GML_EXPOSE_GML_ID', None)
     lyr = ds.GetLayer(0)
     lyr_defn = lyr.GetLayerDefn()
-    if lyr_defn.GetFieldCount() != 7:
-        return 'fail'
+    assert lyr_defn.GetFieldCount() == 7
 
     return 'success'
 
@@ -1535,14 +1365,13 @@ def test_ogr_wfs_vsimem_wfs110_one_layer_xmldescriptionfile_to_be_updated(with_a
 
     ds = ogr.Open('/vsimem/ogr_wfs_xmldescriptionfile_to_be_updated.xml')
     lyr = ds.GetLayer(0)
-    if lyr.GetName() != 'my_layer':
-        return 'fail'
+    assert lyr.GetName() == 'my_layer'
     ds = None
 
     f = gdal.VSIFOpenL('/vsimem/ogr_wfs_xmldescriptionfile_to_be_updated.xml', 'rb')
     data = gdal.VSIFReadL(1, 100000, f).decode('ascii')
     gdal.VSIFCloseL(f)
-    if data != """<OGRWFSDataSource>
+    assert data == """<OGRWFSDataSource>
   <URL>/vsimem/wfs_endpoint</URL>
   <WFS_Capabilities version="1.1.0">
     <FeatureTypeList>
@@ -1553,9 +1382,7 @@ def test_ogr_wfs_vsimem_wfs110_one_layer_xmldescriptionfile_to_be_updated(with_a
     </FeatureTypeList>
   </WFS_Capabilities>
 </OGRWFSDataSource>
-""":
-        print(data)
-        return 'fail'
+"""
 
     ds = ogr.Open('/vsimem/ogr_wfs_xmldescriptionfile_to_be_updated.xml')
     lyr = ds.GetLayer(0)
@@ -1565,7 +1392,7 @@ def test_ogr_wfs_vsimem_wfs110_one_layer_xmldescriptionfile_to_be_updated(with_a
     f = gdal.VSIFOpenL('/vsimem/ogr_wfs_xmldescriptionfile_to_be_updated.xml', 'rb')
     data = gdal.VSIFReadL(1, 100000, f).decode('ascii')
     gdal.VSIFCloseL(f)
-    if data != """<OGRWFSDataSource>
+    assert data == """<OGRWFSDataSource>
   <URL>/vsimem/wfs_endpoint</URL>
   <WFS_Capabilities version="1.1.0">
     <FeatureTypeList>
@@ -1598,9 +1425,7 @@ def test_ogr_wfs_vsimem_wfs110_one_layer_xmldescriptionfile_to_be_updated(with_a
     </schema>
   </OGRWFSLayer>
 </OGRWFSDataSource>
-""":
-        print(data)
-        return 'fail'
+"""
 
     gdal.FileFromMemBuffer('/vsimem/ogr_wfs_xmldescriptionfile_to_be_updated.xml',
                            """<OGRWFSDataSource>
@@ -1632,8 +1457,7 @@ def test_ogr_wfs_vsimem_wfs110_one_layer_xmldescriptionfile_to_be_updated(with_a
 
     ds = ogr.Open('/vsimem/ogr_wfs_xmldescriptionfile_to_be_updated.xml')
     lyr = ds.GetLayer(0)
-    if lyr.GetLayerDefn().GetFieldCount() != 2:
-        return 'fail'
+    assert lyr.GetLayerDefn().GetFieldCount() == 2
     ds = None
 
     return 'success'
@@ -1652,11 +1476,8 @@ def test_ogr_wfs_vsimem_wfs110_one_layer_missing_getfeaturecount_no_hits(with_an
     gdal.PushErrorHandler()
     count = lyr.GetFeatureCount()
     gdal.PopErrorHandler()
-    if gdal.GetLastErrorMsg() == '':
-        return 'fail'
-    if count != 0:
-        print(count)
-        return 'fail'
+    assert gdal.GetLastErrorMsg() != ''
+    assert count == 0
 
     return 'success'
 
@@ -1697,11 +1518,8 @@ def test_ogr_wfs_vsimem_wfs110_one_layer_missing_getfeaturecount_with_hits(with_
     gdal.PushErrorHandler()
     count = lyr.GetFeatureCount()
     gdal.PopErrorHandler()
-    if gdal.GetLastErrorMsg() == '':
-        return 'fail'
-    if count != 0:
-        print(count)
-        return 'fail'
+    assert gdal.GetLastErrorMsg() != ''
+    assert count == 0
 
     return 'success'
 
@@ -1722,11 +1540,8 @@ def test_ogr_wfs_vsimem_wfs110_one_layer_invalid_getfeaturecount_with_hits(with_
     gdal.PushErrorHandler()
     count = lyr.GetFeatureCount()
     gdal.PopErrorHandler()
-    if gdal.GetLastErrorMsg() == '':
-        return 'fail'
-    if count != 0:
-        print(count)
-        return 'fail'
+    assert gdal.GetLastErrorMsg() != ''
+    assert count == 0
 
     return 'success'
 
@@ -1747,11 +1562,8 @@ def test_ogr_wfs_vsimem_wfs110_one_layer_getfeaturecount_with_hits_missing_Featu
     gdal.PushErrorHandler()
     count = lyr.GetFeatureCount()
     gdal.PopErrorHandler()
-    if gdal.GetLastErrorMsg() == '':
-        return 'fail'
-    if count != 0:
-        print(count)
-        return 'fail'
+    assert gdal.GetLastErrorMsg() != ''
+    assert count == 0
 
     return 'success'
 
@@ -1772,11 +1584,8 @@ def test_ogr_wfs_vsimem_wfs110_one_layer_getfeaturecount_with_hits_invalid_xml(w
     gdal.PushErrorHandler()
     count = lyr.GetFeatureCount()
     gdal.PopErrorHandler()
-    if gdal.GetLastErrorMsg() == '':
-        return 'fail'
-    if count != 0:
-        print(count)
-        return 'fail'
+    assert gdal.GetLastErrorMsg() != ''
+    assert count == 0
 
     return 'success'
 
@@ -1797,11 +1606,8 @@ def test_ogr_wfs_vsimem_wfs110_one_layer_getfeaturecount_with_hits_ServiceExcept
     gdal.PushErrorHandler()
     count = lyr.GetFeatureCount()
     gdal.PopErrorHandler()
-    if gdal.GetLastErrorMsg() == '':
-        return 'fail'
-    if count != 0:
-        print(count)
-        return 'fail'
+    assert gdal.GetLastErrorMsg() != ''
+    assert count == 0
 
     return 'success'
 
@@ -1821,11 +1627,8 @@ def test_ogr_wfs_vsimem_wfs110_one_layer_getfeaturecount_with_hits_missing_numbe
     gdal.PushErrorHandler()
     count = lyr.GetFeatureCount()
     gdal.PopErrorHandler()
-    if gdal.GetLastErrorMsg() == '':
-        return 'fail'
-    if count != 0:
-        print(count)
-        return 'fail'
+    assert gdal.GetLastErrorMsg() != ''
+    assert count == 0
 
     return 'success'
 
@@ -1855,9 +1658,7 @@ def test_ogr_wfs_vsimem_wfs110_one_layer_getfeaturecount_with_hits(with_and_with
 </wfs:FeatureCollection>""")
 
     count = lyr.GetFeatureCount()
-    if count != 1:
-        print(count)
-        return 'fail'
+    assert count == 1
 
     return 'success'
 
@@ -1875,10 +1676,8 @@ def test_ogr_wfs_vsimem_wfs110_one_layer_missing_getfeature(with_and_without_str
     gdal.PushErrorHandler()
     f = lyr.GetNextFeature()
     gdal.PopErrorHandler()
-    if gdal.GetLastErrorMsg() == '':
-        return 'fail'
-    if f is not None:
-        return 'fail'
+    assert gdal.GetLastErrorMsg() != ''
+    assert f is None
 
     return 'success'
 
@@ -1900,10 +1699,8 @@ def test_ogr_wfs_vsimem_wfs110_one_layer_invalid_getfeature(with_and_without_str
     gdal.PushErrorHandler()
     f = lyr.GetNextFeature()
     gdal.PopErrorHandler()
-    if gdal.GetLastErrorMsg() == '':
-        return 'fail'
-    if f is not None:
-        return 'fail'
+    assert gdal.GetLastErrorMsg() != ''
+    assert f is None
 
     return 'success'
 
@@ -1925,11 +1722,8 @@ def test_ogr_wfs_vsimem_wfs110_one_layer_exception_getfeature(with_and_without_s
     gdal.PushErrorHandler()
     f = lyr.GetNextFeature()
     gdal.PopErrorHandler()
-    if gdal.GetLastErrorMsg().find('Error returned by server') < 0:
-        print(gdal.GetLastErrorMsg())
-        return 'fail'
-    if f is not None:
-        return 'fail'
+    assert gdal.GetLastErrorMsg().find('Error returned by server') >= 0
+    assert f is None
 
     return 'success'
 
@@ -2014,9 +1808,7 @@ def test_ogr_wfs_vsimem_wfs110_one_layer_getextent(with_and_without_streaming):
 
     ds = ogr.Open('WFS:/vsimem/wfs_endpoint')
     lyr = ds.GetLayer(0)
-    if lyr.GetExtent() != (2, 2, 49, 49):
-        print(lyr.GetExtent())
-        return 'fail'
+    assert lyr.GetExtent() == (2, 2, 49, 49)
 
     return 'success'
 
@@ -2037,11 +1829,8 @@ def test_ogr_wfs_vsimem_wfs110_one_layer_getextent_without_getfeature(with_and_w
     gdal.PushErrorHandler()
     extent = lyr.GetExtent()
     gdal.PopErrorHandler()
-    if gdal.GetLastErrorMsg() == '':
-        return 'fail'
-    if extent != (0, 0, 0, 0):
-        print(extent)
-        return 'fail'
+    assert gdal.GetLastErrorMsg() != ''
+    assert extent == (0, 0, 0, 0)
 
     return 'success'
 
@@ -2105,23 +1894,17 @@ def test_ogr_wfs_vsimem_wfs110_one_layer_getextent_optimized(with_and_without_st
 
     ds = ogr.Open('WFS:/vsimem/wfs_endpoint')
     lyr = ds.GetLayer(0)
-    if lyr.GetExtent() != (-180.0, 180.0, -90.0, 90.0):
-        print(lyr.GetExtent())
-        return 'fail'
+    assert lyr.GetExtent() == (-180.0, 180.0, -90.0, 90.0)
 
     lyr = ds.GetLayer(1)
     gdal.PushErrorHandler()
     got_extent = lyr.GetExtent()
     gdal.PopErrorHandler()
-    if got_extent != (0.0, 0.0, 0.0, 0.0):
-        print(got_extent)
-        return 'fail'
+    assert got_extent == (0.0, 0.0, 0.0, 0.0)
 
     ds = gdal.OpenEx('WFS:/vsimem/wfs_endpoint', open_options=['TRUST_CAPABILITIES_BOUNDS=YES'])
     lyr = ds.GetLayer(1)
-    if lyr.GetExtent() != (-170.0, 170.0, -80.0, 80.0):
-        print(lyr.GetExtent())
-        return 'fail'
+    assert lyr.GetExtent() == (-170.0, 170.0, -80.0, 80.0)
 
     osr_ct.test_osr_ct_1()
     if gdaltest.have_proj4 == 1:
@@ -2134,9 +1917,7 @@ def test_ogr_wfs_vsimem_wfs110_one_layer_getextent_optimized(with_and_without_st
         expected_extent = (-20037508.342789248, 20037508.342789248, -20037508.342789154, 20037508.342789147)
         got_extent = lyr.GetExtent()
         for i in range(4):
-            if abs(expected_extent[i] - got_extent[i]) > 1e-5:
-                print(got_extent)
-                return 'fail'
+            assert abs(expected_extent[i] - got_extent[i]) <= 1e-5
 
     return 'success'
 
@@ -2269,10 +2050,8 @@ def test_ogr_wfs_vsimem_wfs110_one_layer_filter_gml_id_failed(with_and_without_s
     gdal.PushErrorHandler()
     f = lyr.GetNextFeature()
     gdal.PopErrorHandler()
-    if gdal.GetLastErrorMsg() == '':
-        return 'fail'
-    if f is not None:
-        return 'fail'
+    assert gdal.GetLastErrorMsg() != ''
+    assert f is None
 
     return 'success'
 
@@ -2321,8 +2100,7 @@ def test_ogr_wfs_vsimem_wfs110_one_layer_filter_gml_id_success(with_and_without_
     lyr.SetAttributeFilter("gml_id = 'my_layer.1' OR gml_id = 'my_layer.1'")
 
     f = lyr.GetNextFeature()
-    if f is None:
-        return 'fail'
+    assert f is not None
 
     return 'success'
 
@@ -2371,8 +2149,7 @@ def test_ogr_wfs_vsimem_wfs110_one_layer_filter(with_and_without_streaming):
     lyr.SetAttributeFilter("(str = 'str' AND short = 1 AND float = 1.2) OR str LIKE 'st%' OR boolean IS NOT NULL OR int > 1 OR int >= 1 or int != 2 or int < 2000000000 or int <= 2000000000")
 
     f = lyr.GetNextFeature()
-    if f is None:
-        return 'fail'
+    assert f is not None
 
     return 'success'
 
@@ -2421,100 +2198,72 @@ def test_ogr_wfs_vsimem_wfs110_one_layer_filter_spatial_ops(with_and_without_str
     gdal.PushErrorHandler()
     ret = lyr.SetAttributeFilter("ST_Intersects(shape)")
     gdal.PopErrorHandler()
-    if ret == 0 or gdal.GetLastErrorMsg().find('Wrong number of arguments for ST_Intersects') < 0:
-        print(gdal.GetLastErrorMsg())
-        return 'fail'
+    assert not (ret == 0 or gdal.GetLastErrorMsg().find('Wrong number of arguments for ST_Intersects') < 0)
 
     gdal.PushErrorHandler()
     ret = lyr.SetAttributeFilter("ST_Intersects(shape, 5)")
     gdal.PopErrorHandler()
-    if ret == 0 or gdal.GetLastErrorMsg().find('Wrong field type for argument 2 of ST_Intersects') < 0:
-        print(gdal.GetLastErrorMsg())
-        return 'fail'
+    assert not (ret == 0 or gdal.GetLastErrorMsg().find('Wrong field type for argument 2 of ST_Intersects') < 0)
 
     gdal.PushErrorHandler()
     ret = lyr.SetAttributeFilter("ST_Intersects(shape, ST_MakeEnvelope(1))")
     gdal.PopErrorHandler()
-    if ret == 0 or gdal.GetLastErrorMsg().find('Wrong number of arguments for ST_MakeEnvelope') < 0:
-        print(gdal.GetLastErrorMsg())
-        return 'fail'
+    assert not (ret == 0 or gdal.GetLastErrorMsg().find('Wrong number of arguments for ST_MakeEnvelope') < 0)
 
     gdal.PushErrorHandler()
     ret = lyr.SetAttributeFilter("ST_Intersects(shape, ST_MakeEnvelope(1,1,1,'a'))")
     gdal.PopErrorHandler()
-    if ret == 0 or gdal.GetLastErrorMsg().find('Wrong field type for argument 4 of ST_MakeEnvelope') < 0:
-        print(gdal.GetLastErrorMsg())
-        return 'fail'
+    assert not (ret == 0 or gdal.GetLastErrorMsg().find('Wrong field type for argument 4 of ST_MakeEnvelope') < 0)
 
     gdal.PushErrorHandler()
     ret = lyr.SetAttributeFilter("ST_Intersects(shape, ST_MakeEnvelope(1,1,1,1,3.5))")
     gdal.PopErrorHandler()
-    if ret == 0 or gdal.GetLastErrorMsg().find('Wrong field type for argument 5 of ST_MakeEnvelope') < 0:
-        print(gdal.GetLastErrorMsg())
-        return 'fail'
+    assert not (ret == 0 or gdal.GetLastErrorMsg().find('Wrong field type for argument 5 of ST_MakeEnvelope') < 0)
 
     gdal.PushErrorHandler()
     ret = lyr.SetAttributeFilter("ST_Intersects(shape, ST_MakeEnvelope(1,1,1,1,'not_a_srs'))")
     gdal.PopErrorHandler()
-    if ret == 0 or gdal.GetLastErrorMsg().find('Wrong value for argument 5 of ST_MakeEnvelope') < 0:
-        print(gdal.GetLastErrorMsg())
-        return 'fail'
+    assert not (ret == 0 or gdal.GetLastErrorMsg().find('Wrong value for argument 5 of ST_MakeEnvelope') < 0)
 
     gdal.PushErrorHandler()
     ret = lyr.SetAttributeFilter("ST_Intersects(shape, ST_MakeEnvelope(1,1,1,1,-5))")
     gdal.PopErrorHandler()
-    if ret == 0 or gdal.GetLastErrorMsg().find('Wrong value for argument 5 of ST_MakeEnvelope') < 0:
-        print(gdal.GetLastErrorMsg())
-        return 'fail'
+    assert not (ret == 0 or gdal.GetLastErrorMsg().find('Wrong value for argument 5 of ST_MakeEnvelope') < 0)
 
     gdal.PushErrorHandler()
     ret = lyr.SetAttributeFilter("ST_Intersects(shape, ST_GeomFromText(1,2,3))")
     gdal.PopErrorHandler()
-    if ret == 0 or gdal.GetLastErrorMsg().find('Wrong number of arguments for ST_GeomFromText') < 0:
-        print(gdal.GetLastErrorMsg())
-        return 'fail'
+    assert not (ret == 0 or gdal.GetLastErrorMsg().find('Wrong number of arguments for ST_GeomFromText') < 0)
 
     gdal.PushErrorHandler()
     ret = lyr.SetAttributeFilter("ST_Intersects(shape, ST_GeomFromText(1))")
     gdal.PopErrorHandler()
-    if ret == 0 or gdal.GetLastErrorMsg().find('Wrong field type for argument 1 of ST_GeomFromText') < 0:
-        print(gdal.GetLastErrorMsg())
-        return 'fail'
+    assert not (ret == 0 or gdal.GetLastErrorMsg().find('Wrong field type for argument 1 of ST_GeomFromText') < 0)
 
     gdal.PushErrorHandler()
     ret = lyr.SetAttributeFilter("ST_Intersects(shape, ST_GeomFromText('INVALID_GEOM'))")
     gdal.PopErrorHandler()
-    if ret == 0 or gdal.GetLastErrorMsg().find('Wrong value for argument 1 of ST_GeomFromText') < 0:
-        print(gdal.GetLastErrorMsg())
-        return 'fail'
+    assert not (ret == 0 or gdal.GetLastErrorMsg().find('Wrong value for argument 1 of ST_GeomFromText') < 0)
 
     gdal.PushErrorHandler()
     ret = lyr.SetAttributeFilter("ST_Intersects(shape, ST_GeomFromText('POINT(0 0)', 'invalid_srs'))")
     gdal.PopErrorHandler()
-    if ret == 0 or gdal.GetLastErrorMsg().find('Wrong value for argument 2 of ST_GeomFromText') < 0:
-        print(gdal.GetLastErrorMsg())
-        return 'fail'
+    assert not (ret == 0 or gdal.GetLastErrorMsg().find('Wrong value for argument 2 of ST_GeomFromText') < 0)
 
     gdal.PushErrorHandler()
     ret = lyr.SetAttributeFilter("ST_DWithin(shape)")
     gdal.PopErrorHandler()
-    if ret == 0 or gdal.GetLastErrorMsg().find('Wrong number of arguments for ST_DWithin') < 0:
-        print(gdal.GetLastErrorMsg())
-        return 'fail'
+    assert not (ret == 0 or gdal.GetLastErrorMsg().find('Wrong number of arguments for ST_DWithin') < 0)
 
     gdal.PushErrorHandler()
     ret = lyr.SetAttributeFilter("ST_DWithin(shape,'a',5)")
     gdal.PopErrorHandler()
-    if ret == 0 or gdal.GetLastErrorMsg().find('Wrong field type for argument 2 of ST_DWithin') < 0:
-        print(gdal.GetLastErrorMsg())
-        return 'fail'
+    assert not (ret == 0 or gdal.GetLastErrorMsg().find('Wrong field type for argument 2 of ST_DWithin') < 0)
 
     gdal.PushErrorHandler()
     ret = lyr.SetAttributeFilter("ST_DWithin(shape,shape,'a')")
     gdal.PopErrorHandler()
-    if ret == 0 or gdal.GetLastErrorMsg().find('Wrong field type for argument 3 of ST_DWithin') < 0:
-        print(gdal.GetLastErrorMsg())
-        return 'fail'
+    assert not (ret == 0 or gdal.GetLastErrorMsg().find('Wrong field type for argument 3 of ST_DWithin') < 0)
 
     # Now valid requests
     gdal.FileFromMemBuffer('/vsimem/wfs_endpoint?SERVICE=WFS&VERSION=1.1.0&REQUEST=GetFeature&TYPENAME=my_layer&FILTER=%3CFilter%20xmlns%3D%22http:%2F%2Fwww.opengis.net%2Fogc%22%20xmlns:gml%3D%22http:%2F%2Fwww.opengis.net%2Fgml%22%3E%3COr%3E%3COr%3E%3COr%3E%3CIntersects%3E%3CPropertyName%3Eshape%3C%2FPropertyName%3E%3Cgml:Envelope%20srsName%3D%22urn:ogc:def:crs:EPSG::4326%22%3E%3Cgml:lowerCorner%3E48.5%201.5%3C%2Fgml:lowerCorner%3E%3Cgml:upperCorner%3E49.5%202.5%3C%2Fgml:upperCorner%3E%3C%2Fgml:Envelope%3E%3C%2FIntersects%3E%3CIntersects%3E%3CPropertyName%3Eshape%3C%2FPropertyName%3E%3Cgml:Envelope%20srsName%3D%22urn:ogc:def:crs:EPSG::4326%22%3E%3Cgml:lowerCorner%3E48.5%201.5%3C%2Fgml:lowerCorner%3E%3Cgml:upperCorner%3E49.5%202.5%3C%2Fgml:upperCorner%3E%3C%2Fgml:Envelope%3E%3C%2FIntersects%3E%3C%2FOr%3E%3CIntersects%3E%3CPropertyName%3Eshape%3C%2FPropertyName%3E%3Cgml:Envelope%20srsName%3D%22EPSG:4326%22%3E%3Cgml:lowerCorner%3E1.5%2048.5%3C%2Fgml:lowerCorner%3E%3Cgml:upperCorner%3E2.5%2049.5%3C%2Fgml:upperCorner%3E%3C%2Fgml:Envelope%3E%3C%2FIntersects%3E%3C%2FOr%3E%3CIntersects%3E%3CPropertyName%3Eshape%3C%2FPropertyName%3E%3Cgml:Envelope%20srsName%3D%22urn:ogc:def:crs:EPSG::32630%22%3E%3Cgml:lowerCorner%3E380000%205370000%3C%2Fgml:lowerCorner%3E%3Cgml:upperCorner%3E470000%205490000%3C%2Fgml:upperCorner%3E%3C%2Fgml:Envelope%3E%3C%2FIntersects%3E%3C%2FOr%3E%3C%2FFilter%3E',
@@ -2526,8 +2275,7 @@ def test_ogr_wfs_vsimem_wfs110_one_layer_filter_spatial_ops(with_and_without_str
                            "ST_Intersects(shape, ST_MakeEnvelope(380000,5370000,470000,5490000,32630))")
 
     f = lyr.GetNextFeature()
-    if f is None:
-        return 'fail'
+    assert f is not None
 
     gdal.FileFromMemBuffer('/vsimem/wfs_endpoint?SERVICE=WFS&VERSION=1.1.0&REQUEST=GetFeature&TYPENAME=my_layer&FILTER=%3CFilter%20xmlns%3D%22http:%2F%2Fwww.opengis.net%2Fogc%22%20xmlns:gml%3D%22http:%2F%2Fwww.opengis.net%2Fgml%22%3E%3COr%3E%3COr%3E%3CIntersects%3E%3CPropertyName%3Eshape%3C%2FPropertyName%3E%3Cgml:Polygon%20srsName%3D%22urn:ogc:def:crs:EPSG::4326%22%20gml:id%3D%22id1%22%3E%3Cgml:exterior%3E%3Cgml:LinearRing%3E%3Cgml:posList%3E48.5%201.5%2049.5%202.5%2049.5%202.5%2048.5%202.5%2048.5%201.5%3C%2Fgml:posList%3E%3C%2Fgml:LinearRing%3E%3C%2Fgml:exterior%3E%3C%2Fgml:Polygon%3E%3C%2FIntersects%3E%3CIntersects%3E%3CPropertyName%3Eshape%3C%2FPropertyName%3E%3Cgml:Polygon%20srsName%3D%22urn:ogc:def:crs:EPSG::4326%22%20gml:id%3D%22id2%22%3E%3Cgml:exterior%3E%3Cgml:LinearRing%3E%3Cgml:posList%3E48.5%201.5%2049.5%202.5%2049.5%202.5%2048.5%202.5%2048.5%201.5%3C%2Fgml:posList%3E%3C%2Fgml:LinearRing%3E%3C%2Fgml:exterior%3E%3C%2Fgml:Polygon%3E%3C%2FIntersects%3E%3C%2FOr%3E%3CIntersects%3E%3CPropertyName%3Eshape%3C%2FPropertyName%3E%3Cgml:Polygon%20srsName%3D%22EPSG:4326%22%20gml:id%3D%22id3%22%3E%3Cgml:exterior%3E%3Cgml:LinearRing%3E%3Cgml:posList%3E1.5%2048.5%202.5%2049.5%202.5%2049.5%202.5%2048.5%201.5%2048.5%3C%2Fgml:posList%3E%3C%2Fgml:LinearRing%3E%3C%2Fgml:exterior%3E%3C%2Fgml:Polygon%3E%3C%2FIntersects%3E%3C%2FOr%3E%3C%2FFilter%3E',
                            content)
@@ -2537,8 +2285,7 @@ def test_ogr_wfs_vsimem_wfs110_one_layer_filter_spatial_ops(with_and_without_str
                            "ST_Intersects(shape, ST_GeomFromText('POLYGON((1.5 48.5,2.5 49.5,2.5 49.5,2.5 48.5,1.5 48.5)))', 'EPSG:4326'))")
 
     f = lyr.GetNextFeature()
-    if f is None:
-        return 'fail'
+    assert f is not None
 
     gdal.FileFromMemBuffer('/vsimem/wfs_endpoint?SERVICE=WFS&VERSION=1.1.0&REQUEST=GetFeature&TYPENAME=my_layer&FILTER=%3CFilter%20xmlns%3D%22http:%2F%2Fwww.opengis.net%2Fogc%22%20xmlns:gml%3D%22http:%2F%2Fwww.opengis.net%2Fgml%22%3E%3CDWithin%3E%3CPropertyName%3Eshape%3C%2FPropertyName%3E%3Cgml:Envelope%20srsName%3D%22urn:ogc:def:crs:EPSG::4326%22%3E%3Cgml:lowerCorner%3E48.5%201.5%3C%2Fgml:lowerCorner%3E%3Cgml:upperCorner%3E49.5%202.5%3C%2Fgml:upperCorner%3E%3C%2Fgml:Envelope%3E%3CDistance%20unit%3D%22m%22%3E5%3C%2FDistance%3E%3C%2FDWithin%3E%3C%2FFilter%3E',
                            content)
@@ -2546,15 +2293,13 @@ def test_ogr_wfs_vsimem_wfs110_one_layer_filter_spatial_ops(with_and_without_str
     lyr.SetAttributeFilter("ST_DWithin(shape,ST_MakeEnvelope(1.5,48.5,2.5,49.5),5)")
 
     f = lyr.GetNextFeature()
-    if f is None:
-        return 'fail'
+    assert f is not None
 
     sql_lyr = ds.ExecuteSQL("SELECT * FROM my_layer WHERE ST_Intersects(shape, ST_GeomFromText('POLYGON((1.5 48.5,2.5 49.5,2.5 49.5,2.5 48.5,1.5 48.5)))')) OR " +
                             "ST_Intersects(shape, ST_GeomFromText('POLYGON((1.5 48.5,2.5 49.5,2.5 49.5,2.5 48.5,1.5 48.5)))', 4326)) OR " +
                             "ST_Intersects(shape, ST_GeomFromText('POLYGON((1.5 48.5,2.5 49.5,2.5 49.5,2.5 48.5,1.5 48.5)))', 'EPSG:4326'))")
     f = sql_lyr.GetNextFeature()
-    if f is None:
-        return 'fail'
+    assert f is not None
     ds.ReleaseResultSet(sql_lyr)
 
     # Error case
@@ -2562,8 +2307,7 @@ def test_ogr_wfs_vsimem_wfs110_one_layer_filter_spatial_ops(with_and_without_str
     gdal.PushErrorHandler()
     f = sql_lyr.GetNextFeature()
     gdal.PopErrorHandler()
-    if f is not None:
-        return 'fail'
+    assert f is None
     ds.ReleaseResultSet(sql_lyr)
 
     return 'success'
@@ -2613,14 +2357,12 @@ def test_ogr_wfs_vsimem_wfs110_one_layer_spatial_filter(with_and_without_streami
     lyr.SetSpatialFilterRect(1, 48, 3, 50)
 
     f = lyr.GetNextFeature()
-    if f is None:
-        return 'fail'
+    assert f is not None
 
     if gdal.GetConfigOption('OGR_WFS_USE_STREAMING') == 'NO':
         lyr.SetSpatialFilterRect(1.5, 48.5, 2.5, 49.5)
         f = lyr.GetNextFeature()
-        if f is None:
-            return 'fail'
+        assert f is not None
 
         lyr.SetSpatialFilter(None)
         lyr.ResetReading()
@@ -2628,8 +2370,7 @@ def test_ogr_wfs_vsimem_wfs110_one_layer_spatial_filter(with_and_without_streami
         lyr.ResetReading()
         lyr.SetSpatialFilterRect(1, 48, 3, 50)
         f = lyr.GetNextFeature()
-        if f is None:
-            return 'fail'
+        assert f is not None
 
     return 'success'
 
@@ -2679,8 +2420,7 @@ def test_ogr_wfs_vsimem_wfs110_one_layer_spatial_filter_and_attribute_filter(wit
     lyr.SetAttributeFilter("str = 'str'")
 
     f = lyr.GetNextFeature()
-    if f is None:
-        return 'fail'
+    assert f is not None
 
     return 'success'
 
@@ -2770,8 +2510,7 @@ def test_ogr_wfs_vsimem_wfs110_insertfeature(with_and_without_streaming):
     gdal.PushErrorHandler()
     ret = lyr.CreateFeature(f)
     gdal.PopErrorHandler()
-    if ret == 0:
-        return 'fail'
+    assert ret != 0
 
     wfs_insert_url = """/vsimem/wfs_endpoint&POSTFIELDS=<?xml version="1.0"?>
 <wfs:Transaction xmlns:wfs="http://www.opengis.net/wfs"
@@ -2792,8 +2531,7 @@ def test_ogr_wfs_vsimem_wfs110_insertfeature(with_and_without_streaming):
     gdal.PushErrorHandler()
     ret = lyr.CreateFeature(f)
     gdal.PopErrorHandler()
-    if ret == 0:
-        return 'fail'
+    assert ret != 0
 
     gdal.FileFromMemBuffer(wfs_insert_url, "<invalid_xml")
 
@@ -2801,8 +2539,7 @@ def test_ogr_wfs_vsimem_wfs110_insertfeature(with_and_without_streaming):
     gdal.PushErrorHandler()
     ret = lyr.CreateFeature(f)
     gdal.PopErrorHandler()
-    if ret == 0:
-        return 'fail'
+    assert ret != 0
 
     gdal.FileFromMemBuffer(wfs_insert_url, "<ServiceExceptionReport/>")
 
@@ -2810,9 +2547,7 @@ def test_ogr_wfs_vsimem_wfs110_insertfeature(with_and_without_streaming):
     gdal.PushErrorHandler()
     ret = lyr.CreateFeature(f)
     gdal.PopErrorHandler()
-    if ret == 0 or gdal.GetLastErrorMsg().find('Error returned by server') < 0:
-        print(gdal.GetLastErrorMsg())
-        return 'fail'
+    assert not (ret == 0 or gdal.GetLastErrorMsg().find('Error returned by server') < 0)
 
     gdal.FileFromMemBuffer(wfs_insert_url, "<dummy_xml/>")
 
@@ -2820,9 +2555,7 @@ def test_ogr_wfs_vsimem_wfs110_insertfeature(with_and_without_streaming):
     gdal.PushErrorHandler()
     ret = lyr.CreateFeature(f)
     gdal.PopErrorHandler()
-    if ret == 0 or gdal.GetLastErrorMsg().find('Cannot find <TransactionResponse>') < 0:
-        print(gdal.GetLastErrorMsg())
-        return 'fail'
+    assert not (ret == 0 or gdal.GetLastErrorMsg().find('Cannot find <TransactionResponse>') < 0)
 
     gdal.FileFromMemBuffer(wfs_insert_url,
                            """<TransactionResponse>
@@ -2833,8 +2566,7 @@ def test_ogr_wfs_vsimem_wfs110_insertfeature(with_and_without_streaming):
     gdal.PushErrorHandler()
     ret = lyr.CreateFeature(f)
     gdal.PopErrorHandler()
-    if ret == 0:
-        return 'fail'
+    assert ret != 0
 
     gdal.FileFromMemBuffer(wfs_insert_url,
                            """<TransactionResponse>
@@ -2850,8 +2582,7 @@ def test_ogr_wfs_vsimem_wfs110_insertfeature(with_and_without_streaming):
     gdal.PushErrorHandler()
     ret = lyr.CreateFeature(f)
     gdal.PopErrorHandler()
-    if ret == 0:
-        return 'fail'
+    assert ret != 0
 
     gdal.FileFromMemBuffer(wfs_insert_url,
                            """<TransactionResponse>
@@ -2866,142 +2597,109 @@ def test_ogr_wfs_vsimem_wfs110_insertfeature(with_and_without_streaming):
     gdal.PushErrorHandler()
     sql_lyr = ds.ExecuteSQL('SELECT _LAST_INSERTED_FIDS_ FROM not_existing_layer')
     gdal.PopErrorHandler()
-    if sql_lyr is not None:
-        return 'fail'
+    assert sql_lyr is None
 
     f = ogr.Feature(lyr.GetLayerDefn())
     ret = lyr.CreateFeature(f)
-    if ret != 0:
-        return 'fail'
-    if f.GetFID() != 100:
-        return 'fail'
+    assert ret == 0
+    assert f.GetFID() == 100
 
     sql_lyr = ds.ExecuteSQL('SELECT _LAST_INSERTED_FIDS_ FROM my_layer')
     got_f = sql_lyr.GetNextFeature()
-    if got_f is not None:
-        return 'fail'
+    assert got_f is None
     ds.ReleaseResultSet(sql_lyr)
 
     gdal.PushErrorHandler()
     ret = lyr.CreateFeature(f)
     gdal.PopErrorHandler()
-    if ret == 0 or gdal.GetLastErrorMsg().find('Cannot insert a feature when gml_id field is already set') < 0:
-        print(gdal.GetLastErrorMsg())
-        return 'fail'
+    assert not (ret == 0 or gdal.GetLastErrorMsg().find('Cannot insert a feature when gml_id field is already set') < 0)
 
     # Empty StartTransaction + CommitTransaction
     ret = lyr.StartTransaction()
-    if ret != 0:
-        return 'fail'
+    assert ret == 0
     ret = lyr.CommitTransaction()
-    if ret != 0:
-        return 'fail'
+    assert ret == 0
 
     # Empty StartTransaction + RollbackTransaction
     ret = lyr.StartTransaction()
-    if ret != 0:
-        return 'fail'
+    assert ret == 0
     ret = lyr.RollbackTransaction()
-    if ret != 0:
-        return 'fail'
+    assert ret == 0
 
     # Isolated CommitTransaction
     gdal.PushErrorHandler()
     ret = lyr.CommitTransaction()
     gdal.PopErrorHandler()
-    if ret == 0:
-        return 'fail'
+    assert ret != 0
 
     # Isolated RollbackTransaction
     gdal.PushErrorHandler()
     ret = lyr.RollbackTransaction()
     gdal.PopErrorHandler()
-    if ret == 0:
-        return 'fail'
+    assert ret != 0
 
     # 2 StartTransaction in a row
     ret = lyr.StartTransaction()
-    if ret != 0:
-        return 'fail'
+    assert ret == 0
     gdal.PushErrorHandler()
     ret = lyr.StartTransaction()
     gdal.PopErrorHandler()
-    if ret == 0:
-        return 'fail'
+    assert ret != 0
     ret = lyr.RollbackTransaction()
-    if ret != 0:
-        return 'fail'
+    assert ret == 0
 
     # Missing TransactionSummary
     ret = lyr.StartTransaction()
-    if ret != 0:
-        return 'fail'
+    assert ret == 0
     f = ogr.Feature(lyr.GetLayerDefn())
     ret = lyr.CreateFeature(f)
-    if ret != 0:
-        return 'fail'
+    assert ret == 0
     gdal.PushErrorHandler()
     ret = lyr.CommitTransaction()
     gdal.PopErrorHandler()
-    if ret == 0 or gdal.GetLastErrorMsg().find('Only 0 features were inserted whereas 1 where expected') < 0:
-        print(gdal.GetLastErrorMsg())
-        return 'fail'
+    assert not (ret == 0 or gdal.GetLastErrorMsg().find('Only 0 features were inserted whereas 1 where expected') < 0)
 
     ret = lyr.StartTransaction()
-    if ret != 0:
-        return 'fail'
+    assert ret == 0
     f = ogr.Feature(lyr.GetLayerDefn())
     ret = lyr.CreateFeature(f)
-    if ret != 0:
-        return 'fail'
+    assert ret == 0
 
     gdal.FileFromMemBuffer(wfs_insert_url, "<invalid_xml")
     gdal.PushErrorHandler()
     ret = lyr.CommitTransaction()
     gdal.PopErrorHandler()
-    if ret == 0 or gdal.GetLastErrorMsg().find('Invalid XML content') < 0:
-        print(gdal.GetLastErrorMsg())
-        return 'fail'
+    assert not (ret == 0 or gdal.GetLastErrorMsg().find('Invalid XML content') < 0)
 
     ret = lyr.StartTransaction()
-    if ret != 0:
-        return 'fail'
+    assert ret == 0
     f = ogr.Feature(lyr.GetLayerDefn())
     ret = lyr.CreateFeature(f)
-    if ret != 0:
-        return 'fail'
+    assert ret == 0
 
     gdal.FileFromMemBuffer(wfs_insert_url, "<dummy_xml/>")
     gdal.PushErrorHandler()
     ret = lyr.CommitTransaction()
     gdal.PopErrorHandler()
-    if ret == 0 or gdal.GetLastErrorMsg().find('Cannot find <TransactionResponse>') < 0:
-        print(gdal.GetLastErrorMsg())
-        return 'fail'
+    assert not (ret == 0 or gdal.GetLastErrorMsg().find('Cannot find <TransactionResponse>') < 0)
 
     ret = lyr.StartTransaction()
-    if ret != 0:
-        return 'fail'
+    assert ret == 0
     f = ogr.Feature(lyr.GetLayerDefn())
     ret = lyr.CreateFeature(f)
-    if ret != 0:
-        return 'fail'
+    assert ret == 0
 
     gdal.FileFromMemBuffer(wfs_insert_url, "<ServiceExceptionReport/>")
     gdal.PushErrorHandler()
     ret = lyr.CommitTransaction()
     gdal.PopErrorHandler()
-    if ret == 0 or gdal.GetLastErrorMsg().find('Error returned by server') < 0:
-        print(gdal.GetLastErrorMsg())
-        return 'fail'
+    assert not (ret == 0 or gdal.GetLastErrorMsg().find('Error returned by server') < 0)
 
     ret = lyr.StartTransaction()
-    if ret != 0:
-        return 'fail'
+    assert ret == 0
     f = ogr.Feature(lyr.GetLayerDefn())
     ret = lyr.CreateFeature(f)
-    if ret != 0:
-        return 'fail'
+    assert ret == 0
 
     gdal.FileFromMemBuffer(wfs_insert_url,
                            """<TransactionResponse>
@@ -3011,17 +2709,13 @@ def test_ogr_wfs_vsimem_wfs110_insertfeature(with_and_without_streaming):
     gdal.PushErrorHandler()
     ret = lyr.CommitTransaction()
     gdal.PopErrorHandler()
-    if ret == 0 or gdal.GetLastErrorMsg().find('Cannot find node InsertResults') < 0:
-        print(gdal.GetLastErrorMsg())
-        return 'fail'
+    assert not (ret == 0 or gdal.GetLastErrorMsg().find('Cannot find node InsertResults') < 0)
 
     ret = lyr.StartTransaction()
-    if ret != 0:
-        return 'fail'
+    assert ret == 0
     f = ogr.Feature(lyr.GetLayerDefn())
     ret = lyr.CreateFeature(f)
-    if ret != 0:
-        return 'fail'
+    assert ret == 0
 
     gdal.FileFromMemBuffer(wfs_insert_url,
                            """<TransactionResponse>
@@ -3032,17 +2726,13 @@ def test_ogr_wfs_vsimem_wfs110_insertfeature(with_and_without_streaming):
     gdal.PushErrorHandler()
     ret = lyr.CommitTransaction()
     gdal.PopErrorHandler()
-    if ret == 0 or gdal.GetLastErrorMsg().find('Inconsistent InsertResults: did not get expected FID count') < 0:
-        print(gdal.GetLastErrorMsg())
-        return 'fail'
+    assert not (ret == 0 or gdal.GetLastErrorMsg().find('Inconsistent InsertResults: did not get expected FID count') < 0)
 
     ret = lyr.StartTransaction()
-    if ret != 0:
-        return 'fail'
+    assert ret == 0
     f = ogr.Feature(lyr.GetLayerDefn())
     ret = lyr.CreateFeature(f)
-    if ret != 0:
-        return 'fail'
+    assert ret == 0
 
     gdal.FileFromMemBuffer(wfs_insert_url,
                            """<TransactionResponse>
@@ -3056,17 +2746,13 @@ def test_ogr_wfs_vsimem_wfs110_insertfeature(with_and_without_streaming):
     gdal.PushErrorHandler()
     ret = lyr.CommitTransaction()
     gdal.PopErrorHandler()
-    if ret == 0 or gdal.GetLastErrorMsg().find('Cannot find fid') < 0:
-        print(gdal.GetLastErrorMsg())
-        return 'fail'
+    assert not (ret == 0 or gdal.GetLastErrorMsg().find('Cannot find fid') < 0)
 
     ret = lyr.StartTransaction()
-    if ret != 0:
-        return 'fail'
+    assert ret == 0
     f = ogr.Feature(lyr.GetLayerDefn())
     ret = lyr.CreateFeature(f)
-    if ret != 0:
-        return 'fail'
+    assert ret == 0
 
     gdal.FileFromMemBuffer(wfs_insert_url,
                            """<TransactionResponse>
@@ -3079,13 +2765,11 @@ def test_ogr_wfs_vsimem_wfs110_insertfeature(with_and_without_streaming):
 </TransactionResponse>
 """)
     ret = lyr.CommitTransaction()
-    if ret != 0:
-        return 'fail'
+    assert ret == 0
 
     sql_lyr = ds.ExecuteSQL('SELECT _LAST_INSERTED_FIDS_ FROM my_layer')
     f = sql_lyr.GetNextFeature()
-    if f.gml_id != 'my_layer.100':
-        return 'fail'
+    assert f.gml_id == 'my_layer.100'
     sql_lyr.ResetReading()
     sql_lyr.SetNextByIndex(0)
     sql_lyr.GetFeature(0)
@@ -3131,8 +2815,7 @@ def test_ogr_wfs_vsimem_wfs110_insertfeature(with_and_without_streaming):
     f.SetField('double', 2.34)
     f.SetGeometry(ogr.CreateGeometryFromWkt('POINT (2 49)'))
     ret = lyr.CreateFeature(f)
-    if ret != 0:
-        return 'fail'
+    assert ret == 0
 
     gdal.Unlink(wfs_insert_url)
     wfs_insert_url = None
@@ -3155,25 +2838,20 @@ def test_ogr_wfs_vsimem_wfs110_updatefeature(with_and_without_streaming):
     gdal.PushErrorHandler()
     ret = lyr.CreateFeature(f)
     gdal.PopErrorHandler()
-    if ret == 0:
-        return 'fail'
+    assert ret != 0
 
     f = ogr.Feature(lyr.GetLayerDefn())
     gdal.PushErrorHandler()
     ret = lyr.SetFeature(f)
     gdal.PopErrorHandler()
-    if ret == 0 or gdal.GetLastErrorMsg().find('Cannot update a feature when gml_id field is not set') < 0:
-        print(gdal.GetLastErrorMsg())
-        return 'fail'
+    assert not (ret == 0 or gdal.GetLastErrorMsg().find('Cannot update a feature when gml_id field is not set') < 0)
 
     f = ogr.Feature(lyr.GetLayerDefn())
     f.SetField('gml_id', 'my_layer.1')
     gdal.PushErrorHandler()
     ret = lyr.SetFeature(f)
     gdal.PopErrorHandler()
-    if ret == 0:
-        print(gdal.GetLastErrorMsg())
-        return 'fail'
+    assert ret != 0, gdal.GetLastErrorMsg()
 
     wfs_update_url = """/vsimem/wfs_endpoint&POSTFIELDS=<?xml version="1.0"?>
 <wfs:Transaction xmlns:wfs="http://www.opengis.net/wfs"
@@ -3220,9 +2898,7 @@ def test_ogr_wfs_vsimem_wfs110_updatefeature(with_and_without_streaming):
     gdal.PushErrorHandler()
     ret = lyr.SetFeature(f)
     gdal.PopErrorHandler()
-    if ret == 0 or gdal.GetLastErrorMsg().find('Empty content returned by server') < 0:
-        print(gdal.GetLastErrorMsg())
-        return 'fail'
+    assert not (ret == 0 or gdal.GetLastErrorMsg().find('Empty content returned by server') < 0)
 
     gdal.FileFromMemBuffer(wfs_update_url, "<invalid_xmm")
     f = ogr.Feature(lyr.GetLayerDefn())
@@ -3230,9 +2906,7 @@ def test_ogr_wfs_vsimem_wfs110_updatefeature(with_and_without_streaming):
     gdal.PushErrorHandler()
     ret = lyr.SetFeature(f)
     gdal.PopErrorHandler()
-    if ret == 0 or gdal.GetLastErrorMsg().find('Invalid XML content') < 0:
-        print(gdal.GetLastErrorMsg())
-        return 'fail'
+    assert not (ret == 0 or gdal.GetLastErrorMsg().find('Invalid XML content') < 0)
 
     gdal.FileFromMemBuffer(wfs_update_url, "<ServiceExceptionReport/>")
     f = ogr.Feature(lyr.GetLayerDefn())
@@ -3240,9 +2914,7 @@ def test_ogr_wfs_vsimem_wfs110_updatefeature(with_and_without_streaming):
     gdal.PushErrorHandler()
     ret = lyr.SetFeature(f)
     gdal.PopErrorHandler()
-    if ret == 0 or gdal.GetLastErrorMsg().find('Error returned by server') < 0:
-        print(gdal.GetLastErrorMsg())
-        return 'fail'
+    assert not (ret == 0 or gdal.GetLastErrorMsg().find('Error returned by server') < 0)
 
     gdal.FileFromMemBuffer(wfs_update_url, "<foo/>")
     f = ogr.Feature(lyr.GetLayerDefn())
@@ -3250,17 +2922,13 @@ def test_ogr_wfs_vsimem_wfs110_updatefeature(with_and_without_streaming):
     gdal.PushErrorHandler()
     ret = lyr.SetFeature(f)
     gdal.PopErrorHandler()
-    if ret == 0 or gdal.GetLastErrorMsg().find('Cannot find <TransactionResponse>') < 0:
-        print(gdal.GetLastErrorMsg())
-        return 'fail'
+    assert not (ret == 0 or gdal.GetLastErrorMsg().find('Cannot find <TransactionResponse>') < 0)
 
     gdal.FileFromMemBuffer(wfs_update_url, "<TransactionResponse/>")
     f = ogr.Feature(lyr.GetLayerDefn())
     f.SetField('gml_id', 'my_layer.1')
     ret = lyr.SetFeature(f)
-    if ret != 0:
-        print(gdal.GetLastErrorMsg())
-        return 'fail'
+    assert ret == 0, gdal.GetLastErrorMsg()
 
     gdal.Unlink(wfs_update_url)
     wfs_update_url = """/vsimem/wfs_endpoint&POSTFIELDS=<?xml version="1.0"?>
@@ -3314,8 +2982,7 @@ def test_ogr_wfs_vsimem_wfs110_updatefeature(with_and_without_streaming):
     f.SetField('double', 2.34)
     f.SetGeometry(ogr.CreateGeometryFromWkt('POINT (2 49)'))
     ret = lyr.SetFeature(f)
-    if ret != 0:
-        return 'fail'
+    assert ret == 0
 
     return 'success'
 
@@ -3334,9 +3001,7 @@ def test_ogr_wfs_vsimem_wfs110_deletefeature(with_and_without_streaming):
     gdal.PushErrorHandler()
     ret = lyr.DeleteFeature(200)
     gdal.PopErrorHandler()
-    if ret == 0:
-        print(gdal.GetLastErrorMsg())
-        return 'fail'
+    assert ret != 0, gdal.GetLastErrorMsg()
 
     gdal.FileFromMemBuffer('/vsimem/wfs_endpoint?SERVICE=WFS&VERSION=1.1.0&REQUEST=GetFeature&TYPENAME=my_layer&FILTER=%3CFilter%20xmlns%3D%22http:%2F%2Fwww.opengis.net%2Fogc%22%20xmlns:gml%3D%22http:%2F%2Fwww.opengis.net%2Fgml%22%3E%3CGmlObjectId%20id%3D%22my_layer.200%22%2F%3E%3C%2FFilter%3E',
                            """<wfs:FeatureCollection xmlns:xs="http://www.w3.org/2001/XMLSchema"
@@ -3364,9 +3029,7 @@ def test_ogr_wfs_vsimem_wfs110_deletefeature(with_and_without_streaming):
     gdal.PushErrorHandler()
     ret = lyr.DeleteFeature(200)
     gdal.PopErrorHandler()
-    if ret == 0:
-        print(gdal.GetLastErrorMsg())
-        return 'fail'
+    assert ret != 0, gdal.GetLastErrorMsg()
 
     ds = ogr.Open('WFS:/vsimem/wfs_endpoint', update=1)
     lyr = ds.GetLayer(0)
@@ -3390,9 +3053,7 @@ def test_ogr_wfs_vsimem_wfs110_deletefeature(with_and_without_streaming):
     gdal.PushErrorHandler()
     ret = lyr.DeleteFeature(200)
     gdal.PopErrorHandler()
-    if ret == 0 or gdal.GetLastErrorMsg().find('Empty content returned by server') < 0:
-        print(gdal.GetLastErrorMsg())
-        return 'fail'
+    assert not (ret == 0 or gdal.GetLastErrorMsg().find('Empty content returned by server') < 0)
 
     ds = ogr.Open('WFS:/vsimem/wfs_endpoint', update=1)
     lyr = ds.GetLayer(0)
@@ -3400,9 +3061,7 @@ def test_ogr_wfs_vsimem_wfs110_deletefeature(with_and_without_streaming):
     gdal.PushErrorHandler()
     ret = lyr.DeleteFeature(200)
     gdal.PopErrorHandler()
-    if ret == 0 or gdal.GetLastErrorMsg().find('Invalid XML content') < 0:
-        print(gdal.GetLastErrorMsg())
-        return 'fail'
+    assert not (ret == 0 or gdal.GetLastErrorMsg().find('Invalid XML content') < 0)
 
     ds = ogr.Open('WFS:/vsimem/wfs_endpoint', update=1)
     lyr = ds.GetLayer(0)
@@ -3410,17 +3069,13 @@ def test_ogr_wfs_vsimem_wfs110_deletefeature(with_and_without_streaming):
     gdal.PushErrorHandler()
     ret = lyr.DeleteFeature(200)
     gdal.PopErrorHandler()
-    if ret == 0 or gdal.GetLastErrorMsg().find('Cannot find <TransactionResponse>') < 0:
-        print(gdal.GetLastErrorMsg())
-        return 'fail'
+    assert not (ret == 0 or gdal.GetLastErrorMsg().find('Cannot find <TransactionResponse>') < 0)
 
     ds = ogr.Open('WFS:/vsimem/wfs_endpoint', update=1)
     lyr = ds.GetLayer(0)
     gdal.FileFromMemBuffer(wfs_delete_url, "<TransactionResponse/>")
     ret = lyr.DeleteFeature(200)
-    if ret != 0:
-        print(gdal.GetLastErrorMsg())
-        return 'fail'
+    assert ret == 0, gdal.GetLastErrorMsg()
 
     gdal.Unlink(wfs_delete_url)
     wfs_delete_url = """/vsimem/wfs_endpoint&POSTFIELDS=<?xml version="1.0"?>
@@ -3441,49 +3096,37 @@ def test_ogr_wfs_vsimem_wfs110_deletefeature(with_and_without_streaming):
 
     gdal.ErrorReset()
     sql_lyr = ds.ExecuteSQL("DELETE FROM my_layer WHERE gml_id = 'my_layer.200'")
-    if gdal.GetLastErrorMsg() != '':
-        print(gdal.GetLastErrorMsg())
-        return 'fail'
+    assert gdal.GetLastErrorMsg() == ''
 
     gdal.ErrorReset()
     gdal.PushErrorHandler()
     sql_lyr = ds.ExecuteSQL("DELETE FROM ")
     gdal.PopErrorHandler()
-    if gdal.GetLastErrorMsg() == '':
-        print(gdal.GetLastErrorMsg())
-        return 'fail'
+    assert gdal.GetLastErrorMsg() != ''
 
     gdal.ErrorReset()
     gdal.PushErrorHandler()
     sql_lyr = ds.ExecuteSQL("DELETE FROM non_existing_layer WHERE truc")
     gdal.PopErrorHandler()
-    if gdal.GetLastErrorMsg().find('Unknown layer') < 0:
-        print(gdal.GetLastErrorMsg())
-        return 'fail'
+    assert gdal.GetLastErrorMsg().find('Unknown layer') >= 0
 
     gdal.ErrorReset()
     gdal.PushErrorHandler()
     sql_lyr = ds.ExecuteSQL("DELETE FROM my_layer BLA")
     gdal.PopErrorHandler()
-    if gdal.GetLastErrorMsg().find('WHERE clause missing') < 0:
-        print(gdal.GetLastErrorMsg())
-        return 'fail'
+    assert gdal.GetLastErrorMsg().find('WHERE clause missing') >= 0
 
     gdal.ErrorReset()
     gdal.PushErrorHandler()
     sql_lyr = ds.ExecuteSQL("DELETE FROM my_layer WHERE -")
     gdal.PopErrorHandler()
-    if gdal.GetLastErrorMsg().find('SQL Expression Parsing Error') < 0:
-        print(gdal.GetLastErrorMsg())
-        return 'fail'
+    assert gdal.GetLastErrorMsg().find('SQL Expression Parsing Error') >= 0
 
     gdal.ErrorReset()
     gdal.PushErrorHandler()
     sql_lyr = ds.ExecuteSQL("DELETE FROM my_layer WHERE ogr_geometry = 'POINT'")
     gdal.PopErrorHandler()
-    if sql_lyr is not None or gdal.GetLastErrorMsg() == '':
-        print(gdal.GetLastErrorMsg())
-        return 'fail'
+    assert sql_lyr is None and gdal.GetLastErrorMsg() != ''
 
     return 'success'
 
@@ -3534,8 +3177,7 @@ def test_ogr_wfs_vsimem_wfs110_schema_not_understood(with_and_without_streaming)
     gdal.PushErrorHandler()
     lyr_defn = lyr.GetLayerDefn()
     gdal.PopErrorHandler()
-    if lyr_defn.GetFieldCount() != 0:
-        return 'fail'
+    assert lyr_defn.GetFieldCount() == 0
 
     ds = ogr.Open('WFS:/vsimem/wfs_endpoint_schema_not_understood')
     lyr = ds.GetLayer(0)
@@ -3575,8 +3217,7 @@ def test_ogr_wfs_vsimem_wfs110_schema_not_understood(with_and_without_streaming)
     gdal.FileFromMemBuffer('/vsimem/wfs_endpoint_schema_not_understood?SERVICE=WFS&VERSION=1.1.0&REQUEST=GetFeature&TYPENAME=my_layer&MAXFEATURES=1', content)
 
     lyr_defn = lyr.GetLayerDefn()
-    if lyr_defn.GetFieldCount() != 8:
-        return 'fail'
+    assert lyr_defn.GetFieldCount() == 8
 
     gdal.FileFromMemBuffer('/vsimem/wfs_endpoint_schema_not_understood?SERVICE=WFS&VERSION=1.1.0&REQUEST=GetFeature&TYPENAME=my_layer', content)
 
@@ -3624,8 +3265,7 @@ def test_ogr_wfs_vsimem_wfs110_multiple_layers(with_and_without_streaming):
     gdal.PushErrorHandler()
     lyr_defn = lyr.GetLayerDefn()
     gdal.PopErrorHandler()
-    if lyr_defn.GetFieldCount() != 0:
-        return 'fail'
+    assert lyr_defn.GetFieldCount() == 0
 
     ds = ogr.Open('WFS:/vsimem/wfs110_multiple_layers')
     lyr = ds.GetLayer(0)
@@ -3635,8 +3275,7 @@ def test_ogr_wfs_vsimem_wfs110_multiple_layers(with_and_without_streaming):
     gdal.PushErrorHandler()
     lyr_defn = lyr.GetLayerDefn()
     gdal.PopErrorHandler()
-    if lyr_defn.GetFieldCount() != 0:
-        return 'fail'
+    assert lyr_defn.GetFieldCount() == 0
 
     ds = ogr.Open('WFS:/vsimem/wfs110_multiple_layers')
     lyr = ds.GetLayer(0)
@@ -3646,8 +3285,7 @@ def test_ogr_wfs_vsimem_wfs110_multiple_layers(with_and_without_streaming):
     gdal.PushErrorHandler()
     lyr_defn = lyr.GetLayerDefn()
     gdal.PopErrorHandler()
-    if lyr_defn.GetFieldCount() != 0:
-        return 'fail'
+    assert lyr_defn.GetFieldCount() == 0
 
     ds = ogr.Open('WFS:/vsimem/wfs110_multiple_layers')
     lyr = ds.GetLayer(0)
@@ -3657,8 +3295,7 @@ def test_ogr_wfs_vsimem_wfs110_multiple_layers(with_and_without_streaming):
     gdal.PushErrorHandler()
     lyr_defn = lyr.GetLayerDefn()
     gdal.PopErrorHandler()
-    if lyr_defn.GetFieldCount() != 0:
-        return 'fail'
+    assert lyr_defn.GetFieldCount() == 0
 
     ds = ogr.Open('WFS:/vsimem/wfs110_multiple_layers')
     lyr = ds.GetLayer(0)
@@ -3690,13 +3327,11 @@ def test_ogr_wfs_vsimem_wfs110_multiple_layers(with_and_without_streaming):
 
     lyr = ds.GetLayer(0)
     lyr_defn = lyr.GetLayerDefn()
-    if lyr_defn.GetFieldCount() != 2:
-        return 'fail'
+    assert lyr_defn.GetFieldCount() == 2
 
     lyr = ds.GetLayer(1)
     lyr_defn = lyr.GetLayerDefn()
-    if lyr_defn.GetFieldCount() != 2:
-        return 'fail'
+    assert lyr_defn.GetFieldCount() == 2
 
     ds = ogr.Open('WFS:/vsimem/wfs110_multiple_layers')
     lyr = ds.GetLayer(0)
@@ -3718,8 +3353,7 @@ def test_ogr_wfs_vsimem_wfs110_multiple_layers(with_and_without_streaming):
 
     lyr = ds.GetLayer(0)
     lyr_defn = lyr.GetLayerDefn()
-    if lyr_defn.GetFieldCount() != 2:
-        return 'fail'
+    assert lyr_defn.GetFieldCount() == 2
 
     gdal.FileFromMemBuffer('/vsimem/wfs110_multiple_layers?SERVICE=WFS&VERSION=1.1.0&REQUEST=DescribeFeatureType&TYPENAME=my_layer2',
                            """<xsd:schema xmlns:foo="http://foo" xmlns:gml="http://www.opengis.net/gml" xmlns:xsd="http://www.w3.org/2001/XMLSchema" elementFormDefault="qualified" targetNamespace="http://foo">
@@ -3738,8 +3372,7 @@ def test_ogr_wfs_vsimem_wfs110_multiple_layers(with_and_without_streaming):
 """)
     lyr = ds.GetLayer(1)
     lyr_defn = lyr.GetLayerDefn()
-    if lyr_defn.GetFieldCount() != 2:
-        return 'fail'
+    assert lyr_defn.GetFieldCount() == 2
 
     return 'success'
 
@@ -3793,8 +3426,7 @@ def test_ogr_wfs_vsimem_wfs110_multiple_layers_same_name_different_ns(with_and_w
 
     lyr = ds.GetLayer(0)
     lyr_defn = lyr.GetLayerDefn()
-    if lyr_defn.GetFieldCount() != 2:
-        return 'fail'
+    assert lyr_defn.GetFieldCount() == 2
 
     gdal.FileFromMemBuffer('/vsimem/wfs110_multiple_layers_different_ns?SERVICE=WFS&VERSION=1.1.0&REQUEST=GetFeature&TYPENAME=ns1:my_layer',
                            """<wfs:FeatureCollection xmlns:xs="http://www.w3.org/2001/XMLSchema"
@@ -3817,8 +3449,7 @@ def test_ogr_wfs_vsimem_wfs110_multiple_layers_same_name_different_ns(with_and_w
 """)
 
     f = lyr.GetNextFeature()
-    if f is None:
-        return 'fail'
+    assert f is not None
 
     gdal.FileFromMemBuffer('/vsimem/wfs110_multiple_layers_different_ns?SERVICE=WFS&VERSION=1.1.0&REQUEST=DescribeFeatureType&TYPENAME=ns2:my_layer',
                            """<xsd:schema xmlns:ns2="http://ns2" xmlns:ns2="http://ns2" xmlns:gml="http://www.opengis.net/gml" xmlns:xsd="http://www.w3.org/2001/XMLSchema" elementFormDefault="qualified" targetNamespace="http://foo">
@@ -3838,8 +3469,7 @@ def test_ogr_wfs_vsimem_wfs110_multiple_layers_same_name_different_ns(with_and_w
 """)
     lyr = ds.GetLayer(1)
     lyr_defn = lyr.GetLayerDefn()
-    if lyr_defn.GetFieldCount() != 3:
-        return 'fail'
+    assert lyr_defn.GetFieldCount() == 3
 
     return 'success'
 
@@ -3928,9 +3558,7 @@ def test_ogr_wfs_vsimem_wfs200_paging(with_and_without_streaming):
 
     ds = ogr.Open('WFS:/vsimem/wfs200_endpoint_paging')
     lyr = ds.GetLayer(0)
-    if lyr.GetMetadata() != {'ABSTRACT': 'abstract', 'KEYWORD_1': 'keyword', 'TITLE': 'title'}:
-        print(lyr.GetMetadata())
-        return 'fail'
+    assert lyr.GetMetadata() == {'ABSTRACT': 'abstract', 'KEYWORD_1': 'keyword', 'TITLE': 'title'}
 
     gdal.FileFromMemBuffer('/vsimem/wfs200_endpoint_paging?SERVICE=WFS&VERSION=2.0.0&REQUEST=DescribeFeatureType&TYPENAME=my_layer',
                            """<xsd:schema xmlns:foo="http://foo" xmlns:gml="http://www.opengis.net/gml" xmlns:xsd="http://www.w3.org/2001/XMLSchema" elementFormDefault="qualified" targetNamespace="http://foo">
@@ -4012,22 +3640,19 @@ def test_ogr_wfs_vsimem_wfs200_paging(with_and_without_streaming):
 """)
 
     f = lyr.GetNextFeature()
-    if f is None:
-        return 'fail'
+    assert f is not None
     if f.gml_id != 'my_layer.1':
         f.DumpReadable()
         return 'fail'
 
     f = lyr.GetNextFeature()
-    if f is None:
-        return 'fail'
+    assert f is not None
     if f.gml_id != 'my_layer.2':
         f.DumpReadable()
         return 'fail'
 
     f = lyr.GetNextFeature()
-    if f is None:
-        return 'fail'
+    assert f is not None
     if f.gml_id != 'my_layer.3':
         f.DumpReadable()
         return 'fail'
@@ -4165,8 +3790,7 @@ def test_ogr_wfs_vsimem_wfs200_json(with_and_without_streaming):
 """)
 
     f = lyr.GetNextFeature()
-    if f is None:
-        return 'fail'
+    assert f is not None
     # We currently invert... A bit weird. See comment in code. Probably inappropriate
     if f.str != 'str' or f.GetGeometryRef().ExportToWkt() != 'POINT (49 2)':
         f.DumpReadable()
@@ -4244,8 +3868,7 @@ def test_ogr_wfs_vsimem_wfs200_multipart(with_and_without_streaming):
 """)
 
     f = lyr.GetNextFeature()
-    if f is None:
-        return 'fail'
+    assert f is not None
     # We currently invert... A bit weird. See comment in code. Probably inappropriate
     if f.str != 'str' or f.GetGeometryRef().ExportToWkt() != 'POINT (49 2)':
         f.DumpReadable()
@@ -4276,8 +3899,7 @@ def test_ogr_wfs_vsimem_wfs200_multipart(with_and_without_streaming):
 """)
 
     f = lyr.GetNextFeature()
-    if f is None:
-        return 'fail'
+    assert f is not None
 
     ds = ogr.Open('WFS:/vsimem/wfs200_endpoint_multipart?OUTPUTFORMAT=multipart')
     lyr = ds.GetLayer(0)
@@ -4298,8 +3920,7 @@ def test_ogr_wfs_vsimem_wfs200_multipart(with_and_without_streaming):
 --my_boundary--
 """)
     f = lyr.GetNextFeature()
-    if f is None:
-        return 'fail'
+    assert f is not None
     # We currently invert... A bit weird. See comment in code. Probably inappropriate
     if f.str != 'str' or f.GetGeometryRef().ExportToWkt() != 'POINT (49 2)':
         f.DumpReadable()
@@ -4385,8 +4006,7 @@ def test_ogr_wfs_vsimem_wfs200_join(with_and_without_streaming):
     gdal.PushErrorHandler()
     f = sql_lyr.GetNextFeature()
     gdal.PopErrorHandler()
-    if f is not None:
-        return 'fail'
+    assert f is None
 
     ds.ReleaseResultSet(sql_lyr)
 
@@ -4399,9 +4019,7 @@ def test_ogr_wfs_vsimem_wfs200_join(with_and_without_streaming):
     gdal.PushErrorHandler()
     f = sql_lyr.GetNextFeature()
     gdal.PopErrorHandler()
-    if f is not None or gdal.GetLastErrorMsg().find('Empty content returned by server') < 0:
-        print(gdal.GetLastErrorMsg())
-        return 'fail'
+    assert f is None and gdal.GetLastErrorMsg().find('Empty content returned by server') >= 0
 
     ds.ReleaseResultSet(sql_lyr)
 
@@ -4414,9 +4032,7 @@ def test_ogr_wfs_vsimem_wfs200_join(with_and_without_streaming):
     gdal.PushErrorHandler()
     f = sql_lyr.GetNextFeature()
     gdal.PopErrorHandler()
-    if f is not None or gdal.GetLastErrorMsg().find('Error returned by server') < 0:
-        print(gdal.GetLastErrorMsg())
-        return 'fail'
+    assert f is None and gdal.GetLastErrorMsg().find('Error returned by server') >= 0
 
     ds.ReleaseResultSet(sql_lyr)
 
@@ -4429,9 +4045,7 @@ def test_ogr_wfs_vsimem_wfs200_join(with_and_without_streaming):
     gdal.PushErrorHandler()
     f = sql_lyr.GetNextFeature()
     gdal.PopErrorHandler()
-    if f is not None or gdal.GetLastErrorMsg().find('Error: cannot parse') < 0:
-        print(gdal.GetLastErrorMsg())
-        return 'fail'
+    assert f is None and gdal.GetLastErrorMsg().find('Error: cannot parse') >= 0
 
     ds.ReleaseResultSet(sql_lyr)
 
@@ -4444,9 +4058,7 @@ def test_ogr_wfs_vsimem_wfs200_join(with_and_without_streaming):
     gdal.PushErrorHandler()
     f = sql_lyr.GetNextFeature()
     gdal.PopErrorHandler()
-    if f is not None or gdal.GetLastErrorMsg().find('Error: cannot parse') < 0:
-        print(gdal.GetLastErrorMsg())
-        return 'fail'
+    assert f is None and gdal.GetLastErrorMsg().find('Error: cannot parse') >= 0
 
     ds.ReleaseResultSet(sql_lyr)
 
@@ -4555,10 +4167,7 @@ def test_ogr_wfs_vsimem_wfs200_join(with_and_without_streaming):
     gdal.PushErrorHandler('CPLQuietErrorHandler')
     fc = sql_lyr.GetFeatureCount()
     gdal.PopErrorHandler()
-    if fc != 2:
-        print(gdal.GetLastErrorMsg())
-        print(fc)
-        return 'fail'
+    assert fc == 2, gdal.GetLastErrorMsg()
 
     # Empty content returned by server
     gdal.FileFromMemBuffer('/vsimem/wfs200_endpoint_join?SERVICE=WFS&VERSION=2.0.0&REQUEST=GetFeature&TYPENAMES=%28lyr1,lyr2%29&FILTER=%3CFilter%20xmlns%3D%22http:%2F%2Fwww.opengis.net%2Ffes%2F2.0%22%20xmlns:gml%3D%22http:%2F%2Fwww.opengis.net%2Fgml%2F3.2%22%3E%3CPropertyIsEqualTo%3E%3CValueReference%3Elyr1%2Fstr%3C%2FValueReference%3E%3CValueReference%3Elyr2%2Fstr2%3C%2FValueReference%3E%3C%2FPropertyIsEqualTo%3E%3C%2FFilter%3E&RESULTTYPE=hits',
@@ -4566,9 +4175,7 @@ def test_ogr_wfs_vsimem_wfs200_join(with_and_without_streaming):
     gdal.PushErrorHandler('CPLQuietErrorHandler')
     fc = sql_lyr.GetFeatureCount()
     gdal.PopErrorHandler()
-    if fc != 2:
-        print(gdal.GetLastErrorMsg())
-        return 'fail'
+    assert fc == 2, gdal.GetLastErrorMsg()
 
     # Invalid XML
     gdal.FileFromMemBuffer('/vsimem/wfs200_endpoint_join?SERVICE=WFS&VERSION=2.0.0&REQUEST=GetFeature&TYPENAMES=%28lyr1,lyr2%29&FILTER=%3CFilter%20xmlns%3D%22http:%2F%2Fwww.opengis.net%2Ffes%2F2.0%22%20xmlns:gml%3D%22http:%2F%2Fwww.opengis.net%2Fgml%2F3.2%22%3E%3CPropertyIsEqualTo%3E%3CValueReference%3Elyr1%2Fstr%3C%2FValueReference%3E%3CValueReference%3Elyr2%2Fstr2%3C%2FValueReference%3E%3C%2FPropertyIsEqualTo%3E%3C%2FFilter%3E&RESULTTYPE=hits',
@@ -4576,9 +4183,7 @@ def test_ogr_wfs_vsimem_wfs200_join(with_and_without_streaming):
     gdal.PushErrorHandler('CPLQuietErrorHandler')
     fc = sql_lyr.GetFeatureCount()
     gdal.PopErrorHandler()
-    if fc != 2:
-        print(gdal.GetLastErrorMsg())
-        return 'fail'
+    assert fc == 2, gdal.GetLastErrorMsg()
 
     # Server exception
     gdal.FileFromMemBuffer('/vsimem/wfs200_endpoint_join?SERVICE=WFS&VERSION=2.0.0&REQUEST=GetFeature&TYPENAMES=%28lyr1,lyr2%29&FILTER=%3CFilter%20xmlns%3D%22http:%2F%2Fwww.opengis.net%2Ffes%2F2.0%22%20xmlns:gml%3D%22http:%2F%2Fwww.opengis.net%2Fgml%2F3.2%22%3E%3CPropertyIsEqualTo%3E%3CValueReference%3Elyr1%2Fstr%3C%2FValueReference%3E%3CValueReference%3Elyr2%2Fstr2%3C%2FValueReference%3E%3C%2FPropertyIsEqualTo%3E%3C%2FFilter%3E&RESULTTYPE=hits',
@@ -4586,9 +4191,7 @@ def test_ogr_wfs_vsimem_wfs200_join(with_and_without_streaming):
     gdal.PushErrorHandler('CPLQuietErrorHandler')
     fc = sql_lyr.GetFeatureCount()
     gdal.PopErrorHandler()
-    if fc != 2:
-        print(gdal.GetLastErrorMsg())
-        return 'fail'
+    assert fc == 2, gdal.GetLastErrorMsg()
 
     # Missing FeatureCollection
     gdal.FileFromMemBuffer('/vsimem/wfs200_endpoint_join?SERVICE=WFS&VERSION=2.0.0&REQUEST=GetFeature&TYPENAMES=%28lyr1,lyr2%29&FILTER=%3CFilter%20xmlns%3D%22http:%2F%2Fwww.opengis.net%2Ffes%2F2.0%22%20xmlns:gml%3D%22http:%2F%2Fwww.opengis.net%2Fgml%2F3.2%22%3E%3CPropertyIsEqualTo%3E%3CValueReference%3Elyr1%2Fstr%3C%2FValueReference%3E%3CValueReference%3Elyr2%2Fstr2%3C%2FValueReference%3E%3C%2FPropertyIsEqualTo%3E%3C%2FFilter%3E&RESULTTYPE=hits',
@@ -4596,9 +4199,7 @@ def test_ogr_wfs_vsimem_wfs200_join(with_and_without_streaming):
     gdal.PushErrorHandler('CPLQuietErrorHandler')
     fc = sql_lyr.GetFeatureCount()
     gdal.PopErrorHandler()
-    if fc != 2:
-        print(gdal.GetLastErrorMsg())
-        return 'fail'
+    assert fc == 2, gdal.GetLastErrorMsg()
 
     # Missing FeatureCollection.numberMatched
     gdal.FileFromMemBuffer('/vsimem/wfs200_endpoint_join?SERVICE=WFS&VERSION=2.0.0&REQUEST=GetFeature&TYPENAMES=%28lyr1,lyr2%29&FILTER=%3CFilter%20xmlns%3D%22http:%2F%2Fwww.opengis.net%2Ffes%2F2.0%22%20xmlns:gml%3D%22http:%2F%2Fwww.opengis.net%2Fgml%2F3.2%22%3E%3CPropertyIsEqualTo%3E%3CValueReference%3Elyr1%2Fstr%3C%2FValueReference%3E%3CValueReference%3Elyr2%2Fstr2%3C%2FValueReference%3E%3C%2FPropertyIsEqualTo%3E%3C%2FFilter%3E&RESULTTYPE=hits',
@@ -4606,9 +4207,7 @@ def test_ogr_wfs_vsimem_wfs200_join(with_and_without_streaming):
     gdal.PushErrorHandler('CPLQuietErrorHandler')
     fc = sql_lyr.GetFeatureCount()
     gdal.PopErrorHandler()
-    if fc != 2:
-        print(gdal.GetLastErrorMsg())
-        return 'fail'
+    assert fc == 2, gdal.GetLastErrorMsg()
 
     # Valid
     gdal.FileFromMemBuffer('/vsimem/wfs200_endpoint_join?SERVICE=WFS&VERSION=2.0.0&REQUEST=GetFeature&TYPENAMES=%28lyr1,lyr2%29&FILTER=%3CFilter%20xmlns%3D%22http:%2F%2Fwww.opengis.net%2Ffes%2F2.0%22%20xmlns:gml%3D%22http:%2F%2Fwww.opengis.net%2Fgml%2F3.2%22%3E%3CPropertyIsEqualTo%3E%3CValueReference%3Elyr1%2Fstr%3C%2FValueReference%3E%3CValueReference%3Elyr2%2Fstr2%3C%2FValueReference%3E%3C%2FPropertyIsEqualTo%3E%3C%2FFilter%3E&RESULTTYPE=hits',
@@ -4628,9 +4227,7 @@ def test_ogr_wfs_vsimem_wfs200_join(with_and_without_streaming):
     gdal.PushErrorHandler('CPLQuietErrorHandler')
     fc = sql_lyr.GetFeatureCount()
     gdal.PopErrorHandler()
-    if fc != 3:
-        print(gdal.GetLastErrorMsg())
-        return 'fail'
+    assert fc == 3, gdal.GetLastErrorMsg()
 
     sql_lyr.TestCapability('foo')
     sql_lyr.GetLayerDefn()
@@ -4753,23 +4350,17 @@ def test_ogr_wfs_vsimem_wfs200_join(with_and_without_streaming):
     gdal.PushErrorHandler()
     sql_lyr = ds.ExecuteSQL("SELECT * FROM lyr1 JOIN lyr2 ON lyr1.str = lyr2.str2 WHERE lyr1.OGR_GEOMETRY IS NOT NULL")
     gdal.PopErrorHandler()
-    if sql_lyr is not None or gdal.GetLastErrorMsg().find('Unsupported WHERE clause') < 0:
-        print(gdal.GetLastErrorMsg())
-        return 'fail'
+    assert sql_lyr is None and gdal.GetLastErrorMsg().find('Unsupported WHERE clause') >= 0
 
     gdal.PushErrorHandler()
     sql_lyr = ds.ExecuteSQL("SELECT * FROM lyr1 JOIN lyr2 ON lyr1.OGR_GEOMETRY IS NOT NULL")
     gdal.PopErrorHandler()
-    if sql_lyr is not None or gdal.GetLastErrorMsg().find('Unsupported JOIN clause') < 0:
-        print(gdal.GetLastErrorMsg())
-        return 'fail'
+    assert sql_lyr is None and gdal.GetLastErrorMsg().find('Unsupported JOIN clause') >= 0
 
     gdal.PushErrorHandler()
     sql_lyr = ds.ExecuteSQL("SELECT 1 FROM lyr1 JOIN lyr2 ON lyr1.str = lyr2.str2")
     gdal.PopErrorHandler()
-    if sql_lyr is not None or gdal.GetLastErrorMsg().find('Only column names supported in column selection') < 0:
-        print(gdal.GetLastErrorMsg())
-        return 'fail'
+    assert sql_lyr is None and gdal.GetLastErrorMsg().find('Only column names supported in column selection') >= 0
 
     ds = None
 
@@ -5047,8 +4638,7 @@ def test_ogr_wfs_vsimem_wfs200_join_distinct(with_and_without_streaming):
   </wfs:member>
 </wfs:FeatureCollection>
 """)
-    if sql_lyr.GetFeatureCount() != 2:
-        return 'fail'
+    assert sql_lyr.GetFeatureCount() == 2
 
     ds.ReleaseResultSet(sql_lyr)
 
diff --git a/autotest/ogr/ogr_wfs3.py b/autotest/ogr/ogr_wfs3.py
index 3c2daaaa8440..4e60da04e301 100755
--- a/autotest/ogr/ogr_wfs3.py
+++ b/autotest/ogr/ogr_wfs3.py
@@ -69,8 +69,7 @@ def test_ogr_wfs3_errors():
     with webserver.install_http_handler(handler):
         with gdaltest.error_handler():
             ds = ogr.Open('WFS3:http://localhost:%d/wfs3' % gdaltest.webserver_port)
-    if ds is not None:
-        return 'fail'
+    assert ds is None
 
     # No Content-Type
     handler = webserver.SequentialHandler()
@@ -78,8 +77,7 @@ def test_ogr_wfs3_errors():
     with webserver.install_http_handler(handler):
         with gdaltest.error_handler():
             ds = ogr.Open('WFS3:http://localhost:%d/wfs3' % gdaltest.webserver_port)
-    if ds is not None:
-        return 'fail'
+    assert ds is None
 
     # Unexpected Content-Type
     handler = webserver.SequentialHandler()
@@ -88,8 +86,7 @@ def test_ogr_wfs3_errors():
     with webserver.install_http_handler(handler):
         with gdaltest.error_handler():
             ds = ogr.Open('WFS3:http://localhost:%d/wfs3' % gdaltest.webserver_port)
-    if ds is not None:
-        return 'fail'
+    assert ds is None
 
     # Invalid JSON
     handler = webserver.SequentialHandler()
@@ -98,8 +95,7 @@ def test_ogr_wfs3_errors():
     with webserver.install_http_handler(handler):
         with gdaltest.error_handler():
             ds = ogr.Open('WFS3:http://localhost:%d/wfs3' % gdaltest.webserver_port)
-    if ds is not None:
-        return 'fail'
+    assert ds is None
 
     # Valid JSON but not collections array
     handler = webserver.SequentialHandler()
@@ -108,8 +104,7 @@ def test_ogr_wfs3_errors():
     with webserver.install_http_handler(handler):
         with gdaltest.error_handler():
             ds = ogr.Open('WFS3:http://localhost:%d/wfs3' % gdaltest.webserver_port)
-    if ds is not None:
-        return 'fail'
+    assert ds is None
 
     # Valid JSON but collections is not an array
     handler = webserver.SequentialHandler()
@@ -119,8 +114,7 @@ def test_ogr_wfs3_errors():
     with webserver.install_http_handler(handler):
         with gdaltest.error_handler():
             ds = ogr.Open('WFS3:http://localhost:%d/wfs3' % gdaltest.webserver_port)
-    if ds is not None:
-        return 'fail'
+    assert ds is None
 
     handler = webserver.SequentialHandler()
     handler.add('GET', '/wfs3/collections', 200,
@@ -128,14 +122,10 @@ def test_ogr_wfs3_errors():
                 '{ "collections" : [ null, {} ] }')
     with webserver.install_http_handler(handler):
         ds = ogr.Open('WFS3:http://localhost:%d/wfs3' % gdaltest.webserver_port)
-    if ds is None:
-        return 'fail'
-    if ds.GetLayerCount() != 0:
-        return 'fail'
-    if ds.GetLayer(-1) is not None:
-        return 'fail'
-    if ds.GetLayer(0) is not None:
-        return 'fail'
+    assert ds is not None
+    assert ds.GetLayerCount() == 0
+    assert ds.GetLayer(-1) is None
+    assert ds.GetLayer(0) is None
 
     return 'success'
 
@@ -155,21 +145,17 @@ def test_ogr_wfs3_empty_layer():
                 '{ "collections" : [ { "name": "foo" }] }')
     with webserver.install_http_handler(handler):
         ds = ogr.Open('WFS3:http://localhost:%d/wfs3' % gdaltest.webserver_port)
-    if ds is None:
-        return 'fail'
-    if ds.GetLayerCount() != 1:
-        return 'fail'
+    assert ds is not None
+    assert ds.GetLayerCount() == 1
     lyr = ds.GetLayer(0)
-    if lyr.GetName() != 'foo':
-        return 'fail'
+    assert lyr.GetName() == 'foo'
 
     handler = webserver.SequentialHandler()
     handler.add('GET', '/wfs3/collections/foo/items?limit=10', 200,
                 {'Content-Type': 'application/geo+json'},
                 '{ "type": "FeatureCollection", "features": [] }')
     with webserver.install_http_handler(handler):
-        if lyr.GetLayerDefn().GetFieldCount() != 0:
-            return 'fail'
+        assert lyr.GetLayerDefn().GetFieldCount() == 0
 
     return 'success'
 
@@ -202,8 +188,7 @@ def test_ogr_wfs3_fc_links_next_geojson():
                     }
                 ] }""")
     with webserver.install_http_handler(handler):
-        if lyr.GetLayerDefn().GetFieldCount() != 1:
-            return 'fail'
+        assert lyr.GetLayerDefn().GetFieldCount() == 1
 
     handler = webserver.SequentialHandler()
     handler.add('GET', '/wfs3/collections/foo/items?limit=10', 200,
@@ -275,8 +260,7 @@ def test_ogr_wfs3_fc_links_next_headers():
                     }
                 ] }""")
     with webserver.install_http_handler(handler):
-        if lyr.GetLayerDefn().GetFieldCount() != 1:
-            return 'fail'
+        assert lyr.GetLayerDefn().GetFieldCount() == 1
 
     handler = webserver.SequentialHandler()
     link_val = '<http://data.example.org/buildings.json>; rel="self"; type="application/geo+json"\r\nLink: <http://localhost:%d/wfs3/foo_next>; rel="next"; type="application/geo+json"' % gdaltest.webserver_port
@@ -339,9 +323,7 @@ def test_ogr_wfs3_spatial_filter():
     with webserver.install_http_handler(handler):
         ds = ogr.Open('WFS3:http://localhost:%d/wfs3' % gdaltest.webserver_port)
     lyr = ds.GetLayer(0)
-    if lyr.GetExtent() != (-10.0, 15.0, 40.0, 50.0):
-        print(lyr.GetExtent())
-        return 'fail'
+    assert lyr.GetExtent() == (-10.0, 15.0, 40.0, 50.0)
 
     handler = webserver.SequentialHandler()
     handler.add('GET', '/wfs3/collections/foo/items?limit=10', 200,
@@ -355,8 +337,7 @@ def test_ogr_wfs3_spatial_filter():
                     }
                 ] }""")
     with webserver.install_http_handler(handler):
-        if lyr.GetLayerDefn().GetFieldCount() != 1:
-            return 'fail'
+        assert lyr.GetLayerDefn().GetFieldCount() == 1
 
     lyr.SetSpatialFilterRect(2, 49, 3, 50)
     handler = webserver.SequentialHandler()
@@ -376,8 +357,7 @@ def test_ogr_wfs3_spatial_filter():
                 ] }""")
     with webserver.install_http_handler(handler):
         f = lyr.GetNextFeature()
-    if f is None:
-        return 'fail'
+    assert f is not None
 
     lyr.SetSpatialFilter(None)
     lyr.ResetReading()
@@ -393,8 +373,7 @@ def test_ogr_wfs3_spatial_filter():
                 ] }""")
     with webserver.install_http_handler(handler):
         f = lyr.GetNextFeature()
-    if f is None:
-        return 'fail'
+    assert f is not None
 
     return 'success'
 
@@ -453,16 +432,14 @@ def test_ogr_wfs3_get_feature_count():
                 {'Content-Type': 'application/json'},
                 '{ "numberMatched": 1234 }')
     with webserver.install_http_handler(handler):
-        if lyr.GetFeatureCount() != 1234:
-            return 'fail'
+        assert lyr.GetFeatureCount() == 1234
 
     handler = webserver.SequentialHandler()
     handler.add('GET', '/wfs3/collections/foo/items?resultType=hits', 200,
                 {'Content-Type': 'application/json'},
                 '{ "numberMatched": 1234 }')
     with webserver.install_http_handler(handler):
-        if lyr.GetFeatureCount() != 1234:
-            return 'fail'
+        assert lyr.GetFeatureCount() == 1234
 
     return 'success'
 
@@ -545,8 +522,7 @@ def test_ogr_wfs3_attribute_filter():
                 ] }""")
     with webserver.install_http_handler(handler):
         f = lyr.GetNextFeature()
-    if f is None:
-        return 'fail'
+    assert f is not None
 
     lyr.ResetReading()
     lyr.SetAttributeFilter("attr1 = 'foo' OR attr3 = 'bar'")
@@ -564,8 +540,7 @@ def test_ogr_wfs3_attribute_filter():
                 ] }""")
     with webserver.install_http_handler(handler):
         f = lyr.GetNextFeature()
-    if f is None:
-        return 'fail'
+    assert f is not None
 
     lyr.ResetReading()
     lyr.SetAttributeFilter(None)
@@ -583,8 +558,7 @@ def test_ogr_wfs3_attribute_filter():
                 ] }""")
     with webserver.install_http_handler(handler):
         f = lyr.GetNextFeature()
-    if f is None:
-        return 'fail'
+    assert f is not None
 
     return 'success'
 
diff --git a/autotest/ogr/ogr_wkbwkt_geom.py b/autotest/ogr/ogr_wkbwkt_geom.py
index d22662ab6ec1..ac84c70a8330 100755
--- a/autotest/ogr/ogr_wkbwkt_geom.py
+++ b/autotest/ogr/ogr_wkbwkt_geom.py
@@ -63,25 +63,21 @@ def test_wkbwkt_geom(unit):
     # print(wkb_wkt)
     # print(normal_wkt)
     # print(raw_wkt)
-    if wkb_wkt != normal_wkt:
-        gdaltest.post_reason('WKT from WKB (%s) does not match clean WKT (%s).' % (wkb_wkt, normal_wkt))
-        return 'fail'
+    assert wkb_wkt == normal_wkt, \
+        ('WKT from WKB (%s) does not match clean WKT (%s).' % (wkb_wkt, normal_wkt))
 
     ######################################################################
     # Verify that the geometries appear to be the same.   This is
     # intended to catch problems with the encoding too WKT that might
     # cause passes above but that are mistaken.
-    if geom_wkb.GetCoordinateDimension() != geom_wkt.GetCoordinateDimension():
-        gdaltest.post_reason('Coordinate dimension differs!')
-        return 'fail'
+    assert geom_wkb.GetCoordinateDimension() == geom_wkt.GetCoordinateDimension(), \
+        'Coordinate dimension differs!'
 
-    if geom_wkb.GetGeometryType() != geom_wkt.GetGeometryType():
-        gdaltest.post_reason('Geometry type differs!')
-        return 'fail'
+    assert geom_wkb.GetGeometryType() == geom_wkt.GetGeometryType(), \
+        'Geometry type differs!'
 
-    if geom_wkb.GetGeometryName() != geom_wkt.GetGeometryName():
-        gdaltest.post_reason('Geometry name differs!')
-        return 'fail'
+    assert geom_wkb.GetGeometryName() == geom_wkt.GetGeometryName(), \
+        'Geometry name differs!'
 
 # It turns out this test is too picky about coordinate precision. skip.
 #       if geom_wkb.Equal( geom_wkt ) == 0:
@@ -99,20 +95,14 @@ def test_wkbwkt_geom(unit):
     wkb_xdr = geom_wkt.ExportToWkb(ogr.wkbXDR)
     geom_wkb = ogr.CreateGeometryFromWkb(wkb_xdr)
 
-    if str(geom_wkb) != str(geom_wkt):
-        print(geom_wkb)
-        print(geom_wkt)
-        gdaltest.post_reason('XDR WKB encoding/decoding failure.')
-        return 'fail'
+    assert str(geom_wkb) == str(geom_wkt), 'XDR WKB encoding/decoding failure.'
 
     geom_wkb.Destroy()
 
     wkb_ndr = geom_wkt.ExportToWkb(ogr.wkbNDR)
     geom_wkb = ogr.CreateGeometryFromWkb(wkb_ndr)
 
-    if str(geom_wkb) != str(geom_wkt):
-        gdaltest.post_reason('NDR WKB encoding/decoding failure.')
-        return 'fail'
+    assert str(geom_wkb) == str(geom_wkt), 'NDR WKB encoding/decoding failure.'
 
     geom_wkb.Destroy()
 
@@ -135,10 +125,7 @@ def test_ogr_wkbwkt_geom_bigexponents():
     expect = 'POINT (-1.79769313486e+308 -1.12345678901e+308 0)'
     wkt = geom.ExportToWkt()
 
-    if str(wkt) != str(expect):
-        print(wkt)
-        gdaltest.post_reason('trimming long float numbers failed.')
-        return 'fail'
+    assert str(wkt) == str(expect), 'trimming long float numbers failed.'
 
     return 'success'
 
@@ -376,10 +363,7 @@ def test_ogr_wkbwkt_test_broken_geom():
         gdal.PushErrorHandler('CPLQuietErrorHandler')
         geom = ogr.CreateGeometryFromWkt(wkt)
         gdal.PopErrorHandler()
-        if geom is not None:
-            gdaltest.post_reason(
-                'geom %s instantiated but not expected' % wkt)
-            return 'fail'
+        assert geom is None, ('geom %s instantiated but not expected' % wkt)
 
     return 'success'
 
@@ -500,16 +484,11 @@ def test_ogr_wkbwkt_test_import_wkt_sf12():
 
     for wkt_tuple in list_wkt_tuples:
         geom = ogr.CreateGeometryFromWkt(wkt_tuple[0])
-        if geom is None:
-            gdaltest.post_reason(
-                'could not instantiate geometry %s' % wkt_tuple[0])
-            return 'fail'
+        assert geom is not None, ('could not instantiate geometry %s' % wkt_tuple[0])
         out_wkt = geom.ExportToWkt()
-        if out_wkt != wkt_tuple[1]:
-            gdaltest.post_reason(
-                'in=%s, out=%s, expected=%s.' % (wkt_tuple[0], out_wkt,
+        assert out_wkt == wkt_tuple[1], \
+            ('in=%s, out=%s, expected=%s.' % (wkt_tuple[0], out_wkt,
                                                  wkt_tuple[1]))
-            return 'fail'
 
     return 'success'
 
@@ -525,8 +504,7 @@ def test_ogr_wkbwkt_test_import_bad_multipoint_wkb():
     gdal.PushErrorHandler('CPLQuietErrorHandler')
     geom = ogr.CreateGeometryFromWkb(wkb)
     gdal.PopErrorHandler()
-    if geom is not None:
-        return 'fail'
+    assert geom is None
 
     return 'success'
 
@@ -554,11 +532,7 @@ def test_ogr_wkbwkt_test_geometrycollection_wktwkb():
         wkb = g.ExportToWkb()
         g = ogr.CreateGeometryFromWkb(wkb)
         wkt2 = g.ExportToWkt()
-        if wkt != wkt2:
-            gdaltest.post_reason('fail for %s' % wkt)
-            print(wkt)
-            print(wkt2)
-            return 'fail'
+        assert wkt == wkt2, ('fail for %s' % wkt)
 
     return 'success'
 
@@ -571,19 +545,14 @@ def test_ogr_wkbwkt_test_geometrycollection_wkt_recursion():
     wkt = 'GEOMETRYCOLLECTION (' * 31 + 'GEOMETRYCOLLECTION EMPTY' + ')' * 31
 
     geom = ogr.CreateGeometryFromWkt(wkt)
-    if geom.ExportToWkt() != wkt:
-        gdaltest.post_reason('expected %s' % wkt)
-        print(geom.ExportToWkt())
-        return 'fail'
+    assert geom.ExportToWkt() == wkt, ('expected %s' % wkt)
 
     wkt = 'GEOMETRYCOLLECTION (' * 32 + 'GEOMETRYCOLLECTION EMPTY' + ')' * 32
 
     gdal.PushErrorHandler('CPLQuietErrorHandler')
     geom = ogr.CreateGeometryFromWkt(wkt)
     gdal.PopErrorHandler()
-    if geom is not None:
-        gdaltest.post_reason('expected None')
-        return 'fail'
+    assert geom is None, 'expected None'
 
     return 'success'
 
@@ -600,18 +569,14 @@ def test_ogr_wkbwkt_test_geometrycollection_wkb_recursion():
     wkb = wkb_repeat * 31 + wkb_end
 
     geom = ogr.CreateGeometryFromWkb(wkb)
-    if geom is None:
-        gdaltest.post_reason('expected a geometry')
-        return 'fail'
+    assert geom is not None, 'expected a geometry'
 
     wkb = struct.pack('B' * 0) + wkb_repeat * 32 + wkb_end
 
     gdal.PushErrorHandler('CPLQuietErrorHandler')
     geom = ogr.CreateGeometryFromWkb(wkb)
     gdal.PopErrorHandler()
-    if geom is not None:
-        gdaltest.post_reason('expected None')
-        return 'fail'
+    assert geom is None, 'expected None'
 
     return 'success'
 
@@ -624,9 +589,7 @@ def test_ogr_wkbwkt_export_wkt_iso_multipoint():
     wkt = 'MULTIPOINT ((0 0),(1 1))'
     g = ogr.CreateGeometryFromWkt(wkt)
     out_wkt = g.ExportToIsoWkt()
-    if out_wkt != wkt:
-        print(out_wkt)
-        return 'fail'
+    assert out_wkt == wkt
 
     return 'success'
 
@@ -639,9 +602,7 @@ def test_ogr_wkt_inf_nan():
     g = ogr.Geometry(ogr.wkbPoint)
     g.AddPoint(float('inf'), float('-inf'), float('nan'))
     out_wkt = g.ExportToWkt()
-    if out_wkt != 'POINT (inf -inf nan)':
-        print(out_wkt)
-        return 'fail'
+    assert out_wkt == 'POINT (inf -inf nan)'
 
     return 'success'
 
@@ -653,8 +614,7 @@ def test_ogr_wkt_multicurve_compoundcurve_corrupted():
 
     with gdaltest.error_handler():
         g = ogr.CreateGeometryFromWkt('MULTICURVE(COMPOUNDCURVE')
-    if g is not None:
-        return 'fail'
+    assert g is None
 
     return 'success'
 
@@ -666,8 +626,7 @@ def test_ogr_wkt_multipolygon_corrupted():
 
     with gdaltest.error_handler():
         g = ogr.CreateGeometryFromWkt('MULTIPOLYGON(POLYGON((N')
-    if g is not None:
-        return 'fail'
+    assert g is None
 
     return 'success'
 
diff --git a/autotest/ogr/ogr_wktempty.py b/autotest/ogr/ogr_wktempty.py
index 2313845f3edf..0e1af663544e 100755
--- a/autotest/ogr/ogr_wktempty.py
+++ b/autotest/ogr/ogr_wktempty.py
@@ -77,43 +77,38 @@ def test_ogr_wktempty_test_partial_empty_geoms():
     wkt = 'MULTIPOINT (1 1)'
     geom = ogr.CreateGeometryFromWkt(wkt)
     geom.AddGeometry(ogr.Geometry(type=ogr.wkbPoint))
-    if geom.ExportToWkt() != wkt:
-        gdaltest.post_reason('WKT is wrong: ' + geom.ExportToWkt() + '. Expected value is: ' + wkt)
-        return 'fail'
+    assert geom.ExportToWkt() == wkt, \
+        ('WKT is wrong: ' + geom.ExportToWkt() + '. Expected value is: ' + wkt)
 
     # Multipoint with an empty point and a valid point
     geom = ogr.CreateGeometryFromWkt('MULTIPOINT EMPTY')
     geom.AddGeometry(ogr.Geometry(type=ogr.wkbPoint))
     geom.AddGeometry(ogr.CreateGeometryFromWkt('POINT (1 1)'))
     wkt = 'MULTIPOINT (1 1)'
-    if geom.ExportToWkt() != wkt:
-        gdaltest.post_reason('WKT is wrong: ' + geom.ExportToWkt() + '. Expected value is: ' + wkt)
-        return 'fail'
+    assert geom.ExportToWkt() == wkt, \
+        ('WKT is wrong: ' + geom.ExportToWkt() + '. Expected value is: ' + wkt)
 
     # Multilinestring with a valid string and an empty linestring
     wkt = 'MULTILINESTRING ((0 1,2 3,4 5,0 1))'
     geom = ogr.CreateGeometryFromWkt(wkt)
     geom.AddGeometry(ogr.Geometry(type=ogr.wkbLineString))
-    if geom.ExportToWkt() != wkt:
-        gdaltest.post_reason('WKT is wrong: ' + geom.ExportToWkt() + '. Expected value is: ' + wkt)
-        return 'fail'
+    assert geom.ExportToWkt() == wkt, \
+        ('WKT is wrong: ' + geom.ExportToWkt() + '. Expected value is: ' + wkt)
 
     # Multilinestring with an empty linestring and a valid linestring
     geom = ogr.CreateGeometryFromWkt('MULTILINESTRING EMPTY')
     geom.AddGeometry(ogr.Geometry(type=ogr.wkbLineString))
     geom.AddGeometry(ogr.CreateGeometryFromWkt('LINESTRING (0 1,2 3,4 5,0 1)'))
     wkt = 'MULTILINESTRING ((0 1,2 3,4 5,0 1))'
-    if geom.ExportToWkt() != wkt:
-        gdaltest.post_reason('WKT is wrong: ' + geom.ExportToWkt() + '. Expected value is: ' + wkt)
-        return 'fail'
+    assert geom.ExportToWkt() == wkt, \
+        ('WKT is wrong: ' + geom.ExportToWkt() + '. Expected value is: ' + wkt)
 
     # Polygon with a valid external ring and an empty internal ring
     wkt = 'POLYGON ((100 0,100 10,110 10,100 0))'
     geom = ogr.CreateGeometryFromWkt(wkt)
     geom.AddGeometry(ogr.Geometry(type=ogr.wkbLinearRing))
-    if geom.ExportToWkt() != wkt:
-        gdaltest.post_reason('WKT is wrong: ' + geom.ExportToWkt() + '. Expected value is: ' + wkt)
-        return 'fail'
+    assert geom.ExportToWkt() == wkt, \
+        ('WKT is wrong: ' + geom.ExportToWkt() + '. Expected value is: ' + wkt)
 
     # Polygon with an empty external ring and a valid internal ring
     wkt = 'POLYGON EMPTY'
@@ -126,26 +121,23 @@ def test_ogr_wktempty_test_partial_empty_geoms():
     ring.AddPoint_2D(0, 10)
     ring.AddPoint_2D(0, 0)
     geom.AddGeometry(ring)
-    if geom.ExportToWkt() != wkt:
-        gdaltest.post_reason('WKT is wrong: ' + geom.ExportToWkt() + '. Expected value is: ' + wkt)
-        return 'fail'
+    assert geom.ExportToWkt() == wkt, \
+        ('WKT is wrong: ' + geom.ExportToWkt() + '. Expected value is: ' + wkt)
 
     # Multipolygon with a valid polygon and an empty polygon
     wkt = 'MULTIPOLYGON (((0 0,0 10,10 10,0 0)))'
     geom = ogr.CreateGeometryFromWkt(wkt)
     geom.AddGeometry(ogr.Geometry(type=ogr.wkbPolygon))
-    if geom.ExportToWkt() != wkt:
-        gdaltest.post_reason('WKT is wrong: ' + geom.ExportToWkt() + '. Expected value is: ' + wkt)
-        return 'fail'
+    assert geom.ExportToWkt() == wkt, \
+        ('WKT is wrong: ' + geom.ExportToWkt() + '. Expected value is: ' + wkt)
 
     # Multipolygon with an empty polygon and a valid polygon
     geom = ogr.CreateGeometryFromWkt('MULTIPOLYGON EMPTY')
     geom.AddGeometry(ogr.Geometry(type=ogr.wkbPolygon))
     geom.AddGeometry(ogr.CreateGeometryFromWkt('POLYGON ((100 0,100 10,110 10,100 0))'))
     wkt = 'MULTIPOLYGON (((100 0,100 10,110 10,100 0)))'
-    if geom.ExportToWkt() != wkt:
-        gdaltest.post_reason('WKT is wrong: ' + geom.ExportToWkt() + '. Expected value is: ' + wkt)
-        return 'fail'
+    assert geom.ExportToWkt() == wkt, \
+        ('WKT is wrong: ' + geom.ExportToWkt() + '. Expected value is: ' + wkt)
 
     return 'success'
 
diff --git a/autotest/ogr/ogr_xls.py b/autotest/ogr/ogr_xls.py
index 0ba31d75ef30..0a298fe5f8e0 100755
--- a/autotest/ogr/ogr_xls.py
+++ b/autotest/ogr/ogr_xls.py
@@ -46,51 +46,33 @@ def test_ogr_xls_1():
     if drv is None:
         return 'skip'
 
-    if drv.TestCapability("foo") != 0:
-        return 'fail'
+    assert drv.TestCapability("foo") == 0
 
     ds = ogr.Open('data/test972000xp.xls')
-    if ds is None:
-        gdaltest.post_reason('cannot open dataset')
-        return 'fail'
+    assert ds is not None, 'cannot open dataset'
 
-    if ds.TestCapability("foo") != 0:
-        return 'fail'
+    assert ds.TestCapability("foo") == 0
 
-    if ds.GetLayerCount() != 1:
-        gdaltest.post_reason('bad layer count')
-        return 'fail'
+    assert ds.GetLayerCount() == 1, 'bad layer count'
 
     lyr = ds.GetLayer(0)
-    if lyr.GetName() != 'Feuille1':
-        gdaltest.post_reason('bad layer name')
-        return 'fail'
+    assert lyr.GetName() == 'Feuille1', 'bad layer name'
 
-    if lyr.GetGeomType() != ogr.wkbNone:
-        gdaltest.post_reason('bad layer geometry type')
-        return 'fail'
+    assert lyr.GetGeomType() == ogr.wkbNone, 'bad layer geometry type'
 
-    if lyr.GetSpatialRef() is not None:
-        gdaltest.post_reason('bad spatial ref')
-        return 'fail'
+    assert lyr.GetSpatialRef() is None, 'bad spatial ref'
 
-    if lyr.GetFeatureCount() != 3:
-        print(lyr.GetFeatureCount())
-        return 'fail'
+    assert lyr.GetFeatureCount() == 3
 
-    if lyr.TestCapability("foo") != 0:
-        return 'fail'
+    assert lyr.TestCapability("foo") == 0
 
-    if lyr.GetLayerDefn().GetFieldCount() != 5:
-        print(lyr.GetLayerDefn().GetFieldCount())
-        return 'fail'
+    assert lyr.GetLayerDefn().GetFieldCount() == 5
 
-    if lyr.GetLayerDefn().GetFieldDefn(0).GetType() != ogr.OFTInteger or \
-       lyr.GetLayerDefn().GetFieldDefn(1).GetType() != ogr.OFTReal or \
-       lyr.GetLayerDefn().GetFieldDefn(2).GetType() != ogr.OFTString or \
-       lyr.GetLayerDefn().GetFieldDefn(3).GetType() != ogr.OFTDate or \
-       lyr.GetLayerDefn().GetFieldDefn(4).GetType() != ogr.OFTDateTime:
-        return 'fail'
+    assert (lyr.GetLayerDefn().GetFieldDefn(0).GetType() == ogr.OFTInteger and \
+       lyr.GetLayerDefn().GetFieldDefn(1).GetType() == ogr.OFTReal and \
+       lyr.GetLayerDefn().GetFieldDefn(2).GetType() == ogr.OFTString and \
+       lyr.GetLayerDefn().GetFieldDefn(3).GetType() == ogr.OFTDate and \
+       lyr.GetLayerDefn().GetFieldDefn(4).GetType() == ogr.OFTDateTime)
 
     feat = lyr.GetNextFeature()
     if feat.GetFieldAsInteger(0) != 1 or \
@@ -104,8 +86,7 @@ def test_ogr_xls_1():
     feat = lyr.GetNextFeature()
     feat = lyr.GetNextFeature()
     feat = lyr.GetNextFeature()
-    if feat is not None:
-        return 'fail'
+    assert feat is None
 
     return 'success'
 
@@ -124,9 +105,7 @@ def test_ogr_xls_2():
 
     lyr = ds.GetLayer(0)
 
-    if lyr.GetFeatureCount() != 4:
-        print(lyr.GetFeatureCount())
-        return 'fail'
+    assert lyr.GetFeatureCount() == 4
 
     gdal.SetConfigOption('OGR_XLS_HEADERS', None)
 
@@ -147,8 +126,7 @@ def test_ogr_xls_3():
 
     lyr = ds.GetLayer(0)
 
-    if lyr.GetLayerDefn().GetFieldDefn(0).GetType() != ogr.OFTString:
-        return 'fail'
+    assert lyr.GetLayerDefn().GetFieldDefn(0).GetType() == ogr.OFTString
 
     gdal.SetConfigOption('OGR_XLS_FIELD_TYPES', None)
 
@@ -170,9 +148,7 @@ def test_ogr_xls_4():
 
     ret = gdaltest.runexternal(test_cli_utilities.get_test_ogrsf_path() + ' -ro data/test972000xp.xls')
 
-    if ret.find('INFO') == -1 or ret.find('ERROR') != -1:
-        print(ret)
-        return 'fail'
+    assert ret.find('INFO') != -1 and ret.find('ERROR') == -1
 
     return 'success'
 
diff --git a/autotest/ogr/ogr_xlsx.py b/autotest/ogr/ogr_xlsx.py
index 393e1942df36..0c99951fe8bc 100755
--- a/autotest/ogr/ogr_xlsx.py
+++ b/autotest/ogr/ogr_xlsx.py
@@ -43,41 +43,25 @@
 
 def ogr_xlsx_check(ds):
 
-    if ds.TestCapability("foo") != 0:
-        return 'fail'
+    assert ds.TestCapability("foo") == 0
 
-    if ds.GetLayerCount() != 8:
-        gdaltest.post_reason('bad layer count')
-        return 'fail'
+    assert ds.GetLayerCount() == 8, 'bad layer count'
 
     lyr = ds.GetLayer(0)
-    if lyr.GetName() != 'Feuille1':
-        gdaltest.post_reason('bad layer name')
-        return 'fail'
+    assert lyr.GetName() == 'Feuille1', 'bad layer name'
 
-    if lyr.GetGeomType() != ogr.wkbNone:
-        gdaltest.post_reason('bad layer geometry type')
-        return 'fail'
+    assert lyr.GetGeomType() == ogr.wkbNone, 'bad layer geometry type'
 
-    if lyr.GetSpatialRef() is not None:
-        gdaltest.post_reason('bad spatial ref')
-        return 'fail'
+    assert lyr.GetSpatialRef() is None, 'bad spatial ref'
 
-    if lyr.GetFeatureCount() != 26:
-        print(lyr.GetFeatureCount())
-        return 'fail'
+    assert lyr.GetFeatureCount() == 26
 
-    if lyr.TestCapability("foo") != 0:
-        return 'fail'
+    assert lyr.TestCapability("foo") == 0
 
     lyr = ds.GetLayer(6)
-    if lyr.GetName() != 'Feuille7':
-        gdaltest.post_reason('bad layer name')
-        return 'fail'
+    assert lyr.GetName() == 'Feuille7', 'bad layer name'
 
-    if lyr.GetLayerDefn().GetFieldCount() != 12:
-        print(lyr.GetLayerDefn().GetFieldCount())
-        return 'fail'
+    assert lyr.GetLayerDefn().GetFieldCount() == 12
 
     type_array = [ogr.OFTString,
                   ogr.OFTInteger,
@@ -93,9 +77,7 @@ def ogr_xlsx_check(ds):
                   ogr.OFTDateTime]
 
     for i, typ in enumerate(type_array):
-        if lyr.GetLayerDefn().GetFieldDefn(i).GetType() != typ:
-            print(i)
-            return 'fail'
+        assert lyr.GetLayerDefn().GetFieldDefn(i).GetType() == typ
 
     feat = lyr.GetNextFeature()
     if feat.GetFieldAsString(0) != 'val' or \
@@ -124,13 +106,10 @@ def test_ogr_xlsx_1():
     if drv is None:
         return 'skip'
 
-    if drv.TestCapability("foo") != 0:
-        return 'fail'
+    assert drv.TestCapability("foo") == 0
 
     ds = ogr.Open('data/test.xlsx')
-    if ds is None:
-        gdaltest.post_reason('cannot open dataset')
-        return 'fail'
+    assert ds is not None, 'cannot open dataset'
 
     return ogr_xlsx_check(ds)
 
@@ -149,9 +128,7 @@ def test_ogr_xlsx_2():
 
     lyr = ds.GetLayerByName('Feuille7')
 
-    if lyr.GetFeatureCount() != 3:
-        print(lyr.GetFeatureCount())
-        return 'fail'
+    assert lyr.GetFeatureCount() == 3
 
     gdal.SetConfigOption('OGR_XLSX_HEADERS', None)
 
@@ -172,8 +149,7 @@ def test_ogr_xlsx_3():
 
     lyr = ds.GetLayerByName('Feuille7')
 
-    if lyr.GetLayerDefn().GetFieldDefn(1).GetType() != ogr.OFTString:
-        return 'fail'
+    assert lyr.GetLayerDefn().GetFieldDefn(1).GetType() == ogr.OFTString
 
     gdal.SetConfigOption('OGR_XLSX_FIELD_TYPES', None)
 
@@ -195,9 +171,7 @@ def test_ogr_xlsx_4():
 
     ret = gdaltest.runexternal(test_cli_utilities.get_test_ogrsf_path() + ' -ro data/test.xlsx')
 
-    if ret.find('INFO') == -1 or ret.find('ERROR') != -1:
-        print(ret)
-        return 'fail'
+    assert ret.find('INFO') != -1 and ret.find('ERROR') == -1
 
     return 'success'
 
@@ -241,19 +215,14 @@ def test_ogr_xlsx_6():
 
     lyr = ds.GetLayerByName('inlineStr')
 
-    if lyr.GetFeatureCount() != 1:
-        print(lyr.GetFeatureCount())
-        return 'fail'
+    assert lyr.GetFeatureCount() == 1
 
     lyr.ResetReading()
     feat = lyr.GetNextFeature()
-    if feat.Bl_District_t != 'text6':
-        gdaltest.post_reason('Did not get expected value(1)')
-        return 'fail'
+    assert feat.Bl_District_t == 'text6', 'Did not get expected value(1)'
 
-    if abs(float(feat.GetField('Lat')) - 23.6247122) > 0.00001:
-        gdaltest.post_reason('Did not get expected value(2)')
-        return 'fail'
+    assert abs(float(feat.GetField('Lat')) - 23.6247122) <= 0.00001, \
+        'Did not get expected value(2)'
 
     gdal.SetConfigOption('OGR_XLSX_HEADERS', None)
 
@@ -327,9 +296,7 @@ def test_ogr_xlsx_8():
     content = gdal.VSIFReadL(1, 10000, f)
     gdal.VSIFCloseL(f)
 
-    if str(content).find('<c r="AA1" t="s">') < 0:
-        print(content)
-        return 'fail'
+    assert str(content).find('<c r="AA1" t="s">') >= 0
 
     gdal.Unlink('/vsimem/ogr_xlsx_8.xlsx')
 
@@ -362,12 +329,10 @@ def test_ogr_xlsx_9():
 
     ds = ogr.Open('/vsimem/ogr_xlsx_9.xlsx')
     lyr = ds.GetLayer(0)
-    if lyr.GetLayerDefn().GetFieldDefn(0).GetType() != ogr.OFTInteger64:
-        return 'fail'
+    assert lyr.GetLayerDefn().GetFieldDefn(0).GetType() == ogr.OFTInteger64
     f = lyr.GetNextFeature()
     f = lyr.GetNextFeature()
-    if f.GetField(0) != 12345678901234:
-        return 'fail'
+    assert f.GetField(0) == 12345678901234
     ds = None
 
     gdal.Unlink('/vsimem/ogr_xlsx_9.xlsx')
@@ -400,8 +365,7 @@ def test_ogr_xlsx_10():
     ds = ogr.Open('/vsimem/ogr_xlsx_10.xlsx')
     lyr = ds.GetLayer(0)
     for i in range(3):
-        if lyr.GetLayerDefn().GetFieldDefn(i).GetType() != ogr.OFTDateTime:
-            return 'fail'
+        assert lyr.GetLayerDefn().GetFieldDefn(i).GetType() == ogr.OFTDateTime
     f = lyr.GetNextFeature()
     if f.GetField(0) != '2015/12/23 12:34:56.789':
         f.DumpReadable()
@@ -453,8 +417,7 @@ def test_ogr_xlsx_12():
     ds = ogr.Open('data/absolute_sheet_filename.xlsx')
     lyr = ds.GetLayer(0)
     f = lyr.GetNextFeature()
-    if f is None:
-        return 'fail'
+    assert f is not None
     ds = None
 
     return 'success'
@@ -473,17 +436,13 @@ def test_ogr_xlsx_13():
     ds = ogr.Open('data/test_missing_row1_data.xlsx')
 
     lyr = ds.GetLayer(0)
-    if lyr.GetName() != 'Sheet1':
-        gdaltest.post_reason('bad layer name')
-        return 'fail'
+    assert lyr.GetName() == 'Sheet1', 'bad layer name'
 
-    if lyr.GetLayerDefn().GetFieldDefn(0).GetName() != 'Asset Reference':
-        gdaltest.post_reason('invalid field name')
-        return 'fail'
+    assert lyr.GetLayerDefn().GetFieldDefn(0).GetName() == 'Asset Reference', \
+        'invalid field name'
 
-    if lyr.GetLayerDefn().GetFieldCount() != 18:
-        gdaltest.post_reason('invalid field count ({})'.format(lyr.GetLayerDefn().GetFieldCount()))
-        return 'fail'
+    assert lyr.GetLayerDefn().GetFieldCount() == 18, \
+        'invalid field count ({})'.format(lyr.GetLayerDefn().GetFieldCount())
 
     type_array = [ogr.OFTInteger,
                   ogr.OFTString,
@@ -505,9 +464,8 @@ def test_ogr_xlsx_13():
                   ogr.OFTString]
 
     for i, typ in enumerate(type_array):
-        if lyr.GetLayerDefn().GetFieldDefn(i).GetType() != typ:
-            gdaltest.post_reason('invalid type for field {}'.format(i + 1))
-            return 'fail'
+        assert lyr.GetLayerDefn().GetFieldDefn(i).GetType() == typ, \
+            'invalid type for field {}'.format(i + 1)
 
     return 'success'
 
@@ -525,17 +483,13 @@ def test_ogr_xlsx_14():
     ds = ogr.Open('data/test_empty_last_field.xlsx')
 
     lyr = ds.GetLayer(0)
-    if lyr.GetName() != 'Sheet1':
-        gdaltest.post_reason('bad layer name')
-        return 'fail'
+    assert lyr.GetName() == 'Sheet1', 'bad layer name'
 
-    if lyr.GetLayerDefn().GetFieldDefn(0).GetName() != 'Asset Reference':
-        gdaltest.post_reason('invalid field name')
-        return 'fail'
+    assert lyr.GetLayerDefn().GetFieldDefn(0).GetName() == 'Asset Reference', \
+        'invalid field name'
 
-    if lyr.GetLayerDefn().GetFieldCount() != 18:
-        gdaltest.post_reason('invalid field count ({})'.format(lyr.GetLayerDefn().GetFieldCount()))
-        return 'fail'
+    assert lyr.GetLayerDefn().GetFieldCount() == 18, \
+        'invalid field count ({})'.format(lyr.GetLayerDefn().GetFieldCount())
 
     type_array = [ogr.OFTInteger,
                   ogr.OFTString,
@@ -557,9 +511,8 @@ def test_ogr_xlsx_14():
                   ogr.OFTString]
 
     for i, typ in enumerate(type_array):
-        if lyr.GetLayerDefn().GetFieldDefn(i).GetType() != typ:
-            gdaltest.post_reason('invalid type for field {}'.format(i + 1))
-            return 'fail'
+        assert lyr.GetLayerDefn().GetFieldDefn(i).GetType() == typ, \
+            'invalid type for field {}'.format(i + 1)
 
     return 'success'
 
@@ -578,10 +531,8 @@ def test_ogr_xlsx_15():
     gdal.VectorTranslate(out_filename, 'data/poly.shp', options='-update -nln second')
 
     ds = ogr.Open(out_filename)
-    if ds.GetLayerByName('first').GetFeatureCount() == 0:
-        return 'fail'
-    if ds.GetLayerByName('second').GetFeatureCount() == 0:
-        return 'fail'
+    assert ds.GetLayerByName('first').GetFeatureCount() != 0
+    assert ds.GetLayerByName('second').GetFeatureCount() != 0
     ds = None
 
     gdal.Unlink(out_filename)
@@ -611,13 +562,10 @@ def test_ogr_xlsx_boolean():
 
     ds = ogr.Open(out_filename)
     lyr = ds.GetLayer(0)
-    if lyr.GetLayerDefn().GetFieldDefn(0).GetType() != ogr.OFTInteger:
-        return 'fail'
-    if lyr.GetLayerDefn().GetFieldDefn(0).GetSubType() != ogr.OFSTBoolean:
-        return 'fail'
+    assert lyr.GetLayerDefn().GetFieldDefn(0).GetType() == ogr.OFTInteger
+    assert lyr.GetLayerDefn().GetFieldDefn(0).GetSubType() == ogr.OFSTBoolean
     f = lyr.GetNextFeature()
-    if f.GetField(0) != 1:
-        return 'fail'
+    assert f.GetField(0) == 1
     ds = None
 
     gdal.Unlink(out_filename)
diff --git a/autotest/ogr/ogr_xplane.py b/autotest/ogr/ogr_xplane.py
index d4973edb0d3d..5d2f2fb578df 100755
--- a/autotest/ogr/ogr_xplane.py
+++ b/autotest/ogr/ogr_xplane.py
@@ -42,8 +42,7 @@ def test_ogr_xplane_apt_dat():
 
     xplane_apt_ds = ogr.Open('data/apt.dat')
 
-    if xplane_apt_ds is None:
-        return 'fail'
+    assert xplane_apt_ds is not None
 
     layers = [('APT', 8, [('apt_icao', 'E46')]),
               ('RunwayPolygon', 19, [('apt_icao', 'E46')]),
@@ -67,16 +66,11 @@ def test_ogr_xplane_apt_dat():
 
     for layer in layers:
         lyr = xplane_apt_ds.GetLayerByName(layer[0])
-        if lyr.GetFeatureCount() != layer[1]:
-            gdaltest.post_reason('wrong number of features for layer %s : %d. %d were expected ' % (layer[0], lyr.GetFeatureCount(), layer[1]))
-            return 'fail'
+        assert lyr.GetFeatureCount() == layer[1], \
+            ('wrong number of features for layer %s : %d. %d were expected ' % (layer[0], lyr.GetFeatureCount(), layer[1]))
         feat_read = lyr.GetNextFeature()
         for item in layer[2]:
-            if feat_read.GetField(item[0]) != item[1]:
-                print(layer[0])
-                print(item[0])
-                print(feat_read.GetField(item[0]))
-                return 'fail'
+            assert feat_read.GetField(item[0]) == item[1], layer[0]
 
     return 'success'
 
@@ -88,8 +82,7 @@ def test_ogr_xplane_apt_v810_dat():
 
     xplane_apt_ds = ogr.Open('data/apt810/apt.dat')
 
-    if xplane_apt_ds is None:
-        return 'fail'
+    assert xplane_apt_ds is not None
 
     layers = [('APT', 6, [('apt_icao', 'UHP1')]),
               ('RunwayPolygon', 6, [('apt_icao', 'UHP1')]),
@@ -113,16 +106,11 @@ def test_ogr_xplane_apt_v810_dat():
 
     for layer in layers:
         lyr = xplane_apt_ds.GetLayerByName(layer[0])
-        if lyr.GetFeatureCount() != layer[1]:
-            gdaltest.post_reason('wrong number of features for layer %s : %d. %d were expected ' % (layer[0], lyr.GetFeatureCount(), layer[1]))
-            return 'fail'
+        assert lyr.GetFeatureCount() == layer[1], \
+            ('wrong number of features for layer %s : %d. %d were expected ' % (layer[0], lyr.GetFeatureCount(), layer[1]))
         feat_read = lyr.GetNextFeature()
         for item in layer[2]:
-            if feat_read.GetField(item[0]) != item[1]:
-                print(layer[0])
-                print(item[0])
-                print(feat_read.GetField(item[0]))
-                return 'fail'
+            assert feat_read.GetField(item[0]) == item[1], layer[0]
 
     return 'success'
 
@@ -134,8 +122,7 @@ def test_ogr_xplane_nav_dat():
 
     xplane_nav_ds = ogr.Open('data/nav.dat')
 
-    if xplane_nav_ds is None:
-        return 'fail'
+    assert xplane_nav_ds is not None
 
     layers = [('ILS', 6, [('navaid_id', 'IMQS')]),
               ('VOR', 3, [('navaid_id', 'AAL')]),
@@ -148,16 +135,11 @@ def test_ogr_xplane_nav_dat():
 
     for layer in layers:
         lyr = xplane_nav_ds.GetLayerByName(layer[0])
-        if lyr.GetFeatureCount() != layer[1]:
-            gdaltest.post_reason('wrong number of features for layer %s : %d. %d were expected ' % (layer[0], lyr.GetFeatureCount(), layer[1]))
-            return 'fail'
+        assert lyr.GetFeatureCount() == layer[1], \
+            ('wrong number of features for layer %s : %d. %d were expected ' % (layer[0], lyr.GetFeatureCount(), layer[1]))
         feat_read = lyr.GetNextFeature()
         for item in layer[2]:
-            if feat_read.GetField(item[0]) != item[1]:
-                print(layer[0])
-                print(item[0])
-                print(feat_read.GetField(item[0]))
-                return 'fail'
+            assert feat_read.GetField(item[0]) == item[1], layer[0]
 
     xplane_nav_ds = None
 
@@ -171,8 +153,7 @@ def test_ogr_xplane_awy_dat():
 
     xplane_awy_ds = ogr.Open('data/awy.dat')
 
-    if xplane_awy_ds is None:
-        return 'fail'
+    assert xplane_awy_ds is not None
 
     layers = [('AirwaySegment', 11, [('segment_name', 'R464')]),
               ('AirwayIntersection', 14, [('name', '00MKK')])
@@ -180,16 +161,11 @@ def test_ogr_xplane_awy_dat():
 
     for layer in layers:
         lyr = xplane_awy_ds.GetLayerByName(layer[0])
-        if lyr.GetFeatureCount() != layer[1]:
-            gdaltest.post_reason('wrong number of features for layer %s : %d. %d were expected ' % (layer[0], lyr.GetFeatureCount(), layer[1]))
-            return 'fail'
+        assert lyr.GetFeatureCount() == layer[1], \
+            ('wrong number of features for layer %s : %d. %d were expected ' % (layer[0], lyr.GetFeatureCount(), layer[1]))
         feat_read = lyr.GetNextFeature()
         for item in layer[2]:
-            if feat_read.GetField(item[0]) != item[1]:
-                print(layer[0])
-                print(item[0])
-                print(feat_read.GetField(item[0]))
-                return 'fail'
+            assert feat_read.GetField(item[0]) == item[1], layer[0]
 
     return 'success'
 
@@ -201,24 +177,18 @@ def test_ogr_xplane_fix_dat():
 
     xplane_fix_ds = ogr.Open('data/fix.dat')
 
-    if xplane_fix_ds is None:
-        return 'fail'
+    assert xplane_fix_ds is not None
 
     layers = [('FIX', 1, [('fix_name', '00MKK')])
               ]
 
     for layer in layers:
         lyr = xplane_fix_ds.GetLayerByName(layer[0])
-        if lyr.GetFeatureCount() != layer[1]:
-            gdaltest.post_reason('wrong number of features for layer %s : %d. %d were expected ' % (layer[0], lyr.GetFeatureCount(), layer[1]))
-            return 'fail'
+        assert lyr.GetFeatureCount() == layer[1], \
+            ('wrong number of features for layer %s : %d. %d were expected ' % (layer[0], lyr.GetFeatureCount(), layer[1]))
         feat_read = lyr.GetNextFeature()
         for item in layer[2]:
-            if feat_read.GetField(item[0]) != item[1]:
-                print(layer[0])
-                print(item[0])
-                print(feat_read.GetField(item[0]))
-                return 'fail'
+            assert feat_read.GetField(item[0]) == item[1], layer[0]
 
     return 'success'
 
diff --git a/autotest/ogr/ograpispy.py b/autotest/ogr/ograpispy.py
index 5c9dde2be390..ae1afc134b2b 100755
--- a/autotest/ogr/ograpispy.py
+++ b/autotest/ogr/ograpispy.py
@@ -102,14 +102,12 @@ def test_ograpispy_2():
 
     ds = ogr.Open('tmp/snapshot_1/source/ograpispy_2.shp')
     lyr = ds.GetLayer(0)
-    if lyr.GetFeatureCount() != 0:
-        return 'fail'
+    assert lyr.GetFeatureCount() == 0
     ds = None
 
     ds = ogr.Open('tmp/snapshot_1/working/ograpispy_2.shp', update=1)
     lyr = ds.GetLayer(0)
-    if lyr.GetFeatureCount() != 1:
-        return 'fail'
+    assert lyr.GetFeatureCount() == 1
 
     # Add a feature to check that running the script will work
     lyr.CreateFeature(ogr.Feature(lyr.GetLayerDefn()))
@@ -120,9 +118,7 @@ def test_ograpispy_2():
 
     ds = ogr.Open('tmp/snapshot_1/working/ograpispy_2.shp')
     lyr = ds.GetLayer(0)
-    if lyr.GetFeatureCount() != 1:
-        print(lyr.GetFeatureCount())
-        return 'fail'
+    assert lyr.GetFeatureCount() == 1
     ds = None
 
     shutil.rmtree('tmp/snapshot_1/working')
diff --git a/autotest/osr/osr_basic.py b/autotest/osr/osr_basic.py
index 029e5196a55f..f438cf1d85c9 100755
--- a/autotest/osr/osr_basic.py
+++ b/autotest/osr/osr_basic.py
@@ -36,6 +36,7 @@
 
 import gdaltest
 from osgeo import osr
+import pytest
 
 
 ###############################################################################
@@ -48,14 +49,12 @@ def test_osr_basic_1():
     utm_srs.SetUTM(11, 0)
     utm_srs.SetWellKnownGeogCS('WGS84')
 
-    if utm_srs.GetUTMZone() != -11:
-        return 'fail'
+    assert utm_srs.GetUTMZone() == -11
 
     # Northern hemisphere
     utm_srs.SetUTM(11)
 
-    if utm_srs.GetUTMZone() != 11:
-        return 'fail'
+    assert utm_srs.GetUTMZone() == 11
 
     parm_list = \
         [(osr.SRS_PP_CENTRAL_MERIDIAN, -117.0),
@@ -66,26 +65,22 @@ def test_osr_basic_1():
 
     for parm in parm_list:
         value = utm_srs.GetProjParm(parm[0], -1111)
-        if abs(value - parm[1]) > .00000000000010:
-            gdaltest.post_reason('got %g for %s instead of %g.'
+        assert abs(value - parm[1]) <= .00000000000010, ('got %g for %s instead of %g.'
                                  % (value, parm[0], parm[1]))
-            return 'fail'
 
     auth_list = [('GEOGCS', '4326'),
                  ('DATUM', '6326')]
 
     for auth in auth_list:
-        if utm_srs.GetAuthorityName(auth[0]) != 'EPSG':
-            gdaltest.post_reason('Got authority %s instead of EPSG for %s'
+        assert utm_srs.GetAuthorityName(auth[0]) == 'EPSG', \
+            ('Got authority %s instead of EPSG for %s'
                                  % (utm_srs.GetAuthorityName(auth[0]),
                                      auth[0]))
-            return 'fail'
 
-        if str(utm_srs.GetAuthorityCode(auth[0])) != auth[1]:
-            gdaltest.post_reason('Got code %s instead of %s for %s'
+        assert str(utm_srs.GetAuthorityCode(auth[0])) == auth[1], \
+            ('Got code %s instead of %s for %s'
                                  % (utm_srs.GetAuthorityName(auth[0]),
                                      auth[1], auth[0]))
-            return 'fail'
 
     return 'success'
 
@@ -109,10 +104,9 @@ def test_osr_basic_2():
 
     for parm in parm_list:
         value = srs.GetProjParm(parm[0], -1111)
-        if not gdaltest.approx_equal(parm[1], value):
-            gdaltest.post_reason('got %.16g for %s instead of %.16g.'
+        assert gdaltest.approx_equal(parm[1], value), \
+            ('got %.16g for %s instead of %.16g.'
                                  % (value, parm[0], parm[1]))
-            return 'fail'
 
     auth_list = [('GEOGCS', '4269'),
                  ('DATUM', '6269'),
@@ -120,17 +114,15 @@ def test_osr_basic_2():
                  ('PROJCS|UNIT', '9001')]
 
     for auth in auth_list:
-        if srs.GetAuthorityName(auth[0]) != 'EPSG':
-            gdaltest.post_reason('Got authority %s instead of EPSG for %s'
+        assert srs.GetAuthorityName(auth[0]) == 'EPSG', \
+            ('Got authority %s instead of EPSG for %s'
                                  % (srs.GetAuthorityName(auth[0]),
                                     auth[0]))
-            return 'fail'
 
-        if str(srs.GetAuthorityCode(auth[0])) != auth[1]:
-            gdaltest.post_reason('Got code %s instead of %s for %s'
+        assert str(srs.GetAuthorityCode(auth[0])) == auth[1], \
+            ('Got code %s instead of %s for %s'
                                  % (srs.GetAuthorityCode(auth[0]),
                                     auth[1], auth[0]))
-            return 'fail'
 
     return 'success'
 
@@ -156,53 +148,43 @@ def test_osr_basic_3():
 
     for parm in parm_list:
         value = srs.GetProjParm(parm[0], -1111)
-        if not gdaltest.approx_equal(parm[1], value):
-            gdaltest.post_reason('got %.16g for %s instead of %.16g.'
+        assert gdaltest.approx_equal(parm[1], value), \
+            ('got %.16g for %s instead of %.16g.'
                                  % (value, parm[0], parm[1]))
-            return 'fail'
 
     auth_list = [('GEOGCS', '4269'),
                  ('DATUM', '6269')]
 
     for auth in auth_list:
-        if srs.GetAuthorityName(auth[0]) != 'EPSG':
-            gdaltest.post_reason('Got authority %s instead of EPSG for %s'
+        assert srs.GetAuthorityName(auth[0]) == 'EPSG', \
+            ('Got authority %s instead of EPSG for %s'
                                  % (srs.GetAuthorityName(auth[0]),
                                     auth[0]))
-            return 'fail'
 
-        if str(srs.GetAuthorityCode(auth[0])) != auth[1]:
-            gdaltest.post_reason('Got code %s instead of %s for %s'
+        assert str(srs.GetAuthorityCode(auth[0])) == auth[1], \
+            ('Got code %s instead of %s for %s'
                                  % (srs.GetAuthorityCode(auth[0]),
                                     auth[1], auth[0]))
-            return 'fail'
 
-    if srs.GetAuthorityName('PROJCS') is not None:
-        gdaltest.post_reason('Got a PROJCS Authority but we should not')
-        return 'fail'
+    assert srs.GetAuthorityName('PROJCS') is None, \
+        'Got a PROJCS Authority but we should not'
 
-    if str(srs.GetAuthorityCode('PROJCS|UNIT')) == '9001':
-        gdaltest.post_reason('Got METER authority code on linear units.')
-        return 'fail'
+    assert str(srs.GetAuthorityCode('PROJCS|UNIT')) != '9001', \
+        'Got METER authority code on linear units.'
 
-    if srs.GetLinearUnitsName() != 'Foot':
-        gdaltest.post_reason('Didnt get Foot linear units')
-        return 'fail'
+    assert srs.GetLinearUnitsName() == 'Foot', 'Didnt get Foot linear units'
 
     if srs.GetLinearUnits() != 0.3048006096012192:
-        gdaltest.post_reason('Didnt get Foot linear units')
         print('%.16g' % srs.GetLinearUnits())
-        return 'fail'
+        pytest.fail('Didnt get Foot linear units')
 
     if srs.GetTargetLinearUnits('PROJCS') != 0.3048006096012192:
-        gdaltest.post_reason('Didnt get Foot linear units')
         print('%.16g' % srs.GetTargetLinearUnits('PROJCS'))
-        return 'fail'
+        pytest.fail('Didnt get Foot linear units')
 
     if srs.GetTargetLinearUnits(None) != 0.3048006096012192:
-        gdaltest.post_reason('Didnt get Foot linear units')
         print('%.16g' % srs.GetTargetLinearUnits(None))
-        return 'fail'
+        pytest.fail('Didnt get Foot linear units')
 
     return 'success'
 
@@ -220,18 +202,15 @@ def test_osr_basic_4():
 
     srs.SetTOWGS84(1, 2, 3)
 
-    if srs.GetTOWGS84() != (1, 2, 3, 0, 0, 0, 0):
-        gdaltest.post_reason('GetTOWGS84() result is wrong.')
-        return 'fail'
+    assert srs.GetTOWGS84() == (1, 2, 3, 0, 0, 0, 0), 'GetTOWGS84() result is wrong.'
 
     proj4 = srs.ExportToProj4()
 
     srs2 = osr.SpatialReference()
     srs2.ImportFromProj4(proj4)
 
-    if srs2.GetTOWGS84() != (1, 2, 3, 0, 0, 0, 0):
-        gdaltest.post_reason('GetTOWGS84() result is wrong after PROJ.4 conversion.')
-        return 'fail'
+    assert srs2.GetTOWGS84() == (1, 2, 3, 0, 0, 0, 0), \
+        'GetTOWGS84() result is wrong after PROJ.4 conversion.'
 
     return 'success'
 
@@ -243,9 +222,7 @@ def test_osr_basic_5():
 
     wkt_1 = osr.GetUserInputAsWKT('urn:ogc:def:crs:OGC:1.3:CRS84')
     wkt_2 = osr.GetUserInputAsWKT('WGS84')
-    if wkt_1 != wkt_2:
-        gdaltest.post_reason('CRS84 lookup not as expected.')
-        return 'fail'
+    assert wkt_1 == wkt_2, 'CRS84 lookup not as expected.'
 
     return 'success'
 
@@ -257,18 +234,14 @@ def test_osr_basic_6():
 
     # Without version
     wkt_1 = osr.GetUserInputAsWKT('urn:x-ogc:def:crs:EPSG::4326')
-    if wkt_1.find('GEOGCS["WGS 84",DATUM["WGS_1984"') == -1 or wkt_1.find('AXIS["Latitude",NORTH],AXIS["Longitude",EAST]') == -1:
-        print(wkt_1)
-        gdaltest.post_reason('EPSG:4326 urn lookup not as expected.')
-        return 'fail'
+    assert not (wkt_1.find('GEOGCS["WGS 84",DATUM["WGS_1984"') == -1 or wkt_1.find('AXIS["Latitude",NORTH],AXIS["Longitude",EAST]') == -1), \
+        'EPSG:4326 urn lookup not as expected.'
 
     # With a version
     wkt_2 = osr.GetUserInputAsWKT('urn:x-ogc:def:crs:EPSG:6.6:4326')
     if wkt_2.find('GEOGCS["WGS 84",DATUM["WGS_1984"') == -1 or wkt_2.find('AXIS["Latitude",NORTH],AXIS["Longitude",EAST]') == -1:
         print(wkt_1)
-        print(wkt_2)
-        gdaltest.post_reason('EPSG:4326 urn lookup not as expected.')
-        return 'fail'
+        pytest.fail('EPSG:4326 urn lookup not as expected.')
 
     # Without version, but with no repeated :. Probably illegal from my understanding
     # of http://www.opengeospatial.org/ogcUrnPolicy, but found quite often in the wild
@@ -276,9 +249,7 @@ def test_osr_basic_6():
     wkt_2 = osr.GetUserInputAsWKT('urn:x-ogc:def:crs:EPSG:4326')
     if wkt_2.find('GEOGCS["WGS 84",DATUM["WGS_1984"') == -1 or wkt_2.find('AXIS["Latitude",NORTH],AXIS["Longitude",EAST]') == -1:
         print(wkt_1)
-        print(wkt_2)
-        gdaltest.post_reason('EPSG:4326 urn lookup not as expected.')
-        return 'fail'
+        pytest.fail('EPSG:4326 urn lookup not as expected.')
 
     return 'success'
 
@@ -290,11 +261,7 @@ def test_osr_basic_7():
 
     wkt_1 = osr.GetUserInputAsWKT('urn:ogc:def:crs:OGC::AUTO42001:-117:33')
     wkt_2 = 'PROJCS["UTM Zone 11, Northern Hemisphere",GEOGCS["WGS 84",DATUM["WGS_1984",SPHEROID["WGS 84",6378137,298.257223563,AUTHORITY["EPSG","7030"]],AUTHORITY["EPSG","6326"]],PRIMEM["Greenwich",0,AUTHORITY["EPSG","8901"]],UNIT["degree",0.0174532925199433,AUTHORITY["EPSG","9122"]],AUTHORITY["EPSG","4326"]],PROJECTION["Transverse_Mercator"],PARAMETER["latitude_of_origin",0],PARAMETER["central_meridian",-117],PARAMETER["scale_factor",0.9996],PARAMETER["false_easting",500000],PARAMETER["false_northing",0],UNIT["Meter",1,AUTHORITY["EPSG","9001"]]]'
-    if wkt_1 != wkt_2:
-        print(wkt_1)
-        print(wkt_2)
-        gdaltest.post_reason('AUTO42001 urn lookup not as expected.')
-        return 'fail'
+    assert wkt_1 == wkt_2, 'AUTO42001 urn lookup not as expected.'
 
     return 'success'
 
@@ -310,9 +277,7 @@ def test_osr_basic_8():
     srs.SetLinearUnits('Foot', 0.3048)
     fe = srs.GetProjParm('false_easting')
 
-    if fe != 1000.0:
-        gdaltest.post_reason('false easting was unexpectedly updated.')
-        return 'fail'
+    assert fe == 1000.0, 'false easting was unexpectedly updated.'
 
     if 'SetLinearUnitsAndUpdateParameters' not in dir(srs):
         return 'skip'
@@ -321,14 +286,9 @@ def test_osr_basic_8():
     srs.SetLinearUnitsAndUpdateParameters('Foot', 0.3048)
     fe = srs.GetProjParm('false_easting')
 
-    if fe == 1000.0:
-        gdaltest.post_reason('false easting was unexpectedly not updated.')
-        return 'fail'
+    assert fe != 1000.0, 'false easting was unexpectedly not updated.'
 
-    if abs(fe - 3280.840) > 0.01:
-        print(fe)
-        gdaltest.post_reason('wrong updated false easting value.')
-        return 'fail'
+    assert abs(fe - 3280.840) <= 0.01, 'wrong updated false easting value.'
 
     return 'success'
 
@@ -340,8 +300,7 @@ def test_osr_basic_9():
 
     srs = osr.SpatialReference()
     srs.SetFromUserInput("PROJCS[\"unnamed\",GEOGCS[\"unnamed ellipse\",DATUM[\"unknown\",SPHEROID[\"unnamed\",6378137,0]],PRIMEM[\"Greenwich\",0],UNIT[\"degree\",0.0174532925199433]],PROJECTION[\"Mercator_2SP\"],PARAMETER[\"standard_parallel_1\",0],PARAMETER[\"latitude_of_origin\",0],PARAMETER[\"central_meridian\",0],PARAMETER[\"false_easting\",0],PARAMETER[\"false_northing\",0],UNIT[\"Meter\",1],EXTENSION[\"PROJ4\",\"+proj=merc +a=6378137 +b=6378137 +lat_ts=0.0 +lon_0=0.0 +x_0=0.0 +y_0=0 +k=1.0 +units=m +nadgrids=@null +wktext  +no_defs\"]]")
-    if srs.Validate() != 0:
-        return 'fail'
+    assert srs.Validate() == 0
 
     return 'success'
 
@@ -376,8 +335,7 @@ def test_osr_basic_10():
     AXIS["Northing",NORTH],
     AUTHORITY["EPSG","2038"]]""")
 
-    if srs.Validate() != 0:
-        return 'fail'
+    assert srs.Validate() == 0
 
     return 'success'
 
@@ -445,9 +403,7 @@ def test_osr_basic_12():
 
     wkt_1 = osr.GetUserInputAsWKT('CRS:84')
     wkt_2 = osr.GetUserInputAsWKT('WGS84')
-    if wkt_1 != wkt_2:
-        gdaltest.post_reason('CRS:84 lookup not as expected.')
-        return 'fail'
+    assert wkt_1 == wkt_2, 'CRS:84 lookup not as expected.'
 
     return 'success'
 
@@ -463,18 +419,11 @@ def test_osr_basic_13():
     expected_wkt = 'GEOCCS["WGS 84 (geocentric) (deprecated)",DATUM["WGS_1984",SPHEROID["WGS 84",6378137,298.257223563,AUTHORITY["EPSG","7030"]],AUTHORITY["EPSG","6326"]],PRIMEM["Greenwich",0,AUTHORITY["EPSG","8901"]],UNIT["metre",1,AUTHORITY["EPSG","9001"]],AXIS["Geocentric X",OTHER],AXIS["Geocentric Y",OTHER],AXIS["Geocentric Z",NORTH],AUTHORITY["EPSG","4328"]]'
     wkt = srs.ExportToWkt()
 
-    if wkt != expected_wkt:
-        gdaltest.post_reason('did not get expected GEOCCS WKT.')
-        print(wkt)
-        return 'fail'
+    assert wkt == expected_wkt, 'did not get expected GEOCCS WKT.'
 
-    if not srs.IsGeocentric():
-        gdaltest.post_reason('srs not recognised as geocentric.')
-        return 'fail'
+    assert srs.IsGeocentric(), 'srs not recognised as geocentric.'
 
-    if srs.Validate() != 0:
-        gdaltest.post_reason('epsg geoccs import does not validate!')
-        return 'fail'
+    assert srs.Validate() == 0, 'epsg geoccs import does not validate!'
 
     return 'success'
 
@@ -492,18 +441,11 @@ def test_osr_basic_14():
     expected_wkt = 'GEOCCS["My Geocentric",DATUM["WGS_1984",SPHEROID["WGS 84",6378137,298.257223563,AUTHORITY["EPSG","7030"]],AUTHORITY["EPSG","6326"]],PRIMEM["Greenwich",0,AUTHORITY["EPSG","8901"]],UNIT["meter",1]]'
     wkt = srs.ExportToWkt()
 
-    if wkt != expected_wkt:
-        gdaltest.post_reason('did not get expected GEOCCS WKT.')
-        print(wkt)
-        return 'fail'
+    assert wkt == expected_wkt, 'did not get expected GEOCCS WKT.'
 
-    if not srs.IsGeocentric():
-        gdaltest.post_reason('srs not recognised as geocentric.')
-        return 'fail'
+    assert srs.IsGeocentric(), 'srs not recognised as geocentric.'
 
-    if srs.Validate() != 0:
-        gdaltest.post_reason('geocentric srs not recognised as valid.')
-        return 'fail'
+    assert srs.Validate() == 0, 'geocentric srs not recognised as valid.'
 
     return 'success'
 
@@ -528,15 +470,11 @@ def test_osr_basic_15():
     srs = osr.SpatialReference()
     srs.SetFromUserInput(wkt)
 
-    if srs.Validate() == 0:
-        gdaltest.post_reason('Validate() fails to detect misordering.')
-        return 'fail'
+    assert srs.Validate() != 0, 'Validate() fails to detect misordering.'
 
     srs.Fixup()
 
-    if srs.Validate() != 0:
-        gdaltest.post_reason('Fixup() failed to correct srs.')
-        return 'fail'
+    assert srs.Validate() == 0, 'Fixup() failed to correct srs.'
 
     return 'success'
 
@@ -575,8 +513,7 @@ def test_osr_basic_16():
     if wkt != expect_wkt:
         print('Got:%s' % wkt)
         print('Expected:%s' % expect_wkt)
-        gdaltest.post_reason('Did not get expected result.')
-        return 'fail'
+        pytest.fail('Did not get expected result.')
 
     # Build GEOCCS from a valid GEOGCS
     srs = osr.SpatialReference()
@@ -593,17 +530,15 @@ def test_osr_basic_16():
     if wkt != expect_wkt:
         print('Got:%s' % wkt)
         print('Expected:%s' % expect_wkt)
-        gdaltest.post_reason('Did not get expected result.')
-        return 'fail'
+        pytest.fail('Did not get expected result.')
 
     # Error expected. Cannot work on a PROJCS
     srs = osr.SpatialReference()
     srs.ImportFromEPSG(32631)
     ret = srs.SetGeocCS("a")
     if ret == 0:
-        gdaltest.post_reason('expected failure')
         print(srs)
-        return 'fail'
+        pytest.fail('expected failure')
 
     # Limit test : build GEOCCS from an invalid GEOGCS
     srs = osr.SpatialReference()
@@ -614,8 +549,7 @@ def test_osr_basic_16():
     if wkt != expect_wkt:
         print('Got:%s' % wkt)
         print('Expected:%s' % expect_wkt)
-        gdaltest.post_reason('Did not get expected result.')
-        return 'fail'
+        pytest.fail('Did not get expected result.')
 
     return 'success'
 
@@ -627,9 +561,7 @@ def test_osr_basic_17():
 
     wkt_1 = osr.GetUserInputAsWKT('urn:ogc:def:crs:EPSG::4326')
     wkt_2 = osr.GetUserInputAsWKT('http://www.opengis.net/def/crs/EPSG/0/4326')
-    if wkt_1 != wkt_2:
-        gdaltest.post_reason('CRS URL parsing not as expected.')
-        return 'fail'
+    assert wkt_1 == wkt_2, 'CRS URL parsing not as expected.'
 
     return 'success'
 
@@ -641,10 +573,7 @@ def test_osr_basic_18():
 
     # This is a dummy one, but who cares
     wkt = osr.GetUserInputAsWKT('http://www.opengis.net/def/crs-compound?1=http://www.opengis.net/def/crs/EPSG/0/4326&2=http://www.opengis.net/def/crs/EPSG/0/4326')
-    if wkt.find('COMPD_CS') != 0:
-        print(wkt)
-        gdaltest.post_reason('CRS URL parsing not as expected.')
-        return 'fail'
+    assert wkt.find('COMPD_CS') == 0, 'CRS URL parsing not as expected.'
 
     return 'success'
 
@@ -660,10 +589,7 @@ def test_osr_basic_19():
     sr_ref = osr.SpatialReference()
     sr_ref.ImportFromEPSG(4326)
 
-    if sr.ExportToWkt() != sr_ref.ExportToWkt():
-        print(sr.ExportToWkt())
-        print(sr_ref.ExportToWkt())
-        return 'fail'
+    assert sr.ExportToWkt() == sr_ref.ExportToWkt()
 
     sr = osr.SpatialReference()
     sr.SetWellKnownGeogCS('WGS72')
@@ -671,10 +597,7 @@ def test_osr_basic_19():
     sr_ref = osr.SpatialReference()
     sr_ref.ImportFromEPSG(4322)
 
-    if sr.ExportToWkt() != sr_ref.ExportToWkt():
-        print(sr.ExportToWkt())
-        print(sr_ref.ExportToWkt())
-        return 'fail'
+    assert sr.ExportToWkt() == sr_ref.ExportToWkt()
 
     sr = osr.SpatialReference()
     sr.SetWellKnownGeogCS('NAD27')
@@ -682,10 +605,7 @@ def test_osr_basic_19():
     sr_ref = osr.SpatialReference()
     sr_ref.ImportFromEPSG(4267)
 
-    if sr.ExportToWkt() != sr_ref.ExportToWkt():
-        print(sr.ExportToWkt())
-        print(sr_ref.ExportToWkt())
-        return 'fail'
+    assert sr.ExportToWkt() == sr_ref.ExportToWkt()
 
     sr = osr.SpatialReference()
     sr.SetWellKnownGeogCS('NAD83')
@@ -693,10 +613,7 @@ def test_osr_basic_19():
     sr_ref = osr.SpatialReference()
     sr_ref.ImportFromEPSG(4269)
 
-    if sr.ExportToWkt() != sr_ref.ExportToWkt():
-        print(sr.ExportToWkt())
-        print(sr_ref.ExportToWkt())
-        return 'fail'
+    assert sr.ExportToWkt() == sr_ref.ExportToWkt()
 
     return 'success'
 
@@ -709,25 +626,15 @@ def test_osr_basic_20():
     sr = osr.SpatialReference()
     sr.ImportFromEPSGA(4326)
 
-    if sr.GetAxisName(None, 0) != 'Latitude':
-        print(sr.GetAxisName(None, 0))
-        return 'fail'
+    assert sr.GetAxisName(None, 0) == 'Latitude'
 
-    if sr.GetAxisOrientation(None, 0) != osr.OAO_North:
-        print(sr.GetAxisOrientation(None, 0))
-        return 'fail'
+    assert sr.GetAxisOrientation(None, 0) == osr.OAO_North
 
-    if sr.GetAxisName('GEOGCS', 1) != 'Longitude':
-        print(sr.GetAxisName('GEOGCS', 1))
-        return 'fail'
+    assert sr.GetAxisName('GEOGCS', 1) == 'Longitude'
 
-    if sr.GetAxisOrientation('GEOGCS', 1) != osr.OAO_East:
-        print(sr.GetAxisOrientation('GEOGCS', 1))
-        return 'fail'
+    assert sr.GetAxisOrientation('GEOGCS', 1) == osr.OAO_East
 
-    if sr.GetAngularUnitsName() != 'degree':
-        print(sr.GetAngularUnitsName())
-        return 'fail'
+    assert sr.GetAngularUnitsName() == 'degree'
 
     return 'success'
 
@@ -778,17 +685,14 @@ def test_osr_basic_21():
     sr2 = osr.SpatialReference()
     sr2.ImportFromWkt(wkt2)
 
-    if sr1.IsSame(sr2) == 0:
-        return 'fail'
+    assert sr1.IsSame(sr2) != 0
 
-    if sr2.IsSame(sr1) == 0:
-        return 'fail'
+    assert sr2.IsSame(sr1) != 0
 
     sr2_not_equivalent = osr.SpatialReference()
     sr2_not_equivalent.ImportFromWkt(wkt2_not_equivalent)
 
-    if sr1.IsSame(sr2_not_equivalent) == 1:
-        return 'fail'
+    assert sr1.IsSame(sr2_not_equivalent) != 1
 
     return 'success'
 
@@ -846,15 +750,11 @@ def test_osr_basic_22():
     expected_sr2 = osr.SpatialReference()
     expected_sr2.ImportFromWkt(expected_sr2_wkt)
 
-    if sr2.IsSame(expected_sr2) == 0:
-        print(sr2)
-        return 'fail'
+    assert sr2.IsSame(expected_sr2) != 0
 
     # Back to LCC_2SP
     sr3 = sr2.ConvertToOtherProjection(osr.SRS_PT_LAMBERT_CONFORMAL_CONIC_2SP)
-    if sr3.IsSame(sr) == 0:
-        print(sr3)
-        return 'fail'
+    assert sr3.IsSame(sr) != 0
 
     # Particular case of LCC_2SP with phi0=phi1=phi2
     sr.SetFromUserInput("""PROJCS["unnamed",
@@ -899,14 +799,10 @@ def test_osr_basic_22():
     expected_sr2 = osr.SpatialReference()
     expected_sr2.ImportFromWkt(expected_sr2_wkt)
 
-    if sr2.IsSame(expected_sr2) == 0:
-        print(sr2)
-        return 'fail'
+    assert sr2.IsSame(expected_sr2) != 0
 
     sr3 = sr2.ConvertToOtherProjection(osr.SRS_PT_LAMBERT_CONFORMAL_CONIC_2SP)
-    if sr3.IsSame(sr) == 0:
-        print(sr3)
-        return 'fail'
+    assert sr3.IsSame(sr) != 0
 
     # Particular case of LCC_2SP with phi0 != phi1 and phi1=phi2
     sr.SetFromUserInput("""PROJCS["unnamed",
@@ -951,9 +847,7 @@ def test_osr_basic_22():
     expected_sr2 = osr.SpatialReference()
     expected_sr2.ImportFromWkt(expected_sr2_wkt)
 
-    if sr2.IsSame(expected_sr2) == 0:
-        print(sr2)
-        return 'fail'
+    assert sr2.IsSame(expected_sr2) != 0
 
     sr3 = sr2.ConvertToOtherProjection(osr.SRS_PT_LAMBERT_CONFORMAL_CONIC_2SP)
     expected_sr3_wkt = """PROJCS["unnamed",
@@ -977,9 +871,7 @@ def test_osr_basic_22():
     PARAMETER["false_northing",6637093.292952879]]"""
     expected_sr3 = osr.SpatialReference()
     expected_sr3.ImportFromWkt(expected_sr3_wkt)
-    if sr3.IsSame(expected_sr3) == 0:
-        print(sr3)
-        return 'fail'
+    assert sr3.IsSame(expected_sr3) != 0
 
     return 'success'
 
@@ -1037,15 +929,11 @@ def test_osr_basic_23():
     expected_sr2 = osr.SpatialReference()
     expected_sr2.ImportFromWkt(expected_sr2_wkt)
 
-    if sr2.IsSame(expected_sr2) == 0:
-        print(sr2)
-        return 'fail'
+    assert sr2.IsSame(expected_sr2) != 0
 
     # Back to LCC_2SP
     sr3 = sr2.ConvertToOtherProjection(osr.SRS_PT_LAMBERT_CONFORMAL_CONIC_1SP)
-    if sr3.IsSame(sr) == 0:
-        print(sr3)
-        return 'fail'
+    assert sr3.IsSame(sr) != 0
 
     return 'success'
 
@@ -1093,15 +981,11 @@ def test_osr_basic_24():
     expected_sr2 = osr.SpatialReference()
     expected_sr2.ImportFromWkt(expected_sr2_wkt)
 
-    if sr2.IsSame(expected_sr2) == 0:
-        print(sr2)
-        return 'fail'
+    assert sr2.IsSame(expected_sr2) != 0
 
     # Back to LCC_2SP
     sr3 = sr2.ConvertToOtherProjection(osr.SRS_PT_MERCATOR_1SP)
-    if sr3.IsSame(sr) == 0:
-        print(sr3)
-        return 'fail'
+    assert sr3.IsSame(sr) != 0
 
     return 'success'
 
@@ -1117,9 +1001,7 @@ def test_osr_basic_25():
                 SPHEROID["WGS 84",6378137,298.257223563]],
             UNIT["degree",0.0174532925199433]]""")
     sr2 = sr.ConvertToOtherProjection('Mercator_1SP')
-    if sr2 is not None:
-        print(sr2)
-        return 'fail'
+    assert sr2 is None
 
     sr.SetFromUserInput("""PROJCS["unnamed",
         GEOGCS["WGS 84",
@@ -1133,17 +1015,13 @@ def test_osr_basic_25():
         PARAMETER["false_northing",0]]""")
 
     sr2 = sr.ConvertToOtherProjection(None)
-    if sr2 is not None:
-        return 'fail'
+    assert sr2 is None
 
     sr2 = sr.ConvertToOtherProjection('foo')
-    if sr2 is not None:
-        return 'fail'
+    assert sr2 is None
 
     sr2 = sr.ConvertToOtherProjection('Mercator_1SP')
-    if sr2.IsSame(sr) == 0:
-        print(sr2)
-        return 'fail'
+    assert sr2.IsSame(sr) != 0
 
     # Mercator_1SP -> Mercator_2SP: Negative scale factor
     sr = osr.SpatialReference()
@@ -1158,9 +1036,7 @@ def test_osr_basic_25():
         PARAMETER["false_easting",0],
         PARAMETER["false_northing",0]]""")
     sr2 = sr.ConvertToOtherProjection('Mercator_2SP')
-    if sr2 is not None:
-        print(sr2)
-        return 'fail'
+    assert sr2 is None
 
     # Mercator_1SP -> Mercator_2SP: Invalid eccentricity
     sr = osr.SpatialReference()
@@ -1175,9 +1051,7 @@ def test_osr_basic_25():
         PARAMETER["false_easting",0],
         PARAMETER["false_northing",0]]""")
     sr2 = sr.ConvertToOtherProjection('Mercator_2SP')
-    if sr2 is not None:
-        print(sr2)
-        return 'fail'
+    assert sr2 is None
 
     # Mercator_2SP -> Mercator_1SP: Invalid standard_parallel_1
     sr = osr.SpatialReference()
@@ -1192,9 +1066,7 @@ def test_osr_basic_25():
     PARAMETER["false_easting",0],
     PARAMETER["false_northing",0]]""")
     sr2 = sr.ConvertToOtherProjection('Mercator_1SP')
-    if sr2 is not None:
-        print(sr2)
-        return 'fail'
+    assert sr2 is None
 
     # Mercator_2SP -> Mercator_1SP: Invalid eccentricity
     sr = osr.SpatialReference()
@@ -1209,9 +1081,7 @@ def test_osr_basic_25():
     PARAMETER["false_easting",0],
     PARAMETER["false_northing",0]]""")
     sr2 = sr.ConvertToOtherProjection('Mercator_1SP')
-    if sr2 is not None:
-        print(sr2)
-        return 'fail'
+    assert sr2 is None
 
     # LCC_1SP -> LCC_2SP: Negative scale factor
     sr = osr.SpatialReference()
@@ -1228,9 +1098,7 @@ def test_osr_basic_25():
     PARAMETER["false_easting",234.358],
     PARAMETER["false_northing",4185861.369]]""")
     sr2 = sr.ConvertToOtherProjection('Lambert_Conformal_Conic_2SP')
-    if sr2 is not None:
-        print(sr2)
-        return 'fail'
+    assert sr2 is None
 
     # LCC_1SP -> LCC_2SP: Invalid eccentricity
     sr = osr.SpatialReference()
@@ -1247,9 +1115,7 @@ def test_osr_basic_25():
     PARAMETER["false_easting",234.358],
     PARAMETER["false_northing",4185861.369]]""")
     sr2 = sr.ConvertToOtherProjection('Lambert_Conformal_Conic_2SP')
-    if sr2 is not None:
-        print(sr2)
-        return 'fail'
+    assert sr2 is None
 
     # LCC_1SP -> LCC_2SP: Invalid latitude_of_origin
     sr = osr.SpatialReference()
@@ -1266,9 +1132,7 @@ def test_osr_basic_25():
     PARAMETER["false_easting",234.358],
     PARAMETER["false_northing",4185861.369]]""")
     sr2 = sr.ConvertToOtherProjection('Lambert_Conformal_Conic_2SP')
-    if sr2 is not None:
-        print(sr2)
-        return 'fail'
+    assert sr2 is None
 
     # LCC_1SP -> LCC_2SP: latitude_of_origin == 0
     sr = osr.SpatialReference()
@@ -1285,9 +1149,7 @@ def test_osr_basic_25():
     PARAMETER["false_easting",234.358],
     PARAMETER["false_northing",4185861.369]]""")
     sr2 = sr.ConvertToOtherProjection('Lambert_Conformal_Conic_2SP')
-    if sr2 is not None:
-        print(sr2)
-        return 'fail'
+    assert sr2 is None
 
     # LCC_2SP -> LCC_1SP : Invalid standard_parallel_1
     sr.SetFromUserInput("""PROJCS["unnamed",
@@ -1303,9 +1165,7 @@ def test_osr_basic_25():
     PARAMETER["false_easting",700000],
     PARAMETER["false_northing",6600000]]""")
     sr2 = sr.ConvertToOtherProjection('Lambert_Conformal_Conic_1SP')
-    if sr2 is not None:
-        print(sr2)
-        return 'fail'
+    assert sr2 is None
 
     # LCC_2SP -> LCC_1SP : Invalid standard_parallel_2
     sr.SetFromUserInput("""PROJCS["unnamed",
@@ -1321,9 +1181,7 @@ def test_osr_basic_25():
     PARAMETER["false_easting",700000],
     PARAMETER["false_northing",6600000]]""")
     sr2 = sr.ConvertToOtherProjection('Lambert_Conformal_Conic_1SP')
-    if sr2 is not None:
-        print(sr2)
-        return 'fail'
+    assert sr2 is None
 
     # LCC_2SP -> LCC_1SP : Invalid latitude_of_origin
     sr.SetFromUserInput("""PROJCS["unnamed",
@@ -1339,9 +1197,7 @@ def test_osr_basic_25():
     PARAMETER["false_easting",700000],
     PARAMETER["false_northing",6600000]]""")
     sr2 = sr.ConvertToOtherProjection('Lambert_Conformal_Conic_1SP')
-    if sr2 is not None:
-        print(sr2)
-        return 'fail'
+    assert sr2 is None
 
     # LCC_2SP -> LCC_1SP : abs(stdp1) == abs(stdp2)
     sr.SetFromUserInput("""PROJCS["unnamed",
@@ -1357,9 +1213,7 @@ def test_osr_basic_25():
     PARAMETER["false_easting",700000],
     PARAMETER["false_northing",6600000]]""")
     sr2 = sr.ConvertToOtherProjection('Lambert_Conformal_Conic_1SP')
-    if sr2 is not None:
-        print(sr2)
-        return 'fail'
+    assert sr2 is None
 
     # LCC_2SP -> LCC_1SP : stdp1 ~= stdp2 ~= 0
     sr.SetFromUserInput("""PROJCS["unnamed",
@@ -1375,9 +1229,7 @@ def test_osr_basic_25():
     PARAMETER["false_easting",700000],
     PARAMETER["false_northing",6600000]]""")
     sr2 = sr.ConvertToOtherProjection('Lambert_Conformal_Conic_1SP')
-    if sr2 is not None:
-        print(sr2)
-        return 'fail'
+    assert sr2 is None
 
     # LCC_2SP -> LCC_1SP : Invalid eccentricity
     sr.SetFromUserInput("""PROJCS["unnamed",
@@ -1393,9 +1245,7 @@ def test_osr_basic_25():
     PARAMETER["false_easting",700000],
     PARAMETER["false_northing",6600000]]""")
     sr2 = sr.ConvertToOtherProjection('Lambert_Conformal_Conic_1SP')
-    if sr2 is not None:
-        print(sr2)
-        return 'fail'
+    assert sr2 is None
 
     return 'success'
 
@@ -1407,28 +1257,18 @@ def test_osr_basic_setgeogcs():
 
     sr = osr.SpatialReference()
     sr.SetGeogCS(None, None, None, 0, 0, None, 0, None, 0)
-    if sr.ExportToWkt() != 'GEOGCS["unnamed",DATUM["unknown",SPHEROID["unnamed",0,0]],PRIMEM["Greenwich",0],UNIT["degree",0.0174532925199433]]':
-        print(sr.ExportToWkt())
-        return 'fail'
+    assert sr.ExportToWkt() == 'GEOGCS["unnamed",DATUM["unknown",SPHEROID["unnamed",0,0]],PRIMEM["Greenwich",0],UNIT["degree",0.0174532925199433]]'
 
     sr.SetGeogCS('a', 'b', 'c', 1, 2, 'd', 3, 'e', 4)
-    if sr.ExportToWkt() != 'GEOGCS["a",DATUM["b",SPHEROID["c",1,2]],PRIMEM["d",3],UNIT["e",4]]':
-        print(sr.ExportToWkt())
-        return 'fail'
+    assert sr.ExportToWkt() == 'GEOGCS["a",DATUM["b",SPHEROID["c",1,2]],PRIMEM["d",3],UNIT["e",4]]'
 
     sr.SetUTM(31)
     sr.SetGeogCS(None, None, None, 0, 0, None, 0, None, 0)
-    if sr.ExportToWkt() != 'PROJCS["UTM Zone 31, Northern Hemisphere",GEOGCS["unnamed",DATUM["unknown",SPHEROID["unnamed",0,0]],PRIMEM["Greenwich",0],UNIT["degree",0.0174532925199433]],PROJECTION["Transverse_Mercator"],PARAMETER["latitude_of_origin",0],PARAMETER["central_meridian",0.01308996938995747],PARAMETER["scale_factor",0.9996],PARAMETER["false_easting",500000],PARAMETER["false_northing",0],UNIT["Meter",1]]':
-        print(sr.ExportToWkt())
-        return 'fail'
+    assert sr.ExportToWkt() == 'PROJCS["UTM Zone 31, Northern Hemisphere",GEOGCS["unnamed",DATUM["unknown",SPHEROID["unnamed",0,0]],PRIMEM["Greenwich",0],UNIT["degree",0.0174532925199433]],PROJECTION["Transverse_Mercator"],PARAMETER["latitude_of_origin",0],PARAMETER["central_meridian",0.01308996938995747],PARAMETER["scale_factor",0.9996],PARAMETER["false_easting",500000],PARAMETER["false_northing",0],UNIT["Meter",1]]'
 
     sr.ImportFromWkt('FOO["bar",GEOGCS[]]')
-    if sr.SetGeogCS(None, None, None, 0, 0, None, 0, None, 0) == 0:
-        print(sr.ExportToWkt())
-        return 'fail'
-    if sr.ExportToWkt() != 'FOO["bar",GEOGCS[]]':
-        print(sr.ExportToWkt())
-        return 'fail'
+    assert sr.SetGeogCS(None, None, None, 0, 0, None, 0, None, 0) != 0, sr.ExportToWkt()
+    assert sr.ExportToWkt() == 'FOO["bar",GEOGCS[]]'
 
     return 'success'
 
diff --git a/autotest/osr/osr_compd.py b/autotest/osr/osr_compd.py
index 0b2cb13b2f6b..3b3137c14546 100755
--- a/autotest/osr/osr_compd.py
+++ b/autotest/osr/osr_compd.py
@@ -36,6 +36,7 @@
 
 import gdaltest
 from osgeo import osr
+import pytest
 
 example_compd_wkt = 'COMPD_CS["OSGB36 / British National Grid + ODN",PROJCS["OSGB 1936 / British National Grid",GEOGCS["OSGB 1936",DATUM["OSGB_1936",SPHEROID["Airy 1830",6377563.396,299.3249646,AUTHORITY["EPSG",7001]],TOWGS84[375,-111,431,0,0,0,0],AUTHORITY["EPSG",6277]],PRIMEM["Greenwich",0,AUTHORITY["EPSG",8901]],UNIT["DMSH",0.0174532925199433,AUTHORITY["EPSG",9108]],AXIS["Lat",NORTH],AXIS["Long",EAST],AUTHORITY["EPSG",4277]],PROJECTION["Transverse_Mercator"],PARAMETER["latitude_of_origin",49],PARAMETER["central_meridian",-2],PARAMETER["scale_factor",0.999601272],PARAMETER["false_easting",400000],PARAMETER["false_northing",-100000],UNIT["metre_1",1,AUTHORITY["EPSG",9001]],AXIS["E",EAST],AXIS["N",NORTH],AUTHORITY["EPSG",27700]],VERT_CS["Newlyn",VERT_DATUM["Ordnance Datum Newlyn",2005,AUTHORITY["EPSG",5101]],UNIT["metre_2",1,AUTHORITY["EPSG",9001]],AXIS["Up",UP],AUTHORITY["EPSG",5701]],AUTHORITY["EPSG",7405]]'
 
@@ -48,21 +49,13 @@ def test_osr_compd_1():
     srs = osr.SpatialReference()
     srs.ImportFromWkt(example_compd_wkt)
 
-    if not srs.IsProjected():
-        gdaltest.post_reason('Projected COMPD_CS not recognised as projected.')
-        return 'fail'
+    assert srs.IsProjected(), 'Projected COMPD_CS not recognised as projected.'
 
-    if srs.IsGeographic():
-        gdaltest.post_reason('projected COMPD_CS misrecognised as geographic.')
-        return 'fail'
+    assert not srs.IsGeographic(), 'projected COMPD_CS misrecognised as geographic.'
 
-    if srs.IsLocal():
-        gdaltest.post_reason('projected COMPD_CS misrecognised as local.')
-        return 'fail'
+    assert not srs.IsLocal(), 'projected COMPD_CS misrecognised as local.'
 
-    if not srs.IsCompound():
-        gdaltest.post_reason('COMPD_CS not recognised as compound.')
-        return 'fail'
+    assert srs.IsCompound(), 'COMPD_CS not recognised as compound.'
 
     expected_proj4 = '+proj=tmerc +lat_0=49 +lon_0=-2 +k=0.999601272 +x_0=400000 +y_0=-100000 +ellps=airy +towgs84=375,-111,431,0,0,0,0 +units=m +vunits=m +no_defs '
     got_proj4 = srs.ExportToProj4()
@@ -70,16 +63,11 @@ def test_osr_compd_1():
     if expected_proj4 != got_proj4:
         print('Got:      %s' % got_proj4)
         print('Expected: %s' % expected_proj4)
-        gdaltest.post_reason('did not get expected proj.4 translation of compd_cs')
-        return 'fail'
+        pytest.fail('did not get expected proj.4 translation of compd_cs')
 
-    if srs.GetLinearUnitsName() != 'metre_1':
-        gdaltest.post_reason('Did not get expected linear units.')
-        return 'fail'
+    assert srs.GetLinearUnitsName() == 'metre_1', 'Did not get expected linear units.'
 
-    if srs.Validate() != 0:
-        gdaltest.post_reason('Validate() failed.')
-        return 'fail'
+    assert srs.Validate() == 0, 'Validate() failed.'
 
     return 'success'
 
@@ -92,13 +80,9 @@ def test_osr_compd_2():
     srs = osr.SpatialReference()
     srs.SetFromUserInput(example_compd_wkt)
 
-    if srs.Validate() != 0:
-        gdaltest.post_reason('Does not validate')
-        return 'fail'
+    assert srs.Validate() == 0, 'Does not validate'
 
-    if not srs.IsProjected():
-        gdaltest.post_reason('Projected COMPD_CS not recognised as projected.')
-        return 'fail'
+    assert srs.IsProjected(), 'Projected COMPD_CS not recognised as projected.'
 
     return 'success'
 
@@ -111,9 +95,7 @@ def test_osr_compd_3():
     srs = osr.SpatialReference()
     srs.ImportFromEPSG(7401)
 
-    if srs.Validate() != 0:
-        gdaltest.post_reason('Does not validate')
-        return 'fail'
+    assert srs.Validate() == 0, 'Does not validate'
 
     exp_wkt = """COMPD_CS["NTF (Paris) / France II + NGF Lallemand",
     PROJCS["NTF (Paris) / France II (deprecated)",
@@ -148,9 +130,8 @@ def test_osr_compd_3():
         AUTHORITY["EPSG","5719"]],
     AUTHORITY["EPSG","7401"]]"""
     wkt = srs.ExportToPrettyWkt()
-    if gdaltest.equal_srs_from_wkt(exp_wkt, wkt) == 0:
-        gdaltest.post_reason('did not get expected compound cs for EPSG:7401')
-        return 'fail'
+    assert gdaltest.equal_srs_from_wkt(exp_wkt, wkt) != 0, \
+        'did not get expected compound cs for EPSG:7401'
     # elif exp_wkt != wkt:
     #    print('warning they are equivalent, but not completely the same')
     #    print(wkt)
@@ -166,9 +147,7 @@ def test_osr_compd_4():
     srs = osr.SpatialReference()
     srs.ImportFromEPSG(7400)
 
-    if srs.Validate() != 0:
-        gdaltest.post_reason('Does not validate')
-        return 'fail'
+    assert srs.Validate() == 0, 'Does not validate'
 
     exp_wkt = """COMPD_CS["NTF (Paris) + NGF IGN69 height",
     GEOGCS["NTF (Paris)",
@@ -192,9 +171,8 @@ def test_osr_compd_4():
     AUTHORITY["EPSG","7400"]]"""
     wkt = srs.ExportToPrettyWkt()
 
-    if gdaltest.equal_srs_from_wkt(exp_wkt, wkt) == 0:
-        gdaltest.post_reason('did not get expected compound cs for EPSG:7400')
-        return 'fail'
+    assert gdaltest.equal_srs_from_wkt(exp_wkt, wkt) != 0, \
+        'did not get expected compound cs for EPSG:7400'
     # elif exp_wkt != wkt:
     #    print('warning they are equivalent, but not completely the same')
     #    print(wkt)
@@ -211,9 +189,7 @@ def test_osr_compd_5():
     srs = osr.SpatialReference()
     srs.SetFromUserInput('EPSG:26911+5703')
 
-    if srs.Validate() != 0:
-        gdaltest.post_reason('Does not validate')
-        return 'fail'
+    assert srs.Validate() == 0, 'Does not validate'
 
     exp_wkt = """COMPD_CS["NAD83 / UTM zone 11N + NAVD88 height",
     PROJCS["NAD83 / UTM zone 11N",
@@ -255,15 +231,11 @@ def test_osr_compd_5():
         print('warning they are equivalent, but not completely the same')
         print(wkt)
 
-    if wkt.find('g2012a_conus.gtx') == -1:
-        gdaltest.post_reason('Did not get PROJ4_GRIDS EXTENSION node')
-        return 'fail'
+    assert wkt.find('g2012a_conus.gtx') != -1, 'Did not get PROJ4_GRIDS EXTENSION node'
 
     exp_proj4 = '+proj=utm +zone=11 +ellps=GRS80 +towgs84=0,0,0,0,0,0,0 +units=m +geoidgrids=g2012a_conus.gtx,g2012a_alaska.gtx,g2012a_guam.gtx,g2012a_hawaii.gtx,g2012a_puertorico.gtx,g2012a_samoa.gtx +vunits=m +no_defs '
     proj4 = srs.ExportToProj4()
-    if proj4 != exp_proj4:
-        gdaltest.post_reason('Did not get expected proj.4 string, got:' + proj4)
-        return 'fail'
+    assert proj4 == exp_proj4, ('Did not get expected proj.4 string, got:' + proj4)
 
     return 'success'
 
@@ -279,9 +251,7 @@ def test_osr_compd_6():
     srs = osr.SpatialReference()
     srs.SetFromUserInput('+proj=utm +zone=11 +ellps=GRS80 +towgs84=0,0,0,0,0,0,0 +units=m +geoidgrids=g2003conus.gtx,g2003alaska.gtx,g2003h01.gtx,g2003p01.gtx +vunits=us-ft +no_defs ')
 
-    if srs.Validate() != 0:
-        gdaltest.post_reason('Does not validate')
-        return 'fail'
+    assert srs.Validate() == 0, 'Does not validate'
 
     exp_wkt = """COMPD_CS["UTM Zone 11, Northern Hemisphere + Unnamed Vertical Datum",
     PROJCS["UTM Zone 11, Northern Hemisphere",
@@ -312,15 +282,11 @@ def test_osr_compd_6():
         print('warning they are equivalent, but not completely the same')
         print(wkt)
 
-    if wkt.find('g2003conus.gtx') == -1:
-        gdaltest.post_reason('Did not get PROJ4_GRIDS EXTENSION node')
-        return 'fail'
+    assert wkt.find('g2003conus.gtx') != -1, 'Did not get PROJ4_GRIDS EXTENSION node'
 
     exp_proj4 = '+proj=utm +zone=11 +ellps=GRS80 +towgs84=0,0,0,0,0,0,0 +units=m +geoidgrids=g2003conus.gtx,g2003alaska.gtx,g2003h01.gtx,g2003p01.gtx +vunits=us-ft +no_defs '
     proj4 = srs.ExportToProj4()
-    if proj4 != exp_proj4:
-        gdaltest.post_reason('Did not get expected proj.4 string, got:' + proj4)
-        return 'fail'
+    assert proj4 == exp_proj4, ('Did not get expected proj.4 string, got:' + proj4)
 
     return 'success'
 
@@ -340,9 +306,7 @@ def test_osr_compd_7():
     srs = osr.SpatialReference()
     srs.SetCompoundCS('My Compound SRS', srs_horiz, srs_vert)
 
-    if srs.Validate() != 0:
-        gdaltest.post_reason('Does not validate')
-        return 'fail'
+    assert srs.Validate() == 0, 'Does not validate'
 
     exp_wkt = """COMPD_CS["My Compound SRS",
     GEOGCS["WGS 84",
@@ -372,14 +336,12 @@ def test_osr_compd_7():
         print(wkt)
 
     if srs.GetTargetLinearUnits('VERT_CS') != 0.304800609601219:
-        gdaltest.post_reason('Didnt get expected linear units')
         print('%.16g' % srs.GetTargetLinearUnits('VERT_CS'))
-        return 'fail'
+        pytest.fail('Didnt get expected linear units')
 
     if srs.GetTargetLinearUnits(None) != 0.304800609601219:
-        gdaltest.post_reason('Didnt get expected linear units')
         print('%.16g' % srs.GetTargetLinearUnits(None))
-        return 'fail'
+        pytest.fail('Didnt get expected linear units')
 
     return 'success'
 
@@ -392,15 +354,10 @@ def test_osr_compd_8():
     srs = osr.SpatialReference()
     srs.SetFromUserInput('urn:ogc:def:crs,crs:EPSG::27700,crs:EPSG::5701')
 
-    if srs.Validate() != 0:
-        gdaltest.post_reason('Does not validate')
-        return 'fail'
+    assert srs.Validate() == 0, 'Does not validate'
 
     wkt = srs.ExportToWkt()
-    if wkt.find('COMPD_CS') != 0:
-        gdaltest.post_reason('COMPD_CS not recognised as compound.')
-        print(wkt)
-        return 'fail'
+    assert wkt.find('COMPD_CS') == 0, 'COMPD_CS not recognised as compound.'
 
     return 'success'
 
diff --git a/autotest/osr/osr_ct.py b/autotest/osr/osr_ct.py
index e3bacf72afb7..23706a0b1d83 100755
--- a/autotest/osr/osr_ct.py
+++ b/autotest/osr/osr_ct.py
@@ -38,6 +38,7 @@
 from osgeo import osr
 from osgeo import ogr
 import gdaltest
+import pytest
 
 
 ###############################################################################
@@ -69,9 +70,8 @@ def test_osr_ct_1():
         gdaltest.post_reason(gdal.GetLastErrorMsg())
         return 'fail'
 
-    if ct is None or ct.this is None:
-        gdaltest.post_reason('Unable to create simple CoordinateTransformat.')
-        return 'fail'
+    assert not (ct is None or ct.this is None), \
+        'Unable to create simple CoordinateTransformat.'
 
     gdaltest.have_proj4 = 1
 
@@ -96,11 +96,8 @@ def test_osr_ct_2():
     gdaltest.ct = osr.CoordinateTransformation(ll_srs, utm_srs)
 
     result = gdaltest.ct.TransformPoint(-117.5, 32.0, 0.0)
-    if abs(result[0] - 452772.06) > 0.01 \
-       or abs(result[1] - 3540544.89) > 0.01 \
-       or abs(result[2] - 0.0) > 0.01:
-        gdaltest.post_reason('Wrong LL to UTM result')
-        return 'fail'
+    assert abs(result[0] - 452772.06) <= 0.01 and abs(result[1] - 3540544.89) <= 0.01 and abs(result[2] - 0.0) <= 0.01, \
+        'Wrong LL to UTM result'
     return 'success'
 
 ###############################################################################
@@ -125,17 +122,14 @@ def test_osr_ct_3():
 
     pnt = ogr.CreateGeometryFromWkt('POINT(-117.5 32.0)', ll_srs)
     result = pnt.Transform(ct)
-    if result != 0:
-        return 'fail'
+    assert result == 0
 
     ll_srs = None
     ct = None
     utm_srs = None
 
     out_srs = pnt.GetSpatialReference().ExportToPrettyWkt()
-    if out_srs[0:6] != 'PROJCS':
-        gdaltest.post_reason('output srs corrupt, ref counting issue?')
-        return 'fail'
+    assert out_srs[0:6] == 'PROJCS', 'output srs corrupt, ref counting issue?'
 
     pnt = None
 
@@ -163,11 +157,8 @@ def test_osr_ct_4():
     result = gdaltest.ct.TransformPoints([(-117.5, 32.0, 0.0), (-117.5, 32.0)])
 
     for i in range(2):
-        if abs(result[i][0] - 452772.06) > 0.01 \
-                or abs(result[i][1] - 3540544.89) > 0.01 \
-                or abs(result[i][2] - 0.0) > 0.01:
-            gdaltest.post_reason('Wrong LL to UTM result')
-            return 'fail'
+        assert abs(result[i][0] - 452772.06) <= 0.01 and abs(result[i][1] - 3540544.89) <= 0.01 and abs(result[i][2] - 0.0) <= 0.01, \
+            'Wrong LL to UTM result'
 
     return 'success'
 
@@ -193,11 +184,8 @@ def test_osr_ct_5():
     result = gdaltest.ct.TransformPoints(((-117.5, 32.0, 0.0), (-117.5, 32.0)))
 
     for i in range(2):
-        if abs(result[i][0] - 452772.06) > 0.01 \
-                or abs(result[i][1] - 3540544.89) > 0.01 \
-                or abs(result[i][2] - 0.0) > 0.01:
-            gdaltest.post_reason('Wrong LL to UTM result')
-            return 'fail'
+        assert abs(result[i][0] - 452772.06) <= 0.01 and abs(result[i][1] - 3540544.89) <= 0.01 and abs(result[i][2] - 0.0) <= 0.01, \
+            'Wrong LL to UTM result'
 
     return 'success'
 
@@ -211,8 +199,7 @@ def test_osr_ct_6():
         return 'skip'
 
     ct = osr.CreateCoordinateTransformation(None, None)
-    if ct is not None:
-        return 'fail'
+    assert ct is None
 
     utm_srs = osr.SpatialReference()
     utm_srs.SetUTM(11)
@@ -222,17 +209,13 @@ def test_osr_ct_6():
     ll_srs.SetWellKnownGeogCS('WGS84')
 
     ct = osr.CreateCoordinateTransformation(ll_srs, utm_srs)
-    if ct is None:
-        return 'fail'
+    assert ct is not None
 
     result = ct.TransformPoints(((-117.5, 32.0, 0.0), (-117.5, 32.0)))
 
     for i in range(2):
-        if abs(result[i][0] - 452772.06) > 0.01 \
-                or abs(result[i][1] - 3540544.89) > 0.01 \
-                or abs(result[i][2] - 0.0) > 0.01:
-            gdaltest.post_reason('Wrong LL to UTM result')
-            return 'fail'
+        assert abs(result[i][0] - 452772.06) <= 0.01 and abs(result[i][1] - 3540544.89) <= 0.01 and abs(result[i][2] - 0.0) <= 0.01, \
+            'Wrong LL to UTM result'
 
     return 'success'
 
@@ -258,25 +241,22 @@ def test_osr_ct_7():
     if (abs(exp_x - x) > 0.00001 or
         abs(exp_y - y) > 0.00001 or
             abs(exp_z - z) > 0.00001):
-        gdaltest.post_reason('Wrong LL for Pseudo Mercator result')
         print('Got:      (%f, %f, %f)' % (x, y, z))
         print('Expected: (%f, %f, %f)' % (exp_x, exp_y, exp_z))
-        return 'fail'
+        pytest.fail('Wrong LL for Pseudo Mercator result')
 
     pnt = ogr.CreateGeometryFromWkt('POINT(%g %g)' % (7000000, 7000000),
                                     pm_srs)
     expected_pnt = ogr.CreateGeometryFromWkt('POINT(%.10f %.10f)' % (exp_x, exp_y),
                                              ll_srs)
     result = pnt.Transform(gdaltest.ct)
-    if result != 0:
-        return 'fail'
+    assert result == 0
     if (abs(expected_pnt.GetX() - pnt.GetX()) > 0.00001 or
         abs(expected_pnt.GetY() - pnt.GetY()) > 0.00001 or
             abs(expected_pnt.GetZ() - pnt.GetZ()) > 0.00001):
-        gdaltest.post_reason('Failed to transform from Pseudo Mercator to LL')
         print('Got:      %s' % pnt.ExportToWkt())
         print('Expected: %s' % expected_pnt.ExportToWkt())
-        return 'fail'
+        pytest.fail('Failed to transform from Pseudo Mercator to LL')
 
     return 'success'
 
@@ -304,10 +284,9 @@ def test_osr_ct_8():
     for i in range(2):
         for j in range(3):
             if abs(result[i][j] - expected_result[i][j]) > 1e-10:
-                gdaltest.post_reason('Failed to transform from Pseudo Mercator to LL')
                 print('Got:      %s' % str(result))
                 print('Expected: %s' % str(expected_result))
-                return 'fail'
+                pytest.fail('Failed to transform from Pseudo Mercator to LL')
 
     pnts = [(0, 6274861.39400658), (1 + 0, 1 + 6274861.39400658)]
     result = ct.TransformPoints(pnts)
@@ -316,12 +295,9 @@ def test_osr_ct_8():
     for i in range(2):
         for j in range(3):
             if abs(result[i][j] - expected_result[i][j]) > 1e-10:
-                gdaltest.post_reason('Failed to transform from Pseudo Mercator to LL')
                 print('Got:      %s' % str(result))
                 print('Expected: %s' % str(expected_result))
-                print(i)
-                print(j)
-                return 'fail'
+                pytest.fail('Failed to transform from Pseudo Mercator to LL')
 
     return 'success'
 
diff --git a/autotest/osr/osr_ct_proj.py b/autotest/osr/osr_ct_proj.py
index 55f6eab7a37d..aa0286e6e240 100755
--- a/autotest/osr/osr_ct_proj.py
+++ b/autotest/osr/osr_ct_proj.py
@@ -159,14 +159,12 @@ def test_proj(src_srs, src_xyz, src_error,
             return 'skip'
 
     src = osr.SpatialReference()
-    if src.SetFromUserInput(src_srs) != 0:
-        gdaltest.post_reason('SetFromUserInput(%s) failed.' % src_srs)
-        return 'fail'
+    assert src.SetFromUserInput(src_srs) == 0, \
+        ('SetFromUserInput(%s) failed.' % src_srs)
 
     dst = osr.SpatialReference()
-    if dst.SetFromUserInput(dst_srs) != 0:
-        gdaltest.post_reason('SetFromUserInput(%s) failed.' % dst_srs)
-        return 'fail'
+    assert dst.SetFromUserInput(dst_srs) == 0, \
+        ('SetFromUserInput(%s) failed.' % dst_srs)
 
     if requirements is not None and requirements[0] != 'G':
         additionnal_error_str = ' Check that proj version is >= %s ' % requirements
@@ -201,10 +199,9 @@ def test_proj(src_srs, src_xyz, src_error,
         + abs(result[1] - dst_xyz[1]) \
         + abs(result[2] - dst_xyz[2])
 
-    if error > dst_error:
-        gdaltest.post_reason('Dest error is %g, got (%.15g,%.15g,%.15g)%s'
+    assert error <= dst_error, \
+        ('Dest error is %g, got (%.15g,%.15g,%.15g)%s'
                              % (error, result[0], result[1], result[2], additionnal_error_str))
-        return 'fail'
 
     ######################################################################
     # Now transform back.
@@ -217,8 +214,7 @@ def test_proj(src_srs, src_xyz, src_error,
         + abs(result[1] - src_xyz[1]) \
         + abs(result[2] - src_xyz[2])
 
-    if error > src_error:
-        gdaltest.post_reason('Back to source error is %g.%s' % (error, additionnal_error_str))
-        return 'fail'
+    assert error <= src_error, \
+        ('Back to source error is %g.%s' % (error, additionnal_error_str))
 
     return 'success'
diff --git a/autotest/osr/osr_epsg.py b/autotest/osr/osr_epsg.py
index 5885bf603253..37ccadde360d 100755
--- a/autotest/osr/osr_epsg.py
+++ b/autotest/osr/osr_epsg.py
@@ -35,6 +35,7 @@
 
 import gdaltest
 from osgeo import osr
+import pytest
 
 ###############################################################################
 # Verify that EPSG:26591 picks up the entry from the pcs.override.csv
@@ -47,9 +48,8 @@ def test_osr_epsg_1():
     srs.ImportFromEPSG(26591)
 
     if abs(srs.GetProjParm('central_meridian') - -3.4523333333333) > 0.000005:
-        gdaltest.post_reason('Wrong central meridian, override missed?')
         print(srs.ExportToPrettyWkt())
-        return 'fail'
+        pytest.fail('Wrong central meridian, override missed?')
 
     return 'success'
 
@@ -65,9 +65,8 @@ def test_osr_epsg_2():
 
     if abs(float(srs.GetAttrValue('TOWGS84', 6)) -
            2.4232) > 0.0005:
-        gdaltest.post_reason('Wrong TOWGS84, override missed?')
         print(srs.ExportToPrettyWkt())
-        return 'fail'
+        pytest.fail('Wrong TOWGS84, override missed?')
 
     return 'success'
 
@@ -87,9 +86,8 @@ def test_osr_epsg_3():
         for i in range(6):
             if abs(float(srs.GetAttrValue('TOWGS84', i)) -
                    expected_towgs84[i]) > 0.0005:
-                gdaltest.post_reason('For EPSG:%d. Wrong TOWGS84, override missed?' % epsg)
                 print(srs.ExportToPrettyWkt())
-                return 'fail'
+                pytest.fail('For EPSG:%d. Wrong TOWGS84, override missed?' % epsg)
 
     return 'success'
 
@@ -102,13 +100,9 @@ def test_osr_epsg_4():
     srs = osr.SpatialReference()
     srs.ImportFromEPSG(4326)
 
-    if srs.EPSGTreatsAsLatLong():
-        gdaltest.post_reason('not supposed to be treated as lat/long')
-        return 'fail'
+    assert not srs.EPSGTreatsAsLatLong(), 'not supposed to be treated as lat/long'
 
-    if srs.ExportToWkt().find('AXIS') != -1:
-        gdaltest.post_reason('should not have AXIS node')
-        return 'fail'
+    assert srs.ExportToWkt().find('AXIS') == -1, 'should not have AXIS node'
 
     return 'success'
 
@@ -121,13 +115,9 @@ def test_osr_epsg_5():
     srs = osr.SpatialReference()
     srs.ImportFromEPSGA(4326)
 
-    if not srs.EPSGTreatsAsLatLong():
-        gdaltest.post_reason('supposed to be treated as lat/long')
-        return 'fail'
+    assert srs.EPSGTreatsAsLatLong(), 'supposed to be treated as lat/long'
 
-    if srs.ExportToWkt().find('AXIS') == -1:
-        gdaltest.post_reason('should  have AXIS node')
-        return 'fail'
+    assert srs.ExportToWkt().find('AXIS') != -1, 'should  have AXIS node'
 
     return 'success'
 
@@ -140,10 +130,8 @@ def test_osr_epsg_6():
     srs = osr.SpatialReference()
     srs.ImportFromEPSG(4277)
 
-    if srs.ExportToWkt().find('TOWGS84[446.448,-125.157,542.06,0.15,0.247,0.842,-20.489]') == -1:
-        gdaltest.post_reason('did not get expected TOWGS84')
-        print(srs.ExportToWkt())
-        return 'fail'
+    assert srs.ExportToWkt().find('TOWGS84[446.448,-125.157,542.06,0.15,0.247,0.842,-20.489]') != -1, \
+        'did not get expected TOWGS84'
 
     return 'success'
 
@@ -156,13 +144,9 @@ def test_osr_epsg_7():
     srs = osr.SpatialReference()
     srs.ImportFromEPSG(2193)
 
-    if srs.EPSGTreatsAsNorthingEasting():
-        gdaltest.post_reason('not supposed to be treated as n/e')
-        return 'fail'
+    assert not srs.EPSGTreatsAsNorthingEasting(), 'not supposed to be treated as n/e'
 
-    if srs.ExportToWkt().find('AXIS') != -1:
-        gdaltest.post_reason('should not have AXIS node')
-        return 'fail'
+    assert srs.ExportToWkt().find('AXIS') == -1, 'should not have AXIS node'
 
     return 'success'
 
@@ -175,13 +159,9 @@ def test_osr_epsg_8():
     srs = osr.SpatialReference()
     srs.ImportFromEPSGA(2193)
 
-    if not srs.EPSGTreatsAsNorthingEasting():
-        gdaltest.post_reason('supposed to be treated as n/e')
-        return 'fail'
+    assert srs.EPSGTreatsAsNorthingEasting(), 'supposed to be treated as n/e'
 
-    if srs.ExportToWkt().find('AXIS') == -1:
-        gdaltest.post_reason('should  have AXIS node')
-        return 'fail'
+    assert srs.ExportToWkt().find('AXIS') != -1, 'should  have AXIS node'
 
     return 'success'
 
@@ -194,13 +174,9 @@ def test_osr_epsg_9():
     srs = osr.SpatialReference()
     srs.ImportFromEPSG(3857)
 
-    if srs.ExportToWkt() != 'PROJCS["WGS 84 / Pseudo-Mercator",GEOGCS["WGS 84",DATUM["WGS_1984",SPHEROID["WGS 84",6378137,298.257223563,AUTHORITY["EPSG","7030"]],AUTHORITY["EPSG","6326"]],PRIMEM["Greenwich",0,AUTHORITY["EPSG","8901"]],UNIT["degree",0.0174532925199433,AUTHORITY["EPSG","9122"]],AUTHORITY["EPSG","4326"]],PROJECTION["Mercator_1SP"],PARAMETER["central_meridian",0],PARAMETER["scale_factor",1],PARAMETER["false_easting",0],PARAMETER["false_northing",0],UNIT["metre",1,AUTHORITY["EPSG","9001"]],AXIS["X",EAST],AXIS["Y",NORTH],EXTENSION["PROJ4","+proj=merc +a=6378137 +b=6378137 +lat_ts=0.0 +lon_0=0.0 +x_0=0.0 +y_0=0 +k=1.0 +units=m +nadgrids=@null +wktext +no_defs"],AUTHORITY["EPSG","3857"]]':
-        print(srs.ExportToWkt())
-        return 'fail'
+    assert srs.ExportToWkt() == 'PROJCS["WGS 84 / Pseudo-Mercator",GEOGCS["WGS 84",DATUM["WGS_1984",SPHEROID["WGS 84",6378137,298.257223563,AUTHORITY["EPSG","7030"]],AUTHORITY["EPSG","6326"]],PRIMEM["Greenwich",0,AUTHORITY["EPSG","8901"]],UNIT["degree",0.0174532925199433,AUTHORITY["EPSG","9122"]],AUTHORITY["EPSG","4326"]],PROJECTION["Mercator_1SP"],PARAMETER["central_meridian",0],PARAMETER["scale_factor",1],PARAMETER["false_easting",0],PARAMETER["false_northing",0],UNIT["metre",1,AUTHORITY["EPSG","9001"]],AXIS["X",EAST],AXIS["Y",NORTH],EXTENSION["PROJ4","+proj=merc +a=6378137 +b=6378137 +lat_ts=0.0 +lon_0=0.0 +x_0=0.0 +y_0=0 +k=1.0 +units=m +nadgrids=@null +wktext +no_defs"],AUTHORITY["EPSG","3857"]]'
 
-    if srs.Validate() != 0:
-        gdaltest.post_reason('Does not validate')
-        return 'fail'
+    assert srs.Validate() == 0, 'Does not validate'
 
     return 'success'
 
@@ -229,17 +205,13 @@ def test_osr_epsg_10():
     UNIT["metre",1,
         AUTHORITY["EPSG","9001"]]]""")
 
-    if srs.AutoIdentifyEPSG() != 0:
-        return 'fail'
+    assert srs.AutoIdentifyEPSG() == 0
 
-    if srs.GetAuthorityCode(None) != '3031':
-        print(srs.ExportToWkt())
-        return 'fail'
+    assert srs.GetAuthorityCode(None) == '3031', srs.ExportToWkt()
 
     srs_ref = osr.SpatialReference()
     srs_ref.ImportFromEPSG(3031)
-    if srs.IsSame(srs_ref) == 0:
-        return 'fail'
+    assert srs.IsSame(srs_ref) != 0
 
     srs = osr.SpatialReference()
     srs.SetFromUserInput("""PROJCS["PS         WGS84",
@@ -260,17 +232,13 @@ def test_osr_epsg_10():
     UNIT["metre",1,
         AUTHORITY["EPSG","9001"]]]""")
 
-    if srs.AutoIdentifyEPSG() != 0:
-        return 'fail'
+    assert srs.AutoIdentifyEPSG() == 0
 
-    if srs.GetAuthorityCode(None) != '3995':
-        print(srs.ExportToWkt())
-        return 'fail'
+    assert srs.GetAuthorityCode(None) == '3995', srs.ExportToWkt()
 
     srs_ref = osr.SpatialReference()
     srs_ref.ImportFromEPSG(3995)
-    if srs.IsSame(srs_ref) == 0:
-        return 'fail'
+    assert srs.IsSame(srs_ref) != 0
 
     return 'success'
 
@@ -283,10 +251,8 @@ def test_osr_epsg_11():
     srs = osr.SpatialReference()
     srs.ImportFromEPSG(2065)
 
-    if srs.ExportToWkt().find('TOWGS84[570.8,85.7,462.8,4.998,1.587,5.261,3.56]') == -1:
-        gdaltest.post_reason('did not get expected TOWGS84')
-        print(srs.ExportToWkt())
-        return 'fail'
+    assert srs.ExportToWkt().find('TOWGS84[570.8,85.7,462.8,4.998,1.587,5.261,3.56]') != -1, \
+        'did not get expected TOWGS84'
 
     return 'success'
 
@@ -303,8 +269,7 @@ def test_osr_epsg_12():
     sr2 = osr.SpatialReference()
     sr2.ImportFromEPSG(3395)
 
-    if sr1.IsSame(sr2):
-        return 'fail'
+    assert not sr1.IsSame(sr2)
     return 'success'
 
 ###############################################################################
@@ -319,11 +284,8 @@ def test_osr_epsg_13():
     sr.MorphToESRI()
     sr.MorphFromESRI()
     matches = sr.FindMatches()
-    if len(matches) != 1 or matches[0][1] != 100:
-        print(matches)
-        return 'fail'
-    if matches[0][0].IsSame(sr) == 0:
-        return 'fail'
+    assert len(matches) == 1 and matches[0][1] == 100
+    assert matches[0][0].IsSame(sr) != 0
 
     # Two matches (and test GEOGCS)
     sr.SetFromUserInput("""GEOGCS["myLKS94",
@@ -333,15 +295,9 @@ def test_osr_epsg_13():
     PRIMEM["Greenwich",0],
     UNIT["degree",0.0174532925199433]]""")
     matches = sr.FindMatches()
-    if len(matches) != 2:
-        print(matches)
-        return 'fail'
-    if matches[0][0].GetAuthorityCode(None) != '4126' or matches[0][1] != 90:
-        print(matches)
-        return 'fail'
-    if matches[1][0].GetAuthorityCode(None) != '4669' or matches[1][1] != 90:
-        print(matches)
-        return 'fail'
+    assert len(matches) == 2
+    assert matches[0][0].GetAuthorityCode(None) == '4126' and matches[0][1] == 90
+    assert matches[1][0].GetAuthorityCode(None) == '4669' and matches[1][1] == 90
 
     # Zero match
     sr.SetFromUserInput("""GEOGCS["myGEOGCS",
@@ -351,9 +307,7 @@ def test_osr_epsg_13():
     UNIT["degree",0.0174532925199433]]
 """)
     matches = sr.FindMatches()
-    if matches:
-        print(matches)
-        return 'fail'
+    assert not matches
 
     # One single match, but not similar according to IsSame()
     sr = osr.SpatialReference()
@@ -378,11 +332,8 @@ def test_osr_epsg_13():
         AUTHORITY["EPSG","9001"]]]
 """)
     matches = sr.FindMatches()
-    if len(matches) != 1 or matches[0][1] != 50:
-        print(matches)
-        return 'fail'
-    if matches[0][0].IsSame(sr) == 1:
-        return 'fail'
+    assert len(matches) == 1 and matches[0][1] == 50
+    assert matches[0][0].IsSame(sr) != 1
 
     # WKT has EPSG code but the definition doesn't match with the official
     # one (namely linear units are different)
@@ -414,11 +365,8 @@ def test_osr_epsg_13():
     AUTHORITY["EPSG","32122"]]
 """)
     matches = sr.FindMatches()
-    if len(matches) != 1 or matches[0][1] != 50:
-        print(matches)
-        return 'fail'
-    if matches[0][0].IsSame(sr) == 1:
-        return 'fail'
+    assert len(matches) == 1 and matches[0][1] == 50
+    assert matches[0][0].IsSame(sr) != 1
 
     return 'success'
 
@@ -429,9 +377,7 @@ def test_osr_epsg_gcs_deprecated():
 
     sr = osr.SpatialReference()
     sr.ImportFromEPSG(4268)
-    if sr.ExportToWkt().find('NAD27 Michigan (deprecated)') < 0:
-        print(sr.ExportToWkt())
-        return 'fail'
+    assert sr.ExportToWkt().find('NAD27 Michigan (deprecated)') >= 0
     return 'success'
 
 ###############################################################################
@@ -441,9 +387,7 @@ def test_osr_epsg_geoccs_deprecated():
 
     sr = osr.SpatialReference()
     sr.ImportFromEPSG(4346)
-    if sr.ExportToWkt().find('ETRS89 (geocentric) (deprecated)') < 0:
-        print(sr.ExportToWkt())
-        return 'fail'
+    assert sr.ExportToWkt().find('ETRS89 (geocentric) (deprecated)') >= 0
     return 'success'
 
 ###############################################################################
diff --git a/autotest/osr/osr_erm.py b/autotest/osr/osr_erm.py
index c508202fae93..ed953d142620 100755
--- a/autotest/osr/osr_erm.py
+++ b/autotest/osr/osr_erm.py
@@ -43,10 +43,8 @@ def test_osr_erm_1():
         srs = osr.SpatialReference()
         srs.ImportFromERM('MRWORLD', sphere_datum, 'METRE')
 
-        if srs.GetInvFlattening() != 0.0 \
-           or abs(srs.GetSemiMajor() - srs.GetSemiMinor() > 0.0000005):
-            gdaltest.post_reason('Wrong ERMapper spherical datum parameters (bug #3787). Be sure your "ecw_cs.wkt" is from 20890 revision or newer.')
-            return 'fail'
+        assert srs.GetInvFlattening() == 0.0 and not abs(srs.GetSemiMajor() - srs.GetSemiMinor() > 0.0000005), \
+            'Wrong ERMapper spherical datum parameters (bug #3787). Be sure your "ecw_cs.wkt" is from 20890 revision or newer.'
 
     return 'success'
 
@@ -59,19 +57,13 @@ def test_osr_erm_1():
 def test_osr_erm_2():
 
     srs = osr.SpatialReference()
-    if srs.ImportFromERM('EPSG:3395', 'EPSG:3395', 'METRE') != 0 \
-       or not srs.IsProjected():
-        gdaltest.post_reason('EPSG:n import failed.')
-        return 'fail'
+    assert srs.ImportFromERM('EPSG:3395', 'EPSG:3395', 'METRE') == 0 and srs.IsProjected(), \
+        'EPSG:n import failed.'
 
     srs2 = osr.SpatialReference()
     srs2.SetFromUserInput('EPSG:3395')
 
-    if not srs2.IsSame(srs):
-        gdaltest.post_reason('EPSG:n import does not match.')
-        print(srs)
-        print(srs2)
-        return 'fail'
+    assert srs2.IsSame(srs), 'EPSG:n import does not match.'
 
     return 'success'
 
diff --git a/autotest/osr/osr_esri.py b/autotest/osr/osr_esri.py
index b4f2f321fb7e..1033357b10c7 100755
--- a/autotest/osr/osr_esri.py
+++ b/autotest/osr/osr_esri.py
@@ -42,6 +42,7 @@
 from osgeo import gdal
 from osgeo import ogr
 from osgeo import osr
+import pytest
 
 ###############################################################################
 # This test verifies that morphToESRI() translates idiosyncratic datum names
@@ -54,24 +55,21 @@ def test_osr_esri_1():
     srs = osr.SpatialReference()
     srs.ImportFromEPSG(4202)
 
-    if srs.GetAttrValue('DATUM') != 'Australian_Geodetic_Datum_1966':
-        gdaltest.post_reason('Got wrong DATUM name (%s) after EPSG import.' %
+    assert srs.GetAttrValue('DATUM') == 'Australian_Geodetic_Datum_1966', \
+        ('Got wrong DATUM name (%s) after EPSG import.' %
                              srs.GetAttrValue('DATUM'))
-        return 'fail'
 
     srs.MorphToESRI()
 
-    if srs.GetAttrValue('DATUM') != 'D_Australian_1966':
-        gdaltest.post_reason('Got wrong DATUM name (%s) after ESRI morph.' %
+    assert srs.GetAttrValue('DATUM') == 'D_Australian_1966', \
+        ('Got wrong DATUM name (%s) after ESRI morph.' %
                              srs.GetAttrValue('DATUM'))
-        return 'fail'
 
     srs.MorphFromESRI()
 
-    if srs.GetAttrValue('DATUM') != 'Australian_Geodetic_Datum_1966':
-        gdaltest.post_reason('Got wrong DATUM name (%s) after ESRI unmorph.' %
+    assert srs.GetAttrValue('DATUM') == 'Australian_Geodetic_Datum_1966', \
+        ('Got wrong DATUM name (%s) after ESRI unmorph.' %
                              srs.GetAttrValue('DATUM'))
-        return 'fail'
 
     return 'success'
 
@@ -87,15 +85,13 @@ def test_osr_esri_2():
 
     srs.MorphToESRI()
 
-    if srs.GetAttrValue('GEOGCS') != 'GCS_WGS_1984':
-        gdaltest.post_reason('Got wrong GEOGCS name (%s) after ESRI morph.' %
+    assert srs.GetAttrValue('GEOGCS') == 'GCS_WGS_1984', \
+        ('Got wrong GEOGCS name (%s) after ESRI morph.' %
                              srs.GetAttrValue('GEOGCS'))
-        return 'fail'
 
-    if srs.GetAttrValue('PROJCS') != 'WGS_1984_UTM_Zone_11S':
-        gdaltest.post_reason('Got wrong PROJCS name (%s) after ESRI morph.' %
+    assert srs.GetAttrValue('PROJCS') == 'WGS_1984_UTM_Zone_11S', \
+        ('Got wrong PROJCS name (%s) after ESRI morph.' %
                              srs.GetAttrValue('PROJCS'))
-        return 'fail'
 
     return 'success'
 
@@ -110,10 +106,9 @@ def test_osr_esri_3():
 
     srs.MorphToESRI()
 
-    if srs.GetAttrValue('PROJCS') != 'Miller_Cylindrical':
-        gdaltest.post_reason('Got wrong PROJCS name (%s) after ESRI morph.' %
+    assert srs.GetAttrValue('PROJCS') == 'Miller_Cylindrical', \
+        ('Got wrong PROJCS name (%s) after ESRI morph.' %
                              srs.GetAttrValue('PROJCS'))
-        return 'fail'
 
     return 'success'
 
@@ -128,15 +123,13 @@ def test_osr_esri_4():
 
     srs.MorphToESRI()
 
-    if srs.GetAttrValue('PROJECTION') != 'Stereographic_South_Pole':
-        gdaltest.post_reason('Got wrong PROJECTION name (%s) after ESRI morph.' %
+    assert srs.GetAttrValue('PROJECTION') == 'Stereographic_South_Pole', \
+        ('Got wrong PROJECTION name (%s) after ESRI morph.' %
                              srs.GetAttrValue('PROJECTION'))
-        return 'fail'
 
-    if srs.GetProjParm('standard_parallel_1') != -80.2333:
-        gdaltest.post_reason('Got wrong parameter value (%g) after ESRI morph.' %
+    assert srs.GetProjParm('standard_parallel_1') == -80.2333, \
+        ('Got wrong parameter value (%g) after ESRI morph.' %
                              srs.GetProjParm('standard_parallel_1'))
-        return 'fail'
 
     return 'success'
 
@@ -151,15 +144,13 @@ def test_osr_esri_5():
 
     srs.MorphFromESRI()
 
-    if srs.GetAttrValue('PROJECTION') != 'Polar_Stereographic':
-        gdaltest.post_reason('Got wrong PROJECTION name (%s) after ESRI morph.' %
+    assert srs.GetAttrValue('PROJECTION') == 'Polar_Stereographic', \
+        ('Got wrong PROJECTION name (%s) after ESRI morph.' %
                              srs.GetAttrValue('PROJECTION'))
-        return 'fail'
 
-    if srs.GetProjParm('latitude_of_origin') != -80.2333:
-        gdaltest.post_reason('Got wrong parameter value (%g) after ESRI morph.' %
+    assert srs.GetProjParm('latitude_of_origin') == -80.2333, \
+        ('Got wrong parameter value (%g) after ESRI morph.' %
                              srs.GetProjParm('latitude_of_origin'))
-        return 'fail'
 
     return 'success'
 
@@ -175,11 +166,9 @@ def test_osr_esri_6():
 
     srs.MorphFromESRI()
 
-    if srs.GetAttrValue('PROJECTION') != 'Lambert_Conformal_Conic_2SP':
-        gdaltest.post_reason(
-            'Got wrong PROJECTION name (%s) after ESRI morph, expected 2SP' %
+    assert srs.GetAttrValue('PROJECTION') == 'Lambert_Conformal_Conic_2SP', \
+        ('Got wrong PROJECTION name (%s) after ESRI morph, expected 2SP' %
             srs.GetAttrValue('PROJECTION'))
-        return 'fail'
 
     return 'success'
 
@@ -229,8 +218,7 @@ def test_osr_esri_7():
 
     if not srs_prj.IsSame(srs_wkt):
         print('got: ', srs_prj.ExportToPrettyWkt())
-        gdaltest.post_reason('old style ESRI projection imported wrong, perhaps linear units?')
-        return 'fail'
+        pytest.fail('old style ESRI projection imported wrong, perhaps linear units?')
 
     return 'success'
 
@@ -277,9 +265,8 @@ def test_osr_esri_8():
 
     srs_wkt = osr.SpatialReference(wkt=wkt)
 
-    if not srs_prj.IsSame(srs_wkt):
-        gdaltest.post_reason('old style ESRI projection imported wrong, perhaps linear units?')
-        return 'fail'
+    assert srs_prj.IsSame(srs_wkt), \
+        'old style ESRI projection imported wrong, perhaps linear units?'
 
     return 'success'
 
@@ -300,8 +287,7 @@ def test_osr_esri_9():
         print('')
         print('Got:      ', wkt)
         print('Expected: ', expected)
-        gdaltest.post_reason('Did not get expected Equidistant Conic SRS after morphFromESRI')
-        return 'fail'
+        pytest.fail('Did not get expected Equidistant Conic SRS after morphFromESRI')
 
     expected = 'PROJCS["edc",GEOGCS["GCS_North_American_1983",DATUM["D_North_American_1983",SPHEROID["GRS_1980",6378137.0,298.257222101]],PRIMEM["Greenwich",0.0],UNIT["Degree",0.017453292519943295]],PROJECTION["Equidistant_Conic"],PARAMETER["False_Easting",0.0],PARAMETER["False_Northing",0.0],PARAMETER["central_meridian",-96.0],PARAMETER["Standard_Parallel_1",29.5],PARAMETER["Standard_Parallel_2",45.5],PARAMETER["latitude_of_origin",37.5],UNIT["Meter",1.0]]'
 
@@ -311,8 +297,7 @@ def test_osr_esri_9():
         print('')
         print('Got:      ', wkt)
         print('Expected: ', expected)
-        gdaltest.post_reason('Did not get expected Equidistant Conic SRS after morphToESRI')
-        return 'fail'
+        pytest.fail('Did not get expected Equidistant Conic SRS after morphToESRI')
 
     return 'success'
 
@@ -333,8 +318,7 @@ def test_osr_esri_10():
         print('')
         print('Got:      ', wkt)
         print('Expected: ', expected)
-        gdaltest.post_reason('Did not get expected Equirectangular SRS after morphFromESRI')
-        return 'fail'
+        pytest.fail('Did not get expected Equirectangular SRS after morphFromESRI')
 
     expected = 'PROJCS["Sphere_Plate_Carree",GEOGCS["GCS_Sphere",DATUM["D_Sphere",SPHEROID["Sphere",6371000.0,0.0]],PRIMEM["Greenwich",0.0],UNIT["Degree",0.017453292519943295]],PROJECTION["Equidistant_Cylindrical"],PARAMETER["False_Easting",0.0],PARAMETER["False_Northing",0.0],PARAMETER["Central_Meridian",0.0],UNIT["Meter",1.0]]'
 
@@ -344,8 +328,7 @@ def test_osr_esri_10():
         print('')
         print('Got:      ', wkt)
         print('Expected: ', expected)
-        gdaltest.post_reason('Did not get expected Equidistant_Cylindrical SRS after morphToESRI')
-        return 'fail'
+        pytest.fail('Did not get expected Equidistant_Cylindrical SRS after morphToESRI')
 
     return 'success'
 
@@ -378,8 +361,7 @@ def test_osr_esri_11():
         print('')
         print('Got:      ', wkt)
         print('Expected: ', expected)
-        gdaltest.post_reason('Did not get expected TM SRS after morphFromESRI')
-        return 'fail'
+        pytest.fail('Did not get expected TM SRS after morphFromESRI')
 
     return 'success'
 
@@ -394,24 +376,21 @@ def test_osr_esri_12():
 
     # No MorphFromESRI() is required
 
-    if srs.GetAttrValue('PROJECTION') != 'Lambert_Conformal_Conic_2SP':
-        gdaltest.post_reason('Got wrong PROJECTION name (%s) after ESRI morph.' %
+    assert srs.GetAttrValue('PROJECTION') == 'Lambert_Conformal_Conic_2SP', \
+        ('Got wrong PROJECTION name (%s) after ESRI morph.' %
                              srs.GetAttrValue('PROJECTION'))
-        return 'fail'
 
-    if abs(srs.GetProjParm('standard_parallel_1') - 34.333333333) > 0.00001:
-        gdaltest.post_reason('Got wrong parameter value (%g) after ESRI morph.' %
+    assert abs(srs.GetProjParm('standard_parallel_1') - 34.333333333) <= 0.00001, \
+        ('Got wrong parameter value (%g) after ESRI morph.' %
                              srs.GetProjParm('standard_parallel_1'))
-        return 'fail'
 
     if srs.GetAttrValue('DATUM') != 'North_American_Datum_1983':
         gdaltest.post_reason('Got wrong DATUM name (%s) after ESRI morph.' %
                              srs.GetAttrValue('DATUM'))
 
-    if srs.GetAttrValue('UNIT') != 'Meter':
-        gdaltest.post_reason('Got wrong UNIT name (%s) after ESRI morph.' %
+    assert srs.GetAttrValue('UNIT') == 'Meter', \
+        ('Got wrong UNIT name (%s) after ESRI morph.' %
                              srs.GetAttrValue('UNIT'))
-        return 'fail'
 
     return 'success'
 
@@ -427,24 +406,21 @@ def test_osr_esri_13():
 
     # No MorphFromESRI() is required
 
-    if srs.GetAttrValue('PROJECTION') != 'Lambert_Conformal_Conic_2SP':
-        gdaltest.post_reason('Got wrong PROJECTION name (%s) after ESRI morph.' %
+    assert srs.GetAttrValue('PROJECTION') == 'Lambert_Conformal_Conic_2SP', \
+        ('Got wrong PROJECTION name (%s) after ESRI morph.' %
                              srs.GetAttrValue('PROJECTION'))
-        return 'fail'
 
-    if abs(srs.GetProjParm('standard_parallel_1') - 34.333333333) > 0.00001:
-        gdaltest.post_reason('Got wrong parameter value (%g) after ESRI morph.' %
+    assert abs(srs.GetProjParm('standard_parallel_1') - 34.333333333) <= 0.00001, \
+        ('Got wrong parameter value (%g) after ESRI morph.' %
                              srs.GetProjParm('standard_parallel_1'))
-        return 'fail'
 
     if srs.GetAttrValue('DATUM') != 'North_American_Datum_1983':
         gdaltest.post_reason('Got wrong DATUM name (%s) after ESRI morph.' %
                              srs.GetAttrValue('DATUM'))
 
-    if srs.GetAttrValue('UNIT') != 'Meter':
-        gdaltest.post_reason('Got wrong UNIT name (%s) after ESRI morph.' %
+    assert srs.GetAttrValue('UNIT') == 'Meter', \
+        ('Got wrong UNIT name (%s) after ESRI morph.' %
                              srs.GetAttrValue('UNIT'))
-        return 'fail'
 
     return 'success'
 
@@ -461,10 +437,8 @@ def test_osr_esri_14():
                         'FIPSZONE 2600',
                         'DATUM NAD83',
                         'PARAMETERS'])
-    if srs.GetAuthorityCode('PROJCS') is not None:
-        print(srs.GetAuthorityCode('PROJCS'))
-        gdaltest.post_reason('Get epsg authority code inappropriately.')
-        return 'fail'
+    assert srs.GetAuthorityCode('PROJCS') is None, \
+        'Get epsg authority code inappropriately.'
 
     srs = osr.SpatialReference()
     srs.ImportFromESRI(['PROJECTION STATEPLANE',
@@ -472,10 +446,8 @@ def test_osr_esri_14():
                         'FIPSZONE 2600',
                         'DATUM NAD83',
                         'PARAMETERS'])
-    if srs.GetAuthorityCode('PROJCS') != '32104':
-        print(srs.GetAuthorityCode('PROJCS'))
-        gdaltest.post_reason('Did not get epsg authority code when expected.')
-        return 'fail'
+    assert srs.GetAuthorityCode('PROJCS') == '32104', \
+        'Did not get epsg authority code when expected.'
 
     return 'success'
 
@@ -494,23 +466,19 @@ def test_osr_esri_15():
     srs.MorphFromESRI()
     wkt = srs.ExportToWkt()
 
-    if wkt.find('rectified_grid_angle') == -1:
-        print(wkt)
-        gdaltest.post_reason('Did not get rectified_grid_angle as expected.')
-        return 'fail'
+    assert wkt.find('rectified_grid_angle') != -1, \
+        'Did not get rectified_grid_angle as expected.'
 
     srs.MorphToESRI()
     wkt = srs.ExportToWkt()
-    if wkt.find('rectified_grid_angle') != -1:
-        gdaltest.post_reason('did not get rectified_grid_angle removed as expected.')
-        return 'fail'
+    assert wkt.find('rectified_grid_angle') == -1, \
+        'did not get rectified_grid_angle removed as expected.'
 
     if wkt != expected:
         print('')
         print('Got:      ', wkt)
         print('Expected: ', expected)
-        gdaltest.post_reason('Did not get expected HOM projection after morphing')
-        return 'fail'
+        pytest.fail('Did not get expected HOM projection after morphing')
 
     return 'success'
 
@@ -529,10 +497,7 @@ def test_osr_esri_16():
     srs.MorphToESRI()
     wkt = srs.ExportToWkt()
 
-    if expected != wkt:
-        print(wkt)
-        gdaltest.post_reason('Did not get expected equidistant cylindrical.')
-        return 'fail'
+    assert expected == wkt, 'Did not get expected equidistant cylindrical.'
 
     return 'success'
 
@@ -554,8 +519,7 @@ def test_osr_esri_17():
         print('')
         print('Got:      ', wkt)
         print('Expected: ', expected)
-        gdaltest.post_reason('Did not get expected LAEA SRS after morphToESRI')
-        return 'fail'
+        pytest.fail('Did not get expected LAEA SRS after morphToESRI')
 
     expected = 'PROJCS["ETRS89_ETRS_LAEA",GEOGCS["GCS_ETRS_1989",DATUM["European_Terrestrial_Reference_System_1989",SPHEROID["GRS_1980",6378137,298.257222101]],PRIMEM["Greenwich",0],UNIT["Degree",0.017453292519943295]],PROJECTION["Lambert_Azimuthal_Equal_Area"],PARAMETER["latitude_of_center",52],PARAMETER["longitude_of_center",10],PARAMETER["false_easting",4321000],PARAMETER["false_northing",3210000],UNIT["Meter",1]]'
 
@@ -565,8 +529,7 @@ def test_osr_esri_17():
         print('')
         print('Got:      ', wkt)
         print('Expected: ', expected)
-        gdaltest.post_reason('Did not get expected LAEA SRS after morphFromESRI')
-        return 'fail'
+        pytest.fail('Did not get expected LAEA SRS after morphFromESRI')
 
     return 'success'
 
@@ -602,8 +565,7 @@ def test_osr_esri_18():
         print('')
         print('Got:      ', srs.ExportToPrettyWkt())
         print('Expected: ', srs_expected.ExportToPrettyWkt())
-        gdaltest.post_reason('Did not get expected EC SRS after morphFromESRI')
-        return 'fail'
+        pytest.fail('Did not get expected EC SRS after morphFromESRI')
 
     srs.MorphToESRI()
     srs_expected = osr.SpatialReference(wkt=original)
@@ -612,8 +574,7 @@ def test_osr_esri_18():
         print('')
         print('Got:      ', srs.ExportToPrettyWkt())
         print('Expected: ', srs_expected.ExportToPrettyWkt())
-        gdaltest.post_reason('Did not get expected EC SRS after morphToESRI')
-        return 'fail'
+        pytest.fail('Did not get expected EC SRS after morphToESRI')
 
     return 'success'
 
@@ -634,8 +595,7 @@ def test_osr_esri_19():
     if srs.GetAttrValue('SPHEROID') != expected:
         print('')
         print('Got:      ', srs.ExportToPrettyWkt())
-        gdaltest.post_reason('Did not get expected spheroid name after morphFromESRI')
-        return 'fail'
+        pytest.fail('Did not get expected spheroid name after morphFromESRI')
 
     srs.MorphToESRI()
 
@@ -643,8 +603,7 @@ def test_osr_esri_19():
     if srs.GetAttrValue('SPHEROID') != expected:
         print('')
         print('Got:      ', srs.ExportToPrettyWkt())
-        gdaltest.post_reason('Did not get expected spheroid name after morphToESRI')
-        return 'fail'
+        pytest.fail('Did not get expected spheroid name after morphToESRI')
 
     return 'success'
 
@@ -787,9 +746,7 @@ def test_osr_esri_20():
 
 def osr_esri_test_esri_ogc_esri(ifile, ofile_base, fix_config='NO', check_epsg=False):
 
-    if not os.path.exists(ifile):
-        print('input file ' + ifile + ' does not exist')
-        return 'fail'
+    assert os.path.exists(ifile), ('input file ' + ifile + ' does not exist')
 
     result = 'success'
     check_srs = True
@@ -970,9 +927,7 @@ def test_osr_esri_21():
 
 def osr_esri_test_ogc_esri_ogc(ifile, ofile_base, fix_config='NO', check_epsg=False):
 
-    if not os.path.exists(ifile):
-        print('input file ' + ifile + ' does not exist')
-        return 'fail'
+    assert os.path.exists(ifile), ('input file ' + ifile + ' does not exist')
 
     result = 'success'
     check_srs = True
@@ -1178,9 +1133,8 @@ def test_osr_esri_24():
                              PARAMETER["Central_Parallel",51.0],
                              UNIT["Meter",1.0]]''')
     srs.MorphFromESRI()
-    if srs.GetProjParm(osr.SRS_PP_LATITUDE_OF_ORIGIN, 1000.0) == 1000.0:
-        gdaltest.post_reason('Failed to set latitude_of_origin')
-        return 'fail'
+    assert srs.GetProjParm(osr.SRS_PP_LATITUDE_OF_ORIGIN, 1000.0) != 1000.0, \
+        'Failed to set latitude_of_origin'
 
     return 'success'
 
@@ -1215,8 +1169,7 @@ def test_osr_esri_25():
     proj4_string = srs.ExportToProj4()
     if not (expected_proj4_string.split(' ').sort() == proj4_string.split(' ').sort()):  # pylint: disable=superfluous-parens
         print('Got: %s' % expected_proj4_string)
-        print('Expected: %s' % proj4_string)
-        return 'fail'
+        pytest.fail('Expected: %s' % proj4_string)
 
     # test an actual conversion
     (x, y, z) = transformer.TransformPoint(7000000, 7000000, 0)
@@ -1225,8 +1178,7 @@ def test_osr_esri_25():
         abs(exp_y - y) > 0.00001 or
             abs(exp_z - z) > 0.00001):
         print('Got:      (%f, %f, %f)' % (x, y, z))
-        print('Expected: (%f, %f, %f)' % (exp_x, exp_y, exp_z))
-        return 'fail'
+        pytest.fail('Expected: (%f, %f, %f)' % (exp_x, exp_y, exp_z))
 
     return 'success'
 
@@ -1239,9 +1191,7 @@ def test_osr_esri_26():
     srs = osr.SpatialReference()
     srs.SetFromUserInput("""PROJCS["NAD_1983_HARN_WISCRS_Washburn_County_Meters",GEOGCS["GCS_North_American_1983_HARN",DATUM["D_North_American_1983_HARN",SPHEROID["GRS_1980",6378137.0,298.257222101]],PRIMEM["Greenwich",0.0],UNIT["Degree",0.0174532925199433]],PROJECTION["Lambert_Conformal_Conic"],PARAMETER["False_Easting",234086.8682],PARAMETER["False_Northing",188358.6058],PARAMETER["Central_Meridian",-91.78333333333333],PARAMETER["Standard_Parallel_1",45.96121983333334],PARAMETER["Scale_Factor",1.0000475376],PARAMETER["Latitude_Of_Origin",45.96121983333334],UNIT["Meter",1.0]]""")
     srs.MorphFromESRI()
-    if srs.Validate() != 0:
-        print(srs.ExportToWkt())
-        return 'fail'
+    assert srs.Validate() == 0, srs.ExportToWkt()
 
     return 'success'
 
@@ -1269,7 +1219,7 @@ def test_osr_esri_27():
     srs.MorphFromESRI()
 
     got_wkt = srs.ExportToPrettyWkt()
-    if got_wkt != """PROJCS["Batavia_NEIEZ",
+    assert got_wkt == """PROJCS["Batavia_NEIEZ",
     GEOGCS["GCS_Batavia",
         DATUM["Batavia",
             SPHEROID["Bessel_1841",6377397.155,299.1528128]],
@@ -1280,13 +1230,11 @@ def test_osr_esri_27():
     PARAMETER["False_Northing",900000.0],
     PARAMETER["Central_Meridian",110.0],
     PARAMETER["Standard_Parallel_1",4.45405154589751],
-    UNIT["Meter",1.0]]""":
-        print(got_wkt)
-        return 'fail'
+    UNIT["Meter",1.0]]"""
 
     srs.MorphToESRI()
     got_wkt = srs.ExportToPrettyWkt()
-    if got_wkt != """PROJCS["Batavia_NEIEZ",
+    assert got_wkt == """PROJCS["Batavia_NEIEZ",
     GEOGCS["GCS_Batavia",
         DATUM["D_Batavia",
             SPHEROID["Bessel_1841",6377397.155,299.1528128]],
@@ -1297,9 +1245,7 @@ def test_osr_esri_27():
     PARAMETER["False_Northing",900000.0],
     PARAMETER["Central_Meridian",110.0],
     PARAMETER["Standard_Parallel_1",4.45405154589751],
-    UNIT["Meter",1.0]]""":
-        print(got_wkt)
-        return 'fail'
+    UNIT["Meter",1.0]]"""
 
     return 'success'
 
@@ -1339,7 +1285,7 @@ def test_osr_esri_28():
     srs.MorphToESRI()
     got_wkt = srs.ExportToPrettyWkt()
     # Do not do exact test because of subtle difference of precision among compilers
-    if got_wkt.find("""PROJCS["Segara_Jakarta_NEIEZ_deprecated",
+    assert got_wkt.find("""PROJCS["Segara_Jakarta_NEIEZ_deprecated",
     GEOGCS["GCS_Segara (Jakarta)",
         DATUM["D_Gunung_Segara",
             SPHEROID["Bessel_1841",6377397.155,299.1528128]],
@@ -1349,14 +1295,12 @@ def test_osr_esri_28():
     PARAMETER["central_meridian",110],
     PARAMETER["false_easting",3900000],
     PARAMETER["false_northing",900000],
-    PARAMETER["standard_parallel_1",4.45405154""") != 0:
-        print(got_wkt)
-        return 'fail'
+    PARAMETER["standard_parallel_1",4.45405154""") == 0
 
     srs.MorphFromESRI()
     got_wkt = srs.ExportToPrettyWkt()
     # Do not do exact test because of subtle difference of precision among compilers
-    if got_wkt.find("""PROJCS["Segara_Jakarta_NEIEZ_deprecated",
+    assert got_wkt.find("""PROJCS["Segara_Jakarta_NEIEZ_deprecated",
     GEOGCS["GCS_Segara (Jakarta)",
         DATUM["Gunung_Segara_Jakarta",
             SPHEROID["Bessel_1841",6377397.155,299.1528128]],
@@ -1366,9 +1310,7 @@ def test_osr_esri_28():
     PARAMETER["central_meridian",110],
     PARAMETER["false_easting",3900000],
     PARAMETER["false_northing",900000],
-    PARAMETER["standard_parallel_1",4.45405154""") != 0:
-        print(got_wkt)
-        return 'fail'
+    PARAMETER["standard_parallel_1",4.45405154""") == 0
 
     return 'success'
 
@@ -1383,7 +1325,7 @@ def test_osr_esri_29():
 
     srs.MorphToESRI()
     got_wkt = srs.ExportToPrettyWkt()
-    if got_wkt != """PROJCS["WGS_1984_Web_Mercator_Auxiliary_Sphere",
+    assert got_wkt == """PROJCS["WGS_1984_Web_Mercator_Auxiliary_Sphere",
     GEOGCS["GCS_WGS_1984",
         DATUM["D_WGS_1984",
             SPHEROID["WGS_1984",6378137.0,298.257223563]],
@@ -1395,13 +1337,11 @@ def test_osr_esri_29():
     PARAMETER["Central_Meridian",0.0],
     PARAMETER["Standard_Parallel_1",0.0],
     PARAMETER["Auxiliary_Sphere_Type",0.0],
-    UNIT["Meter",1.0]]""":
-        print(got_wkt)
-        return 'fail'
+    UNIT["Meter",1.0]]"""
 
     srs.MorphFromESRI()
     got_wkt = srs.ExportToPrettyWkt()
-    if got_wkt != """PROJCS["WGS 84 / Pseudo-Mercator",
+    assert got_wkt == """PROJCS["WGS 84 / Pseudo-Mercator",
     GEOGCS["WGS 84",
         DATUM["WGS_1984",
             SPHEROID["WGS 84",6378137,298.257223563,
@@ -1422,15 +1362,13 @@ def test_osr_esri_29():
     AXIS["X",EAST],
     AXIS["Y",NORTH],
     EXTENSION["PROJ4","+proj=merc +a=6378137 +b=6378137 +lat_ts=0.0 +lon_0=0.0 +x_0=0.0 +y_0=0 +k=1.0 +units=m +nadgrids=@null +wktext +no_defs"],
-    AUTHORITY["EPSG","3857"]]""":
-        print(got_wkt)
-        return 'fail'
+    AUTHORITY["EPSG","3857"]]"""
 
     # 6134
     srs.SetFromUserInput("""PROJCS["WGS_84_Pseudo_Mercator",GEOGCS["GCS_WGS_1984",DATUM["D_WGS_1984",SPHEROID["WGS_1984",6378137,298.257223563]],PRIMEM["Greenwich",0],UNIT["Degree",0.017453292519943295]],PROJECTION["Mercator"],PARAMETER["central_meridian",0],PARAMETER["false_easting",0],PARAMETER["false_northing",0],UNIT["Meter",1],PARAMETER["standard_parallel_1",0.0]]""")
     srs.MorphFromESRI()
     got_wkt = srs.ExportToPrettyWkt()
-    if got_wkt != """PROJCS["WGS 84 / Pseudo-Mercator",
+    assert got_wkt == """PROJCS["WGS 84 / Pseudo-Mercator",
     GEOGCS["WGS 84",
         DATUM["WGS_1984",
             SPHEROID["WGS 84",6378137,298.257223563,
@@ -1451,9 +1389,7 @@ def test_osr_esri_29():
     AXIS["X",EAST],
     AXIS["Y",NORTH],
     EXTENSION["PROJ4","+proj=merc +a=6378137 +b=6378137 +lat_ts=0.0 +lon_0=0.0 +x_0=0.0 +y_0=0 +k=1.0 +units=m +nadgrids=@null +wktext +no_defs"],
-    AUTHORITY["EPSG","3857"]]""":
-        print(got_wkt)
-        return 'fail'
+    AUTHORITY["EPSG","3857"]]"""
 
     return 'success'
 
@@ -1478,9 +1414,7 @@ def test_osr_esri_30():
 
     srs_wkt = osr.SpatialReference(wkt=wkt)
 
-    if not srs_prj.IsSame(srs_wkt):
-        print(srs_prj)
-        return 'fail'
+    assert srs_prj.IsSame(srs_wkt)
 
     return 'success'
 
@@ -1528,9 +1462,7 @@ def test_osr_esri_31():
 
     srs_wkt = osr.SpatialReference(wkt=wkt)
 
-    if not srs_prj.IsSame(srs_wkt):
-        print(srs_prj)
-        return 'fail'
+    assert srs_prj.IsSame(srs_wkt)
 
     return 'success'
 
@@ -1548,9 +1480,8 @@ def test_osr_esri_32():
     srs_prj = osr.SpatialReference()
     with gdaltest.error_handler('CPLQuietErrorHandler'):
         result = srs_prj.ImportFromESRI(prj)
-        if result != ogr.OGRERR_CORRUPT_DATA:
-            gdaltest.post_reason('Corrupt EQUIDISTANT_CONIC not marked corrupt')
-            return 'fail'
+        assert result == ogr.OGRERR_CORRUPT_DATA, \
+            'Corrupt EQUIDISTANT_CONIC not marked corrupt'
 
     return 'success'
 
diff --git a/autotest/osr/osr_getprojectionmethods.py b/autotest/osr/osr_getprojectionmethods.py
index 3afe24e76ffe..b332c167a14f 100755
--- a/autotest/osr/osr_getprojectionmethods.py
+++ b/autotest/osr/osr_getprojectionmethods.py
@@ -41,8 +41,7 @@
 def test_osr_getprojectionmethods_1():
 
     methods = osr.GetProjectionMethods()
-    if methods[0][0] != 'Transverse_Mercator':
-        return 'fail'
+    assert methods[0][0] == 'Transverse_Mercator'
 
     return 'success'
 
diff --git a/autotest/osr/osr_metacrs.py b/autotest/osr/osr_metacrs.py
index facb68035da2..ce5a183eb199 100755
--- a/autotest/osr/osr_metacrs.py
+++ b/autotest/osr/osr_metacrs.py
@@ -125,8 +125,7 @@ def parse_line(self):
             self.dst_srs = self.build_srs(test_line['tgtCrsType'],
                                           test_line['tgtCrs'])
 
-        if self.src_srs is None or self.dst_srs is None:
-            return 'fail'
+        assert not (self.src_srs is None or self.dst_srs is None)
 
         try:
             self.src_xyz = (float(test_line['srcOrd1']),
diff --git a/autotest/osr/osr_micoordsys.py b/autotest/osr/osr_micoordsys.py
index f19ed8edd56e..d8b217444f40 100755
--- a/autotest/osr/osr_micoordsys.py
+++ b/autotest/osr/osr_micoordsys.py
@@ -33,6 +33,7 @@
 
 import gdaltest
 from osgeo import osr
+import pytest
 
 ###############################################################################
 # Test the osr.SpatialReference.ImportFromMICoordSys() function.
@@ -51,8 +52,7 @@ def test_osr_micoordsys_1():
        or abs(srs.GetProjParm(osr.SRS_PP_FALSE_EASTING) - 0.0) > 0.0000005 \
        or abs(srs.GetProjParm(osr.SRS_PP_FALSE_NORTHING) - 0.0) > 0.0000005:
         print(srs.ExportToPrettyWkt())
-        gdaltest.post_reason('Can not export Lambert Conformal Conic projection.')
-        return 'fail'
+        pytest.fail('Can not export Lambert Conformal Conic projection.')
 
     return 'success'
 
@@ -79,10 +79,8 @@ def test_osr_micoordsys_2():
 
     proj = srs.ExportToMICoordSys()
 
-    if proj != 'Earth Projection 3, 62, "m", -117.474542888889, 33.7644620277778, 33.9036340277778, 33.6252900277778, 0, 0':
-        print(proj)
-        gdaltest.post_reason('Can not import Lambert Conformal Conic projection.')
-        return 'fail'
+    assert proj == 'Earth Projection 3, 62, "m", -117.474542888889, 33.7644620277778, 33.9036340277778, 33.6252900277778, 0, 0', \
+        'Can not import Lambert Conformal Conic projection.'
 
     return 'success'
 
@@ -98,23 +96,17 @@ def test_osr_micoordsys_3():
 
     proj = srs.ExportToMICoordSys()
 
-    if proj != 'Earth Projection 10, 157, "m", 0':
-        print(proj)
-        return 'fail'
+    assert proj == 'Earth Projection 10, 157, "m", 0'
 
     srs = osr.SpatialReference()
     srs.ImportFromMICoordSys('Earth Projection 10, 157, "m", 0')
     wkt = srs.ExportToWkt()
-    if wkt.find('EXTENSION["PROJ4"') < 0:
-        print(wkt)
-        return 'fail'
+    assert wkt.find('EXTENSION["PROJ4"') >= 0
 
     # Transform again to MITAB (we no longer have the EPSG code, so we rely on PROJ4 extension node)
     proj = srs.ExportToMICoordSys()
 
-    if proj != 'Earth Projection 10, 157, "m", 0':
-        print(proj)
-        return 'fail'
+    assert proj == 'Earth Projection 10, 157, "m", 0'
 
     return 'success'
 
diff --git a/autotest/osr/osr_ozi.py b/autotest/osr/osr_ozi.py
index 3e532ed1ca72..258727465dd3 100755
--- a/autotest/osr/osr_ozi.py
+++ b/autotest/osr/osr_ozi.py
@@ -51,8 +51,7 @@ def test_osr_ozi_1():
 
     expected = 'PROJCS["unnamed",GEOGCS["WGS 84",DATUM["WGS_1984",SPHEROID["WGS 84",6378137,298.257223563,AUTHORITY["EPSG","7030"]],AUTHORITY["EPSG","6326"]],PRIMEM["Greenwich",0,AUTHORITY["EPSG","8901"]],UNIT["degree",0.0174532925199433,AUTHORITY["EPSG","9122"]],AUTHORITY["EPSG","4326"]],PROJECTION["Lambert_Conformal_Conic_2SP"],PARAMETER["standard_parallel_1",40],PARAMETER["standard_parallel_2",56],PARAMETER["latitude_of_origin",4],PARAMETER["central_meridian",10],PARAMETER["false_easting",0],PARAMETER["false_northing",0],UNIT["Meter",1]]'
 
-    if not gdaltest.equal_srs_from_wkt(expected, srs.ExportToWkt()):
-        return 'fail'
+    assert gdaltest.equal_srs_from_wkt(expected, srs.ExportToWkt())
 
     return 'success'
 
@@ -74,8 +73,7 @@ def test_osr_ozi_2():
     srs_ref = osr.SpatialReference()
     srs_ref.ImportFromEPSG(4301)
 
-    if not gdaltest.equal_srs_from_wkt(srs_ref.ExportToWkt(), srs.ExportToWkt()):
-        return 'fail'
+    assert gdaltest.equal_srs_from_wkt(srs_ref.ExportToWkt(), srs.ExportToWkt())
 
     return 'success'
 
@@ -96,8 +94,7 @@ def test_osr_ozi_3():
 
     expected = 'GEOGCS["European 1950 (Mean France)",DATUM["European 1950 (Mean France)",SPHEROID["International 1924",6378388,297],TOWGS84[-87,-96,-120,0,0,0,0]],PRIMEM["Greenwich",0],UNIT["degree",0.0174532925199433]]'
 
-    if not gdaltest.equal_srs_from_wkt(expected, srs.ExportToWkt()):
-        return 'fail'
+    assert gdaltest.equal_srs_from_wkt(expected, srs.ExportToWkt())
 
     return 'success'
 
diff --git a/autotest/osr/osr_pci.py b/autotest/osr/osr_pci.py
index f33d96c663a8..47526ff177bc 100755
--- a/autotest/osr/osr_pci.py
+++ b/autotest/osr/osr_pci.py
@@ -42,27 +42,16 @@ def test_osr_pci_1():
     srs = osr.SpatialReference()
     srs.ImportFromPCI('EC          E015', 'METRE', prj_parms)
 
-    if abs(srs.GetProjParm(osr.SRS_PP_STANDARD_PARALLEL_1) - 47.0) > 0.0000005 \
-       or abs(srs.GetProjParm(osr.SRS_PP_STANDARD_PARALLEL_2) - 62.0) > 0.0000005 \
-       or abs(srs.GetProjParm(osr.SRS_PP_LATITUDE_OF_CENTER) - 54.5) > 0.0000005 \
-       or abs(srs.GetProjParm(osr.SRS_PP_LONGITUDE_OF_CENTER) - 45.0) > 0.0000005 \
-       or abs(srs.GetProjParm(osr.SRS_PP_FALSE_EASTING) - 0.0) > 0.0000005 \
-       or abs(srs.GetProjParm(osr.SRS_PP_FALSE_NORTHING) - 0.0) > 0.0000005:
-        gdaltest.post_reason('Can not import Equidistant Conic projection.')
-        return 'fail'
+    assert abs(srs.GetProjParm(osr.SRS_PP_STANDARD_PARALLEL_1) - 47.0) <= 0.0000005 and abs(srs.GetProjParm(osr.SRS_PP_STANDARD_PARALLEL_2) - 62.0) <= 0.0000005 and abs(srs.GetProjParm(osr.SRS_PP_LATITUDE_OF_CENTER) - 54.5) <= 0.0000005 and abs(srs.GetProjParm(osr.SRS_PP_LONGITUDE_OF_CENTER) - 45.0) <= 0.0000005 and abs(srs.GetProjParm(osr.SRS_PP_FALSE_EASTING) - 0.0) <= 0.0000005 and abs(srs.GetProjParm(osr.SRS_PP_FALSE_NORTHING) - 0.0) <= 0.0000005, \
+        'Can not import Equidistant Conic projection.'
 
     expected = 'PROJCS["unnamed",GEOGCS["Unknown - PCI E015",DATUM["Unknown - PCI E015",SPHEROID["Krassowsky 1940",6378245,298.3,AUTHORITY["EPSG","7024"]]],PRIMEM["Greenwich",0],UNIT["degree",0.0174532925199433]],PROJECTION["Equidistant_Conic"],PARAMETER["standard_parallel_1",47],PARAMETER["standard_parallel_2",62],PARAMETER["latitude_of_center",54.5],PARAMETER["longitude_of_center",45],PARAMETER["false_easting",0],PARAMETER["false_northing",0],UNIT["Meter",1]]'
 
-    if not gdaltest.equal_srs_from_wkt(expected, srs.ExportToWkt()):
-        return 'fail'
+    assert gdaltest.equal_srs_from_wkt(expected, srs.ExportToWkt())
 
     pci_parms = srs.ExportToPCI()
-    if pci_parms[0] != 'EC          E015' \
-       or pci_parms[1] != 'METRE' \
-       or pci_parms[2] != prj_parms:
-        print(pci_parms)
-        gdaltest.post_reason('ExportToPCI result wrong.')
-        return 'fail'
+    assert pci_parms[0] == 'EC          E015' and pci_parms[1] == 'METRE' and pci_parms[2] == prj_parms, \
+        'ExportToPCI result wrong.'
 
     return 'success'
 
@@ -89,13 +78,8 @@ def test_osr_pci_2():
 
     (proj, units, parms) = srs.ExportToPCI()
 
-    if proj != 'LCC         D-01' or units != 'METRE' \
-       or abs(parms[2] - -117.4745429) > 0.0000005 \
-       or abs(parms[3] - 33.76446203) > 0.0000005 \
-       or abs(parms[4] - 33.90363403) > 0.0000005 \
-       or abs(parms[5] - 33.62529003) > 0.0000005:
-        gdaltest.post_reason('Can not import Lambert Conformal Conic projection.')
-        return 'fail'
+    assert proj == 'LCC         D-01' and units == 'METRE' and abs(parms[2] - -117.4745429) <= 0.0000005 and abs(parms[3] - 33.76446203) <= 0.0000005 and abs(parms[4] - 33.90363403) <= 0.0000005 and abs(parms[5] - 33.62529003) <= 0.0000005, \
+        'Can not import Lambert Conformal Conic projection.'
 
     return 'success'
 
@@ -152,16 +136,11 @@ def test_osr_pci_4():
 
     expected = 'GEOGCS["Rijksdriehoeks Datum",DATUM["Rijksdriehoeks Datum",SPHEROID["Bessel 1841",6377397.155,299.1528128,AUTHORITY["EPSG","7004"]],TOWGS84[565.04,49.91,465.84,0.4094,-0.3597,1.8685,4.077200000063286]],PRIMEM["Greenwich",0],UNIT["degree",0.0174532925199433]]'
 
-    if not gdaltest.equal_srs_from_wkt(expected, srs.ExportToWkt()):
-        return 'fail'
+    assert gdaltest.equal_srs_from_wkt(expected, srs.ExportToWkt())
 
     pci_parms = srs.ExportToPCI()
-    if pci_parms[0] != 'LONG/LAT    D506' \
-       or pci_parms[1] != 'DEGREE' \
-       or pci_parms[2] != prj_parms:
-        print(pci_parms)
-        gdaltest.post_reason('ExportToPCI result wrong.')
-        return 'fail'
+    assert pci_parms[0] == 'LONG/LAT    D506' and pci_parms[1] == 'DEGREE' and pci_parms[2] == prj_parms, \
+        'ExportToPCI result wrong.'
 
     return 'success'
 
@@ -179,16 +158,11 @@ def test_osr_pci_5():
 
     expected = 'GEOGCS["Unknown - PCI E224",DATUM["Unknown - PCI E224",SPHEROID["Xian 1980",6378140,298.2569978029123]],PRIMEM["Greenwich",0],UNIT["degree",0.0174532925199433]]'
 
-    if not gdaltest.equal_srs_from_wkt(expected, srs.ExportToWkt()):
-        return 'fail'
+    assert gdaltest.equal_srs_from_wkt(expected, srs.ExportToWkt())
 
     pci_parms = srs.ExportToPCI()
-    if pci_parms[0] != 'LONG/LAT    E224' \
-       or pci_parms[1] != 'DEGREE' \
-       or pci_parms[2] != prj_parms:
-        print(pci_parms)
-        gdaltest.post_reason('ExportToPCI result wrong.')
-        return 'fail'
+    assert pci_parms[0] == 'LONG/LAT    E224' and pci_parms[1] == 'DEGREE' and pci_parms[2] == prj_parms, \
+        'ExportToPCI result wrong.'
 
     return 'success'
 
@@ -206,16 +180,11 @@ def test_osr_pci_6():
 
     expected = 'GEOGCS["AGD84",DATUM["Australian_Geodetic_Datum_1984",SPHEROID["Australian National Spheroid",6378160,298.25,AUTHORITY["EPSG","7003"]],TOWGS84[-134,-48,149,0,0,0,0],AUTHORITY["EPSG","6203"]],PRIMEM["Greenwich",0,AUTHORITY["EPSG","8901"]],UNIT["degree",0.0174532925199433,AUTHORITY["EPSG","9122"]],AUTHORITY["EPSG","4203"]]'
 
-    if not gdaltest.equal_srs_from_wkt(expected, srs.ExportToWkt()):
-        return 'fail'
+    assert gdaltest.equal_srs_from_wkt(expected, srs.ExportToWkt())
 
     pci_parms = srs.ExportToPCI()
-    if pci_parms[0] != 'LONG/LAT    D030' \
-       or pci_parms[1] != 'DEGREE' \
-       or pci_parms[2] != prj_parms:
-        print(pci_parms)
-        gdaltest.post_reason('ExportToPCI result wrong.')
-        return 'fail'
+    assert pci_parms[0] == 'LONG/LAT    D030' and pci_parms[1] == 'DEGREE' and pci_parms[2] == prj_parms, \
+        'ExportToPCI result wrong.'
 
     return 'success'
 
@@ -233,12 +202,8 @@ def test_osr_pci_7():
     prj_parms = (0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0)
 
     pci_parms = srs.ExportToPCI()
-    if pci_parms[0] != 'LONG/LAT    D506' \
-       or pci_parms[1] != 'DEGREE' \
-       or pci_parms[2] != prj_parms:
-        print(pci_parms)
-        gdaltest.post_reason('ExportToPCI result wrong.')
-        return 'fail'
+    assert pci_parms[0] == 'LONG/LAT    D506' and pci_parms[1] == 'DEGREE' and pci_parms[2] == prj_parms, \
+        'ExportToPCI result wrong.'
 
     return 'success'
 
diff --git a/autotest/osr/osr_pm.py b/autotest/osr/osr_pm.py
index be6eecfc1732..39d6f4d578ee 100755
--- a/autotest/osr/osr_pm.py
+++ b/autotest/osr/osr_pm.py
@@ -45,13 +45,11 @@ def test_osr_pm_1():
     srs = osr.SpatialReference()
     srs.ImportFromEPSG(27572)
 
-    if abs(float(srs.GetAttrValue('PRIMEM', 1)) - 2.33722917) > 0.0000005:
-        gdaltest.post_reason('Wrong prime meridian.')
-        return 'fail'
+    assert abs(float(srs.GetAttrValue('PRIMEM', 1)) - 2.33722917) <= 0.0000005, \
+        'Wrong prime meridian.'
 
-    if abs(srs.GetProjParm(osr.SRS_PP_CENTRAL_MERIDIAN) - 0.0) > 0.0000005:
-        gdaltest.post_reason('Wrong central meridian.')
-        return 'fail'
+    assert abs(srs.GetProjParm(osr.SRS_PP_CENTRAL_MERIDIAN) - 0.0) <= 0.0000005, \
+        'Wrong central meridian.'
 
     return 'success'
 
@@ -66,15 +64,9 @@ def test_osr_pm_2():
     srs.ImportFromEPSG(27572)
     proj4_srs = srs.ExportToProj4()
 
-    if proj4_srs.find('+pm=paris') == -1:
-        print(proj4_srs)
-        gdaltest.post_reason('prime meridian wrong or missing.')
-        return 'fail'
+    assert proj4_srs.find('+pm=paris') != -1, 'prime meridian wrong or missing.'
 
-    if proj4_srs.find('+lon_0=0') == -1:
-        print(proj4_srs)
-        gdaltest.post_reason('+lon_0 is wrong.')
-        return 'fail'
+    assert proj4_srs.find('+lon_0=0') != -1, '+lon_0 is wrong.'
 
     return 'success'
 
@@ -88,13 +80,11 @@ def test_osr_pm_3():
     srs = osr.SpatialReference()
     srs.ImportFromProj4('+proj=utm +zone=30 +datum=WGS84 +pm=bogota')
 
-    if abs(float(srs.GetAttrValue('PRIMEM', 1)) + 74.08091666678081) > 0.0000005:
-        gdaltest.post_reason('Wrong prime meridian.')
-        return 'fail'
+    assert abs(float(srs.GetAttrValue('PRIMEM', 1)) + 74.08091666678081) <= 0.0000005, \
+        'Wrong prime meridian.'
 
-    if abs(srs.GetProjParm(osr.SRS_PP_CENTRAL_MERIDIAN) + 3.0) > 0.0000005:
-        gdaltest.post_reason('Wrong central meridian.')
-        return 'fail'
+    assert abs(srs.GetProjParm(osr.SRS_PP_CENTRAL_MERIDIAN) + 3.0) <= 0.0000005, \
+        'Wrong central meridian.'
 
     return 'success'
 
diff --git a/autotest/osr/osr_proj4.py b/autotest/osr/osr_proj4.py
index 5a6872004fe3..984835ae5d00 100755
--- a/autotest/osr/osr_proj4.py
+++ b/autotest/osr/osr_proj4.py
@@ -37,6 +37,7 @@
 
 from osgeo import gdal, osr
 import gdaltest
+import pytest
 
 ###############################################################################
 # Return True if proj is at least 4.8.0
@@ -97,9 +98,8 @@ def test_osr_proj4_1():
     srs = osr.SpatialReference()
     srs.ImportFromProj4('+proj=tmerc +lat_0=53.5000000000 +lon_0=-8.0000000000 +k_0=1.0000350000 +x_0=200000.0000000000 +y_0=250000.0000000000 +a=6377340.189000 +rf=299.324965 +towgs84=482.530,-130.596,564.557,-1.042,-0.214,-0.631,8.15')
 
-    if abs(srs.GetProjParm(osr.SRS_PP_SCALE_FACTOR) - 1.000035) > 0.0000005:
-        gdaltest.post_reason('+k_0 not supported on import from PROJ.4?')
-        return 'fail'
+    assert abs(srs.GetProjParm(osr.SRS_PP_SCALE_FACTOR) - 1.000035) <= 0.0000005, \
+        '+k_0 not supported on import from PROJ.4?'
 
     return 'success'
 
@@ -114,14 +114,12 @@ def test_osr_proj4_2():
     srs = osr.SpatialReference()
     srs.ImportFromProj4("+proj=lcc +x_0=0.6096012192024384e+06 +y_0=0 +lon_0=90dw +lat_0=42dn +lat_1=44d4'n +lat_2=42d44'n +a=6378206.400000 +rf=294.978698 +nadgrids=conus,ntv1_can.dat +units=m")
 
-    if abs(srs.GetProjParm(osr.SRS_PP_FALSE_EASTING) - 609601.219) > 0.0005:
-        gdaltest.post_reason('Parsing exponents not supported?')
-        return 'fail'
+    assert abs(srs.GetProjParm(osr.SRS_PP_FALSE_EASTING) - 609601.219) <= 0.0005, \
+        'Parsing exponents not supported?'
 
     if srs.Validate() != 0:
-        gdaltest.post_reason('does not validate')
         print(srs.ExportToPrettyWkt())
-        return 'fail'
+        pytest.fail('does not validate')
 
     return 'success'
 
@@ -185,13 +183,10 @@ def test_osr_proj4_5():
 
     srs.ImportFromProj4('+proj=lcc +lat_1=46.8 +lat_0=46.8 +lon_0=0 +k_0=0.99987742 +x_0=600000 +y_0=2200000 +a=6378249.2 +b=6356515 +towgs84=-168,-60,320,0,0,0,0 +pm=paris +units=m +no_defs')
 
-    if abs(float(srs.GetAttrValue('PRIMEM', 1)) - 2.3372291667) > 0.00000001:
-        gdaltest.post_reason('prime meridian lost?')
-        return 'fail'
+    assert abs(float(srs.GetAttrValue('PRIMEM', 1)) - 2.3372291667) <= 0.00000001, \
+        'prime meridian lost?'
 
-    if abs(srs.GetProjParm('central_meridian')) != 0.0:
-        gdaltest.post_reason('central meridian altered?')
-        return 'fail'
+    assert abs(srs.GetProjParm('central_meridian')) == 0.0, 'central meridian altered?'
 
     p4 = srs.ExportToProj4()
     srs2 = osr.SpatialReference()
@@ -238,8 +233,7 @@ def test_osr_proj4_6():
     if proj4 != expect_proj4:
         print('Got:', proj4)
         print('Expected:', expect_proj4)
-        gdaltest.post_reason('Failed to translate non-zero lat-of-origin mercator.')
-        return 'fail'
+        pytest.fail('Failed to translate non-zero lat-of-origin mercator.')
 
     # Translate back - should be mercator 1sp
 
@@ -266,8 +260,7 @@ def test_osr_proj4_6():
     if wkt != expect_wkt:
         print('Got:   %s' % wkt)
         print('Expect:%s' % expect_wkt)
-        gdaltest.post_reason('did not get expected mercator_2sp result.')
-        return 'fail'
+        pytest.fail('did not get expected mercator_2sp result.')
 
     return 'success'
 
@@ -284,11 +277,10 @@ def test_osr_proj4_7():
     proj4 = srs.ExportToProj4()
     expected = '+proj=somerc +lat_0=47.14439372222222 +lon_0=19.04857177777778 +k_0=0.99993 +x_0=650000 +y_0=200000 +ellps=GRS67 +towgs84=52.17,-71.82,-14.9,0,0,0,0 +units=m +no_defs '
     if proj4 != expected:
-        gdaltest.post_reason('did not get expected proj.4 translation of somerc')
         print('')
         print('Got:     "%s"' % proj4)
         print('Expected:"%s"' % expected)
-        return 'fail'
+        pytest.fail('did not get expected proj.4 translation of somerc')
 
     srs.ImportFromProj4(proj4)
 
@@ -311,9 +303,8 @@ def test_osr_proj4_7():
 
     srs_expected = osr.SpatialReference(wkt=expected)
     if not srs.IsSame(srs_expected):
-        gdaltest.post_reason('did not get expected wkt.')
         print('Got: %s' % srs.ExportToPrettyWkt())
-        return 'fail'
+        pytest.fail('did not get expected wkt.')
 
     return 'success'
 
@@ -328,19 +319,13 @@ def test_osr_proj4_8():
 
     proj4 = srs.ExportToProj4()
     expected = '+proj=merc +a=6378137 +b=6378137 +lat_ts=0.0 +lon_0=0.0 +x_0=0.0 +y_0=0 +k=1.0 +units=m +nadgrids=@null +wktext +no_defs'
-    if proj4 != expected:
-        gdaltest.post_reason('did not get expected EPSG:3857 (google mercator) result.')
-        print(proj4)
-        return 'fail'
+    assert proj4 == expected, 'did not get expected EPSG:3857 (google mercator) result.'
 
     srs = osr.SpatialReference()
     srs.ImportFromEPSG(3785)
 
     proj4 = srs.ExportToProj4()
-    if proj4 != expected:
-        gdaltest.post_reason('did not get expected EPSG:3785 (google mercator) result.')
-        print(proj4)
-        return 'fail'
+    assert proj4 == expected, 'did not get expected EPSG:3785 (google mercator) result.'
 
     return 'success'
 
@@ -356,19 +341,13 @@ def test_osr_proj4_9():
 
     proj4 = srs.ExportToProj4()
     expected = '+proj=longlat +datum=NAD27 +no_defs '
-    if proj4 != expected:
-        gdaltest.post_reason('did not get expected EPSG:4267 (NAD27)')
-        print(proj4)
-        return 'fail'
+    assert proj4 == expected, 'did not get expected EPSG:4267 (NAD27)'
 
     srs = osr.SpatialReference()
     srs.SetFromUserInput('NAD27')
 
     proj4 = srs.ExportToProj4()
-    if proj4 != expected:
-        gdaltest.post_reason('did not get expected "NAD27"')
-        print(proj4)
-        return 'fail'
+    assert proj4 == expected, 'did not get expected "NAD27"'
 
     return 'success'
 
@@ -384,19 +363,17 @@ def test_osr_proj4_10():
 
     wkt_expected = 'GEOCCS["Geocentric",DATUM["unknown",SPHEROID["WGS84",6378137,298.257223563],TOWGS84[0,0,0,0,0,0,0]],PRIMEM["Greenwich",0]]'
 
-    if not gdaltest.equal_srs_from_wkt(wkt_expected, srs.ExportToWkt()):
-        gdaltest.post_reason('did not get expected wkt.')
-        return 'fail'
+    assert gdaltest.equal_srs_from_wkt(wkt_expected, srs.ExportToWkt()), \
+        'did not get expected wkt.'
 
     p4 = srs.ExportToProj4()
     srs2 = osr.SpatialReference()
     srs2.ImportFromProj4(p4)
 
     if not srs.IsSame(srs2):
-        gdaltest.post_reason('round trip via PROJ.4 damaged srs?')
         print(srs.ExportToPrettyWkt())
         print(srs2.ExportToPrettyWkt())
-        return 'fail'
+        pytest.fail('round trip via PROJ.4 damaged srs?')
 
     return 'success'
 
@@ -485,17 +462,12 @@ def test_osr_proj4_11():
         # print(proj4str)
         srs.ImportFromProj4(proj4str)
         if srs.Validate() != 0:
-            gdaltest.post_reason('does not validate')
             print(proj4str)
             print(srs.ExportToPrettyWkt())
-            return 'fail'
+            pytest.fail('does not validate')
         out = srs.ExportToProj4()
 
-        if out != proj4str:
-            gdaltest.post_reason('round trip via PROJ.4 failed')
-            print(proj4str)
-            print(out)
-            return 'fail'
+        assert out == proj4str, 'round trip via PROJ.4 failed'
 
     return 'success'
 
@@ -524,8 +496,7 @@ def test_osr_proj4_12():
     if wkt.find("""GEOGCS["WGS 84""") != 0:
         print('Got:%s' % wkt)
         print('Expected:%s' % expect_wkt)
-        gdaltest.post_reason('Did not get expected result.')
-        return 'fail'
+        pytest.fail('Did not get expected result.')
 
     return 'success'
 
@@ -592,8 +563,7 @@ def test_osr_proj4_14():
     if wkt != expect_wkt:
         print('Got:%s' % wkt)
         print('Expected:%s' % expect_wkt)
-        gdaltest.post_reason('Did not get expected result.')
-        return 'fail'
+        pytest.fail('Did not get expected result.')
 
     srs = osr.SpatialReference()
     srs.ImportFromEPSG(32600 + 32)
@@ -604,8 +574,7 @@ def test_osr_proj4_14():
     if proj4str != expect_proj4str:
         print('Got:%s' % proj4str)
         print('Expected:%s' % expect_proj4str)
-        gdaltest.post_reason('Did not get expected result.')
-        return 'fail'
+        pytest.fail('Did not get expected result.')
 
     # Test exporting standard Transverse_Mercator, with OSR_USE_ETMERC=YES
     gdal.SetConfigOption('OSR_USE_ETMERC', 'YES')
@@ -615,8 +584,7 @@ def test_osr_proj4_14():
     if proj4str != expect_proj4str:
         print('Got:%s' % proj4str)
         print('Expected:%s' % expect_proj4str)
-        gdaltest.post_reason('Did not get expected result.')
-        return 'fail'
+        pytest.fail('Did not get expected result.')
 
     # Test exporting standard Transverse_Mercator, with OSR_USE_ETMERC=NO
     gdal.SetConfigOption('OSR_USE_ETMERC', 'NO')
@@ -626,8 +594,7 @@ def test_osr_proj4_14():
     if proj4str != expect_proj4str:
         print('Got:%s' % proj4str)
         print('Expected:%s' % expect_proj4str)
-        gdaltest.post_reason('Did not get expected result.')
-        return 'fail'
+        pytest.fail('Did not get expected result.')
 
     return 'success'
 
@@ -642,13 +609,9 @@ def test_osr_proj4_15():
     if srs.ImportFromProj4("+init=IGNF:LAMB93") != 0:
         return 'skip'
 
-    if srs.GetAuthorityName(None) != 'IGNF' or srs.GetAuthorityCode(None) != 'LAMB93':
-        print(srs)
-        return 'fail'
+    assert srs.GetAuthorityName(None) == 'IGNF' and srs.GetAuthorityCode(None) == 'LAMB93'
 
-    if srs.Validate() != 0:
-        print(srs)
-        return 'fail'
+    assert srs.Validate() == 0
 
     return 'success'
 
@@ -687,12 +650,10 @@ def almost(a, b):
 
     srs = osr.SpatialReference()
     for u in units:
-        if srs.ImportFromProj4('+proj=utm +zone=11 +datum=WGS84 +units=%s' % u[0]) != 0:
-            return 'fail'
+        assert srs.ImportFromProj4('+proj=utm +zone=11 +datum=WGS84 +units=%s' % u[0]) == 0
         to_met = srs.GetLinearUnits()
-        if not almost(to_met, u[1]):
-            gdaltest.post_reason('Did not get expected units: %s vs %s' % (str(u), str(to_met)))
-            return 'fail'
+        assert almost(to_met, u[1]), \
+            ('Did not get expected units: %s vs %s' % (str(u), str(to_met)))
     return 'success'
 
 ###############################################################################
@@ -726,12 +687,10 @@ def test_osr_proj4_17():
 
     srs = osr.SpatialReference()
     for u in units:
-        if srs.ImportFromProj4('+proj=utm +zone=11 +datum=WGS84 +units=%s' % u[0]) != 0:
-            return 'fail'
+        assert srs.ImportFromProj4('+proj=utm +zone=11 +datum=WGS84 +units=%s' % u[0]) == 0
         unit_name = srs.GetLinearUnitsName()
-        if unit_name != u[1]:
-            gdaltest.post_reason('Did not get expected unit name: %s vs %s' % (str(u), str(unit_name)))
-            return 'fail'
+        assert unit_name == u[1], \
+            ('Did not get expected unit name: %s vs %s' % (str(u), str(unit_name)))
     return 'success'
 
 ###############################################################################
@@ -745,17 +704,13 @@ def test_osr_proj4_18():
         srs = osr.SpatialReference()
         srs.ImportFromProj4('+proj=omerc +lat_0=57 +lonc=-133 +alpha=-36 +k=0.9999 +x_0=5000000 +y_0=-5000000 +%s +datum=NAD83 +units=m +no_defs' % p)
         if srs.Validate() != 0:
-            gdaltest.post_reason('does not validate')
             print(srs.ExportToPrettyWkt())
-            return 'fail'
+            pytest.fail('does not validate')
         out = srs.ExportToProj4()
         proj4str = '+proj=omerc +lat_0=57 +lonc=-133 +alpha=-36 +k=0.9999 +x_0=5000000 +y_0=-5000000 +no_uoff +gamma=-36 +ellps=GRS80 +towgs84=0,0,0,0,0,0,0 +units=m +no_defs '
         if out != proj4str:
-            gdaltest.post_reason('round trip via PROJ.4 failed')
             print(p)
-            print(proj4str)
-            print(out)
-            return 'fail'
+            pytest.fail('round trip via PROJ.4 failed')
 
     return 'success'
 
@@ -768,14 +723,11 @@ def test_osr_proj4_19():
     srs = osr.SpatialReference()
     srs.ImportFromProj4("+proj=longlat +datum=WGS84 +nadgrids=@null")
 
-    if srs.ExportToWkt() != 'GEOGCS["WGS 84",DATUM["WGS_1984",SPHEROID["WGS 84",6378137,298.257223563,AUTHORITY["EPSG","7030"]],EXTENSION["PROJ4_GRIDS","@null"],AUTHORITY["EPSG","6326"]],PRIMEM["Greenwich",0,AUTHORITY["EPSG","8901"]],UNIT["degree",0.0174532925199433,AUTHORITY["EPSG","9122"]],AUTHORITY["EPSG","4326"]]':
-        print(srs.ExportToWkt())
-        return 'fail'
+    assert srs.ExportToWkt() == 'GEOGCS["WGS 84",DATUM["WGS_1984",SPHEROID["WGS 84",6378137,298.257223563,AUTHORITY["EPSG","7030"]],EXTENSION["PROJ4_GRIDS","@null"],AUTHORITY["EPSG","6326"]],PRIMEM["Greenwich",0,AUTHORITY["EPSG","8901"]],UNIT["degree",0.0174532925199433,AUTHORITY["EPSG","9122"]],AUTHORITY["EPSG","4326"]]'
 
     if srs.Validate() != 0:
-        gdaltest.post_reason('does not validate')
         print(srs.ExportToPrettyWkt())
-        return 'fail'
+        pytest.fail('does not validate')
 
     return 'success'
 
@@ -788,15 +740,12 @@ def test_osr_proj4_20():
     srs = osr.SpatialReference()
     srs.ImportFromProj4("+proj=longlat +foo=bar +wktext")
 
-    if srs.ExportToWkt() != 'GEOGCS["WGS 84",DATUM["unknown",SPHEROID["WGS84",6378137,298.257223563]],PRIMEM["Greenwich",0],UNIT["degree",0.0174532925199433],EXTENSION["PROJ4","+proj=longlat +foo=bar +wktext"]]' and \
-       srs.ExportToWkt() != 'GEOGCS["unnamed ellipse",DATUM["unknown",SPHEROID["unnamed",6378137,298.257223563]],PRIMEM["Greenwich",0],UNIT["degree",0.0174532925199433],EXTENSION["PROJ4","+proj=longlat +foo=bar +wktext"]]':
-        print(srs.ExportToWkt())
-        return 'fail'
+    assert (srs.ExportToWkt() == 'GEOGCS["WGS 84",DATUM["unknown",SPHEROID["WGS84",6378137,298.257223563]],PRIMEM["Greenwich",0],UNIT["degree",0.0174532925199433],EXTENSION["PROJ4","+proj=longlat +foo=bar +wktext"]]' or \
+       srs.ExportToWkt() == 'GEOGCS["unnamed ellipse",DATUM["unknown",SPHEROID["unnamed",6378137,298.257223563]],PRIMEM["Greenwich",0],UNIT["degree",0.0174532925199433],EXTENSION["PROJ4","+proj=longlat +foo=bar +wktext"]]')
 
     if srs.Validate() != 0:
-        gdaltest.post_reason('does not validate')
         print(srs.ExportToPrettyWkt())
-        return 'fail'
+        pytest.fail('does not validate')
 
     return 'success'
 
@@ -813,9 +762,7 @@ def test_osr_proj4_21():
     got = srs.ExportToProj4()
     gdal.SetConfigOption('OVERRIDE_PROJ_DATUM_WITH_TOWGS84', None)
 
-    if got.find('+proj=longlat +datum=nzgd49') != 0:
-        print(got)
-        return 'fail'
+    assert got.find('+proj=longlat +datum=nzgd49') == 0
 
     return 'success'
 
@@ -829,9 +776,7 @@ def test_osr_proj4_22():
     srs.ImportFromProj4("+proj=longlat +R=1")
     got = srs.ExportToProj4()
 
-    if got.find('+proj=longlat +a=1 +b=1') != 0:
-        print(got)
-        return 'fail'
+    assert got.find('+proj=longlat +a=1 +b=1') == 0
 
     return 'success'
 
@@ -846,17 +791,13 @@ def test_osr_proj4_23():
     srs.ImportFromProj4("+proj=longlat +a=1 +f=0")
     got = srs.ExportToProj4()
 
-    if got.find('+proj=longlat +a=1 +b=1') != 0:
-        print(got)
-        return 'fail'
+    assert got.find('+proj=longlat +a=1 +b=1') == 0
 
     srs = osr.SpatialReference()
     srs.ImportFromProj4("+proj=longlat +a=2 +f=0.5")
     got = srs.ExportToProj4()
 
-    if got.find('+proj=longlat +a=2 +b=1') != 0:
-        print(got)
-        return 'fail'
+    assert got.find('+proj=longlat +a=2 +b=1') == 0
 
     return 'success'
 
@@ -870,36 +811,28 @@ def test_osr_proj4_24():
     srs.ImportFromProj4("+proj=merc +to_meter=1.0")
     got = srs.ExportToProj4()
 
-    if got.find('+units=m') < 0:
-        print(got)
-        return 'fail'
+    assert got.find('+units=m') >= 0
 
     # Intl foot
     srs = osr.SpatialReference()
     srs.ImportFromProj4("+proj=merc +to_meter=0.3048")
     got = srs.ExportToProj4()
 
-    if got.find('+units=ft') < 0:
-        print(got)
-        return 'fail'
+    assert got.find('+units=ft') >= 0
 
     # US foot
     srs = osr.SpatialReference()
     srs.ImportFromProj4("+proj=merc +to_meter=0.3048006096012192")
     got = srs.ExportToProj4()
 
-    if got.find('+units=us-ft') < 0:
-        print(got)
-        return 'fail'
+    assert got.find('+units=us-ft') >= 0
 
     # unknown
     srs = osr.SpatialReference()
     srs.ImportFromProj4("+proj=merc +to_meter=0.4")
     got = srs.ExportToProj4()
 
-    if got.find('+to_meter=0.4') < 0:
-        print(got)
-        return 'fail'
+    assert got.find('+to_meter=0.4') >= 0
 
     return 'success'
 
@@ -916,36 +849,28 @@ def test_osr_proj4_25():
     srs.ImportFromProj4("+proj=merc +geoidgrids=foo +vto_meter=1.0")
     got = srs.ExportToProj4()
 
-    if got.find('+vunits=m') < 0:
-        print(got)
-        return 'fail'
+    assert got.find('+vunits=m') >= 0
 
     # Intl foot
     srs = osr.SpatialReference()
     srs.ImportFromProj4("+proj=merc +geoidgrids=foo +vto_meter=0.3048")
     got = srs.ExportToProj4()
 
-    if got.find('+vunits=ft') < 0:
-        print(got)
-        return 'fail'
+    assert got.find('+vunits=ft') >= 0
 
     # US foot
     srs = osr.SpatialReference()
     srs.ImportFromProj4("+proj=merc +geoidgrids=foo +vto_meter=0.3048006096012192")
     got = srs.ExportToProj4()
 
-    if got.find('+vunits=us-ft') < 0:
-        print(got)
-        return 'fail'
+    assert got.find('+vunits=us-ft') >= 0
 
     # Unknown
     srs = osr.SpatialReference()
     srs.ImportFromProj4("+proj=merc +geoidgrids=foo +vto_meter=0.4")
     got = srs.ExportToProj4()
 
-    if got.find('+vto_meter=0.4') < 0:
-        print(got)
-        return 'fail'
+    assert got.find('+vto_meter=0.4') >= 0
 
     return 'success'
 
@@ -962,27 +887,21 @@ def test_osr_proj4_26():
     srs.ImportFromProj4("+proj=merc +geoidgrids=foo +vunits=m")
     got = srs.ExportToProj4()
 
-    if got.find('+vunits=m') < 0:
-        print(got)
-        return 'fail'
+    assert got.find('+vunits=m') >= 0
 
     # Intl foot
     srs = osr.SpatialReference()
     srs.ImportFromProj4("+proj=merc +geoidgrids=foo +vunits=ft")
     got = srs.ExportToProj4()
 
-    if got.find('+vunits=ft') < 0:
-        print(got)
-        return 'fail'
+    assert got.find('+vunits=ft') >= 0
 
     # US yard
     srs = osr.SpatialReference()
     srs.ImportFromProj4("+proj=merc +geoidgrids=foo +vunits=us-yd")
     got = srs.ExportToProj4()
 
-    if got.find('+vunits=us-yd') < 0:
-        print(got)
-        return 'fail'
+    assert got.find('+vunits=us-yd') >= 0
 
     return 'success'
 
@@ -999,9 +918,7 @@ def test_osr_proj4_27():
     srs.ImportFromProj4("+proj=geos +h=35785831 +lon_0=0 +datum=WGS84 +sweep=x +units=m")
     got = srs.ExportToProj4()
 
-    if got.find('+proj=geos +h=35785831 +lon_0=0 +datum=WGS84 +sweep=x +units=m') < 0:
-        print(got)
-        return 'fail'
+    assert got.find('+proj=geos +h=35785831 +lon_0=0 +datum=WGS84 +sweep=x +units=m') >= 0
 
     return 'success'
 
@@ -1015,9 +932,7 @@ def test_osr_proj4_28():
     srs.ImportFromProj4("+init=epsg:32631 +units=cm")
     got = srs.ExportToWkt()
 
-    if got.find('32631') >= 0:
-        print(got)
-        return 'fail'
+    assert got.find('32631') < 0
 
     return 'success'
 
@@ -1029,9 +944,7 @@ def test_osr_proj4_28_missing_proj_epsg_dict():
         python_exe = python_exe.replace('\\', '/')
 
     ret = gdaltest.runexternal(python_exe + ' osr_proj4.py osr_proj4_28')
-    if ret.find('fail') >= 0:
-        print(ret)
-        return 'fail'
+    assert ret.find('fail') < 0
     return 'success'
 
 
@@ -1043,17 +956,13 @@ def test_osr_proj4_error_cases_export_mercator():
     srs.SetMercator(30.0, 0.0, 0.99, 0.0, 0.0)
     with gdaltest.error_handler():
         got = srs.ExportToProj4()
-    if got != '':
-        print(got)
-        return 'fail'
+    assert got == ''
 
     # latitude_of_origin != 0.0
     srs.SetMercator2SP(0.0, 40.0, 0.0, 0.0, 0.0)
     with gdaltest.error_handler():
         got = srs.ExportToProj4()
-    if got != '':
-        print(got)
-        return 'fail'
+    assert got == ''
 
     return 'success'
 
diff --git a/autotest/osr/osr_url.py b/autotest/osr/osr_url.py
index 18650444ca10..0738dba7fad5 100755
--- a/autotest/osr/osr_url.py
+++ b/autotest/osr/osr_url.py
@@ -66,9 +66,8 @@ def osr_url_test(url, expected_wkt):
        gdal.GetLastErrorMsg().find("timed out") != -1:
         return 'skip'
 
-    if not gdaltest.equal_srs_from_wkt(expected_wkt,
-                                       srs.ExportToWkt()):
-        return 'fail'
+    assert gdaltest.equal_srs_from_wkt(expected_wkt,
+                                       srs.ExportToWkt())
 
     return 'success'
 
diff --git a/autotest/osr/osr_usgs.py b/autotest/osr/osr_usgs.py
index 945df77a75d0..2a0fd40f8f4a 100755
--- a/autotest/osr/osr_usgs.py
+++ b/autotest/osr/osr_usgs.py
@@ -51,14 +51,8 @@ def test_osr_usgs_1():
          0.0, 0.0, 1.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0),
         15)
 
-    if abs(srs.GetProjParm(osr.SRS_PP_STANDARD_PARALLEL_1) - 47.0) > 0.0000005 \
-       or abs(srs.GetProjParm(osr.SRS_PP_STANDARD_PARALLEL_2) - 62.0) > 0.0000005 \
-       or abs(srs.GetProjParm(osr.SRS_PP_LATITUDE_OF_CENTER) - 54.5) > 0.0000005 \
-       or abs(srs.GetProjParm(osr.SRS_PP_LONGITUDE_OF_CENTER) - 45.0) > 0.0000005 \
-       or abs(srs.GetProjParm(osr.SRS_PP_FALSE_EASTING) - 0.0) > 0.0000005 \
-       or abs(srs.GetProjParm(osr.SRS_PP_FALSE_NORTHING) - 0.0) > 0.0000005:
-        gdaltest.post_reason('Can not import Equidistant Conic projection.')
-        return 'fail'
+    assert abs(srs.GetProjParm(osr.SRS_PP_STANDARD_PARALLEL_1) - 47.0) <= 0.0000005 and abs(srs.GetProjParm(osr.SRS_PP_STANDARD_PARALLEL_2) - 62.0) <= 0.0000005 and abs(srs.GetProjParm(osr.SRS_PP_LATITUDE_OF_CENTER) - 54.5) <= 0.0000005 and abs(srs.GetProjParm(osr.SRS_PP_LONGITUDE_OF_CENTER) - 45.0) <= 0.0000005 and abs(srs.GetProjParm(osr.SRS_PP_FALSE_EASTING) - 0.0) <= 0.0000005 and abs(srs.GetProjParm(osr.SRS_PP_FALSE_NORTHING) - 0.0) <= 0.0000005, \
+        'Can not import Equidistant Conic projection.'
 
     return 'success'
 
@@ -85,13 +79,8 @@ def test_osr_usgs_2():
 
     (proj_code, _, parms, datum_code) = srs.ExportToUSGS()
 
-    if proj_code != 4 or datum_code != 0 \
-       or abs(gdal.PackedDMSToDec(parms[2]) - 33.90363403) > 0.0000005 \
-       or abs(gdal.PackedDMSToDec(parms[3]) - 33.62529003) > 0.0000005 \
-       or abs(gdal.PackedDMSToDec(parms[4]) - -117.4745429) > 0.0000005 \
-       or abs(gdal.PackedDMSToDec(parms[5]) - 33.76446203) > 0.0000005:
-        gdaltest.post_reason('Can not import Lambert Conformal Conic projection.')
-        return 'fail'
+    assert proj_code == 4 and datum_code == 0 and abs(gdal.PackedDMSToDec(parms[2]) - 33.90363403) <= 0.0000005 and abs(gdal.PackedDMSToDec(parms[3]) - 33.62529003) <= 0.0000005 and abs(gdal.PackedDMSToDec(parms[4]) - -117.4745429) <= 0.0000005 and abs(gdal.PackedDMSToDec(parms[5]) - 33.76446203) <= 0.0000005, \
+        'Can not import Lambert Conformal Conic projection.'
 
     return 'success'
 
diff --git a/autotest/osr/osr_validate.py b/autotest/osr/osr_validate.py
index 8c70bed7bd9a..3878f2063664 100755
--- a/autotest/osr/osr_validate.py
+++ b/autotest/osr/osr_validate.py
@@ -42,8 +42,7 @@
 def test_osr_validate_1():
 
     empty_srs = osr.SpatialReference()
-    if empty_srs.Validate() == 0:
-        return 'fail'
+    assert empty_srs.Validate() != 0
 
     return 'success'
 
@@ -55,8 +54,7 @@ def test_osr_validate_2():
 
     srs = osr.SpatialReference()
     srs.ImportFromWkt("FOO[]")
-    if srs.Validate() == 0:
-        return 'fail'
+    assert srs.Validate() != 0
 
     return 'success'
 
@@ -71,24 +69,20 @@ def test_osr_validate_3():
 
     srs.ImportFromWkt("""COMPD_CS[]""")
     # 5 is OGRERR_CORRUPT_DATA.
-    if srs.Validate() == 0:
-        return 'fail'
+    assert srs.Validate() != 0
 
     srs.ImportFromWkt("""COMPD_CS["MYNAME",GEOGCS[]]""")
-    if srs.Validate() == 0:
-        return 'fail'
+    assert srs.Validate() != 0
 
     # AUTHORITY has wrong number of children (1), not 2.
     srs = osr.SpatialReference()
     srs.ImportFromWkt("""COMPD_CS["MYNAME",AUTHORITY[]]""")
-    if srs.Validate() == 0:
-        return 'fail'
+    assert srs.Validate() != 0
 
     # Unexpected child for COMPD_CS `FOO'
     srs = osr.SpatialReference()
     srs.ImportFromWkt("""COMPD_CS["MYNAME",FOO[]]""")
-    if srs.Validate() == 0:
-        return 'fail'
+    assert srs.Validate() != 0
 
     return 'success'
 
@@ -101,50 +95,42 @@ def test_osr_validate_4():
     # Invalid number of children : 1
     srs = osr.SpatialReference()
     srs.ImportFromWkt("""VERT_CS["MYNAME",VERT_DATUM[]]""")
-    if srs.Validate() == 0:
-        return 'fail'
+    assert srs.Validate() != 0
 
     # UNIT has wrong number of children (1), not 2
     srs = osr.SpatialReference()
     srs.ImportFromWkt("""VERT_CS["MYNAME",UNIT[]]""")
-    if srs.Validate() == 0:
-        return 'fail'
+    assert srs.Validate() != 0
 
     # AXIS has wrong number of children (1), not 2
     srs = osr.SpatialReference()
     srs.ImportFromWkt("""VERT_CS["MYNAME",AXIS[]]""")
-    if srs.Validate() == 0:
-        return 'fail'
+    assert srs.Validate() != 0
 
     # AUTHORITY has wrong number of children (1), not 2
     srs = osr.SpatialReference()
     srs.ImportFromWkt("""VERT_CS["MYNAME",AUTHORITY[]]""")
-    if srs.Validate() == 0:
-        return 'fail'
+    assert srs.Validate() != 0
 
     # Unexpected child for VERT_CS `FOO'
     srs = osr.SpatialReference()
     srs.ImportFromWkt("""VERT_CS["MYNAME",FOO[]]""")
-    if srs.Validate() == 0:
-        return 'fail'
+    assert srs.Validate() != 0
 
     # No VERT_DATUM child in VERT_CS
     srs = osr.SpatialReference()
     srs.ImportFromWkt("""VERT_CS["MYNAME"]""")
-    if srs.Validate() == 0:
-        return 'fail'
+    assert srs.Validate() != 0
 
     # No UNIT child in VERT_CS
     srs = osr.SpatialReference()
     srs.ImportFromWkt("""VERT_CS["MYNAME",VERT_DATUM["MYNAME",2005,AUTHORITY["EPSG","0"]]]""")
-    if srs.Validate() == 0:
-        return 'fail'
+    assert srs.Validate() != 0
 
     # Too many AXIS children in VERT_CS
     srs = osr.SpatialReference()
     srs.ImportFromWkt("""VERT_CS["MYNAME",VERT_DATUM["MYNAME",2005,AUTHORITY["EPSG","0"]],UNIT["metre",1],AXIS["foo",foo],AXIS["bar",bar]]""")
-    if srs.Validate() == 0:
-        return 'fail'
+    assert srs.Validate() != 0
 
     return 'success'
 
@@ -159,56 +145,47 @@ def test_osr_validate_5():
     # PRIMEM has wrong number of children (1),not 2 or 3 as expected
     srs = osr.SpatialReference()
     srs.ImportFromWkt('GEOCCS["My Geocentric",DATUM["WGS_1984",SPHEROID["WGS 84",6378137,298.257223563,AUTHORITY["EPSG","7030"]],TOWGS84[0,0,0,0,0,0,0],AUTHORITY["EPSG","6326"]],PRIMEM[],UNIT["meter",1]]')
-    if srs.Validate() == 0:
-        return 'fail'
+    assert srs.Validate() != 0
 
     # UNIT has wrong number of children (1), not 2
     srs = osr.SpatialReference()
     srs.ImportFromWkt('GEOCCS["My Geocentric",DATUM["WGS_1984",SPHEROID["WGS 84",6378137,298.257223563,AUTHORITY["EPSG","7030"]],TOWGS84[0,0,0,0,0,0,0],AUTHORITY["EPSG","6326"]],PRIMEM["Greenwich",0,AUTHORITY["EPSG","8901"]],UNIT[]]')
-    if srs.Validate() == 0:
-        return 'fail'
+    assert srs.Validate() != 0
 
     # AXIS has wrong number of children (1), not 2
     srs = osr.SpatialReference()
     srs.ImportFromWkt('GEOCCS["My Geocentric",DATUM["WGS_1984",SPHEROID["WGS 84",6378137,298.257223563,AUTHORITY["EPSG","7030"]],TOWGS84[0,0,0,0,0,0,0],AUTHORITY["EPSG","6326"]],AXIS[],PRIMEM["Greenwich",0,AUTHORITY["EPSG","8901"]],UNIT["meter",1]]')
-    if srs.Validate() == 0:
-        return 'fail'
+    assert srs.Validate() != 0
 
     # AUTHORITY has wrong number of children (1), not 2
     srs = osr.SpatialReference()
     srs.ImportFromWkt('GEOCCS["My Geocentric",DATUM["WGS_1984",SPHEROID["WGS 84",6378137,298.257223563,AUTHORITY["EPSG","7030"]],TOWGS84[0,0,0,0,0,0,0],AUTHORITY["EPSG","6326"]],PRIMEM["Greenwich",0,AUTHORITY["EPSG","8901"]],UNIT["meter",1],AUTHORITY[]]')
-    if srs.Validate() == 0:
-        return 'fail'
+    assert srs.Validate() != 0
 
     # Unexpected child for GEOCCS `FOO'
     srs = osr.SpatialReference()
     srs.ImportFromWkt('GEOCCS["My Geocentric",FOO[]]')
-    if srs.Validate() == 0:
-        return 'fail'
+    assert srs.Validate() != 0
 
     # No DATUM child in GEOCCS
     srs = osr.SpatialReference()
     srs.ImportFromWkt('GEOCCS["My Geocentric"]')
-    if srs.Validate() == 0:
-        return 'fail'
+    assert srs.Validate() != 0
 
     # No PRIMEM child in GEOCCS
     srs = osr.SpatialReference()
     srs.ImportFromWkt('GEOCCS["My Geocentric",DATUM["WGS_1984",SPHEROID["WGS 84",6378137,298.257223563,AUTHORITY["EPSG","7030"]]]]')
-    if srs.Validate() == 0:
-        return 'fail'
+    assert srs.Validate() != 0
 
     # No UNIT child in GEOCCS
     srs = osr.SpatialReference()
     srs.ImportFromWkt('GEOCCS["My Geocentric",DATUM["WGS_1984",SPHEROID["WGS 84",6378137,298.257223563,AUTHORITY["EPSG","7030"]]],PRIMEM["Greenwich",0]]')
-    if srs.Validate() == 0:
-        return 'fail'
+    assert srs.Validate() != 0
 
     # Wrong number of AXIS children in GEOCCS
     srs = osr.SpatialReference()
     srs.ImportFromWkt('GEOCCS["My Geocentric",DATUM["WGS_1984",SPHEROID["WGS 84",6378137,298.257223563,AUTHORITY["EPSG","7030"]],TOWGS84[0,0,0,0,0,0,0],AUTHORITY["EPSG","6326"]],PRIMEM["Greenwich",0,AUTHORITY["EPSG","8901"]],AXIS["foo",foo],UNIT["meter",1]]')
-    if srs.Validate() == 0:
-        return 'fail'
+    assert srs.Validate() != 0
 
     return 'success'
 
@@ -223,74 +200,62 @@ def test_osr_validate_6():
     # UNIT has wrong number of children (1), not 2
     srs = osr.SpatialReference()
     srs.ImportFromWkt('PROJCS["WGS 84 / UTM zone 31N",UNIT[]]')
-    if srs.Validate() == 0:
-        return 'fail'
+    assert srs.Validate() != 0
 
     # PARAMETER has wrong number of children (1),not 2 as expected
     srs = osr.SpatialReference()
     srs.ImportFromWkt('PROJCS["WGS 84 / UTM zone 31N",PARAMETER[]]')
-    if srs.Validate() == 0:
-        return 'fail'
+    assert srs.Validate() != 0
 
     # Unrecognized PARAMETER `foo'
     srs = osr.SpatialReference()
     srs.ImportFromWkt('PROJCS["WGS 84 / UTM zone 31N",PARAMETER["foo",0]]')
-    if srs.Validate() == 0:
-        return 'fail'
+    assert srs.Validate() != 0
 
     # PROJECTION has wrong number of children (0),not 1 or 2 as expected
     srs = osr.SpatialReference()
     srs.ImportFromWkt('PROJCS["WGS 84 / UTM zone 31N",PROJECTION]')
-    if srs.Validate() == 0:
-        return 'fail'
+    assert srs.Validate() != 0
 
     # Unrecognized PROJECTION `foo'
     srs = osr.SpatialReference()
     srs.ImportFromWkt('PROJCS["WGS 84 / UTM zone 31N",PROJECTION["foo"]]')
-    if srs.Validate() == 0:
-        return 'fail'
+    assert srs.Validate() != 0
 
     # Unsupported, but recognised PROJECTION `Tunisia_Mining_Grid'
     srs = osr.SpatialReference()
     srs.ImportFromWkt('PROJCS["WGS 84 / UTM zone 31N",PROJECTION["Tunisia_Mining_Grid"]]')
-    if srs.Validate() == 0:
-        return 'fail'
+    assert srs.Validate() != 0
 
     # Unexpected child for PROJECTION `FOO'
     srs = osr.SpatialReference()
     srs.ImportFromWkt('PROJCS["WGS 84 / UTM zone 31N",PROJECTION["Transverse_Mercator", FOO]]')
-    if srs.Validate() == 0:
-        return 'fail'
+    assert srs.Validate() != 0
 
     # AUTHORITY has wrong number of children (0), not 2
     srs = osr.SpatialReference()
     srs.ImportFromWkt('PROJCS["WGS 84 / UTM zone 31N",PROJECTION["Transverse_Mercator", AUTHORITY]]')
-    if srs.Validate() == 0:
-        return 'fail'
+    assert srs.Validate() != 0
 
     # AUTHORITY has wrong number of children (0), not 2
     srs = osr.SpatialReference()
     srs.ImportFromWkt('PROJCS["WGS 84 / UTM zone 31N",AUTHORITY]]')
-    if srs.Validate() == 0:
-        return 'fail'
+    assert srs.Validate() != 0
 
     # AXIS has wrong number of children (0), not 2
     srs = osr.SpatialReference()
     srs.ImportFromWkt('PROJCS["WGS 84 / UTM zone 31N",AXIS]]')
-    if srs.Validate() == 0:
-        return 'fail'
+    assert srs.Validate() != 0
 
     # Unexpected child for PROJCS `FOO'
     srs = osr.SpatialReference()
     srs.ImportFromWkt('PROJCS["WGS 84 / UTM zone 31N",FOO]]')
-    if srs.Validate() == 0:
-        return 'fail'
+    assert srs.Validate() != 0
 
     # PROJCS does not have PROJECTION subnode.
     srs = osr.SpatialReference()
     srs.ImportFromWkt('PROJCS["WGS 84 / UTM zone 31N"]')
-    if srs.Validate() == 0:
-        return 'fail'
+    assert srs.Validate() != 0
 
     return 'success'
 
diff --git a/autotest/osr/osr_xml.py b/autotest/osr/osr_xml.py
index d767f5ee20b0..7adcc4d9f7ab 100755
--- a/autotest/osr/osr_xml.py
+++ b/autotest/osr/osr_xml.py
@@ -180,9 +180,7 @@ def test_osr_xml_1():
     got = srs.ExportToWkt()
     expected = gdaltest.srs_wkt
 
-    if got != expected:
-        print(got)
-        return 'fail'
+    assert got == expected
 
     return 'success'
 
@@ -204,9 +202,7 @@ def test_osr_xml_2():
     got = re.sub(r' gml:id="[^"]*"', '', got, 0)
     expected = re.sub(r' gml:id="[^"]*"', '', expected, 0)
 
-    if got != expected:
-        print(got)
-        return 'fail'
+    assert got == expected
 
     return 'success'
 
diff --git a/autotest/pymod/gdaltest.py b/autotest/pymod/gdaltest.py
index 05f346c1da6d..2d733072aa4e 100644
--- a/autotest/pymod/gdaltest.py
+++ b/autotest/pymod/gdaltest.py
@@ -40,6 +40,7 @@
 
 from osgeo import gdal
 from osgeo import osr
+import pytest
 
 cur_name = 'default'
 
@@ -265,9 +266,7 @@ def __init__(self, drivername, filename, band, chksum,
     def testDriver(self):
         if self.driver is None:
             self.driver = gdal.GetDriverByName(self.drivername)
-            if self.driver is None:
-                post_reason(self.drivername + ' driver not found!')
-                return 'fail'
+            assert self.driver is not None, (self.drivername + ' driver not found!')
 
         return 'success'
 
@@ -292,13 +291,10 @@ def testOpen(self, check_prj=None, check_gt=None, gt_epsilon=None,
         else:
             ds = gdal.Open(wrk_filename, gdal.GA_ReadOnly)
 
-        if ds is None:
-            post_reason('Failed to open dataset: ' + wrk_filename)
-            return 'fail'
+        assert ds is not None, ('Failed to open dataset: ' + wrk_filename)
 
-        if ds.GetDriver().ShortName != gdal.GetDriverByName(self.drivername).ShortName:
-            post_reason('The driver of the returned dataset is %s instead of %s.' % (ds.GetDriver().ShortName, self.drivername))
-            return 'fail'
+        assert ds.GetDriver().ShortName == gdal.GetDriverByName(self.drivername).ShortName, \
+            ('The driver of the returned dataset is %s instead of %s.' % (ds.GetDriver().ShortName, self.drivername))
 
         if self.xsize == 0 and self.ysize == 0:
             self.xsize = ds.RasterXSize
@@ -316,9 +312,7 @@ def testOpen(self, check_prj=None, check_gt=None, gt_epsilon=None,
                         gdal.Mkdir(target_filename, 0)
                     else:
                         f = gdal.VSIFOpenL(filename, 'rb')
-                        if f is None:
-                            post_reason('File %s does not exist' % filename)
-                            return 'fail'
+                        assert f is not None, ('File %s does not exist' % filename)
                         gdal.VSIFSeekL(f, 0, 2)
                         size = gdal.VSIFTellL(f)
                         gdal.VSIFSeekL(f, 0, 0)
@@ -353,12 +347,10 @@ def testOpen(self, check_prj=None, check_gt=None, gt_epsilon=None,
                 for filename in gdal.ReadDirRecursive('/vsimem/tmp_testOpen'):
                     gdal.Unlink('/vsimem/tmp_testOpen/' + filename)
 
-                if virtual_ds_is_None:
-                    post_reason('File list is not complete or driver does not support /vsimem/')
-                    return 'fail'
-                if not other_ds_is_None:
-                    post_reason('When excluding %s, dataset is still opened by driver %s' % (self.drivername, other_ds_driver_name))
-                    return 'fail'
+                assert not virtual_ds_is_None, \
+                    'File list is not complete or driver does not support /vsimem/'
+                assert other_ds_is_None, \
+                    ('When excluding %s, dataset is still opened by driver %s' % (self.drivername, other_ds_driver_name))
 
         # Do we need to check projection?
         if check_prj is not None:
@@ -373,8 +365,7 @@ def testOpen(self, check_prj=None, check_gt=None, gt_epsilon=None,
                 print('')
                 print('old = %s' % src_osr.ExportToPrettyWkt())
                 print('new = %s' % new_osr.ExportToPrettyWkt())
-                post_reason('Projections differ')
-                return 'fail'
+                pytest.fail('Projections differ')
 
         # Do we need to check geotransform?
         if check_gt:
@@ -388,8 +379,7 @@ def testOpen(self, check_prj=None, check_gt=None, gt_epsilon=None,
                     print('')
                     print('old = ', check_gt)
                     print('new = ', new_gt)
-                    post_reason('Geotransform differs.')
-                    return 'fail'
+                    pytest.fail('Geotransform differs.')
 
         oBand = ds.GetRasterBand(self.band)
         if skip_checksum is None:
@@ -409,16 +399,14 @@ def testOpen(self, check_prj=None, check_gt=None, gt_epsilon=None,
                 # because we need to support old and buggy Python 2.3.
                 # Tested on Linux, Mac OS X and Windows, with Python 2.3/2.4/2.5.
                 sv = str(new_stat[i]).lower()
-                if 'n' in sv or 'i' in sv or '#' in sv:
-                    post_reason('NaN or infinity value encountered \'%s\'.' % sv)
-                    return 'fail'
+                assert not ('n' in sv or 'i' in sv or '#' in sv), \
+                    ('NaN or infinity value encountered \'%s\'.' % sv)
 
                 if abs(new_stat[i] - check_approx_stat[i]) > stat_epsilon:
                     print('')
                     print('old = ', check_approx_stat)
                     print('new = ', new_stat)
-                    post_reason('Approximate statistics differs.')
-                    return 'fail'
+                    pytest.fail('Approximate statistics differs.')
 
         # Do we need to check statistics?
         if check_stat:
@@ -433,32 +421,26 @@ def testOpen(self, check_prj=None, check_gt=None, gt_epsilon=None,
             for i in range(4):
 
                 sv = str(new_stat[i]).lower()
-                if 'n' in sv or 'i' in sv or '#' in sv:
-                    post_reason('NaN or infinity value encountered \'%s\'.' % sv)
-                    return 'fail'
+                assert not ('n' in sv or 'i' in sv or '#' in sv), \
+                    ('NaN or infinity value encountered \'%s\'.' % sv)
 
                 if abs(new_stat[i] - check_stat[i]) > stat_epsilon:
                     print('')
                     print('old = ', check_stat)
                     print('new = ', new_stat)
-                    post_reason('Statistics differs.')
-                    return 'fail'
+                    pytest.fail('Statistics differs.')
 
         if check_min:
-            if oBand.GetMinimum() != check_min:
-                post_reason('Unexpected minimum value %s' % str(oBand.GetMinimum()))
-                return 'fail'
+            assert oBand.GetMinimum() == check_min, \
+                ('Unexpected minimum value %s' % str(oBand.GetMinimum()))
 
         if check_max:
-            if oBand.GetMaximum() != check_max:
-                post_reason('Unexpected maximum value %s' % str(oBand.GetMaximum()))
-                return 'fail'
+            assert oBand.GetMaximum() == check_max, \
+                ('Unexpected maximum value %s' % str(oBand.GetMaximum()))
 
         ds = None
 
-        if is_file_open(wrk_filename):
-            post_reason('file still open after dataset closing')
-            return 'fail'
+        assert not is_file_open(wrk_filename), 'file still open after dataset closing'
 
         if skip_checksum is not None:
             return 'success'
@@ -524,21 +506,16 @@ def testCreateCopy(self, check_minmax=1, check_gt=0, check_srs=None,
             self.driver.Delete(new_filename)
             return 'fail'
 
-        if new_ds is None:
-            post_reason('Failed to create test file using CreateCopy method.' +
+        assert new_ds is not None, ('Failed to create test file using CreateCopy method.' +
                         '\n' + gdal.GetLastErrorMsg())
-            return 'fail'
 
-        if new_ds.GetDriver().ShortName != gdal.GetDriverByName(self.drivername).ShortName:
-            post_reason('The driver of the returned dataset is %s instead of %s.' % (new_ds.GetDriver().ShortName, self.drivername))
-            return 'fail'
+        assert new_ds.GetDriver().ShortName == gdal.GetDriverByName(self.drivername).ShortName, \
+            ('The driver of the returned dataset is %s instead of %s.' % (new_ds.GetDriver().ShortName, self.drivername))
 
         if self.band > 0 and skip_preclose_test == 0:
             bnd = new_ds.GetRasterBand(self.band)
             if check_checksum_not_null is True:
-                if bnd.Checksum() == 0:
-                    post_reason('Got null checksum on still-open file.')
-                    return 'fail'
+                assert bnd.Checksum() != 0, 'Got null checksum on still-open file.'
             elif self.chksum is not None and bnd.Checksum() != self.chksum:
                 post_reason(
                     'Did not get expected checksum on still-open file.\n'
@@ -546,12 +523,10 @@ def testCreateCopy(self, check_minmax=1, check_gt=0, check_srs=None,
                 return 'fail'
             if check_minmax:
                 got_minmax = bnd.ComputeRasterMinMax()
-                if got_minmax != minmax:
-                    post_reason(
-                        'Did not get expected min/max values on still-open file.\n'
+                assert got_minmax == minmax, \
+                    ('Did not get expected min/max values on still-open file.\n'
                         '    Got %g,%g instead of %g,%g.'
                         % (got_minmax[0], got_minmax[1], minmax[0], minmax[1]))
-                    return 'fail'
 
         bnd = None
         new_ds = None
@@ -562,16 +537,12 @@ def testCreateCopy(self, check_minmax=1, check_gt=0, check_srs=None,
             new_ds = gdal.OpenEx(new_filename, gdal.OF_RASTER, open_options=dest_open_options)
         else:
             new_ds = gdal.Open(new_filename)
-        if new_ds is None:
-            post_reason('Failed to open dataset: ' + new_filename)
-            return 'fail'
+        assert new_ds is not None, ('Failed to open dataset: ' + new_filename)
 
         if self.band > 0:
             bnd = new_ds.GetRasterBand(self.band)
             if check_checksum_not_null is True:
-                if bnd.Checksum() == 0:
-                    post_reason('Got null checksum on reopened file.')
-                    return 'fail'
+                assert bnd.Checksum() != 0, 'Got null checksum on reopened file.'
             elif self.chksum_after_reopening is not None and bnd.Checksum() not in self.chksum_after_reopening:
                 post_reason('Did not get expected checksum on reopened file.\n'
                             '    Got %d instead of %s.'
@@ -580,12 +551,10 @@ def testCreateCopy(self, check_minmax=1, check_gt=0, check_srs=None,
 
             if check_minmax:
                 got_minmax = bnd.ComputeRasterMinMax()
-                if got_minmax != minmax:
-                    post_reason(
-                        'Did not get expected min/max values on reopened file.\n'
+                assert got_minmax == minmax, \
+                    ('Did not get expected min/max values on reopened file.\n'
                         '    Got %g,%g instead of %g,%g.'
                         % (got_minmax[0], got_minmax[1], minmax[0], minmax[1]))
-                    return 'fail'
 
         # Do we need to check the geotransform?
         if check_gt:
@@ -603,8 +572,7 @@ def testCreateCopy(self, check_minmax=1, check_gt=0, check_srs=None,
                 print('')
                 print('old = ', src_gt)
                 print('new = ', new_gt)
-                post_reason('Geotransform differs.')
-                return 'fail'
+                pytest.fail('Geotransform differs.')
 
         # Do we need to check the geotransform?
         if check_srs is not None:
@@ -617,8 +585,7 @@ def testCreateCopy(self, check_minmax=1, check_gt=0, check_srs=None,
                 print('')
                 print('old = %s' % src_osr.ExportToPrettyWkt())
                 print('new = %s' % new_osr.ExportToPrettyWkt())
-                post_reason('Projections differ')
-                return 'fail'
+                pytest.fail('Projections differ')
 
         bnd = None
         new_ds = None
@@ -656,9 +623,7 @@ def testCreate(self, vsimem=0, new_filename=None, out_bands=1,
         new_ds = self.driver.Create(new_filename, xsize, ysize, out_bands,
                                     src_ds.GetRasterBand(self.band).DataType,
                                     options=self.options)
-        if new_ds is None:
-            post_reason('Failed to create test file using Create method.')
-            return 'fail'
+        assert new_ds is not None, 'Failed to create test file using Create method.'
 
         src_ds = None
 
@@ -670,21 +635,16 @@ def testCreate(self, vsimem=0, new_filename=None, out_bands=1,
             return 'fail'
 
         for band in range(1, out_bands + 1):
-            if self.chksum is not None \
-               and new_ds.GetRasterBand(band).Checksum() != self.chksum:
-                post_reason(
-                    'Did not get expected checksum on still-open file.\n'
+            assert self.chksum is None or new_ds.GetRasterBand(band).Checksum() == self.chksum, \
+                ('Did not get expected checksum on still-open file.\n'
                     '    Got %d instead of %d.'
                     % (new_ds.GetRasterBand(band).Checksum(), self.chksum))
 
-                return 'fail'
-
             computed_minmax = new_ds.GetRasterBand(band).ComputeRasterMinMax()
             if computed_minmax != minmax and check_minmax:
-                post_reason('Did not get expected min/max values on still-open file.')
                 print('expect: ', minmax)
                 print('got: ', computed_minmax)
-                return 'fail'
+                pytest.fail('Did not get expected min/max values on still-open file.')
 
         new_ds = None
 
@@ -692,21 +652,16 @@ def testCreate(self, vsimem=0, new_filename=None, out_bands=1,
             new_ds = gdal.OpenEx(new_filename, gdal.OF_RASTER, open_options=dest_open_options)
         else:
             new_ds = gdal.Open(new_filename)
-        if new_ds is None:
-            post_reason('Failed to open dataset: ' + new_filename)
-            return 'fail'
+        assert new_ds is not None, ('Failed to open dataset: ' + new_filename)
 
         for band in range(1, out_bands + 1):
-            if self.chksum is not None \
-               and new_ds.GetRasterBand(band).Checksum() != self.chksum:
-                post_reason('Did not get expected checksum on reopened file.'
+            assert self.chksum is None or new_ds.GetRasterBand(band).Checksum() == self.chksum, \
+                ('Did not get expected checksum on reopened file.'
                             '    Got %d instead of %d.'
                             % (new_ds.GetRasterBand(band).Checksum(), self.chksum))
-                return 'fail'
 
-            if new_ds.GetRasterBand(band).ComputeRasterMinMax() != minmax and check_minmax:
-                post_reason('Did not get expected min/max values on reopened file.')
-                return 'fail'
+            assert new_ds.GetRasterBand(band).ComputeRasterMinMax() == minmax or not check_minmax, \
+                'Did not get expected min/max values on reopened file.'
 
         new_ds = None
 
@@ -730,22 +685,17 @@ def testSetGeoTransform(self):
         new_ds = self.driver.Create(new_filename, xsize, ysize, 1,
                                     src_ds.GetRasterBand(self.band).DataType,
                                     options=self.options)
-        if new_ds is None:
-            post_reason('Failed to create test file using Create method.')
-            return 'fail'
+        assert new_ds is not None, 'Failed to create test file using Create method.'
 
         gt = (123.0, 1.18, 0.0, 456.0, 0.0, -1.18)
-        if new_ds.SetGeoTransform(gt) is not gdal.CE_None:
-            post_reason('Failed to set geographic transformation.')
-            return 'fail'
+        assert new_ds.SetGeoTransform(gt) is gdal.CE_None, \
+            'Failed to set geographic transformation.'
 
         src_ds = None
         new_ds = None
 
         new_ds = gdal.Open(new_filename)
-        if new_ds is None:
-            post_reason('Failed to open dataset: ' + new_filename)
-            return 'fail'
+        assert new_ds is not None, ('Failed to open dataset: ' + new_filename)
 
         eps = 0.00000001
         new_gt = new_ds.GetGeoTransform()
@@ -758,8 +708,7 @@ def testSetGeoTransform(self):
             print('')
             print('old = ', gt)
             print('new = ', new_gt)
-            post_reason('Did not get expected geotransform.')
-            return 'fail'
+            pytest.fail('Did not get expected geotransform.')
 
         new_ds = None
 
@@ -783,9 +732,7 @@ def testSetProjection(self, prj=None, expected_prj=None):
         new_ds = self.driver.Create(new_filename, xsize, ysize, 1,
                                     src_ds.GetRasterBand(self.band).DataType,
                                     options=self.options)
-        if new_ds is None:
-            post_reason('Failed to create test file using Create method.')
-            return 'fail'
+        assert new_ds is not None, 'Failed to create test file using Create method.'
 
         gt = (123.0, 1.18, 0.0, 456.0, 0.0, -1.18)
         if prj is None:
@@ -796,17 +743,14 @@ def testSetProjection(self, prj=None, expected_prj=None):
         src_osr.ImportFromWkt(prj)
 
         new_ds.SetGeoTransform(gt)
-        if new_ds.SetProjection(prj) is not gdal.CE_None:
-            post_reason('Failed to set geographic projection string.')
-            return 'fail'
+        assert new_ds.SetProjection(prj) is gdal.CE_None, \
+            'Failed to set geographic projection string.'
 
         src_ds = None
         new_ds = None
 
         new_ds = gdal.Open(new_filename)
-        if new_ds is None:
-            post_reason('Failed to open dataset: ' + new_filename)
-            return 'fail'
+        assert new_ds is not None, ('Failed to open dataset: ' + new_filename)
 
         expected_osr = osr.SpatialReference()
         if expected_prj is None:
@@ -817,12 +761,11 @@ def testSetProjection(self, prj=None, expected_prj=None):
         new_osr = osr.SpatialReference()
         new_osr.ImportFromWkt(new_ds.GetProjection())
         if not new_osr.IsSame(expected_osr):
-            post_reason('Did not get expected projection reference.')
             print('Got: ')
             print(new_osr.ExportToPrettyWkt())
             print('Expected:')
             print(expected_osr.ExportToPrettyWkt())
-            return 'fail'
+            pytest.fail('Did not get expected projection reference.')
 
         new_ds = None
 
@@ -846,9 +789,7 @@ def testSetMetadata(self):
         new_ds = self.driver.Create(new_filename, xsize, ysize, 1,
                                     src_ds.GetRasterBand(self.band).DataType,
                                     options=self.options)
-        if new_ds is None:
-            post_reason('Failed to create test file using Create method.')
-            return 'fail'
+        assert new_ds is not None, 'Failed to create test file using Create method.'
 
         new_ds.SetMetadata({'TEST_KEY': 'TestValue'})
         # FIXME
@@ -861,19 +802,13 @@ def testSetMetadata(self):
         new_ds = None
 
         new_ds = gdal.Open(new_filename)
-        if new_ds is None:
-            post_reason('Failed to open dataset: ' + new_filename)
-            return 'fail'
+        assert new_ds is not None, ('Failed to open dataset: ' + new_filename)
 
         md_dict = new_ds.GetMetadata()
 
-        if 'TEST_KEY' not in md_dict:
-            post_reason('Metadata item TEST_KEY does not exist.')
-            return 'fail'
+        assert 'TEST_KEY' in md_dict, 'Metadata item TEST_KEY does not exist.'
 
-        if md_dict['TEST_KEY'] != 'TestValue':
-            post_reason('Did not get expected metadata item.')
-            return 'fail'
+        assert md_dict['TEST_KEY'] == 'TestValue', 'Did not get expected metadata item.'
 
         new_ds = None
 
@@ -897,17 +832,14 @@ def testSetNoDataValue(self, delete=False):
         new_ds = self.driver.Create(new_filename, xsize, ysize, 1,
                                     src_ds.GetRasterBand(self.band).DataType,
                                     options=self.options)
-        if new_ds is None:
-            post_reason('Failed to create test file using Create method.')
-            return 'fail'
+        assert new_ds is not None, 'Failed to create test file using Create method.'
 
         if self.options is None or 'PIXELTYPE=SIGNEDBYTE' not in self.options:
             nodata = 130
         else:
             nodata = 11
-        if new_ds.GetRasterBand(1).SetNoDataValue(nodata) is not gdal.CE_None:
-            post_reason('Failed to set NoData value.')
-            return 'fail'
+        assert new_ds.GetRasterBand(1).SetNoDataValue(nodata) is gdal.CE_None, \
+            'Failed to set NoData value.'
 
         src_ds = None
         new_ds = None
@@ -917,26 +849,21 @@ def testSetNoDataValue(self, delete=False):
         else:
             mode = gdal.GA_ReadOnly
         new_ds = gdal.Open(new_filename, mode)
-        if new_ds is None:
-            post_reason('Failed to open dataset: ' + new_filename)
-            return 'fail'
+        assert new_ds is not None, ('Failed to open dataset: ' + new_filename)
 
-        if nodata != new_ds.GetRasterBand(1).GetNoDataValue():
-            post_reason('Did not get expected NoData value.')
-            return 'fail'
+        assert nodata == new_ds.GetRasterBand(1).GetNoDataValue(), \
+            'Did not get expected NoData value.'
 
         if delete:
-            if new_ds.GetRasterBand(1).DeleteNoDataValue() != 0:
-                post_reason('Did not manage to delete nodata value')
-                return 'fail'
+            assert new_ds.GetRasterBand(1).DeleteNoDataValue() == 0, \
+                'Did not manage to delete nodata value'
 
         new_ds = None
 
         if delete:
             new_ds = gdal.Open(new_filename)
-            if new_ds.GetRasterBand(1).GetNoDataValue() is not None:
-                post_reason('Got nodata value whereas none was expected')
-                return 'fail'
+            assert new_ds.GetRasterBand(1).GetNoDataValue() is None, \
+                'Got nodata value whereas none was expected'
             new_ds = None
 
         if gdal.GetConfigOption('CPL_DEBUG', 'OFF') != 'ON':
@@ -962,9 +889,7 @@ def testSetDescription(self):
         new_ds = self.driver.Create(new_filename, xsize, ysize, 1,
                                     src_ds.GetRasterBand(self.band).DataType,
                                     options=self.options)
-        if new_ds is None:
-            post_reason('Failed to create test file using Create method.')
-            return 'fail'
+        assert new_ds is not None, 'Failed to create test file using Create method.'
 
         description = "Description test string"
         new_ds.GetRasterBand(1).SetDescription(description)
@@ -973,13 +898,10 @@ def testSetDescription(self):
         new_ds = None
 
         new_ds = gdal.Open(new_filename)
-        if new_ds is None:
-            post_reason('Failed to open dataset: ' + new_filename)
-            return 'fail'
+        assert new_ds is not None, ('Failed to open dataset: ' + new_filename)
 
-        if description != new_ds.GetRasterBand(1).GetDescription():
-            post_reason('Did not get expected description string.')
-            return 'fail'
+        assert description == new_ds.GetRasterBand(1).GetDescription(), \
+            'Did not get expected description string.'
 
         new_ds = None
 
@@ -1003,30 +925,24 @@ def testSetUnitType(self):
         new_ds = self.driver.Create(new_filename, xsize, ysize, 1,
                                     src_ds.GetRasterBand(self.band).DataType,
                                     options=self.options)
-        if new_ds is None:
-            post_reason('Failed to create test file using Create method.')
-            return 'fail'
+        assert new_ds is not None, 'Failed to create test file using Create method.'
 
         unit = 'mg/m3'
-        if new_ds.GetRasterBand(1).SetUnitType(unit) is not gdal.CE_None:
-            post_reason('Failed to set unit type.')
-            return 'fail'
+        assert new_ds.GetRasterBand(1).SetUnitType(unit) is gdal.CE_None, \
+            'Failed to set unit type.'
 
         src_ds = None
         new_ds = None
 
         new_ds = gdal.Open(new_filename)
-        if new_ds is None:
-            post_reason('Failed to open dataset: ' + new_filename)
-            return 'fail'
+        assert new_ds is not None, ('Failed to open dataset: ' + new_filename)
 
         new_unit = new_ds.GetRasterBand(1).GetUnitType()
         if new_unit != unit:
             print('')
             print('old = ', unit)
             print('new = ', new_unit)
-            post_reason('Did not get expected unit type.')
-            return 'fail'
+            pytest.fail('Did not get expected unit type.')
 
         new_ds = None
 
diff --git a/autotest/pyscripts/test_gdal2tiles.py b/autotest/pyscripts/test_gdal2tiles.py
index 4d81629116ba..da1e90423ffd 100755
--- a/autotest/pyscripts/test_gdal2tiles.py
+++ b/autotest/pyscripts/test_gdal2tiles.py
@@ -68,9 +68,8 @@ def test_gdal2tiles_py_simple():
     ds = None
 
     for filename in ['googlemaps.html', 'leaflet.html', 'openlayers.html', 'tilemapresource.xml']:
-        if not os.path.exists('tmp/out_gdal2tiles_smallworld/' + filename):
-            gdaltest.post_reason('%s missing' % filename)
-            return 'fail'
+        assert os.path.exists('tmp/out_gdal2tiles_smallworld/' + filename), \
+            ('%s missing' % filename)
 
     return 'success'
 
@@ -104,9 +103,7 @@ def test_gdal2tiles_py_zoom_option():
     ds = None
 
     ds = gdal.Open('tmp/out_gdal2tiles_smallworld/doc.kml')
-    if ds is None:
-        gdaltest.post_reason('did not get kml')
-        return 'fail'
+    assert ds is not None, 'did not get kml'
 
     return 'success'
 
@@ -262,21 +259,15 @@ def _test_utf8(should_raise_unicode=False,
         gdaltest.post_reason('Should be handling filenames with utf8 characters in this context')
         return 'fail'
 
-    if should_raise_unicode:
-        gdaltest.post_reason(
-            'Should not be handling filenames with utf8 characters in this context')
-        return 'fail'
+    assert not should_raise_unicode, \
+        'Should not be handling filenames with utf8 characters in this context'
 
     if should_display_warning:
-        if "WARNING" not in ret or "LC_CTYPE" not in ret:
-            gdaltest.post_reason(
-                'Should display a warning message about LC_CTYPE variable')
-            return 'fail'
+        assert "WARNING" in ret and "LC_CTYPE" in ret, \
+            'Should display a warning message about LC_CTYPE variable'
     else:
-        if "WARNING" in ret and "LC_CTYPE" in ret:
-            gdaltest.post_reason(
-                'Should not display a warning message about LC_CTYPE variable')
-            return 'fail'
+        assert not ("WARNING" in ret and "LC_CTYPE" in ret), \
+            'Should not display a warning message about LC_CTYPE variable'
 
     try:
         shutil.rmtree(out_folder)
@@ -315,23 +306,19 @@ def test_exclude_transparent_tiles():
         # First row totally transparent - no tiles
         tiles_folder = os.path.join(output_folder, '15', '21898')
         dir_files = os.listdir(tiles_folder)
-        if dir_files:
-            gdaltest.post_reason('Generated empty tiles for row 21898: %s' % dir_files)
-            return 'fail'
+        assert not dir_files, ('Generated empty tiles for row 21898: %s' % dir_files)
 
         # Second row - only 2 non-transparent tiles
         tiles_folder = os.path.join(output_folder, '15', '21899')
         dir_files = sorted(os.listdir(tiles_folder))
-        if ['22704.png', '22705.png'] != dir_files:
-            gdaltest.post_reason('Generated empty tiles for row 21899: %s' % dir_files)
-            return 'fail'
+        assert ['22704.png', '22705.png'] == dir_files, \
+            ('Generated empty tiles for row 21899: %s' % dir_files)
 
         # Third row - only 1 non-transparent tile
         tiles_folder = os.path.join(output_folder, '15', '21900')
         dir_files = os.listdir(tiles_folder)
-        if ['22705.png'] != dir_files:
-            gdaltest.post_reason('Generated empty tiles for row 21900: %s' % dir_files)
-            return 'fail'
+        assert ['22705.png'] == dir_files, \
+            ('Generated empty tiles for row 21900: %s' % dir_files)
 
         return 'success'
 
diff --git a/autotest/pyscripts/test_gdal_calc.py b/autotest/pyscripts/test_gdal_calc.py
index b1f8be3e71ff..859dbe1b2693 100755
--- a/autotest/pyscripts/test_gdal_calc.py
+++ b/autotest/pyscripts/test_gdal_calc.py
@@ -73,25 +73,13 @@ def test_gdal_calc_py_1():
     ds2 = gdal.Open('tmp/test_gdal_calc_py_1_2.tif')
     ds3 = gdal.Open('tmp/test_gdal_calc_py_1_3.tif')
 
-    if ds1 is None:
-        gdaltest.post_reason('ds1 not found')
-        return 'fail'
-    if ds2 is None:
-        gdaltest.post_reason('ds2 not found')
-        return 'fail'
-    if ds3 is None:
-        gdaltest.post_reason('ds3 not found')
-        return 'fail'
-
-    if ds1.GetRasterBand(1).Checksum() != 12603:
-        gdaltest.post_reason('ds1 wrong checksum')
-        return 'fail'
-    if ds2.GetRasterBand(1).Checksum() != 58561:
-        gdaltest.post_reason('ds2 wrong checksum')
-        return 'fail'
-    if ds3.GetRasterBand(1).Checksum() != 58561:
-        gdaltest.post_reason('ds3 wrong checksum')
-        return 'fail'
+    assert ds1 is not None, 'ds1 not found'
+    assert ds2 is not None, 'ds2 not found'
+    assert ds3 is not None, 'ds3 not found'
+
+    assert ds1.GetRasterBand(1).Checksum() == 12603, 'ds1 wrong checksum'
+    assert ds2.GetRasterBand(1).Checksum() == 58561, 'ds2 wrong checksum'
+    assert ds3.GetRasterBand(1).Checksum() == 58561, 'ds3 wrong checksum'
 
     ds1 = None
     ds2 = None
@@ -120,24 +108,12 @@ def test_gdal_calc_py_2():
     ds2 = gdal.Open('tmp/test_gdal_calc_py_2_2.tif')
     ds3 = gdal.Open('tmp/test_gdal_calc_py_2_3.tif')
 
-    if ds1 is None:
-        gdaltest.post_reason('ds1 not found')
-        return 'fail'
-    if ds2 is None:
-        gdaltest.post_reason('ds2 not found')
-        return 'fail'
-    if ds3 is None:
-        gdaltest.post_reason('ds3 not found')
-        return 'fail'
-    if ds1.GetRasterBand(1).Checksum() != 12368:
-        gdaltest.post_reason('ds1 wrong checksum')
-        return 'fail'
-    if ds2.GetRasterBand(1).Checksum() != 62785:
-        gdaltest.post_reason('ds2 wrong checksum')
-        return 'fail'
-    if ds3.GetRasterBand(1).Checksum() != 47132:
-        gdaltest.post_reason('ds3 wrong checksum')
-        return 'fail'
+    assert ds1 is not None, 'ds1 not found'
+    assert ds2 is not None, 'ds2 not found'
+    assert ds3 is not None, 'ds3 not found'
+    assert ds1.GetRasterBand(1).Checksum() == 12368, 'ds1 wrong checksum'
+    assert ds2.GetRasterBand(1).Checksum() == 62785, 'ds2 wrong checksum'
+    assert ds3.GetRasterBand(1).Checksum() == 47132, 'ds3 wrong checksum'
     ds1 = None
     ds2 = None
     ds3 = None
@@ -161,21 +137,11 @@ def test_gdal_calc_py_3():
 
     ds = gdal.Open('tmp/test_gdal_calc_py_3.tif')
 
-    if ds is None:
-        gdaltest.post_reason('ds not found')
-        return 'fail'
-    if ds.GetRasterBand(1).Checksum() != 12603:
-        gdaltest.post_reason('band 1 wrong checksum')
-        return 'fail'
-    if ds.GetRasterBand(2).Checksum() != 58561:
-        gdaltest.post_reason('band 2 wrong checksum')
-        return 'fail'
-    if ds.GetRasterBand(3).Checksum() != 36064:
-        gdaltest.post_reason('band 3 wrong checksum')
-        return 'fail'
-    if ds.GetRasterBand(4).Checksum() != 10807:
-        gdaltest.post_reason('band 4 wrong checksum')
-        return 'fail'
+    assert ds is not None, 'ds not found'
+    assert ds.GetRasterBand(1).Checksum() == 12603, 'band 1 wrong checksum'
+    assert ds.GetRasterBand(2).Checksum() == 58561, 'band 2 wrong checksum'
+    assert ds.GetRasterBand(3).Checksum() == 36064, 'band 3 wrong checksum'
+    assert ds.GetRasterBand(4).Checksum() == 10807, 'band 4 wrong checksum'
 
     ds = None
 
@@ -200,18 +166,10 @@ def test_gdal_calc_py_4():
 
     ds1 = gdal.Open('tmp/test_gdal_calc_py_4_2.tif')
 
-    if ds1 is None:
-        gdaltest.post_reason('ds1 not found')
-        return 'fail'
-    if ds1.GetRasterBand(1).Checksum() != 29935:
-        gdaltest.post_reason('ds1 band 1 wrong checksum')
-        return 'fail'
-    if ds1.GetRasterBand(2).Checksum() != 13128:
-        gdaltest.post_reason('ds1 band 2 wrong checksum')
-        return 'fail'
-    if ds1.GetRasterBand(3).Checksum() != 59092:
-        gdaltest.post_reason('ds1 band 3 wrong checksum')
-        return 'fail'
+    assert ds1 is not None, 'ds1 not found'
+    assert ds1.GetRasterBand(1).Checksum() == 29935, 'ds1 band 1 wrong checksum'
+    assert ds1.GetRasterBand(2).Checksum() == 13128, 'ds1 band 2 wrong checksum'
+    assert ds1.GetRasterBand(3).Checksum() == 59092, 'ds1 band 3 wrong checksum'
 
     ds1 = None
 
@@ -220,18 +178,10 @@ def test_gdal_calc_py_4():
 
     ds2 = gdal.Open('tmp/test_gdal_calc_py_4_3.tif')
 
-    if ds2 is None:
-        gdaltest.post_reason('ds2 not found')
-        return 'fail'
-    if ds2.GetRasterBand(1).Checksum() != 10025:
-        gdaltest.post_reason('ds2 band 1 wrong checksum')
-        return 'fail'
-    if ds2.GetRasterBand(2).Checksum() != 62785:
-        gdaltest.post_reason('ds2 band 2 wrong checksum')
-        return 'fail'
-    if ds2.GetRasterBand(3).Checksum() != 10621:
-        gdaltest.post_reason('ds2 band 3 wrong checksum')
-        return 'fail'
+    assert ds2 is not None, 'ds2 not found'
+    assert ds2.GetRasterBand(1).Checksum() == 10025, 'ds2 band 1 wrong checksum'
+    assert ds2.GetRasterBand(2).Checksum() == 62785, 'ds2 band 2 wrong checksum'
+    assert ds2.GetRasterBand(3).Checksum() == 10621, 'ds2 band 3 wrong checksum'
 
     ds2 = None
 
@@ -267,25 +217,13 @@ def test_gdal_calc_py_5():
     ds2 = gdal.Open('tmp/test_gdal_calc_py_5_2.tif')
     ds3 = gdal.Open('tmp/test_gdal_calc_py_5_3.tif')
 
-    if ds1 is None:
-        gdaltest.post_reason('ds1 not found')
-        return 'fail'
-    if ds2 is None:
-        gdaltest.post_reason('ds2 not found')
-        return 'fail'
-    if ds3 is None:
-        gdaltest.post_reason('ds3 not found')
-        return 'fail'
-
-    if ds1.GetRasterBand(1).Checksum() != 12603:
-        gdaltest.post_reason('ds1 wrong checksum')
-        return 'fail'
-    if ds2.GetRasterBand(1).Checksum() != 58561:
-        gdaltest.post_reason('ds2 wrong checksum')
-        return 'fail'
-    if ds3.GetRasterBand(1).Checksum() != 58561:
-        gdaltest.post_reason('ds3 wrong checksum')
-        return 'fail'
+    assert ds1 is not None, 'ds1 not found'
+    assert ds2 is not None, 'ds2 not found'
+    assert ds3 is not None, 'ds3 not found'
+
+    assert ds1.GetRasterBand(1).Checksum() == 12603, 'ds1 wrong checksum'
+    assert ds2.GetRasterBand(1).Checksum() == 58561, 'ds2 wrong checksum'
+    assert ds3.GetRasterBand(1).Checksum() == 58561, 'ds3 wrong checksum'
 
     ds1 = None
     ds2 = None
@@ -319,13 +257,9 @@ def test_gdal_calc_py_6():
 
     ds = gdal.Open('tmp/test_gdal_calc_py_6.tif')
     cs = ds.GetRasterBand(1).Checksum()
-    if cs != 4673:
-        print(cs)
-        return 'fail'
+    assert cs == 4673
     result = ds.GetRasterBand(1).ComputeRasterMinMax()
-    if result != (90, 255):
-        print(result)
-        return 'fail'
+    assert result == (90, 255)
 
     return 'success'
 
@@ -373,31 +307,15 @@ def test_gdal_calc_py_7():
     ds3 = gdal.Open('tmp/test_gdal_calc_py_7_3.tif')
     ds4 = gdal.Open('tmp/test_gdal_calc_py_7_4.tif')
 
-    if ds1 is None:
-        gdaltest.post_reason('ds1 not found')
-        return 'fail'
-    if ds2 is None:
-        gdaltest.post_reason('ds2 not found')
-        return 'fail'
-    if ds3 is None:
-        gdaltest.post_reason('ds3 not found')
-        return 'fail'
-    if ds4 is None:
-        gdaltest.post_reason('ds4 not found')
-        return 'fail'
-
-    if ds1.GetRasterBand(1).Checksum() != 12603:
-        gdaltest.post_reason('ds1 wrong checksum')
-        return 'fail'
-    if ds2.GetRasterBand(1).Checksum() != 58561:
-        gdaltest.post_reason('ds2 wrong checksum')
-        return 'fail'
-    if ds3.GetRasterBand(1).Checksum() != 58561:
-        gdaltest.post_reason('ds3 wrong checksum')
-        return 'fail'
-    if ds4.GetRasterBand(1).Checksum() != 58561:
-        gdaltest.post_reason('ds4 wrong checksum')
-        return 'fail'
+    assert ds1 is not None, 'ds1 not found'
+    assert ds2 is not None, 'ds2 not found'
+    assert ds3 is not None, 'ds3 not found'
+    assert ds4 is not None, 'ds4 not found'
+
+    assert ds1.GetRasterBand(1).Checksum() == 12603, 'ds1 wrong checksum'
+    assert ds2.GetRasterBand(1).Checksum() == 58561, 'ds2 wrong checksum'
+    assert ds3.GetRasterBand(1).Checksum() == 58561, 'ds3 wrong checksum'
+    assert ds4.GetRasterBand(1).Checksum() == 58561, 'ds4 wrong checksum'
 
     ds1 = None
     ds2 = None
diff --git a/autotest/pyscripts/test_gdal_edit.py b/autotest/pyscripts/test_gdal_edit.py
index f7e84fcee5b7..af958befddc4 100755
--- a/autotest/pyscripts/test_gdal_edit.py
+++ b/autotest/pyscripts/test_gdal_edit.py
@@ -76,31 +76,19 @@ def test_gdal_edit_py_1():
     md = ds.GetMetadata()
     ds = None
 
-    if wkt.find('4326') == -1:
-        print(wkt)
-        return 'fail'
+    assert wkt.find('4326') != -1
 
     expected_gt = (2.0, 0.050000000000000003, 0.0, 50.0, 0.0, -0.050000000000000003)
     for i in range(6):
-        if abs(gt[i] - expected_gt[i]) > 1e-10:
-            print(gt)
-            return 'fail'
+        assert abs(gt[i] - expected_gt[i]) <= 1e-10
 
-    if nd != 123:
-        print(nd)
-        return 'fail'
+    assert nd == 123
 
-    if md['FOO'] != 'BAR':
-        print(md)
-        return 'fail'
+    assert md['FOO'] == 'BAR'
 
-    if md['UTF8'] != val:
-        print(md)
-        return 'fail'
+    assert md['UTF8'] == val
 
-    if md[val] != 'UTF8':
-        print(md)
-        return 'fail'
+    assert md[val] == 'UTF8'
 
     return 'success'
 
@@ -123,13 +111,9 @@ def test_gdal_edit_py_2():
     gt = ds.GetGeoTransform(can_return_null=True)
     ds = None
 
-    if gt is not None:
-        print(gt)
-        return 'fail'
+    assert gt is None
 
-    if wkt == '':
-        print(wkt)
-        return 'fail'
+    assert wkt != ''
 
     return 'success'
 
@@ -152,13 +136,9 @@ def test_gdal_edit_py_3():
     gt = ds.GetGeoTransform()
     ds = None
 
-    if gt == (0.0, 1.0, 0.0, 0.0, 0.0, 1.0):
-        print(gt)
-        return 'fail'
+    assert gt != (0.0, 1.0, 0.0, 0.0, 0.0, 1.0)
 
-    if wkt != '':
-        print(wkt)
-        return 'fail'
+    assert wkt == ''
 
     return 'success'
 
@@ -181,18 +161,16 @@ def test_gdal_edit_py_4():
 
     ds = gdal.Open('tmp/test_gdal_edit_py.tif')
     band = ds.GetRasterBand(1)
-    if (band.GetMetadataItem('STATISTICS_MINIMUM') is None or
-            band.GetMetadataItem('FOO') is None):
-        return 'fail'
+    assert (not (band.GetMetadataItem('STATISTICS_MINIMUM') is None or
+            band.GetMetadataItem('FOO') is None))
     ds = band = None
 
     test_py_scripts.run_py_script(script_path, 'gdal_edit', "tmp/test_gdal_edit_py.tif -unsetstats")
 
     ds = gdal.Open('tmp/test_gdal_edit_py.tif')
     band = ds.GetRasterBand(1)
-    if (band.GetMetadataItem('STATISTICS_MINIMUM') is not None or
-            band.GetMetadataItem('FOO') is None):
-        return 'fail'
+    assert (not (band.GetMetadataItem('STATISTICS_MINIMUM') is not None or
+            band.GetMetadataItem('FOO') is None))
     ds = band = None
 
     try:
@@ -229,16 +207,14 @@ def test_gdal_edit_py_5():
     ds = band = None
 
     ds = gdal.Open('tmp/test_gdal_edit_py.tif')
-    if ds.ReadAsArray()[15, 12] != 22:
-        return 'fail'
+    assert ds.ReadAsArray()[15, 12] == 22
     ds = None
 
     test_py_scripts.run_py_script(script_path, 'gdal_edit', "tmp/test_gdal_edit_py.tif -stats")
 
     ds = gdal.Open('tmp/test_gdal_edit_py.tif')
     stat_min = ds.GetRasterBand(1).GetMetadataItem('STATISTICS_MINIMUM')
-    if stat_min is None or float(stat_min) != 22:
-        return 'fail'
+    assert stat_min is not None and float(stat_min) == 22
     ds = None
 
     ds = gdal.Open('tmp/test_gdal_edit_py.tif', gdal.GA_Update)
@@ -249,16 +225,14 @@ def test_gdal_edit_py_5():
     ds = band = None
 
     ds = gdal.Open('tmp/test_gdal_edit_py.tif')
-    if ds.ReadAsArray()[15, 12] != 26:
-        return 'fail'
+    assert ds.ReadAsArray()[15, 12] == 26
     ds = None
 
     test_py_scripts.run_py_script(script_path, 'gdal_edit', "tmp/test_gdal_edit_py.tif -stats")
 
     ds = gdal.Open('tmp/test_gdal_edit_py.tif')
     stat_min = ds.GetRasterBand(1).GetMetadataItem('STATISTICS_MINIMUM')
-    if stat_min is None or float(stat_min) != 26:
-        return 'fail'
+    assert stat_min is not None and float(stat_min) == 26
     ds = None
 
     return 'success'
@@ -280,17 +254,13 @@ def test_gdal_edit_py_6():
 
     ds = gdal.Open('tmp/test_gdal_edit_py.tif')
     stat_min = ds.GetRasterBand(1).GetMetadataItem('STATISTICS_MINIMUM')
-    if stat_min is None or float(stat_min) != 74:
-        return 'fail'
+    assert stat_min is not None and float(stat_min) == 74
     stat_max = ds.GetRasterBand(1).GetMetadataItem('STATISTICS_MAXIMUM')
-    if stat_max is None or float(stat_max) != 255:
-        return 'fail'
+    assert stat_max is not None and float(stat_max) == 255
     stat_mean = ds.GetRasterBand(1).GetMetadataItem('STATISTICS_MEAN')
-    if stat_mean is None or abs(float(stat_mean) - 126.765)>0.001:
-        return 'fail'
+    assert not (stat_mean is None or abs(float(stat_mean) - 126.765)>0.001)
     stat_stddev = ds.GetRasterBand(1).GetMetadataItem('STATISTICS_STDDEV')
-    if stat_stddev is None or abs(float(stat_stddev) - 22.928)>0.001:
-        return 'fail'
+    assert not (stat_stddev is None or abs(float(stat_stddev) - 22.928)>0.001)
 
     ds = None
 
@@ -298,17 +268,13 @@ def test_gdal_edit_py_6():
 
     ds = gdal.Open('tmp/test_gdal_edit_py.tif')
     stat_min = ds.GetRasterBand(1).GetMetadataItem('STATISTICS_MINIMUM')
-    if stat_min is None or float(stat_min) != 22:
-        return 'fail'
+    assert stat_min is not None and float(stat_min) == 22
     stat_max = ds.GetRasterBand(1).GetMetadataItem('STATISTICS_MAXIMUM')
-    if stat_max is None or float(stat_max) != 217:
-        return 'fail'
+    assert stat_max is not None and float(stat_max) == 217
     stat_mean = ds.GetRasterBand(1).GetMetadataItem('STATISTICS_MEAN')
-    if stat_mean is None or float(stat_mean) != 100:
-        return 'fail'
+    assert stat_mean is not None and float(stat_mean) == 100
     stat_stddev = ds.GetRasterBand(1).GetMetadataItem('STATISTICS_STDDEV')
-    if stat_stddev is None or float(stat_stddev) != 30:
-        return 'fail'
+    assert stat_stddev is not None and float(stat_stddev) == 30
     ds = None
 
     return 'success'
@@ -327,10 +293,8 @@ def test_gdal_edit_py_7():
     test_py_scripts.run_py_script(script_path, 'gdal_edit', "tmp/test_gdal_edit_py.tif -scale 2 -offset 3")
 
     ds = gdal.Open('tmp/test_gdal_edit_py.tif')
-    if ds.GetRasterBand(1).GetScale() != 2:
-        return 'fail'
-    if ds.GetRasterBand(1).GetOffset() != 3:
-        return 'fail'
+    assert ds.GetRasterBand(1).GetScale() == 2
+    assert ds.GetRasterBand(1).GetOffset() == 3
 
     return 'success'
 
@@ -351,14 +315,12 @@ def test_gdal_edit_py_8():
     test_py_scripts.run_py_script(script_path, 'gdal_edit', "tmp/test_gdal_edit_py.tif -colorinterp_4 alpha")
 
     ds = gdal.Open('tmp/test_gdal_edit_py.tif')
-    if ds.GetRasterBand(4).GetColorInterpretation() != gdal.GCI_AlphaBand:
-        return 'fail'
+    assert ds.GetRasterBand(4).GetColorInterpretation() == gdal.GCI_AlphaBand
 
     test_py_scripts.run_py_script(script_path, 'gdal_edit', "tmp/test_gdal_edit_py.tif -colorinterp_4 undefined")
 
     ds = gdal.Open('tmp/test_gdal_edit_py.tif')
-    if ds.GetRasterBand(4).GetColorInterpretation() != gdal.GCI_Undefined:
-        return 'fail'
+    assert ds.GetRasterBand(4).GetColorInterpretation() == gdal.GCI_Undefined
 
     return 'success'
 
@@ -377,8 +339,7 @@ def test_gdal_edit_py_unsetrpc():
                                   "tmp/test_gdal_edit_py.tif -unsetrpc")
 
     ds = gdal.Open('tmp/test_gdal_edit_py.tif')
-    if ds.GetMetadata('RPC'):
-        return 'fail'
+    assert not ds.GetMetadata('RPC')
 
     return 'success'
 
diff --git a/autotest/pyscripts/test_gdal_fillnodata.py b/autotest/pyscripts/test_gdal_fillnodata.py
index 9db3808e74b0..d4f7c06cb2d9 100755
--- a/autotest/pyscripts/test_gdal_fillnodata.py
+++ b/autotest/pyscripts/test_gdal_fillnodata.py
@@ -50,8 +50,7 @@ def test_gdal_fillnodata_1():
     test_py_scripts.run_py_script(script_path, 'gdal_fillnodata', '../gcore/data/byte.tif tmp/test_gdal_fillnodata_1.tif')
 
     ds = gdal.Open('tmp/test_gdal_fillnodata_1.tif')
-    if ds.GetRasterBand(1).Checksum() != 4672:
-        return 'fail'
+    assert ds.GetRasterBand(1).Checksum() == 4672
     ds = None
 
     return 'success'
@@ -70,9 +69,8 @@ def test_gdal_fillnodata_2():
     test_py_scripts.run_py_script(script_path, 'gdal_fillnodata', '../gcore/data/nodata_byte.tif tmp/test_gdal_fillnodata_2.tif')
 
     ds = gdal.Open('tmp/test_gdal_fillnodata_2.tif')
-    if ds.GetRasterBand(1).GetNoDataValue() != 0:
-        gdaltest.post_reason('Failed to copy No Data Value to dst dataset.')
-        return 'fail'
+    assert ds.GetRasterBand(1).GetNoDataValue() == 0, \
+        'Failed to copy No Data Value to dst dataset.'
     ds = None
 
     return 'success'
diff --git a/autotest/pyscripts/test_gdal_ls_py.py b/autotest/pyscripts/test_gdal_ls_py.py
index ab1c18b6f39d..c2d7e0b9e490 100755
--- a/autotest/pyscripts/test_gdal_ls_py.py
+++ b/autotest/pyscripts/test_gdal_ls_py.py
@@ -79,9 +79,7 @@ def test_gdal_ls_py_1():
     # TODO: Why the '' as the first element of the list here and below?
     ret, ret_str = run_gdal_ls(['', '-l', '../ogr/data/poly.shp'])
 
-    if ret_str.find('poly.shp') == -1:
-        print(ret_str)
-        return 'fail'
+    assert ret_str.find('poly.shp') != -1
 
     return 'success'
 
@@ -92,9 +90,7 @@ def test_gdal_ls_py_1():
 def test_gdal_ls_py_2():
     ret, ret_str = run_gdal_ls(['', '-l', '../ogr/data'])
 
-    if ret_str.find('poly.shp') == -1:
-        print(ret_str)
-        return 'fail'
+    assert ret_str.find('poly.shp') != -1
 
     return 'success'
 
@@ -105,9 +101,7 @@ def test_gdal_ls_py_2():
 def test_gdal_ls_py_3():
     ret, ret_str = run_gdal_ls(['', '-R', '../ogr/data'])
 
-    if ret_str.find('PROJ_UNITS') == -1:
-        print(ret_str)
-        return 'fail'
+    assert ret_str.find('PROJ_UNITS') != -1
 
     return 'success'
 
@@ -257,13 +251,9 @@ def test_gdal_ls_py_8():
 
     ret, ret_str = run_gdal_ls(['', '-l', '-R', '-Rzip', 'ftp://download.osgeo.org/gdal/data/aig'])
 
-    if ret_str.find('-r--r--r--  1 unknown unknown        24576 2007-03-29 00:00 /vsicurl/ftp://download.osgeo.org/gdal/data/aig/nzdem/info/arc0002r.001') == -1:
-        print(ret_str)
-        return 'fail'
+    assert ret_str.find('-r--r--r--  1 unknown unknown        24576 2007-03-29 00:00 /vsicurl/ftp://download.osgeo.org/gdal/data/aig/nzdem/info/arc0002r.001') != -1
 
-    if ret_str.find('-r--r--r--  1 unknown unknown        24576 2007-03-29 12:20 /vsizip//vsicurl/ftp://download.osgeo.org/gdal/data/aig/nzdem.zip/nzdem/info/arc0002r.001') == -1:
-        print(ret_str)
-        return 'fail'
+    assert ret_str.find('-r--r--r--  1 unknown unknown        24576 2007-03-29 12:20 /vsizip//vsicurl/ftp://download.osgeo.org/gdal/data/aig/nzdem.zip/nzdem/info/arc0002r.001') != -1
 
     return 'success'
 
diff --git a/autotest/pyscripts/test_gdal_merge.py b/autotest/pyscripts/test_gdal_merge.py
index d3bbdd165303..790d1961f9f1 100755
--- a/autotest/pyscripts/test_gdal_merge.py
+++ b/autotest/pyscripts/test_gdal_merge.py
@@ -51,8 +51,7 @@ def test_gdal_merge_1():
     test_py_scripts.run_py_script(script_path, 'gdal_merge', '-o tmp/test_gdal_merge_1.tif ../gcore/data/byte.tif')
 
     ds = gdal.Open('tmp/test_gdal_merge_1.tif')
-    if ds.GetRasterBand(1).Checksum() != 4672:
-        return 'fail'
+    assert ds.GetRasterBand(1).Checksum() == 4672
     ds = None
 
     return 'success'
@@ -99,28 +98,21 @@ def test_gdal_merge_2():
     test_py_scripts.run_py_script(script_path, 'gdal_merge', '-q -o tmp/test_gdal_merge_2.tif tmp/in1.tif tmp/in2.tif tmp/in3.tif tmp/in4.tif')
 
     ds = gdal.Open('tmp/test_gdal_merge_2.tif')
-    if ds.GetProjectionRef().find('WGS 84') == -1:
-        gdaltest.post_reason('Expected WGS 84\nGot : %s' % (ds.GetProjectionRef()))
-        return 'fail'
+    assert ds.GetProjectionRef().find('WGS 84') != -1, \
+        ('Expected WGS 84\nGot : %s' % (ds.GetProjectionRef()))
 
     gt = ds.GetGeoTransform()
     expected_gt = [2, 0.1, 0, 49, 0, -0.1]
     for i in range(6):
-        if abs(gt[i] - expected_gt[i] > 1e-5):
-            gdaltest.post_reason('Expected : %s\nGot : %s' % (expected_gt, gt))
-            return 'fail'
+        assert not abs(gt[i] - expected_gt[i] > 1e-5), \
+            ('Expected : %s\nGot : %s' % (expected_gt, gt))
 
-    if ds.RasterXSize != 20 or ds.RasterYSize != 20:
-        gdaltest.post_reason('Wrong raster dimensions : %d x %d' % (ds.RasterXSize, ds.RasterYSize))
-        return 'fail'
+    assert ds.RasterXSize == 20 and ds.RasterYSize == 20, \
+        ('Wrong raster dimensions : %d x %d' % (ds.RasterXSize, ds.RasterYSize))
 
-    if ds.RasterCount != 1:
-        gdaltest.post_reason('Wrong raster count : %d ' % (ds.RasterCount))
-        return 'fail'
+    assert ds.RasterCount == 1, ('Wrong raster count : %d ' % (ds.RasterCount))
 
-    if ds.GetRasterBand(1).Checksum() != 3508:
-        gdaltest.post_reason('Wrong checksum')
-        return 'fail'
+    assert ds.GetRasterBand(1).Checksum() == 3508, 'Wrong checksum'
 
     return 'success'
 
@@ -137,28 +129,21 @@ def test_gdal_merge_3():
     test_py_scripts.run_py_script(script_path, 'gdal_merge', '-separate -v -o tmp/test_gdal_merge_3.tif tmp/in1.tif tmp/in2.tif tmp/in3.tif tmp/in4.tif')
 
     ds = gdal.Open('tmp/test_gdal_merge_3.tif')
-    if ds.GetProjectionRef().find('WGS 84') == -1:
-        gdaltest.post_reason('Expected WGS 84\nGot : %s' % (ds.GetProjectionRef()))
-        return 'fail'
+    assert ds.GetProjectionRef().find('WGS 84') != -1, \
+        ('Expected WGS 84\nGot : %s' % (ds.GetProjectionRef()))
 
     gt = ds.GetGeoTransform()
     expected_gt = [2, 0.1, 0, 49, 0, -0.1]
     for i in range(6):
-        if abs(gt[i] - expected_gt[i] > 1e-5):
-            gdaltest.post_reason('Expected : %s\nGot : %s' % (expected_gt, gt))
-            return 'fail'
+        assert not abs(gt[i] - expected_gt[i] > 1e-5), \
+            ('Expected : %s\nGot : %s' % (expected_gt, gt))
 
-    if ds.RasterXSize != 20 or ds.RasterYSize != 20:
-        gdaltest.post_reason('Wrong raster dimensions : %d x %d' % (ds.RasterXSize, ds.RasterYSize))
-        return 'fail'
+    assert ds.RasterXSize == 20 and ds.RasterYSize == 20, \
+        ('Wrong raster dimensions : %d x %d' % (ds.RasterXSize, ds.RasterYSize))
 
-    if ds.RasterCount != 4:
-        gdaltest.post_reason('Wrong raster count : %d ' % (ds.RasterCount))
-        return 'fail'
+    assert ds.RasterCount == 4, ('Wrong raster count : %d ' % (ds.RasterCount))
 
-    if ds.GetRasterBand(1).Checksum() != 0:
-        gdaltest.post_reason('Wrong checksum')
-        return 'fail'
+    assert ds.GetRasterBand(1).Checksum() == 0, 'Wrong checksum'
 
     return 'success'
 
@@ -176,10 +161,7 @@ def test_gdal_merge_4():
 
     ds = gdal.Open('tmp/test_gdal_merge_4.tif')
 
-    if ds.GetRasterBand(1).Checksum() != 4725:
-        print(ds.GetRasterBand(1).Checksum())
-        gdaltest.post_reason('Wrong checksum')
-        return 'fail'
+    assert ds.GetRasterBand(1).Checksum() == 4725, 'Wrong checksum'
 
     return 'success'
 
@@ -221,22 +203,10 @@ def test_gdal_merge_5():
 
     ds = gdal.Open('tmp/test_gdal_merge_5.tif')
 
-    if ds.GetRasterBand(1).Checksum() != 0:
-        print(ds.GetRasterBand(1).Checksum())
-        gdaltest.post_reason('Wrong checksum')
-        return 'fail'
-    if ds.GetRasterBand(2).Checksum() != cs:
-        print(ds.GetRasterBand(2).Checksum())
-        gdaltest.post_reason('Wrong checksum')
-        return 'fail'
-    if ds.GetRasterBand(3).Checksum() != 0:
-        print(ds.GetRasterBand(3).Checksum())
-        gdaltest.post_reason('Wrong checksum')
-        return 'fail'
-    if ds.GetRasterBand(4).Checksum() != cs:
-        print(ds.GetRasterBand(4).Checksum())
-        gdaltest.post_reason('Wrong checksum')
-        return 'fail'
+    assert ds.GetRasterBand(1).Checksum() == 0, 'Wrong checksum'
+    assert ds.GetRasterBand(2).Checksum() == cs, 'Wrong checksum'
+    assert ds.GetRasterBand(3).Checksum() == 0, 'Wrong checksum'
+    assert ds.GetRasterBand(4).Checksum() == cs, 'Wrong checksum'
     ds = None
 
     os.unlink('tmp/test_gdal_merge_5.tif')
@@ -245,22 +215,10 @@ def test_gdal_merge_5():
 
     ds = gdal.Open('tmp/test_gdal_merge_5.tif')
 
-    if ds.GetRasterBand(1).Checksum() != 0:
-        print(ds.GetRasterBand(1).Checksum())
-        gdaltest.post_reason('Wrong checksum')
-        return 'fail'
-    if ds.GetRasterBand(2).Checksum() != cs:
-        print(ds.GetRasterBand(2).Checksum())
-        gdaltest.post_reason('Wrong checksum')
-        return 'fail'
-    if ds.GetRasterBand(3).Checksum() != 0:
-        print(ds.GetRasterBand(3).Checksum())
-        gdaltest.post_reason('Wrong checksum')
-        return 'fail'
-    if ds.GetRasterBand(4).Checksum() != cs:
-        print(ds.GetRasterBand(4).Checksum())
-        gdaltest.post_reason('Wrong checksum')
-        return 'fail'
+    assert ds.GetRasterBand(1).Checksum() == 0, 'Wrong checksum'
+    assert ds.GetRasterBand(2).Checksum() == cs, 'Wrong checksum'
+    assert ds.GetRasterBand(3).Checksum() == 0, 'Wrong checksum'
+    assert ds.GetRasterBand(4).Checksum() == cs, 'Wrong checksum'
 
     return 'success'
 
diff --git a/autotest/pyscripts/test_gdal_pansharpen.py b/autotest/pyscripts/test_gdal_pansharpen.py
index 31c619eaa1ed..8712eacd01ed 100755
--- a/autotest/pyscripts/test_gdal_pansharpen.py
+++ b/autotest/pyscripts/test_gdal_pansharpen.py
@@ -67,9 +67,7 @@ def test_gdal_pansharpen_1():
     ds = None
     gdal.GetDriverByName('GTiff').Delete('tmp/out.tif')
 
-    if cs != [4735, 10000, 9742]:
-        print(cs)
-        return 'fail'
+    assert cs == [4735, 10000, 9742]
 
     return 'success'
 
@@ -90,9 +88,7 @@ def test_gdal_pansharpen_2():
     ds = None
     gdal.GetDriverByName('VRT').Delete('tmp/out.vrt')
 
-    if cs != [9742, 4735]:
-        print(cs)
-        return 'fail'
+    assert cs == [9742, 4735]
 
     return 'success'
 
diff --git a/autotest/pyscripts/test_gdal_polygonize.py b/autotest/pyscripts/test_gdal_polygonize.py
index f52632749286..6a3c23192e1e 100755
--- a/autotest/pyscripts/test_gdal_polygonize.py
+++ b/autotest/pyscripts/test_gdal_polygonize.py
@@ -75,9 +75,7 @@ def test_gdal_polygonize_1():
     shp_lyr = shp_ds.GetLayerByName('poly')
 
     expected_feature_number = 13
-    if shp_lyr.GetFeatureCount() != expected_feature_number:
-        gdaltest.post_reason('GetFeatureCount() returned %d instead of %d' % (shp_lyr.GetFeatureCount(), expected_feature_number))
-        return 'fail'
+    assert shp_lyr.GetFeatureCount() == expected_feature_number
 
     expect = [107, 123, 115, 115, 140, 148, 123, 140, 156,
               100, 101, 102, 103]
@@ -124,9 +122,7 @@ def test_gdal_polygonize_2():
     shp_lyr = shp_ds.GetLayerByName('out')
 
     expected_feature_number = 17
-    if shp_lyr.GetFeatureCount() != expected_feature_number:
-        gdaltest.post_reason('GetFeatureCount() returned %d instead of %d' % (shp_lyr.GetFeatureCount(), expected_feature_number))
-        return 'fail'
+    assert shp_lyr.GetFeatureCount() == expected_feature_number
 
     expect = [107, 123, 115, 132, 115, 132, 140, 132, 148, 123, 140,
               132, 156, 100, 101, 102, 103]
@@ -192,9 +188,7 @@ def test_gdal_polygonize_4():
 
     os.unlink('tmp/out.gml')
 
-    if content.find('<ogr:geometryProperty><gml:Polygon srsName="EPSG:26711"><gml:outerBoundaryIs><gml:LinearRing><gml:coordinates>440720,3751320 440720,3750120 441920,3750120 441920,3751320 440720,3751320</gml:coordinates></gml:LinearRing></gml:outerBoundaryIs></gml:Polygon></ogr:geometryProperty>') < 0:
-        print(content)
-        return 'fail'
+    assert content.find('<ogr:geometryProperty><gml:Polygon srsName="EPSG:26711"><gml:outerBoundaryIs><gml:LinearRing><gml:coordinates>440720,3751320 440720,3750120 441920,3750120 441920,3751320 440720,3751320</gml:coordinates></gml:LinearRing></gml:outerBoundaryIs></gml:Polygon></ogr:geometryProperty>') >= 0
 
     # Test mask,1 syntax
     test_py_scripts.run_py_script(script_path, 'gdal_polygonize', '-q -f GML -b mask,1 ../gcore/data/byte.tif tmp/out.gml')
@@ -203,9 +197,7 @@ def test_gdal_polygonize_4():
 
     os.unlink('tmp/out.gml')
 
-    if content.find('<ogr:geometryProperty><gml:Polygon srsName="EPSG:26711"><gml:outerBoundaryIs><gml:LinearRing><gml:coordinates>440720,3751320 440720,3750120 441920,3750120 441920,3751320 440720,3751320</gml:coordinates></gml:LinearRing></gml:outerBoundaryIs></gml:Polygon></ogr:geometryProperty>') < 0:
-        print(content)
-        return 'fail'
+    assert content.find('<ogr:geometryProperty><gml:Polygon srsName="EPSG:26711"><gml:outerBoundaryIs><gml:LinearRing><gml:coordinates>440720,3751320 440720,3750120 441920,3750120 441920,3751320 440720,3751320</gml:coordinates></gml:LinearRing></gml:outerBoundaryIs></gml:Polygon></ogr:geometryProperty>') >= 0
 
     return 'success'
 
diff --git a/autotest/pyscripts/test_gdal_proximity.py b/autotest/pyscripts/test_gdal_proximity.py
index 8332f9adab44..5ee936941ba5 100755
--- a/autotest/pyscripts/test_gdal_proximity.py
+++ b/autotest/pyscripts/test_gdal_proximity.py
@@ -37,6 +37,7 @@
 import test_py_scripts
 
 from osgeo import gdal
+import pytest
 
 ###############################################################################
 # Test a fairly default case.
@@ -65,8 +66,7 @@ def test_gdal_proximity_1():
 
     if cs != cs_expected:
         print('Got: ', cs)
-        gdaltest.post_reason('got wrong checksum')
-        return 'fail'
+        pytest.fail('got wrong checksum')
     return 'success'
 
 ###############################################################################
@@ -92,8 +92,7 @@ def test_gdal_proximity_2():
 
     if cs != cs_expected:
         print('Got: ', cs)
-        gdaltest.post_reason('got wrong checksum')
-        return 'fail'
+        pytest.fail('got wrong checksum')
     return 'success'
 
 ###############################################################################
@@ -119,8 +118,7 @@ def test_gdal_proximity_3():
 
     if cs != cs_expected:
         print('Got: ', cs)
-        gdaltest.post_reason('got wrong checksum')
-        return 'fail'
+        pytest.fail('got wrong checksum')
     return 'success'
 
 ###############################################################################
diff --git a/autotest/pyscripts/test_gdal_retile.py b/autotest/pyscripts/test_gdal_retile.py
index faaed1582e2c..90ef1d90e887 100755
--- a/autotest/pyscripts/test_gdal_retile.py
+++ b/autotest/pyscripts/test_gdal_retile.py
@@ -56,24 +56,18 @@ def test_gdal_retile_1():
     test_py_scripts.run_py_script(script_path, 'gdal_retile', '-v -levels 2 -r bilinear -targetDir tmp/outretile ../gcore/data/byte.tif')
 
     ds = gdal.Open('tmp/outretile/byte_1_1.tif')
-    if ds.GetRasterBand(1).Checksum() != 4672:
-        print(ds.GetRasterBand(1).Checksum())
-        return 'fail'
+    assert ds.GetRasterBand(1).Checksum() == 4672
     ds = None
 
     ds = gdal.Open('tmp/outretile/1/byte_1_1.tif')
-    if ds.RasterXSize != 10:
-        print(ds.RasterXSize)
-        return 'fail'
+    assert ds.RasterXSize == 10
     # if ds.GetRasterBand(1).Checksum() != 1152:
     #    print(ds.GetRasterBand(1).Checksum())
     #    return 'fail'
     ds = None
 
     ds = gdal.Open('tmp/outretile/2/byte_1_1.tif')
-    if ds.RasterXSize != 5:
-        print(ds.RasterXSize)
-        return 'fail'
+    assert ds.RasterXSize == 5
     # if ds.GetRasterBand(1).Checksum() != 215:
     #    print(ds.GetRasterBand(1).Checksum())
     #    return 'fail'
@@ -99,14 +93,8 @@ def test_gdal_retile_2():
     test_py_scripts.run_py_script(script_path, 'gdal_retile', '-v -levels 2 -r bilinear -targetDir tmp/outretile2 ../gcore/data/rgba.tif')
 
     ds = gdal.Open('tmp/outretile2/2/rgba_1_1.tif')
-    if ds.GetRasterBand(1).Checksum() != 35:
-        gdaltest.post_reason('wrong checksum for band 1')
-        print(ds.GetRasterBand(1).Checksum())
-        return 'fail'
-    if ds.GetRasterBand(4).Checksum() != 35:
-        gdaltest.post_reason('wrong checksum for band 4')
-        print(ds.GetRasterBand(4).Checksum())
-        return 'fail'
+    assert ds.GetRasterBand(1).Checksum() == 35, 'wrong checksum for band 1'
+    assert ds.GetRasterBand(4).Checksum() == 35, 'wrong checksum for band 4'
     ds = None
 
     return 'success'
@@ -169,28 +157,21 @@ def test_gdal_retile_3():
     test_py_scripts.run_py_script(script_path, 'gdal_retile', '-v -levels 2 -r bilinear -targetDir tmp/outretile3 tmp/in1.tif tmp/in2.tif')
 
     ds = gdal.Open('tmp/outretile3/in1_1_1.tif')
-    if ds.GetProjectionRef().find('WGS 84') == -1:
-        gdaltest.post_reason('Expected WGS 84\nGot : %s' % (ds.GetProjectionRef()))
-        return 'fail'
+    assert ds.GetProjectionRef().find('WGS 84') != -1, \
+        ('Expected WGS 84\nGot : %s' % (ds.GetProjectionRef()))
 
     gt = ds.GetGeoTransform()
     expected_gt = [0, px1_x, 0, 60, 0, -px1_y]
     for i in range(6):
-        if abs(gt[i] - expected_gt[i] > 1e-5):
-            gdaltest.post_reason('Expected : %s\nGot : %s' % (expected_gt, gt))
-            return 'fail'
+        assert not abs(gt[i] - expected_gt[i] > 1e-5), \
+            ('Expected : %s\nGot : %s' % (expected_gt, gt))
 
-    if ds.RasterXSize != 100 or ds.RasterYSize != 200:
-        gdaltest.post_reason('Wrong raster dimensions : %d x %d' % (ds.RasterXSize, ds.RasterYSize))
-        return 'fail'
+    assert ds.RasterXSize == 100 and ds.RasterYSize == 200, \
+        ('Wrong raster dimensions : %d x %d' % (ds.RasterXSize, ds.RasterYSize))
 
-    if ds.RasterCount != 1:
-        gdaltest.post_reason('Wrong raster count : %d ' % (ds.RasterCount))
-        return 'fail'
+    assert ds.RasterCount == 1, ('Wrong raster count : %d ' % (ds.RasterCount))
 
-    if ds.GetRasterBand(1).Checksum() != 38999:
-        gdaltest.post_reason('Wrong checksum')
-        return 'fail'
+    assert ds.GetRasterBand(1).Checksum() == 38999, 'Wrong checksum'
 
     return 'success'
 
@@ -234,16 +215,8 @@ def test_gdal_retile_4():
 
     for (filename, width, height) in expected_results:
         ds = gdal.Open(filename)
-        if ds.RasterXSize != width:
-            print(filename)
-            print(ds.RasterXSize)
-            print(width)
-            return 'fail'
-        if ds.RasterYSize != height:
-            print(filename)
-            print(ds.RasterYSize)
-            print(height)
-            return 'fail'
+        assert ds.RasterXSize == width, filename
+        assert ds.RasterYSize == height, filename
         ds = None
 
     test_py_scripts.run_py_script(script_path, 'gdal_retile', '-v -levels 1 -ps 8 8 -overlap 4 -targetDir tmp/outretile4 ../gcore/data/byte.tif')
@@ -271,16 +244,8 @@ def test_gdal_retile_4():
 
     for (filename, width, height) in expected_results:
         ds = gdal.Open(filename)
-        if ds.RasterXSize != width:
-            print(filename)
-            print(ds.RasterXSize)
-            print(width)
-            return 'fail'
-        if ds.RasterYSize != height:
-            print(filename)
-            print(ds.RasterYSize)
-            print(height)
-            return 'fail'
+        assert ds.RasterXSize == width, filename
+        assert ds.RasterYSize == height, filename
         ds = None
 
     return 'success'
diff --git a/autotest/pyscripts/test_gdal_sieve.py b/autotest/pyscripts/test_gdal_sieve.py
index 456a7d7570f3..1c8f868a0b94 100755
--- a/autotest/pyscripts/test_gdal_sieve.py
+++ b/autotest/pyscripts/test_gdal_sieve.py
@@ -36,6 +36,7 @@
 import test_py_scripts
 
 from osgeo import gdal
+import pytest
 
 ###############################################################################
 # Test a fairly default case.
@@ -70,8 +71,7 @@ def test_gdal_sieve_1():
 
     if cs != cs_expected:
         print('Got: ', cs)
-        gdaltest.post_reason('got wrong checksum')
-        return 'fail'
+        pytest.fail('got wrong checksum')
     return 'success'
 
 
diff --git a/autotest/pyscripts/test_gdalinfo_py.py b/autotest/pyscripts/test_gdalinfo_py.py
index a4e4d40fb7c8..db24624f1453 100755
--- a/autotest/pyscripts/test_gdalinfo_py.py
+++ b/autotest/pyscripts/test_gdalinfo_py.py
@@ -46,8 +46,7 @@ def test_gdalinfo_py_1():
         return 'skip'
 
     ret = test_py_scripts.run_py_script(script_path, 'gdalinfo', '../gcore/data/byte.tif')
-    if ret.find('Driver: GTiff/GeoTIFF') == -1:
-        return 'fail'
+    assert ret.find('Driver: GTiff/GeoTIFF') != -1
 
     return 'success'
 
@@ -61,8 +60,7 @@ def test_gdalinfo_py_2():
         return 'skip'
 
     ret = test_py_scripts.run_py_script(script_path, 'gdalinfo', '-checksum ../gcore/data/byte.tif')
-    if ret.find('Checksum=4672') == -1:
-        return 'fail'
+    assert ret.find('Checksum=4672') != -1
 
     return 'success'
 
@@ -76,12 +74,10 @@ def test_gdalinfo_py_3():
         return 'skip'
 
     ret = test_py_scripts.run_py_script(script_path, 'gdalinfo', '../gcore/data/byte.tif')
-    if ret.find('Metadata') == -1:
-        return 'fail'
+    assert ret.find('Metadata') != -1
 
     ret = test_py_scripts.run_py_script(script_path, 'gdalinfo', '-nomd ../gcore/data/byte.tif')
-    if ret.find('Metadata') != -1:
-        return 'fail'
+    assert ret.find('Metadata') == -1
 
     return 'success'
 
@@ -95,12 +91,10 @@ def test_gdalinfo_py_4():
         return 'skip'
 
     ret = test_py_scripts.run_py_script(script_path, 'gdalinfo', '../gdrivers/data/bug407.gif')
-    if ret.find('0: 255,255,255,255') == -1:
-        return 'fail'
+    assert ret.find('0: 255,255,255,255') != -1
 
     ret = test_py_scripts.run_py_script(script_path, 'gdalinfo', '-noct ../gdrivers/data/bug407.gif')
-    if ret.find('0: 255,255,255,255') != -1:
-        return 'fail'
+    assert ret.find('0: 255,255,255,255') == -1
 
     return 'success'
 
@@ -119,16 +113,10 @@ def test_gdalinfo_py_5():
         pass
 
     ret = test_py_scripts.run_py_script(script_path, 'gdalinfo', '../gcore/data/byte.tif')
-    if ret.find('STATISTICS_MINIMUM=74') != -1:
-        gdaltest.post_reason('got wrong minimum.')
-        print(ret)
-        return 'fail'
+    assert ret.find('STATISTICS_MINIMUM=74') == -1, 'got wrong minimum.'
 
     ret = test_py_scripts.run_py_script(script_path, 'gdalinfo', '-stats ../gcore/data/byte.tif')
-    if ret.find('STATISTICS_MINIMUM=74') == -1:
-        gdaltest.post_reason('got wrong minimum (2).')
-        print(ret)
-        return 'fail'
+    assert ret.find('STATISTICS_MINIMUM=74') != -1, 'got wrong minimum (2).'
 
     # We will blow an exception if the file does not exist now!
     os.remove('../gcore/data/byte.tif.aux.xml')
@@ -145,8 +133,7 @@ def test_gdalinfo_py_6():
         return 'skip'
 
     ret = test_py_scripts.run_py_script(script_path, 'gdalinfo', '../gdrivers/data/int.img')
-    if ret.find('Overviews') == -1:
-        return 'fail'
+    assert ret.find('Overviews') != -1
     # if ret.find('GDALRasterAttributeTable') == -1:
     #    return 'fail'
 
@@ -162,21 +149,15 @@ def test_gdalinfo_py_7():
         return 'skip'
 
     ret = test_py_scripts.run_py_script(script_path, 'gdalinfo', '../gcore/data/gcps.vrt')
-    if ret.find('GCP Projection =') == -1:
-        return 'fail'
-    if ret.find('PROJCS["NAD27 / UTM zone 11N"') == -1:
-        return 'fail'
-    if ret.find('(100,100) -> (446720,3745320,0)') == -1:
-        return 'fail'
+    assert ret.find('GCP Projection =') != -1
+    assert ret.find('PROJCS["NAD27 / UTM zone 11N"') != -1
+    assert ret.find('(100,100) -> (446720,3745320,0)') != -1
 
     # Same but with -nogcps
     ret = test_py_scripts.run_py_script(script_path, 'gdalinfo', '-nogcp ../gcore/data/gcps.vrt')
-    if ret.find('GCP Projection =') != -1:
-        return 'fail'
-    if ret.find('PROJCS["NAD27 / UTM zone 11N"') != -1:
-        return 'fail'
-    if ret.find('(100,100) -> (446720,3745320,0)') != -1:
-        return 'fail'
+    assert ret.find('GCP Projection =') == -1
+    assert ret.find('PROJCS["NAD27 / UTM zone 11N"') == -1
+    assert ret.find('(100,100) -> (446720,3745320,0)') == -1
 
     return 'success'
 
@@ -195,16 +176,12 @@ def test_gdalinfo_py_8():
         pass
 
     ret = test_py_scripts.run_py_script(script_path, 'gdalinfo', '../gcore/data/byte.tif')
-    if ret.find('0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 1 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 6 0 0 0 0 0 0 0 0 37 0 0 0 0 0 0 0 57 0 0 0 0 0 0 0 62 0 0 0 0 0 0 0 66 0 0 0 0 0 0 0 0 72 0 0 0 0 0 0 0 31 0 0 0 0 0 0 0 24 0 0 0 0 0 0 0 12 0 0 0 0 0 0 0 0 7 0 0 0 0 0 0 0 12 0 0 0 0 0 0 0 5 0 0 0 0 0 0 0 3 0 0 0 0 0 0 0 1 0 0 0 0 0 0 0 0 2 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 1 0 0 0 0 0 0 0 1') != -1:
-        gdaltest.post_reason('did not expect histogram.')
-        print(ret)
-        return 'fail'
+    assert ret.find('0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 1 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 6 0 0 0 0 0 0 0 0 37 0 0 0 0 0 0 0 57 0 0 0 0 0 0 0 62 0 0 0 0 0 0 0 66 0 0 0 0 0 0 0 0 72 0 0 0 0 0 0 0 31 0 0 0 0 0 0 0 24 0 0 0 0 0 0 0 12 0 0 0 0 0 0 0 0 7 0 0 0 0 0 0 0 12 0 0 0 0 0 0 0 5 0 0 0 0 0 0 0 3 0 0 0 0 0 0 0 1 0 0 0 0 0 0 0 0 2 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 1 0 0 0 0 0 0 0 1') == -1, \
+        'did not expect histogram.'
 
     ret = test_py_scripts.run_py_script(script_path, 'gdalinfo', '-hist ../gcore/data/byte.tif')
-    if ret.find('0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 1 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 6 0 0 0 0 0 0 0 0 37 0 0 0 0 0 0 0 57 0 0 0 0 0 0 0 62 0 0 0 0 0 0 0 66 0 0 0 0 0 0 0 0 72 0 0 0 0 0 0 0 31 0 0 0 0 0 0 0 24 0 0 0 0 0 0 0 12 0 0 0 0 0 0 0 0 7 0 0 0 0 0 0 0 12 0 0 0 0 0 0 0 5 0 0 0 0 0 0 0 3 0 0 0 0 0 0 0 1 0 0 0 0 0 0 0 0 2 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 1 0 0 0 0 0 0 0 1') == -1:
-        gdaltest.post_reason('did not get expected histogram.')
-        print(ret)
-        return 'fail'
+    assert ret.find('0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 1 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 6 0 0 0 0 0 0 0 0 37 0 0 0 0 0 0 0 57 0 0 0 0 0 0 0 62 0 0 0 0 0 0 0 66 0 0 0 0 0 0 0 0 72 0 0 0 0 0 0 0 31 0 0 0 0 0 0 0 24 0 0 0 0 0 0 0 12 0 0 0 0 0 0 0 0 7 0 0 0 0 0 0 0 12 0 0 0 0 0 0 0 5 0 0 0 0 0 0 0 3 0 0 0 0 0 0 0 1 0 0 0 0 0 0 0 0 2 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 1 0 0 0 0 0 0 0 1') != -1, \
+        'did not get expected histogram.'
 
     # We will blow an exception if the file does not exist now!
     os.remove('../gcore/data/byte.tif.aux.xml')
@@ -221,16 +198,10 @@ def test_gdalinfo_py_9():
         return 'skip'
 
     ret = test_py_scripts.run_py_script(script_path, 'gdalinfo', '../gdrivers/data/fake_nsif.ntf')
-    if ret.find('BLOCKA=010000001000000000') != -1:
-        gdaltest.post_reason('Got unexpected extra MD.')
-        print(ret)
-        return 'fail'
+    assert ret.find('BLOCKA=010000001000000000') == -1, 'Got unexpected extra MD.'
 
     ret = test_py_scripts.run_py_script(script_path, 'gdalinfo', '-mdd TRE ../gdrivers/data/fake_nsif.ntf')
-    if ret.find('BLOCKA=010000001000000000') == -1:
-        gdaltest.post_reason('did not get extra MD.')
-        print(ret)
-        return 'fail'
+    assert ret.find('BLOCKA=010000001000000000') != -1, 'did not get extra MD.'
 
     return 'success'
 
@@ -244,12 +215,10 @@ def test_gdalinfo_py_10():
         return 'skip'
 
     ret = test_py_scripts.run_py_script(script_path, 'gdalinfo', '../gcore/data/byte.tif')
-    if ret.find('Computed Min/Max=74.000,255.000') != -1:
-        return 'fail'
+    assert ret.find('Computed Min/Max=74.000,255.000') == -1
 
     ret = test_py_scripts.run_py_script(script_path, 'gdalinfo', '-mm ../gcore/data/byte.tif')
-    if ret.find('Computed Min/Max=74.000,255.000') == -1:
-        return 'fail'
+    assert ret.find('Computed Min/Max=74.000,255.000') != -1
 
     return 'success'
 
diff --git a/autotest/pyscripts/test_gdalmove.py b/autotest/pyscripts/test_gdalmove.py
index 57c7d1b8b7fa..175691a98a63 100755
--- a/autotest/pyscripts/test_gdalmove.py
+++ b/autotest/pyscripts/test_gdalmove.py
@@ -55,16 +55,9 @@ def test_gdalmove_1():
     got_gt = ds.GetGeoTransform()
     expected_gt = (440719.95870935748, 60.000041745067577, 1.9291142234578728e-05, 3751294.2109841029, 1.9099167548120022e-05, -60.000041705276814)
     for i in range(6):
-        if abs(got_gt[i] - expected_gt[i]) / abs(got_gt[i]) > 1e-5:
-            gdaltest.post_reason('bad gt')
-            print(got_gt)
-            print(expected_gt)
-            return 'fail'
+        assert abs(got_gt[i] - expected_gt[i]) / abs(got_gt[i]) <= 1e-5, 'bad gt'
     wkt = ds.GetProjection()
-    if wkt.find('32611') < 0:
-        gdaltest.post_reason('bad geotransform')
-        print(wkt)
-        return 'fail'
+    assert wkt.find('32611') >= 0, 'bad geotransform'
     ds = None
 
     return 'success'
diff --git a/autotest/pyscripts/test_ogr2ogr_py.py b/autotest/pyscripts/test_ogr2ogr_py.py
index 55b0a59a16d6..7501d8c1099b 100755
--- a/autotest/pyscripts/test_ogr2ogr_py.py
+++ b/autotest/pyscripts/test_ogr2ogr_py.py
@@ -60,18 +60,13 @@ def test_ogr2ogr_py_1():
 
     test_py_scripts.run_py_script(script_path, 'ogr2ogr', 'tmp/poly.shp ../ogr/data/poly.shp')
     ds = ogr.Open('tmp/poly.shp')
-    if ds is None or ds.GetLayer(0).GetFeatureCount() != 10:
-        return 'fail'
+    assert ds is not None and ds.GetLayer(0).GetFeatureCount() == 10
 
     feat0 = ds.GetLayer(0).GetFeature(0)
-    if feat0.GetFieldAsDouble('AREA') != 215229.266:
-        print(feat0.GetFieldAsDouble('AREA'))
-        gdaltest.post_reason('Did not get expected value for field AREA')
-        return 'fail'
-    if feat0.GetFieldAsString('PRFEDEA') != '35043411':
-        print(feat0.GetFieldAsString('PRFEDEA'))
-        gdaltest.post_reason('Did not get expected value for field PRFEDEA')
-        return 'fail'
+    assert feat0.GetFieldAsDouble('AREA') == 215229.266, \
+        'Did not get expected value for field AREA'
+    assert feat0.GetFieldAsString('PRFEDEA') == '35043411', \
+        'Did not get expected value for field PRFEDEA'
 
     ds.Destroy()
 
@@ -97,8 +92,7 @@ def test_ogr2ogr_py_2():
     test_py_scripts.run_py_script(script_path, 'ogr2ogr', 'tmp/poly.shp ../ogr/data/poly.shp -sql "select * from poly"')
 
     ds = ogr.Open('tmp/poly.shp')
-    if ds is None or ds.GetLayer(0).GetFeatureCount() != 10:
-        return 'fail'
+    assert ds is not None and ds.GetLayer(0).GetFeatureCount() == 10
     ds.Destroy()
 
     ogr.GetDriverByName('ESRI Shapefile').DeleteDataSource('tmp/poly.shp')
@@ -124,11 +118,9 @@ def test_ogr2ogr_py_3():
 
     ds = ogr.Open('tmp/poly.shp')
     if ogrtest.have_geos():
-        if ds is None or ds.GetLayer(0).GetFeatureCount() != 4:
-            return 'fail'
+        assert ds is not None and ds.GetLayer(0).GetFeatureCount() == 4
     else:
-        if ds is None or ds.GetLayer(0).GetFeatureCount() != 5:
-            return 'fail'
+        assert ds is not None and ds.GetLayer(0).GetFeatureCount() == 5
     ds.Destroy()
 
     ogr.GetDriverByName('ESRI Shapefile').DeleteDataSource('tmp/poly.shp')
@@ -153,8 +145,7 @@ def test_ogr2ogr_py_4():
     test_py_scripts.run_py_script(script_path, 'ogr2ogr', 'tmp/poly.shp ../ogr/data/poly.shp -where "EAS_ID=171"')
 
     ds = ogr.Open('tmp/poly.shp')
-    if ds is None or ds.GetLayer(0).GetFeatureCount() != 1:
-        return 'fail'
+    assert ds is not None and ds.GetLayer(0).GetFeatureCount() == 1
     ds.Destroy()
 
     ogr.GetDriverByName('ESRI Shapefile').DeleteDataSource('tmp/poly.shp')
@@ -180,18 +171,13 @@ def test_ogr2ogr_py_5():
     test_py_scripts.run_py_script(script_path, 'ogr2ogr', '-update -append tmp/poly.shp ../ogr/data/poly.shp')
 
     ds = ogr.Open('tmp/poly.shp')
-    if ds is None or ds.GetLayer(0).GetFeatureCount() != 20:
-        return 'fail'
+    assert ds is not None and ds.GetLayer(0).GetFeatureCount() == 20
 
     feat10 = ds.GetLayer(0).GetFeature(10)
-    if feat10.GetFieldAsDouble('AREA') != 215229.266:
-        print(feat10.GetFieldAsDouble('AREA'))
-        gdaltest.post_reason('Did not get expected value for field AREA')
-        return 'fail'
-    if feat10.GetFieldAsString('PRFEDEA') != '35043411':
-        print(feat10.GetFieldAsString('PRFEDEA'))
-        gdaltest.post_reason('Did not get expected value for field PRFEDEA')
-        return 'fail'
+    assert feat10.GetFieldAsDouble('AREA') == 215229.266, \
+        'Did not get expected value for field AREA'
+    assert feat10.GetFieldAsString('PRFEDEA') == '35043411', \
+        'Did not get expected value for field PRFEDEA'
 
     ds.Destroy()
 
@@ -224,8 +210,7 @@ def test_ogr2ogr_py_6():
     test_py_scripts.run_py_script(script_path, 'ogr2ogr', '-update -overwrite -f PostgreSQL PG:"' + gdaltest.pg_connection_string + '" ../ogr/data/poly.shp -nln tpoly')
 
     ds = ogr.Open('PG:' + gdaltest.pg_connection_string)
-    if ds is None or ds.GetLayerByName('tpoly').GetFeatureCount() != 10:
-        return 'fail'
+    assert ds is not None and ds.GetLayerByName('tpoly').GetFeatureCount() == 10
     ds.Destroy()
 
     gdaltest.runexternal(test_cli_utilities.get_ogrinfo_path() + ' PG:"' + gdaltest.pg_connection_string + '" -sql "DELLAYER:tpoly"')
@@ -256,8 +241,7 @@ def test_ogr2ogr_py_7():
     test_py_scripts.run_py_script(script_path, 'ogr2ogr', '-f PostgreSQL PG:"' + gdaltest.pg_connection_string + '" ../ogr/data/poly.shp -nln tpoly -gt 1')
 
     ds = ogr.Open('PG:' + gdaltest.pg_connection_string)
-    if ds is None or ds.GetLayerByName('tpoly').GetFeatureCount() != 10:
-        return 'fail'
+    assert ds is not None and ds.GetLayerByName('tpoly').GetFeatureCount() == 10
     ds.Destroy()
 
     gdaltest.runexternal(test_cli_utilities.get_ogrinfo_path() + ' PG:"' + gdaltest.pg_connection_string + '" -sql "DELLAYER:tpoly"')
@@ -282,8 +266,7 @@ def test_ogr2ogr_py_8():
     test_py_scripts.run_py_script(script_path, 'ogr2ogr', '-t_srs EPSG:4326 tmp/poly.shp ../ogr/data/poly.shp')
 
     ds = ogr.Open('tmp/poly.shp')
-    if str(ds.GetLayer(0).GetSpatialRef()).find('1984') == -1:
-        return 'fail'
+    assert str(ds.GetLayer(0).GetSpatialRef()).find('1984') != -1
     ds.Destroy()
 
     ogr.GetDriverByName('ESRI Shapefile').DeleteDataSource('tmp/poly.shp')
@@ -308,8 +291,7 @@ def test_ogr2ogr_py_9():
     test_py_scripts.run_py_script(script_path, 'ogr2ogr', '-a_srs EPSG:4326 tmp/poly.shp ../ogr/data/poly.shp')
 
     ds = ogr.Open('tmp/poly.shp')
-    if str(ds.GetLayer(0).GetSpatialRef()).find('1984') == -1:
-        return 'fail'
+    assert str(ds.GetLayer(0).GetSpatialRef()).find('1984') != -1
     ds.Destroy()
 
     ogr.GetDriverByName('ESRI Shapefile').DeleteDataSource('tmp/poly.shp')
@@ -336,8 +318,7 @@ def test_ogr2ogr_py_10():
 
     ds = ogr.Open('tmp/poly.shp')
     lyr = ds.GetLayer(0)
-    if lyr.GetLayerDefn().GetFieldCount() != 2:
-        return 'fail'
+    assert lyr.GetLayerDefn().GetFieldCount() == 2
     feat = lyr.GetNextFeature()
     ret = 'success'
     if feat.GetFieldAsDouble('EAS_ID') != 168:
@@ -374,8 +355,7 @@ def test_ogr2ogr_py_11():
     test_py_scripts.run_py_script(script_path, 'ogr2ogr', '-lco SHPT=POLYGONZ tmp/poly.shp ../ogr/data/poly.shp')
 
     ds = ogr.Open('tmp/poly.shp')
-    if ds.GetLayer(0).GetLayerDefn().GetGeomType() != ogr.wkbPolygon25D:
-        return 'fail'
+    assert ds.GetLayer(0).GetLayerDefn().GetGeomType() == ogr.wkbPolygon25D
     ds.Destroy()
 
     ogr.GetDriverByName('ESRI Shapefile').DeleteDataSource('tmp/poly.shp')
@@ -401,8 +381,7 @@ def test_ogr2ogr_py_12():
     test_py_scripts.run_py_script(script_path, 'ogr2ogr', '-nlt POLYGON25D tmp/poly.shp ../ogr/data/poly.shp')
 
     ds = ogr.Open('tmp/poly.shp')
-    if ds.GetLayer(0).GetLayerDefn().GetGeomType() != ogr.wkbPolygon25D:
-        return 'fail'
+    assert ds.GetLayer(0).GetLayerDefn().GetGeomType() == ogr.wkbPolygon25D
     ds.Destroy()
 
     ogr.GetDriverByName('ESRI Shapefile').DeleteDataSource('tmp/poly.shp')
@@ -427,8 +406,7 @@ def test_ogr2ogr_py_13():
     test_py_scripts.run_py_script(script_path, 'ogr2ogr', 'tmp/poly.shp ../ogr/data/poly.shp poly')
 
     ds = ogr.Open('tmp/poly.shp')
-    if ds is None or ds.GetLayer(0).GetFeatureCount() != 10:
-        return 'fail'
+    assert ds is not None and ds.GetLayer(0).GetFeatureCount() == 10
     ds.Destroy()
 
     ogr.GetDriverByName('ESRI Shapefile').DeleteDataSource('tmp/poly.shp')
@@ -453,11 +431,9 @@ def test_ogr2ogr_py_14():
     test_py_scripts.run_py_script(script_path, 'ogr2ogr', '-segmentize 100 tmp/poly.shp ../ogr/data/poly.shp poly')
 
     ds = ogr.Open('tmp/poly.shp')
-    if ds is None or ds.GetLayer(0).GetFeatureCount() != 10:
-        return 'fail'
+    assert ds is not None and ds.GetLayer(0).GetFeatureCount() == 10
     feat = ds.GetLayer(0).GetNextFeature()
-    if feat.GetGeometryRef().GetGeometryRef(0).GetPointCount() != 36:
-        return 'fail'
+    assert feat.GetGeometryRef().GetGeometryRef(0).GetPointCount() == 36
     ds.Destroy()
 
     ogr.GetDriverByName('ESRI Shapefile').DeleteDataSource('tmp/poly.shp')
@@ -483,16 +459,14 @@ def test_ogr2ogr_py_15():
     test_py_scripts.run_py_script(script_path, 'ogr2ogr', 'tmp/poly.shp ../ogr/data/poly.shp')
 
     ds = ogr.Open('tmp/poly.shp')
-    if ds is None or ds.GetLayer(0).GetFeatureCount() != 10:
-        return 'fail'
+    assert ds is not None and ds.GetLayer(0).GetFeatureCount() == 10
     ds.Destroy()
 
     # Overwrite
     test_py_scripts.run_py_script(script_path, 'ogr2ogr', '-overwrite tmp ../ogr/data/poly.shp')
 
     ds = ogr.Open('tmp/poly.shp')
-    if ds is None or ds.GetLayer(0).GetFeatureCount() != 10:
-        return 'fail'
+    assert ds is not None and ds.GetLayer(0).GetFeatureCount() == 10
     ds.Destroy()
 
     ogr.GetDriverByName('ESRI Shapefile').DeleteDataSource('tmp/poly.shp')
@@ -517,12 +491,10 @@ def test_ogr2ogr_py_16():
 
     src_ds = ogr.Open('../ogr/data/poly.shp')
     ds = ogr.Open('tmp/poly.shp')
-    if ds is None or ds.GetLayer(0).GetFeatureCount() != 1:
-        return 'fail'
+    assert ds is not None and ds.GetLayer(0).GetFeatureCount() == 1
     src_feat = src_ds.GetLayer(0).GetFeature(8)
     feat = ds.GetLayer(0).GetNextFeature()
-    if feat.GetField("EAS_ID") != src_feat.GetField("EAS_ID"):
-        return 'fail'
+    assert feat.GetField("EAS_ID") == src_feat.GetField("EAS_ID")
     ds.Destroy()
     src_ds.Destroy()
 
@@ -545,13 +517,10 @@ def test_ogr2ogr_py_17():
         pass
 
     ret = test_py_scripts.run_py_script(script_path, 'ogr2ogr', '-progress tmp/poly.shp ../ogr/data/poly.shp')
-    if ret.find('0...10...20...30...40...50...60...70...80...90...100 - done.') == -1:
-        print(ret)
-        return 'fail'
+    assert ret.find('0...10...20...30...40...50...60...70...80...90...100 - done.') != -1
 
     ds = ogr.Open('tmp/poly.shp')
-    if ds is None or ds.GetLayer(0).GetFeatureCount() != 10:
-        return 'fail'
+    assert ds is not None and ds.GetLayer(0).GetFeatureCount() == 10
     ds.Destroy()
 
     ogr.GetDriverByName('ESRI Shapefile').DeleteDataSource('tmp/poly.shp')
@@ -630,13 +599,10 @@ def test_ogr2ogr_py_19():
     test_py_scripts.run_py_script(script_path, 'ogr2ogr', 'tmp/poly.shp ../ogr/data/poly.shp -clipsrc spat_extent -spat 479609 4764629 479764 4764817')
 
     ds = ogr.Open('tmp/poly.shp')
-    if ds is None or ds.GetLayer(0).GetFeatureCount() != 4:
-        return 'fail'
+    assert ds is not None and ds.GetLayer(0).GetFeatureCount() == 4
 
-    if ds.GetLayer(0).GetExtent() != (479609, 479764, 4764629, 4764817):
-        print(ds.GetLayer(0).GetExtent())
-        gdaltest.post_reason('unexpected extent')
-        return 'fail'
+    assert ds.GetLayer(0).GetExtent() == (479609, 479764, 4764629, 4764817), \
+        'unexpected extent'
 
     ds.Destroy()
 
@@ -695,8 +661,7 @@ def test_ogr2ogr_py_20():
 
     ds = ogr.Open('tmp/Fields.dbf')
 
-    if ds is None:
-        return 'fail'
+    assert ds is not None
     layer_defn = ds.GetLayer(0).GetLayerDefn()
     if layer_defn.GetFieldCount() != 15:
         gdaltest.post_reason('Unexpected field count: ' + str(ds.GetLayer(0).GetLayerDefn().GetFieldCount()))
@@ -717,8 +682,7 @@ def test_ogr2ogr_py_20():
     ds.Destroy()
     ogr.GetDriverByName('ESRI Shapefile').DeleteDataSource('tmp/Fields.dbf')
 
-    if error_occurred:
-        return 'fail'
+    assert not error_occurred
 
     return 'success'
 
@@ -742,8 +706,7 @@ def test_ogr2ogr_py_21():
                                   '-sql "SELECT comment, name FROM dataforogr2ogr21" -nlt POINT')
     ds = ogr.Open('tmp/testogr2ogr21.gtm')
 
-    if ds is None:
-        return 'fail'
+    assert ds is not None
     ds.GetLayer(0).GetLayerDefn()
     lyr = ds.GetLayer(0)
     feat = lyr.GetNextFeature()
@@ -774,8 +737,7 @@ def test_ogr2ogr_py_22():
                                   '-sql "SELECT comment, name FROM dataforogr2ogr21" -nlt POINT')
     ds = ogr.Open('tmp/testogr2ogr22.mif')
 
-    if ds is None:
-        return 'fail'
+    assert ds is not None
     ds.GetLayer(0).GetLayerDefn()
     lyr = ds.GetLayer(0)
     feat = lyr.GetNextFeature()
@@ -808,8 +770,7 @@ def test_ogr2ogr_py_23():
                          '-sql "SELECT comment, name FROM dataforogr2ogr21" -select comment,name -nlt POINT')
     ds = ogr.Open('tmp/testogr2ogr23.mif')
 
-    if ds is None:
-        return 'fail'
+    assert ds is not None
     ds.GetLayer(0).GetLayerDefn()
     lyr = ds.GetLayer(0)
     feat = lyr.GetNextFeature()
@@ -847,13 +808,10 @@ def test_ogr2ogr_py_24():
     test_py_scripts.run_py_script(script_path, 'ogr2ogr', 'tmp/poly.shp ../ogr/data/poly.shp -clipsrc "POLYGON((479609 4764629,479609 4764817,479764 4764817,479764 4764629,479609 4764629))"')
 
     ds = ogr.Open('tmp/poly.shp')
-    if ds is None or ds.GetLayer(0).GetFeatureCount() != 4:
-        return 'fail'
+    assert ds is not None and ds.GetLayer(0).GetFeatureCount() == 4
 
-    if ds.GetLayer(0).GetExtent() != (479609, 479764, 4764629, 4764817):
-        print(ds.GetLayer(0).GetExtent())
-        gdaltest.post_reason('unexpected extent')
-        return 'fail'
+    assert ds.GetLayer(0).GetExtent() == (479609, 479764, 4764629, 4764817), \
+        'unexpected extent'
 
     ds.Destroy()
 
@@ -887,13 +845,10 @@ def test_ogr2ogr_py_25():
     test_py_scripts.run_py_script(script_path, 'ogr2ogr', 'tmp/poly.shp ../ogr/data/poly.shp -clipsrc tmp/clip.csv -clipsrcwhere foo=\'foo\'')
 
     ds = ogr.Open('tmp/poly.shp')
-    if ds is None or ds.GetLayer(0).GetFeatureCount() != 4:
-        return 'fail'
+    assert ds is not None and ds.GetLayer(0).GetFeatureCount() == 4
 
-    if ds.GetLayer(0).GetExtent() != (479609, 479764, 4764629, 4764817):
-        print(ds.GetLayer(0).GetExtent())
-        gdaltest.post_reason('unexpected extent')
-        return 'fail'
+    assert ds.GetLayer(0).GetExtent() == (479609, 479764, 4764629, 4764817), \
+        'unexpected extent'
 
     ds.Destroy()
 
@@ -923,13 +878,10 @@ def test_ogr2ogr_py_26():
     test_py_scripts.run_py_script(script_path, 'ogr2ogr', 'tmp/poly.shp ../ogr/data/poly.shp -clipdst "POLYGON((479609 4764629,479609 4764817,479764 4764817,479764 4764629,479609 4764629))"')
 
     ds = ogr.Open('tmp/poly.shp')
-    if ds is None or ds.GetLayer(0).GetFeatureCount() != 4:
-        return 'fail'
+    assert ds is not None and ds.GetLayer(0).GetFeatureCount() == 4
 
-    if ds.GetLayer(0).GetExtent() != (479609, 479764, 4764629, 4764817):
-        print(ds.GetLayer(0).GetExtent())
-        gdaltest.post_reason('unexpected extent')
-        return 'fail'
+    assert ds.GetLayer(0).GetExtent() == (479609, 479764, 4764629, 4764817), \
+        'unexpected extent'
 
     ds.Destroy()
 
@@ -963,13 +915,10 @@ def test_ogr2ogr_py_27():
     test_py_scripts.run_py_script(script_path, 'ogr2ogr', '-nlt MULTIPOLYGON tmp/poly.shp ../ogr/data/poly.shp -clipdst tmp/clip.csv -clipdstsql "SELECT * from clip"')
 
     ds = ogr.Open('tmp/poly.shp')
-    if ds is None or ds.GetLayer(0).GetFeatureCount() != 4:
-        return 'fail'
+    assert ds is not None and ds.GetLayer(0).GetFeatureCount() == 4
 
-    if ds.GetLayer(0).GetExtent() != (479609, 479764, 4764629, 4764817):
-        print(ds.GetLayer(0).GetExtent())
-        gdaltest.post_reason('unexpected extent')
-        return 'fail'
+    assert ds.GetLayer(0).GetExtent() == (479609, 479764, 4764629, 4764817), \
+        'unexpected extent'
 
     ds.Destroy()
 
@@ -997,8 +946,7 @@ def test_ogr2ogr_py_31():
     test_py_scripts.run_py_script(script_path, 'ogr2ogr', ' -overwrite tmp/poly.shp ../ogr/data/poly.shp')
 
     ds = ogr.Open('tmp/poly.shp')
-    if ds is None or ds.GetLayer(0).GetFeatureCount() != 10:
-        return 'fail'
+    assert ds is not None and ds.GetLayer(0).GetFeatureCount() == 10
     ds.Destroy()
 
     ogr.GetDriverByName('ESRI Shapefile').DeleteDataSource('tmp/poly.shp')
@@ -1024,17 +972,14 @@ def test_ogr2ogr_py_32():
     test_py_scripts.run_py_script(script_path, 'ogr2ogr', ' -append tmp/test_ogr2ogr_32.shp ../ogr/data/poly.shp')
 
     ds = ogr.Open('tmp/test_ogr2ogr_32.shp')
-    if ds is None or ds.GetLayer(0).GetFeatureCount() != 20:
-        gdaltest.post_reason('-append failed')
-        return 'fail'
+    assert ds is not None and ds.GetLayer(0).GetFeatureCount() == 20, '-append failed'
     ds = None
 
     test_py_scripts.run_py_script(script_path, 'ogr2ogr', ' -overwrite tmp/test_ogr2ogr_32.shp ../ogr/data/poly.shp')
 
     ds = ogr.Open('tmp/test_ogr2ogr_32.shp')
-    if ds is None or ds.GetLayer(0).GetFeatureCount() != 10:
-        gdaltest.post_reason('-overwrite failed')
-        return 'fail'
+    assert ds is not None and ds.GetLayer(0).GetFeatureCount() == 10, \
+        '-overwrite failed'
     ds = None
 
     ogr.GetDriverByName('ESRI Shapefile').DeleteDataSource('tmp/test_ogr2ogr_32.shp')
@@ -1072,10 +1017,7 @@ def test_ogr2ogr_py_33():
 
     ds = ogr.Open('tmp/test_ogr2ogr_33_dst.shp')
     lyr = ds.GetLayer(0)
-    if lyr.GetFeatureCount() != 3:
-        gdaltest.post_reason('-explodecollections failed')
-        print(lyr.GetFeatureCount())
-        return 'fail'
+    assert lyr.GetFeatureCount() == 3, '-explodecollections failed'
 
     feat = lyr.GetFeature(0)
     if feat.GetField("foo") != 'bar':
@@ -1128,25 +1070,21 @@ def test_ogr2ogr_py_34():
     test_py_scripts.run_py_script(script_path, 'ogr2ogr', ' tmp/test_ogr2ogr_34_dir ../ogr/data/poly.shp -nln test_ogr2ogr_34_dir')
 
     ds = ogr.Open('tmp/test_ogr2ogr_34_dir/test_ogr2ogr_34_dir.shp')
-    if ds is None or ds.GetLayer(0).GetFeatureCount() != 10:
-        gdaltest.post_reason('initial shapefile creation failed')
-        return 'fail'
+    assert ds is not None and ds.GetLayer(0).GetFeatureCount() == 10, \
+        'initial shapefile creation failed'
     ds = None
 
     test_py_scripts.run_py_script(script_path, 'ogr2ogr', ' -append tmp/test_ogr2ogr_34_dir ../ogr/data/poly.shp -nln test_ogr2ogr_34_dir')
 
     ds = ogr.Open('tmp/test_ogr2ogr_34_dir/test_ogr2ogr_34_dir.shp')
-    if ds is None or ds.GetLayer(0).GetFeatureCount() != 20:
-        gdaltest.post_reason('-append failed')
-        return 'fail'
+    assert ds is not None and ds.GetLayer(0).GetFeatureCount() == 20, '-append failed'
     ds = None
 
     test_py_scripts.run_py_script(script_path, 'ogr2ogr', ' -overwrite tmp/test_ogr2ogr_34_dir ../ogr/data/poly.shp -nln test_ogr2ogr_34_dir')
 
     ds = ogr.Open('tmp/test_ogr2ogr_34_dir/test_ogr2ogr_34_dir.shp')
-    if ds is None or ds.GetLayer(0).GetFeatureCount() != 10:
-        gdaltest.post_reason('-overwrite failed')
-        return 'fail'
+    assert ds is not None and ds.GetLayer(0).GetFeatureCount() == 10, \
+        '-overwrite failed'
     ds = None
 
     ogr.GetDriverByName('ESRI Shapefile').DeleteDataSource('tmp/test_ogr2ogr_34_dir')
@@ -1171,25 +1109,21 @@ def test_ogr2ogr_py_35():
     test_py_scripts.run_py_script(script_path, 'ogr2ogr', ' tmp/test_ogr2ogr_35_dir ../ogr/data/poly.shp ')
 
     ds = ogr.Open('tmp/test_ogr2ogr_35_dir/poly.shp')
-    if ds is None or ds.GetLayer(0).GetFeatureCount() != 10:
-        gdaltest.post_reason('initial shapefile creation failed')
-        return 'fail'
+    assert ds is not None and ds.GetLayer(0).GetFeatureCount() == 10, \
+        'initial shapefile creation failed'
     ds = None
 
     test_py_scripts.run_py_script(script_path, 'ogr2ogr', ' -append tmp/test_ogr2ogr_35_dir ../ogr/data/poly.shp')
 
     ds = ogr.Open('tmp/test_ogr2ogr_35_dir/poly.shp')
-    if ds is None or ds.GetLayer(0).GetFeatureCount() != 20:
-        gdaltest.post_reason('-append failed')
-        return 'fail'
+    assert ds is not None and ds.GetLayer(0).GetFeatureCount() == 20, '-append failed'
     ds = None
 
     test_py_scripts.run_py_script(script_path, 'ogr2ogr', ' -overwrite tmp/test_ogr2ogr_35_dir ../ogr/data/poly.shp')
 
     ds = ogr.Open('tmp/test_ogr2ogr_35_dir/poly.shp')
-    if ds is None or ds.GetLayer(0).GetFeatureCount() != 10:
-        gdaltest.post_reason('-overwrite failed')
-        return 'fail'
+    assert ds is not None and ds.GetLayer(0).GetFeatureCount() == 10, \
+        '-overwrite failed'
     ds = None
 
     ogr.GetDriverByName('ESRI Shapefile').DeleteDataSource('tmp/test_ogr2ogr_35_dir')
@@ -1220,8 +1154,7 @@ def test_ogr2ogr_py_36():
 
     ogr.GetDriverByName('ESRI Shapefile').DeleteDataSource('tmp/test_ogr2ogr_36.shp')
 
-    if wkt.find(' 168,') == -1:
-        return 'fail'
+    assert wkt.find(' 168,') != -1
 
     return 'success'
 
@@ -1255,8 +1188,7 @@ def test_ogr2ogr_py_37():
     test_py_scripts.run_py_script(script_path, 'ogr2ogr', ' tmp/test_ogr2ogr_37_dir.shp tmp/test_ogr2ogr_37_src')
 
     ds = ogr.Open('tmp/test_ogr2ogr_37_dir.shp')
-    if ds is None or ds.GetLayerCount() != 2:
-        return 'fail'
+    assert ds is not None and ds.GetLayerCount() == 2
     ds = None
 
     ogr.GetDriverByName('ESRI Shapefile').DeleteDataSource('tmp/test_ogr2ogr_37_src')
@@ -1286,8 +1218,7 @@ def test_ogr2ogr_py_38():
     ds = ogr.Open('tmp/test_ogr2ogr_38.shp')
     lyr = ds.GetLayer(0)
     feat = lyr.GetNextFeature()
-    if feat is None:
-        return 'fail'
+    assert feat is not None
     ds = None
 
     ogr.GetDriverByName('ESRI Shapefile').DeleteDataSource('tmp/test_ogr2ogr_38.shp')
@@ -1324,8 +1255,7 @@ def test_ogr2ogr_py_39():
     test_py_scripts.run_py_script(script_path, 'ogr2ogr', ' tmp/test_ogr2ogr_39.shp tmp/test_ogr2ogr_39_src -sql "select * from poly"')
 
     ds = ogr.Open('tmp/test_ogr2ogr_39.shp')
-    if ds is None or ds.GetLayerCount() != 1:
-        return 'fail'
+    assert ds is not None and ds.GetLayerCount() == 1
     ds = None
 
     ogr.GetDriverByName('ESRI Shapefile').DeleteDataSource('tmp/test_ogr2ogr_39_src')
@@ -1353,8 +1283,7 @@ def test_ogr2ogr_py_43():
 
     ds = ogr.Open('tmp/test_ogr2ogr_43_3d.shp')
     lyr = ds.GetLayerByIndex(0)
-    if lyr.GetGeomType() != ogr.wkbPolygon25D:
-        return 'fail'
+    assert lyr.GetGeomType() == ogr.wkbPolygon25D
     ds = None
 
     try:
@@ -1367,8 +1296,7 @@ def test_ogr2ogr_py_43():
 
     ds = ogr.Open('tmp/test_ogr2ogr_43_2d.shp')
     lyr = ds.GetLayerByIndex(0)
-    if lyr.GetGeomType() != ogr.wkbPolygon:
-        return 'fail'
+    assert lyr.GetGeomType() == ogr.wkbPolygon
     ds = None
 
     ogr.GetDriverByName('ESRI Shapefile').DeleteDataSource('tmp/test_ogr2ogr_43_2d.shp')
@@ -1411,17 +1339,13 @@ def test_ogr2ogr_py_44():
     data = f.read()
     f.close()
 
-    if data.find('type="gml:MultiPolygonPropertyType"') == -1:
-        print(data)
-        return 'fail'
+    assert data.find('type="gml:MultiPolygonPropertyType"') != -1
 
     f = open('tmp/test_ogr2ogr_44.gml')
     data = f.read()
     f.close()
 
-    if data.find('<ogr:geometryProperty><gml:MultiPolygon><gml:polygonMember><gml:Polygon><gml:outerBoundaryIs><gml:LinearRing><gml:coordinates>0,0 0,1 1,1 0,0</gml:coordinates></gml:LinearRing></gml:outerBoundaryIs></gml:Polygon></gml:polygonMember></gml:MultiPolygon></ogr:geometryProperty>') == -1:
-        print(data)
-        return 'fail'
+    assert data.find('<ogr:geometryProperty><gml:MultiPolygon><gml:polygonMember><gml:Polygon><gml:outerBoundaryIs><gml:LinearRing><gml:coordinates>0,0 0,1 1,1 0,0</gml:coordinates></gml:LinearRing></gml:outerBoundaryIs></gml:Polygon></gml:polygonMember></gml:MultiPolygon></ogr:geometryProperty>') != -1
 
     ogr.GetDriverByName('ESRI Shapefile').DeleteDataSource('tmp/test_ogr2ogr_44_src.shp')
     os.unlink('tmp/test_ogr2ogr_44.gml')
@@ -1464,17 +1388,13 @@ def test_ogr2ogr_py_45():
     data = f.read()
     f.close()
 
-    if data.find('type="gml:MultiPolygonPropertyType"') == -1:
-        print(data)
-        return 'fail'
+    assert data.find('type="gml:MultiPolygonPropertyType"') != -1
 
     f = open('tmp/test_ogr2ogr_44.gml')
     data = f.read()
     f.close()
 
-    if data.find('<ogr:geometryProperty><gml:MultiPolygon><gml:polygonMember><gml:Polygon><gml:outerBoundaryIs><gml:LinearRing><gml:coordinates>0,0 0,1 1,1 0,0</gml:coordinates></gml:LinearRing></gml:outerBoundaryIs></gml:Polygon></gml:polygonMember></gml:MultiPolygon></ogr:geometryProperty>') == -1:
-        print(data)
-        return 'fail'
+    assert data.find('<ogr:geometryProperty><gml:MultiPolygon><gml:polygonMember><gml:Polygon><gml:outerBoundaryIs><gml:LinearRing><gml:coordinates>0,0 0,1 1,1 0,0</gml:coordinates></gml:LinearRing></gml:outerBoundaryIs></gml:Polygon></gml:polygonMember></gml:MultiPolygon></ogr:geometryProperty>') != -1
 
     ogr.GetDriverByName('ESRI Shapefile').DeleteDataSource('tmp/test_ogr2ogr_44_src.shp')
     os.unlink('tmp/test_ogr2ogr_44.gml')
@@ -1517,17 +1437,13 @@ def test_ogr2ogr_py_46():
     data = f.read()
     f.close()
 
-    if data.find('type="gml:MultiLineStringPropertyType"') == -1:
-        print(data)
-        return 'fail'
+    assert data.find('type="gml:MultiLineStringPropertyType"') != -1
 
     f = open('tmp/test_ogr2ogr_45.gml')
     data = f.read()
     f.close()
 
-    if data.find('<ogr:geometryProperty><gml:MultiLineString><gml:lineStringMember><gml:LineString><gml:coordinates>0,0 0,1 1,1 0,0</gml:coordinates></gml:LineString></gml:lineStringMember></gml:MultiLineString></ogr:geometryProperty>') == -1:
-        print(data)
-        return 'fail'
+    assert data.find('<ogr:geometryProperty><gml:MultiLineString><gml:lineStringMember><gml:LineString><gml:coordinates>0,0 0,1 1,1 0,0</gml:coordinates></gml:LineString></gml:lineStringMember></gml:MultiLineString></ogr:geometryProperty>') != -1
 
     ogr.GetDriverByName('ESRI Shapefile').DeleteDataSource('tmp/test_ogr2ogr_45_src.shp')
     gdal.Unlink('tmp/test_ogr2ogr_45.gml')
diff --git a/autotest/pyscripts/test_ogrinfo_py.py b/autotest/pyscripts/test_ogrinfo_py.py
index 953c7f6bf70f..a20cbd882030 100755
--- a/autotest/pyscripts/test_ogrinfo_py.py
+++ b/autotest/pyscripts/test_ogrinfo_py.py
@@ -46,8 +46,7 @@ def test_ogrinfo_py_1():
         return 'skip'
 
     ret = test_py_scripts.run_py_script(script_path, 'ogrinfo', '../ogr/data/poly.shp')
-    if ret.find('ESRI Shapefile') == -1:
-        return 'fail'
+    assert ret.find('ESRI Shapefile') != -1
 
     return 'success'
 
@@ -61,8 +60,7 @@ def test_ogrinfo_py_2():
         return 'skip'
 
     ret = test_py_scripts.run_py_script(script_path, 'ogrinfo', '-ro ../ogr/data/poly.shp')
-    if ret.find('ESRI Shapefile') == -1:
-        return 'fail'
+    assert ret.find('ESRI Shapefile') != -1
 
     return 'success'
 
@@ -76,8 +74,7 @@ def test_ogrinfo_py_3():
         return 'skip'
 
     ret = test_py_scripts.run_py_script(script_path, 'ogrinfo', '-al ../ogr/data/poly.shp')
-    if ret.find('Feature Count: 10') == -1:
-        return 'fail'
+    assert ret.find('Feature Count: 10') != -1
 
     return 'success'
 
@@ -91,8 +88,7 @@ def test_ogrinfo_py_4():
         return 'skip'
 
     ret = test_py_scripts.run_py_script(script_path, 'ogrinfo', '../ogr/data/poly.shp poly')
-    if ret.find('Feature Count: 10') == -1:
-        return 'fail'
+    assert ret.find('Feature Count: 10') != -1
 
     return 'success'
 
@@ -106,8 +102,7 @@ def test_ogrinfo_py_5():
         return 'skip'
 
     ret = test_py_scripts.run_py_script(script_path, 'ogrinfo', '../ogr/data/poly.shp -sql "select * from poly"')
-    if ret.find('Feature Count: 10') == -1:
-        return 'fail'
+    assert ret.find('Feature Count: 10') != -1
 
     return 'success'
 
@@ -121,10 +116,8 @@ def test_ogrinfo_py_6():
         return 'skip'
 
     ret = test_py_scripts.run_py_script(script_path, 'ogrinfo', '../ogr/data/poly.shp poly -geom=no')
-    if ret.find('Feature Count: 10') == -1:
-        return 'fail'
-    if ret.find('POLYGON') != -1:
-        return 'fail'
+    assert ret.find('Feature Count: 10') != -1
+    assert ret.find('POLYGON') == -1
 
     return 'success'
 
@@ -138,12 +131,9 @@ def test_ogrinfo_py_7():
         return 'skip'
 
     ret = test_py_scripts.run_py_script(script_path, 'ogrinfo', '../ogr/data/poly.shp poly -geom=summary')
-    if ret.find('Feature Count: 10') == -1:
-        return 'fail'
-    if ret.find('POLYGON (') != -1:
-        return 'fail'
-    if ret.find('POLYGON :') == -1:
-        return 'fail'
+    assert ret.find('Feature Count: 10') != -1
+    assert ret.find('POLYGON (') == -1
+    assert ret.find('POLYGON :') != -1
 
     return 'success'
 
@@ -158,12 +148,10 @@ def test_ogrinfo_py_8():
 
     ret = test_py_scripts.run_py_script(script_path, 'ogrinfo', '../ogr/data/poly.shp poly -spat 479609 4764629 479764 4764817')
     if ogrtest.have_geos():
-        if ret.find('Feature Count: 4') == -1:
-            return 'fail'
+        assert ret.find('Feature Count: 4') != -1
         return 'success'
     else:
-        if ret.find('Feature Count: 5') == -1:
-            return 'fail'
+        assert ret.find('Feature Count: 5') != -1
         return 'success'
 
 ###############################################################################
@@ -176,8 +164,7 @@ def test_ogrinfo_py_9():
         return 'skip'
 
     ret = test_py_scripts.run_py_script(script_path, 'ogrinfo', '../ogr/data/poly.shp poly -where "EAS_ID=171"')
-    if ret.find('Feature Count: 1') == -1:
-        return 'fail'
+    assert ret.find('Feature Count: 1') != -1
 
     return 'success'
 
@@ -191,8 +178,7 @@ def test_ogrinfo_py_10():
         return 'skip'
 
     ret = test_py_scripts.run_py_script(script_path, 'ogrinfo', '../ogr/data/poly.shp poly -fid 9')
-    if ret.find('OGRFeature(poly):9') == -1:
-        return 'fail'
+    assert ret.find('OGRFeature(poly):9') != -1
 
     return 'success'
 
@@ -206,10 +192,8 @@ def test_ogrinfo_py_11():
         return 'skip'
 
     ret = test_py_scripts.run_py_script(script_path, 'ogrinfo', '../ogr/data/poly.shp poly -fields=no')
-    if ret.find('AREA (Real') != -1:
-        return 'fail'
-    if ret.find('POLYGON (') == -1:
-        return 'fail'
+    assert ret.find('AREA (Real') == -1
+    assert ret.find('POLYGON (') != -1
 
     return 'success'
 
@@ -228,9 +212,7 @@ def test_ogrinfo_py_22():
     f.close()
 
     ret = test_py_scripts.run_py_script(script_path, 'ogrinfo', 'tmp/test_ogrinfo_22.csv')
-    if ret.find('1: test_ogrinfo_22 (Unknown (any), Unknown (any))') < 0:
-        print(ret)
-        return 'fail'
+    assert ret.find('1: test_ogrinfo_22 (Unknown (any), Unknown (any))') >= 0
 
     ret = test_py_scripts.run_py_script(script_path, 'ogrinfo', '-al tmp/test_ogrinfo_22.csv')
     expected_ret = """INFO: Open of `tmp/test_ogrinfo_22.csv'
@@ -289,9 +271,7 @@ def test_ogrinfo_py_22():
     expected_lines = expected_ret.splitlines()
     lines = ret.splitlines()
     for i, exp_line in enumerate(expected_lines):
-        if exp_line != lines[i]:
-            print(ret)
-            return 'fail'
+        assert exp_line == lines[i], ret
 
     os.unlink('tmp/test_ogrinfo_22.csv')
 
@@ -369,9 +349,7 @@ def test_ogrinfo_py_23():
     expected_lines = expected_ret.splitlines()
     lines = ret.splitlines()
     for i, exp_line in enumerate(expected_lines):
-        if exp_line != lines[i]:
-            print(ret)
-            return 'fail'
+        assert exp_line == lines[i], ret
 
     os.unlink('tmp/test_ogrinfo_23.csv')
 
diff --git a/autotest/pyscripts/test_ogrmerge.py b/autotest/pyscripts/test_ogrmerge.py
index 9d236502bed1..5359d96ae6c0 100755
--- a/autotest/pyscripts/test_ogrmerge.py
+++ b/autotest/pyscripts/test_ogrmerge.py
@@ -50,8 +50,7 @@ def test_ogrmerge_1():
 
     ds = ogr.Open('/vsimem/out.shp')
     lyr = ds.GetLayer(0)
-    if lyr.GetFeatureCount() != 20:
-        return 'fail'
+    assert lyr.GetFeatureCount() == 20
     ds = None
 
     ogr.GetDriverByName('ESRI Shapefile').DeleteDataSource('/vsimem/out.shp')
@@ -74,8 +73,7 @@ def test_ogrmerge_2():
 
     ds = ogr.Open('/vsimem/out.shp')
     lyr = ds.GetLayer(0)
-    if lyr.GetFeatureCount() != 20:
-        return 'fail'
+    assert lyr.GetFeatureCount() == 20
     ds = None
 
     ogr.GetDriverByName('ESRI Shapefile').DeleteDataSource('/vsimem/out.shp')
@@ -98,8 +96,7 @@ def test_ogrmerge_3():
 
     ds = ogr.Open('/vsimem/out.shp')
     lyr = ds.GetLayer(0)
-    if lyr.GetFeatureCount() != 10:
-        return 'fail'
+    assert lyr.GetFeatureCount() == 10
     ds = None
 
     ogr.GetDriverByName('ESRI Shapefile').DeleteDataSource('/vsimem/out.shp')
@@ -120,10 +117,8 @@ def test_ogrmerge_4():
 
     ds = ogr.Open('/vsimem/out.vrt')
     lyr = ds.GetLayer(0)
-    if lyr.GetName() != 'poly':
-        return 'fail'
-    if lyr.GetFeatureCount() != 10:
-        return 'fail'
+    assert lyr.GetName() == 'poly'
+    assert lyr.GetFeatureCount() == 10
     ds = None
 
     gdal.Unlink('/vsimem/out.vrt')
@@ -145,17 +140,11 @@ def test_ogrmerge_5():
 
     ds = ogr.Open('/vsimem/out.vrt')
     lyr = ds.GetLayer(0)
-    if lyr.GetName() != 'foo_../ogr/data/poly.shp_poly_0_poly_0':
-        print(lyr.GetName())
-        return 'fail'
-    if lyr.GetFeatureCount() != 10:
-        return 'fail'
+    assert lyr.GetName() == 'foo_../ogr/data/poly.shp_poly_0_poly_0'
+    assert lyr.GetFeatureCount() == 10
     lyr = ds.GetLayer(1)
-    if lyr.GetName() != 'foo_../ogr/data/testpoly.shp_testpoly_1_testpoly_0':
-        print(lyr.GetName())
-        return 'fail'
-    if lyr.GetFeatureCount() != 14:
-        return 'fail'
+    assert lyr.GetName() == 'foo_../ogr/data/testpoly.shp_testpoly_1_testpoly_0'
+    assert lyr.GetFeatureCount() == 14
     ds = None
 
     gdal.Unlink('/vsimem/out.vrt')
@@ -203,8 +192,7 @@ def test_ogrmerge_7():
                                   '-src_geom_type POINT')
 
     ds = ogr.Open('/vsimem/out.vrt')
-    if ds.GetLayerCount() != 0:
-        return 'fail'
+    assert ds.GetLayerCount() == 0
     ds = None
 
     gdal.Unlink('/vsimem/out.vrt')
@@ -215,8 +203,7 @@ def test_ogrmerge_7():
                                   '-src_geom_type POLYGON')
 
     ds = ogr.Open('/vsimem/out.vrt')
-    if ds.GetLayerCount() != 1:
-        return 'fail'
+    assert ds.GetLayerCount() == 1
     ds = None
 
     gdal.Unlink('/vsimem/out.vrt')
@@ -227,8 +214,7 @@ def test_ogrmerge_7():
                                   '-src_geom_type POINT')
 
     ds = ogr.Open('/vsimem/out.vrt')
-    if ds.GetLayerCount() != 0:
-        return 'fail'
+    assert ds.GetLayerCount() == 0
     ds = None
 
     gdal.Unlink('/vsimem/out.vrt')
@@ -239,8 +225,7 @@ def test_ogrmerge_7():
                                   '-src_geom_type POLYGON')
 
     ds = ogr.Open('/vsimem/out.vrt')
-    if ds.GetLayerCount() != 1:
-        return 'fail'
+    assert ds.GetLayerCount() == 1
     ds = None
 
     gdal.Unlink('/vsimem/out.vrt')
@@ -261,8 +246,7 @@ def test_ogrmerge_8():
                                   '-s_srs EPSG:32630 -t_srs EPSG:4326')
 
     ds = ogr.Open('/vsimem/out.vrt')
-    if ds is None:
-        return 'fail'
+    assert ds is not None
     ds = None
 
     f = gdal.VSIFOpenL('/vsimem/out.vrt', 'rb')
@@ -272,13 +256,9 @@ def test_ogrmerge_8():
         gdal.VSIFCloseL(f)
     gdal.Unlink('/vsimem/out.vrt')
 
-    if content.find('<SrcSRS>EPSG:32630</SrcSRS>') < 0:
-        print(content)
-        return 'fail'
+    assert content.find('<SrcSRS>EPSG:32630</SrcSRS>') >= 0
 
-    if content.find('<TargetSRS>EPSG:4326</TargetSRS>') < 0:
-        print(content)
-        return 'fail'
+    assert content.find('<TargetSRS>EPSG:4326</TargetSRS>') >= 0
 
     return 'success'
 
@@ -296,8 +276,7 @@ def test_ogrmerge_9():
                                   '-s_srs EPSG:32630 -t_srs EPSG:4326')
 
     ds = ogr.Open('/vsimem/out.vrt')
-    if ds is None:
-        return 'fail'
+    assert ds is not None
     ds = None
 
     f = gdal.VSIFOpenL('/vsimem/out.vrt', 'rb')
@@ -307,13 +286,9 @@ def test_ogrmerge_9():
         gdal.VSIFCloseL(f)
     gdal.Unlink('/vsimem/out.vrt')
 
-    if content.find('<SrcSRS>EPSG:32630</SrcSRS>') < 0:
-        print(content)
-        return 'fail'
+    assert content.find('<SrcSRS>EPSG:32630</SrcSRS>') >= 0
 
-    if content.find('<TargetSRS>EPSG:4326</TargetSRS>') < 0:
-        print(content)
-        return 'fail'
+    assert content.find('<TargetSRS>EPSG:4326</TargetSRS>') >= 0
 
     return 'success'
 
@@ -331,8 +306,7 @@ def test_ogrmerge_10():
                                   '-a_srs EPSG:32630')
 
     ds = ogr.Open('/vsimem/out.vrt')
-    if ds is None:
-        return 'fail'
+    assert ds is not None
     ds = None
 
     f = gdal.VSIFOpenL('/vsimem/out.vrt', 'rb')
@@ -342,9 +316,7 @@ def test_ogrmerge_10():
         gdal.VSIFCloseL(f)
     gdal.Unlink('/vsimem/out.vrt')
 
-    if content.find('<LayerSRS>EPSG:32630</LayerSRS>') < 0:
-        print(content)
-        return 'fail'
+    assert content.find('<LayerSRS>EPSG:32630</LayerSRS>') >= 0
 
     return 'success'
 
@@ -362,8 +334,7 @@ def test_ogrmerge_11():
                                   '-a_srs EPSG:32630')
 
     ds = ogr.Open('/vsimem/out.vrt')
-    if ds is None:
-        return 'fail'
+    assert ds is not None
     ds = None
 
     f = gdal.VSIFOpenL('/vsimem/out.vrt', 'rb')
@@ -373,9 +344,7 @@ def test_ogrmerge_11():
         gdal.VSIFCloseL(f)
     gdal.Unlink('/vsimem/out.vrt')
 
-    if content.find('<LayerSRS>EPSG:32630</LayerSRS>') < 0:
-        print(content)
-        return 'fail'
+    assert content.find('<LayerSRS>EPSG:32630</LayerSRS>') >= 0
 
     return 'success'
 
@@ -395,8 +364,7 @@ def test_ogrmerge_12():
                                   '-f VRT -o /vsimem/out.vrt tmp/tmp.json')
 
     ds = ogr.Open('/vsimem/out.vrt')
-    if ds is None:
-        return 'fail'
+    assert ds is not None
     ds = None
 
     gdal.Unlink('tmp/tmp.json')
diff --git a/autotest/pyscripts/test_rgb2pct.py b/autotest/pyscripts/test_rgb2pct.py
index 9d6c1ba352e3..f6b598e9b440 100755
--- a/autotest/pyscripts/test_rgb2pct.py
+++ b/autotest/pyscripts/test_rgb2pct.py
@@ -51,9 +51,7 @@ def test_rgb2pct_1():
     test_py_scripts.run_py_script(script_path, 'rgb2pct', '../gcore/data/rgbsmall.tif tmp/test_rgb2pct_1.tif')
 
     ds = gdal.Open('tmp/test_rgb2pct_1.tif')
-    if ds.GetRasterBand(1).Checksum() != 31231:
-        print(ds.GetRasterBand(1).Checksum())
-        return 'fail'
+    assert ds.GetRasterBand(1).Checksum() == 31231
     ds = None
 
     return 'success'
@@ -76,14 +74,11 @@ def test_pct2rgb_1():
     test_py_scripts.run_py_script(script_path, 'pct2rgb', 'tmp/test_rgb2pct_1.tif tmp/test_pct2rgb_1.tif')
 
     ds = gdal.Open('tmp/test_pct2rgb_1.tif')
-    if ds.GetRasterBand(1).Checksum() != 20963:
-        print(ds.GetRasterBand(1).Checksum())
-        return 'fail'
+    assert ds.GetRasterBand(1).Checksum() == 20963
 
     ori_ds = gdal.Open('../gcore/data/rgbsmall.tif')
     max_diff = gdaltest.compare_ds(ori_ds, ds)
-    if max_diff > 18:
-        return 'fail'
+    assert max_diff <= 18
 
     ds = None
     ori_ds = None
@@ -103,16 +98,13 @@ def test_rgb2pct_2():
     test_py_scripts.run_py_script(script_path, 'rgb2pct', '-n 16 ../gcore/data/rgbsmall.tif tmp/test_rgb2pct_2.tif')
 
     ds = gdal.Open('tmp/test_rgb2pct_2.tif')
-    if ds.GetRasterBand(1).Checksum() != 16596:
-        print(ds.GetRasterBand(1).Checksum())
-        return 'fail'
+    assert ds.GetRasterBand(1).Checksum() == 16596
 
     ct = ds.GetRasterBand(1).GetRasterColorTable()
     for i in range(16, 255):
         entry = ct.GetColorEntry(i)
-        if not (entry[0] == 0 and entry[1] == 0 and entry[2] == 0):
-            gdaltest.post_reason('Color table has more than 16 entries')
-            return 'fail'
+        assert (entry[0] == 0 and entry[1] == 0 and entry[2] == 0), \
+            'Color table has more than 16 entries'
 
     ds = None
 
@@ -131,16 +123,13 @@ def test_rgb2pct_3():
     test_py_scripts.run_py_script(script_path, 'rgb2pct', '-pct tmp/test_rgb2pct_2.tif ../gcore/data/rgbsmall.tif tmp/test_rgb2pct_3.tif')
 
     ds = gdal.Open('tmp/test_rgb2pct_3.tif')
-    if ds.GetRasterBand(1).Checksum() != 16596:
-        print(ds.GetRasterBand(1).Checksum())
-        return 'fail'
+    assert ds.GetRasterBand(1).Checksum() == 16596
 
     ct = ds.GetRasterBand(1).GetRasterColorTable()
     for i in range(16, 255):
         entry = ct.GetColorEntry(i)
-        if not (entry[0] == 0 and entry[1] == 0 and entry[2] == 0):
-            gdaltest.post_reason('Color table has more than 16 entries')
-            return 'fail'
+        assert (entry[0] == 0 and entry[1] == 0 and entry[2] == 0), \
+            'Color table has more than 16 entries'
 
     ds = None
 
@@ -175,8 +164,7 @@ def test_pct2rgb_4():
     ct = ori_ds.GetRasterBand(1).GetRasterColorTable()
     entry = ct.GetColorEntry(ori_data)
 
-    if entry != data:
-        return 'fail'
+    assert entry == data
 
     ds = None
     ori_ds = None
diff --git a/autotest/utilities/test_gdal_contour.py b/autotest/utilities/test_gdal_contour.py
index 4e91d48594a8..b75e2bc83f60 100755
--- a/autotest/utilities/test_gdal_contour.py
+++ b/autotest/utilities/test_gdal_contour.py
@@ -40,6 +40,7 @@
 import gdaltest
 import ogrtest
 import test_cli_utilities
+import pytest
 
 ###############################################################################
 # Test with -a and -i options
@@ -95,10 +96,7 @@ def test_gdal_contour_1():
     ds = None
 
     (_, err) = gdaltest.runexternal_out_and_err(test_cli_utilities.get_gdal_contour_path() + ' -a elev -i 10 tmp/gdal_contour.tif tmp/contour.shp')
-    if not (err is None or err == ''):
-        gdaltest.post_reason('got error/warning')
-        print(err)
-        return 'fail'
+    assert (err is None or err == ''), 'got error/warning'
 
     ds = ogr.Open('tmp/contour.shp')
 
@@ -108,30 +106,20 @@ def test_gdal_contour_1():
 
     lyr = ds.ExecuteSQL("select * from contour order by elev asc")
 
-    if lyr.GetSpatialRef().ExportToWkt() != wkt:
-        print('Did not get expected spatial ref')
-        print(lyr.GetSpatialRef().ExportToWkt())
-        print(wkt)
-        return 'fail'
+    assert lyr.GetSpatialRef().ExportToWkt() == wkt, 'Did not get expected spatial ref'
 
-    if lyr.GetFeatureCount() != len(expected_envelopes):
-        print('Got %d features. Expected %d' % (lyr.GetFeatureCount(), len(expected_envelopes)))
-        return 'fail'
+    assert lyr.GetFeatureCount() == len(expected_envelopes)
 
     i = 0
     feat = lyr.GetNextFeature()
     while feat is not None:
         envelope = feat.GetGeometryRef().GetEnvelope()
-        if feat.GetField('elev') != expected_height[i]:
-            print('Got %f. Expected %f' % (feat.GetField('elev'), expected_height[i]))
-            return 'fail'
+        assert feat.GetField('elev') == expected_height[i]
         for j in range(4):
             if abs(expected_envelopes[i][j] - envelope[j]) > precision / 2 * 1.001:
                 print('i=%d, wkt=%s' % (i, feat.GetGeometryRef().ExportToWkt()))
                 print(feat.GetGeometryRef().GetEnvelope())
-                print(expected_envelopes[i])
-                print('%f, %f' % (expected_envelopes[i][j] - envelope[j], precision / 2))
-                return 'fail'
+                pytest.fail('%f, %f' % (expected_envelopes[i][j] - envelope[j], precision / 2))
         i = i + 1
         feat = lyr.GetNextFeature()
 
@@ -176,27 +164,19 @@ def test_gdal_contour_2():
 
     lyr = ds.ExecuteSQL("select * from contour order by elev asc")
 
-    if lyr.GetFeatureCount() != len(expected_envelopes):
-        print('Got %d features. Expected %d' % (lyr.GetFeatureCount(), len(expected_envelopes)))
-        return 'fail'
+    assert lyr.GetFeatureCount() == len(expected_envelopes)
 
     i = 0
     feat = lyr.GetNextFeature()
     while feat is not None:
-        if feat.GetGeometryRef().GetZ(0) != expected_height[i]:
-            print('Got %f as z. Expected %f' % (feat.GetGeometryRef().GetZ(0), expected_height[i]))
-            return 'fail'
+        assert feat.GetGeometryRef().GetZ(0) == expected_height[i]
         envelope = feat.GetGeometryRef().GetEnvelope()
-        if feat.GetField('elev') != expected_height[i]:
-            print('Got %f. Expected %f' % (feat.GetField('elev'), expected_height[i]))
-            return 'fail'
+        assert feat.GetField('elev') == expected_height[i]
         for j in range(4):
             if abs(expected_envelopes[i][j] - envelope[j]) > precision / 2 * 1.001:
                 print('i=%d, wkt=%s' % (i, feat.GetGeometryRef().ExportToWkt()))
                 print(feat.GetGeometryRef().GetEnvelope())
-                print(expected_envelopes[i])
-                print('%f, %f' % (expected_envelopes[i][j] - envelope[j], precision / 2))
-                return 'fail'
+                pytest.fail('%f, %f' % (expected_envelopes[i][j] - envelope[j], precision / 2))
         i = i + 1
         feat = lyr.GetNextFeature()
 
@@ -234,15 +214,12 @@ def test_gdal_contour_3():
     lyr = ds.ExecuteSQL("select distinct elev from contour order by elev asc")
 
     expected_heights = [100, 150, 200, 250, 300, 350, 400, 450]
-    if lyr.GetFeatureCount() != len(expected_heights):
-        print('Got %d features. Expected %d' % (lyr.GetFeatureCount(), len(expected_heights)))
-        return 'fail'
+    assert lyr.GetFeatureCount() == len(expected_heights)
 
     i = 0
     feat = lyr.GetNextFeature()
     while feat is not None:
-        if feat.GetField('elev') != expected_heights[i]:
-            return 'fail'
+        assert feat.GetField('elev') == expected_heights[i]
         i = i + 1
         feat = lyr.GetNextFeature()
 
@@ -333,18 +310,14 @@ def test_gdal_contour_4():
 
     lyr = ds.ExecuteSQL("select * from contour_orientation1 order by elev asc")
 
-    if lyr.GetFeatureCount() != len(expected_contours):
-        print('Got %d features. Expected %d' % (lyr.GetFeatureCount(), len(expected_contours)))
-        return 'fail'
+    assert lyr.GetFeatureCount() == len(expected_contours)
 
     i = 0
     test_failed = False
     feat = lyr.GetNextFeature()
     while feat is not None:
         expected_geom = ogr.CreateGeometryFromWkt(expected_contours[i])
-        if feat.GetField('elev') != expected_elev[i]:
-            print('Got %f. Expected %f' % (feat.GetField('elev'), expected_elev[i]))
-            return 'fail'
+        assert feat.GetField('elev') == expected_elev[i]
         if ogrtest.check_feature_geometry(feat, expected_geom, 0.01) != 0:
             print('Got      %s.\nExpected %s' % (feat.GetGeometryRef().ExportToWkt(), expected_contours[i]))
             test_failed = True
@@ -382,18 +355,14 @@ def test_gdal_contour_5():
 
     lyr = ds.ExecuteSQL("select * from contour_orientation2 order by elev asc")
 
-    if lyr.GetFeatureCount() != len(expected_contours):
-        print('Got %d features. Expected %d' % (lyr.GetFeatureCount(), len(expected_contours)))
-        return 'fail'
+    assert lyr.GetFeatureCount() == len(expected_contours)
 
     i = 0
     test_failed = False
     feat = lyr.GetNextFeature()
     while feat is not None:
         expected_geom = ogr.CreateGeometryFromWkt(expected_contours[i])
-        if feat.GetField('elev') != expected_elev[i]:
-            print('Got %f. Expected %f' % (feat.GetField('elev'), expected_elev[i]))
-            return 'fail'
+        assert feat.GetField('elev') == expected_elev[i]
         if ogrtest.check_feature_geometry(feat, expected_geom) != 0:
             print('Got      %s.\nExpected %s' % (feat.GetGeometryRef().ExportToWkt(), expected_contours[i]))
             test_failed = True
diff --git a/autotest/utilities/test_gdal_grid.py b/autotest/utilities/test_gdal_grid.py
index 9a0700e7dbaf..7f87763eb73e 100755
--- a/autotest/utilities/test_gdal_grid.py
+++ b/autotest/utilities/test_gdal_grid.py
@@ -32,6 +32,7 @@
 import sys
 import os
 import struct
+import pytest
 
 sys.path.append('../gcore')
 
@@ -104,19 +105,13 @@ def test_gdal_grid_1():
 
     # Create a GDAL dataset from the previous generated OGR grid
     (_, err) = gdaltest.runexternal_out_and_err(gdal_grid + ' -txe -80.0041667 -78.9958333 -tye 42.9958333 44.0041667 -outsize 121 121 -ot Int16 -a nearest:radius1=0.0:radius2=0.0:angle=0.0 -co TILED=YES -co BLOCKXSIZE=256 -co BLOCKYSIZE=256 tmp/n43.shp ' + outfiles[-1])
-    if not (err is None or err == ''):
-        gdaltest.post_reason('got error/warning')
-        print(err)
-        return 'fail'
+    assert (err is None or err == ''), 'got error/warning'
 
     # We should get the same values as in n43.td0
     ds2 = gdal.Open(outfiles[-1])
-    if ds.GetRasterBand(1).Checksum() != ds2.GetRasterBand(1).Checksum():
-        print('bad checksum : got %d, expected %d' % (ds.GetRasterBand(1).Checksum(), ds2.GetRasterBand(1).Checksum()))
-        return 'fail'
-    if ds2.GetRasterBand(1).GetNoDataValue() is not None:
-        print('did not expect nodata value')
-        return 'fail'
+    assert ds.GetRasterBand(1).Checksum() == ds2.GetRasterBand(1).Checksum(), \
+        ('bad checksum : got %d, expected %d' % (ds.GetRasterBand(1).Checksum(), ds2.GetRasterBand(1).Checksum()))
+    assert ds2.GetRasterBand(1).GetNoDataValue() is None, 'did not expect nodata value'
 
     ds = None
     ds2 = None
@@ -150,13 +145,10 @@ def test_gdal_grid_2():
     # We should get the same values as in "gcore/data/byte.tif"
     ds = gdal.Open(outfiles[-1])
     if ds.GetRasterBand(1).Checksum() != checksum_ref:
-        gdaltest.post_reason('bad checksum')
         print('bad checksum : got %d, expected %d' %
               (ds.GetRasterBand(1).Checksum(), checksum_ref))
-        return 'fail'
-    if ds.GetRasterBand(1).GetNoDataValue() != 0.0:
-        print('expected a nodata value')
-        return 'fail'
+        pytest.fail('bad checksum')
+    assert ds.GetRasterBand(1).GetNoDataValue() == 0.0, 'expected a nodata value'
     ds = None
 
     #################
@@ -173,10 +165,9 @@ def test_gdal_grid_2():
     # We should get the same values as in "gcore/data/byte.tif"
     ds = gdal.Open(outfiles[-1])
     if ds.GetRasterBand(1).Checksum() != checksum_ref:
-        gdaltest.post_reason('bad checksum')
         print('bad checksum : got %d, expected %d' %
               (ds.GetRasterBand(1).Checksum(), checksum_ref))
-        return 'fail'
+        pytest.fail('bad checksum')
     ds = None
 
     #################
@@ -192,10 +183,9 @@ def test_gdal_grid_2():
     # We should get the same values as in "gcore/data/byte.tif"
     ds = gdal.Open(outfiles[-1])
     if ds.GetRasterBand(1).Checksum() != checksum_ref:
-        gdaltest.post_reason('bad checksum')
         print('bad checksum : got %d, expected %d' %
               (ds.GetRasterBand(1).Checksum(), checksum_ref))
-        return 'fail'
+        pytest.fail('bad checksum')
     ds = None
 
     #################
@@ -211,10 +201,9 @@ def test_gdal_grid_2():
     # We should get the same values as in "gcore/data/byte.tif"
     ds = gdal.Open(outfiles[-1])
     if ds.GetRasterBand(1).Checksum() != checksum_ref:
-        gdaltest.post_reason('bad checksum')
         print('bad checksum : got %d, expected %d' %
               (ds.GetRasterBand(1).Checksum(), checksum_ref))
-        return 'fail'
+        pytest.fail('bad checksum')
     ds = None
 
     #################
@@ -230,10 +219,9 @@ def test_gdal_grid_2():
     # We should get the same values as in "gcore/data/byte.tif"
     ds = gdal.Open(outfiles[-1])
     if ds.GetRasterBand(1).Checksum() != checksum_ref:
-        gdaltest.post_reason('bad checksum')
         print('bad checksum : got %d, expected %d' %
               (ds.GetRasterBand(1).Checksum(), checksum_ref))
-        return 'fail'
+        pytest.fail('bad checksum')
     ds = None
 
     #################
@@ -249,10 +237,9 @@ def test_gdal_grid_2():
     # We should get the same values as in "gcore/data/byte.tif"
     ds = gdal.Open(outfiles[-1])
     if ds.GetRasterBand(1).Checksum() != checksum_ref:
-        gdaltest.post_reason('bad checksum')
         print('bad checksum : got %d, expected %d' %
               (ds.GetRasterBand(1).Checksum(), checksum_ref))
-        return 'fail'
+        pytest.fail('bad checksum')
     ds = None
 
     return 'success'
@@ -540,10 +527,9 @@ def test_gdal_grid_5():
     # We should get the same values as in "ref_data/grid_minimum.tif"
     ds = gdal.Open(outfiles[-1])
     ds_ref = gdal.Open('ref_data/grid_minimum.tif')
-    if ds.GetRasterBand(1).Checksum() != ds_ref.GetRasterBand(1).Checksum():
-        print('bad checksum : got %d, expected %d' %
+    assert ds.GetRasterBand(1).Checksum() == ds_ref.GetRasterBand(1).Checksum(), \
+        ('bad checksum : got %d, expected %d' %
               (ds.GetRasterBand(1).Checksum(), ds_ref.GetRasterBand(1).checksum_ref))
-        return 'fail'
     ds_ref = None
     ds = None
 
@@ -561,10 +547,9 @@ def test_gdal_grid_5():
     # We should get the same values as in "ref_data/grid_minimum_400_100_120.tif"
     ds = gdal.Open(outfiles[-1])
     ds_ref = gdal.Open('ref_data/grid_minimum_400_100_120.tif')
-    if ds.GetRasterBand(1).Checksum() != ds_ref.GetRasterBand(1).Checksum():
-        print('bad checksum : got %d, expected %d' %
+    assert ds.GetRasterBand(1).Checksum() == ds_ref.GetRasterBand(1).Checksum(), \
+        ('bad checksum : got %d, expected %d' %
               (ds.GetRasterBand(1).Checksum(), ds_ref.GetRasterBand(1).checksum_ref))
-        return 'fail'
     ds_ref = None
     ds = None
 
@@ -592,10 +577,9 @@ def test_gdal_grid_6():
     # We should get the same values as in "ref_data/grid_maximum.tif"
     ds = gdal.Open(outfiles[-1])
     ds_ref = gdal.Open('ref_data/grid_maximum.tif')
-    if ds.GetRasterBand(1).Checksum() != ds_ref.GetRasterBand(1).Checksum():
-        print('bad checksum : got %d, expected %d' %
+    assert ds.GetRasterBand(1).Checksum() == ds_ref.GetRasterBand(1).Checksum(), \
+        ('bad checksum : got %d, expected %d' %
               (ds.GetRasterBand(1).Checksum(), ds_ref.GetRasterBand(1).checksum_ref))
-        return 'fail'
     ds_ref = None
     ds = None
 
@@ -613,10 +597,9 @@ def test_gdal_grid_6():
     # We should get the same values as in "ref_data/grid_maximum_100_100.tif"
     ds = gdal.Open(outfiles[-1])
     ds_ref = gdal.Open('ref_data/grid_maximum_100_100.tif')
-    if ds.GetRasterBand(1).Checksum() != ds_ref.GetRasterBand(1).Checksum():
-        print('bad checksum : got %d, expected %d' %
+    assert ds.GetRasterBand(1).Checksum() == ds_ref.GetRasterBand(1).Checksum(), \
+        ('bad checksum : got %d, expected %d' %
               (ds.GetRasterBand(1).Checksum(), ds_ref.GetRasterBand(1).checksum_ref))
-        return 'fail'
     ds_ref = None
     ds = None
 
@@ -644,10 +627,9 @@ def test_gdal_grid_7():
     # We should get the same values as in "ref_data/grid_range.tif"
     ds = gdal.Open(outfiles[-1])
     ds_ref = gdal.Open('ref_data/grid_range.tif')
-    if ds.GetRasterBand(1).Checksum() != ds_ref.GetRasterBand(1).Checksum():
-        print('bad checksum : got %d, expected %d' %
+    assert ds.GetRasterBand(1).Checksum() == ds_ref.GetRasterBand(1).Checksum(), \
+        ('bad checksum : got %d, expected %d' %
               (ds.GetRasterBand(1).Checksum(), ds_ref.GetRasterBand(1).checksum_ref))
-        return 'fail'
     ds_ref = None
     ds = None
 
@@ -666,10 +648,9 @@ def test_gdal_grid_7():
     # We should get the same values as in "ref_data/grid_range_90_90_8p.tif"
     ds = gdal.Open(outfiles[-1])
     ds_ref = gdal.Open('ref_data/grid_range_90_90_8p.tif')
-    if ds.GetRasterBand(1).Checksum() != ds_ref.GetRasterBand(1).Checksum():
-        print('bad checksum : got %d, expected %d' %
+    assert ds.GetRasterBand(1).Checksum() == ds_ref.GetRasterBand(1).Checksum(), \
+        ('bad checksum : got %d, expected %d' %
               (ds.GetRasterBand(1).Checksum(), ds_ref.GetRasterBand(1).checksum_ref))
-        return 'fail'
     ds_ref = None
     ds = None
 
@@ -696,10 +677,9 @@ def test_gdal_grid_8():
     # We should get the same values as in "ref_data/grid_count_70_70.tif"
     ds = gdal.Open(outfiles[-1])
     ds_ref = gdal.Open('ref_data/grid_count_70_70.tif')
-    if ds.GetRasterBand(1).Checksum() != ds_ref.GetRasterBand(1).Checksum():
-        print('bad checksum : got %d, expected %d' %
+    assert ds.GetRasterBand(1).Checksum() == ds_ref.GetRasterBand(1).Checksum(), \
+        ('bad checksum : got %d, expected %d' %
               (ds.GetRasterBand(1).Checksum(), ds_ref.GetRasterBand(1).checksum_ref))
-        return 'fail'
     ds_ref = None
     ds = None
 
@@ -716,10 +696,9 @@ def test_gdal_grid_8():
     # We should get the same values as in "ref_data/grid_count_300_300.tif"
     ds = gdal.Open(outfiles[-1])
     ds_ref = gdal.Open('ref_data/grid_count_300_300.tif')
-    if ds.GetRasterBand(1).Checksum() != ds_ref.GetRasterBand(1).Checksum():
-        print('bad checksum : got %d, expected %d' %
+    assert ds.GetRasterBand(1).Checksum() == ds_ref.GetRasterBand(1).Checksum(), \
+        ('bad checksum : got %d, expected %d' %
               (ds.GetRasterBand(1).Checksum(), ds_ref.GetRasterBand(1).checksum_ref))
-        return 'fail'
     ds_ref = None
     ds = None
 
@@ -826,17 +805,13 @@ def test_gdal_grid_11():
 
     # Create a GDAL dataset from the previous generated OGR grid
     (_, err) = gdaltest.runexternal_out_and_err(gdal_grid + ' -txe -80.0041667 -78.9958333 -tye 42.9958333 44.0041667 -outsize 121 121 -ot Int16 -l n43 -a linear -co TILED=YES -co BLOCKXSIZE=256 -co BLOCKYSIZE=256 tmp/n43.shp ' + outfiles[-1])
-    if not (err is None or err == ''):
-        gdaltest.post_reason('got error/warning')
-        print(err)
-        return 'fail'
+    assert (err is None or err == ''), 'got error/warning'
 
     # We should get the same values as in n43.td0
     ds = gdal.Open('../gdrivers/data/n43.dt0')
     ds2 = gdal.Open(outfiles[-1])
-    if ds.GetRasterBand(1).Checksum() != ds2.GetRasterBand(1).Checksum():
-        print('bad checksum : got %d, expected %d' % (ds.GetRasterBand(1).Checksum(), ds2.GetRasterBand(1).Checksum()))
-        return 'fail'
+    assert ds.GetRasterBand(1).Checksum() == ds2.GetRasterBand(1).Checksum(), \
+        ('bad checksum : got %d, expected %d' % (ds.GetRasterBand(1).Checksum(), ds2.GetRasterBand(1).Checksum()))
 
     ds = None
     ds2 = None
@@ -949,10 +924,7 @@ def test_gdal_grid_clipsrc():
     # We should get the same values as in "gcore/data/byte.tif"
     ds = gdal.Open(outfiles[-1])
     cs = ds.GetRasterBand(1).Checksum()
-    if cs == 0 or cs == 4672:
-        gdaltest.post_reason('bad checksum')
-        print(cs)
-        return 'fail'
+    assert not (cs == 0 or cs == 4672), 'bad checksum'
     ds = None
 
     return 'success'
diff --git a/autotest/utilities/test_gdal_grid_lib.py b/autotest/utilities/test_gdal_grid_lib.py
index d554ceebbe9a..2b4d937c8752 100755
--- a/autotest/utilities/test_gdal_grid_lib.py
+++ b/autotest/utilities/test_gdal_grid_lib.py
@@ -78,12 +78,9 @@ def test_gdal_grid_lib_1():
                     algorithm='nearest:radius1=0.0:radius2=0.0:angle=0.0',
                     spatFilter=spatFilter)
     # We should get the same values as in n43.td0
-    if ds.GetRasterBand(1).Checksum() != ds2.GetRasterBand(1).Checksum():
-        print('bad checksum : got %d, expected %d' % (ds.GetRasterBand(1).Checksum(), ds2.GetRasterBand(1).Checksum()))
-        return 'fail'
-    if ds2.GetRasterBand(1).GetNoDataValue() is not None:
-        print('did not expect nodata value')
-        return 'fail'
+    assert ds.GetRasterBand(1).Checksum() == ds2.GetRasterBand(1).Checksum(), \
+        ('bad checksum : got %d, expected %d' % (ds.GetRasterBand(1).Checksum(), ds2.GetRasterBand(1).Checksum()))
+    assert ds2.GetRasterBand(1).GetNoDataValue() is None, 'did not expect nodata value'
 
     ds = None
     ds2 = None
@@ -121,14 +118,10 @@ def test_gdal_grid_lib_2():
         gdal.SetConfigOption('GDAL_USE_SSE', None)
 
         cs = ds1.GetRasterBand(1).Checksum()
-        if cs != 2:
-            print(cs)
-            return 'fail'
+        assert cs == 2
 
         cs = ds2.GetRasterBand(1).Checksum()
-        if cs != 1064:
-            print(cs)
-            return 'fail'
+        assert cs == 1064
 
     return 'success'
 
diff --git a/autotest/utilities/test_gdal_rasterize.py b/autotest/utilities/test_gdal_rasterize.py
index 5cbceac04a75..828e795c0778 100755
--- a/autotest/utilities/test_gdal_rasterize.py
+++ b/autotest/utilities/test_gdal_rasterize.py
@@ -104,21 +104,14 @@ def test_gdal_rasterize_1():
 
     # Run the algorithm.
     (_, err) = gdaltest.runexternal_out_and_err(test_cli_utilities.get_gdal_rasterize_path() + ' -b 3 -b 2 -b 1 -burn 200 -burn 220 -burn 240 -l rast1 tmp/rast1.tab tmp/rast1.tif')
-    if not (err is None or err == ''):
-        gdaltest.post_reason('got error/warning')
-        print(err)
-        return 'fail'
+    assert (err is None or err == ''), 'got error/warning'
 
     # Check results.
 
     target_ds = gdal.Open('tmp/rast1.tif')
     expected = 6452
     checksum = target_ds.GetRasterBand(2).Checksum()
-    if checksum != expected:
-        print(checksum)
-        gdaltest.post_reason('Did not get expected image checksum')
-
-        return 'fail'
+    assert checksum == expected, 'Did not get expected image checksum'
 
     target_ds = None
 
@@ -150,11 +143,7 @@ def test_gdal_rasterize_2():
     target_ds = gdal.Open('tmp/rast2.tif')
     expected = 121
     checksum = target_ds.GetRasterBand(2).Checksum()
-    if checksum != expected:
-        print(checksum)
-        gdaltest.post_reason('Did not get expected image checksum')
-
-        return 'fail'
+    assert checksum == expected, 'Did not get expected image checksum'
 
     target_ds = None
 
@@ -179,28 +168,19 @@ def test_gdal_rasterize_3():
     ds_ref = gdal.Open('../gdrivers/data/n43.dt0')
     ds = gdal.Open('tmp/n43dt0.tif')
 
-    if ds.GetRasterBand(1).GetNoDataValue() != 0.0:
-        gdaltest.post_reason('did not get expected nodata value')
-        return 'fail'
+    assert ds.GetRasterBand(1).GetNoDataValue() == 0.0, \
+        'did not get expected nodata value'
 
-    if ds.RasterXSize != 121 or ds.RasterYSize != 121:
-        gdaltest.post_reason('did not get expected dimensions')
-        return 'fail'
+    assert ds.RasterXSize == 121 and ds.RasterYSize == 121, \
+        'did not get expected dimensions'
 
     gt_ref = ds_ref.GetGeoTransform()
     gt = ds.GetGeoTransform()
     for i in range(6):
-        if abs(gt[i] - gt_ref[i]) > 1e-6:
-            gdaltest.post_reason('did not get expected geotransform')
-            print(gt)
-            print(gt_ref)
-            return 'fail'
+        assert abs(gt[i] - gt_ref[i]) <= 1e-6, 'did not get expected geotransform'
 
     wkt = ds.GetProjectionRef()
-    if wkt.find("WGS_1984") == -1:
-        gdaltest.post_reason('did not get expected SRS')
-        print(wkt)
-        return 'fail'
+    assert wkt.find("WGS_1984") != -1, 'did not get expected SRS'
 
     return 'success'
 
@@ -223,36 +203,25 @@ def test_gdal_rasterize_4():
     ds_ref = gdal.Open('../gdrivers/data/n43.dt0')
     ds = gdal.Open('tmp/n43dt0.tif')
 
-    if ds.GetRasterBand(1).GetNoDataValue() != 0.0:
-        gdaltest.post_reason('did not get expected nodata value')
-        return 'fail'
+    assert ds.GetRasterBand(1).GetNoDataValue() == 0.0, \
+        'did not get expected nodata value'
 
     # Allow output to grow by 1/2 cell, as per #6058
-    if ds.RasterXSize != 122 or ds.RasterYSize != 122:
-        gdaltest.post_reason('did not get expected dimensions')
-        return 'fail'
+    assert ds.RasterXSize == 122 and ds.RasterYSize == 122, \
+        'did not get expected dimensions'
 
     gt_ref = ds_ref.GetGeoTransform()
     gt = ds.GetGeoTransform()
-    if abs(gt[1] - gt_ref[1]) > 1e-6 or abs(gt[5] - gt_ref[5]) > 1e-6:
-        gdaltest.post_reason('did not get expected geotransform(dx/dy)')
-        print(gt)
-        print(gt_ref)
-        return 'fail'
+    assert abs(gt[1] - gt_ref[1]) <= 1e-6 and abs(gt[5] - gt_ref[5]) <= 1e-6, \
+        'did not get expected geotransform(dx/dy)'
 
     # Allow output to grow by 1/2 cell, as per #6058
-    if abs(gt[0] + (gt[1] / 2) - gt_ref[0]) > 1e-6 or \
-       abs(gt[3] + (gt[5] / 2) - gt_ref[3]) > 1e-6:
-        gdaltest.post_reason('did not get expected geotransform')
-        print(gt)
-        print(gt_ref)
-        return 'fail'
+    assert (abs(gt[0] + (gt[1] / 2) - gt_ref[0]) <= 1e-6 and \
+       abs(gt[3] + (gt[5] / 2) - gt_ref[3]) <= 1e-6), \
+        'did not get expected geotransform'
 
     wkt = ds.GetProjectionRef()
-    if wkt.find("WGS_1984") == -1:
-        gdaltest.post_reason('did not get expected SRS')
-        print(wkt)
-        return 'fail'
+    assert wkt.find("WGS_1984") != -1, 'did not get expected SRS'
 
     return 'success'
 
@@ -288,25 +257,17 @@ def test_gdal_rasterize_5():
     gdaltest.runexternal(test_cli_utilities.get_gdal_rasterize_path() + ' -l test tmp/test_gdal_rasterize_5.vrt tmp/test_gdal_rasterize_5.tif -a Value -tr 1 1 -ot Byte')
 
     ds = gdal.Open('tmp/test_gdal_rasterize_5.tif')
-    if ds.RasterXSize != 3 or ds.RasterYSize != 3:
-        gdaltest.post_reason('did not get expected dimensions')
-        print(ds.RasterXSize)
-        print(ds.RasterYSize)
-        return 'fail'
+    assert ds.RasterXSize == 3 and ds.RasterYSize == 3, \
+        'did not get expected dimensions'
 
     gt_ref = [0, 1, 0, 3, 0, -1]
     gt = ds.GetGeoTransform()
     for i in range(6):
-        if abs(gt[i] - gt_ref[i]) > 1e-6:
-            gdaltest.post_reason('did not get expected geotransform')
-            print(gt)
-            print(gt_ref)
-            return 'fail'
+        assert abs(gt[i] - gt_ref[i]) <= 1e-6, 'did not get expected geotransform'
 
     data = ds.GetRasterBand(1).ReadRaster(0, 0, 3, 3)
-    if data.decode('iso-8859-1') != '\x02\x00\x03\x00\x05\x00\x01\x00\x04':
-        gdaltest.post_reason('did not get expected values')
-        return 'fail'
+    assert data.decode('iso-8859-1') == '\x02\x00\x03\x00\x05\x00\x01\x00\x04', \
+        'did not get expected values'
 
     ds = None
 
@@ -341,10 +302,7 @@ def test_gdal_rasterize_6():
     gdaltest.runexternal(test_cli_utilities.get_gdal_rasterize_path() + ' -l test_gdal_rasterize_6 tmp/test_gdal_rasterize_6.csv tmp/test_gdal_rasterize_6.tif -a Value')
 
     ds = gdal.Open('tmp/test_gdal_rasterize_6.tif')
-    if ds.GetRasterBand(1).Checksum() != 39190:
-        gdaltest.post_reason('did not get expected checksum')
-        print(ds.GetRasterBand(1).Checksum())
-        return 'fail'
+    assert ds.GetRasterBand(1).Checksum() == 39190, 'did not get expected checksum'
 
     ds = None
 
@@ -396,9 +354,7 @@ def test_gdal_rasterize_7():
 
     ds = gdal.Open('tmp/test_gdal_rasterize_7.tif')
     data = ds.GetRasterBand(1).ReadAsArray()
-    if data.sum() <= 5:
-        gdaltest.post_reason('Only rasterized 5 pixels or less.')
-        return 'fail'
+    assert data.sum() > 5, 'Only rasterized 5 pixels or less.'
 
     ds = None
 
@@ -425,10 +381,7 @@ def test_gdal_rasterize_8():
 
     ds = gdal.Open('tmp/test_gdal_rasterize_8.tif')
     cs = ds.GetRasterBand(1).Checksum()
-    if cs != 21:
-        gdaltest.post_reason('Did not rasterize line data properly')
-        print(cs)
-        return 'fail'
+    assert cs == 21, 'Did not rasterize line data properly'
 
     ds = None
 
diff --git a/autotest/utilities/test_gdal_rasterize_lib.py b/autotest/utilities/test_gdal_rasterize_lib.py
index d18bf8718c2a..9b74dee8bea1 100755
--- a/autotest/utilities/test_gdal_rasterize_lib.py
+++ b/autotest/utilities/test_gdal_rasterize_lib.py
@@ -35,6 +35,7 @@
 
 from osgeo import gdal, ogr, osr
 import gdaltest
+import pytest
 
 ###############################################################################
 # Simple polygon rasterization (adapted from alg/rasterize.py).
@@ -89,17 +90,12 @@ def test_gdal_rasterize_lib_1():
     rast_lyr.CreateFeature(feat)
 
     ret = gdal.Rasterize(target_ds, vector_ds, bands=[3, 2, 1], burnValues=[200, 220, 240], layers='rast1')
-    if ret != 1:
-        return 'fail'
+    assert ret == 1
 
     # Check results.
     expected = 6452
     checksum = target_ds.GetRasterBand(2).Checksum()
-    if checksum != expected:
-        print(checksum)
-        gdaltest.post_reason('Did not get expected image checksum')
-
-        return 'fail'
+    assert checksum == expected, 'Did not get expected image checksum'
 
     target_ds = None
 
@@ -119,9 +115,7 @@ def test_gdal_rasterize_lib_3():
 
     with gdaltest.error_handler():
         ds = gdal.Rasterize('/vsimem/bogus.tif', 'tmp/n43dt0.shp')
-    if ds is not None:
-        gdaltest.post_reason('did not expected success')
-        return 'fail'
+    assert ds is None, 'did not expected success'
 
     ds = gdal.Rasterize('', 'tmp/n43dt0.shp', format='MEM', outputType=gdal.GDT_Byte, useZ=True, layers=['n43dt0'], width=121, height=121, noData=0)
 
@@ -129,28 +123,19 @@ def test_gdal_rasterize_lib_3():
 
     ds_ref = gdal.Open('../gdrivers/data/n43.dt0')
 
-    if ds.GetRasterBand(1).GetNoDataValue() != 0.0:
-        gdaltest.post_reason('did not get expected nodata value')
-        return 'fail'
+    assert ds.GetRasterBand(1).GetNoDataValue() == 0.0, \
+        'did not get expected nodata value'
 
-    if ds.RasterXSize != 121 or ds.RasterYSize != 121:
-        gdaltest.post_reason('did not get expected dimensions')
-        return 'fail'
+    assert ds.RasterXSize == 121 and ds.RasterYSize == 121, \
+        'did not get expected dimensions'
 
     gt_ref = ds_ref.GetGeoTransform()
     gt = ds.GetGeoTransform()
     for i in range(6):
-        if abs(gt[i] - gt_ref[i]) > 1e-6:
-            gdaltest.post_reason('did not get expected geotransform')
-            print(gt)
-            print(gt_ref)
-            return 'fail'
+        assert abs(gt[i] - gt_ref[i]) <= 1e-6, 'did not get expected geotransform'
 
     wkt = ds.GetProjectionRef()
-    if wkt.find("WGS_1984") == -1:
-        gdaltest.post_reason('did not get expected SRS')
-        print(wkt)
-        return 'fail'
+    assert wkt.find("WGS_1984") != -1, 'did not get expected SRS'
 
     return 'success'
 
@@ -176,17 +161,12 @@ def test_gdal_rasterize_lib_100():
     rast_lyr.CreateFeature(feat)
 
     ret = gdal.Rasterize(target_ds, vector_ds, burnValues=[255])
-    if ret != 1:
-        return 'fail'
+    assert ret == 1
 
     # Check results.
     expected = 44190
     checksum = target_ds.GetRasterBand(1).Checksum()
-    if checksum != expected:
-        print(checksum)
-        gdaltest.post_reason('Did not get expected image checksum')
-
-        return 'fail'
+    assert checksum == expected, 'Did not get expected image checksum'
 
     target_ds = None
 
@@ -215,16 +195,11 @@ def test_gdal_rasterize_lib_101():
     rast_lyr.CreateFeature(feat)
 
     ret = gdal.Rasterize(target_ds, vector_ds, burnValues=[255])
-    if ret != 1:
-        return 'fail'
+    assert ret == 1
 
     # Check results.
     checksum = target_ds.GetRasterBand(1).Checksum()
-    if checksum != 0:
-        print(checksum)
-        gdaltest.post_reason('Did not get expected image checksum')
-
-        return 'fail'
+    assert checksum == 0, 'Did not get expected image checksum'
 
     target_ds = None
 
@@ -271,31 +246,21 @@ def test_gdal_rasterize_lib_102():
     rast_lyr.CreateFeature(feat)
 
     ret = gdal.Rasterize(target_ds, vector_ds, burnValues=[0])
-    if ret != 1:
-        return 'fail'
+    assert ret == 1
 
     # Check results.
     checksum = target_ds.GetRasterBand(1).Checksum()
-    if checksum != 1604:
-        print(checksum)
-        gdaltest.post_reason('Did not get expected image checksum')
-
-        return 'fail'
+    assert checksum == 1604, 'Did not get expected image checksum'
 
     # Re-try with transformer options
     target_ds.GetRasterBand(1).Fill(255)
     ret = gdal.Rasterize(target_ds, vector_ds, burnValues=[0],
                          transformerOptions=['RPC_HEIGHT=1000'])
-    if ret != 1:
-        return 'fail'
+    assert ret == 1
 
     # Check results.
     checksum = target_ds.GetRasterBand(1).Checksum()
-    if checksum != 2003:
-        print(checksum)
-        gdaltest.post_reason('Did not get expected image checksum')
-
-        return 'fail'
+    assert checksum == 2003, 'Did not get expected image checksum'
     target_ds = None
 
     return 'success'
@@ -353,17 +318,15 @@ def test_gdal_rasterize_lib_4():
         rast_lyr.CreateFeature(feat)
 
         ret = gdal.Rasterize(target_ds, vector_ds, bands=[3, 2, 1], burnValues=[200, 220, 240], layers='rast1', optim=optim)
-        if ret != 1:
-            return 'fail'
+        assert ret == 1
 
         # Check results.
         expected = 6452
         checksum = target_ds.GetRasterBand(2).Checksum()
         if checksum != expected:
             print(checksum, optim)
-            gdaltest.post_reason('Did not get expected image checksum')
 
-            return 'fail'
+            pytest.fail('Did not get expected image checksum')
 
         target_ds = None
 
diff --git a/autotest/utilities/test_gdal_translate.py b/autotest/utilities/test_gdal_translate.py
index ae15054a004f..2bafe750c389 100755
--- a/autotest/utilities/test_gdal_translate.py
+++ b/autotest/utilities/test_gdal_translate.py
@@ -46,18 +46,12 @@ def test_gdal_translate_1():
         return 'skip'
 
     (_, err) = gdaltest.runexternal_out_and_err(test_cli_utilities.get_gdal_translate_path() + ' ../gcore/data/byte.tif tmp/test1.tif')
-    if not (err is None or err == ''):
-        gdaltest.post_reason('got error/warning')
-        print(err)
-        return 'fail'
+    assert (err is None or err == ''), 'got error/warning'
 
     ds = gdal.Open('tmp/test1.tif')
-    if ds is None:
-        return 'fail'
+    assert ds is not None
 
-    if ds.GetRasterBand(1).Checksum() != 4672:
-        gdaltest.post_reason('Bad checksum')
-        return 'fail'
+    assert ds.GetRasterBand(1).Checksum() == 4672, 'Bad checksum'
 
     ds = None
 
@@ -74,12 +68,9 @@ def test_gdal_translate_2():
     gdaltest.runexternal(test_cli_utilities.get_gdal_translate_path() + ' -of GTiff ../gcore/data/byte.tif tmp/test2.tif')
 
     ds = gdal.Open('tmp/test2.tif')
-    if ds is None:
-        return 'fail'
+    assert ds is not None
 
-    if ds.GetRasterBand(1).Checksum() != 4672:
-        gdaltest.post_reason('Bad checksum')
-        return 'fail'
+    assert ds.GetRasterBand(1).Checksum() == 4672, 'Bad checksum'
 
     ds = None
 
@@ -96,16 +87,11 @@ def test_gdal_translate_3():
     gdaltest.runexternal(test_cli_utilities.get_gdal_translate_path() + ' -ot Int16 ../gcore/data/byte.tif tmp/test3.tif')
 
     ds = gdal.Open('tmp/test3.tif')
-    if ds is None:
-        return 'fail'
+    assert ds is not None
 
-    if ds.GetRasterBand(1).DataType != gdal.GDT_Int16:
-        gdaltest.post_reason('Bad data type')
-        return 'fail'
+    assert ds.GetRasterBand(1).DataType == gdal.GDT_Int16, 'Bad data type'
 
-    if ds.GetRasterBand(1).Checksum() != 4672:
-        gdaltest.post_reason('Bad checksum')
-        return 'fail'
+    assert ds.GetRasterBand(1).Checksum() == 4672, 'Bad checksum'
 
     ds = None
 
@@ -122,20 +108,13 @@ def test_gdal_translate_4():
     gdaltest.runexternal(test_cli_utilities.get_gdal_translate_path() + ' -b 3 -b 2 -b 1 ../gcore/data/rgbsmall.tif tmp/test4.tif')
 
     ds = gdal.Open('tmp/test4.tif')
-    if ds is None:
-        return 'fail'
+    assert ds is not None
 
-    if ds.GetRasterBand(1).Checksum() != 21349:
-        gdaltest.post_reason('Bad checksum')
-        return 'fail'
+    assert ds.GetRasterBand(1).Checksum() == 21349, 'Bad checksum'
 
-    if ds.GetRasterBand(2).Checksum() != 21053:
-        gdaltest.post_reason('Bad checksum')
-        return 'fail'
+    assert ds.GetRasterBand(2).Checksum() == 21053, 'Bad checksum'
 
-    if ds.GetRasterBand(3).Checksum() != 21212:
-        gdaltest.post_reason('Bad checksum')
-        return 'fail'
+    assert ds.GetRasterBand(3).Checksum() == 21212, 'Bad checksum'
 
     ds = None
 
@@ -152,32 +131,22 @@ def test_gdal_translate_5():
     gdaltest.runexternal(test_cli_utilities.get_gdal_translate_path() + ' -expand rgb ../gdrivers/data/bug407.gif tmp/test5.tif')
 
     ds = gdal.Open('tmp/test5.tif')
-    if ds is None:
-        return 'fail'
+    assert ds is not None
 
-    if ds.GetRasterBand(1).GetRasterColorInterpretation() != gdal.GCI_RedBand:
-        gdaltest.post_reason('Bad color interpretation')
-        return 'fail'
+    assert ds.GetRasterBand(1).GetRasterColorInterpretation() == gdal.GCI_RedBand, \
+        'Bad color interpretation'
 
-    if ds.GetRasterBand(2).GetRasterColorInterpretation() != gdal.GCI_GreenBand:
-        gdaltest.post_reason('Bad color interpretation')
-        return 'fail'
+    assert ds.GetRasterBand(2).GetRasterColorInterpretation() == gdal.GCI_GreenBand, \
+        'Bad color interpretation'
 
-    if ds.GetRasterBand(3).GetRasterColorInterpretation() != gdal.GCI_BlueBand:
-        gdaltest.post_reason('Bad color interpretation')
-        return 'fail'
+    assert ds.GetRasterBand(3).GetRasterColorInterpretation() == gdal.GCI_BlueBand, \
+        'Bad color interpretation'
 
-    if ds.GetRasterBand(1).Checksum() != 20615:
-        gdaltest.post_reason('Bad checksum')
-        return 'fail'
+    assert ds.GetRasterBand(1).Checksum() == 20615, 'Bad checksum'
 
-    if ds.GetRasterBand(2).Checksum() != 59147:
-        gdaltest.post_reason('Bad checksum')
-        return 'fail'
+    assert ds.GetRasterBand(2).Checksum() == 59147, 'Bad checksum'
 
-    if ds.GetRasterBand(3).Checksum() != 63052:
-        gdaltest.post_reason('Bad checksum')
-        return 'fail'
+    assert ds.GetRasterBand(3).Checksum() == 63052, 'Bad checksum'
 
     ds = None
 
@@ -194,12 +163,9 @@ def test_gdal_translate_6():
     gdaltest.runexternal(test_cli_utilities.get_gdal_translate_path() + ' -outsize 40 40 ../gcore/data/byte.tif tmp/test6.tif')
 
     ds = gdal.Open('tmp/test6.tif')
-    if ds is None:
-        return 'fail'
+    assert ds is not None
 
-    if ds.GetRasterBand(1).Checksum() != 18784:
-        gdaltest.post_reason('Bad checksum')
-        return 'fail'
+    assert ds.GetRasterBand(1).Checksum() == 18784, 'Bad checksum'
 
     ds = None
 
@@ -216,12 +182,9 @@ def test_gdal_translate_7():
     gdaltest.runexternal(test_cli_utilities.get_gdal_translate_path() + ' -outsize 200% 200% ../gcore/data/byte.tif tmp/test7.tif')
 
     ds = gdal.Open('tmp/test7.tif')
-    if ds is None:
-        return 'fail'
+    assert ds is not None
 
-    if ds.GetRasterBand(1).Checksum() != 18784:
-        gdaltest.post_reason('Bad checksum')
-        return 'fail'
+    assert ds.GetRasterBand(1).Checksum() == 18784, 'Bad checksum'
 
     ds = None
 
@@ -238,21 +201,14 @@ def test_gdal_translate_8():
     gdaltest.runexternal(test_cli_utilities.get_gdal_translate_path() + ' -a_srs EPSG:26711 -gcp 0 0  440720.000 3751320.000 -gcp 20 0 441920.000 3751320.000 -gcp 20 20 441920.000 3750120.000 0 -gcp 0 20 440720.000 3750120.000 ../gcore/data/byte.tif tmp/test8.tif')
 
     ds = gdal.Open('tmp/test8.tif')
-    if ds is None:
-        return 'fail'
+    assert ds is not None
 
-    if ds.GetRasterBand(1).Checksum() != 4672:
-        gdaltest.post_reason('Bad checksum')
-        return 'fail'
+    assert ds.GetRasterBand(1).Checksum() == 4672, 'Bad checksum'
 
     gcps = ds.GetGCPs()
-    if len(gcps) != 4:
-        gdaltest.post_reason('GCP count wrong.')
-        return 'fail'
+    assert len(gcps) == 4, 'GCP count wrong.'
 
-    if ds.GetGCPProjection().find('26711') == -1:
-        gdaltest.post_reason('Bad GCP projection.')
-        return 'fail'
+    assert ds.GetGCPProjection().find('26711') != -1, 'Bad GCP projection.'
 
     ds = None
 
@@ -269,12 +225,9 @@ def test_gdal_translate_9():
     gdaltest.runexternal(test_cli_utilities.get_gdal_translate_path() + ' -a_nodata 1 ../gcore/data/byte.tif tmp/test9.tif')
 
     ds = gdal.Open('tmp/test9.tif')
-    if ds is None:
-        return 'fail'
+    assert ds is not None
 
-    if ds.GetRasterBand(1).GetNoDataValue() != 1:
-        gdaltest.post_reason('Bad nodata value')
-        return 'fail'
+    assert ds.GetRasterBand(1).GetNoDataValue() == 1, 'Bad nodata value'
 
     ds = None
 
@@ -291,12 +244,9 @@ def test_gdal_translate_10():
     gdaltest.runexternal(test_cli_utilities.get_gdal_translate_path() + ' -srcwin 0 0 1 1 ../gcore/data/byte.tif tmp/test10.tif')
 
     ds = gdal.Open('tmp/test10.tif')
-    if ds is None:
-        return 'fail'
+    assert ds is not None
 
-    if ds.GetRasterBand(1).Checksum() != 2:
-        gdaltest.post_reason('Bad checksum')
-        return 'fail'
+    assert ds.GetRasterBand(1).Checksum() == 2, 'Bad checksum'
 
     ds = None
 
@@ -313,16 +263,12 @@ def test_gdal_translate_11():
     gdaltest.runexternal(test_cli_utilities.get_gdal_translate_path() + ' -projwin 440720.000 3751320.000 441920.000 3750120.000 ../gcore/data/byte.tif tmp/test11.tif')
 
     ds = gdal.Open('tmp/test11.tif')
-    if ds is None:
-        return 'fail'
+    assert ds is not None
 
-    if ds.GetRasterBand(1).Checksum() != 4672:
-        gdaltest.post_reason('Bad checksum')
-        return 'fail'
+    assert ds.GetRasterBand(1).Checksum() == 4672, 'Bad checksum'
 
-    if not gdaltest.geotransform_equals(gdal.Open('../gcore/data/byte.tif').GetGeoTransform(), ds.GetGeoTransform(), 1e-9):
-        gdaltest.post_reason('Bad geotransform')
-        return 'fail'
+    assert gdaltest.geotransform_equals(gdal.Open('../gcore/data/byte.tif').GetGeoTransform(), ds.GetGeoTransform(), 1e-9), \
+        'Bad geotransform'
 
     ds = None
 
@@ -339,16 +285,12 @@ def test_gdal_translate_12():
     gdaltest.runexternal(test_cli_utilities.get_gdal_translate_path() + ' -a_ullr 440720.000 3751320.000 441920.000 3750120.000 ../gcore/data/byte.tif tmp/test12.tif')
 
     ds = gdal.Open('tmp/test12.tif')
-    if ds is None:
-        return 'fail'
+    assert ds is not None
 
-    if ds.GetRasterBand(1).Checksum() != 4672:
-        gdaltest.post_reason('Bad checksum')
-        return 'fail'
+    assert ds.GetRasterBand(1).Checksum() == 4672, 'Bad checksum'
 
-    if not gdaltest.geotransform_equals(gdal.Open('../gcore/data/byte.tif').GetGeoTransform(), ds.GetGeoTransform(), 1e-9):
-        gdaltest.post_reason('Bad geotransform')
-        return 'fail'
+    assert gdaltest.geotransform_equals(gdal.Open('../gcore/data/byte.tif').GetGeoTransform(), ds.GetGeoTransform(), 1e-9), \
+        'Bad geotransform'
 
     ds = None
 
@@ -365,13 +307,10 @@ def test_gdal_translate_13():
     gdaltest.runexternal(test_cli_utilities.get_gdal_translate_path() + ' -mo TIFFTAG_DOCUMENTNAME=test13 ../gcore/data/byte.tif tmp/test13.tif')
 
     ds = gdal.Open('tmp/test13.tif')
-    if ds is None:
-        return 'fail'
+    assert ds is not None
 
     md = ds.GetMetadata()
-    if 'TIFFTAG_DOCUMENTNAME' not in md:
-        gdaltest.post_reason('Did not get TIFFTAG_DOCUMENTNAME')
-        return 'fail'
+    assert 'TIFFTAG_DOCUMENTNAME' in md, 'Did not get TIFFTAG_DOCUMENTNAME'
 
     ds = None
 
@@ -388,13 +327,10 @@ def test_gdal_translate_14():
     gdaltest.runexternal(test_cli_utilities.get_gdal_translate_path() + ' -co COMPRESS=LZW ../gcore/data/byte.tif tmp/test14.tif')
 
     ds = gdal.Open('tmp/test14.tif')
-    if ds is None:
-        return 'fail'
+    assert ds is not None
 
     md = ds.GetMetadata('IMAGE_STRUCTURE')
-    if 'COMPRESSION' not in md or md['COMPRESSION'] != 'LZW':
-        gdaltest.post_reason('Did not get COMPRESSION')
-        return 'fail'
+    assert 'COMPRESSION' in md and md['COMPRESSION'] == 'LZW', 'Did not get COMPRESSION'
 
     ds = None
 
@@ -411,8 +347,7 @@ def test_gdal_translate_15():
     gdaltest.runexternal(test_cli_utilities.get_gdal_translate_path() + ' -sds ../gdrivers/data/A.TOC tmp/test15.tif')
 
     ds = gdal.Open('tmp/test15_1.tif')
-    if ds is None:
-        return 'fail'
+    assert ds is not None
 
     ds = None
 
@@ -429,12 +364,9 @@ def test_gdal_translate_16():
     gdaltest.runexternal(test_cli_utilities.get_gdal_translate_path() + ' -of VRT ../gcore/data/byte.tif tmp/test16.vrt')
 
     ds = gdal.Open('tmp/test16.vrt')
-    if ds is None:
-        return 'fail'
+    assert ds is not None
 
-    if ds.GetRasterBand(1).Checksum() != 4672:
-        gdaltest.post_reason('Bad checksum')
-        return 'fail'
+    assert ds.GetRasterBand(1).Checksum() == 4672, 'Bad checksum'
 
     ds = None
 
@@ -451,41 +383,27 @@ def test_gdal_translate_17():
     gdaltest.runexternal(test_cli_utilities.get_gdal_translate_path() + ' -of VRT -expand rgba ../gdrivers/data/bug407.gif tmp/test17.vrt')
 
     ds = gdal.Open('tmp/test17.vrt')
-    if ds is None:
-        return 'fail'
+    assert ds is not None
 
-    if ds.GetRasterBand(1).GetRasterColorInterpretation() != gdal.GCI_RedBand:
-        gdaltest.post_reason('Bad color interpretation')
-        return 'fail'
+    assert ds.GetRasterBand(1).GetRasterColorInterpretation() == gdal.GCI_RedBand, \
+        'Bad color interpretation'
 
-    if ds.GetRasterBand(2).GetRasterColorInterpretation() != gdal.GCI_GreenBand:
-        gdaltest.post_reason('Bad color interpretation')
-        return 'fail'
+    assert ds.GetRasterBand(2).GetRasterColorInterpretation() == gdal.GCI_GreenBand, \
+        'Bad color interpretation'
 
-    if ds.GetRasterBand(3).GetRasterColorInterpretation() != gdal.GCI_BlueBand:
-        gdaltest.post_reason('Bad color interpretation')
-        return 'fail'
+    assert ds.GetRasterBand(3).GetRasterColorInterpretation() == gdal.GCI_BlueBand, \
+        'Bad color interpretation'
 
-    if ds.GetRasterBand(4).GetRasterColorInterpretation() != gdal.GCI_AlphaBand:
-        gdaltest.post_reason('Bad color interpretation')
-        return 'fail'
+    assert ds.GetRasterBand(4).GetRasterColorInterpretation() == gdal.GCI_AlphaBand, \
+        'Bad color interpretation'
 
-    if ds.GetRasterBand(1).Checksum() != 20615:
-        gdaltest.post_reason('Bad checksum')
-        return 'fail'
+    assert ds.GetRasterBand(1).Checksum() == 20615, 'Bad checksum'
 
-    if ds.GetRasterBand(2).Checksum() != 59147:
-        gdaltest.post_reason('Bad checksum')
-        return 'fail'
+    assert ds.GetRasterBand(2).Checksum() == 59147, 'Bad checksum'
 
-    if ds.GetRasterBand(3).Checksum() != 63052:
-        gdaltest.post_reason('Bad checksum')
-        return 'fail'
+    assert ds.GetRasterBand(3).Checksum() == 63052, 'Bad checksum'
 
-    if ds.GetRasterBand(4).Checksum() != 63052:
-        print(ds.GetRasterBand(3).Checksum())
-        gdaltest.post_reason('Bad checksum')
-        return 'fail'
+    assert ds.GetRasterBand(4).Checksum() == 63052, 'Bad checksum'
 
     ds = None
 
@@ -504,16 +422,12 @@ def test_gdal_translate_18():
     (_, ret_stderr) = gdaltest.runexternal_out_and_err(test_cli_utilities.get_gdal_translate_path() + ' tmp/test18_2.vrt tmp/test18_2.tif')
 
     # Check that all datasets are closed
-    if ret_stderr.find('Open GDAL Datasets') != -1:
-        return 'fail'
+    assert ret_stderr.find('Open GDAL Datasets') == -1
 
     ds = gdal.Open('tmp/test18_2.tif')
-    if ds is None:
-        return 'fail'
+    assert ds is not None
 
-    if ds.GetRasterBand(1).Checksum() != 4672:
-        gdaltest.post_reason('Bad checksum')
-        return 'fail'
+    assert ds.GetRasterBand(1).Checksum() == 4672, 'Bad checksum'
 
     ds = None
 
@@ -538,21 +452,12 @@ def test_gdal_translate_19():
     gdaltest.runexternal(test_cli_utilities.get_gdal_translate_path() + ' -expand rgba tmp/test_gdal_translate_19_src.tif tmp/test_gdal_translate_19_dst.tif')
 
     ds = gdal.Open('tmp/test_gdal_translate_19_dst.tif')
-    if ds is None:
-        return 'fail'
+    assert ds is not None
 
-    if ds.GetRasterBand(1).Checksum() != 1:
-        gdaltest.post_reason('Bad checksum for band 1')
-        return 'fail'
-    if ds.GetRasterBand(2).Checksum() != 2:
-        gdaltest.post_reason('Bad checksum for band 2')
-        return 'fail'
-    if ds.GetRasterBand(3).Checksum() != 3:
-        gdaltest.post_reason('Bad checksum for band 3')
-        return 'fail'
-    if ds.GetRasterBand(4).Checksum() != 250 % 7:
-        gdaltest.post_reason('Bad checksum for band 4')
-        return 'fail'
+    assert ds.GetRasterBand(1).Checksum() == 1, 'Bad checksum for band 1'
+    assert ds.GetRasterBand(2).Checksum() == 2, 'Bad checksum for band 2'
+    assert ds.GetRasterBand(3).Checksum() == 3, 'Bad checksum for band 3'
+    assert ds.GetRasterBand(4).Checksum() == 250 % 7, 'Bad checksum for band 4'
 
     ds = None
 
@@ -570,13 +475,10 @@ def test_gdal_translate_20():
     gdaltest.runexternal(test_cli_utilities.get_gdal_translate_path() + ' -a_nodata None tmp/test_gdal_translate_20_src.tif tmp/test_gdal_translate_20_dst.tif')
 
     ds = gdal.Open('tmp/test_gdal_translate_20_dst.tif')
-    if ds is None:
-        return 'fail'
+    assert ds is not None
 
     nodata = ds.GetRasterBand(1).GetNoDataValue()
-    if nodata is not None:
-        print(nodata)
-        return 'fail'
+    assert nodata is None
 
     ds = None
 
@@ -597,14 +499,10 @@ def test_gdal_translate_21():
     md = ds.GetRasterBand(1).GetMetadata()
     ds = None
 
-    if md['STATISTICS_MINIMUM'] != '8':
-        gdaltest.post_reason('STATISTICS_MINIMUM is wrong.')
-        print(md['STATISTICS_MINIMUM'])
-        return 'fail'
+    assert md['STATISTICS_MINIMUM'] == '8', 'STATISTICS_MINIMUM is wrong.'
 
-    if md['STATISTICS_HISTOBINVALUES'] != '0|0|0|0|0|0|0|0|8|0|0|0|0|0|0|0|23|0|0|0|0|0|0|0|0|29|0|0|0|0|0|0|0|46|0|0|0|0|0|0|0|69|0|0|0|0|0|0|0|99|0|0|0|0|0|0|0|0|120|0|0|0|0|0|0|0|178|0|0|0|0|0|0|0|193|0|0|0|0|0|0|0|212|0|0|0|0|0|0|0|281|0|0|0|0|0|0|0|0|365|0|0|0|0|0|0|0|460|0|0|0|0|0|0|0|533|0|0|0|0|0|0|0|544|0|0|0|0|0|0|0|0|626|0|0|0|0|0|0|0|653|0|0|0|0|0|0|0|673|0|0|0|0|0|0|0|629|0|0|0|0|0|0|0|0|586|0|0|0|0|0|0|0|541|0|0|0|0|0|0|0|435|0|0|0|0|0|0|0|348|0|0|0|0|0|0|0|341|0|0|0|0|0|0|0|0|284|0|0|0|0|0|0|0|225|0|0|0|0|0|0|0|237|0|0|0|0|0|0|0|172|0|0|0|0|0|0|0|0|159|0|0|0|0|0|0|0|105|0|0|0|0|0|0|0|824|':
-        gdaltest.post_reason('STATISTICS_HISTOBINVALUES is wrong.')
-        return 'fail'
+    assert md['STATISTICS_HISTOBINVALUES'] == '0|0|0|0|0|0|0|0|8|0|0|0|0|0|0|0|23|0|0|0|0|0|0|0|0|29|0|0|0|0|0|0|0|46|0|0|0|0|0|0|0|69|0|0|0|0|0|0|0|99|0|0|0|0|0|0|0|0|120|0|0|0|0|0|0|0|178|0|0|0|0|0|0|0|193|0|0|0|0|0|0|0|212|0|0|0|0|0|0|0|281|0|0|0|0|0|0|0|0|365|0|0|0|0|0|0|0|460|0|0|0|0|0|0|0|533|0|0|0|0|0|0|0|544|0|0|0|0|0|0|0|0|626|0|0|0|0|0|0|0|653|0|0|0|0|0|0|0|673|0|0|0|0|0|0|0|629|0|0|0|0|0|0|0|0|586|0|0|0|0|0|0|0|541|0|0|0|0|0|0|0|435|0|0|0|0|0|0|0|348|0|0|0|0|0|0|0|341|0|0|0|0|0|0|0|0|284|0|0|0|0|0|0|0|225|0|0|0|0|0|0|0|237|0|0|0|0|0|0|0|172|0|0|0|0|0|0|0|0|159|0|0|0|0|0|0|0|105|0|0|0|0|0|0|0|824|', \
+        'STATISTICS_HISTOBINVALUES is wrong.'
 
     return 'success'
 
@@ -623,13 +521,11 @@ def test_gdal_translate_22():
     md = ds.GetRasterBand(1).GetMetadata()
     ds = None
 
-    if 'STATISTICS_MINIMUM' in md:
-        gdaltest.post_reason('did not expected a STATISTICS_MINIMUM value.')
-        return 'fail'
+    assert 'STATISTICS_MINIMUM' not in md, \
+        'did not expected a STATISTICS_MINIMUM value.'
 
-    if 'STATISTICS_HISTOBINVALUES' in md:
-        gdaltest.post_reason( 'did not expected a STATISTICS_HISTOBINVALUES value.' )
-        return 'fail'
+    assert 'STATISTICS_HISTOBINVALUES' not in md, \
+        'did not expected a STATISTICS_HISTOBINVALUES value.'
 
     return 'success'
 
@@ -647,10 +543,7 @@ def test_gdal_translate_23():
     md = ds.GetRasterBand(1).GetMetadata()
     ds = None
 
-    if md['STATISTICS_MINIMUM'] != '74':
-        gdaltest.post_reason('STATISTICS_MINIMUM is wrong.')
-        print(md['STATISTICS_MINIMUM'])
-        return 'fail'
+    assert md['STATISTICS_MINIMUM'] == '74', 'STATISTICS_MINIMUM is wrong.'
 
     try:
         os.stat('tmp/test_gdal_translate_23.tif.aux.xml')
@@ -674,14 +567,10 @@ def test_gdal_translate_24():
     gdaltest.runexternal(test_cli_utilities.get_gdal_translate_path() + ' -q -srcwin -10 -10 40 40 ../gcore/data/byte.tif tmp/test_gdal_translate_24.tif')
 
     ds = gdal.Open('tmp/test_gdal_translate_24.tif')
-    if ds is None:
-        return 'fail'
+    assert ds is not None
 
     cs = ds.GetRasterBand(1).Checksum()
-    if cs != 4620:
-        gdaltest.post_reason('Bad checksum')
-        print(cs)
-        return 'fail'
+    assert cs == 4620, 'Bad checksum'
 
     ds = None
 
@@ -698,9 +587,7 @@ def test_gdal_translate_25():
     gdaltest.runexternal(test_cli_utilities.get_gdal_translate_path() + ' -q ../gdrivers/data/int.img tmp/test_gdal_translate_25.tif -norat')
 
     ds = gdal.Open('tmp/test_gdal_translate_25.tif')
-    if ds.GetRasterBand(1).GetDefaultRAT() is not None:
-        gdaltest.post_reason('RAT unexpected')
-        return 'fail'
+    assert ds.GetRasterBand(1).GetDefaultRAT() is None, 'RAT unexpected'
 
     ds = None
 
@@ -724,12 +611,8 @@ def test_gdal_translate_26():
     gdaltest.runexternal(test_cli_utilities.get_gdal_translate_path() + ' -a_nodata -999 -stats tmp/test_gdal_translate_26.xyz tmp/test_gdal_translate_26.tif')
 
     ds = gdal.Open('tmp/test_gdal_translate_26.tif')
-    if ds.GetRasterBand(1).GetMinimum() != 10:
-        print(ds.GetRasterBand(1).GetMinimum())
-        return 'fail'
-    if ds.GetRasterBand(1).GetNoDataValue() != -999:
-        print(ds.GetRasterBand(1).GetNoDataValue())
-        return 'fail'
+    assert ds.GetRasterBand(1).GetMinimum() == 10
+    assert ds.GetRasterBand(1).GetNoDataValue() == -999
 
     ds = None
 
@@ -761,24 +644,21 @@ def test_gdal_translate_27():
     gdaltest.runexternal(test_cli_utilities.get_gdal_translate_path() + ' tmp/test_gdal_translate_27.asc tmp/test_gdal_translate_27.tif -ot UInt16')
 
     ds = gdal.Open('tmp/test_gdal_translate_27.tif')
-    if ds.GetRasterBand(1).GetMetadataItem('STATISTICS_MINIMUM') is None:
-        return 'fail'
+    assert ds.GetRasterBand(1).GetMetadataItem('STATISTICS_MINIMUM') is not None
     ds = None
 
     # Translate to an output type that accepts 256 as maximum
     gdaltest.runexternal(test_cli_utilities.get_gdal_translate_path() + ' tmp/test_gdal_translate_27.asc tmp/test_gdal_translate_27.tif -ot Float64')
 
     ds = gdal.Open('tmp/test_gdal_translate_27.tif')
-    if ds.GetRasterBand(1).GetMetadataItem('STATISTICS_MINIMUM') is None:
-        return 'fail'
+    assert ds.GetRasterBand(1).GetMetadataItem('STATISTICS_MINIMUM') is not None
     ds = None
 
     # Translate to an output type that doesn't accept 256 as maximum
     gdaltest.runexternal(test_cli_utilities.get_gdal_translate_path() + ' tmp/test_gdal_translate_27.asc tmp/test_gdal_translate_27.tif -ot Byte')
 
     ds = gdal.Open('tmp/test_gdal_translate_27.tif')
-    if ds.GetRasterBand(1).GetMetadataItem('STATISTICS_MINIMUM') is not None:
-        return 'fail'
+    assert ds.GetRasterBand(1).GetMetadataItem('STATISTICS_MINIMUM') is None
     ds = None
 
     return 'success'
@@ -794,8 +674,7 @@ def test_gdal_translate_28():
     gdaltest.runexternal(test_cli_utilities.get_gdal_translate_path() + ' ../gdrivers/data/float64.asc tmp/test_gdal_translate_28.tif -oo datatype=float64')
 
     ds = gdal.Open('tmp/test_gdal_translate_28.tif')
-    if ds.GetRasterBand(1).DataType != gdal.GDT_Float64:
-        return 'fail'
+    assert ds.GetRasterBand(1).DataType == gdal.GDT_Float64
     ds = None
 
     return 'success'
@@ -809,43 +688,26 @@ def test_gdal_translate_29():
         return 'skip'
 
     (_, err) = gdaltest.runexternal_out_and_err(test_cli_utilities.get_gdal_translate_path() + ' ../gcore/data/byte.tif tmp/test_gdal_translate_29.tif -outsize 50% 50% -r cubic')
-    if not (err is None or err == ''):
-        gdaltest.post_reason('got error/warning')
-        print(err)
-        return 'fail'
+    assert (err is None or err == ''), 'got error/warning'
 
     ds = gdal.Open('tmp/test_gdal_translate_29.tif')
-    if ds is None:
-        return 'fail'
+    assert ds is not None
 
     cs = ds.GetRasterBand(1).Checksum()
-    if cs != 1059:
-        gdaltest.post_reason('Bad checksum')
-        print(cs)
-        return 'fail'
+    assert cs == 1059, 'Bad checksum'
 
     ds = None
 
     (_, err) = gdaltest.runexternal_out_and_err(test_cli_utilities.get_gdal_translate_path() + ' ../gcore/data/byte.tif tmp/test_gdal_translate_29.vrt -outsize 50% 50% -r cubic -of VRT')
-    if not (err is None or err == ''):
-        gdaltest.post_reason('got error/warning')
-        print(err)
-        return 'fail'
+    assert (err is None or err == ''), 'got error/warning'
     (_, err) = gdaltest.runexternal_out_and_err(test_cli_utilities.get_gdal_translate_path() + ' tmp/test_gdal_translate_29.vrt tmp/test_gdal_translate_29.tif')
-    if not (err is None or err == ''):
-        gdaltest.post_reason('got error/warning')
-        print(err)
-        return 'fail'
+    assert (err is None or err == ''), 'got error/warning'
 
     ds = gdal.Open('tmp/test_gdal_translate_29.tif')
-    if ds is None:
-        return 'fail'
+    assert ds is not None
 
     cs = ds.GetRasterBand(1).Checksum()
-    if cs != 1059:
-        gdaltest.post_reason('Bad checksum')
-        print(cs)
-        return 'fail'
+    assert cs == 1059, 'Bad checksum'
 
     ds = None
 
@@ -862,14 +724,10 @@ def test_gdal_translate_30():
     gdaltest.runexternal(test_cli_utilities.get_gdal_translate_path() + ' -tr 30 30 ../gcore/data/byte.tif tmp/test_gdal_translate_30.tif')
 
     ds = gdal.Open('tmp/test_gdal_translate_30.tif')
-    if ds is None:
-        return 'fail'
+    assert ds is not None
 
     cs = ds.GetRasterBand(1).Checksum()
-    if cs != 18784:
-        print(cs)
-        gdaltest.post_reason('Bad checksum')
-        return 'fail'
+    assert cs == 18784, 'Bad checksum'
 
     ds = None
 
@@ -886,16 +744,12 @@ def test_gdal_translate_31():
     gdaltest.runexternal(test_cli_utilities.get_gdal_translate_path() + ' -projwin_srs EPSG:4267 -projwin -117.641168620797 33.9023526904262 -117.628110837847 33.8915970129613 ../gcore/data/byte.tif tmp/test_gdal_translate_31.tif')
 
     ds = gdal.Open('tmp/test_gdal_translate_31.tif')
-    if ds is None:
-        return 'fail'
+    assert ds is not None
 
-    if ds.GetRasterBand(1).Checksum() != 4672:
-        gdaltest.post_reason('Bad checksum')
-        return 'fail'
+    assert ds.GetRasterBand(1).Checksum() == 4672, 'Bad checksum'
 
-    if not gdaltest.geotransform_equals(gdal.Open('../gcore/data/byte.tif').GetGeoTransform(), ds.GetGeoTransform(), 1e-6):
-        gdaltest.post_reason('Bad geotransform')
-        return 'fail'
+    assert gdaltest.geotransform_equals(gdal.Open('../gcore/data/byte.tif').GetGeoTransform(), ds.GetGeoTransform(), 1e-6), \
+        'Bad geotransform'
 
     ds = None
 
@@ -912,22 +766,18 @@ def test_gdal_translate_32():
     gdaltest.runexternal(test_cli_utilities.get_gdal_translate_path() + ' ../gcore/data/byte_rpc.tif tmp/test_gdal_translate_32.tif -srcwin 1 2 13 14 -outsize 150% 300%')
     ds = gdal.Open('tmp/test_gdal_translate_32.tif')
     md = ds.GetMetadata('RPC')
-    if abs(float(md['LINE_OFF']) - 47496) > 1e-5 or \
-       abs(float(md['LINE_SCALE']) - 47502) > 1e-5 or \
-       abs(float(md['SAMP_OFF']) - 19676.6923076923) > 1e-5 or \
-       abs(float(md['SAMP_SCALE']) - 19678.1538461538) > 1e-5:
-        print(md)
-        return 'fail'
+    assert (abs(float(md['LINE_OFF']) - 47496) <= 1e-5 and \
+       abs(float(md['LINE_SCALE']) - 47502) <= 1e-5 and \
+       abs(float(md['SAMP_OFF']) - 19676.6923076923) <= 1e-5 and \
+       abs(float(md['SAMP_SCALE']) - 19678.1538461538) <= 1e-5)
 
     gdaltest.runexternal_out_and_err(test_cli_utilities.get_gdal_translate_path() + ' ../gcore/data/byte_rpc.tif tmp/test_gdal_translate_32.tif -srcwin -10 -5 20 20')
     ds = gdal.Open('tmp/test_gdal_translate_32.tif')
     md = ds.GetMetadata('RPC')
-    if abs(float(md['LINE_OFF']) - (15834 - -5)) > 1e-5 or \
-       abs(float(md['LINE_SCALE']) - 15834) > 1e-5 or \
-       abs(float(md['SAMP_OFF']) - (13464 - -10)) > 1e-5 or \
-       abs(float(md['SAMP_SCALE']) - 13464) > 1e-5:
-        print(md)
-        return 'fail'
+    assert (abs(float(md['LINE_OFF']) - (15834 - -5)) <= 1e-5 and \
+       abs(float(md['LINE_SCALE']) - 15834) <= 1e-5 and \
+       abs(float(md['SAMP_OFF']) - (13464 - -10)) <= 1e-5 and \
+       abs(float(md['SAMP_SCALE']) - 13464) <= 1e-5)
 
     return 'success'
 
@@ -942,24 +792,19 @@ def test_gdal_translate_33():
     gdaltest.runexternal(test_cli_utilities.get_gdal_translate_path() + ' -outsize 100 0 ../gdrivers/data/small_world.tif tmp/test_gdal_translate_33.tif')
 
     ds = gdal.Open('tmp/test_gdal_translate_33.tif')
-    if ds.RasterYSize != 50:
-        print(ds.RasterYSize)
-        return 'fail'
+    assert ds.RasterYSize == 50
     ds = None
 
     gdaltest.runexternal(test_cli_utilities.get_gdal_translate_path() + ' -outsize 0 100 ../gdrivers/data/small_world.tif tmp/test_gdal_translate_33.tif')
 
     ds = gdal.Open('tmp/test_gdal_translate_33.tif')
-    if ds.RasterXSize != 200:
-        print(ds.RasterYSize)
-        return 'fail'
+    assert ds.RasterXSize == 200, ds.RasterYSize
     ds = None
 
     os.unlink('tmp/test_gdal_translate_33.tif')
 
     (_, err) = gdaltest.runexternal_out_and_err(test_cli_utilities.get_gdal_translate_path() + ' -outsize 0 0 ../gdrivers/data/small_world.tif tmp/test_gdal_translate_33.tif')
-    if err.find('-outsize 0 0 invalid') < 0:
-        return 'fail'
+    assert err.find('-outsize 0 0 invalid') >= 0
 
     return 'success'
 
@@ -974,8 +819,7 @@ def test_gdal_translate_34():
     gdaltest.runexternal(test_cli_utilities.get_gdal_translate_path() + ' ../gcore/data/oddsize1bit.tif tmp/test_gdal_translate_34.vrt -of VRT -mo FOO=BAR')
 
     ds = gdal.Open('tmp/test_gdal_translate_34.vrt')
-    if ds.GetRasterBand(1).GetMetadataItem('NBITS', 'IMAGE_STRUCTURE') != '1':
-        return 'fail'
+    assert ds.GetRasterBand(1).GetMetadataItem('NBITS', 'IMAGE_STRUCTURE') == '1'
     ds = None
 
     os.unlink('tmp/test_gdal_translate_34.vrt')
@@ -991,24 +835,16 @@ def test_gdal_translate_35():
         return 'skip'
 
     (_, err) = gdaltest.runexternal_out_and_err(test_cli_utilities.get_gdal_translate_path())
-    if err.find('No source dataset specified') < 0:
-        print(err)
-        return 'fail'
+    assert err.find('No source dataset specified') >= 0
 
     (_, err) = gdaltest.runexternal_out_and_err(test_cli_utilities.get_gdal_translate_path() + ' ../gcore/data/byte.tif')
-    if err.find('No target dataset specified') < 0:
-        print(err)
-        return 'fail'
+    assert err.find('No target dataset specified') >= 0
 
     (_, err) = gdaltest.runexternal_out_and_err(test_cli_utilities.get_gdal_translate_path() + ' /non_existing_path/non_existing.tif /vsimem/out.tif')
-    if err.find('does not exist in the file system') < 0 and err.find('No such file or directory') < 0:
-        print(err)
-        return 'fail'
+    assert err.find('does not exist in the file system') >= 0 or err.find('No such file or directory') >= 0
 
     (_, err) = gdaltest.runexternal_out_and_err(test_cli_utilities.get_gdal_translate_path() + ' ../gcore/data/byte.tif /non_existing_path/non_existing.tif')
-    if err.find('Attempt to create new tiff file') < 0:
-        print(err)
-        return 'fail'
+    assert err.find('Attempt to create new tiff file') >= 0
 
     return 'success'
 
@@ -1022,21 +858,14 @@ def test_gdal_translate_36():
     gdaltest.runexternal(test_cli_utilities.get_gdal_translate_path() + ' -of gtiff data/onepixelcontinuous.img tmp/test_gdal_translate_36.tif')
 
     ds = gdal.Open('tmp/test_gdal_translate_36.tif')
-    if ds is None:
-        return 'fail'
+    assert ds is not None
 
     rat = ds.GetRasterBand(1).GetDefaultRAT()
-    if not rat:
-        gdaltest.post_reason('Did not get RAT')
-        return 'fail'
+    assert rat, 'Did not get RAT'
 
-    if not rat.GetRowCount() == 256:
-        gdaltest.post_reason('RAT has incorrect row count')
-        return 'fail'
+    assert rat.GetRowCount() == 256, 'RAT has incorrect row count'
 
-    if rat.GetTableType() != 1:
-        gdaltest.post_reason('RAT not athematic')
-        return 'fail'
+    assert rat.GetTableType() == 1, 'RAT not athematic'
     rat = None
     ds = None
 
@@ -1052,21 +881,14 @@ def test_gdal_translate_37():
     gdaltest.runexternal(test_cli_utilities.get_gdal_translate_path() + ' -q -of gtiff data/onepixelthematic.img tmp/test_gdal_translate_37.tif')
 
     ds = gdal.Open('tmp/test_gdal_translate_37.tif')
-    if ds is None:
-        return 'fail'
+    assert ds is not None
 
     rat = ds.GetRasterBand(1).GetDefaultRAT()
-    if not rat:
-        gdaltest.post_reason('Did not get RAT')
-        return 'fail'
+    assert rat, 'Did not get RAT'
 
-    if not rat.GetRowCount() == 256:
-        gdaltest.post_reason('RAT has incorrect row count')
-        return 'fail'
+    assert rat.GetRowCount() == 256, 'RAT has incorrect row count'
 
-    if rat.GetTableType() != 0:
-        gdaltest.post_reason('RAT not thematic')
-        return 'fail'
+    assert rat.GetTableType() == 0, 'RAT not thematic'
     rat = None
     ds = None
 
@@ -1081,21 +903,14 @@ def test_gdal_translate_38():
     gdaltest.runexternal(test_cli_utilities.get_gdal_translate_path() + ' -q -of hfa tmp/test_gdal_translate_37.tif tmp/test_gdal_translate_38.img')
 
     ds = gdal.Open('tmp/test_gdal_translate_38.img')
-    if ds is None:
-        return 'fail'
+    assert ds is not None
 
     rat = ds.GetRasterBand(1).GetDefaultRAT()
-    if not rat:
-        gdaltest.post_reason('Did not get RAT')
-        return 'fail'
+    assert rat, 'Did not get RAT'
 
-    if not rat.GetRowCount() == 256:
-        gdaltest.post_reason('RAT has incorrect row count')
-        return 'fail'
+    assert rat.GetRowCount() == 256, 'RAT has incorrect row count'
 
-    if rat.GetTableType() != 0:
-        gdaltest.post_reason('RAT not thematic')
-        return 'fail'
+    assert rat.GetTableType() == 0, 'RAT not thematic'
     rat = None
     ds = None
 
diff --git a/autotest/utilities/test_gdal_translate_lib.py b/autotest/utilities/test_gdal_translate_lib.py
index b8d6ef75ffc0..5741d35c433c 100755
--- a/autotest/utilities/test_gdal_translate_lib.py
+++ b/autotest/utilities/test_gdal_translate_lib.py
@@ -45,23 +45,16 @@ def test_gdal_translate_lib_1():
     ds = gdal.Open('../gcore/data/byte.tif')
 
     ds = gdal.Translate('tmp/test1.tif', ds)
-    if ds is None:
-        gdaltest.post_reason('got error/warning')
-        return 'fail'
+    assert ds is not None, 'got error/warning'
 
-    if ds.GetRasterBand(1).Checksum() != 4672:
-        gdaltest.post_reason('Bad checksum')
-        return 'fail'
+    assert ds.GetRasterBand(1).Checksum() == 4672, 'Bad checksum'
 
     ds = None
 
     ds = gdal.Open('tmp/test1.tif')
-    if ds is None:
-        return 'fail'
+    assert ds is not None
 
-    if ds.GetRasterBand(1).Checksum() != 4672:
-        gdaltest.post_reason('Bad checksum')
-        return 'fail'
+    assert ds.GetRasterBand(1).Checksum() == 4672, 'Bad checksum'
 
     ds = None
 
@@ -82,16 +75,11 @@ def test_gdal_translate_lib_2():
     src_ds = gdal.Open('../gcore/data/byte.tif')
     tab = [0]
     ds = gdal.Translate('tmp/test2.tif', src_ds, format='GTiff', callback=mycallback, callback_data=tab)
-    if ds is None:
-        return 'fail'
+    assert ds is not None
 
-    if ds.GetRasterBand(1).Checksum() != 4672:
-        gdaltest.post_reason('Bad checksum')
-        return 'fail'
+    assert ds.GetRasterBand(1).Checksum() == 4672, 'Bad checksum'
 
-    if tab[0] != 1.0:
-        gdaltest.post_reason('Bad percentage')
-        return 'fail'
+    assert tab[0] == 1.0, 'Bad percentage'
 
     ds = None
 
@@ -105,16 +93,11 @@ def test_gdal_translate_lib_3():
 
     ds = gdal.Open('../gcore/data/byte.tif')
     ds = gdal.Translate('tmp/test3.tif', ds, outputType=gdal.GDT_Int16)
-    if ds is None:
-        return 'fail'
+    assert ds is not None
 
-    if ds.GetRasterBand(1).DataType != gdal.GDT_Int16:
-        gdaltest.post_reason('Bad data type')
-        return 'fail'
+    assert ds.GetRasterBand(1).DataType == gdal.GDT_Int16, 'Bad data type'
 
-    if ds.GetRasterBand(1).Checksum() != 4672:
-        gdaltest.post_reason('Bad checksum')
-        return 'fail'
+    assert ds.GetRasterBand(1).Checksum() == 4672, 'Bad checksum'
 
     ds = None
 
@@ -129,21 +112,13 @@ def test_gdal_translate_lib_4():
     ds = gdal.Open('../gcore/data/rgbsmall.tif')
 
     ds = gdal.Translate('tmp/test4.tif', ds, bandList=[3, 2, 1])
-    if ds is None:
-        gdaltest.post_reason('got error/warning')
-        return 'fail'
+    assert ds is not None, 'got error/warning'
 
-    if ds.GetRasterBand(1).Checksum() != 21349:
-        gdaltest.post_reason('Bad checksum')
-        return 'fail'
+    assert ds.GetRasterBand(1).Checksum() == 21349, 'Bad checksum'
 
-    if ds.GetRasterBand(2).Checksum() != 21053:
-        gdaltest.post_reason('Bad checksum')
-        return 'fail'
+    assert ds.GetRasterBand(2).Checksum() == 21053, 'Bad checksum'
 
-    if ds.GetRasterBand(3).Checksum() != 21212:
-        gdaltest.post_reason('Bad checksum')
-        return 'fail'
+    assert ds.GetRasterBand(3).Checksum() == 21212, 'Bad checksum'
 
     ds = None
 
@@ -157,32 +132,22 @@ def test_gdal_translate_lib_5():
 
     ds = gdal.Open('../gdrivers/data/bug407.gif')
     ds = gdal.Translate('tmp/test5.tif', ds, rgbExpand='rgb')
-    if ds is None:
-        return 'fail'
+    assert ds is not None
 
-    if ds.GetRasterBand(1).GetRasterColorInterpretation() != gdal.GCI_RedBand:
-        gdaltest.post_reason('Bad color interpretation')
-        return 'fail'
+    assert ds.GetRasterBand(1).GetRasterColorInterpretation() == gdal.GCI_RedBand, \
+        'Bad color interpretation'
 
-    if ds.GetRasterBand(2).GetRasterColorInterpretation() != gdal.GCI_GreenBand:
-        gdaltest.post_reason('Bad color interpretation')
-        return 'fail'
+    assert ds.GetRasterBand(2).GetRasterColorInterpretation() == gdal.GCI_GreenBand, \
+        'Bad color interpretation'
 
-    if ds.GetRasterBand(3).GetRasterColorInterpretation() != gdal.GCI_BlueBand:
-        gdaltest.post_reason('Bad color interpretation')
-        return 'fail'
+    assert ds.GetRasterBand(3).GetRasterColorInterpretation() == gdal.GCI_BlueBand, \
+        'Bad color interpretation'
 
-    if ds.GetRasterBand(1).Checksum() != 20615:
-        gdaltest.post_reason('Bad checksum')
-        return 'fail'
+    assert ds.GetRasterBand(1).Checksum() == 20615, 'Bad checksum'
 
-    if ds.GetRasterBand(2).Checksum() != 59147:
-        gdaltest.post_reason('Bad checksum')
-        return 'fail'
+    assert ds.GetRasterBand(2).Checksum() == 59147, 'Bad checksum'
 
-    if ds.GetRasterBand(3).Checksum() != 63052:
-        gdaltest.post_reason('Bad checksum')
-        return 'fail'
+    assert ds.GetRasterBand(3).Checksum() == 63052, 'Bad checksum'
 
     ds = None
 
@@ -196,12 +161,9 @@ def test_gdal_translate_lib_6():
 
     ds = gdal.Open('../gcore/data/byte.tif')
     ds = gdal.Translate('tmp/test6.tif', ds, width=40, height=40)
-    if ds is None:
-        return 'fail'
+    assert ds is not None
 
-    if ds.GetRasterBand(1).Checksum() != 18784:
-        gdaltest.post_reason('Bad checksum')
-        return 'fail'
+    assert ds.GetRasterBand(1).Checksum() == 18784, 'Bad checksum'
 
     ds = None
 
@@ -215,12 +177,9 @@ def test_gdal_translate_lib_7():
 
     ds = gdal.Open('../gcore/data/byte.tif')
     ds = gdal.Translate('tmp/test7.tif', ds, widthPct=200.0, heightPct=200.0)
-    if ds is None:
-        return 'fail'
+    assert ds is not None
 
-    if ds.GetRasterBand(1).Checksum() != 18784:
-        gdaltest.post_reason('Bad checksum')
-        return 'fail'
+    assert ds.GetRasterBand(1).Checksum() == 18784, 'Bad checksum'
 
     ds = None
 
@@ -235,21 +194,14 @@ def test_gdal_translate_lib_8():
     gcpList = [gdal.GCP(440720.000, 3751320.000, 0, 0, 0), gdal.GCP(441920.000, 3751320.000, 0, 20, 0), gdal.GCP(441920.000, 3750120.000, 0, 20, 20), gdal.GCP(440720.000, 3750120.000, 0, 0, 20)]
     ds = gdal.Open('../gcore/data/byte.tif')
     ds = gdal.Translate('tmp/test8.tif', ds, outputSRS='EPSG:26711', GCPs=gcpList)
-    if ds is None:
-        return 'fail'
+    assert ds is not None
 
-    if ds.GetRasterBand(1).Checksum() != 4672:
-        gdaltest.post_reason('Bad checksum')
-        return 'fail'
+    assert ds.GetRasterBand(1).Checksum() == 4672, 'Bad checksum'
 
     gcps = ds.GetGCPs()
-    if len(gcps) != 4:
-        gdaltest.post_reason('GCP count wrong.')
-        return 'fail'
+    assert len(gcps) == 4, 'GCP count wrong.'
 
-    if ds.GetGCPProjection().find('26711') == -1:
-        gdaltest.post_reason('Bad GCP projection.')
-        return 'fail'
+    assert ds.GetGCPProjection().find('26711') != -1, 'Bad GCP projection.'
 
     ds = None
 
@@ -263,12 +215,9 @@ def test_gdal_translate_lib_9():
 
     ds = gdal.Open('../gcore/data/byte.tif')
     ds = gdal.Translate('tmp/test9.tif', ds, noData=1)
-    if ds is None:
-        return 'fail'
+    assert ds is not None
 
-    if ds.GetRasterBand(1).GetNoDataValue() != 1:
-        gdaltest.post_reason('Bad nodata value')
-        return 'fail'
+    assert ds.GetRasterBand(1).GetNoDataValue() == 1, 'Bad nodata value'
 
     ds = None
 
@@ -282,12 +231,9 @@ def test_gdal_translate_lib_10():
 
     ds = gdal.Open('../gcore/data/byte.tif')
     ds = gdal.Translate('tmp/test10.tif', ds, srcWin=[0, 0, 1, 1])
-    if ds is None:
-        return 'fail'
+    assert ds is not None
 
-    if ds.GetRasterBand(1).Checksum() != 2:
-        gdaltest.post_reason('Bad checksum')
-        return 'fail'
+    assert ds.GetRasterBand(1).Checksum() == 2, 'Bad checksum'
 
     ds = None
 
@@ -301,16 +247,12 @@ def test_gdal_translate_lib_11():
 
     ds = gdal.Open('../gcore/data/byte.tif')
     ds = gdal.Translate('tmp/test11.tif', ds, projWin=[440720.000, 3751320.000, 441920.000, 3750120.000])
-    if ds is None:
-        return 'fail'
+    assert ds is not None
 
-    if ds.GetRasterBand(1).Checksum() != 4672:
-        gdaltest.post_reason('Bad checksum')
-        return 'fail'
+    assert ds.GetRasterBand(1).Checksum() == 4672, 'Bad checksum'
 
-    if not gdaltest.geotransform_equals(gdal.Open('../gcore/data/byte.tif').GetGeoTransform(), ds.GetGeoTransform(), 1e-9):
-        gdaltest.post_reason('Bad geotransform')
-        return 'fail'
+    assert gdaltest.geotransform_equals(gdal.Open('../gcore/data/byte.tif').GetGeoTransform(), ds.GetGeoTransform(), 1e-9), \
+        'Bad geotransform'
 
     ds = None
 
@@ -324,16 +266,12 @@ def test_gdal_translate_lib_12():
 
     ds = gdal.Open('../gcore/data/byte.tif')
     ds = gdal.Translate('tmp/test12.tif', ds, outputBounds=[440720.000, 3751320.000, 441920.000, 3750120.000])
-    if ds is None:
-        return 'fail'
+    assert ds is not None
 
-    if ds.GetRasterBand(1).Checksum() != 4672:
-        gdaltest.post_reason('Bad checksum')
-        return 'fail'
+    assert ds.GetRasterBand(1).Checksum() == 4672, 'Bad checksum'
 
-    if not gdaltest.geotransform_equals(gdal.Open('../gcore/data/byte.tif').GetGeoTransform(), ds.GetGeoTransform(), 1e-9):
-        gdaltest.post_reason('Bad geotransform')
-        return 'fail'
+    assert gdaltest.geotransform_equals(gdal.Open('../gcore/data/byte.tif').GetGeoTransform(), ds.GetGeoTransform(), 1e-9), \
+        'Bad geotransform'
 
     ds = None
 
@@ -347,13 +285,10 @@ def test_gdal_translate_lib_13():
 
     ds = gdal.Open('../gcore/data/byte.tif')
     ds = gdal.Translate('tmp/test13.tif', ds, metadataOptions=['TIFFTAG_DOCUMENTNAME=test13'])
-    if ds is None:
-        return 'fail'
+    assert ds is not None
 
     md = ds.GetMetadata()
-    if 'TIFFTAG_DOCUMENTNAME' not in md:
-        gdaltest.post_reason('Did not get TIFFTAG_DOCUMENTNAME')
-        return 'fail'
+    assert 'TIFFTAG_DOCUMENTNAME' in md, 'Did not get TIFFTAG_DOCUMENTNAME'
 
     ds = None
 
@@ -367,13 +302,10 @@ def test_gdal_translate_lib_14():
 
     ds = gdal.Open('../gcore/data/byte.tif')
     ds = gdal.Translate('tmp/test14.tif', ds, creationOptions=['COMPRESS=LZW'])
-    if ds is None:
-        return 'fail'
+    assert ds is not None
 
     md = ds.GetMetadata('IMAGE_STRUCTURE')
-    if 'COMPRESSION' not in md or md['COMPRESSION'] != 'LZW':
-        gdaltest.post_reason('Did not get COMPRESSION')
-        return 'fail'
+    assert 'COMPRESSION' in md and md['COMPRESSION'] == 'LZW', 'Did not get COMPRESSION'
 
     ds = None
 
@@ -408,16 +340,11 @@ def test_gdal_translate_lib_100():
 def test_gdal_translate_lib_101():
 
     ds = gdal.Translate('/vsimem/test_gdal_translate_lib_101.tif', gdal.Open('../gcore/data/byte.tif'), creationOptions=['PIXELTYPE=SIGNEDBYTE'], noData='-128')
-    if ds.GetRasterBand(1).GetMetadataItem('PIXELTYPE', 'IMAGE_STRUCTURE') != 'SIGNEDBYTE':
-        gdaltest.post_reason('Did not get SIGNEDBYTE')
-        return 'fail'
-    if ds.GetRasterBand(1).GetNoDataValue() != -128:
-        gdaltest.post_reason('Did not get -128')
-        return 'fail'
+    assert ds.GetRasterBand(1).GetMetadataItem('PIXELTYPE', 'IMAGE_STRUCTURE') == 'SIGNEDBYTE', \
+        'Did not get SIGNEDBYTE'
+    assert ds.GetRasterBand(1).GetNoDataValue() == -128, 'Did not get -128'
     ds2 = gdal.Translate('/vsimem/test_gdal_translate_lib_101_2.tif', ds, noData=-127)
-    if ds2.GetRasterBand(1).GetNoDataValue() != -127:
-        gdaltest.post_reason('Did not get -127')
-        return 'fail'
+    assert ds2.GetRasterBand(1).GetNoDataValue() == -127, 'Did not get -127'
     ds = None
     ds2 = None
     gdal.Unlink('/vsimem/test_gdal_translate_lib_101.tif')
@@ -432,9 +359,7 @@ def test_gdal_translate_lib_102():
 
     ds = gdal.Translate('', gdal.Open('../gcore/data/byte.tif'), format='MEM', scaleParams=[[0, 255, 0, 65535]], outputType=gdal.GDT_UInt16)
     result = ds.GetRasterBand(1).ComputeRasterMinMax(False)
-    if result != (19018.0, 65535.0):
-        print(result)
-        return 'fail'
+    assert result == (19018.0, 65535.0)
 
     (approx_min, approx_max) = ds.GetRasterBand(1).ComputeRasterMinMax(True)
     ds2 = gdal.Translate('', ds, format='MEM', scaleParams=[[approx_min, approx_max]], outputType=gdal.GDT_Byte)
@@ -444,9 +369,7 @@ def test_gdal_translate_lib_102():
     ds2 = gdal.Translate('', ds, format='MEM', scaleParams=[[]], outputType=gdal.GDT_Byte)
     stats = ds2.GetRasterBand(1).ComputeStatistics(False)
     for i in range(4):
-        if abs(stats[i] - expected_stats[i]) > 1e-3:
-            print(stats)
-            return 'fail'
+        assert abs(stats[i] - expected_stats[i]) <= 1e-3
 
     return 'success'
 
@@ -458,16 +381,12 @@ def test_gdal_translate_lib_102():
 def test_gdal_translate_lib_103():
 
     ds = gdal.Translate('', '../gcore/data/byte.tif', format='MEM', projWin=[440730, 3751310, 441910, 3750140])
-    if ds is None:
-        return 'fail'
+    assert ds is not None
 
-    if ds.GetRasterBand(1).Checksum() != 4672:
-        gdaltest.post_reason('Bad checksum')
-        return 'fail'
+    assert ds.GetRasterBand(1).Checksum() == 4672, 'Bad checksum'
 
-    if not gdaltest.geotransform_equals(gdal.Open('../gcore/data/byte.tif').GetGeoTransform(), ds.GetGeoTransform(), 1e-9):
-        gdaltest.post_reason('Bad geotransform')
-        return 'fail'
+    assert gdaltest.geotransform_equals(gdal.Open('../gcore/data/byte.tif').GetGeoTransform(), ds.GetGeoTransform(), 1e-9), \
+        'Bad geotransform'
 
     return 'success'
 
@@ -480,9 +399,7 @@ def test_gdal_translate_lib_104():
     src_ds = gdal.GetDriverByName('MEM').Create('', 2, 2)
     src_ds.GetRasterBand(1).Fill(255)
     ds = gdal.Translate('', '../gcore/data/byte.tif', format='VRT', width=1, height=1)
-    if ds.GetRasterBand(1).Checksum() != 3:
-        gdaltest.post_reason('Bad checksum')
-        return 'fail'
+    assert ds.GetRasterBand(1).Checksum() == 3, 'Bad checksum'
 
     return 'success'
 
@@ -494,17 +411,12 @@ def test_gdal_translate_lib_gcp_vrt_path():
 
     src_ds = gdal.Open('../gcore/data/gcps.vrt')
     ds = gdal.Translate('', src_ds, format='MEM', metadataOptions=['FOO=BAR'])
-    if len(ds.GetGCPs()) != len(src_ds.GetGCPs()):
-        return 'fail'
+    assert len(ds.GetGCPs()) == len(src_ds.GetGCPs())
     for i in range(len(src_ds.GetGCPs())):
-        if ds.GetGCPs()[i].GCPX != src_ds.GetGCPs()[i].GCPX:
-            return 'fail'
-        if ds.GetGCPs()[i].GCPY != src_ds.GetGCPs()[i].GCPY:
-            return 'fail'
-        if ds.GetGCPs()[i].GCPPixel != src_ds.GetGCPs()[i].GCPPixel:
-            return 'fail'
-        if ds.GetGCPs()[i].GCPLine != src_ds.GetGCPs()[i].GCPLine:
-            return 'fail'
+        assert ds.GetGCPs()[i].GCPX == src_ds.GetGCPs()[i].GCPX
+        assert ds.GetGCPs()[i].GCPY == src_ds.GetGCPs()[i].GCPY
+        assert ds.GetGCPs()[i].GCPPixel == src_ds.GetGCPs()[i].GCPPixel
+        assert ds.GetGCPs()[i].GCPLine == src_ds.GetGCPs()[i].GCPLine
 
     return 'success'
 
@@ -516,8 +428,7 @@ def test_gdal_translate_lib_rcp_vrt_path():
 
     src_ds = gdal.Open('../gcore/data/rpc.vrt')
     ds = gdal.Translate('', src_ds, format='MEM', metadataOptions=['FOO=BAR'])
-    if ds.GetMetadata('RPC') != src_ds.GetMetadata('RPC'):
-        return 'fail'
+    assert ds.GetMetadata('RPC') == src_ds.GetMetadata('RPC')
 
     return 'success'
 
@@ -529,8 +440,7 @@ def test_gdal_translate_lib_geolocation_vrt_path():
 
     src_ds = gdal.Open('../gcore/data/sstgeo.vrt')
     ds = gdal.Translate('/vsimem/temp.vrt', src_ds, format='VRT', metadataOptions=['FOO=BAR'])
-    if ds.GetMetadata('GEOLOCATION') != src_ds.GetMetadata('GEOLOCATION'):
-        return 'fail'
+    assert ds.GetMetadata('GEOLOCATION') == src_ds.GetMetadata('GEOLOCATION')
     gdal.Unlink('/vsimem/temp.vrt')
 
     return 'success'
@@ -545,31 +455,22 @@ def test_gdal_translate_lib_colorinterp():
 
     # Less bands specified than available
     ds = gdal.Translate('', src_ds, options='-f MEM -colorinterp blue,gray')
-    if ds.GetRasterBand(1).GetColorInterpretation() != gdal.GCI_BlueBand:
-        return 'fail'
-    if ds.GetRasterBand(2).GetColorInterpretation() != gdal.GCI_GrayIndex:
-        return 'fail'
-    if ds.GetRasterBand(3).GetColorInterpretation() != gdal.GCI_BlueBand:
-        return 'fail'
+    assert ds.GetRasterBand(1).GetColorInterpretation() == gdal.GCI_BlueBand
+    assert ds.GetRasterBand(2).GetColorInterpretation() == gdal.GCI_GrayIndex
+    assert ds.GetRasterBand(3).GetColorInterpretation() == gdal.GCI_BlueBand
 
     # More bands specified than available and a unknown color interpretation
     with gdaltest.error_handler():
         ds = gdal.Translate('', src_ds, options='-f MEM -colorinterp alpha,red,undefined,foo')
-    if ds.GetRasterBand(1).GetColorInterpretation() != gdal.GCI_AlphaBand:
-        return 'fail'
-    if ds.GetRasterBand(2).GetColorInterpretation() != gdal.GCI_RedBand:
-        return 'fail'
-    if ds.GetRasterBand(3).GetColorInterpretation() != gdal.GCI_Undefined:
-        return 'fail'
+    assert ds.GetRasterBand(1).GetColorInterpretation() == gdal.GCI_AlphaBand
+    assert ds.GetRasterBand(2).GetColorInterpretation() == gdal.GCI_RedBand
+    assert ds.GetRasterBand(3).GetColorInterpretation() == gdal.GCI_Undefined
 
     # Test colorinterp_
     ds = gdal.Translate('', src_ds, options='-f MEM -colorinterp_2 alpha')
-    if ds.GetRasterBand(1).GetColorInterpretation() != gdal.GCI_RedBand:
-        return 'fail'
-    if ds.GetRasterBand(2).GetColorInterpretation() != gdal.GCI_AlphaBand:
-        return 'fail'
-    if ds.GetRasterBand(3).GetColorInterpretation() != gdal.GCI_BlueBand:
-        return 'fail'
+    assert ds.GetRasterBand(1).GetColorInterpretation() == gdal.GCI_RedBand
+    assert ds.GetRasterBand(2).GetColorInterpretation() == gdal.GCI_AlphaBand
+    assert ds.GetRasterBand(3).GetColorInterpretation() == gdal.GCI_BlueBand
 
     # Test invalid colorinterp_
     try:
diff --git a/autotest/utilities/test_gdaladdo.py b/autotest/utilities/test_gdaladdo.py
index a8695456c1d4..01239d4d629b 100755
--- a/autotest/utilities/test_gdaladdo.py
+++ b/autotest/utilities/test_gdaladdo.py
@@ -52,10 +52,7 @@ def test_gdaladdo_1():
     shutil.copy('../gcore/data/float32.tif', 'tmp/float32.tif')
 
     (_, err) = gdaltest.runexternal_out_and_err(test_cli_utilities.get_gdaladdo_path() + ' tmp/mfloat32.vrt 2 4')
-    if not (err is None or err == ''):
-        gdaltest.post_reason('got error/warning')
-        print(err)
-        return 'fail'
+    assert (err is None or err == ''), 'got error/warning'
 
     ds = gdal.Open('tmp/mfloat32.vrt')
     ret = tiff_ovr.tiff_ovr_check(ds)
@@ -83,10 +80,7 @@ def test_gdaladdo_2():
     cs = ds.GetRasterBand(1).GetOverview(0).Checksum()
     exp_cs = 1130
 
-    if cs != exp_cs:
-        gdaltest.post_reason('got wrong overview checksum.')
-        print(exp_cs, cs)
-        return 'fail'
+    assert cs == exp_cs, 'got wrong overview checksum.'
 
     ds = None
 
@@ -110,10 +104,7 @@ def test_gdaladdo_3():
     cs = ds.GetRasterBand(1).GetOverview(0).Checksum()
     exp_cs = 20683
 
-    if cs != exp_cs:
-        gdaltest.post_reason('got wrong overview checksum.')
-        print(exp_cs, cs)
-        return 'fail'
+    assert cs == exp_cs, 'got wrong overview checksum.'
 
     ds = None
 
@@ -139,9 +130,7 @@ def test_gdaladdo_4():
     cnt = ds.GetRasterBand(1).GetOverviewCount()
     ds = None
 
-    if cnt != 0:
-        gdaltest.post_reason('did not clean overviews.')
-        return 'fail'
+    assert cnt == 0, 'did not clean overviews.'
 
     try:
         os.stat('tmp/test_gdaladdo_3.tif.ovr')
@@ -171,9 +160,7 @@ def test_gdaladdo_5():
     cnt = ds.GetRasterBand(1).GetOverviewCount()
     ds = None
 
-    if cnt != 0:
-        print(cnt)
-        return 'fail'
+    assert cnt == 0
 
     # Will generate overviews of size 10 5 3 2 1
     gdaltest.runexternal(test_cli_utilities.get_gdaladdo_path() + ' -minsize 1 tmp/test_gdaladdo_5.tif')
@@ -182,9 +169,7 @@ def test_gdaladdo_5():
     cnt = ds.GetRasterBand(1).GetOverviewCount()
     ds = None
 
-    if cnt != 5:
-        print(cnt)
-        return 'fail'
+    assert cnt == 5
 
     gdal.Translate('tmp/test_gdaladdo_5.tif', '../gcore/data/nodata_byte.tif', options='-outsize 257 257')
 
@@ -195,9 +180,7 @@ def test_gdaladdo_5():
     cnt = ds.GetRasterBand(1).GetOverviewCount()
     ds = None
 
-    if cnt != 1:
-        print(cnt)
-        return 'fail'
+    assert cnt == 1
 
     os.remove('tmp/test_gdaladdo_5.tif')
 
diff --git a/autotest/utilities/test_gdalbuildvrt.py b/autotest/utilities/test_gdalbuildvrt.py
index 194c1691c4d4..6734a775765a 100755
--- a/autotest/utilities/test_gdalbuildvrt.py
+++ b/autotest/utilities/test_gdalbuildvrt.py
@@ -44,28 +44,21 @@
 def test_gdalbuildvrt_check():
 
     ds = gdal.Open('tmp/mosaic.vrt')
-    if ds.GetProjectionRef().find('WGS 84') == -1:
-        gdaltest.post_reason('Expected WGS 84\nGot : %s' % (ds.GetProjectionRef()))
-        return 'fail'
+    assert ds.GetProjectionRef().find('WGS 84') != -1, \
+        ('Expected WGS 84\nGot : %s' % (ds.GetProjectionRef()))
 
     gt = ds.GetGeoTransform()
     expected_gt = [2, 0.1, 0, 49, 0, -0.1]
     for i in range(6):
-        if abs(gt[i] - expected_gt[i] > 1e-5):
-            gdaltest.post_reason('Expected : %s\nGot : %s' % (expected_gt, gt))
-            return 'fail'
+        assert not abs(gt[i] - expected_gt[i] > 1e-5), \
+            ('Expected : %s\nGot : %s' % (expected_gt, gt))
 
-    if ds.RasterXSize != 20 or ds.RasterYSize != 20:
-        gdaltest.post_reason('Wrong raster dimensions : %d x %d' % (ds.RasterXSize, ds.RasterYSize))
-        return 'fail'
+    assert ds.RasterXSize == 20 and ds.RasterYSize == 20, \
+        ('Wrong raster dimensions : %d x %d' % (ds.RasterXSize, ds.RasterYSize))
 
-    if ds.RasterCount != 1:
-        gdaltest.post_reason('Wrong raster count : %d ' % (ds.RasterCount))
-        return 'fail'
+    assert ds.RasterCount == 1, ('Wrong raster count : %d ' % (ds.RasterCount))
 
-    if ds.GetRasterBand(1).Checksum() != 3508:
-        gdaltest.post_reason('Wrong checksum')
-        return 'fail'
+    assert ds.GetRasterBand(1).Checksum() == 3508, 'Wrong checksum'
 
     return 'success'
 
@@ -107,10 +100,7 @@ def test_gdalbuildvrt_1():
     ds = None
 
     (_, err) = gdaltest.runexternal_out_and_err(test_cli_utilities.get_gdalbuildvrt_path() + ' tmp/mosaic.vrt tmp/gdalbuildvrt1.tif tmp/gdalbuildvrt2.tif tmp/gdalbuildvrt3.tif tmp/gdalbuildvrt4.tif')
-    if not (err is None or err == ''):
-        gdaltest.post_reason('got error/warning')
-        print(err)
-        return 'fail'
+    assert (err is None or err == ''), 'got error/warning'
 
     return test_gdalbuildvrt_check()
 
@@ -214,28 +204,21 @@ def test_gdalbuildvrt_6():
     gdaltest.runexternal(test_cli_utilities.get_gdalbuildvrt_path() + ' -separate tmp/stacked.vrt tmp/gdalbuildvrt1.tif tmp/gdalbuildvrt2.tif tmp/gdalbuildvrt3.tif tmp/gdalbuildvrt4.tif')
 
     ds = gdal.Open('tmp/stacked.vrt')
-    if ds.GetProjectionRef().find('WGS 84') == -1:
-        gdaltest.post_reason('Expected WGS 84\nGot : %s' % (ds.GetProjectionRef()))
-        return 'fail'
+    assert ds.GetProjectionRef().find('WGS 84') != -1, \
+        ('Expected WGS 84\nGot : %s' % (ds.GetProjectionRef()))
 
     gt = ds.GetGeoTransform()
     expected_gt = [2, 0.1, 0, 49, 0, -0.1]
     for i in range(6):
-        if abs(gt[i] - expected_gt[i] > 1e-5):
-            gdaltest.post_reason('Expected : %s\nGot : %s' % (expected_gt, gt))
-            return 'fail'
+        assert not abs(gt[i] - expected_gt[i] > 1e-5), \
+            ('Expected : %s\nGot : %s' % (expected_gt, gt))
 
-    if ds.RasterXSize != 20 or ds.RasterYSize != 20:
-        gdaltest.post_reason('Wrong raster dimensions : %d x %d' % (ds.RasterXSize, ds.RasterYSize))
-        return 'fail'
+    assert ds.RasterXSize == 20 and ds.RasterYSize == 20, \
+        ('Wrong raster dimensions : %d x %d' % (ds.RasterXSize, ds.RasterYSize))
 
-    if ds.RasterCount != 4:
-        gdaltest.post_reason('Wrong raster count : %d ' % (ds.RasterCount))
-        return 'fail'
+    assert ds.RasterCount == 4, ('Wrong raster count : %d ' % (ds.RasterCount))
 
-    if ds.GetRasterBand(1).Checksum() != 0:
-        gdaltest.post_reason('Wrong checksum')
-        return 'fail'
+    assert ds.GetRasterBand(1).Checksum() == 0, 'Wrong checksum'
 
     return 'success'
 
@@ -286,17 +269,11 @@ def test_gdalbuildvrt_7():
 
     ds = gdal.Open('tmp/gdalbuildvrt7.vrt')
 
-    if ds.GetRasterBand(1).Checksum() != 1217:
-        gdaltest.post_reason('Wrong checksum')
-        return 'fail'
+    assert ds.GetRasterBand(1).Checksum() == 1217, 'Wrong checksum'
 
-    if ds.GetRasterBand(2).Checksum() != 1218:
-        gdaltest.post_reason('Wrong checksum')
-        return 'fail'
+    assert ds.GetRasterBand(2).Checksum() == 1218, 'Wrong checksum'
 
-    if ds.GetRasterBand(3).Checksum() != 0:
-        gdaltest.post_reason('Wrong checksum')
-        return 'fail'
+    assert ds.GetRasterBand(3).Checksum() == 0, 'Wrong checksum'
 
     ds = None
 
@@ -317,13 +294,11 @@ def test_gdalbuildvrt_8():
     gt = ds.GetGeoTransform()
     expected_gt = [2, 0.05, 0, 49, 0, -0.05]
     for i in range(6):
-        if abs(gt[i] - expected_gt[i] > 1e-5):
-            gdaltest.post_reason('Expected : %s\nGot : %s' % (expected_gt, gt))
-            return 'fail'
+        assert not abs(gt[i] - expected_gt[i] > 1e-5), \
+            ('Expected : %s\nGot : %s' % (expected_gt, gt))
 
-    if ds.RasterXSize != 40 or ds.RasterYSize != 40:
-        gdaltest.post_reason('Wrong raster dimensions : %d x %d' % (ds.RasterXSize, ds.RasterYSize))
-        return 'fail'
+    assert ds.RasterXSize == 40 and ds.RasterYSize == 40, \
+        ('Wrong raster dimensions : %d x %d' % (ds.RasterXSize, ds.RasterYSize))
 
     gdaltest.runexternal(test_cli_utilities.get_gdalbuildvrt_path() + ' -tr 0.1 0.1 tmp/mosaic.vrt tmp/mosaic2.vrt')
 
@@ -344,13 +319,11 @@ def test_gdalbuildvrt_9():
     gt = ds.GetGeoTransform()
     expected_gt = [1, 0.1, 0, 50, 0, -0.1]
     for i in range(6):
-        if abs(gt[i] - expected_gt[i] > 1e-5):
-            gdaltest.post_reason('Expected : %s\nGot : %s' % (expected_gt, gt))
-            return 'fail'
+        assert not abs(gt[i] - expected_gt[i] > 1e-5), \
+            ('Expected : %s\nGot : %s' % (expected_gt, gt))
 
-    if ds.RasterXSize != 40 or ds.RasterYSize != 40:
-        gdaltest.post_reason('Wrong raster dimensions : %d x %d' % (ds.RasterXSize, ds.RasterYSize))
-        return 'fail'
+    assert ds.RasterXSize == 40 and ds.RasterYSize == 40, \
+        ('Wrong raster dimensions : %d x %d' % (ds.RasterXSize, ds.RasterYSize))
 
     gdaltest.runexternal(test_cli_utilities.get_gdalbuildvrt_path() + ' -te 2 47 4 49 tmp/mosaic.vrt tmp/mosaic2.vrt')
 
@@ -386,10 +359,7 @@ def test_gdalbuildvrt_10():
 
     ds = gdal.Open('tmp/gdalbuildvrt10.vrt')
 
-    if ds.GetRasterBand(1).Checksum() != 18:
-        print(ds.GetRasterBand(1).Checksum())
-        gdaltest.post_reason('Wrong checksum')
-        return 'fail'
+    assert ds.GetRasterBand(1).Checksum() == 18, 'Wrong checksum'
 
     ds = None
 
@@ -417,17 +387,9 @@ def test_gdalbuildvrt_11():
 
     ds = gdal.Open('tmp/gdalbuildvrt11.vrt')
 
-    if ds.GetRasterBand(1).Checksum() != cs1:
-        print(ds.GetRasterBand(1).Checksum())
-        print(cs1)
-        gdaltest.post_reason('Wrong checksum')
-        return 'fail'
+    assert ds.GetRasterBand(1).Checksum() == cs1, 'Wrong checksum'
 
-    if ds.GetRasterBand(2).Checksum() != cs2:
-        print(ds.GetRasterBand(2).Checksum())
-        print(cs2)
-        gdaltest.post_reason('Wrong checksum')
-        return 'fail'
+    assert ds.GetRasterBand(2).Checksum() == cs2, 'Wrong checksum'
 
     ds = None
 
@@ -443,9 +405,8 @@ def test_gdalbuildvrt_12():
 
     (_, err) = gdaltest.runexternal_out_and_err(test_cli_utilities.get_gdalbuildvrt_path() + ' -tap tmp/gdalbuildvrt12.vrt ../gcore/data/byte.tif',
                                                 check_memleak=False)
-    if err.find('-tap option cannot be used without using -tr') == -1:
-        gdaltest.post_reason('expected error')
-        return 'fail'
+    assert err.find('-tap option cannot be used without using -tr') != -1, \
+        'expected error'
 
     gdaltest.runexternal(test_cli_utilities.get_gdalbuildvrt_path() + ' -tr 100 50 -tap tmp/gdalbuildvrt12.vrt ../gcore/data/byte.tif')
 
@@ -454,13 +415,11 @@ def test_gdalbuildvrt_12():
     gt = ds.GetGeoTransform()
     expected_gt = [440700.0, 100.0, 0.0, 3751350.0, 0.0, -50.0]
     for i in range(6):
-        if abs(gt[i] - expected_gt[i] > 1e-5):
-            gdaltest.post_reason('Expected : %s\nGot : %s' % (expected_gt, gt))
-            return 'fail'
+        assert not abs(gt[i] - expected_gt[i] > 1e-5), \
+            ('Expected : %s\nGot : %s' % (expected_gt, gt))
 
-    if ds.RasterXSize != 13 or ds.RasterYSize != 25:
-        gdaltest.post_reason('Wrong raster dimensions : %d x %d' % (ds.RasterXSize, ds.RasterYSize))
-        return 'fail'
+    assert ds.RasterXSize == 13 and ds.RasterYSize == 25, \
+        ('Wrong raster dimensions : %d x %d' % (ds.RasterXSize, ds.RasterYSize))
 
     return 'success'
 
@@ -475,8 +434,7 @@ def test_gdalbuildvrt_13():
     gdaltest.runexternal(test_cli_utilities.get_gdalbuildvrt_path() + ' tmp/gdalbuildvrt13.vrt ../gcore/data/byte.tif -a_srs EPSG:4326')
 
     ds = gdal.Open('tmp/gdalbuildvrt13.vrt')
-    if ds.GetProjectionRef().find('4326') == -1:
-        return 'fail'
+    assert ds.GetProjectionRef().find('4326') != -1
     ds = None
 
     return 'success'
@@ -502,10 +460,7 @@ def test_gdalbuildvrt_14():
     ds = None
     ds_ref = None
 
-    if cs != cs_ref:
-        print(cs)
-        print(cs_ref)
-        return 'fail'
+    assert cs == cs_ref
 
     return 'success'
 
@@ -523,9 +478,7 @@ def test_gdalbuildvrt_15():
     cs = ds.GetRasterBand(1).Checksum()
     ds = None
 
-    if cs != 4672:
-        print(cs)
-        return 'fail'
+    assert cs == 4672
 
     return 'success'
 
@@ -540,16 +493,10 @@ def test_gdalbuildvrt_16():
     (out, err) = gdaltest.runexternal_out_and_err(test_cli_utilities.get_gdalbuildvrt_path() + ' /non_existing_dir/non_existing_subdir/out.vrt ../gcore/data/byte.tif')
 
     if not gdaltest.is_travis_branch('mingw'):
-        if err.find('ERROR ret code = 1') < 0:
-            print(out)
-            print(err)
-            return 'fail'
+        assert err.find('ERROR ret code = 1') >= 0, out
     else:
         # We don't get the error code on Travis mingw
-        if err.find('ERROR') < 0:
-            print(out)
-            print(err)
-            return 'fail'
+        assert err.find('ERROR') >= 0, out
 
     return 'success'
 
diff --git a/autotest/utilities/test_gdalbuildvrt_lib.py b/autotest/utilities/test_gdalbuildvrt_lib.py
index 37f2815ad471..c6d8a15ce2e9 100755
--- a/autotest/utilities/test_gdalbuildvrt_lib.py
+++ b/autotest/utilities/test_gdalbuildvrt_lib.py
@@ -43,43 +43,27 @@ def test_gdalbuildvrt_lib_1():
 
     # Source = String
     ds = gdal.BuildVRT('', '../gcore/data/byte.tif')
-    if ds is None:
-        gdaltest.post_reason('got error/warning')
-        return 'fail'
+    assert ds is not None, 'got error/warning'
 
-    if ds.GetRasterBand(1).Checksum() != 4672:
-        gdaltest.post_reason('Bad checksum')
-        return 'fail'
+    assert ds.GetRasterBand(1).Checksum() == 4672, 'Bad checksum'
 
     # Source = Array of string
     ds = gdal.BuildVRT('', ['../gcore/data/byte.tif'])
-    if ds is None:
-        gdaltest.post_reason('got error/warning')
-        return 'fail'
+    assert ds is not None, 'got error/warning'
 
-    if ds.GetRasterBand(1).Checksum() != 4672:
-        gdaltest.post_reason('Bad checksum')
-        return 'fail'
+    assert ds.GetRasterBand(1).Checksum() == 4672, 'Bad checksum'
 
     # Source = Dataset
     ds = gdal.BuildVRT('', gdal.Open('../gcore/data/byte.tif'))
-    if ds is None:
-        gdaltest.post_reason('got error/warning')
-        return 'fail'
+    assert ds is not None, 'got error/warning'
 
-    if ds.GetRasterBand(1).Checksum() != 4672:
-        gdaltest.post_reason('Bad checksum')
-        return 'fail'
+    assert ds.GetRasterBand(1).Checksum() == 4672, 'Bad checksum'
 
     # Source = Array of dataset
     ds = gdal.BuildVRT('', [gdal.Open('../gcore/data/byte.tif')])
-    if ds is None:
-        gdaltest.post_reason('got error/warning')
-        return 'fail'
+    assert ds is not None, 'got error/warning'
 
-    if ds.GetRasterBand(1).Checksum() != 4672:
-        gdaltest.post_reason('Bad checksum')
-        return 'fail'
+    assert ds.GetRasterBand(1).Checksum() == 4672, 'Bad checksum'
 
     return 'success'
 
@@ -97,16 +81,11 @@ def test_gdalbuildvrt_lib_2():
 
     tab = [0]
     ds = gdal.BuildVRT('', '../gcore/data/byte.tif', callback=mycallback, callback_data=tab)
-    if ds is None:
-        return 'fail'
+    assert ds is not None
 
-    if ds.GetRasterBand(1).Checksum() != 4672:
-        gdaltest.post_reason('Bad checksum')
-        return 'fail'
+    assert ds.GetRasterBand(1).Checksum() == 4672, 'Bad checksum'
 
-    if tab[0] != 1.0:
-        gdaltest.post_reason('Bad percentage')
-        return 'fail'
+    assert tab[0] == 1.0, 'Bad percentage'
 
     ds = None
 
diff --git a/autotest/utilities/test_gdaldem.py b/autotest/utilities/test_gdaldem.py
index 79ac5d137375..e35a02a7432b 100755
--- a/autotest/utilities/test_gdaldem.py
+++ b/autotest/utilities/test_gdaldem.py
@@ -47,37 +47,24 @@ def test_gdaldem_hillshade():
         return 'skip'
 
     (_, err) = gdaltest.runexternal_out_and_err(test_cli_utilities.get_gdaldem_path() + ' hillshade -s 111120 -z 30 ../gdrivers/data/n43.dt0 tmp/n43_hillshade.tif')
-    if not (err is None or err == ''):
-        gdaltest.post_reason('got error/warning')
-        print(err)
-        return 'fail'
+    assert (err is None or err == ''), 'got error/warning'
 
     src_ds = gdal.Open('../gdrivers/data/n43.dt0')
     ds = gdal.Open('tmp/n43_hillshade.tif')
-    if ds is None:
-        return 'fail'
+    assert ds is not None
 
     cs = ds.GetRasterBand(1).Checksum()
-    if cs != 45587:
-        gdaltest.post_reason('Bad checksum')
-        print(cs)
-        return 'fail'
+    assert cs == 45587, 'Bad checksum'
 
     src_gt = src_ds.GetGeoTransform()
     dst_gt = ds.GetGeoTransform()
     for i in range(6):
-        if abs(src_gt[i] - dst_gt[i]) > 1e-10:
-            gdaltest.post_reason('Bad geotransform')
-            return 'fail'
+        assert abs(src_gt[i] - dst_gt[i]) <= 1e-10, 'Bad geotransform'
 
     dst_wkt = ds.GetProjectionRef()
-    if dst_wkt.find('AUTHORITY["EPSG","4326"]') == -1:
-        gdaltest.post_reason('Bad projection')
-        return 'fail'
+    assert dst_wkt.find('AUTHORITY["EPSG","4326"]') != -1, 'Bad projection'
 
-    if ds.GetRasterBand(1).GetNoDataValue() != 0:
-        gdaltest.post_reason('Bad nodata value')
-        return 'fail'
+    assert ds.GetRasterBand(1).GetNoDataValue() == 0, 'Bad nodata value'
 
     src_ds = None
     ds = None
@@ -93,28 +80,20 @@ def test_gdaldem_hillshade_compressed_tiled_output():
         return 'skip'
 
     (_, err) = gdaltest.runexternal_out_and_err(test_cli_utilities.get_gdaldem_path() + ' hillshade -s 111120 -z 30 ../gdrivers/data/n43.dt0 tmp/n43_hillshade_compressed_tiled.tif -co TILED=YES -co COMPRESS=DEFLATE --config GDAL_CACHEMAX 0')
-    if not (err is None or err == ''):
-        gdaltest.post_reason('got error/warning')
-        print(err)
-        return 'fail'
+    assert (err is None or err == ''), 'got error/warning'
 
     ds = gdal.Open('tmp/n43_hillshade_compressed_tiled.tif')
-    if ds is None:
-        return 'fail'
+    assert ds is not None
 
     cs = ds.GetRasterBand(1).Checksum()
-    if cs != 45587:
-        gdaltest.post_reason('Bad checksum')
-        print(cs)
-        return 'fail'
+    assert cs == 45587, 'Bad checksum'
 
     ds = None
 
     stat_uncompressed = os.stat('tmp/n43_hillshade.tif')
     stat_compressed = os.stat('tmp/n43_hillshade_compressed_tiled.tif')
-    if stat_uncompressed.st_size < stat_compressed.st_size:
-        gdaltest.post_reason('failure: compressed size greater than uncompressed one')
-        return 'fail'
+    assert stat_uncompressed.st_size >= stat_compressed.st_size, \
+        'failure: compressed size greater than uncompressed one'
 
     return 'success'
 
@@ -130,30 +109,20 @@ def test_gdaldem_hillshade_combined():
 
     src_ds = gdal.Open('../gdrivers/data/n43.dt0')
     ds = gdal.Open('tmp/n43_hillshade_combined.tif')
-    if ds is None:
-        return 'fail'
+    assert ds is not None
 
     cs = ds.GetRasterBand(1).Checksum()
-    if cs != 43876:
-        gdaltest.post_reason('Bad checksum')
-        print(cs)
-        return 'fail'
+    assert cs == 43876, 'Bad checksum'
 
     src_gt = src_ds.GetGeoTransform()
     dst_gt = ds.GetGeoTransform()
     for i in range(6):
-        if abs(src_gt[i] - dst_gt[i]) > 1e-10:
-            gdaltest.post_reason('Bad geotransform')
-            return 'fail'
+        assert abs(src_gt[i] - dst_gt[i]) <= 1e-10, 'Bad geotransform'
 
     dst_wkt = ds.GetProjectionRef()
-    if dst_wkt.find('AUTHORITY["EPSG","4326"]') == -1:
-        gdaltest.post_reason('Bad projection')
-        return 'fail'
+    assert dst_wkt.find('AUTHORITY["EPSG","4326"]') != -1, 'Bad projection'
 
-    if ds.GetRasterBand(1).GetNoDataValue() != 0:
-        gdaltest.post_reason('Bad nodata value')
-        return 'fail'
+    assert ds.GetRasterBand(1).GetNoDataValue() == 0, 'Bad nodata value'
 
     src_ds = None
     ds = None
@@ -171,14 +140,10 @@ def test_gdaldem_hillshade_compute_edges():
     gdaltest.runexternal(test_cli_utilities.get_gdaldem_path() + ' hillshade -compute_edges -s 111120 -z 30 ../gdrivers/data/n43.dt0 tmp/n43_hillshade_compute_edges.tif')
 
     ds = gdal.Open('tmp/n43_hillshade_compute_edges.tif')
-    if ds is None:
-        return 'fail'
+    assert ds is not None
 
     cs = ds.GetRasterBand(1).Checksum()
-    if cs != 50239:
-        gdaltest.post_reason('Bad checksum')
-        print(cs)
-        return 'fail'
+    assert cs == 50239, 'Bad checksum'
 
     ds = None
 
@@ -214,9 +179,7 @@ def test_gdaldem_hillshade_azimuth():
 
     ds_ref = gdal.Open('data/pyramid_shaded_ref.tif')
     ds = gdal.Open('tmp/pyramid_shaded.tif')
-    if gdaltest.compare_ds(ds, ds_ref, verbose=1) > 1:
-        gdaltest.post_reason('Bad checksum')
-        return 'fail'
+    assert gdaltest.compare_ds(ds, ds_ref, verbose=1) <= 1, 'Bad checksum'
     ds = None
     ds_ref = None
 
@@ -233,14 +196,10 @@ def test_gdaldem_hillshade_png():
     gdaltest.runexternal(test_cli_utilities.get_gdaldem_path() + ' hillshade -of PNG  -s 111120 -z 30 ../gdrivers/data/n43.dt0 tmp/n43_hillshade.png')
 
     ds = gdal.Open('tmp/n43_hillshade.png')
-    if ds is None:
-        return 'fail'
+    assert ds is not None
 
     cs = ds.GetRasterBand(1).Checksum()
-    if cs != 45587:
-        gdaltest.post_reason('Bad checksum')
-        print(cs)
-        return 'fail'
+    assert cs == 45587, 'Bad checksum'
 
     ds = None
 
@@ -257,14 +216,10 @@ def test_gdaldem_hillshade_png_compute_edges():
     gdaltest.runexternal(test_cli_utilities.get_gdaldem_path() + ' hillshade -compute_edges -of PNG  -s 111120 -z 30 ../gdrivers/data/n43.dt0 tmp/n43_hillshade_compute_edges.png')
 
     ds = gdal.Open('tmp/n43_hillshade_compute_edges.png')
-    if ds is None:
-        return 'fail'
+    assert ds is not None
 
     cs = ds.GetRasterBand(1).Checksum()
-    if cs != 50239:
-        gdaltest.post_reason('Bad checksum')
-        print(cs)
-        return 'fail'
+    assert cs == 50239, 'Bad checksum'
 
     ds = None
 
@@ -282,28 +237,19 @@ def test_gdaldem_slope():
 
     src_ds = gdal.Open('../gdrivers/data/n43.dt0')
     ds = gdal.Open('tmp/n43_slope.tif')
-    if ds is None:
-        return 'fail'
+    assert ds is not None
 
-    if ds.GetRasterBand(1).Checksum() != 63748:
-        gdaltest.post_reason('Bad checksum')
-        return 'fail'
+    assert ds.GetRasterBand(1).Checksum() == 63748, 'Bad checksum'
 
     src_gt = src_ds.GetGeoTransform()
     dst_gt = ds.GetGeoTransform()
     for i in range(6):
-        if abs(src_gt[i] - dst_gt[i]) > 1e-10:
-            gdaltest.post_reason('Bad geotransform')
-            return 'fail'
+        assert abs(src_gt[i] - dst_gt[i]) <= 1e-10, 'Bad geotransform'
 
     dst_wkt = ds.GetProjectionRef()
-    if dst_wkt.find('AUTHORITY["EPSG","4326"]') == -1:
-        gdaltest.post_reason('Bad projection')
-        return 'fail'
+    assert dst_wkt.find('AUTHORITY["EPSG","4326"]') != -1, 'Bad projection'
 
-    if ds.GetRasterBand(1).GetNoDataValue() != -9999.0:
-        gdaltest.post_reason('Bad nodata value')
-        return 'fail'
+    assert ds.GetRasterBand(1).GetNoDataValue() == -9999.0, 'Bad nodata value'
 
     src_ds = None
     ds = None
@@ -322,28 +268,19 @@ def test_gdaldem_aspect():
 
     src_ds = gdal.Open('../gdrivers/data/n43.dt0')
     ds = gdal.Open('tmp/n43_aspect.tif')
-    if ds is None:
-        return 'fail'
+    assert ds is not None
 
-    if ds.GetRasterBand(1).Checksum() != 54885:
-        gdaltest.post_reason('Bad checksum')
-        return 'fail'
+    assert ds.GetRasterBand(1).Checksum() == 54885, 'Bad checksum'
 
     src_gt = src_ds.GetGeoTransform()
     dst_gt = ds.GetGeoTransform()
     for i in range(6):
-        if abs(src_gt[i] - dst_gt[i]) > 1e-10:
-            gdaltest.post_reason('Bad geotransform')
-            return 'fail'
+        assert abs(src_gt[i] - dst_gt[i]) <= 1e-10, 'Bad geotransform'
 
     dst_wkt = ds.GetProjectionRef()
-    if dst_wkt.find('AUTHORITY["EPSG","4326"]') == -1:
-        gdaltest.post_reason('Bad projection')
-        return 'fail'
+    assert dst_wkt.find('AUTHORITY["EPSG","4326"]') != -1, 'Bad projection'
 
-    if ds.GetRasterBand(1).GetNoDataValue() != -9999.0:
-        gdaltest.post_reason('Bad nodata value')
-        return 'fail'
+    assert ds.GetRasterBand(1).GetNoDataValue() == -9999.0, 'Bad nodata value'
 
     src_ds = None
     ds = None
@@ -361,35 +298,21 @@ def test_gdaldem_color_relief():
     gdaltest.runexternal(test_cli_utilities.get_gdaldem_path() + ' color-relief ../gdrivers/data/n43.dt0 data/color_file.txt tmp/n43_colorrelief.tif')
     src_ds = gdal.Open('../gdrivers/data/n43.dt0')
     ds = gdal.Open('tmp/n43_colorrelief.tif')
-    if ds is None:
-        return 'fail'
+    assert ds is not None
 
-    if ds.GetRasterBand(1).Checksum() != 55009:
-        print(ds.GetRasterBand(1).Checksum())
-        gdaltest.post_reason('Bad checksum')
-        return 'fail'
+    assert ds.GetRasterBand(1).Checksum() == 55009, 'Bad checksum'
 
-    if ds.GetRasterBand(2).Checksum() != 37543:
-        print(ds.GetRasterBand(2).Checksum())
-        gdaltest.post_reason('Bad checksum')
-        return 'fail'
+    assert ds.GetRasterBand(2).Checksum() == 37543, 'Bad checksum'
 
-    if ds.GetRasterBand(3).Checksum() != 47711:
-        print(ds.GetRasterBand(3).Checksum())
-        gdaltest.post_reason('Bad checksum')
-        return 'fail'
+    assert ds.GetRasterBand(3).Checksum() == 47711, 'Bad checksum'
 
     src_gt = src_ds.GetGeoTransform()
     dst_gt = ds.GetGeoTransform()
     for i in range(6):
-        if abs(src_gt[i] - dst_gt[i]) > 1e-10:
-            gdaltest.post_reason('Bad geotransform')
-            return 'fail'
+        assert abs(src_gt[i] - dst_gt[i]) <= 1e-10, 'Bad geotransform'
 
     dst_wkt = ds.GetProjectionRef()
-    if dst_wkt.find('AUTHORITY["EPSG","4326"]') == -1:
-        gdaltest.post_reason('Bad projection')
-        return 'fail'
+    assert dst_wkt.find('AUTHORITY["EPSG","4326"]') != -1, 'Bad projection'
 
     src_ds = None
     ds = None
@@ -407,35 +330,21 @@ def test_gdaldem_color_relief_cpt():
     gdaltest.runexternal(test_cli_utilities.get_gdaldem_path() + ' color-relief ../gdrivers/data/n43.dt0 data/color_file.cpt tmp/n43_colorrelief_cpt.tif')
     src_ds = gdal.Open('../gdrivers/data/n43.dt0')
     ds = gdal.Open('tmp/n43_colorrelief_cpt.tif')
-    if ds is None:
-        return 'fail'
+    assert ds is not None
 
-    if ds.GetRasterBand(1).Checksum() != 55009:
-        print(ds.GetRasterBand(1).Checksum())
-        gdaltest.post_reason('Bad checksum')
-        return 'fail'
+    assert ds.GetRasterBand(1).Checksum() == 55009, 'Bad checksum'
 
-    if ds.GetRasterBand(2).Checksum() != 37543:
-        print(ds.GetRasterBand(2).Checksum())
-        gdaltest.post_reason('Bad checksum')
-        return 'fail'
+    assert ds.GetRasterBand(2).Checksum() == 37543, 'Bad checksum'
 
-    if ds.GetRasterBand(3).Checksum() != 47711:
-        print(ds.GetRasterBand(3).Checksum())
-        gdaltest.post_reason('Bad checksum')
-        return 'fail'
+    assert ds.GetRasterBand(3).Checksum() == 47711, 'Bad checksum'
 
     src_gt = src_ds.GetGeoTransform()
     dst_gt = ds.GetGeoTransform()
     for i in range(6):
-        if abs(src_gt[i] - dst_gt[i]) > 1e-10:
-            gdaltest.post_reason('Bad geotransform')
-            return 'fail'
+        assert abs(src_gt[i] - dst_gt[i]) <= 1e-10, 'Bad geotransform'
 
     dst_wkt = ds.GetProjectionRef()
-    if dst_wkt.find('AUTHORITY["EPSG","4326"]') == -1:
-        gdaltest.post_reason('Bad projection')
-        return 'fail'
+    assert dst_wkt.find('AUTHORITY["EPSG","4326"]') != -1, 'Bad projection'
 
     src_ds = None
     ds = None
@@ -453,26 +362,19 @@ def test_gdaldem_color_relief_vrt():
     gdaltest.runexternal(test_cli_utilities.get_gdaldem_path() + ' color-relief -of VRT ../gdrivers/data/n43.dt0 data/color_file.txt tmp/n43_colorrelief.vrt')
     src_ds = gdal.Open('../gdrivers/data/n43.dt0')
     ds = gdal.Open('tmp/n43_colorrelief.vrt')
-    if ds is None:
-        return 'fail'
+    assert ds is not None
 
     ds_ref = gdal.Open('tmp/n43_colorrelief.tif')
-    if gdaltest.compare_ds(ds, ds_ref, verbose=0) > 1:
-        gdaltest.post_reason('Bad checksum')
-        return 'fail'
+    assert gdaltest.compare_ds(ds, ds_ref, verbose=0) <= 1, 'Bad checksum'
     ds_ref = None
 
     src_gt = src_ds.GetGeoTransform()
     dst_gt = ds.GetGeoTransform()
     for i in range(6):
-        if abs(src_gt[i] - dst_gt[i]) > 1e-10:
-            gdaltest.post_reason('Bad geotransform')
-            return 'fail'
+        assert abs(src_gt[i] - dst_gt[i]) <= 1e-10, 'Bad geotransform'
 
     dst_wkt = ds.GetProjectionRef()
-    if dst_wkt.find('AUTHORITY["EPSG","4326"]') == -1:
-        gdaltest.post_reason('Bad projection')
-        return 'fail'
+    assert dst_wkt.find('AUTHORITY["EPSG","4326"]') != -1, 'Bad projection'
 
     src_ds = None
     ds = None
@@ -492,23 +394,13 @@ def test_gdaldem_color_relief_from_float32():
     gdaltest.runexternal(test_cli_utilities.get_gdal_translate_path() + ' -ot Float32 ../gdrivers/data/n43.dt0 tmp/n43_float32.tif')
     gdaltest.runexternal(test_cli_utilities.get_gdaldem_path() + ' color-relief tmp/n43_float32.tif data/color_file.txt tmp/n43_colorrelief_from_float32.tif')
     ds = gdal.Open('tmp/n43_colorrelief_from_float32.tif')
-    if ds is None:
-        return 'fail'
+    assert ds is not None
 
-    if ds.GetRasterBand(1).Checksum() != 55009:
-        print(ds.GetRasterBand(1).Checksum())
-        gdaltest.post_reason('Bad checksum')
-        return 'fail'
+    assert ds.GetRasterBand(1).Checksum() == 55009, 'Bad checksum'
 
-    if ds.GetRasterBand(2).Checksum() != 37543:
-        print(ds.GetRasterBand(2).Checksum())
-        gdaltest.post_reason('Bad checksum')
-        return 'fail'
+    assert ds.GetRasterBand(2).Checksum() == 37543, 'Bad checksum'
 
-    if ds.GetRasterBand(3).Checksum() != 47711:
-        print(ds.GetRasterBand(3).Checksum())
-        gdaltest.post_reason('Bad checksum')
-        return 'fail'
+    assert ds.GetRasterBand(3).Checksum() == 47711, 'Bad checksum'
 
     ds = None
 
@@ -524,23 +416,13 @@ def test_gdaldem_color_relief_png():
 
     gdaltest.runexternal(test_cli_utilities.get_gdaldem_path() + ' color-relief -of PNG ../gdrivers/data/n43.dt0 data/color_file.txt tmp/n43_colorrelief.png')
     ds = gdal.Open('tmp/n43_colorrelief.png')
-    if ds is None:
-        return 'fail'
+    assert ds is not None
 
-    if ds.GetRasterBand(1).Checksum() != 55009:
-        print(ds.GetRasterBand(1).Checksum())
-        gdaltest.post_reason('Bad checksum')
-        return 'fail'
+    assert ds.GetRasterBand(1).Checksum() == 55009, 'Bad checksum'
 
-    if ds.GetRasterBand(2).Checksum() != 37543:
-        print(ds.GetRasterBand(2).Checksum())
-        gdaltest.post_reason('Bad checksum')
-        return 'fail'
+    assert ds.GetRasterBand(2).Checksum() == 37543, 'Bad checksum'
 
-    if ds.GetRasterBand(3).Checksum() != 47711:
-        print(ds.GetRasterBand(3).Checksum())
-        gdaltest.post_reason('Bad checksum')
-        return 'fail'
+    assert ds.GetRasterBand(3).Checksum() == 47711, 'Bad checksum'
 
     ds = None
 
@@ -558,23 +440,13 @@ def test_gdaldem_color_relief_from_float32_to_png():
 
     gdaltest.runexternal(test_cli_utilities.get_gdaldem_path() + ' color-relief -of PNG tmp/n43_float32.tif data/color_file.txt tmp/n43_colorrelief_from_float32.png')
     ds = gdal.Open('tmp/n43_colorrelief_from_float32.png')
-    if ds is None:
-        return 'fail'
+    assert ds is not None
 
-    if ds.GetRasterBand(1).Checksum() != 55009:
-        print(ds.GetRasterBand(1).Checksum())
-        gdaltest.post_reason('Bad checksum')
-        return 'fail'
+    assert ds.GetRasterBand(1).Checksum() == 55009, 'Bad checksum'
 
-    if ds.GetRasterBand(2).Checksum() != 37543:
-        print(ds.GetRasterBand(2).Checksum())
-        gdaltest.post_reason('Bad checksum')
-        return 'fail'
+    assert ds.GetRasterBand(2).Checksum() == 37543, 'Bad checksum'
 
-    if ds.GetRasterBand(3).Checksum() != 47711:
-        print(ds.GetRasterBand(3).Checksum())
-        gdaltest.post_reason('Bad checksum')
-        return 'fail'
+    assert ds.GetRasterBand(3).Checksum() == 47711, 'Bad checksum'
 
     ds = None
 
@@ -590,23 +462,13 @@ def test_gdaldem_color_relief_nearest_color_entry():
 
     gdaltest.runexternal(test_cli_utilities.get_gdaldem_path() + ' color-relief -nearest_color_entry ../gdrivers/data/n43.dt0 data/color_file.txt tmp/n43_colorrelief_nearest.tif')
     ds = gdal.Open('tmp/n43_colorrelief_nearest.tif')
-    if ds is None:
-        return 'fail'
+    assert ds is not None
 
-    if ds.GetRasterBand(1).Checksum() != 57296:
-        print(ds.GetRasterBand(1).Checksum())
-        gdaltest.post_reason('Bad checksum')
-        return 'fail'
+    assert ds.GetRasterBand(1).Checksum() == 57296, 'Bad checksum'
 
-    if ds.GetRasterBand(2).Checksum() != 42926:
-        print(ds.GetRasterBand(2).Checksum())
-        gdaltest.post_reason('Bad checksum')
-        return 'fail'
+    assert ds.GetRasterBand(2).Checksum() == 42926, 'Bad checksum'
 
-    if ds.GetRasterBand(3).Checksum() != 47181:
-        print(ds.GetRasterBand(3).Checksum())
-        gdaltest.post_reason('Bad checksum')
-        return 'fail'
+    assert ds.GetRasterBand(3).Checksum() == 47181, 'Bad checksum'
 
     ds = None
 
@@ -622,23 +484,13 @@ def test_gdaldem_color_relief_nearest_color_entry_vrt():
 
     gdaltest.runexternal(test_cli_utilities.get_gdaldem_path() + ' color-relief -of VRT -nearest_color_entry ../gdrivers/data/n43.dt0 data/color_file.txt tmp/n43_colorrelief_nearest.vrt')
     ds = gdal.Open('tmp/n43_colorrelief_nearest.vrt')
-    if ds is None:
-        return 'fail'
+    assert ds is not None
 
-    if ds.GetRasterBand(1).Checksum() != 57296:
-        print(ds.GetRasterBand(1).Checksum())
-        gdaltest.post_reason('Bad checksum')
-        return 'fail'
+    assert ds.GetRasterBand(1).Checksum() == 57296, 'Bad checksum'
 
-    if ds.GetRasterBand(2).Checksum() != 42926:
-        print(ds.GetRasterBand(2).Checksum())
-        gdaltest.post_reason('Bad checksum')
-        return 'fail'
+    assert ds.GetRasterBand(2).Checksum() == 42926, 'Bad checksum'
 
-    if ds.GetRasterBand(3).Checksum() != 47181:
-        print(ds.GetRasterBand(3).Checksum())
-        gdaltest.post_reason('Bad checksum')
-        return 'fail'
+    assert ds.GetRasterBand(3).Checksum() == 47181, 'Bad checksum'
 
     ds = None
 
@@ -676,9 +528,7 @@ def test_gdaldem_color_relief_nodata_nan():
 
     import struct
     val = struct.unpack('B' * 4, val)
-    if val != (0, 0, 0, 1):
-        print(val)
-        return 'fail'
+    assert val == (0, 0, 0, 1)
 
     os.unlink('tmp/nodata_nan_src.asc')
     os.unlink('tmp/nodata_nan_plt.txt')
@@ -722,9 +572,7 @@ def test_gdaldem_color_relief_repeated_entry():
 
     import struct
     val = struct.unpack('B' * 6, val)
-    if val != (1, 1, 5, 10, 10, 25):
-        print(val)
-        return 'fail'
+    assert val == (1, 1, 5, 10, 10, 25)
 
     gdaltest.runexternal(test_cli_utilities.get_gdaldem_path() + ' color-relief tmp/test_gdaldem_color_relief_repeated_entry.asc tmp/test_gdaldem_color_relief_repeated_entry.txt tmp/test_gdaldem_color_relief_repeated_entry_out.vrt -of VRT')
 
@@ -733,9 +581,7 @@ def test_gdaldem_color_relief_repeated_entry():
     ds = None
 
     val = struct.unpack('B' * 6, val)
-    if val != (1, 1, 5, 10, 10, 25):
-        print(val)
-        return 'fail'
+    assert val == (1, 1, 5, 10, 10, 25)
 
     os.unlink('tmp/test_gdaldem_color_relief_repeated_entry.asc')
     os.unlink('tmp/test_gdaldem_color_relief_repeated_entry.txt')
diff --git a/autotest/utilities/test_gdaldem_lib.py b/autotest/utilities/test_gdaldem_lib.py
index 68b394f04f05..23d15c209a16 100755
--- a/autotest/utilities/test_gdaldem_lib.py
+++ b/autotest/utilities/test_gdaldem_lib.py
@@ -36,6 +36,7 @@
 from osgeo import gdal
 from osgeo import osr
 import gdaltest
+import pytest
 
 ###############################################################################
 # Test gdaldem hillshade
@@ -45,30 +46,20 @@ def test_gdaldem_lib_hillshade():
 
     src_ds = gdal.Open('../gdrivers/data/n43.dt0')
     ds = gdal.DEMProcessing('', src_ds, 'hillshade', format='MEM', scale=111120, zFactor=30)
-    if ds is None:
-        return 'fail'
+    assert ds is not None
 
     cs = ds.GetRasterBand(1).Checksum()
-    if cs != 45587:
-        gdaltest.post_reason('Bad checksum')
-        print(cs)
-        return 'fail'
+    assert cs == 45587, 'Bad checksum'
 
     src_gt = src_ds.GetGeoTransform()
     dst_gt = ds.GetGeoTransform()
     for i in range(6):
-        if abs(src_gt[i] - dst_gt[i]) > 1e-10:
-            gdaltest.post_reason('Bad geotransform')
-            return 'fail'
+        assert abs(src_gt[i] - dst_gt[i]) <= 1e-10, 'Bad geotransform'
 
     dst_wkt = ds.GetProjectionRef()
-    if dst_wkt.find('AUTHORITY["EPSG","4326"]') == -1:
-        gdaltest.post_reason('Bad projection')
-        return 'fail'
+    assert dst_wkt.find('AUTHORITY["EPSG","4326"]') != -1, 'Bad projection'
 
-    if ds.GetRasterBand(1).GetNoDataValue() != 0:
-        gdaltest.post_reason('Bad nodata value')
-        return 'fail'
+    assert ds.GetRasterBand(1).GetNoDataValue() == 0, 'Bad nodata value'
 
     src_ds = None
     ds = None
@@ -83,30 +74,20 @@ def test_gdaldem_lib_hillshade_float():
 
     src_ds = gdal.Translate('', gdal.Open('../gdrivers/data/n43.dt0'), format='MEM', outputType=gdal.GDT_Float32)
     ds = gdal.DEMProcessing('', src_ds, 'hillshade', format='MEM', scale=111120, zFactor=30)
-    if ds is None:
-        return 'fail'
+    assert ds is not None
 
     cs = ds.GetRasterBand(1).Checksum()
-    if cs != 45587:
-        gdaltest.post_reason('Bad checksum')
-        print(cs)
-        return 'fail'
+    assert cs == 45587, 'Bad checksum'
 
     src_gt = src_ds.GetGeoTransform()
     dst_gt = ds.GetGeoTransform()
     for i in range(6):
-        if abs(src_gt[i] - dst_gt[i]) > 1e-10:
-            gdaltest.post_reason('Bad geotransform')
-            return 'fail'
+        assert abs(src_gt[i] - dst_gt[i]) <= 1e-10, 'Bad geotransform'
 
     dst_wkt = ds.GetProjectionRef()
-    if dst_wkt.find('AUTHORITY["EPSG","4326"]') == -1:
-        gdaltest.post_reason('Bad projection')
-        return 'fail'
+    assert dst_wkt.find('AUTHORITY["EPSG","4326"]') != -1, 'Bad projection'
 
-    if ds.GetRasterBand(1).GetNoDataValue() != 0:
-        gdaltest.post_reason('Bad nodata value')
-        return 'fail'
+    assert ds.GetRasterBand(1).GetNoDataValue() == 0, 'Bad nodata value'
 
     src_ds = None
     ds = None
@@ -121,30 +102,20 @@ def test_gdaldem_lib_hillshade_float_png():
 
     src_ds = gdal.Translate('', gdal.Open('../gdrivers/data/n43.dt0'), format='MEM', outputType=gdal.GDT_Float32)
     ds = gdal.DEMProcessing('/vsimem/test_gdaldem_lib_hillshade_float_png.png', src_ds, 'hillshade', format='PNG', scale=111120, zFactor=30)
-    if ds is None:
-        return 'fail'
+    assert ds is not None
 
     cs = ds.GetRasterBand(1).Checksum()
-    if cs != 45587:
-        gdaltest.post_reason('Bad checksum')
-        print(cs)
-        return 'fail'
+    assert cs == 45587, 'Bad checksum'
 
     src_gt = src_ds.GetGeoTransform()
     dst_gt = ds.GetGeoTransform()
     for i in range(6):
-        if abs(src_gt[i] - dst_gt[i]) > 1e-10:
-            gdaltest.post_reason('Bad geotransform')
-            return 'fail'
+        assert abs(src_gt[i] - dst_gt[i]) <= 1e-10, 'Bad geotransform'
 
     dst_wkt = ds.GetProjectionRef()
-    if dst_wkt.find('AUTHORITY["EPSG","4326"]') == -1:
-        gdaltest.post_reason('Bad projection')
-        return 'fail'
+    assert dst_wkt.find('AUTHORITY["EPSG","4326"]') != -1, 'Bad projection'
 
-    if ds.GetRasterBand(1).GetNoDataValue() != 0:
-        gdaltest.post_reason('Bad nodata value')
-        return 'fail'
+    assert ds.GetRasterBand(1).GetNoDataValue() == 0, 'Bad nodata value'
 
     src_ds = None
     ds = None
@@ -161,30 +132,20 @@ def test_gdaldem_lib_hillshade_combined():
 
     src_ds = gdal.Open('../gdrivers/data/n43.dt0')
     ds = gdal.DEMProcessing('', src_ds, 'hillshade', format='MEM', combined=True, scale=111120, zFactor=30)
-    if ds is None:
-        return 'fail'
+    assert ds is not None
 
     cs = ds.GetRasterBand(1).Checksum()
-    if cs != 43876:
-        gdaltest.post_reason('Bad checksum')
-        print(cs)
-        return 'fail'
+    assert cs == 43876, 'Bad checksum'
 
     src_gt = src_ds.GetGeoTransform()
     dst_gt = ds.GetGeoTransform()
     for i in range(6):
-        if abs(src_gt[i] - dst_gt[i]) > 1e-10:
-            gdaltest.post_reason('Bad geotransform')
-            return 'fail'
+        assert abs(src_gt[i] - dst_gt[i]) <= 1e-10, 'Bad geotransform'
 
     dst_wkt = ds.GetProjectionRef()
-    if dst_wkt.find('AUTHORITY["EPSG","4326"]') == -1:
-        gdaltest.post_reason('Bad projection')
-        return 'fail'
+    assert dst_wkt.find('AUTHORITY["EPSG","4326"]') != -1, 'Bad projection'
 
-    if ds.GetRasterBand(1).GetNoDataValue() != 0:
-        gdaltest.post_reason('Bad nodata value')
-        return 'fail'
+    assert ds.GetRasterBand(1).GetNoDataValue() == 0, 'Bad nodata value'
 
     src_ds = None
     ds = None
@@ -199,30 +160,20 @@ def test_gdaldem_lib_hillshade_ZevenbergenThorne():
 
     src_ds = gdal.Open('../gdrivers/data/n43.dt0')
     ds = gdal.DEMProcessing('', src_ds, 'hillshade', format='MEM', alg='ZevenbergenThorne', scale=111120, zFactor=30)
-    if ds is None:
-        return 'fail'
+    assert ds is not None
 
     cs = ds.GetRasterBand(1).Checksum()
-    if cs != 46544:
-        gdaltest.post_reason('Bad checksum')
-        print(cs)
-        return 'fail'
+    assert cs == 46544, 'Bad checksum'
 
     src_gt = src_ds.GetGeoTransform()
     dst_gt = ds.GetGeoTransform()
     for i in range(6):
-        if abs(src_gt[i] - dst_gt[i]) > 1e-10:
-            gdaltest.post_reason('Bad geotransform')
-            return 'fail'
+        assert abs(src_gt[i] - dst_gt[i]) <= 1e-10, 'Bad geotransform'
 
     dst_wkt = ds.GetProjectionRef()
-    if dst_wkt.find('AUTHORITY["EPSG","4326"]') == -1:
-        gdaltest.post_reason('Bad projection')
-        return 'fail'
+    assert dst_wkt.find('AUTHORITY["EPSG","4326"]') != -1, 'Bad projection'
 
-    if ds.GetRasterBand(1).GetNoDataValue() != 0:
-        gdaltest.post_reason('Bad nodata value')
-        return 'fail'
+    assert ds.GetRasterBand(1).GetNoDataValue() == 0, 'Bad nodata value'
 
     src_ds = None
     ds = None
@@ -237,30 +188,20 @@ def test_gdaldem_lib_hillshade_ZevenbergenThorne_combined():
 
     src_ds = gdal.Open('../gdrivers/data/n43.dt0')
     ds = gdal.DEMProcessing('', src_ds, 'hillshade', format='MEM', alg='ZevenbergenThorne', combined=True, scale=111120, zFactor=30)
-    if ds is None:
-        return 'fail'
+    assert ds is not None
 
     cs = ds.GetRasterBand(1).Checksum()
-    if cs != 43112:
-        gdaltest.post_reason('Bad checksum')
-        print(cs)
-        return 'fail'
+    assert cs == 43112, 'Bad checksum'
 
     src_gt = src_ds.GetGeoTransform()
     dst_gt = ds.GetGeoTransform()
     for i in range(6):
-        if abs(src_gt[i] - dst_gt[i]) > 1e-10:
-            gdaltest.post_reason('Bad geotransform')
-            return 'fail'
+        assert abs(src_gt[i] - dst_gt[i]) <= 1e-10, 'Bad geotransform'
 
     dst_wkt = ds.GetProjectionRef()
-    if dst_wkt.find('AUTHORITY["EPSG","4326"]') == -1:
-        gdaltest.post_reason('Bad projection')
-        return 'fail'
+    assert dst_wkt.find('AUTHORITY["EPSG","4326"]') != -1, 'Bad projection'
 
-    if ds.GetRasterBand(1).GetNoDataValue() != 0:
-        gdaltest.post_reason('Bad nodata value')
-        return 'fail'
+    assert ds.GetRasterBand(1).GetNoDataValue() == 0, 'Bad nodata value'
 
     src_ds = None
     ds = None
@@ -275,14 +216,10 @@ def test_gdaldem_lib_hillshade_compute_edges():
 
     src_ds = gdal.Open('../gdrivers/data/n43.dt0')
     ds = gdal.DEMProcessing('', src_ds, 'hillshade', format='MEM', computeEdges=True, scale=111120, zFactor=30)
-    if ds is None:
-        return 'fail'
+    assert ds is not None
 
     cs = ds.GetRasterBand(1).Checksum()
-    if cs != 50239:
-        gdaltest.post_reason('Bad checksum')
-        print(cs)
-        return 'fail'
+    assert cs == 50239, 'Bad checksum'
 
     ds = None
 
@@ -296,14 +233,10 @@ def test_gdaldem_lib_hillshade_compute_edges_float():
 
     src_ds = gdal.Translate('', gdal.Open('../gdrivers/data/n43.dt0'), format='MEM', outputType=gdal.GDT_Float32)
     ds = gdal.DEMProcessing('', src_ds, 'hillshade', format='MEM', computeEdges=True, scale=111120, zFactor=30)
-    if ds is None:
-        return 'fail'
+    assert ds is not None
 
     cs = ds.GetRasterBand(1).Checksum()
-    if cs != 50239:
-        gdaltest.post_reason('Bad checksum')
-        print(cs)
-        return 'fail'
+    assert cs == 50239, 'Bad checksum'
 
     ds = None
 
@@ -332,12 +265,9 @@ def test_gdaldem_lib_hillshade_azimuth():
 
     # Light from the east
     ds = gdal.DEMProcessing('', src_ds, 'hillshade', format='MEM', azimuth=90, scale=111120, zFactor=100)
-    if ds is None:
-        return 'fail'
+    assert ds is not None
     ds_ref = gdal.Open('data/pyramid_shaded_ref.tif')
-    if gdaltest.compare_ds(ds, ds_ref, verbose=1) > 1:
-        gdaltest.post_reason('Bad checksum')
-        return 'fail'
+    assert gdaltest.compare_ds(ds, ds_ref, verbose=1) <= 1, 'Bad checksum'
     ds = None
     ds_ref = None
 
@@ -351,14 +281,10 @@ def test_gdaldem_lib_hillshade_multidirectional():
 
     src_ds = gdal.Open('../gdrivers/data/n43.dt0')
     ds = gdal.DEMProcessing('', src_ds, 'hillshade', format='MEM', multiDirectional=True, computeEdges=True, scale=111120, zFactor=30)
-    if ds is None:
-        return 'fail'
+    assert ds is not None
 
     cs = ds.GetRasterBand(1).Checksum()
-    if cs != 51784:
-        gdaltest.post_reason('Bad checksum')
-        print(cs)
-        return 'fail'
+    assert cs == 51784, 'Bad checksum'
 
     ds = None
 
@@ -372,14 +298,10 @@ def test_gdaldem_lib_hillshade_multidirectional_ZevenbergenThorne():
 
     src_ds = gdal.Open('../gdrivers/data/n43.dt0')
     ds = gdal.DEMProcessing('', src_ds, 'hillshade', format='MEM', alg='ZevenbergenThorne', multiDirectional=True, computeEdges=True, scale=111120, zFactor=30)
-    if ds is None:
-        return 'fail'
+    assert ds is not None
 
     cs = ds.GetRasterBand(1).Checksum()
-    if cs != 50860:
-        gdaltest.post_reason('Bad checksum')
-        print(cs)
-        return 'fail'
+    assert cs == 50860, 'Bad checksum'
 
     ds = None
 
@@ -393,40 +315,24 @@ def test_gdaldem_lib_color_relief():
 
     src_ds = gdal.Open('../gdrivers/data/n43.dt0')
     ds = gdal.DEMProcessing('', src_ds, 'color-relief', format='MEM', colorFilename='data/color_file.txt')
-    if ds is None:
-        return 'fail'
+    assert ds is not None
 
-    if ds.GetRasterBand(1).Checksum() != 55009:
-        print(ds.GetRasterBand(1).Checksum())
-        gdaltest.post_reason('Bad checksum')
-        return 'fail'
+    assert ds.GetRasterBand(1).Checksum() == 55009, 'Bad checksum'
 
-    if ds.GetRasterBand(2).Checksum() != 37543:
-        print(ds.GetRasterBand(2).Checksum())
-        gdaltest.post_reason('Bad checksum')
-        return 'fail'
+    assert ds.GetRasterBand(2).Checksum() == 37543, 'Bad checksum'
 
-    if ds.GetRasterBand(3).Checksum() != 47711:
-        print(ds.GetRasterBand(3).Checksum())
-        gdaltest.post_reason('Bad checksum')
-        return 'fail'
+    assert ds.GetRasterBand(3).Checksum() == 47711, 'Bad checksum'
 
     src_gt = src_ds.GetGeoTransform()
     dst_gt = ds.GetGeoTransform()
     for i in range(6):
-        if abs(src_gt[i] - dst_gt[i]) > 1e-10:
-            gdaltest.post_reason('Bad geotransform')
-            return 'fail'
+        assert abs(src_gt[i] - dst_gt[i]) <= 1e-10, 'Bad geotransform'
 
     dst_wkt = ds.GetProjectionRef()
-    if dst_wkt.find('AUTHORITY["EPSG","4326"]') == -1:
-        gdaltest.post_reason('Bad projection')
-        return 'fail'
+    assert dst_wkt.find('AUTHORITY["EPSG","4326"]') != -1, 'Bad projection'
 
     ds = gdal.DEMProcessing('', src_ds, 'color-relief', format='MEM', colorFilename='data/color_file.txt', addAlpha=True)
-    if ds.RasterCount != 4:
-        gdaltest.post_reason('Bad RasterCount')
-        return 'fail'
+    assert ds.RasterCount == 4, 'Bad RasterCount'
 
     src_ds = None
     ds = None
@@ -441,14 +347,10 @@ def test_gdaldem_lib_tpi():
 
     src_ds = gdal.Open('../gdrivers/data/n43.dt0')
     ds = gdal.DEMProcessing('', src_ds, 'tpi', format='MEM')
-    if ds is None:
-        return 'fail'
+    assert ds is not None
 
     cs = ds.GetRasterBand(1).Checksum()
-    if cs != 60504:
-        gdaltest.post_reason('Bad checksum')
-        print(cs)
-        return 'fail'
+    assert cs == 60504, 'Bad checksum'
 
     ds = None
 
@@ -462,14 +364,10 @@ def test_gdaldem_lib_tri():
 
     src_ds = gdal.Open('../gdrivers/data/n43.dt0')
     ds = gdal.DEMProcessing('', src_ds, 'tri', format='MEM')
-    if ds is None:
-        return 'fail'
+    assert ds is not None
 
     cs = ds.GetRasterBand(1).Checksum()
-    if cs != 61143:
-        gdaltest.post_reason('Bad checksum')
-        print(cs)
-        return 'fail'
+    assert cs == 61143, 'Bad checksum'
 
     ds = None
 
@@ -483,14 +381,10 @@ def test_gdaldem_lib_roughness():
 
     src_ds = gdal.Open('../gdrivers/data/n43.dt0')
     ds = gdal.DEMProcessing('', src_ds, 'roughness', format='MEM')
-    if ds is None:
-        return 'fail'
+    assert ds is not None
 
     cs = ds.GetRasterBand(1).Checksum()
-    if cs != 38624:
-        gdaltest.post_reason('Bad checksum')
-        print(cs)
-        return 'fail'
+    assert cs == 38624, 'Bad checksum'
 
     ds = None
 
@@ -504,14 +398,10 @@ def test_gdaldem_lib_slope_ZevenbergenThorne():
 
     src_ds = gdal.Open('../gdrivers/data/n43.dt0')
     ds = gdal.DEMProcessing('', src_ds, 'slope', format='MEM', alg='ZevenbergenThorne', scale=111120, zFactor=30)
-    if ds is None:
-        return 'fail'
+    assert ds is not None
 
     cs = ds.GetRasterBand(1).Checksum()
-    if cs != 64393:
-        gdaltest.post_reason('Bad checksum')
-        print(cs)
-        return 'fail'
+    assert cs == 64393, 'Bad checksum'
 
     return 'success'
 
@@ -523,14 +413,10 @@ def test_gdaldem_lib_aspect_ZevenbergenThorne():
 
     src_ds = gdal.Open('../gdrivers/data/n43.dt0')
     ds = gdal.DEMProcessing('', src_ds, 'aspect', format='MEM', alg='ZevenbergenThorne', scale=111120, zFactor=30)
-    if ds is None:
-        return 'fail'
+    assert ds is not None
 
     cs = ds.GetRasterBand(1).Checksum()
-    if cs != 50539:
-        gdaltest.post_reason('Bad checksum')
-        print(cs)
-        return 'fail'
+    assert cs == 50539, 'Bad checksum'
 
     return 'success'
 
@@ -554,14 +440,10 @@ def test_gdaldem_lib_nodata():
         src_ds.GetRasterBand(1).Fill(value)
 
         ds = gdal.DEMProcessing('', src_ds, 'hillshade', format='MEM')
-        if ds is None:
-            return 'fail'
+        assert ds is not None
 
         cs = ds.GetRasterBand(1).Checksum()
-        if cs != 0:
-            gdaltest.post_reason('Bad checksum')
-            print(cs)
-            return 'fail'
+        assert cs == 0, 'Bad checksum'
 
         src_ds = None
         ds = None
@@ -573,18 +455,14 @@ def test_gdaldem_lib_nodata():
     ds = gdal.DEMProcessing('', src_ds, 'hillshade', format='MEM')
     cs = ds.GetRasterBand(1).Checksum()
     if cs != 0:
-        gdaltest.post_reason('Bad checksum')
-        print(cs)
         print(ds.ReadAsArray())
-        return 'fail'
+        pytest.fail('Bad checksum')
 
     ds = gdal.DEMProcessing('', src_ds, 'hillshade', format='MEM', computeEdges=True)
     cs = ds.GetRasterBand(1).Checksum()
     if cs != 10:
-        gdaltest.post_reason('Bad checksum')
-        print(cs)
         print(ds.ReadAsArray())  # Should be 0 0 0 0 181 0 0 0 0
-        return 'fail'
+        pytest.fail('Bad checksum')
 
     # Same with floating point
     src_ds = gdal.GetDriverByName('MEM').Create('', 3, 3, 1, gdal.GDT_Float32)
@@ -594,18 +472,14 @@ def test_gdaldem_lib_nodata():
     ds = gdal.DEMProcessing('', src_ds, 'hillshade', format='MEM')
     cs = ds.GetRasterBand(1).Checksum()
     if cs != 0:
-        gdaltest.post_reason('Bad checksum')
-        print(cs)
         print(ds.ReadAsArray())
-        return 'fail'
+        pytest.fail('Bad checksum')
 
     ds = gdal.DEMProcessing('', src_ds, 'hillshade', format='MEM', computeEdges=True)
     cs = ds.GetRasterBand(1).Checksum()
     if cs != 10:
-        gdaltest.post_reason('Bad checksum')
-        print(cs)
         print(ds.ReadAsArray())  # Should be 0 0 0 0 181 0 0 0 0
-        return 'fail'
+        pytest.fail('Bad checksum')
 
     return 'success'
 
diff --git a/autotest/utilities/test_gdalinfo.py b/autotest/utilities/test_gdalinfo.py
index beff3af98e13..2e8fad3cff1a 100755
--- a/autotest/utilities/test_gdalinfo.py
+++ b/autotest/utilities/test_gdalinfo.py
@@ -47,12 +47,8 @@ def test_gdalinfo_1():
         return 'skip'
 
     (ret, err) = gdaltest.runexternal_out_and_err(test_cli_utilities.get_gdalinfo_path() + ' ../gcore/data/byte.tif')
-    if not (err is None or err == ''):
-        gdaltest.post_reason('got error/warning')
-        print(err)
-        return 'fail'
-    if ret.find('Driver: GTiff/GeoTIFF') == -1:
-        return 'fail'
+    assert (err is None or err == ''), 'got error/warning'
+    assert ret.find('Driver: GTiff/GeoTIFF') != -1
 
     return 'success'
 
@@ -65,8 +61,7 @@ def test_gdalinfo_2():
         return 'skip'
 
     ret = gdaltest.runexternal(test_cli_utilities.get_gdalinfo_path() + ' -checksum ../gcore/data/byte.tif')
-    if ret.find('Checksum=4672') == -1:
-        return 'fail'
+    assert ret.find('Checksum=4672') != -1
 
     return 'success'
 
@@ -79,12 +74,10 @@ def test_gdalinfo_3():
         return 'skip'
 
     ret = gdaltest.runexternal(test_cli_utilities.get_gdalinfo_path() + ' ../gcore/data/byte.tif')
-    if ret.find('Metadata') == -1:
-        return 'fail'
+    assert ret.find('Metadata') != -1
 
     ret = gdaltest.runexternal(test_cli_utilities.get_gdalinfo_path() + ' -nomd ../gcore/data/byte.tif')
-    if ret.find('Metadata') != -1:
-        return 'fail'
+    assert ret.find('Metadata') == -1
 
     return 'success'
 
@@ -97,12 +90,10 @@ def test_gdalinfo_4():
         return 'skip'
 
     ret = gdaltest.runexternal(test_cli_utilities.get_gdalinfo_path() + ' ../gdrivers/data/bug407.gif')
-    if ret.find('0: 255,255,255,255') == -1:
-        return 'fail'
+    assert ret.find('0: 255,255,255,255') != -1
 
     ret = gdaltest.runexternal(test_cli_utilities.get_gdalinfo_path() + ' -noct ../gdrivers/data/bug407.gif')
-    if ret.find('0: 255,255,255,255') != -1:
-        return 'fail'
+    assert ret.find('0: 255,255,255,255') == -1
 
     return 'success'
 
@@ -120,16 +111,10 @@ def test_gdalinfo_5():
         pass
 
     ret = gdaltest.runexternal(test_cli_utilities.get_gdalinfo_path() + ' ../gcore/data/byte.tif')
-    if ret.find('STATISTICS_MINIMUM=74') != -1:
-        gdaltest.post_reason('got wrong minimum.')
-        print(ret)
-        return 'fail'
+    assert ret.find('STATISTICS_MINIMUM=74') == -1, 'got wrong minimum.'
 
     ret = gdaltest.runexternal(test_cli_utilities.get_gdalinfo_path() + ' -stats ../gcore/data/byte.tif')
-    if ret.find('STATISTICS_MINIMUM=74') == -1:
-        gdaltest.post_reason('got wrong minimum (2).')
-        print(ret)
-        return 'fail'
+    assert ret.find('STATISTICS_MINIMUM=74') != -1, 'got wrong minimum (2).'
 
     # We will blow an exception if the file does not exist now!
     os.remove('../gcore/data/byte.tif.aux.xml')
@@ -145,10 +130,8 @@ def test_gdalinfo_6():
         return 'skip'
 
     ret = gdaltest.runexternal(test_cli_utilities.get_gdalinfo_path() + ' ../gdrivers/data/int.img')
-    if ret.find('Overviews') == -1:
-        return 'fail'
-    if ret.find('GDALRasterAttributeTable') == -1:
-        return 'fail'
+    assert ret.find('Overviews') != -1
+    assert ret.find('GDALRasterAttributeTable') != -1
 
     return 'success'
 
@@ -161,21 +144,15 @@ def test_gdalinfo_7():
         return 'skip'
 
     ret = gdaltest.runexternal(test_cli_utilities.get_gdalinfo_path() + ' ../gcore/data/gcps.vrt')
-    if ret.find('GCP Projection =') == -1:
-        return 'fail'
-    if ret.find('PROJCS["NAD27 / UTM zone 11N"') == -1:
-        return 'fail'
-    if ret.find('(100,100) -> (446720,3745320,0)') == -1:
-        return 'fail'
+    assert ret.find('GCP Projection =') != -1
+    assert ret.find('PROJCS["NAD27 / UTM zone 11N"') != -1
+    assert ret.find('(100,100) -> (446720,3745320,0)') != -1
 
     # Same but with -nogcps
     ret = gdaltest.runexternal(test_cli_utilities.get_gdalinfo_path() + ' -nogcp ../gcore/data/gcps.vrt')
-    if ret.find('GCP Projection =') != -1:
-        return 'fail'
-    if ret.find('PROJCS["NAD27 / UTM zone 11N"') != -1:
-        return 'fail'
-    if ret.find('(100,100) -> (446720,3745320,0)') != -1:
-        return 'fail'
+    assert ret.find('GCP Projection =') == -1
+    assert ret.find('PROJCS["NAD27 / UTM zone 11N"') == -1
+    assert ret.find('(100,100) -> (446720,3745320,0)') == -1
 
     return 'success'
 
@@ -193,16 +170,12 @@ def test_gdalinfo_8():
         pass
 
     ret = gdaltest.runexternal(test_cli_utilities.get_gdalinfo_path() + ' ../gcore/data/byte.tif')
-    if ret.find('0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 1 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 6 0 0 0 0 0 0 0 0 37 0 0 0 0 0 0 0 57 0 0 0 0 0 0 0 62 0 0 0 0 0 0 0 66 0 0 0 0 0 0 0 0 72 0 0 0 0 0 0 0 31 0 0 0 0 0 0 0 24 0 0 0 0 0 0 0 12 0 0 0 0 0 0 0 0 7 0 0 0 0 0 0 0 12 0 0 0 0 0 0 0 5 0 0 0 0 0 0 0 3 0 0 0 0 0 0 0 1 0 0 0 0 0 0 0 0 2 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 1 0 0 0 0 0 0 0 1') != -1:
-        gdaltest.post_reason('did not expect histogram.')
-        print(ret)
-        return 'fail'
+    assert ret.find('0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 1 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 6 0 0 0 0 0 0 0 0 37 0 0 0 0 0 0 0 57 0 0 0 0 0 0 0 62 0 0 0 0 0 0 0 66 0 0 0 0 0 0 0 0 72 0 0 0 0 0 0 0 31 0 0 0 0 0 0 0 24 0 0 0 0 0 0 0 12 0 0 0 0 0 0 0 0 7 0 0 0 0 0 0 0 12 0 0 0 0 0 0 0 5 0 0 0 0 0 0 0 3 0 0 0 0 0 0 0 1 0 0 0 0 0 0 0 0 2 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 1 0 0 0 0 0 0 0 1') == -1, \
+        'did not expect histogram.'
 
     ret = gdaltest.runexternal(test_cli_utilities.get_gdalinfo_path() + ' -hist ../gcore/data/byte.tif')
-    if ret.find('0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 1 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 6 0 0 0 0 0 0 0 0 37 0 0 0 0 0 0 0 57 0 0 0 0 0 0 0 62 0 0 0 0 0 0 0 66 0 0 0 0 0 0 0 0 72 0 0 0 0 0 0 0 31 0 0 0 0 0 0 0 24 0 0 0 0 0 0 0 12 0 0 0 0 0 0 0 0 7 0 0 0 0 0 0 0 12 0 0 0 0 0 0 0 5 0 0 0 0 0 0 0 3 0 0 0 0 0 0 0 1 0 0 0 0 0 0 0 0 2 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 1 0 0 0 0 0 0 0 1') == -1:
-        gdaltest.post_reason('did not get expected histogram.')
-        print(ret)
-        return 'fail'
+    assert ret.find('0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 1 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 6 0 0 0 0 0 0 0 0 37 0 0 0 0 0 0 0 57 0 0 0 0 0 0 0 62 0 0 0 0 0 0 0 66 0 0 0 0 0 0 0 0 72 0 0 0 0 0 0 0 31 0 0 0 0 0 0 0 24 0 0 0 0 0 0 0 12 0 0 0 0 0 0 0 0 7 0 0 0 0 0 0 0 12 0 0 0 0 0 0 0 5 0 0 0 0 0 0 0 3 0 0 0 0 0 0 0 1 0 0 0 0 0 0 0 0 2 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 1 0 0 0 0 0 0 0 1') != -1, \
+        'did not get expected histogram.'
 
     # We will blow an exception if the file does not exist now!
     os.remove('../gcore/data/byte.tif.aux.xml')
@@ -218,16 +191,10 @@ def test_gdalinfo_9():
         return 'skip'
 
     ret = gdaltest.runexternal(test_cli_utilities.get_gdalinfo_path() + ' ../gdrivers/data/fake_nsif.ntf')
-    if ret.find('BLOCKA=010000001000000000') != -1:
-        gdaltest.post_reason('got unexpected extra MD.')
-        print(ret)
-        return 'fail'
+    assert ret.find('BLOCKA=010000001000000000') == -1, 'got unexpected extra MD.'
 
     ret = gdaltest.runexternal(test_cli_utilities.get_gdalinfo_path() + ' -mdd TRE ../gdrivers/data/fake_nsif.ntf')
-    if ret.find('BLOCKA=010000001000000000') == -1:
-        gdaltest.post_reason('did not get extra MD.')
-        print(ret)
-        return 'fail'
+    assert ret.find('BLOCKA=010000001000000000') != -1, 'did not get extra MD.'
 
     return 'success'
 
@@ -240,12 +207,10 @@ def test_gdalinfo_10():
         return 'skip'
 
     ret = gdaltest.runexternal(test_cli_utilities.get_gdalinfo_path() + ' ../gcore/data/byte.tif')
-    if ret.find('Computed Min/Max=74.000,255.000') != -1:
-        return 'fail'
+    assert ret.find('Computed Min/Max=74.000,255.000') == -1
 
     ret = gdaltest.runexternal(test_cli_utilities.get_gdalinfo_path() + ' -mm ../gcore/data/byte.tif')
-    if ret.find('Computed Min/Max=74.000,255.000') == -1:
-        return 'fail'
+    assert ret.find('Computed Min/Max=74.000,255.000') != -1
 
     return 'success'
 
@@ -259,9 +224,7 @@ def test_gdalinfo_11():
         return 'skip'
 
     ret = gdaltest.runexternal(test_cli_utilities.get_gdalinfo_path() + ' --version', check_memleak=False)
-    if ret.find(gdal.VersionInfo('--version')) != 0:
-        print(ret)
-        return 'fail'
+    assert ret.find(gdal.VersionInfo('--version')) == 0
 
     return 'success'
 
@@ -275,9 +238,7 @@ def test_gdalinfo_12():
 
     ret = gdaltest.runexternal(test_cli_utilities.get_gdalinfo_path() + ' --build', check_memleak=False)
     ret = ret.replace('\r\n', '\n')
-    if ret.find(gdal.VersionInfo('BUILD_INFO')) != 0:
-        print(ret)
-        return 'fail'
+    assert ret.find(gdal.VersionInfo('BUILD_INFO')) == 0
 
     return 'success'
 
@@ -309,9 +270,7 @@ def test_gdalinfo_14():
         return 'skip'
 
     (_, err) = gdaltest.runexternal_out_and_err(test_cli_utilities.get_gdalinfo_path() + ' --config', check_memleak=False)
-    if err.find('--config option given without a key and value argument') < 0:
-        print(err)
-        return 'fail'
+    assert err.find('--config option given without a key and value argument') >= 0
 
     return 'success'
 
@@ -324,9 +283,7 @@ def test_gdalinfo_15():
         return 'skip'
 
     (_, err) = gdaltest.runexternal_out_and_err(test_cli_utilities.get_gdalinfo_path() + ' --mempreload', check_memleak=False)
-    if err.find('--mempreload option given without directory path') < 0:
-        print(err)
-        return 'fail'
+    assert err.find('--mempreload option given without directory path') >= 0
 
     return 'success'
 
@@ -339,9 +296,7 @@ def test_gdalinfo_16():
         return 'skip'
 
     (ret, _) = gdaltest.runexternal_out_and_err(test_cli_utilities.get_gdalinfo_path() + ' --debug on --mempreload ../gcore/data /vsimem/byte.tif', check_memleak=False)
-    if ret.find('Driver: GTiff/GeoTIFF') != 0:
-        print(ret)
-        return 'fail'
+    assert ret.find('Driver: GTiff/GeoTIFF') == 0
 
     return 'success'
 
@@ -354,9 +309,7 @@ def test_gdalinfo_17():
         return 'skip'
 
     (_, err) = gdaltest.runexternal_out_and_err(test_cli_utilities.get_gdalinfo_path() + ' --debug', check_memleak=False)
-    if err.find('--debug option given without debug level') < 0:
-        print(err)
-        return 'fail'
+    assert err.find('--debug option given without debug level') >= 0
 
     return 'success'
 
@@ -369,14 +322,10 @@ def test_gdalinfo_18():
         return 'skip'
 
     (_, err) = gdaltest.runexternal_out_and_err(test_cli_utilities.get_gdalinfo_path() + ' --optfile', check_memleak=False)
-    if err.find('--optfile option given without filename') < 0:
-        print(err)
-        return 'fail'
+    assert err.find('--optfile option given without filename') >= 0
 
     (_, err) = gdaltest.runexternal_out_and_err(test_cli_utilities.get_gdalinfo_path() + ' --optfile /foo/bar', check_memleak=False)
-    if err.find('Unable to open optfile') < 0:
-        print(err)
-        return 'fail'
+    assert err.find('Unable to open optfile') >= 0
 
     return 'success'
 
@@ -394,9 +343,7 @@ def test_gdalinfo_19():
     f.close()
     ret = gdaltest.runexternal(test_cli_utilities.get_gdalinfo_path() + ' --optfile tmp/optfile.txt', check_memleak=False)
     os.unlink('tmp/optfile.txt')
-    if ret.find('Driver: GTiff/GeoTIFF') != 0:
-        print(ret)
-        return 'fail'
+    assert ret.find('Driver: GTiff/GeoTIFF') == 0
 
     return 'success'
 
@@ -409,9 +356,7 @@ def test_gdalinfo_20():
         return 'skip'
 
     ret = gdaltest.runexternal(test_cli_utilities.get_gdalinfo_path() + ' --formats', check_memleak=False)
-    if ret.find('GTiff -raster- (rw+vs): GeoTIFF') < 0:
-        print(ret)
-        return 'fail'
+    assert ret.find('GTiff -raster- (rw+vs): GeoTIFF') >= 0
 
     return 'success'
 
@@ -424,14 +369,10 @@ def test_gdalinfo_21():
         return 'skip'
 
     (_, err) = gdaltest.runexternal_out_and_err(test_cli_utilities.get_gdalinfo_path() + ' --format', check_memleak=False)
-    if err.find('--format option given without a format code') < 0:
-        print(err)
-        return 'fail'
+    assert err.find('--format option given without a format code') >= 0
 
     (_, err) = gdaltest.runexternal_out_and_err(test_cli_utilities.get_gdalinfo_path() + ' --format foo_bar', check_memleak=False)
-    if err.find('--format option given with format') < 0:
-        print(err)
-        return 'fail'
+    assert err.find('--format option given with format') >= 0
 
     return 'success'
 
@@ -457,10 +398,7 @@ def test_gdalinfo_22():
         'Creation Datatypes',
         '<CreationOptionList>']
     for expected_string in expected_strings:
-        if ret.find(expected_string) < 0:
-            gdaltest.post_reason('did not find %s' % expected_string)
-            print(ret)
-            return 'fail'
+        assert ret.find(expected_string) >= 0, ('did not find %s' % expected_string)
 
     return 'success'
 
@@ -473,9 +411,7 @@ def test_gdalinfo_23():
         return 'skip'
 
     ret = gdaltest.runexternal(test_cli_utilities.get_gdalinfo_path() + ' --help-general', check_memleak=False)
-    if ret.find('Generic GDAL utility command options') < 0:
-        print(ret)
-        return 'fail'
+    assert ret.find('Generic GDAL utility command options') >= 0
 
     return 'success'
 
@@ -488,9 +424,7 @@ def test_gdalinfo_24():
         return 'skip'
 
     ret = gdaltest.runexternal(test_cli_utilities.get_gdalinfo_path() + ' --locale C ../gcore/data/byte.tif', check_memleak=False)
-    if ret.find('Driver: GTiff/GeoTIFF') != 0:
-        print(ret)
-        return 'fail'
+    assert ret.find('Driver: GTiff/GeoTIFF') == 0
 
     return 'success'
 
@@ -503,12 +437,8 @@ def test_gdalinfo_25():
         return 'skip'
 
     ret = gdaltest.runexternal(test_cli_utilities.get_gdalinfo_path() + ' ../gdrivers/data/byte_with_xmp.tif -listmdd', check_memleak=False)
-    if ret.find('Metadata domains:') < 0:
-        print(ret)
-        return 'fail'
-    if ret.find('  xml:XMP') < 0:
-        print(ret)
-        return 'fail'
+    assert ret.find('Metadata domains:') >= 0
+    assert ret.find('  xml:XMP') >= 0
 
     return 'success'
 
@@ -521,9 +451,7 @@ def test_gdalinfo_26():
         return 'skip'
 
     ret = gdaltest.runexternal(test_cli_utilities.get_gdalinfo_path() + ' ../gdrivers/data/byte_with_xmp.tif -mdd all', check_memleak=False)
-    if ret.find('Metadata (xml:XMP)') < 0:
-        print(ret)
-        return 'fail'
+    assert ret.find('Metadata (xml:XMP)') >= 0
 
     return 'success'
 
@@ -536,9 +464,7 @@ def test_gdalinfo_27():
         return 'skip'
 
     ret = gdaltest.runexternal(test_cli_utilities.get_gdalinfo_path() + ' ../gdrivers/data/float64.asc -oo datatype=float64', check_memleak=False)
-    if ret.find('Type=Float64') < 0:
-        print(ret)
-        return 'fail'
+    assert ret.find('Type=Float64') >= 0
 
     return 'success'
 
@@ -552,12 +478,8 @@ def test_gdalinfo_28():
 
     (ret, err) = gdaltest.runexternal_out_and_err(test_cli_utilities.get_gdalinfo_path() + ' -json ../gcore/data/byte.tif')
     ret = json.loads(ret)
-    if not (err is None or err == ''):
-        gdaltest.post_reason('got error/warning')
-        print(err)
-        return 'fail'
-    if ret['driverShortName'] != 'GTiff':
-        return 'fail'
+    assert (err is None or err == ''), 'got error/warning'
+    assert ret['driverShortName'] == 'GTiff'
 
     return 'success'
 
@@ -571,8 +493,7 @@ def test_gdalinfo_29():
 
     ret = gdaltest.runexternal(test_cli_utilities.get_gdalinfo_path() + ' -json -checksum ../gcore/data/byte.tif')
     ret = json.loads(ret)
-    if ret['bands'][0]['checksum'] != 4672:
-        return 'fail'
+    assert ret['bands'][0]['checksum'] == 4672
 
     return 'success'
 
@@ -586,13 +507,11 @@ def test_gdalinfo_30():
 
     ret = gdaltest.runexternal(test_cli_utilities.get_gdalinfo_path() + ' -json ../gcore/data/byte.tif')
     ret = json.loads(ret)
-    if 'metadata' not in ret:
-        return 'fail'
+    assert 'metadata' in ret
 
     ret = gdaltest.runexternal(test_cli_utilities.get_gdalinfo_path() + ' -json -nomd ../gcore/data/byte.tif')
     ret = json.loads(ret)
-    if 'metadata' in ret:
-        return 'fail'
+    assert 'metadata' not in ret
 
     return 'success'
 
@@ -606,13 +525,11 @@ def test_gdalinfo_31():
 
     ret = gdaltest.runexternal(test_cli_utilities.get_gdalinfo_path() + ' -json ../gdrivers/data/bug407.gif')
     ret = json.loads(ret)
-    if ret['bands'][0]['colorTable']['entries'][0] != [255, 255, 255, 255]:
-        return 'fail'
+    assert ret['bands'][0]['colorTable']['entries'][0] == [255, 255, 255, 255]
 
     ret = gdaltest.runexternal(test_cli_utilities.get_gdalinfo_path() + ' -json -noct ../gdrivers/data/bug407.gif')
     ret = json.loads(ret)
-    if 'colorTable' in ret['bands'][0]:
-        return 'fail'
+    assert 'colorTable' not in ret['bands'][0]
 
     return 'success'
 
@@ -631,17 +548,12 @@ def test_gdalinfo_32():
 
     ret = gdaltest.runexternal(test_cli_utilities.get_gdalinfo_path() + ' -json ../gcore/data/byte.tif')
     ret = json.loads(ret)
-    if '' in ret['bands'][0]['metadata']:
-        gdaltest.post_reason('got wrong minimum.')
-        print(ret)
-        return 'fail'
+    assert '' not in ret['bands'][0]['metadata'], 'got wrong minimum.'
 
     ret = gdaltest.runexternal(test_cli_utilities.get_gdalinfo_path() + ' -json -stats ../gcore/data/byte.tif')
     ret = json.loads(ret)
-    if ret['bands'][0]['metadata']['']['STATISTICS_MINIMUM'] != '74':
-        gdaltest.post_reason('got wrong minimum (2).')
-        print(ret)
-        return 'fail'
+    assert ret['bands'][0]['metadata']['']['STATISTICS_MINIMUM'] == '74', \
+        'got wrong minimum (2).'
 
     # We will blow an exception if the file does not exist now!
     os.remove('../gcore/data/byte.tif.aux.xml')
@@ -658,10 +570,8 @@ def test_gdalinfo_33():
 
     ret = gdaltest.runexternal(test_cli_utilities.get_gdalinfo_path() + ' -json ../gdrivers/data/int.img')
     ret = json.loads(ret)
-    if 'overviews' not in ret['bands'][0]:
-        return 'fail'
-    if 'rat' not in ret:
-        return 'fail'
+    assert 'overviews' in ret['bands'][0]
+    assert 'rat' in ret
 
     return 'success'
 
@@ -675,17 +585,13 @@ def test_gdalinfo_34():
 
     ret = gdaltest.runexternal(test_cli_utilities.get_gdalinfo_path() + ' -json ../gcore/data/gcps.vrt')
     ret = json.loads(ret)
-    if 'wkt' not in ret['gcps']['coordinateSystem']:
-        return 'fail'
-    if ret['gcps']['coordinateSystem']['wkt'].find('PROJCS["NAD27 / UTM zone 11N"') == -1:
-        return 'fail'
-    if ret['gcps']['gcpList'][0]['x'] != 440720.0:
-        return 'fail'
+    assert 'wkt' in ret['gcps']['coordinateSystem']
+    assert ret['gcps']['coordinateSystem']['wkt'].find('PROJCS["NAD27 / UTM zone 11N"') != -1
+    assert ret['gcps']['gcpList'][0]['x'] == 440720.0
 
     ret = gdaltest.runexternal(test_cli_utilities.get_gdalinfo_path() + ' -json -nogcp ../gcore/data/gcps.vrt')
     ret = json.loads(ret)
-    if 'gcps' in ret:
-        return 'fail'
+    assert 'gcps' not in ret
 
     return 'success'
 
@@ -704,17 +610,12 @@ def test_gdalinfo_35():
 
     ret = gdaltest.runexternal(test_cli_utilities.get_gdalinfo_path() + ' -json ../gcore/data/byte.tif')
     ret = json.loads(ret)
-    if 'histogram' in ret['bands'][0]:
-        gdaltest.post_reason('did not expect histogram.')
-        print(ret)
-        return 'fail'
+    assert 'histogram' not in ret['bands'][0], 'did not expect histogram.'
 
     ret = gdaltest.runexternal(test_cli_utilities.get_gdalinfo_path() + ' -json -hist ../gcore/data/byte.tif')
     ret = json.loads(ret)
-    if ret['bands'][0]['histogram']['buckets'] != [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 6, 0, 0, 0, 0, 0, 0, 0, 0, 37, 0, 0, 0, 0, 0, 0, 0, 57, 0, 0, 0, 0, 0, 0, 0, 62, 0, 0, 0, 0, 0, 0, 0, 66, 0, 0, 0, 0, 0, 0, 0, 0, 72, 0, 0, 0, 0, 0, 0, 0, 31, 0, 0, 0, 0, 0, 0, 0, 24, 0, 0, 0, 0, 0, 0, 0, 12, 0, 0, 0, 0, 0, 0, 0, 0, 7, 0, 0, 0, 0, 0, 0, 0, 12, 0, 0, 0, 0, 0, 0, 0, 5, 0, 0, 0, 0, 0, 0, 0, 3, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 2, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 1]:
-        gdaltest.post_reason('did not get expected histogram.')
-        print(ret)
-        return 'fail'
+    assert ret['bands'][0]['histogram']['buckets'] == [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 6, 0, 0, 0, 0, 0, 0, 0, 0, 37, 0, 0, 0, 0, 0, 0, 0, 57, 0, 0, 0, 0, 0, 0, 0, 62, 0, 0, 0, 0, 0, 0, 0, 66, 0, 0, 0, 0, 0, 0, 0, 0, 72, 0, 0, 0, 0, 0, 0, 0, 31, 0, 0, 0, 0, 0, 0, 0, 24, 0, 0, 0, 0, 0, 0, 0, 12, 0, 0, 0, 0, 0, 0, 0, 0, 7, 0, 0, 0, 0, 0, 0, 0, 12, 0, 0, 0, 0, 0, 0, 0, 5, 0, 0, 0, 0, 0, 0, 0, 3, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 2, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 1], \
+        'did not get expected histogram.'
 
     # We will blow an exception if the file does not exist now!
     os.remove('../gcore/data/byte.tif.aux.xml')
@@ -731,17 +632,12 @@ def test_gdalinfo_36():
 
     ret = gdaltest.runexternal(test_cli_utilities.get_gdalinfo_path() + ' -json ../gdrivers/data/fake_nsif.ntf')
     ret = json.loads(ret)
-    if 'TRE' in ret['metadata']:
-        gdaltest.post_reason('got unexpected extra MD.')
-        print(ret)
-        return 'fail'
+    assert 'TRE' not in ret['metadata'], 'got unexpected extra MD.'
 
     ret = gdaltest.runexternal(test_cli_utilities.get_gdalinfo_path() + ' -json -mdd TRE ../gdrivers/data/fake_nsif.ntf')
     ret = json.loads(ret)
-    if ret['metadata']['TRE']['BLOCKA'].find('010000001000000000') == -1:
-        gdaltest.post_reason('did not get extra MD.')
-        print(ret)
-        return 'fail'
+    assert ret['metadata']['TRE']['BLOCKA'].find('010000001000000000') != -1, \
+        'did not get extra MD.'
 
     return 'success'
 
@@ -755,13 +651,11 @@ def test_gdalinfo_37():
 
     ret = gdaltest.runexternal(test_cli_utilities.get_gdalinfo_path() + ' -json ../gcore/data/byte.tif')
     ret = json.loads(ret)
-    if 'computedMin' in ret['bands'][0]:
-        return 'fail'
+    assert 'computedMin' not in ret['bands'][0]
 
     ret = gdaltest.runexternal(test_cli_utilities.get_gdalinfo_path() + ' -json -mm ../gcore/data/byte.tif')
     ret = json.loads(ret)
-    if ret['bands'][0]['computedMin'] != 74.000:
-        return 'fail'
+    assert ret['bands'][0]['computedMin'] == 74.000
 
     return 'success'
 
@@ -775,12 +669,8 @@ def test_gdalinfo_38():
 
     ret = gdaltest.runexternal(test_cli_utilities.get_gdalinfo_path() + ' -json ../gdrivers/data/byte_with_xmp.tif -listmdd', check_memleak=False)
     ret = json.loads(ret)
-    if 'metadataDomains' not in ret['metadata']:
-        print(ret)
-        return 'fail'
-    if ret['metadata']['metadataDomains'][0] != 'xml:XMP':
-        print(ret)
-        return 'fail'
+    assert 'metadataDomains' in ret['metadata']
+    assert ret['metadata']['metadataDomains'][0] == 'xml:XMP'
 
     return 'success'
 
@@ -794,9 +684,7 @@ def test_gdalinfo_39():
 
     ret = gdaltest.runexternal(test_cli_utilities.get_gdalinfo_path() + ' -json ../gdrivers/data/byte_with_xmp.tif -mdd all', check_memleak=False)
     ret = json.loads(ret)
-    if 'xml:XMP' not in ret['metadata']:
-        print(ret)
-        return 'fail'
+    assert 'xml:XMP' in ret['metadata']
 
     return 'success'
 
@@ -810,21 +698,11 @@ def test_gdalinfo_40():
 
     ret = gdaltest.runexternal(test_cli_utilities.get_gdalinfo_path() + ' -json ../gdrivers/data/small_world.tif')
     ret = json.loads(ret)
-    if 'wgs84Extent' not in ret:
-        print(ret)
-        return 'fail'
-    if 'type' not in ret['wgs84Extent']:
-        print(ret)
-        return 'fail'
-    if ret['wgs84Extent']['type'] != 'Polygon':
-        print(ret)
-        return 'fail'
-    if 'coordinates' not in ret['wgs84Extent']:
-        print(ret)
-        return 'fail'
-    if ret['wgs84Extent']['coordinates'] != [[[-180.0, 90.0], [-180.0, -90.0], [180.0, -90.0], [180.0, 90.0], [-180.0, 90.0]]]:
-        print(ret)
-        return 'fail'
+    assert 'wgs84Extent' in ret
+    assert 'type' in ret['wgs84Extent']
+    assert ret['wgs84Extent']['type'] == 'Polygon'
+    assert 'coordinates' in ret['wgs84Extent']
+    assert ret['wgs84Extent']['coordinates'] == [[[-180.0, 90.0], [-180.0, -90.0], [180.0, -90.0], [180.0, 90.0], [-180.0, 90.0]]]
 
     return 'success'
 
diff --git a/autotest/utilities/test_gdalinfo_lib.py b/autotest/utilities/test_gdalinfo_lib.py
index a63d8a01d575..a83e18b173c4 100755
--- a/autotest/utilities/test_gdalinfo_lib.py
+++ b/autotest/utilities/test_gdalinfo_lib.py
@@ -44,10 +44,7 @@ def test_gdalinfo_lib_1():
     ds = gdal.Open('../gcore/data/byte.tif')
 
     ret = gdal.Info(ds)
-    if ret.find('Driver: GTiff/GeoTIFF') == -1:
-        gdaltest.post_reason('did not get expected string.')
-        print(ret)
-        return 'fail'
+    assert ret.find('Driver: GTiff/GeoTIFF') != -1, 'did not get expected string.'
 
     return 'success'
 
@@ -60,10 +57,7 @@ def test_gdalinfo_lib_2():
     ds = gdal.Open('../gcore/data/byte.tif')
 
     ret = gdal.Info(ds, format='json')
-    if ret['driverShortName'] != 'GTiff':
-        gdaltest.post_reason('wrong value for driverShortName.')
-        print(ret)
-        return 'fail'
+    assert ret['driverShortName'] == 'GTiff', 'wrong value for driverShortName.'
 
     return 'success'
 
@@ -76,17 +70,12 @@ def test_gdalinfo_lib_3():
     ds = gdal.Open('../gdrivers/data/fake_nsif.ntf')
 
     ret = gdal.Info(ds, format='json')
-    if 'TRE' in ret['metadata']:
-        gdaltest.post_reason('got unexpected extra MD.')
-        print(ret)
-        return 'fail'
+    assert 'TRE' not in ret['metadata'], 'got unexpected extra MD.'
 
     options = gdal.InfoOptions(format='json', extraMDDomains=['TRE'])
     ret = gdal.Info(ds, options=options)
-    if ret['metadata']['TRE']['BLOCKA'].find('010000001000000000') == -1:
-        gdaltest.post_reason('did not get extra MD.')
-        print(ret)
-        return 'fail'
+    assert ret['metadata']['TRE']['BLOCKA'].find('010000001000000000') != -1, \
+        'did not get extra MD.'
 
     return 'success'
 
@@ -99,9 +88,7 @@ def test_gdalinfo_lib_4():
     ds = gdal.Open('../gdrivers/data/byte_with_xmp.tif')
 
     ret = gdal.Info(ds, allMetadata=True, format='json')
-    if 'xml:XMP' not in ret['metadata']:
-        print(ret)
-        return 'fail'
+    assert 'xml:XMP' in ret['metadata']
 
     return 'success'
 
@@ -118,15 +105,11 @@ def test_gdalinfo_lib_5():
                     stats=True, approxStats=True, computeChecksum=True,
                     showGCPs=False, showMetadata=False, showRAT=False,
                     showColorTable=False, listMDD=True, showFileList=False)
-    if 'files' in ret:
-        return 'fail'
+    assert 'files' not in ret
     band = ret['bands'][0]
-    if 'computedMin' not in band:
-        return 'fail'
-    if 'histogram' not in band:
-        return 'fail'
-    if 'checksum' not in band:
-        return 'fail'
+    assert 'computedMin' in band
+    assert 'histogram' in band
+    assert 'checksum' in band
 
     ds = None
 
@@ -141,10 +124,7 @@ def test_gdalinfo_lib_5():
 def test_gdalinfo_lib_6():
 
     ret = gdal.Info('../gcore/data/byte.tif', options='-json')
-    if ret['driverShortName'] != 'GTiff':
-        gdaltest.post_reason('wrong value for driverShortName.')
-        print(ret)
-        return 'fail'
+    assert ret['driverShortName'] == 'GTiff', 'wrong value for driverShortName.'
 
     return 'success'
 
@@ -155,10 +135,7 @@ def test_gdalinfo_lib_6():
 def test_gdalinfo_lib_7():
 
     ret = gdal.Info('../gcore/data/byte.tif'.encode('ascii').decode('ascii'), options='-json'.encode('ascii').decode('ascii'))
-    if ret['driverShortName'] != 'GTiff':
-        gdaltest.post_reason('wrong value for driverShortName.')
-        print(ret)
-        return 'fail'
+    assert ret['driverShortName'] == 'GTiff', 'wrong value for driverShortName.'
 
     return 'success'
 
@@ -169,10 +146,7 @@ def test_gdalinfo_lib_nodatavalues():
 
     ds = gdal.Translate('', '../gcore/data/byte.tif', options='-of VRT -b 1 -b 1 -b 1 -mo "NODATA_VALUES=0 1 2"')
     ret = gdal.Info(ds)
-    if ret.find('PER_DATASET NODATA') < 0:
-        gdaltest.post_reason('wrong value for mask flags.')
-        print(ret)
-        return 'fail'
+    assert ret.find('PER_DATASET NODATA') >= 0, 'wrong value for mask flags.'
 
     return 'success'
 
diff --git a/autotest/utilities/test_gdallocationinfo.py b/autotest/utilities/test_gdallocationinfo.py
index 28c47852fba6..851af46f8050 100755
--- a/autotest/utilities/test_gdallocationinfo.py
+++ b/autotest/utilities/test_gdallocationinfo.py
@@ -46,19 +46,14 @@ def test_gdallocationinfo_1():
         return 'skip'
 
     (ret, err) = gdaltest.runexternal_out_and_err(test_cli_utilities.get_gdallocationinfo_path() + ' ../gcore/data/byte.tif 0 0')
-    if not (err is None or err == ''):
-        gdaltest.post_reason('got error/warning')
-        print(err)
-        return 'fail'
+    assert (err is None or err == ''), 'got error/warning'
 
     ret = ret.replace('\r\n', '\n')
     expected_ret = """Report:
   Location: (0P,0L)
   Band 1:
     Value: 107"""
-    if ret.find(expected_ret) != 0:
-        print(ret)
-        return 'fail'
+    assert ret.find(expected_ret) == 0
 
     return 'success'
 
@@ -77,9 +72,7 @@ def test_gdallocationinfo_2():
     <Value>107</Value>
   </BandReport>
 </Report>"""
-    if ret.find(expected_ret) != 0:
-        print(ret)
-        return 'fail'
+    assert ret.find(expected_ret) == 0
 
     return 'success'
 
@@ -93,9 +86,7 @@ def test_gdallocationinfo_3():
 
     ret = gdaltest.runexternal(test_cli_utilities.get_gdallocationinfo_path() + ' -b 1 -valonly ../gcore/data/byte.tif 0 0')
     expected_ret = """107"""
-    if ret.find(expected_ret) != 0:
-        print(ret)
-        return 'fail'
+    assert ret.find(expected_ret) == 0
 
     return 'success'
 
@@ -113,9 +104,7 @@ def test_gdallocationinfo_4():
   Location: (0P,0L)
   Band 1:
     Value: 107"""
-    if ret.find(expected_ret) != 0:
-        print(ret)
-        return 'fail'
+    assert ret.find(expected_ret) == 0
 
     return 'success'
 
@@ -130,9 +119,7 @@ def test_gdallocationinfo_5():
     ret = gdaltest.runexternal(test_cli_utilities.get_gdallocationinfo_path() + ' -lifonly ../gcore/data/byte.vrt 0 0')
     expected_ret1 = """../gcore/data/byte.tif"""
     expected_ret2 = """../gcore/data\\byte.tif"""
-    if ret.find(expected_ret1) < 0 and ret.find(expected_ret2) < 0:
-        print(ret)
-        return 'fail'
+    assert ret.find(expected_ret1) >= 0 or ret.find(expected_ret2) >= 0
 
     return 'success'
 
@@ -154,9 +141,7 @@ def test_gdallocationinfo_6():
 
     gdal.GetDriverByName('GTiff').Delete('tmp/test_gdallocationinfo_6.tif')
     expected_ret = """Value: 130"""
-    if ret.find(expected_ret) < 0:
-        print(ret)
-        return 'fail'
+    assert ret.find(expected_ret) >= 0
 
     return 'success'
 
diff --git a/autotest/utilities/test_gdalsrsinfo.py b/autotest/utilities/test_gdalsrsinfo.py
index 632a6c14d542..4d11ed0d02ae 100755
--- a/autotest/utilities/test_gdalsrsinfo.py
+++ b/autotest/utilities/test_gdalsrsinfo.py
@@ -44,15 +44,10 @@ def test_gdalsrsinfo_1():
         return 'skip'
 
     (ret, err) = gdaltest.runexternal_out_and_err(test_cli_utilities.get_gdalsrsinfo_path() + ' ../gcore/data/byte.tif')
-    if not (err is None or err == ''):
-        gdaltest.post_reason('got error/warning')
-        print(err)
-        return 'fail'
+    assert (err is None or err == ''), 'got error/warning'
 
-    if ret.find('PROJ.4 :') == -1:
-        return 'fail'
-    if ret.find('OGC WKT :') == -1:
-        return 'fail'
+    assert ret.find('PROJ.4 :') != -1
+    assert ret.find('OGC WKT :') != -1
 
     return 'success'
 
@@ -67,9 +62,7 @@ def test_gdalsrsinfo_2():
     ret = gdaltest.runexternal(test_cli_utilities.get_gdalsrsinfo_path() +
                                ' -o proj4 ../gcore/data/byte.tif')
 
-    if ret.strip() != "+proj=utm +zone=11 +datum=NAD27 +units=m +no_defs":
-        print(ret.strip())
-        return 'fail'
+    assert ret.strip() == "+proj=utm +zone=11 +datum=NAD27 +units=m +no_defs"
 
     return 'success'
 
@@ -87,9 +80,7 @@ def test_gdalsrsinfo_3():
     first_val = 'PROJCS["NAD27 / UTM zone 11N",GEOGCS["NAD27",DATUM["North_American_Datum_1927",SPHEROID["Clarke 1866",6378206.4,294.9786982139006,AUTHORITY["EPSG","7008"]],AUTHORITY["EPSG","6267"]],PRIMEM["Greenwich",0],UNIT["degree",0.0174532925199433],AUTHORITY["EPSG","4267"]],PROJECTION["Transverse_Mercator"],PARAMETER["latitude_of_origin",0],PARAMETER["central_meridian",-117],PARAMETER["scale_factor",0.9996],PARAMETER["false_easting",500000],PARAMETER["false_northing",0],UNIT["metre",1,AUTHORITY["EPSG","9001"]],AUTHORITY["EPSG","26711"]]'
     second_val = 'PROJCS["NAD27 / UTM zone 11N",GEOGCS["NAD27",DATUM["North_American_Datum_1927",SPHEROID["Clarke 1866",6378206.4,294.9786982138982,AUTHORITY["EPSG","7008"]],AUTHORITY["EPSG","6267"]],PRIMEM["Greenwich",0],UNIT["degree",0.0174532925199433],AUTHORITY["EPSG","4267"]],PROJECTION["Transverse_Mercator"],PARAMETER["latitude_of_origin",0],PARAMETER["central_meridian",-117],PARAMETER["scale_factor",0.9996],PARAMETER["false_easting",500000],PARAMETER["false_northing",0],UNIT["metre",1,AUTHORITY["EPSG","9001"]],AUTHORITY["EPSG","26711"]]'
     third_val = 'PROJCS["NAD27 / UTM zone 11N",GEOGCS["NAD27",DATUM["North_American_Datum_1927",SPHEROID["Clarke 1866",6378206.4,294.9786982138982,AUTHORITY["EPSG","7008"]],AUTHORITY["EPSG","6267"]],PRIMEM["Greenwich",0,AUTHORITY["EPSG","8901"]],UNIT["degree",0.0174532925199433,AUTHORITY["EPSG","9122"]],AUTHORITY["EPSG","4267"]],PROJECTION["Transverse_Mercator"],PARAMETER["latitude_of_origin",0],PARAMETER["central_meridian",-117],PARAMETER["scale_factor",0.9996],PARAMETER["false_easting",500000],PARAMETER["false_northing",0],UNIT["metre",1,AUTHORITY["EPSG","9001"]],AXIS["Easting",EAST],AXIS["Northing",NORTH],AUTHORITY["EPSG","26711"]]'
-    if ret.strip() != first_val and ret.strip() != second_val and ret.strip() != third_val:
-        print(ret.strip())
-        return 'fail'
+    assert ret.strip() == first_val or ret.strip() == second_val or ret.strip() == third_val
 
     return 'success'
 
@@ -104,8 +95,7 @@ def test_gdalsrsinfo_4():
     ret = gdaltest.runexternal(test_cli_utilities.get_gdalsrsinfo_path() +
                                ' -o wkt_esri ../gcore/data/byte.tif')
 
-    if ret.strip() != 'PROJCS["NAD_1927_UTM_Zone_11N",GEOGCS["GCS_North_American_1927",DATUM["D_North_American_1927",SPHEROID["Clarke_1866",6378206.4,294.9786982]],PRIMEM["Greenwich",0],UNIT["Degree",0.017453292519943295]],PROJECTION["Transverse_Mercator"],PARAMETER["latitude_of_origin",0],PARAMETER["central_meridian",-117],PARAMETER["scale_factor",0.9996],PARAMETER["false_easting",500000],PARAMETER["false_northing",0],UNIT["Meter",1]]':
-        return 'fail'
+    assert ret.strip() == 'PROJCS["NAD_1927_UTM_Zone_11N",GEOGCS["GCS_North_American_1927",DATUM["D_North_American_1927",SPHEROID["Clarke_1866",6378206.4,294.9786982]],PRIMEM["Greenwich",0],UNIT["Degree",0.017453292519943295]],PROJECTION["Transverse_Mercator"],PARAMETER["latitude_of_origin",0],PARAMETER["central_meridian",-117],PARAMETER["scale_factor",0.9996],PARAMETER["false_easting",500000],PARAMETER["false_northing",0],UNIT["Meter",1]]'
 
     return 'success'
 
@@ -122,9 +112,7 @@ def test_gdalsrsinfo_5():
 
     first_val = 'PROJCS["NAD27 / UTM zone 11N",GEOGCS["NAD27",DATUM["North_American_Datum_1927",SPHEROID["Clarke 1866",6378206.4,294.9786982139006]],PRIMEM["Greenwich",0],UNIT["degree",0.0174532925199433]],PROJECTION["Transverse_Mercator"],PARAMETER["latitude_of_origin",0],PARAMETER["central_meridian",-117],PARAMETER["scale_factor",0.9996],PARAMETER["false_easting",500000],PARAMETER["false_northing",0],UNIT["metre",1]]'
     second_val = 'PROJCS["NAD27 / UTM zone 11N",GEOGCS["NAD27",DATUM["North_American_Datum_1927",SPHEROID["Clarke 1866",6378206.4,294.9786982138982]],PRIMEM["Greenwich",0],UNIT["degree",0.0174532925199433]],PROJECTION["Transverse_Mercator"],PARAMETER["latitude_of_origin",0],PARAMETER["central_meridian",-117],PARAMETER["scale_factor",0.9996],PARAMETER["false_easting",500000],PARAMETER["false_northing",0],UNIT["metre",1]]'
-    if ret.strip() != first_val and ret.strip() != second_val:
-        print(ret.strip())
-        return 'fail'
+    assert ret.strip() == first_val or ret.strip() == second_val
 
     return 'success'
 
@@ -167,9 +155,7 @@ def test_gdalsrsinfo_6():
     PARAMETER["false_northing",0],
     UNIT["metre",1]]"""
 
-    if ret.strip() != first_val and ret.strip() != second_val:
-        print(ret.strip())
-        return 'fail'
+    assert ret.strip() == first_val or ret.strip() == second_val
 
     return 'success'
 
@@ -184,8 +170,7 @@ def test_gdalsrsinfo_7():
     ret = gdaltest.runexternal(test_cli_utilities.get_gdalsrsinfo_path() +
                                ' -o mapinfo ../gcore/data/byte.tif')
 
-    if ret.strip() != """'Earth Projection 8, 62, "m", -117, 0, 0.9996, 500000, 0'""":
-        return 'fail'
+    assert ret.strip() == """'Earth Projection 8, 62, "m", -117, 0, 0.9996, 500000, 0'"""
 
     return 'success'
 
@@ -201,7 +186,7 @@ def test_gdalsrsinfo_8():
                                ' -o wkt -p EPSG:4326')
     ret = ret.replace('\r\n', '\n')
 
-    if ret.strip() != """GEOGCS["WGS 84",
+    assert ret.strip() == """GEOGCS["WGS 84",
     DATUM["WGS_1984",
         SPHEROID["WGS 84",6378137,298.257223563,
             AUTHORITY["EPSG","7030"]],
@@ -210,8 +195,7 @@ def test_gdalsrsinfo_8():
         AUTHORITY["EPSG","8901"]],
     UNIT["degree",0.0174532925199433,
         AUTHORITY["EPSG","9122"]],
-    AUTHORITY["EPSG","4326"]]""":
-        return 'fail'
+    AUTHORITY["EPSG","4326"]]"""
 
     return 'success'
 
@@ -226,8 +210,7 @@ def test_gdalsrsinfo_9():
     _, err = gdaltest.runexternal_out_and_err(
         test_cli_utilities.get_gdalsrsinfo_path() + ' nonexistent_file')
 
-    if err.strip() != "ERROR 1: ERROR - failed to load SRS definition from nonexistent_file":
-        return 'fail'
+    assert err.strip() == "ERROR 1: ERROR - failed to load SRS definition from nonexistent_file"
 
     return 'success'
 
@@ -249,9 +232,7 @@ def test_gdalsrsinfo_10():
         ret = gdaltest.runexternal(test_cli_utilities.get_gdalsrsinfo_path() +
                                    " -V -o proj4 '" + wkt + "'")
 
-    if ret.find('Validate Succeeds') == -1:
-        print(ret)
-        return 'fail'
+    assert ret.find('Validate Succeeds') != -1
 
     return 'success'
 
@@ -273,8 +254,7 @@ def test_gdalsrsinfo_11():
         ret = gdaltest.runexternal(test_cli_utilities.get_gdalsrsinfo_path() +
                                    " -V -o proj4 '" + wkt + "'")
 
-    if ret.find('Validate Fails') == -1:
-        return 'fail'
+    assert ret.find('Validate Fails') != -1
 
     return 'success'
 
@@ -289,8 +269,7 @@ def test_gdalsrsinfo_12():
     ret = gdaltest.runexternal(test_cli_utilities.get_gdalsrsinfo_path() +
                                ' -o wkt EPSG:4326')
 
-    if ret.strip() != """GEOGCS["WGS 84",DATUM["WGS_1984",SPHEROID["WGS 84",6378137,298.257223563,AUTHORITY["EPSG","7030"]],AUTHORITY["EPSG","6326"]],PRIMEM["Greenwich",0,AUTHORITY["EPSG","8901"]],UNIT["degree",0.0174532925199433,AUTHORITY["EPSG","9122"]],AUTHORITY["EPSG","4326"]]""":
-        return 'fail'
+    assert ret.strip() == """GEOGCS["WGS 84",DATUM["WGS_1984",SPHEROID["WGS 84",6378137,298.257223563,AUTHORITY["EPSG","7030"]],AUTHORITY["EPSG","6326"]],PRIMEM["Greenwich",0,AUTHORITY["EPSG","8901"]],UNIT["degree",0.0174532925199433,AUTHORITY["EPSG","9122"]],AUTHORITY["EPSG","4326"]]"""
 
     return 'success'
 
@@ -305,8 +284,7 @@ def test_gdalsrsinfo_13():
     ret = gdaltest.runexternal(test_cli_utilities.get_gdalsrsinfo_path() +
                                ' -o wkt "+proj=longlat +datum=WGS84 +no_defs"')
 
-    if ret.strip() != """GEOGCS["WGS 84",DATUM["WGS_1984",SPHEROID["WGS 84",6378137,298.257223563,AUTHORITY["EPSG","7030"]],AUTHORITY["EPSG","6326"]],PRIMEM["Greenwich",0,AUTHORITY["EPSG","8901"]],UNIT["degree",0.0174532925199433,AUTHORITY["EPSG","9122"]],AUTHORITY["EPSG","4326"]]""":
-        return 'fail'
+    assert ret.strip() == """GEOGCS["WGS 84",DATUM["WGS_1984",SPHEROID["WGS 84",6378137,298.257223563,AUTHORITY["EPSG","7030"]],AUTHORITY["EPSG","6326"]],PRIMEM["Greenwich",0,AUTHORITY["EPSG","8901"]],UNIT["degree",0.0174532925199433,AUTHORITY["EPSG","9122"]],AUTHORITY["EPSG","4326"]]"""
 
     return 'success'
 
@@ -321,8 +299,7 @@ def test_gdalsrsinfo_14():
     ret = gdaltest.runexternal(test_cli_utilities.get_gdalsrsinfo_path() +
                                ' -o proj4 /vsizip/../gcore/data/byte.tif.zip')
 
-    if ret.strip() != "+proj=utm +zone=11 +datum=NAD27 +units=m +no_defs":
-        return 'fail'
+    assert ret.strip() == "+proj=utm +zone=11 +datum=NAD27 +units=m +no_defs"
 
     return 'success'
 
@@ -337,8 +314,7 @@ def test_gdalsrsinfo_14bis():
     ret = gdaltest.runexternal(test_cli_utilities.get_gdalsrsinfo_path() +
                                ' -o proj4 ../ogr/data/Stacks.shp')
 
-    if ret.strip() != "+proj=lcc +lat_1=30.28333333333333 +lat_2=28.38333333333333 +lat_0=27.83333333333333 +lon_0=-99 +x_0=600000 +y_0=3999999.9998984 +ellps=GRS80 +towgs84=0,0,0,0,0,0,0 +units=us-ft +no_defs":
-        return 'fail'
+    assert ret.strip() == "+proj=lcc +lat_1=30.28333333333333 +lat_2=28.38333333333333 +lat_0=27.83333333333333 +lon_0=-99 +x_0=600000 +y_0=3999999.9998984 +ellps=GRS80 +towgs84=0,0,0,0,0,0,0 +units=us-ft +no_defs"
 
     return 'success'
 
@@ -353,8 +329,7 @@ def test_gdalsrsinfo_15():
     ret = gdaltest.runexternal(test_cli_utilities.get_gdalsrsinfo_path() +
                                ' -o proj4 ../osr/data/lcc_esri.prj')
 
-    if ret.strip() != "+proj=lcc +lat_1=34.33333333333334 +lat_2=36.16666666666666 +lat_0=33.75 +lon_0=-79 +x_0=609601.22 +y_0=0 +datum=NAD83 +units=m +no_defs":
-        return 'fail'
+    assert ret.strip() == "+proj=lcc +lat_1=34.33333333333334 +lat_2=36.16666666666666 +lat_0=33.75 +lon_0=-79 +x_0=609601.22 +y_0=0 +datum=NAD83 +units=m +no_defs"
 
     return 'success'
 
@@ -375,8 +350,7 @@ def test_gdalsrsinfo_16():
         gdaltest.post_reason('gdalsrsinfo execution failed')
         return 'fail'
 
-    if err != '':
-        return 'fail'
+    assert err == ''
 
     return 'success'
 
@@ -392,24 +366,18 @@ def test_gdalsrsinfo_17():
     ret = gdaltest.runexternal(test_cli_utilities.get_gdalsrsinfo_path() +
                                ' -e "LOCAL_CS[foo]"')
 
-    if ret.find('EPSG:-1') < 0:
-        print(ret)
-        return 'fail'
+    assert ret.find('EPSG:-1') >= 0
 
     # One match
     ret = gdaltest.runexternal(test_cli_utilities.get_gdalsrsinfo_path() +
                                ' -e ../osr/data/lcc_esri.prj')
 
-    if ret.find('EPSG:32119') < 0:
-        print(ret)
-        return 'fail'
+    assert ret.find('EPSG:32119') >= 0
 
     # Two matches
     ret = gdaltest.runexternal(test_cli_utilities.get_gdalsrsinfo_path() +
                                """ -e "GEOGCS[\"myLKS94\",DATUM[\"Lithuania_1994_ETRS89\",SPHEROID[\"GRS_1980\",6378137,298.257222101],TOWGS84[0,0,0,0,0,0,0]],PRIMEM[\"Greenwich\",0],UNIT[\"degree\",0.0174532925199433]]" """)
-    if ret.find('EPSG:4126') < 0 or ret.find('EPSG:4669') < 0:
-        print(ret)
-        return 'fail'
+    assert ret.find('EPSG:4126') >= 0 and ret.find('EPSG:4669') >= 0
 
     return 'success'
 
diff --git a/autotest/utilities/test_gdaltindex.py b/autotest/utilities/test_gdaltindex.py
index 59507e28e93b..6038a85cc684 100755
--- a/autotest/utilities/test_gdaltindex.py
+++ b/autotest/utilities/test_gdaltindex.py
@@ -38,6 +38,7 @@
 from osgeo import osr
 import gdaltest
 import test_cli_utilities
+import pytest
 
 ###############################################################################
 # Simple test
@@ -88,25 +89,18 @@ def test_gdaltindex_1():
     ds = None
 
     (_, err) = gdaltest.runexternal_out_and_err(test_cli_utilities.get_gdaltindex_path() + ' tmp/tileindex.shp tmp/gdaltindex1.tif tmp/gdaltindex2.tif')
-    if not (err is None or err == ''):
-        gdaltest.post_reason('got error/warning')
-        print(err)
-        return 'fail'
+    assert (err is None or err == ''), 'got error/warning'
 
     (ret_stdout, ret_stderr) = gdaltest.runexternal_out_and_err(test_cli_utilities.get_gdaltindex_path() + ' tmp/tileindex.shp tmp/gdaltindex3.tif tmp/gdaltindex4.tif')
 
     ds = ogr.Open('tmp/tileindex.shp')
     if ds.GetLayer(0).GetFeatureCount() != 4:
         print(ret_stdout)
-        print(ret_stderr)
-        print(ds.GetLayer(0).GetFeatureCount())
-        return 'fail'
+        pytest.fail(ret_stderr)
     tileindex_wkt = ds.GetLayer(0).GetSpatialRef().ExportToWkt()
     if tileindex_wkt.find('WGS_1984') == -1:
         print(ret_stdout)
-        print(ret_stderr)
-        print(tileindex_wkt)
-        return 'fail'
+        pytest.fail(ret_stderr)
 
     expected_wkts = ['POLYGON ((49 2,50 2,50 1,49 1,49 2))',
                      'POLYGON ((49 3,50 3,50 2,49 2,49 3))',
@@ -115,9 +109,8 @@ def test_gdaltindex_1():
     i = 0
     feat = ds.GetLayer(0).GetNextFeature()
     while feat is not None:
-        if feat.GetGeometryRef().ExportToWkt() != expected_wkts[i]:
-            print('i=%d, wkt=%s' % (i, feat.GetGeometryRef().ExportToWkt()))
-            return 'fail'
+        assert feat.GetGeometryRef().ExportToWkt() == expected_wkts[i], \
+            ('i=%d, wkt=%s' % (i, feat.GetGeometryRef().ExportToWkt()))
         i = i + 1
         feat = ds.GetLayer(0).GetNextFeature()
     ds.Destroy()
@@ -134,17 +127,14 @@ def test_gdaltindex_2():
 
     (_, ret_stderr) = gdaltest.runexternal_out_and_err(test_cli_utilities.get_gdaltindex_path() + ' tmp/tileindex.shp tmp/gdaltindex1.tif tmp/gdaltindex2.tif tmp/gdaltindex3.tif tmp/gdaltindex4.tif')
 
-    if ret_stderr.find('File tmp/gdaltindex1.tif is already in tileindex. Skipping it.') == -1 or \
+    assert (not (ret_stderr.find('File tmp/gdaltindex1.tif is already in tileindex. Skipping it.') == -1 or \
        ret_stderr.find('File tmp/gdaltindex2.tif is already in tileindex. Skipping it.') == -1 or \
        ret_stderr.find('File tmp/gdaltindex3.tif is already in tileindex. Skipping it.') == -1 or \
-       ret_stderr.find('File tmp/gdaltindex4.tif is already in tileindex. Skipping it.') == -1:
-        print(ret_stderr)
-        gdaltest.post_reason('got unexpected error messages.')
-        return 'fail'
+       ret_stderr.find('File tmp/gdaltindex4.tif is already in tileindex. Skipping it.') == -1)), \
+        'got unexpected error messages.'
 
     ds = ogr.Open('tmp/tileindex.shp')
-    if ds.GetLayer(0).GetFeatureCount() != 4:
-        return 'fail'
+    assert ds.GetLayer(0).GetFeatureCount() == 4
     ds.Destroy()
 
     return 'success'
@@ -168,15 +158,12 @@ def test_gdaltindex_3():
 
     (_, ret_stderr) = gdaltest.runexternal_out_and_err(test_cli_utilities.get_gdaltindex_path() + ' -skip_different_projection tmp/tileindex.shp tmp/gdaltindex5.tif')
 
-    if ret_stderr.find('Warning : tmp/gdaltindex5.tif is not using the same projection system as other files in the tileindex.') == -1 or \
-       ret_stderr.find('Use -t_srs option to set target projection system (not supported by MapServer).') == -1:
-        print(ret_stderr)
-        gdaltest.post_reason('got unexpected error message \n[%s]' % (ret_stderr))
-        return 'fail'
+    assert (not (ret_stderr.find('Warning : tmp/gdaltindex5.tif is not using the same projection system as other files in the tileindex.') == -1 or \
+       ret_stderr.find('Use -t_srs option to set target projection system (not supported by MapServer).') == -1)), \
+        ('got unexpected error message \n[%s]' % (ret_stderr))
 
     ds = ogr.Open('tmp/tileindex.shp')
-    if ds.GetLayer(0).GetFeatureCount() != 4:
-        return 'fail'
+    assert ds.GetLayer(0).GetFeatureCount() == 4
     ds.Destroy()
 
     return 'success'
@@ -201,9 +188,8 @@ def test_gdaltindex_4():
     gdaltest.runexternal_out_and_err(test_cli_utilities.get_gdaltindex_path() + ' -t_srs EPSG:4326 tmp/tileindex.shp tmp/gdaltindex5.tif')
 
     ds = ogr.Open('tmp/tileindex.shp')
-    if ds.GetLayer(0).GetFeatureCount() != 5:
-        gdaltest.post_reason('got %d features, expecting 5' % ds.GetLayer(0).GetFeatureCount())
-        return 'fail'
+    assert ds.GetLayer(0).GetFeatureCount() == 5, \
+        ('got %d features, expecting 5' % ds.GetLayer(0).GetFeatureCount())
     ds.Destroy()
 
     return 'success'
@@ -233,9 +219,8 @@ def test_gdaltindex_5():
 
         ds = ogr.Open('tmp/test_gdaltindex_5.shp')
         lyr = ds.GetLayer(0)
-        if lyr.GetFeatureCount() != 2:
-            gdaltest.post_reason('got %d features, expecting 2' % ds.GetLayer(0).GetFeatureCount())
-            return 'fail'
+        assert lyr.GetFeatureCount() == 2, \
+            ('got %d features, expecting 2' % ds.GetLayer(0).GetFeatureCount())
         feat = lyr.GetNextFeature()
         feat = lyr.GetNextFeature()
         if src_srs_format == '-src_srs_format PROJ':
@@ -269,9 +254,8 @@ def test_gdaltindex_6():
         gdaltest.runexternal_out_and_err(test_cli_utilities.get_gdaltindex_path() + ' -f "MapInfo File" %s tmp/test_gdaltindex_6.mif tmp/gdaltindex1.tif' % option)
         ds = ogr.Open('tmp/test_gdaltindex_6.mif')
         lyr = ds.GetLayer(0)
-        if lyr.GetFeatureCount() != 1:
-            gdaltest.post_reason('got %d features, expecting 1' % lyr.GetFeatureCount())
-            return 'fail'
+        assert lyr.GetFeatureCount() == 1, \
+            ('got %d features, expecting 1' % lyr.GetFeatureCount())
         ds = None
 
     return 'success'
diff --git a/autotest/utilities/test_gdaltransform.py b/autotest/utilities/test_gdaltransform.py
index 4889da5c3749..625dd50b4172 100755
--- a/autotest/utilities/test_gdaltransform.py
+++ b/autotest/utilities/test_gdaltransform.py
@@ -45,12 +45,8 @@ def test_gdaltransform_1():
     strin = '2 49 1\n' + '3 50 2\n'
     ret = gdaltest.runexternal(test_cli_utilities.get_gdaltransform_path() + ' -s_srs EPSG:4326 -t_srs EPSG:4326', strin)
 
-    if ret.find('2 49 1') == -1:
-        print(ret)
-        return 'fail'
-    if ret.find('3 50 2') == -1:
-        print(ret)
-        return 'fail'
+    assert ret.find('2 49 1') != -1
+    assert ret.find('3 50 2') != -1
 
     return 'success'
 
@@ -65,18 +61,10 @@ def test_gdaltransform_2():
     strin = '0 0\n' + '20 0\n' + '20 20\n' + '0 20\n'
     ret = gdaltest.runexternal(test_cli_utilities.get_gdaltransform_path() + ' -gcp 0 0  440720.000 3751320.000 -gcp 20 0 441920.000 3751320.000 -gcp 20 20 441920.000 3750120.000 0 -gcp 0 20 440720.000 3750120.000', strin)
 
-    if ret.find('440720 3751320') == -1:
-        print(ret)
-        return 'fail'
-    if ret.find('441920 3751320') == -1:
-        print(ret)
-        return 'fail'
-    if ret.find('441920 3750120') == -1:
-        print(ret)
-        return 'fail'
-    if ret.find('440720 3750120') == -1:
-        print(ret)
-        return 'fail'
+    assert ret.find('440720 3751320') != -1
+    assert ret.find('441920 3751320') != -1
+    assert ret.find('441920 3750120') != -1
+    assert ret.find('440720 3750120') != -1
 
     return 'success'
 
@@ -91,18 +79,10 @@ def test_gdaltransform_3():
     strin = '0 0\n' + '20 0\n' + '20 20\n' + '0 20\n'
     ret = gdaltest.runexternal(test_cli_utilities.get_gdaltransform_path() + ' -tps -gcp 0 0  440720.000 3751320.000 -gcp 20 0 441920.000 3751320.000 -gcp 20 20 441920.000 3750120.000 0 -gcp 0 20 440720.000 3750120.000', strin)
 
-    if ret.find('440720 3751320') == -1:
-        print(ret)
-        return 'fail'
-    if ret.find('441920 3751320') == -1:
-        print(ret)
-        return 'fail'
-    if ret.find('441920 3750120') == -1:
-        print(ret)
-        return 'fail'
-    if ret.find('440720 3750120') == -1:
-        print(ret)
-        return 'fail'
+    assert ret.find('440720 3751320') != -1
+    assert ret.find('441920 3751320') != -1
+    assert ret.find('441920 3750120') != -1
+    assert ret.find('440720 3750120') != -1
 
     return 'success'
 
@@ -117,18 +97,10 @@ def test_gdaltransform_4():
     strin = '0 0\n' + '20 0\n' + '20 20\n' + '0 20\n'
     ret = gdaltest.runexternal(test_cli_utilities.get_gdaltransform_path() + ' -order 1 -gcp 0 0  440720.000 3751320.000 -gcp 20 0 441920.000 3751320.000 -gcp 20 20 441920.000 3750120.000 0 -gcp 0 20 440720.000 3750120.000', strin)
 
-    if ret.find('440720 3751320') == -1:
-        print(ret)
-        return 'fail'
-    if ret.find('441920 3751320') == -1:
-        print(ret)
-        return 'fail'
-    if ret.find('441920 3750120') == -1:
-        print(ret)
-        return 'fail'
-    if ret.find('440720 3750120') == -1:
-        print(ret)
-        return 'fail'
+    assert ret.find('440720 3751320') != -1
+    assert ret.find('441920 3751320') != -1
+    assert ret.find('441920 3750120') != -1
+    assert ret.find('440720 3750120') != -1
 
     return 'success'
 
@@ -147,9 +119,7 @@ def test_gdaltransform_5():
     x = float(text_split[0])
     y = float(text_split[1])
 
-    if abs(x - 440720) > 1e-4 or abs(y - 3751320) > 1e-4:
-        print(ret)
-        return 'fail'
+    assert abs(x - 440720) <= 1e-4 and abs(y - 3751320) <= 1e-4, ret
 
     return 'success'
 
@@ -168,9 +138,7 @@ def test_gdaltransform_6():
     x = float(text_split[0])
     y = float(text_split[1])
 
-    if abs(x - 440720) > 1e-4 or abs(y - 3751320) > 1e-4:
-        print(ret)
-        return 'fail'
+    assert abs(x - 440720) <= 1e-4 and abs(y - 3751320) <= 1e-4, ret
 
     return 'success'
 
@@ -189,9 +157,7 @@ def test_gdaltransform_7():
     x = float(text_split[0])
     y = float(text_split[1])
 
-    if abs(x - 0) > 1e-4 or abs(y - 0) > 1e-4:
-        print(ret)
-        return 'fail'
+    assert abs(x - 0) <= 1e-4 and abs(y - 0) <= 1e-4, ret
 
     return 'success'
 
@@ -206,9 +172,7 @@ def test_gdaltransform_8():
     strin = '2 49 1\n'
     ret = gdaltest.runexternal(test_cli_utilities.get_gdaltransform_path() + ' -to "SRC_SRS=WGS84" -to "DST_SRS=WGS84"', strin)
 
-    if ret.find('2 49 1') == -1:
-        print(ret)
-        return 'fail'
+    assert ret.find('2 49 1') != -1
 
     return 'success'
 
@@ -224,9 +188,7 @@ def test_gdaltransform_9():
     ret = gdaltest.runexternal(test_cli_utilities.get_gdaltransform_path() + ' ../gcore/data/byte.tif -output_xy', strin)
 
     text_split = ret.split(' ')
-    if len(text_split) != 2:
-        print(ret)
-        return 'fail'
+    assert len(text_split) == 2, ret
 
     return 'success'
 
diff --git a/autotest/utilities/test_gdalwarp.py b/autotest/utilities/test_gdalwarp.py
index 072820acd735..130b0e9840f5 100755
--- a/autotest/utilities/test_gdalwarp.py
+++ b/autotest/utilities/test_gdalwarp.py
@@ -47,18 +47,12 @@ def test_gdalwarp_1():
         return 'skip'
 
     (_, err) = gdaltest.runexternal_out_and_err(test_cli_utilities.get_gdalwarp_path() + ' ../gcore/data/byte.tif tmp/testgdalwarp1.tif')
-    if not (err is None or err == ''):
-        gdaltest.post_reason('got error/warning')
-        print(err)
-        return 'fail'
+    assert (err is None or err == ''), 'got error/warning'
 
     ds = gdal.Open('tmp/testgdalwarp1.tif')
-    if ds is None:
-        return 'fail'
+    assert ds is not None
 
-    if ds.GetRasterBand(1).Checksum() != 4672:
-        gdaltest.post_reason('Bad checksum')
-        return 'fail'
+    assert ds.GetRasterBand(1).Checksum() == 4672, 'Bad checksum'
 
     ds = None
 
@@ -75,12 +69,9 @@ def test_gdalwarp_2():
     gdaltest.runexternal(test_cli_utilities.get_gdalwarp_path() + ' -of GTiff ../gcore/data/byte.tif tmp/testgdalwarp2.tif')
 
     ds = gdal.Open('tmp/testgdalwarp2.tif')
-    if ds is None:
-        return 'fail'
+    assert ds is not None
 
-    if ds.GetRasterBand(1).Checksum() != 4672:
-        gdaltest.post_reason('Bad checksum')
-        return 'fail'
+    assert ds.GetRasterBand(1).Checksum() == 4672, 'Bad checksum'
 
     ds = None
 
@@ -97,16 +88,11 @@ def test_gdalwarp_3():
     gdaltest.runexternal(test_cli_utilities.get_gdalwarp_path() + ' -ot Int16 ../gcore/data/byte.tif tmp/testgdalwarp3.tif')
 
     ds = gdal.Open('tmp/testgdalwarp3.tif')
-    if ds is None:
-        return 'fail'
+    assert ds is not None
 
-    if ds.GetRasterBand(1).DataType != gdal.GDT_Int16:
-        gdaltest.post_reason('Bad data type')
-        return 'fail'
+    assert ds.GetRasterBand(1).DataType == gdal.GDT_Int16, 'Bad data type'
 
-    if ds.GetRasterBand(1).Checksum() != 4672:
-        gdaltest.post_reason('Bad checksum')
-        return 'fail'
+    assert ds.GetRasterBand(1).Checksum() == 4672, 'Bad checksum'
 
     ds = None
 
@@ -123,12 +109,9 @@ def test_gdalwarp_4():
     gdaltest.runexternal(test_cli_utilities.get_gdalwarp_path() + ' -t_srs EPSG:32611 ../gcore/data/byte.tif tmp/testgdalwarp4.tif')
 
     ds = gdal.Open('tmp/testgdalwarp4.tif')
-    if ds is None:
-        return 'fail'
+    assert ds is not None
 
-    if ds.GetRasterBand(1).Checksum() != 4672:
-        gdaltest.post_reason('Bad checksum')
-        return 'fail'
+    assert ds.GetRasterBand(1).Checksum() == 4672, 'Bad checksum'
 
     ds = None
 
@@ -150,16 +133,12 @@ def test_gdalwarp_5():
     gdaltest.runexternal(test_cli_utilities.get_gdalwarp_path() + ' tmp/testgdalwarp_gcp.tif tmp/testgdalwarp5.tif')
 
     ds = gdal.Open('tmp/testgdalwarp5.tif')
-    if ds is None:
-        return 'fail'
+    assert ds is not None
 
-    if ds.GetRasterBand(1).Checksum() != 4672:
-        gdaltest.post_reason('Bad checksum')
-        return 'fail'
+    assert ds.GetRasterBand(1).Checksum() == 4672, 'Bad checksum'
 
-    if not gdaltest.geotransform_equals(gdal.Open('../gcore/data/byte.tif').GetGeoTransform(), ds.GetGeoTransform(), 1e-9):
-        gdaltest.post_reason('Bad geotransform')
-        return 'fail'
+    assert gdaltest.geotransform_equals(gdal.Open('../gcore/data/byte.tif').GetGeoTransform(), ds.GetGeoTransform(), 1e-9), \
+        'Bad geotransform'
 
     ds = None
 
@@ -176,16 +155,12 @@ def test_gdalwarp_6():
     gdaltest.runexternal(test_cli_utilities.get_gdalwarp_path() + ' -tps tmp/testgdalwarp_gcp.tif tmp/testgdalwarp6.tif')
 
     ds = gdal.Open('tmp/testgdalwarp6.tif')
-    if ds is None:
-        return 'fail'
+    assert ds is not None
 
-    if ds.GetRasterBand(1).Checksum() != 4672:
-        gdaltest.post_reason('Bad checksum')
-        return 'fail'
+    assert ds.GetRasterBand(1).Checksum() == 4672, 'Bad checksum'
 
-    if not gdaltest.geotransform_equals(gdal.Open('../gcore/data/byte.tif').GetGeoTransform(), ds.GetGeoTransform(), 1e-9):
-        gdaltest.post_reason('Bad geotransform')
-        return 'fail'
+    assert gdaltest.geotransform_equals(gdal.Open('../gcore/data/byte.tif').GetGeoTransform(), ds.GetGeoTransform(), 1e-9), \
+        'Bad geotransform'
 
     ds = None
 
@@ -202,13 +177,11 @@ def test_gdalwarp_7():
     gdaltest.runexternal(test_cli_utilities.get_gdalwarp_path() + ' -tr 120 120 tmp/testgdalwarp_gcp.tif tmp/testgdalwarp7.tif')
 
     ds = gdal.Open('tmp/testgdalwarp7.tif')
-    if ds is None:
-        return 'fail'
+    assert ds is not None
 
     expected_gt = (440720.0, 120.0, 0.0, 3751320.0, 0.0, -120.0)
-    if not gdaltest.geotransform_equals(expected_gt, ds.GetGeoTransform(), 1e-9):
-        gdaltest.post_reason('Bad geotransform')
-        return 'fail'
+    assert gdaltest.geotransform_equals(expected_gt, ds.GetGeoTransform(), 1e-9), \
+        'Bad geotransform'
 
     ds = None
 
@@ -225,13 +198,11 @@ def test_gdalwarp_8():
     gdaltest.runexternal(test_cli_utilities.get_gdalwarp_path() + ' -ts 10 10 tmp/testgdalwarp_gcp.tif tmp/testgdalwarp8.tif')
 
     ds = gdal.Open('tmp/testgdalwarp8.tif')
-    if ds is None:
-        return 'fail'
+    assert ds is not None
 
     expected_gt = (440720.0, 120.0, 0.0, 3751320.0, 0.0, -120.0)
-    if not gdaltest.geotransform_equals(expected_gt, ds.GetGeoTransform(), 1e-9):
-        gdaltest.post_reason('Bad geotransform')
-        return 'fail'
+    assert gdaltest.geotransform_equals(expected_gt, ds.GetGeoTransform(), 1e-9), \
+        'Bad geotransform'
 
     ds = None
 
@@ -248,12 +219,10 @@ def test_gdalwarp_9():
     gdaltest.runexternal(test_cli_utilities.get_gdalwarp_path() + ' -te 440720.000 3750120.000 441920.000 3751320.000 tmp/testgdalwarp_gcp.tif tmp/testgdalwarp9.tif')
 
     ds = gdal.Open('tmp/testgdalwarp9.tif')
-    if ds is None:
-        return 'fail'
+    assert ds is not None
 
-    if not gdaltest.geotransform_equals(gdal.Open('../gcore/data/byte.tif').GetGeoTransform(), ds.GetGeoTransform(), 1e-9):
-        gdaltest.post_reason('Bad geotransform')
-        return 'fail'
+    assert gdaltest.geotransform_equals(gdal.Open('../gcore/data/byte.tif').GetGeoTransform(), ds.GetGeoTransform(), 1e-9), \
+        'Bad geotransform'
 
     ds = None
 
@@ -270,13 +239,9 @@ def test_gdalwarp_10():
     gdaltest.runexternal(test_cli_utilities.get_gdalwarp_path() + ' -ts 40 40 -rn tmp/testgdalwarp_gcp.tif tmp/testgdalwarp10.tif')
 
     ds = gdal.Open('tmp/testgdalwarp10.tif')
-    if ds is None:
-        return 'fail'
+    assert ds is not None
 
-    if ds.GetRasterBand(1).Checksum() != 18784:
-        print(ds.GetRasterBand(1).Checksum())
-        gdaltest.post_reason('Bad checksum')
-        return 'fail'
+    assert ds.GetRasterBand(1).Checksum() == 18784, 'Bad checksum'
 
     ds = None
 
@@ -293,8 +258,7 @@ def test_gdalwarp_11():
     gdaltest.runexternal(test_cli_utilities.get_gdalwarp_path() + ' -ts 40 40 -rb tmp/testgdalwarp_gcp.tif tmp/testgdalwarp11.tif')
 
     ds = gdal.Open('tmp/testgdalwarp11.tif')
-    if ds is None:
-        return 'fail'
+    assert ds is not None
 
     ref_ds = gdal.Open('ref_data/testgdalwarp11.tif')
     maxdiff = gdaltest.compare_ds(ds, ref_ds, verbose=0)
@@ -320,8 +284,7 @@ def test_gdalwarp_12():
     gdaltest.runexternal(test_cli_utilities.get_gdalwarp_path() + ' -ts 40 40 -rc tmp/testgdalwarp_gcp.tif tmp/testgdalwarp12.tif')
 
     ds = gdal.Open('tmp/testgdalwarp12.tif')
-    if ds is None:
-        return 'fail'
+    assert ds is not None
 
     ref_ds = gdal.Open('ref_data/testgdalwarp12.tif')
     maxdiff = gdaltest.compare_ds(ds, ref_ds, verbose=0)
@@ -348,16 +311,13 @@ def test_gdalwarp_13():
     gdaltest.runexternal(test_cli_utilities.get_gdalwarp_path() + ' -ts 40 40 -rcs tmp/testgdalwarp_gcp.tif tmp/testgdalwarp13.tif')
 
     ds = gdal.Open('tmp/testgdalwarp13.tif')
-    if ds is None:
-        return 'fail'
+    assert ds is not None
 
     ref_ds = gdal.Open('ref_data/testgdalwarp13.tif')
     maxdiff = gdaltest.compare_ds(ds, ref_ds)
     ref_ds = None
 
-    if maxdiff > 1:
-        gdaltest.post_reason('Image too different from reference')
-        return 'fail'
+    assert maxdiff <= 1, 'Image too different from reference'
 
     ds = None
 
@@ -374,16 +334,13 @@ def test_gdalwarp_14():
     gdaltest.runexternal(test_cli_utilities.get_gdalwarp_path() + ' -ts 40 40 -r lanczos tmp/testgdalwarp_gcp.tif tmp/testgdalwarp14.tif')
 
     ds = gdal.Open('tmp/testgdalwarp14.tif')
-    if ds is None:
-        return 'fail'
+    assert ds is not None
 
     ref_ds = gdal.Open('ref_data/testgdalwarp14.tif')
     maxdiff = gdaltest.compare_ds(ds, ref_ds)
     ref_ds = None
 
-    if maxdiff > 1:
-        gdaltest.post_reason('Image too different from reference')
-        return 'fail'
+    assert maxdiff <= 1, 'Image too different from reference'
 
     ds = None
 
@@ -400,18 +357,11 @@ def test_gdalwarp_15():
     gdaltest.runexternal(test_cli_utilities.get_gdalwarp_path() + ' -dstnodata 1 -t_srs EPSG:32610 tmp/testgdalwarp_gcp.tif tmp/testgdalwarp15.tif')
 
     ds = gdal.Open('tmp/testgdalwarp15.tif')
-    if ds is None:
-        return 'fail'
+    assert ds is not None
 
-    if ds.GetRasterBand(1).GetNoDataValue() != 1:
-        print(ds.GetRasterBand(1).GetNoDataValue())
-        gdaltest.post_reason('Bad nodata value')
-        return 'fail'
+    assert ds.GetRasterBand(1).GetNoDataValue() == 1, 'Bad nodata value'
 
-    if ds.GetRasterBand(1).Checksum() != 4523:
-        print(ds.GetRasterBand(1).Checksum())
-        gdaltest.post_reason('Bad checksum')
-        return 'fail'
+    assert ds.GetRasterBand(1).Checksum() == 4523, 'Bad checksum'
 
     ds = None
 
@@ -428,13 +378,9 @@ def test_gdalwarp_16():
     gdaltest.runexternal(test_cli_utilities.get_gdalwarp_path() + ' -of VRT tmp/testgdalwarp_gcp.tif tmp/testgdalwarp16.vrt')
 
     ds = gdal.Open('tmp/testgdalwarp16.vrt')
-    if ds is None:
-        return 'fail'
+    assert ds is not None
 
-    if ds.GetRasterBand(1).Checksum() != 4672:
-        print(ds.GetRasterBand(1).Checksum())
-        gdaltest.post_reason('Bad checksum')
-        return 'fail'
+    assert ds.GetRasterBand(1).Checksum() == 4672, 'Bad checksum'
 
     ds = None
 
@@ -451,12 +397,9 @@ def test_gdalwarp_17():
     gdaltest.runexternal(test_cli_utilities.get_gdalwarp_path() + ' -dstalpha ../gcore/data/rgbsmall.tif tmp/testgdalwarp17.tif')
 
     ds = gdal.Open('tmp/testgdalwarp17.tif')
-    if ds is None:
-        return 'fail'
+    assert ds is not None
 
-    if ds.GetRasterBand(4) is None:
-        gdaltest.post_reason('No alpha band generated')
-        return 'fail'
+    assert ds.GetRasterBand(4) is not None, 'No alpha band generated'
 
     ds = None
 
@@ -478,12 +421,9 @@ def test_gdalwarp_18():
         return 'skip'
 
     ds = gdal.Open('tmp/testgdalwarp18.tif')
-    if ds is None:
-        return 'fail'
+    assert ds is not None
 
-    if ds.GetRasterBand(1).Checksum() != 4672:
-        gdaltest.post_reason('Bad checksum')
-        return 'fail'
+    assert ds.GetRasterBand(1).Checksum() == 4672, 'Bad checksum'
 
     ds = None
 
@@ -500,13 +440,9 @@ def test_gdalwarp_19():
     gdaltest.runexternal(test_cli_utilities.get_gdalwarp_path() + ' -et 0 tmp/testgdalwarp_gcp.tif tmp/testgdalwarp19.tif')
 
     ds = gdal.Open('tmp/testgdalwarp19.tif')
-    if ds is None:
-        return 'fail'
+    assert ds is not None
 
-    if ds.GetRasterBand(1).Checksum() != 4672:
-        print(ds.GetRasterBand(1).Checksum())
-        gdaltest.post_reason('Bad checksum')
-        return 'fail'
+    assert ds.GetRasterBand(1).Checksum() == 4672, 'Bad checksum'
 
     ds = None
 
@@ -523,13 +459,9 @@ def test_gdalwarp_20():
     gdaltest.runexternal(test_cli_utilities.get_gdalwarp_path() + ' -of VRT -et 0 tmp/testgdalwarp_gcp.tif tmp/testgdalwarp20.vrt')
 
     ds = gdal.Open('tmp/testgdalwarp20.vrt')
-    if ds is None:
-        return 'fail'
+    assert ds is not None
 
-    if ds.GetRasterBand(1).Checksum() != 4672:
-        print(ds.GetRasterBand(1).Checksum())
-        gdaltest.post_reason('Bad checksum')
-        return 'fail'
+    assert ds.GetRasterBand(1).Checksum() == 4672, 'Bad checksum'
 
     ds = None
 
@@ -546,13 +478,9 @@ def test_gdalwarp_21():
     gdaltest.runexternal(test_cli_utilities.get_gdalwarp_path() + ' ../gcore/data/utmsmall.tif tmp/testgdalwarp21.tif -cutline data/cutline.vrt -cl cutline')
 
     ds = gdal.Open('tmp/testgdalwarp21.tif')
-    if ds is None:
-        return 'fail'
+    assert ds is not None
 
-    if ds.GetRasterBand(1).Checksum() != 19139:
-        print(ds.GetRasterBand(1).Checksum())
-        gdaltest.post_reason('Bad checksum')
-        return 'fail'
+    assert ds.GetRasterBand(1).Checksum() == 19139, 'Bad checksum'
 
     ds = None
 
@@ -569,13 +497,9 @@ def test_gdalwarp_22():
     gdaltest.runexternal(test_cli_utilities.get_gdalwarp_path() + ' ../gcore/data/utmsmall.tif tmp/testgdalwarp22.tif -cutline data/cutline.vrt -cl cutline -tr 30 30')
 
     ds = gdal.Open('tmp/testgdalwarp22.tif')
-    if ds is None:
-        return 'fail'
+    assert ds is not None
 
-    if ds.GetRasterBand(1).Checksum() != 14047:
-        print(ds.GetRasterBand(1).Checksum())
-        gdaltest.post_reason('Bad checksum')
-        return 'fail'
+    assert ds.GetRasterBand(1).Checksum() == 14047, 'Bad checksum'
 
     ds = None
 
@@ -592,13 +516,9 @@ def test_gdalwarp_23():
     gdaltest.runexternal(test_cli_utilities.get_gdalwarp_path() + ' -wo CUTLINE_ALL_TOUCHED=TRUE ../gcore/data/utmsmall.tif tmp/testgdalwarp23.tif -cutline data/cutline.vrt -cl cutline')
 
     ds = gdal.Open('tmp/testgdalwarp23.tif')
-    if ds is None:
-        return 'fail'
+    assert ds is not None
 
-    if ds.GetRasterBand(1).Checksum() != 20123:
-        print(ds.GetRasterBand(1).Checksum())
-        gdaltest.post_reason('Bad checksum')
-        return 'fail'
+    assert ds.GetRasterBand(1).Checksum() == 20123, 'Bad checksum'
 
     ds = None
 
@@ -621,13 +541,9 @@ def test_gdalwarp_24():
     gdaltest.runexternal(test_cli_utilities.get_gdalwarp_path() + ' -t_srs EPSG:32660 tmp/testgdalwarp24src.tif tmp/testgdalwarp24dst.tif')
 
     ds = gdal.Open('tmp/testgdalwarp24dst.tif')
-    if ds is None:
-        return 'fail'
+    assert ds is not None
 
-    if ds.GetRasterBand(1).Checksum() != 50634:
-        print(ds.GetRasterBand(1).Checksum())
-        gdaltest.post_reason('Bad checksum')
-        return 'fail'
+    assert ds.GetRasterBand(1).Checksum() == 50634, 'Bad checksum'
 
     ds = None
 
@@ -644,22 +560,15 @@ def test_gdalwarp_25():
     gdaltest.runexternal(test_cli_utilities.get_gdalwarp_path() + ' -t_srs "+proj=sinu" data/w_jpeg.tiff tmp/testgdalwarp25.tif')
 
     ds = gdal.Open('tmp/testgdalwarp25.tif')
-    if ds is None:
-        return 'fail'
+    assert ds is not None
 
     cs = ds.GetRasterBand(1).Checksum()
-    if cs != 8016 and cs != 6157:
-        print(cs)
-        gdaltest.post_reason('Bad checksum')
-        return 'fail'
+    assert cs == 8016 or cs == 6157, 'Bad checksum'
 
     gt = ds.GetGeoTransform()
     expected_gt = [-20037508.342789248, 78245.302611923355, 0.0, 10001965.729313632, 0.0, -77939.656898595524]
     for i in range(6):
-        if abs(gt[i] - expected_gt[i]) > 1:
-            print(gt)
-            gdaltest.post_reason('Bad gt')
-            return 'fail'
+        assert abs(gt[i] - expected_gt[i]) <= 1, 'Bad gt'
 
     ds = None
 
@@ -676,22 +585,15 @@ def test_gdalwarp_26():
     gdaltest.runexternal(test_cli_utilities.get_gdalwarp_path() + ' -t_srs "+proj=eck4" data/w_jpeg.tiff tmp/testgdalwarp26.tif')
 
     ds = gdal.Open('tmp/testgdalwarp26.tif')
-    if ds is None:
-        return 'fail'
+    assert ds is not None
 
     cs = ds.GetRasterBand(1).Checksum()
-    if cs != 8582 and cs != 3938:
-        print(cs)
-        gdaltest.post_reason('Bad checksum')
-        return 'fail'
+    assert cs == 8582 or cs == 3938, 'Bad checksum'
 
     gt = ds.GetGeoTransform()
     expected_gt = [-16921202.922943164, 41752.719393322564, 0.0, 8460601.4614715818, 0.0, -41701.109109770863]
     for i in range(6):
-        if abs(gt[i] - expected_gt[i]) > 1:
-            print(gt)
-            gdaltest.post_reason('Bad gt')
-            return 'fail'
+        assert abs(gt[i] - expected_gt[i]) <= 1, 'Bad gt'
 
     ds = None
 
@@ -708,22 +610,15 @@ def test_gdalwarp_27():
     gdaltest.runexternal(test_cli_utilities.get_gdalwarp_path() + ' -t_srs "+proj=vandg" data/w_jpeg.tiff tmp/testgdalwarp27.tif')
 
     ds = gdal.Open('tmp/testgdalwarp27.tif')
-    if ds is None:
-        return 'fail'
+    assert ds is not None
 
     cs = ds.GetRasterBand(1).Checksum()
-    if cs != 22006 and cs != 22615:
-        print(cs)
-        gdaltest.post_reason('Bad checksum')
-        return 'fail'
+    assert cs == 22006 or cs == 22615, 'Bad checksum'
 
     gt = ds.GetGeoTransform()
     expected_gt = [-20015109.356056381, 98651.645855415176, 0.0, 20015109.356056374, 0.0, -98651.645855415176]
     for i in range(6):
-        if abs(gt[i] - expected_gt[i]) > 1:
-            print(gt)
-            gdaltest.post_reason('Bad gt')
-            return 'fail'
+        assert abs(gt[i] - expected_gt[i]) <= 1, 'Bad gt'
 
     ds = None
 
@@ -740,8 +635,7 @@ def test_gdalwarp_28():
     gdaltest.runexternal(test_cli_utilities.get_gdalwarp_path() + ' -t_srs "+proj=aeqd +lat_0=45 +lon_0=90" data/w_jpeg.tiff tmp/testgdalwarp28.tif')
 
     ds = gdal.Open('tmp/testgdalwarp28.tif')
-    if ds is None:
-        return 'fail'
+    assert ds is not None
 
     # Check that there is no hole at the south pole location
     # First is gcc unoptimized with proj 5.1
@@ -749,10 +643,7 @@ def test_gdalwarp_28():
     # Third is mingw_w64 with proj 4.9.2
     # Fourth is macosx with proj 5.0.1
     cs = ds.GetRasterBand(1).Checksum()
-    if cs not in (37509, 46728, 26309, 32622):
-        print(cs)
-        gdaltest.post_reason('Bad checksum')
-        return 'fail'
+    assert cs in (37509, 46728, 26309, 32622), 'Bad checksum'
 
     gt = ds.GetGeoTransform()
     # First is GCC; Second is MSVC 6.0. Third is proj 4.9.2. Fourth is proj 4.9.3
@@ -761,10 +652,8 @@ def test_gdalwarp_28():
     expected_gt3 = [-19976414.463615071, 95707.390034570519, 0.0, 20003931.458625447, 0.0, -95707.390034570519]
     expected_gt4 = (-19976414.463615071, 95709.342728086922, 0.0, 19004529.751051534, 0.0, -95474.761005714157)
     for i in range(6):
-        if abs(gt[i] - expected_gt1[i]) > 1 and abs(gt[i] - expected_gt2[i]) > 1 and abs(gt[i] - expected_gt3[i]) > 1 and abs(gt[i] - expected_gt4[i]) > 1:
-            print(gt)
-            gdaltest.post_reason('Bad gt')
-            return 'fail'
+        assert abs(gt[i] - expected_gt1[i]) <= 1 or abs(gt[i] - expected_gt2[i]) <= 1 or abs(gt[i] - expected_gt3[i]) <= 1 or abs(gt[i] - expected_gt4[i]) <= 1, \
+            'Bad gt'
 
     ds = None
 
@@ -781,22 +670,15 @@ def test_gdalwarp_29():
     gdaltest.runexternal(test_cli_utilities.get_gdalwarp_path() + ' -t_srs EPSG:3785 data/w_jpeg.tiff tmp/testgdalwarp29.tif')
 
     ds = gdal.Open('tmp/testgdalwarp29.tif')
-    if ds is None:
-        return 'fail'
+    assert ds is not None
 
     cs = ds.GetRasterBand(1).Checksum()
-    if cs != 55149 and cs != 56054:
-        print(cs)
-        gdaltest.post_reason('Bad checksum')
-        return 'fail'
+    assert cs == 55149 or cs == 56054, 'Bad checksum'
 
     gt = ds.GetGeoTransform()
     expected_gt = [-20037508.342789248, 90054.726863985939, 0.0, 16213801.067583967, 0.0, -90056.750611190684]
     for i in range(6):
-        if abs(gt[i] - expected_gt[i]) > 1:
-            print(gt)
-            gdaltest.post_reason('Bad gt')
-            return 'fail'
+        assert abs(gt[i] - expected_gt[i]) <= 1, 'Bad gt'
 
     ds = None
 
@@ -824,52 +706,34 @@ def test_gdalwarp_30():
     file_size3 = os.stat('tmp/testgdalwarp30_3.tif')[stat.ST_SIZE]
 
     ds = gdal.Open('tmp/testgdalwarp30_1.tif')
-    if ds is None:
-        return 'fail'
+    assert ds is not None
 
     cs = ds.GetRasterBand(1).Checksum()
-    if cs != 64629 and cs != 1302:
-        print(cs)
-        gdaltest.post_reason('Bad checksum on testgdalwarp30_1')
-        return 'fail'
+    assert cs == 64629 or cs == 1302, 'Bad checksum on testgdalwarp30_1'
 
     ds = None
 
     ds = gdal.Open('tmp/testgdalwarp30_2.tif')
-    if ds is None:
-        return 'fail'
+    assert ds is not None
 
     cs = ds.GetRasterBand(1).Checksum()
-    if cs != 64629 and cs != 1302:
-        print(cs)
-        gdaltest.post_reason('Bad checksum on testgdalwarp30_2')
-        return 'fail'
+    assert cs == 64629 or cs == 1302, 'Bad checksum on testgdalwarp30_2'
 
     ds = None
 
     ds = gdal.Open('tmp/testgdalwarp30_3.tif')
-    if ds is None:
-        return 'fail'
+    assert ds is not None
 
     cs = ds.GetRasterBand(1).Checksum()
-    if cs != 64629 and cs != 1302:
-        print(cs)
-        gdaltest.post_reason('Bad checksum on testgdalwarp30_3')
-        return 'fail'
+    assert cs == 64629 or cs == 1302, 'Bad checksum on testgdalwarp30_3'
 
     ds = None
 
-    if file_size1 <= file_size2:
-        print(file_size1)
-        print(file_size2)
-        gdaltest.post_reason('Size with -wo OPTIMIZE_SIZE=TRUE larger than without !')
-        return 'fail'
+    assert file_size1 > file_size2, \
+        'Size with -wo OPTIMIZE_SIZE=TRUE larger than without !'
 
-    if file_size1 <= file_size3:
-        print(file_size1)
-        print(file_size3)
-        gdaltest.post_reason('Size with -wo STREAMABLE_OUTPUT=TRUE larger than without !')
-        return 'fail'
+    assert file_size1 > file_size3, \
+        'Size with -wo STREAMABLE_OUTPUT=TRUE larger than without !'
 
     return 'success'
 
@@ -899,11 +763,7 @@ def test_gdalwarp_31():
     cs3 = ds.GetRasterBand(1).Checksum()
     ds = None
 
-    if cs1 != 4672 or cs2 != 4672 or cs3 != 4727 or err == '' or err2 != '':
-        print(cs1, cs2, cs3)
-        print(err)
-        print(err2)
-        return 'fail'
+    assert cs1 == 4672 and cs2 == 4672 and cs3 == 4727 and err != '' and err2 == ''
 
     return 'success'
 
@@ -917,26 +777,20 @@ def test_gdalwarp_32():
 
     (_, err) = gdaltest.runexternal_out_and_err(test_cli_utilities.get_gdalwarp_path() + ' -tap ../gcore/data/byte.tif tmp/testgdalwarp32.tif',
                                                 check_memleak=False)
-    if err.find('-tap option cannot be used without using -tr') == -1:
-        gdaltest.post_reason('expected error')
-        return 'fail'
+    assert err.find('-tap option cannot be used without using -tr') != -1, \
+        'expected error'
 
     gdaltest.runexternal(test_cli_utilities.get_gdalwarp_path() + ' -tr 100 50 -tap ../gcore/data/byte.tif tmp/testgdalwarp32.tif')
 
     ds = gdal.Open('tmp/testgdalwarp32.tif')
-    if ds is None:
-        return 'fail'
+    assert ds is not None
 
     expected_gt = (440700.0, 100.0, 0.0, 3751350.0, 0.0, -50.0)
     got_gt = ds.GetGeoTransform()
-    if not gdaltest.geotransform_equals(expected_gt, got_gt, 1e-9):
-        gdaltest.post_reason('Bad geotransform')
-        print(got_gt)
-        return 'fail'
+    assert gdaltest.geotransform_equals(expected_gt, got_gt, 1e-9), 'Bad geotransform'
 
-    if ds.RasterXSize != 13 or ds.RasterYSize != 25:
-        gdaltest.post_reason('Wrong raster dimensions : %d x %d' % (ds.RasterXSize, ds.RasterYSize))
-        return 'fail'
+    assert ds.RasterXSize == 13 and ds.RasterYSize == 25, \
+        ('Wrong raster dimensions : %d x %d' % (ds.RasterXSize, ds.RasterYSize))
 
     ds = None
 
@@ -956,14 +810,12 @@ def test_gdalwarp_33():
 
     src_ds = gdal.Open('../gcore/data/ycbcr_with_mask.tif')
     ds = gdal.Open('tmp/testgdalwarp33.tif')
-    if ds is None:
-        return 'fail'
+    assert ds is not None
 
     # There are expected diffs because of the artifacts due to JPEG compression in 8x8 blocks
     # that are partially masked. gdalwarp will remove those artifacts
     max_diff = gdaltest.compare_ds(src_ds, ds)
-    if max_diff > 40:
-        return 'fail'
+    assert max_diff <= 40
 
     src_ds = None
 
@@ -977,11 +829,7 @@ def test_gdalwarp_33():
 
     ds = None
 
-    if cs != expected_cs:
-        gdaltest.post_reason('did not get expected checksum on alpha band')
-        print(cs)
-        print(expected_cs)
-        return 'fail'
+    assert cs == expected_cs, 'did not get expected checksum on alpha band'
 
     return 'success'
 
@@ -1015,23 +863,13 @@ def test_gdalwarp_34():
 
     os.remove('tmp/testgdalwarp34.tif')
 
-    if xsize != 20 or ysize != 20:
-        gdaltest.post_reason('bad dimensions')
-        print(xsize)
-        print(ysize)
-        return 'fail'
+    assert xsize == 20 and ysize == 20, 'bad dimensions'
 
-    if cs != 4672:
-        gdaltest.post_reason('bad checksum')
-        print(cs)
-        return 'fail'
+    assert cs == 4672, 'bad checksum'
 
     expected_gt = (440720.0, 60.0, 0.0, 3751320.0, 0.0, -60.0)
     for i in range(6):
-        if abs(gt[i] - expected_gt[i]) > 1e-5:
-            gdaltest.post_reason('bad gt')
-            print(gt)
-            return 'fail'
+        assert abs(gt[i] - expected_gt[i]) <= 1e-5, 'bad gt'
 
     return 'success'
 
@@ -1046,12 +884,10 @@ def test_gdalwarp_35():
     gdaltest.runexternal(test_cli_utilities.get_gdalwarp_path() + ' -ts 20 20 -te 440720.000 3750120.000 441920.000 3751320.000 ../gcore/data/byte.tif tmp/testgdalwarp35.tif')
 
     ds = gdal.Open('tmp/testgdalwarp35.tif')
-    if ds is None:
-        return 'fail'
+    assert ds is not None
 
-    if not gdaltest.geotransform_equals(gdal.Open('../gcore/data/byte.tif').GetGeoTransform(), ds.GetGeoTransform(), 1e-9):
-        gdaltest.post_reason('Bad geotransform')
-        return 'fail'
+    assert gdaltest.geotransform_equals(gdal.Open('../gcore/data/byte.tif').GetGeoTransform(), ds.GetGeoTransform(), 1e-9), \
+        'Bad geotransform'
 
     ds = None
 
@@ -1068,12 +904,10 @@ def test_gdalwarp_36():
     gdaltest.runexternal(test_cli_utilities.get_gdalwarp_path() + ' -tr 60 60 -te 440720.000 3750120.000 441920.000 3751320.000 ../gcore/data/byte.tif tmp/testgdalwarp36.tif')
 
     ds = gdal.Open('tmp/testgdalwarp36.tif')
-    if ds is None:
-        return 'fail'
+    assert ds is not None
 
-    if not gdaltest.geotransform_equals(gdal.Open('../gcore/data/byte.tif').GetGeoTransform(), ds.GetGeoTransform(), 1e-9):
-        gdaltest.post_reason('Bad geotransform')
-        return 'fail'
+    assert gdaltest.geotransform_equals(gdal.Open('../gcore/data/byte.tif').GetGeoTransform(), ds.GetGeoTransform(), 1e-9), \
+        'Bad geotransform'
 
     ds = None
 
@@ -1090,24 +924,18 @@ def test_gdalwarp_37():
     gdaltest.runexternal(test_cli_utilities.get_gdalwarp_path() + ' -tr 60 60 ./data/utmsmall.tif tmp/testgdalwarp37.tif')
 
     ds = gdal.Open('tmp/testgdalwarp37.tif')
-    if ds is None:
-        return 'fail'
+    assert ds is not None
 
     md = ds.GetRasterBand(1).GetMetadata()
 
     # basic metadata test
-    if 'testkey' not in md or md['testkey'] != 'test value':
-        gdaltest.post_reason('Output file metadata is wrong : { %s }' % md)
-        return 'fail'
+    assert 'testkey' in md and md['testkey'] == 'test value', \
+        ('Output file metadata is wrong : { %s }' % md)
 
     # make sure stats not copied
-    if 'STATISTICS_MEAN' in md:
-        gdaltest.post_reason('Output file contains statistics metadata')
-        return 'fail'
+    assert 'STATISTICS_MEAN' not in md, 'Output file contains statistics metadata'
 
-    if ds.GetRasterBand(1).GetMinimum() is not None:
-        gdaltest.post_reason('Output file has statistics')
-        return 'fail'
+    assert ds.GetRasterBand(1).GetMinimum() is None, 'Output file has statistics'
 
     ds = None
 
@@ -1124,10 +952,8 @@ def test_gdalwarp_38():
     gdaltest.runexternal(test_cli_utilities.get_gdalwarp_path() + ' data/withnodata.asc tmp/testgdalwarp38.tif')
 
     ds = gdal.Open('tmp/testgdalwarp38.tif')
-    if ds.GetRasterBand(1).Checksum() != 65531:
-        return 'fail'
-    if ds.GetRasterBand(1).GetNoDataValue() != -999:
-        return 'fail'
+    assert ds.GetRasterBand(1).Checksum() == 65531
+    assert ds.GetRasterBand(1).GetNoDataValue() == -999
     ds = None
 
     return 'success'
@@ -1143,8 +969,7 @@ def test_gdalwarp_39():
     gdaltest.runexternal(test_cli_utilities.get_gdalwarp_path() + ' ../gdrivers/data/float64.asc tmp/test_gdalwarp_39.tif -oo DATATYPE=Float64 -overwrite')
 
     ds = gdal.Open('tmp/test_gdalwarp_39.tif')
-    if ds.GetRasterBand(1).DataType != gdal.GDT_Float64:
-        return 'fail'
+    assert ds.GetRasterBand(1).DataType == gdal.GDT_Float64
     ds = None
 
     return 'success'
@@ -1171,16 +996,14 @@ def test_gdalwarp_40():
     gdaltest.runexternal(test_cli_utilities.get_gdalwarp_path() + ' tmp/test_gdalwarp_40_src.tif tmp/test_gdalwarp_40.tif -overwrite')
 
     ds = gdal.Open('tmp/test_gdalwarp_40.tif')
-    if ds.GetRasterBand(1).Checksum() != cs_main:
-        return 'fail'
+    assert ds.GetRasterBand(1).Checksum() == cs_main
     ds = None
 
     # Test -ovr AUTO. Should select main resolution
     gdaltest.runexternal(test_cli_utilities.get_gdalwarp_path() + ' tmp/test_gdalwarp_40_src.tif tmp/test_gdalwarp_40.tif -overwrite -ovr AUTO')
 
     ds = gdal.Open('tmp/test_gdalwarp_40.tif')
-    if ds.GetRasterBand(1).Checksum() != cs_main:
-        return 'fail'
+    assert ds.GetRasterBand(1).Checksum() == cs_main
     ds = None
 
     gdaltest.runexternal(test_cli_utilities.get_gdalwarp_path() + ' ../gcore/data/byte.tif tmp/test_gdalwarp_40.tif -overwrite -ts 5 5')
@@ -1192,8 +1015,7 @@ def test_gdalwarp_40():
     gdaltest.runexternal(test_cli_utilities.get_gdalwarp_path() + ' tmp/test_gdalwarp_40_src.tif tmp/test_gdalwarp_40.tif -overwrite -ovr NONE -ts 5 5')
 
     ds = gdal.Open('tmp/test_gdalwarp_40.tif')
-    if ds.GetRasterBand(1).Checksum() != expected_cs:
-        return 'fail'
+    assert ds.GetRasterBand(1).Checksum() == expected_cs
     ds = None
 
     gdaltest.runexternal(test_cli_utilities.get_gdalwarp_path() + ' ../gcore/data/byte.tif tmp/test_gdalwarp_40.tif -overwrite -ts 15 15')
@@ -1205,24 +1027,21 @@ def test_gdalwarp_40():
     gdaltest.runexternal(test_cli_utilities.get_gdalwarp_path() + ' tmp/test_gdalwarp_40_src.tif tmp/test_gdalwarp_40.tif -overwrite -ts 15 15')
 
     ds = gdal.Open('tmp/test_gdalwarp_40.tif')
-    if ds.GetRasterBand(1).Checksum() != expected_cs:
-        return 'fail'
+    assert ds.GetRasterBand(1).Checksum() == expected_cs
     ds = None
 
     # Should select overview 0
     gdaltest.runexternal(test_cli_utilities.get_gdalwarp_path() + ' tmp/test_gdalwarp_40_src.tif tmp/test_gdalwarp_40.tif -overwrite -ts 10 10')
 
     ds = gdal.Open('tmp/test_gdalwarp_40.tif')
-    if ds.GetRasterBand(1).Checksum() != cs_ov0:
-        return 'fail'
+    assert ds.GetRasterBand(1).Checksum() == cs_ov0
     ds = None
 
     # Should select overview 0 through VRT
     gdaltest.runexternal(test_cli_utilities.get_gdalwarp_path() + ' tmp/test_gdalwarp_40_src.tif tmp/test_gdalwarp_40.vrt -overwrite -ts 10 10 -of VRT')
 
     ds = gdal.Open('tmp/test_gdalwarp_40.vrt')
-    if ds.GetRasterBand(1).Checksum() != cs_ov0:
-        return 'fail'
+    assert ds.GetRasterBand(1).Checksum() == cs_ov0
     ds = None
 
     gdaltest.runexternal(test_cli_utilities.get_gdalwarp_path() + ' tmp/test_gdalwarp_40_src.tif -oo OVERVIEW_LEVEL=0 tmp/test_gdalwarp_40.tif -overwrite -ts 7 7')
@@ -1234,8 +1053,7 @@ def test_gdalwarp_40():
     gdaltest.runexternal(test_cli_utilities.get_gdalwarp_path() + ' tmp/test_gdalwarp_40_src.tif tmp/test_gdalwarp_40.tif -overwrite -ts 7 7')
 
     ds = gdal.Open('tmp/test_gdalwarp_40.tif')
-    if ds.GetRasterBand(1).Checksum() != expected_cs:
-        return 'fail'
+    assert ds.GetRasterBand(1).Checksum() == expected_cs
     ds = None
 
     gdaltest.runexternal(test_cli_utilities.get_gdalwarp_path() + ' tmp/test_gdalwarp_40_src.tif -ovr NONE -oo OVERVIEW_LEVEL=0 tmp/test_gdalwarp_40.tif -overwrite -ts 5 5')
@@ -1247,16 +1065,14 @@ def test_gdalwarp_40():
     gdaltest.runexternal(test_cli_utilities.get_gdalwarp_path() + ' tmp/test_gdalwarp_40_src.tif tmp/test_gdalwarp_40.tif -overwrite -ts 5 5 -ovr AUTO-1')
 
     ds = gdal.Open('tmp/test_gdalwarp_40.tif')
-    if ds.GetRasterBand(1).Checksum() != expected_cs:
-        return 'fail'
+    assert ds.GetRasterBand(1).Checksum() == expected_cs
     ds = None
 
     # Should select overview 1
     gdaltest.runexternal(test_cli_utilities.get_gdalwarp_path() + ' tmp/test_gdalwarp_40_src.tif tmp/test_gdalwarp_40.tif -overwrite -ts 5 5')
 
     ds = gdal.Open('tmp/test_gdalwarp_40.tif')
-    if ds.GetRasterBand(1).Checksum() != cs_ov1:
-        return 'fail'
+    assert ds.GetRasterBand(1).Checksum() == cs_ov1
     ds = None
 
     gdaltest.runexternal(test_cli_utilities.get_gdalwarp_path() + ' tmp/test_gdalwarp_40_src.tif -oo OVERVIEW_LEVEL=1 tmp/test_gdalwarp_40.tif -overwrite -ts 3 3')
@@ -1268,8 +1084,7 @@ def test_gdalwarp_40():
     gdaltest.runexternal(test_cli_utilities.get_gdalwarp_path() + ' tmp/test_gdalwarp_40_src.tif tmp/test_gdalwarp_40.tif -overwrite -ts 3 3')
 
     ds = gdal.Open('tmp/test_gdalwarp_40.tif')
-    if ds.GetRasterBand(1).Checksum() != expected_cs:
-        return 'fail'
+    assert ds.GetRasterBand(1).Checksum() == expected_cs
     ds = None
 
     gdaltest.runexternal(test_cli_utilities.get_gdalwarp_path() + ' tmp/test_gdalwarp_40_src.tif -oo OVERVIEW_LEVEL=1 tmp/test_gdalwarp_40.tif -overwrite -ts 20 20')
@@ -1281,8 +1096,7 @@ def test_gdalwarp_40():
     gdaltest.runexternal(test_cli_utilities.get_gdalwarp_path() + ' tmp/test_gdalwarp_40_src.tif tmp/test_gdalwarp_40.tif -overwrite -ovr 5')
 
     ds = gdal.Open('tmp/test_gdalwarp_40.tif')
-    if ds.GetRasterBand(1).Checksum() != expected_cs:
-        return 'fail'
+    assert ds.GetRasterBand(1).Checksum() == expected_cs
     ds = None
 
     return 'success'
@@ -1321,18 +1135,14 @@ def test_gdalwarp_41():
     gdaltest.runexternal(test_cli_utilities.get_gdalwarp_path() + ' tmp/test_gdalwarp_41_src.tif tmp/test_gdalwarp_41.tif -overwrite  -t_srs EPSG:4326 -te -180 -90 180 90  -wo INIT_DEST=127 -wo SKIP_NOSOURCE=YES')
 
     ds = gdal.Open('tmp/test_gdalwarp_41.tif')
-    if ds.GetRasterBand(1).Checksum() != 25945:
-        print(ds.GetRasterBand(1).Checksum())
-        return 'fail'
+    assert ds.GetRasterBand(1).Checksum() == 25945
     ds = None
 
     # Check when source fill ratio heuristics is OFF
     gdaltest.runexternal(test_cli_utilities.get_gdalwarp_path() + ' tmp/test_gdalwarp_41_src.tif tmp/test_gdalwarp_41.tif -overwrite  -t_srs EPSG:4326 -te -180 -90 180 90  -wo INIT_DEST=127 -wo SKIP_NOSOURCE=YES -wo SRC_FILL_RATIO_HEURISTICS=NO')
 
     ds = gdal.Open('tmp/test_gdalwarp_41.tif')
-    if ds.GetRasterBand(1).Checksum() != 65068:
-        print(ds.GetRasterBand(1).Checksum())
-        return 'fail'
+    assert ds.GetRasterBand(1).Checksum() == 65068
     ds = None
 
     return 'success'
@@ -1356,9 +1166,7 @@ def test_gdalwarp_42():
     ds = gdal.Open('tmp/test_gdalwarp_42.tif')
     got_cs = [ds.GetRasterBand(i + 1).Checksum() for i in range(4)]
     expected_cs = [25382, 27573, 35297, 59540]
-    if got_cs != expected_cs:
-        print(got_cs)
-        return 'fail'
+    assert got_cs == expected_cs
     ds = None
 
     # In one step
@@ -1367,9 +1175,7 @@ def test_gdalwarp_42():
     ds = gdal.Open('tmp/test_gdalwarp_42.tif')
     got_cs = [ds.GetRasterBand(i + 1).Checksum() for i in range(4)]
     expected_cs = [25382, 27573, 35297, 59540]
-    if got_cs != expected_cs:
-        print(got_cs)
-        return 'fail'
+    assert got_cs == expected_cs
     ds = None
 
     # In one step with -wo INIT_DEST=255,255,255,0
@@ -1378,9 +1184,7 @@ def test_gdalwarp_42():
     ds = gdal.Open('tmp/test_gdalwarp_42.tif')
     got_cs = [ds.GetRasterBand(i + 1).Checksum() for i in range(4)]
     expected_cs = [30111, 32302, 40026, 59540]
-    if got_cs != expected_cs:
-        print(got_cs)
-        return 'fail'
+    assert got_cs == expected_cs
     ds = None
 
     # In one step with -wo INIT_DEST=0,0,0,0
@@ -1390,9 +1194,7 @@ def test_gdalwarp_42():
     ds = gdal.Open('tmp/test_gdalwarp_42.tif')
     got_cs = [ds.GetRasterBand(i + 1).Checksum() for i in range(4)]
     expected_cs = [25382, 27573, 35297, 59540]
-    if got_cs != expected_cs:
-        print(got_cs)
-        return 'fail'
+    assert got_cs == expected_cs
     ds = None
 
     return 'success'
@@ -1412,15 +1214,11 @@ def test_gdalwarp_43():
     gdaltest.runexternal(test_cli_utilities.get_gdalwarp_path() + ' tmp/small_world.tif tmp/test_gdalwarp_43.tif -overwrite -dstalpha')
 
     ds = gdal.Open('tmp/test_gdalwarp_43.tif')
-    if ds.GetMetadataItem('NODATA_VALUES') is not None:
-        return 'fail'
-    if ds.GetMetadataItem('FOO') != 'BAR':
-        return 'fail'
+    assert ds.GetMetadataItem('NODATA_VALUES') is None
+    assert ds.GetMetadataItem('FOO') == 'BAR'
     got_cs = [ds.GetRasterBand(i + 1).Checksum() for i in range(4)]
     expected_cs = [30106, 32285, 40022, 64261]
-    if got_cs != expected_cs:
-        print(got_cs)
-        return 'fail'
+    assert got_cs == expected_cs
 
     return 'success'
 
@@ -1457,8 +1255,7 @@ def test_gdalwarp_44():
     cs4 = ds.GetRasterBand(1).Checksum()
     ds = None
 
-    if cs3 != cs4:
-        return 'fail'
+    assert cs3 == cs4
 
     return 'success'
 
@@ -1473,18 +1270,14 @@ def test_gdalwarp_45():
     gdaltest.runexternal(test_cli_utilities.get_gdalwarp_path() + ' -te_srs EPSG:4267 -te -117.641087629972 33.8915301685897 -117.628190189534 33.9024195619201 ../gcore/data/byte.tif tmp/test_gdalwarp_45.tif -overwrite')
 
     ds = gdal.Open('tmp/test_gdalwarp_45.tif')
-    if ds.GetRasterBand(1).Checksum() != 4672:
-        print(ds.GetRasterBand(1).Checksum())
-        return 'fail'
+    assert ds.GetRasterBand(1).Checksum() == 4672
 
     ds = None
 
     gdaltest.runexternal(test_cli_utilities.get_gdalwarp_path() + ' -te_srs EPSG:4267 -te -117.641087629972 33.8915301685897 -117.628190189534 33.9024195619201 -t_srs EPSG:32611 ../gcore/data/byte.tif tmp/test_gdalwarp_45.tif -overwrite')
 
     ds = gdal.Open('tmp/test_gdalwarp_45.tif')
-    if ds.GetRasterBand(1).Checksum() != 4672:
-        print(ds.GetRasterBand(1).Checksum())
-        return 'fail'
+    assert ds.GetRasterBand(1).Checksum() == 4672
 
     ds = None
 
@@ -1503,13 +1296,9 @@ def test_gdalwarp_46():
     gdaltest.runexternal(test_cli_utilities.get_gdalwarp_path() + ' ../gcore/data/utmsmall.tif tmp/test_gdalwarp_46.tif -cutline data/cutline.vrt -crop_to_cutline -overwrite')
 
     ds = gdal.Open('tmp/test_gdalwarp_46.tif')
-    if ds is None:
-        return 'fail'
+    assert ds is not None
 
-    if ds.GetRasterBand(1).Checksum() != 18837:
-        print(ds.GetRasterBand(1).Checksum())
-        gdaltest.post_reason('Bad checksum')
-        return 'fail'
+    assert ds.GetRasterBand(1).Checksum() == 18837, 'Bad checksum'
 
     ds = None
 
@@ -1517,13 +1306,9 @@ def test_gdalwarp_46():
     gdaltest.runexternal(test_cli_utilities.get_gdalwarp_path() + ' ../gcore/data/utmsmall.tif tmp/test_gdalwarp_46.tif -cutline data/cutline.vrt -crop_to_cutline -overwrite -s_srs EPSG:26711 -t_srs EPSG:26711')
 
     ds = gdal.Open('tmp/test_gdalwarp_46.tif')
-    if ds is None:
-        return 'fail'
+    assert ds is not None
 
-    if ds.GetRasterBand(1).Checksum() != 18837:
-        print(ds.GetRasterBand(1).Checksum())
-        gdaltest.post_reason('Bad checksum')
-        return 'fail'
+    assert ds.GetRasterBand(1).Checksum() == 18837, 'Bad checksum'
 
     ds = None
 
@@ -1532,13 +1317,9 @@ def test_gdalwarp_46():
     gdaltest.runexternal(test_cli_utilities.get_gdalwarp_path() + ' ../gcore/data/utmsmall.tif tmp/test_gdalwarp_46.tif -cutline tmp/cutline_4326.shp -crop_to_cutline -overwrite -t_srs EPSG:32711')
 
     ds = gdal.Open('tmp/test_gdalwarp_46.tif')
-    if ds is None:
-        return 'fail'
+    assert ds is not None
 
-    if ds.GetRasterBand(1).Checksum() != 19582:
-        print(ds.GetRasterBand(1).Checksum())
-        gdaltest.post_reason('Bad checksum')
-        return 'fail'
+    assert ds.GetRasterBand(1).Checksum() == 19582, 'Bad checksum'
 
     ds = None
 
diff --git a/autotest/utilities/test_gdalwarp_lib.py b/autotest/utilities/test_gdalwarp_lib.py
index 77a285cdd1f0..3ee1831369ed 100755
--- a/autotest/utilities/test_gdalwarp_lib.py
+++ b/autotest/utilities/test_gdalwarp_lib.py
@@ -38,6 +38,7 @@
 from osgeo import gdal, ogr, osr
 import gdaltest
 import ogrtest
+import pytest
 
 ###############################################################################
 # Simple test
@@ -48,9 +49,7 @@ def test_gdalwarp_lib_1():
     ds1 = gdal.Open('../gcore/data/byte.tif')
     dstDS = gdal.Warp('tmp/testgdalwarp1.tif', ds1)
 
-    if dstDS.GetRasterBand(1).Checksum() != 4672:
-        gdaltest.post_reason('Bad checksum')
-        return 'fail'
+    assert dstDS.GetRasterBand(1).Checksum() == 4672, 'Bad checksum'
 
     dstDS = None
 
@@ -65,9 +64,7 @@ def test_gdalwarp_lib_2():
     ds1 = gdal.Open('../gcore/data/byte.tif')
     dstDS = gdal.Warp('tmp/testgdalwarp2.tif'.encode('ascii').decode('ascii'), [ds1], format='GTiff')
 
-    if dstDS.GetRasterBand(1).Checksum() != 4672:
-        gdaltest.post_reason('Bad checksum')
-        return 'fail'
+    assert dstDS.GetRasterBand(1).Checksum() == 4672, 'Bad checksum'
 
     dstDS = None
 
@@ -82,13 +79,9 @@ def test_gdalwarp_lib_3():
     ds1 = gdal.Open('../gcore/data/byte.tif')
     dstDS = gdal.Warp('', ds1, format='MEM', outputType=gdal.GDT_Int16)
 
-    if dstDS.GetRasterBand(1).DataType != gdal.GDT_Int16:
-        gdaltest.post_reason('Bad data type')
-        return 'fail'
+    assert dstDS.GetRasterBand(1).DataType == gdal.GDT_Int16, 'Bad data type'
 
-    if dstDS.GetRasterBand(1).Checksum() != 4672:
-        gdaltest.post_reason('Bad checksum')
-        return 'fail'
+    assert dstDS.GetRasterBand(1).Checksum() == 4672, 'Bad checksum'
 
     dstDS = None
 
@@ -103,9 +96,7 @@ def test_gdalwarp_lib_4():
     ds1 = gdal.Open('../gcore/data/byte.tif')
     dstDS = gdal.Warp('', ds1, format='MEM', dstSRS='EPSG:32611')
 
-    if dstDS.GetRasterBand(1).Checksum() != 4672:
-        gdaltest.post_reason('Bad checksum')
-        return 'fail'
+    assert dstDS.GetRasterBand(1).Checksum() == 4672, 'Bad checksum'
 
     dstDS = None
 
@@ -122,13 +113,10 @@ def test_gdalwarp_lib_5():
     ds1 = gdal.Translate('tmp/testgdalwarp_gcp.tif', ds, outputSRS='EPSG:26711', GCPs=gcpList)
     dstDS = gdal.Warp('', ds1, format='MEM', tps=True)
 
-    if dstDS.GetRasterBand(1).Checksum() != 4672:
-        gdaltest.post_reason('Bad checksum')
-        return 'fail'
+    assert dstDS.GetRasterBand(1).Checksum() == 4672, 'Bad checksum'
 
-    if not gdaltest.geotransform_equals(ds.GetGeoTransform(), dstDS.GetGeoTransform(), 1e-9):
-        gdaltest.post_reason('Bad geotransform')
-        return 'fail'
+    assert gdaltest.geotransform_equals(ds.GetGeoTransform(), dstDS.GetGeoTransform(), 1e-9), \
+        'Bad geotransform'
 
     dstDS = None
 
@@ -143,13 +131,10 @@ def test_gdalwarp_lib_6():
     ds1 = gdal.Open('tmp/testgdalwarp_gcp.tif')
     dstDS = gdal.Warp('', ds1, format='MEM', tps=True)
 
-    if dstDS.GetRasterBand(1).Checksum() != 4672:
-        gdaltest.post_reason('Bad checksum')
-        return 'fail'
+    assert dstDS.GetRasterBand(1).Checksum() == 4672, 'Bad checksum'
 
-    if not gdaltest.geotransform_equals(gdal.Open('../gcore/data/byte.tif').GetGeoTransform(), dstDS.GetGeoTransform(), 1e-9):
-        gdaltest.post_reason('Bad geotransform')
-        return 'fail'
+    assert gdaltest.geotransform_equals(gdal.Open('../gcore/data/byte.tif').GetGeoTransform(), dstDS.GetGeoTransform(), 1e-9), \
+        'Bad geotransform'
 
     dstDS = None
 
@@ -163,13 +148,11 @@ def test_gdalwarp_lib_7():
 
     ds1 = gdal.Open('tmp/testgdalwarp_gcp.tif')
     dstDS = gdal.Warp('', [ds1], format='MEM', xRes=120, yRes=120)
-    if dstDS is None:
-        return 'fail'
+    assert dstDS is not None
 
     expected_gt = (440720.0, 120.0, 0.0, 3751320.0, 0.0, -120.0)
-    if not gdaltest.geotransform_equals(expected_gt, dstDS.GetGeoTransform(), 1e-9):
-        gdaltest.post_reason('Bad geotransform')
-        return 'fail'
+    assert gdaltest.geotransform_equals(expected_gt, dstDS.GetGeoTransform(), 1e-9), \
+        'Bad geotransform'
 
     dstDS = None
 
@@ -183,13 +166,11 @@ def test_gdalwarp_lib_8():
 
     ds1 = gdal.Open('tmp/testgdalwarp_gcp.tif')
     dstDS = gdal.Warp('', [ds1], format='MEM', width=10, height=10)
-    if dstDS is None:
-        return 'fail'
+    assert dstDS is not None
 
     expected_gt = (440720.0, 120.0, 0.0, 3751320.0, 0.0, -120.0)
-    if not gdaltest.geotransform_equals(expected_gt, dstDS.GetGeoTransform(), 1e-9):
-        gdaltest.post_reason('Bad geotransform')
-        return 'fail'
+    assert gdaltest.geotransform_equals(expected_gt, dstDS.GetGeoTransform(), 1e-9), \
+        'Bad geotransform'
 
     dstDS = None
 
@@ -203,9 +184,8 @@ def test_gdalwarp_lib_9():
 
     ds = gdal.Warp('', '../gcore/data/byte.tif', format='MEM', outputBounds=[440720.000, 3750120.000, 441920.000, 3751320.000])
 
-    if not gdaltest.geotransform_equals(gdal.Open('../gcore/data/byte.tif').GetGeoTransform(), ds.GetGeoTransform(), 1e-9):
-        gdaltest.post_reason('Bad geotransform')
-        return 'fail'
+    assert gdaltest.geotransform_equals(gdal.Open('../gcore/data/byte.tif').GetGeoTransform(), ds.GetGeoTransform(), 1e-9), \
+        'Bad geotransform'
 
     ds = None
 
@@ -219,10 +199,7 @@ def test_gdalwarp_lib_10():
 
     ds = gdal.Warp('', '../gcore/data/byte.tif', format='MEM', width=40, height=40, resampleAlg=gdal.GRIORA_NearestNeighbour)
 
-    if ds.GetRasterBand(1).Checksum() != 18784:
-        print(ds.GetRasterBand(1).Checksum())
-        gdaltest.post_reason('Bad checksum')
-        return 'fail'
+    assert ds.GetRasterBand(1).Checksum() == 18784, 'Bad checksum'
 
     ds = None
 
@@ -320,15 +297,9 @@ def test_gdalwarp_lib_15():
 
     ds = gdal.Warp('', 'tmp/testgdalwarp_gcp.tif', format='MEM', dstSRS='EPSG:32610', dstNodata=1)
 
-    if ds.GetRasterBand(1).GetNoDataValue() != 1:
-        print(ds.GetRasterBand(1).GetNoDataValue())
-        gdaltest.post_reason('Bad nodata value')
-        return 'fail'
+    assert ds.GetRasterBand(1).GetNoDataValue() == 1, 'Bad nodata value'
 
-    if ds.GetRasterBand(1).Checksum() != 4523:
-        print(ds.GetRasterBand(1).Checksum())
-        gdaltest.post_reason('Bad checksum')
-        return 'fail'
+    assert ds.GetRasterBand(1).Checksum() == 4523, 'Bad checksum'
 
     ds = None
 
@@ -341,13 +312,9 @@ def test_gdalwarp_lib_15():
 def test_gdalwarp_lib_16():
 
     ds = gdal.Warp('/vsimem/test_gdalwarp_lib_16.vrt', 'tmp/testgdalwarp_gcp.tif', format='VRT')
-    if ds is None:
-        return 'fail'
+    assert ds is not None
 
-    if ds.GetRasterBand(1).Checksum() != 4672:
-        print(ds.GetRasterBand(1).Checksum())
-        gdaltest.post_reason('Bad checksum')
-        return 'fail'
+    assert ds.GetRasterBand(1).Checksum() == 4672, 'Bad checksum'
 
     ds = None
 
@@ -356,8 +323,7 @@ def test_gdalwarp_lib_16():
     # Cannot write file
     with gdaltest.error_handler():
         ds = gdal.Warp('/i_dont/exist/test_gdalwarp_lib_16.vrt', 'tmp/testgdalwarp_gcp.tif', format='VRT')
-    if ds is not None:
-        return 'fail'
+    assert ds is None
 
     return 'success'
 
@@ -368,12 +334,9 @@ def test_gdalwarp_lib_16():
 def test_gdalwarp_lib_17():
 
     ds = gdal.Warp('', '../gcore/data/rgbsmall.tif', format='MEM', dstAlpha=True)
-    if ds is None:
-        return 'fail'
+    assert ds is not None
 
-    if ds.GetRasterBand(4) is None:
-        gdaltest.post_reason('No alpha band generated')
-        return 'fail'
+    assert ds.GetRasterBand(4) is not None, 'No alpha band generated'
 
     ds = None
 
@@ -386,13 +349,9 @@ def test_gdalwarp_lib_17():
 def test_gdalwarp_lib_19():
 
     ds = gdal.Warp('', 'tmp/testgdalwarp_gcp.tif', format='MEM', errorThreshold=0)
-    if ds is None:
-        return 'fail'
+    assert ds is not None
 
-    if ds.GetRasterBand(1).Checksum() != 4672:
-        print(ds.GetRasterBand(1).Checksum())
-        gdaltest.post_reason('Bad checksum')
-        return 'fail'
+    assert ds.GetRasterBand(1).Checksum() == 4672, 'Bad checksum'
 
     ds = None
 
@@ -405,13 +364,9 @@ def test_gdalwarp_lib_19():
 def test_gdalwarp_lib_21():
 
     ds = gdal.Warp('', '../gcore/data/utmsmall.tif', format='MEM', cutlineDSName='data/cutline.vrt', cutlineLayer='cutline')
-    if ds is None:
-        return 'fail'
+    assert ds is not None
 
-    if ds.GetRasterBand(1).Checksum() != 19139:
-        print(ds.GetRasterBand(1).Checksum())
-        gdaltest.post_reason('Bad checksum')
-        return 'fail'
+    assert ds.GetRasterBand(1).Checksum() == 19139, 'Bad checksum'
 
     ds = None
 
@@ -424,13 +379,9 @@ def test_gdalwarp_lib_21():
 def test_gdalwarp_lib_23():
 
     ds = gdal.Warp('', '../gcore/data/utmsmall.tif', format='MEM', warpOptions=['CUTLINE_ALL_TOUCHED=TRUE'], cutlineDSName='data/cutline.vrt', cutlineLayer='cutline')
-    if ds is None:
-        return 'fail'
+    assert ds is not None
 
-    if ds.GetRasterBand(1).Checksum() != 20123:
-        print(ds.GetRasterBand(1).Checksum())
-        gdaltest.post_reason('Bad checksum')
-        return 'fail'
+    assert ds.GetRasterBand(1).Checksum() == 20123, 'Bad checksum'
 
     ds = None
 
@@ -443,19 +394,14 @@ def test_gdalwarp_lib_23():
 def test_gdalwarp_lib_32():
 
     ds = gdal.Warp('', '../gcore/data/byte.tif', format='MEM', targetAlignedPixels=True, xRes=100, yRes=50)
-    if ds is None:
-        return 'fail'
+    assert ds is not None
 
     expected_gt = (440700.0, 100.0, 0.0, 3751350.0, 0.0, -50.0)
     got_gt = ds.GetGeoTransform()
-    if not gdaltest.geotransform_equals(expected_gt, got_gt, 1e-9):
-        gdaltest.post_reason('Bad geotransform')
-        print(got_gt)
-        return 'fail'
+    assert gdaltest.geotransform_equals(expected_gt, got_gt, 1e-9), 'Bad geotransform'
 
-    if ds.RasterXSize != 13 or ds.RasterYSize != 25:
-        gdaltest.post_reason('Wrong raster dimensions : %d x %d' % (ds.RasterXSize, ds.RasterYSize))
-        return 'fail'
+    assert ds.RasterXSize == 13 and ds.RasterYSize == 25, \
+        ('Wrong raster dimensions : %d x %d' % (ds.RasterXSize, ds.RasterYSize))
 
     ds = None
 
@@ -477,23 +423,13 @@ def test_gdalwarp_lib_34():
     ysize = ds.RasterYSize
     ds = None
 
-    if xsize != 20 or ysize != 20:
-        gdaltest.post_reason('bad dimensions')
-        print(xsize)
-        print(ysize)
-        return 'fail'
+    assert xsize == 20 and ysize == 20, 'bad dimensions'
 
-    if cs != 4672:
-        gdaltest.post_reason('bad checksum')
-        print(cs)
-        return 'fail'
+    assert cs == 4672, 'bad checksum'
 
     expected_gt = (440720.0, 60.0, 0.0, 3751320.0, 0.0, -60.0)
     for i in range(6):
-        if abs(gt[i] - expected_gt[i]) > 1e-5:
-            gdaltest.post_reason('bad gt')
-            print(gt)
-            return 'fail'
+        assert abs(gt[i] - expected_gt[i]) <= 1e-5, 'bad gt'
 
     return 'success'
 
@@ -504,9 +440,7 @@ def test_gdalwarp_lib_34():
 def test_gdalwarp_lib_45():
 
     ds = gdal.Warp('', ['../gcore/data/byte.tif'], format='MEM', outputBounds=[-117.641087629972, 33.8915301685897, -117.628190189534, 33.9024195619201], outputBoundsSRS='EPSG:4267')
-    if ds.GetRasterBand(1).Checksum() != 4672:
-        print(ds.GetRasterBand(1).Checksum())
-        return 'fail'
+    assert ds.GetRasterBand(1).Checksum() == 4672
 
     ds = None
 
@@ -519,10 +453,7 @@ def test_gdalwarp_lib_45():
 def test_gdalwarp_lib_46():
 
     ds = gdal.Warp('', ['../gcore/data/utmsmall.tif'], format='MEM', cutlineDSName='data/cutline.vrt', cropToCutline=True)
-    if ds.GetRasterBand(1).Checksum() != 18837:
-        print(ds.GetRasterBand(1).Checksum())
-        gdaltest.post_reason('Bad checksum')
-        return 'fail'
+    assert ds.GetRasterBand(1).Checksum() == 18837, 'Bad checksum'
 
     ds = None
 
@@ -546,12 +477,8 @@ def test_gdalwarp_lib_46():
                    cropToCutline=True)
     got_gt = ds.GetGeoTransform()
     expected_gt = (2.15, 0.05, 0.0, 48.8, 0.0, -0.05)
-    if max([abs(got_gt[i]-expected_gt[i]) for i in range(6)]) > 1e-8:
-        print(got_gt)
-        return 'fail'
-    if ds.RasterXSize != 13 or ds.RasterYSize != 13:
-        print(ds.RasterXSize, ds.RasterYSize)
-        return 'fail'
+    assert max([abs(got_gt[i]-expected_gt[i]) for i in range(6)]) <= 1e-8
+    assert ds.RasterXSize == 13 and ds.RasterYSize == 13
 
     # Same but with CUTLINE_ALL_TOUCHED=YES: the extent should be larger
     # than the cutline
@@ -560,12 +487,8 @@ def test_gdalwarp_lib_46():
                    warpOptions=['CUTLINE_ALL_TOUCHED=YES'])
     got_gt = ds.GetGeoTransform()
     expected_gt = (2.1, 0.05, 0.0, 48.85, 0.0, -0.05)
-    if max([abs(got_gt[i]-expected_gt[i]) for i in range(6)]) > 1e-8:
-        print(got_gt)
-        return 'fail'
-    if ds.RasterXSize != 15 or ds.RasterYSize != 15:
-        print(ds.RasterXSize, ds.RasterYSize)
-        return 'fail'
+    assert max([abs(got_gt[i]-expected_gt[i]) for i in range(6)]) <= 1e-8
+    assert ds.RasterXSize == 15 and ds.RasterYSize == 15
 
     # Test numeric stability when the cutline is exactly on pixel boundaries
     cutline_ds = ogr.GetDriverByName('GeoJSON').CreateDataSource(cutlineDSName)
@@ -582,12 +505,8 @@ def test_gdalwarp_lib_46():
                        cropToCutline=True, warpOptions=warpOptions)
         got_gt = ds.GetGeoTransform()
         expected_gt = (2.15, 0.05, 0.0, 48.85, 0.0, -0.05)
-        if max([abs(got_gt[i]-expected_gt[i]) for i in range(6)]) > 1e-8:
-            print(got_gt)
-            return 'fail'
-        if ds.RasterXSize != 14 or ds.RasterYSize != 14:
-            print(ds.RasterXSize, ds.RasterYSize)
-            return 'fail'
+        assert max([abs(got_gt[i]-expected_gt[i]) for i in range(6)]) <= 1e-8
+        assert ds.RasterXSize == 14 and ds.RasterYSize == 14
 
     gdal.Unlink(cutlineDSName)
 
@@ -607,16 +526,11 @@ def test_gdalwarp_lib_100():
 
     tab = [0]
     ds = gdal.Warp('', '../gcore/data/byte.tif', format='MEM', callback=mycallback, callback_data=tab)
-    if ds is None:
-        return 'fail'
+    assert ds is not None
 
-    if ds.GetRasterBand(1).Checksum() != 4672:
-        gdaltest.post_reason('Bad checksum')
-        return 'fail'
+    assert ds.GetRasterBand(1).Checksum() == 4672, 'Bad checksum'
 
-    if tab[0] != 1.0:
-        gdaltest.post_reason('Bad percentage')
-        return 'fail'
+    assert tab[0] == 1.0, 'Bad percentage'
 
     ds = None
 
@@ -629,9 +543,7 @@ def test_gdalwarp_lib_100():
 def test_gdalwarp_lib_101():
 
     ds = gdal.Warp('', '../gdrivers/data/small_world_pct.tif', format='MEM')
-    if ds.GetRasterBand(1).GetColorTable() is None:
-        gdaltest.post_reason('Did not get color table')
-        return 'fail'
+    assert ds.GetRasterBand(1).GetColorTable() is not None, 'Did not get color table'
 
     return 'success'
 
@@ -644,9 +556,7 @@ def test_gdalwarp_lib_102():
     no_band_ds = gdal.GetDriverByName('MEM').Create('no band', 1, 1, 0)
     with gdaltest.error_handler():
         ds = gdal.Warp('', ['../gdrivers/data/small_world_pct.tif', no_band_ds], format='MEM')
-    if ds is not None:
-        gdaltest.post_reason('Did not expected dataset')
-        return 'fail'
+    assert ds is None, 'Did not expected dataset'
     return 'success'
 
 ###############################################################################
@@ -657,9 +567,7 @@ def test_gdalwarp_lib_103():
 
     with gdaltest.error_handler():
         ds = gdal.Warp('', ['../gdrivers/data/small_world_pct.tif', '../gcore/data/stefan_full_rgba.tif'], format='MEM')
-    if ds is not None:
-        gdaltest.post_reason('Did not expected dataset')
-        return 'fail'
+    assert ds is None, 'Did not expected dataset'
     return 'success'
 
 ###############################################################################
@@ -670,9 +578,7 @@ def test_gdalwarp_lib_104():
 
     with gdaltest.error_handler():
         ds = gdal.Warp('', [], format='MEM')
-    if ds is not None:
-        gdaltest.post_reason('Did not expected dataset')
-        return 'fail'
+    assert ds is None, 'Did not expected dataset'
     return 'success'
 
 ###############################################################################
@@ -697,9 +603,7 @@ def test_gdalwarp_lib_106():
 
     with gdaltest.error_handler():
         ds = gdal.Warp('/not_existing_dir/not_existing_file', ['../gdrivers/data/small_world_pct.tif', '../gcore/data/byte.tif'])
-    if ds is not None:
-        gdaltest.post_reason('Did not expected dataset')
-        return 'fail'
+    assert ds is None, 'Did not expected dataset'
     return 'success'
 
 ###############################################################################
@@ -709,10 +613,7 @@ def test_gdalwarp_lib_106():
 def test_gdalwarp_lib_107():
 
     ds = gdal.Warp('', '../gcore/data/byte.tif', format='MEM', width=20)
-    if ds.GetRasterBand(1).Checksum() != 4672:
-        print(ds.GetRasterBand(1).Checksum())
-        gdaltest.post_reason('Bad checksum')
-        return 'fail'
+    assert ds.GetRasterBand(1).Checksum() == 4672, 'Bad checksum'
 
     return 'success'
 
@@ -723,10 +624,7 @@ def test_gdalwarp_lib_107():
 def test_gdalwarp_lib_108():
 
     ds = gdal.Warp('', '../gcore/data/byte.tif', format='MEM', height=20)
-    if ds.GetRasterBand(1).Checksum() != 4672:
-        print(ds.GetRasterBand(1).Checksum())
-        gdaltest.post_reason('Bad checksum')
-        return 'fail'
+    assert ds.GetRasterBand(1).Checksum() == 4672, 'Bad checksum'
 
     return 'success'
 
@@ -738,9 +636,7 @@ def test_gdalwarp_lib_109():
 
     with gdaltest.error_handler():
         ds = gdal.Warp('', '../gcore/data/byte.tif', format='MEM', cutlineDSName='/does/not/exist')
-    if ds is not None:
-        gdaltest.post_reason('Did not expected dataset')
-        return 'fail'
+    assert ds is None, 'Did not expected dataset'
     return 'success'
 
 ###############################################################################
@@ -751,9 +647,7 @@ def test_gdalwarp_lib_110():
 
     with gdaltest.error_handler():
         ds = gdal.Warp('', '../gcore/data/byte.tif', format='MEM', cutlineDSName='data/cutline.vrt', cutlineLayer='wrong_name')
-    if ds is not None:
-        gdaltest.post_reason('Did not expected dataset')
-        return 'fail'
+    assert ds is None, 'Did not expected dataset'
     return 'success'
 
 ###############################################################################
@@ -763,13 +657,9 @@ def test_gdalwarp_lib_110():
 def test_gdalwarp_lib_111():
 
     ds = gdal.Warp('', '../gcore/data/utmsmall.tif', format='MEM', cutlineDSName='data/cutline.vrt', cutlineSQL='SELECT * FROM cutline', cutlineWhere='1 = 1')
-    if ds is None:
-        return 'fail'
+    assert ds is not None
 
-    if ds.GetRasterBand(1).Checksum() != 19139:
-        print(ds.GetRasterBand(1).Checksum())
-        gdaltest.post_reason('Bad checksum')
-        return 'fail'
+    assert ds.GetRasterBand(1).Checksum() == 19139, 'Bad checksum'
 
     ds = None
 
@@ -789,9 +679,7 @@ def test_gdalwarp_lib_112():
     ds = None
     with gdaltest.error_handler():
         ds = gdal.Warp('', '../gcore/data/utmsmall.tif', format='MEM', cutlineDSName='/vsimem/cutline.shp', cutlineSQL='SELECT * FROM cutline')
-    if ds is not None:
-        gdaltest.post_reason('Did not expected dataset')
-        return 'fail'
+    assert ds is None, 'Did not expected dataset'
     ogr.GetDriverByName('ESRI Shapefile').DeleteDataSource('/vsimem/cutline.shp')
 
     return 'success'
@@ -811,9 +699,7 @@ def test_gdalwarp_lib_113():
     ds = None
     with gdaltest.error_handler():
         ds = gdal.Warp('', '../gcore/data/utmsmall.tif', format='MEM', cutlineDSName='/vsimem/cutline.shp')
-    if ds is not None:
-        gdaltest.post_reason('Did not expected dataset')
-        return 'fail'
+    assert ds is None, 'Did not expected dataset'
     ogr.GetDriverByName('ESRI Shapefile').DeleteDataSource('/vsimem/cutline.shp')
 
     return 'success'
@@ -829,9 +715,7 @@ def test_gdalwarp_lib_114():
     ds = None
     with gdaltest.error_handler():
         ds = gdal.Warp('', '../gcore/data/utmsmall.tif', format='MEM', cutlineDSName='/vsimem/cutline.shp')
-    if ds is not None:
-        gdaltest.post_reason('Did not expected dataset')
-        return 'fail'
+    assert ds is None, 'Did not expected dataset'
     ogr.GetDriverByName('ESRI Shapefile').DeleteDataSource('/vsimem/cutline.shp')
 
     return 'success'
@@ -847,9 +731,7 @@ def test_gdalwarp_lib_115():
 
     with gdaltest.error_handler():
         ret = gdal.Warp(out_ds, no_band_ds, cutlineDSName='data/cutline.vrt', cutlineLayer='cutline')
-    if ret != 0:
-        gdaltest.post_reason('Expected failure')
-        return 'fail'
+    assert ret == 0, 'Expected failure'
 
     return 'success'
 
@@ -861,9 +743,7 @@ def test_gdalwarp_lib_116():
 
     with gdaltest.error_handler():
         ds = gdal.Warp('', '../gcore/data/utmsmall.tif', format='MEM', cutlineDSName='data/cutline.vrt', cutlineLayer='cutline', cropToCutline=True, transformerOptions=['SRC_SRS=invalid'])
-    if ds is not None:
-        gdaltest.post_reason('Did not expected dataset')
-        return 'fail'
+    assert ds is None, 'Did not expected dataset'
 
     return 'success'
 
@@ -875,9 +755,7 @@ def test_gdalwarp_lib_117():
 
     with gdaltest.error_handler():
         ds = gdal.Warp('', '../gcore/data/utmsmall.tif', format='MEM', cutlineDSName='data/cutline.vrt', cutlineLayer='cutline', cropToCutline=True, transformerOptions=['DST_SRS=invalid'])
-    if ds is not None:
-        gdaltest.post_reason('Did not expected dataset')
-        return 'fail'
+    assert ds is None, 'Did not expected dataset'
 
     return 'success'
 
@@ -889,9 +767,7 @@ def test_gdalwarp_lib_118():
 
     with gdaltest.error_handler():
         ds = gdal.Warp('', [], format='MEM', cutlineDSName='data/cutline.vrt', cutlineLayer='cutline', cropToCutline=True)
-    if ds is not None:
-        gdaltest.post_reason('Did not expected dataset')
-        return 'fail'
+    assert ds is None, 'Did not expected dataset'
 
     return 'success'
 
@@ -904,9 +780,7 @@ def test_gdalwarp_lib_119():
     no_proj_ds = gdal.GetDriverByName('MEM').Create('no_proj_ds', 1, 1)
     with gdaltest.error_handler():
         ds = gdal.Warp('', no_proj_ds, format='MEM', cutlineDSName='data/cutline.vrt', cutlineLayer='cutline', cropToCutline=True)
-    if ds is not None:
-        gdaltest.post_reason('Did not expected dataset')
-        return 'fail'
+    assert ds is None, 'Did not expected dataset'
 
     return 'success'
 
@@ -920,9 +794,7 @@ def test_gdalwarp_lib_120():
     dummy_proj_ds.SetProjection('dummy')
     with gdaltest.error_handler():
         ds = gdal.Warp('', dummy_proj_ds, format='MEM', cutlineDSName='data/cutline.vrt', cutlineLayer='cutline', cropToCutline=True)
-    if ds is not None:
-        gdaltest.post_reason('Did not expected dataset')
-        return 'fail'
+    assert ds is None, 'Did not expected dataset'
 
     return 'success'
 
@@ -963,9 +835,7 @@ def test_gdalwarp_lib_121():
 def test_gdalwarp_lib_122():
 
     ds = gdal.Warp('', '../gcore/data/byte.tif', format='VRT')
-    if ds.GetRasterBand(1).Checksum() != 4672:
-        gdaltest.post_reason('Bad checksum')
-        return 'fail'
+    assert ds.GetRasterBand(1).Checksum() == 4672, 'Bad checksum'
     return 'success'
 
 ###############################################################################
@@ -976,8 +846,7 @@ def test_gdalwarp_lib_123():
 
     with gdaltest.error_handler():
         ds = gdal.Warp('', '../gcore/data/byte_truncated.tif', format='MEM')
-    if ds is not None:
-        return 'fail'
+    assert ds is None
 
     return 'success'
 
@@ -1001,11 +870,7 @@ def test_gdalwarp_lib_124():
     gdal.Warp(out_ds, src_ds)
 
     cs = out_ds.GetRasterBand(1).Checksum()
-    if cs != expected_cs:
-        gdaltest.post_reason('Bad checksum')
-        print(cs)
-        print(expected_cs)
-        return 'fail'
+    assert cs == expected_cs, 'Bad checksum'
 
     return 'success'
 
@@ -1029,9 +894,7 @@ def test_gdalwarp_lib_125():
 
         out_ds = gdal.Warp('', [src_ds_1, src_ds_2], format='MEM')
 
-        if out_ds.GetRasterBand(1).GetMetadataItem('STATISTICS_MINIUM') is not None:
-            print(i)
-            return 'fail'
+        assert out_ds.GetRasterBand(1).GetMetadataItem('STATISTICS_MINIUM') is None, i
 
     return 'success'
 
@@ -1053,9 +916,7 @@ def test_gdalwarp_lib_126():
     ds = None
     with gdaltest.error_handler():
         ds = gdal.Warp('', '../gcore/data/utmsmall.tif', format='MEM', cutlineDSName='/vsimem/cutline.shp')
-    if ds is not None:
-        gdaltest.post_reason('Did not expected dataset')
-        return 'fail'
+    assert ds is None, 'Did not expected dataset'
     ogr.GetDriverByName('ESRI Shapefile').DeleteDataSource('/vsimem/cutline.shp')
 
     return 'success'
@@ -1067,14 +928,8 @@ def test_gdalwarp_lib_126():
 def test_gdalwarp_lib_127():
 
     ds = gdal.Warp('', '../gcore/data/byte.tif', format='MEM', srcNodata=1)
-    if ds.GetRasterBand(1).GetNoDataValue() != 1:
-        gdaltest.post_reason('bad nodata value')
-        print(ds.GetRasterBand(1).GetNoDataValue())
-        return 'fail'
-    if ds.GetRasterBand(1).Checksum() != 4672:
-        gdaltest.post_reason('bad checksum')
-        print(ds.GetRasterBand(1).Checksum())
-        return 'fail'
+    assert ds.GetRasterBand(1).GetNoDataValue() == 1, 'bad nodata value'
+    assert ds.GetRasterBand(1).Checksum() == 4672, 'bad checksum'
 
     return 'success'
 
@@ -1120,10 +975,7 @@ def test_gdalwarp_lib_128():
                    transformerOptions=['RPC_DEM=data/test_gdalwarp_lib_128_dem.tif'])
     cs = ds.GetRasterBand(1).Checksum()
 
-    if cs != 4248:
-        gdaltest.post_reason('bad checksum')
-        print(cs)
-        return 'fail'
+    assert cs == 4248, 'bad checksum'
 
     # Below steps depend on GEOS
     if not ogrtest.have_geos():
@@ -1139,10 +991,7 @@ def test_gdalwarp_lib_128():
     gdal.SetConfigOption('GDALWARP_DENSIFY_CUTLINE', None)
     cs = ds.GetRasterBand(1).Checksum()
 
-    if cs != 4248:
-        gdaltest.post_reason('bad checksum')
-        print(cs)
-        return 'fail'
+    assert cs == 4248, 'bad checksum'
 
     gdal.SetConfigOption('GDALWARP_DENSIFY_CUTLINE', 'NO')
     with gdaltest.error_handler():
@@ -1152,9 +1001,7 @@ def test_gdalwarp_lib_128():
                        xRes=0.000226555, yRes=0.000226555,
                        transformerOptions=['RPC_DEM=data/test_gdalwarp_lib_128_dem.tif'])
     gdal.SetConfigOption('GDALWARP_DENSIFY_CUTLINE', None)
-    if ds is not None:
-        gdaltest.post_reason('expected none return')
-        return 'fail'
+    assert ds is None, 'expected none return'
 
     gdal.Unlink(cutlineDSName)
 
@@ -1205,10 +1052,7 @@ def test_gdalwarp_lib_129():
                    transformerOptions=['RPC_DEM=data/test_gdalwarp_lib_129_dem.vrt'])
     cs = ds.GetRasterBand(1).Checksum()
 
-    if cs != 399:
-        gdaltest.post_reason('bad checksum')
-        print(cs)
-        return 'fail'
+    assert cs == 399, 'bad checksum'
 
     gdal.Unlink(cutlineDSName)
 
@@ -1232,20 +1076,14 @@ def test_gdalwarp_lib_130():
     src_ds.GetRasterBand(5).Fill(255)
 
     ds = gdal.Warp('/vsimem/test_gdalwarp_lib_130_dst.tif', src_ds)
-    if ds.GetRasterBand(1).GetColorInterpretation() != gdal.GCI_RedBand:
-        gdaltest.post_reason('bad color interpretation')
-        return 'fail'
-    if ds.GetRasterBand(5).GetColorInterpretation() != gdal.GCI_AlphaBand:
-        gdaltest.post_reason('bad color interpretation')
-        return 'fail'
+    assert ds.GetRasterBand(1).GetColorInterpretation() == gdal.GCI_RedBand, \
+        'bad color interpretation'
+    assert ds.GetRasterBand(5).GetColorInterpretation() == gdal.GCI_AlphaBand, \
+        'bad color interpretation'
     expected_val = [1, 2, 3, 4, 255]
     for i in range(5):
         data = struct.unpack('B' * 1, ds.GetRasterBand(i + 1).ReadRaster())[0]
-        if data != expected_val[i]:
-            gdaltest.post_reason('bad checksum')
-            print(i)
-            print(data)
-            return 'fail'
+        assert data == expected_val[i], 'bad checksum'
 
     # Wrap onto existing file
     for i in range(5):
@@ -1253,18 +1091,13 @@ def test_gdalwarp_lib_130():
     gdal.Warp(ds, src_ds)
     for i in range(5):
         data = struct.unpack('B' * 1, ds.GetRasterBand(i + 1).ReadRaster())[0]
-        if data != expected_val[i]:
-            gdaltest.post_reason('bad checksum')
-            print(i)
-            print(data)
-            return 'fail'
+        assert data == expected_val[i], 'bad checksum'
 
     src_ds = None
     ds = None
 
-    if gdal.VSIStatL('/vsimem/test_gdalwarp_lib_130_dst.tif.aux.xml') is not None:
-        gdaltest.post_reason('got PAM file')
-        return 'fail'
+    assert gdal.VSIStatL('/vsimem/test_gdalwarp_lib_130_dst.tif.aux.xml') is None, \
+        'got PAM file'
 
     gdal.Unlink('/vsimem/test_gdalwarp_lib_130.tif')
     gdal.Unlink('/vsimem/test_gdalwarp_lib_130_dst.tif')
@@ -1288,11 +1121,7 @@ def test_gdalwarp_lib_131():
     expected_val = [1, 0]
     for i in range(2):
         data = struct.unpack('B' * 1, ds.GetRasterBand(i + 1).ReadRaster())[0]
-        if data != expected_val[i]:
-            gdaltest.post_reason('bad checksum')
-            print(i)
-            print(data)
-            return 'fail'
+        assert data == expected_val[i], 'bad checksum'
     src_ds = None
     ds = None
     gdal.Unlink('/vsimem/test_gdalwarp_lib_131.tif')
@@ -1332,13 +1161,9 @@ def test_gdalwarp_lib_132():
             for x in range(33):
                 data = struct.unpack('B' * 1, ds.GetRasterBand(i + 1).ReadRaster(i, 0, 1, 1, buf_type=gdal.GDT_Byte))[0]
                 if abs(data - expected_val[i]) > 1:
-                    gdaltest.post_reason('bad checksum')
                     print(dt)
-                    print(i)
                     print(x)
-                    print(data)
-                    print(expected_val[i])
-                    return 'fail'
+                    pytest.fail('bad checksum')
         ds = None
 
         src_ds = None
@@ -1370,13 +1195,9 @@ def test_gdalwarp_lib_133():
     src_ds.SetGeoTransform([0, 1, 0, 1, 0, -1])
     src_ds.GetRasterBand(1).Fill(255)
     ds = gdal.Warp('', src_ds, format='MEM', cutlineDSName='/vsimem/test_gdalwarp_lib_133.shp')
-    if ds is None:
-        return 'fail'
+    assert ds is not None
 
-    if ds.GetRasterBand(1).Checksum() != 5:
-        print(ds.GetRasterBand(1).Checksum())
-        gdaltest.post_reason('Bad checksum')
-        return 'fail'
+    assert ds.GetRasterBand(1).Checksum() == 5, 'Bad checksum'
 
     ds = None
 
@@ -1402,22 +1223,18 @@ def test_gdalwarp_lib_134():
     src_ds = gdal.GetDriverByName('MEM').Create('', 20, 20)
     src_ds.GetRasterBand(1).WriteRaster(0, 0, 20, 20, src_src_ds.GetRasterBand(1).ReadRaster())
     ds = gdal.Warp('', src_ds, format='MEM', transformerOptions=['SRC_METHOD=NO_GEOTRANSFORM', 'DST_METHOD=NO_GEOTRANSFORM'], outputBounds=[1, 2, 4, 6])
-    if ds is None:
-        return 'fail'
+    assert ds is not None
 
-    if ds.GetRasterBand(1).ReadRaster() != src_src_ds.GetRasterBand(1).ReadRaster(1, 2, 4 - 1, 6 - 2):
-        gdaltest.post_reason('Bad checksum')
-        return 'fail'
+    assert ds.GetRasterBand(1).ReadRaster() == src_src_ds.GetRasterBand(1).ReadRaster(1, 2, 4 - 1, 6 - 2), \
+        'Bad checksum'
 
     ds = None
 
     ds = gdal.Warp('', src_ds, format='MEM', transformerOptions=['SRC_METHOD=NO_GEOTRANSFORM', 'DST_METHOD=NO_GEOTRANSFORM'], cutlineDSName='/vsimem/test_gdalwarp_lib_134.shp', cropToCutline=True)
-    if ds is None:
-        return 'fail'
+    assert ds is not None
 
-    if ds.GetRasterBand(1).ReadRaster() != src_src_ds.GetRasterBand(1).ReadRaster(2, 2, 16, 16):
-        gdaltest.post_reason('Bad checksum')
-        return 'fail'
+    assert ds.GetRasterBand(1).ReadRaster() == src_src_ds.GetRasterBand(1).ReadRaster(2, 2, 16, 16), \
+        'Bad checksum'
 
     ds = None
 
@@ -1458,50 +1275,35 @@ def test_gdalwarp_lib_135():
                    srcSRS='+proj=utm +zone=31 +datum=WGS84 +units=m +geoidgrids=/vsimem/grid.tif +vunits=m +no_defs',
                    dstSRS='EPSG:4979')
     data = struct.unpack('B' * 1, ds.GetRasterBand(1).ReadRaster())[0]
-    if data != 120:
-        gdaltest.post_reason('Bad value')
-        print(data)
-        return 'fail'
+    assert data == 120, 'Bad value'
 
     # Inverse transform
     ds = gdal.Warp('', src_ds, format='MEM',
                    srcSRS='+proj=utm +zone=31 +datum=WGS84 +units=m +no_defs',
                    dstSRS='+proj=longlat +datum=WGS84 +geoidgrids=/vsimem/grid.tif +vunits=m +no_defs')
     data = struct.unpack('B' * 1, ds.GetRasterBand(1).ReadRaster())[0]
-    if data != 80:
-        gdaltest.post_reason('Bad value')
-        print(data)
-        return 'fail'
+    assert data == 80, 'Bad value'
 
     # Both transforms
     ds = gdal.Warp('', src_ds, format='MEM',
                    srcSRS='+proj=utm +zone=31 +datum=WGS84 +units=m +geoidgrids=/vsimem/grid.tif +vunits=m +no_defs',
                    dstSRS='+proj=longlat +datum=WGS84 +geoidgrids=/vsimem/grid2.tif +vunits=m +no_defs')
     data = struct.unpack('B' * 1, ds.GetRasterBand(1).ReadRaster())[0]
-    if data != 115:
-        gdaltest.post_reason('Bad value')
-        print(data)
-        return 'fail'
+    assert data == 115, 'Bad value'
 
     # Both transforms, but none of them have geoidgrids
     ds = gdal.Warp('', src_ds, format='MEM',
                    srcSRS='EPSG:32631+5730',
                    dstSRS='EPSG:4326+5621')
     data = struct.unpack('B' * 1, ds.GetRasterBand(1).ReadRaster())[0]
-    if data != 100:
-        gdaltest.post_reason('Bad value')
-        print(data)
-        return 'fail'
+    assert data == 100, 'Bad value'
 
     # Both transforms being a no-op
     ds = gdal.Warp('', src_ds, format='MEM',
                    srcSRS='+proj=utm +zone=31 +datum=WGS84 +units=m +geoidgrids=/vsimem/grid.tif +vunits=m +no_defs',
                    dstSRS='+proj=longlat +datum=WGS84 +geoidgrids=/vsimem/grid.tif +vunits=m +no_defs')
     data = struct.unpack('B' * 1, ds.GetRasterBand(1).ReadRaster())[0]
-    if data != 100:
-        gdaltest.post_reason('Bad value')
-        print(data)
-        return 'fail'
+    assert data == 100, 'Bad value'
 
     # Both transforms to anonymous VRT
     ds = gdal.Warp('', src_ds, format='VRT',
@@ -1509,10 +1311,7 @@ def test_gdalwarp_lib_135():
                    dstSRS='+proj=longlat +datum=WGS84 +geoidgrids=/vsimem/grid2.tif +vunits=m +no_defs')
     src_ds = None  # drop the ref to src_ds before for fun
     data = struct.unpack('B' * 1, ds.GetRasterBand(1).ReadRaster())[0]
-    if data != 115:
-        gdaltest.post_reason('Bad value')
-        print(data)
-        return 'fail'
+    assert data == 115, 'Bad value'
 
     src_ds = gdal.GetDriverByName('MEM').Create('', 1, 1)
     src_ds.SetGeoTransform([500000, 1, 0, 4000000, 0, -1])
@@ -1528,18 +1327,14 @@ def test_gdalwarp_lib_135():
     ds = None
     gdal.Unlink('/vsimem/dem.tif')
     gdal.Unlink('/vsimem/tmp.vrt')
-    if data != 115:
-        gdaltest.post_reason('Bad value')
-        print(data)
-        return 'fail'
+    assert data == 115, 'Bad value'
 
     # Missing grid in forward path
     with gdaltest.error_handler():
         ds = gdal.Warp('', src_ds, format='MEM',
                        srcSRS='+proj=utm +zone=31 +datum=WGS84 +units=m +geoidgrids=i_dont_exist.tif +vunits=m +no_defs',
                        dstSRS='EPSG:4979')
-    if ds is not None:
-        return 'fail'
+    assert ds is None
 
     # Missing grid in forward path with PROJ_LIB
     old_proj_lib = os.environ.get('PROJ_LIB', None)
@@ -1552,68 +1347,56 @@ def test_gdalwarp_lib_135():
         os.environ['PROJ_LIB'] = old_proj_lib
     else:
         del os.environ['PROJ_LIB']
-    if ds is not None:
-        return 'fail'
+    assert ds is None
 
     # Missing grid in forward path
     with gdaltest.error_handler():
         ds = gdal.Warp('', src_ds, format='MEM',
                        srcSRS='+proj=utm +zone=31 +datum=WGS84 +units=m +geoidgrids=~/i_dont_exist.tif +vunits=m +no_defs',
                        dstSRS='EPSG:4979')
-    if ds is not None:
-        return 'fail'
+    assert ds is None
 
     # Missing grid in forward path
     with gdaltest.error_handler():
         ds = gdal.Warp('', src_ds, format='MEM',
                        srcSRS='+proj=utm +zone=31 +datum=WGS84 +units=m +geoidgrids=/i_dont/exist.tif +vunits=m +no_defs',
                        dstSRS='EPSG:4979')
-    if ds is not None:
-        return 'fail'
+    assert ds is None
 
     # Ungeoref grid in forward path
     with gdaltest.error_handler():
         ds = gdal.Warp('', src_ds, format='MEM',
                        srcSRS='+proj=utm +zone=31 +datum=WGS84 +units=m +geoidgrids=/vsimem/ungeoref_grid.tif +vunits=m +no_defs',
                        dstSRS='EPSG:4979')
-    if ds is not None:
-        return 'fail'
+    assert ds is None
 
     # Missing grid in inverse path
     with gdaltest.error_handler():
         ds = gdal.Warp('', src_ds, format='MEM',
                        srcSRS='+proj=utm +zone=31 +datum=WGS84 +units=m +no_defs',
                        dstSRS='+proj=longlat +datum=WGS84 +geoidgrids=i_dont_exist.tif +vunits=m +no_defs')
-    if ds is not None:
-        return 'fail'
+    assert ds is None
 
     # Ungeoref grid in inverse path
     with gdaltest.error_handler():
         ds = gdal.Warp('', src_ds, format='MEM',
                        srcSRS='+proj=utm +zone=31 +datum=WGS84 +units=m +no_defs',
                        dstSRS='+proj=longlat +datum=WGS84 +geoidgrids=/vsimem/ungeoref_grid.tif +vunits=m +no_defs')
-    if ds is not None:
-        return 'fail'
+    assert ds is None
 
     # Missing grid in forward path, but this is OK
     ds = gdal.Warp('', src_ds, format='MEM',
                    srcSRS='+proj=utm +zone=31 +datum=WGS84 +units=m +geoidgrids=@i_dont_exist.tif +vunits=m +no_defs',
                    dstSRS='EPSG:4979')
     data = struct.unpack('B' * 1, ds.GetRasterBand(1).ReadRaster())[0]
-    if data != 100:
-        gdaltest.post_reason('Bad value')
-        print(data)
-        return 'fail'
+    assert data == 100, 'Bad value'
 
     # Missing grid in inverse path but this is OK
     ds = gdal.Warp('', src_ds, format='MEM',
                    srcSRS='+proj=utm +zone=31 +datum=WGS84 +units=m +no_defs',
                    dstSRS='+proj=longlat +datum=WGS84 +geoidgrids=@i_dont_exist.tif +vunits=m +no_defs')
     data = struct.unpack('B' * 1, ds.GetRasterBand(1).ReadRaster())[0]
-    if data != 100:
-        gdaltest.post_reason('Bad value')
-        print(data)
-        return 'fail'
+    assert data == 100, 'Bad value'
 
     # Forward transform with explicit m unit
     src_ds = gdal.GetDriverByName('MEM').Create('', 1, 1)
@@ -1627,10 +1410,7 @@ def test_gdalwarp_lib_135():
     ds = gdal.Warp('', src_ds, format='MEM',
                    dstSRS='EPSG:4979')
     data = struct.unpack('B' * 1, ds.GetRasterBand(1).ReadRaster())[0]
-    if data != 120:
-        gdaltest.post_reason('Bad value')
-        print(data)
-        return 'fail'
+    assert data == 120, 'Bad value'
 
     # Forward transform with explicit ft unit
     src_ds = gdal.GetDriverByName('MEM').Create('', 1, 1, 1, gdal.GDT_Float32)
@@ -1644,10 +1424,7 @@ def test_gdalwarp_lib_135():
     ds = gdal.Warp('', src_ds, format='MEM',
                    dstSRS='EPSG:4979', outputType=gdal.GDT_Byte)
     data = struct.unpack('B' * 1, ds.GetRasterBand(1).ReadRaster())[0]
-    if data != 120:
-        gdaltest.post_reason('Bad value')
-        print(data)
-        return 'fail'
+    assert data == 120, 'Bad value'
 
     # Forward transform with explicit unhandled unit
     src_ds = gdal.GetDriverByName('MEM').Create('', 1, 1)
@@ -1662,10 +1439,7 @@ def test_gdalwarp_lib_135():
         ds = gdal.Warp('', src_ds, format='MEM',
                        dstSRS='EPSG:4979')
     data = struct.unpack('B' * 1, ds.GetRasterBand(1).ReadRaster())[0]
-    if data != 120:
-        gdaltest.post_reason('Bad value')
-        print(data)
-        return 'fail'
+    assert data == 120, 'Bad value'
 
     grid_ds = gdal.GetDriverByName('GTiff').Create('/vsimem/empty_grid.tif', 1, 1)
     sr = osr.SpatialReference()
@@ -1685,10 +1459,7 @@ def test_gdalwarp_lib_135():
                    srcSRS='+proj=utm +zone=31 +datum=WGS84 +units=m +geoidgrids=/vsimem/empty_grid.tif +vunits=m +no_defs',
                    dstSRS='EPSG:4979')
     data = struct.unpack('B' * 1, ds.GetRasterBand(1).ReadRaster())[0]
-    if data != 100:
-        gdaltest.post_reason('Bad value')
-        print(data)
-        return 'fail'
+    assert data == 100, 'Bad value'
 
     # Same, but make it an error
     with gdaltest.error_handler():
@@ -1697,29 +1468,22 @@ def test_gdalwarp_lib_135():
                        dstSRS='EPSG:4979',
                        transformerOptions=['ERROR_ON_MISSING_VERT_SHIFT=YES'])
     if ds is not None:
-        gdaltest.post_reason('Bad value')
         print(data)
-        return 'fail'
+        pytest.fail('Bad value')
 
     # Test several grids
     ds = gdal.Warp('', src_ds, format='MEM',
                    srcSRS='+proj=utm +zone=31 +datum=WGS84 +units=m +geoidgrids=/vsimem/grid.tif,/vsimem/empty_grid.tif +vunits=m +no_defs',
                    dstSRS='EPSG:4979')
     data = struct.unpack('B' * 1, ds.GetRasterBand(1).ReadRaster())[0]
-    if data != 120:
-        gdaltest.post_reason('Bad value')
-        print(data)
-        return 'fail'
+    assert data == 120, 'Bad value'
 
     # Same, but different order
     ds = gdal.Warp('', src_ds, format='MEM',
                    srcSRS='+proj=utm +zone=31 +datum=WGS84 +units=m +geoidgrids=/vsimem/empty_grid.tif,/vsimem/grid.tif +vunits=m +no_defs',
                    dstSRS='EPSG:4979')
     data = struct.unpack('B' * 1, ds.GetRasterBand(1).ReadRaster())[0]
-    if data != 120:
-        gdaltest.post_reason('Bad value')
-        print(data)
-        return 'fail'
+    assert data == 120, 'Bad value'
 
     # Test several grids, with some missing
     with gdaltest.error_handler():
@@ -1727,29 +1491,22 @@ def test_gdalwarp_lib_135():
                        srcSRS='+proj=utm +zone=31 +datum=WGS84 +units=m +geoidgrids=/vsimem/grid.tif,i_dont_exist.tif +vunits=m +no_defs',
                        dstSRS='EPSG:4979')
     if ds is not None:
-        gdaltest.post_reason('Bad value')
         print(data)
-        return 'fail'
+        pytest.fail('Bad value')
 
     # Test several grids, with some missing, but that's OK
     ds = gdal.Warp('', src_ds, format='MEM',
                    srcSRS='+proj=utm +zone=31 +datum=WGS84 +units=m +geoidgrids=/vsimem/grid.tif,@i_dont_exist.tif +vunits=m +no_defs',
                    dstSRS='EPSG:4979')
     data = struct.unpack('B' * 1, ds.GetRasterBand(1).ReadRaster())[0]
-    if data != 120:
-        gdaltest.post_reason('Bad value')
-        print(data)
-        return 'fail'
+    assert data == 120, 'Bad value'
 
     # Test several grids, with all missing, but that's OK
     ds = gdal.Warp('', src_ds, format='MEM',
                    srcSRS='+proj=utm +zone=31 +datum=WGS84 +units=m +geoidgrids=@i_dont_exist.tif,@i_dont_exist_either.tif +vunits=m +no_defs',
                    dstSRS='EPSG:4979')
     data = struct.unpack('B' * 1, ds.GetRasterBand(1).ReadRaster())[0]
-    if data != 100:
-        gdaltest.post_reason('Bad value')
-        print(data)
-        return 'fail'
+    assert data == 100, 'Bad value'
 
     gdal.GetDriverByName('GTiff').Delete('/vsimem/grid.tif')
     gdal.GetDriverByName('GTiff').Delete('/vsimem/grid2.tif')
@@ -1766,13 +1523,11 @@ def test_gdalwarp_lib_136():
 
     with gdaltest.error_handler():
         ds = gdal.Warp('', '../gcore/data/utmsmall.tif', format='MEM', warpOptions=['CUTLINE=invalid'])
-    if ds is not None:
-        return 'fail'
+    assert ds is None
 
     with gdaltest.error_handler():
         ds = gdal.Warp('', '../gcore/data/utmsmall.tif', format='VRT', warpOptions=['CUTLINE=invalid'])
-    if ds is not None:
-        return 'fail'
+    assert ds is None
 
     return 'success'
 
@@ -1791,15 +1546,10 @@ def test_gdalwarp_lib_several_sources_with_different_srs_no_explicit_target_srs(
     src_ds_4326_right = gdal.Warp('', src_ds_32611_right, format='MEM',
                                   dstSRS='EPSG:4326')
     out_ds = gdal.Warp('', [src_ds_4326_right, src_ds_32611_left], format='MEM')
-    if out_ds is None:
-        return 'fail'
-    if out_ds.RasterXSize != 23:
-        print(out_ds.RasterXSize)
-        return 'fail'
+    assert out_ds is not None
+    assert out_ds.RasterXSize == 23
     cs = out_ds.GetRasterBand(1).Checksum()
-    if cs != 5048:
-        print(cs)
-        return 'fail'
+    assert cs == 5048
 
     return 'success'
 
@@ -1815,9 +1565,7 @@ def test_gdalwarp_lib_touching_dateline():
     sr.ImportFromEPSG(3411)
     src_ds.SetProjection(sr.ExportToWkt())
     out_ds = gdal.Warp('', src_ds, dstSRS='EPSG:4326', format='MEM')
-    if out_ds.RasterXSize != 319:
-        print(out_ds.RasterXSize)
-        return 'fail'
+    assert out_ds.RasterXSize == 319
 
     return 'success'
 
@@ -1842,13 +1590,8 @@ def test_gdalwarp_lib_override_default_output_nodata():
         gdal.Warp('tmp/out.nc', '../gcore/data/byte.tif', srcNodata=255,
                   format='netCDF', creationOptions=['FORMAT=' + frmt])
         ds = gdal.Open('tmp/out.nc')
-        if ds.GetRasterBand(1).GetNoDataValue() != 255:
-            print(frmt)
-            print(ds.GetRasterBand(1).GetNoDataValue())
-            return 'fail'
-        if ds.GetProjection() == '':
-            print(frmt)
-            return 'fail'
+        assert ds.GetRasterBand(1).GetNoDataValue() == 255, frmt
+        assert ds.GetProjection() != '', frmt
         ds = None
         os.unlink('tmp/out.nc')
 
@@ -1880,9 +1623,7 @@ def test_gdalwarp_lib_auto_skip_nosource():
                            options='-te 1.5 48 3.5 49.5 -wm 100000 ' +
                            '-of GTiff ' + options)
         cs = out_ds.GetRasterBand(1).Checksum()
-        if cs != 41500:
-            print(options, cs)
-            return 'fail'
+        assert cs == 41500, (options, cs)
 
     # Same with MEM
     for options in ['',
@@ -1893,9 +1634,7 @@ def test_gdalwarp_lib_auto_skip_nosource():
                            options='-te 1.5 48 3.5 49.5 -wm 100000 ' +
                            '-of MEM ' + options)
         cs = out_ds.GetRasterBand(1).Checksum()
-        if cs != 41500:
-            print(options, cs)
-            return 'fail'
+        assert cs == 41500, (options, cs)
 
     # Use fill/nodata at 1
     for options in [  # '-wo SKIP_NOSOURCE=NO -dstnodata 1',
@@ -1907,9 +1646,7 @@ def test_gdalwarp_lib_auto_skip_nosource():
                            options='-te 1.5 48 3.5 49.5 -wm 100000 ' +
                            '-of GTiff ' + options)
         cs = out_ds.GetRasterBand(1).Checksum()
-        if cs != 51132:
-            print(options, cs)
-            return 'fail'
+        assert cs == 51132, (options, cs)
 
     # Same with MEM
     for options in [  # '-wo SKIP_NOSOURCE=NO -dstnodata 1',
@@ -1921,9 +1658,7 @@ def test_gdalwarp_lib_auto_skip_nosource():
                            options='-te 1.5 48 3.5 49.5 -wm 100000 ' +
                            '-of MEM ' + options)
         cs = out_ds.GetRasterBand(1).Checksum()
-        if cs != 51132:
-            print(options, cs)
-            return 'fail'
+        assert cs == 51132, (options, cs)
 
     # Rather dummy: use a INIT_DEST different of the target dstnodata
     for options in [  # '-wo SKIP_NOSOURCE=NO -dstnodata 1 -wo INIT_DEST=0',
@@ -1933,9 +1668,7 @@ def test_gdalwarp_lib_auto_skip_nosource():
                            options='-te 1.5 48 3.5 49.5 -wm 100000 ' +
                            '-of GTiff ' + options)
         cs = out_ds.GetRasterBand(1).Checksum()
-        if cs != 41500:
-            print(options, cs)
-            return 'fail'
+        assert cs == 41500, (options, cs)
 
     # Test with 2 input datasets
     src_ds1 = gdal.GetDriverByName('MEM').Create('', 500, 500)
@@ -1954,9 +1687,7 @@ def test_gdalwarp_lib_auto_skip_nosource():
                            options='-te 1.5 48 3.5 49.5 -wm 100000 ' +
                            '-of GTiff ' + options)
         cs = out_ds.GetRasterBand(1).Checksum()
-        if cs != 41500:
-            print(options, cs)
-            return 'fail'
+        assert cs == 41500, (options, cs)
 
     gdal.Unlink(tmpfilename)
 
@@ -1975,17 +1706,13 @@ def test_gdalwarp_lib_to_ortho():
     line = out_ds.GetRasterBand(1).ReadRaster(0, 0, out_ds.RasterXSize, 1)
     line = struct.unpack('B' * out_ds.RasterXSize, line)
     # Fail if the first line is completely black
-    if line.count(0) == out_ds.RasterXSize:
-        gdaltest.post_reason('first line is completely black')
-        return 'fail'
+    assert line.count(0) != out_ds.RasterXSize, 'first line is completely black'
 
     line = out_ds.GetRasterBand(1).ReadRaster(0, out_ds.RasterYSize - 1,
                                               out_ds.RasterXSize, 1)
     line = struct.unpack('B' * out_ds.RasterXSize, line)
     # Fail if the last line is completely black
-    if line.count(0) == out_ds.RasterXSize:
-        gdaltest.post_reason('last line is completely black')
-        return 'fail'
+    assert line.count(0) != out_ds.RasterXSize, 'last line is completely black'
 
     return 'success'
 
@@ -1996,8 +1723,7 @@ def test_gdalwarp_lib_insufficient_dst_band_count():
     src_ds = gdal.Translate('', '../gcore/data/byte.tif', options='-of MEM -b 1 -b 1')
     dst_ds = gdal.Translate('', '../gcore/data/byte.tif', options='-of MEM')
     with gdaltest.error_handler():
-        if gdal.Warp(dst_ds, src_ds) != 0:
-            return 'fail'
+        assert gdal.Warp(dst_ds, src_ds) == 0
 
     return 'success'
 
diff --git a/autotest/utilities/test_gnmutils.py b/autotest/utilities/test_gnmutils.py
index bcfa27b33a4f..2d3248989953 100755
--- a/autotest/utilities/test_gnmutils.py
+++ b/autotest/utilities/test_gnmutils.py
@@ -48,10 +48,7 @@ def test_gnmmanage_1():
         return 'skip'
 
     (_, err) = gdaltest.runexternal_out_and_err(test_cli_utilities.get_gnmmanage_path() + ' create -f GNMFile -t_srs EPSG:4326 -dsco net_name=test_gnm -dsco net_description="Test file based GNM" tmp')
-    if not (err is None or err == ''):
-        gdaltest.post_reason('got error/warning')
-        print(err)
-        return 'fail'
+    assert (err is None or err == ''), 'got error/warning'
 
     try:
         os.stat('tmp/test_gnm')
@@ -72,16 +69,10 @@ def test_gnmmanage_2():
         return 'skip'
 
     (_, err) = gdaltest.runexternal_out_and_err(test_cli_utilities.get_gnmmanage_path() + ' import ../gnm/data/pipes.shp tmp/test_gnm')
-    if not (err is None or err == ''):
-        gdaltest.post_reason('got error/warning')
-        print(err)
-        return 'fail'
+    assert (err is None or err == ''), 'got error/warning'
 
     (_, err) = gdaltest.runexternal_out_and_err(test_cli_utilities.get_gnmmanage_path() + ' import ../gnm/data/wells.shp tmp/test_gnm')
-    if not (err is None or err == ''):
-        gdaltest.post_reason('got error/warning')
-        print(err)
-        return 'fail'
+    assert (err is None or err == ''), 'got error/warning'
 
     return 'success'
 
@@ -96,12 +87,9 @@ def test_gnmmanage_3():
 
     ret = gdaltest.runexternal(test_cli_utilities.get_gnmmanage_path() + ' info tmp/test_gnm')
 
-    if ret.find('Network version: 1.0.') == -1:
-        return 'fail'
-    if ret.find('Network name: test_gnm.') == -1:
-        return 'fail'
-    if ret.find('Network description') == -1:
-        return 'fail'
+    assert ret.find('Network version: 1.0.') != -1
+    assert ret.find('Network name: test_gnm.') != -1
+    assert ret.find('Network description') != -1
 
     return 'success'
 
@@ -115,8 +103,7 @@ def test_gnmmanage_4():
         return 'skip'
 
     ret = gdaltest.runexternal(test_cli_utilities.get_gnmmanage_path() + ' autoconnect 0.000001 tmp/test_gnm')
-    if ret.find('success') == -1:
-        return 'fail'
+    assert ret.find('success') != -1
 
     return 'success'
 
@@ -132,8 +119,7 @@ def test_gnmanalyse_1():
         return 'skip'
 
     ret = gdaltest.runexternal(test_cli_utilities.get_gnmanalyse_path() + ' dijkstra 61 50 tmp/test_gnm')
-    if ret.find('Feature Count: 19') == -1:
-        return 'fail'
+    assert ret.find('Feature Count: 19') != -1
 
     return 'success'
 
@@ -149,8 +135,7 @@ def test_gnmanalyse_2():
         return 'skip'
 
     ret = gdaltest.runexternal(test_cli_utilities.get_gnmanalyse_path() + ' kpaths 61 50 3 tmp/test_gnm')
-    if ret.find('Feature Count: 61') == -1:
-        return 'fail'
+    assert ret.find('Feature Count: 61') != -1
 
     return 'success'
 
@@ -163,10 +148,7 @@ def test_gnm_cleanup():
         return 'skip'
 
     (_, err) = gdaltest.runexternal_out_and_err(test_cli_utilities.get_gnmmanage_path() + ' delete tmp/test_gnm')
-    if not (err is None or err == ''):
-        gdaltest.post_reason('got error/warning')
-        print(err)
-        return 'fail'
+    assert (err is None or err == ''), 'got error/warning'
 
     try:
         os.stat('tmp/test_gnm')
diff --git a/autotest/utilities/test_nearblack.py b/autotest/utilities/test_nearblack.py
index f64c14a4cd90..7de282c7ef15 100755
--- a/autotest/utilities/test_nearblack.py
+++ b/autotest/utilities/test_nearblack.py
@@ -47,42 +47,25 @@ def test_nearblack_1():
         return 'skip'
 
     (_, err) = gdaltest.runexternal_out_and_err(test_cli_utilities.get_nearblack_path() + ' ../gdrivers/data/rgbsmall.tif -nb 0 -of GTiff -o tmp/nearblack1.tif')
-    if not (err is None or err == ''):
-        gdaltest.post_reason('got error/warning')
-        print(err)
-        return 'fail'
+    assert (err is None or err == ''), 'got error/warning'
 
     src_ds = gdal.Open('../gdrivers/data/rgbsmall.tif')
     ds = gdal.Open('tmp/nearblack1.tif')
-    if ds is None:
-        return 'fail'
+    assert ds is not None
 
-    if ds.GetRasterBand(1).Checksum() != 21106:
-        print(ds.GetRasterBand(1).Checksum())
-        gdaltest.post_reason('Bad checksum band 1')
-        return 'fail'
+    assert ds.GetRasterBand(1).Checksum() == 21106, 'Bad checksum band 1'
 
-    if ds.GetRasterBand(2).Checksum() != 20736:
-        print(ds.GetRasterBand(2).Checksum())
-        gdaltest.post_reason('Bad checksum band 2')
-        return 'fail'
+    assert ds.GetRasterBand(2).Checksum() == 20736, 'Bad checksum band 2'
 
-    if ds.GetRasterBand(3).Checksum() != 21309:
-        print(ds.GetRasterBand(3).Checksum())
-        gdaltest.post_reason('Bad checksum band 3')
-        return 'fail'
+    assert ds.GetRasterBand(3).Checksum() == 21309, 'Bad checksum band 3'
 
     src_gt = src_ds.GetGeoTransform()
     dst_gt = ds.GetGeoTransform()
     for i in range(6):
-        if abs(src_gt[i] - dst_gt[i]) > 1e-10:
-            gdaltest.post_reason('Bad geotransform')
-            return 'fail'
+        assert abs(src_gt[i] - dst_gt[i]) <= 1e-10, 'Bad geotransform'
 
     dst_wkt = ds.GetProjectionRef()
-    if dst_wkt.find('AUTHORITY["EPSG","4326"]') == -1:
-        gdaltest.post_reason('Bad projection')
-        return 'fail'
+    assert dst_wkt.find('AUTHORITY["EPSG","4326"]') != -1, 'Bad projection'
 
     src_ds = None
     ds = None
@@ -100,13 +83,9 @@ def test_nearblack_2():
     gdaltest.runexternal(test_cli_utilities.get_nearblack_path() + ' ../gdrivers/data/rgbsmall.tif -setalpha -nb 0 -of GTiff -o tmp/nearblack2.tif -co TILED=YES')
 
     ds = gdal.Open('tmp/nearblack2.tif')
-    if ds is None:
-        return 'fail'
+    assert ds is not None
 
-    if ds.GetRasterBand(4).Checksum() != 22002:
-        print(ds.GetRasterBand(4).Checksum())
-        gdaltest.post_reason('Bad checksum band 0')
-        return 'fail'
+    assert ds.GetRasterBand(4).Checksum() == 22002, 'Bad checksum band 0'
 
     ds = None
 
@@ -124,13 +103,9 @@ def test_nearblack_3():
     gdaltest.runexternal(test_cli_utilities.get_nearblack_path() + ' -setalpha -nb 0 -of GTiff tmp/nearblack3.tif')
 
     ds = gdal.Open('tmp/nearblack3.tif')
-    if ds is None:
-        return 'fail'
+    assert ds is not None
 
-    if ds.GetRasterBand(4).Checksum() != 22002:
-        print(ds.GetRasterBand(4).Checksum())
-        gdaltest.post_reason('Bad checksum band 0')
-        return 'fail'
+    assert ds.GetRasterBand(4).Checksum() == 22002, 'Bad checksum band 0'
 
     ds = None
 
@@ -150,13 +125,9 @@ def test_nearblack_4():
     gdaltest.runexternal(test_cli_utilities.get_nearblack_path() + ' -q -setalpha -white -nb 0 -of GTiff tmp/nearblack4_src.tif -o tmp/nearblack4.tif')
 
     ds = gdal.Open('tmp/nearblack4.tif')
-    if ds is None:
-        return 'fail'
+    assert ds is not None
 
-    if ds.GetRasterBand(4).Checksum() != 24151:
-        print(ds.GetRasterBand(4).Checksum())
-        gdaltest.post_reason('Bad checksum band 0')
-        return 'fail'
+    assert ds.GetRasterBand(4).Checksum() == 24151, 'Bad checksum band 0'
 
     ds = None
 
@@ -173,13 +144,10 @@ def test_nearblack_5():
     gdaltest.runexternal(test_cli_utilities.get_nearblack_path() + ' ../gdrivers/data/rgbsmall.tif --config GDAL_TIFF_INTERNAL_MASK NO -setmask -nb 0 -of GTiff -o tmp/nearblack5.tif -co TILED=YES')
 
     ds = gdal.Open('tmp/nearblack5.tif')
-    if ds is None:
-        return 'fail'
+    assert ds is not None
 
-    if ds.GetRasterBand(1).GetMaskBand().Checksum() != 22002:
-        print(ds.GetRasterBand(1).GetMaskBand().Checksum())
-        gdaltest.post_reason('Bad checksum mask band')
-        return 'fail'
+    assert ds.GetRasterBand(1).GetMaskBand().Checksum() == 22002, \
+        'Bad checksum mask band'
 
     ds = None
 
@@ -199,13 +167,10 @@ def test_nearblack_6():
     gdaltest.runexternal(test_cli_utilities.get_nearblack_path() + ' -setmask -nb 0 -of GTiff tmp/nearblack6.tif')
 
     ds = gdal.Open('tmp/nearblack6.tif')
-    if ds is None:
-        return 'fail'
+    assert ds is not None
 
-    if ds.GetRasterBand(1).GetMaskBand().Checksum() != 22002:
-        print(ds.GetRasterBand(1).GetMaskBand().Checksum())
-        gdaltest.post_reason('Bad checksum mask band')
-        return 'fail'
+    assert ds.GetRasterBand(1).GetMaskBand().Checksum() == 22002, \
+        'Bad checksum mask band'
 
     ds = None
 
@@ -222,17 +187,11 @@ def test_nearblack_7():
     gdaltest.runexternal(test_cli_utilities.get_nearblack_path() + ' data/whiteblackred.tif -o tmp/nearblack7.tif -color 0,0,0 -color 255,255,255 -of GTiff')
 
     ds = gdal.Open('tmp/nearblack7.tif')
-    if ds is None:
-        return 'fail'
-
-    if ds.GetRasterBand(1).Checksum() != 418 or \
-       ds.GetRasterBand(2).Checksum() != 0 or \
-       ds.GetRasterBand(3).Checksum() != 0:
-        print(ds.GetRasterBand(1).Checksum())
-        print(ds.GetRasterBand(2).Checksum())
-        print(ds.GetRasterBand(3).Checksum())
-        gdaltest.post_reason('Bad checksum')
-        return 'fail'
+    assert ds is not None
+
+    assert (ds.GetRasterBand(1).Checksum() == 418 and \
+       ds.GetRasterBand(2).Checksum() == 0 and \
+       ds.GetRasterBand(3).Checksum() == 0), 'Bad checksum'
 
     ds = None
 
@@ -251,29 +210,16 @@ def test_nearblack_8():
     src_ds = None
 
     (_, err) = gdaltest.runexternal_out_and_err(test_cli_utilities.get_nearblack_path() + ' tmp/nearblack8.tif -nb 0')
-    if not (err is None or err == ''):
-        gdaltest.post_reason('got error/warning')
-        print(err)
-        return 'fail'
+    assert (err is None or err == ''), 'got error/warning'
 
     ds = gdal.Open('tmp/nearblack8.tif')
-    if ds is None:
-        return 'fail'
-
-    if ds.GetRasterBand(1).Checksum() != 21106:
-        print(ds.GetRasterBand(1).Checksum())
-        gdaltest.post_reason('Bad checksum band 1')
-        return 'fail'
-
-    if ds.GetRasterBand(2).Checksum() != 20736:
-        print(ds.GetRasterBand(2).Checksum())
-        gdaltest.post_reason('Bad checksum band 2')
-        return 'fail'
-
-    if ds.GetRasterBand(3).Checksum() != 21309:
-        print(ds.GetRasterBand(3).Checksum())
-        gdaltest.post_reason('Bad checksum band 3')
-        return 'fail'
+    assert ds is not None
+
+    assert ds.GetRasterBand(1).Checksum() == 21106, 'Bad checksum band 1'
+
+    assert ds.GetRasterBand(2).Checksum() == 20736, 'Bad checksum band 2'
+
+    assert ds.GetRasterBand(3).Checksum() == 21309, 'Bad checksum band 3'
 
     return 'success'
 
diff --git a/autotest/utilities/test_nearblack_lib.py b/autotest/utilities/test_nearblack_lib.py
index 4ca7ae7e891f..3f860a04e60d 100755
--- a/autotest/utilities/test_nearblack_lib.py
+++ b/autotest/utilities/test_nearblack_lib.py
@@ -43,35 +43,21 @@ def test_nearblack_lib_1():
 
     src_ds = gdal.Open('../gdrivers/data/rgbsmall.tif')
     ds = gdal.Nearblack('', src_ds, format='MEM', maxNonBlack=0, nearDist=15)
-    if ds is None:
-        return 'fail'
+    assert ds is not None
 
-    if ds.GetRasterBand(1).Checksum() != 21106:
-        print(ds.GetRasterBand(1).Checksum())
-        gdaltest.post_reason('Bad checksum band 1')
-        return 'fail'
+    assert ds.GetRasterBand(1).Checksum() == 21106, 'Bad checksum band 1'
 
-    if ds.GetRasterBand(2).Checksum() != 20736:
-        print(ds.GetRasterBand(2).Checksum())
-        gdaltest.post_reason('Bad checksum band 2')
-        return 'fail'
+    assert ds.GetRasterBand(2).Checksum() == 20736, 'Bad checksum band 2'
 
-    if ds.GetRasterBand(3).Checksum() != 21309:
-        print(ds.GetRasterBand(3).Checksum())
-        gdaltest.post_reason('Bad checksum band 3')
-        return 'fail'
+    assert ds.GetRasterBand(3).Checksum() == 21309, 'Bad checksum band 3'
 
     src_gt = src_ds.GetGeoTransform()
     dst_gt = ds.GetGeoTransform()
     for i in range(6):
-        if abs(src_gt[i] - dst_gt[i]) > 1e-10:
-            gdaltest.post_reason('Bad geotransform')
-            return 'fail'
+        assert abs(src_gt[i] - dst_gt[i]) <= 1e-10, 'Bad geotransform'
 
     dst_wkt = ds.GetProjectionRef()
-    if dst_wkt.find('AUTHORITY["EPSG","4326"]') == -1:
-        gdaltest.post_reason('Bad projection')
-        return 'fail'
+    assert dst_wkt.find('AUTHORITY["EPSG","4326"]') != -1, 'Bad projection'
 
     src_ds = None
     ds = None
@@ -85,13 +71,9 @@ def test_nearblack_lib_1():
 def test_nearblack_lib_2():
 
     ds = gdal.Nearblack('', '../gdrivers/data/rgbsmall.tif', format='MEM', maxNonBlack=0, setAlpha=True)
-    if ds is None:
-        return 'fail'
+    assert ds is not None
 
-    if ds.GetRasterBand(4).Checksum() != 22002:
-        print(ds.GetRasterBand(4).Checksum())
-        gdaltest.post_reason('Bad checksum band 0')
-        return 'fail'
+    assert ds.GetRasterBand(4).Checksum() == 22002, 'Bad checksum band 0'
 
     ds = None
 
@@ -105,13 +87,9 @@ def test_nearblack_lib_3():
 
     src_ds = gdal.Nearblack('', '../gdrivers/data/rgbsmall.tif', format='MEM', maxNonBlack=0, setAlpha=True)
     ds = gdal.Nearblack('', src_ds, format='MEM', maxNonBlack=0, setAlpha=True)
-    if ds is None:
-        return 'fail'
+    assert ds is not None
 
-    if ds.GetRasterBand(4).Checksum() != 22002:
-        print(ds.GetRasterBand(4).Checksum())
-        gdaltest.post_reason('Bad checksum band 0')
-        return 'fail'
+    assert ds.GetRasterBand(4).Checksum() == 22002, 'Bad checksum band 0'
 
     ds = None
 
@@ -125,13 +103,9 @@ def test_nearblack_lib_4():
 
     src_ds = gdal.Warp('', '../gdrivers/data/rgbsmall.tif', format='MEM', warpOptions=["INIT_DEST=255"], srcNodata=0)
     ds = gdal.Nearblack('', src_ds, format='MEM', white=True, maxNonBlack=0, setAlpha=True)
-    if ds is None:
-        return 'fail'
+    assert ds is not None
 
-    if ds.GetRasterBand(4).Checksum() != 24151:
-        print(ds.GetRasterBand(4).Checksum())
-        gdaltest.post_reason('Bad checksum band 0')
-        return 'fail'
+    assert ds.GetRasterBand(4).Checksum() == 24151, 'Bad checksum band 0'
 
     ds = None
 
@@ -144,13 +118,10 @@ def test_nearblack_lib_4():
 def test_nearblack_lib_5():
 
     ds = gdal.Nearblack('/vsimem/test_nearblack_lib_5.tif', '../gdrivers/data/rgbsmall.tif', format='GTiff', maxNonBlack=0, setMask=True)
-    if ds is None:
-        return 'fail'
+    assert ds is not None
 
-    if ds.GetRasterBand(1).GetMaskBand().Checksum() != 22002:
-        print(ds.GetRasterBand(1).GetMaskBand().Checksum())
-        gdaltest.post_reason('Bad checksum mask band')
-        return 'fail'
+    assert ds.GetRasterBand(1).GetMaskBand().Checksum() == 22002, \
+        'Bad checksum mask band'
 
     ds = None
 
@@ -166,17 +137,11 @@ def test_nearblack_lib_5():
 def test_nearblack_lib_7():
 
     ds = gdal.Nearblack('', 'data/whiteblackred.tif', format='MEM', colors=((0, 0, 0), (255, 255, 255)))
-    if ds is None:
-        return 'fail'
-
-    if ds.GetRasterBand(1).Checksum() != 418 or \
-       ds.GetRasterBand(2).Checksum() != 0 or \
-       ds.GetRasterBand(3).Checksum() != 0:
-        print(ds.GetRasterBand(1).Checksum())
-        print(ds.GetRasterBand(2).Checksum())
-        print(ds.GetRasterBand(3).Checksum())
-        gdaltest.post_reason('Bad checksum')
-        return 'fail'
+    assert ds is not None
+
+    assert (ds.GetRasterBand(1).Checksum() == 418 and \
+       ds.GetRasterBand(2).Checksum() == 0 and \
+       ds.GetRasterBand(3).Checksum() == 0), 'Bad checksum'
 
     ds = None
 
@@ -191,23 +156,13 @@ def test_nearblack_lib_8():
     src_ds = gdal.Open('../gdrivers/data/rgbsmall.tif')
     ds = gdal.GetDriverByName('MEM').CreateCopy('', src_ds)
     ret = gdal.Nearblack(ds, ds, maxNonBlack=0)
-    if ret != 1:
-        return 'fail'
-
-    if ds.GetRasterBand(1).Checksum() != 21106:
-        print(ds.GetRasterBand(1).Checksum())
-        gdaltest.post_reason('Bad checksum band 1')
-        return 'fail'
-
-    if ds.GetRasterBand(2).Checksum() != 20736:
-        print(ds.GetRasterBand(2).Checksum())
-        gdaltest.post_reason('Bad checksum band 2')
-        return 'fail'
-
-    if ds.GetRasterBand(3).Checksum() != 21309:
-        print(ds.GetRasterBand(3).Checksum())
-        gdaltest.post_reason('Bad checksum band 3')
-        return 'fail'
+    assert ret == 1
+
+    assert ds.GetRasterBand(1).Checksum() == 21106, 'Bad checksum band 1'
+
+    assert ds.GetRasterBand(2).Checksum() == 20736, 'Bad checksum band 2'
+
+    assert ds.GetRasterBand(3).Checksum() == 21309, 'Bad checksum band 3'
 
     return 'success'
 
diff --git a/autotest/utilities/test_ogr2ogr.py b/autotest/utilities/test_ogr2ogr.py
index d66ddbebcb77..c76ac25cdd2a 100755
--- a/autotest/utilities/test_ogr2ogr.py
+++ b/autotest/utilities/test_ogr2ogr.py
@@ -32,6 +32,7 @@
 import sys
 import os
 import shutil
+import pytest
 
 sys.path.append('../ogr')
 
@@ -55,24 +56,16 @@ def test_ogr2ogr_1():
         pass
 
     (_, err) = gdaltest.runexternal_out_and_err(test_cli_utilities.get_ogr2ogr_path() + ' tmp/poly.shp ../ogr/data/poly.shp')
-    if not (err is None or err == ''):
-        gdaltest.post_reason('got error/warning')
-        print(err)
-        return 'fail'
+    assert (err is None or err == ''), 'got error/warning'
 
     ds = ogr.Open('tmp/poly.shp')
-    if ds is None or ds.GetLayer(0).GetFeatureCount() != 10:
-        return 'fail'
+    assert ds is not None and ds.GetLayer(0).GetFeatureCount() == 10
 
     feat0 = ds.GetLayer(0).GetFeature(0)
-    if feat0.GetFieldAsDouble('AREA') != 215229.266:
-        print(feat0.GetFieldAsDouble('AREA'))
-        gdaltest.post_reason('Did not get expected value for field AREA')
-        return 'fail'
-    if feat0.GetFieldAsString('PRFEDEA') != '35043411':
-        print(feat0.GetFieldAsString('PRFEDEA'))
-        gdaltest.post_reason('Did not get expected value for field PRFEDEA')
-        return 'fail'
+    assert feat0.GetFieldAsDouble('AREA') == 215229.266, \
+        'Did not get expected value for field AREA'
+    assert feat0.GetFieldAsString('PRFEDEA') == '35043411', \
+        'Did not get expected value for field PRFEDEA'
 
     ds.Destroy()
 
@@ -97,8 +90,7 @@ def test_ogr2ogr_2():
     gdaltest.runexternal(test_cli_utilities.get_ogr2ogr_path() + ' tmp/poly.shp ../ogr/data/poly.shp -sql "select * from poly"')
 
     ds = ogr.Open('tmp/poly.shp')
-    if ds is None or ds.GetLayer(0).GetFeatureCount() != 10:
-        return 'fail'
+    assert ds is not None and ds.GetLayer(0).GetFeatureCount() == 10
     ds.Destroy()
 
     ogr.GetDriverByName('ESRI Shapefile').DeleteDataSource('tmp/poly.shp')
@@ -123,11 +115,9 @@ def test_ogr2ogr_3():
 
     ds = ogr.Open('tmp/poly.shp')
     if ogrtest.have_geos():
-        if ds is None or ds.GetLayer(0).GetFeatureCount() != 4:
-            return 'fail'
+        assert ds is not None and ds.GetLayer(0).GetFeatureCount() == 4
     else:
-        if ds is None or ds.GetLayer(0).GetFeatureCount() != 5:
-            return 'fail'
+        assert ds is not None and ds.GetLayer(0).GetFeatureCount() == 5
     ds.Destroy()
 
     ogr.GetDriverByName('ESRI Shapefile').DeleteDataSource('tmp/poly.shp')
@@ -151,8 +141,7 @@ def test_ogr2ogr_4():
     gdaltest.runexternal(test_cli_utilities.get_ogr2ogr_path() + ' tmp/poly.shp ../ogr/data/poly.shp -where "EAS_ID=171"')
 
     ds = ogr.Open('tmp/poly.shp')
-    if ds is None or ds.GetLayer(0).GetFeatureCount() != 1:
-        return 'fail'
+    assert ds is not None and ds.GetLayer(0).GetFeatureCount() == 1
     ds.Destroy()
 
     ogr.GetDriverByName('ESRI Shapefile').DeleteDataSource('tmp/poly.shp')
@@ -180,18 +169,13 @@ def test_ogr2ogr_5():
     gdaltest.runexternal(test_cli_utilities.get_ogr2ogr_path() + ' -append -update tmp/poly.shp ../ogr/data/poly.shp')
 
     ds = ogr.Open('tmp/poly.shp')
-    if ds is None or ds.GetLayer(0).GetFeatureCount() != 40:
-        return 'fail'
+    assert ds is not None and ds.GetLayer(0).GetFeatureCount() == 40
 
     feat10 = ds.GetLayer(0).GetFeature(10)
-    if feat10.GetFieldAsDouble('AREA') != 215229.266:
-        print(feat10.GetFieldAsDouble('AREA'))
-        gdaltest.post_reason('Did not get expected value for field AREA')
-        return 'fail'
-    if feat10.GetFieldAsString('PRFEDEA') != '35043411':
-        print(feat10.GetFieldAsString('PRFEDEA'))
-        gdaltest.post_reason('Did not get expected value for field PRFEDEA')
-        return 'fail'
+    assert feat10.GetFieldAsDouble('AREA') == 215229.266, \
+        'Did not get expected value for field AREA'
+    assert feat10.GetFieldAsString('PRFEDEA') == '35043411', \
+        'Did not get expected value for field PRFEDEA'
 
     ds.Destroy()
 
@@ -223,8 +207,7 @@ def test_ogr2ogr_6():
     gdaltest.runexternal(test_cli_utilities.get_ogr2ogr_path() + ' -update -overwrite -f PostgreSQL PG:"' + gdaltest.pg_connection_string + '" ../ogr/data/poly.shp -nln tpoly')
 
     ds = ogr.Open('PG:' + gdaltest.pg_connection_string)
-    if ds is None or ds.GetLayerByName('tpoly').GetFeatureCount() != 10:
-        return 'fail'
+    assert ds is not None and ds.GetLayerByName('tpoly').GetFeatureCount() == 10
     ds.Destroy()
 
     gdaltest.runexternal(test_cli_utilities.get_ogrinfo_path() + ' PG:"' + gdaltest.pg_connection_string + '" -sql "DELLAYER:tpoly"')
@@ -254,8 +237,7 @@ def test_ogr2ogr_7():
     gdaltest.runexternal(test_cli_utilities.get_ogr2ogr_path() + ' -f PostgreSQL PG:"' + gdaltest.pg_connection_string + '" ../ogr/data/poly.shp -nln tpoly -gt 1')
 
     ds = ogr.Open('PG:' + gdaltest.pg_connection_string)
-    if ds is None or ds.GetLayerByName('tpoly').GetFeatureCount() != 10:
-        return 'fail'
+    assert ds is not None and ds.GetLayerByName('tpoly').GetFeatureCount() == 10
     ds.Destroy()
 
     gdaltest.runexternal(test_cli_utilities.get_ogrinfo_path() + ' PG:"' + gdaltest.pg_connection_string + '" -sql "DELLAYER:tpoly"')
@@ -279,8 +261,7 @@ def test_ogr2ogr_8():
     gdaltest.runexternal(test_cli_utilities.get_ogr2ogr_path() + ' -t_srs EPSG:4326 tmp/poly.shp ../ogr/data/poly.shp')
 
     ds = ogr.Open('tmp/poly.shp')
-    if str(ds.GetLayer(0).GetSpatialRef()).find('1984') == -1:
-        return 'fail'
+    assert str(ds.GetLayer(0).GetSpatialRef()).find('1984') != -1
     ds.Destroy()
 
     ogr.GetDriverByName('ESRI Shapefile').DeleteDataSource('tmp/poly.shp')
@@ -304,8 +285,7 @@ def test_ogr2ogr_9():
     gdaltest.runexternal(test_cli_utilities.get_ogr2ogr_path() + ' -a_srs EPSG:4326 tmp/poly.shp ../ogr/data/poly.shp')
 
     ds = ogr.Open('tmp/poly.shp')
-    if str(ds.GetLayer(0).GetSpatialRef()).find('1984') == -1:
-        return 'fail'
+    assert str(ds.GetLayer(0).GetSpatialRef()).find('1984') != -1
     ds.Destroy()
 
     ogr.GetDriverByName('ESRI Shapefile').DeleteDataSource('tmp/poly.shp')
@@ -331,8 +311,7 @@ def test_ogr2ogr_10():
 
     ds = ogr.Open('tmp/poly.shp')
     lyr = ds.GetLayer(0)
-    if lyr.GetLayerDefn().GetFieldCount() != 2:
-        return 'fail'
+    assert lyr.GetLayerDefn().GetFieldCount() == 2
     feat = lyr.GetNextFeature()
     ret = 'success'
     if feat.GetFieldAsDouble('EAS_ID') != 168:
@@ -367,8 +346,7 @@ def test_ogr2ogr_11():
     gdaltest.runexternal(test_cli_utilities.get_ogr2ogr_path() + ' -lco SHPT=POLYGONZ tmp/poly.shp ../ogr/data/poly.shp')
 
     ds = ogr.Open('tmp/poly.shp')
-    if ds.GetLayer(0).GetLayerDefn().GetGeomType() != ogr.wkbPolygon25D:
-        return 'fail'
+    assert ds.GetLayer(0).GetLayerDefn().GetGeomType() == ogr.wkbPolygon25D
     ds.Destroy()
 
     ogr.GetDriverByName('ESRI Shapefile').DeleteDataSource('tmp/poly.shp')
@@ -392,8 +370,7 @@ def test_ogr2ogr_12():
     gdaltest.runexternal(test_cli_utilities.get_ogr2ogr_path() + ' -nlt POLYGON25D tmp/poly.shp ../ogr/data/poly.shp')
 
     ds = ogr.Open('tmp/poly.shp')
-    if ds.GetLayer(0).GetLayerDefn().GetGeomType() != ogr.wkbPolygon25D:
-        return 'fail'
+    assert ds.GetLayer(0).GetLayerDefn().GetGeomType() == ogr.wkbPolygon25D
     ds.Destroy()
 
     ogr.GetDriverByName('ESRI Shapefile').DeleteDataSource('tmp/poly.shp')
@@ -417,8 +394,7 @@ def test_ogr2ogr_13():
     gdaltest.runexternal(test_cli_utilities.get_ogr2ogr_path() + ' tmp/poly.shp ../ogr/data/poly.shp poly')
 
     ds = ogr.Open('tmp/poly.shp')
-    if ds is None or ds.GetLayer(0).GetFeatureCount() != 10:
-        return 'fail'
+    assert ds is not None and ds.GetLayer(0).GetFeatureCount() == 10
     ds.Destroy()
 
     ogr.GetDriverByName('ESRI Shapefile').DeleteDataSource('tmp/poly.shp')
@@ -442,11 +418,9 @@ def test_ogr2ogr_14():
     gdaltest.runexternal(test_cli_utilities.get_ogr2ogr_path() + ' -segmentize 100 tmp/poly.shp ../ogr/data/poly.shp poly')
 
     ds = ogr.Open('tmp/poly.shp')
-    if ds is None or ds.GetLayer(0).GetFeatureCount() != 10:
-        return 'fail'
+    assert ds is not None and ds.GetLayer(0).GetFeatureCount() == 10
     feat = ds.GetLayer(0).GetNextFeature()
-    if feat.GetGeometryRef().GetGeometryRef(0).GetPointCount() != 36:
-        return 'fail'
+    assert feat.GetGeometryRef().GetGeometryRef(0).GetPointCount() == 36
     ds.Destroy()
 
     ogr.GetDriverByName('ESRI Shapefile').DeleteDataSource('tmp/poly.shp')
@@ -471,16 +445,14 @@ def test_ogr2ogr_15():
     gdaltest.runexternal(test_cli_utilities.get_ogr2ogr_path() + ' tmp/poly.shp ../ogr/data/poly.shp')
 
     ds = ogr.Open('tmp/poly.shp')
-    if ds is None or ds.GetLayer(0).GetFeatureCount() != 10:
-        return 'fail'
+    assert ds is not None and ds.GetLayer(0).GetFeatureCount() == 10
     ds.Destroy()
 
     # Overwrite
     gdaltest.runexternal(test_cli_utilities.get_ogr2ogr_path() + ' -overwrite tmp ../ogr/data/poly.shp')
 
     ds = ogr.Open('tmp/poly.shp')
-    if ds is None or ds.GetLayer(0).GetFeatureCount() != 10:
-        return 'fail'
+    assert ds is not None and ds.GetLayer(0).GetFeatureCount() == 10
     ds.Destroy()
 
     ogr.GetDriverByName('ESRI Shapefile').DeleteDataSource('tmp/poly.shp')
@@ -505,12 +477,10 @@ def test_ogr2ogr_16():
 
     src_ds = ogr.Open('../ogr/data/poly.shp')
     ds = ogr.Open('tmp/poly.shp')
-    if ds is None or ds.GetLayer(0).GetFeatureCount() != 1:
-        return 'fail'
+    assert ds is not None and ds.GetLayer(0).GetFeatureCount() == 1
     src_feat = src_ds.GetLayer(0).GetFeature(8)
     feat = ds.GetLayer(0).GetNextFeature()
-    if feat.GetField("EAS_ID") != src_feat.GetField("EAS_ID"):
-        return 'fail'
+    assert feat.GetField("EAS_ID") == src_feat.GetField("EAS_ID")
     ds.Destroy()
     src_ds.Destroy()
 
@@ -533,12 +503,10 @@ def test_ogr2ogr_17():
         pass
 
     ret = gdaltest.runexternal(test_cli_utilities.get_ogr2ogr_path() + ' -progress tmp/poly.shp ../ogr/data/poly.shp')
-    if ret.find('0...10...20...30...40...50...60...70...80...90...100 - done.') == -1:
-        return 'fail'
+    assert ret.find('0...10...20...30...40...50...60...70...80...90...100 - done.') != -1
 
     ds = ogr.Open('tmp/poly.shp')
-    if ds is None or ds.GetLayer(0).GetFeatureCount() != 10:
-        return 'fail'
+    assert ds is not None and ds.GetLayer(0).GetFeatureCount() == 10
     ds.Destroy()
 
     ogr.GetDriverByName('ESRI Shapefile').DeleteDataSource('tmp/poly.shp')
@@ -621,13 +589,10 @@ def test_ogr2ogr_19():
     gdaltest.runexternal(test_cli_utilities.get_ogr2ogr_path() + ' tmp/poly.shp ../ogr/data/poly.shp -clipsrc spat_extent -spat 479609 4764629 479764 4764817')
 
     ds = ogr.Open('tmp/poly.shp')
-    if ds is None or ds.GetLayer(0).GetFeatureCount() != 4:
-        return 'fail'
+    assert ds is not None and ds.GetLayer(0).GetFeatureCount() == 4
 
-    if ds.GetLayer(0).GetExtent() != (479609, 479764, 4764629, 4764817):
-        print(ds.GetLayer(0).GetExtent())
-        gdaltest.post_reason('unexpected extent')
-        return 'fail'
+    assert ds.GetLayer(0).GetExtent() == (479609, 479764, 4764629, 4764817), \
+        'unexpected extent'
 
     ds.Destroy()
 
@@ -680,8 +645,7 @@ def test_ogr2ogr_20():
 
     ds = ogr.Open('tmp/Fields.dbf')
 
-    if ds is None:
-        return 'fail'
+    assert ds is not None
     layer_defn = ds.GetLayer(0).GetLayerDefn()
     if layer_defn.GetFieldCount() != 15:
         gdaltest.post_reason('Unexpected field count: ' + str(ds.GetLayer(0).GetLayerDefn().GetFieldCount()))
@@ -702,8 +666,7 @@ def test_ogr2ogr_20():
     ds.Destroy()
     ogr.GetDriverByName('ESRI Shapefile').DeleteDataSource('tmp/Fields.dbf')
 
-    if error_occurred:
-        return 'fail'
+    assert not error_occurred
 
     return 'success'
 
@@ -726,8 +689,7 @@ def test_ogr2ogr_21():
                          '-sql "SELECT comment, name FROM dataforogr2ogr21" -nlt POINT')
     ds = ogr.Open('tmp/testogr2ogr21.gtm')
 
-    if ds is None:
-        return 'fail'
+    assert ds is not None
     ds.GetLayer(0).GetLayerDefn()
     lyr = ds.GetLayer(0)
     feat = lyr.GetNextFeature()
@@ -757,8 +719,7 @@ def test_ogr2ogr_22():
                          '-sql "SELECT comment, name FROM dataforogr2ogr21" -nlt POINT')
     ds = ogr.Open('tmp/testogr2ogr22.mif')
 
-    if ds is None:
-        return 'fail'
+    assert ds is not None
     ds.GetLayer(0).GetLayerDefn()
     lyr = ds.GetLayer(0)
     feat = lyr.GetNextFeature()
@@ -788,8 +749,7 @@ def test_ogr2ogr_23():
                          '-sql "SELECT comment, name FROM dataforogr2ogr21" -select comment,name -nlt POINT')
     ds = ogr.Open('tmp/testogr2ogr23.mif')
 
-    if ds is None:
-        return 'fail'
+    assert ds is not None
     ds.GetLayer(0).GetLayerDefn()
     lyr = ds.GetLayer(0)
     feat = lyr.GetNextFeature()
@@ -826,13 +786,10 @@ def test_ogr2ogr_24():
     gdaltest.runexternal(test_cli_utilities.get_ogr2ogr_path() + ' tmp/poly.shp ../ogr/data/poly.shp -clipsrc "POLYGON((479609 4764629,479609 4764817,479764 4764817,479764 4764629,479609 4764629))"')
 
     ds = ogr.Open('tmp/poly.shp')
-    if ds is None or ds.GetLayer(0).GetFeatureCount() != 4:
-        return 'fail'
+    assert ds is not None and ds.GetLayer(0).GetFeatureCount() == 4
 
-    if ds.GetLayer(0).GetExtent() != (479609, 479764, 4764629, 4764817):
-        print(ds.GetLayer(0).GetExtent())
-        gdaltest.post_reason('unexpected extent')
-        return 'fail'
+    assert ds.GetLayer(0).GetExtent() == (479609, 479764, 4764629, 4764817), \
+        'unexpected extent'
 
     ds.Destroy()
 
@@ -865,13 +822,10 @@ def test_ogr2ogr_25():
     gdaltest.runexternal(test_cli_utilities.get_ogr2ogr_path() + ' tmp/poly.shp ../ogr/data/poly.shp -clipsrc tmp/clip.csv -clipsrcwhere foo=\'foo\'')
 
     ds = ogr.Open('tmp/poly.shp')
-    if ds is None or ds.GetLayer(0).GetFeatureCount() != 4:
-        return 'fail'
+    assert ds is not None and ds.GetLayer(0).GetFeatureCount() == 4
 
-    if ds.GetLayer(0).GetExtent() != (479609, 479764, 4764629, 4764817):
-        print(ds.GetLayer(0).GetExtent())
-        gdaltest.post_reason('unexpected extent')
-        return 'fail'
+    assert ds.GetLayer(0).GetExtent() == (479609, 479764, 4764629, 4764817), \
+        'unexpected extent'
 
     ds.Destroy()
 
@@ -900,13 +854,10 @@ def test_ogr2ogr_26():
     gdaltest.runexternal(test_cli_utilities.get_ogr2ogr_path() + ' tmp/poly.shp ../ogr/data/poly.shp -clipdst "POLYGON((479609 4764629,479609 4764817,479764 4764817,479764 4764629,479609 4764629))"')
 
     ds = ogr.Open('tmp/poly.shp')
-    if ds is None or ds.GetLayer(0).GetFeatureCount() != 4:
-        return 'fail'
+    assert ds is not None and ds.GetLayer(0).GetFeatureCount() == 4
 
-    if ds.GetLayer(0).GetExtent() != (479609, 479764, 4764629, 4764817):
-        print(ds.GetLayer(0).GetExtent())
-        gdaltest.post_reason('unexpected extent')
-        return 'fail'
+    assert ds.GetLayer(0).GetExtent() == (479609, 479764, 4764629, 4764817), \
+        'unexpected extent'
 
     ds.Destroy()
 
@@ -939,13 +890,10 @@ def test_ogr2ogr_27():
     gdaltest.runexternal(test_cli_utilities.get_ogr2ogr_path() + ' -nlt MULTIPOLYGON tmp/poly.shp ../ogr/data/poly.shp -clipdst tmp/clip.csv -clipdstsql "SELECT * from clip"')
 
     ds = ogr.Open('tmp/poly.shp')
-    if ds is None or ds.GetLayer(0).GetFeatureCount() != 4:
-        return 'fail'
+    assert ds is not None and ds.GetLayer(0).GetFeatureCount() == 4
 
-    if ds.GetLayer(0).GetExtent() != (479609, 479764, 4764629, 4764817):
-        print(ds.GetLayer(0).GetExtent())
-        gdaltest.post_reason('unexpected extent')
-        return 'fail'
+    assert ds.GetLayer(0).GetExtent() == (479609, 479764, 4764629, 4764817), \
+        'unexpected extent'
 
     ds.Destroy()
 
@@ -1062,8 +1010,7 @@ def test_ogr2ogr_29():
         ogr.GetDriverByName('ESRI Shapefile').DeleteDataSource('tmp/wrapdateline_src.shp')
         ogr.GetDriverByName('ESRI Shapefile').DeleteDataSource('tmp/wrapdateline_dst.shp')
 
-        if ret != 0:
-            return 'fail'
+        assert ret == 0
 
     return 'success'
 
@@ -1085,8 +1032,7 @@ def test_ogr2ogr_30():
     gdal.Unlink('../ogr/data//testlistfields.gfs')
 
     ds = ogr.Open('tmp/test_ogr2ogr_30.dbf')
-    if ds is None:
-        return 'fail'
+    assert ds is not None
     lyr = ds.GetLayer(0)
     feat = lyr.GetNextFeature()
 
@@ -1124,8 +1070,7 @@ def test_ogr2ogr_31():
     gdaltest.runexternal(test_cli_utilities.get_ogr2ogr_path() + ' -overwrite tmp/poly.shp ../ogr/data/poly.shp')
 
     ds = ogr.Open('tmp/poly.shp')
-    if ds is None or ds.GetLayer(0).GetFeatureCount() != 10:
-        return 'fail'
+    assert ds is not None and ds.GetLayer(0).GetFeatureCount() == 10
     ds.Destroy()
 
     ogr.GetDriverByName('ESRI Shapefile').DeleteDataSource('tmp/poly.shp')
@@ -1150,17 +1095,14 @@ def test_ogr2ogr_32():
     gdaltest.runexternal(test_cli_utilities.get_ogr2ogr_path() + ' -append tmp/test_ogr2ogr_32.shp ../ogr/data/poly.shp')
 
     ds = ogr.Open('tmp/test_ogr2ogr_32.shp')
-    if ds is None or ds.GetLayer(0).GetFeatureCount() != 20:
-        gdaltest.post_reason('-append failed')
-        return 'fail'
+    assert ds is not None and ds.GetLayer(0).GetFeatureCount() == 20, '-append failed'
     ds = None
 
     gdaltest.runexternal(test_cli_utilities.get_ogr2ogr_path() + ' -overwrite tmp/test_ogr2ogr_32.shp ../ogr/data/poly.shp')
 
     ds = ogr.Open('tmp/test_ogr2ogr_32.shp')
-    if ds is None or ds.GetLayer(0).GetFeatureCount() != 10:
-        gdaltest.post_reason('-overwrite failed')
-        return 'fail'
+    assert ds is not None and ds.GetLayer(0).GetFeatureCount() == 10, \
+        '-overwrite failed'
     ds = None
 
     ogr.GetDriverByName('ESRI Shapefile').DeleteDataSource('tmp/test_ogr2ogr_32.shp')
@@ -1197,10 +1139,7 @@ def test_ogr2ogr_33():
 
     ds = ogr.Open('tmp/test_ogr2ogr_33_dst.shp')
     lyr = ds.GetLayer(0)
-    if lyr.GetFeatureCount() != 3:
-        gdaltest.post_reason('-explodecollections failed')
-        print(lyr.GetFeatureCount())
-        return 'fail'
+    assert lyr.GetFeatureCount() == 3, '-explodecollections failed'
 
     feat = lyr.GetFeature(0)
     if feat.GetField("foo") != 'bar':
@@ -1252,25 +1191,21 @@ def test_ogr2ogr_34():
     gdaltest.runexternal(test_cli_utilities.get_ogr2ogr_path() + ' tmp/test_ogr2ogr_34_dir ../ogr/data/poly.shp -nln test_ogr2ogr_34_dir')
 
     ds = ogr.Open('tmp/test_ogr2ogr_34_dir/test_ogr2ogr_34_dir.shp')
-    if ds is None or ds.GetLayer(0).GetFeatureCount() != 10:
-        gdaltest.post_reason('initial shapefile creation failed')
-        return 'fail'
+    assert ds is not None and ds.GetLayer(0).GetFeatureCount() == 10, \
+        'initial shapefile creation failed'
     ds = None
 
     gdaltest.runexternal(test_cli_utilities.get_ogr2ogr_path() + ' -append tmp/test_ogr2ogr_34_dir ../ogr/data/poly.shp -nln test_ogr2ogr_34_dir')
 
     ds = ogr.Open('tmp/test_ogr2ogr_34_dir/test_ogr2ogr_34_dir.shp')
-    if ds is None or ds.GetLayer(0).GetFeatureCount() != 20:
-        gdaltest.post_reason('-append failed')
-        return 'fail'
+    assert ds is not None and ds.GetLayer(0).GetFeatureCount() == 20, '-append failed'
     ds = None
 
     gdaltest.runexternal(test_cli_utilities.get_ogr2ogr_path() + ' -overwrite tmp/test_ogr2ogr_34_dir ../ogr/data/poly.shp -nln test_ogr2ogr_34_dir')
 
     ds = ogr.Open('tmp/test_ogr2ogr_34_dir/test_ogr2ogr_34_dir.shp')
-    if ds is None or ds.GetLayer(0).GetFeatureCount() != 10:
-        gdaltest.post_reason('-overwrite failed')
-        return 'fail'
+    assert ds is not None and ds.GetLayer(0).GetFeatureCount() == 10, \
+        '-overwrite failed'
     ds = None
 
     ogr.GetDriverByName('ESRI Shapefile').DeleteDataSource('tmp/test_ogr2ogr_34_dir')
@@ -1294,25 +1229,21 @@ def test_ogr2ogr_35():
     gdaltest.runexternal(test_cli_utilities.get_ogr2ogr_path() + ' tmp/test_ogr2ogr_35_dir ../ogr/data/poly.shp ')
 
     ds = ogr.Open('tmp/test_ogr2ogr_35_dir/poly.shp')
-    if ds is None or ds.GetLayer(0).GetFeatureCount() != 10:
-        gdaltest.post_reason('initial shapefile creation failed')
-        return 'fail'
+    assert ds is not None and ds.GetLayer(0).GetFeatureCount() == 10, \
+        'initial shapefile creation failed'
     ds = None
 
     gdaltest.runexternal(test_cli_utilities.get_ogr2ogr_path() + ' -append tmp/test_ogr2ogr_35_dir ../ogr/data/poly.shp')
 
     ds = ogr.Open('tmp/test_ogr2ogr_35_dir/poly.shp')
-    if ds is None or ds.GetLayer(0).GetFeatureCount() != 20:
-        gdaltest.post_reason('-append failed')
-        return 'fail'
+    assert ds is not None and ds.GetLayer(0).GetFeatureCount() == 20, '-append failed'
     ds = None
 
     gdaltest.runexternal(test_cli_utilities.get_ogr2ogr_path() + ' -overwrite tmp/test_ogr2ogr_35_dir ../ogr/data/poly.shp')
 
     ds = ogr.Open('tmp/test_ogr2ogr_35_dir/poly.shp')
-    if ds is None or ds.GetLayer(0).GetFeatureCount() != 10:
-        gdaltest.post_reason('-overwrite failed')
-        return 'fail'
+    assert ds is not None and ds.GetLayer(0).GetFeatureCount() == 10, \
+        '-overwrite failed'
     ds = None
 
     ogr.GetDriverByName('ESRI Shapefile').DeleteDataSource('tmp/test_ogr2ogr_35_dir')
@@ -1342,8 +1273,7 @@ def test_ogr2ogr_36():
 
     ogr.GetDriverByName('ESRI Shapefile').DeleteDataSource('tmp/test_ogr2ogr_36.shp')
 
-    if wkt.find(' 168,') == -1:
-        return 'fail'
+    assert wkt.find(' 168,') != -1
 
     return 'success'
 
@@ -1376,8 +1306,7 @@ def test_ogr2ogr_37():
     gdaltest.runexternal(test_cli_utilities.get_ogr2ogr_path() + ' tmp/test_ogr2ogr_37_dir.shp tmp/test_ogr2ogr_37_src')
 
     ds = ogr.Open('tmp/test_ogr2ogr_37_dir.shp')
-    if ds is None or ds.GetLayerCount() != 2:
-        return 'fail'
+    assert ds is not None and ds.GetLayerCount() == 2
     ds = None
 
     ogr.GetDriverByName('ESRI Shapefile').DeleteDataSource('tmp/test_ogr2ogr_37_src')
@@ -1406,8 +1335,7 @@ def test_ogr2ogr_38():
     ds = ogr.Open('tmp/test_ogr2ogr_38.shp')
     lyr = ds.GetLayer(0)
     feat = lyr.GetNextFeature()
-    if feat is None:
-        return 'fail'
+    assert feat is not None
     ds = None
 
     ogr.GetDriverByName('ESRI Shapefile').DeleteDataSource('tmp/test_ogr2ogr_38.shp')
@@ -1443,8 +1371,7 @@ def test_ogr2ogr_39():
     gdaltest.runexternal(test_cli_utilities.get_ogr2ogr_path() + ' tmp/test_ogr2ogr_39.shp tmp/test_ogr2ogr_39_src -sql "select * from poly"')
 
     ds = ogr.Open('tmp/test_ogr2ogr_39.shp')
-    if ds is None or ds.GetLayerCount() != 1:
-        return 'fail'
+    assert ds is not None and ds.GetLayerCount() == 1
     ds = None
 
     ogr.GetDriverByName('ESRI Shapefile').DeleteDataSource('tmp/test_ogr2ogr_39_src')
@@ -1475,8 +1402,7 @@ def test_ogr2ogr_40():
 
     ds = ogr.Open('tmp/test_ogr2ogr_40.db')
     lyr = ds.GetLayerByName('poly2')
-    if lyr.GetFeatureCount() != 10:
-        return 'fail'
+    assert lyr.GetFeatureCount() == 10
     ds = None
 
     ogr.GetDriverByName('SQLite').DeleteDataSource('tmp/test_ogr2ogr_40.db')
@@ -1517,8 +1443,7 @@ def test_ogr2ogr_41():
 
     ds = ogr.Open('PG:' + gdaltest.pg_connection_string)
     lyr = ds.GetLayerByName('test_ogr2ogr_41_target')
-    if lyr.GetFeatureCount() != 501:
-        return 'fail'
+    assert lyr.GetFeatureCount() == 501
     ds.ExecuteSQL('DELLAYER:test_ogr2ogr_41_src')
     ds.ExecuteSQL('DELLAYER:test_ogr2ogr_41_target')
     ds = None
@@ -1544,8 +1469,7 @@ def test_ogr2ogr_42():
 
     ds = ogr.Open('tmp/test_ogr2ogr_42.shp')
     lyr = ds.GetLayerByIndex(0)
-    if lyr.GetFeatureCount() != 1:
-        return 'fail'
+    assert lyr.GetFeatureCount() == 1
     ds = None
 
     ogr.GetDriverByName('ESRI Shapefile').DeleteDataSource('tmp/test_ogr2ogr_42.shp')
@@ -1571,8 +1495,7 @@ def test_ogr2ogr_43():
 
     ds = ogr.Open('tmp/test_ogr2ogr_43_3d.shp')
     lyr = ds.GetLayerByIndex(0)
-    if lyr.GetGeomType() != ogr.wkbPolygon25D:
-        return 'fail'
+    assert lyr.GetGeomType() == ogr.wkbPolygon25D
     ds = None
 
     try:
@@ -1585,8 +1508,7 @@ def test_ogr2ogr_43():
 
     ds = ogr.Open('tmp/test_ogr2ogr_43_2d.shp')
     lyr = ds.GetLayerByIndex(0)
-    if lyr.GetGeomType() != ogr.wkbPolygon:
-        return 'fail'
+    assert lyr.GetGeomType() == ogr.wkbPolygon
     ds = None
 
     ogr.GetDriverByName('ESRI Shapefile').DeleteDataSource('tmp/test_ogr2ogr_43_2d.shp')
@@ -1628,17 +1550,13 @@ def test_ogr2ogr_44():
     data = f.read()
     f.close()
 
-    if data.find('type="gml:MultiPolygonPropertyType"') == -1:
-        print(data)
-        return 'fail'
+    assert data.find('type="gml:MultiPolygonPropertyType"') != -1
 
     f = open('tmp/test_ogr2ogr_44.gml')
     data = f.read()
     f.close()
 
-    if data.find('<ogr:geometryProperty><gml:MultiPolygon><gml:polygonMember><gml:Polygon><gml:outerBoundaryIs><gml:LinearRing><gml:coordinates>0,0 0,1 1,1 0,0</gml:coordinates></gml:LinearRing></gml:outerBoundaryIs></gml:Polygon></gml:polygonMember></gml:MultiPolygon></ogr:geometryProperty>') == -1:
-        print(data)
-        return 'fail'
+    assert data.find('<ogr:geometryProperty><gml:MultiPolygon><gml:polygonMember><gml:Polygon><gml:outerBoundaryIs><gml:LinearRing><gml:coordinates>0,0 0,1 1,1 0,0</gml:coordinates></gml:LinearRing></gml:outerBoundaryIs></gml:Polygon></gml:polygonMember></gml:MultiPolygon></ogr:geometryProperty>') != -1
 
     ogr.GetDriverByName('ESRI Shapefile').DeleteDataSource('tmp/test_ogr2ogr_44_src.shp')
     os.unlink('tmp/test_ogr2ogr_44.gml')
@@ -1680,17 +1598,13 @@ def test_ogr2ogr_45():
     data = f.read()
     f.close()
 
-    if data.find('type="gml:MultiLineStringPropertyType"') == -1:
-        print(data)
-        return 'fail'
+    assert data.find('type="gml:MultiLineStringPropertyType"') != -1
 
     f = open('tmp/test_ogr2ogr_45.gml')
     data = f.read()
     f.close()
 
-    if data.find('<ogr:geometryProperty><gml:MultiLineString><gml:lineStringMember><gml:LineString><gml:coordinates>0,0 0,1 1,1 0,0</gml:coordinates></gml:LineString></gml:lineStringMember></gml:MultiLineString></ogr:geometryProperty>') == -1:
-        print(data)
-        return 'fail'
+    assert data.find('<ogr:geometryProperty><gml:MultiLineString><gml:lineStringMember><gml:LineString><gml:coordinates>0,0 0,1 1,1 0,0</gml:coordinates></gml:LineString></gml:lineStringMember></gml:MultiLineString></ogr:geometryProperty>') != -1
 
     ogr.GetDriverByName('ESRI Shapefile').DeleteDataSource('tmp/test_ogr2ogr_45_src.shp')
     os.unlink('tmp/test_ogr2ogr_45.gml')
@@ -1733,15 +1647,11 @@ def test_ogr2ogr_46():
         data = f.read()
         f.close()
 
-        if data.find('2,49') == -1 and data.find('2.0,49.0') == -1 and data.find('222638.') == -1:
-            print(option)
-            print(data)
-            return 'fail'
+        assert not (data.find('2,49') == -1 and data.find('2.0,49.0') == -1 and data.find('222638.') == -1), \
+            option
 
-        if data.find('3,50') == -1 and data.find('3.0,50.0') == -1 and data.find('333958.') == -1:
-            print(option)
-            print(data)
-            return 'fail'
+        assert not (data.find('3,50') == -1 and data.find('3.0,50.0') == -1 and data.find('333958.') == -1), \
+            option
 
         os.unlink('tmp/test_ogr2ogr_46.gml')
         os.unlink('tmp/test_ogr2ogr_46.xsd')
@@ -1797,9 +1707,7 @@ def test_ogr2ogr_47():
     data = f.read()
     f.close()
 
-    if data.find('>-3.0,40.65') == -1 and data.find('<3.0,40.65') == -1:
-        print(data)
-        return 'fail'
+    assert not (data.find('>-3.0,40.65') == -1 and data.find('<3.0,40.65') == -1)
 
     os.unlink('tmp/test_ogr2ogr_47_dst.gml')
     os.unlink('tmp/test_ogr2ogr_47_dst.xsd')
@@ -1823,8 +1731,7 @@ def test_ogr2ogr_48():
 
     ds = ogr.Open('tmp/Fields.dbf')
 
-    if ds is None:
-        return 'fail'
+    assert ds is not None
     layer_defn = ds.GetLayer(0).GetLayerDefn()
     if layer_defn.GetFieldCount() != 15:
         gdaltest.post_reason('Unexpected field count: ' + str(ds.GetLayer(0).GetLayerDefn().GetFieldCount()))
@@ -1849,8 +1756,7 @@ def test_ogr2ogr_48():
     ds.Destroy()
     ogr.GetDriverByName('ESRI Shapefile').DeleteDataSource('tmp/Fields.dbf')
 
-    if error_occurred:
-        return 'fail'
+    assert not error_occurred
 
     return 'success'
 
@@ -1870,10 +1776,8 @@ def test_ogr2ogr_49():
 
     os.unlink('tmp/test_ogr2ogr_49.csv')
 
-    if lines[0].find('foo,bar,foo3,foo2,baz,foo4') != 0 or \
-       lines[1].find('val_foo,val_bar,val_foo3,val_foo2,val_baz,val_foo4') != 0:
-        print(lines)
-        return 'fail'
+    assert (lines[0].find('foo,bar,foo3,foo2,baz,foo4') == 0 and \
+       lines[1].find('val_foo,val_bar,val_foo3,val_foo2,val_baz,val_foo4') == 0)
 
     return 'success'
 
@@ -1903,13 +1807,9 @@ def test_ogr2ogr_49_bis():
         """</Folder>""",
         """</Document></kml>"""]
 
-    if len(lines) != len(expected_lines):
-        print(lines)
-        return 'fail'
+    assert len(lines) == len(expected_lines)
     for i, line in enumerate(lines):
-        if line.strip() != expected_lines[i].strip():
-            print(lines)
-            return 'fail'
+        assert line.strip() == expected_lines[i].strip(), lines
 
     return 'success'
 
@@ -1975,9 +1875,7 @@ def test_ogr2ogr_51():
 
     expected_lines = ['"_WKTgeom1_EPSG_4326","_WKTgeom2_EPSG_32631","id","foo"', '"POINT (1 2)","POINT (3 4)","1","bar"']
     for i in range(2):
-        if lines[i].strip() != expected_lines[i]:
-            print(lines)
-            return 'fail'
+        assert lines[i].strip() == expected_lines[i]
 
     # Test conversion from a multi-geometry format into a single-geometry format
     gdaltest.runexternal(test_cli_utilities.get_ogr2ogr_path() + ' tmp/test_ogr2ogr_51_dst.shp tmp/test_ogr2ogr_51_src.csv -nln test_ogr2ogr_51_dst')
@@ -1985,12 +1883,9 @@ def test_ogr2ogr_51():
     ds = ogr.Open('tmp/test_ogr2ogr_51_dst.shp')
     lyr = ds.GetLayer(0)
     sr = lyr.GetSpatialRef()
-    if sr is None or sr.ExportToWkt().find('GEOGCS["WGS 84"') != 0:
-        print(sr.ExportToWkt())
-        return 'fail'
+    assert sr is not None and sr.ExportToWkt().find('GEOGCS["WGS 84"') == 0
     feat = lyr.GetNextFeature()
-    if feat.GetGeometryRef().ExportToWkt() != 'POINT (1 2)':
-        return 'fail'
+    assert feat.GetGeometryRef().ExportToWkt() == 'POINT (1 2)'
     ds = None
     ogr.GetDriverByName('ESRI Shapefile').DeleteDataSource('tmp/test_ogr2ogr_51_dst.shp')
 
@@ -2005,9 +1900,7 @@ def test_ogr2ogr_51():
                       '"POINT (1 2)","POINT (3 4)","1","bar"',
                       '"POINT (1 2)","POINT (3 4)","1","bar"']
     for i in range(3):
-        if lines[i].strip() != expected_lines[i]:
-            print(lines)
-            return 'fail'
+        assert lines[i].strip() == expected_lines[i]
 
     os.unlink('tmp/test_ogr2ogr_51_dst.csv')
 
@@ -2020,9 +1913,7 @@ def test_ogr2ogr_51():
 
     expected_lines = ['"_WKTgeom2_EPSG_32631","_WKTgeom1_EPSG_4326","foo","id"', '"POINT (3 4)","POINT (1 2)","bar","1"']
     for i in range(2):
-        if lines[i].strip() != expected_lines[i]:
-            print(lines)
-            return 'fail'
+        assert lines[i].strip() == expected_lines[i]
 
     # Test -geomfield option
     gdaltest.runexternal(test_cli_utilities.get_ogr2ogr_path() + ' -append tmp/test_ogr2ogr_51_dst.csv tmp/test_ogr2ogr_51_src.csv -nln test_ogr2ogr_51_dst -spat 1 2 1 2 -geomfield geom__WKTgeom1_EPSG_4326')
@@ -2035,9 +1926,7 @@ def test_ogr2ogr_51():
                       '"POINT (3 4)","POINT (1 2)","bar","1"',
                       '"POINT (3 4)","POINT (1 2)","bar","1"']
     for i in range(2):
-        if lines[i].strip() != expected_lines[i]:
-            print(lines)
-            return 'fail'
+        assert lines[i].strip() == expected_lines[i]
 
     os.unlink('tmp/test_ogr2ogr_51_src.csv')
     os.unlink('tmp/test_ogr2ogr_51_dst.csv')
@@ -2063,9 +1952,7 @@ def test_ogr2ogr_52():
     content = f.read()
     f.close()
 
-    if content.find('LINESTRING (0 0,') < 0:
-        print(content)
-        return 'fail'
+    assert content.find('LINESTRING (0 0,') >= 0
 
     gdaltest.runexternal(test_cli_utilities.get_ogr2ogr_path() + ' -f CSV tmp/test_ogr2ogr_52_dst2.csv tmp/test_ogr2ogr_52_dst.csv -select id -nln test_ogr2ogr_52_dst2 -dsco GEOMETRY=AS_WKT -nlt CONVERT_TO_CURVE')
 
@@ -2073,9 +1960,7 @@ def test_ogr2ogr_52():
     content = f.read()
     f.close()
 
-    if content.find('COMPOUNDCURVE ((0 0,') < 0:
-        print(content)
-        return 'fail'
+    assert content.find('COMPOUNDCURVE ((0 0,') >= 0
 
     os.unlink('tmp/test_ogr2ogr_52_src.csv')
     os.unlink('tmp/test_ogr2ogr_52_dst.csv')
@@ -2106,14 +1991,12 @@ def test_ogr2ogr_53():
     content = f.read()
     f.close()
 
-    if content.find('<SimpleField name="id" type="int"></SimpleField>') < 0 or \
-       content.find('<SimpleData name="id">1</SimpleData>') < 0 or \
-       content.find('<SimpleField name="i64" type="float"></SimpleField>') < 0 or \
-       content.find('<SimpleData name="i64">123456789012</SimpleData>') < 0 or \
-       content.find('<SimpleField name="b" type="string"></SimpleField>') < 0 or \
-       content.find('<SimpleData name="b">1</SimpleData>') < 0:
-        print(content)
-        return 'fail'
+    assert (content.find('<SimpleField name="id" type="int"></SimpleField>') >= 0 and \
+       content.find('<SimpleData name="id">1</SimpleData>') >= 0 and \
+       content.find('<SimpleField name="i64" type="float"></SimpleField>') >= 0 and \
+       content.find('<SimpleData name="i64">123456789012</SimpleData>') >= 0 and \
+       content.find('<SimpleField name="b" type="string"></SimpleField>') >= 0 and \
+       content.find('<SimpleData name="b">1</SimpleData>') >= 0)
 
     os.unlink('tmp/test_ogr2ogr_53.kml')
 
@@ -2124,9 +2007,7 @@ def test_ogr2ogr_53():
     content = f.read()
     f.close()
 
-    if content.find('"123456789012.0"') < 0:
-        print(content)
-        return 'fail'
+    assert content.find('"123456789012.0"') >= 0
 
     os.unlink('tmp/test_ogr2ogr_53.bna')
 
@@ -2137,10 +2018,8 @@ def test_ogr2ogr_53():
     content = f.read()
     f.close()
 
-    if content.find('<SimpleField name="i64" type="string"></SimpleField>') < 0 or \
-       content.find('<SimpleData name="i64">123456789012</SimpleData>') < 0:
-        print(content)
-        return 'fail'
+    assert (content.find('<SimpleField name="i64" type="string"></SimpleField>') >= 0 and \
+       content.find('<SimpleData name="i64">123456789012</SimpleData>') >= 0)
 
     os.unlink('tmp/test_ogr2ogr_53.kml')
 
@@ -2182,11 +2061,9 @@ def test_ogr2ogr_54():
     content = f.read()
     f.close()
 
-    if content.find('<xs:element name="WKT" type="gml:GeometryPropertyType" nillable="true" minOccurs="1" maxOccurs="1"/>') < 0 or \
-       content.find('<xs:element name="fld1" nillable="true" minOccurs="1" maxOccurs="1">') < 0 or \
-       content.find('<xs:element name="fld2" nillable="true" minOccurs="0" maxOccurs="1">') < 0:
-        print(content)
-        return 'fail'
+    assert (content.find('<xs:element name="WKT" type="gml:GeometryPropertyType" nillable="true" minOccurs="1" maxOccurs="1"/>') >= 0 and \
+       content.find('<xs:element name="fld1" nillable="true" minOccurs="1" maxOccurs="1">') >= 0 and \
+       content.find('<xs:element name="fld2" nillable="true" minOccurs="0" maxOccurs="1">') >= 0)
 
     os.unlink('tmp/test_ogr2ogr_54.gml')
     os.unlink('tmp/test_ogr2ogr_54.xsd')
@@ -2198,11 +2075,9 @@ def test_ogr2ogr_54():
     content = f.read()
     f.close()
 
-    if content.find('<xs:element name="WKT" type="gml:GeometryPropertyType" nillable="true" minOccurs="0" maxOccurs="1"/>') < 0 or \
-       content.find('<xs:element name="fld1" nillable="true" minOccurs="0" maxOccurs="1">') < 0 or \
-       content.find('<xs:element name="fld2" nillable="true" minOccurs="0" maxOccurs="1">') < 0:
-        print(content)
-        return 'fail'
+    assert (content.find('<xs:element name="WKT" type="gml:GeometryPropertyType" nillable="true" minOccurs="0" maxOccurs="1"/>') >= 0 and \
+       content.find('<xs:element name="fld1" nillable="true" minOccurs="0" maxOccurs="1">') >= 0 and \
+       content.find('<xs:element name="fld2" nillable="true" minOccurs="0" maxOccurs="1">') >= 0)
 
     os.unlink('tmp/test_ogr2ogr_54.gml')
     os.unlink('tmp/test_ogr2ogr_54.xsd')
@@ -2249,9 +2124,7 @@ def test_ogr2ogr_55():
     content = f.read()
     f.close()
 
-    if content.find('<ogr:fld2>2</ogr:fld2>') < 0:
-        print(content)
-        return 'fail'
+    assert content.find('<ogr:fld2>2</ogr:fld2>') >= 0
 
     os.unlink('tmp/test_ogr2ogr_55.gml')
     os.unlink('tmp/test_ogr2ogr_55.xsd')
@@ -2263,9 +2136,7 @@ def test_ogr2ogr_55():
     content = f.read()
     f.close()
 
-    if content.find('<ogr:fld2>') >= 0:
-        print(content)
-        return 'fail'
+    assert content.find('<ogr:fld2>') < 0
 
     os.unlink('tmp/test_ogr2ogr_55.gml')
     os.unlink('tmp/test_ogr2ogr_55.xsd')
@@ -2299,10 +2170,8 @@ def test_ogr2ogr_56():
     content = f.read()
     f.close()
 
-    if content.find("""ALTER TABLE "public"."test_ogr2ogr_56" ADD COLUMN "myid"" """) >= 0 or \
-       content.find("""INSERT INTO "public"."test_ogr2ogr_56" ("wkb_geometry" , "myid" , "str", "wkt") VALUES ('010100000000000000000000000000000000000000', 10, 'aaa', 'POINT(0 0)');""") < 0:
-        print(content)
-        return 'fail'
+    assert (content.find("""ALTER TABLE "public"."test_ogr2ogr_56" ADD COLUMN "myid"" """) < 0 and \
+       content.find("""INSERT INTO "public"."test_ogr2ogr_56" ("wkb_geometry" , "myid" , "str", "wkt") VALUES ('010100000000000000000000000000000000000000', 10, 'aaa', 'POINT(0 0)');""") >= 0)
 
     os.unlink('tmp/test_ogr2ogr_56.sql')
     os.unlink('tmp/test_ogr2ogr_56.csv')
@@ -2347,10 +2216,8 @@ def test_ogr2ogr_57():
     content = f.read()
     f.close()
 
-    if content.find("""CREATE TABLE "public"."test_ogr2ogr_57" (    "id" SERIAL,    CONSTRAINT "test_ogr2ogr_57_pk" PRIMARY KEY ("id") )""") < 0 or \
-       content.find("""INSERT INTO "public"."test_ogr2ogr_57" ("wkt" , "id" , "str") VALUES ('010100000000000000000000000000000000000000', 10, 'a')""") < 0:
-        print(content)
-        return 'fail'
+    assert (content.find("""CREATE TABLE "public"."test_ogr2ogr_57" (    "id" SERIAL,    CONSTRAINT "test_ogr2ogr_57_pk" PRIMARY KEY ("id") )""") >= 0 and \
+       content.find("""INSERT INTO "public"."test_ogr2ogr_57" ("wkt" , "id" , "str") VALUES ('010100000000000000000000000000000000000000', 10, 'a')""") >= 0)
 
     os.unlink('tmp/test_ogr2ogr_57.sql')
 
@@ -2361,10 +2228,8 @@ def test_ogr2ogr_57():
     content = f.read()
     f.close()
 
-    if content.find("""CREATE TABLE "public"."test_ogr2ogr_57" (    "ogc_fid" SERIAL,    CONSTRAINT "test_ogr2ogr_57_pk" PRIMARY KEY ("ogc_fid") )""") < 0 or \
-       content.find("""INSERT INTO "public"."test_ogr2ogr_57" ("wkt" , "str") VALUES ('010100000000000000000000000000000000000000', 'a')""") < 0:
-        print(content)
-        return 'fail'
+    assert (content.find("""CREATE TABLE "public"."test_ogr2ogr_57" (    "ogc_fid" SERIAL,    CONSTRAINT "test_ogr2ogr_57_pk" PRIMARY KEY ("ogc_fid") )""") >= 0 and \
+       content.find("""INSERT INTO "public"."test_ogr2ogr_57" ("wkt" , "str") VALUES ('010100000000000000000000000000000000000000', 'a')""") >= 0)
 
     os.unlink('tmp/test_ogr2ogr_57.sql')
 
@@ -2388,8 +2253,7 @@ def test_ogr2ogr_58():
 
     ds = ogr.Open('tmp/test_ogr2ogr_58.sqlite')
     lyr = ds.GetLayer(0)
-    if lyr.GetFeatureCount() != 10:
-        return 'fail'
+    assert lyr.GetFeatureCount() == 10
     ds = None
 
     ogr.GetDriverByName('SQLite').DeleteDataSource('tmp/test_ogr2ogr_58.sqlite')
@@ -2417,32 +2281,20 @@ def test_ogr2ogr_59():
     gdaltest.runexternal(test_cli_utilities.get_ogr2ogr_path() + ' -f GPKG tmp/test_ogr2ogr_59_dest.gpkg tmp/test_ogr2ogr_59_src.gpkg -mo BAZ=BAW')
 
     ds = ogr.Open('tmp/test_ogr2ogr_59_dest.gpkg')
-    if ds.GetMetadata() != {'FOO': 'BAR', 'BAZ': 'BAW'}:
-        print(ds.GetMetadata())
-        return 'fail'
-    if ds.GetMetadata('another_domain') != {'BAR': 'BAZ'}:
-        print(ds.GetMetadata())
-        return 'fail'
+    assert ds.GetMetadata() == {'FOO': 'BAR', 'BAZ': 'BAW'}
+    assert ds.GetMetadata('another_domain') == {'BAR': 'BAZ'}
     lyr = ds.GetLayer(0)
-    if lyr.GetMetadata() != {'lyr_FOO': 'lyr_BAR'}:
-        print(lyr.GetMetadata())
-        return 'fail'
-    if lyr.GetMetadata('lyr_another_domain') != {'lyr_BAR': 'lyr_BAZ'}:
-        print(lyr.GetMetadata())
-        return 'fail'
+    assert lyr.GetMetadata() == {'lyr_FOO': 'lyr_BAR'}
+    assert lyr.GetMetadata('lyr_another_domain') == {'lyr_BAR': 'lyr_BAZ'}
     ds = None
 
     ogr.GetDriverByName('GPKG').DeleteDataSource('tmp/test_ogr2ogr_59_dest.gpkg')
 
     gdaltest.runexternal(test_cli_utilities.get_ogr2ogr_path() + ' -f GPKG tmp/test_ogr2ogr_59_dest.gpkg tmp/test_ogr2ogr_59_src.gpkg -nomd')
     ds = ogr.Open('tmp/test_ogr2ogr_59_dest.gpkg')
-    if ds.GetMetadata() != {}:
-        print(ds.GetMetadata())
-        return 'fail'
+    assert ds.GetMetadata() == {}
     lyr = ds.GetLayer(0)
-    if lyr.GetMetadata() != {}:
-        print(lyr.GetMetadata())
-        return 'fail'
+    assert lyr.GetMetadata() == {}
     ds = None
 
     ogr.GetDriverByName('GPKG').DeleteDataSource('tmp/test_ogr2ogr_59_dest.gpkg')
@@ -2465,8 +2317,7 @@ def test_ogr2ogr_60():
 
     ds = ogr.Open('tmp/test_ogr2ogr_60.gdb')
     lyr = ds.GetLayer(0)
-    if lyr.GetFeatureCount() != 10:
-        return 'fail'
+    assert lyr.GetFeatureCount() == 10
     ds = None
 
     ogr.GetDriverByName('FileGDB').DeleteDataSource('tmp/test_ogr2ogr_60.gdb')
@@ -2489,15 +2340,13 @@ def test_ogr2ogr_61():
     gdaltest.runexternal(test_cli_utilities.get_ogr2ogr_path() + ' tmp/test_ogr2ogr_61.shp tmp/test_ogr2ogr_61.csv -spat 426857 5427937 426858 5427938 -spat_srs EPSG:32631 -s_srs EPSG:4326 -a_srs EPSG:4326')
 
     ds = ogr.Open('tmp/test_ogr2ogr_61.shp')
-    if ds is None or ds.GetLayer(0).GetFeatureCount() != 1:
-        return 'fail'
+    assert ds is not None and ds.GetLayer(0).GetFeatureCount() == 1
     ds.Destroy()
 
     gdaltest.runexternal(test_cli_utilities.get_ogr2ogr_path() + ' tmp/test_ogr2ogr_61_2.shp tmp/test_ogr2ogr_61.shp -spat 426857 5427937 426858 5427938 -spat_srs EPSG:32631')
 
     ds = ogr.Open('tmp/test_ogr2ogr_61_2.shp')
-    if ds is None or ds.GetLayer(0).GetFeatureCount() != 1:
-        return 'fail'
+    assert ds is not None and ds.GetLayer(0).GetFeatureCount() == 1
     ds.Destroy()
 
     ogr.GetDriverByName('ESRI Shapefile').DeleteDataSource('tmp/test_ogr2ogr_61.shp')
@@ -2522,29 +2371,23 @@ def test_ogr2ogr_62():
 
     gdaltest.runexternal(test_cli_utilities.get_ogr2ogr_path() + """ -f GeoJSON tmp/test_ogr2ogr_62.json tmp/test_ogr2ogr_62_in.json""")
     fp = gdal.VSIFOpenL('tmp/test_ogr2ogr_62.json', 'rb')
-    if fp is None:
-        return 'fail'
+    assert fp is not None
     data = gdal.VSIFReadL(1, 10000, fp).decode('ascii')
     gdal.VSIFCloseL(fp)
     os.unlink('tmp/test_ogr2ogr_62.json')
 
-    if data.find('bar') < 0 or data.find('baz') < 0:
-        print(data)
-        return 'fail'
+    assert data.find('bar') >= 0 and data.find('baz') >= 0
 
     # Test -noNativeData
     gdaltest.runexternal(test_cli_utilities.get_ogr2ogr_path() + """ -f GeoJSON tmp/test_ogr2ogr_62.json tmp/test_ogr2ogr_62_in.json -noNativeData""")
     fp = gdal.VSIFOpenL('tmp/test_ogr2ogr_62.json', 'rb')
-    if fp is None:
-        return 'fail'
+    assert fp is not None
     data = gdal.VSIFReadL(1, 10000, fp).decode('ascii')
     gdal.VSIFCloseL(fp)
     os.unlink('tmp/test_ogr2ogr_62.json')
     os.unlink('tmp/test_ogr2ogr_62_in.json')
 
-    if data.find('bar') >= 0 or data.find('baz') >= 0:
-        print(data)
-        return 'fail'
+    assert data.find('bar') < 0 and data.find('baz') < 0
 
     return 'success'
 
@@ -2563,14 +2406,8 @@ def test_ogr2ogr_63():
         pass
 
     (ret, err) = gdaltest.runexternal_out_and_err(test_cli_utilities.get_ogr2ogr_path() + ' --formats')
-    if ret.find('Supported Formats') < 0:
-        print(ret)
-        print(err)
-        return 'fail'
-    if err.find('ERROR') >= 0:
-        print(ret)
-        print(err)
-        return 'fail'
+    assert ret.find('Supported Formats') >= 0, err
+    assert err.find('ERROR') < 0, ret
     return 'success'
 
 ###############################################################################
@@ -2603,10 +2440,8 @@ def test_ogr2ogr_64():
     gdaltest.runexternal(test_cli_utilities.get_ogr2ogr_path() + ' -append tmp/out_csv tmp/in_csv')
 
     ds = ogr.Open('tmp/out_csv')
-    if ds.GetLayerByName(first_layer).GetFeatureCount() != 1:
-        return 'fail'
-    if ds.GetLayerByName(second_layer).GetFeatureCount() != 2:
-        return 'fail'
+    assert ds.GetLayerByName(first_layer).GetFeatureCount() == 1
+    assert ds.GetLayerByName(second_layer).GetFeatureCount() == 2
     ds = None
 
     shutil.rmtree('tmp/in_csv')
@@ -2624,17 +2459,14 @@ def test_ogr2ogr_65():
 
     gdaltest.runexternal(test_cli_utilities.get_ogr2ogr_path() + ' tmp/out.csv ../ogr/data/poly.shp')
     ds = gdal.OpenEx('tmp/out.csv')
-    if ds.GetDriver().ShortName != 'CSV':
-        return 'fail'
+    assert ds.GetDriver().ShortName == 'CSV'
     ds = None
     gdal.Unlink('tmp/out.csv')
 
     (ret, err) = gdaltest.runexternal_out_and_err(test_cli_utilities.get_ogr2ogr_path() + ' /vsimem/out.xxx ../ogr/data/poly.shp')
     if err.find("Cannot guess") < 0:
-        gdaltest.post_reason('expected a warning about probably wrong extension')
         print(ret)
-        print(err)
-        return 'fail'
+        pytest.fail('expected a warning about probably wrong extension')
 
     return 'success'
 
@@ -2647,10 +2479,8 @@ def test_ogr2ogr_66():
         return 'skip'
 
     (ret, err) = gdaltest.runexternal_out_and_err(test_cli_utilities.get_ogr2ogr_path() + ' ../ogr/data/poly.shp ../ogr/data/poly.shp')
-    if err.find("Source and destination datasets must be different in non-update mode") < 0:
-        print(ret)
-        print(err)
-        return 'fail'
+    assert err.find("Source and destination datasets must be different in non-update mode") >= 0, \
+        ret
 
     return 'success'
 
diff --git a/autotest/utilities/test_ogr2ogr_lib.py b/autotest/utilities/test_ogr2ogr_lib.py
index f4df6052ecf2..915d176a072f 100755
--- a/autotest/utilities/test_ogr2ogr_lib.py
+++ b/autotest/utilities/test_ogr2ogr_lib.py
@@ -35,6 +35,7 @@
 from osgeo import gdal, gdalconst, ogr
 import gdaltest
 import ogrtest
+import pytest
 
 ###############################################################################
 # Simple test
@@ -44,18 +45,13 @@ def test_ogr2ogr_lib_1():
 
     srcDS = gdal.OpenEx('../ogr/data/poly.shp')
     ds = gdal.VectorTranslate('', srcDS, format='Memory')
-    if ds is None or ds.GetLayer(0).GetFeatureCount() != 10:
-        return 'fail'
+    assert ds is not None and ds.GetLayer(0).GetFeatureCount() == 10
 
     feat0 = ds.GetLayer(0).GetFeature(0)
-    if feat0.GetFieldAsDouble('AREA') != 215229.266:
-        print(feat0.GetFieldAsDouble('AREA'))
-        gdaltest.post_reason('Did not get expected value for field AREA')
-        return 'fail'
-    if feat0.GetFieldAsString('PRFEDEA') != '35043411':
-        print(feat0.GetFieldAsString('PRFEDEA'))
-        gdaltest.post_reason('Did not get expected value for field PRFEDEA')
-        return 'fail'
+    assert feat0.GetFieldAsDouble('AREA') == 215229.266, \
+        'Did not get expected value for field AREA'
+    assert feat0.GetFieldAsString('PRFEDEA') == '35043411', \
+        'Did not get expected value for field PRFEDEA'
 
     return 'success'
 
@@ -67,14 +63,12 @@ def test_ogr2ogr_lib_2():
 
     srcDS = gdal.OpenEx('../ogr/data/poly.shp')
     ds = gdal.VectorTranslate('', srcDS, format='Memory', SQLStatement='select * from poly', SQLDialect='OGRSQL')
-    if ds is None or ds.GetLayer(0).GetFeatureCount() != 10:
-        return 'fail'
+    assert ds is not None and ds.GetLayer(0).GetFeatureCount() == 10
 
     # Test @filename syntax
     gdal.FileFromMemBuffer('/vsimem/sql.txt', '-- initial comment\nselect * from poly\n-- trailing comment')
     ds = gdal.VectorTranslate('', srcDS, format='Memory', SQLStatement='@/vsimem/sql.txt')
-    if ds is None or ds.GetLayer(0).GetFeatureCount() != 10:
-        return 'fail'
+    assert ds is not None and ds.GetLayer(0).GetFeatureCount() == 10
     gdal.Unlink('/vsimem/sql.txt')
 
     # Test @filename syntax with a UTF-8 BOM
@@ -83,8 +77,7 @@ def test_ogr2ogr_lib_2():
     else:
         gdal.FileFromMemBuffer('/vsimem/sql.txt', '\xEF\xBB\xBFselect * from poly')
     ds = gdal.VectorTranslate('', srcDS, format='Memory', SQLStatement='@/vsimem/sql.txt')
-    if ds is None or ds.GetLayer(0).GetFeatureCount() != 10:
-        return 'fail'
+    assert ds is not None and ds.GetLayer(0).GetFeatureCount() == 10
     gdal.Unlink('/vsimem/sql.txt')
 
     return 'success'
@@ -97,14 +90,12 @@ def test_ogr2ogr_lib_3():
 
     srcDS = gdal.OpenEx('../ogr/data/poly.shp')
     ds = gdal.VectorTranslate('', srcDS, format='Memory', where='EAS_ID=171')
-    if ds is None or ds.GetLayer(0).GetFeatureCount() != 1:
-        return 'fail'
+    assert ds is not None and ds.GetLayer(0).GetFeatureCount() == 1
 
     # Test @filename syntax
     gdal.FileFromMemBuffer('/vsimem/filter.txt', 'EAS_ID=171')
     ds = gdal.VectorTranslate('', srcDS, format='Memory', where='@/vsimem/filter.txt')
-    if ds is None or ds.GetLayer(0).GetFeatureCount() != 1:
-        return 'fail'
+    assert ds is not None and ds.GetLayer(0).GetFeatureCount() == 1
     gdal.Unlink('/vsimem/filter.txt')
 
     return 'success'
@@ -117,39 +108,22 @@ def test_ogr2ogr_lib_4():
 
     srcDS = gdal.OpenEx('../ogr/data/poly.shp')
     ds = gdal.VectorTranslate('/vsimem/poly.shp', srcDS)
-    if ds.GetLayer(0).GetFeatureCount() != 10:
-        gdaltest.post_reason('wrong feature count')
-        print(ds.GetLayer(0).GetFeatureCount())
-        return 'fail'
+    assert ds.GetLayer(0).GetFeatureCount() == 10, 'wrong feature count'
     ds = None
 
     ds = gdal.VectorTranslate('/vsimem/poly.shp', srcDS, accessMode='append')
-    if ds is None:
-        gdaltest.post_reason('ds is None')
-        return 'fail'
-    if ds.GetLayer(0).GetFeatureCount() != 20:
-        gdaltest.post_reason('wrong feature count')
-        print(ds.GetLayer(0).GetFeatureCount())
-        return 'fail'
+    assert ds is not None, 'ds is None'
+    assert ds.GetLayer(0).GetFeatureCount() == 20, 'wrong feature count'
 
     ret = gdal.VectorTranslate(ds, srcDS, accessMode='append')
-    if ret != 1:
-        gdaltest.post_reason('ds is None')
-        return 'fail'
-    if ds.GetLayer(0).GetFeatureCount() != 30:
-        gdaltest.post_reason('wrong feature count')
-        print(ds.GetLayer(0).GetFeatureCount())
-        return 'fail'
+    assert ret == 1, 'ds is None'
+    assert ds.GetLayer(0).GetFeatureCount() == 30, 'wrong feature count'
 
     feat10 = ds.GetLayer(0).GetFeature(10)
-    if feat10.GetFieldAsDouble('AREA') != 215229.266:
-        print(feat10.GetFieldAsDouble('AREA'))
-        gdaltest.post_reason('Did not get expected value for field AREA')
-        return 'fail'
-    if feat10.GetFieldAsString('PRFEDEA') != '35043411':
-        print(feat10.GetFieldAsString('PRFEDEA'))
-        gdaltest.post_reason('Did not get expected value for field PRFEDEA')
-        return 'fail'
+    assert feat10.GetFieldAsDouble('AREA') == 215229.266, \
+        'Did not get expected value for field AREA'
+    assert feat10.GetFieldAsString('PRFEDEA') == '35043411', \
+        'Did not get expected value for field PRFEDEA'
 
     ds = None
     ogr.GetDriverByName('ESRI Shapefile').DeleteDataSource('/vsimem/poly.shp')
@@ -164,8 +138,7 @@ def test_ogr2ogr_lib_5():
 
     srcDS = gdal.OpenEx('../ogr/data/poly.shp')
     ds = gdal.VectorTranslate('', srcDS, format='Memory', dstSRS='EPSG:4326')
-    if str(ds.GetLayer(0).GetSpatialRef()).find('1984') == -1:
-        return 'fail'
+    assert str(ds.GetLayer(0).GetSpatialRef()).find('1984') != -1
 
     return 'success'
 
@@ -179,8 +152,7 @@ def test_ogr2ogr_lib_6():
     # Voluntary don't use the exact case of the source field names (#4502)
     ds = gdal.VectorTranslate('', srcDS, format='Memory', selectFields=['eas_id', 'prfedea'])
     lyr = ds.GetLayer(0)
-    if lyr.GetLayerDefn().GetFieldCount() != 2:
-        return 'fail'
+    assert lyr.GetLayerDefn().GetFieldCount() == 2
     feat = lyr.GetNextFeature()
     ret = 'success'
     if feat.GetFieldAsDouble('EAS_ID') != 168:
@@ -202,8 +174,7 @@ def test_ogr2ogr_lib_7():
 
     srcDS = gdal.OpenEx('../ogr/data/poly.shp')
     ds = gdal.VectorTranslate('/vsimem/poly.shp', srcDS, layerCreationOptions=['SHPT=POLYGONZ'])
-    if ds.GetLayer(0).GetLayerDefn().GetGeomType() != ogr.wkbPolygon25D:
-        return 'fail'
+    assert ds.GetLayer(0).GetLayerDefn().GetGeomType() == ogr.wkbPolygon25D
 
     ds = None
     ogr.GetDriverByName('ESRI Shapefile').DeleteDataSource('/vsimem/poly.shp')
@@ -218,13 +189,11 @@ def test_ogr2ogr_lib_8():
 
     srcDS = gdal.OpenEx('../ogr/data/poly.shp')
     ds = gdal.VectorTranslate('', srcDS, format='Memory', layers=['poly'])
-    if ds is None or ds.GetLayer(0).GetFeatureCount() != 10:
-        return 'fail'
+    assert ds is not None and ds.GetLayer(0).GetFeatureCount() == 10
 
     # Test also with just a string and not an array
     ds = gdal.VectorTranslate('', srcDS, format='Memory', layers='poly')
-    if ds is None or ds.GetLayer(0).GetFeatureCount() != 10:
-        return 'fail'
+    assert ds is not None and ds.GetLayer(0).GetFeatureCount() == 10
 
     return 'success'
 
@@ -236,11 +205,9 @@ def test_ogr2ogr_lib_9():
 
     srcDS = gdal.OpenEx('../ogr/data/poly.shp')
     ds = gdal.VectorTranslate('', srcDS, format='Memory', segmentizeMaxDist=100)
-    if ds is None or ds.GetLayer(0).GetFeatureCount() != 10:
-        return 'fail'
+    assert ds is not None and ds.GetLayer(0).GetFeatureCount() == 10
     feat = ds.GetLayer(0).GetNextFeature()
-    if feat.GetGeometryRef().GetGeometryRef(0).GetPointCount() != 36:
-        return 'fail'
+    assert feat.GetGeometryRef().GetGeometryRef(0).GetPointCount() == 36
 
     return 'success'
 
@@ -252,14 +219,12 @@ def test_ogr2ogr_lib_10():
 
     srcDS = gdal.OpenEx('../ogr/data/poly.shp')
     ds = gdal.VectorTranslate('/vsimem/tmp/poly.shp', srcDS)
-    if ds is None or ds.GetLayer(0).GetFeatureCount() != 10:
-        return 'fail'
+    assert ds is not None and ds.GetLayer(0).GetFeatureCount() == 10
     ds = None
 
     # Overwrite
     ds = gdal.VectorTranslate('/vsimem/tmp', srcDS, accessMode='overwrite')
-    if ds is None or ds.GetLayer(0).GetFeatureCount() != 10:
-        return 'fail'
+    assert ds is not None and ds.GetLayer(0).GetFeatureCount() == 10
     ds = None
 
     ogr.GetDriverByName('ESRI Shapefile').DeleteDataSource('/vsimem/tmp')
@@ -274,11 +239,9 @@ def test_ogr2ogr_lib_11():
     srcDS = gdal.OpenEx('../ogr/data/poly.shp')
     ds = gdal.VectorTranslate('', srcDS, format='Memory', spatFilter=[479609, 4764629, 479764, 4764817])
     if ogrtest.have_geos():
-        if ds is None or ds.GetLayer(0).GetFeatureCount() != 4:
-            return 'fail'
+        assert ds is not None and ds.GetLayer(0).GetFeatureCount() == 4
     else:
-        if ds is None or ds.GetLayer(0).GetFeatureCount() != 5:
-            return 'fail'
+        assert ds is not None and ds.GetLayer(0).GetFeatureCount() == 5
 
     return 'success'
 
@@ -296,12 +259,9 @@ def test_ogr2ogr_lib_12():
 
     tab = [0]
     ds = gdal.VectorTranslate('', '../ogr/data/poly.shp', format='Memory', callback=mycallback, callback_data=tab)
-    if ds is None or ds.GetLayer(0).GetFeatureCount() != 10:
-        return 'fail'
+    assert ds is not None and ds.GetLayer(0).GetFeatureCount() == 10
 
-    if tab[0] != 1.0:
-        gdaltest.post_reason('Bad percentage')
-        return 'fail'
+    assert tab[0] == 1.0, 'Bad percentage'
 
     return 'success'
 
@@ -320,8 +280,7 @@ def test_ogr2ogr_lib_13():
 
     with gdaltest.error_handler():
         ds = gdal.VectorTranslate('', '../ogr/data/poly.shp', format='Memory', callback=mycallback_with_failure)
-    if ds is not None:
-        return 'fail'
+    assert ds is None
 
     return 'success'
 
@@ -349,8 +308,7 @@ def test_ogr2ogr_lib_15():
     with gdaltest.error_handler():
         ds = gdal.VectorTranslate('', srcDS, format='Memory', zField='foo')
     lyr = ds.GetLayer(0)
-    if lyr.GetGeomType() != ogr.wkbPolygon:
-        return 'fail'
+    assert lyr.GetGeomType() == ogr.wkbPolygon
 
     return 'success'
 
@@ -386,10 +344,7 @@ def test_ogr2ogr_lib_16():
         f = lyr.GetNextFeature()
         if f.GetGeometryRef().ExportToIsoWkt() != wkt_after:
             print(wkt_before)
-            print(dim)
-            print(wkt_after)
-            print(f.GetGeometryRef().ExportToIsoWkt())
-            return 'fail'
+            pytest.fail(dim)
 
     return 'success'
 
@@ -402,8 +357,7 @@ def test_ogr2ogr_lib_17():
     ds = gdal.GetDriverByName('Memory').Create('', 0, 0, 0)
     gdal.VectorTranslate(ds, gdal.OpenEx('../ogr/data/poly.shp'))
     lyr = ds.GetLayer(0)
-    if lyr.GetFeatureCount() != 10:
-        return 'fail'
+    assert lyr.GetFeatureCount() == 10
     ds = None
 
     return 'success'
@@ -417,8 +371,7 @@ def test_ogr2ogr_lib_18():
     ds = gdal.GetDriverByName('Memory').Create('', 0, 0, 0)
     gdal.VectorTranslate(ds, gdal.OpenEx('../ogr/data/poly.shp'), limit=1)
     lyr = ds.GetLayer(0)
-    if lyr.GetFeatureCount() != 1:
-        return 'fail'
+    assert lyr.GetFeatureCount() == 1
     ds = None
 
     return 'success'
@@ -468,9 +421,7 @@ def test_ogr2ogr_lib_20():
 
     ds = gdal.VectorTranslate('/vsimem/out.gpkg', src_ds, format='GPKG')
     lyr = ds.GetLayer(0)
-    if lyr.GetGeometryColumn() != 'foo':
-        print(lyr.GetGeometryColumn())
-        return 'fail'
+    assert lyr.GetGeometryColumn() == 'foo'
     ds = None
     gdal.Unlink('/vsimem/out.gpkg')
 
@@ -481,9 +432,7 @@ def test_ogr2ogr_lib_20():
 
     ds = gdal.VectorTranslate('/vsimem/out.gpkg', src_ds, format='GPKG', selectFields=['bar'])
     lyr = ds.GetLayer(0)
-    if lyr.GetGeometryColumn() != 'bar':
-        print(lyr.GetGeometryColumn())
-        return 'fail'
+    assert lyr.GetGeometryColumn() == 'bar'
     ds = None
     gdal.Unlink('/vsimem/out.gpkg')
 
@@ -513,10 +462,8 @@ def test_ogr2ogr_lib_21():
     f.Destroy()
     src_ds = None
 
-    if gdal.GetLastErrorNo() != gdalconst.CPLE_IllegalArg:
-        gdaltest.post_reason(
-            'expected use of -select and -append together to be invalid')
-        return 'fail'
+    assert gdal.GetLastErrorNo() == gdalconst.CPLE_IllegalArg, \
+        'expected use of -select and -append together to be invalid'
 
     return 'success'
 
@@ -535,9 +482,7 @@ def test_ogr2ogr_clipsrc_no_dst_geom():
                               options='-f CSV -clipsrc "%s"' % wkt)
     lyr = ds.GetLayer(0)
     fc = lyr.GetFeatureCount()
-    if fc != 1:
-        print(fc)
-        return 'fail'
+    assert fc == 1
     ds = None
 
     gdal.Unlink(tmpfilename)
diff --git a/autotest/utilities/test_ogrinfo.py b/autotest/utilities/test_ogrinfo.py
index e4dc178c39e3..108655c473ca 100755
--- a/autotest/utilities/test_ogrinfo.py
+++ b/autotest/utilities/test_ogrinfo.py
@@ -47,12 +47,8 @@ def test_ogrinfo_1():
         return 'skip'
 
     (ret, err) = gdaltest.runexternal_out_and_err(test_cli_utilities.get_ogrinfo_path() + ' ../ogr/data/poly.shp')
-    if not (err is None or err == ''):
-        gdaltest.post_reason('got error/warning')
-        print(err)
-        return 'fail'
-    if ret.find('ESRI Shapefile') == -1:
-        return 'fail'
+    assert (err is None or err == ''), 'got error/warning'
+    assert ret.find('ESRI Shapefile') != -1
 
     return 'success'
 
@@ -65,8 +61,7 @@ def test_ogrinfo_2():
         return 'skip'
 
     ret = gdaltest.runexternal(test_cli_utilities.get_ogrinfo_path() + ' -ro ../ogr/data/poly.shp')
-    if ret.find('ESRI Shapefile') == -1:
-        return 'fail'
+    assert ret.find('ESRI Shapefile') != -1
 
     return 'success'
 
@@ -79,18 +74,12 @@ def test_ogrinfo_3():
         return 'skip'
 
     ret = gdaltest.runexternal(test_cli_utilities.get_ogrinfo_path() + ' -al ../ogr/data/poly.shp')
-    if ret.find('Layer name: poly') == -1:
-        return 'fail'
-    if ret.find('Geometry: Polygon') == -1:
-        return 'fail'
-    if ret.find('Feature Count: 10') == -1:
-        return 'fail'
-    if ret.find('Extent: (478315') == -1:
-        return 'fail'
-    if ret.find('PROJCS["OSGB') == -1:
-        return 'fail'
-    if ret.find('AREA: Real (') == -1:
-        return 'fail'
+    assert ret.find('Layer name: poly') != -1
+    assert ret.find('Geometry: Polygon') != -1
+    assert ret.find('Feature Count: 10') != -1
+    assert ret.find('Extent: (478315') != -1
+    assert ret.find('PROJCS["OSGB') != -1
+    assert ret.find('AREA: Real (') != -1
 
     return 'success'
 
@@ -103,8 +92,7 @@ def test_ogrinfo_4():
         return 'skip'
 
     ret = gdaltest.runexternal(test_cli_utilities.get_ogrinfo_path() + ' ../ogr/data/poly.shp poly')
-    if ret.find('Feature Count: 10') == -1:
-        return 'fail'
+    assert ret.find('Feature Count: 10') != -1
 
     return 'success'
 
@@ -117,8 +105,7 @@ def test_ogrinfo_5():
         return 'skip'
 
     ret = gdaltest.runexternal(test_cli_utilities.get_ogrinfo_path() + ' ../ogr/data/poly.shp -sql "select * from poly"')
-    if ret.find('Feature Count: 10') == -1:
-        return 'fail'
+    assert ret.find('Feature Count: 10') != -1
 
     return 'success'
 
@@ -131,10 +118,8 @@ def test_ogrinfo_6():
         return 'skip'
 
     ret = gdaltest.runexternal(test_cli_utilities.get_ogrinfo_path() + ' ../ogr/data/poly.shp poly -geom=no')
-    if ret.find('Feature Count: 10') == -1:
-        return 'fail'
-    if ret.find('POLYGON') != -1:
-        return 'fail'
+    assert ret.find('Feature Count: 10') != -1
+    assert ret.find('POLYGON') == -1
 
     return 'success'
 
@@ -147,12 +132,9 @@ def test_ogrinfo_7():
         return 'skip'
 
     ret = gdaltest.runexternal(test_cli_utilities.get_ogrinfo_path() + ' ../ogr/data/poly.shp poly -geom=summary')
-    if ret.find('Feature Count: 10') == -1:
-        return 'fail'
-    if ret.find('POLYGON (') != -1:
-        return 'fail'
-    if ret.find('POLYGON :') == -1:
-        return 'fail'
+    assert ret.find('Feature Count: 10') != -1
+    assert ret.find('POLYGON (') == -1
+    assert ret.find('POLYGON :') != -1
 
     return 'success'
 
@@ -166,12 +148,10 @@ def test_ogrinfo_8():
 
     ret = gdaltest.runexternal(test_cli_utilities.get_ogrinfo_path() + ' ../ogr/data/poly.shp poly -spat 479609 4764629 479764 4764817')
     if ogrtest.have_geos():
-        if ret.find('Feature Count: 4') == -1:
-            return 'fail'
+        assert ret.find('Feature Count: 4') != -1
         return 'success'
     else:
-        if ret.find('Feature Count: 5') == -1:
-            return 'fail'
+        assert ret.find('Feature Count: 5') != -1
         return 'success'
 
 ###############################################################################
@@ -183,9 +163,7 @@ def test_ogrinfo_9():
         return 'skip'
 
     ret = gdaltest.runexternal(test_cli_utilities.get_ogrinfo_path() + ' ../ogr/data/poly.shp poly -where "EAS_ID=171"')
-    if ret.find('Feature Count: 1') == -1:
-        print(ret)
-        return 'fail'
+    assert ret.find('Feature Count: 1') != -1
 
     return 'success'
 
@@ -198,8 +176,7 @@ def test_ogrinfo_10():
         return 'skip'
 
     ret = gdaltest.runexternal(test_cli_utilities.get_ogrinfo_path() + ' ../ogr/data/poly.shp poly -fid 9')
-    if ret.find('OGRFeature(poly):9') == -1:
-        return 'fail'
+    assert ret.find('OGRFeature(poly):9') != -1
 
     return 'success'
 
@@ -212,10 +189,8 @@ def test_ogrinfo_11():
         return 'skip'
 
     ret = gdaltest.runexternal(test_cli_utilities.get_ogrinfo_path() + ' ../ogr/data/poly.shp poly -fields=no')
-    if ret.find('AREA (Real') != -1:
-        return 'fail'
-    if ret.find('POLYGON (') == -1:
-        return 'fail'
+    assert ret.find('AREA (Real') == -1
+    assert ret.find('POLYGON (') != -1
 
     return 'success'
 
@@ -228,9 +203,7 @@ def test_ogrinfo_12():
         return 'skip'
 
     ret = gdaltest.runexternal(test_cli_utilities.get_ogrinfo_path() + ' --version', check_memleak=False)
-    if ret.find(gdal.VersionInfo('--version')) != 0:
-        print(ret)
-        return 'fail'
+    assert ret.find(gdal.VersionInfo('--version')) == 0
 
     return 'success'
 
@@ -243,9 +216,7 @@ def test_ogrinfo_13():
         return 'skip'
 
     (_, err) = gdaltest.runexternal_out_and_err(test_cli_utilities.get_ogrinfo_path() + ' --config', check_memleak=False)
-    if err.find('--config option given without a key and value argument') < 0:
-        print(err)
-        return 'fail'
+    assert err.find('--config option given without a key and value argument') >= 0
 
     return 'success'
 
@@ -258,9 +229,7 @@ def test_ogrinfo_14():
         return 'skip'
 
     (_, err) = gdaltest.runexternal_out_and_err(test_cli_utilities.get_ogrinfo_path() + ' --mempreload', check_memleak=False)
-    if err.find('--mempreload option given without directory path') < 0:
-        print(err)
-        return 'fail'
+    assert err.find('--mempreload option given without directory path') >= 0
 
     return 'success'
 
@@ -273,9 +242,7 @@ def test_ogrinfo_15():
         return 'skip'
 
     (ret, _) = gdaltest.runexternal_out_and_err(test_cli_utilities.get_ogrinfo_path() + ' --debug on --mempreload ../ogr/data /vsimem/poly.shp', check_memleak=False)
-    if ret.find("ESRI Shapefile") < 0:
-        print(ret)
-        return 'fail'
+    assert ret.find("ESRI Shapefile") >= 0
 
     return 'success'
 
@@ -288,9 +255,7 @@ def test_ogrinfo_16():
         return 'skip'
 
     (_, err) = gdaltest.runexternal_out_and_err(test_cli_utilities.get_ogrinfo_path() + ' --debug', check_memleak=False)
-    if err.find('--debug option given without debug level') < 0:
-        print(err)
-        return 'fail'
+    assert err.find('--debug option given without debug level') >= 0
 
     return 'success'
 
@@ -303,23 +268,17 @@ def test_ogrinfo_17():
         return 'skip'
 
     (_, err) = gdaltest.runexternal_out_and_err(test_cli_utilities.get_ogrinfo_path() + ' --optfile', check_memleak=False)
-    if err.find('--optfile option given without filename') < 0:
-        print(err)
-        return 'fail'
+    assert err.find('--optfile option given without filename') >= 0
 
     (_, err) = gdaltest.runexternal_out_and_err(test_cli_utilities.get_ogrinfo_path() + ' --optfile /foo/bar', check_memleak=False)
-    if err.find('Unable to open optfile') < 0:
-        print(err)
-        return 'fail'
+    assert err.find('Unable to open optfile') >= 0
 
     f = open('tmp/optfile.txt', 'wt')
     f.write('--config foo\n')
     f.close()
     (_, err) = gdaltest.runexternal_out_and_err(test_cli_utilities.get_ogrinfo_path() + ' --optfile tmp/optfile.txt', check_memleak=False)
     os.unlink('tmp/optfile.txt')
-    if err.find('--config option given without a key and value argument') < 0:
-        print(err)
-        return 'fail'
+    assert err.find('--config option given without a key and value argument') >= 0
 
     return 'success'
 
@@ -337,9 +296,7 @@ def test_ogrinfo_18():
     f.close()
     ret = gdaltest.runexternal(test_cli_utilities.get_ogrinfo_path() + ' --optfile tmp/optfile.txt', check_memleak=False)
     os.unlink('tmp/optfile.txt')
-    if ret.find("ESRI Shapefile") < 0:
-        print(ret)
-        return 'fail'
+    assert ret.find("ESRI Shapefile") >= 0
 
     return 'success'
 
@@ -352,9 +309,7 @@ def test_ogrinfo_19():
         return 'skip'
 
     ret = gdaltest.runexternal(test_cli_utilities.get_ogrinfo_path() + ' --formats', check_memleak=False)
-    if ret.find('ESRI Shapefile -vector- (rw+v): ESRI Shapefile') < 0:
-        print(ret)
-        return 'fail'
+    assert ret.find('ESRI Shapefile -vector- (rw+v): ESRI Shapefile') >= 0
 
     return 'success'
 
@@ -367,9 +322,7 @@ def test_ogrinfo_20():
         return 'skip'
 
     ret = gdaltest.runexternal(test_cli_utilities.get_ogrinfo_path() + ' --help-general', check_memleak=False)
-    if ret.find('Generic GDAL utility command options') < 0:
-        print(ret)
-        return 'fail'
+    assert ret.find('Generic GDAL utility command options') >= 0
 
     return 'success'
 
@@ -382,9 +335,7 @@ def test_ogrinfo_21():
         return 'skip'
 
     ret = gdaltest.runexternal(test_cli_utilities.get_ogrinfo_path() + ' --locale C ../ogr/data/poly.shp', check_memleak=False)
-    if ret.find("ESRI Shapefile") < 0:
-        print(ret)
-        return 'fail'
+    assert ret.find("ESRI Shapefile") >= 0
 
     return 'success'
 
@@ -402,9 +353,7 @@ def test_ogrinfo_22():
     f.close()
 
     ret = gdaltest.runexternal(test_cli_utilities.get_ogrinfo_path() + ' tmp/test_ogrinfo_22.csv', check_memleak=False)
-    if ret.find('1: test_ogrinfo_22 (Unknown (any), Unknown (any))') < 0:
-        print(ret)
-        return 'fail'
+    assert ret.find('1: test_ogrinfo_22 (Unknown (any), Unknown (any))') >= 0
 
     ret = gdaltest.runexternal(test_cli_utilities.get_ogrinfo_path() + ' -al tmp/test_ogrinfo_22.csv', check_memleak=False)
     expected_ret = """INFO: Open of `tmp/test_ogrinfo_22.csv'
@@ -463,9 +412,7 @@ def test_ogrinfo_22():
     expected_lines = expected_ret.splitlines()
     lines = ret.splitlines()
     for i, exp_line in enumerate(expected_lines):
-        if exp_line != lines[i]:
-            print(ret)
-            return 'fail'
+        assert exp_line == lines[i], ret
 
     os.unlink('tmp/test_ogrinfo_22.csv')
 
@@ -542,9 +489,7 @@ def test_ogrinfo_23():
     expected_lines = expected_ret.splitlines()
     lines = ret.splitlines()
     for i, exp_line in enumerate(expected_lines):
-        if exp_line != lines[i]:
-            print(ret)
-            return 'fail'
+        assert exp_line == lines[i], ret
 
     os.unlink('tmp/test_ogrinfo_23.csv')
 
@@ -730,14 +675,9 @@ def test_ogrinfo_25():
         return 'skip'
 
     (ret, err) = gdaltest.runexternal_out_and_err(test_cli_utilities.get_ogrinfo_path() + ' -rl -q ../ogr/data/poly.shp')
-    if not (err is None or err == ''):
-        gdaltest.post_reason('got error/warning')
-        print(err)
-        return 'fail'
-    if ret.find('OGRFeature(poly):0') < 0 or ret.find('OGRFeature(poly):9') < 0:
-        gdaltest.post_reason('wrong output')
-        print(ret)
-        return 'fail'
+    assert (err is None or err == ''), 'got error/warning'
+    assert ret.find('OGRFeature(poly):0') >= 0 and ret.find('OGRFeature(poly):9') >= 0, \
+        'wrong output'
 
     return 'success'
 
@@ -753,14 +693,9 @@ def test_ogrinfo_sql_filename():
     open('tmp/my.sql', 'wt').write('-- initial comment\nselect * from poly\n-- trailing comment')
     (ret, err) = gdaltest.runexternal_out_and_err(test_cli_utilities.get_ogrinfo_path() + ' -q ../ogr/data/poly.shp -sql @tmp/my.sql')
     os.unlink('tmp/my.sql')
-    if not (err is None or err == ''):
-        gdaltest.post_reason('got error/warning')
-        print(err)
-        return 'fail'
-    if ret.find('OGRFeature(poly):0') < 0 or ret.find('OGRFeature(poly):9') < 0:
-        gdaltest.post_reason('wrong output')
-        print(ret)
-        return 'fail'
+    assert (err is None or err == ''), 'got error/warning'
+    assert ret.find('OGRFeature(poly):0') >= 0 and ret.find('OGRFeature(poly):9') >= 0, \
+        'wrong output'
 
     return 'success'
 
diff --git a/autotest/utilities/test_ogrlineref.py b/autotest/utilities/test_ogrlineref.py
index 011e37230c3d..4e90f7091767 100755
--- a/autotest/utilities/test_ogrlineref.py
+++ b/autotest/utilities/test_ogrlineref.py
@@ -50,13 +50,10 @@ def test_ogrlineref_1():
         ogr.GetDriverByName('ESRI Shapefile').DeleteDataSource('tmp/parts.shp')
 
     _, err = gdaltest.runexternal_out_and_err(test_cli_utilities.get_ogrlineref_path() + ' -create -l data/path.shp -p data/mstones.shp -pm pos -o tmp/parts.shp -s 1000')
-    if err is not None and err != '':
-        gdaltest.post_reason('got error/warning: "%s"' % err)
-        return 'fail'
+    assert err is None or err == '', ('got error/warning: "%s"' % err)
 
     ds = ogr.Open('tmp/parts.shp')
-    if ds is None or ds.GetLayer(0).GetFeatureCount() != 9:
-        return 'fail'
+    assert ds is not None and ds.GetLayer(0).GetFeatureCount() == 9
 
     return 'success'
 
@@ -71,10 +68,7 @@ def test_ogrlineref_2():
     ret = gdaltest.runexternal(test_cli_utilities.get_ogrlineref_path() + ' -get_pos -r tmp/parts.shp -x -1.4345 -y 51.9497 -quiet').strip()
 
     expected = '15977.724709'
-    if ret != expected:
-        gdaltest.post_reason('"%s" != %s' % (ret.strip(), expected))
-        print(ret)
-        return 'fail'
+    assert ret == expected, ('"%s" != %s' % (ret.strip(), expected))
 
     return 'success'
 
@@ -89,9 +83,7 @@ def test_ogrlineref_3():
     ret = gdaltest.runexternal(test_cli_utilities.get_ogrlineref_path() + ' -get_coord -r tmp/parts.shp -m 15977.724709 -quiet').strip()
 
     expected = '-1.435097,51.950080,0.000000'
-    if ret != expected:
-        gdaltest.post_reason('%s != %s' % (ret.strip(), expected))
-        return 'fail'
+    assert ret == expected, ('%s != %s' % (ret.strip(), expected))
 
     return 'success'
 
@@ -109,14 +101,10 @@ def test_ogrlineref_4():
     gdaltest.runexternal(test_cli_utilities.get_ogrlineref_path() + ' -get_subline -r tmp/parts.shp -mb 13300 -me 17400 -o tmp/subline.shp')
 
     ds = ogr.Open('tmp/subline.shp')
-    if ds is None:
-        gdaltest.post_reason('ds is None')
-        return 'fail'
+    assert ds is not None, 'ds is None'
 
     feature_count = ds.GetLayer(0).GetFeatureCount()
-    if feature_count != 1:
-        gdaltest.post_reason('feature count %d != 1' % feature_count)
-        return 'fail'
+    assert feature_count == 1, ('feature count %d != 1' % feature_count)
     ds = None
 
     ogr.GetDriverByName('ESRI Shapefile').DeleteDataSource('tmp/subline.shp')
diff --git a/autotest/utilities/test_ogrtindex.py b/autotest/utilities/test_ogrtindex.py
index 0a5e3510af50..6fbb155cd925 100755
--- a/autotest/utilities/test_ogrtindex.py
+++ b/autotest/utilities/test_ogrtindex.py
@@ -85,24 +85,16 @@ def test_ogrtindex_1(srs=None):
     shape_ds.Destroy()
 
     (_, err) = gdaltest.runexternal_out_and_err(test_cli_utilities.get_ogrtindex_path() + ' -skip_different_projection tmp/tileindex.shp tmp/point1.shp tmp/point2.shp tmp/point3.shp tmp/point4.shp')
-    if not (err is None or err == ''):
-        gdaltest.post_reason('got error/warning')
-        print(err)
-        return 'fail'
+    assert (err is None or err == ''), 'got error/warning'
 
     ds = ogr.Open('tmp/tileindex.shp')
-    if ds.GetLayer(0).GetFeatureCount() != 4:
-        gdaltest.post_reason('did not get expected feature count')
-        return 'fail'
+    assert ds.GetLayer(0).GetFeatureCount() == 4, 'did not get expected feature count'
 
     if srs is not None:
-        if ds.GetLayer(0).GetSpatialRef() is None or not ds.GetLayer(0).GetSpatialRef().IsSame(srs):
-            gdaltest.post_reason('did not get expected spatial ref')
-            return 'fail'
+        assert ds.GetLayer(0).GetSpatialRef() is not None and ds.GetLayer(0).GetSpatialRef().IsSame(srs), \
+            'did not get expected spatial ref'
     else:
-        if ds.GetLayer(0).GetSpatialRef() is not None:
-            gdaltest.post_reason('did not get expected spatial ref')
-            return 'fail'
+        assert ds.GetLayer(0).GetSpatialRef() is None, 'did not get expected spatial ref'
 
     expected_wkts = ['POLYGON ((49 2,49 2,49 2,49 2,49 2))',
                      'POLYGON ((49 3,49 3,49 3,49 3,49 3))',
@@ -111,9 +103,8 @@ def test_ogrtindex_1(srs=None):
     i = 0
     feat = ds.GetLayer(0).GetNextFeature()
     while feat is not None:
-        if feat.GetGeometryRef().ExportToWkt() != expected_wkts[i]:
-            print('i=%d, wkt=%s' % (i, feat.GetGeometryRef().ExportToWkt()))
-            return 'fail'
+        assert feat.GetGeometryRef().ExportToWkt() == expected_wkts[i], \
+            ('i=%d, wkt=%s' % (i, feat.GetGeometryRef().ExportToWkt()))
         i = i + 1
         feat = ds.GetLayer(0).GetNextFeature()
     ds.Destroy()
@@ -195,19 +186,15 @@ def test_ogrtindex_3():
             test_cli_utilities.get_ogrtindex_path() +
             ' -src_srs_name src_srs -t_srs EPSG:4326 ' + output_filename + ' tmp/point1.shp tmp/point2.shp ' + src_srs_format + output_format)
 
-        if src_srs_format != '-src_srs_format WKT' and not (err is None or err == ''):
-            gdaltest.post_reason('got error/warning')
-            print(err)
-            return 'fail'
+        assert src_srs_format == '-src_srs_format WKT' or (err is None or err == ''), \
+            'got error/warning'
 
         ds = ogr.Open(output_filename)
-        if ds.GetLayer(0).GetFeatureCount() != 2:
-            gdaltest.post_reason('did not get expected feature count')
-            return 'fail'
+        assert ds.GetLayer(0).GetFeatureCount() == 2, \
+            'did not get expected feature count'
 
-        if ds.GetLayer(0).GetSpatialRef().GetAuthorityCode(None) != '4326':
-            gdaltest.post_reason('did not get expected spatial ref')
-            return 'fail'
+        assert ds.GetLayer(0).GetSpatialRef().GetAuthorityCode(None) == '4326', \
+            'did not get expected spatial ref'
 
         expected_wkts = ['POLYGON ((2 49,2 49,2 49,2 49,2 49))',
                          'POLYGON ((3 50,3 50,3 50,3 50,3 50))']
@@ -218,9 +205,8 @@ def test_ogrtindex_3():
                 print(i, src_srs_format)
                 feat.DumpReadable()
                 return 'fail'
-            if ogrtest.check_feature_geometry(feat, expected_wkts[i]) != 0:
-                print('i=%d, wkt=%s' % (i, feat.GetGeometryRef().ExportToWkt()))
-                return 'fail'
+            assert ogrtest.check_feature_geometry(feat, expected_wkts[i]) == 0, \
+                ('i=%d, wkt=%s' % (i, feat.GetGeometryRef().ExportToWkt()))
             i = i + 1
             feat = ds.GetLayer(0).GetNextFeature()
         ds = None

From 18d416311e200b5da50db91131d38b1c59283280 Mon Sep 17 00:00:00 2001
From: Craig de Stigter <craig.destigter@koordinates.com>
Date: Mon, 10 Dec 2018 09:25:52 +1300
Subject: [PATCH 139/488] Automated: Rewrite most skip/fail from tests

Rather than returning a string from tests, we can just call `pytest.skip()`
or `pytest.fail()`. This throws an exception, which is transparently handled
by the pytest runner and provides contextual information.
---
 autotest/alg/contour.py                       |   6 +-
 autotest/alg/cutline.py                       |   7 +-
 autotest/alg/dither.py                        |   3 +-
 autotest/alg/rasterize.py                     |  19 +-
 autotest/alg/reproject.py                     |   6 +-
 autotest/alg/sieve.py                         |   2 +-
 autotest/alg/transformgeoloc.py               |   3 +-
 autotest/alg/warp.py                          | 110 ++--
 autotest/gcore/basic_test.py                  |  38 +-
 autotest/gcore/bmp_read.py                    |   4 +-
 autotest/gcore/colortable.py                  |   3 +-
 autotest/gcore/gdal_api_proxy.py              |  17 +-
 autotest/gcore/gdal_stats.py                  |   6 +-
 autotest/gcore/hdf4_read.py                   |  42 +-
 autotest/gcore/hfa_write.py                   |  18 +-
 autotest/gcore/mask.py                        |  23 +-
 autotest/gcore/misc.py                        |  33 +-
 autotest/gcore/numpy_rw.py                    |  71 +--
 autotest/gcore/overviewds.py                  |   7 +-
 autotest/gcore/pam.py                         |   3 +-
 autotest/gcore/pixfun.py                      |  61 +-
 autotest/gcore/rasterio.py                    |  11 +-
 autotest/gcore/rat.py                         |   5 +-
 autotest/gcore/rfc30.py                       |   3 +-
 autotest/gcore/testnonboundtoswig.py          |  24 +-
 autotest/gcore/thread_test.py                 |   3 +-
 autotest/gcore/tiff_ovr.py                    |  54 +-
 autotest/gcore/tiff_read.py                   | 162 +++--
 autotest/gcore/tiff_write.py                  | 284 ++++-----
 autotest/gcore/transformer.py                 |   6 +-
 autotest/gcore/virtualmem.py                  |  31 +-
 autotest/gcore/vrt_read.py                    |  18 +-
 autotest/gcore/vsiaz.py                       |  65 +-
 autotest/gcore/vsicrypt.py                    |  16 +-
 autotest/gcore/vsicurl.py                     |  73 ++-
 autotest/gcore/vsicurl_streaming.py           |  38 +-
 autotest/gcore/vsifile.py                     |  35 +-
 autotest/gcore/vsigs.py                       |  74 ++-
 autotest/gcore/vsihdfs.py                     |  15 +-
 autotest/gcore/vsioss.py                      |  51 +-
 autotest/gcore/vsis3.py                       |  82 ++-
 autotest/gcore/vsistdin.py                    |   7 +-
 autotest/gcore/vsiswift.py                    |  38 +-
 autotest/gcore/vsiwebhdfs.py                  |  26 +-
 autotest/gcore/vsizip.py                      |  17 +-
 autotest/gdrivers/aaigrid.py                  |   5 +-
 autotest/gdrivers/aigrid.py                   |   9 +-
 autotest/gdrivers/arg.py                      |  21 +-
 autotest/gdrivers/bag.py                      |  31 +-
 autotest/gdrivers/bsb.py                      |  17 +-
 autotest/gdrivers/db2.py                      |  12 +-
 autotest/gdrivers/derived.py                  |  11 +-
 autotest/gdrivers/dods.py                     |  19 +-
 autotest/gdrivers/ecrgtoc.py                  |   4 +-
 autotest/gdrivers/ecw.py                      | 202 +++----
 autotest/gdrivers/eedai.py                    |  42 +-
 autotest/gdrivers/envisat.py                  |  28 +-
 autotest/gdrivers/ers.py                      |   6 +-
 autotest/gdrivers/fast.py                     |  19 +-
 autotest/gdrivers/gdalhttp.py                 |  74 +--
 autotest/gdrivers/georaster.py                |  69 ++-
 autotest/gdrivers/gff.py                      |   3 +-
 autotest/gdrivers/gmt.py                      |   5 +-
 autotest/gdrivers/gpkg.py                     | 218 ++++---
 autotest/gdrivers/grass.py                    |   5 +-
 autotest/gdrivers/grib.py                     |  84 +--
 autotest/gdrivers/gta.py                      |  10 +-
 autotest/gdrivers/hdf5.py                     |  10 +-
 autotest/gdrivers/hfa.py                      |  23 +-
 autotest/gdrivers/jp2kak.py                   |  44 +-
 autotest/gdrivers/jp2lura.py                  | 149 +++--
 autotest/gdrivers/jp2metadata.py              |  13 +-
 autotest/gdrivers/jp2openjpeg.py              | 174 +++---
 autotest/gdrivers/jpeg.py                     |  27 +-
 autotest/gdrivers/jpeg2000.py                 |  49 +-
 autotest/gdrivers/jpeg_profile.py             |   7 +-
 autotest/gdrivers/jpegls.py                   |   5 +-
 autotest/gdrivers/jpipkak.py                  |  21 +-
 autotest/gdrivers/kea.py                      |  28 +-
 autotest/gdrivers/kmlsuperoverlay.py          |  14 +-
 autotest/gdrivers/kro.py                      |   3 +-
 autotest/gdrivers/l1b.py                      |  12 +-
 autotest/gdrivers/lcp.py                      |   4 +-
 autotest/gdrivers/loslas.py                   |   7 +-
 autotest/gdrivers/mbtiles.py                  | 100 ++-
 autotest/gdrivers/mem.py                      |  21 +-
 autotest/gdrivers/mg4lidar.py                 |   9 +-
 autotest/gdrivers/mrsid.py                    |  51 +-
 autotest/gdrivers/netcdf.py                   | 308 +++++-----
 autotest/gdrivers/netcdf_cf.py                |  35 +-
 autotest/gdrivers/nitf.py                     | 110 ++--
 autotest/gdrivers/ntv2.py                     |   9 +-
 autotest/gdrivers/nwt_grd.py                  |   3 +-
 autotest/gdrivers/ozi.py                      |   7 +-
 autotest/gdrivers/pcidsk.py                   |  29 +-
 autotest/gdrivers/pcraster.py                 |   5 +-
 autotest/gdrivers/pdf.py                      | 123 ++--
 autotest/gdrivers/pds4.py                     |  11 +-
 autotest/gdrivers/plmosaic.py                 |  51 +-
 autotest/gdrivers/png_profile.py              |   7 +-
 autotest/gdrivers/postgisraster.py            |  77 ++-
 autotest/gdrivers/rasdaman.py                 |   9 +-
 autotest/gdrivers/rasterlite.py               |  57 +-
 autotest/gdrivers/rda.py                      |  57 +-
 autotest/gdrivers/rik.py                      |  11 +-
 autotest/gdrivers/rl2.py                      |  55 +-
 autotest/gdrivers/rmf.py                      |  19 +-
 autotest/gdrivers/sar_ceos.py                 |   3 +-
 autotest/gdrivers/sentinel2.py                |  89 +--
 autotest/gdrivers/srtmhgt.py                  |   3 +-
 autotest/gdrivers/test_validate_jp2.py        |  61 +-
 autotest/gdrivers/tiff_profile.py             |   7 +-
 autotest/gdrivers/til.py                      |   7 +-
 autotest/gdrivers/usgsdem.py                  |   3 +-
 autotest/gdrivers/vrtderived.py               |  31 +-
 autotest/gdrivers/vrtfilt.py                  |   5 +-
 autotest/gdrivers/vrtmask.py                  |  20 +-
 autotest/gdrivers/vrtpansharpen.py            |   2 +-
 autotest/gdrivers/wcs.py                      |  27 +-
 autotest/gdrivers/webp.py                     |  15 +-
 autotest/gdrivers/wms.py                      | 121 ++--
 autotest/gdrivers/wmts.py                     |  55 +-
 autotest/gnm/gnm_test.py                      |  29 +-
 autotest/ogr/ogr_arcgen.py                    |  37 +-
 autotest/ogr/ogr_avc.py                       |  20 +-
 autotest/ogr/ogr_basic_test.py                |  48 +-
 autotest/ogr/ogr_cad.py                       |  19 +-
 autotest/ogr/ogr_carto.py                     |  50 +-
 autotest/ogr/ogr_cloudant.py                  |  24 +-
 autotest/ogr/ogr_couchdb.py                   |  20 +-
 autotest/ogr/ogr_csv.py                       | 172 +++---
 autotest/ogr/ogr_csw.py                       |  19 +-
 autotest/ogr/ogr_db2.py                       |  26 +-
 autotest/ogr/ogr_db2_hack.py                  |   5 +-
 autotest/ogr/ogr_dgn.py                       |  17 +-
 autotest/ogr/ogr_dgnv8.py                     |  15 +-
 autotest/ogr/ogr_dods.py                      |  29 +-
 autotest/ogr/ogr_dxf.py                       | 571 ++++++++----------
 autotest/ogr/ogr_edigeo.py                    |  11 +-
 autotest/ogr/ogr_eeda.py                      |  19 +-
 autotest/ogr/ogr_elasticsearch.py             |  63 +-
 autotest/ogr/ogr_factory.py                   |   3 +-
 autotest/ogr/ogr_feature.py                   |  11 +-
 autotest/ogr/ogr_fgdb.py                      | 169 +++---
 autotest/ogr/ogr_fgdb_stress_test.py          |  15 +-
 autotest/ogr/ogr_geoconcept.py                |  15 +-
 autotest/ogr/ogr_geojson.py                   | 275 +++++----
 autotest/ogr/ogr_geojsonseq.py                |  15 +-
 autotest/ogr/ogr_geom.py                      |  31 +-
 autotest/ogr/ogr_georss.py                    |  23 +-
 autotest/ogr/ogr_geos.py                      |  67 +-
 autotest/ogr/ogr_gft.py                       |  64 +-
 autotest/ogr/ogr_gml_fgd_read.py              |   8 +-
 autotest/ogr/ogr_gml_geom.py                  |  12 +-
 autotest/ogr/ogr_gml_read.py                  | 337 +++++------
 autotest/ogr/ogr_gmlas.py                     | 392 ++++++------
 autotest/ogr/ogr_gpkg.py                      | 278 ++++-----
 autotest/ogr/ogr_gpsbabel.py                  |  10 +-
 autotest/ogr/ogr_gpx.py                       |  26 +-
 autotest/ogr/ogr_grass.py                     |   5 +-
 autotest/ogr/ogr_gtm.py                       |   9 +-
 autotest/ogr/ogr_htf.py                       |   2 +-
 autotest/ogr/ogr_idrisi.py                    |  33 +-
 autotest/ogr/ogr_ili.py                       | 128 ++--
 autotest/ogr/ogr_index_test.py                |  10 +-
 autotest/ogr/ogr_ingres.py                    |  23 +-
 autotest/ogr/ogr_jml.py                       |  17 +-
 autotest/ogr/ogr_join_test.py                 |  15 +-
 autotest/ogr/ogr_kml.py                       |  52 +-
 autotest/ogr/ogr_layer_algebra.py             |  30 +-
 autotest/ogr/ogr_libkml.py                    | 146 ++---
 autotest/ogr/ogr_mem.py                       |  23 +-
 autotest/ogr/ogr_mitab.py                     | 114 ++--
 autotest/ogr/ogr_mongodb.py                   |  53 +-
 autotest/ogr/ogr_mssqlspatial.py              |  18 +-
 autotest/ogr/ogr_mvt.py                       | 137 ++---
 autotest/ogr/ogr_mysql.py                     |  72 ++-
 autotest/ogr/ogr_nas.py                       |  30 +-
 autotest/ogr/ogr_ntf.py                       |  13 +-
 autotest/ogr/ogr_oci.py                       |  54 +-
 autotest/ogr/ogr_odbc.py                      |  21 +-
 autotest/ogr/ogr_ods.py                       |  50 +-
 autotest/ogr/ogr_ogdi.py                      |  29 +-
 autotest/ogr/ogr_openfilegdb.py               |  42 +-
 autotest/ogr/ogr_osm.py                       | 106 ++--
 autotest/ogr/ogr_pcidsk.py                    |  39 +-
 autotest/ogr/ogr_pdf.py                       |  44 +-
 autotest/ogr/ogr_pds.py                       |   6 +-
 autotest/ogr/ogr_pg.py                        | 366 +++++------
 autotest/ogr/ogr_pgdump.py                    |   9 +-
 autotest/ogr/ogr_pgeo.py                      |  48 +-
 autotest/ogr/ogr_plscenes.py                  |  46 +-
 autotest/ogr/ogr_rec.py                       |   3 +-
 autotest/ogr/ogr_rfc30.py                     |   3 +-
 autotest/ogr/ogr_rfc35_mem.py                 |   3 +-
 autotest/ogr/ogr_rfc35_mitab.py               |   5 +-
 autotest/ogr/ogr_rfc35_shape.py               |   5 +-
 autotest/ogr/ogr_rfc35_sqlite.py              |  15 +-
 autotest/ogr/ogr_rfc41.py                     |  19 +-
 autotest/ogr/ogr_s57.py                       |  23 +-
 autotest/ogr/ogr_sde.py                       |  22 +-
 autotest/ogr/ogr_segukooa.py                  |  37 +-
 autotest/ogr/ogr_segy.py                      |   4 +-
 autotest/ogr/ogr_selafin.py                   |   7 +-
 autotest/ogr/ogr_shape.py                     | 150 ++---
 autotest/ogr/ogr_shape_sbn.py                 |   7 +-
 autotest/ogr/ogr_sosi.py                      |   7 +-
 autotest/ogr/ogr_sql_rfc28.py                 |  31 +-
 autotest/ogr/ogr_sql_sqlite.py                | 130 ++--
 autotest/ogr/ogr_sql_test.py                  |  72 +--
 autotest/ogr/ogr_sqlite.py                    | 244 ++++----
 autotest/ogr/ogr_svg.py                       |  13 +-
 autotest/ogr/ogr_sxf.py                       |   7 +-
 autotest/ogr/ogr_tiger.py                     |  19 +-
 autotest/ogr/ogr_vdv.py                       |  35 +-
 autotest/ogr/ogr_vfk.py                       |  28 +-
 autotest/ogr/ogr_virtualogr.py                |  23 +-
 autotest/ogr/ogr_vrt.py                       | 157 +++--
 autotest/ogr/ogr_wasp.py                      |   9 +-
 autotest/ogr/ogr_wfs.py                       | 206 +++----
 autotest/ogr/ogr_wfs3.py                      |  43 +-
 autotest/ogr/ogr_xls.py                       |  13 +-
 autotest/ogr/ogr_xlsx.py                      |  58 +-
 autotest/ogr/ograpispy.py                     |   8 +-
 autotest/osr/osr_basic.py                     |   4 +-
 autotest/osr/osr_compd.py                     |   8 +-
 autotest/osr/osr_ct.py                        |  25 +-
 autotest/osr/osr_ct_proj.py                   |  18 +-
 autotest/osr/osr_esri.py                      |   2 +-
 autotest/osr/osr_metacrs.py                   |  16 +-
 autotest/osr/osr_proj4.py                     |  16 +-
 autotest/osr/osr_url.py                       |  12 +-
 autotest/pymod/gdaltest.py                    |  33 +-
 autotest/pymod/ogrtest.py                     |   7 +-
 autotest/pyscripts/test_gdal2tiles.py         |  38 +-
 autotest/pyscripts/test_gdal_calc.py          |  33 +-
 autotest/pyscripts/test_gdal_edit.py          |  23 +-
 autotest/pyscripts/test_gdal_fillnodata.py    |   5 +-
 autotest/pyscripts/test_gdal_ls_py.py         |  49 +-
 autotest/pyscripts/test_gdal_merge.py         |  13 +-
 autotest/pyscripts/test_gdal_pansharpen.py    |   7 +-
 autotest/pyscripts/test_gdal_polygonize.py    |  14 +-
 autotest/pyscripts/test_gdal_proximity.py     |   6 +-
 autotest/pyscripts/test_gdal_retile.py        |   9 +-
 autotest/pyscripts/test_gdal_sieve.py         |   2 +-
 autotest/pyscripts/test_gdalinfo_py.py        |  21 +-
 autotest/pyscripts/test_gdalmove.py           |   3 +-
 autotest/pyscripts/test_ogr2ogr_py.py         | 127 ++--
 autotest/pyscripts/test_ogrinfo_py.py         |  27 +-
 autotest/pyscripts/test_ogrmerge.py           |  27 +-
 autotest/pyscripts/test_rgb2pct.py            |  15 +-
 autotest/utilities/test_gdal_contour.py       |  12 +-
 autotest/utilities/test_gdal_grid.py          |  76 +--
 autotest/utilities/test_gdal_rasterize.py     |  29 +-
 autotest/utilities/test_gdal_rasterize_lib.py |   2 +-
 autotest/utilities/test_gdal_translate.py     |  82 +--
 autotest/utilities/test_gdal_translate_lib.py |   3 +-
 autotest/utilities/test_gdaladdo.py           |  17 +-
 autotest/utilities/test_gdalbuildvrt.py       |  39 +-
 autotest/utilities/test_gdaldem.py            |  43 +-
 autotest/utilities/test_gdalinfo.py           |  84 +--
 autotest/utilities/test_gdallocationinfo.py   |  13 +-
 autotest/utilities/test_gdalsrsinfo.py        |  40 +-
 autotest/utilities/test_gdaltindex.py         |  18 +-
 autotest/utilities/test_gdaltransform.py      |  19 +-
 autotest/utilities/test_gdalwarp.py           | 114 ++--
 autotest/utilities/test_gdalwarp_lib.py       |  18 +-
 autotest/utilities/test_gnmutils.py           |  25 +-
 autotest/utilities/test_nearblack.py          |  19 +-
 autotest/utilities/test_ogr2ogr.py            | 209 ++++---
 autotest/utilities/test_ogr2ogr_lib.py        |   8 +-
 autotest/utilities/test_ogrinfo.py            |  62 +-
 autotest/utilities/test_ogrlineref.py         |  15 +-
 autotest/utilities/test_ogrtindex.py          |  10 +-
 274 files changed, 5896 insertions(+), 6479 deletions(-)

diff --git a/autotest/alg/contour.py b/autotest/alg/contour.py
index c7f1f0a36b16..3a5fe47c8657 100755
--- a/autotest/alg/contour.py
+++ b/autotest/alg/contour.py
@@ -259,11 +259,9 @@ def test_contour_3():
     feat = lyr.GetNextFeature()
     while feat is not None:
         if i < 3 and feat.GetField('elevMax') != expected_height[i]:
-            print('Got %f as z. Expected %f' % (feat.GetField('elevMax'), expected_height[i]))
-            return 'fail'
+            pytest.fail('Got %f as z. Expected %f' % (feat.GetField('elevMax'), expected_height[i]))
         elif i > 0 and i < 3 and feat.GetField('elevMin') != expected_height[i-1]:
-            print('Got %f as z. Expected %f' % (feat.GetField('elevMin'), expected_height[i-1]))
-            return 'fail'
+            pytest.fail('Got %f as z. Expected %f' % (feat.GetField('elevMin'), expected_height[i-1]))
 
         envelope = feat.GetGeometryRef().GetEnvelope()
         for j in range(4):
diff --git a/autotest/alg/cutline.py b/autotest/alg/cutline.py
index 7184664413a0..7f26ad79e036 100755
--- a/autotest/alg/cutline.py
+++ b/autotest/alg/cutline.py
@@ -36,6 +36,7 @@
 from osgeo import gdal
 import ogrtest
 import gdaltest
+import pytest
 
 ###############################################################################
 
@@ -51,7 +52,7 @@ def test_cutline_1():
 def test_cutline_2():
 
     if not ogrtest.have_geos():
-        return 'skip'
+        pytest.skip()
 
     tst = gdaltest.GDALTest('VRT', 'cutline_blend.vrt', 1, 21395)
     return tst.testOpen()
@@ -62,7 +63,7 @@ def test_cutline_2():
 def test_cutline_3():
 
     if not ogrtest.have_geos():
-        return 'skip'
+        pytest.skip()
 
     tst = gdaltest.GDALTest('VRT', 'cutline_multipolygon.vrt', 1, 20827)
     return tst.testOpen()
@@ -73,7 +74,7 @@ def test_cutline_3():
 def test_cutline_4():
 
     if not ogrtest.have_geos():
-        return 'skip'
+        pytest.skip()
 
     ds = gdal.Translate('/vsimem/utmsmall.tif', '../gcore/data/utmsmall.tif')
     ds.BuildOverviews('NEAR', [2])
diff --git a/autotest/alg/dither.py b/autotest/alg/dither.py
index e53c85dfdd13..ef83b64c4390 100755
--- a/autotest/alg/dither.py
+++ b/autotest/alg/dither.py
@@ -81,11 +81,10 @@ def test_dither_1():
         for j in range(4):
 
             if ct_data[j] != ref_data[j]:
-                gdaltest.post_reason('color table mismatch')
                 for k in range(nColors):
                     print(ct.GetColorEntry(k))
                     print(ref_ct[k])
-                return 'fail'
+                pytest.fail('color table mismatch')
 
     if cs == cs_expected or gdal.GetConfigOption('CPL_DEBUG', 'OFF') != 'ON':
         drv.Delete('tmp/rgbsmall.tif')
diff --git a/autotest/alg/rasterize.py b/autotest/alg/rasterize.py
index 922e9756ab0a..9726526c44af 100755
--- a/autotest/alg/rasterize.py
+++ b/autotest/alg/rasterize.py
@@ -36,6 +36,7 @@
 import ogrtest
 
 from osgeo import gdal, ogr, osr
+import pytest
 
 ###############################################################################
 # Simple polygon rasterization.
@@ -91,10 +92,8 @@ def test_rasterize_1():
     checksum = target_ds.GetRasterBand(2).Checksum()
     if checksum != expected:
         print(checksum)
-        gdaltest.post_reason('Did not get expected image checksum')
-
         gdal.GetDriverByName('GTiff').CreateCopy('tmp/rasterize_1.tif', target_ds)
-        return 'fail'
+        pytest.fail('Did not get expected image checksum')
 
     return 'success'
 
@@ -134,10 +133,8 @@ def test_rasterize_2():
     checksum = target_ds.GetRasterBand(2).Checksum()
     if checksum != expected:
         print(checksum)
-        gdaltest.post_reason('Did not get expected image checksum')
-
         gdal.GetDriverByName('GTiff').CreateCopy('tmp/rasterize_2.tif', target_ds)
-        return 'fail'
+        pytest.fail('Did not get expected image checksum')
 
     return 'success'
 
@@ -188,9 +185,8 @@ def test_rasterize_3():
     checksum = target_ds.GetRasterBand(2).Checksum()
     if checksum != expected:
         print(checksum)
-        gdaltest.post_reason('Did not get expected image checksum')
         gdal.GetDriverByName('GTiff').CreateCopy('tmp/rasterize_3.tif', target_ds)
-        return 'fail'
+        pytest.fail('Did not get expected image checksum')
 
     return 'success'
 
@@ -244,9 +240,8 @@ def test_rasterize_4():
     checksum = target_ds.GetRasterBand(2).Checksum()
     if checksum != expected:
         print(checksum)
-        gdaltest.post_reason('Did not get expected image checksum')
         gdal.GetDriverByName('GTiff').CreateCopy('tmp/rasterize_4.tif', target_ds)
-        return 'fail'
+        pytest.fail('Did not get expected image checksum')
 
     return 'success'
 
@@ -311,10 +306,8 @@ def test_rasterize_5():
     checksum = target_ds.GetRasterBand(2).Checksum()
     if checksum != expected:
         print(checksum)
-        gdaltest.post_reason('Did not get expected image checksum')
-
         gdal.GetDriverByName('GTiff').CreateCopy('tmp/rasterize_5.tif', target_ds)
-        return 'fail'
+        pytest.fail('Did not get expected image checksum')
 
     return 'success'
 
diff --git a/autotest/alg/reproject.py b/autotest/alg/reproject.py
index 93a97832ce55..901abb39b3aa 100755
--- a/autotest/alg/reproject.py
+++ b/autotest/alg/reproject.py
@@ -119,8 +119,7 @@ def test_reproject_3():
     expected_data = '\x03\x7f\x7f\x7f\x03\x03\x03\x7f\x7f\x7f\x03\x03\x03\x7f\x7f\x7f\x03\x03'
     if got_data != expected_data:
         import struct
-        print(struct.unpack('B' * 18, got_data))
-        return 'fail'
+        pytest.fail(struct.unpack('B' * 18, got_data))
 
     return 'success'
 
@@ -145,8 +144,7 @@ def test_reproject_4():
     expected_data = '\x03\x7f\x7f\x7f\x03\x03\x03\x7f\x7f\x7f\x03\x03\x03\x7f\x7f\x7f\x03\x03'
     if got_data != expected_data:
         import struct
-        print(struct.unpack('B' * 18, got_data))
-        return 'fail'
+        pytest.fail(struct.unpack('B' * 18, got_data))
 
     return 'success'
 
diff --git a/autotest/alg/sieve.py b/autotest/alg/sieve.py
index 332aac2dd0a0..8c03fdd0240a 100755
--- a/autotest/alg/sieve.py
+++ b/autotest/alg/sieve.py
@@ -199,7 +199,7 @@ def test_sieve_6():
     try:
         import numpy
     except ImportError:
-        return 'skip'
+        pytest.skip()
 
     # Try 3002. Should run in less than 10 seconds
     # size = 3002
diff --git a/autotest/alg/transformgeoloc.py b/autotest/alg/transformgeoloc.py
index 0dac4d2af1c3..302b64d0fd7a 100755
--- a/autotest/alg/transformgeoloc.py
+++ b/autotest/alg/transformgeoloc.py
@@ -36,6 +36,7 @@
 import gdaltest
 from osgeo import gdal
 from osgeo import osr
+import pytest
 
 ###############################################################################
 # Test a fairly default case.
@@ -46,7 +47,7 @@ def test_transformgeoloc_1():
     try:
         import numpy
     except ImportError:
-        return 'skip'
+        pytest.skip()
 
     # Setup 2x2 geolocation arrays in a memory dataset with lat/long values.
 
diff --git a/autotest/alg/warp.py b/autotest/alg/warp.py
index 0849d8e65c8c..30c16db71d2b 100755
--- a/autotest/alg/warp.py
+++ b/autotest/alg/warp.py
@@ -54,7 +54,7 @@ def test_warp_1():
 
     gdaltest.tiff_drv = gdal.GetDriverByName('GTiff')
     if gdaltest.tiff_drv is None:
-        return 'skip'
+        pytest.skip()
 
     ds = gdal.Open('data/utmsmall_near.vrt')
     ref_ds = gdal.Open('data/utmsmall_near.tiff')
@@ -71,7 +71,7 @@ def test_warp_1_short():
 
     gdaltest.tiff_drv = gdal.GetDriverByName('GTiff')
     if gdaltest.tiff_drv is None:
-        return 'skip'
+        pytest.skip()
 
     ds = gdal.Open('data/utmsmall_near_short.vrt')
     ref_ds = gdal.Open('data/utmsmall_near.tiff')
@@ -88,7 +88,7 @@ def test_warp_1_ushort():
 
     gdaltest.tiff_drv = gdal.GetDriverByName('GTiff')
     if gdaltest.tiff_drv is None:
-        return 'skip'
+        pytest.skip()
 
     ds = gdal.Open('data/utmsmall_near_ushort.vrt')
     ref_ds = gdal.Open('data/utmsmall_near.tiff')
@@ -105,7 +105,7 @@ def test_warp_1_float():
 
     gdaltest.tiff_drv = gdal.GetDriverByName('GTiff')
     if gdaltest.tiff_drv is None:
-        return 'skip'
+        pytest.skip()
 
     ds = gdal.Open('data/utmsmall_near_float.vrt')
     ref_ds = gdal.Open('data/utmsmall_near.tiff')
@@ -122,7 +122,7 @@ def test_warp_2():
 
     gdaltest.tiff_drv = gdal.GetDriverByName('GTiff')
     if gdaltest.tiff_drv is None:
-        return 'skip'
+        pytest.skip()
 
     ds = gdal.Open('data/utmsmall_blinear.vrt')
     ref_ds = gdal.Open('data/utmsmall_blinear.tiff')
@@ -139,7 +139,7 @@ def test_warp_2_short():
 
     gdaltest.tiff_drv = gdal.GetDriverByName('GTiff')
     if gdaltest.tiff_drv is None:
-        return 'skip'
+        pytest.skip()
 
     ds = gdal.Open('data/utmsmall_blinear_short.vrt')
     ref_ds = gdal.Open('data/utmsmall_blinear.tiff')
@@ -156,7 +156,7 @@ def test_warp_2_ushort():
 
     gdaltest.tiff_drv = gdal.GetDriverByName('GTiff')
     if gdaltest.tiff_drv is None:
-        return 'skip'
+        pytest.skip()
 
     ds = gdal.Open('data/utmsmall_blinear_ushort.vrt')
     ref_ds = gdal.Open('data/utmsmall_blinear.tiff')
@@ -173,7 +173,7 @@ def test_warp_2_downsize():
 
     gdaltest.tiff_drv = gdal.GetDriverByName('GTiff')
     if gdaltest.tiff_drv is None:
-        return 'skip'
+        pytest.skip()
 
     ds = gdal.Open('data/utmsmall_bilinear_2.vrt')
     ref_ds = gdal.Open('data/utmsmall_bilinear_2.tif')
@@ -190,7 +190,7 @@ def test_warp_3():
 
     gdaltest.tiff_drv = gdal.GetDriverByName('GTiff')
     if gdaltest.tiff_drv is None:
-        return 'skip'
+        pytest.skip()
 
     ds = gdal.Open('data/utmsmall_cubic.vrt')
     ref_ds = gdal.Open('data/utmsmall_cubic.tiff')
@@ -207,7 +207,7 @@ def test_warp_3_short():
 
     gdaltest.tiff_drv = gdal.GetDriverByName('GTiff')
     if gdaltest.tiff_drv is None:
-        return 'skip'
+        pytest.skip()
 
     ds = gdal.Open('data/utmsmall_cubic_short.vrt')
     ref_ds = gdal.Open('data/utmsmall_cubic.tiff')
@@ -224,7 +224,7 @@ def test_warp_3_ushort():
 
     gdaltest.tiff_drv = gdal.GetDriverByName('GTiff')
     if gdaltest.tiff_drv is None:
-        return 'skip'
+        pytest.skip()
 
     ds = gdal.Open('data/utmsmall_cubic_ushort.vrt')
     ref_ds = gdal.Open('data/utmsmall_cubic.tiff')
@@ -241,7 +241,7 @@ def test_warp_3_downsize():
 
     gdaltest.tiff_drv = gdal.GetDriverByName('GTiff')
     if gdaltest.tiff_drv is None:
-        return 'skip'
+        pytest.skip()
 
     ds = gdal.Open('data/utmsmall_cubic_2.vrt')
     ref_ds = gdal.Open('data/utmsmall_cubic_2.tif')
@@ -258,7 +258,7 @@ def test_warp_3_float_downsize():
 
     gdaltest.tiff_drv = gdal.GetDriverByName('GTiff')
     if gdaltest.tiff_drv is None:
-        return 'skip'
+        pytest.skip()
 
     ds = gdal.Open('data/utmsmall_cubic_2_float.vrt')
     ref_ds = gdal.Open('data/utmsmall_cubic_2.tif')
@@ -275,7 +275,7 @@ def test_warp_4():
 
     gdaltest.tiff_drv = gdal.GetDriverByName('GTiff')
     if gdaltest.tiff_drv is None:
-        return 'skip'
+        pytest.skip()
 
     ds = gdal.Open('data/utmsmall_cubicspline.vrt')
     ref_ds = gdal.Open('data/utmsmall_cubicspline.tiff')
@@ -292,7 +292,7 @@ def test_warp_4_short():
 
     gdaltest.tiff_drv = gdal.GetDriverByName('GTiff')
     if gdaltest.tiff_drv is None:
-        return 'skip'
+        pytest.skip()
 
     ds = gdal.Open('data/utmsmall_cubicspline_short.vrt')
     ref_ds = gdal.Open('data/utmsmall_cubicspline.tiff')
@@ -309,7 +309,7 @@ def test_warp_4_ushort():
 
     gdaltest.tiff_drv = gdal.GetDriverByName('GTiff')
     if gdaltest.tiff_drv is None:
-        return 'skip'
+        pytest.skip()
 
     ds = gdal.Open('data/utmsmall_cubicspline_ushort.vrt')
     ref_ds = gdal.Open('data/utmsmall_cubicspline.tiff')
@@ -326,7 +326,7 @@ def test_warp_4_downsize():
 
     gdaltest.tiff_drv = gdal.GetDriverByName('GTiff')
     if gdaltest.tiff_drv is None:
-        return 'skip'
+        pytest.skip()
 
     ds = gdal.Open('data/utmsmall_cubicspline_2.vrt')
     ref_ds = gdal.Open('data/utmsmall_cubicspline_2.tif')
@@ -343,7 +343,7 @@ def test_warp_4_short_downsize():
 
     gdaltest.tiff_drv = gdal.GetDriverByName('GTiff')
     if gdaltest.tiff_drv is None:
-        return 'skip'
+        pytest.skip()
 
     ds = gdal.Open('data/utmsmall_cubicspline_wt_short.vrt')
     ref_ds = gdal.Open('data/utmsmall_cubicspline_2.tif')
@@ -360,7 +360,7 @@ def test_warp_4_float_downsize():
 
     gdaltest.tiff_drv = gdal.GetDriverByName('GTiff')
     if gdaltest.tiff_drv is None:
-        return 'skip'
+        pytest.skip()
 
     ds = gdal.Open('data/utmsmall_cubicspline_wt_float32.vrt')
     ref_ds = gdal.Open('data/utmsmall_cubicspline_2.tif')
@@ -377,7 +377,7 @@ def test_warp_5():
 
     gdaltest.tiff_drv = gdal.GetDriverByName('GTiff')
     if gdaltest.tiff_drv is None:
-        return 'skip'
+        pytest.skip()
 
     ds = gdal.Open('data/utmsmall_lanczos.vrt')
     ref_ds = gdal.Open('data/utmsmall_lanczos.tiff')
@@ -394,7 +394,7 @@ def test_warp_5_downsize():
 
     gdaltest.tiff_drv = gdal.GetDriverByName('GTiff')
     if gdaltest.tiff_drv is None:
-        return 'skip'
+        pytest.skip()
 
     ds = gdal.Open('data/utmsmall_lanczos_2.vrt')
     ref_ds = gdal.Open('data/utmsmall_lanczos_2.tif')
@@ -413,7 +413,7 @@ def test_warp_6():
 
     gdaltest.tiff_drv = gdal.GetDriverByName('GTiff')
     if gdaltest.tiff_drv is None:
-        return 'skip'
+        pytest.skip()
 
     tst = gdaltest.GDALTest('VRT', 'utmsmall_ds_near.vrt', 1, 4770)
 
@@ -424,7 +424,7 @@ def test_warp_7():
 
     gdaltest.tiff_drv = gdal.GetDriverByName('GTiff')
     if gdaltest.tiff_drv is None:
-        return 'skip'
+        pytest.skip()
 
     tst = gdaltest.GDALTest('VRT', 'utmsmall_ds_blinear.vrt', 1, 4755)
 
@@ -435,7 +435,7 @@ def test_warp_8():
 
     gdaltest.tiff_drv = gdal.GetDriverByName('GTiff')
     if gdaltest.tiff_drv is None:
-        return 'skip'
+        pytest.skip()
 
     tst = gdaltest.GDALTest('VRT', 'utmsmall_ds_cubic.vrt', 1, 4833)
 
@@ -446,7 +446,7 @@ def test_warp_9():
 
     gdaltest.tiff_drv = gdal.GetDriverByName('GTiff')
     if gdaltest.tiff_drv is None:
-        return 'skip'
+        pytest.skip()
 
     ds = gdal.Open('data/utmsmall_ds_cubicspline.vrt')
     ref_ds = gdal.Open('data/utmsmall_ds_cubicspline.tiff')
@@ -463,7 +463,7 @@ def test_warp_10():
 
     gdaltest.tiff_drv = gdal.GetDriverByName('GTiff')
     if gdaltest.tiff_drv is None:
-        return 'skip'
+        pytest.skip()
 
     ds = gdal.Open('data/utmsmall_ds_lanczos.vrt')
     ref_ds = gdal.Open('data/utmsmall_ds_lanczos.tiff')
@@ -480,7 +480,7 @@ def test_warp_11():
 
     gdaltest.tiff_drv = gdal.GetDriverByName('GTiff')
     if gdaltest.tiff_drv is None:
-        return 'skip'
+        pytest.skip()
 
     tst = gdaltest.GDALTest('VRT', 'rgbsmall_dstalpha.vrt', 4, 30658)
 
@@ -493,7 +493,7 @@ def test_warp_12():
 
     gdaltest.tiff_drv = gdal.GetDriverByName('GTiff')
     if gdaltest.tiff_drv is None:
-        return 'skip'
+        pytest.skip()
 
     ds = gdaltest.tiff_drv.Create('tmp/empty.tif', 20, 20, 4)
     ds.GetRasterBand(1).Fill(0)
@@ -518,7 +518,7 @@ def test_warp_13():
 
     gdaltest.tiff_drv = gdal.GetDriverByName('GTiff')
     if gdaltest.tiff_drv is None:
-        return 'skip'
+        pytest.skip()
 
     ds = gdaltest.tiff_drv.Create('tmp/empty.tif', 20, 20, 4)
     ds.GetRasterBand(1).Fill(0)
@@ -543,7 +543,7 @@ def test_warp_14():
 
     gdaltest.tiff_drv = gdal.GetDriverByName('GTiff')
     if gdaltest.tiff_drv is None:
-        return 'skip'
+        pytest.skip()
 
     ds = gdaltest.tiff_drv.Create('tmp/empty.tif', 20, 20, 4)
     ds.GetRasterBand(1).Fill(0)
@@ -568,7 +568,7 @@ def test_warp_15():
 
     gdaltest.tiff_drv = gdal.GetDriverByName('GTiff')
     if gdaltest.tiff_drv is None:
-        return 'skip'
+        pytest.skip()
 
     ds = gdaltest.tiff_drv.Create('tmp/test.tif', 20, 20, 4)
     ds.GetRasterBand(1).Fill(0)
@@ -593,7 +593,7 @@ def test_warp_16():
 
     gdaltest.tiff_drv = gdal.GetDriverByName('GTiff')
     if gdaltest.tiff_drv is None:
-        return 'skip'
+        pytest.skip()
 
     ds = gdaltest.tiff_drv.Create('tmp/test.tif', 20, 20, 4)
     ds.GetRasterBand(1).Fill(255)
@@ -618,7 +618,7 @@ def test_warp_17():
 
     gdaltest.tiff_drv = gdal.GetDriverByName('GTiff')
     if gdaltest.tiff_drv is None:
-        return 'skip'
+        pytest.skip()
 
     ds = gdaltest.tiff_drv.Create('tmp/test.tif', 20, 20, 4)
     ds.GetRasterBand(1).Fill(0)
@@ -643,7 +643,7 @@ def test_warp_18():
 
     gdaltest.tiff_drv = gdal.GetDriverByName('GTiff')
     if gdaltest.tiff_drv is None:
-        return 'skip'
+        pytest.skip()
 
     ds = gdaltest.tiff_drv.Create('tmp/test.tif', 20, 20, 4)
     ds.GetRasterBand(1).Fill(255)
@@ -694,7 +694,7 @@ def test_warp_19():
 
     gdaltest.tiff_drv = gdal.GetDriverByName('GTiff')
     if gdaltest.tiff_drv is None:
-        return 'skip'
+        pytest.skip()
 
     datatypes = [gdal.GDT_Byte,
                  gdal.GDT_Int16,
@@ -727,7 +727,7 @@ def test_warp_20():
 
     gdaltest.tiff_drv = gdal.GetDriverByName('GTiff')
     if gdaltest.tiff_drv is None:
-        return 'skip'
+        pytest.skip()
 
     tst = gdaltest.GDALTest('VRT', 'white_nodata.vrt', 1, 1705)
 
@@ -747,7 +747,7 @@ def test_warp_21():
 
     ds = gdal.Open('tmp/warp_21.vrt')
     if ds.GetRasterBand(1).GetOverviewCount() != 1:
-        return 'skip'
+        pytest.skip()
 
     ds.GetRasterBand(1).GetOverview(0).Checksum()
 
@@ -1176,7 +1176,7 @@ def test_warp_31():
 
     gdaltest.tiff_drv = gdal.GetDriverByName('GTiff')
     if gdaltest.tiff_drv is None:
-        return 'skip'
+        pytest.skip()
 
     ds = gdal.Open('data/utmsmall_average.vrt')
     ref_ds = gdal.Open('data/utmsmall_average.tiff')
@@ -1195,7 +1195,7 @@ def test_warp_32():
 
     gdaltest.tiff_drv = gdal.GetDriverByName('GTiff')
     if gdaltest.tiff_drv is None:
-        return 'skip'
+        pytest.skip()
 
     ds = gdal.Open('data/utmsmall_average_float.vrt')
     ref_ds = gdal.Open('data/utmsmall_average_float.tiff')
@@ -1214,7 +1214,7 @@ def test_warp_33():
 
     gdaltest.tiff_drv = gdal.GetDriverByName('GTiff')
     if gdaltest.tiff_drv is None:
-        return 'skip'
+        pytest.skip()
 
     ds = gdal.Open('data/utmsmall_mode.vrt')
     ref_ds = gdal.Open('data/utmsmall_mode.tiff')
@@ -1233,7 +1233,7 @@ def test_warp_34():
 
     gdaltest.tiff_drv = gdal.GetDriverByName('GTiff')
     if gdaltest.tiff_drv is None:
-        return 'skip'
+        pytest.skip()
 
     ds = gdal.Open('data/utmsmall_mode_int16.vrt')
     ref_ds = gdal.Open('data/utmsmall_mode_int16.tiff')
@@ -1252,7 +1252,7 @@ def test_warp_35():
 
     gdaltest.tiff_drv = gdal.GetDriverByName('GTiff')
     if gdaltest.tiff_drv is None:
-        return 'skip'
+        pytest.skip()
 
     ds = gdal.Open('data/utmsmall-int16-neg_mode.vrt')
     ref_ds = gdal.Open('data/utmsmall-int16-neg_mode.tiff')
@@ -1271,7 +1271,7 @@ def test_warp_36():
 
     gdaltest.tiff_drv = gdal.GetDriverByName('GTiff')
     if gdaltest.tiff_drv is None:
-        return 'skip'
+        pytest.skip()
 
     ds = gdal.Open('data/utmsmall_mode_int32.vrt')
     ref_ds = gdal.Open('data/utmsmall_mode_int32.tiff')
@@ -1391,7 +1391,7 @@ def test_warp_40():
 
     gdaltest.tiff_drv = gdal.GetDriverByName('GTiff')
     if gdaltest.tiff_drv is None:
-        return 'skip'
+        pytest.skip()
 
     ds = gdal.Open('data/2by2.vrt')
     ref_ds = gdal.Open('data/2by2.tif')
@@ -1441,7 +1441,7 @@ def test_warp_42():
 
     gdaltest.tiff_drv = gdal.GetDriverByName('GTiff')
     if gdaltest.tiff_drv is None:
-        return 'skip'
+        pytest.skip()
 
     ds = gdal.Open('data/utmsmall_max.vrt')
     ref_ds = gdal.Open('data/utmsmall_max.tif')
@@ -1460,7 +1460,7 @@ def test_warp_43():
 
     gdaltest.tiff_drv = gdal.GetDriverByName('GTiff')
     if gdaltest.tiff_drv is None:
-        return 'skip'
+        pytest.skip()
 
     ds = gdal.Open('data/utmsmall_min.vrt')
     ref_ds = gdal.Open('data/utmsmall_min.tif')
@@ -1479,7 +1479,7 @@ def test_warp_44():
 
     gdaltest.tiff_drv = gdal.GetDriverByName('GTiff')
     if gdaltest.tiff_drv is None:
-        return 'skip'
+        pytest.skip()
 
     ds = gdal.Open('data/utmsmall_med.vrt')
     ref_ds = gdal.Open('data/utmsmall_med.tif')
@@ -1498,7 +1498,7 @@ def test_warp_45():
 
     gdaltest.tiff_drv = gdal.GetDriverByName('GTiff')
     if gdaltest.tiff_drv is None:
-        return 'skip'
+        pytest.skip()
 
     ds = gdal.Open('data/utmsmall_Q1.vrt')
     ref_ds = gdal.Open('data/utmsmall_Q1.tif')
@@ -1517,7 +1517,7 @@ def test_warp_46():
 
     gdaltest.tiff_drv = gdal.GetDriverByName('GTiff')
     if gdaltest.tiff_drv is None:
-        return 'skip'
+        pytest.skip()
 
     ds = gdal.Open('data/utmsmall_Q3.vrt')
     ref_ds = gdal.Open('data/utmsmall_Q3.tif')
@@ -1536,7 +1536,7 @@ def test_warp_47():
 
     gdaltest.tiff_drv = gdal.GetDriverByName('GTiff')
     if gdaltest.tiff_drv is None:
-        return 'skip'
+        pytest.skip()
 
     ds = gdal.Open('data/utmsmall-int16-neg_max.vrt')
     ref_ds = gdal.Open('data/utmsmall-int16-neg_max.tif')
@@ -1555,7 +1555,7 @@ def test_warp_48():
 
     gdaltest.tiff_drv = gdal.GetDriverByName('GTiff')
     if gdaltest.tiff_drv is None:
-        return 'skip'
+        pytest.skip()
 
     ds = gdal.Open('data/utmsmall-int16-neg_min.vrt')
     ref_ds = gdal.Open('data/utmsmall-int16-neg_min.tif')
@@ -1574,7 +1574,7 @@ def test_warp_49():
 
     gdaltest.tiff_drv = gdal.GetDriverByName('GTiff')
     if gdaltest.tiff_drv is None:
-        return 'skip'
+        pytest.skip()
 
     ds = gdal.Open('data/utmsmall-int16-neg_med.vrt')
     ref_ds = gdal.Open('data/utmsmall-int16-neg_med.tif')
@@ -1593,7 +1593,7 @@ def test_warp_50():
 
     gdaltest.tiff_drv = gdal.GetDriverByName('GTiff')
     if gdaltest.tiff_drv is None:
-        return 'skip'
+        pytest.skip()
 
     ds = gdal.Open('data/utmsmall-int16-neg_Q1.vrt')
     ref_ds = gdal.Open('data/utmsmall-int16-neg_Q1.tif')
@@ -1612,7 +1612,7 @@ def test_warp_51():
 
     gdaltest.tiff_drv = gdal.GetDriverByName('GTiff')
     if gdaltest.tiff_drv is None:
-        return 'skip'
+        pytest.skip()
 
     ds = gdal.Open('data/utmsmall-int16-neg_Q3.vrt')
     ref_ds = gdal.Open('data/utmsmall-int16-neg_Q3.tif')
@@ -1774,7 +1774,7 @@ def test_warp_56():
         gdalnumeric.zeros
         import numpy
     except (ImportError, AttributeError):
-        return 'skip'
+        pytest.skip()
 
     pix_ds = gdal.GetDriverByName('MEM').Create('', 1, 1)
     src_ds = gdal.GetDriverByName('MEM').Create('', 3, 3)
diff --git a/autotest/gcore/basic_test.py b/autotest/gcore/basic_test.py
index b0dc74eb63cb..d65f62ae1089 100755
--- a/autotest/gcore/basic_test.py
+++ b/autotest/gcore/basic_test.py
@@ -35,6 +35,7 @@
 
 import gdaltest
 from osgeo import gdal
+import pytest
 
 # Nothing exciting here. Just trying to open non existing files,
 # or empty names, or files that are not valid datasets...
@@ -53,14 +54,13 @@ def test_basic_test_1():
     gdal.PopErrorHandler()
     if ds is None and matches_non_existing_error_msg(gdal.GetLastErrorMsg()):
         return 'success'
-    gdaltest.post_reason('did not get expected error message, got %s' % gdal.GetLastErrorMsg())
-    return 'fail'
+    pytest.fail('did not get expected error message, got %s' % gdal.GetLastErrorMsg())
 
 
 def test_basic_test_strace_non_existing_file():
 
     if not sys.platform.startswith('linux'):
-        return 'skip'
+        pytest.skip()
 
     python_exe = sys.executable
     cmd = "strace -f %s -c \"from osgeo import gdal; " % python_exe + (
@@ -70,7 +70,7 @@ def test_basic_test_strace_non_existing_file():
         (_, err) = gdaltest.runexternal_out_and_err(cmd)
     except:
         # strace not available
-        return 'skip'
+        pytest.skip()
 
     interesting_lines = []
     for line in err.split('\n'):
@@ -87,8 +87,7 @@ def test_basic_test_2():
     gdal.PopErrorHandler()
     if ds is None and matches_non_existing_error_msg(gdal.GetLastErrorMsg()):
         return 'success'
-    gdaltest.post_reason('did not get expected error message, got %s' % gdal.GetLastErrorMsg())
-    return 'fail'
+    pytest.fail('did not get expected error message, got %s' % gdal.GetLastErrorMsg())
 
 
 def test_basic_test_3():
@@ -97,8 +96,7 @@ def test_basic_test_3():
     gdal.PopErrorHandler()
     if ds is None and matches_non_existing_error_msg(gdal.GetLastErrorMsg()):
         return 'success'
-    gdaltest.post_reason('did not get expected error message, got %s' % gdal.GetLastErrorMsg())
-    return 'fail'
+    pytest.fail('did not get expected error message, got %s' % gdal.GetLastErrorMsg())
 
 
 def test_basic_test_4():
@@ -107,8 +105,7 @@ def test_basic_test_4():
     gdal.PopErrorHandler()
     if ds is None and matches_non_existing_error_msg(gdal.GetLastErrorMsg()):
         return 'success'
-    gdaltest.post_reason('did not get expected error message, got %s' % gdal.GetLastErrorMsg())
-    return 'fail'
+    pytest.fail('did not get expected error message, got %s' % gdal.GetLastErrorMsg())
 
 
 def test_basic_test_5():
@@ -119,7 +116,7 @@ def test_basic_test_5():
     expected = '`data/doctype.xml\' not recognized as a supported file format'
     if ds is None and expected in last_error:
         return 'success'
-    return 'fail'
+    pytest.fail()
 
 ###############################################################################
 # Issue several AllRegister() to check that GDAL drivers are good citizens
@@ -139,8 +136,7 @@ def test_basic_test_6():
 def basic_test_7_internal():
     try:
         gdal.Open('non_existing_ds', gdal.GA_ReadOnly)
-        gdaltest.post_reason('opening should have thrown an exception')
-        return 'fail'
+        pytest.fail('opening should have thrown an exception')
     except:
         # Special case: we should still be able to get the error message
         # until we call a new GDAL function
@@ -414,7 +410,7 @@ def test_basic_test_14():
 
     try:
         ds.SetMetadata(5)
-        return 'fail'
+        pytest.fail()
     except:
         pass
 
@@ -423,7 +419,7 @@ def test_basic_test_14():
 
     try:
         ds.SetMetadata([5])
-        return 'fail'
+        pytest.fail()
     except:
         pass
 
@@ -432,19 +428,19 @@ def test_basic_test_14():
 
     try:
         ds.SetMetadata({'foo': 5})
-        return 'fail'
+        pytest.fail()
     except:
         pass
 
     try:
         ds.SetMetadata({5: 'baz'})
-        return 'fail'
+        pytest.fail()
     except:
         pass
 
     try:
         ds.SetMetadata({5: 6})
-        return 'fail'
+        pytest.fail()
     except:
         pass
 
@@ -461,13 +457,13 @@ def test_basic_test_14():
 
     try:
         ds.SetMetadata({val: 5})
-        return 'fail'
+        pytest.fail()
     except:
         pass
 
     try:
         ds.SetMetadata({5: val})
-        return 'fail'
+        pytest.fail()
     except:
         pass
 
@@ -496,7 +492,7 @@ def test_basic_test_15():
     try:
         with gdaltest.error_handler():
             gdal.GetDriverByName('MEM').CreateCopy('', gdal.GetDriverByName('MEM').Create('', 1, 1), callback='foo')
-        return 'fail'
+        pytest.fail()
     except:
         pass
 
diff --git a/autotest/gcore/bmp_read.py b/autotest/gcore/bmp_read.py
index d874c58692e1..a948cf70884d 100755
--- a/autotest/gcore/bmp_read.py
+++ b/autotest/gcore/bmp_read.py
@@ -54,7 +54,7 @@ def test_bmp_open(filename, checksum):
 def test_bmp_online_1():
 
     if not gdaltest.download_file('http://download.osgeo.org/gdal/data/bmp/8bit_pal_rle.bmp', '8bit_pal_rle.bmp'):
-        return 'skip'
+        pytest.skip()
 
     tst = gdaltest.GDALTest('BMP', 'tmp/cache/8bit_pal_rle.bmp', 1, 17270, filename_absolute=1)
 
@@ -64,7 +64,7 @@ def test_bmp_online_1():
 def test_bmp_online_2():
 
     if not gdaltest.download_file('http://download.osgeo.org/gdal/data/bmp/24bit.bmp', '24bit.bmp'):
-        return 'skip'
+        pytest.skip()
 
     tst = gdaltest.GDALTest('BMP', 'tmp/cache/24bit.bmp', 1, 7158, filename_absolute=1)
     if tst == 'success':
diff --git a/autotest/gcore/colortable.py b/autotest/gcore/colortable.py
index 5486c2366d21..229421d2d764 100755
--- a/autotest/gcore/colortable.py
+++ b/autotest/gcore/colortable.py
@@ -35,6 +35,7 @@
 
 import gdaltest
 from osgeo import gdal
+import pytest
 
 ###############################################################################
 # Create a color table.
@@ -80,7 +81,7 @@ def test_colortable_3():
     try:
         ct.CreateColorRamp
     except AttributeError:
-        return 'skip'
+        pytest.skip()
 
     ct.CreateColorRamp(0, (255, 0, 0), 255, (0, 0, 255))
 
diff --git a/autotest/gcore/gdal_api_proxy.py b/autotest/gcore/gdal_api_proxy.py
index 29ec4fec8478..4bdb6a1de864 100755
--- a/autotest/gcore/gdal_api_proxy.py
+++ b/autotest/gcore/gdal_api_proxy.py
@@ -36,6 +36,7 @@
 
 
 import gdaltest
+import pytest
 
 ###############################################################################
 # Test forked gdalserver
@@ -62,7 +63,7 @@ def test_gdal_api_proxy_1():
 def test_gdal_api_proxy_2():
 
     if sys.version_info < (2, 6, 0):
-        return 'skip'
+        pytest.skip()
 
     import test_py_scripts
     ret = test_py_scripts.run_py_script_as_external_script('.', 'gdal_api_proxy', ' \"%s\" -2' % gdaltest.gdalserver_path, display_live_on_parent_stdout=True)
@@ -78,14 +79,13 @@ def test_gdal_api_proxy_2():
 def test_gdal_api_proxy_3():
 
     if sys.version_info < (2, 6, 0):
-        return 'skip'
+        pytest.skip()
 
     if sys.platform == 'win32':
-        return 'skip'
+        pytest.skip()
 
     if sys.platform == 'darwin':
-        print("Fails on MacOSX ('ERROR 1: posix_spawnp() failed'. Not sure why.")
-        return 'skip'
+        pytest.skip("Fails on MacOSX ('ERROR 1: posix_spawnp() failed'. Not sure why.")
 
     import test_py_scripts
     ret = test_py_scripts.run_py_script_as_external_script('.', 'gdal_api_proxy', ' \"%s\" -3' % gdaltest.gdalserver_path, display_live_on_parent_stdout=True)
@@ -101,14 +101,13 @@ def test_gdal_api_proxy_3():
 def test_gdal_api_proxy_4():
 
     if sys.version_info < (2, 6, 0):
-        return 'skip'
+        pytest.skip()
 
     if sys.platform == 'win32':
-        return 'skip'
+        pytest.skip()
 
     if sys.platform == 'darwin':
-        print("Fails on MacOSX ('ERROR 1: posix_spawnp() failed'. Not sure why.")
-        return 'skip'
+        pytest.skip("Fails on MacOSX ('ERROR 1: posix_spawnp() failed'. Not sure why.")
 
     import test_py_scripts
     ret = test_py_scripts.run_py_script_as_external_script('.', 'gdal_api_proxy', ' \"%s\" -4' % gdaltest.gdalserver_path, display_live_on_parent_stdout=True)
diff --git a/autotest/gcore/gdal_stats.py b/autotest/gcore/gdal_stats.py
index 6c3260c03d14..73f35a6436f7 100755
--- a/autotest/gcore/gdal_stats.py
+++ b/autotest/gcore/gdal_stats.py
@@ -45,7 +45,7 @@ def test_stats_nan_1():
 
     gdaltest.gtiff_drv = gdal.GetDriverByName('GTiff')
     if gdaltest.gtiff_drv is None:
-        return 'skip'
+        pytest.skip()
 
     stats = (50.0, 58.0, 54.0, 2.5819888974716)
 
@@ -65,7 +65,7 @@ def test_stats_nan_1():
 def test_stats_nan_2():
 
     if gdaltest.gtiff_drv is None:
-        return 'skip'
+        pytest.skip()
 
     stats = (50.0, 58.0, 54.0, 2.5819888974716)
 
@@ -85,7 +85,7 @@ def test_stats_nan_2():
 def test_stats_signedbyte():
 
     if gdaltest.gtiff_drv is None:
-        return 'skip'
+        pytest.skip()
 
     stats = (-128.0, 127.0, -0.2, 80.64)
 
diff --git a/autotest/gcore/hdf4_read.py b/autotest/gcore/hdf4_read.py
index 7b02ab40516c..fbccb9a6283c 100755
--- a/autotest/gcore/hdf4_read.py
+++ b/autotest/gcore/hdf4_read.py
@@ -73,10 +73,10 @@ def test_hdf4_read_online_1():
     gdaltest.hdf4_drv = gdal.GetDriverByName('HDF4')
 
     if gdaltest.hdf4_drv is None:
-        return 'skip'
+        pytest.skip()
 
     if not gdaltest.download_file('http://download.osgeo.org/gdal/data/hdf4/A2004259075000.L2_LAC_SST.hdf', 'A2004259075000.L2_LAC_SST.hdf'):
-        return 'skip'
+        pytest.skip()
 
     tst = gdaltest.GDALTest('HDF4Image', 'tmp/cache/A2004259075000.L2_LAC_SST.hdf', 1, 28189, filename_absolute=1)
 
@@ -89,10 +89,10 @@ def test_hdf4_read_online_1():
 def test_hdf4_read_online_2():
 
     if gdaltest.hdf4_drv is None:
-        return 'skip'
+        pytest.skip()
 
     if not gdaltest.download_file('http://download.osgeo.org/gdal/data/hdf4/A2006005182000.L2_LAC_SST.x.hdf', 'A2006005182000.L2_LAC_SST.x.hdf'):
-        return 'skip'
+        pytest.skip()
 
     tst = gdaltest.GDALTest('HDF4Image', 'HDF4_SDS:UNKNOWN:"tmp/cache/A2006005182000.L2_LAC_SST.x.hdf":13', 1, 13209, filename_absolute=1)
 
@@ -114,10 +114,10 @@ def test_hdf4_read_online_2():
 def test_hdf4_read_online_3():
 
     if gdaltest.hdf4_drv is None:
-        return 'skip'
+        pytest.skip()
 
     if not gdaltest.download_file('http://download.osgeo.org/gdal/data/hdf4/MO36MW14.chlor_MODIS.ADD2001089.004.2002186190207.hdf', 'MO36MW14.chlor_MODIS.ADD2001089.004.2002186190207.hdf'):
-        return 'skip'
+        pytest.skip()
 
     tst = gdaltest.GDALTest('HDF4Image', 'tmp/cache/MO36MW14.chlor_MODIS.ADD2001089.004.2002186190207.hdf', 1, 34723, filename_absolute=1)
 
@@ -143,10 +143,10 @@ def test_hdf4_read_online_3():
 def test_hdf4_read_online_4():
 
     if gdaltest.hdf4_drv is None:
-        return 'skip'
+        pytest.skip()
 
     if not gdaltest.download_file('http://download.osgeo.org/gdal/data/hdf4/S2002196124536.L1A_HDUN.BartonBendish.extract.hdf', 'S2002196124536.L1A_HDUN.BartonBendish.extract.hdf'):
-        return 'skip'
+        pytest.skip()
 
     tst = gdaltest.GDALTest('HDF4Image', 'tmp/cache/S2002196124536.L1A_HDUN.BartonBendish.extract.hdf', 1, 33112, filename_absolute=1)
 
@@ -166,11 +166,11 @@ def test_hdf4_read_online_4():
 def test_hdf4_read_online_5():
 
     if gdaltest.hdf4_drv is None:
-        return 'skip'
+        pytest.skip()
 
     # 13 MB
     if not gdaltest.download_file('ftp://data.nodc.noaa.gov/pub/data.nodc/pathfinder/Version5.0/Monthly/1991/199101.s04m1pfv50-sst-16b.hdf', '199101.s04m1pfv50-sst-16b.hdf'):
-        return 'skip'
+        pytest.skip()
 
     tst = gdaltest.GDALTest('HDF4Image', 'tmp/cache/199101.s04m1pfv50-sst-16b.hdf', 1, 41173, filename_absolute=1)
 
@@ -185,11 +185,11 @@ def test_hdf4_read_online_5():
 def test_hdf4_read_online_6():
 
     if gdaltest.hdf4_drv is None:
-        return 'skip'
+        pytest.skip()
 
     # 1 MB
     if not gdaltest.download_file('http://download.osgeo.org/gdal/data/hdf4/MOD09Q1G_EVI.A2006233.h07v03.005.2008338190308.hdf', 'MOD09Q1G_EVI.A2006233.h07v03.005.2008338190308.hdf'):
-        return 'skip'
+        pytest.skip()
 
     # Test with quoting of components
     tst = gdaltest.GDALTest('HDF4Image', 'HDF4_EOS:EOS_GRID:"tmp/cache/MOD09Q1G_EVI.A2006233.h07v03.005.2008338190308.hdf":"MODIS_NACP_EVI":"MODIS_EVI"', 1, 12197, filename_absolute=1)
@@ -216,11 +216,11 @@ def test_hdf4_read_online_6():
 def test_hdf4_read_online_7():
 
     if gdaltest.hdf4_drv is None:
-        return 'skip'
+        pytest.skip()
 
     # 4 MB
     if not gdaltest.download_file('http://download.osgeo.org/gdal/data/hdf4/MOD09A1.A2010041.h06v03.005.2010051001103.hdf', 'MOD09A1.A2010041.h06v03.005.2010051001103.hdf'):
-        return 'skip'
+        pytest.skip()
 
     tst = gdaltest.GDALTest('HDF4Image', 'HDF4_EOS:EOS_GRID:tmp/cache/MOD09A1.A2010041.h06v03.005.2010051001103.hdf:MOD_Grid_500m_Surface_Reflectance:sur_refl_b01', 1, 54894, filename_absolute=1)
 
@@ -247,11 +247,11 @@ def test_hdf4_read_online_7():
 def test_hdf4_read_online_8():
 
     if gdaltest.hdf4_drv is None:
-        return 'skip'
+        pytest.skip()
 
     # 5 MB
     if not gdaltest.download_file('ftp://e4ftl01u.ecs.nasa.gov/MODIS_Composites/MOLT/MOD13Q1.005/2006.06.10/MOD13Q1.A2006161.h21v13.005.2008234103220.hdf', 'MOD13Q1.A2006161.h21v13.005.2008234103220.hdf'):
-        return 'skip'
+        pytest.skip()
 
     tst = gdaltest.GDALTest('HDF4Image', 'HDF4_EOS:EOS_GRID:tmp/cache/MOD13Q1.A2006161.h21v13.005.2008234103220.hdf:MODIS_Grid_16DAY_250m_500m_VI:250m 16 days NDVI', 1, 53837, filename_absolute=1)
 
@@ -279,13 +279,13 @@ def test_hdf4_read_online_8():
 def test_hdf4_read_online_9():
 
     if gdaltest.hdf4_drv is None:
-        return 'skip'
+        pytest.skip()
 
     if not gdaltest.download_file('http://www.geogratis.cgdi.gc.ca/download/landsat_7/hdf/L71002025_02520010722/L71002025_02520010722_MTL.L1G', 'L71002025_02520010722_MTL.L1G'):
-        return 'skip'
+        pytest.skip()
 
     if not gdaltest.download_file('http://www.geogratis.cgdi.gc.ca/download/landsat_7/hdf/L71002025_02520010722/L71002025_02520010722_HDF.L1G', 'L71002025_02520010722_HDF.L1G'):
-        return 'skip'
+        pytest.skip()
 
     f = open('tmp/cache/L71002025_02520010722_B10.L1G', 'wb')
     f.close()
@@ -305,10 +305,10 @@ def test_hdf4_read_online_9():
 def test_hdf4_read_online_10():
 
     if gdaltest.hdf4_drv is None:
-        return 'skip'
+        pytest.skip()
 
     if not gdaltest.download_file('http://trac.osgeo.org/gdal/raw-attachment/ticket/4672/MOD16A2.A2000M01.h14v02.105.2010357183410.hdf', 'MOD16A2.A2000M01.h14v02.105.2010357183410.hdf'):
-        return 'skip'
+        pytest.skip()
 
     ds = gdal.Open('HDF4_EOS:EOS_GRID:"tmp/cache/MOD16A2.A2000M01.h14v02.105.2010357183410.hdf":MOD_Grid_MOD16A2:ET_1km')
 
diff --git a/autotest/gcore/hfa_write.py b/autotest/gcore/hfa_write.py
index ad997d88b35e..74148194fb8d 100755
--- a/autotest/gcore/hfa_write.py
+++ b/autotest/gcore/hfa_write.py
@@ -174,8 +174,7 @@ def test_hfa_clean_external_overviews():
 
     try:
         os.stat('tmp/small.rrd')
-        gdaltest.post_reason('small.rrd still present.')
-        return 'fail'
+        pytest.fail('small.rrd still present.')
     except OSError:
         pass
 
@@ -220,8 +219,7 @@ def test_hfa_use_rrd():
     try:
         os.stat('tmp/small.rrd')
     except OSError:
-        gdaltest.post_reason('small.rrd not present.')
-        return 'fail'
+        pytest.fail('small.rrd not present.')
 
     ds = gdal.Open('tmp/small.img')
     assert ds.GetRasterBand(1).GetOverview(0).Checksum() == 26148, \
@@ -265,10 +263,10 @@ def test_hfa_update_existing_aux_overviews():
     new_cs_ovr1 = ds.GetRasterBand(1).GetOverview(1).Checksum()
     if cs_ovr0 != new_cs_ovr0:
         gdal.SetConfigOption('USE_RRD', None)
-        return 'fail'
+        pytest.fail()
     if cs_ovr1 != new_cs_ovr1:
         gdal.SetConfigOption('USE_RRD', None)
-        return 'fail'
+        pytest.fail()
 
     # and regenerate them twice in a row
     ds.BuildOverviews('NEAR', overviewlist=[2, 4])
@@ -281,10 +279,10 @@ def test_hfa_update_existing_aux_overviews():
     new_cs_ovr1 = ds.GetRasterBand(1).GetOverview(1).Checksum()
     if cs_ovr0 != new_cs_ovr0:
         gdal.SetConfigOption('USE_RRD', None)
-        return 'fail'
+        pytest.fail()
     if cs_ovr1 != new_cs_ovr1:
         gdal.SetConfigOption('USE_RRD', None)
-        return 'fail'
+        pytest.fail()
 
     # and regenerate them with an extra overview level
     ds.BuildOverviews('NEAR', overviewlist=[8])
@@ -296,10 +294,10 @@ def test_hfa_update_existing_aux_overviews():
     new_cs_ovr1 = ds.GetRasterBand(1).GetOverview(1).Checksum()
     if cs_ovr0 != new_cs_ovr0:
         gdal.SetConfigOption('USE_RRD', None)
-        return 'fail'
+        pytest.fail()
     if cs_ovr1 != new_cs_ovr1:
         gdal.SetConfigOption('USE_RRD', None)
-        return 'fail'
+        pytest.fail()
     ds = None
 
     gdal.GetDriverByName('BMP').Delete('tmp/hfa_update_existing_aux_overviews.bmp')
diff --git a/autotest/gcore/mask.py b/autotest/gcore/mask.py
index dca7c291ea10..7900c93c42a8 100755
--- a/autotest/gcore/mask.py
+++ b/autotest/gcore/mask.py
@@ -35,6 +35,7 @@
 
 import gdaltest
 from osgeo import gdal
+import pytest
 
 ###############################################################################
 # Verify the checksum and flags for "all valid" case.
@@ -159,7 +160,7 @@ def test_mask_5():
     # This crashes with libtiff 3.8.2, so skip it
     md = gdal.GetDriverByName('GTiff').GetMetadata()
     if md['DMD_CREATIONOPTIONLIST'].find('BigTIFF') == -1:
-        return 'skip'
+        pytest.skip()
 
     ds = gdal.Open('tmp/mask_4.pnm', gdal.GA_Update)
 
@@ -425,8 +426,7 @@ def test_mask_13():
     try:
         os.stat('tmp/byte_with_mask.tif.msk')
     except OSError:
-        gdaltest.post_reason('tmp/byte_with_mask.tif.msk is absent')
-        return 'fail'
+        pytest.fail('tmp/byte_with_mask.tif.msk is absent')
 
     ds = gdal.Open('tmp/byte_with_mask.tif')
 
@@ -442,8 +442,7 @@ def test_mask_13():
 
     try:
         os.stat('tmp/byte_with_mask.tif.msk')
-        gdaltest.post_reason('tmp/byte_with_mask.tif.msk is still there')
-        return 'fail'
+        pytest.fail('tmp/byte_with_mask.tif.msk is still there')
     except OSError:
         pass
 
@@ -499,8 +498,7 @@ def test_mask_14():
 
     try:
         os.stat('tmp/byte_with_mask.tif.msk')
-        gdaltest.post_reason('tmp/byte_with_mask.tif.msk should not exist')
-        return 'fail'
+        pytest.fail('tmp/byte_with_mask.tif.msk should not exist')
     except OSError:
         pass
 
@@ -590,8 +588,7 @@ def mask_and_ovr(order, method):
 
     try:
         os.stat('tmp/byte_with_ovr_and_mask.tif.msk')
-        gdaltest.post_reason('tmp/byte_with_mask.tif.msk should not exist')
-        return 'fail'
+        pytest.fail('tmp/byte_with_mask.tif.msk should not exist')
     except OSError:
         pass
 
@@ -763,8 +760,7 @@ def test_mask_22():
     try:
         os.stat('tmp/mask_22.tif.msk')
     except OSError:
-        gdaltest.post_reason('tmp/mask_22.tif.msk is absent')
-        return 'fail'
+        pytest.fail('tmp/mask_22.tif.msk is absent')
 
     ds = gdal.Open('tmp/mask_22.tif')
 
@@ -780,8 +776,7 @@ def test_mask_22():
 
     try:
         os.stat('tmp/mask_22.tif.msk')
-        gdaltest.post_reason('tmp/mask_22.tif.msk is still there')
-        return 'fail'
+        pytest.fail('tmp/mask_22.tif.msk is still there')
     except OSError:
         pass
 
@@ -797,7 +792,7 @@ def test_mask_23():
     drv = gdal.GetDriverByName('GTiff')
     md = drv.GetMetadata()
     if md['DMD_CREATIONOPTIONLIST'].find('JPEG') == -1:
-        return 'skip'
+        pytest.skip()
 
     src_ds = drv.Create('tmp/mask_23_src.tif', 3000, 2000, 3, options=['TILED=YES', 'SPARSE_OK=YES'])
     src_ds.CreateMaskBand(gdal.GMF_PER_DATASET)
diff --git a/autotest/gcore/misc.py b/autotest/gcore/misc.py
index ce662bafac57..365d84d0bb95 100755
--- a/autotest/gcore/misc.py
+++ b/autotest/gcore/misc.py
@@ -36,6 +36,7 @@
 
 
 import gdaltest
+import pytest
 
 
 ###############################################################################
@@ -209,8 +210,7 @@ def test_misc_5():
             os.stat('tmp/tmp')
             # Hum the directory already exists... Not expected, but let's try to go on
         except OSError:
-            gdaltest.post_reason('Cannot create tmp/tmp')
-            return 'fail'
+            pytest.fail('Cannot create tmp/tmp')
 
     # This is to speed-up the runtime of tests on EXT4 filesystems
     # Do not use this for production environment if you care about data safety
@@ -299,8 +299,7 @@ def misc_6_internal(datatype, nBands, setDriversDone):
                         # Hum the directory already exists... Not expected, but let's try to go on
                     except OSError:
                         reason = 'Cannot create %s before drv = %s, nBands = %d, datatype = %s' % (dirname, drv.ShortName, nBands, gdal.GetDataTypeName(datatype))
-                        gdaltest.post_reason(reason)
-                        return 'fail'
+                        pytest.fail(reason)
 
                 filename = get_filename(drv, dirname)
 
@@ -317,8 +316,7 @@ def misc_6_internal(datatype, nBands, setDriversDone):
                     shutil.rmtree(dirname)
                 except OSError:
                     reason = 'Cannot remove %s after drv = %s, nBands = %d, datatype = %s' % (dirname, drv.ShortName, nBands, gdal.GetDataTypeName(datatype))
-                    gdaltest.post_reason(reason)
-                    return 'fail'
+                    pytest.fail(reason)
 
                 if has_succeeded and drv.ShortName not in setDriversDone and nBands > 0:
                     setDriversDone.add(drv.ShortName)
@@ -358,7 +356,6 @@ def misc_6_internal(datatype, nBands, setDriversDone):
                     if drv.ShortName not in ['ECW', 'JP2ECW', 'VRT', 'XPM', 'JPEG2000', 'FIT', 'RST', 'INGR', 'USGSDEM', 'KMLSUPEROVERLAY', 'GMT']:
                         dst_ds = drv.CreateCopy(filename, ds, callback=misc_6_interrupt_callback_class().cbk)
                         if dst_ds is not None:
-                            gdaltest.post_reason('interruption did not work with drv = %s, nBands = %d, datatype = %s' % (drv.ShortName, nBands, gdal.GetDataTypeName(datatype)))
                             dst_ds = None
 
                             try:
@@ -366,7 +363,7 @@ def misc_6_internal(datatype, nBands, setDriversDone):
                             except OSError:
                                 pass
 
-                            return 'fail'
+                            pytest.fail('interruption did not work with drv = %s, nBands = %d, datatype = %s' % (drv.ShortName, nBands, gdal.GetDataTypeName(datatype)))
 
                         dst_ds = None
 
@@ -378,8 +375,7 @@ def misc_6_internal(datatype, nBands, setDriversDone):
                             os.mkdir(dirname)
                         except OSError:
                             reason = 'Cannot create %s before drv = %s, nBands = %d, datatype = %s' % (dirname, drv.ShortName, nBands, gdal.GetDataTypeName(datatype))
-                            gdaltest.post_reason(reason)
-                            return 'fail'
+                            pytest.fail(reason)
     ds = None
 
     return 'success'
@@ -401,8 +397,7 @@ def test_misc_6():
             os.stat('tmp/tmp')
             # Hum the directory already exists... Not expected, but let's try to go on
         except OSError:
-            gdaltest.post_reason('Cannot create tmp/tmp')
-            return 'fail'
+            pytest.fail('Cannot create tmp/tmp')
 
     # This is to speed-up the runtime of tests on EXT4 filesystems
     # Do not use this for production environment if you care about data safety
@@ -446,7 +441,7 @@ def test_misc_7():
     try:
         gdal.InvGeoTransform
     except AttributeError:
-        return 'skip'
+        pytest.skip()
 
     gt = (10, 0.1, 0, 20, 0, -1.0)
     res = gdal.InvGeoTransform(gt)
@@ -465,7 +460,7 @@ def test_misc_8():
     try:
         gdal.ApplyGeoTransform
     except AttributeError:
-        return 'skip'
+        pytest.skip()
 
     gt = (10, 0.1, 0, 20, 0, -1.0)
     res = gdal.ApplyGeoTransform(gt, 10, 1)
@@ -525,7 +520,7 @@ def test_misc_10():
 def test_misc_11():
 
     if not gdaltest.support_symlink():
-        return 'skip'
+        pytest.skip()
 
     gdal.Unlink('tmp/symlink.tif')
     os.symlink('GTIFF_DIR:1:data/byte.tif', 'tmp/symlink.tif')
@@ -533,7 +528,7 @@ def test_misc_11():
     ds = gdal.Open('tmp/symlink.tif')
     if ds is None:
         os.remove('tmp/symlink.tif')
-        return 'fail'
+        pytest.fail()
     desc = ds.GetDescription()
     ds = None
 
@@ -550,8 +545,7 @@ def test_misc_11():
 def test_misc_12():
 
     if int(gdal.VersionInfo('VERSION_NUM')) < 1900:
-        gdaltest.post_reason('would crash')
-        return 'skip'
+        pytest.skip('would crash')
 
     import test_cli_utilities
     gdal_translate_path = test_cli_utilities.get_gdal_translate_path()
@@ -585,9 +579,8 @@ def test_misc_12():
             ds = drv.CreateCopy('/nonexistingpath' + get_filename(drv, ''), src_ds)
             gdal.PopErrorHandler()
             if ds is None and gdal.GetLastErrorMsg() == '':
-                print('CreateCopy() into non existing dir fails without error message for driver %s' % drv.ShortName)
                 gdal.Unlink('/vsimem/misc_12_src.tif')
-                return 'fail'
+                pytest.fail('CreateCopy() into non existing dir fails without error message for driver %s' % drv.ShortName)
             ds = None
 
             if gdal_translate_path is not None:
diff --git a/autotest/gcore/numpy_rw.py b/autotest/gcore/numpy_rw.py
index 67ddeb6cb64b..39f0b84a4b1a 100755
--- a/autotest/gcore/numpy_rw.py
+++ b/autotest/gcore/numpy_rw.py
@@ -47,7 +47,7 @@ def test_numpy_rw_1():
         from osgeo import gdalnumeric
         gdalnumeric.zeros
     except (ImportError, AttributeError):
-        return 'skip'
+        pytest.skip()
 
     gdal.AllRegister()
 
@@ -63,7 +63,7 @@ def test_numpy_rw_1():
 def test_numpy_rw_2():
 
     if gdaltest.numpy_drv is None:
-        return 'skip'
+        pytest.skip()
 
     from osgeo import gdalnumeric
 
@@ -86,7 +86,7 @@ def test_numpy_rw_2():
 def test_numpy_rw_3():
 
     if gdaltest.numpy_drv is None:
-        return 'skip'
+        pytest.skip()
 
     ds = gdal.Open('data/cint_sar.tif')
     array = ds.ReadAsArray()
@@ -102,7 +102,7 @@ def test_numpy_rw_3():
 def test_numpy_rw_4():
 
     if gdaltest.numpy_drv is None:
-        return 'skip'
+        pytest.skip()
 
     ds = gdal.Open('data/byte.tif')
     array = ds.GetRasterBand(1).ReadAsArray(0, 0, 20, 20, 5, 5)
@@ -119,7 +119,7 @@ def test_numpy_rw_4():
 def test_numpy_rw_5():
 
     if gdaltest.numpy_drv is None:
-        return 'skip'
+        pytest.skip()
 
     from osgeo import gdalnumeric
 
@@ -153,7 +153,7 @@ def test_numpy_rw_5():
 def test_numpy_rw_6():
 
     if gdaltest.numpy_drv is None:
-        return 'skip'
+        pytest.skip()
 
     import numpy
     from osgeo import gdalnumeric
@@ -176,7 +176,7 @@ def test_numpy_rw_6():
 def test_numpy_rw_7():
 
     if gdaltest.numpy_drv is None:
-        return 'skip'
+        pytest.skip()
 
     import numpy
     from osgeo import gdalnumeric
@@ -218,7 +218,7 @@ def test_numpy_rw_7():
 def test_numpy_rw_8():
 
     if gdaltest.numpy_drv is None:
-        return 'skip'
+        pytest.skip()
 
     import numpy
     from osgeo import gdalnumeric
@@ -240,7 +240,7 @@ def test_numpy_rw_8():
 def test_numpy_rw_9():
 
     if gdaltest.numpy_drv is None:
-        return 'skip'
+        pytest.skip()
 
     ds = gdal.Open('data/byte.tif')
     array = ds.ReadAsArray()
@@ -262,7 +262,7 @@ def test_numpy_rw_9():
 def test_numpy_rw_10():
 
     if gdaltest.numpy_drv is None:
-        return 'skip'
+        pytest.skip()
 
     import numpy
 
@@ -294,7 +294,7 @@ def test_numpy_rw_10():
 def test_numpy_rw_11():
 
     if gdaltest.numpy_drv is None:
-        return 'skip'
+        pytest.skip()
 
     import numpy
     from osgeo import gdal_array
@@ -357,7 +357,7 @@ def test_numpy_rw_11():
 def test_numpy_rw_12():
 
     if gdaltest.numpy_drv is None:
-        return 'skip'
+        pytest.skip()
 
     import numpy
 
@@ -388,7 +388,7 @@ def test_numpy_rw_12():
 def test_numpy_rw_13():
 
     if gdaltest.numpy_drv is None:
-        return 'skip'
+        pytest.skip()
 
     import numpy
 
@@ -403,9 +403,8 @@ def test_numpy_rw_13():
     ar = numpy.empty([1, 2], dtype=numpy.int64)
     try:
         ds.GetRasterBand(1).ReadAsArray(buf_obj=ar)
-        gdaltest.post_reason('expected "ValueError: array does not have '
+        pytest.fail('expected "ValueError: array does not have '
                              'corresponding GDAL data type"')
-        return 'fail'
     except:
         pass
 
@@ -414,9 +413,8 @@ def test_numpy_rw_13():
     try:
         ds.GetRasterBand(1).ReadAsArray(buf_obj=ar, buf_xsize=2,
                                         buf_ysize=2)
-        gdaltest.post_reason('expected "Specified buf_ysize not consistent '
+        pytest.fail('expected "Specified buf_ysize not consistent '
                              'with buffer shape"')
-        return 'fail'
     except:
         pass
 
@@ -425,9 +423,8 @@ def test_numpy_rw_13():
     try:
         ds.GetRasterBand(1).ReadAsArray(buf_obj=ar, buf_xsize=2,
                                         buf_ysize=2)
-        gdaltest.post_reason('expected "Specified buf_ysize not consistent '
+        pytest.fail('expected "Specified buf_ysize not consistent '
                              'with buffer shape"')
-        return 'fail'
     except:
         pass
 
@@ -436,9 +433,8 @@ def test_numpy_rw_13():
     try:
         ds.GetRasterBand(1).ReadAsArray(buf_obj=ar, buf_xsize=1,
                                         buf_ysize=1)
-        gdaltest.post_reason('expected "Specified buf_xsize not consistent '
+        pytest.fail('expected "Specified buf_xsize not consistent '
                              'with buffer shape"')
-        return 'fail'
     except:
         pass
 
@@ -447,9 +443,8 @@ def test_numpy_rw_13():
     try:
         ds.GetRasterBand(1).ReadAsArray(buf_obj=ar,
                                         buf_type=gdal.GDT_Int16)
-        gdaltest.post_reason('expected "Specified buf_type not consistent '
+        pytest.fail('expected "Specified buf_type not consistent '
                              'with array type"')
-        return 'fail'
     except:
         pass
 
@@ -490,9 +485,8 @@ def test_numpy_rw_13():
     ar = numpy.empty([3, 1, 2], dtype=numpy.int64)
     try:
         ds.ReadAsArray(buf_obj=ar)
-        gdaltest.post_reason('expected "ValueError: array does not have '
+        pytest.fail('expected "ValueError: array does not have '
                              'corresponding GDAL data type"')
-        return 'fail'
     except:
         pass
 
@@ -500,9 +494,8 @@ def test_numpy_rw_13():
     ar = numpy.empty([3, 1, 2], dtype=numpy.uint8)
     try:
         ds.ReadAsArray(buf_obj=ar, buf_xsize=2, buf_ysize=2)
-        gdaltest.post_reason('expected "Specified buf_ysize not consistent '
+        pytest.fail('expected "Specified buf_ysize not consistent '
                              'with buffer shape"')
-        return 'fail'
     except:
         pass
 
@@ -510,9 +503,8 @@ def test_numpy_rw_13():
     ar = numpy.empty([1, 2], dtype=numpy.uint8)
     try:
         ds.ReadAsArray(buf_obj=ar)
-        gdaltest.post_reason('expected "ValueError: Array should have 3 '
+        pytest.fail('expected "ValueError: Array should have 3 '
                              'dimensions"')
-        return 'fail'
     except:
         pass
 
@@ -520,9 +512,8 @@ def test_numpy_rw_13():
     ar = numpy.empty([3, 1, 2], dtype=numpy.uint8)
     try:
         ds.ReadAsArray(buf_obj=ar, buf_xsize=1, buf_ysize=1)
-        gdaltest.post_reason('expected "Specified buf_xsize not consistent '
+        pytest.fail('expected "Specified buf_xsize not consistent '
                              'with buffer shape"')
-        return 'fail'
     except:
         pass
 
@@ -530,8 +521,7 @@ def test_numpy_rw_13():
     ar = numpy.empty([3, 1, 2], dtype=numpy.uint8)
     try:
         ds.ReadAsArray(buf_obj=ar, buf_type=gdal.GDT_Int16)
-        gdaltest.post_reason('expected "Specified buf_type not consistent with array type"')
-        return 'fail'
+        pytest.fail('expected "Specified buf_type not consistent with array type"')
     except:
         pass
 
@@ -539,8 +529,7 @@ def test_numpy_rw_13():
     ar = numpy.empty([2, 1, 2], dtype=numpy.uint8)
     try:
         ds.ReadAsArray(buf_obj=ar)
-        gdaltest.post_reason('expected "Array should have space for 3 bands"')
-        return 'fail'
+        pytest.fail('expected "Array should have space for 3 bands"')
     except:
         pass
 
@@ -598,12 +587,12 @@ def numpy_rw_14_progress_callback_2(pct, message, user_data):
 def test_numpy_rw_14():
 
     if gdaltest.numpy_drv is None:
-        return 'skip'
+        pytest.skip()
 
     # Progress not implemented yet
     if gdal.GetConfigOption('GTIFF_DIRECT_IO') == 'YES' or \
        gdal.GetConfigOption('GTIFF_VIRTUAL_MEM_IO') == 'YES':
-        return 'skip'
+        pytest.skip()
 
     import numpy
 
@@ -664,7 +653,7 @@ def test_numpy_rw_14():
 def test_numpy_rw_15():
 
     if gdaltest.numpy_drv is None:
-        return 'skip'
+        pytest.skip()
 
     import numpy
     from osgeo import gdal_array
@@ -686,7 +675,7 @@ def test_numpy_rw_15():
 def test_numpy_rw_16():
 
     if gdaltest.numpy_drv is None:
-        return 'skip'
+        pytest.skip()
 
     import numpy
     from osgeo import gdal_array
@@ -718,7 +707,7 @@ def test_numpy_rw_16():
 def test_numpy_rw_17():
 
     if gdaltest.numpy_drv is None:
-        return 'skip'
+        pytest.skip()
 
     import numpy
     from osgeo import gdal_array
@@ -748,7 +737,7 @@ def test_numpy_rw_17():
 def test_numpy_rw_18():
 
     if gdaltest.numpy_drv is None:
-        return 'skip'
+        pytest.skip()
 
     import numpy
     import numpy.random
diff --git a/autotest/gcore/overviewds.py b/autotest/gcore/overviewds.py
index b98a57614202..35ba70a843b6 100755
--- a/autotest/gcore/overviewds.py
+++ b/autotest/gcore/overviewds.py
@@ -36,6 +36,7 @@
 
 import gdaltest
 from osgeo import gdal
+import pytest
 
 ###############################################################################
 # Error cases
@@ -174,10 +175,9 @@ def test_overviewds_4():
         if key == 'LINE_SCALE' or key == 'SAMP_SCALE' or key == 'LINE_OFF' or key == 'SAMP_OFF':
             assert float(got_md[key]) == myfloat(rpc_md[key]) / 2
         elif got_md[key] != rpc_md[key]:
-            print(key)
             print(got_md[key])
             print(rpc_md[key])
-            return 'fail'
+            pytest.fail(key)
 
     # Really check that the transformer works
     tr = gdal.Transformer(ds, None, ['METHOD=RPC'])
@@ -223,10 +223,9 @@ def test_overviewds_5():
         elif key == 'PIXEL_STEP' or key == 'LINE_STEP':
             assert abs(float(got_md[key]) - myfloat(geoloc_md[key]) / 2) <= 1e-1
         elif got_md[key] != geoloc_md[key]:
-            print(key)
             print(got_md[key])
             print(geoloc_md[key])
-            return 'fail'
+            pytest.fail(key)
 
     # Really check that the transformer works
     tr = gdal.Transformer(ds, None, ['METHOD=GEOLOC_ARRAY'])
diff --git a/autotest/gcore/pam.py b/autotest/gcore/pam.py
index 1cd0f9f0abf1..f37dc1f6d045 100755
--- a/autotest/gcore/pam.py
+++ b/autotest/gcore/pam.py
@@ -38,6 +38,7 @@
 
 import gdaltest
 from osgeo import gdal
+import pytest
 
 ###############################################################################
 # Check that we can read PAM metadata for existing PNM file.
@@ -346,7 +347,7 @@ def test_pam_11():
         f = open('tmpdirreadonly/test', 'w')
         if f is not None:
             f.close()
-            return 'skip'
+            pytest.skip()
     except IOError:
         pass
 
diff --git a/autotest/gcore/pixfun.py b/autotest/gcore/pixfun.py
index eb965698bd83..0a651be22ca0 100755
--- a/autotest/gcore/pixfun.py
+++ b/autotest/gcore/pixfun.py
@@ -29,6 +29,7 @@
 ###############################################################################
 
 import sys
+import pytest
 
 try:
     import numpy
@@ -48,7 +49,7 @@
 def test_pixfun_real_c():
 
     if not numpy_available:
-        return 'skip'
+        pytest.skip()
 
     filename = 'data/pixfun_real_c.vrt'
     ds = gdal.OpenShared(filename, gdal.GA_ReadOnly)
@@ -71,7 +72,7 @@ def test_pixfun_real_c():
 def test_pixfun_real_r():
 
     if not numpy_available:
-        return 'skip'
+        pytest.skip()
 
     filename = 'data/pixfun_real_r.vrt'
     ds = gdal.OpenShared(filename, gdal.GA_ReadOnly)
@@ -94,7 +95,7 @@ def test_pixfun_real_r():
 def test_pixfun_imag_c():
 
     if not numpy_available:
-        return 'skip'
+        pytest.skip()
 
     filename = 'data/pixfun_imag_c.vrt'
     ds = gdal.OpenShared(filename, gdal.GA_ReadOnly)
@@ -124,7 +125,7 @@ def test_pixfun_imag_c():
 def test_pixfun_imag_r():
 
     if not numpy_available:
-        return 'skip'
+        pytest.skip()
 
     filename = 'data/pixfun_imag_r.vrt'
     ds = gdal.OpenShared(filename, gdal.GA_ReadOnly)
@@ -142,7 +143,7 @@ def test_pixfun_imag_r():
 def test_pixfun_complex():
 
     if not numpy_available:
-        return 'skip'
+        pytest.skip()
 
     filename = 'data/pixfun_complex.vrt'
     ds = gdal.OpenShared(filename, gdal.GA_ReadOnly)
@@ -165,7 +166,7 @@ def test_pixfun_complex():
 def test_pixfun_mod_c():
 
     if not numpy_available:
-        return 'skip'
+        pytest.skip()
 
     filename = 'data/pixfun_mod_c.vrt'
     ds = gdal.OpenShared(filename, gdal.GA_ReadOnly)
@@ -188,7 +189,7 @@ def test_pixfun_mod_c():
 def test_pixfun_mod_r():
 
     if not numpy_available:
-        return 'skip'
+        pytest.skip()
 
     filename = 'data/pixfun_mod_r.vrt'
     ds = gdal.OpenShared(filename, gdal.GA_ReadOnly)
@@ -211,7 +212,7 @@ def test_pixfun_mod_r():
 def test_pixfun_phase_c():
 
     if not numpy_available:
-        return 'skip'
+        pytest.skip()
 
     filename = 'data/pixfun_phase_c.vrt'
     ds = gdal.OpenShared(filename, gdal.GA_ReadOnly)
@@ -235,7 +236,7 @@ def test_pixfun_phase_c():
 def test_pixfun_phase_r():
 
     if not numpy_available:
-        return 'skip'
+        pytest.skip()
 
     filename = 'data/pixfun_phase_r.vrt'
     ds = gdal.OpenShared(filename, gdal.GA_ReadOnly)
@@ -258,7 +259,7 @@ def test_pixfun_phase_r():
 def test_pixfun_conj_c():
 
     if not numpy_available:
-        return 'skip'
+        pytest.skip()
 
     filename = 'data/pixfun_conj_c.vrt'
     ds = gdal.OpenShared(filename, gdal.GA_ReadOnly)
@@ -281,7 +282,7 @@ def test_pixfun_conj_c():
 def test_pixfun_conj_r():
 
     if not numpy_available:
-        return 'skip'
+        pytest.skip()
 
     filename = 'data/pixfun_conj_r.vrt'
     ds = gdal.OpenShared(filename, gdal.GA_ReadOnly)
@@ -304,7 +305,7 @@ def test_pixfun_conj_r():
 def test_pixfun_sum_r():
 
     if not numpy_available:
-        return 'skip'
+        pytest.skip()
 
     filename = 'data/pixfun_sum_r.vrt'
     ds = gdal.OpenShared(filename, gdal.GA_ReadOnly)
@@ -330,7 +331,7 @@ def test_pixfun_sum_r():
 def test_pixfun_sum_c():
 
     if not numpy_available:
-        return 'skip'
+        pytest.skip()
 
     filename = 'data/pixfun_sum_c.vrt'
     ds = gdal.OpenShared(filename, gdal.GA_ReadOnly)
@@ -356,7 +357,7 @@ def test_pixfun_sum_c():
 def test_pixfun_diff_r():
 
     if not numpy_available:
-        return 'skip'
+        pytest.skip()
 
     filename = 'data/pixfun_diff_r.vrt'
     ds = gdal.OpenShared(filename, gdal.GA_ReadOnly)
@@ -384,7 +385,7 @@ def test_pixfun_diff_r():
 def test_pixfun_diff_c():
 
     if not numpy_available:
-        return 'skip'
+        pytest.skip()
 
     filename = 'data/pixfun_diff_c.vrt'
     ds = gdal.OpenShared(filename, gdal.GA_ReadOnly)
@@ -412,7 +413,7 @@ def test_pixfun_diff_c():
 def test_pixfun_mul_r():
 
     if not numpy_available:
-        return 'skip'
+        pytest.skip()
 
     filename = 'data/pixfun_mul_r.vrt'
     ds = gdal.OpenShared(filename, gdal.GA_ReadOnly)
@@ -438,7 +439,7 @@ def test_pixfun_mul_r():
 def test_pixfun_mul_c():
 
     if not numpy_available:
-        return 'skip'
+        pytest.skip()
 
     filename = 'data/pixfun_mul_c.vrt'
     ds = gdal.OpenShared(filename, gdal.GA_ReadOnly)
@@ -461,7 +462,7 @@ def test_pixfun_mul_c():
 def test_pixfun_cmul_c():
 
     if not numpy_available:
-        return 'skip'
+        pytest.skip()
 
     filename = 'data/pixfun_cmul_c.vrt'
     ds = gdal.OpenShared(filename, gdal.GA_ReadOnly)
@@ -484,7 +485,7 @@ def test_pixfun_cmul_c():
 def test_pixfun_cmul_r():
 
     if not numpy_available:
-        return 'skip'
+        pytest.skip()
 
     filename = 'data/pixfun_cmul_r.vrt'
     ds = gdal.OpenShared(filename, gdal.GA_ReadOnly)
@@ -514,7 +515,7 @@ def test_pixfun_cmul_r():
 def test_pixfun_inv_r():
 
     if not numpy_available:
-        return 'skip'
+        pytest.skip()
 
     filename = 'data/pixfun_inv_r.vrt'
     ds = gdal.OpenShared(filename, gdal.GA_ReadOnly)
@@ -538,7 +539,7 @@ def test_pixfun_inv_r():
 def test_pixfun_inv_c():
 
     if not numpy_available:
-        return 'skip'
+        pytest.skip()
 
     filename = 'data/pixfun_inv_c.vrt'
     ds = gdal.OpenShared(filename, gdal.GA_ReadOnly)
@@ -564,7 +565,7 @@ def test_pixfun_inv_c():
 def test_pixfun_intensity_c():
 
     if not numpy_available:
-        return 'skip'
+        pytest.skip()
 
     filename = 'data/pixfun_intensity_c.vrt'
     ds = gdal.OpenShared(filename, gdal.GA_ReadOnly)
@@ -587,7 +588,7 @@ def test_pixfun_intensity_c():
 def test_pixfun_intensity_r():
 
     if not numpy_available:
-        return 'skip'
+        pytest.skip()
 
     filename = 'data/pixfun_intensity_r.vrt'
     ds = gdal.OpenShared(filename, gdal.GA_ReadOnly)
@@ -610,7 +611,7 @@ def test_pixfun_intensity_r():
 def test_pixfun_sqrt():
 
     if not numpy_available:
-        return 'skip'
+        pytest.skip()
 
     filename = 'data/pixfun_sqrt.vrt'
     ds = gdal.OpenShared(filename, gdal.GA_ReadOnly)
@@ -633,7 +634,7 @@ def test_pixfun_sqrt():
 def test_pixfun_log10_r():
 
     if not numpy_available:
-        return 'skip'
+        pytest.skip()
 
     filename = 'data/pixfun_log10_r.vrt'
     ds = gdal.OpenShared(filename, gdal.GA_ReadOnly)
@@ -656,7 +657,7 @@ def test_pixfun_log10_r():
 def test_pixfun_log10_c():
 
     if not numpy_available:
-        return 'skip'
+        pytest.skip()
 
     filename = 'data/pixfun_log10_c.vrt'
     ds = gdal.OpenShared(filename, gdal.GA_ReadOnly)
@@ -678,7 +679,7 @@ def test_pixfun_log10_c():
 def test_pixfun_dB_r():
 
     if not numpy_available:
-        return 'skip'
+        pytest.skip()
 
     filename = 'data/pixfun_dB_r.vrt'
     ds = gdal.OpenShared(filename, gdal.GA_ReadOnly)
@@ -701,7 +702,7 @@ def test_pixfun_dB_r():
 def test_pixfun_dB_c():
 
     if not numpy_available:
-        return 'skip'
+        pytest.skip()
 
     filename = 'data/pixfun_dB_c.vrt'
     ds = gdal.OpenShared(filename, gdal.GA_ReadOnly)
@@ -723,7 +724,7 @@ def test_pixfun_dB_c():
 def test_pixfun_dB2amp():
 
     if not numpy_available:
-        return 'skip'
+        pytest.skip()
 
     filename = 'data/pixfun_dB2amp.vrt'
     ds = gdal.OpenShared(filename, gdal.GA_ReadOnly)
@@ -747,7 +748,7 @@ def test_pixfun_dB2amp():
 def test_pixfun_dB2pow():
 
     if not numpy_available:
-        return 'skip'
+        pytest.skip()
 
     filename = 'data/pixfun_dB2pow.vrt'
     ds = gdal.OpenShared(filename, gdal.GA_ReadOnly)
diff --git a/autotest/gcore/rasterio.py b/autotest/gcore/rasterio.py
index 29f07ff5aed3..11d985921c52 100755
--- a/autotest/gcore/rasterio.py
+++ b/autotest/gcore/rasterio.py
@@ -260,8 +260,7 @@ def test_rasterio_6():
     for obj in [ds, ds.GetRasterBand(1)]:
         try:
             obj.WriteRaster(0, 0, 2, 2, None)
-            gdaltest.post_reason('expected exception')
-            return 'fail'
+            pytest.fail('expected exception')
         except:
             pass
 
@@ -346,7 +345,7 @@ def test_rasterio_8():
     # Progress not implemented yet
     if gdal.GetConfigOption('GTIFF_DIRECT_IO') == 'YES' or \
        gdal.GetConfigOption('GTIFF_VIRTUAL_MEM_IO') == 'YES':
-        return 'skip'
+        pytest.skip()
 
     # Test RasterBand.ReadRaster
     tab = [0, True]
@@ -679,7 +678,7 @@ def test_rasterio_11():
         gdalnumeric.zeros
         import numpy
     except (ImportError, AttributeError):
-        return 'skip'
+        pytest.skip()
 
     mem_ds = gdal.GetDriverByName('MEM').Create('', 4, 3)
     mem_ds.GetRasterBand(1).WriteArray(numpy.array([[80, 125, 125, 80], [80, 125, 125, 80], [80, 125, 125, 80]]))
@@ -716,7 +715,7 @@ def test_rasterio_12():
         gdalnumeric.zeros
         import numpy
     except (ImportError, AttributeError):
-        return 'skip'
+        pytest.skip()
 
     mem_ds = gdal.GetDriverByName('MEM').Create('', 4, 3, 4)
     for i in range(3):
@@ -759,7 +758,7 @@ def test_rasterio_13():
         gdalnumeric.zeros
         import numpy
     except (ImportError, AttributeError):
-        return 'skip'
+        pytest.skip()
 
     for dt in [gdal.GDT_Byte, gdal.GDT_UInt16, gdal.GDT_UInt32]:
 
diff --git a/autotest/gcore/rat.py b/autotest/gcore/rat.py
index 3e4879fb5156..2be0be8c5df5 100755
--- a/autotest/gcore/rat.py
+++ b/autotest/gcore/rat.py
@@ -35,6 +35,7 @@
 
 import gdaltest
 from osgeo import gdal
+import pytest
 
 ###############################################################################
 # Create a raster attribute table.
@@ -47,7 +48,7 @@ def test_rat_1():
     try:
         rat = gdal.RasterAttributeTable()
     except:
-        return 'skip'
+        pytest.skip()
 
     rat.CreateColumn('Value', gdal.GFT_Integer, gdal.GFU_MinMax)
     rat.CreateColumn('Count', gdal.GFT_Integer, gdal.GFU_PixelCount)
@@ -87,7 +88,7 @@ def test_rat_1():
 def test_rat_2():
 
     if gdaltest.saved_rat is None:
-        return 'skip'
+        pytest.skip()
 
     ds = gdal.GetDriverByName('PNM').Create('tmp/rat_2.pnm', 100, 90, 1,
                                             gdal.GDT_Byte)
diff --git a/autotest/gcore/rfc30.py b/autotest/gcore/rfc30.py
index 318c9496ee33..2c4bcc951542 100755
--- a/autotest/gcore/rfc30.py
+++ b/autotest/gcore/rfc30.py
@@ -35,6 +35,7 @@
 
 
 import gdaltest
+import pytest
 
 ###############################################################################
 # Try opening a file with a Chinese name using the Python UTF-8 string.
@@ -50,7 +51,7 @@ def test_rfc30_1():
         filename_escaped = gdaltest.urlescape(filename.encode('utf-8'))
 
     if not gdaltest.download_file('http://download.osgeo.org/gdal/data/gtiff/' + filename_escaped, filename):
-        return 'skip'
+        pytest.skip()
 
     filename = 'tmp/cache/' + filename
 
diff --git a/autotest/gcore/testnonboundtoswig.py b/autotest/gcore/testnonboundtoswig.py
index 4cf82d135820..b0bfaf7f46fa 100755
--- a/autotest/gcore/testnonboundtoswig.py
+++ b/autotest/gcore/testnonboundtoswig.py
@@ -32,6 +32,7 @@
 import sys
 from sys import version_info
 from osgeo import gdal
+import pytest
 
 
 try:
@@ -62,7 +63,7 @@ def test_testnonboundtoswig_init():
 
     if gdal_handle_init:
         if gdal_handle is None:
-            return 'skip'
+            pytest.skip()
         return 'success'
 
     gdal_handle_init = True
@@ -70,12 +71,11 @@ def test_testnonboundtoswig_init():
     try:
         ctypes.cdll
     except ImportError:
-        print('cannot find ctypes')
-        return 'skip'
+        pytest.skip('cannot find ctypes')
 
     name = find_libgdal()
     if name is None:
-        return 'skip'
+        pytest.skip()
 
     print('Found libgdal we are running against : %s' % name)
 
@@ -97,15 +97,13 @@ def test_testnonboundtoswig_init():
             dynamic_version = str(dynamic_version, 'utf-8')
 
         if dynamic_version != static_version:
-            gdaltest.post_reason('dynamic version(%s) does not match static version (%s)' % (dynamic_version, static_version))
             gdal_handle = None
             gdal_handle_stdcall = None
-            return 'skip'
+            pytest.skip('dynamic version(%s) does not match static version (%s)' % (dynamic_version, static_version))
 
         return 'success'
     except:
-        print('cannot find gdal shared object')
-        return 'skip'
+        pytest.skip('cannot find gdal shared object')
 
 ###############################################################################
 # Call GDALDestroyDriverManager()
@@ -117,7 +115,7 @@ def GDALDestroyDriverManager():
         test_testnonboundtoswig_init()
 
     if gdal_handle is None:
-        return 'skip'
+        pytest.skip()
 
     gdal_handle_stdcall.GDALDestroyDriverManager.argtypes = []
     gdal_handle_stdcall.GDALDestroyDriverManager.restype = None
@@ -136,7 +134,7 @@ def OGRCleanupAll():
         test_testnonboundtoswig_init()
 
     if gdal_handle is None:
-        return 'skip'
+        pytest.skip()
 
     gdal_handle_stdcall.OGRCleanupAll.argtypes = []
     gdal_handle_stdcall.OGRCleanupAll.restype = None
@@ -155,7 +153,7 @@ def OSRCleanup():
         test_testnonboundtoswig_init()
 
     if gdal_handle is None:
-        return 'skip'
+        pytest.skip()
 
     gdal_handle.OSRCleanup.argtypes = []
     gdal_handle.OSRCleanup.restype = None
@@ -171,7 +169,7 @@ def OSRCleanup():
 def test_testnonboundtoswig_GDALSimpleImageWarp():
 
     if gdal_handle is None:
-        return 'skip'
+        pytest.skip()
 
     src_ds = gdal.Open('data/byte.tif')
     gt = src_ds.GetGeoTransform()
@@ -298,7 +296,7 @@ def my_pyDerivedPixelFunc(papoSources, nSources, pData, nBufXSize, nBufYSize, eS
 def test_testnonboundtoswig_VRTDerivedBands():
 
     if gdal_handle is None:
-        return 'skip'
+        pytest.skip()
 
     DerivedPixelFuncType = ctypes.CFUNCTYPE(ctypes.c_int,  # ret CPLErr
                                             ctypes.POINTER(ctypes.c_void_p),  # void **papoSources
diff --git a/autotest/gcore/thread_test.py b/autotest/gcore/thread_test.py
index bfe07c8e0a6e..af98d219867c 100755
--- a/autotest/gcore/thread_test.py
+++ b/autotest/gcore/thread_test.py
@@ -35,6 +35,7 @@
 
 import gdaltest
 from osgeo import gdal
+import pytest
 
 
 def my_error_handler(err_type, err_no, err_msg):
@@ -62,7 +63,7 @@ def test_thread_test_1():
         from osgeo import gdalnumeric
         gdalnumeric.zeros
     except (ImportError, AttributeError):
-        return 'skip'
+        pytest.skip()
 
     threads = []
     args_array = []
diff --git a/autotest/gcore/tiff_ovr.py b/autotest/gcore/tiff_ovr.py
index a8d836520335..3ac1f6f04c5e 100755
--- a/autotest/gcore/tiff_ovr.py
+++ b/autotest/gcore/tiff_ovr.py
@@ -67,24 +67,20 @@ def tiff_ovr_check(src_ds):
         ovr_band = src_ds.GetRasterBand(i).GetOverview(0)
         if ovr_band.XSize != 10 or ovr_band.YSize != 10:
             msg = 'overview wrong size: band %d, overview 0, size = %d * %d,' % (i, ovr_band.XSize, ovr_band.YSize)
-            gdaltest.post_reason(msg)
-            return 'fail'
+            pytest.fail(msg)
 
         if ovr_band.Checksum() != 1087:
             msg = 'overview wrong checksum: band %d, overview 0, checksum = %d,' % (i, ovr_band.Checksum())
-            gdaltest.post_reason(msg)
-            return 'fail'
+            pytest.fail(msg)
 
         ovr_band = src_ds.GetRasterBand(i).GetOverview(1)
         if ovr_band.XSize != 5 or ovr_band.YSize != 5:
             msg = 'overview wrong size: band %d, overview 1, size = %d * %d,' % (i, ovr_band.XSize, ovr_band.YSize)
-            gdaltest.post_reason(msg)
-            return 'fail'
+            pytest.fail(msg)
 
         if ovr_band.Checksum() != 328:
             msg = 'overview wrong checksum: band %d, overview 1, checksum = %d,' % (i, ovr_band.Checksum())
-            gdaltest.post_reason(msg)
-            return 'fail'
+            pytest.fail(msg)
     return 'success'
 
 ###############################################################################
@@ -271,8 +267,7 @@ def test_tiff_ovr_6(both_endian):
     try:
         os.stat('tmp/ovr6.aux')
     except OSError:
-        gdaltest.post_reason('no external overview.')
-        return 'fail'
+        pytest.fail('no external overview.')
 
     cs = wrk_ds.GetRasterBand(1).GetOverview(0).Checksum()
     exp_cs = 1130
@@ -342,7 +337,7 @@ def test_tiff_ovr_9(both_endian):
     drv = gdal.GetDriverByName('GTiff')
     md = drv.GetMetadata()
     if md['DMD_CREATIONOPTIONLIST'].find('BigTIFF') == -1:
-        return 'skip'
+        pytest.skip()
 
     shutil.copyfile('data/rgbsmall.tif', 'tmp/ovr9.tif')
 
@@ -672,7 +667,7 @@ def test_tiff_ovr_19(both_endian):
     drv = gdal.GetDriverByName('GTiff')
     md = drv.GetMetadata()
     if md['DMD_CREATIONOPTIONLIST'].find('BigTIFF') == -1:
-        return 'skip'
+        pytest.skip()
 
     ds = gdal.GetDriverByName('GTiff').Create('tmp/ovr19.tif', 100, 100, 1)
     ds.GetRasterBand(1).Fill(1)
@@ -705,7 +700,7 @@ def test_tiff_ovr_20(both_endian):
     drv = gdal.GetDriverByName('GTiff')
     md = drv.GetMetadata()
     if md['DMD_CREATIONOPTIONLIST'].find('BigTIFF') == -1:
-        return 'skip'
+        pytest.skip()
 
     ds = gdaltest.tiff_drv.Create('tmp/ovr20.tif', 100, 100, 1)
     ds = None
@@ -740,7 +735,7 @@ def test_tiff_ovr_21(both_endian):
     drv = gdal.GetDriverByName('GTiff')
     md = drv.GetMetadata()
     if md['DMD_CREATIONOPTIONLIST'].find('BigTIFF') == -1:
-        return 'skip'
+        pytest.skip()
 
     ds = gdaltest.tiff_drv.Create('tmp/ovr21.tif', 170000, 100000, 1, options=['SPARSE_OK=YES'])
     ds = None
@@ -775,7 +770,7 @@ def test_tiff_ovr_22(both_endian):
     drv = gdal.GetDriverByName('GTiff')
     md = drv.GetMetadata()
     if md['DMD_CREATIONOPTIONLIST'].find('BigTIFF') == -1:
-        return 'skip'
+        pytest.skip()
 
     ds = gdaltest.tiff_drv.Create('tmp/ovr22.tif', 170000, 100000, 1, options=['SPARSE_OK=YES'])
     ds = None
@@ -796,7 +791,7 @@ def test_tiff_ovr_22(both_endian):
 
     if err != 0:
         return 'success'
-    return 'fail'
+    pytest.fail()
 
 ###############################################################################
 # Same as before, but BigTIFF might be not needed as we use a compression
@@ -808,7 +803,7 @@ def test_tiff_ovr_23(both_endian):
     drv = gdal.GetDriverByName('GTiff')
     md = drv.GetMetadata()
     if md['DMD_CREATIONOPTIONLIST'].find('BigTIFF') == -1:
-        return 'skip'
+        pytest.skip()
 
     ds = gdaltest.tiff_drv.Create('tmp/ovr23.tif', 170000, 100000, 1, options=['SPARSE_OK=YES'])
     ds = None
@@ -845,7 +840,7 @@ def test_tiff_ovr_24(both_endian):
     drv = gdal.GetDriverByName('GTiff')
     md = drv.GetMetadata()
     if md['DMD_CREATIONOPTIONLIST'].find('BigTIFF') == -1:
-        return 'skip'
+        pytest.skip()
 
     ds = gdaltest.tiff_drv.Create('tmp/ovr24.tif', 85000, 100000, 1, options=['SPARSE_OK=YES'])
     ds = None
@@ -996,8 +991,7 @@ def test_tiff_ovr_29(both_endian):
 
     try:
         os.stat('tmp/ovr29.png.ovr')
-        gdaltest.post_reason('.ovr file still present')
-        return 'fail'
+        pytest.fail('.ovr file still present')
     except OSError:
         pass
 
@@ -1063,7 +1057,7 @@ def test_tiff_ovr_32(both_endian):
     drv = gdal.GetDriverByName('GTiff')
     md = drv.GetMetadata()
     if md['DMD_CREATIONOPTIONLIST'].find('BigTIFF') == -1:
-        return 'skip'
+        pytest.skip()
 
     # 4 regular band
     shutil.copyfile('data/stefan_full_rgba_photometric_rgb.tif', 'tmp/ovr32.tif')
@@ -1330,7 +1324,7 @@ def test_tiff_ovr_38(both_endian):
     # Skip with old libtiff (crash with 3.8.2)
     md = gdaltest.tiff_drv.GetMetadata()
     if md['DMD_CREATIONOPTIONLIST'].find('BigTIFF') == -1:
-        return 'skip'
+        pytest.skip()
 
     src_ds = gdal.Open('../gdrivers/data/n43.dt0')
     ds = gdaltest.tiff_drv.CreateCopy('tmp/ovr38.tif', src_ds, options=['COMPRESS=LZW', 'PREDICTOR=2'])
@@ -1524,7 +1518,7 @@ def test_tiff_ovr_43(both_endian):
 
     md = gdaltest.tiff_drv.GetMetadata()
     if md['DMD_CREATIONOPTIONLIST'].find('JPEG') == -1:
-        return 'skip'
+        pytest.skip()
 
     old_accum = gdal.GetConfigOption('CPL_ACCUM_ERROR_MSG', 'OFF')
     gdal.SetConfigOption('CPL_ACCUM_ERROR_MSG', 'ON')
@@ -1543,7 +1537,7 @@ def test_tiff_ovr_43(both_endian):
     if gdal.GetLastErrorMsg().find(
             'Unsupported JPEG data precision 12') != -1:
         sys.stdout.write('(12bit jpeg not available) ... ')
-        return 'skip'
+        pytest.skip()
 
     ds = gdaltest.tiff_drv.Create('tmp/ovr43.tif', 16, 16, 1, gdal.GDT_UInt16)
     ds.GetRasterBand(1).Fill(4000)
@@ -1636,10 +1630,10 @@ def test_tiff_ovr_46():
 
     md = gdaltest.tiff_drv.GetMetadata()
     if md['DMD_CREATIONOPTIONLIST'].find('BigTIFF') == -1:
-        return 'skip'
+        pytest.skip()
 
     if not gdaltest.run_slow_tests():
-        return 'skip'
+        pytest.skip()
 
     # Test NEAREST
     gdal.SetConfigOption('GTIFF_DONT_WRITE_BLOCKS', 'YES')
@@ -1835,7 +1829,7 @@ def test_tiff_ovr_51():
 
     src_ds = gdal.Open('data/stefan_full_rgba_pct32.png')
     if src_ds is None:
-        return 'skip'
+        pytest.skip()
 
     ds = gdal.GetDriverByName('PNG').CreateCopy('/vsimem/tiff_ovr_51.png', src_ds)
     ds.BuildOverviews('AVERAGE', [2])
@@ -1858,7 +1852,7 @@ def test_tiff_ovr_52():
 
     src_ds = gdal.Open('data/byte.tif')
     if src_ds is None:
-        return 'skip'
+        pytest.skip()
 
     gdal.GetDriverByName('GTiff').CreateCopy('/vsimem/tiff_ovr_52.tif', src_ds)
     gdal.SetConfigOption('COMPRESS_OVERVIEW', 'DEFLATE')
@@ -1909,7 +1903,7 @@ def test_tiff_ovr_53():
 
     src_ds = gdal.Open('data/byte.tif')
     if src_ds is None:
-        return 'skip'
+        pytest.skip()
 
     gdal.GetDriverByName('GTiff').CreateCopy('/vsimem/tiff_ovr_53.tif', src_ds)
     ds = gdal.Open('/vsimem/tiff_ovr_53.tif')
@@ -1965,7 +1959,7 @@ def test_tiff_ovr_54():
     drv = gdal.GetDriverByName('GTiff')
     md = drv.GetMetadata()
     if md['DMD_CREATIONOPTIONLIST'].find('JPEG') == -1:
-        return 'skip'
+        pytest.skip()
 
     src_ds = gdal.Open('../gdrivers/data/small_world.tif')
     gdal.GetDriverByName('GTiff').CreateCopy('/vsimem/tiff_ovr_54.tif', src_ds)
diff --git a/autotest/gcore/tiff_read.py b/autotest/gcore/tiff_read.py
index 47d97bc8064f..8edd8c80b52c 100755
--- a/autotest/gcore/tiff_read.py
+++ b/autotest/gcore/tiff_read.py
@@ -244,16 +244,15 @@ def test_tiff_read_ojpeg():
 
     md = gdal.GetDriverByName('GTiff').GetMetadata()
     if md['DMD_CREATIONOPTIONLIST'].find('JPEG') == -1:
-        return 'skip'
+        pytest.skip()
 
     gdal.PushErrorHandler('CPLQuietErrorHandler')
     ds = gdal.Open('data/zackthecat.tif')
     gdal.PopErrorHandler()
     if ds is None:
         if gdal.GetLastErrorMsg().find('Cannot open TIFF file due to missing codec') == 0:
-            return 'skip'
-        print(gdal.GetLastErrorMsg())
-        return 'fail'
+            pytest.skip()
+        pytest.fail(gdal.GetLastErrorMsg())
 
     gdal.PushErrorHandler('CPLQuietErrorHandler')
     got_cs = ds.GetRasterBand(1).Checksum()
@@ -290,8 +289,7 @@ def test_tiff_read_gzip():
 
     try:
         os.stat('data/byte.tif.gz.properties')
-        gdaltest.post_reason('did not expect data/byte.tif.gz.properties')
-        return 'fail'
+        pytest.fail('did not expect data/byte.tif.gz.properties')
     except OSError:
         return 'success'
 
@@ -438,7 +436,7 @@ def test_tiff_citation():
 
     build_info = gdal.VersionInfo('BUILD_INFO')
     if build_info.find('ESRI_BUILD=YES') == -1:
-        return 'skip'
+        pytest.skip()
 
     ds = gdal.Open('data/citation_mixedcase.tif')
     wkt = ds.GetProjectionRef()
@@ -544,7 +542,7 @@ def test_tiff_linearparmunits2():
 def test_tiff_g4_split():
 
     if 'GetBlockSize' not in dir(gdal.Band):
-        return 'skip'
+        pytest.skip()
 
     ds = gdal.Open('data/slim_g4.tif')
 
@@ -597,7 +595,7 @@ def test_tiff_vsimem():
     try:
         gdal.FileFromMemBuffer
     except AttributeError:
-        return 'skip'
+        pytest.skip()
 
     content = open('data/byte.tif', mode='rb').read()
 
@@ -635,7 +633,7 @@ def test_tiff_vsizip_and_mem():
     try:
         gdal.FileFromMemBuffer
     except AttributeError:
-        return 'skip'
+        pytest.skip()
 
     content = open('data/byte.tif.zip', mode='rb').read()
 
@@ -700,10 +698,9 @@ def test_tiff_12bitjpeg():
     if gdal.GetLastErrorMsg().find(
             'Unsupported JPEG data precision 12') != -1:
         sys.stdout.write('(12bit jpeg not available) ... ')
-        return 'skip'
+        pytest.skip()
     elif ds is None:
-        gdaltest.post_reason('failed to open 12bit jpeg file with unexpected error')
-        return 'fail'
+        pytest.fail('failed to open 12bit jpeg file with unexpected error')
 
     try:
         stats = ds.GetRasterBand(1).GetStatistics(0, 1)
@@ -741,8 +738,7 @@ def test_tiff_read_stats_from_pam():
     try:
         os.stat('data/byte.tif.aux.xml')
     except OSError:
-        gdaltest.post_reason('Expected generation of data/byte.tif.aux.xml')
-        return 'fail'
+        pytest.fail('Expected generation of data/byte.tif.aux.xml')
 
     ds = gdal.Open('data/byte.tif')
     # Just read statistics (from PAM) without forcing their computation
@@ -792,8 +788,7 @@ def test_tiff_read_from_tab():
 
     try:
         os.stat('tmp/tiff_read_from_tab.tab')
-        gdaltest.post_reason('did not expect to find .tab file at that point')
-        return 'fail'
+        pytest.fail('did not expect to find .tab file at that point')
     except OSError:
         pass
 
@@ -1042,7 +1037,7 @@ def test_tiff_read_exif_and_gps():
 def test_tiff_jpeg_rgba_pixel_interleaved():
     md = gdal.GetDriverByName('GTiff').GetMetadata()
     if md['DMD_CREATIONOPTIONLIST'].find('JPEG') == -1:
-        return 'skip'
+        pytest.skip()
 
     ds = gdal.Open('data/stefan_full_rgba_jpeg_contig.tif')
     md = ds.GetMetadata('IMAGE_STRUCTURE')
@@ -1066,7 +1061,7 @@ def test_tiff_jpeg_rgba_pixel_interleaved():
 def test_tiff_jpeg_rgba_band_interleaved():
     md = gdal.GetDriverByName('GTiff').GetMetadata()
     if md['DMD_CREATIONOPTIONLIST'].find('JPEG') == -1:
-        return 'skip'
+        pytest.skip()
 
     ds = gdal.Open('data/stefan_full_rgba_jpeg_separate.tif')
     md = ds.GetMetadata('IMAGE_STRUCTURE')
@@ -1090,10 +1085,10 @@ def test_tiff_jpeg_rgba_band_interleaved():
 def test_tiff_read_online_1():
     md = gdal.GetDriverByName('GTiff').GetMetadata()
     if md['DMD_CREATIONOPTIONLIST'].find('JPEG') == -1:
-        return 'skip'
+        pytest.skip()
 
     if not gdaltest.download_file('http://trac.osgeo.org/gdal/raw-attachment/ticket/3259/imgpb17.tif', 'imgpb17.tif'):
-        return 'skip'
+        pytest.skip()
 
     ds = gdal.Open('tmp/cache/imgpb17.tif')
     gdal.ErrorReset()
@@ -1114,11 +1109,10 @@ def test_tiff_read_online_1():
 def test_tiff_read_online_2():
 
     if gdal.GetDriverByName('HTTP') is None:
-        return 'skip'
+        pytest.skip()
 
     if gdaltest.gdalurlopen('http://download.osgeo.org/gdal/data/gtiff/utm.tif') is None:
-        print('cannot open URL')
-        return 'skip'
+        pytest.skip('cannot open URL')
 
     old_val = gdal.GetConfigOption('GTIFF_DIRECT_IO')
     gdal.SetConfigOption('GTIFF_DIRECT_IO', 'YES')
@@ -1153,7 +1147,7 @@ def test_tiff_read_huge4GB():
     # Need libtiff 4.X anyway
     md = gdal.GetDriverByName('GTiff').GetMetadata()
     if md['DMD_CREATIONOPTIONLIST'].find('BigTIFF') == -1:
-        return 'skip'
+        pytest.skip()
 
     if not gdaltest.filesystem_supports_sparse_files('tmp'):
         ds = gdal.Open('data/huge4GB.tif')
@@ -1167,7 +1161,7 @@ def test_tiff_read_huge4GB():
         ds = gdal.Open('tmp/huge4GB.tif')
         if ds is None:
             os.remove('tmp/huge4GB.tif')
-            return 'fail'
+            pytest.fail()
         ds = None
         os.remove('tmp/huge4GB.tif')
 
@@ -1181,7 +1175,7 @@ def test_tiff_read_bigtiff():
 
     md = gdal.GetDriverByName('GTiff').GetMetadata()
     if md['DMD_CREATIONOPTIONLIST'].find('BigTIFF') == -1:
-        return 'skip'
+        pytest.skip()
 
     ds = gdal.Open('data/byte_bigtiff_strip5lines.tif')
     cs = ds.GetRasterBand(1).Checksum()
@@ -1199,7 +1193,7 @@ def test_tiff_read_tiff_metadata():
 
     md = gdal.GetDriverByName('GTiff').GetMetadata()
     if md['DMD_CREATIONOPTIONLIST'].find('JPEG') == -1:
-        return 'skip'
+        pytest.skip()
 
     ds = gdal.Open('data/stefan_full_rgba_jpeg_contig.tif')
     assert ds.GetRasterBand(1).GetMetadataItem('BLOCK_OFFSET_0_0', 'TIFF') == '254'
@@ -1224,7 +1218,7 @@ def test_tiff_read_irregular_tile_size_jpeg_in_tiff():
 
     md = gdal.GetDriverByName('GTiff').GetMetadata()
     if md['DMD_CREATIONOPTIONLIST'].find('JPEG') == -1:
-        return 'skip'
+        pytest.skip()
 
     ds = gdal.Open('data/irregular_tile_size_jpeg_in_tiff.tif')
     gdal.ErrorReset()
@@ -1477,9 +1471,8 @@ def test_tiff_direct_and_virtual_mem_io():
                             print(i)
                             pytest.fail(gdal.GetDataTypeName(dt))
                     elif ref_data_native_type_whole != got_data_native_type_whole:
-                        print(option)
                         print(i)
-                        return 'fail'
+                        pytest.fail(option)
 
                     if ref_data_native_type_downsampled != got_data_native_type_downsampled:
                         print(option)
@@ -1530,19 +1523,17 @@ def test_tiff_direct_and_virtual_mem_io():
                             print(option)
                             pytest.fail(i)
                     elif ref_nbands_data_native_type_whole != got_nbands_data_native_type_whole:
-                        print(gdal.GetDataTypeName(dt))
                         print(option)
                         print(i)
-                        return 'fail'
+                        pytest.fail(gdal.GetDataTypeName(dt))
 
                     if truncated:
                         if got_nbands_data_native_type_pixel_interleaved_whole is not None:
                             print(option)
                             pytest.fail(i)
                     elif ref_nbands_data_native_type_pixel_interleaved_whole != got_nbands_data_native_type_pixel_interleaved_whole:
-                        print(option)
                         print(i)
-                        return 'fail'
+                        pytest.fail(option)
 
                     if truncated and got_nbands_data_native_type_bottom_right_downsampled is not None:
                         print(gdal.GetDataTypeName(dt))
@@ -1652,8 +1643,7 @@ def test_tiff_read_md1():
 
     try:
         os.stat('data/md_dg.tif.aux.xml')
-        gdaltest.post_reason('Expected not generation of data/md_dg.tif.aux.xml')
-        return 'fail'
+        pytest.fail('Expected not generation of data/md_dg.tif.aux.xml')
     except OSError:
         pass
 
@@ -1692,8 +1682,7 @@ def test_tiff_read_md2():
 
     try:
         os.stat('data/md_dg_2.tif.aux.xml')
-        gdaltest.post_reason('Expected not generation of data/md_dg_2.tif.aux.xml')
-        return 'fail'
+        pytest.fail('Expected not generation of data/md_dg_2.tif.aux.xml')
     except OSError:
         pass
 
@@ -1732,8 +1721,7 @@ def test_tiff_read_md3():
 
     try:
         os.stat('data/md_ge_rgb_0010000.tif.aux.xml')
-        gdaltest.post_reason('Expected not generation of data/md_ge_rgb_0010000.tif.aux.xml')
-        return 'fail'
+        pytest.fail('Expected not generation of data/md_ge_rgb_0010000.tif.aux.xml')
     except OSError:
         pass
 
@@ -1772,8 +1760,7 @@ def test_tiff_read_md4():
 
     try:
         os.stat('data/md_ov.tif.aux.xml')
-        gdaltest.post_reason('Expected not generation of data/md_ov.tif.aux.xml')
-        return 'fail'
+        pytest.fail('Expected not generation of data/md_ov.tif.aux.xml')
     except OSError:
         pass
 
@@ -1812,8 +1799,7 @@ def test_tiff_read_md5():
 
     try:
         os.stat('data/md_rdk1.tif.aux.xml')
-        gdaltest.post_reason('Expected not generation of data/md_rdk1.tif.aux.xml')
-        return 'fail'
+        pytest.fail('Expected not generation of data/md_rdk1.tif.aux.xml')
     except OSError:
         pass
 
@@ -1852,8 +1838,7 @@ def test_tiff_read_md6():
 
     try:
         os.stat('data/md_ls_b1.tif.aux.xml')
-        gdaltest.post_reason('Expected not generation of data/md_ls_b1.tif.aux.xml')
-        return 'fail'
+        pytest.fail('Expected not generation of data/md_ls_b1.tif.aux.xml')
     except OSError:
         pass
 
@@ -1892,8 +1877,7 @@ def test_tiff_read_md7():
 
     try:
         os.stat('data/spot/md_spot.tif.aux.xml')
-        gdaltest.post_reason('Expected not generation of data/spot/md_spot.tif.aux.xml')
-        return 'fail'
+        pytest.fail('Expected not generation of data/spot/md_spot.tif.aux.xml')
     except OSError:
         pass
 
@@ -1932,8 +1916,7 @@ def test_tiff_read_md8():
 
     try:
         os.stat('data/md_re.tif.aux.xml')
-        gdaltest.post_reason('Expected not generation of data/md_re.tif.aux.xml')
-        return 'fail'
+        pytest.fail('Expected not generation of data/md_re.tif.aux.xml')
     except OSError:
         pass
 
@@ -1971,8 +1954,7 @@ def test_tiff_read_md9():
 
     try:
         os.stat('data/alos/IMG-md_alos.tif.aux.xml')
-        gdaltest.post_reason('Expected not generation of data/alos/IMG-md_alos.tif.aux.xml')
-        return 'fail'
+        pytest.fail('Expected not generation of data/alos/IMG-md_alos.tif.aux.xml')
     except OSError:
         pass
 
@@ -2011,8 +1993,7 @@ def test_tiff_read_md10():
 
     try:
         os.stat('data/md_eros.tif.aux.xml')
-        gdaltest.post_reason('Expected not generation of data/md_eros.tif.aux.xml')
-        return 'fail'
+        pytest.fail('Expected not generation of data/md_eros.tif.aux.xml')
     except OSError:
         pass
 
@@ -2051,8 +2032,7 @@ def test_tiff_read_md11():
 
     try:
         os.stat('data/md_kompsat.tif.aux.xml')
-        gdaltest.post_reason('Expected not generation of data/md_kompsat.tif.aux.xml')
-        return 'fail'
+        pytest.fail('Expected not generation of data/md_kompsat.tif.aux.xml')
     except OSError:
         pass
 
@@ -2090,8 +2070,7 @@ def test_tiff_read_md12():
 
     try:
         os.stat('data/md_kompsat.tif.aux.xml')
-        gdaltest.post_reason('Expected not generation of data/md_kompsat.tif.aux.xml')
-        return 'fail'
+        pytest.fail('Expected not generation of data/md_kompsat.tif.aux.xml')
     except OSError:
         pass
 
@@ -2129,7 +2108,7 @@ def test_tiff_read_empty_nodata_tag():
 def test_tiff_read_strace_check():
 
     if not sys.platform.startswith('linux'):
-        return 'skip'
+        pytest.skip()
 
     python_exe = sys.executable
     cmd = "strace -f %s -c \"from osgeo import gdal; " % python_exe + (
@@ -2143,7 +2122,7 @@ def test_tiff_read_strace_check():
         (_, err) = gdaltest.runexternal_out_and_err(cmd)
     except:
         # strace not available
-        return 'skip'
+        pytest.skip()
 
     lines_with_dotdot_gcore = []
     for line in err.split('\n'):
@@ -2178,7 +2157,7 @@ def test_tiff_read_readdir_limit_on_open():
 def test_tiff_read_minisblack_as_rgba():
 
     if not gdaltest.supports_force_rgba:
-        return 'skip'
+        pytest.skip()
 
     gdal.SetConfigOption('GTIFF_FORCE_RGBA', 'YES')
     ds = gdal.Open('data/byte.tif')
@@ -2196,7 +2175,7 @@ def test_tiff_read_minisblack_as_rgba():
 def test_tiff_read_colortable_as_rgba():
 
     if not gdaltest.supports_force_rgba:
-        return 'skip'
+        pytest.skip()
 
     gdal.SetConfigOption('GTIFF_FORCE_RGBA', 'YES')
     ds = gdal.Open('data/test_average_palette.tif')
@@ -2214,7 +2193,7 @@ def test_tiff_read_colortable_as_rgba():
 def test_tiff_read_logl_as_rgba():
 
     if not gdaltest.supports_force_rgba:
-        return 'skip'
+        pytest.skip()
 
     gdal.SetConfigOption('GTIFF_FORCE_RGBA', 'YES')
     ds = gdal.Open('data/uint16_sgilog.tif')
@@ -2233,7 +2212,7 @@ def test_tiff_read_logl_as_rgba():
 def test_tiff_read_strip_separate_as_rgba():
 
     if not gdaltest.supports_force_rgba:
-        return 'skip'
+        pytest.skip()
 
     # 3 band
     gdal.Translate('/vsimem/tiff_read_strip_separate_as_rgba.tif',
@@ -2271,7 +2250,7 @@ def test_tiff_read_strip_separate_as_rgba():
 def test_tiff_read_tiled_separate_as_rgba():
 
     if not gdaltest.supports_force_rgba:
-        return 'skip'
+        pytest.skip()
 
     # 3 band
     gdal.Translate('/vsimem/tiff_read_tiled_separate_as_rgba.tif',
@@ -2586,8 +2565,7 @@ def test_tiff_read_corrupted_jpeg_cloud_optimized():
     if cs1 == 0:
         print('Expected error while writing overview with libjpeg-6b')
     elif cs1 != 1133:
-        print(cs1)
-        return 'fail'
+        pytest.fail(cs1)
 
     return 'success'
 
@@ -2785,7 +2763,7 @@ def test_tiff_read_unknown_compression():
 def test_tiff_read_leak_ZIPSetupDecode():
 
     if not check_libtiff_internal_or_at_least(4, 0, 8):
-        return 'skip'
+        pytest.skip()
 
     with gdaltest.error_handler():
         ds = gdal.Open('data/leak-ZIPSetupDecode.tif')
@@ -2800,7 +2778,7 @@ def test_tiff_read_leak_ZIPSetupDecode():
 def test_tiff_read_excessive_memory_TIFFFillStrip():
 
     if not check_libtiff_internal_or_at_least(4, 0, 8):
-        return 'skip'
+        pytest.skip()
 
     with gdaltest.error_handler():
         ds = gdal.Open('data/excessive-memory-TIFFFillStrip.tif')
@@ -2815,7 +2793,7 @@ def test_tiff_read_excessive_memory_TIFFFillStrip():
 def test_tiff_read_excessive_memory_TIFFFillStrip2():
 
     if not check_libtiff_internal_or_at_least(4, 0, 8):
-        return 'skip'
+        pytest.skip()
 
     with gdaltest.error_handler():
         ds = gdal.Open('data/excessive-memory-TIFFFillStrip2.tif')
@@ -2829,7 +2807,7 @@ def test_tiff_read_excessive_memory_TIFFFillStrip2():
 def test_tiff_read_excessive_memory_TIFFFillTile():
 
     if not check_libtiff_internal_or_at_least(4, 0, 8):
-        return 'skip'
+        pytest.skip()
 
     with gdaltest.error_handler():
         ds = gdal.Open('data/excessive-memory-TIFFFillTile.tif')
@@ -2843,11 +2821,11 @@ def test_tiff_read_excessive_memory_TIFFFillTile():
 def test_tiff_read_big_strip():
 
     if not check_libtiff_internal_or_at_least(4, 0, 8):
-        return 'skip'
+        pytest.skip()
 
     gdal.Translate('/vsimem/test.tif', 'data/byte.tif', options='-co compress=lzw -outsize 10000 2000  -co blockysize=2000 -r bilinear -ot float32')
     if gdal.GetLastErrorMsg().find('cannot allocate') >= 0:
-        return 'skip'
+        pytest.skip()
     ds = gdal.Open('/vsimem/test.tif')
     assert ds.GetRasterBand(1).Checksum() == 2676
     ds = None
@@ -2876,11 +2854,11 @@ def test_tiff_read_big_strip_chunky_way():
 def test_tiff_read_big_tile():
 
     if not check_libtiff_internal_or_at_least(4, 0, 8):
-        return 'skip'
+        pytest.skip()
 
     gdal.Translate('/vsimem/test.tif', 'data/byte.tif', options='-co compress=lzw -outsize 10000 2000 -co tiled=yes -co blockxsize=10000 -co blockysize=2000 -r bilinear -ot float32')
     if gdal.GetLastErrorMsg().find('cannot allocate') >= 0:
-        return 'skip'
+        pytest.skip()
     ds = gdal.Open('/vsimem/test.tif')
     assert ds.GetRasterBand(1).Checksum() == 2676
     ds = None
@@ -2906,7 +2884,7 @@ def test_tiff_read_huge_number_strips():
 
     md = gdal.GetDriverByName('GTiff').GetMetadata()
     if md['LIBTIFF'] != 'INTERNAL':
-        return 'skip'
+        pytest.skip()
 
     with gdaltest.error_handler():
         ds = gdal.Open('data/huge-number-strips.tif')
@@ -2920,7 +2898,7 @@ def test_tiff_read_huge_number_strips():
 def test_tiff_read_huge_implied_number_strips():
 
     if not check_libtiff_internal_or_at_least(4, 0, 10):
-        return 'skip'
+        pytest.skip()
 
     with gdaltest.error_handler():
         gdal.Open('data/huge-implied-number-strips.tif')
@@ -2934,11 +2912,11 @@ def test_tiff_read_many_blocks():
 
     # Runs super slow on some Windows configs
     if sys.platform == 'win32':
-        return 'skip'
+        pytest.skip()
 
     md = gdal.GetDriverByName('GTiff').GetMetadata()
     if md['LIBTIFF'] != 'INTERNAL':
-        return 'skip'
+        pytest.skip()
 
     ds = gdal.GetDriverByName('GTiff').Create('/vsimem/test.tif', 1, 2000000, options=['BLOCKYSIZE=1'])
     ds = None
@@ -2956,7 +2934,7 @@ def test_tiff_read_many_blocks_truncated():
 
     md = gdal.GetDriverByName('GTiff').GetMetadata()
     if md['LIBTIFF'] != 'INTERNAL':
-        return 'skip'
+        pytest.skip()
 
     ds = gdal.Open('data/many_blocks_truncated.tif')
     with gdaltest.error_handler():
@@ -2985,7 +2963,7 @@ def test_tiff_read_uint33():
 def test_tiff_read_corrupted_deflate_singlestrip():
 
     if not check_libtiff_internal_or_at_least(4, 0, 8):
-        return 'skip'
+        pytest.skip()
 
     with gdaltest.error_handler():
         ds = gdal.Open('data/corrupted_deflate_singlestrip.tif')
@@ -3000,7 +2978,7 @@ def test_tiff_read_corrupted_deflate_singlestrip():
 def test_tiff_read_packbits_not_enough_data():
 
     if not check_libtiff_internal_or_at_least(4, 0, 8):
-        return 'skip'
+        pytest.skip()
 
     with gdaltest.error_handler():
         ds = gdal.Open('data/packbits-not-enough-data.tif')
@@ -3112,7 +3090,7 @@ def test_tiff_read_stripoffset_types():
 def test_tiff_read_progressive_jpeg_denial_of_service():
 
     if not check_libtiff_internal_or_at_least(4, 0, 9):
-        return 'skip'
+        pytest.skip()
 
     # Should error out with 'JPEGPreDecode:Reading this strip would require
     # libjpeg to allocate at least...'
@@ -3142,7 +3120,7 @@ def test_tiff_read_progressive_jpeg_denial_of_service():
 def test_tiff_read_old_style_lzw():
 
     if not check_libtiff_internal_or_at_least(4, 0, 8):
-        return 'skip'
+        pytest.skip()
 
     ds = gdal.Open('data/quad-lzw-old-style.tif')
     # Shut down warning about old style LZW
@@ -3199,7 +3177,7 @@ def test_tiff_read_mmap_interface():
 def test_tiff_read_jpeg_too_big_last_stripe():
 
     if not check_libtiff_internal_or_at_least(4, 0, 9):
-        return 'skip'
+        pytest.skip()
 
     ds = gdal.Open('data/tif_jpeg_too_big_last_stripe.tif')
     with gdaltest.error_handler():
@@ -3241,7 +3219,7 @@ def test_tiff_read_zstd():
 
     md = gdal.GetDriverByName('GTiff').GetMetadata()
     if md['DMD_CREATIONOPTIONLIST'].find('ZSTD') == -1:
-        return 'skip'
+        pytest.skip()
 
     ut = gdaltest.GDALTest('GTiff', 'byte_zstd.tif', 1, 4672)
     return ut.testOpen()
@@ -3254,7 +3232,7 @@ def test_tiff_read_zstd_corrupted():
 
     md = gdal.GetDriverByName('GTiff').GetMetadata()
     if md['DMD_CREATIONOPTIONLIST'].find('ZSTD') == -1:
-        return 'skip'
+        pytest.skip()
 
     ut = gdaltest.GDALTest('GTiff', 'byte_zstd_corrupted.tif', 1, 0)
     with gdaltest.error_handler():
@@ -3268,7 +3246,7 @@ def test_tiff_read_zstd_corrupted2():
 
     md = gdal.GetDriverByName('GTiff').GetMetadata()
     if md['DMD_CREATIONOPTIONLIST'].find('ZSTD') == -1:
-        return 'skip'
+        pytest.skip()
 
     ut = gdaltest.GDALTest('GTiff', 'byte_zstd_corrupted2.tif', 1, 0)
     with gdaltest.error_handler():
@@ -3283,7 +3261,7 @@ def test_tiff_read_webp():
 
     md = gdal.GetDriverByName('GTiff').GetMetadata()
     if md['DMD_CREATIONOPTIONLIST'].find('WEBP') == -1:
-        return 'skip'
+        pytest.skip()
     stats = (0, 215, 66.38, 47.186)
     ut = gdaltest.GDALTest('GTiff', 'tif_webp.tif', 1, None)
     success = ut.testOpen(check_approx_stat=stats, stat_epsilon=1)
@@ -3298,7 +3276,7 @@ def test_tiff_read_webp_huge_single_strip():
 
     md = gdal.GetDriverByName('GTiff').GetMetadata()
     if md['DMD_CREATIONOPTIONLIST'].find('WEBP') == -1:
-        return 'skip'
+        pytest.skip()
     ds = gdal.Open('data/tif_webp_huge_single_strip.tif')
     assert ds.GetRasterBand(1).Checksum() != 0
 
@@ -3321,7 +3299,7 @@ def test_tiff_read_lerc():
 
     md = gdal.GetDriverByName('GTiff').GetMetadata()
     if md['DMD_CREATIONOPTIONLIST'].find('LERC') == -1:
-        return 'skip'
+        pytest.skip()
 
     ut = gdaltest.GDALTest('GTiff', 'byte_lerc.tif', 1, 4672)
     return ut.testOpen()
diff --git a/autotest/gcore/tiff_write.py b/autotest/gcore/tiff_write.py
index 234b333199aa..a8785efd0740 100755
--- a/autotest/gcore/tiff_write.py
+++ b/autotest/gcore/tiff_write.py
@@ -120,7 +120,7 @@ def test_tiff_write_4():
     try:
         from osgeo import gdalnumeric
     except ImportError:
-        return 'skip'
+        pytest.skip()
 
     options = ['TILED=YES', 'BLOCKXSIZE=32', 'BLOCKYSIZE=32']
 
@@ -234,7 +234,7 @@ def test_tiff_write_6():
 
     md = gdaltest.tiff_drv.GetMetadata()
     if md['DMD_CREATIONOPTIONLIST'].find('BigTIFF') == -1:
-        return 'skip'
+        pytest.skip()
 
     options = ['TILED=YES', 'BLOCKXSIZE=32', 'BLOCKYSIZE=32',
                'COMPRESS=DEFLATE', 'PREDICTOR=2']
@@ -252,8 +252,7 @@ def test_tiff_write_6():
 
     if buf_read != buf:
         gdaltest.tiff_write_6_failed = True
-        gdaltest.post_reason('did not get back expected data.')
-        return 'fail'
+        pytest.fail('did not get back expected data.')
 
     ds = None
 
@@ -272,7 +271,7 @@ def test_tiff_write_7():
 
     md = gdaltest.tiff_drv.GetMetadata()
     if md['DMD_CREATIONOPTIONLIST'].find('BigTIFF') == -1:
-        return 'skip'
+        pytest.skip()
 
     options = ['TILED=YES', 'COMPRESS=LZW', 'PREDICTOR=2']
     ds = gdaltest.tiff_drv.Create('tmp/test_7.tif', 200, 200, 1,
@@ -374,7 +373,7 @@ def test_tiff_write_12():
 
     md = gdaltest.tiff_drv.GetMetadata()
     if md['DMD_CREATIONOPTIONLIST'].find('JPEG') == -1:
-        return 'skip'
+        pytest.skip()
 
     ds = gdal.Open('data/sasha.tif')
     cs = ds.GetRasterBand(3).Checksum()
@@ -390,7 +389,7 @@ def test_tiff_write_13():
 
     md = gdaltest.tiff_drv.GetMetadata()
     if md['DMD_CREATIONOPTIONLIST'].find('JPEG') == -1:
-        return 'skip'
+        pytest.skip()
 
     src_ds = gdal.Open('data/sasha.tif')
     ds = gdaltest.tiff_drv.CreateCopy('tmp/sasha.tif', src_ds, options=['PROFILE=BASELINE',
@@ -508,8 +507,7 @@ def test_tiff_write_16():
         try:
             os.stat('tmp/tw_16.tif.aux.xml')
         except OSError:
-            gdaltest.post_reason('No .aux.xml file.')
-            return 'fail'
+            pytest.fail('No .aux.xml file.')
 
     ds = gdal.Open('tmp/tw_16.tif')
 
@@ -704,16 +702,14 @@ def test_tiff_write_rpc_txt():
     # confirm there is no .RPB file created by default.
     try:
         open('tmp/tiff_write_rpc_txt.RPB').read()
-        gdaltest.post_reason('unexpectedly found .RPB file')
-        return 'fail'
+        pytest.fail('unexpectedly found .RPB file')
     except IOError:
         pass
 
     try:
         open('tmp/tiff_write_rpc_txt_RPC.TXT').read()
     except IOError:
-        gdaltest.post_reason('missing _RPC.TXT file.')
-        return 'fail'
+        pytest.fail('missing _RPC.TXT file.')
 
     # Open the dataset, and confirm the RPC data is still intact.
     ds = gdal.Open('tmp/tiff_write_rpc_txt.tif')
@@ -728,8 +724,7 @@ def test_tiff_write_rpc_txt():
     # file list functionality is not working properly.
     try:
         open('tmp/tiff_write_rpc_txt_RPC.TXT').read()
-        gdaltest.post_reason('_RPC.TXT did not get cleaned up.')
-        return 'fail'
+        pytest.fail('_RPC.TXT did not get cleaned up.')
     except IOError:
         pass
 
@@ -754,14 +749,12 @@ def test_tiff_write_rpc_in_pam():
     try:
         os.stat('tmp/tiff_write_rpc_in_pam.tif.aux.xml')
     except OSError:
-        gdaltest.post_reason('missing .aux.xml file.')
-        return 'fail'
+        pytest.fail('missing .aux.xml file.')
 
     # confirm there is no .RPB file created.
     try:
         open('tmp/tiff_write_rpc_txt.RPB').read()
-        gdaltest.post_reason('unexpectedly found .RPB file')
-        return 'fail'
+        pytest.fail('unexpectedly found .RPB file')
     except IOError:
         pass
 
@@ -836,8 +829,7 @@ def test_tiff_write_20():
 
     try:
         os.stat('tmp/tags.tif.aux.xml')
-        gdaltest.post_reason('did not expected .aux.xml file')
-        return 'fail'
+        pytest.fail('did not expected .aux.xml file')
     except OSError:
         pass
 
@@ -858,8 +850,7 @@ def test_tiff_write_20():
 
     try:
         os.stat('tmp/tags.tif.aux.xml')
-        gdaltest.post_reason('did not expected .aux.xml file')
-        return 'fail'
+        pytest.fail('did not expected .aux.xml file')
     except OSError:
         pass
 
@@ -1166,7 +1157,7 @@ def test_tiff_write_30():
 
     md = gdaltest.tiff_drv.GetMetadata()
     if md['DMD_CREATIONOPTIONLIST'].find('BigTIFF') == -1:
-        return 'skip'
+        pytest.skip()
 
     ds = gdaltest.tiff_drv.Create('tmp/bigtiff.tif', 1, 1, 1, options=['BigTIFF=YES'])
     ds = None
@@ -1196,7 +1187,7 @@ def test_tiff_write_31():
 
     md = gdaltest.tiff_drv.GetMetadata()
     if md['DMD_CREATIONOPTIONLIST'].find('BigTIFF') == -1:
-        return 'skip'
+        pytest.skip()
 
     ds = gdaltest.tiff_drv.Create('tmp/bigtiff.tif', 100000, 100000, 1,
                                   options=['SPARSE_OK=TRUE'])
@@ -1290,8 +1281,7 @@ def test_tiff_write_33():
         try:
             os.stat('tmp/tw_33.tif.aux.xml')
         except OSError:
-            gdaltest.post_reason('No .aux.xml file.')
-            return 'fail'
+            pytest.fail('No .aux.xml file.')
 
     ds = gdal.Open('tmp/tw_33.tif')
 
@@ -1337,8 +1327,7 @@ def test_tiff_write_34():
         try:
             os.stat('tmp/tw_34.tif.aux.xml')
         except OSError:
-            gdaltest.post_reason('No .aux.xml file.')
-            return 'fail'
+            pytest.fail('No .aux.xml file.')
 
     ds = gdal.Open('tmp/tw_34.tif')
 
@@ -1395,8 +1384,7 @@ def test_tiff_write_35():
     try:
         os.stat('tmp/tw_35.tif.aux.xml')
     except OSError:
-        gdaltest.post_reason('No .aux.xml file.')
-        return 'fail'
+        pytest.fail('No .aux.xml file.')
 
     gdal.PushErrorHandler('CPLQuietErrorHandler')
     ds = gdal.Open('tmp/tw_35.tif')
@@ -1853,7 +1841,7 @@ def test_tiff_write_54():
 
     md = gdaltest.tiff_drv.GetMetadata()
     if md['DMD_CREATIONOPTIONLIST'].find('JPEG') == -1:
-        return 'skip'
+        pytest.skip()
 
     ds = gdaltest.tiff_drv.Create('tmp/tiff_write_54.tif',
                                   256, 256, 3,
@@ -1907,7 +1895,7 @@ def test_tiff_write_56():
     md = gdaltest.tiff_drv.GetMetadata()
     # Expected to fail with libtiff < 4.0 as it needs TIFFUnsetField, so skip it
     if md['DMD_CREATIONOPTIONLIST'].find('BigTIFF') == -1:
-        return 'skip'
+        pytest.skip()
 
     test_ct_data = [(255, 0, 0), (0, 255, 0), (0, 0, 255), (255, 255, 255, 0)]
 
@@ -1948,7 +1936,7 @@ def test_tiff_write_57():
     md = gdaltest.tiff_drv.GetMetadata()
     # Expected to fail with libtiff < 4.0 as it needs TIFFUnsetField, so skip it
     if md['DMD_CREATIONOPTIONLIST'].find('BigTIFF') == -1:
-        return 'skip'
+        pytest.skip()
 
     # copy a file to tmp dir to modify.
     open('tmp/tiff57.tif', 'wb').write(open('data/byte.tif', 'rb').read())
@@ -2071,8 +2059,7 @@ def test_tiff_write_60():
 
         try:
             os.stat(options_tuple[1])
-            gdaltest.post_reason('%s should have been deleted' % options_tuple[1])
-            return 'fail'
+            pytest.fail('%s should have been deleted' % options_tuple[1])
         except OSError:
             pass
 
@@ -2094,8 +2081,7 @@ def test_tiff_write_60():
 
         try:
             os.stat(options_tuple[1])
-            gdaltest.post_reason('%s should have been deleted' % options_tuple[1])
-            return 'fail'
+            pytest.fail('%s should have been deleted' % options_tuple[1])
         except OSError:
             pass
 
@@ -2109,7 +2095,7 @@ def test_tiff_write_61():
 
     md = gdaltest.tiff_drv.GetMetadata()
     if md['DMD_CREATIONOPTIONLIST'].find('BigTIFF') == -1:
-        return 'skip'
+        pytest.skip()
 
     ds = gdaltest.tiff_drv.Create('tmp/bigtiff.tif', 50000, 50000, 1,
                                   options=['BIGTIFF=IF_NEEDED', 'SPARSE_OK=TRUE'])
@@ -2140,7 +2126,7 @@ def test_tiff_write_62():
 
     md = gdaltest.tiff_drv.GetMetadata()
     if md['DMD_CREATIONOPTIONLIST'].find('BigTIFF') == -1:
-        return 'skip'
+        pytest.skip()
 
     ds = gdaltest.tiff_drv.Create('tmp/bigtiff.tif', 50000, 50000, 1,
                                   options=['BIGTIFF=IF_SAFER', 'SPARSE_OK=TRUE'])
@@ -2171,9 +2157,9 @@ def test_tiff_write_63():
 
     md = gdaltest.tiff_drv.GetMetadata()
     if md['DMD_CREATIONOPTIONLIST'].find('BigTIFF') == -1:
-        return 'skip'
+        pytest.skip()
     if int(gdal.VersionInfo('VERSION_NUM')) < 1700:
-        return 'skip'
+        pytest.skip()
 
     gdal.PushErrorHandler('CPLQuietErrorHandler')
     ds = gdaltest.tiff_drv.Create('tmp/bigtiff.tif', 150000, 150000, 1,
@@ -2183,7 +2169,7 @@ def test_tiff_write_63():
     if ds is None:
         return 'success'
 
-    return 'fail'
+    pytest.fail()
 
 ###############################################################################
 # Test returned projection in WKT format for a WGS84 GeoTIFF (#2787)
@@ -2239,7 +2225,7 @@ def test_tiff_write_65():
 def test_tiff_write_66():
 
     if gdal.GetConfigOption('SKIP_MEM_INTENSIVE_TEST') is not None:
-        return 'skip'
+        pytest.skip()
 
     ds = gdaltest.tiff_drv.Create('tmp/tiff_write_66.tif', 1, 1, 65535, options=['INTERLEAVE=BAND'])
     ds = None
@@ -2264,7 +2250,7 @@ def test_tiff_write_66():
 def test_tiff_write_67():
 
     if gdal.GetConfigOption('SKIP_MEM_INTENSIVE_TEST') is not None:
-        return 'skip'
+        pytest.skip()
 
     ds = gdaltest.tiff_drv.Create('tmp/tiff_write_67.tif', 1, 1, 65535, options=['INTERLEAVE=PIXEL'])
     ds = None
@@ -2358,7 +2344,7 @@ def test_tiff_write_70():
 
     try:
         os.stat('tmp/tiff_write_70.tif.aux.xml')
-        return 'fail'
+        pytest.fail()
     except OSError:
         pass
 
@@ -2381,12 +2367,12 @@ def test_tiff_write_71():
 
     md = gdaltest.tiff_drv.GetMetadata()
     if md['DMD_CREATIONOPTIONLIST'].find('BigTIFF') == -1:
-        return 'skip'
+        pytest.skip()
 
     # Determine if the filesystem supports sparse files (we don't want to create a real 10 GB
     # file !
     if not gdaltest.filesystem_supports_sparse_files('tmp'):
-        return 'skip'
+        pytest.skip()
 
     header = open('data/bigtiff_header_extract.tif', 'rb').read()
 
@@ -2512,7 +2498,7 @@ def test_tiff_write_74():
 
     md = gdaltest.tiff_drv.GetMetadata()
     if md['DMD_CREATIONOPTIONLIST'].find('JPEG') == -1:
-        return 'skip'
+        pytest.skip()
 
     old_accum = gdal.GetConfigOption('CPL_ACCUM_ERROR_MSG', 'OFF')
     gdal.SetConfigOption('CPL_ACCUM_ERROR_MSG', 'ON')
@@ -2531,7 +2517,7 @@ def test_tiff_write_74():
     if gdal.GetLastErrorMsg().find(
             'Unsupported JPEG data precision 12') != -1:
         sys.stdout.write('(12bit jpeg not available) ... ')
-        return 'skip'
+        pytest.skip()
 
     for photometric in ('YCBCR', 'RGB'):
 
@@ -2667,7 +2653,7 @@ def test_tiff_write_78():
 
     md = gdaltest.tiff_drv.GetMetadata()
     if md['DMD_CREATIONOPTIONLIST'].find('JPEG') == -1:
-        return 'skip'
+        pytest.skip()
 
     src_ds = gdaltest.tiff_drv.Create('tmp/tiff_write_78_src.tif', 16, 2048, 3)
     src_ds.GetRasterBand(2).Fill(255)
@@ -2755,8 +2741,7 @@ def test_tiff_write_79():
             try:
                 # check that it doesn't go to PAM
                 os.stat('tmp/tiff_write_79.tif.aux.xml')
-                gdaltest.post_reason('got to PAM')
-                return 'fail'
+                pytest.fail('got to PAM')
             except OSError:
                 pass
 
@@ -2782,8 +2767,7 @@ def test_tiff_write_79():
             try:
                 # check that it doesn't go to PAM
                 os.stat('tmp/tiff_write_79.tif.aux.xml')
-                gdaltest.post_reason('got to PAM')
-                return 'fail'
+                pytest.fail('got to PAM')
             except OSError:
                 pass
 
@@ -2836,8 +2820,7 @@ def test_tiff_write_80():
     try:
         # check that it doesn't go to PAM
         os.stat('tmp/tiff_write_80.tif.aux.xml')
-        gdaltest.post_reason('got to PAM, but not expected...')
-        return 'fail'
+        pytest.fail('got to PAM, but not expected...')
     except OSError:
         pass
 
@@ -2890,8 +2873,7 @@ def test_tiff_write_80():
         # check that it *goes* to PAM
         os.stat('tmp/tiff_write_80_bis.tif.aux.xml')
     except OSError:
-        gdaltest.post_reason('did not go to PAM as expected')
-        return 'fail'
+        pytest.fail('did not go to PAM as expected')
 
     ds = gdal.Open('tmp/tiff_write_80_bis.tif')
     scale = ds.GetRasterBand(1).GetScale()
@@ -2909,8 +2891,7 @@ def test_tiff_write_80():
     try:
         # check that there is no more any PAM file
         os.stat('tmp/tiff_write_80_bis.tif.aux.xml')
-        gdaltest.post_reason('PAM file should be deleted')
-        return 'fail'
+        pytest.fail('PAM file should be deleted')
     except OSError:
         pass
 
@@ -3025,10 +3006,10 @@ def test_tiff_write_84():
 
     # Crashes with libtiff < 4.0
     if md['DMD_CREATIONOPTIONLIST'].find('BigTIFF') == -1:
-        return 'skip'
+        pytest.skip()
 
     if md['DMD_CREATIONOPTIONLIST'].find('JPEG') == -1:
-        return 'skip'
+        pytest.skip()
 
     with gdaltest.SetCacheMax(0):
         ds = gdal.GetDriverByName('GTiff').Create('tmp/tiff_write_84.tif', 128, 128, 3)
@@ -3068,8 +3049,7 @@ def test_tiff_write_85():
     try:
         # check that it doesn't go to PAM
         os.stat('tmp/tiff_write_85.tif.aux.xml')
-        gdaltest.post_reason('got to PAM, but not expected...')
-        return 'fail'
+        pytest.fail('got to PAM, but not expected...')
     except OSError:
         pass
 
@@ -3114,8 +3094,7 @@ def test_tiff_write_85():
         # check that it *goes* to PAM
         os.stat('tmp/tiff_write_85_bis.tif.aux.xml')
     except OSError:
-        gdaltest.post_reason('did not go to PAM as expected')
-        return 'fail'
+        pytest.fail('did not go to PAM as expected')
 
     ds = gdal.Open('tmp/tiff_write_85_bis.tif')
     unittype = ds.GetRasterBand(1).GetUnitType()
@@ -3130,8 +3109,7 @@ def test_tiff_write_85():
     try:
         # check that there is no more any PAM file
         os.stat('tmp/tiff_write_85_bis.tif.aux.xml')
-        gdaltest.post_reason('PAM file should be deleted')
-        return 'fail'
+        pytest.fail('PAM file should be deleted')
     except OSError:
         pass
 
@@ -3168,7 +3146,7 @@ def test_tiff_write_86():
 
     if ds.GetMetadataItem('BaseTest') != 'Value':
         gdaltest.post_value('missing metadata(1)')
-        return 'fail'
+        pytest.fail()
     ds = None
 
     # After removing the pam file is it gone, but the conventional
@@ -3182,7 +3160,7 @@ def test_tiff_write_86():
 
     if ds.GetMetadataItem('BaseTest') != 'Value':
         gdaltest.post_value('missing metadata(2)')
-        return 'fail'
+        pytest.fail()
 
     ds = None
 
@@ -3203,7 +3181,7 @@ def test_tiff_write_86():
 
     if ds.GetMetadataItem('BaseTest') != 'Value':
         gdaltest.post_value('missing metadata(1cc)')
-        return 'fail'
+        pytest.fail()
     ds = None
 
     # After removing the pam file is it gone, but the conventional
@@ -3216,7 +3194,7 @@ def test_tiff_write_86():
 
     if ds.GetMetadataItem('BaseTest') != 'Value':
         gdaltest.post_value('missing metadata(2cc)')
-        return 'fail'
+        pytest.fail()
 
     ds = None
 
@@ -3264,8 +3242,7 @@ def test_tiff_write_87():
         _, errors, _ = validate_cloud_optimized_geotiff.validate('tmp/tiff_write_87_dst.tif', check_tiled=False)
         assert not errors, 'validate_cloud_optimized_geotiff failed'
     except OSError:
-        gdaltest.post_reason('validate_cloud_optimized_geotiff failed')
-        return 'fail'
+        pytest.fail('validate_cloud_optimized_geotiff failed')
 
     gdaltest.tiff_drv.Delete('tmp/tiff_write_87_src.tif')
     gdaltest.tiff_drv.Delete('tmp/tiff_write_87_dst.tif')
@@ -3287,7 +3264,7 @@ def test_tiff_write_87():
 def test_tiff_write_88():
     md = gdaltest.tiff_drv.GetMetadata()
     if md['DMD_CREATIONOPTIONLIST'].find('BigTIFF') == -1:
-        return 'skip'
+        pytest.skip()
 
     # The file would be > 4.2 GB without SPARSE_OK
     src_ds = gdaltest.tiff_drv.Create('tmp/tiff_write_88_src.tif', 60000, 60000, 1,
@@ -3345,10 +3322,10 @@ def test_tiff_write_88():
 def test_tiff_write_89():
     md = gdaltest.tiff_drv.GetMetadata()
     if md['DMD_CREATIONOPTIONLIST'].find('BigTIFF') == -1:
-        return 'skip'
+        pytest.skip()
 
     if md['DMD_CREATIONOPTIONLIST'].find('JPEG') == -1:
-        return 'skip'
+        pytest.skip()
 
     last_size = 0
     for quality in [90, 75, 30]:
@@ -3399,10 +3376,10 @@ def test_tiff_write_89():
 def test_tiff_write_90():
     md = gdaltest.tiff_drv.GetMetadata()
     if md['DMD_CREATIONOPTIONLIST'].find('BigTIFF') == -1:
-        return 'skip'
+        pytest.skip()
 
     if md['DMD_CREATIONOPTIONLIST'].find('JPEG') == -1:
-        return 'skip'
+        pytest.skip()
 
     last_size = 0
     for quality in [90, 75, 30]:
@@ -3443,10 +3420,10 @@ def test_tiff_write_90():
 def test_tiff_write_91():
     md = gdaltest.tiff_drv.GetMetadata()
     if md['DMD_CREATIONOPTIONLIST'].find('BigTIFF') == -1:
-        return 'skip'
+        pytest.skip()
 
     if md['DMD_CREATIONOPTIONLIST'].find('JPEG') == -1:
-        return 'skip'
+        pytest.skip()
 
     last_size = 0
     for quality in [90, 75, 30]:
@@ -3493,10 +3470,10 @@ def test_tiff_write_91():
 def test_tiff_write_92():
     md = gdaltest.tiff_drv.GetMetadata()
     if md['DMD_CREATIONOPTIONLIST'].find('BigTIFF') == -1:
-        return 'skip'
+        pytest.skip()
 
     if md['DMD_CREATIONOPTIONLIST'].find('JPEG') == -1:
-        return 'skip'
+        pytest.skip()
 
     last_size = 0
     quality = 30
@@ -3546,10 +3523,10 @@ def test_tiff_write_92():
 def test_tiff_write_93():
     md = gdaltest.tiff_drv.GetMetadata()
     if md['DMD_CREATIONOPTIONLIST'].find('BigTIFF') == -1:
-        return 'skip'
+        pytest.skip()
 
     if md['DMD_CREATIONOPTIONLIST'].find('JPEG') == -1:
-        return 'skip'
+        pytest.skip()
 
     src_ds = gdal.Open('../gdrivers/data/utm.tif')
     ds = gdal.GetDriverByName('GTiff').Create('tmp/tiff_write_93.tif', 1024, 1024, 3,
@@ -3608,10 +3585,10 @@ def test_tiff_write_93():
 def test_tiff_write_94():
     md = gdaltest.tiff_drv.GetMetadata()
     if md['DMD_CREATIONOPTIONLIST'].find('BigTIFF') == -1:
-        return 'skip'
+        pytest.skip()
 
     if md['DMD_CREATIONOPTIONLIST'].find('JPEG') == -1:
-        return 'skip'
+        pytest.skip()
 
     src_ds = gdal.GetDriverByName('GTiff').Create('tmp/tiff_write_94_src.tif', 1024, 1024, 3)
     gdal.SetConfigOption('GDAL_TIFF_INTERNAL_MASK', 'YES')
@@ -3871,11 +3848,11 @@ def test_tiff_write_100():
 def test_tiff_write_101():
 
     if not gdaltest.run_slow_tests():
-        return 'skip'
+        pytest.skip()
 
     md = gdaltest.tiff_drv.GetMetadata()
     if md['DMD_CREATIONOPTIONLIST'].find('BigTIFF') == -1:
-        return 'skip'
+        pytest.skip()
 
     if sys.platform.startswith('linux'):
         # Much faster to use /dev/urandom than python random generator !
@@ -3929,13 +3906,12 @@ def test_tiff_write_101():
         if error_msg != '':
             src_ds = None
             gdaltest.tiff_drv.Delete('tmp/tiff_write_101.bin')
-            return 'fail'
+            pytest.fail()
 
         if compression_method != 'JPEG' and cs != expected_cs:
-            gdaltest.post_reason('for compression method %s, got %d instead of %d' % (compression_method, cs, expected_cs))
             src_ds = None
             gdaltest.tiff_drv.Delete('tmp/tiff_write_101.bin')
-            return 'fail'
+            pytest.fail('for compression method %s, got %d instead of %d' % (compression_method, cs, expected_cs))
 
     src_ds = None
     gdaltest.tiff_drv.Delete('tmp/tiff_write_101.bin')
@@ -3988,7 +3964,7 @@ def test_tiff_write_102():
 def test_tiff_write_103():
     import test_cli_utilities
     if test_cli_utilities.get_gdaladdo_path() is None:
-        return 'skip'
+        pytest.skip()
 
     gdal.Translate('tmp/tiff_write_103_src.tif', 'data/rgbsmall.tif', options='-outsize 260 260')
     gdaltest.runexternal(test_cli_utilities.get_gdaladdo_path() + ' -ro tmp/tiff_write_103_src.tif 2')
@@ -4043,7 +4019,7 @@ def test_tiff_write_105():
     # This hangs forever with libtiff 3.8.2, so skip it
     md = gdaltest.tiff_drv.GetMetadata()
     if md['DMD_CREATIONOPTIONLIST'].find('BigTIFF') == -1:
-        return 'skip'
+        pytest.skip()
 
     shutil.copyfile('data/bug4468.tif', 'tmp/bug4468.tif')
 
@@ -4076,7 +4052,7 @@ def test_tiff_write_106(filename='../gdrivers/data/byte_with_xmp.jpg', options=N
 
     md = gdaltest.tiff_drv.GetMetadata()
     if md['DMD_CREATIONOPTIONLIST'].find('JPEG') == -1:
-        return 'skip'
+        pytest.skip()
 
     src_ds = gdal.Open(filename)
     nbands = src_ds.RasterCount
@@ -4165,7 +4141,7 @@ def test_tiff_write_114():
 def test_tiff_write_115():
     md = gdaltest.tiff_drv.GetMetadata()
     if md['DMD_CREATIONOPTIONLIST'].find('JPEG') == -1:
-        return 'skip'
+        pytest.skip()
 
     tmpfilename = '/vsimem/tiff_write_115.tif'
 
@@ -4179,14 +4155,14 @@ def test_tiff_write_115():
     if f is not None:
         gdal.VSIFCloseL(f)
         gdal.Unlink(tmpfilename)
-        return 'fail'
+        pytest.fail()
 
     ds = gdal.Open(tmpfilename)
     md = ds.GetMetadata('IMAGE_STRUCTURE')
     if md['INTERLEAVE'] != 'PIXEL':
         ds = None
         gdal.Unlink(tmpfilename)
-        return 'fail'
+        pytest.fail()
 
     expected_cs = [16404, 62700, 37913, 14174]
     for i in range(4):
@@ -4194,12 +4170,12 @@ def test_tiff_write_115():
         if cs != expected_cs[i]:
             ds = None
             gdal.Unlink(tmpfilename)
-            return 'fail'
+            pytest.fail()
 
         if ds.GetRasterBand(i + 1).GetRasterColorInterpretation() != gdal.GCI_RedBand + i:
             ds = None
             gdal.Unlink(tmpfilename)
-            return 'fail'
+            pytest.fail()
 
     ds = None
     gdal.Unlink(tmpfilename)
@@ -4213,7 +4189,7 @@ def test_tiff_write_115():
 def test_tiff_write_116():
     md = gdaltest.tiff_drv.GetMetadata()
     if md['DMD_CREATIONOPTIONLIST'].find('JPEG') == -1:
-        return 'skip'
+        pytest.skip()
 
     tmpfilename = '/vsimem/tiff_write_116.tif'
 
@@ -4227,14 +4203,14 @@ def test_tiff_write_116():
     if f is not None:
         gdal.VSIFCloseL(f)
         gdal.Unlink(tmpfilename)
-        return 'fail'
+        pytest.fail()
 
     ds = gdal.Open(tmpfilename)
     md = ds.GetMetadata('IMAGE_STRUCTURE')
     if md['INTERLEAVE'] != 'BAND':
         ds = None
         gdal.Unlink(tmpfilename)
-        return 'fail'
+        pytest.fail()
 
     expected_cs = [16404, 62700, 37913, 14174]
     for i in range(4):
@@ -4242,12 +4218,12 @@ def test_tiff_write_116():
         if cs != expected_cs[i]:
             ds = None
             gdal.Unlink(tmpfilename)
-            return 'fail'
+            pytest.fail()
 
         if ds.GetRasterBand(i + 1).GetRasterColorInterpretation() != gdal.GCI_RedBand + i:
             ds = None
             gdal.Unlink(tmpfilename)
-            return 'fail'
+            pytest.fail()
 
     ds = None
     gdal.Unlink(tmpfilename)
@@ -4263,7 +4239,7 @@ def test_tiff_write_117():
     # Might be good to be able to test internal libtiff presence
     md = gdaltest.tiff_drv.GetMetadata()
     if md['DMD_CREATIONOPTIONLIST'].find('BigTIFF') == -1:
-        return 'skip'
+        pytest.skip()
 
     import random
 
@@ -4469,12 +4445,10 @@ def test_tiff_write_122():
     md = new_ds.GetMetadata()
 
     if 'TIFFTAG_RESOLUTIONUNIT' not in md:
-        gdaltest.post_reason('Couldnt find tag TIFFTAG_RESOLUTIONUNIT')
-        return 'fail'
+        pytest.fail('Couldnt find tag TIFFTAG_RESOLUTIONUNIT')
 
     elif md['TIFFTAG_RESOLUTIONUNIT'] != '1 (unitless)':
-        gdaltest.post_reason("Got unexpected tag TIFFTAG_RESOLUTIONUNIT='%s' (expected ='1 (unitless)')" % md['TIFFTAG_RESOLUTIONUNIT'])
-        return 'fail'
+        pytest.fail("Got unexpected tag TIFFTAG_RESOLUTIONUNIT='%s' (expected ='1 (unitless)')" % md['TIFFTAG_RESOLUTIONUNIT'])
 
     new_ds = None
 
@@ -4703,7 +4677,7 @@ def test_tiff_write_124():
 def test_tiff_write_125():
 
     if gdal.GetConfigOption('SKIP_MEM_INTENSIVE_TEST') is not None:
-        return 'skip'
+        pytest.skip()
 
     ds = gdaltest.tiff_drv.Create('/vsimem/tiff_write_125.tif', 2147000000, 5000, 65535, options=['SPARSE_OK=YES', 'BLOCKYSIZE=5000', 'COMPRESS=LZW', 'BIGTIFF=NO'])
     ds = None
@@ -4737,7 +4711,7 @@ def test_tiff_write_126():
 
     md = gdaltest.tiff_drv.GetMetadata()
     if md['DMD_CREATIONOPTIONLIST'].find('JPEG') == -1:
-        return 'skip'
+        pytest.skip()
 
     src_ds = gdal.Open('../gdrivers/data/small_world_400pct.vrt')
 
@@ -4924,7 +4898,7 @@ def test_tiff_write_128():
 
     md = gdaltest.tiff_drv.GetMetadata()
     if md['DMD_CREATIONOPTIONLIST'].find('JPEG') == -1:
-        return 'skip'
+        pytest.skip()
 
     gdal.SetConfigOption('GDAL_JPEG_TO_RGB', 'NO')
     src_ds = gdal.Open('../gdrivers/data/rgb_ntf_cmyk.jpg')
@@ -4988,10 +4962,10 @@ def test_tiff_write_128():
 def test_tiff_write_129():
     md = gdaltest.tiff_drv.GetMetadata()
     if md['DMD_CREATIONOPTIONLIST'].find('BigTIFF') == -1:
-        return 'skip'
+        pytest.skip()
 
     if md['DMD_CREATIONOPTIONLIST'].find('JPEG') == -1:
-        return 'skip'
+        pytest.skip()
 
     for jpegtablesmode in ['1', '3']:
         for photometric in ['RGB', 'YCBCR']:
@@ -5019,10 +4993,9 @@ def test_tiff_write_129():
                 if i == 0:
                     cs_ref = cs
                 elif cs != cs_ref:
-                    print(jpegtablesmode)
                     print(photometric)
                     print(i)
-                    return 'fail'
+                    pytest.fail(jpegtablesmode)
 
     return 'success'
 
@@ -5033,10 +5006,10 @@ def test_tiff_write_129():
 def test_tiff_write_130():
     md = gdaltest.tiff_drv.GetMetadata()
     if md['DMD_CREATIONOPTIONLIST'].find('BigTIFF') == -1:
-        return 'skip'
+        pytest.skip()
 
     if md['DMD_CREATIONOPTIONLIST'].find('JPEG') == -1:
-        return 'skip'
+        pytest.skip()
 
     shutil.copyfile('data/byte_jpg_unusual_jpegtable.tif', 'tmp/byte_jpg_unusual_jpegtable.tif')
     ds = gdal.Open('tmp/byte_jpg_unusual_jpegtable.tif', gdal.GA_Update)
@@ -5072,7 +5045,7 @@ def test_tiff_write_131(level=1):
 
     md = gdaltest.tiff_drv.GetMetadata()
     if md['DMD_CREATIONOPTIONLIST'].find('LZMA') == -1:
-        return 'skip'
+        pytest.skip()
 
     filename = '/vsimem/tiff_write_131.tif'
     src_ds = gdal.Open('data/byte.tif')
@@ -5084,7 +5057,7 @@ def test_tiff_write_131(level=1):
     # LZMA requires an howful amount of memory even on small files
     if gdal.GetLastErrorMsg().find('cannot allocate memory') >= 0:
         gdal.Unlink(filename)
-        return 'skip'
+        pytest.skip()
 
     ds = gdal.Open(filename)
     assert ds.GetRasterBand(1).Checksum() == 4672
@@ -5837,12 +5810,12 @@ def test_tiff_write_144():
 
     md = gdaltest.tiff_drv.GetMetadata()
     if md['DMD_CREATIONOPTIONLIST'].find('BigTIFF') == -1:
-        return 'skip'
+        pytest.skip()
 
     # Determine if the filesystem supports sparse files (we don't want to create a real 10 GB
     # file !
     if not gdaltest.filesystem_supports_sparse_files('tmp'):
-        return 'skip'
+        pytest.skip()
 
     ds = gdal.GetDriverByName('GTiff').Create('tmp/tiff_write_144.tif', 20, 20, 1, options=['BIGTIFF=YES'])
     ds.GetRasterBand(1).Fill(255)
@@ -5912,13 +5885,11 @@ def test_tiff_write_145():
         with gdaltest.error_handler():
             ds = gdaltest.tiff_drv.Create(filename, xsize, ysize, bands, datatype, options=creation_options)
         if ds is not None and options.get('expected_failure', False):
-            gdaltest.post_reason('expected failure, but did not get it')
             print(options)
-            return 'fail'
+            pytest.fail('expected failure, but did not get it')
         elif ds is None and not options.get('expected_failure', False):
-            gdaltest.post_reason('got failure, but did not expect it')
             print(options)
-            return 'fail'
+            pytest.fail('got failure, but did not expect it')
         ds = None
         # print(gdal.GetLastErrorMsg())
         if gdal.GetLastErrorMsg() == '':
@@ -5937,7 +5908,7 @@ def test_tiff_write_146():
 
     md = gdaltest.tiff_drv.GetMetadata()
     if md['DMD_CREATIONOPTIONLIST'].find('JPEG') == -1:
-        return 'skip'
+        pytest.skip()
 
     tmp_ds = gdal.Translate('', 'data/stefan_full_rgba.tif', format='MEM')
     original_stats = [tmp_ds.GetRasterBand(i + 1).ComputeStatistics(True) for i in range(4)]
@@ -5963,7 +5934,7 @@ def test_tiff_write_147():
 
     md = gdaltest.tiff_drv.GetMetadata()
     if md['DMD_CREATIONOPTIONLIST'].find('JPEG') == -1:
-        return 'skip'
+        pytest.skip()
 
     gdal.SetConfigOption('GDAL_JPEG_TO_RGB', 'NO')
     gdal.SetConfigOption('GDAL_PAM_ENABLED', 'NO')
@@ -5985,7 +5956,7 @@ def test_tiff_write_148():
 
     md = gdaltest.tiff_drv.GetMetadata()
     if md['DMD_CREATIONOPTIONLIST'].find('JPEG') == -1:
-        return 'skip'
+        pytest.skip()
 
     gdal.SetConfigOption('GDAL_JPEG_TO_RGB', 'NO')
     tmp_ds = gdal.Translate('', '../gdrivers/data/rgb_ntf_cmyk.jpg', format='MEM')
@@ -6130,7 +6101,7 @@ def test_tiff_write_153():
     target_dir = 'tmp'
 
     if gdal.VSISupportsSparseFiles(target_dir) == 0:
-        return 'skip'
+        pytest.skip()
 
     gdaltest.tiff_drv.Create(target_dir + '/tiff_write_153.tif', 500, 500)
 
@@ -6362,10 +6333,9 @@ def test_tiff_write_157():
         if i == 4 or i == 5:
             assert got[i] != got[i]
         elif abs(got[i] - expected[i]) > 1e-15:
-            print(i)
             print(got[i])
             print(expected[i])
-            return 'fail'
+            pytest.fail(i)
 
     # Check that we properly decode&re-encode Float16 values
     gdal.Translate('/vsimem/tiff_write_157_dst.tif', ds)
@@ -6424,10 +6394,9 @@ def test_tiff_write_157():
         if i == 4 or i == 5:
             assert got[i] != got[i]
         elif abs(got[i] - expected[i]) > 1e-15:
-            print(i)
             print(got[i])
             print(expected[i])
-            return 'fail'
+            pytest.fail(i)
 
     gdaltest.tiff_drv.Delete('/vsimem/tiff_write_157.tif')
 
@@ -6478,9 +6447,9 @@ def test_tiff_write_159():
 
     md = gdaltest.tiff_drv.GetMetadata()
     if md['DMD_CREATIONOPTIONLIST'].find('JPEG') == -1:
-        return 'skip'
+        pytest.skip()
     if md['DMD_CREATIONOPTIONLIST'].find('BIGTIFF') == -1:
-        return 'skip'
+        pytest.skip()
 
     prev_table = ''
     for options in [[], ['JPEG_QUALITY=50'], ['PHOTOMETRIC=YCBCR']]:
@@ -6616,8 +6585,7 @@ def test_tiff_write_163():
 
     # Was a libtiff 4.0.8 regression
     if gdaltest.tiff_drv.GetMetadataItem('LIBTIFF').find('4.0.8') >= 0:
-        print('Test broken with libtiff 4.0.8')
-        return 'skip'
+        pytest.skip('Test broken with libtiff 4.0.8')
 
     gdal.Translate('/vsimem/tiff_write_163.tif', 'data/byte.tif',
                    options='-outsize 1 20000 -co BLOCKYSIZE=20000 -co PROFILE=BASELINE')
@@ -6860,7 +6828,7 @@ def test_tiff_write_171_zstd():
 
     md = gdaltest.tiff_drv.GetMetadata()
     if md['DMD_CREATIONOPTIONLIST'].find('ZSTD') == -1:
-        return 'skip'
+        pytest.skip()
 
     ut = gdaltest.GDALTest('GTiff', 'byte.tif', 1, 4672,
                            options=['COMPRESS=ZSTD', 'ZSTD_LEVEL=1'])
@@ -6874,7 +6842,7 @@ def test_tiff_write_171_zstd_predictor():
 
     md = gdaltest.tiff_drv.GetMetadata()
     if md['DMD_CREATIONOPTIONLIST'].find('ZSTD') == -1:
-        return 'skip'
+        pytest.skip()
 
     ut = gdaltest.GDALTest('GTiff', 'byte.tif', 1, 4672,
                            options=['COMPRESS=ZSTD', 'ZSTD_LEVEL=1', 'PREDICTOR=2'])
@@ -6888,7 +6856,7 @@ def test_tiff_write_webp():
 
     md = gdaltest.tiff_drv.GetMetadata()
     if md['DMD_CREATIONOPTIONLIST'].find('WEBP') == -1:
-        return 'skip'
+        pytest.skip()
 
     ut = gdaltest.GDALTest('GTiff', 'md_ge_rgb_0010000.tif', 0, None,
                            options=['COMPRESS=WEBP'])
@@ -6902,10 +6870,10 @@ def test_tiff_write_tiled_webp():
 
     md = gdaltest.tiff_drv.GetMetadata()
     if md['DMD_CREATIONOPTIONLIST'].find('WEBP') == -1:
-        return 'skip'
+        pytest.skip()
 
     if md['DMD_CREATIONOPTIONLIST'].find('WEBP_LOSSLESS') == -1:
-        return 'skip'
+        pytest.skip()
 
     filename = '/vsimem/tiff_write_tiled_webp.tif'
     src_ds = gdal.Open('data/md_ge_rgb_0010000.tif')
@@ -6930,7 +6898,7 @@ def test_tiff_write_webp_huge_single_strip():
 
     md = gdaltest.tiff_drv.GetMetadata()
     if md['DMD_CREATIONOPTIONLIST'].find('WEBP') == -1:
-        return 'skip'
+        pytest.skip()
 
     filename = '/vsimem/tif_webp_huge_single_strip.tif'
     src_ds = gdal.Open('data/tif_webp_huge_single_strip.tif')
@@ -6988,7 +6956,7 @@ def test_tiff_write_173_lerc():
 
     md = gdaltest.tiff_drv.GetMetadata()
     if md['DMD_CREATIONOPTIONLIST'].find('LERC') == -1:
-        return 'skip'
+        pytest.skip()
 
     ut = gdaltest.GDALTest('GTiff', 'byte.tif', 1, 4672,
                            options=['COMPRESS=LERC'])
@@ -7002,7 +6970,7 @@ def test_tiff_write_174_lerc_deflate():
 
     md = gdaltest.tiff_drv.GetMetadata()
     if md['DMD_CREATIONOPTIONLIST'].find('LERC_DEFLATE') == -1:
-        return 'skip'
+        pytest.skip()
 
     ut = gdaltest.GDALTest('GTiff', 'byte.tif', 1, 4672,
                            options=['COMPRESS=LERC_DEFLATE'])
@@ -7016,7 +6984,7 @@ def test_tiff_write_174_lerc_deflate_with_level():
 
     md = gdaltest.tiff_drv.GetMetadata()
     if md['DMD_CREATIONOPTIONLIST'].find('LERC_DEFLATE') == -1:
-        return 'skip'
+        pytest.skip()
 
     ut = gdaltest.GDALTest('GTiff', 'byte.tif', 1, 4672,
                            options=['COMPRESS=LERC_DEFLATE', 'ZLEVEL=1'])
@@ -7030,7 +6998,7 @@ def test_tiff_write_175_lerc_zstd():
 
     md = gdaltest.tiff_drv.GetMetadata()
     if md['DMD_CREATIONOPTIONLIST'].find('LERC_ZSTD') == -1:
-        return 'skip'
+        pytest.skip()
 
     ut = gdaltest.GDALTest('GTiff', 'byte.tif', 1, 4672,
                            options=['COMPRESS=LERC_ZSTD'])
@@ -7044,7 +7012,7 @@ def test_tiff_write_175_lerc_zstd_with_level():
 
     md = gdaltest.tiff_drv.GetMetadata()
     if md['DMD_CREATIONOPTIONLIST'].find('LERC_ZSTD') == -1:
-        return 'skip'
+        pytest.skip()
 
     ut = gdaltest.GDALTest('GTiff', 'byte.tif', 1, 4672,
                            options=['COMPRESS=LERC_ZSTD', 'ZSTD_LEVEL=1'])
@@ -7058,7 +7026,7 @@ def test_tiff_write_176_lerc_max_z_error():
 
     md = gdaltest.tiff_drv.GetMetadata()
     if md['DMD_CREATIONOPTIONLIST'].find('LERC') == -1:
-        return 'skip'
+        pytest.skip()
 
     ut = gdaltest.GDALTest('GTiff', 'byte.tif', 1, 4529,
                            options=['COMPRESS=LERC', 'MAX_Z_ERROR=1'])
@@ -7072,7 +7040,7 @@ def test_tiff_write_177_lerc_several_bands_tiling():
 
     md = gdaltest.tiff_drv.GetMetadata()
     if md['DMD_CREATIONOPTIONLIST'].find('LERC') == -1:
-        return 'skip'
+        pytest.skip()
 
     filename = '/vsimem/tiff_write_177_lerc_several_bands_tiling.tif'
     gdal.Translate(filename, '../gdrivers/data/small_world.tif',
@@ -7093,7 +7061,7 @@ def test_tiff_write_178_lerc_with_alpha():
 
     md = gdaltest.tiff_drv.GetMetadata()
     if md['DMD_CREATIONOPTIONLIST'].find('LERC') == -1:
-        return 'skip'
+        pytest.skip()
 
     filename = '/vsimem/tiff_write_178_lerc_with_alpha.tif'
     gdal.Translate(filename, 'data/stefan_full_rgba.tif',
@@ -7114,7 +7082,7 @@ def test_tiff_write_178_lerc_with_alpha_0_and_255():
 
     md = gdaltest.tiff_drv.GetMetadata()
     if md['DMD_CREATIONOPTIONLIST'].find('LERC') == -1:
-        return 'skip'
+        pytest.skip()
 
     filename = '/vsimem/tiff_write_178_lerc_with_alpha_0_and_255.tif'
     gdal.Translate(filename, 'data/rgba_with_alpha_0_and_255.tif',
@@ -7135,7 +7103,7 @@ def test_tiff_write_179_lerc_data_types():
 
     md = gdaltest.tiff_drv.GetMetadata()
     if md['DMD_CREATIONOPTIONLIST'].find('LERC') == -1:
-        return 'skip'
+        pytest.skip()
 
     filename = '/vsimem/tiff_write_179_lerc_data_types.tif'
     for src_filename in ['uint16.tif', 'int16.tif', 'uint32.tif', 'int32.tif',
@@ -7175,7 +7143,7 @@ def test_tiff_write_180_lerc_separate():
 
     md = gdaltest.tiff_drv.GetMetadata()
     if md['DMD_CREATIONOPTIONLIST'].find('LERC') == -1:
-        return 'skip'
+        pytest.skip()
 
     filename = '/vsimem/tiff_write_180_lerc_separate.tif'
     gdal.Translate(filename, '../gdrivers/data/small_world.tif',
@@ -7250,7 +7218,7 @@ def test_tiff_write_182_xmp_delete():
 def tiff_write_api_proxy():
 
     if not run_tiff_write_api_proxy:
-        return 'skip'
+        pytest.skip()
 
     import test_py_scripts
     ret = test_py_scripts.run_py_script_as_external_script('.', 'tiff_write', ' -api_proxy', display_live_on_parent_stdout=True)
diff --git a/autotest/gcore/transformer.py b/autotest/gcore/transformer.py
index 96b8f63acded..f2abf4af3e1b 100755
--- a/autotest/gcore/transformer.py
+++ b/autotest/gcore/transformer.py
@@ -380,13 +380,11 @@ def test_transformer_10():
     sr = osr.SpatialReference()
     sr.ImportFromProj4('+proj=longlat +datum=WGS84 +geoidgrids=./tmp/fake.gtx +vunits=m +foo=bar +no_defs')
     if sr.ExportToProj4().find('foo=bar') >= 0:
-        print('Missing proj.4')
         gdal.GetDriverByName('GTX').Delete('tmp/fake.gtx')
-        return 'skip'
+        pytest.skip('Missing proj.4')
     if sr.ExportToProj4().find('geoidgrids') < 0:
-        print('Missing geoidgrids in %s. Outdated proj.4 version' % sr.ExportToProj4())
         gdal.GetDriverByName('GTX').Delete('tmp/fake.gtx')
-        return 'skip'
+        pytest.skip('Missing geoidgrids in %s. Outdated proj.4 version' % sr.ExportToProj4())
 
     # Create a fake DEM
     ds_dem = gdal.GetDriverByName('GTiff').Create('/vsimem/dem.tif', 100, 100, 1, gdal.GDT_Byte)
diff --git a/autotest/gcore/virtualmem.py b/autotest/gcore/virtualmem.py
index c916145d96e9..9558b5168ee1 100755
--- a/autotest/gcore/virtualmem.py
+++ b/autotest/gcore/virtualmem.py
@@ -34,6 +34,7 @@
 
 import gdaltest
 from osgeo import gdal
+import pytest
 
 ###############################################################################
 # Test linear and tiled virtual mem interfaces in read-only mode
@@ -42,13 +43,13 @@
 def test_virtualmem_1():
 
     if gdal.GetConfigOption('SKIP_VIRTUALMEM'):
-        return 'skip'
+        pytest.skip()
 
     try:
         from osgeo import gdalnumeric
         gdalnumeric.zeros
     except (ImportError, AttributeError):
-        return 'skip'
+        pytest.skip()
 
     ds = gdal.Open('../gdrivers/data/small_world.tif')
     bufxsize = 400
@@ -67,7 +68,7 @@ def test_virtualmem_1():
                 ar_tiled_band1 = ds.GetRasterBand(1).GetTiledVirtualMemArray(gdal.GF_Read, 0, 0, bufxsize, bufysize, tilexsize, tileysize, gdal.GDT_Int16, 1024 * 1024)
             except:
                 pass
-            return 'skip'
+            pytest.skip()
 
     ar_flat_band1 = ds.GetRasterBand(1).GetVirtualMemArray(gdal.GF_Read, 0, 0, bufxsize, bufysize, bufxsize, bufysize, gdal.GDT_Int16, 1024 * 1024, 0)
     ar_flat_bip = ds.GetVirtualMemArray(gdal.GF_Read, 0, 0, bufxsize, bufysize, bufxsize, bufysize, gdal.GDT_Int16, [1, 2, 3], 0, 1024 * 1024, 0)
@@ -116,15 +117,15 @@ def test_virtualmem_1():
 def test_virtualmem_2():
 
     if gdal.GetConfigOption('SKIP_VIRTUALMEM'):
-        return 'skip'
+        pytest.skip()
     try:
         from osgeo import gdalnumeric
         gdalnumeric.zeros
     except (ImportError, AttributeError):
-        return 'skip'
+        pytest.skip()
 
     if not sys.platform.startswith('linux'):
-        return 'skip'
+        pytest.skip()
 
     ds = gdal.GetDriverByName('MEM').Create('', 100, 100, 1)
     ar = ds.GetVirtualMemArray(gdal.GF_Write)
@@ -146,14 +147,14 @@ def test_virtualmem_2():
 def test_virtualmem_3():
 
     if gdal.GetConfigOption('SKIP_VIRTUALMEM'):
-        return 'skip'
+        pytest.skip()
     try:
         from osgeo import gdalnumeric
     except ImportError:
-        return 'skip'
+        pytest.skip()
 
     if not sys.platform.startswith('linux'):
-        return 'skip'
+        pytest.skip()
 
     for tmpfile in ['tmp/virtualmem_3.img', '/vsimem/virtualmem_3.img']:
         ds = gdal.GetDriverByName('EHdr').Create(tmpfile, 400, 300, 2)
@@ -193,14 +194,14 @@ def test_virtualmem_3():
 def test_virtualmem_4():
 
     if gdal.GetConfigOption('SKIP_VIRTUALMEM'):
-        return 'skip'
+        pytest.skip()
     try:
         from osgeo import gdalnumeric
     except ImportError:
-        return 'skip'
+        pytest.skip()
 
     if not sys.platform.startswith('linux'):
-        return 'skip'
+        pytest.skip()
 
     tmpfile = 'tmp/virtualmem_4.tif'
     for option in ['INTERLEAVE=PIXEL', 'INTERLEAVE=BAND']:
@@ -210,7 +211,7 @@ def test_virtualmem_4():
         if gdal.GetLastErrorMsg().find('mmap() failed') >= 0:
             ar1 = None
             ds = None
-            return 'skip'
+            pytest.skip()
         ar1 = None
         ar1 = ds.GetRasterBand(1).GetVirtualMemAutoArray(gdal.GF_Write)
         ar1_bis = ds.GetRasterBand(1).GetVirtualMemAutoArray(gdal.GF_Write)
@@ -239,12 +240,12 @@ def test_virtualmem_4():
                 ar1 = None
                 ar2 = None
                 ds = None
-                return 'fail'
+                pytest.fail()
             if not gdalnumeric.array_equal(ar2[y], ar_255):
                 ar1 = None
                 ar2 = None
                 ds = None
-                return 'fail'
+                pytest.fail()
         # We need to destroy the array before dataset destruction
         ar1 = None
         ar2 = None
diff --git a/autotest/gcore/vrt_read.py b/autotest/gcore/vrt_read.py
index e015447d11b2..7c739f7c86f0 100755
--- a/autotest/gcore/vrt_read.py
+++ b/autotest/gcore/vrt_read.py
@@ -90,7 +90,7 @@ def test_vrt_read_1():
     if ds is None:
         return 'success'
 
-    return 'fail'
+    pytest.fail()
 
 ###############################################################################
 # The VRT references a non existing TIF file, but using the proxy pool dataset API (#2837)
@@ -153,7 +153,7 @@ def test_vrt_read_4():
     try:
         import numpy as np
     except ImportError:
-        return 'skip'
+        pytest.skip()
 
     data = np.zeros((1, 1), np.complex64)
     data[0, 0] = 1. + 3.j
@@ -434,7 +434,7 @@ def test_vrt_read_10():
 def test_vrt_read_11():
 
     if not gdaltest.support_symlink():
-        return 'skip'
+        pytest.skip()
 
     try:
         os.remove('tmp/byte.vrt')
@@ -460,7 +460,7 @@ def test_vrt_read_11():
 def test_vrt_read_12():
 
     if not gdaltest.support_symlink():
-        return 'skip'
+        pytest.skip()
 
     try:
         os.remove('tmp/byte.vrt')
@@ -485,7 +485,7 @@ def test_vrt_read_12():
 def test_vrt_read_13():
 
     if not gdaltest.support_symlink():
-        return 'skip'
+        pytest.skip()
 
     try:
         os.remove('tmp/byte.vrt')
@@ -679,7 +679,7 @@ def test_vrt_read_19():
 def test_vrt_read_20():
 
     if test_cli_utilities.get_gdalinfo_path() is None:
-        return 'skip'
+        pytest.skip()
 
     shutil.copy('data/byte.tif', 'tmp')
     for i in range(3):
@@ -910,7 +910,7 @@ def test_vrt_read_23():
         gdalnumeric.zeros
         import numpy
     except (ImportError, AttributeError):
-        return 'skip'
+        pytest.skip()
 
     mem_ds = gdal.GetDriverByName('GTiff').Create('/vsimem/vrt_read_23.tif', 2, 1)
     mem_ds.GetRasterBand(1).WriteArray(numpy.array([[0, 10]]))
@@ -982,7 +982,7 @@ def test_vrt_read_25():
 
     import ogrtest
     if not ogrtest.have_geos():
-        return 'skip'
+        pytest.skip()
 
     ds = gdal.Open("""<VRTDataset rasterXSize="2000" rasterYSize="200">
   <VRTRasterBand dataType="Byte" band="1">
@@ -1081,7 +1081,7 @@ def test_vrt_read_29():
     f = open('data/byte.tif')
     lst_before = gdaltest.get_opened_files()
     if not lst_before:
-        return 'skip'
+        pytest.skip()
     f.close()
     lst_before = gdaltest.get_opened_files()
 
diff --git a/autotest/gcore/vsiaz.py b/autotest/gcore/vsiaz.py
index 76107d038056..9069fd16a020 100755
--- a/autotest/gcore/vsiaz.py
+++ b/autotest/gcore/vsiaz.py
@@ -35,6 +35,7 @@
 
 import gdaltest
 import webserver
+import pytest
 
 
 def open_for_read(uri):
@@ -66,7 +67,7 @@ def test_vsiaz_init():
 def test_vsiaz_real_server_errors():
 
     if not gdaltest.built_against_curl():
-        return 'skip'
+        pytest.skip()
 
     # Missing AZURE_STORAGE_ACCOUNT
     gdal.ErrorReset()
@@ -105,8 +106,7 @@ def test_vsiaz_real_server_errors():
             gdal.VSIFCloseL(f)
         if gdal.GetConfigOption('APPVEYOR') is not None:
             return 'success'
-        print(gdal.VSIGetLastErrorMsg())
-        return 'fail'
+        pytest.fail(gdal.VSIGetLastErrorMsg())
 
     gdal.ErrorReset()
     with gdaltest.error_handler():
@@ -124,11 +124,11 @@ def test_vsiaz_start_webserver():
     gdaltest.webserver_port = 0
 
     if not gdaltest.built_against_curl():
-        return 'skip'
+        pytest.skip()
 
     (gdaltest.webserver_process, gdaltest.webserver_port) = webserver.launch(handler=webserver.DispatcherHttpHandler)
     if gdaltest.webserver_port == 0:
-        return 'skip'
+        pytest.skip()
 
     gdal.SetConfigOption('AZURE_STORAGE_CONNECTION_STRING',
                          'DefaultEndpointsProtocol=http;AccountName=myaccount;AccountKey=MY_ACCOUNT_KEY;EndpointSuffix=127.0.0.1:%d' % gdaltest.webserver_port)
@@ -145,7 +145,7 @@ def test_vsiaz_start_webserver():
 def test_vsiaz_fake_basic():
 
     if gdaltest.webserver_port == 0:
-        return 'skip'
+        pytest.skip()
 
     signed_url = gdal.GetSignedURL('/vsiaz/az_fake_bucket/resource', ['START_DATE=20180213T123456'])
     assert (signed_url in ('http://127.0.0.1:8080/azure/blob/myaccount/az_fake_bucket/resource?se=2018-02-13T13%3A34%3A56Z&sig=9Jc4yBFlSRZSSxf059OohN6pYRrjuHWJWSEuryczN%2FM%3D&sp=r&sr=c&st=2018-02-13T12%3A34%3A56Z&sv=2012-02-12',
@@ -216,7 +216,7 @@ def method(request):
                 print(stat_res.size)
             else:
                 print(stat_res)
-            return 'fail'
+            pytest.fail()
 
     handler = webserver.SequentialHandler()
     handler.add('HEAD', '/azure/blob/myaccount/az_fake_bucket/resource2.bin', 200,
@@ -228,7 +228,7 @@ def method(request):
                 print(stat_res.size)
             else:
                 print(stat_res)
-            return 'fail'
+            pytest.fail()
 
     return 'success'
 
@@ -239,7 +239,7 @@ def method(request):
 def test_vsiaz_fake_readdir():
 
     if gdaltest.webserver_port == 0:
-        return 'skip'
+        pytest.skip()
 
     handler = webserver.SequentialHandler()
     handler.add('GET', '/azure/blob/myaccount/az_fake_bucket2?comp=list&delimiter=%2F&prefix=a_dir%2F&restype=container', 200,
@@ -284,10 +284,9 @@ def test_vsiaz_fake_readdir():
     if f is None:
 
         if gdaltest.is_travis_branch('trusty'):
-            print('Skipped on trusty branch, but should be investigated')
-            return 'skip'
+            pytest.skip('Skipped on trusty branch, but should be investigated')
 
-        return 'fail'
+        pytest.fail()
     gdal.VSIFCloseL(f)
 
     dir_contents = gdal.ReadDir('/vsiaz/az_fake_bucket2/a_dir')
@@ -356,7 +355,7 @@ def test_vsiaz_fake_readdir():
 def test_vsiaz_fake_write():
 
     if gdaltest.webserver_port == 0:
-        return 'skip'
+        pytest.skip()
 
     gdal.VSICurlClearCache()
 
@@ -396,9 +395,8 @@ def method(request):
         ret = gdal.VSIFWriteL('x' * 35000, 1, 35000, f)
         ret += gdal.VSIFWriteL('x' * 5000, 1, 5000, f)
         if ret != 40000:
-            print(ret)
             gdal.VSIFCloseL(f)
-            return 'fail'
+            pytest.fail(ret)
         gdal.VSIFCloseL(f)
 
     # Simulate illegal read
@@ -433,36 +431,35 @@ def method(request):
 
     if gdal.VSIFSeekL(f, 0, 0) != 0:
         gdal.VSIFCloseL(f)
-        return 'fail'
+        pytest.fail()
 
     gdal.VSIFWriteL('x' * 35000, 1, 35000, f)
 
     if gdal.VSIFTellL(f) != 35000:
         gdal.VSIFCloseL(f)
-        return 'fail'
+        pytest.fail()
 
     if gdal.VSIFSeekL(f, 35000, 0) != 0:
         gdal.VSIFCloseL(f)
-        return 'fail'
+        pytest.fail()
 
     if gdal.VSIFSeekL(f, 0, 1) != 0:
         gdal.VSIFCloseL(f)
-        return 'fail'
+        pytest.fail()
     if gdal.VSIFSeekL(f, 0, 2) != 0:
         gdal.VSIFCloseL(f)
-        return 'fail'
+        pytest.fail()
 
     if gdal.VSIFEofL(f) != 0:
         gdal.VSIFCloseL(f)
-        return 'fail'
+        pytest.fail()
 
     with webserver.install_http_handler(handler):
         with gdaltest.error_handler():
             ret = gdal.VSIFCloseL(f)
         if ret == 0:
-            print(ret)
             gdal.VSIFCloseL(f)
-            return 'fail'
+            pytest.fail(ret)
 
     # Simulate creation of BlockBob over an existing blob of incompatible type
     f = gdal.VSIFOpenL('/vsiaz/test_copy/file.bin', 'wb')
@@ -550,9 +547,8 @@ def method(request):
     with webserver.install_http_handler(handler):
         ret = gdal.VSIFWriteL('0123456789abcdef', 1, 16, f)
         if ret != 16:
-            print(ret)
             gdal.VSIFCloseL(f)
-            return 'fail'
+            pytest.fail(ret)
         gdal.VSIFCloseL(f)
 
     # Test failed creation of AppendBlob
@@ -575,9 +571,8 @@ def method(request):
         with gdaltest.error_handler():
             ret = gdal.VSIFWriteL('0123456789abcdef', 1, 16, f)
         if ret != 0:
-            print(ret)
             gdal.VSIFCloseL(f)
-            return 'fail'
+            pytest.fail(ret)
         gdal.VSIFCloseL(f)
 
     # Test failed writing of a block of an AppendBlob
@@ -593,9 +588,8 @@ def method(request):
         with gdaltest.error_handler():
             ret = gdal.VSIFWriteL('0123456789abcdef', 1, 16, f)
         if ret != 0:
-            print(ret)
             gdal.VSIFCloseL(f)
-            return 'fail'
+            pytest.fail(ret)
         gdal.VSIFCloseL(f)
 
     return 'success'
@@ -607,7 +601,7 @@ def method(request):
 def test_vsiaz_fake_unlink():
 
     if gdaltest.webserver_port == 0:
-        return 'skip'
+        pytest.skip()
 
     # Success
     handler = webserver.SequentialHandler()
@@ -635,7 +629,7 @@ def test_vsiaz_fake_unlink():
 def test_vsiaz_fake_mkdir_rmdir():
 
     if gdaltest.webserver_port == 0:
-        return 'skip'
+        pytest.skip()
 
     # Invalid name
     ret = gdal.Mkdir('/vsiaz', 0)
@@ -757,7 +751,7 @@ def test_vsiaz_fake_mkdir_rmdir():
 def test_vsiaz_fake_test_BlobEndpointInConnectionString():
 
     if gdaltest.webserver_port == 0:
-        return 'skip'
+        pytest.skip()
 
     gdal.SetConfigOption('AZURE_STORAGE_CONNECTION_STRING',
                          'DefaultEndpointsProtocol=http;AccountName=myaccount;AccountKey=MY_ACCOUNT_KEY;BlobEndpoint=http://127.0.0.1:%d/myaccount' % gdaltest.webserver_port)
@@ -774,7 +768,7 @@ def test_vsiaz_fake_test_BlobEndpointInConnectionString():
 def test_vsiaz_stop_webserver():
 
     if gdaltest.webserver_port == 0:
-        return 'skip'
+        pytest.skip()
 
     # Clearcache needed to close all connections, since the Python server
     # can only handle one connection at a time
@@ -791,12 +785,11 @@ def test_vsiaz_stop_webserver():
 def vsiaz_extra_1():
 
     if not gdaltest.built_against_curl():
-        return 'skip'
+        pytest.skip()
 
     az_resource = gdal.GetConfigOption('AZ_RESOURCE')
     if az_resource is None:
-        print('Missing AZ_RESOURCE for running gdaltest_list_extra')
-        return 'skip'
+        pytest.skip('Missing AZ_RESOURCE for running gdaltest_list_extra')
 
     if az_resource.find('/') < 0:
         path = '/vsiaz/' + az_resource
diff --git a/autotest/gcore/vsicrypt.py b/autotest/gcore/vsicrypt.py
index 05dfd27c9dde..9334a0595f98 100755
--- a/autotest/gcore/vsicrypt.py
+++ b/autotest/gcore/vsicrypt.py
@@ -46,7 +46,7 @@ def test_vsicrypt_1():
     gdaltest.has_vsicrypt = False
     fp = gdal.VSIFOpenL('/vsicrypt/key=DONT_USE_IN_PROD,file=/vsimem/file.bin', 'wb+')
     if fp is None:
-        return 'skip'
+        pytest.skip()
     gdal.VSIFCloseL(fp)
     gdal.Unlink('/vsicrypt/key=DONT_USE_IN_PROD,file=/vsimem/file.bin')
     gdaltest.has_vsicrypt = True
@@ -61,7 +61,7 @@ def test_vsicrypt_1():
 def test_vsicrypt_2():
 
     if not gdaltest.has_vsicrypt:
-        return 'skip'
+        pytest.skip()
 
     # Missing key
     with gdaltest.error_handler():
@@ -258,7 +258,7 @@ def test_vsicrypt_2():
 def test_vsicrypt_3():
 
     if not gdaltest.has_vsicrypt:
-        return 'skip'
+        pytest.skip()
 
     for options in ['sector_size=16', 'alg=AES', 'alg=DES_EDE2', 'alg=DES_EDE3', 'alg=SKIPJACK', 'alg=invalid',
                     'mode=CBC', 'mode=CFB', 'mode=OFB', 'mode=CTR', 'mode=CBC_CTS', 'mode=invalid',
@@ -351,7 +351,7 @@ def test_vsicrypt_3():
 def test_vsicrypt_4():
 
     if not gdaltest.has_vsicrypt:
-        return 'skip'
+        pytest.skip()
 
     test_file = '/vsicrypt/key=DONT_USE_IN_PROD,sector_size=32,file=/vsimem/file_enc.bin'
     ref_file = '/vsimem/file.bin'
@@ -414,7 +414,7 @@ def test_vsicrypt_4():
 def test_vsicrypt_5():
 
     if not gdaltest.has_vsicrypt:
-        return 'skip'
+        pytest.skip()
 
     test_file = '/vsicrypt/key=DONT_USE_IN_PROD,file=/vsimem/file_enc.bin'
 
@@ -472,13 +472,13 @@ def test_vsicrypt_6():
     try:
         import ctypes
     except ImportError:
-        return 'skip'
+        pytest.skip()
     import testnonboundtoswig
 
     testnonboundtoswig.testnonboundtoswig_init()
 
     if testnonboundtoswig.gdal_handle is None:
-        return 'skip'
+        pytest.skip()
 
     testnonboundtoswig.gdal_handle.VSISetCryptKey.argtypes = [ctypes.c_char_p, ctypes.c_int]
     testnonboundtoswig.gdal_handle.VSISetCryptKey.restype = None
@@ -487,7 +487,7 @@ def test_vsicrypt_6():
     testnonboundtoswig.gdal_handle.VSISetCryptKey('DONT_USE_IN_PROD'.encode('ASCII'), 16)
 
     if not gdaltest.has_vsicrypt:
-        return 'skip'
+        pytest.skip()
 
     fp = gdal.VSIFOpenL('/vsicrypt/add_key_check=yes,file=/vsimem/file.bin', 'wb+')
     assert fp is not None
diff --git a/autotest/gcore/vsicurl.py b/autotest/gcore/vsicurl.py
index 1bd7b7ce60f8..4fe6c60144f9 100755
--- a/autotest/gcore/vsicurl.py
+++ b/autotest/gcore/vsicurl.py
@@ -37,6 +37,7 @@
 
 import gdaltest
 import webserver
+import pytest
 
 
 ###############################################################################
@@ -44,10 +45,10 @@
 
 def test_vsicurl_1():
     if not gdaltest.run_slow_tests():
-        return 'skip'
+        pytest.skip()
 
     if not gdaltest.built_against_curl():
-        return 'skip'
+        pytest.skip()
 
     ds = ogr.Open('/vsizip/vsicurl/http://publicfiles.dep.state.fl.us/dear/BWR_GIS/2007NWFLULC/NWFWMD2007LULC.zip')
     assert ds is not None
@@ -60,10 +61,10 @@ def test_vsicurl_1():
 
 def vsicurl_2():
     if not gdaltest.run_slow_tests():
-        return 'skip'
+        pytest.skip()
 
     if not gdaltest.built_against_curl():
-        return 'skip'
+        pytest.skip()
 
     ds = gdal.Open('/vsizip//vsicurl/http://eros.usgs.gov/archive/nslrsda/GeoTowns/HongKong/srtm/n22e113.zip/n22e113.bil')
     assert ds is not None
@@ -76,10 +77,10 @@ def vsicurl_2():
 
 def vsicurl_3():
     if not gdaltest.run_slow_tests():
-        return 'skip'
+        pytest.skip()
 
     if not gdaltest.built_against_curl():
-        return 'skip'
+        pytest.skip()
 
     ds = ogr.Open('/vsizip/vsicurl/http://www.iucnredlist.org/spatial-data/MAMMALS_TERRESTRIAL.zip')
     assert ds is None
@@ -92,10 +93,10 @@ def vsicurl_3():
 
 def test_vsicurl_4():
     if not gdaltest.run_slow_tests():
-        return 'skip'
+        pytest.skip()
 
     if not gdaltest.built_against_curl():
-        return 'skip'
+        pytest.skip()
 
     ds = ogr.Open('/vsizip/vsicurl/http://lelserver.env.duke.edu:8080/LandscapeTools/export/49/Downloads/1_Habitats.zip')
     assert ds is None
@@ -108,10 +109,10 @@ def test_vsicurl_4():
 
 def test_vsicurl_5():
     if not gdaltest.run_slow_tests():
-        return 'skip'
+        pytest.skip()
 
     if not gdaltest.built_against_curl():
-        return 'skip'
+        pytest.skip()
 
     ds = gdal.Open('/vsicurl/http://dds.cr.usgs.gov/srtm/SRTM_image_sample/picture%20examples/N34W119_DEM.tif')
     assert ds is not None
@@ -124,10 +125,10 @@ def test_vsicurl_5():
 
 def vsicurl_6_disabled():
     if not gdaltest.run_slow_tests():
-        return 'skip'
+        pytest.skip()
 
     if not gdaltest.built_against_curl():
-        return 'skip'
+        pytest.skip()
 
     fl = gdal.ReadDir('/vsicurl/ftp://ftp2.cits.rncan.gc.ca/pub/cantopo/250k_tif')
     assert fl
@@ -140,10 +141,10 @@ def vsicurl_6_disabled():
 
 def test_vsicurl_7():
     if not gdaltest.run_slow_tests():
-        return 'skip'
+        pytest.skip()
 
     if not gdaltest.built_against_curl():
-        return 'skip'
+        pytest.skip()
 
     fl = gdal.ReadDir('/vsicurl/http://ortho.linz.govt.nz/tifs/2005_06')
     assert fl
@@ -156,10 +157,10 @@ def test_vsicurl_7():
 
 def vsicurl_8():
     if not gdaltest.run_slow_tests():
-        return 'skip'
+        pytest.skip()
 
     if not gdaltest.built_against_curl():
-        return 'skip'
+        pytest.skip()
 
     ds1 = gdal.Open('/vsigzip//vsicurl/http://dds.cr.usgs.gov/pub/data/DEM/250/notavail/C/chipicoten-w.gz')
     gdal.Open('/vsizip//vsicurl/http://edcftp.cr.usgs.gov/pub/data/landcover/files/2009/biso/gokn09b_dnbr.zip/nps-serotnbsp-9001-20090321_rd.tif')
@@ -175,10 +176,10 @@ def vsicurl_8():
 
 def test_vsicurl_9():
     if not gdaltest.run_slow_tests():
-        return 'skip'
+        pytest.skip()
 
     if not gdaltest.built_against_curl():
-        return 'skip'
+        pytest.skip()
 
     if version_info >= (3, 0, 0):
         filename = 'xx\u4E2D\u6587.\u4E2D\u6587'
@@ -197,10 +198,10 @@ def test_vsicurl_9():
 
 def test_vsicurl_10():
     if not gdaltest.run_slow_tests():
-        return 'skip'
+        pytest.skip()
 
     if not gdaltest.built_against_curl():
-        return 'skip'
+        pytest.skip()
 
     ds = gdal.Open('/vsicurl/http://download.osgeo.org/gdal/data/gtiff/xx%E4%B8%AD%E6%96%87.%E4%B8%AD%E6%96%87')
     assert ds is not None
@@ -213,14 +214,14 @@ def test_vsicurl_10():
 
 def test_vsicurl_11():
     if not gdaltest.run_slow_tests():
-        return 'skip'
+        pytest.skip()
 
     if not gdaltest.built_against_curl():
-        return 'skip'
+        pytest.skip()
 
     f = gdal.VSIFOpenL('/vsicurl/http://download.osgeo.org/gdal/data/bmp/Bug2236.bmp', 'rb')
     if f is None:
-        return 'skip'
+        pytest.skip()
     gdal.VSIFSeekL(f, 1000000, 0)
     gdal.VSIFReadL(1, 1, f)
     gdal.VSIFCloseL(f)
@@ -239,11 +240,11 @@ def test_vsicurl_start_webserver():
     gdaltest.webserver_port = 0
 
     if not gdaltest.built_against_curl():
-        return 'skip'
+        pytest.skip()
 
     (gdaltest.webserver_process, gdaltest.webserver_port) = webserver.launch(handler=webserver.DispatcherHttpHandler)
     if gdaltest.webserver_port == 0:
-        return 'skip'
+        pytest.skip()
 
     return 'success'
 
@@ -253,11 +254,10 @@ def test_vsicurl_start_webserver():
 def test_vsicurl_test_redirect():
 
     if gdaltest.is_travis_branch('trusty'):
-        print('Skipped on trusty branch, but should be investigated')
-        return 'skip'
+        pytest.skip('Skipped on trusty branch, but should be investigated')
 
     if gdaltest.webserver_port == 0:
-        return 'skip'
+        pytest.skip()
 
     gdal.VSICurlClearCache()
 
@@ -318,9 +318,8 @@ def method(request):
 
     gdal.VSIFSeekL(f, 0, 2)
     if gdal.VSIFTellL(f) != 1000000:
-        print(gdal.VSIFTellL(f))
         gdal.VSIFCloseL(f)
-        return 'fail'
+        pytest.fail(gdal.VSIFTellL(f))
     gdal.VSIFSeekL(f, 0, 0)
 
     handler = webserver.SequentialHandler()
@@ -360,14 +359,12 @@ def method(request):
     with webserver.install_http_handler(handler):
         content = gdal.VSIFReadL(1, 16383, f).decode('ascii')
         if len(content) != 16383 or content[0] != 'x':
-            print(content)
             gdal.VSIFCloseL(f)
-            return 'fail'
+            pytest.fail(content)
         content = gdal.VSIFReadL(1, 2, f).decode('ascii')
         if content != 'xy':
-            print(content)
             gdal.VSIFCloseL(f)
-            return 'fail'
+            pytest.fail(content)
 
     gdal.VSIFCloseL(f)
 
@@ -390,7 +387,7 @@ def test_vsicurl_test_clear_cache():
 def test_vsicurl_test_retry():
 
     if gdaltest.webserver_port == 0:
-        return 'skip'
+        pytest.skip()
 
     handler = webserver.SequentialHandler()
     handler.add('GET', '/test_retry/', 404)
@@ -431,7 +428,7 @@ def test_vsicurl_test_retry():
 def test_vsicurl_test_fallback_from_head_to_get():
 
     if gdaltest.webserver_port == 0:
-        return 'skip'
+        pytest.skip()
 
     gdal.VSICurlClearCache()
 
@@ -452,7 +449,7 @@ def test_vsicurl_test_fallback_from_head_to_get():
 def test_vsicurl_test_parse_html_filelist_apache():
 
     if gdaltest.webserver_port == 0:
-        return 'skip'
+        pytest.skip()
 
     handler = webserver.SequentialHandler()
     handler.add('GET', '/mydir/', 200, {}, """<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 3.2 Final//EN">
@@ -488,7 +485,7 @@ def test_vsicurl_test_parse_html_filelist_apache():
 def test_vsicurl_stop_webserver():
 
     if gdaltest.webserver_port == 0:
-        return 'skip'
+        pytest.skip()
 
     # Clearcache needed to close all connections, since the Python server
     # can only handle one connection at a time
diff --git a/autotest/gcore/vsicurl_streaming.py b/autotest/gcore/vsicurl_streaming.py
index 178a8b9bb8a2..1f4ddba8b03a 100755
--- a/autotest/gcore/vsicurl_streaming.py
+++ b/autotest/gcore/vsicurl_streaming.py
@@ -34,6 +34,7 @@
 
 
 import gdaltest
+import pytest
 
 ###############################################################################
 #
@@ -43,81 +44,78 @@ def test_vsicurl_streaming_1():
     drv = gdal.GetDriverByName('HTTP')
 
     if drv is None:
-        return 'skip'
+        pytest.skip()
 
     gdal.SetConfigOption('GDAL_HTTP_CONNECTTIMEOUT', '5')
     fp = gdal.VSIFOpenL('/vsicurl_streaming/http://download.osgeo.org/gdal/data/usgsdem/cded/114p01_0100_deme.dem', 'rb')
     gdal.SetConfigOption('GDAL_HTTP_CONNECTTIMEOUT', None)
     if fp is None:
         if gdaltest.gdalurlopen('http://download.osgeo.org/gdal/data/usgsdem/cded/114p01_0100_deme.dem', timeout=4) is None:
-            print('cannot open URL')
-            return 'skip'
-        return 'fail'
+            pytest.skip('cannot open URL')
+        pytest.fail()
 
     if gdal.VSIFTellL(fp) != 0:
         gdal.VSIFCloseL(fp)
-        return 'fail'
+        pytest.fail()
     data = gdal.VSIFReadL(1, 50, fp)
     if data.decode('ascii') != '                              114p01DEMe   Base Ma':
         gdal.VSIFCloseL(fp)
-        return 'fail'
+        pytest.fail()
     if gdal.VSIFTellL(fp) != 50:
         gdal.VSIFCloseL(fp)
-        return 'fail'
+        pytest.fail()
 
     gdal.VSIFSeekL(fp, 0, 0)
 
     if gdal.VSIFTellL(fp) != 0:
         gdal.VSIFCloseL(fp)
-        return 'fail'
+        pytest.fail()
     data = gdal.VSIFReadL(1, 50, fp)
     if data.decode('ascii') != '                              114p01DEMe   Base Ma':
         gdal.VSIFCloseL(fp)
-        return 'fail'
+        pytest.fail()
     if gdal.VSIFTellL(fp) != 50:
         gdal.VSIFCloseL(fp)
-        return 'fail'
+        pytest.fail()
 
     time.sleep(0.5)
     gdal.VSIFSeekL(fp, 2001, 0)
     data_2001 = gdal.VSIFReadL(1, 20, fp)
     if data_2001.decode('ascii') != '7-32767-32767-32767-':
-        print(data_2001)
         gdal.VSIFCloseL(fp)
-        return 'fail'
+        pytest.fail(data_2001)
     if gdal.VSIFTellL(fp) != 2001 + 20:
         gdal.VSIFCloseL(fp)
-        return 'fail'
+        pytest.fail()
 
     gdal.VSIFSeekL(fp, 0, 2)
     if gdal.VSIFTellL(fp) != 9839616:
         gdal.VSIFCloseL(fp)
-        return 'fail'
+        pytest.fail()
 
     nRet = len(gdal.VSIFReadL(1, 10, fp))
     if nRet != 0:
         gdal.VSIFCloseL(fp)
-        return 'fail'
+        pytest.fail()
 
     gdal.VSIFSeekL(fp, 2001, 0)
     data_2001_2 = gdal.VSIFReadL(1, 20, fp)
     if gdal.VSIFTellL(fp) != 2001 + 20:
         gdal.VSIFCloseL(fp)
-        return 'fail'
+        pytest.fail()
 
     if data_2001 != data_2001_2:
         gdal.VSIFCloseL(fp)
-        return 'fail'
+        pytest.fail()
 
     gdal.VSIFSeekL(fp, 1024 * 1024 + 100, 0)
     data = gdal.VSIFReadL(1, 20, fp)
     if data.decode('ascii') != '67-32767-32767-32767':
-        print(data)
         gdal.VSIFCloseL(fp)
-        return 'fail'
+        pytest.fail(data)
     if gdal.VSIFTellL(fp) != 1024 * 1024 + 100 + 20:
         gdal.VSIFCloseL(fp)
-        return 'fail'
+        pytest.fail()
 
     gdal.VSIFCloseL(fp)
 
diff --git a/autotest/gcore/vsifile.py b/autotest/gcore/vsifile.py
index 1c0da35b0f45..6dfe842fd813 100755
--- a/autotest/gcore/vsifile.py
+++ b/autotest/gcore/vsifile.py
@@ -35,6 +35,7 @@
 
 
 import gdaltest
+import pytest
 
 ###############################################################################
 # Generic test
@@ -121,7 +122,7 @@ def test_vsifile_2():
         # FIXME
         # Fails on Travis with 17592186044423 (which is 0x10 00 00 00 00 07 instead of 7) at line 63
         # Looks like a 32/64bit issue with Python bindings of VSIStatL()
-        return 'skip'
+        pytest.skip()
     return ret
 
 ###############################################################################
@@ -131,7 +132,7 @@ def test_vsifile_2():
 def test_vsifile_3():
 
     if not gdaltest.filesystem_supports_sparse_files('tmp'):
-        return 'skip'
+        pytest.skip()
 
     filename = 'tmp/vsifile_3'
 
@@ -142,16 +143,14 @@ def test_vsifile_3():
     if pos != 10 * 1024 * 1024 * 1024:
         gdal.VSIFCloseL(fp)
         gdal.Unlink(filename)
-        print(pos)
-        return 'fail'
+        pytest.fail(pos)
     gdal.VSIFSeekL(fp, 0, 0)
     gdal.VSIFSeekL(fp, pos, 0)
     pos = gdal.VSIFTellL(fp)
     if pos != 10 * 1024 * 1024 * 1024:
         gdal.VSIFCloseL(fp)
         gdal.Unlink(filename)
-        print(pos)
-        return 'fail'
+        pytest.fail(pos)
 
     gdal.VSIFCloseL(fp)
 
@@ -205,19 +204,19 @@ def test_vsifile_5():
         if gdal.VSIFTellL(fp) != 50000:
             gdal.SetConfigOption('VSI_CACHE_SIZE', None)
             gdal.SetConfigOption('VSI_CACHE', None)
-            return 'fail'
+            pytest.fail()
 
         gdal.VSIFSeekL(fp, 50000, 1)
         if gdal.VSIFTellL(fp) != 100000:
             gdal.SetConfigOption('VSI_CACHE_SIZE', None)
             gdal.SetConfigOption('VSI_CACHE', None)
-            return 'fail'
+            pytest.fail()
 
         gdal.VSIFSeekL(fp, 0, 2)
         if gdal.VSIFTellL(fp) != 5 * 32768 * 8:
             gdal.SetConfigOption('VSI_CACHE_SIZE', None)
             gdal.SetConfigOption('VSI_CACHE', None)
-            return 'fail'
+            pytest.fail()
         gdal.VSIFReadL(1, 1, fp)
 
         gdal.VSIFSeekL(fp, 0, 0)
@@ -225,20 +224,20 @@ def test_vsifile_5():
         if data.decode('ascii') != ref_data[0:3 * 32768]:
             gdal.SetConfigOption('VSI_CACHE_SIZE', None)
             gdal.SetConfigOption('VSI_CACHE', None)
-            return 'fail'
+            pytest.fail()
 
         gdal.VSIFSeekL(fp, 16384, 0)
         data = gdal.VSIFReadL(1, 5 * 32768, fp)
         if data.decode('ascii') != ref_data[16384:16384 + 5 * 32768]:
             gdal.SetConfigOption('VSI_CACHE_SIZE', None)
             gdal.SetConfigOption('VSI_CACHE', None)
-            return 'fail'
+            pytest.fail()
 
         data = gdal.VSIFReadL(1, 50 * 32768, fp)
         if data[0:1130496].decode('ascii') != ref_data[16384 + 5 * 32768:]:
             gdal.SetConfigOption('VSI_CACHE_SIZE', None)
             gdal.SetConfigOption('VSI_CACHE', None)
-            return 'fail'
+            pytest.fail()
 
         gdal.VSIFCloseL(fp)
 
@@ -255,7 +254,7 @@ def test_vsifile_5():
 def test_vsifile_6():
 
     if not gdaltest.filesystem_supports_sparse_files('tmp'):
-        return 'skip'
+        pytest.skip()
 
     offset = 4 * 1024 * 1024 * 1024
 
@@ -294,7 +293,7 @@ def test_vsifile_6():
 def test_vsifile_7():
 
     if gdal.GetConfigOption('SKIP_MEM_INTENSIVE_TEST') is not None:
-        return 'skip'
+        pytest.skip()
 
     # Test extending file beyond reasonable limits in write mode
     fp = gdal.VSIFOpenL('/vsimem/vsifile_7.bin', 'wb')
@@ -430,7 +429,7 @@ def test_vsifile_10():
     contents = gdal.ReadDir('/vsitar//vsimem/vsifile_10.tar')
     if contents is None:
         gdal.Unlink('/vsimem/vsifile_10.tar')
-        return 'skip'
+        pytest.skip()
     assert contents == ['test.txt', 'huge.txt', 'small.txt']
     assert gdal.VSIStatL('/vsitar//vsimem/vsifile_10.tar/test.txt').size == 3
     assert gdal.VSIStatL('/vsitar//vsimem/vsifile_10.tar/huge.txt').size == 3888
@@ -489,7 +488,7 @@ def test_vsifile_12():
     target_dir = 'tmp'
 
     if gdal.VSISupportsSparseFiles(target_dir) == 0:
-        return 'skip'
+        pytest.skip()
 
     # Minimum value to make it work on NTFS
     block_size = 65536
@@ -653,7 +652,7 @@ def test_vsifile_20():
     except ValueError:
         return 'success'
 
-    return 'fail'
+    pytest.fail()
 
 ###############################################################################
 # Test gdal.VSIGetMemFileBuffer_unsafe() and gdal.VSIFWriteL() reading buffers
@@ -748,7 +747,7 @@ def test_vsigzip_multi_thread():
                 print(i*5, data[i*5:i*5+5], data[i*5-5:i*5+5-5])
                 break
 
-        return 'fail'
+        pytest.fail()
 
     return 'success'
 
diff --git a/autotest/gcore/vsigs.py b/autotest/gcore/vsigs.py
index 789473e7f606..617423fdc5ec 100755
--- a/autotest/gcore/vsigs.py
+++ b/autotest/gcore/vsigs.py
@@ -35,6 +35,7 @@
 
 import gdaltest
 import webserver
+import pytest
 
 
 def open_for_read(uri):
@@ -78,7 +79,7 @@ def test_vsigs_init():
 def test_vsigs_1():
 
     if not gdaltest.built_against_curl():
-        return 'skip'
+        pytest.skip()
 
     # Invalid header filename
     gdal.ErrorReset()
@@ -88,7 +89,7 @@ def test_vsigs_1():
                 f = open_for_read('/vsigs/foo/bar')
     if f is not None:
         gdal.VSIFCloseL(f)
-        return 'fail'
+        pytest.fail()
     last_err = gdal.GetLastErrorMsg()
     assert last_err.find('Cannot read') >= 0
 
@@ -98,7 +99,7 @@ def test_vsigs_1():
             f = open_for_read('/vsigs/foo/bar')
     if f is not None:
         gdal.VSIFCloseL(f)
-        return 'fail'
+        pytest.fail()
 
     # Missing GS_SECRET_ACCESS_KEY
     gdal.ErrorReset()
@@ -132,8 +133,7 @@ def test_vsigs_1():
             gdal.VSIFCloseL(f)
         if gdal.GetConfigOption('APPVEYOR') is not None:
             return 'success'
-        print(gdal.VSIGetLastErrorMsg())
-        return 'fail'
+        pytest.fail(gdal.VSIGetLastErrorMsg())
 
     gdal.ErrorReset()
     with gdaltest.error_handler():
@@ -151,11 +151,11 @@ def test_vsigs_start_webserver():
     gdaltest.webserver_port = 0
 
     if not gdaltest.built_against_curl():
-        return 'skip'
+        pytest.skip()
 
     (gdaltest.webserver_process, gdaltest.webserver_port) = webserver.launch(handler=webserver.DispatcherHttpHandler)
     if gdaltest.webserver_port == 0:
-        return 'skip'
+        pytest.skip()
 
     gdal.SetConfigOption('CPL_GS_ENDPOINT', 'http://127.0.0.1:%d/' % gdaltest.webserver_port)
     gdal.SetConfigOption('GS_SECRET_ACCESS_KEY', 'GS_SECRET_ACCESS_KEY')
@@ -170,7 +170,7 @@ def test_vsigs_start_webserver():
 def test_vsigs_2():
 
     if gdaltest.webserver_port == 0:
-        return 'skip'
+        pytest.skip()
 
     # header file
     gdal.FileFromMemBuffer('/vsimem/my_headers.txt', 'foo: bar')
@@ -231,7 +231,7 @@ def test_vsigs_2():
                 print(stat_res.size)
             else:
                 print(stat_res)
-            return 'fail'
+            pytest.fail()
 
     handler = webserver.SequentialHandler()
     handler.add('HEAD', '/gs_fake_bucket/resource2.bin', 200,
@@ -243,7 +243,7 @@ def test_vsigs_2():
                 print(stat_res.size)
             else:
                 print(stat_res)
-            return 'fail'
+            pytest.fail()
 
     return 'success'
 
@@ -254,7 +254,7 @@ def test_vsigs_2():
 def test_vsigs_readdir():
 
     if gdaltest.webserver_port == 0:
-        return 'skip'
+        pytest.skip()
 
     handler = webserver.SequentialHandler()
     handler.add('GET', '/gs_fake_bucket2/?delimiter=%2F&prefix=a_dir%2F', 200,
@@ -291,10 +291,9 @@ def test_vsigs_readdir():
     if f is None:
 
         if gdaltest.is_travis_branch('trusty'):
-            print('Skipped on trusty branch, but should be investigated')
-            return 'skip'
+            pytest.skip('Skipped on trusty branch, but should be investigated')
 
-        return 'fail'
+        pytest.fail()
     gdal.VSIFCloseL(f)
 
     dir_contents = gdal.ReadDir('/vsigs/gs_fake_bucket2/a_dir')
@@ -331,7 +330,7 @@ def test_vsigs_readdir():
 def test_vsigs_write():
 
     if gdaltest.webserver_port == 0:
-        return 'skip'
+        pytest.skip()
 
     gdal.VSICurlClearCache()
 
@@ -365,9 +364,8 @@ def method(request):
         ret = gdal.VSIFWriteL('x' * 35000, 1, 35000, f)
         ret += gdal.VSIFWriteL('x' * 5000, 1, 5000, f)
         if ret != 40000:
-            print(ret)
             gdal.VSIFCloseL(f)
-            return 'fail'
+            pytest.fail(ret)
         gdal.VSIFCloseL(f)
 
     # Simulate failure while transmitting
@@ -387,9 +385,8 @@ def method(request):
         with gdaltest.error_handler():
             ret = gdal.VSIFWriteL('x' * 35000, 1, 35000, f)
         if ret != 0:
-            print(ret)
             gdal.VSIFCloseL(f)
-            return 'fail'
+            pytest.fail(ret)
     gdal.VSIFCloseL(f)
 
     # Simulate failure at end of transfer
@@ -416,9 +413,8 @@ def method(request):
     with webserver.install_http_handler(handler):
         ret = gdal.VSIFWriteL('x' * 35000, 1, 35000, f)
         if ret != 35000:
-            print(ret)
             gdal.VSIFCloseL(f)
-            return 'fail'
+            pytest.fail(ret)
         with gdaltest.error_handler():
             ret = gdal.VSIFCloseL(f)
         assert ret != 0
@@ -432,7 +428,7 @@ def method(request):
 def test_vsigs_read_credentials_refresh_token_default_gdal_app():
 
     if gdaltest.webserver_port == 0:
-        return 'skip'
+        pytest.skip()
 
     gdal.SetConfigOption('GS_SECRET_ACCESS_KEY', '')
     gdal.SetConfigOption('GS_ACCESS_KEY_ID', '')
@@ -507,7 +503,7 @@ def method(request):
 def test_vsigs_read_credentials_refresh_token_custom_app():
 
     if gdaltest.webserver_port == 0:
-        return 'skip'
+        pytest.skip()
 
     gdal.SetConfigOption('GS_SECRET_ACCESS_KEY', '')
     gdal.SetConfigOption('GS_ACCESS_KEY_ID', '')
@@ -583,7 +579,7 @@ def method(request):
 def test_vsigs_read_credentials_oauth2_service_account():
 
     if gdaltest.webserver_port == 0:
-        return 'skip'
+        pytest.skip()
 
     gdal.SetConfigOption('GS_SECRET_ACCESS_KEY', '')
     gdal.SetConfigOption('GS_ACCESS_KEY_ID', '')
@@ -675,7 +671,7 @@ def method(request):
                 gdal.VSIFCloseL(f)
         except:
             if gdal.GetLastErrorMsg().find('CPLRSASHA256Sign() not implemented') >= 0:
-                return 'skip'
+                pytest.skip()
         finally:
             gdal.SetConfigOption('GO2A_AUD', None)
             gdal.SetConfigOption('GO2A_NOW', None)
@@ -696,7 +692,7 @@ def method(request):
 def test_vsigs_read_credentials_oauth2_service_account_json_file():
 
     if gdaltest.webserver_port == 0:
-        return 'skip'
+        pytest.skip()
 
     gdal.SetConfigOption('GS_SECRET_ACCESS_KEY', '')
     gdal.SetConfigOption('GS_ACCESS_KEY_ID', '')
@@ -761,7 +757,7 @@ def method(request):
             f = open_for_read('/vsigs/gs_fake_bucket/resource')
             if f is None:
                 gdal.Unlink('/vsimem/service_account.json')
-                return 'fail'
+                pytest.fail()
             data = gdal.VSIFReadL(1, 4, f).decode('ascii')
             gdal.VSIFCloseL(f)
 
@@ -769,13 +765,12 @@ def method(request):
                                            ['START_DATE=20180212T123456Z'])
             if signed_url not in ('http://127.0.0.1:8080/gs_fake_bucket/resource?Expires=1518442496&GoogleAccessId=CLIENT_EMAIL&Signature=b19I62KdqV51DpWGxhxGXLGJIA8MHvSJofwOygoeQuIxkM6PmmQFvJYTNWRt9zUVTUoVC0UHVB7ee5Z35NqDC8K4i0quu1hb8Js2B4h0W6OAupvyF3nSQ5D0OJmiSbomGMq0Ehyro5cqJ%2FU%2Fd8oAaKrGKVQScKfXoFrSJBbWkNs%3D',
                                   'http://127.0.0.1:8081/gs_fake_bucket/resource?Expires=1518442496&GoogleAccessId=CLIENT_EMAIL&Signature=b19I62KdqV51DpWGxhxGXLGJIA8MHvSJofwOygoeQuIxkM6PmmQFvJYTNWRt9zUVTUoVC0UHVB7ee5Z35NqDC8K4i0quu1hb8Js2B4h0W6OAupvyF3nSQ5D0OJmiSbomGMq0Ehyro5cqJ%2FU%2Fd8oAaKrGKVQScKfXoFrSJBbWkNs%3D'):
-                print(signed_url)
                 gdal.Unlink('/vsimem/service_account.json')
-                return 'fail'
+                pytest.fail(signed_url)
 
     except:
         if gdal.GetLastErrorMsg().find('CPLRSASHA256Sign() not implemented') >= 0:
-            return 'skip'
+            pytest.skip()
     finally:
         gdal.SetConfigOption('GO2A_AUD', None)
         gdal.SetConfigOption('GO2A_NOW', None)
@@ -794,7 +789,7 @@ def method(request):
 def test_vsigs_read_credentials_file():
 
     if gdaltest.webserver_port == 0:
-        return 'skip'
+        pytest.skip()
 
     gdal.SetConfigOption('GS_SECRET_ACCESS_KEY', '')
     gdal.SetConfigOption('GS_ACCESS_KEY_ID', '')
@@ -854,7 +849,7 @@ def method(request):
 def test_vsigs_read_credentials_file_refresh_token():
 
     if gdaltest.webserver_port == 0:
-        return 'skip'
+        pytest.skip()
 
     gdal.SetConfigOption('GS_SECRET_ACCESS_KEY', '')
     gdal.SetConfigOption('GS_ACCESS_KEY_ID', '')
@@ -934,10 +929,10 @@ def method(request):
 def test_vsigs_read_credentials_gce():
 
     if gdaltest.webserver_port == 0:
-        return 'skip'
+        pytest.skip()
 
     if sys.platform not in ('linux', 'linux2', 'win32'):
-        return 'skip'
+        pytest.skip()
 
     gdal.SetConfigOption('CPL_GS_CREDENTIALS_FILE', '')
     gdal.SetConfigOption('GS_SECRET_ACCESS_KEY', '')
@@ -1012,10 +1007,10 @@ def method(request):
 def test_vsigs_read_credentials_gce_expiration():
 
     if gdaltest.webserver_port == 0:
-        return 'skip'
+        pytest.skip()
 
     if sys.platform not in ('linux', 'linux2', 'win32'):
-        return 'skip'
+        pytest.skip()
 
     gdal.SetConfigOption('CPL_GS_CREDENTIALS_FILE', '')
     gdal.SetConfigOption('GS_SECRET_ACCESS_KEY', '')
@@ -1080,7 +1075,7 @@ def method(request):
 def test_vsigs_stop_webserver():
 
     if gdaltest.webserver_port == 0:
-        return 'skip'
+        pytest.skip()
 
     # Clearcache needed to close all connections, since the Python server
     # can only handle one connection at a time
@@ -1097,7 +1092,7 @@ def test_vsigs_stop_webserver():
 def vsigs_extra_1():
 
     if not gdaltest.built_against_curl():
-        return 'skip'
+        pytest.skip()
 
     # if gdal.GetConfigOption('GS_SECRET_ACCESS_KEY') is None:
     #    print('Missing GS_SECRET_ACCESS_KEY for running gdaltest_list_extra')
@@ -1108,8 +1103,7 @@ def vsigs_extra_1():
 
     gs_resource = gdal.GetConfigOption('GS_RESOURCE')
     if gs_resource is None:
-        print('Missing GS_RESOURCE for running gdaltest_list_extra')
-        return 'skip'
+        pytest.skip('Missing GS_RESOURCE for running gdaltest_list_extra')
 
     if gs_resource.find('/') < 0:
         path = '/vsigs/' + gs_resource
diff --git a/autotest/gcore/vsihdfs.py b/autotest/gcore/vsihdfs.py
index 922b850df5d9..d6800e72772b 100755
--- a/autotest/gcore/vsihdfs.py
+++ b/autotest/gcore/vsihdfs.py
@@ -36,6 +36,7 @@
 
 
 import gdaltest
+import pytest
 
 # Read test
 def test_vsihdfs_1():
@@ -43,7 +44,7 @@ def test_vsihdfs_1():
     fp = gdal.VSIFOpenL(filename, 'rb')
     if fp is None:
         gdaltest.have_vsihdfs = False
-        return 'skip'
+        pytest.skip()
 
     gdaltest.have_vsihdfs = True
 
@@ -59,7 +60,7 @@ def test_vsihdfs_1():
 # Seek test
 def test_vsihdfs_2():
     if gdaltest.have_vsihdfs == False:
-        return 'skip'
+        pytest.skip()
 
     filename = '/vsihdfs/file:' + os.getcwd() + '/data/text.txt'
     fp = gdal.VSIFOpenL(filename, 'rb')
@@ -84,7 +85,7 @@ def test_vsihdfs_2():
 # Tell test
 def test_vsihdfs_3():
     if gdaltest.have_vsihdfs == False:
-        return 'skip'
+        pytest.skip()
 
     filename = '/vsihdfs/file:' + os.getcwd() + '/data/text.txt'
     fp = gdal.VSIFOpenL(filename, 'rb')
@@ -101,12 +102,12 @@ def test_vsihdfs_3():
 
 # Write test
 def test_vsihdfs_4():
-    return 'skip'
+    pytest.skip()
 
 # EOF test
 def test_vsihdfs_5():
     if gdaltest.have_vsihdfs == False:
-        return 'skip'
+        pytest.skip()
 
     filename = '/vsihdfs/file:' + os.getcwd() + '/data/text.txt'
     fp = gdal.VSIFOpenL(filename, 'rb')
@@ -134,7 +135,7 @@ def test_vsihdfs_5():
 # Stat test
 def test_vsihdfs_6():
     if gdaltest.have_vsihdfs == False:
-        return 'skip'
+        pytest.skip()
 
     filename = '/vsihdfs/file:' + os.getcwd() + '/data/text.txt'
     statBuf = gdal.VSIStatL(filename, 0)
@@ -149,7 +150,7 @@ def test_vsihdfs_6():
 # ReadDir test
 def test_vsihdfs_7():
     if gdaltest.have_vsihdfs == False:
-        return 'skip'
+        pytest.skip()
 
     dirname = '/vsihdfs/file:' + os.getcwd() + '/data/'
     lst = gdal.ReadDir(dirname)
diff --git a/autotest/gcore/vsioss.py b/autotest/gcore/vsioss.py
index 213eb885edd5..232958892c58 100755
--- a/autotest/gcore/vsioss.py
+++ b/autotest/gcore/vsioss.py
@@ -66,7 +66,7 @@ def test_visoss_init():
 def test_visoss_1():
 
     if not gdaltest.built_against_curl():
-        return 'skip'
+        pytest.skip()
 
     # Missing OSS_SECRET_ACCESS_KEY
     gdal.ErrorReset()
@@ -95,10 +95,10 @@ def test_visoss_1():
 def test_visoss_real_test():
 
     if not gdaltest.built_against_curl():
-        return 'skip'
+        pytest.skip()
 
     if gdaltest.skip_on_travis():
-        return 'skip'
+        pytest.skip()
 
     # ERROR 1: The OSS Access Key Id you provided does not exist in our records.
     gdal.ErrorReset()
@@ -109,8 +109,7 @@ def test_visoss_real_test():
             gdal.VSIFCloseL(f)
         if gdal.GetConfigOption('APPVEYOR') is not None:
             return 'success'
-        print(gdal.VSIGetLastErrorMsg())
-        return 'fail'
+        pytest.fail(gdal.VSIGetLastErrorMsg())
 
     gdal.ErrorReset()
     with gdaltest.error_handler():
@@ -128,11 +127,11 @@ def test_visoss_start_webserver():
     gdaltest.webserver_port = 0
 
     if not gdaltest.built_against_curl():
-        return 'skip'
+        pytest.skip()
 
     (gdaltest.webserver_process, gdaltest.webserver_port) = webserver.launch(handler=webserver.DispatcherHttpHandler)
     if gdaltest.webserver_port == 0:
-        return 'skip'
+        pytest.skip()
 
     gdal.SetConfigOption('OSS_SECRET_ACCESS_KEY', 'OSS_SECRET_ACCESS_KEY')
     gdal.SetConfigOption('OSS_ACCESS_KEY_ID', 'OSS_ACCESS_KEY_ID')
@@ -173,7 +172,7 @@ def get_oss_fake_bucket_resource_method(request):
 def test_visoss_2():
 
     if gdaltest.webserver_port == 0:
-        return 'skip'
+        pytest.skip()
 
     signed_url = gdal.GetSignedURL('/vsioss/oss_fake_bucket/resource',
                                    ['START_DATE=20180212T123456Z'])
@@ -248,11 +247,9 @@ def method(request):
     if data != 'foo':
 
         if gdaltest.is_travis_branch('trusty'):
-            print('Skipped on trusty branch, but should be investigated')
-            return 'skip'
+            pytest.skip('Skipped on trusty branch, but should be investigated')
 
-        print(data)
-        return 'fail'
+        pytest.fail(data)
 
     # Test region and endpoint 'redirects'
     handler.req_count = 0
@@ -364,7 +361,7 @@ def method(request):
 def test_visoss_3():
 
     if gdaltest.webserver_port == 0:
-        return 'skip'
+        pytest.skip()
 
     handler = webserver.SequentialHandler()
 
@@ -417,10 +414,9 @@ def method(request):
     if f is None:
 
         if gdaltest.is_travis_branch('trusty'):
-            print('Skipped on trusty branch, but should be investigated')
-            return 'skip'
+            pytest.skip('Skipped on trusty branch, but should be investigated')
 
-        return 'fail'
+        pytest.fail()
     gdal.VSIFCloseL(f)
 
     with webserver.install_http_handler(webserver.SequentialHandler()):
@@ -558,7 +554,7 @@ def method(request):
 def test_visoss_4():
 
     if gdaltest.webserver_port == 0:
-        return 'skip'
+        pytest.skip()
 
     with webserver.install_http_handler(webserver.SequentialHandler()):
         with gdaltest.error_handler():
@@ -679,7 +675,7 @@ def method(request):
 def test_visoss_5():
 
     if gdaltest.webserver_port == 0:
-        return 'skip'
+        pytest.skip()
 
     with webserver.install_http_handler(webserver.SequentialHandler()):
         with gdaltest.error_handler():
@@ -723,7 +719,7 @@ def test_visoss_5():
 def test_visoss_6():
 
     if gdaltest.webserver_port == 0:
-        return 'skip'
+        pytest.skip()
 
     with gdaltest.config_option('VSIOSS_CHUNK_SIZE', '1'):  # 1 MB
         with webserver.install_http_handler(webserver.SequentialHandler()):
@@ -904,7 +900,7 @@ def method(request):
 def test_visoss_7():
 
     if gdaltest.webserver_port == 0:
-        return 'skip'
+        pytest.skip()
 
     handler = webserver.SequentialHandler()
     handler.add('GET', '/oss_bucket_test_mkdir/dir/', 404, {'Connection': 'close'})
@@ -963,7 +959,7 @@ def test_visoss_7():
 def test_visoss_8():
 
     if gdaltest.webserver_port == 0:
-        return 'skip'
+        pytest.skip()
 
     handler = webserver.SequentialHandler()
     handler.add('GET', '/visoss_8/?delimiter=%2F', 200,
@@ -1002,7 +998,7 @@ def test_visoss_8():
 def test_visoss_stop_webserver():
 
     if gdaltest.webserver_port == 0:
-        return 'skip'
+        pytest.skip()
 
     # Clearcache needed to close all connections, since the Python server
     # can only handle one connection at a time
@@ -1019,20 +1015,17 @@ def test_visoss_stop_webserver():
 def visoss_extra_1():
 
     if not gdaltest.built_against_curl():
-        return 'skip'
+        pytest.skip()
 
     # Either a bucket name or bucket/filename
     OSS_RESOURCE = gdal.GetConfigOption('OSS_RESOURCE')
 
     if gdal.GetConfigOption('OSS_SECRET_ACCESS_KEY') is None:
-        print('Missing OSS_SECRET_ACCESS_KEY for running gdaltest_list_extra')
-        return 'skip'
+        pytest.skip('Missing OSS_SECRET_ACCESS_KEY for running gdaltest_list_extra')
     elif gdal.GetConfigOption('OSS_ACCESS_KEY_ID') is None:
-        print('Missing OSS_ACCESS_KEY_ID for running gdaltest_list_extra')
-        return 'skip'
+        pytest.skip('Missing OSS_ACCESS_KEY_ID for running gdaltest_list_extra')
     elif OSS_RESOURCE is None:
-        print('Missing OSS_RESOURCE for running gdaltest_list_extra')
-        return 'skip'
+        pytest.skip('Missing OSS_RESOURCE for running gdaltest_list_extra')
 
     if OSS_RESOURCE.find('/') < 0:
         path = '/vsioss/' + OSS_RESOURCE
diff --git a/autotest/gcore/vsis3.py b/autotest/gcore/vsis3.py
index d2070ec83ea4..b323f980460b 100755
--- a/autotest/gcore/vsis3.py
+++ b/autotest/gcore/vsis3.py
@@ -73,7 +73,7 @@ def test_vsis3_init():
 def test_vsis3_no_sign_request():
 
     if not gdaltest.built_against_curl():
-        return 'skip'
+        pytest.skip()
 
     with gdaltest.config_option('AWS_NO_SIGN_REQUEST', 'YES'):
         actual_url = gdal.GetActualURL('/vsis3/landsat-pds/L8/001/002/LC80010022016230LGN00/LC80010022016230LGN00_B1.TIF')
@@ -86,9 +86,8 @@ def test_vsis3_no_sign_request():
 
     if f is None:
         if gdaltest.gdalurlopen('https://landsat-pds.s3.amazonaws.com/L8/001/002/LC80010022016230LGN00/LC80010022016230LGN00_B1.TIF') is None:
-            print('cannot open URL')
-            return 'skip'
-        return 'fail'
+            pytest.skip('cannot open URL')
+        pytest.fail()
     gdal.VSIFCloseL(f)
     return 'success'
 
@@ -99,7 +98,7 @@ def test_vsis3_no_sign_request():
 def test_vsis3_1():
 
     if not gdaltest.built_against_curl():
-        return 'skip'
+        pytest.skip()
 
     # Missing AWS_SECRET_ACCESS_KEY
     gdal.ErrorReset()
@@ -131,8 +130,7 @@ def test_vsis3_1():
             gdal.VSIFCloseL(f)
         if gdal.GetConfigOption('APPVEYOR') is not None:
             return 'success'
-        print(gdal.VSIGetLastErrorMsg())
-        return 'fail'
+        pytest.fail(gdal.VSIGetLastErrorMsg())
 
     gdal.ErrorReset()
     with gdaltest.error_handler():
@@ -150,11 +148,11 @@ def test_vsis3_start_webserver():
     gdaltest.webserver_port = 0
 
     if not gdaltest.built_against_curl():
-        return 'skip'
+        pytest.skip()
 
     (gdaltest.webserver_process, gdaltest.webserver_port) = webserver.launch(handler=webserver.DispatcherHttpHandler)
     if gdaltest.webserver_port == 0:
-        return 'skip'
+        pytest.skip()
 
     gdal.SetConfigOption('AWS_SECRET_ACCESS_KEY', 'AWS_SECRET_ACCESS_KEY')
     gdal.SetConfigOption('AWS_ACCESS_KEY_ID', 'AWS_ACCESS_KEY_ID')
@@ -194,7 +192,7 @@ def get_s3_fake_bucket_resource_method(request):
 def test_vsis3_2():
 
     if gdaltest.webserver_port == 0:
-        return 'skip'
+        pytest.skip()
 
     signed_url = gdal.GetSignedURL('/vsis3/s3_fake_bucket/resource')
     expected_url_8080 = 'http://127.0.0.1:8080/s3_fake_bucket/resource?X-Amz-Algorithm=AWS4-HMAC-SHA256&X-Amz-Credential=AWS_ACCESS_KEY_ID%2F20150101%2Fus-east-1%2Fs3%2Faws4_request&X-Amz-Date=20150101T000000Z&X-Amz-Expires=3600&X-Amz-Signature=dca239dd95f72ff8c37c15c840afc54cd19bdb07f7aaee2223108b5b0ad35da8&X-Amz-SignedHeaders=host'
@@ -290,7 +288,7 @@ def method(request):
                 print(stat_res.size)
             else:
                 print(stat_res)
-            return 'fail'
+            pytest.fail()
 
     handler = webserver.SequentialHandler()
     handler.add('HEAD', '/s3_fake_bucket/resource2.bin', 200,
@@ -304,7 +302,7 @@ def method(request):
             print(stat_res.size)
         else:
             print(stat_res)
-        return 'fail'
+        pytest.fail()
 
     handler = webserver.SequentialHandler()
 
@@ -367,11 +365,9 @@ def method(request):
     if data != 'foo':
 
         if gdaltest.is_travis_branch('trusty'):
-            print('Skipped on trusty branch, but should be investigated')
-            return 'skip'
+            pytest.skip('Skipped on trusty branch, but should be investigated')
 
-        print(data)
-        return 'fail'
+        pytest.fail(data)
 
     # Test region and endpoint 'redirects'
     handler.req_count = 0
@@ -588,7 +584,7 @@ def method_req_2(self, request):
 def test_vsis3_readdir():
 
     if gdaltest.webserver_port == 0:
-        return 'skip'
+        pytest.skip()
 
     handler = webserver.SequentialHandler()
 
@@ -679,10 +675,9 @@ def method(request):
     if f is None:
 
         if gdaltest.is_travis_branch('trusty'):
-            print('Skipped on trusty branch, but should be investigated')
-            return 'skip'
+            pytest.skip('Skipped on trusty branch, but should be investigated')
 
-        return 'fail'
+        pytest.fail()
     gdal.VSIFCloseL(f)
 
     with webserver.install_http_handler(webserver.SequentialHandler()):
@@ -959,7 +954,7 @@ def method_req_2(self, request):
 def test_vsis3_opendir():
 
     if gdaltest.webserver_port == 0:
-        return 'skip'
+        pytest.skip()
 
     # Unlimited depth
     handler = webserver.SequentialHandler()
@@ -1107,7 +1102,7 @@ def test_vsis3_opendir():
 def test_vsis3_4():
 
     if gdaltest.webserver_port == 0:
-        return 'skip'
+        pytest.skip()
 
     with webserver.install_http_handler(webserver.SequentialHandler()):
         with gdaltest.error_handler():
@@ -1278,7 +1273,7 @@ def method(request):
 def test_vsis3_5():
 
     if gdaltest.webserver_port == 0:
-        return 'skip'
+        pytest.skip()
 
     with webserver.install_http_handler(webserver.SequentialHandler()):
         with gdaltest.error_handler():
@@ -1354,7 +1349,7 @@ def method(request):
 def test_vsis3_6():
 
     if gdaltest.webserver_port == 0:
-        return 'skip'
+        pytest.skip()
 
     with gdaltest.config_option('VSIS3_CHUNK_SIZE', '1'):  # 1 MB
         with webserver.install_http_handler(webserver.SequentialHandler()):
@@ -1550,7 +1545,7 @@ def method(request):
 def test_vsis3_7():
 
     if gdaltest.webserver_port == 0:
-        return 'skip'
+        pytest.skip()
 
     handler = webserver.SequentialHandler()
     handler.add('GET', '/s3_bucket_test_mkdir/dir/', 404, {'Connection': 'close'})
@@ -1684,7 +1679,7 @@ def test_vsis3_7():
 def test_vsis3_8():
 
     if gdaltest.webserver_port == 0:
-        return 'skip'
+        pytest.skip()
 
     handler = webserver.SequentialHandler()
     handler.add('GET', '/vsis3_8/?delimiter=%2F', 200,
@@ -1724,7 +1719,7 @@ def test_vsis3_8():
 def test_vsis3_sync_etag():
 
     if gdaltest.webserver_port == 0:
-        return 'skip'
+        pytest.skip()
 
     gdal.VSICurlClearCache()
 
@@ -1870,7 +1865,7 @@ def method(request):
 def test_vsis3_sync_timestamp():
 
     if gdaltest.webserver_port == 0:
-        return 'skip'
+        pytest.skip()
 
     options = ['SYNC_STRATEGY=TIMESTAMP']
 
@@ -1937,7 +1932,7 @@ def test_vsis3_sync_timestamp():
 def test_vsis3_read_credentials_file():
 
     if gdaltest.webserver_port == 0:
-        return 'skip'
+        pytest.skip()
 
     gdal.SetConfigOption('AWS_SECRET_ACCESS_KEY', '')
     gdal.SetConfigOption('AWS_ACCESS_KEY_ID', '')
@@ -1980,7 +1975,7 @@ def test_vsis3_read_credentials_file():
 def test_vsis3_read_config_file():
 
     if gdaltest.webserver_port == 0:
-        return 'skip'
+        pytest.skip()
 
     gdal.SetConfigOption('AWS_SECRET_ACCESS_KEY', '')
     gdal.SetConfigOption('AWS_ACCESS_KEY_ID', '')
@@ -2024,7 +2019,7 @@ def test_vsis3_read_config_file():
 def test_vsis3_read_credentials_config_file():
 
     if gdaltest.webserver_port == 0:
-        return 'skip'
+        pytest.skip()
 
     gdal.SetConfigOption('AWS_SECRET_ACCESS_KEY', '')
     gdal.SetConfigOption('AWS_ACCESS_KEY_ID', '')
@@ -2084,7 +2079,7 @@ def test_vsis3_read_credentials_config_file():
 def test_vsis3_read_credentials_config_file_non_default():
 
     if gdaltest.webserver_port == 0:
-        return 'skip'
+        pytest.skip()
 
     gdal.SetConfigOption('AWS_SECRET_ACCESS_KEY', '')
     gdal.SetConfigOption('AWS_ACCESS_KEY_ID', '')
@@ -2143,7 +2138,7 @@ def test_vsis3_read_credentials_config_file_non_default():
 def test_vsis3_read_credentials_config_file_inconsistent():
 
     if gdaltest.webserver_port == 0:
-        return 'skip'
+        pytest.skip()
 
     gdal.SetConfigOption('AWS_SECRET_ACCESS_KEY', '')
     gdal.SetConfigOption('AWS_ACCESS_KEY_ID', '')
@@ -2205,10 +2200,10 @@ def test_vsis3_read_credentials_config_file_inconsistent():
 def test_vsis3_read_credentials_ec2():
 
     if gdaltest.webserver_port == 0:
-        return 'skip'
+        pytest.skip()
 
     if sys.platform not in ('linux', 'linux2', 'win32'):
-        return 'skip'
+        pytest.skip()
 
     gdal.SetConfigOption('CPL_AWS_CREDENTIALS_FILE', '')
     gdal.SetConfigOption('AWS_CONFIG_FILE', '')
@@ -2265,10 +2260,10 @@ def test_vsis3_read_credentials_ec2():
 def test_vsis3_read_credentials_ec2_expiration():
 
     if gdaltest.webserver_port == 0:
-        return 'skip'
+        pytest.skip()
 
     if sys.platform not in ('linux', 'linux2', 'win32'):
-        return 'skip'
+        pytest.skip()
 
     gdal.SetConfigOption('CPL_AWS_CREDENTIALS_FILE', '')
     gdal.SetConfigOption('AWS_CONFIG_FILE', '')
@@ -2317,7 +2312,7 @@ def test_vsis3_read_credentials_ec2_expiration():
 def test_vsis3_stop_webserver():
 
     if gdaltest.webserver_port == 0:
-        return 'skip'
+        pytest.skip()
 
     # Clearcache needed to close all connections, since the Python server
     # can only handle one connection at a time
@@ -2334,7 +2329,7 @@ def test_vsis3_stop_webserver():
 def vsis3_extra_1():
 
     if not gdaltest.built_against_curl():
-        return 'skip'
+        pytest.skip()
 
     credentials_filename = gdal.GetConfigOption('HOME',
                                                 gdal.GetConfigOption('USERPROFILE', '')) + '/.aws/credentials'
@@ -2344,14 +2339,11 @@ def vsis3_extra_1():
 
     if not os.path.exists(credentials_filename):
         if gdal.GetConfigOption('AWS_SECRET_ACCESS_KEY') is None:
-            print('Missing AWS_SECRET_ACCESS_KEY for running gdaltest_list_extra')
-            return 'skip'
+            pytest.skip('Missing AWS_SECRET_ACCESS_KEY for running gdaltest_list_extra')
         elif gdal.GetConfigOption('AWS_ACCESS_KEY_ID') is None:
-            print('Missing AWS_ACCESS_KEY_ID for running gdaltest_list_extra')
-            return 'skip'
+            pytest.skip('Missing AWS_ACCESS_KEY_ID for running gdaltest_list_extra')
     elif s3_resource is None:
-        print('Missing S3_RESOURCE for running gdaltest_list_extra')
-        return 'skip'
+        pytest.skip('Missing S3_RESOURCE for running gdaltest_list_extra')
 
     if s3_resource.find('/') < 0:
         path = '/vsis3/' + s3_resource
diff --git a/autotest/gcore/vsistdin.py b/autotest/gcore/vsistdin.py
index a336471c6262..0080038d3a65 100755
--- a/autotest/gcore/vsistdin.py
+++ b/autotest/gcore/vsistdin.py
@@ -35,6 +35,7 @@
 import gdaltest
 from osgeo import gdal
 import test_cli_utilities
+import pytest
 
 ###############################################################################
 # Test on a small file
@@ -42,7 +43,7 @@
 
 def test_vsistdin_1():
     if test_cli_utilities.get_gdal_translate_path() is None:
-        return 'skip'
+        pytest.skip()
 
     src_ds = gdal.Open('data/byte.tif')
     ds = gdal.GetDriverByName('GTiff').CreateCopy('tmp/vsistdin_1_src.tif', src_ds)
@@ -69,7 +70,7 @@ def test_vsistdin_1():
 
 def test_vsistdin_2():
     if test_cli_utilities.get_gdal_translate_path() is None:
-        return 'skip'
+        pytest.skip()
 
     ds = gdal.GetDriverByName('GTiff').Create('tmp/vsistdin_2_src.tif', 2048, 2048)
     ds = None
@@ -106,7 +107,7 @@ def test_vsistdin_3():
 
 def test_vsistdin_4():
     if test_cli_utilities.get_gdal_translate_path() is None:
-        return 'skip'
+        pytest.skip()
 
     f = open('tmp/vsistdin_4_src.vrt', 'wt')
     f.write("""<VRTDataset rasterXSize="20" rasterYSize="20">
diff --git a/autotest/gcore/vsiswift.py b/autotest/gcore/vsiswift.py
index f3dddb38128e..7b3c1d316e82 100644
--- a/autotest/gcore/vsiswift.py
+++ b/autotest/gcore/vsiswift.py
@@ -35,6 +35,7 @@
 
 import gdaltest
 import webserver
+import pytest
 
 
 def open_for_read(uri):
@@ -64,7 +65,7 @@ def test_vsiswift_init():
 def test_vsiswift_real_server_errors():
 
     if not gdaltest.built_against_curl():
-        return 'skip'
+        pytest.skip()
 
     # Nothing set
     gdal.ErrorReset()
@@ -93,8 +94,7 @@ def test_vsiswift_real_server_errors():
     if f is not None:
         if f is not None:
             gdal.VSIFCloseL(f)
-        print(gdal.VSIGetLastErrorMsg())
-        return 'fail'
+        pytest.fail(gdal.VSIGetLastErrorMsg())
 
     gdal.ErrorReset()
     with gdaltest.error_handler():
@@ -112,11 +112,11 @@ def test_vsiswift_start_webserver():
     gdaltest.webserver_port = 0
 
     if not gdaltest.built_against_curl():
-        return 'skip'
+        pytest.skip()
 
     (gdaltest.webserver_process, gdaltest.webserver_port) = webserver.launch(handler=webserver.DispatcherHttpHandler)
     if gdaltest.webserver_port == 0:
-        return 'skip'
+        pytest.skip()
 
     return 'success'
 
@@ -127,7 +127,7 @@ def test_vsiswift_start_webserver():
 def test_vsiswift_fake_auth_v1_url():
 
     if gdaltest.webserver_port == 0:
-        return 'skip'
+        pytest.skip()
 
     gdal.VSICurlClearCache()
     gdal.SetConfigOption('SWIFT_AUTH_V1_URL', 'http://127.0.0.1:%d/auth/1.0' % gdaltest.webserver_port)
@@ -219,7 +219,7 @@ def method(request):
 def test_vsiswift_fake_auth_storage_url_and_auth_token():
 
     if gdaltest.webserver_port == 0:
-        return 'skip'
+        pytest.skip()
 
     gdal.VSICurlClearCache()
     gdal.SetConfigOption('SWIFT_AUTH_V1_URL', '')
@@ -275,7 +275,7 @@ def method(request):
 def test_vsiswift_stat():
 
     if gdaltest.webserver_port == 0:
-        return 'skip'
+        pytest.skip()
 
     gdal.VSICurlClearCache()
 
@@ -289,7 +289,7 @@ def test_vsiswift_stat():
                 print(stat_res.size)
             else:
                 print(stat_res)
-            return 'fail'
+            pytest.fail()
 
     handler = webserver.SequentialHandler()
     handler.add('HEAD', '/v1/AUTH_something/foo/bar', 200, {'Content-Length': '1000000'})
@@ -300,7 +300,7 @@ def test_vsiswift_stat():
                 print(stat_res.size)
             else:
                 print(stat_res)
-            return 'fail'
+            pytest.fail()
 
     # Test stat on container
     handler = webserver.SequentialHandler()
@@ -320,7 +320,7 @@ def test_vsiswift_stat():
 def test_vsiswift_fake_readdir():
 
     if gdaltest.webserver_port == 0:
-        return 'skip'
+        pytest.skip()
 
     gdal.VSICurlClearCache()
 
@@ -423,7 +423,7 @@ def test_vsiswift_fake_readdir():
 def test_vsiswift_fake_write():
 
     if gdaltest.webserver_port == 0:
-        return 'skip'
+        pytest.skip()
 
     gdal.VSICurlClearCache()
 
@@ -466,9 +466,8 @@ def method(request):
         ret = gdal.VSIFWriteL('x' * 35000, 1, 35000, f)
         ret += gdal.VSIFWriteL('x' * 5000, 1, 5000, f)
         if ret != 40000:
-            print(ret)
             gdal.VSIFCloseL(f)
-            return 'fail'
+            pytest.fail(ret)
         gdal.VSIFCloseL(f)
 
     return 'success'
@@ -480,7 +479,7 @@ def method(request):
 def test_vsiswift_fake_unlink():
 
     if gdaltest.webserver_port == 0:
-        return 'skip'
+        pytest.skip()
 
     gdal.VSICurlClearCache()
 
@@ -512,7 +511,7 @@ def test_vsiswift_fake_unlink():
 def test_vsiswift_fake_mkdir_rmdir():
 
     if gdaltest.webserver_port == 0:
-        return 'skip'
+        pytest.skip()
 
     gdal.VSICurlClearCache()
 
@@ -602,7 +601,7 @@ def test_vsiswift_fake_mkdir_rmdir():
 def test_vsiswift_stop_webserver():
 
     if gdaltest.webserver_port == 0:
-        return 'skip'
+        pytest.skip()
 
     # Clearcache needed to close all connections, since the Python server
     # can only handle one connection at a time
@@ -619,12 +618,11 @@ def test_vsiswift_stop_webserver():
 def vsiswift_extra_1():
 
     if not gdaltest.built_against_curl():
-        return 'skip'
+        pytest.skip()
 
     swift_resource = gdal.GetConfigOption('SWIFT_RESOURCE')
     if swift_resource is None:
-        print('Missing SWIFT_RESOURCE for running gdaltest_list_extra')
-        return 'skip'
+        pytest.skip('Missing SWIFT_RESOURCE for running gdaltest_list_extra')
 
     if swift_resource.find('/') < 0:
         path = '/vsiswift/' + swift_resource
diff --git a/autotest/gcore/vsiwebhdfs.py b/autotest/gcore/vsiwebhdfs.py
index 993ee904ead9..74933f20390d 100644
--- a/autotest/gcore/vsiwebhdfs.py
+++ b/autotest/gcore/vsiwebhdfs.py
@@ -35,6 +35,7 @@
 
 import gdaltest
 import webserver
+import pytest
 
 
 def open_for_read(uri):
@@ -65,12 +66,12 @@ def test_vsiwebhdfs_start_webserver():
     gdaltest.webserver_port = 0
 
     if not gdaltest.built_against_curl():
-        return 'skip'
+        pytest.skip()
 
     (gdaltest.webserver_process, gdaltest.webserver_port) = webserver.launch(
         handler=webserver.DispatcherHttpHandler)
     if gdaltest.webserver_port == 0:
-        return 'skip'
+        pytest.skip()
 
     gdaltest.webhdfs_base_connection = '/vsiwebhdfs/http://localhost:' + \
         str(gdaltest.webserver_port) + '/webhdfs/v1'
@@ -86,7 +87,7 @@ def test_vsiwebhdfs_start_webserver():
 def test_vsiwebhdfs_open():
 
     if gdaltest.webserver_port == 0:
-        return 'skip'
+        pytest.skip()
 
     gdal.VSICurlClearCache()
 
@@ -145,7 +146,7 @@ def test_vsiwebhdfs_open():
 def test_vsiwebhdfs_stat():
 
     if gdaltest.webserver_port == 0:
-        return 'skip'
+        pytest.skip()
 
     gdal.VSICurlClearCache()
 
@@ -159,7 +160,7 @@ def test_vsiwebhdfs_stat():
             print(stat_res.size)
         else:
             print(stat_res)
-        return 'fail'
+        pytest.fail()
 
     # Test caching
     stat_res = gdal.VSIStatL(gdaltest.webhdfs_base_connection + '/foo/bar')
@@ -183,7 +184,7 @@ def test_vsiwebhdfs_stat():
 def test_vsiwebhdfs_readdir():
 
     if gdaltest.webserver_port == 0:
-        return 'skip'
+        pytest.skip()
 
     gdal.VSICurlClearCache()
 
@@ -219,7 +220,7 @@ def test_vsiwebhdfs_readdir():
 def test_vsiwebhdfs_write():
 
     if gdaltest.webserver_port == 0:
-        return 'skip'
+        pytest.skip()
 
     gdal.VSICurlClearCache()
 
@@ -348,7 +349,7 @@ def method(request):
 def test_vsiwebhdfs_unlink():
 
     if gdaltest.webserver_port == 0:
-        return 'skip'
+        pytest.skip()
 
     gdal.VSICurlClearCache()
 
@@ -405,7 +406,7 @@ def test_vsiwebhdfs_unlink():
 def test_vsiwebhdfs_mkdir_rmdir():
 
     if gdaltest.webserver_port == 0:
-        return 'skip'
+        pytest.skip()
 
     gdal.VSICurlClearCache()
 
@@ -472,7 +473,7 @@ def test_vsiwebhdfs_mkdir_rmdir():
 def test_vsiwebhdfs_stop_webserver():
 
     if gdaltest.webserver_port == 0:
-        return 'skip'
+        pytest.skip()
 
     # Clearcache needed to close all connections, since the Python server
     # can only handle one connection at a time
@@ -489,12 +490,11 @@ def test_vsiwebhdfs_stop_webserver():
 def vsiwebhdfs_extra_1():
 
     if not gdaltest.built_against_curl():
-        return 'skip'
+        pytest.skip()
 
     webhdfs_url = gdal.GetConfigOption('WEBHDFS_URL')
     if webhdfs_url is None:
-        print('Missing WEBHDFS_URL for running gdaltest_list_extra')
-        return 'skip'
+        pytest.skip('Missing WEBHDFS_URL for running gdaltest_list_extra')
 
     if webhdfs_url.endswith('/webhdfs/v1') or webhdfs_url.endswith('/webhdfs/v1/'):
         path = '/vsiwebhdfs/' + webhdfs_url
diff --git a/autotest/gcore/vsizip.py b/autotest/gcore/vsizip.py
index 435be4f7786e..083d92792757 100755
--- a/autotest/gcore/vsizip.py
+++ b/autotest/gcore/vsizip.py
@@ -309,7 +309,7 @@ def test_vsizip_6():
     gdal.PopErrorHandler()
     if f is not None:
         gdal.VSIFCloseL(f)
-        return 'fail'
+        pytest.fail()
     gdal.VSIFCloseL(fmain)
     fmain = None
 
@@ -327,7 +327,7 @@ def test_vsizip_6():
     gdal.PopErrorHandler()
     if f is not None:
         gdal.VSIFCloseL(f)
-        return 'fail'
+        pytest.fail()
 
     gdal.Unlink("/vsimem/test6.zip")
 
@@ -408,11 +408,10 @@ def test_vsizip_10():
 
     if ok == 0:
         if gdal.GetLastErrorMsg().find('Recode from CP866 to UTF-8 not supported') >= 0:
-            return 'skip'
+            pytest.skip()
 
-        gdaltest.post_reason('bad content')
         print(content)
-        return 'fail'
+        pytest.fail('bad content')
 
     return 'success'
 
@@ -529,7 +528,7 @@ def test_vsizip_14():
     if f is None:
         gdal.VSIFCloseL(fmain)
         gdal.Unlink('/vsimem/vsizip_14.zip')
-        return 'skip'
+        pytest.skip()
 
     gdal.VSIFWriteL('hello', 1, 5, f)
     gdal.VSIFCloseL(f)
@@ -569,7 +568,7 @@ def test_vsizip_multi_thread():
                 print(i*5, data[i*5:i*5+5], data[i*5-5:i*5+5-5])
                 break
 
-        return 'fail'
+        pytest.fail()
 
     return 'success'
 
@@ -604,7 +603,7 @@ def test_vsizip_multi_thread_below_threshold():
 def test_vsizip_create_zip64():
 
     if not gdaltest.run_slow_tests():
-        return 'skip'
+        pytest.skip()
 
     niters = 1000
     s = 'hello' * 1000 * 1000
@@ -639,7 +638,7 @@ def test_vsizip_create_zip64():
 def test_vsizip_create_zip64_stream_larger_than_4G():
 
     if not gdaltest.run_slow_tests():
-        return 'skip'
+        pytest.skip()
 
     zip_name = 'tmp/vsizip_create_zip64_stream_larger_than_4G.zip'
 
diff --git a/autotest/gdrivers/aaigrid.py b/autotest/gdrivers/aaigrid.py
index 3360cc2bf2aa..84072021549f 100755
--- a/autotest/gdrivers/aaigrid.py
+++ b/autotest/gdrivers/aaigrid.py
@@ -37,6 +37,7 @@
 
 
 import gdaltest
+import pytest
 
 ###############################################################################
 # Perform simple read test.
@@ -216,7 +217,7 @@ def test_aaigrid_9():
 
     if abs(got_minmax[0] - -0.84) < 1e-7:
         return 'success'
-    return 'fail'
+    pytest.fail()
 
 ###############################################################################
 # Test AAIGRID_DATATYPE configuration option and DATATYPE open options
@@ -275,7 +276,7 @@ def test_aaigrid_11():
 
     if abs(got_minmax[0] - -0.84) < 1e-7:
         return 'success'
-    return 'fail'
+    pytest.fail()
 
 ###############################################################################
 # Test no data is written to correct precision with DECIMAL_PRECISION.
diff --git a/autotest/gdrivers/aigrid.py b/autotest/gdrivers/aigrid.py
index b2c6907ddcbb..f7e0769fc316 100755
--- a/autotest/gdrivers/aigrid.py
+++ b/autotest/gdrivers/aigrid.py
@@ -35,6 +35,7 @@
 
 
 import gdaltest
+import pytest
 
 ###############################################################################
 # Read test of simple byte reference data.
@@ -156,7 +157,7 @@ def test_aigrid_online_1():
 
     for filename in list_files:
         if not gdaltest.download_file('http://download.osgeo.org/gdal/data/aig/nzdem/' + filename, 'nzdem/' + filename):
-            return 'skip'
+            pytest.skip()
 
     tst = gdaltest.GDALTest('AIG', 'tmp/cache/nzdem/nzdem500/hdr.adf', 1, 45334, filename_absolute=1)
     ret = tst.testOpen()
@@ -202,7 +203,7 @@ def test_aigrid_online_1():
 def test_aigrid_online_2():
 
     if not gdaltest.download_file('http://download.osgeo.org/gdal/data/aig/ai_bug_6886.zip', 'ai_bug_6886.zip'):
-        return 'skip'
+        pytest.skip()
 
     try:
         os.stat('tmp/cache/ai_bug')
@@ -212,9 +213,9 @@ def test_aigrid_online_2():
             try:
                 os.stat('tmp/cache/ai_bug')
             except OSError:
-                return 'skip'
+                pytest.skip()
         except:
-            return 'skip'
+            pytest.skip()
 
     tst = gdaltest.GDALTest('AIG', 'tmp/cache/ai_bug/ai_bug/hdr.adf', 1, 16018, filename_absolute=1)
     return tst.testOpen()
diff --git a/autotest/gdrivers/arg.py b/autotest/gdrivers/arg.py
index 331482ee180d..78902c94c40b 100755
--- a/autotest/gdrivers/arg.py
+++ b/autotest/gdrivers/arg.py
@@ -36,6 +36,7 @@
 
 
 import gdaltest
+import pytest
 
 # given fmt and nodata, encodes a value as bytes
 
@@ -59,7 +60,7 @@ def encode(fmt, nodata, values):
 def test_arg_init():
     gdaltest.argDriver = gdal.GetDriverByName('ARG')
     if gdaltest.argDriver is None:
-        return 'skip'
+        pytest.skip()
 
     gdaltest.argJsontpl = """{
     "layer": "%(fmt)s",
@@ -119,14 +120,14 @@ def test_arg_init():
         gdaltest.argDriver = None
 
     if gdaltest.argDriver is None:
-        return 'skip'
+        pytest.skip()
 
     return 'success'
 
 
 def test_arg_unsupported():
     if gdaltest.argDriver is None:
-        return 'skip'
+        pytest.skip()
 
     # int8 is unsupported
     for d in gdaltest.argTests:
@@ -144,7 +145,7 @@ def test_arg_unsupported():
 
 def test_arg_getrastercount():
     if gdaltest.argDriver is None:
-        return 'skip'
+        pytest.skip()
 
     for d in gdaltest.argTests:
         for (name, _, _) in d['formats']:
@@ -160,7 +161,7 @@ def test_arg_getrastercount():
 
 def test_arg_getgeotransform():
     if gdaltest.argDriver is None:
-        return 'skip'
+        pytest.skip()
 
     for d in gdaltest.argTests:
         for (name, _, _) in d['formats']:
@@ -183,7 +184,7 @@ def test_arg_getgeotransform():
 
 def test_arg_blocksize():
     if gdaltest.argDriver is None:
-        return 'skip'
+        pytest.skip()
 
     tifDriver = gdal.GetDriverByName('GTiff')
     assert tifDriver is not None
@@ -219,7 +220,7 @@ def test_arg_layername():
     behavior was wrong. See ticket #4609
     """
     if gdaltest.argDriver is None:
-        return 'skip'
+        pytest.skip()
 
     ds = gdal.Open('data/arg-int16.arg')
 
@@ -259,7 +260,7 @@ def test_arg_nodata():
     ARG spec. See ticket #4610
     """
     if gdaltest.argDriver is None:
-        return 'skip'
+        pytest.skip()
 
     ds = gdal.Open('data/arg-int8.arg')
 
@@ -277,7 +278,7 @@ def test_arg_byteorder():
     when the binary data is the same. Compare them byte-by-byte.
     """
     if gdaltest.argDriver is None:
-        return 'skip'
+        pytest.skip()
 
     tifDriver = gdal.GetDriverByName('GTiff')
     assert tifDriver is not None
@@ -320,7 +321,7 @@ def test_arg_byteorder():
 
 def test_arg_destroy():
     if gdaltest.argDriver is None:
-        return 'skip'
+        pytest.skip()
 
     for d in gdaltest.argTests:
         for (name, _, _) in d['formats']:
diff --git a/autotest/gdrivers/bag.py b/autotest/gdrivers/bag.py
index 54b2b2719781..b6575531b131 100755
--- a/autotest/gdrivers/bag.py
+++ b/autotest/gdrivers/bag.py
@@ -59,7 +59,7 @@ def check_no_file_leaks():
 def test_bag_2():
 
     if gdaltest.bag_drv is None:
-        return 'skip'
+        pytest.skip()
 
     ds = gdal.Open('data/true_n_nominal.bag')
 
@@ -105,7 +105,7 @@ def test_bag_2():
 def test_bag_3():
 
     if gdaltest.bag_drv is None:
-        return 'skip'
+        pytest.skip()
 
     ds = gdal.Open('data/southern_hemi_false_northing.bag')
 
@@ -132,7 +132,7 @@ def test_bag_3():
 def test_bag_vr_normal():
 
     if gdaltest.bag_drv is None:
-        return 'skip'
+        pytest.skip()
 
     ds = gdal.Open('data/test_vr.bag')
     assert ds is not None
@@ -175,11 +175,10 @@ def test_bag_vr_normal():
 
     for key in expected_md:
         if key not in got_md or got_md[key] != expected_md[key]:
-            print(key)
             import pprint
             pp = pprint.PrettyPrinter()
             pp.pprint(got_md)
-            return 'fail'
+            pytest.fail(key)
 
     with gdaltest.error_handler():
         ds = gdal.OpenEx('data/test_vr.bag',
@@ -198,7 +197,7 @@ def test_bag_vr_normal():
 def test_bag_vr_list_supergrids():
 
     if gdaltest.bag_drv is None:
-        return 'skip'
+        pytest.skip()
 
     ds = gdal.OpenEx('data/test_vr.bag', open_options=['MODE=LIST_SUPERGRIDS'])
     assert ds is not None
@@ -257,7 +256,7 @@ def test_bag_vr_list_supergrids():
 def test_bag_vr_open_supergrids():
 
     if gdaltest.bag_drv is None:
-        return 'skip'
+        pytest.skip()
 
     ds = gdal.Open('BAG:"data/test_vr.bag":supergrid:0:0')
     assert ds is not None
@@ -297,11 +296,10 @@ def test_bag_vr_open_supergrids():
 
     for key in expected_md:
         if key not in got_md or got_md[key] != expected_md[key]:
-            print(key)
             import pprint
             pp = pprint.PrettyPrinter()
             pp.pprint(got_md)
-            return 'fail'
+            pytest.fail(key)
 
     with gdaltest.error_handler():
         ds = gdal.Open('BAG:"/vsimem/unexisting.bag":supergrid:0:0')
@@ -329,7 +327,7 @@ def test_bag_vr_open_supergrids():
 def test_bag_vr_resampled():
 
     if gdaltest.bag_drv is None:
-        return 'skip'
+        pytest.skip()
 
     ds = gdal.OpenEx('data/test_vr.bag', open_options=['MODE=RESAMPLED_GRID'])
     assert ds is not None
@@ -373,11 +371,10 @@ def test_bag_vr_resampled():
 
     for key in expected_md:
         if key not in got_md or got_md[key] != expected_md[key]:
-            print(key)
             import pprint
             pp = pprint.PrettyPrinter()
             pp.pprint(got_md)
-            return 'fail'
+            pytest.fail(key)
 
     data_ref = ds.ReadRaster()
 
@@ -573,7 +570,7 @@ def test_bag_vr_resampled():
 def test_bag_vr_resampled_mask():
 
     if gdaltest.bag_drv is None:
-        return 'skip'
+        pytest.skip()
 
     ds = gdal.OpenEx('data/test_vr.bag',
                      open_options=['MODE=RESAMPLED_GRID',
@@ -594,7 +591,7 @@ def test_bag_vr_resampled_mask():
 def test_bag_vr_resampled_interpolated():
 
     if gdaltest.bag_drv is None:
-        return 'skip'
+        pytest.skip()
 
     ds = gdal.OpenEx('data/test_vr.bag',
                      open_options=['MODE=RESAMPLED_GRID',
@@ -625,7 +622,7 @@ def test_bag_vr_resampled_interpolated():
 def test_bag_write_single_band():
 
     if gdaltest.bag_drv is None:
-        return 'skip'
+        pytest.skip()
 
     tst = gdaltest.GDALTest('BAG', 'byte.tif', 1, 4672)
     ret = tst.testCreateCopy(quiet_error_handler=False,
@@ -639,7 +636,7 @@ def test_bag_write_single_band():
 def test_bag_write_two_bands():
 
     if gdaltest.bag_drv is None:
-        return 'skip'
+        pytest.skip()
 
     tst = gdaltest.GDALTest('BAG', 'test_vr.bag', 2, 60,
                             options=['BLOCK_SIZE=2',
@@ -665,7 +662,7 @@ def test_bag_write_two_bands():
 def test_bag_write_south_up():
 
     if gdaltest.bag_drv is None:
-        return 'skip'
+        pytest.skip()
 
     # Generate a south-up dataset
     src_ds = gdal.Warp('', 'data/byte.tif',
diff --git a/autotest/gdrivers/bsb.py b/autotest/gdrivers/bsb.py
index f081e747cfe7..686f77609132 100755
--- a/autotest/gdrivers/bsb.py
+++ b/autotest/gdrivers/bsb.py
@@ -33,6 +33,7 @@
 
 
 import gdaltest
+import pytest
 
 ###############################################################################
 # Test driver availability
@@ -41,7 +42,7 @@
 def test_bsb_0():
     gdaltest.bsb_dr = gdal.GetDriverByName('BSB')
     if gdaltest.bsb_dr is None:
-        return 'skip'
+        pytest.skip()
 
     return 'success'
 
@@ -51,7 +52,7 @@ def test_bsb_0():
 
 def test_bsb_1():
     if gdaltest.bsb_dr is None:
-        return 'skip'
+        pytest.skip()
 
     tst = gdaltest.GDALTest('BSB', 'rgbsmall.kap', 1, 30321)
 
@@ -63,11 +64,11 @@ def test_bsb_1():
 
 def test_bsb_2():
     if gdaltest.bsb_dr is None:
-        return 'skip'
+        pytest.skip()
 
     md = gdaltest.bsb_dr.GetMetadata()
     if 'DMD_CREATIONDATATYPES' not in md:
-        return 'skip'
+        pytest.skip()
 
     tst = gdaltest.GDALTest('BSB', 'rgbsmall.kap', 1, 30321)
 
@@ -82,7 +83,7 @@ def test_bsb_2():
 
 def test_bsb_3():
     if gdaltest.bsb_dr is None:
-        return 'skip'
+        pytest.skip()
 
     tst = gdaltest.GDALTest('BSB', 'rgbsmall_index.kap', 1, 30321)
 
@@ -96,7 +97,7 @@ def test_bsb_3():
 
 def test_bsb_4():
     if gdaltest.bsb_dr is None:
-        return 'skip'
+        pytest.skip()
 
     tst = gdaltest.GDALTest('BSB', 'rgbsmall_with_line_break.kap', 1, 30321)
 
@@ -108,7 +109,7 @@ def test_bsb_4():
 
 def test_bsb_5():
     if gdaltest.bsb_dr is None:
-        return 'skip'
+        pytest.skip()
 
     tst = gdaltest.GDALTest('BSB', 'rgbsmall_truncated.kap', 1, 29696)
 
@@ -124,7 +125,7 @@ def test_bsb_5():
 
 def test_bsb_6():
     if gdaltest.bsb_dr is None:
-        return 'skip'
+        pytest.skip()
 
     tst = gdaltest.GDALTest('BSB', 'rgbsmall_truncated2.kap', 1, 29696)
 
diff --git a/autotest/gdrivers/db2.py b/autotest/gdrivers/db2.py
index f03bd36ce461..31cc2c3f9597 100755
--- a/autotest/gdrivers/db2.py
+++ b/autotest/gdrivers/db2.py
@@ -31,6 +31,7 @@
 
 import os
 import sys
+import pytest
 
 # Make sure we run from the directory of the script
 if os.path.basename(sys.argv[0]) == os.path.basename(__file__):
@@ -51,7 +52,7 @@ def test_gpkg_init():
 
     gdaltest.db2_drv = gdal.GetDriverByName('DB2ODBC')
     if gdaltest.db2_drv is None:
-        return 'skip'
+        pytest.skip()
 
     gdaltest.png_dr = gdal.GetDriverByName('PNG')
     gdaltest.jpeg_dr = gdal.GetDriverByName('JPEG')
@@ -65,9 +66,8 @@ def test_gpkg_init():
     if 'DB2_TEST_SERVER' in os.environ:
         gdaltest.db2_test_server = "DB2ODBC:" + os.environ['DB2_TEST_SERVER']
     else:
-        gdaltest.post_reason('Environment variable DB2_TEST_SERVER not found')
         gdaltest.db2_drv = None
-        return 'skip'
+        pytest.skip('Environment variable DB2_TEST_SERVER not found')
 
     print("\ntest server: " + gdaltest.db2_test_server + "\n")
 
@@ -142,7 +142,7 @@ def check_tile_format(out_ds, expected_format, expected_band_count, expected_ct,
     if expected_format is None:
         if mime_type is None:
             return 'success'
-        return 'fail'
+        pytest.fail()
 
     if expected_format == 'PNG':
         expected_mime_type = 'image/png'
@@ -163,9 +163,9 @@ def check_tile_format(out_ds, expected_format, expected_band_count, expected_ct,
 def test_gpkg_1():
 
     if gdaltest.db2_drv is None:
-        return 'skip'
+        pytest.skip()
     if gdaltest.png_dr is None:
-        return 'skip'
+        pytest.skip()
 
     # With padding
     ds = gdal.Open('data/byte.tif')
diff --git a/autotest/gdrivers/derived.py b/autotest/gdrivers/derived.py
index e417ef47a91a..8ea374e750ab 100755
--- a/autotest/gdrivers/derived.py
+++ b/autotest/gdrivers/derived.py
@@ -33,6 +33,7 @@
 
 
 import gdaltest
+import pytest
 
 
 def test_derived_test1():
@@ -61,7 +62,7 @@ def test_derived_test1():
     if got_dsds != expected_dsds:
         import pprint
         pprint.pprint(got_dsds)
-        return 'fail'
+        pytest.fail()
 
     for key in expected_dsds:
         val = expected_dsds[key]
@@ -72,12 +73,12 @@ def test_derived_test1():
             if gt != expected_gt:
                 import pprint
                 pprint.pprint("Expected geotransform: " + str(expected_gt) + ", got " + str(gt))
-                return 'fail'
+                pytest.fail()
             prj = ds.GetProjection()
             if prj != expected_prj:
                 import pprint
                 pprint.pprint("Expected projection: " + str(expected_prj) + ", got: " + str(gt))
-                return 'fail'
+                pytest.fail()
     return 'success'
 
 
@@ -113,7 +114,7 @@ def test_derived_test2():
     if got_dsds != expected_dsds:
         import pprint
         pprint.pprint(got_dsds)
-        return 'fail'
+        pytest.fail()
 
     for key in expected_dsds:
         val = expected_dsds[key]
@@ -124,7 +125,7 @@ def test_derived_test2():
             if expected_cs[key] != cs:
                 import pprint
                 pprint.pprint("Expected checksum " + str(expected_cs[key]) + ", got " + str(cs))
-                return 'fail'
+                pytest.fail()
 
     return 'success'
 
diff --git a/autotest/gdrivers/dods.py b/autotest/gdrivers/dods.py
index 01e2bd8b0a3f..976265d654b9 100755
--- a/autotest/gdrivers/dods.py
+++ b/autotest/gdrivers/dods.py
@@ -33,6 +33,7 @@
 
 
 import gdaltest
+import pytest
 
 
 ###############################################################################
@@ -44,13 +45,13 @@ def dods_1():
 
     gdaltest.dods_dr = gdal.GetDriverByName('DODS')
     if gdaltest.dods_dr is None:
-        return 'skip'
+        pytest.skip()
 
     gdaltest.dods_grid_ds = gdal.Open('http://disc1.sci.gsfc.nasa.gov/opendap/tovs/TOVSAMNF/1985/032/TOVS_MONTHLY_PM_8502_NF.HDF.Z?Data-Set-11[y][x]')
 
     if gdaltest.dods_grid_ds is None:
         gdaltest.dods_dr = None
-        return 'fail'
+        pytest.fail()
 
     return 'success'
 
@@ -60,7 +61,7 @@ def dods_1():
 
 def dods_2():
     if gdaltest.dods_dr is None:
-        return 'skip'
+        pytest.skip()
     tst = gdaltest.GDALTest('dods', 'http://disc1.sci.gsfc.nasa.gov/opendap/tovs/TOVSAMNF/1985/032/TOVS_MONTHLY_PM_8502_NF.HDF.Z?Data-Set-11', 1, 3391, filename_absolute=1)
     return tst.testOpen()
 
@@ -70,7 +71,7 @@ def dods_2():
 
 def dods_3():
     if gdaltest.dods_dr is None:
-        return 'skip'
+        pytest.skip()
     tst = gdaltest.GDALTest('dods', 'http://disc1.sci.gsfc.nasa.gov/opendap/tovs/TOVSAMNF/1985/032/TOVS_MONTHLY_PM_8502_NF.HDF.Z', 12, 43208, filename_absolute=1)
     return tst.testOpen()
 
@@ -80,7 +81,7 @@ def dods_3():
 
 def dods_4():
     if gdaltest.dods_dr is None:
-        return 'skip'
+        pytest.skip()
     tst = gdaltest.GDALTest('dods', 'http://disc1.sci.gsfc.nasa.gov/opendap/tovs/TOVSAMNF/1985/032/TOVS_MONTHLY_PM_8502_NF.HDF.Z?Data-Set-11[y][x]', 1, 3391, filename_absolute=1)
     return tst.testOpen()
 
@@ -90,7 +91,7 @@ def dods_4():
 
 def dods_5():
     if gdaltest.dods_dr is None:
-        return 'skip'
+        pytest.skip()
 
     tst = gdaltest.GDALTest('dods', 'http://disc1.sci.gsfc.nasa.gov/opendap/tovs/TOVSAMNF/1985/032/TOVS_MONTHLY_PM_8502_NF.HDF.Z?Data-Set-11[y][-x]', 1, 2436, filename_absolute=1)
     return tst.testOpen()
@@ -101,11 +102,11 @@ def dods_5():
 
 def dods_6():
     if gdaltest.dods_dr is None:
-        return 'skip'
+        pytest.skip()
 
     # This server seems to no longer be online, skipping test.
 
-    return 'skip'
+    pytest.skip()
 
     # pylint: disable=unreachable
     gdaltest.dods_grid_ds = gdal.Open('http://g0dup05u.ecs.nasa.gov/opendap/AIRS/AIRX3STD.003/2004.12.28/AIRS.2004.12.28.L3.RetStd001.v4.0.9.0.G05253115303.hdf?TotH2OVap_A[y][x]')
@@ -119,7 +120,7 @@ def dods_6():
 
 def dods_cleanup():
     if gdaltest.dods_dr is None:
-        return 'skip'
+        pytest.skip()
 
     gdaltest.dods_dr = None
     gdaltest.dods_grid_ds = None
diff --git a/autotest/gdrivers/ecrgtoc.py b/autotest/gdrivers/ecrgtoc.py
index 93338c737415..c5cab0d6a4f5 100755
--- a/autotest/gdrivers/ecrgtoc.py
+++ b/autotest/gdrivers/ecrgtoc.py
@@ -283,12 +283,12 @@ def test_ecrgtoc_4():
 def test_ecrgtoc_online_1():
 
     if not gdaltest.download_file('http://www.falconview.org/trac/FalconView/downloads/17', 'ECRG_Sample.zip'):
-        return 'skip'
+        pytest.skip()
 
     try:
         os.stat('tmp/cache/ECRG_Sample.zip')
     except OSError:
-        return 'skip'
+        pytest.skip()
 
     ds = gdal.Open('/vsizip/tmp/cache/ECRG_Sample.zip/ECRG_Sample/EPF/TOC.xml')
     assert ds is not None
diff --git a/autotest/gdrivers/ecw.py b/autotest/gdrivers/ecw.py
index 9e40fc6de43b..090c40d0aa65 100755
--- a/autotest/gdrivers/ecw.py
+++ b/autotest/gdrivers/ecw.py
@@ -41,6 +41,7 @@
 
 
 import gdaltest
+import pytest
 
 ###############################################################################
 
@@ -111,7 +112,7 @@ def test_ecw_1():
 def test_ecw_2():
 
     if gdaltest.ecw_drv is None:
-        return 'skip'
+        pytest.skip()
 
     ds = gdal.Open('data/jrc.ecw')
 
@@ -140,7 +141,7 @@ def test_ecw_2():
 
 def test_ecw_3():
     if gdaltest.ecw_drv is None or gdaltest.ecw_write == 0:
-        return 'skip'
+        pytest.skip()
 
     ds = gdal.Open('data/jrc.ecw')
     out_ds = gdaltest.ecw_drv.CreateCopy('tmp/jrc_out.ecw', ds, options=['TARGET=75'])
@@ -153,7 +154,7 @@ def test_ecw_3():
     if out_ds is None:
         if gdal.GetLastErrorMsg().find('ECW_ENCODE_KEY') >= 0:
             gdaltest.ecw_write = 0
-            return 'skip'
+            pytest.skip()
 
     gdaltest.b_ecw_has_write_support = True
 
@@ -166,7 +167,7 @@ def test_ecw_3():
 def test_ecw_4():
 
     if gdaltest.ecw_drv is None or gdaltest.ecw_write == 0:
-        return 'skip'
+        pytest.skip()
 
     gdal.Unlink('tmp/jrc_out.ecw.aux.xml')
 
@@ -201,7 +202,7 @@ def test_ecw_4():
 
 def test_ecw_5():
     if gdaltest.jp2ecw_drv is None or gdaltest.ecw_write == 0:
-        return 'skip'
+        pytest.skip()
 
     ds = gdal.Open('data/small.vrt')
     ds_out = gdaltest.jp2ecw_drv.CreateCopy('tmp/ecw_5.jp2', ds, options=['TARGET=75'])
@@ -219,7 +220,7 @@ def test_ecw_5():
 def test_ecw_6():
 
     if gdaltest.jp2ecw_drv is None or gdaltest.ecw_write == 0:
-        return 'skip'
+        pytest.skip()
 
     ds = gdal.Open('tmp/ecw_5.jp2')
 
@@ -263,7 +264,7 @@ def test_ecw_6():
 
 def test_ecw_7():
     if gdaltest.jp2ecw_drv is None or gdaltest.ecw_write == 0:
-        return 'skip'
+        pytest.skip()
 
     ds = gdal.Open('data/small.vrt')
     drv = gdal.GetDriverByName('NITF')
@@ -279,7 +280,7 @@ def test_ecw_7():
 def test_ecw_8():
 
     if gdaltest.jp2ecw_drv is None or gdaltest.ecw_write == 0:
-        return 'skip'
+        pytest.skip()
 
     ds = gdal.Open('tmp/ecw_7.ntf')
 
@@ -307,11 +308,11 @@ def test_ecw_8():
 
 def test_ecw_9():
     if gdaltest.jp2ecw_drv is None or gdaltest.ecw_write == 0:
-        return 'skip'
+        pytest.skip()
 
     # This always crashes on Frank's machine - some bug in old sdk.
     if os.getenv('USER') == 'warmerda' and gdaltest.ecw_drv.major_version == 3:
-        return 'skip'
+        pytest.skip()
 
     ds = gdaltest.jp2ecw_drv.Create('tmp/ecw9.jp2', 200, 100, 1,
                                     gdal.GDT_Int16, options=['TARGET=75'])
@@ -334,11 +335,11 @@ def test_ecw_9():
 
 def test_ecw_10():
     if gdaltest.jp2ecw_drv is None or gdaltest.ecw_write == 0:
-        return 'skip'
+        pytest.skip()
 
     # This always crashes on Frank's machine - some bug in old sdk.
     if os.getenv('USER') == 'warmerda' and gdaltest.ecw_drv.major_version == 3:
-        return 'skip'
+        pytest.skip()
 
     ds = gdal.Open('tmp/ecw9.jp2')
 
@@ -362,7 +363,7 @@ def test_ecw_10():
 
 def test_ecw_11():
     if gdaltest.jp2ecw_drv is None or gdaltest.ecw_write == 0:
-        return 'skip'
+        pytest.skip()
 
     drv = gdal.GetDriverByName('NITF')
     ds = drv.Create('tmp/test_11.ntf', 200, 100, 3, gdal.GDT_Byte,
@@ -391,7 +392,7 @@ def test_ecw_11():
 
 def test_ecw_12():
     if gdaltest.jp2ecw_drv is None or gdaltest.ecw_write == 0:
-        return 'skip'
+        pytest.skip()
 
     ds = gdal.Open('tmp/test_11.ntf')
 
@@ -421,7 +422,7 @@ def test_ecw_12():
 
 def test_ecw_13():
     if gdaltest.jp2ecw_drv is None:
-        return 'skip'
+        pytest.skip()
 
     ds = gdal.Open('data/rgb16_ecwsdk.jp2')
 
@@ -450,7 +451,7 @@ def test_ecw_13():
 
 def test_ecw_14():
     if gdaltest.jp2ecw_drv is None or gdaltest.ecw_write == 0:
-        return 'skip'
+        pytest.skip()
 
     ds = gdal.Open('data/rgb_gcp.vrt')
     gdaltest.jp2ecw_drv.CreateCopy('tmp/rgb_gcp.jp2', ds)
@@ -464,7 +465,7 @@ def test_ecw_14():
 def test_ecw_15():
 
     if gdaltest.jp2ecw_drv is None or gdaltest.ecw_write == 0:
-        return 'skip'
+        pytest.skip()
 
     ds = gdal.Open('tmp/rgb_gcp.jp2')
 
@@ -488,7 +489,7 @@ def test_ecw_15():
 def test_ecw_16():
 
     if gdaltest.jp2ecw_drv is None:
-        return 'skip'
+        pytest.skip()
 
     srs = """PROJCS["NAD27 / UTM zone 11N",
     GEOGCS["NAD27",
@@ -521,11 +522,10 @@ def test_ecw_16():
 def test_ecw_17():
 
     if gdaltest.jp2ecw_drv is None:
-        return 'skip'
+        pytest.skip()
 
     if gdaltest.ecw_drv.major_version == 4:
-        gdaltest.post_reason('4.x SDK gets unreliable results for jp2')
-        return 'skip'
+        pytest.skip('4.x SDK gets unreliable results for jp2')
 
     ds = gdal.Open('data/int16.jp2')
     ds_ref = gdal.Open('data/int16.tif')
@@ -547,7 +547,7 @@ def test_ecw_17():
 def test_ecw_18():
 
     if gdaltest.jp2ecw_drv is None:
-        return 'skip'
+        pytest.skip()
 
     srs = """PROJCS["NAD27 / UTM zone 11N",
     GEOGCS["NAD27",
@@ -580,7 +580,7 @@ def test_ecw_18():
 def test_ecw_19():
 
     if gdaltest.jp2ecw_drv is None:
-        return 'skip'
+        pytest.skip()
 
     ds = gdal.Open('data/3_13bit_and_1bit.jp2')
 
@@ -602,7 +602,7 @@ def test_ecw_19():
 def test_ecw_20():
 
     if gdaltest.ecw_drv is None:
-        return 'skip'
+        pytest.skip()
 
     ds = gdal.Open('data/jrc.ecw')
 
@@ -640,7 +640,7 @@ def test_ecw_20():
 def test_ecw_21():
 
     if gdaltest.ecw_drv is None:
-        return 'skip'
+        pytest.skip()
 
     ds = gdal.Open('data/jrc.ecw')
     mem_ds = gdal.GetDriverByName('MEM').CreateCopy('xxxyyy', ds, options=['INTERLEAVE=PIXEL'])
@@ -669,7 +669,7 @@ def test_ecw_21():
 def test_ecw_22():
 
     if gdaltest.ecw_drv is None:
-        return 'skip'
+        pytest.skip()
 
     ds = gdal.Open('data/spif83.ecw')
 
@@ -688,7 +688,7 @@ def test_ecw_22():
 def test_ecw_23():
 
     if gdaltest.ecw_drv is None:
-        return 'skip'
+        pytest.skip()
 
     shutil.copyfile('data/spif83.ecw', 'tmp/spif83.ecw')
     shutil.copyfile('data/spif83_hidden.ecw.aux.xml', 'tmp/spif83.ecw.aux.xml')
@@ -719,7 +719,7 @@ def test_ecw_23():
 def test_ecw_24():
 
     if gdaltest.ecw_drv is None:
-        return 'skip'
+        pytest.skip()
 
     shutil.copyfile('data/spif83.ecw', 'tmp/spif83.ecw')
     try:
@@ -733,14 +733,14 @@ def test_ecw_24():
             os.remove('tmp/spif83.ecw')
         except OSError:
             pass
-        return 'skip'
+        pytest.skip()
     gt = [1, 2, 0, 3, 0, -4]
     ds.SetGeoTransform(gt)
     ds = None
 
     try:
         os.stat('tmp/spif83.ecw.aux.xml')
-        return 'fail'
+        pytest.fail()
     except OSError:
         pass
 
@@ -765,7 +765,7 @@ def test_ecw_24():
 def test_ecw_25():
 
     if gdaltest.ecw_drv is None:
-        return 'skip'
+        pytest.skip()
 
     shutil.copyfile('data/spif83.ecw', 'tmp/spif83.ecw')
     try:
@@ -783,7 +783,7 @@ def test_ecw_25():
             os.remove('tmp/spif83.ecw')
         except OSError:
             pass
-        return 'skip'
+        pytest.skip()
     sr = osr.SpatialReference()
     sr.ImportFromERM(proj, datum, units)
     wkt = sr.ExportToWkt()
@@ -792,7 +792,7 @@ def test_ecw_25():
 
     try:
         os.stat('tmp/spif83.ecw.aux.xml')
-        return 'fail'
+        pytest.fail()
     except OSError:
         pass
 
@@ -823,7 +823,7 @@ def test_ecw_25():
 def test_ecw_26():
 
     if gdaltest.ecw_drv is None:
-        return 'skip'
+        pytest.skip()
 
     shutil.copyfile('data/spif83.ecw', 'tmp/spif83.ecw')
     try:
@@ -841,7 +841,7 @@ def test_ecw_26():
             os.remove('tmp/spif83.ecw')
         except OSError:
             pass
-        return 'skip'
+        pytest.skip()
     ds.SetMetadataItem("PROJ", proj, "ECW")
     ds.SetMetadataItem("DATUM", datum, "ECW")
     ds.SetMetadataItem("UNITS", units, "ECW")
@@ -849,7 +849,7 @@ def test_ecw_26():
 
     try:
         os.stat('tmp/spif83.ecw.aux.xml')
-        return 'fail'
+        pytest.fail()
     except OSError:
         pass
 
@@ -884,7 +884,7 @@ def test_ecw_26():
 def test_ecw_27():
 
     if gdaltest.jp2ecw_drv is None or gdaltest.ecw_write == 0:
-        return 'skip'
+        pytest.skip()
 
     ds = gdal.Open('data/byte_without_geotransform.jp2')
 
@@ -903,7 +903,7 @@ def test_ecw_27():
 def test_ecw_28():
 
     if gdaltest.ecw_drv is None:
-        return 'skip'
+        pytest.skip()
 
     x = y = 50
 
@@ -933,7 +933,7 @@ def test_ecw_28():
 def test_ecw_29():
 
     if gdaltest.ecw_drv is None:
-        return 'skip'
+        pytest.skip()
 
     ds = gdal.Open('data/jrc.ecw')
     data_b1 = ds.GetRasterBand(1).ReadRaster(0, 0, 400, 400)
@@ -1004,7 +1004,7 @@ def test_ecw_29():
 def test_ecw_30():
 
     if gdaltest.ecw_drv is None:
-        return 'skip'
+        pytest.skip()
 
     ds = gdal.Open('data/jrc.ecw')
     (blockxsize, blockysize) = ds.GetRasterBand(1).GetBlockSize()
@@ -1023,10 +1023,10 @@ def test_ecw_30():
 def test_ecw_31():
 
     if gdaltest.ecw_drv is None:
-        return 'skip'
+        pytest.skip()
 
     if gdaltest.ecw_drv.major_version < 4:
-        return 'skip'
+        pytest.skip()
 
     ds = gdal.Open('data/jrc.ecw')
     ref_buf = ds.ReadRaster(0, 0, ds.RasterXSize, ds.RasterYSize)
@@ -1042,15 +1042,13 @@ def test_ecw_31():
         elif result[0] != gdal.GARIO_ERROR:
             continue
         else:
-            gdaltest.post_reason('error occurred')
             ds.EndAsyncReader(asyncreader)
-            return 'fail'
+            pytest.fail('error occurred')
 
     if result != [gdal.GARIO_COMPLETE, 0, 0, ds.RasterXSize, ds.RasterYSize]:
-        gdaltest.post_reason('wrong return values for GetNextUpdatedRegion()')
         print(result)
         ds.EndAsyncReader(asyncreader)
-        return 'fail'
+        pytest.fail('wrong return values for GetNextUpdatedRegion()')
 
     async_buf = asyncreader.GetBuffer()
 
@@ -1071,7 +1069,7 @@ def test_ecw_31():
 def test_ecw_32():
 
     if gdaltest.ecw_drv is None:
-        return 'skip'
+        pytest.skip()
 
     ds = gdal.Open('data/jrc.ecw')
     data_123 = ds.ReadRaster(0, 0, ds.RasterXSize, ds.RasterYSize, band_list=[1, 2, 3])
@@ -1111,7 +1109,7 @@ def test_ecw_32():
 def test_ecw_33():
 
     if gdaltest.ecw_drv is None:
-        return 'skip'
+        pytest.skip()
 
     ds = gdal.Open('data/jrc.ecw')
     multiband_data = ds.ReadRaster(100, 100, 50, 50)
@@ -1165,7 +1163,7 @@ def test_ecw_33():
 def test_ecw_33_bis():
 
     if gdaltest.ecw_drv is None:
-        return 'skip'
+        pytest.skip()
 
     ds = gdal.Open('data/jrc.ecw')
     data_ref = ds.ReadRaster(0, 0, 50, 50)
@@ -1202,9 +1200,9 @@ def test_ecw_33_bis():
 def test_ecw_34():
 
     if gdaltest.ecw_drv is None or gdaltest.ecw_write == 0:
-        return 'skip'
+        pytest.skip()
     if gdaltest.ecw_drv.major_version < 5:
-        return 'skip'
+        pytest.skip()
 
     ds = gdal.GetDriverByName('MEM').Create('MEM:::', 128, 128, 1, gdal.GDT_UInt16)
     ds.GetRasterBand(1).Fill(65535)
@@ -1229,7 +1227,7 @@ def test_ecw_34():
 
 def test_ecw_35():
     if gdaltest.jp2ecw_drv is None or gdaltest.ecw_write == 0:
-        return 'skip'
+        pytest.skip()
 
     ds = gdal.GetDriverByName('MEM').Create('MEM:::', 128, 128, 1, gdal.GDT_UInt16)
     ds.GetRasterBand(1).Fill(65535)
@@ -1252,9 +1250,9 @@ def test_ecw_35():
 def test_ecw_36():
 
     if gdaltest.ecw_drv is None or gdaltest.ecw_write == 0:
-        return 'skip'
+        pytest.skip()
     if gdaltest.ecw_drv.major_version < 5:
-        return 'skip'
+        pytest.skip()
 
     vrt_ds = gdal.Open("""<VRTDataset rasterXSize="400" rasterYSize="400">
     <VRTRasterBand dataType="Byte" band="1">
@@ -1311,9 +1309,9 @@ def test_ecw_36():
 def test_ecw_37():
 
     if gdaltest.ecw_drv is None or gdaltest.ecw_write == 0:
-        return 'skip'
+        pytest.skip()
     if gdaltest.ecw_drv.major_version < 5:
-        return 'skip'
+        pytest.skip()
 
     ds = gdal.Open("data/jrc.ecw")
 
@@ -1348,7 +1346,7 @@ def test_ecw_37():
 def test_ecw_38():
 
     if gdaltest.ecw_drv is None:
-        return 'skip'
+        pytest.skip()
 
     gdaltest.ecw_38_fname = ''
     if version_info >= (3, 0, 0):
@@ -1358,7 +1356,7 @@ def test_ecw_38():
     fname = gdaltest.ecw_38_fname
 
     if gdaltest.ecw_drv.major_version < 4:
-        return 'skip'
+        pytest.skip()
 
     shutil.copyfile('data/jrc.ecw', fname)
 
@@ -1383,9 +1381,9 @@ def test_ecw_38():
 def test_ecw_39():
 
     if gdaltest.ecw_drv is None or gdaltest.ecw_write == 0:
-        return 'skip'
+        pytest.skip()
     if gdaltest.ecw_drv.major_version < 5:
-        return 'skip'
+        pytest.skip()
 
     ds = gdal.Open('data/jrc.ecw')
 
@@ -1412,16 +1410,15 @@ def test_ecw_39():
 def test_ecw_40():
 
     if gdaltest.ecw_drv is None:
-        return 'skip'
+        pytest.skip()
 
     ds = gdal.Open('data/stefan_full_rgba_ecwv3_meta.ecw')
     if ds is None:
         if gdaltest.ecw_drv.major_version < 5:
             if gdal.GetLastErrorMsg().find('requires ECW SDK 5.0') >= 0:
-                return 'skip'
-            gdaltest.post_reason('explicit error message expected')
-            return 'fail'
-        return 'fail'
+                pytest.skip()
+            pytest.fail('explicit error message expected')
+        pytest.fail()
 
     expected_md = [
         ('CLOCKWISE_ROTATION_DEG', '0.000000'),
@@ -1460,7 +1457,7 @@ def test_ecw_40():
 def test_ecw_41():
 
     if gdaltest.ecw_drv is None or gdaltest.ecw_drv.major_version < 5:
-        return 'skip'
+        pytest.skip()
 
     shutil.copy('data/stefan_full_rgba_ecwv3_meta.ecw', 'tmp/stefan_full_rgba_ecwv3_meta.ecw')
     try:
@@ -1487,7 +1484,7 @@ def test_ecw_41():
     # Check that there's no .aux.xml file
     try:
         os.stat('tmp/stefan_full_rgba_ecwv3_meta.ecw.aux.xml')
-        return 'fail'
+        pytest.fail()
     except OSError:
         pass
 
@@ -1523,7 +1520,7 @@ def test_ecw_41():
     # Check that there's no .aux.xml file
     try:
         os.stat('tmp/stefan_full_rgba_ecwv3_meta.ecw.aux.xml')
-        return 'fail'
+        pytest.fail()
     except OSError:
         pass
 
@@ -1536,7 +1533,7 @@ def test_ecw_41():
 def test_ecw_42():
 
     if gdaltest.ecw_drv is None or gdaltest.ecw_drv.major_version < 5:
-        return 'skip'
+        pytest.skip()
 
     shutil.copy('data/stefan_full_rgba_ecwv3_meta.ecw', 'tmp/stefan_full_rgba_ecwv3_meta.ecw')
     try:
@@ -1562,7 +1559,7 @@ def test_ecw_42():
     # Check that there's no .aux.xml file
     try:
         os.stat('tmp/stefan_full_rgba_ecwv3_meta.ecw.aux.xml')
-        return 'fail'
+        pytest.fail()
     except OSError:
         pass
 
@@ -1592,7 +1589,7 @@ def test_ecw_42():
     # Check that there's no .aux.xml file
     try:
         os.stat('tmp/stefan_full_rgba_ecwv3_meta.ecw.aux.xml')
-        return 'fail'
+        pytest.fail()
     except OSError:
         pass
 
@@ -1613,7 +1610,7 @@ def test_ecw_42():
 def test_ecw_43():
 
     if gdaltest.jp2ecw_drv is None:
-        return 'skip'
+        pytest.skip()
 
     ds = gdal.Open('data/stefan_full_rgba_alpha_1bit.jp2')
     fourth_band = ds.GetRasterBand(4)
@@ -1651,9 +1648,9 @@ def test_ecw_43():
 def test_ecw_44():
 
     if gdaltest.jp2ecw_drv is None:
-        return 'skip'
+        pytest.skip()
     if gdaltest.ecw_drv.major_version < 5 or (gdaltest.ecw_drv.major_version == 5 and gdaltest.ecw_drv.minor_version < 1):
-        return 'skip'
+        pytest.skip()
 
     ds = gdal.Open('data/stefan_full_rgba_alpha_1bit.jp2')
 
@@ -1699,7 +1696,7 @@ def RemoveDriverMetadata(md):
 
 def test_ecw_45():
     if gdaltest.jp2ecw_drv is None or gdaltest.ecw_write == 0:
-        return 'skip'
+        pytest.skip()
 
     # No metadata
     src_ds = gdal.GetDriverByName('MEM').Create('', 2, 2)
@@ -1775,7 +1772,7 @@ def test_ecw_45():
 def test_ecw_46():
 
     if gdaltest.jp2ecw_drv is None or gdaltest.ecw_write == 0:
-        return 'skip'
+        pytest.skip()
 
     tmp_ds = gdaltest.jp2ecw_drv.CreateCopy('/vsimem/ecw_46.jp2', gdal.Open('data/int16.tif'))
     tmp_ds = None
@@ -1805,10 +1802,10 @@ def test_ecw_46():
 def test_ecw_47():
 
     if gdaltest.ecw_drv is None:
-        return 'skip'
+        pytest.skip()
 
     if gdaltest.ecw_drv.major_version == 3:
-        return 'skip'
+        pytest.skip()
 
     data = open('data/jrc.ecw', 'rb').read()
     gdal.FileFromMemBuffer('/vsimem/ecw_47.ecw', data)
@@ -1839,7 +1836,7 @@ def test_ecw_47():
 def test_ecw_48():
 
     if gdaltest.ecw_drv is None:
-        return 'skip'
+        pytest.skip()
 
     ecw_upward = gdal.GetConfigOption('ECW_ALWAYS_UPWARD', 'TRUE')
     assert ecw_upward == 'TRUE' or ecw_upward == 'ON', \
@@ -1861,7 +1858,7 @@ def test_ecw_48():
 def test_ecw_49():
 
     if gdaltest.ecw_drv is None:
-        return 'skip'
+        pytest.skip()
 
     ecw_upward_old = gdal.GetConfigOption('ECW_ALWAYS_UPWARD', 'TRUE')
     gdal.SetConfigOption('ECW_ALWAYS_UPWARD', 'FALSE')
@@ -1880,10 +1877,10 @@ def test_ecw_49():
 
 def test_ecw_online_1():
     if gdaltest.jp2ecw_drv is None:
-        return 'skip'
+        pytest.skip()
 
     if not gdaltest.download_file('http://download.osgeo.org/gdal/data/jpeg2000/7sisters200.j2k', '7sisters200.j2k'):
-        return 'skip'
+        pytest.skip()
 
     # checksum = 32316 on my PC
     tst = gdaltest.GDALTest('JP2ECW', 'tmp/cache/7sisters200.j2k', 1, None, filename_absolute=1)
@@ -1901,10 +1898,10 @@ def test_ecw_online_1():
 
 def test_ecw_online_2():
     if gdaltest.jp2ecw_drv is None:
-        return 'skip'
+        pytest.skip()
 
     if not gdaltest.download_file('http://download.osgeo.org/gdal/data/jpeg2000/gcp.jp2', 'gcp.jp2'):
-        return 'skip'
+        pytest.skip()
 
     # checksum = 1292 on my PC
     tst = gdaltest.GDALTest('JP2ECW', 'tmp/cache/gcp.jp2', 1, None, filename_absolute=1)
@@ -1927,15 +1924,14 @@ def test_ecw_online_2():
 
 def ecw_online_3():
     if gdaltest.jp2ecw_drv is None:
-        return 'skip'
+        pytest.skip()
     if gdaltest.ecw_drv.major_version == 4:
-        gdaltest.post_reason('4.x SDK gets unreliable results for jp2')
-        return 'skip'
+        pytest.skip('4.x SDK gets unreliable results for jp2')
 
     if not gdaltest.download_file('http://www.openjpeg.org/samples/Bretagne1.j2k', 'Bretagne1.j2k'):
-        return 'skip'
+        pytest.skip()
     if not gdaltest.download_file('http://www.openjpeg.org/samples/Bretagne1.bmp', 'Bretagne1.bmp'):
-        return 'skip'
+        pytest.skip()
 
     # checksum = 16481 on my PC
     tst = gdaltest.GDALTest('JP2ECW', 'tmp/cache/Bretagne1.j2k', 1, None, filename_absolute=1)
@@ -1962,16 +1958,15 @@ def ecw_online_3():
 def test_ecw_online_4():
 
     if gdaltest.jp2ecw_drv is None:
-        return 'skip'
+        pytest.skip()
 
     if gdaltest.ecw_drv.major_version == 5 and gdaltest.ecw_drv.minor_version == 2:
-        print('This test hangs on Linux in a mutex in the SDK 5.2.1')
-        return 'skip'
+        pytest.skip('This test hangs on Linux in a mutex in the SDK 5.2.1')
 
     if not gdaltest.download_file('http://www.openjpeg.org/samples/Bretagne2.j2k', 'Bretagne2.j2k'):
-        return 'skip'
+        pytest.skip()
     if not gdaltest.download_file('http://www.openjpeg.org/samples/Bretagne2.bmp', 'Bretagne2.bmp'):
-        return 'skip'
+        pytest.skip()
 
     # Checksum = 53054 on my PC
     tst = gdaltest.GDALTest('JP2ECW', 'tmp/cache/Bretagne2.j2k', 1, None, filename_absolute=1)
@@ -1998,10 +1993,10 @@ def test_ecw_online_4():
 def test_ecw_online_5():
 
     if gdaltest.ecw_drv is None:
-        return 'skip'
+        pytest.skip()
 
     if not gdaltest.download_file('http://download.osgeo.org/gdal/data/ecw/red_flower.ecw', 'red_flower.ecw'):
-        return 'skip'
+        pytest.skip()
 
     ds = gdal.Open('tmp/cache/red_flower.ecw')
 
@@ -2031,11 +2026,11 @@ def test_ecw_online_5():
 def test_ecw_online_6():
 
     if gdaltest.ecw_drv is None:
-        return 'skip'
+        pytest.skip()
 
     drv = gdal.GetDriverByName('HTTP')
     if drv is None:
-        return 'skip'
+        pytest.skip()
 
     dods_drv = gdal.GetDriverByName('DODS')
     if dods_drv is not None:
@@ -2051,15 +2046,14 @@ def test_ecw_online_6():
         # The ECW driver (3.3) doesn't manage to open in /vsimem, thus fallbacks
         # to writing to /tmp, which doesn't work on Windows
         if sys.platform == 'win32':
-            return 'skip'
+            pytest.skip()
 
         conn = gdaltest.gdalurlopen(url)
         if conn is None:
-            print('cannot open URL')
-            return 'skip'
+            pytest.skip('cannot open URL')
         conn.close()
 
-        return 'fail'
+        pytest.fail()
     ds = None
 
     return 'success'
@@ -2071,10 +2065,10 @@ def test_ecw_online_6():
 def test_ecw_online_7():
 
     if gdaltest.ecw_drv is None:
-        return 'skip'
+        pytest.skip()
 
     if not gdaltest.download_file('http://download.osgeo.org/gdal/data/ecw/sandiego2m_null.ecw', 'sandiego2m_null.ecw'):
-        return 'skip'
+        pytest.skip()
 
     ds = gdal.Open('tmp/cache/sandiego2m_null.ecw')
     if gdaltest.ecw_drv.major_version == 3:
diff --git a/autotest/gdrivers/eedai.py b/autotest/gdrivers/eedai.py
index 884c3e382be5..7cb860c7b7e6 100644
--- a/autotest/gdrivers/eedai.py
+++ b/autotest/gdrivers/eedai.py
@@ -38,6 +38,7 @@
 
 import gdaltest
 import webserver
+import pytest
 
 
 ###############################################################################
@@ -49,7 +50,7 @@ def test_eedai_1():
     gdaltest.eedai_drv = gdal.GetDriverByName('EEDAI')
 
     if gdaltest.eedai_drv is None:
-        return 'skip'
+        pytest.skip()
 
     gdal.SetConfigOption('CPL_CURL_ENABLE_VSIMEM', 'YES')
 
@@ -69,7 +70,7 @@ def test_eedai_1():
 def test_eedai_2():
 
     if gdaltest.eedai_drv is None:
-        return 'skip'
+        pytest.skip()
 
     gdal.FileFromMemBuffer('/vsimem/ee/projects/earthengine-public/assets/image', json.dumps({
         'type': 'IMAGE',
@@ -285,7 +286,6 @@ def test_eedai_2():
     info = gdal.Info(ds, format='json')
     for key in expected_info:
         if not (key in info and info[key] == expected_info[key]):
-            print('Got difference for key %s' % key)
             if key in info:
                 print('Got: ' + str(info[key]))
             else:
@@ -293,7 +293,7 @@ def test_eedai_2():
             print('Expected: ' + str(expected_info[key]))
             print('Whole info:')
             print(json.dumps(info, indent=4))
-            return 'fail'
+            pytest.fail('Got difference for key %s' % key)
 
     assert ds.GetProjectionRef().find('32610') >= 0
 
@@ -346,10 +346,10 @@ def test_eedai_2():
 def test_eedai_3():
 
     if gdaltest.eedai_drv is None:
-        return 'skip'
+        pytest.skip()
 
     if gdaltest.is_travis_branch('gcc52_stdcpp14_sanitize'):
-        return 'skip'
+        pytest.skip()
 
     gdal.SetConfigOption('EEDA_URL', '/vsimem/ee/')
     # Generated with 'openssl genrsa -out rsa-openssl.pem 1024' and
@@ -385,7 +385,7 @@ def test_eedai_3():
     gdal.SetConfigOption('EEDA_CLIENT_EMAIL', None)
 
     if gdal.GetLastErrorMsg().find('CPLRSASHA256Sign() not implemented') >= 0:
-        return 'skip'
+        pytest.skip()
 
     assert ds is not None
 
@@ -398,10 +398,10 @@ def test_eedai_3():
 def test_eedai_GOOGLE_APPLICATION_CREDENTIALS():
 
     if gdaltest.eedai_drv is None:
-        return 'skip'
+        pytest.skip()
 
     if gdaltest.is_travis_branch('gcc52_stdcpp14_sanitize'):
-        return 'skip'
+        pytest.skip()
 
     gdal.FileFromMemBuffer('/vsimem/my.json', """{
 "private_key":"-----BEGIN PRIVATE KEY-----
@@ -442,7 +442,7 @@ def test_eedai_GOOGLE_APPLICATION_CREDENTIALS():
     gdal.SetConfigOption('EEDA_CLIENT_EMAIL', None)
 
     if gdal.GetLastErrorMsg().find('CPLRSASHA256Sign() not implemented') >= 0:
-        return 'skip'
+        pytest.skip()
 
     assert ds is not None
 
@@ -455,20 +455,20 @@ def test_eedai_GOOGLE_APPLICATION_CREDENTIALS():
 def test_eedai_gce_credentials():
 
     if gdaltest.eedai_drv is None:
-        return 'skip'
+        pytest.skip()
 
     if sys.platform not in ('linux', 'linux2', 'win32'):
-        return 'skip'
+        pytest.skip()
 
     gdaltest.webserver_process = None
     gdaltest.webserver_port = 0
 
     if not gdaltest.built_against_curl():
-        return 'skip'
+        pytest.skip()
 
     (gdaltest.webserver_process, gdaltest.webserver_port) = webserver.launch(handler=webserver.DispatcherHttpHandler)
     if gdaltest.webserver_port == 0:
-        return 'skip'
+        pytest.skip()
 
     gdal.SetConfigOption('CPL_GCE_CREDENTIALS_URL',
                          'http://localhost:%d/computeMetadata/v1/instance/service-accounts/default/token' % gdaltest.webserver_port)
@@ -523,7 +523,7 @@ def method(request):
 def test_eedai_4():
 
     if gdaltest.eedai_drv is None:
-        return 'skip'
+        pytest.skip()
 
     gdal.FileFromMemBuffer('/vsimem/ee/projects/earthengine-public/assets/image', json.dumps({
         'type': 'IMAGE',
@@ -657,7 +657,7 @@ def test_eedai_4():
 def test_eedai_geotiff():
 
     if gdaltest.eedai_drv is None:
-        return 'skip'
+        pytest.skip()
 
     gdal.FileFromMemBuffer('/vsimem/ee/projects/earthengine-public/assets/image', json.dumps({
         'type': 'IMAGE',
@@ -720,17 +720,15 @@ def test_eedai_geotiff():
 def test_eedai_real_service():
 
     if gdaltest.eedai_drv is None:
-        return 'skip'
+        pytest.skip()
 
     if gdal.GetConfigOption('GOOGLE_APPLICATION_CREDENTIALS') is None:
 
         if gdal.GetConfigOption('EEDA_PRIVATE_KEY_FILE') is None and gdal.GetConfigOption('EEDA_PRIVATE_KEY') is None:
-            print('Missing EEDA_PRIVATE_KEY_FILE/EEDA_PRIVATE_KEY or GOOGLE_APPLICATION_CREDENTIALS')
-            return 'skip'
+            pytest.skip('Missing EEDA_PRIVATE_KEY_FILE/EEDA_PRIVATE_KEY or GOOGLE_APPLICATION_CREDENTIALS')
 
         if gdal.GetConfigOption('EEDA_CLIENT_EMAIL') is None:
-            print('Missing EEDA_CLIENT_EMAIL')
-            return 'skip'
+            pytest.skip('Missing EEDA_CLIENT_EMAIL')
 
     ds = gdal.Open('EEDAI:USDA/NAIP/DOQQ/n_4010064_se_14_2_20070725')
     assert ds is not None
@@ -755,7 +753,7 @@ def test_eedai_real_service():
 def test_eedai_cleanup():
 
     if gdaltest.eedai_drv is None:
-        return 'skip'
+        pytest.skip()
 
     gdal.SetConfigOption('CPL_CURL_ENABLE_VSIMEM', None)
     gdal.SetConfigOption('EEDA_BEARER', gdaltest.EEDA_BEARER)
diff --git a/autotest/gdrivers/envisat.py b/autotest/gdrivers/envisat.py
index 40dbb2a62c82..9e807392d7b1 100755
--- a/autotest/gdrivers/envisat.py
+++ b/autotest/gdrivers/envisat.py
@@ -97,7 +97,7 @@ def download_file(self):
 
     def test_envisat_1(self):
         if not self.download_file():
-            return 'skip'
+            pytest.skip()
 
         ds = gdal.Open(os.path.join('tmp', 'cache', self.fileName))
         assert ds is not None
@@ -109,7 +109,7 @@ def test_envisat_1(self):
 
     def test_envisat_2(self):
         if not self.download_file():
-            return 'skip'
+            pytest.skip()
 
         ds = gdal.Open(os.path.join('tmp', 'cache', self.fileName))
         assert ds is not None
@@ -123,7 +123,7 @@ def test_envisat_3(self):
         # Regression test for #3160 and #3709.
 
         if not self.download_file():
-            return 'skip'
+            pytest.skip()
 
         ds = gdal.Open(os.path.join('tmp', 'cache', self.fileName))
         assert ds is not None
@@ -132,8 +132,7 @@ def test_envisat_3(self):
         for gcp in ds.GetGCPs():
             lp = (gcp.GCPLine, gcp.GCPPixel)
             if lp in d:
-                gdaltest.post_reason('Duplicate GCP coordinates.')
-                return 'fail'
+                pytest.fail('Duplicate GCP coordinates.')
             else:
                 d[lp] = (gcp.GCPX, gcp.GCPY, gcp.GCPZ)
 
@@ -143,7 +142,7 @@ def test_envisat_4(self):
         # test number of bands
 
         if not self.download_file():
-            return 'skip'
+            pytest.skip()
 
         filename = os.path.join('tmp', 'cache', self.fileName)
         mds_num = _get_mds_num(filename)
@@ -159,7 +158,7 @@ def test_envisat_5(self):
         # test metadata in RECORDS domain
 
         if not self.download_file():
-            return 'skip'
+            pytest.skip()
 
         ds = gdal.Open(os.path.join('tmp', 'cache', self.fileName))
         assert ds is not None
@@ -186,7 +185,7 @@ def test_envisat_asar_1(self):
         # test sensor ID
 
         if not self.download_file():
-            return 'skip'
+            pytest.skip()
 
         ds = gdal.Open(os.path.join('tmp', 'cache', self.fileName))
         assert ds is not None
@@ -201,7 +200,7 @@ def test_envisat_asar_2(self):
         # test metadata in RECORDS domain
 
         if not self.download_file():
-            return 'skip'
+            pytest.skip()
 
         ds = gdal.Open(os.path.join('tmp', 'cache', self.fileName))
         assert ds is not None
@@ -249,7 +248,7 @@ def test_envisat_meris_1(self):
         # test sensor ID
 
         if not self.download_file():
-            return 'skip'
+            pytest.skip()
 
         ds = gdal.Open(os.path.join('tmp', 'cache', self.fileName))
         assert ds is not None
@@ -264,7 +263,7 @@ def test_envisat_meris_2(self):
         # test metadata in RECORDS domain
 
         if not self.download_file():
-            return 'skip'
+            pytest.skip()
 
         ds = gdal.Open(os.path.join('tmp', 'cache', self.fileName))
         assert ds is not None
@@ -288,7 +287,7 @@ def test_envisat_meris_3(self):
         # test Flag bands
 
         if not self.download_file():
-            return 'skip'
+            pytest.skip()
 
         ds = gdal.Open(os.path.join('tmp', 'cache', self.fileName))
         assert ds is not None
@@ -328,8 +327,7 @@ def test_envisat_meris_3(self):
                 ('Incorrect data type of the flag band in '
                                      'MERIS Level 2 product.')
         else:
-            gdaltest.post_reason('Invalid product level: %s.' % level)
-            return 'fail'
+            pytest.fail('Invalid product level: %s.' % level)
 
         return 'success'
 
@@ -337,7 +335,7 @@ def test_envisat_meris_4(self):
         # test DEM corrections (see #5423)
 
         if not self.download_file():
-            return 'skip'
+            pytest.skip()
 
         ds = gdal.Open(os.path.join('tmp', 'cache', self.fileName))
         assert ds is not None
diff --git a/autotest/gdrivers/ers.py b/autotest/gdrivers/ers.py
index 551f94a0530d..af0b7281cf02 100755
--- a/autotest/gdrivers/ers.py
+++ b/autotest/gdrivers/ers.py
@@ -189,10 +189,9 @@ def test_ers_9():
 
     f = gdal.VSIFOpenL('/vsimem/ers_9.ers.aux.xml', 'rb')
     if f is not None:
-        gdaltest.post_reason('/vsimem/ers_9.ers.aux.xml should not exist')
         gdal.VSIFCloseL(f)
         drv.Delete('/vsimem/ers_9.ers')
-        return 'fail'
+        pytest.fail('/vsimem/ers_9.ers.aux.xml should not exist')
 
     ds = gdal.Open('/vsimem/ers_9.ers')
     val = ds.GetRasterBand(1).GetNoDataValue()
@@ -240,10 +239,9 @@ def test_ers_10():
 
     f = gdal.VSIFOpenL('/vsimem/ers_10.ers.aux.xml', 'rb')
     if f is not None:
-        gdaltest.post_reason('/vsimem/ers_10.ers.aux.xml should not exist')
         gdal.VSIFCloseL(f)
         drv.Delete('/vsimem/ers_10.ers')
-        return 'fail'
+        pytest.fail('/vsimem/ers_10.ers.aux.xml should not exist')
 
     ds = gdal.Open('/vsimem/ers_10.ers')
     wkt = ds.GetProjectionRef()
diff --git a/autotest/gdrivers/fast.py b/autotest/gdrivers/fast.py
index 02e059750fc9..df0ea65ab9be 100755
--- a/autotest/gdrivers/fast.py
+++ b/autotest/gdrivers/fast.py
@@ -34,6 +34,7 @@
 
 
 import gdaltest
+import pytest
 
 ###############################################################################
 # Verify we have the driver.
@@ -43,7 +44,7 @@ def test_fast_1():
 
     gdaltest.fast_drv = gdal.GetDriverByName('FAST')
     if gdaltest.fast_drv is None:
-        return 'skip'
+        pytest.skip()
 
     return 'success'
 
@@ -54,7 +55,7 @@ def test_fast_1():
 def test_fast_2():
 
     if gdaltest.fast_drv is None:
-        return 'skip'
+        pytest.skip()
 
     # Actually, the band (a placeholder) is of 0 bytes size,
     # so the checksum is 0 expected.
@@ -70,7 +71,7 @@ def test_fast_2():
 def test_fast_3():
 
     if gdaltest.fast_drv is None:
-        return 'skip'
+        pytest.skip()
 
     gdaltest.fast_ds = gdal.Open('data/L71118038_03820020111_HPN.FST')
     ds = gdaltest.fast_ds
@@ -107,7 +108,7 @@ def test_fast_3():
 def test_fast_4():
 
     if gdaltest.fast_drv is None:
-        return 'skip'
+        pytest.skip()
 
     ds = gdaltest.fast_ds
     assert ds is not None, 'Missing test dataset'
@@ -132,7 +133,7 @@ def test_fast_4():
 def test_fast_5():
 
     if gdaltest.fast_drv is None:
-        return 'skip'
+        pytest.skip()
 
     tst = gdaltest.GDALTest('fast', 'L71230079_07920021111_HTM.FST', 2, 19110,
                             0, 0, 7000, 1)
@@ -172,7 +173,7 @@ def test_fast_5():
 def test_fast_6():
 
     if gdaltest.fast_drv is None:
-        return 'skip'
+        pytest.skip()
 
     tst = gdaltest.GDALTest('fast', 'n0o0y867.0fl', 1, 0, 0, 0, 2741, 1)
 
@@ -193,7 +194,7 @@ def test_fast_6():
 def test_fast_7():
 
     if gdaltest.fast_drv is None:
-        return 'skip'
+        pytest.skip()
 
     tst = gdaltest.GDALTest('fast', 'h0o0y867.1ah', 1, 0, 0, 0, 5815, 1)
 
@@ -225,7 +226,7 @@ def test_fast_7():
 def test_fast_8():
 
     if gdaltest.fast_drv is None:
-        return 'skip'
+        pytest.skip()
 
     tst = gdaltest.GDALTest('fast', 'w0y13a4t.010', 1, 0, 0, 0, 4748, 1)
 
@@ -259,7 +260,7 @@ def test_fast_8():
 def test_fast_9():
 
     if gdaltest.fast_drv is None:
-        return 'skip'
+        pytest.skip()
 
     ds = gdal.Open('data/HEADER.DAT')
     assert ds.GetMetadataItem('SENSOR') == '', 'Did not get expected SENSOR value.'
diff --git a/autotest/gdrivers/gdalhttp.py b/autotest/gdrivers/gdalhttp.py
index aa810f169e2e..78f1589c975e 100755
--- a/autotest/gdrivers/gdalhttp.py
+++ b/autotest/gdrivers/gdalhttp.py
@@ -37,6 +37,7 @@
 
 
 import gdaltest
+import pytest
 
 ###############################################################################
 # Verify we have the driver.
@@ -48,7 +49,7 @@ def test_http_1():
 
     drv = gdal.GetDriverByName('HTTP')
     if drv is None:
-        return 'skip'
+        pytest.skip()
 
     gdaltest.dods_drv = gdal.GetDriverByName('DODS')
     if gdaltest.dods_drv is not None:
@@ -60,8 +61,7 @@ def test_http_1():
     if ret == 'fail':
         conn = gdaltest.gdalurlopen('http://gdal.org/gdalicon.png')
         if conn is None:
-            print('cannot open URL')
-            return 'skip'
+            pytest.skip('cannot open URL')
         conn.close()
 
     return ret
@@ -74,7 +74,7 @@ def test_http_2():
 
     drv = gdal.GetDriverByName('HTTP')
     if drv is None:
-        return 'skip'
+        pytest.skip()
 
     tst = gdaltest.GDALTest('GTiff', '/vsicurl/https://raw.githubusercontent.com/OSGeo/gdal/master/autotest/gcore/data/byte.tif',
                             1, 4672, filename_absolute=1)
@@ -82,8 +82,7 @@ def test_http_2():
     if ret == 'fail':
         conn = gdaltest.gdalurlopen('https://raw.githubusercontent.com/OSGeo/gdal/master/autotest/gcore/data/byte.tif')
         if conn is None:
-            print('cannot open URL')
-            return 'skip'
+            pytest.skip('cannot open URL')
         conn.close()
 
     return ret
@@ -96,7 +95,7 @@ def test_http_3():
 
     drv = gdal.GetDriverByName('HTTP')
     if drv is None:
-        return 'skip'
+        pytest.skip()
 
     gdal.SetConfigOption('GDAL_HTTP_TIMEOUT', '5')
     ds = gdal.Open('/vsicurl/http://download.osgeo.org/gdal/data/ehdr/elggll.bil')
@@ -104,10 +103,9 @@ def test_http_3():
     if ds is None:
         conn = gdaltest.gdalurlopen('http://download.osgeo.org/gdal/data/ehdr/elggll.bil')
         if conn is None:
-            print('cannot open URL')
-            return 'skip'
+            pytest.skip('cannot open URL')
         conn.close()
-        return 'fail'
+        pytest.fail()
 
     return 'success'
 
@@ -119,7 +117,7 @@ def http_4_old():
 
     drv = gdal.GetDriverByName('HTTP')
     if drv is None:
-        return 'skip'
+        pytest.skip()
 
     ds = gdal.Open('/vsicurl/ftp://ftp2.cits.rncan.gc.ca/pub/cantopo/250k_tif/MCR2010_01.tif')
     if ds is None:
@@ -128,14 +126,13 @@ def http_4_old():
         # builds on other machines...
         # This heuristics might be fragile !
         if "GDAL_DATA" in os.environ and os.environ["GDAL_DATA"].find("E:\\builds\\..\\sdk\\") == 0:
-            return 'skip'
+            pytest.skip()
 
         conn = gdaltest.gdalurlopen('ftp://ftp2.cits.rncan.gc.ca/pub/cantopo/250k_tif/MCR2010_01.tif')
         if conn is None:
-            print('cannot open URL')
-            return 'skip'
+            pytest.skip('cannot open URL')
         conn.close()
-        return 'fail'
+        pytest.fail()
 
     filelist = ds.GetFileList()
     assert filelist[0] == '/vsicurl/ftp://ftp2.cits.rncan.gc.ca/pub/cantopo/250k_tif/MCR2010_01.tif'
@@ -150,28 +147,25 @@ def test_http_4():
 
     # Too unreliable
     if gdaltest.skip_on_travis():
-        return 'skip'
+        pytest.skip()
 
     drv = gdal.GetDriverByName('HTTP')
     if drv is None:
-        return 'skip'
+        pytest.skip()
 
     ds = gdal.Open('/vsicurl/ftp://download.osgeo.org/gdal/data/gtiff/utm.tif')
     if ds is None:
         conn = gdaltest.gdalurlopen('ftp://download.osgeo.org/gdal/data/gtiff/utm.tif', timeout=4)
         if conn is None:
-            print('cannot open URL')
-            return 'skip'
+            pytest.skip('cannot open URL')
         try:
             conn.read()
         except:
-            print('cannot read')
-            return 'skip'
+            pytest.skip('cannot read')
         conn.close()
         if sys.platform == 'darwin' and gdal.GetConfigOption('TRAVIS', None) is not None:
-            print("Fails on MacOSX Travis sometimes. Not sure why.")
-            return 'skip'
-        return 'fail'
+            pytest.skip("Fails on MacOSX Travis sometimes. Not sure why.")
+        pytest.fail()
 
     filelist = ds.GetFileList()
     assert '/vsicurl/ftp://download.osgeo.org/gdal/data/gtiff/utm.tif' in filelist
@@ -186,28 +180,25 @@ def test_http_5():
 
     drv = gdal.GetDriverByName('HTTP')
     if drv is None:
-        return 'skip'
+        pytest.skip()
 
     ds = gdal.Open('https://raw.githubusercontent.com/OSGeo/gdal/master/autotest/gdrivers/data/s4103.blx')
     if ds is None:
         conn = gdaltest.gdalurlopen('https://raw.githubusercontent.com/OSGeo/gdal/master/autotest/gdrivers/data/s4103.blx')
         if conn is None:
-            print('cannot open URL')
-            return 'skip'
+            pytest.skip('cannot open URL')
         try:
             conn.read()
         except:
-            print('cannot read')
-            return 'skip'
+            pytest.skip('cannot read')
         conn.close()
-        return 'fail'
+        pytest.fail()
     filename = ds.GetDescription()
     ds = None
 
     try:
         os.stat(filename)
-        gdaltest.post_reason('file %s should have been removed' % filename)
-        return 'fail'
+        pytest.fail('file %s should have been removed' % filename)
     except OSError:
         pass
 
@@ -221,21 +212,19 @@ def test_http_6():
 
     drv = gdal.GetDriverByName('HTTP')
     if drv is None:
-        return 'skip'
+        pytest.skip()
 
     ds = ogr.Open('https://raw.githubusercontent.com/OSGeo/gdal/master/autotest/ogr/data/test.jml')
     if ds is None:
         conn = gdaltest.gdalurlopen('https://raw.githubusercontent.com/OSGeo/gdal/master/autotest/ogr/data/test.jml')
         if conn is None:
-            print('cannot open URL')
-            return 'skip'
+            pytest.skip('cannot open URL')
         try:
             conn.read()
         except:
-            print('cannot read')
-            return 'skip'
+            pytest.skip('cannot read')
         conn.close()
-        return 'fail'
+        pytest.fail()
     ds = None
 
     return 'success'
@@ -246,7 +235,7 @@ def test_http_6():
 def test_http_test_ssl_verifystatus():
 
     if gdal.GetDriverByName('HTTP') is None:
-        return 'skip'
+        pytest.skip()
 
     with gdaltest.config_option('GDAL_HTTP_SSL_VERIFYSTATUS', 'YES'):
         with gdaltest.error_handler():
@@ -257,10 +246,9 @@ def test_http_test_ssl_verifystatus():
 
         # The test actually works on Travis Mac
         if sys.platform == 'darwin' and gdal.GetConfigOption('TRAVIS', None) is not None:
-            return 'skip'
+            pytest.skip()
 
-        print(last_err)
-        return 'fail'
+        pytest.fail(last_err)
 
     return 'success'
 
@@ -270,7 +258,7 @@ def test_http_test_ssl_verifystatus():
 def test_http_test_use_capi_store():
 
     if gdal.GetDriverByName('HTTP') is None:
-        return 'skip'
+        pytest.skip()
 
     if sys.platform != 'win32':
         with gdaltest.error_handler():
diff --git a/autotest/gdrivers/georaster.py b/autotest/gdrivers/georaster.py
index 8001ba12ea3e..3796904ab644 100755
--- a/autotest/gdrivers/georaster.py
+++ b/autotest/gdrivers/georaster.py
@@ -35,6 +35,7 @@
 
 
 import gdaltest
+import pytest
 
 ###############################################################################
 #
@@ -59,15 +60,15 @@ def test_georaster_init():
 
     gdaltest.georasterDriver = gdal.GetDriverByName('GeoRaster')
     if gdaltest.georasterDriver is None:
-        return 'skip'
+        pytest.skip()
 
     if os.environ.get('OCI_DSNAME') is None:
-        return 'skip'
+        pytest.skip()
 
     gdaltest.oci_ds = ogr.Open(os.environ.get('OCI_DSNAME'))
 
     if gdaltest.oci_ds is None:
-        return 'skip'
+        pytest.skip()
 
     gdal.PushErrorHandler('CPLQuietErrorHandler')
     rs = gdaltest.oci_ds.ExecuteSQL('select owner from all_sdo_geor_sysdata')
@@ -80,11 +81,9 @@ def test_georaster_init():
         rs = None
 
     if err_msg != '':
-        gdaltest.post_reason('ALL_SDO_GEOR_SYSDATA inaccessible, '
-                             'likely georaster unavailable.')
-
         gdaltest.oci_ds = None
-        return 'skip'
+        pytest.skip('ALL_SDO_GEOR_SYSDATA inaccessible, '
+                             'likely georaster unavailable.')
 
     return 'success'
 
@@ -95,10 +94,10 @@ def test_georaster_init():
 def test_georaster_byte():
 
     if gdaltest.georasterDriver is None:
-        return 'skip'
+        pytest.skip()
 
     if gdaltest.oci_ds is None:
-        return 'skip'
+        pytest.skip()
 
     ds_src = gdal.Open('data/byte.tif')
 
@@ -122,10 +121,10 @@ def test_georaster_byte():
 def test_georaster_int16():
 
     if gdaltest.georasterDriver is None:
-        return 'skip'
+        pytest.skip()
 
     if gdaltest.oci_ds is None:
-        return 'skip'
+        pytest.skip()
 
     get_connection_str()
 
@@ -151,10 +150,10 @@ def test_georaster_int16():
 def test_georaster_int32():
 
     if gdaltest.georasterDriver is None:
-        return 'skip'
+        pytest.skip()
 
     if gdaltest.oci_ds is None:
-        return 'skip'
+        pytest.skip()
 
     get_connection_str()
 
@@ -180,10 +179,10 @@ def test_georaster_int32():
 def test_georaster_rgb_b1():
 
     if gdaltest.georasterDriver is None:
-        return 'skip'
+        pytest.skip()
 
     if gdaltest.oci_ds is None:
-        return 'skip'
+        pytest.skip()
 
     ds_src = gdal.Open('data/rgbsmall.tif')
 
@@ -208,10 +207,10 @@ def test_georaster_rgb_b1():
 def test_georaster_rgb_b2():
 
     if gdaltest.georasterDriver is None:
-        return 'skip'
+        pytest.skip()
 
     if gdaltest.oci_ds is None:
-        return 'skip'
+        pytest.skip()
 
     ds_src = gdal.Open('data/rgbsmall.tif')
 
@@ -236,10 +235,10 @@ def test_georaster_rgb_b2():
 def test_georaster_rgb_b3_bsq():
 
     if gdaltest.georasterDriver is None:
-        return 'skip'
+        pytest.skip()
 
     if gdaltest.oci_ds is None:
-        return 'skip'
+        pytest.skip()
 
     ds_src = gdal.Open('data/rgbsmall.tif')
 
@@ -264,10 +263,10 @@ def test_georaster_rgb_b3_bsq():
 def test_georaster_rgb_b3_bip():
 
     if gdaltest.georasterDriver is None:
-        return 'skip'
+        pytest.skip()
 
     if gdaltest.oci_ds is None:
-        return 'skip'
+        pytest.skip()
 
     ds_src = gdal.Open('data/rgbsmall.tif')
 
@@ -292,10 +291,10 @@ def test_georaster_rgb_b3_bip():
 def test_georaster_rgb_b3_bil():
 
     if gdaltest.georasterDriver is None:
-        return 'skip'
+        pytest.skip()
 
     if gdaltest.oci_ds is None:
-        return 'skip'
+        pytest.skip()
 
     ds_src = gdal.Open('data/rgbsmall.tif')
 
@@ -320,10 +319,10 @@ def test_georaster_rgb_b3_bil():
 def test_georaster_byte_deflate():
 
     if gdaltest.georasterDriver is None:
-        return 'skip'
+        pytest.skip()
 
     if gdaltest.oci_ds is None:
-        return 'skip'
+        pytest.skip()
 
     ds_src = gdal.Open('data/byte.tif')
 
@@ -348,10 +347,10 @@ def test_georaster_byte_deflate():
 def test_georaster_rgb_deflate_b3():
 
     if gdaltest.georasterDriver is None:
-        return 'skip'
+        pytest.skip()
 
     if gdaltest.oci_ds is None:
-        return 'skip'
+        pytest.skip()
 
     ds_src = gdal.Open('data/rgbsmall.tif')
 
@@ -376,10 +375,10 @@ def test_georaster_rgb_deflate_b3():
 def test_georaster_1bit():
 
     if gdaltest.georasterDriver is None:
-        return 'skip'
+        pytest.skip()
 
     if gdaltest.oci_ds is None:
-        return 'skip'
+        pytest.skip()
 
     ds_src = gdal.Open('data/byte.tif')
 
@@ -404,10 +403,10 @@ def test_georaster_1bit():
 def test_georaster_2bit():
 
     if gdaltest.georasterDriver is None:
-        return 'skip'
+        pytest.skip()
 
     if gdaltest.oci_ds is None:
-        return 'skip'
+        pytest.skip()
 
     ds_src = gdal.Open('data/byte.tif')
 
@@ -432,10 +431,10 @@ def test_georaster_2bit():
 def test_georaster_4bit():
 
     if gdaltest.georasterDriver is None:
-        return 'skip'
+        pytest.skip()
 
     if gdaltest.oci_ds is None:
-        return 'skip'
+        pytest.skip()
 
     ds_src = gdal.Open('data/byte.tif')
 
@@ -460,10 +459,10 @@ def test_georaster_4bit():
 def test_georaster_cleanup():
 
     if gdaltest.georasterDriver is None:
-        return 'skip'
+        pytest.skip()
 
     if gdaltest.oci_ds is None:
-        return 'skip'
+        pytest.skip()
 
     gdaltest.oci_ds.ExecuteSQL('drop table GDAL_TEST')
     gdaltest.oci_ds.ExecuteSQL('drop table GDAL_TEST_RDT')
diff --git a/autotest/gdrivers/gff.py b/autotest/gdrivers/gff.py
index 8dc33ec73660..1310546e2620 100755
--- a/autotest/gdrivers/gff.py
+++ b/autotest/gdrivers/gff.py
@@ -33,6 +33,7 @@
 
 
 import gdaltest
+import pytest
 
 ###############################################################################
 # Test an extract from a real dataset
@@ -41,7 +42,7 @@
 def test_gff_1():
     # 12088 = 2048 + 8 * 1255
     if not gdaltest.download_file('http://sandia.gov/RADAR/complex_data/MiniSAR20050519p0001image008.gff', 'MiniSAR20050519p0001image008.gff', 12088):
-        return 'skip'
+        pytest.skip()
 
     tst = gdaltest.GDALTest('GFF', 'tmp/cache/MiniSAR20050519p0001image008.gff', 1, 29757, filename_absolute=1)
     gdal.PushErrorHandler('CPLQuietErrorHandler')
diff --git a/autotest/gdrivers/gmt.py b/autotest/gdrivers/gmt.py
index e54bc0f25116..f56f8a2f8a5d 100755
--- a/autotest/gdrivers/gmt.py
+++ b/autotest/gdrivers/gmt.py
@@ -33,6 +33,7 @@
 
 
 import gdaltest
+import pytest
 
 ###############################################################################
 # Perform simple read test.
@@ -43,7 +44,7 @@ def test_gmt_1():
     gdaltest.gmt_drv = gdal.GetDriverByName('GMT')
 
     if gdaltest.gmt_drv is None:
-        return 'skip'
+        pytest.skip()
 
     tst = gdaltest.GDALTest('GMT', 'gmt_1.grd', 1, 34762)
 
@@ -59,7 +60,7 @@ def test_gmt_1():
 def test_gmt_2():
 
     if gdaltest.gmt_drv is None:
-        return 'skip'
+        pytest.skip()
 
     tst = gdaltest.GDALTest('GMT', 'int16.tif', 1, 4672)
     return tst.testCreateCopy(check_gt=1)
diff --git a/autotest/gdrivers/gpkg.py b/autotest/gdrivers/gpkg.py
index bf63bbcea367..fc175cbdf8d7 100755
--- a/autotest/gdrivers/gpkg.py
+++ b/autotest/gdrivers/gpkg.py
@@ -31,6 +31,7 @@
 
 import os
 import sys
+import pytest
 
 # Make sure we run from the directory of the script
 if os.path.basename(sys.argv[0]) == os.path.basename(__file__):
@@ -85,7 +86,7 @@ def test_gpkg_init():
 
     gdaltest.gpkg_dr = gdal.GetDriverByName('GPKG')
     if gdaltest.gpkg_dr is None:
-        return 'skip'
+        pytest.skip()
 
     gdaltest.png_dr = gdal.GetDriverByName('PNG')
     gdaltest.jpeg_dr = gdal.GetDriverByName('JPEG')
@@ -174,7 +175,7 @@ def check_tile_format(out_ds, expected_format, expected_band_count, expected_ct,
     if expected_format is None:
         if mime_type is None:
             return 'success'
-        return 'fail'
+        pytest.fail()
 
     if expected_format == 'PNG':
         expected_mime_type = 'image/png'
@@ -195,9 +196,9 @@ def check_tile_format(out_ds, expected_format, expected_band_count, expected_ct,
 def test_gpkg_1():
 
     if gdaltest.gpkg_dr is None:
-        return 'skip'
+        pytest.skip()
     if gdaltest.png_dr is None:
-        return 'skip'
+        pytest.skip()
 
     gdal.Unlink('/vsimem/tmp.gpkg')
 
@@ -285,9 +286,9 @@ def test_gpkg_1():
 def test_gpkg_2():
 
     if gdaltest.gpkg_dr is None:
-        return 'skip'
+        pytest.skip()
     if gdaltest.jpeg_dr is None:
-        return 'skip'
+        pytest.skip()
 
     gdal.Unlink('/vsimem/tmp.gpkg')
 
@@ -370,9 +371,9 @@ def test_gpkg_2():
 def test_gpkg_3():
 
     if gdaltest.gpkg_dr is None:
-        return 'skip'
+        pytest.skip()
     if gdaltest.webp_dr is None:
-        return 'skip'
+        pytest.skip()
 
     gdal.Unlink('/vsimem/tmp.gpkg')
 
@@ -435,7 +436,7 @@ def test_gpkg_3():
     gdal.PopErrorHandler()
     if gdal.GetLastErrorMsg() == '':
         gdaltest.webp_dr.Register()
-        return 'fail'
+        pytest.fail()
 
     # And at pixel reading time as well
     gdal.ErrorReset()
@@ -444,7 +445,7 @@ def test_gpkg_3():
     gdal.PopErrorHandler()
     if gdal.GetLastErrorMsg() == '':
         gdaltest.webp_dr.Register()
-        return 'fail'
+        pytest.fail()
     out_ds = None
 
     # Re-register driver
@@ -474,7 +475,7 @@ def test_gpkg_3():
 def test_gpkg_4(tile_drv_name='PNG'):
 
     if gdaltest.gpkg_dr is None:
-        return 'skip'
+        pytest.skip()
     if tile_drv_name == 'PNG':
         tile_drv = gdaltest.png_dr
         working_bands = 4
@@ -488,7 +489,7 @@ def test_gpkg_4(tile_drv_name='PNG'):
         else:
             working_bands = 3
     if tile_drv is None:
-        return 'skip'
+        pytest.skip()
 
     gdal.Unlink('/vsimem/tmp.gpkg')
 
@@ -571,7 +572,7 @@ def get_georeferenced_rgba_ds(alpha_fully_transparent=False, alpha_fully_opaque=
 def test_gpkg_7(tile_drv_name='PNG'):
 
     if gdaltest.gpkg_dr is None:
-        return 'skip'
+        pytest.skip()
     if tile_drv_name == 'PNG':
         tile_drv = gdaltest.png_dr
         working_bands = 4
@@ -585,7 +586,7 @@ def test_gpkg_7(tile_drv_name='PNG'):
         else:
             working_bands = 3
     if tile_drv is None:
-        return 'skip'
+        pytest.skip()
 
     gdal.Unlink('/vsimem/tmp.gpkg')
 
@@ -678,9 +679,9 @@ def get_georeferenced_ds_with_pct32():
 def test_gpkg_10():
 
     if gdaltest.gpkg_dr is None:
-        return 'skip'
+        pytest.skip()
     if gdaltest.png_dr is None:
-        return 'skip'
+        pytest.skip()
 
     gdal.Unlink('/vsimem/tmp.gpkg')
 
@@ -773,7 +774,7 @@ def test_gpkg_10():
 def test_gpkg_11(tile_drv_name='JPEG'):
 
     if gdaltest.gpkg_dr is None:
-        return 'skip'
+        pytest.skip()
     if tile_drv_name == 'JPEG':
         tile_drv = gdaltest.jpeg_dr
         working_bands = 3
@@ -784,7 +785,7 @@ def test_gpkg_11(tile_drv_name='JPEG'):
         else:
             working_bands = 3
     if tile_drv is None:
-        return 'skip'
+        pytest.skip()
 
     gdal.Unlink('/vsimem/tmp.gpkg')
 
@@ -833,9 +834,9 @@ def test_gpkg_12():
 def test_gpkg_13():
 
     if gdaltest.gpkg_dr is None:
-        return 'skip'
+        pytest.skip()
     if gdaltest.png_dr is None:
-        return 'skip'
+        pytest.skip()
 
     gdal.Unlink('/vsimem/tmp.gpkg')
 
@@ -889,9 +890,9 @@ def test_gpkg_13():
 def test_gpkg_14():
 
     if gdaltest.gpkg_dr is None:
-        return 'skip'
+        pytest.skip()
     if gdaltest.png_dr is None:
-        return 'skip'
+        pytest.skip()
 
     gdal.Unlink('/vsimem/tmp.gpkg')
 
@@ -1144,10 +1145,9 @@ def test_gpkg_14():
     expected_cs = [0, 56451, 0, 0]
     got_cs = [ds.GetRasterBand(i + 1).Checksum() for i in range(4)]
     if got_cs != expected_cs:
-        print('Got %s, expected %s' % (str(got_cs), str(expected_cs)))
         ds.GetRasterBand(4).Fill(255)
         # sys.exit(0)
-        return 'fail'
+        pytest.fail('Got %s, expected %s' % (str(got_cs), str(expected_cs)))
     ds = None
 
     # Overflow occurred in ComputeTileAndPixelShifts()
@@ -1179,7 +1179,7 @@ def test_gpkg_14():
 def test_gpkg_15():
 
     if gdaltest.gpkg_dr is None:
-        return 'skip'
+        pytest.skip()
 
     gdal.Unlink('/vsimem/tmp.gpkg')
 
@@ -1298,9 +1298,9 @@ def test_gpkg_15():
 def test_gpkg_16():
 
     if gdaltest.gpkg_dr is None:
-        return 'skip'
+        pytest.skip()
     if gdaltest.jpeg_dr is None:
-        return 'skip'
+        pytest.skip()
 
     gdal.Unlink('/vsimem/tmp.gpkg')
 
@@ -1335,9 +1335,9 @@ def test_gpkg_16():
 def test_gpkg_17():
 
     if gdaltest.gpkg_dr is None:
-        return 'skip'
+        pytest.skip()
     if gdaltest.png_dr is None:
-        return 'skip'
+        pytest.skip()
 
     gdal.Unlink('/vsimem/tmp.gpkg')
 
@@ -1470,9 +1470,9 @@ def test_gpkg_17():
 def test_gpkg_18():
 
     if gdaltest.gpkg_dr is None:
-        return 'skip'
+        pytest.skip()
     if gdaltest.png_dr is None:
-        return 'skip'
+        pytest.skip()
     gdal.Unlink('/vsimem/tmp.gpkg')
 
     # Without padding, immediately after create copy
@@ -1573,9 +1573,9 @@ def test_gpkg_18():
 def test_gpkg_19():
 
     if gdaltest.gpkg_dr is None:
-        return 'skip'
+        pytest.skip()
     if gdaltest.png_dr is None:
-        return 'skip'
+        pytest.skip()
 
     gdal.Unlink('/vsimem/tmp.gpkg')
 
@@ -1614,9 +1614,9 @@ def test_gpkg_19():
 def test_gpkg_20():
 
     if gdaltest.gpkg_dr is None:
-        return 'skip'
+        pytest.skip()
     if gdaltest.png_dr is None:
-        return 'skip'
+        pytest.skip()
 
     gdal.Unlink('/vsimem/tmp.gpkg')
 
@@ -1694,9 +1694,9 @@ def test_gpkg_20():
 def test_gpkg_21():
 
     if gdaltest.gpkg_dr is None:
-        return 'skip'
+        pytest.skip()
     if gdaltest.png_dr is None:
-        return 'skip'
+        pytest.skip()
 
     gdal.Unlink('/vsimem/tmp.gpkg')
 
@@ -1726,15 +1726,13 @@ def test_gpkg_21():
 
         assert not out_ds.GetMetadata('GEOPACKAGE')
         if out_ds.GetMetadataItem('foo') != foo_value:
-            print(out_ds.GetMetadataItem('foo'))
             feat.DumpReadable()
-            return 'fail'
+            pytest.fail(out_ds.GetMetadataItem('foo'))
         md = out_ds.GetMetadata()
         if len(md) != 3 or md['foo'] != foo_value or \
                 md['IDENTIFIER'] != 'tmp' or md['ZOOM_LEVEL'] != '0':
-            print(md)
             feat.DumpReadable()
-            return 'fail'
+            pytest.fail(md)
 
         sql_lyr = out_ds.ExecuteSQL('SELECT * FROM gpkg_metadata')
         feat = sql_lyr.GetNextFeature()
@@ -1747,9 +1745,8 @@ def test_gpkg_21():
   </Metadata>
 </GDALMultiDomainMetadata>
 """ % foo_value:
-            print(i)
             feat.DumpReadable()
-            return 'fail'
+            pytest.fail(i)
         out_ds.ReleaseResultSet(sql_lyr)
 
         sql_lyr = out_ds.ExecuteSQL('SELECT * FROM gpkg_metadata_reference')
@@ -1761,9 +1758,8 @@ def test_gpkg_21():
                 not feat.IsFieldSet('timestamp') or \
                 feat.GetField('md_file_id') != 1 or \
                 not feat.IsFieldNull('md_parent_id'):
-            print(i)
             feat.DumpReadable()
-            return 'fail'
+            pytest.fail(i)
         out_ds.ReleaseResultSet(sql_lyr)
 
         if i == 1:
@@ -1786,14 +1782,14 @@ def test_gpkg_21():
     if feat is not None:
         feat.DumpReadable()
         out_ds.ReleaseResultSet(sql_lyr)
-        return 'fail'
+        pytest.fail()
     out_ds.ReleaseResultSet(sql_lyr)
     sql_lyr = out_ds.ExecuteSQL('SELECT * FROM gpkg_metadata_reference')
     feat = sql_lyr.GetNextFeature()
     if feat is not None:
         feat.DumpReadable()
         out_ds.ReleaseResultSet(sql_lyr)
-        return 'fail'
+        pytest.fail()
     out_ds.ReleaseResultSet(sql_lyr)
 
     out_ds.SetMetadataItem('IDENTIFIER', 'my_identifier')
@@ -1809,14 +1805,14 @@ def test_gpkg_21():
     if feat is not None:
         feat.DumpReadable()
         out_ds.ReleaseResultSet(sql_lyr)
-        return 'fail'
+        pytest.fail()
     out_ds.ReleaseResultSet(sql_lyr)
     sql_lyr = out_ds.ExecuteSQL('SELECT * FROM gpkg_metadata_reference')
     feat = sql_lyr.GetNextFeature()
     if feat is not None:
         feat.DumpReadable()
         out_ds.ReleaseResultSet(sql_lyr)
-        return 'fail'
+        pytest.fail()
     out_ds.ReleaseResultSet(sql_lyr)
 
     # Write metadata in global scope
@@ -1841,7 +1837,7 @@ def test_gpkg_21():
 """:
         feat.DumpReadable()
         out_ds.ReleaseResultSet(sql_lyr)
-        return 'fail'
+        pytest.fail()
     out_ds.ReleaseResultSet(sql_lyr)
 
     sql_lyr = out_ds.ExecuteSQL('SELECT * FROM gpkg_metadata_reference')
@@ -1855,7 +1851,7 @@ def test_gpkg_21():
             not feat.IsFieldNull('md_parent_id'):
         feat.DumpReadable()
         out_ds.ReleaseResultSet(sql_lyr)
-        return 'fail'
+        pytest.fail()
     out_ds.ReleaseResultSet(sql_lyr)
 
     out_ds.SetMetadataItem('bar', 'baz', 'GEOPACKAGE')
@@ -1914,14 +1910,14 @@ def test_gpkg_21():
     if feat is not None:
         feat.DumpReadable()
         out_ds.ReleaseResultSet(sql_lyr)
-        return 'fail'
+        pytest.fail()
     out_ds.ReleaseResultSet(sql_lyr)
     sql_lyr = out_ds.ExecuteSQL('SELECT * FROM gpkg_metadata_reference WHERE md_file_id < 10')
     feat = sql_lyr.GetNextFeature()
     if feat is not None:
         feat.DumpReadable()
         out_ds.ReleaseResultSet(sql_lyr)
-        return 'fail'
+        pytest.fail()
     out_ds.ReleaseResultSet(sql_lyr)
     out_ds = None
 
@@ -1946,11 +1942,11 @@ def get_georeferenced_greyalpha_ds():
 def test_gpkg_22(tile_drv_name='PNG'):
 
     if gdaltest.gpkg_dr is None:
-        return 'skip'
+        pytest.skip()
     if tile_drv_name is None:
         tile_drv = gdaltest.png_dr
         if gdaltest.jpeg_dr is None:
-            return 'skip'
+            pytest.skip()
         expected_cs = [2466, 10807]
         clamped_expected_cs = [1989, 1989, 1989, 11580]
     if tile_drv_name == 'PNG':
@@ -1970,7 +1966,7 @@ def test_gpkg_22(tile_drv_name='PNG'):
             expected_cs = [13112, 32706]
             clamped_expected_cs = [13380, 13380, 13380, 32744]
     if tile_drv is None:
-        return 'skip'
+        pytest.skip()
 
     gdal.Unlink('/vsimem/tmp.gpkg')
 
@@ -2036,9 +2032,9 @@ def test_gpkg_25():
 def test_gpkg_26():
 
     if gdaltest.gpkg_dr is None:
-        return 'skip'
+        pytest.skip()
     if gdaltest.png_dr is None:
-        return 'skip'
+        pytest.skip()
 
     gdal.Unlink('/vsimem/tmp.gpkg')
 
@@ -2151,9 +2147,9 @@ def test_gpkg_26():
 def test_gpkg_27():
 
     if gdaltest.gpkg_dr is None:
-        return 'skip'
+        pytest.skip()
     if gdaltest.png_dr is None:
-        return 'skip'
+        pytest.skip()
 
     gdal.Unlink('/vsimem/tmp.gpkg')
 
@@ -2177,9 +2173,9 @@ def test_gpkg_27():
 def test_gpkg_28():
 
     if gdaltest.gpkg_dr is None:
-        return 'skip'
+        pytest.skip()
     if gdaltest.png_dr is None:
-        return 'skip'
+        pytest.skip()
 
     gdal.Unlink('/vsimem/tmp.gpkg')
 
@@ -2217,9 +2213,9 @@ def test_gpkg_28():
 def test_gpkg_29(x=0):
 
     if gdaltest.gpkg_dr is None:
-        return 'skip'
+        pytest.skip()
     if gdaltest.png_dr is None:
-        return 'skip'
+        pytest.skip()
 
     gdal.Unlink('/vsimem/tmp.gpkg')
 
@@ -2267,9 +2263,9 @@ def test_gpkg_30():
 def test_gpkg_31():
 
     if gdaltest.gpkg_dr is None:
-        return 'skip'
+        pytest.skip()
     if gdaltest.png_dr is None:
-        return 'skip'
+        pytest.skip()
 
     gdal.Unlink('/vsimem/tmp.gpkg')
 
@@ -2294,9 +2290,9 @@ def test_gpkg_31():
 def test_gpkg_32():
 
     if gdaltest.gpkg_dr is None:
-        return 'skip'
+        pytest.skip()
     if gdaltest.png_dr is None:
-        return 'skip'
+        pytest.skip()
 
     gdal.Unlink('/vsimem/tmp.gpkg')
 
@@ -2326,9 +2322,9 @@ def test_gpkg_32():
 def test_gpkg_33():
 
     if gdaltest.gpkg_dr is None:
-        return 'skip'
+        pytest.skip()
     if gdaltest.png_dr is None:
-        return 'skip'
+        pytest.skip()
 
     gdal.Unlink('/vsimem/tmp.gpkg')
 
@@ -2355,9 +2351,9 @@ def test_gpkg_33():
 def test_gpkg_34():
 
     if gdaltest.gpkg_dr is None:
-        return 'skip'
+        pytest.skip()
     if gdaltest.png_dr is None:
-        return 'skip'
+        pytest.skip()
 
     gdal.Unlink('/vsimem/tmp.gpkg')
 
@@ -2383,9 +2379,9 @@ def test_gpkg_34():
 def test_gpkg_35():
 
     if gdaltest.gpkg_dr is None:
-        return 'skip'
+        pytest.skip()
     if gdaltest.png_dr is None:
-        return 'skip'
+        pytest.skip()
 
     gdal.Unlink('/vsimem/tmp.gpkg')
 
@@ -2433,9 +2429,9 @@ def test_gpkg_35():
 def test_gpkg_36():
 
     if gdaltest.gpkg_dr is None:
-        return 'skip'
+        pytest.skip()
     if gdaltest.png_dr is None:
-        return 'skip'
+        pytest.skip()
 
     src_ds = gdal.Open('data/small_world_pct.tif')
     out_ds = gdaltest.gpkg_dr.CreateCopy('/vsimem/gpkg_36.gpkg', src_ds, options=['TILE_FORMAT=PNG', 'TILING_SCHEME=GoogleMapsCompatible', 'RESAMPLING=NEAREST'])
@@ -2462,7 +2458,7 @@ def test_gpkg_36():
 def test_gpkg_37():
 
     if gdaltest.gpkg_dr is None:
-        return 'skip'
+        pytest.skip()
 
     ds = gdal.GetDriverByName('GPKG').Create('/vsimem/gpkg_37.gpkg', 205000, 200000)
     ds.SetGeoTransform([100, 0.000001, 0, 100, 0, -0.000001])
@@ -2483,7 +2479,7 @@ def test_gpkg_37():
 def test_gpkg_38():
 
     if gdaltest.gpkg_dr is None:
-        return 'skip'
+        pytest.skip()
 
     # Without padding, immediately after create copy
     src_ds = gdal.Open('data/small_world.tif')
@@ -2520,7 +2516,7 @@ def test_gpkg_38():
 def test_gpkg_39():
 
     if gdaltest.gpkg_dr is None:
-        return 'skip'
+        pytest.skip()
 
     src_ds = gdal.Open('data/int16.tif')
     gdal.Translate('/vsimem/gpkg_39.gpkg', src_ds, format='GPKG')
@@ -2542,17 +2538,17 @@ def test_gpkg_39():
     f = sql_lyr.GetNextFeature()
     if f['scale'] != 1.0:
         f.DumpReadable()
-        return 'fail'
+        pytest.fail()
     if f['offset'] != 0.0:
         f.DumpReadable()
-        return 'fail'
+        pytest.fail()
     ds.ReleaseResultSet(sql_lyr)
 
     sql_lyr = ds.ExecuteSQL('SELECT grid_cell_encoding FROM gpkg_2d_gridded_coverage_ancillary')
     f = sql_lyr.GetNextFeature()
     if f['grid_cell_encoding'] != 'grid-value-is-area':
         f.DumpReadable()
-        return 'fail'
+        pytest.fail()
     ds.ReleaseResultSet(sql_lyr)
 
     # No metadata for now
@@ -2566,13 +2562,13 @@ def test_gpkg_39():
     f = sql_lyr.GetNextFeature()
     if f['application_id'] != 1196444487:
         f.DumpReadable()
-        return 'fail'
+        pytest.fail()
     ds.ReleaseResultSet(sql_lyr)
     sql_lyr = ds.ExecuteSQL('PRAGMA user_version')
     f = sql_lyr.GetNextFeature()
     if f['user_version'] != 10200:
         f.DumpReadable()
-        return 'fail'
+        pytest.fail()
     ds.ReleaseResultSet(sql_lyr)
 
     # Statistics not available on partial tile without nodata
@@ -2876,7 +2872,7 @@ def test_gpkg_39():
 def test_gpkg_40():
 
     if gdaltest.gpkg_dr is None:
-        return 'skip'
+        pytest.skip()
 
     src_ds = gdal.Open('data/byte.tif')
     # Should default to 1.2
@@ -2886,13 +2882,13 @@ def test_gpkg_40():
     f = sql_lyr.GetNextFeature()
     if f['application_id'] != 1196444487:
         f.DumpReadable()
-        return 'fail'
+        pytest.fail()
     ds.ReleaseResultSet(sql_lyr)
     sql_lyr = ds.ExecuteSQL('PRAGMA user_version')
     f = sql_lyr.GetNextFeature()
     if f['user_version'] != 10200:
         f.DumpReadable()
-        return 'fail'
+        pytest.fail()
     ds.ReleaseResultSet(sql_lyr)
     ds = None
 
@@ -2904,13 +2900,13 @@ def test_gpkg_40():
     f = sql_lyr.GetNextFeature()
     if f['application_id'] != 1196437808:
         f.DumpReadable()
-        return 'fail'
+        pytest.fail()
     ds.ReleaseResultSet(sql_lyr)
     sql_lyr = ds.ExecuteSQL('PRAGMA user_version')
     f = sql_lyr.GetNextFeature()
     if f['user_version'] != 0:
         f.DumpReadable()
-        return 'fail'
+        pytest.fail()
     ds.ReleaseResultSet(sql_lyr)
     ds = None
 
@@ -2921,13 +2917,13 @@ def test_gpkg_40():
     f = sql_lyr.GetNextFeature()
     if f['application_id'] != 1196437809:
         f.DumpReadable()
-        return 'fail'
+        pytest.fail()
     ds.ReleaseResultSet(sql_lyr)
     sql_lyr = ds.ExecuteSQL('PRAGMA user_version')
     f = sql_lyr.GetNextFeature()
     if f['user_version'] != 0:
         f.DumpReadable()
-        return 'fail'
+        pytest.fail()
     ds.ReleaseResultSet(sql_lyr)
     ds = None
 
@@ -2938,13 +2934,13 @@ def test_gpkg_40():
     f = sql_lyr.GetNextFeature()
     if f['application_id'] != 1196444487:
         f.DumpReadable()
-        return 'fail'
+        pytest.fail()
     ds.ReleaseResultSet(sql_lyr)
     sql_lyr = ds.ExecuteSQL('PRAGMA user_version')
     f = sql_lyr.GetNextFeature()
     if f['user_version'] != 10200:
         f.DumpReadable()
-        return 'fail'
+        pytest.fail()
     ds.ReleaseResultSet(sql_lyr)
     ds = None
 
@@ -2960,7 +2956,7 @@ def test_gpkg_41():
 
     if gdaltest.gpkg_dr is None or gdal.GetConfigOption('TRAVIS') is not None or \
        gdal.GetConfigOption('APPVEYOR') is not None:
-        return 'skip'
+        pytest.skip()
 
     gdal.SetConfigOption('GPKG_ALLOW_CRAZY_SETTINGS', 'YES')
     with gdaltest.error_handler():
@@ -2980,7 +2976,7 @@ def test_gpkg_41():
 def test_gpkg_42():
 
     if gdaltest.gpkg_dr is None:
-        return 'skip'
+        pytest.skip()
 
     gdal.SetConfigOption('CREATE_GEOMETRY_COLUMNS', 'NO')
     gdal.Translate('/vsimem/gpkg_42.gpkg', 'data/byte.tif', format='GPKG')
@@ -3008,7 +3004,7 @@ def test_gpkg_42():
 def test_gpkg_43():
 
     if gdaltest.gpkg_dr is None:
-        return 'skip'
+        pytest.skip()
 
     gdal.SetConfigOption('CREATE_RASTER_TABLES', 'NO')
     ds = gdaltest.gpkg_dr.Create('/vsimem/gpkg_43.gpkg', 0, 0, 0, gdal.GDT_Unknown)
@@ -3043,10 +3039,10 @@ def test_gpkg_43():
 def test_gpkg_44():
 
     if gdaltest.gpkg_dr is None:
-        return 'skip'
+        pytest.skip()
 
     if gdaltest.gpkg_dr.GetMetadataItem("ENABLE_SQL_GPKG_FORMAT") != 'YES':
-        return 'skip'
+        pytest.skip()
 
     ds = gdal.Open('data/byte.gpkg.sql')
     assert ds.GetRasterBand(1).Checksum() == 4672, 'validation failed'
@@ -3059,7 +3055,7 @@ def test_gpkg_44():
 def test_gpkg_45():
 
     if gdaltest.gpkg_dr is None:
-        return 'skip'
+        pytest.skip()
 
     ds = gdal.Open('data/byte.gpkg')
     assert ds.GetRasterBand(1).Checksum() == 4672, 'validation failed'
@@ -3072,7 +3068,7 @@ def test_gpkg_45():
 def test_gpkg_46():
 
     if gdaltest.gpkg_dr is None:
-        return 'skip'
+        pytest.skip()
 
     ds = gdaltest.gpkg_dr.Create('/vsimem/gpkg_46.gpkg', 6698, 6698,
                                  options=['TILING_SCHEME=GoogleMapsCompatible'])
@@ -3096,7 +3092,7 @@ def test_gpkg_46():
             f.DumpReadable()
             ds.ReleaseResultSet(sql_lyr)
             gdal.Unlink('/vsimem/gpkg_46.gpkg')
-            return 'fail'
+            pytest.fail()
     ds.ReleaseResultSet(sql_lyr)
     ds = None
 
@@ -3113,7 +3109,7 @@ def test_gpkg_46():
 def test_gpkg_47():
 
     if gdaltest.gpkg_dr is None:
-        return 'skip'
+        pytest.skip()
 
     tmpfile = '/vsimem/gpkg_47.gpkg'
     ds = gdaltest.gpkg_dr.CreateCopy(tmpfile,
@@ -3137,7 +3133,7 @@ def test_gpkg_47():
 def test_gpkg_48():
 
     if gdaltest.gpkg_dr is None:
-        return 'skip'
+        pytest.skip()
 
     if sys.platform == 'win32':
         filename = os.path.join(os.getcwd(), 'tmp', 'byte.gpkg')
@@ -3150,12 +3146,12 @@ def test_gpkg_48():
     ds = gdal.Open('GPKG:' + filename + ':foo')
     if ds is None:
         gdal.Unlink(filename)
-        return 'fail'
+        pytest.fail()
     ds = None
     ds = gdal.Open('GPKG:' + filename + ':bar')
     if ds is None:
         gdal.Unlink(filename)
-        return 'fail'
+        pytest.fail()
     ds = None
 
     gdal.Unlink(filename)
@@ -3168,7 +3164,7 @@ def test_gpkg_48():
 def test_gpkg_delete_raster_layer():
 
     if gdaltest.gpkg_dr is None:
-        return 'skip'
+        pytest.skip()
 
     filename = '/vsimem/byte.gpkg'
     gdal.Translate(filename, 'data/byte.tif', format='GPKG',
@@ -3201,7 +3197,7 @@ def test_gpkg_delete_raster_layer():
 def test_gpkg_delete_gridded_coverage_raster_layer():
 
     if gdaltest.gpkg_dr is None:
-        return 'skip'
+        pytest.skip()
 
     filename = '/vsimem/float32.gpkg'
     gdal.Translate(filename, 'data/float32.tif', format='GPKG',
@@ -3227,7 +3223,7 @@ def test_gpkg_delete_gridded_coverage_raster_layer():
 def test_gpkg_open_old_gpkg_elevation_tiles_extension():
 
     if gdaltest.gpkg_dr is None:
-        return 'skip'
+        pytest.skip()
 
     gdal.ErrorReset()
     ds = gdal.Open('data/uint16-old-elevation-extension.gpkg')
@@ -3243,7 +3239,7 @@ def test_gpkg_open_old_gpkg_elevation_tiles_extension():
 def test_gpkg_GeneralCmdLineProcessor():
 
     if gdaltest.gpkg_dr is None:
-        return 'skip'
+        pytest.skip()
 
     import test_cli_utilities
     if test_cli_utilities.get_gdalinfo_path() is not None and test_cli_utilities.get_ogrinfo_path() is not None:
@@ -3262,7 +3258,7 @@ def test_gpkg_GeneralCmdLineProcessor():
 def test_gpkg_match_overview_factor():
 
     if gdaltest.gpkg_dr is None:
-        return 'skip'
+        pytest.skip()
 
     gdal.FileFromMemBuffer('/vsimem/gpkg_match_overview_factor.gpkg',
                            open('data/test_match_overview_factor.gpkg', 'rb').read())
@@ -3282,7 +3278,7 @@ def test_gpkg_match_overview_factor():
 def test_gpkg_cleanup():
 
     if gdaltest.gpkg_dr is None:
-        return 'skip'
+        pytest.skip()
 
     gdal.Unlink('/vsimem/tmp.gpkg')
     gdal.Unlink('/vsimem/tmp.gpkg.aux.xml')
diff --git a/autotest/gdrivers/grass.py b/autotest/gdrivers/grass.py
index 079bab0c90d1..915337c38f9c 100755
--- a/autotest/gdrivers/grass.py
+++ b/autotest/gdrivers/grass.py
@@ -33,6 +33,7 @@
 
 
 import gdaltest
+import pytest
 
 
 ###############################################################################
@@ -42,7 +43,7 @@ def test_grass_1():
 
     gdaltest.grass_drv = gdal.GetDriverByName('GRASS')
     if gdaltest.grass_drv is None:
-        return 'skip'
+        pytest.skip()
 
     return 'success'
 
@@ -53,7 +54,7 @@ def test_grass_1():
 def test_grass_2():
 
     if gdaltest.grass_drv is None:
-        return 'skip'
+        pytest.skip()
 
     tst = gdaltest.GDALTest('GRASS', 'small_grass_dataset/demomapset/cellhd/elevation', 1, 41487)
 
diff --git a/autotest/gdrivers/grib.py b/autotest/gdrivers/grib.py
index 10182cc95c9c..91325f2ac4c4 100755
--- a/autotest/gdrivers/grib.py
+++ b/autotest/gdrivers/grib.py
@@ -57,7 +57,7 @@ def test_grib_1():
 
     gdaltest.grib_drv = gdal.GetDriverByName('GRIB')
     if gdaltest.grib_drv is None:
-        return 'skip'
+        pytest.skip()
 
     # Test proj4 presence
     import osr_ct
@@ -73,7 +73,7 @@ def test_grib_1():
 def test_grib_2():
 
     if gdaltest.grib_drv is None:
-        return 'skip'
+        pytest.skip()
 
     tst = gdaltest.GDALTest('GRIB', 'grib/Sample_QuikSCAT.grb', 4, 50714)
     return tst.testOpen()
@@ -86,7 +86,7 @@ def test_grib_2():
 def test_grib_read_different_sizes_messages():
 
     if gdaltest.grib_drv is None:
-        return 'skip'
+        pytest.skip()
 
     tst = gdaltest.GDALTest('GRIB', 'grib/bug3246.grb', 4, 4081)
     gdal.PushErrorHandler('CPLQuietErrorHandler')
@@ -107,7 +107,7 @@ def test_grib_read_different_sizes_messages():
 def test_grib_grib2_read_nodata():
 
     if gdaltest.grib_drv is None:
-        return 'skip'
+        pytest.skip()
 
     ds = gdal.Open('data/grib/ds.mint.bin')
     assert ds.GetRasterBand(1).GetNoDataValue() == 9999
@@ -126,7 +126,7 @@ def test_grib_grib2_read_nodata():
 def test_grib_read_units():
 
     if gdaltest.grib_drv is None:
-        return 'skip'
+        pytest.skip()
 
     gdal.Unlink('tmp/ds.mint.bin.aux.xml')
 
@@ -170,7 +170,7 @@ def test_grib_read_units():
 def test_grib_read_geotransform_one_n_or_n_one():
 
     if gdaltest.grib_drv is None:
-        return 'skip'
+        pytest.skip()
 
     ds = gdal.Open('data/grib/one_one.grib2')
     egt = (-114.25, 0.5, 0.0, 47.250, 0.0, -0.5)
@@ -190,7 +190,7 @@ def test_grib_read_geotransform_one_n_or_n_one():
 def test_grib_read_vsizip():
 
     if gdaltest.grib_drv is None:
-        return 'skip'
+        pytest.skip()
 
     ds = gdal.Open('/vsizip/data/grib/gfs.t00z.mastergrb2f03.zip/gfs.t00z.mastergrb2f03')
     assert ds is not None
@@ -204,7 +204,7 @@ def test_grib_read_vsizip():
 def test_grib_grib2_test_grib_pds_all_bands():
 
     if gdaltest.grib_drv is None:
-        return 'skip'
+        pytest.skip()
     ds = gdal.Open('/vsizip/data/grib/gfs.t00z.mastergrb2f03.zip/gfs.t00z.mastergrb2f03')
     assert ds is not None
     band = ds.GetRasterBand(2)
@@ -229,11 +229,11 @@ def test_grib_grib2_test_grib_pds_all_bands():
 def test_grib_grib2_read_template_4_15():
 
     if gdaltest.grib_drv is None:
-        return 'skip'
+        pytest.skip()
 
     import test_cli_utilities
     if test_cli_utilities.get_gdalinfo_path() is None:
-        return 'skip'
+        pytest.skip()
 
     ret, err = gdaltest.runexternal_out_and_err(test_cli_utilities.get_gdalinfo_path() + ' data/grib/template_4_15.grb2 -checksum')
 
@@ -254,10 +254,10 @@ def test_grib_grib2_read_template_4_15():
 def test_grib_grib2_read_png():
 
     if gdaltest.grib_drv is None:
-        return 'skip'
+        pytest.skip()
 
     if gdal.GetDriverByName('PNG') is None:
-        return 'skip'
+        pytest.skip()
 
     ds = gdal.Open('data/grib/MRMS_EchoTop_18_00.50_20161015-133230.grib2')
     cs = ds.GetRasterBand(1).Checksum()
@@ -272,7 +272,7 @@ def test_grib_grib2_read_png():
 def test_grib_grib2_read_template_4_32():
 
     if gdaltest.grib_drv is None:
-        return 'skip'
+        pytest.skip()
 
     # First band extracted from http://nomads.ncep.noaa.gov/pub/data/nccf/com/hur/prod/hwrf.2017102006/twenty-se27w.2017102006.hwrfsat.core.0p02.f000.grb2
     ds = gdal.Open('data/grib/twenty-se27w.2017102006.hwrfsat.core.0p02.f000_truncated.grb2')
@@ -292,7 +292,7 @@ def test_grib_grib2_read_template_4_32():
 def test_grib_grib2_read_all_zero_data():
 
     if gdaltest.grib_drv is None:
-        return 'skip'
+        pytest.skip()
 
     # From http://dd.weather.gc.ca/model_wave/great_lakes/erie/grib2/00/CMC_rdwps_lake-erie_ICEC_SFC_0_latlon0.05x0.05_2017111800_P000.grib2
     ds = gdal.Open('data/grib/CMC_rdwps_lake-erie_ICEC_SFC_0_latlon0.05x0.05_2017111800_P000.grib2')
@@ -312,7 +312,7 @@ def test_grib_grib2_read_all_zero_data():
 def test_grib_grib2_read_rotated_pole_lonlat():
 
     if gdaltest.grib_drv is None:
-        return 'skip'
+        pytest.skip()
 
     ds = gdal.Open('/vsisparse/data/grib/rotated_pole.grb.xml')
 
@@ -342,11 +342,11 @@ def test_grib_grib2_read_rotated_pole_lonlat():
 def test_grib_grib2_read_template_4_40():
 
     if gdaltest.grib_drv is None:
-        return 'skip'
+        pytest.skip()
 
     # We could use some other encoding that JP2K...
     if not has_jp2kdrv():
-        return 'skip'
+        pytest.skip()
 
     # First band extracted from https://download.regional.atmosphere.copernicus.eu/services/CAMS50?token=__M0bChV6QsoOFqHz31VRqnpr4GhWPtcpaRy3oeZjBNSg__&grid=0.1&model=ENSEMBLE&package=ANALYSIS_PM10_SURFACE&time=-24H-1H&referencetime=2017-09-12T00:00:00Z&format=GRIB2&licence=yes
     # with data nullified
@@ -365,7 +365,7 @@ def test_grib_grib2_read_template_4_40():
 def test_grib_grib2_read_template_4_unhandled():
 
     if gdaltest.grib_drv is None:
-        return 'skip'
+        pytest.skip()
 
     with gdaltest.error_handler():
         ds = gdal.Open('data/grib/template_4_65535.grb2')
@@ -383,7 +383,7 @@ def test_grib_grib2_read_template_4_unhandled():
 def test_grib_grib2_read_transverse_mercator():
 
     if gdaltest.grib_drv is None:
-        return 'skip'
+        pytest.skip()
 
     ds = gdal.Open('data/grib/transverse_mercator.grb2')
 
@@ -405,10 +405,10 @@ def test_grib_grib2_read_transverse_mercator():
 def test_grib_grib2_read_mercator():
 
     if gdaltest.grib_drv is None:
-        return 'skip'
+        pytest.skip()
 
     if gdaltest.have_proj4 == 0:
-        return 'skip'
+        pytest.skip()
 
     ds = gdal.Open('data/grib/mercator.grb2')
 
@@ -430,10 +430,10 @@ def test_grib_grib2_read_mercator():
 def test_grib_grib2_read_mercator_2sp():
 
     if gdaltest.grib_drv is None:
-        return 'skip'
+        pytest.skip()
 
     if gdaltest.have_proj4 == 0:
-        return 'skip'
+        pytest.skip()
 
     ds = gdal.Open('data/grib/mercator_2sp.grb2')
 
@@ -455,10 +455,10 @@ def test_grib_grib2_read_mercator_2sp():
 def test_grib_grib2_read_lcc():
 
     if gdaltest.grib_drv is None:
-        return 'skip'
+        pytest.skip()
 
     if gdaltest.have_proj4 == 0:
-        return 'skip'
+        pytest.skip()
 
     ds = gdal.Open('data/grib/lambert_conformal_conic.grb2')
 
@@ -480,10 +480,10 @@ def test_grib_grib2_read_lcc():
 def test_grib_grib2_read_polar_stereo():
 
     if gdaltest.grib_drv is None:
-        return 'skip'
+        pytest.skip()
 
     if gdaltest.have_proj4 == 0:
-        return 'skip'
+        pytest.skip()
 
     ds = gdal.Open('data/grib/polar_stereographic.grb2')
 
@@ -505,10 +505,10 @@ def test_grib_grib2_read_polar_stereo():
 def test_grib_grib2_read_aea():
 
     if gdaltest.grib_drv is None:
-        return 'skip'
+        pytest.skip()
 
     if gdaltest.have_proj4 == 0:
-        return 'skip'
+        pytest.skip()
 
     ds = gdal.Open('data/grib/albers_equal_area.grb2')
 
@@ -530,10 +530,10 @@ def test_grib_grib2_read_aea():
 def test_grib_grib2_read_laea():
 
     if gdaltest.grib_drv is None:
-        return 'skip'
+        pytest.skip()
 
     if gdaltest.have_proj4 == 0:
-        return 'skip'
+        pytest.skip()
 
     ds = gdal.Open('data/grib/lambert_azimuthal_equal_area.grb2')
 
@@ -555,7 +555,7 @@ def test_grib_grib2_read_laea():
 def test_grib_grib2_read_template_5_4_grid_point_ieee_floating_point():
 
     if gdaltest.grib_drv is None:
-        return 'skip'
+        pytest.skip()
 
     ds = gdal.Open('data/grib/ieee754_single.grb2')
     cs = ds.GetRasterBand(1).Checksum()
@@ -574,7 +574,7 @@ def test_grib_grib2_read_template_5_4_grid_point_ieee_floating_point():
 def test_grib_grib2_read_section_5_nbits_zero_decimal_scaled():
 
     if gdaltest.grib_drv is None:
-        return 'skip'
+        pytest.skip()
 
     ds = gdal.Open('data/grib/simple_packing_nbits_zero_decimal_scaled.grb2')
     cs = ds.GetRasterBand(1).Checksum()
@@ -599,7 +599,7 @@ def test_grib_grib2_read_section_5_nbits_zero_decimal_scaled():
 def test_grib_grib2_read_spatial_differencing_order_1():
 
     if gdaltest.grib_drv is None:
-        return 'skip'
+        pytest.skip()
 
     ds = gdal.Open('data/grib/spatial_differencing_order_1.grb2')
     cs = ds.GetRasterBand(1).Checksum()
@@ -616,7 +616,7 @@ def test_grib_grib2_read_spatial_differencing_order_1():
 def test_grib_grib2_write_creation_options():
 
     if gdaltest.grib_drv is None:
-        return 'skip'
+        pytest.skip()
 
     tmpfilename = '/vsimem/out.grb2'
     gdal.Translate(tmpfilename, 'data/byte.tif', format='GRIB',
@@ -837,7 +837,7 @@ def test_grib_grib2_write_creation_options():
 def test_grib_grib2_write_projections():
 
     if gdaltest.grib_drv is None:
-        return 'skip'
+        pytest.skip()
 
     filenames = ['albers_equal_area.grb2',
                  'lambert_azimuthal_equal_area.grb2',
@@ -988,7 +988,7 @@ def _grib_read_section(filename, sect_num_to_read):
 def test_grib_grib2_write_data_encodings():
 
     if gdaltest.grib_drv is None:
-        return 'skip'
+        pytest.skip()
 
     # Template 5 numbers
     GS5_SIMPLE = 0
@@ -1224,7 +1224,7 @@ def test_grib_grib2_write_data_encodings():
 def test_grib_grib2_write_data_encodings_warnings_and_errors():
 
     if gdaltest.grib_drv is None:
-        return 'skip'
+        pytest.skip()
 
     # Cases where warnings are expected
     tests = []
@@ -1346,7 +1346,7 @@ def test_grib_grib2_write_temperatures():
 def test_grib_grib2_write_nodata():
 
     if gdaltest.grib_drv is None:
-        return 'skip'
+        pytest.skip()
 
     for src_type in [ gdal.GDT_Byte, gdal.GDT_Float32 ]:
         src_ds = gdal.GetDriverByName('MEM').Create('', 2, 2, 1, src_type)
@@ -1375,14 +1375,14 @@ def test_grib_grib2_write_nodata():
 def test_grib_online_grib2_jpeg2000_single_line():
 
     if gdaltest.grib_drv is None:
-        return 'skip'
+        pytest.skip()
 
     if not has_jp2kdrv():
-        return 'skip'
+        pytest.skip()
 
     filename = 'CMC_hrdps_continental_PRATE_SFC_0_ps2.5km_2017111712_P001-00.grib2'
     if not gdaltest.download_file('http://download.osgeo.org/gdal/data/grib/' + filename):
-        return 'skip'
+        pytest.skip()
 
     ds = gdal.Open('tmp/cache/' + filename)
     cs = ds.GetRasterBand(1).Checksum()
diff --git a/autotest/gdrivers/gta.py b/autotest/gdrivers/gta.py
index 42a7a5ebfe63..deca3c5920a9 100755
--- a/autotest/gdrivers/gta.py
+++ b/autotest/gdrivers/gta.py
@@ -59,7 +59,7 @@ def test_gta_1():
 
     gdaltest.gta_drv = gdal.GetDriverByName('GTA')
     if gdaltest.gta_drv is None:
-        return 'skip'
+        pytest.skip()
 
     return 'success'
 
@@ -70,7 +70,7 @@ def test_gta_1():
 def test_gta_2():
 
     if gdaltest.gta_drv is None:
-        return 'skip'
+        pytest.skip()
 
     src_ds = gdal.Open('data/byte.tif')
     out_ds = gdaltest.gta_drv.CreateCopy('/vsimem/byte.gta', src_ds)
@@ -114,7 +114,7 @@ def test_gta_2():
 def test_gta_3():
 
     if gdaltest.gta_drv is None:
-        return 'skip'
+        pytest.skip()
 
     src_ds = gdal.Open('../gcore/data/gcps.vrt')
 
@@ -148,7 +148,7 @@ def test_gta_3():
 def test_gta_4():
 
     if gdaltest.gta_drv is None:
-        return 'skip'
+        pytest.skip()
 
     src_ds = gdal.GetDriverByName('MEM').Create('', 1, 1, 17)
     src_ds.GetRasterBand(1).Fill(255)
@@ -195,7 +195,7 @@ def test_gta_4():
 def test_gta_5():
 
     if gdaltest.gta_drv is None:
-        return 'skip'
+        pytest.skip()
 
     src_ds = gdal.Open('data/byte.tif')
 
diff --git a/autotest/gdrivers/hdf5.py b/autotest/gdrivers/hdf5.py
index 974c886fb56d..e804fd1d2aad 100755
--- a/autotest/gdrivers/hdf5.py
+++ b/autotest/gdrivers/hdf5.py
@@ -173,8 +173,7 @@ def test_hdf5_7():
         try:
             metadata.pop(key)
         except KeyError:
-            gdaltest.post_reason('unable to find "%s" key' % key)
-            return 'fail'
+            pytest.fail('unable to find "%s" key' % key)
     return 'success'
 
 ###############################################################################
@@ -238,8 +237,7 @@ def scanMetadata(parts):
 def test_hdf5_9():
 
     if int(gdal.VersionInfo('VERSION_NUM')) < 1900:
-        gdaltest.post_reason('would crash')
-        return 'skip'
+        pytest.skip('would crash')
 
     ds = gdal.Open('data/vlstr_metadata.h5')
     metadata = ds.GetRasterBand(1).GetMetadata()
@@ -330,7 +328,7 @@ def test_hdf5_11():
 def test_hdf5_12():
 
     if not gdaltest.download_file('http://trac.osgeo.org/gdal/raw-attachment/ticket/5032/norsa.ss.ppi-00.5-dbz.aeqd-1000.20070601T000039Z.hdf', 'norsa.ss.ppi-00.5-dbz.aeqd-1000.20070601T000039Z.hdf'):
-        return 'skip'
+        pytest.skip()
 
     ds = gdal.Open('tmp/cache/norsa.ss.ppi-00.5-dbz.aeqd-1000.20070601T000039Z.hdf')
     got_projection = ds.GetProjection()
@@ -353,7 +351,7 @@ def test_hdf5_12():
 def test_hdf5_13():
 
     if not gdaltest.download_file('http://oceandata.sci.gsfc.nasa.gov/cgi/getfile/A2016273115000.L2_LAC_OC.nc', 'A2016273115000.L2_LAC_OC.nc'):
-        return 'skip'
+        pytest.skip()
 
     ds = gdal.Open('HDF5:"tmp/cache/A2016273115000.L2_LAC_OC.nc"://geophysical_data/Kd_490')
 
diff --git a/autotest/gdrivers/hfa.py b/autotest/gdrivers/hfa.py
index c422f686e859..9e8e842fc45e 100755
--- a/autotest/gdrivers/hfa.py
+++ b/autotest/gdrivers/hfa.py
@@ -413,8 +413,7 @@ def test_hfa_clean_ige():
     try:
         open('tmp/igetest.ige')
     except IOError:
-        gdaltest.post_reason('ige file not created with USE_SPILL=YES')
-        return 'fail'
+        pytest.fail('ige file not created with USE_SPILL=YES')
 
     # confirm ige shows up in file list.
     ds = gdal.Open('tmp/igetest.img')
@@ -437,8 +436,7 @@ def test_hfa_clean_ige():
 
     try:
         open('tmp/igetest.ige')
-        gdaltest.post_reason('ige file not cleaned up properly.')
-        return 'fail'
+        pytest.fail('ige file not cleaned up properly.')
     except IOError:
         pass
 
@@ -486,7 +484,7 @@ def test_hfa_mapinformation_units():
 
     if gdaltest.equal_srs_from_wkt(expected_wkt, wkt):
         return 'success'
-    return 'fail'
+    pytest.fail()
 
 ###############################################################################
 # Write nodata value.
@@ -731,7 +729,7 @@ def test_hfa_unique_values_hist():
     try:
         gdal.RasterAttributeTable()
     except:
-        return 'skip'
+        pytest.skip()
 
     ds = gdal.Open('data/i8u_c_i.img')
 
@@ -782,8 +780,7 @@ def test_hfa_xforms_3rd():
         try:
             value = float(xform_md[check_item[0]])
         except (TypeError, ValueError):
-            gdaltest.post_reason('metadata item %d missing' % check_item[0])
-            return 'fail'
+            pytest.fail('metadata item %d missing' % check_item[0])
 
         assert abs(value - check_item[1]) <= abs(value / 100000.0), \
             ('metadata item %s has wrong value: %.15g' %
@@ -823,7 +820,7 @@ def test_hfa_delete_colortable():
         # value for them
         ds = None
         gdal.GetDriverByName('HFA').Delete('tmp/i8u.img')
-        return 'skip'
+        pytest.skip()
 
     ds.GetRasterBand(1).SetColorTable(None)
     ds = None
@@ -861,7 +858,7 @@ def test_hfa_delete_colortable2():
         # value for them
         ds = None
         gdal.GetDriverByName('HFA').Delete('tmp/hfa_delete_colortable2.img')
-        return 'skip'
+        pytest.skip()
 
     ds.GetRasterBand(1).SetColorTable(None)
     ds = None
@@ -979,8 +976,7 @@ def test_hfa_write_bit2grayscale():
     # as an aside, confirm the .rrd file was deleted.
     try:
         open('tmp/small1bit.rrd')
-        gdaltest.post_reason('tmp/small1bit.rrd not deleted!')
-        return 'fail'
+        pytest.fail('tmp/small1bit.rrd not deleted!')
     except IOError:
         pass
 
@@ -1005,8 +1001,7 @@ def test_hfa_camera_md():
         try:
             value = md[check_item[0]]
         except IndexError:
-            gdaltest.post_reason('metadata item %d missing' % check_item[0])
-            return 'fail'
+            pytest.fail('metadata item %d missing' % check_item[0])
 
         assert value == check_item[1], ('metadata item %s has wrong value: %s' %
                                  (check_item[0], value))
diff --git a/autotest/gdrivers/jp2kak.py b/autotest/gdrivers/jp2kak.py
index 6dfe81ac7b4a..99453c4446d3 100755
--- a/autotest/gdrivers/jp2kak.py
+++ b/autotest/gdrivers/jp2kak.py
@@ -35,6 +35,7 @@
 
 
 import gdaltest
+import pytest
 
 ###############################################################################
 # Read test of simple byte reference data.
@@ -44,7 +45,7 @@ def test_jp2kak_1():
 
     gdaltest.jp2kak_drv = gdal.GetDriverByName('JP2KAK')
     if gdaltest.jp2kak_drv is None:
-        return 'skip'
+        pytest.skip()
 
     gdaltest.deregister_all_jpeg2000_drivers_but('JP2KAK')
 
@@ -58,7 +59,7 @@ def test_jp2kak_1():
 def test_jp2kak_2():
 
     if gdaltest.jp2kak_drv is None:
-        return 'skip'
+        pytest.skip()
 
     tst = gdaltest.GDALTest('JP2KAK', 'int16.jp2', 1, 4587)
     return tst.testOpen()
@@ -70,7 +71,7 @@ def test_jp2kak_2():
 def test_jp2kak_3():
 
     if gdaltest.jp2kak_drv is None:
-        return 'skip'
+        pytest.skip()
 
     tst = gdaltest.GDALTest('JP2KAK', 'byte.jp2', 1, 50054,
                             options=['QUALITY=100'])
@@ -84,7 +85,7 @@ def test_jp2kak_3():
 def test_jp2kak_4():
 
     if gdaltest.jp2kak_drv is None:
-        return 'skip'
+        pytest.skip()
 
     tst = gdaltest.GDALTest('JP2KAK', 'rgbsmall.tif', 0, 0,
                             options=['GMLJP2=OFF'])
@@ -98,7 +99,7 @@ def test_jp2kak_4():
 def test_jp2kak_5():
 
     if gdaltest.jp2kak_drv is None:
-        return 'skip'
+        pytest.skip()
 
     tst = gdaltest.GDALTest('JP2KAK', 'rgbsmall.tif', 0, 0,
                             options=['GEOJP2=OFF'])
@@ -113,7 +114,7 @@ def test_jp2kak_5():
 def test_jp2kak_8():
 
     if gdaltest.jp2kak_drv is None:
-        return 'skip'
+        pytest.skip()
 
     tst = gdaltest.GDALTest('JP2KAK', 'byte.jp2', 1, 50054,
                             options=['QUALITY=100'])
@@ -129,7 +130,7 @@ def test_jp2kak_8():
 def test_jp2kak_9():
 
     if gdaltest.jp2kak_drv is None:
-        return 'skip'
+        pytest.skip()
 
     tst = gdaltest.GDALTest('JP2KAK', 'rgbwcmyk01_YeGeo_kakadu.jp2', 2, 32141)
     return tst.testOpen()
@@ -143,7 +144,7 @@ def test_jp2kak_9():
 def test_jp2kak_10():
 
     if gdaltest.jp2kak_drv is None:
-        return 'skip'
+        pytest.skip()
 
     ds = gdal.Open('data/rgbwcmyk01_YeGeo_kakadu.jp2')
     data = ds.ReadRaster(0, 0, 800, 100, band_list=[2, 3]).decode('latin1')
@@ -168,7 +169,7 @@ def test_jp2kak_10():
 def test_jp2kak_11():
 
     if gdaltest.jp2kak_drv is None:
-        return 'skip'
+        pytest.skip()
 
     ds = gdal.Open('data/gtsmall_11_int16.jp2')
     cs = ds.GetRasterBand(1).Checksum()
@@ -183,7 +184,7 @@ def test_jp2kak_11():
 def test_jp2kak_12():
 
     if gdaltest.jp2kak_drv is None:
-        return 'skip'
+        pytest.skip()
 
     ds = gdal.Open('data/gtsmall_10_uint16.jp2')
     cs = ds.GetRasterBand(1).Checksum()
@@ -198,7 +199,7 @@ def test_jp2kak_12():
 def test_jp2kak_13():
 
     if gdaltest.jp2kak_drv is None:
-        return 'skip'
+        pytest.skip()
 
     src_ds = gdal.Open('data/utm.pix')
     jp2_ds = gdaltest.jp2kak_drv.CreateCopy('tmp/jp2kak_13.jp2', src_ds)
@@ -228,7 +229,7 @@ def test_jp2kak_13():
 def test_jp2kak_14():
 
     if gdaltest.jp2kak_drv is None:
-        return 'skip'
+        pytest.skip()
 
     jp2_ds = gdal.Open('tmp/jp2kak_13.jp2')
 
@@ -265,7 +266,7 @@ def test_jp2kak_14():
 def test_jp2kak_15():
 
     if gdaltest.jp2kak_drv is None:
-        return 'skip'
+        pytest.skip()
 
     jp2_ds = gdal.Open('data/small_200ppcm.jp2')
 
@@ -287,7 +288,7 @@ def test_jp2kak_15():
 def test_jp2kak_16():
 
     if gdaltest.jp2kak_drv is None:
-        return 'skip'
+        pytest.skip()
 
     jp2_ds = gdal.Open('data/small_200ppcm.jp2')
     out_ds = gdaltest.jp2kak_drv.CreateCopy('tmp/jp2kak_16.jp2', jp2_ds)
@@ -319,7 +320,7 @@ def test_jp2kak_16():
 def test_jp2kak_17():
 
     if gdaltest.jp2kak_drv is None:
-        return 'skip'
+        pytest.skip()
 
     gdal.SetConfigOption('GDAL_JP2K_ALT_OFFSETVECTOR_ORDER', 'YES')
 
@@ -335,10 +336,9 @@ def test_jp2kak_17():
         abs(gt[2] - gte[2]) > 0.000000000005 or
         abs(gt[4] - gte[4]) > 0.000000000005 or
             abs(gt[5] - gte[5]) > 0.000000000005):
-        gdaltest.post_reason('did not get expected geotransform')
         print('got: ', gt)
         gdal.SetConfigOption('GDAL_JP2K_ALT_OFFSETVECTOR_ORDER', 'NO')
-        return 'fail'
+        pytest.fail('did not get expected geotransform')
 
     ds = None
 
@@ -353,7 +353,7 @@ def test_jp2kak_17():
 def test_jp2kak_18():
 
     if gdaltest.jp2kak_drv is None:
-        return 'skip'
+        pytest.skip()
 
     tst = gdaltest.GDALTest('JP2KAK', 'int16.tif', 1, 4672,
                             options=['QUALITY=100'])
@@ -367,7 +367,7 @@ def test_jp2kak_18():
 def test_jp2kak_19():
 
     if gdaltest.jp2kak_drv is None:
-        return 'skip'
+        pytest.skip()
 
     tst = gdaltest.GDALTest('JP2KAK', '../gcore/data/uint16.tif', 1, 4672,
                             options=['QUALITY=100'], filename_absolute=1)
@@ -381,7 +381,7 @@ def test_jp2kak_19():
 def test_jp2kak_20():
 
     if gdaltest.jp2kak_drv is None:
-        return 'skip'
+        pytest.skip()
 
     ds = gdal.Open('data/stefan_full_rgba_alpha_1bit.jp2')
     fourth_band = ds.GetRasterBand(4)
@@ -428,7 +428,7 @@ def test_jp2kak_20():
 def test_jp2kak_21():
 
     if gdaltest.jp2kak_drv is None:
-        return 'skip'
+        pytest.skip()
 
     tmp_ds = gdaltest.jp2kak_drv.CreateCopy(
         '/vsimem/jp2kak_21.jp2',
@@ -462,7 +462,7 @@ def test_jp2kak_21():
 def test_jp2kak_22():
 
     if gdaltest.jp2kak_drv is None:
-        return 'skip'
+        pytest.skip()
 
     src_ds = gdal.Open('../gcore/data/stefan_full_rgba.tif')
     gdaltest.jp2kak_drv.CreateCopy('/vsimem/jp2kak_22.jp2', src_ds, options=['QUALITY=100'])
diff --git a/autotest/gdrivers/jp2lura.py b/autotest/gdrivers/jp2lura.py
index 9ae93b375167..b1d38161436a 100755
--- a/autotest/gdrivers/jp2lura.py
+++ b/autotest/gdrivers/jp2lura.py
@@ -50,22 +50,20 @@ def test_jp2lura_1():
 
     gdaltest.jp2lura_drv = gdal.GetDriverByName('JP2Lura')
     if gdaltest.jp2lura_drv is None:
-        return 'skip'
+        pytest.skip()
 
     if gdaltest.jp2lura_drv is not None:
         if gdal.GetConfigOption('LURA_LICENSE_NUM_1') is None or \
            gdal.GetConfigOption('LURA_LICENSE_NUM_2') is None:
-            print('Driver JP2Lura is registered, but missing LURA_LICENSE_NUM_1 and LURA_LICENSE_NUM_2')
             gdaltest.jp2lura_drv = None
-            return 'skip'
+            pytest.skip('Driver JP2Lura is registered, but missing LURA_LICENSE_NUM_1 and LURA_LICENSE_NUM_2')
 
     gdaltest.deregister_all_jpeg2000_drivers_but('JP2Lura')
 
     ds = gdal.Open('data/byte.jp2')
     if ds is None and gdal.GetLastErrorMsg().find('license') >= 0:
-        print('Driver JP2Lura is registered, but issue with license')
         gdaltest.jp2lura_drv = None
-        return 'skip'
+        pytest.skip('Driver JP2Lura is registered, but issue with license')
 
     return 'success'
 
@@ -76,7 +74,7 @@ def test_jp2lura_1():
 def test_jp2lura_missing_license_num():
 
     if gdaltest.jp2lura_drv is None:
-        return 'skip'
+        pytest.skip()
 
     old_num_1 = gdal.GetConfigOption('LURA_LICENSE_NUM_1')
     old_num_2 = gdal.GetConfigOption('LURA_LICENSE_NUM_2')
@@ -98,7 +96,7 @@ def test_jp2lura_missing_license_num():
 def test_jp2lura_invalid_license_num():
 
     if gdaltest.jp2lura_drv is None:
-        return 'skip'
+        pytest.skip()
 
     old_num_1 = gdal.GetConfigOption('LURA_LICENSE_NUM_1')
     old_num_2 = gdal.GetConfigOption('LURA_LICENSE_NUM_2')
@@ -121,8 +119,7 @@ def validate(filename, expected_gmljp2=True, return_error_count=False, oidoc=Non
     try:
         import validate_jp2
     except ImportError:
-        print('Cannot run validate_jp2')
-        return 'skip'
+        pytest.skip('Cannot run validate_jp2')
 
     try:
         os.stat('tmp/cache/SCHEMAS_OPENGIS_NET')
@@ -144,7 +141,7 @@ def validate(filename, expected_gmljp2=True, return_error_count=False, oidoc=Non
         return (res.error_count, res.warning_count)
     if res.error_count == 0 and res.warning_count == 0:
         return 'success'
-    return 'fail'
+    pytest.fail()
 
 ###############################################################################
 # Open byte.jp2
@@ -153,7 +150,7 @@ def validate(filename, expected_gmljp2=True, return_error_count=False, oidoc=Non
 def test_jp2lura_2():
 
     if gdaltest.jp2lura_drv is None:
-        return 'skip'
+        pytest.skip()
 
     srs = """PROJCS["NAD27 / UTM zone 11N",
     GEOGCS["NAD27",
@@ -186,7 +183,7 @@ def test_jp2lura_2():
 def test_jp2lura_3():
 
     if gdaltest.jp2lura_drv is None:
-        return 'skip'
+        pytest.skip()
 
     ds = gdal.Open('data/int16.jp2')
     ds_ref = gdal.Open('data/int16.tif')
@@ -213,7 +210,7 @@ def test_jp2lura_3():
 def test_jp2lura_4(out_filename='tmp/jp2lura_4.jp2'):
 
     if gdaltest.jp2lura_drv is None:
-        return 'skip'
+        pytest.skip()
 
     src_ds = gdal.Open('data/byte.jp2')
     src_wkt = src_ds.GetProjectionRef()
@@ -278,7 +275,7 @@ def test_jp2lura_4_vsimem():
 def test_jp2lura_5():
 
     if gdaltest.jp2lura_drv is None:
-        return 'skip'
+        pytest.skip()
 
     tst = gdaltest.GDALTest('JP2Lura', 'int16.jp2', 1, None, options=['REVERSIBLE=YES', 'CODEC=J2K'])
     return tst.testCreateCopy()
@@ -290,7 +287,7 @@ def test_jp2lura_5():
 def test_jp2lura_6():
 
     if gdaltest.jp2lura_drv is None:
-        return 'skip'
+        pytest.skip()
 
     tst = gdaltest.GDALTest('JP2Lura', 'll.jp2', 1, None)
 
@@ -309,7 +306,7 @@ def test_jp2lura_6():
 def test_jp2lura_7():
 
     if gdaltest.jp2lura_drv is None:
-        return 'skip'
+        pytest.skip()
 
     tst = gdaltest.GDALTest('JP2Lura', '/vsigzip/data/byte.jp2.gz', 1, 50054, filename_absolute=1)
     return tst.testOpen()
@@ -321,7 +318,7 @@ def test_jp2lura_7():
 def test_jp2lura_8():
 
     if gdaltest.jp2lura_drv is None:
-        return 'skip'
+        pytest.skip()
 
     ds = gdal.Open('data/3_13bit_and_1bit.jp2')
 
@@ -342,7 +339,7 @@ def test_jp2lura_8():
 def test_jp2lura_9():
 
     if gdaltest.jp2lura_drv is None:
-        return 'skip'
+        pytest.skip()
 
     ds = gdal.Open('data/byte_without_geotransform.jp2')
 
@@ -361,7 +358,7 @@ def test_jp2lura_9():
 def DISABLED_jp2lura_10():
 
     if gdaltest.jp2lura_drv is None:
-        return 'skip'
+        pytest.skip()
 
     src_ds = gdal.Open('data/rgbsmall.tif')
     out_ds = gdaltest.jp2lura_drv.CreateCopy('/vsimem/jp2lura_10.jp2', src_ds, options=['YCBCR420=YES', 'RESOLUTIONS=3'])
@@ -385,7 +382,7 @@ def DISABLED_jp2lura_10():
 def DISABLED_jp2lura_11():
 
     if gdaltest.jp2lura_drv is None:
-        return 'skip'
+        pytest.skip()
 
     ds = gdal.Open('data/stefan_full_rgba_alpha_1bit.jp2')
     fourth_band = ds.GetRasterBand(4)
@@ -423,7 +420,7 @@ def DISABLED_jp2lura_11():
 def test_jp2lura_12():
 
     if gdaltest.jp2lura_drv is None:
-        return 'skip'
+        pytest.skip()
 
     # Override projection
     shutil.copy('data/byte.jp2', 'tmp/jp2lura_12.jp2')
@@ -466,7 +463,7 @@ def test_jp2lura_12():
 def test_jp2lura_13():
 
     if gdaltest.jp2lura_drv is None:
-        return 'skip'
+        pytest.skip()
 
     # Create a dataset with GCPs
     src_ds = gdal.Open('data/rgb_gcp.vrt')
@@ -514,7 +511,7 @@ def test_jp2lura_13():
 def test_jp2lura_14():
 
     if gdaltest.jp2lura_drv is None:
-        return 'skip'
+        pytest.skip()
 
     ds = gdal.Open('data/byte_2gcps.jp2')
     assert ds.GetGCPCount() == 2
@@ -528,7 +525,7 @@ def test_jp2lura_14():
 def test_jp2lura_16():
 
     if gdaltest.jp2lura_drv is None:
-        return 'skip'
+        pytest.skip()
 
     ds = gdal.Open('data/byte_point.jp2')
     gt = ds.GetGeoTransform()
@@ -562,7 +559,7 @@ def test_jp2lura_16():
 def test_jp2lura_17():
 
     if gdaltest.jp2lura_drv is None:
-        return 'skip'
+        pytest.skip()
 
     src_ds = gdal.Open('data/byte_point.jp2')
     ds = gdaltest.jp2lura_drv.CreateCopy('/vsimem/jp2lura_17.jp2', src_ds)
@@ -593,7 +590,7 @@ def test_jp2lura_17():
 def test_jp2lura_18():
 
     if gdaltest.jp2lura_drv is None:
-        return 'skip'
+        pytest.skip()
 
     src_ds = gdal.GetDriverByName('Mem').Create('', 2000, 2000)
     ds = gdaltest.jp2lura_drv.CreateCopy('/vsimem/jp2lura_18.jp2', src_ds, options=['TILEXSIZE=2000', 'TILEYSIZE=2000'])
@@ -616,7 +613,7 @@ def test_jp2lura_18():
 def test_jp2lura_19():
 
     if gdaltest.jp2lura_drv is None:
-        return 'skip'
+        pytest.skip()
 
     ds = gdal.Open('data/byte_gmljp2_with_nul_car.jp2')
     assert ds.GetProjectionRef() != ''
@@ -631,15 +628,14 @@ def test_jp2lura_19():
 def test_jp2lura_20():
 
     if gdaltest.jp2lura_drv is None:
-        return 'skip'
+        pytest.skip()
 
     try:
         import xmlvalidate
     except ImportError:
-        print('Cannot import xmlvalidate')
         import traceback
         traceback.print_exc(file=sys.stdout)
-        return 'skip'
+        pytest.skip('Cannot import xmlvalidate')
 
     try:
         os.stat('tmp/cache/SCHEMAS_OPENGIS_NET.zip')
@@ -650,8 +646,7 @@ def test_jp2lura_20():
         except OSError:
             url = 'http://schemas.opengis.net/SCHEMAS_OPENGIS_NET.zip'
             if not gdaltest.download_file(url, 'SCHEMAS_OPENGIS_NET.zip', force_download=True, max_download_duration=20):
-                print('Cannot get SCHEMAS_OPENGIS_NET.zip')
-                return 'skip'
+                pytest.skip('Cannot get SCHEMAS_OPENGIS_NET.zip')
 
     try:
         os.mkdir('tmp/cache/SCHEMAS_OPENGIS_NET')
@@ -670,8 +665,7 @@ def test_jp2lura_20():
         if not gdaltest.download_file(xlink_xsd_url, 'SCHEMAS_OPENGIS_NET/xlink.xsd', force_download=True, max_download_duration=10):
             xlink_xsd_url = 'http://even.rouault.free.fr/xlink.xsd'
             if not gdaltest.download_file(xlink_xsd_url, 'SCHEMAS_OPENGIS_NET/xlink.xsd', force_download=True, max_download_duration=10):
-                print('Cannot get xlink.xsd')
-                return 'skip'
+                pytest.skip('Cannot get xlink.xsd')
 
     try:
         os.stat('tmp/cache/SCHEMAS_OPENGIS_NET/xml.xsd')
@@ -680,8 +674,7 @@ def test_jp2lura_20():
         if not gdaltest.download_file(xlink_xsd_url, 'SCHEMAS_OPENGIS_NET/xml.xsd', force_download=True, max_download_duration=10):
             xlink_xsd_url = 'http://even.rouault.free.fr/xml.xsd'
             if not gdaltest.download_file(xlink_xsd_url, 'SCHEMAS_OPENGIS_NET/xml.xsd', force_download=True, max_download_duration=10):
-                print('Cannot get xml.xsd')
-                return 'skip'
+                pytest.skip('Cannot get xml.xsd')
 
     xmlvalidate.transform_abs_links_to_ref_links('tmp/cache/SCHEMAS_OPENGIS_NET')
 
@@ -702,7 +695,7 @@ def test_jp2lura_20():
 def test_jp2lura_22():
 
     if gdaltest.jp2lura_drv is None:
-        return 'skip'
+        pytest.skip()
 
     # RGBA
     src_ds = gdal.Open('../gcore/data/stefan_full_rgba.tif')
@@ -810,7 +803,7 @@ def test_jp2lura_22():
 def DISABLED_jp2lura_23():
 
     if gdaltest.jp2lura_drv is None:
-        return 'skip'
+        pytest.skip()
 
     src_ds = gdal.Open('../gcore/data/uint16.tif')
     out_ds = gdaltest.jp2lura_drv.CreateCopy('/vsimem/jp2lura_23.jp2', src_ds, options=['NBITS=9', 'QUALITY=100', 'REVERSIBLE=YES'])
@@ -840,7 +833,7 @@ def DISABLED_jp2lura_23():
 def test_jp2lura_24():
 
     if gdaltest.jp2lura_drv is None:
-        return 'skip'
+        pytest.skip()
 
     #  Grey+alpha
     src_ds = gdal.Open('../gcore/data/stefan_full_greyalpha.tif')
@@ -887,7 +880,7 @@ def test_jp2lura_24():
 def test_jp2lura_25():
 
     if gdaltest.jp2lura_drv is None:
-        return 'skip'
+        pytest.skip()
 
     src_ds = gdal.GetDriverByName('MEM').Create('', 100, 100, 5)
     src_ds.GetRasterBand(1).Fill(255)
@@ -918,7 +911,7 @@ def test_jp2lura_25():
 def test_jp2lura_27():
 
     if gdaltest.jp2lura_drv is None:
-        return 'skip'
+        pytest.skip()
 
     # Test optimization in GDALCopyWholeRasterGetSwathSize()
     # Not sure how we can check that except looking at logs with CPL_DEBUG=GDAL
@@ -1004,7 +997,7 @@ def jp2lura_test_codeblock(filename, codeblock_width, codeblock_height):
 def test_jp2lura_28():
 
     if gdaltest.jp2lura_drv is None:
-        return 'skip'
+        pytest.skip()
 
     src_ds = gdal.GetDriverByName('MEM').Create('', 10, 10, 1)
 
@@ -1041,7 +1034,7 @@ def test_jp2lura_28():
 def test_jp2lura_30():
 
     if gdaltest.jp2lura_drv is None:
-        return 'skip'
+        pytest.skip()
 
     src_ds = gdal.GetDriverByName('MEM').Create('', 10, 10, 1)
     ct = gdal.ColorTable()
@@ -1066,7 +1059,7 @@ def test_jp2lura_30():
 def DISABLED_jp2lura_31():
 
     if gdaltest.jp2lura_drv is None:
-        return 'skip'
+        pytest.skip()
 
     src_ds = gdal.GetDriverByName('MEM').Create('', 10, 10, 3)
     src_ds.GetRasterBand(1).SetColorInterpretation(gdal.GCI_GreenBand)
@@ -1108,7 +1101,7 @@ def DISABLED_jp2lura_31():
 def DISABLED_jp2lura_33():
 
     if gdaltest.jp2lura_drv is None:
-        return 'skip'
+        pytest.skip()
 
     src_ds = gdal.Open("""<VRTDataset rasterXSize="100000" rasterYSize="100000">
   <VRTRasterBand dataType="Byte" band="1">
@@ -1130,7 +1123,7 @@ def DISABLED_jp2lura_33():
 def test_jp2lura_34():
 
     if gdaltest.jp2lura_drv is None:
-        return 'skip'
+        pytest.skip()
 
     gdal.PushErrorHandler()
     ds = gdal.Open('data/dimensions_above_31bit.jp2')
@@ -1146,7 +1139,7 @@ def test_jp2lura_34():
 def test_jp2lura_35():
 
     if gdaltest.jp2lura_drv is None:
-        return 'skip'
+        pytest.skip()
 
     gdal.PushErrorHandler()
     ds = gdal.Open('data/truncated.jp2')
@@ -1162,7 +1155,7 @@ def test_jp2lura_35():
 def test_jp2lura_36():
 
     if gdaltest.jp2lura_drv is None:
-        return 'skip'
+        pytest.skip()
 
     src_ds = gdal.GetDriverByName('MEM').Create('', 2, 2, 16385)
     gdal.PushErrorHandler()
@@ -1179,7 +1172,7 @@ def test_jp2lura_36():
 def test_jp2lura_37():
 
     if gdaltest.jp2lura_drv is None:
-        return 'skip'
+        pytest.skip()
 
     # No metadata
     src_ds = gdal.GetDriverByName('MEM').Create('', 2, 2)
@@ -1274,7 +1267,7 @@ def test_jp2lura_37():
 def test_jp2lura_38():
 
     if gdaltest.jp2lura_drv is None:
-        return 'skip'
+        pytest.skip()
 
     # No metadata
     src_ds = gdal.GetDriverByName('MEM').Create('', 2, 2)
@@ -1311,7 +1304,7 @@ def test_jp2lura_38():
 def test_jp2lura_39():
 
     if gdaltest.jp2lura_drv is None:
-        return 'skip'
+        pytest.skip()
 
     # No metadata
     src_ds = gdal.GetDriverByName('MEM').Create('', 20, 20)
@@ -1382,7 +1375,7 @@ def test_jp2lura_39():
 def test_jp2lura_40():
 
     if gdaltest.jp2lura_drv is None:
-        return 'skip'
+        pytest.skip()
 
     # No metadata
     src_ds = gdal.GetDriverByName('MEM').Create('', 20, 20)
@@ -1460,7 +1453,7 @@ def test_jp2lura_40():
 def test_jp2lura_41():
 
     if gdaltest.jp2lura_drv is None:
-        return 'skip'
+        pytest.skip()
 
     src_ds = gdal.Open('data/byte.jp2')
     out_ds = gdaltest.jp2lura_drv.CreateCopy('/vsimem/jp2lura_41.jp2', src_ds,
@@ -1515,11 +1508,11 @@ def test_jp2lura_43():
 def test_jp2lura_45():
 
     if gdaltest.jp2lura_drv is None:
-        return 'skip'
+        pytest.skip()
     if gdal.GetDriverByName('GML') is None:
-        return 'skip'
+        pytest.skip()
     if gdal.GetDriverByName('KML') is None and gdal.GetDriverByName('LIBKML') is None:
-        return 'skip'
+        pytest.skip()
 
     # Test GMLJP2V2_DEF=YES
     src_ds = gdal.Open('data/byte.tif')
@@ -1601,7 +1594,7 @@ def test_jp2lura_45():
 def test_jp2lura_47():
 
     if gdaltest.jp2lura_drv is None:
-        return 'skip'
+        pytest.skip()
 
     src_ds = gdal.Open('../gcore/data/byte_rpc.tif')
     out_ds = gdaltest.jp2lura_drv.CreateCopy('/vsimem/jp2lura_47.jp2', src_ds)
@@ -1623,7 +1616,7 @@ def test_jp2lura_47():
 def test_jp2lura_48():
 
     if gdaltest.jp2lura_drv is None:
-        return 'skip'
+        pytest.skip()
 
     ds = gdal.Open('data/byte_tile_2048.jp2')
     (blockxsize, blockysize) = ds.GetRasterBand(1).GetBlockSize()
@@ -1639,10 +1632,10 @@ def test_jp2lura_48():
 def test_jp2lura_online_1():
 
     if gdaltest.jp2lura_drv is None:
-        return 'skip'
+        pytest.skip()
 
     if not gdaltest.download_file('http://download.osgeo.org/gdal/data/jpeg2000/7sisters200.j2k', '7sisters200.j2k'):
-        return 'skip'
+        pytest.skip()
 
     # Checksum = 32669 on my PC
     tst = gdaltest.GDALTest('JP2Lura', 'tmp/cache/7sisters200.j2k', 1, None, filename_absolute=1)
@@ -1661,10 +1654,10 @@ def test_jp2lura_online_1():
 def test_jp2lura_online_2():
 
     if gdaltest.jp2lura_drv is None:
-        return 'skip'
+        pytest.skip()
 
     if not gdaltest.download_file('http://download.osgeo.org/gdal/data/jpeg2000/gcp.jp2', 'gcp.jp2'):
-        return 'skip'
+        pytest.skip()
 
     # Checksum = 15621 on my PC
     tst = gdaltest.GDALTest('JP2Lura', 'tmp/cache/gcp.jp2', 1, None, filename_absolute=1)
@@ -1688,12 +1681,12 @@ def test_jp2lura_online_2():
 def test_jp2lura_online_3():
 
     if gdaltest.jp2lura_drv is None:
-        return 'skip'
+        pytest.skip()
 
     if not gdaltest.download_file('http://www.openjpeg.org/samples/Bretagne1.j2k', 'Bretagne1.j2k'):
-        return 'skip'
+        pytest.skip()
     if not gdaltest.download_file('http://www.openjpeg.org/samples/Bretagne1.bmp', 'Bretagne1.bmp'):
-        return 'skip'
+        pytest.skip()
 
     tst = gdaltest.GDALTest('JP2Lura', 'tmp/cache/Bretagne1.j2k', 1, None, filename_absolute=1)
 
@@ -1719,12 +1712,12 @@ def test_jp2lura_online_3():
 def test_jp2lura_online_4():
 
     if gdaltest.jp2lura_drv is None:
-        return 'skip'
+        pytest.skip()
 
     if not gdaltest.download_file('http://www.openjpeg.org/samples/Bretagne2.j2k', 'Bretagne2.j2k'):
-        return 'skip'
+        pytest.skip()
     if not gdaltest.download_file('http://www.openjpeg.org/samples/Bretagne2.bmp', 'Bretagne2.bmp'):
-        return 'skip'
+        pytest.skip()
 
     tst = gdaltest.GDALTest('JP2Lura', 'tmp/cache/Bretagne2.j2k', 1, None, filename_absolute=1)
 
@@ -1751,10 +1744,10 @@ def test_jp2lura_online_4():
 def test_jp2lura_online_5():
 
     if gdaltest.jp2lura_drv is None:
-        return 'skip'
+        pytest.skip()
 
     if not gdaltest.download_file('http://www.gwg.nga.mil/ntb/baseline/software/testfile/Jpeg2000/jp2_09/file9.jp2', 'file9.jp2'):
-        return 'skip'
+        pytest.skip()
 
     ds = gdal.Open('tmp/cache/file9.jp2')
     cs1 = ds.GetRasterBand(1).Checksum()
@@ -1772,10 +1765,10 @@ def test_jp2lura_online_5():
 def test_jp2lura_online_6():
 
     if gdaltest.jp2lura_drv is None:
-        return 'skip'
+        pytest.skip()
 
     if not gdaltest.download_file('http://www.gwg.nga.mil/ntb/baseline/software/testfile/Jpeg2000/jp2_03/file3.jp2', 'file3.jp2'):
-        return 'skip'
+        pytest.skip()
 
     ds = gdal.Open('tmp/cache/file3.jp2')
     # cs1 = ds.GetRasterBand(1).Checksum()
@@ -1797,7 +1790,7 @@ def test_jp2lura_online_6():
 def test_jp2lura_49():
 
     if gdaltest.jp2lura_drv is None:
-        return 'skip'
+        pytest.skip()
 
     tests = [(None, True, True, 'LOCAL_CS["PAM"]', (100.0, 1.0, 0.0, 300.0, 0.0, -1.0)),
              (None, True, False, 'LOCAL_CS["PAM"]', (100.0, 1.0, 0.0, 300.0, 0.0, -1.0)),
@@ -1920,7 +1913,7 @@ def test_jp2lura_49():
 def test_jp2lura_50():
 
     if gdaltest.jp2lura_drv is None:
-        return 'skip'
+        pytest.skip()
 
     tst = gdaltest.GDALTest('JP2Lura', 'float32_ieee754_split_reversible.jp2', 1, 4672)
     return tst.testOpen()
@@ -1932,7 +1925,7 @@ def test_jp2lura_50():
 def test_jp2lura_51():
 
     if gdaltest.jp2lura_drv is None:
-        return 'skip'
+        pytest.skip()
 
     # Don't allow it by default
     src_ds = gdal.Open('data/float32.tif')
@@ -1995,7 +1988,7 @@ def test_jp2lura_51():
 def test_jp2lura_52():
 
     if gdaltest.jp2lura_drv is None:
-        return 'skip'
+        pytest.skip()
 
     tests = [[-32768, gdal.GDT_Int16, 'h'],
              [-1, gdal.GDT_Int16, 'h'],
@@ -2031,7 +2024,7 @@ def test_jp2lura_52():
 def test_jp2lura_53():
 
     if gdaltest.jp2lura_drv is None:
-        return 'skip'
+        pytest.skip()
 
     src_ds = gdal.Open('data/byte.tif')
 
@@ -2078,7 +2071,7 @@ def test_jp2lura_53():
 def test_jp2lura_54():
 
     if gdaltest.jp2lura_drv is None:
-        return 'skip'
+        pytest.skip()
 
     # Tiled with incomplete boundary tiles
     src_ds = gdal.GetDriverByName('MEM').Create('', 100, 100, 1)
diff --git a/autotest/gdrivers/jp2metadata.py b/autotest/gdrivers/jp2metadata.py
index 228fbc006cad..3362c94cbf86 100755
--- a/autotest/gdrivers/jp2metadata.py
+++ b/autotest/gdrivers/jp2metadata.py
@@ -45,7 +45,7 @@ def test_jp2metadata_1():
 
     ds = gdal.Open('data/erdas_foo.jp2')
     if ds is None:
-        return 'skip'
+        pytest.skip()
 
     wkt = ds.GetProjectionRef()
     gt = ds.GetGeoTransform()
@@ -69,7 +69,7 @@ def test_jp2metadata_2():
 
     ds = gdal.Open('data/IMG_md_ple_R1C1.jp2', gdal.GA_ReadOnly)
     if ds is None:
-        return 'skip'
+        pytest.skip()
 
     filelist = ds.GetFileList()
 
@@ -89,8 +89,7 @@ def test_jp2metadata_2():
 
     try:
         os.stat('data/IMG_md_ple_R1C1.jp2.aux.xml')
-        gdaltest.post_reason('Expected not generation of data/IMG_md_ple_R1C1.jp2.aux.xml')
-        return 'fail'
+        pytest.fail('Expected not generation of data/IMG_md_ple_R1C1.jp2.aux.xml')
     except OSError:
         pass
 
@@ -111,7 +110,7 @@ def test_jp2metadata_3():
     ds = gdal.Open('data/ll.jp2')
     if ds is None:
         gdal.SetConfigOption('GDAL_IGNORE_AXIS_ORIENTATION', 'NO')
-        return 'skip'
+        pytest.skip()
     wkt = ds.GetProjection()
 
     if wkt != exp_wkt:
@@ -145,7 +144,7 @@ def test_jp2metadata_4():
 
     ds = gdal.Open('data/gmljp2_dtedsm_epsg_4326_axes.jp2')
     if ds is None:
-        return 'skip'
+        pytest.skip()
     wkt = ds.GetProjection()
 
     if wkt != exp_wkt:
@@ -180,7 +179,7 @@ def test_jp2metadata_5():
 
     ds = gdal.Open('data/gmljp2_epsg3035_easting_northing.jp2')
     if ds is None:
-        return 'skip'
+        pytest.skip()
     wkt = ds.GetProjection()
 
     if wkt != exp_wkt:
diff --git a/autotest/gdrivers/jp2openjpeg.py b/autotest/gdrivers/jp2openjpeg.py
index 92aef4da7f8b..d927283a5d69 100755
--- a/autotest/gdrivers/jp2openjpeg.py
+++ b/autotest/gdrivers/jp2openjpeg.py
@@ -50,7 +50,7 @@ def test_jp2openjpeg_1():
 
     gdaltest.jp2openjpeg_drv = gdal.GetDriverByName('JP2OpenJPEG')
     if gdaltest.jp2openjpeg_drv is None:
-        return 'skip'
+        pytest.skip()
 
     gdaltest.deregister_all_jpeg2000_drivers_but('JP2OpenJPEG')
 
@@ -63,7 +63,7 @@ def test_jp2openjpeg_1():
 def test_jp2openjpeg_2():
 
     if gdaltest.jp2openjpeg_drv is None:
-        return 'skip'
+        pytest.skip()
 
     srs = """PROJCS["NAD27 / UTM zone 11N",
     GEOGCS["NAD27",
@@ -96,7 +96,7 @@ def test_jp2openjpeg_2():
 def test_jp2openjpeg_3():
 
     if gdaltest.jp2openjpeg_drv is None:
-        return 'skip'
+        pytest.skip()
 
     ds = gdal.Open('data/int16.jp2')
     ds_ref = gdal.Open('data/int16.tif')
@@ -123,7 +123,7 @@ def test_jp2openjpeg_3():
 def test_jp2openjpeg_4(out_filename='tmp/jp2openjpeg_4.jp2'):
 
     if gdaltest.jp2openjpeg_drv is None:
-        return 'skip'
+        pytest.skip()
 
     src_ds = gdal.Open('data/byte.jp2')
     src_wkt = src_ds.GetProjectionRef()
@@ -186,7 +186,7 @@ def test_jp2openjpeg_4_vsimem():
 def test_jp2openjpeg_5():
 
     if gdaltest.jp2openjpeg_drv is None:
-        return 'skip'
+        pytest.skip()
 
     tst = gdaltest.GDALTest('JP2OpenJPEG', 'int16.jp2', 1, None, options=['REVERSIBLE=YES', 'QUALITY=100', 'CODEC=J2K'])
     return tst.testCreateCopy()
@@ -198,7 +198,7 @@ def test_jp2openjpeg_5():
 def test_jp2openjpeg_6():
 
     if gdaltest.jp2openjpeg_drv is None:
-        return 'skip'
+        pytest.skip()
 
     tst = gdaltest.GDALTest('JP2OpenJPEG', 'll.jp2', 1, None)
 
@@ -217,7 +217,7 @@ def test_jp2openjpeg_6():
 def test_jp2openjpeg_7():
 
     if gdaltest.jp2openjpeg_drv is None:
-        return 'skip'
+        pytest.skip()
 
     tst = gdaltest.GDALTest('JP2OpenJPEG', '/vsigzip/data/byte.jp2.gz', 1, 50054, filename_absolute=1)
     return tst.testOpen()
@@ -229,7 +229,7 @@ def test_jp2openjpeg_7():
 def test_jp2openjpeg_8():
 
     if gdaltest.jp2openjpeg_drv is None:
-        return 'skip'
+        pytest.skip()
 
     ds = gdal.Open('data/3_13bit_and_1bit.jp2')
 
@@ -250,7 +250,7 @@ def test_jp2openjpeg_8():
 def test_jp2openjpeg_9():
 
     if gdaltest.jp2openjpeg_drv is None:
-        return 'skip'
+        pytest.skip()
 
     ds = gdal.Open('data/byte_without_geotransform.jp2')
 
@@ -269,7 +269,7 @@ def test_jp2openjpeg_9():
 def test_jp2openjpeg_10():
 
     if gdaltest.jp2openjpeg_drv is None:
-        return 'skip'
+        pytest.skip()
 
     src_ds = gdal.Open('data/rgbsmall.tif')
     out_ds = gdaltest.jp2openjpeg_drv.CreateCopy('/vsimem/jp2openjpeg_10.jp2', src_ds, options=['YCBCR420=YES', 'RESOLUTIONS=3'])
@@ -293,7 +293,7 @@ def test_jp2openjpeg_10():
 def test_jp2openjpeg_11():
 
     if gdaltest.jp2openjpeg_drv is None:
-        return 'skip'
+        pytest.skip()
 
     ds = gdal.Open('data/stefan_full_rgba_alpha_1bit.jp2')
     fourth_band = ds.GetRasterBand(4)
@@ -331,7 +331,7 @@ def test_jp2openjpeg_11():
 def test_jp2openjpeg_12():
 
     if gdaltest.jp2openjpeg_drv is None:
-        return 'skip'
+        pytest.skip()
 
     # Override projection
     shutil.copy('data/byte.jp2', 'tmp/jp2openjpeg_12.jp2')
@@ -374,7 +374,7 @@ def test_jp2openjpeg_12():
 def test_jp2openjpeg_13():
 
     if gdaltest.jp2openjpeg_drv is None:
-        return 'skip'
+        pytest.skip()
 
     # Create a dataset with GCPs
     src_ds = gdal.Open('data/rgb_gcp.vrt')
@@ -422,7 +422,7 @@ def test_jp2openjpeg_13():
 def test_jp2openjpeg_14():
 
     if gdaltest.jp2openjpeg_drv is None:
-        return 'skip'
+        pytest.skip()
 
     ds = gdal.Open('data/byte_2gcps.jp2')
     assert ds.GetGCPCount() == 2
@@ -436,7 +436,7 @@ def test_jp2openjpeg_14():
 def test_jp2openjpeg_15():
 
     if gdaltest.jp2openjpeg_drv is None:
-        return 'skip'
+        pytest.skip()
 
     src_ds = gdal.GetDriverByName('MEM').Create('', 256, 256)
     src_ds.GetRasterBand(1).Fill(255)
@@ -457,7 +457,7 @@ def test_jp2openjpeg_15():
 def test_jp2openjpeg_16():
 
     if gdaltest.jp2openjpeg_drv is None:
-        return 'skip'
+        pytest.skip()
 
     ds = gdal.Open('data/byte_point.jp2')
     gt = ds.GetGeoTransform()
@@ -491,7 +491,7 @@ def test_jp2openjpeg_16():
 def test_jp2openjpeg_17():
 
     if gdaltest.jp2openjpeg_drv is None:
-        return 'skip'
+        pytest.skip()
 
     src_ds = gdal.Open('data/byte_point.jp2')
     ds = gdaltest.jp2openjpeg_drv.CreateCopy('/vsimem/jp2openjpeg_17.jp2', src_ds)
@@ -522,7 +522,7 @@ def test_jp2openjpeg_17():
 def test_jp2openjpeg_18():
 
     if gdaltest.jp2openjpeg_drv is None:
-        return 'skip'
+        pytest.skip()
 
     src_ds = gdal.GetDriverByName('Mem').Create('', 2000, 2000)
     ds = gdaltest.jp2openjpeg_drv.CreateCopy('/vsimem/jp2openjpeg_18.jp2', src_ds, options=['BLOCKXSIZE=2000', 'BLOCKYSIZE=2000'])
@@ -545,7 +545,7 @@ def test_jp2openjpeg_18():
 def test_jp2openjpeg_19():
 
     if gdaltest.jp2openjpeg_drv is None:
-        return 'skip'
+        pytest.skip()
 
     ds = gdal.Open('data/byte_gmljp2_with_nul_car.jp2')
     assert ds.GetProjectionRef() != ''
@@ -560,15 +560,14 @@ def test_jp2openjpeg_19():
 def test_jp2openjpeg_20():
 
     if gdaltest.jp2openjpeg_drv is None:
-        return 'skip'
+        pytest.skip()
 
     try:
         import xmlvalidate
     except ImportError:
-        print('Cannot import xmlvalidate')
         import traceback
         traceback.print_exc(file=sys.stdout)
-        return 'skip'
+        pytest.skip('Cannot import xmlvalidate')
 
     try:
         os.stat('tmp/cache/SCHEMAS_OPENGIS_NET.zip')
@@ -579,8 +578,7 @@ def test_jp2openjpeg_20():
         except OSError:
             url = 'http://schemas.opengis.net/SCHEMAS_OPENGIS_NET.zip'
             if not gdaltest.download_file(url, 'SCHEMAS_OPENGIS_NET.zip', force_download=True, max_download_duration=20):
-                print('Cannot get SCHEMAS_OPENGIS_NET.zip')
-                return 'skip'
+                pytest.skip('Cannot get SCHEMAS_OPENGIS_NET.zip')
 
     try:
         os.mkdir('tmp/cache/SCHEMAS_OPENGIS_NET')
@@ -599,8 +597,7 @@ def test_jp2openjpeg_20():
         if not gdaltest.download_file(xlink_xsd_url, 'SCHEMAS_OPENGIS_NET/xlink.xsd', force_download=True, max_download_duration=10):
             xlink_xsd_url = 'http://even.rouault.free.fr/xlink.xsd'
             if not gdaltest.download_file(xlink_xsd_url, 'SCHEMAS_OPENGIS_NET/xlink.xsd', force_download=True, max_download_duration=10):
-                print('Cannot get xlink.xsd')
-                return 'skip'
+                pytest.skip('Cannot get xlink.xsd')
 
     try:
         os.stat('tmp/cache/SCHEMAS_OPENGIS_NET/xml.xsd')
@@ -609,8 +606,7 @@ def test_jp2openjpeg_20():
         if not gdaltest.download_file(xlink_xsd_url, 'SCHEMAS_OPENGIS_NET/xml.xsd', force_download=True, max_download_duration=10):
             xlink_xsd_url = 'http://even.rouault.free.fr/xml.xsd'
             if not gdaltest.download_file(xlink_xsd_url, 'SCHEMAS_OPENGIS_NET/xml.xsd', force_download=True, max_download_duration=10):
-                print('Cannot get xml.xsd')
-                return 'skip'
+                pytest.skip('Cannot get xml.xsd')
 
     xmlvalidate.transform_abs_links_to_ref_links('tmp/cache/SCHEMAS_OPENGIS_NET')
 
@@ -631,7 +627,7 @@ def test_jp2openjpeg_20():
 def test_jp2openjpeg_21():
 
     if gdaltest.jp2openjpeg_drv is None:
-        return 'skip'
+        pytest.skip()
 
     src_ds = gdal.Open('data/rgbsmall.tif')
     out_ds = gdaltest.jp2openjpeg_drv.CreateCopy('/vsimem/jp2openjpeg_21.jp2', src_ds, options=['QUALITY=100', 'REVERSIBLE=YES', 'YCC=NO'])
@@ -652,7 +648,7 @@ def test_jp2openjpeg_21():
 def test_jp2openjpeg_22():
 
     if gdaltest.jp2openjpeg_drv is None:
-        return 'skip'
+        pytest.skip()
 
     # RGBA
     src_ds = gdal.Open('../gcore/data/stefan_full_rgba.tif')
@@ -756,7 +752,7 @@ def test_jp2openjpeg_22():
 def test_jp2openjpeg_23():
 
     if gdaltest.jp2openjpeg_drv is None:
-        return 'skip'
+        pytest.skip()
 
     src_ds = gdal.Open('../gcore/data/uint16.tif')
     out_ds = gdaltest.jp2openjpeg_drv.CreateCopy('/vsimem/jp2openjpeg_23.jp2', src_ds, options=['NBITS=9', 'QUALITY=100', 'REVERSIBLE=YES'])
@@ -786,7 +782,7 @@ def test_jp2openjpeg_23():
 def test_jp2openjpeg_24():
 
     if gdaltest.jp2openjpeg_drv is None:
-        return 'skip'
+        pytest.skip()
 
     #  Grey+alpha
     src_ds = gdal.Open('../gcore/data/stefan_full_greyalpha.tif')
@@ -829,7 +825,7 @@ def test_jp2openjpeg_24():
 def test_jp2openjpeg_25():
 
     if gdaltest.jp2openjpeg_drv is None:
-        return 'skip'
+        pytest.skip()
 
     src_ds = gdal.GetDriverByName('MEM').Create('', 100, 100, 5)
     src_ds.GetRasterBand(1).Fill(255)
@@ -861,8 +857,7 @@ def validate(filename, expected_gmljp2=True, return_error_count=False, oidoc=Non
     try:
         import validate_jp2
     except ImportError:
-        print('Cannot run validate_jp2')
-        return 'skip'
+        pytest.skip('Cannot run validate_jp2')
 
     try:
         os.stat('tmp/cache/SCHEMAS_OPENGIS_NET')
@@ -884,7 +879,7 @@ def validate(filename, expected_gmljp2=True, return_error_count=False, oidoc=Non
         return (res.error_count, res.warning_count)
     if res.error_count == 0 and res.warning_count == 0:
         return 'success'
-    return 'fail'
+    pytest.fail()
 
 ###############################################################################
 # Test INSPIRE_TG support
@@ -893,7 +888,7 @@ def validate(filename, expected_gmljp2=True, return_error_count=False, oidoc=Non
 def test_jp2openjpeg_26():
 
     if gdaltest.jp2openjpeg_drv is None:
-        return 'skip'
+        pytest.skip()
 
     src_ds = gdal.GetDriverByName('MEM').Create('', 2048, 2048, 1)
     sr = osr.SpatialReference()
@@ -1039,7 +1034,7 @@ def test_jp2openjpeg_26():
 def test_jp2openjpeg_27():
 
     if gdaltest.jp2openjpeg_drv is None:
-        return 'skip'
+        pytest.skip()
 
     # Test optimization in GDALCopyWholeRasterGetSwathSize()
     # Not sure how we can check that except looking at logs with CPL_DEBUG=GDAL
@@ -1125,7 +1120,7 @@ def jp2openjpeg_test_codeblock(filename, codeblock_width, codeblock_height):
 def test_jp2openjpeg_28():
 
     if gdaltest.jp2openjpeg_drv is None:
-        return 'skip'
+        pytest.skip()
 
     src_ds = gdal.GetDriverByName('MEM').Create('', 10, 10, 1)
 
@@ -1162,7 +1157,7 @@ def test_jp2openjpeg_28():
 def test_jp2openjpeg_29():
 
     if gdaltest.jp2openjpeg_drv is None:
-        return 'skip'
+        pytest.skip()
 
     src_ds = gdal.GetDriverByName('MEM').Create('', 128, 128, 1)
 
@@ -1199,7 +1194,7 @@ def test_jp2openjpeg_29():
 def test_jp2openjpeg_30():
 
     if gdaltest.jp2openjpeg_drv is None:
-        return 'skip'
+        pytest.skip()
 
     src_ds = gdal.GetDriverByName('MEM').Create('', 10, 10, 1)
     ct = gdal.ColorTable()
@@ -1290,7 +1285,7 @@ def test_jp2openjpeg_30():
 def test_jp2openjpeg_31():
 
     if gdaltest.jp2openjpeg_drv is None:
-        return 'skip'
+        pytest.skip()
 
     src_ds = gdal.GetDriverByName('MEM').Create('', 10, 10, 3)
     src_ds.GetRasterBand(1).SetColorInterpretation(gdal.GCI_GreenBand)
@@ -1332,7 +1327,7 @@ def test_jp2openjpeg_31():
 def test_jp2openjpeg_32():
 
     if gdaltest.jp2openjpeg_drv is None:
-        return 'skip'
+        pytest.skip()
 
     src_ds = gdal.GetDriverByName('MEM').Create('', 10, 10, 1)
     gdal.PushErrorHandler()
@@ -1351,7 +1346,7 @@ def test_jp2openjpeg_32():
 def test_jp2openjpeg_33():
 
     if gdaltest.jp2openjpeg_drv is None:
-        return 'skip'
+        pytest.skip()
 
     src_ds = gdal.Open("""<VRTDataset rasterXSize="100000" rasterYSize="100000">
   <VRTRasterBand dataType="Byte" band="1">
@@ -1375,7 +1370,7 @@ def test_jp2openjpeg_33():
 def test_jp2openjpeg_34():
 
     if gdaltest.jp2openjpeg_drv is None:
-        return 'skip'
+        pytest.skip()
 
     gdal.PushErrorHandler()
     ds = gdal.Open('data/dimensions_above_31bit.jp2')
@@ -1391,7 +1386,7 @@ def test_jp2openjpeg_34():
 def test_jp2openjpeg_35():
 
     if gdaltest.jp2openjpeg_drv is None:
-        return 'skip'
+        pytest.skip()
 
     gdal.PushErrorHandler()
     ds = gdal.Open('data/truncated.jp2')
@@ -1407,7 +1402,7 @@ def test_jp2openjpeg_35():
 def test_jp2openjpeg_36():
 
     if gdaltest.jp2openjpeg_drv is None:
-        return 'skip'
+        pytest.skip()
 
     src_ds = gdal.GetDriverByName('MEM').Create('', 2, 2, 16385)
     gdal.PushErrorHandler()
@@ -1424,7 +1419,7 @@ def test_jp2openjpeg_36():
 def test_jp2openjpeg_37():
 
     if gdaltest.jp2openjpeg_drv is None:
-        return 'skip'
+        pytest.skip()
 
     # No metadata
     src_ds = gdal.GetDriverByName('MEM').Create('', 2, 2)
@@ -1520,7 +1515,7 @@ def test_jp2openjpeg_37():
 def test_jp2openjpeg_38():
 
     if gdaltest.jp2openjpeg_drv is None:
-        return 'skip'
+        pytest.skip()
 
     # No metadata
     src_ds = gdal.GetDriverByName('MEM').Create('', 2, 2)
@@ -1558,7 +1553,7 @@ def test_jp2openjpeg_38():
 def test_jp2openjpeg_39():
 
     if gdaltest.jp2openjpeg_drv is None:
-        return 'skip'
+        pytest.skip()
 
     # No metadata
     src_ds = gdal.GetDriverByName('MEM').Create('', 20, 20)
@@ -1629,7 +1624,7 @@ def test_jp2openjpeg_39():
 def test_jp2openjpeg_40():
 
     if gdaltest.jp2openjpeg_drv is None:
-        return 'skip'
+        pytest.skip()
 
     # No metadata
     src_ds = gdal.GetDriverByName('MEM').Create('', 20, 20)
@@ -1707,7 +1702,7 @@ def test_jp2openjpeg_40():
 def test_jp2openjpeg_41():
 
     if gdaltest.jp2openjpeg_drv is None:
-        return 'skip'
+        pytest.skip()
 
     src_ds = gdal.Open('data/byte.jp2')
     out_ds = gdaltest.jp2openjpeg_drv.CreateCopy('/vsimem/jp2openjpeg_41.jp2', src_ds,
@@ -1749,7 +1744,7 @@ def test_jp2openjpeg_41():
 def test_jp2openjpeg_42():
 
     if gdaltest.jp2openjpeg_drv is None:
-        return 'skip'
+        pytest.skip()
 
     src_ds = gdal.GetDriverByName('MEM').Create('', 20, 20)
     gdal.PushErrorHandler()
@@ -1897,7 +1892,7 @@ def test_jp2openjpeg_43():
 def test_jp2openjpeg_44():
 
     if gdaltest.jp2openjpeg_drv is None:
-        return 'skip'
+        pytest.skip()
 
     src_ds = gdal.Open('data/utm.tif')
     out_ds = gdaltest.jp2openjpeg_drv.CreateCopy('/vsimem/jp2openjpeg_44.jp2', src_ds, options=['INSPIRE_TG=YES'])
@@ -1915,16 +1910,14 @@ def test_jp2openjpeg_44():
 def test_jp2openjpeg_45():
 
     if gdaltest.jp2openjpeg_drv is None:
-        return 'skip'
+        pytest.skip()
 
     with gdaltest.error_handler():
         if ogr.Open('../ogr/data/ionic_wfs.gml') is None:
-            print('GML read support missing')
-            return 'skip'
+            pytest.skip('GML read support missing')
 
     if gdal.GetDriverByName('KML') is None and gdal.GetDriverByName('LIBKML') is None:
-        print('KML support missing')
-        return 'skip'
+        pytest.skip('KML support missing')
 
     # Test GMLJP2V2_DEF=YES
     src_ds = gdal.Open('data/byte.tif')
@@ -2537,7 +2530,7 @@ def test_jp2openjpeg_45():
         if ds.GetLayer(j).GetName() != expected_layers[j]:
             for i in range(ds.GetLayerCount()):
                 print(ds.GetLayer(i).GetName())
-            return 'fail'
+            pytest.fail()
     ds = None
 
     ret = validate('/vsimem/jp2openjpeg_45.jp2', inspire_tg=False)
@@ -2577,7 +2570,7 @@ def test_jp2openjpeg_45():
             data = gdal.VSIFReadL(1, 100000, fp).decode('ascii')
             gdal.VSIFCloseL(fp)
             print(data)
-        return 'fail'
+        pytest.fail()
 
     ds = gdal.Open('/vsimem/jp2openjpeg_45.jp2')
     assert ds.GetMetadata() == {'FOO': 'BAR'}
@@ -2601,8 +2594,8 @@ def test_jp2openjpeg_45():
 
     if ds is None:
         if gdaltest.gdalurlopen('https://raw.githubusercontent.com/OSGeo/gdal/master/autotest/ogr/data/expected_gml_gml32.gml') is None:
-            return 'skip'
-        return 'fail'
+            pytest.skip()
+        pytest.fail()
     assert ds.GetLayerCount() == 1
     ds = None
 
@@ -2617,7 +2610,7 @@ def test_jp2openjpeg_45():
 def test_jp2openjpeg_46():
 
     if gdaltest.jp2openjpeg_drv is None:
-        return 'skip'
+        pytest.skip()
 
     import json
 
@@ -2648,21 +2641,20 @@ def test_jp2openjpeg_46():
     del out_ds
     if gdal.GetLastErrorMsg().find('dynamic_metadata not supported') >= 0:
         gdal.Unlink('/vsimem/jp2openjpeg_46.jp2')
-        return 'skip'
+        pytest.skip()
     # Maybe a conflict with FileGDB libxml2
     if gdal.GetLastErrorMsg().find('An error occurred in libxml2') >= 0:
         gdal.Unlink('/vsimem/jp2openjpeg_46.jp2')
-        return 'skip'
+        pytest.skip()
 
     ds = gdal.Open('/vsimem/jp2openjpeg_46.jp2')
     gmljp2 = ds.GetMetadata_List("xml:gml.root-instance")[0]
     if gmljp2.find("""<gmljp2:metadata>1 str trueX
         <B>my_value</B>
 yeah: """) < 0:
-        print(gmljp2)
         if gmljp2.find("""<gmljp2:metadata>1 str true""") >= 0:
-            return 'skip'
-        return 'fail'
+            pytest.skip()
+        pytest.fail(gmljp2)
     ds = None
 
     gdal.Unlink('/vsimem/jp2openjpeg_46.jp2')
@@ -2782,7 +2774,7 @@ def test_jp2openjpeg_46():
 def test_jp2openjpeg_47():
 
     if gdaltest.jp2openjpeg_drv is None:
-        return 'skip'
+        pytest.skip()
 
     src_ds = gdal.Open('../gcore/data/byte_rpc.tif')
     out_ds = gdaltest.jp2openjpeg_drv.CreateCopy('/vsimem/jp2openjpeg_47.jp2', src_ds)
@@ -2804,7 +2796,7 @@ def test_jp2openjpeg_47():
 def test_jp2openjpeg_48():
 
     if gdaltest.jp2openjpeg_drv is None:
-        return 'skip'
+        pytest.skip()
 
     ds = gdal.Open('data/byte_tile_2048.jp2')
     (blockxsize, blockysize) = ds.GetRasterBand(1).GetBlockSize()
@@ -2820,10 +2812,10 @@ def test_jp2openjpeg_48():
 def test_jp2openjpeg_online_1():
 
     if gdaltest.jp2openjpeg_drv is None:
-        return 'skip'
+        pytest.skip()
 
     if not gdaltest.download_file('http://download.osgeo.org/gdal/data/jpeg2000/7sisters200.j2k', '7sisters200.j2k'):
-        return 'skip'
+        pytest.skip()
 
     # Checksum = 32669 on my PC
     tst = gdaltest.GDALTest('JP2OpenJPEG', 'tmp/cache/7sisters200.j2k', 1, None, filename_absolute=1)
@@ -2842,10 +2834,10 @@ def test_jp2openjpeg_online_1():
 def test_jp2openjpeg_online_2():
 
     if gdaltest.jp2openjpeg_drv is None:
-        return 'skip'
+        pytest.skip()
 
     if not gdaltest.download_file('http://download.osgeo.org/gdal/data/jpeg2000/gcp.jp2', 'gcp.jp2'):
-        return 'skip'
+        pytest.skip()
 
     # Checksum = 15621 on my PC
     tst = gdaltest.GDALTest('JP2OpenJPEG', 'tmp/cache/gcp.jp2', 1, None, filename_absolute=1)
@@ -2869,12 +2861,12 @@ def test_jp2openjpeg_online_2():
 def test_jp2openjpeg_online_3():
 
     if gdaltest.jp2openjpeg_drv is None:
-        return 'skip'
+        pytest.skip()
 
     if not gdaltest.download_file('http://www.openjpeg.org/samples/Bretagne1.j2k', 'Bretagne1.j2k'):
-        return 'skip'
+        pytest.skip()
     if not gdaltest.download_file('http://www.openjpeg.org/samples/Bretagne1.bmp', 'Bretagne1.bmp'):
-        return 'skip'
+        pytest.skip()
 
     tst = gdaltest.GDALTest('JP2OpenJPEG', 'tmp/cache/Bretagne1.j2k', 1, None, filename_absolute=1)
 
@@ -2900,12 +2892,12 @@ def test_jp2openjpeg_online_3():
 def test_jp2openjpeg_online_4():
 
     if gdaltest.jp2openjpeg_drv is None:
-        return 'skip'
+        pytest.skip()
 
     if not gdaltest.download_file('http://www.openjpeg.org/samples/Bretagne2.j2k', 'Bretagne2.j2k'):
-        return 'skip'
+        pytest.skip()
     if not gdaltest.download_file('http://www.openjpeg.org/samples/Bretagne2.bmp', 'Bretagne2.bmp'):
-        return 'skip'
+        pytest.skip()
 
     tst = gdaltest.GDALTest('JP2OpenJPEG', 'tmp/cache/Bretagne2.j2k', 1, None, filename_absolute=1)
 
@@ -2932,10 +2924,10 @@ def test_jp2openjpeg_online_4():
 def test_jp2openjpeg_online_5():
 
     if gdaltest.jp2openjpeg_drv is None:
-        return 'skip'
+        pytest.skip()
 
     if not gdaltest.download_file('http://www.gwg.nga.mil/ntb/baseline/software/testfile/Jpeg2000/jp2_09/file9.jp2', 'file9.jp2'):
-        return 'skip'
+        pytest.skip()
 
     ds = gdal.Open('tmp/cache/file9.jp2')
     cs1 = ds.GetRasterBand(1).Checksum()
@@ -2953,10 +2945,10 @@ def test_jp2openjpeg_online_5():
 def test_jp2openjpeg_online_6():
 
     if gdaltest.jp2openjpeg_drv is None:
-        return 'skip'
+        pytest.skip()
 
     if not gdaltest.download_file('http://www.gwg.nga.mil/ntb/baseline/software/testfile/Jpeg2000/jp2_03/file3.jp2', 'file3.jp2'):
-        return 'skip'
+        pytest.skip()
 
     ds = gdal.Open('tmp/cache/file3.jp2')
     cs1 = ds.GetRasterBand(1).Checksum()
@@ -2976,7 +2968,7 @@ def test_jp2openjpeg_online_6():
 def test_jp2openjpeg_49():
 
     if gdaltest.jp2openjpeg_drv is None:
-        return 'skip'
+        pytest.skip()
 
     tests = [(None, True, True, 'LOCAL_CS["PAM"]', (100.0, 1.0, 0.0, 300.0, 0.0, -1.0)),
              (None, True, False, 'LOCAL_CS["PAM"]', (100.0, 1.0, 0.0, 300.0, 0.0, -1.0)),
@@ -3099,7 +3091,7 @@ def test_jp2openjpeg_49():
 def test_jp2openjpeg_50():
 
     if gdaltest.jp2openjpeg_drv is None:
-        return 'skip'
+        pytest.skip()
 
     ds = gdal.Open('data/fake_sent2_preview.jp2')
     blockxsize, blockysize = ds.GetRasterBand(1).GetBlockSize()
@@ -3117,10 +3109,10 @@ def test_jp2openjpeg_50():
 def test_jp2openjpeg_codeblock_style():
 
     if gdaltest.jp2openjpeg_drv is None:
-        return 'skip'
+        pytest.skip()
 
     if gdaltest.jp2openjpeg_drv.GetMetadataItem('DMD_CREATIONOPTIONLIST').find('CODEBLOCK_STYLE') < 0:
-        return 'skip'
+        pytest.skip()
 
     filename = '/vsimem/jp2openjpeg_codeblock_style.jp2'
     for options in [['CODEBLOCK_STYLE=63', 'REVERSIBLE=YES', 'QUALITY=100'],
@@ -3155,7 +3147,7 @@ def test_jp2openjpeg_codeblock_style():
 def test_jp2openjpeg_external_overviews_single_band():
 
     if gdaltest.jp2openjpeg_drv is None:
-        return 'skip'
+        pytest.skip()
 
     filename = '/vsimem/jp2openjpeg_external_overviews_single_band.jp2'
     gdaltest.jp2openjpeg_drv.CreateCopy(filename,
@@ -3182,7 +3174,7 @@ def test_jp2openjpeg_external_overviews_single_band():
 def test_jp2openjpeg_external_overviews_multiple_band():
 
     if gdaltest.jp2openjpeg_drv is None:
-        return 'skip'
+        pytest.skip()
 
     filename = '/vsimem/jp2openjpeg_external_overviews_multiple_band.jp2'
     gdaltest.jp2openjpeg_drv.CreateCopy(filename,
diff --git a/autotest/gdrivers/jpeg.py b/autotest/gdrivers/jpeg.py
index 86b9ec929b21..1468731b6a83 100755
--- a/autotest/gdrivers/jpeg.py
+++ b/autotest/gdrivers/jpeg.py
@@ -86,8 +86,7 @@ def test_jpeg_2():
                 md['EXIF_XResolution'] != '(96)')), 'Exif metadata wrong.'
     except KeyError:
         print(md)
-        gdaltest.post_reason('Exit metadata apparently missing.')
-        return 'fail'
+        pytest.fail('Exit metadata apparently missing.')
 
     assert ds.GetRasterBand(3).GetRasterColorInterpretation() == gdal.GCI_BlueBand, \
         'Did not get expected color interpretation.'
@@ -139,8 +138,7 @@ def test_jpeg_3():
     try:
         os.stat('tmp/byte.wld')
     except OSError:
-        gdaltest.post_reason('should have .wld file at that point')
-        return 'fail'
+        pytest.fail('should have .wld file at that point')
 
     ds = gdal.Open('tmp/byte.jpg')
     expected_gt = [440720.0, 60.0, 0.0, 3751320.0, 0.0, -60.0]
@@ -158,8 +156,7 @@ def test_jpeg_3():
 
     try:
         os.stat('tmp/byte.wld')
-        gdaltest.post_reason('did not expect to find .wld file at that point')
-        return 'fail'
+        pytest.fail('did not expect to find .wld file at that point')
     except OSError:
         pass
 
@@ -174,7 +171,7 @@ def test_jpeg_4():
     try:
         gdalconst.GMF_ALL_VALID
     except AttributeError:
-        return 'skip'
+        pytest.skip()
 
     ds = gdal.Open('data/masked.jpg')
 
@@ -196,7 +193,7 @@ def test_jpeg_5():
     try:
         gdalconst.GMF_ALL_VALID
     except AttributeError:
-        return 'skip'
+        pytest.skip()
 
     ds = gdal.Open('data/masked.jpg')
 
@@ -360,14 +357,14 @@ def test_jpeg_9():
 def test_jpeg_10():
 
     if gdaltest.jpeg_version == '9b':  # Fails for some reason
-        return 'skip'
+        pytest.skip()
 
     # Check if JPEG driver supports 12bit JPEG reading/writing
     drv = gdal.GetDriverByName('JPEG')
     md = drv.GetMetadata()
     if md[gdal.DMD_CREATIONDATATYPES].find('UInt16') == -1:
         sys.stdout.write('(12bit jpeg not available) ... ')
-        return 'skip'
+        pytest.skip()
 
     try:
         os.remove('data/12bit_rose_extract.jpg.aux.xml')
@@ -394,14 +391,14 @@ def test_jpeg_10():
 def test_jpeg_11():
 
     if gdaltest.jpeg_version == '9b':  # Fails for some reason
-        return 'skip'
+        pytest.skip()
 
     # Check if JPEG driver supports 12bit JPEG reading/writing
     drv = gdal.GetDriverByName('JPEG')
     md = drv.GetMetadata()
     if md[gdal.DMD_CREATIONDATATYPES].find('UInt16') == -1:
         sys.stdout.write('(12bit jpeg not available) ... ')
-        return 'skip'
+        pytest.skip()
 
     ds = gdal.Open('data/12bit_rose_extract.jpg')
     out_ds = gdal.GetDriverByName('JPEG').CreateCopy('tmp/jpeg11.jpg', ds)
@@ -466,14 +463,14 @@ def test_jpeg_13():
 def test_jpeg_14():
 
     if gdaltest.jpeg_version == '9b':  # Fails for some reason
-        return 'skip'
+        pytest.skip()
 
     # Check if JPEG driver supports 12bit JPEG reading/writing
     drv = gdal.GetDriverByName('JPEG')
     md = drv.GetMetadata()
     if md[gdal.DMD_CREATIONDATATYPES].find('UInt16') == -1:
         sys.stdout.write('(12bit jpeg not available) ... ')
-        return 'skip'
+        pytest.skip()
 
     src_ds = gdal.Open('data/12bit_rose_extract.jpg')
     ds = drv.CreateCopy('/vsistdout_redirect//vsimem/tmp.jpg', src_ds)
@@ -882,7 +879,7 @@ def test_jpeg_24():
         if gdal.GetLastErrorMsg().find('Requested feature was omitted at compile time') >= 0:
             ds = None
             gdal.Unlink('/vsimem/byte.jpg')
-            return 'skip'
+            pytest.skip()
 
         expected_cs = 4743
 
diff --git a/autotest/gdrivers/jpeg2000.py b/autotest/gdrivers/jpeg2000.py
index 873abb45bd3c..73aff24a56f4 100755
--- a/autotest/gdrivers/jpeg2000.py
+++ b/autotest/gdrivers/jpeg2000.py
@@ -33,6 +33,7 @@
 
 
 import gdaltest
+import pytest
 
 gdaltest.buggy_jasper = None
 
@@ -78,7 +79,7 @@ def test_jpeg2000_1():
 def test_jpeg2000_2():
 
     if gdaltest.jpeg2000_drv is None:
-        return 'skip'
+        pytest.skip()
 
     srs = """PROJCS["NAD27 / UTM zone 11N",
     GEOGCS["NAD27",
@@ -111,7 +112,7 @@ def test_jpeg2000_2():
 def test_jpeg2000_3():
 
     if gdaltest.jpeg2000_drv is None:
-        return 'skip'
+        pytest.skip()
 
     ds = gdal.Open('data/int16.jp2')
     ds_ref = gdal.Open('data/int16.tif')
@@ -135,7 +136,7 @@ def test_jpeg2000_3():
 def test_jpeg2000_4():
 
     if gdaltest.jpeg2000_drv is None:
-        return 'skip'
+        pytest.skip()
 
     tst = gdaltest.GDALTest('JPEG2000', 'byte.jp2', 1, 50054)
     tst.testCreateCopy()
@@ -154,7 +155,7 @@ def test_jpeg2000_4():
 def test_jpeg2000_5():
 
     if gdaltest.jpeg2000_drv is None:
-        return 'skip'
+        pytest.skip()
 
     tst = gdaltest.GDALTest('JPEG2000', 'int16.jp2', 1, None)
     return tst.testCreateCopy()
@@ -166,7 +167,7 @@ def test_jpeg2000_5():
 def test_jpeg2000_6():
 
     if gdaltest.jpeg2000_drv is None:
-        return 'skip'
+        pytest.skip()
 
     tst = gdaltest.GDALTest('JPEG2000', 'll.jp2', 1, None)
 
@@ -185,7 +186,7 @@ def test_jpeg2000_6():
 def test_jpeg2000_7():
 
     if gdaltest.jpeg2000_drv is None:
-        return 'skip'
+        pytest.skip()
 
     tst = gdaltest.GDALTest('JPEG2000', '/vsigzip/data/byte.jp2.gz', 1, 50054, filename_absolute=1)
     return tst.testOpen()
@@ -197,7 +198,7 @@ def test_jpeg2000_7():
 def test_jpeg2000_8():
 
     if gdaltest.jpeg2000_drv is None or is_buggy_jasper():
-        return 'skip'
+        pytest.skip()
 
     ds = gdal.Open('data/3_13bit_and_1bit.jp2')
 
@@ -218,7 +219,7 @@ def test_jpeg2000_8():
 def test_jpeg2000_9():
 
     if gdaltest.jpeg2000_drv is None:
-        return 'skip'
+        pytest.skip()
 
     ds = gdal.Open('data/byte_without_geotransform.jp2')
 
@@ -237,7 +238,7 @@ def test_jpeg2000_9():
 def test_jpeg2000_10():
 
     if gdaltest.jpeg2000_drv is None:
-        return 'skip'
+        pytest.skip()
 
     src_ds = gdal.GetDriverByName('GTiff').Create('/vsimem/jpeg2000_10_src.tif', 128, 128, 5)
     for i in range(src_ds.RasterCount):
@@ -266,7 +267,7 @@ def test_jpeg2000_10():
 def test_jpeg2000_11():
 
     if gdaltest.jpeg2000_drv is None or is_buggy_jasper():
-        return 'skip'
+        pytest.skip()
 
     ds = gdal.Open('data/stefan_full_rgba_alpha_1bit.jp2')
     fourth_band = ds.GetRasterBand(4)
@@ -303,10 +304,10 @@ def test_jpeg2000_11():
 def test_jpeg2000_online_1():
 
     if gdaltest.jpeg2000_drv is None:
-        return 'skip'
+        pytest.skip()
 
     if not gdaltest.download_file('http://download.osgeo.org/gdal/data/jpeg2000/7sisters200.j2k', '7sisters200.j2k'):
-        return 'skip'
+        pytest.skip()
 
     # Checksum = 32669 on my PC
     tst = gdaltest.GDALTest('JPEG2000', 'tmp/cache/7sisters200.j2k', 1, None, filename_absolute=1)
@@ -325,10 +326,10 @@ def test_jpeg2000_online_1():
 def test_jpeg2000_online_2():
 
     if gdaltest.jpeg2000_drv is None:
-        return 'skip'
+        pytest.skip()
 
     if not gdaltest.download_file('http://download.osgeo.org/gdal/data/jpeg2000/gcp.jp2', 'gcp.jp2'):
-        return 'skip'
+        pytest.skip()
 
     # Checksum = 15621 on my PC
     tst = gdaltest.GDALTest('JPEG2000', 'tmp/cache/gcp.jp2', 1, None, filename_absolute=1)
@@ -352,12 +353,12 @@ def test_jpeg2000_online_2():
 def test_jpeg2000_online_3():
 
     if gdaltest.jpeg2000_drv is None:
-        return 'skip'
+        pytest.skip()
 
     if not gdaltest.download_file('http://www.openjpeg.org/samples/Bretagne1.j2k', 'Bretagne1.j2k'):
-        return 'skip'
+        pytest.skip()
     if not gdaltest.download_file('http://www.openjpeg.org/samples/Bretagne1.bmp', 'Bretagne1.bmp'):
-        return 'skip'
+        pytest.skip()
 
     # Checksum = 14443 on my PC
     tst = gdaltest.GDALTest('JPEG2000', 'tmp/cache/Bretagne1.j2k', 1, None, filename_absolute=1)
@@ -384,12 +385,12 @@ def test_jpeg2000_online_3():
 def test_jpeg2000_online_4():
 
     if gdaltest.jpeg2000_drv is None:
-        return 'skip'
+        pytest.skip()
 
     if not gdaltest.download_file('http://www.openjpeg.org/samples/Bretagne2.j2k', 'Bretagne2.j2k'):
-        return 'skip'
+        pytest.skip()
     if not gdaltest.download_file('http://www.openjpeg.org/samples/Bretagne2.bmp', 'Bretagne2.bmp'):
-        return 'skip'
+        pytest.skip()
 
     tst = gdaltest.GDALTest('JPEG2000', 'tmp/cache/Bretagne2.j2k', 1, None, filename_absolute=1)
 
@@ -420,10 +421,10 @@ def test_jpeg2000_online_4():
 def test_jpeg2000_online_5():
 
     if gdaltest.jpeg2000_drv is None:
-        return 'skip'
+        pytest.skip()
 
     if not gdaltest.download_file('http://www.gwg.nga.mil/ntb/baseline/software/testfile/Jpeg2000/jp2_09/file9.jp2', 'file9.jp2'):
-        return 'skip'
+        pytest.skip()
 
     ds = gdal.Open('tmp/cache/file9.jp2')
     cs1 = ds.GetRasterBand(1).Checksum()
@@ -443,10 +444,10 @@ def test_jpeg2000_online_5():
 def test_jpeg2000_online_6():
 
     if gdaltest.jpeg2000_drv is None:
-        return 'skip'
+        pytest.skip()
 
     if not gdaltest.download_file('http://www.gwg.nga.mil/ntb/baseline/software/testfile/Jpeg2000/jp2_03/file3.jp2', 'file3.jp2'):
-        return 'skip'
+        pytest.skip()
 
     ds = gdal.Open('tmp/cache/file3.jp2')
     cs1 = ds.GetRasterBand(1).Checksum()
diff --git a/autotest/gdrivers/jpeg_profile.py b/autotest/gdrivers/jpeg_profile.py
index 9a197acdd9f6..672e030cfc47 100755
--- a/autotest/gdrivers/jpeg_profile.py
+++ b/autotest/gdrivers/jpeg_profile.py
@@ -37,6 +37,7 @@
 
 import gdaltest
 from osgeo import gdal
+import pytest
 
 
 ###############################################################################
@@ -149,7 +150,7 @@ def test_jpeg_copy_icc_64K():
 
     try:
         os.stat('tmp/icc_test.jpg.aux.xml')
-        return 'fail'
+        pytest.fail()
     except OSError:
         pass
 
@@ -164,7 +165,7 @@ def test_jpeg_copy_icc_64K():
 
     try:
         os.stat('tmp/icc_test.jpg.aux.xml')
-        return 'fail'
+        pytest.fail()
     except OSError:
         pass
 
@@ -177,7 +178,7 @@ def test_jpeg_copy_icc_64K():
 
     try:
         os.stat('tmp/icc_test.jpg.aux.xml')
-        return 'fail'
+        pytest.fail()
     except OSError:
         pass
 
diff --git a/autotest/gdrivers/jpegls.py b/autotest/gdrivers/jpegls.py
index 75d7b5964790..125d77ae94e5 100755
--- a/autotest/gdrivers/jpegls.py
+++ b/autotest/gdrivers/jpegls.py
@@ -33,6 +33,7 @@
 
 
 import gdaltest
+import pytest
 
 ###############################################################################
 
@@ -40,7 +41,7 @@
 def test_jpegls_1():
 
     if gdal.GetDriverByName('JPEGLS') is None:
-        return 'skip'
+        pytest.skip()
 
     tst = gdaltest.GDALTest('JPEGLS', 'byte.tif', 1, 4672)
     return tst.testCreateCopy(vsimem=1)
@@ -51,7 +52,7 @@ def test_jpegls_1():
 def test_jpegls_2():
 
     if gdal.GetDriverByName('JPEGLS') is None:
-        return 'skip'
+        pytest.skip()
 
     tst = gdaltest.GDALTest('JPEGLS', 'int16.tif', 1, 4672)
     return tst.testCreateCopy(vsimem=1)
diff --git a/autotest/gdrivers/jpipkak.py b/autotest/gdrivers/jpipkak.py
index 25ea150e9855..1d62a56320c1 100755
--- a/autotest/gdrivers/jpipkak.py
+++ b/autotest/gdrivers/jpipkak.py
@@ -33,6 +33,7 @@
 
 
 import gdaltest
+import pytest
 
 ###############################################################################
 # Read test of simple byte reference data.
@@ -40,12 +41,12 @@
 
 def test_jpipkak_1():
 
-    return 'skip'
+    pytest.skip()
 
     # pylint: disable=unreachable
     gdaltest.jpipkak_drv = gdal.GetDriverByName('JPIPKAK')
     if gdaltest.jpipkak_drv is None:
-        return 'skip'
+        pytest.skip()
 
     ds = gdal.Open('jpip://216.150.195.220/JP2Server/qb_boulder_msi_uint')
     assert ds is not None, 'failed to open jpip stream.'
@@ -65,11 +66,11 @@ def test_jpipkak_1():
 
 def test_jpipkak_2():
 
-    return 'skip'
+    pytest.skip()
 
     # pylint: disable=unreachable
     if gdaltest.jpipkak_drv is None:
-        return 'skip'
+        pytest.skip()
 
     ds = gdal.Open('jpip://216.150.195.220/JP2Server/qb_boulder_pan_byte')
     assert ds is not None, 'failed to open jpip stream.'
@@ -94,11 +95,11 @@ def test_jpipkak_2():
 
 def test_jpipkak_3():
 
-    return 'skip'
+    pytest.skip()
 
     # pylint: disable=unreachable
     if gdaltest.jpipkak_drv is None:
-        return 'skip'
+        pytest.skip()
 
     ds = gdal.Open('jpip://216.150.195.220/JP2Server/qb_boulder_pan_11bit')
     assert ds is not None, 'failed to open jpip stream.'
@@ -118,11 +119,11 @@ def test_jpipkak_3():
 
 def test_jpipkak_4():
 
-    return 'skip'
+    pytest.skip()
 
     # pylint: disable=unreachable
     if gdaltest.jpipkak_drv is None:
-        return 'skip'
+        pytest.skip()
 
     ds = gdal.Open('jpip://216.150.195.220/JP2Server/qb_boulder_pan_20bit')
     assert ds is not None, 'failed to open jpip stream.'
@@ -142,11 +143,11 @@ def test_jpipkak_4():
 
 def test_jpipkak_5():
 
-    return 'skip'
+    pytest.skip()
 
     # pylint: disable=unreachable
     if gdaltest.jpipkak_drv is None:
-        return 'skip'
+        pytest.skip()
 
     ds = gdal.Open('jpip://216.150.195.220/JP2Server/qb_boulder_pan_byte')
     assert ds is not None, 'failed to open jpip stream.'
diff --git a/autotest/gdrivers/kea.py b/autotest/gdrivers/kea.py
index 826a436cfc70..32e90d32a040 100755
--- a/autotest/gdrivers/kea.py
+++ b/autotest/gdrivers/kea.py
@@ -50,7 +50,7 @@ def test_kea_init():
 
 def test_kea_1():
     if gdaltest.kea_driver is None:
-        return 'skip'
+        pytest.skip()
 
     tst = gdaltest.GDALTest('KEA', 'byte.tif', 1, 4672, options=['IMAGEBLOCKSIZE=15', 'THEMATIC=YES'])
     return tst.testCreateCopy(check_srs=True, check_gt=1)
@@ -61,7 +61,7 @@ def test_kea_1():
 
 def test_kea_2():
     if gdaltest.kea_driver is None:
-        return 'skip'
+        pytest.skip()
 
     src_files = ['byte.tif',
                  'int16.tif',
@@ -83,7 +83,7 @@ def test_kea_2():
 
 def test_kea_3():
     if gdaltest.kea_driver is None:
-        return 'skip'
+        pytest.skip()
 
     src_files = ['byte.tif',
                  'int16.tif',
@@ -105,7 +105,7 @@ def test_kea_3():
 
 def test_kea_4():
     if gdaltest.kea_driver is None:
-        return 'skip'
+        pytest.skip()
 
     gdal.PushErrorHandler('CPLQuietErrorHandler')
     ds = gdaltest.kea_driver.Create("/non_existing_path/non_existing_path", 1, 1)
@@ -189,7 +189,7 @@ def test_kea_4():
 
 def test_kea_5():
     if gdaltest.kea_driver is None:
-        return 'skip'
+        pytest.skip()
 
     options = ['IMAGEBLOCKSIZE=15', 'ATTBLOCKSIZE=100', 'MDC_NELMTS=10',
                'RDCC_NELMTS=256', 'RDCC_NBYTES=500000', 'RDCC_W0=0.5',
@@ -214,7 +214,7 @@ def test_kea_5():
 
 def test_kea_6():
     if gdaltest.kea_driver is None:
-        return 'skip'
+        pytest.skip()
 
     ds = gdaltest.kea_driver.Create("tmp/out.kea", 1, 1, 5)
     ds.SetMetadata({'foo': 'bar'})
@@ -267,7 +267,7 @@ def test_kea_6():
 
 def test_kea_7():
     if gdaltest.kea_driver is None:
-        return 'skip'
+        pytest.skip()
 
     # Geotransform
     ds = gdaltest.kea_driver.Create("tmp/out.kea", 1, 1)
@@ -322,7 +322,7 @@ def test_kea_7():
 
 def test_kea_8():
     if gdaltest.kea_driver is None:
-        return 'skip'
+        pytest.skip()
 
     for i in range(2):
         ds = gdaltest.kea_driver.Create("tmp/out.kea", 1, 1)
@@ -359,7 +359,7 @@ def test_kea_8():
 
 def test_kea_9():
     if gdaltest.kea_driver is None:
-        return 'skip'
+        pytest.skip()
 
     ds = gdaltest.kea_driver.Create("tmp/out.kea", 1, 1, gdal.GCI_YCbCr_CrBand - gdal.GCI_GrayIndex + 1)
     assert ds.GetRasterBand(1).GetColorInterpretation() == gdal.GCI_GrayIndex
@@ -387,7 +387,7 @@ def test_kea_9():
 
 def test_kea_10():
     if gdaltest.kea_driver is None:
-        return 'skip'
+        pytest.skip()
 
     for (dt, nd, expected_nd) in [(gdal.GDT_Byte, 0, 0),
                                   (gdal.GDT_Byte, 1.1, 1.0),
@@ -444,7 +444,7 @@ def test_kea_10():
 
 def test_kea_11():
     if gdaltest.kea_driver is None:
-        return 'skip'
+        pytest.skip()
 
     ds = gdaltest.kea_driver.Create("tmp/out.kea", 1, 1, 1, gdal.GDT_Byte)
     ds = None
@@ -470,7 +470,7 @@ def test_kea_11():
 
 def test_kea_12():
     if gdaltest.kea_driver is None:
-        return 'skip'
+        pytest.skip()
 
     ds = gdaltest.kea_driver.Create("tmp/out.kea", 1, 1, 1, gdal.GDT_Byte)
     assert ds.GetRasterBand(1).GetDefaultRAT().GetColumnCount() == 0
@@ -578,7 +578,7 @@ def test_kea_12():
 
 def test_kea_13():
     if gdaltest.kea_driver is None:
-        return 'skip'
+        pytest.skip()
 
     src_ds = gdal.Open('data/byte.tif')
     ds = gdaltest.kea_driver.CreateCopy("tmp/out.kea", src_ds)
@@ -607,7 +607,7 @@ def test_kea_13():
 
 def test_kea_14():
     if gdaltest.kea_driver is None:
-        return 'skip'
+        pytest.skip()
 
     ds = gdaltest.kea_driver.Create("tmp/out.kea", 1, 1, 1, gdal.GDT_Byte)
     assert ds.GetRasterBand(1).GetMaskFlags() == gdal.GMF_ALL_VALID
diff --git a/autotest/gdrivers/kmlsuperoverlay.py b/autotest/gdrivers/kmlsuperoverlay.py
index 2fbdc0e2de5c..e676e2e2d8fc 100755
--- a/autotest/gdrivers/kmlsuperoverlay.py
+++ b/autotest/gdrivers/kmlsuperoverlay.py
@@ -36,6 +36,7 @@
 
 
 import gdaltest
+import pytest
 
 ###############################################################################
 # Test CreateCopy() to a KMZ file
@@ -83,8 +84,7 @@ def test_kmlsuperoverlay_3():
         try:
             os.remove(filename)
         except OSError:
-            gdaltest.post_reason("Missing file: %s" % filename)
-            return 'fail'
+            pytest.fail("Missing file: %s" % filename)
 
     shutil.rmtree('tmp/0')
     shutil.rmtree('tmp/1')
@@ -152,19 +152,19 @@ def test_kmlsuperoverlay_4():
         src_ds = None
         gdal.Unlink("/vsimem/src.vrt")
         gdal.Unlink("/vsimem/kmlsuperoverlay_4.kmz")
-        return 'fail'
+        pytest.fail()
     if ds.GetRasterBand(1).GetOverview(0).Checksum() != 30111:
         ds = None
         src_ds = None
         gdal.Unlink("/vsimem/src.vrt")
         gdal.Unlink("/vsimem/kmlsuperoverlay_4.kmz")
-        return 'fail'
+        pytest.fail()
     if ds.GetRasterBand(1).Checksum() != src_ds.GetRasterBand(1).Checksum():
         ds = None
         src_ds = None
         gdal.Unlink("/vsimem/src.vrt")
         gdal.Unlink("/vsimem/kmlsuperoverlay_4.kmz")
-        return 'fail'
+        pytest.fail()
 
     # Test fix for #6311
     vrt_ds = gdal.GetDriverByName('VRT').CreateCopy('', ds)
@@ -176,7 +176,7 @@ def test_kmlsuperoverlay_4():
         src_ds = None
         gdal.Unlink("/vsimem/src.vrt")
         gdal.Unlink("/vsimem/kmlsuperoverlay_4.kmz")
-        return 'fail'
+        pytest.fail()
 
     ds = None
     src_ds = None
@@ -195,7 +195,7 @@ def test_kmlsuperoverlay_5():
     try:
         from xml.etree import ElementTree
     except ImportError:
-        return 'skip'
+        pytest.skip()
 
     src_ds = gdal.Open("""<VRTDataset rasterXSize="512" rasterYSize="512">
   <SRS>PROJCS["WGS 84 / Mercator 41",
diff --git a/autotest/gdrivers/kro.py b/autotest/gdrivers/kro.py
index e1cca0b76541..d3ea86b89875 100755
--- a/autotest/gdrivers/kro.py
+++ b/autotest/gdrivers/kro.py
@@ -34,6 +34,7 @@
 
 
 import gdaltest
+import pytest
 
 ###############################################################################
 # Create 3-band byte
@@ -84,7 +85,7 @@ def test_kro_5():
     # Determine if the filesystem supports sparse files (we don't want to create a real 10 GB
     # file !
     if not gdaltest.filesystem_supports_sparse_files('tmp'):
-        return 'skip'
+        pytest.skip()
 
     ds = gdal.GetDriverByName('KRO').Create('tmp/kro_5.kro', 100000, 10000, 4)
     ds = None
diff --git a/autotest/gdrivers/l1b.py b/autotest/gdrivers/l1b.py
index 270702a9ba6c..9ed9558fcf40 100755
--- a/autotest/gdrivers/l1b.py
+++ b/autotest/gdrivers/l1b.py
@@ -80,7 +80,7 @@ def test_l1b_geoloc():
     try:
         os.stat('tmp/cache/n12gac8bit.l1b')
     except OSError:
-        return 'skip'
+        pytest.skip()
 
     ds = gdal.Open('tmp/cache/n12gac8bit.l1b')
     md = ds.GetMetadata('GEOLOCATION')
@@ -113,7 +113,7 @@ def test_l1b_solar_zenith_angles_before_noaa_15():
     try:
         os.stat('tmp/cache/n12gac10bit.l1b')
     except OSError:
-        return 'skip'
+        pytest.skip()
 
     ds = gdal.Open('tmp/cache/n12gac10bit.l1b')
     md = ds.GetMetadata('SUBDATASETS')
@@ -139,7 +139,7 @@ def test_l1b_metadata_before_noaa_15():
     try:
         os.stat('tmp/cache/n12gac10bit.l1b')
     except OSError:
-        return 'skip'
+        pytest.skip()
 
     gdal.SetConfigOption('L1B_FETCH_METADATA', 'YES')
     gdal.SetConfigOption('L1B_METADATA_DIRECTORY', 'tmp')
@@ -167,7 +167,7 @@ def test_l1b_angles_after_noaa_15():
     try:
         os.stat('tmp/cache/n16gac10bit.l1b')
     except OSError:
-        return 'skip'
+        pytest.skip()
 
     ds = gdal.Open('tmp/cache/n16gac10bit.l1b')
     md = ds.GetMetadata('SUBDATASETS')
@@ -197,7 +197,7 @@ def test_l1b_clouds_after_noaa_15():
     try:
         os.stat('tmp/cache/n16gac10bit.l1b')
     except OSError:
-        return 'skip'
+        pytest.skip()
 
     ds = gdal.Open('tmp/cache/n16gac10bit.l1b')
     md = ds.GetMetadata('SUBDATASETS')
@@ -223,7 +223,7 @@ def test_l1b_metadata_after_noaa_15():
     try:
         os.stat('tmp/cache/n16gac10bit.l1b')
     except OSError:
-        return 'skip'
+        pytest.skip()
 
     gdal.SetConfigOption('L1B_FETCH_METADATA', 'YES')
     gdal.SetConfigOption('L1B_METADATA_DIRECTORY', 'tmp')
diff --git a/autotest/gdrivers/lcp.py b/autotest/gdrivers/lcp.py
index c965bc5f7962..cbf231512c67 100755
--- a/autotest/gdrivers/lcp.py
+++ b/autotest/gdrivers/lcp.py
@@ -774,7 +774,7 @@ def test_lcp_21():
         import random
         import struct
     except ImportError:
-        return 'skip'
+        pytest.skip()
     mem_drv = gdal.GetDriverByName('MEM')
     assert mem_drv is not None
     drv = gdal.GetDriverByName('LCP')
@@ -816,7 +816,7 @@ def test_lcp_22():
         import struct
         import numpy
     except ImportError:
-        return 'skip'
+        pytest.skip()
     mem_drv = gdal.GetDriverByName('MEM')
     assert mem_drv is not None
     drv = gdal.GetDriverByName('LCP')
diff --git a/autotest/gdrivers/loslas.py b/autotest/gdrivers/loslas.py
index 7bc5ed77ce88..eb64973208dd 100755
--- a/autotest/gdrivers/loslas.py
+++ b/autotest/gdrivers/loslas.py
@@ -33,6 +33,7 @@
 
 
 import gdaltest
+import pytest
 
 ###############################################################################
 
@@ -40,12 +41,12 @@
 def test_loslas_online_1():
 
     if not gdaltest.download_file('http://www.ngs.noaa.gov/PC_PROD/NADCON/NADCON.zip', 'NADCON.zip'):
-        return 'skip'
+        pytest.skip()
 
     try:
         os.stat('tmp/cache/NADCON.zip')
     except OSError:
-        return 'skip'
+        pytest.skip()
 
     try:
         gdaltest.unzip('tmp/cache/NADCON', 'tmp/cache/NADCON.zip')
@@ -53,7 +54,7 @@ def test_loslas_online_1():
         gdaltest.unzip('tmp/cache/NADCON', 'tmp/cache/NADCON/nadcon.jar')
         os.stat('tmp/cache/NADCON/grids/wyhpgn.los')
     except OSError:
-        return 'skip'
+        pytest.skip()
 
     tst = gdaltest.GDALTest('LOSLAS', 'tmp/cache/NADCON/grids/wyhpgn.los', 1, 0, filename_absolute=1)
     gt = (-111.625, 0.25, 0.0, 45.625, 0.0, -0.25)
diff --git a/autotest/gdrivers/mbtiles.py b/autotest/gdrivers/mbtiles.py
index 971b34dfa0eb..80702586bb21 100755
--- a/autotest/gdrivers/mbtiles.py
+++ b/autotest/gdrivers/mbtiles.py
@@ -36,6 +36,7 @@
 
 import gdaltest
 import webserver
+import pytest
 
 ###############################################################################
 # Get the mbtiles driver
@@ -54,10 +55,10 @@ def test_mbtiles_1():
 def test_mbtiles_2():
 
     if gdaltest.mbtiles_drv is None:
-        return 'skip'
+        pytest.skip()
 
     if gdal.GetDriverByName('JPEG') is None:
-        return 'skip'
+        pytest.skip()
 
     ds = gdal.OpenEx('data/world_l1.mbtiles', open_options=['USE_BOUNDS=NO'])
     assert ds is not None
@@ -109,45 +110,42 @@ def test_mbtiles_2():
 def test_mbtiles_3():
 
     if gdaltest.mbtiles_drv is None:
-        return 'skip'
+        pytest.skip()
 
     if gdal.GetDriverByName('HTTP') is None:
-        return 'skip'
+        pytest.skip()
 
     if sys.platform == 'darwin' and gdal.GetConfigOption('TRAVIS', None) is not None:
-        print("Hangs on MacOSX Travis sometimes. Not sure why.")
-        return 'skip'
+        pytest.skip("Hangs on MacOSX Travis sometimes. Not sure why.")
 
     # Check that we have SQLite VFS support
     gdal.PushErrorHandler('CPLQuietErrorHandler')
     ds = ogr.GetDriverByName('SQLite').CreateDataSource('/vsimem/mbtiles_3.db')
     gdal.PopErrorHandler()
     if ds is None:
-        return 'skip'
+        pytest.skip()
     ds = None
     gdal.Unlink('/vsimem/mbtiles_3.db')
 
     ds = gdal.Open('/vsicurl/http://a.tiles.mapbox.com/v3/mapbox.geography-class.mbtiles')
     if ds is None:
         # Just skip. The service isn't perfectly reliable sometimes
-        return 'skip'
+        pytest.skip()
 
     # long=2,lat=49 in WGS 84 --> x=222638,y=6274861 in Google Mercator
     locationInfo = ds.GetRasterBand(1).GetMetadataItem('GeoPixel_222638_6274861', 'LocationInfo')
     if locationInfo is None or locationInfo.find("France") == -1:
-        gdaltest.post_reason('did not get expected LocationInfo')
         print(locationInfo)
         if gdaltest.skip_on_travis():
-            return 'skip'
-        return 'fail'
+            pytest.skip()
+        pytest.fail('did not get expected LocationInfo')
 
     locationInfo2 = ds.GetRasterBand(1).GetOverview(5).GetMetadataItem('GeoPixel_222638_6274861', 'LocationInfo')
     if locationInfo2 != locationInfo:
-        gdaltest.post_reason('did not get expected LocationInfo on overview')
         print(locationInfo2)
         if gdaltest.skip_on_travis():
-            return 'skip'
-        return 'fail'
+            pytest.skip()
+        pytest.fail('did not get expected LocationInfo on overview')
 
     return 'success'
 
@@ -158,14 +156,14 @@ def test_mbtiles_3():
 def test_mbtiles_start_webserver():
 
     if gdaltest.mbtiles_drv is None:
-        return 'skip'
+        pytest.skip()
 
     if gdal.GetDriverByName('HTTP') is None:
-        return 'skip'
+        pytest.skip()
 
     (gdaltest.webserver_process, gdaltest.webserver_port) = webserver.launch(handler=webserver.DispatcherHttpHandler)
     if gdaltest.webserver_port == 0:
-        return 'skip'
+        pytest.skip()
 
     return 'success'
 
@@ -176,16 +174,16 @@ def test_mbtiles_start_webserver():
 def test_mbtiles_http_jpeg_three_bands():
 
     if gdaltest.mbtiles_drv is None:
-        return 'skip'
+        pytest.skip()
 
     if gdal.GetDriverByName('HTTP') is None:
-        return 'skip'
+        pytest.skip()
 
     if gdal.GetDriverByName('JPEG') is None:
-        return 'skip'
+        pytest.skip()
 
     if gdaltest.webserver_port == 0:
-        return 'skip'
+        pytest.skip()
 
     handler = webserver.FileHandler(
         {'/world_l1.mbtiles': open('data/world_l1.mbtiles', 'rb').read()})
@@ -202,16 +200,16 @@ def test_mbtiles_http_jpeg_three_bands():
 def test_mbtiles_http_jpeg_single_band():
 
     if gdaltest.mbtiles_drv is None:
-        return 'skip'
+        pytest.skip()
 
     if gdal.GetDriverByName('HTTP') is None:
-        return 'skip'
+        pytest.skip()
 
     if gdal.GetDriverByName('JPEG') is None:
-        return 'skip'
+        pytest.skip()
 
     if gdaltest.webserver_port == 0:
-        return 'skip'
+        pytest.skip()
 
     handler = webserver.FileHandler(
         {'/byte_jpeg.mbtiles': open('data/byte_jpeg.mbtiles', 'rb').read()})
@@ -228,16 +226,16 @@ def test_mbtiles_http_jpeg_single_band():
 def test_mbtiles_http_png():
 
     if gdaltest.mbtiles_drv is None:
-        return 'skip'
+        pytest.skip()
 
     if gdal.GetDriverByName('HTTP') is None:
-        return 'skip'
+        pytest.skip()
 
     if gdal.GetDriverByName('PNG') is None:
-        return 'skip'
+        pytest.skip()
 
     if gdaltest.webserver_port == 0:
-        return 'skip'
+        pytest.skip()
 
     handler = webserver.FileHandler(
         {'/byte.mbtiles': open('data/byte.mbtiles', 'rb').read()})
@@ -254,10 +252,10 @@ def test_mbtiles_http_png():
 def test_mbtiles_stop_webserver():
 
     if gdaltest.mbtiles_drv is None:
-        return 'skip'
+        pytest.skip()
 
     if gdal.GetDriverByName('HTTP') is None:
-        return 'skip'
+        pytest.skip()
 
     if gdaltest.webserver_port != 0:
         webserver.server_stop(gdaltest.webserver_process, gdaltest.webserver_port)
@@ -271,10 +269,10 @@ def test_mbtiles_stop_webserver():
 def test_mbtiles_4():
 
     if gdaltest.mbtiles_drv is None:
-        return 'skip'
+        pytest.skip()
 
     if gdal.GetDriverByName('JPEG') is None:
-        return 'skip'
+        pytest.skip()
 
     ds = gdal.Open('data/world_l1.mbtiles')
     assert ds is not None
@@ -302,10 +300,10 @@ def test_mbtiles_4():
 def test_mbtiles_5():
 
     if gdaltest.mbtiles_drv is None:
-        return 'skip'
+        pytest.skip()
 
     if gdal.GetDriverByName('PNG') is None:
-        return 'skip'
+        pytest.skip()
 
     src_ds = gdal.Open('data/byte.tif')
     gdaltest.mbtiles_drv.CreateCopy('/vsimem/mbtiles_5.mbtiles', src_ds)
@@ -340,10 +338,10 @@ def test_mbtiles_5():
 def test_mbtiles_6():
 
     if gdaltest.mbtiles_drv is None:
-        return 'skip'
+        pytest.skip()
 
     if gdal.GetDriverByName('JPEG') is None:
-        return 'skip'
+        pytest.skip()
 
     # Test options
     src_ds = gdal.Open('data/byte.tif')
@@ -377,10 +375,10 @@ def test_mbtiles_6():
 def test_mbtiles_7():
 
     if gdaltest.mbtiles_drv is None:
-        return 'skip'
+        pytest.skip()
 
     if gdal.GetDriverByName('PNG') is None:
-        return 'skip'
+        pytest.skip()
 
     src_ds = gdal.Open('data/small_world.tif')
     data = src_ds.ReadRaster()
@@ -433,10 +431,10 @@ def test_mbtiles_7():
 def test_mbtiles_8():
 
     if gdaltest.mbtiles_drv is None:
-        return 'skip'
+        pytest.skip()
 
     if gdal.GetDriverByName('PNG') is None:
-        return 'skip'
+        pytest.skip()
 
     src_ds = gdal.Open('data/small_world_pct.tif')
     out_ds = gdaltest.mbtiles_drv.CreateCopy('/vsimem/mbtiles_8.mbtiles', src_ds, options=['RESAMPLING=NEAREST'])
@@ -477,10 +475,10 @@ def test_mbtiles_8():
 def test_mbtiles_9():
 
     if gdaltest.mbtiles_drv is None:
-        return 'skip'
+        pytest.skip()
 
     if gdal.GetDriverByName('PNG') is None:
-        return 'skip'
+        pytest.skip()
 
     src_ds = gdal.Open('data/byte.tif')
     gdaltest.mbtiles_drv.CreateCopy('/vsimem/mbtiles_9.mbtiles', src_ds, options=['RESAMPLING=NEAREST'])
@@ -505,10 +503,10 @@ def test_mbtiles_9():
 def test_mbtiles_10():
 
     if gdaltest.mbtiles_drv is None:
-        return 'skip'
+        pytest.skip()
 
     if gdal.GetDriverByName('PNG') is None:
-        return 'skip'
+        pytest.skip()
 
     old_val_GPKG_FORCE_TEMPDB_COMPACTION = gdal.GetConfigOption('GPKG_FORCE_TEMPDB_COMPACTION')
     gdal.SetConfigOption('GPKG_FORCE_TEMPDB_COMPACTION', 'YES')
@@ -531,13 +529,13 @@ def test_mbtiles_10():
 def test_mbtiles_11():
 
     if gdaltest.mbtiles_drv is None:
-        return 'skip'
+        pytest.skip()
 
     if gdaltest.mbtiles_drv.GetMetadataItem("ENABLE_SQL_SQLITE_FORMAT") != 'YES':
-        return 'skip'
+        pytest.skip()
 
     if gdal.GetDriverByName('PNG') is None:
-        return 'skip'
+        pytest.skip()
     ds = gdal.Open('data/byte.mbtiles.sql')
     assert ds.GetRasterBand(1).Checksum() == 4118, 'validation failed'
 
@@ -549,7 +547,7 @@ def test_mbtiles_11():
 def test_mbtiles_raster_open_in_vector_mode():
 
     if gdaltest.mbtiles_drv is None:
-        return 'skip'
+        pytest.skip()
 
     ds = ogr.Open('data/byte.mbtiles')
     assert ds is None
@@ -562,7 +560,7 @@ def test_mbtiles_raster_open_in_vector_mode():
 def test_mbtiles_create():
 
     if gdaltest.mbtiles_drv is None:
-        return 'skip'
+        pytest.skip()
 
     filename = '/vsimem/mbtiles_create.mbtiles'
     gdaltest.mbtiles_drv.Create(filename, 1, 1, 1)
@@ -628,7 +626,7 @@ def test_mbtiles_create():
 def test_mbtiles_cleanup():
 
     if gdaltest.mbtiles_drv is None:
-        return 'skip'
+        pytest.skip()
 
     return 'success'
 
diff --git a/autotest/gdrivers/mem.py b/autotest/gdrivers/mem.py
index db12914e294a..bb3a5def142e 100755
--- a/autotest/gdrivers/mem.py
+++ b/autotest/gdrivers/mem.py
@@ -35,6 +35,7 @@
 
 
 import gdaltest
+import pytest
 
 ###############################################################################
 # Create a MEM dataset, and set some data, then test it.
@@ -113,7 +114,7 @@ def test_mem_2():
     try:
         import ctypes
     except ImportError:
-        return 'skip'
+        pytest.skip()
 
     for libname in ['msvcrt', 'libc.so.6']:
         try:
@@ -124,7 +125,7 @@ def test_mem_2():
             break
 
     if crt is None:
-        return 'skip'
+        pytest.skip()
 
     malloc = crt.malloc
     malloc.argtypes = [ctypes.c_size_t]
@@ -139,7 +140,7 @@ def test_mem_2():
     height = 3
     p = malloc(width * height * 4)
     if p is None:
-        return 'skip'
+        pytest.skip()
     float_p = ctypes.cast(p, ctypes.POINTER(ctypes.c_float))
 
     # build ds name.
@@ -153,25 +154,22 @@ def test_mem_2():
 
         ds = gdal.Open(dsname)
         if ds is None:
-            gdaltest.post_reason('opening MEM dataset failed.')
             free(p)
-            return 'fail'
+            pytest.fail('opening MEM dataset failed.')
 
         chksum = ds.GetRasterBand(1).Checksum()
         if chksum != 750:
-            gdaltest.post_reason('checksum failed.')
             print(chksum)
             free(p)
-            return 'fail'
+            pytest.fail('checksum failed.')
 
         ds.GetRasterBand(1).Fill(100.0)
         ds.FlushCache()
 
         if float_p[0] != 100.0:
             print(float_p[0])
-            gdaltest.post_reason('fill seems to have failed.')
             free(p)
-            return 'fail'
+            pytest.fail('fill seems to have failed.')
 
         ds = None
 
@@ -254,7 +252,7 @@ def test_mem_5():
 def test_mem_6():
 
     if gdal.GetConfigOption('SKIP_MEM_INTENSIVE_TEST') is not None:
-        return 'skip'
+        pytest.skip()
 
     drv = gdal.GetDriverByName('MEM')
 
@@ -348,11 +346,10 @@ def test_mem_9():
         ref_data = src_ds.GetRasterBand(2).ReadRaster(20, 8, 4, 5)
         got_data = out_ds.GetRasterBand(2).ReadRaster(20, 8, 4, 5)
         if ref_data != got_data:
-            print(interleave)
             import struct
             print(struct.unpack('B' * 4 * 5, ref_data))
             print(struct.unpack('B' * 4 * 5, got_data))
-            return 'fail'
+            pytest.fail(interleave)
 
         ref_data = src_ds.GetRasterBand(2).ReadRaster(20, 8, 4, 5, buf_pixel_space=3, buf_line_space=100)
         got_data = out_ds.GetRasterBand(2).ReadRaster(20, 8, 4, 5, buf_pixel_space=3, buf_line_space=100)
diff --git a/autotest/gdrivers/mg4lidar.py b/autotest/gdrivers/mg4lidar.py
index 5413a78b68b5..063e4d66c73a 100755
--- a/autotest/gdrivers/mg4lidar.py
+++ b/autotest/gdrivers/mg4lidar.py
@@ -34,6 +34,7 @@
 
 import gdaltest
 from osgeo import gdal
+import pytest
 
 ###############################################################################
 # Test reading a MG4Lidar file
@@ -44,10 +45,10 @@ def test_mg4lidar_1():
 
     drv = gdal.GetDriverByName('MG4Lidar')
     if drv is None:
-        return 'skip'
+        pytest.skip()
 
     if not gdaltest.download_file('http://home.gdal.org/tmp/GDAL_MG4Lidar_Src.zip', 'GDAL_MG4Lidar_Src.zip'):
-        return 'skip'
+        pytest.skip()
 
     try:
         os.stat('tmp/cache/GDAL_MG4Lidar_Src')
@@ -57,9 +58,9 @@ def test_mg4lidar_1():
             try:
                 os.stat('tmp/cache/GDAL_MG4Lidar_Src')
             except OSError:
-                return 'skip'
+                pytest.skip()
         except OSError:
-            return 'skip'
+            pytest.skip()
 
     ds = gdal.Open('tmp/cache/GDAL_MG4Lidar_Src/Tetons_200k.view')
     assert ds is not None, 'could not open dataset'
diff --git a/autotest/gdrivers/mrsid.py b/autotest/gdrivers/mrsid.py
index 2350ebba3fd6..0fa3bff26712 100755
--- a/autotest/gdrivers/mrsid.py
+++ b/autotest/gdrivers/mrsid.py
@@ -46,7 +46,7 @@ def test_mrsid_1():
 
     gdaltest.mrsid_drv = gdal.GetDriverByName('MrSID')
     if gdaltest.mrsid_drv is None:
-        return 'skip'
+        pytest.skip()
 
     tst = gdaltest.GDALTest('MrSID', 'mercator.sid', 1, None)
 
@@ -139,15 +139,14 @@ def test_mrsid_1():
 def test_mrsid_2():
 
     if gdaltest.mrsid_drv is None:
-        return 'skip'
+        pytest.skip()
 
     ds = gdal.Open('data/mercator.sid')
 
     try:
         data = ds.ReadRaster(0, 0, 515, 515, buf_xsize=10, buf_ysize=10)
     except:
-        gdaltest.post_reason('Small overview read failed: ' + gdal.GetLastErrorMsg())
-        return 'fail'
+        pytest.fail('Small overview read failed: ' + gdal.GetLastErrorMsg())
 
     ds = None
 
@@ -174,7 +173,7 @@ def test_mrsid_2():
 def test_mrsid_3():
 
     if gdaltest.mrsid_drv is None:
-        return 'skip'
+        pytest.skip()
 
     ds = gdal.Open('data/mercator.sid')
 
@@ -202,7 +201,7 @@ def test_mrsid_3():
 def test_mrsid_4():
 
     if gdaltest.mrsid_drv is None:
-        return 'skip'
+        pytest.skip()
 
     try:
         os.remove('data/mercator_new.sid.aux.xml')
@@ -248,7 +247,7 @@ def test_mrsid_4():
 def test_mrsid_5():
     gdaltest.jp2mrsid_drv = gdal.GetDriverByName('JP2MrSID')
     if gdaltest.jp2mrsid_drv is None:
-        return 'skip'
+        pytest.skip()
 
     gdaltest.deregister_all_jpeg2000_drivers_but('JP2MrSID')
 
@@ -261,7 +260,7 @@ def test_mrsid_5():
 def test_mrsid_6():
 
     if gdaltest.jp2mrsid_drv is None:
-        return 'skip'
+        pytest.skip()
 
     srs = """PROJCS["NAD27 / UTM zone 11N",
     GEOGCS["NAD27",
@@ -294,7 +293,7 @@ def test_mrsid_6():
 def test_mrsid_7():
 
     if gdaltest.jp2mrsid_drv is None:
-        return 'skip'
+        pytest.skip()
 
     ds = gdal.Open('data/int16.jp2')
     ds_ref = gdal.Open('data/int16.tif')
@@ -302,13 +301,12 @@ def test_mrsid_7():
     maxdiff = gdaltest.compare_ds(ds, ds_ref)
 
     if maxdiff > 5:
-        gdaltest.post_reason('Image too different from reference')
         print(ds.GetRasterBand(1).Checksum())
         print(ds_ref.GetRasterBand(1).Checksum())
 
         ds = None
         ds_ref = None
-        return 'fail'
+        pytest.fail('Image too different from reference')
 
     ds = None
     ds_ref = None
@@ -322,7 +320,7 @@ def test_mrsid_7():
 def test_mrsid_8():
 
     if gdaltest.mrsid_drv is None:
-        return 'skip'
+        pytest.skip()
 
     new_gt = (10000, 50, 0, 20000, 0, -50)
     new_srs = """PROJCS["OSGB 1936 / British National Grid",GEOGCS["OSGB 1936",DATUM["OSGB_1936",SPHEROID["Airy 1830",6377563.396,299.3249646,AUTHORITY["EPSG","7001"]],AUTHORITY["EPSG","6277"]],PRIMEM["Greenwich",0,AUTHORITY["EPSG","8901"]],UNIT["degree",0.01745329251994328,AUTHORITY["EPSG","9122"]],AUTHORITY["EPSG","4277"]],UNIT["metre",1,AUTHORITY["EPSG","9001"]],PROJECTION["Transverse_Mercator"],PARAMETER["latitude_of_origin",49],PARAMETER["central_meridian",-2],PARAMETER["scale_factor",0.9996012717],PARAMETER["false_easting",400000],PARAMETER["false_northing",-100000],AUTHORITY["EPSG","27700"],AXIS["Easting",EAST],AXIS["Northing",NORTH]]"""
@@ -361,7 +359,7 @@ def test_mrsid_8():
 def test_mrsid_9():
 
     if gdaltest.mrsid_drv is None:
-        return 'skip'
+        pytest.skip()
 
     f = open('data/mercator.sid', 'rb')
     data = f.read()
@@ -385,7 +383,7 @@ def test_mrsid_9():
 def test_mrsid_10():
 
     if gdaltest.jp2mrsid_drv is None:
-        return 'skip'
+        pytest.skip()
 
     f = open('data/int16.jp2', 'rb')
     data = f.read()
@@ -409,7 +407,7 @@ def test_mrsid_10():
 def test_mrsid_11():
 
     if gdaltest.jp2mrsid_drv is None:
-        return 'skip'
+        pytest.skip()
 
     ds = gdal.Open('data/byte_without_geotransform.jp2')
 
@@ -427,10 +425,10 @@ def test_mrsid_11():
 def test_mrsid_online_1():
 
     if gdaltest.jp2mrsid_drv is None:
-        return 'skip'
+        pytest.skip()
 
     if not gdaltest.download_file('http://download.osgeo.org/gdal/data/jpeg2000/7sisters200.j2k', '7sisters200.j2k'):
-        return 'skip'
+        pytest.skip()
 
     # Checksum = 29473 on my PC
     tst = gdaltest.GDALTest('JP2MrSID', 'tmp/cache/7sisters200.j2k', 1, None, filename_absolute=1)
@@ -449,10 +447,10 @@ def test_mrsid_online_1():
 def test_mrsid_online_2():
 
     if gdaltest.jp2mrsid_drv is None:
-        return 'skip'
+        pytest.skip()
 
     if not gdaltest.download_file('http://download.osgeo.org/gdal/data/jpeg2000/gcp.jp2', 'gcp.jp2'):
-        return 'skip'
+        pytest.skip()
 
     # Checksum = 209 on my PC
     tst = gdaltest.GDALTest('JP2MrSID', 'tmp/cache/gcp.jp2', 1, None, filename_absolute=1)
@@ -481,12 +479,12 @@ def test_mrsid_online_2():
 def test_mrsid_online_3():
 
     if gdaltest.jp2mrsid_drv is None:
-        return 'skip'
+        pytest.skip()
 
     if not gdaltest.download_file('http://www.openjpeg.org/samples/Bretagne1.j2k', 'Bretagne1.j2k'):
-        return 'skip'
+        pytest.skip()
     if not gdaltest.download_file('http://www.openjpeg.org/samples/Bretagne1.bmp', 'Bretagne1.bmp'):
-        return 'skip'
+        pytest.skip()
 
     # checksum = 14443 on my PC
     tst = gdaltest.GDALTest('JP2MrSID', 'tmp/cache/Bretagne1.j2k', 1, None, filename_absolute=1)
@@ -506,8 +504,7 @@ def test_mrsid_online_3():
         print(ds_ref.GetRasterBand(1).Checksum())
 
         gdaltest.compare_ds(ds, ds_ref, verbose=1)
-        gdaltest.post_reason('Image too different from reference')
-        return 'fail'
+        pytest.fail('Image too different from reference')
 
     return 'success'
 
@@ -517,12 +514,12 @@ def test_mrsid_online_3():
 def test_mrsid_online_4():
 
     if gdaltest.jp2mrsid_drv is None:
-        return 'skip'
+        pytest.skip()
 
     if not gdaltest.download_file('http://www.openjpeg.org/samples/Bretagne2.j2k', 'Bretagne2.j2k'):
-        return 'skip'
+        pytest.skip()
     if not gdaltest.download_file('http://www.openjpeg.org/samples/Bretagne2.bmp', 'Bretagne2.bmp'):
-        return 'skip'
+        pytest.skip()
 
     # Checksum = 53186 on my PC
     tst = gdaltest.GDALTest('JP2MrSID', 'tmp/cache/Bretagne2.j2k', 1, None, filename_absolute=1)
diff --git a/autotest/gdrivers/netcdf.py b/autotest/gdrivers/netcdf.py
index 13af0b28bd84..9ca8a49d5a60 100755
--- a/autotest/gdrivers/netcdf.py
+++ b/autotest/gdrivers/netcdf.py
@@ -77,14 +77,12 @@ def netcdf_setup():
     gdaltest.netcdf_drv = gdal.GetDriverByName('NETCDF')
 
     if gdaltest.netcdf_drv is None:
-        print('NOTICE: netcdf not supported, skipping checks')
-        return 'skip'
+        pytest.skip('NOTICE: netcdf not supported, skipping checks')
 
     # get capabilities from driver
     metadata = gdaltest.netcdf_drv.GetMetadata()
     if metadata is None:
-        print('NOTICE: netcdf metadata not found, skipping checks')
-        return 'skip'
+        pytest.skip('NOTICE: netcdf metadata not found, skipping checks')
 
     # netcdf library version "3.6.3" of Dec 22 2009 06:10:17 $
     # netcdf library version 4.1.1 of Mar  4 2011 12:52:19 $
@@ -169,14 +167,13 @@ def netcdf_test_deflate(ifile, checksum, zlevel=1, timeout=None):
         from multiprocessing import Process
         Process.is_alive
     except (ImportError, AttributeError):
-        print('from multiprocessing import Process failed')
-        return 'skip'
+        pytest.skip('from multiprocessing import Process failed')
 
     if gdaltest.netcdf_drv is None:
-        return 'skip'
+        pytest.skip()
 
     if not gdaltest.netcdf_drv_has_nc4:
-        return 'skip'
+        pytest.skip()
 
     ofile1 = 'tmp/' + os.path.basename(ifile) + '-1.nc'
     ofile1_opts = ['FORMAT=NC4C', 'COMPRESS=NONE']
@@ -196,8 +193,7 @@ def netcdf_test_deflate(ifile, checksum, zlevel=1, timeout=None):
         size1 = os.path.getsize(ofile1)
         size2 = os.path.getsize(ofile2)
     except OSError:
-        gdaltest.post_reason('Error getting file sizes.')
-        return 'fail'
+        pytest.fail('Error getting file sizes.')
 
     assert size2 < size1, \
         'Compressed file is not smaller than reference, check your netcdf-4, HDF5 and zlib installation'
@@ -261,7 +257,7 @@ def test_netcdf_1():
     netcdf_setup()
 
     if gdaltest.netcdf_drv is None:
-        return 'skip'
+        pytest.skip()
 
     tst = gdaltest.GDALTest('NetCDF', 'NETCDF:"data/bug636.nc":tas', 1, 31621,
                             filename_absolute=1)
@@ -282,7 +278,7 @@ def test_netcdf_1():
 def test_netcdf_2():
 
     if gdaltest.netcdf_drv is None:
-        return 'skip'
+        pytest.skip()
 
     src_ds = gdal.Open('data/byte.tif')
 
@@ -328,7 +324,7 @@ def test_netcdf_2():
 def test_netcdf_3():
 
     if gdaltest.netcdf_drv is None:
-        return 'skip'
+        pytest.skip()
 
     ds = gdal.Open('data/sombrero.grd')
     bnd = ds.GetRasterBand(1)
@@ -349,7 +345,7 @@ def test_netcdf_3():
 def test_netcdf_4():
 
     if gdaltest.netcdf_drv is None:
-        return 'skip'
+        pytest.skip()
 
     tst = gdaltest.GDALTest('NetCDF',
                             'NETCDF:data/foo_5dimensional.nc:temperature',
@@ -372,7 +368,7 @@ def test_netcdf_4():
 def test_netcdf_5():
 
     if gdaltest.netcdf_drv is None:
-        return 'skip'
+        pytest.skip()
 
     tst = gdaltest.GDALTest('NetCDF',
                             'NETCDF:data/foo_5dimensional.nc:temperature',
@@ -395,7 +391,7 @@ def test_netcdf_5():
 def test_netcdf_6():
 
     if gdaltest.netcdf_drv is None:
-        return 'skip'
+        pytest.skip()
 
     ds = gdal.Open('data/cf_lcc1sp.nc')
     prj = ds.GetProjection()
@@ -419,7 +415,7 @@ def test_netcdf_6():
 def test_netcdf_7():
 
     if gdaltest.netcdf_drv is None:
-        return 'skip'
+        pytest.skip()
 
     ds = gdal.Open('data/cf_lcc2sp.nc')
     prj = ds.GetProjection()
@@ -447,7 +443,7 @@ def test_netcdf_7():
 def test_netcdf_8():
 
     if gdaltest.netcdf_drv is None:
-        return 'skip'
+        pytest.skip()
 
     ds = gdal.Open('data/cf_aea2sp_invf.nc')
 
@@ -475,7 +471,7 @@ def test_netcdf_8():
 def test_netcdf_9():
 
     if gdaltest.netcdf_drv is None:
-        return 'skip'
+        pytest.skip()
 
     ds = gdal.Open('data/cf_no_sphere.nc')
 
@@ -500,7 +496,7 @@ def test_netcdf_9():
 def test_netcdf_10():
 
     if gdaltest.netcdf_drv is None:
-        return 'skip'
+        pytest.skip()
 
     ds = gdal.Open('data/cf_no_sphere.nc')
 
@@ -533,7 +529,7 @@ def test_netcdf_10():
 def test_netcdf_11():
 
     if gdaltest.netcdf_drv is None:
-        return 'skip'
+        pytest.skip()
 
     ds = gdal.Open('data/cf_geog.nc')
 
@@ -552,7 +548,7 @@ def test_netcdf_11():
 def test_netcdf_12():
 
     if gdaltest.netcdf_drv is None:
-        return 'skip'
+        pytest.skip()
 
     ds = gdal.Open('data/scale_offset.nc')
 
@@ -573,7 +569,7 @@ def test_netcdf_12():
 def test_netcdf_13():
 
     if gdaltest.netcdf_drv is None:
-        return 'skip'
+        pytest.skip()
 
     ds = gdal.Open('data/no_scale_offset.nc')
 
@@ -593,7 +589,7 @@ def test_netcdf_13():
 def test_netcdf_14():
 
     if gdaltest.netcdf_drv is None:
-        return 'skip'
+        pytest.skip()
 
     ds = gdal.Open('NETCDF:data/two_vars_scale_offset.nc:z')
 
@@ -626,7 +622,7 @@ def test_netcdf_14():
 def test_netcdf_15():
 
     if gdaltest.netcdf_drv is None:
-        return 'skip'
+        pytest.skip()
 
     if gdaltest.netcdf_drv_has_nc2:
         ds = gdal.Open('data/trmm-nc2.nc')
@@ -634,7 +630,7 @@ def test_netcdf_15():
         ds = None
         return 'success'
     else:
-        return 'skip'
+        pytest.skip()
 
     return 'success'
 
@@ -645,7 +641,7 @@ def test_netcdf_15():
 def test_netcdf_16():
 
     if gdaltest.netcdf_drv is None:
-        return 'skip'
+        pytest.skip()
 
     ifile = 'data/trmm-nc4.nc'
 
@@ -654,8 +650,7 @@ def test_netcdf_16():
         # test with Open()
         ds = gdal.Open(ifile)
         if ds is None:
-            gdaltest.post_reason('GDAL did not open file')
-            return 'fail'
+            pytest.fail('GDAL did not open file')
         else:
             name = ds.GetDriver().GetDescription()
             ds = None
@@ -667,7 +662,7 @@ def test_netcdf_16():
         assert name == 'netCDF', 'netcdf driver did not identify file'
 
     else:
-        return 'skip'
+        pytest.skip()
 
     return 'success'
 
@@ -678,22 +673,21 @@ def test_netcdf_16():
 def test_netcdf_17():
 
     if gdaltest.netcdf_drv is None:
-        return 'skip'
+        pytest.skip()
 
     ifile = 'data/groups.h5'
 
     # skip test if Hdf5 is not enabled
     if gdal.GetDriverByName('HDF5') is None and \
             gdal.GetDriverByName('HDF5Image') is None:
-        return 'skip'
+        pytest.skip()
 
     if gdaltest.netcdf_drv_has_nc4:
 
         # test with Open()
         ds = gdal.Open(ifile)
         if ds is None:
-            gdaltest.post_reason('GDAL did not open hdf5 file')
-            return 'fail'
+            pytest.fail('GDAL did not open hdf5 file')
         else:
             name = ds.GetDriver().GetDescription()
             ds = None
@@ -705,7 +699,7 @@ def test_netcdf_17():
         assert name != 'netCDF', 'netcdf driver was identified for hdf5 file'
 
     else:
-        return 'skip'
+        pytest.skip()
 
     return 'success'
 
@@ -716,7 +710,7 @@ def test_netcdf_17():
 def test_netcdf_18():
 
     if gdaltest.netcdf_drv is None:
-        return 'skip'
+        pytest.skip()
 
     ifile = 'data/trmm-nc4c.nc'
 
@@ -725,7 +719,7 @@ def test_netcdf_18():
         # test with Open()
         ds = gdal.Open(ifile)
         if ds is None:
-            return 'fail'
+            pytest.fail()
         else:
             name = ds.GetDriver().GetDescription()
             ds = None
@@ -737,7 +731,7 @@ def test_netcdf_18():
         assert name == 'netCDF'
 
     else:
-        return 'skip'
+        pytest.skip()
 
     return 'success'
 
@@ -748,10 +742,10 @@ def test_netcdf_18():
 def test_netcdf_19():
 
     if gdaltest.netcdf_drv is None:
-        return 'skip'
+        pytest.skip()
 
     if not gdaltest.netcdf_drv_has_nc4:
-        return 'skip'
+        pytest.skip()
 
     tst = gdaltest.GDALTest('NetCDF', 'data/trmm-nc4z.nc', 1, 50235,
                             filename_absolute=1)
@@ -767,10 +761,10 @@ def test_netcdf_19():
 def test_netcdf_20():
 
     if gdaltest.netcdf_drv is None:
-        return 'skip'
+        pytest.skip()
 
     if not gdaltest.netcdf_drv_has_nc4:
-        return 'skip'
+        pytest.skip()
 
     # simple test with tiny file
     return netcdf_test_deflate('data/utm.tif', 50235)
@@ -782,13 +776,13 @@ def test_netcdf_20():
 def test_netcdf_21():
 
     if gdaltest.netcdf_drv is None:
-        return 'skip'
+        pytest.skip()
 
     if not gdaltest.netcdf_drv_has_nc4:
-        return 'skip'
+        pytest.skip()
 
     if not gdaltest.run_slow_tests():
-        return 'skip'
+        pytest.skip()
 
     bigfile = 'tmp/cache/utm-big.tif'
 
@@ -804,8 +798,7 @@ def test_netcdf_21():
 
         # create large gtiff
         if test_cli_utilities.get_gdalwarp_path() is None:
-            gdaltest.post_reason('gdalwarp not found')
-            return 'skip'
+            pytest.skip('gdalwarp not found')
 
         warp_cmd = test_cli_utilities.get_gdalwarp_path() +\
             ' -q -overwrite -r bilinear -ts 7680 7680 -of gtiff ' +\
@@ -814,8 +807,7 @@ def test_netcdf_21():
         try:
             (ret, err) = gdaltest.runexternal_out_and_err(warp_cmd)
         except OSError:
-            gdaltest.post_reason('gdalwarp execution failed')
-            return 'fail'
+            pytest.fail('gdalwarp execution failed')
 
         assert not (err != '' or ret != ''), \
             ('gdalwarp returned error\n' + str(ret) + ' ' + str(err))
@@ -829,10 +821,10 @@ def test_netcdf_21():
 def test_netcdf_22():
 
     if gdaltest.netcdf_drv is None:
-        return 'skip'
+        pytest.skip()
 
     if not gdaltest.netcdf_drv_has_hdf4:
-        return 'skip'
+        pytest.skip()
 
     ifile = 'data/hdifftst2.hdf'
 
@@ -842,8 +834,7 @@ def test_netcdf_22():
     gdal.PopErrorHandler()
 
     if ds is None:
-        gdaltest.post_reason('netcdf driver did not open hdf4 file')
-        return 'fail'
+        pytest.fail('netcdf driver did not open hdf4 file')
     else:
         ds = None
 
@@ -864,15 +855,14 @@ def test_netcdf_23():
     # skip test if Hdf4 is not enabled in GDAL
     if gdal.GetDriverByName('HDF4') is None and \
             gdal.GetDriverByName('HDF4Image') is None:
-        return 'skip'
+        pytest.skip()
 
     ifile = 'data/hdifftst2.hdf'
 
     # test with Open()
     ds = gdal.Open(ifile)
     if ds is None:
-        gdaltest.post_reason('GDAL did not open hdf4 file')
-        return 'fail'
+        pytest.fail('GDAL did not open hdf4 file')
     else:
         name = ds.GetDriver().GetDescription()
         ds = None
@@ -892,7 +882,7 @@ def test_netcdf_23():
 def test_netcdf_24():
 
     if gdaltest.netcdf_drv is None:
-        return 'skip'
+        pytest.skip()
 
     vals_global = {'NC_GLOBAL#test': 'testval',
                    'NC_GLOBAL#valid_range_i': '0,255',
@@ -914,10 +904,10 @@ def test_netcdf_24():
 def netcdf_24_nc4():
 
     if gdaltest.netcdf_drv is None:
-        return 'skip'
+        pytest.skip()
 
     if not gdaltest.netcdf_drv_has_nc4:
-        return 'skip'
+        pytest.skip()
 
     vals_global = {'NC_GLOBAL#test': 'testval',
                    'NC_GLOBAL#test_string': 'testval_string',
@@ -949,7 +939,7 @@ def netcdf_24_nc4():
 def test_netcdf_25():
 
     if gdaltest.netcdf_drv is None:
-        return 'skip'
+        pytest.skip()
 
     result = netcdf_test_copy('data/nc_vars.nc', 1, None, 'tmp/netcdf_25.nc')
 
@@ -973,10 +963,10 @@ def test_netcdf_25():
 def netcdf_25_nc4():
 
     if gdaltest.netcdf_drv is None:
-        return 'skip'
+        pytest.skip()
 
     if not gdaltest.netcdf_drv_has_nc4:
-        return 'skip'
+        pytest.skip()
 
     result = netcdf_test_copy('data/nc4_vars.nc', 1, None, 'tmp/netcdf_25_nc4.nc', ['FORMAT=NC4'])
 
@@ -1012,7 +1002,7 @@ def netcdf_25_nc4():
 def test_netcdf_26():
 
     if gdaltest.netcdf_drv is None:
-        return 'skip'
+        pytest.skip()
 
     # test default config
     test = gdaltest.GDALTest('NETCDF', '../data/int16-nogeo.nc', 1, 4672)
@@ -1042,7 +1032,7 @@ def test_netcdf_26():
 def test_netcdf_27():
 
     if gdaltest.netcdf_drv is None:
-        return 'skip'
+        pytest.skip()
 
     # test default config
     test = gdaltest.GDALTest('NETCDF', '../data/int16-nogeo.nc', 1, 4672)
@@ -1124,7 +1114,7 @@ def netcdf_test_4dfile(ofile):
 def test_netcdf_28():
 
     if gdaltest.netcdf_drv is None:
-        return 'skip'
+        pytest.skip()
 
     ifile = 'data/netcdf-4d.nc'
     ofile = 'tmp/netcdf_28.nc'
@@ -1148,12 +1138,11 @@ def test_netcdf_28():
 def test_netcdf_29():
 
     if gdaltest.netcdf_drv is None:
-        return 'skip'
+        pytest.skip()
 
     # create tif file using gdalwarp
     if test_cli_utilities.get_gdalwarp_path() is None:
-        gdaltest.post_reason('gdalwarp not found')
-        return 'skip'
+        pytest.skip('gdalwarp not found')
 
     ifile = 'data/netcdf-4d.nc'
     ofile1 = 'tmp/netcdf_29.vrt'
@@ -1164,8 +1153,7 @@ def test_netcdf_29():
     try:
         (ret, err) = gdaltest.runexternal_out_and_err(warp_cmd)
     except OSError:
-        gdaltest.post_reason('gdalwarp execution failed')
-        return 'fail'
+        pytest.fail('gdalwarp execution failed')
 
     assert not (err != '' or ret != ''), \
         ('gdalwarp returned error\n' + str(ret) + ' ' + str(err))
@@ -1187,7 +1175,7 @@ def test_netcdf_29():
 def test_netcdf_30():
 
     if gdaltest.netcdf_drv is None:
-        return 'skip'
+        pytest.skip()
 
     tst = gdaltest.GDALTest('NetCDF', 'trmm-nan.nc', 1, 62519)
 
@@ -1207,7 +1195,7 @@ def test_netcdf_30():
 def test_netcdf_31():
 
     if gdaltest.netcdf_drv is None:
-        return 'skip'
+        pytest.skip()
 
     ds = gdal.Open('data/trmm-2x2.nc')
 
@@ -1230,10 +1218,10 @@ def test_netcdf_31():
 def test_netcdf_32():
 
     if gdaltest.netcdf_drv is None:
-        return 'skip'
+        pytest.skip()
 
     if not gdaltest.netcdf_drv_has_nc4:
-        return 'skip'
+        pytest.skip()
 
     ifile = 'data/byte.tif'
     ofile = 'tmp/netcdf_32.nc'
@@ -1253,7 +1241,7 @@ def test_netcdf_32():
 def test_netcdf_33():
 
     if gdaltest.netcdf_drv is None:
-        return 'skip'
+        pytest.skip()
 
     ifile = 'data/nc_vars.nc'
     ofile = 'tmp/netcdf_33.nc'
@@ -1274,22 +1262,21 @@ def test_netcdf_34():
     timeout = 5
 
     if gdaltest.netcdf_drv is None:
-        return 'skip'
+        pytest.skip()
 
     if not gdaltest.netcdf_drv_has_nc4:
-        return 'skip'
+        pytest.skip()
 
     if not gdaltest.run_slow_tests():
-        return 'skip'
+        pytest.skip()
 
     try:
         from multiprocessing import Process
     except ImportError:
-        print('from multiprocessing import Process failed')
-        return 'skip'
+        pytest.skip('from multiprocessing import Process failed')
 
     if not gdaltest.download_file('http://download.osgeo.org/gdal/data/netcdf/' + filename, filename):
-        return 'skip'
+        pytest.skip()
 
     sys.stdout.write('.')
     sys.stdout.flush()
@@ -1307,8 +1294,7 @@ def test_netcdf_34():
     # valgrind detects memory leaks when this occurs (although it should never happen)
     if proc.is_alive():
         proc.terminate()
-        print('testOpen() for file %s has reached timeout limit of %d seconds' % (filename, timeout))
-        return 'fail'
+        pytest.fail('testOpen() for file %s has reached timeout limit of %d seconds' % (filename, timeout))
 
     return 'success'
 
@@ -1319,7 +1305,7 @@ def test_netcdf_34():
 def test_netcdf_35():
 
     if gdaltest.netcdf_drv is None:
-        return 'skip'
+        pytest.skip()
 
     ifile = 'data/netcdf_fixes.nc'
     ofile = 'tmp/netcdf_35.nc'
@@ -1347,7 +1333,7 @@ def test_netcdf_35():
 def test_netcdf_36():
 
     if gdaltest.netcdf_drv is None:
-        return 'skip'
+        pytest.skip()
 
     ifile = 'data/netcdf_fixes.nc'
 
@@ -1370,7 +1356,7 @@ def test_netcdf_36():
 def test_netcdf_36_lonwrap():
 
     if gdaltest.netcdf_drv is None:
-        return 'skip'
+        pytest.skip()
 
     ifile = 'data/nc_lonwrap.nc'
 
@@ -1393,7 +1379,7 @@ def test_netcdf_36_lonwrap():
 def test_netcdf_37():
 
     if gdaltest.netcdf_drv is None:
-        return 'skip'
+        pytest.skip()
 
     ifile = 'data/reduce-cgcms.nc'
 
@@ -1423,7 +1409,7 @@ def test_netcdf_37():
 def test_netcdf_38():
 
     if gdaltest.netcdf_drv is None:
-        return 'skip'
+        pytest.skip()
 
     ifile = 'data/bug5118.nc'
 
@@ -1447,7 +1433,7 @@ def test_netcdf_38():
 def test_netcdf_39():
 
     if gdaltest.netcdf_drv is None:
-        return 'skip'
+        pytest.skip()
 
     shutil.copy('data/two_vars_scale_offset.nc', 'tmp')
     src_ds = gdal.Open('NETCDF:tmp/two_vars_scale_offset.nc:z')
@@ -1512,7 +1498,7 @@ def test_netcdf_39():
 def test_netcdf_40():
 
     if gdaltest.netcdf_drv is None or not gdaltest.netcdf_drv_has_nc4:
-        return 'skip'
+        pytest.skip()
 
     return netcdf_test_copy('data/bug5291.nc', 0, None, 'tmp/netcdf_40.nc')
 
@@ -1523,7 +1509,7 @@ def test_netcdf_40():
 def test_netcdf_41():
 
     if gdaltest.netcdf_drv is None:
-        return 'skip'
+        pytest.skip()
 
     with gdaltest.error_handler():
         ds = gdal.Open('data/byte_no_cf.nc')
@@ -1539,7 +1525,7 @@ def test_netcdf_41():
 def test_netcdf_42():
 
     if gdaltest.netcdf_drv is None:
-        return 'skip'
+        pytest.skip()
 
     src_ds = gdal.GetDriverByName('MEM').Create('', 60, 39, 1)
     src_ds.SetMetadata([
@@ -1585,7 +1571,7 @@ def test_netcdf_42():
 def test_netcdf_43():
 
     if gdaltest.netcdf_drv is None:
-        return 'skip'
+        pytest.skip()
 
     src_ds = gdal.Open('data/byte.tif')
     gdaltest.netcdf_drv.CreateCopy('tmp/netcdf_43.nc', src_ds, options=['WRITE_LONLAT=YES'])
@@ -1611,10 +1597,10 @@ def test_netcdf_43():
 def test_netcdf_44():
 
     if gdaltest.netcdf_drv is None:
-        return 'skip'
+        pytest.skip()
 
     if not gdaltest.netcdf_drv_has_nc4:
-        return 'skip'
+        pytest.skip()
 
     for f, md5 in ('data/ushort.nc', 18), ('data/uint.nc', 10):
         assert (not (netcdf_test_copy(f, 1, md5, 'tmp/netcdf_44.nc', ['FORMAT=NC4']) !=
@@ -1629,7 +1615,7 @@ def test_netcdf_44():
 def test_netcdf_45():
 
     if gdaltest.netcdf_drv is None:
-        return 'skip'
+        pytest.skip()
 
     # Test that a vector cannot be opened in raster-only mode
     ds = gdal.OpenEx('data/test_ogr_nc3.nc', gdal.OF_RASTER)
@@ -1675,10 +1661,10 @@ def test_netcdf_45():
 def test_netcdf_46():
 
     if gdaltest.netcdf_drv is None:
-        return 'skip'
+        pytest.skip()
 
     if test_cli_utilities.get_test_ogrsf_path() is None:
-        return 'skip'
+        pytest.skip()
 
     ret = gdaltest.runexternal(test_cli_utilities.get_test_ogrsf_path() + ' -ro data/test_ogr_nc3.nc')
 
@@ -1693,10 +1679,10 @@ def test_netcdf_46():
 def test_netcdf_47():
 
     if gdaltest.netcdf_drv is None:
-        return 'skip'
+        pytest.skip()
 
     if not gdaltest.netcdf_drv_has_nc4:
-        return 'skip'
+        pytest.skip()
 
     # Test that a vector cannot be opened in raster-only mode
     with gdaltest.error_handler():
@@ -1739,7 +1725,7 @@ def test_netcdf_47():
 def test_netcdf_48():
 
     if gdaltest.netcdf_drv is None:
-        return 'skip'
+        pytest.skip()
 
     with gdaltest.error_handler():
         ds = gdal.OpenEx('data/test_ogr_no_xyz_var.nc', gdal.OF_VECTOR)
@@ -1757,7 +1743,7 @@ def test_netcdf_48():
 def test_netcdf_49():
 
     if gdaltest.netcdf_drv is None:
-        return 'skip'
+        pytest.skip()
 
     with gdaltest.error_handler():
         ds = gdal.OpenEx('data/test_ogr_xyz_float.nc', gdal.OF_VECTOR)
@@ -1785,7 +1771,7 @@ def test_netcdf_49():
 def test_netcdf_50():
 
     if gdaltest.netcdf_drv is None:
-        return 'skip'
+        pytest.skip()
 
     ds = gdal.OpenEx('../ogr/data/poly.shp', gdal.OF_VECTOR)
     out_ds = gdal.VectorTranslate('tmp/netcdf_50.nc', ds, format='netCDF', layerCreationOptions=['WKT_DEFAULT_WIDTH=1'])
@@ -1823,7 +1809,7 @@ def test_netcdf_50():
 def test_netcdf_51():
 
     if gdaltest.netcdf_drv is None:
-        return 'skip'
+        pytest.skip()
 
     ds = gdal.OpenEx('data/test_ogr_nc3.nc', gdal.OF_VECTOR)
     # Test autogrow of string fields
@@ -1892,7 +1878,7 @@ def test_netcdf_51():
 def test_netcdf_51_no_gdal_tags():
 
     if gdaltest.netcdf_drv is None:
-        return 'skip'
+        pytest.skip()
 
     ds = gdal.OpenEx('data/test_ogr_nc3.nc', gdal.OF_VECTOR)
     gdal.VectorTranslate('tmp/netcdf_51_no_gdal_tags.nc', ds, format='netCDF', datasetCreationOptions=['WRITE_GDAL_TAGS=NO'])
@@ -1937,10 +1923,10 @@ def test_netcdf_51_no_gdal_tags():
 def test_netcdf_52():
 
     if gdaltest.netcdf_drv is None:
-        return 'skip'
+        pytest.skip()
 
     if not gdaltest.netcdf_drv_has_nc4:
-        return 'skip'
+        pytest.skip()
 
     ds = gdal.OpenEx('data/test_ogr_nc4.nc', gdal.OF_VECTOR)
     gdal.VectorTranslate('tmp/netcdf_52.nc', ds, format='netCDF', datasetCreationOptions=['FORMAT=NC4'])
@@ -2006,10 +1992,10 @@ def test_netcdf_52():
 def test_netcdf_53():
 
     if gdaltest.netcdf_drv is None:
-        return 'skip'
+        pytest.skip()
 
     if not gdaltest.netcdf_drv_has_nc4:
-        return 'skip'
+        pytest.skip()
 
     ds = gdal.OpenEx('../ogr/data/poly.shp', gdal.OF_VECTOR)
     out_ds = gdal.VectorTranslate('tmp/netcdf_53.nc', ds, format='netCDF', datasetCreationOptions=['FORMAT=NC4'])
@@ -2047,10 +2033,10 @@ def test_netcdf_53():
 def test_netcdf_54():
 
     if gdaltest.netcdf_drv is None:
-        return 'skip'
+        pytest.skip()
 
     if not gdaltest.netcdf_drv_has_nc4:
-        return 'skip'
+        pytest.skip()
 
     shutil.copy('data/test_ogr_nc4.nc', 'tmp/netcdf_54.nc')
 
@@ -2086,10 +2072,10 @@ def test_netcdf_54():
 def test_netcdf_55():
 
     if gdaltest.netcdf_drv is None:
-        return 'skip'
+        pytest.skip()
 
     if not gdaltest.netcdf_drv_has_nc4:
-        return 'skip'
+        pytest.skip()
 
     shutil.copy('data/test_ogr_nc4.nc', 'tmp/netcdf_55.nc')
 
@@ -2125,7 +2111,7 @@ def test_netcdf_55():
 def test_netcdf_56():
 
     if gdaltest.netcdf_drv is None:
-        return 'skip'
+        pytest.skip()
 
     ds = ogr.GetDriverByName('netCDF').CreateDataSource('tmp/netcdf_56.nc')
     # Test auto-grow of WKT field
@@ -2144,7 +2130,7 @@ def test_netcdf_56():
     f = lyr.GetFeature(lyr.GetFeatureCount())
     if f['txt'] != '01234' or f.GetGeometryRef() is not None:
         f.DumpReadable()
-        return 'fail'
+        pytest.fail()
     ds = None
 
     gdal.Unlink('tmp/netcdf_56.nc')
@@ -2158,7 +2144,7 @@ def test_netcdf_56():
 def test_netcdf_57():
 
     if gdaltest.netcdf_drv is None:
-        return 'skip'
+        pytest.skip()
 
     try:
         shutil.rmtree('tmp/netcdf_57')
@@ -2204,10 +2190,10 @@ def test_netcdf_57():
 def test_netcdf_58():
 
     if gdaltest.netcdf_drv is None:
-        return 'skip'
+        pytest.skip()
 
     if not gdaltest.netcdf_drv_has_nc4:
-        return 'skip'
+        pytest.skip()
 
     ds = ogr.GetDriverByName('netCDF').CreateDataSource('tmp/netcdf_58.nc', options=['FORMAT=NC4', 'MULTIPLE_LAYERS=SEPARATE_GROUPS'])
     for ilayer in range(2):
@@ -2237,7 +2223,7 @@ def test_netcdf_58():
 def test_netcdf_59():
 
     if gdaltest.netcdf_drv is None:
-        return 'skip'
+        pytest.skip()
 
     # get
     ds = gdal.Open('data/unittype.nc')
@@ -2261,7 +2247,7 @@ def test_netcdf_59():
 def test_netcdf_60():
 
     if gdaltest.netcdf_drv is None:
-        return 'skip'
+        pytest.skip()
 
     # Test that a vector cannot be opened in raster-only mode
     ds = gdal.OpenEx('data/profile.nc', gdal.OF_RASTER)
@@ -2296,7 +2282,7 @@ def test_netcdf_60():
 def test_netcdf_61():
 
     if gdaltest.netcdf_drv is None:
-        return 'skip'
+        pytest.skip()
 
     shutil.copy('data/profile.nc', 'tmp/netcdf_61.nc')
     ds = gdal.VectorTranslate('tmp/netcdf_61.nc', 'data/profile.nc', accessMode='append')
@@ -2330,7 +2316,7 @@ def test_netcdf_61():
 def test_netcdf_62():
 
     if gdaltest.netcdf_drv is None:
-        return 'skip'
+        pytest.skip()
 
     ds = gdal.VectorTranslate('tmp/netcdf_62.nc', 'data/profile.nc', format='netCDF', layerCreationOptions=['FEATURE_TYPE=PROFILE', 'PROFILE_DIM_INIT_SIZE=1', 'PROFILE_VARIABLES=station'])
     gdal.VectorTranslate('/vsimem/netcdf_62.csv', ds, format='CSV', layerCreationOptions=['LINEFORMAT=LF', 'GEOMETRY=AS_WKT', 'STRING_QUOTING=IF_NEEDED'])
@@ -2356,7 +2342,7 @@ def test_netcdf_62():
 def test_netcdf_62_ncdump_check():
 
     if gdaltest.netcdf_drv is None:
-        return 'skip'
+        pytest.skip()
 
     # get file header with ncdump (if available)
     try:
@@ -2373,7 +2359,7 @@ def test_netcdf_62_ncdump_check():
            ret.find('char station(profile') >= 0 and \
            ret.find('char foo(record') >= 0)
     else:
-        return 'skip'
+        pytest.skip()
 
     return 'success'
 
@@ -2381,7 +2367,7 @@ def test_netcdf_62_ncdump_check():
 def test_netcdf_62_cf_check():
 
     if gdaltest.netcdf_drv is None:
-        return 'skip'
+        pytest.skip()
 
     import netcdf_cf
     if netcdf_cf.netcdf_cf_setup() == 'success' and \
@@ -2399,10 +2385,10 @@ def test_netcdf_62_cf_check():
 def test_netcdf_63():
 
     if gdaltest.netcdf_drv is None:
-        return 'skip'
+        pytest.skip()
 
     if not gdaltest.netcdf_drv_has_nc4:
-        return 'skip'
+        pytest.skip()
 
     shutil.copy('data/profile.nc', 'tmp/netcdf_63.nc')
     ds = gdal.VectorTranslate('tmp/netcdf_63.nc', 'data/profile.nc', format='netCDF', datasetCreationOptions=['FORMAT=NC4'], layerCreationOptions=['FEATURE_TYPE=PROFILE', 'USE_STRING_IN_NC4=NO', 'STRING_DEFAULT_WIDTH=1'])
@@ -2429,10 +2415,10 @@ def test_netcdf_63():
 def test_netcdf_63_ncdump_check():
 
     if gdaltest.netcdf_drv is None:
-        return 'skip'
+        pytest.skip()
 
     if not gdaltest.netcdf_drv_has_nc4:
-        return 'skip'
+        pytest.skip()
 
     # get file header with ncdump (if available)
     try:
@@ -2449,7 +2435,7 @@ def test_netcdf_63_ncdump_check():
            ret.find('char station(record') >= 0)
     else:
         gdal.Unlink('/vsimem/netcdf_63.nc')
-        return 'skip'
+        pytest.skip()
 
     gdal.Unlink('/vsimem/netcdf_63.nc')
 
@@ -2463,7 +2449,7 @@ def test_netcdf_63_ncdump_check():
 def test_netcdf_64():
 
     if gdaltest.netcdf_drv is None:
-        return 'skip'
+        pytest.skip()
 
     gdal.VectorTranslate('tmp/netcdf_64.nc', 'data/profile.nc', format='netCDF', selectFields=['id,station,foo'], layerCreationOptions=['FEATURE_TYPE=PROFILE', 'PROFILE_DIM_NAME=profile_dim', 'PROFILE_DIM_INIT_SIZE=1'])
     gdal.VectorTranslate('/vsimem/netcdf_64.csv', 'tmp/netcdf_64.nc', format='CSV', layerCreationOptions=['LINEFORMAT=LF', 'GEOMETRY=AS_WKT', 'STRING_QUOTING=IF_NEEDED'])
@@ -2494,10 +2480,10 @@ def test_netcdf_64():
 def test_netcdf_65():
 
     if gdaltest.netcdf_drv is None:
-        return 'skip'
+        pytest.skip()
 
     if not gdaltest.netcdf_drv_has_nc4:
-        return 'skip'
+        pytest.skip()
 
     ds = ogr.GetDriverByName('netCDF').CreateDataSource('tmp/netcdf_65.nc', options=['FORMAT=NC4'])
     lyr = ds.CreateLayer('test')
@@ -2511,7 +2497,7 @@ def test_netcdf_65():
     f = lyr.GetNextFeature()
     if f['str'] != '':
         f.DumpReadable()
-        return 'fail'
+        pytest.fail()
     ds = None
 
     gdal.Unlink('tmp/netcdf_65.nc')
@@ -2526,7 +2512,7 @@ def test_netcdf_65():
 def test_netcdf_66():
 
     if gdaltest.netcdf_drv is None:
-        return 'skip'
+        pytest.skip()
 
     # First trying with no so good configs
 
@@ -2626,7 +2612,7 @@ def test_netcdf_66():
 def test_netcdf_66_ncdump_check():
 
     if gdaltest.netcdf_drv is None:
-        return 'skip'
+        pytest.skip()
 
     # get file header with ncdump (if available)
     try:
@@ -2645,7 +2631,7 @@ def test_netcdf_66_ncdump_check():
            ret.find(':featureType = "profile"') >= 0)
     else:
         gdal.Unlink('/vsimem/netcdf_66.nc')
-        return 'skip'
+        pytest.skip()
 
     gdal.Unlink('/vsimem/netcdf_66.nc')
 
@@ -2659,15 +2645,15 @@ def test_netcdf_66_ncdump_check():
 def test_netcdf_67():
 
     if gdaltest.netcdf_drv is None:
-        return 'skip'
+        pytest.skip()
 
     if not gdaltest.netcdf_drv_has_nc4:
-        return 'skip'
+        pytest.skip()
 
     try:
         import numpy
     except ImportError:
-        return 'skip'
+        pytest.skip()
 
     # disable bottom-up mode to use the real file's blocks size
     gdal.SetConfigOption('GDAL_NETCDF_BOTTOMUP', 'NO')
@@ -2694,7 +2680,7 @@ def test_netcdf_67():
 def test_netcdf_68():
 
     if gdaltest.netcdf_drv is None:
-        return 'skip'
+        pytest.skip()
 
     ds = gdal.Open('data/srid.nc')
     wkt = ds.GetProjectionRef()
@@ -2709,7 +2695,7 @@ def test_netcdf_68():
 def test_netcdf_69():
 
     if gdaltest.netcdf_drv is None:
-        return 'skip'
+        pytest.skip()
 
     ds = gdal.Open('data/test6645.nc')
     assert ds is not None
@@ -2723,7 +2709,7 @@ def test_netcdf_69():
 def test_netcdf_70():
 
     if gdaltest.netcdf_drv is None:
-        return 'skip'
+        pytest.skip()
 
     ds = gdal.Open('data/test6759.nc')
     gt = ds.GetGeoTransform()
@@ -2740,7 +2726,7 @@ def test_netcdf_70():
 def test_netcdf_71():
 
     if gdaltest.netcdf_drv is None:
-        return 'skip'
+        pytest.skip()
 
     ds = gdal.Open('data/test_coord_scale_offset.nc')
     gt = ds.GetGeoTransform()
@@ -2756,10 +2742,10 @@ def test_netcdf_71():
 def test_netcdf_72():
 
     if gdaltest.netcdf_drv is None:
-        return 'skip'
+        pytest.skip()
 
     if not gdaltest.netcdf_drv_has_nc4:
-        return 'skip'
+        pytest.skip()
 
     ds = gdal.Open('data/int64dim.nc')
     mdi = ds.GetRasterBand(1).GetMetadataItem('NETCDF_DIM_TIME')
@@ -2774,7 +2760,7 @@ def test_netcdf_72():
 def test_netcdf_73():
 
     if gdaltest.netcdf_drv is None:
-        return 'skip'
+        pytest.skip()
 
     ds = gdal.Open('data/geos_rad.nc')
     gt = ds.GetGeoTransform()
@@ -2790,7 +2776,7 @@ def test_netcdf_73():
 def test_netcdf_74():
 
     if gdaltest.netcdf_drv is None:
-        return 'skip'
+        pytest.skip()
 
     ds = gdal.Open('data/geos_microradian.nc')
     gt = ds.GetGeoTransform()
@@ -2806,10 +2792,10 @@ def test_netcdf_74():
 def test_netcdf_75():
 
     if gdaltest.netcdf_drv is None:
-        return 'skip'
+        pytest.skip()
 
     if gdaltest.netcdf_drv.GetMetadataItem("ENABLE_NCDUMP") != 'YES':
-        return 'skip'
+        pytest.skip()
 
     tst = gdaltest.GDALTest('NetCDF', 'byte.nc.txt',
                             1, 4672)
@@ -2842,17 +2828,17 @@ def test_netcdf_75():
 def test_netcdf_76():
 
     if gdaltest.netcdf_drv is None:
-        return 'skip'
+        pytest.skip()
 
     if gdaltest.netcdf_drv.GetMetadataItem("ENABLE_NCDUMP") != 'YES':
-        return 'skip'
+        pytest.skip()
 
     ds = ogr.Open('data/poly.nc.txt')
     lyr = ds.GetLayer(0)
     f = lyr.GetNextFeature()
     if f is None or f.GetGeometryRef() is None:
         f.DumpReadable()
-        return 'fail'
+        pytest.fail()
 
     return 'success'
 
@@ -2863,7 +2849,7 @@ def test_netcdf_76():
 def test_netcdf_77():
 
     if gdaltest.netcdf_drv is None:
-        return 'skip'
+        pytest.skip()
 
     ds = gdal.Open('data/fake_Oa01_radiance.nc')
     subdatasets = ds.GetMetadata('SUBDATASETS')
@@ -2882,7 +2868,7 @@ def test_netcdf_77():
 def test_netcdf_78():
 
     if gdaltest.netcdf_drv is None:
-        return 'skip'
+        pytest.skip()
 
     ds = gdal.Open('data/byte_with_valid_range.nc')
     assert ds.GetRasterBand(1).GetNoDataValue() == 240
@@ -2900,7 +2886,7 @@ def test_netcdf_78():
 def test_netcdf_79():
 
     if gdaltest.netcdf_drv is None:
-        return 'skip'
+        pytest.skip()
 
     ds = gdal.Open('data/byte_with_neg_fillvalue_and_unsigned_hint.nc')
     assert ds.GetRasterBand(1).GetNoDataValue() == 240
@@ -2917,7 +2903,7 @@ def test_netcdf_79():
 def test_netcdf_80():
 
     if gdaltest.netcdf_drv is None:
-        return 'skip'
+        pytest.skip()
 
     test = gdaltest.GDALTest('NETCDF', '../data/byte.tif', 1, 4672)
     return test.testCreateCopy(new_filename='test\xc3\xa9.nc', check_gt=0, check_srs=0, check_minmax=0)
@@ -2929,7 +2915,7 @@ def test_netcdf_80():
 def test_netcdf_81():
 
     if gdaltest.netcdf_drv is None:
-        return 'skip'
+        pytest.skip()
 
     ds = gdal.Open('data/rotated_pole.nc')
 
@@ -2956,7 +2942,7 @@ def test_netcdf_81():
 def test_netcdf_82():
 
     if gdaltest.netcdf_drv is None:
-        return 'skip'
+        pytest.skip()
 
     with gdaltest.error_handler():
         ds = gdal.Open('data/oddly_indexed_extra_dims.nc')
@@ -2987,10 +2973,10 @@ def test_netcdf_82():
 def test_netcdf_uffd():
 
     if gdaltest.netcdf_drv is None:
-        return 'skip'
+        pytest.skip()
 
     if uffd_compare('orog_CRCM1.nc') is None:
-        return 'skip'
+        pytest.skip()
 
     netcdf_files = [
         'orog_CRCM1.nc',
diff --git a/autotest/gdrivers/netcdf_cf.py b/autotest/gdrivers/netcdf_cf.py
index e0b2259805ae..e0d892aa6e1d 100755
--- a/autotest/gdrivers/netcdf_cf.py
+++ b/autotest/gdrivers/netcdf_cf.py
@@ -57,12 +57,11 @@ def netcdf_cf_setup():
 
     # if netcdf is not supported, skip detection
     if gdaltest.netcdf_drv is None:
-        return 'skip'
+        pytest.skip()
 
     # skip if on windows
     if os.name != 'posix':
-        print('NOTICE: will skip CF checks because OS is not posix!')
-        return 'skip'
+        pytest.skip('NOTICE: will skip CF checks because OS is not posix!')
 
     # try local method
     cdms2_installed = False
@@ -166,22 +165,20 @@ def netcdf_cf_check_file(ifile, version='auto', silent=True):
     gdaltest.netcdf_cf_check_error = ''
 
     if not os.path.exists(ifile):
-        return 'skip'
+        pytest.skip()
 
     output_all = ''
 
     command = netcdf_cf_get_command(ifile, version='auto')
     if command is None or command == '':
-        gdaltest.post_reason('no suitable method found, skipping')
-        return 'skip'
+        pytest.skip('no suitable method found, skipping')
 
     try:
         if gdaltest.netcdf_cf_method == 'http':
             print('calling ' + command)
         (ret, err) = gdaltest.runexternal_out_and_err(command)
     except OSError:
-        gdaltest.post_reason('ERROR with command - ' + command)
-        return 'fail'
+        pytest.fail('ERROR with command - ' + command)
 
     # There should be a ERRORS detected summary
     if 'ERRORS detected' not in ret:
@@ -372,14 +369,12 @@ def netcdf_cfproj_testcopy(projTuples, origTiff, interFormats, inPath, outPath,
         (_, err) = gdaltest.runexternal_out_and_err('ncdump -h')
     except OSError:
         # nothing is supported as ncdump not found
-        print('NOTICE: netcdf version not found')
-        return 'skip'
+        pytest.skip('NOTICE: netcdf version not found')
 
     i = err.find('netcdf library version ')
     # version not found
     if i == -1:
-        print('NOTICE: netcdf version not found')
-        return 'skip'
+        pytest.skip('NOTICE: netcdf version not found')
 
     if not os.path.exists(outPath):
         os.makedirs(outPath)
@@ -562,7 +557,7 @@ def test_netcdf_cf_1():
     netcdf_cf_setup()
 
     if gdaltest.netcdf_drv is None:
-        return 'skip'
+        pytest.skip()
 
     # tst1 = gdaltest.GDALTest( 'NETCDF', 'trmm.tif', 1, 14 )
     # result = tst1.testCreateCopy(check_gt=1, check_srs=1, new_filename='tmp/netcdf_cf_1.nc', delete_copy = 0)
@@ -578,7 +573,7 @@ def test_netcdf_cf_1():
 
     if result != 'fail' and result_cf != 'fail':
         return 'success'
-    return 'fail'
+    pytest.fail()
 
 
 ###############################################################################
@@ -586,7 +581,7 @@ def test_netcdf_cf_1():
 def test_netcdf_cf_2():
 
     if gdaltest.netcdf_drv is None:
-        return 'skip'
+        pytest.skip()
 
     result = netcdf_test_copy('data/trmm.nc', 1, 14, 'tmp/netcdf_cf_2.nc')
 
@@ -596,7 +591,7 @@ def test_netcdf_cf_2():
 
     if result != 'fail' and result_cf != 'fail':
         return 'success'
-    return 'fail'
+    pytest.fail()
 
 
 ###############################################################################
@@ -605,7 +600,7 @@ def test_netcdf_cf_2():
 def test_netcdf_cf_3():
 
     if gdaltest.netcdf_drv is None:
-        return 'skip'
+        pytest.skip()
 
     result = 'success'
     result_cf = 'success'
@@ -623,7 +618,7 @@ def test_netcdf_cf_3():
 
     if result != 'fail' and result_cf != 'fail':
         return 'success'
-    return 'fail'
+    pytest.fail()
 
 ###############################################################################
 # test support for various CF projections
@@ -632,7 +627,7 @@ def test_netcdf_cf_3():
 def test_netcdf_cf_4():
 
     if gdaltest.netcdf_drv is None:
-        return 'skip'
+        pytest.skip()
 
     result = netcdf_cfproj_testcopy(netcdf_cfproj_tuples, 'melb-small.tif',
                                     netcdf_cfproj_int_fmt_maps,
@@ -649,7 +644,7 @@ def test_netcdf_cf_4():
 def test_netcdf_cf_5():
 
     if gdaltest.netcdf_drv is None:
-        return 'skip'
+        pytest.skip()
 
     ifiles = ['NETCDF:data/orog_CRCM1.nc:orog', 'NETCDF:data/orog_CRCM2.nc:orog']
     for ifile in ifiles:
diff --git a/autotest/gdrivers/nitf.py b/autotest/gdrivers/nitf.py
index 49c6c3ef00c4..5a7e9b0827dc 100755
--- a/autotest/gdrivers/nitf.py
+++ b/autotest/gdrivers/nitf.py
@@ -508,11 +508,11 @@ def test_nitf_28_jp2ecw():
 
     gdaltest.nitf_28_jp2ecw_is_ok = False
     if gdal.GetDriverByName('JP2ECW') is None:
-        return 'skip'
+        pytest.skip()
 
     import ecw
     if not ecw.has_write_support():
-        return 'skip'
+        pytest.skip()
 
     # Deregister other potential conflicting JPEG2000 drivers
     gdaltest.deregister_all_jpeg2000_drivers_but('JP2ECW')
@@ -546,11 +546,11 @@ def test_nitf_28_jp2ecw():
 
 def test_nitf_28_jp2mrsid():
     if not gdaltest.nitf_28_jp2ecw_is_ok:
-        return 'skip'
+        pytest.skip()
 
     jp2mrsid_drv = gdal.GetDriverByName('JP2MrSID')
     if jp2mrsid_drv is None:
-        return 'skip'
+        pytest.skip()
 
     # Deregister other potential conflicting JPEG2000 drivers
     gdaltest.deregister_all_jpeg2000_drivers_but('JP2MrSID')
@@ -567,11 +567,11 @@ def test_nitf_28_jp2mrsid():
 
 def test_nitf_28_jp2kak():
     if not gdaltest.nitf_28_jp2ecw_is_ok:
-        return 'skip'
+        pytest.skip()
 
     jp2kak_drv = gdal.GetDriverByName('JP2KAK')
     if jp2kak_drv is None:
-        return 'skip'
+        pytest.skip()
 
     # Deregister other potential conflicting JPEG2000 drivers
     gdaltest.deregister_all_jpeg2000_drivers_but('JP2KAK')
@@ -588,11 +588,11 @@ def test_nitf_28_jp2kak():
 
 def test_nitf_28_jp2openjpeg():
     if not gdaltest.nitf_28_jp2ecw_is_ok:
-        return 'skip'
+        pytest.skip()
 
     drv = gdal.GetDriverByName('JP2OpenJPEG')
     if drv is None:
-        return 'skip'
+        pytest.skip()
 
     # Deregister other potential conflicting JPEG2000 drivers
     gdaltest.deregister_all_jpeg2000_drivers_but('JP2OpenJPEG')
@@ -610,7 +610,7 @@ def test_nitf_28_jp2openjpeg():
 def test_nitf_28_jp2openjpeg_bis():
     drv = gdal.GetDriverByName('JP2OpenJPEG')
     if drv is None:
-        return 'skip'
+        pytest.skip()
 
     # Deregister other potential conflicting JPEG2000 drivers
     gdaltest.deregister_all_jpeg2000_drivers_but('JP2OpenJPEG')
@@ -906,7 +906,7 @@ def test_nitf_36():
 def test_nitf_37():
     try:
         if int(gdal.VersionInfo('VERSION_NUM')) < 1700:
-            return 'skip'
+            pytest.skip()
     except:
         # OG-python bindings don't have gdal.VersionInfo. Too bad, but let's hope that GDAL's version isn't too old !
         pass
@@ -1028,7 +1028,7 @@ def test_nitf_40():
     # Determine if the filesystem supports sparse files (we don't want to create a real 10 GB
     # file !
     if not gdaltest.filesystem_supports_sparse_files('tmp'):
-        return 'skip'
+        pytest.skip()
 
     width = 99000
     height = 99000
@@ -1082,14 +1082,14 @@ def test_nitf_41():
     import jpeg
     jpeg.jpeg_1()
     if gdaltest.jpeg_version == '9b':
-        return 'skip'
+        pytest.skip()
 
     # Check if JPEG driver supports 12bit JPEG reading/writing
     jpg_drv = gdal.GetDriverByName('JPEG')
     md = jpg_drv.GetMetadata()
     if md[gdal.DMD_CREATIONDATATYPES].find('UInt16') == -1:
         sys.stdout.write('(12bit jpeg not available) ... ')
-        return 'skip'
+        pytest.skip()
 
     try:
         os.remove('data/U_4017A.NTF.aux.xml')
@@ -1116,14 +1116,14 @@ def test_nitf_41():
 def test_nitf_42():
 
     if gdaltest.jpeg_version == '9b':
-        return 'skip'
+        pytest.skip()
 
     # Check if JPEG driver supports 12bit JPEG reading/writing
     jpg_drv = gdal.GetDriverByName('JPEG')
     md = jpg_drv.GetMetadata()
     if md[gdal.DMD_CREATIONDATATYPES].find('UInt16') == -1:
         sys.stdout.write('(12bit jpeg not available) ... ')
-        return 'skip'
+        pytest.skip()
 
     ds = gdal.Open('data/U_4017A.NTF')
     out_ds = gdal.GetDriverByName('NITF').CreateCopy('tmp/nitf42.ntf', ds, options=['IC=C3', 'FHDR=NITF02.10'])
@@ -1149,7 +1149,7 @@ def nitf_43(driver_to_test, options):
             jp2_drv = None
 
     if jp2_drv is None:
-        return 'skip'
+        pytest.skip()
 
     # Deregister other potential conflicting JPEG2000 drivers
     gdaltest.deregister_all_jpeg2000_drivers_but(driver_to_test)
@@ -1184,7 +1184,7 @@ def test_nitf_43_jasper():
 def test_nitf_43_jp2ecw():
     import ecw
     if not ecw.has_write_support():
-        return 'skip'
+        pytest.skip()
     return nitf_43('JP2ECW', ['IC=C8', 'TARGET=0'])
 
 
@@ -1246,7 +1246,7 @@ def nitf_46(driver_to_test):
 
     jp2_drv = gdal.GetDriverByName(driver_to_test)
     if jp2_drv is None:
-        return 'skip'
+        pytest.skip()
 
     # Deregister other potential conflicting JPEG2000 drivers
     gdaltest.deregister_all_jpeg2000_drivers_but(driver_to_test)
@@ -2156,9 +2156,8 @@ def compare_rpc(src_md, md):
                 print(md)
                 pytest.fail('fail: %s value is not the one expected' % key)
         elif float(src_md[key]) != float(md[key]):
-            gdaltest.post_reason('fail: %s value is not the one expected' % key)
             print(md)
-            return 'fail'
+            pytest.fail('fail: %s value is not the one expected' % key)
     return 'success'
 
 
@@ -2192,12 +2191,11 @@ def test_nitf_72():
     assert gdal.GetLastErrorMsg() == '', 'fail: did not expect warning'
 
     if gdal.VSIStatL('/vsimem/nitf_72.ntf.aux.xml') is not None:
-        gdaltest.post_reason('fail: PAM file not expected')
         f = gdal.VSIFOpenL('/vsimem/nitf_72.ntf.aux.xml', 'rb')
         data = gdal.VSIFReadL(1, 10000, f)
         gdal.VSIFCloseL(f)
         print(str(data))
-        return 'fail'
+        pytest.fail('fail: PAM file not expected')
 
     ds = gdal.Open('/vsimem/nitf_72.ntf')
     md = ds.GetMetadata('RPC')
@@ -2223,12 +2221,11 @@ def test_nitf_72():
     assert gdal.GetLastErrorMsg() == '', 'fail: did not expect warning'
 
     if gdal.VSIStatL('/vsimem/nitf_72.ntf.aux.xml') is not None:
-        gdaltest.post_reason('fail: PAM file not expected')
         f = gdal.VSIFOpenL('/vsimem/nitf_72.ntf.aux.xml', 'rb')
         data = gdal.VSIFReadL(1, 10000, f)
         gdal.VSIFCloseL(f)
         print(str(data))
-        return 'fail'
+        pytest.fail('fail: PAM file not expected')
 
     ds = gdal.Open('/vsimem/nitf_72.ntf')
     md = ds.GetMetadata('RPC')
@@ -2293,12 +2290,11 @@ def test_nitf_72():
     assert gdal.GetLastErrorMsg() == '', 'fail: did not expect warning'
 
     if gdal.VSIStatL('/vsimem/nitf_72.ntf.aux.xml') is not None:
-        gdaltest.post_reason('fail: PAM file not expected')
         f = gdal.VSIFOpenL('/vsimem/nitf_72.ntf.aux.xml', 'rb')
         data = gdal.VSIFReadL(1, 10000, f)
         gdal.VSIFCloseL(f)
         print(str(data))
-        return 'fail'
+        pytest.fail('fail: PAM file not expected')
 
     ds = gdal.Open('/vsimem/nitf_72.ntf')
     md = ds.GetMetadata('RPC')
@@ -2685,7 +2681,7 @@ def test_nitf_read_C4():
 def test_nitf_online_1():
 
     if not gdaltest.download_file('http://download.osgeo.org/gdal/data/nitf/bugs/NITF21_CGM_ANNO_Uncompressed_unmasked.ntf', 'NITF21_CGM_ANNO_Uncompressed_unmasked.ntf'):
-        return 'skip'
+        pytest.skip()
 
     tst = gdaltest.GDALTest('NITF', 'tmp/cache/NITF21_CGM_ANNO_Uncompressed_unmasked.ntf', 1, 13123, filename_absolute=1)
 
@@ -2703,7 +2699,7 @@ def test_nitf_online_1():
 def test_nitf_online_2():
 
     if not gdaltest.download_file('http://download.osgeo.org/gdal/data/nitf/nitf1.1/U_0001a.ntf', 'U_0001a.ntf'):
-        return 'skip'
+        pytest.skip()
 
     ds = gdal.Open('tmp/cache/U_0001a.ntf')
 
@@ -2720,7 +2716,7 @@ def test_nitf_online_2():
 def test_nitf_online_3():
 
     if not gdaltest.download_file('http://download.osgeo.org/gdal/data/nitf/nitf1.1/U_0001a.ntf', 'U_0001a.ntf'):
-        return 'skip'
+        pytest.skip()
 
     tst = gdaltest.GDALTest('NITF', 'NITF_IM:3:tmp/cache/U_0001a.ntf', 1, 23463, filename_absolute=1)
 
@@ -2733,7 +2729,7 @@ def test_nitf_online_3():
 def test_nitf_online_4():
 
     if not gdaltest.download_file('http://download.osgeo.org/gdal/data/nitf/cadrg/001zc013.on1', '001zc013.on1'):
-        return 'skip'
+        pytest.skip()
 
     # check that the RPF attribute metadata was carried through.
     ds = gdal.Open('tmp/cache/001zc013.on1')
@@ -2754,7 +2750,7 @@ def test_nitf_online_4():
 def test_nitf_online_5():
 
     if not gdaltest.download_file('http://download.osgeo.org/gdal/data/nitf/cadrg/overview.ovr', 'overview.ovr'):
-        return 'skip'
+        pytest.skip()
 
     tst = gdaltest.GDALTest('NITF', 'tmp/cache/overview.ovr', 1, 60699, filename_absolute=1)
 
@@ -2767,7 +2763,7 @@ def test_nitf_online_5():
 def test_nitf_online_6():
 
     if not gdaltest.download_file('http://download.osgeo.org/gdal/data/nitf/nitf2.0/U_4001b.ntf', 'U_4001b.ntf'):
-        return 'skip'
+        pytest.skip()
 
     tst = gdaltest.GDALTest('NITF', 'tmp/cache/U_4001b.ntf', 1, 60030, filename_absolute=1)
 
@@ -2781,7 +2777,7 @@ def test_nitf_online_7():
 
     for filename in ['ns3228b.nsf', 'i_3228c.ntf', 'ns3228d.nsf', 'i_3228e.ntf']:
         if not gdaltest.download_file('http://www.gwg.nga.mil/ntb/baseline/software/testfile/Nitfv2_1/' + filename, filename):
-            return 'skip'
+            pytest.skip()
 
         ds = gdal.Open('tmp/cache/' + filename)
         assert ds.RasterCount == 6
@@ -2808,7 +2804,7 @@ def test_nitf_online_7():
 def test_nitf_online_8():
 
     if not gdaltest.download_file('http://www.gwg.nga.mil/ntb/baseline/software/testfile/Nitfv2_1/ns3301j.nsf', 'ns3301j.nsf'):
-        return 'skip'
+        pytest.skip()
 
     tst = gdaltest.GDALTest('NITF', 'tmp/cache/ns3301j.nsf', 1, 56861, filename_absolute=1)
 
@@ -2821,7 +2817,7 @@ def test_nitf_online_8():
 def test_nitf_online_9():
 
     if not gdaltest.download_file('http://www.gwg.nga.mil/ntb/baseline/software/testfile/Nitfv2_1/ns3304a.nsf', 'ns3304a.nsf'):
-        return 'skip'
+        pytest.skip()
 
     tst = gdaltest.GDALTest('NITF', 'tmp/cache/ns3304a.nsf', 1, 32419, filename_absolute=1)
 
@@ -2834,7 +2830,7 @@ def test_nitf_online_9():
 def test_nitf_online_10():
 
     if not gdaltest.download_file('http://www.gwg.nga.mil/ntb/baseline/software/testfile/Nitfv2_1/ns3119b.nsf', 'ns3119b.nsf'):
-        return 'skip'
+        pytest.skip()
 
     # Shut up the warning about missing image segment
     gdal.PushErrorHandler('CPLQuietErrorHandler')
@@ -2886,7 +2882,7 @@ def test_nitf_online_10():
 def test_nitf_online_11():
 
     if not gdaltest.download_file('http://download.osgeo.org/gdal/data/nitf/nitf2.0/U_1122a.ntf', 'U_1122a.ntf'):
-        return 'skip'
+        pytest.skip()
 
     ds = gdal.Open('tmp/cache/U_1122a.ntf')
 
@@ -2914,7 +2910,7 @@ def test_nitf_online_11():
 def test_nitf_online_12():
 
     if not gdaltest.download_file('http://download.osgeo.org/gdal/data/nitf/bugs/i_3430a.ntf', 'i_3430a.ntf'):
-        return 'skip'
+        pytest.skip()
 
     tst = gdaltest.GDALTest('NITF', 'tmp/cache/i_3430a.ntf', 1, 38647,
                             filename_absolute=1)
@@ -2928,7 +2924,7 @@ def test_nitf_online_12():
 def test_nitf_online_13():
 
     if not gdaltest.download_file('http://download.osgeo.org/gdal/data/nitf/u_3054a.ntf', 'u_3054a.ntf'):
-        return 'skip'
+        pytest.skip()
 
     # Shut up the warning about missing image segment
     ds = gdal.Open('NITF_IM:2:tmp/cache/u_3054a.ntf')
@@ -2974,7 +2970,7 @@ def test_nitf_online_13():
 def test_nitf_online_14():
 
     if not gdaltest.download_file('http://download.osgeo.org/gdal/data/nitf/nitf2.0/U_4020h.ntf', 'U_4020h.ntf'):
-        return 'skip'
+        pytest.skip()
 
     try:
         os.remove('tmp/cache/U_4020h.ntf.aux.xml')
@@ -2982,14 +2978,14 @@ def test_nitf_online_14():
         pass
 
     if gdaltest.jpeg_version == '9b':
-        return 'skip'
+        pytest.skip()
 
     # Check if JPEG driver supports 12bit JPEG reading/writing
     jpg_drv = gdal.GetDriverByName('JPEG')
     md = jpg_drv.GetMetadata()
     if md[gdal.DMD_CREATIONDATATYPES].find('UInt16') == -1:
         sys.stdout.write('(12bit jpeg not available) ... ')
-        return 'skip'
+        pytest.skip()
 
     ds = gdal.Open('tmp/cache/U_4020h.ntf')
     assert ds.GetRasterBand(1).DataType == gdal.GDT_UInt16
@@ -3010,12 +3006,12 @@ def test_nitf_online_14():
 
 def nitf_online_15(driver_to_test, expected_cs=1054):
     if not gdaltest.download_file('http://www.gwg.nga.mil/ntb/baseline/software/testfile/Jpeg2000/p0_01/p0_01a.ntf', 'p0_01a.ntf'):
-        return 'skip'
+        pytest.skip()
 
     jp2_drv = gdal.GetDriverByName(driver_to_test)
 
     if jp2_drv is None:
-        return 'skip'
+        pytest.skip()
 
     # Deregister other potential conflicting JPEG2000 drivers
     gdaltest.deregister_all_jpeg2000_drivers_but(driver_to_test)
@@ -3059,12 +3055,12 @@ def test_nitf_online_15_openjpeg():
 
 def nitf_online_16(driver_to_test):
     if not gdaltest.download_file('http://www.gwg.nga.mil/ntb/baseline/software/testfile/Jpeg2000/jp2_09/file9_jp2_2places.ntf', 'file9_jp2_2places.ntf'):
-        return 'skip'
+        pytest.skip()
 
     jp2_drv = gdal.GetDriverByName(driver_to_test)
 
     if jp2_drv is None:
-        return 'skip'
+        pytest.skip()
 
     # Deregister other potential conflicting JPEG2000 drivers
     gdaltest.deregister_all_jpeg2000_drivers_but(driver_to_test)
@@ -3120,12 +3116,12 @@ def test_nitf_online_16_openjpeg():
 
 def nitf_online_17(driver_to_test):
     if not gdaltest.download_file('http://www.gwg.nga.mil/ntb/baseline/software/testfile/Jpeg2000/jp2_09/file9_j2c.ntf', 'file9_j2c.ntf'):
-        return 'skip'
+        pytest.skip()
 
     jp2_drv = gdal.GetDriverByName(driver_to_test)
 
     if jp2_drv is None:
-        return 'skip'
+        pytest.skip()
 
     # Deregister other potential conflicting JPEG2000 drivers
     gdaltest.deregister_all_jpeg2000_drivers_but(driver_to_test)
@@ -3173,7 +3169,7 @@ def test_nitf_online_17_openjpeg():
 
 def test_nitf_online_18():
     if not gdaltest.download_file('http://download.osgeo.org/gdal/data/nitf/bugs/bug3337.ntf', 'bug3337.ntf'):
-        return 'skip'
+        pytest.skip()
 
     ds = gdal.Open('tmp/cache/bug3337.ntf')
 
@@ -3211,7 +3207,7 @@ def test_nitf_online_18():
 def test_nitf_online_19():
 
     if not gdaltest.download_file('http://download.osgeo.org/gdal/data/nitf/0000M033.GN3', '0000M033.GN3'):
-        return 'skip'
+        pytest.skip()
 
     tst = gdaltest.GDALTest('NITF', 'tmp/cache/0000M033.GN3', 1, 38928,
                             filename_absolute=1)
@@ -3228,7 +3224,7 @@ def test_nitf_online_19():
 def test_nitf_online_20():
 
     if not gdaltest.download_file('http://download.osgeo.org/gdal/data/nitf/0000M033.GN3', '0000M033.GN3'):
-        return 'skip'
+        pytest.skip()
 
     # check that the RPF attribute metadata was carried through.
     # Special case where the reported size of the attribute subsection is
@@ -3248,7 +3244,7 @@ def test_nitf_online_20():
 def test_nitf_online_21():
 
     if not gdaltest.download_file('http://www.gwg.nga.mil/ntb/baseline/software/testfile/Nitfv2_1/ns3321a.nsf', 'ns3321a.nsf'):
-        return 'skip'
+        pytest.skip()
 
     ds = gdal.Open('tmp/cache/ns3321a.nsf')
     md = ds.GetMetadata()
@@ -3268,7 +3264,7 @@ def test_nitf_online_21():
 def test_nitf_online_22():
 
     if not gdaltest.download_file('http://www.gwg.nga.mil/ntb/baseline/software/testfile/Nitfv1_1/U_0001C.NTF', 'U_0001C.NTF'):
-        return 'skip'
+        pytest.skip()
 
     ds = gdal.Open('NITF_IM:1:tmp/cache/U_0001C.NTF')
     md = ds.GetMetadata()
@@ -3347,7 +3343,7 @@ def test_nitf_online_22():
 def test_nitf_online_23():
 
     if not gdaltest.download_file('http://download.osgeo.org/gdal/data/nitf/nitf2.0/U_3058b.ntf', 'U_3058b.ntf'):
-        return 'skip'
+        pytest.skip()
 
     tst = gdaltest.GDALTest('NITF', 'tmp/cache/U_3058b.ntf', 1, 44748, filename_absolute=1)
 
@@ -3360,12 +3356,12 @@ def test_nitf_online_23():
 def test_nitf_online_24():
 
     if not gdaltest.download_file('http://www.falconview.org/trac/FalconView/downloads/17', 'ECRG_Sample.zip'):
-        return 'skip'
+        pytest.skip()
 
     try:
         os.stat('tmp/cache/ECRG_Sample.zip')
     except OSError:
-        return 'skip'
+        pytest.skip()
 
     oldval = gdal.GetConfigOption('NITF_OPEN_UNDERLYING_DS')
     gdal.SetConfigOption('NITF_OPEN_UNDERLYING_DS', 'NO')
@@ -3391,7 +3387,7 @@ def test_nitf_online_24():
 def test_nitf_online_25():
 
     if not gdaltest.download_file('http://www.gwg.nga.mil/ntb/baseline/docs/HRE_spec/Case1_HRE10G324642N1170747W_Uxx.hr5', 'Case1_HRE10G324642N1170747W_Uxx.hr5'):
-        return 'skip'
+        pytest.skip()
 
     tst = gdaltest.GDALTest('NITF', 'tmp/cache/Case1_HRE10G324642N1170747W_Uxx.hr5', 1, 7099, filename_absolute=1)
 
diff --git a/autotest/gdrivers/ntv2.py b/autotest/gdrivers/ntv2.py
index 2f14566d4c2b..fa4afe91194b 100755
--- a/autotest/gdrivers/ntv2.py
+++ b/autotest/gdrivers/ntv2.py
@@ -34,6 +34,7 @@
 
 from osgeo import gdal
 import gdaltest
+import pytest
 
 ###############################################################################
 # Open a little-endian NTv2 grid
@@ -131,12 +132,12 @@ def test_ntv2_7():
 def test_ntv2_online_1():
 
     if not gdaltest.download_file('http://download.osgeo.org/proj/nzgd2kgrid0005.gsb', 'nzgd2kgrid0005.gsb'):
-        return 'skip'
+        pytest.skip()
 
     try:
         os.stat('tmp/cache/nzgd2kgrid0005.gsb')
     except OSError:
-        return 'skip'
+        pytest.skip()
 
     tst = gdaltest.GDALTest('NTV2', 'tmp/cache/nzgd2kgrid0005.gsb', 1, 54971, filename_absolute=1)
     gt = (165.95, 0.1, 0.0, -33.95, 0.0, -0.1)
@@ -150,7 +151,7 @@ def test_ntv2_online_2():
     try:
         os.stat('tmp/cache/nzgd2kgrid0005.gsb')
     except OSError:
-        return 'skip'
+        pytest.skip()
 
     tst = gdaltest.GDALTest('NTV2', 'tmp/cache/nzgd2kgrid0005.gsb', 1, 54971, filename_absolute=1)
     return tst.testCreateCopy(vsimem=1)
@@ -163,7 +164,7 @@ def test_ntv2_online_3():
     try:
         os.stat('tmp/cache/nzgd2kgrid0005.gsb')
     except OSError:
-        return 'skip'
+        pytest.skip()
 
     tst = gdaltest.GDALTest('NTV2', 'tmp/cache/nzgd2kgrid0005.gsb', 1, 54971, filename_absolute=1)
     return tst.testCreate(vsimem=1, out_bands=4)
diff --git a/autotest/gdrivers/nwt_grd.py b/autotest/gdrivers/nwt_grd.py
index 236852ceed18..69d51619157e 100755
--- a/autotest/gdrivers/nwt_grd.py
+++ b/autotest/gdrivers/nwt_grd.py
@@ -34,6 +34,7 @@
 
 from osgeo import gdal
 import gdaltest
+import pytest
 
 ###############################################################################
 # Test a GRD dataset with three bands + Z
@@ -51,7 +52,7 @@ def test_nwt_grd_1():
     status4 = tst4.testOpen()
     if status1 == 'success' and status2 == 'success' and status3 == 'success' and status4 == 'success':
         return 'success'
-    return 'fail'
+    pytest.fail()
 
 
 def test_nwt_grd_2():
diff --git a/autotest/gdrivers/ozi.py b/autotest/gdrivers/ozi.py
index f4c3346b1cc1..ac19d76a3a9d 100755
--- a/autotest/gdrivers/ozi.py
+++ b/autotest/gdrivers/ozi.py
@@ -34,6 +34,7 @@
 
 
 import gdaltest
+import pytest
 
 ###############################################################################
 # Test reading OZF2 file
@@ -42,7 +43,7 @@
 def test_ozi_online_1():
 
     if not gdaltest.download_file('http://www.oziexplorer2.com/maps/Europe2001_setup.exe', 'Europe2001_setup.exe'):
-        return 'skip'
+        pytest.skip()
 
     try:
         os.stat('tmp/cache/Europe 2001_OZF.map')
@@ -52,9 +53,9 @@ def test_ozi_online_1():
             try:
                 os.stat('tmp/cache/Europe 2001_OZF.map')
             except OSError:
-                return 'skip'
+                pytest.skip()
         except:
-            return 'skip'
+            pytest.skip()
 
     ds = gdal.Open('tmp/cache/Europe 2001_OZF.map')
     assert ds is not None
diff --git a/autotest/gdrivers/pcidsk.py b/autotest/gdrivers/pcidsk.py
index d8b49650cea8..ae377e126be2 100755
--- a/autotest/gdrivers/pcidsk.py
+++ b/autotest/gdrivers/pcidsk.py
@@ -36,6 +36,7 @@
 
 
 import gdaltest
+import pytest
 
 ###############################################################################
 # Read test of floating point reference data.
@@ -93,7 +94,7 @@ def test_pcidsk_5():
     col = driver.GetMetadataItem('DMD_CREATIONOPTIONLIST')
     if col.find('COMPRESSION') == -1:
         gdaltest.pcidsk_new = 0
-        return 'skip'
+        pytest.skip()
     else:
         gdaltest.pcidsk_new = 1
 
@@ -136,7 +137,7 @@ def test_pcidsk_5():
 def test_pcidsk_6():
 
     if gdaltest.pcidsk_new == 0:
-        return 'skip'
+        pytest.skip()
 
     # Write out some metadata to the default and non-default domain and
     # using the set and single methods.
@@ -172,7 +173,7 @@ def test_pcidsk_6():
 def test_pcidsk_7():
 
     if gdaltest.pcidsk_new == 0:
-        return 'skip'
+        pytest.skip()
 
     # Write out some metadata to the default and non-default domain and
     # using the set and single methods.
@@ -236,11 +237,11 @@ def test_pcidsk_8():
 def pcidsk_9():
 
     if gdaltest.pcidsk_new == 0:
-        return 'skip'
+        pytest.skip()
 
     ogr_drv = ogr.GetDriverByName('PCIDSK')
     if ogr_drv is None:
-        return 'skip'
+        pytest.skip()
 
     ds = ogr_drv.CreateDataSource('/vsimem/pcidsk_9.pix')
     ds.CreateLayer('foo')
@@ -262,7 +263,7 @@ def pcidsk_9():
 
 def test_pcidsk_10():
     if gdaltest.pcidsk_new == 0:
-        return 'skip'
+        pytest.skip()
 
     src_ds = gdal.Open('data/byte.tif')
     ds = gdal.GetDriverByName('PCIDSK').CreateCopy('/vsimem/pcidsk_10.pix', src_ds)
@@ -291,7 +292,7 @@ def test_pcidsk_10():
 
 def test_pcidsk_11():
     if gdaltest.pcidsk_new == 0:
-        return 'skip'
+        pytest.skip()
 
     tst = gdaltest.GDALTest('PCIDSK', 'rgba16.png', 2, 2042,
                             options=['INTERLEAVING=TILED', 'TILESIZE=32'])
@@ -304,7 +305,7 @@ def test_pcidsk_11():
 
 def test_pcidsk_12():
     if gdaltest.pcidsk_new == 0:
-        return 'skip'
+        pytest.skip()
 
     tst = gdaltest.GDALTest('PCIDSK', 'rgba16.png', 2, 2042,
                             options=['INTERLEAVING=TILED', 'TILESIZE=32', 'COMPRESSION=RLE'])
@@ -317,10 +318,10 @@ def test_pcidsk_12():
 
 def test_pcidsk_13():
     if gdaltest.pcidsk_new == 0:
-        return 'skip'
+        pytest.skip()
 
     if gdal.GetDriverByName('JPEG') is None:
-        return 'skip'
+        pytest.skip()
 
     src_ds = gdal.Open('data/byte.tif')
     ds = gdal.GetDriverByName('PCIDSK').CreateCopy('/vsimem/pcidsk_13.pix', src_ds, options=['INTERLEAVING=TILED', 'COMPRESSION=JPEG'])
@@ -347,7 +348,7 @@ def test_pcidsk_13():
 
 def test_pcidsk_14():
     if gdaltest.pcidsk_new == 0:
-        return 'skip'
+        pytest.skip()
 
     ds = gdal.GetDriverByName('PCIDSK').Create('/vsimem/pcidsk_14.pix', 1, 1)
     band = ds.GetRasterBand(1).SetDescription('mydescription')
@@ -373,7 +374,7 @@ def test_pcidsk_14():
 
 def test_pcidsk_15():
     if gdaltest.pcidsk_new == 0:
-        return 'skip'
+        pytest.skip()
 
     # One raster band and vector layer
     ds = gdal.GetDriverByName('PCIDSK').Create('/vsimem/pcidsk_15.pix', 1, 1)
@@ -476,10 +477,10 @@ def test_pcidsk_external_ovr_rrd():
 
 def test_pcidsk_online_1():
     if gdaltest.pcidsk_new == 0:
-        return 'skip'
+        pytest.skip()
 
     if not gdaltest.download_file('http://download.osgeo.org/gdal/data/pcidsk/sdk_testsuite/irvine_gcp2.pix', 'irvine_gcp2.pix'):
-        return 'skip'
+        pytest.skip()
 
     ds = gdal.Open('tmp/cache/irvine_gcp2.pix')
 
diff --git a/autotest/gdrivers/pcraster.py b/autotest/gdrivers/pcraster.py
index d7333708d56b..17d67aa43efe 100755
--- a/autotest/gdrivers/pcraster.py
+++ b/autotest/gdrivers/pcraster.py
@@ -33,6 +33,7 @@
 
 
 import gdaltest
+import pytest
 
 ###############################################################################
 # Perform simple read test.
@@ -43,7 +44,7 @@ def test_pcraster_1():
     gdaltest.pcraster_drv = gdal.GetDriverByName('PCRaster')
 
     if gdaltest.pcraster_drv is None:
-        return 'skip'
+        pytest.skip()
 
     tst = gdaltest.GDALTest('PCRaster', 'ldd.map', 1, 4528)
     return tst.testOpen()
@@ -55,7 +56,7 @@ def test_pcraster_1():
 def test_pcraster_2():
 
     if gdaltest.pcraster_drv is None:
-        return 'skip'
+        pytest.skip()
 
     ds = gdal.Open('data/ldd.map')
 
diff --git a/autotest/gdrivers/pdf.py b/autotest/gdrivers/pdf.py
index cd28e2a8cdb1..4a83f5e54a80 100755
--- a/autotest/gdrivers/pdf.py
+++ b/autotest/gdrivers/pdf.py
@@ -49,12 +49,12 @@ def pdf_init():
 
     gdaltest.pdf_drv = gdal.GetDriverByName('PDF')
     if gdaltest.pdf_drv is None:
-        return 'skip'
+        pytest.skip()
 
     md = gdaltest.pdf_drv.GetMetadata()
     if 'HAVE_POPPLER' not in md and 'HAVE_PODOFO' not in md and 'HAVE_PDFIUM' not in md:
         gdaltest.pdf_drv = None
-        return 'skip'
+        pytest.skip()
 
     return 'success'
 
@@ -115,15 +115,15 @@ def pdf_checksum_available():
 def pdf_online_1():
 
     if gdaltest.pdf_drv is None:
-        return 'skip'
+        pytest.skip()
 
     if not gdaltest.download_file('http://www.agc.army.mil/GeoPDFgallery/Imagery/Cherrydale_eDOQQ_1m_0_033_R1C1.pdf', 'Cherrydale_eDOQQ_1m_0_033_R1C1.pdf'):
-        return 'skip'
+        pytest.skip()
 
     try:
         os.stat('tmp/cache/Cherrydale_eDOQQ_1m_0_033_R1C1.pdf')
     except OSError:
-        return 'skip'
+        pytest.skip()
 
     ds = gdal.Open('tmp/cache/Cherrydale_eDOQQ_1m_0_033_R1C1.pdf')
     assert ds is not None
@@ -161,12 +161,12 @@ def pdf_online_1():
 def pdf_online_2():
 
     if gdaltest.pdf_drv is None:
-        return 'skip'
+        pytest.skip()
 
     try:
         os.stat('tmp/cache/Cherrydale_eDOQQ_1m_0_033_R1C1.pdf')
     except OSError:
-        return 'skip'
+        pytest.skip()
 
     ds = gdal.Open('PDF:1:tmp/cache/Cherrydale_eDOQQ_1m_0_033_R1C1.pdf')
     assert ds is not None
@@ -199,7 +199,7 @@ def pdf_online_2():
 def pdf_1():
 
     if gdaltest.pdf_drv is None:
-        return 'skip'
+        pytest.skip()
 
     gdal.SetConfigOption('GDAL_PDF_DPI', '200')
     ds = gdal.Open('data/adobe_style_geospatial.pdf')
@@ -245,7 +245,7 @@ def pdf_1():
 def pdf_iso32000():
 
     if gdaltest.pdf_drv is None:
-        return 'skip'
+        pytest.skip()
 
     tst = gdaltest.GDALTest('PDF', 'byte.tif', 1, None)
     ret = tst.testCreateCopy(check_minmax=0, check_gt=1, check_srs=True, check_checksum_not_null=pdf_checksum_available())
@@ -259,7 +259,7 @@ def pdf_iso32000():
 def pdf_iso32000_dpi_300():
 
     if gdaltest.pdf_drv is None:
-        return 'skip'
+        pytest.skip()
 
     tst = gdaltest.GDALTest('PDF', 'byte.tif', 1, None, options=['DPI=300'])
     ret = tst.testCreateCopy(check_minmax=0, check_gt=1, check_srs=True, check_checksum_not_null=pdf_checksum_available())
@@ -273,7 +273,7 @@ def pdf_iso32000_dpi_300():
 def pdf_ogcbp():
 
     if gdaltest.pdf_drv is None:
-        return 'skip'
+        pytest.skip()
 
     gdal.SetConfigOption('GDAL_PDF_OGC_BP_WRITE_WKT', 'FALSE')
     tst = gdaltest.GDALTest('PDF', 'byte.tif', 1, None, options=['GEO_ENCODING=OGC_BP'])
@@ -289,7 +289,7 @@ def pdf_ogcbp():
 def pdf_ogcbp_dpi_300():
 
     if gdaltest.pdf_drv is None:
-        return 'skip'
+        pytest.skip()
 
     gdal.SetConfigOption('GDAL_PDF_OGC_BP_WRITE_WKT', 'FALSE')
     tst = gdaltest.GDALTest('PDF', 'byte.tif', 1, None, options=['GEO_ENCODING=OGC_BP', 'DPI=300'])
@@ -302,7 +302,7 @@ def pdf_ogcbp_dpi_300():
 def pdf_ogcbp_lcc():
 
     if gdaltest.pdf_drv is None:
-        return 'skip'
+        pytest.skip()
 
     wkt = """PROJCS["NAD83 / Utah North",
     GEOGCS["NAD83",
@@ -351,7 +351,7 @@ def pdf_ogcbp_lcc():
 def pdf_no_compression():
 
     if gdaltest.pdf_drv is None:
-        return 'skip'
+        pytest.skip()
 
     tst = gdaltest.GDALTest('PDF', 'byte.tif', 1, None, options=['COMPRESS=NONE'])
     ret = tst.testCreateCopy(check_minmax=0, check_gt=0, check_srs=None, check_checksum_not_null=pdf_checksum_available())
@@ -365,10 +365,10 @@ def pdf_no_compression():
 def pdf_jpeg_compression(filename='byte.tif'):
 
     if gdaltest.pdf_drv is None:
-        return 'skip'
+        pytest.skip()
 
     if gdal.GetDriverByName('JPEG') is None:
-        return 'skip'
+        pytest.skip()
 
     tst = gdaltest.GDALTest('PDF', filename, 1, None, options=['COMPRESS=JPEG'])
     ret = tst.testCreateCopy(check_minmax=0, check_gt=0, check_srs=None, check_checksum_not_null=pdf_checksum_available())
@@ -390,16 +390,16 @@ def pdf_get_J2KDriver(drv_name):
 def pdf_jpx_compression(filename, drv_name=None):
 
     if gdaltest.pdf_drv is None:
-        return 'skip'
+        pytest.skip()
 
     if drv_name is None:
         if pdf_get_J2KDriver('JP2KAK') is None and \
            pdf_get_J2KDriver('JP2ECW') is None and \
            pdf_get_J2KDriver('JP2OpenJpeg') is None and \
            pdf_get_J2KDriver('JPEG2000') is None:
-            return 'skip'
+            pytest.skip()
     elif pdf_get_J2KDriver(drv_name) is None:
-        return 'skip'
+        pytest.skip()
 
     if drv_name is None:
         options = ['COMPRESS=JPEG2000']
@@ -446,10 +446,10 @@ def pdf_jpeg_compression_rgb():
 def pdf_rgba_default_compression(options_param=None):
     options_param = [] if options_param is None else options_param
     if gdaltest.pdf_drv is None:
-        return 'skip'
+        pytest.skip()
 
     if not pdf_checksum_available():
-        return 'skip'
+        pytest.skip()
 
     src_ds = gdal.Open('../gcore/data/stefan_full_rgba.tif')
     out_ds = gdaltest.pdf_drv.CreateCopy('tmp/rgba.pdf', src_ds, options=options_param)
@@ -481,7 +481,7 @@ def pdf_rgba_default_compression(options_param=None):
     gdal.GetDriverByName('PDF').Delete('tmp/rgba.pdf')
 
     if cs4 < 0:
-        return 'skip'
+        pytest.skip()
 
     assert (content.find('Type = dictionary, Num = 3, Gen = 0') == 0 and \
        content.find('      Type = dictionary, Num = 3, Gen = 0') >= 0), \
@@ -516,7 +516,7 @@ def pdf_jpeg_compression_rgba():
 def pdf_predictor_2():
 
     if gdaltest.pdf_drv is None:
-        return 'skip'
+        pytest.skip()
 
     tst = gdaltest.GDALTest('PDF', 'utm.tif', 1, None, options=['PREDICTOR=2'])
     ret = tst.testCreateCopy(check_minmax=0, check_gt=0, check_srs=None, check_checksum_not_null=pdf_checksum_available())
@@ -527,7 +527,7 @@ def pdf_predictor_2():
 def pdf_predictor_2_rgb():
 
     if gdaltest.pdf_drv is None:
-        return 'skip'
+        pytest.skip()
 
     tst = gdaltest.GDALTest('PDF', 'rgbsmall.tif', 1, None, options=['PREDICTOR=2'])
     ret = tst.testCreateCopy(check_minmax=0, check_gt=0, check_srs=None, check_checksum_not_null=pdf_checksum_available())
@@ -541,7 +541,7 @@ def pdf_predictor_2_rgb():
 def pdf_tiled():
 
     if gdaltest.pdf_drv is None:
-        return 'skip'
+        pytest.skip()
 
     tst = gdaltest.GDALTest('PDF', 'utm.tif', 1, None, options=['COMPRESS=DEFLATE', 'TILED=YES'])
     ret = tst.testCreateCopy(check_minmax=0, check_gt=0, check_srs=None, check_checksum_not_null=pdf_checksum_available())
@@ -552,7 +552,7 @@ def pdf_tiled():
 def pdf_tiled_128():
 
     if gdaltest.pdf_drv is None:
-        return 'skip'
+        pytest.skip()
 
     tst = gdaltest.GDALTest('PDF', 'utm.tif', 1, None, options=['BLOCKXSIZE=128', 'BLOCKYSIZE=128'])
     ret = tst.testCreateCopy(check_minmax=0, check_gt=0, check_srs=None, check_checksum_not_null=pdf_checksum_available())
@@ -566,10 +566,10 @@ def pdf_tiled_128():
 def pdf_color_table():
 
     if gdaltest.pdf_drv is None:
-        return 'skip'
+        pytest.skip()
 
     if gdal.GetDriverByName('GIF') is None:
-        return 'skip'
+        pytest.skip()
 
     tst = gdaltest.GDALTest('PDF', 'bug407.gif', 1, None)
     ret = tst.testCreateCopy(check_minmax=0, check_gt=0, check_srs=None, check_checksum_not_null=pdf_checksum_available())
@@ -583,7 +583,7 @@ def pdf_color_table():
 def pdf_xmp():
 
     if gdaltest.pdf_drv is None:
-        return 'skip'
+        pytest.skip()
 
     src_ds = gdal.Open('data/adobe_style_geospatial_with_xmp.pdf')
     gdaltest.pdf_drv.CreateCopy('tmp/pdf_xmp.pdf', src_ds, options=['WRITE_INFO=NO'])
@@ -591,7 +591,7 @@ def pdf_xmp():
     if out_ds is None:
         # Some Poppler versions cannot re-open the file
         gdal.GetDriverByName('PDF').Delete('tmp/pdf_xmp.pdf')
-        return 'skip'
+        pytest.skip()
 
     ref_md = src_ds.GetMetadata('xml:XMP')
     got_md = out_ds.GetMetadata('xml:XMP')
@@ -614,7 +614,7 @@ def pdf_xmp():
 def pdf_info():
 
     if gdaltest.pdf_drv is None:
-        return 'skip'
+        pytest.skip()
 
     try:
         val = '\xc3\xa9'.decode('UTF-8')
@@ -659,7 +659,7 @@ def pdf_info():
 def pdf_update_gt():
 
     if gdaltest.pdf_drv is None:
-        return 'skip'
+        pytest.skip()
 
     src_ds = gdal.Open('data/byte.tif')
     ds = gdaltest.pdf_drv.CreateCopy('tmp/pdf_update_gt.pdf', src_ds)
@@ -725,7 +725,7 @@ def pdf_update_gt():
 def pdf_update_info():
 
     if gdaltest.pdf_drv is None:
-        return 'skip'
+        pytest.skip()
 
     src_ds = gdal.Open('data/byte.tif')
     ds = gdaltest.pdf_drv.CreateCopy('tmp/pdf_update_info.pdf', src_ds)
@@ -784,7 +784,7 @@ def pdf_update_info():
 def pdf_update_xmp():
 
     if gdaltest.pdf_drv is None:
-        return 'skip'
+        pytest.skip()
 
     src_ds = gdal.Open('data/byte.tif')
     ds = gdaltest.pdf_drv.CreateCopy('tmp/pdf_update_xmp.pdf', src_ds)
@@ -842,7 +842,7 @@ def pdf_update_xmp():
 def pdf_update_gcps(dpi=300):
 
     if gdaltest.pdf_drv is None:
-        return 'skip'
+        pytest.skip()
 
     out_filename = 'tmp/pdf_update_gcps.pdf'
 
@@ -951,7 +951,7 @@ def pdf_update_gcps_ogc_bp():
 def pdf_set_5_gcps_ogc_bp(dpi=300):
 
     if gdaltest.pdf_drv is None:
-        return 'skip'
+        pytest.skip()
 
     out_filename = 'tmp/pdf_set_5_gcps_ogc_bp.pdf'
 
@@ -1051,7 +1051,7 @@ def pdf_set_5_gcps_ogc_bp(dpi=300):
 def pdf_set_neatline(geo_encoding, dpi=300):
 
     if gdaltest.pdf_drv is None:
-        return 'skip'
+        pytest.skip()
 
     out_filename = 'tmp/pdf_set_neatline.pdf'
 
@@ -1142,7 +1142,7 @@ def pdf_set_neatline_ogc_bp():
 def pdf_check_identity_iso32000():
 
     if gdaltest.pdf_drv is None:
-        return 'skip'
+        pytest.skip()
 
     out_filename = 'tmp/pdf_check_identity_iso32000.pdf'
 
@@ -1172,7 +1172,7 @@ def pdf_check_identity_iso32000():
 def pdf_check_identity_ogc_bp():
 
     if gdaltest.pdf_drv is None:
-        return 'skip'
+        pytest.skip()
 
     out_filename = 'tmp/pdf_check_identity_ogc_bp.pdf'
 
@@ -1204,10 +1204,10 @@ def pdf_check_identity_ogc_bp():
 def pdf_layers():
 
     if gdaltest.pdf_drv is None:
-        return 'skip'
+        pytest.skip()
 
     if not pdf_is_poppler() and not pdf_is_pdfium():
-        return 'skip'
+        pytest.skip()
 
     ds = gdal.Open('data/adobe_style_geospatial.pdf')
     layers = ds.GetMetadata_List('LAYERS')
@@ -1219,7 +1219,7 @@ def pdf_layers():
         'did not get expected layers'
 
     if not pdf_checksum_available():
-        return 'skip'
+        pytest.skip()
 
     # Turn a layer off
     gdal.SetConfigOption('GDAL_PDF_LAYERS_OFF', 'New_Data_Frame')
@@ -1256,7 +1256,7 @@ def pdf_layers():
 def pdf_custom_layout():
 
     if gdaltest.pdf_drv is None:
-        return 'skip'
+        pytest.skip()
 
     js = """button = app.alert({cMsg: 'This file was generated by GDAL. Do you want to visit its website ?', cTitle: 'Question', nIcon:2, nType:2});
 if (button == 4) app.launchURL('http://gdal.org/');"""
@@ -1298,7 +1298,7 @@ def pdf_custom_layout():
 def pdf_extra_rasters():
 
     if gdaltest.pdf_drv is None:
-        return 'skip'
+        pytest.skip()
 
     subbyte = """<VRTDataset rasterXSize="10" rasterYSize="10">
   <SRS>PROJCS["NAD27 / UTM zone 11N",GEOGCS["NAD27",DATUM["North_American_Datum_1927",SPHEROID["Clarke 1866",6378206.4,294.9786982139006,AUTHORITY["EPSG","7008"]],AUTHORITY["EPSG","6267"]],PRIMEM["Greenwich",0],UNIT["degree",0.0174532925199433],AUTHORITY["EPSG","4267"]],PROJECTION["Transverse_Mercator"],PARAMETER["latitude_of_origin",0],PARAMETER["central_meridian",-117],PARAMETER["scale_factor",0.9996],PARAMETER["false_easting",500000],PARAMETER["false_northing",0],UNIT["metre",1,AUTHORITY["EPSG","9001"]],AUTHORITY["EPSG","26711"]]</SRS>
@@ -1365,7 +1365,7 @@ def pdf_extra_rasters():
 def pdf_write_ogr():
 
     if gdaltest.pdf_drv is None:
-        return 'skip'
+        pytest.skip()
 
     f = gdal.VSIFOpenL('tmp/test.csv', 'wb')
     data = """id,foo,WKT,style
@@ -1458,12 +1458,12 @@ def pdf_write_ogr():
 def pdf_write_ogr_with_reprojection():
 
     if gdaltest.pdf_drv is None:
-        return 'skip'
+        pytest.skip()
 
     import osr_ct
     osr_ct.osr_ct_1()
     if gdaltest.have_proj4 == 0:
-        return 'skip'
+        pytest.skip()
 
     f = gdal.VSIFOpenL('tmp/test.csv', 'wb')
     data = """WKT,id
@@ -1521,10 +1521,10 @@ def pdf_write_ogr_with_reprojection():
 def pdf_jpeg_direct_copy():
 
     if gdaltest.pdf_drv is None:
-        return 'skip'
+        pytest.skip()
 
     if gdal.GetDriverByName('JPEG') is None:
-        return 'skip'
+        pytest.skip()
 
     src_ds = gdal.Open('data/byte_with_xmp.jpg')
     ds = gdaltest.pdf_drv.CreateCopy('tmp/pdf_jpeg_direct_copy.pdf', src_ds, options=['XMP=NO'])
@@ -1557,10 +1557,10 @@ def pdf_jpeg_direct_copy():
 def pdf_jpeg_in_vrt_direct_copy():
 
     if gdaltest.pdf_drv is None:
-        return 'skip'
+        pytest.skip()
 
     if gdal.GetDriverByName('JPEG') is None:
-        return 'skip'
+        pytest.skip()
 
     src_ds = gdal.Open("""<VRTDataset rasterXSize="20" rasterYSize="20">
   <SRS>PROJCS["NAD27 / UTM zone 11N",GEOGCS["NAD27",DATUM["North_American_Datum_1927",SPHEROID["Clarke 1866",6378206.4,294.9786982139006,AUTHORITY["EPSG","7008"]],AUTHORITY["EPSG","6267"]],PRIMEM["Greenwich",0],UNIT["degree",0.0174532925199433],AUTHORITY["EPSG","4267"]],PROJECTION["Transverse_Mercator"],PARAMETER["latitude_of_origin",0],PARAMETER["central_meridian",-117],PARAMETER["scale_factor",0.9996],PARAMETER["false_easting",500000],PARAMETER["false_northing",0],UNIT["metre",1,AUTHORITY["EPSG","9001"]],AUTHORITY["EPSG","26711"]]</SRS>
@@ -1605,7 +1605,7 @@ def pdf_jpeg_in_vrt_direct_copy():
 def pdf_georef_on_image(src_filename='data/byte.tif'):
 
     if gdaltest.pdf_drv is None:
-        return 'skip'
+        pytest.skip()
 
     src_ds = gdal.Open(src_filename)
     gdal.SetConfigOption('GDAL_PDF_WRITE_GEOREF_ON_IMAGE', 'YES')
@@ -1649,7 +1649,7 @@ def pdf_georef_on_image_rgb():
 def pdf_write_huge():
 
     if gdaltest.pdf_drv is None:
-        return 'skip'
+        pytest.skip()
 
     if pdf_is_poppler() or pdf_is_pdfium():
         tmp_filename = '/vsimem/pdf_write_huge.pdf'
@@ -1705,10 +1705,10 @@ def pdf_write_huge():
 def pdf_overviews():
 
     if gdaltest.pdf_drv is None:
-        return 'skip'
+        pytest.skip()
 
     if not pdf_is_poppler() and not pdf_is_pdfium():
-        return 'skip'
+        pytest.skip()
     tmp_filename = '/vsimem/pdf_overviews.pdf'
 
     src_ds = gdal.GetDriverByName('MEM').Create('', 1024, 1024, 3)
@@ -1726,8 +1726,7 @@ def pdf_overviews():
         cs = ds.GetRasterBand(1).GetOverview(0).Checksum()
         assert cs == 5934
     elif pdf_is_pdfium():
-        gdaltest.post_reason('Overview expected at this point!')
-        return 'fail'
+        pytest.fail('Overview expected at this point!')
     ds.BuildOverviews('NONE', [2])
     after = ds.GetRasterBand(1).GetOverviewCount()
     assert after == 1
@@ -1746,7 +1745,7 @@ def pdf_overviews():
 def pdf_password():
 
     if gdaltest.pdf_drv is None:
-        return 'skip'
+        pytest.skip()
 
     # User password of this test file is user_password and owner password is
     # owner_password
@@ -1767,7 +1766,7 @@ def pdf_password():
 
     import test_cli_utilities
     if test_cli_utilities.get_gdal_translate_path() is None:
-        return 'skip'
+        pytest.skip()
 
     # Test ASK_INTERACTIVE with wrong password
     cmd_line = test_cli_utilities.get_gdal_translate_path() + ' data/byte_enc.pdf /vsimem/out.tif -q -oo USER_PWD=ASK_INTERACTIVE < tmp/password.txt'
@@ -1794,7 +1793,7 @@ def pdf_password():
 def pdf_multipage():
 
     if gdaltest.pdf_drv is None:
-        return 'skip'
+        pytest.skip()
 
     # byte_and_rgbsmall_2pages.pdf was generated with :
     # 1) gdal_translate gcore/data/byte.tif byte.pdf -of PDF
@@ -1834,7 +1833,7 @@ def pdf_multipage():
 def pdf_metadata():
 
     if gdaltest.pdf_drv is None:
-        return 'skip'
+        pytest.skip()
 
     gdal.Translate('tmp/pdf_metadata.pdf', 'data/byte.tif', format='PDF', metadataOptions=['FOO=BAR'])
     ds = gdal.Open('tmp/pdf_metadata.pdf')
@@ -1856,7 +1855,7 @@ def pdf_metadata():
 def pdf_pam_georef():
 
     if gdaltest.pdf_drv is None:
-        return 'skip'
+        pytest.skip()
 
     src_ds = gdal.Open('data/byte.tif')
 
diff --git a/autotest/gdrivers/pds4.py b/autotest/gdrivers/pds4.py
index 5ea1c259cf0b..db2c95cbca3b 100755
--- a/autotest/gdrivers/pds4.py
+++ b/autotest/gdrivers/pds4.py
@@ -38,6 +38,7 @@
 from osgeo import ogr
 from osgeo import osr
 import gdaltest
+import pytest
 
 ###############################################################################
 # Validate XML file against schemas
@@ -46,27 +47,27 @@
 def validate_xml(filename):
 
     if ogr.GetDriverByName('GMLAS') is None:
-        return 'skip'
+        pytest.skip()
 
     if not gdaltest.download_file('https://pds.nasa.gov/pds4/pds/v1/PDS4_PDS_1800.xsd',
                                   'pds.nasa.gov_pds4_pds_v1_PDS4_PDS_1800.xsd',
                                   force_download=True):
-        return 'skip'
+        pytest.skip()
 
     if not gdaltest.download_file('https://pds.nasa.gov/pds4/disp/v1/PDS4_DISP_1800.xsd',
                                   'pds.nasa.gov_pds4_disp_v1_PDS4_DISP_1800.xsd',
                                   force_download=True):
-        return 'skip'
+        pytest.skip()
 
     if not gdaltest.download_file('https://pds.nasa.gov/pds4/pds/v1/PDS4_PDS_1700.xsd',
                                   'pds.nasa.gov_pds4_pds_v1_PDS4_PDS_1700.xsd',
                                   force_download=True):
-        return 'skip'
+        pytest.skip()
 
     if not gdaltest.download_file('https://pds.nasa.gov/pds4/cart/v1/PDS4_CART_1700.xsd',
                                   'pds.nasa.gov_pds4_cart_v1_PDS4_CART_1700.xsd',
                                   force_download=True):
-        return 'skip'
+        pytest.skip()
 
     ds = gdal.OpenEx('GMLAS:' + filename, open_options=[
         'VALIDATE=YES',
diff --git a/autotest/gdrivers/plmosaic.py b/autotest/gdrivers/plmosaic.py
index 5d56288d793b..6d2df13de6cf 100755
--- a/autotest/gdrivers/plmosaic.py
+++ b/autotest/gdrivers/plmosaic.py
@@ -38,6 +38,7 @@
 from osgeo import gdal
 
 import gdaltest
+import pytest
 
 ###############################################################################
 # Find PLMosaic driver
@@ -49,7 +50,7 @@ def test_plmosaic_1():
 
     if gdaltest.plmosaic_drv is not None:
         return 'success'
-    return 'skip'
+    pytest.skip()
 
 ###############################################################################
 # Error: no API_KEY
@@ -58,7 +59,7 @@ def test_plmosaic_1():
 def test_plmosaic_2():
 
     if gdaltest.plmosaic_drv is None:
-        return 'skip'
+        pytest.skip()
 
     gdal.PushErrorHandler()
     gdal.SetConfigOption('PL_URL', '/vsimem/root')
@@ -76,7 +77,7 @@ def test_plmosaic_2():
 def test_plmosaic_3():
 
     if gdaltest.plmosaic_drv is None:
-        return 'skip'
+        pytest.skip()
 
     gdal.PushErrorHandler()
     gdal.SetConfigOption('PL_URL', '/vsimem/does_not_exist/')
@@ -94,7 +95,7 @@ def test_plmosaic_3():
 def test_plmosaic_4():
 
     if gdaltest.plmosaic_drv is None:
-        return 'skip'
+        pytest.skip()
 
     gdal.FileFromMemBuffer('/vsimem/root', """{""")
 
@@ -114,7 +115,7 @@ def test_plmosaic_4():
 def test_plmosaic_5():
 
     if gdaltest.plmosaic_drv is None:
-        return 'skip'
+        pytest.skip()
 
     gdal.FileFromMemBuffer('/vsimem/root', """null""")
 
@@ -134,7 +135,7 @@ def test_plmosaic_5():
 def test_plmosaic_6():
 
     if gdaltest.plmosaic_drv is None:
-        return 'skip'
+        pytest.skip()
 
     gdal.FileFromMemBuffer('/vsimem/root', """{}""")
 
@@ -154,7 +155,7 @@ def test_plmosaic_6():
 def test_plmosaic_7():
 
     if gdaltest.plmosaic_drv is None:
-        return 'skip'
+        pytest.skip()
 
     gdal.FileFromMemBuffer('/vsimem/root', """{
     "mosaics": [],
@@ -175,7 +176,7 @@ def test_plmosaic_7():
 def test_plmosaic_8():
 
     if gdaltest.plmosaic_drv is None:
-        return 'skip'
+        pytest.skip()
 
     gdal.FileFromMemBuffer('/vsimem/root', """{
     "_links" : { "_next": "/vsimem/root/?page=2" },
@@ -230,7 +231,7 @@ def test_plmosaic_8():
 def test_plmosaic_9():
 
     if gdaltest.plmosaic_drv is None:
-        return 'skip'
+        pytest.skip()
 
     gdal.PushErrorHandler()
     gdal.SetConfigOption('PL_URL', '/vsimem/root')
@@ -248,7 +249,7 @@ def test_plmosaic_9():
 def test_plmosaic_9bis():
 
     if gdaltest.plmosaic_drv is None:
-        return 'skip'
+        pytest.skip()
 
     gdal.FileFromMemBuffer('/vsimem/root/?name__is=my_mosaic', """{""")
     gdal.SetConfigOption('PL_URL', '/vsimem/root')
@@ -267,7 +268,7 @@ def test_plmosaic_9bis():
 def test_plmosaic_9ter():
 
     if gdaltest.plmosaic_drv is None:
-        return 'skip'
+        pytest.skip()
 
     gdal.FileFromMemBuffer('/vsimem/root/?name__is=my_mosaic', """{}""")
     gdal.SetConfigOption('PL_URL', '/vsimem/root')
@@ -286,7 +287,7 @@ def test_plmosaic_9ter():
 def test_plmosaic_10():
 
     if gdaltest.plmosaic_drv is None:
-        return 'skip'
+        pytest.skip()
 
     gdal.FileFromMemBuffer('/vsimem/root/?name__is=my_mosaic', """{
 "mosaics": [{
@@ -310,7 +311,7 @@ def test_plmosaic_10():
 def test_plmosaic_11():
 
     if gdaltest.plmosaic_drv is None:
-        return 'skip'
+        pytest.skip()
 
     gdal.FileFromMemBuffer('/vsimem/root/?name__is=my_mosaic', """{
 "mosaics": [{
@@ -340,7 +341,7 @@ def test_plmosaic_11():
 def test_plmosaic_12():
 
     if gdaltest.plmosaic_drv is None:
-        return 'skip'
+        pytest.skip()
 
     gdal.FileFromMemBuffer('/vsimem/root/?name__is=my_mosaic', """{
 "mosaics": [{
@@ -370,7 +371,7 @@ def test_plmosaic_12():
 def test_plmosaic_13():
 
     if gdaltest.plmosaic_drv is None:
-        return 'skip'
+        pytest.skip()
 
     gdal.FileFromMemBuffer('/vsimem/root/?name__is=my_mosaic', """{
 "mosaics": [{
@@ -400,7 +401,7 @@ def test_plmosaic_13():
 def test_plmosaic_14():
 
     if gdaltest.plmosaic_drv is None:
-        return 'skip'
+        pytest.skip()
 
     gdal.FileFromMemBuffer('/vsimem/root/?name__is=my_mosaic', """{
 "mosaics": [{
@@ -430,7 +431,7 @@ def test_plmosaic_14():
 def test_plmosaic_15():
 
     if gdaltest.plmosaic_drv is None:
-        return 'skip'
+        pytest.skip()
 
     gdal.FileFromMemBuffer('/vsimem/root/?name__is=my_mosaic', """{
 "mosaics": [{
@@ -469,7 +470,7 @@ def test_plmosaic_15():
 def test_plmosaic_16():
 
     if gdaltest.plmosaic_drv is None:
-        return 'skip'
+        pytest.skip()
 
     try:
         shutil.rmtree('tmp/plmosaic_cache')
@@ -533,7 +534,7 @@ def test_plmosaic_16():
 def test_plmosaic_17():
 
     if gdaltest.plmosaic_drv is None:
-        return 'skip'
+        pytest.skip()
 
     gdal.SetConfigOption('PL_URL', '/vsimem/root')
     ds = gdal.OpenEx('PLMosaic:', gdal.OF_RASTER, open_options=['API_KEY=foo', 'MOSAIC=my_mosaic', 'CACHE_PATH=tmp'])
@@ -656,7 +657,7 @@ def test_plmosaic_17():
 def test_plmosaic_18():
 
     if gdaltest.plmosaic_drv is None:
-        return 'skip'
+        pytest.skip()
 
     shutil.rmtree('tmp/plmosaic_cache')
 
@@ -699,7 +700,7 @@ def test_plmosaic_18():
 def test_plmosaic_19():
 
     if gdaltest.plmosaic_drv is None:
-        return 'skip'
+        pytest.skip()
 
     gdal.SetConfigOption('PL_URL', '/vsimem/root')
     ds = gdal.OpenEx('PLMosaic:', gdal.OF_RASTER, open_options=['API_KEY=foo', 'MOSAIC=my_mosaic', 'CACHE_PATH=/does_not_exist'])
@@ -724,7 +725,7 @@ def test_plmosaic_19():
 def test_plmosaic_20():
 
     if gdaltest.plmosaic_drv is None:
-        return 'skip'
+        pytest.skip()
 
     gdal.SetConfigOption('PL_URL', '/vsimem/root')
     ds = gdal.OpenEx('PLMosaic:', gdal.OF_RASTER, open_options=['API_KEY=foo', 'MOSAIC=my_mosaic', 'CACHE_PATH='])
@@ -747,7 +748,7 @@ def test_plmosaic_20():
 def test_plmosaic_21():
 
     if gdaltest.plmosaic_drv is None:
-        return 'skip'
+        pytest.skip()
 
     gdal.SetConfigOption('PL_URL', '/vsimem/root')
     ds = gdal.OpenEx('PLMosaic:', gdal.OF_RASTER, open_options=['API_KEY=foo', 'MOSAIC=my_mosaic', 'CACHE_PATH=', 'USE_TILES=YES'])
@@ -833,7 +834,7 @@ def test_plmosaic_21():
 def test_plmosaic_with_bbox():
 
     if gdaltest.plmosaic_drv is None:
-        return 'skip'
+        pytest.skip()
 
     try:
         shutil.rmtree('tmp/plmosaic_cache')
@@ -924,7 +925,7 @@ def test_plmosaic_with_bbox():
 def test_plmosaic_cleanup():
 
     if gdaltest.plmosaic_drv is None:
-        return 'skip'
+        pytest.skip()
 
     gdal.Unlink('/vsimem/root_no_mosaics')
     gdal.Unlink('/vsimem/root')
diff --git a/autotest/gdrivers/png_profile.py b/autotest/gdrivers/png_profile.py
index 84ba56c51057..f9ebb9dd3f54 100755
--- a/autotest/gdrivers/png_profile.py
+++ b/autotest/gdrivers/png_profile.py
@@ -37,6 +37,7 @@
 
 import gdaltest
 from osgeo import gdal
+import pytest
 
 
 ###############################################################################
@@ -66,7 +67,7 @@ def test_png_copy_icc():
 
     try:
         os.stat('tmp/icc_test.png.aux.xml')
-        return 'fail'
+        pytest.fail()
     except OSError:
         pass
 
@@ -77,7 +78,7 @@ def test_png_copy_icc():
 
     try:
         os.stat('tmp/icc_test.png.aux.xml')
-        return 'fail'
+        pytest.fail()
     except OSError:
         pass
 
@@ -90,7 +91,7 @@ def test_png_copy_icc():
 
     try:
         os.stat('tmp/icc_test.png.aux.xml')
-        return 'fail'
+        pytest.fail()
     except OSError:
         pass
 
diff --git a/autotest/gdrivers/postgisraster.py b/autotest/gdrivers/postgisraster.py
index be9ecdac1e45..909d2fd2187e 100755
--- a/autotest/gdrivers/postgisraster.py
+++ b/autotest/gdrivers/postgisraster.py
@@ -38,6 +38,7 @@
 
 
 import gdaltest
+import pytest
 
 #
 # To initialize the required PostGISRaster DB instance, run data/load_postgisraster_test_data.sh
@@ -51,11 +52,11 @@
 def test_postgisraster_init():
     gdaltest.postgisrasterDriver = gdal.GetDriverByName('PostGISRaster')
     if gdaltest.postgisrasterDriver is None:
-        return 'skip'
+        pytest.skip()
 
     if gdal.GetConfigOption('APPVEYOR'):
         gdaltest.postgisrasterDriver = None
-        return 'skip'
+        pytest.skip()
 
     val = gdal.GetConfigOption('GDAL_PG_CONNECTION_STRING', None)
     if val is not None:
@@ -71,7 +72,7 @@ def test_postgisraster_init():
         ds = ogr.Open(gdaltest.postgisraster_connection_string, update=1)
     if ds is None:
         gdaltest.postgisrasterDriver = None
-        return 'skip'
+        pytest.skip()
 
     sr = osr.SpatialReference()
     sr.ImportFromEPSG(26711)
@@ -100,7 +101,7 @@ def test_postgisraster_init():
         gdaltest.postgisrasterDriver = None
 
     if gdaltest.postgisrasterDriver is None:
-        return 'skip'
+        pytest.skip()
 
     return 'success'
 
@@ -110,14 +111,14 @@ def test_postgisraster_init():
 
 def test_postgisraster_test_open_error1():
     if gdaltest.postgisrasterDriver is None:
-        return 'skip'
+        pytest.skip()
 
     with gdaltest.error_handler():
         ds = gdal.Open(gdaltest.postgisraster_connection_string +
                        "table='nonexistent'")
     if ds is None:
         return 'success'
-    return 'fail'
+    pytest.fail()
 
 ###############################################################################
 #
@@ -125,7 +126,7 @@ def test_postgisraster_test_open_error1():
 
 def test_postgisraster_test_open_error2():
     if gdaltest.postgisrasterDriver is None:
-        return 'skip'
+        pytest.skip()
 
     # removed mode, as it defaults to one raster per row
     with gdaltest.error_handler():
@@ -139,7 +140,7 @@ def test_postgisraster_test_open_error2():
 
 def test_postgisraster_compare_utm():
     if gdaltest.postgisrasterDriver is None:
-        return 'skip'
+        pytest.skip()
 
     src_ds = gdal.Open('data/utm.tif')
     with gdaltest.error_handler():
@@ -157,7 +158,7 @@ def test_postgisraster_compare_utm():
 
 def test_postgisraster_compare_small_world():
     if gdaltest.postgisrasterDriver is None:
-        return 'skip'
+        pytest.skip()
 
     src_ds = gdal.Open('data/small_world.tif')
     with gdaltest.error_handler():
@@ -175,7 +176,7 @@ def test_postgisraster_compare_small_world():
 
 def test_postgisraster_test_utm_open():
     if gdaltest.postgisrasterDriver is None:
-        return 'skip'
+        pytest.skip()
 
     # First open tif file
     src_ds = gdal.Open('data/utm.tif')
@@ -200,7 +201,7 @@ def test_postgisraster_test_utm_open():
 
 def test_postgisraster_test_small_world_open_b1():
     if gdaltest.postgisrasterDriver is None:
-        return 'skip'
+        pytest.skip()
 
     # First open tif file
     src_ds = gdal.Open('data/small_world.tif')
@@ -225,7 +226,7 @@ def test_postgisraster_test_small_world_open_b1():
 
 def test_postgisraster_test_small_world_open_b2():
     if gdaltest.postgisrasterDriver is None:
-        return 'skip'
+        pytest.skip()
 
     # First open tif file
     src_ds = gdal.Open('data/small_world.tif')
@@ -250,7 +251,7 @@ def test_postgisraster_test_small_world_open_b2():
 
 def test_postgisraster_test_small_world_open_b3():
     if gdaltest.postgisrasterDriver is None:
-        return 'skip'
+        pytest.skip()
 
     # First open tif file
     src_ds = gdal.Open('data/small_world.tif')
@@ -273,7 +274,7 @@ def test_postgisraster_test_small_world_open_b3():
 
 def test_postgisraster_test_create_copy_bad_conn_string():
     if gdaltest.postgisrasterDriver is None:
-        return 'skip'
+        pytest.skip()
 
     with gdaltest.error_handler():
         src_ds = gdal.Open(gdaltest.postgisraster_connection_string + "table='small_world'")
@@ -285,7 +286,7 @@ def test_postgisraster_test_create_copy_bad_conn_string():
 
 def test_postgisraster_test_create_copy_no_dbname():
     if gdaltest.postgisrasterDriver is None:
-        return 'skip'
+        pytest.skip()
 
     with gdaltest.error_handler():
         src_ds = gdal.Open(gdaltest.postgisraster_connection_string + "table='small_world'")
@@ -301,7 +302,7 @@ def test_postgisraster_test_create_copy_no_dbname():
 
 def test_postgisraster_test_create_copy_no_tablename():
     if gdaltest.postgisrasterDriver is None:
-        return 'skip'
+        pytest.skip()
 
     with gdaltest.error_handler():
         src_ds = gdal.Open(gdaltest.postgisraster_connection_string + "table='small_world'")
@@ -321,7 +322,7 @@ def test_postgisraster_test_create_copy_and_delete():
     Why, test "Delete", of course!
     """
     if gdaltest.postgisrasterDriver is None:
-        return 'skip'
+        pytest.skip()
 
     with gdaltest.error_handler():
         src_ds = gdal.Open(gdaltest.postgisraster_connection_string + "table='small_world'")
@@ -340,7 +341,7 @@ def test_postgisraster_test_create_copy_and_delete_phases():
     Create a copy of the dataset, then delete it in phases.
     """
     if gdaltest.postgisrasterDriver is None:
-        return 'skip'
+        pytest.skip()
 
     with gdaltest.error_handler():
         src_ds = gdal.Open(gdaltest.postgisraster_connection_string + "table='small_world'")
@@ -355,11 +356,9 @@ def test_postgisraster_test_create_copy_and_delete_phases():
         src_ds = None
 
         if new_ds is None:
-            gdaltest.post_reason('No new dataset was created during copy.')
-            return 'fail'
+            pytest.fail('No new dataset was created during copy.')
         elif len(src_md) != len(new_md):
-            gdaltest.post_reason('Metadata differs between new and old rasters.')
-            return 'fail'
+            pytest.fail('Metadata differs between new and old rasters.')
 
         ds = gdal.Open(gdaltest.postgisraster_connection_string + "table='small_world_copy' mode=2")
         cs = [ds.GetRasterBand(i + 1).Checksum() for i in range(3)]
@@ -376,15 +375,13 @@ def test_postgisraster_test_create_copy_and_delete_phases():
         src_md = src_ds.GetMetadata('SUBDATASETS').keys()
 
         if src_ds is None:
-            gdaltest.post_reason('Could not open reduced dataset (1).')
-            return 'fail'
+            pytest.fail('Could not open reduced dataset (1).')
         elif len(src_md) != 100:
             # The length of the metadata contains two pcs of
             # information per raster, so 50 rasters remaining = 100 keys
-            gdaltest.post_reason(
-                'Expected 100 keys of metadata for 50 subdataset rasters.')
             print(len(src_md))
-            return 'fail'
+            pytest.fail(
+                'Expected 100 keys of metadata for 50 subdataset rasters.')
 
         # done with src
         src_ds = None
@@ -398,14 +395,12 @@ def test_postgisraster_test_create_copy_and_delete_phases():
         src_md = src_ds.GetMetadata('SUBDATASETS').keys()
 
         if src_ds is None:
-            gdaltest.post_reason('Could not open reduced dataset (2).')
-            return 'fail'
+            pytest.fail('Could not open reduced dataset (2).')
         elif len(src_md) != 50:
             # The length of the metadata contains two pcs of
             # information per raster, so 25 rasters remaining = 50 keys
-            gdaltest.post_reason('Expected 50 keys of metadata for 25 subdataset rasters.')
             print(len(src_md))
-            return 'fail'
+            pytest.fail('Expected 50 keys of metadata for 25 subdataset rasters.')
 
         # done with src
         src_ds = None
@@ -422,7 +417,7 @@ def test_postgisraster_test_norid():
     Test the ability to connect to a data source if it has no 'rid' column.
     """
     if gdaltest.postgisrasterDriver is None:
-        return 'skip'
+        pytest.skip()
 
     with gdaltest.error_handler():
         src_ds = gdal.Open(gdaltest.postgisraster_connection_string + "table='small_world_noid'")
@@ -450,7 +445,7 @@ def test_postgisraster_test_serial():
     but uses a sequence instead.
     """
     if gdaltest.postgisrasterDriver is None:
-        return 'skip'
+        pytest.skip()
 
     with gdaltest.error_handler():
         src_ds = gdal.Open(gdaltest.postgisraster_connection_string + "table='small_world_serial'")
@@ -480,7 +475,7 @@ def test_postgisraster_test_unique():
     but uses a unique constraint instead.
     """
     if gdaltest.postgisrasterDriver is None:
-        return 'skip'
+        pytest.skip()
 
     with gdaltest.error_handler():
         src_ds = gdal.Open(gdaltest.postgisraster_connection_string + "table='small_world_unique'")
@@ -507,7 +502,7 @@ def test_postgisraster_test_unique():
 def test_postgisraster_test_constraint():
 
     if gdaltest.postgisrasterDriver is None:
-        return 'skip'
+        pytest.skip()
     ds = gdal.Open(gdaltest.postgisraster_connection_string + "table='small_world_constraint' mode=2")
     cs = [ds.GetRasterBand(i + 1).Checksum() for i in range(3)]
     assert cs == [30111, 32302, 40026]
@@ -518,7 +513,7 @@ def test_postgisraster_test_constraint():
 def test_postgisraster_test_constraint_with_spi():
 
     if gdaltest.postgisrasterDriver is None:
-        return 'skip'
+        pytest.skip()
     ds = gdal.Open(gdaltest.postgisraster_connection_string + "table='small_world_constraint_with_spi' mode=2")
     cs = [ds.GetRasterBand(i + 1).Checksum() for i in range(3)]
     assert cs == [30111, 32302, 40026]
@@ -529,13 +524,13 @@ def test_postgisraster_test_constraint_with_spi():
 def test_postgisraster_test_outdb():
 
     if gdaltest.postgisrasterDriver is None:
-        return 'skip'
+        pytest.skip()
 
     # For some reason fails with
     # ERROR 1: PostGISRasterRasterBand::IRasterIO(): ERROR:  rt_band_load_offline_data: Cannot open offline raster: /home/travis/build/rouault/gdal/autotest/gdrivers/data/small_world.tif
     # See https://api.travis-ci.org/v3/job/428972866/log.txt
     if gdaltest.is_travis_branch('ubuntu_1804'):
-        return 'skip'
+        pytest.skip()
 
     ds = ogr.Open(gdaltest.postgisraster_connection_string_without_schema)
     sql_lyr = ds.ExecuteSQL('SHOW postgis.enable_outdb_rasters')
@@ -554,7 +549,7 @@ def test_postgisraster_test_outdb():
 def test_postgisraster_test_outdb_client_side():
 
     if gdaltest.postgisrasterDriver is None:
-        return 'skip'
+        pytest.skip()
     ds = gdal.Open(gdaltest.postgisraster_connection_string + "table='small_world_outdb_constraint' mode=2 outdb_resolution=client_side")
     cs = [ds.GetRasterBand(i + 1).Checksum() for i in range(3)]
     assert cs == [30111, 32302, 40026]
@@ -565,7 +560,7 @@ def test_postgisraster_test_outdb_client_side():
 def test_postgisraster_test_outdb_client_side_force_ireadblock():
 
     if gdaltest.postgisrasterDriver is None:
-        return 'skip'
+        pytest.skip()
     ds = gdal.Open(gdaltest.postgisraster_connection_string + "table='small_world_outdb_constraint' mode=2 outdb_resolution=client_side")
     with gdaltest.SetCacheMax(0):
         cs = [ds.GetRasterBand(i + 1).Checksum() for i in range(3)]
@@ -577,7 +572,7 @@ def test_postgisraster_test_outdb_client_side_force_ireadblock():
 def test_postgisraster_test_outdb_client_side_if_possible():
 
     if gdaltest.postgisrasterDriver is None:
-        return 'skip'
+        pytest.skip()
     ds = gdal.Open(gdaltest.postgisraster_connection_string + "table='small_world_outdb_constraint' mode=2 outdb_resolution=client_side_if_possible")
     cs = [ds.GetRasterBand(i + 1).Checksum() for i in range(3)]
     assert cs == [30111, 32302, 40026]
diff --git a/autotest/gdrivers/rasdaman.py b/autotest/gdrivers/rasdaman.py
index 5cfdb7e9dfd8..dd0f941eae8b 100755
--- a/autotest/gdrivers/rasdaman.py
+++ b/autotest/gdrivers/rasdaman.py
@@ -33,6 +33,7 @@
 
 
 import gdaltest
+import pytest
 
 #
 # The rasdaman DB must be created like this :
@@ -48,7 +49,7 @@
 def test_rasdaman_1():
     gdaltest.rasdamanDriver = gdal.GetDriverByName('RASDAMAN')
     if gdaltest.rasdamanDriver is None:
-        return 'skip'
+        pytest.skip()
 
     try:
         ds = gdal.Open("rasdaman:query='select a[$x_lo:$x_hi,$y_lo:$y_hi] from rgb as a'")
@@ -59,7 +60,7 @@ def test_rasdaman_1():
         gdaltest.rasdamanDriver = None
 
     if gdaltest.rasdamanDriver is None:
-        return 'skip'
+        pytest.skip()
 
     cs = ds.GetRasterBand(1).Checksum()
     assert cs == 61774, 'did not get expected checksum'
@@ -72,7 +73,7 @@ def test_rasdaman_1():
 
 def test_rasdaman_2():
     if gdaltest.rasdamanDriver is None:
-        return 'skip'
+        pytest.skip()
 
     ds = gdal.Open("rasdaman:query='select a[$x_lo:$x_hi,$y_lo:$y_hi] from notexisting as a'")
     return 'success' if ds is None else 'fail'
@@ -83,7 +84,7 @@ def test_rasdaman_2():
 
 def test_rasdaman_3():
     if gdaltest.rasdamanDriver is None:
-        return 'skip'
+        pytest.skip()
 
     ds = gdal.Open("rasdaman:query='select'")
 
diff --git a/autotest/gdrivers/rasterlite.py b/autotest/gdrivers/rasterlite.py
index 7264a4e9d762..c016b453bd94 100755
--- a/autotest/gdrivers/rasterlite.py
+++ b/autotest/gdrivers/rasterlite.py
@@ -36,6 +36,7 @@
 
 
 import gdaltest
+import pytest
 
 ###############################################################################
 # Get the rasterlite driver
@@ -60,7 +61,7 @@ def test_rasterlite_1():
 def test_rasterlite_2():
 
     if gdaltest.rasterlite_drv is None:
-        return 'skip'
+        pytest.skip()
 
     # Test if SQLite3 supports rtrees
     try:
@@ -77,17 +78,15 @@ def test_rasterlite_2():
         pass
     if gdal.GetLastErrorMsg().find('rtree') != -1:
         gdaltest.rasterlite_drv = None
-        gdaltest.post_reason('Please upgrade your sqlite3 library to be able to read Rasterlite DBs (needs rtree support)!')
-        return 'skip'
+        pytest.skip('Please upgrade your sqlite3 library to be able to read Rasterlite DBs (needs rtree support)!')
 
     gdal.ErrorReset()
     ds = gdal.Open('data/rasterlite.sqlite')
     if ds is None:
         if gdal.GetLastErrorMsg().find('unsupported file format') != -1:
             gdaltest.rasterlite_drv = None
-            gdaltest.post_reason('Please upgrade your sqlite3 library to be able to read Rasterlite DBs!')
-            return 'skip'
-        return 'fail'
+            pytest.skip('Please upgrade your sqlite3 library to be able to read Rasterlite DBs!')
+        pytest.fail()
 
     assert ds.RasterCount == 3, 'expected 3 bands'
 
@@ -127,7 +126,7 @@ def test_rasterlite_2():
 def test_rasterlite_3():
 
     if gdaltest.rasterlite_drv is None:
-        return 'skip'
+        pytest.skip()
 
     ds = gdal.Open('RASTERLITE:data/rasterlite_pyramids.sqlite,table=test')
 
@@ -161,7 +160,7 @@ def test_rasterlite_3():
 def test_rasterlite_4():
 
     if gdaltest.rasterlite_drv is None:
-        return 'skip'
+        pytest.skip()
 
     ds = gdal.Open('RASTERLITE:data/rasterlite_pct.sqlite,minx=0,miny=0,maxx=180,maxy=90')
 
@@ -188,7 +187,7 @@ def test_rasterlite_4():
 def test_rasterlite_5():
 
     if gdaltest.rasterlite_drv is None:
-        return 'skip'
+        pytest.skip()
 
     ds = gdal.Open('RASTERLITE:data/rasterlite_pct.sqlite,bands=3')
 
@@ -223,7 +222,7 @@ def test_rasterlite_5():
 def test_rasterlite_6():
 
     if gdaltest.rasterlite_drv is None:
-        return 'skip'
+        pytest.skip()
 
     # Test first if spatialite is available
     gdal.PushErrorHandler('CPLQuietErrorHandler')
@@ -236,7 +235,7 @@ def test_rasterlite_6():
     if sql_lyr is None:
         gdaltest.has_spatialite = False
         ogr_ds = None
-        return 'skip'
+        pytest.skip()
 
     gdaltest.has_spatialite = True
     ogr_ds.ReleaseResultSet(sql_lyr)
@@ -270,10 +269,10 @@ def test_rasterlite_6():
 def test_rasterlite_7():
 
     if gdaltest.rasterlite_drv is None:
-        return 'skip'
+        pytest.skip()
 
     if gdaltest.has_spatialite is False:
-        return 'skip'
+        pytest.skip()
 
     ds = gdal.Open('tmp/byte.sqlite', gdal.GA_Update)
 
@@ -305,10 +304,10 @@ def test_rasterlite_7():
 def test_rasterlite_8():
 
     if gdaltest.rasterlite_drv is None:
-        return 'skip'
+        pytest.skip()
 
     if gdaltest.has_spatialite is False:
-        return 'skip'
+        pytest.skip()
 
     ds = gdal.Open('tmp/byte.sqlite', gdal.GA_Update)
 
@@ -325,13 +324,13 @@ def test_rasterlite_8():
 def test_rasterlite_9():
 
     if gdaltest.rasterlite_drv is None:
-        return 'skip'
+        pytest.skip()
 
     if gdaltest.has_spatialite is False:
-        return 'skip'
+        pytest.skip()
 
     if gdaltest.epsilon_drv is None:
-        return 'skip'
+        pytest.skip()
 
     tst = gdaltest.GDALTest('RASTERLITE', 'byte.tif', 1, 4866, options=['DRIVER=EPSILON'])
 
@@ -344,13 +343,13 @@ def test_rasterlite_9():
 def test_rasterlite_10():
 
     if gdaltest.rasterlite_drv is None:
-        return 'skip'
+        pytest.skip()
 
     if gdaltest.has_spatialite is False:
-        return 'skip'
+        pytest.skip()
 
     if gdaltest.epsilon_drv is None:
-        return 'skip'
+        pytest.skip()
 
     tst = gdaltest.GDALTest('RASTERLITE', 'rgbsmall.tif', 1, 23189, options=['DRIVER=EPSILON'])
 
@@ -363,10 +362,10 @@ def test_rasterlite_10():
 def test_rasterlite_11():
 
     if gdaltest.rasterlite_drv is None:
-        return 'skip'
+        pytest.skip()
 
     if gdaltest.has_spatialite is False:
-        return 'skip'
+        pytest.skip()
 
     ds = gdal.Open('tmp/byte.sqlite', gdal.GA_Update)
 
@@ -394,10 +393,10 @@ def test_rasterlite_11():
 def test_rasterlite_12():
 
     if gdaltest.rasterlite_drv is None:
-        return 'skip'
+        pytest.skip()
 
     if gdaltest.has_spatialite is False:
-        return 'skip'
+        pytest.skip()
 
     ds = gdal.Open('data/byte.rasterlite')
     assert ds.GetRasterBand(1).Checksum() == 4672, 'validation failed'
@@ -410,13 +409,13 @@ def test_rasterlite_12():
 def test_rasterlite_13():
 
     if gdaltest.rasterlite_drv is None:
-        return 'skip'
+        pytest.skip()
 
     if gdaltest.has_spatialite is False:
-        return 'skip'
+        pytest.skip()
 
     if gdaltest.rasterlite_drv.GetMetadataItem("ENABLE_SQL_SQLITE_FORMAT") != 'YES':
-        return 'skip'
+        pytest.skip()
 
     ds = gdal.Open('data/byte.rasterlite.sql')
     assert ds.GetRasterBand(1).Checksum() == 4672, 'validation failed'
@@ -429,7 +428,7 @@ def test_rasterlite_13():
 def test_rasterlite_cleanup():
 
     if gdaltest.rasterlite_drv is None:
-        return 'skip'
+        pytest.skip()
 
     try:
         os.remove('tmp/spatialite_test.db')
diff --git a/autotest/gdrivers/rda.py b/autotest/gdrivers/rda.py
index 50dd5380df79..2591f0ca9317 100755
--- a/autotest/gdrivers/rda.py
+++ b/autotest/gdrivers/rda.py
@@ -39,6 +39,7 @@
 
 import gdaltest
 import webserver
+import pytest
 
 ###############################################################################
 # Find RDA driver
@@ -52,11 +53,11 @@ def test_rda_test_presence():
     gdal.SetConfigOption('GDBX_CONFIG_FILE', '')
 
     if gdaltest.rda_drv is None:
-        return 'skip'
+        pytest.skip()
 
     (gdaltest.webserver_process, gdaltest.webserver_port) = webserver.launch(handler=webserver.DispatcherHttpHandler)
     if gdaltest.webserver_port == 0:
-        return 'skip'
+        pytest.skip()
 
     return 'success'
 
@@ -66,7 +67,7 @@ def test_rda_test_presence():
 def test_rda_bad_connection_string():
 
     if gdaltest.rda_drv is None:
-        return 'skip'
+        pytest.skip()
 
     # Bad json
     with gdaltest.error_handler():
@@ -91,7 +92,7 @@ def test_rda_bad_connection_string():
 def test_rda_missing_credentials():
 
     if gdaltest.rda_drv is None:
-        return 'skip'
+        pytest.skip()
 
     with gdaltest.error_handler():
         ds = gdal.Open('{"graph-id":"foo","node-id":"bar"}')
@@ -105,9 +106,9 @@ def test_rda_missing_credentials():
 def test_rda_failed_authentication():
 
     if gdaltest.rda_drv is None:
-        return 'skip'
+        pytest.skip()
     if gdaltest.webserver_port == 0:
-        return 'skip'
+        pytest.skip()
 
     # invalid characters in env variable
     with gdaltest.config_options({'GBDX_AUTH_URL': '\\',
@@ -167,9 +168,9 @@ def test_rda_failed_authentication():
 def test_rda_error_metadata():
 
     if gdaltest.rda_drv is None:
-        return 'skip'
+        pytest.skip()
     if gdaltest.webserver_port == 0:
-        return 'skip'
+        pytest.skip()
 
     # 404
     handler = webserver.SequentialHandler()
@@ -338,9 +339,9 @@ def test_rda_error_metadata():
 def test_rda_graph_nominal():
 
     if gdaltest.rda_drv is None:
-        return 'skip'
+        pytest.skip()
     if gdaltest.webserver_port == 0:
-        return 'skip'
+        pytest.skip()
 
     handler = webserver.SequentialHandler()
     metadata_json = {"imageMetadata": {
@@ -659,9 +660,9 @@ def test_rda_graph_nominal():
 def test_rda_template_nominal():
 
     if gdaltest.rda_drv is None:
-        return 'skip'
+        pytest.skip()
     if gdaltest.webserver_port == 0:
-        return 'skip'
+        pytest.skip()
 
     handler = webserver.SequentialHandler()
     metadata_json = {"imageMetadata": {
@@ -857,9 +858,9 @@ def test_rda_template_nominal():
 def test_rda_template_image_reference_nominal():
 
     if gdaltest.rda_drv is None:
-        return 'skip'
+        pytest.skip()
     if gdaltest.webserver_port == 0:
-        return 'skip'
+        pytest.skip()
 
     handler = webserver.SequentialHandler()
     metadata_json = {"imageMetadata": {
@@ -1022,9 +1023,9 @@ def test_rda_template_image_reference_nominal():
 def test_rda_read_gbdx_config():
 
     if gdaltest.rda_drv is None:
-        return 'skip'
+        pytest.skip()
     if gdaltest.webserver_port == 0:
-        return 'skip'
+        pytest.skip()
 
     gdal.RmdirRecursive('/vsimem/cache_dir')
 
@@ -1080,9 +1081,9 @@ def test_rda_read_gbdx_config():
 def test_rda_download_queue():
 
     if gdaltest.rda_drv is None:
-        return 'skip'
+        pytest.skip()
     if gdaltest.webserver_port == 0:
-        return 'skip'
+        pytest.skip()
 
     gdal.RmdirRecursive('/vsimem/cache_dir')
 
@@ -1157,9 +1158,9 @@ def test_rda_download_queue():
 def test_rda_rpc():
 
     if gdaltest.rda_drv is None:
-        return 'skip'
+        pytest.skip()
     if gdaltest.webserver_port == 0:
-        return 'skip'
+        pytest.skip()
 
     gdal.RmdirRecursive('/vsimem/cache_dir')
 
@@ -1253,13 +1254,13 @@ def test_rda_rpc():
 def test_rda_real_cache_dir():
 
     if gdaltest.rda_drv is None:
-        return 'skip'
+        pytest.skip()
     if gdaltest.webserver_port == 0:
-        return 'skip'
+        pytest.skip()
 
     home = gdal.GetConfigOption('HOME', gdal.GetConfigOption('USERPROFILE', None))
     if home is None:
-        return 'skip'
+        pytest.skip()
 
     gdal.RmdirRecursive('/vsimem/cache_dir')
 
@@ -1344,9 +1345,9 @@ def test_rda_real_cache_dir():
 def test_rda_real_expired_authentication():
 
     if gdaltest.rda_drv is None:
-        return 'skip'
+        pytest.skip()
     if gdaltest.webserver_port == 0:
-        return 'skip'
+        pytest.skip()
 
     gdal.RmdirRecursive('/vsimem/cache_dir')
 
@@ -1405,9 +1406,9 @@ def test_rda_real_expired_authentication():
 def test_rda_bad_tile():
 
     if gdaltest.rda_drv is None:
-        return 'skip'
+        pytest.skip()
     if gdaltest.webserver_port == 0:
-        return 'skip'
+        pytest.skip()
 
     gdal.RmdirRecursive('/vsimem/cache_dir')
 
@@ -1515,7 +1516,7 @@ def test_rda_bad_tile():
 def test_rda_cleanup():
 
     if gdaltest.rda_drv is None:
-        return 'skip'
+        pytest.skip()
 
     if gdaltest.webserver_port != 0:
         webserver.server_stop(gdaltest.webserver_process, gdaltest.webserver_port)
diff --git a/autotest/gdrivers/rik.py b/autotest/gdrivers/rik.py
index e2f01f8c2c70..55d02b4e0ea0 100755
--- a/autotest/gdrivers/rik.py
+++ b/autotest/gdrivers/rik.py
@@ -34,6 +34,7 @@
 
 
 import gdaltest
+import pytest
 
 ###############################################################################
 # Test a RIK map
@@ -43,10 +44,10 @@
 def test_rik_online_1():
 
     if gdal.GetDriverByName('RIK') is None:
-        return 'skip'
+        pytest.skip()
 
     if not gdaltest.download_file('http://www.lantmateriet.se/upload/filer/kartor/programvaror/sverige500_swe99.zip', 'sverige500_swe99.zip'):
-        return 'skip'
+        pytest.skip()
 
     try:
         os.stat('tmp/cache/sverige500_swe99.rik')
@@ -61,7 +62,7 @@ def test_rik_online_1():
             outfile.close()
             file_to_test = 'tmp/cache/sverige500_swe99.rik'
         except OSError:
-            return 'skip'
+            pytest.skip()
 
     tst = gdaltest.GDALTest('RIK', file_to_test, 1, 17162, filename_absolute=1)
     return tst.testOpen()
@@ -73,10 +74,10 @@ def test_rik_online_1():
 def test_rik_online_2():
 
     if gdal.GetDriverByName('RIK') is None:
-        return 'skip'
+        pytest.skip()
 
     if not gdaltest.download_file('http://trac.osgeo.org/gdal/raw-attachment/ticket/3674/ab-del.rik', 'ab-del.rik'):
-        return 'skip'
+        pytest.skip()
 
     tst = gdaltest.GDALTest('RIK', 'tmp/cache/ab-del.rik', 1, 44974, filename_absolute=1)
     return tst.testOpen()
diff --git a/autotest/gdrivers/rl2.py b/autotest/gdrivers/rl2.py
index c8b35c829cf8..7cc2cc60528a 100755
--- a/autotest/gdrivers/rl2.py
+++ b/autotest/gdrivers/rl2.py
@@ -34,6 +34,7 @@
 
 
 import gdaltest
+import pytest
 
 ###############################################################################
 # Get the rl2 driver
@@ -43,10 +44,10 @@ def test_rl2_1():
 
     gdaltest.rl2_drv = gdal.GetDriverByName('SQLite')
     if gdaltest.rl2_drv is None:
-        return 'skip'
+        pytest.skip()
     if gdaltest.rl2_drv.GetMetadataItem('DCAP_RASTER') is None:
         gdaltest.rl2_drv = None
-        return 'skip'
+        pytest.skip()
 
     return 'success'
 
@@ -57,7 +58,7 @@ def test_rl2_1():
 def test_rl2_2():
 
     if gdaltest.rl2_drv is None:
-        return 'skip'
+        pytest.skip()
 
     ds = gdal.Open('data/byte.rl2')
 
@@ -104,7 +105,7 @@ def test_rl2_2():
 def test_rl2_3():
 
     if gdaltest.rl2_drv is None:
-        return 'skip'
+        pytest.skip()
 
     ds = gdal.Open('data/small_world.rl2')
 
@@ -146,7 +147,7 @@ def test_rl2_3():
 def test_rl2_4():
 
     if gdaltest.rl2_drv is None:
-        return 'skip'
+        pytest.skip()
 
     ds = gdal.Open('data/small_world_pct.rl2')
 
@@ -174,7 +175,7 @@ def test_rl2_4():
 def test_rl2_5():
 
     if gdaltest.rl2_drv is None:
-        return 'skip'
+        pytest.skip()
 
     ds = gdal.Open('data/multi_type.rl2')
 
@@ -208,7 +209,7 @@ def test_rl2_5():
 def test_rl2_6():
 
     if gdaltest.rl2_drv is None:
-        return 'skip'
+        pytest.skip()
 
     tst = gdaltest.GDALTest('SQLite', 'byte.tif', 1, 4672)
     return tst.testCreateCopy(vsimem=1, check_minmax=False)
@@ -220,7 +221,7 @@ def test_rl2_6():
 def test_rl2_7():
 
     if gdaltest.rl2_drv is None:
-        return 'skip'
+        pytest.skip()
 
     tst = gdaltest.GDALTest('SQLite', 'small_world.tif', 1, 30111, options=['COMPRESS=PNG'])
     return tst.testCreateCopy(vsimem=1)
@@ -232,7 +233,7 @@ def test_rl2_7():
 def test_rl2_8():
 
     if gdaltest.rl2_drv is None:
-        return 'skip'
+        pytest.skip()
 
     tst = gdaltest.GDALTest('SQLite', 'small_world_pct.tif', 1, 14890, options=['COMPRESS=PNG'])
     return tst.testCreateCopy(vsimem=1, check_minmax=False)
@@ -244,7 +245,7 @@ def test_rl2_8():
 def test_rl2_9():
 
     if gdaltest.rl2_drv is None:
-        return 'skip'
+        pytest.skip()
 
     tst = gdaltest.GDALTest('SQLite', '../../gcore/data/uint16.tif', 1, 4672)
     return tst.testCreateCopy(vsimem=1)
@@ -256,7 +257,7 @@ def test_rl2_9():
 def test_rl2_10():
 
     if gdaltest.rl2_drv is None:
-        return 'skip'
+        pytest.skip()
 
     tst = gdaltest.GDALTest('SQLite', '../../gcore/data/int16.tif', 1, 4672)
     return tst.testCreateCopy(vsimem=1)
@@ -268,7 +269,7 @@ def test_rl2_10():
 def test_rl2_11():
 
     if gdaltest.rl2_drv is None:
-        return 'skip'
+        pytest.skip()
 
     tst = gdaltest.GDALTest('SQLite', '../../gcore/data/uint32.tif', 1, 4672)
     return tst.testCreateCopy(vsimem=1)
@@ -280,7 +281,7 @@ def test_rl2_11():
 def test_rl2_12():
 
     if gdaltest.rl2_drv is None:
-        return 'skip'
+        pytest.skip()
 
     tst = gdaltest.GDALTest('SQLite', '../../gcore/data/int32.tif', 1, 4672)
     return tst.testCreateCopy(vsimem=1)
@@ -292,7 +293,7 @@ def test_rl2_12():
 def test_rl2_13():
 
     if gdaltest.rl2_drv is None:
-        return 'skip'
+        pytest.skip()
 
     tst = gdaltest.GDALTest('SQLite', '../../gcore/data/float32.tif', 1, 4672)
     return tst.testCreateCopy(vsimem=1)
@@ -304,7 +305,7 @@ def test_rl2_13():
 def test_rl2_14():
 
     if gdaltest.rl2_drv is None:
-        return 'skip'
+        pytest.skip()
 
     tst = gdaltest.GDALTest('SQLite', '../../gcore/data/float64.tif', 1, 4672)
     return tst.testCreateCopy(vsimem=1)
@@ -316,7 +317,7 @@ def test_rl2_14():
 def test_rl2_15():
 
     if gdaltest.rl2_drv is None:
-        return 'skip'
+        pytest.skip()
 
     tst = gdaltest.GDALTest('SQLite', '../../gcore/data/1bit.bmp', 1, 200)
     return tst.testCreateCopy(vsimem=1, check_minmax=False)
@@ -328,7 +329,7 @@ def test_rl2_15():
 def test_rl2_16():
 
     if gdaltest.rl2_drv is None:
-        return 'skip'
+        pytest.skip()
 
     tst = gdaltest.GDALTest('SQLite', 'byte.tif', 1, 4873, options=['NBITS=1', 'COMPRESS=CCITTFAX4'])
     return tst.testCreateCopy(vsimem=1, check_minmax=False)
@@ -340,7 +341,7 @@ def test_rl2_16():
 def test_rl2_17():
 
     if gdaltest.rl2_drv is None:
-        return 'skip'
+        pytest.skip()
 
     tst = gdaltest.GDALTest('SQLite', 'byte.tif', 1, 4873, options=['NBITS=2', 'COMPRESS=DEFLATE'])
     return tst.testCreateCopy(vsimem=1, check_minmax=False)
@@ -352,7 +353,7 @@ def test_rl2_17():
 def test_rl2_18():
 
     if gdaltest.rl2_drv is None:
-        return 'skip'
+        pytest.skip()
 
     tst = gdaltest.GDALTest('SQLite', 'byte.tif', 1, 2541, options=['NBITS=4'])
     return tst.testCreateCopy(vsimem=1, check_minmax=False)
@@ -364,7 +365,7 @@ def test_rl2_18():
 def test_rl2_19():
 
     if gdaltest.rl2_drv is None:
-        return 'skip'
+        pytest.skip()
 
     tst = gdaltest.GDALTest('SQLite', 'byte.tif', 1, 4873, options=['PIXEL_TYPE=MONOCHROME'])
     return tst.testCreateCopy(vsimem=1, check_minmax=False)
@@ -377,7 +378,7 @@ def test_rl2_19():
 def test_rl2_20():
 
     if gdaltest.rl2_drv is None:
-        return 'skip'
+        pytest.skip()
 
     tests = [('MONOCHROME', 2, gdal.GDT_Byte, 'NONE', None, None),
              ('MONOCHROME', 1, gdal.GDT_UInt16, 'NONE', None, None),
@@ -426,7 +427,7 @@ def test_rl2_20():
 def test_rl2_21():
 
     if gdaltest.rl2_drv is None:
-        return 'skip'
+        pytest.skip()
 
     tests = [('DEFLATE', None),
              ('LZMA', None),
@@ -469,7 +470,7 @@ def test_rl2_21():
 def test_rl2_22():
 
     if gdaltest.rl2_drv is None:
-        return 'skip'
+        pytest.skip()
 
     src_ds = gdal.Open('data/byte.tif')
 
@@ -506,7 +507,7 @@ def test_rl2_22():
 def test_rl2_23():
 
     if gdaltest.rl2_drv is None:
-        return 'skip'
+        pytest.skip()
 
     src_ds = gdal.Open('data/byte.tif')
     src_ds = gdal.Translate('', src_ds, format='MEM', width=2048, height=2048)
@@ -533,10 +534,10 @@ def test_rl2_23():
 def test_rl2_24():
 
     if gdaltest.rl2_drv is None:
-        return 'skip'
+        pytest.skip()
 
     if gdal.GetDriverByName('SQLite').GetMetadataItem("ENABLE_SQL_SQLITE_FORMAT") != 'YES':
-        return 'skip'
+        pytest.skip()
 
     ds = gdal.Open('data/byte.rl2.sql')
     assert ds.GetRasterBand(1).Checksum() == 4672, 'validation failed'
@@ -549,7 +550,7 @@ def test_rl2_24():
 def test_rl2_error_create():
 
     if gdaltest.rl2_drv is None:
-        return 'skip'
+        pytest.skip()
 
     with gdaltest.error_handler():
         assert gdaltest.rl2_drv.Create('/vsimem/out.db', 1, 1) is None
diff --git a/autotest/gdrivers/rmf.py b/autotest/gdrivers/rmf.py
index 8312b58f7dd3..53189a7ce956 100755
--- a/autotest/gdrivers/rmf.py
+++ b/autotest/gdrivers/rmf.py
@@ -35,6 +35,7 @@
 import gdaltest
 from osgeo import gdal
 from osgeo import osr
+import pytest
 
 ###############################################################################
 # Perform simple read tests.
@@ -168,14 +169,12 @@ def test_rmf_11():
         if ovr_band.XSize != ovr_size[i] or ovr_band.YSize != ovr_size[i]:
             msg = 'overview wrong size: overview %d, size = %d * %d,' % \
                   (i, ovr_band.XSize, ovr_band.YSize)
-            gdaltest.post_reason(msg)
-            return 'fail'
+            pytest.fail(msg)
 
         if ovr_band.Checksum() != ovr_checksum[i]:
             msg = 'overview wrong checksum: overview %d, checksum = %d,' % \
                   (i, ovr_band.Checksum())
-            gdaltest.post_reason(msg)
-            return 'fail'
+            pytest.fail(msg)
 
     return 'success'
 
@@ -260,14 +259,12 @@ def rmf_build_ov(source, testid, options, ov_sizes, crs, reopen=False, pass_coun
                    ovr_band.YSize != ov_sizes[iOverview][1]:
                     msg = 'overview wrong size: band %d, overview %d, size = %d * %d,' % \
                           (iBand, iOverview, ovr_band.XSize, ovr_band.YSize)
-                    gdaltest.post_reason(msg)
-                    return 'fail'
+                    pytest.fail(msg)
 
                 if ovr_band.Checksum() != crs[iOverview][iBand]:
                     msg = 'overview wrong checksum: band %d, overview %d, checksum = %d,' % \
                           (iBand, iOverview, ovr_band.Checksum())
-                    gdaltest.post_reason(msg)
-                    return 'fail'
+                    pytest.fail(msg)
 
     src_ds = None
     os.remove(test_ds_name)
@@ -508,7 +505,7 @@ def test_rmf_26():
 def test_rmf_27():
 
     if gdal.GetDriverByName('JPEG') is None:
-        return 'skip'
+        pytest.skip()
 
     cs1 = [50553, 27604, 36652] #
     cs2 = [51009, 27640, 37765] # osx, clang
@@ -667,11 +664,11 @@ def test_rmf_31e():
     try:
         import numpy
     except ImportError:
-        return 'skip'
+        pytest.skip()
 
     drv = gdal.GetDriverByName('Gtiff')
     if drv is None:
-        return 'skip'
+        pytest.skip()
     # Create test data
     stripeSize = 32;
     sx = 256
diff --git a/autotest/gdrivers/sar_ceos.py b/autotest/gdrivers/sar_ceos.py
index 67e22f007720..f9085f964c4e 100755
--- a/autotest/gdrivers/sar_ceos.py
+++ b/autotest/gdrivers/sar_ceos.py
@@ -32,6 +32,7 @@
 
 
 import gdaltest
+import pytest
 
 ###############################################################################
 
@@ -45,7 +46,7 @@ def test_sar_ceos_online_1():
 
     for filename in list_files:
         if not gdaltest.download_file('http://download.osgeo.org/gdal/data/ceos/' + filename, filename):
-            return 'skip'
+            pytest.skip()
 
     tst = gdaltest.GDALTest('SAR_CEOS', 'tmp/cache/ottawa_patch.img', 1, 23026, filename_absolute=1)
     return tst.testOpen()
diff --git a/autotest/gdrivers/sentinel2.py b/autotest/gdrivers/sentinel2.py
index cae88f102aaf..aea7bf85fdc4 100755
--- a/autotest/gdrivers/sentinel2.py
+++ b/autotest/gdrivers/sentinel2.py
@@ -35,6 +35,7 @@
 
 
 import gdaltest
+import pytest
 
 ###############################################################################
 # Test opening a L1C product
@@ -79,7 +80,7 @@ def test_sentinel2_l1c_1():
     if got_md != expected_md:
         import pprint
         pprint.pprint(got_md)
-        return 'fail'
+        pytest.fail()
 
     expected_md = {'SUBDATASET_1_DESC': 'Bands B2, B3, B4, B8 with 10m resolution, UTM 32N',
                    'SUBDATASET_1_NAME': 'SENTINEL2_L1C:data/fake_sentinel2_l1c/S2A_OPER_PRD_MSIL1C.SAFE/S2A_OPER_MTD_SAFL1C.xml:10m:EPSG_32632',
@@ -93,7 +94,7 @@ def test_sentinel2_l1c_1():
     if got_md != expected_md:
         import pprint
         pprint.pprint(got_md)
-        return 'fail'
+        pytest.fail()
 
     # Try opening a zip file as distributed from https://scihub.esa.int/
     if not sys.platform.startswith('win'):
@@ -168,7 +169,7 @@ def test_sentinel2_l1c_2():
     if got_md != expected_md:
         import pprint
         pprint.pprint(got_md)
-        return 'fail'
+        pytest.fail()
 
     assert ds.RasterXSize == 20984 and ds.RasterYSize == 20980
 
@@ -210,7 +211,7 @@ def test_sentinel2_l1c_2():
     if got_md != expected_md:
         import pprint
         pprint.pprint(got_md)
-        return 'fail'
+        pytest.fail()
 
     assert band.GetColorInterpretation() == gdal.GCI_RedBand
 
@@ -233,7 +234,7 @@ def test_sentinel2_l1c_2():
     if got_md != expected_md:
         import pprint
         pprint.pprint(got_md)
-        return 'fail'
+        pytest.fail()
 
     return 'success'
 
@@ -278,7 +279,7 @@ def test_sentinel2_l1c_4():
     if len(fl) != 1 + 2 + 2:
         import pprint
         pprint.pprint(fl)
-        return 'fail'
+        pytest.fail()
 
     band = ds.GetRasterBand(1)
     assert band.GetColorInterpretation() == gdal.GCI_RedBand
@@ -467,7 +468,7 @@ def test_sentinel2_l1c_5():
 def test_sentinel2_l1c_6():
 
     if sys.platform != 'win32':
-        return 'skip'
+        pytest.skip()
 
     filename_xml = 'data/fake_sentinel2_l1c/S2A_OPER_PRD_MSIL1C.SAFE/S2A_OPER_MTD_SAFL1C.xml'
     filename_xml = filename_xml.replace('/', '\\')
@@ -601,7 +602,7 @@ def test_sentinel2_l1c_tile_1():
     if got_md != expected_md:
         import pprint
         pprint.pprint(got_md)
-        return 'fail'
+        pytest.fail()
 
     expected_md = {'SUBDATASET_1_DESC': 'Bands B2, B3, B4, B8 with 10m resolution',
                    'SUBDATASET_1_NAME': 'SENTINEL2_L1C_TILE:data/fake_sentinel2_l1c/S2A_OPER_PRD_MSIL1C.SAFE/GRANULE/S2A_OPER_MSI_L1C_T32TQR_N01.03/S2A_OPER_MTD_L1C_T32TQR.xml:10m',
@@ -615,7 +616,7 @@ def test_sentinel2_l1c_tile_1():
     if got_md != expected_md:
         import pprint
         pprint.pprint(got_md)
-        return 'fail'
+        pytest.fail()
 
     # Try opening the 4 subdatasets
     for i in range(4):
@@ -658,7 +659,7 @@ def test_sentinel2_l1c_tile_2():
     if got_md != expected_md:
         import pprint
         pprint.pprint(got_md)
-        return 'fail'
+        pytest.fail()
 
     expected_md = {'SUBDATASET_1_DESC': 'Bands B2, B3, B4, B8 with 10m resolution',
                    'SUBDATASET_1_NAME': 'SENTINEL2_L1C_TILE:data/fake_sentinel2_l1c/S2A_OPER_PRD_MSIL1C.SAFE/GRANULE/S2A_OPER_MSI_L1C_T32TQR_N01.03/S2A_OPER_MTD_L1C_T32TQR.xml:10m',
@@ -672,7 +673,7 @@ def test_sentinel2_l1c_tile_2():
     if got_md != expected_md:
         import pprint
         pprint.pprint(got_md)
-        return 'fail'
+        pytest.fail()
 
     return 'success'
 
@@ -722,7 +723,7 @@ def test_sentinel2_l1c_tile_3():
     if got_md != expected_md:
         import pprint
         pprint.pprint(got_md)
-        return 'fail'
+        pytest.fail()
 
     assert ds.RasterXSize == 10980 and ds.RasterYSize == 10980
 
@@ -757,7 +758,7 @@ def test_sentinel2_l1c_tile_3():
     if got_md != expected_md:
         import pprint
         pprint.pprint(got_md)
-        return 'fail'
+        pytest.fail()
 
     assert band.GetColorInterpretation() == gdal.GCI_RedBand
 
@@ -780,7 +781,7 @@ def test_sentinel2_l1c_tile_3():
     if got_md != expected_md:
         import pprint
         pprint.pprint(got_md)
-        return 'fail'
+        pytest.fail()
 
     return 'success'
 
@@ -807,7 +808,7 @@ def test_sentinel2_l1c_tile_4():
     if got_md != expected_md:
         import pprint
         pprint.pprint(got_md)
-        return 'fail'
+        pytest.fail()
 
     assert ds.RasterXSize == 10980 and ds.RasterYSize == 10980
 
@@ -840,7 +841,7 @@ def test_sentinel2_l1c_tile_4():
     if got_md != expected_md:
         import pprint
         pprint.pprint(got_md)
-        return 'fail'
+        pytest.fail()
 
     assert band.GetColorInterpretation() == gdal.GCI_RedBand
 
@@ -982,7 +983,7 @@ def test_sentinel2_l1b_1():
     if got_md != expected_md:
         import pprint
         pprint.pprint(got_md)
-        return 'fail'
+        pytest.fail()
 
     expected_md = {'SUBDATASET_1_DESC': 'Bands B2, B3, B4, B8 of granule S2B_OPER_MTD_L1B.xml with 10m resolution',
                    'SUBDATASET_1_NAME': 'SENTINEL2_L1B:data/fake_sentinel2_l1b/S2B_OPER_PRD_MSIL1B.SAFE/GRANULE/S2B_OPER_MSI_L1B_N01.03/S2B_OPER_MTD_L1B.xml:10m',
@@ -994,7 +995,7 @@ def test_sentinel2_l1b_1():
     if got_md != expected_md:
         import pprint
         pprint.pprint(got_md)
-        return 'fail'
+        pytest.fail()
 
     # Try opening the 3 subdatasets
     for i in range(3):
@@ -1064,7 +1065,7 @@ def test_sentinel2_l1b_2():
     if got_md != expected_md:
         import pprint
         pprint.pprint(got_md)
-        return 'fail'
+        pytest.fail()
 
     subdatasets_md = {'SUBDATASET_1_DESC': 'Bands B2, B3, B4, B8 with 10m resolution',
                       'SUBDATASET_1_NAME': 'SENTINEL2_L1B:data/fake_sentinel2_l1b/S2B_OPER_PRD_MSIL1B.SAFE/GRANULE/S2B_OPER_MSI_L1B_N01.03/S2B_OPER_MTD_L1B.xml:10m',
@@ -1076,7 +1077,7 @@ def test_sentinel2_l1b_2():
     if got_md != subdatasets_md:
         import pprint
         pprint.pprint(got_md)
-        return 'fail'
+        pytest.fail()
 
     cwd = os.getcwd()
     gdal.ErrorReset()
@@ -1090,7 +1091,7 @@ def test_sentinel2_l1b_2():
     if got_md != expected_md:
         import pprint
         pprint.pprint(got_md)
-        return 'fail'
+        pytest.fail()
 
     return 'success'
 
@@ -1142,7 +1143,7 @@ def test_sentinel2_l1b_3():
     if got_md != expected_md:
         import pprint
         pprint.pprint(got_md)
-        return 'fail'
+        pytest.fail()
 
     assert ds.RasterXSize == 1276 and ds.RasterYSize == 384
 
@@ -1205,7 +1206,7 @@ def test_sentinel2_l1b_3():
     if got_md != expected_md:
         import pprint
         pprint.pprint(got_md)
-        return 'fail'
+        pytest.fail()
 
     assert band.DataType == gdal.GDT_UInt16
 
@@ -1305,7 +1306,7 @@ def test_sentinel2_l1b_4():
     if got_md != expected_md:
         import pprint
         pprint.pprint(got_md)
-        return 'fail'
+        pytest.fail()
     ds = None
 
     ds = gdal.OpenEx('SENTINEL2_L1B:/vsimem/foo/GRANULE/S2B_OPER_MTD_L1B_N01.03/S2B_OPER_MTD_L1B.xml:60m', open_options=['ALPHA=YES'])
@@ -1554,7 +1555,7 @@ def test_sentinel2_l2a_1():
     if got_md != expected_md:
         import pprint
         pprint.pprint(got_md)
-        return 'fail'
+        pytest.fail()
 
     expected_md = {'SUBDATASET_1_DESC': 'Bands B1, B2, B3, B4, B5, B6, B7, B9, B10, B11, B12, B8A, AOT, CLD, SCL, SNW, WVP with 60m resolution, UTM 32N',
                    'SUBDATASET_1_NAME': 'SENTINEL2_L2A:data/fake_sentinel2_l2a/S2A_USER_PRD_MSIL2A.SAFE/S2A_USER_MTD_SAFL2A.xml:60m:EPSG_32632',
@@ -1564,7 +1565,7 @@ def test_sentinel2_l2a_1():
     if got_md != expected_md:
         import pprint
         pprint.pprint(got_md)
-        return 'fail'
+        pytest.fail()
 
     # Try opening the 4 subdatasets
     for i in range(2):
@@ -1653,7 +1654,7 @@ def test_sentinel2_l2a_2():
     if got_md != expected_md:
         import pprint
         pprint.pprint(got_md)
-        return 'fail'
+        pytest.fail()
 
     assert ds.RasterXSize == 1830 and ds.RasterYSize == 1830
 
@@ -1688,7 +1689,7 @@ def test_sentinel2_l2a_2():
     if got_md != expected_md:
         import pprint
         pprint.pprint(got_md)
-        return 'fail'
+        pytest.fail()
 
     assert band.DataType == gdal.GDT_UInt16
 
@@ -1701,7 +1702,7 @@ def test_sentinel2_l2a_2():
     if got_md != expected_md:
         import pprint
         pprint.pprint(got_md)
-        return 'fail'
+        pytest.fail()
 
     scl_band = 0
     for i in range(ds.RasterCount):
@@ -1725,7 +1726,7 @@ def test_sentinel2_l2a_2():
     if got_categories != expected_categories:
         import pprint
         pprint.pprint(got_categories)
-        return 'fail'
+        pytest.fail()
 
     return 'success'
 
@@ -1865,7 +1866,7 @@ def test_sentinel2_l2a_4():
     if got_md != expected_md:
         import pprint
         pprint.pprint(got_md)
-        return 'fail'
+        pytest.fail()
 
     expected_md = {
                     'SUBDATASET_1_DESC':
@@ -1888,7 +1889,7 @@ def test_sentinel2_l2a_4():
     if got_md != expected_md:
         import pprint
         pprint.pprint(got_md)
-        return 'fail'
+        pytest.fail()
 
     # Try opening the 4 subdatasets
     for i in range(2):
@@ -1977,7 +1978,7 @@ def test_sentinel2_l2a_5():
     if got_md != expected_md:
         import pprint
         pprint.pprint(got_md)
-        return 'fail'
+        pytest.fail()
 
     assert ds.RasterXSize == 1830 and ds.RasterYSize == 1830
 
@@ -2012,7 +2013,7 @@ def test_sentinel2_l2a_5():
     if got_md != expected_md:
         import pprint
         pprint.pprint(got_md)
-        return 'fail'
+        pytest.fail()
 
     assert band.DataType == gdal.GDT_UInt16
 
@@ -2087,7 +2088,7 @@ def test_sentinel2_l2a_6():
     if got_md != expected_md:
         import pprint
         pprint.pprint(got_md)
-        return 'fail'
+        pytest.fail()
 
     expected_md = {
                     'SUBDATASET_1_DESC':
@@ -2110,7 +2111,7 @@ def test_sentinel2_l2a_6():
     if got_md != expected_md:
         import pprint
         pprint.pprint(got_md)
-        return 'fail'
+        pytest.fail()
 
     # Try opening the 4 subdatasets
     for i in range(2):
@@ -2204,7 +2205,7 @@ def test_sentinel2_l2a_7():
     if got_md != expected_md:
         import pprint
         pprint.pprint(got_md)
-        return 'fail'
+        pytest.fail()
 
     assert ds.RasterXSize == 1830 and ds.RasterYSize == 1830
 
@@ -2239,7 +2240,7 @@ def test_sentinel2_l2a_7():
     if got_md != expected_md:
         import pprint
         pprint.pprint(got_md)
-        return 'fail'
+        pytest.fail()
 
     assert band.DataType == gdal.GDT_UInt16
 
@@ -2289,7 +2290,7 @@ def test_sentinel2_l1c_safe_compact_1():
     if got_md != expected_md:
         import pprint
         pprint.pprint(got_md)
-        return 'fail'
+        pytest.fail()
 
     expected_md = {'SUBDATASET_1_DESC': 'Bands B2, B3, B4, B8 with 10m resolution, UTM 32N',
                    'SUBDATASET_1_NAME': 'SENTINEL2_L1C:data/fake_sentinel2_l1c_safecompact/S2A_MSIL1C_test.SAFE/MTD_MSIL1C.xml:10m:EPSG_32632',
@@ -2303,7 +2304,7 @@ def test_sentinel2_l1c_safe_compact_1():
     if got_md != expected_md:
         import pprint
         pprint.pprint(got_md)
-        return 'fail'
+        pytest.fail()
 
     # Try opening the 4 subdatasets
     for i in range(4):
@@ -2378,7 +2379,7 @@ def test_sentinel2_l1c_safe_compact_2():
     if got_md != expected_md:
         import pprint
         pprint.pprint(got_md)
-        return 'fail'
+        pytest.fail()
 
     assert ds.RasterXSize == 10980 and ds.RasterYSize == 10980
 
@@ -2414,7 +2415,7 @@ def test_sentinel2_l1c_safe_compact_2():
     if got_md != expected_md:
         import pprint
         pprint.pprint(got_md)
-        return 'fail'
+        pytest.fail()
 
     assert band.GetColorInterpretation() == gdal.GCI_RedBand
 
@@ -2437,7 +2438,7 @@ def test_sentinel2_l1c_safe_compact_2():
     if got_md != expected_md:
         import pprint
         pprint.pprint(got_md)
-        return 'fail'
+        pytest.fail()
 
     return 'success'
 
@@ -2458,7 +2459,7 @@ def test_sentinel2_l1c_safe_compact_3():
     if len(fl) != 1 + 1 + 1:
         import pprint
         pprint.pprint(fl)
-        return 'fail'
+        pytest.fail()
 
     band = ds.GetRasterBand(1)
     assert band.GetColorInterpretation() == gdal.GCI_RedBand
diff --git a/autotest/gdrivers/srtmhgt.py b/autotest/gdrivers/srtmhgt.py
index 687d5450c499..7e3f017547a6 100755
--- a/autotest/gdrivers/srtmhgt.py
+++ b/autotest/gdrivers/srtmhgt.py
@@ -35,6 +35,7 @@
 
 
 import gdaltest
+import pytest
 
 
 ###############################################################################
@@ -127,7 +128,7 @@ def test_srtmhgt_4():
 
     f = gdal.VSIFOpenL('/vsizip//vsimem/N43W080.SRTMSWBD.raw.zip/N43W080.raw', 'wb')
     if f is None:
-        return 'skip'
+        pytest.skip()
     gdal.VSIFWriteL(' ' * (3601 * 3601), 1, 3601 * 3601, f)
     gdal.VSIFCloseL(f)
 
diff --git a/autotest/gdrivers/test_validate_jp2.py b/autotest/gdrivers/test_validate_jp2.py
index ce42759dda6a..e0a79bacef14 100755
--- a/autotest/gdrivers/test_validate_jp2.py
+++ b/autotest/gdrivers/test_validate_jp2.py
@@ -32,6 +32,7 @@
 import os
 import sys
 from osgeo import gdal
+import pytest
 
 sys.path.append('../../gdal/swig/python/samples')
 
@@ -46,7 +47,7 @@ def test_validate_jp2_1():
     gdaltest.has_validate_jp2_and_build_jp2 = False
     gdaltest.jp2openjpeg_drv = gdal.GetDriverByName('JP2OpenJPEG')
     if gdaltest.jp2openjpeg_drv is None:
-        return 'skip'
+        pytest.skip()
 
     try:
         import validate_jp2
@@ -54,7 +55,7 @@ def test_validate_jp2_1():
         validate_jp2.validate
         build_jp2_from_xml.build_file
     except (ImportError, AttributeError):
-        return 'skip'
+        pytest.skip()
 
     gdaltest.has_validate_jp2_and_build_jp2 = True
     gdaltest.deregister_all_jpeg2000_drivers_but('JP2OpenJPEG')
@@ -90,7 +91,7 @@ def validate(filename, inspire_tg=True, expected_gmljp2=True, oidoc=None):
 def test_validate_jp2_2():
 
     if not gdaltest.has_validate_jp2_and_build_jp2:
-        return 'skip'
+        pytest.skip()
 
     import build_jp2_from_xml
 
@@ -127,11 +128,10 @@ def test_validate_jp2_2():
                        'ERROR[PROFILE_1, Conformance class A.8.14]: SPcod_xcb_minus_2 = 5, whereas max allowed for Profile 1 is 4']
 
     if error_report.error_array != expected_errors:
-        gdaltest.post_reason('did not get expected errors')
         import pprint
         pp = pprint.PrettyPrinter()
         pp.pprint(error_report.error_array)
-        return 'fail'
+        pytest.fail('did not get expected errors')
 
     expected_warnings = [
         'WARNING[GENERAL]: Unknown value 1 for colr.PREC',
@@ -143,11 +143,10 @@ def test_validate_jp2_2():
         'WARNING[INSPIRE_TG, Recommendation 39]: No user-defined precincts 0 defined'
     ]
     if error_report.warning_array != expected_warnings:
-        gdaltest.post_reason('did not get expected errors')
         import pprint
         pp = pprint.PrettyPrinter()
         pp.pprint(error_report.warning_array)
-        return 'fail'
+        pytest.fail('did not get expected errors')
 
     return 'success'
 
@@ -158,7 +157,7 @@ def test_validate_jp2_2():
 def test_validate_jp2_3():
 
     if not gdaltest.has_validate_jp2_and_build_jp2:
-        return 'skip'
+        pytest.skip()
 
     import build_jp2_from_xml
 
@@ -189,22 +188,20 @@ def test_validate_jp2_3():
                        'ERROR[PROFILE_1, Conformance class A.8.14]: Not enough decomposition levels = 0 (max_dim=162, 128 * 2**SPcod_NumDecompositions=128)']
 
     if error_report.error_array != expected_errors:
-        gdaltest.post_reason('did not get expected errors')
         import pprint
         pp = pprint.PrettyPrinter()
         pp.pprint(error_report.error_array)
-        return 'fail'
+        pytest.fail('did not get expected errors')
 
     expected_warnings = [
         'WARNING[INSPIRE_TG, Recommendation 38]: Bit depth of alpha channel should be 1 (BPCC 0), but its BPCC is 7',
         'WARNING[INSPIRE_TG, Recommendation 38]: Bit depth of alpha channel should be 1 (BPCC 0), but its BPCC is 7'
     ]
     if error_report.warning_array != expected_warnings:
-        gdaltest.post_reason('did not get expected errors')
         import pprint
         pp = pprint.PrettyPrinter()
         pp.pprint(error_report.warning_array)
-        return 'fail'
+        pytest.fail('did not get expected errors')
 
     return 'success'
 
@@ -215,7 +212,7 @@ def test_validate_jp2_3():
 def test_validate_jp2_4():
 
     if not gdaltest.has_validate_jp2_and_build_jp2:
-        return 'skip'
+        pytest.skip()
 
     import build_jp2_from_xml
 
@@ -235,20 +232,18 @@ def test_validate_jp2_4():
         'ERROR[GENERAL]: No EOC marker found']
 
     if error_report.error_array != expected_errors:
-        gdaltest.post_reason('did not get expected errors')
         import pprint
         pp = pprint.PrettyPrinter()
         pp.pprint(error_report.error_array)
-        return 'fail'
+        pytest.fail('did not get expected errors')
 
     expected_warnings = [
     ]
     if error_report.warning_array != expected_warnings:
-        gdaltest.post_reason('did not get expected errors')
         import pprint
         pp = pprint.PrettyPrinter()
         pp.pprint(error_report.warning_array)
-        return 'fail'
+        pytest.fail('did not get expected errors')
 
     return 'success'
 
@@ -260,7 +255,7 @@ def test_validate_jp2_4():
 def test_validate_jp2_5():
 
     if not gdaltest.has_validate_jp2_and_build_jp2:
-        return 'skip'
+        pytest.skip()
 
     import build_jp2_from_xml
 
@@ -283,20 +278,18 @@ def test_validate_jp2_5():
         'ERROR[INSPIRE_TG, Requirement 26, Conformance class A.8.16]: RGN marker found, which is not allowed']
 
     if error_report.error_array != expected_errors:
-        gdaltest.post_reason('did not get expected errors')
         import pprint
         pp = pprint.PrettyPrinter()
         pp.pprint(error_report.error_array)
-        return 'fail'
+        pytest.fail('did not get expected errors')
 
     expected_warnings = [
     ]
     if error_report.warning_array != expected_warnings:
-        gdaltest.post_reason('did not get expected errors')
         import pprint
         pp = pprint.PrettyPrinter()
         pp.pprint(error_report.warning_array)
-        return 'fail'
+        pytest.fail('did not get expected errors')
 
     return 'success'
 
@@ -307,26 +300,24 @@ def test_validate_jp2_5():
 def test_validate_jp2_6():
 
     if not gdaltest.has_validate_jp2_and_build_jp2:
-        return 'skip'
+        pytest.skip()
 
     error_report = validate('data/test_validate_jp2/byte.jp2', oidoc='data/test_validate_jp2/byte_oi.xml')
     gdal.Unlink('/vsimem/out.jp2')
 
     expected_errors = []
     if error_report.error_array != expected_errors:
-        gdaltest.post_reason('did not get expected errors')
         import pprint
         pp = pprint.PrettyPrinter()
         pp.pprint(error_report.error_array)
-        return 'fail'
+        pytest.fail('did not get expected errors')
 
     expected_warnings = []
     if error_report.warning_array != expected_warnings:
-        gdaltest.post_reason('did not get expected errors')
         import pprint
         pp = pprint.PrettyPrinter()
         pp.pprint(error_report.warning_array)
-        return 'fail'
+        pytest.fail('did not get expected errors')
 
     return 'success'
 
@@ -337,26 +328,24 @@ def test_validate_jp2_6():
 def test_validate_jp2_7():
 
     if not gdaltest.has_validate_jp2_and_build_jp2:
-        return 'skip'
+        pytest.skip()
 
     error_report = validate('data/test_validate_jp2/stefan_full_rgba.jp2', oidoc='data/test_validate_jp2/stefan_full_rgba_oi.xml', expected_gmljp2=False)
     gdal.Unlink('/vsimem/out.jp2')
 
     expected_errors = []
     if error_report.error_array != expected_errors:
-        gdaltest.post_reason('did not get expected errors')
         import pprint
         pp = pprint.PrettyPrinter()
         pp.pprint(error_report.error_array)
-        return 'fail'
+        pytest.fail('did not get expected errors')
 
     expected_warnings = []
     if error_report.warning_array != expected_warnings:
-        gdaltest.post_reason('did not get expected errors')
         import pprint
         pp = pprint.PrettyPrinter()
         pp.pprint(error_report.warning_array)
-        return 'fail'
+        pytest.fail('did not get expected errors')
 
     return 'success'
 
@@ -367,26 +356,24 @@ def test_validate_jp2_7():
 def test_validate_jp2_8():
 
     if not gdaltest.has_validate_jp2_and_build_jp2:
-        return 'skip'
+        pytest.skip()
 
     error_report = validate('data/test_validate_jp2/utmsmall_pct.jp2', oidoc='data/test_validate_jp2/utmsmall_pct_oi.xml')
     gdal.Unlink('/vsimem/out.jp2')
 
     expected_errors = []
     if error_report.error_array != expected_errors:
-        gdaltest.post_reason('did not get expected errors')
         import pprint
         pp = pprint.PrettyPrinter()
         pp.pprint(error_report.error_array)
-        return 'fail'
+        pytest.fail('did not get expected errors')
 
     expected_warnings = []
     if error_report.warning_array != expected_warnings:
-        gdaltest.post_reason('did not get expected errors')
         import pprint
         pp = pprint.PrettyPrinter()
         pp.pprint(error_report.warning_array)
-        return 'fail'
+        pytest.fail('did not get expected errors')
 
     return 'success'
 
diff --git a/autotest/gdrivers/tiff_profile.py b/autotest/gdrivers/tiff_profile.py
index 8dcb3da2fcf2..81f0ffb65ee4 100755
--- a/autotest/gdrivers/tiff_profile.py
+++ b/autotest/gdrivers/tiff_profile.py
@@ -37,6 +37,7 @@
 
 import gdaltest
 from osgeo import gdal
+import pytest
 
 
 ###############################################################################
@@ -61,7 +62,7 @@ def test_tiff_write_icc():
 
     try:
         os.stat('tmp/icc_test.tiff.aux.xml')
-        return 'fail'
+        pytest.fail()
     except OSError:
         pass
 
@@ -74,7 +75,7 @@ def test_tiff_write_icc():
 
     try:
         os.stat('tmp/icc_test.tiff.aux.xml')
-        return 'fail'
+        pytest.fail()
     except OSError:
         pass
 
@@ -87,7 +88,7 @@ def test_tiff_write_icc():
 
     try:
         os.stat('tmp/icc_test.tiff.aux.xml')
-        return 'fail'
+        pytest.fail()
     except OSError:
         pass
 
diff --git a/autotest/gdrivers/til.py b/autotest/gdrivers/til.py
index 5b62de8e9f2a..05834d349957 100755
--- a/autotest/gdrivers/til.py
+++ b/autotest/gdrivers/til.py
@@ -34,6 +34,7 @@
 
 import gdaltest
 from osgeo import gdal
+import pytest
 
 ###############################################################################
 # Test a fake TIL dataset
@@ -70,8 +71,7 @@ def test_til_2():
 
     try:
         os.stat('data/testtil.til.aux.xml')
-        gdaltest.post_reason('Expected not generation of data/testtil.til.aux.xml')
-        return 'fail'
+        pytest.fail('Expected not generation of data/testtil.til.aux.xml')
     except OSError:
         pass
 
@@ -103,8 +103,7 @@ def test_til_3():
 
     try:
         os.stat('data/testtil.til.aux.xml')
-        gdaltest.post_reason('Expected not generation of data/testtil.til.aux.xml')
-        return 'fail'
+        pytest.fail('Expected not generation of data/testtil.til.aux.xml')
     except OSError:
         pass
 
diff --git a/autotest/gdrivers/usgsdem.py b/autotest/gdrivers/usgsdem.py
index 575d6f637e5b..19dab096225c 100755
--- a/autotest/gdrivers/usgsdem.py
+++ b/autotest/gdrivers/usgsdem.py
@@ -95,12 +95,11 @@ def test_usgsdem_5():
                                                      options=['RESAMPLE=Nearest'])
 
     if ds.GetRasterBand(1).Checksum() != ds2.GetRasterBand(1).Checksum():
-        gdaltest.post_reason('Bad checksum.')
         print(ds2.GetRasterBand(1).Checksum())
         print(ds.GetRasterBand(1).Checksum())
         ds2 = None
         print(open('tmp/n43.dem', 'rb').read())
-        return 'fail'
+        pytest.fail('Bad checksum.')
 
     gt1 = ds.GetGeoTransform()
     gt2 = ds2.GetGeoTransform()
diff --git a/autotest/gdrivers/vrtderived.py b/autotest/gdrivers/vrtderived.py
index 9682d25346d3..ff22238e309c 100755
--- a/autotest/gdrivers/vrtderived.py
+++ b/autotest/gdrivers/vrtderived.py
@@ -203,7 +203,7 @@ def test_vrtderived_5():
         import numpy
         numpy.ones
     except (ImportError, AttributeError):
-        return 'skip'
+        pytest.skip()
 
     gdal.SetConfigOption('GDAL_VRT_ENABLE_PYTHON', 'YES')
     ds = gdal.Open('data/n43_hillshade.vrt')
@@ -223,7 +223,7 @@ def test_vrtderived_6():
         import numpy
         numpy.ones
     except (ImportError, AttributeError):
-        return 'skip'
+        pytest.skip()
 
     gdal.SetConfigOption('GDAL_VRT_ENABLE_PYTHON', 'YES')
     ds = gdal.Open('data/python_ones.vrt')
@@ -241,7 +241,7 @@ def test_vrtderived_7():
 
     import test_cli_utilities
     if test_cli_utilities.get_gdalinfo_path() is None:
-        return 'skip'
+        pytest.skip()
 
     ret, err = gdaltest.runexternal_out_and_err(test_cli_utilities.get_gdalinfo_path() + ' -checksum data/n43_hillshade.vrt --config GDAL_VRT_ENABLE_PYTHON YES')
     if gdal.GetConfigOption('CPL_DEBUG') is not None:
@@ -250,9 +250,8 @@ def test_vrtderived_7():
     if ret.find('Checksum=0') >= 0:
         print('Did not manage to find a Python library')
     elif ret.find('Checksum=50577') < 0:
-        print(ret)
         print(err)
-        return 'fail'
+        pytest.fail(ret)
 
     ret, err = gdaltest.runexternal_out_and_err(test_cli_utilities.get_gdalinfo_path() + ' -checksum data/n43_hillshade.vrt --config GDAL_VRT_ENABLE_PYTHON YES --config VRT_ENABLE_PYTHON_PATH NO')
     if gdal.GetConfigOption('CPL_DEBUG') is not None:
@@ -261,9 +260,8 @@ def test_vrtderived_7():
     if ret.find('Checksum=0') >= 0:
         print('Did not manage to find a Python library')
     elif ret.find('Checksum=50577') < 0:
-        print(ret)
         print(err)
-        return 'fail'
+        pytest.fail(ret)
 
     ret, err = gdaltest.runexternal_out_and_err(test_cli_utilities.get_gdalinfo_path() + ' -checksum data/n43_hillshade.vrt --config GDAL_VRT_ENABLE_PYTHON YES --config VRT_ENABLE_PYTHON_SYMLINK NO')
     if gdal.GetConfigOption('CPL_DEBUG') is not None:
@@ -272,9 +270,8 @@ def test_vrtderived_7():
     if ret.find('Checksum=0') >= 0:
         print('Did not manage to find a Python library')
     elif ret.find('Checksum=50577') < 0:
-        print(ret)
         print(err)
-        return 'fail'
+        pytest.fail(ret)
 
     # Invalid shared object name
     ret, err = gdaltest.runexternal_out_and_err(test_cli_utilities.get_gdalinfo_path() + ' -checksum data/n43_hillshade.vrt --config GDAL_VRT_ENABLE_PYTHON YES --config PYTHONSO foo')
@@ -302,7 +299,7 @@ def test_vrtderived_8():
         import numpy
         numpy.ones
     except (ImportError, AttributeError):
-        return 'skip'
+        pytest.skip()
 
     gdal.SetConfigOption('GDAL_VRT_ENABLE_PYTHON', 'NO')
     ds = gdal.Open('data/n43_hillshade.vrt')
@@ -328,7 +325,7 @@ def test_vrtderived_9():
         import numpy
         numpy.ones
     except (ImportError, AttributeError):
-        return 'skip'
+        pytest.skip()
 
     # Missing PixelFunctionType
     with gdaltest.error_handler():
@@ -616,7 +613,7 @@ def test_vrtderived_10():
         import numpy
         numpy.ones
     except (ImportError, AttributeError):
-        return 'skip'
+        pytest.skip()
 
     content = """<VRTDataset rasterXSize="10" rasterYSize="10">
   <VRTRasterBand dataType="Byte" band="1" subClass="VRTDerivedRasterBand">
@@ -684,7 +681,7 @@ def test_vrtderived_11():
         import numpy
         numpy.ones
     except (ImportError, AttributeError):
-        return 'skip'
+        pytest.skip()
 
     shutil.copy('data/n43_hillshade.vrt', 'tmp/n43_hillshade.vrt')
     shutil.copy('data/n43.dt0', 'tmp/n43.dt0')
@@ -714,7 +711,7 @@ def test_vrtderived_12():
         import numpy
         numpy.ones
     except (ImportError, AttributeError):
-        return 'skip'
+        pytest.skip()
 
     for dt in ["Byte", "UInt16", "Int16", "UInt32", "Int32",
                "Float32", "Float64",
@@ -773,7 +770,7 @@ def test_vrtderived_13():
         import numpy
         numpy.ones
     except (ImportError, AttributeError):
-        return 'skip'
+        pytest.skip()
 
     gdal.SetConfigOption('GDAL_VRT_ENABLE_PYTHON', "YES")
     # Will test the VRTDerivedRasterBand::IGetDataCoverageStatus() interface
@@ -797,7 +794,7 @@ def test_vrtderived_14():
         import numpy
         numpy.ones
     except (ImportError, AttributeError):
-        return 'skip'
+        pytest.skip()
 
     gdal.SetConfigOption('GDAL_VRT_ENABLE_PYTHON', "YES")
     ds = gdal.GetDriverByName('VRT').CreateCopy('/vsimem/vrtderived_14.vrt', gdal.Open('data/python_ones.vrt'))
@@ -847,7 +844,7 @@ def test_vrtderived_15():
         import numpy
         numpy.ones
     except (ImportError, AttributeError):
-        return 'skip'
+        pytest.skip()
 
     gdal.SetConfigOption('GDAL_VRT_ENABLE_PYTHON', "YES")
 
diff --git a/autotest/gdrivers/vrtfilt.py b/autotest/gdrivers/vrtfilt.py
index 328346ee5b80..72ceda4f7288 100755
--- a/autotest/gdrivers/vrtfilt.py
+++ b/autotest/gdrivers/vrtfilt.py
@@ -34,6 +34,7 @@
 
 
 import gdaltest
+import pytest
 
 ###############################################################################
 # Verify simple 3x3 averaging filter.
@@ -84,7 +85,7 @@ def test_vrtfilt_3():
     try:
         vrt_ds.GetRasterBand(1).SetMetadataItem
     except:
-        return 'skip'
+        pytest.skip()
 
     vrt_ds.GetRasterBand(1).SetMetadataItem('source_0', filterSourceXML, 'vrt_sources')
     assert vrt_ds.GetRasterBand(1).Checksum() == 21890
@@ -113,7 +114,7 @@ def test_vrtfilt_4():
     try:
         vrt_ds.GetRasterBand(1).SetMetadataItem
     except:
-        return 'skip'
+        pytest.skip()
 
     vrt_ds.GetRasterBand(1).SetMetadataItem('source_0', filterSourceXML, 'new_vrt_sources')
     assert vrt_ds.GetRasterBand(1).Checksum() == 21890
diff --git a/autotest/gdrivers/vrtmask.py b/autotest/gdrivers/vrtmask.py
index 43b9580a361e..5115d0ce7947 100755
--- a/autotest/gdrivers/vrtmask.py
+++ b/autotest/gdrivers/vrtmask.py
@@ -35,6 +35,7 @@
 
 
 import gdaltest
+import pytest
 
 ###############################################################################
 # Test with a global dataset mask band
@@ -126,7 +127,7 @@ def test_vrtmask_3():
     gtiff_drv = gdal.GetDriverByName('GTiff')
     md = gtiff_drv.GetMetadata()
     if md['DMD_CREATIONOPTIONLIST'].find('JPEG') == -1:
-        return 'skip'
+        pytest.skip()
 
     src_ds = gdal.Open('../gcore/data/ycbcr_with_mask.tif')
     ds = gdal.GetDriverByName('VRT').CreateCopy('tmp/vrtmask_3.vrt', src_ds)
@@ -155,12 +156,12 @@ def test_vrtmask_3():
 def test_vrtmask_4():
     import test_cli_utilities
     if test_cli_utilities.get_gdalbuildvrt_path() is None:
-        return 'skip'
+        pytest.skip()
 
     gtiff_drv = gdal.GetDriverByName('GTiff')
     md = gtiff_drv.GetMetadata()
     if md['DMD_CREATIONOPTIONLIST'].find('JPEG') == -1:
-        return 'skip'
+        pytest.skip()
 
     gdaltest.runexternal(test_cli_utilities.get_gdalbuildvrt_path() + ' tmp/vrtmask_4.vrt ../gcore/data/ycbcr_with_mask.tif')
 
@@ -187,7 +188,7 @@ def test_vrtmask_5():
     gtiff_drv = gdal.GetDriverByName('GTiff')
     md = gtiff_drv.GetMetadata()
     if md['DMD_CREATIONOPTIONLIST'].find('JPEG') == -1:
-        return 'skip'
+        pytest.skip()
 
     gdal.Translate('tmp/vrtmask_5.vrt', '../gcore/data/ycbcr_with_mask.tif', options='-of VRT -outsize 100% 100%')
 
@@ -214,7 +215,7 @@ def test_vrtmask_6():
     gtiff_drv = gdal.GetDriverByName('GTiff')
     md = gtiff_drv.GetMetadata()
     if md['DMD_CREATIONOPTIONLIST'].find('JPEG') == -1:
-        return 'skip'
+        pytest.skip()
 
     gdal.Translate('tmp/vrtmask_6.vrt', '../gcore/data/ycbcr_with_mask.tif',
                    options='-of VRT -b 1 -b 2 -b 3 -mask mask,1')
@@ -242,7 +243,7 @@ def test_vrtmask_7():
     gtiff_drv = gdal.GetDriverByName('GTiff')
     md = gtiff_drv.GetMetadata()
     if md['DMD_CREATIONOPTIONLIST'].find('JPEG') == -1:
-        return 'skip'
+        pytest.skip()
     try:
         os.remove('tmp/vrtmask_7_rgba.tif.msk')
     except OSError:
@@ -270,8 +271,7 @@ def test_vrtmask_7():
     os.remove('tmp/vrtmask_7_rgba.tif')
     try:
         os.remove('tmp/vrtmask_7_rgba.tif.msk')
-        gdaltest.post_reason('did not expect tmp/vrtmask_7_rgba.tif.msk')
-        return 'fail'
+        pytest.fail('did not expect tmp/vrtmask_7_rgba.tif.msk')
     except OSError:
         pass
     os.remove('tmp/vrtmask_7_rgbmask.vrt')
@@ -291,7 +291,7 @@ def test_vrtmask_8():
     gtiff_drv = gdal.GetDriverByName('GTiff')
     md = gtiff_drv.GetMetadata()
     if md['DMD_CREATIONOPTIONLIST'].find('JPEG') == -1:
-        return 'skip'
+        pytest.skip()
 
     gdal.Translate('tmp/vrtmask_8.vrt', '../gcore/data/ycbcr_with_mask.tif',
                    options='-of VRT -mask none')
@@ -313,7 +313,7 @@ def test_vrtmask_8():
 def test_vrtmask_9():
     import test_cli_utilities
     if test_cli_utilities.get_gdal_translate_path() is None:
-        return 'skip'
+        pytest.skip()
 
     src_ds = gdal.GetDriverByName('GTiff').Create('tmp/vrtmask_9_src.tif', 10, 10, 4)
     del src_ds
diff --git a/autotest/gdrivers/vrtpansharpen.py b/autotest/gdrivers/vrtpansharpen.py
index bf5c3ab94f62..c2aa94eae939 100755
--- a/autotest/gdrivers/vrtpansharpen.py
+++ b/autotest/gdrivers/vrtpansharpen.py
@@ -1221,7 +1221,7 @@ def test_vrtpansharpen_6():
         gdalnumeric.zeros
         import numpy
     except (ImportError, AttributeError):
-        return 'skip'
+        pytest.skip()
 
     # i = 0: VRT has <BitDepth>7</BitDepth>
     # i = 1: bands have NBITS=7 and VRT <BitDepth>7</BitDepth>
diff --git a/autotest/gdrivers/wcs.py b/autotest/gdrivers/wcs.py
index 1aa7772a5728..903dd299929e 100755
--- a/autotest/gdrivers/wcs.py
+++ b/autotest/gdrivers/wcs.py
@@ -36,6 +36,7 @@
 import re
 import shutil
 import urlparse
+import pytest
 try:
     from BaseHTTPServer import BaseHTTPRequestHandler
 except ImportError:
@@ -65,7 +66,7 @@ def test_wcs_1():
 
     gdaltest.wcs_ds = None
     if gdaltest.wcs_drv is None:
-        return 'skip'
+        pytest.skip()
     return 'success'
 
 ###############################################################################
@@ -75,7 +76,7 @@ def test_wcs_1():
 def wcs_2():
 
     if gdaltest.wcs_drv is None:
-        return 'skip'
+        pytest.skip()
 
     # first, copy to tmp directory.
     open('tmp/geoserver.wcs', 'w').write(open('data/geoserver.wcs').read())
@@ -85,8 +86,7 @@ def wcs_2():
 
     if gdaltest.wcs_ds is not None:
         return 'success'
-    gdaltest.post_reason('open failed.')
-    return 'fail'
+    pytest.fail('open failed.')
 
 ###############################################################################
 # Check various things about the configuration.
@@ -95,7 +95,7 @@ def wcs_2():
 def test_wcs_3():
 
     if gdaltest.wcs_drv is None or gdaltest.wcs_ds is None:
-        return 'skip'
+        pytest.skip()
 
     assert gdaltest.wcs_ds.RasterXSize == 983 and gdaltest.wcs_ds.RasterYSize == 598 and gdaltest.wcs_ds.RasterCount == 3, \
         'wrong size or bands'
@@ -122,7 +122,7 @@ def test_wcs_3():
 def test_wcs_4():
 
     if gdaltest.wcs_drv is None or gdaltest.wcs_ds is None:
-        return 'skip'
+        pytest.skip()
 
     cs = gdaltest.wcs_ds.GetRasterBand(1).Checksum()
     assert cs == 58765, ('Wrong checksum: ' + str(cs))
@@ -136,7 +136,7 @@ def test_wcs_4():
 def wcs_5():
 
     if gdaltest.wcs_drv is None:
-        return 'skip'
+        pytest.skip()
 
     fn = """<WCS_GDAL>
   <ServiceURL>http://demo.opengeo.org/geoserver/wcs?</ServiceURL>
@@ -161,7 +161,7 @@ def wcs_5():
 def old_wcs_2():
 
     if gdaltest.wcs_drv is None:
-        return 'skip'
+        pytest.skip()
 
     # first, copy to tmp directory.
     open('tmp/srtmplus.wcs', 'w').write(open('data/srtmplus.wcs').read())
@@ -171,8 +171,7 @@ def old_wcs_2():
 
     if gdaltest.wcs_ds is not None:
         return 'success'
-    gdaltest.post_reason('open failed.')
-    return 'fail'
+    pytest.fail('open failed.')
 
 ###############################################################################
 # Check various things about the configuration.
@@ -181,7 +180,7 @@ def old_wcs_2():
 def old_wcs_3():
 
     if gdaltest.wcs_drv is None or gdaltest.wcs_ds is None:
-        return 'skip'
+        pytest.skip()
 
     assert gdaltest.wcs_ds.RasterXSize == 43200 and gdaltest.wcs_ds.RasterYSize == 21600 and gdaltest.wcs_ds.RasterCount == 1, \
         'wrong size or bands'
@@ -207,7 +206,7 @@ def old_wcs_3():
 def old_wcs_4():
 
     if gdaltest.wcs_drv is None or gdaltest.wcs_ds is None:
-        return 'skip'
+        pytest.skip()
 
     cs = gdaltest.wcs_ds.GetRasterBand(1).Checksum(0, 0, 100, 100)
     assert cs == 10469, ('Wrong checksum: ' + str(cs))
@@ -221,7 +220,7 @@ def old_wcs_4():
 def old_wcs_5():
 
     if gdaltest.wcs_drv is None:
-        return 'skip'
+        pytest.skip()
 
     fn = '<WCS_GDAL><ServiceURL>http://geodata.telascience.org/cgi-bin/mapserv_dem?</ServiceURL><CoverageName>srtmplus_raw</CoverageName><Timeout>75</Timeout></WCS_GDAL>'
 
@@ -435,7 +434,7 @@ def setupFct():
 def test_wcs_6():
     driver = gdal.GetDriverByName('WCS')
     if driver is None:
-        return 'skip'
+        pytest.skip()
     # Generating various URLs from the driver and comparing them to ones
     # that have worked.
     first_call = True
diff --git a/autotest/gdrivers/webp.py b/autotest/gdrivers/webp.py
index 9e0805cdd591..e12ee743cdab 100755
--- a/autotest/gdrivers/webp.py
+++ b/autotest/gdrivers/webp.py
@@ -34,6 +34,7 @@
 
 
 import gdaltest
+import pytest
 
 ###############################################################################
 # Test if WEBP driver is present
@@ -43,7 +44,7 @@ def test_webp_1():
 
     gdaltest.webp_drv = gdal.GetDriverByName('WEBP')
     if gdaltest.webp_drv is None:
-        return 'skip'
+        pytest.skip()
 
     return 'success'
 
@@ -54,7 +55,7 @@ def test_webp_1():
 def test_webp_2():
 
     if gdaltest.webp_drv is None:
-        return 'skip'
+        pytest.skip()
 
     ds = gdal.Open('data/rgbsmall.webp')
     cs = ds.GetRasterBand(1).Checksum()
@@ -70,7 +71,7 @@ def test_webp_2():
 def test_webp_3():
 
     if gdaltest.webp_drv is None:
-        return 'skip'
+        pytest.skip()
 
     src_ds = gdal.Open('data/rgbsmall.tif')
     out_ds = gdaltest.webp_drv.CreateCopy('/vsimem/webp_3.webp', src_ds, options=['QUALITY=80'])
@@ -93,11 +94,11 @@ def test_webp_3():
 def test_webp_4():
 
     if gdaltest.webp_drv is None:
-        return 'skip'
+        pytest.skip()
 
     md = gdaltest.webp_drv.GetMetadata()
     if md['DMD_CREATIONOPTIONLIST'].find('LOSSLESS') == -1:
-        return 'skip'
+        pytest.skip()
 
     src_ds = gdal.Open('../gcore/data/stefan_full_rgba.tif')
     out_ds = gdaltest.webp_drv.CreateCopy('/vsimem/webp_4.webp', src_ds)
@@ -122,11 +123,11 @@ def test_webp_4():
 def test_webp_5():
 
     if gdaltest.webp_drv is None:
-        return 'skip'
+        pytest.skip()
 
     md = gdaltest.webp_drv.GetMetadata()
     if md['DMD_CREATIONOPTIONLIST'].find('LOSSLESS') == -1:
-        return 'skip'
+        pytest.skip()
 
     src_ds = gdal.Open('../gcore/data/stefan_full_rgba.tif')
     out_ds = gdaltest.webp_drv.CreateCopy('/vsimem/webp_5.webp', src_ds, options=['LOSSLESS=YES'])
diff --git a/autotest/gdrivers/wms.py b/autotest/gdrivers/wms.py
index 8cc834e61fbb..b01f9f573d9d 100755
--- a/autotest/gdrivers/wms.py
+++ b/autotest/gdrivers/wms.py
@@ -49,7 +49,7 @@ def test_wms_1():
 
     gdaltest.wms_drv = gdal.GetDriverByName('WMS')
     if gdaltest.wms_drv is None:
-        return 'skip'
+        pytest.skip()
     return 'success'
 
 ###############################################################################
@@ -59,7 +59,7 @@ def test_wms_1():
 def wms_2():
 
     if gdaltest.wms_drv is None:
-        return 'skip'
+        pytest.skip()
 
     # NOTE - mloskot:
     # This is a dirty hack checking if remote WMS service is online.
@@ -70,14 +70,13 @@ def wms_2():
     gdaltest.wms_ds = None
 
     if not gdaltest.wms_srv1_ok:
-        return 'skip'
+        pytest.skip()
 
     gdaltest.wms_ds = gdal.Open('data/pop_wms.xml')
 
     if gdaltest.wms_ds is not None:
         return 'success'
-    gdaltest.post_reason('open failed.')
-    return 'fail'
+    pytest.fail('open failed.')
 
 ###############################################################################
 # Check various things about the configuration.
@@ -86,10 +85,10 @@ def wms_2():
 def wms_3():
 
     if gdaltest.wms_drv is None or gdaltest.wms_ds is None:
-        return 'skip'
+        pytest.skip()
 
     if not gdaltest.wms_srv1_ok:
-        return 'skip'
+        pytest.skip()
 
     assert gdaltest.wms_ds.RasterXSize == 36000 and gdaltest.wms_ds.RasterYSize == 14500 and gdaltest.wms_ds.RasterCount == 3, \
         'wrong size or bands'
@@ -115,10 +114,10 @@ def wms_3():
 def wms_4():
 
     if gdaltest.wms_drv is None or gdaltest.wms_ds is None:
-        return 'skip'
+        pytest.skip()
 
     if not gdaltest.wms_srv1_ok:
-        return 'skip'
+        pytest.skip()
 
     gdal.SetConfigOption('CPL_ACCUM_ERROR_MSG', 'ON')
     gdal.PushErrorHandler('CPLQuietErrorHandler')
@@ -131,8 +130,7 @@ def wms_4():
     gdal.ErrorReset()
 
     if msg is not None and msg.find('Service denied due to system overload') != -1:
-        print(msg)
-        return 'skip'
+        pytest.skip(msg)
 
     assert cs == 57182, ('Wrong checksum: ' + str(cs))
 
@@ -145,7 +143,7 @@ def wms_4():
 def test_wms_5():
 
     if gdaltest.wms_drv is None:
-        return 'skip'
+        pytest.skip()
 
     # We don't need to check if the remote service is online as we
     # don't need a connection for this test
@@ -170,7 +168,7 @@ def test_wms_5():
 def test_wms_6():
 
     if gdaltest.wms_drv is None:
-        return 'skip'
+        pytest.skip()
 
     # We don't need to check if the remote service is online as we
     # don't need a connection for this test
@@ -195,12 +193,12 @@ def test_wms_6():
 def test_wms_7():
 
     if gdaltest.wms_drv is None:
-        return 'skip'
+        pytest.skip()
 
     srv = 'http://tilecache.osgeo.org/wms-c/Basic.py'
     gdaltest.metacarta_tms = False
     if gdaltest.gdalurlopen(srv) is None:
-        return 'skip'
+        pytest.skip()
     gdaltest.metacarta_tms = True
 
     tms = """<GDAL_WMS>
@@ -246,7 +244,7 @@ def test_wms_7():
 def test_wms_8():
 
     if gdaltest.wms_drv is None:
-        return 'skip'
+        pytest.skip()
 
     # server_url = 'http://tilecache.osgeo.org/wms-c/Basic.py'
     # wmstms_version = '/1.0.0/basic'
@@ -345,7 +343,7 @@ def test_wms_8():
 </GDAL_WMS>""" % server_url_mask
 
     if gdaltest.gdalurlopen(server_url) is None:
-        return 'skip'
+        pytest.skip()
 
     try:
         shutil.rmtree('tmp/gdalwmscache')
@@ -366,7 +364,7 @@ def test_wms_8():
     data = ds.GetRasterBand(1).GetOverview(ovr_upper_level).ReadRaster(0, 0, 512, 512)
     if gdal.GetLastErrorMsg() != '':
         if gdaltest.gdalurlopen(server_url + zero_tile) is None:
-            return 'skip'
+            pytest.skip()
 
     ds = None
 
@@ -383,8 +381,7 @@ def test_wms_8():
         try:
             os.stat(expected_file)
         except OSError:
-            gdaltest.post_reason('%s should exist' % expected_file)
-            return 'fail'
+            pytest.fail('%s should exist' % expected_file)
 
     # Now, we should read from the cache
     ds = gdal.Open(tms)
@@ -463,7 +460,7 @@ def test_wms_8():
 def wms_9():
 
     if gdaltest.wms_drv is None:
-        return 'skip'
+        pytest.skip()
 
     tms = """<GDAL_WMS>
     <Service name="TiledWMS">
@@ -478,9 +475,8 @@ def wms_9():
     if ds is None:
         srv = 'http://onearth.jpl.nasa.gov/wms.cgi?'
         if gdaltest.gdalurlopen(srv) is None:
-            return 'skip'
-        gdaltest.post_reason('open failed.')
-        return 'fail'
+            pytest.skip()
+        pytest.fail('open failed.')
 
     expected_cs = 5478
     cs = ds.GetRasterBand(1).GetOverview(9).Checksum()
@@ -498,10 +494,10 @@ def wms_9():
 def wms_10():
 
     if gdaltest.wms_drv is None:
-        return 'skip'
+        pytest.skip()
 
     if not gdaltest.wms_srv1_ok:
-        return 'skip'
+        pytest.skip()
 
     name = "WMS:http://sedac.ciesin.columbia.edu/mapserver/map/GPWv3?"
     ds = gdal.Open(name)
@@ -527,14 +523,14 @@ def wms_10():
 def test_wms_11():
 
     if gdaltest.wms_drv is None:
-        return 'skip'
+        pytest.skip()
 
     if gdaltest.skip_on_travis():
-        return 'skip'
+        pytest.skip()
 
     srv = 'http://onearth.jpl.nasa.gov/wms.cgi'
     if gdaltest.gdalurlopen(srv) is None:
-        return 'skip'
+        pytest.skip()
 
     name = "WMS:http://onearth.jpl.nasa.gov/wms.cgi?request=GetTileService"
     ds = gdal.Open(name)
@@ -560,18 +556,17 @@ def test_wms_11():
 def test_wms_12():
 
     if gdaltest.wms_drv is None:
-        return 'skip'
+        pytest.skip()
 
     if gdaltest.metacarta_tms is not True:
-        return 'skip'
+        pytest.skip()
 
     name = "http://tilecache.osgeo.org/wms-c/Basic.py/1.0.0/"
     ds = gdal.Open(name)
     if ds is None:
         if gdaltest.gdalurlopen('http://tilecache.osgeo.org/wms-c/Basic.py/1.0.0/basic/0/0/0.png') is None:
-            return 'skip'
-        gdaltest.post_reason('open of %s failed.' % name)
-        return 'fail'
+            pytest.skip()
+        pytest.fail('open of %s failed.' % name)
 
     subdatasets = ds.GetMetadata("SUBDATASETS")
     assert subdatasets, 'did not get expected subdataset count'
@@ -585,9 +580,8 @@ def test_wms_12():
             ds = gdal.Open(name)
             if ds is None:
                 if gdaltest.gdalurlopen('http://tilecache.osgeo.org/wms-c/Basic.py/1.0.0/basic/0/0/0.png') is None:
-                    return 'skip'
-                gdaltest.post_reason('open of %s failed.' % name)
-                return 'fail'
+                    pytest.skip()
+                pytest.fail('open of %s failed.' % name)
             ds = None
 
     return 'success'
@@ -599,14 +593,14 @@ def test_wms_12():
 def test_wms_13():
 
     if gdaltest.wms_drv is None:
-        return 'skip'
+        pytest.skip()
 
     ds = gdal.Open("data/DNEC_250K.vrt")
     if ds.ReadRaster(0, 0, 1024, 682) is None:
         srv = 'http://wms.geobase.ca/wms-bin/cubeserv.cgi?SERVICE=WMS&VERSION=1.1.1&REQUEST=GeCapabilities'
         if gdaltest.gdalurlopen(srv) is None:
-            return 'skip'
-        return 'fail'
+            pytest.skip()
+        pytest.fail()
     ds = None
 
     return 'success'
@@ -618,7 +612,7 @@ def test_wms_13():
 def test_wms_14():
 
     if gdaltest.wms_drv is None:
-        return 'skip'
+        pytest.skip()
     ds = gdal.Open("""<GDAL_WMS>
   <Service name="VirtualEarth">
     <ServerUrl>http://a${server_num}.ortho.tiles.virtualearth.net/tiles/a${quadkey}.jpeg?g=90</ServerUrl>
@@ -654,13 +648,13 @@ def test_wms_14():
 def test_wms_15():
 
     if gdaltest.wms_drv is None:
-        return 'skip'
+        pytest.skip()
     src_ds = gdal.Open("http://server.arcgisonline.com/ArcGIS/rest/services/World_Imagery/MapServer?f=json&pretty=true")
     if src_ds is None:
         srv = 'http://server.arcgisonline.com/ArcGIS/rest/services/World_Imagery/MapServer?f=json&pretty=true'
         if gdaltest.gdalurlopen(srv) is None:
-            return 'skip'
-        return 'fail'
+            pytest.skip()
+        pytest.fail()
     ds = gdal.GetDriverByName("WMS").CreateCopy("/vsimem/wms.xml", src_ds)
     src_ds = None
 
@@ -696,16 +690,15 @@ def test_wms_15():
 def test_wms_16():
 
     if gdaltest.wms_drv is None:
-        return 'skip'
+        pytest.skip()
 
     name = "WMS:http://demo.opengeo.org/geoserver/gwc/service/wms?tiled=TRUE"
     ds = gdal.Open(name)
     if ds is None:
         srv = 'http://demo.opengeo.org/geoserver/gwc/service/wms?'
         if gdaltest.gdalurlopen(srv) is None:
-            return 'skip'
-        gdaltest.post_reason('open of %s failed.' % name)
-        return 'fail'
+            pytest.skip()
+        pytest.fail('open of %s failed.' % name)
 
     subdatasets = ds.GetMetadata("SUBDATASETS")
     assert subdatasets, 'did not get expected subdataset count'
@@ -735,21 +728,18 @@ def test_wms_16():
 
     # Some bug in GeoServer ?
     if val is not None and val.find('java.lang.NoSuchMethodError: org.geoserver.wms.WMS.pixelToWorld') >= 0:
-        print(val)
-        return 'skip'
+        pytest.skip(val)
 
     if val is not None and (val.find('Gateway Time-out') >= 0 or
                             val.find('HTTP error code : 5') >= 0):
-        return 'skip'
+        pytest.skip()
 
     if val is None or val.find('<og:cat>86</og:cat>') == -1:
         if val.find('java.lang.NullPointerException') >= 0 or val.find('504 Gateway Time-out') >= 0 or val.find('java.lang.OutOfMemoryError') >= 0:
-            print(val)
-            return 'skip'
+            pytest.skip(val)
 
-        gdaltest.post_reason('expected a value')
         print(val)
-        return 'fail'
+        pytest.fail('expected a value')
 
     # Ask again. Should be cached
     val_again = ds.GetRasterBand(1).GetMetadataItem(pixel, "LocationInfo")
@@ -763,12 +753,10 @@ def test_wms_16():
     val2 = ds.GetRasterBand(1).GetOverview(0).GetMetadataItem(pixel, "LocationInfo")
     if val2 != val:
         if val2.find('java.lang.NullPointerException') >= 0 or val2.find('504 Gateway Time-out') >= 0 or val2.find('java.lang.OutOfMemoryError') >= 0:
-            print(val2)
-            return 'skip'
+            pytest.skip(val2)
 
-        gdaltest.post_reason('expected a value')
         print(val2)
-        return 'fail'
+        pytest.fail('expected a value')
 
     ds = None
 
@@ -781,11 +769,11 @@ def test_wms_16():
 def wms_17():
 
     if gdaltest.wms_drv is None:
-        return 'skip'
+        pytest.skip()
 
     srv = 'http://onmoon.lmmp.nasa.gov/sites/wms.cgi?'
     if gdaltest.gdalurlopen(srv) is None:
-        return 'skip'
+        pytest.skip()
 
     name = '<GDAL_WMS><Service name="TiledWMS"><ServerUrl>http://onmoon.lmmp.nasa.gov/sites/wms.cgi?</ServerUrl><TiledGroupName>King Crater DEM Color Confidence, LMMP</TiledGroupName></Service></GDAL_WMS>'
     ds = gdal.Open(name)
@@ -805,7 +793,7 @@ def wms_17():
 def test_wms_18():
 
     if gdaltest.wms_drv is None:
-        return 'skip'
+        pytest.skip()
 
     # We don't need to check if the remote service is online as we
     # don't need a connection for this test.
@@ -823,7 +811,7 @@ def test_wms_18():
 
     # add getting image test
     if gdaltest.gdalurlopen('http://sampleserver1.arcgisonline.com/ArcGIS/rest/services/Specialty/ESRI_StateCityHighway_USA/MapServer') is None:
-        return 'skip'
+        pytest.skip()
 
     expected_cs = 12824
     cs = ds.GetRasterBand(1).Checksum()
@@ -840,15 +828,14 @@ def test_wms_18():
 def test_wms_19():
 
     if gdaltest.wms_drv is None:
-        return 'skip'
+        pytest.skip()
 
     ds = gdal.Open('IIP:http://merovingio.c2rmf.cnrs.fr/fcgi-bin/iipsrv.fcgi?FIF=globe.256x256.tif')
 
     if ds is None:
         if gdaltest.gdalurlopen('http://merovingio.c2rmf.cnrs.fr/fcgi-bin/iipsrv.fcgi?FIF=globe.256x256.tif&obj=Basic-Info') is None:
-            return 'skip'
-        gdaltest.post_reason('open failed.')
-        return 'fail'
+            pytest.skip()
+        pytest.fail('open failed.')
 
     assert ds.RasterXSize == 86400 and ds.RasterYSize == 43200 and ds.RasterCount == 3, \
         'wrong size or bands'
diff --git a/autotest/gdrivers/wmts.py b/autotest/gdrivers/wmts.py
index 55bcf99c6e8b..c6b2897738f0 100755
--- a/autotest/gdrivers/wmts.py
+++ b/autotest/gdrivers/wmts.py
@@ -36,6 +36,7 @@
 from osgeo import gdal
 
 import gdaltest
+import pytest
 
 ###############################################################################
 # Find WMTS driver
@@ -55,7 +56,7 @@ def test_wmts_1():
         gdal.SetConfigOption('GDAL_DEFAULT_WMS_CACHE_PATH', '/vsimem/cache')
 
         return 'success'
-    return 'skip'
+    pytest.skip()
 
 ###############################################################################
 # Error: no URL and invalid GDAL_WMTS service file documents
@@ -64,7 +65,7 @@ def test_wmts_1():
 def test_wmts_2():
 
     if gdaltest.wmts_drv is None:
-        return 'skip'
+        pytest.skip()
 
     gdal.PushErrorHandler()
     ds = gdal.Open('WMTS:')
@@ -95,7 +96,7 @@ def test_wmts_2():
 def test_wmts_3():
 
     if gdaltest.wmts_drv is None:
-        return 'skip'
+        pytest.skip()
 
     gdal.PushErrorHandler()
     ds = gdal.Open('WMTS:https://non_existing')
@@ -111,7 +112,7 @@ def test_wmts_3():
 def test_wmts_4():
 
     if gdaltest.wmts_drv is None:
-        return 'skip'
+        pytest.skip()
 
     gdal.PushErrorHandler()
     ds = gdal.Open('WMTS:/vsimem/non_existing')
@@ -127,7 +128,7 @@ def test_wmts_4():
 def test_wmts_5():
 
     if gdaltest.wmts_drv is None:
-        return 'skip'
+        pytest.skip()
 
     gdal.FileFromMemBuffer('/vsimem/invalid_getcapabilities.xml', '<invalid_xml')
 
@@ -145,7 +146,7 @@ def test_wmts_5():
 def test_wmts_6():
 
     if gdaltest.wmts_drv is None:
-        return 'skip'
+        pytest.skip()
 
     gdal.FileFromMemBuffer('/vsimem/invalid_getcapabilities.xml', '<Capabilities/>')
 
@@ -163,7 +164,7 @@ def test_wmts_6():
 def test_wmts_7():
 
     if gdaltest.wmts_drv is None:
-        return 'skip'
+        pytest.skip()
 
     gdal.FileFromMemBuffer('/vsimem/empty_getcapabilities.xml', '<Capabilities><Contents/></Capabilities>')
 
@@ -181,7 +182,7 @@ def test_wmts_7():
 def test_wmts_8():
 
     if gdaltest.wmts_drv is None:
-        return 'skip'
+        pytest.skip()
 
     gdal.FileFromMemBuffer('/vsimem/missing.xml', """<Capabilities>
     <Contents>
@@ -205,7 +206,7 @@ def test_wmts_8():
 def test_wmts_9():
 
     if gdaltest.wmts_drv is None:
-        return 'skip'
+        pytest.skip()
 
     gdal.FileFromMemBuffer('/vsimem/missing_tms.xml', """<Capabilities>
     <Contents>
@@ -236,7 +237,7 @@ def test_wmts_9():
 def test_wmts_10():
 
     if gdaltest.wmts_drv is None:
-        return 'skip'
+        pytest.skip()
 
     gdal.FileFromMemBuffer('/vsimem/missing_SupportedCRS.xml', """<Capabilities>
     <Contents>
@@ -270,7 +271,7 @@ def test_wmts_10():
 def test_wmts_11():
 
     if gdaltest.wmts_drv is None:
-        return 'skip'
+        pytest.skip()
 
     gdal.FileFromMemBuffer('/vsimem/no_tilematrix.xml', """<Capabilities>
     <Contents>
@@ -305,7 +306,7 @@ def test_wmts_11():
 def test_wmts_12():
 
     if gdaltest.wmts_drv is None:
-        return 'skip'
+        pytest.skip()
 
     gdal.FileFromMemBuffer('/vsimem/missing_required_element_in_tilematrix.xml', """<Capabilities>
     <Contents>
@@ -341,7 +342,7 @@ def test_wmts_12():
 def test_wmts_12bis():
 
     if gdaltest.wmts_drv is None:
-        return 'skip'
+        pytest.skip()
 
     gdal.FileFromMemBuffer('/vsimem/wmts_12bis.xml', """<Capabilities>
     <Contents>
@@ -384,7 +385,7 @@ def test_wmts_12bis():
 def test_wmts_13():
 
     if gdaltest.wmts_drv is None:
-        return 'skip'
+        pytest.skip()
 
     gdal.FileFromMemBuffer('/vsimem/minimal.xml', """<Capabilities>
     <Contents>
@@ -486,7 +487,7 @@ def test_wmts_13():
 def test_wmts_14():
 
     if gdaltest.wmts_drv is None:
-        return 'skip'
+        pytest.skip()
 
     gdal.FileFromMemBuffer('/vsimem/nominal.xml', """<Capabilities>
     <Contents>
@@ -720,7 +721,7 @@ def test_wmts_14():
 def test_wmts_15():
 
     if gdaltest.wmts_drv is None:
-        return 'skip'
+        pytest.skip()
 
     gdal.FileFromMemBuffer('/vsimem/nominal_kvp.xml?service=WMTS&request=GetCapabilities', """<Capabilities xmlns="http://www.opengis.net/wmts/1.0">
     <ows:OperationsMetadata>
@@ -864,7 +865,7 @@ def test_wmts_15():
 def test_wmts_16():
 
     if gdaltest.wmts_drv is None:
-        return 'skip'
+        pytest.skip()
 
     gdal.FileFromMemBuffer('/vsimem/wmts_16.xml', """<Capabilities>
     <Contents>
@@ -940,7 +941,7 @@ def test_wmts_16():
 def test_wmts_17():
 
     if gdaltest.wmts_drv is None:
-        return 'skip'
+        pytest.skip()
 
     gdal.FileFromMemBuffer('/vsimem/wmts_17.xml', """<Capabilities>
     <Contents>
@@ -1016,7 +1017,7 @@ def test_wmts_17():
 def test_wmts_18():
 
     if gdaltest.wmts_drv is None:
-        return 'skip'
+        pytest.skip()
 
     gdal.FileFromMemBuffer('/vsimem/wmts_18.xml', """<Capabilities>
     <Contents>
@@ -1092,7 +1093,7 @@ def test_wmts_18():
 def test_wmts_19():
 
     if gdaltest.wmts_drv is None:
-        return 'skip'
+        pytest.skip()
 
     gdal.FileFromMemBuffer('/vsimem/wmts_19.xml', """<Capabilities>
     <Contents>
@@ -1173,7 +1174,7 @@ def test_wmts_19():
 def test_wmts_20():
 
     if gdaltest.wmts_drv is None:
-        return 'skip'
+        pytest.skip()
 
     gdal.FileFromMemBuffer('/vsimem/wmts_20.xml', """<Capabilities>
     <Contents>
@@ -1258,7 +1259,7 @@ def test_wmts_20():
 def test_wmts_21():
 
     if gdaltest.wmts_drv is None:
-        return 'skip'
+        pytest.skip()
 
     gdal.FileFromMemBuffer('/vsimem/wmts_21.xml', """<Capabilities>
     <Contents>
@@ -1353,7 +1354,7 @@ def test_wmts_21():
 def test_wmts_22():
 
     if gdaltest.wmts_drv is None:
-        return 'skip'
+        pytest.skip()
 
     gdal.FileFromMemBuffer('/vsimem/wmts_22.xml', """<Capabilities>
     <Contents>
@@ -1410,7 +1411,7 @@ def test_wmts_22():
 def wmts_23(imagetype, expected_cs):
 
     if gdaltest.wmts_drv is None:
-        return 'skip'
+        pytest.skip()
 
     inputXml = '/vsimem/' + imagetype + '.xml'
     serviceUrl = '/vsimem/wmts_23/' + imagetype
@@ -1484,7 +1485,7 @@ def test_wmts_23_rgba():
 def test_wmts_invalid_global_to_tm_reprojection():
 
     if gdaltest.wmts_drv is None:
-        return 'skip'
+        pytest.skip()
 
     inputXml = '/vsimem/wmts_invalid_global_to_tm_reprojection.xml'
     gdal.FileFromMemBuffer(inputXml, """<?xml version="1.0"?>
@@ -1544,7 +1545,7 @@ def test_wmts_invalid_global_to_tm_reprojection():
 def test_wmts_check_no_overflow_zoom_level():
 
     if gdaltest.wmts_drv is None:
-        return 'skip'
+        pytest.skip()
 
     inputXml = '/vsimem/wmts_check_no_overflow_zoom_level.xml'
     gdal.FileFromMemBuffer(inputXml, """<?xml version="1.0"?>
@@ -1828,7 +1829,7 @@ def wmts_CleanCache():
 def test_wmts_cleanup():
 
     if gdaltest.wmts_drv is None:
-        return 'skip'
+        pytest.skip()
 
     gdal.SetConfigOption('CPL_CURL_ENABLE_VSIMEM', None)
     gdal.SetConfigOption('GDAL_DEFAULT_WMS_CACHE_PATH', None)
diff --git a/autotest/gnm/gnm_test.py b/autotest/gnm/gnm_test.py
index aa1e111d9df5..0a85ab253b28 100755
--- a/autotest/gnm/gnm_test.py
+++ b/autotest/gnm/gnm_test.py
@@ -40,6 +40,7 @@
 
 from osgeo import gdal
 from osgeo import gnm
+import pytest
 
 ###############################################################################
 # Create file base network
@@ -58,7 +59,7 @@ def test_gnm_filenetwork_create():
     ogrtest.drv = gdal.GetDriverByName('GNMFile')
 
     if ogrtest.drv is None:
-        return 'skip'
+        pytest.skip()
 
     ds = ogrtest.drv.Create('tmp/', 0, 0, 0, gdal.GDT_Unknown, options=['net_name=test_gnm', 'net_description=Test file based GNM', 'net_srs=EPSG:4326'])
     # cast to GNM
@@ -80,7 +81,7 @@ def test_gnm_filenetwork_create():
 def test_gnm_filenetwork_open():
 
     if not ogrtest.have_gnm:
-        return 'skip'
+        pytest.skip()
 
     ds = gdal.OpenEx('tmp/test_gnm')
     # cast to GNM
@@ -101,7 +102,7 @@ def test_gnm_filenetwork_open():
 def test_gnm_import():
 
     if not ogrtest.have_gnm:
-        return 'skip'
+        pytest.skip()
 
     ds = gdal.OpenEx('tmp/test_gnm')
 
@@ -133,7 +134,7 @@ def test_gnm_import():
 def test_gnm_autoconnect():
 
     if not ogrtest.have_gnm:
-        return 'skip'
+        pytest.skip()
 
     ds = gdal.OpenEx('tmp/test_gnm')
     dgn = gnm.CastToGenericNetwork(ds)
@@ -152,7 +153,7 @@ def test_gnm_autoconnect():
 def test_gnm_graph_dijkstra():
 
     if not ogrtest.have_gnm:
-        return 'skip'
+        pytest.skip()
 
     ds = gdal.OpenEx('tmp/test_gnm')
     dn = gnm.CastToNetwork(ds)
@@ -163,8 +164,7 @@ def test_gnm_graph_dijkstra():
 
     if lyr.GetFeatureCount() == 0:
         dn.ReleaseResultSet(lyr)
-        gdaltest.post_reason('failed to get path')
-        return 'fail'
+        pytest.fail('failed to get path')
 
     dn.ReleaseResultSet(lyr)
     dn = None
@@ -179,7 +179,7 @@ def test_gnm_graph_dijkstra():
 def test_gnm_graph_kshortest():
 
     if not ogrtest.have_gnm:
-        return 'skip'
+        pytest.skip()
 
     ds = gdal.OpenEx('tmp/test_gnm')
     dn = gnm.CastToNetwork(ds)
@@ -190,8 +190,7 @@ def test_gnm_graph_kshortest():
 
     if lyr.GetFeatureCount() < 20:
         dn.ReleaseResultSet(lyr)
-        gdaltest.post_reason('failed to get path')
-        return 'fail'
+        pytest.fail('failed to get path')
 
     dn.ReleaseResultSet(lyr)
     dn = None
@@ -204,7 +203,7 @@ def test_gnm_graph_kshortest():
 def test_gnm_graph_connectedcomponents():
 
     if not ogrtest.have_gnm:
-        return 'skip'
+        pytest.skip()
 
     ds = gdal.OpenEx('tmp/test_gnm')
     dn = gnm.CastToNetwork(ds)
@@ -215,8 +214,7 @@ def test_gnm_graph_connectedcomponents():
 
     if lyr.GetFeatureCount() == 0:
         dn.ReleaseResultSet(lyr)
-        gdaltest.post_reason('failed to get path')
-        return 'fail'
+        pytest.fail('failed to get path')
 
     dn.ReleaseResultSet(lyr)
     dn = None
@@ -229,14 +227,13 @@ def test_gnm_graph_connectedcomponents():
 def test_gnm_delete():
 
     if not ogrtest.have_gnm:
-        return 'skip'
+        pytest.skip()
 
     gdal.GetDriverByName('GNMFile').Delete('tmp/test_gnm')
 
     try:
         os.stat('tmp/test_gnm')
-        gdaltest.post_reason('Expected delete tmp/test_gnm')
-        return 'fail'
+        pytest.fail('Expected delete tmp/test_gnm')
     except OSError:
         pass
 
diff --git a/autotest/ogr/ogr_arcgen.py b/autotest/ogr/ogr_arcgen.py
index 9d724d2bf81a..affd58e97601 100755
--- a/autotest/ogr/ogr_arcgen.py
+++ b/autotest/ogr/ogr_arcgen.py
@@ -34,6 +34,7 @@
 import gdaltest
 import ogrtest
 from osgeo import ogr
+import pytest
 
 ###############################################################################
 # Read points
@@ -53,14 +54,12 @@ def test_ogr_arcgen_points():
 
     feat = lyr.GetNextFeature()
     if feat.GetField(0) != 1:
-        gdaltest.post_reason('did not get expected ID')
         feat.DumpReadable()
-        return 'fail'
+        pytest.fail('did not get expected ID')
     if ogrtest.check_feature_geometry(feat, 'POINT (2 49)',
                                       max_error=0.0000001) != 0:
-        gdaltest.post_reason('did not get expected first geom')
         feat.DumpReadable()
-        return 'fail'
+        pytest.fail('did not get expected first geom')
 
     return 'success'
 
@@ -82,14 +81,12 @@ def test_ogr_arcgen_points25d():
 
     feat = lyr.GetNextFeature()
     if feat.GetField(0) != 1:
-        gdaltest.post_reason('did not get expected ID')
         feat.DumpReadable()
-        return 'fail'
+        pytest.fail('did not get expected ID')
     if ogrtest.check_feature_geometry(feat, 'POINT (2 49 10)',
                                       max_error=0.0000001) != 0:
-        gdaltest.post_reason('did not get expected first geom')
         feat.DumpReadable()
-        return 'fail'
+        pytest.fail('did not get expected first geom')
 
     return 'success'
 
@@ -109,14 +106,12 @@ def test_ogr_arcgen_lines():
 
     feat = lyr.GetNextFeature()
     if feat.GetField(0) != 1:
-        gdaltest.post_reason('did not get expected ID')
         feat.DumpReadable()
-        return 'fail'
+        pytest.fail('did not get expected ID')
     if ogrtest.check_feature_geometry(feat, 'LINESTRING (2 49,3 50)',
                                       max_error=0.0000001) != 0:
-        gdaltest.post_reason('did not get expected first geom')
         feat.DumpReadable()
-        return 'fail'
+        pytest.fail('did not get expected first geom')
 
     return 'success'
 
@@ -136,14 +131,12 @@ def test_ogr_arcgen_lines25d():
 
     feat = lyr.GetNextFeature()
     if feat.GetField(0) != 1:
-        gdaltest.post_reason('did not get expected ID')
         feat.DumpReadable()
-        return 'fail'
+        pytest.fail('did not get expected ID')
     if ogrtest.check_feature_geometry(feat, 'LINESTRING (2 49 10,3 50 10)',
                                       max_error=0.0000001) != 0:
-        gdaltest.post_reason('did not get expected first geom')
         feat.DumpReadable()
-        return 'fail'
+        pytest.fail('did not get expected first geom')
 
     return 'success'
 
@@ -163,14 +156,12 @@ def test_ogr_arcgen_polygons():
 
     feat = lyr.GetNextFeature()
     if feat.GetField(0) != 1:
-        print('did not get expected ID')
         feat.DumpReadable()
-        return 'fail'
+        pytest.fail('did not get expected ID')
     if ogrtest.check_feature_geometry(feat, 'POLYGON ((2 49,2 50,3 50,3 49,2 49))',
                                       max_error=0.0000001) != 0:
-        gdaltest.post_reason('did not get expected first geom')
         feat.DumpReadable()
-        return 'fail'
+        pytest.fail('did not get expected first geom')
 
     return 'success'
 
@@ -190,14 +181,12 @@ def test_ogr_arcgen_polygons25d():
 
     feat = lyr.GetNextFeature()
     if feat.GetField(0) != 1:
-        gdaltest.post_reason('did not get expected ID')
         feat.DumpReadable()
-        return 'fail'
+        pytest.fail('did not get expected ID')
     if ogrtest.check_feature_geometry(feat, 'POLYGON ((2 49 10,2 50 10,3 50 10,3 49 10,2 49 10))',
                                       max_error=0.0000001) != 0:
-        gdaltest.post_reason('did not get expected first geom')
         feat.DumpReadable()
-        return 'fail'
+        pytest.fail('did not get expected first geom')
 
     return 'success'
 
diff --git a/autotest/ogr/ogr_avc.py b/autotest/ogr/ogr_avc.py
index 2fe3b07e861c..2c02eff81a0e 100755
--- a/autotest/ogr/ogr_avc.py
+++ b/autotest/ogr/ogr_avc.py
@@ -35,6 +35,7 @@
 import ogrtest
 from osgeo import ogr
 from osgeo import gdal
+import pytest
 
 ###############################################################################
 #
@@ -68,7 +69,7 @@ def test_ogr_avc_1():
 
     if avc_ds is not None:
         return check_content(avc_ds)
-    return 'fail'
+    pytest.fail()
 
 ###############################################################################
 # Open AVCBin datasource.
@@ -81,7 +82,7 @@ def test_ogr_avc_2():
 
     if avc_ds is not None:
         return check_content(avc_ds)
-    return 'fail'
+    pytest.fail()
 
 ###############################################################################
 # Try opening a compressed E00 (which is not supported)
@@ -118,17 +119,15 @@ def test_ogr_avc_4():
         count = lyr.GetFeatureCount()
         assert count == 80, filename
         if last_feature.GetFieldCount() != 7:
-            print(filename)
             f.DumpReadable()
-            return 'fail'
+            pytest.fail(filename)
         if filename == 'data/testpointavc/testpointavc':
             fld_name = 'TESTPOINTAVC-ID'
         else:
             fld_name = 'WELLS-ID'
         if last_feature.GetField('ValueId') != 80 or last_feature.GetField(fld_name) != 80:
-            print(filename)
             f.DumpReadable()
-            return 'fail'
+            pytest.fail(filename)
 
     return 'success'
 
@@ -150,22 +149,19 @@ def test_ogr_avc_5():
         count = lyr.GetFeatureCount()
         assert count == 3, filename
         if last_feature.GetFieldCount() != 5:
-            print(filename)
             f.DumpReadable()
-            return 'fail'
+            pytest.fail(filename)
         if last_feature.GetField('ArcIds') != [-4, -5] or abs(last_feature.GetField('AREA') - 9939.059) > 1e-3:
-            print(filename)
             f.DumpReadable()
-            return 'fail'
+            pytest.fail(filename)
         if filename == 'data/testpolyavc/testpolyavc':
             expected_wkt = 'POLYGON ((340700.03125 4100199.5,340500.0 4100199.75,340599.96875 4100100.25,340700.03125 4100199.5))'
         else:
             # Likely a bug in AVCE00 driver
             expected_wkt = 'POLYGON ((340299.94 4100199.8,340099.88 4100200.0,340299.94 4100199.8))'
         if last_feature.GetGeometryRef().ExportToWkt() != expected_wkt:
-            print(filename)
             f.DumpReadable()
-            return 'fail'
+            pytest.fail(filename)
 
     return 'success'
 
diff --git a/autotest/ogr/ogr_basic_test.py b/autotest/ogr/ogr_basic_test.py
index b9e970df3a97..a2a3fb6f395e 100755
--- a/autotest/ogr/ogr_basic_test.py
+++ b/autotest/ogr/ogr_basic_test.py
@@ -35,6 +35,7 @@
 import ogrtest
 from osgeo import gdal
 from osgeo import ogr
+import pytest
 
 ###############################################################################
 
@@ -182,7 +183,7 @@ def test_ogr_basic_7():
     try:
         feat.SetFieldIntegerList
     except AttributeError:
-        return 'skip'
+        pytest.skip()
 
     feat_clone = feat.Clone()
     assert feat.Equal(feat_clone)
@@ -232,7 +233,7 @@ def test_ogr_basic_7():
     feat_clone = feat.Clone()
     if not feat.Equal(feat_clone):
         feat.DumpReadable()
-        return 'fail'
+        pytest.fail()
 
     feat_almost_clone = feat.Clone()
     geom = ogr.CreateGeometryFromWkt('POINT(0 1)')
@@ -240,7 +241,7 @@ def test_ogr_basic_7():
     if feat.Equal(feat_almost_clone):
         feat.DumpReadable()
         feat_almost_clone.DumpReadable()
-        return 'fail'
+        pytest.fail()
 
     feat_almost_clone = feat.Clone()
     geom = ogr.CreateGeometryFromWkt('POINT(0 1)')
@@ -248,83 +249,83 @@ def test_ogr_basic_7():
     if feat.Equal(feat_almost_clone):
         feat.DumpReadable()
         feat_almost_clone.DumpReadable()
-        return 'fail'
+        pytest.fail()
 
     feat_clone = feat.Clone()
     if not feat.Equal(feat_clone):
         feat.DumpReadable()
         feat_clone.DumpReadable()
-        return 'fail'
+        pytest.fail()
 
     feat_almost_clone = feat.Clone()
     feat_almost_clone.SetFID(99)
     if feat.Equal(feat_almost_clone):
         feat.DumpReadable()
         feat_almost_clone.DumpReadable()
-        return 'fail'
+        pytest.fail()
 
     feat_almost_clone = feat.Clone()
     feat_almost_clone.SetField(0, 2)
     if feat.Equal(feat_almost_clone):
         feat.DumpReadable()
         feat_almost_clone.DumpReadable()
-        return 'fail'
+        pytest.fail()
 
     feat_almost_clone = feat.Clone()
     feat_almost_clone.SetField(1, 2.2)
     if feat.Equal(feat_almost_clone):
         feat.DumpReadable()
         feat_almost_clone.DumpReadable()
-        return 'fail'
+        pytest.fail()
 
     feat_almost_clone = feat.Clone()
     feat_almost_clone.SetField(2, "B")
     if feat.Equal(feat_almost_clone):
         feat.DumpReadable()
         feat_almost_clone.DumpReadable()
-        return 'fail'
+        pytest.fail()
 
     feat_almost_clone = feat.Clone()
     feat_almost_clone.SetFieldIntegerList(3, [1, 2, 3])
     if feat.Equal(feat_almost_clone):
         feat.DumpReadable()
         feat_almost_clone.DumpReadable()
-        return 'fail'
+        pytest.fail()
 
     feat_almost_clone = feat.Clone()
     feat_almost_clone.SetFieldIntegerList(3, [1, 3])
     if feat.Equal(feat_almost_clone):
         feat.DumpReadable()
         feat_almost_clone.DumpReadable()
-        return 'fail'
+        pytest.fail()
 
     feat_almost_clone = feat.Clone()
     feat_almost_clone.SetFieldDoubleList(4, [1.2, 3.4, 5.6])
     if feat.Equal(feat_almost_clone):
         feat.DumpReadable()
         feat_almost_clone.DumpReadable()
-        return 'fail'
+        pytest.fail()
 
     feat_almost_clone = feat.Clone()
     feat_almost_clone.SetFieldDoubleList(4, [1.2, 3.5])
     if feat.Equal(feat_almost_clone):
         feat.DumpReadable()
         feat_almost_clone.DumpReadable()
-        return 'fail'
+        pytest.fail()
 
     feat_almost_clone = feat.Clone()
     feat_almost_clone.SetFieldStringList(5, ["A", "B", "C"])
     if feat.Equal(feat_almost_clone):
         feat.DumpReadable()
         feat_almost_clone.DumpReadable()
-        return 'fail'
+        pytest.fail()
 
     feat_almost_clone = feat.Clone()
     feat_almost_clone.SetFieldStringList(5, ["A", "D"])
     if feat.Equal(feat_almost_clone):
         feat.DumpReadable()
         feat_almost_clone.DumpReadable()
-        return 'fail'
+        pytest.fail()
 
     for num_field in [6, 7, 8]:
         for i in range(7):
@@ -335,28 +336,28 @@ def test_ogr_basic_7():
             if feat.Equal(feat_almost_clone):
                 feat.DumpReadable()
                 feat_almost_clone.DumpReadable()
-                return 'fail'
+                pytest.fail()
 
     feat_almost_clone = feat.Clone()
     feat_almost_clone.SetFieldBinaryFromHexString(9, '00')
     if feat.Equal(feat_almost_clone):
         feat.DumpReadable()
         feat_almost_clone.DumpReadable()
-        return 'fail'
+        pytest.fail()
 
     feat_almost_clone = feat.Clone()
     feat_almost_clone.SetField(10, 2)
     if feat.Equal(feat_almost_clone):
         feat.DumpReadable()
         feat_almost_clone.DumpReadable()
-        return 'fail'
+        pytest.fail()
 
     feat_almost_clone = feat.Clone()
     feat_almost_clone.SetField(10, 2)
     if feat.Equal(feat_almost_clone):
         feat.DumpReadable()
         feat_almost_clone.DumpReadable()
-        return 'fail'
+        pytest.fail()
 
     return 'success'
 
@@ -411,7 +412,7 @@ def test_ogr_basic_10():
 
     import test_cli_utilities
     if test_cli_utilities.get_test_ogrsf_path() is None:
-        return 'skip'
+        pytest.skip()
 
     ret = gdaltest.runexternal(test_cli_utilities.get_test_ogrsf_path() + ' -all_drivers')
 
@@ -426,7 +427,7 @@ def test_ogr_basic_10():
 def test_ogr_basic_11():
 
     if not ogrtest.have_geos():
-        return 'skip'
+        pytest.skip()
 
     used_exceptions_before = ogr.GetUseExceptions()
     for _ in range(2):
@@ -548,7 +549,7 @@ def test_ogr_basic_12():
         assert gdal.GetLastErrorMsg() != ''
         if abs(f.GetField('fld') - 1.23) < 1e-8:
             f.DumpReadable()
-            return 'fail'
+            pytest.fail()
 
     gdal.ErrorReset()
     gdal.PushErrorHandler('CPLQuietErrorHandler')
@@ -637,8 +638,7 @@ def test_ogr_basic_15():
         if used_exceptions_before == 0:
             ogr.DontUseExceptions()
 
-    print('Expected exception')
-    return 'fail'
+    pytest.fail('Expected exception')
 
 
 ###############################################################################
diff --git a/autotest/ogr/ogr_cad.py b/autotest/ogr/ogr_cad.py
index bebd37285367..84872903cdb3 100755
--- a/autotest/ogr/ogr_cad.py
+++ b/autotest/ogr/ogr_cad.py
@@ -37,6 +37,7 @@
 import ogrtest
 from osgeo import gdal
 from osgeo import ogr
+import pytest
 
 ###############################################################################
 # Check driver existence.
@@ -49,7 +50,7 @@ def test_ogr_cad_1():
 
     gdaltest.cad_dr = ogr.GetDriverByName('CAD')
     if gdaltest.cad_dr is None:
-        return 'skip'
+        pytest.skip()
 
     return 'success'
 
@@ -59,7 +60,7 @@ def test_ogr_cad_1():
 
 def test_ogr_cad_2():
     if gdaltest.cad_dr is None:
-        return 'skip'
+        pytest.skip()
 
     gdaltest.cad_ds = gdal.OpenEx('data/cad/ellipse_r2000.dwg', allowed_drivers=['CAD'])
 
@@ -118,7 +119,7 @@ def test_ogr_cad_2():
 
 def test_ogr_cad_3():
     if gdaltest.cad_dr is None:
-        return 'skip'
+        pytest.skip()
 
     gdaltest.cad_ds = gdal.OpenEx('data/cad/triple_circles_r2000.dwg', allowed_drivers=['CAD'])
 
@@ -247,7 +248,7 @@ def test_ogr_cad_3():
 
 def test_ogr_cad_4():
     if gdaltest.cad_dr is None:
-        return 'skip'
+        pytest.skip()
 
     gdaltest.cad_ds = gdal.OpenEx('data/cad/point2d_r2000.dwg', allowed_drivers=['CAD'])
 
@@ -271,7 +272,7 @@ def test_ogr_cad_4():
 
 def test_ogr_cad_5():
     if gdaltest.cad_dr is None:
-        return 'skip'
+        pytest.skip()
 
     gdaltest.cad_ds = gdal.OpenEx('data/cad/line_r2000.dwg', allowed_drivers=['CAD'])
 
@@ -296,7 +297,7 @@ def test_ogr_cad_5():
 
 def test_ogr_cad_6():
     if gdaltest.cad_dr is None:
-        return 'skip'
+        pytest.skip()
 
     gdaltest.cad_ds = gdal.OpenEx('data/cad/text_mtext_attdef_r2000.dwg', allowed_drivers=['CAD'])
 
@@ -325,7 +326,7 @@ def test_ogr_cad_6():
 
 def test_ogr_cad_7():
     if gdaltest.cad_dr is None:
-        return 'skip'
+        pytest.skip()
 
     feat = gdaltest.cad_layer.GetNextFeature()
 
@@ -344,7 +345,7 @@ def test_ogr_cad_7():
 
 def test_ogr_cad_8():
     if gdaltest.cad_dr is None:
-        return 'skip'
+        pytest.skip()
 
     feat = gdaltest.cad_layer.GetNextFeature()
 
@@ -363,7 +364,7 @@ def test_ogr_cad_8():
 
 def test_ogr_cad_9():
     if gdaltest.cad_dr is None:
-        return 'skip'
+        pytest.skip()
 
     with gdaltest.error_handler():
         ds = gdal.OpenEx('data/AC1018_signature.dwg', allowed_drivers=['CAD'])
diff --git a/autotest/ogr/ogr_carto.py b/autotest/ogr/ogr_carto.py
index 619d11b5c794..78458cac0220 100755
--- a/autotest/ogr/ogr_carto.py
+++ b/autotest/ogr/ogr_carto.py
@@ -38,6 +38,7 @@
 from osgeo import gdal
 from osgeo import ogr
 from osgeo import osr
+import pytest
 
 ###############################################################################
 # Test if driver is available
@@ -49,7 +50,7 @@ def test_ogr_carto_init():
 
     ogrtest.carto_drv = ogr.GetDriverByName('Carto')
     if ogrtest.carto_drv is None:
-        return 'skip'
+        pytest.skip()
 
     return 'success'
 
@@ -59,7 +60,7 @@ def test_ogr_carto_init():
 
 def test_ogr_carto_vsimem():
     if ogrtest.carto_drv is None:
-        return 'skip'
+        pytest.skip()
 
     ogrtest.carto_api_key_ori = gdal.GetConfigOption('CARTO_API_KEY')
     gdal.SetConfigOption('CARTO_API_URL', '/vsimem/carto')
@@ -189,7 +190,7 @@ def test_ogr_carto_vsimem():
     f = lyr.GetNextFeature()
     if f.GetFID() != 0:
         f.DumpReadable()
-        return 'fail'
+        pytest.fail()
 
     # Layer without geometry or primary key
     gdal.FileFromMemBuffer('/vsimem/carto&POSTFIELDS=q=SELECT * FROM "table1" LIMIT 0',
@@ -214,7 +215,7 @@ def test_ogr_carto_vsimem():
     if f['strfield'] != 'foo' or f['realfield'] != 1.23 or f['boolfield'] != 1 or \
        f['datefield'] != '2015/04/24 12:34:56.123+00':
         f.DumpReadable()
-        return 'fail'
+        pytest.fail()
 
     gdal.SetConfigOption('CARTO_API_KEY', 'foo')
     gdal.FileFromMemBuffer('/vsimem/carto&POSTFIELDS=q=SELECT current_schema() LIMIT 500 OFFSET 0&api_key=foo',
@@ -658,7 +659,7 @@ def test_ogr_carto_vsimem():
         ds = None
     if ret != 0 or f.GetFID() != 12:
         f.DumpReadable()
-        return 'fail'
+        pytest.fail()
 
     ds = gdal.OpenEx('CARTO:foo', gdal.OF_VECTOR | gdal.OF_UPDATE, open_options=['COPY_MODE=NO'])
     lyr = ds.GetLayer(0)
@@ -672,7 +673,7 @@ def test_ogr_carto_vsimem():
 
     if ret != 0 or f.GetFID() != 11:
         f.DumpReadable()
-        return 'fail'
+        pytest.fail()
 
     # Now remove default value to strfield
     gdal.FileFromMemBuffer(get_full_details_fields_url,
@@ -824,7 +825,7 @@ def test_ogr_carto_vsimem():
 
 def test_ogr_carto_vsimem_cleanup():
     if ogrtest.carto_drv is None:
-        return 'skip'
+        pytest.skip()
 
     gdal.SetConfigOption('CARTO_API_URL', None)
     gdal.SetConfigOption('CPL_CURL_ENABLE_VSIMEM', None)
@@ -843,21 +844,20 @@ def test_ogr_carto_vsimem_cleanup():
 
 def test_ogr_carto_test_ogrsf():
     if ogrtest.carto_drv is None or gdal.GetConfigOption('SKIP_SLOW') is not None:
-        return 'skip'
+        pytest.skip()
 
     if gdaltest.skip_on_travis():
-        return 'skip'
+        pytest.skip()
 
     ogrtest.carto_test_server = 'https://gdalautotest2.carto.com'
 
     if gdaltest.gdalurlopen(ogrtest.carto_test_server) is None:
-        print('cannot open %s' % ogrtest.carto_test_server)
         ogrtest.carto_drv = None
-        return 'skip'
+        pytest.skip('cannot open %s' % ogrtest.carto_test_server)
 
     import test_cli_utilities
     if test_cli_utilities.get_test_ogrsf_path() is None:
-        return 'skip'
+        pytest.skip()
 
     ret = gdaltest.runexternal(test_cli_utilities.get_test_ogrsf_path() + ' --config CARTO_HTTPS NO --config CARTO_PAGE_SIZE 300 -ro "CARTO:gdalautotest2 tables=tm_world_borders_simpl_0_3"')
 
@@ -875,15 +875,13 @@ def ogr_carto_rw_init():
 
     ogrtest.carto_connection = gdal.GetConfigOption('CARTO_CONNECTION')
     if ogrtest.carto_connection is None:
-        print('CARTO_CONNECTION missing')
-        return 'skip'
+        pytest.skip('CARTO_CONNECTION missing')
     if gdal.GetConfigOption('CARTO_API_KEY') is None:
-        print('CARTO_API_KEY missing')
-        return 'skip'
+        pytest.skip('CARTO_API_KEY missing')
 
     ogrtest.carto_drv = ogr.GetDriverByName('Carto')
     if ogrtest.carto_drv is None:
-        return 'skip'
+        pytest.skip()
 
     return 'success'
 
@@ -894,7 +892,7 @@ def ogr_carto_rw_init():
 def ogr_carto_rw_1():
 
     if ogrtest.carto_drv is None:
-        return 'skip'
+        pytest.skip()
 
     ds = ogr.Open(ogrtest.carto_connection, update=1)
     assert ds is not None
@@ -967,13 +965,13 @@ def ogr_carto_rw_1():
        f.GetGeometryRef().ExportToWkt() != 'POINT (3 4)':
         f.DumpReadable()
         ds.ExecuteSQL("DELLAYER:" + lyr_name)
-        return 'fail'
+        pytest.fail()
 
     lyr.DeleteFeature(fid)
     f = lyr.GetFeature(fid)
     if f is not None:
         ds.ExecuteSQL("DELLAYER:" + lyr_name)
-        return 'fail'
+        pytest.fail()
 
     # Non-differed field creation
     lyr.CreateField(ogr.FieldDefn("otherstrfield", ogr.OFTString))
@@ -1001,7 +999,7 @@ def ogr_carto_rw_1():
     if not f.GetField(0).startswith('POINT'):
         ds.ExecuteSQL("DELLAYER:" + lyr_name)
         ds.ReleaseResultSet(sql_lyr)
-        return 'fail'
+        pytest.fail()
     ds.ReleaseResultSet(sql_lyr)
 
     ds.ExecuteSQL("DELLAYER:" + lyr_name)
@@ -1034,20 +1032,20 @@ def ogr_carto_rw_1():
     lyr = ds.GetLayerByName(lyr_name)
     if lyr.GetLayerDefn().GetFieldDefn(lyr.GetLayerDefn().GetFieldIndex('nullable')).IsNullable() != 1:
         ds.ExecuteSQL("DELLAYER:" + lyr_name)
-        return 'fail'
+        pytest.fail()
     if lyr.GetLayerDefn().GetFieldDefn(lyr.GetLayerDefn().GetFieldIndex('not_nullable')).IsNullable() != 0:
         ds.ExecuteSQL("DELLAYER:" + lyr_name)
-        return 'fail'
+        pytest.fail()
     if lyr.GetLayerDefn().GetFieldDefn(lyr.GetLayerDefn().GetFieldIndex('field_string')).GetDefault() != "'a''b'":
         ds.ExecuteSQL("DELLAYER:" + lyr_name)
-        return 'fail'
+        pytest.fail()
     if lyr.GetLayerDefn().GetFieldDefn(lyr.GetLayerDefn().GetFieldIndex('field_datetime_with_default')).GetDefault() != 'CURRENT_TIMESTAMP':
         ds.ExecuteSQL("DELLAYER:" + lyr_name)
-        return 'fail'
+        pytest.fail()
     f = lyr.GetNextFeature()
     if f is None or f.GetField('field_string') != 'a\'b' or not f.IsFieldSet('field_datetime_with_default'):
         ds.ExecuteSQL("DELLAYER:" + lyr_name)
-        return 'fail'
+        pytest.fail()
     ds.ExecuteSQL("DELLAYER:" + lyr_name)
 
     return 'success'
diff --git a/autotest/ogr/ogr_cloudant.py b/autotest/ogr/ogr_cloudant.py
index cfda17131733..a920c4e8d3e8 100755
--- a/autotest/ogr/ogr_cloudant.py
+++ b/autotest/ogr/ogr_cloudant.py
@@ -37,6 +37,7 @@
 import gdaltest
 import ogrtest
 from osgeo import ogr
+import pytest
 
 ###############################################################################
 # Test if driver is available
@@ -52,7 +53,7 @@ def test_ogr_cloudant_init():
         pass
 
     if ogrtest.cloudant_drv is None:
-        return 'skip'
+        pytest.skip()
 
     if 'CLOUDANT_TEST_SERVER' in os.environ:
         ogrtest.cloudant_test_server = os.environ['CLOUDANT_TEST_SERVER']
@@ -64,9 +65,8 @@ def test_ogr_cloudant_init():
     ogrtest.cloudant_test_layer = 'gdaltest'
 
     if gdaltest.gdalurlopen(ogrtest.cloudant_test_url) is None:
-        print('cannot open %s' % ogrtest.cloudant_test_url)
         ogrtest.cloudant_drv = None
-        return 'skip'
+        pytest.skip('cannot open %s' % ogrtest.cloudant_test_url)
 
     return 'success'
 
@@ -76,7 +76,7 @@ def test_ogr_cloudant_init():
 
 def test_ogr_cloudant_GetFeatureCount():
     if ogrtest.cloudant_drv is None:
-        return 'skip'
+        pytest.skip()
 
     ds = ogr.Open('cloudant:%s/%s' % (ogrtest.cloudant_test_server, ogrtest.cloudant_test_layer))
     assert ds is not None
@@ -95,7 +95,7 @@ def test_ogr_cloudant_GetFeatureCount():
 
 def test_ogr_cloudant_GetNextFeature():
     if ogrtest.cloudant_drv is None:
-        return 'skip'
+        pytest.skip()
 
     ds = ogr.Open('cloudant:%s/%s' % (ogrtest.cloudant_test_server, ogrtest.cloudant_test_layer))
     assert ds is not None
@@ -106,9 +106,8 @@ def test_ogr_cloudant_GetNextFeature():
     feat = lyr.GetNextFeature()
     assert feat is not None, 'did not get expected feature'
     if feat.GetField('_id') != '0400000US01':
-        gdaltest.post_reason('did not get expected feature')
         feat.DumpReadable()
-        return 'fail'
+        pytest.fail('did not get expected feature')
 
     return 'success'
 
@@ -118,7 +117,7 @@ def test_ogr_cloudant_GetNextFeature():
 
 def test_ogr_cloudant_GetSpatialRef():
     if ogrtest.cloudant_drv is None:
-        return 'skip'
+        pytest.skip()
 
     ds = ogr.Open('cloudant:%s/%s' % (ogrtest.cloudant_test_server, ogrtest.cloudant_test_layer))
     assert ds is not None
@@ -139,7 +138,7 @@ def test_ogr_cloudant_GetSpatialRef():
 
 def test_ogr_cloudant_GetExtent():
     if ogrtest.cloudant_drv is None:
-        return 'skip'
+        pytest.skip()
 
     ds = ogr.Open('cloudant:%s/%s' % (ogrtest.cloudant_test_server, ogrtest.cloudant_test_layer))
     assert ds is not None
@@ -161,10 +160,10 @@ def test_ogr_cloudant_GetExtent():
 
 def test_ogr_cloudant_SetSpatialFilter():
     if ogrtest.cloudant_drv is None:
-        return 'skip'
+        pytest.skip()
 
     if not ogrtest.have_geos():
-        return 'skip'
+        pytest.skip()
 
     ds = ogr.Open('cloudant:%s/%s' % (ogrtest.cloudant_test_server, ogrtest.cloudant_test_layer))
     assert ds is not None
@@ -177,9 +176,8 @@ def test_ogr_cloudant_SetSpatialFilter():
     feat = lyr.GetNextFeature()
     assert feat is not None, 'did not get expected feature'
     if feat.GetField('NAME') != 'Colorado':
-        gdaltest.post_reason('did not get expected feature')
         feat.DumpReadable()
-        return 'fail'
+        pytest.fail('did not get expected feature')
 
     return 'success'
 
diff --git a/autotest/ogr/ogr_couchdb.py b/autotest/ogr/ogr_couchdb.py
index 14817d984c69..64935d0cf619 100755
--- a/autotest/ogr/ogr_couchdb.py
+++ b/autotest/ogr/ogr_couchdb.py
@@ -38,6 +38,7 @@
 import ogrtest
 from osgeo import gdal
 from osgeo import ogr
+import pytest
 
 ###############################################################################
 # Test if driver is available
@@ -49,7 +50,7 @@ def test_ogr_couchdb_init():
 
     ogrtest.couchdb_drv = ogr.GetDriverByName('CouchDB')
     if ogrtest.couchdb_drv is None:
-        return 'skip'
+        pytest.skip()
 
     if 'COUCHDB_TEST_SERVER' in os.environ:
         ogrtest.couchdb_test_server = os.environ['COUCHDB_TEST_SERVER']
@@ -58,9 +59,8 @@ def test_ogr_couchdb_init():
     ogrtest.couchdb_temp_layer_name = 'layer_' + str(uuid.uuid1()).replace('-', '_')
 
     if gdaltest.gdalurlopen(ogrtest.couchdb_test_server) is None:
-        print('cannot open %s' % ogrtest.couchdb_test_server)
         ogrtest.couchdb_drv = None
-        return 'skip'
+        pytest.skip('cannot open %s' % ogrtest.couchdb_test_server)
 
     return 'success'
 
@@ -70,7 +70,7 @@ def test_ogr_couchdb_init():
 
 def test_ogr_couchdb_1():
     if ogrtest.couchdb_drv is None:
-        return 'skip'
+        pytest.skip()
 
     gdal.VectorTranslate('CouchDB:' + ogrtest.couchdb_test_server, 'data/poly.shp',
                          format='CouchDB',
@@ -82,7 +82,7 @@ def test_ogr_couchdb_1():
     f = lyr.GetNextFeature()
     if f['AREA'] != 215229.266 or f['EAS_ID'] != '168' or f.GetGeometryRef() is None:
         f.DumpReadable()
-        return 'fail'
+        pytest.fail()
     ds.ExecuteSQL('DELLAYER:' + ogrtest.couchdb_temp_layer_name)
 
     return 'success'
@@ -93,7 +93,7 @@ def test_ogr_couchdb_1():
 
 def test_ogr_couchdb_2():
     if ogrtest.couchdb_drv is None:
-        return 'skip'
+        pytest.skip()
 
     ds = ogr.Open('couchdb:%s' % ogrtest.couchdb_test_server, update=1)
     assert ds is not None
@@ -114,17 +114,17 @@ def test_ogr_couchdb_2():
     f = lyr.GetNextFeature()
     if f['str_field'] != 'foo':
         f.DumpReadable()
-        return 'fail'
+        pytest.fail()
 
     f = lyr.GetNextFeature()
     if f['str_field'] is not None:
         f.DumpReadable()
-        return 'fail'
+        pytest.fail()
 
     f = lyr.GetNextFeature()
     if f.IsFieldSet('str_field'):
         f.DumpReadable()
-        return 'fail'
+        pytest.fail()
 
     return 'success'
 
@@ -134,7 +134,7 @@ def test_ogr_couchdb_2():
 
 def test_ogr_couchdb_cleanup():
     if ogrtest.couchdb_drv is None:
-        return 'skip'
+        pytest.skip()
 
     ds = ogr.Open('couchdb:%s' % ogrtest.couchdb_test_server, update=1)
     assert ds is not None
diff --git a/autotest/ogr/ogr_csv.py b/autotest/ogr/ogr_csv.py
index 9878569412ad..4a16b23ffae4 100755
--- a/autotest/ogr/ogr_csv.py
+++ b/autotest/ogr/ogr_csv.py
@@ -36,6 +36,7 @@
 from osgeo import ogr
 from osgeo import osr
 from osgeo import gdal
+import pytest
 
 ###############################################################################
 # Open CSV datasource.
@@ -48,7 +49,7 @@ def test_ogr_csv_1():
 
     if gdaltest.csv_ds is not None:
         return 'success'
-    return 'fail'
+    pytest.fail()
 
 
 ###############################################################################
@@ -84,7 +85,7 @@ def ogr_csv_check_layer(lyr, expect_code_as_numeric):
 
 def test_ogr_csv_2():
     if gdaltest.csv_ds is None:
-        return 'skip'
+        pytest.skip()
 
     with gdaltest.error_handler():
         assert gdaltest.csv_ds.CreateLayer('foo') is None
@@ -143,7 +144,7 @@ def ogr_csv_copy_layer(layer_name, options):
 
 def test_ogr_csv_3():
     if gdaltest.csv_ds is None:
-        return 'skip'
+        pytest.skip()
 
     #######################################################
     # Ensure any old copy of our working datasource is cleaned up
@@ -184,7 +185,7 @@ def test_ogr_csv_3():
 
 def test_ogr_csv_4():
     if gdaltest.csv_ds is None:
-        return 'skip'
+        pytest.skip()
 
     return ogr_csv_check_layer(gdaltest.csv_lyr1, True)
 
@@ -194,7 +195,7 @@ def test_ogr_csv_4():
 
 def test_ogr_csv_5():
     if gdaltest.csv_ds is None:
-        return 'skip'
+        pytest.skip()
 
     #######################################################
     # Create layer (.csv file)
@@ -209,7 +210,7 @@ def test_ogr_csv_5():
 
 def test_ogr_csv_6():
     if gdaltest.csv_ds is None:
-        return 'skip'
+        pytest.skip()
 
     return ogr_csv_check_layer(gdaltest.csv_lyr2, True)
 
@@ -220,7 +221,7 @@ def test_ogr_csv_6():
 
 def test_ogr_csv_7():
     if gdaltest.csv_ds is None:
-        return 'skip'
+        pytest.skip()
 
     lyr = gdaltest.csv_tmpds.GetLayer(0)
     assert lyr.GetName() == 'pm1', 'unexpected name for first layer'
@@ -248,7 +249,7 @@ def test_ogr_csv_7():
 
 def test_ogr_csv_8():
     if gdaltest.csv_ds is None:
-        return 'skip'
+        pytest.skip()
 
     gdaltest.csv_tmpds = ogr.Open('tmp/csvwrk', update=1)
 
@@ -272,7 +273,7 @@ def test_ogr_csv_8():
 
 def test_ogr_csv_9():
     if gdaltest.csv_ds is None:
-        return 'skip'
+        pytest.skip()
 
     gdaltest.csv_tmpds = ogr.Open('tmp/csvwrk', update=1)
 
@@ -304,7 +305,7 @@ def test_ogr_csv_9():
 
 def test_ogr_csv_10():
     if gdaltest.csv_ds is None:
-        return 'skip'
+        pytest.skip()
 
     lyr = gdaltest.csv_ds.GetLayerByName('prime_meridian')
 
@@ -422,7 +423,7 @@ def ogr_csv_check_testcsvt(lyr):
 def test_ogr_csv_11():
 
     if gdaltest.csv_ds is None:
-        return 'skip'
+        pytest.skip()
 
     gdaltest.csv_ds = None
     gdaltest.csv_ds = ogr.Open('data/testcsvt.csv')
@@ -440,7 +441,7 @@ def test_ogr_csv_11():
 def test_ogr_csv_12():
 
     if gdaltest.csv_ds is None:
-        return 'skip'
+        pytest.skip()
 
     srclyr = gdaltest.csv_ds.GetLayerByName('testcsvt')
 
@@ -498,7 +499,7 @@ def test_ogr_csv_12():
 def test_ogr_csv_13():
 
     if gdaltest.csv_ds is None:
-        return 'skip'
+        pytest.skip()
 
     gdaltest.csv_tmpds = ogr.Open('tmp/csvwrk', update=1)
 
@@ -652,7 +653,7 @@ def test_ogr_csv_13():
 
 def test_ogr_csv_14():
     if gdaltest.csv_ds is None:
-        return 'skip'
+        pytest.skip()
 
     gdaltest.csv_tmpds = ogr.Open('tmp/csvwrk', update=1)
     gdaltest.csv_ds = None
@@ -671,7 +672,7 @@ def test_ogr_csv_14():
 
 def test_ogr_csv_15():
     if gdaltest.csv_ds is None:
-        return 'skip'
+        pytest.skip()
 
     return ogr_csv_check_layer(gdaltest.csv_lyr1, True)
 
@@ -682,7 +683,7 @@ def test_ogr_csv_15():
 
 def test_ogr_csv_16():
     if gdaltest.csv_ds is None:
-        return 'skip'
+        pytest.skip()
 
     gdaltest.csv_tmpds = None
     gdaltest.csv_tmpds = ogr.Open('tmp/csvwrk')
@@ -697,7 +698,7 @@ def test_ogr_csv_16():
 
 def test_ogr_csv_17():
     if gdaltest.csv_ds is None:
-        return 'skip'
+        pytest.skip()
 
     csv_ds = ogr.Open('data/wkt.csv')
     csv_lyr = csv_ds.GetLayer(0)
@@ -744,7 +745,7 @@ def test_ogr_csv_18():
 def test_ogr_csv_19():
 
     if gdaltest.csv_ds is None:
-        return 'skip'
+        pytest.skip()
 
     gdaltest.csv_ds = None
     gdaltest.csv_ds = ogr.Open('data/testnull.csv')
@@ -774,7 +775,7 @@ def test_ogr_csv_19():
 def test_ogr_csv_20():
 
     if gdaltest.csv_ds is None:
-        return 'skip'
+        pytest.skip()
 
     gdaltest.csv_ds = None
 
@@ -819,7 +820,7 @@ def test_ogr_csv_20():
 def test_ogr_csv_21():
 
     if gdaltest.csv_ds is None:
-        return 'skip'
+        pytest.skip()
 
     gdaltest.csv_ds = None
 
@@ -1042,7 +1043,7 @@ def test_ogr_csv_27():
        feat.GetField('time_2012') != 2.34 or \
        feat.IsFieldSet('time_2012_flag'):
         feat.DumpReadable()
-        return 'fail'
+        pytest.fail()
 
     return 'success'
 
@@ -1103,11 +1104,11 @@ def test_ogr_csv_29():
     geom = feat.GetGeomFieldRef('geom__WKT_lyr1_EPSG_4326')
     if geom.ExportToWkt() != 'POINT (1 2)':
         feat.DumpReadable()
-        return 'fail'
+        pytest.fail()
     geom = feat.GetGeomFieldRef('geom__WKT_lyr2_EPSG_32632')
     if geom.ExportToWkt() != 'POLYGON ((0 0,0 1,1 1,1 0,0 0))':
         feat.DumpReadable()
-        return 'fail'
+        pytest.fail()
     ds = None
 
     return 'success'
@@ -1120,7 +1121,7 @@ def test_ogr_csv_30():
 
     import test_cli_utilities
     if test_cli_utilities.get_test_ogrsf_path() is None:
-        return 'skip'
+        pytest.skip()
 
     ret = gdaltest.runexternal(test_cli_utilities.get_test_ogrsf_path() + ' tmp/ogr_csv_29')
 
@@ -1140,13 +1141,13 @@ def test_ogr_csv_31():
     if f.GetField('GEONAMEID') != '3038814' or f.GetField('LATITUDE') != 42.5 or \
        f.GetGeometryRef().ExportToWkt() != 'POINT (1.48333 42.5)':
         f.DumpReadable()
-        return 'fail'
+        pytest.fail()
 
     lyr.ResetReading()
     f = lyr.GetNextFeature()
     if f.GetField('GEONAMEID') != '3038814':
         f.DumpReadable()
-        return 'fail'
+        pytest.fail()
 
     assert lyr.GetFeatureCount() == 10
 
@@ -1169,9 +1170,8 @@ def test_ogr_csv_32():
         assert (lyr.GetLayerDefn().GetFieldDefn(i).GetType() == ogr.OFTString and \
            lyr.GetLayerDefn().GetFieldDefn(i).GetWidth() == 0)
         if f.GetField(i) != col_values[i]:
-            print(i)
             f.DumpReadable()
-            return 'fail'
+            pytest.fail(i)
 
     # Without limit, everything will be detected as string
     ds = gdal.OpenEx('data/testtypeautodetect.csv', gdal.OF_VECTOR,
@@ -1182,9 +1182,8 @@ def test_ogr_csv_32():
         assert (lyr.GetLayerDefn().GetFieldDefn(i).GetType() == ogr.OFTString and \
            lyr.GetLayerDefn().GetFieldDefn(i).GetWidth() == 0)
         if f.GetField(i) != col_values[i]:
-            print(i)
             f.DumpReadable()
-            return 'fail'
+            pytest.fail(i)
 
     # We limit to the first "1.5" line
     ds = gdal.OpenEx('data/testtypeautodetect.csv', gdal.OF_VECTOR,
@@ -1200,9 +1199,8 @@ def test_ogr_csv_32():
         assert (lyr.GetLayerDefn().GetFieldDefn(i).GetType() == col_type[i] and \
            lyr.GetLayerDefn().GetFieldDefn(i).GetWidth() == 0)
         if f.GetField(i) != col_values[i]:
-            print(i)
             f.DumpReadable()
-            return 'fail'
+            pytest.fail(i)
 
     # Without QUOTED_FIELDS_AS_STRING=YES, str3 will be detected as integer
     ds = gdal.OpenEx('data/testtypeautodetect.csv', gdal.OF_VECTOR,
@@ -1224,9 +1222,8 @@ def test_ogr_csv_32():
         assert (lyr.GetLayerDefn().GetFieldDefn(i).GetType() == col_type[i] and \
            lyr.GetLayerDefn().GetFieldDefn(i).GetWidth() == 0)
         if f.GetField(i) != col_values[i]:
-            print(i)
             f.DumpReadable()
-            return 'fail'
+            pytest.fail(i)
 
     # Test AUTODETECT_WIDTH=YES
     ds = gdal.OpenEx('data/testtypeautodetect.csv', gdal.OF_VECTOR,
@@ -1241,9 +1238,8 @@ def test_ogr_csv_32():
            lyr.GetLayerDefn().GetFieldDefn(i).GetWidth() == col_width[i] and \
            lyr.GetLayerDefn().GetFieldDefn(i).GetPrecision() == col_precision[i])
         if f.GetField(i) != col_values[i]:
-            print(i)
             f.DumpReadable()
-            return 'fail'
+            pytest.fail(i)
 
     # Test AUTODETECT_WIDTH=STRING_ONLY
     ds = gdal.OpenEx('data/testtypeautodetect.csv', gdal.OF_VECTOR,
@@ -1258,9 +1254,8 @@ def test_ogr_csv_32():
            lyr.GetLayerDefn().GetFieldDefn(i).GetWidth() == col_width[i] and \
            lyr.GetLayerDefn().GetFieldDefn(i).GetPrecision() == col_precision[i])
         if f.GetField(i) != col_values[i]:
-            print(i)
             f.DumpReadable()
-            return 'fail'
+            pytest.fail(i)
 
     # Test KEEP_SOURCE_COLUMNS=YES
     ds = gdal.OpenEx('data/testtypeautodetect.csv', gdal.OF_VECTOR,
@@ -1276,9 +1271,8 @@ def test_ogr_csv_32():
         assert (lyr.GetLayerDefn().GetFieldDefn(i).GetType() == ogr.OFTString or \
            lyr.GetLayerDefn().GetFieldDefn(i + 1).GetNameRef() == lyr.GetLayerDefn().GetFieldDefn(i).GetNameRef() + '_original')
         if f.GetField(i) != col_values[i]:
-            print(i)
             f.DumpReadable()
-            return 'fail'
+            pytest.fail(i)
 
     # Test warnings
     for fid in [3,  # string in real field
@@ -1297,9 +1291,8 @@ def test_ogr_csv_32():
         lyr.GetFeature(fid)
         gdal.PopErrorHandler()
         if gdal.GetLastErrorType() != gdal.CE_Warning:
-            print(fid)
             f.DumpReadable()
-            return 'fail'
+            pytest.fail(fid)
 
     # Test Real -> Integer64 (https://github.com/OSGeo/gdal/issues/343)
     gdal.FileFromMemBuffer('/vsimem/testtypeautodetect.csv',
@@ -1313,7 +1306,7 @@ def test_ogr_csv_32():
     f = lyr.GetNextFeature()
     if f.GetField(0) != 1.2:
         f.DumpReadable()
-        return 'fail'
+        pytest.fail()
 
     return 'success'
 
@@ -1332,9 +1325,8 @@ def test_ogr_csv_33():
         assert (not (i < 10 and lyr.GetLayerDefn().GetFieldDefn(i).GetSubType() != ogr.OFSTBoolean) or \
            (i >= 10 and lyr.GetLayerDefn().GetFieldDefn(i).GetSubType() == ogr.OFSTBoolean))
         if f.GetField(i) != col_values[i]:
-            print(i)
             f.DumpReadable()
-            return 'fail'
+            pytest.fail(i)
     ds = None
 
     ds = ogr.GetDriverByName('CSV').CreateDataSource('/vsimem/subtypes.csv')
@@ -1367,7 +1359,7 @@ def test_ogr_csv_33():
     f = lyr.GetNextFeature()
     if f.GetField(0) != 1 or f.GetField(1) != -32768 or f.GetField(2) != 1.23:
         f.DumpReadable()
-        return 'fail'
+        pytest.fail()
     ds = None
 
     gdal.Unlink('/vsimem/subtypes.csv')
@@ -1388,16 +1380,14 @@ def test_ogr_csv_34():
     col_values = [1, 10000000000, 10000000000, 10000000000.0]
     for i in range(lyr.GetLayerDefn().GetFieldCount()):
         if f.GetField(i) != col_values[i]:
-            print(i)
             f.DumpReadable()
-            return 'fail'
+            pytest.fail(i)
     f = lyr.GetNextFeature()
     col_values = [10000000000, 1, 10000000000, 1.0]
     for i in range(lyr.GetLayerDefn().GetFieldCount()):
         if f.GetField(i) != col_values[i]:
-            print(i)
             f.DumpReadable()
-            return 'fail'
+            pytest.fail(i)
     ds = None
 
     ds = ogr.GetDriverByName('CSV').CreateDataSource('/vsimem/int64.csv')
@@ -1415,7 +1405,7 @@ def test_ogr_csv_34():
     f = lyr.GetNextFeature()
     if f.GetField(0) != 10000000000:
         f.DumpReadable()
-        return 'fail'
+        pytest.fail()
     ds = None
 
     gdal.Unlink('/vsimem/int64.csv')
@@ -1440,7 +1430,7 @@ def test_ogr_csv_35():
     f = lyr.GetNextFeature()
     if f['FIELD_1'] != 'VAL1' or f['FIELD 2'] != 'VAL 2' or f['FIELD_3'] != 'VAL 3':
         f.DumpReadable()
-        return 'fail'
+        pytest.fail()
     ds = None
 
     gdal.Unlink('/vsimem/ogr_csv_35.csv')
@@ -1486,23 +1476,23 @@ def test_ogr_csv_36():
     f = lyr.GetNextFeature()
     if f.GetGeometryRef().ExportToWkt() != 'POINT (1 2)' or f['id'] != '1' or f['mygeometry'] != 'POINT(1 2)' or f['format'] != 'wkt':
         f.DumpReadable()
-        return 'fail'
+        pytest.fail()
     f = lyr.GetNextFeature()
     if f.GetGeometryRef().ExportToWkt() != 'POINT (2 49)':
         f.DumpReadable()
-        return 'fail'
+        pytest.fail()
     f = lyr.GetNextFeature()
     if f.GetGeometryRef().ExportToWkt() != 'POINT (3 50)':
         f.DumpReadable()
-        return 'fail'
+        pytest.fail()
     f = lyr.GetNextFeature()
     if f.GetGeometryRef().ExportToWkt() != 'POINT (3 50)':
         f.DumpReadable()
-        return 'fail'
+        pytest.fail()
     f = lyr.GetNextFeature()
     if f.GetGeometryRef() is not None:
         f.DumpReadable()
-        return 'fail'
+        pytest.fail()
     ds = None
 
     # Test prefix* pattern
@@ -1512,7 +1502,7 @@ def test_ogr_csv_36():
     f = lyr.GetNextFeature()
     if f.GetGeometryRef().ExportToWkt() != 'POINT (1 2)':
         f.DumpReadable()
-        return 'fail'
+        pytest.fail()
     ds = None
 
     # Test *suffix pattern
@@ -1522,7 +1512,7 @@ def test_ogr_csv_36():
     f = lyr.GetNextFeature()
     if f.GetGeometryRef().ExportToWkt() != 'POINT (1 2)':
         f.DumpReadable()
-        return 'fail'
+        pytest.fail()
     ds = None
 
     # Test *middle* pattern
@@ -1532,7 +1522,7 @@ def test_ogr_csv_36():
     f = lyr.GetNextFeature()
     if f.GetGeometryRef().ExportToWkt() != 'POINT (1 2)':
         f.DumpReadable()
-        return 'fail'
+        pytest.fail()
     ds = None
 
     # Test non matching pattern
@@ -1550,7 +1540,7 @@ def test_ogr_csv_36():
     f = lyr.GetNextFeature()
     if f.GetGeometryRef().ExportToWkt() != 'POINT (1 2)' or f['id'] != '1' or f['format'] != 'wkt':
         f.DumpReadable()
-        return 'fail'
+        pytest.fail()
     ds = None
 
     gdal.Unlink('/vsimem/ogr_csv_36.csv')
@@ -1576,15 +1566,15 @@ def test_ogr_csv_37():
     f = lyr.GetNextFeature()
     if f.GetGeometryRef().ExportToWkt() != 'POINT (2 49)' or f['id'] != '1' or f['x'] != 2 or f['y'] != 49 or f['other'] != 'a' or f['z'] != '100':
         f.DumpReadable()
-        return 'fail'
+        pytest.fail()
     f = lyr.GetNextFeature()
     if f.GetGeometryRef().ExportToWkt() != 'POINT (3 50)':
         f.DumpReadable()
-        return 'fail'
+        pytest.fail()
     f = lyr.GetNextFeature()
     if f.GetGeometryRef() is not None:
         f.DumpReadable()
-        return 'fail'
+        pytest.fail()
     ds = None
 
     # Check Z_POSSIBLE_NAMES
@@ -1594,15 +1584,15 @@ def test_ogr_csv_37():
     f = lyr.GetNextFeature()
     if f.GetGeometryRef().ExportToWkt() != 'POINT (2 49 100)' or f['id'] != '1' or f['x'] != 2 or f['y'] != 49 or f['other'] != 'a' or f['z'] != 100:
         f.DumpReadable()
-        return 'fail'
+        pytest.fail()
     f = lyr.GetNextFeature()
     if f.GetGeometryRef().ExportToWkt() != 'POINT (3 50)':
         f.DumpReadable()
-        return 'fail'
+        pytest.fail()
     f = lyr.GetNextFeature()
     if f.GetGeometryRef() is not None:
         f.DumpReadable()
-        return 'fail'
+        pytest.fail()
     ds = None
 
     # Check KEEP_GEOM_COLUMNS=NO
@@ -1613,7 +1603,7 @@ def test_ogr_csv_37():
     f = lyr.GetNextFeature()
     if f.GetGeometryRef().ExportToWkt() != 'POINT (2 49)' or f['id'] != '1' or f['other'] != 'a':
         f.DumpReadable()
-        return 'fail'
+        pytest.fail()
     ds = None
 
     gdal.Unlink('/vsimem/ogr_csv_37.csv')
@@ -1644,7 +1634,7 @@ def test_ogr_csv_38():
     f = lyr.GetNextFeature()
     if f.GetGeometryRef().ExportToWkt() != 'POINT (2 49)':
         f.DumpReadable()
-        return 'fail'
+        pytest.fail()
     ds = None
 
     gdal.Unlink('/vsimem/ogr_csv_38.csv')
@@ -1673,7 +1663,7 @@ def test_ogr_csv_39():
     f = lyr.GetNextFeature()
     if f.GetGeometryRef().ExportToWkt() != 'POINT (2 49)':
         f.DumpReadable()
-        return 'fail'
+        pytest.fail()
     ds = None
 
     gdal.Unlink('/vsimem/ogr_csv_39.csv')
@@ -1698,7 +1688,7 @@ def test_ogr_csv_40():
     f = lyr.GetNextFeature()
     if f.GetGeometryRef().ExportToWkt() != 'POINT (2 49)' or f['id'] != '1' or f['the_geom'] != '0101000020E61000004486E281C5C257C068B89DDA998F4640':
         f.DumpReadable()
-        return 'fail'
+        pytest.fail()
     f = lyr.GetNextFeature()
     ds = None
 
@@ -1715,7 +1705,7 @@ def test_ogr_csv_40():
     f = lyr.GetNextFeature()
     if f.GetGeometryRef().ExportToWkt().find('POINT (-95.04') < 0 or f['id'] != '1' or f['longitude'] != '2' or f['latitude'] != '49':
         f.DumpReadable()
-        return 'fail'
+        pytest.fail()
     f = lyr.GetNextFeature()
     ds = None
 
@@ -1740,7 +1730,7 @@ def test_ogr_csv_41():
     f = lyr.GetNextFeature()
     if f.GetGeometryRef() is not None or f['id'] != '1' or f['foo'] != 'bar':
         f.DumpReadable()
-        return 'fail'
+        pytest.fail()
     ds = None
 
     gdal.Unlink('/vsimem/ogr_csv_41.csv')
@@ -1783,7 +1773,7 @@ def test_ogr_csv_43():
     f = lyr.GetNextFeature()
     if f['id'] != 1:
         f.DumpReadable()
-        return 'fail'
+        pytest.fail()
     f = None
 
     assert lyr.TestCapability(ogr.OLCCreateField) == 1
@@ -1797,12 +1787,12 @@ def test_ogr_csv_43():
     f = lyr.GetFeature(1)
     if f['id'] != 1 or f['foo'] != 'bar' or f.GetGeometryRef().ExportToWkt() != 'POINT (2 49)':
         f.DumpReadable()
-        return 'fail'
+        pytest.fail()
     lyr.ResetReading()
     f = lyr.GetNextFeature()
     if f['id'] != 1 or f['foo'] != 'bar' or f.GetGeometryRef().ExportToWkt() != 'POINT (2 49)':
         f.DumpReadable()
-        return 'fail'
+        pytest.fail()
     f = lyr.GetNextFeature()
     assert f is None
     assert lyr.GetFeatureCount() == 1
@@ -1815,17 +1805,17 @@ def test_ogr_csv_43():
     f = lyr.GetFeature(2)
     if f['id'] != 2 or f['foo'] != 'baz' or f.GetGeometryRef().ExportToWkt() != 'POINT (3 50)':
         f.DumpReadable()
-        return 'fail'
+        pytest.fail()
     assert lyr.GetFeatureCount() == 2
     lyr.SetNextByIndex(1)
     f = lyr.GetNextFeature()
     if f['id'] != 2:
         f.DumpReadable()
-        return 'fail'
+        pytest.fail()
     f = lyr.GetNextFeature()
     if f is not None:
         f.DumpReadable()
-        return 'fail'
+        pytest.fail()
     f = None
 
     ds = None
@@ -1835,7 +1825,7 @@ def test_ogr_csv_43():
     f = lyr.GetFeature(2)
     if f['id'] != 2 or f['foo'] != 'baz' or f.GetGeometryRef().ExportToWkt() != 'POINT (3 50)':
         f.DumpReadable()
-        return 'fail'
+        pytest.fail()
     f = None
     assert lyr.TestCapability(ogr.OLCDeleteField) == 1
     with gdaltest.error_handler():
@@ -1870,7 +1860,7 @@ def test_ogr_csv_43():
     f = lyr.GetFeature(2)
     if f['id'] != 3:
         f.DumpReadable()
-        return 'fail'
+        pytest.fail()
     f = None
     assert lyr.DeleteField(lyr.GetLayerDefn().GetFieldIndex('foo')) == 0
     f = ogr.Feature(lyr.GetLayerDefn())
@@ -1878,7 +1868,7 @@ def test_ogr_csv_43():
     assert lyr.CreateFeature(f) == 0
     if f.GetFID() != 3:
         f.DumpReadable()
-        return 'fail'
+        pytest.fail()
     assert lyr.GetExtent() == (2.0, 4.0, 49.0, 51.0)
     assert lyr.DeleteFeature(f.GetFID()) == 0
     assert lyr.GetFeatureCount() == 2
@@ -1936,7 +1926,7 @@ def test_ogr_csv_43():
     f = lyr.GetFeature(2)
     if f['WKT'] != 'POINT (1 2)' or f['_WKT_2'] != 'POINT (3 4)':
         f.DumpReadable()
-        return 'fail'
+        pytest.fail()
     assert lyr.SetFeature(f) == 0
     f = None
     assert lyr.DeleteFeature(2) == 0
@@ -1965,14 +1955,14 @@ def test_ogr_csv_44():
     f = lyr.GetFeature(1)
     if f['id'] != 1 or f.GetGeometryRef().ExportToWkt() != 'POINT (2 49)':
         f.DumpReadable()
-        return 'fail'
+        pytest.fail()
     f = ogr.Feature(lyr.GetLayerDefn())
     f.SetField('id', 2)
     assert lyr.CreateFeature(f) == 0
     f = lyr.GetFeature(2)
     if f['id'] != 2 or f.GetGeometryRef() is not None:
         f.DumpReadable()
-        return 'fail'
+        pytest.fail()
     ds = None
 
     gdal.Unlink('/vsimem/ogr_csv_44.csv')
@@ -2039,7 +2029,7 @@ def test_ogr_csv_46():
     f = lyr.GetNextFeature()
     if f['id'] != '1' or f['X'] != '10' or f['Y'] != '20' or f['Z'] != '3':
         f.DumpReadable()
-        return 'fail'
+        pytest.fail()
     ds = None
 
     ds = gdal.OpenEx('/vsimem/ogr_csv_46.csv', gdal.OF_VECTOR | gdal.OF_UPDATE, open_options=['KEEP_GEOM_COLUMNS=NO', 'X_POSSIBLE_NAMES=X', 'Y_POSSIBLE_NAMES=Y'])
@@ -2056,7 +2046,7 @@ def test_ogr_csv_46():
     f = lyr.GetNextFeature()
     if f['id'] != '1' or f['X'] != '-10' or f['Y'] != '-20' or f['Z'] != '3':
         f.DumpReadable()
-        return 'fail'
+        pytest.fail()
     ds = None
 
     ds = gdal.OpenEx('/vsimem/ogr_csv_46.csv', gdal.OF_VECTOR | gdal.OF_UPDATE, open_options=['KEEP_GEOM_COLUMNS=NO', 'X_POSSIBLE_NAMES=X', 'Y_POSSIBLE_NAMES=Y', 'Z_POSSIBLE_NAMES=Z'])
@@ -2073,7 +2063,7 @@ def test_ogr_csv_46():
     f = lyr.GetNextFeature()
     if f['id'] != '1' or f['X'] != '-1' or f['Y'] != '-2' or f['Z'] != '-3':
         f.DumpReadable()
-        return 'fail'
+        pytest.fail()
     ds = None
 
     gdal.Unlink('/vsimem/ogr_csv_46.csv')
@@ -2103,7 +2093,7 @@ def test_ogr_csv_47():
     f = lyr.GetNextFeature()
     if f.GetGeometryRef().ExportToIsoWkt() != 'POINT ZM (1 2 3 4)':
         f.DumpReadable()
-        return 'fail'
+        pytest.fail()
     ds = None
 
     gdal.Unlink('/vsimem/ogr_csv_47.csv')
@@ -2158,7 +2148,7 @@ def test_ogr_csv_49():
     f = lyr.GetNextFeature()
     if not f.IsFieldNull('str'):
         f.DumpReadable()
-        return 'fail'
+        pytest.fail()
     ds = None
 
     gdal.Unlink('/vsimem/ogr_csv_49.csv')
@@ -2302,7 +2292,7 @@ def test_ogr_csv_iter_and_set_feature():
 def test_ogr_csv_cleanup():
 
     if gdaltest.csv_ds is None:
-        return 'skip'
+        pytest.skip()
 
     gdaltest.csv_ds = None
 
diff --git a/autotest/ogr/ogr_csw.py b/autotest/ogr/ogr_csw.py
index 40ed75b23cc1..2026ead6581d 100755
--- a/autotest/ogr/ogr_csw.py
+++ b/autotest/ogr/ogr_csw.py
@@ -52,9 +52,8 @@ def ogr_csw_init():
     if gml_ds is None:
         gdaltest.csw_drv = None
         if gdal.GetLastErrorMsg().find('Xerces') != -1:
-            return 'skip'
-        gdaltest.post_reason('failed to open test file.')
-        return 'skip'
+            pytest.skip()
+        pytest.skip('failed to open test file.')
 
     return 'success'
 
@@ -67,10 +66,8 @@ def test_ogr_csw_pycsw():
     ds = ogr.Open('CSW:http://catalog.data.gov/csw')
     if ds is None:
         if gdaltest.gdalurlopen('http://catalog.data.gov/csw') is None:
-            print('cannot open URL')
-            return 'skip'
-        gdaltest.post_reason('did not managed to open CSW datastore')
-        return 'skip'
+            pytest.skip('cannot open URL')
+        pytest.skip('did not managed to open CSW datastore')
     lyr = ds.GetLayer(0)
     f = lyr.GetNextFeature()
     assert f is not None, 'did not get expected layer name'
@@ -289,7 +286,7 @@ def test_ogr_csw_vsimem_csw_minimal_instance():
        f['format'] != 'a_format' or f['other_formats'] != ['another_format'] or \
        f['boundingbox'].ExportToWkt() != 'POLYGON ((-180 -90,-180 90,180 90,180 -90,-180 -90))':
         f.DumpReadable()
-        return 'fail'
+        pytest.fail()
     f = lyr.GetNextFeature()
     assert f is not None
     gdal.PushErrorHandler()
@@ -496,7 +493,7 @@ def test_ogr_csw_vsimem_csw_output_schema_csw():
     if f['raw_xml'].find('<csw:Record') != 0 or \
        f['boundingbox'].ExportToWkt() != 'POLYGON ((-180 -90,-180 90,180 90,180 -90,-180 -90))':
         f.DumpReadable()
-        return 'fail'
+        pytest.fail()
 
     return 'success'
 
@@ -537,7 +534,7 @@ def test_ogr_csw_vsimem_csw_output_schema_gmd():
     if f['raw_xml'].find('<gmd:MD_Metadata') != 0 or \
        f['boundingbox'].ExportToWkt() != 'POLYGON ((-180 -90,-180 90,180 90,180 -90,-180 -90))':
         f.DumpReadable()
-        return 'fail'
+        pytest.fail()
 
     return 'success'
 
@@ -580,7 +577,7 @@ def test_ogr_csw_vsimem_csw_output_schema_fgdc():
     if f['raw_xml'].find('<metadata') != 0 or \
        f['boundingbox'].ExportToWkt() != 'POLYGON ((-180 -90,-180 90,180 90,180 -90,-180 -90))':
         f.DumpReadable()
-        return 'fail'
+        pytest.fail()
 
     return 'success'
 
diff --git a/autotest/ogr/ogr_db2.py b/autotest/ogr/ogr_db2.py
index 2285dee6ca83..8946403ae91f 100755
--- a/autotest/ogr/ogr_db2.py
+++ b/autotest/ogr/ogr_db2.py
@@ -45,6 +45,7 @@
 import gdaltest
 import ogrtest
 from osgeo import ogr
+import pytest
 
 ###############################################################################
 # Test if driver is available
@@ -57,7 +58,7 @@ def test_ogr_db2_check_driver():
     ogrtest.db2_drv = ogr.GetDriverByName('DB2ODBC')
 
     if ogrtest.db2_drv is None:
-        return 'skip'
+        pytest.skip()
 
     return 'success'
 
@@ -68,14 +69,13 @@ def test_ogr_db2_check_driver():
 def test_ogr_db2_init():
 
     if ogrtest.db2_drv is None:
-        return 'skip'
+        pytest.skip()
 
     if 'DB2_TEST_SERVER' in os.environ:
         ogrtest.db2_test_server = "DB2ODBC:" + os.environ['DB2_TEST_SERVER']
     else:
-        gdaltest.post_reason('Environment variable DB2_TEST_SERVER not found')
         ogrtest.db2_drv = None
-        return 'skip'
+        pytest.skip('Environment variable DB2_TEST_SERVER not found')
 
     return 'success'
 ###############################################################################
@@ -85,7 +85,7 @@ def test_ogr_db2_init():
 def test_ogr_db2_GetFeatureCount():
 
     if ogrtest.db2_drv is None:
-        return 'skip'
+        pytest.skip()
 
     ds = ogr.Open(ogrtest.db2_test_server)
 
@@ -107,7 +107,7 @@ def test_ogr_db2_GetFeatureCount():
 def test_ogr_db2_GetSpatialRef():
 
     if ogrtest.db2_drv is None:
-        return 'skip'
+        pytest.skip()
 
     ds = ogr.Open(ogrtest.db2_test_server)
 
@@ -133,7 +133,7 @@ def test_ogr_db2_GetSpatialRef():
 def test_ogr_db2_GetExtent():
 
     if ogrtest.db2_drv is None:
-        return 'skip'
+        pytest.skip()
 
     ds = ogr.Open(ogrtest.db2_test_server)
 
@@ -158,7 +158,7 @@ def test_ogr_db2_GetExtent():
 def test_ogr_db2_GetFeature():
 
     if ogrtest.db2_drv is None:
-        return 'skip'
+        pytest.skip()
 
     ds = ogr.Open(ogrtest.db2_test_server)
 
@@ -172,9 +172,8 @@ def test_ogr_db2_GetFeature():
     assert feat is not None, 'did not get a feature'
 
     if feat.GetField('ZIP') != '95008':
-        gdaltest.post_reason('did not get expected feature')
         feat.DumpReadable()
-        return 'fail'
+        pytest.fail('did not get expected feature')
 
     return 'success'
 
@@ -185,7 +184,7 @@ def test_ogr_db2_GetFeature():
 def test_ogr_db2_SetSpatialFilter():
 
     if ogrtest.db2_drv is None:
-        return 'skip'
+        pytest.skip()
 
     ds = ogr.Open(ogrtest.db2_test_server)
 
@@ -206,9 +205,8 @@ def test_ogr_db2_SetSpatialFilter():
     assert feat is not None, 'did not get a feature'
 
     if feat.GetField('ZIP') != '94089':
-        gdaltest.post_reason('did not get expected feature')
         feat.DumpReadable()
-        return 'fail'
+        pytest.fail('did not get expected feature')
 
 # start over with a larger envelope to get 3 out of 5 of the points
     lyr.ResetReading()
@@ -237,7 +235,7 @@ def test_ogr_db2_SetSpatialFilter():
 def test_ogr_db2_capabilities():
 
     if ogrtest.db2_drv is None:
-        return 'skip'
+        pytest.skip()
 
     ds = ogr.Open(ogrtest.db2_test_server)
 
diff --git a/autotest/ogr/ogr_db2_hack.py b/autotest/ogr/ogr_db2_hack.py
index 3b99970f1f7f..57149f8144a9 100755
--- a/autotest/ogr/ogr_db2_hack.py
+++ b/autotest/ogr/ogr_db2_hack.py
@@ -32,6 +32,7 @@
 
 import gdaltest
 from osgeo import ogr
+import pytest
 
 ###############################################################################
 # Create a point in DB2 format, and verify the byte order flag.
@@ -40,7 +41,7 @@
 def test_ogr_db2_hack_1():
 
     if ogr.SetGenerate_DB2_V72_BYTE_ORDER(1) != 0:
-        return 'skip'
+        pytest.skip()
 
     # XDR Case.
     geom = ogr.CreateGeometryFromWkt('POINT(10 20)')
@@ -90,7 +91,7 @@ def test_ogr_db2_hack_2():
 def test_ogr_db2_hack_3():
 
     if ogr.SetGenerate_DB2_V72_BYTE_ORDER(1) != 0:
-        return 'skip'
+        pytest.skip()
 
     wkt = 'MULTIPOLYGON (((10.00121344 2.99853145,10.00121344 1.99853145,11.00121343 1.99853148,11.00121343 2.99853148)),((10.00121344 2.99853145,10.00121344 3.99853145,9.00121345 3.99853143,9.00121345 2.99853143)))'
 
diff --git a/autotest/ogr/ogr_dgn.py b/autotest/ogr/ogr_dgn.py
index 520e4f902224..c1d2faf994a0 100755
--- a/autotest/ogr/ogr_dgn.py
+++ b/autotest/ogr/ogr_dgn.py
@@ -31,6 +31,7 @@
 import gdaltest
 import ogrtest
 from osgeo import ogr
+import pytest
 
 ###############################################################################
 # Verify we can open the test file.
@@ -51,7 +52,7 @@ def test_ogr_dgn_1():
 
 def test_ogr_dgn_2():
     if gdaltest.dgn_ds is None:
-        return 'skip'
+        pytest.skip()
 
     feat = gdaltest.dgn_lyr.GetNextFeature()
     assert feat.GetField('Type') == 17 and feat.GetField('Level') == 1, \
@@ -72,7 +73,7 @@ def test_ogr_dgn_2():
 
 def test_ogr_dgn_3():
     if gdaltest.dgn_ds is None:
-        return 'skip'
+        pytest.skip()
 
     feat = gdaltest.dgn_lyr.GetNextFeature()
     assert feat.GetField('Type') == 15 and feat.GetField('Level') == 2, \
@@ -99,7 +100,7 @@ def test_ogr_dgn_3():
 
 def test_ogr_dgn_4():
     if gdaltest.dgn_ds is None:
-        return 'skip'
+        pytest.skip()
 
     feat = gdaltest.dgn_lyr.GetNextFeature()
     assert feat.GetField('Type') == 6 and feat.GetField('Level') == 2 and feat.GetField('ColorIndex') == 83, \
@@ -123,7 +124,7 @@ def test_ogr_dgn_4():
 def test_ogr_dgn_5():
 
     if gdaltest.dgn_ds is None:
-        return 'skip'
+        pytest.skip()
 
     gdaltest.dgn_lyr.SetAttributeFilter('Type = 15 and Level = 2')
     tr = ogrtest.check_features_against_list(gdaltest.dgn_lyr, 'Type', [15])
@@ -138,7 +139,7 @@ def test_ogr_dgn_5():
 def test_ogr_dgn_6():
 
     if gdaltest.dgn_ds is None:
-        return 'skip'
+        pytest.skip()
 
     geom = ogr.CreateGeometryFromWkt('LINESTRING(1.0 8.55, 2.5 6.86)')
     gdaltest.dgn_lyr.SetSpatialFilter(geom)
@@ -156,7 +157,7 @@ def test_ogr_dgn_6():
 def test_ogr_dgn_7():
 
     if gdaltest.dgn_ds is None:
-        return 'skip'
+        pytest.skip()
 
     co_opts = ['UOR_PER_SUB_UNIT=100', 'SUB_UNITS_PER_MASTER_UNIT=100',
                'ORIGIN=-50,-50,0']
@@ -193,7 +194,7 @@ def test_ogr_dgn_7():
 def test_ogr_dgn_8():
 
     if gdaltest.dgn_ds is None:
-        return 'skip'
+        pytest.skip()
 
     dgn2_ds = ogr.Open('tmp/dgn7.dgn')
 
@@ -252,7 +253,7 @@ def test_ogr_dgn_8():
 def test_ogr_dgn_online_1():
 
     if not gdaltest.download_file('http://download.osgeo.org/gdal/data/dgn/DGNSample_v7.dgn', 'DGNSample_v7.dgn'):
-        return 'skip'
+        pytest.skip()
 
     ds = ogr.Open('tmp/cache/DGNSample_v7.dgn')
     assert ds is not None
diff --git a/autotest/ogr/ogr_dgnv8.py b/autotest/ogr/ogr_dgnv8.py
index cfe4711fe2c7..91fa3b5c8427 100755
--- a/autotest/ogr/ogr_dgnv8.py
+++ b/autotest/ogr/ogr_dgnv8.py
@@ -36,6 +36,7 @@
 import gdaltest
 import ogrtest
 from osgeo import gdal, ogr
+import pytest
 
 ###############################################################################
 # Verify we can open the test file.
@@ -45,7 +46,7 @@ def test_ogr_dgnv8_1():
 
     gdaltest.dgnv8_drv = ogr.GetDriverByName('DGNv8')
     if gdaltest.dgnv8_drv is None:
-        return 'skip'
+        pytest.skip()
 
     ds = ogr.Open('data/test_dgnv8.dgn')
     assert ds is not None, 'failed to open test file.'
@@ -59,7 +60,7 @@ def test_ogr_dgnv8_1():
 def test_ogr_dgnv8_2():
 
     if gdaltest.dgnv8_drv is None:
-        return 'skip'
+        pytest.skip()
 
     gdal.VectorTranslate('/vsimem/ogr_dgnv8_2.csv', 'data/test_dgnv8.dgn',
                          options='-f CSV  -dsco geometry=as_wkt -sql "select *, ogr_style from my_model"')
@@ -81,11 +82,11 @@ def test_ogr_dgnv8_2():
 def test_ogr_dgnv8_3():
 
     if gdaltest.dgnv8_drv is None:
-        return 'skip'
+        pytest.skip()
 
     import test_cli_utilities
     if test_cli_utilities.get_test_ogrsf_path() is None:
-        return 'skip'
+        pytest.skip()
 
     ret = gdaltest.runexternal(test_cli_utilities.get_test_ogrsf_path() + ' -ro data/test_dgnv8.dgn')
 
@@ -106,7 +107,7 @@ def test_ogr_dgnv8_3():
 def test_ogr_dgnv8_4():
 
     if gdaltest.dgnv8_drv is None:
-        return 'skip'
+        pytest.skip()
 
     tmp_dgn = 'tmp/ogr_dgnv8_4.dgn'
     gdal.VectorTranslate(tmp_dgn, 'data/test_dgnv8.dgn', format='DGNv8')
@@ -133,7 +134,7 @@ def test_ogr_dgnv8_4():
 def test_ogr_dgnv8_5():
 
     if gdaltest.dgnv8_drv is None:
-        return 'skip'
+        pytest.skip()
 
     tmp_dgn = 'tmp/ogr_dgnv8_5.dgn'
     options = ['APPLICATION=application',
@@ -182,7 +183,7 @@ def test_ogr_dgnv8_5():
     f = lyr.GetNextFeature()
     if f.GetGeometryRef().ExportToWkt() != 'POINT (2 3)':
         f.DumpReadable()
-        return 'fail'
+        pytest.fail()
     ds = None
 
     gdal.Unlink(tmp_dgn)
diff --git a/autotest/ogr/ogr_dods.py b/autotest/ogr/ogr_dods.py
index 1f1831bb7fa1..768f3ea24298 100755
--- a/autotest/ogr/ogr_dods.py
+++ b/autotest/ogr/ogr_dods.py
@@ -33,6 +33,7 @@
 import ogrtest
 from osgeo import ogr
 from osgeo import gdal
+import pytest
 
 ###############################################################################
 # Open DODS datasource.
@@ -43,14 +44,14 @@ def ogr_dods_1():
     ogrtest.dods_drv = ogr.GetDriverByName('DODS')
 
     if ogrtest.dods_drv is None:
-        return 'skip'
+        pytest.skip()
 
     gdal.SetConfigOption('DODS_AIS_FILE', 'data/ais.xml')
 
     srv = 'http://www.epic.noaa.gov:10100/dods/wod2001/natl_prof_bot.cdp?&_id=1'
     if gdaltest.gdalurlopen(srv) is None:
         gdaltest.dods_ds = None
-        return 'skip'
+        pytest.skip()
 
     gdaltest.dods_ds = ogr.Open('DODS:' + srv)
 
@@ -66,8 +67,7 @@ def ogr_dods_1():
 
     if gdaltest.dods_profiles is None:
         gdaltest.dods_ds = None
-        gdaltest.post_reason('profiles layer missing, likely AIS stuff not working.')
-        return 'fail'
+        pytest.fail('profiles layer missing, likely AIS stuff not working.')
     return 'success'
 
 ###############################################################################
@@ -78,7 +78,7 @@ def ogr_dods_1():
 def ogr_dods_2():
 
     if gdaltest.dods_ds is None:
-        return 'skip'
+        pytest.skip()
 
     gdaltest.dods_profiles.ResetReading()
     feat = gdaltest.dods_profiles.GetNextFeature()
@@ -94,8 +94,7 @@ def ogr_dods_2():
     feat = gdaltest.dods_profiles.GetNextFeature()
     if feat is not None:
         feat.Destroy()
-        gdaltest.post_reason('got more than expected number of features.')
-        return 'fail'
+        pytest.fail('got more than expected number of features.')
 
     return 'success'
 
@@ -107,7 +106,7 @@ def ogr_dods_2():
 def ogr_dods_3():
 
     if gdaltest.dods_ds is None:
-        return 'skip'
+        pytest.skip()
 
     gdaltest.dods_normalized.ResetReading()
     expect = [0, 10, 20, 30, 39]
@@ -133,8 +132,7 @@ def ogr_dods_3():
     feat = gdaltest.dods_normalized.GetNextFeature()
     if feat is not None:
         feat.Destroy()
-        gdaltest.post_reason('got more than expected number of features.')
-        return 'fail'
+        pytest.fail('got more than expected number of features.')
 
     return 'success'
 
@@ -146,7 +144,7 @@ def ogr_dods_3():
 def ogr_dods_4():
 
     if gdaltest.dods_ds is None:
-        return 'skip'
+        pytest.skip()
 
     gdaltest.dods_lines.ResetReading()
     feat = gdaltest.dods_lines.GetNextFeature()
@@ -165,8 +163,7 @@ def ogr_dods_4():
     feat = gdaltest.dods_lines.GetNextFeature()
     if feat is not None:
         feat.Destroy()
-        gdaltest.post_reason('got more than expected number of features.')
-        return 'fail'
+        pytest.fail('got more than expected number of features.')
 
     return 'success'
 
@@ -178,11 +175,11 @@ def ogr_dods_4():
 def ogr_dods_5():
 
     if ogrtest.dods_drv is None:
-        return 'skip'
+        pytest.skip()
 
     srv = 'http://uhslc1.soest.hawaii.edu/cgi-bin/nph-nc/fast/m004.nc.dds'
     if gdaltest.gdalurlopen(srv) is None:
-        return 'skip'
+        pytest.skip()
 
     grid_ds = ogr.Open('DODS:' + srv)
     assert grid_ds is not None
@@ -202,7 +199,7 @@ def ogr_dods_5():
 def ogr_dods_cleanup():
 
     if gdaltest.dods_ds is None:
-        return 'skip'
+        pytest.skip()
 
     gdaltest.dods_profiles = None
     gdaltest.dods_lines = None
diff --git a/autotest/ogr/ogr_dxf.py b/autotest/ogr/ogr_dxf.py
index f1a5bebcf04b..eb7c380d0c9a 100644
--- a/autotest/ogr/ogr_dxf.py
+++ b/autotest/ogr/ogr_dxf.py
@@ -1030,19 +1030,16 @@ def test_ogr_dxf_22():
 
     feat = lyr.GetNextFeature()
     if feat.GetFieldAsString('Text') != test_text:
-        gdaltest.post_reason('bad attribute')
         feat.DumpReadable()
-        return 'fail'
+        pytest.fail('bad attribute')
     style = feat.GetStyleString()
     if style != 'LABEL(f:"SwissCheese",bo:1,t:"' + test_text + '",a:45,s:10g,w:51,c:#ff0000)':
-        gdaltest.post_reason('bad style')
         feat.DumpReadable()
         print(style)
-        return 'fail'
+        pytest.fail('bad style')
     if ogrtest.check_feature_geometry(feat, 'POINT(1 2 3)'):
-        gdaltest.post_reason('bad geometry')
         feat.DumpReadable()
-        return 'fail'
+        pytest.fail('bad geometry')
 
     # Write text feature
     out_ds = ogr.GetDriverByName('DXF').CreateDataSource('/vsimem/ogr_dxf_22.dxf')
@@ -1063,19 +1060,16 @@ def test_ogr_dxf_22():
 
     feat = lyr.GetNextFeature()
     if feat.GetFieldAsString('Text') != test_text:
-        gdaltest.post_reason('bad attribute')
         feat.DumpReadable()
-        return 'fail'
+        pytest.fail('bad attribute')
     style = feat.GetStyleString()
     if style != 'LABEL(f:"SwissCheese",bo:1,t:"' + test_text + '",a:45,s:10g,w:51,c:#ff0000)':
-        gdaltest.post_reason('bad style')
         feat.DumpReadable()
         print(style)
-        return 'fail'
+        pytest.fail('bad style')
     if ogrtest.check_feature_geometry(feat, 'POINT(1 2 3)'):
-        gdaltest.post_reason('bad geometry')
         feat.DumpReadable()
-        return 'fail'
+        pytest.fail('bad geometry')
 
     ds = None
 
@@ -1089,9 +1083,8 @@ def test_ogr_dxf_22():
 
     feat = lyr.GetNextFeature()
     if feat.GetFieldAsString('Text') != '\A1;test^Itext\~\pt0.2;{\H0.7x;\Sab\/c\~d%%p^ ef\^ g.h\#i;} j{\L\Ok\ol}m':
-        gdaltest.post_reason('bad attribute with DXF_TRANSLATE_ESCAPE_SEQUENCES = FALSE')
         feat.DumpReadable()
-        return 'fail'
+        pytest.fail('bad attribute with DXF_TRANSLATE_ESCAPE_SEQUENCES = FALSE')
 
     ds = None
 
@@ -1169,12 +1162,12 @@ def test_ogr_dxf_25():
     feat = lyr.GetNextFeature()
     if ogrtest.check_feature_geometry(feat, 'POLYGON ((10 20 30,11 21 31,12 22 32,10 20 30))'):
         feat.DumpReadable()
-        return 'fail'
+        pytest.fail()
 
     feat = lyr.GetNextFeature()
     if ogrtest.check_feature_geometry(feat, 'POLYGON ((10 20 30,11 21 31,12 22 32,13 23 33,10 20 30))'):
         feat.DumpReadable()
-        return 'fail'
+        pytest.fail()
 
     ds = None
 
@@ -1192,7 +1185,7 @@ def test_ogr_dxf_26():
     feat = lyr.GetNextFeature()
     if ogrtest.check_feature_geometry(feat, 'POLYGON ((2.716846 2.762514,2.393674 1.647962,4.391042 1.06881,4.714214 2.183362,2.716846 2.762514))'):
         feat.DumpReadable()
-        return 'fail'
+        pytest.fail()
 
     ds = None
 
@@ -1225,12 +1218,12 @@ def test_ogr_dxf_28():
     feat = lyr.GetNextFeature()
     if ogrtest.check_feature_geometry(feat, 'LINESTRING Z (247.379588068074 525.677518653024 0,247.560245171261 525.685592896308 0,247.739941456101 525.705876573267 0,247.917852718752 525.738276649788 0,248.09316294264 525.782644518081 0,248.265068041245 525.838776678293 0,248.432779546163 525.90641567189 0,248.595528223532 525.985251262527 0,248.752567602242 526.074921858996 0,248.903177397731 526.175016173715 0,249.046666815684 526.285075109164 0,249.182377720457 526.404593863601 0,249.309687653722 526.533024246411 0,249.428012689458 526.669777192466 0,249.536810112221 526.814225463957 0,249.635580906384 526.965706527318 0,249.723872044951 527.123525592032 0)'):
         feat.DumpReadable()
-        return 'fail'
+        pytest.fail()
 
     feat = lyr.GetNextFeature()
     if ogrtest.check_feature_geometry(feat, 'LINESTRING Z (290.988651614349 531.01336644407 0,290.900681473157 531.171364661134 0,290.823607338001 531.334954880971 0,290.757782720911 531.503386772611 0,290.703509536322 531.675887798031 0,290.661036716299 531.85166675552 0,290.630559068775 532.029917408641 0,290.612216384031 532.209822184155 0,290.606092793529 532.390555921946 0,290.612216384031 532.571289659737 0,290.630559068775 532.751194435252 0,290.661036716299 532.929445088373 0,290.703509536321 533.105224045862 0,290.75778272091 533.277725071282 0,290.823607338 533.446156962922 0,290.900681473156 533.60974718276 0,290.988651614348 533.767745399824 0)'):
         feat.DumpReadable()
-        return 'fail'
+        pytest.fail()
 
     ds = None
 
@@ -1249,19 +1242,19 @@ def test_ogr_dxf_29():
     feat = lyr.GetNextFeature()
     if ogrtest.check_feature_geometry(feat, 'LINESTRING (2 2, 2.10256409645081 2.15371131896973, 2.20512819290161 2.3066132068634, 2.307692527771 2.4578971862793, 2.41025638580322 2.6067533493042, 2.51282024383545 2.75237274169922, 2.61538457870483 2.89394640922546, 2.71794891357422 3.03066444396973, 2.82051301002502 3.16171884536743, 2.92307710647583 3.28629970550537, 3.02564096450806 3.40359783172607, 3.12820529937744 3.51280379295349, 3.23076939582825 3.61310863494873, 3.33333325386047 3.70370388031006, 3.43589782714844 3.78377938270569, 3.53846144676208 3.85252642631531, 3.64102602005005 3.90913581848145, 3.74358987808228 3.95279765129089, 3.84615445137024 3.98270392417908, 3.94871830940247 3.99804472923279, 4.05128240585327 3.99804425239563, 4.15384674072266 3.9827036857605, 4.25641107559204 3.95279765129089, 4.35897541046143 3.90913534164429, 4.46153926849365 3.85252571105957, 4.56410360336304 3.78377866744995, 4.66666793823242 3.70370292663574, 4.76923179626465 3.61310815811157, 4.87179613113403 3.51280236244202, 4.97436046600342 3.40359592437744, 5.07692432403564 3.2862982749939, 5.17948865890503 3.16171741485596, 5.28205299377441 3.03066277503967, 5.38461685180664 2.89394426345825, 5.48718070983887 2.75237035751343, 5.58974552154541 2.60675096511841, 5.69230937957764 2.45789456367493, 5.79487323760986 2.30661058425903, 5.89743757247925 2.15370845794678, 6 2)'):
         feat.DumpReadable()
-        return 'fail'
+        pytest.fail()
 
     # spline 261, weight(3) = 2.0
     feat = lyr.GetNextFeature()
     if ogrtest.check_feature_geometry(feat, 'LINESTRING (2 2, 2.10976576805115 2.16451454162598, 2.23113083839417 2.34563326835632, 2.35994720458984 2.53639197349548, 2.49239826202393 2.73041176795959, 2.62522411346436 2.92225241661072, 2.75582838058472 3.10756635665894, 2.88229131698608 3.2831084728241, 3.00331926345825 3.44663000106812, 3.11815142631531 3.59672045707703, 3.2264621257782 3.73262500762939, 3.32825922966003 3.85407567024231, 3.42379808425903 3.96113181114197, 3.51351404190063 4.05405473709106, 3.59796214103699 4.13319540023804, 3.67778849601746 4.19891929626465, 3.75369834899902 4.25152969360352, 3.82645153999329 4.29121112823486, 3.89685702323914 4.31797361373901, 3.96579027175903 4.33159732818604, 4.03421020507812 4.33159732818604, 4.1031436920166 4.31797361373901, 4.17354917526245 4.29121017456055, 4.24630165100098 4.2515287399292, 4.32221221923828 4.19891929626465, 4.40203857421875 4.13319492340088, 4.48648738861084 4.05405378341675, 4.57620286941528 3.96113133430481, 4.67174291610718 3.85407471656799, 4.77353954315186 3.73262333869934, 4.88184928894043 3.59671831130981, 4.99668216705322 3.44662809371948, 5.11771011352539 3.28310608863831, 5.24417400360107 3.10756373405457, 5.37477827072144 2.92224931716919, 5.50760412216187 2.73040890693665, 5.64005517959595 2.5363883972168, 5.76887130737305 2.34562969207764, 5.89023685455322 2.16451120376587, 6 2)'):
         feat.DumpReadable()
-        return 'fail'
+        pytest.fail()
 
     # spline 262, weight(3) = 0.5
     feat = lyr.GetNextFeature()
     if ogrtest.check_feature_geometry(feat, 'LINESTRING (2 2, 2.09894275665283 2.14827871322632, 2.19183802604675 2.28667020797729, 2.28029608726501 2.41674375534058, 2.36573505401611 2.53972935676575, 2.4494321346283 2.65657186508179, 2.53256177902222 2.76796913146973, 2.61621570587158 2.87439489364624, 2.70142364501953 2.97611308097839, 2.78915071487427 3.07318329811096, 2.88029623031616 3.16546249389648, 2.97567653656006 3.25260472297668, 3.07599782943726 3.33406257629395, 3.18181824684143 3.40909075737, 3.29349946975708 3.4767644405365, 3.4111499786377 3.53600478172302, 3.53456783294678 3.58562660217285, 3.66318273544312 3.62440752983093, 3.79601716995239 3.6511766910553, 3.93166828155518 3.66492199897766, 4.06833267211914 3.66492199897766, 4.20398426055908 3.65117692947388, 4.33681774139404 3.62440729141235, 4.4654335975647 3.58562660217285, 4.58885097503662 3.53600406646729, 4.70650196075439 3.47676372528076, 4.81818294525146 3.40909028053284, 4.92400360107422 3.33406162261963, 5.02432489395142 3.25260376930237, 5.11970520019531 3.16546106338501, 5.21085071563721 3.07318210601807, 5.29857730865479 2.9761118888855, 5.38378524780273 2.87439346313477, 5.46744012832642 2.76796770095825, 5.55056858062744 2.65656995773315, 5.63426637649536 2.53972721099854, 5.71970558166504 2.41674160957336, 5.8081636428833 2.2866678237915, 5.9010591506958 2.14827609062195, 6 2)'):
         feat.DumpReadable()
-        return 'fail'
+        pytest.fail()
 
     ds = None
 
@@ -1280,13 +1273,13 @@ def test_ogr_dxf_30():
     feat = lyr.GetNextFeature()
     if ogrtest.check_feature_geometry(feat, 'LINESTRING (14 2, 13.9043273925781 2.11115527153015, 13.82310962677 2.23728489875793, 13.7564849853516 2.3759388923645, 13.7045974731445 2.52466750144958, 13.6675891876221 2.68102264404297, 13.6455984115601 2.84255337715149, 13.6387672424316 3.00681042671204, 13.6472396850586 3.17134499549866, 13.6711559295654 3.33370733261108, 13.7106552124023 3.49144792556763, 13.7658815383911 3.64211750030518, 13.8369770050049 3.78326630592346, 13.9240808486938 3.9124448299408, 14.0273275375366 4.0272102355957, 14.1460762023926 4.125901222229, 14.2781581878662 4.20836925506592, 14.4212408065796 4.27464532852173, 14.5729866027832 4.32475566864014, 14.7310619354248 4.35873079299927, 14.8931264877319 4.37659645080566, 15.056845664978 4.37838315963745, 15.2198839187622 4.36411762237549, 15.3799018859863 4.33382892608643, 15.5345678329468 4.2875452041626, 15.681544303894 4.22529458999634, 15.8184909820557 4.14710569381714, 15.9430751800537 4.05300617218018, 16.0530071258545 3.94307255744934, 16.1471080780029 3.81848883628845, 16.2252960205078 3.68154096603394, 16.2875461578369 3.53456616401672, 16.3338298797607 3.37990093231201, 16.3641166687012 3.219881772995, 16.3783836364746 3.05684399604797, 16.3765964508057 2.89312481880188, 16.3587284088135 2.73106050491333, 16.3247547149658 2.57298684120178, 16.2746448516846 2.42124080657959, 16.2083702087402 2.27815842628479, 16.1259021759033 2.146075963974, 16.0272102355957 2.02732920646667, 15.9124450683594 1.92408156394958, 15.7832660675049 1.83697760105133, 15.6421175003052 1.7658828496933, 15.4914503097534 1.71065592765808, 15.3337097167969 1.67115533351898, 15.1713457107544 1.6472395658493, 15.0068111419678 1.63876724243164, 14.8425559997559 1.64559710025787, 14.681022644043 1.66758728027344, 14.5246696472168 1.70459699630737, 14.375940322876 1.75648427009583, 14.2372856140137 1.82310783863068, 14.1111574172974 1.90432631969452, 14 2)'):
         feat.DumpReadable()
-        return 'fail'
+        pytest.fail()
 
     # spline 24c, closed, recalculate knots
     feat = lyr.GetNextFeature()
     if ogrtest.check_feature_geometry(feat, 'LINESTRING (14 2, 13.9043273925781 2.11115527153015, 13.82310962677 2.23728489875793, 13.7564849853516 2.3759388923645, 13.7045974731445 2.52466750144958, 13.6675891876221 2.68102264404297, 13.6455984115601 2.84255337715149, 13.6387672424316 3.00681042671204, 13.6472396850586 3.17134499549866, 13.6711559295654 3.33370733261108, 13.7106552124023 3.49144792556763, 13.7658815383911 3.64211750030518, 13.8369770050049 3.78326630592346, 13.9240808486938 3.9124448299408, 14.0273275375366 4.0272102355957, 14.1460762023926 4.125901222229, 14.2781581878662 4.20836925506592, 14.4212408065796 4.27464532852173, 14.5729866027832 4.32475566864014, 14.7310619354248 4.35873079299927, 14.8931264877319 4.37659645080566, 15.056845664978 4.37838315963745, 15.2198839187622 4.36411762237549, 15.3799018859863 4.33382892608643, 15.5345678329468 4.2875452041626, 15.681544303894 4.22529458999634, 15.8184909820557 4.14710569381714, 15.9430751800537 4.05300617218018, 16.0530071258545 3.94307255744934, 16.1471080780029 3.81848883628845, 16.2252960205078 3.68154096603394, 16.2875461578369 3.53456616401672, 16.3338298797607 3.37990093231201, 16.3641166687012 3.219881772995, 16.3783836364746 3.05684399604797, 16.3765964508057 2.89312481880188, 16.3587284088135 2.73106050491333, 16.3247547149658 2.57298684120178, 16.2746448516846 2.42124080657959, 16.2083702087402 2.27815842628479, 16.1259021759033 2.146075963974, 16.0272102355957 2.02732920646667, 15.9124450683594 1.92408156394958, 15.7832660675049 1.83697760105133, 15.6421175003052 1.7658828496933, 15.4914503097534 1.71065592765808, 15.3337097167969 1.67115533351898, 15.1713457107544 1.6472395658493, 15.0068111419678 1.63876724243164, 14.8425559997559 1.64559710025787, 14.681022644043 1.66758728027344, 14.5246696472168 1.70459699630737, 14.375940322876 1.75648427009583, 14.2372856140137 1.82310783863068, 14.1111574172974 1.90432631969452, 14 2)'):
         feat.DumpReadable()
-        return 'fail'
+        pytest.fail()
 
     ds = None
 
@@ -1309,7 +1302,7 @@ def test_ogr_dxf_31():
     feat = lyr.GetNextFeature()
     if ogrtest.check_feature_geometry(feat, 'POINT Z (4 4 0)'):
         feat.DumpReadable()
-        return 'fail'
+        pytest.fail()
 
 # OGRFeature(entities):1
 #   EntityHandle (String) = 1F0
@@ -1317,7 +1310,7 @@ def test_ogr_dxf_31():
     feat = lyr.GetNextFeature()
     if ogrtest.check_feature_geometry(feat, 'LINESTRING Z (0 0 0,1 1 0)'):
         feat.DumpReadable()
-        return 'fail'
+        pytest.fail()
 
 # OGRFeature(entities):2
 #   EntityHandle (String) = 1F1
@@ -1325,7 +1318,7 @@ def test_ogr_dxf_31():
     feat = lyr.GetNextFeature()
     if ogrtest.check_feature_geometry(feat, 'LINESTRING (1 1,2 1,1 2,1 1)'):
         feat.DumpReadable()
-        return 'fail'
+        pytest.fail()
 
 # OGRFeature(entities):3
 #   EntityHandle (String) = 1F2
@@ -1333,7 +1326,7 @@ def test_ogr_dxf_31():
     feat = lyr.GetNextFeature()
     if ogrtest.check_feature_geometry(feat, 'LINESTRING Z (1 1 0,1 2 0,2 2 0,1 1 0)'):
         feat.DumpReadable()
-        return 'fail'
+        pytest.fail()
 
 # OGRFeature(entities):4
 #   EntityHandle (String) = 1F7
@@ -1341,7 +1334,7 @@ def test_ogr_dxf_31():
     feat = lyr.GetNextFeature()
     if ogrtest.check_feature_geometry(feat, 'LINESTRING Z (6 4 0,5.99512810051965 3.86048705251175 0,5.98053613748314 3.72165379807987 0,5.95629520146761 3.58417661836448 0,5.92252339187664 3.448725288366 0,5.87938524157182 3.31595971334866 0,5.8270909152852 3.1865267138484 0,5.76589518571785 3.06105687442822 0,5.69609619231285 2.94016147153359 0,5.61803398874989 2.82442949541505 0,5.53208888623796 2.71442478062692 0,5.4386796006773 2.61068325908201 0,5.33826121271772 2.51371034904521 0,5.23132295065132 2.42397849278656 0,5.11838580694149 2.34192485488992 0,5.0 2.26794919243112 0,4.87674229357815 2.20241190740167 0,4.74921318683182 2.14563229086643 0,4.61803398874989 2.09788696740969 0,4.48384379119934 2.05940854744801 0,4.34729635533386 2.03038449397558 0,4.20905692653531 2.01095620926345 0,4.069798993405 2.00121834596181 0,3.930201006595 2.00121834596181 0,3.79094307346469 2.01095620926345 0,3.65270364466614 2.03038449397558 0,3.51615620880066 2.05940854744801 0,3.38196601125011 2.09788696740969 0,3.25078681316818 2.14563229086643 0,3.12325770642185 2.20241190740167 0,3.0 2.26794919243112 0,2.88161419305851 2.34192485488992 0,2.76867704934868 2.42397849278656 0,2.66173878728228 2.51371034904521 0,2.5613203993227 2.61068325908201 0,2.46791111376204 2.71442478062692 0,2.38196601125011 2.82442949541505 0,2.30390380768715 2.94016147153359 0,2.23410481428215 3.06105687442822 0,2.1729090847148 3.1865267138484 0,2.12061475842818 3.31595971334866 0,2.07747660812336 3.448725288366 0,2.04370479853239 3.58417661836448 0,2.01946386251686 3.72165379807987 0,2.00487189948035 3.86048705251175 0,2.0 4.0 0,2.00487189948035 4.13951294748825 0,2.01946386251686 4.27834620192013 0,2.04370479853239 4.41582338163552 0,2.07747660812336 4.551274711634 0,2.12061475842818 4.68404028665134 0,2.1729090847148 4.8134732861516 0,2.23410481428215 4.93894312557178 0,2.30390380768715 5.05983852846641 0,2.38196601125011 5.17557050458495 0,2.46791111376204 5.28557521937308 0,2.5613203993227 5.38931674091799 0,2.66173878728228 5.48628965095479 0,2.76867704934868 5.57602150721344 0,2.88161419305851 5.65807514511008 0,3.0 5.73205080756888 0,3.12325770642184 5.79758809259833 0,3.25078681316818 5.85436770913357 0,3.38196601125011 5.90211303259031 0,3.51615620880066 5.94059145255199 0,3.65270364466614 5.96961550602442 0,3.79094307346469 5.98904379073655 0,3.930201006595 5.99878165403819 0,4.069798993405 5.99878165403819 0,4.20905692653531 5.98904379073655 0,4.34729635533386 5.96961550602442 0,4.48384379119933 5.94059145255199 0,4.61803398874989 5.90211303259031 0,4.74921318683182 5.85436770913357 0,4.87674229357815 5.79758809259833 0,5.0 5.73205080756888 0,5.11838580694149 5.65807514511008 0,5.23132295065132 5.57602150721344 0,5.33826121271772 5.48628965095479 0,5.4386796006773 5.389316740918 0,5.53208888623796 5.28557521937308 0,5.61803398874989 5.17557050458495 0,5.69609619231285 5.05983852846641 0,5.76589518571785 4.93894312557178 0,5.8270909152852 4.8134732861516 0,5.87938524157182 4.68404028665134 0,5.92252339187664 4.551274711634 0,5.95629520146761 4.41582338163552 0,5.98053613748314 4.27834620192013 0,5.99512810051965 4.13951294748825 0,6.0 4.0 0)'):
         feat.DumpReadable()
-        return 'fail'
+        pytest.fail()
 
 # OGRFeature(entities):5
 #   EntityHandle (String) = 1F8
@@ -1349,7 +1342,7 @@ def test_ogr_dxf_31():
     feat = lyr.GetNextFeature()
     if ogrtest.check_feature_geometry(feat, 'LINESTRING Z (2 4 0,2.00487189948035 4.06975647374412 0,2.01946386251686 4.13917310096007 0,2.04370479853239 4.20791169081776 0,2.07747660812336 4.275637355817 0,2.12061475842818 4.34202014332567 0,2.1729090847148 4.4067366430758 0,2.23410481428215 4.46947156278589 0,2.30390380768715 4.52991926423321 0,2.38196601125011 4.58778525229247 0,2.46791111376204 4.64278760968654 0,2.5613203993227 4.694658370459 0,2.66173878728228 4.74314482547739 0,2.76867704934868 4.78801075360672 0,2.88161419305851 4.82903757255504 0,3.0 4.86602540378444 0,3.12325770642185 4.89879404629917 0,3.25078681316818 4.92718385456679 0,3.38196601125011 4.95105651629515 0,3.51615620880067 4.970295726276 0,3.65270364466614 4.98480775301221 0,3.79094307346469 4.99452189536827 0,3.930201006595 4.9993908270191 0,4.069798993405 4.9993908270191 0,4.20905692653531 4.99452189536827 0,4.34729635533386 4.98480775301221 0,4.48384379119934 4.970295726276 0,4.61803398874989 4.95105651629515 0,4.74921318683182 4.92718385456679 0,4.87674229357816 4.89879404629917 0,5.0 4.86602540378444 0,5.11838580694149 4.82903757255504 0,5.23132295065132 4.78801075360672 0,5.33826121271772 4.74314482547739 0,5.4386796006773 4.694658370459 0,5.53208888623796 4.64278760968654 0,5.61803398874989 4.58778525229247 0,5.69609619231285 4.5299192642332 0,5.76589518571785 4.46947156278589 0,5.8270909152852 4.4067366430758 0,5.87938524157182 4.34202014332567 0,5.92252339187664 4.275637355817 0,5.95629520146761 4.20791169081776 0,5.98053613748314 4.13917310096006 0,5.99512810051965 4.06975647374412 0,6.0 4.0 0,5.99512810051965 3.93024352625587 0,5.98053613748314 3.86082689903993 0,5.95629520146761 3.79208830918224 0,5.92252339187664 3.724362644183 0,5.87938524157182 3.65797985667433 0,5.8270909152852 3.5932633569242 0,5.76589518571785 3.53052843721411 0,5.69609619231285 3.4700807357668 0,5.61803398874989 3.41221474770753 0,5.53208888623796 3.35721239031346 0,5.4386796006773 3.305341629541 0,5.33826121271772 3.25685517452261 0,5.23132295065132 3.21198924639328 0,5.11838580694149 3.17096242744496 0,5.0 3.13397459621556 0,4.87674229357815 3.10120595370083 0,4.74921318683182 3.07281614543321 0,4.61803398874989 3.04894348370485 0,4.48384379119934 3.029704273724 0,4.34729635533386 3.01519224698779 0,4.20905692653531 3.00547810463173 0,4.069798993405 3.0006091729809 0,3.930201006595 3.0006091729809 0,3.79094307346469 3.00547810463173 0,3.65270364466614 3.01519224698779 0,3.51615620880066 3.029704273724 0,3.38196601125011 3.04894348370485 0,3.25078681316818 3.07281614543321 0,3.12325770642185 3.10120595370083 0,3.0 3.13397459621556 0,2.88161419305851 3.17096242744496 0,2.76867704934868 3.21198924639328 0,2.66173878728228 3.25685517452261 0,2.5613203993227 3.305341629541 0,2.46791111376204 3.35721239031346 0,2.38196601125011 3.41221474770753 0,2.30390380768715 3.4700807357668 0,2.23410481428215 3.53052843721411 0,2.1729090847148 3.5932633569242 0,2.12061475842818 3.65797985667433 0,2.07747660812336 3.724362644183 0,2.04370479853239 3.79208830918224 0,2.01946386251686 3.86082689903993 0,2.00487189948035 3.93024352625587 0,2 4 0)'):
         feat.DumpReadable()
-        return 'fail'
+        pytest.fail()
 
 # OGRFeature(entities):6
 #   EntityHandle (String) = 1F9
@@ -1357,7 +1350,7 @@ def test_ogr_dxf_31():
     feat = lyr.GetNextFeature()
     if ogrtest.check_feature_geometry(feat, 'LINESTRING Z (2.0 2.0 0,1.96657794502105 2.03582232791524 0,1.93571660708646 2.07387296203834 0,1.90756413746468 2.11396923855471 0,1.88225568337755 2.15591867344963 0,1.85991273921989 2.19951988653655 0,1.84064256332004 2.24456356819194 0,1.8245376630414 2.29083348415575 0,1.81167535069652 2.33810751357387 0,1.80211737240583 2.38615871529951 0,1.79590961168258 2.43475641733454 0,1.79308186916688 2.48366732418105 0,1.79364771956639 2.53265663678705 0,1.79760444649032 2.58148917971011 0,1.80493305548955 2.62993053008785 0,1.81559836524041 2.67774814299566 0,1.8295491764342 2.72471246778926 0,1.84671851756181 2.7705980500731 0,1.86702396641357 2.81518461400453 0,1.89036804575079 2.85825811973811 0,1.91663869124976 2.89961179093366 0,1.94570978947168 2.93904710739563 0,1.97744178327594 2.97637475807832 0,2.01168234177068 3.01141554988232 0,2.04826709158413 3.04400126787917 0,2.08702040594658 3.07397548283483 0,2.12775624779472 3.10119430215541 0,2.17027906285109 3.12552706065018 0,2.2143847183914 3.14685694779575 0,2.25986148319297 3.16508156849045 0,2.30649104396024 3.18011343460661 0,2.35404955334774 3.1918803849814 0,2.40230870454951 3.20032593182975 0,2.45103682729644 3.2054095319166 0,2.5 3.20710678118655 0,2.54896317270356 3.2054095319166 0,2.59769129545049 3.20032593182975 0,2.64595044665226 3.1918803849814 0,2.69350895603976 3.18011343460661 0,2.74013851680703 3.16508156849045 0,2.7856152816086 3.14685694779575 0,2.8297209371489 3.12552706065018 0,2.87224375220528 3.10119430215541 0,2.91297959405342 3.07397548283483 0,2.95173290841587 3.04400126787917 0,2.98831765822932 3.01141554988232 0,3.02255821672406 2.97637475807832 0,3.05429021052832 2.93904710739563 0,3.08336130875024 2.89961179093367 0,3.10963195424921 2.85825811973811 0,3.13297603358643 2.81518461400453 0,3.15328148243819 2.7705980500731 0,3.1704508235658 2.72471246778926 0,3.18440163475959 2.67774814299567 0,3.19506694451045 2.62993053008786 0,3.20239555350968 2.58148917971011 0,3.20635228043361 2.53265663678705 0,3.20691813083312 2.48366732418105 0,3.20409038831742 2.43475641733454 0,3.19788262759417 2.38615871529951 0,3.18832464930348 2.33810751357387 0,3.1754623369586 2.29083348415575 0,3.15935743667996 2.24456356819194 0,3.14008726078011 2.19951988653655 0,3.11774431662245 2.15591867344963 0,3.09243586253532 2.11396923855472 0,3.06428339291354 2.07387296203834 0,3.03342205497895 2.03582232791524 0,3 2 0)'):
         feat.DumpReadable()
-        return 'fail'
+        pytest.fail()
 
 # OGRFeature(entities):7
 #   EntityHandle (String) = 1FA
@@ -1365,7 +1358,7 @@ def test_ogr_dxf_31():
     feat = lyr.GetNextFeature()
     if ogrtest.check_feature_geometry(feat, 'POLYGON Z ((1 2 0,1 3 0,2 3 0,2 2 0,1 2 0))'):
         feat.DumpReadable()
-        return 'fail'
+        pytest.fail()
 
 # OGRFeature(entities):8
 #   EntityHandle (String) = 1FB
@@ -1373,7 +1366,7 @@ def test_ogr_dxf_31():
     feat = lyr.GetNextFeature()
     if ogrtest.check_feature_geometry(feat, 'POLYGON ((3 4,4 4,4 3,3 3,3 4))'):
         feat.DumpReadable()
-        return 'fail'
+        pytest.fail()
 
 # OGRFeature(entities):9
 #   EntityHandle (String) = 1FD
@@ -1381,7 +1374,7 @@ def test_ogr_dxf_31():
     feat = lyr.GetNextFeature()
     if ogrtest.check_feature_geometry(feat, 'POLYGON ((8 8,9 8,9 9,8 9,8 8))'):
         feat.DumpReadable()
-        return 'fail'
+        pytest.fail()
 
 # OGRFeature(entities):10
 #   EntityHandle (String) = 200
@@ -1389,7 +1382,7 @@ def test_ogr_dxf_31():
     feat = lyr.GetNextFeature()
     if ogrtest.check_feature_geometry(feat, 'LINESTRING (2 2,2.15384615384615 2.15384615384615,2.30769230769231 2.30769230769231,2.46153846153846 2.46153846153846,2.61538461538461 2.61538461538461,2.76923076923077 2.76923076923077,2.92307692307692 2.92307692307692,3.07692307692308 3.07692307692308,3.23076923076923 3.23076923076923,3.38461538461538 3.38461538461538,3.53846153846154 3.53846153846154,3.69230769230769 3.69230769230769,3.84615384615385 3.84615384615385,4 4,4.15384615384615 4.15384615384615,4.30769230769231 4.30769230769231,4.46153846153846 4.46153846153846,4.61538461538462 4.61538461538462,4.76923076923077 4.76923076923077,4.92307692307692 4.92307692307692,5.07692307692308 5.07692307692308,5.23076923076923 5.23076923076923,5.38461538461538 5.38461538461538,5.53846153846154 5.53846153846154,5.69230769230769 5.69230769230769,5.84615384615385 5.84615384615385,6.0 6.0,6.15384615384615 6.15384615384615,6.30769230769231 6.30769230769231,6.46153846153846 6.46153846153846,6.61538461538462 6.61538461538462,6.76923076923077 6.76923076923077,6.92307692307692 6.92307692307692,7.07692307692308 7.07692307692308,7.23076923076923 7.23076923076923,7.38461538461539 7.38461538461539,7.53846153846154 7.53846153846154,7.69230769230769 7.69230769230769,7.84615384615385 7.84615384615385,8 8)'):
         feat.DumpReadable()
-        return 'fail'
+        pytest.fail()
 
 # OGRFeature(entities):11
 #   EntityHandle (String) = 201
@@ -1397,7 +1390,7 @@ def test_ogr_dxf_31():
     feat = lyr.GetNextFeature()
     if ogrtest.check_feature_geometry(feat, 'LINESTRING (8 1,7.62837370825536 0.987348067229724,7.25775889681215 0.975707614760869,6.88916704597178 0.966090122894857,6.52360963603567 0.959507071933107,6.16209814730525 0.956969942177043,5.80564406008193 0.959490213928084,5.45525885466714 0.968079367487651,5.11195401136229 0.983748883157167,4.77674101046882 1.00751024123805,4.45063133228814 1.04037492203173,4.13463645712167 1.08335440583961,3.82976786527082 1.13746017296313,3.53703703703704 1.2037037037037,3.25745545272173 1.28309647836275,2.99203459262631 1.37664997724169,2.74178593705221 1.48537568064195,2.50772096630085 1.61028506886495,2.29085116067365 1.75238962221211,2.09218800047203 1.91270082098484,1.91270082098485 2.09218800047202,1.75238962221211 2.29085116067364,1.61028506886495 2.50772096630085,1.48537568064195 2.74178593705221,1.37664997724169 2.99203459262631,1.28309647836275 3.25745545272172,1.2037037037037 3.53703703703703,1.13746017296313 3.82976786527082,1.08335440583961 4.13463645712166,1.04037492203173 4.45063133228814,1.00751024123805 4.77674101046882,0.983748883157167 5.11195401136229,0.968079367487652 5.45525885466714,0.959490213928084 5.80564406008193,0.956969942177043 6.16209814730525,0.959507071933108 6.52360963603567,0.966090122894857 6.88916704597178,0.975707614760869 7.25775889681216,0.987348067229724 7.62837370825537,1 8)'):
         feat.DumpReadable()
-        return 'fail'
+        pytest.fail()
 
 # OGRFeature(entities):12
 #   EntityHandle (String) = 202
@@ -1405,7 +1398,7 @@ def test_ogr_dxf_31():
     feat = lyr.GetNextFeature()
     if ogrtest.check_feature_geometry(feat, 'POINT Z (7 7 0)'):
         feat.DumpReadable()
-        return 'fail'
+        pytest.fail()
 
 # OGRFeature(entities):13
 #   EntityHandle (String) = 203
@@ -1413,7 +1406,7 @@ def test_ogr_dxf_31():
     feat = lyr.GetNextFeature()
     if ogrtest.check_feature_geometry(feat, 'POINT Z (-4 4 -5e-16)'):
         feat.DumpReadable()
-        return 'fail'
+        pytest.fail()
 
 # OGRFeature(entities):14
 #   EntityHandle (String) = 204
@@ -1421,7 +1414,7 @@ def test_ogr_dxf_31():
     feat = lyr.GetNextFeature()
     if ogrtest.check_feature_geometry(feat, 'LINESTRING Z (0 0 0,-1 1 -1e-16)'):
         feat.DumpReadable()
-        return 'fail'
+        pytest.fail()
 
 # OGRFeature(entities):15
 #   EntityHandle (String) = 205
@@ -1429,7 +1422,7 @@ def test_ogr_dxf_31():
     feat = lyr.GetNextFeature()
     if ogrtest.check_feature_geometry(feat, 'LINESTRING (-1 1,-2 1,-1 2,-1 1)'):
         feat.DumpReadable()
-        return 'fail'
+        pytest.fail()
 
 # OGRFeature(entities):16
 #   EntityHandle (String) = 206
@@ -1437,7 +1430,7 @@ def test_ogr_dxf_31():
     feat = lyr.GetNextFeature()
     if ogrtest.check_feature_geometry(feat, 'LINESTRING Z (-1 1 -1e-16,-1 2 -1e-16,-2 2 -2e-16,-1 1 -1e-16)'):
         feat.DumpReadable()
-        return 'fail'
+        pytest.fail()
 
 # OGRFeature(entities):17
 #   EntityHandle (String) = 20B
@@ -1447,7 +1440,7 @@ def test_ogr_dxf_31():
     if ogrtest.check_feature_geometry(feat, 'LINESTRING Z (-6 4 -6e-16,-5.99512810051965 3.86048705251175 -5.99512810051965e-16,-5.98053613748314 3.72165379807987 -5.98053613748314e-16,-5.95629520146761 3.58417661836448 -5.95629520146761e-16,-5.92252339187664 3.448725288366 -5.92252339187664e-16,-5.87938524157182 3.31595971334866 -5.87938524157182e-16,-5.8270909152852 3.1865267138484 -5.8270909152852e-16,-5.76589518571785 3.06105687442822 -5.76589518571785e-16,-5.69609619231285 2.94016147153359 -5.69609619231285e-16,-5.61803398874989 2.82442949541505 -5.61803398874989e-16,-5.53208888623796 2.71442478062692 -5.53208888623796e-16,-5.4386796006773 2.61068325908201 -5.4386796006773e-16,-5.33826121271772 2.51371034904521 -5.33826121271772e-16,-5.23132295065132 2.42397849278656 -5.23132295065132e-16,-5.11838580694149 2.34192485488992 -5.11838580694149e-16,-5.0 2.26794919243112 -5e-16,-4.87674229357815 2.20241190740167 -4.87674229357815e-16,-4.74921318683182 2.14563229086643 -4.74921318683182e-16,-4.61803398874989 2.09788696740969 -4.61803398874989e-16,-4.48384379119934 2.05940854744801 -4.48384379119934e-16,-4.34729635533386 2.03038449397558 -4.34729635533386e-16,-4.20905692653531 2.01095620926345 -4.20905692653531e-16,-4.069798993405 2.00121834596181 -4.069798993405e-16,-3.930201006595 2.00121834596181 -3.930201006595e-16,-3.79094307346469 2.01095620926345 -3.79094307346469e-16,-3.65270364466614 2.03038449397558 -3.65270364466614e-16,-3.51615620880066 2.05940854744801 -3.51615620880066e-16,-3.38196601125011 2.09788696740969 -3.3819660112501e-16,-3.25078681316818 2.14563229086643 -3.25078681316818e-16,-3.12325770642185 2.20241190740167 -3.12325770642185e-16,-3.0 2.26794919243112 -3e-16,-2.88161419305851 2.34192485488992 -2.88161419305851e-16,-2.76867704934868 2.42397849278656 -2.76867704934868e-16,-2.66173878728228 2.51371034904521 -2.66173878728228e-16,-2.5613203993227 2.61068325908201 -2.5613203993227e-16,-2.46791111376204 2.71442478062692 -2.46791111376204e-16,-2.38196601125011 2.82442949541505 -2.3819660112501e-16,-2.30390380768715 2.94016147153359 -2.30390380768715e-16,-2.23410481428215 3.06105687442822 -2.23410481428215e-16,-2.1729090847148 3.1865267138484 -2.1729090847148e-16,-2.12061475842818 3.31595971334866 -2.12061475842818e-16,-2.07747660812336 3.448725288366 -2.07747660812336e-16,-2.04370479853239 3.58417661836448 -2.04370479853239e-16,-2.01946386251686 3.72165379807987 -2.01946386251686e-16,-2.00487189948035 3.86048705251175 -2.00487189948035e-16,-2.0 4.0 -2e-16,-2.00487189948035 4.13951294748825 -2.00487189948035e-16,-2.01946386251686 4.27834620192013 -2.01946386251686e-16,-2.04370479853239 4.41582338163552 -2.04370479853239e-16,' +
                                       '-2.07747660812336 4.551274711634 -2.07747660812336e-16,-2.12061475842818 4.68404028665134 -2.12061475842818e-16,-2.1729090847148 4.8134732861516 -2.1729090847148e-16,-2.23410481428215 4.93894312557178 -2.23410481428215e-16,-2.30390380768715 5.05983852846641 -2.30390380768715e-16,-2.38196601125011 5.17557050458495 -2.3819660112501e-16,-2.46791111376204 5.28557521937308 -2.46791111376204e-16,-2.5613203993227 5.38931674091799 -2.5613203993227e-16,-2.66173878728228 5.48628965095479 -2.66173878728228e-16,-2.76867704934868 5.57602150721344 -2.76867704934868e-16,-2.88161419305851 5.65807514511008 -2.88161419305851e-16,-3.0 5.73205080756888 -3e-16,-3.12325770642184 5.79758809259833 -3.12325770642184e-16,-3.25078681316818 5.85436770913357 -3.25078681316817e-16,-3.38196601125011 5.90211303259031 -3.3819660112501e-16,-3.51615620880066 5.94059145255199 -3.51615620880066e-16,-3.65270364466614 5.96961550602442 -3.65270364466614e-16,-3.79094307346469 5.98904379073655 -3.79094307346469e-16,-3.930201006595 5.99878165403819 -3.930201006595e-16,-4.069798993405 5.99878165403819 -4.069798993405e-16,-4.20905692653531 5.98904379073655 -4.20905692653531e-16,-4.34729635533386 5.96961550602442 -4.34729635533386e-16,-4.48384379119933 5.94059145255199 -4.48384379119933e-16,-4.61803398874989 5.90211303259031 -4.61803398874989e-16,-4.74921318683182 5.85436770913357 -4.74921318683182e-16,-4.87674229357815 5.79758809259833 -4.87674229357815e-16,-5.0 5.73205080756888 -5e-16,-5.11838580694149 5.65807514511008 -5.11838580694149e-16,-5.23132295065132 5.57602150721344 -5.23132295065132e-16,-5.33826121271772 5.48628965095479 -5.33826121271772e-16,-5.4386796006773 5.389316740918 -5.4386796006773e-16,-5.53208888623796 5.28557521937308 -5.53208888623796e-16,-5.61803398874989 5.17557050458495 -5.61803398874989e-16,-5.69609619231285 5.05983852846641 -5.69609619231285e-16,-5.76589518571785 4.93894312557178 -5.76589518571785e-16,-5.8270909152852 4.8134732861516 -5.8270909152852e-16,-5.87938524157182 4.68404028665134 -5.87938524157182e-16,-5.92252339187664 4.551274711634 -5.92252339187664e-16,-5.95629520146761 4.41582338163552 -5.95629520146761e-16,-5.98053613748314 4.27834620192013 -5.98053613748314e-16,-5.99512810051965 4.13951294748825 -5.99512810051965e-16,-6.0 4.0 -6e-16)'):
         feat.DumpReadable()
-        return 'fail'
+        pytest.fail()
 
 # OGRFeature(entities):18
 #   EntityHandle (String) = 20C
@@ -1457,7 +1450,7 @@ def test_ogr_dxf_31():
     if ogrtest.check_feature_geometry(feat, 'LINESTRING Z (-2 4 -3e-16,-2.00487189948035 4.06975647374412 -3.00487189948035e-16,-2.01946386251686 4.13917310096007 -3.01946386251686e-16,-2.04370479853239 4.20791169081776 -3.04370479853239e-16,-2.07747660812336 4.275637355817 -3.07747660812336e-16,-2.12061475842818 4.34202014332567 -3.12061475842818e-16,-2.1729090847148 4.4067366430758 -3.1729090847148e-16,-2.23410481428215 4.46947156278589 -3.23410481428215e-16,-2.30390380768715 4.52991926423321 -3.30390380768715e-16,-2.38196601125011 4.58778525229247 -3.38196601125011e-16,-2.46791111376204 4.64278760968654 -3.46791111376204e-16,-2.5613203993227 4.694658370459 -3.5613203993227e-16,-2.66173878728228 4.74314482547739 -3.66173878728228e-16,-2.76867704934868 4.78801075360672 -3.76867704934868e-16,-2.88161419305851 4.82903757255504 -3.88161419305851e-16,-3.0 4.86602540378444 -4e-16,-3.12325770642185 4.89879404629917 -4.12325770642185e-16,-3.25078681316818 4.92718385456679 -4.25078681316818e-16,-3.38196601125011 4.95105651629515 -4.38196601125011e-16,-3.51615620880067 4.970295726276 -4.51615620880067e-16,-3.65270364466614 4.98480775301221 -4.65270364466614e-16,-3.79094307346469 4.99452189536827 -4.79094307346469e-16,-3.930201006595 4.9993908270191 -4.930201006595e-16,-4.069798993405 4.9993908270191 -5.069798993405e-16,-4.20905692653531 4.99452189536827 -5.20905692653531e-16,-4.34729635533386 4.98480775301221 -5.34729635533386e-16,-4.48384379119934 4.970295726276 -5.48384379119934e-16,-4.61803398874989 4.95105651629515 -5.6180339887499e-16,-4.74921318683182 4.92718385456679 -5.74921318683183e-16,-4.87674229357816 4.89879404629917 -5.87674229357816e-16,-5.0 4.86602540378444 -6e-16,-5.11838580694149 4.82903757255504 -6.1183858069415e-16,-5.23132295065132 4.78801075360672 -6.23132295065132e-16,-5.33826121271772 4.74314482547739 -6.33826121271772e-16,-5.4386796006773 4.694658370459 -6.4386796006773e-16,-5.53208888623796 4.64278760968654 -6.53208888623796e-16,-5.61803398874989 4.58778525229247 -6.61803398874989e-16,-5.69609619231285 4.5299192642332 -6.69609619231285e-16,-5.76589518571785 4.46947156278589 -6.76589518571785e-16,-5.8270909152852 4.4067366430758 -6.8270909152852e-16,-5.87938524157182 4.34202014332567 -6.87938524157182e-16,-5.92252339187664 4.275637355817 -6.92252339187664e-16,-5.95629520146761 4.20791169081776 -6.95629520146761e-16,-5.98053613748314 4.13917310096006 -6.98053613748314e-16,-5.99512810051965 4.06975647374412 -6.99512810051965e-16,-6.0 4.0 -7e-16,-5.99512810051965 3.93024352625587 -6.99512810051965e-16,-5.98053613748314 3.86082689903993 -6.98053613748314e-16,-5.95629520146761 3.79208830918224 -6.95629520146761e-16,' +
                                       '-5.92252339187664 3.724362644183 -6.92252339187664e-16,-5.87938524157182 3.65797985667433 -6.87938524157182e-16,-5.8270909152852 3.5932633569242 -6.8270909152852e-16,-5.76589518571785 3.53052843721411 -6.76589518571785e-16,-5.69609619231285 3.4700807357668 -6.69609619231285e-16,-5.61803398874989 3.41221474770753 -6.61803398874989e-16,-5.53208888623796 3.35721239031346 -6.53208888623796e-16,-5.4386796006773 3.305341629541 -6.4386796006773e-16,-5.33826121271772 3.25685517452261 -6.33826121271772e-16,-5.23132295065132 3.21198924639328 -6.23132295065132e-16,-5.11838580694149 3.17096242744496 -6.11838580694149e-16,-5.0 3.13397459621556 -6e-16,-4.87674229357815 3.10120595370083 -5.87674229357816e-16,-4.74921318683182 3.07281614543321 -5.74921318683182e-16,-4.61803398874989 3.04894348370485 -5.6180339887499e-16,-4.48384379119934 3.029704273724 -5.48384379119934e-16,-4.34729635533386 3.01519224698779 -5.34729635533386e-16,-4.20905692653531 3.00547810463173 -5.20905692653531e-16,-4.069798993405 3.0006091729809 -5.069798993405e-16,-3.930201006595 3.0006091729809 -4.930201006595e-16,-3.79094307346469 3.00547810463173 -4.79094307346469e-16,-3.65270364466614 3.01519224698779 -4.65270364466614e-16,-3.51615620880066 3.029704273724 -4.51615620880066e-16,-3.38196601125011 3.04894348370485 -4.38196601125011e-16,-3.25078681316818 3.07281614543321 -4.25078681316818e-16,-3.12325770642185 3.10120595370083 -4.12325770642185e-16,-3.0 3.13397459621556 -4e-16,-2.88161419305851 3.17096242744496 -3.88161419305851e-16,-2.76867704934868 3.21198924639328 -3.76867704934868e-16,-2.66173878728228 3.25685517452261 -3.66173878728228e-16,-2.5613203993227 3.305341629541 -3.5613203993227e-16,-2.46791111376204 3.35721239031346 -3.46791111376204e-16,-2.38196601125011 3.41221474770753 -3.38196601125011e-16,-2.30390380768715 3.4700807357668 -3.30390380768715e-16,-2.23410481428215 3.53052843721411 -3.23410481428215e-16,-2.1729090847148 3.5932633569242 -3.1729090847148e-16,-2.12061475842818 3.65797985667433 -3.12061475842818e-16,-2.07747660812336 3.724362644183 -3.07747660812336e-16,-2.04370479853239 3.79208830918224 -3.04370479853239e-16,-2.01946386251686 3.86082689903993 -3.01946386251686e-16,-2.00487189948035 3.93024352625587 -3.00487189948035e-16,-2 4 -3e-16)'):
         feat.DumpReadable()
-        return 'fail'
+        pytest.fail()
 
 # OGRFeature(entities):19
 #   EntityHandle (String) = 20D
@@ -1466,7 +1459,7 @@ def test_ogr_dxf_31():
     if ogrtest.check_feature_geometry(feat, 'LINESTRING Z (-2.0 2.0 -2e-16,-1.96657794502105 2.03582232791524 -1.96657794502105e-16,-1.93571660708646 2.07387296203834 -1.93571660708646e-16,-1.90756413746468 2.11396923855471 -1.90756413746468e-16,-1.88225568337755 2.15591867344963 -1.88225568337755e-16,-1.85991273921989 2.19951988653655 -1.85991273921989e-16,-1.84064256332004 2.24456356819194 -1.84064256332004e-16,-1.8245376630414 2.29083348415575 -1.8245376630414e-16,-1.81167535069652 2.33810751357387 -1.81167535069652e-16,-1.80211737240583 2.38615871529951 -1.80211737240583e-16,-1.79590961168258 2.43475641733454 -1.79590961168258e-16,-1.79308186916688 2.48366732418105 -1.79308186916688e-16,-1.79364771956639 2.53265663678705 -1.79364771956639e-16,-1.79760444649032 2.58148917971011 -1.79760444649032e-16,-1.80493305548955 2.62993053008785 -1.80493305548955e-16,-1.81559836524041 2.67774814299566 -1.81559836524041e-16,-1.8295491764342 2.72471246778926 -1.8295491764342e-16,-1.84671851756181 2.7705980500731 -1.84671851756181e-16,-1.86702396641357 2.81518461400453 -1.86702396641357e-16,-1.89036804575079 2.85825811973811 -1.89036804575079e-16,-1.91663869124976 2.89961179093366 -1.91663869124976e-16,-1.94570978947168 2.93904710739563 -1.94570978947168e-16,-1.97744178327594 2.97637475807832 -1.97744178327594e-16,-2.01168234177068 3.01141554988232 -2.01168234177068e-16,-2.04826709158413 3.04400126787917 -2.04826709158413e-16,-2.08702040594658 3.07397548283483 -2.08702040594658e-16,-2.12775624779472 3.10119430215541 -2.12775624779472e-16,-2.17027906285109 3.12552706065018 -2.17027906285109e-16,-2.2143847183914 3.14685694779575 -2.2143847183914e-16,-2.25986148319297 3.16508156849045 -2.25986148319297e-16,-2.30649104396024 3.18011343460661 -2.30649104396024e-16,-2.35404955334774 3.1918803849814 -2.35404955334774e-16,-2.40230870454951 3.20032593182975 -2.40230870454951e-16,-2.45103682729644 3.2054095319166 -2.45103682729644e-16,' +
                                       '-2.5 3.20710678118655 -2.5e-16,-2.54896317270356 3.2054095319166 -2.54896317270356e-16,-2.59769129545049 3.20032593182975 -2.59769129545049e-16,-2.64595044665226 3.1918803849814 -2.64595044665226e-16,-2.69350895603976 3.18011343460661 -2.69350895603976e-16,-2.74013851680703 3.16508156849045 -2.74013851680703e-16,-2.7856152816086 3.14685694779575 -2.7856152816086e-16,-2.8297209371489 3.12552706065018 -2.8297209371489e-16,-2.87224375220528 3.10119430215541 -2.87224375220528e-16,-2.91297959405342 3.07397548283483 -2.91297959405342e-16,-2.95173290841587 3.04400126787917 -2.95173290841587e-16,-2.98831765822932 3.01141554988232 -2.98831765822932e-16,-3.02255821672406 2.97637475807832 -3.02255821672406e-16,-3.05429021052832 2.93904710739563 -3.05429021052832e-16,-3.08336130875024 2.89961179093367 -3.08336130875024e-16,-3.10963195424921 2.85825811973811 -3.10963195424921e-16,-3.13297603358643 2.81518461400453 -3.13297603358643e-16,-3.15328148243819 2.7705980500731 -3.15328148243819e-16,-3.1704508235658 2.72471246778926 -3.1704508235658e-16,-3.18440163475959 2.67774814299567 -3.18440163475959e-16,-3.19506694451045 2.62993053008786 -3.19506694451045e-16,-3.20239555350968 2.58148917971011 -3.20239555350968e-16,-3.20635228043361 2.53265663678705 -3.20635228043361e-16,-3.20691813083312 2.48366732418105 -3.20691813083312e-16,-3.20409038831742 2.43475641733454 -3.20409038831742e-16,-3.19788262759417 2.38615871529951 -3.19788262759417e-16,-3.18832464930348 2.33810751357387 -3.18832464930349e-16,-3.1754623369586 2.29083348415575 -3.1754623369586e-16,-3.15935743667996 2.24456356819194 -3.15935743667996e-16,-3.14008726078011 2.19951988653655 -3.14008726078011e-16,-3.11774431662245 2.15591867344963 -3.11774431662245e-16,-3.09243586253532 2.11396923855472 -3.09243586253532e-16,-3.06428339291354 2.07387296203834 -3.06428339291354e-16,-3.03342205497895 2.03582232791524 -3.03342205497895e-16,-3 2 -3e-16)'):
         feat.DumpReadable()
-        return 'fail'
+        pytest.fail()
 
 # OGRFeature(entities):20
 #   EntityHandle (String) = 20E
@@ -1474,7 +1467,7 @@ def test_ogr_dxf_31():
     feat = lyr.GetNextFeature()
     if ogrtest.check_feature_geometry(feat, 'POLYGON Z ((-1 2 -1e-16,-1 3 -1e-16,-2 3 -2e-16,-2 2 -2e-16,-1 2 -1e-16))'):
         feat.DumpReadable()
-        return 'fail'
+        pytest.fail()
 
 # OGRFeature(entities):21
 #   EntityHandle (String) = 20F
@@ -1482,7 +1475,7 @@ def test_ogr_dxf_31():
     feat = lyr.GetNextFeature()
     if ogrtest.check_feature_geometry(feat, 'POLYGON ((-3 4,-4 4,-4 3,-3 3,-3 4))'):
         feat.DumpReadable()
-        return 'fail'
+        pytest.fail()
 
 # OGRFeature(entities):22
 #   EntityHandle (String) = 211
@@ -1490,7 +1483,7 @@ def test_ogr_dxf_31():
     feat = lyr.GetNextFeature()
     if ogrtest.check_feature_geometry(feat, 'POLYGON ((-8 8,-9 8,-9 9,-8 9,-8 8))'):
         feat.DumpReadable()
-        return 'fail'
+        pytest.fail()
 
 # OGRFeature(entities):23
 #   EntityHandle (String) = 212
@@ -1498,7 +1491,7 @@ def test_ogr_dxf_31():
     feat = lyr.GetNextFeature()
     if ogrtest.check_feature_geometry(feat, 'LINESTRING (-2 2,-2.15384615384615 2.15384615384615,-2.30769230769231 2.30769230769231,-2.46153846153846 2.46153846153846,-2.61538461538461 2.61538461538461,-2.76923076923077 2.76923076923077,-2.92307692307692 2.92307692307692,-3.07692307692308 3.07692307692308,-3.23076923076923 3.23076923076923,-3.38461538461538 3.38461538461538,-3.53846153846154 3.53846153846154,-3.69230769230769 3.69230769230769,-3.84615384615385 3.84615384615385,-4 4,-4.15384615384615 4.15384615384615,-4.30769230769231 4.30769230769231,-4.46153846153846 4.46153846153846,-4.61538461538462 4.61538461538462,-4.76923076923077 4.76923076923077,-4.92307692307692 4.92307692307692,-5.07692307692308 5.07692307692308,-5.23076923076923 5.23076923076923,-5.38461538461538 5.38461538461538,-5.53846153846154 5.53846153846154,-5.69230769230769 5.69230769230769,-5.84615384615385 5.84615384615385,-6.0 6.0,-6.15384615384615 6.15384615384615,-6.30769230769231 6.30769230769231,-6.46153846153846 6.46153846153846,-6.61538461538462 6.61538461538462,-6.76923076923077 6.76923076923077,-6.92307692307692 6.92307692307692,-7.07692307692308 7.07692307692308,-7.23076923076923 7.23076923076923,-7.38461538461539 7.38461538461539,-7.53846153846154 7.53846153846154,-7.69230769230769 7.69230769230769,-7.84615384615385 7.84615384615385,-8 8)'):
         feat.DumpReadable()
-        return 'fail'
+        pytest.fail()
 
 # OGRFeature(entities):24
 #   EntityHandle (String) = 213
@@ -1506,7 +1499,7 @@ def test_ogr_dxf_31():
     feat = lyr.GetNextFeature()
     if ogrtest.check_feature_geometry(feat, 'LINESTRING (-8 1,-7.62837370825536 0.987348067229724,-7.25775889681215 0.975707614760869,-6.88916704597178 0.966090122894857,-6.52360963603567 0.959507071933107,-6.16209814730525 0.956969942177043,-5.80564406008193 0.959490213928084,-5.45525885466714 0.968079367487651,-5.11195401136229 0.983748883157167,-4.77674101046882 1.00751024123805,-4.45063133228814 1.04037492203173,-4.13463645712167 1.08335440583961,-3.82976786527082 1.13746017296313,-3.53703703703704 1.2037037037037,-3.25745545272173 1.28309647836275,-2.99203459262631 1.37664997724169,-2.74178593705221 1.48537568064195,-2.50772096630085 1.61028506886495,-2.29085116067365 1.75238962221211,-2.09218800047203 1.91270082098484,-1.91270082098485 2.09218800047202,-1.75238962221211 2.29085116067364,-1.61028506886495 2.50772096630085,-1.48537568064195 2.74178593705221,-1.37664997724169 2.99203459262631,-1.28309647836275 3.25745545272172,-1.2037037037037 3.53703703703703,-1.13746017296313 3.82976786527082,-1.08335440583961 4.13463645712166,-1.04037492203173 4.45063133228814,-1.00751024123805 4.77674101046882,-0.983748883157167 5.11195401136229,-0.968079367487652 5.45525885466714,-0.959490213928084 5.80564406008193,-0.956969942177043 6.16209814730525,-0.959507071933108 6.52360963603567,-0.966090122894857 6.88916704597178,-0.975707614760869 7.25775889681216,-0.987348067229724 7.62837370825537,-1 8)'):
         feat.DumpReadable()
-        return 'fail'
+        pytest.fail()
 
 # OGRFeature(entities):25
 #   EntityHandle (String) = 214
@@ -1514,7 +1507,7 @@ def test_ogr_dxf_31():
     feat = lyr.GetNextFeature()
     if ogrtest.check_feature_geometry(feat, 'POINT Z (-7 7 -7e-16)'):
         feat.DumpReadable()
-        return 'fail'
+        pytest.fail()
 
 # OGRFeature(entities):26
 #   EntityHandle (String) = 215
@@ -1522,7 +1515,7 @@ def test_ogr_dxf_31():
     feat = lyr.GetNextFeature()
     if ogrtest.check_feature_geometry(feat, 'POINT Z (-4 -4 -1e-15)'):
         feat.DumpReadable()
-        return 'fail'
+        pytest.fail()
 
 # OGRFeature(entities):27
 #   EntityHandle (String) = 216
@@ -1530,7 +1523,7 @@ def test_ogr_dxf_31():
     feat = lyr.GetNextFeature()
     if ogrtest.check_feature_geometry(feat, 'LINESTRING Z (0 0 -2e-16,-1 -1 -5e-16)'):
         feat.DumpReadable()
-        return 'fail'
+        pytest.fail()
 
 # OGRFeature(entities):28
 #   EntityHandle (String) = 217
@@ -1538,7 +1531,7 @@ def test_ogr_dxf_31():
     feat = lyr.GetNextFeature()
     if ogrtest.check_feature_geometry(feat, 'LINESTRING (-1 -1,-2 -1,-1 -2,-1 -1)'):
         feat.DumpReadable()
-        return 'fail'
+        pytest.fail()
 
 # OGRFeature(entities):29
 #   EntityHandle (String) = 218
@@ -1546,7 +1539,7 @@ def test_ogr_dxf_31():
     feat = lyr.GetNextFeature()
     if ogrtest.check_feature_geometry(feat, 'LINESTRING Z (-1 -1 -2e-16,-1 -2 -4e-16,-2 -2 -5e-16,-1 -1 -2e-16)'):
         feat.DumpReadable()
-        return 'fail'
+        pytest.fail()
 
 # OGRFeature(entities):30
 #   EntityHandle (String) = 21D
@@ -1554,7 +1547,7 @@ def test_ogr_dxf_31():
     feat = lyr.GetNextFeature()
     if ogrtest.check_feature_geometry(feat, 'LINESTRING Z (-2 -4 0,-2.00487189948035 -4.13951294748825 0,-2.01946386251686 -4.27834620192013 0,-2.04370479853239 -4.41582338163552 0,-2.07747660812336 -4.551274711634 0,-2.12061475842818 -4.68404028665134 0,-2.1729090847148 -4.8134732861516 0,-2.23410481428215 -4.93894312557178 0,-2.30390380768715 -5.05983852846641 0,-2.38196601125011 -5.17557050458495 0,-2.46791111376204 -5.28557521937308 0,-2.5613203993227 -5.38931674091799 0,-2.66173878728228 -5.48628965095479 0,-2.76867704934868 -5.57602150721344 0,-2.88161419305851 -5.65807514511008 0,-3.0 -5.73205080756888 0,-3.12325770642185 -5.79758809259833 0,-3.25078681316818 -5.85436770913357 0,-3.38196601125011 -5.90211303259031 0,-3.51615620880066 -5.94059145255199 0,-3.65270364466614 -5.96961550602442 0,-3.79094307346469 -5.98904379073655 0,-3.930201006595 -5.99878165403819 0,-4.069798993405 -5.99878165403819 0,-4.20905692653531 -5.98904379073655 0,-4.34729635533386 -5.96961550602442 0,-4.48384379119934 -5.94059145255199 0,-4.61803398874989 -5.90211303259031 0,-4.74921318683182 -5.85436770913357 0,-4.87674229357815 -5.79758809259833 0,-5.0 -5.73205080756888 0,-5.11838580694149 -5.65807514511008 0,-5.23132295065132 -5.57602150721344 0,-5.33826121271772 -5.48628965095479 0,-5.4386796006773 -5.38931674091799 0,-5.53208888623796 -5.28557521937308 0,-5.61803398874989 -5.17557050458495 0,-5.69609619231285 -5.05983852846641 0,-5.76589518571785 -4.93894312557178 0,-5.8270909152852 -4.8134732861516 0,-5.87938524157182 -4.68404028665134 0,-5.92252339187664 -4.551274711634 0,-5.95629520146761 -4.41582338163552 0,-5.98053613748314 -4.27834620192013 0,-5.99512810051965 -4.13951294748825 0,-6 -4 0,-5.99512810051965 -3.86048705251175 0,-5.98053613748314 -3.72165379807987 0,-5.95629520146761 -3.58417661836448 0,-5.92252339187664 -3.448725288366 0,-5.87938524157182 -3.31595971334866 0,-5.8270909152852 -3.1865267138484 0,-5.76589518571785 -3.06105687442822 0,-5.69609619231285 -2.94016147153359 0,-5.61803398874989 -2.82442949541505 0,-5.53208888623796 -2.71442478062692 0,-5.4386796006773 -2.61068325908201 0,-5.33826121271772 -2.51371034904521 0,-5.23132295065132 -2.42397849278656 0,-5.11838580694149 -2.34192485488992 0,-5.0 -2.26794919243112 0,-4.87674229357816 -2.20241190740167 0,-4.74921318683182 -2.14563229086643 0,-4.61803398874989 -2.09788696740969 0,-4.48384379119934 -2.05940854744801 0,-4.34729635533386 -2.03038449397558 0,-4.20905692653531 -2.01095620926345 0,-4.069798993405 -2.00121834596181 0,-3.930201006595 -2.00121834596181 0,-3.79094307346469 -2.01095620926345 0,-3.65270364466614 -2.03038449397558 0,-3.51615620880067 -2.05940854744801 0,-3.38196601125011 -2.09788696740969 0,-3.25078681316818 -2.14563229086643 0,-3.12325770642185 -2.20241190740167 0,-3.0 -2.26794919243112 0,-2.88161419305851 -2.34192485488992 0,-2.76867704934868 -2.42397849278656 0,-2.66173878728228 -2.51371034904521 0,-2.5613203993227 -2.610683259082 0,-2.46791111376204 -2.71442478062692 0,-2.38196601125011 -2.82442949541505 0,-2.30390380768715 -2.94016147153359 0,-2.23410481428215 -3.06105687442822 0,-2.1729090847148 -3.1865267138484 0,-2.12061475842818 -3.31595971334866 0,-2.07747660812336 -3.448725288366 0,-2.04370479853239 -3.58417661836448 0,-2.01946386251686 -3.72165379807987 0,-2.00487189948035 -3.86048705251175 0,-2.0 -4.0 0)'):
         feat.DumpReadable()
-        return 'fail'
+        pytest.fail()
 
 # OGRFeature(entities):31
 #   EntityHandle (String) = 21E
@@ -1564,7 +1557,7 @@ def test_ogr_dxf_31():
     if ogrtest.check_feature_geometry(feat, 'LINESTRING Z (-2 -4 -8e-16,-2.00487189948035 -4.06975647374412 -8.07462837322448e-16,-2.01946386251686 -4.13917310096007 -8.15863696347693e-16,-2.04370479853239 -4.20791169081776 -8.25161648935015e-16,-2.07747660812336 -4.275637355817 -8.35311396394036e-16,-2.12061475842818 -4.34202014332567 -8.46263490175385e-16,-2.1729090847148 -4.4067366430758 -8.5796457277906e-16,-2.23410481428215 -4.46947156278589 -8.70357637706804e-16,-2.30390380768715 -4.52991926423321 -8.83382307192036e-16,-2.38196601125011 -4.58778525229247 -8.96975126354258e-16,-2.46791111376204 -4.64278760968654 -9.11069872344859e-16,-2.5613203993227 -4.694658370459 -9.2559787697817e-16,-2.66173878728228 -4.74314482547739 -9.40488361275968e-16,-2.76867704934868 -4.78801075360672 -9.5566878029554e-16,-2.88161419305851 -4.82903757255504 -9.71065176561355e-16,-3.0 -4.86602540378444 -9.86602540378444e-16,-3.12325770642185 -4.89879404629917 -1.0022051752721e-15,-3.25078681316818 -4.92718385456679 -1.0177970667735e-15,-3.38196601125011 -4.95105651629515 -1.03330225275453e-15,-3.51615620880067 -4.970295726276 -1.04864519350767e-15,-3.65270364466614 -4.98480775301221 -1.06375113976783e-15,-3.79094307346469 -4.99452189536827 -1.0785464968833e-15,-3.930201006595 -4.9993908270191 -1.09295918336141e-15,-4.069798993405 -4.9993908270191 -1.10691898204241e-15,-4.20905692653531 -4.99452189536827 -1.12035788219036e-15,-4.34729635533386 -4.98480775301221 -1.13321041083461e-15,-4.48384379119934 -4.970295726276 -1.14541395174753e-15,-4.61803398874989 -4.95105651629515 -1.1569090505045e-15,-4.74921318683182 -4.92718385456679 -1.16763970413986e-15,-4.87674229357816 -4.89879404629917 -1.17755363398773e-15,-5.0 -4.86602540378444 -1.18660254037844e-15,-5.11838580694149 -4.82903757255504 -1.19474233794965e-15,-5.23132295065132 -4.78801075360672 -1.2019333704258e-15,-5.33826121271772 -4.74314482547739 -1.20814060381951e-15,-5.4386796006773 -4.694658370459 -1.21333379711363e-15,-5.53208888623796 -4.64278760968654 -1.21748764959245e-15,-5.61803398874989 -4.58778525229247 -1.22058192410424e-15,-5.69609619231285 -4.5299192642332 -1.22260154565461e-15,-5.76589518571785 -4.46947156278589 -1.22353667485037e-15,-5.8270909152852 -4.4067366430758 -1.2233827558361e-15,-5.87938524157182 -4.34202014332567 -1.22214053848975e-15,-5.92252339187664 -4.275637355817 -1.21981607476936e-15,-5.95629520146761 -4.20791169081776 -1.21642068922854e-15,-5.98053613748314 -4.13917310096007 -1.21197092384432e-15,-5.99512810051965 -4.06975647374412 -1.20648845742638e-15,-6 -4 -1.2e-15,-5.99512810051965 -3.93024352625587 -1.19253716267755e-15,' +
                                       '-5.98053613748314 -3.86082689903993 -1.18413630365231e-15,-5.95629520146761 -3.79208830918224 -1.17483835106499e-15,-5.92252339187664 -3.724362644183 -1.16468860360596e-15,-5.87938524157182 -3.65797985667433 -1.15373650982461e-15,-5.8270909152852 -3.5932633569242 -1.14203542722094e-15,-5.76589518571785 -3.53052843721411 -1.1296423622932e-15,-5.69609619231285 -3.4700807357668 -1.11661769280796e-15,-5.61803398874989 -3.41221474770753 -1.10302487364574e-15,-5.53208888623796 -3.35721239031346 -1.08893012765514e-15,-5.4386796006773 -3.305341629541 -1.07440212302183e-15,-5.33826121271772 -3.25685517452261 -1.05951163872403e-15,-5.23132295065132 -3.21198924639328 -1.04433121970446e-15,-5.11838580694149 -3.17096242744496 -1.02893482343865e-15,-5.0 -3.13397459621556 -1.01339745962156e-15,-4.87674229357815 -3.10120595370083 -9.97794824727899e-16,-4.74921318683182 -3.07281614543321 -9.82202933226504e-16,-4.61803398874989 -3.04894348370485 -9.66697747245474e-16,-4.48384379119934 -3.029704273724 -9.51354806492334e-16,-4.34729635533386 -3.01519224698779 -9.36248860232165e-16,-4.20905692653531 -3.00547810463173 -9.21453503116703e-16,-4.069798993405 -3.0006091729809 -9.07040816638591e-16,-3.930201006595 -3.0006091729809 -8.9308101795759e-16,-3.79094307346469 -3.00547810463173 -8.79642117809642e-16,-3.65270364466614 -3.01519224698779 -8.66789589165393e-16,-3.51615620880066 -3.029704273724 -8.54586048252467e-16,-3.38196601125011 -3.04894348370485 -8.43090949495495e-16,-3.25078681316818 -3.07281614543321 -8.32360295860139e-16,-3.12325770642185 -3.10120595370083 -8.22446366012268e-16,-3.0 -3.13397459621556 -8.13397459621556e-16,-2.88161419305851 -3.17096242744496 -8.05257662050347e-16,-2.76867704934868 -3.21198924639328 -7.98066629574196e-16,-2.66173878728228 -3.25685517452261 -7.91859396180489e-16,-2.5613203993227 -3.305341629541 -7.8666620288637e-16,-2.46791111376204 -3.35721239031346 -7.82512350407551e-16,-2.38196601125011 -3.41221474770753 -7.79418075895763e-16,-2.30390380768715 -3.4700807357668 -7.77398454345394e-16,-2.23410481428215 -3.53052843721411 -7.76463325149626e-16,-2.1729090847148 -3.5932633569242 -7.766172441639e-16,-2.12061475842818 -3.65797985667433 -7.77859461510252e-16,-2.07747660812336 -3.724362644183 -7.80183925230636e-16,-2.04370479853239 -3.79208830918224 -7.83579310771463e-16,-2.01946386251686 -3.86082689903993 -7.88029076155679e-16,-2.00487189948035 -3.93024352625587 -7.93511542573623e-16,-2 -4 -8e-16)'):
         feat.DumpReadable()
-        return 'fail'
+        pytest.fail()
 
 # OGRFeature(entities):32
 #   EntityHandle (String) = 21F
@@ -1572,7 +1565,7 @@ def test_ogr_dxf_31():
     feat = lyr.GetNextFeature()
     if ogrtest.check_feature_geometry(feat, 'LINESTRING Z (-2 -2 0,-1.96657794502105 -2.03582232791524 0,-1.93571660708646 -2.07387296203834 0,-1.90756413746468 -2.11396923855472 0,-1.88225568337755 -2.15591867344963 0,-1.85991273921989 -2.19951988653655 0,-1.84064256332004 -2.24456356819194 0,-1.8245376630414 -2.29083348415575 0,-1.81167535069652 -2.33810751357387 0,-1.80211737240583 -2.38615871529951 0,-1.79590961168258 -2.43475641733454 0,-1.79308186916688 -2.48366732418105 0,-1.79364771956639 -2.53265663678705 0,-1.79760444649032 -2.58148917971011 0,-1.80493305548955 -2.62993053008786 0,-1.81559836524041 -2.67774814299567 0,-1.8295491764342 -2.72471246778926 0,-1.84671851756181 -2.7705980500731 0,-1.86702396641357 -2.81518461400453 0,-1.89036804575079 -2.85825811973811 0,-1.91663869124976 -2.89961179093367 0,-1.94570978947168 -2.93904710739563 0,-1.97744178327594 -2.97637475807832 0,-2.01168234177068 -3.01141554988232 0,-2.04826709158413 -3.04400126787917 0,-2.08702040594658 -3.07397548283483 0,-2.12775624779472 -3.10119430215541 0,-2.1702790628511 -3.12552706065018 0,-2.2143847183914 -3.14685694779575 0,-2.25986148319297 -3.16508156849045 0,-2.30649104396024 -3.18011343460661 0,-2.35404955334774 -3.1918803849814 0,-2.40230870454951 -3.20032593182975 0,-2.45103682729644 -3.2054095319166 0,-2.5 -3.20710678118655 0,-2.54896317270356 -3.2054095319166 0,-2.59769129545049 -3.20032593182975 0,-2.64595044665226 -3.1918803849814 0,-2.69350895603976 -3.18011343460661 0,-2.74013851680703 -3.16508156849045 0,-2.7856152816086 -3.14685694779575 0,-2.8297209371489 -3.12552706065018 0,-2.87224375220528 -3.10119430215541 0,-2.91297959405342 -3.07397548283483 0,-2.95173290841587 -3.04400126787917 0,-2.98831765822932 -3.01141554988232 0,-3.02255821672406 -2.97637475807832 0,-3.05429021052832 -2.93904710739563 0,-3.08336130875024 -2.89961179093367 0,-3.10963195424921 -2.85825811973811 0,-3.13297603358643 -2.81518461400453 0,-3.15328148243819 -2.7705980500731 0,-3.1704508235658 -2.72471246778926 0,-3.18440163475959 -2.67774814299567 0,-3.19506694451045 -2.62993053008786 0,-3.20239555350968 -2.58148917971011 0,-3.20635228043361 -2.53265663678705 0,-3.20691813083312 -2.48366732418105 0,-3.20409038831742 -2.43475641733454 0,-3.19788262759417 -2.38615871529951 0,-3.18832464930348 -2.33810751357387 0,-3.1754623369586 -2.29083348415575 0,-3.15935743667996 -2.24456356819194 0,-3.14008726078011 -2.19951988653655 0,-3.11774431662245 -2.15591867344963 0,-3.09243586253532 -2.11396923855472 0,-3.06428339291354 -2.07387296203834 0,-3.03342205497895 -2.03582232791524 0,-3 -2 0)'):
         feat.DumpReadable()
-        return 'fail'
+        pytest.fail()
 
 # OGRFeature(entities):33
 #   EntityHandle (String) = 220
@@ -1580,7 +1573,7 @@ def test_ogr_dxf_31():
     feat = lyr.GetNextFeature()
     if ogrtest.check_feature_geometry(feat, 'POLYGON Z ((-1 -2 -4e-16,-1 -3 -5e-16,-2 -3 -6e-16,-2 -2 -5e-16,-1 -2 -4e-16))'):
         feat.DumpReadable()
-        return 'fail'
+        pytest.fail()
 
 # OGRFeature(entities):34
 #   EntityHandle (String) = 221
@@ -1588,7 +1581,7 @@ def test_ogr_dxf_31():
     feat = lyr.GetNextFeature()
     if ogrtest.check_feature_geometry(feat, 'POLYGON ((-3 -4,-4 -4,-4 -3,-3 -3,-3 -4))'):
         feat.DumpReadable()
-        return 'fail'
+        pytest.fail()
 
 # OGRFeature(entities):35
 #   EntityHandle (String) = 223
@@ -1596,7 +1589,7 @@ def test_ogr_dxf_31():
     feat = lyr.GetNextFeature()
     if ogrtest.check_feature_geometry(feat, 'POLYGON ((-8 -8,-9 -8,-9 -9,-8 -9,-8 -8))'):
         feat.DumpReadable()
-        return 'fail'
+        pytest.fail()
 
 # OGRFeature(entities):36
 #   EntityHandle (String) = 224
@@ -1604,7 +1597,7 @@ def test_ogr_dxf_31():
     feat = lyr.GetNextFeature()
     if ogrtest.check_feature_geometry(feat, 'LINESTRING (-2 -2,-2.15384615384615 -2.15384615384615,-2.30769230769231 -2.30769230769231,-2.46153846153846 -2.46153846153846,-2.61538461538461 -2.61538461538461,-2.76923076923077 -2.76923076923077,-2.92307692307692 -2.92307692307692,-3.07692307692308 -3.07692307692308,-3.23076923076923 -3.23076923076923,-3.38461538461538 -3.38461538461538,-3.53846153846154 -3.53846153846154,-3.69230769230769 -3.69230769230769,-3.84615384615385 -3.84615384615385,-4 -4,-4.15384615384615 -4.15384615384615,-4.30769230769231 -4.30769230769231,-4.46153846153846 -4.46153846153846,-4.61538461538462 -4.61538461538462,-4.76923076923077 -4.76923076923077,-4.92307692307692 -4.92307692307692,-5.07692307692308 -5.07692307692308,-5.23076923076923 -5.23076923076923,-5.38461538461538 -5.38461538461538,-5.53846153846154 -5.53846153846154,-5.69230769230769 -5.69230769230769,-5.84615384615385 -5.84615384615385,-6.0 -6.0,-6.15384615384615 -6.15384615384615,-6.30769230769231 -6.30769230769231,-6.46153846153846 -6.46153846153846,-6.61538461538462 -6.61538461538462,-6.76923076923077 -6.76923076923077,-6.92307692307692 -6.92307692307692,-7.07692307692308 -7.07692307692308,-7.23076923076923 -7.23076923076923,-7.38461538461539 -7.38461538461539,-7.53846153846154 -7.53846153846154,-7.69230769230769 -7.69230769230769,-7.84615384615385 -7.84615384615385,-8 -8)'):
         feat.DumpReadable()
-        return 'fail'
+        pytest.fail()
 
 # OGRFeature(entities):37
 #   EntityHandle (String) = 225
@@ -1612,7 +1605,7 @@ def test_ogr_dxf_31():
     feat = lyr.GetNextFeature()
     if ogrtest.check_feature_geometry(feat, 'LINESTRING (-8 -1,-7.62837370825536 -0.987348067229724,-7.25775889681215 -0.975707614760869,-6.88916704597178 -0.966090122894857,-6.52360963603567 -0.959507071933107,-6.16209814730525 -0.956969942177043,-5.80564406008193 -0.959490213928084,-5.45525885466714 -0.968079367487651,-5.11195401136229 -0.983748883157167,-4.77674101046882 -1.00751024123805,-4.45063133228814 -1.04037492203173,-4.13463645712167 -1.08335440583961,-3.82976786527082 -1.13746017296313,-3.53703703703704 -1.2037037037037,-3.25745545272173 -1.28309647836275,-2.99203459262631 -1.37664997724169,-2.74178593705221 -1.48537568064195,-2.50772096630085 -1.61028506886495,-2.29085116067365 -1.75238962221211,-2.09218800047203 -1.91270082098484,-1.91270082098485 -2.09218800047202,-1.75238962221211 -2.29085116067364,-1.61028506886495 -2.50772096630085,-1.48537568064195 -2.74178593705221,-1.37664997724169 -2.99203459262631,-1.28309647836275 -3.25745545272172,-1.2037037037037 -3.53703703703703,-1.13746017296313 -3.82976786527082,-1.08335440583961 -4.13463645712166,-1.04037492203173 -4.45063133228814,-1.00751024123805 -4.77674101046882,-0.983748883157167 -5.11195401136229,-0.968079367487652 -5.45525885466714,-0.959490213928084 -5.80564406008193,-0.956969942177043 -6.16209814730525,-0.959507071933108 -6.52360963603567,-0.966090122894857 -6.88916704597178,-0.975707614760869 -7.25775889681216,-0.987348067229724 -7.62837370825537,-1 -8)'):
         feat.DumpReadable()
-        return 'fail'
+        pytest.fail()
 
 # OGRFeature(entities):38
 #   EntityHandle (String) = 226
@@ -1620,7 +1613,7 @@ def test_ogr_dxf_31():
     feat = lyr.GetNextFeature()
     if ogrtest.check_feature_geometry(feat, 'POINT Z (-7 -7 0)'):
         feat.DumpReadable()
-        return 'fail'
+        pytest.fail()
 
 # OGRFeature(entities):39
 #   EntityHandle (String) = 227
@@ -1628,7 +1621,7 @@ def test_ogr_dxf_31():
     feat = lyr.GetNextFeature()
     if ogrtest.check_feature_geometry(feat, 'POINT Z (4 -4 -5e-16)'):
         feat.DumpReadable()
-        return 'fail'
+        pytest.fail()
 
 # OGRFeature(entities):40
 #   EntityHandle (String) = 228
@@ -1636,7 +1629,7 @@ def test_ogr_dxf_31():
     feat = lyr.GetNextFeature()
     if ogrtest.check_feature_geometry(feat, 'LINESTRING Z (0 0 0,1 -1 -1e-16)'):
         feat.DumpReadable()
-        return 'fail'
+        pytest.fail()
 
 # OGRFeature(entities):41
 #   EntityHandle (String) = 229
@@ -1644,7 +1637,7 @@ def test_ogr_dxf_31():
     feat = lyr.GetNextFeature()
     if ogrtest.check_feature_geometry(feat, 'LINESTRING (1 -1,2 -1,1 -2,1 -1)'):
         feat.DumpReadable()
-        return 'fail'
+        pytest.fail()
 
 # OGRFeature(entities):42
 #   EntityHandle (String) = 22A
@@ -1652,7 +1645,7 @@ def test_ogr_dxf_31():
     feat = lyr.GetNextFeature()
     if ogrtest.check_feature_geometry(feat, 'LINESTRING Z (1 -1 -1e-16,1 -2 -2e-16,2 -2 -2e-16,1 -1 -1e-16)'):
         feat.DumpReadable()
-        return 'fail'
+        pytest.fail()
 
 # OGRFeature(entities):43
 #   EntityHandle (String) = 22F
@@ -1662,7 +1655,7 @@ def test_ogr_dxf_31():
     if ogrtest.check_feature_geometry(feat, 'LINESTRING Z (2 -4 -4e-16,2.00487189948035 -4.13951294748825 -4.13951294748825e-16,2.01946386251686 -4.27834620192013 -4.27834620192013e-16,2.04370479853239 -4.41582338163552 -4.41582338163552e-16,2.07747660812336 -4.551274711634 -4.551274711634e-16,2.12061475842818 -4.68404028665134 -4.68404028665134e-16,2.1729090847148 -4.8134732861516 -4.8134732861516e-16,2.23410481428215 -4.93894312557178 -4.93894312557178e-16,2.30390380768715 -5.05983852846641 -5.05983852846641e-16,2.38196601125011 -5.17557050458495 -5.17557050458495e-16,2.46791111376204 -5.28557521937308 -5.28557521937308e-16,2.5613203993227 -5.38931674091799 -5.38931674091799e-16,2.66173878728228 -5.48628965095479 -5.48628965095479e-16,2.76867704934868 -5.57602150721344 -5.57602150721344e-16,2.88161419305851 -5.65807514511008 -5.65807514511008e-16,3.0 -5.73205080756888 -5.73205080756888e-16,3.12325770642185 -5.79758809259833 -5.79758809259833e-16,3.25078681316818 -5.85436770913357 -5.85436770913357e-16,3.38196601125011 -5.90211303259031 -5.90211303259031e-16,3.51615620880066 -5.94059145255199 -5.94059145255199e-16,3.65270364466614 -5.96961550602442 -5.96961550602442e-16,3.79094307346469 -5.98904379073655 -5.98904379073655e-16,3.930201006595 -5.99878165403819 -5.99878165403819e-16,4.069798993405 -5.99878165403819 -5.99878165403819e-16,4.20905692653531 -5.98904379073655 -5.98904379073655e-16,4.34729635533386 -5.96961550602442 -5.96961550602442e-16,4.48384379119934 -5.94059145255199 -5.94059145255199e-16,4.61803398874989 -5.90211303259031 -5.90211303259031e-16,4.74921318683182 -5.85436770913357 -5.85436770913357e-16,4.87674229357815 -5.79758809259833 -5.79758809259833e-16,5.0 -5.73205080756888 -5.73205080756888e-16,5.11838580694149 -5.65807514511008 -5.65807514511008e-16,5.23132295065132 -5.57602150721344 -5.57602150721344e-16,5.33826121271772 -5.48628965095479 -5.48628965095479e-16,5.4386796006773 -5.38931674091799 -5.38931674091799e-16,5.53208888623796 -5.28557521937308 -5.28557521937308e-16,5.61803398874989 -5.17557050458495 -5.17557050458495e-16,5.69609619231285 -5.05983852846641 -5.05983852846641e-16,5.76589518571785 -4.93894312557178 -4.93894312557178e-16,5.8270909152852 -4.8134732861516 -4.8134732861516e-16,5.87938524157182 -4.68404028665134 -4.68404028665134e-16,5.92252339187664 -4.551274711634 -4.551274711634e-16,5.95629520146761 -4.41582338163552 -4.41582338163552e-16,5.98053613748314 -4.27834620192013 -4.27834620192013e-16,5.99512810051965 -4.13951294748825 -4.13951294748825e-16,6 -4 -4e-16,5.99512810051965 -3.86048705251175 -3.86048705251175e-16,5.98053613748314 -3.72165379807987 -3.72165379807987e-16,5.95629520146761 -3.58417661836448 -3.58417661836448e-16,5.92252339187664 -3.448725288366 -3.448725288366e-16,5.87938524157182 -3.31595971334866 -3.31595971334866e-16,5.8270909152852 -3.1865267138484 -3.1865267138484e-16,5.76589518571785 -3.06105687442822 -3.06105687442822e-16,5.69609619231285 -2.94016147153359 -2.94016147153359e-16,5.61803398874989 -2.82442949541505 -2.82442949541505e-16,5.53208888623796 -2.71442478062692 -2.71442478062692e-16,5.4386796006773 -2.61068325908201 -2.61068325908201e-16,5.33826121271772 -2.51371034904521 -2.51371034904521e-16,' +
                                       '5.23132295065132 -2.42397849278656 -2.42397849278656e-16,5.11838580694149 -2.34192485488992 -2.34192485488992e-16,5.0 -2.26794919243112 -2.26794919243112e-16,4.87674229357816 -2.20241190740167 -2.20241190740167e-16,4.74921318683182 -2.14563229086643 -2.14563229086643e-16,4.61803398874989 -2.09788696740969 -2.09788696740969e-16,4.48384379119934 -2.05940854744801 -2.05940854744801e-16,4.34729635533386 -2.03038449397558 -2.03038449397558e-16,4.20905692653531 -2.01095620926345 -2.01095620926345e-16,4.069798993405 -2.00121834596181 -2.00121834596181e-16,3.930201006595 -2.00121834596181 -2.00121834596181e-16,3.79094307346469 -2.01095620926345 -2.01095620926345e-16,3.65270364466614 -2.03038449397558 -2.03038449397558e-16,3.51615620880067 -2.05940854744801 -2.05940854744801e-16,3.38196601125011 -2.09788696740969 -2.09788696740969e-16,3.25078681316818 -2.14563229086643 -2.14563229086643e-16,3.12325770642185 -2.20241190740167 -2.20241190740167e-16,3.0 -2.26794919243112 -2.26794919243112e-16,2.88161419305851 -2.34192485488992 -2.34192485488992e-16,2.76867704934868 -2.42397849278656 -2.42397849278656e-16,2.66173878728228 -2.51371034904521 -2.51371034904521e-16,2.5613203993227 -2.610683259082 -2.610683259082e-16,2.46791111376204 -2.71442478062692 -2.71442478062692e-16,2.38196601125011 -2.82442949541505 -2.82442949541505e-16,2.30390380768715 -2.94016147153359 -2.94016147153359e-16,2.23410481428215 -3.06105687442822 -3.06105687442822e-16,2.1729090847148 -3.1865267138484 -3.1865267138484e-16,2.12061475842818 -3.31595971334866 -3.31595971334866e-16,2.07747660812336 -3.448725288366 -3.448725288366e-16,2.04370479853239 -3.58417661836448 -3.58417661836448e-16,2.01946386251686 -3.72165379807987 -3.72165379807987e-16,2.00487189948035 -3.86048705251175 -3.86048705251175e-16,2.0 -4.0 -4e-16)'):
         feat.DumpReadable()
-        return 'fail'
+        pytest.fail()
 
 # OGRFeature(entities):44
 #   EntityHandle (String) = 230
@@ -1672,7 +1665,7 @@ def test_ogr_dxf_31():
     if ogrtest.check_feature_geometry(feat, 'LINESTRING Z (2 -4 -5e-16,2.00487189948035 -4.06975647374412 -5.06975647374413e-16,2.01946386251686 -4.13917310096007 -5.13917310096007e-16,2.04370479853239 -4.20791169081776 -5.20791169081776e-16,2.07747660812336 -4.275637355817 -5.275637355817e-16,2.12061475842818 -4.34202014332567 -5.34202014332567e-16,2.1729090847148 -4.4067366430758 -5.4067366430758e-16,2.23410481428215 -4.46947156278589 -5.46947156278589e-16,2.30390380768715 -4.52991926423321 -5.52991926423321e-16,2.38196601125011 -4.58778525229247 -5.58778525229247e-16,2.46791111376204 -4.64278760968654 -5.64278760968654e-16,2.5613203993227 -4.694658370459 -5.694658370459e-16,2.66173878728228 -4.74314482547739 -5.7431448254774e-16,2.76867704934868 -4.78801075360672 -5.78801075360672e-16,2.88161419305851 -4.82903757255504 -5.82903757255504e-16,3.0 -4.86602540378444 -5.86602540378444e-16,3.12325770642185 -4.89879404629917 -5.89879404629917e-16,3.25078681316818 -4.92718385456679 -5.92718385456679e-16,3.38196601125011 -4.95105651629515 -5.95105651629515e-16,3.51615620880067 -4.970295726276 -5.970295726276e-16,3.65270364466614 -4.98480775301221 -5.98480775301221e-16,3.79094307346469 -4.99452189536827 -5.99452189536827e-16,3.930201006595 -4.9993908270191 -5.9993908270191e-16,4.069798993405 -4.9993908270191 -5.9993908270191e-16,4.20905692653531 -4.99452189536827 -5.99452189536827e-16,4.34729635533386 -4.98480775301221 -5.98480775301221e-16,4.48384379119934 -4.970295726276 -5.970295726276e-16,4.61803398874989 -4.95105651629515 -5.95105651629515e-16,4.74921318683182 -4.92718385456679 -5.92718385456679e-16,4.87674229357816 -4.89879404629917 -5.89879404629917e-16,5.0 -4.86602540378444 -5.86602540378444e-16,5.11838580694149 -4.82903757255504 -5.82903757255504e-16,5.23132295065132 -4.78801075360672 -5.78801075360672e-16,5.33826121271772 -4.74314482547739 -5.74314482547739e-16,5.4386796006773 -4.694658370459 -5.694658370459e-16,5.53208888623796 -4.64278760968654 -5.64278760968654e-16,5.61803398874989 -4.58778525229247 -5.58778525229247e-16,5.69609619231285 -4.5299192642332 -5.52991926423321e-16,5.76589518571785 -4.46947156278589 -5.46947156278589e-16,5.8270909152852 -4.4067366430758 -5.4067366430758e-16,5.87938524157182 -4.34202014332567 -5.34202014332567e-16,5.92252339187664 -4.275637355817 -5.275637355817e-16,5.95629520146761 -4.20791169081776 -5.20791169081776e-16,5.98053613748314 -4.13917310096007 -5.13917310096007e-16,5.99512810051965 -4.06975647374412 -5.06975647374413e-16,6 -4 -5e-16,5.99512810051965 -3.93024352625587 -4.93024352625588e-16,5.98053613748314 -3.86082689903993 -4.86082689903993e-16,5.95629520146761 -3.79208830918224 -4.79208830918224e-16,5.92252339187664 -3.724362644183 -4.724362644183e-16,5.87938524157182 -3.65797985667433 -4.65797985667433e-16,5.8270909152852 -3.5932633569242 -4.5932633569242e-16,5.76589518571785 -3.53052843721411 -4.53052843721411e-16,5.69609619231285 -3.4700807357668 -4.4700807357668e-16,5.61803398874989 -3.41221474770753 -4.41221474770753e-16,' +
                                       '5.53208888623796 -3.35721239031346 -4.35721239031346e-16,5.4386796006773 -3.305341629541 -4.305341629541e-16,5.33826121271772 -3.25685517452261 -4.25685517452261e-16,5.23132295065132 -3.21198924639328 -4.21198924639328e-16,5.11838580694149 -3.17096242744496 -4.17096242744496e-16,5.0 -3.13397459621556 -4.13397459621556e-16,4.87674229357815 -3.10120595370083 -4.10120595370083e-16,4.74921318683182 -3.07281614543321 -4.07281614543321e-16,4.61803398874989 -3.04894348370485 -4.04894348370485e-16,4.48384379119934 -3.029704273724 -4.029704273724e-16,4.34729635533386 -3.01519224698779 -4.01519224698779e-16,4.20905692653531 -3.00547810463173 -4.00547810463173e-16,4.069798993405 -3.0006091729809 -4.0006091729809e-16,3.930201006595 -3.0006091729809 -4.0006091729809e-16,3.79094307346469 -3.00547810463173 -4.00547810463173e-16,3.65270364466614 -3.01519224698779 -4.01519224698779e-16,3.51615620880066 -3.029704273724 -4.029704273724e-16,3.38196601125011 -3.04894348370485 -4.04894348370485e-16,3.25078681316818 -3.07281614543321 -4.07281614543321e-16,3.12325770642185 -3.10120595370083 -4.10120595370083e-16,3.0 -3.13397459621556 -4.13397459621556e-16,2.88161419305851 -3.17096242744496 -4.17096242744496e-16,2.76867704934868 -3.21198924639328 -4.21198924639328e-16,2.66173878728228 -3.25685517452261 -4.25685517452261e-16,2.5613203993227 -3.305341629541 -4.305341629541e-16,2.46791111376204 -3.35721239031346 -4.35721239031346e-16,2.38196601125011 -3.41221474770753 -4.41221474770753e-16,2.30390380768715 -3.4700807357668 -4.4700807357668e-16,2.23410481428215 -3.53052843721411 -4.53052843721411e-16,2.1729090847148 -3.5932633569242 -4.5932633569242e-16,2.12061475842818 -3.65797985667433 -4.65797985667433e-16,2.07747660812336 -3.724362644183 -4.724362644183e-16,2.04370479853239 -3.79208830918224 -4.79208830918224e-16,2.01946386251686 -3.86082689903993 -4.86082689903993e-16,2.00487189948035 -3.93024352625587 -4.93024352625588e-16,2 -4 -5e-16)'):
         feat.DumpReadable()
-        return 'fail'
+        pytest.fail()
 
 # OGRFeature(entities):45
 #   EntityHandle (String) = 231
@@ -1680,7 +1673,7 @@ def test_ogr_dxf_31():
     feat = lyr.GetNextFeature()
     if ogrtest.check_feature_geometry(feat, 'LINESTRING Z (2 -2 -2e-16,1.96657794502105 -2.03582232791524 -2.03582232791524e-16,1.93571660708646 -2.07387296203834 -2.07387296203834e-16,1.90756413746468 -2.11396923855472 -2.11396923855472e-16,1.88225568337755 -2.15591867344963 -2.15591867344963e-16,1.85991273921989 -2.19951988653655 -2.19951988653655e-16,1.84064256332004 -2.24456356819194 -2.24456356819194e-16,1.8245376630414 -2.29083348415575 -2.29083348415575e-16,1.81167535069652 -2.33810751357387 -2.33810751357387e-16,1.80211737240583 -2.38615871529951 -2.38615871529951e-16,1.79590961168258 -2.43475641733454 -2.43475641733454e-16,1.79308186916688 -2.48366732418105 -2.48366732418105e-16,1.79364771956639 -2.53265663678705 -2.53265663678705e-16,1.79760444649032 -2.58148917971011 -2.58148917971011e-16,1.80493305548955 -2.62993053008786 -2.62993053008786e-16,1.81559836524041 -2.67774814299567 -2.67774814299567e-16,1.8295491764342 -2.72471246778926 -2.72471246778926e-16,1.84671851756181 -2.7705980500731 -2.7705980500731e-16,1.86702396641357 -2.81518461400453 -2.81518461400453e-16,1.89036804575079 -2.85825811973811 -2.85825811973811e-16,1.91663869124976 -2.89961179093367 -2.89961179093367e-16,1.94570978947168 -2.93904710739563 -2.93904710739563e-16,1.97744178327594 -2.97637475807832 -2.97637475807832e-16,2.01168234177068 -3.01141554988232 -3.01141554988232e-16,2.04826709158413 -3.04400126787917 -3.04400126787917e-16,2.08702040594658 -3.07397548283483 -3.07397548283483e-16,2.12775624779472 -3.10119430215541 -3.10119430215541e-16,2.1702790628511 -3.12552706065018 -3.12552706065018e-16,2.2143847183914 -3.14685694779575 -3.14685694779575e-16,2.25986148319297 -3.16508156849045 -3.16508156849045e-16,2.30649104396024 -3.18011343460661 -3.18011343460661e-16,2.35404955334774 -3.1918803849814 -3.1918803849814e-16,2.40230870454951 -3.20032593182975 -3.20032593182975e-16,2.45103682729644 -3.2054095319166 -3.2054095319166e-16,2.5 -3.20710678118655 -3.20710678118655e-16,2.54896317270356 -3.2054095319166 -3.2054095319166e-16,2.59769129545049 -3.20032593182975 -3.20032593182975e-16,2.64595044665226 -3.1918803849814 -3.1918803849814e-16,2.69350895603976 -3.18011343460661 -3.18011343460661e-16,2.74013851680703 -3.16508156849045 -3.16508156849045e-16,2.7856152816086 -3.14685694779575 -3.14685694779575e-16,2.8297209371489 -3.12552706065018 -3.12552706065018e-16,2.87224375220528 -3.10119430215541 -3.10119430215541e-16,2.91297959405342 -3.07397548283483 -3.07397548283483e-16,2.95173290841587 -3.04400126787917 -3.04400126787917e-16,2.98831765822932 -3.01141554988232 -3.01141554988232e-16,3.02255821672406 -2.97637475807832 -2.97637475807832e-16,3.05429021052832 -2.93904710739563 -2.93904710739563e-16,3.08336130875024 -2.89961179093367 -2.89961179093367e-16,3.10963195424921 -2.85825811973811 -2.85825811973811e-16,3.13297603358643 -2.81518461400453 -2.81518461400453e-16,3.15328148243819 -2.7705980500731 -2.7705980500731e-16,3.1704508235658 -2.72471246778926 -2.72471246778926e-16,3.18440163475959 -2.67774814299567 -2.67774814299567e-16,3.19506694451045 -2.62993053008786 -2.62993053008786e-16,3.20239555350968 -2.58148917971011 -2.58148917971011e-16,3.20635228043361 -2.53265663678705 -2.53265663678705e-16,3.20691813083312 -2.48366732418105 -2.48366732418105e-16,3.20409038831742 -2.43475641733454 -2.43475641733454e-16,3.19788262759417 -2.38615871529951 -2.38615871529951e-16,3.18832464930348 -2.33810751357387 -2.33810751357387e-16,3.1754623369586 -2.29083348415575 -2.29083348415575e-16,3.15935743667996 -2.24456356819194 -2.24456356819194e-16,3.14008726078011 -2.19951988653655 -2.19951988653655e-16,3.11774431662245 -2.15591867344963 -2.15591867344963e-16,3.09243586253532 -2.11396923855472 -2.11396923855471e-16,3.06428339291354 -2.07387296203834 -2.07387296203834e-16,3.03342205497895 -2.03582232791524 -2.03582232791524e-16,3 -2 -2e-16)'):
         feat.DumpReadable()
-        return 'fail'
+        pytest.fail()
 
 # OGRFeature(entities):46
 #   EntityHandle (String) = 232
@@ -1688,7 +1681,7 @@ def test_ogr_dxf_31():
     feat = lyr.GetNextFeature()
     if ogrtest.check_feature_geometry(feat, 'POLYGON Z ((1 -2 -2e-16,1 -3 -4e-16,2 -3 -4e-16,2 -2 -2e-16,1 -2 -2e-16))'):
         feat.DumpReadable()
-        return 'fail'
+        pytest.fail()
 
 # OGRFeature(entities):47
 #   EntityHandle (String) = 233
@@ -1696,7 +1689,7 @@ def test_ogr_dxf_31():
     feat = lyr.GetNextFeature()
     if ogrtest.check_feature_geometry(feat, 'POLYGON ((3 -4,4 -4,4 -3,3 -3,3 -4))'):
         feat.DumpReadable()
-        return 'fail'
+        pytest.fail()
 
 # OGRFeature(entities):48
 #   EntityHandle (String) = 235
@@ -1704,7 +1697,7 @@ def test_ogr_dxf_31():
     feat = lyr.GetNextFeature()
     if ogrtest.check_feature_geometry(feat, 'POLYGON ((8 -8,9 -8,9 -9,8 -9,8 -8))'):
         feat.DumpReadable()
-        return 'fail'
+        pytest.fail()
 
 # OGRFeature(entities):49
 #   EntityHandle (String) = 236
@@ -1712,7 +1705,7 @@ def test_ogr_dxf_31():
     feat = lyr.GetNextFeature()
     if ogrtest.check_feature_geometry(feat, 'LINESTRING (2 -2,2.15384615384615 -2.15384615384615,2.30769230769231 -2.30769230769231,2.46153846153846 -2.46153846153846,2.61538461538461 -2.61538461538461,2.76923076923077 -2.76923076923077,2.92307692307692 -2.92307692307692,3.07692307692308 -3.07692307692308,3.23076923076923 -3.23076923076923,3.38461538461538 -3.38461538461538,3.53846153846154 -3.53846153846154,3.69230769230769 -3.69230769230769,3.84615384615385 -3.84615384615385,4 -4,4.15384615384615 -4.15384615384615,4.30769230769231 -4.30769230769231,4.46153846153846 -4.46153846153846,4.61538461538462 -4.61538461538462,4.76923076923077 -4.76923076923077,4.92307692307692 -4.92307692307692,5.07692307692308 -5.07692307692308,5.23076923076923 -5.23076923076923,5.38461538461538 -5.38461538461538,5.53846153846154 -5.53846153846154,5.69230769230769 -5.69230769230769,5.84615384615385 -5.84615384615385,6.0 -6.0,6.15384615384615 -6.15384615384615,6.30769230769231 -6.30769230769231,6.46153846153846 -6.46153846153846,6.61538461538462 -6.61538461538462,6.76923076923077 -6.76923076923077,6.92307692307692 -6.92307692307692,7.07692307692308 -7.07692307692308,7.23076923076923 -7.23076923076923,7.38461538461539 -7.38461538461539,7.53846153846154 -7.53846153846154,7.69230769230769 -7.69230769230769,7.84615384615385 -7.84615384615385,8 -8)'):
         feat.DumpReadable()
-        return 'fail'
+        pytest.fail()
 
 # OGRFeature(entities):50
 #   EntityHandle (String) = 237
@@ -1720,7 +1713,7 @@ def test_ogr_dxf_31():
     feat = lyr.GetNextFeature()
     if ogrtest.check_feature_geometry(feat, 'LINESTRING (8 -1,7.62837370825536 -0.987348067229724,7.25775889681215 -0.975707614760869,6.88916704597178 -0.966090122894857,6.52360963603567 -0.959507071933107,6.16209814730525 -0.956969942177043,5.80564406008193 -0.959490213928084,5.45525885466714 -0.968079367487651,5.11195401136229 -0.983748883157167,4.77674101046882 -1.00751024123805,4.45063133228814 -1.04037492203173,4.13463645712167 -1.08335440583961,3.82976786527082 -1.13746017296313,3.53703703703704 -1.2037037037037,3.25745545272173 -1.28309647836275,2.99203459262631 -1.37664997724169,2.74178593705221 -1.48537568064195,2.50772096630085 -1.61028506886495,2.29085116067365 -1.75238962221211,2.09218800047203 -1.91270082098484,1.91270082098485 -2.09218800047202,1.75238962221211 -2.29085116067364,1.61028506886495 -2.50772096630085,1.48537568064195 -2.74178593705221,1.37664997724169 -2.99203459262631,1.28309647836275 -3.25745545272172,1.2037037037037 -3.53703703703703,1.13746017296313 -3.82976786527082,1.08335440583961 -4.13463645712166,1.04037492203173 -4.45063133228814,1.00751024123805 -4.77674101046882,0.983748883157167 -5.11195401136229,0.968079367487652 -5.45525885466714,0.959490213928084 -5.80564406008193,0.956969942177043 -6.16209814730525,0.959507071933108 -6.52360963603567,0.966090122894857 -6.88916704597178,0.975707614760869 -7.25775889681216,0.987348067229724 -7.62837370825537,1 -8)'):
         feat.DumpReadable()
-        return 'fail'
+        pytest.fail()
 
 # OGRFeature(entities):51
 #   EntityHandle (String) = 238
@@ -1728,7 +1721,7 @@ def test_ogr_dxf_31():
     feat = lyr.GetNextFeature()
     if ogrtest.check_feature_geometry(feat, 'POINT Z (7 -7 -7e-16)'):
         feat.DumpReadable()
-        return 'fail'
+        pytest.fail()
 
     return 'success'
 
@@ -1751,7 +1744,7 @@ def test_ogr_dxf_32():
     feat = lyr.GetNextFeature()
     if ogrtest.check_feature_geometry(feat, 'POINT Z (4 4 0)'):
         feat.DumpReadable()
-        return 'fail'
+        pytest.fail()
 
 # OGRFeature(entities):1
 #   EntityHandle (String) = 1B2
@@ -1759,7 +1752,7 @@ def test_ogr_dxf_32():
     feat = lyr.GetNextFeature()
     if ogrtest.check_feature_geometry(feat, 'LINESTRING Z (0 0 0,1 1 0)'):
         feat.DumpReadable()
-        return 'fail'
+        pytest.fail()
 
 # OGRFeature(entities):2
 #   EntityHandle (String) = 1B3
@@ -1768,7 +1761,7 @@ def test_ogr_dxf_32():
     if ogrtest.check_feature_geometry(feat, 'LINESTRING (1 1,2 1,1 2,1 1)') \
             or feat.GetField('RawCodeValues') != ['330 1F','43 0.0']:
         feat.DumpReadable()
-        return 'fail'
+        pytest.fail()
 
 # OGRFeature(entities):3
 #   EntityHandle (String) = 1B4
@@ -1777,7 +1770,7 @@ def test_ogr_dxf_32():
     if ogrtest.check_feature_geometry(feat, 'LINESTRING Z (1 1 0,1 2 0,2 2 0,1 1 0)') \
             or feat.GetField('RawCodeValues') != ['330 1F','66      1','10 0.0','20 0.0','30 0.0']:
         feat.DumpReadable()
-        return 'fail'
+        pytest.fail()
 
 # OGRFeature(entities):4
 #   EntityHandle (String) = 1B9
@@ -1785,7 +1778,7 @@ def test_ogr_dxf_32():
     feat = lyr.GetNextFeature()
     if ogrtest.check_feature_geometry(feat, 'LINESTRING Z (6 4 0,5.99512810051965 3.86048705251175 0,5.98053613748314 3.72165379807987 0,5.95629520146761 3.58417661836448 0,5.92252339187664 3.448725288366 0,5.87938524157182 3.31595971334866 0,5.8270909152852 3.1865267138484 0,5.76589518571785 3.06105687442822 0,5.69609619231285 2.94016147153359 0,5.61803398874989 2.82442949541505 0,5.53208888623796 2.71442478062692 0,5.4386796006773 2.61068325908201 0,5.33826121271772 2.51371034904521 0,5.23132295065132 2.42397849278656 0,5.11838580694149 2.34192485488992 0,5.0 2.26794919243112 0,4.87674229357815 2.20241190740167 0,4.74921318683182 2.14563229086643 0,4.61803398874989 2.09788696740969 0,4.48384379119934 2.05940854744801 0,4.34729635533386 2.03038449397558 0,4.20905692653531 2.01095620926345 0,4.069798993405 2.00121834596181 0,3.930201006595 2.00121834596181 0,3.79094307346469 2.01095620926345 0,3.65270364466614 2.03038449397558 0,3.51615620880066 2.05940854744801 0,3.38196601125011 2.09788696740969 0,3.25078681316818 2.14563229086643 0,3.12325770642185 2.20241190740167 0,3.0 2.26794919243112 0,2.88161419305851 2.34192485488992 0,2.76867704934868 2.42397849278656 0,2.66173878728228 2.51371034904521 0,2.5613203993227 2.61068325908201 0,2.46791111376204 2.71442478062692 0,2.38196601125011 2.82442949541505 0,2.30390380768715 2.94016147153359 0,2.23410481428215 3.06105687442822 0,2.1729090847148 3.1865267138484 0,2.12061475842818 3.31595971334866 0,2.07747660812336 3.448725288366 0,2.04370479853239 3.58417661836448 0,2.01946386251686 3.72165379807987 0,2.00487189948035 3.86048705251175 0,2.0 4.0 0,2.00487189948035 4.13951294748825 0,2.01946386251686 4.27834620192013 0,2.04370479853239 4.41582338163552 0,2.07747660812336 4.551274711634 0,2.12061475842818 4.68404028665134 0,2.1729090847148 4.8134732861516 0,2.23410481428215 4.93894312557178 0,2.30390380768715 5.05983852846641 0,2.38196601125011 5.17557050458495 0,2.46791111376204 5.28557521937308 0,2.5613203993227 5.38931674091799 0,2.66173878728228 5.48628965095479 0,2.76867704934868 5.57602150721344 0,2.88161419305851 5.65807514511008 0,3.0 5.73205080756888 0,3.12325770642184 5.79758809259833 0,3.25078681316818 5.85436770913357 0,3.38196601125011 5.90211303259031 0,3.51615620880066 5.94059145255199 0,3.65270364466614 5.96961550602442 0,3.79094307346469 5.98904379073655 0,3.930201006595 5.99878165403819 0,4.069798993405 5.99878165403819 0,4.20905692653531 5.98904379073655 0,4.34729635533386 5.96961550602442 0,4.48384379119933 5.94059145255199 0,4.61803398874989 5.90211303259031 0,4.74921318683182 5.85436770913357 0,4.87674229357815 5.79758809259833 0,5.0 5.73205080756888 0,5.11838580694149 5.65807514511008 0,5.23132295065132 5.57602150721344 0,5.33826121271772 5.48628965095479 0,5.4386796006773 5.389316740918 0,5.53208888623796 5.28557521937308 0,5.61803398874989 5.17557050458495 0,5.69609619231285 5.05983852846641 0,5.76589518571785 4.93894312557178 0,5.8270909152852 4.8134732861516 0,5.87938524157182 4.68404028665134 0,5.92252339187664 4.551274711634 0,5.95629520146761 4.41582338163552 0,5.98053613748314 4.27834620192013 0,5.99512810051965 4.13951294748825 0,6.0 4.0 0)'):
         feat.DumpReadable()
-        return 'fail'
+        pytest.fail()
 
 # OGRFeature(entities):5
 #   EntityHandle (String) = 1BA
@@ -1793,7 +1786,7 @@ def test_ogr_dxf_32():
     feat = lyr.GetNextFeature()
     if ogrtest.check_feature_geometry(feat, 'LINESTRING Z (2 4 0,4 4 0)'):
         feat.DumpReadable()
-        return 'fail'
+        pytest.fail()
 
 # OGRFeature(entities):6
 #   EntityHandle (String) = 1BB
@@ -1801,7 +1794,7 @@ def test_ogr_dxf_32():
     feat = lyr.GetNextFeature()
     if ogrtest.check_feature_geometry(feat, 'LINESTRING Z (4 4 0,6 4 0)'):
         feat.DumpReadable()
-        return 'fail'
+        pytest.fail()
 
 # OGRFeature(entities):7
 #   EntityHandle (String) = 1BC
@@ -1809,7 +1802,7 @@ def test_ogr_dxf_32():
     feat = lyr.GetNextFeature()
     if ogrtest.check_feature_geometry(feat, 'LINESTRING Z (4 3 0,4 4 0)'):
         feat.DumpReadable()
-        return 'fail'
+        pytest.fail()
 
 # OGRFeature(entities):8
 #   EntityHandle (String) = 1BD
@@ -1817,7 +1810,7 @@ def test_ogr_dxf_32():
     feat = lyr.GetNextFeature()
     if ogrtest.check_feature_geometry(feat, 'LINESTRING Z (4 4 0,4 5 0)'):
         feat.DumpReadable()
-        return 'fail'
+        pytest.fail()
 
 # OGRFeature(entities):9
 #   EntityHandle (String) = 1BE
@@ -1825,7 +1818,7 @@ def test_ogr_dxf_32():
     feat = lyr.GetNextFeature()
     if ogrtest.check_feature_geometry(feat, 'LINESTRING Z (2 4 0,2.00487189948035 4.06975647374412 0,2.01946386251686 4.13917310096007 0,2.04370479853239 4.20791169081776 0,2.07747660812336 4.275637355817 0,2.12061475842818 4.34202014332567 0,2.1729090847148 4.4067366430758 0,2.23410481428215 4.46947156278589 0,2.30390380768715 4.52991926423321 0,2.38196601125011 4.58778525229247 0,2.46791111376204 4.64278760968654 0,2.5613203993227 4.694658370459 0,2.66173878728228 4.74314482547739 0,2.76867704934868 4.78801075360672 0,2.88161419305851 4.82903757255504 0,3.0 4.86602540378444 0,3.12325770642185 4.89879404629917 0,3.25078681316818 4.92718385456679 0,3.38196601125011 4.95105651629515 0,3.51615620880067 4.970295726276 0,3.65270364466614 4.98480775301221 0,3.79094307346469 4.99452189536827 0,3.930201006595 4.9993908270191 0,4.069798993405 4.9993908270191 0,4.20905692653531 4.99452189536827 0,4.34729635533386 4.98480775301221 0,4.48384379119934 4.970295726276 0,4.61803398874989 4.95105651629515 0,4.74921318683182 4.92718385456679 0,4.87674229357816 4.89879404629917 0,5.0 4.86602540378444 0,5.11838580694149 4.82903757255504 0,5.23132295065132 4.78801075360672 0,5.33826121271772 4.74314482547739 0,5.4386796006773 4.694658370459 0,5.53208888623796 4.64278760968654 0,5.61803398874989 4.58778525229247 0,5.69609619231285 4.5299192642332 0,5.76589518571785 4.46947156278589 0,5.8270909152852 4.4067366430758 0,5.87938524157182 4.34202014332567 0,5.92252339187664 4.275637355817 0,5.95629520146761 4.20791169081776 0,5.98053613748314 4.13917310096006 0,5.99512810051965 4.06975647374412 0,6.0 4.0 0,5.99512810051965 3.93024352625587 0,5.98053613748314 3.86082689903993 0,5.95629520146761 3.79208830918224 0,5.92252339187664 3.724362644183 0,5.87938524157182 3.65797985667433 0,5.8270909152852 3.5932633569242 0,5.76589518571785 3.53052843721411 0,5.69609619231285 3.4700807357668 0,5.61803398874989 3.41221474770753 0,5.53208888623796 3.35721239031346 0,5.4386796006773 3.305341629541 0,5.33826121271772 3.25685517452261 0,5.23132295065132 3.21198924639328 0,5.11838580694149 3.17096242744496 0,5.0 3.13397459621556 0,4.87674229357815 3.10120595370083 0,4.74921318683182 3.07281614543321 0,4.61803398874989 3.04894348370485 0,4.48384379119934 3.029704273724 0,4.34729635533386 3.01519224698779 0,4.20905692653531 3.00547810463173 0,4.069798993405 3.0006091729809 0,3.930201006595 3.0006091729809 0,3.79094307346469 3.00547810463173 0,3.65270364466614 3.01519224698779 0,3.51615620880066 3.029704273724 0,3.38196601125011 3.04894348370485 0,3.25078681316818 3.07281614543321 0,3.12325770642185 3.10120595370083 0,3.0 3.13397459621556 0,2.88161419305851 3.17096242744496 0,2.76867704934868 3.21198924639328 0,2.66173878728228 3.25685517452261 0,2.5613203993227 3.305341629541 0,2.46791111376204 3.35721239031346 0,2.38196601125011 3.41221474770753 0,2.30390380768715 3.4700807357668 0,2.23410481428215 3.53052843721411 0,2.1729090847148 3.5932633569242 0,2.12061475842818 3.65797985667433 0,2.07747660812336 3.724362644183 0,2.04370479853239 3.79208830918224 0,2.01946386251686 3.86082689903993 0,2.00487189948035 3.93024352625587 0,2 4 0)'):
         feat.DumpReadable()
-        return 'fail'
+        pytest.fail()
 
 # OGRFeature(entities):10
 #   EntityHandle (String) = 1BF
@@ -1833,7 +1826,7 @@ def test_ogr_dxf_32():
     feat = lyr.GetNextFeature()
     if ogrtest.check_feature_geometry(feat, 'LINESTRING Z (2.0 2.0 0,1.96657794502105 2.03582232791524 0,1.93571660708646 2.07387296203834 0,1.90756413746468 2.11396923855471 0,1.88225568337755 2.15591867344963 0,1.85991273921989 2.19951988653655 0,1.84064256332004 2.24456356819194 0,1.8245376630414 2.29083348415575 0,1.81167535069652 2.33810751357387 0,1.80211737240583 2.38615871529951 0,1.79590961168258 2.43475641733454 0,1.79308186916688 2.48366732418105 0,1.79364771956639 2.53265663678705 0,1.79760444649032 2.58148917971011 0,1.80493305548955 2.62993053008785 0,1.81559836524041 2.67774814299566 0,1.8295491764342 2.72471246778926 0,1.84671851756181 2.7705980500731 0,1.86702396641357 2.81518461400453 0,1.89036804575079 2.85825811973811 0,1.91663869124976 2.89961179093366 0,1.94570978947168 2.93904710739563 0,1.97744178327594 2.97637475807832 0,2.01168234177068 3.01141554988232 0,2.04826709158413 3.04400126787917 0,2.08702040594658 3.07397548283483 0,2.12775624779472 3.10119430215541 0,2.17027906285109 3.12552706065018 0,2.2143847183914 3.14685694779575 0,2.25986148319297 3.16508156849045 0,2.30649104396024 3.18011343460661 0,2.35404955334774 3.1918803849814 0,2.40230870454951 3.20032593182975 0,2.45103682729644 3.2054095319166 0,2.5 3.20710678118655 0,2.54896317270356 3.2054095319166 0,2.59769129545049 3.20032593182975 0,2.64595044665226 3.1918803849814 0,2.69350895603976 3.18011343460661 0,2.74013851680703 3.16508156849045 0,2.7856152816086 3.14685694779575 0,2.8297209371489 3.12552706065018 0,2.87224375220528 3.10119430215541 0,2.91297959405342 3.07397548283483 0,2.95173290841587 3.04400126787917 0,2.98831765822932 3.01141554988232 0,3.02255821672406 2.97637475807832 0,3.05429021052832 2.93904710739563 0,3.08336130875024 2.89961179093367 0,3.10963195424921 2.85825811973811 0,3.13297603358643 2.81518461400453 0,3.15328148243819 2.7705980500731 0,3.1704508235658 2.72471246778926 0,3.18440163475959 2.67774814299567 0,3.19506694451045 2.62993053008786 0,3.20239555350968 2.58148917971011 0,3.20635228043361 2.53265663678705 0,3.20691813083312 2.48366732418105 0,3.20409038831742 2.43475641733454 0,3.19788262759417 2.38615871529951 0,3.18832464930348 2.33810751357387 0,3.1754623369586 2.29083348415575 0,3.15935743667996 2.24456356819194 0,3.14008726078011 2.19951988653655 0,3.11774431662245 2.15591867344963 0,3.09243586253532 2.11396923855472 0,3.06428339291354 2.07387296203834 0,3.03342205497895 2.03582232791524 0,3 2 0)'):
         feat.DumpReadable()
-        return 'fail'
+        pytest.fail()
 
 # OGRFeature(entities):11
 #   EntityHandle (String) = 1C0
@@ -1841,7 +1834,7 @@ def test_ogr_dxf_32():
     feat = lyr.GetNextFeature()
     if ogrtest.check_feature_geometry(feat, 'POLYGON Z ((1 2 0,1 3 0,2 3 0,2 2 0,1 2 0))'):
         feat.DumpReadable()
-        return 'fail'
+        pytest.fail()
 
 # OGRFeature(entities):12
 #   EntityHandle (String) = 1C1
@@ -1849,7 +1842,7 @@ def test_ogr_dxf_32():
     feat = lyr.GetNextFeature()
     if ogrtest.check_feature_geometry(feat, 'POLYGON ((3 4,4 4,4 3,3 3,3 4))'):
         feat.DumpReadable()
-        return 'fail'
+        pytest.fail()
 
 # OGRFeature(entities):13
 #   EntityHandle (String) = 1C3
@@ -1857,7 +1850,7 @@ def test_ogr_dxf_32():
     feat = lyr.GetNextFeature()
     if ogrtest.check_feature_geometry(feat, 'POLYGON ((8 8,9 8,9 9,8 9,8 8))'):
         feat.DumpReadable()
-        return 'fail'
+        pytest.fail()
 
 # OGRFeature(entities):14
 #   EntityHandle (String) = 1C6
@@ -1865,7 +1858,7 @@ def test_ogr_dxf_32():
     feat = lyr.GetNextFeature()
     if ogrtest.check_feature_geometry(feat, 'LINESTRING (2 2,2.15384615384615 2.15384615384615,2.30769230769231 2.30769230769231,2.46153846153846 2.46153846153846,2.61538461538461 2.61538461538461,2.76923076923077 2.76923076923077,2.92307692307692 2.92307692307692,3.07692307692308 3.07692307692308,3.23076923076923 3.23076923076923,3.38461538461538 3.38461538461538,3.53846153846154 3.53846153846154,3.69230769230769 3.69230769230769,3.84615384615385 3.84615384615385,4 4,4.15384615384615 4.15384615384615,4.30769230769231 4.30769230769231,4.46153846153846 4.46153846153846,4.61538461538462 4.61538461538462,4.76923076923077 4.76923076923077,4.92307692307692 4.92307692307692,5.07692307692308 5.07692307692308,5.23076923076923 5.23076923076923,5.38461538461538 5.38461538461538,5.53846153846154 5.53846153846154,5.69230769230769 5.69230769230769,5.84615384615385 5.84615384615385,6.0 6.0,6.15384615384615 6.15384615384615,6.30769230769231 6.30769230769231,6.46153846153846 6.46153846153846,6.61538461538462 6.61538461538462,6.76923076923077 6.76923076923077,6.92307692307692 6.92307692307692,7.07692307692308 7.07692307692308,7.23076923076923 7.23076923076923,7.38461538461539 7.38461538461539,7.53846153846154 7.53846153846154,7.69230769230769 7.69230769230769,7.84615384615385 7.84615384615385,8 8)'):
         feat.DumpReadable()
-        return 'fail'
+        pytest.fail()
 
 # OGRFeature(entities):15
 #   EntityHandle (String) = 1C7
@@ -1873,7 +1866,7 @@ def test_ogr_dxf_32():
     feat = lyr.GetNextFeature()
     if ogrtest.check_feature_geometry(feat, 'LINESTRING (8 1,7.62837370825536 0.987348067229724,7.25775889681215 0.975707614760869,6.88916704597178 0.966090122894857,6.52360963603567 0.959507071933107,6.16209814730525 0.956969942177043,5.80564406008193 0.959490213928084,5.45525885466714 0.968079367487651,5.11195401136229 0.983748883157167,4.77674101046882 1.00751024123805,4.45063133228814 1.04037492203173,4.13463645712167 1.08335440583961,3.82976786527082 1.13746017296313,3.53703703703704 1.2037037037037,3.25745545272173 1.28309647836275,2.99203459262631 1.37664997724169,2.74178593705221 1.48537568064195,2.50772096630085 1.61028506886495,2.29085116067365 1.75238962221211,2.09218800047203 1.91270082098484,1.91270082098485 2.09218800047202,1.75238962221211 2.29085116067364,1.61028506886495 2.50772096630085,1.48537568064195 2.74178593705221,1.37664997724169 2.99203459262631,1.28309647836275 3.25745545272172,1.2037037037037 3.53703703703703,1.13746017296313 3.82976786527082,1.08335440583961 4.13463645712166,1.04037492203173 4.45063133228814,1.00751024123805 4.77674101046882,0.983748883157167 5.11195401136229,0.968079367487652 5.45525885466714,0.959490213928084 5.80564406008193,0.956969942177043 6.16209814730525,0.959507071933108 6.52360963603567,0.966090122894857 6.88916704597178,0.975707614760869 7.25775889681216,0.987348067229724 7.62837370825537,1 8)'):
         feat.DumpReadable()
-        return 'fail'
+        pytest.fail()
 
 # OGRFeature(entities):16
 #   EntityHandle (String) = 1C8
@@ -1881,7 +1874,7 @@ def test_ogr_dxf_32():
     feat = lyr.GetNextFeature()
     if ogrtest.check_feature_geometry(feat, 'POINT Z (7 7 0)'):
         feat.DumpReadable()
-        return 'fail'
+        pytest.fail()
 
 # OGRFeature(entities):17
 #   EntityHandle (String) = 1C9
@@ -1889,7 +1882,7 @@ def test_ogr_dxf_32():
     feat = lyr.GetNextFeature()
     if ogrtest.check_feature_geometry(feat, 'POINT Z (-2.0 4.0 -3.46410161513775)'):
         feat.DumpReadable()
-        return 'fail'
+        pytest.fail()
 
 # OGRFeature(entities):18
 #   EntityHandle (String) = 1CA
@@ -1897,7 +1890,7 @@ def test_ogr_dxf_32():
     feat = lyr.GetNextFeature()
     if ogrtest.check_feature_geometry(feat, 'LINESTRING Z (0 0 0,-0.5 1.0 -0.866025403784439)'):
         feat.DumpReadable()
-        return 'fail'
+        pytest.fail()
 
 # OGRFeature(entities):19
 #   EntityHandle (String) = 1CB
@@ -1905,7 +1898,7 @@ def test_ogr_dxf_32():
     feat = lyr.GetNextFeature()
     if ogrtest.check_feature_geometry(feat, 'LINESTRING Z (-0.5 1.0 -0.866025403784439,-1.0 1.0 -1.73205080756888,-0.5 2.0 -0.866025403784439,-0.5 1.0 -0.866025403784439)'):
         feat.DumpReadable()
-        return 'fail'
+        pytest.fail()
 
 # OGRFeature(entities):20
 #   EntityHandle (String) = 1CC
@@ -1913,7 +1906,7 @@ def test_ogr_dxf_32():
     feat = lyr.GetNextFeature()
     if ogrtest.check_feature_geometry(feat, 'LINESTRING Z (-0.5 1.0 -0.866025403784439,-0.5 2.0 -0.866025403784439,-1.0 2.0 -1.73205080756888,-0.5 1.0 -0.866025403784439)'):
         feat.DumpReadable()
-        return 'fail'
+        pytest.fail()
 
 # OGRFeature(entities):21
 #   EntityHandle (String) = 1D1
@@ -1923,7 +1916,7 @@ def test_ogr_dxf_32():
     if ogrtest.check_feature_geometry(feat, 'LINESTRING Z (-2.0 6.0 -3.46410161513776,-2.06975647374412 5.99512810051965 -3.58492337181942,-2.13917310096006 5.98053613748314 -3.7051564970475,-2.20791169081776 5.95629520146761 -3.82421522712167,-2.275637355817 5.92252339187664 -3.94151951987674,-2.34202014332567 5.87938524157182 -4.0564978805898,-2.4067366430758 5.8270909152852 -4.16859014624505,-2.46947156278589 5.76589518571785 -4.27725021459168,-2.5299192642332 5.69609619231285 -4.38194870469918,-2.58778525229247 5.61803398874989 -4.48217553604801,-2.64278760968654 5.53208888623796 -4.57744241359059,-2.694658370459 5.4386796006773 -4.66728520667574,-2.74314482547739 5.33826121271772 -4.75126621024651,-2.78801075360672 5.23132295065132 -4.82897627729524,-2.82903757255504 5.11838580694149 -4.90003681218666,-2.86602540378444 5.0 -4.96410161513776,-2.89879404629917 4.87674229357815 -5.02085856886833,-2.92718385456679 4.74921318683182 -5.07003115920498,-2.95105651629515 4.61803398874989 -5.11137982223042,-2.970295726276 4.48384379119934 -5.14470311141473,-2.98480775301221 4.34729635533386 -5.16983867904264,-2.99452189536827 4.20905692653531 -5.1866640671553,-2.99939082701909 4.069798993405 -5.19509730415311,-2.99939082701909 3.930201006595 -5.19509730415311,-2.99452189536827 3.79094307346469 -5.1866640671553,-2.98480775301221 3.65270364466614 -5.16983867904264,-2.970295726276 3.51615620880066 -5.14470311141473,-2.95105651629515 3.38196601125011 -5.11137982223042,-2.92718385456679 3.25078681316818 -5.07003115920498,-2.89879404629917 3.12325770642185 -5.02085856886833,-2.86602540378444 3.0 -4.96410161513776,-2.82903757255504 2.88161419305851 -4.90003681218666,-2.78801075360672 2.76867704934868 -4.82897627729524,-2.74314482547739 2.66173878728228 -4.75126621024651,-2.694658370459 2.5613203993227 -4.66728520667574,-2.64278760968654 2.46791111376204 -4.5774424135906,-2.58778525229247 2.38196601125011 -4.48217553604801,-2.5299192642332 2.30390380768715 -4.38194870469918,-2.46947156278589 2.23410481428215 -4.27725021459168,-2.4067366430758 2.1729090847148 -4.16859014624505,-2.34202014332567 2.12061475842818 -4.0564978805898,-2.275637355817 2.07747660812336 -3.94151951987674,-2.20791169081776 2.04370479853239 -3.82421522712167,-2.13917310096006 2.01946386251686 -3.7051564970475,-2.06975647374412 2.00487189948035 -3.58492337181943,-2.0 2.0 -3.46410161513776,-1.93024352625587 2.00487189948035 -3.34327985845609,-1.86082689903993 2.01946386251686 -3.22304673322801,-1.79208830918224 2.04370479853239 -3.10398800315384,-1.724362644183 2.07747660812336 -2.98668371039877,' +
                                       '-1.65797985667433 2.12061475842818 -2.87170534968571,-1.5932633569242 2.1729090847148 -2.75961308403046,-1.53052843721411 2.23410481428215 -2.65095301568383,-1.47008073576679 2.30390380768715 -2.54625452557633,-1.41221474770753 2.38196601125011 -2.4460276942275,-1.35721239031346 2.46791111376204 -2.35076081668492,-1.305341629541 2.5613203993227 -2.26091802359977,-1.25685517452261 2.66173878728228 -2.176937020029,-1.21198924639328 2.76867704934868 -2.09922695298027,-1.17096242744496 2.88161419305851 -2.02816641808885,-1.13397459621556 3.0 -1.96410161513776,-1.10120595370083 3.12325770642184 -1.90734466140718,-1.07281614543321 3.25078681316818 -1.85817207107053,-1.04894348370485 3.38196601125011 -1.81682340804509,-1.029704273724 3.51615620880066 -1.78350011886079,-1.01519224698779 3.65270364466614 -1.75836455123287,-1.00547810463173 3.79094307346469 -1.74153916312021,-1.0006091729809 3.930201006595 -1.7331059261224,-1.0006091729809 4.069798993405 -1.7331059261224,-1.00547810463173 4.20905692653531 -1.74153916312021,-1.01519224698779 4.34729635533386 -1.75836455123287,-1.029704273724 4.48384379119933 -1.78350011886078,-1.04894348370485 4.61803398874989 -1.81682340804509,-1.07281614543321 4.74921318683182 -1.85817207107053,-1.10120595370083 4.87674229357815 -1.90734466140718,-1.13397459621556 5.0 -1.96410161513776,-1.17096242744496 5.11838580694149 -2.02816641808885,-1.21198924639328 5.23132295065132 -2.09922695298027,-1.25685517452261 5.33826121271772 -2.176937020029,-1.305341629541 5.4386796006773 -2.26091802359977,-1.35721239031346 5.53208888623796 -2.35076081668492,-1.41221474770753 5.61803398874989 -2.4460276942275,-1.47008073576679 5.69609619231285 -2.54625452557633,-1.53052843721411 5.76589518571785 -2.65095301568383,-1.5932633569242 5.8270909152852 -2.75961308403046,-1.65797985667433 5.87938524157182 -2.87170534968571,-1.724362644183 5.92252339187664 -2.98668371039877,-1.79208830918224 5.95629520146761 -3.10398800315384,-1.86082689903993 5.98053613748314 -3.22304673322801,-1.93024352625587 5.99512810051965 -3.34327985845609,-2.0 6.0 -3.46410161513775)'):
         feat.DumpReadable()
-        return 'fail'
+        pytest.fail()
 
 # OGRFeature(entities):22
 #   EntityHandle (String) = 1D2
@@ -1931,7 +1924,7 @@ def test_ogr_dxf_32():
     feat = lyr.GetNextFeature()
     if ogrtest.check_feature_geometry(feat, 'LINESTRING Z (-1.0 4.0 -1.73205080756888,-2.0 4.0 -3.46410161513775)'):
         feat.DumpReadable()
-        return 'fail'
+        pytest.fail()
 
 # OGRFeature(entities):23
 #   EntityHandle (String) = 1D3
@@ -1939,7 +1932,7 @@ def test_ogr_dxf_32():
     feat = lyr.GetNextFeature()
     if ogrtest.check_feature_geometry(feat, 'LINESTRING Z (-2.0 4.0 -3.46410161513775,-3.0 4.0 -5.19615242270663)'):
         feat.DumpReadable()
-        return 'fail'
+        pytest.fail()
 
 # OGRFeature(entities):24
 #   EntityHandle (String) = 1D4
@@ -1947,7 +1940,7 @@ def test_ogr_dxf_32():
     feat = lyr.GetNextFeature()
     if ogrtest.check_feature_geometry(feat, 'LINESTRING Z (-2.0 3.0 -3.46410161513775,-2.0 4.0 -3.46410161513775)'):
         feat.DumpReadable()
-        return 'fail'
+        pytest.fail()
 
 # OGRFeature(entities):25
 #   EntityHandle (String) = 1D5
@@ -1955,7 +1948,7 @@ def test_ogr_dxf_32():
     feat = lyr.GetNextFeature()
     if ogrtest.check_feature_geometry(feat, 'LINESTRING Z (-2.0 4.0 -3.46410161513775,-2.0 5.0 -3.46410161513775)'):
         feat.DumpReadable()
-        return 'fail'
+        pytest.fail()
 
 # OGRFeature(entities):26
 #   EntityHandle (String) = 1D6
@@ -1965,7 +1958,7 @@ def test_ogr_dxf_32():
     if ogrtest.check_feature_geometry(feat, 'LINESTRING Z (-1.0 4.0 -1.73205080756888,-1.00243594974018 4.06975647374412 -1.73626999628355,-1.00973193125843 4.13917310096007 -1.74890700696425,-1.02185239926619 4.20791169081776 -1.76990027336521,-1.03873830406168 4.275637355817 -1.79914751840276,-1.06030737921409 4.34202014332567 -1.83650625243901,-1.0864545423574 4.4067366430758 -1.88179446747701,-1.11705240714107 4.46947156278589 -1.93479152388545,-1.15195190384357 4.52991926423321 -1.99523922533277,-1.19098300562505 4.58778525229247 -2.06284307669368,-1.23395555688102 4.64278760968654 -2.13727371879988,-1.28066019966135 4.694658370459 -2.21816853304476,-1.33086939364114 4.74314482547739 -2.30513340802484,-1.38433852467434 4.78801075360672 -2.3977446596109,-1.44080709652925 4.82903757255504 -2.49555109509446,-1.5 4.86602540378444 -2.59807621135332,-1.56162885321092 4.89879404629917 -2.70482051632684,-1.62539340658409 4.92718385456679 -2.8152639624911,-1.69098300562505 4.95105651629515 -2.92886848047812,-1.75807810440033 4.970295726276 -3.04508060049576,-1.82635182233307 4.98480775301221 -3.16333414877688,-1.89547153673235 4.99452189536827 -3.28305300592108,-1.9651005032975 4.99939082701909 -3.40365391369044,-2.0348994967025 4.99939082701909 -3.52454931658507,-2.10452846326765 4.99452189536827 -3.64515022435443,-2.17364817766693 4.98480775301221 -3.76486908149863,-2.24192189559967 4.970295726276 -3.88312262977975,-2.30901699437495 4.95105651629515 -3.99933474979739,-2.37460659341591 4.92718385456679 -4.11293926778441,-2.43837114678908 4.89879404629917 -4.22338271394867,-2.5 4.86602540378444 -4.33012701892219,-2.55919290347075 4.82903757255504 -4.43265213518105,-2.61566147532566 4.78801075360672 -4.53045857066461,-2.66913060635886 4.74314482547739 -4.62306982225067,-2.71933980033865 4.694658370459 -4.71003469723075,-2.76604444311898 4.64278760968654 -4.79092951147563,-2.80901699437495 4.58778525229247 -4.86536015358183,-2.84804809615642 4.5299192642332 -4.93296400494274,-2.88294759285893 4.46947156278589 -4.99341170639005,-2.9135454576426 4.4067366430758 -5.0464087627985,-2.93969262078591 4.34202014332567 -5.0916969778365,-2.96126169593832 4.275637355817 -5.12905571187275,-2.9781476007338 4.20791169081776 -5.1583029569103,-2.99026806874157 4.13917310096007 -5.17929622331126,-2.99756405025982 4.06975647374412 -5.19193323399196,-3.0 4.0 -5.19615242270663,-2.99756405025982 3.93024352625587 -5.19193323399196,-2.99026806874157 3.86082689903993 -5.17929622331126,-2.9781476007338 3.79208830918224 -5.1583029569103,-2.96126169593832 3.724362644183 -5.12905571187275,' +
                                       '-2.93969262078591 3.65797985667433 -5.0916969778365,-2.9135454576426 3.5932633569242 -5.0464087627985,-2.88294759285893 3.53052843721411 -4.99341170639005,-2.84804809615642 3.4700807357668 -4.93296400494274,-2.80901699437495 3.41221474770753 -4.86536015358183,-2.76604444311898 3.35721239031346 -4.79092951147563,-2.71933980033865 3.305341629541 -4.71003469723075,-2.66913060635886 3.25685517452261 -4.62306982225067,-2.61566147532566 3.21198924639328 -4.53045857066461,-2.55919290347075 3.17096242744496 -4.43265213518105,-2.5 3.13397459621556 -4.33012701892219,-2.43837114678908 3.10120595370083 -4.22338271394867,-2.37460659341591 3.07281614543321 -4.11293926778441,-2.30901699437495 3.04894348370485 -3.99933474979739,-2.24192189559967 3.029704273724 -3.88312262977975,-2.17364817766693 3.01519224698779 -3.76486908149863,-2.10452846326765 3.00547810463173 -3.64515022435443,-2.0348994967025 3.0006091729809 -3.52454931658507,-1.9651005032975 3.0006091729809 -3.40365391369044,-1.89547153673235 3.00547810463173 -3.28305300592108,-1.82635182233307 3.01519224698779 -3.16333414877688,-1.75807810440033 3.029704273724 -3.04508060049576,-1.69098300562505 3.04894348370485 -2.92886848047812,-1.62539340658409 3.07281614543321 -2.8152639624911,-1.56162885321092 3.10120595370083 -2.70482051632684,-1.5 3.13397459621556 -2.59807621135332,-1.44080709652925 3.17096242744496 -2.49555109509446,-1.38433852467434 3.21198924639328 -2.3977446596109,-1.33086939364114 3.25685517452261 -2.30513340802484,-1.28066019966135 3.305341629541 -2.21816853304476,-1.23395555688102 3.35721239031346 -2.13727371879988,-1.19098300562505 3.41221474770753 -2.06284307669368,-1.15195190384357 3.4700807357668 -1.99523922533277,-1.11705240714107 3.53052843721411 -1.93479152388545,-1.0864545423574 3.5932633569242 -1.88179446747701,-1.06030737921409 3.65797985667433 -1.83650625243901,-1.03873830406168 3.724362644183 -1.79914751840276,-1.02185239926619 3.79208830918224 -1.76990027336521,-1.00973193125843 3.86082689903993 -1.74890700696425,-1.00243594974018 3.93024352625587 -1.73626999628355,-1.0 4.0 -1.73205080756888)'):
         feat.DumpReadable()
-        return 'fail'
+        pytest.fail()
 
 # OGRFeature(entities):27
 #   EntityHandle (String) = 1D7
@@ -1973,7 +1966,7 @@ def test_ogr_dxf_32():
     feat = lyr.GetNextFeature()
     if ogrtest.check_feature_geometry(feat, 'LINESTRING Z (-1.0 2.0 -1.73205080756888,-0.983288972510522 2.03582232791524 -1.70310645891042,-0.967858303543227 2.07387296203834 -1.67637975626429,-0.953782068732337 2.11396923855472 -1.65199900239256,-0.941127841688774 2.15591867344963 -1.6300812382226,-0.929956369609942 2.19951988653655 -1.61073168098672,-0.92032128166002 2.24456356819194 -1.59404321912206,-0.912268831520699 2.29083348415575 -1.58009596635534,-0.905837675348257 2.33810751357387 -1.56895687711326,-0.901058686202915 2.38615871529951 -1.56067942510471,-0.89795480584129 2.43475641733454 -1.55530334661776,-0.896540934583439 2.48366732418105 -1.5528544497638,-0.896823859783196 2.53265663678705 -1.55334449058452,-0.898802223245158 2.58148917971011 -1.55677111661648,-0.902466527744776 2.62993053008786 -1.56311787818422,-0.907799182620207 2.67774814299567 -1.5723543073677,-0.9147745882171 2.72471246778926 -1.58443606426492,-0.923359258780906 2.7705980500731 -1.59930514984767,-0.933511983206783 2.81518461400453 -1.61689018438853,-0.945184022875394 2.85825811973811 -1.63710675012253,-0.958319345624882 2.89961179093367 -1.65985779649846,-0.972854894735838 2.93904710739563 -1.68503410607454,-0.988720891637972 2.97637475807832 -1.71251481882177,-1.00584117088534 3.01141554988232 -1.74216801231798,-1.02413354579207 3.04400126787917 -1.77385133504753,-1.04351020297329 3.07397548283483 -1.80741268976625,-1.06387812389736 3.10119430215541 -1.84269096365129,-1.08513953142555 3.12552706065018 -1.87951680173053,-1.1071923591957 3.14685694779575 -1.917713419879,-1.12993074159648 3.16508156849045 -1.95709745347909,-1.15324552198012 3.18011343460661 -1.99747983767086,-1.17702477667387 3.1918803849814 -2.03866671496655,-1.20115435227475 3.20032593182975 -2.08046036587236,-1.22551841364822 3.2054095319166 -2.12266015804993,-1.25 3.20710678118655 -2.1650635094611,-1.27448158635178 3.2054095319166 -2.20746686087227,-1.29884564772525 3.20032593182975 -2.24966665304983,-1.32297522332613 3.1918803849814 -2.29146030395564,-1.34675447801988 3.18011343460661 -2.33264718125133,-1.37006925840352 3.16508156849045 -2.3730295654431,-1.3928076408043 3.14685694779575 -2.41241359904319,-1.41486046857445 3.12552706065018 -2.45061021719166,-1.43612187610264 3.10119430215541 -2.48743605527091,-1.45648979702671 3.07397548283483 -2.52271432915594,-1.47586645420793 3.04400126787917 -2.55627568387467,-1.49415882911466 3.01141554988232 -2.58795900660421,-1.51127910836203 2.97637475807832 -2.61761220010042,-1.52714510526416 2.93904710739563 -2.64509291284765,-1.54168065437512 2.89961179093367 -2.67026922242374,-1.55481597712461 2.85825811973811 -2.69302026879967,-1.56648801679322 2.81518461400453 -2.71323683453366,-1.57664074121909 2.7705980500731 -2.73082186907453,-1.5852254117829 2.72471246778926 -2.74569095465728,-1.59220081737979 2.67774814299567 -2.7577727115545,-1.59753347225522 2.62993053008785 -2.76700914073797,-1.60119777675484 2.58148917971011 -2.77335590230571,-1.6031761402168 2.53265663678705 -2.77678252833767,-1.60345906541656 2.48366732418105 -2.77727256915839,-1.60204519415871 2.43475641733454 -2.77482367230443,-1.59894131379708 2.38615871529951 -2.76944759381748,-1.59416232465174 2.33810751357387 -2.76117014180893,-1.5877311684793 2.29083348415575 -2.75003105256685,-1.57967871833998 2.24456356819194 -2.73608379980013,-1.57004363039006 2.19951988653655 -2.71939533793547,-1.55887215831123 2.15591867344963 -2.7000457806996,-1.54621793126766 2.11396923855472 -2.67812801652963,-1.53214169645677 2.07387296203834 -2.6537472626579,-1.51671102748948 2.03582232791524 -2.62702056001177,-1.5 2.0 -2.59807621135332)'):
         feat.DumpReadable()
-        return 'fail'
+        pytest.fail()
 
 # OGRFeature(entities):28
 #   EntityHandle (String) = 1D8
@@ -1981,7 +1974,7 @@ def test_ogr_dxf_32():
     feat = lyr.GetNextFeature()
     if ogrtest.check_feature_geometry(feat, 'POLYGON Z ((-0.5 2.0 -0.866025403784439,-0.5 3.0 -0.866025403784439,-1.0 3.0 -1.73205080756888,-1.0 2.0 -1.73205080756888,-0.5 2.0 -0.866025403784439))'):
         feat.DumpReadable()
-        return 'fail'
+        pytest.fail()
 
 # OGRFeature(entities):29
 #   EntityHandle (String) = 1D9
@@ -1989,7 +1982,7 @@ def test_ogr_dxf_32():
     feat = lyr.GetNextFeature()
     if ogrtest.check_feature_geometry(feat, 'POLYGON ((-1.5 4.0 -2.59807621135332,-2.0 4.0 -3.46410161513776,-2.0 3.0 -3.46410161513776,-1.5 3.0 -2.59807621135332,-1.5 4.0 -2.59807621135332))'):
         feat.DumpReadable()
-        return 'fail'
+        pytest.fail()
 
 # OGRFeature(entities):30
 #   EntityHandle (String) = 1DB
@@ -1997,7 +1990,7 @@ def test_ogr_dxf_32():
     feat = lyr.GetNextFeature()
     if ogrtest.check_feature_geometry(feat, 'POLYGON Z ((-4.0 8.0 -6.92820323027551,-4.5 8.0 -7.79422863405995,-4.5 9.0 -7.79422863405995,-4.0 9.0 -6.92820323027551,-4.0 8.0 -6.92820323027551))'):
         feat.DumpReadable()
-        return 'fail'
+        pytest.fail()
 
 # OGRFeature(entities):31
 #   EntityHandle (String) = 1DC
@@ -2005,7 +1998,7 @@ def test_ogr_dxf_32():
     feat = lyr.GetNextFeature()
     if ogrtest.check_feature_geometry(feat, 'LINESTRING (-1.0 2.0,-1.07692307692308 2.15384615384615,-1.15384615384615 2.30769230769231,-1.23076923076923 2.46153846153846,-1.30769230769231 2.61538461538461,-1.38461538461538 2.76923076923077,-1.46153846153846 2.92307692307692,-1.53846153846154 3.07692307692308,-1.61538461538461 3.23076923076923,-1.69230769230769 3.38461538461538,-1.76923076923077 3.53846153846154,-1.84615384615384 3.69230769230769,-1.92307692307692 3.84615384615385,-2.0 4.0,-2.07692307692307 4.15384615384615,-2.15384615384615 4.30769230769231,-2.23076923076923 4.46153846153846,-2.30769230769231 4.61538461538462,-2.38461538461538 4.76923076923077,-2.46153846153846 4.92307692307692,-2.53846153846154 5.07692307692308,-2.61538461538461 5.23076923076923,-2.69230769230769 5.38461538461538,-2.76923076923077 5.53846153846154,-2.84615384615384 5.69230769230769,-2.92307692307692 5.84615384615385,-3.0 6.0,-3.07692307692308 6.15384615384615,-3.15384615384615 6.30769230769231,-3.23076923076923 6.46153846153846,-3.30769230769231 6.61538461538462,-3.38461538461538 6.76923076923077,-3.46153846153846 6.92307692307692,-3.53846153846154 7.07692307692308,-3.61538461538461 7.23076923076923,-3.69230769230769 7.38461538461539,-3.76923076923077 7.53846153846154,-3.84615384615384 7.69230769230769,-3.92307692307692 7.84615384615385,-4.0 8.0)'):
         feat.DumpReadable()
-        return 'fail'
+        pytest.fail()
 
 # OGRFeature(entities):32
 #   EntityHandle (String) = 1DD
@@ -2013,7 +2006,7 @@ def test_ogr_dxf_32():
     feat = lyr.GetNextFeature()
     if ogrtest.check_feature_geometry(feat, 'LINESTRING (-4.0 1.0,-3.81418685412768 0.987348067229724,-3.62887944840607 0.975707614760869,-3.44458352298589 0.966090122894857,-3.26180481801783 0.959507071933107,-3.08104907365262 0.956969942177043,-2.90282203004096 0.959490213928084,-2.72762942733357 0.968079367487651,-2.55597700568115 0.983748883157167,-2.38837050523441 1.00751024123805,-2.22531566614407 1.04037492203173,-2.06731822856083 1.08335440583961,-1.91488393263541 1.13746017296313,-1.76851851851852 1.2037037037037,-1.62872772636086 1.28309647836275,-1.49601729631315 1.37664997724169,-1.3708929685261 1.48537568064195,-1.25386048315042 1.61028506886495,-1.14542558033682 1.75238962221211,-1.04609400023601 1.91270082098484,-0.956350410492422 2.09218800047202,-0.876194811106054 2.29085116067364,-0.805142534432475 2.50772096630085,-0.742687840320977 2.74178593705221,-0.688324988620847 2.99203459262631,-0.641548239181376 3.25745545272172,-0.601851851851852 3.53703703703703,-0.568730086481566 3.82976786527082,-0.541677202919806 4.13463645712166,-0.520187461015863 4.45063133228814,-0.503755120619026 4.77674101046882,-0.491874441578583 5.11195401136229,-0.484039683743826 5.45525885466714,-0.479745106964042 5.80564406008193,-0.478484971088521 6.16209814730525,-0.479753535966554 6.52360963603567,-0.483045061447428 6.88916704597178,-0.487853807380435 7.25775889681216,-0.493674033614862 7.62837370825537,-0.5 8.0)'):
         feat.DumpReadable()
-        return 'fail'
+        pytest.fail()
 
 # OGRFeature(entities):33
 #   EntityHandle (String) = 1DE
@@ -2021,7 +2014,7 @@ def test_ogr_dxf_32():
     feat = lyr.GetNextFeature()
     if ogrtest.check_feature_geometry(feat, 'POINT Z (-3.5 7.0 -6.06217782649107)'):
         feat.DumpReadable()
-        return 'fail'
+        pytest.fail()
 
 # OGRFeature(entities):34
 #   EntityHandle (String) = 1DF
@@ -2029,7 +2022,7 @@ def test_ogr_dxf_32():
     feat = lyr.GetNextFeature()
     if ogrtest.check_feature_geometry(feat, 'POINT Z (1.0 -2.0 -5.19615242270663)'):
         feat.DumpReadable()
-        return 'fail'
+        pytest.fail()
 
 # OGRFeature(entities):35
 #   EntityHandle (String) = 1E0
@@ -2037,7 +2030,7 @@ def test_ogr_dxf_32():
     feat = lyr.GetNextFeature()
     if ogrtest.check_feature_geometry(feat, 'LINESTRING Z (0 0 0,0.25 -0.5 -1.29903810567666)'):
         feat.DumpReadable()
-        return 'fail'
+        pytest.fail()
 
 # OGRFeature(entities):36
 #   EntityHandle (String) = 1E1
@@ -2045,7 +2038,7 @@ def test_ogr_dxf_32():
     feat = lyr.GetNextFeature()
     if ogrtest.check_feature_geometry(feat, 'LINESTRING Z (0.25 -0.5 -1.29903810567666,-0.25 -0.5 -2.1650635094611,1.0 -1.0 -1.73205080756888,0.25 -0.5 -1.29903810567666)'):
         feat.DumpReadable()
-        return 'fail'
+        pytest.fail()
 
 # OGRFeature(entities):37
 #   EntityHandle (String) = 1E2
@@ -2053,7 +2046,7 @@ def test_ogr_dxf_32():
     feat = lyr.GetNextFeature()
     if ogrtest.check_feature_geometry(feat, 'LINESTRING Z (0.25 -0.5 -1.29903810567666,1 -1 -1.73205080756888,0.5 -1.0 -2.59807621135332,0.25 -0.5 -1.29903810567666)'):
         feat.DumpReadable()
-        return 'fail'
+        pytest.fail()
 
 # OGRFeature(entities):38
 #   EntityHandle (String) = 1E7
@@ -2063,7 +2056,7 @@ def test_ogr_dxf_32():
     if ogrtest.check_feature_geometry(feat, 'LINESTRING Z (2.78885438199983 -2.89442719099992 -5.19615242270663,2.76889880091653 -2.9234444547489 -5.33123525325721,2.74032532268425 -2.94796278993866 -5.46565997383582,2.70327315441675 -2.96786274570473 -5.59877168071614,2.65792281055334 -2.98304737146295 -5.72992186704258,2.60449523341074 -2.99344268924297 -5.85847158229053,2.54325071677425 -2.99899805410152 -5.98379454516908,2.47448763777266 -2.99968640085941 -6.1052801948005,2.39854100321483 -2.99550437596044 -6.22233666531148,2.31578081747018 -2.98647235380955 -6.33439366934417,2.22661027984464 -2.97263433751074 -6.44090527643885,2.13146382023413 -2.95405774448845 -6.54135257275227,2.03080498262578 -2.93083307803656 -6.63524618915372,1.92512416675824 -2.90307348639549 -6.72212868538223,1.81493623894341 -2.87091421150532 -6.80157677864958,1.70077802368955 -2.8345119301207 -6.87320340583148,1.58320568834623 -2.79404399049737 -6.93665960920016,1.46279203351292 -2.74970754836936 -6.99163623651142,1.34012370241203 -2.70171860642604 -7.03786544716322,1.21579832282211 -2.65031096196872 -7.07512201708822,1.09042159549536 -2.59573506787371 -7.10322443602275,0.964604343244512 -2.5382568124111 -7.12203579180661,0.838959535075416 -2.47815622386382 -7.13146443740534,0.714099299863701 -2.41572610625796 -7.13146443740534,0.590631944124412 -2.35127061285105 -7.12203579180661,0.469158988403815 -2.28510376432794 -7.10322443602275,0.350272236731764 -2.21754791892355 -7.07512201708822,0.234550893411949 -2.148932201926 -7.03786544716322,0.122558741196756 -2.07959090221128 -6.99163623651142,0.014841394594365 -2.00986184362144 -6.93665960920016,-0.088076358310285 -1.94008473912078 -6.87320340583148,-0.185693112570302 -1.87059953574847 -6.80157677864958,-0.277533289171331 -1.8017447584307 -6.72212868538223,-0.363149452004714 -1.73385586072131 -6.63524618915372,-0.442124487731234 -1.66726359050577 -6.54135257275227,-0.514073637915374 -1.60229237863074 -6.44090527643885,-0.57864637352974 -1.53925875830959 -6.33439366934417,-0.635528102697248 -1.47846982300441 -6.22233666531148,-0.684441703351125 -1.42022173029752 -6.1052801948005,-0.725148873345763 -1.36479825904151 -5.98379454516908,-0.757451291440819 -1.31246942681719 -5.85847158229053,-0.781191583502361 -1.2634901744351 -5.72992186704258,-0.796254089213832 -1.21809912388944 -5.59877168071614,-0.802565425561482 -1.1765174158158 -5.46565997383582,-0.80009484434904 -1.13894763211612 -5.33123525325721,-0.788854381999831 -1.10557280900008 -5.19615242270663,-0.768898800916532 -1.0765555452511 -5.06106959215606,-0.740325322684253 -1.05203721006134 -4.92664487157745,-0.703273154416746 -1.03213725429527 -4.79353316469713,-0.65792281055334 -1.01695262853705 -4.66238297837069,-0.604495233410736 -1.00655731075703 -4.53383326312274,-0.543250716774252 -1.00100194589848 -4.40851030024419,-0.474487637772662 -1.00031359914059 -4.28702465061277,-0.398541003214825 -1.00449562403956 -4.16996818010179,-0.315780817470174 -1.01352764619045 -4.0579111760691,' +
                                       '-0.226610279844633 -1.02736566248926 -3.95139956897441,-0.131463820234124 -1.04594225551155 -3.85095227266099,-0.03080498262578 -1.06916692196344 -3.75705865625955,0.074875833241763 -1.09692651360451 -3.67017616003104,0.185063761056595 -1.12908578849468 -3.59072806676368,0.299221976310455 -1.1654880698793 -3.51910143958179,0.416794311653771 -1.20595600950263 -3.45564523621311,0.537207966487078 -1.25029245163064 -3.40066860890185,0.659876297587969 -1.29828139357396 -3.35443939825005,0.784201677177895 -1.34968903803128 -3.31718282832505,0.909578404504639 -1.40426493212629 -3.28908040939052,1.03539565675549 -1.4617431875889 -3.27026905360665,1.16104046492459 -1.52184377613619 -3.26084040800793,1.2859007001363 -1.58427389374204 -3.26084040800793,1.40936805587559 -1.64872938714895 -3.27026905360665,1.53084101159619 -1.71489623567206 -3.28908040939052,1.64972776326824 -1.78245208107646 -3.31718282832505,1.76544910658805 -1.851067798074 -3.35443939825005,1.87744125880325 -1.92040909778872 -3.40066860890185,1.98515860540564 -1.99013815637856 -3.45564523621311,2.08807635831029 -2.05991526087922 -3.51910143958179,2.1856931125703 -2.12940046425153 -3.59072806676368,2.27753328917133 -2.1982552415693 -3.67017616003104,2.36314945200472 -2.26614413927869 -3.75705865625955,2.44212448773124 -2.33273640949423 -3.85095227266099,2.51407363791538 -2.39770762136926 -3.95139956897441,2.57864637352974 -2.46074124169041 -4.0579111760691,2.63552810269725 -2.52153017699559 -4.16996818010179,2.68444170335113 -2.57977826970249 -4.28702465061277,2.72514887334576 -2.63520174095849 -4.40851030024419,2.75745129144082 -2.68753057318281 -4.53383326312274,2.78119158350236 -2.7365098255649 -4.66238297837069,2.79625408921383 -2.78190087611056 -4.79353316469713,2.80256542556148 -2.82348258418421 -4.92664487157744,2.80009484434904 -2.86105236788389 -5.06106959215606,2.78885438199983 -2.89442719099992 -5.19615242270663)'):
         feat.DumpReadable()
-        return 'fail'
+        pytest.fail()
 
 # OGRFeature(entities):39
 #   EntityHandle (String) = 1E8
@@ -2071,7 +2064,7 @@ def test_ogr_dxf_32():
     feat = lyr.GetNextFeature()
     if ogrtest.check_feature_geometry(feat, 'LINESTRING Z (2.0 -2.0 -3.46410161513775,1.0 -2.0 -5.19615242270663)'):
         feat.DumpReadable()
-        return 'fail'
+        pytest.fail()
 
 # OGRFeature(entities):40
 #   EntityHandle (String) = 1E9
@@ -2079,7 +2072,7 @@ def test_ogr_dxf_32():
     feat = lyr.GetNextFeature()
     if ogrtest.check_feature_geometry(feat, 'LINESTRING Z (1.0 -2.0 -5.19615242270663,0.0 -2.0 -6.92820323027551)'):
         feat.DumpReadable()
-        return 'fail'
+        pytest.fail()
 
 # OGRFeature(entities):41
 #   EntityHandle (String) = 1EA
@@ -2087,7 +2080,7 @@ def test_ogr_dxf_32():
     feat = lyr.GetNextFeature()
     if ogrtest.check_feature_geometry(feat, 'LINESTRING Z (0.25 -1.5 -4.76313972081441,1.0 -2.0 -5.19615242270663)'):
         feat.DumpReadable()
-        return 'fail'
+        pytest.fail()
 
 # OGRFeature(entities):42
 #   EntityHandle (String) = 1EB
@@ -2095,7 +2088,7 @@ def test_ogr_dxf_32():
     feat = lyr.GetNextFeature()
     if ogrtest.check_feature_geometry(feat, 'LINESTRING Z (1.0 -2.0 -5.19615242270663,1.75 -2.5 -5.62916512459885)'):
         feat.DumpReadable()
-        return 'fail'
+        pytest.fail()
 
 # OGRFeature(entities):43
 #   EntityHandle (String) = 1EC
@@ -2105,7 +2098,7 @@ def test_ogr_dxf_32():
     if ogrtest.check_feature_geometry(feat, 'LINESTRING Z (2.0 -2.0 -3.46410161513775,2.04988140556792 -2.03487823687206 -3.49852624302284,2.09464789446162 -2.06958655048003 -3.54122153501056,2.13408136884713 -2.10395584540888 -3.59197948393006,2.16798971280107 -2.1378186779085 -3.65055280215638,2.19620772828016 -2.17101007166283 -3.7166561263709,2.21859793994945 -2.2033683215379 -3.78996740782271,2.23505126494835 -2.23473578139294 -3.87012948131781,2.24548754433133 -2.2649596321166 -3.956751805292,2.2498559335943 -2.29389262614624 -4.04941236449012,2.24813515038388 -2.32139380484327 -4.14765972598196,2.2403335781829 -2.3473291852295 -4.25101523849813,2.2264892254669 -2.3715724127387 -4.35897536437091,2.2066695405307 -2.39400537680336 -4.47101413271915,2.18097108288703 -2.41451878627752 -4.58658570192556,2.14951905283833 -2.43301270189222 -4.70512701892219,2.11246668151345 -2.44939702314958 -4.82606056232836,2.069994484341 -2.46359192728339 -4.94879715607678,2.02230938159631 -2.47552825814758 -5.07273883982016,1.96964369030667 -2.485147863138 -5.19728178213388,1.91225399242609 -2.4924038765061 -5.32181922232198,1.85041988479386 -2.49726094768414 -5.44574442649435,1.78444261696682 -2.49969541350955 -5.56845364351315,1.71464362356182 -2.49969541350955 -5.68934904640778,1.64136295825855 -2.49726094768414 -5.80784164492769,1.56495763709223 -2.4924038765061 -5.92335415504372,1.48579989910733 -2.485147863138 -6.03532381141787,1.40427539284642 -2.47552825814758 -6.14320510913943,1.32078129750918 -2.46359192728339 -6.24647246137009,1.2357243879353 -2.44939702314958 -6.34462275995019,1.14951905283833 -2.43301270189222 -6.43717782649107,1.06258527594554 -2.41451878627752 -6.52368674201215,0.975346589879385 -2.39400537680336 -6.60372804377285,0.888228012749189 -2.3715724127387 -6.67691177859673,0.801653977505599 -2.3473291852295 -6.74288140268412,0.716046264145928 -2.32139380484327 -6.80131551865772,0.631821944844409 -2.29389262614623 -6.85192944137827,0.549391352018479 -2.2649596321166 -6.89447658490197,0.469156079230493 -2.23473578139294 -6.92874966382241,0.391507024664251 -2.2033683215379 -6.9545817031442,0.316822486708345 -2.17101007166283 -6.97184685176839,0.245466320924432 -2.1378186779085 -6.98046099562637,0.177786167379516 -2.10395584540888 -6.98038216747516,0.114111756978481 -2.06958655048003 -6.97161075135758,0.054753305048271 -2.03487823687206 -6.95418948073126,0.0 -2.0 -6.92820323027551,-0.049881405567917 -1.96512176312794 -6.89377860239042,-0.094647894461618 -1.93041344951997 -6.8510833104027,-0.134081368847123 -1.89604415459112 -6.8003253614832,-0.167989712801067 -1.8621813220915 -6.74175204325688,-0.196207728280158 -1.82898992833716 -6.67564871904237,-0.218597939949449 -1.7966316784621 -6.60233743759055,' +
                                       '-0.235051264948343 -1.76526421860705 -6.52217536409545,-0.245487544331328 -1.7350403678834 -6.43555304012126,-0.2498559335943 -1.70610737385376 -6.34289248092314,-0.248135150383881 -1.67860619515673 -6.2446451194313,-0.240333578182897 -1.6526708147705 -6.14128960691513,-0.226489225466902 -1.6284275872613 -6.03332948104236,-0.206669540530698 -1.60599462319664 -5.92129071269411,-0.180971082887026 -1.58548121372248 -5.8057191434877,-0.149519052838327 -1.56698729810778 -5.68717782649107,-0.112466681513451 -1.55060297685042 -5.5662442830849,-0.069994484341001 -1.5364080727166 -5.44350768933648,-0.022309381596311 -1.52447174185242 -5.3195660055931,0.030356309693336 -1.514852136862 -5.19502306327939,0.087746007573915 -1.50759612349389 -5.07048562309128,0.149580115206143 -1.50273905231586 -4.94656041891892,0.215557383033179 -1.50030458649045 -4.82385120190011,0.28535637643818 -1.50030458649045 -4.70295579900548,0.35863704174145 -1.50273905231586 -4.58446320048557,0.435042362907775 -1.50759612349389 -4.46895069036954,0.514200100892672 -1.514852136862 -4.35698103399539,0.595724607153583 -1.52447174185242 -4.24909973627383,0.679218702490823 -1.5364080727166 -4.14583238404317,0.764275612064703 -1.55060297685042 -4.04768208546307,0.850480947161672 -1.56698729810778 -3.95512701892219,0.937414724054466 -1.58548121372248 -3.86861810340111,1.02465341012062 -1.60599462319664 -3.78857680164041,1.11177198725081 -1.6284275872613 -3.71539306681653,1.1983460224944 -1.6526708147705 -3.64942344272914,1.28395373585407 -1.67860619515673 -3.59098932675554,1.36817805515559 -1.70610737385376 -3.54037540403499,1.45060864798152 -1.7350403678834 -3.49782826051129,1.53084392076951 -1.76526421860705 -3.46355518159085,1.60849297533575 -1.7966316784621 -3.43772314226906,1.68317751329166 -1.82898992833716 -3.42045799364487,1.75453367907557 -1.8621813220915 -3.41184384978689,1.82221383262049 -1.89604415459112 -3.4119226779381,1.88588824302152 -1.93041344951997 -3.42069409405568,1.94524669495173 -1.96512176312794 -3.438115364682,2.0 -2.0 -3.46410161513775)'):
         feat.DumpReadable()
-        return 'fail'
+        pytest.fail()
 
 # OGRFeature(entities):44
 #   EntityHandle (String) = 1ED
@@ -2113,7 +2106,7 @@ def test_ogr_dxf_32():
     feat = lyr.GetNextFeature()
     if ogrtest.check_feature_geometry(feat, 'LINESTRING Z (0.5 -1.0 -2.59807621135332,0.543577773425908 -1.01791116395762 -2.58464338569351,0.587546417985528 -1.03693648101917 -2.57439309093773,0.631694860183701 -1.05698461927736 -2.56737453409618,0.675811163398452 -1.07795933672482 -2.56362140807291,0.719683545292469 -1.09975994326827 -2.56315172992158,0.763101394483934 -1.12228178409597 -2.5659677543537,0.805856281596113 -1.14541674207787 -2.57205596291479,0.847742959832148 -1.16905375678694 -2.58138712888039,0.888560350271717 -1.19307935764976 -2.59391645756022,0.928112507159618 -1.21737820866727 -2.60958380133721,0.96620955855235 -1.24183366209053 -2.62831394840886,1.00266861780709 -1.26632831839353 -2.65001698384495,1.03731466153743 -1.29074458985506 -2.67458872122829,1.06998136982112 -1.31496526504393 -2.7019112028064,1.10051192462654 -1.33887407149783 -2.73185326575312,1.12875976262485 -1.36235623389463 -2.76427117182176,1.15458927877392 -1.38529902503655 -2.79900929736714,1.17787647729662 -1.40759230700227 -2.83590088042404,1.19850956692819 -1.42912905986906 -2.8747688212557,1.21638949757537 -1.44980589546683 -2.91542653252918,1.23143043581088 -1.46952355369781 -2.95767883503644,1.24356017692077 -1.48818737903916 -3.00132289466106,1.2527204915264 -1.50570777494116 -3.04614919609277,1.25886740511731 -1.52200063393958 -3.09194254861523,1.26197140915283 -1.53698774141742 -3.138483119139,1.2620176027192 -1.55059715107771 -3.18554748752036,1.25900576406208 -1.56276353032509 -3.23290971909991,1.25295035165112 -1.57342847389788 -3.28034244931235,1.24388043477135 -1.58254078424523 -3.32761797516041,1.23183955397484 -1.59005671730331 -3.37450934831362,1.21688551206218 -1.5959401924907 -3.42079146458413,1.19909009659756 -1.60016296591487 -3.46624214454969,1.17853873528923 -1.6027047659583 -3.51064320013621,1.15533008588991 -1.60355339059327 -3.55378148203954,1.12957556258567 -1.6027047659583 -3.59544990295855,1.10139880114707 -1.60016296591487 -3.63544843172717,1.07093506540992 -1.5959401924907 -3.67358505357321,1.03833059793508 -1.59005671730331 -3.70967669189409,1.00374191796432 -1.58254078424523 -3.74355008712442,0.967335070042516 -1.57342847389788 -3.77504262847653,0.929284826913179 -1.56276353032509 -3.80400313456104,0.889773850513921 -1.55059715107771 -3.83029257913998,0.848991815099414 -1.53698774141741 -3.85378475852869,0.807134496701444 -1.52200063393958 -3.87436689744237,0.764402833297081 -1.50570777494116 -3.891940190379,0.72100196019671 -1.48818737903916 -3.90642027593972,0.677140225282558 -1.46952355369781 -3.91773764180954,0.633028188825132 -1.44980589546683 -3.92583795845446,0.588877612678977 -1.42912905986906 -3.93068233993284,0.544900443710183 -1.40759230700227 -3.93224753056917,0.501307796335731 -1.38529902503655 -3.93052601659399,0.458308939059047 -1.36235623389463 -3.92552606221412,0.416110289866958 -1.33887407149783 -3.91727166993992,0.374914425310669 -1.31496526504393 -3.90580246536015,0.334919108027743 -1.29074458985506 -3.89117350691752,0.296316337373485 -1.26632831839353 -3.87345502159809,0.259291427719229 -1.24183366209053 -3.85273206780345,0.224022118842197 -1.21737820866727 -3.82910412702388,0.190677722677547 -1.19307935764975 -3.80268462627299,0.159418310528662 -1.16905375678694 -3.77360039357605,0.13039394463751 -1.14541674207787 -3.7419910491263,0.103743957803975 -1.12228178409597 -3.70800833503176,0.079596284512354 -1.09975994326827 -3.67181538687033,0.058066846776 -1.07795933672482 -3.63358595054991,0.039258997648375 -1.05698461927736 -3.59350354823325,0.023263025071983 -1.03693648101917 -3.55176059733134,0.010155718446952 -1.01791116395762 -3.50855748679486,0.0 -1.0 -3.46410161513776)'):
         feat.DumpReadable()
-        return 'fail'
+        pytest.fail()
 
 # OGRFeature(entities):45
 #   EntityHandle (String) = 1EE
@@ -2121,7 +2114,7 @@ def test_ogr_dxf_32():
     feat = lyr.GetNextFeature()
     if ogrtest.check_feature_geometry(feat, 'POLYGON Z ((1 -1 -1.73205080756888,1.75 -1.5 -2.1650635094611,1.25 -1.5 -3.03108891324553,0.5 -1.0 -2.59807621135332,1 -1 -1.73205080756888))'):
         feat.DumpReadable()
-        return 'fail'
+        pytest.fail()
 
 # OGRFeature(entities):46
 #   EntityHandle (String) = 1EF
@@ -2129,7 +2122,7 @@ def test_ogr_dxf_32():
     feat = lyr.GetNextFeature()
     if ogrtest.check_feature_geometry(feat, 'POLYGON Z ((1.5 -2.0 -4.33012701892219,1.0 -2.0 -5.19615242270663,0.25 -1.5 -4.76313972081441,0.75 -1.5 -3.89711431702997,1.5 -2.0 -4.33012701892219))'):
         feat.DumpReadable()
-        return 'fail'
+        pytest.fail()
 
 # OGRFeature(entities):47
 #   EntityHandle (String) = 1F1
@@ -2137,7 +2130,7 @@ def test_ogr_dxf_32():
     feat = lyr.GetNextFeature()
     if ogrtest.check_feature_geometry(feat, 'POLYGON Z ((2.0 -4.0 -10.3923048454133,1.5 -4.0 -11.2583302491977,2.25 -4.5 -11.6913429510899,2.75 -4.5 -10.8253175473055,2.0 -4.0 -10.3923048454133))'):
         feat.DumpReadable()
-        return 'fail'
+        pytest.fail()
 
 # OGRFeature(entities):48
 #   EntityHandle (String) = 1F2
@@ -2145,7 +2138,7 @@ def test_ogr_dxf_32():
     feat = lyr.GetNextFeature()
     if ogrtest.check_feature_geometry(feat, 'LINESTRING (0.5 -1.0,0.53846153846154 -1.07692307692308,0.576923076923078 -1.15384615384615,0.615384615384617 -1.23076923076923,0.653846153846155 -1.30769230769231,0.692307692307694 -1.38461538461538,0.730769230769232 -1.46153846153846,0.769230769230771 -1.53846153846154,0.807692307692309 -1.61538461538462,0.846153846153848 -1.69230769230769,0.884615384615386 -1.76923076923077,0.923076923076924 -1.84615384615385,0.961538461538463 -1.92307692307692,1.0 -2.0,1.03846153846154 -2.07692307692308,1.07692307692308 -2.15384615384615,1.11538461538462 -2.23076923076923,1.15384615384616 -2.30769230769231,1.19230769230769 -2.38461538461538,1.23076923076923 -2.46153846153846,1.26923076923077 -2.53846153846154,1.30769230769231 -2.61538461538461,1.34615384615385 -2.69230769230769,1.38461538461539 -2.76923076923077,1.42307692307693 -2.84615384615385,1.46153846153846 -2.92307692307692,1.5 -3.0,1.53846153846154 -3.07692307692308,1.57692307692308 -3.15384615384615,1.61538461538462 -3.23076923076923,1.65384615384616 -3.30769230769231,1.6923076923077 -3.38461538461539,1.73076923076923 -3.46153846153846,1.76923076923077 -3.53846153846154,1.80769230769231 -3.61538461538461,1.84615384615385 -3.69230769230769,1.88461538461539 -3.76923076923077,1.92307692307693 -3.84615384615385,1.96153846153847 -3.92307692307692,2.0 -4.0)'):
         feat.DumpReadable()
-        return 'fail'
+        pytest.fail()
 
 # OGRFeature(entities):49
 #   EntityHandle (String) = 1F3
@@ -2153,7 +2146,7 @@ def test_ogr_dxf_32():
     feat = lyr.GetNextFeature()
     if ogrtest.check_feature_geometry(feat, 'LINESTRING (-3.25 -0.5,-3.07367580370539 -0.493674033614862,-2.89709873733542 -0.487853807380434,-2.72001593081474 -0.483045061447428,-2.542174514068 -0.479753535966554,-2.36332161701984 -0.478484971088521,-2.1832043695949 -0.479745106964042,-2.00156990171783 -0.484039683743825,-1.81816534331327 -0.491874441578583,-1.63273782430587 -0.503755120619026,-1.44503447462027 -0.520187461015863,-1.25480242418112 -0.541677202919806,-1.06178880291306 -0.568730086481565,-0.865740740740739 -0.601851851851852,-0.666405367588798 -0.641548239181375,-0.463529813381883 -0.688324988620846,-0.256861208044639 -0.742687840320976,-0.04614668150171 -0.805142534432475,0.168866636322258 -0.876194811106053,0.388431615502622 -0.956350410492422,0.612790589861596 -1.04609400023601,0.841943559399181 -1.14542558033682,1.07564819029316 -1.25386048315042,1.31365161246818 -1.3708929685261,1.55570095584888 -1.49601729631315,1.80154335035992 -1.62872772636086,2.05092592592592 -1.76851851851852,2.30359581247155 -1.91488393263541,2.55930013992144 -2.06731822856083,2.81778603820024 -2.22531566614407,3.07880063723259 -2.38837050523441,3.34209106694314 -2.55597700568115,3.60740445725653 -2.72762942733357,3.87448793809741 -2.90282203004097,4.14308863939042 -3.08104907365262,4.4129536910602 -3.26180481801784,4.68383022303141 -3.44458352298589,4.95546536522868 -3.62887944840608,5.22760624757667 -3.81418685412768,5.5 -4.0)'):
         feat.DumpReadable()
-        return 'fail'
+        pytest.fail()
 
 # OGRFeature(entities):50
 #   EntityHandle (String) = 1F4
@@ -2161,7 +2154,7 @@ def test_ogr_dxf_32():
     feat = lyr.GetNextFeature()
     if ogrtest.check_feature_geometry(feat, 'POINT Z (1.75 -3.5 -9.09326673973661)'):
         feat.DumpReadable()
-        return 'fail'
+        pytest.fail()
 
 # OGRFeature(entities):51
 #   EntityHandle (String) = 1F5
@@ -2169,7 +2162,7 @@ def test_ogr_dxf_32():
     feat = lyr.GetNextFeature()
     if ogrtest.check_feature_geometry(feat, 'POINT Z (5.5 1.0 -0.866025403784439)'):
         feat.DumpReadable()
-        return 'fail'
+        pytest.fail()
 
 # OGRFeature(entities):52
 #   EntityHandle (String) = 1F6
@@ -2177,7 +2170,7 @@ def test_ogr_dxf_32():
     feat = lyr.GetNextFeature()
     if ogrtest.check_feature_geometry(feat, 'LINESTRING Z (0 0 0,1.375 0.25 -0.21650635094611)'):
         feat.DumpReadable()
-        return 'fail'
+        pytest.fail()
 
 # OGRFeature(entities):53
 #   EntityHandle (String) = 1F7
@@ -2185,7 +2178,7 @@ def test_ogr_dxf_32():
     feat = lyr.GetNextFeature()
     if ogrtest.check_feature_geometry(feat, 'LINESTRING Z (1.375 0.25 -0.21650635094611,2.0 1.0 -9.68245836551854e-17,2.125 -0.25 -0.649519052838329,1.375 0.25 -0.21650635094611)'):
         feat.DumpReadable()
-        return 'fail'
+        pytest.fail()
 
 # OGRFeature(entities):54
 #   EntityHandle (String) = 1F8
@@ -2193,7 +2186,7 @@ def test_ogr_dxf_32():
     feat = lyr.GetNextFeature()
     if ogrtest.check_feature_geometry(feat, 'LINESTRING Z (1.375 0.25 -0.21650635094611,2.125 -0.25 -0.649519052838329,2.75 0.5 -0.43301270189222,1.375 0.25 -0.21650635094611)'):
         feat.DumpReadable()
-        return 'fail'
+        pytest.fail()
 
 # OGRFeature(entities):55
 #   EntityHandle (String) = 1FD
@@ -2203,7 +2196,7 @@ def test_ogr_dxf_32():
     if ogrtest.check_feature_geometry(feat, 'LINESTRING Z (3.71114561800017 0.105572809000085 -0.866025403784439,3.77009625337411 -0.001434563330173 -0.933566819059727,3.83747480591229 -0.103563047131737 -1.00077917934903,3.91295301407961 -0.200315082697444 -1.06733503278919,3.99616315563294 -0.2912193038355 -1.13291012595241,4.08669983912687 -0.37583283431818 -1.19718498357639,4.18412197894014 -0.453743445530294 -1.25984646501566,4.28795494420042 -0.524571564805566 -1.32058928983137,4.39769287113821 -0.587972124666501 -1.37911752508686,4.51280112760429 -0.643636243958462 -1.43514602710321,4.6327189177438 -0.691292732687594 -1.48840183065055,4.75686201413727 -0.730709413231224 -1.53862547880726,4.88462560409789 -0.761694251483893 -1.58557228700798,5.01538723625813 -0.784096292428219 -1.62901353512224,5.14850985309022 -0.797806395572568 -1.66873758175591,5.28334489458639 -0.802757766672552 -1.70455089534686,5.41923545797803 -0.798926283145887 -1.7362789970312,5.55551949809999 -0.786330611595171 -1.76376731068683,5.691533052808 -0.76503211686609 -1.78688191601273,5.82661347773556 -0.735134563084044 -1.80551020097523,5.96010267463067 -0.69678360812577 -1.8195614104425,6.09135029754434 -0.650166093988798 -1.82896708833443,6.2197169212507 -0.595509136516029 -1.83368141113379,6.34457715646241 -0.533079018910172 -1.83368141113379,6.46532269666444 -0.463179894428748 -1.82896708833443,6.58136528172222 -0.386152304579996 -1.8195614104425,6.69213956382591 -0.302371520038872 -1.80551020097523,6.79710586180808 -0.212245712366048 -1.78688191601273,6.89575279041615 -0.116213965437088 -1.76376731068683,6.9875997517299 -0.014744136269953 -1.7362789970312,7.07219927658622 0.091669424327363 -1.70455089534686,7.14913920460393 0.202508280184287 -1.66873758175591,7.2180446921877 0.317232435536567 -1.62901353512224,7.27858003872839 0.435282965831356 -1.58557228700798,7.33045032210263 0.556084740751457 -1.53862547880726,7.37340283550381 0.679049226192411 -1.48840183065055,7.4072283186042 0.803577351541497 -1.43514602710321,7.43176197705028 0.929062428289537 -1.37911752508686,7.44688428532421 1.05489310575633 -1.32058928983137,7.45252156906016 1.18045634952971 -1.25984646501566,7.44864636397843 1.3051404281076 -1.19718498357639,7.43527754968864 1.42833789319235 -1.13291012595241,7.41248025771019 1.54944853911785 -1.06733503278919,7.38036555415802 1.66788232699113 -1.00077917934903,7.33908989863968 1.78306225930261 -0.933566819059728,7.28885438199984 1.89442719099992 -0.86602540378444,7.2299037466259 2.00143456333018 -0.798483988509152,7.16252519408772 2.10356304713174 -0.731271628219845,7.08704698592039 2.20031508269745 -0.664715774779688,' +
                                       '7.00383684436707 2.2912193038355 -0.599140681616468,6.91330016087314 2.37583283431818 -0.534865823992492,6.81587802105987 2.4537434455303 -0.472204342553219,6.71204505579959 2.52457156480557 -0.411461517737508,6.6023071288618 2.5879721246665 -0.352933282482017,6.48719887239572 2.64363624395846 -0.296904780465671,6.36728108225621 2.6912927326876 -0.24364897691833,6.24313798586274 2.73070941323123 -0.19342532876162,6.11537439590212 2.7616942514839 -0.146478520560899,5.98461276374187 2.78409629242822 -0.103037272446642,5.85149014690979 2.79780639557257 -0.0633132258129652,5.71665510541362 2.80275776667256 -0.0274999122220189,5.58076454202198 2.79892628314589 0.00422818946232298,5.44448050190002 2.78633061159517 0.0317165031179519,5.30846694719201 2.76503211686609 0.0548311084438533,5.17338652226444 2.73513456308405 0.0734593934063514,5.03989732536933 2.69678360812577 0.0875106028736174,4.90864970245567 2.6501660939888 0.0969162807655497,4.78028307874931 2.59550913651603 0.101630603564914,4.6554228435376 2.53307901891017 0.101630603564914,4.53467730333557 2.46317989442875 0.0969162807655497,4.41863471827779 2.38615230458 0.0875106028736175,4.3078604361741 2.30237152003888 0.0734593934063515,4.20289413819193 2.21224571236605 0.0548311084438534,4.10424720958385 2.11621396543709 0.031716503117952,4.01240024827011 2.01474413626996 0.00422818946232319,3.92780072341379 1.90833057567264 -0.0274999122220187,3.85086079539608 1.79749171981572 -0.0633132258129645,3.7819553078123 1.68276756446344 -0.103037272446642,3.72141996127162 1.56471703416865 -0.146478520560898,3.66954967789738 1.44391525924855 -0.19342532876162,3.6265971644962 1.32095077380759 -0.243648976918329,3.5927716813958 1.19642264845851 -0.296904780465671,3.56823802294973 1.07093757171047 -0.352933282482016,3.5531157146758 0.945106894243672 -0.411461517737508,3.54747843093985 0.819543650470287 -0.472204342553219,3.55135363602158 0.694859571892403 -0.534865823992493,3.56472245031136 0.571662106807651 -0.599140681616467,3.58751974228981 0.450551460882157 -0.664715774779687,3.61963444584198 0.332117673008871 -0.731271628219845,3.66091010136033 0.216937740697387 -0.798483988509152,3.71114561800017 0.105572809000085 -0.866025403784439)'):
         feat.DumpReadable()
-        return 'fail'
+        pytest.fail()
 
 # OGRFeature(entities):56
 #   EntityHandle (String) = 1FE
@@ -2211,7 +2204,7 @@ def test_ogr_dxf_32():
     feat = lyr.GetNextFeature()
     if ogrtest.check_feature_geometry(feat, 'LINESTRING Z (4.25 -0.5 -1.29903810567666,5.5 1.0 -0.866025403784439)'):
         feat.DumpReadable()
-        return 'fail'
+        pytest.fail()
 
 # OGRFeature(entities):57
 #   EntityHandle (String) = 1FF
@@ -2219,7 +2212,7 @@ def test_ogr_dxf_32():
     feat = lyr.GetNextFeature()
     if ogrtest.check_feature_geometry(feat, 'LINESTRING Z (5.5 1.0 -0.866025403784439,6.75 2.5 -0.43301270189222)'):
         feat.DumpReadable()
-        return 'fail'
+        pytest.fail()
 
 # OGRFeature(entities):58
 #   EntityHandle (String) = 200
@@ -2227,7 +2220,7 @@ def test_ogr_dxf_32():
     feat = lyr.GetNextFeature()
     if ogrtest.check_feature_geometry(feat, 'LINESTRING Z (4.75 1.5 -0.43301270189222,5.5 1.0 -0.866025403784439)'):
         feat.DumpReadable()
-        return 'fail'
+        pytest.fail()
 
 # OGRFeature(entities):59
 #   EntityHandle (String) = 201
@@ -2235,7 +2228,7 @@ def test_ogr_dxf_32():
     feat = lyr.GetNextFeature()
     if ogrtest.check_feature_geometry(feat, 'LINESTRING Z (5.5 1.0 -0.866025403784439,6.25 0.5 -1.29903810567666)'):
         feat.DumpReadable()
-        return 'fail'
+        pytest.fail()
 
 # OGRFeature(entities):60
 #   EntityHandle (String) = 202
@@ -2245,7 +2238,7 @@ def test_ogr_dxf_32():
     if ogrtest.check_feature_geometry(feat, 'LINESTRING Z (4.25 -0.5 -1.29903810567666,4.30536229248331 -0.531224312261799 -1.32818874766841,4.36654473979309 -0.554988653592388 -1.35508777630525,4.43324926719606 -0.571177246509588 -1.37960414222355,4.50515089693985 -0.579711221815978 -1.40161840415293,4.58189933151187 -0.580549002841697 -1.42102331082214,4.6631206602536 -0.573686508001801 -1.43772432347645,4.74841918101576 -0.559157170681335 -1.451640076461,4.83737932797937 -0.53703177635124 -1.46270277362604,4.92956769625067 -0.507418117708657 -1.47085851862302,5.02453515336618 -0.470460469521736 -1.47606757748212,5.12181902742094 -0.426338885737475 -1.47830457219218,5.22094536115948 -0.375268322276984 -1.47755860433986,5.32143122104797 -0.317497589791849 -1.47383330820552,5.42278705007785 -0.253308141483641 -1.46714683305749,5.52451905283833 -0.183012701892219 -1.45753175473055,5.62613160123803 -0.106953743333199 -1.44503491691981,5.7271296491552 -0.025501817407262 -1.42971720296291,5.82702114425268 0.060946250290002 -1.41165323922251,5.92531942520741 0.151969293462501 -1.39093103151418,6.02154559267549 0.247123856993501 -1.36765153635088,6.11523084244164 0.345946357414384 -1.34192816909299,6.2059187493862 0.4479553414367 -1.31388625140011,6.29316749114245 0.552653831544204 -1.28366240067645,6.37655200061077 0.659531747217344 -1.25140386448466,6.45566603684282 0.768068389994292 -1.21726780317044,6.53012416420658 0.877734980261504 -1.18142052419318,6.59956363019005 0.987997233414845 -1.1440366718927,6.66364613269498 1.09831796284048 -1.10529837663958,6.72205946821072 1.20815969703403 -1.06539436751435,6.77451905283833 1.31698729810778 -1.02451905283833,6.82076930875472 1.4242705689286 -0.982871573035841,6.86058490936212 1.52948683618513 -0.940654830442097,6.89377187705662 1.63212349679959 -0.898074500783399,6.92016852826756 1.73168051527848 -0.855338031145687,6.93964626116363 1.8276728598352 -0.81265362931318,6.95211018218804 1.91963286541618 -0.770229249400985,6.95749956837044 2.00711251211804 -0.72827157872355,6.95578816316308 2.08968560789544 -0.686985030834846,6.9469843043601 2.166949864926 -0.646570749646076,6.93113088347664 2.23852885951603 -0.607225629472764,6.90830513678565 2.30407386599898 -0.569141355785437,6.87861826903058 2.36326555569183 -0.53250347133728,6.84221491164701 2.41581555263232 -0.497490472218499,6.79927241813288 2.46146783851767 -0.464272938241304,6.75 2.5 -0.43301270189222,6.69463770751669 2.5312243122618 -0.40386205990047,' +
                                       '6.63345526020692 2.55498865359239 -0.376963031263626,6.56675073280394 2.57117724650959 -0.352446665345325,6.49484910306015 2.57971122181598 -0.330432403415945,6.41810066848813 2.5805490028417 -0.311027496746741,6.3368793397464 2.5736865080018 -0.294326484092429,6.25158081898424 2.55915717068134 -0.280410731107883,6.16262067202063 2.53703177635124 -0.269348033942836,6.07043230374933 2.50741811770866 -0.261192288945857,5.97546484663382 2.47046046952174 -0.255983230086761,5.87818097257907 2.42633888573748 -0.253746235376694,5.77905463884053 2.37526832227698 -0.254492203229023,5.67856877895203 2.31749758979185 -0.258217499363356,5.57721294992215 2.25330814148364 -0.264903974511391,5.47548094716167 2.18301270189222 -0.27451905283833,5.37386839876197 2.1069537433332 -0.287015890649068,5.2728703508448 2.02550181740726 -0.302333604605968,5.17297885574732 1.93905374971 -0.320397568346365,5.07468057479259 1.8480307065375 -0.341119776054697,4.97845440732451 1.7528761430065 -0.364399271218,4.88476915755836 1.65405364258562 -0.390122638475884,4.79408125061381 1.5520446585633 -0.418164556168773,4.70683250885755 1.4473461684558 -0.44838840689243,4.62344799938923 1.34046825278266 -0.48064694308422,4.54433396315718 1.23193161000571 -0.514783004398435,4.46987583579342 1.1222650197385 -0.550630283375696,4.40043636980995 1.01200276658516 -0.588014135676182,4.33635386730502 0.901682037159526 -0.626752430929296,4.27794053178928 0.791840302965968 -0.666656440054525,4.22548094716167 0.68301270189222 -0.707531754730549,4.17923069124529 0.575729431071401 -0.749179234533037,4.13941509063789 0.470513163814874 -0.791395977126782,4.10622812294338 0.36787650320041 -0.833976306785479,4.07983147173244 0.268319484721523 -0.876712776423191,4.06035373883638 0.172327140164803 -0.919397178255699,4.04788981781196 0.080367134583816 -0.961821558167894,4.04250043162957 -0.007112512118036 -1.00377922884533,4.04421183683692 -0.089685607895445 -1.04506577673403,4.0530156956399 -0.166949864926001 -1.0854800579228,4.06886911652336 -0.238528859516028 -1.12482517809611,4.09169486321435 -0.304073865998978 -1.16290945178344,4.12138173096942 -0.363265555691829 -1.1995473362316,4.15778508835299 -0.415815552632322 -1.23456033535038,4.20072758186713 -0.461467838517673 -1.26777786932757,4.25 -0.5 -1.29903810567666)'):
         feat.DumpReadable()
-        return 'fail'
+        pytest.fail()
 
 # OGRFeature(entities):61
 #   EntityHandle (String) = 203
@@ -2253,7 +2246,7 @@ def test_ogr_dxf_32():
     feat = lyr.GetNextFeature()
     if ogrtest.check_feature_geometry(feat, 'LINESTRING Z (2.75 0.5 -0.43301270189222,2.75597796157458 0.457022294808167 -0.455760312055479,2.76522760095779 0.414850974295674 -0.478918395607368,2.77770451483146 0.37368848382115 -0.502375781105475,2.79334880719819 0.333732425808347 -0.526019860294666,2.81208537691484 0.295174611146642 -0.549737128688177,2.83382427821898 0.258200138394064 -0.573413730451116,2.85846115251769 0.222986505203176 -0.596936004970611,2.88587772936573 0.189702756235451 -0.620191032488805,2.91594239422828 0.15850867165462 -0.643067176179329,2.94851082030252 0.129554000094665 -0.66545461806501,2.98342666136509 0.102977739784634 -0.687245886204105,3.02052230231928 0.078907471281269 -0.708336370614292,3.05961966383903 0.057458745012683 -0.728624825457685,3.10053105724686 0.038734526573237 -0.748013855076124,3.14306008552201 0.022824702432479 -0.766410381543502,3.18700258611332 0.009805648431019 -0.783726091490617,3.23214761103096 -0.00026013686519 -0.79987786005755,3.27827843951188 -0.007324332192091 -0.814788149938374,3.32517361839783 -0.011353025555964 -0.828385383602543,3.37260802523135 -0.012326877029509 -0.84060428690611,3.42035394896652 -0.010241211594056 -0.851386202443257,3.46818218310621 -0.0051060415822 -0.860679371133851,3.51586312601842 0.003053981386852 -0.868439180695292,3.56316788314946 0.014199684748517 -0.874628379805819,3.60986936584274 0.028277563042523 -0.879217256931186,3.65574338148826 0.045220034768334 -0.882183782956251,3.70056970976957 0.064945766813234 -0.883513716936746,3.74413315984144 0.087360064895672 -0.883200674463593,3.78622460336345 0.112355328149502 -0.881246158311542,3.82664197843012 0.139811565666877 -0.87765955122504,3.86519125957839 0.169596972520106 -0.872458070875934,3.90168738921576 0.201568562497258 -0.865666687209244,3.93595516599773 0.235572854514029 -0.857318002573801,3.96783008588991 0.271446609406727 -0.847452095213172,3.99715913187718 0.30901761356937 -0.836116326868217,4.02380150852887 0.348105505672996 -0.823365115414876,4.04762931789371 0.3885226424985 -0.809259673628662,4.06852817347981 0.430074999726512 -0.793867715329923,4.08639774937224 0.472563103360048 -0.777263130320539,4.10115226185219 0.515782987308575 -0.759525629672545,4.1127208812057 0.559527172536592 -0.740740363071464,4.12104807174486 0.603585663076254 -0.720997510051345,4.12609385840951 0.647746954122649 -0.700391847083764,4.1278340186693 0.691799047372318 -0.679022292599034,4.12626019880507 0.735530468730831 -0.656991432123733,4.12137995401128 0.778731283503886 -0.634405025814187,4.11321671212692 0.821194104198432 -0.61137150074998,4.10180966116915 0.862715086095846 -0.588001430424789,4.08721356120934 0.903094905817856 -0.564407003933257,4.06949848149492 0.942139718187561 -0.540701487402092,4.04874946407869 0.979662086792094 -0.516998680250836,4.02506611557057 1.01548188377972 -0.493412368892526,3.99856212897149 1.04942715457186 -0.470055780496802,3.96936473788492 1.08133494333891 -0.447041039437686,3.93761410572614 1.11105207527721 -0.424478629035376,3.9034626528613 1.13843589193168 -0.402476861176005,3.86707432490649 1.16335493603432 -0.381141356355458,3.8286238056993 1.1856895825708 -0.360574536643342,3.78829567872099 1.20533261304587 -0.340875134001137,3.74628354099508 1.22218973019068 -0.322137716314888,3.70278907371594 1.23618001064108 -0.304452233417734,3.65802107406893 1.247236293414 -0.287903585281599,3.61219445288998 1.25530550231681 -0.27257121445099,3.56552920297626 1.26034890074202 -0.258528724675415,3.51824934300062 1.26234227762414 -0.245843527571206,3.47058184209972 1.26127606366599 -0.234576519008966,3.42275553029828 1.2571553772766 -0.224781786780142,3.375 1.25 -0.21650635094611)'):
         feat.DumpReadable()
-        return 'fail'
+        pytest.fail()
 
 # OGRFeature(entities):62
 #   EntityHandle (String) = 204
@@ -2261,7 +2254,7 @@ def test_ogr_dxf_32():
     feat = lyr.GetNextFeature()
     if ogrtest.check_feature_geometry(feat, 'POLYGON Z ((2.125 -0.25 -0.649519052838329,2.875 -0.75 -1.08253175473055,3.5 0.0 -0.866025403784439,2.75 0.5 -0.43301270189222,2.125 -0.25 -0.649519052838329))'):
         feat.DumpReadable()
-        return 'fail'
+        pytest.fail()
 
 # OGRFeature(entities):63
 #   EntityHandle (String) = 205
@@ -2269,7 +2262,7 @@ def test_ogr_dxf_32():
     feat = lyr.GetNextFeature()
     if ogrtest.check_feature_geometry(feat, 'POLYGON Z ((4.875 0.25 -1.08253175473055,5.5 1.0 -0.866025403784439,4.75 1.5 -0.43301270189222,4.125 0.75 -0.649519052838329,4.875 0.25 -1.08253175473055))'):
         feat.DumpReadable()
-        return 'fail'
+        pytest.fail()
 
 # OGRFeature(entities):64
 #   EntityHandle (String) = 207
@@ -2277,7 +2270,7 @@ def test_ogr_dxf_32():
     feat = lyr.GetNextFeature()
     if ogrtest.check_feature_geometry(feat, 'POLYGON Z ((11 2 -1.73205080756888,11.625 2.75 -1.51554445662277,12.375 2.25 -1.94855715851499,11.75 1.5 -2.1650635094611,11 2 -1.73205080756888))'):
         feat.DumpReadable()
-        return 'fail'
+        pytest.fail()
 
 # OGRFeature(entities):65
 #   EntityHandle (String) = 208
@@ -2285,7 +2278,7 @@ def test_ogr_dxf_32():
     feat = lyr.GetNextFeature()
     if ogrtest.check_feature_geometry(feat, 'LINESTRING (2.75 0.5,2.96153846153846 0.538461538461539,3.17307692307692 0.576923076923077,3.38461538461539 0.615384615384616,3.59615384615385 0.653846153846154,3.80769230769231 0.692307692307693,4.01923076923077 0.730769230769231,4.23076923076923 0.76923076923077,4.44230769230769 0.807692307692308,4.65384615384616 0.846153846153847,4.86538461538462 0.884615384615385,5.07692307692308 0.923076923076924,5.28846153846154 0.961538461538462,5.5 1.0,5.71153846153846 1.03846153846154,5.92307692307693 1.07692307692308,6.13461538461539 1.11538461538462,6.34615384615385 1.15384615384615,6.55769230769231 1.19230769230769,6.76923076923077 1.23076923076923,6.98076923076923 1.26923076923077,7.19230769230769 1.30769230769231,7.40384615384616 1.34615384615385,7.61538461538462 1.38461538461539,7.82692307692308 1.42307692307692,8.03846153846154 1.46153846153846,8.25 1.5,8.46153846153846 1.53846153846154,8.67307692307693 1.57692307692308,8.88461538461539 1.61538461538462,9.09615384615385 1.65384615384615,9.30769230769231 1.69230769230769,9.51923076923077 1.73076923076923,9.73076923076923 1.76923076923077,9.94230769230769 1.80769230769231,10.1538461538462 1.84615384615385,10.3653846153846 1.88461538461539,10.5769230769231 1.92307692307692,10.7884615384615 1.96153846153846,11.0 2.0)'):
         feat.DumpReadable()
-        return 'fail'
+        pytest.fail()
 
 # OGRFeature(entities):66
 #   EntityHandle (String) = 209
@@ -2293,7 +2286,7 @@ def test_ogr_dxf_32():
     feat = lyr.GetNextFeature()
     if ogrtest.check_feature_geometry(feat, 'LINESTRING (5.75 5.5,5.5082446180819 5.22760624757667,5.26788002157825 4.95546536522868,5.03029699590351 4.68383022303141,4.79688632647213 4.4129536910602,4.56903879869856 4.14308863939042,4.34814519799727 3.87448793809741,4.1355963097827 3.60740445725653,3.93278291946931 3.34209106694314,3.74109581247155 3.07880063723259,3.56192577420388 2.81778603820024,3.39666359008075 2.55930013992144,3.24670004551661 2.30359581247155,3.11342592592593 2.05092592592593,2.99823201672314 1.80154335035992,2.90250910332271 1.55570095584889,2.8276479711391 1.31365161246818,2.77503940558674 1.07564819029316,2.74607419208011 0.84194355939918,2.74214311603365 0.612790589861594,2.76457901346955 0.38843161550262,2.8133818843878 0.168866636322256,2.88721889276623 -0.046146681501713,2.98469925319038 -0.256861208044643,3.10443218024579 -0.463529813381887,3.24502688851802 -0.666405367588803,3.4050925925926 -0.865740740740744,3.58323850705508 -1.06178880291307,3.77807384649101 -1.25480242418113,3.98820782548594 -1.44503447462028,4.21224965862541 -1.63273782430588,4.44880856049496 -1.81816534331328,4.69649374568015 -2.00156990171784,4.95391442876651 -2.18320436959491,5.2196798243396 -2.36332161701985,5.49239914698496 -2.54217451406801,5.77068161128813 -2.72001593081475,6.05313643183467 -2.89709873733543,6.33837282321012 -3.0736758037054,6.625 -3.25)'):
         feat.DumpReadable()
-        return 'fail'
+        pytest.fail()
 
 # OGRFeature(entities):67
 #   EntityHandle (String) = 20A
@@ -2301,7 +2294,7 @@ def test_ogr_dxf_32():
     feat = lyr.GetNextFeature()
     if ogrtest.check_feature_geometry(feat, 'POINT Z (9.625 1.75 -1.51554445662277)'):
         feat.DumpReadable()
-        return 'fail'
+        pytest.fail()
 
     return 'success'
 
@@ -2329,8 +2322,7 @@ def test_ogr_dxf_33():
     wkt_string_expected = 'POLYHEDRALSURFACE Z (((0 0 0,1 0 0,1 1 0,0 1 0,0 0 0)),((0 0 0,1 0 0,1 0 1,0 0 1,0 0 0)),((1 0 0,1 1 0,1 1 1,1 0 1,1 0 0)),((1 1 0,1 1 1,0 1 1,0 1 0,1 1 0)),((0 0 0,0 1 0,0 1 1,0 0 1,0 0 0)),((0 0 1,1 0 1,1 1 1,0 1 1,0 0 1)))'
     if wkt_string != wkt_string_expected:
         feat.DumpReadable()
-        gdaltest.post_reason('wrong geometry for polyface mesh')
-        return 'fail'
+        pytest.fail('wrong geometry for polyface mesh')
 
     faces = geom.GetGeometryCount()
     assert faces == 6, \
@@ -2353,46 +2345,38 @@ def test_ogr_dxf_33():
 
     if feat.GetGeometryRef() is not None:
         feat.DumpReadable()
-        gdaltest.post_reason('geometry on first 3DSOLID was not empty')
-        return 'fail'
+        pytest.fail('geometry on first 3DSOLID was not empty')
 
     if feat.GetFieldAsBinary('ASMData') != b'ACIS BinaryFile(U\x00\x00\x00\x00\x00\x00\x02\x00\x00\x00\x0c\x00\x00\x00\x07\x10Autodesk AutoCAD\x07\x13ASM 221.0.0.1871 NT\x07\x18Sun Mar 04 15:10:20 2018\x06ffffff9@\x06\x8d\xed\xb5\xa0\xf7\xc6\xb0>\x06\xbb\xbd\xd7\xd9\xdf|\xdb=\r\tasmheader\x0c\xff\xff\xff\xff\x04\xff\xff\xff\xff\x07\x0c221.0.0.1871\x11\r\x04body\x0c\xff\xff\xff\xff\x04\xff\xff\xff\xff\x0c\xff\xff\xff\xff\x0c\x02\x00\x00\x00\x0c\xff\xff\xff\xff\x0c\x03\x00\x00\x00\x11\r\x04lump\x0c\xff\xff\xff\xff\x04\xff\xff\xff\xff\x0c\xff\xff\xff\xff\x0c\xff\xff\xff\xff\x0c\x04\x00\x00\x00\x0c\x01\x00\x00\x00\x11\r\ttransform\x0c\xff\xff\xff\xff\x04\xff\xff\xff\xff\x14\x00\x00\x00\x00\x00\x00\xf0?\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x14\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\xf0?\x00\x00\x00\x00\x00\x00\x00\x00\x14\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\xf0?\x14\x00\x00\x00\x00\x00\x00\x10@\x00\x00\x00\x00\x00\x00\xf0?\x00\x00\x00\x00\x00\x00\x00\x00\x06\x00\x00\x00\x00\x00\x00\xf0?\x0b\x0b\x0b\x11\r\x05shell\x0c\xff\xff\xff\xff\x04\xff\xff\xff\xff\x0c\xff\xff\xff\xff\x0c\xff\xff\xff\xff\x0c\xff\xff\xff\xff\x0c\x05\x00\x00\x00\x0c\xff\xff\xff\xff\x0c\x02\x00\x00\x00\x11\r\x04face\x0c\x06\x00\x00\x00\x04\xff\xff\xff\xff\x0c\xff\xff\xff\xff\x0c\xff\xff\xff\xff\x0c\xff\xff\xff\xff\x0c\x04\x00\x00\x00\x0c\xff\xff\xff\xff\x0c\x07\x00\x00\x00\x0b\x0b\x11\x0e\tpersubent\x0e\x10acadSolidHistory\r\x06attrib\x0c\xff\xff\xff\xff\x04\xff\xff\xff\xff\x0c\xff\xff\xff\xff\x0c\xff\xff\xff\xff\x0c\x05\x00\x00\x00\x04\x01\x00\x00\x00\x04\x02\x00\x00\x00\x04\x01\x00\x00\x00\x04\x00\x00\x00\x00\x11\x0e\x06sphere\r\x07surface\x0c\xff\xff\xff\xff\x04\xff\xff\xff\xff\x0c\xff\xff\xff\xff\x13\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x06\xcd;\x7ff\x9e\xa0\xe6?\x14\x00\x00\x00\x00\x00\x00\xf0?\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x14\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\xf0?\x0b\x0b\x0b\x0b\x0b\x11\x0e\x03End\x0e\x02of\x0e\x03ASM\r\x04data':
         feat.DumpReadable()
-        gdaltest.post_reason('wrong ASMData on first 3DSOLID')
-        return 'fail'
+        pytest.fail('wrong ASMData on first 3DSOLID')
 
     if feat.GetField('ASMTransform') != [1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0, 0]:
         feat.DumpReadable()
-        gdaltest.post_reason('wrong ASMTransform on first 3DSOLID')
-        return 'fail'
+        pytest.fail('wrong ASMTransform on first 3DSOLID')
 
     if feat.GetStyleString() != 'BRUSH(fc:#000000)':
         feat.DumpReadable()
-        gdaltest.post_reason('wrong style string on first 3DSOLID')
-        return 'fail'
+        pytest.fail('wrong style string on first 3DSOLID')
 
     # 3DSOLID inside a block
     feat = layer.GetNextFeature()
 
     if feat.GetGeometryRef() is not None:
         feat.DumpReadable()
-        gdaltest.post_reason('geometry on second 3DSOLID was not empty')
-        return 'fail'
+        pytest.fail('geometry on second 3DSOLID was not empty')
 
     if feat.GetFieldAsBinary('ASMData') != b'ACIS BinaryFile(U\x00\x00\x00\x00\x00\x00\x02\x00\x00\x00\x0c\x00\x00\x00\x07\x10Autodesk AutoCAD\x07\x13ASM 221.0.0.1871 NT\x07\x18Sun Mar 04 15:10:20 2018\x06ffffff9@\x06\x8d\xed\xb5\xa0\xf7\xc6\xb0>\x06\xbb\xbd\xd7\xd9\xdf|\xdb=\r\tasmheader\x0c\xff\xff\xff\xff\x04\xff\xff\xff\xff\x07\x0c221.0.0.1871\x11\r\x04body\x0c\xff\xff\xff\xff\x04\xff\xff\xff\xff\x0c\xff\xff\xff\xff\x0c\x02\x00\x00\x00\x0c\xff\xff\xff\xff\x0c\x03\x00\x00\x00\x11\r\x04lump\x0c\xff\xff\xff\xff\x04\xff\xff\xff\xff\x0c\xff\xff\xff\xff\x0c\xff\xff\xff\xff\x0c\x04\x00\x00\x00\x0c\x01\x00\x00\x00\x11\r\ttransform\x0c\xff\xff\xff\xff\x04\xff\xff\xff\xff\x14\x00\x00\x00\x00\x00\x00\xf0?\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x14\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\xf0?\x00\x00\x00\x00\x00\x00\x00\x00\x14\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\xf0?\x14\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x06\x00\x00\x00\x00\x00\x00\xf0?\x0b\x0b\x0b\x11\r\x05shell\x0c\xff\xff\xff\xff\x04\xff\xff\xff\xff\x0c\xff\xff\xff\xff\x0c\xff\xff\xff\xff\x0c\xff\xff\xff\xff\x0c\x05\x00\x00\x00\x0c\xff\xff\xff\xff\x0c\x02\x00\x00\x00\x11\r\x04face\x0c\x06\x00\x00\x00\x04\xff\xff\xff\xff\x0c\xff\xff\xff\xff\x0c\xff\xff\xff\xff\x0c\xff\xff\xff\xff\x0c\x04\x00\x00\x00\x0c\xff\xff\xff\xff\x0c\x07\x00\x00\x00\x0b\x0b\x11\x0e\tpersubent\x0e\x10acadSolidHistory\r\x06attrib\x0c\xff\xff\xff\xff\x04\xff\xff\xff\xff\x0c\xff\xff\xff\xff\x0c\xff\xff\xff\xff\x0c\x05\x00\x00\x00\x04\x01\x00\x00\x00\x04\x04\x00\x00\x00\x04\x01\x00\x00\x00\x04\x00\x00\x00\x00\x11\x0e\x06sphere\r\x07surface\x0c\xff\xff\xff\xff\x04\xff\xff\xff\xff\x0c\xff\xff\xff\xff\x13\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x06\x00\x00\x00\x00\x00\x00\x00@\x14\x00\x00\x00\x00\x00\x00\xf0?\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x14\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\xf0?\x0b\x0b\x0b\x0b\x0b\x11\x0e\x03End\x0e\x02of\x0e\x03ASM\r\x04data':
         feat.DumpReadable()
-        gdaltest.post_reason('wrong ASMData on second 3DSOLID')
-        return 'fail'
+        pytest.fail('wrong ASMData on second 3DSOLID')
 
     if feat.GetField('ASMTransform') != [-0.18750000000000006, 0.08660254037844387, 0.0, 0.3247595264191645, 0.05000000000000002, 0.0, 0.0, 0.0, -1.0, 5.75, 1.125, 0.0]:
         feat.DumpReadable()
-        gdaltest.post_reason('wrong ASMTransform on second 3DSOLID')
-        return 'fail'
+        pytest.fail('wrong ASMTransform on second 3DSOLID')
 
     if feat.GetStyleString() != 'BRUSH(fc:#ff0000)':
         feat.DumpReadable()
-        gdaltest.post_reason('wrong style string on second 3DSOLID')
-        return 'fail'
+        pytest.fail('wrong style string on second 3DSOLID')
 
     return 'success'
 
@@ -2596,13 +2580,13 @@ def test_ogr_dxf_38():
     if f.GetGeometryRef().ExportToWkt() != 'POINT (0 2)' \
             or f.GetStyleString() != 'PEN(c:#000000)':
         f.DumpReadable()
-        return 'fail'
+        pytest.fail()
 
     f = lyr.GetNextFeature()
     if f.GetGeometryRef().ExportToWkt() != 'LINESTRING (0.5 2.0,1 2)' \
             or f.GetStyleString() != 'PEN(c:#000000)':
         f.DumpReadable()
-        return 'fail'
+        pytest.fail()
 
     return 'success'
 
@@ -2618,12 +2602,12 @@ def test_ogr_dxf_39():
     f = lyr.GetNextFeature()
     if f.GetGeometryRef().ExportToWkt() != 'POLYGON ((0 5,1.5 2.5,1.5 0.0,0.0 2.5,0 5))':
         f.DumpReadable()
-        return 'fail'
+        pytest.fail()
 
     f = lyr.GetNextFeature()
     if f.GetGeometryRef().ExportToIsoWkt() != 'POLYGON Z ((-10 13 123,10 10 123,5 12 123,8 13 123,-10 13 123))':
         f.DumpReadable()
-        return 'fail'
+        pytest.fail()
 
     return 'success'
 
@@ -2638,7 +2622,7 @@ def test_ogr_dxf_40():
     f = lyr.GetFeature(5)
     if ogrtest.check_feature_geometry(f, 'POINT (320000.0 5815007.5 0)') != 0:
         f.DumpReadable()
-        return 'fail'
+        pytest.fail()
 
     return 'success'
 
@@ -2655,20 +2639,20 @@ def test_ogr_dxf_41():
     f = lyr.GetFeature(1)
     if ogrtest.check_feature_geometry(f, 'LINESTRING (45 20,25 20,25 40,45 40,45 20)') != 0:
         f.DumpReadable()
-        return 'fail'
+        pytest.fail()
 
     # INSERT #2: OCS normal vector (0,1/sqrt(2),-1/sqrt(2))
     f = lyr.GetFeature(3)
     if ogrtest.check_feature_geometry(f, 'LINESTRING Z (10.0 18.0 -76.3675323681472,-10.0 18.0 -76.3675323681472,-10.0 32.142135623731 -62.2253967444162,10.0 32.142135623731 -62.2253967444162,10.0 18.0 -76.3675323681472)') != 0:
         f.DumpReadable()
-        return 'fail'
+        pytest.fail()
 
     # INSERT #3: OCS normal vector (0.6,sqrt(8)/5,sqrt(8)/5) with
     # Y scale factor of 2 and rotation angle of 45 degrees
     f = lyr.GetFeature(5)
     if ogrtest.check_feature_geometry(f, 'LINESTRING Z (49.7198871869889 -21.8420670839387 75.1721817670195,34.1976071850546 -17.0401066991021 86.8340855568821,41.9587471852111 -48.595846365317 110.157893136607,57.4810271871454 -53.3978067501536 98.4959893467447,49.7198871869889 -21.8420670839387 75.1721817670195)') != 0:
         f.DumpReadable()
-        return 'fail'
+        pytest.fail()
 
     # HATCH
     f = lyr.GetFeature(7)
@@ -2728,13 +2712,13 @@ def test_ogr_dxf_41():
         "-4.0 41.0121933088198 -132.936074863071))"
     if ogrtest.check_feature_geometry(f, expected_wkt) != 0:
         f.DumpReadable()
-        return 'fail'
+        pytest.fail()
 
     # SOLID
     f = lyr.GetFeature(9)
     if ogrtest.check_feature_geometry(f, 'POLYGON Z ((-10.0 13.0 124,8.0 13.0 124,5.0 12.0 123,10.0 10.0 121,-10.0 13.0 124))') != 0:
         f.DumpReadable()
-        return 'fail'
+        pytest.fail()
 
     return 'success'
 
@@ -2761,15 +2745,13 @@ def test_ogr_dxf_42():
 
     f = lyr.GetNextFeature()
     if ogrtest.check_feature_geometry(f, 'POINT Z (8.0 2.5 6)') != 0:
-        gdaltest.post_reason('Wrong geometry for first insertion point')
         f.DumpReadable()
-        return 'fail'
+        pytest.fail('Wrong geometry for first insertion point')
 
     f = lyr.GetNextFeature()
     if ogrtest.check_feature_geometry(f, 'POINT Z (-1 -2 -3)') != 0:
-        gdaltest.post_reason('Wrong geometry for second insertion point')
         f.DumpReadable()
-        return 'fail'
+        pytest.fail('Wrong geometry for second insertion point')
 
     lyr = ds.GetLayerByName('blocks')
     assert lyr.GetFeatureCount() == 6, \
@@ -2777,15 +2759,13 @@ def test_ogr_dxf_42():
 
     f = lyr.GetFeature(3)
     if ogrtest.check_feature_geometry(f, 'POINT Z (5 5 0)') != 0:
-        gdaltest.post_reason('Wrong geometry for second insertion of BLOCK4 on BLOCK3')
         f.DumpReadable()
-        return 'fail'
+        pytest.fail('Wrong geometry for second insertion of BLOCK4 on BLOCK3')
 
     f = lyr.GetFeature(4)
     if ogrtest.check_feature_geometry(f, 'POINT Z (-5.48795472456028 1.69774937525433 4.12310562561766)') != 0:
-        gdaltest.post_reason('Wrong geometry for third insertion of BLOCK4 on BLOCK3')
         f.DumpReadable()
-        return 'fail'
+        pytest.fail('Wrong geometry for third insertion of BLOCK4 on BLOCK3')
 
     assert f.GetField('BlockName') == 'BLOCK4', 'Wrong BlockName'
     assert f.GetField('BlockScale') == [0.4, 1.0, 1.5], 'Wrong BlockScale'
@@ -2839,12 +2819,12 @@ def test_ogr_dxf_44():
     f = lyr.GetNextFeature()
     if ogrtest.check_feature_geometry(f, 'LINESTRING Z (21 40 0,10 40 0,19.3125 34.6875 0,10.3125 34.6875 0,-13.5990791268758 34.6875 0)') != 0:
         f.DumpReadable()
-        return 'fail'
+        pytest.fail()
 
     f = lyr.GetNextFeature()
     if ogrtest.check_feature_geometry(f, 'POLYGON ((21.0 41.5,30 40,21.0 38.5,21.0 41.5))') != 0:
         f.DumpReadable()
-        return 'fail'
+        pytest.fail()
 
     # Skip text
     f = lyr.GetNextFeature()
@@ -2854,32 +2834,32 @@ def test_ogr_dxf_44():
     if f.GetStyleString() != 'PEN(c:#ff0000)' \
             or ogrtest.check_feature_geometry(f, 'LINESTRING Z (-20.9782552979609 38.1443878852919 30,-12.2152357926375 44.793971841437 30,-13.7256166009765 49.0748560186272 30,-13.9025293262723 49.0416613258524 30)') != 0:
         f.DumpReadable()
-        return 'fail'
+        pytest.fail()
 
     f = lyr.GetNextFeature()
     if f.GetStyleString() != 'BRUSH(fc:#ff0000)' \
             or ogrtest.check_feature_geometry(f, 'POLYGON Z ((-20.9601206293303 38.1204894796201 30,-21.121645731992 38.035579873508 30,-20.9963899665916 38.1682862909638 30,-20.9601206293303 38.1204894796201 30))') != 0:
         f.DumpReadable()
-        return 'fail'
+        pytest.fail()
 
     # LEADER with a custom arrowhead that consists of a polygon and line
     f = lyr.GetNextFeature()
     if f.GetStyleString() != 'PEN(c:#00ff00)' \
             or ogrtest.check_feature_geometry(f, 'LINESTRING Z (26.8 77.6 0,10 65 0,25 55 0,25 50 0,40 65 0,48 65 0,169.282571623465 65.0 0)') != 0:
         f.DumpReadable()
-        return 'fail'
+        pytest.fail()
 
     f = lyr.GetNextFeature()
     if f.GetStyleString() != 'BRUSH(fc:#00ff00)' \
             or ogrtest.check_feature_geometry(f, 'POLYGON ((27.2 80.4,30.4 82.8,32.8 79.6,29.6 77.2,27.2 80.4))') != 0:
         f.DumpReadable()
-        return 'fail'
+        pytest.fail()
 
     f = lyr.GetNextFeature()
     if f.GetStyleString() != 'PEN(c:#00ff00)' \
             or ogrtest.check_feature_geometry(f, 'LINESTRING Z (28.4 78.8 0,26.8 77.6 0)') != 0:
         f.DumpReadable()
-        return 'fail'
+        pytest.fail()
 
     # Check that the very long text string in the MTEXT entity associated
     # to this LEADER is captured correctly
@@ -2891,27 +2871,26 @@ def test_ogr_dxf_44():
     f = lyr.GetNextFeature()
     if ogrtest.check_feature_geometry(f, 'MULTILINESTRING ((26.8 32.6,10 20,25 10,25 5,40 20),(40 20,48 20))') != 0:
         f.DumpReadable()
-        return 'fail'
+        pytest.fail()
 
     f = lyr.GetNextFeature()
     if ogrtest.check_feature_geometry(f, 'POLYGON ((27.2 35.4,30.4 37.8,32.8 34.6,29.6 32.2,27.2 35.4))') != 0:
         f.DumpReadable()
-        return 'fail'
+        pytest.fail()
 
     f = lyr.GetNextFeature()
     if ogrtest.check_feature_geometry(f, 'LINESTRING Z (28.4 33.8 0,26.8 32.6 0)') != 0:
         f.DumpReadable()
-        return 'fail'
+        pytest.fail()
 
     f = lyr.GetNextFeature()
     if ogrtest.check_feature_geometry(f, 'POINT (50.0 22.0327421555252)') != 0:
         f.DumpReadable()
-        return 'fail'
+        pytest.fail()
 
     if f.GetStyleString() != 'LABEL(f:"Arial",t:"Basic Multileader",p:7,s:4g,c:#000000)':
-        gdaltest.post_reason('Wrong style string on MULTILEADER text')
         f.DumpReadable()
-        return 'fail'
+        pytest.fail('Wrong style string on MULTILEADER text')
 
     # There are three LEADERs, followed by two MULTILEADERs, without arrowheads.
     # In the first LEADER/MULTILEADER, the arrowhead is set to an empty block.
@@ -2940,26 +2919,26 @@ def test_ogr_dxf_44():
     if f.GetStyleString() != 'PEN(c:#0000ff)' \
             or ogrtest.check_feature_geometry(f, 'MULTILINESTRING ((7.6425115795681 -8.00285406769102,18.2 -20.0),(19.2913880067389 -13.9367332958948,18.2 -20.0),(18.2 -20.0,38 -20),(54.8204921137545 -22.5800753657327,60.2227692307692 -20.0),(60.2227692307692 -20.0,52.2227692307692 -20.0))') != 0:
         f.DumpReadable()
-        return 'fail'
+        pytest.fail()
 
     f = lyr.GetNextFeature()
     if f.GetStyleString() != 'BRUSH(fc:#0000ff)' \
             or ogrtest.check_feature_geometry(f, 'POLYGON Z ((7.1420359016196 -8.4432726642857 0,5 -5 0,8.1429872575166 -7.56243547109634 0,7.1420359016196 -8.4432726642857 0))') != 0:
         f.DumpReadable()
-        return 'fail'
+        pytest.fail()
 
     f = lyr.GetNextFeature()
     if f.GetStyleString() != 'BRUSH(fc:#0000ff)' \
             or ogrtest.check_feature_geometry(f, 'POLYGON Z ((18.6352657907565 -13.8186312970179 0,20 -10 0,19.9475102227214 -14.0548352947716 0,18.6352657907565 -13.8186312970179 0))') != 0:
         f.DumpReadable()
-        return 'fail'
+        pytest.fail()
 
     # Note, the text actually is nine question marks, this is not an encoding error
     f = lyr.GetNextFeature()
     if f.GetStyleString() != 'LABEL(f:"Calibri",it:1,t:"?????????",p:7,s:4g,w:40,c:#0000ff)' \
             or ogrtest.check_feature_geometry(f, 'POINT (40.0 -17.9846153846154)') != 0:
         f.DumpReadable()
-        return 'fail'
+        pytest.fail()
 
     # Rotated MULTILEADER with scaled block content, block attributes, and
     # different leader color
@@ -2967,12 +2946,12 @@ def test_ogr_dxf_44():
     if f.GetStyleString() != 'PEN(c:#ff00ff)' \
             or ogrtest.check_feature_geometry(f, 'MULTILINESTRING ((-41.8919467995818 -22.8930851139176,-36.1215379759023 -17.6108145786645),(-36.1215379759023 -17.6108145786645,-44.0 -19.0))') != 0:
         f.DumpReadable()
-        return 'fail'
+        pytest.fail()
 
     f = lyr.GetNextFeature()
     if ogrtest.check_feature_geometry(f, 'POLYGON ((-40.7553616986189 -14.3661762772835,-44.6945927106677 -15.0607689879512,-44 -19,-40.0607689879512 -18.3054072893323,-40.7553616986189 -14.3661762772835),(-41.9142984770378 -17.0075519687798,-41.126452274628 -16.8686334266463,-40.9875337324945 -17.6564796290561,-41.7753799349043 -17.7953981711896,-41.9142984770378 -17.0075519687798),(-42.0532170191713 -16.2197057663701,-42.1921355613049 -15.4318595639603,-41.4042893588951 -15.2929410218268,-41.2653708167616 -16.0807872242365,-42.0532170191713 -16.2197057663701),(-42.7021446794476 -17.1464705109134,-42.563226137314 -17.9343167133231,-43.3510723397238 -18.0732352554567,-43.4899908818573 -17.2853890530469,-42.7021446794476 -17.1464705109134),(-42.8410632215811 -16.3586243085036,-43.6289094239909 -16.4975428506372,-43.7678279661244 -15.7096966482274,-42.9799817637146 -15.5707781060938,-42.8410632215811 -16.3586243085036))') != 0:
         f.DumpReadable()
-        return 'fail'
+        pytest.fail()
 
     if version_info >= (3, 0, 0):
         test_text = 'Apples\u00B1'
@@ -2985,13 +2964,13 @@ def test_ogr_dxf_44():
         or f.GetField('Text') != test_text \
             or ogrtest.check_feature_geometry(f, 'POINT Z (-42.7597068401767 -14.5165110820149 0)') != 0:
         f.DumpReadable()
-        return 'fail'
+        pytest.fail()
 
     # MULTILEADER with no dogleg
     f = lyr.GetNextFeature()
     if ogrtest.check_feature_geometry(f, 'MULTILINESTRING ((-2.39659963256204 -14.5201521575302,-3.98423252456234 -23.1105237601191),(-26.0282877045921 -20.4748699216691,-3.98423252456233 -23.1105237601191))') != 0:
         f.DumpReadable()
-        return 'fail'
+        pytest.fail()
 
     for x in range(4):
         f = lyr.GetNextFeature()
@@ -3000,12 +2979,12 @@ def test_ogr_dxf_44():
     f = lyr.GetNextFeature()
     if ogrtest.check_feature_geometry(f, 'MULTILINESTRING EMPTY') != 0:
         f.DumpReadable()
-        return 'fail'
+        pytest.fail()
 
     f = lyr.GetNextFeature()
     if ogrtest.check_feature_geometry(f, 'POLYGON ((-4.98423252456234 -22.1105237601191,-6.98423252456234 -22.1105237601191,-6.98423252456234 -24.1105237601191,-4.98423252456234 -24.1105237601191,-4.98423252456234 -22.1105237601191),(-5.78423252456234 -23.3105237601191,-5.38423252456234 -23.3105237601191,-5.38423252456234 -23.7105237601191,-5.78423252456234 -23.7105237601191,-5.78423252456234 -23.3105237601191),(-5.78423252456234 -22.9105237601191,-5.78423252456234 -22.5105237601191,-5.38423252456234 -22.5105237601191,-5.38423252456234 -22.9105237601191,-5.78423252456234 -22.9105237601191),(-6.18423252456234 -23.3105237601191,-6.18423252456234 -23.7105237601191,-6.58423252456234 -23.7105237601191,-6.58423252456234 -23.3105237601191,-6.18423252456234 -23.3105237601191),(-6.18423252456234 -22.9105237601191,-6.58423252456234 -22.9105237601191,-6.58423252456234 -22.5105237601191,-6.18423252456234 -22.5105237601191,-6.18423252456234 -22.9105237601191))') != 0:
         f.DumpReadable()
-        return 'fail'
+        pytest.fail()
 
     f = lyr.GetNextFeature()
 
@@ -3013,31 +2992,31 @@ def test_ogr_dxf_44():
     f = lyr.GetNextFeature()
     if ogrtest.check_feature_geometry(f, 'LINESTRING Z (75 -5 0,75.3293039686015 -5.27450166567948 0,75.686184437139 -5.54808513378289 0,76.0669570707518 -5.8208730793178 0,76.4679375345795 -6.09298817729179 0,76.8854414937615 -6.36455310271241 0,77.3157846134373 -6.63569053058724 0,77.7552825587464 -6.90652313592384 0,78.2002509948283 -7.17717359372979 0,78.6470055868223 -7.44776457901266 0,79.091861999868 -7.71841876678001 0,79.5311358991048 -7.98925883203941 0,79.9611429496723 -8.26040744979843 0,80.3781988167098 -8.53198729506465 0,80.7786191653568 -8.80412104284562 0,81.1587196607529 -9.07693136814892 0,81.5148159680374 -9.35054094598211 0,81.8432237523498 -9.62507245135277 0,82.1402586788297 -9.90064855926846 0,82.4022364126165 -10.1773919447368 0,82.6254726188496 -10.4554252827652 0,82.8062829626685 -10.7348712483614 0,82.9409831092127 -11.0158525165329 0,83.0258887236216 -11.2984917622873 0,83.0573154710347 -11.5829116606322 0,83.0315790165916 -11.869234886575 0,82.9452821800198 -12.1575745539156 0,82.8004070385963 -12.447864666659 0,82.603711185096 -12.7398802214393 0,82.3621180817583 -13.033390692038 0,82.0825511908225 -13.3281655522369 0,81.7719339745283 -13.6239742758175 0,81.4371898951149 -13.9205863365615 0,81.0852424148219 -14.2177712082505 0,80.7230149958886 -14.515298364666 0,80.3574311005547 -14.8129372795898 0,79.9954141910594 -15.1104574268035 0,79.6438877296422 -15.4076282800887 0,79.3097751785426 -15.704219313227 0,79 -16 0)') != 0:
         f.DumpReadable()
-        return 'fail'
+        pytest.fail()
 
     # MULTILEADER with spline path including an arrowhead on one leader line,
     # and text on an angle
     f = lyr.GetNextFeature()
     if ogrtest.check_feature_geometry(f, 'MULTILINESTRING ((97.9154085227223 -24.4884177083425,98.2307499443399 -23.8667044316857,98.5274844683239 -23.1977407715784,98.8076056908493 -22.4865892691047,99.0731072080911 -21.7383124653484,99.3259826162243 -20.9579729013935,99.568225511424 -20.1506331183241,99.8018294898652 -19.3213556572241,100.028788147723 -18.4752030591775,100.251095081172 -17.6172378652682,100.470743886388 -16.7525226165803,100.689728159546 -15.8861198541978,100.91004149682 -15.0230921192046,101.133677494386 -14.1685019526847,101.362629748419 -13.327411895722,101.598891855094 -12.5048844894007,101.844457410585 -11.7059822748045,102.101320011068 -10.9357677930177,102.371473252719 -10.199303585124,102.656910731711 -9.50165219220749,102.95962604422 -8.84787615535218,103.281612786421 -8.24303801564202,103.624864554489 -7.69220031416101,103.991374944599 -7.20042559199311,104.383137552927 -6.77277639022231,104.802145975646 -6.41431524993259,105.250393808933 -6.13010471220794,105.729874648962 -5.92520731813233,106.242582091908 -5.80468560878975,106.790509733946 -5.77360212526418,107.375651171252 -5.8370194086396,108.0 -6.0),(99.0 -4.0,99.2390786191346 -4.00918383080352,99.4787687119818 -4.01534615590692,99.7189331856537 -4.01916439926796,99.9594349472622 -4.02131598484443,100.200136903919 -4.02247833659411,100.440901962737 -4.02332887847475,100.681593030828 -4.02454503444416,100.922073015303 -4.02680422846008,101.162204823276 -4.03078388448032,101.401851361856 -4.03716142646263,101.640875538158 -4.0466142783648,101.879140259293 -4.0598198641446,102.116508432372 -4.07745560775981,102.352842964508 -4.1001989331682,102.588006762813 -4.12872726432755,102.821862734399 -4.16371802519564,103.054283542724 -4.20580126092676,103.285277318696 -4.25494915918985,103.514951346557 -4.31065239888725,103.743415181632 -4.37239063008777,103.970778379245 -4.43964350286021,104.19715049472 -4.51189066727337,104.422641083382 -4.58861177339606,104.647359700555 -4.66928647129708,104.871415901564 -4.75339441104525,105.094919241732 -4.84041524270936,105.317979276384 -4.92982861635822,105.540705560844 -5.02111418206063,105.763207650437 -5.11375158988541,105.985595100486 -5.20722048990135,106.207977466317 -5.30100053217725,106.430464303253 -5.39457136678194,106.653165166619 -5.4874126437842,106.876189611739 -5.57900401325284,107.099647193937 -5.66882512525668,107.323647468538 -5.7563556298645,107.548299990866 -5.84107517714513,107.773714316245 -5.92246341716736,108.0 -6.0))') != 0:
         f.DumpReadable()
-        return 'fail'
+        pytest.fail()
 
     f = lyr.GetNextFeature()
     if ogrtest.check_feature_geometry(f, 'POLYGON Z ((98.5006722379985 -24.8076524621295 0,96 -28 0,97.330144807446 -24.1691829545554 0,98.5006722379985 -24.8076524621295 0))') != 0:
         f.DumpReadable()
-        return 'fail'
+        pytest.fail()
 
     f = lyr.GetNextFeature()
     if f.GetStyleString() != 'LABEL(f:"Arial",t:"Splines",p:7,a:342,s:2g,c:#000000)' \
             or ogrtest.check_feature_geometry(f, 'POINT (110.7043505591 -4.20673403616296)') != 0:
         f.DumpReadable()
-        return 'fail'
+        pytest.fail()
 
     # MULTILEADER with DIMBREAK
     f = lyr.GetNextFeature()
     if ogrtest.check_feature_geometry(f, 'MULTILINESTRING ((50.8917622404846 41.5635728657296,51.2877903403879 42.2579494192141),(51.9070696740577 43.3437639093041,54.3108962133801 47.5585173269448,55.9270734326513 48.2521008552884),(57.0757636753042 48.7450620367561,59.4256548786735 49.7535194092661),(60 50,60 50),(60 50,60 50),(60.625 50.0,61.875 50.0),(63.125 50.0,63.6 50.0))') != 0:
         f.DumpReadable()
-        return 'fail'
+        pytest.fail()
 
     return 'success'
 
@@ -3089,41 +3068,40 @@ def test_ogr_dxf_46():
     f = lyr.GetNextFeature()
     if ogrtest.check_feature_geometry(f, 'LINESTRING Z (320000.0 5820010.0625 0,320000.0 5820010.43087258 0)') != 0:
         f.DumpReadable()
-        return 'fail'
+        pytest.fail()
     f = lyr.GetNextFeature()
     if ogrtest.check_feature_geometry(f, 'LINESTRING Z (320010.0 5820010.0625 0,320010.0 5820010.43087258 0)') != 0:
         f.DumpReadable()
-        return 'fail'
+        pytest.fail()
 
     # Dimension arrow lines
     f = lyr.GetNextFeature()
     if ogrtest.check_feature_geometry(f, 'LINESTRING Z (320000.18 5820010.25087258 0,320004.475225102 5820010.25087258 0)') != 0:
         f.DumpReadable()
-        return 'fail'
+        pytest.fail()
     f = lyr.GetNextFeature()
     if ogrtest.check_feature_geometry(f, 'LINESTRING Z (320009.82 5820010.25087258 0,320005.524774898 5820010.25087258 0)') != 0:
         f.DumpReadable()
-        return 'fail'
+        pytest.fail()
 
     # Arrowheads
     f = lyr.GetNextFeature()
     if ogrtest.check_feature_geometry(f, 'POLYGON ((320000.18 5820010.28087259,320000.18 5820010.22087258,320000.0 5820010.25087258,320000.18 5820010.28087259))') != 0:
         f.DumpReadable()
-        return 'fail'
+        pytest.fail()
     f = lyr.GetNextFeature()
     if ogrtest.check_feature_geometry(f, 'POLYGON ((320009.82 5820010.28087259,320009.82 5820010.22087258,320010.0 5820010.25087258,320009.82 5820010.28087259))') != 0:
         f.DumpReadable()
-        return 'fail'
+        pytest.fail()
 
     # Text
     f = lyr.GetNextFeature()
     if ogrtest.check_feature_geometry(f, 'POINT Z (320004.537844475 5820010.16240737 0)') != 0:
         f.DumpReadable()
-        return 'fail'
+        pytest.fail()
     if f.GetStyleString() != 'LABEL(f:"Arial",t:"10.0000",p:1,s:0.18g,c:#000000)':
-        gdaltest.post_reason('Wrong style string on DIMENSION text from block')
         f.DumpReadable()
-        return 'fail'
+        pytest.fail('Wrong style string on DIMENSION text from block')
 
     return 'success'
 
@@ -3142,27 +3120,26 @@ def test_ogr_dxf_47():
     f = lyr.GetNextFeature()
     if ogrtest.check_feature_geometry(f, 'MULTILINESTRING ((320010.0 5820010.25087258,320000.0 5820010.25087258),(320010.0 5820010.0625,320010.0 5820010.43087258),(320000.0 5820010.0625,320000.0 5820010.43087258))') != 0:
         f.DumpReadable()
-        return 'fail'
+        pytest.fail()
 
     # Arrowheads
     f = lyr.GetNextFeature()
     if ogrtest.check_feature_geometry(f, 'POLYGON Z ((320009.82 5820010.28087259 0,320010.0 5820010.25087258 0,320009.82 5820010.22087258 0,320009.82 5820010.28087259 0))') != 0:
         f.DumpReadable()
-        return 'fail'
+        pytest.fail()
     f = lyr.GetNextFeature()
     if ogrtest.check_feature_geometry(f, 'POLYGON Z ((320000.18 5820010.22087258 0,320000.0 5820010.25087258 0,320000.18 5820010.28087259 0,320000.18 5820010.22087258 0))') != 0:
         f.DumpReadable()
-        return 'fail'
+        pytest.fail()
 
     # Text
     f = lyr.GetNextFeature()
     if ogrtest.check_feature_geometry(f, 'POINT (320005.0 5820010.25087258)') != 0:
         f.DumpReadable()
-        return 'fail'
+        pytest.fail()
     if f.GetStyleString() != 'LABEL(f:"Arial",t:"10.0000",p:11,s:0.18g,c:#000000)':
-        gdaltest.post_reason('Wrong style string on first DIMENSION text')
         f.DumpReadable()
-        return 'fail'
+        pytest.fail('Wrong style string on first DIMENSION text')
 
     # DIMENSION with style overrides
 
@@ -3170,27 +3147,26 @@ def test_ogr_dxf_47():
     f = lyr.GetNextFeature()
     if ogrtest.check_feature_geometry(f, 'MULTILINESTRING ((320005 5820005,320000 5820010))') != 0:
         f.DumpReadable()
-        return 'fail'
+        pytest.fail()
 
     # Arrowheads
     f = lyr.GetNextFeature()
     if ogrtest.check_feature_geometry(f, 'POLYGON Z ((320004.116116524 5820006.23743687 0,320005 5820005 0,320003.762563133 5820005.88388348 0,320004.116116524 5820006.23743687 0))') != 0:
         f.DumpReadable()
-        return 'fail'
+        pytest.fail()
     f = lyr.GetNextFeature()
     if ogrtest.check_feature_geometry(f, 'POLYGON Z ((320000.883883476 5820008.76256313 0,320000 5820010 0,320001.237436867 5820009.11611652 0,320000.883883476 5820008.76256313 0))') != 0:
         f.DumpReadable()
-        return 'fail'
+        pytest.fail()
 
     # Text
     f = lyr.GetNextFeature()
     if ogrtest.check_feature_geometry(f, 'POINT (320002.5 5820007.5)') != 0:
         f.DumpReadable()
-        return 'fail'
+        pytest.fail()
     if f.GetStyleString() != 'LABEL(f:"Arial",t:"7.1",p:11,a:-45,s:0.48g,c:#000000)':
-        gdaltest.post_reason('Wrong style string on second DIMENSION text')
         f.DumpReadable()
-        return 'fail'
+        pytest.fail('Wrong style string on second DIMENSION text')
 
     # DIMENSION inheriting styles from a custom DIMSTYLE
 
@@ -3198,27 +3174,26 @@ def test_ogr_dxf_47():
     f = lyr.GetNextFeature()
     if ogrtest.check_feature_geometry(f, 'MULTILINESTRING ((320000.0 5820001.5,320005.0 5820001.5),(320000.0 5820002.4,320000 5820001),(320005.0 5820002.4,320005 5820001))') != 0:
         f.DumpReadable()
-        return 'fail'
+        pytest.fail()
 
     # Arrowheads
     f = lyr.GetNextFeature()
     if ogrtest.check_feature_geometry(f, 'POLYGON Z ((320000.18 5820001.47 0,320000.0 5820001.5 0,320000.18 5820001.53 0,320000.18 5820001.47 0))') != 0:
         f.DumpReadable()
-        return 'fail'
+        pytest.fail()
     f = lyr.GetNextFeature()
     if ogrtest.check_feature_geometry(f, 'POLYGON Z ((320004.82 5820001.53 0,320005.0 5820001.5 0,320004.82 5820001.47 0,320004.82 5820001.53 0))') != 0:
         f.DumpReadable()
-        return 'fail'
+        pytest.fail()
 
     # Text
     f = lyr.GetNextFeature()
     if ogrtest.check_feature_geometry(f, 'POINT (320001.5 5820001.5)') != 0:
         f.DumpReadable()
-        return 'fail'
+        pytest.fail()
     if f.GetStyleString() != 'LABEL(f:"Arial",t:"±2 3\n\\P4 5.0000",p:11,s:0.18g,c:#000000)':
-        gdaltest.post_reason('Wrong style string on third DIMENSION text')
         f.DumpReadable()
-        return 'fail'
+        pytest.fail('Wrong style string on third DIMENSION text')
 
     return 'success'
 
@@ -3240,25 +3215,22 @@ def test_ogr_dxf_48():
     # The dimension extension lines are ByBlock; the INSERT is magenta
     f = lyr.GetFeature(0)
     if f.GetStyleString() != 'PEN(c:#ff00ff,p:"1.5875g 1.5875g")':
-        gdaltest.post_reason('Wrong style string on feature 0')
         f.DumpReadable()
-        return 'fail'
+        pytest.fail('Wrong style string on feature 0')
 
     # The dimension line is set directly to blue
     f = lyr.GetFeature(2)
     if f.GetStyleString() != 'PEN(c:#0000ff)':
-        gdaltest.post_reason('Wrong style string on feature 2')
         f.DumpReadable()
-        return 'fail'
+        pytest.fail('Wrong style string on feature 2')
 
     # The first arrowhead is a custom block; the SOLID in this block is
     # colored ByLayer; the layer the block is inserted on (_K_POINTS)
     # is colored red
     f = lyr.GetFeature(4)
     if f.GetStyleString() != 'BRUSH(fc:#ff0000)':
-        gdaltest.post_reason('Wrong style string on feature 4')
         f.DumpReadable()
-        return 'fail'
+        pytest.fail('Wrong style string on feature 4')
 
     # The first arrowhead block also contains a line colored ByBlock.
     # The arrowhead INSERT is blue, so the line should be blue.
@@ -3267,61 +3239,53 @@ def test_ogr_dxf_48():
     # block, which is magenta.
     f = lyr.GetFeature(5)
     if f.GetStyleString() != 'PEN(c:#0000ff)':
-        gdaltest.post_reason('Wrong style string on feature 5')
         f.DumpReadable()
-        return 'fail'
+        pytest.fail('Wrong style string on feature 5')
 
     # The second arrowhead, like the dimension line, is set directly
     # to blue
     f = lyr.GetFeature(6)
     if f.GetStyleString() != 'BRUSH(fc:#0000ff)':
-        gdaltest.post_reason('Wrong style string on feature 6')
         f.DumpReadable()
-        return 'fail'
+        pytest.fail('Wrong style string on feature 6')
 
     # Like the dimension extension lines, the text is ByBlock (#7099)
     f = lyr.GetFeature(7)
     if f.GetStyleString() != 'LABEL(f:"Arial",t:"10.141 (2C)",s:0.4g,p:5,c:#ff00ff)':
-        gdaltest.post_reason('Wrong style string on feature 7')
         f.DumpReadable()
-        return 'fail'
+        pytest.fail('Wrong style string on feature 7')
 
     # ByLayer feature in block
     f = lyr.GetFeature(11)
     if f.GetStyleString() != 'PEN(c:#ff0000)':
-        gdaltest.post_reason('Wrong style string on feature 11')
         f.DumpReadable()
-        return 'fail'
+        pytest.fail('Wrong style string on feature 11')
 
     # ByBlock feature in block
     f = lyr.GetFeature(12)
     if f.GetStyleString() != 'PEN(c:#a552a5)':
-        gdaltest.post_reason('Wrong style string on feature 12')
         f.DumpReadable()
-        return 'fail'
+        pytest.fail('Wrong style string on feature 12')
 
     # ByLayer feature inserted via an INSERT on yellow layer in block
     # inserted via an INSERT on red layer: should be yellow
     f = lyr.GetFeature(13)
     if f.GetStyleString() != 'PEN(c:#ffff00)':
-        gdaltest.post_reason('Wrong style string on feature 13')
         f.DumpReadable()
-        return 'fail'
+        pytest.fail('Wrong style string on feature 13')
 
     # ByBlock feature inserted via a ByBlock INSERT in block inserted
     # via a color213 INSERT: should be color213
     f = lyr.GetFeature(14)
     if f.GetStyleString() != 'PEN(c:#a552a5)':
-        gdaltest.post_reason('Wrong style string on feature 14')
         f.DumpReadable()
-        return 'fail'
+        pytest.fail('Wrong style string on feature 14')
 
     # ByBlock entities directly on the canvas show up as black
     f = lyr.GetFeature(15)
     if f.GetStyleString() != 'PEN(c:#000000)':
-        gdaltest.post_reason('Wrong style string on feature 15')
         f.DumpReadable()
-        return 'fail'
+        pytest.fail('Wrong style string on feature 15')
 
     return 'success'
 
@@ -3339,13 +3303,11 @@ def test_ogr_dxf_49():
 
     f = lyr.GetFeature(1)
     if f.GetField('Text') != 'super test':
-        gdaltest.post_reason('Wrong Text value on first ATTRIB on first INSERT')
         f.DumpReadable()
-        return 'fail'
+        pytest.fail('Wrong Text value on first ATTRIB on first INSERT')
     if f.GetStyleString() != 'LABEL(f:"Arial",t:"super test",p:2,s:8g,w:234.6,dx:30.293g,c:#ff0000)':
-        gdaltest.post_reason('Wrong style string on first ATTRIB on first INSERT')
         f.DumpReadable()
-        return 'fail'
+        pytest.fail('Wrong style string on first ATTRIB on first INSERT')
 
     f = lyr.GetFeature(4)
     geom = f.GetGeometryRef()
@@ -3353,9 +3315,8 @@ def test_ogr_dxf_49():
 
     f = lyr.GetFeature(5)
     if f.GetField('Text') != '':
-        gdaltest.post_reason('Wrong Text value on ATTRIB on second INSERT')
         f.DumpReadable()
-        return 'fail'
+        pytest.fail('Wrong Text value on ATTRIB on second INSERT')
 
     # No inlining
     gdal.SetConfigOption('DXF_INLINE_BLOCKS', 'FALSE')
@@ -3366,29 +3327,25 @@ def test_ogr_dxf_49():
 
     f = lyr.GetFeature(0)
     if f.GetField('BlockAttributes') != ['MYATT1 super test', 'MYATTMULTI_001 Corps', 'MYATTMULTI_002 plpl']:
-        gdaltest.post_reason('Wrong BlockAttributes value on first INSERT')
         f.DumpReadable()
-        return 'fail'
+        pytest.fail('Wrong BlockAttributes value on first INSERT')
 
     f = lyr.GetFeature(1)
     if f.GetField('BlockAttributes') != ['MYATTMULTI ']:
-        gdaltest.post_reason('Wrong BlockAttributes value on second INSERT')
         f.DumpReadable()
-        return 'fail'
+        pytest.fail('Wrong BlockAttributes value on second INSERT')
 
     lyr = ds.GetLayerByName('blocks')
 
     f = lyr.GetFeature(1)
     if f.GetField('AttributeTag') != 'MYATT1':
-        gdaltest.post_reason('Wrong AttributeTag value on first ATTDEF')
         f.DumpReadable()
-        return 'fail'
+        pytest.fail('Wrong AttributeTag value on first ATTDEF')
 
     f = lyr.GetFeature(2)
     if f.GetField('AttributeTag') != 'MYATTMULTI':
-        gdaltest.post_reason('Wrong AttributeTag value on second ATTDEF')
         f.DumpReadable()
-        return 'fail'
+        pytest.fail('Wrong AttributeTag value on second ATTDEF')
 
     return 'success'
 
@@ -3408,46 +3365,40 @@ def test_ogr_dxf_50():
     # inside block inserted on a blue layer
     f = lyr.GetFeature(0)
     if f.GetStyleString() != 'LABEL(f:"Times New Roman",bo:1,it:1,t:"Some nice text",p:5,s:10g,w:190,dx:84.3151g,dy:4.88825g,c:#0000ff)':
-        gdaltest.post_reason('Wrong style string on feature 0')
         f.DumpReadable()
-        return 'fail'
+        pytest.fail('Wrong style string on feature 0')
 
     # Polyline, color and linetype ByBlock inside block with red color
     # and ByLayer linetype inserted on a layer with DASHED2 linetype
     f = lyr.GetFeature(1)
     if f.GetStyleString() != 'PEN(c:#ff0000,w:2.1g,p:"2.5g 1.25g")':
-        gdaltest.post_reason('Wrong style string on feature 1')
         f.DumpReadable()
-        return 'fail'
+        pytest.fail('Wrong style string on feature 1')
 
     # Make sure TEXT objects don't inherit anything other than font name,
     # bold and italic from their parent STYLE
     f = lyr.GetFeature(2)
     if f.GetStyleString() != 'LABEL(f:"Times New Roman",bo:1,it:1,t:"Good text",p:1,s:5g,c:#000000)':
-        gdaltest.post_reason('Wrong style string on feature 2')
         f.DumpReadable()
-        return 'fail'
+        pytest.fail('Wrong style string on feature 2')
 
     # Polyline, color ByBlock, inside block inserted on a blue layer
     f = lyr.GetFeature(3)
     if f.GetStyleString() != 'PEN(c:#0000ff,w:2.1g)':
-        gdaltest.post_reason('Wrong style string on feature 3')
         f.DumpReadable()
-        return 'fail'
+        pytest.fail('Wrong style string on feature 3')
 
     # MTEXT stretched 250%, color ByLayer inside block inserted on a blue layer
     f = lyr.GetFeature(4)
     if f.GetStyleString() != 'LABEL(f:"Times New Roman",bo:1,it:1,t:"Some nice MTEXT",s:10g,w:250,p:8,c:#0000ff)':
-        gdaltest.post_reason('Wrong style string on feature 4')
         f.DumpReadable()
-        return 'fail'
+        pytest.fail('Wrong style string on feature 4')
 
     # Individually invisible object should be invisible
     f = lyr.GetFeature(5)
     if f.GetStyleString() != 'LABEL(f:"Times New Roman",bo:1,it:1,t:"Invisible text",p:1,s:5g,c:#00000000)':
-        gdaltest.post_reason('Wrong style string on feature 5')
         f.DumpReadable()
-        return 'fail'
+        pytest.fail('Wrong style string on feature 5')
 
     return 'success'
 
@@ -3468,14 +3419,12 @@ def test_ogr_dxf_51():
         f = lyr.GetNextFeature()
 
         if ogrtest.check_feature_geometry(f, 'POINT Z (2.83231568033604 5.98356393304499 0)') != 0:
-            gdaltest.post_reason('Wrong geometry on feature %d' % x)
             f.DumpReadable()
-            return 'fail'
+            pytest.fail('Wrong geometry on feature %d' % x)
 
         if sorted(f.GetStyleString()[6:-1].split(',')) != wanted_style:
-            gdaltest.post_reason('Wrong style string on feature %d' % x)
             f.DumpReadable()
-            return 'fail'
+            pytest.fail('Wrong style string on feature %d' % x)
 
     return 'success'
 
@@ -3491,109 +3440,94 @@ def test_ogr_dxf_52():
     # HELIX
     f = lyr.GetNextFeature()
     if f.GetField('SubClasses') != 'AcDbEntity:AcDbSpline:AcDbHelix':
-        gdaltest.post_reason('Wrong SubClasses on HELIX')
         f.DumpReadable()
-        return 'fail'
+        pytest.fail('Wrong SubClasses on HELIX')
     if ogrtest.check_feature_geometry(f, 'LINESTRING (150 120,149.345876458438 119.778561209114,148.706627788813 119.535836602547,148.082773142501 119.272634882071,147.474831670876 118.989764749454,146.883322525316 118.688034906466,146.308764857195 118.368254054878,145.75167781789 118.03123089646,145.212580558776 117.677774132981,144.691992231228 117.308692466212,144.190431986623 116.924794597921,143.708418976337 116.52688922988,143.246472351745 116.115785063858,142.805226682224 115.692350328976,142.385468357145 115.257680939095,141.987209053809 114.8126724387,141.610382578047 114.358190780749,141.254922735687 113.895101918197,140.920763332559 113.424271804003,140.607838174492 112.946566391121,140.316081067316 112.46285163251,140.04542581686 111.973993481125,139.795806228954 111.480857889924,139.567156109426 110.984310811863,139.359409264107 110.4852181999,139.172499498825 109.98444600699,139.00636061941 109.482860186091,138.860926431692 108.981326690159,138.7361307415 108.480711472151,138.631907354662 107.981880485024,138.54819007701 107.485699681734,138.484912714371 106.993035015239,138.442009072576 106.504752438495,138.419412957453 106.021717904458,138.41678542913 105.544991394258,138.433333223564 105.075482938615,138.468434844937 104.613670677827,138.521471087835 104.160029888371,138.59182274684 103.715035846723,138.678870616536 103.27916382936,138.781995491508 102.852889112758,138.900578166339 102.436686973394,139.033999435614 102.031032687745,139.181640093916 101.636401532287,139.342880935829 101.253268783496,139.517102755937 100.882109717849,139.703686348824 100.523399611823,139.902012509075 100.177613741895,140.111462031272 99.8452273845396,140.33141571 99.5267158162348,140.561254339843 99.2225543134567,140.800358715385 98.933218152682,141.04810963121 98.6591826103871,141.303887881901 98.4009229630486,141.567055122443 98.1589144355755,141.836465751876 97.9334729764931,142.111203876514 97.7245055448538,142.390570491032 97.5318567084626,142.673866590107 97.3553710351246,142.960393168413 97.194893092645,143.249451220625 97.0502674488286,143.54034174142 96.9213386714808,143.832365725473 96.8079513284064,144.124824167458 96.7099499874106,144.417018062052 96.6271792162984,144.708248403929 96.5594835828749,144.997816187765 96.5067076549452,145.285022408236 96.4686960003143,145.569168060017 96.4452931867873,145.849554137782 96.4363437821692,146.125481636209 96.4416923542652,146.396251549971 96.4611834708803,146.661164873745 96.4946616998195,146.919522602205 96.5419716088879,147.170625730027 96.6029577658907,147.413708536343 96.6773765373194,147.64790100184 96.7644518356677,147.872845806317 96.8635266377703,148.088244263586 96.9739879715066,148.293797687463 97.0952228647559,148.48920739176 97.2266183453974,148.674174690292 97.3675614413103,148.848400896871 97.5174391803741,149.011587325312 97.675638590468,149.163435289429 97.8415466994713,149.303646103034 98.0145505352631,149.431921079943 98.194037125723,149.547961533967 98.37939349873,149.651468778922 98.5700066821635,149.742144128621 98.7652637039028,149.819688896877 98.9645515918272,149.883804397505 99.1672573738159,149.934191944317 99.3727680777483,149.970552851128 99.5804707315036,149.992588431751 99.7897523629611,150 100)') != 0:
-        gdaltest.post_reason('Wrong geometry on HELIX')
         f.DumpReadable()
-        return 'fail'
+        pytest.fail('Wrong geometry on HELIX')
 
     # TRACE
     f = lyr.GetNextFeature()
     if ogrtest.check_feature_geometry(f, 'POLYGON ((150.0 120.5,150.0 119.5,200.0 119.5,200.0 120.5,150.0 120.5))') != 0:
-        gdaltest.post_reason('Wrong geometry on TRACE')
         f.DumpReadable()
-        return 'fail'
+        pytest.fail('Wrong geometry on TRACE')
 
     # HATCH with a spline boundary path (and OCS as well, just for fun)
     f = lyr.GetNextFeature()
     if ogrtest.check_feature_geometry(f, 'POLYGON Z ((47.6969600708475 60.0 15,47.6969600708475 0.0 15,46.1103652823066 -0.466958240734954 14.5010390223444,44.5309994192688 -0.919910449553494 14.0043514365868,42.9660914072371 -1.34485059453921 13.5122106346236,41.4228701717145 -1.72777264377568 13.0268900083519,39.9085646382042 -2.0546705653465 12.5506629496691,38.4304037322091 -2.31153832733525 12.0858028504722,36.9956163792324 -2.48436989782552 11.6345831026584,35.6114315047771 -2.55915924490089 11.1992770981251,34.2850780343463 -2.52190033664495 10.7821582287693,33.0237848934429 -2.3585871411413 10.3854998864882,31.8347810075701 -2.0552136264735 10.011575463179,30.725295302231 -1.59777376072516 9.66265835073903,29.7025567029285 -0.972261511979859 9.34102194106535,28.7737941351658 -0.164670848321179 9.04893962605519,27.9445456607789 0.835923776643351 8.78815304558283,27.2086691364137 2.01916842728349 8.55673058492536,26.5550905172208 3.36572402537053 8.35118961809371,25.9727183005027 4.85621968724478 8.1680420288596,25.450460983562 6.47128452924656 8.00379970099481,24.9772270637013 8.19154766771616 7.85497451827107,24.5419250382231 9.99763821899391 7.71807836446012,24.1334634044299 11.8701852994201 7.58962312333373,23.7407506596245 13.7898180253351 7.46612067866363,23.3526953011092 15.7371655130791 7.34408291422158,22.9582058261868 17.6928568789925 7.22002171377933,22.5461907321598 19.6375212394157 7.09044896110861,22.1055585163308 21.5517877106888 6.95187653998118,21.6252176760022 23.4162854091522 6.80081633416879,21.0940767084768 25.2116434511463 6.63378022744318,20.501044111057 26.9184909530113 6.44728010357611,19.8350283810455 28.5174570310876 6.23782784633932,19.0849380157448 29.9891708017154 6.00193533950455,18.2425220975445 31.3190096857923 5.73700778952582,17.3111586046656 32.5117898949509 5.44410752140743,16.2972009340528 33.5773013324584 5.12523258605305,15.2070024839932 34.5253339038266 4.7823810347885,14.046916652774 35.3656775145671 4.41755091893963,12.8232968386826 36.1081220701913 4.0327402898323,11.5424964400062 36.7624574762111 3.62994719879235,10.2108688550319 37.338473638138 3.21116969714562,8.834767482047 37.8459604614835 2.77840583621797,7.42054571933875 38.2947078517594 2.33365366733523,5.97455696519436 38.6945057144772 1.87891124182326,4.50315461790106 39.0551439551486 1.41617661100791,3.01269207574607 39.3864124792851 0.947447826215011,1.50952273701662 39.6981011923983 0.474722938770421,0 40 0,-0.0 40.0 -2.12999999999989e-15,47.6969600708475 60.0 15))') != 0:
-        gdaltest.post_reason('Wrong geometry on HATCH 1')
         f.DumpReadable()
-        return 'fail'
+        pytest.fail('Wrong geometry on HATCH 1')
 
     # Another HATCH with a spline boundary path
     f = lyr.GetNextFeature()
     if ogrtest.check_feature_geometry(f, 'POLYGON ((77.2409948093467 172.430072843974,75.261065049518 171.643815908613,73.2981627172517 170.696359298076,71.3875263981659 169.604375316261,69.5631545040892 168.388782317518,67.8563613292361 167.073645833116,66.2946346031063 165.684923719356,64.9008927779373 164.249191641798,63.6931834376534 162.792474868402,62.6848095284188 161.339284018754,61.8848281190297 159.911914493846,61.298843085132 158.530030785262,60.9300095654357 157.21052494952,60.7801817312349 155.967617443343,60.8511622391671 154.813159397702,61.1453506194465 153.756315627339,61.664528568996 152.803726831033,62.4105189258065 151.964301284269,63.3843801494824 151.249807149788,64.5850174245011 150.674379748575,66.0076885629501 150.253830592488,67.6424701411086 150.004704104407,69.4728079995063 149.943055679116,71.4743351228068 150.082969908572,73.6141841756299 150.434899728198,75.8510314766708 151.003978292885,78.1360638882735 151.788519596984,80.41494916904 152.778958906121,82.6307223520159 153.957467932202,84.7273090430607 155.298400731333,86.6532441052495 156.769592674546,88.3650659486779 158.334376895018,89.8299059955281 159.954044613131,91.0272387483612 161.589690168686,91.957368361883 163.189390065386,92.6421956980388 164.701128484532,93.1110835351921 166.094608264522,93.3942229550992 167.356341648662,93.5189493216415 168.483994478151,93.5079031853763 169.481912548033,93.3782987206629 170.357905428604,93.1417233193846 171.121075154443,92.8040593119231 171.78040251468,92.3652285565357 172.343822183981,91.8186752047856 172.817679470437,91.1571081487304 173.20986823606,90.3766844995721 173.528608818345,89.4716123962251 173.777329886712,88.4346297478537 173.955199520934,87.2580461173156 174.057607166253,85.9350751682361 174.076420167619,84.4616595153474 174.000186427787,82.8389797200317 173.814465060529,81.0767853391384 173.502507153586,79.1975328516125 173.04655812613,77.2409948093467 172.430072843974))') != 0:
-        gdaltest.post_reason('Wrong geometry on HATCH 2')
         f.DumpReadable()
-        return 'fail'
+        pytest.fail('Wrong geometry on HATCH 2')
 
     # Three MLINE objects
     f = lyr.GetNextFeature()
     if ogrtest.check_feature_geometry(f, 'MULTILINESTRING Z ((-3.92232270276368 270.388386486182 0,44.2014737139232 260.763627202844 0),(0 290 0,50 280 0),(50 280 0,54.2440667916678 280.848813358334 0),(66.6666666666666 283.333333333333 0,87.2937093466817 287.458741869336 0),(55.335512192016 260.671024384032 0,83.0445264186877 266.212827229366 0),(97.9166666666667 289.583333333333 0,150 300 0),(93.6674837386727 268.337418693363 0,122.93205511402 274.190332968433 0),(150 300 0,140 260 0),(122.93205511402 274.190332968433 0,120.597149997093 264.850712500727 0))') != 0:
-        gdaltest.post_reason('Wrong geometry on MLINE 1')
         f.DumpReadable()
-        return 'fail'
+        pytest.fail('Wrong geometry on MLINE 1')
 
     f = lyr.GetNextFeature()
     if ogrtest.check_feature_geometry(f, 'MULTILINESTRING Z ((70 290 0,50 250 0),(61.0557280900008 294.472135955 0,41.0557280900008 254.472135955 0))') != 0:
-        gdaltest.post_reason('Wrong geometry on MLINE 2')
         f.DumpReadable()
-        return 'fail'
+        pytest.fail('Wrong geometry on MLINE 2')
 
     f = lyr.GetNextFeature()
     if ogrtest.check_feature_geometry(f, 'MULTILINESTRING Z ((100 300 0,97.9166666666667 289.583333333333 0),(95.7739043877141 304.364619506534 0,92.6051880066742 288.521037601335 0),(91.5478087754281 308.729239013068 0,87.2937093466817 287.458741869336 0),(93.6674837386727 268.337418693363 0,90 250 0),(88.3560050786802 267.275122961365 0,83.7111464107331 244.050829621629 0),(83.0445264186877 266.212827229366 0,77.4222928214662 238.101659243259 0),(90 250 0,160 260 0),(83.7111464107331 244.050829621629 0,165.0 255.663522991525 0),(77.4222928214662 238.101659243259 0,170.0 251.327045983049 0),(160 260 0,160 310 0),(165.0 255.663522991525 0,165.0 315.902302108582 0),(170.0 251.327045983049 0,170.0 321.804604217164 0),(160 310 0,100 300 0),(165.0 315.902302108582 0,95.7739043877141 304.364619506534 0),(170.0 321.804604217164 0,91.5478087754281 308.729239013068 0))') != 0:
-        gdaltest.post_reason('Wrong geometry on MLINE 3')
         f.DumpReadable()
-        return 'fail'
+        pytest.fail('Wrong geometry on MLINE 3')
 
     # INSERT with rows/columns (MInsert)
     minsert_attrib_style = 'LABEL(f:"Arial",t:"N",p:5,a:13,s:8g,w:120,dx:2.21818g,dy:4.61732g,c:#000000)'
 
     f = lyr.GetNextFeature()
     if ogrtest.check_feature_geometry(f, 'LINESTRING (57.7504894565613 50.7437006478524,69.4429302339842 53.4431132999787,71.6924407774228 43.6994126521264,60 41,57.7504894565613 50.7437006478524)') != 0:
-        gdaltest.post_reason('Wrong geometry on INSERT polyline 1')
         f.DumpReadable()
-        return 'fail'
+        pytest.fail('Wrong geometry on INSERT polyline 1')
 
     f = lyr.GetNextFeature()
     if ogrtest.check_feature_geometry(f, 'POINT Z (62.5032851270548 42.604233016948 0)') != 0 \
             or f.GetStyleString() != minsert_attrib_style:
-        gdaltest.post_reason('Wrong geometry on INSERT attribute 1')
         f.DumpReadable()
-        return 'fail'
+        pytest.fail('Wrong geometry on INSERT attribute 1')
 
     for _ in range(2):
         f = lyr.GetNextFeature()
 
     f = lyr.GetNextFeature()
     if ogrtest.check_feature_geometry(f, 'LINESTRING (116.212693343675 64.2407639084843,127.905134121098 66.9401765606106,130.154644664537 57.1964759127583,118.462203887114 54.4970632606319,116.212693343675 64.2407639084843)') != 0:
-        gdaltest.post_reason('Wrong geometry on INSERT polyline 3')
         f.DumpReadable()
-        return 'fail'
+        pytest.fail('Wrong geometry on INSERT polyline 3')
 
     f = lyr.GetNextFeature()
     if ogrtest.check_feature_geometry(f, 'POINT Z (120.965489014169 56.1012962775799 0)') != 0 \
             or f.GetStyleString() != minsert_attrib_style:
-        gdaltest.post_reason('Wrong geometry on INSERT attribute 3')
         f.DumpReadable()
-        return 'fail'
+        pytest.fail('Wrong geometry on INSERT attribute 3')
 
     for _ in range(8):
         f = lyr.GetNextFeature()
 
     f = lyr.GetNextFeature()
     if ogrtest.check_feature_geometry(f, 'LINESTRING (140.944774200355 90.4766968345049,152.637214977778 93.1761094866313,154.886725521217 83.4324088387789,143.194284743794 80.7329961866526,140.944774200355 90.4766968345049)') != 0:
-        gdaltest.post_reason('Wrong geometry on INSERT polyline 8')
         f.DumpReadable()
-        return 'fail'
+        pytest.fail('Wrong geometry on INSERT polyline 8')
 
     f = lyr.GetNextFeature()
     if ogrtest.check_feature_geometry(f, 'POINT Z (145.697569870849 82.3372292036006 0)') != 0 \
             or f.GetStyleString() != minsert_attrib_style:
-        gdaltest.post_reason('Wrong geometry on INSERT attribute 8')
         f.DumpReadable()
-        return 'fail'
+        pytest.fail('Wrong geometry on INSERT attribute 8')
 
     # Also throw in a test of a weird SPLINE generated by a certain CAD package
     # with a knot vector that does not start at zero
     f = lyr.GetNextFeature()
     if ogrtest.check_feature_geometry(f, 'LINESTRING (0 20,0.513272464826192 19.8251653183892,1.00815682586353 19.629626397244,1.48499546839613 19.4132825350102,1.94413077770813 19.1760330301337,2.38590513908363 18.9177771810603,2.81066093780676 18.6384142862359,3.21874055916165 18.3378436441062,3.61048638843241 18.0159645531172,3.98624081090316 17.6726763117148,4.34634621185803 17.3078782183446,4.69114497658114 16.9214695714527,5.02097949035661 16.5133496694848,5.33619213846856 16.0834178108867,5.63712530620111 15.6315732941045,5.92412137883838 15.1577154175837,6.1975227416645 14.6617434797705,6.45767177996359 14.1435567791104,6.70491087901976 13.6030546140496,6.93958242411715 13.0401362830336,7.16202880053986 12.4547010845085,7.37259239357203 11.8466483169201,7.57161558849776 11.2158772787141,7.7594407706012 10.5622872683365,7.93641032516645 9.88577758423314,8.10286663747763 9.18624752484979,8.25915209281888 8.46359638863234,8.4056090764743 7.71772347402662,8.54257997372803 6.94852807947849,8.67040716986418 6.1559095034338,8.78943305016688 5.33976704433838,8.9 4.5)') != 0:
-        gdaltest.post_reason('Wrong geometry on SPLINE')
         f.DumpReadable()
-        return 'fail'
+        pytest.fail('Wrong geometry on SPLINE')
 
     return 'success'
 
@@ -3608,9 +3542,8 @@ def test_ogr_dxf_53():
 
     f = lyr.GetNextFeature()
     if ogrtest.check_feature_geometry(f, 'MULTILINESTRING Z ((290 160 0,310 140 0),(310 160 0,290 140 0))') != 0:
-        gdaltest.post_reason('Wrong feature geometry')
         f.DumpReadable()
-        return 'fail'
+        pytest.fail('Wrong feature geometry')
 
     return 'success'
 
diff --git a/autotest/ogr/ogr_edigeo.py b/autotest/ogr/ogr_edigeo.py
index 753b008a26ef..9a587d5abf8f 100755
--- a/autotest/ogr/ogr_edigeo.py
+++ b/autotest/ogr/ogr_edigeo.py
@@ -36,6 +36,7 @@
 
 import gdaltest
 import ogrtest
+import pytest
 
 ###############################################################################
 
@@ -57,13 +58,13 @@ def test_ogr_edigeo_1():
 
     for filename in filelist:
         if not gdaltest.download_file(base_url + filename, filename):
-            return 'skip'
+            pytest.skip()
 
     try:
         for filename in filelist:
             os.stat('tmp/cache/' + filename)
     except OSError:
-        return 'skip'
+        pytest.skip()
 
     ds = ogr.Open('tmp/cache/E000AB01.THF')
     assert ds.GetLayerCount() == 24
@@ -98,19 +99,19 @@ def test_ogr_edigeo_1():
     feat = lyr.GetNextFeature()
     if ogrtest.check_feature_geometry(feat, 'POINT (877171.28 72489.22)'):
         feat.DumpReadable()
-        return 'fail'
+        pytest.fail()
 
     lyr = ds.GetLayerByName('BATIMENT_id')
     feat = lyr.GetNextFeature()
     if ogrtest.check_feature_geometry(feat, 'POLYGON ((877206.16 71888.82,877193.14 71865.51,877202.95 71860.07,877215.83 71883.5,877206.16 71888.82))'):
         feat.DumpReadable()
-        return 'fail'
+        pytest.fail()
 
     lyr = ds.GetLayerByName('ZONCOMMUNI_id')
     feat = lyr.GetNextFeature()
     if ogrtest.check_feature_geometry(feat, 'LINESTRING (877929.8 71656.39,877922.38 71663.72,877911.48 71669.51,877884.23 71675.64,877783.07 71694.04,877716.31 71706.98,877707.45 71709.71,877702.0 71713.79,877696.89 71719.58,877671.69 71761.82,877607.99 71865.03,877545.32 71959.04,877499.22 72026.82)'):
         feat.DumpReadable()
-        return 'fail'
+        pytest.fail()
 
     ds.Destroy()
 
diff --git a/autotest/ogr/ogr_eeda.py b/autotest/ogr/ogr_eeda.py
index 1bcd9f40db10..420d0aa571a7 100644
--- a/autotest/ogr/ogr_eeda.py
+++ b/autotest/ogr/ogr_eeda.py
@@ -37,6 +37,7 @@
 
 import gdaltest
 import ogrtest
+import pytest
 
 ###############################################################################
 # Find EEDA driver
@@ -47,7 +48,7 @@ def test_eeda_1():
     ogrtest.eeda_drv = ogr.GetDriverByName('EEDA')
 
     if ogrtest.eeda_drv is None:
-        return 'skip'
+        pytest.skip()
 
     gdal.SetConfigOption('CPL_CURL_ENABLE_VSIMEM', 'YES')
 
@@ -60,7 +61,7 @@ def test_eeda_1():
 def test_eeda_2():
 
     if ogrtest.eeda_drv is None:
-        return 'skip'
+        pytest.skip()
 
     gdal.FileFromMemBuffer('/vsimem/ee/projects/earthengine-public/assets/collection:listImages?pageSize=1', json.dumps({
         'assets': [
@@ -168,12 +169,12 @@ def test_eeda_2():
        f.GetField('other_properties') != '{ "another_prop": 3 }' or \
        f.GetGeometryRef().ExportToWkt() != 'MULTIPOLYGON (((2 49,2.1 49.0,2.1 49.1,2.0 49.1,2 49)))':
         f.DumpReadable()
-        return 'fail'
+        pytest.fail()
 
     f = lyr.GetNextFeature()
     if f.GetField('name') != 'projects/earthengine-public/assets/collection/second_feature':
         f.DumpReadable()
-        return 'fail'
+        pytest.fail()
 
     gdal.FileFromMemBuffer('/vsimem/ee/projects/earthengine-public/assets/collection:listImages?pageToken=myToken', json.dumps({
         'assets': [
@@ -186,7 +187,7 @@ def test_eeda_2():
     f = lyr.GetNextFeature()
     if f.GetField('name') != 'projects/earthengine-public/assets/collection/third_feature':
         f.DumpReadable()
-        return 'fail'
+        pytest.fail()
 
     f = lyr.GetNextFeature()
     assert f is None
@@ -196,7 +197,7 @@ def test_eeda_2():
     f = lyr.GetNextFeature()
     if f.GetField('name') != 'projects/earthengine-public/assets/collection/first_feature':
         f.DumpReadable()
-        return 'fail'
+        pytest.fail()
 
     lyr.SetAttributeFilter('EEDA:raw_filter')
 
@@ -311,7 +312,7 @@ def test_eeda_2():
 def test_eeda_3():
 
     if ogrtest.eeda_drv is None:
-        return 'skip'
+        pytest.skip()
 
     gdal.SetConfigOption('EEDA_BEARER', 'mybearer')
     gdal.SetConfigOption('EEDA_URL', '/vsimem/ee/')
@@ -334,7 +335,7 @@ def test_eeda_3():
 def test_eeda_4():
 
     if ogrtest.eeda_drv is None:
-        return 'skip'
+        pytest.skip()
 
     gdal.SetConfigOption('EEDA_BEARER', 'mybearer')
     gdal.SetConfigOption('EEDA_URL', '/vsimem/ee/')
@@ -419,7 +420,7 @@ def test_eeda_4():
 def test_eeda_cleanup():
 
     if ogrtest.eeda_drv is None:
-        return 'skip'
+        pytest.skip()
 
     gdal.SetConfigOption('CPL_CURL_ENABLE_VSIMEM', None)
     gdal.SetConfigOption('EEDA_BEARER', None)
diff --git a/autotest/ogr/ogr_elasticsearch.py b/autotest/ogr/ogr_elasticsearch.py
index 4027d7d68920..966435adeac7 100755
--- a/autotest/ogr/ogr_elasticsearch.py
+++ b/autotest/ogr/ogr_elasticsearch.py
@@ -36,6 +36,7 @@
 from osgeo import gdal
 from osgeo import ogr
 from osgeo import osr
+import pytest
 
 ###############################################################################
 # Test driver availability
@@ -50,7 +51,7 @@ def test_ogr_elasticsearch_init():
 
     ogrtest.elasticsearch_drv = ogr.GetDriverByName('ElasticSearch')
     if ogrtest.elasticsearch_drv is None:
-        return 'skip'
+        pytest.skip()
 
     gdal.SetConfigOption('CPL_CURL_ENABLE_VSIMEM', 'YES')
 
@@ -62,7 +63,7 @@ def test_ogr_elasticsearch_init():
 
 def test_ogr_elasticsearch_nonexistent_server():
     if ogrtest.elasticsearch_drv is None:
-        return 'skip'
+        pytest.skip()
 
     with gdaltest.error_handler():
         ds = ogrtest.elasticsearch_drv.CreateDataSource(
@@ -106,7 +107,7 @@ def test_ogr_elasticsearch_nonexistent_server():
 
 def test_ogr_elasticsearch_1():
     if ogrtest.elasticsearch_drv is None:
-        return 'skip'
+        pytest.skip()
 
     gdal.FileFromMemBuffer("/vsimem/fakeelasticsearch",
                            """{"version":{"number":"2.0.0"}}""")
@@ -346,7 +347,7 @@ def test_ogr_elasticsearch_1():
 
 def test_ogr_elasticsearch_2():
     if ogrtest.elasticsearch_drv is None:
-        return 'skip'
+        pytest.skip()
 
     ds = ogrtest.elasticsearch_drv.CreateDataSource(
         "/vsimem/fakeelasticsearch")
@@ -391,7 +392,7 @@ def test_ogr_elasticsearch_2():
 
 def test_ogr_elasticsearch_3():
     if ogrtest.elasticsearch_drv is None:
-        return 'skip'
+        pytest.skip()
 
     ds = ogrtest.elasticsearch_drv.CreateDataSource(
         "/vsimem/fakeelasticsearch")
@@ -435,7 +436,7 @@ def test_ogr_elasticsearch_3():
 
 def test_ogr_elasticsearch_4():
     if ogrtest.elasticsearch_drv is None:
-        return 'skip'
+        pytest.skip()
 
     with gdaltest.error_handler():
         ds = ogr.Open('ES:/vsimem/fakeelasticsearch')
@@ -726,7 +727,7 @@ def test_ogr_elasticsearch_4():
        f['a_geopoint'].ExportToWkt() != 'POINT (2 49)' or \
        f['a_geoshape'].ExportToWkt() != 'LINESTRING (2 49,3 50)':
         f.DumpReadable()
-        return 'fail'
+        pytest.fail()
 
     lyr.ResetReading()
     lyr.GetNextFeature()
@@ -885,7 +886,7 @@ def test_ogr_elasticsearch_4():
     f = sql_lyr.GetNextFeature()
     if f['some_field'] != '5':
         f.DumpReadable()
-        return 'fail'
+        pytest.fail()
     ds.ReleaseResultSet(sql_lyr)
 
     # Invalid index
@@ -978,7 +979,7 @@ def test_ogr_elasticsearch_4():
 
 def test_ogr_elasticsearch_5():
     if ogrtest.elasticsearch_drv is None:
-        return 'skip'
+        pytest.skip()
 
     gdal.FileFromMemBuffer("/vsimem/fakeelasticsearch/_stats",
                            """{"_shards":{"total":0,"successful":0,"failed":0},"indices":{}}""")
@@ -1121,7 +1122,7 @@ def test_ogr_elasticsearch_5():
        f['superobject.another_geoshape'].ExportToWkt() != 'POINT (3 50)' or \
        f['superobject.another_geoshape2'].ExportToWkt() != 'POINT (2 50)':
         f.DumpReadable()
-        return 'fail'
+        pytest.fail()
 
     f['_id'] = 'my_id'
     gdal.FileFromMemBuffer(
@@ -1132,18 +1133,18 @@ def test_ogr_elasticsearch_5():
     f = lyr.GetNextFeature()
     if f['another_geopoint'].ExportToWkt() != 'POINT (2.1 49.1)':
         f.DumpReadable()
-        return 'fail'
+        pytest.fail()
 
     f = lyr.GetNextFeature()
     if f['another_geopoint'].ExportToWkt() != 'POINT (2.2 49.2)':
         f.DumpReadable()
-        return 'fail'
+        pytest.fail()
 
     # Test geohash
     f = lyr.GetNextFeature()
     if ogrtest.check_feature_geometry(f['another_geopoint'], 'POINT (2 49)') != 0:
         f.DumpReadable()
-        return 'fail'
+        pytest.fail()
 
     f = None
     lyr.CreateField(ogr.FieldDefn('superobject.subfield2', ogr.OFTString))
@@ -1171,7 +1172,7 @@ def test_ogr_elasticsearch_5():
        f['a_geoshape'].ExportToWkt() != 'LINESTRING (2 49,3 50)' or \
        f['superobject.another_geoshape'].ExportToWkt() != 'POINT (3 50)':
         f.DumpReadable()
-        return 'fail'
+        pytest.fail()
 
     ds = gdal.OpenEx("ES:/vsimem/fakeelasticsearch", open_options=[
                      'FEATURE_COUNT_TO_ESTABLISH_FEATURE_DEFN=0', 'FLATTEN_NESTED_ATTRIBUTES=FALSE'])
@@ -1184,7 +1185,7 @@ def test_ogr_elasticsearch_5():
        f['a_geopoint'].ExportToWkt() != 'POINT (2 49)' or \
        f['a_geoshape'].ExportToWkt() != 'LINESTRING (2 49,3 50)':
         f.DumpReadable()
-        return 'fail'
+        pytest.fail()
 
     ds = gdal.OpenEx("ES:/vsimem/fakeelasticsearch",
                      gdal.OF_UPDATE, open_options=['JSON_FIELD=YES'])
@@ -1197,7 +1198,7 @@ def test_ogr_elasticsearch_5():
        f['a_geoshape'].ExportToWkt() != 'LINESTRING (2 49,3 50)' or \
        f['superobject.another_geoshape'].ExportToWkt() != 'POINT (3 50)':
         f.DumpReadable()
-        return 'fail'
+        pytest.fail()
 
     f['_id'] = 'my_id'
     f['_json'] = '{ "foo": "bar" }'
@@ -1214,7 +1215,7 @@ def test_ogr_elasticsearch_5():
 
 def test_ogr_elasticsearch_6():
     if ogrtest.elasticsearch_drv is None:
-        return 'skip'
+        pytest.skip()
 
     gdal.FileFromMemBuffer(
         """/vsimem/fakeelasticsearch/_cat/indices?h=i""", 'non_standard_geometries\n')
@@ -1285,23 +1286,23 @@ def test_ogr_elasticsearch_6():
     f = lyr.GetNextFeature()
     if f['geometry'].ExportToWkt() != 'POLYGON ((2 49,3 49,3 50,2 50,2 49))':
         f.DumpReadable()
-        return 'fail'
+        pytest.fail()
 
     f = lyr.GetNextFeature()
     ref_txt = f['geometry'].ExportToWkt()
     if ref_txt.find('POLYGON ((') != 0:
         f.DumpReadable()
-        return 'fail'
+        pytest.fail()
 
     f = lyr.GetNextFeature()
     if f['geometry'].ExportToWkt() != ref_txt:
         f.DumpReadable()
-        return 'fail'
+        pytest.fail()
 
     f = lyr.GetNextFeature()
     if f['geometry'].ExportToWkt() != ref_txt:
         f.DumpReadable()
-        return 'fail'
+        pytest.fail()
 
     return 'success'
 
@@ -1311,7 +1312,7 @@ def test_ogr_elasticsearch_6():
 
 def test_ogr_elasticsearch_7():
     if ogrtest.elasticsearch_drv is None:
-        return 'skip'
+        pytest.skip()
 
     gdal.FileFromMemBuffer("/vsimem/fakeelasticsearch/_stats",
                            """{"_shards":{"total":0,"successful":0,"failed":0},"indices":{}}""")
@@ -1344,7 +1345,7 @@ def test_ogr_elasticsearch_7():
 
 def test_ogr_elasticsearch_8():
     if ogrtest.elasticsearch_drv is None:
-        return 'skip'
+        pytest.skip()
 
     gdal.FileFromMemBuffer("/vsimem/fakeelasticsearch/_stats",
                            """{"_shards":{"total":0,"successful":0,"failed":0},"indices":{}}""")
@@ -1400,7 +1401,7 @@ def test_ogr_elasticsearch_8():
 
 def test_ogr_elasticsearch_9():
     if ogrtest.elasticsearch_drv is None:
-        return 'skip'
+        pytest.skip()
 
     ogr_elasticsearch_delete_files()
 
@@ -1508,7 +1509,7 @@ def test_ogr_elasticsearch_9():
 
 def test_ogr_elasticsearch_10():
     if ogrtest.elasticsearch_drv is None:
-        return 'skip'
+        pytest.skip()
 
     ogr_elasticsearch_delete_files()
 
@@ -2101,7 +2102,7 @@ def test_ogr_elasticsearch_10():
 
 def test_ogr_elasticsearch_11():
     if ogrtest.elasticsearch_drv is None:
-        return 'skip'
+        pytest.skip()
 
     ogr_elasticsearch_delete_files()
 
@@ -2185,17 +2186,17 @@ def test_ogr_elasticsearch_11():
     f = lyr.GetNextFeature()
     if f['str_field'] != 'foo':
         f.DumpReadable()
-        return 'fail'
+        pytest.fail()
 
     f = lyr.GetNextFeature()
     if f['str_field'] is not None:
         f.DumpReadable()
-        return 'fail'
+        pytest.fail()
 
     f = lyr.GetNextFeature()
     if f.IsFieldSet('str_field'):
         f.DumpReadable()
-        return 'fail'
+        pytest.fail()
 
     gdal.FileFromMemBuffer("""/vsimem/fakeelasticsearch/a_layer/FeatureCollection/_count?pretty""", """{
     "hits":
@@ -2232,7 +2233,7 @@ def test_ogr_elasticsearch_11():
 
 def test_ogr_elasticsearch_authentication():
     if ogrtest.elasticsearch_drv is None:
-        return 'skip'
+        pytest.skip()
 
     ogr_elasticsearch_delete_files()
 
@@ -2302,7 +2303,7 @@ def ogr_elasticsearch_delete_files():
 
 def test_ogr_elasticsearch_cleanup():
     if ogrtest.elasticsearch_drv is None:
-        return 'skip'
+        pytest.skip()
 
     ogr_elasticsearch_delete_files()
 
diff --git a/autotest/ogr/ogr_factory.py b/autotest/ogr/ogr_factory.py
index 7f6252738c68..41a88bb9affc 100755
--- a/autotest/ogr/ogr_factory.py
+++ b/autotest/ogr/ogr_factory.py
@@ -532,10 +532,9 @@ def test_ogr_factory_8():
         if exp_wkt is None:
             exp_wkt = src_wkt
         elif target_type != ogr.wkbUnknown and dst_geom.GetGeometryType() != target_type:
-            print(src_wkt)
             print(target_type)
             print(dst_geom.ExportToWkt())
-            return 'fail'
+            pytest.fail(src_wkt)
 
         if ogrtest.check_feature_geometry(dst_geom, exp_wkt):
             print(src_wkt)
diff --git a/autotest/ogr/ogr_feature.py b/autotest/ogr/ogr_feature.py
index fe00eeeb3211..6f4ceb08e606 100755
--- a/autotest/ogr/ogr_feature.py
+++ b/autotest/ogr/ogr_feature.py
@@ -35,6 +35,7 @@
 from osgeo import gdal
 from osgeo import ogr
 import gdaltest
+import pytest
 
 ###############################################################################
 # Create a destination feature type with one field for each field in the source
@@ -595,7 +596,7 @@ def test_ogr_feature_cp_stringlist():
 
 def test_ogr_feature_unicode():
     if sys.version_info >= (3, 0, 0):
-        return 'skip'
+        pytest.skip()
 
     feat_def = ogr.FeatureDefn('test')
 
@@ -646,13 +647,13 @@ def test_ogr_feature_overflow_64bit_integer():
     gdal.PopErrorHandler()
     if f.GetField(0) != 9223372036854775807:
         f.DumpReadable()
-        return 'fail'
+        pytest.fail()
     gdal.PushErrorHandler()
     f.SetField(0, '-9999999999999999999')
     gdal.PopErrorHandler()
     if f.GetField(0) != -9223372036854775808:
         f.DumpReadable()
-        return 'fail'
+        pytest.fail()
     return 'success'
 
 ###############################################################################
@@ -815,14 +816,14 @@ def test_ogr_feature_default():
        f.GetField('field_int') != 123 or \
        f.IsFieldSet('field_nodefault'):
         f.DumpReadable()
-        return 'fail'
+        pytest.fail()
 
     f = ogr.Feature(feat_def)
     f.SetField('field_string', 'b')
     f.FillUnsetWithDefault()
     if f.GetField('field_string') != 'b':
         f.DumpReadable()
-        return 'fail'
+        pytest.fail()
 
     return 'success'
 
diff --git a/autotest/ogr/ogr_fgdb.py b/autotest/ogr/ogr_fgdb.py
index b5576900ab65..c0ec6d82cf5e 100755
--- a/autotest/ogr/ogr_fgdb.py
+++ b/autotest/ogr/ogr_fgdb.py
@@ -51,7 +51,7 @@ def test_ogr_fgdb_init():
 
     ogrtest.fgdb_drv = ogr.GetDriverByName('FileGDB')
     if ogrtest.fgdb_drv is None:
-        return 'skip'
+        pytest.skip()
 
     ogrtest.openfilegdb_drv = ogr.GetDriverByName('OpenFileGDB')
     if ogrtest.openfilegdb_drv is not None:
@@ -99,7 +99,7 @@ def ogr_fgdb_is_sdk_1_4_or_later():
 
 def test_ogr_fgdb_1():
     if ogrtest.fgdb_drv is None:
-        return 'skip'
+        pytest.skip()
 
     srs = osr.SpatialReference()
     srs.SetFromUserInput("WGS84")
@@ -184,13 +184,11 @@ def test_ogr_fgdb_1():
                 expected_wkt = data[2]
             if expected_wkt is None:
                 if feat.GetGeometryRef() is not None:
-                    print(data)
                     feat.DumpReadable()
-                    return 'fail'
+                    pytest.fail(data)
             elif ogrtest.check_feature_geometry(feat, expected_wkt) != 0:
-                print(data)
                 feat.DumpReadable()
-                return 'fail'
+                pytest.fail(data)
 
         if feat.GetField('id') != 1 or \
            feat.GetField('smallint') != -13 or \
@@ -204,7 +202,7 @@ def test_ogr_fgdb_1():
            feat.GetField('binary2') != "123456" or \
            feat.GetField('smallint2') != -32768:
             feat.DumpReadable()
-            return 'fail'
+            pytest.fail()
 
         sql_lyr = ds.ExecuteSQL("GetLayerDefinition %s" % lyr.GetName())
         assert sql_lyr is not None
@@ -238,7 +236,7 @@ def test_ogr_fgdb_1():
 
 def test_ogr_fgdb_DeleteField():
     if ogrtest.fgdb_drv is None:
-        return 'skip'
+        pytest.skip()
 
     ds = ogr.Open("tmp/test.gdb", update=1)
     lyr = ds.GetLayerByIndex(0)
@@ -292,11 +290,11 @@ def test_ogr_fgdb_DeleteField():
 
 def test_ogr_fgdb_2():
     if ogrtest.fgdb_drv is None:
-        return 'skip'
+        pytest.skip()
 
     import test_cli_utilities
     if test_cli_utilities.get_test_ogrsf_path() is None:
-        return 'skip'
+        pytest.skip()
 
     ret = gdaltest.runexternal(test_cli_utilities.get_test_ogrsf_path() + ' -ro tmp/test.gdb --config OGR_SKIP OpenFileGDB')
 
@@ -310,11 +308,11 @@ def test_ogr_fgdb_2():
 
 def test_ogr_fgdb_3():
     if ogrtest.fgdb_drv is None:
-        return 'skip'
+        pytest.skip()
 
     import test_cli_utilities
     if test_cli_utilities.get_ogr2ogr_path() is None:
-        return 'skip'
+        pytest.skip()
 
     try:
         shutil.rmtree("tmp/poly.gdb")
@@ -328,7 +326,7 @@ def test_ogr_fgdb_3():
     ds = None
 
     if test_cli_utilities.get_test_ogrsf_path() is None:
-        return 'skip'
+        pytest.skip()
 
     ret = gdaltest.runexternal(test_cli_utilities.get_test_ogrsf_path() + ' tmp/poly.gdb')
     # print ret
@@ -343,11 +341,11 @@ def test_ogr_fgdb_3():
 
 def test_ogr_fgdb_sql():
     if ogrtest.fgdb_drv is None:
-        return 'skip'
+        pytest.skip()
 
     import test_cli_utilities
     if test_cli_utilities.get_ogr2ogr_path() is None:
-        return 'skip'
+        pytest.skip()
 
     ds = ogr.Open('tmp/poly.gdb')
 
@@ -370,7 +368,7 @@ def test_ogr_fgdb_sql():
 
 def test_ogr_fgdb_4():
     if ogrtest.fgdb_drv is None:
-        return 'skip'
+        pytest.skip()
 
     for j in range(2):
 
@@ -410,15 +408,14 @@ def test_ogr_fgdb_4():
 
 def test_ogr_fgdb_5():
     if ogrtest.fgdb_drv is None:
-        return 'skip'
+        pytest.skip()
 
     assert ogrtest.fgdb_drv.DeleteDataSource("tmp/test.gdb") == 0, \
         'DeleteDataSource() failed'
 
     try:
         os.stat("tmp/test.gdb")
-        gdaltest.post_reason("tmp/test.gdb still existing")
-        return 'fail'
+        pytest.fail("tmp/test.gdb still existing")
     except OSError:
         pass
 
@@ -430,7 +427,7 @@ def test_ogr_fgdb_5():
 
 def test_ogr_fgdb_6():
     if ogrtest.fgdb_drv is None:
-        return 'skip'
+        pytest.skip()
 
     srs = osr.SpatialReference()
     srs.SetFromUserInput("WGS84")
@@ -452,7 +449,7 @@ def test_ogr_fgdb_6():
 
 def test_ogr_fgdb_7():
     if ogrtest.fgdb_drv is None:
-        return 'skip'
+        pytest.skip()
 
     try:
         shutil.rmtree("tmp/test.gdb")
@@ -489,7 +486,7 @@ def test_ogr_fgdb_7():
 
 def test_ogr_fgdb_8():
     if ogrtest.fgdb_drv is None:
-        return 'skip'
+        pytest.skip()
 
     try:
         shutil.rmtree("tmp/test.gdb")
@@ -527,7 +524,7 @@ def test_ogr_fgdb_8():
 
 def test_ogr_fgdb_9():
     if ogrtest.fgdb_drv is None:
-        return 'skip'
+        pytest.skip()
 
     try:
         shutil.rmtree("tmp/test.gdb")
@@ -573,7 +570,7 @@ def test_ogr_fgdb_9():
 
 def test_ogr_fgdb_10():
     if ogrtest.fgdb_drv is None:
-        return 'skip'
+        pytest.skip()
 
     try:
         shutil.rmtree("tmp/test.gdb")
@@ -666,7 +663,7 @@ def test_ogr_fgdb_10():
 
 def test_ogr_fgdb_11():
     if ogrtest.fgdb_drv is None:
-        return 'skip'
+        pytest.skip()
 
     try:
         shutil.rmtree("tmp/test.gdb")
@@ -716,18 +713,18 @@ def test_ogr_fgdb_11():
        feat.GetField('esriFieldTypeGUID') != '{12345678-9ABC-DEF0-1234-567890ABCDEF}' or \
        (not feat.IsFieldSet('esriFieldTypeGlobalID')):
         feat.DumpReadable()
-        return 'fail'
+        pytest.fail()
 
     feat = lyr.GetNextFeature()
     if not feat.IsFieldSet('esriFieldTypeGlobalID'):
         feat.DumpReadable()
-        return 'fail'
+        pytest.fail()
 
     lyr = ds.GetLayerByName('test2')
     feat = lyr.GetNextFeature()
     if not feat.IsFieldSet('global_id'):
         feat.DumpReadable()
-        return 'fail'
+        pytest.fail()
 
     ds = None
 
@@ -739,7 +736,7 @@ def test_ogr_fgdb_11():
 
 def test_ogr_fgdb_12():
     if ogrtest.fgdb_drv is None:
-        return 'skip'
+        pytest.skip()
 
     ds = ogr.Open('tmp/non_existing.gdb')
     assert ds is None
@@ -775,7 +772,7 @@ def test_ogr_fgdb_12():
 
 def test_ogr_fgdb_13():
     if ogrtest.fgdb_drv is None:
-        return 'skip'
+        pytest.skip()
 
     gdal.PushErrorHandler('CPLQuietErrorHandler')
     ds = ogrtest.fgdb_drv.CreateDataSource('tmp/foo')
@@ -817,7 +814,7 @@ def test_ogr_fgdb_13():
 
 def test_ogr_fgdb_14():
     if ogrtest.fgdb_drv is None:
-        return 'skip'
+        pytest.skip()
 
     for _ in range(3):
         ds1 = ogr.Open("tmp/test.gdb")
@@ -835,7 +832,7 @@ def test_ogr_fgdb_14():
 
 def test_ogr_fgdb_15():
     if ogrtest.fgdb_drv is None:
-        return 'skip'
+        pytest.skip()
 
     try:
         shutil.rmtree('tmp/test3005.gdb')
@@ -859,7 +856,7 @@ def test_ogr_fgdb_15():
 
 def test_ogr_fgdb_16():
     if ogrtest.fgdb_drv is None or ogrtest.openfilegdb_drv is None:
-        return 'skip'
+        pytest.skip()
 
     try:
         gdaltest.unzip('tmp/cache', 'data/ESSENCE_NAIPF_ORI_PROV_sub93.gdb.zip')
@@ -868,7 +865,7 @@ def test_ogr_fgdb_16():
     try:
         os.stat('tmp/cache/ESSENCE_NAIPF_ORI_PROV_sub93.gdb')
     except OSError:
-        return 'skip'
+        pytest.skip()
 
     ogrtest.fgdb_drv.Deregister()
 
@@ -896,7 +893,7 @@ def test_ogr_fgdb_16():
 def test_ogr_fgdb_17():
 
     if ogrtest.fgdb_drv is None:
-        return 'skip'
+        pytest.skip()
 
     try:
         shutil.rmtree("tmp/test.gdb")
@@ -958,7 +955,7 @@ def test_ogr_fgdb_17():
 def test_ogr_fgdb_18():
 
     if ogrtest.fgdb_drv is None:
-        return 'skip'
+        pytest.skip()
 
     try:
         shutil.rmtree("tmp/test.gdb")
@@ -1028,7 +1025,7 @@ def ogr_fgdb_18_test_results():
        not f.IsFieldNull('field_nodefault') or not f.IsFieldSet('field_datetime') or \
        f.GetField('field_datetime2') != '2015/06/30 12:34:56':
         f.DumpReadable()
-        return 'fail'
+        pytest.fail()
     ds = None
 
     return 'success'
@@ -1063,14 +1060,14 @@ def ogr_fgdb_19_open_update(filename):
 def test_ogr_fgdb_19():
 
     if ogrtest.fgdb_drv is None:
-        return 'skip'
+        pytest.skip()
 
     # FIXME likely due to too old FileGDB SDK on those targets
     # fails with ERROR 1: Failed to open Geodatabase (The system cannot find the file specified.)
     # File "ogr_fgdb.py", line 1664, in ogr_fgdb_19
     # if ds.StartTransaction(force=True) != 0:
     if gdaltest.is_travis_branch('ubuntu_1804') or gdaltest.is_travis_branch('ubuntu_1604') or gdaltest.is_travis_branch('trusty_clang') or gdaltest.is_travis_branch('python3') or gdaltest.is_travis_branch('trunk_with_coverage'):
-        return 'skip'
+        pytest.skip()
 
     try:
         shutil.rmtree("tmp/test.gdb.ogrtmp")
@@ -1140,10 +1137,10 @@ def test_ogr_fgdb_19():
     try:
         os.stat('tmp/test.gdb.ogredited')
     except OSError:
-        return 'fail'
+        pytest.fail()
     try:
         os.stat('tmp/test.gdb.ogrtmp')
-        return 'fail'
+        pytest.fail()
     except OSError:
         pass
 
@@ -1211,13 +1208,13 @@ def test_ogr_fgdb_19():
 
     try:
         os.stat('tmp/test.gdb.ogredited')
-        return 'fail'
+        pytest.fail()
     except OSError:
         pass
 
     try:
         os.stat('tmp/test.gdb.ogrtmp')
-        return 'fail'
+        pytest.fail()
     except OSError:
         pass
 
@@ -1264,13 +1261,13 @@ def test_ogr_fgdb_19():
 
     try:
         os.stat('tmp/test.gdb.ogredited')
-        return 'fail'
+        pytest.fail()
     except OSError:
         pass
 
     try:
         os.stat('tmp/test.gdb.ogrtmp')
-        return 'fail'
+        pytest.fail()
     except OSError:
         pass
 
@@ -1473,8 +1470,7 @@ def test_ogr_fgdb_19():
             if case == 'CASE4':
                 try:
                     os.stat('tmp/test.gdb.ogredited')
-                    print(case)
-                    return 'fail'
+                    pytest.fail(case)
                 except OSError:
                     pass
             else:
@@ -1602,15 +1598,15 @@ def test_ogr_fgdb_19():
 def test_ogr_fgdb_19bis():
 
     if ogrtest.fgdb_drv is None:
-        return 'skip'
+        pytest.skip()
 
     if gdaltest.is_travis_branch('ubuntu_1804') or gdaltest.is_travis_branch('ubuntu_1604') or gdaltest.is_travis_branch('trusty_clang') or gdaltest.is_travis_branch('python3') or gdaltest.is_travis_branch('trunk_with_coverage'):
-        return 'skip'
+        pytest.skip()
 
     (bPerLayerCopyingForTransaction, ds) = ogr_fgdb_19_open_update('tmp/test.gdb')
     del ds
     if not bPerLayerCopyingForTransaction:
-        return 'skip'
+        pytest.skip()
 
     gdal.SetConfigOption('FGDB_PER_LAYER_COPYING_TRANSACTION', 'FALSE')
     ret = test_ogr_fgdb_19()
@@ -1624,13 +1620,13 @@ def test_ogr_fgdb_19bis():
 def test_ogr_fgdb_20():
 
     if ogrtest.fgdb_drv is None:
-        return 'skip'
+        pytest.skip()
 
     if ogrtest.openfilegdb_drv is None:
-        return 'skip'
+        pytest.skip()
 
     if gdaltest.is_travis_branch('ubuntu_1804') or gdaltest.is_travis_branch('ubuntu_1604') or gdaltest.is_travis_branch('trusty_clang') or gdaltest.is_travis_branch('python3') or gdaltest.is_travis_branch('trunk_with_coverage'):
-        return 'skip'
+        pytest.skip()
 
     if not os.path.exists('tmp/test.gdb'):
         ds = ogrtest.fgdb_drv.CreateDataSource("tmp/test.gdb")
@@ -1676,7 +1672,7 @@ def test_ogr_fgdb_20():
     ret = lyr.CreateFeature(f)
     if ret != 0 or f.GetFID() != 2 or lyr.GetMetadataItem('2', 'MAP_OGR_FID_TO_FGDB_FID') is not None:
         f.DumpReadable()
-        return 'fail'
+        pytest.fail()
 
     # OGR FID = 4, FileGDB FID = 3
     f = ogr.Feature(lyr.GetLayerDefn())
@@ -1694,8 +1690,7 @@ def test_ogr_fgdb_20():
     ret = lyr.CreateFeature(f)
     if ret != 0 or f.GetFID() != 4 or lyr.GetMetadataItem('4', 'MAP_OGR_FID_TO_FGDB_FID') != '3':
         f.DumpReadable()
-        print(lyr.GetMetadataItem('4', 'MAP_OGR_FID_TO_FGDB_FID'))
-        return 'fail'
+        pytest.fail(lyr.GetMetadataItem('4', 'MAP_OGR_FID_TO_FGDB_FID'))
 
     #  Cannot open geodatabase at the moment since it is in 'FID hack mode'
     gdal.PushErrorHandler()
@@ -1727,7 +1722,7 @@ def test_ogr_fgdb_20():
     ret = lyr.CreateFeature(f)
     if ret != 0 or f.GetFID() != 3 or lyr.GetMetadataItem('3', 'MAP_OGR_FID_TO_FGDB_FID') != '4':
         f.DumpReadable()
-        return 'fail'
+        pytest.fail()
 
     lyr.ResetReading()
     expected = [(1, None), (2, None), (4, 3), (3, 4)]
@@ -1740,21 +1735,19 @@ def test_ogr_fgdb_20():
             assert f is not None
             if f.GetFID() != fid or f.GetField('id') != fid:
                 f.DumpReadable()
-                print(fid)
-                return 'fail'
+                pytest.fail(fid)
             got_fgdb_fid = lyr.GetMetadataItem(str(f.GetFID()), 'MAP_OGR_FID_TO_FGDB_FID')
             if got_fgdb_fid is None:
                 assert fgdb_fid is None
             elif int(got_fgdb_fid) != fgdb_fid:
-                print(got_fgdb_fid)
                 print(fgdb_fid)
-                return 'fail'
+                pytest.fail(got_fgdb_fid)
 
     for fid in [-9876543210, 0, 100]:
         f = lyr.GetFeature(fid)
         if f is not None:
             f.DumpReadable()
-            return 'fail'
+            pytest.fail()
 
     for invalid_fid in [-2, 0, 9876543210]:
         f = ogr.Feature(lyr.GetLayerDefn())
@@ -1785,16 +1778,15 @@ def test_ogr_fgdb_20():
         ret = lyr.CreateFeature(f)
         if ret != 0 or f.GetFID() != fid or str(lyr.GetMetadataItem(str(fid), 'MAP_OGR_FID_TO_FGDB_FID')) != str(fgdb_fid):
             f.DumpReadable()
-            print(fid)
             print(lyr.GetMetadataItem(str(fid), 'MAP_OGR_FID_TO_FGDB_FID'))
-            return 'fail'
+            pytest.fail(fid)
 
     # Normally 12 should be attributed, but it has already been reserved
     f = ogr.Feature(lyr.GetLayerDefn())
     ret = lyr.CreateFeature(f)
     if ret != 0 or f.GetFID() != 13:
         f.DumpReadable()
-        return 'fail'
+        pytest.fail()
     f.SetField('id', f.GetFID())
     lyr.SetFeature(f)
 
@@ -1805,16 +1797,15 @@ def test_ogr_fgdb_20():
         assert f is not None
         if f.GetFID() != fid or f.GetField('id') != fid or str(lyr.GetMetadataItem(str(fid), 'MAP_OGR_FID_TO_FGDB_FID')) != str(fgdb_fid):
             f.DumpReadable()
-            print(fid)
             print(lyr.GetMetadataItem(str(fid), 'MAP_OGR_FID_TO_FGDB_FID'))
-            return 'fail'
+            pytest.fail(fid)
 
     lyr.SetAttributeFilter('id = 3')
     lyr.ResetReading()
     f = lyr.GetNextFeature()
     if f.GetFID() != 3:
         f.DumpReadable()
-        return 'fail'
+        pytest.fail()
 
     # This will cause a resync of indexes
     lyr.SetAttributeFilter('OBJECTID = 3')
@@ -1822,7 +1813,7 @@ def test_ogr_fgdb_20():
     f = lyr.GetNextFeature()
     if f.GetFID() != 3:
         f.DumpReadable()
-        return 'fail'
+        pytest.fail()
 
     # No sparse pages
     lyr = ds.CreateLayer('ogr_fgdb_20_simple', geom_type=ogr.wkbNone)
@@ -1838,7 +1829,7 @@ def test_ogr_fgdb_20():
     f = sql_lyr.GetNextFeature()
     if f.GetFID() != 2:
         f.DumpReadable()
-        return 'fail'
+        pytest.fail()
 
     # Do not allow user set FID while a select layer is in progress
     f = ogr.Feature(lyr.GetLayerDefn())
@@ -1894,8 +1885,7 @@ def test_ogr_fgdb_20():
             assert f is not None, fid
             if f.GetFID() != fid or f.GetField('id') != fid:
                 f.DumpReadable()
-                print(fid)
-                return 'fail'
+                pytest.fail(fid)
 
         for fid in expected:
             lyr.SetAttributeFilter('id = %d' % fid)
@@ -1903,8 +1893,7 @@ def test_ogr_fgdb_20():
             f = lyr.GetNextFeature()
             if f.GetFID() != fid or f.GetField('id') != fid:
                 f.DumpReadable()
-                print(fid)
-                return 'fail'
+                pytest.fail(fid)
 
         lyr = ds.GetLayerByName('ogr_fgdb_20_simple')
         f = lyr.GetNextFeature()
@@ -1941,8 +1930,7 @@ def test_ogr_fgdb_20():
         ret = lyr.CreateFeature(f)
         if ret != 0 or f.GetFID() != fid or str(lyr.GetMetadataItem(str(fid), 'MAP_OGR_FID_TO_FGDB_FID')) != str(fgdb_fid):
             f.DumpReadable()
-            print(lyr.GetMetadataItem(str(fid), 'MAP_OGR_FID_TO_FGDB_FID'))
-            return 'fail'
+            pytest.fail(lyr.GetMetadataItem(str(fid), 'MAP_OGR_FID_TO_FGDB_FID'))
 
     ds = None
 
@@ -1957,8 +1945,7 @@ def test_ogr_fgdb_20():
         ret = lyr.CreateFeature(f)
         if ret != 0 or f.GetFID() != fid or lyr.GetMetadataItem(str(fid), 'MAP_OGR_FID_TO_FGDB_FID') != str(fgdb_fid):
             f.DumpReadable()
-            print(lyr.GetMetadataItem(str(fid), 'MAP_OGR_FID_TO_FGDB_FID'))
-            return 'fail'
+            pytest.fail(lyr.GetMetadataItem(str(fid), 'MAP_OGR_FID_TO_FGDB_FID'))
         ds = None
 
     # Check consistency after re-opening
@@ -1975,8 +1962,7 @@ def test_ogr_fgdb_20():
             assert f is not None, fid
             if f.GetFID() != fid or f.GetField('id') != fid:
                 f.DumpReadable()
-                print(fid)
-                return 'fail'
+                pytest.fail(fid)
 
     # Simulate different errors when database reopening is done
     # to sync ids
@@ -2033,15 +2019,14 @@ def test_ogr_fgdb_20():
 def test_ogr_fgdb_21():
 
     if ogrtest.fgdb_drv is None:
-        return 'skip'
+        pytest.skip()
 
     if not ogr_fgdb_is_sdk_1_4_or_later():
-        print('SDK 1.4 required')
-        return 'skip'
+        pytest.skip('SDK 1.4 required')
 
     # Fails on MULTIPOINT ZM
     if gdaltest.is_travis_branch('ubuntu_1804') or gdaltest.is_travis_branch('ubuntu_1604'):
-        return 'skip'
+        pytest.skip()
 
     try:
         shutil.rmtree("tmp/test.gdb")
@@ -2099,13 +2084,11 @@ def test_ogr_fgdb_21():
             expected_wkt = data[2]
         if expected_wkt is None:
             if feat.GetGeometryRef() is not None:
-                print(data)
                 feat.DumpReadable()
-                return 'fail'
+                pytest.fail(data)
         elif ogrtest.check_feature_geometry(feat, expected_wkt) != 0:
-            print(data)
             feat.DumpReadable()
-            return 'fail'
+            pytest.fail(data)
 
     return 'success'
 
@@ -2116,7 +2099,7 @@ def test_ogr_fgdb_21():
 def test_ogr_fgdb_22():
 
     if ogrtest.fgdb_drv is None:
-        return 'skip'
+        pytest.skip()
 
     ds = ogr.Open('data/curves.gdb')
     lyr = ds.GetLayerByName('line')
@@ -2156,7 +2139,7 @@ def test_ogr_fgdb_22():
 def test_ogr_fgdb_23():
 
     if ogrtest.fgdb_drv is None:
-        return 'skip'
+        pytest.skip()
 
     os.chdir('data/curves.gdb')
     ds = ogr.Open('.')
@@ -2206,7 +2189,7 @@ def test_ogr_fgdb_25():
     f = sql_lyr.GetNextFeature()
     if f.GetFID() != 2:
         f.DumpReadable()
-        return 'fail'
+        pytest.fail()
     f = sql_lyr.GetNextFeature()
     assert f is None
     ds.ReleaseResultSet(sql_lyr)
@@ -2216,7 +2199,7 @@ def test_ogr_fgdb_25():
     f = lyr.GetNextFeature()
     if f.GetFID() != 2:
         f.DumpReadable()
-        return 'fail'
+        pytest.fail()
 
     return 'success'
 
@@ -2226,7 +2209,7 @@ def test_ogr_fgdb_25():
 
 def test_ogr_fgdb_cleanup():
     if ogrtest.fgdb_drv is None:
-        return 'skip'
+        pytest.skip()
 
     try:
         shutil.rmtree("tmp/test.gdb")
diff --git a/autotest/ogr/ogr_fgdb_stress_test.py b/autotest/ogr/ogr_fgdb_stress_test.py
index 25a75d6a2acf..c3db01d735bf 100755
--- a/autotest/ogr/ogr_fgdb_stress_test.py
+++ b/autotest/ogr/ogr_fgdb_stress_test.py
@@ -40,6 +40,7 @@
 from osgeo import gdal
 from osgeo import ogr
 from osgeo import osr
+import pytest
 
 ###############################################################################
 # Test if driver is available
@@ -56,11 +57,11 @@ def ogr_fgdb_stress_test_init():
     ogrtest.openfilegdb_drv = ogr.GetDriverByName('OpenFileGDB')
 
     if ogrtest.fgdb_drv is None:
-        return 'skip'
+        pytest.skip()
     if ogrtest.reference_drv is None:
-        return 'skip'
+        pytest.skip()
     if ogrtest.openfilegdb_drv is None:
-        return 'skip'
+        pytest.skip()
 
     try:
         shutil.rmtree("tmp/test.gdb")
@@ -77,7 +78,7 @@ def ogr_fgdb_stress_test_init():
 
 def ogr_fgdb_stress_test_1():
     if ogrtest.fgdb_drv is None:
-        return 'skip'
+        pytest.skip()
 
     verbose = False
 
@@ -168,7 +169,7 @@ def ogr_fgdb_stress_test_1():
 
 def ogr_fgdb_stress_test_2():
     if ogrtest.fgdb_drv is None:
-        return 'skip'
+        pytest.skip()
 
     ds_test = ogr.Open('tmp/test.gdb')
     ds_ref = ogr.Open('tmp/test.' + ogrtest.reference_ext)
@@ -187,7 +188,7 @@ def ogr_fgdb_stress_test_2():
            ogrtest.check_feature_geometry(f_test, f_ref.GetGeometryRef()) != 0:
             f_test.DumpReadable()
             f_ref.DumpReadable()
-            return 'fail'
+            pytest.fail()
 
     for val in range(1000):
         lyr_test.SetAttributeFilter("str = '%d'" % val)
@@ -204,7 +205,7 @@ def ogr_fgdb_stress_test_2():
 
 def ogr_fgdb_stress_test_cleanup():
     if ogrtest.fgdb_drv is None:
-        return 'skip'
+        pytest.skip()
 
     try:
         shutil.rmtree("tmp/test.gdb")
diff --git a/autotest/ogr/ogr_geoconcept.py b/autotest/ogr/ogr_geoconcept.py
index 7321d81a12aa..2f2facd43d82 100755
--- a/autotest/ogr/ogr_geoconcept.py
+++ b/autotest/ogr/ogr_geoconcept.py
@@ -37,6 +37,7 @@
 import ogrtest
 from osgeo import ogr
 from osgeo import osr
+import pytest
 
 ###############################################################################
 # Simple read test of known file.
@@ -214,7 +215,7 @@ def test_ogr_gxt_multipolygon_singlepart_nohole():
     if ogrtest.check_feature_geometry(feat, 'MULTIPOLYGON (((0 0,0 1,1 1,1 0,0 0)))',
                                       max_error=0.000000001) != 0:
         feat.DumpReadable()
-        return 'fail'
+        pytest.fail()
 
     return 'success'
 
@@ -225,7 +226,7 @@ def test_ogr_gxt_multipolygon_singlepart_nohole():
 def test_ogr_gxt_multipolygon_singlepart_hole():
 
     if not ogrtest.have_geos():
-        return 'skip'
+        pytest.skip()
 
     ds = ogr.Open('data/geoconcept_multipolygon_singlepart_hole.txt')
     lyr = ds.GetLayer(0)
@@ -234,7 +235,7 @@ def test_ogr_gxt_multipolygon_singlepart_hole():
     if ogrtest.check_feature_geometry(feat, 'MULTIPOLYGON (((0 0,0 1,1 1,1 0,0 0),(0.1 0.1,0.1 0.9,0.9 0.9,0.1 0.1)))',
                                       max_error=0.000000001) != 0:
         feat.DumpReadable()
-        return 'fail'
+        pytest.fail()
 
     return 'success'
 
@@ -245,7 +246,7 @@ def test_ogr_gxt_multipolygon_singlepart_hole():
 def test_ogr_gxt_multipolygon_twoparts_second_with_hole():
 
     if not ogrtest.have_geos():
-        return 'skip'
+        pytest.skip()
 
     ds = ogr.Open('data/geoconcept_multipolygon_twoparts_second_with_hole.txt')
     lyr = ds.GetLayer(0)
@@ -254,7 +255,7 @@ def test_ogr_gxt_multipolygon_twoparts_second_with_hole():
     if ogrtest.check_feature_geometry(feat, 'MULTIPOLYGON (((-10 -10,-10 -9,-9 -9,-10 -10)),((0 0,0 1,1 1,1 0,0 0),(0.1 0.1,0.1 0.9,0.9 0.9,0.1 0.1)))',
                                       max_error=0.000000001) != 0:
         feat.DumpReadable()
-        return 'fail'
+        pytest.fail()
 
     return 'success'
 
@@ -265,7 +266,7 @@ def test_ogr_gxt_multipolygon_twoparts_second_with_hole():
 def test_ogr_gxt_line():
 
     if not ogrtest.have_geos():
-        return 'skip'
+        pytest.skip()
 
     ds = ogr.Open('data/line.gxt')
     lyr = ds.GetLayer(0)
@@ -274,7 +275,7 @@ def test_ogr_gxt_line():
     if ogrtest.check_feature_geometry(feat, 'LINESTRING (440720 3751320,441920 3750120)',
                                       max_error=0.000000001) != 0:
         feat.DumpReadable()
-        return 'fail'
+        pytest.fail()
 
     return 'success'
 
diff --git a/autotest/ogr/ogr_geojson.py b/autotest/ogr/ogr_geojson.py
index 49e3aaacb02f..5ee6073ca7c1 100755
--- a/autotest/ogr/ogr_geojson.py
+++ b/autotest/ogr/ogr_geojson.py
@@ -210,7 +210,7 @@ def test_ogr_geojson_1():
 
     if gdaltest.geojson_drv is not None:
         return 'success'
-    return 'fail'
+    pytest.fail()
 
 ###############################################################################
 # Test file-based DS with standalone "Point" feature object.
@@ -219,7 +219,7 @@ def test_ogr_geojson_1():
 def test_ogr_geojson_2():
 
     if gdaltest.geojson_drv is None:
-        return 'skip'
+        pytest.skip()
 
     ds = ogr.Open('data/point.geojson')
     assert ds is not None, 'Failed to open datasource'
@@ -245,7 +245,7 @@ def test_ogr_geojson_2():
 def test_ogr_geojson_3():
 
     if gdaltest.geojson_drv is None:
-        return 'skip'
+        pytest.skip()
 
     ds = ogr.Open('data/linestring.geojson')
     assert ds is not None, 'Failed to open datasource'
@@ -271,7 +271,7 @@ def test_ogr_geojson_3():
 def test_ogr_geojson_4():
 
     if gdaltest.geojson_drv is None:
-        return 'skip'
+        pytest.skip()
 
     ds = ogr.Open('data/polygon.geojson')
     assert ds is not None, 'Failed to open datasource'
@@ -297,7 +297,7 @@ def test_ogr_geojson_4():
 def test_ogr_geojson_5():
 
     if gdaltest.geojson_drv is None:
-        return 'skip'
+        pytest.skip()
 
     ds = ogr.Open('data/geometrycollection.geojson')
     assert ds is not None, 'Failed to open datasource'
@@ -323,7 +323,7 @@ def test_ogr_geojson_5():
 def test_ogr_geojson_6():
 
     if gdaltest.geojson_drv is None:
-        return 'skip'
+        pytest.skip()
 
     ds = ogr.Open('data/multipoint.geojson')
     assert ds is not None, 'Failed to open datasource'
@@ -349,7 +349,7 @@ def test_ogr_geojson_6():
 def test_ogr_geojson_7():
 
     if gdaltest.geojson_drv is None:
-        return 'skip'
+        pytest.skip()
 
     ds = ogr.Open('data/multilinestring.geojson')
     assert ds is not None, 'Failed to open datasource'
@@ -375,7 +375,7 @@ def test_ogr_geojson_7():
 def test_ogr_geojson_8():
 
     if gdaltest.geojson_drv is None:
-        return 'skip'
+        pytest.skip()
 
     ds = ogr.Open('data/multipolygon.geojson')
     assert ds is not None, 'Failed to open datasource'
@@ -401,7 +401,7 @@ def test_ogr_geojson_8():
 def test_ogr_geojson_9():
 
     if gdaltest.geojson_drv is None:
-        return 'skip'
+        pytest.skip()
 
     gdaltest.tests = [
         ['gjpoint', [1], ['Point 1']],
@@ -430,7 +430,7 @@ def test_ogr_geojson_9():
 def test_ogr_geojson_10():
 
     if gdaltest.geojson_drv is None:
-        return 'skip'
+        pytest.skip()
 
     gdaltest.tests = [
         ['gjpoint', [1], ['Point 1']],
@@ -458,7 +458,7 @@ def test_ogr_geojson_10():
 def test_ogr_geojson_11():
 
     if gdaltest.geojson_drv is None:
-        return 'skip'
+        pytest.skip()
 
     ds = ogr.Open('data/srs_name.geojson')
     assert ds is not None, 'Failed to open datasource'
@@ -495,15 +495,15 @@ def test_ogr_geojson_11():
 def test_ogr_geojson_12():
 
     if gdaltest.geojson_drv is None:
-        return 'skip'
+        pytest.skip()
 
     if os.name == 'nt':
-        return 'skip'
+        pytest.skip()
 
     import test_cli_utilities
 
     if test_cli_utilities.get_ogrinfo_path() is None:
-        return 'skip'
+        pytest.skip()
 
     ret = gdaltest.runexternal(test_cli_utilities.get_ogrinfo_path() + ' -ro -al \'{"type": "Point","coordinates": [100.0, 0.0]}\'')
     assert ret.find(' POINT (100 0)') != -1
@@ -517,7 +517,7 @@ def test_ogr_geojson_12():
 def test_ogr_geojson_13():
 
     if gdaltest.geojson_drv is None:
-        return 'skip'
+        pytest.skip()
 
     test = ['gjpoint', [1], ['Point 1']]
 
@@ -533,10 +533,10 @@ def test_ogr_geojson_13():
 def test_ogr_geojson_14():
 
     if gdaltest.geojson_drv is None:
-        return 'skip'
+        pytest.skip()
 
     if int(gdal.VersionInfo('VERSION_NUM')) < 1800:
-        return 'skip'
+        pytest.skip()
 
     with gdaltest.error_handler():
         ds = ogr.Open('data/ogr_geojson_14.geojson')
@@ -581,7 +581,7 @@ def test_ogr_geojson_15():
     try:
         out = feature.ExportToJson()
     except ImportError:
-        return 'skip'
+        pytest.skip()
 
     expected_out = """{"geometry": {"type": "Point", "coordinates": [1.0, 2.0]}, "type": "Feature", "properties": {"foo": "bar", "boolfield": true}, "id": 0}"""
 
@@ -604,7 +604,7 @@ def test_ogr_geojson_15():
 def test_ogr_geojson_16():
 
     if gdaltest.geojson_drv is None:
-        return 'skip'
+        pytest.skip()
 
     ds = ogr.Open('data/esripoint.json')
     assert ds is not None, 'Failed to open datasource'
@@ -628,23 +628,23 @@ def test_ogr_geojson_16():
     ref_geom = ogr.CreateGeometryFromWkt('POINT(2 49)')
     if ogrtest.check_feature_geometry(feature, ref_geom) != 0:
         feature.DumpReadable()
-        return 'fail'
+        pytest.fail()
 
     if feature.GetFID() != 1:
         feature.DumpReadable()
-        return 'fail'
+        pytest.fail()
 
     if feature.GetFieldAsInteger('fooInt') != 2:
         feature.DumpReadable()
-        return 'fail'
+        pytest.fail()
 
     if feature.GetFieldAsDouble('fooDouble') != 3.4:
         feature.DumpReadable()
-        return 'fail'
+        pytest.fail()
 
     if feature.GetFieldAsString('fooString') != '56':
         feature.DumpReadable()
-        return 'fail'
+        pytest.fail()
 
     lyr = None
     ds = None
@@ -658,7 +658,7 @@ def test_ogr_geojson_16():
 def test_ogr_geojson_17():
 
     if gdaltest.geojson_drv is None:
-        return 'skip'
+        pytest.skip()
 
     ds = ogr.Open('data/esrilinestring.json')
     assert ds is not None, 'Failed to open datasource'
@@ -676,7 +676,7 @@ def test_ogr_geojson_17():
     ref_geom = ogr.CreateGeometryFromWkt('LINESTRING (2 49,3 50)')
     if ogrtest.check_feature_geometry(feature, ref_geom) != 0:
         feature.DumpReadable()
-        return 'fail'
+        pytest.fail()
 
     lyr = None
     ds = None
@@ -701,7 +701,7 @@ def test_ogr_geojson_17():
     ref_geom = ogr.CreateGeometryFromWkt('MULTILINESTRING ((2 49,2.1 49.1),(3 50,3.1 50.1))')
     if ogrtest.check_feature_geometry(feature, ref_geom) != 0:
         feature.DumpReadable()
-        return 'fail'
+        pytest.fail()
 
     return 'success'
 
@@ -712,7 +712,7 @@ def test_ogr_geojson_17():
 def test_ogr_geojson_18():
 
     if gdaltest.geojson_drv is None:
-        return 'skip'
+        pytest.skip()
 
     ds = ogr.Open('data/esripolygon.json')
     assert ds is not None, 'Failed to open datasource'
@@ -730,7 +730,7 @@ def test_ogr_geojson_18():
     ref_geom = ogr.CreateGeometryFromWkt('MULTIPOLYGON (((2 49,2 50,3 50,3 49,2 49),(2.1 49.1,2.1 49.9,2.9 49.9,2.9 49.1,2.1 49.1)),((-2 49,-2 50,-3 50,-3 49,-2 49)))')
     if ogrtest.check_feature_geometry(feature, ref_geom) != 0:
         feature.DumpReadable()
-        return 'fail'
+        pytest.fail()
 
     lyr = None
     ds = None
@@ -741,7 +741,7 @@ def test_ogr_geojson_18():
     feature = lyr.GetNextFeature()
     if feature.GetGeometryRef().ExportToWkt() != 'POLYGON EMPTY':
         feature.DumpReadable()
-        return 'fail'
+        pytest.fail()
 
     lyr = None
     ds = None
@@ -755,7 +755,7 @@ def test_ogr_geojson_18():
 def test_ogr_geojson_19():
 
     if gdaltest.geojson_drv is None:
-        return 'skip'
+        pytest.skip()
 
     ds = ogr.Open('data/esrimultipoint.json')
     assert ds is not None, 'Failed to open datasource'
@@ -773,7 +773,7 @@ def test_ogr_geojson_19():
     ref_geom = ogr.CreateGeometryFromWkt('MULTIPOINT (2 49,3 50)')
     if ogrtest.check_feature_geometry(feature, ref_geom) != 0:
         feature.DumpReadable()
-        return 'fail'
+        pytest.fail()
 
     lyr = None
     ds = None
@@ -787,7 +787,7 @@ def test_ogr_geojson_19():
 def test_ogr_geojson_20():
 
     if gdaltest.geojson_drv is None:
-        return 'skip'
+        pytest.skip()
 
     from glob import glob
 
@@ -822,7 +822,7 @@ def test_ogr_geojson_20():
 def test_ogr_geojson_21():
 
     if gdaltest.geojson_drv is None:
-        return 'skip'
+        pytest.skip()
 
     ds = ogr.Open("""{"type": "FeatureCollection", "features":[
 {"type": "Feature",
@@ -840,7 +840,7 @@ def test_ogr_geojson_21():
        feature.GetFieldAsInteger("intvalue") != 2 or \
        ogrtest.check_feature_geometry(feature, ref_geom) != 0:
         feature.DumpReadable()
-        return 'fail'
+        pytest.fail()
 
     lyr = None
     ds = None
@@ -854,7 +854,7 @@ def test_ogr_geojson_21():
 def test_ogr_geojson_22():
 
     if gdaltest.geojson_drv is None:
-        return 'skip'
+        pytest.skip()
 
     ds = ogr.Open("""{"type": "FeatureCollection", "features":[
 {"type": "Feature",
@@ -876,7 +876,7 @@ def test_ogr_geojson_22():
        feature.GetFieldAsDouble("intvalue") != 2 or \
        ogrtest.check_feature_geometry(feature, ref_geom) != 0:
         feature.DumpReadable()
-        return 'fail'
+        pytest.fail()
 
     feature = lyr.GetNextFeature()
     ref_geom = ogr.CreateGeometryFromWkt('POINT (3 4)')
@@ -886,7 +886,7 @@ def test_ogr_geojson_22():
        feature.GetFieldAsString("str2value") != 'bar' or \
        ogrtest.check_feature_geometry(feature, ref_geom) != 0:
         feature.DumpReadable()
-        return 'fail'
+        pytest.fail()
 
     lyr = None
     ds = None
@@ -900,7 +900,7 @@ def test_ogr_geojson_22():
 def test_ogr_geojson_23():
 
     if gdaltest.geojson_drv is None:
-        return 'skip'
+        pytest.skip()
 
     ds = gdaltest.geojson_drv.CreateDataSource('/vsimem/ogr_geojson_23.json')
     sr = osr.SpatialReference()
@@ -942,7 +942,7 @@ def test_ogr_geojson_23():
 def test_ogr_geojson_24():
 
     if gdaltest.geojson_drv is None:
-        return 'skip'
+        pytest.skip()
 
     content = """loadGeoJSON({"layerFoo": { "type": "Feature",
   "geometry": {
@@ -977,7 +977,7 @@ def test_ogr_geojson_24():
         if feature.GetFieldAsString("name") != 'bar' or \
                 ogrtest.check_feature_geometry(feature, ref_geom) != 0:
             feature.DumpReadable()
-            return 'fail'
+            pytest.fail()
 
         lyr = ds.GetLayerByName('layerBar')
         assert lyr is not None, 'cannot find layer'
@@ -987,7 +987,7 @@ def test_ogr_geojson_24():
         if feature.GetFieldAsString("other_name") != 'baz' or \
                 ogrtest.check_feature_geometry(feature, ref_geom) != 0:
             feature.DumpReadable()
-            return 'fail'
+            pytest.fail()
 
         ds = None
 
@@ -1000,7 +1000,7 @@ def test_ogr_geojson_24():
 def test_ogr_geojson_25():
 
     if gdaltest.geojson_drv is None:
-        return 'skip'
+        pytest.skip()
 
     ds = ogr.Open('data/topojson1.topojson')
     lyr = ds.GetLayer(0)
@@ -1052,11 +1052,10 @@ def test_ogr_geojson_25():
         if feat.GetField('id') != exp_result[0] or \
            feat.GetField('name') != exp_result[1] or \
            feat.GetGeometryRef().ExportToWkt() != exp_result[2]:
-            gdaltest.post_reason('failure at feat index %d' % i)
             feat.DumpReadable()
             print(exp_result)
             print(feat.GetField('name'))
-            return 'fail'
+            pytest.fail('failure at feat index %d' % i)
     ds = None
 
     ds = ogr.Open('data/topojson2.topojson')
@@ -1090,7 +1089,7 @@ def test_ogr_geojson_25():
 def test_ogr_geojson_26():
 
     if gdaltest.geojson_drv is None:
-        return 'skip'
+        pytest.skip()
 
     ds = ogr.Open("""{"type": "FeatureCollection", "features":[
 {"type": "Feature", "id": 1,
@@ -1108,24 +1107,24 @@ def test_ogr_geojson_26():
     feature = lyr.GetNextFeature()
     if feature.GetFID() != 1:
         feature.DumpReadable()
-        return 'fail'
+        pytest.fail()
     if feature.GetField("intvalue") != 1:
         feature.DumpReadable()
-        return 'fail'
+        pytest.fail()
     if feature.GetField("int64") != 1234567890123:
         feature.DumpReadable()
-        return 'fail'
+        pytest.fail()
 
     feature = lyr.GetNextFeature()
     if feature.GetFID() != 1234567890123:
         feature.DumpReadable()
-        return 'fail'
+        pytest.fail()
     if feature.GetField("intvalue") != 1234567890123:
         feature.DumpReadable()
-        return 'fail'
+        pytest.fail()
     if feature.GetField("intlist") != [1, 1234567890123]:
         feature.DumpReadable()
-        return 'fail'
+        pytest.fail()
 
     lyr = None
     ds = None
@@ -1159,7 +1158,7 @@ def test_ogr_geojson_26():
 def test_ogr_geojson_27():
 
     if gdaltest.geojson_drv is None:
-        return 'skip'
+        pytest.skip()
 
     gdal.PushErrorHandler('CPLQuietErrorHandler')
     # Warning 1: Integer values probably ranging out of 64bit integer range
@@ -1180,12 +1179,12 @@ def test_ogr_geojson_27():
     feature = lyr.GetNextFeature()
     if feature.GetField("intvalue") != 1:
         feature.DumpReadable()
-        return 'fail'
+        pytest.fail()
 
     feature = lyr.GetNextFeature()
     if feature.GetField("intvalue") != 9223372036854775807:
         feature.DumpReadable()
-        return 'fail'
+        pytest.fail()
 
     lyr = None
     ds = None
@@ -1199,7 +1198,7 @@ def test_ogr_geojson_27():
 def test_ogr_geojson_28():
 
     if gdaltest.geojson_drv is None:
-        return 'skip'
+        pytest.skip()
 
     ds = ogr.Open('data/esrizpoint.json')
     assert ds is not None, 'Failed to open datasource'
@@ -1223,23 +1222,23 @@ def test_ogr_geojson_28():
     ref_geom = ogr.CreateGeometryFromWkt('POINT(2 49 1)')
     if ogrtest.check_feature_geometry(feature, ref_geom) != 0:
         feature.DumpReadable()
-        return 'fail'
+        pytest.fail()
 
     if feature.GetFID() != 1:
         feature.DumpReadable()
-        return 'fail'
+        pytest.fail()
 
     if feature.GetFieldAsInteger('fooInt') != 2:
         feature.DumpReadable()
-        return 'fail'
+        pytest.fail()
 
     if feature.GetFieldAsDouble('fooDouble') != 3.4:
         feature.DumpReadable()
-        return 'fail'
+        pytest.fail()
 
     if feature.GetFieldAsString('fooString') != '56':
         feature.DumpReadable()
-        return 'fail'
+        pytest.fail()
 
     lyr = None
     ds = None
@@ -1253,7 +1252,7 @@ def test_ogr_geojson_28():
 def test_ogr_geojson_29():
 
     if gdaltest.geojson_drv is None:
-        return 'skip'
+        pytest.skip()
 
     ds = ogr.Open('data/esrizlinestring.json')
     assert ds is not None, 'Failed to open datasource'
@@ -1272,7 +1271,7 @@ def test_ogr_geojson_29():
     ref_geom = ogr.CreateGeometryFromWkt('LINESTRING (2 49 1,3 50 2)')
     if ogrtest.check_feature_geometry(feature, ref_geom) != 0:
         feature.DumpReadable()
-        return 'fail'
+        pytest.fail()
 
     lyr = None
     ds = None
@@ -1286,7 +1285,7 @@ def test_ogr_geojson_29():
 def test_ogr_geojson_30():
 
     if gdaltest.geojson_drv is None:
-        return 'skip'
+        pytest.skip()
 
     ds = ogr.Open('data/esrizmultipoint.json')
     assert ds is not None, 'Failed to open datasource'
@@ -1305,7 +1304,7 @@ def test_ogr_geojson_30():
     ref_geom = ogr.CreateGeometryFromWkt('MULTIPOINT (2 49 1,3 50 2)')
     if ogrtest.check_feature_geometry(feature, ref_geom) != 0:
         feature.DumpReadable()
-        return 'fail'
+        pytest.fail()
 
     lyr = None
     ds = None
@@ -1319,7 +1318,7 @@ def test_ogr_geojson_30():
 def test_ogr_geojson_31():
 
     if gdaltest.geojson_drv is None:
-        return 'skip'
+        pytest.skip()
 
     ds = ogr.Open('data/esrizpolygon.json')
     assert ds is not None, 'Failed to open datasource'
@@ -1338,7 +1337,7 @@ def test_ogr_geojson_31():
     ref_geom = ogr.CreateGeometryFromWkt('POLYGON ((2 49 1,2 50 2,3 50 3,3 49 4,2 49 1))')
     if ogrtest.check_feature_geometry(feature, ref_geom) != 0:
         feature.DumpReadable()
-        return 'fail'
+        pytest.fail()
 
     lyr = None
     ds = None
@@ -1352,7 +1351,7 @@ def test_ogr_geojson_31():
 def test_ogr_geojson_32():
 
     if gdaltest.geojson_drv is None:
-        return 'skip'
+        pytest.skip()
 
     ds = ogr.Open('data/esrihasmnozmultipoint.json')
     assert ds is not None, 'Failed to open datasource'
@@ -1370,7 +1369,7 @@ def test_ogr_geojson_32():
     ref_geom = ogr.CreateGeometryFromWkt('MULTIPOINT M ((2 49 1),(3 50 2))')
     if ogrtest.check_feature_geometry(feature, ref_geom) != 0:
         feature.DumpReadable()
-        return 'fail'
+        pytest.fail()
 
     lyr = None
     ds = None
@@ -1384,7 +1383,7 @@ def test_ogr_geojson_32():
 def test_ogr_geojson_33():
 
     if gdaltest.geojson_drv is None:
-        return 'skip'
+        pytest.skip()
 
     ds = ogr.Open('data/esriinvalidhaszmultipoint.json')
     assert ds is not None, 'Failed to open datasource'
@@ -1402,7 +1401,7 @@ def test_ogr_geojson_33():
     ref_geom = ogr.CreateGeometryFromWkt('MULTIPOINT (2 49,3 50)')
     if ogrtest.check_feature_geometry(feature, ref_geom) != 0:
         feature.DumpReadable()
-        return 'fail'
+        pytest.fail()
 
     lyr = None
     ds = None
@@ -1416,7 +1415,7 @@ def test_ogr_geojson_33():
 def test_ogr_geojson_34():
 
     if gdaltest.geojson_drv is None:
-        return 'skip'
+        pytest.skip()
 
     ds = ogr.Open('data/esrizmmultipoint.json')
     assert ds is not None, 'Failed to open datasource'
@@ -1434,7 +1433,7 @@ def test_ogr_geojson_34():
     ref_geom = ogr.CreateGeometryFromWkt('MULTIPOINT ZM ((2 49 1 100),(3 50 2 100))')
     if ogrtest.check_feature_geometry(feature, ref_geom) != 0:
         feature.DumpReadable()
-        return 'fail'
+        pytest.fail()
 
     lyr = None
     ds = None
@@ -1448,7 +1447,7 @@ def test_ogr_geojson_34():
 def test_ogr_geojson_35():
 
     if gdaltest.geojson_drv is None:
-        return 'skip'
+        pytest.skip()
 
     ds = gdaltest.geojson_drv.CreateDataSource('/vsimem/ogr_geojson_35.json')
     lyr = ds.CreateLayer('foo')
@@ -1546,7 +1545,7 @@ def test_ogr_geojson_35():
 def test_ogr_geojson_36():
 
     if gdaltest.geojson_drv is None:
-        return 'skip'
+        pytest.skip()
 
     ds = ogr.Open('data/point_with_utf8bom.json')
     assert ds is not None, 'Failed to open datasource'
@@ -1561,7 +1560,7 @@ def test_ogr_geojson_36():
 def test_ogr_geojson_37():
 
     if gdaltest.geojson_drv is None:
-        return 'skip'
+        pytest.skip()
 
     # Test read support
     ds = ogr.Open("""{"type": "FeatureCollection","features": [
@@ -1579,7 +1578,7 @@ def test_ogr_geojson_37():
     f = lyr.GetNextFeature()
     if f.GetField('bool') != 0 or f.GetField('bool_list') != [0, 1]:
         f.DumpReadable()
-        return 'fail'
+        pytest.fail()
 
     out_ds = ogr.GetDriverByName('GeoJSON').CreateDataSource('/vsimem/ogr_geojson_37.json')
     out_lyr = out_ds.CreateLayer('test')
@@ -1607,7 +1606,7 @@ def test_ogr_geojson_37():
 def test_ogr_geojson_38():
 
     if gdaltest.geojson_drv is None:
-        return 'skip'
+        pytest.skip()
 
     # Test read support
     ds = ogr.Open("""{"type": "FeatureCollection", "features": [
@@ -1626,12 +1625,12 @@ def test_ogr_geojson_38():
     if f.GetField('dt') != '2014/11/20 12:34:56+01' or f.GetField('dt2') != '2014/11/20 00:00:00' or \
        f.GetField('date') != '2014/11/20' or f.GetField('time') != '12:34:56':
         f.DumpReadable()
-        return 'fail'
+        pytest.fail()
     f = lyr.GetNextFeature()
     if f.GetField('dt') != '2014/11/20 00:00:00' or f.GetField('dt2') != '2014/11/20 12:34:56+00' or \
        f.GetField('date') != '2014/11/20' or f.GetField('time') != '12:34:56':
         f.DumpReadable()
-        return 'fail'
+        pytest.fail()
 
     return 'success'
 
@@ -1642,7 +1641,7 @@ def test_ogr_geojson_38():
 def test_ogr_geojson_39():
 
     if gdaltest.geojson_drv is None:
-        return 'skip'
+        pytest.skip()
 
     ds = ogr.Open("""{"type": "FeatureCollection", "features": [
 { "type": "Feature", "id" : "foo", "properties": { "bar" : "baz" }, "geometry": null },
@@ -1653,7 +1652,7 @@ def test_ogr_geojson_39():
     feat = lyr.GetNextFeature()
     if feat.GetField('id') != 'foo' or feat.GetField('bar') != 'baz':
         feat.DumpReadable()
-        return 'fail'
+        pytest.fail()
 
     # Crazy case: properties.id has the precedence because we arbitrarily decided that...
     ds = ogr.Open("""{"type": "FeatureCollection", "features": [
@@ -1665,7 +1664,7 @@ def test_ogr_geojson_39():
     feat = lyr.GetNextFeature()
     if feat.GetField('id') != 6:
         feat.DumpReadable()
-        return 'fail'
+        pytest.fail()
 
     # Same with 2 features
     ds = ogr.Open("""{"type": "FeatureCollection", "features": [
@@ -1678,7 +1677,7 @@ def test_ogr_geojson_39():
     feat = lyr.GetNextFeature()
     if feat.GetField('id') != 6:
         feat.DumpReadable()
-        return 'fail'
+        pytest.fail()
 
     # Crazy case: properties.id has the precedence because we arbitrarily decided that...
     ds = ogr.Open("""{"type": "FeatureCollection", "features": [
@@ -1690,7 +1689,7 @@ def test_ogr_geojson_39():
     feat = lyr.GetNextFeature()
     if feat.GetField('id') != 'baz':
         feat.DumpReadable()
-        return 'fail'
+        pytest.fail()
 
     # id and properties.ID (#6538)
     ds = ogr.Open("""{"type": "FeatureCollection", "features": [
@@ -1702,7 +1701,7 @@ def test_ogr_geojson_39():
     feat = lyr.GetNextFeature()
     if feat.GetFID() != 1 or feat.GetField('ID') != 2:
         feat.DumpReadable()
-        return 'fail'
+        pytest.fail()
 
     # Test handling of duplicated id
     gdal.ErrorReset()
@@ -1718,15 +1717,15 @@ def test_ogr_geojson_39():
     feat = lyr.GetNextFeature()
     if feat.GetFID() != 1 or feat.GetField('foo') != 'bar':
         feat.DumpReadable()
-        return 'fail'
+        pytest.fail()
     feat = lyr.GetNextFeature()
     if feat.GetFID() != 2 or feat.GetField('foo') != 'baz':
         feat.DumpReadable()
-        return 'fail'
+        pytest.fail()
     feat = lyr.GetNextFeature()
     if feat.GetFID() != 3 or feat.GetField('foo') != 'baw':
         feat.DumpReadable()
-        return 'fail'
+        pytest.fail()
 
     # negative id
     ds = ogr.Open("""{"type": "FeatureCollection", "features": [
@@ -1738,7 +1737,7 @@ def test_ogr_geojson_39():
     feat = lyr.GetNextFeature()
     if feat.GetField('id') != -1:
         feat.DumpReadable()
-        return 'fail'
+        pytest.fail()
 
     # negative id 64bit
     ds = ogr.Open("""{"type": "FeatureCollection", "features": [
@@ -1751,7 +1750,7 @@ def test_ogr_geojson_39():
     feat = lyr.GetNextFeature()
     if feat.GetField('id') != -1234567890123:
         feat.DumpReadable()
-        return 'fail'
+        pytest.fail()
 
     # negative id
     ds = ogr.Open("""{"type": "FeatureCollection", "features": [
@@ -1764,7 +1763,7 @@ def test_ogr_geojson_39():
     feat = lyr.GetNextFeature()
     if feat.GetField('id') != -2:
         feat.DumpReadable()
-        return 'fail'
+        pytest.fail()
 
     # positive and then negative id
     ds = ogr.Open("""{"type": "FeatureCollection", "features": [
@@ -1777,7 +1776,7 @@ def test_ogr_geojson_39():
     feat = lyr.GetNextFeature()
     if feat.GetField('id') != 1:
         feat.DumpReadable()
-        return 'fail'
+        pytest.fail()
 
     # mix of int and string id
     ds = ogr.Open("""{"type": "FeatureCollection", "features": [
@@ -1791,7 +1790,7 @@ def test_ogr_geojson_39():
     feat = lyr.GetNextFeature()
     if feat.GetField('id') != '-2':
         feat.DumpReadable()
-        return 'fail'
+        pytest.fail()
 
     return 'success'
 
@@ -1802,7 +1801,7 @@ def test_ogr_geojson_39():
 def test_ogr_geojson_40():
 
     if gdaltest.geojson_drv is None:
-        return 'skip'
+        pytest.skip()
 
     ds = gdal.OpenEx("""{
   "type": "FeatureCollection",
@@ -1844,7 +1843,7 @@ def test_ogr_geojson_40():
     if feat.GetField('a_property') != 'foo' or feat.GetField('some_object.a_property') != 1 or \
        feat.GetField('some_object.another_property') != 2.34:
         feat.DumpReadable()
-        return 'fail'
+        pytest.fail()
 
     return 'success'
 
@@ -1855,7 +1854,7 @@ def test_ogr_geojson_40():
 def test_ogr_geojson_41():
 
     if gdaltest.geojson_drv is None:
-        return 'skip'
+        pytest.skip()
 
     # Check that by default we return a WGS 84 SRS
     g = ogr.CreateGeometryFromJson("{ 'type': 'Point', 'coordinates' : [ 2, 49] }")
@@ -1884,7 +1883,7 @@ def test_ogr_geojson_41():
 def test_ogr_geojson_42():
 
     if gdaltest.geojson_drv is None:
-        return 'skip'
+        pytest.skip()
 
     gdal.SetConfigOption('CPL_CURL_ENABLE_VSIMEM', 'YES')
 
@@ -2061,7 +2060,7 @@ def test_ogr_geojson_42():
 
 def test_ogr_geojson_43():
     if gdaltest.geojson_drv is None:
-        return 'skip'
+        pytest.skip()
 
     ds = ogr.Open("""{"type": "FeatureCollection", "features":[
 {"type": "Feature", "properties": {"foo": "bar"}}]}""")
@@ -2072,7 +2071,7 @@ def test_ogr_geojson_43():
     feature = lyr.GetNextFeature()
     if feature.GetFieldAsString("foo") != 'bar':
         feature.DumpReadable()
-        return 'fail'
+        pytest.fail()
 
     lyr = None
     ds = None
@@ -2085,7 +2084,7 @@ def test_ogr_geojson_43():
 
 def test_ogr_geojson_44():
     if gdaltest.geojson_drv is None:
-        return 'skip'
+        pytest.skip()
 
     with gdaltest.error_handler():
         ogr.Open("""{"type": "FeatureCollection", "features":[ null ]}""")
@@ -2098,7 +2097,7 @@ def test_ogr_geojson_44():
 
 def test_ogr_geojson_45():
     if gdaltest.geojson_drv is None:
-        return 'skip'
+        pytest.skip()
 
     # Test read support
     content = """{"type": "FeatureCollection", "foo": "bar", "bar": "baz",
@@ -2223,7 +2222,7 @@ def test_ogr_geojson_45():
 
 def test_ogr_geojson_46():
     if gdaltest.geojson_drv is None:
-        return 'skip'
+        pytest.skip()
 
     ds = ogr.GetDriverByName('GeoJSON').CreateDataSource('/vsimem/ogr_geojson_46.json')
     lyr = ds.CreateLayer('test')
@@ -2249,7 +2248,7 @@ def test_ogr_geojson_46():
 
 def test_ogr_geojson_47():
     if gdaltest.geojson_drv is None:
-        return 'skip'
+        pytest.skip()
 
     # ERROR 6: Update from inline definition not supported
     with gdaltest.error_handler():
@@ -2288,14 +2287,14 @@ def test_ogr_geojson_47():
     lyr.CreateFeature(f)
     if f.GetFID() != 1:
         f.DumpReadable()
-        return 'fail'
+        pytest.fail()
     f = ogr.Feature(lyr.GetLayerDefn())
     f.SetGeometry(ogr.CreateGeometryFromWkt('POINT(2 3)'))
     lyr.CreateFeature(f)
     f = lyr.GetNextFeature()
     if f.GetFID() != 0:
         f.DumpReadable()
-        return 'fail'
+        pytest.fail()
     ds = None
 
     # Test append support
@@ -2405,7 +2404,7 @@ def test_ogr_geojson_47():
 
 def test_ogr_geojson_48():
     if gdaltest.geojson_drv is None:
-        return 'skip'
+        pytest.skip()
 
     gdal.FileFromMemBuffer('/vsimem/ogr_geojson_48.json',
                            """{ "type": "Feature", "bar": "baz", "bbox": [2,49,2,49], "properties": { "myprop": "myvalue" }, "geometry": {"type": "Point", "coordinates": [ 2, 49]} }""")
@@ -2443,7 +2442,7 @@ def test_ogr_geojson_48():
 
 def test_ogr_geojson_49():
     if gdaltest.geojson_drv is None:
-        return 'skip'
+        pytest.skip()
 
     gdal.FileFromMemBuffer('/vsimem/ogr_geojson_49.json',
                            """{ "type": "Feature", "properties": { "foo": ["bar"] }, "geometry": null }""")
@@ -2455,7 +2454,7 @@ def test_ogr_geojson_49():
     f = lyr.GetNextFeature()
     if f['foo'] != '[ "bar" ]':
         f.DumpReadable()
-        return 'fail'
+        pytest.fail()
     ds = None
 
     gdal.Unlink('/vsimem/ogr_geojson_49.json')
@@ -2468,7 +2467,7 @@ def test_ogr_geojson_49():
 
 def test_ogr_geojson_50():
     if gdaltest.geojson_drv is None:
-        return 'skip'
+        pytest.skip()
 
     ds = ogr.GetDriverByName('GeoJSON').CreateDataSource('/vsimem/ogr_geojson_50.json')
     lyr = ds.CreateLayer('test')
@@ -2538,7 +2537,7 @@ def test_ogr_geojson_50():
 
 def test_ogr_geojson_51():
     if gdaltest.geojson_drv is None:
-        return 'skip'
+        pytest.skip()
 
     ds = ogr.GetDriverByName('GeoJSON').CreateDataSource('/vsimem/ogr_geojson_51.json')
     lyr = ds.CreateLayer('test')
@@ -2602,7 +2601,7 @@ def test_ogr_geojson_51():
 
 def test_ogr_geojson_52():
     if gdaltest.geojson_drv is None:
-        return 'skip'
+        pytest.skip()
 
     ds = ogr.Open('data/nullvalues.geojson')
     assert ds is not None, 'Failed to open datasource'
@@ -2630,7 +2629,7 @@ def test_ogr_geojson_52():
 
 def test_ogr_geojson_53():
     if gdaltest.geojson_drv is None:
-        return 'skip'
+        pytest.skip()
 
     ds = ogr.GetDriverByName('GeoJSON').CreateDataSource('/vsimem/ogr_geojson_53.json')
     lyr = ds.CreateLayer('test')
@@ -2655,7 +2654,7 @@ def test_ogr_geojson_53():
 
 def test_ogr_geojson_54():
     if gdaltest.geojson_drv is None:
-        return 'skip'
+        pytest.skip()
 
     ds = ogr.Open("""{
    "type": "FeatureCollection",
@@ -2699,7 +2698,7 @@ def read_file(filename):
 
 def test_ogr_geojson_55():
     if gdaltest.geojson_drv is None:
-        return 'skip'
+        pytest.skip()
 
     # Basic test for standard bbox and coordinate truncation
     gdal.VectorTranslate('/vsimem/out.json', """{
@@ -2803,9 +2802,9 @@ def test_ogr_geojson_55():
 
 def test_ogr_geojson_56():
     if gdaltest.geojson_drv is None:
-        return 'skip'
+        pytest.skip()
     if not ogrtest.have_geos():
-        return 'skip'
+        pytest.skip()
 
     # Test offsetting longitudes beyond antimeridian
     gdal.VectorTranslate('/vsimem/out.json', """{
@@ -2873,9 +2872,9 @@ def test_ogr_geojson_56():
 
 def test_ogr_geojson_57():
     if gdaltest.geojson_drv is None:
-        return 'skip'
+        pytest.skip()
     if not ogrtest.have_geos():
-        return 'skip'
+        pytest.skip()
 
     # Standard case: EPSG:32662: WGS 84 / Plate Carre
     src_ds = gdal.GetDriverByName('Memory').Create('', 0, 0, 0)
@@ -3094,7 +3093,7 @@ def test_ogr_geojson_57():
 
 def test_ogr_geojson_58():
     if gdaltest.geojson_drv is None:
-        return 'skip'
+        pytest.skip()
 
     ds = ogr.Open('{ "type": "FeatureCollection", "name": "layer_name", "features": []}')
     assert ds is not None, 'Failed to open datasource'
@@ -3119,7 +3118,7 @@ def test_ogr_geojson_58():
 
 def test_ogr_geojson_59():
     if gdaltest.geojson_drv is None:
-        return 'skip'
+        pytest.skip()
 
     ds = ogr.Open('{ "type": "FeatureCollection", "description": "my_description", "features": []}')
     assert ds is not None, 'Failed to open datasource'
@@ -3146,7 +3145,7 @@ def test_ogr_geojson_59():
 
 def test_ogr_geojson_60():
     if gdaltest.geojson_drv is None:
-        return 'skip'
+        pytest.skip()
 
     ds = gdal.OpenEx("""{ "type": "FeatureCollection", "features": [
 { "type": "Feature", "properties" : { "foo" : "bar" } },
@@ -3156,15 +3155,15 @@ def test_ogr_geojson_60():
     f = lyr.GetNextFeature()
     if f['foo'] != 'bar':
         f.DumpReadable()
-        return 'fail'
+        pytest.fail()
     f = lyr.GetNextFeature()
     if not f.IsFieldNull('foo'):
         f.DumpReadable()
-        return 'fail'
+        pytest.fail()
     f = lyr.GetNextFeature()
     if f.IsFieldSet('foo'):
         f.DumpReadable()
-        return 'fail'
+        pytest.fail()
 
     # Test writing side
     gdal.VectorTranslate('/vsimem/ogr_geojson_60.json', ds, format='GeoJSON')
@@ -3631,7 +3630,7 @@ def test_ogr_geojson_read_fields_with_different_case():
     f = lyr.GetNextFeature()
     if f.GetField(0) != 'my_id' or f.GetField(1) != 'MY_ID' or f.GetField(2) != 'foo' or f.GetField(3) != 'FOO':
         f.DumpReadable()
-        return 'fail'
+        pytest.fail()
 
     return 'success'
 
@@ -3642,7 +3641,7 @@ def test_ogr_geojson_read_fields_with_different_case():
 def test_ogr_geojson_clip_geometries_rfc7946():
 
     if not ogrtest.have_geos():
-        return 'skip'
+        pytest.skip()
 
     tmpfilename = '/vsimem/out.json'
     gdal.VectorTranslate(tmpfilename, """{
@@ -3661,19 +3660,19 @@ def test_ogr_geojson_clip_geometries_rfc7946():
     ref_geom = ogr.CreateGeometryFromWkt('MULTIPOLYGON (((-180 30,-180 -20,16 -20,16 30,-180 30)),((140 -20,180 -20,180 30,140 30,140 -20)))')
     if ogrtest.check_feature_geometry(f, ref_geom) != 0:
         f.DumpReadable()
-        return 'fail'
+        pytest.fail()
 
     f = lyr.GetNextFeature()
     ref_geom = ogr.CreateGeometryFromWkt('MULTIPOLYGON (((180 40,180 70,-16 70,-16 40,180 40)),((-180 70,-180 40,-140 40,-140 70,-180 70)))')
     if ogrtest.check_feature_geometry(f, ref_geom) != 0:
         f.DumpReadable()
-        return 'fail'
+        pytest.fail()
 
     f = lyr.GetNextFeature()
     ref_geom = ogr.CreateGeometryFromWkt('POLYGON ((170 -40,-16 -40,-16 70,170 -70,170 -40))')
     if ogrtest.check_feature_geometry(f, ref_geom) != 0:
         f.DumpReadable()
-        return 'fail'
+        pytest.fail()
     ds = None
 
     gdal.Unlink(tmpfilename)
@@ -3695,7 +3694,7 @@ def test_ogr_geojson_non_finite():
         ds = ogr.Open(json_content)
     if ds is None:
         # Might fail with older libjson-c versions
-        return 'skip'
+        pytest.skip()
     lyr = ds.GetLayer(0)
     f = lyr.GetNextFeature()
     for i in range(3):
@@ -3703,14 +3702,13 @@ def test_ogr_geojson_non_finite():
 
     if f['inf_prop'] != float('inf'):
         f.DumpReadable()
-        return 'fail'
+        pytest.fail()
     if f['minus_inf_prop'] != float('-inf'):
         f.DumpReadable()
-        return 'fail'
+        pytest.fail()
     if not math.isnan(f['nan_prop']):
-        print(str(f['nan_prop']))
         f.DumpReadable()
-        return 'fail'
+        pytest.fail(str(f['nan_prop']))
     ds = None
 
     tmpfilename = '/vsimem/out.json'
@@ -3729,14 +3727,13 @@ def test_ogr_geojson_non_finite():
     f = lyr.GetNextFeature()
     if f['inf_prop'] != float('inf'):
         f.DumpReadable()
-        return 'fail'
+        pytest.fail()
     if f['minus_inf_prop'] != float('-inf'):
         f.DumpReadable()
-        return 'fail'
+        pytest.fail()
     if not math.isnan(f['nan_prop']):
-        print(str(f['nan_prop']))
         f.DumpReadable()
-        return 'fail'
+        pytest.fail(str(f['nan_prop']))
     ds = None
 
     gdal.Unlink(tmpfilename)
diff --git a/autotest/ogr/ogr_geojsonseq.py b/autotest/ogr/ogr_geojsonseq.py
index d44f340c28b7..db127d48e9a3 100755
--- a/autotest/ogr/ogr_geojsonseq.py
+++ b/autotest/ogr/ogr_geojsonseq.py
@@ -36,6 +36,7 @@
 from osgeo import ogr
 
 import gdaltest
+import pytest
 
 
 def _ogr_geojsonseq_create(filename, lco, expect_rs):
@@ -77,11 +78,11 @@ def _ogr_geojsonseq_create(filename, lco, expect_rs):
     if f['foo'] != 'bar"d' or \
        f.GetGeometryRef().ExportToWkt() != 'POINT (1 2)':
         f.DumpReadable()
-        return 'fail'
+        pytest.fail()
     f = lyr.GetNextFeature()
     if f['foo'] != 'baz' or f.GetGeometryRef().ExportToWkt() != 'POINT (3 4)':
         f.DumpReadable()
-        return 'fail'
+        pytest.fail()
     assert lyr.GetNextFeature() is None
     ds = None
 
@@ -129,7 +130,7 @@ def test_ogr_geojsonseq_seq_geometries():
         f = lyr.GetNextFeature()
         if f.GetGeometryRef().ExportToWkt() != 'POINT (2 49)':
             f.DumpReadable()
-            return 'fail'
+            pytest.fail()
 
     return 'success'
 
@@ -153,7 +154,7 @@ def test_ogr_geojsonseq_reprojection():
     f = lyr.GetNextFeature()
     if f.GetGeometryRef().ExportToWkt() != 'POINT (2 49)':
         f.DumpReadable()
-        return 'fail'
+        pytest.fail()
     ds = None
 
     ogr.GetDriverByName('GeoJSONSeq').DeleteDataSource(filename)
@@ -169,11 +170,11 @@ def test_ogr_geojsonseq_read_rs_json_pretty():
     if f['foo'] != 'bar' or \
        f.GetGeometryRef().ExportToWkt() != 'POINT (1 2)':
         f.DumpReadable()
-        return 'fail'
+        pytest.fail()
     f = lyr.GetNextFeature()
     if f['foo'] != 'baz' or f.GetGeometryRef().ExportToWkt() != 'POINT (3 4)':
         f.DumpReadable()
-        return 'fail'
+        pytest.fail()
     assert lyr.GetNextFeature() is None
     return 'success'
 
@@ -182,7 +183,7 @@ def test_ogr_geojsonseq_test_ogrsf():
 
     import test_cli_utilities
     if test_cli_utilities.get_test_ogrsf_path() is None:
-        return 'skip'
+        pytest.skip()
 
     ret = gdaltest.runexternal(
         test_cli_utilities.get_test_ogrsf_path() + ' -ro data/test.geojsonl')
diff --git a/autotest/ogr/ogr_geom.py b/autotest/ogr/ogr_geom.py
index 2db39eded9d0..389800041436 100755
--- a/autotest/ogr/ogr_geom.py
+++ b/autotest/ogr/ogr_geom.py
@@ -375,7 +375,7 @@ def test_ogr_geom_tin():
 def test_ogr_geom_boundary_point():
 
     if not ogrtest.have_geos():
-        return 'skip'
+        pytest.skip()
 
     geom_wkt = 'POINT(1 1)'
     geom = ogr.CreateGeometryFromWkt(geom_wkt)
@@ -397,7 +397,7 @@ def test_ogr_geom_boundary_point():
 def test_ogr_geom_boundary_multipoint():
 
     if not ogrtest.have_geos():
-        return 'skip'
+        pytest.skip()
 
     geom_wkt = 'MULTIPOINT((0 0),(1 1))'
     geom = ogr.CreateGeometryFromWkt(geom_wkt)
@@ -415,7 +415,7 @@ def test_ogr_geom_boundary_multipoint():
 def test_ogr_geom_boundary_linestring():
 
     if not ogrtest.have_geos():
-        return 'skip'
+        pytest.skip()
 
     geom_wkt = 'LINESTRING(0 0, 1 1, 2 2, 3 2, 4 2)'
     geom = ogr.CreateGeometryFromWkt(geom_wkt)
@@ -445,7 +445,7 @@ def test_ogr_geom_boundary_linestring():
 def test_ogr_geom_boundary_polygon():
 
     if not ogrtest.have_geos():
-        return 'skip'
+        pytest.skip()
 
     geom_wkt = 'POLYGON((0 0,1 1,1 0,0 0))'
     geom = ogr.CreateGeometryFromWkt(geom_wkt)
@@ -463,7 +463,7 @@ def test_ogr_geom_boundary_polygon():
 def test_ogr_geom_build_from_edges_1():
 
     if not ogrtest.have_geos():
-        return 'skip'
+        pytest.skip()
 
     link_coll = ogr.Geometry(type=ogr.wkbGeometryCollection)
 
@@ -484,7 +484,7 @@ def test_ogr_geom_build_from_edges_1():
         poly = ogr.BuildPolygonFromEdges(link_coll)
         assert poly is not None
     except:
-        return 'fail'
+        pytest.fail()
 
     return 'success'
 
@@ -495,7 +495,7 @@ def test_ogr_geom_build_from_edges_1():
 def test_ogr_geom_build_from_edges_2():
 
     if not ogrtest.have_geos():
-        return 'skip'
+        pytest.skip()
 
     link_coll = ogr.Geometry(type=ogr.wkbMultiLineString)
 
@@ -515,7 +515,7 @@ def test_ogr_geom_build_from_edges_2():
         poly = ogr.BuildPolygonFromEdges(link_coll)
         assert poly is not None
     except:
-        return 'fail'
+        pytest.fail()
 
     return 'success'
 
@@ -526,7 +526,7 @@ def test_ogr_geom_build_from_edges_2():
 def test_ogr_geom_build_from_edges_3():
 
     if not ogrtest.have_geos():
-        return 'skip'
+        pytest.skip()
 
     src_geom = ogr.CreateGeometryFromWkt('POINT (0 1)')
     try:
@@ -555,11 +555,10 @@ def test_ogr_geom_build_from_edges_3():
 def test_ogr_geom_build_from_edges_4():
 
     if int(gdal.VersionInfo('VERSION_NUM')) < 1900:
-        gdaltest.post_reason('would crash')
-        return 'skip'
+        pytest.skip('would crash')
 
     if not ogrtest.have_geos():
-        return 'skip'
+        pytest.skip()
 
     link_coll = ogr.Geometry(type=ogr.wkbGeometryCollection)
 
@@ -587,7 +586,7 @@ def test_ogr_geom_build_from_edges_4():
         wkt = poly.ExportToWkt()
         assert wkt == 'POLYGON ((0 0,0 10,10 10,10 0,0 0),(1 1,1 2,2 2,2 1,1 1))'
     except:
-        return 'fail'
+        pytest.fail()
 
     return 'success'
 
@@ -1207,7 +1206,7 @@ def test_ogr_geom_triangle_invalid_wkt():
 def test_ogr_geom_triangle_sfcgal():
 
     if not ogrtest.have_sfcgal():
-        return 'skip'
+        pytest.skip()
 
     g1 = ogr.CreateGeometryFromWkt('TRIANGLE ((0 0,100 0 100,0 100 100,0 0))')
     g2 = ogr.CreateGeometryFromWkt('TRIANGLE ((-1 -1,100 0 100,0 100 100,-1 -1))')
@@ -3176,7 +3175,7 @@ def test_ogr_geom_polygon_empty_ring():
 def test_ogr_geom_polygon_intersects_point():
 
     if not ogrtest.have_geos():
-        return 'skip'
+        pytest.skip()
 
     poly = ogr.CreateGeometryFromWkt('POLYGON((0 0,5 5,10 0,0 0))')
     point = ogr.Geometry(ogr.wkbPoint)
@@ -3305,7 +3304,7 @@ def test_ogr_geom_remove_geometry():
 def test_ogr_geom_sfcgal():
 
     if not ogrtest.have_sfcgal():
-        return 'skip'
+        pytest.skip()
 
     g1 = ogr.CreateGeometryFromWkt('TIN EMPTY')
 
diff --git a/autotest/ogr/ogr_georss.py b/autotest/ogr/ogr_georss.py
index 456170bd9243..a64ee9bcf88a 100755
--- a/autotest/ogr/ogr_georss.py
+++ b/autotest/ogr/ogr_georss.py
@@ -87,7 +87,7 @@ def test_ogr_georss_init():
 def ogr_georss_test_atom(filename):
 
     if not gdaltest.georss_read_support:
-        return 'skip'
+        pytest.skip()
 
     ds = ogr.Open(filename)
     lyr = ds.GetLayerByName('georss')
@@ -165,7 +165,7 @@ def test_ogr_georss_1ter():
 def ogr_georss_test_rss(filename, only_first_feature):
 
     if not gdaltest.georss_read_support:
-        return 'skip'
+        pytest.skip()
 
     ds = ogr.Open(filename)
     assert ds is not None
@@ -180,8 +180,7 @@ def ogr_georss_test_rss(filename, only_first_feature):
 
     if lyr.GetSpatialRef().ExportToWkt().find('AXIS["Latitude",NORTH],AXIS["Longitude",EAST]') != -1:
         lyr.GetSpatialRef().ExportToWkt()
-        gdaltest.post_reason('AXIS definition found with latitude/longitude order!')
-        return 'fail'
+        pytest.fail('AXIS definition found with latitude/longitude order!')
 
     feat = lyr.GetNextFeature()
     expected_wkt = 'POINT (2 49)'
@@ -231,7 +230,7 @@ def test_ogr_georss_2():
 def test_ogr_georss_3():
 
     if not gdaltest.have_gml_reader:
-        return 'skip'
+        pytest.skip()
 
     return ogr_georss_test_rss('data/test_georss_gml.xml', False)
 
@@ -343,7 +342,7 @@ def test_ogr_georss_6():
 
 def test_ogr_georss_7():
     if not gdaltest.have_gml_reader:
-        return 'skip'
+        pytest.skip()
 
     return ogr_georss_test_rss('tmp/test_rss2.xml', False)
 
@@ -421,9 +420,9 @@ def test_ogr_georss_10():
 def test_ogr_georss_11():
 
     if not gdaltest.georss_read_support:
-        return 'skip'
+        pytest.skip()
     if not gdaltest.have_gml_reader:
-        return 'skip'
+        pytest.skip()
 
     ds = ogr.Open('tmp/test32631.rss')
     lyr = ds.GetLayer(0)
@@ -452,7 +451,7 @@ def test_ogr_georss_11():
 def test_ogr_georss_12():
 
     if not gdaltest.georss_read_support:
-        return 'skip'
+        pytest.skip()
 
     open('tmp/broken.rss', 'wt').write('<?xml version="1.0"?><rss><item><a></item></rss>')
     gdal.PushErrorHandler('CPLQuietErrorHandler')
@@ -515,7 +514,7 @@ def test_ogr_georss_13():
 def test_ogr_georss_14():
 
     if not gdaltest.georss_read_support:
-        return 'skip'
+        pytest.skip()
 
     ds = ogr.Open('tmp/nonstandard.rss')
     lyr = ds.GetLayer(0)
@@ -538,12 +537,12 @@ def test_ogr_georss_14():
 def test_ogr_georss_15():
 
     if not gdaltest.georss_read_support:
-        return 'skip'
+        pytest.skip()
 
     try:
         gdal.FileFromMemBuffer
     except AttributeError:
-        return 'skip'
+        pytest.skip()
 
     content = """<?xml version="1.0" encoding="UTF-8"?>
     <rss version="2.0" xmlns:georss="http://www.georss.org/georss" xmlns:gml="http://www.opengis.net/gml">
diff --git a/autotest/ogr/ogr_geos.py b/autotest/ogr/ogr_geos.py
index cfe3ec335b0a..9fd10fee6a3d 100755
--- a/autotest/ogr/ogr_geos.py
+++ b/autotest/ogr/ogr_geos.py
@@ -34,6 +34,7 @@
 import ogrtest
 from osgeo import ogr
 from osgeo import gdal
+import pytest
 
 ###############################################################################
 # Establish whether we have GEOS support integrated, testing simple Union.
@@ -42,7 +43,7 @@
 def test_ogr_geos_union():
 
     if not ogrtest.have_geos():
-        return 'skip'
+        pytest.skip()
 
     pnt1 = ogr.CreateGeometryFromWkt('POINT(10 20)')
     pnt2 = ogr.CreateGeometryFromWkt('POINT(30 20)')
@@ -60,7 +61,7 @@ def test_ogr_geos_union():
 def test_ogr_geos_intersection():
 
     if not ogrtest.have_geos():
-        return 'skip'
+        pytest.skip()
 
     g1 = ogr.CreateGeometryFromWkt('POLYGON((0 0, 10 10, 10 0, 0 0))')
     g2 = ogr.CreateGeometryFromWkt('POLYGON((0 0, 0 10, 10 0, 0 0))')
@@ -79,7 +80,7 @@ def test_ogr_geos_intersection():
 def test_ogr_geos_difference():
 
     if not ogrtest.have_geos():
-        return 'skip'
+        pytest.skip()
 
     g1 = ogr.CreateGeometryFromWkt('POLYGON((0 0, 10 10, 10 0, 0 0))')
     g2 = ogr.CreateGeometryFromWkt('POLYGON((0 0, 0 10, 10 0, 0 0))')
@@ -99,7 +100,7 @@ def test_ogr_geos_difference():
 def test_ogr_geos_symmetric_difference():
 
     if not ogrtest.have_geos():
-        return 'skip'
+        pytest.skip()
 
     g1 = ogr.CreateGeometryFromWkt('POLYGON((0 0, 10 10, 10 0, 0 0))')
     g2 = ogr.CreateGeometryFromWkt('POLYGON((0 0, 0 10, 10 0, 0 0))')
@@ -119,7 +120,7 @@ def test_ogr_geos_symmetric_difference():
 def test_ogr_geos_sym_difference():
 
     if not ogrtest.have_geos():
-        return 'skip'
+        pytest.skip()
 
     g1 = ogr.CreateGeometryFromWkt('POLYGON((0 0, 10 10, 10 0, 0 0))')
     g2 = ogr.CreateGeometryFromWkt('POLYGON((0 0, 0 10, 10 0, 0 0))')
@@ -139,7 +140,7 @@ def test_ogr_geos_sym_difference():
 def test_ogr_geos_intersect():
 
     if not ogrtest.have_geos():
-        return 'skip'
+        pytest.skip()
 
     g1 = ogr.CreateGeometryFromWkt('LINESTRING(0 0, 10 10)')
     g2 = ogr.CreateGeometryFromWkt('LINESTRING(10 0, 0 10)')
@@ -164,7 +165,7 @@ def test_ogr_geos_intersect():
 def test_ogr_geos_disjoint():
 
     if not ogrtest.have_geos():
-        return 'skip'
+        pytest.skip()
 
     g1 = ogr.CreateGeometryFromWkt('LINESTRING(0 0, 10 10)')
     g2 = ogr.CreateGeometryFromWkt('LINESTRING(10 0, 0 10)')
@@ -189,7 +190,7 @@ def test_ogr_geos_disjoint():
 def test_ogr_geos_touches():
 
     if not ogrtest.have_geos():
-        return 'skip'
+        pytest.skip()
 
     g1 = ogr.CreateGeometryFromWkt('LINESTRING(0 0, 10 10)')
     g2 = ogr.CreateGeometryFromWkt('LINESTRING(0 0, 0 10)')
@@ -214,7 +215,7 @@ def test_ogr_geos_touches():
 def test_ogr_geos_crosses():
 
     if not ogrtest.have_geos():
-        return 'skip'
+        pytest.skip()
 
     g1 = ogr.CreateGeometryFromWkt('LINESTRING(0 0, 10 10)')
     g2 = ogr.CreateGeometryFromWkt('LINESTRING(10 0, 0 10)')
@@ -238,7 +239,7 @@ def test_ogr_geos_crosses():
 def test_ogr_geos_within():
 
     if not ogrtest.have_geos():
-        return 'skip'
+        pytest.skip()
 
     g1 = ogr.CreateGeometryFromWkt('POLYGON((0 0, 10 10, 10 0, 0 0))')
     g2 = ogr.CreateGeometryFromWkt('POLYGON((-90 -90, -90 90, 190 -90, -90 -90))')
@@ -259,7 +260,7 @@ def test_ogr_geos_within():
 def test_ogr_geos_contains():
 
     if not ogrtest.have_geos():
-        return 'skip'
+        pytest.skip()
 
     g1 = ogr.CreateGeometryFromWkt('POLYGON((0 0, 10 10, 10 0, 0 0))')
     g2 = ogr.CreateGeometryFromWkt('POLYGON((-90 -90, -90 90, 190 -90, -90 -90))')
@@ -280,7 +281,7 @@ def test_ogr_geos_contains():
 def test_ogr_geos_overlaps():
 
     if not ogrtest.have_geos():
-        return 'skip'
+        pytest.skip()
 
     g1 = ogr.CreateGeometryFromWkt('POLYGON((0 0, 10 10, 10 0, 0 0))')
     g2 = ogr.CreateGeometryFromWkt('POLYGON((-90 -90, -90 90, 190 -90, -90 -90))')
@@ -305,7 +306,7 @@ def test_ogr_geos_overlaps():
 def test_ogr_geos_buffer():
 
     if not ogrtest.have_geos():
-        return 'skip'
+        pytest.skip()
 
     g1 = ogr.CreateGeometryFromWkt('POLYGON((0 0, 10 10, 10 0, 0 0))')
 
@@ -323,7 +324,7 @@ def test_ogr_geos_buffer():
 def test_ogr_geos_centroid():
 
     if not ogrtest.have_geos():
-        return 'skip'
+        pytest.skip()
 
     g1 = ogr.CreateGeometryFromWkt('POLYGON((0 0, 10 10, 10 0, 0 0))')
 
@@ -349,7 +350,7 @@ def test_ogr_geos_centroid():
 def test_ogr_geos_centroid_multipolygon():
 
     if not ogrtest.have_geos():
-        return 'skip'
+        pytest.skip()
 
     g1 = ogr.CreateGeometryFromWkt('MULTIPOLYGON(((0 0,0 1,1 1,1 0,0 0)),((2 0,2 1,3 1,3 0,2 0)))')
 
@@ -367,7 +368,7 @@ def test_ogr_geos_centroid_multipolygon():
 def test_ogr_geos_centroid_point_empty():
 
     if not ogrtest.have_geos():
-        return 'skip'
+        pytest.skip()
 
     g1 = ogr.CreateGeometryFromWkt('POINT EMPTY')
 
@@ -383,7 +384,7 @@ def test_ogr_geos_centroid_point_empty():
 def test_ogr_geos_simplify_linestring():
 
     if not ogrtest.have_geos():
-        return 'skip'
+        pytest.skip()
 
     g1 = ogr.CreateGeometryFromWkt('LINESTRING(0 0,1 0,10 0)')
 
@@ -401,7 +402,7 @@ def test_ogr_geos_simplify_linestring():
 def test_ogr_geos_simplifypreservetopology_linestring():
 
     if not ogrtest.have_geos():
-        return 'skip'
+        pytest.skip()
 
     g1 = ogr.CreateGeometryFromWkt('LINESTRING(0 0,1 0,10 0)')
 
@@ -419,7 +420,7 @@ def test_ogr_geos_simplifypreservetopology_linestring():
 def test_ogr_geos_unioncascaded():
 
     if not ogrtest.have_geos():
-        return 'skip'
+        pytest.skip()
 
     g1 = ogr.CreateGeometryFromWkt('MULTIPOLYGON(((0 0,0 1,1 1,1 0,0 0)),((0.5 0.5,0.5 1.5,1.5 1.5,1.5 0.5,0.5 0.5)))')
 
@@ -437,7 +438,7 @@ def test_ogr_geos_unioncascaded():
 def test_ogr_geos_convexhull():
 
     if not ogrtest.have_geos():
-        return 'skip'
+        pytest.skip()
 
     g1 = ogr.CreateGeometryFromWkt('GEOMETRYCOLLECTION(POINT(0 1), POINT(0 0), POINT(1 0), POINT(1 1))')
 
@@ -454,7 +455,7 @@ def test_ogr_geos_convexhull():
 def test_ogr_geos_distance():
 
     if not ogrtest.have_geos():
-        return 'skip'
+        pytest.skip()
 
     g1 = ogr.CreateGeometryFromWkt('POINT(0 0)')
     g2 = ogr.CreateGeometryFromWkt('POINT(1 0)')
@@ -472,7 +473,7 @@ def test_ogr_geos_distance():
 def test_ogr_geos_isring():
 
     if not ogrtest.have_geos():
-        return 'skip'
+        pytest.skip()
 
     g1 = ogr.CreateGeometryFromWkt('LINESTRING(0 0,0 1,1 1,0 0)')
 
@@ -488,7 +489,7 @@ def test_ogr_geos_isring():
 def test_ogr_geos_issimple_true():
 
     if not ogrtest.have_geos():
-        return 'skip'
+        pytest.skip()
 
     g1 = ogr.CreateGeometryFromWkt('POLYGON ((0 0,0 1,1 1,1 0,0 0))')
 
@@ -504,7 +505,7 @@ def test_ogr_geos_issimple_true():
 def test_ogr_geos_issimple_false():
 
     if not ogrtest.have_geos():
-        return 'skip'
+        pytest.skip()
 
     g1 = ogr.CreateGeometryFromWkt('LINESTRING(1 1,2 2,2 3.5,1 3,1 2,2 1)')
 
@@ -520,7 +521,7 @@ def test_ogr_geos_issimple_false():
 def test_ogr_geos_isvalid_true():
 
     if not ogrtest.have_geos():
-        return 'skip'
+        pytest.skip()
 
     g1 = ogr.CreateGeometryFromWkt('LINESTRING(0 0, 1 1)')
 
@@ -536,7 +537,7 @@ def test_ogr_geos_isvalid_true():
 def test_ogr_geos_isvalid_true_linestringM():
 
     if not ogrtest.have_geos():
-        return 'skip'
+        pytest.skip()
 
     g1 = ogr.CreateGeometryFromWkt('LINESTRING M(0 0 10, 1 1 20)')
 
@@ -552,7 +553,7 @@ def test_ogr_geos_isvalid_true_linestringM():
 def test_ogr_geos_isvalid_true_circularStringM():
 
     if not ogrtest.have_geos():
-        return 'skip'
+        pytest.skip()
 
     g1 = ogr.CreateGeometryFromWkt('CIRCULARSTRING M(0 0 10, 1 1 20,2 0 30)')
 
@@ -568,7 +569,7 @@ def test_ogr_geos_isvalid_true_circularStringM():
 def test_ogr_geos_isvalid_true_triangle():
 
     if not ogrtest.have_geos():
-        return 'skip'
+        pytest.skip()
 
     g1 = ogr.CreateGeometryFromWkt('TRIANGLE ((0 0,0 1,1 1,0 0))')
 
@@ -584,7 +585,7 @@ def test_ogr_geos_isvalid_true_triangle():
 def test_ogr_geos_isvalid_false():
 
     if not ogrtest.have_geos():
-        return 'skip'
+        pytest.skip()
 
     g1 = ogr.CreateGeometryFromWkt('POLYGON((0 0,1 1,1 2,1 1,0 0))')
 
@@ -601,7 +602,7 @@ def test_ogr_geos_isvalid_false():
 def test_ogr_geos_pointonsurface():
 
     if not ogrtest.have_geos():
-        return 'skip'
+        pytest.skip()
 
     g1 = ogr.CreateGeometryFromWkt('POLYGON((0 0, 10 10, 10 0, 0 0))')
 
@@ -617,7 +618,7 @@ def test_ogr_geos_pointonsurface():
 def test_ogr_geos_DelaunayTriangulation():
 
     if not ogrtest.have_geos():
-        return 'skip'
+        pytest.skip()
 
     g1 = ogr.CreateGeometryFromWkt('MULTIPOINT(0 0,0 1,1 1,1 0)')
 
@@ -625,7 +626,7 @@ def test_ogr_geos_DelaunayTriangulation():
     triangulation = g1.DelaunayTriangulation()
     if triangulation is None:
         assert gdal.GetLastErrorMsg() != ''
-        return 'skip'
+        pytest.skip()
 
     assert triangulation.ExportToWkt() == 'GEOMETRYCOLLECTION (POLYGON ((0 1,0 0,1 0,0 1)),POLYGON ((0 1,1 0,1 1,0 1)))', \
         ('Got: %s' % triangulation.ExportToWkt())
@@ -638,7 +639,7 @@ def test_ogr_geos_DelaunayTriangulation():
 def test_ogr_geos_polygonize():
 
     if not ogrtest.have_geos():
-        return 'skip'
+        pytest.skip()
 
     g = ogr.CreateGeometryFromWkt('MULTILINESTRING((0 0,0 1,1 1),(1 1,0 0))')
     got = g.Polygonize()
diff --git a/autotest/ogr/ogr_gft.py b/autotest/ogr/ogr_gft.py
index ee879e42cb92..e7e7081a021b 100755
--- a/autotest/ogr/ogr_gft.py
+++ b/autotest/ogr/ogr_gft.py
@@ -37,6 +37,7 @@
 import ogrtest
 from osgeo import gdal
 from osgeo import ogr
+import pytest
 
 ###############################################################################
 # Test if driver is available
@@ -49,12 +50,11 @@ def test_ogr_gft_init():
     ogrtest.gft_drv = ogr.GetDriverByName('GFT')
 
     if ogrtest.gft_drv is None:
-        return 'skip'
+        pytest.skip()
 
     if gdaltest.gdalurlopen('http://www.google.com') is None:
-        print('cannot open http://www.google.com')
         ogrtest.gft_drv = None
-        return 'skip'
+        pytest.skip('cannot open http://www.google.com')
 
     ogrtest.gft_refresh = '1/woRTxgfN8dLUpRhnOL-BXG-f7VxzXKy_3D5eizH8bS8'
 
@@ -66,7 +66,7 @@ def test_ogr_gft_init():
 
 def test_ogr_gft_read():
     if ogrtest.gft_drv is None:
-        return 'skip'
+        pytest.skip()
 
     table_id = '15eIgEVTUNlC649ODphJVHXeb4nsOb49WJUlnhw'
 
@@ -90,12 +90,11 @@ def test_ogr_gft_read():
 
     count = lyr.GetFeatureCount()
     if count == 0:
-        gdaltest.post_reason('did not get expected feature count')
         print(count)
         if gdaltest.skip_on_travis() or gdal.GetConfigOption('APPVEYOR') is not None:
             ogrtest.gft_drv = None
-            return 'skip'
-        return 'fail'
+            pytest.skip()
+        pytest.fail('did not get expected feature count')
 
     sql_lyr = ds.ExecuteSQL("SELECT Latitude, Longitude FROM " + table_id + " WHERE ST_INTERSECTS('Latitude', RECTANGLE(LATLNG(31.5,67.0), LATLNG(32.0,67.5))) AND 'Attack on' = 'ENEMY'")
     assert sql_lyr is not None, 'SQL request failed'
@@ -113,16 +112,16 @@ def test_ogr_gft_read():
 
 def test_ogr_gft_write():
     if ogrtest.gft_drv is None:
-        return 'skip'
+        pytest.skip()
 
     if ogrtest.gft_refresh is None:
         ogrtest.gft_can_write = False
-        return 'skip'
+        pytest.skip()
 
     ds = ogr.Open('GFT:refresh=%s' % ogrtest.gft_refresh, update=1)
     if ds is None:
         ogrtest.gft_can_write = False
-        return 'skip'
+        pytest.skip()
     ogrtest.gft_can_write = True
 
     import random
@@ -149,15 +148,13 @@ def test_ogr_gft_write():
     lyr.ResetReading()
     feat = lyr.GetNextFeature()
     if feat.GetFieldAsString('strcol') != 'bar':
-        gdaltest.post_reason('GetNextFeature() did not get expected feature')
         feat.DumpReadable()
-        return 'fail'
+        pytest.fail('GetNextFeature() did not get expected feature')
 
     feat = lyr.GetFeature(fid)
     if feat.GetFieldAsString('strcol') != 'bar':
-        gdaltest.post_reason('GetFeature() did not get expected feature')
         feat.DumpReadable()
-        return 'fail'
+        pytest.fail('GetFeature() did not get expected feature')
     got_wkt = feat.GetGeometryRef().ExportToWkt()
     assert got_wkt == expected_wkt, 'did not get expected geometry'
 
@@ -178,14 +175,14 @@ def test_ogr_gft_write():
 
 def test_ogr_gft_ogr2ogr_non_spatial():
     if ogrtest.gft_drv is None:
-        return 'skip'
+        pytest.skip()
 
     if not ogrtest.gft_can_write:
-        return 'skip'
+        pytest.skip()
 
     import test_cli_utilities
     if test_cli_utilities.get_ogr2ogr_path() is None:
-        return 'skip'
+        pytest.skip()
 
     layer_name = 'no_geometry_table_%d' % ogrtest.gft_rand_val
 
@@ -202,19 +199,16 @@ def test_ogr_gft_ogr2ogr_non_spatial():
     ds = ogr.Open('GFT:refresh=%s' % ogrtest.gft_refresh, update=1)
     lyr = ds.GetLayerByName(layer_name)
     if lyr.GetLayerDefn().GetFieldCount() != 2:
-        gdaltest.post_reason('did not get expected field count')
         ds.ExecuteSQL('DELLAYER:' + layer_name)
-        return 'fail'
+        pytest.fail('did not get expected field count')
 
     if lyr.GetGeomType() != ogr.wkbNone:
-        gdaltest.post_reason('did not get expected layer geometry type')
         ds.ExecuteSQL('DELLAYER:' + layer_name)
-        return 'fail'
+        pytest.fail('did not get expected layer geometry type')
 
     if lyr.GetFeatureCount() != 3:
-        gdaltest.post_reason('did not get expected feature count')
         ds.ExecuteSQL('DELLAYER:' + layer_name)
-        return 'fail'
+        pytest.fail('did not get expected feature count')
 
     ds.ExecuteSQL('DELLAYER:' + layer_name)
 
@@ -228,14 +222,14 @@ def test_ogr_gft_ogr2ogr_non_spatial():
 
 def test_ogr_gft_ogr2ogr_spatial():
     if ogrtest.gft_drv is None:
-        return 'skip'
+        pytest.skip()
 
     if not ogrtest.gft_can_write:
-        return 'skip'
+        pytest.skip()
 
     import test_cli_utilities
     if test_cli_utilities.get_ogr2ogr_path() is None:
-        return 'skip'
+        pytest.skip()
 
     layer_name = 'geometry_table_%d' % ogrtest.gft_rand_val
     copied_layer_name = 'copied_geometry_table_%d' % ogrtest.gft_rand_val
@@ -265,41 +259,35 @@ def test_ogr_gft_ogr2ogr_spatial():
         lyr = ds.GetLayerByName(name)
 
         if lyr.GetGeometryColumn() != 'geometry':
-            gdaltest.post_reason('layer %s: did not get expected geometry column' % name)
             ds.ExecuteSQL('DELLAYER:' + layer_name)
             ds.ExecuteSQL('DELLAYER:' + copied_layer_name)
-            return 'fail'
+            pytest.fail('layer %s: did not get expected geometry column' % name)
 
         if lyr.GetLayerDefn().GetFieldCount() != 3:
-            gdaltest.post_reason('layer %s: did not get expected field count' % name)
             ds.ExecuteSQL('DELLAYER:' + layer_name)
             ds.ExecuteSQL('DELLAYER:' + copied_layer_name)
-            return 'fail'
+            pytest.fail('layer %s: did not get expected field count' % name)
 
         if lyr.GetGeomType() != ogr.wkbUnknown:
-            gdaltest.post_reason('layer %s: did not get expected layer geometry type' % name)
             ds.ExecuteSQL('DELLAYER:' + layer_name)
             ds.ExecuteSQL('DELLAYER:' + copied_layer_name)
-            return 'fail'
+            pytest.fail('layer %s: did not get expected layer geometry type' % name)
 
         if lyr.GetFeatureCount() != 3:
-            gdaltest.post_reason('layer %s: did not get expected feature count' % name)
             ds.ExecuteSQL('DELLAYER:' + layer_name)
             ds.ExecuteSQL('DELLAYER:' + copied_layer_name)
-            return 'fail'
+            pytest.fail('layer %s: did not get expected feature count' % name)
 
         feat = lyr.GetNextFeature()
         if feat.GetGeometryRef().ExportToWkt() != "POINT (0 1)":
-            gdaltest.post_reason('layer %s: did not get expected geometry' % name)
             ds.ExecuteSQL('DELLAYER:' + layer_name)
             ds.ExecuteSQL('DELLAYER:' + copied_layer_name)
-            return 'fail'
+            pytest.fail('layer %s: did not get expected geometry' % name)
 
         if feat.GetFieldAsInteger('bar') != 2:
-            gdaltest.post_reason('layer %s: did not get expected field value' % name)
             ds.ExecuteSQL('DELLAYER:' + layer_name)
             ds.ExecuteSQL('DELLAYER:' + copied_layer_name)
-            return 'fail'
+            pytest.fail('layer %s: did not get expected field value' % name)
 
     ds.ExecuteSQL('DELLAYER:' + layer_name)
     ds.ExecuteSQL('DELLAYER:' + copied_layer_name)
diff --git a/autotest/ogr/ogr_gml_fgd_read.py b/autotest/ogr/ogr_gml_fgd_read.py
index 265039d56e36..e25965b86dea 100755
--- a/autotest/ogr/ogr_gml_fgd_read.py
+++ b/autotest/ogr/ogr_gml_fgd_read.py
@@ -37,6 +37,7 @@
 from osgeo import gdal
 from osgeo import ogr
 from osgeo import osr
+import pytest
 
 
 ###############################################################################
@@ -58,9 +59,8 @@ def test_ogr_gml_fgd_1():
 
     if ds is None:
         if gdal.GetLastErrorMsg().find('Xerces') != -1:
-            return 'skip'
-        gdaltest.post_reason('failed to open test file.')
-        return 'fail'
+            pytest.skip()
+        pytest.fail('failed to open test file.')
 
     # we have gml reader for fgd
     gdaltest.have_gml_fgd_reader = 1
@@ -90,7 +90,7 @@ def test_ogr_gml_fgd_1():
 
 def test_ogr_gml_fgd_2():
     if not gdaltest.have_gml_fgd_reader:
-        return 'skip'
+        pytest.skip()
 
     # open FGD GML file
     ds = ogr.Open(_fgd_dir + 'BldA.xml')
diff --git a/autotest/ogr/ogr_gml_geom.py b/autotest/ogr/ogr_gml_geom.py
index f88e5a707dbe..c924509a7857 100755
--- a/autotest/ogr/ogr_gml_geom.py
+++ b/autotest/ogr/ogr_gml_geom.py
@@ -68,8 +68,7 @@ def test_gml_geom(unit):
     if ogrtest.check_feature_geometry(geom_wkt, geom_gml, 0.0000000000001) == 1:
         clean_wkt = geom_wkt.ExportToWkt()
         gml_wkt = geom_gml.ExportToWkt()
-        gdaltest.post_reason('WKT from GML (%s) does not match clean WKT (%s).\ngml was (%s)' % (gml_wkt, clean_wkt, gml))
-        return 'fail'
+        pytest.fail('WKT from GML (%s) does not match clean WKT (%s).\ngml was (%s)' % (gml_wkt, clean_wkt, gml))
 
     return 'success'
 
@@ -1286,8 +1285,7 @@ def test_gml_invalid_geoms():
         else:
             wkt = geom.ExportToWkt()
             if expected_wkt is None:
-                gdaltest.post_reason('did not get expected result for %s. Got %s instead of None' % (gml, wkt))
-                return 'fail'
+                pytest.fail('did not get expected result for %s. Got %s instead of None' % (gml, wkt))
             else:
                 assert wkt == expected_wkt, \
                     ('did not get expected result for %s. Got %s instead of %s' % (gml, wkt, expected_wkt))
@@ -1648,8 +1646,7 @@ def test_gml_Coordinates_ts_cs_decimal():
         geom = ogr.CreateGeometryFromGML(gml)
         wkt = geom.ExportToWkt()
         if expected_wkt is None:
-            gdaltest.post_reason('did not get expected result for %s. Got %s instead of None' % (gml, wkt))
-            return 'fail'
+            pytest.fail('did not get expected result for %s. Got %s instead of None' % (gml, wkt))
         else:
             assert wkt == expected_wkt, \
                 ('did not get expected result for %s. Got %s instead of %s' % (gml, wkt, expected_wkt))
@@ -1691,8 +1688,7 @@ def test_gml_with_xml_header_and_comments():
         geom = ogr.CreateGeometryFromGML(gml)
         wkt = geom.ExportToWkt()
         if expected_wkt is None:
-            gdaltest.post_reason('did not get expected result for %s. Got %s instead of None' % (gml, wkt))
-            return 'fail'
+            pytest.fail('did not get expected result for %s. Got %s instead of None' % (gml, wkt))
         else:
             assert wkt == expected_wkt, \
                 ('did not get expected result for %s. Got %s instead of %s' % (gml, wkt, expected_wkt))
diff --git a/autotest/ogr/ogr_gml_read.py b/autotest/ogr/ogr_gml_read.py
index dae301442d3a..45e4600ef0e5 100755
--- a/autotest/ogr/ogr_gml_read.py
+++ b/autotest/ogr/ogr_gml_read.py
@@ -54,9 +54,8 @@ def test_ogr_gml_1():
     gml_ds = ogr.Open('data/ionic_wfs.gml')
     if gml_ds is None:
         if gdal.GetLastErrorMsg().find('Xerces') != -1:
-            return 'skip'
-        gdaltest.post_reason('failed to open test file.')
-        return 'fail'
+            pytest.skip()
+        pytest.fail('failed to open test file.')
 
     gdaltest.have_gml_reader = 1
 
@@ -82,7 +81,7 @@ def test_ogr_gml_1():
 
 def test_ogr_gml_2():
     if not gdaltest.have_gml_reader:
-        return 'skip'
+        pytest.skip()
 
     # copy gml file (but not .gfs file)
     open('tmp/ionic_wfs.gml', 'w').write(open('data/ionic_wfs.gml').read())
@@ -111,7 +110,7 @@ def test_ogr_gml_2():
 
 def test_ogr_gml_3():
     if not gdaltest.have_gml_reader:
-        return 'skip'
+        pytest.skip()
 
     gml_ds = ogr.Open('data/rnf_eg.gml')
 
@@ -140,7 +139,7 @@ def test_ogr_gml_3():
 
 def test_ogr_gml_4():
     if not gdaltest.have_gml_reader:
-        return 'skip'
+        pytest.skip()
 
     gml_ds = ogr.Open('data/bom.gml')
 
@@ -179,7 +178,7 @@ def test_ogr_gml_4():
 def test_ogr_gml_5():
 
     if not gdaltest.have_gml_reader:
-        return 'skip'
+        pytest.skip()
 
     gml_ds = ogr.Open('data/ticket_2349_test_1.gml')
 
@@ -198,7 +197,7 @@ def test_ogr_gml_5():
 def test_ogr_gml_6():
 
     if not gdaltest.have_gml_reader:
-        return 'skip'
+        pytest.skip()
 
     files = ['test_point1', 'test_point2', 'test_point3', 'test_point4']
     fids = []
@@ -212,8 +211,7 @@ def test_ogr_gml_6():
             if (feat.GetFID() < 0) or (feat.GetFID() in fids):
                 gml_ds = None
                 os.remove('data' + os.sep + filename + '.gfs')
-                gdaltest.post_reason('Wrong FID value')
-                return 'fail'
+                pytest.fail('Wrong FID value')
             fids.append(feat.GetFID())
             feat = lyr.GetNextFeature()
         gml_ds = None
@@ -228,7 +226,7 @@ def test_ogr_gml_6():
 def test_ogr_gml_7():
 
     if not gdaltest.have_gml_reader:
-        return 'skip'
+        pytest.skip()
 
     gdal.SetConfigOption('GML_EXPOSE_FID', 'FALSE')
     gml_ds = ogr.Open('data/test_point.gml')
@@ -242,7 +240,7 @@ def test_ogr_gml_7():
     try:
         ldefn.GetFieldDefn(0).GetFieldTypeName
     except:
-        return 'skip'
+        pytest.skip()
 
     assert ldefn.GetFieldDefn(0).GetFieldTypeName(ldefn.GetFieldDefn(0).GetType()) == 'Real'
     assert ldefn.GetFieldDefn(1).GetFieldTypeName(ldefn.GetFieldDefn(1).GetType()) == 'Integer'
@@ -257,7 +255,7 @@ def test_ogr_gml_7():
 def test_ogr_gml_8():
 
     if not gdaltest.have_gml_reader:
-        return 'skip'
+        pytest.skip()
 
     gml_ds = ogr.Open('data/utf8.gml')
     lyr = gml_ds.GetLayer()
@@ -276,7 +274,7 @@ def test_ogr_gml_8():
 def test_ogr_gml_9():
 
     if not gdaltest.have_gml_reader:
-        return 'skip'
+        pytest.skip()
 
     drv = ogr.GetDriverByName('GML')
     ds = drv.CreateDataSource('tmp/broken_utf8.gml')
@@ -314,7 +312,7 @@ def test_ogr_gml_9():
 def test_ogr_gml_10():
 
     if not gdaltest.have_gml_reader:
-        return 'skip'
+        pytest.skip()
 
     drv = ogr.GetDriverByName('GML')
     ds = drv.CreateDataSource('tmp/fields.gml')
@@ -390,7 +388,7 @@ def test_ogr_gml_10():
 def test_ogr_gml_11():
 
     if not gdaltest.have_gml_reader:
-        return 'skip'
+        pytest.skip()
 
     # Make sure the .gfs file is more recent that the .gml one
     try:
@@ -429,7 +427,7 @@ def test_ogr_gml_11():
 def test_ogr_gml_12():
 
     if not gdaltest.have_gml_reader:
-        return 'skip'
+        pytest.skip()
 
     ds = ogr.Open('/vsizip/data/testgeometryelementpath.zip/testgeometryelementpath.gml')
     lyr = ds.GetLayer(0)
@@ -453,7 +451,7 @@ def test_ogr_gml_12():
 def test_ogr_gml_13():
 
     if not gdaltest.have_gml_reader:
-        return 'skip'
+        pytest.skip()
 
     for _ in range(2):
         ds = ogr.Open('data/testlistfields.gml')
@@ -479,22 +477,21 @@ def test_ogr_gml_13():
 def test_ogr_gml_14():
 
     if not gdaltest.have_gml_reader:
-        return 'skip'
+        pytest.skip()
 
     # We need CURL for xlink resolution, and a sign that Curl is available
     # is the availability of the WMS driver
     gdaltest.wms_drv = gdal.GetDriverByName('WMS')
     if gdaltest.wms_drv is None:
-        return 'skip'
+        pytest.skip()
 
     if gdaltest.gdalurlopen('http://download.osgeo.org/gdal/data/gml/xlink3.gml') is None:
-        print('cannot open URL')
-        return 'skip'
+        pytest.skip('cannot open URL')
 
     files = ['xlink1.gml', 'xlink2.gml', 'expected1.gml', 'expected2.gml']
     for f in files:
         if not gdaltest.download_file('http://download.osgeo.org/gdal/data/gml/' + f, f):
-            return 'skip'
+            pytest.skip()
 
     gdal.SetConfigOption('GML_SKIP_RESOLVE_ELEMS', 'NONE')
     gdal.SetConfigOption('GML_SAVE_RESOLVED_TO', 'tmp/cache/xlink1resolved.gml')
@@ -517,7 +514,7 @@ def test_ogr_gml_14():
         expectedtext = fp.read()
         fp.close()
     except (IOError, OSError):
-        return 'fail'
+        pytest.fail()
 
     assert text == expectedtext, 'Problem with file 1'
 
@@ -530,7 +527,7 @@ def test_ogr_gml_14():
         expectedtext = fp.read()
         fp.close()
     except (IOError, OSError):
-        return 'fail'
+        pytest.fail()
 
     assert text == expectedtext, 'Problem with file 2'
 
@@ -543,11 +540,11 @@ def test_ogr_gml_14():
 def test_ogr_gml_15():
 
     if not gdaltest.have_gml_reader:
-        return 'skip'
+        pytest.skip()
 
     import test_cli_utilities
     if test_cli_utilities.get_test_ogrsf_path() is None:
-        return 'skip'
+        pytest.skip()
 
     ret = gdaltest.runexternal(test_cli_utilities.get_test_ogrsf_path() + ' -ro data/test_point.gml')
 
@@ -562,7 +559,7 @@ def test_ogr_gml_15():
 def test_ogr_gml_16():
 
     if not gdaltest.have_gml_reader:
-        return 'skip'
+        pytest.skip()
 
     ds = ogr.Open('data/citygml.gml')
     lyr = ds.GetLayer(0)
@@ -572,8 +569,7 @@ def test_ogr_gml_16():
        feat.GetField('a_int_attr') != 2 or \
        feat.GetField('a_double_attr') != 3.45:
         feat.DumpReadable()
-        gdaltest.post_reason('did not get expected values')
-        return 'fail'
+        pytest.fail('did not get expected values')
 
     return 'success'
 
@@ -584,7 +580,7 @@ def test_ogr_gml_16():
 def test_ogr_gml_17():
 
     if not gdaltest.have_gml_reader:
-        return 'skip'
+        pytest.skip()
 
     ds = ogr.Open('data/gnis_pop_100.gml')
     lyr = ds.GetLayer(0)
@@ -606,7 +602,7 @@ def test_ogr_gml_17():
 def test_ogr_gml_18():
 
     if not gdaltest.have_gml_reader:
-        return 'skip'
+        pytest.skip()
 
     ds = ogr.Open('data/gnis_pop_110.gml')
     lyr = ds.GetLayer(0)
@@ -629,7 +625,7 @@ def test_ogr_gml_18():
 def test_ogr_gml_19():
 
     if not gdaltest.have_gml_reader:
-        return 'skip'
+        pytest.skip()
 
     try:
         os.remove('data/gnis_pop_110.gfs')
@@ -661,7 +657,7 @@ def test_ogr_gml_19():
 def test_ogr_gml_20():
 
     if not gdaltest.have_gml_reader:
-        return 'skip'
+        pytest.skip()
 
     try:
         os.remove('data/archsites.gfs')
@@ -675,7 +671,7 @@ def test_ogr_gml_20():
     try:
         ldefn.GetFieldDefn(0).GetFieldTypeName
     except:
-        return 'skip'
+        pytest.skip()
 
     idx = ldefn.GetFieldIndex("gml_id")
     assert idx != -1, 'did not get expected column "gml_id"'
@@ -698,8 +694,7 @@ def test_ogr_gml_20():
 
     try:
         os.stat('data/archsites.gfs')
-        gdaltest.post_reason('did not expected .gfs -> XSD parsing failed')
-        return 'fail'
+        pytest.fail('did not expected .gfs -> XSD parsing failed')
     except OSError:
         return 'success'
 
@@ -710,7 +705,7 @@ def test_ogr_gml_20():
 def test_ogr_gml_21(frmt='GML3'):
 
     if not gdaltest.have_gml_reader:
-        return 'skip'
+        pytest.skip()
 
     # Create GML3 file
     sr = osr.SpatialReference()
@@ -803,7 +798,7 @@ def test_ogr_gml_21_gml32():
 def test_ogr_gml_22():
 
     if not gdaltest.have_gml_reader:
-        return 'skip'
+        pytest.skip()
 
     ds = ogr.Open('data/paris_typical_strike_demonstration.xml')
     lyr = ds.GetLayerByName('RouteGeometry')
@@ -824,7 +819,7 @@ def test_ogr_gml_22():
 def test_ogr_gml_23():
 
     if not gdaltest.have_gml_reader:
-        return 'skip'
+        pytest.skip()
 
     try:
         os.remove('tmp/global_geometry.gfs')
@@ -861,7 +856,7 @@ def test_ogr_gml_23():
 def test_ogr_gml_24():
 
     if not gdaltest.have_gml_reader:
-        return 'skip'
+        pytest.skip()
 
     try:
         os.remove('data/global_geometry.gfs')
@@ -900,11 +895,10 @@ def test_ogr_gml_24():
 def test_ogr_gml_25():
 
     if not gdaltest.have_gml_reader:
-        return 'skip'
+        pytest.skip()
 
     if int(gdal.VersionInfo('VERSION_NUM')) < 1900:
-        gdaltest.post_reason('would crash')
-        return 'skip'
+        pytest.skip('would crash')
 
     try:
         os.remove('data/curveProperty.gfs')
@@ -932,11 +926,11 @@ def test_ogr_gml_25():
 def test_ogr_gml_26():
 
     if not gdaltest.have_gml_reader:
-        return 'skip'
+        pytest.skip()
 
     import test_cli_utilities
     if test_cli_utilities.get_ogr2ogr_path() is None:
-        return 'skip'
+        pytest.skip()
 
     gdaltest.runexternal(test_cli_utilities.get_ogr2ogr_path() + ' -f GML tmp/ogr_gml_26.gml data/poly.shp -zfield eas_id')
 
@@ -962,11 +956,11 @@ def test_ogr_gml_26():
 def test_ogr_gml_27():
 
     if not gdaltest.have_gml_reader:
-        return 'skip'
+        pytest.skip()
 
     import test_cli_utilities
     if test_cli_utilities.get_ogr2ogr_path() is None:
-        return 'skip'
+        pytest.skip()
 
     gdaltest.runexternal(test_cli_utilities.get_ogr2ogr_path() + ' -f GML tmp/ogr_gml_27.gml data/poly.shp -zfield eas_id -dsco FORMAT=GML3')
 
@@ -992,11 +986,11 @@ def test_ogr_gml_27():
 def test_ogr_gml_28():
 
     if not gdaltest.have_gml_reader:
-        return 'skip'
+        pytest.skip()
 
     import test_cli_utilities
     if test_cli_utilities.get_ogr2ogr_path() is None:
-        return 'skip'
+        pytest.skip()
 
     gdaltest.runexternal(test_cli_utilities.get_ogr2ogr_path() + ' -f GML tmp/ogr_gml_28.gml data/idlink.dbf')
 
@@ -1028,7 +1022,7 @@ def test_ogr_gml_28():
 def test_ogr_gml_29():
 
     if not gdaltest.have_gml_reader:
-        return 'skip'
+        pytest.skip()
 
     ds = ogr.Open('data/testfmegml.gml')
 
@@ -1059,7 +1053,7 @@ def test_ogr_gml_29():
 def test_ogr_gml_30():
 
     if not gdaltest.have_gml_reader:
-        return 'skip'
+        pytest.skip()
 
     field1 = " "
     for _ in range(11):
@@ -1103,7 +1097,7 @@ def test_ogr_gml_30():
 def test_ogr_gml_31():
 
     if not gdaltest.have_gml_reader:
-        return 'skip'
+        pytest.skip()
 
     gdal.SetConfigOption('GML_READ_MODE', 'SEQUENTIAL_LAYERS')
     ret = test_ogr_gml_29()
@@ -1133,7 +1127,7 @@ def test_ogr_gml_31():
 def test_ogr_gml_32():
 
     if not gdaltest.have_gml_reader:
-        return 'skip'
+        pytest.skip()
 
     # Test without .xsd or .gfs
     f = gdal.VSIFOpenL("data/testfmegml.gml", "rb")
@@ -1174,7 +1168,7 @@ def test_ogr_gml_32():
 def test_ogr_gml_33():
 
     if not gdaltest.have_gml_reader:
-        return 'skip'
+        pytest.skip()
 
     # Test reading second layer and then first layer
     gdal.SetConfigOption('GML_READ_MODE', 'INTERLEAVED_LAYERS')
@@ -1214,7 +1208,7 @@ def test_ogr_gml_33():
 def test_ogr_gml_34():
 
     if not gdaltest.have_gml_reader:
-        return 'skip'
+        pytest.skip()
 
     drv = ogr.GetDriverByName('GML')
     ds = drv.CreateDataSource('/vsimem/ogr_gml_34.gml')
@@ -1244,13 +1238,13 @@ def test_ogr_gml_34():
 def test_ogr_gml_35():
 
     if not gdaltest.have_gml_reader:
-        return 'skip'
+        pytest.skip()
 
     if ogr.GetDriverByName('SQLite') is None:
-        return 'skip'
+        pytest.skip()
 
     if not ogrtest.have_geos():
-        return 'skip'
+        pytest.skip()
 
     try:
         os.remove('tmp/GmlTopo-sample.sqlite')
@@ -1273,8 +1267,7 @@ def test_ogr_gml_35():
 
     try:
         os.stat('tmp/GmlTopo-sample.sqlite')
-        gdaltest.post_reason('did not expect tmp/GmlTopo-sample.sqlite')
-        return 'fail'
+        pytest.fail('did not expect tmp/GmlTopo-sample.sqlite')
     except OSError:
         pass
 
@@ -1304,11 +1297,11 @@ def test_ogr_gml_35():
 def test_ogr_gml_36(GML_FACE_HOLE_NEGATIVE='NO'):
 
     if not gdaltest.have_gml_reader:
-        return 'skip'
+        pytest.skip()
 
     if GML_FACE_HOLE_NEGATIVE == 'NO':
         if not ogrtest.have_geos():
-            return 'skip'
+            pytest.skip()
 
     try:
         os.remove('tmp/GmlTopo-sample.gfs')
@@ -1363,14 +1356,14 @@ def test_ogr_gml_37():
 def test_ogr_gml_38(resolver='HUGE'):
 
     if not gdaltest.have_gml_reader:
-        return 'skip'
+        pytest.skip()
 
     if resolver == 'HUGE':
         if ogr.GetDriverByName('SQLite') is None:
-            return 'skip'
+            pytest.skip()
 
     if not ogrtest.have_geos():
-        return 'skip'
+        pytest.skip()
 
     try:
         os.remove('tmp/sample_gml_face_hole_negative_no.sqlite')
@@ -1395,8 +1388,7 @@ def test_ogr_gml_38(resolver='HUGE'):
     if resolver == 'HUGE':
         try:
             os.stat('tmp/sample_gml_face_hole_negative_no.sqlite')
-            gdaltest.post_reason('did not expect tmp/sample_gml_face_hole_negative_no.sqlite')
-            return 'fail'
+            pytest.fail('did not expect tmp/sample_gml_face_hole_negative_no.sqlite')
         except OSError:
             pass
 
@@ -1425,7 +1417,7 @@ def test_ogr_gml_39():
 def test_ogr_gml_40():
 
     if not gdaltest.have_gml_reader:
-        return 'skip'
+        pytest.skip()
 
     ds = ogr.Open('data/testLookForSimpleType.xml')
     lyr = ds.GetLayer(0)
@@ -1443,10 +1435,10 @@ def test_ogr_gml_41():
     gdaltest.have_gml_validation = False
 
     if not gdaltest.have_gml_reader:
-        return 'skip'
+        pytest.skip()
 
     if not gdaltest.download_file('http://schemas.opengis.net/SCHEMAS_OPENGIS_NET.zip', 'SCHEMAS_OPENGIS_NET.zip'):
-        return 'skip'
+        pytest.skip()
 
     ds = ogr.Open('data/expected_gml_21.gml')
 
@@ -1462,7 +1454,7 @@ def test_ogr_gml_41():
 
     if val == 0:
         assert gdal.GetLastErrorMsg().find('not implemented due to missing libxml2 support') != -1
-        return 'skip'
+        pytest.skip()
 
     gdaltest.have_gml_validation = True
 
@@ -1475,7 +1467,7 @@ def test_ogr_gml_41():
 def test_ogr_gml_42():
 
     if not gdaltest.have_gml_validation:
-        return 'skip'
+        pytest.skip()
 
     try:
         os.mkdir('tmp/cache/SCHEMAS_OPENGIS_NET')
@@ -1510,11 +1502,11 @@ def test_ogr_gml_42():
 def test_ogr_gml_43():
 
     # The service times out
-    return 'skip'
+    pytest.skip()
 
     # pylint: disable=unreachable
     if not gdaltest.have_gml_reader:
-        return 'skip'
+        pytest.skip()
 
     ds = ogr.Open('data/wfs_typefeature.gml')
     assert ds is not None
@@ -1543,7 +1535,7 @@ def test_ogr_gml_43():
 def test_ogr_gml_44():
 
     if not gdaltest.have_gml_reader:
-        return 'skip'
+        pytest.skip()
 
     xsd_content = """<?xml version="1.0" encoding="UTF-8"?>
 <xs:schema targetNamespace="http://ogr.maptools.org/" xmlns:ogr="http://ogr.maptools.org/" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:gml="http://www.opengis.net/gml" elementFormDefault="qualified" version="1.0">
@@ -1597,7 +1589,7 @@ def test_ogr_gml_44():
 def test_ogr_gml_45():
 
     if not gdaltest.have_gml_reader:
-        return 'skip'
+        pytest.skip()
 
     drv = ogr.GetDriverByName('GML')
     ds = drv.CreateDataSource('/vsimem/ogr_gml_45.gml', options=['PREFIX=foo', 'TARGET_NAMESPACE=http://bar/'])
@@ -1619,7 +1611,7 @@ def test_ogr_gml_45():
     if not gdaltest.have_gml_validation:
         gdal.Unlink('/vsimem/ogr_gml_45.gml')
         gdal.Unlink('/vsimem/ogr_gml_45.xsd')
-        return 'skip'
+        pytest.skip()
 
     # Validate document
 
@@ -1650,7 +1642,7 @@ def test_ogr_gml_45():
 def test_ogr_gml_46():
 
     if not gdaltest.have_gml_validation:
-        return 'skip'
+        pytest.skip()
 
     wkt_list = ['',
                 'POINT (0 1)',
@@ -1763,7 +1755,7 @@ def test_ogr_gml_46():
 def test_ogr_gml_47():
 
     if not gdaltest.have_gml_validation:
-        return 'skip'
+        pytest.skip()
 
     filenames = ['data/wfs10.xml', 'data/wfs11.xml', 'data/wfs20.xml']
 
@@ -1803,7 +1795,7 @@ def test_ogr_gml_47():
 def test_ogr_gml_48():
 
     if not gdaltest.have_gml_reader:
-        return 'skip'
+        pytest.skip()
 
     gdal.Unlink('data/schema_with_geom_in_complextype.gfs')
 
@@ -1825,7 +1817,7 @@ def test_ogr_gml_48():
 def test_ogr_gml_49():
 
     if not gdaltest.have_gml_reader:
-        return 'skip'
+        pytest.skip()
 
     xsd_content = """<ogr:FeatureCollection xmlns:gml="http://www.opengis.net/gml" xmlns:ogr="http://ogr.maptools.org/">
   <gml:featureMember>
@@ -1864,7 +1856,7 @@ def test_ogr_gml_49():
 def test_ogr_gml_50():
 
     if not gdaltest.have_gml_reader:
-        return 'skip'
+        pytest.skip()
 
     drv = ogr.GetDriverByName('GML')
     ds = drv.CreateDataSource('/vsimem/ogr_gml_50.gml')
@@ -1887,13 +1879,13 @@ def test_ogr_gml_50():
     feat = lyr.GetNextFeature()
     if feat.GetFieldAsStringList(lyr.GetLayerDefn().GetFieldIndex('stringlist')) != ['a', 'b']:
         feat.DumpReadable()
-        return 'fail'
+        pytest.fail()
     if feat.GetFieldAsIntegerList(lyr.GetLayerDefn().GetFieldIndex('intlist')) != [2, 3]:
         feat.DumpReadable()
-        return 'fail'
+        pytest.fail()
     if feat.GetFieldAsDoubleList(lyr.GetLayerDefn().GetFieldIndex('reallist')) != [4.56, 5.67]:
         feat.DumpReadable()
-        return 'fail'
+        pytest.fail()
     ds = None
 
     gdal.Unlink('/vsimem/ogr_gml_50.gml')
@@ -1908,11 +1900,11 @@ def test_ogr_gml_50():
 def test_ogr_gml_51():
 
     if not gdaltest.have_gml_reader:
-        return 'skip'
+        pytest.skip()
 
     import test_cli_utilities
     if test_cli_utilities.get_ogr2ogr_path() is None:
-        return 'skip'
+        pytest.skip()
 
     for frmt in ['GML2', 'GML3']:
 
@@ -1944,7 +1936,7 @@ def test_ogr_gml_51():
 def test_ogr_gml_52():
 
     if not gdaltest.have_gml_reader:
-        return 'skip'
+        pytest.skip()
 
     try:
         os.remove('data/fake_mtkgml.gfs')
@@ -1970,7 +1962,7 @@ def test_ogr_gml_52():
                 feat.GetField('teksti_kieli') != 'fr' or \
                 ogrtest.check_feature_geometry(feat, 'POINT (280000 7000000 0)') != 0:
             feat.DumpReadable()
-            return 'fail'
+            pytest.fail()
 
         lyr = ds.GetLayerByName('B')
         assert lyr.GetGeomType() == ogr.wkbPolygon25D
@@ -1979,14 +1971,14 @@ def test_ogr_gml_52():
         feat = lyr.GetNextFeature()
         if ogrtest.check_feature_geometry(feat, 'POLYGON ((280000 7000000 0,281000 7000000 0,281000 7001000 0,280000 7001000 0,280000 7000000 0))') != 0:
             feat.DumpReadable()
-            return 'fail'
+            pytest.fail()
 
         lyr = ds.GetLayerByName('C')
         assert lyr.GetGeomType() == ogr.wkbLineString25D
         feat = lyr.GetNextFeature()
         if ogrtest.check_feature_geometry(feat, 'LINESTRING (280000 7000000 0,281000 7000000 0,281000 7001000 0,280000 7001000 0,280000 7000000 0)') != 0:
             feat.DumpReadable()
-            return 'fail'
+            pytest.fail()
 
         ds = None
 
@@ -2001,7 +1993,7 @@ def test_ogr_gml_52():
 def test_ogr_gml_53():
 
     if not gdaltest.have_gml_reader:
-        return 'skip'
+        pytest.skip()
 
     ds = ogr.Open('data/archsites.xsd')
     assert ds is None
@@ -2016,7 +2008,7 @@ def test_ogr_gml_53():
 def test_ogr_gml_54():
 
     if not gdaltest.have_gml_reader:
-        return 'skip'
+        pytest.skip()
 
     gdal.Unlink('data/empty.gfs')
 
@@ -2041,7 +2033,7 @@ def test_ogr_gml_54():
 def test_ogr_gml_55():
 
     if not gdaltest.have_gml_reader:
-        return 'skip'
+        pytest.skip()
 
     ds = ogr.Open('data/ogr_gml_55.gml')
     lyr = ds.GetLayer(0)
@@ -2050,7 +2042,7 @@ def test_ogr_gml_55():
 
     try:
         os.unlink('data/ogr_gml_55.gfs')
-        return 'fail'
+        pytest.fail()
     except OSError:
         pass
 
@@ -2064,7 +2056,7 @@ def test_ogr_gml_55():
 def test_ogr_gml_56():
 
     if not gdaltest.have_gml_reader:
-        return 'skip'
+        pytest.skip()
 
     gdal.Unlink('data/ogr_gml_56.gfs')
 
@@ -2097,7 +2089,7 @@ def test_ogr_gml_56():
 
     try:
         os.unlink('data/ogr_gml_56.gfs')
-        return 'fail'
+        pytest.fail()
     except OSError:
         pass
 
@@ -2110,7 +2102,7 @@ def test_ogr_gml_56():
 def test_ogr_gml_57():
 
     if not gdaltest.have_gml_reader:
-        return 'skip'
+        pytest.skip()
 
     for i in range(4):
         options = []
@@ -2170,7 +2162,7 @@ def test_ogr_gml_57():
 def test_ogr_gml_58():
 
     if not gdaltest.have_gml_reader:
-        return 'skip'
+        pytest.skip()
 
     gdal.Unlink('data/inspire_cadastralparcel.gfs')
 
@@ -2379,7 +2371,7 @@ def test_ogr_gml_58():
 def test_ogr_gml_59():
 
     if not gdaltest.have_gml_reader:
-        return 'skip'
+        pytest.skip()
 
     # Make sure the .gfs file is more recent that the .gml one
     try:
@@ -2419,7 +2411,7 @@ def test_ogr_gml_59():
 def test_ogr_gml_60():
 
     if not gdaltest.have_gml_reader:
-        return 'skip'
+        pytest.skip()
 
     # Make sure the .gfs file is more recent that the .gml one
     gdal.Unlink('data/wfs_200_multiplelayers.gfs')
@@ -2447,7 +2439,7 @@ def test_ogr_gml_60():
 def test_ogr_gml_61():
 
     if not gdaltest.have_gml_reader:
-        return 'skip'
+        pytest.skip()
 
     # Make sure the .gfs file is more recent that the .gml one
     try:
@@ -2471,20 +2463,20 @@ def test_ogr_gml_61():
     feat = lyr.GetNextFeature()
     if feat.GetField('gml_id') != 'Object.1' or feat.GetField('foo') != 'bar':
         feat.DumpReadable()
-        return 'fail'
+        pytest.fail()
     geom = feat.GetGeometryRef()
     if geom.ExportToWkt() != 'POLYGON ((2 48,2 49,3 49,3 48,2 48))':
         feat.DumpReadable()
-        return 'fail'
+        pytest.fail()
 
     feat = lyr.GetNextFeature()
     if feat.GetField('gml_id') != 'Object.2' or feat.GetField('foo') != 'baz':
         feat.DumpReadable()
-        return 'fail'
+        pytest.fail()
     geom = feat.GetGeometryRef()
     if geom.ExportToWkt() != 'POLYGON ((2 -48,2 -49,3 -49,3 -48,2 -48))':
         feat.DumpReadable()
-        return 'fail'
+        pytest.fail()
 
     ds = None
     return 'success'
@@ -2496,7 +2488,7 @@ def test_ogr_gml_61():
 def test_ogr_gml_62():
 
     if not gdaltest.have_gml_reader:
-        return 'skip'
+        pytest.skip()
 
     gdal.Unlink('tmp/gmlattributes.gfs')
 
@@ -2526,24 +2518,21 @@ def test_ogr_gml_62():
                 feat.GetField('element2') != 'foo' or \
                 feat.IsFieldSet('element3_attr1'):
             feat.DumpReadable()
-            print(i)
-            return 'fail'
+            pytest.fail(i)
         feat = lyr.GetNextFeature()
         if feat.IsFieldSet('element_attr1') or \
                 feat.IsFieldSet('element2_attr1') or \
                 feat.IsFieldSet('element2') or \
                 feat.GetField('element3_attr1') != 1:
             feat.DumpReadable()
-            print(i)
-            return 'fail'
+            pytest.fail(i)
         feat = lyr.GetNextFeature()
         if feat.GetField('element_attr1') != 'a' or \
                 feat.IsFieldSet('element2_attr1') or \
                 feat.IsFieldSet('element2') or \
                 feat.IsFieldSet('element3_attr1'):
             feat.DumpReadable()
-            print(i)
-            return 'fail'
+            pytest.fail(i)
         feat = None
         ds = None
 
@@ -2556,7 +2545,7 @@ def test_ogr_gml_62():
 def test_ogr_gml_63():
 
     if not gdaltest.have_gml_reader:
-        return 'skip'
+        pytest.skip()
 
     # test ST file type
     ds = ogr.Open('data/ruian_st_v1.xml.gz')
@@ -2597,7 +2586,7 @@ def test_ogr_gml_63():
 def test_ogr_gml_64():
 
     if not gdaltest.have_gml_reader:
-        return 'skip'
+        pytest.skip()
 
     for parser in ['XERCES', 'EXPAT']:
         for _ in range(2):
@@ -2617,7 +2606,7 @@ def test_ogr_gml_64():
 def test_ogr_gml_65():
 
     if not gdaltest.have_gml_reader:
-        return 'skip'
+        pytest.skip()
 
     option_expected_list = [['SRSDIMENSION_LOC=GEOMETRY', '<ogr:geometryProperty><gml:MultiSurface srsDimension="3"><gml:surfaceMember><gml:Polygon><gml:exterior><gml:LinearRing><gml:posList>0 1 2 3 4 5 6 7 8 0 1 2</gml:posList></gml:LinearRing></gml:exterior></gml:Polygon></gml:surfaceMember></gml:MultiSurface></ogr:geometryProperty>'],
                             ['SRSDIMENSION_LOC=POSLIST', '<ogr:geometryProperty><gml:MultiSurface><gml:surfaceMember><gml:Polygon><gml:exterior><gml:LinearRing><gml:posList srsDimension="3">0 1 2 3 4 5 6 7 8 0 1 2</gml:posList></gml:LinearRing></gml:exterior></gml:Polygon></gml:surfaceMember></gml:MultiSurface></ogr:geometryProperty>'],
@@ -2644,7 +2633,7 @@ def test_ogr_gml_65():
         feat = lyr.GetNextFeature()
         if feat.GetGeometryRef().ExportToWkt() != "MULTIPOLYGON (((0 1 2,3 4 5,6 7 8,0 1 2)))":
             feat.DumpReadable()
-            return 'fail'
+            pytest.fail()
         ds = None
 
         gdal.Unlink(filename)
@@ -2659,7 +2648,7 @@ def test_ogr_gml_65():
 def test_ogr_gml_66():
 
     if not gdaltest.have_gml_reader:
-        return 'skip'
+        pytest.skip()
 
     filename = '/vsimem/ogr_gml_66.gml'
     # filename = 'ogr_gml_66.gml'
@@ -2800,76 +2789,76 @@ def test_ogr_gml_66():
         feat = lyr.GetNextFeature()
         if feat.GetGeometryRef().ExportToWkt() != 'COMPOUNDCURVE (CIRCULARSTRING (0 0,1 1,2 0))':
             feat.DumpReadable()
-            return 'fail'
+            pytest.fail()
         feat = lyr.GetNextFeature()
         if feat.GetGeometryRef().ExportToWkt() != 'COMPOUNDCURVE (CIRCULARSTRING (0 0,1 1,2 0))':
             feat.DumpReadable()
-            return 'fail'
+            pytest.fail()
         feat = lyr.GetNextFeature()
         if feat.GetGeometryRef().ExportToWkt() != 'COMPOUNDCURVE ((0 0,1 1,2 0))':
             feat.DumpReadable()
-            return 'fail'
+            pytest.fail()
 
         lyr = ds.GetLayerByName('curvepolygon')
         assert lyr.GetGeomType() == ogr.wkbCurvePolygon
         feat = lyr.GetNextFeature()
         if feat.GetGeometryRef().ExportToWkt() != 'CURVEPOLYGON (CIRCULARSTRING (0 0,0.5 0.5,1 0,0.5 -0.5,0 0))':
             feat.DumpReadable()
-            return 'fail'
+            pytest.fail()
         feat = lyr.GetNextFeature()
         if feat.GetGeometryRef().ExportToWkt() != 'CURVEPOLYGON ((0 0,0 1,1 1,0 0))':
             feat.DumpReadable()
-            return 'fail'
+            pytest.fail()
 
         lyr = ds.GetLayerByName('multisurface')
         assert lyr.GetGeomType() == ogr.wkbMultiSurface
         feat = lyr.GetNextFeature()
         if feat.GetGeometryRef().ExportToWkt() != 'MULTISURFACE (CURVEPOLYGON (CIRCULARSTRING (0 0,0.5 0.5,1 0,0.5 -0.5,0 0)))':
             feat.DumpReadable()
-            return 'fail'
+            pytest.fail()
         feat = lyr.GetNextFeature()
         if feat.GetGeometryRef().ExportToWkt() != 'MULTISURFACE (((0 0,0 1,1 1,0 0)))':
             feat.DumpReadable()
-            return 'fail'
+            pytest.fail()
 
         lyr = ds.GetLayerByName('multicurve')
         assert lyr.GetGeomType() == ogr.wkbMultiCurve
         feat = lyr.GetNextFeature()
         if feat.GetGeometryRef().ExportToWkt() != 'MULTICURVE (CIRCULARSTRING (0 0,0.5 0.5,1 0,0.5 -0.5,0 0))':
             feat.DumpReadable()
-            return 'fail'
+            pytest.fail()
         feat = lyr.GetNextFeature()
         if feat.GetGeometryRef().ExportToWkt() != 'MULTICURVE ((0 0,0 1,1 1,0 0))':
             feat.DumpReadable()
-            return 'fail'
+            pytest.fail()
 
         lyr = ds.GetLayerByName('polygon')
         assert lyr.GetGeomType() == ogr.wkbPolygon
         feat = lyr.GetNextFeature()
         if feat.GetGeometryRef().ExportToWkt() != 'POLYGON ((0 0,0 1,1 1,0 0))':
             feat.DumpReadable()
-            return 'fail'
+            pytest.fail()
 
         lyr = ds.GetLayerByName('linestring')
         assert lyr.GetGeomType() == ogr.wkbLineString
         feat = lyr.GetNextFeature()
         if feat.GetGeometryRef().ExportToWkt() != 'LINESTRING (0 0,0 1,1 1,0 0)':
             feat.DumpReadable()
-            return 'fail'
+            pytest.fail()
 
         lyr = ds.GetLayerByName('multipolygon')
         assert lyr.GetGeomType() == ogr.wkbMultiPolygon
         feat = lyr.GetNextFeature()
         if feat.GetGeometryRef().ExportToWkt() != 'MULTIPOLYGON (((0 0,0 1,1 1,0 0)))':
             feat.DumpReadable()
-            return 'fail'
+            pytest.fail()
 
         lyr = ds.GetLayerByName('multilinestring')
         assert lyr.GetGeomType() == ogr.wkbMultiLineString
         feat = lyr.GetNextFeature()
         if feat.GetGeometryRef().ExportToWkt() != 'MULTILINESTRING ((0 0,0 1,1 1,0 0))':
             feat.DumpReadable()
-            return 'fail'
+            pytest.fail()
 
         lyr = ds.GetLayerByName('compoundcurve_untyped')
         if i != 0:
@@ -2877,16 +2866,16 @@ def test_ogr_gml_66():
             feat = lyr.GetNextFeature()
             if feat.GetGeometryRef().ExportToWkt() != 'COMPOUNDCURVE ((0 0,1 1,2 0))':
                 feat.DumpReadable()
-                return 'fail'
+                pytest.fail()
         else:
             feat = lyr.GetNextFeature()
             if feat.GetGeometryRef().ExportToWkt() != 'LINESTRING (0 0,1 1,2 0)':
                 feat.DumpReadable()
-                return 'fail'
+                pytest.fail()
         feat = lyr.GetNextFeature()
         if feat.GetGeometryRef().ExportToWkt() != 'COMPOUNDCURVE (CIRCULARSTRING (0 0,1 1,2 0))':
             feat.DumpReadable()
-            return 'fail'
+            pytest.fail()
 
         lyr = ds.GetLayerByName('curvepolygon_untyped')
         if i != 0:
@@ -2894,16 +2883,16 @@ def test_ogr_gml_66():
             feat = lyr.GetNextFeature()
             if feat.GetGeometryRef().ExportToWkt() != 'CURVEPOLYGON ((0 0,0 1,1 1,0 0))':
                 feat.DumpReadable()
-                return 'fail'
+                pytest.fail()
         else:
             feat = lyr.GetNextFeature()
             if feat.GetGeometryRef().ExportToWkt() != 'POLYGON ((0 0,0 1,1 1,0 0))':
                 feat.DumpReadable()
-                return 'fail'
+                pytest.fail()
         feat = lyr.GetNextFeature()
         if feat.GetGeometryRef().ExportToWkt() != 'CURVEPOLYGON (CIRCULARSTRING (0 0,0.5 0.5,1 0,0.5 -0.5,0 0))':
             feat.DumpReadable()
-            return 'fail'
+            pytest.fail()
 
         lyr = ds.GetLayerByName('multisurface_untyped')
         if i != 0:
@@ -2911,16 +2900,16 @@ def test_ogr_gml_66():
             feat = lyr.GetNextFeature()
             if feat.GetGeometryRef().ExportToWkt() != 'MULTISURFACE (((0 0,0 1,1 1,0 0)))':
                 feat.DumpReadable()
-                return 'fail'
+                pytest.fail()
         else:
             feat = lyr.GetNextFeature()
             if feat.GetGeometryRef().ExportToWkt() != 'MULTIPOLYGON (((0 0,0 1,1 1,0 0)))':
                 feat.DumpReadable()
-                return 'fail'
+                pytest.fail()
         feat = lyr.GetNextFeature()
         if feat.GetGeometryRef().ExportToWkt() != 'MULTISURFACE (CURVEPOLYGON (CIRCULARSTRING (0 0,0.5 0.5,1 0,0.5 -0.5,0 0)))':
             feat.DumpReadable()
-            return 'fail'
+            pytest.fail()
 
         lyr = ds.GetLayerByName('multicurve_untyped')
         if i != 0:
@@ -2928,16 +2917,16 @@ def test_ogr_gml_66():
             feat = lyr.GetNextFeature()
             if feat.GetGeometryRef().ExportToWkt() != 'MULTICURVE ((0 0,0 1,1 1,0 0))':
                 feat.DumpReadable()
-                return 'fail'
+                pytest.fail()
         else:
             feat = lyr.GetNextFeature()
             if feat.GetGeometryRef().ExportToWkt() != 'MULTILINESTRING ((0 0,0 1,1 1,0 0))':
                 feat.DumpReadable()
-                return 'fail'
+                pytest.fail()
         feat = lyr.GetNextFeature()
         if feat.GetGeometryRef().ExportToWkt() != 'MULTICURVE (CIRCULARSTRING (0 0,1 1,2 0))':
             feat.DumpReadable()
-            return 'fail'
+            pytest.fail()
 
         ds = None
 
@@ -2955,7 +2944,7 @@ def test_ogr_gml_66():
 def test_ogr_gml_67():
 
     if not gdaltest.have_gml_reader:
-        return 'skip'
+        pytest.skip()
 
     filename = '/vsimem/ogr_gml_67.gml'
     ds = ogr.GetDriverByName('GML').CreateDataSource(filename)
@@ -3023,14 +3012,12 @@ def test_ogr_gml_67():
             i
         f = lyr.GetNextFeature()
         if f.GetField('b1') != 1 or f.GetField('b2') != 0 or f.GetFieldAsString('bool_list') != '(2:1,0)' or f.GetField('short') != -32768 or f.GetField('float') != 1.23:
-            print(i)
             f.DumpReadable()
-            return 'fail'
+            pytest.fail(i)
         f = lyr.GetNextFeature()
         if f.GetFID() != 1234567890123 or f.GetField('int64') != 1234567890123 or f.GetField('int64list') != [1, 1234567890123]:
-            print(i)
             f.DumpReadable()
-            return 'fail'
+            pytest.fail(i)
         ds = None
 
         gdal.Unlink(filename[0:-3] + "xsd")
@@ -3047,7 +3034,7 @@ def test_ogr_gml_67():
 def test_ogr_gml_68():
 
     if not gdaltest.have_gml_reader:
-        return 'skip'
+        pytest.skip()
 
     ds = ogr.Open('data/choicepolygonmultipolygon.gml')
 
@@ -3074,7 +3061,7 @@ def test_ogr_gml_68():
 def test_ogr_gml_69():
 
     if not gdaltest.have_gml_reader:
-        return 'skip'
+        pytest.skip()
 
     ds = ogr.GetDriverByName('GML').CreateDataSource('/vsimem/ogr_gml_69.gml')
     lyr = ds.CreateLayer('test', geom_type=ogr.wkbNone)
@@ -3135,7 +3122,7 @@ def test_ogr_gml_69():
 def test_ogr_gml_70():
 
     if not gdaltest.have_gml_reader:
-        return 'skip'
+        pytest.skip()
 
     ds = ogr.GetDriverByName('GML').CreateDataSource('/vsimem/ogr_gml_70.gml')
     lyr = ds.CreateLayer('test', geom_type=ogr.wkbNone)
@@ -3156,7 +3143,7 @@ def test_ogr_gml_70():
     f = lyr.GetNextFeature()
     if f.GetField('field_string') != 'a':
         f.DumpReadable()
-        return 'fail'
+        pytest.fail()
     ds = None
 
     gdal.Unlink("/vsimem/ogr_gml_70.gml")
@@ -3198,7 +3185,7 @@ def ogr_gml_71_helper(ds):
        f.GetGeomFieldRef(0) is not None or \
        f.GetGeomFieldRef(1).ExportToWkt() != 'POINT (2 49)':
         f.DumpReadable()
-        return 'fail'
+        pytest.fail()
     f = lyr.GetNextFeature()
     if f.GetField('table1.gml_id') != 'table1-2' or \
        f.IsFieldSet('table1.foo') or \
@@ -3209,7 +3196,7 @@ def ogr_gml_71_helper(ds):
        f.GetGeomFieldRef(0).ExportToWkt() != 'POINT (3 50)' or \
        f.GetGeomFieldRef(1).ExportToWkt() != 'POINT (2 50)':
         f.DumpReadable()
-        return 'fail'
+        pytest.fail()
 
     return 'success'
 
@@ -3217,7 +3204,7 @@ def ogr_gml_71_helper(ds):
 def test_ogr_gml_71():
 
     if not gdaltest.have_gml_reader:
-        return 'skip'
+        pytest.skip()
 
     # With .xsd
     gdal.Unlink('data/wfsjointlayer.gfs')
@@ -3227,7 +3214,7 @@ def test_ogr_gml_71():
 
     try:
         os.unlink('data/wfsjointlayer.gfs')
-        return 'fail'
+        pytest.fail()
     except OSError:
         pass
 
@@ -3239,7 +3226,7 @@ def test_ogr_gml_71():
     try:
         os.unlink('data/wfsjointlayer.gfs')
     except OSError:
-        return 'fail'
+        pytest.fail()
 
     # Without .xsd nor .gfs
     shutil.copy('data/wfsjointlayer.gml', 'tmp/wfsjointlayer.gml')
@@ -3251,7 +3238,7 @@ def test_ogr_gml_71():
     try:
         os.stat('tmp/wfsjointlayer.gfs')
     except OSError:
-        return 'fail'
+        pytest.fail()
 
     # With .gfs
     ds = ogr.Open('tmp/wfsjointlayer.gml')
@@ -3267,7 +3254,7 @@ def test_ogr_gml_71():
 def test_ogr_gml_72():
 
     if not gdaltest.have_gml_reader:
-        return 'skip'
+        pytest.skip()
 
     ds = ogr.GetDriverByName('GML').CreateDataSource('/vsimem/ogr_gml_72.gml', options=['NAME=name', 'DESCRIPTION=description'])
     ds.SetMetadata({'NAME': 'ignored', 'DESCRIPTION': 'ignored'})
@@ -3302,7 +3289,7 @@ def test_ogr_gml_72():
 def test_ogr_gml_73():
 
     if not gdaltest.have_gml_reader:
-        return 'skip'
+        pytest.skip()
 
     try:
         os.remove('data/cswresults.gfs')
@@ -3338,7 +3325,7 @@ def test_ogr_gml_73():
 def test_ogr_gml_74():
 
     if not gdaltest.have_gml_reader:
-        return 'skip'
+        pytest.skip()
 
     # With .xsd
     ds = gdal.OpenEx('data/expected_gml_gml32.gml', open_options=['FORCE_SRS_DETECTION=YES'])
@@ -3375,7 +3362,7 @@ def test_ogr_gml_74():
 def test_ogr_gml_75():
 
     if not gdaltest.have_gml_reader:
-        return 'skip'
+        pytest.skip()
 
     gdal.FileFromMemBuffer("/vsimem/ogr_gml_75.xml",
                            """<?xml version="1.0" encoding="UTF-8"?>
@@ -3417,10 +3404,10 @@ def test_ogr_gml_75():
 def test_ogr_gml_76():
 
     if not gdaltest.have_gml_reader:
-        return 'skip'
+        pytest.skip()
 
     if not gdaltest.run_slow_tests():
-        return 'skip'
+        pytest.skip()
 
     with gdaltest.error_handler():
         ds = ogr.Open('/vsisparse/data/huge_attribute_gml_sparse.xml')
@@ -3442,7 +3429,7 @@ def test_ogr_gml_76():
 def test_ogr_gml_77():
 
     if not gdaltest.have_gml_reader:
-        return 'skip'
+        pytest.skip()
 
     gdal.FileFromMemBuffer("/vsimem/ogr_gml_77.xml",
                            """<?xml version="1.0" encoding="utf-8" ?>
@@ -3490,7 +3477,7 @@ def test_ogr_gml_77():
 def test_ogr_gml_78():
 
     if not gdaltest.have_gml_reader:
-        return 'skip'
+        pytest.skip()
 
     gdal.FileFromMemBuffer("/vsimem/ogr_gml_78.xml",
                            """<?xml version="1.0" encoding="utf-8" ?>
@@ -3575,7 +3562,7 @@ def test_ogr_gml_79():
 def test_ogr_gml_80():
 
     if not gdaltest.have_gml_reader:
-        return 'skip'
+        pytest.skip()
 
     ds = ogr.GetDriverByName('GML').CreateDataSource('/vsimem/ogr_gml_80.xml')
     lyr = ds.CreateLayer('test', geom_type=ogr.wkbNone)
@@ -3599,17 +3586,17 @@ def test_ogr_gml_80():
     f = lyr.GetNextFeature()
     if f['int_field'] != 4:
         f.DumpReadable()
-        return 'fail'
+        pytest.fail()
 
     f = lyr.GetNextFeature()
     if f['int_field'] is not None:
         f.DumpReadable()
-        return 'fail'
+        pytest.fail()
 
     f = lyr.GetNextFeature()
     if f.IsFieldSet('int_field'):
         f.DumpReadable()
-        return 'fail'
+        pytest.fail()
     f = None
     ds = None
 
@@ -3625,7 +3612,7 @@ def test_ogr_gml_80():
 def test_ogr_gml_81():
 
     if not gdaltest.have_gml_reader:
-        return 'skip'
+        pytest.skip()
 
     gdal.Unlink('data/test_xsi_nil_gfs.gfs')
     ds = ogr.Open('data/test_xsi_nil_gfs.gml')
@@ -3633,7 +3620,7 @@ def test_ogr_gml_81():
     f = lyr.GetNextFeature()
     if f.GetField('intval') != 1:
         f.DumpReadable()
-        return 'fail'
+        pytest.fail()
     ds = None
 
     gdal.Unlink('data/test_xsi_nil_gfs.gfs')
@@ -3647,7 +3634,7 @@ def test_ogr_gml_81():
 def test_ogr_gml_82():
 
     if not gdaltest.have_gml_reader:
-        return 'skip'
+        pytest.skip()
 
     gdal.VectorTranslate('/vsimem/ogr_gml_82.gml', 'data/poly.shp',
                          format='GML',
@@ -3701,7 +3688,7 @@ def test_ogr_gml_gml2_write_geometry_error():
 
 def test_ogr_gml_cleanup():
     if not gdaltest.have_gml_reader:
-        return 'skip'
+        pytest.skip()
 
     gdal.SetConfigOption('GML_SKIP_RESOLVE_ELEMS', None)
     gdal.SetConfigOption('GML_SAVE_RESOLVED_TO', None)
diff --git a/autotest/ogr/ogr_gmlas.py b/autotest/ogr/ogr_gmlas.py
index 8a7d2aa63914..49441b17e6bf 100755
--- a/autotest/ogr/ogr_gmlas.py
+++ b/autotest/ogr/ogr_gmlas.py
@@ -48,6 +48,7 @@
 
 from osgeo import gdal
 from osgeo import ogr
+import pytest
 
 
 ###############################################################################
@@ -57,7 +58,7 @@ def compare_ogrinfo_output(gmlfile, reffile, options=''):
     import test_cli_utilities
 
     if test_cli_utilities.get_ogrinfo_path() is None:
-        return 'skip'
+        pytest.skip()
 
     tmpfilename = 'tmp/' + os.path.basename(gmlfile) + '.txt'
     ret = gdaltest.runexternal(test_cli_utilities.get_ogrinfo_path() +
@@ -72,13 +73,12 @@ def compare_ogrinfo_output(gmlfile, reffile, options=''):
     expected = open(reffile, 'rb').read().decode('utf-8')
     expected = expected.replace('\r\n', '\n')
     if ret != expected:
-        print('Got:')
         print(ret.encode('utf-8'))
         open(tmpfilename, 'wb').write(ret.encode('utf-8'))
         print('Diff:')
         os.system('diff -u ' + reffile + ' ' + tmpfilename)
         # os.unlink(tmpfilename)
-        return 'fail'
+        pytest.fail('Got:')
     return 'success'
 
 ###############################################################################
@@ -88,7 +88,7 @@ def compare_ogrinfo_output(gmlfile, reffile, options=''):
 def test_ogr_gmlas_basic():
 
     if ogr.GetDriverByName('GMLAS') is None:
-        return 'skip'
+        pytest.skip()
 
     gdal.SetConfigOption('GMLAS_WARN_UNEXPECTED', 'YES')
 
@@ -103,8 +103,7 @@ def test_ogr_gmlas_basic():
 
     # Skip tests when -fsanitize is used
     if gdaltest.is_travis_branch('sanitize'):
-        print('Skipping because of -sanitize')
-        return 'skip'
+        pytest.skip('Skipping because of -sanitize')
 
     return compare_ogrinfo_output('data/gmlas/gmlas_test1.xml',
                                   'data/gmlas/gmlas_test1.txt')
@@ -116,17 +115,16 @@ def test_ogr_gmlas_basic():
 def test_ogr_gmlas_test_ogrsf():
 
     if ogr.GetDriverByName('GMLAS') is None:
-        return 'skip'
+        pytest.skip()
 
     # Skip tests when -fsanitize is used
     if gdaltest.is_travis_branch('sanitize'):
-        print('Skipping because of -sanitize')
-        return 'skip'
+        pytest.skip('Skipping because of -sanitize')
 
     import test_cli_utilities
 
     if test_cli_utilities.get_test_ogrsf_path() is None:
-        return 'skip'
+        pytest.skip()
 
     ret = gdaltest.runexternal(test_cli_utilities.get_test_ogrsf_path() + ' -ro GMLAS:data/gmlas/gmlas_test1.xml')
 
@@ -141,7 +139,7 @@ def test_ogr_gmlas_test_ogrsf():
 def test_ogr_gmlas_virtual_file():
 
     if ogr.GetDriverByName('GMLAS') is None:
-        return 'skip'
+        pytest.skip()
 
     gdal.FileFromMemBuffer('/vsimem/ogr_gmlas_8.xml',
                            """<myns:main_elt xmlns:myns="http://myns"
@@ -171,7 +169,7 @@ def test_ogr_gmlas_virtual_file():
 def test_ogr_gmlas_datafile_with_xsd_option():
 
     if ogr.GetDriverByName('GMLAS') is None:
-        return 'skip'
+        pytest.skip()
 
     ds = gdal.OpenEx('GMLAS:data/gmlas/gmlas_test1.xml', open_options=['XSD=data/gmlas/gmlas_test1.xsd'])
     assert ds is not None
@@ -185,7 +183,7 @@ def test_ogr_gmlas_datafile_with_xsd_option():
 def test_ogr_gmlas_no_datafile_with_xsd_option():
 
     if ogr.GetDriverByName('GMLAS') is None:
-        return 'skip'
+        pytest.skip()
 
     ds = gdal.OpenEx('GMLAS:', open_options=['XSD=data/gmlas/gmlas_test1.xsd'])
     assert ds is not None
@@ -199,7 +197,7 @@ def test_ogr_gmlas_no_datafile_with_xsd_option():
 def test_ogr_gmlas_no_datafile_xsd_which_is_not_xsd():
 
     if ogr.GetDriverByName('GMLAS') is None:
-        return 'skip'
+        pytest.skip()
 
     with gdaltest.error_handler():
         ds = gdal.OpenEx('GMLAS:', open_options=['XSD=data/gmlas/gmlas_test1.xml'])
@@ -215,7 +213,7 @@ def test_ogr_gmlas_no_datafile_xsd_which_is_not_xsd():
 def test_ogr_gmlas_no_datafile_no_xsd():
 
     if ogr.GetDriverByName('GMLAS') is None:
-        return 'skip'
+        pytest.skip()
 
     with gdaltest.error_handler():
         ds = gdal.OpenEx('GMLAS:')
@@ -231,7 +229,7 @@ def test_ogr_gmlas_no_datafile_no_xsd():
 def test_ogr_gmlas_non_existing_gml():
 
     if ogr.GetDriverByName('GMLAS') is None:
-        return 'skip'
+        pytest.skip()
 
     with gdaltest.error_handler():
         ds = gdal.OpenEx('GMLAS:/vsimem/i_do_not_exist.gml')
@@ -247,7 +245,7 @@ def test_ogr_gmlas_non_existing_gml():
 def test_ogr_gmlas_non_existing_xsd():
 
     if ogr.GetDriverByName('GMLAS') is None:
-        return 'skip'
+        pytest.skip()
 
     with gdaltest.error_handler():
         ds = gdal.OpenEx('GMLAS:', open_options=['XSD=/vsimem/i_do_not_exist.xsd'])
@@ -263,7 +261,7 @@ def test_ogr_gmlas_non_existing_xsd():
 def test_ogr_gmlas_gml_without_schema_location():
 
     if ogr.GetDriverByName('GMLAS') is None:
-        return 'skip'
+        pytest.skip()
 
     gdal.FileFromMemBuffer('/vsimem/ogr_gmlas_gml_without_schema_location.xml',
                            """<MYNS:main_elt xmlns:MYNS="http://myns"/>""")
@@ -284,7 +282,7 @@ def test_ogr_gmlas_gml_without_schema_location():
 def test_ogr_gmlas_invalid_schema():
 
     if ogr.GetDriverByName('GMLAS') is None:
-        return 'skip'
+        pytest.skip()
 
     with gdaltest.error_handler():
         ds = gdal.OpenEx('GMLAS:data/gmlas/gmlas_invalid_schema.xml')
@@ -300,7 +298,7 @@ def test_ogr_gmlas_invalid_schema():
 def test_ogr_gmlas_invalid_xml():
 
     if ogr.GetDriverByName('GMLAS') is None:
-        return 'skip'
+        pytest.skip()
 
     ds = gdal.OpenEx('GMLAS:data/gmlas/gmlas_invalid_xml.xml')
     lyr = ds.GetLayer(0)
@@ -318,7 +316,7 @@ def test_ogr_gmlas_invalid_xml():
 def test_ogr_gmlas_gml_Reference():
 
     if ogr.GetDriverByName('GMLAS') is None:
-        return 'skip'
+        pytest.skip()
 
     ds = ogr.Open('GMLAS:data/gmlas/gmlas_test_targetelement.xml')
     assert ds.GetLayerCount() == 3
@@ -334,7 +332,7 @@ def test_ogr_gmlas_gml_Reference():
        f.IsFieldSet('reference_existing_abstract_target_elt_nillable_href') or \
        f['reference_existing_abstract_target_elt_nillable_nil'] != 1:
         f.DumpReadable()
-        return 'fail'
+        pytest.fail()
 
     return 'success'
 
@@ -345,7 +343,7 @@ def test_ogr_gmlas_gml_Reference():
 def test_ogr_gmlas_same_element_in_different_ns():
 
     if ogr.GetDriverByName('GMLAS') is None:
-        return 'skip'
+        pytest.skip()
 
     ds = gdal.OpenEx('GMLAS:data/gmlas/gmlas_same_element_in_different_ns.xml')
     assert ds is not None
@@ -357,7 +355,7 @@ def test_ogr_gmlas_same_element_in_different_ns():
     f = lyr.GetNextFeature()
     if f.IsFieldSet('abstractElt_other_ns_realizationOfAbstractElt_pkid') == 0:
         f.DumpReadable()
-        return 'fail'
+        pytest.fail()
     assert ds.GetLayerByName('myns_realizationOfAbstractElt') is not None
     assert ds.GetLayerByName('other_ns_realizationOfAbstractElt') is not None
     assert ds.GetLayerByName('elt_elt2_abstractElt_myns_realizationOfAbstractElt') is not None
@@ -372,7 +370,7 @@ def test_ogr_gmlas_same_element_in_different_ns():
 def test_ogr_gmlas_corner_case_relative_path():
 
     if ogr.GetDriverByName('GMLAS') is None:
-        return 'skip'
+        pytest.skip()
 
     ds = ogr.Open('GMLAS:../ogr/data/gmlas/gmlas_test1.xml')
     assert ds is not None
@@ -386,7 +384,7 @@ def test_ogr_gmlas_corner_case_relative_path():
 def test_ogr_gmlas_unexpected_repeated_element():
 
     if ogr.GetDriverByName('GMLAS') is None:
-        return 'skip'
+        pytest.skip()
 
     ds = gdal.OpenEx('GMLAS:data/gmlas/gmlas_unexpected_repeated_element.xml')
     lyr = ds.GetLayer(0)
@@ -394,7 +392,7 @@ def test_ogr_gmlas_unexpected_repeated_element():
         f = lyr.GetNextFeature()
     if f is None or f['foo'] != 'foo_again':  # somewhat arbitrary to keep the latest one!
         f.DumpReadable()
-        return 'fail'
+        pytest.fail()
     assert gdal.GetLastErrorMsg().find('Unexpected element myns:main_elt/myns:foo') >= 0
     f = lyr.GetNextFeature()
     assert f is None
@@ -409,7 +407,7 @@ def test_ogr_gmlas_unexpected_repeated_element():
 def test_ogr_gmlas_unexpected_repeated_element_variant():
 
     if ogr.GetDriverByName('GMLAS') is None:
-        return 'skip'
+        pytest.skip()
 
     ds = gdal.OpenEx('GMLAS:data/gmlas/gmlas_unexpected_repeated_element_variant.xml')
     lyr = ds.GetLayer(0)
@@ -417,7 +415,7 @@ def test_ogr_gmlas_unexpected_repeated_element_variant():
         f = lyr.GetNextFeature()
     if f is None or f['foo'] != 'foo_again':  # somewhat arbitrary to keep the latest one!
         f.DumpReadable()
-        return 'fail'
+        pytest.fail()
     assert gdal.GetLastErrorMsg().find('Unexpected element myns:main_elt/myns:foo') >= 0
     f = lyr.GetNextFeature()
     assert f is None
@@ -432,7 +430,7 @@ def test_ogr_gmlas_unexpected_repeated_element_variant():
 def test_ogr_gmlas_geometryproperty():
 
     if ogr.GetDriverByName('GMLAS') is None:
-        return 'skip'
+        pytest.skip()
 
     ds = gdal.OpenEx('GMLAS:data/gmlas/gmlas_geometryproperty_gml32.gml', open_options=[
         'CONFIG_FILE=<Configuration><LayerBuildingRules><GML><IncludeGeometryXML>true</IncludeGeometryXML></GML></LayerBuildingRules></Configuration>'])
@@ -443,20 +441,19 @@ def test_ogr_gmlas_geometryproperty():
     f = lyr.GetNextFeature()
     if f['geometryProperty_xml'] != ' <gml:Point gml:id="poly.geom.Geometry" srsName="urn:ogc:def:crs:EPSG::4326"> <gml:pos>49 2</gml:pos> </gml:Point> ':
         f.DumpReadable()
-        return 'fail'
+        pytest.fail()
     if not f.IsFieldNull('geometryPropertyEmpty_xml'):
         f.DumpReadable()
-        return 'fail'
+        pytest.fail()
     if f['pointProperty_xml'] != '<gml:Point gml:id="poly.geom.Point"><gml:pos srsName="http://www.opengis.net/def/crs/EPSG/0/4326">50 3</gml:pos></gml:Point>':
         f.DumpReadable()
-        return 'fail'
+        pytest.fail()
     if f['pointPropertyRepeated_xml'] != [
             '<gml:Point gml:id="poly.geom.pointPropertyRepeated.1"><gml:pos>0 1</gml:pos></gml:Point>',
             '<gml:Point gml:id="poly.geom.pointPropertyRepeated.2"><gml:pos>1 2</gml:pos></gml:Point>',
             '<gml:Point gml:id="poly.geom.pointPropertyRepeated.3"><gml:pos>3 4</gml:pos></gml:Point>']:
-        print(f['pointPropertyRepeated_xml'])
         f.DumpReadable()
-        return 'fail'
+        pytest.fail(f['pointPropertyRepeated_xml'])
     geom_idx = lyr.GetLayerDefn().GetGeomFieldIndex('geometryProperty')
     sr = lyr.GetLayerDefn().GetGeomFieldDefn(geom_idx).GetSpatialRef()
     assert not (sr is None or sr.ExportToWkt().find('4326') < 0 or sr.ExportToWkt().find('AXIS') >= 0)
@@ -464,18 +461,18 @@ def test_ogr_gmlas_geometryproperty():
     # Axis swapping
     if wkt != 'POINT (2 49)':
         f.DumpReadable()
-        return 'fail'
+        pytest.fail()
     geom_idx = lyr.GetLayerDefn().GetGeomFieldIndex('geometryPropertyEmpty')
     if f.GetGeomFieldRef(geom_idx) is not None:
         f.DumpReadable()
-        return 'fail'
+        pytest.fail()
     geom_idx = lyr.GetLayerDefn().GetGeomFieldIndex('pointProperty')
     sr = lyr.GetLayerDefn().GetGeomFieldDefn(geom_idx).GetSpatialRef()
     assert not (sr is None or sr.ExportToWkt().find('4326') < 0 or sr.ExportToWkt().find('AXIS') >= 0)
     wkt = f.GetGeomFieldRef(geom_idx).ExportToWkt()
     if wkt != 'POINT (3 50)':
         f.DumpReadable()
-        return 'fail'
+        pytest.fail()
     geom_idx = lyr.GetLayerDefn().GetGeomFieldIndex('lineStringProperty')
     sr = lyr.GetLayerDefn().GetGeomFieldDefn(geom_idx).GetSpatialRef()
     assert not (sr is None or sr.ExportToWkt().find('4326') < 0 or sr.ExportToWkt().find('AXIS') >= 0)
@@ -483,18 +480,18 @@ def test_ogr_gmlas_geometryproperty():
     wkt = f.GetGeomFieldRef(geom_idx).ExportToWkt()
     if wkt != 'LINESTRING (2 49)':
         f.DumpReadable()
-        return 'fail'
+        pytest.fail()
     geom_idx = lyr.GetLayerDefn().GetGeomFieldIndex('pointPropertyRepeated')
     assert lyr.GetLayerDefn().GetGeomFieldDefn(geom_idx).GetType() == ogr.wkbUnknown
     wkt = f.GetGeomFieldRef(geom_idx).ExportToWkt()
     if wkt != 'GEOMETRYCOLLECTION (POINT (0 1),POINT (1 2),POINT (3 4))':
         f.DumpReadable()
-        return 'fail'
+        pytest.fail()
     geom_idx = lyr.GetLayerDefn().GetGeomFieldIndex('mycustompointproperty_point')
     wkt = f.GetGeomFieldRef(geom_idx).ExportToWkt()
     if wkt != 'POINT (5 6)':
         f.DumpReadable()
-        return 'fail'
+        pytest.fail()
 
     # Test that on-the-fly reprojection works
     f = lyr.GetNextFeature()
@@ -502,7 +499,7 @@ def test_ogr_gmlas_geometryproperty():
     geom = f.GetGeomFieldRef(geom_idx)
     if ogrtest.check_feature_geometry(geom, 'POINT (3.0 0.0)') != 0:
         f.DumpReadable()
-        return 'fail'
+        pytest.fail()
 
     # Failed reprojection
     with gdaltest.error_handler():
@@ -510,7 +507,7 @@ def test_ogr_gmlas_geometryproperty():
     geom_idx = lyr.GetLayerDefn().GetGeomFieldIndex('geometryProperty')
     if f.GetGeomFieldRef(geom_idx) is not None:
         f.DumpReadable()
-        return 'fail'
+        pytest.fail()
 
     # Test SWAP_COORDINATES=NO
     ds = gdal.OpenEx('GMLAS:data/gmlas/gmlas_geometryproperty_gml32.gml',
@@ -523,13 +520,13 @@ def test_ogr_gmlas_geometryproperty():
     # Axis swapping
     if wkt != 'POINT (49 2)':
         f.DumpReadable()
-        return 'fail'
+        pytest.fail()
     geom_idx = lyr.GetLayerDefn().GetGeomFieldIndex('lineStringProperty')
     wkt = f.GetGeomFieldRef(geom_idx).ExportToWkt()
     # Axis swapping
     if wkt != 'LINESTRING (2 49)':
         f.DumpReadable()
-        return 'fail'
+        pytest.fail()
 
     # Test SWAP_COORDINATES=YES
     ds = gdal.OpenEx('GMLAS:data/gmlas/gmlas_geometryproperty_gml32.gml',
@@ -542,13 +539,13 @@ def test_ogr_gmlas_geometryproperty():
     # Axis swapping
     if wkt != 'POINT (2 49)':
         f.DumpReadable()
-        return 'fail'
+        pytest.fail()
     geom_idx = lyr.GetLayerDefn().GetGeomFieldIndex('lineStringProperty')
     wkt = f.GetGeomFieldRef(geom_idx).ExportToWkt()
     # Axis swapping
     if wkt != 'LINESTRING (49 2)':
         f.DumpReadable()
-        return 'fail'
+        pytest.fail()
 
     return 'success'
 
@@ -559,7 +556,7 @@ def test_ogr_gmlas_geometryproperty():
 def test_ogr_gmlas_abstractgeometry():
 
     if ogr.GetDriverByName('GMLAS') is None:
-        return 'skip'
+        pytest.skip()
 
     ds = gdal.OpenEx('GMLAS:data/gmlas/gmlas_abstractgeometry_gml32.gml', open_options=[
         'CONFIG_FILE=<Configuration><LayerBuildingRules><GML><IncludeGeometryXML>true</IncludeGeometryXML></GML></LayerBuildingRules></Configuration>'])
@@ -568,21 +565,20 @@ def test_ogr_gmlas_abstractgeometry():
     f = lyr.GetNextFeature()
     if f['AbstractGeometry_xml'] != '<gml:Point gml:id="test.geom.0"><gml:pos>0 1</gml:pos></gml:Point>':
         f.DumpReadable()
-        return 'fail'
+        pytest.fail()
     if f['repeated_AbstractGeometry_xml'] != [
             '<gml:Point gml:id="test.geom.repeated.1"><gml:pos>0 1</gml:pos>',
             '<gml:Point gml:id="test.geom.repeated.2"><gml:pos>1 2</gml:pos>']:
-        print(f['repeated_AbstractGeometry_xml'])
         f.DumpReadable()
-        return 'fail'
+        pytest.fail(f['repeated_AbstractGeometry_xml'])
     wkt = f.GetGeomFieldRef(0).ExportToWkt()
     if wkt != 'POINT (0 1)':
         f.DumpReadable()
-        return 'fail'
+        pytest.fail()
     wkt = f.GetGeomFieldRef(1).ExportToWkt()
     if wkt != 'GEOMETRYCOLLECTION (POINT (0 1),POINT (1 2))':
         f.DumpReadable()
-        return 'fail'
+        pytest.fail()
 
     return 'success'
 
@@ -602,7 +598,7 @@ def error_handler(self, err_type, err_no, err_msg):
 def test_ogr_gmlas_validate():
 
     if ogr.GetDriverByName('GMLAS') is None:
-        return 'skip'
+        pytest.skip()
 
     # By default check we are silent about validation error
     ds = gdal.OpenEx('GMLAS:data/gmlas/gmlas_validate.xml')
@@ -679,7 +675,7 @@ def test_ogr_gmlas_validate():
 def test_ogr_gmlas_test_ns_prefix():
 
     if ogr.GetDriverByName('GMLAS') is None:
-        return 'skip'
+        pytest.skip()
 
     # The schema doesn't directly import xlink, but indirectly references it
     ds = gdal.OpenEx('GMLAS:', open_options=['XSD=data/gmlas/gmlas_test_targetelement.xsd'])
@@ -688,7 +684,7 @@ def test_ogr_gmlas_test_ns_prefix():
     f = lyr.GetNextFeature()
     if f['field_xpath'] != 'myns:main_elt/myns:reference_missing_target_elt/@xlink:href':
         f.DumpReadable()
-        return 'fail'
+        pytest.fail()
 
     return 'success'
 
@@ -699,14 +695,14 @@ def test_ogr_gmlas_test_ns_prefix():
 def test_ogr_gmlas_no_namespace():
 
     if ogr.GetDriverByName('GMLAS') is None:
-        return 'skip'
+        pytest.skip()
 
     ds = ogr.Open('GMLAS:data/gmlas/gmlas_no_namespace.xml')
     lyr = ds.GetLayer(0)
     f = lyr.GetNextFeature()
     if f['foo'] != 'bar':
         f.DumpReadable()
-        return 'fail'
+        pytest.fail()
 
     return 'success'
 
@@ -717,7 +713,7 @@ def test_ogr_gmlas_no_namespace():
 def test_ogr_gmlas_conf():
 
     if ogr.GetDriverByName('GMLAS') is None:
-        return 'skip'
+        pytest.skip()
 
     # Non existing file
     with gdaltest.error_handler():
@@ -753,7 +749,7 @@ def test_ogr_gmlas_conf():
     if f['ogr_pkid'].find('main_elt_1') < 0 or \
        f['otherns_id'] != 'otherns_id':
         f.DumpReadable()
-        return 'fail'
+        pytest.fail()
 
     # IncludeGeometryXML = false
     ds = gdal.OpenEx('GMLAS:data/gmlas/gmlas_geometryproperty_gml32.gml', open_options=[
@@ -767,7 +763,7 @@ def test_ogr_gmlas_conf():
     wkt = f.GetGeomFieldRef(geom_idx).ExportToWkt()
     if wkt != 'POINT (2 49)':
         f.DumpReadable()
-        return 'fail'
+        pytest.fail()
 
     # ExposeMetadataLayers = true
     ds = gdal.OpenEx('GMLAS:data/gmlas/gmlas_abstractgeometry_gml32.gml', open_options=[
@@ -796,7 +792,7 @@ def test_ogr_gmlas_conf():
 def test_ogr_gmlas_conf_ignored_xpath():
 
     if ogr.GetDriverByName('GMLAS') is None:
-        return 'skip'
+        pytest.skip()
 
     # Test unsupported and invalid XPaths
     for xpath in ['',
@@ -948,16 +944,16 @@ def do_GET(self):
 def test_ogr_gmlas_cache():
 
     if ogr.GetDriverByName('GMLAS') is None:
-        return 'skip'
+        pytest.skip()
 
     drv = gdal.GetDriverByName('HTTP')
 
     if drv is None:
-        return 'skip'
+        pytest.skip()
 
     (webserver_process, webserver_port) = webserver.launch(handler=GMLASHTTPHandler)
     if webserver_port == 0:
-        return 'skip'
+        pytest.skip()
 
     gdal.FileFromMemBuffer('/vsimem/ogr_gmlas_cache.xml',
                            """<main_elt xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
@@ -996,22 +992,20 @@ def test_ogr_gmlas_cache():
             'CONFIG_FILE=<Configuration><SchemaCache><Directory>/inexisting_directory/not/exist</Directory></SchemaCache></Configuration>'])
     if ds is None:
         webserver.server_stop(webserver_process, webserver_port)
-        return 'fail'
+        pytest.fail()
     if ds.GetLayerCount() != 1:
-        print(ds.GetLayerCount())
         webserver.server_stop(webserver_process, webserver_port)
-        return 'fail'
+        pytest.fail(ds.GetLayerCount())
 
     # Will create the directory and download and cache
     ds = gdal.OpenEx('GMLAS:/vsimem/ogr_gmlas_cache.xml', open_options=[
         'CONFIG_FILE=<Configuration><SchemaCache><Directory>/vsimem/my/gmlas_cache</Directory></SchemaCache></Configuration>'])
     if ds is None:
         webserver.server_stop(webserver_process, webserver_port)
-        return 'fail'
+        pytest.fail()
     if ds.GetLayerCount() != 1:
-        print(ds.GetLayerCount())
         webserver.server_stop(webserver_process, webserver_port)
-        return 'fail'
+        pytest.fail(ds.GetLayerCount())
 
     gdal.Unlink('/vsimem/my/gmlas_cache/' + gdal.ReadDir('/vsimem/my/gmlas_cache')[0])
 
@@ -1020,10 +1014,10 @@ def test_ogr_gmlas_cache():
         'CONFIG_FILE=<Configuration><SchemaCache><Directory>/vsimem/my/gmlas_cache</Directory></SchemaCache></Configuration>'])
     if ds is None:
         webserver.server_stop(webserver_process, webserver_port)
-        return 'fail'
+        pytest.fail()
     if ds.GetLayerCount() != 1:
         webserver.server_stop(webserver_process, webserver_port)
-        return 'fail'
+        pytest.fail()
 
     # With XSD open option
     ds = gdal.OpenEx('GMLAS:/vsimem/ogr_gmlas_cache.xml', open_options=[
@@ -1031,10 +1025,10 @@ def test_ogr_gmlas_cache():
         'CONFIG_FILE=<Configuration><SchemaCache><Directory>/vsimem/my/gmlas_cache</Directory></SchemaCache></Configuration>'])
     if ds is None:
         webserver.server_stop(webserver_process, webserver_port)
-        return 'fail'
+        pytest.fail()
     if ds.GetLayerCount() != 1:
         webserver.server_stop(webserver_process, webserver_port)
-        return 'fail'
+        pytest.fail()
 
     webserver.server_stop(webserver_process, webserver_port)
 
@@ -1050,9 +1044,8 @@ def test_ogr_gmlas_cache():
             'REFRESH_CACHE=YES',
             'CONFIG_FILE=<Configuration><SchemaCache><Directory>/vsimem/my/gmlas_cache</Directory></SchemaCache></Configuration>'])
     if ds is not None or gdal.GetLastErrorMsg().find('Cannot resolve') < 0:
-        print(gdal.GetLastErrorMsg())
         webserver.server_stop(webserver_process, webserver_port)
-        return 'fail'
+        pytest.fail(gdal.GetLastErrorMsg())
 
     # Re try with non existing cached schema
     gdal.Unlink('/vsimem/my/gmlas_cache/' + gdal.ReadDir('/vsimem/my/gmlas_cache')[0])
@@ -1082,14 +1075,14 @@ def test_ogr_gmlas_cache():
 def test_ogr_gmlas_link_nested_independant_child():
 
     if ogr.GetDriverByName('GMLAS') is None:
-        return 'skip'
+        pytest.skip()
 
     ds = ogr.Open('GMLAS:data/gmlas/gmlas_link_nested_independant_child.xml')
     lyr = ds.GetLayer(0)
     f = lyr.GetNextFeature()
     if f['second_my_id'] != 'second_id':
         f.DumpReadable()
-        return 'fail'
+        pytest.fail()
 
     return 'success'
 
@@ -1100,7 +1093,7 @@ def test_ogr_gmlas_link_nested_independant_child():
 def test_ogr_gmlas_composition_compositionPart():
 
     if ogr.GetDriverByName('GMLAS') is None:
-        return 'skip'
+        pytest.skip()
 
     ds = ogr.Open('GMLAS:data/gmlas/gmlas_composition_compositionPart.xml')
 
@@ -1108,21 +1101,21 @@ def test_ogr_gmlas_composition_compositionPart():
     f = lyr.GetNextFeature()
     if f.IsFieldSet('parent_ogr_pkid') == 0 or f.IsFieldSet('CompositionPart_pkid') == 0:
         f.DumpReadable()
-        return 'fail'
+        pytest.fail()
     f = lyr.GetNextFeature()
     if f.IsFieldSet('parent_ogr_pkid') == 0 or f.IsFieldSet('CompositionPart_pkid') == 0:
         f.DumpReadable()
-        return 'fail'
+        pytest.fail()
 
     lyr = ds.GetLayerByName('CompositionPart')
     f = lyr.GetNextFeature()
     if f.IsFieldSet('my_id') == 0 or f.IsFieldSet('a') == 0:
         f.DumpReadable()
-        return 'fail'
+        pytest.fail()
     f = lyr.GetNextFeature()
     if f.IsFieldSet('my_id') == 0 or f.IsFieldSet('a') == 0:
         f.DumpReadable()
-        return 'fail'
+        pytest.fail()
 
     return 'success'
 
@@ -1134,7 +1127,7 @@ def test_ogr_gmlas_composition_compositionPart():
 def test_ogr_gmlas_instantiate_only_gml_feature():
 
     if ogr.GetDriverByName('GMLAS') is None:
-        return 'skip'
+        pytest.skip()
 
     ds = gdal.OpenEx('GMLAS:',
                      open_options=['XSD=data/gmlas/gmlas_instantiate_only_gml_feature.xsd'])
@@ -1150,7 +1143,7 @@ def test_ogr_gmlas_instantiate_only_gml_feature():
 def test_ogr_gmlas_timestamp_ignored_for_hash():
 
     if ogr.GetDriverByName('GMLAS') is None:
-        return 'skip'
+        pytest.skip()
 
     ds = ogr.Open('GMLAS:data/gmlas/gmlas_timestamp_ignored_for_hash_foo.xml')
     lyr = ds.GetLayer(0)
@@ -1161,9 +1154,8 @@ def test_ogr_gmlas_timestamp_ignored_for_hash():
     lyr = ds.GetLayer(0)
     f = lyr.GetNextFeature()
     if f['ogr_pkid'] != pkid:
-        print(pkid)
         f.DumpReadable()
-        return 'fail'
+        pytest.fail(pkid)
 
     return 'success'
 
@@ -1174,7 +1166,7 @@ def test_ogr_gmlas_timestamp_ignored_for_hash():
 def test_ogr_gmlas_dataset_getnextfeature():
 
     if ogr.GetDriverByName('GMLAS') is None:
-        return 'skip'
+        pytest.skip()
 
     ds = gdal.OpenEx('GMLAS:data/gmlas/gmlas_test1.xml')
 
@@ -1299,14 +1291,13 @@ def test_ogr_gmlas_dataset_getnextfeature():
 def test_ogr_gmlas_inline_identifier():
 
     if ogr.GetDriverByName('GMLAS') is None:
-        return 'skip'
+        pytest.skip()
 
     ds = gdal.OpenEx('GMLAS:', open_options=['XSD=data/gmlas/gmlas_inline_identifier.xsd'])
     if ds.GetLayerCount() != 2:
-        print(ds.GetLayerCount())
         for i in range(ds.GetLayerCount()):
             print(ds.GetLayer(i).GetName())
-        return 'fail'
+        pytest.fail(ds.GetLayerCount())
     lyr = ds.GetLayer(0)
     assert lyr.GetLayerDefn().GetFieldIndex('identifier_foo') >= 0
 
@@ -1319,7 +1310,7 @@ def test_ogr_gmlas_inline_identifier():
 def test_ogr_gmlas_avoid_same_name_inlined_classes():
 
     if ogr.GetDriverByName('GMLAS') is None:
-        return 'skip'
+        pytest.skip()
 
     ds = gdal.OpenEx('GMLAS:', open_options=['XSD=data/gmlas/gmlas_avoid_same_name_inlined_classes.xsd'])
     assert ds.GetLayerCount() == 3
@@ -1337,7 +1328,7 @@ def test_ogr_gmlas_avoid_same_name_inlined_classes():
 def test_ogr_gmlas_validate_ignored_fixed_attribute():
 
     if ogr.GetDriverByName('GMLAS') is None:
-        return 'skip'
+        pytest.skip()
 
     myhandler = MyHandler()
     gdal.PushErrorHandler(myhandler.error_handler)
@@ -1356,7 +1347,7 @@ def test_ogr_gmlas_validate_ignored_fixed_attribute():
 def test_ogr_gmlas_remove_unused_layers_and_fields():
 
     if ogr.GetDriverByName('GMLAS') is None:
-        return 'skip'
+        pytest.skip()
 
     ds = gdal.OpenEx('GMLAS:data/gmlas/gmlas_remove_unused_layers_and_fields.xml',
                      open_options=['REMOVE_UNUSED_LAYERS=YES',
@@ -1365,28 +1356,27 @@ def test_ogr_gmlas_remove_unused_layers_and_fields():
     lyr = ds.GetLayer(0)
     f = lyr.GetNextFeature()
     if lyr.GetLayerDefn().GetFieldCount() != 4:
-        print(lyr.GetLayerDefn().GetFieldCount())
         f.DumpReadable()
-        return 'fail'
+        pytest.fail(lyr.GetLayerDefn().GetFieldCount())
     assert f['used1'] == 'foo' and f['used2'] == 'bar' and f['nillable_nilReason'] == 'unknown'
 
     lyr = ds.GetLayerByName('_ogr_layers_metadata')
     if lyr.GetFeatureCount() != 1:
         for f in lyr:
             f.DumpReadable()
-        return 'fail'
+        pytest.fail()
 
     lyr = ds.GetLayerByName('_ogr_fields_metadata')
     if lyr.GetFeatureCount() != 7:
         for f in lyr:
             f.DumpReadable()
-        return 'fail'
+        pytest.fail()
 
     lyr = ds.GetLayerByName('_ogr_layer_relationships')
     if lyr.GetFeatureCount() != 0:
         for f in lyr:
             f.DumpReadable()
-        return 'fail'
+        pytest.fail()
 
     return 'success'
 
@@ -1397,15 +1387,15 @@ def test_ogr_gmlas_remove_unused_layers_and_fields():
 def test_ogr_gmlas_xlink_resolver():
 
     if ogr.GetDriverByName('GMLAS') is None:
-        return 'skip'
+        pytest.skip()
 
     drv = gdal.GetDriverByName('HTTP')
     if drv is None:
-        return 'skip'
+        pytest.skip()
 
     (webserver_process, webserver_port) = webserver.launch(handler=GMLASHTTPHandler)
     if webserver_port == 0:
-        return 'skip'
+        pytest.skip()
 
     gdal.FileFromMemBuffer('/vsimem/ogr_gmlas_xlink_resolver.xsd',
                            """<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema"
@@ -1469,7 +1459,7 @@ def test_ogr_gmlas_xlink_resolver():
     lyr = ds.GetLayer(0)
     if lyr.GetLayerDefn().GetFieldIndex('my_link_rawcontent') >= 0:
         webserver.server_stop(webserver_process, webserver_port)
-        return 'fail'
+        pytest.fail()
     ds = None
 
     # Enable resolution, but only from local cache
@@ -1484,11 +1474,11 @@ def test_ogr_gmlas_xlink_resolver():
     lyr = ds.GetLayer(0)
     if lyr.GetLayerDefn().GetFieldIndex('my_link_rawcontent') < 0:
         webserver.server_stop(webserver_process, webserver_port)
-        return 'fail'
+        pytest.fail()
     f = lyr.GetNextFeature()
     if f.IsFieldSet('my_link_rawcontent'):
         webserver.server_stop(webserver_process, webserver_port)
-        return 'fail'
+        pytest.fail()
 
     # Try again but this time with the cached file
     cached_file = '/vsimem/gmlas_xlink_cache/localhost_%d_vsimem_resource.xml' % webserver_port
@@ -1497,7 +1487,7 @@ def test_ogr_gmlas_xlink_resolver():
     f = lyr.GetNextFeature()
     if f['my_link_rawcontent'] != 'foo':
         webserver.server_stop(webserver_process, webserver_port)
-        return 'fail'
+        pytest.fail()
     ds = None
     gdal.Unlink(cached_file)
 
@@ -1518,11 +1508,11 @@ def test_ogr_gmlas_xlink_resolver():
     f = lyr.GetNextFeature()
     if f['my_link_rawcontent'] != 'bar':
         webserver.server_stop(webserver_process, webserver_port)
-        return 'fail'
+        pytest.fail()
     # Check that the content is not cached
     if gdal.VSIStatL(cached_file) is not None:
         webserver.server_stop(webserver_process, webserver_port)
-        return 'fail'
+        pytest.fail()
 
     # Delete the remote file and check that we can retrieve it from RAM cache
     gdal.Unlink('/vsimem/resource.xml')
@@ -1530,12 +1520,12 @@ def test_ogr_gmlas_xlink_resolver():
     f = lyr.GetNextFeature()
     if f['my_link_rawcontent'] != 'bar':
         webserver.server_stop(webserver_process, webserver_port)
-        return 'fail'
+        pytest.fail()
 
     f = lyr.GetNextFeature()
     if f['my_link_rawcontent'] != 'baz':
         webserver.server_stop(webserver_process, webserver_port)
-        return 'fail'
+        pytest.fail()
 
     gdal.Unlink('/vsimem/resource2.xml')
     lyr.ResetReading()
@@ -1544,12 +1534,12 @@ def test_ogr_gmlas_xlink_resolver():
         f = lyr.GetNextFeature()
     if f['my_link_rawcontent'] is not None:
         webserver.server_stop(webserver_process, webserver_port)
-        return 'fail'
+        pytest.fail()
 
     f = lyr.GetNextFeature()
     if f['my_link_rawcontent'] != 'baz':
         webserver.server_stop(webserver_process, webserver_port)
-        return 'fail'
+        pytest.fail()
 
     ds = None
 
@@ -1568,11 +1558,11 @@ def test_ogr_gmlas_xlink_resolver():
     f = lyr.GetNextFeature()
     if f['my_link_rawcontent'] != 'bar':
         webserver.server_stop(webserver_process, webserver_port)
-        return 'fail'
+        pytest.fail()
     # Check that the content is cached
     if gdal.VSIStatL(cached_file) is None:
         webserver.server_stop(webserver_process, webserver_port)
-        return 'fail'
+        pytest.fail()
     ds = None
 
     # Enable remote resolution and caching and REFRESH_CACHE
@@ -1590,11 +1580,11 @@ def test_ogr_gmlas_xlink_resolver():
     f = lyr.GetNextFeature()
     if f['my_link_rawcontent'] != 'baz':
         webserver.server_stop(webserver_process, webserver_port)
-        return 'fail'
+        pytest.fail()
     # Check that the content is cached
     if gdal.VSIStatL(cached_file) is None:
         webserver.server_stop(webserver_process, webserver_port)
-        return 'fail'
+        pytest.fail()
     ds = None
 
     # Test absent remote resource
@@ -1619,7 +1609,7 @@ def test_ogr_gmlas_xlink_resolver():
     if f.IsFieldSet('my_link_rawcontent'):
         f.DumpReadable()
         webserver.server_stop(webserver_process, webserver_port)
-        return 'fail'
+        pytest.fail()
     ds = None
 
     # Test file size limit
@@ -1639,11 +1629,11 @@ def test_ogr_gmlas_xlink_resolver():
         f = lyr.GetNextFeature()
     if gdal.GetLastErrorMsg() == '':
         webserver.server_stop(webserver_process, webserver_port)
-        return 'fail'
+        pytest.fail()
     # Check that the content is not cached
     if gdal.VSIStatL(cached_file) is not None:
         webserver.server_stop(webserver_process, webserver_port)
-        return 'fail'
+        pytest.fail()
     ds = None
 
     # Test with URL specific rule with RawContent resolution
@@ -1667,11 +1657,11 @@ def test_ogr_gmlas_xlink_resolver():
        f['my_link_attr_after'] != 'b':
         f.DumpReadable()
         webserver.server_stop(webserver_process, webserver_port)
-        return 'fail'
+        pytest.fail()
     # Check that the content is cached
     if gdal.VSIStatL(cached_file) is None:
         webserver.server_stop(webserver_process, webserver_port)
-        return 'fail'
+        pytest.fail()
     ds = None
 
     # Test with URL specific rule with FieldsFromXPath resolution
@@ -1796,13 +1786,13 @@ def test_ogr_gmlas_xlink_resolver():
        f['my_link2_attr_after'] != 'b2':
         f.DumpReadable()
         webserver.server_stop(webserver_process, webserver_port)
-        return 'fail'
+        pytest.fail()
 
     f = lyr.GetNextFeature()
     if f['my_link2_bar'] != 123:
         f.DumpReadable()
         webserver.server_stop(webserver_process, webserver_port)
-        return 'fail'
+        pytest.fail()
 
     gdal.Unlink('/vsimem/subdir1/resource.xml')
     gdal.Unlink('/vsimem/subdir2/resource2_super_super_super_super_super_super_super_super_super_super_super_super_super_super_super_super_super_super_super_super_super_super_super_super_super_super_super_super_super_super_super_super_super_super_super_super_super_super_super_super_super_super_super_super_very_long.xml')
@@ -1825,7 +1815,7 @@ def test_ogr_gmlas_xlink_resolver():
        f['my_link2_attr_after'] != 'b2':
         f.DumpReadable()
         webserver.server_stop(webserver_process, webserver_port)
-        return 'fail'
+        pytest.fail()
 
     ds = None
 
@@ -1855,7 +1845,7 @@ def test_ogr_gmlas_xlink_resolver():
 def test_ogr_gmlas_recoding():
 
     if ogr.GetDriverByName('GMLAS') is None:
-        return 'skip'
+        pytest.skip()
 
     if sys.version_info >= (3, 0, 0):
         accent = '\u00e9'
@@ -1868,7 +1858,7 @@ def test_ogr_gmlas_recoding():
     f = lyr.GetNextFeature()
     if f['attr'] != accent:
         f.DumpReadable()
-        return 'fail'
+        pytest.fail()
 
     return 'success'
 
@@ -1879,7 +1869,7 @@ def test_ogr_gmlas_recoding():
 def test_ogr_gmlas_schema_without_namespace_prefix():
 
     if ogr.GetDriverByName('GMLAS') is None:
-        return 'skip'
+        pytest.skip()
 
     # Generic http:// namespace URI
     ds = gdal.OpenEx('GMLAS:', open_options=['XSD=data/gmlas/gmlas_schema_without_namespace_prefix_generic_http_uri.xsd'])
@@ -1887,7 +1877,7 @@ def test_ogr_gmlas_schema_without_namespace_prefix():
     f = lyr.GetNextFeature()
     if f['layer_xpath'] != 'my_ns:main_elt':
         f.DumpReadable()
-        return 'fail'
+        pytest.fail()
 
     gdal.Unlink('/vsimem/ogr_gmlas_schema_without_namespace_prefix.xsd')
 
@@ -1898,7 +1888,7 @@ def test_ogr_gmlas_schema_without_namespace_prefix():
     f = lyr.GetNextFeature()
     if f['layer_xpath'] != 'fake_3_0:main_elt':
         f.DumpReadable()
-        return 'fail'
+        pytest.fail()
 
     gdal.Unlink('/vsimem/ogr_gmlas_schema_without_namespace_prefix.xsd')
 
@@ -1909,7 +1899,7 @@ def test_ogr_gmlas_schema_without_namespace_prefix():
     f = lyr.GetNextFeature()
     if f['layer_xpath'] != 'my_namespace:main_elt':
         f.DumpReadable()
-        return 'fail'
+        pytest.fail()
 
     return 'success'
 
@@ -1920,7 +1910,7 @@ def test_ogr_gmlas_schema_without_namespace_prefix():
 def test_ogr_gmlas_truncated_xml():
 
     if ogr.GetDriverByName('GMLAS') is None:
-        return 'skip'
+        pytest.skip()
 
     ds = gdal.OpenEx('GMLAS:data/gmlas/gmlas_truncated_xml.xml')
     lyr = ds.GetLayer(0)
@@ -1928,7 +1918,7 @@ def test_ogr_gmlas_truncated_xml():
         f = lyr.GetNextFeature()
     if f is not None:
         f.DumpReadable()
-        return 'fail'
+        pytest.fail()
 
     return 'success'
 
@@ -1939,7 +1929,7 @@ def test_ogr_gmlas_truncated_xml():
 def test_ogr_gmlas_identifier_truncation():
 
     if ogr.GetDriverByName('GMLAS') is None:
-        return 'skip'
+        pytest.skip()
 
     ds = gdal.OpenEx('GMLAS:', open_options=[
         'XSD=data/gmlas/gmlas_identifier_truncation.xsd',
@@ -1977,7 +1967,7 @@ def test_ogr_gmlas_identifier_truncation():
 def test_ogr_gmlas_identifier_case_ambiguity():
 
     if ogr.GetDriverByName('GMLAS') is None:
-        return 'skip'
+        pytest.skip()
 
     ds = gdal.OpenEx('GMLAS:', open_options=[
         'XSD=data/gmlas/gmlas_identifier_case_ambiguity.xsd',
@@ -2001,10 +1991,10 @@ def test_ogr_gmlas_identifier_case_ambiguity():
 def test_ogr_gmlas_writer():
 
     if ogr.GetDriverByName('GMLAS') is None:
-        return 'skip'
+        pytest.skip()
 
     if ogr.GetDriverByName('SQLite') is None:
-        return 'skip'
+        pytest.skip()
 
     src_ds = gdal.OpenEx('GMLAS:data/gmlas/gmlas_test1.xml', open_options=['EXPOSE_METADATA_LAYERS=YES'])
     tmp_ds = gdal.VectorTranslate('/vsimem/ogr_gmlas_writer.db', src_ds, format='SQLite')
@@ -2026,10 +2016,10 @@ def test_ogr_gmlas_writer():
 def test_ogr_gmlas_writer_check_xml_xsd():
 
     if ogr.GetDriverByName('GMLAS') is None:
-        return 'skip'
+        pytest.skip()
 
     if ogr.GetDriverByName('SQLite') is None:
-        return 'skip'
+        pytest.skip()
 
     got = open('tmp/gmlas_test1_generated.xml', 'rt').read()
     got = got.replace('\r\n', '\n')
@@ -2043,13 +2033,12 @@ def test_ogr_gmlas_writer_check_xml_xsd():
     expected = expected.replace('\r\n', '\n')
 
     if got != expected:
-        print('Got:')
         print(got)
         print('')
 
         print('Diff:')
         os.system('diff -u data/gmlas/gmlas_test1_generated.xml tmp/gmlas_test1_generated.xml')
-        return 'fail'
+        pytest.fail('Got:')
 
     got = open('tmp/gmlas_test1_generated.xsd', 'rt').read()
     got = got.replace('\r\n', '\n')
@@ -2063,13 +2052,12 @@ def test_ogr_gmlas_writer_check_xml_xsd():
     expected = expected.replace('\r\n', '\n')
 
     if got != expected:
-        print('Got:')
         print(got)
         print('')
 
         print('Diff:')
         os.system('diff -u data/gmlas/gmlas_test1_generated.xsd tmp/gmlas_test1_generated.xsd')
-        return 'fail'
+        pytest.fail('Got:')
 
     return 'success'
 
@@ -2081,22 +2069,21 @@ def test_ogr_gmlas_writer_check_xml_xsd():
 def test_ogr_gmlas_writer_check_xml_read_back():
 
     if ogr.GetDriverByName('GMLAS') is None:
-        return 'skip'
+        pytest.skip()
 
     if ogr.GetDriverByName('SQLite') is None:
-        return 'skip'
+        pytest.skip()
 
     # Skip tests when -fsanitize is used
     if gdaltest.is_travis_branch('sanitize'):
-        print('Skipping because of -sanitize')
-        return 'skip'
+        pytest.skip('Skipping because of -sanitize')
 
     import test_cli_utilities
 
     if test_cli_utilities.get_ogrinfo_path() is None:
         gdal.Unlink('tmp/gmlas_test1_generated.xml')
         gdal.Unlink('tmp/gmlas_test1_generated.xsd')
-        return 'skip'
+        pytest.skip()
 
     # Compare the ogrinfo dump of the generated .xml with a reference one
     ret = gdaltest.runexternal(test_cli_utilities.get_ogrinfo_path() +
@@ -2115,7 +2102,6 @@ def test_ogr_gmlas_writer_check_xml_read_back():
     ret_for_comparison = ret_for_comparison.replace('fake_hash', '3CF9893502A592E8CF5EA6EF3D8F8C7B')
 
     if ret_for_comparison != expected:
-        print('XML:')
         print(open('tmp/gmlas_test1_generated.xml', 'rt').read())
         print('')
 
@@ -2134,7 +2120,7 @@ def test_ogr_gmlas_writer_check_xml_read_back():
 
         os.unlink('tmp/gmlas_test1_generated_expected.txt')
         os.unlink('tmp/gmlas_test1_generated_got.txt')
-        return 'fail'
+        pytest.fail('XML:')
 
     gdal.Unlink('tmp/gmlas_test1_generated.xml')
     gdal.Unlink('tmp/gmlas_test1_generated.xsd')
@@ -2148,7 +2134,7 @@ def test_ogr_gmlas_writer_check_xml_read_back():
 def test_ogr_gmlas_writer_gml():
 
     if ogr.GetDriverByName('GMLAS') is None:
-        return 'skip'
+        pytest.skip()
 
     src_ds = gdal.OpenEx('GMLAS:data/gmlas/gmlas_geometryproperty_gml32_no_error.gml',
                          open_options=['EXPOSE_METADATA_LAYERS=YES', '@HASH=hash'])
@@ -2191,7 +2177,7 @@ def test_ogr_gmlas_writer_gml():
 def test_ogr_gmlas_writer_gml_assign_srs():
 
     if ogr.GetDriverByName('GMLAS') is None:
-        return 'skip'
+        pytest.skip()
 
     src_ds = gdal.OpenEx('GMLAS:data/gmlas/gmlas_geometryproperty_gml32_no_error.gml',
                          open_options=['EXPOSE_METADATA_LAYERS=YES', '@HASH=hash'])
@@ -2250,7 +2236,7 @@ def test_ogr_gmlas_writer_gml_assign_srs():
 def test_ogr_gmlas_writer_gml_original_xml():
 
     if ogr.GetDriverByName('GMLAS') is None:
-        return 'skip'
+        pytest.skip()
 
     src_ds = gdal.OpenEx('GMLAS:data/gmlas/gmlas_geometryproperty_gml32_no_error.gml',
                          open_options=['EXPOSE_METADATA_LAYERS=YES',
@@ -2291,7 +2277,7 @@ def test_ogr_gmlas_writer_gml_original_xml():
 def test_ogr_gmlas_writer_options():
 
     if ogr.GetDriverByName('GMLAS') is None:
-        return 'skip'
+        pytest.skip()
 
     src_ds = gdal.OpenEx('GMLAS:data/gmlas/gmlas_geometryproperty_gml32_no_error.gml', open_options=['@HASH=hash'])
     tmp_ds = gdal.VectorTranslate('', src_ds, format='Memory')
@@ -2409,7 +2395,7 @@ def test_ogr_gmlas_writer_options():
 def test_ogr_gmlas_writer_errors():
 
     if ogr.GetDriverByName('GMLAS') is None:
-        return 'skip'
+        pytest.skip()
 
     # Source dataset is empty
     with gdaltest.error_handler():
@@ -2513,7 +2499,7 @@ def test_ogr_gmlas_writer_errors():
 def test_ogr_gmlas_read_fake_gmljp2():
 
     if ogr.GetDriverByName('GMLAS') is None:
-        return 'skip'
+        pytest.skip()
 
     ds = gdal.OpenEx('GMLAS:data/fake_gmljp2.xml')
 
@@ -2536,7 +2522,7 @@ def test_ogr_gmlas_read_fake_gmljp2():
 def test_ogr_gmlas_typing_constraints():
 
     if ogr.GetDriverByName('GMLAS') is None:
-        return 'skip'
+        pytest.skip()
 
     # One substitution, no repetition
     ds = gdal.OpenEx('GMLAS:data/gmlas/gmlas_typing_constraints_one_subst_no_repetition.xml',
@@ -2557,12 +2543,12 @@ def test_ogr_gmlas_typing_constraints():
     f = lyr.GetNextFeature()
     if not f.IsFieldSetAndNotNull('foo_bar_pkid'):
         f.DumpReadable()
-        return 'fail'
+        pytest.fail()
     lyr = ds.GetLayer(1)
     f = lyr.GetNextFeature()
     if f.GetField('value') != 'baz':
         f.DumpReadable()
-        return 'fail'
+        pytest.fail()
     ds = None
 
     # One substitution, with repetition
@@ -2587,11 +2573,11 @@ def test_ogr_gmlas_typing_constraints():
     f = lyr.GetNextFeature()
     if f.GetField('value') != 'baz':
         f.DumpReadable()
-        return 'fail'
+        pytest.fail()
     f = lyr.GetNextFeature()
     if f.GetField('value') != 'baz2':
         f.DumpReadable()
-        return 'fail'
+        pytest.fail()
     ds = None
 
     # 2 substitutions
@@ -2614,15 +2600,15 @@ def test_ogr_gmlas_typing_constraints():
     f = lyr.GetNextFeature()
     if not f.IsFieldSetAndNotNull('foo_bar_pkid'):
         f.DumpReadable()
-        return 'fail'
+        pytest.fail()
     if f.IsFieldSetAndNotNull('foo_baz_pkid'):
         f.DumpReadable()
-        return 'fail'
+        pytest.fail()
     lyr = ds.GetLayer(1)
     f = lyr.GetNextFeature()
     if f.GetField('value') != 'baz':
         f.DumpReadable()
-        return 'fail'
+        pytest.fail()
     ds = None
 
     return 'success'
@@ -2634,7 +2620,7 @@ def test_ogr_gmlas_typing_constraints():
 def test_ogr_gmlas_swe_dataarray():
 
     if ogr.GetDriverByName('GMLAS') is None:
-        return 'skip'
+        pytest.skip()
 
     ds = gdal.OpenEx('GMLAS:data/gmlas/gmlas_swe_dataarray.xml')
 
@@ -2648,17 +2634,17 @@ def test_ogr_gmlas_swe_dataarray():
        f.GetField('myText') != 'foo' or \
        f.GetField('myBoolean') is False:
         f.DumpReadable()
-        return 'fail'
+        pytest.fail()
     f = lyr.GetNextFeature()
     if f.GetField('myTime') != '2017/09/01 00:00:00' or \
        f.GetField('myCategory') != '2' or \
        f.GetField('myQuantity') != 3.45:
         f.DumpReadable()
-        return 'fail'
+        pytest.fail()
     f = lyr.GetNextFeature()
     if f is not None:
         f.DumpReadable()
-        return 'fail'
+        pytest.fail()
 
     lyr = ds.GetLayerByName('dataarray_2')
     f = lyr.GetNextFeature()
@@ -2666,17 +2652,17 @@ def test_ogr_gmlas_swe_dataarray():
        f.GetField('myCategory') != '1' or \
        f.GetField('myQuantity') != 2.34:
         f.DumpReadable()
-        return 'fail'
+        pytest.fail()
     f = lyr.GetNextFeature()
     if f.GetField('myTime') != '2017/09/01 00:00:00' or \
        f.GetField('myCategory') is not None or \
        f.GetField('myQuantity') != 3.45:
         f.DumpReadable()
-        return 'fail'
+        pytest.fail()
     f = lyr.GetNextFeature()
     if f is not None:
         f.DumpReadable()
-        return 'fail'
+        pytest.fail()
 
     lyr = ds.GetLayerByName('dataarray_3')
     f = lyr.GetNextFeature()
@@ -2684,17 +2670,17 @@ def test_ogr_gmlas_swe_dataarray():
        f.GetField('myCategory') != '1' or \
        f.GetField('myQuantity') != 2.34:
         f.DumpReadable()
-        return 'fail'
+        pytest.fail()
     f = lyr.GetNextFeature()
     if f.GetField('myTime') != '2017/09/01 00:00:00' or \
        f.GetField('myCategory') is not None or \
        f.GetField('myQuantity') != 3.45:
         f.DumpReadable()
-        return 'fail'
+        pytest.fail()
     f = lyr.GetNextFeature()
     if f is not None:
         f.DumpReadable()
-        return 'fail'
+        pytest.fail()
 
     ds = None
 
@@ -2707,7 +2693,7 @@ def test_ogr_gmlas_swe_dataarray():
 def test_ogr_gmlas_swe_datarecord():
 
     if ogr.GetDriverByName('GMLAS') is None:
-        return 'skip'
+        pytest.skip()
 
     gdal.ErrorReset()
     ds = gdal.OpenEx('GMLAS:data/gmlas/gmlas_swe_datarecord.xml', open_options=['VALIDATE=YES'])
@@ -2727,7 +2713,7 @@ def test_ogr_gmlas_swe_datarecord():
        f.GetField('mytext_value') != 'foo' or \
        f.GetField('myboolean_value') is False:
         f.DumpReadable()
-        return 'fail'
+        pytest.fail()
     ds = None
 
     return 'success'
@@ -2739,7 +2725,7 @@ def test_ogr_gmlas_swe_datarecord():
 def test_ogr_gmlas_any_field_at_end_of_declaration():
 
     if ogr.GetDriverByName('GMLAS') is None:
-        return 'skip'
+        pytest.skip()
 
     # Simplified test case for
     # http://schemas.earthresourceml.org/earthresourceml-lite/1.0/erml-lite.xsd
@@ -2755,7 +2741,7 @@ def test_ogr_gmlas_any_field_at_end_of_declaration():
     assert gdal.GetLastErrorMsg() != ''
     if f.GetField('foo') != 'bar':
         f.DumpReadable()
-        return 'fail'
+        pytest.fail()
     if f.GetField('value') != '<something>baz</something>':
         print('Expected fail: value != <something>baz</something>')
 
@@ -2768,14 +2754,14 @@ def test_ogr_gmlas_any_field_at_end_of_declaration():
 def test_ogr_gmlas_aux_schema_without_namespace_prefix():
 
     if ogr.GetDriverByName('GMLAS') is None:
-        return 'skip'
+        pytest.skip()
 
     ds = gdal.OpenEx('GMLAS:data/gmlas/gmlas_aux_schema_without_namespace_prefix.xml')
     lyr = ds.GetLayerByName('main_elt')
     f = lyr.GetNextFeature()
     if not f.IsFieldSetAndNotNull('generic_pkid'):
         f.DumpReadable()
-        return 'fail'
+        pytest.fail()
 
     return 'success'
 
@@ -2787,14 +2773,14 @@ def test_ogr_gmlas_aux_schema_without_namespace_prefix():
 def test_ogr_gmlas_geometry_as_substitutiongroup():
 
     if ogr.GetDriverByName('GMLAS') is None:
-        return 'skip'
+        pytest.skip()
 
     ds = gdal.OpenEx('GMLAS:data/gmlas/gmlas_geometry_as_substitutiongroup.xml')
     lyr = ds.GetLayerByName('foo')
     f = lyr.GetNextFeature()
     if f.GetGeometryRef() is None:
         f.DumpReadable()
-        return 'fail'
+        pytest.fail()
     ds = None
 
     return 'success'
@@ -2805,7 +2791,7 @@ def test_ogr_gmlas_geometry_as_substitutiongroup():
 def ogr_gmlas_extra_piezometre():
 
     if ogr.GetDriverByName('GMLAS') is None:
-        return 'skip'
+        pytest.skip()
 
     return compare_ogrinfo_output('data/gmlas/real_world/Piezometre.06512X0037.STREMY.2.gml',
                                   'data/gmlas/real_world/output/Piezometre.06512X0037.STREMY.2.txt',
@@ -2817,7 +2803,7 @@ def ogr_gmlas_extra_piezometre():
 def ogr_gmlas_extra_eureg():
 
     if ogr.GetDriverByName('GMLAS') is None:
-        return 'skip'
+        pytest.skip()
 
     return compare_ogrinfo_output('data/gmlas/real_world/EUReg.example.gml',
                                   'data/gmlas/real_world/output/EUReg.example.txt',
@@ -2831,14 +2817,14 @@ def ogr_gmlas_extra_eureg():
 def test_ogr_gmlas_no_element_in_first_choice_schema():
 
     if ogr.GetDriverByName('GMLAS') is None:
-        return 'skip'
+        pytest.skip()
 
     ds = gdal.OpenEx('GMLAS:', open_options=['XSD=data/gmlas/gmlas_no_element_in_first_choice_schema.xsd'])
     lyr = ds.GetLayerByName('_ogr_layers_metadata')
     f = lyr.GetNextFeature()
     if f['layer_xpath'] != 'my_ns:main_elt':
         f.DumpReadable()
-        return 'fail'
+        pytest.fail()
 
     return 'success'
 
@@ -2849,7 +2835,7 @@ def test_ogr_gmlas_no_element_in_first_choice_schema():
 def test_ogr_gmlas_internal_xlink_href():
 
     if ogr.GetDriverByName('GMLAS') is None:
-        return 'skip'
+        pytest.skip()
 
     with gdaltest.error_handler():
         ds = gdal.OpenEx('GMLAS:data/gmlas/gmlas_internal_xlink_href.xml')
@@ -2860,7 +2846,7 @@ def test_ogr_gmlas_internal_xlink_href():
        f.IsFieldSet('link_to_second_or_third_elt_third_elt_pkid') or \
        f.IsFieldSet('link_to_third_elt_third_elt_pkid'):
         f.DumpReadable()
-        return 'fail'
+        pytest.fail()
 
     f = lyr.GetNextFeature()
     if f['link_to_second_or_third_elt_href'] != '#id2' or \
@@ -2868,7 +2854,7 @@ def test_ogr_gmlas_internal_xlink_href():
        f.IsFieldSet('link_to_second_or_third_elt_third_elt_pkid') or \
        f.IsFieldSet('link_to_third_elt_third_elt_pkid'):
         f.DumpReadable()
-        return 'fail'
+        pytest.fail()
 
     f = lyr.GetNextFeature()
     if f['link_to_second_or_third_elt_href'] != '#id3' or \
@@ -2876,7 +2862,7 @@ def test_ogr_gmlas_internal_xlink_href():
        f.IsFieldSet('link_to_second_or_third_elt_third_elt_pkid') or \
        f.IsFieldSet('link_to_third_elt_third_elt_pkid'):
         f.DumpReadable()
-        return 'fail'
+        pytest.fail()
 
     f = lyr.GetNextFeature()
     if f['link_to_second_or_third_elt_href'] != '#id4' or \
@@ -2884,7 +2870,7 @@ def test_ogr_gmlas_internal_xlink_href():
        f['link_to_second_or_third_elt_third_elt_pkid'] != 'D1013B7E44F28C976B976A4314FA4A09_third_elt_1' or \
        f.IsFieldSet('link_to_third_elt_third_elt_pkid'):
         f.DumpReadable()
-        return 'fail'
+        pytest.fail()
 
     f = lyr.GetNextFeature()
     if f['link_to_third_elt_href'] != '#id4' or \
@@ -2892,14 +2878,14 @@ def test_ogr_gmlas_internal_xlink_href():
        f.IsFieldSet('link_to_second_or_third_elt_third_elt_pkid') or \
        f['link_to_third_elt_third_elt_pkid'] != 'D1013B7E44F28C976B976A4314FA4A09_third_elt_1':
         f.DumpReadable()
-        return 'fail'
+        pytest.fail()
 
     lyr = ds.GetLayerByName('_ogr_fields_metadata')
     f = lyr.GetNextFeature()
     if f['layer_name'] != 'main_elt' or f['field_index'] != 1 or \
        f['field_name'] != 'link_to_second_or_third_elt_href':
         f.DumpReadable()
-        return 'fail'
+        pytest.fail()
 
     f = lyr.GetNextFeature()
     if f['layer_name'] != 'main_elt' or f['field_index'] != 2 or \
@@ -2912,7 +2898,7 @@ def test_ogr_gmlas_internal_xlink_href():
        f['field_category'] != 'PATH_TO_CHILD_ELEMENT_WITH_LINK' or \
        f['field_related_layer'] != 'second_elt':
         f.DumpReadable()
-        return 'fail'
+        pytest.fail()
 
     f = lyr.GetNextFeature()
     if f['layer_name'] != 'main_elt' or f['field_index'] != 3 or \
@@ -2925,31 +2911,31 @@ def test_ogr_gmlas_internal_xlink_href():
        f['field_category'] != 'PATH_TO_CHILD_ELEMENT_WITH_LINK' or \
        f['field_related_layer'] != 'third_elt':
         f.DumpReadable()
-        return 'fail'
+        pytest.fail()
 
     f = lyr.GetNextFeature()
     if f['layer_name'] != 'main_elt' or f['field_index'] != 4 or \
        f['field_name'] != 'link_to_second_or_third_elt':
         f.DumpReadable()
-        return 'fail'
+        pytest.fail()
 
     f = lyr.GetNextFeature()
     if f['layer_name'] != 'main_elt' or f['field_index'] != 5 or \
        f['field_name'] != 'link_to_third_elt_href':
         f.DumpReadable()
-        return 'fail'
+        pytest.fail()
 
     f = lyr.GetNextFeature()
     if f['layer_name'] != 'main_elt' or f['field_index'] != 6 or \
        f['field_name'] != 'link_to_third_elt_third_elt_pkid':
         f.DumpReadable()
-        return 'fail'
+        pytest.fail()
 
     f = lyr.GetNextFeature()
     if f['layer_name'] != 'third_elt' or f['field_index'] != 1 or \
        f['field_name'] != 'id':
         f.DumpReadable()
-        return 'fail'
+        pytest.fail()
 
     lyr = ds.GetLayerByName('_ogr_layer_relationships')
     f = lyr.GetNextFeature()
@@ -2959,7 +2945,7 @@ def test_ogr_gmlas_internal_xlink_href():
        f['child_layer'] != 'third_elt' or \
        f['child_pkid'] != 'ogr_pkid':
         f.DumpReadable()
-        return 'fail'
+        pytest.fail()
 
     f = lyr.GetNextFeature()
     if f['parent_layer'] != 'main_elt' or \
@@ -2968,7 +2954,7 @@ def test_ogr_gmlas_internal_xlink_href():
        f['child_layer'] != 'second_elt' or \
        f['child_pkid'] != 'id':
         f.DumpReadable()
-        return 'fail'
+        pytest.fail()
 
     f = lyr.GetNextFeature()
     if f['parent_layer'] != 'main_elt' or \
@@ -2977,7 +2963,7 @@ def test_ogr_gmlas_internal_xlink_href():
        f['child_layer'] != 'third_elt' or \
        f['child_pkid'] != 'ogr_pkid':
         f.DumpReadable()
-        return 'fail'
+        pytest.fail()
 
     return 'success'
 
@@ -2988,7 +2974,7 @@ def test_ogr_gmlas_internal_xlink_href():
 def test_ogr_gmlas_cleanup():
 
     if ogr.GetDriverByName('GMLAS') is None:
-        return 'skip'
+        pytest.skip()
 
     files = gdal.ReadDir('/vsimem/')
     if files is not None:
diff --git a/autotest/ogr/ogr_gpkg.py b/autotest/ogr/ogr_gpkg.py
index ae24e36a856a..ebb7c286b305 100755
--- a/autotest/ogr/ogr_gpkg.py
+++ b/autotest/ogr/ogr_gpkg.py
@@ -33,6 +33,7 @@
 import os
 import struct
 import sys
+import pytest
 
 # Make sure we run from the directory of the script
 if os.path.basename(sys.argv[0]) == os.path.basename(__file__):
@@ -94,7 +95,7 @@ def test_ogr_gpkg_1():
 
     gdaltest.gpkg_dr = ogr.GetDriverByName('GPKG')
     if gdaltest.gpkg_dr is None:
-        return 'skip'
+        pytest.skip()
 
     try:
         os.remove('tmp/gpkg_test.gpkg')
@@ -123,7 +124,7 @@ def test_ogr_gpkg_1():
 def test_ogr_gpkg_2():
 
     if gdaltest.gpkg_dr is None:
-        return 'skip'
+        pytest.skip()
 
     gdaltest.gpkg_ds = gdaltest.gpkg_dr.Open('tmp/gpkg_test.gpkg', update=1)
 
@@ -138,13 +139,13 @@ def test_ogr_gpkg_2():
     f = sql_lyr.GetNextFeature()
     if f['application_id'] != 1196444487:
         f.DumpReadable()
-        return 'fail'
+        pytest.fail()
     gdaltest.gpkg_ds.ReleaseResultSet(sql_lyr)
     sql_lyr = gdaltest.gpkg_ds.ExecuteSQL('PRAGMA user_version')
     f = sql_lyr.GetNextFeature()
     if f['user_version'] != 10200:
         f.DumpReadable()
-        return 'fail'
+        pytest.fail()
     gdaltest.gpkg_ds.ReleaseResultSet(sql_lyr)
 
     return 'success'
@@ -156,7 +157,7 @@ def test_ogr_gpkg_2():
 def test_ogr_gpkg_3():
 
     if gdaltest.gpkg_dr is None or gdaltest.gpkg_ds is None:
-        return 'skip'
+        pytest.skip()
 
     # Test invalid FORMAT
     # gdal.PushErrorHandler('CPLQuietErrorHandler')
@@ -182,7 +183,7 @@ def test_ogr_gpkg_3():
 def test_ogr_gpkg_4():
 
     if gdaltest.gpkg_dr is None or gdaltest.gpkg_ds is None:
-        return 'skip'
+        pytest.skip()
 
     gdaltest.gpkg_ds = None
 
@@ -237,7 +238,7 @@ def test_ogr_gpkg_4():
 def test_ogr_gpkg_5():
 
     if gdaltest.gpkg_dr is None or gdaltest.gpkg_ds is None:
-        return 'skip'
+        pytest.skip()
 
     assert gdaltest.gpkg_ds.GetLayerCount() == 2, 'unexpected number of layers'
 
@@ -264,7 +265,7 @@ def test_ogr_gpkg_5():
 def test_ogr_gpkg_6():
 
     if gdaltest.gpkg_dr is None or gdaltest.gpkg_ds is None:
-        return 'skip'
+        pytest.skip()
 
     srs4326 = osr.SpatialReference()
     srs4326.ImportFromEPSG(4326)
@@ -306,7 +307,7 @@ def test_ogr_gpkg_6():
 def test_ogr_gpkg_7():
 
     if gdaltest.gpkg_dr is None or gdaltest.gpkg_ds is None:
-        return 'skip'
+        pytest.skip()
 
     lyr = gdaltest.gpkg_ds.GetLayerByName('field_test_layer')
     geom = ogr.CreateGeometryFromWkt('POINT(10 10)')
@@ -389,7 +390,7 @@ def test_ogr_gpkg_8():
     # gdaltest.gpkg_ds = gdaltest.gpkg_dr.CreateDataSource( 'tmp/gpkg_test.gpkg' )
 
     if gdaltest.gpkg_dr is None or gdaltest.gpkg_ds is None:
-        return 'skip'
+        pytest.skip()
 
     srs = osr.SpatialReference()
     # Test a non-default SRS
@@ -455,7 +456,7 @@ def test_ogr_gpkg_8():
        feat.GetField(6) != 1 or feat.GetField(7) != -32768 or feat.GetField(8) != 1.23 or \
        feat.GetField(9) != 1000000000000:
         feat.DumpReadable()
-        return 'fail'
+        pytest.fail()
 
     lyr = gdaltest.gpkg_ds.CreateLayer('tbl_polygon', geom_type=ogr.wkbPolygon, srs=srs)
     assert lyr is not None
@@ -506,7 +507,7 @@ def test_ogr_gpkg_8():
 def test_ogr_gpkg_9():
 
     if gdaltest.gpkg_dr is None or gdaltest.gpkg_ds is None:
-        return 'skip'
+        pytest.skip()
 
     lyr = gdaltest.gpkg_ds.GetLayerByName('tbl_linestring')
     extent = lyr.GetExtent()
@@ -524,7 +525,7 @@ def test_ogr_gpkg_9():
 def test_ogr_gpkg_11():
 
     if gdaltest.gpkg_dr is None:
-        return 'skip'
+        pytest.skip()
 
     gdaltest.gpkg_ds = None
     gdaltest.gpkg_ds = ogr.Open('tmp/gpkg_test.gpkg', update=1)
@@ -548,7 +549,7 @@ def test_ogr_gpkg_11():
 def test_ogr_gpkg_12():
 
     if gdaltest.gpkg_dr is None:
-        return 'skip'
+        pytest.skip()
 
     sql_lyr = gdaltest.gpkg_ds.ExecuteSQL('SELECT * FROM tbl_linestring_renamed')
     assert sql_lyr.GetFIDColumn() == 'fid'
@@ -625,7 +626,7 @@ def test_ogr_gpkg_12():
 def test_ogr_gpkg_13():
 
     if gdaltest.gpkg_dr is None:
-        return 'skip'
+        pytest.skip()
 
     lyr = gdaltest.gpkg_ds.CreateLayer('non_spatial', geom_type=ogr.wkbNone, options=['ASPATIAL_VARIANT=OGR_ASPATIAL'])
     feat = ogr.Feature(lyr.GetLayerDefn())
@@ -640,11 +641,11 @@ def test_ogr_gpkg_13():
     feat = lyr.GetNextFeature()
     if not feat.IsFieldNull('fld_integer'):
         feat.DumpReadable()
-        return 'fail'
+        pytest.fail()
     feat = lyr.GetNextFeature()
     if feat.GetField('fld_integer') != 1:
         feat.DumpReadable()
-        return 'fail'
+        pytest.fail()
 
     # Test second aspatial layer
     lyr = gdaltest.gpkg_ds.CreateLayer('non_spatial2', geom_type=ogr.wkbNone, options=['ASPATIAL_VARIANT=OGR_ASPATIAL'])
@@ -660,7 +661,7 @@ def test_ogr_gpkg_13():
     feat = lyr.GetNextFeature()
     if feat.GetField('fld_integer') != 1:
         feat.DumpReadable()
-        return 'fail'
+        pytest.fail()
 
     sql_lyr = gdaltest.gpkg_ds.ExecuteSQL("SELECT * FROM gpkg_extensions WHERE table_name IS NULL AND extension_name = 'gdal_aspatial'")
     assert sql_lyr.GetFeatureCount() == 1
@@ -675,7 +676,7 @@ def test_ogr_gpkg_13():
 def test_ogr_gpkg_14():
 
     if gdaltest.gpkg_dr is None:
-        return 'skip'
+        pytest.skip()
 
     sr = osr.SpatialReference()
     sr.ImportFromEPSG(32631)
@@ -705,11 +706,11 @@ def test_ogr_gpkg_14():
     f = lyr.GetFeature(5)
     if f.GetGeometryRef() is not None:
         f.DumpReadable()
-        return 'fail'
+        pytest.fail()
     f = lyr.GetFeature(6)
     if f.GetGeometryRef().ExportToWkt() != 'POINT EMPTY':
         f.DumpReadable()
-        return 'fail'
+        pytest.fail()
     f = None
 
     sql_lyr = gdaltest.gpkg_ds.ExecuteSQL('SELECT * FROM "point_no_spi-but-with-dashes"')
@@ -761,7 +762,7 @@ def test_ogr_gpkg_14():
 def test_ogr_gpkg_15():
 
     if gdaltest.gpkg_dr is None:
-        return 'skip'
+        pytest.skip()
 
     sql_lyr = gdaltest.gpkg_ds.ExecuteSQL(
         'SELECT ST_IsEmpty(geom), ST_SRID(geom), ST_GeometryType(geom), ' +
@@ -772,7 +773,7 @@ def test_ogr_gpkg_15():
        feat.GetField(3) != 1000 or feat.GetField(4) != 30000000 or \
        feat.GetField(5) != 1000 or feat.GetField(6) != 30000000:
         feat.DumpReadable()
-        return 'fail'
+        pytest.fail()
     gdaltest.gpkg_ds.ReleaseResultSet(sql_lyr)
 
     sql_lyr = gdaltest.gpkg_ds.ExecuteSQL(
@@ -782,7 +783,7 @@ def test_ogr_gpkg_15():
     if not feat.IsFieldNull(0) or not feat.IsFieldNull(1) or not feat.IsFieldNull(2) or \
        not feat.IsFieldNull(3) or not feat.IsFieldNull(4) or not feat.IsFieldNull(5) or not feat.IsFieldNull(6):
         feat.DumpReadable()
-        return 'fail'
+        pytest.fail()
     gdaltest.gpkg_ds.ReleaseResultSet(sql_lyr)
 
     for (expected_type, actual_type, expected_result) in [
@@ -839,7 +840,7 @@ def test_ogr_gpkg_15():
     feat = sql_lyr.GetNextFeature()
     if feat.GetField(0) != -1:
         feat.DumpReadable()
-        return 'fail'
+        pytest.fail()
     gdaltest.gpkg_ds.ReleaseResultSet(sql_lyr)
 
     # NULL argument
@@ -847,7 +848,7 @@ def test_ogr_gpkg_15():
     feat = sql_lyr.GetNextFeature()
     if feat.GetField(0) != -1:
         feat.DumpReadable()
-        return 'fail'
+        pytest.fail()
     gdaltest.gpkg_ds.ReleaseResultSet(sql_lyr)
 
     # Existing entry
@@ -855,7 +856,7 @@ def test_ogr_gpkg_15():
     feat = sql_lyr.GetNextFeature()
     if feat.GetField(0) != 4326:
         feat.DumpReadable()
-        return 'fail'
+        pytest.fail()
     gdaltest.gpkg_ds.ReleaseResultSet(sql_lyr)
 
     # Non existing entry
@@ -863,7 +864,7 @@ def test_ogr_gpkg_15():
     feat = sql_lyr.GetNextFeature()
     if feat.GetField(0) != -1:
         feat.DumpReadable()
-        return 'fail'
+        pytest.fail()
     gdaltest.gpkg_ds.ReleaseResultSet(sql_lyr)
 
     # NULL argument
@@ -871,7 +872,7 @@ def test_ogr_gpkg_15():
     feat = sql_lyr.GetNextFeature()
     if feat.GetField(0) != -1:
         feat.DumpReadable()
-        return 'fail'
+        pytest.fail()
     gdaltest.gpkg_ds.ReleaseResultSet(sql_lyr)
 
     # Existing entry in gpkg_spatial_ref_sys
@@ -879,7 +880,7 @@ def test_ogr_gpkg_15():
     feat = sql_lyr.GetNextFeature()
     if feat.GetField(0) != 4326:
         feat.DumpReadable()
-        return 'fail'
+        pytest.fail()
     gdaltest.gpkg_ds.ReleaseResultSet(sql_lyr)
 
     # New entry in gpkg_spatial_ref_sys
@@ -887,7 +888,7 @@ def test_ogr_gpkg_15():
     feat = sql_lyr.GetNextFeature()
     if feat.GetField(0) != 32633:
         feat.DumpReadable()
-        return 'fail'
+        pytest.fail()
     gdaltest.gpkg_ds.ReleaseResultSet(sql_lyr)
 
     # Invalid code
@@ -896,7 +897,7 @@ def test_ogr_gpkg_15():
     feat = sql_lyr.GetNextFeature()
     if feat.GetField(0) != -1:
         feat.DumpReadable()
-        return 'fail'
+        pytest.fail()
     gdaltest.gpkg_ds.ReleaseResultSet(sql_lyr)
 
     # NULL argument
@@ -904,7 +905,7 @@ def test_ogr_gpkg_15():
     feat = sql_lyr.GetNextFeature()
     if feat.GetGeometryRef() is not None:
         feat.DumpReadable()
-        return 'fail'
+        pytest.fail()
     gdaltest.gpkg_ds.ReleaseResultSet(sql_lyr)
 
     # Invalid geometry
@@ -913,7 +914,7 @@ def test_ogr_gpkg_15():
     feat = sql_lyr.GetNextFeature()
     if feat.GetGeometryRef() is not None:
         feat.DumpReadable()
-        return 'fail'
+        pytest.fail()
     gdaltest.gpkg_ds.ReleaseResultSet(sql_lyr)
 
     # NULL argument
@@ -921,7 +922,7 @@ def test_ogr_gpkg_15():
     feat = sql_lyr.GetNextFeature()
     if feat.GetGeometryRef() is not None:
         feat.DumpReadable()
-        return 'fail'
+        pytest.fail()
     gdaltest.gpkg_ds.ReleaseResultSet(sql_lyr)
 
     # Invalid target SRID
@@ -930,7 +931,7 @@ def test_ogr_gpkg_15():
     feat = sql_lyr.GetNextFeature()
     if feat.GetGeometryRef() is not None:
         feat.DumpReadable()
-        return 'fail'
+        pytest.fail()
     gdaltest.gpkg_ds.ReleaseResultSet(sql_lyr)
 
     # Invalid source SRID
@@ -939,7 +940,7 @@ def test_ogr_gpkg_15():
     feat = sql_lyr.GetNextFeature()
     if feat.GetGeometryRef() is not None:
         feat.DumpReadable()
-        return 'fail'
+        pytest.fail()
     gdaltest.gpkg_ds.ReleaseResultSet(sql_lyr)
 
     # Invalid spatialite geometry: SRID=4326,MULTIPOINT EMPTY truncated
@@ -948,7 +949,7 @@ def test_ogr_gpkg_15():
     feat = sql_lyr.GetNextFeature()
     if feat.GetGeometryRef() is not None:
         feat.DumpReadable()
-        return 'fail'
+        pytest.fail()
     gdaltest.gpkg_ds.ReleaseResultSet(sql_lyr)
 
     if osr_proj4.have_proj480():
@@ -956,14 +957,14 @@ def test_ogr_gpkg_15():
         feat = sql_lyr.GetNextFeature()
         if feat.GetGeometryRef().ExportToWkt() != 'LINESTRING (5 5,10 5,10 10,5 10)':
             feat.DumpReadable()
-            return 'fail'
+            pytest.fail()
         gdaltest.gpkg_ds.ReleaseResultSet(sql_lyr)
 
         sql_lyr = gdaltest.gpkg_ds.ExecuteSQL("SELECT ST_SRID(ST_Transform(geom, 4326)) FROM tbl_linestring_renamed")
         feat = sql_lyr.GetNextFeature()
         if feat.GetField(0) != 4326:
             feat.DumpReadable()
-            return 'fail'
+            pytest.fail()
         gdaltest.gpkg_ds.ReleaseResultSet(sql_lyr)
 
         # Spatialite geometry: SRID=4326,MULTIPOINT EMPTY
@@ -971,7 +972,7 @@ def test_ogr_gpkg_15():
         feat = sql_lyr.GetNextFeature()
         if feat.GetField(0) != 4326:
             feat.DumpReadable()
-            return 'fail'
+            pytest.fail()
         gdaltest.gpkg_ds.ReleaseResultSet(sql_lyr)
 
     # Error case: less than 8 bytes
@@ -979,7 +980,7 @@ def test_ogr_gpkg_15():
     feat = sql_lyr.GetNextFeature()
     if feat.IsFieldSetAndNotNull(0):
         feat.DumpReadable()
-        return 'fail'
+        pytest.fail()
     feat = None
     gdaltest.gpkg_ds.ReleaseResultSet(sql_lyr)
 
@@ -988,7 +989,7 @@ def test_ogr_gpkg_15():
     feat = sql_lyr.GetNextFeature()
     if feat.IsFieldSetAndNotNull(0):
         feat.DumpReadable()
-        return 'fail'
+        pytest.fail()
     feat = None
     gdaltest.gpkg_ds.ReleaseResultSet(sql_lyr)
 
@@ -997,7 +998,7 @@ def test_ogr_gpkg_15():
     feat = sql_lyr.GetNextFeature()
     if feat.IsFieldSetAndNotNull(0):
         feat.DumpReadable()
-        return 'fail'
+        pytest.fail()
     feat = None
     gdaltest.gpkg_ds.ReleaseResultSet(sql_lyr)
 
@@ -1006,7 +1007,7 @@ def test_ogr_gpkg_15():
     feat = sql_lyr.GetNextFeature()
     if feat.IsFieldSetAndNotNull(0):
         feat.DumpReadable()
-        return 'fail'
+        pytest.fail()
     feat = None
     gdaltest.gpkg_ds.ReleaseResultSet(sql_lyr)
 
@@ -1015,7 +1016,7 @@ def test_ogr_gpkg_15():
     feat = sql_lyr.GetNextFeature()
     if feat.GetField(0) != 'MULTIPOINT':
         feat.DumpReadable()
-        return 'fail'
+        pytest.fail()
     feat = None
     gdaltest.gpkg_ds.ReleaseResultSet(sql_lyr)
 
@@ -1024,7 +1025,7 @@ def test_ogr_gpkg_15():
     feat = sql_lyr.GetNextFeature()
     if feat.GetField(0) != 'MULTIPOINT':
         feat.DumpReadable()
-        return 'fail'
+        pytest.fail()
     feat = None
     gdaltest.gpkg_ds.ReleaseResultSet(sql_lyr)
 
@@ -1033,7 +1034,7 @@ def test_ogr_gpkg_15():
     feat = sql_lyr.GetNextFeature()
     if feat.GetField(0) != 1:
         feat.DumpReadable()
-        return 'fail'
+        pytest.fail()
     feat = None
     gdaltest.gpkg_ds.ReleaseResultSet(sql_lyr)
 
@@ -1043,7 +1044,7 @@ def test_ogr_gpkg_15():
     feat = sql_lyr.GetNextFeature()
     if feat.IsFieldSetAndNotNull(0):
         feat.DumpReadable()
-        return 'fail'
+        pytest.fail()
     feat = None
     gdaltest.gpkg_ds.ReleaseResultSet(sql_lyr)
 
@@ -1064,7 +1065,7 @@ def test_ogr_gpkg_15():
     feat = sql_lyr.GetNextFeature()
     if feat.GetField(0) != 'b':
         feat.DumpReadable()
-        return 'fail'
+        pytest.fail()
     feat = None
     gdaltest.gpkg_ds.ReleaseResultSet(sql_lyr)
 
@@ -1073,7 +1074,7 @@ def test_ogr_gpkg_15():
     feat = sql_lyr.GetNextFeature()
     if feat.GetField(0) is not None:
         feat.DumpReadable()
-        return 'fail'
+        pytest.fail()
     feat = None
     gdaltest.gpkg_ds.ReleaseResultSet(sql_lyr)
 
@@ -1082,7 +1083,7 @@ def test_ogr_gpkg_15():
     feat = sql_lyr.GetNextFeature()
     if feat.GetField(0) is not None:
         feat.DumpReadable()
-        return 'fail'
+        pytest.fail()
     feat = None
     gdaltest.gpkg_ds.ReleaseResultSet(sql_lyr)
 
@@ -1091,7 +1092,7 @@ def test_ogr_gpkg_15():
     feat = sql_lyr.GetNextFeature()
     if feat.GetField(0) is not None:
         feat.DumpReadable()
-        return 'fail'
+        pytest.fail()
     feat = None
     gdaltest.gpkg_ds.ReleaseResultSet(sql_lyr)
 
@@ -1126,7 +1127,7 @@ def test_ogr_gpkg_15():
 def test_ogr_gpkg_16():
 
     if gdaltest.gpkg_dr is None:
-        return 'skip'
+        pytest.skip()
 
     ds = gdaltest.gpkg_dr.CreateDataSource('/vsimem/ogr_gpk_16.gpkg')
     ds.CreateLayer('foo')
@@ -1233,7 +1234,7 @@ def test_ogr_gpkg_16():
 def test_ogr_gpkg_17():
 
     if gdaltest.gpkg_dr is None:
-        return 'skip'
+        pytest.skip()
 
     ds = gdaltest.gpkg_dr.CreateDataSource('/vsimem/ogr_gpkg_17.gpkg')
     sql_lyr = ds.ExecuteSQL("SELECT ogr_version()", dialect='INDIRECT_SQLITE')
@@ -1252,7 +1253,7 @@ def test_ogr_gpkg_17():
 def test_ogr_gpkg_18():
 
     if gdaltest.gpkg_dr is None:
-        return 'skip'
+        pytest.skip()
 
     ds = gdaltest.gpkg_dr.CreateDataSource('/vsimem/ogr_gpkg_18.gpkg')
     lyr = ds.CreateLayer('wkbCircularString', geom_type=ogr.wkbCircularString)
@@ -1349,7 +1350,7 @@ def test_ogr_gpkg_18():
 def test_ogr_gpkg_19():
 
     if gdaltest.gpkg_dr is None:
-        return 'skip'
+        pytest.skip()
 
     ds = gdaltest.gpkg_dr.CreateDataSource('/vsimem/ogr_gpkg_19.gpkg')
     assert not ds.GetMetadata()
@@ -1438,7 +1439,7 @@ def test_ogr_gpkg_19():
 def test_ogr_gpkg_20():
 
     if gdaltest.gpkg_dr is None:
-        return 'skip'
+        pytest.skip()
 
     ds = gdaltest.gpkg_dr.CreateDataSource('/vsimem/ogr_gpkg_20.gpkg')
 
@@ -1536,7 +1537,7 @@ def test_ogr_gpkg_20():
 def test_ogr_gpkg_21():
 
     if gdaltest.gpkg_dr is None:
-        return 'skip'
+        pytest.skip()
 
     ds = gdaltest.gpkg_dr.CreateDataSource('/vsimem/ogr_gpkg_21.gpkg')
     lyr = ds.CreateLayer('test')
@@ -1613,7 +1614,7 @@ def test_ogr_gpkg_21():
 def test_ogr_gpkg_22():
 
     if gdaltest.gpkg_dr is None:
-        return 'skip'
+        pytest.skip()
 
     ds = gdaltest.gpkg_dr.CreateDataSource('/vsimem/ogr_gpkg_22.gpkg')
     lyr = ds.CreateLayer('test')
@@ -1645,7 +1646,7 @@ def test_ogr_gpkg_22():
 def test_ogr_gpkg_23():
 
     if gdaltest.gpkg_dr is None:
-        return 'skip'
+        pytest.skip()
 
     ds = gdaltest.gpkg_dr.CreateDataSource('/vsimem/ogr_gpkg_23.gpkg')
     lyr = ds.CreateLayer('test', geom_type=ogr.wkbNone)
@@ -1799,7 +1800,7 @@ def test_ogr_gpkg_23():
 def test_ogr_gpkg_24():
 
     if gdaltest.gpkg_dr is None:
-        return 'skip'
+        pytest.skip()
 
     ds = gdaltest.gpkg_dr.CreateDataSource('/vsimem/ogr_gpkg_24.gpkg')
     lyr = ds.CreateLayer('test', geom_type=ogr.wkbNone)
@@ -1895,7 +1896,7 @@ def test_ogr_gpkg_24():
        f.GetField('field_datetime6') != '2016/06/30 12:34:56+00' or \
        f.GetField('field_string2') != 'X':
         f.DumpReadable()
-        return 'fail'
+        pytest.fail()
 
     ds = None
 
@@ -1910,7 +1911,7 @@ def test_ogr_gpkg_24():
 def test_ogr_gpkg_25():
 
     if gdaltest.gpkg_dr is None:
-        return 'skip'
+        pytest.skip()
 
     ds = gdaltest.gpkg_dr.CreateDataSource('/vsimem/ogr_gpkg_25.gpkg')
     lyr = ds.CreateLayer('test', geom_type=ogr.wkbNone, options=['FID=myfid'])
@@ -1939,10 +1940,10 @@ def test_ogr_gpkg_25():
     assert ret == 0
     if feat.GetFID() < 0:
         feat.DumpReadable()
-        return 'fail'
+        pytest.fail()
     if feat.GetField('myfid') != feat.GetFID():
         feat.DumpReadable()
-        return 'fail'
+        pytest.fail()
 
     feat.SetField('str', 'foo')
     ret = lyr.SetFeature(feat)
@@ -1971,11 +1972,11 @@ def test_ogr_gpkg_25():
     f = lyr.GetNextFeature()
     if f.GetFID() != 10 or f.GetField('str') != 'first string' or f.GetField('str2') != 'second string' or f.GetField('myfid') != 10:
         f.DumpReadable()
-        return 'fail'
+        pytest.fail()
     f = lyr.GetFeature(f.GetFID())
     if f.GetFID() != 10 or f.GetField('str') != 'first string' or f.GetField('str2') != 'second string' or f.GetField('myfid') != 10:
         f.DumpReadable()
-        return 'fail'
+        pytest.fail()
     f = None
 
     ds = None
@@ -1991,7 +1992,7 @@ def test_ogr_gpkg_25():
 def test_ogr_gpkg_26():
 
     if gdaltest.gpkg_dr is None:
-        return 'skip'
+        pytest.skip()
 
     ds = gdaltest.gpkg_dr.CreateDataSource('/vsimem/ogr_gpkg_26.gpkg')
 
@@ -2112,7 +2113,7 @@ def test_ogr_gpkg_26():
 def test_ogr_gpkg_27():
 
     if gdaltest.gpkg_dr is None:
-        return 'skip'
+        pytest.skip()
 
     ds = gdaltest.gpkg_dr.CreateDataSource('/vsimem/ogr_gpkg_27.gpkg')
     gdal.PushErrorHandler()
@@ -2121,7 +2122,7 @@ def test_ogr_gpkg_27():
     if sql_lyr is None:
         ds = None
         gdaltest.gpkg_dr.DeleteDataSource('/vsimem/ogr_gpkg_27.gpkg')
-        return 'skip'
+        pytest.skip()
     ds.ReleaseResultSet(sql_lyr)
 
     lyr = ds.CreateLayer('test')
@@ -2132,7 +2133,7 @@ def test_ogr_gpkg_27():
     f = sql_lyr.GetNextFeature()
     if f.GetGeometryRef().ExportToWkt() != 'POINT (2 49)':
         f.DumpReadable()
-        return 'fail'
+        pytest.fail()
     ds.ReleaseResultSet(sql_lyr)
 
     ds = None
@@ -2148,7 +2149,7 @@ def test_ogr_gpkg_27():
 def test_ogr_gpkg_28():
 
     if gdaltest.gpkg_dr is None:
-        return 'skip'
+        pytest.skip()
 
     srcDS = gdal.OpenEx('../ogr/data/poly.shp')
     ds = gdal.VectorTranslate('/vsimem/ogr_gpkg_28.gpkg', srcDS, format='GPKG', dstSRS='EPSG:4326')
@@ -2166,7 +2167,7 @@ def test_ogr_gpkg_28():
 def test_ogr_gpkg_29():
 
     if gdaltest.gpkg_dr is None:
-        return 'skip'
+        pytest.skip()
 
     ds = gdaltest.gpkg_dr.CreateDataSource('/vsimem/ogr_gpkg_29.gpkg')
     assert ds.TestCapability(ogr.ODsCMeasuredGeometries) == 1
@@ -2190,7 +2191,7 @@ def test_ogr_gpkg_29():
     f = lyr.GetNextFeature()
     if f.GetGeometryRef().ExportToIsoWkt() != 'POINT M (1 2 3)':
         f.DumpReadable()
-        return 'fail'
+        pytest.fail()
 
     # Generate a XYM envelope
     ds.ExecuteSQL("UPDATE pointm SET geom = x'4750000700000000000000000000F03F000000000000F03F000000000000004000000000000000400000000000000840000000000000084001D1070000000000000000F03F00000000000000400000000000000840'")
@@ -2200,7 +2201,7 @@ def test_ogr_gpkg_29():
     f = lyr.GetNextFeature()
     if f.GetGeometryRef().ExportToIsoWkt() != 'POINT ZM (1 2 3 4)':
         f.DumpReadable()
-        return 'fail'
+        pytest.fail()
 
     # Generate a XYZM envelope
     ds.ExecuteSQL("UPDATE pointzm SET geom = x'4750000900000000000000000000F03F000000000000F03F00000000000000400000000000000040000000000000084000000000000008400000000000001040000000000000104001B90B0000000000000000F03F000000000000004000000000000008400000000000001040'")
@@ -2214,13 +2215,13 @@ def test_ogr_gpkg_29():
     f = lyr.GetNextFeature()
     if f.GetGeometryRef().ExportToIsoWkt() != 'POINT M (1 2 3)':
         f.DumpReadable()
-        return 'fail'
+        pytest.fail()
     lyr = ds.GetLayerByName('pointzm')
     assert lyr.GetGeomType() == ogr.wkbPointZM
     f = lyr.GetNextFeature()
     if f.GetGeometryRef().ExportToIsoWkt() != 'POINT ZM (1 2 3 4)':
         f.DumpReadable()
-        return 'fail'
+        pytest.fail()
     ds = None
 
     gdaltest.gpkg_dr.DeleteDataSource('/vsimem/ogr_gpkg_29.gpkg')
@@ -2234,7 +2235,7 @@ def test_ogr_gpkg_29():
 def test_ogr_gpkg_30():
 
     if gdaltest.gpkg_dr is None:
-        return 'skip'
+        pytest.skip()
 
     with gdaltest.error_handler():
         ds = gdaltest.gpkg_dr.CreateDataSource('/vsimem/ogr_gpkg_30.geopkg')
@@ -2260,7 +2261,7 @@ def test_ogr_gpkg_30():
 def test_ogr_gpkg_31():
 
     if gdaltest.gpkg_dr is None:
-        return 'skip'
+        pytest.skip()
 
     ds = gdaltest.gpkg_dr.CreateDataSource('/vsimem/ogr_gpkg_31.gpkg')
     lyr = ds.CreateLayer('curve', geom_type=ogr.wkbCurve)
@@ -2300,7 +2301,7 @@ def test_ogr_gpkg_31():
 def test_ogr_gpkg_32():
 
     if gdaltest.gpkg_dr is None:
-        return 'skip'
+        pytest.skip()
 
     ds = gdaltest.gpkg_dr.CreateDataSource('/vsimem/ogr_gpkg_32.gpkg')
     ds.CreateLayer('aspatial', geom_type=ogr.wkbNone, options=['ASPATIAL_VARIANT=NOT_REGISTERED'])
@@ -2332,7 +2333,7 @@ def test_ogr_gpkg_32():
 def test_ogr_gpkg_33():
 
     if gdaltest.gpkg_dr is None:
-        return 'skip'
+        pytest.skip()
 
     gdal.SetConfigOption('OGR_CURRENT_DATE', '2000-01-01T:00:00:00.000Z')
     ds = gdaltest.gpkg_dr.CreateDataSource('/vsimem/ogr_gpkg_33.gpkg')
@@ -2357,7 +2358,7 @@ def test_ogr_gpkg_33():
 def test_ogr_gpkg_test_ogrsf():
 
     if gdaltest.gpkg_dr is None:
-        return 'skip'
+        pytest.skip()
 
     # Do integrity check first
     sql_lyr = gdaltest.gpkg_ds.ExecuteSQL("PRAGMA integrity_check")
@@ -2367,7 +2368,7 @@ def test_ogr_gpkg_test_ogrsf():
 
     import test_cli_utilities
     if test_cli_utilities.get_test_ogrsf_path() is None:
-        return 'skip'
+        pytest.skip()
 
     gdaltest.gpkg_ds = None
     # sys.exit(0)
@@ -2388,7 +2389,7 @@ def test_ogr_gpkg_test_ogrsf():
 def test_ogr_gpkg_34():
 
     if gdaltest.gpkg_dr is None:
-        return 'skip'
+        pytest.skip()
 
     layer_name = """weird'layer"name"""
 
@@ -2500,7 +2501,7 @@ def test_ogr_gpkg_34():
 def test_ogr_gpkg_35():
 
     if gdaltest.gpkg_dr is None:
-        return 'skip'
+        pytest.skip()
 
     dbname = '/vsimem/ogr_gpkg_35.gpkg'
     ds = gdaltest.gpkg_dr.CreateDataSource(dbname)
@@ -2559,7 +2560,7 @@ def test_ogr_gpkg_35():
     if f.GetFID() != 10 or f['foo'] != 'fooval' or f['baz'] != 'bazval' or \
        f.GetGeometryRef().ExportToWkt() != 'POLYGON ((0 0,0 1,1 1,0 0))':
         f.DumpReadable()
-        return 'fail'
+        pytest.fail()
 
     lyr.StartTransaction()
     ret = lyr_nonspatial.DeleteField(1)
@@ -2569,7 +2570,7 @@ def test_ogr_gpkg_35():
     f = lyr_nonspatial.GetNextFeature()
     if f.GetFID() != 10 or f['foo'] != 'fooval' or f['baz'] != 'bazval':
         f.DumpReadable()
-        return 'fail'
+        pytest.fail()
 
     ds.ExecuteSQL('VACUUM')
 
@@ -2601,7 +2602,7 @@ def test_ogr_gpkg_35():
 def test_ogr_gpkg_36():
 
     if gdaltest.gpkg_dr is None:
-        return 'skip'
+        pytest.skip()
 
     dbname = '/vsimem/ogr_gpkg_36.gpkg'
     ds = gdaltest.gpkg_dr.CreateDataSource(dbname)
@@ -2661,7 +2662,7 @@ def test_ogr_gpkg_36():
     if f.GetFID() != 10 or f['bar'] != 10.5 or \
             f.GetGeometryRef().ExportToWkt() != 'POLYGON ((0 0,0 1,1 1,0 0))':
         f.DumpReadable()
-        return 'fail'
+        pytest.fail()
     f = None
 
     lyr.StartTransaction()
@@ -2674,7 +2675,7 @@ def test_ogr_gpkg_36():
     if f.GetFID() != 10 or f['baw'] != '10.5' or \
        f.GetGeometryRef().ExportToWkt() != 'POLYGON ((0 0,0 1,1 1,0 0))':
         f.DumpReadable()
-        return 'fail'
+        pytest.fail()
     f = None
 
     # Check that index has been recreated
@@ -2729,7 +2730,7 @@ def test_ogr_gpkg_36():
 def test_ogr_gpkg_37():
 
     if gdaltest.gpkg_dr is None:
-        return 'skip'
+        pytest.skip()
 
     dbname = '/vsimem/ogr_gpkg_37.gpkg'
     ds = gdaltest.gpkg_dr.CreateDataSource(dbname)
@@ -2773,7 +2774,7 @@ def test_ogr_gpkg_37():
     if f.GetFID() != 10 or f['foo'] != 'fooval' or f['bar'] != 'barval' or \
             f.GetGeometryRef().ExportToWkt() != 'POLYGON ((0 0,0 1,1 1,0 0))':
         f.DumpReadable()
-        return 'fail'
+        pytest.fail()
 
     # Check that index has been recreated
     sql_lyr = ds.ExecuteSQL("SELECT * FROM sqlite_master WHERE name = 'my_idx_foo' OR name = 'my_idx_bar'")
@@ -2801,7 +2802,7 @@ def test_ogr_gpkg_37():
 def test_ogr_gpkg_38(options=['SPATIAL_INDEX=YES']):
 
     if gdaltest.gpkg_dr is None:
-        return 'skip'
+        pytest.skip()
 
     dbname = '/vsimem/ogr_gpkg_38.gpkg'
     ds = gdaltest.gpkg_dr.CreateDataSource(dbname)
@@ -2827,7 +2828,7 @@ def test_ogr_gpkg_38(options=['SPATIAL_INDEX=YES']):
     f = sql_lyr.GetNextFeature()
     if f['min_x'] != 1 or f['min_y'] != 2 or f['max_x'] != 3 or f['max_y'] != 4:
         f.DumpReadable()
-        return 'fail'
+        pytest.fail()
     ds.ReleaseResultSet(sql_lyr)
     extent = lyr.GetExtent(force=0)
     assert extent == (1, 3, 2, 4)
@@ -2885,7 +2886,7 @@ def test_ogr_gpkg_38_nospi():
 def test_ogr_gpkg_39():
 
     if gdaltest.gpkg_dr is None:
-        return 'skip'
+        pytest.skip()
 
     dbname = '/vsimem/ogr_gpkg_39.gpkg'
     ds = gdaltest.gpkg_dr.CreateDataSource(dbname)
@@ -2925,7 +2926,7 @@ def test_ogr_gpkg_39():
 def test_ogr_gpkg_40():
 
     if gdaltest.gpkg_dr is None:
-        return 'skip'
+        pytest.skip()
 
     ds = gdaltest.gpkg_dr.CreateDataSource('/vsimem/ogr_gpkg_40.gpkg')
     ds.CreateLayer('aspatial', geom_type=ogr.wkbNone, options=['ASPATIAL_VARIANT=GPKG_ATTRIBUTES'])
@@ -2957,7 +2958,7 @@ def test_ogr_gpkg_40():
 def test_ogr_gpkg_41():
 
     if gdaltest.gpkg_dr is None:
-        return 'skip'
+        pytest.skip()
 
     ds = gdaltest.gpkg_dr.CreateDataSource('/vsimem/ogr_gpkg_41.gpkg')
     ds.ExecuteSQL('CREATE TABLE foo (mycol VARCHAR_ILLEGAL)')
@@ -2971,7 +2972,7 @@ def test_ogr_gpkg_41():
         f = lyr.GetNextFeature()
     if f['mycol'] != 'myval' or f.GetFID() != 1:
         f.DumpReadable()
-        return 'fail'
+        pytest.fail()
     ds = None
 
     ds = ogr.Open('/vsimem/ogr_gpkg_41.gpkg')
@@ -2980,7 +2981,7 @@ def test_ogr_gpkg_41():
         f = lyr.GetFeature(1)
     if f['mycol'] != 'myval' or f.GetFID() != 1:
         f.DumpReadable()
-        return 'fail'
+        pytest.fail()
     ds = None
 
     gdaltest.gpkg_dr.DeleteDataSource('/vsimem/ogr_gpkg_41.gpkg')
@@ -3013,7 +3014,7 @@ def get_feature_count_from_gpkg_contents(ds):
 def test_ogr_gpkg_42():
 
     if gdaltest.gpkg_dr is None:
-        return 'skip'
+        pytest.skip()
 
     ds = gdaltest.gpkg_dr.CreateDataSource('/vsimem/ogr_gpkg_42.gpkg')
     lyr = ds.CreateLayer('foo', geom_type=ogr.wkbNone)
@@ -3149,7 +3150,7 @@ def test_ogr_gpkg_42():
 def test_ogr_gpkg_43():
 
     if gdaltest.gpkg_dr is None:
-        return 'skip'
+        pytest.skip()
 
     ds = gdaltest.gpkg_dr.CreateDataSource('/vsimem/ogr_gpkg_43.gpkg')
     ds.StartTransaction()
@@ -3187,7 +3188,7 @@ def test_ogr_gpkg_43():
 def test_ogr_gpkg_44():
 
     if gdaltest.gpkg_dr is None:
-        return 'skip'
+        pytest.skip()
 
     gdal.SetConfigOption('CREATE_METADATA_TABLES', 'NO')
     ds = gdaltest.gpkg_dr.CreateDataSource('/vsimem/ogr_gpkg_44.gpkg')
@@ -3228,7 +3229,7 @@ def test_ogr_gpkg_44():
 def test_ogr_gpkg_45():
 
     if gdaltest.gpkg_dr is None:
-        return 'skip'
+        pytest.skip()
 
     ds = gdaltest.gpkg_dr.CreateDataSource('/vsimem/ogr_gpkg_45.gpkg')
     ds.ExecuteSQL('CREATE TABLE test (a INTEGER, b INTEGER, CONSTRAINT pkid_constraint PRIMARY KEY (a, b))')
@@ -3251,7 +3252,7 @@ def test_ogr_gpkg_45():
 def test_ogr_gpkg_46():
 
     if gdaltest.gpkg_dr is None:
-        return 'skip'
+        pytest.skip()
 
     ds = gdaltest.gpkg_dr.CreateDataSource('/vsimem/ogr_gpkg_46.gpkg')
     lyr = ds.CreateLayer('foo')
@@ -3297,8 +3298,7 @@ def test_ogr_gpkg_46():
     if not has_spatial_index:
         ds = None
         gdaltest.gpkg_dr.DeleteDataSource('/vsimem/ogr_gpkg_46.gpkg')
-        print('SQLite likely built without SQLITE_HAS_COLUMN_METADATA')
-        return 'skip'
+        pytest.skip('SQLite likely built without SQLITE_HAS_COLUMN_METADATA')
 
     # Effectively test spatial index
     lyr.SetSpatialFilterRect(-0.5, -0.5, 0.5, 0.5)
@@ -3315,7 +3315,7 @@ def test_ogr_gpkg_46():
     f = lyr.GetNextFeature()
     if f.GetFID() != 1 or f.GetField(0) != 'bla':
         f.DumpReadable()
-        return 'fail'
+        pytest.fail()
 
     # View without valid rowid
     lyr = ds.GetLayerByName('my_view3')
@@ -3323,16 +3323,16 @@ def test_ogr_gpkg_46():
     f = lyr.GetNextFeature()
     if f.GetFID() != 0:
         f.DumpReadable()
-        return 'fail'
+        pytest.fail()
     f = lyr.GetNextFeature()
     if f.GetFID() != 1:
         f.DumpReadable()
-        return 'fail'
+        pytest.fail()
     f2 = lyr.GetFeature(1)
     if not f.Equal(f2):
         f.DumpReadable()
         f2.DumpReadable()
-        return 'fail'
+        pytest.fail()
 
     ds = None
 
@@ -3347,7 +3347,7 @@ def test_ogr_gpkg_46():
 def test_ogr_gpkg_47():
 
     if gdaltest.gpkg_dr is None:
-        return 'skip'
+        pytest.skip()
 
     gdaltest.gpkg_dr.CreateDataSource('/vsimem/ogr_gpkg_47.gpkg')
     # Set wrong application_id
@@ -3469,7 +3469,7 @@ def test_ogr_gpkg_47():
 def test_ogr_gpkg_48():
 
     if gdaltest.gpkg_dr is None:
-        return 'skip'
+        pytest.skip()
 
     ds = gdaltest.gpkg_dr.CreateDataSource('/vsimem/ogr_gpkg_48.gpkg')
     lyr = ds.CreateLayer('foo')
@@ -3487,11 +3487,11 @@ def test_ogr_gpkg_48():
     f = lyr.GetNextFeature()
     if f.GetField('a') != 'a' or f.GetField('b') is not None:
         f.DumpReadable()
-        return 'fail'
+        pytest.fail()
     f = lyr.GetNextFeature()
     if f.GetField('b') != 'b' or f.GetField('c') != 'c' or f.GetField('a') is not None:
         f.DumpReadable()
-        return 'fail'
+        pytest.fail()
 
     # No geom field, one single field with default value
     lyr = ds.CreateLayer('default_field_no_geom', geom_type=ogr.wkbNone)
@@ -3504,7 +3504,7 @@ def test_ogr_gpkg_48():
     f = lyr.GetNextFeature()
     if f.GetField('foo') != 'x':
         f.DumpReadable()
-        return 'fail'
+        pytest.fail()
     f = ogr.Feature(lyr.GetLayerDefn())
     f.SetFID(1)
     assert lyr.SetFeature(f) == 0
@@ -3512,7 +3512,7 @@ def test_ogr_gpkg_48():
     f = lyr.GetNextFeature()
     if f.GetField('foo') != 'x':
         f.DumpReadable()
-        return 'fail'
+        pytest.fail()
     ds = None
 
     gdaltest.gpkg_dr.DeleteDataSource('/vsimem/ogr_gpkg_48.gpkg')
@@ -3526,7 +3526,7 @@ def test_ogr_gpkg_48():
 def test_ogr_gpkg_49():
 
     if gdaltest.gpkg_dr is None:
-        return 'skip'
+        pytest.skip()
 
     ds = gdaltest.gpkg_dr.CreateDataSource('/vsimem/ogr_gpkg_49.gpkg')
 
@@ -3552,7 +3552,7 @@ def test_ogr_gpkg_49():
 def test_ogr_gpkg_50():
 
     if gdaltest.gpkg_dr is None:
-        return 'skip'
+        pytest.skip()
 
     gdal.SetConfigOption('GPKG_ADD_DEFINITION_12_063', 'YES')
     gdaltest.gpkg_dr.CreateDataSource('/vsimem/ogr_gpkg_50.gpkg')
@@ -3596,10 +3596,10 @@ def test_ogr_gpkg_50():
 def test_ogr_gpkg_51():
 
     if gdaltest.gpkg_dr is None:
-        return 'skip'
+        pytest.skip()
 
     if gdaltest.gpkg_dr.GetMetadataItem("ENABLE_SQL_GPKG_FORMAT") != 'YES':
-        return 'skip'
+        pytest.skip()
 
     ds = ogr.Open('data/poly.gpkg.sql')
     lyr = ds.GetLayer(0)
@@ -3615,7 +3615,7 @@ def test_ogr_gpkg_51():
 def test_ogr_gpkg_52():
 
     if gdaltest.gpkg_dr is None:
-        return 'skip'
+        pytest.skip()
 
     ds = ogr.Open('data/poly_non_conformant.gpkg')
     lyr = ds.GetLayer(0)
@@ -3632,10 +3632,10 @@ def test_ogr_gpkg_52():
 def test_ogr_gpkg_53():
 
     if gdaltest.gpkg_dr is None:
-        return 'skip'
+        pytest.skip()
 
     if gdaltest.gpkg_dr.GetMetadataItem("ENABLE_SQL_GPKG_FORMAT") != 'YES':
-        return 'skip'
+        pytest.skip()
 
     ds = ogr.Open('data/poly_inconsistent_case.gpkg.sql')
     assert ds.GetLayerCount() == 1
@@ -3658,7 +3658,7 @@ def test_ogr_gpkg_53():
 def test_ogr_gpkg_54():
 
     if gdaltest.gpkg_dr is None:
-        return 'skip'
+        pytest.skip()
 
     # Must be on a real file system to demonstrate potential locking
     # issue
@@ -3706,12 +3706,12 @@ def test_ogr_gpkg_54():
     f = lyr1.GetNextFeature()
     if f.GetGeometryRef().ExportToWkt() != 'POINT (5 6)':
         f.DumpReadable()
-        return 'fail'
+        pytest.fail()
     lyr2 = ds.GetLayer(1)
     f = lyr2.GetNextFeature()
     if f.GetGeometryRef().ExportToWkt() != 'POINT (7 8)':
         f.DumpReadable()
-        return 'fail'
+        pytest.fail()
     ds = None
 
     gdal.Unlink(tmpfile)
@@ -3725,7 +3725,7 @@ def test_ogr_gpkg_54():
 def test_ogr_gpkg_55():
 
     if gdaltest.gpkg_dr is None:
-        return 'skip'
+        pytest.skip()
 
     tmpfile = '/vsimem/ogr_gpkg_55.gpkg'
     ds = ogr.GetDriverByName('GPKG').CreateDataSource(tmpfile)
@@ -3756,7 +3756,7 @@ def test_ogr_gpkg_55():
 def test_ogr_gpkg_56():
 
     if gdaltest.gpkg_dr is None:
-        return 'skip'
+        pytest.skip()
 
     ds = gdal.VectorTranslate('/vsimem/ogr_gpkg_56.gpkg', 'data/poly.shp', format='GPKG')
     lyr = ds.ExecuteSQL('select a.fid as fid1, b.fid as fid2 from poly a, poly b order by fid1, fid2')
@@ -3764,7 +3764,7 @@ def test_ogr_gpkg_56():
     f = lyr.GetNextFeature()
     if f.GetField('fid1') != 1 or f.GetField('fid2') != 2:
         f.DumpReadable()
-        return 'fail'
+        pytest.fail()
     ds.ReleaseResultSet(lyr)
     ds = None
     gdal.Unlink('/vsimem/ogr_gpkg_56.gpkg')
@@ -3778,10 +3778,10 @@ def test_ogr_gpkg_56():
 def test_ogr_gpkg_57():
 
     if gdaltest.gpkg_dr is None:
-        return 'skip'
+        pytest.skip()
 
     if gdaltest.gpkg_dr.GetMetadataItem("ENABLE_SQL_GPKG_FORMAT") != 'YES':
-        return 'skip'
+        pytest.skip()
 
     tmpfile = '/vsimem/tmp.gpkg.txt'
     gdal.FileFromMemBuffer(tmpfile,
@@ -3814,7 +3814,7 @@ def test_ogr_gpkg_57():
 def test_ogr_gpkg_58():
 
     if gdaltest.gpkg_dr is None:
-        return 'skip'
+        pytest.skip()
 
     out_filename = '/vsimem/ogr_gpkg_58.gpkg'
     gdal.VectorTranslate(out_filename, 'data/poly.shp', format='GPKG')
@@ -3839,7 +3839,7 @@ def test_ogr_gpkg_58():
 def test_ogr_gpkg_59():
 
     if gdaltest.gpkg_dr is None:
-        return 'skip'
+        pytest.skip()
 
     out_filename = '/vsimem/ogr_gpkg_59.gpkg'
     gdal.VectorTranslate(out_filename, 'data/poly.shp', format='GPKG',
@@ -3863,7 +3863,7 @@ def test_ogr_gpkg_59():
 def test_ogr_gpkg_savepoint():
 
     if gdaltest.gpkg_dr is None:
-        return 'skip'
+        pytest.skip()
 
     filename = '/vsimem/ogr_gpkg_savepoint.gpkg'
     ds = gdaltest.gpkg_dr.CreateDataSource(filename)
@@ -3902,11 +3902,11 @@ def test_ogr_gpkg_savepoint():
 def test_ogr_gpkg_wal():
 
     if gdaltest.gpkg_dr is None:
-        return 'skip'
+        pytest.skip()
 
     import test_cli_utilities
     if test_cli_utilities.get_ogrinfo_path() is None:
-        return 'skip'
+        pytest.skip()
 
     # needs to be a real file
     filename = 'tmp/ogr_gpkg_wal.gpkg'
@@ -3946,7 +3946,7 @@ def test_ogr_gpkg_wal():
 def test_ogr_gpkg_json():
 
     if gdaltest.gpkg_dr is None:
-        return 'skip'
+        pytest.skip()
 
     filename = '/vsimem/ogr_gpkg_json.gpkg'
     ds = gdaltest.gpkg_dr.CreateDataSource(filename)
@@ -4015,7 +4015,7 @@ def test_ogr_gpkg_json():
 def test_ogr_gpkg_cleanup():
 
     if gdaltest.gpkg_dr is None:
-        return 'skip'
+        pytest.skip()
 
     gdaltest.gpkg_ds = None
 
diff --git a/autotest/ogr/ogr_gpsbabel.py b/autotest/ogr/ogr_gpsbabel.py
index 475fbd919bd9..e0dd86262fcb 100755
--- a/autotest/ogr/ogr_gpsbabel.py
+++ b/autotest/ogr/ogr_gpsbabel.py
@@ -35,6 +35,7 @@
 import ogrtest
 from osgeo import ogr
 from osgeo import gdal
+import pytest
 
 ###############################################################################
 # Check that dependencies are met
@@ -50,8 +51,7 @@ def test_ogr_gpsbabel_init():
     except OSError:
         ret = ''
     if ret.find('GPSBabel') == -1:
-        print('Cannot access GPSBabel utility')
-        return 'skip'
+        pytest.skip('Cannot access GPSBabel utility')
 
     ds = ogr.Open('data/test.gpx')
 
@@ -71,7 +71,7 @@ def test_ogr_gpsbabel_init():
 def test_ogr_gpsbabel_1():
 
     if not ogrtest.have_read_gpsbabel:
-        return 'skip'
+        pytest.skip()
 
     ds = ogr.Open('GPSBabel:nmea:data/nmea.txt')
     assert ds is not None
@@ -87,7 +87,7 @@ def test_ogr_gpsbabel_1():
 def test_ogr_gpsbabel_2():
 
     if not ogrtest.have_read_gpsbabel:
-        return 'skip'
+        pytest.skip()
 
     ds = ogr.Open('data/nmea.txt')
     assert ds is not None
@@ -103,7 +103,7 @@ def test_ogr_gpsbabel_2():
 def test_ogr_gpsbabel_3():
 
     if not ogrtest.have_gpsbabel:
-        return 'skip'
+        pytest.skip()
 
     ds = ogr.GetDriverByName('GPSBabel').CreateDataSource('GPSBabel:nmea:tmp/nmea.txt')
     lyr = ds.CreateLayer('track_points', geom_type=ogr.wkbPoint)
diff --git a/autotest/ogr/ogr_gpx.py b/autotest/ogr/ogr_gpx.py
index 73c946d050ce..bbe906d9c6c5 100755
--- a/autotest/ogr/ogr_gpx.py
+++ b/autotest/ogr/ogr_gpx.py
@@ -36,6 +36,7 @@
 import ogrtest
 from osgeo import ogr
 from osgeo import gdal
+import pytest
 
 
 def test_ogr_gpx_init():
@@ -48,7 +49,7 @@ def test_ogr_gpx_init():
         gdaltest.have_gpx = 1
 
     if not gdaltest.have_gpx:
-        return 'skip'
+        pytest.skip()
 
     assert gdaltest.gpx_ds.GetLayerCount() == 5, 'wrong number of layers'
 
@@ -60,7 +61,7 @@ def test_ogr_gpx_init():
 
 def test_ogr_gpx_1():
     if not gdaltest.have_gpx:
-        return 'skip'
+        pytest.skip()
 
     assert gdaltest.gpx_ds is not None
 
@@ -145,7 +146,7 @@ def test_ogr_gpx_1():
 
 def test_ogr_gpx_2():
     if not gdaltest.have_gpx:
-        return 'skip'
+        pytest.skip()
 
     assert gdaltest.gpx_ds is not None
 
@@ -166,7 +167,7 @@ def test_ogr_gpx_2():
 
 def test_ogr_gpx_3():
     if not gdaltest.have_gpx:
-        return 'skip'
+        pytest.skip()
 
     assert gdaltest.gpx_ds is not None
 
@@ -189,7 +190,7 @@ def test_ogr_gpx_3():
 
 def test_ogr_gpx_4():
     if not gdaltest.have_gpx:
-        return 'skip'
+        pytest.skip()
 
     assert gdaltest.gpx_ds is not None
 
@@ -214,7 +215,7 @@ def test_ogr_gpx_4():
 
 def test_ogr_gpx_5():
     if not gdaltest.have_gpx:
-        return 'skip'
+        pytest.skip()
 
     assert gdaltest.gpx_ds is not None
 
@@ -237,10 +238,10 @@ def test_ogr_gpx_5():
 
 def test_ogr_gpx_6():
     if not gdaltest.have_gpx:
-        return 'skip'
+        pytest.skip()
 
     if gdaltest.gpx_ds is None:
-        return 'skip'
+        pytest.skip()
 
     try:
         gdal.PushErrorHandler('CPLQuietErrorHandler')
@@ -318,7 +319,7 @@ def test_ogr_gpx_6():
 
 def test_ogr_gpx_7():
     if not gdaltest.have_gpx:
-        return 'skip'
+        pytest.skip()
 
     gdaltest.gpx_ds = None
 
@@ -387,7 +388,7 @@ def test_ogr_gpx_7():
 
 def test_ogr_gpx_8():
     if not gdaltest.have_gpx:
-        return 'skip'
+        pytest.skip()
 
     gdaltest.gpx_ds = None
 
@@ -479,15 +480,14 @@ def test_ogr_gpx_8():
 
 def test_ogr_gpx_9():
     if not gdaltest.have_gpx:
-        return 'skip'
+        pytest.skip()
 
     ds = ogr.Open('data/track_with_time_extension.gpx')
     lyr = ds.GetLayerByName('tracks')
     f = lyr.GetNextFeature()
     if f['time'] != '2015-10-11T15:06:33Z':
-        gdaltest.post_reason('did not get expected result')
         f.DumpReadable()
-        return 'fail'
+        pytest.fail('did not get expected result')
 
     return 'success'
 
diff --git a/autotest/ogr/ogr_grass.py b/autotest/ogr/ogr_grass.py
index 21a444aba397..47b873fa21c2 100755
--- a/autotest/ogr/ogr_grass.py
+++ b/autotest/ogr/ogr_grass.py
@@ -33,6 +33,7 @@
 
 
 import gdaltest
+import pytest
 
 
 ###############################################################################
@@ -42,7 +43,7 @@ def test_ogr_grass_1():
 
     gdaltest.ogr_grass_drv = ogr.GetDriverByName('GRASS')
     if gdaltest.ogr_grass_drv is None:
-        return 'skip'
+        pytest.skip()
 
     return 'success'
 
@@ -53,7 +54,7 @@ def test_ogr_grass_1():
 def test_ogr_grass_2():
 
     if gdaltest.ogr_grass_drv is None:
-        return 'skip'
+        pytest.skip()
 
     ds = ogr.Open('./data/PERMANENT/vector/point/head')
     assert ds is not None, 'Cannot open datasource'
diff --git a/autotest/ogr/ogr_gtm.py b/autotest/ogr/ogr_gtm.py
index 0181c85d37f1..b0a6a588b260 100755
--- a/autotest/ogr/ogr_gtm.py
+++ b/autotest/ogr/ogr_gtm.py
@@ -36,6 +36,7 @@
 import gdaltest
 import ogrtest
 from osgeo import ogr
+import pytest
 
 
 def test_ogr_gtm_init():
@@ -49,7 +50,7 @@ def test_ogr_gtm_init():
         gdaltest.have_gtm = 1
 
     if not gdaltest.have_gtm:
-        return 'skip'
+        pytest.skip()
 
     assert gdaltest.gtm_ds.GetLayerCount() == 2, 'wrong number of layers'
 
@@ -61,7 +62,7 @@ def test_ogr_gtm_init():
 
 def test_ogr_gtm_read_1():
     if not gdaltest.have_gtm:
-        return 'skip'
+        pytest.skip()
 
     assert gdaltest.gtm_ds is not None
 
@@ -120,7 +121,7 @@ def test_ogr_gtm_read_1():
 
 def test_ogr_gtm_read_2():
     if not gdaltest.have_gtm:
-        return 'skip'
+        pytest.skip()
 
     assert gdaltest.gtm_ds is not None
 
@@ -251,7 +252,7 @@ def test_ogr_gtm_write_1():
 
 def test_ogr_gtm_check_write_1():
     if not gdaltest.have_gtm:
-        return 'skip'
+        pytest.skip()
 
     ds = ogr.Open('tmp/gtm.gtm')
     lyr = ds.GetLayerByName('gtm_waypoints')
diff --git a/autotest/ogr/ogr_htf.py b/autotest/ogr/ogr_htf.py
index 246626477ce0..9ca234887c40 100755
--- a/autotest/ogr/ogr_htf.py
+++ b/autotest/ogr/ogr_htf.py
@@ -91,7 +91,7 @@ def test_ogr_htf_2():
 
     import test_cli_utilities
     if test_cli_utilities.get_test_ogrsf_path() is None:
-        return 'skip'
+        pytest.skip()
 
     ret = gdaltest.runexternal(test_cli_utilities.get_test_ogrsf_path() + ' -ro data/test.htf')
 
diff --git a/autotest/ogr/ogr_idrisi.py b/autotest/ogr/ogr_idrisi.py
index 719453f58596..3edec94844b4 100755
--- a/autotest/ogr/ogr_idrisi.py
+++ b/autotest/ogr/ogr_idrisi.py
@@ -34,6 +34,7 @@
 
 import gdaltest
 import ogrtest
+import pytest
 
 ###############################################################################
 # Test point layer
@@ -65,39 +66,39 @@ def test_ogr_idrisi_1():
     feat = lyr.GetNextFeature()
     if feat.GetFieldAsDouble(0) != 1.0:
         feat.DumpReadable()
-        return 'fail'
+        pytest.fail()
 
     if feat.GetFieldAsInteger(1) != 2:
         feat.DumpReadable()
-        return 'fail'
+        pytest.fail()
 
     if feat.GetFieldAsDouble(2) != 3.45:
         feat.DumpReadable()
-        return 'fail'
+        pytest.fail()
 
     if feat.GetFieldAsString(3) != 'foo':
         feat.DumpReadable()
-        return 'fail'
+        pytest.fail()
 
     if ogrtest.check_feature_geometry(feat, ogr.CreateGeometryFromWkt('POINT(400000 5000000)')) != 0:
         feat.DumpReadable()
-        return 'fail'
+        pytest.fail()
 
     feat = lyr.GetNextFeature()
     if feat.GetFieldAsDouble(0) != 2.0:
         feat.DumpReadable()
-        return 'fail'
+        pytest.fail()
 
     if ogrtest.check_feature_geometry(feat, ogr.CreateGeometryFromWkt('POINT (600000 4000000)')) != 0:
         feat.DumpReadable()
-        return 'fail'
+        pytest.fail()
 
     lyr.SetSpatialFilterRect(600000 - 1, 4000000 - 1, 600000 + 1, 4000000 + 1)
     lyr.ResetReading()
     feat = lyr.GetNextFeature()
     if feat.GetFieldAsDouble(0) != 2.0:
         feat.DumpReadable()
-        return 'fail'
+        pytest.fail()
 
     lyr.SetSpatialFilterRect(0, 0, 1, 1)
     lyr.ResetReading()
@@ -131,20 +132,20 @@ def test_ogr_idrisi_2():
     feat = lyr.GetNextFeature()
     if feat.GetFieldAsDouble(0) != 10.0:
         feat.DumpReadable()
-        return 'fail'
+        pytest.fail()
 
     if ogrtest.check_feature_geometry(feat, ogr.CreateGeometryFromWkt('LINESTRING (400000 5000000,600000 4500000)')) != 0:
         feat.DumpReadable()
-        return 'fail'
+        pytest.fail()
 
     feat = lyr.GetNextFeature()
     if feat.GetFieldAsDouble(0) != 20.0:
         feat.DumpReadable()
-        return 'fail'
+        pytest.fail()
 
     if ogrtest.check_feature_geometry(feat, ogr.CreateGeometryFromWkt('LINESTRING (450000 4000000,550000 4500000)')) != 0:
         feat.DumpReadable()
-        return 'fail'
+        pytest.fail()
 
     lyr.SetSpatialFilterRect(0, 0, 1, 1)
     lyr.ResetReading()
@@ -178,20 +179,20 @@ def test_ogr_idrisi_3():
     feat = lyr.GetNextFeature()
     if feat.GetFieldAsDouble(0) != 1.0:
         feat.DumpReadable()
-        return 'fail'
+        pytest.fail()
 
     if ogrtest.check_feature_geometry(feat, ogr.CreateGeometryFromWkt('POLYGON ((400000 4000000,400000 5000000,600000 5000000,600000 4000000,400000 4000000),(450000 4250000,450000 4750000,550000 4750000,550000 4250000,450000 4250000))')) != 0:
         feat.DumpReadable()
-        return 'fail'
+        pytest.fail()
 
     feat = lyr.GetNextFeature()
     if feat.GetFieldAsDouble(0) != 2.0:
         feat.DumpReadable()
-        return 'fail'
+        pytest.fail()
 
     if ogrtest.check_feature_geometry(feat, ogr.CreateGeometryFromWkt('POLYGON ((400000 4000000,400000 5000000,600000 5000000,600000 4000000,400000 4000000))')) != 0:
         feat.DumpReadable()
-        return 'fail'
+        pytest.fail()
 
     lyr.SetSpatialFilterRect(0, 0, 1, 1)
     lyr.ResetReading()
diff --git a/autotest/ogr/ogr_ili.py b/autotest/ogr/ogr_ili.py
index 30347f6d45a5..87839128df05 100755
--- a/autotest/ogr/ogr_ili.py
+++ b/autotest/ogr/ogr_ili.py
@@ -53,7 +53,7 @@ def test_ogr_interlis1_1():
     gdaltest.have_ili_reader = 0
     driver = ogr.GetDriverByName('Interlis 1')
     if driver is None:
-        return 'skip'
+        pytest.skip()
 
     gdaltest.have_ili_reader = 1
 
@@ -66,10 +66,10 @@ def test_ogr_interlis1_1():
 def test_ogr_interlis1_2():
 
     if not gdaltest.have_ili_reader:
-        return 'skip'
+        pytest.skip()
 
     if not ogrtest.have_geos():
-        return 'skip'
+        pytest.skip()
 
     ds = ogr.Open('data/ili/Beispiel.itf,data/ili/Beispiel.imd')
     layers = ['Bodenbedeckung__BoFlaechen',
@@ -97,8 +97,7 @@ def test_ogr_interlis1_2():
         if feat.GetFieldAsString(i) != str(field_values[i]):
             feat.DumpReadable()
             print(feat.GetFieldAsString(i))
-            gdaltest.post_reason('field value wrong.')
-            return 'fail'
+            pytest.fail('field value wrong.')
 
     geom = feat.GetGeomFieldRef(0)
     assert geom.GetCoordinateDimension() == 2, 'dimension wrong.'
@@ -117,7 +116,7 @@ def test_ogr_interlis1_2():
 def test_ogr_interlis1_3():
 
     if not gdaltest.have_ili_reader:
-        return 'skip'
+        pytest.skip()
 
     ds = ogr.Open('data/ili/format-default.itf,data/ili/format-default.imd')
 
@@ -141,8 +140,7 @@ def test_ogr_interlis1_3():
         if feat.GetFieldAsString(i) != str(field_values[i]):
             feat.DumpReadable()
             print(feat.GetFieldAsString(i))
-            gdaltest.post_reason('field value wrong.')
-            return 'fail'
+            pytest.fail('field value wrong.')
 
     return 'success'
 
@@ -153,7 +151,7 @@ def test_ogr_interlis1_3():
 def test_ogr_interlis1_4():
 
     if not gdaltest.have_ili_reader:
-        return 'skip'
+        pytest.skip()
 
     ds = ogr.Open('data/ili/format-test.itf,data/ili/format-test.imd')
 
@@ -177,8 +175,7 @@ def test_ogr_interlis1_4():
         if feat.GetFieldAsString(i) != str(field_values[i]):
             feat.DumpReadable()
             print(feat.GetFieldAsString(i))
-            gdaltest.post_reason('field value wrong.')
-            return 'fail'
+            pytest.fail('field value wrong.')
 
     return 'success'
 
@@ -189,7 +186,7 @@ def test_ogr_interlis1_4():
 def test_ogr_interlis1_5():
 
     if not gdaltest.have_ili_reader:
-        return 'skip'
+        pytest.skip()
 
     ds = ogr.Open('data/ili/format-default.itf,data/ili/format-default.imd')
 
@@ -236,7 +233,7 @@ def test_ogr_interlis1_5():
 def test_ogr_interlis1_6():
 
     if not gdaltest.have_ili_reader:
-        return 'skip'
+        pytest.skip()
 
     ds = ogr.Open('data/ili/format-default.itf,data/ili/format-default.imd')
     lyr = ds.GetLayerByName('FormatTests__FormatTable')
@@ -279,7 +276,7 @@ def test_ogr_interlis1_6():
 def test_ogr_interlis1_7():
 
     if not gdaltest.have_ili_reader:
-        return 'skip'
+        pytest.skip()
 
     ds = ogr.Open('data/ili/encoding-test.itf,data/ili/format-default.imd')
 
@@ -305,8 +302,7 @@ def test_ogr_interlis1_7():
         if feat.GetFieldAsString(i) != str(field_values[i]):
             feat.DumpReadable()
             print(feat.GetFieldAsString(i))
-            gdaltest.post_reason('field value wrong.')
-            return 'fail'
+            pytest.fail('field value wrong.')
 
     # Write back
     driver = ogr.GetDriverByName('Interlis 1')
@@ -354,7 +350,7 @@ def test_ogr_interlis1_7():
 def test_ogr_interlis1_9():
 
     if not gdaltest.have_ili_reader:
-        return 'skip'
+        pytest.skip()
 
     ds = ogr.Open('data/ili/Beispiel-rename.vrt')
     layers = ['BoGebaeude']
@@ -380,8 +376,7 @@ def test_ogr_interlis1_9():
         if feat.GetFieldAsString(i) != str(field_values[i]):
             feat.DumpReadable()
             print(feat.GetFieldAsString(i))
-            gdaltest.post_reason('field value wrong.')
-            return 'fail'
+            pytest.fail('field value wrong.')
 
     return 'success'
 
@@ -392,10 +387,10 @@ def test_ogr_interlis1_9():
 def test_ogr_interlis1_10():
 
     if not gdaltest.have_ili_reader:
-        return 'skip'
+        pytest.skip()
 
     if not ogrtest.have_geos():
-        return 'skip'
+        pytest.skip()
 
     ds = ogr.Open('data/ili/Beispiel.itf,data/ili/Beispiel.imd')
 
@@ -412,7 +407,7 @@ def test_ogr_interlis1_10():
         geom = feat.GetGeomFieldRef(i)
         if ogrtest.check_feature_geometry(geom, geom_field_values[i]) != 0:
             feat.DumpReadable()
-            return 'fail'
+            pytest.fail()
 
     return 'success'
 
@@ -423,7 +418,7 @@ def test_ogr_interlis1_10():
 def test_ogr_interlis1_11():
 
     if not gdaltest.have_ili_reader:
-        return 'skip'
+        pytest.skip()
 
     ds = ogr.Open('data/ili/multigeom.itf,data/ili/multigeom.imd')
 
@@ -466,7 +461,7 @@ def test_ogr_interlis1_11():
 def test_ogr_interlis1_12():
 
     if not gdaltest.have_ili_reader:
-        return 'skip'
+        pytest.skip()
 
     ds = ogr.Open('data/ili/multicoord.itf,data/ili/multicoord.imd')
 
@@ -484,8 +479,7 @@ def test_ogr_interlis1_12():
 
     if feat.GetFieldCount() != 6:
         feat.DumpReadable()
-        gdaltest.post_reason('field count wrong.')
-        return 'fail'
+        pytest.fail('field count wrong.')
 
     geom_columns = ['coordPoint1', 'coordPoint2']
 
@@ -504,7 +498,7 @@ def test_ogr_interlis1_12():
 def test_ogr_interlis1_13():
 
     if not gdaltest.have_ili_reader:
-        return 'skip'
+        pytest.skip()
 
     ds = ogr.Open('data/ili/surface.itf,data/ili/surface.imd')
 
@@ -540,8 +534,7 @@ def test_ogr_interlis1_13():
         if feat.GetFieldAsString(i) != str(field_values[i]):
             feat.DumpReadable()
             print(feat.GetFieldAsString(i))
-            gdaltest.post_reason('field value wrong.')
-            return 'fail'
+            pytest.fail('field value wrong.')
 
     geom_field_values = ['CURVEPOLYGON (COMPOUNDCURVE ((598600.961 249487.174,598608.899 249538.768,598624.774 249594.331,598648.586 249630.05,598684.305 249661.8,598763.68 249685.612,598850.993 249685.612,598854.962 249618.143,598843.055 249550.675,598819.243 249514.956,598763.68 249479.237,598692.243 249447.487,598612.868 249427.643,598600.961 249487.174)))']
 
@@ -551,7 +544,7 @@ def test_ogr_interlis1_13():
         geom = feat.GetGeomFieldRef(i)
         if ogrtest.check_feature_geometry(geom, geom_field_values[i]) != 0:
             feat.DumpReadable()
-            return 'fail'
+            pytest.fail()
 
     # --- test curved polygon
 
@@ -564,7 +557,7 @@ def test_ogr_interlis1_13():
         geom = feat.GetGeomFieldRef(i)
         if ogrtest.check_feature_geometry(geom, geom_field_values[i]) != 0:
             feat.DumpReadable()
-            return 'fail'
+            pytest.fail()
 
     # --- test multi-ring polygon
 
@@ -578,8 +571,7 @@ def test_ogr_interlis1_13():
         if feat.GetFieldAsString(i) != str(field_values[i]):
             feat.DumpReadable()
             print(feat.GetFieldAsString(i))
-            gdaltest.post_reason('field value wrong.')
-            return 'fail'
+            pytest.fail('field value wrong.')
 
     # FIXME: note this is an invalid curve polygon. The two rings are completely disjoint, so this should be a multisurface instead.
     geom_field_values = ['CURVEPOLYGON (COMPOUNDCURVE ((747951.24 265833.326,747955.101 265828.716,747954.975 265827.862,747951.166 265828.348,747951.24 265833.326)),COMPOUNDCURVE ((747925.762 265857.606,747927.618 265861.533,747928.237 265860.794,747930.956 265857.547,747925.762 265857.606)))']
@@ -590,7 +582,7 @@ def test_ogr_interlis1_13():
         geom = feat.GetGeomFieldRef(i)
         if ogrtest.check_feature_geometry(geom, geom_field_values[i]) != 0:
             feat.DumpReadable()
-            return 'fail'
+            pytest.fail()
 
     # --- same with text IDENT field
     # TODO: Surface with text IDENT field not supported yet
@@ -678,7 +670,7 @@ def test_ogr_interlis1_13():
         geom = feat.GetGeomFieldRef(i)
         if ogrtest.check_feature_geometry(geom, geom_field_values[i]) != 0:
             feat.DumpReadable()
-            return 'fail'
+            pytest.fail()
 
     feat = lyr.GetNextFeature()
 
@@ -688,7 +680,7 @@ def test_ogr_interlis1_13():
         geom = feat.GetGeomFieldRef(i)
         if ogrtest.check_feature_geometry(geom, geom_field_values[i]) != 0:
             feat.DumpReadable()
-            return 'fail'
+            pytest.fail()
 
     lyr = ds.GetLayerByName('SURFC_TOP__Flaechenelement')
     assert lyr.GetFeatureCount() == 2, 'feature count wrong.'
@@ -701,7 +693,7 @@ def test_ogr_interlis1_13():
         geom = feat.GetGeomFieldRef(i)
         if ogrtest.check_feature_geometry(geom, geom_field_values[i]) != 0:
             feat.DumpReadable()
-            return 'fail'
+            pytest.fail()
 
     feat = lyr.GetNextFeature()
 
@@ -711,7 +703,7 @@ def test_ogr_interlis1_13():
         geom = feat.GetGeomFieldRef(i)
         if ogrtest.check_feature_geometry(geom, geom_field_values[i]) != 0:
             feat.DumpReadable()
-            return 'fail'
+            pytest.fail()
 
     # Test assembling curves not in "right" order
     ds = ogr.Open('data/ili/surface_complex.itf,data/ili/surface.imd')
@@ -724,7 +716,7 @@ def test_ogr_interlis1_13():
         geom = feat.GetGeomFieldRef(i)
         if ogrtest.check_feature_geometry(geom, geom_field_values[i]) != 0:
             feat.DumpReadable()
-            return 'fail'
+            pytest.fail()
 
     return 'success'
 
@@ -735,7 +727,7 @@ def test_ogr_interlis1_13():
 def test_ogr_interlis1_13_linear():
 
     if not gdaltest.have_ili_reader:
-        return 'skip'
+        pytest.skip()
 
     gdal.SetConfigOption('OGR_STROKE_CURVE', 'YES')
 
@@ -773,8 +765,7 @@ def test_ogr_interlis1_13_linear():
         if feat.GetFieldAsString(i) != str(field_values[i]):
             feat.DumpReadable()
             print(feat.GetFieldAsString(i))
-            gdaltest.post_reason('field value wrong.')
-            return 'fail'
+            pytest.fail('field value wrong.')
 
     geom_field_values = ['POLYGON ((598600.961 249487.174,598608.899 249538.768,598624.774 249594.331,598648.586 249630.05,598684.305 249661.8,598763.68 249685.612,598850.993 249685.612,598854.962 249618.143,598843.055 249550.675,598819.243 249514.956,598763.68 249479.237,598692.243 249447.487,598612.868 249427.643,598600.961 249487.174))']
 
@@ -784,7 +775,7 @@ def test_ogr_interlis1_13_linear():
         geom = feat.GetGeomFieldRef(i)
         if ogrtest.check_feature_geometry(geom, geom_field_values[i]) != 0:
             feat.DumpReadable()
-            return 'fail'
+            pytest.fail()
 
     # --- test curved polygon
 
@@ -796,7 +787,7 @@ def test_ogr_interlis1_13_linear():
         geom = feat.GetGeomFieldRef(i)
         if ogrtest.check_feature_geometry(geom, geom_field_values[i]) != 0:
             feat.DumpReadable()
-            return 'fail'
+            pytest.fail()
 
     # --- test multi-ring polygon
 
@@ -811,8 +802,7 @@ def test_ogr_interlis1_13_linear():
         if feat.GetFieldAsString(i) != str(field_values[i]):
             feat.DumpReadable()
             print(feat.GetFieldAsString(i))
-            gdaltest.post_reason('field value wrong.')
-            return 'fail'
+            pytest.fail('field value wrong.')
 
     geom_field_values = ['POLYGON ((598330.204 249028.397,598344.756 249057.501,598390.838 249074.479,598422.367 249081.755,598459.96 249093.882,598493.915 249101.158,598523.019 249106.008,598563.038 249084.18,598589.716 249042.949,598603.056 249011.42,598607.907 248966.551,598577.59 248960.487,598493.915 248983.528,598424.793 248996.868,598359.308 249010.207,598330.204 249028.397))']
 
@@ -822,7 +812,7 @@ def test_ogr_interlis1_13_linear():
         geom = feat.GetGeomFieldRef(i)
         if ogrtest.check_feature_geometry(geom, geom_field_values[i]) != 0:
             feat.DumpReadable()
-            return 'fail'
+            pytest.fail()
 
     lyr = ds.GetLayerByName('SURFC_TOP__Flaechenelement_Geometrie')
     assert lyr.GetFeatureCount() == 3, 'feature count wrong.'
@@ -835,7 +825,7 @@ def test_ogr_interlis1_13_linear():
         geom = feat.GetGeomFieldRef(i)
         if ogrtest.check_feature_geometry(geom, geom_field_values[i]) != 0:
             feat.DumpReadable()
-            return 'fail'
+            pytest.fail()
 
     feat = lyr.GetNextFeature()
 
@@ -845,7 +835,7 @@ def test_ogr_interlis1_13_linear():
         geom = feat.GetGeomFieldRef(i)
         if ogrtest.check_feature_geometry(geom, geom_field_values[i]) != 0:
             feat.DumpReadable()
-            return 'fail'
+            pytest.fail()
 
     lyr = ds.GetLayerByName('SURFC_TOP__Flaechenelement')
     assert lyr.GetFeatureCount() == 2, 'feature count wrong.'
@@ -858,7 +848,7 @@ def test_ogr_interlis1_13_linear():
         geom = feat.GetGeomFieldRef(i)
         if ogrtest.check_feature_geometry(geom, geom_field_values[i]) != 0:
             feat.DumpReadable()
-            return 'fail'
+            pytest.fail()
 
     feat = lyr.GetNextFeature()
 
@@ -868,7 +858,7 @@ def test_ogr_interlis1_13_linear():
         geom = feat.GetGeomFieldRef(i)
         if ogrtest.check_feature_geometry(geom, geom_field_values[i]) != 0:
             feat.DumpReadable()
-            return 'fail'
+            pytest.fail()
 
     gdal.SetConfigOption('OGR_STROKE_CURVE', None)
 
@@ -881,7 +871,7 @@ def test_ogr_interlis1_13_linear():
 def test_ogr_interlis1_14():
 
     if not gdaltest.have_ili_reader:
-        return 'skip'
+        pytest.skip()
 
     ds = ogr.Open('data/ili/Beispiel.itf,data/ili/Beispiel.imd')
     lyr = ds.GetLayerByName('Bodenbedeckung__Strasse')
@@ -930,7 +920,7 @@ def test_ogr_interlis1_14():
 def test_ogr_interlis2_1():
 
     if not gdaltest.have_ili_reader:
-        return 'skip'
+        pytest.skip()
 
     ds = ogr.Open('data/ili/RoadsExdm2ien.xml')
     assert ds is not None
@@ -955,7 +945,7 @@ def test_ogr_interlis2_1():
 def test_ogr_interlis2_2():
 
     if not gdaltest.have_ili_reader:
-        return 'skip'
+        pytest.skip()
 
     ds = ogr.Open('data/ili/RoadsExdm2ien.xml,data/ili/RoadsExdm2ien.imd')
     assert ds is not None
@@ -981,15 +971,13 @@ def test_ogr_interlis2_2():
 
     if feat.GetFieldCount() != len(field_values):
         feat.DumpReadable()
-        gdaltest.post_reason('field count wrong.')
-        return 'fail'
+        pytest.fail('field count wrong.')
 
     for i in range(feat.GetFieldCount()):
         if feat.GetFieldAsString(i) != str(field_values[i]):
             feat.DumpReadable()
             print(feat.GetFieldAsString(i))
-            gdaltest.post_reason('field value wrong.')
-            return 'fail'
+            pytest.fail('field value wrong.')
 
     geom = feat.GetGeometryRef()
     assert geom.GetCoordinateDimension() == 2, 'dimension wrong.'
@@ -1002,7 +990,7 @@ def test_ogr_interlis2_2():
         geom = feat.GetGeomFieldRef(i)
         if ogrtest.check_feature_geometry(geom, geom_field_values[i]) != 0:
             feat.DumpReadable()
-            return 'fail'
+            pytest.fail()
 
     lyr = ds.GetLayerByName('RoadsExdm2ien.RoadsExtended.StreetAxis')
     assert lyr.GetFeatureCount() == 7, 'feature count wrong.'
@@ -1017,7 +1005,7 @@ def test_ogr_interlis2_2():
         geom = feat.GetGeomFieldRef(i)
         if ogrtest.check_feature_geometry(geom, geom_field_values[i]) != 0:
             feat.DumpReadable()
-            return 'fail'
+            pytest.fail()
 
     lyr = ds.GetLayerByName('RoadsExdm2ben.Roads.LandCover')
     assert lyr.GetFeatureCount() == 12, 'feature count wrong.'
@@ -1032,7 +1020,7 @@ def test_ogr_interlis2_2():
         geom = feat.GetGeomFieldRef(i)
         if ogrtest.check_feature_geometry(geom, geom_field_values[i]) != 0:
             feat.DumpReadable()
-            return 'fail'
+            pytest.fail()
 
     return 'success'
 
@@ -1043,7 +1031,7 @@ def test_ogr_interlis2_2():
 def test_ogr_interlis2_3():
 
     if not gdaltest.have_ili_reader:
-        return 'skip'
+        pytest.skip()
 
     ds = ogr.Open('data/ili/RoadsExdm2ien.xml,data/ili/RoadsExdm2ien.imd')
 
@@ -1135,7 +1123,7 @@ def test_ogr_interlis2_3():
 def test_ogr_interlis2_4():
 
     if not gdaltest.have_ili_reader:
-        return 'skip'
+        pytest.skip()
 
     ds = ogr.Open('data/ili/ch.bazl.sicherheitszonenplan.oereb_20131118.xtf,data/ili/ch.bazl.sicherheitszonenplan.oereb_20131118.imd')
     assert ds is not None
@@ -1184,15 +1172,13 @@ def test_ogr_interlis2_4():
 
     if feat.GetFieldCount() != len(field_values):
         feat.DumpReadable()
-        gdaltest.post_reason('field count wrong.')
-        return 'fail'
+        pytest.fail('field count wrong.')
 
     for i in range(feat.GetFieldCount()):
         if feat.GetFieldAsString(i) != str(field_values[i]):
             feat.DumpReadable()
             print(feat.GetFieldAsString(i))
-            gdaltest.post_reason('field value wrong.')
-            return 'fail'
+            pytest.fail('field value wrong.')
 
     geom_field_values = [None, None, 'CURVEPOLYGON (COMPOUNDCURVE ((658593.928 254957.714,658511.628 254948.614,658418.028 254938.516,658106.426 254913.918,658192.222 254445.914,658771.228 254619.412,659667.232 254699.606,660369.238 254827.202,661016.442 255010.1,661279.644 255090.198,661866.648 255138.094,661784.45 255601.798,661211.146 255432.8,660320.54 255352.806,659523.436 255206.71,658703.528 254966.814,658624.228 254961.014,658593.928 254957.714)))']
     assert feat.GetGeomFieldCount() == len(geom_field_values), 'geom field count wrong.'
@@ -1217,7 +1203,7 @@ def test_ogr_interlis2_4():
 def test_ogr_interlis_arc1():
 
     if not gdaltest.have_ili_reader:
-        return 'skip'
+        pytest.skip()
 
     gdal.SetConfigOption('OGR_STROKE_CURVE', 'TRUE')
     # gdal.SetConfigOption('OGR_ARC_STEPSIZE', '0.96')
@@ -1270,7 +1256,7 @@ def test_ogr_interlis_arc1():
 def test_ogr_interlis_arc2():
 
     if not gdaltest.have_ili_reader:
-        return 'skip'
+        pytest.skip()
 
     ds = ogr.Open('data/ili/Beispiel.itf,data/ili/Beispiel.imd')
 
@@ -1286,7 +1272,7 @@ def test_ogr_interlis_arc2():
         geom = feat.GetGeomFieldRef(i)
         if ogrtest.check_feature_geometry(geom, geom_field_values[i]) != 0:
             feat.DumpReadable()
-            return 'fail'
+            pytest.fail()
 
     return 'success'
 
@@ -1297,7 +1283,7 @@ def test_ogr_interlis_arc2():
 def test_ogr_interlis_cleanup():
 
     if not gdaltest.have_ili_reader:
-        return 'skip'
+        pytest.skip()
 
     gdal.SetConfigOption('OGR_STROKE_CURVE', None)
 
diff --git a/autotest/ogr/ogr_index_test.py b/autotest/ogr/ogr_index_test.py
index 49c45b257fed..c6f52e337326 100755
--- a/autotest/ogr/ogr_index_test.py
+++ b/autotest/ogr/ogr_index_test.py
@@ -33,6 +33,7 @@
 import gdaltest
 from osgeo import ogr
 import ogrtest
+import pytest
 
 ###############################################################################
 # Create a MIF file to be our primary table.
@@ -230,8 +231,7 @@ def test_ogr_index_9():
     for filename in ['join_t.idm', 'join_t.ind']:
         try:
             os.stat(filename)
-            gdaltest.post_reason("%s should not exist" % filename)
-            return 'fail'
+            pytest.fail("%s should not exist" % filename)
         except OSError:
             pass
 
@@ -244,8 +244,7 @@ def test_ogr_index_9():
         try:
             os.stat(filename)
         except OSError:
-            gdaltest.post_reason("%s should exist" % filename)
-            return 'fail'
+            pytest.fail("%s should exist" % filename)
 
     f = open('join_t.idm', 'rt')
     xml = f.read()
@@ -448,8 +447,7 @@ def test_ogr_index_cleanup():
     for filename in ['join_t.idm', 'join_t.ind']:
         try:
             os.stat(filename)
-            gdaltest.post_reason("%s should not exist" % filename)
-            return 'fail'
+            pytest.fail("%s should not exist" % filename)
         except OSError:
             pass
 
diff --git a/autotest/ogr/ogr_ingres.py b/autotest/ogr/ogr_ingres.py
index 51f68d676f5c..6ba7b95b9673 100755
--- a/autotest/ogr/ogr_ingres.py
+++ b/autotest/ogr/ogr_ingres.py
@@ -34,6 +34,7 @@
 import gdaltest
 import ogrtest
 from osgeo import ogr
+import pytest
 
 ###############################################################################
 # Open INGRES test datasource.
@@ -45,11 +46,11 @@ def test_ogr_ingres_1():
 
     drv = ogr.GetDriverByName('Ingres')
     if drv is None:
-        return 'skip'
+        pytest.skip()
 
     gdaltest.ingres_ds = ogr.Open('@driver=ingres,dbname=test', update=1)
     if gdaltest.ingres_ds is None:
-        return 'skip'
+        pytest.skip()
 
     return 'success'
 
@@ -60,7 +61,7 @@ def test_ogr_ingres_1():
 def test_ogr_ingres_2():
 
     if gdaltest.ingres_ds is None:
-        return 'skip'
+        pytest.skip()
 
     #######################################################
     # Create Layer
@@ -104,7 +105,7 @@ def test_ogr_ingres_2():
 
 def test_ogr_ingres_3():
     if gdaltest.ingres_ds is None:
-        return 'skip'
+        pytest.skip()
 
     expect = [168, 169, 166, 158, 165]
 
@@ -140,7 +141,7 @@ def test_ogr_ingres_3():
 def test_ogr_ingres_4():
 
     if gdaltest.ingres_ds is None:
-        return 'skip'
+        pytest.skip()
 
     expect = [179, 173, 172, 171, 170, 169, 168, 166, 165, 158]
 
@@ -163,9 +164,9 @@ def test_ogr_ingres_4():
 def test_ogr_ingres_5():
 
     if gdaltest.ingres_ds is None:
-        return 'skip'
+        pytest.skip()
 
-    return 'skip'
+    pytest.skip()
 
     # pylint: disable=unreachable
     sql_lyr = gdaltest.ingres_ds.ExecuteSQL(
@@ -191,7 +192,7 @@ def test_ogr_ingres_5():
 def test_ogr_ingres_6():
 
     if gdaltest.ingres_ds is None:
-        return 'skip'
+        pytest.skip()
 
     gdaltest.ingres_lyr.SetAttributeFilter(None)
 
@@ -214,7 +215,7 @@ def test_ogr_ingres_6():
 def test_ogr_ingres_7():
 
     if gdaltest.ingres_ds is None:
-        return 'skip'
+        pytest.skip()
 
     ####################################################################
     # Add new string field.
@@ -257,7 +258,7 @@ def test_ogr_ingres_7():
 def test_ogr_ingres_8():
 
     if gdaltest.ingres_ds is None:
-        return 'skip'
+        pytest.skip()
 
     assert gdaltest.ingres_lyr.TestCapability('DeleteFeature'), \
         'DeleteFeature capability test failed.'
@@ -290,7 +291,7 @@ def test_ogr_ingres_8():
 def test_ogr_ingres_cleanup():
 
     if gdaltest.ingres_ds is None:
-        return 'skip'
+        pytest.skip()
 
     gdaltest.ingres_ds.Destroy()
     gdaltest.ingres_ds = None
diff --git a/autotest/ogr/ogr_jml.py b/autotest/ogr/ogr_jml.py
index 0628e1eb44e0..8a83b210f13a 100755
--- a/autotest/ogr/ogr_jml.py
+++ b/autotest/ogr/ogr_jml.py
@@ -36,6 +36,7 @@
 from osgeo import ogr
 from osgeo import osr
 from osgeo import gdal
+import pytest
 
 
 def test_ogr_jml_init():
@@ -57,7 +58,7 @@ def test_ogr_jml_init():
 def test_ogr_jml_1():
 
     if not gdaltest.jml_read_support:
-        return 'skip'
+        pytest.skip()
 
     ds = ogr.Open('data/test.jml')
     assert ds.GetLayerCount() == 1
@@ -95,7 +96,7 @@ def test_ogr_jml_1():
        feat.GetStyleString() != 'BRUSH(fc:#0000FF)' or \
        feat.GetGeometryRef().ExportToWkt() != 'POLYGON ((0 0,0 10,10 10,10 0,0 0))':
         feat.DumpReadable()
-        return 'fail'
+        pytest.fail()
 
     feat = lyr.GetNextFeature()
     if feat.GetFieldAsString('datetime') != '2014/10/18 21:36:45+02' or \
@@ -103,12 +104,12 @@ def test_ogr_jml_1():
        feat.GetStyleString() != 'PEN(c:#FF00FF)' or \
        feat.GetGeometryRef().ExportToWkt() != 'POINT (-1 -1)':
         feat.DumpReadable()
-        return 'fail'
+        pytest.fail()
 
     feat = lyr.GetNextFeature()
     if feat.GetGeometryRef() is not None:
         feat.DumpReadable()
-        return 'fail'
+        pytest.fail()
 
     return 'success'
 
@@ -402,11 +403,11 @@ def test_ogr_jml_2():
 def test_ogr_jml_3():
 
     if not gdaltest.jml_read_support:
-        return 'skip'
+        pytest.skip()
 
     import test_cli_utilities
     if test_cli_utilities.get_test_ogrsf_path() is None:
-        return 'skip'
+        pytest.skip()
 
     ret = gdaltest.runexternal(test_cli_utilities.get_test_ogrsf_path() + ' -ro data/test.jml')
 
@@ -421,7 +422,7 @@ def test_ogr_jml_3():
 def test_ogr_jml_4():
 
     if not gdaltest.jml_read_support:
-        return 'skip'
+        pytest.skip()
 
     # Missing CollectionElement, FeatureElement or GeometryElement
     gdal.FileFromMemBuffer('/vsimem/ogr_jml.jml', """<?xml version='1.0' encoding='UTF-8'?>
@@ -602,7 +603,7 @@ def test_ogr_jml_4():
 def test_ogr_jml_read_srs():
 
     if not gdaltest.jml_read_support:
-        return 'skip'
+        pytest.skip()
 
     ds = ogr.Open('data/one_point_srid_4326.jml')
     lyr = ds.GetLayer(0)
diff --git a/autotest/ogr/ogr_join_test.py b/autotest/ogr/ogr_join_test.py
index 4c4564c54c08..a412abce1a73 100755
--- a/autotest/ogr/ogr_join_test.py
+++ b/autotest/ogr/ogr_join_test.py
@@ -34,6 +34,7 @@
 from osgeo import gdal
 from osgeo import ogr
 import ogrtest
+import pytest
 
 ###############################################################################
 # Test a join.
@@ -351,7 +352,7 @@ def test_ogr_join_16():
 
     if sql_lyr is None:
         return 'success'
-    return 'fail'
+    pytest.fail()
 
 ###############################################################################
 # Test non-support of a secondarytable.fieldname in a order by clause
@@ -371,7 +372,7 @@ def test_ogr_join_17():
 
     if sql_lyr is None:
         return 'success'
-    return 'fail'
+    pytest.fail()
 
 ###############################################################################
 # Test inverted order of fields in ON
@@ -406,7 +407,7 @@ def test_ogr_join_19():
 
     if sql_lyr is None:
         return 'success'
-    return 'fail'
+    pytest.fail()
 
 ###############################################################################
 # Test unrecognized secondary field
@@ -424,7 +425,7 @@ def test_ogr_join_20():
 
     if sql_lyr is None:
         return 'success'
-    return 'fail'
+    pytest.fail()
 
 ###############################################################################
 # Test unexpected secondary table
@@ -444,7 +445,7 @@ def test_ogr_join_21():
 
     if sql_lyr is None:
         return 'success'
-    return 'fail'
+    pytest.fail()
 
 ###############################################################################
 # Test join with a complex expression as ON
@@ -495,11 +496,11 @@ def test_ogr_join_23():
     feat = sql_lyr.GetNextFeature()
     if feat.IsFieldSetAndNotNull('second.f'):
         feat.DumpReadable()
-        return 'fail'
+        pytest.fail()
     feat = sql_lyr.GetNextFeature()
     if feat['f'] != 'key1' or feat['second.f'] != 'key1':
         feat.DumpReadable()
-        return 'fail'
+        pytest.fail()
     ds.ReleaseResultSet(sql_lyr)
 
     ds = None
diff --git a/autotest/ogr/ogr_kml.py b/autotest/ogr/ogr_kml.py
index d2947f3c1e4c..f974833a2ac1 100755
--- a/autotest/ogr/ogr_kml.py
+++ b/autotest/ogr/ogr_kml.py
@@ -55,7 +55,7 @@ def test_ogr_kml_datastore():
 
     ogrtest.kml_drv = ogr.GetDriverByName('KML')
     if ogrtest.kml_drv is None:
-        return 'skip'
+        pytest.skip()
 
     ogrtest.libkml_drv = ogr.GetDriverByName('LIBKML')
     # Unregister LIBKML driver if present as it's behaviour is not identical
@@ -69,7 +69,7 @@ def test_ogr_kml_datastore():
         ogrtest.have_read_kml = 1
 
     if not ogrtest.have_read_kml:
-        return 'skip'
+        pytest.skip()
 
     assert ogrtest.kml_ds.GetLayerCount() == 6, 'wrong number of layers'
 
@@ -83,7 +83,7 @@ def test_ogr_kml_datastore():
 def test_ogr_kml_attributes_1():
 
     if not ogrtest.have_read_kml:
-        return 'skip'
+        pytest.skip()
 
     assert ogrtest.kml_ds is not None, 'kml_ds is none'
 
@@ -124,7 +124,7 @@ def test_ogr_kml_attributes_1():
 def test_ogr_kml_attributes_2():
 
     if not ogrtest.have_read_kml:
-        return 'skip'
+        pytest.skip()
 
     assert ogrtest.kml_ds is not None, 'kml_ds is none'
 
@@ -148,7 +148,7 @@ def test_ogr_kml_attributes_2():
 def test_ogr_kml_attributes_3():
 
     if not ogrtest.have_read_kml:
-        return 'skip'
+        pytest.skip()
 
     assert ogrtest.kml_ds is not None, 'kml_ds is none'
 
@@ -181,7 +181,7 @@ def test_ogr_kml_attributes_3():
 def test_ogr_kml_attributes_4():
 
     if not ogrtest.have_read_kml:
-        return 'skip'
+        pytest.skip()
 
     assert ogrtest.kml_ds is not None, 'kml_ds is none'
 
@@ -210,7 +210,7 @@ def test_ogr_kml_attributes_4():
 def test_ogr_kml_point_read():
 
     if not ogrtest.have_read_kml:
-        return 'skip'
+        pytest.skip()
 
     assert ogrtest.kml_ds is not None, 'kml_ds is none'
 
@@ -246,7 +246,7 @@ def test_ogr_kml_point_read():
 def test_ogr_kml_linestring_read():
 
     if not ogrtest.have_read_kml:
-        return 'skip'
+        pytest.skip()
 
     assert ogrtest.kml_ds is not None, 'kml_ds is none'
 
@@ -279,7 +279,7 @@ def test_ogr_kml_linestring_read():
 def test_ogr_kml_polygon_read():
 
     if not ogrtest.have_read_kml:
-        return 'skip'
+        pytest.skip()
 
     assert ogrtest.kml_ds is not None, 'kml_ds is none'
 
@@ -317,7 +317,7 @@ def test_ogr_kml_polygon_read():
 def test_ogr_kml_write_1():
 
     if ogrtest.kml_drv is None:
-        return 'skip'
+        pytest.skip()
 
     srs = osr.SpatialReference()
     srs.SetWellKnownGeogCS('WGS72')
@@ -377,7 +377,7 @@ def test_ogr_kml_write_1():
 def test_ogr_kml_check_write_1():
 
     if not ogrtest.have_read_kml:
-        return 'skip'
+        pytest.skip()
 
     content = open('tmp/kml.kml').read()
     assert content.find('Schema') < 0, 'Did not expect Schema tags.'
@@ -428,7 +428,7 @@ def test_ogr_kml_check_write_1():
 def test_ogr_kml_xml_attributes():
 
     if not ogrtest.have_read_kml:
-        return 'skip'
+        pytest.skip()
 
     ds = ogr.Open('data/description_with_xml.kml')
 
@@ -448,7 +448,7 @@ def test_ogr_kml_xml_attributes():
 def test_ogr_kml_read_geometries():
 
     if not ogrtest.have_read_kml:
-        return 'skip'
+        pytest.skip()
 
     ds = ogr.Open('data/geometries.kml')
 
@@ -466,11 +466,11 @@ def test_ogr_kml_read_geometries():
 def test_ogr_kml_test_ogrsf():
 
     if not ogrtest.have_read_kml:
-        return 'skip'
+        pytest.skip()
 
     import test_cli_utilities
     if test_cli_utilities.get_test_ogrsf_path() is None:
-        return 'skip'
+        pytest.skip()
 
     ret = gdaltest.runexternal(test_cli_utilities.get_test_ogrsf_path() + ' --config OGR_SKIP LIBKML -ro data/samples.kml')
 
@@ -506,7 +506,7 @@ def test_ogr_kml_interleaved_writing():
 def test_ogr_kml_read_placemark():
 
     if not ogrtest.have_read_kml:
-        return 'skip'
+        pytest.skip()
 
     ds = ogr.Open('data/placemark.kml')
     lyr = ds.GetLayer(0)
@@ -522,7 +522,7 @@ def test_ogr_kml_read_placemark():
 def test_ogr_kml_read_empty():
 
     if not ogrtest.have_read_kml:
-        return 'skip'
+        pytest.skip()
 
     ds = ogr.Open('data/empty.kml')
     assert ds.GetLayerCount() == 0
@@ -536,7 +536,7 @@ def test_ogr_kml_read_empty():
 def test_ogr_kml_read_emptylayers():
 
     if not ogrtest.have_read_kml:
-        return 'skip'
+        pytest.skip()
 
     ds = ogr.Open('data/emptylayers.kml')
     assert ds.GetLayerCount() == 2
@@ -680,7 +680,7 @@ def test_ogr_kml_cleanup():
     os.remove('tmp/kml.kml')
 
     if not ogrtest.have_read_kml:
-        return 'skip'
+        pytest.skip()
 
     if ogrtest.kml_ds is not None:
         ogrtest.kml_ds = None
@@ -699,7 +699,7 @@ def test_ogr_kml_cleanup():
 def test_ogr_kml_read_folder_with_subfolder_placemark():
 
     if not ogrtest.have_read_kml:
-        return 'skip'
+        pytest.skip()
 
     ds = ogr.Open('data/folder_with_subfolder_placemark.kml')
     assert ds.GetLayerCount() == 1
@@ -715,7 +715,7 @@ def test_ogr_kml_read_folder_with_subfolder_placemark():
 def test_ogr_kml_read_truncated():
 
     if not ogrtest.have_read_kml:
-        return 'skip'
+        pytest.skip()
 
     with gdaltest.error_handler():
         ds = ogr.Open('data/truncated.kml')
@@ -730,7 +730,7 @@ def test_ogr_kml_read_truncated():
 def test_ogr_kml_read_weird_empty_folders():
 
     if not ogrtest.have_read_kml:
-        return 'skip'
+        pytest.skip()
 
     ds = ogr.Open('data/weird_empty_folders.kml')
     assert ds.GetLayerCount() == 1
@@ -746,7 +746,7 @@ def test_ogr_kml_read_weird_empty_folders():
 def test_ogr_kml_read_junk_content_after_valid_doc():
 
     if not ogrtest.have_read_kml:
-        return 'skip'
+        pytest.skip()
 
     with gdaltest.error_handler():
         ds = ogr.Open('data/junk_content_after_valid_doc.kml')
@@ -761,7 +761,7 @@ def test_ogr_kml_read_junk_content_after_valid_doc():
 def test_ogr_kml_read_placemark_with_kml_prefix():
 
     if not ogrtest.have_read_kml:
-        return 'skip'
+        pytest.skip()
 
     ds = ogr.Open('data/placemark_with_kml_prefix.kml')
     lyr = ds.GetLayer(0)
@@ -777,7 +777,7 @@ def test_ogr_kml_read_placemark_with_kml_prefix():
 def test_ogr_kml_read_duplicate_folder_name():
 
     if not ogrtest.have_read_kml:
-        return 'skip'
+        pytest.skip()
 
     ds = ogr.Open('data/duplicate_folder_name.kml')
     lyr = ds.GetLayer(0)
@@ -794,7 +794,7 @@ def test_ogr_kml_read_duplicate_folder_name():
 def test_ogr_kml_read_placemark_in_root_and_subfolder():
 
     if not ogrtest.have_read_kml:
-        return 'skip'
+        pytest.skip()
 
     ds = ogr.Open('data/placemark_in_root_and_subfolder.kml')
     lyr = ds.GetLayerByName('TopLevel')
diff --git a/autotest/ogr/ogr_layer_algebra.py b/autotest/ogr/ogr_layer_algebra.py
index cfee839b1680..9b14446b4d6b 100755
--- a/autotest/ogr/ogr_layer_algebra.py
+++ b/autotest/ogr/ogr_layer_algebra.py
@@ -36,6 +36,7 @@
 import ogrtest
 
 from osgeo import ogr
+import pytest
 
 ###############################################################################
 # Common usage tests.
@@ -89,7 +90,7 @@ def test_algebra_setup():
     global ds, A, B, C, pointInB, D1, D2, empty
 
     if not ogrtest.have_geos():
-        return 'skip'
+        pytest.skip()
 
     # Create three memory layers for intersection.
 
@@ -161,7 +162,7 @@ def test_algebra_setup():
 
 def test_algebra_intersection():
     if not ogrtest.have_geos():
-        return 'skip'
+        pytest.skip()
 
     recreate_layer_C()
 
@@ -196,8 +197,7 @@ def test_algebra_intersection():
             assert feat.GetField('A') == f2[1] and feat.GetField('B') == f2[2], \
                 'Did not get expected field values.'
         else:
-            gdaltest.post_reason('Layer.Intersection returned wrong geometry: ' + g.ExportToWkt())
-            return 'fail'
+            pytest.fail('Layer.Intersection returned wrong geometry: ' + g.ExportToWkt())
 
     # This time we test with PROMOTE_TO_MULTI and pre-created output fields.
     recreate_layer_C()
@@ -229,8 +229,7 @@ def test_algebra_intersection():
             assert feat.GetField('A') == f2[1] and feat.GetField('B') == f2[2], \
                 'Did not get expected field values. (2)'
         else:
-            gdaltest.post_reason('Layer.Intersection returned wrong geometry: ' + g.ExportToWkt())
-            return 'fail'
+            pytest.fail('Layer.Intersection returned wrong geometry: ' + g.ExportToWkt())
 
     recreate_layer_C()
 
@@ -248,7 +247,7 @@ def test_algebra_intersection():
 
 def test_algebra_KEEP_LOWER_DIMENSION_GEOMETRIES():
     if not ogrtest.have_geos():
-        return 'skip'
+        pytest.skip()
 
     driver = ogr.GetDriverByName('MEMORY')
     ds = driver.CreateDataSource('ds')
@@ -313,7 +312,7 @@ def test_algebra_KEEP_LOWER_DIMENSION_GEOMETRIES():
 
 def test_algebra_union():
     if not ogrtest.have_geos():
-        return 'skip'
+        pytest.skip()
 
     recreate_layer_C()
 
@@ -365,7 +364,7 @@ def test_algebra_union():
 
 def test_algebra_symdifference():
     if not ogrtest.have_geos():
-        return 'skip'
+        pytest.skip()
 
     recreate_layer_C()
 
@@ -406,7 +405,7 @@ def test_algebra_symdifference():
 
 def test_algebra_identify():
     if not ogrtest.have_geos():
-        return 'skip'
+        pytest.skip()
 
     recreate_layer_C()
 
@@ -446,7 +445,7 @@ def test_algebra_identify():
 
 def test_algebra_update():
     if not ogrtest.have_geos():
-        return 'skip'
+        pytest.skip()
 
     recreate_layer_C()
 
@@ -486,7 +485,7 @@ def test_algebra_update():
 
 def test_algebra_clip():
     if not ogrtest.have_geos():
-        return 'skip'
+        pytest.skip()
 
     recreate_layer_C()
 
@@ -526,7 +525,7 @@ def test_algebra_clip():
 
 def test_algebra_erase():
     if not ogrtest.have_geos():
-        return 'skip'
+        pytest.skip()
 
     recreate_layer_C()
 
@@ -575,10 +574,9 @@ def test_algebra_erase():
     feat_a = A.GetNextFeature()
     feat_c = C.GetNextFeature()
     if feat_a.Equal(feat_c) != 0:
-        gdaltest.post_reason('features not identical')
         feat_a.DumpReadable()
         feat_c.DumpReadable()
-        return 'fail'
+        pytest.fail('features not identical')
 
     recreate_layer_C()
 
@@ -594,7 +592,7 @@ def test_algebra_erase():
 
 def test_algebra_cleanup():
     if not ogrtest.have_geos():
-        return 'skip'
+        pytest.skip()
 
     global ds, A, B, C, pointInB, D1, D2, empty
 
diff --git a/autotest/ogr/ogr_libkml.py b/autotest/ogr/ogr_libkml.py
index 66df2752177f..c60c52bc6e87 100755
--- a/autotest/ogr/ogr_libkml.py
+++ b/autotest/ogr/ogr_libkml.py
@@ -53,7 +53,7 @@ def test_ogr_libkml_datastore():
 
     ogrtest.kml_drv = ogr.GetDriverByName('LIBKML')
     if ogrtest.kml_drv is None:
-        return 'skip'
+        pytest.skip()
 
     ogrtest.kml_drv = ogr.GetDriverByName('KML')
     # Unregister KML driver if present as its behaviour is not identical
@@ -67,7 +67,7 @@ def test_ogr_libkml_datastore():
         ogrtest.have_read_libkml = 1
 
     if not ogrtest.have_read_libkml:
-        return 'skip'
+        pytest.skip()
 
     assert ogrtest.kml_ds.GetLayerCount() == 10, 'wrong number of layers'
 
@@ -81,7 +81,7 @@ def test_ogr_libkml_datastore():
 def test_ogr_libkml_attributes_1():
 
     if not ogrtest.have_read_libkml:
-        return 'skip'
+        pytest.skip()
 
     assert ogrtest.kml_ds is not None, 'libkml_ds is none'
 
@@ -122,7 +122,7 @@ def test_ogr_libkml_attributes_1():
 def test_ogr_libkml_attributes_2():
 
     if not ogrtest.have_read_libkml:
-        return 'skip'
+        pytest.skip()
 
     assert ogrtest.kml_ds is not None, 'libkml_ds is none'
 
@@ -148,7 +148,7 @@ def test_ogr_libkml_attributes_2():
 def test_ogr_libkml_attributes_3():
 
     if not ogrtest.have_read_libkml:
-        return 'skip'
+        pytest.skip()
 
     assert ogrtest.kml_ds is not None, 'libkml_ds is none'
 
@@ -181,7 +181,7 @@ def test_ogr_libkml_attributes_3():
 def test_ogr_libkml_attributes_4():
 
     if not ogrtest.have_read_libkml:
-        return 'skip'
+        pytest.skip()
 
     assert ogrtest.kml_ds is not None, 'libkml_ds is none'
 
@@ -210,7 +210,7 @@ def test_ogr_libkml_attributes_4():
 def test_ogr_libkml_point_read():
 
     if not ogrtest.have_read_libkml:
-        return 'skip'
+        pytest.skip()
 
     assert ogrtest.kml_ds is not None, 'libkml_ds is none'
 
@@ -246,7 +246,7 @@ def test_ogr_libkml_point_read():
 def test_ogr_libkml_linestring_read():
 
     if not ogrtest.have_read_libkml:
-        return 'skip'
+        pytest.skip()
 
     assert ogrtest.kml_ds is not None, 'libkml_ds is none'
 
@@ -279,7 +279,7 @@ def test_ogr_libkml_linestring_read():
 def test_ogr_libkml_polygon_read():
 
     if not ogrtest.have_read_libkml:
-        return 'skip'
+        pytest.skip()
 
     assert ogrtest.kml_ds is not None, 'libkml_ds is none'
 
@@ -317,7 +317,7 @@ def test_ogr_libkml_polygon_read():
 def ogr_libkml_write(filename):
 
     if ogrtest.kml_drv is None:
-        return 'skip'
+        pytest.skip()
 
     ds = ogr.GetDriverByName('LIBKML').CreateDataSource(filename)
 
@@ -387,7 +387,7 @@ def ogr_libkml_write(filename):
 def ogr_libkml_check_write(filename):
 
     if not ogrtest.have_read_libkml:
-        return 'skip'
+        pytest.skip()
 
     ds = ogr.Open(filename)
     if filename != '/vsimem/libkml_use_doc_off.kmz':
@@ -471,7 +471,7 @@ def test_ogr_libkml_write_dir():
 
 def test_ogr_libkml_check_write_dir():
     if not ogrtest.have_read_libkml:
-        return 'skip'
+        pytest.skip()
 
     ret = ogr_libkml_check_write('/vsimem/libkmldir')
     files = gdal.ReadDir('/vsimem/libkmldir')
@@ -488,7 +488,7 @@ def test_ogr_libkml_check_write_dir():
 def test_ogr_libkml_xml_attributes():
 
     if not ogrtest.have_read_libkml:
-        return 'skip'
+        pytest.skip()
 
     ds = ogr.Open('data/description_with_xml.kml')
 
@@ -511,7 +511,7 @@ def test_ogr_libkml_xml_attributes():
 def test_ogr_libkml_read_geometries():
 
     if not ogrtest.have_read_libkml:
-        return 'skip'
+        pytest.skip()
 
     ds = ogr.Open('data/geometries.kml')
 
@@ -531,11 +531,11 @@ def test_ogr_libkml_read_geometries():
 def test_ogr_libkml_test_ogrsf():
 
     if not ogrtest.have_read_libkml:
-        return 'skip'
+        pytest.skip()
 
     import test_cli_utilities
     if test_cli_utilities.get_test_ogrsf_path() is None:
-        return 'skip'
+        pytest.skip()
 
     ret = gdaltest.runexternal(test_cli_utilities.get_test_ogrsf_path() + ' --config OGR_SKIP KML -ro data/samples.kml')
 
@@ -550,7 +550,7 @@ def test_ogr_libkml_test_ogrsf():
 def test_ogr_libkml_read_placemark():
 
     if not ogrtest.have_read_libkml:
-        return 'skip'
+        pytest.skip()
 
     ds = ogr.Open('data/placemark.kml')
     lyr = ds.GetLayer(0)
@@ -568,7 +568,7 @@ def test_ogr_libkml_read_placemark():
 def test_ogr_libkml_read_empty():
 
     if not ogrtest.have_read_libkml:
-        return 'skip'
+        pytest.skip()
 
     ds = ogr.Open('data/empty.kml')
     assert ds.GetLayerCount() == 0
@@ -584,7 +584,7 @@ def test_ogr_libkml_read_empty():
 def test_ogr_libkml_read_emptylayers():
 
     if not ogrtest.have_read_libkml:
-        return 'skip'
+        pytest.skip()
 
     ds = ogr.Open('data/emptylayers.kml')
     assert ds.GetLayerCount() == 2
@@ -608,7 +608,7 @@ def test_ogr_libkml_read_emptylayers():
 def test_ogr_libkml_read_emptylayers_without_folder():
 
     if not ogrtest.have_read_libkml:
-        return 'skip'
+        pytest.skip()
 
     ds = ogr.Open('data/emptylayers_without_folder.kml')
     assert ds.GetLayerCount() == 1
@@ -628,7 +628,7 @@ def test_ogr_libkml_read_emptylayers_without_folder():
 def test_ogr_libkml_read_schema():
 
     if not ogrtest.have_read_libkml:
-        return 'skip'
+        pytest.skip()
 
     ds = ogr.Open('data/test_schema.kml')
     assert ds.GetLayerCount() == 4
@@ -637,13 +637,13 @@ def test_ogr_libkml_read_schema():
     feat = lyr.GetNextFeature()
     if feat.GetField('foo') != 'bar':
         feat.DumpReadable()
-        return 'fail'
+        pytest.fail()
 
     lyr = ds.GetLayer(1)
     feat = lyr.GetNextFeature()
     if feat.GetField('foo') != 'baz':
         feat.DumpReadable()
-        return 'fail'
+        pytest.fail()
 
     lyr = ds.GetLayer(2)
     assert lyr.GetLayerDefn().GetFieldIndex('foo') == -1
@@ -663,25 +663,25 @@ def test_ogr_libkml_read_schema():
 def test_ogr_libkml_extended_data_without_schema_data():
 
     if not ogrtest.have_read_libkml:
-        return 'skip'
+        pytest.skip()
 
     ds = ogr.Open('data/extended_data_without_schema_data.kml')
     lyr = ds.GetLayer(0)
     feat = lyr.GetNextFeature()
     if feat.GetField('field1') != '1_1':
         feat.DumpReadable()
-        return 'fail'
+        pytest.fail()
     if feat.GetField('field2') != '1_2':
         feat.DumpReadable()
-        return 'fail'
+        pytest.fail()
 
     feat = lyr.GetNextFeature()
     if feat.GetField('field1') != '2_1':
         feat.DumpReadable()
-        return 'fail'
+        pytest.fail()
     if feat.IsFieldSet('field2'):
         feat.DumpReadable()
-        return 'fail'
+        pytest.fail()
 
     ds = None
 
@@ -694,7 +694,7 @@ def test_ogr_libkml_extended_data_without_schema_data():
 def test_ogr_libkml_gxtrack():
 
     if not ogrtest.have_read_libkml:
-        return 'skip'
+        pytest.skip()
 
     ds = ogr.Open('data/gxtrack.kml')
     lyr = ds.GetLayer(0)
@@ -704,7 +704,7 @@ def test_ogr_libkml_gxtrack():
        feat.GetField('end') != '2013/05/28 13:00:00' or \
        feat.GetGeometryRef().ExportToWkt() != 'LINESTRING (2 49,3 50)':
         feat.DumpReadable()
-        return 'fail'
+        pytest.fail()
     ds = None
 
     return 'success'
@@ -716,7 +716,7 @@ def test_ogr_libkml_gxtrack():
 def test_ogr_libkml_gxmultitrack():
 
     if not ogrtest.have_read_libkml:
-        return 'skip'
+        pytest.skip()
 
     ds = ogr.Open('data/gxmultitrack.kml')
     lyr = ds.GetLayer(0)
@@ -726,7 +726,7 @@ def test_ogr_libkml_gxmultitrack():
        feat.GetField('end') != '2013/05/28 13:00:00' or \
        feat.GetGeometryRef().ExportToWkt() != 'MULTILINESTRING ((2 49,3 50))':
         feat.DumpReadable()
-        return 'fail'
+        pytest.fail()
     ds = None
 
     return 'success'
@@ -738,7 +738,7 @@ def test_ogr_libkml_gxmultitrack():
 def test_ogr_libkml_camera():
 
     if not ogrtest.have_read_libkml:
-        return 'skip'
+        pytest.skip()
 
     ds = ogr.GetDriverByName('LIBKML').CreateDataSource("/vsimem/ogr_libkml_camera.kml")
     lyr = ds.CreateLayer('test')
@@ -784,7 +784,7 @@ def test_ogr_libkml_camera():
         feat.GetField("tilt") != 75.0 or
             feat.GetField("roll") != 10.0):
         feat.DumpReadable()
-        return 'fail'
+        pytest.fail()
 
     feat = lyr.GetNextFeature()
     if (feat.GetGeometryRef().ExportToWkt() != 'POINT (3 50 1)' or
@@ -793,7 +793,7 @@ def test_ogr_libkml_camera():
         feat.IsFieldSet("roll") or
             feat.GetField("altitudeMode") != 'relativeToGround'):
         feat.DumpReadable()
-        return 'fail'
+        pytest.fail()
     ds = None
 
     return 'success'
@@ -805,7 +805,7 @@ def test_ogr_libkml_camera():
 def test_ogr_libkml_write_layer_lookat():
 
     if not ogrtest.have_read_libkml:
-        return 'skip'
+        pytest.skip()
 
     ds = ogr.GetDriverByName('LIBKML').CreateDataSource("/vsimem/ogr_libkml_write_layer_lookat.kml")
     options = ['LOOKAT_LONGITUDE=2', 'LOOKAT_LATITUDE=49', 'LOOKAT_RANGE=150']
@@ -843,7 +843,7 @@ def test_ogr_libkml_write_layer_lookat():
 def test_ogr_libkml_write_layer_camera():
 
     if not ogrtest.have_read_libkml:
-        return 'skip'
+        pytest.skip()
 
     ds = ogr.GetDriverByName('LIBKML').CreateDataSource("/vsimem/ogr_libkml_write_layer_camera.kml")
     options = ['CAMERA_LONGITUDE=3', 'CAMERA_LATITUDE=50', 'CAMERA_ALTITUDE=100',
@@ -874,7 +874,7 @@ def test_ogr_libkml_write_layer_camera():
 def test_ogr_libkml_write_multigeometry():
 
     if not ogrtest.have_read_libkml:
-        return 'skip'
+        pytest.skip()
 
     ds = ogr.GetDriverByName('LIBKML').CreateDataSource("/vsimem/ogr_libkml_write_multigeometry.kml")
     lyr = ds.CreateLayer('test')
@@ -895,11 +895,11 @@ def test_ogr_libkml_write_multigeometry():
     feat = lyr.GetNextFeature()
     if feat.GetGeometryRef().ExportToWkt() != 'POINT (0 1 0)':
         feat.DumpReadable()
-        return 'fail'
+        pytest.fail()
     feat = lyr.GetNextFeature()
     if feat.GetGeometryRef().ExportToWkt() != 'GEOMETRYCOLLECTION EMPTY':
         feat.DumpReadable()
-        return 'fail'
+        pytest.fail()
 
     return 'success'
 
@@ -910,7 +910,7 @@ def test_ogr_libkml_write_multigeometry():
 def test_ogr_libkml_write_snippet():
 
     if not ogrtest.have_read_libkml:
-        return 'skip'
+        pytest.skip()
 
     ds = ogr.GetDriverByName('LIBKML').CreateDataSource("/vsimem/ogr_libkml_write_snippet.kml")
     lyr = ds.CreateLayer('test')
@@ -933,10 +933,10 @@ def test_ogr_libkml_write_snippet():
     feat = lyr.GetNextFeature()
     if feat.GetField('snippet') != 'test_snippet':
         feat.DumpReadable()
-        return 'fail'
+        pytest.fail()
     if feat.GetGeometryRef().ExportToWkt() != 'POINT (0 1 0)':
         feat.DumpReadable()
-        return 'fail'
+        pytest.fail()
 
     return 'success'
 
@@ -947,7 +947,7 @@ def test_ogr_libkml_write_snippet():
 def test_ogr_libkml_write_atom_author():
 
     if not ogrtest.have_read_libkml:
-        return 'skip'
+        pytest.skip()
 
     filepath = '/vsimem/ogr_libkml_write_atom_author.kml'
     ds = ogr.GetDriverByName('LIBKML').CreateDataSource(filepath,
@@ -975,7 +975,7 @@ def test_ogr_libkml_write_atom_author():
 def test_ogr_libkml_write_atom_link():
 
     if not ogrtest.have_read_libkml:
-        return 'skip'
+        pytest.skip()
 
     filepath = '/vsimem/ogr_libkml_write_atom_link.kml'
     ds = ogr.GetDriverByName('LIBKML').CreateDataSource(filepath,
@@ -1000,7 +1000,7 @@ def test_ogr_libkml_write_atom_link():
 def test_ogr_libkml_write_phonenumber():
 
     if not ogrtest.have_read_libkml:
-        return 'skip'
+        pytest.skip()
 
     filepath = '/vsimem/ogr_libkml_write_phonenumber.kml'
     ds = ogr.GetDriverByName('LIBKML').CreateDataSource(filepath,
@@ -1024,7 +1024,7 @@ def test_ogr_libkml_write_phonenumber():
 def test_ogr_libkml_write_region():
 
     if not ogrtest.have_read_libkml:
-        return 'skip'
+        pytest.skip()
 
     ds = ogr.GetDriverByName('LIBKML').CreateDataSource("/vsimem/ogr_libkml_write_region.kml")
     lyr = ds.CreateLayer('auto', options=['ADD_REGION=YES'])
@@ -1067,7 +1067,7 @@ def test_ogr_libkml_write_region():
 def test_ogr_libkml_write_screenoverlay():
 
     if not ogrtest.have_read_libkml:
-        return 'skip'
+        pytest.skip()
 
     ds = ogr.GetDriverByName('LIBKML').CreateDataSource("/vsimem/ogr_libkml_write_screenoverlay.kml")
     ds.CreateLayer('auto', options=['SO_HREF=http://foo'])
@@ -1111,7 +1111,7 @@ def test_ogr_libkml_write_screenoverlay():
 def test_ogr_libkml_write_model():
 
     if not ogrtest.have_read_libkml:
-        return 'skip'
+        pytest.skip()
 
     ds = ogr.GetDriverByName('LIBKML').CreateDataSource("/vsimem/ogr_libkml_write_model.kml")
     lyr = ds.CreateLayer('test')
@@ -1181,7 +1181,7 @@ def test_ogr_libkml_write_model():
 def test_ogr_libkml_read_write_style():
 
     if not ogrtest.have_read_libkml:
-        return 'skip'
+        pytest.skip()
 
     f = gdal.VSIFOpenL('/vsimem/ogr_libkml_read_write_style_read.kml', 'wb')
 
@@ -1419,7 +1419,7 @@ def test_ogr_libkml_read_write_style():
 def test_ogr_libkml_write_update():
 
     if not ogrtest.have_read_libkml:
-        return 'skip'
+        pytest.skip()
 
     for i in range(3):
 
@@ -1475,7 +1475,7 @@ def test_ogr_libkml_write_update():
 def test_ogr_libkml_write_networklinkcontrol():
 
     if not ogrtest.have_read_libkml:
-        return 'skip'
+        pytest.skip()
 
     options = ['NLC_MINREFRESHPERIOD=3600',
                'NLC_MAXSESSIONLENGTH=-1',
@@ -1528,7 +1528,7 @@ def test_ogr_libkml_write_networklinkcontrol():
 def test_ogr_libkml_write_liststyle():
 
     if not ogrtest.have_read_libkml:
-        return 'skip'
+        pytest.skip()
 
     options = ['LISTSTYLE_ICON_HREF=http://www.gdal.org/gdalicon.png']
     ds = ogr.GetDriverByName('LIBKML').CreateDataSource("/vsimem/ogr_libkml_write_liststyle.kml", options=options)
@@ -1566,7 +1566,7 @@ def test_ogr_libkml_write_liststyle():
 def test_ogr_libkml_write_networklink():
 
     if not ogrtest.have_read_libkml:
-        return 'skip'
+        pytest.skip()
 
     ds = ogr.GetDriverByName('LIBKML').CreateDataSource("/vsimem/ogr_libkml_write_networklink.kml")
     lyr = ds.CreateLayer('test')
@@ -1634,7 +1634,7 @@ def test_ogr_libkml_write_networklink():
 def test_ogr_libkml_write_photooverlay():
 
     if not ogrtest.have_read_libkml:
-        return 'skip'
+        pytest.skip()
 
     ds = ogr.GetDriverByName('LIBKML').CreateDataSource("/vsimem/ogr_libkml_write_photooverlay.kml")
     lyr = ds.CreateLayer('test')
@@ -1720,7 +1720,7 @@ def test_ogr_libkml_write_photooverlay():
 def test_ogr_libkml_read_write_data():
 
     if not ogrtest.have_read_libkml:
-        return 'skip'
+        pytest.skip()
 
     ds = ogr.GetDriverByName('LIBKML').CreateDataSource("/vsimem/ogr_libkml_read_write_data.kml")
     gdal.SetConfigOption('LIBKML_USE_SIMPLEFIELD', 'NO')
@@ -1755,7 +1755,7 @@ def test_ogr_libkml_read_write_data():
 def test_ogr_libkml_write_folder():
 
     if not ogrtest.have_read_libkml:
-        return 'skip'
+        pytest.skip()
 
     ds = ogr.GetDriverByName('LIBKML').CreateDataSource("/vsimem/ogr_libkml_write_folder.kml")
     ds.CreateLayer('test', options=['LISTSTYLE_ICON_HREF=http://foo', 'FOLDER=YES'])
@@ -1782,7 +1782,7 @@ def test_ogr_libkml_write_folder():
 def test_ogr_libkml_write_container_properties():
 
     if not ogrtest.have_read_libkml:
-        return 'skip'
+        pytest.skip()
 
     ds = ogr.GetDriverByName('LIBKML').CreateDataSource("/vsimem/ogr_libkml_write_container_properties.kml",
                                                         options=['NAME=ds_name', 'DESCRIPTION=ds_description', 'OPEN=1', 'VISIBILITY=1', 'SNIPPET=ds_snippet'])
@@ -1814,18 +1814,18 @@ def test_ogr_libkml_write_container_properties():
 def test_ogr_libkml_read_gx_timestamp():
 
     if not ogrtest.have_read_libkml:
-        return 'skip'
+        pytest.skip()
 
     ds = ogr.Open('data/gxtimestamp.kml')
     lyr = ds.GetLayer(0)
     f = lyr.GetNextFeature()
     if f['timestamp'] != '2016/02/13 12:34:56+00':
         f.DumpReadable()
-        return 'fail'
+        pytest.fail()
     f = lyr.GetNextFeature()
     if f['begin'] != '2016/02/13 00:00:00+00' or f['end'] != '2016/02/14 00:00:00+00':
         f.DumpReadable()
-        return 'fail'
+        pytest.fail()
 
     return 'success'
 
@@ -1836,7 +1836,7 @@ def test_ogr_libkml_read_gx_timestamp():
 def test_ogr_libkml_read_placemark_with_kml_prefix():
 
     if not ogrtest.have_read_libkml:
-        return 'skip'
+        pytest.skip()
 
     ds = ogr.Open('data/placemark_with_kml_prefix.kml')
     lyr = ds.GetLayer(0)
@@ -1852,7 +1852,7 @@ def test_ogr_libkml_read_placemark_with_kml_prefix():
 def test_ogr_libkml_read_duplicate_folder_name():
 
     if not ogrtest.have_read_libkml:
-        return 'skip'
+        pytest.skip()
 
     ds = ogr.Open('data/duplicate_folder_name.kml')
     lyr = ds.GetLayer(0)
@@ -1869,7 +1869,7 @@ def test_ogr_libkml_read_duplicate_folder_name():
 def test_ogr_libkml_read_placemark_in_root_and_subfolder():
 
     if not ogrtest.have_read_libkml:
-        return 'skip'
+        pytest.skip()
 
     ds = ogr.Open('data/placemark_in_root_and_subfolder.kml')
     lyr = ds.GetLayerByName('TopLevel')
@@ -1889,7 +1889,7 @@ def test_ogr_libkml_read_placemark_in_root_and_subfolder():
 def test_ogr_libkml_read_tab_separated_coord_triplet():
 
     if not ogrtest.have_read_libkml:
-        return 'skip'
+        pytest.skip()
 
     ds = ogr.Open('data/tab_separated_coord_triplet.kml')
     lyr = ds.GetLayer(0)
@@ -1908,7 +1908,7 @@ def test_ogr_libkml_read_tab_separated_coord_triplet():
 def test_ogr_libkml_read_kml_with_space_content_in_coordinates():
 
     if not ogrtest.have_read_libkml:
-        return 'skip'
+        pytest.skip()
 
     ds = ogr.Open('data/kml_with_space_content_in_coordinates.kml')
     lyr = ds.GetLayer(0)
@@ -1927,31 +1927,31 @@ def test_ogr_libkml_read_kml_with_space_content_in_coordinates():
 def test_ogr_libkml_read_several_schema():
 
     if not ogrtest.have_read_libkml:
-        return 'skip'
+        pytest.skip()
 
     ds = ogr.Open('data/several_schema_in_layer.kml')
     lyr = ds.GetLayer(0)
     feat = lyr.GetNextFeature()
     if feat['fieldA'] != 'fieldAValue' or feat['common'] != 'commonAValue':
         feat.DumpReadable()
-        return 'fail'
+        pytest.fail()
 
     feat = lyr.GetNextFeature()
     if feat['fieldB'] != 'fieldBValue' or feat['common'] != 'commonBValue':
         feat.DumpReadable()
-        return 'fail'
+        pytest.fail()
 
     ds = ogr.Open('data/several_schema_outside_layer.kml')
     lyr = ds.GetLayer(0)
     feat = lyr.GetNextFeature()
     if feat['fieldA'] != 'fieldAValue' or feat['common'] != 'commonAValue':
         feat.DumpReadable()
-        return 'fail'
+        pytest.fail()
 
     feat = lyr.GetNextFeature()
     if feat['fieldB'] != 'fieldBValue' or feat['common'] != 'commonBValue':
         feat.DumpReadable()
-        return 'fail'
+        pytest.fail()
 
     return 'success'
 
@@ -1961,7 +1961,7 @@ def test_ogr_libkml_read_several_schema():
 def test_ogr_libkml_update_existing_kml():
 
     if not ogrtest.have_read_libkml:
-        return 'skip'
+        pytest.skip()
 
     filename = '/vsimem/ogr_libkml_update_existing_kml.kml'
     gdal.FileFromMemBuffer(filename, open('data/several_schema_in_layer.kml', 'rb').read())
@@ -1986,7 +1986,7 @@ def test_ogr_libkml_update_existing_kml():
 
 def test_ogr_libkml_cleanup():
     if not ogrtest.have_read_libkml:
-        return 'skip'
+        pytest.skip()
 
     if ogrtest.kml_ds is not None:
         ogrtest.kml_ds = None
diff --git a/autotest/ogr/ogr_mem.py b/autotest/ogr/ogr_mem.py
index b145c5ddabba..19460238f0fa 100755
--- a/autotest/ogr/ogr_mem.py
+++ b/autotest/ogr/ogr_mem.py
@@ -36,6 +36,7 @@
 import ogrtest
 from osgeo import ogr
 from osgeo import gdal
+import pytest
 
 ###############################################################################
 # Open Memory datasource.
@@ -57,7 +58,7 @@ def test_ogr_mem_1():
 def test_ogr_mem_2():
 
     if gdaltest.mem_ds is None:
-        return 'skip'
+        pytest.skip()
 
     assert gdaltest.mem_ds.TestCapability(ogr.ODsCCreateLayer) != 0, \
         'ODsCCreateLayer TestCapability failed.'
@@ -104,7 +105,7 @@ def test_ogr_mem_2():
 
 def test_ogr_mem_3():
     if gdaltest.mem_ds is None:
-        return 'skip'
+        pytest.skip()
 
     expect = [168, 169, 166, 158, 165]
 
@@ -137,7 +138,7 @@ def test_ogr_mem_3():
 def test_ogr_mem_4():
 
     if gdaltest.mem_ds is None:
-        return 'skip'
+        pytest.skip()
 
     dst_feat = ogr.Feature(feature_def=gdaltest.mem_lyr.GetLayerDefn())
     wkt_list = ['10', '2', '1', '3d_1', '4', '5', '6']
@@ -171,7 +172,7 @@ def test_ogr_mem_4():
 def test_ogr_mem_5():
 
     if gdaltest.mem_ds is None:
-        return 'skip'
+        pytest.skip()
 
     expect = [179, 173, 172, 171, 170, 169, 168, 166, 165, 158, None]
 
@@ -190,7 +191,7 @@ def test_ogr_mem_5():
 def test_ogr_mem_6():
 
     if gdaltest.mem_ds is None:
-        return 'skip'
+        pytest.skip()
 
     sql_lyr = gdaltest.mem_ds.ExecuteSQL(
         "select * from tpoly where prfedea = '2'")
@@ -213,7 +214,7 @@ def test_ogr_mem_6():
 def test_ogr_mem_7():
 
     if gdaltest.mem_ds is None:
-        return 'skip'
+        pytest.skip()
 
     gdaltest.mem_lyr.SetAttributeFilter(None)
 
@@ -372,7 +373,7 @@ def test_ogr_mem_11():
 def test_ogr_mem_12():
 
     if gdaltest.mem_ds is None:
-        return 'skip'
+        pytest.skip()
 
     #######################################################
     # Create memory Layer
@@ -398,7 +399,7 @@ def test_ogr_mem_12():
 def test_ogr_mem_13():
 
     if gdaltest.mem_ds is None:
-        return 'skip'
+        pytest.skip()
 
     lyr = gdaltest.mem_ds.CreateLayer('listlayer')
     field_defn = ogr.FieldDefn('stringlist', ogr.OFTStringList)
@@ -413,7 +414,7 @@ def test_ogr_mem_13():
         feat.SetFieldStringList
     except AttributeError:
         # OG python bindings
-        return 'skip'
+        pytest.skip()
 
     feat.SetFieldStringList(0, ['a', 'b'])
     assert feat.GetFieldAsStringList(0) == ['a', 'b']
@@ -433,7 +434,7 @@ def test_ogr_mem_13():
 def test_ogr_mem_14():
 
     if gdaltest.mem_ds is None:
-        return 'skip'
+        pytest.skip()
 
     lyr = gdaltest.mem_ds.CreateLayer('SetNextByIndex')
     field_defn = ogr.FieldDefn('foo', ogr.OFTString)
@@ -662,7 +663,7 @@ def test_ogr_mem_17():
 def test_ogr_mem_cleanup():
 
     if gdaltest.mem_ds is None:
-        return 'skip'
+        pytest.skip()
 
     ogr.SetNonLinearGeometriesEnabledFlag(True)
     gdaltest.mem_ds = None
diff --git a/autotest/ogr/ogr_mitab.py b/autotest/ogr/ogr_mitab.py
index f58d3d755131..be8924353a03 100755
--- a/autotest/ogr/ogr_mitab.py
+++ b/autotest/ogr/ogr_mitab.py
@@ -53,7 +53,7 @@ def test_ogr_mitab_1():
 
     if gdaltest.mapinfo_ds is not None:
         return 'success'
-    return 'fail'
+    pytest.fail()
 
 ###############################################################################
 # Create table from data/poly.shp
@@ -62,7 +62,7 @@ def test_ogr_mitab_1():
 def test_ogr_mitab_2():
 
     if gdaltest.mapinfo_ds is None:
-        return 'skip'
+        pytest.skip()
 
     # This should convert to MapInfo datum name 'New_Zealand_GD49'
     WEIRD_SRS = 'PROJCS["NZGD49 / UTM zone 59S",GEOGCS["NZGD49",DATUM["NZGD49",SPHEROID["International 1924",6378388,297,AUTHORITY["EPSG","7022"]],TOWGS84[59.47,-5.04,187.44,0.47,-0.1,1.024,-4.5993],AUTHORITY["EPSG","6272"]],PRIMEM["Greenwich",0,AUTHORITY["EPSG","8901"]],UNIT["degree",0.0174532925199433,AUTHORITY["EPSG","9122"]],AUTHORITY["EPSG","4272"]],PROJECTION["Transverse_Mercator"],PARAMETER["latitude_of_origin",0],PARAMETER["central_meridian",171],PARAMETER["scale_factor",0.9996],PARAMETER["false_easting",500000],PARAMETER["false_northing",10000000],UNIT["metre",1,AUTHORITY["EPSG","9001"]],AXIS["Easting",EAST],AXIS["Northing",NORTH],AUTHORITY["EPSG","27259"]]'
@@ -117,7 +117,7 @@ def test_ogr_mitab_2():
 
 def test_ogr_mitab_3():
     if gdaltest.mapinfo_drv is None:
-        return 'skip'
+        pytest.skip()
 
     gdaltest.mapinfo_ds = ogr.Open('tmp')
     gdaltest.mapinfo_lyr = gdaltest.mapinfo_ds.GetLayer(0)
@@ -154,7 +154,7 @@ def test_ogr_mitab_3():
 def test_ogr_mitab_4():
 
     if gdaltest.mapinfo_ds is None:
-        return 'skip'
+        pytest.skip()
 
     sql_lyr = gdaltest.mapinfo_ds.ExecuteSQL(
         "select * from tpoly where prfedea = '35043413'")
@@ -177,7 +177,7 @@ def test_ogr_mitab_4():
 def test_ogr_mitab_5():
 
     if gdaltest.mapinfo_ds is None:
-        return 'skip'
+        pytest.skip()
 
     gdaltest.mapinfo_lyr.SetAttributeFilter(None)
 
@@ -198,7 +198,7 @@ def test_ogr_mitab_5():
 def test_ogr_mitab_6():
 
     if gdaltest.mapinfo_drv is None:
-        return 'skip'
+        pytest.skip()
 
     srs = gdaltest.mapinfo_lyr.GetSpatialRef()
     datum_name = srs.GetAttrValue('PROJCS|GEOGCS|DATUM')
@@ -221,7 +221,7 @@ def test_ogr_mitab_7():
 
     if gdaltest.mapinfo_ds is not None:
         return 'success'
-    return 'fail'
+    pytest.fail()
 
 ###############################################################################
 # Create table from data/poly.shp
@@ -230,7 +230,7 @@ def test_ogr_mitab_7():
 def test_ogr_mitab_8():
 
     if gdaltest.mapinfo_ds is None:
-        return 'skip'
+        pytest.skip()
 
     #######################################################
     # Create memory Layer
@@ -277,7 +277,7 @@ def test_ogr_mitab_8():
 
 def test_ogr_mitab_9():
     if gdaltest.mapinfo_drv is None:
-        return 'skip'
+        pytest.skip()
 
     gdaltest.mapinfo_ds = ogr.Open('tmp')
     gdaltest.mapinfo_lyr = gdaltest.mapinfo_ds.GetLayer(0)
@@ -311,7 +311,7 @@ def test_ogr_mitab_9():
 
 def test_ogr_mitab_10():
     if gdaltest.mapinfo_drv is None:
-        return 'skip'
+        pytest.skip()
 
     ds = ogr.Open('data/small.mif')
     lyr = ds.GetLayer(0)
@@ -346,7 +346,7 @@ def test_ogr_mitab_10():
 def test_ogr_mitab_11():
 
     if gdaltest.mapinfo_drv is None:
-        return 'skip'
+        pytest.skip()
 
     ds = ogr.Open('data/small_ntf.mif')
     srs = ds.GetLayer(0).GetSpatialRef()
@@ -365,7 +365,7 @@ def test_ogr_mitab_11():
 def test_ogr_mitab_12():
 
     if gdaltest.mapinfo_drv is None:
-        return 'skip'
+        pytest.skip()
 
     ds = gdaltest.mapinfo_drv.CreateDataSource('tmp', options=['FORMAT=MIF'])
     lyr = ds.CreateLayer('testlyrdef')
@@ -385,13 +385,13 @@ def test_ogr_mitab_12():
 def test_ogr_mitab_13():
 
     if gdaltest.mapinfo_drv is None:
-        return 'skip'
+        pytest.skip()
 
     import ogr_gml_read
     ogr_gml_read.ogr_gml_1()
 
     if test_cli_utilities.get_ogr2ogr_path() is None:
-        return 'skip'
+        pytest.skip()
 
     try:
         os.stat('tmp/testlyrdef.tab')
@@ -432,13 +432,13 @@ def test_ogr_mitab_13():
 def test_ogr_mitab_14():
 
     if gdaltest.mapinfo_drv is None:
-        return 'skip'
+        pytest.skip()
 
     import ogr_gml_read
     ogr_gml_read.ogr_gml_1()
 
     if test_cli_utilities.get_ogr2ogr_path() is None:
-        return 'skip'
+        pytest.skip()
 
     try:
         os.stat('tmp/testlyrdef.mif')
@@ -482,7 +482,7 @@ def test_ogr_mitab_14():
 def test_ogr_mitab_15():
 
     if gdaltest.mapinfo_drv is None:
-        return 'skip'
+        pytest.skip()
 
     ds = ogr.Open('data/nomid.mif')
     lyr = ds.GetLayer(0)
@@ -506,7 +506,7 @@ def test_ogr_mitab_15():
     f = lyr.GetNextFeature()
     if f.IsFieldSet(0) or f.GetGeometryRef() is None:
         f.DumpReadable()
-        return 'fail'
+        pytest.fail()
     gdal.Unlink('/vsimem/nomid.mif')
 
     return 'success'
@@ -518,7 +518,7 @@ def test_ogr_mitab_15():
 def test_ogr_mitab_16():
 
     if gdaltest.mapinfo_drv is None:
-        return 'skip'
+        pytest.skip()
 
     ds = ogr.GetDriverByName('MapInfo File').CreateDataSource('tmp/empty.mif')
     lyr = ds.CreateLayer('empty')
@@ -538,13 +538,13 @@ def test_ogr_mitab_16():
 def test_ogr_mitab_17():
 
     if gdaltest.mapinfo_drv is None:
-        return 'skip'
+        pytest.skip()
 
     import ogr_gml_read
     ogr_gml_read.ogr_gml_1()
 
     if test_cli_utilities.get_test_ogrsf_path() is None:
-        return 'skip'
+        pytest.skip()
 
     ret = gdaltest.runexternal(test_cli_utilities.get_test_ogrsf_path() + ' tmp')
     assert ret.find('INFO') != -1 and ret.find('ERROR') == -1
@@ -562,7 +562,7 @@ def test_ogr_mitab_17():
 def test_ogr_mitab_18():
 
     if gdaltest.mapinfo_drv is None:
-        return 'skip'
+        pytest.skip()
 
     ds = ogr.GetDriverByName('MapInfo File').CreateDataSource('/vsimem/ogr_mitab_18.tab')
     sr = osr.SpatialReference()
@@ -596,7 +596,7 @@ def test_ogr_mitab_18():
 def test_ogr_mitab_19():
 
     if gdaltest.mapinfo_drv is None:
-        return 'skip'
+        pytest.skip()
 
     ds = ogr.Open('data/utm31.TAB')
     lyr = ds.GetLayer(0)
@@ -604,7 +604,7 @@ def test_ogr_mitab_19():
     # Strict text comparison to check precision
     if feat.GetGeometryRef().ExportToWkt() != 'POINT (485248.12 2261.45)':
         feat.DumpReadable()
-        return 'fail'
+        pytest.fail()
 
     return 'success'
 
@@ -617,7 +617,7 @@ def test_ogr_mitab_19():
 def test_ogr_mitab_20():
 
     if gdaltest.mapinfo_drv is None:
-        return 'skip'
+        pytest.skip()
 
     # Pass i==0: without MITAB_BOUNDS_FILE
     # Pass i==1: with MITAB_BOUNDS_FILE and French bounds : first load
@@ -688,16 +688,14 @@ def test_ogr_mitab_20():
             if fmt == 'tab':
                 if i == 1 or i == 2 or i == 4:
                     if feat.GetGeometryRef().ExportToWkt() != 'POINT (700000.001 6600000.001)':
-                        print(fmt)
                         print(i)
                         feat.DumpReadable()
-                        return 'fail'
+                        pytest.fail(fmt)
                 else:
                     if feat.GetGeometryRef().ExportToWkt() == 'POINT (700000.001 6600000.001)':
-                        print(fmt)
                         print(i)
                         feat.DumpReadable()
-                        return 'fail'
+                        pytest.fail(fmt)
 
             ds = None
 
@@ -738,11 +736,10 @@ def test_ogr_mitab_20():
         else:
             expected = '49.00000000002'
         if lyr.GetSpatialRef().ExportToWkt().find(expected) < 0:
-            print(lyr.GetSpatialRef().ExportToWkt())
             print(i)
             gdal.SetConfigOption('MITAB_BOUNDS_FILE', None)
             os.unlink('tmp/mitab_bounds.txt')
-            return 'fail'
+            pytest.fail(lyr.GetSpatialRef().ExportToWkt())
         ds = None
         ogr.GetDriverByName('MapInfo File').DeleteDataSource('/vsimem/ogr_mitab_20.tab')
 
@@ -758,7 +755,7 @@ def test_ogr_mitab_20():
 def test_ogr_mitab_21():
 
     if gdaltest.mapinfo_drv is None:
-        return 'skip'
+        pytest.skip()
 
     ds = ogr.GetDriverByName('MapInfo File').CreateDataSource('/vsimem/ogr_mitab_21.tab')
     lyr = ds.CreateLayer('test')
@@ -774,7 +771,7 @@ def test_ogr_mitab_21():
     feat = lyr.GetNextFeature()
     if feat.GetField('FID') != 1:
         feat.DumpReadable()
-        return 'fail'
+        pytest.fail()
     ds = None
 
     ogr.GetDriverByName('MapInfo File').DeleteDataSource('/vsimem/ogr_mitab_21.tab')
@@ -1099,7 +1096,7 @@ def test_ogr_mitab_27():
     if f.GetField('intfield') != 0 or f.GetField('realfield') != 0 or f.GetField('stringfield') != '' or \
        f.GetGeometryRef() is not None:
         f.DumpReadable()
-        return 'fail'
+        pytest.fail()
 
     f.SetField('intfield', 1)
     f.SetField('realfield', 2.34)
@@ -1114,7 +1111,7 @@ def test_ogr_mitab_27():
     if f.GetField('intfield') != 1 or f.GetField('realfield') != 2.34 or f.GetField('stringfield') != 'foo' or \
        f.GetGeometryRef() is None:
         f.DumpReadable()
-        return 'fail'
+        pytest.fail()
 
     lyr.DeleteFeature(f.GetFID())
     ds = None
@@ -1128,7 +1125,7 @@ def test_ogr_mitab_27():
     if f.GetField('intfield') != 1 or f.GetField('realfield') != 2.34 or f.GetField('stringfield') != 'foo' or \
        f.GetGeometryRef() is None:
         f.DumpReadable()
-        return 'fail'
+        pytest.fail()
     ds = None
 
     ds = ogr.Open(filename, update=1)
@@ -1169,7 +1166,7 @@ def test_ogr_mitab_27():
     if f.GetField('intfield') != -1 or f.GetField('realfield') != 2.34 or f.GetField('stringfield') != 'foo' or \
        f.GetGeometryRef() is None:
         f.DumpReadable()
-        return 'fail'
+        pytest.fail()
 
     ds = None
 
@@ -1273,9 +1270,9 @@ def test_ogr_mitab_29():
             try:
                 os.stat('tmp/cache/compr_symb_deleted_records.tab')
             except OSError:
-                return 'skip'
+                pytest.skip()
         except OSError:
-            return 'skip'
+            pytest.skip()
 
     shutil.copy('tmp/cache/compr_symb_deleted_records.tab', 'tmp')
     shutil.copy('tmp/cache/compr_symb_deleted_records.dat', 'tmp')
@@ -1384,18 +1381,16 @@ def test_ogr_mitab_30(update=0):
             assert lyr2.GetFeatureCount() == j + 1, i
             feat2 = lyr2.GetFeature(j + 1)
             if feat2.GetField('ID') != j + 1 or feat2.GetGeometryRef().ExportToWkt() != 'POINT (%d %d)' % (j, j):
-                print(j)
                 print(i)
                 feat2.DumpReadable()
-                return 'fail'
+                pytest.fail(j)
             lyr2.ResetReading()
             for _ in range(j + 1):
                 feat2 = lyr2.GetNextFeature()
             if feat2.GetField('ID') != j + 1 or feat2.GetGeometryRef().ExportToWkt() != 'POINT (%d %d)' % (j, j):
-                print(j)
                 print(i)
                 feat2.DumpReadable()
-                return 'fail'
+                pytest.fail(j)
             ds2 = None
 
     ds = None
@@ -1774,8 +1769,7 @@ def test_ogr_mitab_36():
     got_g = f.GetGeometryRef()
     if ogrtest.check_feature_geometry(f, got_g, max_error=0.1):
         f.DumpReadable()
-        print(g)
-        return 'fail'
+        pytest.fail(g)
     while True:
         f = lyr.GetNextFeature()
         if f is None:
@@ -1833,7 +1827,7 @@ def test_ogr_mitab_38():
     f = lyr.GetNextFeature()
     if f['field1'] != '' or f['field2'] != 'foo':
         f.DumpReadable()
-        return 'fail'
+        pytest.fail()
 
     return 'success'
 
@@ -1858,7 +1852,7 @@ def test_ogr_mitab_39():
            f.GetStyleString() != f_ref.GetStyleString():
             f.DumpReadable()
             f_ref.DumpReadable()
-            return 'fail'
+            pytest.fail()
 
     return 'success'
 
@@ -1904,7 +1898,7 @@ def test_ogr_mitab_41():
            f.GetStyleString() != f_ref.GetStyleString():
             f.DumpReadable()
             f_ref.DumpReadable()
-            return 'fail'
+            pytest.fail()
 
     return 'success'
 
@@ -1929,7 +1923,7 @@ def test_ogr_mitab_42():
            f.GetStyleString() != f_ref.GetStyleString():
             f.DumpReadable()
             f_ref.DumpReadable()
-            return 'fail'
+            pytest.fail()
 
     return 'success'
 
@@ -1969,7 +1963,7 @@ def test_ogr_mitab_43():
            f.GetStyleString() != f_ref.GetStyleString():
             f.DumpReadable()
             f_ref.DumpReadable()
-            return 'fail'
+            pytest.fail()
 
     gdaltest.mapinfo_drv.DeleteDataSource('/vsimem/all_geoms_block_512.tab')
     gdaltest.mapinfo_drv.DeleteDataSource('/vsimem/all_geoms_block_32256.tab')
@@ -2031,8 +2025,7 @@ def test_ogr_mitab_45():
                                      ' for ' + dsName)
 
             if lyr.TestCapability(ogr.OLCStringsAsUTF8) != 1:
-                gdaltest.post_reason('skipping test: recode is not possible')
-                return 'skip'
+                pytest.skip('skipping test: recode is not possible')
 
             for fldName in fldNames:
                 fld_defn = ogr.FieldDefn(fldName, ogr.OFTString)
@@ -2112,8 +2105,7 @@ def test_ogr_mitab_46():
         assert lyr is not None, ('Can\'t get layer 0 from ' + dsName)
 
         if lyr.TestCapability(ogr.OLCStringsAsUTF8) != 1:
-            gdaltest.post_reason('skipping test: recode is not possible')
-            return 'skip'
+            pytest.skip('skipping test: recode is not possible')
 
         for fldN, expectedName in enumerate(fldNames):
             fldName = lyr.GetLayerDefn().GetFieldDefn(fldN).GetName()
@@ -2293,9 +2285,8 @@ def test_ogr_mitab_tab_view():
     assert lyr.GetLayerDefn().GetFieldCount() == 2, 'bad field count'
     f = lyr.GetNextFeature()
     if f['ID'] != 100 or f['foo'] != 'foo':
-        gdaltest.post_reason('bad feature')
         f.DumpReadable()
-        return 'fail'
+        pytest.fail('bad feature')
     ds = None
 
     ds = ogr.Open('data/mitab/view_select_all_first_table_second_table.tab')
@@ -2303,9 +2294,8 @@ def test_ogr_mitab_tab_view():
     assert lyr.GetLayerDefn().GetFieldCount() == 3, 'bad field count'
     f = lyr.GetNextFeature()
     if f['joint_field'] != 1 or f['ID'] != 100 or f['foo'] != 'foo':
-        gdaltest.post_reason('bad feature')
         f.DumpReadable()
-        return 'fail'
+        pytest.fail('bad feature')
     ds = None
 
     return 'success'
@@ -2339,15 +2329,15 @@ def test_ogr_mitab_style():
     f = lyr.GetNextFeature()
     if f.GetStyleString() != 'BRUSH(fc:#aabbcc,bc:#ddeeff,id:"mapinfo-brush-2,ogr-brush-0");PEN(w:1px,c:#ddeeff,id:"mapinfo-pen-2,ogr-pen-0")':
         f.DumpReadable()
-        return 'fail'
+        pytest.fail()
     f = lyr.GetNextFeature()
     if f.GetStyleString() != 'BRUSH(fc:#aabbcc,id:"mapinfo-brush-1,ogr-brush-1");PEN(w:1px,c:#000000,id:"mapinfo-pen-2,ogr-pen-0")':
         f.DumpReadable()
-        return 'fail'
+        pytest.fail()
     f = lyr.GetNextFeature()
     if f.GetStyleString() != 'BRUSH(fc:#aabbcc,id:"mapinfo-brush-1,ogr-brush-1");PEN(w:1px,c:#000000,id:"mapinfo-pen-2,ogr-pen-0")':
         f.DumpReadable()
-        return 'fail'
+        pytest.fail()
     ds = None
 
     ogr.GetDriverByName('MapInfo File').DeleteDataSource(tmpfile)
@@ -2387,7 +2377,7 @@ def test_ogr_mitab_tab_write_field_name_with_dot():
 def test_ogr_mitab_cleanup():
 
     if gdaltest.mapinfo_ds is None:
-        return 'skip'
+        pytest.skip()
 
     fl = gdal.ReadDir('/vsimem/')
     if fl is not None:
diff --git a/autotest/ogr/ogr_mongodb.py b/autotest/ogr/ogr_mongodb.py
index dd0d47259e0b..50f798eb40c1 100755
--- a/autotest/ogr/ogr_mongodb.py
+++ b/autotest/ogr/ogr_mongodb.py
@@ -39,6 +39,7 @@
 from osgeo import gdal
 from osgeo import ogr
 from osgeo import osr
+import pytest
 
 ###############################################################################
 # Test if driver is available
@@ -50,7 +51,7 @@ def test_ogr_mongodb_init():
 
     ogrtest.mongodb_drv = ogr.GetDriverByName('MongoDB')
     if ogrtest.mongodb_drv is None:
-        return 'skip'
+        pytest.skip()
 
     if 'MONGODB_TEST_HOST' in os.environ:
         ogrtest.mongodb_test_host = os.environ['MONGODB_TEST_HOST']
@@ -90,9 +91,8 @@ def test_ogr_mongodb_init():
 
     ds = ogr.Open(ogrtest.mongodb_test_uri)
     if ds is None:
-        print('cannot open %s' % ogrtest.mongodb_test_uri)
         ogrtest.mongodb_drv = None
-        return 'skip'
+        pytest.skip('cannot open %s' % ogrtest.mongodb_test_uri)
 
     return 'success'
 
@@ -102,7 +102,7 @@ def test_ogr_mongodb_init():
 
 def test_ogr_mongodb_1():
     if ogrtest.mongodb_drv is None:
-        return 'skip'
+        pytest.skip()
 
     # The below options must be used the very first time mongoDB is initialized
     # otherwise they will get ignored
@@ -252,7 +252,7 @@ def test_ogr_mongodb_1():
 
 def test_ogr_mongodb_2():
     if ogrtest.mongodb_drv is None:
-        return 'skip'
+        pytest.skip()
 
     ogrtest.mongodb_ds = ogr.Open(ogrtest.mongodb_test_uri, update=1)
     assert ogrtest.mongodb_ds.GetLayerByName('not_existing') is None
@@ -333,17 +333,17 @@ def test_ogr_mongodb_2():
     f = lyr.GetNextFeature()
     if not f.Equal(f_ref):
         f.DumpReadable()
-        return 'fail'
+        pytest.fail()
     f = lyr.GetNextFeature()
     if f is not None:
         f.DumpReadable()
-        return 'fail'
+        pytest.fail()
 
     # Test GetFeature()
     f = lyr.GetFeature(1)
     if not f.Equal(f_ref):
         f.DumpReadable()
-        return 'fail'
+        pytest.fail()
 
     # Test SetFeature()
     f['bool'] = 0
@@ -352,7 +352,7 @@ def test_ogr_mongodb_2():
     f = lyr.GetFeature(1)
     if f['bool'] != 0:
         f.DumpReadable()
-        return 'fail'
+        pytest.fail()
 
     # Test (not working) DeleteFeature()
     gdal.PushErrorHandler()
@@ -366,14 +366,14 @@ def test_ogr_mongodb_2():
     f = lyr.GetNextFeature()
     if not f.Equal(f_ref):
         f.DumpReadable()
-        return 'fail'
+        pytest.fail()
 
     lyr.SetAttributeFilter('{ "int": 2 }')
     lyr.ResetReading()
     f = lyr.GetNextFeature()
     if f is not None:
         f.DumpReadable()
-        return 'fail'
+        pytest.fail()
 
     # Test OGR filter
     lyr.SetAttributeFilter('int = 1')
@@ -381,14 +381,14 @@ def test_ogr_mongodb_2():
     f = lyr.GetNextFeature()
     if not f.Equal(f_ref):
         f.DumpReadable()
-        return 'fail'
+        pytest.fail()
 
     lyr.SetAttributeFilter('int = 2')
     lyr.ResetReading()
     f = lyr.GetNextFeature()
     if f is not None:
         f.DumpReadable()
-        return 'fail'
+        pytest.fail()
 
     # Test geometry filter
     lyr.SetAttributeFilter(None)
@@ -397,14 +397,14 @@ def test_ogr_mongodb_2():
     f = lyr.GetNextFeature()
     if not f.Equal(f_ref):
         f.DumpReadable()
-        return 'fail'
+        pytest.fail()
 
     lyr.SetSpatialFilterRect(1.1, 49.1, 1.9, 49.9)
     lyr.ResetReading()
     f = lyr.GetNextFeature()
     if f is not None:
         f.DumpReadable()
-        return 'fail'
+        pytest.fail()
 
     f = f_ref.Clone()
     f.SetFID(-1)
@@ -478,20 +478,20 @@ def test_ogr_mongodb_2():
            f.GetFieldDefnRef(i).GetSubType() != f_ref.GetFieldDefnRef(i).GetSubType():
             f.DumpReadable()
             f_ref.DumpReadable()
-            return 'fail'
+            pytest.fail()
     for i in range(f_ref.GetDefnRef().GetGeomFieldCount()):
         if not f.GetGeomFieldRef(i).Equals(f_ref.GetGeomFieldRef(i)) or \
                 f.GetGeomFieldDefnRef(i).GetName() != f_ref.GetGeomFieldDefnRef(i).GetName() or \
                 f.GetGeomFieldDefnRef(i).GetType() != f_ref.GetGeomFieldDefnRef(i).GetType():
             f.DumpReadable()
             f_ref.DumpReadable()
-            return 'fail'
+            pytest.fail()
 
     lyr.SetSpatialFilterRect(2.1, 49.1, 2.9, 49.9)
     lyr.ResetReading()
     if f is None:
         f.DumpReadable()
-        return 'fail'
+        pytest.fail()
 
     # Create a feature only from its _json content and do not store any ogr metadata related to the layer
     ogrtest.mongodb_layer_name_no_ogr_metadata = ogrtest.mongodb_layer_name + "_no_ogr_metadata"
@@ -635,7 +635,7 @@ def test_ogr_mongodb_2():
                 f.GetFieldDefnRef(j).GetSubType() != f_ref.GetFieldDefnRef(i).GetSubType():
             f.DumpReadable()
             f_ref.DumpReadable()
-            return 'fail'
+            pytest.fail()
     for i in range(f_ref.GetDefnRef().GetGeomFieldCount()):
         # Order might be a bit different...
         j = f.GetDefnRef().GetGeomFieldIndex(f_ref.GetGeomFieldDefnRef(i).GetNameRef())
@@ -644,15 +644,14 @@ def test_ogr_mongodb_2():
                 f.GetGeomFieldDefnRef(j).GetType() != f_ref.GetGeomFieldDefnRef(i).GetType():
             f.DumpReadable()
             f_ref.DumpReadable()
-            print(f.GetGeomFieldDefnRef(j).GetType())
             print(f_ref.GetGeomFieldDefnRef(i).GetType())
-            return 'fail'
+            pytest.fail(f.GetGeomFieldDefnRef(j).GetType())
 
     lyr.SetSpatialFilterRect(2.1, 49.1, 2.9, 49.9)
     lyr.ResetReading()
     if f is None:
         f.DumpReadable()
-        return 'fail'
+        pytest.fail()
 
     lyr = ogrtest.mongodb_ds.GetLayerByName(ogrtest.mongodb_layer_name_guess_types)
 
@@ -701,11 +700,11 @@ def test_ogr_mongodb_2():
        f['int64list'] != [1, 1234567890123456, 1, -9223372036854775808, 9223372036854775807, -9223372036854775808, 9223372036854775807, 1] or \
        f['int'] != -2147483648 or f['int64'] != -9223372036854775808 or f['real'] - 1 != f['real']:
         f.DumpReadable()
-        return 'fail'
+        pytest.fail()
     f = lyr.GetNextFeature()
     if f['int'] != 2147483647 or f['int64'] != 9223372036854775807 or f['real'] + 1 != f['real']:
         f.DumpReadable()
-        return 'fail'
+        pytest.fail()
 
     lyr = ogrtest.mongodb_ds.GetLayerByName(ogrtest.mongodb_layer_name_with_2d_index)
     assert lyr.TestCapability(ogr.OLCFastSpatialFilter) != 0
@@ -778,11 +777,11 @@ def test_ogr_mongodb_2():
 
 def test_ogr_mongodb_3():
     if ogrtest.mongodb_drv is None:
-        return 'skip'
+        pytest.skip()
 
     import test_cli_utilities
     if test_cli_utilities.get_test_ogrsf_path() is None:
-        return 'skip'
+        pytest.skip()
 
     ret = gdaltest.runexternal(test_cli_utilities.get_test_ogrsf_path() + ' -ro ' + ogrtest.mongodb_test_uri)
     assert ret.find('INFO') != -1 and ret.find('ERROR') == -1
@@ -795,7 +794,7 @@ def test_ogr_mongodb_3():
 
 def test_ogr_mongodb_cleanup():
     if ogrtest.mongodb_drv is None:
-        return 'skip'
+        pytest.skip()
 
     ogrtest.mongodb_ds = None
 
diff --git a/autotest/ogr/ogr_mssqlspatial.py b/autotest/ogr/ogr_mssqlspatial.py
index 3be9013ca58e..583a16f59036 100755
--- a/autotest/ogr/ogr_mssqlspatial.py
+++ b/autotest/ogr/ogr_mssqlspatial.py
@@ -48,7 +48,7 @@ def test_ogr_mssqlspatial_1():
     gdaltest.mssqlspatial_ds = None
 
     if ogr.GetDriverByName('MSSQLSpatial') is None:
-        return 'skip'
+        pytest.skip()
 
     gdaltest.mssqlspatial_dsname = gdal.GetConfigOption(
         'OGR_MSSQL_CONNECTION_STRING',
@@ -56,7 +56,7 @@ def test_ogr_mssqlspatial_1():
         'MSSQL:server=127.0.0.1;database=TestDB;driver=ODBC Driver 17 for SQL Server;UID=SA;PWD=DummyPassw0rd')
     gdaltest.mssqlspatial_ds = ogr.Open(gdaltest.mssqlspatial_dsname, update=1)
     if gdaltest.mssqlspatial_ds is None:
-        return 'skip'
+        pytest.skip()
 
     # Fetch and store the major-version number of the SQL Server engine in use
     sql_lyr = gdaltest.mssqlspatial_ds.ExecuteSQL(
@@ -85,7 +85,7 @@ def test_ogr_mssqlspatial_1():
 def test_ogr_mssqlspatial_2():
 
     if gdaltest.mssqlspatial_ds is None:
-        return 'skip'
+        pytest.skip()
 
     shp_ds = ogr.Open('data/poly.shp')
     gdaltest.shp_ds = shp_ds
@@ -140,7 +140,7 @@ def test_ogr_mssqlspatial_2():
 
 def test_ogr_mssqlspatial_3():
     if gdaltest.mssqlspatial_ds is None:
-        return 'skip'
+        pytest.skip()
 
     assert gdaltest.mssqlspatial_lyr.GetGeometryColumn() == 'ogr_geometry'
 
@@ -183,7 +183,7 @@ def test_ogr_mssqlspatial_3():
 
 def test_ogr_mssqlspatial_4():
     if gdaltest.mssqlspatial_ds is None:
-        return 'skip'
+        pytest.skip()
 
     dst_feat = ogr.Feature(
         feature_def=gdaltest.mssqlspatial_lyr.GetLayerDefn())
@@ -241,11 +241,11 @@ def test_ogr_mssqlspatial_4():
 def test_ogr_mssqlspatial_test_ogrsf():
 
     if gdaltest.mssqlspatial_ds is None:
-        return 'skip'
+        pytest.skip()
 
     import test_cli_utilities
     if test_cli_utilities.get_test_ogrsf_path() is None:
-        return 'skip'
+        pytest.skip()
 
     ret = gdaltest.runexternal(test_cli_utilities.get_test_ogrsf_path() + " -ro '" + gdaltest.mssqlspatial_dsname + "' tpoly")
 
@@ -260,7 +260,7 @@ def test_ogr_mssqlspatial_test_ogrsf():
 
 def test_ogr_mssqlspatial_create_feature_in_unregistered_table():
     if gdaltest.mssqlspatial_ds is None:
-        return 'skip'
+        pytest.skip()
 
     # Create a feature that specifies a spatial-reference system
     spatial_reference = osr.SpatialReference()
@@ -332,7 +332,7 @@ def test_ogr_mssqlspatial_create_feature_in_unregistered_table():
 def test_ogr_mssqlspatial_cleanup():
 
     if gdaltest.mssqlspatial_ds is None:
-        return 'skip'
+        pytest.skip()
 
     gdaltest.mssqlspatial_ds = None
 
diff --git a/autotest/ogr/ogr_mvt.py b/autotest/ogr/ogr_mvt.py
index e2f3b2b4cf97..887277edaac2 100644
--- a/autotest/ogr/ogr_mvt.py
+++ b/autotest/ogr/ogr_mvt.py
@@ -38,6 +38,7 @@
 from osgeo import gdal
 from osgeo import ogr
 from osgeo import osr
+import pytest
 
 ###############################################################################
 
@@ -64,7 +65,7 @@ def test_ogr_mvt_datatypes():
        f['real_value'] != 1.23456789 or \
        f['string_value'] != 'str':
         f.DumpReadable()
-        return 'fail'
+        pytest.fail()
 
     # Without metadata.json
     ds = gdal.OpenEx('data/mvt/datatypes/0/0/0.pbf',
@@ -116,7 +117,7 @@ def test_ogr_mvt_datatypes():
        f['real_value'] != 1.23456789 or \
        f['string_value'] != 'str':
         f.DumpReadable()
-        return 'fail'
+        pytest.fail()
 
     return 'success'
 
@@ -187,7 +188,7 @@ def test_ogr_mvt_with_extension_fields():
     f = lyr.GetNextFeature()
     if ogrtest.check_feature_geometry(f, 'LINESTRING (2070 2690,2082 2707)') != 0:
         f.DumpReadable()
-        return 'fail'
+        pytest.fail()
 
     return 'success'
 
@@ -201,11 +202,11 @@ def test_ogr_mvt_mixed():
     f = lyr.GetNextFeature()
     if ogrtest.check_feature_geometry(f, 'MULTIPOINT ((215246.671651058 6281289.23636264),(332653.947097085 6447616.20991119))') != 0:
         f.DumpReadable()
-        return 'fail'
+        pytest.fail()
     f = lyr.GetNextFeature()
     if ogrtest.check_feature_geometry(f, 'LINESTRING (215246.671651058 6281289.23636264,332653.947097085 6447616.20991119)') != 0:
         f.DumpReadable()
-        return 'fail'
+        pytest.fail()
 
     return 'success'
 
@@ -219,14 +220,14 @@ def test_ogr_mvt_linestring():
     f = lyr.GetNextFeature()
     if ogrtest.check_feature_geometry(f, 'MULTILINESTRING ((215246.671651058 6281289.23636264,332653.947097085 6447616.20991119))') != 0:
         f.DumpReadable()
-        return 'fail'
+        pytest.fail()
 
     ds = gdal.OpenEx('data/mvt/linestring/0/0/0.pbf', open_options=['METADATA_FILE='])
     lyr = ds.GetLayer(0)
     f = lyr.GetNextFeature()
     if ogrtest.check_feature_geometry(f, 'LINESTRING (215246.671651058 6281289.23636264,332653.947097085 6447616.20991119)') != 0:
         f.DumpReadable()
-        return 'fail'
+        pytest.fail()
 
     return 'success'
 
@@ -240,14 +241,14 @@ def test_ogr_mvt_multilinestring():
     f = lyr.GetNextFeature()
     if ogrtest.check_feature_geometry(f, 'MULTILINESTRING ((215246.671651058 6281289.23636264,332653.947097085 6447616.20991119),(440277.282922614 6623727.12308023,547900.618748143 6809621.97586978),(665307.894194175 6985732.88903883,772931.230019704 7171627.74182838))') != 0:
         f.DumpReadable()
-        return 'fail'
+        pytest.fail()
 
     ds = gdal.OpenEx('data/mvt/multilinestring/0/0/0.pbf', open_options=['METADATA_FILE='])
     lyr = ds.GetLayer(0)
     f = lyr.GetNextFeature()
     if ogrtest.check_feature_geometry(f, 'MULTILINESTRING ((215246.671651058 6281289.23636264,332653.947097085 6447616.20991119),(440277.282922614 6623727.12308023,547900.618748143 6809621.97586978),(665307.894194175 6985732.88903883,772931.230019704 7171627.74182838))') != 0:
         f.DumpReadable()
-        return 'fail'
+        pytest.fail()
 
     return 'success'
 
@@ -261,14 +262,14 @@ def test_ogr_mvt_polygon():
     f = lyr.GetNextFeature()
     if ogrtest.check_feature_geometry(f, 'MULTIPOLYGON (((332653.947097085 6447616.20991119,332653.947097085 6281289.23636264,215246.671651058 6281289.23636264,215246.671651058 6447616.20991119,332653.947097085 6447616.20991119)))') != 0:
         f.DumpReadable()
-        return 'fail'
+        pytest.fail()
 
     ds = gdal.OpenEx('data/mvt/polygon/0/0/0.pbf', open_options=['METADATA_FILE='])
     lyr = ds.GetLayer(0)
     f = lyr.GetNextFeature()
     if ogrtest.check_feature_geometry(f, 'POLYGON ((332653.947097085 6447616.20991119,332653.947097085 6281289.23636264,215246.671651058 6281289.23636264,215246.671651058 6447616.20991119,332653.947097085 6447616.20991119))') != 0:
         f.DumpReadable()
-        return 'fail'
+        pytest.fail()
 
     return 'success'
 
@@ -282,12 +283,12 @@ def test_ogr_mvt_point_polygon():
     f = lyr.GetNextFeature()
     if ogrtest.check_feature_geometry(f, 'MULTIPOINT ((215246.671651058 6281289.23636264))') != 0:
         f.DumpReadable()
-        return 'fail'
+        pytest.fail()
     lyr = ds.GetLayer(1)
     f = lyr.GetNextFeature()
     if ogrtest.check_feature_geometry(f, 'MULTIPOLYGON (((440277.282922614 450061.222543117,440277.282922614 -440277.282922614,0.0 -440277.282922614,0.0 -215246.671651058,215246.671651058 -215246.671651058,215246.671651058 225030.61127156,0.0 225030.61127156,0.0 450061.222543117,440277.282922614 450061.222543117)),((0.0 117407.275446031,0.0 -107623.335825529,-117407.275446031 -107623.335825529,-117407.275446031 117407.275446031,0.0 117407.275446031)),((107623.335825529 58703.6377230138,107623.335825529 -48919.6981025115,48919.6981025115 -48919.6981025115,48919.6981025115 58703.6377230138,107623.335825529 58703.6377230138)))') != 0:
         f.DumpReadable()
-        return 'fail'
+        pytest.fail()
 
     return 'success'
 
@@ -297,12 +298,12 @@ def test_ogr_mvt_point_polygon():
 def test_ogr_mvt_point_polygon_clip():
 
     if not ogrtest.have_geos() or gdal.GetConfigOption('OGR_MVT_CLIP') is not None:
-        return 'skip'
+        pytest.skip()
 
     if gdal.GetConfigOption('APPVEYOR') is not None:
-        return 'skip'
+        pytest.skip()
     if sys.platform == 'darwin' and gdal.GetConfigOption('TRAVIS', None) is not None:
-        return 'skip'
+        pytest.skip()
 
     ds = ogr.Open('data/mvt/point_polygon/1')
     lyr = ds.GetLayer(1)
@@ -310,7 +311,7 @@ def test_ogr_mvt_point_polygon_clip():
     if ogrtest.check_feature_geometry(f, 'MULTIPOLYGON (((445169.252732867 450061.222543117,445169.252732867 0.0,220138.641461308 0.0,220138.641461308 225030.61127156,0.0 225030.61127156,0.0 450061.222543117,445169.252732867 450061.222543117)),((107623.335825528 58703.6377230138,107623.335825528 0.0,53811.6679127641 0.0,53811.6679127641 58703.6377230138,107623.335825528 58703.6377230138)))') != 0 and \
        ogrtest.check_feature_geometry(f, 'MULTIPOLYGON (((445169.252732867 0.0,445169.252732867 -445169.252732867,0.0 -445169.252732867,0.0 -220138.641461308,220138.641461308 -220138.641461308,220138.641461308 0.0,445169.252732867 0.0)),((107623.335825528 0.0,107623.335825528 -53811.6679127641,53811.6679127641 -53811.6679127641,53811.6679127641 0.0,107623.335825528 0.0)))') != 0:
         f.DumpReadable()
-        return 'fail'
+        pytest.fail()
 
     return 'success'
 
@@ -399,28 +400,28 @@ def test_ogr_mvt_open_variants():
     f = lyr.GetNextFeature()
     if ogrtest.check_feature_geometry(f, expected_geom) != 0:
         f.DumpReadable()
-        return 'fail'
+        pytest.fail()
 
     ds = ogr.Open('MVT:data/mvt/linestring/0')
     lyr = ds.GetLayer(0)
     f = lyr.GetNextFeature()
     if ogrtest.check_feature_geometry(f, expected_geom) != 0:
         f.DumpReadable()
-        return 'fail'
+        pytest.fail()
 
     ds = ogr.Open('/vsigzip/data/mvt/linestring/0/0/0.pbf')
     lyr = ds.GetLayer(0)
     f = lyr.GetNextFeature()
     if ogrtest.check_feature_geometry(f, expected_geom) != 0:
         f.DumpReadable()
-        return 'fail'
+        pytest.fail()
 
     ds = ogr.Open('MVT:/vsigzip/data/mvt/linestring/0/0/0.pbf')
     lyr = ds.GetLayer(0)
     f = lyr.GetNextFeature()
     if ogrtest.check_feature_geometry(f, expected_geom) != 0:
         f.DumpReadable()
-        return 'fail'
+        pytest.fail()
 
     return 'success'
 
@@ -435,7 +436,7 @@ def test_ogr_mvt_xyz_options():
     f = lyr.GetNextFeature()
     if ogrtest.check_feature_geometry(f, 'POINT (-12496536.8802869 8299226.7830913)') != 0:
         f.DumpReadable()
-        return 'fail'
+        pytest.fail()
 
     return 'success'
 
@@ -446,7 +447,7 @@ def test_ogr_mvt_test_ogrsf_pbf():
 
     import test_cli_utilities
     if test_cli_utilities.get_test_ogrsf_path() is None:
-        return 'skip'
+        pytest.skip()
 
     ret = gdaltest.runexternal(test_cli_utilities.get_test_ogrsf_path() +
                                ' -ro data/mvt/datatypes/0/0/0.pbf')
@@ -462,7 +463,7 @@ def test_ogr_mvt_test_ogrsf_directory():
 
     import test_cli_utilities
     if test_cli_utilities.get_test_ogrsf_path() is None:
-        return 'skip'
+        pytest.skip()
 
     ret = gdaltest.runexternal(test_cli_utilities.get_test_ogrsf_path() +
                                ' -ro data/mvt/datatypes/0')
@@ -477,21 +478,21 @@ def test_ogr_mvt_test_ogrsf_directory():
 def test_ogr_mvt_mbtiles():
 
     if ogr.GetDriverByName('MBTILES') is None:
-        return 'skip'
+        pytest.skip()
 
     ds = ogr.Open('data/mvt/point_polygon.mbtiles')
     lyr = ds.GetLayerByName('point')
     f = lyr.GetNextFeature()
     if ogrtest.check_feature_geometry(f, 'MULTIPOINT ((220138.641461308 6276397.26655239))') != 0:
         f.DumpReadable()
-        return 'fail'
+        pytest.fail()
 
     lyr.SetSpatialFilterRect(0, 0, 10000000, 10000000)
     lyr.ResetReading()
     f = lyr.GetNextFeature()
     if ogrtest.check_feature_geometry(f, 'MULTIPOINT ((220138.641461308 6276397.26655239))') != 0:
         f.DumpReadable()
-        return 'fail'
+        pytest.fail()
 
     return 'success'
 
@@ -501,7 +502,7 @@ def test_ogr_mvt_mbtiles():
 def test_ogr_mvt_mbtiles_json_field():
 
     if ogr.GetDriverByName('MBTILES') is None:
-        return 'skip'
+        pytest.skip()
 
     ds = gdal.OpenEx('data/mvt/datatypes.mbtiles',
                      open_options=['JSON_FIELD=YES', 'CLIP=NO'])
@@ -527,7 +528,7 @@ def test_ogr_mvt_mbtiles_json_field():
 def test_ogr_mvt_mbtiles_json_field_auto():
 
     if ogr.GetDriverByName('MBTILES') is None:
-        return 'skip'
+        pytest.skip()
 
     ds = gdal.OpenEx('data/mvt/datatypes_json_field_auto.mbtiles',
                      open_options=['CLIP=NO'])
@@ -554,10 +555,10 @@ def test_ogr_mvt_mbtiles_test_ogrsf():
 
     import test_cli_utilities
     if test_cli_utilities.get_test_ogrsf_path() is None:
-        return 'skip'
+        pytest.skip()
 
     if ogr.GetDriverByName('MBTILES') is None:
-        return 'skip'
+        pytest.skip()
 
     ret = gdaltest.runexternal(test_cli_utilities.get_test_ogrsf_path() +
                                ' -ro data/mvt/point_polygon.mbtiles polygon2')
@@ -572,7 +573,7 @@ def test_ogr_mvt_mbtiles_test_ogrsf():
 def test_ogr_mvt_mbtiles_open_vector_in_raster_mode():
 
     if ogr.GetDriverByName('MBTILES') is None:
-        return 'skip'
+        pytest.skip()
 
     ds = gdal.OpenEx('data/mvt/datatypes.mbtiles', gdal.OF_RASTER)
     assert ds is None
@@ -592,7 +593,7 @@ def test_ogr_mvt_x_y_z_filename_scheme():
     f = lyr.GetNextFeature()
     if ogrtest.check_feature_geometry(f, 'LINESTRING (215246.671651058 6281289.23636264,332653.947097085 6447616.20991119)') != 0:
         f.DumpReadable()
-        return 'fail'
+        pytest.fail()
     ds = None
     gdal.Unlink(tmpfilename)
 
@@ -675,11 +676,11 @@ def test_ogr_mvt_http_start():
     gdaltest.webserver_port = 0
 
     if not gdaltest.built_against_curl():
-        return 'skip'
+        pytest.skip()
 
     (gdaltest.webserver_process, gdaltest.webserver_port) = webserver.launch(handler=webserver.DispatcherHttpHandler)
     if gdaltest.webserver_port == 0:
-        return 'skip'
+        pytest.skip()
 
     return 'success'
 
@@ -689,7 +690,7 @@ def test_ogr_mvt_http_start():
 def test_ogr_mvt_http():
 
     if gdaltest.webserver_port == 0:
-        return 'skip'
+        pytest.skip()
 
     handler = webserver.SequentialHandler()
     handler.add('GET', '/linestring/metadata.json', 200, {},
@@ -771,7 +772,7 @@ def test_ogr_mvt_http():
 def test_ogr_mvt_http_stop():
 
     if gdaltest.webserver_port == 0:
-        return 'skip'
+        pytest.skip()
 
     webserver.server_stop(gdaltest.webserver_process, gdaltest.webserver_port)
 
@@ -783,7 +784,7 @@ def test_ogr_mvt_http_stop():
 def test_ogr_mvt_write_one_layer():
 
     if not ogrtest.have_geos() or ogr.GetDriverByName('SQLITE') is None:
-        return 'skip'
+        pytest.skip()
 
     src_ds = gdal.GetDriverByName('Memory').Create('', 0, 0, 0, gdal.GDT_Unknown)
     lyr = src_ds.CreateLayer('mylayer')
@@ -887,7 +888,7 @@ def test_ogr_mvt_write_one_layer():
        out_f['boolfield'] is False or \
        ogrtest.check_feature_geometry(out_f, 'POINT (498980.920645632 997961.84129126)') != 0:
         out_f.DumpReadable()
-        return 'fail'
+        pytest.fail()
 
     out_f = out_lyr.GetNextFeature()
     if out_f['strfield'] != 'foo' or \
@@ -899,7 +900,7 @@ def test_ogr_mvt_write_one_layer():
        out_f['boolfield'] is False or \
        ogrtest.check_feature_geometry(out_f, 'MULTILINESTRING ((498980.920645632 997961.84129126,508764.860266134 1007745.78091176,518548.799886636 1017529.72053226))') != 0:
         out_f.DumpReadable()
-        return 'fail'
+        pytest.fail()
 
     out_f = out_lyr.GetNextFeature()
     if out_f['strfield'] != 'foobarbazbaw' or \
@@ -911,36 +912,36 @@ def test_ogr_mvt_write_one_layer():
        out_f.IsFieldSet('boolfield') or \
        ogrtest.check_feature_geometry(out_f, 'POLYGON ((498980.920645632 997961.84129126,508764.860266134 1007745.78091176,508764.860266134 997961.84129126,498980.920645632 997961.84129126))') != 0:
         out_f.DumpReadable()
-        return 'fail'
+        pytest.fail()
 
     out_f = out_lyr.GetNextFeature()
     if ogrtest.check_feature_geometry(out_f, 'MULTIPOINT ((498980.920645632 997961.84129126),(508764.860266134 1007745.78091176))') != 0:
         out_f.DumpReadable()
-        return 'fail'
+        pytest.fail()
 
     out_f = out_lyr.GetNextFeature()
     if ogrtest.check_feature_geometry(out_f, 'MULTILINESTRING ((498980.920645632 997961.84129126,508764.860266134 1007745.78091176),(508764.860266134 1007745.78091176,508764.860266134 997961.84129126))') != 0:
         out_f.DumpReadable()
-        return 'fail'
+        pytest.fail()
 
     out_f = out_lyr.GetNextFeature()
     if ogrtest.check_feature_geometry(out_f, 'MULTIPOLYGON (((498980.920645632 997961.84129126,508764.860266134 1007745.78091176,508764.860266134 997961.84129126,498980.920645632 997961.84129126)),((-498980.920645632 997961.84129126,-508764.860266134 997961.84129126,-508764.860266134 1007745.78091176,-498980.920645632 997961.84129126)))') != 0:
         out_f.DumpReadable()
-        return 'fail'
+        pytest.fail()
 
     out_f = out_lyr.GetNextFeature()
     if (out_f.GetGeometryRef().GetGeometryType() == ogr.wkbPoint and ogrtest.check_feature_geometry(out_f, 'POINT (498980.920645632 997961.84129126)') != 0) or \
        (out_f.GetGeometryRef().GetGeometryType() == ogr.wkbMultiLineString and ogrtest.check_feature_geometry(out_f, 'MULTILINESTRING ((498980.920645632 997961.84129126,508764.860266134 1007745.78091176,518548.799886636 1017529.72053226))') != 0) or \
        out_f.GetGeometryRef().GetGeometryType() not in (ogr.wkbPoint, ogr.wkbMultiLineString):
         out_f.DumpReadable()
-        return 'fail'
+        pytest.fail()
 
     out_f = out_lyr.GetNextFeature()
     if (out_f.GetGeometryRef().GetGeometryType() == ogr.wkbPoint and ogrtest.check_feature_geometry(out_f, 'POINT (498980.920645632 997961.84129126)') != 0) or \
        (out_f.GetGeometryRef().GetGeometryType() == ogr.wkbMultiLineString and ogrtest.check_feature_geometry(out_f, 'MULTILINESTRING ((498980.920645632 997961.84129126,508764.860266134 1007745.78091176,518548.799886636 1017529.72053226))') != 0) or \
        out_f.GetGeometryRef().GetGeometryType() not in (ogr.wkbPoint, ogr.wkbMultiLineString):
         out_f.DumpReadable()
-        return 'fail'
+        pytest.fail()
 
     out_ds = ogr.Open('/vsimem/outmvt/5')
     assert out_ds is not None
@@ -1077,7 +1078,7 @@ def test_ogr_mvt_write_one_layer():
 def test_ogr_mvt_write_conf():
 
     if not ogrtest.have_geos() or ogr.GetDriverByName('SQLITE') is None:
-        return 'skip'
+        pytest.skip()
 
     src_ds = gdal.GetDriverByName('Memory').Create('', 0, 0, 0, gdal.GDT_Unknown)
     lyr = src_ds.CreateLayer('mylayer')
@@ -1101,7 +1102,7 @@ def test_ogr_mvt_write_conf():
     out_f = out_lyr.GetNextFeature()
     if ogrtest.check_feature_geometry(out_f, 'MULTIPOINT (498980.920645632 997961.84129126)') != 0:
         out_f.DumpReadable()
-        return 'fail'
+        pytest.fail()
 
     f = gdal.VSIFOpenL('/vsimem/outmvt/metadata.json', 'rb')
     assert f is not None
@@ -1147,7 +1148,7 @@ def test_ogr_mvt_write_conf():
 def test_ogr_mvt_write_mbtiles():
 
     if not ogrtest.have_geos() or ogr.GetDriverByName('SQLITE') is None:
-        return 'skip'
+        pytest.skip()
 
     src_ds = gdal.GetDriverByName('Memory').Create('', 0, 0, 0, gdal.GDT_Unknown)
     lyr = src_ds.CreateLayer('mylayer')
@@ -1166,7 +1167,7 @@ def test_ogr_mvt_write_mbtiles():
     out_f = out_lyr.GetNextFeature()
     if ogrtest.check_feature_geometry(out_f, 'MULTIPOINT ((499898.164985053 1000102.07808325))') != 0:
         out_f.DumpReadable()
-        return 'fail'
+        pytest.fail()
     out_ds = None
 
     gdal.Unlink('/vsimem/out.mbtiles')
@@ -1179,7 +1180,7 @@ def test_ogr_mvt_write_mbtiles():
 def test_ogr_mvt_write_limitations_max_size():
 
     if not ogrtest.have_geos() or ogr.GetDriverByName('SQLITE') is None:
-        return 'skip'
+        pytest.skip()
 
     src_ds = gdal.GetDriverByName('Memory').Create('', 0, 0, 0, gdal.GDT_Unknown)
     lyr = src_ds.CreateLayer('mylayer')
@@ -1207,11 +1208,11 @@ def test_ogr_mvt_write_limitations_max_size():
     out_f = out_lyr.GetNextFeature()
     if ogrtest.check_feature_geometry(out_f, 'MULTILINESTRING ((498980.920645631 1007745.78091176,508764.860266133 1007745.78091176))') != 0:
         out_f.DumpReadable()
-        return 'fail'
+        pytest.fail()
     out_f = out_lyr.GetNextFeature()
     if ogrtest.check_feature_geometry(out_f, 'POINT (498980.920645631 1007745.78091176)') != 0:
         out_f.DumpReadable()
-        return 'fail'
+        pytest.fail()
     out_ds = None
 
     gdal.Unlink('/vsimem/out.mbtiles')
@@ -1224,7 +1225,7 @@ def test_ogr_mvt_write_limitations_max_size():
 def test_ogr_mvt_write_polygon_repaired():
 
     if not ogrtest.have_geos() or ogr.GetDriverByName('SQLITE') is None:
-        return 'skip'
+        pytest.skip()
 
     src_ds = gdal.GetDriverByName('Memory').Create('', 0, 0, 0, gdal.GDT_Unknown)
     lyr = src_ds.CreateLayer('mylayer')
@@ -1253,15 +1254,15 @@ def test_ogr_mvt_write_polygon_repaired():
     out_f = out_lyr.GetNextFeature()
     if ogrtest.check_feature_geometry(out_f, 'MULTIPOLYGON (((0 0,0.0 498980.920645632,498980.920645632 498980.920645632,498980.920645632 0.0,0 0)))') != 0:
         out_f.DumpReadable()
-        return 'fail'
+        pytest.fail()
     out_f = out_lyr.GetNextFeature()
     if ogrtest.check_feature_geometry(out_f, 'MULTIPOLYGON (((0 0,0.0 498980.920645632,498980.920645632 498980.920645632,498980.920645632 0.0,0 0)),((997961.84129126 0.0,997961.84129126 997961.84129126,1995923.68258252 997961.84129126,997961.84129126 0.0)))') != 0:
         out_f.DumpReadable()
-        return 'fail'
+        pytest.fail()
     out_f = out_lyr.GetNextFeature()
     if out_f is not None:
         out_f.DumpReadable()
-        return 'fail'
+        pytest.fail()
     out_ds = None
 
     gdal.Unlink('/vsimem/out.mbtiles')
@@ -1274,7 +1275,7 @@ def test_ogr_mvt_write_polygon_repaired():
 def test_ogr_mvt_write_conflicting_innner_ring():
 
     if not ogrtest.have_geos() or ogr.GetDriverByName('SQLITE') is None:
-        return 'skip'
+        pytest.skip()
 
     src_ds = gdal.GetDriverByName('Memory').Create('', 0, 0, 0, gdal.GDT_Unknown)
     lyr = src_ds.CreateLayer('mylayer')
@@ -1295,7 +1296,7 @@ def test_ogr_mvt_write_conflicting_innner_ring():
     out_f = out_lyr.GetNextFeature()
     if ogrtest.check_feature_geometry(out_f, 'MULTIPOLYGON (((-499898.164985052 1000102.07808325,-509987.852718695 1000102.07808325,-509987.852718695 1009886.01770375,-499898.164985052 1000102.07808325),(-502038.401777037 1001019.32242267,-509070.608379273 1008357.27713804,-509070.608379273 1001019.32242267,-502038.401777037 1001019.32242267)))') != 0:
         out_f.DumpReadable()
-        return 'fail'
+        pytest.fail()
     out_ds = None
 
     gdal.Unlink('/vsimem/out.mbtiles')
@@ -1308,7 +1309,7 @@ def test_ogr_mvt_write_conflicting_innner_ring():
 def test_ogr_mvt_write_limitations_max_size_polygon():
 
     if not ogrtest.have_geos() or ogr.GetDriverByName('SQLITE') is None:
-        return 'skip'
+        pytest.skip()
 
     src_ds = gdal.GetDriverByName('Memory').Create('', 0, 0, 0, gdal.GDT_Unknown)
     lyr = src_ds.CreateLayer('mylayer')
@@ -1330,7 +1331,7 @@ def test_ogr_mvt_write_limitations_max_size_polygon():
     out_f = out_lyr.GetNextFeature()
     if ogrtest.check_feature_geometry(out_f, 'MULTIPOLYGON (((498980.920645631 1007745.78091176,508764.860266133 1017529.72053227,508764.860266133 1007745.78091176,498980.920645631 1007745.78091176)))') != 0:
         out_f.DumpReadable()
-        return 'fail'
+        pytest.fail()
     out_ds = None
 
     gdal.Unlink('/vsimem/out.mbtiles')
@@ -1343,7 +1344,7 @@ def test_ogr_mvt_write_limitations_max_size_polygon():
 def test_ogr_mvt_write_limitations_max_features():
 
     if not ogrtest.have_geos() or ogr.GetDriverByName('SQLITE') is None:
-        return 'skip'
+        pytest.skip()
 
     src_ds = gdal.GetDriverByName('Memory').Create('', 0, 0, 0, gdal.GDT_Unknown)
     lyr = src_ds.CreateLayer('mylayer')
@@ -1367,11 +1368,11 @@ def test_ogr_mvt_write_limitations_max_features():
     out_f = out_lyr.GetNextFeature()
     if ogrtest.check_feature_geometry(out_f, 'POLYGON ((499898.164985053 1000102.07808325,509987.852718696 1100081.71108026,509987.852718696 1000102.07808325,499898.164985053 1000102.07808325))') != 0:
         out_f.DumpReadable()
-        return 'fail'
+        pytest.fail()
     out_f = out_lyr.GetNextFeature()
     if out_f is not None:
         out_f.DumpReadable()
-        return 'fail'
+        pytest.fail()
     out_ds = None
 
     gdal.Unlink('/vsimem/out.mbtiles')
@@ -1384,7 +1385,7 @@ def test_ogr_mvt_write_limitations_max_features():
 def test_ogr_mvt_write_custom_tiling_scheme():
 
     if not ogrtest.have_geos() or ogr.GetDriverByName('SQLITE') is None:
-        return 'skip'
+        pytest.skip()
 
     src_ds = gdal.GetDriverByName('Memory').Create('', 0, 0, 0, gdal.GDT_Unknown)
     srs = osr.SpatialReference()
@@ -1407,7 +1408,7 @@ def test_ogr_mvt_write_custom_tiling_scheme():
     out_f = out_lyr.GetNextFeature()
     if ogrtest.check_feature_geometry(out_f, 'MULTILINESTRING ((-40160 7944704,21024 8044800))') != 0:
         out_f.DumpReadable()
-        return 'fail'
+        pytest.fail()
     out_ds = None
 
     gdal.RmdirRecursive('/vsimem/out')
@@ -1420,7 +1421,7 @@ def test_ogr_mvt_write_custom_tiling_scheme():
 def test_ogr_mvt_write_errors():
 
     if not ogrtest.have_geos() or ogr.GetDriverByName('SQLITE') is None:
-        return 'skip'
+        pytest.skip()
 
     # Raster creation attempt
     gdal.RmdirRecursive('/vsimem/foo')
@@ -1576,7 +1577,7 @@ def test_ogr_mvt_write_errors():
 def test_ogr_mvt_write_reuse_temp_db():
 
     if not ogrtest.have_geos() or ogr.GetDriverByName('SQLITE') is None:
-        return 'skip'
+        pytest.skip()
 
     src_ds = gdal.GetDriverByName('Memory').Create('', 0, 0, 0, gdal.GDT_Unknown)
     lyr = src_ds.CreateLayer('mylayer')
diff --git a/autotest/ogr/ogr_mysql.py b/autotest/ogr/ogr_mysql.py
index 9a9088cae82e..bffbdebc0ef6 100755
--- a/autotest/ogr/ogr_mysql.py
+++ b/autotest/ogr/ogr_mysql.py
@@ -58,7 +58,7 @@ def test_ogr_mysql_1():
     try:
         ogr.GetDriverByName('MySQL')
     except:
-        return 'skip'
+        pytest.skip()
 
     val = gdal.GetConfigOption('OGR_MYSQL_CONNECTION_STRING', None)
     if val is not None:
@@ -68,7 +68,7 @@ def test_ogr_mysql_1():
 
     gdaltest.mysql_ds = ogr.Open(gdaltest.mysql_connection_string, update=1)
     if gdaltest.mysql_ds is None:
-        return 'skip'
+        pytest.skip()
 
     sql_lyr = gdaltest.mysql_ds.ExecuteSQL("SELECT VERSION()")
     f = sql_lyr.GetNextFeature()
@@ -85,7 +85,7 @@ def test_ogr_mysql_1():
 def test_ogr_mysql_2():
 
     if gdaltest.mysql_ds is None:
-        return 'skip'
+        pytest.skip()
 
     shp_ds = ogr.Open('data/poly.shp')
     gdaltest.shp_ds = shp_ds
@@ -139,7 +139,7 @@ def test_ogr_mysql_2():
 
 def test_ogr_mysql_3():
     if gdaltest.mysql_ds is None:
-        return 'skip'
+        pytest.skip()
 
     assert gdaltest.mysql_lyr.GetGeometryColumn() == 'SHAPE'
 
@@ -183,7 +183,7 @@ def test_ogr_mysql_3():
 def test_ogr_mysql_4():
 
     if gdaltest.mysql_ds is None:
-        return 'skip'
+        pytest.skip()
 
     # E. Rouault : the mySQL driver doesn't seem to like adding new features and
     # iterating over a query at the same time.
@@ -244,7 +244,7 @@ def test_ogr_mysql_4():
 def test_ogr_mysql_5():
 
     if gdaltest.mysql_ds is None:
-        return 'skip'
+        pytest.skip()
 
     # E. Rouault : unlike PostgreSQL driver : None is sorted in last position
     expect = [179, 173, 172, 171, 170, 169, 168, 166, 165, 158, None]
@@ -266,7 +266,7 @@ def test_ogr_mysql_5():
 def test_ogr_mysql_6():
 
     if gdaltest.mysql_ds is None:
-        return 'skip'
+        pytest.skip()
 
     sql_lyr = gdaltest.mysql_ds.ExecuteSQL("select * from tpoly where prfedea = '2'")
 
@@ -299,7 +299,7 @@ def test_ogr_mysql_6():
 def test_ogr_mysql_7():
 
     if gdaltest.mysql_ds is None:
-        return 'skip'
+        pytest.skip()
 
     gdaltest.mysql_lyr.SetAttributeFilter(None)
 
@@ -335,7 +335,7 @@ def test_ogr_mysql_7():
 def test_ogr_mysql_8():
 
     if gdaltest.mysql_ds is None:
-        return 'skip'
+        pytest.skip()
 
     dst_feat = ogr.Feature(feature_def=gdaltest.mysql_lyr.GetLayerDefn())
 
@@ -366,7 +366,7 @@ def test_ogr_mysql_8():
 def test_ogr_mysql_9():
 
     if gdaltest.mysql_ds is None:
-        return 'skip'
+        pytest.skip()
 
     gdaltest.mysql_lyr.SetAttributeFilter("PRFEDEA = 'CrazyKey'")
     feat = gdaltest.mysql_lyr.GetNextFeature()
@@ -380,8 +380,7 @@ def test_ogr_mysql_9():
 
     if gdaltest.mysql_lyr.SetFeature(feat) != 0:
         feat.Destroy()
-        gdaltest.post_reason('SetFeature() method failed.')
-        return 'fail'
+        pytest.fail('SetFeature() method failed.')
 
     fid = feat.GetFID()
     feat.Destroy()
@@ -401,14 +400,12 @@ def test_ogr_mysql_9():
     feat.SetFID(-10)
     if gdaltest.mysql_lyr.SetFeature(feat) != ogr.OGRERR_NON_EXISTING_FEATURE:
         feat.Destroy()
-        gdaltest.post_reason('Expected failure of SetFeature().')
-        return 'fail'
+        pytest.fail('Expected failure of SetFeature().')
 
     # Test deleting non-existing feature
     if gdaltest.mysql_lyr.DeleteFeature(-10) != ogr.OGRERR_NON_EXISTING_FEATURE:
         feat.Destroy()
-        gdaltest.post_reason('Expected failure of DeleteFeature().')
-        return 'fail'
+        pytest.fail('Expected failure of DeleteFeature().')
 
     feat.Destroy()
 
@@ -421,7 +418,7 @@ def test_ogr_mysql_9():
 def test_ogr_mysql_10():
 
     if gdaltest.mysql_ds is None:
-        return 'skip'
+        pytest.skip()
 
     gdaltest.mysql_lyr.SetAttributeFilter("PRFEDEA = 'CrazyKey'")
     feat = gdaltest.mysql_lyr.GetNextFeature()
@@ -440,8 +437,7 @@ def test_ogr_mysql_10():
         return 'success'
 
     feat.Destroy()
-    gdaltest.post_reason('DeleteFeature() seems to have had no effect.')
-    return 'fail'
+    pytest.fail('DeleteFeature() seems to have had no effect.')
 
 
 ###############################################################################
@@ -450,7 +446,7 @@ def test_ogr_mysql_10():
 def test_ogr_mysql_15():
 
     if gdaltest.mysql_ds is None:
-        return 'skip'
+        pytest.skip()
 
     expect = [169]
 
@@ -473,7 +469,7 @@ def test_ogr_mysql_15():
 def test_ogr_mysql_16():
 
     if gdaltest.mysql_ds is None:
-        return 'skip'
+        pytest.skip()
 
     expect = [169]
 
@@ -499,7 +495,7 @@ def test_ogr_mysql_16():
 def test_ogr_mysql_17():
 
     if gdaltest.mysql_ds is None:
-        return 'skip'
+        pytest.skip()
 
     count = gdaltest.mysql_ds.GetLayerCount()
     layer = gdaltest.mysql_ds.GetLayerByName('JunkTableName')
@@ -517,7 +513,7 @@ def test_ogr_mysql_17():
 def ogr_mysql_18():
 
     if gdaltest.mysql_ds is None:
-        return 'skip'
+        pytest.skip()
 
     count = gdaltest.mysql_ds.GetLayerCount()
     layer = gdaltest.mysql_ds.GetLayerByName('geometry_columns')
@@ -535,7 +531,7 @@ def ogr_mysql_18():
 def test_ogr_mysql_19():
 
     if gdaltest.mysql_ds is None:
-        return 'skip'
+        pytest.skip()
 
     layer = gdaltest.mysql_ds.GetLayerByName('tpoly')
     assert layer is not None, 'did not get tpoly layer'
@@ -561,7 +557,7 @@ def test_ogr_mysql_19():
 def test_ogr_mysql_20():
 
     if gdaltest.mysql_ds is None:
-        return 'skip'
+        pytest.skip()
 
     layer = gdaltest.mysql_ds.CreateLayer('select', options=['ENGINE=MyISAM'])
     ogrtest.quick_create_layer_def(layer,
@@ -581,7 +577,7 @@ def test_ogr_mysql_20():
     feat = layer.GetNextFeature()
     if feat.desc == 'desc' and feat.select == 'select':
         return 'success'
-    return 'fail'
+    pytest.fail()
 
 ###############################################################################
 # Test inserting NULL geometries into a table with a spatial index -> must FAIL
@@ -590,7 +586,7 @@ def test_ogr_mysql_20():
 def test_ogr_mysql_21():
 
     if gdaltest.mysql_ds is None:
-        return 'skip'
+        pytest.skip()
 
     layer = gdaltest.mysql_ds.CreateLayer('tablewithspatialindex', geom_type=ogr.wkbPoint, options=['ENGINE=MyISAM'])
     ogrtest.quick_create_layer_def(layer, [('name', ogr.OFTString)])
@@ -617,7 +613,7 @@ def test_ogr_mysql_21():
 def test_ogr_mysql_22():
 
     if gdaltest.mysql_ds is None:
-        return 'skip'
+        pytest.skip()
 
     layer = gdaltest.mysql_ds.CreateLayer('tablewithoutspatialindex', geom_type=ogr.wkbPoint,
                                           options=['SPATIAL_INDEX=NO', 'ENGINE=MyISAM'])
@@ -642,7 +638,7 @@ def test_ogr_mysql_22():
 def test_ogr_mysql_23():
 
     if gdaltest.mysql_ds is None:
-        return 'skip'
+        pytest.skip()
 
     fields = ('zero', 'widthonly', 'onedecimal', 'twentynine', 'thirtyone')
     values = (1, 2, 1.1, 0.12345678901234567890123456789, 0.1234567890123456789012345678901)
@@ -680,11 +676,11 @@ def test_ogr_mysql_23():
 def test_ogr_mysql_24():
 
     if gdaltest.mysql_ds is None:
-        return 'skip'
+        pytest.skip()
 
     import test_cli_utilities
     if test_cli_utilities.get_test_ogrsf_path() is None:
-        return 'skip'
+        pytest.skip()
 
     ret = gdaltest.runexternal(test_cli_utilities.get_test_ogrsf_path() + " '" + gdaltest.mysql_connection_string + "' tpoly")
 
@@ -699,7 +695,7 @@ def test_ogr_mysql_24():
 def test_ogr_mysql_72():
 
     if gdaltest.mysql_ds is None:
-        return 'skip'
+        pytest.skip()
 
     # Regular layer with 32 bit IDs
     lyr = gdaltest.mysql_ds.CreateLayer('ogr_mysql_72', geom_type=ogr.wkbNone)
@@ -729,7 +725,7 @@ def test_ogr_mysql_72():
     f = lyr.GetNextFeature()
     if f.GetFID() != 123456789012345:
         f.DumpReadable()
-        return 'fail'
+        pytest.fail()
 
     return 'success'
 
@@ -740,7 +736,7 @@ def test_ogr_mysql_72():
 def test_ogr_mysql_25():
 
     if gdaltest.mysql_ds is None:
-        return 'skip'
+        pytest.skip()
 
     lyr = gdaltest.mysql_ds.CreateLayer('ogr_mysql_25', geom_type=ogr.wkbPoint, options=['ENGINE=MyISAM'])
     field_defn = ogr.FieldDefn('field_not_nullable', ogr.OFTString)
@@ -791,7 +787,7 @@ def test_ogr_mysql_25():
 def test_ogr_mysql_26():
 
     if gdaltest.mysql_ds is None:
-        return 'skip'
+        pytest.skip()
 
     lyr = gdaltest.mysql_ds.CreateLayer('ogr_mysql_26', geom_type=ogr.wkbPoint, options=['ENGINE=MyISAM'])
 
@@ -859,7 +855,7 @@ def test_ogr_mysql_26():
        not f.IsFieldNull('field_nodefault') or not f.IsFieldSet('field_datetime') or \
        f.GetField('field_datetime2') != '2015/06/30 12:34:56':
         f.DumpReadable()
-        return 'fail'
+        pytest.fail()
 
     gdal.Unlink('/vsimem/ogr_gpkg_24.gpkg')
 
@@ -872,7 +868,7 @@ def test_ogr_mysql_26():
 def test_ogr_mysql_longlat():
 
     if gdaltest.mysql_ds is None:
-        return 'skip'
+        pytest.skip()
 
     srs = osr.SpatialReference()
     srs.SetFromUserInput('WGS84')
@@ -911,7 +907,7 @@ def test_ogr_mysql_longlat():
 def test_ogr_mysql_cleanup():
 
     if gdaltest.mysql_ds is None:
-        return 'skip'
+        pytest.skip()
 
     gdaltest.mysql_ds.ExecuteSQL('DROP TABLE tpoly')
     gdaltest.mysql_ds.ExecuteSQL('DROP TABLE `select`')
diff --git a/autotest/ogr/ogr_nas.py b/autotest/ogr/ogr_nas.py
index 3329ee54e695..3b1ef9f1a370 100755
--- a/autotest/ogr/ogr_nas.py
+++ b/autotest/ogr/ogr_nas.py
@@ -35,6 +35,7 @@
 import gdaltest
 import ogrtest
 from osgeo import ogr
+import pytest
 
 # Other test data :
 # http://www.lv-bw.de/alkis.info/nas-bsp.html
@@ -50,10 +51,10 @@ def test_ogr_nas_1():
 
     drv = ogr.GetDriverByName('NAS')
     if drv is None:
-        return 'skip'
+        pytest.skip()
 
     if not gdaltest.download_file('http://www.geodatenzentrum.de/gdz1/abgabe/testdaten/vektor/nas_testdaten_peine.zip', 'nas_testdaten_peine.zip'):
-        return 'skip'
+        pytest.skip()
 
     try:
         os.stat('tmp/cache/BKG_NAS_Peine.xml')
@@ -63,9 +64,9 @@ def test_ogr_nas_1():
             try:
                 os.stat('tmp/cache/BKG_NAS_Peine.xml')
             except OSError:
-                return 'skip'
+                pytest.skip()
         except OSError:
-            return 'skip'
+            pytest.skip()
 
     try:
         os.remove('tmp/cache/BKG_NAS_Peine.gfs')
@@ -83,7 +84,7 @@ def test_ogr_nas_1():
 
     if feat.GetField('name') != 'Ziegelei' or geom.ExportToWkt() != 'POINT (3575300 5805100)':
         feat.DumpReadable()
-        return 'fail'
+        pytest.fail()
 
     relation_lyr = ds.GetLayerByName('ALKIS_beziehungen')
     feat = relation_lyr.GetNextFeature()
@@ -91,7 +92,7 @@ def test_ogr_nas_1():
        feat.GetField('beziehungsart') != 'istTeilVon' or \
        feat.GetField('beziehung_zu') != 'DENIBKG1000000T6':
         feat.DumpReadable()
-        return 'fail'
+        pytest.fail()
 
     ds = None
 
@@ -106,10 +107,10 @@ def test_ogr_nas_2():
 
     drv = ogr.GetDriverByName('NAS')
     if drv is None:
-        return 'skip'
+        pytest.skip()
 
     if not gdaltest.download_file('http://trac.wheregroup.com/PostNAS/browser/trunk/demodaten/lverm_geo_rlp/gid-6.0/gm2566-testdaten-gid60-2008-11-11.xml.zip?format=raw', 'gm2566-testdaten-gid60-2008-11-11.xml.zip'):
-        return 'skip'
+        pytest.skip()
 
     try:
         os.stat('tmp/cache/gm2566-testdaten-gid60-2008-11-11.xml')
@@ -119,9 +120,9 @@ def test_ogr_nas_2():
             try:
                 os.stat('tmp/cache/gm2566-testdaten-gid60-2008-11-11.xml')
             except OSError:
-                return 'skip'
+                pytest.skip()
         except OSError:
-            return 'skip'
+            pytest.skip()
 
     try:
         os.remove('tmp/cache/gm2566-testdaten-gid60-2008-11-11.gfs')
@@ -145,8 +146,7 @@ def test_ogr_nas_2():
     expected_geom = 'CURVEPOLYGON (COMPOUNDCURVE ((350821.045 5532031.37,350924.309 5532029.513,350938.493 5532026.622,350951.435 5532021.471,350978.7 5532007.18,351026.406 5531971.088,351032.251 5531951.16199999955),(351032.251 5531951.16199999955,351080.623 5531942.67,351154.886 5531963.718),(351154.886 5531963.718,351207.689 5532019.797),(351207.689 5532019.797,351211.063 5532044.06699999981,351203.83 5532074.034,351165.959 5532114.315,351152.85 5532135.774),(351152.85 5532135.774,351141.396 5532140.355),CIRCULARSTRING (351141.396 5532140.355,351110.659 5532137.542,351080.17 5532132.74199999962),CIRCULARSTRING (351080.17 5532132.74199999962,351002.887 5532120.75,350925.682 5532108.264),CIRCULARSTRING (350925.682 5532108.264,350848.556 5532095.285,350771.515 5532081.814),(350771.515 5532081.814,350769.548 5532071.196,350812.194 5532034.716,350821.045 5532031.37)))'
     if ogrtest.check_feature_geometry(feat, expected_geom) != 0:
         geom = feat.GetGeometryRef()
-        print(geom)
-        return 'fail'
+        pytest.fail(geom)
 
     ds = None
 
@@ -161,7 +161,7 @@ def test_ogr_nas_3():
 
     drv = ogr.GetDriverByName('NAS')
     if drv is None:
-        return 'skip'
+        pytest.skip()
 
     ds = ogr.Open('data/empty_nas.xml')
     assert ds is not None, 'could not open dataset'
@@ -181,7 +181,7 @@ def test_ogr_nas_4():
 
     drv = ogr.GetDriverByName('NAS')
     if drv is None:
-        return 'skip'
+        pytest.skip()
 
     try:
         os.remove('data/delete_nas.gfs')
@@ -227,7 +227,7 @@ def test_ogr_nas_5():
 
     drv = ogr.GetDriverByName('NAS')
     if drv is None:
-        return 'skip'
+        pytest.skip()
 
     try:
         os.remove('data/replace_nas.gfs')
diff --git a/autotest/ogr/ogr_ntf.py b/autotest/ogr/ogr_ntf.py
index 9372cd91d186..8495d3018dd6 100755
--- a/autotest/ogr/ogr_ntf.py
+++ b/autotest/ogr/ogr_ntf.py
@@ -82,6 +82,7 @@
 
 
 import gdaltest
+import pytest
 
 ###############################################################################
 
@@ -89,7 +90,7 @@
 def test_ogr_ntf_1():
 
     if not gdaltest.download_file('http://www.ordnancesurvey.co.uk/oswebsite/products/strategi/sampledata/stratntf.exe', 'stratntf.exe'):
-        return 'skip'
+        pytest.skip()
 
     try:
         os.stat('tmp/cache/SS.ntf')
@@ -99,9 +100,9 @@ def test_ogr_ntf_1():
             try:
                 os.stat('tmp/cache/SS.ntf')
             except OSError:
-                return 'skip'
+                pytest.skip()
         except OSError:
-            return 'skip'
+            pytest.skip()
 
     ds = ogr.Open('tmp/cache/SS.ntf')
     assert ds.GetLayerCount() == 5
@@ -132,7 +133,7 @@ def test_ogr_ntf_1():
 def test_ogr_ntf_2():
 
     if not gdaltest.download_file('http://www.ordnancesurvey.co.uk/oswebsite/products/meridian2/sampledata/meridian2ntf.exe', 'meridian2ntf.exe'):
-        return 'skip'
+        pytest.skip()
 
     try:
         os.stat('tmp/cache/Port_Talbot_NTF/SS78.ntf')
@@ -142,9 +143,9 @@ def test_ogr_ntf_2():
             try:
                 os.stat('tmp/cache/Port_Talbot_NTF/SS78.ntf')
             except OSError:
-                return 'skip'
+                pytest.skip()
         except OSError:
-            return 'skip'
+            pytest.skip()
 
     ds = ogr.Open('tmp/cache/Port_Talbot_NTF/SS78.ntf')
     assert ds.GetLayerCount() == 5
diff --git a/autotest/ogr/ogr_oci.py b/autotest/ogr/ogr_oci.py
index e135b8570898..4da4d4c0d735 100755
--- a/autotest/ogr/ogr_oci.py
+++ b/autotest/ogr/ogr_oci.py
@@ -48,16 +48,16 @@ def test_ogr_oci_1():
     try:
         ogr.GetDriverByName('OCI')
     except:
-        return 'skip'
+        pytest.skip()
 
     if 'OCI_DSNAME' not in os.environ:
-        return 'skip'
+        pytest.skip()
 
     gdaltest.oci_ds = ogr.Open(os.environ['OCI_DSNAME'])
 
     if gdaltest.oci_ds is not None:
         return 'success'
-    return 'fail'
+    pytest.fail()
 
 ###############################################################################
 # Create Oracle table from data/poly.shp
@@ -66,7 +66,7 @@ def test_ogr_oci_1():
 def test_ogr_oci_2():
 
     if gdaltest.oci_ds is None:
-        return 'skip'
+        pytest.skip()
 
     gdal.PushErrorHandler('CPLQuietErrorHandler')
     gdaltest.oci_ds.ExecuteSQL('DELLAYER:tpoly')
@@ -141,7 +141,7 @@ def reverse_rings(poly):
 
 def test_ogr_oci_3():
     if gdaltest.oci_ds is None:
-        return 'skip'
+        pytest.skip()
 
     expect = [168, 169, 166, 158, 165]
 
@@ -185,7 +185,7 @@ def test_ogr_oci_3():
 def test_ogr_oci_4():
 
     if gdaltest.oci_ds is None:
-        return 'skip'
+        pytest.skip()
 
     wkt_list = ['10', '2', '1', '3d_1', '4', '5', '6']
 
@@ -222,7 +222,7 @@ def test_ogr_oci_4():
 def test_ogr_oci_5():
 
     if gdaltest.oci_ds is None:
-        return 'skip'
+        pytest.skip()
 
     expect = [None, 179, 173, 172, 171, 170, 169, 168, 166, 165, 158]
 
@@ -242,7 +242,7 @@ def test_ogr_oci_5():
 def test_ogr_oci_6():
 
     if gdaltest.oci_ds is None:
-        return 'skip'
+        pytest.skip()
 
     sql_lyr = gdaltest.oci_ds.ExecuteSQL("select * from tpoly where prfedea = '2'")
     assert sql_lyr.GetLayerDefn().GetGeomFieldCount() == 1
@@ -266,7 +266,7 @@ def test_ogr_oci_6():
 def test_ogr_oci_7():
 
     if gdaltest.oci_ds is None:
-        return 'skip'
+        pytest.skip()
 
     gdaltest.oci_lyr.SetAttributeFilter(None)
 
@@ -290,7 +290,7 @@ def test_ogr_oci_7():
 def test_ogr_oci_8():
 
     if gdaltest.oci_ds is None:
-        return 'skip'
+        pytest.skip()
 
     #######################################################
     # Preclean.
@@ -335,7 +335,7 @@ def test_ogr_oci_8():
 def test_ogr_oci_9():
 
     if gdaltest.oci_ds is None:
-        return 'skip'
+        pytest.skip()
 
     #######################################################
     # Preclean.
@@ -377,7 +377,7 @@ def test_ogr_oci_9():
 def test_ogr_oci_10():
 
     if gdaltest.oci_ds is None:
-        return 'skip'
+        pytest.skip()
 
     # Create a test table.
     gdal.PushErrorHandler('CPLQuietErrorHandler')
@@ -425,7 +425,7 @@ def test_ogr_oci_10():
 def test_ogr_oci_11():
 
     if gdaltest.oci_ds is None:
-        return 'skip'
+        pytest.skip()
 
     # insert a rectangle geometry.
     gdaltest.oci_ds.ExecuteSQL("""
@@ -464,7 +464,7 @@ def test_ogr_oci_11():
 def test_ogr_oci_12():
 
     if gdaltest.oci_ds is None:
-        return 'skip'
+        pytest.skip()
 
     # insert a rectangle geometry.
     gdaltest.oci_ds.ExecuteSQL("""
@@ -502,7 +502,7 @@ def test_ogr_oci_12():
 def test_ogr_oci_13():
 
     if gdaltest.oci_ds is None:
-        return 'skip'
+        pytest.skip()
 
     # insert a rectangle geometry.
     gdaltest.oci_ds.ExecuteSQL("""
@@ -541,7 +541,7 @@ def test_ogr_oci_13():
 def test_ogr_oci_14():
 
     if gdaltest.oci_ds is None:
-        return 'skip'
+        pytest.skip()
 
     # insert a rectangle geometry.
     gdaltest.oci_ds.ExecuteSQL("""
@@ -580,7 +580,7 @@ def test_ogr_oci_14():
 def test_ogr_oci_15():
 
     if gdaltest.oci_ds is None:
-        return 'skip'
+        pytest.skip()
 
     # insert a rectangle geometry.
     gdaltest.oci_ds.ExecuteSQL("""
@@ -619,7 +619,7 @@ def test_ogr_oci_15():
 def test_ogr_oci_16():
 
     if gdaltest.oci_ds is None:
-        return 'skip'
+        pytest.skip()
 
     target_index = -1
     lc = gdaltest.oci_ds.GetLayerCount()
@@ -649,7 +649,7 @@ def test_ogr_oci_16():
 def test_ogr_oci_17():
 
     if gdaltest.oci_ds is None:
-        return 'skip'
+        pytest.skip()
 
     gdaltest.oci_ds.ExecuteSQL('DELLAYER:xpoly')
 
@@ -717,7 +717,7 @@ def test_ogr_oci_17():
 def test_ogr_oci_18():
 
     if gdaltest.oci_ds is None:
-        return 'skip'
+        pytest.skip()
 
     wkts = ['POINT (0 1)', 'LINESTRING (0 1,2 3)', 'POLYGON ((0 0,1 0,1 1,0 1,0 0))',
             'MULTIPOINT (0 1)', 'MULTILINESTRING ((0 1,2 3))', 'MULTIPOLYGON (((0 0,1 0,1 1,0 1,0 0)))',
@@ -777,7 +777,7 @@ def test_ogr_oci_18():
 def test_ogr_oci_19():
 
     if gdaltest.oci_ds is None:
-        return 'skip'
+        pytest.skip()
 
     lyr = gdaltest.oci_ds.CreateLayer('testdate', geom_type=ogr.wkbNone)
     lyr.CreateField(ogr.FieldDefn('MYDATE', ogr.OFTDate))
@@ -794,7 +794,7 @@ def test_ogr_oci_19():
     f = sql_lyr.GetNextFeature()
     if f.GetField(0) != '2015/02/03' or f.GetField(1) != '2015/02/03 11:33:44':
         f.DumpReadable()
-        return 'fail'
+        pytest.fail()
     gdaltest.oci_ds.ReleaseResultSet(sql_lyr)
 
     return 'success'
@@ -806,7 +806,7 @@ def test_ogr_oci_19():
 def test_ogr_oci_20():
 
     if gdaltest.oci_ds is None:
-        return 'skip'
+        pytest.skip()
     lyr = gdaltest.oci_ds.CreateLayer('ogr_oci_20', geom_type=ogr.wkbPoint, options=['GEOMETRY_NULLABLE=NO', 'DIM=2'])
     assert lyr.GetLayerDefn().GetGeomFieldDefn(0).IsNullable() == 0
     field_defn = ogr.FieldDefn('field_not_nullable', ogr.OFTString)
@@ -879,7 +879,7 @@ def test_ogr_oci_20():
 def test_ogr_oci_21():
 
     if gdaltest.oci_ds is None:
-        return 'skip'
+        pytest.skip()
 
     lyr = gdaltest.oci_ds.CreateLayer('ogr_oci_21', geom_type=ogr.wkbPoint, options=['DIM=2'])
 
@@ -952,7 +952,7 @@ def test_ogr_oci_21():
     f = lyr.GetNextFeature()
     if f.GetField('field_string') != 'c':
         f.DumpReadable()
-        return 'fail'
+        pytest.fail()
 
     f = lyr.GetNextFeature()
     if f.GetField('field_string') != 'a\'b' or f.GetField('field_int') != 123 or \
@@ -960,7 +960,7 @@ def test_ogr_oci_21():
        not f.IsFieldNull('field_nodefault') or not f.IsFieldSet('field_datetime') or \
        f.GetField('field_datetime2') != '2015/06/30 12:34:56':
         f.DumpReadable()
-        return 'fail'
+        pytest.fail()
 
     gdal.Unlink('/vsimem/ogr_gpkg_24.gpkg')
 
@@ -973,7 +973,7 @@ def test_ogr_oci_21():
 def test_ogr_oci_cleanup():
 
     if gdaltest.oci_ds is None:
-        return 'skip'
+        pytest.skip()
 
     gdaltest.oci_ds.ExecuteSQL('DELLAYER:tpoly')
     gdaltest.oci_ds.ExecuteSQL('DELLAYER:xpoly')
diff --git a/autotest/ogr/ogr_odbc.py b/autotest/ogr/ogr_odbc.py
index 75b5b1ec711a..f2dd88c6096b 100755
--- a/autotest/ogr/ogr_odbc.py
+++ b/autotest/ogr/ogr_odbc.py
@@ -36,6 +36,7 @@
 
 import gdaltest
 import ogrtest
+import pytest
 
 ###############################################################################
 # Basic testing
@@ -45,16 +46,16 @@ def test_ogr_odbc_1():
 
     ogrtest.odbc_drv = None
     if sys.platform != 'win32':
-        return 'skip'
+        pytest.skip()
 
     ogrtest.odbc_drv = ogr.GetDriverByName('ODBC')
     if ogrtest.odbc_drv is None:
-        return 'skip'
+        pytest.skip()
 
     ds = ogrtest.odbc_drv.Open('data/empty.mdb')
     if ds is None:
         ogrtest.odbc_drv = None
-        return 'skip'
+        pytest.skip()
 
     ds = None
 
@@ -97,7 +98,7 @@ def test_ogr_odbc_1():
     feat = lyr.GetNextFeature()
     if feat.GetField('intfield') != 1 or feat.GetField('doublefield') != 2.34 or feat.GetField('stringfield') != 'foo':
         feat.DumpReadable()
-        return 'fail'
+        pytest.fail()
 
     lyr = ds.GetLayerByName('test_with_pk')
     # Test GetFeatureCount()
@@ -107,21 +108,21 @@ def test_ogr_odbc_1():
     feat = lyr.GetFeature(4)
     if feat.GetField('intfield') != 5:
         feat.DumpReadable()
-        return 'fail'
+        pytest.fail()
 
     # Test SetAttributeFilter()
     lyr.SetAttributeFilter('intfield = 6')
     feat = lyr.GetNextFeature()
     if feat.GetFID() != 5:
         feat.DumpReadable()
-        return 'fail'
+        pytest.fail()
 
     # Test ExecuteSQL()
     sql_lyr = ds.ExecuteSQL("SELECT * FROM test")
     feat = sql_lyr.GetNextFeature()
     if feat.GetField('intfield') != 1 or feat.GetField('doublefield') != 2.34 or feat.GetField('stringfield') != 'foo':
         feat.DumpReadable()
-        return 'fail'
+        pytest.fail()
     ds.ReleaseResultSet(sql_lyr)
 
     ds = None
@@ -134,11 +135,11 @@ def test_ogr_odbc_1():
 
 def test_ogr_odbc_2():
     if ogrtest.odbc_drv is None:
-        return 'skip'
+        pytest.skip()
 
     import test_cli_utilities
     if test_cli_utilities.get_test_ogrsf_path() is None:
-        return 'skip'
+        pytest.skip()
 
     ret = gdaltest.runexternal(test_cli_utilities.get_test_ogrsf_path() + ' tmp/odbc.mdb')
 
@@ -152,7 +153,7 @@ def test_ogr_odbc_2():
 
 def test_ogr_odbc_cleanup():
     if ogrtest.odbc_drv is None:
-        return 'skip'
+        pytest.skip()
 
     gdal.Unlink('tmp/odbc.mdb')
 
diff --git a/autotest/ogr/ogr_ods.py b/autotest/ogr/ogr_ods.py
index 332183e1454f..cd658de64519 100755
--- a/autotest/ogr/ogr_ods.py
+++ b/autotest/ogr/ogr_ods.py
@@ -36,6 +36,7 @@
 import gdaltest
 from osgeo import gdal
 from osgeo import ogr
+import pytest
 
 ###############################################################################
 # Check
@@ -87,12 +88,12 @@ def ogr_ods_check(ds):
        feat.GetFieldAsString(4) != '2012/01/22' or \
        feat.GetFieldAsString(5) != '2012/01/22 18:49:00':
         feat.DumpReadable()
-        return 'fail'
+        pytest.fail()
 
     feat = lyr.GetNextFeature()
     if feat.IsFieldSet(2):
         feat.DumpReadable()
-        return 'fail'
+        pytest.fail()
 
     return 'success'
 
@@ -104,7 +105,7 @@ def test_ogr_ods_1():
 
     drv = ogr.GetDriverByName('ODS')
     if drv is None:
-        return 'skip'
+        pytest.skip()
 
     assert drv.TestCapability("foo") == 0
 
@@ -121,7 +122,7 @@ def test_ogr_ods_kspread_1():
 
     drv = ogr.GetDriverByName('ODS')
     if drv is None:
-        return 'skip'
+        pytest.skip()
 
     assert drv.TestCapability("foo") == 0
 
@@ -173,12 +174,12 @@ def test_ogr_ods_kspread_1():
        feat.GetFieldAsString(4) != '2012/01/22' or \
        feat.GetFieldAsString(5) != '22/01/2012 18:49:00':  # 2012/01/22 18:49:00
         feat.DumpReadable()
-        return 'fail'
+        pytest.fail()
 
     feat = lyr.GetNextFeature()
     if feat.IsFieldSet(2):
         feat.DumpReadable()
-        return 'fail'
+        pytest.fail()
 
     return 'success'
 
@@ -190,7 +191,7 @@ def test_ogr_ods_2():
 
     drv = ogr.GetDriverByName('ODS')
     if drv is None:
-        return 'skip'
+        pytest.skip()
 
     gdal.SetConfigOption('OGR_ODS_HEADERS', 'DISABLE')
     ds = ogr.Open('data/test.ods')
@@ -211,7 +212,7 @@ def test_ogr_ods_3():
 
     drv = ogr.GetDriverByName('ODS')
     if drv is None:
-        return 'skip'
+        pytest.skip()
 
     gdal.SetConfigOption('OGR_ODS_FIELD_TYPES', 'STRING')
     ds = ogr.Open('data/test.ods')
@@ -232,11 +233,11 @@ def test_ogr_ods_4():
 
     drv = ogr.GetDriverByName('ODS')
     if drv is None:
-        return 'skip'
+        pytest.skip()
 
     import test_cli_utilities
     if test_cli_utilities.get_test_ogrsf_path() is None:
-        return 'skip'
+        pytest.skip()
 
     ret = gdaltest.runexternal(test_cli_utilities.get_test_ogrsf_path() + ' -ro data/test.ods')
 
@@ -252,11 +253,11 @@ def test_ogr_ods_5():
 
     drv = ogr.GetDriverByName('ODS')
     if drv is None:
-        return 'skip'
+        pytest.skip()
 
     import test_cli_utilities
     if test_cli_utilities.get_ogr2ogr_path() is None:
-        return 'skip'
+        pytest.skip()
 
     gdaltest.runexternal(test_cli_utilities.get_ogr2ogr_path() + ' -f ODS tmp/test.ods data/test.ods')
 
@@ -276,7 +277,7 @@ def test_ogr_ods_6():
 
     drv = ogr.GetDriverByName('ODS')
     if drv is None:
-        return 'skip'
+        pytest.skip()
 
     src_ds = ogr.Open('ODS:data/content_formulas.xml')
     filepath = '/vsimem/content_formulas.csv'
@@ -319,7 +320,7 @@ def test_ogr_ods_7():
 
     drv = ogr.GetDriverByName('ODS')
     if drv is None:
-        return 'skip'
+        pytest.skip()
 
     filepath = 'tmp/ogr_ods_7.ods'
     if os.path.exists(filepath):
@@ -330,9 +331,8 @@ def test_ogr_ods_7():
     lyr = ds.GetLayerByName('Feuille7')
     feat = lyr.GetNextFeature()
     if feat.GetFID() != 2:
-        gdaltest.post_reason('did not get expected FID')
         feat.DumpReadable()
-        return 'fail'
+        pytest.fail('did not get expected FID')
     feat.SetField(0, 'modified_value')
     lyr.SetFeature(feat)
     feat = None
@@ -342,13 +342,11 @@ def test_ogr_ods_7():
     lyr = ds.GetLayerByName('Feuille7')
     feat = lyr.GetNextFeature()
     if feat.GetFID() != 2:
-        gdaltest.post_reason('did not get expected FID')
         feat.DumpReadable()
-        return 'fail'
+        pytest.fail('did not get expected FID')
     if feat.GetField(0) != 'modified_value':
-        gdaltest.post_reason('did not get expected value')
         feat.DumpReadable()
-        return 'fail'
+        pytest.fail('did not get expected value')
     feat = None
     ds = None
 
@@ -364,7 +362,7 @@ def test_ogr_ods_8():
 
     drv = ogr.GetDriverByName('ODS')
     if drv is None:
-        return 'skip'
+        pytest.skip()
 
     ds = drv.CreateDataSource('/vsimem/ogr_ods_8.ods')
     lyr = ds.CreateLayer('foo')
@@ -401,7 +399,7 @@ def test_ogr_ods_9():
 
     drv = ogr.GetDriverByName('ODS')
     if drv is None:
-        return 'skip'
+        pytest.skip()
 
     ds = drv.CreateDataSource('/vsimem/ogr_ods_9.ods')
     lyr = ds.CreateLayer('foo')
@@ -423,13 +421,13 @@ def test_ogr_ods_9():
     f = lyr.GetNextFeature()
     if f.GetField(0) != '2015/12/23 12:34:56.789':
         f.DumpReadable()
-        return 'fail'
+        pytest.fail()
     if f.GetField(1) != '2015/12/23 12:34:56':
         f.DumpReadable()
-        return 'fail'
+        pytest.fail()
     if f.GetField(2) != '2015/12/23 12:34:56':
         f.DumpReadable()
-        return 'fail'
+        pytest.fail()
     ds = None
 
     gdal.Unlink('/vsimem/ogr_ods_9.ods')
@@ -444,7 +442,7 @@ def test_ogr_ods_boolean():
 
     drv = ogr.GetDriverByName('ODS')
     if drv is None:
-        return 'skip'
+        pytest.skip()
 
     out_filename = '/vsimem/ogr_ods_boolean.ods'
     ds = drv.CreateDataSource(out_filename)
diff --git a/autotest/ogr/ogr_ogdi.py b/autotest/ogr/ogr_ogdi.py
index 572be8290b2b..1b42fcd888d8 100755
--- a/autotest/ogr/ogr_ogdi.py
+++ b/autotest/ogr/ogr_ogdi.py
@@ -35,6 +35,7 @@
 
 import gdaltest
 import ogrtest
+import pytest
 
 ###############################################################################
 
@@ -45,16 +46,15 @@ def test_ogr_ogdi_1():
 
     # Skip tests when -fsanitize is used because of memleaks in libogdi
     if gdaltest.is_travis_branch('sanitize'):
-        print('Skipping because of memory leaks in OGDI')
         ogrtest.ogdi_drv = None
-        return 'skip'
+        pytest.skip('Skipping because of memory leaks in OGDI')
 
     ogrtest.ogdi_drv = ogr.GetDriverByName('OGDI')
     if ogrtest.ogdi_drv is None:
-        return 'skip'
+        pytest.skip()
 
     if not gdaltest.download_file('http://freefr.dl.sourceforge.net/project/ogdi/OGDI_Test_Suite/3.1/ogdits-3.1.0.zip', 'ogdits-3.1.0.zip'):
-        return 'skip'
+        pytest.skip()
 
     try:
         os.stat('tmp/cache/ogdits-3.1')
@@ -64,9 +64,9 @@ def test_ogr_ogdi_1():
             try:
                 os.stat('tmp/cache/ogdits-3.1')
             except OSError:
-                return 'skip'
+                pytest.skip()
         except OSError:
-            return 'skip'
+            pytest.skip()
 
     url_name = 'gltp:/vrf/' + os.getcwd() + '/tmp/cache/ogdits-3.1/data/vpf/vm2alv2/texash'
 
@@ -106,11 +106,11 @@ def test_ogr_ogdi_1():
 def test_ogr_ogdi_2():
 
     if ogrtest.ogdi_ds is None:
-        return 'skip'
+        pytest.skip()
 
     import test_cli_utilities
     if test_cli_utilities.get_test_ogrsf_path() is None:
-        return 'skip'
+        pytest.skip()
 
     url_name = 'gltp:/vrf/' + os.getcwd() + '/tmp/cache/ogdits-3.1/data/vpf/vm2alv2/texash'
 
@@ -127,7 +127,7 @@ def test_ogr_ogdi_2():
 def test_ogr_ogdi_3():
 
     if ogrtest.ogdi_ds is None:
-        return 'skip'
+        pytest.skip()
 
     lyr0 = ogrtest.ogdi_ds.GetLayer(0)
     lyr0.ResetReading()
@@ -165,7 +165,7 @@ def test_ogr_ogdi_3():
 def test_ogr_ogdi_4():
 
     if ogrtest.ogdi_drv is None:
-        return 'skip'
+        pytest.skip()
 
     url_name = 'gltp:/vrf/' + os.getcwd() + '/data/vm2alv2_texash/texash'
     ds = ogr.Open(url_name)
@@ -184,9 +184,8 @@ def test_ogr_ogdi_4():
     feat = lyr.GetNextFeature()
 
     if feat['id'] != 1 or feat['f_code'] != 'FA001' or feat['acc'] != 1:
-        gdaltest.post_reason('bad attributes')
         feat.DumpReadable()
-        return 'fail'
+        pytest.fail('bad attributes')
 
     wkt = 'POLYGON ((-97.6672973632812 31.250171661377,-97.5832977294922 31.250171661377,-97.5780029296875 31.250171661377,-97.5780029296875 31.250171661377,-97.5780944824219 31.2494583129883,-97.5779724121094 31.2492084503174,-97.577751159668 31.24880027771,-97.5776443481445 31.2484683990479,-97.5775451660156 31.2482070922852,-97.5774078369141 31.2479457855225,-97.5772705078125 31.2477989196777,-97.5771331787109 31.2477321624756,-97.5768661499023 31.2476787567139,-97.5766830444336 31.2476959228516,-97.5763168334961 31.2477016448975,-97.576042175293 31.247673034668,-97.5757141113281 31.2475509643555,-97.5754852294922 31.2473278045654,-97.5752792358398 31.2470207214356,-97.5751190185547 31.2467250823975,-97.5750122070312 31.2465076446533,-97.5748443603516 31.2462825775147,-97.5746002197266 31.2460918426514,-97.5742874145508 31.2459144592285,-97.5739288330078 31.2458171844482,-97.5736083984375 31.2457542419434,-97.5731201171875 31.2456817626953,-97.5728302001953 31.245641708374,-97.5724792480469 31.2455806732178,-97.5721817016602 31.2454471588135,-97.5719223022461 31.2453022003174,-97.5717086791992 31.2450218200684,-97.5715408325195 31.2446899414062,-97.5713882446289 31.2445201873779,-97.5711669921875 31.2442722320557,-97.5710678100586 31.2440910339355,-97.5711975097656 31.2438926696777,-97.5713577270508 31.2437191009521,-97.5718154907227 31.2434253692627,-97.5724258422852 31.2431831359863,-97.5726470947266 31.2430419921875,-97.5728530883789 31.2427291870117,-97.5728759765625 31.2424869537354,-97.57275390625 31.2423858642578,-97.5727996826172 31.2423534393311,-97.5712738037109 31.2422771453857,-97.5710067749023 31.2422466278076,-97.5707092285156 31.2421951293945,-97.5702285766602 31.2420444488525,-97.5701599121094 31.242000579834,-97.5701599121094 31.242000579834,-97.5794296264648 31.2372093200684,-97.5909194946289 31.2314224243164,-97.6050415039062 31.2241363525391,-97.6213302612305 31.2157878875732,-97.6490707397461 31.201566696167,-97.6662445068359 31.1928386688232,-97.6803207397461 31.1855792999268,-97.6936721801758 31.1787204742432,-97.7042617797852 31.1732997894287,-97.7107391357422 31.1699485778809,-97.7178192138672 31.1663246154785,-97.7325134277344 31.1587982177734,-97.7502975463867 31.1499614715576,-97.7502975463867 31.1499614715576,-97.7502975463867 31.1671733856201,-97.7502975463867 31.1671733856201,-97.7502975463867 31.250171661377,-97.6672973632812 31.250171661377))'
     ref_geom = ogr.CreateGeometryFromWkt(wkt)
@@ -210,11 +209,11 @@ def test_ogr_ogdi_4():
 def test_ogr_ogdi_5():
 
     if ogrtest.ogdi_drv is None:
-        return 'skip'
+        pytest.skip()
 
     import test_cli_utilities
     if test_cli_utilities.get_test_ogrsf_path() is None:
-        return 'skip'
+        pytest.skip()
 
     url_name = 'gltp:/vrf/' + os.getcwd() + '/data/vm2alv2_texash/texash'
 
@@ -230,7 +229,7 @@ def test_ogr_ogdi_5():
 def test_ogr_ogdi_cleanup():
 
     if ogrtest.ogdi_ds is None:
-        return 'skip'
+        pytest.skip()
 
     ogrtest.ogdi_ds = None
     return 'success'
diff --git a/autotest/ogr/ogr_openfilegdb.py b/autotest/ogr/ogr_openfilegdb.py
index 2917def1587b..538e33c5f534 100755
--- a/autotest/ogr/ogr_openfilegdb.py
+++ b/autotest/ogr/ogr_openfilegdb.py
@@ -311,8 +311,7 @@ def test_ogr_openfilegdb_1(filename='data/testopenfilegdb.gdb.zip', version10=Tr
                 geom = geom.ExportToWkt()
             if geom != expected_wkt and ogrtest.check_feature_geometry(feat, expected_wkt) == 1:
                 feat.DumpReadable()
-                print(expected_wkt)
-                return 'fail'
+                pytest.fail(expected_wkt)
 
         if feat.GetField('id') != 1 or \
            feat.GetField('smallint') != -13 or \
@@ -325,7 +324,7 @@ def test_ogr_openfilegdb_1(filename='data/testopenfilegdb.gdb.zip', version10=Tr
            feat.GetField('binary') != "00FF7F" or \
            feat.GetField('binary2') != "123456":
             feat.DumpReadable()
-            return 'fail'
+            pytest.fail()
 
         if version10:
             sql_lyr = ds.ExecuteSQL("GetLayerDefinition %s" % lyr.GetName())
@@ -372,13 +371,11 @@ def test_ogr_openfilegdb_1(filename='data/testopenfilegdb.gdb.zip', version10=Tr
                 expected_wkt = data[2]
             if expected_wkt is None:
                 if feat.GetGeometryRef() is not None:
-                    print(data)
                     feat.DumpReadable()
-                    return 'fail'
+                    pytest.fail(data)
             elif ogrtest.check_feature_geometry(feat, expected_wkt) != 0:
-                print(data)
                 feat.DumpReadable()
-                return 'fail'
+                pytest.fail(data)
 
     ds = None
 
@@ -400,7 +397,7 @@ def test_ogr_openfilegdb_2(filename='data/testopenfilegdb.gdb.zip'):
 
     import test_cli_utilities
     if test_cli_utilities.get_test_ogrsf_path() is None:
-        return 'skip'
+        pytest.skip()
 
     ret = gdaltest.runexternal(test_cli_utilities.get_test_ogrsf_path() + ' -ro ' + filename)
 
@@ -639,11 +636,11 @@ def test_ogr_openfilegdb_5():
     try:
         gdaltest.unzip('tmp/', 'data/testopenfilegdb.gdb.zip')
     except OSError:
-        return 'skip'
+        pytest.skip()
     try:
         os.stat('tmp/testopenfilegdb.gdb')
     except OSError:
-        return 'skip'
+        pytest.skip()
 
     ds = ogr.Open('tmp/testopenfilegdb.gdb')
     assert ds is not None
@@ -682,7 +679,7 @@ def test_ogr_openfilegdb_6():
        feat.IsFieldSet('AVG_nullint'):
         feat.DumpReadable()
         ds.ReleaseResultSet(sql_lyr)
-        return 'fail'
+        pytest.fail()
     ds.ReleaseResultSet(sql_lyr)
 
     # No index
@@ -692,7 +689,7 @@ def test_ogr_openfilegdb_6():
        feat.GetField('AVG_id') != 3.0:
         feat.DumpReadable()
         ds.ReleaseResultSet(sql_lyr)
-        return 'fail'
+        pytest.fail()
     ds.ReleaseResultSet(sql_lyr)
 
     return 'success'
@@ -737,21 +734,18 @@ def test_ogr_openfilegdb_7():
         if expected_optimized is None:
             if sql_lyr is not None:
                 ds.ReleaseResultSet(sql_lyr)
-                print(sql, feat_count, first_fid)
-                return 'fail'
+                pytest.fail(sql, feat_count, first_fid)
             continue
         assert sql_lyr is not None, (sql, feat_count, first_fid)
         if expected_optimized:
             if sql_lyr.GetFeatureCount() != feat_count:
-                print(sql, feat_count, first_fid)
                 ds.ReleaseResultSet(sql_lyr)
-                return 'fail'
+                pytest.fail(sql, feat_count, first_fid)
             feat = sql_lyr.GetNextFeature()
             if feat.GetFID() != first_fid:
-                print(sql, feat_count, first_fid)
                 ds.ReleaseResultSet(sql_lyr)
                 feat.DumpReadable()
-                return 'fail'
+                pytest.fail(sql, feat_count, first_fid)
         ds.ReleaseResultSet(sql_lyr)
 
         sql_lyr = ds.ExecuteSQL('GetLastSQLUsedOptimizedImplementation')
@@ -800,7 +794,7 @@ def test_ogr_openfilegdb_8():
     while feat is not None:
         if feat.GetField('str') != expected_str[i]:
             feat.DumpReadable()
-            return 'fail'
+            pytest.fail()
         i = i + 1
         feat = lyr.GetNextFeature()
 
@@ -815,7 +809,7 @@ def test_ogr_openfilegdb_9():
     try:
         os.stat('tmp/testopenfilegdb.gdb')
     except OSError:
-        return 'skip'
+        pytest.skip()
 
     shutil.copy('tmp/testopenfilegdb.gdb/a00000009.gdbtable', 'tmp/a00000009.gdbtable')
     shutil.copy('tmp/testopenfilegdb.gdb/a00000009.gdbtablx', 'tmp/a00000009.gdbtablx')
@@ -860,7 +854,7 @@ def test_ogr_openfilegdb_10():
     try:
         os.stat('tmp/testopenfilegdb.gdb')
     except OSError:
-        return 'skip'
+        pytest.skip()
 
     shutil.copytree('tmp/testopenfilegdb.gdb', 'tmp/testopenfilegdb_fuzzed.gdb')
 
@@ -1178,7 +1172,7 @@ def test_ogr_openfilegdb_13():
     f = lyr.GetNextFeature()
     if f.GetField('GEOCODE') != '-673985,22+745574,77':
         f.DumpReadable()
-        return 'fail'
+        pytest.fail()
     ds = None
 
     return 'success'
@@ -1344,7 +1338,7 @@ def test_ogr_openfilegdb_21():
     f = sql_lyr.GetNextFeature()
     if f.GetFID() != 2:
         f.DumpReadable()
-        return 'fail'
+        pytest.fail()
     f = sql_lyr.GetNextFeature()
     assert f is None
     ds.ReleaseResultSet(sql_lyr)
@@ -1354,7 +1348,7 @@ def test_ogr_openfilegdb_21():
     f = lyr.GetNextFeature()
     if f.GetFID() != 2:
         f.DumpReadable()
-        return 'fail'
+        pytest.fail()
 
     return 'success'
 
diff --git a/autotest/ogr/ogr_osm.py b/autotest/ogr/ogr_osm.py
index 7eb06d05f675..87b4b8f292a8 100755
--- a/autotest/ogr/ogr_osm.py
+++ b/autotest/ogr/ogr_osm.py
@@ -37,6 +37,7 @@
 
 import gdaltest
 import ogrtest
+import pytest
 
 ###############################################################################
 # Test .pbf
@@ -46,16 +47,16 @@ def test_ogr_osm_1(filename='data/test.pbf'):
 
     ogrtest.osm_drv = ogr.GetDriverByName('OSM')
     if ogrtest.osm_drv is None:
-        return 'skip'
+        pytest.skip()
 
     ds = ogr.Open(filename)
     if ds is None:
         if filename == 'data/test.osm':
             ogrtest.osm_drv_parse_osm = False
             if gdal.GetLastErrorMsg().find('OSM XML detected, but Expat parser not available') == 0:
-                return 'skip'
+                pytest.skip()
 
-        return 'fail'
+        pytest.fail()
     else:
         if filename == 'data/test.osm':
             ogrtest.osm_drv_parse_osm = True
@@ -76,16 +77,16 @@ def test_ogr_osm_1(filename='data/test.pbf'):
        feat.GetFieldAsString('name') != 'Some interesting point' or \
        feat.GetFieldAsString('other_tags') != '"foo"=>"bar","bar"=>"baz"':
         feat.DumpReadable()
-        return 'fail'
+        pytest.fail()
 
     if ogrtest.check_feature_geometry(feat, ogr.CreateGeometryFromWkt('POINT (3.0 49.5)')) != 0:
         feat.DumpReadable()
-        return 'fail'
+        pytest.fail()
 
     feat = lyr.GetNextFeature()
     if feat is not None:
         feat.DumpReadable()
-        return 'fail'
+        pytest.fail()
 
     # Test lines
     lyr = ds.GetLayer('lines')
@@ -97,25 +98,25 @@ def test_ogr_osm_1(filename='data/test.pbf'):
        feat.GetFieldAsInteger('z_order') != 9 or \
        feat.GetFieldAsString('other_tags') != '"foo"=>"bar"':
         feat.DumpReadable()
-        return 'fail'
+        pytest.fail()
 
     if ogrtest.check_feature_geometry(feat, ogr.CreateGeometryFromWkt('LINESTRING (2 49,3 50)')) != 0:
         feat.DumpReadable()
-        return 'fail'
+        pytest.fail()
 
     feat = lyr.GetNextFeature()
     if feat.GetFieldAsString('osm_id') != '6':
         feat.DumpReadable()
-        return 'fail'
+        pytest.fail()
 
     if ogrtest.check_feature_geometry(feat, ogr.CreateGeometryFromWkt('LINESTRING (2 49,3 49,3 50,2 50,2 49)')) != 0:
         feat.DumpReadable()
-        return 'fail'
+        pytest.fail()
 
     feat = lyr.GetNextFeature()
     if feat is not None:
         feat.DumpReadable()
-        return 'fail'
+        pytest.fail()
 
     # Test multipolygons
     lyr = ds.GetLayer('multipolygons')
@@ -129,34 +130,34 @@ def test_ogr_osm_1(filename='data/test.pbf'):
        feat.GetFieldAsString('type') != 'multipolygon' or \
        feat.GetFieldAsString('natural') != 'forest':
         feat.DumpReadable()
-        return 'fail'
+        pytest.fail()
 
     if filename == 'tmp/ogr_osm_3':
         if ogrtest.check_feature_geometry(feat, ogr.CreateGeometryFromWkt('POLYGON ((2 49,2 50,3 50,3 49,2 49),(2.1 49.1,2.2 49.1,2.2 49.2,2.1 49.2,2.1 49.1))')) != 0:
             feat.DumpReadable()
-            return 'fail'
+            pytest.fail()
     else:
         if ogrtest.check_feature_geometry(feat, ogr.CreateGeometryFromWkt('MULTIPOLYGON (((2 49,3 49,3 50,2 50,2 49),(2.1 49.1,2.2 49.1,2.2 49.2,2.1 49.2,2.1 49.1)))')) != 0:
             feat.DumpReadable()
-            return 'fail'
+            pytest.fail()
 
     feat = lyr.GetNextFeature()
     if feat.GetFieldAsString('osm_id') != '5' or \
        feat.GetFieldAsString('type') != 'multipolygon' or \
        feat.GetFieldAsString('natural') != 'wood':
         feat.DumpReadable()
-        return 'fail'
+        pytest.fail()
 
     feat = lyr.GetNextFeature()
     if feat.GetFieldAsString('osm_way_id') != '8' or \
        feat.GetFieldAsString('name') != 'standalone_polygon':
         feat.DumpReadable()
-        return 'fail'
+        pytest.fail()
 
     feat = lyr.GetNextFeature()
     if feat is not None:
         feat.DumpReadable()
-        return 'fail'
+        pytest.fail()
 
     # Test multilinestrings
     lyr = ds.GetLayer('multilinestrings')
@@ -169,21 +170,21 @@ def test_ogr_osm_1(filename='data/test.pbf'):
     if feat.GetFieldAsString('osm_id') != '3' or \
        feat.GetFieldAsString('type') != 'route':
         feat.DumpReadable()
-        return 'fail'
+        pytest.fail()
 
     if filename == 'tmp/ogr_osm_3':
         if ogrtest.check_feature_geometry(feat, ogr.CreateGeometryFromWkt('LINESTRING (2 49,3 50)')) != 0:
             feat.DumpReadable()
-            return 'fail'
+            pytest.fail()
     else:
         if ogrtest.check_feature_geometry(feat, ogr.CreateGeometryFromWkt('MULTILINESTRING ((2 49,3 50))')) != 0:
             feat.DumpReadable()
-            return 'fail'
+            pytest.fail()
 
     feat = lyr.GetNextFeature()
     if feat is not None:
         feat.DumpReadable()
-        return 'fail'
+        pytest.fail()
 
     # Test other_relations
     lyr = ds.GetLayer('other_relations')
@@ -196,16 +197,16 @@ def test_ogr_osm_1(filename='data/test.pbf'):
         if feat.GetFieldAsString('osm_id') != '4' or \
            feat.GetFieldAsString('type') != 'other_type':
             feat.DumpReadable()
-            return 'fail'
+            pytest.fail()
 
         if ogrtest.check_feature_geometry(feat, ogr.CreateGeometryFromWkt('GEOMETRYCOLLECTION (POINT (2 49),LINESTRING (2 49,3 50))')) != 0:
             feat.DumpReadable()
-            return 'fail'
+            pytest.fail()
 
         feat = lyr.GetNextFeature()
         if feat is not None:
             feat.DumpReadable()
-            return 'fail'
+            pytest.fail()
 
     if ds.GetDriver().GetName() == 'OSM':
         sql_lyr = ds.ExecuteSQL("GetBytesRead()")
@@ -239,7 +240,7 @@ def test_ogr_osm_2():
 def test_ogr_osm_3(options=None, all_layers=False):
 
     if ogrtest.osm_drv is None:
-        return 'skip'
+        pytest.skip()
 
     filepath = 'tmp/ogr_osm_3'
     if os.path.exists(filepath):
@@ -296,7 +297,7 @@ def test_ogr_osm_3_all_layers():
 def test_ogr_osm_4():
 
     if ogrtest.osm_drv is None:
-        return 'skip'
+        pytest.skip()
 
     ds = ogr.Open('data/test.pbf')
     assert ds is not None
@@ -350,7 +351,7 @@ def test_ogr_osm_4():
 def test_ogr_osm_5():
 
     if ogrtest.osm_drv is None:
-        return 'skip'
+        pytest.skip()
 
     ds = ogr.Open('data/test.pbf')
     assert ds is not None
@@ -390,11 +391,11 @@ def test_ogr_osm_5():
 def test_ogr_osm_6():
 
     if ogrtest.osm_drv is None:
-        return 'skip'
+        pytest.skip()
 
     import test_cli_utilities
     if test_cli_utilities.get_ogr2ogr_path() is None:
-        return 'skip'
+        pytest.skip()
 
     try:
         os.stat('tmp/ogr_osm_6')
@@ -423,14 +424,14 @@ def test_ogr_osm_6():
 def test_ogr_osm_7():
 
     if ogrtest.osm_drv is None:
-        return 'skip'
+        pytest.skip()
 
     ds = ogr.Open('data/test.pbf')
     assert ds is not None
 
     sql_lyr = ds.ExecuteSQL('SELECT * FROM points LIMIT 10', dialect='SQLite')
     if sql_lyr is None and gdal.GetLastErrorMsg().find('automatic extension loading failed') != 0:
-        return 'skip'
+        pytest.skip()
     count = sql_lyr.GetFeatureCount()
     ds.ReleaseResultSet(sql_lyr)
 
@@ -445,7 +446,7 @@ def test_ogr_osm_7():
 def test_ogr_osm_8():
 
     if ogrtest.osm_drv is None:
-        return 'skip'
+        pytest.skip()
 
     ds = ogr.Open('data/base-64.osm.pbf')
     assert ds is not None
@@ -457,14 +458,14 @@ def test_ogr_osm_8():
     if feat.GetField('name') != 'Treetops' or \
        ogrtest.check_feature_geometry(feat, ogr.CreateGeometryFromWkt('POINT (-61.7964321 17.1498319)')) != 0:
         feat.DumpReadable()
-        return 'fail'
+        pytest.fail()
 
     lyr = ds.GetLayerByName('multipolygons')
     feat = lyr.GetFeature(1113)
 
     if ogrtest.check_feature_geometry(feat, ogr.CreateGeometryFromWkt('MULTIPOLYGON (((-61.7780345 17.140634,-61.7777002 17.1406069,-61.7776854 17.1407739,-61.7779131 17.1407923,-61.7779158 17.1407624,-61.7780224 17.140771,-61.7780345 17.140634)))')) != 0:
         feat.DumpReadable()
-        return 'fail'
+        pytest.fail()
 
     return 'success'
 
@@ -475,7 +476,7 @@ def test_ogr_osm_8():
 def test_ogr_osm_9():
 
     if ogrtest.osm_drv is None:
-        return 'skip'
+        pytest.skip()
 
     old_val = gdal.GetConfigOption('OSM_USE_CUSTOM_INDEXING')
     gdal.SetConfigOption('OSM_USE_CUSTOM_INDEXING', 'NO')
@@ -491,7 +492,7 @@ def test_ogr_osm_9():
 def test_ogr_osm_10():
 
     if ogrtest.osm_drv is None:
-        return 'skip'
+        pytest.skip()
 
     # A file that does not exist.
     ds = ogr.Open('/nonexistent/foo.osm')
@@ -569,7 +570,7 @@ def test_ogr_osm_10():
 def test_ogr_osm_11():
 
     if ogrtest.osm_drv is None:
-        return 'skip'
+        pytest.skip()
 
     gdal.SetConfigOption('OSM_CONFIG_FILE', 'data/osmconf_alltags.ini')
     ds = ogr.Open('data/test.pbf')
@@ -580,13 +581,13 @@ def test_ogr_osm_11():
        feat.GetFieldAsString('name') != 'Some interesting point' or \
        feat.GetFieldAsString('all_tags') != '"name"=>"Some interesting point","foo"=>"bar","bar"=>"baz"':
         feat.DumpReadable()
-        return 'fail'
+        pytest.fail()
 
     lyr = ds.GetLayerByName('lines')
     feat = lyr.GetNextFeature()
     if feat.GetField('z_order') != 9:
         feat.DumpReadable()
-        return 'fail'
+        pytest.fail()
 
     return 'success'
 
@@ -598,7 +599,7 @@ def test_ogr_osm_11():
 def test_ogr_osm_12():
 
     if ogrtest.osm_drv is None:
-        return 'skip'
+        pytest.skip()
 
     ds = ogr.Open('data/test.pbf')
     for i in range(2):
@@ -637,7 +638,7 @@ def test_ogr_osm_test_uncompressed_dense_false_pbf():
 def test_ogr_osm_13():
 
     if ogrtest.osm_drv is None or not ogrtest.osm_drv_parse_osm:
-        return 'skip'
+        pytest.skip()
 
     gdal.FileFromMemBuffer('/vsimem/ogr_osm_13.osm',
                            """<osm><node id="123" lon="2" lat="49"><tag k="osm_id" v="0"/></node></osm>""")
@@ -646,12 +647,12 @@ def test_ogr_osm_13():
         ds = ogr.Open('/vsimem/ogr_osm_13.osm')
     if ds is None:
         gdal.Unlink('/vsimem/ogr_osm_13.osm')
-        return 'skip'
+        pytest.skip()
     lyr = ds.GetLayer(0)
     f = lyr.GetNextFeature()
     if f['osm_id'] != '123' or f['other_tags'] != '"osm_id"=>"0"':
         f.DumpReadable()
-        return 'fail'
+        pytest.fail()
     ds = None
 
     gdal.Unlink('/vsimem/ogr_osm_13.osm')
@@ -665,7 +666,7 @@ def test_ogr_osm_13():
 def test_ogr_osm_14():
 
     if ogrtest.osm_drv is None or not ogrtest.osm_drv_parse_osm:
-        return 'skip'
+        pytest.skip()
 
     gdal.FileFromMemBuffer('/vsimem/ogr_osm_14.osm',
                            """<osm>
@@ -690,12 +691,12 @@ def test_ogr_osm_14():
         ds = ogr.Open('/vsimem/ogr_osm_14.osm')
     if ds is None:
         gdal.Unlink('/vsimem/ogr_osm_14.osm')
-        return 'skip'
+        pytest.skip()
     sql_lyr = ds.ExecuteSQL('SELECT * FROM other_relations')
     f = sql_lyr.GetNextFeature()
     if f.GetGeometryRef().ExportToWkt() != 'GEOMETRYCOLLECTION (POLYGON ((49 2,49.0 2.1,49.1 2.1,49 2)))':
         f.DumpReadable()
-        return 'fail'
+        pytest.fail()
     ds.ReleaseResultSet(sql_lyr)
     ds = None
 
@@ -721,7 +722,7 @@ def ogr_osm_15_progresscbk_return_false(pct, msg, user_data):
 def test_ogr_osm_15():
 
     if ogrtest.osm_drv is None:
-        return 'skip'
+        pytest.skip()
 
     ds = gdal.OpenEx('data/test.pbf')
 
@@ -740,8 +741,7 @@ def test_ogr_osm_15():
         count += 1
         if f.GetDefnRef().GetName() != l.GetName():
             f.DumpReadable()
-            print(l.GetName())
-            return 'fail'
+            pytest.fail(l.GetName())
 
     assert count == 8
 
@@ -784,7 +784,7 @@ def test_ogr_osm_15():
 def test_ogr_osm_16():
 
     if ogrtest.osm_drv is None or not ogrtest.osm_drv_parse_osm:
-        return 'skip'
+        pytest.skip()
 
     gdal.FileFromMemBuffer('/vsimem/ogr_osm_16.osm',
                            """<osm>
@@ -807,7 +807,7 @@ def test_ogr_osm_16():
     f = lyr.GetNextFeature()
     if f['foo_baar'] != 'val' or f['foo_bar'] != 'val2':
         f.DumpReadable()
-        return 'fail'
+        pytest.fail()
     ds = None
 
     gdal.Unlink('/vsimem/ogr_osm_16.osm')
@@ -823,7 +823,7 @@ def test_ogr_osm_16():
 def test_ogr_osm_17():
 
     if ogrtest.osm_drv is None or not ogrtest.osm_drv_parse_osm:
-        return 'skip'
+        pytest.skip()
 
     with gdaltest.error_handler():
         gdal.VectorTranslate('/vsimem/ogr_osm_17', 'data/empty.osm', options='-skip')
@@ -846,7 +846,7 @@ def test_ogr_osm_17():
 def test_ogr_osm_18():
 
     if ogrtest.osm_drv is None:
-        return 'skip'
+        pytest.skip()
 
     ds = ogr.Open('data/two_points.pbf')
     lyr = ds.GetLayerByName('points')
diff --git a/autotest/ogr/ogr_pcidsk.py b/autotest/ogr/ogr_pcidsk.py
index d703dc17846d..23fc3d53195f 100755
--- a/autotest/ogr/ogr_pcidsk.py
+++ b/autotest/ogr/ogr_pcidsk.py
@@ -36,6 +36,7 @@
 from osgeo import ogr
 from osgeo import osr
 from osgeo import gdal
+import pytest
 
 
 wkts = [('POINT (0 1 2)', 'points', 0),
@@ -52,7 +53,7 @@ def test_ogr_pcidsk_1():
 
     ogr_drv = ogr.GetDriverByName('PCIDSK')
     if ogr_drv is None:
-        return 'skip'
+        pytest.skip()
 
     ds = ogr_drv.CreateDataSource('tmp/ogr_pcidsk_1.pix')
 
@@ -111,8 +112,7 @@ def test_ogr_pcidsk_1():
         assert feat is not None, layername
         if feat.GetGeometryRef().ExportToWkt() != wkt:
             feat.DumpReadable()
-            print(layername)
-            return 'fail'
+            pytest.fail(layername)
 
     ds = None
 
@@ -126,7 +126,7 @@ def test_ogr_pcidsk_2():
 
     ogr_drv = ogr.GetDriverByName('PCIDSK')
     if ogr_drv is None:
-        return 'skip'
+        pytest.skip()
 
     ds = ogr.Open('tmp/ogr_pcidsk_1.pix')
     assert ds.GetLayerCount() == 2 + len(wkts)
@@ -158,8 +158,7 @@ def test_ogr_pcidsk_2():
         assert feat is not None, layername
         if feat.GetGeometryRef().ExportToWkt() != wkt:
             feat.DumpReadable()
-            print(layername)
-            return 'fail'
+            pytest.fail(layername)
 
     ds = None
 
@@ -173,10 +172,10 @@ def test_ogr_pcidsk_3():
 
     import test_cli_utilities
     if test_cli_utilities.get_test_ogrsf_path() is None:
-        return 'skip'
+        pytest.skip()
 
     if ogr.GetDriverByName('PCIDSK') is None:
-        return 'skip'
+        pytest.skip()
 
     ret = gdaltest.runexternal(test_cli_utilities.get_test_ogrsf_path() + ' tmp/ogr_pcidsk_1.pix')
 
@@ -202,10 +201,10 @@ def test_ogr_pcidsk_3():
 def test_ogr_pcidsk_4():
 
     if ogr.GetDriverByName('PCIDSK') is None:
-        return 'skip'
+        pytest.skip()
 
     if gdal.GetDriverByName('PCIDSK') is None:
-        return 'skip'
+        pytest.skip()
 
     ds = ogr.Open('../gdrivers/data/utm.pix')
     assert ds is None
@@ -220,10 +219,10 @@ def test_ogr_pcidsk_4():
 def test_ogr_pcidsk_5():
 
     if ogr.GetDriverByName('PCIDSK') is None:
-        return 'skip'
+        pytest.skip()
 
     if gdal.GetDriverByName('PCIDSK') is None:
-        return 'skip'
+        pytest.skip()
 
     ds = ogr.Open('../gdrivers/data/utm.pix', update=1)
     assert ds is not None
@@ -237,7 +236,7 @@ def test_ogr_pcidsk_5():
 def test_ogr_pcidsk_add_field_to_non_empty_layer():
 
     if ogr.GetDriverByName('PCIDSK') is None:
-        return 'skip'
+        pytest.skip()
 
     tmpfile = '/vsimem/tmp.pix'
     ds = ogr.GetDriverByName('PCIDSK').CreateDataSource(tmpfile)
@@ -265,7 +264,7 @@ def test_ogr_pcidsk_add_field_to_non_empty_layer():
 def test_ogr_pcidsk_too_many_layers():
 
     if ogr.GetDriverByName('PCIDSK') is None:
-        return 'skip'
+        pytest.skip()
 
     tmpfile = '/vsimem/tmp.pix'
     ds = ogr.GetDriverByName('PCIDSK').CreateDataSource(tmpfile)
@@ -286,10 +285,10 @@ def test_ogr_pcidsk_too_many_layers():
 def test_ogr_pcidsk_online_1():
 
     if ogr.GetDriverByName('PCIDSK') is None:
-        return 'skip'
+        pytest.skip()
 
     if not gdaltest.download_file('http://download.osgeo.org/gdal/data/pcidsk/sdk_testsuite/polygon.pix', 'polygon.pix'):
-        return 'skip'
+        pytest.skip()
 
     ds = ogr.Open('tmp/cache/polygon.pix')
     assert ds is not None
@@ -303,7 +302,7 @@ def test_ogr_pcidsk_online_1():
     geom = 'POLYGON ((479819.84375 4765180.5 0,479690.1875 4765259.5 0,479647.0 4765369.5 0,479730.375 4765400.5 0,480039.03125 4765539.5 0,480035.34375 4765558.5 0,480159.78125 4765610.5 0,480202.28125 4765482.0 0,480365.0 4765015.5 0,480389.6875 4764950.0 0,480133.96875 4764856.5 0,480080.28125 4764979.5 0,480082.96875 4765049.5 0,480088.8125 4765139.5 0,480059.90625 4765239.5 0,480019.71875 4765319.5 0,479980.21875 4765409.5 0,479909.875 4765370.0 0,479859.875 4765270.0 0,479819.84375 4765180.5 0))'
     if ogrtest.check_feature_geometry(feat, geom) != 0:
         feat.DumpReadable()
-        return 'fail'
+        pytest.fail()
 
     return 'success'
 
@@ -315,13 +314,13 @@ def test_ogr_pcidsk_online_2():
 
     import test_cli_utilities
     if test_cli_utilities.get_test_ogrsf_path() is None:
-        return 'skip'
+        pytest.skip()
 
     if ogr.GetDriverByName('PCIDSK') is None:
-        return 'skip'
+        pytest.skip()
 
     if not gdaltest.download_file('http://download.osgeo.org/gdal/data/pcidsk/sdk_testsuite/polygon.pix', 'polygon.pix'):
-        return 'skip'
+        pytest.skip()
 
     ret = gdaltest.runexternal(test_cli_utilities.get_test_ogrsf_path() + ' -ro tmp/cache/polygon.pix')
 
diff --git a/autotest/ogr/ogr_pdf.py b/autotest/ogr/ogr_pdf.py
index c8f48de40cd9..943d2a96af60 100755
--- a/autotest/ogr/ogr_pdf.py
+++ b/autotest/ogr/ogr_pdf.py
@@ -37,6 +37,7 @@
 from osgeo import gdal
 from osgeo import ogr
 from osgeo import osr
+import pytest
 
 
 def has_read_support():
@@ -59,7 +60,7 @@ def has_read_support():
 def test_ogr_pdf_1(name='tmp/ogr_pdf_1.pdf', write_attributes='YES'):
 
     if ogr.GetDriverByName('PDF') is None:
-        return 'skip'
+        pytest.skip()
 
     sr = osr.SpatialReference()
     sr.ImportFromEPSG(4326)
@@ -131,7 +132,7 @@ def test_ogr_pdf_1(name='tmp/ogr_pdf_1.pdf', write_attributes='YES'):
 def test_ogr_pdf_2(name='tmp/ogr_pdf_1.pdf', has_attributes=True):
 
     if not has_read_support():
-        return 'skip'
+        pytest.skip()
 
     ds = ogr.Open(name)
     assert ds is not None
@@ -158,41 +159,39 @@ def test_ogr_pdf_2(name='tmp/ogr_pdf_1.pdf', has_attributes=True):
     feat = lyr.GetNextFeature()
     if ogrtest.check_feature_geometry(feat, ogr.CreateGeometryFromWkt('LINESTRING(2 48,3 50)')) != 0:
         feat.DumpReadable()
-        return 'fail'
+        pytest.fail()
 
     if has_attributes:
         if feat.GetField('strfield') != 'str':
             feat.DumpReadable()
-            return 'fail'
+            pytest.fail()
         if feat.GetField('intfield') != 1:
             feat.DumpReadable()
-            return 'fail'
+            pytest.fail()
         if abs(feat.GetFieldAsDouble('realfield') - 2.34) > 1e-10:
             feat.DumpReadable()
-            return 'fail'
+            pytest.fail()
 
     feat = lyr.GetNextFeature()
     if ogrtest.check_feature_geometry(feat, ogr.CreateGeometryFromWkt('POLYGON((2 48,2 49,3 49,3 48,2 48))')) != 0:
         feat.DumpReadable()
-        return 'fail'
+        pytest.fail()
 
     feat = lyr.GetNextFeature()
     if ogrtest.check_feature_geometry(feat, ogr.CreateGeometryFromWkt('POLYGON((2 48,2 49,3 49,3 48,2 48),(2.25 48.25,2.25 48.75,2.75 48.75,2.75 48.25,2.25 48.25))')) != 0:
         feat.DumpReadable()
-        return 'fail'
+        pytest.fail()
 
     for i in range(10):
         feat = lyr.GetNextFeature()
         if ogrtest.check_feature_geometry(feat, ogr.CreateGeometryFromWkt('POINT(%f 49.1)' % (2 + i * 0.05))) != 0:
             feat.DumpReadable()
-            gdaltest.post_reason('fail with ogr-sym-%d' % i)
-            return 'fail'
+            pytest.fail('fail with ogr-sym-%d' % i)
 
     feat = lyr.GetNextFeature()
     if ogrtest.check_feature_geometry(feat, ogr.CreateGeometryFromWkt('POINT(2.5 49.1)')) != 0:
         feat.DumpReadable()
-        gdaltest.post_reason('fail with raster icon')
-        return 'fail'
+        pytest.fail('fail with raster icon')
 
     ds = None
 
@@ -220,7 +219,7 @@ def test_ogr_pdf_4_podofo():
 
     gdal_pdf_drv = gdal.GetDriverByName('PDF')
     if gdal_pdf_drv is None:
-        return 'skip'
+        pytest.skip()
 
     md = gdal_pdf_drv.GetMetadata()
     if 'HAVE_POPPLER' in md and 'HAVE_PODOFO' in md:
@@ -229,7 +228,7 @@ def test_ogr_pdf_4_podofo():
         ret = test_ogr_pdf_4()
         gdal.SetConfigOption("GDAL_PDF_LIB", None)
         return ret
-    return 'skip'
+    pytest.skip()
 
 ###############################################################################
 # Test read support with OGR_PDF_READ_NON_STRUCTURED=YES
@@ -238,7 +237,7 @@ def test_ogr_pdf_4_podofo():
 def test_ogr_pdf_5():
 
     if not has_read_support():
-        return 'skip'
+        pytest.skip()
 
     with gdaltest.config_option('OGR_PDF_READ_NON_STRUCTURED', 'YES'):
         ds = ogr.Open('data/drawing.pdf')
@@ -257,10 +256,10 @@ def test_ogr_pdf_5():
 def test_ogr_pdf_online_1():
 
     if not has_read_support():
-        return 'skip'
+        pytest.skip()
 
     if not gdaltest.download_file('http://www.terragotech.com/images/pdf/webmap_urbansample.pdf', 'webmap_urbansample.pdf'):
-        return 'skip'
+        pytest.skip()
 
     expected_layers = [
         ["Cadastral Boundaries", ogr.wkbPolygon],
@@ -292,7 +291,7 @@ def test_ogr_pdf_online_1():
     feat = lyr.GetNextFeature()
     if ogrtest.check_feature_geometry(feat, ogr.CreateGeometryFromWkt('POINT (724431.316665166523308 7672947.212302438914776)')) != 0:
         feat.DumpReadable()
-        return 'fail'
+        pytest.fail()
     assert feat.GetField('ID') == 'VL46'
 
     return 'success'
@@ -304,10 +303,10 @@ def test_ogr_pdf_online_1():
 def test_ogr_pdf_online_2():
 
     if not has_read_support():
-        return 'skip'
+        pytest.skip()
 
     if not gdaltest.download_file('https://download.osgeo.org/gdal/data/pdf/340711752_Azusa_FSTopo.pdf', '340711752_Azusa_FSTopo.pdf'):
-        return 'skip'
+        pytest.skip()
 
     expected_layers = [
         ['Other_5', 0],
@@ -350,10 +349,9 @@ def test_ogr_pdf_online_2():
     assert ds is not None
 
     if ds.GetLayerCount() != len(expected_layers):
-        print(ds.GetLayerCount())
         for lyr in ds:
             print(lyr.GetName(), lyr.GetGeomType())
-        return 'fail'
+        pytest.fail(ds.GetLayerCount())
 
     for i in range(ds.GetLayerCount()):
         assert ds.GetLayer(i).GetName() == expected_layers[i][0], \
@@ -371,7 +369,7 @@ def test_ogr_pdf_online_2():
 def test_ogr_pdf_cleanup():
 
     if ogr.GetDriverByName('PDF') is None:
-        return 'skip'
+        pytest.skip()
 
     ogr.GetDriverByName('PDF').DeleteDataSource('tmp/ogr_pdf_1.pdf')
     ogr.GetDriverByName('PDF').DeleteDataSource('tmp/ogr_pdf_2.pdf')
diff --git a/autotest/ogr/ogr_pds.py b/autotest/ogr/ogr_pds.py
index a1713add3352..85c26f5391bf 100755
--- a/autotest/ogr/ogr_pds.py
+++ b/autotest/ogr/ogr_pds.py
@@ -54,7 +54,7 @@ def test_ogr_pds_1():
         feat = lyr.GetNextFeature()
     if feat.GetField('NOISE_COUNTS_1') != 96:
         feat.DumpReadable()
-        return 'fail'
+        pytest.fail()
     geom = feat.GetGeometryRef()
     if ogrtest.check_feature_geometry(feat, 'POINT (146.1325 -55.648)',
                                       max_error=0.000000001) != 0:
@@ -65,7 +65,7 @@ def test_ogr_pds_1():
         feat = lyr.GetFeature(1)
     if feat.GetField('MARS_RADIUS') != 3385310.2:
         feat.DumpReadable()
-        return 'fail'
+        pytest.fail()
 
     return 'success'
 
@@ -80,7 +80,7 @@ def test_ogr_pds_2():
     f = lyr.GetNextFeature()
     if abs(f['INCIDENCE_ANGLE'] - 3.56775538) > 1e-7 or abs(f['TEMP_2'] - 28.1240005493164) > 1e-7:
         f.DumpReadable()
-        return 'fail'
+        pytest.fail()
 
     return 'success'
 
diff --git a/autotest/ogr/ogr_pg.py b/autotest/ogr/ogr_pg.py
index f4f2a9886c59..a715ac21bcfd 100755
--- a/autotest/ogr/ogr_pg.py
+++ b/autotest/ogr/ogr_pg.py
@@ -74,7 +74,7 @@ def ogr_pg_check_layer_in_list(ds, layer_name):
 def with_and_without_postgis(request):
     test_ogr_pg_1()
     if gdaltest.pg_ds is None:
-        return 'skip'
+        pytest.skip()
 
     with_postgis = request.param == 'postgis'
 
@@ -116,7 +116,7 @@ def test_ogr_pg_1():
         gdal.PopErrorHandler()
 
     if gdaltest.pg_ds is None:
-        return 'skip'
+        pytest.skip()
 
     sql_lyr = gdaltest.pg_ds.ExecuteSQL('SELECT version()')
     feat = sql_lyr.GetNextFeature()
@@ -168,7 +168,7 @@ def test_ogr_pg_1():
 def test_ogr_pg_2(with_and_without_postgis):
 
     if gdaltest.pg_ds is None:
-        return 'skip'
+        pytest.skip()
 
     gdal.PushErrorHandler('CPLQuietErrorHandler')
     gdaltest.pg_ds.ExecuteSQL('DELLAYER:tpoly')
@@ -251,7 +251,7 @@ def test_ogr_pg_2(with_and_without_postgis):
 def test_ogr_pg_19(with_and_without_postgis):
 
     if gdaltest.pg_ds is None:
-        return 'skip'
+        pytest.skip()
 
     layer = gdaltest.pg_ds.GetLayerByName('tpoly')
     assert layer is not None, 'did not get tpoly layer'
@@ -289,7 +289,7 @@ def test_ogr_pg_19(with_and_without_postgis):
 def test_ogr_pg_19_2(with_and_without_postgis):
 
     if gdaltest.pg_ds is None:
-        return 'skip'
+        pytest.skip()
 
     sql_lyr = gdaltest.pg_ds.ExecuteSQL('select * from tpoly')
 
@@ -312,7 +312,7 @@ def test_ogr_pg_19_2(with_and_without_postgis):
 
 def test_ogr_pg_3(with_and_without_postgis):
     if gdaltest.pg_ds is None:
-        return 'skip'
+        pytest.skip()
 
     assert gdaltest.pg_lyr.GetFeatureCount() == 10
 
@@ -352,7 +352,7 @@ def test_ogr_pg_3(with_and_without_postgis):
 def test_ogr_pg_4(with_and_without_postgis):
 
     if gdaltest.pg_ds is None:
-        return 'skip'
+        pytest.skip()
 
     dst_feat = ogr.Feature(feature_def=gdaltest.pg_lyr.GetLayerDefn())
     wkt_list = ['10', '2', '1', '3d_1', '4', '5', '6']
@@ -396,7 +396,7 @@ def test_ogr_pg_4(with_and_without_postgis):
 def test_ogr_pg_5(with_and_without_postgis):
 
     if gdaltest.pg_ds is None:
-        return 'skip'
+        pytest.skip()
 
     expect = [None, 179, 173, 172, 171, 170, 169, 168, 166, 165, 158]
 
@@ -417,7 +417,7 @@ def test_ogr_pg_5(with_and_without_postgis):
 def test_ogr_pg_6(with_and_without_postgis):
 
     if gdaltest.pg_ds is None:
-        return 'skip'
+        pytest.skip()
 
     sql_lyr = gdaltest.pg_ds.ExecuteSQL("select * from tpoly where prfedea = '2'")
 
@@ -451,7 +451,7 @@ def test_ogr_pg_6(with_and_without_postgis):
 def test_ogr_pg_7(with_and_without_postgis):
 
     if gdaltest.pg_ds is None:
-        return 'skip'
+        pytest.skip()
 
     gdaltest.pg_lyr.SetAttributeFilter(None)
 
@@ -487,7 +487,7 @@ def test_ogr_pg_7(with_and_without_postgis):
 def test_ogr_pg_8(with_and_without_postgis):
 
     if gdaltest.pg_ds is None:
-        return 'skip'
+        pytest.skip()
 
     dst_feat = ogr.Feature(feature_def=gdaltest.pg_lyr.GetLayerDefn())
 
@@ -516,7 +516,7 @@ def test_ogr_pg_8(with_and_without_postgis):
 def test_ogr_pg_9(with_and_without_postgis):
 
     if gdaltest.pg_ds is None:
-        return 'skip'
+        pytest.skip()
 
     gdaltest.pg_lyr.SetAttributeFilter("PRFEDEA = 'CrazyKey'")
     feat = gdaltest.pg_lyr.GetNextFeature()
@@ -530,8 +530,7 @@ def test_ogr_pg_9(with_and_without_postgis):
 
     if gdaltest.pg_lyr.SetFeature(feat) != 0:
         feat.Destroy()
-        gdaltest.post_reason('SetFeature() method failed.')
-        return 'fail'
+        pytest.fail('SetFeature() method failed.')
 
     fid = feat.GetFID()
     feat.Destroy()
@@ -551,8 +550,7 @@ def test_ogr_pg_9(with_and_without_postgis):
 
     if gdaltest.pg_lyr.SetFeature(feat) != 0:
         feat.Destroy()
-        gdaltest.post_reason('SetFeature() method failed.')
-        return 'fail'
+        pytest.fail('SetFeature() method failed.')
 
     feat.Destroy()
 
@@ -569,8 +567,7 @@ def test_ogr_pg_9(with_and_without_postgis):
     feat.SetFID(-10)
     if gdaltest.pg_lyr.SetFeature(feat) != ogr.OGRERR_NON_EXISTING_FEATURE:
         feat.Destroy()
-        gdaltest.post_reason('Expected failure of SetFeature().')
-        return 'fail'
+        pytest.fail('Expected failure of SetFeature().')
 
     feat.Destroy()
 
@@ -583,7 +580,7 @@ def test_ogr_pg_9(with_and_without_postgis):
 def test_ogr_pg_10(with_and_without_postgis):
 
     if gdaltest.pg_ds is None:
-        return 'skip'
+        pytest.skip()
 
     gdaltest.pg_lyr.SetAttributeFilter("PRFEDEA = 'CrazyKey'")
     feat = gdaltest.pg_lyr.GetNextFeature()
@@ -600,8 +597,7 @@ def test_ogr_pg_10(with_and_without_postgis):
 
     if feat is not None:
         feat.Destroy()
-        gdaltest.post_reason('DeleteFeature() seems to have had no effect.')
-        return 'fail'
+        pytest.fail('DeleteFeature() seems to have had no effect.')
 
     # Test deleting non-existing feature
     assert gdaltest.pg_lyr.DeleteFeature(-10) == ogr.OGRERR_NON_EXISTING_FEATURE, \
@@ -616,7 +612,7 @@ def test_ogr_pg_10(with_and_without_postgis):
 def test_ogr_pg_11(with_and_without_postgis):
 
     if gdaltest.pg_ds is None:
-        return 'skip'
+        pytest.skip()
 
     gdal.PushErrorHandler('CPLQuietErrorHandler')
     gdaltest.pg_ds.ExecuteSQL('DELLAYER:tpolycopy')
@@ -669,7 +665,7 @@ def test_ogr_pg_11(with_and_without_postgis):
 
 def test_ogr_pg_12(with_and_without_postgis):
     if gdaltest.pg_ds is None:
-        return 'skip'
+        pytest.skip()
 
     gdaltest.pgc_lyr.ResetReading()
     gdaltest.pgc_lyr.SetAttributeFilter(None)
@@ -700,7 +696,7 @@ def test_ogr_pg_12(with_and_without_postgis):
 def test_ogr_pg_13(with_and_without_postgis):
 
     if gdaltest.pg_ds is None:
-        return 'skip'
+        pytest.skip()
 
     gdal.PushErrorHandler('CPLQuietErrorHandler')
     gdaltest.pg_ds.ExecuteSQL('DELLAYER:datetest')
@@ -736,7 +732,7 @@ def test_ogr_pg_13(with_and_without_postgis):
 
 def test_ogr_pg_14(with_and_without_postgis):
     if gdaltest.pg_ds is None:
-        return 'skip'
+        pytest.skip()
 
     ds = ogr.Open('PG:' + gdaltest.pg_connection_string, update=1)
 
@@ -752,9 +748,8 @@ def test_ogr_pg_14(with_and_without_postgis):
        or feat.GetFieldAsString('ts') != '2005/10/12 10:41:33' \
        or feat.GetFieldAsString('dt') != '2005/10/12' \
        or feat.GetFieldAsString('tm') != '10:41:33':
-        gdaltest.post_reason('UTC value wrong')
         feat.DumpReadable()
-        return 'fail'
+        pytest.fail('UTC value wrong')
 
     sql_lyr = ds.ExecuteSQL("select * from pg_timezone_names where name = 'Canada/Newfoundland'")
     if sql_lyr is None:
@@ -775,9 +770,8 @@ def test_ogr_pg_14(with_and_without_postgis):
                 or feat.GetFieldAsString('ts') != '2005/10/12 10:41:33' \
                 or feat.GetFieldAsString('dt') != '2005/10/12' \
                 or feat.GetFieldAsString('tm') != '10:41:33':
-            gdaltest.post_reason('Newfoundland value wrong')
             feat.DumpReadable()
-            return 'fail'
+            pytest.fail('Newfoundland value wrong')
 
     ds.ExecuteSQL('set timezone to "+5"')
 
@@ -786,9 +780,8 @@ def test_ogr_pg_14(with_and_without_postgis):
     feat = lyr.GetNextFeature()
     if feat.GetFieldAsString('ogrdatetime') != '2005/10/12 20:41:33+05' \
        or feat.GetFieldAsString('tsz') != '2005/10/12 20:41:33+05':
-        gdaltest.post_reason('+5 value wrong')
         feat.DumpReadable()
-        return 'fail'
+        pytest.fail('+5 value wrong')
 
     feat = None
     ds.Destroy()
@@ -802,7 +795,7 @@ def test_ogr_pg_14(with_and_without_postgis):
 def test_ogr_pg_15(with_and_without_postgis):
 
     if gdaltest.pg_ds is None:
-        return 'skip'
+        pytest.skip()
 
     expect = [169]
 
@@ -825,7 +818,7 @@ def test_ogr_pg_15(with_and_without_postgis):
 def test_ogr_pg_16(with_and_without_postgis):
 
     if gdaltest.pg_ds is None:
-        return 'skip'
+        pytest.skip()
 
     expect = [169]
 
@@ -851,7 +844,7 @@ def test_ogr_pg_16(with_and_without_postgis):
 def test_ogr_pg_17(with_and_without_postgis):
 
     if gdaltest.pg_ds is None:
-        return 'skip'
+        pytest.skip()
 
     count = gdaltest.pg_ds.GetLayerCount()
     try:
@@ -872,7 +865,7 @@ def test_ogr_pg_17(with_and_without_postgis):
 def test_ogr_pg_18(with_and_without_postgis):
 
     if gdaltest.pg_ds is None or not gdaltest.pg_has_postgis:
-        return 'skip'
+        pytest.skip()
 
     count = gdaltest.pg_ds.GetLayerCount()
     layer = gdaltest.pg_ds.GetLayerByName('geometry_columns')
@@ -891,7 +884,7 @@ def test_ogr_pg_18(with_and_without_postgis):
 def test_ogr_pg_20(with_and_without_postgis):
 
     if gdaltest.pg_ds is None or not gdaltest.pg_has_postgis:
-        return 'skip'
+        pytest.skip()
 
     #
     # Prepare test layer with 4-dim geometries.
@@ -972,7 +965,7 @@ def test_ogr_pg_20(with_and_without_postgis):
 def test_ogr_pg_21(with_and_without_postgis):
 
     if gdaltest.pg_ds is None or not gdaltest.pg_has_postgis:
-        return 'skip'
+        pytest.skip()
 
     layer = gdaltest.pg_ds.ExecuteSQL("SELECT wkb_geometry FROM testgeom")
     assert layer is not None, 'did not get testgeom layer'
@@ -981,12 +974,11 @@ def test_ogr_pg_21(with_and_without_postgis):
     while feat is not None:
         geom = feat.GetGeometryRef()
         if ogr.GT_HasZ(geom.GetGeometryType()) == 0 or ogr.GT_HasM(geom.GetGeometryType()) == 0:
-            gdaltest.post_reason('expected feature with type >3000')
             feat.Destroy()
             feat = None
             gdaltest.pg_ds.ReleaseResultSet(layer)
             layer = None
-            return 'fail'
+            pytest.fail('expected feature with type >3000')
 
         feat.Destroy()
         feat = layer.GetNextFeature()
@@ -1004,7 +996,7 @@ def test_ogr_pg_21(with_and_without_postgis):
 def test_ogr_pg_21_subgeoms(with_and_without_postgis):
 
     if gdaltest.pg_ds is None or not gdaltest.pg_has_postgis:
-        return 'skip'
+        pytest.skip()
 
     subgeom_PS = ['POLYGON ZM ((0 0 0 0,0 0 1 0,0 1 1 0,0 1 0 0,0 0 0 0))',
                   'POLYGON ZM ((0 0 0 0,0 1 0 0,1 1 0 0,1 0 0 0,0 0 0 0))',
@@ -1045,7 +1037,7 @@ def test_ogr_pg_21_subgeoms(with_and_without_postgis):
 def test_ogr_pg_21_3d_geometries():
 
     if gdaltest.pg_ds is None:
-        return 'skip'
+        pytest.skip()
 
     gdaltest.pg_ds = ogr.Open('PG:' + gdaltest.pg_connection_string, update=1)
 
@@ -1092,7 +1084,7 @@ def test_ogr_pg_21_3d_geometries():
 def test_ogr_pg_22(with_and_without_postgis):
 
     if gdaltest.pg_ds is None:
-        return 'skip'
+        pytest.skip()
 
     ######################################################
     # Create Schema
@@ -1149,7 +1141,7 @@ def test_ogr_pg_22(with_and_without_postgis):
 def test_ogr_pg_23(with_and_without_postgis):
 
     if gdaltest.pg_ds is None:
-        return 'skip'
+        pytest.skip()
 
     gdal.PushErrorHandler('CPLQuietErrorHandler')
     gdaltest.pg_ds.ExecuteSQL('DELLAYER:datatypetest')
@@ -1307,9 +1299,8 @@ def check_value_23(layer_defn, feat):
         abs(feat.my_numericarray[0] - 100.12) > 1e-8 or \
         abs(feat.my_numeric5array[0] - 10) > 1e-8 or \
             abs(feat.my_numeric5_3array[0] - 10.12) > 1e-8:
-        gdaltest.post_reason('Wrong values')
         feat.DumpReadable()
-        return 'fail'
+        pytest.fail('Wrong values')
 
     geom = feat.GetGeometryRef()
     assert geom is not None, 'geom is none'
@@ -1326,7 +1317,7 @@ def check_value_23(layer_defn, feat):
 def test_ogr_pg_24(with_and_without_postgis):
 
     if gdaltest.pg_ds is None:
-        return 'skip'
+        pytest.skip()
 
     ds = ogr.Open('PG:' + gdaltest.pg_connection_string, update=1)
 
@@ -1350,7 +1341,7 @@ def test_ogr_pg_24(with_and_without_postgis):
 def test_ogr_pg_25(with_and_without_postgis):
 
     if gdaltest.pg_ds is None:
-        return 'skip'
+        pytest.skip()
 
     ds = ogr.Open('PG:' + gdaltest.pg_connection_string, update=1)
 
@@ -1376,7 +1367,7 @@ def test_ogr_pg_25(with_and_without_postgis):
 def test_ogr_pg_28(with_and_without_postgis):
 
     if gdaltest.pg_ds is None:
-        return 'skip'
+        pytest.skip()
 
     gdal.SetConfigOption('PG_USE_COPY', "NO")
 
@@ -1424,7 +1415,7 @@ def test_ogr_pg_28(with_and_without_postgis):
 def test_ogr_pg_29(with_and_without_postgis):
 
     if gdaltest.pg_ds is None:
-        return 'skip'
+        pytest.skip()
 
     ds = ogr.Open('PG:' + gdaltest.pg_connection_string, update=1)
 
@@ -1453,7 +1444,7 @@ def test_ogr_pg_29(with_and_without_postgis):
 def test_ogr_pg_30(with_and_without_postgis):
 
     if gdaltest.pg_ds is None:
-        return 'skip'
+        pytest.skip()
 
     gdal.SetConfigOption('PG_USE_COPY', 'YES')
 
@@ -1498,7 +1489,7 @@ def test_ogr_pg_30(with_and_without_postgis):
 def test_ogr_pg_31(with_and_without_postgis):
 
     if gdaltest.pg_ds is None:
-        return 'skip'
+        pytest.skip()
 
     srs = osr.SpatialReference()
     srs.ImportFromEPSG(4326)
@@ -1535,7 +1526,7 @@ def test_ogr_pg_31(with_and_without_postgis):
 def test_ogr_pg_32(with_and_without_postgis):
 
     if gdaltest.pg_ds is None or not gdaltest.pg_has_postgis:
-        return 'skip'
+        pytest.skip()
 
     gdaltest.pg_ds.ExecuteSQL("DELETE FROM spatial_ref_sys")
 
@@ -1549,9 +1540,8 @@ def test_ogr_pg_32(with_and_without_postgis):
     sql_lyr = gdaltest.pg_ds.ExecuteSQL("SELECT COUNT(*) FROM spatial_ref_sys")
     feat = sql_lyr.GetNextFeature()
     if feat.count != 1:
-        gdaltest.post_reason('did not get expected count after step (1)')
         feat.DumpReadable()
-        return 'fail'
+        pytest.fail('did not get expected count after step (1)')
     gdaltest.pg_ds.ReleaseResultSet(sql_lyr)
 
     ######################################################
@@ -1565,9 +1555,8 @@ def test_ogr_pg_32(with_and_without_postgis):
     sql_lyr = gdaltest.pg_ds.ExecuteSQL("SELECT COUNT(*) FROM spatial_ref_sys")
     feat = sql_lyr.GetNextFeature()
     if feat.count != 1:
-        gdaltest.post_reason('did not get expected count after step (2)')
         feat.DumpReadable()
-        return 'fail'
+        pytest.fail('did not get expected count after step (2)')
     gdaltest.pg_ds.ReleaseResultSet(sql_lyr)
 
     ######################################################
@@ -1581,9 +1570,8 @@ def test_ogr_pg_32(with_and_without_postgis):
     sql_lyr = gdaltest.pg_ds.ExecuteSQL("SELECT COUNT(*) FROM spatial_ref_sys")
     feat = sql_lyr.GetNextFeature()
     if feat.count != 1:
-        gdaltest.post_reason('did not get expected count after step (3)')
         feat.DumpReadable()
-        return 'fail'
+        pytest.fail('did not get expected count after step (3)')
     gdaltest.pg_ds.ReleaseResultSet(sql_lyr)
 
     ######################################################
@@ -1604,9 +1592,8 @@ def test_ogr_pg_32(with_and_without_postgis):
     feat = sql_lyr.GetNextFeature()
     # Must be 2 now
     if feat.count != 2:
-        gdaltest.post_reason('did not get expected count after step (4)')
         feat.DumpReadable()
-        return 'fail'
+        pytest.fail('did not get expected count after step (4)')
     gdaltest.pg_ds.ReleaseResultSet(sql_lyr)
 
     ######################################################
@@ -1654,9 +1641,8 @@ def test_ogr_pg_32(with_and_without_postgis):
     feat = sql_lyr.GetNextFeature()
     # Must be 3 now
     if feat.count != 3:
-        gdaltest.post_reason('did not get expected count after step (5)')
         feat.DumpReadable()
-        return 'fail'
+        pytest.fail('did not get expected count after step (5)')
     gdaltest.pg_ds.ReleaseResultSet(sql_lyr)
 
     return 'success'
@@ -1668,7 +1654,7 @@ def test_ogr_pg_32(with_and_without_postgis):
 def test_ogr_pg_33(with_and_without_postgis):
 
     if gdaltest.pg_ds is None:
-        return 'skip'
+        pytest.skip()
 
     gdaltest.pg_lyr = gdaltest.pg_ds.GetLayerByName('tpoly')
     assert gdaltest.pg_lyr is not None, 'did not get tpoly layer'
@@ -1688,7 +1674,7 @@ def test_ogr_pg_33(with_and_without_postgis):
 def test_ogr_pg_34(with_and_without_postgis):
 
     if gdaltest.pg_ds is None:
-        return 'skip'
+        pytest.skip()
 
     # We only test that on Linux since setting os.environ['XXX']
     # is not guaranteed to have effects on system not supporting putenv
@@ -1724,7 +1710,7 @@ def test_ogr_pg_34(with_and_without_postgis):
 def test_ogr_pg_35(with_and_without_postgis):
 
     if gdaltest.pg_ds is None:
-        return 'skip'
+        pytest.skip()
 
     gdal.PushErrorHandler()
     try:
@@ -1756,7 +1742,7 @@ def test_ogr_pg_35(with_and_without_postgis):
 def test_ogr_pg_36(with_and_without_postgis):
 
     if gdaltest.pg_ds is None:
-        return 'skip'
+        pytest.skip()
 
     if gdaltest.pg_has_postgis:
         lyr = gdaltest.pg_ds.CreateLayer('table36_base', geom_type=ogr.wkbPoint)
@@ -1802,7 +1788,7 @@ def test_ogr_pg_36(with_and_without_postgis):
 def test_ogr_pg_36_bis(with_and_without_postgis):
 
     if gdaltest.pg_ds is None:
-        return 'skip'
+        pytest.skip()
 
     ds = ogr.Open('PG:' + gdaltest.pg_connection_string + ' TABLES=table36_base', update=1)
 
@@ -1824,7 +1810,7 @@ def test_ogr_pg_36_bis(with_and_without_postgis):
 def test_ogr_pg_37(with_and_without_postgis):
 
     if gdaltest.pg_ds is None or not gdaltest.pg_has_postgis:
-        return 'skip'
+        pytest.skip()
 
     gdaltest.pg_ds.ExecuteSQL('CREATE TABLE table37_base ( col1 CHAR(1) )')
     gdaltest.pg_ds.ExecuteSQL('CREATE TABLE table37_inherited ( col2 CHAR(1) ) INHERITS ( table37_base )')
@@ -1850,7 +1836,7 @@ def test_ogr_pg_37(with_and_without_postgis):
 
 def test_ogr_pg_38(with_and_without_postgis):
     if gdaltest.pg_ds is None or not gdaltest.pg_has_postgis:
-        return 'skip'
+        pytest.skip()
 
     sql_lyr = gdaltest.pg_ds.ExecuteSQL("SELECT AddGeometryColumn('public','table37_base','pointBase',-1,'POINT',2)")
     gdaltest.pg_ds.ReleaseResultSet(sql_lyr)
@@ -1870,10 +1856,9 @@ def test_ogr_pg_38(with_and_without_postgis):
     assert gfld_defn is not None
     assert gfld_defn.GetType() == ogr.wkbPoint
     if lyr.GetLayerDefn().GetGeomFieldCount() != 3:
-        print(lyr.GetLayerDefn().GetGeomFieldCount())
         for i in range(lyr.GetLayerDefn().GetGeomFieldCount()):
             print(lyr.GetLayerDefn().GetGeomFieldDefn(i).GetName())
-        return 'fail'
+        pytest.fail(lyr.GetLayerDefn().GetGeomFieldCount())
 
     # Explicit query to 'table37_inherited(wkb_geometry)' should also work
     lyr = ds.GetLayerByName('table37_inherited(wkb_geometry)')
@@ -1909,7 +1894,7 @@ def test_ogr_pg_38(with_and_without_postgis):
 
 def test_ogr_pg_39(with_and_without_postgis):
     if gdaltest.pg_ds is None:
-        return 'skip'
+        pytest.skip()
 
     if not gdaltest.pg_has_postgis:
         gdaltest.pg_ds.ExecuteSQL("CREATE VIEW testview AS SELECT * FROM table36_base")
@@ -1979,7 +1964,7 @@ def test_ogr_pg_39(with_and_without_postgis):
 
 def test_ogr_pg_40(with_and_without_postgis):
     if gdaltest.pg_ds is None:
-        return 'skip'
+        pytest.skip()
 
     layer = gdaltest.pg_ds.GetLayerByName('tpoly')
     assert layer.GetFeature(0) is None
@@ -1992,7 +1977,7 @@ def test_ogr_pg_40(with_and_without_postgis):
 
 def test_ogr_pg_41(with_and_without_postgis):
     if gdaltest.pg_ds is None:
-        return 'skip'
+        pytest.skip()
 
     ds = ogr.Open('PG:' + gdaltest.pg_connection_string + ' active_schema=AutoTest-schema', update=1)
 
@@ -2040,7 +2025,7 @@ def test_ogr_pg_41(with_and_without_postgis):
 
 def test_ogr_pg_42(with_and_without_postgis):
     if gdaltest.pg_ds is None:
-        return 'skip'
+        pytest.skip()
 
     ds = ogr.Open('PG:' + gdaltest.pg_connection_string + ' schemas=AutoTest-schema', update=1)
 
@@ -2082,7 +2067,7 @@ def test_ogr_pg_42(with_and_without_postgis):
 
 def test_ogr_pg_43(with_and_without_postgis):
     if gdaltest.pg_ds is None:
-        return 'skip'
+        pytest.skip()
 
     ds = ogr.Open('PG:' + gdaltest.pg_connection_string + ' schemas=public,AutoTest-schema', update=1)
 
@@ -2110,7 +2095,7 @@ def test_ogr_pg_43(with_and_without_postgis):
 def test_ogr_pg_44(with_and_without_postgis):
 
     if gdaltest.pg_ds is None:
-        return 'skip'
+        pytest.skip()
 
     gdaltest.pg_lyr = gdaltest.pg_ds.CreateLayer('select', options=['OVERWRITE=YES', 'GEOMETRY_NAME=where', 'DIM=3'])
     ogrtest.quick_create_layer_def(gdaltest.pg_lyr, [('from', ogr.OFTReal)])
@@ -2153,7 +2138,7 @@ def test_ogr_pg_44(with_and_without_postgis):
 def test_ogr_pg_45(with_and_without_postgis):
 
     if gdaltest.pg_ds is None:
-        return 'skip'
+        pytest.skip()
 
     lyr = gdaltest.pg_ds.GetLayerByName('tpoly')
 
@@ -2183,7 +2168,7 @@ def test_ogr_pg_45(with_and_without_postgis):
 def test_ogr_pg_46(with_and_without_postgis):
 
     if gdaltest.pg_ds is None:
-        return 'skip'
+        pytest.skip()
 
     nFeatures = 1000
 
@@ -2241,18 +2226,17 @@ def test_ogr_pg_46(with_and_without_postgis):
 def test_ogr_pg_47(with_and_without_postgis):
 
     if gdaltest.pg_ds is None:
-        return 'skip'
+        pytest.skip()
 
     if not gdaltest.pg_has_postgis:
-        return 'skip'
+        pytest.skip()
 
     # Create table with geography column
     gdaltest.pg_ds.ExecuteSQL("DELETE FROM spatial_ref_sys")
     gdaltest.pg_ds.ExecuteSQL("""INSERT INTO "spatial_ref_sys" ("srid","auth_name","auth_srid","srtext","proj4text") VALUES (4326,'EPSG',4326,'GEOGCS["WGS 84",DATUM["WGS_1984",SPHEROID["WGS 84",6378137,298.257223563,AUTHORITY["EPSG","7030"]],AUTHORITY["EPSG","6326"]],PRIMEM["Greenwich",0,AUTHORITY["EPSG","8901"]],UNIT["degree",0.01745329251994328,AUTHORITY["EPSG","9122"]],AUTHORITY["EPSG","4326"]]','+proj=longlat +ellps=WGS84 +datum=WGS84 +no_defs ')""")
 
     if gdaltest.pg_ds.GetLayerByName('geography_columns') is None:
-        gdaltest.post_reason('autotest database must be created with PostGIS >= 1.5')
-        return 'skip'
+        pytest.skip('autotest database must be created with PostGIS >= 1.5')
 
     gdaltest.pg_ds = None
     gdaltest.pg_ds = ogr.Open('PG:' + gdaltest.pg_connection_string, update=1)
@@ -2295,7 +2279,7 @@ def test_ogr_pg_47(with_and_without_postgis):
     feat = geography_columns_lyr.GetNextFeature()
     if feat.GetFieldAsString('f_geography_column') != 'my_geog':
         feat.DumpReadable()
-        return 'fail'
+        pytest.fail()
     gdaltest.pg_ds.ReleaseResultSet(geography_columns_lyr)
 
     # Get the layer by name
@@ -2348,7 +2332,7 @@ def test_ogr_pg_47(with_and_without_postgis):
 def test_ogr_pg_48(with_and_without_postgis):
 
     if gdaltest.pg_ds is None:
-        return 'skip'
+        pytest.skip()
 
     gdaltest.pg_ds.ExecuteSQL("CREATE TABLE no_pk_table (gid serial NOT NULL, other_id INTEGER)")
     gdaltest.pg_ds.ExecuteSQL("INSERT INTO no_pk_table (gid, other_id) VALUES (1, 10)")
@@ -2393,19 +2377,16 @@ def test_ogr_pg_48(with_and_without_postgis):
     assert lyr.GetFIDColumn() == '', 'got a non NULL FID column'
 
     if feat.GetFID() != 0:
-        gdaltest.post_reason('did not get expected FID')
         feat.DumpReadable()
-        return 'fail'
+        pytest.fail('did not get expected FID')
 
     if feat.GetFieldAsInteger('gid') != 1:
-        gdaltest.post_reason('did not get expected gid')
         feat.DumpReadable()
-        return 'fail'
+        pytest.fail('did not get expected gid')
 
     if feat.GetFieldAsInteger('other_id') != 10:
-        gdaltest.post_reason('did not get expected other_id')
         feat.DumpReadable()
-        return 'fail'
+        pytest.fail('did not get expected other_id')
 
     return 'success'
 
@@ -2416,7 +2397,7 @@ def test_ogr_pg_48(with_and_without_postgis):
 def test_ogr_pg_49(with_and_without_postgis):
 
     if gdaltest.pg_ds is None:
-        return 'skip'
+        pytest.skip()
 
     gdal.SetConfigOption('PGSQL_OGR_FID', 'other_id')
     gdaltest.pg_ds = None
@@ -2430,9 +2411,8 @@ def test_ogr_pg_49(with_and_without_postgis):
     assert lyr.GetFIDColumn() == 'other_id', 'did not get expected FID column'
 
     if feat.GetFID() != 10:
-        gdaltest.post_reason('did not get expected FID')
         feat.DumpReadable()
-        return 'fail'
+        pytest.fail('did not get expected FID')
 
     return 'success'
 
@@ -2444,7 +2424,7 @@ def test_ogr_pg_49(with_and_without_postgis):
 def test_ogr_pg_50(with_and_without_postgis):
 
     if gdaltest.pg_ds is None:
-        return 'skip'
+        pytest.skip()
 
     gdaltest.pg_lyr = gdaltest.pg_ds.GetLayerByName('tpoly')
     assert gdaltest.pg_lyr is not None, 'did not get tpoly layer'
@@ -2480,25 +2460,21 @@ def test_ogr_pg_50(with_and_without_postgis):
             got_val = feat.GetField('AREA')
             if value == 'NaN':
                 if not gdaltest.isnan(got_val):
-                    print(feat.GetFieldAsString('AREA') + ' returned for AREA instead of ' + value)
                     gdaltest.pg_lyr.ResetReading()  # to close implicit transaction
-                    return 'fail'
+                    pytest.fail(feat.GetFieldAsString('AREA') + ' returned for AREA instead of ' + value)
             elif got_val != float(value):
-                print(feat.GetFieldAsString('AREA') + ' returned for AREA instead of ' + value)
                 gdaltest.pg_lyr.ResetReading()  # to close implicit transaction
-                return 'fail'
+                pytest.fail(feat.GetFieldAsString('AREA') + ' returned for AREA instead of ' + value)
 
             if bHasSetFieldDoubleList:
                 got_val = feat.GetFieldAsDoubleList(feature_def.GetFieldIndex('REALLIST'))
                 if value == 'NaN':
                     if not gdaltest.isnan(got_val[0]) or not gdaltest.isnan(got_val[1]):
-                        print(feat.GetFieldAsString('REALLIST') + ' returned for REALLIST instead of ' + value)
                         gdaltest.pg_lyr.ResetReading()  # to close implicit transaction
-                        return 'fail'
+                        pytest.fail(feat.GetFieldAsString('REALLIST') + ' returned for REALLIST instead of ' + value)
                 elif got_val[0] != float(value) or got_val[1] != float(value):
-                    print(feat.GetFieldAsString('REALLIST') + ' returned for REALLIST instead of ' + value)
                     gdaltest.pg_lyr.ResetReading()  # to close implicit transaction
-                    return 'fail'
+                    pytest.fail(feat.GetFieldAsString('REALLIST') + ' returned for REALLIST instead of ' + value)
 
     gdaltest.pg_lyr.ResetReading()  # to close implicit transaction
 
@@ -2511,11 +2487,11 @@ def test_ogr_pg_50(with_and_without_postgis):
 def test_ogr_pg_51(with_and_without_postgis):
 
     if gdaltest.pg_ds is None:
-        return 'skip'
+        pytest.skip()
 
     import test_cli_utilities
     if test_cli_utilities.get_test_ogrsf_path() is None:
-        return 'skip'
+        pytest.skip()
 
     ret = gdaltest.runexternal(test_cli_utilities.get_test_ogrsf_path() + ' "' + 'PG:' + gdaltest.pg_connection_string + '" tpoly testview')
 
@@ -2530,11 +2506,11 @@ def test_ogr_pg_51(with_and_without_postgis):
 def test_ogr_pg_52(with_and_without_postgis):
 
     if gdaltest.pg_ds is None:
-        return 'skip'
+        pytest.skip()
 
     import test_cli_utilities
     if test_cli_utilities.get_test_ogrsf_path() is None:
-        return 'skip'
+        pytest.skip()
 
     ret = gdaltest.runexternal(test_cli_utilities.get_test_ogrsf_path() + ' "' + 'PG:' + gdaltest.pg_connection_string + '" -sql "SELECT * FROM tpoly"')
 
@@ -2549,7 +2525,7 @@ def test_ogr_pg_52(with_and_without_postgis):
 def test_ogr_pg_53(with_and_without_postgis):
 
     if gdaltest.pg_ds is None:
-        return 'skip'
+        pytest.skip()
 
     lyr = gdaltest.pg_ds.CreateLayer('no_geometry_table', geom_type=ogr.wkbNone)
     field_defn = ogr.FieldDefn('foo')
@@ -2604,7 +2580,7 @@ def test_ogr_pg_53(with_and_without_postgis):
 def test_ogr_pg_53_bis(with_and_without_postgis):
     import test_cli_utilities
     if test_cli_utilities.get_ogr2ogr_path() is None:
-        return 'skip'
+        pytest.skip()
 
     f = open('tmp/no_geometry_table.csv', 'wt')
     f.write('foo,bar\n')
@@ -2628,10 +2604,10 @@ def test_ogr_pg_53_bis(with_and_without_postgis):
 def test_ogr_pg_54(with_and_without_postgis):
 
     if gdaltest.pg_ds is None:
-        return 'skip'
+        pytest.skip()
 
     if not gdaltest.pg_has_postgis:
-        return 'skip'
+        pytest.skip()
 
     if gdaltest.pg_has_postgis_2:
         sql_lyr = gdaltest.pg_ds.ExecuteSQL("SELECT ST_AsEWKB(GeomFromEWKT('POINT (0 1 2)'))")
@@ -2652,10 +2628,10 @@ def test_ogr_pg_54(with_and_without_postgis):
 def test_ogr_pg_55(with_and_without_postgis):
 
     if gdaltest.pg_ds is None:
-        return 'skip'
+        pytest.skip()
 
     if not gdaltest.pg_has_postgis:
-        return 'skip'
+        pytest.skip()
 
     layer = gdaltest.pg_ds.CreateLayer('ogr_pg_55', options=['DIM=3'])
     feat = ogr.Feature(layer.GetLayerDefn())
@@ -2684,7 +2660,7 @@ def test_ogr_pg_55(with_and_without_postgis):
 def test_ogr_pg_56(with_and_without_postgis):
 
     if gdaltest.pg_ds is None:
-        return 'skip'
+        pytest.skip()
 
     gdaltest.pg_ds.ExecuteSQL('CREATE TABLE ogr_pg_56 ( bar varchar, baz varchar ) WITH (OIDS=FALSE)')
 
@@ -2728,39 +2704,33 @@ def test_ogr_pg_56(with_and_without_postgis):
 
     feat = lyr.GetNextFeature()
     if feat.GetField(0) is not None or feat.GetField(1) is not None:
-        gdaltest.post_reason('did not get expected value for feat %d' % feat.GetFID())
         feat.DumpReadable()
-        return 'fail'
+        pytest.fail('did not get expected value for feat %d' % feat.GetFID())
 
     feat = lyr.GetNextFeature()
     if feat.GetField(0) != '' or feat.GetField(1) is not None:
-        gdaltest.post_reason('did not get expected value for feat %d' % feat.GetFID())
         feat.DumpReadable()
-        return 'fail'
+        pytest.fail('did not get expected value for feat %d' % feat.GetFID())
 
     feat = lyr.GetNextFeature()
     if feat.GetField(0) is not None or feat.GetField(1) != '':
-        gdaltest.post_reason('did not get expected value for feat %d' % feat.GetFID())
         feat.DumpReadable()
-        return 'fail'
+        pytest.fail('did not get expected value for feat %d' % feat.GetFID())
 
     feat = lyr.GetNextFeature()
     if feat.GetField(0) != '' or feat.GetField(1) != '':
-        gdaltest.post_reason('did not get expected value for feat %d' % feat.GetFID())
         feat.DumpReadable()
-        return 'fail'
+        pytest.fail('did not get expected value for feat %d' % feat.GetFID())
 
     feat = lyr.GetNextFeature()
     if feat.GetField(0) != 'bar' or feat.GetField(1) != '':
-        gdaltest.post_reason('did not get expected value for feat %d' % feat.GetFID())
         feat.DumpReadable()
-        return 'fail'
+        pytest.fail('did not get expected value for feat %d' % feat.GetFID())
 
     feat = lyr.GetNextFeature()
     if feat.GetField(0) != '' or feat.GetField(1) != 'baz':
-        gdaltest.post_reason('did not get expected value for feat %d' % feat.GetFID())
         feat.DumpReadable()
-        return 'fail'
+        pytest.fail('did not get expected value for feat %d' % feat.GetFID())
 
     ds = None
 
@@ -2773,7 +2743,7 @@ def test_ogr_pg_56(with_and_without_postgis):
 def test_ogr_pg_57(with_and_without_postgis):
 
     if gdaltest.pg_ds is None:
-        return 'skip'
+        pytest.skip()
 
     lyr = gdaltest.pg_ds.CreateLayer('ogr_pg_57')
     lyr.CreateField(ogr.FieldDefn('acolumn', ogr.OFTString))
@@ -2792,7 +2762,7 @@ def test_ogr_pg_57(with_and_without_postgis):
 def test_ogr_pg_58(with_and_without_postgis):
 
     if gdaltest.pg_ds is None:
-        return 'skip'
+        pytest.skip()
 
     lyr = gdaltest.pg_ds.CreateLayer('ogr_pg_58')
     lyr.CreateField(ogr.FieldDefn('strcolumn', ogr.OFTString))
@@ -2843,11 +2813,11 @@ def test_ogr_pg_58(with_and_without_postgis):
 def test_ogr_pg_59(with_and_without_postgis):
 
     if gdaltest.pg_ds is None:
-        return 'skip'
+        pytest.skip()
 
     import test_cli_utilities
     if test_cli_utilities.get_ogr2ogr_path() is None:
-        return 'skip'
+        pytest.skip()
 
     gdaltest.runexternal(
         test_cli_utilities.get_ogr2ogr_path() +
@@ -2871,7 +2841,7 @@ def test_ogr_pg_59(with_and_without_postgis):
 def test_ogr_pg_60(with_and_without_postgis):
 
     if gdaltest.pg_ds is None:
-        return 'skip'
+        pytest.skip()
 
     sql_lyr = gdaltest.pg_ds.ExecuteSQL("CREATE TABLE ogr_pg_60(id integer,"
                                         "name varchar(50),primary key (id)) "
@@ -2902,7 +2872,7 @@ def test_ogr_pg_60(with_and_without_postgis):
 def test_ogr_pg_61(with_and_without_postgis):
 
     if gdaltest.pg_ds is None:
-        return 'skip'
+        pytest.skip()
 
     gdaltest.pg_ds.ExecuteSQL('CREATE TABLE ogr_pg_61 ( id integer NOT NULL PRIMARY KEY, bar varchar )')
 
@@ -2929,15 +2899,13 @@ def test_ogr_pg_61(with_and_without_postgis):
 
     feat = lyr.GetFeature(10)
     if not feat.IsFieldNull(0):
-        gdaltest.post_reason('did not get expected value for feat %d' % feat.GetFID())
         feat.DumpReadable()
-        return 'fail'
+        pytest.fail('did not get expected value for feat %d' % feat.GetFID())
 
     feat = lyr.GetFeature(20)
     if feat.GetField(0) != 'baz':
-        gdaltest.post_reason('did not get expected value for feat %d' % feat.GetFID())
         feat.DumpReadable()
-        return 'fail'
+        pytest.fail('did not get expected value for feat %d' % feat.GetFID())
 
     ds = None
 
@@ -2950,10 +2918,10 @@ def test_ogr_pg_61(with_and_without_postgis):
 def test_ogr_pg_62(with_and_without_postgis):
 
     if gdaltest.pg_ds is None:
-        return 'skip'
+        pytest.skip()
 
     if not gdaltest.pg_has_postgis:
-        return 'skip'
+        pytest.skip()
 
     # Test on a regular request in a table
     srs = osr.SpatialReference()
@@ -2981,11 +2949,11 @@ def test_ogr_pg_62(with_and_without_postgis):
 def test_ogr_pg_63(with_and_without_postgis):
 
     if gdaltest.pg_ds is None:
-        return 'skip'
+        pytest.skip()
 
     # No need to test it in the non PostGIS case
     if not gdaltest.pg_has_postgis:
-        return 'skip'
+        pytest.skip()
 
     lyr = gdaltest.pg_ds.CreateLayer('ogr_pg_63', options=['COLUMN_TYPES=foo=int8,bar=numeric(10,5),baz=hstore,baw=numeric(20,0)'])
     lyr.CreateField(ogr.FieldDefn('foo', ogr.OFTString))
@@ -3018,11 +2986,11 @@ def test_ogr_pg_63(with_and_without_postgis):
 def test_ogr_pg_64(with_and_without_postgis):
 
     if gdaltest.pg_ds is None:
-        return 'skip'
+        pytest.skip()
 
     # No need to test it in the non PostGIS case
     if not gdaltest.pg_has_postgis:
-        return 'skip'
+        pytest.skip()
 
     ds = ogr.Open('PG:' + gdaltest.pg_connection_string, update=1)
     lyr = ds.GetLayerByName('ogr_pg_63')
@@ -3055,10 +3023,10 @@ def test_ogr_pg_64(with_and_without_postgis):
 def test_ogr_pg_65(with_and_without_postgis):
 
     if gdaltest.pg_ds is None:
-        return 'skip'
+        pytest.skip()
 
     if not gdaltest.pg_has_postgis:
-        return 'skip'
+        pytest.skip()
 
     ds = ogr.Open('PG:' + gdaltest.pg_connection_string, update=1)
     assert ds.TestCapability(ogr.ODsCCreateGeomFieldAfterCreateLayer) != 0
@@ -3094,12 +3062,12 @@ def test_ogr_pg_65(with_and_without_postgis):
        feat.GetGeomFieldRef('geom1').ExportToWkt() != 'POINT (1 2)' or \
        feat.GetGeomFieldRef('geom2').ExportToWkt() != 'LINESTRING (3 4 5,6 7 8)':
         feat.DumpReadable()
-        return 'fail'
+        pytest.fail()
     feat = lyr.GetNextFeature()
     if feat.GetGeomFieldRef('geom1') is not None or \
        feat.GetGeomFieldRef('geom2') is not None:
         feat.DumpReadable()
-        return 'fail'
+        pytest.fail()
 
     ds = None
     for i in range(2):
@@ -3120,12 +3088,12 @@ def test_ogr_pg_65(with_and_without_postgis):
                 feat.GetGeomFieldRef('geom1').ExportToWkt() != 'POINT (1 2)' or \
                 feat.GetGeomFieldRef('geom2').ExportToWkt() != 'LINESTRING (3 4 5,6 7 8)':
             feat.DumpReadable()
-            return 'fail'
+            pytest.fail()
         feat = lyr.GetNextFeature()
         if feat.GetGeomFieldRef('geom1') is not None or \
            feat.GetGeomFieldRef('geom2') is not None:
             feat.DumpReadable()
-            return 'fail'
+            pytest.fail()
         if i == 1:
             ds.ReleaseResultSet(lyr)
 
@@ -3148,12 +3116,12 @@ def test_ogr_pg_65(with_and_without_postgis):
     if feat.GetGeomFieldRef('geom1').ExportToWkt() != 'POINT (3 4)' or \
        feat.GetGeomFieldRef('geom2').ExportToWkt() != 'LINESTRING (4 5 6,7 8 9)':
         feat.DumpReadable()
-        return 'fail'
+        pytest.fail()
     feat = lyr.GetNextFeature()
     if feat.GetGeomFieldRef('geom1') is not None or \
             feat.GetGeomFieldRef('geom2') is not None:
         feat.DumpReadable()
-        return 'fail'
+        pytest.fail()
 
     import test_cli_utilities
     if test_cli_utilities.get_ogr2ogr_path() is not None:
@@ -3173,14 +3141,14 @@ def test_ogr_pg_65(with_and_without_postgis):
 def test_ogr_pg_66(with_and_without_postgis):
 
     if gdaltest.pg_ds is None:
-        return 'skip'
+        pytest.skip()
 
     if not gdaltest.pg_has_postgis:
-        return 'skip'
+        pytest.skip()
 
     import test_cli_utilities
     if test_cli_utilities.get_test_ogrsf_path() is None:
-        return 'skip'
+        pytest.skip()
 
     ret = gdaltest.runexternal(test_cli_utilities.get_test_ogrsf_path() + ' "' + 'PG:' + gdaltest.pg_connection_string + '" ogr_pg_65')
 
@@ -3195,10 +3163,10 @@ def test_ogr_pg_66(with_and_without_postgis):
 def test_ogr_pg_67(with_and_without_postgis):
 
     if gdaltest.pg_ds is None:
-        return 'skip'
+        pytest.skip()
 
     if not gdaltest.pg_has_postgis:
-        return 'skip'
+        pytest.skip()
 
     lyr = gdaltest.pg_ds.CreateLayer('ogr_pg_67')
     lyr.ResetReading()  # to trigger layer creation
@@ -3238,10 +3206,10 @@ def test_ogr_pg_67(with_and_without_postgis):
 def test_ogr_pg_68(with_and_without_postgis):
 
     if gdaltest.pg_ds is None:
-        return 'skip'
+        pytest.skip()
 
     if not gdaltest.pg_has_postgis:
-        return 'skip'
+        pytest.skip()
 
     srs = osr.SpatialReference()
     srs.ImportFromEPSG(4326)
@@ -3292,7 +3260,7 @@ def has_run_load_tables(ds):
 def test_ogr_pg_69(with_and_without_postgis):
 
     if gdaltest.pg_ds is None:
-        return 'skip'
+        pytest.skip()
 
     gdaltest.pg_ds = None
     gdaltest.pg_ds = ogr.Open('PG:' + gdaltest.pg_connection_string)
@@ -3323,7 +3291,7 @@ def test_ogr_pg_69(with_and_without_postgis):
 def test_ogr_pg_70(with_and_without_postgis):
 
     if gdaltest.pg_ds is None:
-        return 'skip'
+        pytest.skip()
 
     gdal.SetConfigOption('OGR_PG_DEFERRED_CREATION', 'NO')
     lyr = gdaltest.pg_ds.CreateLayer('ogr_pg_70')
@@ -3375,10 +3343,10 @@ def test_ogr_pg_70(with_and_without_postgis):
 def test_ogr_pg_71(with_and_without_postgis):
 
     if gdaltest.pg_ds is None:
-        return 'skip'
+        pytest.skip()
 
     if not gdaltest.pg_has_postgis:
-        return 'skip'
+        pytest.skip()
 
     curve_lyr = gdaltest.pg_ds.CreateLayer('test_curve')
     curve_lyr2 = gdaltest.pg_ds.CreateLayer('test_curve_3d', geom_type=ogr.wkbUnknown | ogr.wkb25DBit)
@@ -3497,7 +3465,7 @@ def test_ogr_pg_71(with_and_without_postgis):
 def test_ogr_pg_72(with_and_without_postgis):
 
     if gdaltest.pg_ds is None:
-        return 'skip'
+        pytest.skip()
 
     # Regular layer with 32 bit IDs
     lyr = gdaltest.pg_ds.CreateLayer('ogr_pg_72')
@@ -3538,7 +3506,7 @@ def test_ogr_pg_72(with_and_without_postgis):
     f = lyr.GetNextFeature()
     if f.GetFID() != 123456789012345:
         f.DumpReadable()
-        return 'fail'
+        pytest.fail()
 
     lyr.ResetReading()  # to close implicit transaction
 
@@ -3551,10 +3519,10 @@ def test_ogr_pg_72(with_and_without_postgis):
 def test_ogr_pg_73(with_and_without_postgis):
 
     if gdaltest.pg_ds is None:
-        return 'skip'
+        pytest.skip()
 
     if not gdaltest.pg_has_postgis:
-        return 'skip'
+        pytest.skip()
 
     gdal.SetConfigOption('PG_USE_COPY', 'NO')
 
@@ -3636,10 +3604,10 @@ def test_ogr_pg_73(with_and_without_postgis):
 def test_ogr_pg_74(with_and_without_postgis):
 
     if gdaltest.pg_ds is None:
-        return 'skip'
+        pytest.skip()
 
     if not gdaltest.pg_has_postgis:
-        return 'skip'
+        pytest.skip()
 
     lyr = gdaltest.pg_ds.CreateLayer('ogr_pg_74', geom_type=ogr.wkbNone)
 
@@ -3726,7 +3694,7 @@ def test_ogr_pg_74(with_and_without_postgis):
     f = lyr.GetNextFeature()
     if not f.IsFieldNull('field_string'):
         f.DumpReadable()
-        return 'fail'
+        pytest.fail()
 
     f = lyr.GetNextFeature()
     if f.GetField('field_string') != 'a\'b' or f.GetField('field_int') != 123 or \
@@ -3736,12 +3704,12 @@ def test_ogr_pg_74(with_and_without_postgis):
        f.GetField('field_datetime3') != '2015/06/30 12:34:56.123+00' or \
        not f.IsFieldSet('field_date') or not f.IsFieldSet('field_time'):
         f.DumpReadable()
-        return 'fail'
+        pytest.fail()
 
     f = lyr.GetNextFeature()
     if f.GetField('field_string') != 'b':
         f.DumpReadable()
-        return 'fail'
+        pytest.fail()
 
     lyr.ResetReading()  # to close implicit transaction
 
@@ -3775,10 +3743,10 @@ def test_ogr_pg_74(with_and_without_postgis):
 def test_ogr_pg_75(with_and_without_postgis):
 
     if gdaltest.pg_ds is None:
-        return 'skip'
+        pytest.skip()
 
     if not gdaltest.pg_has_postgis:
-        return 'skip'
+        pytest.skip()
 
     lyr = gdaltest.pg_ds.CreateLayer('ogr_pg_75', geom_type=ogr.wkbNone, options=['FID=myfid'])
 
@@ -3806,10 +3774,10 @@ def test_ogr_pg_75(with_and_without_postgis):
     assert ret == 0
     if feat.GetFID() < 0:
         feat.DumpReadable()
-        return 'fail'
+        pytest.fail()
     if feat.GetField('myfid') != feat.GetFID():
         feat.DumpReadable()
-        return 'fail'
+        pytest.fail()
 
     feat.SetField('str', 'foo')
     ret = lyr.SetFeature(feat)
@@ -3846,11 +3814,11 @@ def test_ogr_pg_75(with_and_without_postgis):
     f = lyr.GetNextFeature()
     if f.GetFID() != 10 or f.GetField('str') != 'first string' or f.GetField('str2') != 'second string' or f.GetField('myfid') != 10:
         f.DumpReadable()
-        return 'fail'
+        pytest.fail()
     f = lyr.GetFeature(f.GetFID())
     if f.GetFID() != 10 or f.GetField('str') != 'first string' or f.GetField('str2') != 'second string' or f.GetField('myfid') != 10:
         f.DumpReadable()
-        return 'fail'
+        pytest.fail()
     f = None
     lyr.ResetReading()  # to close implicit transaction
 
@@ -3870,7 +3838,7 @@ def ogr_pg_76_get_transaction_state(ds):
 def test_ogr_pg_76(with_and_without_postgis):
 
     if gdaltest.pg_ds is None:
-        return 'skip'
+        pytest.skip()
 
     assert gdaltest.pg_ds.TestCapability(ogr.ODsCTransactions) == 1
 
@@ -4155,7 +4123,7 @@ def ogr_pg_76_scenario4(lyr1, lyr2with_and_without_postgis):
 def test_ogr_pg_77(with_and_without_postgis):
     import test_cli_utilities
     if test_cli_utilities.get_ogr2ogr_path() is None:
-        return 'skip'
+        pytest.skip()
 
     gdaltest.pg_ds.ExecuteSQL('DELLAYER:ogr_pg_77_1')
     gdaltest.pg_ds.ExecuteSQL('DELLAYER:ogr_pg_77_2')
@@ -4210,7 +4178,7 @@ def test_ogr_pg_77(with_and_without_postgis):
 def test_ogr_pg_78(with_and_without_postgis):
 
     if gdaltest.pg_ds is None or not gdaltest.pg_has_postgis_2:
-        return 'skip'
+        pytest.skip()
 
     gdaltest.pg_ds.ExecuteSQL("CREATE TABLE ogr_pg_78 (ID INTEGER PRIMARY KEY)")
     gdaltest.pg_ds.ExecuteSQL("ALTER TABLE ogr_pg_78 ADD COLUMN my_geom GEOMETRY")
@@ -4262,13 +4230,13 @@ def test_ogr_pg_78(with_and_without_postgis):
                 if val is not None:
                     print('Fails on Travis. geom_type = %d' % lyr.GetGeomType())
                 else:
-                    return 'fail'
+                    pytest.fail()
             if lyr.GetSpatialRef() is None or lyr.GetSpatialRef().ExportToWkt().find('4326') < 0:
                 val = gdal.GetConfigOption('TRAVIS', None)
                 if val is not None:
                     print('Fails on Travis. GetSpatialRef() = %s' % str(lyr.GetSpatialRef()))
                 else:
-                    return 'fail'
+                    pytest.fail()
         if lyr.GetName() == 'ogr_pg_78_2':
             ogr_pg_78_2_found = True
             # No logic in geography_columns to get type/coordim/srid from constraints
@@ -4290,7 +4258,7 @@ def test_ogr_pg_78(with_and_without_postgis):
 def test_ogr_pg_79(with_and_without_postgis):
 
     if gdaltest.pg_ds is None:
-        return 'skip'
+        pytest.skip()
 
     # PRELUDE_STATEMENTS starting with BEGIN (use case: pg_bouncer in transaction pooling)
     ds = gdal.OpenEx('PG:' + gdaltest.pg_connection_string,
@@ -4301,7 +4269,7 @@ def test_ogr_pg_79(with_and_without_postgis):
     f = sql_lyr.GetNextFeature()
     if f.GetField(0) != '1h':
         f.DumpReadable()
-        return 'fail'
+        pytest.fail()
     ds.ReleaseResultSet(sql_lyr)
     ret = ds.StartTransaction()
     assert ret == 0
@@ -4319,7 +4287,7 @@ def test_ogr_pg_79(with_and_without_postgis):
     f = sql_lyr.GetNextFeature()
     if f.GetField(0) != '1h':
         f.DumpReadable()
-        return 'fail'
+        pytest.fail()
     ds.ReleaseResultSet(sql_lyr)
     ret = ds.StartTransaction()
     assert ret == 0
@@ -4356,7 +4324,7 @@ def test_ogr_pg_79(with_and_without_postgis):
 def test_ogr_pg_80():
 
     if gdaltest.pg_ds is None:
-        return 'skip'
+        pytest.skip()
 
     gdal.ErrorReset()
     with gdaltest.error_handler():
@@ -4373,7 +4341,7 @@ def test_ogr_pg_80():
 def test_ogr_pg_81():
 
     if gdaltest.pg_ds is None:
-        return 'skip'
+        pytest.skip()
 
     gdaltest.pg_ds.ReleaseResultSet(gdaltest.pg_ds.ExecuteSQL("create table ogr_pg_81_1(id varchar unique, foo varchar); SELECT AddGeometryColumn('ogr_pg_81_1','dummy',-1,'POINT',2);"))
     gdaltest.pg_ds.ReleaseResultSet(gdaltest.pg_ds.ExecuteSQL("create table ogr_pg_81_2(id varchar unique, foo varchar); SELECT AddGeometryColumn('ogr_pg_81_2','dummy',-1,'POINT',2);"))
@@ -4406,7 +4374,7 @@ def test_ogr_pg_81():
     f = lyr.GetNextFeature()
     if f['id'] != '2':
         f.DumpReadable()
-        return 'fail'
+        pytest.fail()
     lyr.ResetReading()  # flushes implicit transaction
 
     return 'success'
@@ -4421,7 +4389,7 @@ def test_ogr_pg_81():
 def test_ogr_pg_82():
 
     if gdaltest.pg_ds is None or not gdaltest.pg_has_postgis:
-        return 'skip'
+        pytest.skip()
 
     lyr = gdaltest.pg_ds.CreateLayer('ogr_pg_82', geom_type=ogr.wkbNone, options=['GEOMETRY_NAME=another_name'])
     lyr.CreateGeomField(ogr.GeomFieldDefn('my_geom', ogr.wkbPoint))
@@ -4436,7 +4404,7 @@ def test_ogr_pg_82():
 def test_ogr_pg_83():
 
     if gdaltest.pg_ds is None or not gdaltest.pg_has_postgis:
-        return 'skip'
+        pytest.skip()
 
     tests = [[ogr.wkbUnknown, [], 'POINT ZM (1 2 3 4)', 'POINT (1 2)'],
              [ogr.wkbUnknown, ['DIM=XYZM'], 'POINT ZM (1 2 3 4)', 'POINT ZM (1 2 3 4)'],
@@ -4499,7 +4467,7 @@ def test_ogr_pg_83():
 def test_ogr_pg_84():
 
     if gdaltest.pg_ds is None:
-        return 'skip'
+        pytest.skip()
 
     ds = ogr.Open('PG:' + gdaltest.pg_connection_string, update=1)
     lyr = ds.CreateLayer('ogr_pg_84', geom_type=ogr.wkbPoint, options=['OVERWRITE=YES', 'DESCRIPTION=foo'])
@@ -4556,7 +4524,7 @@ def test_ogr_pg_84():
 def test_ogr_pg_85():
 
     if gdaltest.pg_ds is None:
-        return 'skip'
+        pytest.skip()
 
     gdaltest.pg_ds.CreateLayer('ogr_pg_85_1')
     lyr = gdaltest.pg_ds.CreateLayer('ogr_pg_85_2')
@@ -4610,7 +4578,7 @@ def test_ogr_pg_85():
 def test_ogr_pg_86():
 
     if gdaltest.pg_ds is None:
-        return 'skip'
+        pytest.skip()
 
     old_val = gdal.GetConfigOption('PG_USE_COPY')
 
@@ -4625,7 +4593,7 @@ def test_ogr_pg_86():
     f = lyr.GetNextFeature()
     if f.GetField(0) != '3020':
         gdal.SetConfigOption('PG_USE_COPY', old_val)
-        return 'fail'
+        pytest.fail()
 
     gdal.SetConfigOption('PG_USE_COPY', 'NO')
 
@@ -4638,7 +4606,7 @@ def test_ogr_pg_86():
     f = lyr.GetNextFeature()
     if f.GetField(0) != '3020':
         gdal.SetConfigOption('PG_USE_COPY', old_val)
-        return 'fail'
+        pytest.fail()
 
     gdal.SetConfigOption('PG_USE_COPY', old_val)
 
@@ -4651,7 +4619,7 @@ def test_ogr_pg_86():
 def test_ogr_pg_87():
 
     if gdaltest.pg_ds is None:
-        return 'skip'
+        pytest.skip()
 
     lyr = gdaltest.pg_ds.CreateLayer('ogr_pg_87')
     lyr.CreateField(ogr.FieldDefn('test', ogr.OFTString))
@@ -4682,7 +4650,7 @@ def test_ogr_pg_87():
 def test_ogr_pg_json():
 
     if gdaltest.pg_ds is None:
-        return 'skip'
+        pytest.skip()
 
     lyr = gdaltest.pg_ds.CreateLayer('ogr_pg_json')
     fld_defn = ogr.FieldDefn('test_json', ogr.OFTString)
@@ -4698,7 +4666,7 @@ def test_ogr_pg_json():
     f = lyr.GetNextFeature()
     if f.GetField(0) != '{"a": "b"}':
         f.DumpReadable()
-        return 'fail'
+        pytest.fail()
 
     sql_lyr = gdaltest.pg_ds.ExecuteSQL('SELECT * FROM ogr_pg_json')
     assert sql_lyr.GetLayerDefn().GetFieldDefn(0).GetSubType() == ogr.OFSTJSON
@@ -4713,7 +4681,7 @@ def test_ogr_pg_json():
 def test_ogr_pg_table_cleanup(with_and_without_postgis):
 
     if gdaltest.pg_ds is None:
-        return 'skip'
+        pytest.skip()
 
     gdal.PushErrorHandler('CPLQuietErrorHandler')
     gdaltest.pg_ds.ExecuteSQL('DELLAYER:tpoly')
@@ -4792,7 +4760,7 @@ def test_ogr_pg_table_cleanup(with_and_without_postgis):
 def test_ogr_pg_cleanup(with_and_without_postgis):
 
     if gdaltest.pg_ds is None:
-        return 'skip'
+        pytest.skip()
 
     gdaltest.pg_ds = ogr.Open('PG:' + gdaltest.pg_connection_string, update=1)
     test_ogr_pg_table_cleanup()
diff --git a/autotest/ogr/ogr_pgdump.py b/autotest/ogr/ogr_pgdump.py
index 2aed1489097b..c8a6fc6da549 100755
--- a/autotest/ogr/ogr_pgdump.py
+++ b/autotest/ogr/ogr_pgdump.py
@@ -37,6 +37,7 @@
 from osgeo import ogr
 from osgeo import osr
 from osgeo import gdal
+import pytest
 
 ###############################################################################
 # Create table from data/poly.shp
@@ -488,10 +489,10 @@ def test_ogr_pgdump_7():
     assert ret == 0
     if feat.GetFID() < 0:
         feat.DumpReadable()
-        return 'fail'
+        pytest.fail()
     if feat.GetField('myfid') != feat.GetFID():
         feat.DumpReadable()
-        return 'fail'
+        pytest.fail()
 
     # feat.SetField('str', 'foo')
     # ret = lyr.SetFeature(feat)
@@ -583,10 +584,10 @@ def test_ogr_pgdump_8():
     assert ret == 0
     if feat.GetFID() < 0:
         feat.DumpReadable()
-        return 'fail'
+        pytest.fail()
     if feat.GetField('myfid') != feat.GetFID():
         feat.DumpReadable()
-        return 'fail'
+        pytest.fail()
 
     # feat.SetField('str', 'foo')
     # ret = lyr.SetFeature(feat)
diff --git a/autotest/ogr/ogr_pgeo.py b/autotest/ogr/ogr_pgeo.py
index 7eb98e58e3e4..b23c500b84d2 100755
--- a/autotest/ogr/ogr_pgeo.py
+++ b/autotest/ogr/ogr_pgeo.py
@@ -36,6 +36,7 @@
 
 import gdaltest
 import ogrtest
+import pytest
 
 ###############################################################################
 # Basic testing
@@ -63,10 +64,10 @@ def ogr_pgeo_1(tested_driver='PGeo', other_driver='MDB'):
     drv = ogr.GetDriverByName(tested_driver)
 
     if drv is None:
-        return 'skip'
+        pytest.skip()
 
     if not gdaltest.download_file('http://download.osgeo.org/gdal/data/pgeo/PGeoTest.zip', 'PGeoTest.zip'):
-        return 'skip'
+        pytest.skip()
 
     try:
         os.stat('tmp/cache/Autodesk Test.mdb')
@@ -76,14 +77,13 @@ def ogr_pgeo_1(tested_driver='PGeo', other_driver='MDB'):
             try:
                 os.stat('tmp/cache/Autodesk Test.mdb')
             except OSError:
-                return 'skip'
+                pytest.skip()
         except:
-            return 'skip'
+            pytest.skip()
 
     ogrtest.pgeo_ds = ogr.Open('tmp/cache/Autodesk Test.mdb')
     if ogrtest.pgeo_ds is None:
-        gdaltest.post_reason('could not open DB. Driver probably misconfigured')
-        return 'skip'
+        pytest.skip('could not open DB. Driver probably misconfigured')
 
     assert ogrtest.pgeo_ds.GetLayerCount() == 3, 'did not get expected layer count'
 
@@ -92,14 +92,12 @@ def ogr_pgeo_1(tested_driver='PGeo', other_driver='MDB'):
     if feat.GetField('OBJECTID') != 1 or \
        feat.GetField('IDNUM') != 9424 or \
        feat.GetField('OWNER') != 'City':
-        gdaltest.post_reason('did not get expected attributes')
         feat.DumpReadable()
-        return 'fail'
+        pytest.fail('did not get expected attributes')
 
     if ogrtest.check_feature_geometry(feat, 'LINESTRING (1910941.703951031 445833.57942859828 0,1910947.927691862 445786.43811868131 0)', max_error=0.0000001) != 0:
-        gdaltest.post_reason('did not get expected geometry')
         feat.DumpReadable()
-        return 'fail'
+        pytest.fail('did not get expected geometry')
 
     feat_count = lyr.GetFeatureCount()
     assert feat_count == 9418, 'did not get expected feature count'
@@ -116,7 +114,7 @@ def ogr_pgeo_mdb_1():
 
 def ogr_pgeo_2():
     if ogrtest.pgeo_ds is None:
-        return 'skip'
+        pytest.skip()
 
     lyr = ogrtest.pgeo_ds.GetLayer(0)
     lyr.ResetReading()
@@ -133,9 +131,8 @@ def ogr_pgeo_2():
     if feat.GetField('OBJECTID') != 1 or \
        feat.GetField('IDNUM') != 9424 or \
        feat.GetField('OWNER') != 'City':
-        gdaltest.post_reason('did not get expected attributes')
         feat.DumpReadable()
-        return 'fail'
+        pytest.fail('did not get expected attributes')
 
     # Check that geometry filter is well cleared
     lyr.SetSpatialFilter(None)
@@ -150,7 +147,7 @@ def ogr_pgeo_2():
 
 def ogr_pgeo_3():
     if ogrtest.pgeo_ds is None:
-        return 'skip'
+        pytest.skip()
 
     lyr = ogrtest.pgeo_ds.GetLayer(0)
     lyr.SetAttributeFilter('OBJECTID=1')
@@ -162,9 +159,8 @@ def ogr_pgeo_3():
     if feat.GetField('OBJECTID') != 1 or \
        feat.GetField('IDNUM') != 9424 or \
        feat.GetField('OWNER') != 'City':
-        gdaltest.post_reason('did not get expected attributes')
         feat.DumpReadable()
-        return 'fail'
+        pytest.fail('did not get expected attributes')
 
     # Check that attribute filter is well cleared (#3706)
     lyr.SetAttributeFilter(None)
@@ -179,7 +175,7 @@ def ogr_pgeo_3():
 
 def ogr_pgeo_4():
     if ogrtest.pgeo_ds is None:
-        return 'skip'
+        pytest.skip()
 
     sql_lyr = ogrtest.pgeo_ds.ExecuteSQL('SELECT * FROM SDPipes WHERE OBJECTID = 1')
 
@@ -190,9 +186,8 @@ def ogr_pgeo_4():
     if feat.GetField('OBJECTID') != 1 or \
        feat.GetField('IDNUM') != 9424 or \
        feat.GetField('OWNER') != 'City':
-        gdaltest.post_reason('did not get expected attributes')
         feat.DumpReadable()
-        return 'fail'
+        pytest.fail('did not get expected attributes')
 
     ogrtest.pgeo_ds.ReleaseResultSet(sql_lyr)
 
@@ -204,14 +199,13 @@ def ogr_pgeo_4():
 
 def ogr_pgeo_5():
     if ogrtest.pgeo_ds is None:
-        return 'skip'
+        pytest.skip()
 
     lyr = ogrtest.pgeo_ds.GetLayer(0)
     feat = lyr.GetFeature(9418)
     if feat.GetField('OBJECTID') != 9418:
-        gdaltest.post_reason('did not get expected attributes')
         feat.DumpReadable()
-        return 'fail'
+        pytest.fail('did not get expected attributes')
 
     return 'success'
 
@@ -221,11 +215,11 @@ def ogr_pgeo_5():
 
 def ogr_pgeo_6():
     if ogrtest.pgeo_ds is None:
-        return 'skip'
+        pytest.skip()
 
     import test_cli_utilities
     if test_cli_utilities.get_test_ogrsf_path() is None:
-        return 'skip'
+        pytest.skip()
 
     ret = gdaltest.runexternal(test_cli_utilities.get_test_ogrsf_path() + ' "tmp/cache/Autodesk Test.mdb"')
 
@@ -239,11 +233,11 @@ def ogr_pgeo_6():
 
 def ogr_pgeo_7():
     if ogrtest.pgeo_ds is None:
-        return 'skip'
+        pytest.skip()
 
     import test_cli_utilities
     if test_cli_utilities.get_test_ogrsf_path() is None:
-        return 'skip'
+        pytest.skip()
 
     ret = gdaltest.runexternal(test_cli_utilities.get_test_ogrsf_path() + ' "tmp/cache/Autodesk Test.mdb" -sql "SELECT * FROM SDPipes"')
 
@@ -261,7 +255,7 @@ def ogr_pgeo_cleanup():
         ogrtest.other_driver.Register()
 
     if ogrtest.pgeo_ds is None:
-        return 'skip'
+        pytest.skip()
 
     ogrtest.pgeo_ds = None
     return 'success'
diff --git a/autotest/ogr/ogr_plscenes.py b/autotest/ogr/ogr_plscenes.py
index f12d02ece288..3db20212ac42 100755
--- a/autotest/ogr/ogr_plscenes.py
+++ b/autotest/ogr/ogr_plscenes.py
@@ -36,6 +36,7 @@
 from osgeo import gdal
 
 import gdaltest
+import pytest
 
 ###############################################################################
 # Find PLScenes driver
@@ -47,7 +48,7 @@ def test_ogr_plscenes_init():
 
     if gdaltest.plscenes_drv is not None:
         return 'success'
-    return 'skip'
+    pytest.skip()
 
 ###############################################################################
 # Test Data V1 API catalog listing with a single catalog
@@ -56,7 +57,7 @@ def test_ogr_plscenes_init():
 def test_ogr_plscenes_data_v1_catalog_no_paging():
 
     if gdaltest.plscenes_drv is None:
-        return 'skip'
+        pytest.skip()
 
     gdal.FileFromMemBuffer('/vsimem/data_v1/item-types', '{ "item_types": [ { "id": "PSScene3Band" } ] }')
     gdal.SetConfigOption('PL_URL', '/vsimem/data_v1/')
@@ -81,7 +82,7 @@ def test_ogr_plscenes_data_v1_catalog_no_paging():
 def test_ogr_plscenes_data_v1_catalog_paging():
 
     if gdaltest.plscenes_drv is None:
-        return 'skip'
+        pytest.skip()
 
     gdal.FileFromMemBuffer('/vsimem/data_v1/item-types', '{"_links": { "_next" : "/vsimem/data_v1/item-types/page_2"}, "item_types": [ { "id": "PSScene3Band" } ] }')
     gdal.FileFromMemBuffer('/vsimem/data_v1/item-types/page_2', '{ "item_types": [ { "id": "PSScene4Band" } ] }')
@@ -112,7 +113,7 @@ def test_ogr_plscenes_data_v1_catalog_paging():
 def test_ogr_plscenes_data_v1_nominal():
 
     if gdaltest.plscenes_drv is None:
-        return 'skip'
+        pytest.skip()
 
     gdal.FileFromMemBuffer('/vsimem/data_v1/item-types',
                            """{ "item_types": [
@@ -211,13 +212,13 @@ def test_ogr_plscenes_data_v1_nominal():
        f['asset_analytic_status'] != 'active' or \
        f.GetGeometryRef().ExportToWkt() != 'MULTIPOLYGON (((2 49,2.0 49.1,2.1 49.1,2.1 49.0,2 49)))':
         f.DumpReadable()
-        return 'fail'
+        pytest.fail()
 
     lyr.ResetReading()
     f = lyr.GetNextFeature()
     if f.GetFID() != 1:
         f.DumpReadable()
-        return 'fail'
+        pytest.fail()
 
     gdal.FileFromMemBuffer('/vsimem/data_v1/quick-search?page=2',
                            """{
@@ -231,18 +232,18 @@ def test_ogr_plscenes_data_v1_nominal():
     f = lyr.GetNextFeature()
     if f.GetFID() != 2 or f['id'] != 'id2':
         f.DumpReadable()
-        return 'fail'
+        pytest.fail()
 
     lyr.ResetReading()
     f = lyr.GetNextFeature()
     if f.GetFID() != 1:
         f.DumpReadable()
-        return 'fail'
+        pytest.fail()
 
     f = lyr.GetNextFeature()
     if f.GetFID() != 2:
         f.DumpReadable()
-        return 'fail'
+        pytest.fail()
 
     f = lyr.GetNextFeature()
     assert f is None
@@ -258,7 +259,7 @@ def test_ogr_plscenes_data_v1_nominal():
     f = lyr.GetNextFeature()
     if f['id'] != 'id3':
         f.DumpReadable()
-        return 'fail'
+        pytest.fail()
 
     # Cannot find /vsimem/data_v1/stats&POSTFIELDS={"interval":"year","item_types":["PSOrthoTile"],"filter":{"type":"AndFilter","config":[{"type":"GeometryFilter","field_name":"geometry","config":{"type":"Point","coordinates":[2.0,49.0]}}]}}
     with gdaltest.error_handler():
@@ -269,7 +270,7 @@ def test_ogr_plscenes_data_v1_nominal():
     f = lyr.GetNextFeature()
     if f['id'] != 'id':
         f.DumpReadable()
-        return 'fail'
+        pytest.fail()
 
     # Test attribute filter on id
     lyr.SetAttributeFilter("id = 'filtered_id'")
@@ -282,7 +283,7 @@ def test_ogr_plscenes_data_v1_nominal():
     f = lyr.GetNextFeature()
     if f['id'] != 'filtered_id':
         f.DumpReadable()
-        return 'fail'
+        pytest.fail()
 
     # Test attribute filter fully evaluated on server side.
     lyr.SetAttributeFilter("id != 'a' AND acquired >= '2016/02/11' AND acquired <= '2016/02/12' AND acquired > '1970/01/01 01:23:45' AND acquired < '2100/01/01 01:23:45' AND anomalous_pixels = 1.234567 AND (NOT id = 'b') AND columns > 0 AND columns < 2 AND columns = 1 AND columns IN (1, 2) AND (id IN ('filtered_2') OR id = 'foo') AND permissions = 'download' AND permissions IN ('download')")
@@ -314,7 +315,7 @@ def test_ogr_plscenes_data_v1_nominal():
     f = lyr.GetNextFeature()
     if f['id'] != 'filtered_2':
         f.DumpReadable()
-        return 'fail'
+        pytest.fail()
 
     # Partly server / partly client
     lyr.SetAttributeFilter("id = 'filtered_3' AND id > 'a'")
@@ -331,34 +332,34 @@ def test_ogr_plscenes_data_v1_nominal():
     f = lyr.GetNextFeature()
     if f['id'] != 'filtered_3':
         f.DumpReadable()
-        return 'fail'
+        pytest.fail()
 
     lyr.SetAttributeFilter("id > 'a' AND id = 'filtered_3'")
     f = lyr.GetNextFeature()
     if f['id'] != 'filtered_3':
         f.DumpReadable()
-        return 'fail'
+        pytest.fail()
 
     # Completely client side
     lyr.SetAttributeFilter("id > 'a' OR id = 'id'")
     f = lyr.GetNextFeature()
     if f['id'] != 'id':
         f.DumpReadable()
-        return 'fail'
+        pytest.fail()
 
     # Completely client side
     lyr.SetAttributeFilter("NOT id > 'z'")
     f = lyr.GetNextFeature()
     if f['id'] != 'id':
         f.DumpReadable()
-        return 'fail'
+        pytest.fail()
 
     # Reset attribute filter
     lyr.SetAttributeFilter(None)
     f = lyr.GetNextFeature()
     if f['id'] != 'id':
         f.DumpReadable()
-        return 'fail'
+        pytest.fail()
 
     # Try raster access
 
@@ -530,7 +531,7 @@ def test_ogr_plscenes_data_v1_nominal():
 def test_ogr_plscenes_data_v1_errors():
 
     if gdaltest.plscenes_drv is None:
-        return 'skip'
+        pytest.skip()
 
     # No PL_API_KEY
     gdal.SetConfigOption('PL_URL', '/vsimem/data_v1/')
@@ -632,12 +633,11 @@ def test_ogr_plscenes_data_v1_errors():
 def test_ogr_plscenes_data_v1_live():
 
     if gdaltest.plscenes_drv is None:
-        return 'skip'
+        pytest.skip()
 
     api_key = gdal.GetConfigOption('PL_API_KEY')
     if api_key is None:
-        print('Skipping test as PL_API_KEY not defined')
-        return 'skip'
+        pytest.skip('Skipping test as PL_API_KEY not defined')
 
     gdal.SetConfigOption('PLSCENES_PAGE_SIZE', '10')
     ds = ogr.Open('PLScenes:version=data_v1,FOLLOW_LINKS=YES')
@@ -672,7 +672,7 @@ def test_ogr_plscenes_data_v1_live():
 
     if not f.IsFieldSet(acquired_field):
         f.DumpReadable()
-        return 'fail'
+        pytest.fail()
 
     int_field = -1
     float_field = -1
diff --git a/autotest/ogr/ogr_rec.py b/autotest/ogr/ogr_rec.py
index c575a8226a88..042bbadb72dd 100755
--- a/autotest/ogr/ogr_rec.py
+++ b/autotest/ogr/ogr_rec.py
@@ -33,6 +33,7 @@
 
 
 import gdaltest
+import pytest
 
 ###############################################################################
 
@@ -41,7 +42,7 @@ def test_ogr_rec_1():
 
     import test_cli_utilities
     if test_cli_utilities.get_test_ogrsf_path() is None:
-        return 'skip'
+        pytest.skip()
 
     ret = gdaltest.runexternal(test_cli_utilities.get_test_ogrsf_path() + ' -ro data/test.rec')
 
diff --git a/autotest/ogr/ogr_rfc30.py b/autotest/ogr/ogr_rfc30.py
index b0f148b50d63..38c4b9716333 100755
--- a/autotest/ogr/ogr_rfc30.py
+++ b/autotest/ogr/ogr_rfc30.py
@@ -34,6 +34,7 @@
 
 
 import gdaltest
+import pytest
 
 ###############################################################################
 # Try ogr.Open(), Driver.CreateDataSource(), Driver.DeleteDataSource()
@@ -72,7 +73,7 @@ def test_ogr_rfc30_1():
 def test_ogr_rfc30_1_bis():
 
     if version_info >= (3, 0, 0):
-        return 'skip'
+        pytest.skip()
 
     filename = None
     layer_name = None
diff --git a/autotest/ogr/ogr_rfc35_mem.py b/autotest/ogr/ogr_rfc35_mem.py
index 1921c84474f3..8270f7309186 100755
--- a/autotest/ogr/ogr_rfc35_mem.py
+++ b/autotest/ogr/ogr_rfc35_mem.py
@@ -34,6 +34,7 @@
 import gdaltest
 from osgeo import ogr
 from osgeo import gdal
+import pytest
 
 ###############################################################################
 # Initiate the test file
@@ -117,7 +118,7 @@ def CheckFeatures(lyr, field1='foo5', field2='bar10', field3='baz15', field4='ba
            (field3 is not None and feat.GetField(field3) != Truncate(expected_values[i][2], lyr_defn, field3)) or \
            (field4 is not None and feat.GetField(field4) != Truncate(expected_values[i][3], lyr_defn, field4)):
             feat.DumpReadable()
-            return 'fail'
+            pytest.fail()
         feat = lyr.GetNextFeature()
         i = i + 1
 
diff --git a/autotest/ogr/ogr_rfc35_mitab.py b/autotest/ogr/ogr_rfc35_mitab.py
index 85d728c863de..759d9fa093e4 100755
--- a/autotest/ogr/ogr_rfc35_mitab.py
+++ b/autotest/ogr/ogr_rfc35_mitab.py
@@ -35,6 +35,7 @@
 import gdaltest
 from osgeo import ogr
 from osgeo import gdal
+import pytest
 
 ###############################################################################
 #
@@ -45,7 +46,7 @@ def CheckFileSize(src_filename):
     import test_py_scripts
     script_path = test_py_scripts.get_py_script('ogr2ogr')
     if script_path is None:
-        return 'skip'
+        pytest.skip()
 
     test_py_scripts.run_py_script(script_path, 'ogr2ogr', '-f "MapInfo File" /vsimem/CheckFileSize.tab ' + src_filename)
     statBufSrc = gdal.VSIStatL(src_filename[0:-3] + "dat", gdal.VSI_STAT_EXISTS_FLAG | gdal.VSI_STAT_NATURE_FLAG | gdal.VSI_STAT_SIZE_FLAG)
@@ -135,7 +136,7 @@ def CheckFeatures(lyr, field1='foo5', field2='bar10', field3='baz15', field4='ba
            (field3 is not None and feat.GetField(field3) != Truncate(expected_values[i][2], lyr_defn, field3)) or \
            (field4 is not None and feat.GetField(field4) != Truncate(expected_values[i][3], lyr_defn, field4)):
             feat.DumpReadable()
-            return 'fail'
+            pytest.fail()
         feat = lyr.GetNextFeature()
         i = i + 1
 
diff --git a/autotest/ogr/ogr_rfc35_shape.py b/autotest/ogr/ogr_rfc35_shape.py
index 53ecff72b503..e5b039792872 100755
--- a/autotest/ogr/ogr_rfc35_shape.py
+++ b/autotest/ogr/ogr_rfc35_shape.py
@@ -35,6 +35,7 @@
 import gdaltest
 from osgeo import ogr
 from osgeo import gdal
+import pytest
 
 ###############################################################################
 #
@@ -45,7 +46,7 @@ def CheckFileSize(src_filename):
     import test_py_scripts
     script_path = test_py_scripts.get_py_script('ogr2ogr')
     if script_path is None:
-        return 'skip'
+        pytest.skip()
 
     test_py_scripts.run_py_script(script_path, 'ogr2ogr', '/vsimem/CheckFileSize.dbf ' + src_filename)
     statBufSrc = gdal.VSIStatL(src_filename, gdal.VSI_STAT_EXISTS_FLAG | gdal.VSI_STAT_NATURE_FLAG | gdal.VSI_STAT_SIZE_FLAG)
@@ -135,7 +136,7 @@ def CheckFeatures(lyr, field1='foo5', field2='bar10', field3='baz15', field4='ba
            (field3 is not None and feat.GetField(field3) != Truncate(expected_values[i][2], lyr_defn, field3)) or \
            (field4 is not None and feat.GetField(field4) != Truncate(expected_values[i][3], lyr_defn, field4)):
             feat.DumpReadable()
-            return 'fail'
+            pytest.fail()
         feat = lyr.GetNextFeature()
         i = i + 1
 
diff --git a/autotest/ogr/ogr_rfc35_sqlite.py b/autotest/ogr/ogr_rfc35_sqlite.py
index f72bf802c018..0a66076094a3 100755
--- a/autotest/ogr/ogr_rfc35_sqlite.py
+++ b/autotest/ogr/ogr_rfc35_sqlite.py
@@ -34,6 +34,7 @@
 import gdaltest
 from osgeo import ogr
 from osgeo import gdal
+import pytest
 
 ###############################################################################
 # Initiate the test file
@@ -45,7 +46,7 @@ def test_ogr_rfc35_sqlite_1():
     gdaltest.rfc35_sqlite_ds_name = None
     sqlite_dr = ogr.GetDriverByName('SQLite')
     if sqlite_dr is None:
-        return 'skip'
+        pytest.skip()
 
     gdal.Unlink('tmp/rfc35_test.sqlite')
 
@@ -131,7 +132,7 @@ def CheckFeatures(lyr, field1='foo5', field2='bar10', field3='baz15', field4='ba
            (field3 is not None and feat.GetField(field3) != Truncate(expected_values[i][2], lyr_defn, field3)) or \
            (field4 is not None and feat.GetField(field4) != Truncate(expected_values[i][3], lyr_defn, field4)):
             feat.DumpReadable()
-            return 'fail'
+            pytest.fail()
         feat = lyr.GetNextFeature()
         i = i + 1
 
@@ -159,7 +160,7 @@ def Check(lyr, expected_order):
 def test_ogr_rfc35_sqlite_2():
 
     if gdaltest.rfc35_sqlite_ds is None:
-        return 'skip'
+        pytest.skip()
 
     lyr = gdaltest.rfc35_sqlite_ds.GetLayer(0)
 
@@ -212,7 +213,7 @@ def test_ogr_rfc35_sqlite_2():
 def test_ogr_rfc35_sqlite_3():
 
     if gdaltest.rfc35_sqlite_ds is None:
-        return 'skip'
+        pytest.skip()
 
     lyr = gdaltest.rfc35_sqlite_ds.GetLayer(0)
 
@@ -258,7 +259,7 @@ def test_ogr_rfc35_sqlite_3():
 def test_ogr_rfc35_sqlite_4():
 
     if gdaltest.rfc35_sqlite_ds is None:
-        return 'skip'
+        pytest.skip()
 
     lyr = gdaltest.rfc35_sqlite_ds.GetLayer(0)
     lyr_defn = lyr.GetLayerDefn()
@@ -353,7 +354,7 @@ def test_ogr_rfc35_sqlite_4():
 def test_ogr_rfc35_sqlite_5():
 
     if gdaltest.rfc35_sqlite_ds is None:
-        return 'skip'
+        pytest.skip()
 
     lyr = gdaltest.rfc35_sqlite_ds.GetLayer(0)
     lyr_defn = lyr.GetLayerDefn()
@@ -397,7 +398,7 @@ def test_ogr_rfc35_sqlite_5():
 def test_ogr_rfc35_sqlite_cleanup():
 
     if gdaltest.rfc35_sqlite_ds_name is None:
-        return 'skip'
+        pytest.skip()
 
     gdaltest.rfc35_sqlite_ds = None
     ogr.GetDriverByName('SQLite').DeleteDataSource(gdaltest.rfc35_sqlite_ds_name)
diff --git a/autotest/ogr/ogr_rfc41.py b/autotest/ogr/ogr_rfc41.py
index 357676090d78..f916e40b1e8d 100755
--- a/autotest/ogr/ogr_rfc41.py
+++ b/autotest/ogr/ogr_rfc41.py
@@ -36,6 +36,7 @@
 from osgeo import ogr
 from osgeo import osr
 from osgeo import gdal
+import pytest
 
 ###############################################################################
 # Test OGRGeomFieldDefn class
@@ -353,19 +354,19 @@ def test_ogr_rfc41_5():
 
     try:
         f['nonexistent_field']
-        return 'fail'
+        pytest.fail()
     except KeyError:
         pass
 
     try:
         f.nonexistent_field
-        return 'fail'
+        pytest.fail()
     except AttributeError:
         pass
 
     try:
         f['nonexistent_field'] = 'foo'
-        return 'fail'
+        pytest.fail()
     except KeyError:
         pass
 
@@ -706,7 +707,7 @@ def test_ogr_rfc41_7():
        feat.geom4.GetGeometryType() != ogr.wkbPolygon or \
        feat['_ogr_geometry_'].GetGeometryType() != ogr.wkbPolygon:
         feat.DumpReadable()
-        return 'fail'
+        pytest.fail()
     ds.ReleaseResultSet(sql_lyr)
 
     ds = None
@@ -721,7 +722,7 @@ def test_ogr_rfc41_8():
 
     import ogr_sql_sqlite
     if not ogr_sql_sqlite.ogr_sql_sqlite_available():
-        return 'skip'
+        pytest.skip()
 
     ds = ogr.GetDriverByName('memory').CreateDataSource('')
     lyr = ds.CreateLayer('mytable', geom_type=ogr.wkbPolygon)
@@ -753,11 +754,11 @@ def test_ogr_rfc41_8():
     geom = feat.GetGeomFieldRef('geomfield')
     if geom.ExportToWkt() != 'POLYGON ((0 0,0 1,1 1,1 0,0 0))':
         feat.DumpReadable()
-        return 'fail'
+        pytest.fail()
     geom = feat.GetGeomFieldRef('geomfield2')
     if geom.ExportToWkt() != 'POINT (0 1 2)':
         feat.DumpReadable()
-        return 'fail'
+        pytest.fail()
     feat = None
     ds.ReleaseResultSet(sql_lyr)
 
@@ -771,11 +772,11 @@ def test_ogr_rfc41_8():
     geom = feat.GetGeomFieldRef('geomfield')
     if geom.ExportToWkt() != 'POLYGON ((0 0,0 1,1 1,1 0,0 0))':
         feat.DumpReadable()
-        return 'fail'
+        pytest.fail()
     geom = feat.GetGeomFieldRef('geomfield2')
     if geom.ExportToWkt() != 'POINT (3 4 5)':
         feat.DumpReadable()
-        return 'fail'
+        pytest.fail()
     feat = None
     ds.ReleaseResultSet(sql_lyr)
 
diff --git a/autotest/ogr/ogr_s57.py b/autotest/ogr/ogr_s57.py
index b6beecbaa42d..ee16d6aeece0 100755
--- a/autotest/ogr/ogr_s57.py
+++ b/autotest/ogr/ogr_s57.py
@@ -39,6 +39,7 @@
 import ogrtest
 from osgeo import ogr
 from osgeo import gdal
+import pytest
 
 ###############################################################################
 # Verify we can open the test file.
@@ -64,7 +65,7 @@ def test_ogr_s57_1():
 
 def test_ogr_s57_2():
     if gdaltest.s57_ds is None:
-        return 'skip'
+        pytest.skip()
 
     layer_list = [('DSID', ogr.wkbNone, 1),
                   ('COALNE', ogr.wkbUnknown, 1),
@@ -105,7 +106,7 @@ def test_ogr_s57_2():
 
 def test_ogr_s57_3():
     if gdaltest.s57_ds is None:
-        return 'skip'
+        pytest.skip()
 
     feat = gdaltest.s57_ds.GetLayerByName('COALNE').GetNextFeature()
 
@@ -126,7 +127,7 @@ def test_ogr_s57_3():
 
 def test_ogr_s57_4():
     if gdaltest.s57_ds is None:
-        return 'skip'
+        pytest.skip()
 
     feat = gdaltest.s57_ds.GetLayerByName('M_QUAL').GetNextFeature()
 
@@ -147,7 +148,7 @@ def test_ogr_s57_4():
 
 def test_ogr_s57_5():
     if gdaltest.s57_ds is None:
-        return 'skip'
+        pytest.skip()
 
     feat = gdaltest.s57_ds.GetLayerByName('SOUNDG').GetNextFeature()
 
@@ -207,7 +208,7 @@ def test_ogr_s57_8():
 
     import test_cli_utilities
     if test_cli_utilities.get_test_ogrsf_path() is None:
-        return 'skip'
+        pytest.skip()
 
     ret = gdaltest.runexternal(test_cli_utilities.get_test_ogrsf_path() + ' -ro data/1B5X02NE.000')
 
@@ -301,7 +302,7 @@ def test_ogr_s57_11():
 def test_ogr_s57_online_1():
 
     if not gdaltest.download_file('ftp://sdg.ivs90.nl/ENC/1R5MK050.000', '1R5MK050.000'):
-        return 'skip'
+        pytest.skip()
 
     ds = ogr.Open('tmp/cache/1R5MK050.000')
     assert ds is not None
@@ -328,7 +329,7 @@ def test_ogr_s57_online_1():
 def test_ogr_s57_online_2():
 
     if not gdaltest.download_file('http://download.osgeo.org/gdal/data/s57/enctds/GB5X01SW.000', 'GB5X01SW.000'):
-        return 'skip'
+        pytest.skip()
 
     gdaltest.clean_tmp()
     shutil.copy('tmp/cache/GB5X01SW.000', 'tmp/GB5X01SW.000')
@@ -359,7 +360,7 @@ def test_ogr_s57_online_2():
 def test_ogr_s57_online_3():
 
     if not gdaltest.download_file('http://download.osgeo.org/gdal/data/s57/enctds/GB5X01SW.001', 'GB5X01SW.001'):
-        return 'skip'
+        pytest.skip()
 
     shutil.copy('tmp/cache/GB5X01SW.001', 'tmp/GB5X01SW.001')
     ds = ogr.Open('tmp/GB5X01SW.000')
@@ -392,7 +393,7 @@ def test_ogr_s57_online_3():
 def test_ogr_s57_online_4():
 
     if not gdaltest.download_file('http://www1.kaiho.mlit.go.jp/KOKAI/ENC/images/sample/sample.zip', 'sample.zip'):
-        return 'skip'
+        pytest.skip()
 
     try:
         os.stat('tmp/cache/ENC_ROOT/JP34NC94.000')
@@ -402,9 +403,9 @@ def test_ogr_s57_online_4():
             try:
                 os.stat('tmp/cache/ENC_ROOT/JP34NC94.000')
             except OSError:
-                return 'skip'
+                pytest.skip()
         except OSError:
-            return 'skip'
+            pytest.skip()
 
     gdal.SetConfigOption('OGR_S57_OPTIONS', 'RETURN_PRIMITIVES=ON,RETURN_LINKAGES=ON,LNAM_REFS=ON,RECODE_BY_DSSI=ON')
     ds = ogr.Open('tmp/cache/ENC_ROOT/JP34NC94.000')
diff --git a/autotest/ogr/ogr_sde.py b/autotest/ogr/ogr_sde.py
index e7f7fc120557..e3b32d844019 100755
--- a/autotest/ogr/ogr_sde.py
+++ b/autotest/ogr/ogr_sde.py
@@ -37,6 +37,7 @@
 from osgeo import ogr
 from osgeo import osr
 from osgeo import gdal
+import pytest
 
 ###############################################################################
 # Open ArcSDE datasource.
@@ -58,14 +59,13 @@ def test_ogr_sde_1():
     "Test basic opening of a database"
 
     if gdaltest.sde_dr is None:
-        return 'skip'
+        pytest.skip()
 
     base = 'SDE:%s,%s,%s,%s,%s' % (sde_server, sde_port, sde_db, sde_user, sde_password)
     ds = ogr.Open(base)
     if ds is None:
-        print("Could not open %s" % base)
         gdaltest.sde_dr = None
-        return 'skip'
+        pytest.skip("Could not open %s" % base)
     ds.Destroy()
 
     ds = ogr.Open(base, update=1)
@@ -77,7 +77,7 @@ def test_ogr_sde_1():
 def test_ogr_sde_2():
     "Test creation of a layer"
     if gdaltest.sde_dr is None:
-        return 'skip'
+        pytest.skip()
     base = 'SDE:%s,%s,%s,%s,%s' % (sde_server, sde_port, sde_db, sde_user, sde_password)
 
     shp_ds = ogr.Open('data/poly.shp')
@@ -118,7 +118,7 @@ def test_ogr_sde_2():
 def test_ogr_sde_3():
     "Test basic version locking"
     if gdaltest.sde_dr is None:
-        return 'skip'
+        pytest.skip()
 
     base = 'SDE:%s,%s,%s,%s,%s,SDE.TPOLY,SDE.DEFAULT' % (sde_server, sde_port, sde_db, sde_user, sde_password)
     ds = ogr.Open(base, update=1)
@@ -135,7 +135,7 @@ def test_ogr_sde_4():
     "Test basic version creation"
 
     if gdaltest.sde_dr is None:
-        return 'skip'
+        pytest.skip()
     version_name = 'TESTING'
     gdal.SetConfigOption('SDE_VERSIONOVERWRITE', 'TRUE')
 
@@ -156,7 +156,7 @@ def test_ogr_sde_5():
     "Test versioned editing"
 
     if gdaltest.sde_dr is None:
-        return 'skip'
+        pytest.skip()
     version_name = 'TESTING'
     gdal.SetConfigOption('SDE_VERSIONOVERWRITE', 'TRUE')
 
@@ -218,7 +218,7 @@ def test_ogr_sde_6():
     "Extent fetching"
 
     if gdaltest.sde_dr is None:
-        return 'skip'
+        pytest.skip()
 
     base = 'SDE:%s,%s,%s,%s,%s,SDE.TPOLY,SDE.DEFAULT' % (
         sde_server, sde_port, sde_db, sde_user, sde_password)
@@ -239,7 +239,7 @@ def test_ogr_sde_7():
     "Bad layer test"
 
     if gdaltest.sde_dr is None:
-        return 'skip'
+        pytest.skip()
 
     base = 'SDE:%s,%s,%s,%s,%s,SDE.TPOLY,SDE.DEFAULT' % (
         sde_server, sde_port, sde_db, sde_user, sde_password)
@@ -281,7 +281,7 @@ def test_ogr_sde_7():
 def test_ogr_sde_8():
     "Test spatial references"
     if gdaltest.sde_dr is None:
-        return 'skip'
+        pytest.skip()
     base = 'SDE:%s,%s,%s,%s,%s' % (sde_server, sde_port, sde_db, sde_user, sde_password)
 
     shp_ds = ogr.Open('data/poly.shp')
@@ -324,7 +324,7 @@ def test_ogr_sde_8():
 
 def test_ogr_sde_cleanup():
     if gdaltest.sde_dr is None:
-        return 'skip'
+        pytest.skip()
     base = 'SDE:%s,%s,%s,%s,%s' % (sde_server, sde_port, sde_db, sde_user, sde_password)
     ds = ogr.Open(base, update=1)
     ds.DeleteLayer('%s.%s' % (sde_user.upper(), 'TPOLY'))
diff --git a/autotest/ogr/ogr_segukooa.py b/autotest/ogr/ogr_segukooa.py
index 3d5937609696..10b3e15b7192 100755
--- a/autotest/ogr/ogr_segukooa.py
+++ b/autotest/ogr/ogr_segukooa.py
@@ -34,6 +34,7 @@
 import gdaltest
 import ogrtest
 from osgeo import ogr
+import pytest
 
 ###############################################################################
 # Read SEGP1
@@ -64,15 +65,13 @@ def test_ogr_segp1_points():
 
     for values in expected_values:
         if feat.GetField(values[0]) != values[1]:
-            print('did not get expected value for %s' % values[0])
             feat.DumpReadable()
-            return 'fail'
+            pytest.fail('did not get expected value for %s' % values[0])
 
     if ogrtest.check_feature_geometry(feat, 'POINT (2 49)',
                                       max_error=0.0000001) != 0:
-        print('did not get expected first geom')
         feat.DumpReadable()
-        return 'fail'
+        pytest.fail('did not get expected first geom')
 
     return 'success'
 
@@ -93,28 +92,24 @@ def test_ogr_segp1_lines():
     feat = lyr.GetNextFeature()
 
     if feat.GetField('LINENAME') != 'firstline':
-        print('did not get expected value for LINENAME')
         feat.DumpReadable()
-        return 'fail'
+        pytest.fail('did not get expected value for LINENAME')
 
     if ogrtest.check_feature_geometry(feat, 'LINESTRING (2 49,2.0 49.5)',
                                       max_error=0.0000001) != 0:
-        print('did not get expected first geom')
         feat.DumpReadable()
-        return 'fail'
+        pytest.fail('did not get expected first geom')
 
     feat = lyr.GetNextFeature()
 
     if feat.GetField('LINENAME') != 'secondline':
-        print('did not get expected value for LINENAME')
         feat.DumpReadable()
-        return 'fail'
+        pytest.fail('did not get expected value for LINENAME')
 
     if ogrtest.check_feature_geometry(feat, 'LINESTRING (-2 -49,-2.5 -49.0)',
                                       max_error=0.0000001) != 0:
-        print('did not get expected first geom')
         feat.DumpReadable()
-        return 'fail'
+        pytest.fail('did not get expected first geom')
 
     return 'success'
 
@@ -146,15 +141,13 @@ def test_ogr_ukooa_points():
 
     for values in expected_values:
         if feat.GetField(values[0]) != values[1]:
-            print('did not get expected value for %s' % values[0])
             feat.DumpReadable()
-            return 'fail'
+            pytest.fail('did not get expected value for %s' % values[0])
 
     if ogrtest.check_feature_geometry(feat, 'POINT (2 49)',
                                       max_error=0.0000001) != 0:
-        print('did not get expected first geom')
         feat.DumpReadable()
-        return 'fail'
+        pytest.fail('did not get expected first geom')
 
     return 'success'
 
@@ -175,28 +168,24 @@ def test_ogr_ukooa_lines():
     feat = lyr.GetNextFeature()
 
     if feat.GetField('LINENAME') != 'firstline':
-        print('did not get expected value for LINENAME')
         feat.DumpReadable()
-        return 'fail'
+        pytest.fail('did not get expected value for LINENAME')
 
     if ogrtest.check_feature_geometry(feat, 'LINESTRING (2 49,2.0 49.5)',
                                       max_error=0.0000001) != 0:
-        print('did not get expected first geom')
         feat.DumpReadable()
-        return 'fail'
+        pytest.fail('did not get expected first geom')
 
     feat = lyr.GetNextFeature()
 
     if feat.GetField('LINENAME') != 'secondline':
-        print('did not get expected value for LINENAME')
         feat.DumpReadable()
-        return 'fail'
+        pytest.fail('did not get expected value for LINENAME')
 
     if ogrtest.check_feature_geometry(feat, 'LINESTRING (-2 -49,-2.5 -49.0)',
                                       max_error=0.0000001) != 0:
-        print('did not get expected first geom')
         feat.DumpReadable()
-        return 'fail'
+        pytest.fail('did not get expected first geom')
 
     return 'success'
 
diff --git a/autotest/ogr/ogr_segy.py b/autotest/ogr/ogr_segy.py
index dd87a4967477..6084d5b26832 100755
--- a/autotest/ogr/ogr_segy.py
+++ b/autotest/ogr/ogr_segy.py
@@ -34,6 +34,7 @@
 import gdaltest
 import ogrtest
 from osgeo import ogr
+import pytest
 
 ###############################################################################
 # Read SEG-Y
@@ -60,9 +61,8 @@ def test_ogr_segy_1():
     feat = lyr.GetNextFeature()
     if ogrtest.check_feature_geometry(feat, 'POINT (500000 4500000)',
                                       max_error=0.0000001) != 0:
-        print('did not get expected first geom')
         feat.DumpReadable()
-        return 'fail'
+        pytest.fail('did not get expected first geom')
 
     feat = lyr.GetNextFeature()
     assert feat is None
diff --git a/autotest/ogr/ogr_selafin.py b/autotest/ogr/ogr_selafin.py
index 00e6f661b83a..6d20e1fdd619 100755
--- a/autotest/ogr/ogr_selafin.py
+++ b/autotest/ogr/ogr_selafin.py
@@ -38,6 +38,7 @@
 from osgeo import gdal
 from osgeo import ogr
 from osgeo import osr
+import pytest
 
 ###############################################################################
 # Create wasp datasource
@@ -56,7 +57,7 @@ def test_ogr_selafin_create_ds():
 
     if gdaltest.selafin_ds is not None:
         return 'success'
-    return 'fail'
+    pytest.fail()
 
 ###############################################################################
 # Add a few points to the datasource
@@ -94,7 +95,7 @@ def test_ogr_selafin_create_elements():
 
     gdaltest.selafin_ds = ogr.Open('tmp/tmp.slf', 1)
     if gdaltest.selafin_ds is None:
-        return 'skip'
+        pytest.skip()
     layerCount = gdaltest.selafin_ds.GetLayerCount()
     assert layerCount >= 2, 'elements layer not created with nodes layer'
     for i in range(layerCount):
@@ -148,7 +149,7 @@ def test_ogr_selafin_set_field():
 
     gdaltest.selafin_ds = ogr.Open('tmp/tmp.slf', 1)
     if gdaltest.selafin_ds is None:
-        return 'skip'
+        pytest.skip()
     layerCount = gdaltest.selafin_ds.GetLayerCount()
     assert layerCount >= 2, 'elements layer not created with nodes layer'
     for i in range(layerCount):
diff --git a/autotest/ogr/ogr_shape.py b/autotest/ogr/ogr_shape.py
index 0587dd47991d..c1b5f9ac9329 100755
--- a/autotest/ogr/ogr_shape.py
+++ b/autotest/ogr/ogr_shape.py
@@ -53,7 +53,7 @@ def test_ogr_shape_1():
 
     if gdaltest.shape_ds is not None:
         return 'success'
-    return 'fail'
+    pytest.fail()
 
 ###############################################################################
 # Create table from data/poly.shp
@@ -62,7 +62,7 @@ def test_ogr_shape_1():
 def test_ogr_shape_2():
 
     if gdaltest.shape_ds is None:
-        return 'skip'
+        pytest.skip()
 
     #######################################################
     # Create memory Layer
@@ -107,7 +107,7 @@ def test_ogr_shape_2():
 
 def test_ogr_shape_3():
     if gdaltest.shape_ds is None:
-        return 'skip'
+        pytest.skip()
 
     expect = [168, 169, 166, 158, 165]
 
@@ -138,7 +138,7 @@ def test_ogr_shape_3():
 def test_ogr_shape_4():
 
     if gdaltest.shape_ds is None:
-        return 'skip'
+        pytest.skip()
 
     ######################################################################
     # Create feature without geometry.
@@ -167,7 +167,7 @@ def test_ogr_shape_4():
 def test_ogr_shape_5():
 
     if gdaltest.shape_ds is None:
-        return 'skip'
+        pytest.skip()
 
     expect = [179, 173, 172, 171, 170, 169, 168, 166, 165, 158, None]
 
@@ -186,7 +186,7 @@ def test_ogr_shape_5():
 def test_ogr_shape_6():
 
     if gdaltest.shape_ds is None:
-        return 'skip'
+        pytest.skip()
 
     sql_lyr = gdaltest.shape_ds.ExecuteSQL(
         "select * from tpoly where prfedea = '35043413'")
@@ -209,7 +209,7 @@ def test_ogr_shape_6():
 def test_ogr_shape_7():
 
     if gdaltest.shape_ds is None:
-        return 'skip'
+        pytest.skip()
 
     gdaltest.shape_lyr.SetAttributeFilter(None)
 
@@ -232,7 +232,7 @@ def test_ogr_shape_7():
 def test_ogr_shape_8():
 
     if gdaltest.shape_ds is None:
-        return 'skip'
+        pytest.skip()
 
     gdaltest.shape_lyr.SetAttributeFilter(None)
     gdaltest.shape_ds.ExecuteSQL('CREATE SPATIAL INDEX ON tpoly')
@@ -267,7 +267,7 @@ def test_ogr_shape_8():
 def test_ogr_shape_9():
 
     if gdaltest.shape_ds is None:
-        return 'skip'
+        pytest.skip()
 
     gdaltest.shape_ds = None
     gdaltest.shape_ds = ogr.Open('data/testpoly.shp')
@@ -279,7 +279,7 @@ def test_ogr_shape_9():
         return 'success'
     if not ogrtest.have_geos() and gdaltest.shape_lyr.GetFeatureCount() == 1:
         return 'success'
-    return 'fail'
+    pytest.fail()
 
 ###############################################################################
 # Do a fair size query that should pull in a few shapes.
@@ -288,7 +288,7 @@ def test_ogr_shape_9():
 def test_ogr_shape_10():
 
     if gdaltest.shape_ds is None:
-        return 'skip'
+        pytest.skip()
 
     gdaltest.shape_lyr.SetSpatialFilterRect(-400, 22, -120, 400)
 
@@ -304,7 +304,7 @@ def test_ogr_shape_10():
 def test_ogr_shape_11():
 
     if gdaltest.shape_ds is None:
-        return 'skip'
+        pytest.skip()
 
     gdaltest.shape_lyr.SetAttributeFilter('FID = 5')
     gdaltest.shape_lyr.SetSpatialFilterRect(-400, 22, -120, 400)
@@ -332,7 +332,7 @@ def test_ogr_shape_11():
 def test_ogr_shape_12():
 
     if gdaltest.shape_ds is None:
-        return 'skip'
+        pytest.skip()
 
     asm_ds = ogr.Open('data/asm.shp')
     asm_lyr = asm_ds.GetLayer(0)
@@ -367,7 +367,7 @@ def test_ogr_shape_12():
 def test_ogr_shape_13():
 
     if gdaltest.shape_ds is None:
-        return 'skip'
+        pytest.skip()
 
     gdaltest.shape_ds = None
     gdaltest.shape_ds = ogr.Open('tmp/tpoly.shp', update=1)
@@ -406,7 +406,7 @@ def test_ogr_shape_13():
 def test_ogr_shape_14():
 
     if gdaltest.shape_ds is None:
-        return 'skip'
+        pytest.skip()
 
     gdaltest.shape_ds = None
     gdaltest.shape_ds = ogr.Open('tmp/tpoly.shp', update=1)
@@ -441,7 +441,7 @@ def test_ogr_shape_14():
 def test_ogr_shape_15():
 
     if gdaltest.shape_ds is None:
-        return 'skip'
+        pytest.skip()
 
     ######################################################################
     # Delete FID 9.
@@ -470,7 +470,7 @@ def test_ogr_shape_15():
 def test_ogr_shape_16():
 
     if gdaltest.shape_ds is None:
-        return 'skip'
+        pytest.skip()
 
     gdaltest.shape_ds.ExecuteSQL('REPACK tpoly')
 
@@ -503,7 +503,7 @@ def test_ogr_shape_16():
 def test_ogr_shape_16_1():
 
     if gdaltest.shape_ds is None:
-        return 'skip'
+        pytest.skip()
 
     ######################################################################
     # Add a new field.
@@ -531,7 +531,7 @@ def test_ogr_shape_16_1():
 def test_ogr_shape_17():
 
     if gdaltest.shape_ds is None:
-        return 'skip'
+        pytest.skip()
 
     shutil.copy('data/can_caps.shp', 'tmp/can_caps.shp')
     shutil.copy('data/can_caps.shx', 'tmp/can_caps.shx')
@@ -622,7 +622,7 @@ def test_ogr_shape_19():
 def test_ogr_shape_20():
 
     if gdaltest.shape_ds is None:
-        return 'skip'
+        pytest.skip()
 
     ds = ogr.Open('data/emptymultipoint.shp')
     lyr = ds.GetLayer(0)
@@ -657,7 +657,7 @@ def test_ogr_shape_20():
 def test_ogr_shape_21():
 
     if gdaltest.shape_ds is None:
-        return 'skip'
+        pytest.skip()
 
     files = ['data/buggypoint.shp',
              'data/buggymultipoint.shp',
@@ -693,7 +693,7 @@ def test_ogr_shape_21():
 def test_ogr_shape_22():
 
     if gdaltest.shape_ds is None:
-        return 'skip'
+        pytest.skip()
 
     #######################################################
     # Create memory Layer
@@ -822,7 +822,7 @@ def ogr_shape_23_write_geom(layer_name, geom, expected_geom, wkbType):
 def test_ogr_shape_23():
 
     if gdaltest.shape_ds is None:
-        return 'skip'
+        pytest.skip()
 
     test_geom_array = [
         ('points', 'POINT(0 1)', 'LINESTRING(0 1)', ogr.wkbPoint),
@@ -971,7 +971,7 @@ def test_ogr_shape_23():
 def test_ogr_shape_24():
 
     if gdaltest.shape_ds is None:
-        return 'skip'
+        pytest.skip()
 
     layer_name = 'touchingrings'
     wkt = 'MULTIPOLYGON(((0 0,0 10,10 10,0 0), (0 0,1 1,0 1,0 0)), ((100 100,100 200,200 200,200 100,100 100)))'
@@ -1054,7 +1054,7 @@ def test_ogr_shape_28():
     # Determine if the filesystem supports sparse files (we don't want to create a real 3 GB
     # file !
     if not gdaltest.filesystem_supports_sparse_files('tmp'):
-        return 'skip'
+        pytest.skip()
 
     for filename in ('tmp/hugedbf.dbf', 'tmp/hugedbf.shp', 'tmp/hugedbf.shx'):
         try:
@@ -1208,7 +1208,7 @@ def test_ogr_shape_30():
 def test_ogr_shape_31():
 
     if gdaltest.shape_ds is None:
-        return 'skip'
+        pytest.skip()
 
     fields = [('a', ogr.OFTReal),
               ('A', ogr.OFTInteger),
@@ -1284,7 +1284,7 @@ def test_ogr_shape_32():
     # 4.5 GB space available or give a new directory that does and delete the
     # directory afterwards.
 
-    return 'skip'  # pylint: disable=unreachable
+    pytest.skip()  # pylint: disable=unreachable
 
     # pylint: disable=unreachable
     from decimal import Decimal
@@ -1531,7 +1531,7 @@ def test_ogr_shape_39():
 def test_ogr_shape_40():
 
     if gdaltest.shape_ds is None:
-        return 'skip'
+        pytest.skip()
 
     datafiles = ('gjpoint.dbf', 'gjpoint.shp', 'gjpoint.shx')
     indexfiles = ('gjpoint.sbn', 'gjpoint.sbx', 'gjpoint.qix')
@@ -1600,7 +1600,7 @@ def test_ogr_shape_41():
 
     import test_cli_utilities
     if test_cli_utilities.get_test_ogrsf_path() is None:
-        return 'skip'
+        pytest.skip()
 
     shutil.copy('data/poly.shp', 'tmp/poly.shp')
     shutil.copy('data/poly.shx', 'tmp/poly.shx')
@@ -1624,7 +1624,7 @@ def test_ogr_shape_42():
 
     import test_cli_utilities
     if test_cli_utilities.get_test_ogrsf_path() is None:
-        return 'skip'
+        pytest.skip()
 
     shutil.copy('data/poly.shp', 'tmp/poly.shp')
     shutil.copy('data/poly.shx', 'tmp/poly.shx')
@@ -1648,12 +1648,11 @@ def test_ogr_shape_43():
 
     drv = gdal.GetDriverByName('HTTP')
     if drv is None:
-        return 'skip'
+        pytest.skip()
 
     conn = gdaltest.gdalurlopen('https://raw.githubusercontent.com/OSGeo/gdal/master/autotest/ogr/data/poly.zip')
     if conn is None:
-        print('cannot open URL')
-        return 'skip'
+        pytest.skip('cannot open URL')
     conn.close()
 
     ds = ogr.Open('/vsizip//vsicurl/https://raw.githubusercontent.com/OSGeo/gdal/master/autotest/ogr/data/poly.zip')
@@ -1678,12 +1677,11 @@ def ogr_shape_44_DISABLED():
 
     drv = gdal.GetDriverByName('HTTP')
     if drv is None:
-        return 'skip'
+        pytest.skip()
 
     conn = gdaltest.gdalurlopen('https://raw.githubusercontent.com/OSGeo/gdal/master/autotest/ogr/data/poly.zip')
     if conn is None:
-        print('cannot open URL')
-        return 'skip'
+        pytest.skip('cannot open URL')
     conn.close()
 
     ds = ogr.Open('/vsicurl/https://raw.githubusercontent.com/OSGeo/gdal/master/autotest/ogr/data/testshp')
@@ -1781,7 +1779,7 @@ def test_ogr_shape_46():
 def test_ogr_shape_47():
 
     if not gdaltest.support_symlink():
-        return 'skip'
+        pytest.skip()
 
     gdal.Unlink('tmp/poly.zip')
     os.symlink('/vsizip/data/poly.zip', 'tmp/poly.zip')
@@ -1896,7 +1894,7 @@ def test_ogr_shape_50():
 
     ds = ogr.Open('data/chinese.dbf')
     if ds is None:
-        return 'skip'
+        pytest.skip()
     lyr = ds.GetLayer(0)
 
     reconv_possible = lyr.TestCapability(ogr.OLCStringsAsUTF8) == 1
@@ -1905,8 +1903,7 @@ def test_ogr_shape_50():
         assert not reconv_possible, \
             'Recode failed, but TestCapability(OLCStringsAsUTF8) returns TRUE'
 
-        gdaltest.post_reason('skipping test: iconv support needed')
-        return 'skip'
+        pytest.skip('skipping test: iconv support needed')
 
     # Setup the utf-8 string.
     if sys.version_info >= (3, 0, 0):
@@ -1929,8 +1926,7 @@ def test_ogr_shape_50():
 def test_ogr_shape_51():
 
     if int(gdal.VersionInfo('VERSION_NUM')) < 1900:
-        gdaltest.post_reason('would crash')
-        return 'skip'
+        pytest.skip('would crash')
 
     ds = ogr.GetDriverByName('ESRI Shapefile').CreateDataSource('/vsimem/ogr_shape_51.shp')
     lyr = ds.CreateLayer('ogr_shape_51')
@@ -2546,11 +2542,11 @@ def test_ogr_shape_58():
 def test_ogr_shape_59():
 
     if gdaltest.shape_ds is None:
-        return 'skip'
+        pytest.skip()
 
     shp_ds = ogr.Open('data/testpointm.shp')
     if shp_ds is None:
-        return 'skip'
+        pytest.skip()
     shp_lyr = shp_ds.GetLayer(0)
 
     feat = shp_lyr.GetNextFeature()
@@ -2595,11 +2591,11 @@ def test_ogr_shape_59():
 def test_ogr_shape_60():
 
     if gdaltest.shape_ds is None:
-        return 'skip'
+        pytest.skip()
 
     shp_ds = ogr.Open('data/testpointzm.shp')
     if shp_ds is None:
-        return 'skip'
+        pytest.skip()
     shp_lyr = shp_ds.GetLayer(0)
 
     feat = shp_lyr.GetNextFeature()
@@ -2891,7 +2887,7 @@ def test_ogr_shape_67():
 
     try:
         os.stat('tmp/emptyshapefilewithsbn.sbn')
-        return 'fail'
+        pytest.fail()
     except OSError:
         pass
 
@@ -2907,8 +2903,7 @@ def test_ogr_shape_67():
 def test_ogr_shape_68():
 
     if sys.platform == 'darwin':
-        print("Fails on MacOSX. Not sure why.")
-        return 'skip'
+        pytest.skip("Fails on MacOSX. Not sure why.")
 
     for i in range(2):
         if i == 1 and sys.platform != 'win32':
@@ -3015,7 +3010,7 @@ def test_ogr_shape_69():
 def test_ogr_shape_70():
 
     if sys.platform != 'win32':
-        return 'skip'
+        pytest.skip()
 
     ds = ogr.GetDriverByName('ESRI Shapefile').CreateDataSource('tmp/ogr_shape_70.shp')
     lyr = ds.CreateLayer('ogr_shape_70')
@@ -3055,11 +3050,10 @@ def test_ogr_shape_70():
 def test_ogr_shape_71():
 
     if sys.platform.find('linux') != 0:
-        return 'skip'
+        pytest.skip()
 
     if os.getuid() == 0:
-        print('running as root... skipping')
-        return 'skip'
+        pytest.skip('running as root... skipping')
 
     import stat
     shutil.copy('data/poly.shp', 'tmp/ogr_shape_71.shp')
@@ -3088,7 +3082,7 @@ def test_ogr_shape_72():
     # Determine if the filesystem supports sparse files (we don't want to create a real 3 GB
     # file !
     if gdaltest.filesystem_supports_sparse_files('tmp') is False:
-        return 'skip'
+        pytest.skip()
 
     ds = ogr.GetDriverByName('ESRI Shapefile').CreateDataSource('tmp/ogr_shape_72.shp')
     lyr = ds.CreateLayer('2gb', geom_type=ogr.wkbPoint)
@@ -3180,7 +3174,7 @@ def test_ogr_shape_73():
     got_geom = feat.GetGeometryRef()
     if geom.ExportToWkt() != got_geom.ExportToWkt():
         feat.DumpReadable()
-        return 'fail'
+        pytest.fail()
     ds = None
 
     return 'success'
@@ -3207,7 +3201,7 @@ def test_ogr_shape_74():
     got_geom = feat.GetGeometryRef()
     if geom.ExportToWkt() != got_geom.ExportToWkt():
         feat.DumpReadable()
-        return 'fail'
+        pytest.fail()
 
     lyr.ResetReading()
     gdal.SetConfigOption('OGR_ORGANIZE_POLYGONS', 'DEFAULT')
@@ -3216,7 +3210,7 @@ def test_ogr_shape_74():
     got_geom = feat.GetGeometryRef()
     if geom.ExportToWkt() != got_geom.ExportToWkt():
         feat.DumpReadable()
-        return 'fail'
+        pytest.fail()
     ds = None
 
     return 'success'
@@ -3324,9 +3318,8 @@ def test_ogr_shape_78():
     lyr = ds.GetLayer(0)
     f = lyr.GetNextFeature()
     if f.GetField('dblfield') != 9007199254740992.:
-        gdaltest.post_reason('did not get expected value')
         f.DumpReadable()
-        return 'fail'
+        pytest.fail('did not get expected value')
     ds = None
 
     return 'success'
@@ -3453,7 +3446,7 @@ def test_ogr_shape_81():
 def test_ogr_shape_82():
 
     if gdaltest.shape_ds is None:
-        return 'skip'
+        pytest.skip()
 
     # create ogrlayer to test cut long strings with UTF-8 encoding
     gdaltest.shape_lyr = gdaltest.shape_ds.CreateLayer('test_utf_cut', geom_type=ogr.wkbPoint, options=['ENCODING=UTF-8'])
@@ -3877,8 +3870,7 @@ def test_ogr_shape_94():
                 if expected_fail:
                     print('FIXME!:', i, shpt, geom_type, wkt, f.GetGeometryRef().ExportToIsoWkt())
                 else:
-                    print(i, shpt, geom_type, wkt, f.GetGeometryRef().ExportToIsoWkt())
-                    return 'fail'
+                    pytest.fail(i, shpt, geom_type, wkt, f.GetGeometryRef().ExportToIsoWkt())
             ds = None
             ogr.GetDriverByName('ESRI Shapefile').DeleteDataSource('/vsimem/ogr_shape_94.shp')
 
@@ -3983,7 +3975,7 @@ def test_ogr_shape_97():
 def test_ogr_shape_98():
 
     if gdaltest.shape_ds is None:
-        return 'skip'
+        pytest.skip()
 
     gdal.SetConfigOption('SHAPE_RESTORE_SHX', 'TRUE')
     shutil.copy('data/can_caps.shp', 'tmp/can_caps.shp')
@@ -4103,9 +4095,8 @@ def test_ogr_shape_100():
 
         f = lyr.GetFeature(0)
         if f['foo'] != '2' or f.GetGeometryRef().ExportToWkt() != 'LINESTRING (1 1,2 2,3 3)':
-            print(variant)
             f.DumpReadable()
-            return 'fail'
+            pytest.fail(variant)
         with gdaltest.error_handler():
             f = lyr.GetFeature(1)
         assert f is None, variant
@@ -4113,9 +4104,8 @@ def test_ogr_shape_100():
         assert lyr.GetFeatureCount() == 1, variant
         f = lyr.GetNextFeature()
         if f['foo'] != '2' or f.GetGeometryRef().ExportToWkt() != 'LINESTRING (1 1,2 2,3 3)':
-            print(variant)
             f.DumpReadable()
-            return 'fail'
+            pytest.fail(variant)
         f = lyr.GetNextFeature()
         assert f is None, variant
         f = ogr.Feature(lyr.GetLayerDefn())
@@ -4130,14 +4120,12 @@ def test_ogr_shape_100():
         assert lyr.GetFeatureCount() == 2, variant
         f = lyr.GetNextFeature()
         if f['foo'] != '2' or f.GetGeometryRef().ExportToWkt() != 'LINESTRING (1 1,2 2,3 3)':
-            print(variant)
             f.DumpReadable()
-            return 'fail'
+            pytest.fail(variant)
         f = lyr.GetNextFeature()
         if f['foo'] != '3' or f.GetGeometryRef().ExportToWkt() != 'LINESTRING (3 3,4 4,5 5,6 6)':
-            print(variant)
             f.DumpReadable()
-            return 'fail'
+            pytest.fail(variant)
         f = lyr.GetNextFeature()
         assert f is None, variant
         ds = None
@@ -4182,9 +4170,8 @@ def test_ogr_shape_101():
         assert lyr.GetFeatureCount() == 1, i
         f = lyr.GetNextFeature()
         if f.GetFID() != 0 or f['foo'] != '2' or f.GetGeometryRef().ExportToWkt() != 'LINESTRING (1 1,2 2,3 3)':
-            print(i)
             f.DumpReadable()
-            return 'fail'
+            pytest.fail(i)
         f = lyr.GetNextFeature()
         assert f is None, i
 
@@ -4210,9 +4197,8 @@ def test_ogr_shape_101():
             assert lyr.GetFeatureCount() == 1, i
             f = lyr.GetNextFeature()
             if f.GetFID() != 0 or f['foo'] != '3' or f.GetGeometryRef().ExportToWkt() != 'LINESTRING (3 3,4 4,5 5,6 6)':
-                print(i)
                 f.DumpReadable()
-                return 'fail'
+                pytest.fail(i)
             f = lyr.GetNextFeature()
             assert f is None, i
             ds = None
@@ -4233,9 +4219,8 @@ def test_ogr_shape_101():
             assert lyr.GetFeatureCount() == 2, i
             f = lyr.GetNextFeature()
             if f.GetFID() != 1 or f['foo'] != '4':
-                print(i)
                 f.DumpReadable()
-                return 'fail'
+                pytest.fail(i)
 
             ds = None
 
@@ -4479,9 +4464,8 @@ def test_ogr_shape_104():
         lyr = ds.GetLayer(0)
         f = lyr.GetNextFeature()
         if f.GetGeometryRef().ExportToIsoWkt() != expected_wkt:
-            print(wkt, lyr_type, options)
             f.DumpReadable()
-            return 'fail'
+            pytest.fail(wkt, lyr_type, options)
         ds = None
 
         ogr.GetDriverByName('ESRI Shapefile').DeleteDataSource(filename)
@@ -4608,11 +4592,11 @@ def test_ogr_shape_107():
     f = lyr.GetNextFeature()
     if f.GetGeometryRef().ExportToWkt() != 'LINESTRING (1 2,3 4)':
         f.DumpReadable()
-        return'fail'
+        pytest.fail()
     f = lyr.GetNextFeature()
     if f.GetGeometryRef().ExportToWkt() != 'LINESTRING (5 6)':
         f.DumpReadable()
-        return'fail'
+        pytest.fail()
     ds = None
 
     gdal.VectorTranslate(copy_filename, filename)
@@ -4640,7 +4624,7 @@ def test_ogr_shape_107():
     f = lyr.GetNextFeature()
     if f.GetGeometryRef().ExportToWkt() != 'LINESTRING (1 2,3 4)':
         f.DumpReadable()
-        return'fail'
+        pytest.fail()
     ds = None
 
     gdal.VectorTranslate(copy_filename, filename)
@@ -4746,7 +4730,7 @@ def test_ogr_shape_111_delete_field_no_record():
 def test_ogr_shape_cleanup():
 
     if gdaltest.shape_ds is None:
-        return 'skip'
+        pytest.skip()
 
     gdaltest.shape_ds = None
 
diff --git a/autotest/ogr/ogr_shape_sbn.py b/autotest/ogr/ogr_shape_sbn.py
index 7d90c6a14973..8e35983e5600 100755
--- a/autotest/ogr/ogr_shape_sbn.py
+++ b/autotest/ogr/ogr_shape_sbn.py
@@ -35,6 +35,7 @@
 
 import gdaltest
 from osgeo import ogr
+import pytest
 
 ###############################################################################
 #
@@ -106,7 +107,7 @@ def search_all_features(lyr):
 def test_ogr_shape_sbn_1():
 
     if not gdaltest.download_file('http://pubs.usgs.gov/sim/3194/contents/Cochiti_shapefiles.zip', 'Cochiti_shapefiles.zip'):
-        return 'skip'
+        pytest.skip()
 
     try:
         os.stat('tmp/cache/CochitiDamShapeFiles/CochitiBoundary.shp')
@@ -116,9 +117,9 @@ def test_ogr_shape_sbn_1():
             try:
                 os.stat('tmp/cache/CochitiDamShapeFiles/CochitiBoundary.shp')
             except OSError:
-                return 'skip'
+                pytest.skip()
         except OSError:
-            return 'skip'
+            pytest.skip()
 
     ds = ogr.Open('tmp/cache/CochitiDamShapeFiles')
     for i in range(ds.GetLayerCount()):
diff --git a/autotest/ogr/ogr_sosi.py b/autotest/ogr/ogr_sosi.py
index d4d256cdbab7..e3173cdc97f0 100755
--- a/autotest/ogr/ogr_sosi.py
+++ b/autotest/ogr/ogr_sosi.py
@@ -34,6 +34,7 @@
 
 
 import gdaltest
+import pytest
 
 ###############################################################################
 
@@ -41,14 +42,14 @@
 def test_ogr_sosi_1():
 
     if ogr.GetDriverByName('SOSI') is None:
-        return 'skip'
+        pytest.skip()
 
     if not gdaltest.download_file('http://trac.osgeo.org/gdal/raw-attachment/ticket/3638/20BygnAnlegg.SOS', '20BygnAnlegg.SOS'):
-        return 'skip'
+        pytest.skip()
 
     import test_cli_utilities
     if test_cli_utilities.get_test_ogrsf_path() is None:
-        return 'skip'
+        pytest.skip()
 
     ret = gdaltest.runexternal(test_cli_utilities.get_test_ogrsf_path() + ' -ro tmp/cache/20BygnAnlegg.SOS')
 
diff --git a/autotest/ogr/ogr_sql_rfc28.py b/autotest/ogr/ogr_sql_rfc28.py
index 8f8de6fd211b..4327ff2b4330 100755
--- a/autotest/ogr/ogr_sql_rfc28.py
+++ b/autotest/ogr/ogr_sql_rfc28.py
@@ -37,6 +37,7 @@
 from osgeo import ogr
 import gdaltest
 import ogrtest
+import pytest
 
 ###############################################################################
 # Test an expression with a left side value and right side column and an \
@@ -505,17 +506,17 @@ def test_ogr_rfc28_24():
     if feat.IsFieldSet('FIELD_4'):
         feat.DumpReadable()
         gdaltest.ds.ReleaseResultSet(sql_lyr)
-        return 'fail'
+        pytest.fail()
 
     if feat.IsFieldSet('nullstrfield'):
         feat.DumpReadable()
         gdaltest.ds.ReleaseResultSet(sql_lyr)
-        return 'fail'
+        pytest.fail()
 
     if feat.IsFieldSet('nullintfield'):
         feat.DumpReadable()
         gdaltest.ds.ReleaseResultSet(sql_lyr)
-        return 'fail'
+        pytest.fail()
 
     count = sql_lyr.GetFeatureCount()
 
@@ -954,11 +955,11 @@ def test_ogr_rfc28_42():
        f.GetField(3) != 1 or f.GetField(4) != 1 or \
        f.GetField(5) != 32000 or f.GetField(6) != 32001 or f.GetField(7) != 32001:
         f.DumpReadable()
-        return 'fail'
+        pytest.fail()
     f = lyr.GetNextFeature()
     if f.GetField('b') != 1 or f.GetField(1) != 0 or f.GetField(2) != 2 or f.GetField(3) != 1 or f.GetField(4) != 1:
         f.DumpReadable()
-        return 'fail'
+        pytest.fail()
     gdaltest.ds.ReleaseResultSet(lyr)
 
     lyr = ds.ExecuteSQL("SELECT MIN(b), MAX(b), SUM(b) FROM test")
@@ -996,31 +997,31 @@ def test_ogr_rfc28_43():
     assert lyr.GetLayerDefn().GetFieldDefn(3).GetType() == ogr.OFTInteger64
     if f.GetField(0) != 1000000000000 or f.GetField(1) != -1000000000000 or f.GetField(2) != 1 or f.GetField(3) != 100000000000 or f.GetField(4) != 1.0:
         f.DumpReadable()
-        return 'fail'
+        pytest.fail()
     gdaltest.ds.ReleaseResultSet(lyr)
 
     lyr = ds.ExecuteSQL("SELECT MIN(myint64), MAX(myint64), SUM(myint64) FROM test")
     f = lyr.GetNextFeature()
     if f.GetField('MIN_myint64') != -1000000000000:
         f.DumpReadable()
-        return 'fail'
+        pytest.fail()
     if f.GetField('MAX_myint64') != 100000000000:
         f.DumpReadable()
-        return 'fail'
+        pytest.fail()
     if f.GetField('SUM_myint64') != -1000000000000 + 100000000000:
         f.DumpReadable()
-        return 'fail'
+        pytest.fail()
     gdaltest.ds.ReleaseResultSet(lyr)
 
     lyr = ds.ExecuteSQL("SELECT DISTINCT myint64 FROM test ORDER BY myint64")
     f = lyr.GetNextFeature()
     if f.GetField('myint64') != -1000000000000:
         f.DumpReadable()
-        return 'fail'
+        pytest.fail()
     f = lyr.GetNextFeature()
     if f.GetField('myint64') != 100000000000:
         f.DumpReadable()
-        return 'fail'
+        pytest.fail()
     gdaltest.ds.ReleaseResultSet(lyr)
     return 'success'
 
@@ -1139,15 +1140,15 @@ def test_ogr_rfc28_46():
     f = sql_lyr.GetNextFeature()
     if f.GetFID() != 2500000000 or f['outfid'] != 2500000000 or f['val'] != 2:
         f.DumpReadable()
-        return 'fail'
+        pytest.fail()
     f = sql_lyr.GetNextFeature()
     if f.GetFID() != 3000000000 or f['outfid'] != 3000000000 or f['val'] != 1:
         f.DumpReadable()
-        return 'fail'
+        pytest.fail()
     f = sql_lyr.GetNextFeature()
     if f is not None:
         f.DumpReadable()
-        return 'fail'
+        pytest.fail()
     ds.ReleaseResultSet(sql_lyr)
 
     # Explicit cast of fid to bigint no longer needed if the layer is declared OLMD_FID64=YES
@@ -1156,7 +1157,7 @@ def test_ogr_rfc28_46():
     f = sql_lyr.GetNextFeature()
     if f.GetFID() != 2500000000 or f['outfid'] != 2500000000 or f['val'] != 2:
         f.DumpReadable()
-        return 'fail'
+        pytest.fail()
     ds.ReleaseResultSet(sql_lyr)
 
     ds = None
diff --git a/autotest/ogr/ogr_sql_sqlite.py b/autotest/ogr/ogr_sql_sqlite.py
index 5aeda82ed5c7..820000058c38 100755
--- a/autotest/ogr/ogr_sql_sqlite.py
+++ b/autotest/ogr/ogr_sql_sqlite.py
@@ -79,7 +79,7 @@ def test_ogr_sql_sqlite_1():
     if ret == 'fail':
         return ret
     if not ret:
-        return 'skip'
+        pytest.skip()
 
     ds = ogr.GetDriverByName("Memory").CreateDataSource("my_ds")
     for geom in [ogr.wkbNone, ogr.wkbUnknown]:
@@ -139,7 +139,7 @@ def test_ogr_sql_sqlite_1():
            feat.GetField('timefield') != '21:24:00' or \
            feat.GetField('from') != 'from_val':
             feat.DumpReadable()
-            return 'fail'
+            pytest.fail()
         feat = None
 
         # Test UPDATE
@@ -156,7 +156,7 @@ def test_ogr_sql_sqlite_1():
            feat.GetField('datefield') != '2012/08/23' or \
            feat.GetField('timefield') != '12:34:00':
             feat.DumpReadable()
-            return 'fail'
+            pytest.fail()
 
         feat.SetStyleString('cool_style')
         lyr.SetFeature(feat)
@@ -188,7 +188,7 @@ def test_ogr_sql_sqlite_1():
            feat.GetField('doublelistfield') != [1.23] or \
            feat.GetField('strlistfield') != ['a']:
             feat.DumpReadable()
-            return 'fail'
+            pytest.fail()
         feat = None
         ds.ReleaseResultSet(sql_lyr)
 
@@ -201,7 +201,7 @@ def test_ogr_sql_sqlite_1():
            feat.GetField('strfield') != 'bar' or \
            feat.GetStyleString() != 'cool_style':
             feat.DumpReadable()
-            return 'fail'
+            pytest.fail()
         feat = None
         ds.ReleaseResultSet(sql_lyr)
 
@@ -249,7 +249,7 @@ def test_ogr_sql_sqlite_1():
         feat = lyr.GetFeature(1000)
         if feat.GetField('intfield') != 100:
             feat.DumpReadable()
-            return 'fail'
+            pytest.fail()
         feat = None
 
         # Test DELETE
@@ -262,7 +262,7 @@ def test_ogr_sql_sqlite_1():
         feat = lyr.GetNextFeature()
         if feat is not None:
             feat.DumpReadable()
-            return 'fail'
+            pytest.fail()
         feat = None
 
         ds.DeleteLayer(0)
@@ -278,7 +278,7 @@ def test_ogr_sql_sqlite_1():
 def test_ogr_sql_sqlite_2():
 
     if not ogrtest.has_sqlite_dialect:
-        return 'skip'
+        pytest.skip()
 
     ds = ogr.GetDriverByName("Memory").CreateDataSource("my_ds")
 
@@ -313,7 +313,7 @@ def test_ogr_sql_sqlite_2():
        feat.GetField('strfield') != 'bar' or \
        feat.GetGeometryRef().ExportToWkt() != 'POINT (0 1)':
         feat.DumpReadable()
-        return 'fail'
+        pytest.fail()
     feat = None
 
     # Test SELECT
@@ -324,7 +324,7 @@ def test_ogr_sql_sqlite_2():
        feat.GetField('strfield') != 'bar' or \
        feat.GetGeometryRef().ExportToWkt() != 'POINT (0 1)':
         feat.DumpReadable()
-        return 'fail'
+        pytest.fail()
     got_srs = feat.GetGeometryRef().GetSpatialReference()
     assert not (got_srs is None or srs.IsSame(got_srs) == 0)
     feat = None
@@ -339,7 +339,7 @@ def test_ogr_sql_sqlite_2():
        feat.GetStyleString() != 'cool_style' or \
        feat.GetGeometryRef().ExportToWkt() != 'POINT (0 1)':
         feat.DumpReadable()
-        return 'fail'
+        pytest.fail()
     got_srs = feat.GetGeometryRef().GetSpatialReference()
     assert not (got_srs is None or srs.IsSame(got_srs) == 0)
     feat = None
@@ -370,7 +370,7 @@ def test_ogr_sql_sqlite_2():
         feat = sql_lyr.GetNextFeature()
         if feat.GetGeometryRef().ExportToWkt() != 'POINT (0 1)':
             feat.DumpReadable()
-            return 'fail'
+            pytest.fail()
         got_srs = feat.GetGeometryRef().GetSpatialReference()
         assert not (got_srs is None or srs.IsSame(got_srs) == 0)
         feat = None
@@ -386,7 +386,7 @@ def test_ogr_sql_sqlite_2():
 def test_ogr_sql_sqlite_3():
 
     if not ogrtest.has_sqlite_dialect:
-        return 'skip'
+        pytest.skip()
 
     ds = ogr.Open('data')
 
@@ -396,12 +396,12 @@ def test_ogr_sql_sqlite_3():
     feat = sql_lyr.GetNextFeature()
     if feat.GetField('NAME') != '_158_':
         feat.DumpReadable()
-        return 'fail'
+        pytest.fail()
     geom = feat.GetGeometryRef()
     p = geom.GetGeometryRef(0).GetPoint_2D(0)
     if p != (480701.0625, 4764738.0):
         feat.DumpReadable()
-        return 'fail'
+        pytest.fail()
     ds.ReleaseResultSet(sql_lyr)
 
     assert count == 10
@@ -417,7 +417,7 @@ def test_ogr_sql_sqlite_3():
 def test_ogr_sql_sqlite_4():
 
     if not ogrtest.has_sqlite_dialect:
-        return 'skip'
+        pytest.skip()
 
     ds = ogr.Open('data')
 
@@ -438,7 +438,7 @@ def test_ogr_sql_sqlite_4():
 def test_ogr_sql_sqlite_5():
 
     if not ogrtest.has_sqlite_dialect:
-        return 'skip'
+        pytest.skip()
 
     gdal.PushErrorHandler('CPLQuietErrorHandler')
     ds = ogr.GetDriverByName('SQLite').CreateDataSource('/vsimem/foo.db', options=['SPATIALITE=YES'])
@@ -453,8 +453,7 @@ def test_ogr_sql_sqlite_5():
     gdal.PopErrorHandler()
 
     if ogrtest.has_spatialite is False:
-        print('Spatialite not available')
-        return 'skip'
+        pytest.skip('Spatialite not available')
 
     ds = ogr.Open('data')
 
@@ -476,10 +475,10 @@ def test_ogr_sql_sqlite_5():
 def test_ogr_sql_sqlite_6():
 
     if not ogrtest.has_sqlite_dialect:
-        return 'skip'
+        pytest.skip()
 
     if ogrtest.has_spatialite is False:
-        return 'skip'
+        pytest.skip()
 
     gdal.SetConfigOption('OGR_SQLITE_DIALECT_USE_SPATIALITE', 'NO')
 
@@ -500,7 +499,7 @@ def test_ogr_sql_sqlite_6():
 def test_ogr_sql_sqlite_7():
 
     if not ogrtest.has_sqlite_dialect:
-        return 'skip'
+        pytest.skip()
 
     ds = ogr.GetDriverByName("Memory").CreateDataSource("my_ds")
 
@@ -527,7 +526,7 @@ def test_ogr_sql_sqlite_7():
        feat.GetField('geometry') != 'BLA' or \
        feat.GetGeometryRef().ExportToWkt() != 'POINT (0 1)':
         feat.DumpReadable()
-        return 'fail'
+        pytest.fail()
     feat = None
     ds.ReleaseResultSet(sql_lyr)
 
@@ -536,7 +535,7 @@ def test_ogr_sql_sqlite_7():
     feat = sql_lyr.GetNextFeature()
     if feat.GetGeometryRef().ExportToWkt() != 'POINT (0 1)':
         feat.DumpReadable()
-        return 'fail'
+        pytest.fail()
     feat = None
     ds.ReleaseResultSet(sql_lyr)
 
@@ -549,7 +548,7 @@ def test_ogr_sql_sqlite_7():
 def test_ogr_sql_sqlite_8():
 
     if not ogrtest.has_sqlite_dialect:
-        return 'skip'
+        pytest.skip()
 
     ds = ogr.Open('data')
 
@@ -573,7 +572,7 @@ def test_ogr_sql_sqlite_8():
 def test_ogr_sql_sqlite_9():
 
     if not ogrtest.has_sqlite_dialect:
-        return 'skip'
+        pytest.skip()
 
     ds = ogr.Open('data')
 
@@ -597,7 +596,7 @@ def test_ogr_sql_sqlite_9():
 def test_ogr_sql_sqlite_10():
 
     if not ogrtest.has_sqlite_dialect:
-        return 'skip'
+        pytest.skip()
 
     ds = ogr.Open('data')
 
@@ -621,7 +620,7 @@ def test_ogr_sql_sqlite_10():
 def test_ogr_sql_sqlite_11():
 
     if not ogrtest.has_sqlite_dialect:
-        return 'skip'
+        pytest.skip()
 
     ds = ogr.GetDriverByName("Memory").CreateDataSource("my_ds")
 
@@ -651,7 +650,7 @@ def test_ogr_sql_sqlite_11():
 def test_ogr_sql_sqlite_12():
 
     if not ogrtest.has_sqlite_dialect:
-        return 'skip'
+        pytest.skip()
 
     ds = ogr.GetDriverByName("Memory").CreateDataSource("my_ds")
 
@@ -684,7 +683,7 @@ def test_ogr_sql_sqlite_12():
 def test_ogr_sql_sqlite_13():
 
     if not ogrtest.has_sqlite_dialect:
-        return 'skip'
+        pytest.skip()
 
     ds = ogr.GetDriverByName("Memory").CreateDataSource("my_ds")
 
@@ -878,10 +877,10 @@ def ogr_sql_sqlite_14_and_15(sql):
 def test_ogr_sql_sqlite_14():
 
     if not ogrtest.has_sqlite_dialect:
-        return 'skip'
+        pytest.skip()
 
     if ogrtest.has_spatialite is False:
-        return 'skip'
+        pytest.skip()
 
     sql = "SELECT intfield, intfield2 FROM my_layer, my_layer2 WHERE " + \
         "my_layer2.rowid IN (SELECT pkid FROM idx_my_layer2_geometry WHERE " + \
@@ -897,13 +896,13 @@ def test_ogr_sql_sqlite_14():
 def test_ogr_sql_sqlite_15():
 
     if not ogrtest.has_sqlite_dialect:
-        return 'skip'
+        pytest.skip()
 
     if ogrtest.has_spatialite is False:
-        return 'skip'
+        pytest.skip()
 
     if int(gdaltest.spatialite_version[0:gdaltest.spatialite_version.find('.')]) < 3:
-        return 'skip'
+        pytest.skip()
 
     sql = "SELECT intfield, intfield2 FROM my_layer, my_layer2 WHERE " + \
         "my_layer2.rowid IN (SELECT ROWID FROM SpatialIndex WHERE f_table_name = 'my_layer2' AND search_frame = my_layer.geometry)"
@@ -1184,14 +1183,14 @@ def test_ogr_sql_sqlite_start_webserver():
     ogrtest.webserver_port = 0
 
     if not ogrtest.has_sqlite_dialect:
-        return 'skip'
+        pytest.skip()
 
     if gdal.GetDriverByName('HTTP') is None:
-        return 'skip'
+        pytest.skip()
 
     (ogrtest.webserver_process, ogrtest.webserver_port) = webserver.launch(handler=GeocodingHTTPHandler)
     if ogrtest.webserver_port == 0:
-        return 'skip'
+        pytest.skip()
 
     return 'success'
 
@@ -1202,10 +1201,10 @@ def test_ogr_sql_sqlite_start_webserver():
 def test_ogr_sql_sqlite_16(service=None, template='http://127.0.0.1:%d/geocoding?q=%%s'):
 
     if not ogrtest.has_sqlite_dialect:
-        return 'skip'
+        pytest.skip()
 
     if ogrtest.webserver_port == 0:
-        return 'skip'
+        pytest.skip()
 
     gdal.SetConfigOption('OGR_GEOCODE_APPLICATION', 'GDAL/OGR autotest suite')
     gdal.SetConfigOption('OGR_GEOCODE_EMAIL', 'foo@bar')
@@ -1324,10 +1323,10 @@ def test_ogr_sql_sqlite_16(service=None, template='http://127.0.0.1:%d/geocoding
 def test_ogr_sql_sqlite_17(service=None, template='http://127.0.0.1:%d/reversegeocoding?lon={lon}&lat={lat}'):
 
     if not ogrtest.has_sqlite_dialect:
-        return 'skip'
+        pytest.skip()
 
     if ogrtest.webserver_port == 0:
-        return 'skip'
+        pytest.skip()
 
     gdal.SetConfigOption('OGR_GEOCODE_APPLICATION', 'GDAL/OGR autotest suite')
     gdal.SetConfigOption('OGR_GEOCODE_EMAIL', 'foo@bar')
@@ -1488,7 +1487,7 @@ def test_ogr_sql_sqlite_23():
 def test_ogr_sql_sqlite_24():
 
     if not ogrtest.has_sqlite_dialect:
-        return 'skip'
+        pytest.skip()
 
     ds = ogr.GetDriverByName("Memory").CreateDataSource("my_ds")
 
@@ -1498,7 +1497,7 @@ def test_ogr_sql_sqlite_24():
     if feat.GetField(0) != 'ab':
         feat.DumpReadable()
         ds.ReleaseResultSet(sql_lyr)
-        return 'fail'
+        pytest.fail()
     ds.ReleaseResultSet(sql_lyr)
 
     # Big very compressible string
@@ -1508,7 +1507,7 @@ def test_ogr_sql_sqlite_24():
     if feat.GetField(0) != bigstr:
         feat.DumpReadable()
         ds.ReleaseResultSet(sql_lyr)
-        return 'fail'
+        pytest.fail()
     ds.ReleaseResultSet(sql_lyr)
 
     # Blob
@@ -1517,7 +1516,7 @@ def test_ogr_sql_sqlite_24():
     if feat.GetField(0) != '0203':
         feat.DumpReadable()
         ds.ReleaseResultSet(sql_lyr)
-        return 'fail'
+        pytest.fail()
     ds.ReleaseResultSet(sql_lyr)
 
     # Test inflating a random binary blob
@@ -1526,7 +1525,7 @@ def test_ogr_sql_sqlite_24():
     if not feat.IsFieldNull(0):
         feat.DumpReadable()
         ds.ReleaseResultSet(sql_lyr)
-        return 'fail'
+        pytest.fail()
     ds.ReleaseResultSet(sql_lyr)
 
     # Error case
@@ -1535,7 +1534,7 @@ def test_ogr_sql_sqlite_24():
     gdal.PopErrorHandler()
     if sql_lyr is not None:
         ds.ReleaseResultSet(sql_lyr)
-        return 'fail'
+        pytest.fail()
 
     # Error case
     sql_lyr = ds.ExecuteSQL("SELECT ogr_deflate('a', 'b')", dialect='SQLite')
@@ -1543,7 +1542,7 @@ def test_ogr_sql_sqlite_24():
     if not feat.IsFieldNull(0):
         feat.DumpReadable()
         ds.ReleaseResultSet(sql_lyr)
-        return 'fail'
+        pytest.fail()
     ds.ReleaseResultSet(sql_lyr)
 
     # Error case
@@ -1552,7 +1551,7 @@ def test_ogr_sql_sqlite_24():
     gdal.PopErrorHandler()
     if sql_lyr is not None:
         ds.ReleaseResultSet(sql_lyr)
-        return 'fail'
+        pytest.fail()
 
     # Error case
     sql_lyr = ds.ExecuteSQL("SELECT ogr_inflate('a')", dialect='SQLite')
@@ -1560,7 +1559,7 @@ def test_ogr_sql_sqlite_24():
     if not feat.IsFieldNull(0):
         feat.DumpReadable()
         ds.ReleaseResultSet(sql_lyr)
-        return 'fail'
+        pytest.fail()
     ds.ReleaseResultSet(sql_lyr)
 
     return 'success'
@@ -1571,7 +1570,7 @@ def test_ogr_sql_sqlite_24():
 def test_ogr_sql_sqlite_stop_webserver():
 
     if ogrtest.webserver_port == 0:
-        return 'skip'
+        pytest.skip()
 
     webserver.server_stop(ogrtest.webserver_process, ogrtest.webserver_port)
 
@@ -1599,7 +1598,7 @@ def ogr_sql_sqlite_25_test_errors(ds, fct):
 def test_ogr_sql_sqlite_25():
 
     if not ogrtest.has_sqlite_dialect:
-        return 'skip'
+        pytest.skip()
 
     # if ogrtest.has_spatialite is True:
     #    return 'skip'
@@ -1612,7 +1611,7 @@ def test_ogr_sql_sqlite_25():
     if feat.GetGeometryRef().ExportToWkt() != 'POINT (0 1)':
         feat.DumpReadable()
         ds.ReleaseResultSet(sql_lyr)
-        return 'fail'
+        pytest.fail()
     ds.ReleaseResultSet(sql_lyr)
 
     for fct in ["ST_AsText", "ST_GeomFromText", "ST_AsBinary", "ST_GeomFromWKB"]:
@@ -1649,10 +1648,10 @@ def test_ogr_sql_sqlite_25():
 def test_ogr_sql_sqlite_26():
 
     if not ogrtest.has_sqlite_dialect:
-        return 'skip'
+        pytest.skip()
 
     if not ogrtest.have_geos():
-        return 'skip'
+        pytest.skip()
 
     # if ogrtest.has_spatialite is True:
     #    return 'skip'
@@ -1691,11 +1690,10 @@ def test_ogr_sql_sqlite_26():
                 if ogrtest.has_sqlite_dialect and wkt == 'POLYGON EMPTY':
                     print('difference wit op = %s and wkt = POLYGON EMPTY' % op_str)
                 else:
-                    gdaltest.post_reason('fail with %s' % op_str)
                     print(wkt)
                     print(b_sql)
                     print(b_geos)
-                    return 'fail'
+                    pytest.fail('fail with %s' % op_str)
 
     for op_str in ["Intersects", "Equals", "Disjoint",
                    "Touches", "Crosses", "Within",
@@ -1777,7 +1775,7 @@ def test_ogr_sql_sqlite_26():
 def test_ogr_sql_sqlite_27():
 
     if not ogrtest.has_sqlite_dialect:
-        return 'skip'
+        pytest.skip()
 
     ds = ogr.GetDriverByName('Memory').CreateDataSource('')
     lyr = ds.CreateLayer('test')
@@ -1810,7 +1808,7 @@ def test_ogr_sql_sqlite_27():
 def test_ogr_sql_sqlite_28():
 
     if not ogrtest.has_sqlite_dialect:
-        return 'skip'
+        pytest.skip()
 
     ds = ogr.GetDriverByName('Memory').CreateDataSource('')
 
@@ -1830,9 +1828,8 @@ def test_ogr_sql_sqlite_28():
         sql_lyr = ds.ExecuteSQL(sql, dialect='SQLite')
         f = sql_lyr.GetNextFeature()
         if not f.IsFieldNull(0):
-            print(sql)
             f.DumpReadable()
-            return 'fail'
+            pytest.fail(sql)
         ds.ReleaseResultSet(sql_lyr)
 
     # Valid hstore syntax
@@ -1840,9 +1837,8 @@ def test_ogr_sql_sqlite_28():
         sql_lyr = ds.ExecuteSQL(sql, dialect='SQLite')
         f = sql_lyr.GetNextFeature()
         if f.GetField(0) != expected:
-            print(sql)
             f.DumpReadable()
-            return 'fail'
+            pytest.fail(sql)
         ds.ReleaseResultSet(sql_lyr)
 
     return 'success'
@@ -1854,7 +1850,7 @@ def test_ogr_sql_sqlite_28():
 def test_ogr_sql_sqlite_29():
 
     if not ogrtest.has_sqlite_dialect:
-        return 'skip'
+        pytest.skip()
 
     ds = ogr.GetDriverByName('Memory').CreateDataSource('')
     lyr = ds.CreateLayer('test', geom_type=ogr.wkbCircularString)
@@ -1882,7 +1878,7 @@ def test_ogr_sql_sqlite_29():
 def test_ogr_sql_sqlite_30():
 
     if not ogrtest.has_sqlite_dialect:
-        return 'skip'
+        pytest.skip()
 
     ds = ogr.GetDriverByName('Memory').CreateDataSource('')
     lyr = ds.CreateLayer('testm', geom_type=ogr.wkbLineStringM)
@@ -1924,7 +1920,7 @@ def test_ogr_sql_sqlite_30():
 def test_ogr_sql_sqlite_31():
 
     if not ogrtest.has_sqlite_dialect:
-        return 'skip'
+        pytest.skip()
 
     ds = ogr.GetDriverByName('Memory').CreateDataSource('')
     lyr = ds.CreateLayer('test')
diff --git a/autotest/ogr/ogr_sql_test.py b/autotest/ogr/ogr_sql_test.py
index fbabb01d318e..ce273e945daa 100755
--- a/autotest/ogr/ogr_sql_test.py
+++ b/autotest/ogr/ogr_sql_test.py
@@ -34,6 +34,7 @@
 from osgeo import ogr
 import gdaltest
 import ogrtest
+import pytest
 
 ###############################################################################
 # Test a simple query with a where clause.
@@ -130,19 +131,19 @@ def test_ogr_sql_5():
     feat = sql_lyr.GetNextFeature()
     if feat['max_eas_id'] != 179:
         feat.DumpReadable()
-        return 'fail'
+        pytest.fail()
     if feat['min_eas_id'] != 158:
         feat.DumpReadable()
-        return 'fail'
+        pytest.fail()
     if abs(feat['avg_eas_id'] - 168.142857142857) > 1e-12:
         feat.DumpReadable()
-        return 'fail'
+        pytest.fail()
     if feat['count_eas_id'] != 7:
         feat.DumpReadable()
-        return 'fail'
+        pytest.fail()
     if feat['sum_eas_id'] != 1177:
         feat.DumpReadable()
-        return 'fail'
+        pytest.fail()
     gdaltest.ds.ReleaseResultSet(sql_lyr)
 
     return 'success'
@@ -382,7 +383,7 @@ def test_ogr_sql_17():
 def test_ogr_sql_18():
 
     if sys.version_info >= (3, 0, 0):
-        return 'skip'
+        pytest.skip()
 
     name = 'data/departs.vrt'
 
@@ -393,7 +394,7 @@ def test_ogr_sql_18():
     sql_lyr = ds.ExecuteSQL(sql)
     if sql_lyr is None:
         ds = None
-        return 'fail'
+        pytest.fail()
     feat = sql_lyr.GetNextFeature()
     assert feat is not None
     feat = None
@@ -405,7 +406,7 @@ def test_ogr_sql_18():
     sql_lyr = ds.ExecuteSQL(sql)
     if sql_lyr is None:
         ds = None
-        return 'fail'
+        pytest.fail()
     feat = sql_lyr.GetNextFeature()
     assert feat is not None
     feat = None
@@ -648,8 +649,7 @@ def test_ogr_sql_28():
 
     try:
         sql_lyr = ds.ExecuteSQL(None)
-        gdaltest.post_reason('expected error on NULL query')
-        return 'fail'
+        pytest.fail('expected error on NULL query')
     except:
         pass
 
@@ -790,9 +790,8 @@ def test_ogr_sql_28():
         sql_lyr = ds.ExecuteSQL(query)
         gdal.PopErrorHandler()
         if sql_lyr is not None:
-            gdaltest.post_reason('expected None result on "%s"' % query)
             ds.ReleaseResultSet(sql_lyr)
-            return 'fail'
+            pytest.fail('expected None result on "%s"' % query)
         assert gdal.GetLastErrorType() != 0, ('expected error on "%s"' % query)
 
     ds = None
@@ -1003,28 +1002,24 @@ def test_ogr_sql_36():
         sql_lyr = ds.ExecuteSQL("select distinct %s from layer order by %s asc" % (fieldname, fieldname))
         feat = sql_lyr.GetNextFeature()
         if feat.IsFieldSetAndNotNull(0) != 0:
-            print('field %s' % fieldname)
             feat.DumpReadable()
-            return 'fail'
+            pytest.fail('field %s' % fieldname)
         feat = sql_lyr.GetNextFeature()
         if feat.IsFieldSetAndNotNull(0) == 0:
-            print('field %s' % fieldname)
             feat.DumpReadable()
-            return 'fail'
+            pytest.fail('field %s' % fieldname)
         ds.ReleaseResultSet(sql_lyr)
 
     for fieldname in ['intfield', 'int64field', 'floatfield', 'strfield']:
         sql_lyr = ds.ExecuteSQL("select distinct %s from layer order by %s desc" % (fieldname, fieldname))
         feat = sql_lyr.GetNextFeature()
         if feat.IsFieldSetAndNotNull(0) == 0:
-            print('field %s' % fieldname)
             feat.DumpReadable()
-            return 'fail'
+            pytest.fail('field %s' % fieldname)
         feat = sql_lyr.GetNextFeature()
         if feat.IsFieldSetAndNotNull(0) != 0:
-            print('field %s' % fieldname)
             feat.DumpReadable()
-            return 'fail'
+            pytest.fail('field %s' % fieldname)
         ds.ReleaseResultSet(sql_lyr)
 
     return 'success'
@@ -1064,19 +1059,16 @@ def test_ogr_sql_37():
         sql_lyr = ds.ExecuteSQL("select count(%s), count(distinct %s), count(*) from layer" % (fieldname, fieldname))
         feat = sql_lyr.GetNextFeature()
         if feat.GetFieldAsInteger(0) != 2:
-            print('field %s' % fieldname)
             feat.DumpReadable()
-            return 'fail'
+            pytest.fail('field %s' % fieldname)
 
         if feat.GetFieldAsInteger(1) != 1:
-            print('field %s' % fieldname)
             feat.DumpReadable()
-            return 'fail'
+            pytest.fail('field %s' % fieldname)
 
         if feat.GetFieldAsInteger(2) != 4:
-            print('field %s' % fieldname)
             feat.DumpReadable()
-            return 'fail'
+            pytest.fail('field %s' % fieldname)
 
         ds.ReleaseResultSet(sql_lyr)
 
@@ -1084,7 +1076,7 @@ def test_ogr_sql_37():
     feat = sql_lyr.GetNextFeature()
     if feat.IsFieldSetAndNotNull(0) != 0:
         feat.DumpReadable()
-        return 'fail'
+        pytest.fail()
     ds.ReleaseResultSet(sql_lyr)
 
     # Fix crash when first values is null (#4509)
@@ -1092,25 +1084,25 @@ def test_ogr_sql_37():
     feat = sql_lyr.GetNextFeature()
     if feat.IsFieldSetAndNotNull('strfield_first_null'):
         feat.DumpReadable()
-        return 'fail'
+        pytest.fail()
     feat = sql_lyr.GetNextFeature()
     if feat.GetFieldAsString('strfield_first_null') != 'foo':
         feat.DumpReadable()
-        return 'fail'
+        pytest.fail()
     ds.ReleaseResultSet(sql_lyr)
 
     sql_lyr = ds.ExecuteSQL("select distinct strfield_never_set from layer")
     feat = sql_lyr.GetNextFeature()
     if feat.IsFieldSetAndNotNull('strfield_never_set'):
         feat.DumpReadable()
-        return 'fail'
+        pytest.fail()
     ds.ReleaseResultSet(sql_lyr)
 
     sql_lyr = ds.ExecuteSQL("select min(intfield_never_set), max(intfield_never_set), avg(intfield_never_set), sum(intfield_never_set), count(intfield_never_set) from layer")
     feat = sql_lyr.GetNextFeature()
     if feat.IsFieldSetAndNotNull(0) or feat.IsFieldSetAndNotNull(1) or feat.IsFieldSetAndNotNull(2) or feat.IsFieldSetAndNotNull(3) or feat.GetField(4) != 0:
         feat.DumpReadable()
-        return 'fail'
+        pytest.fail()
     ds.ReleaseResultSet(sql_lyr)
 
     return 'success'
@@ -1130,8 +1122,7 @@ def test_ogr_sql_38():
 
     if abs(val - 1634833.39062) < 1e-5:
         return 'success'
-    print(val)
-    return 'fail'
+    pytest.fail(val)
 
 ###############################################################################
 # Test ORDER BY on a float special field
@@ -1148,8 +1139,7 @@ def test_ogr_sql_39():
 
     if abs(val - 5268.813) < 1e-5:
         return 'success'
-    print(val)
-    return 'fail'
+    pytest.fail(val)
 
 ###############################################################################
 # Test ORDER BY on a int special field
@@ -1248,9 +1238,8 @@ def test_ogr_sql_44():
         sql_lyr = gdaltest.ds.ExecuteSQL(sql)
         f = sql_lyr.GetNextFeature()
         if f.IsFieldSetAndNotNull(0):
-            print(sql)
             f.DumpReadable()
-            return 'fail'
+            pytest.fail(sql)
         gdaltest.ds.ReleaseResultSet(sql_lyr)
 
     # Valid hstore syntax
@@ -1266,9 +1255,8 @@ def test_ogr_sql_44():
         sql_lyr = gdaltest.ds.ExecuteSQL(sql)
         f = sql_lyr.GetNextFeature()
         if f.GetField(0) != expected:
-            print(sql)
             f.DumpReadable()
-            return 'fail'
+            pytest.fail(sql)
         gdaltest.ds.ReleaseResultSet(sql_lyr)
 
     return 'success'
@@ -1333,7 +1321,7 @@ def test_ogr_sql_46():
     feat = sql_lyr.GetNextFeature()
     if feat.GetField(0) != 3 or feat.GetField(1) != 'id' or feat.GetField(2) != 3 or feat.GetField(3) != 3 or feat.GetField(4) != 'from':
         feat.DumpReadable()
-        return 'fail'
+        pytest.fail()
     feat = sql_lyr.GetNextFeature()
     assert feat is None
     ds.ReleaseResultSet(sql_lyr)
@@ -1342,7 +1330,7 @@ def test_ogr_sql_46():
     feat = sql_lyr.GetNextFeature()
     if feat.GetField(0) != 3 or feat.GetField(1) != 3 or feat.GetField(2) != 2 or feat.GetField(3) != 2:
         feat.DumpReadable()
-        return 'fail'
+        pytest.fail()
     ds.ReleaseResultSet(sql_lyr)
 
     # Not accepted
@@ -1412,7 +1400,7 @@ def test_ogr_sql_48():
     for f in sql_lyr:
         if f['int_field'] != i:
             f.DumpReadable()
-            return 'fail'
+            pytest.fail()
         i = i + 1
     ds.ReleaseResultSet(sql_lyr)
     assert i == 1001
diff --git a/autotest/ogr/ogr_sqlite.py b/autotest/ogr/ogr_sqlite.py
index 2599f5e9d490..5b0c54455d18 100755
--- a/autotest/ogr/ogr_sqlite.py
+++ b/autotest/ogr/ogr_sqlite.py
@@ -33,6 +33,7 @@
 import os
 import sys
 import shutil
+import pytest
 
 # Make sure we run from the directory of the script
 if os.path.basename(sys.argv[0]) == os.path.basename(__file__):
@@ -59,7 +60,7 @@ def test_ogr_sqlite_1():
 
     sqlite_dr = ogr.GetDriverByName('SQLite')
     if sqlite_dr is None:
-        return 'skip'
+        pytest.skip()
 
     try:
         os.remove('tmp/sqlite_test.db')
@@ -75,7 +76,7 @@ def test_ogr_sqlite_1():
 
     if gdaltest.sl_ds is not None:
         return 'success'
-    return 'fail'
+    pytest.fail()
 
 ###############################################################################
 # Create table from data/poly.shp
@@ -84,7 +85,7 @@ def test_ogr_sqlite_1():
 def test_ogr_sqlite_2():
 
     if gdaltest.sl_ds is None:
-        return 'skip'
+        pytest.skip()
 
     gdal.PushErrorHandler('CPLQuietErrorHandler')
     gdaltest.sl_ds.ExecuteSQL('DELLAYER:tpoly')
@@ -184,7 +185,7 @@ def test_ogr_sqlite_2():
 
 def test_ogr_sqlite_3():
     if gdaltest.sl_ds is None:
-        return 'skip'
+        pytest.skip()
 
     assert gdaltest.sl_lyr.GetFeatureCount() == 10
 
@@ -212,7 +213,7 @@ def test_ogr_sqlite_3():
                 ('Attribute %d does not match' % fld)
         if read_feat.GetField('int64') != 1234567890123:
             read_feat.DumpReadable()
-            return 'fail'
+            pytest.fail()
 
     gdaltest.poly_feat = None
     gdaltest.shp_ds = None
@@ -227,7 +228,7 @@ def test_ogr_sqlite_3():
 def test_ogr_sqlite_4():
 
     if gdaltest.sl_ds is None:
-        return 'skip'
+        pytest.skip()
 
     dst_feat = ogr.Feature(feature_def=gdaltest.sl_lyr.GetLayerDefn())
     wkt_list = ['10', '2', '1', '3d_1', '4', '5', '6']
@@ -264,7 +265,7 @@ def test_ogr_sqlite_4():
 def test_ogr_sqlite_5():
 
     if gdaltest.sl_ds is None:
-        return 'skip'
+        pytest.skip()
 
     expect = [179, 173, 172, 171, 170, 169, 168, 166, 165, 158, None]
 
@@ -285,7 +286,7 @@ def test_ogr_sqlite_5():
 def test_ogr_sqlite_6():
 
     if gdaltest.sl_ds is None:
-        return 'skip'
+        pytest.skip()
 
     sql_lyr = gdaltest.sl_ds.ExecuteSQL("select * from tpoly where prfedea = '2'")
 
@@ -307,7 +308,7 @@ def test_ogr_sqlite_6():
 def test_ogr_sqlite_7():
 
     if gdaltest.sl_ds is None:
-        return 'skip'
+        pytest.skip()
 
     gdaltest.sl_lyr.SetAttributeFilter(None)
 
@@ -338,7 +339,7 @@ def test_ogr_sqlite_7():
 def test_ogr_sqlite_8():
 
     if gdaltest.sl_ds is None:
-        return 'skip'
+        pytest.skip()
 
     ######################################################################
     # Prepare working feature.
@@ -392,7 +393,7 @@ def test_ogr_sqlite_8():
 def test_ogr_sqlite_9():
 
     if gdaltest.sl_ds is None:
-        return 'skip'
+        pytest.skip()
 
     ######################################################################
     # Read feature with EAS_ID 158.
@@ -421,8 +422,7 @@ def test_ogr_sqlite_9():
 
     if feat_read_2.GetField('PRFEDEA') != 'SetWorked':
         feat_read_2.DumpReadable()
-        gdaltest.post_reason('PRFEDEA apparently not reset as expected.')
-        return 'fail'
+        pytest.fail('PRFEDEA apparently not reset as expected.')
 
     # Test updating non-existing feature
     feat_read.SetFID(-10)
@@ -445,7 +445,7 @@ def test_ogr_sqlite_9():
 def test_ogr_sqlite_10():
 
     if gdaltest.sl_ds is None:
-        return 'skip'
+        pytest.skip()
 
     ######################################################################
     # Read feature with EAS_ID 158.
@@ -466,8 +466,7 @@ def test_ogr_sqlite_10():
     if feat_read_2.GetField('PRFEDEA') != feat_read.GetField('PRFEDEA'):
         feat_read.DumpReadable()
         feat_read_2.DumpReadable()
-        gdaltest.post_reason('GetFeature() result seems to not match expected.')
-        return 'fail'
+        pytest.fail('GetFeature() result seems to not match expected.')
 
     return 'success'
 
@@ -478,7 +477,7 @@ def test_ogr_sqlite_10():
 def test_ogr_sqlite_11():
 
     if gdaltest.sl_ds is None:
-        return 'skip'
+        pytest.skip()
 
     ######################################################
     # Create Layer with WKB geometry
@@ -513,7 +512,7 @@ def test_ogr_sqlite_11():
 def test_ogr_sqlite_12():
 
     if gdaltest.sl_ds is None:
-        return 'skip'
+        pytest.skip()
 
     ######################################################
     # Create Layer with WKT geometry
@@ -561,7 +560,7 @@ def test_ogr_sqlite_12():
 def test_ogr_sqlite_13():
 
     if gdaltest.sl_ds is None:
-        return 'skip'
+        pytest.skip()
 
     ######################################################
     # Create Layer with EPSG:4326
@@ -598,7 +597,7 @@ def test_ogr_sqlite_13():
 def test_ogr_sqlite_14():
 
     if gdaltest.sl_ds is None:
-        return 'skip'
+        pytest.skip()
 
     gdaltest.sl_lyr = gdaltest.sl_ds.CreateLayer('testtypes')
     ogrtest.quick_create_layer_def(gdaltest.sl_lyr,
@@ -649,7 +648,7 @@ def test_ogr_sqlite_14():
 def test_ogr_sqlite_15():
 
     if gdaltest.sl_ds is None:
-        return 'skip'
+        pytest.skip()
 
     ######################################################
     # Create Layer with SPATIALITE geometry
@@ -719,7 +718,7 @@ def test_ogr_sqlite_15():
 def test_ogr_sqlite_16():
 
     if gdaltest.sl_ds is None:
-        return 'skip'
+        pytest.skip()
 
     ######################################################
     # Reopen DB in update
@@ -798,7 +797,7 @@ def test_ogr_sqlite_16():
 def test_ogr_sqlite_17():
 
     if gdaltest.sl_ds is None:
-        return 'skip'
+        pytest.skip()
 
     ######################################################
     # Create dataset with SPATIALITE geometry
@@ -847,10 +846,10 @@ def test_ogr_sqlite_17():
 def test_ogr_sqlite_18():
 
     if gdaltest.sl_ds is None:
-        return 'skip'
+        pytest.skip()
 
     if not gdaltest.has_spatialite:
-        return 'skip'
+        pytest.skip()
 
     ds = ogr.Open('tmp/spatialite_test.db', update=1)
     srs = osr.SpatialReference()
@@ -872,7 +871,7 @@ def test_ogr_sqlite_18():
     if feat.GetField('auth_name') != 'OGR' or \
        feat.GetField('proj4text').find('+proj=vandg') != 0:
         feat.DumpReadable()
-        return 'fail'
+        pytest.fail()
     gdaltest.sl_ds.ReleaseResultSet(sql_lyr)
 
     return 'success'
@@ -884,16 +883,16 @@ def test_ogr_sqlite_18():
 def test_ogr_sqlite_19():
 
     if gdaltest.sl_ds is None:
-        return 'skip'
+        pytest.skip()
 
     if int(gdal.VersionInfo('VERSION_NUM')) < 1800:
-        return 'skip'
+        pytest.skip()
 
     if not gdaltest.has_spatialite:
-        return 'skip'
+        pytest.skip()
 
     if gdaltest.spatialite_version != '2.3.1':
-        return 'skip'
+        pytest.skip()
 
     ds = ogr.GetDriverByName('SQLite').CreateDataSource('tmp/spatialite_test_with_epsg.db', options=['SPATIALITE=YES', 'INIT_WITH_EPSG=YES'])
 
@@ -922,13 +921,13 @@ def test_ogr_sqlite_19():
 def test_ogr_sqlite_19_bis():
 
     if gdaltest.sl_ds is None:
-        return 'skip'
+        pytest.skip()
 
     if not gdaltest.has_spatialite:
-        return 'skip'
+        pytest.skip()
 
     if int(gdaltest.spatialite_version[0:gdaltest.spatialite_version.find('.')]) < 4:
-        return 'skip'
+        pytest.skip()
 
     ds = ogr.GetDriverByName('SQLite').CreateDataSource('/vsimem/spatialite_test_without_epsg.db', options=['SPATIALITE=YES', 'INIT_WITH_EPSG=NO'])
 
@@ -958,7 +957,7 @@ def test_ogr_sqlite_19_bis():
 def test_ogr_sqlite_20():
 
     if gdaltest.sl_ds is None:
-        return 'skip'
+        pytest.skip()
 
     gdal.Unlink('tmp/non_spatialite_test_with_epsg.db')
 
@@ -989,7 +988,7 @@ def test_ogr_sqlite_20():
 def test_ogr_sqlite_21():
 
     if gdaltest.sl_ds is None:
-        return 'skip'
+        pytest.skip()
 
     src_lyr = gdaltest.sl_ds.GetLayerByName('tpoly')
     copy_lyr = gdaltest.sl_ds.CopyLayer(src_lyr, 'tpoly_2')
@@ -1007,7 +1006,7 @@ def test_ogr_sqlite_21():
 def test_ogr_sqlite_22():
 
     if gdaltest.sl_ds is None:
-        return 'skip'
+        pytest.skip()
 
     src_lyr = gdaltest.sl_ds.ExecuteSQL('select * from tpoly')
     copy_lyr = gdaltest.sl_ds.CopyLayer(src_lyr, 'tpoly_3')
@@ -1027,7 +1026,7 @@ def test_ogr_sqlite_22():
 def test_ogr_sqlite_23():
 
     if gdaltest.sl_ds is None:
-        return 'skip'
+        pytest.skip()
 
     shp_layer = gdaltest.sl_ds.GetLayerByName('tpoly')
     shp_layer.SetIgnoredFields(['AREA'])
@@ -1074,7 +1073,7 @@ def test_ogr_sqlite_23():
 def test_ogr_sqlite_24():
 
     if gdaltest.sl_ds is None:
-        return 'skip'
+        pytest.skip()
 
     try:
         os.remove('tmp/test24.sqlite')
@@ -1099,9 +1098,8 @@ def test_ogr_sqlite_24():
     lyr = ds.ExecuteSQL('select OGR_GEOMETRY from test')
     gdal.PopErrorHandler()
     if lyr is not None:
-        gdaltest.post_reason('this should not work (1)')
         ds.ReleaseResultSet(lyr)
-        return 'fail'
+        pytest.fail('this should not work (1)')
 
     lyr = ds.ExecuteSQL('select * from test')
     lyr.SetAttributeFilter("OGR_GEOMETRY = 'POLYGON'")
@@ -1138,7 +1136,7 @@ def test_ogr_sqlite_24():
 def test_ogr_sqlite_25():
 
     if gdaltest.sl_ds is None:
-        return 'skip'
+        pytest.skip()
 
     sql_lyr = gdaltest.sl_ds.ExecuteSQL("SELECT sqlite_version()")
     feat = sql_lyr.GetNextFeature()
@@ -1150,14 +1148,14 @@ def test_ogr_sqlite_25():
     drv = gdal.GetDriverByName('HTTP')
 
     if drv is None:
-        return 'skip'
+        pytest.skip()
 
     # Check that we have SQLite VFS support
     gdal.PushErrorHandler('CPLQuietErrorHandler')
     ds = ogr.GetDriverByName('SQLite').CreateDataSource('/vsimem/ogr_sqlite_25.db')
     gdal.PopErrorHandler()
     if ds is None:
-        return 'skip'
+        pytest.skip()
     ds = None
     gdal.Unlink('/vsimem/ogr_sqlite_25.db')
 
@@ -1166,9 +1164,8 @@ def test_ogr_sqlite_25():
     gdal.SetConfigOption('GDAL_HTTP_TIMEOUT', None)
     if ds is None:
         if gdaltest.gdalurlopen('http://download.osgeo.org/gdal/data/sqlite3/polygon.db', timeout=4) is None:
-            print('cannot open URL')
-            return 'skip'
-        return 'fail'
+            pytest.skip('cannot open URL')
+        pytest.fail()
 
     lyr = ds.GetLayerByName('polygon')
     assert lyr is not None
@@ -1184,7 +1181,7 @@ def test_ogr_sqlite_25():
 def test_ogr_sqlite_26():
 
     if gdaltest.sl_ds is None:
-        return 'skip'
+        pytest.skip()
 
     ds = ogr.GetDriverByName('SQLite').CreateDataSource(':memory:')
     sql_lyr = ds.ExecuteSQL('select count(*) from geometry_columns')
@@ -1205,13 +1202,13 @@ def test_ogr_sqlite_26():
 def test_ogr_sqlite_27():
 
     if gdaltest.sl_ds is None:
-        return 'skip'
+        pytest.skip()
 
     import test_cli_utilities
     if test_cli_utilities.get_ogr2ogr_path() is None:
-        return 'skip'
+        pytest.skip()
     if test_cli_utilities.get_test_ogrsf_path() is None:
-        return 'skip'
+        pytest.skip()
 
     gdaltest.runexternal(test_cli_utilities.get_ogr2ogr_path() + ' -f SQLite tmp/ogr_sqlite_27.sqlite data/poly.shp --config OGR_SQLITE_SYNCHRONOUS OFF')
 
@@ -1250,11 +1247,11 @@ def test_ogr_sqlite_27():
 def test_ogr_sqlite_28():
 
     if gdaltest.sl_ds is None:
-        return 'skip'
+        pytest.skip()
 
     import test_cli_utilities
     if test_cli_utilities.get_test_ogrsf_path() is None:
-        return 'skip'
+        pytest.skip()
 
     # Test with a Spatialite 3.0 DB
     shutil.copy('data/poly_spatialite.sqlite', 'tmp/poly_spatialite.sqlite')
@@ -1289,7 +1286,7 @@ def test_ogr_sqlite_28():
 def test_ogr_sqlite_29():
 
     if gdaltest.sl_ds is None:
-        return 'skip'
+        pytest.skip()
 
     try:
         os.remove('tmp/ogr_sqlite_29.sqlite')
@@ -1312,11 +1309,11 @@ def test_ogr_sqlite_29():
 def test_ogr_sqlite_30():
 
     if gdaltest.sl_ds is None:
-        return 'skip'
+        pytest.skip()
 
     sql_lyr = gdaltest.sl_ds.ExecuteSQL('SELECT * FROM tpoly WHERE eas_id = 12345')
     if sql_lyr is None:
-        return 'skip'
+        pytest.skip()
 
     # Test fix added in r24768
     feat = sql_lyr.GetNextFeature()
@@ -1333,7 +1330,7 @@ def test_ogr_sqlite_30():
 def test_ogr_spatialite_1():
 
     if gdaltest.sl_ds is None:
-        return 'skip'
+        pytest.skip()
 
     gdal.PushErrorHandler('CPLQuietErrorHandler')
     sql_lyr = gdaltest.sl_ds.ExecuteSQL("SELECT spatialite_version()")
@@ -1357,7 +1354,7 @@ def test_ogr_spatialite_1():
 def test_ogr_spatialite_2():
 
     if not gdaltest.has_spatialite:
-        return 'skip'
+        pytest.skip()
 
     ds = ogr.Open('tmp/spatialite_test.db', update=1)
     srs = osr.SpatialReference()
@@ -1511,7 +1508,7 @@ def test_ogr_spatialite_2():
 def test_ogr_spatialite_3():
 
     if not gdaltest.has_spatialite:
-        return 'skip'
+        pytest.skip()
 
     ds = ogr.Open('tmp/spatialite_test.db', update=1)
     ds.ExecuteSQL('CREATE VIRTUAL TABLE testpoly USING VirtualShape(data/testpoly, CP1252, -1)')
@@ -1537,7 +1534,7 @@ def test_ogr_spatialite_3():
 def test_ogr_spatialite_4():
 
     if not gdaltest.has_spatialite:
-        return 'skip'
+        pytest.skip()
 
     ds = ogr.Open('tmp/spatialite_test.db', update=1)
 
@@ -1591,7 +1588,7 @@ def test_ogr_spatialite_4():
 def test_ogr_spatialite_5(bUseComprGeom=False):
 
     if not gdaltest.has_spatialite:
-        return 'skip'
+        pytest.skip()
 
     try:
         os.remove('tmp/ogr_spatialite_5.sqlite')
@@ -1685,8 +1682,7 @@ def test_ogr_spatialite_5(bUseComprGeom=False):
             expected_wkt = geom.ExportToIsoWkt()
             assert got_wkt == expected_wkt
         elif got_wkt != wkt:
-            gdaltest.post_reason('got %s, expected %s' % (got_wkt, wkt))
-            return 'fail'
+            pytest.fail('got %s, expected %s' % (got_wkt, wkt))
 
         num_layer = num_layer + 1
 
@@ -1699,17 +1695,15 @@ def test_ogr_spatialite_5(bUseComprGeom=False):
                 val = feat.GetFieldAsInteger(0)
                 if wkt != 'LINESTRING (1 2)':
                     if val != 1:
-                        gdaltest.post_reason('did not get expected compressed geometry')
                         print(wkt)
                         print(val)
                         ds.ReleaseResultSet(sql_lyr)
-                        return 'fail'
+                        pytest.fail('did not get expected compressed geometry')
                 else:
                     if val != 0:
-                        print(wkt)
                         print(val)
                         ds.ReleaseResultSet(sql_lyr)
-                        return 'fail'
+                        pytest.fail(wkt)
                 feat = None
                 ds.ReleaseResultSet(sql_lyr)
             num_layer = num_layer + 1
@@ -1725,10 +1719,10 @@ def test_ogr_spatialite_5(bUseComprGeom=False):
 def test_ogr_spatialite_compressed_geom_5():
 
     if not gdaltest.has_spatialite:
-        return 'skip'
+        pytest.skip()
 
     if gdaltest.spatialite_version == '2.3.1':
-        return 'skip'
+        pytest.skip()
 
     return test_ogr_spatialite_5(bUseComprGeom=True)
 
@@ -1739,10 +1733,10 @@ def test_ogr_spatialite_compressed_geom_5():
 def test_ogr_spatialite_6():
 
     if not gdaltest.has_spatialite:
-        return 'skip'
+        pytest.skip()
 
     if gdaltest.spatialite_version.find('2.3') == 0:
-        return 'skip'
+        pytest.skip()
 
     try:
         os.remove('tmp/ogr_spatialite_6.sqlite')
@@ -1824,19 +1818,19 @@ def test_ogr_spatialite_6():
     feat = view_lyr.GetFeature(3)
     if feat.GetFieldAsInteger(0) != 34:
         feat.DumpReadable()
-        return 'fail'
+        pytest.fail()
     if feat.GetFieldAsDouble(1) != 56.78:
         feat.DumpReadable()
-        return 'fail'
+        pytest.fail()
     view_lyr.SetAttributeFilter('"int\'col" = 34')
     view_lyr.SetSpatialFilterRect(2.5, 49.5, 3.5, 50.5)
     feat = view_lyr.GetNextFeature()
     if feat.GetFID() != 3:
         feat.DumpReadable()
-        return 'fail'
+        pytest.fail()
     if feat.GetGeometryRef().ExportToWkt() != 'POINT (3 50)':
         feat.DumpReadable()
-        return 'fail'
+        pytest.fail()
     ds = None
 
     # Remove spatial index
@@ -1854,7 +1848,7 @@ def test_ogr_spatialite_6():
     feat = view_lyr.GetNextFeature()
     if feat.GetFID() != 3:
         feat.DumpReadable()
-        return 'fail'
+        pytest.fail()
     ds = None
 
     return 'success'
@@ -1866,7 +1860,7 @@ def test_ogr_spatialite_6():
 def test_ogr_spatialite_7():
 
     if not gdaltest.has_spatialite:
-        return 'skip'
+        pytest.skip()
 
     ds = ogr.Open('VirtualShape:data/poly.shp')
     assert ds is not None
@@ -1888,10 +1882,10 @@ def test_ogr_spatialite_7():
 def test_ogr_spatialite_8():
 
     if not gdaltest.has_spatialite:
-        return 'skip'
+        pytest.skip()
 
     if gdaltest.spatialite_version.find('2.3') == 0:
-        return 'skip'
+        pytest.skip()
 
     try:
         os.remove('tmp/ogr_spatialite_8.sqlite')
@@ -1918,7 +1912,7 @@ def test_ogr_spatialite_8():
     if f.GetGeomFieldRef('geom1').ExportToWkt() != 'POINT (0 -1)' or \
        f.GetGeomFieldRef('geom2').ExportToWkt() != 'LINESTRING (0 -1,2 3)':
         f.DumpReadable()
-        return 'fail'
+        pytest.fail()
     f.SetGeomFieldDirectly(0, ogr.CreateGeometryFromWkt('POINT(0 1)'))
     f.SetGeomFieldDirectly(1, ogr.CreateGeometryFromWkt('LINESTRING(0 1,2 3)'))
     lyr.SetFeature(f)
@@ -1953,16 +1947,16 @@ def test_ogr_spatialite_8():
     feat = view_lyr.GetFeature(1)
     if feat.GetFieldAsString(0) != 'bar':
         feat.DumpReadable()
-        return 'fail'
+        pytest.fail()
     feat = None
     view_lyr.SetSpatialFilterRect(-1, -1, 10, 10)
     feat = view_lyr.GetNextFeature()
     if feat.GetFID() != 1:
         feat.DumpReadable()
-        return 'fail'
+        pytest.fail()
     if feat.GetGeometryRef().ExportToWkt() != 'POINT (0 1)':
         feat.DumpReadable()
-        return 'fail'
+        pytest.fail()
     feat = None
 
     lyr = ds.GetLayerByName('test(geom2)')
@@ -1977,16 +1971,16 @@ def test_ogr_spatialite_8():
     feat = view_lyr.GetFeature(1)
     if feat.GetFieldAsString(0) != 'bar':
         feat.DumpReadable()
-        return 'fail'
+        pytest.fail()
     feat = None
     view_lyr.SetSpatialFilterRect(-1, -1, 10, 10)
     feat = view_lyr.GetNextFeature()
     if feat.GetFID() != 1:
         feat.DumpReadable()
-        return 'fail'
+        pytest.fail()
     if feat.GetGeometryRef().ExportToWkt() != 'LINESTRING (0 1,2 3)':
         feat.DumpReadable()
-        return 'fail'
+        pytest.fail()
     feat = None
 
     sql_lyr = ds.ExecuteSQL('SELECT foo, geom2 FROM test')
@@ -1994,7 +1988,7 @@ def test_ogr_spatialite_8():
     feat = sql_lyr.GetNextFeature()
     if feat.GetGeometryRef().ExportToWkt() != 'LINESTRING (0 1,2 3)':
         feat.DumpReadable()
-        return 'fail'
+        pytest.fail()
     feat = None
     ds.ReleaseResultSet(sql_lyr)
 
@@ -2013,20 +2007,20 @@ def test_ogr_spatialite_8():
     feat = lyr.GetNextFeature()
     if feat.GetFID() != 1:
         feat.DumpReadable()
-        return 'fail'
+        pytest.fail()
     if feat.GetGeomFieldRef(0).ExportToWkt() != 'POINT (0 1)':
         feat.DumpReadable()
-        return 'fail'
+        pytest.fail()
     if feat.GetGeomFieldRef(1).ExportToWkt() != 'LINESTRING (0 1,2 3)':
         feat.DumpReadable()
-        return 'fail'
+        pytest.fail()
     feat = None
 
     lyr.SetSpatialFilterRect(1, -1, -1, 10, 10)
     feat = lyr.GetNextFeature()
     if feat.GetFID() != 1:
         feat.DumpReadable()
-        return 'fail'
+        pytest.fail()
     feat = None
 
     ds = None
@@ -2040,7 +2034,7 @@ def test_ogr_spatialite_8():
 def test_ogr_sqlite_31():
 
     if gdaltest.sl_ds is None:
-        return 'skip'
+        pytest.skip()
 
     try:
         os.remove('tmp/ogr_sqlite_31.sqlite')
@@ -2075,10 +2069,10 @@ def test_ogr_sqlite_31():
     feat = lyr.GetNextFeature()
     if feat.GetFID() != 1:
         feat.DumpReadable()
-        return 'fail'
+        pytest.fail()
     if feat.GetGeometryRef().ExportToWkt() != 'POINT (0 1)':
         feat.DumpReadable()
-        return 'fail'
+        pytest.fail()
     feat = None
 
     lyr = ds.GetLayerByName('test(geom2)')
@@ -2089,10 +2083,10 @@ def test_ogr_sqlite_31():
     feat = lyr.GetNextFeature()
     if feat.GetFID() != 1:
         feat.DumpReadable()
-        return 'fail'
+        pytest.fail()
     if feat.GetGeometryRef().ExportToWkt() != 'LINESTRING (0 1,2 3)':
         feat.DumpReadable()
-        return 'fail'
+        pytest.fail()
     feat = None
 
     ds = None
@@ -2106,7 +2100,7 @@ def test_ogr_sqlite_31():
 def test_ogr_sqlite_32():
 
     if gdaltest.sl_ds is None:
-        return 'skip'
+        pytest.skip()
 
     try:
         os.remove('tmp/ogr_sqlite_32.sqlite')
@@ -2142,7 +2136,7 @@ def test_ogr_sqlite_32():
             feat.GetField('datefield') != '2012/08/23' or \
             feat.GetField('timefield') != '21:24:00':
         feat.DumpReadable()
-        return 'fail'
+        pytest.fail()
     feat = None
 
     ds = None
@@ -2156,7 +2150,7 @@ def test_ogr_sqlite_32():
 def test_ogr_sqlite_33():
 
     if gdaltest.sl_ds is None:
-        return 'skip'
+        pytest.skip()
 
     for i in range(2):
         try:
@@ -2223,13 +2217,13 @@ def test_ogr_sqlite_33():
 def test_ogr_sqlite_34():
 
     if gdaltest.sl_ds is None:
-        return 'skip'
+        pytest.skip()
 
     gdal.PushErrorHandler('CPLQuietErrorHandler')
     sql_lyr = gdaltest.sl_ds.ExecuteSQL("SELECT 'a' REGEXP 'a'")
     gdal.PopErrorHandler()
     if sql_lyr is None:
-        return 'skip'
+        pytest.skip()
     feat = sql_lyr.GetNextFeature()
     val = feat.GetField(0)
     gdaltest.sl_ds.ReleaseResultSet(sql_lyr)
@@ -2287,7 +2281,7 @@ def test_ogr_sqlite_34():
 def test_ogr_sqlite_35():
 
     if gdaltest.sl_ds is None:
-        return 'skip'
+        pytest.skip()
 
     if gdaltest.has_spatialite and gdaltest.spatialite_version.find('2.3') < 0:
         options = ['SPATIALITE=YES']
@@ -2372,7 +2366,7 @@ def test_ogr_sqlite_35():
 def test_ogr_sqlite_36():
 
     if gdaltest.sl_ds is None:
-        return 'skip'
+        pytest.skip()
 
     try:
         os.remove('tmp/ogr_sqlite_36.sqlite')
@@ -2407,7 +2401,7 @@ def test_ogr_sqlite_36():
 def test_ogr_sqlite_37():
 
     if gdaltest.sl_ds is None:
-        return 'skip'
+        pytest.skip()
 
     try:
         os.remove('tmp/ogr_sqlite_37.sqlite')
@@ -2494,7 +2488,7 @@ def test_ogr_sqlite_37():
 def test_ogr_sqlite_38():
 
     if gdaltest.sl_ds is None:
-        return 'skip'
+        pytest.skip()
 
     try:
         os.remove('tmp/ogr_sqlite_38.sqlite')
@@ -2568,7 +2562,7 @@ def test_ogr_sqlite_38():
        not f.IsFieldSet('field_datetime3') or \
        not f.IsFieldSet('field_date') or not f.IsFieldSet('field_time'):
         f.DumpReadable()
-        return 'fail'
+        pytest.fail()
 
     # Change DEFAULT value
     src_fd = lyr.GetLayerDefn().GetFieldDefn(lyr.GetLayerDefn().GetFieldIndex('field_string'))
@@ -2602,7 +2596,7 @@ def test_ogr_sqlite_38():
 def test_ogr_spatialite_9():
 
     if not gdaltest.has_spatialite:
-        return 'skip'
+        pytest.skip()
 
     ds = ogr.GetDriverByName('SQLite').CreateDataSource('/vsimem/ogr_spatialite_9.sqlite', options=['SPATIALITE=YES'])
     lyr = ds.CreateLayer('point', geom_type=ogr.wkbPoint)
@@ -2625,7 +2619,7 @@ def test_ogr_spatialite_9():
 def test_ogr_spatialite_10():
 
     if not gdaltest.has_spatialite:
-        return 'skip'
+        pytest.skip()
     try:
         os.remove('tmp/ogr_spatialite_10.sqlite')
     except OSError:
@@ -2667,7 +2661,7 @@ def test_ogr_spatialite_10():
 def test_ogr_sqlite_39():
 
     if gdaltest.sl_ds is None:
-        return 'skip'
+        pytest.skip()
 
     ds = ogr.GetDriverByName('SQLite').CreateDataSource('/vsimem/ogr_sqlite_39.sqlite')
     lyr = ds.CreateLayer('test', geom_type=ogr.wkbNone, options=['FID=myfid'])
@@ -2696,10 +2690,10 @@ def test_ogr_sqlite_39():
     assert ret == 0
     if feat.GetFID() < 0:
         feat.DumpReadable()
-        return 'fail'
+        pytest.fail()
     if feat.GetField('myfid') != feat.GetFID():
         feat.DumpReadable()
-        return 'fail'
+        pytest.fail()
 
     feat.SetField('str', 'foo')
     ret = lyr.SetFeature(feat)
@@ -2728,7 +2722,7 @@ def test_ogr_sqlite_39():
     f = lyr.GetNextFeature()
     if f.GetFID() != 10 or f.GetField('str') != 'first string' or f.GetField('str2') != 'second string' or f.GetField('myfid') != 10:
         f.DumpReadable()
-        return 'fail'
+        pytest.fail()
     f = None
 
     ds = None
@@ -2744,7 +2738,7 @@ def test_ogr_sqlite_39():
 def test_ogr_sqlite_40():
 
     if gdaltest.sl_ds is None:
-        return 'skip'
+        pytest.skip()
 
     if gdaltest.has_spatialite:
         options = ['SPATIALITE=YES']
@@ -2866,7 +2860,7 @@ def test_ogr_sqlite_40():
 def test_ogr_sqlite_41():
 
     if gdaltest.sl_ds is None:
-        return 'skip'
+        pytest.skip()
     ds = ogr.GetDriverByName('SQLite').CreateDataSource('/vsimem/ogr_sqlite_41.sqlite', options=['METADATA=NO'])
     ds.ExecuteSQL('CREATE TABLE test(a_date DATETIME);')
     ds.ExecuteSQL("INSERT INTO test(a_date) VALUES (strftime('%J', '2015-04-30 12:34:56'))")
@@ -2890,7 +2884,7 @@ def test_ogr_sqlite_41():
 def test_ogr_sqlite_42():
 
     if gdaltest.sl_ds is None:
-        return 'skip'
+        pytest.skip()
 
     ds = ogr.GetDriverByName('SQLite').CreateDataSource('/vsimem/ogr_sqlite_42.sqlite')
     lyr = ds.CreateLayer("aab")
@@ -2945,12 +2939,12 @@ def test_ogr_sqlite_42():
 def test_ogr_sqlite_43():
 
     if gdaltest.sl_ds is None:
-        return 'skip'
+        pytest.skip()
 
     # Only available since sqlite 3.8.0
     version = ogrtest.sqlite_version.split('.')
     if not (len(version) >= 3 and int(version[0]) * 10000 + int(version[1]) * 100 + int(version[2]) >= 30800):
-        return 'skip'
+        pytest.skip()
 
     ds = ogr.Open('file:foo?mode=memory&cache=shared')
     assert ds is not None
@@ -2964,7 +2958,7 @@ def test_ogr_sqlite_43():
 def test_ogr_sqlite_44():
 
     if gdaltest.sl_ds is None:
-        return 'skip'
+        pytest.skip()
 
     gdal.FileFromMemBuffer('/vsimem/ogr_sqlite_44.csvt', 'JsonStringList,JsonIntegerList,JsonInteger64List,JsonRealList,WKT')
     gdal.FileFromMemBuffer('/vsimem/ogr_sqlite_44.csv',
@@ -3003,12 +2997,12 @@ def test_ogr_sqlite_44():
 def test_ogr_sqlite_45():
 
     if gdaltest.sl_ds is None:
-        return 'skip'
+        pytest.skip()
 
     # Only available since sqlite 3.7.0
     version = ogrtest.sqlite_version.split('.')
     if not (len(version) >= 3 and int(version[0]) * 10000 + int(version[1]) * 100 + int(version[2]) >= 30700):
-        return 'skip'
+        pytest.skip()
 
     ds = ogr.GetDriverByName('SQLite').CreateDataSource('tmp/ogr_sqlite_45.db')
     sql_lyr = ds.ExecuteSQL('PRAGMA journal_mode = WAL')
@@ -3038,7 +3032,7 @@ def test_ogr_sqlite_45():
 def test_ogr_spatialite_11():
 
     if not gdaltest.has_spatialite:
-        return 'skip'
+        pytest.skip()
 
     ds = ogr.GetDriverByName('SQLite').CreateDataSource('/vsimem/ogr_spatialite_11.sqlite', options=['SPATIALITE=YES'])
 
@@ -3066,10 +3060,10 @@ def test_ogr_spatialite_11():
 def test_ogr_spatialite_12():
 
     if not gdaltest.has_spatialite:
-        return 'skip'
+        pytest.skip()
 
     if gdal.GetDriverByName('SQLite').GetMetadataItem("ENABLE_SQL_SQLITE_FORMAT") != 'YES':
-        return 'skip'
+        pytest.skip()
 
     ds = ogr.Open('data/poly_spatialite.sqlite.sql')
     lyr = ds.GetLayer(0)
@@ -3084,7 +3078,7 @@ def test_ogr_spatialite_12():
 def test_ogr_sqlite_iterate_and_update():
 
     if gdaltest.sl_ds is None:
-        return 'skip'
+        pytest.skip()
 
     filename = "/vsimem/ogr_sqlite_iterate_and_update.db"
     ds = ogr.GetDriverByName('SQLite').CreateDataSource(filename)
@@ -3115,7 +3109,7 @@ def test_ogr_sqlite_iterate_and_update():
 def test_ogr_sqlite_cleanup():
 
     if gdaltest.sl_ds is None:
-        return 'skip'
+        pytest.skip()
 
     gdaltest.sl_ds.ExecuteSQL('DELLAYER:tpoly')
     gdaltest.sl_ds.ExecuteSQL('DELLAYER:tpoly_2')
@@ -3228,7 +3222,7 @@ def test_ogr_sqlite_cleanup():
 def test_ogr_sqlite_without_spatialite():
 
     if not gdaltest.has_spatialite or not run_without_spatialite:
-        return 'skip'
+        pytest.skip()
 
     import test_py_scripts
     ret = test_py_scripts.run_py_script_as_external_script('.', 'ogr_sqlite', ' -without_spatialite', display_live_on_parent_stdout=True)
diff --git a/autotest/ogr/ogr_svg.py b/autotest/ogr/ogr_svg.py
index b5ee5100beb3..897752676a94 100755
--- a/autotest/ogr/ogr_svg.py
+++ b/autotest/ogr/ogr_svg.py
@@ -34,6 +34,7 @@
 import gdaltest
 import ogrtest
 from osgeo import ogr
+import pytest
 
 
 def test_ogr_svg_init():
@@ -47,7 +48,7 @@ def test_ogr_svg_init():
         gdaltest.have_svg = 1
 
     if not gdaltest.have_svg:
-        return 'skip'
+        pytest.skip()
 
     assert gdaltest.svg_ds.GetLayerCount() == 3, 'wrong number of layers'
 
@@ -59,7 +60,7 @@ def test_ogr_svg_init():
 
 def test_ogr_svg_1():
     if not gdaltest.have_svg:
-        return 'skip'
+        pytest.skip()
 
     assert gdaltest.svg_ds is not None
 
@@ -70,12 +71,12 @@ def test_ogr_svg_1():
 
     if feat.GetFieldAsString('building') != 'yes':
         feat.DumpReadable()
-        return 'fail'
+        pytest.fail()
 
     if ogrtest.check_feature_geometry(feat, 'POINT (-13610535.695141600444913 4561593.930507560260594)',
                                       max_error=0.0001) != 0:
         feat.DumpReadable()
-        return 'fail'
+        pytest.fail()
 
     lyr = gdaltest.svg_ds.GetLayerByName('lines')
     assert lyr.GetFeatureCount() == 1, 'wrong number of features'
@@ -85,7 +86,7 @@ def test_ogr_svg_1():
     if ogrtest.check_feature_geometry(feat, 'LINESTRING (-13609855.59 4561479.26,-13609856.21 4561474.27,-13609860.03 4561468.87,-13609865.74 4561465.69,-13609869.54 4561465.06)',
                                       max_error=0.0001) != 0:
         feat.DumpReadable()
-        return 'fail'
+        pytest.fail()
 
     lyr = gdaltest.svg_ds.GetLayerByName('polygons')
     assert lyr.GetFeatureCount() == 1, 'wrong number of features'
@@ -95,7 +96,7 @@ def test_ogr_svg_1():
     if ogrtest.check_feature_geometry(feat, 'POLYGON ((-13610027.72 4562403.66,-13609661.58 4562462.95,-13609671.33 4562516.4,-13609676.11 4562532.65,-13609692.36 4562552.71,-13609711.46 4562609.08,-13609721.97 4562634.89,-13609727.7 4562650.16,-13609727.7 4562666.41,-13609716.23 4562699.85,-13609698.09 4562758.14,-13609697.13 4562771.51,-13609706.68 4562811.64,-13609720.06 4562843.18,-13609723.88 4562863.23,-13609725.8 4562891.91,-13609721.02 4562919.61,-13609713.37 4562938.72,-13609701.91 4562954.97,-13609688.53 4562968.34,-13609668.47 4562979.8,-13609614.96 4562993.17,-13609589.16 4563005.6,-13609552.85 4563037.14,-13609530.88 4563053.37,-13609474.5 4563076.3,-13609487.81 4563109.75,-13609491.89 4563149.38,-13609478.48 4563157.66,-13609467.67 4563171.31,-13609462.25 4563189.21,-13609420.46 4563189.32,-13609401.89 4563191.92,-13609395.2 4563201.47,-13609287.23 4563264.53,-13609303.48 4563291.29,-13609330.23 4563313.26,-13609339.78 4563326.63,-13609342.66 4563340.96,-13609344.56 4563458.48,-13609341.7 4563482.38,-13609322.59 4563518.68,-13609304.43 4563574.1,-13609290.1 4563592.26,-13609289.15 4563615.19,-13609290.1 4563655.32,-13609287.23 4563675.38,-13609271.95 4563703.09,-13609263.35 4563739.4,-13609258.57 4563762.32,-13609250.73 4563760.48,-13609226.84 4563718.43,-13609214.42 4563688.81,-13609204.87 4563661.1,-13609191.49 4563641.03,-13609170.47 4563629.56,-13609137.03 4563632.44,-13609109.32 4563648.68,-13609097.85 4563676.39,-13609100.72 4563712.7,-13609102.63 4563800.59,-13609116.0 4563819.7,-13609156.13 4563850.28,-13609151.55 4563861.7,-13609044.54 4563885.58,-13609057.92 4563945.78,-13609058.88 4563959.15,-13609031.17 4563987.81,-13609014.93 4563969.66,-13608988.17 4563981.13,-13608918.43 4563946.74,-13608834.46 4563870.62,-13608756.43 4563811.52,-13608716.02 4563488.23,-13608439.74 4563228.22,-13608483.69 4563167.08,-13608471.27 4563156.56,-13608461.72 4563132.68,-13608457.89 4563102.1,-13608460.76 4563077.26,-13608464.58 4563054.33,-13608444.52 4563044.78,-13608428.02 4562925.57,-13608408.91 4562672.38,-13608471.97 4562671.42,-13608514.96 4562653.27,-13608586.63 4562653.27,-13608728.76 4562628.85,-13609304.17 4562530.01,-13609354.81 4562401.98,-13609349.2 4562281.92,-13609401.52 4562278.13,-13609426.46 4562253.26,-13609385.39 4562165.98,-13609374.88 4561992.09,-13609361.7 4561946.97,-13609413.36 4561935.48,-13609402.85 4561884.85,-13609429.6 4561890.57,-13609487.88 4561880.07,-13609495.53 4561931.65,-13609442.02 4561942.18,-13609454.44 4562017.65,-13609601.59 4561997.59,-13609881.1 4561949.97,-13609858.97 4561817.17,-13609878.07 4561814.31,-13609891.08 4561883.51,-13609912.1 4561880.63,-13609918.79 4561924.59,-13609922.03 4561942.33,-13609949.37 4561938.35,-13609971.5 4562072.19,-13610108.74 4562049.23,-13610117.33 4562098.92,-13610151.73 4562094.14,-13610154.59 4562109.42,-13610224.34 4562097.96,-13610222.43 4562079.81,-13610381.03 4562053.05,-13610401.1 4562051.15,-13610386.77 4561907.82,-13610286.45 4561921.2,-13610210.01 4561869.6,-13610188.04 4561873.42,-13610173.7 4561778.84,-13610177.52 4561770.24,-13610184.21 4561764.51,-13610403.97 4561729.15,-13610429.77 4561711.0,-13610442.18 4561704.31,-13610574.04 4561683.29,-13610579.77 4561748.26,-13610620.86 4561745.4,-13610652.39 4562062.61,-13610802.4 4562037.77,-13610765.13 4561654.62,-13610860.68 4561641.25,-13610892.21 4562001.46,-13610848.26 4562007.19,-13610850.37 4562027.78,-13610870.24 4562264.22,-13610821.87 4562270.93,-13610819.96 4562245.14,-13610749.26 4562250.86,-13610754.03 4562306.29,-13610861.04 4562285.26,-13610864.69 4562319.19,-13610873.3 4562318.24,-13610882.85 4562463.47,-13610835.12 4562470.5,-13610816.0 4562473.37,-13610816.96 4562481.96,-13610737.66 4562493.43,-13610746.26 4562564.13,-13610782.56 4562558.4,-13610784.48 4562580.38,-13610826.52 4562575.6,-13610828.43 4562590.89,-13610845.63 4562588.98,-13610891.49 4562583.24,-13610895.3 4562621.46,-13610829.38 4562629.11,-13610844.67 4562786.76,-13610613.45 4562823.06,-13610570.46 4562334.82,-13610699.56 4562312.97,-13610695.75 4562293.86,-13610689.66 4562256.58,-13610543.47 4562263.26,-13610548.25 4562316.77,-13610487.1 4562326.32,-13610483.27 4562297.66,-13610443.14 4562303.38,-13610446.97 4562333.96,-13610027.72 4562403.66))',
                                       max_error=0.0001) != 0:
         feat.DumpReadable()
-        return 'fail'
+        pytest.fail()
 
     return 'success'
 
diff --git a/autotest/ogr/ogr_sxf.py b/autotest/ogr/ogr_sxf.py
index 0a6d2a0f8ecf..c8d77c9632d4 100755
--- a/autotest/ogr/ogr_sxf.py
+++ b/autotest/ogr/ogr_sxf.py
@@ -31,6 +31,7 @@
 
 import gdaltest
 from osgeo import ogr
+import pytest
 
 ###############################################################################
 # Open SXF datasource.
@@ -45,7 +46,7 @@ def test_ogr_sxf_1():
 
     if gdaltest.sxf_ds is not None:
         return 'success'
-    return 'fail'
+    pytest.fail()
 
 
 ###############################################################################
@@ -55,7 +56,7 @@ def test_ogr_sxf_2():
 
     import test_cli_utilities
     if test_cli_utilities.get_test_ogrsf_path() is None:
-        return 'skip'
+        pytest.skip()
 
     ret = gdaltest.runexternal(test_cli_utilities.get_test_ogrsf_path() + ' data/100_test.sxf')
 
@@ -70,7 +71,7 @@ def test_ogr_sxf_2():
 def test_ogr_sxf_cleanup():
 
     if gdaltest.sxf_ds is None:
-        return 'skip'
+        pytest.skip()
 
     gdaltest.sxf_ds = None
 
diff --git a/autotest/ogr/ogr_tiger.py b/autotest/ogr/ogr_tiger.py
index 3540fcb1e0f4..cfc481d60fdb 100755
--- a/autotest/ogr/ogr_tiger.py
+++ b/autotest/ogr/ogr_tiger.py
@@ -37,6 +37,7 @@
 
 import gdaltest
 import ogrtest
+import pytest
 
 ###############################################################################
 
@@ -46,7 +47,7 @@ def test_ogr_tiger_1():
     ogrtest.tiger_ds = None
 
     if not gdaltest.download_file('http://www2.census.gov/geo/tiger/tiger2006se/AL/TGR01001.ZIP', 'TGR01001.ZIP'):
-        return 'skip'
+        pytest.skip()
 
     try:
         os.stat('tmp/cache/TGR01001/TGR01001.MET')
@@ -60,9 +61,9 @@ def test_ogr_tiger_1():
             try:
                 os.stat('tmp/cache/TGR01001/TGR01001.MET')
             except OSError:
-                return 'skip'
+                pytest.skip()
         except:
-            return 'skip'
+            pytest.skip()
 
     ogrtest.tiger_ds = ogr.Open('tmp/cache/TGR01001')
     assert ogrtest.tiger_ds is not None
@@ -98,11 +99,11 @@ def test_ogr_tiger_1():
 def test_ogr_tiger_2():
 
     if ogrtest.tiger_ds is None:
-        return 'skip'
+        pytest.skip()
 
     import test_cli_utilities
     if test_cli_utilities.get_test_ogrsf_path() is None:
-        return 'skip'
+        pytest.skip()
 
     ret = gdaltest.runexternal(test_cli_utilities.get_test_ogrsf_path() + ' -ro tmp/cache/TGR01001')
 
@@ -117,11 +118,11 @@ def test_ogr_tiger_2():
 def test_ogr_tiger_3():
 
     if ogrtest.tiger_ds is None:
-        return 'skip'
+        pytest.skip()
 
     import test_cli_utilities
     if test_cli_utilities.get_ogr2ogr_path() is None:
-        return 'skip'
+        pytest.skip()
 
     try:
         shutil.rmtree('tmp/outtiger')
@@ -167,7 +168,7 @@ def test_ogr_tiger_3():
 def test_ogr_tiger_4():
 
     if ogrtest.tiger_ds is None:
-        return 'skip'
+        pytest.skip()
 
     # load all the files into memory.
     for filename in gdal.ReadDir('tmp/cache/TGR01001'):
@@ -223,7 +224,7 @@ def test_ogr_tiger_4():
 def test_ogr_tiger_cleanup():
 
     if ogrtest.tiger_ds is None:
-        return 'skip'
+        pytest.skip()
 
     ogrtest.tiger_ds = None
     return 'success'
diff --git a/autotest/ogr/ogr_vdv.py b/autotest/ogr/ogr_vdv.py
index d46ba4eb59bb..7f288b88a23d 100755
--- a/autotest/ogr/ogr_vdv.py
+++ b/autotest/ogr/ogr_vdv.py
@@ -37,6 +37,7 @@
 import ogrtest
 from osgeo import gdal
 from osgeo import ogr
+import pytest
 
 ###############################################################################
 # Basic test of .idf file
@@ -49,25 +50,25 @@ def test_ogr_idf_1():
     f = lyr.GetNextFeature()
     if f['NODE_ID'] != 1 or f['foo'] != 'U' or f.GetGeometryRef().ExportToWkt() != 'POINT (2 49)':
         f.DumpReadable()
-        return 'fail'
+        pytest.fail()
 
     lyr = ds.GetLayer(1)
     f = lyr.GetNextFeature()
     if f.GetGeometryRef().ExportToWkt() != 'LINESTRING (2 49,2.5 49.5,2.7 49.7,3 50)':
         f.DumpReadable()
-        return 'fail'
+        pytest.fail()
 
     lyr = ds.GetLayer(2)
     f = lyr.GetNextFeature()
     if f.GetGeometryRef().ExportToWkt() != 'POINT (2.5 49.5)':
         f.DumpReadable()
-        return 'fail'
+        pytest.fail()
 
     lyr = ds.GetLayer(3)
     f = lyr.GetNextFeature()
     if f['FOO'] != 1:
         f.DumpReadable()
-        return 'fail'
+        pytest.fail()
 
     return 'success'
 
@@ -77,7 +78,7 @@ def test_ogr_idf_1():
 
 def test_ogr_idf_1_with_temp_sqlite_db():
     if ogr.GetDriverByName('SQLite') is None:
-        return 'skip'
+        pytest.skip()
     with gdaltest.config_option('OGR_IDF_TEMP_DB_THRESHOLD', '0'):
         return test_ogr_idf_1()
 
@@ -92,25 +93,25 @@ def test_ogr_idf_3d():
     f = lyr.GetNextFeature()
     if f['NODE_ID'] != 1 or f['foo'] != 'U' or f.GetGeometryRef().ExportToWkt() != 'POINT (2 49 10)':
         f.DumpReadable()
-        return 'fail'
+        pytest.fail()
 
     lyr = ds.GetLayer(1)
     f = lyr.GetNextFeature()
     if f.GetGeometryRef().ExportToWkt() != 'LINESTRING (2 49 10,2.5 49.5 10,2.7 49.7 20,3 50 20)':
         f.DumpReadable()
-        return 'fail'
+        pytest.fail()
 
     lyr = ds.GetLayer(2)
     f = lyr.GetNextFeature()
     if f.GetGeometryRef().ExportToWkt() != 'POINT (2.5 49.5 10)':
         f.DumpReadable()
-        return 'fail'
+        pytest.fail()
 
     lyr = ds.GetLayer(3)
     f = lyr.GetNextFeature()
     if f['FOO'] != 1:
         f.DumpReadable()
-        return 'fail'
+        pytest.fail()
 
     return 'success'
 
@@ -122,7 +123,7 @@ def test_ogr_idf_2():
 
     import test_cli_utilities
     if test_cli_utilities.get_test_ogrsf_path() is None:
-        return 'skip'
+        pytest.skip()
 
     ret = gdaltest.runexternal(test_cli_utilities.get_test_ogrsf_path() + ' -ro data/test.idf')
 
@@ -263,7 +264,7 @@ def test_ogr_vdv_3():
 
     import test_cli_utilities
     if test_cli_utilities.get_test_ogrsf_path() is None:
-        return 'skip'
+        pytest.skip()
 
     ret = gdaltest.runexternal(test_cli_utilities.get_test_ogrsf_path() + ' -ro tmp/test.x10')
 
@@ -293,7 +294,7 @@ def test_ogr_vdv_6():
 
     import test_cli_utilities
     if test_cli_utilities.get_test_ogrsf_path() is None:
-        return 'skip'
+        pytest.skip()
 
     ret = gdaltest.runexternal(test_cli_utilities.get_test_ogrsf_path() + ' -ro tmp/test_x10')
 
@@ -332,7 +333,7 @@ def test_ogr_vdv_7():
            f[latname] != -234556789 or \
            ogrtest.check_feature_geometry(f, 'POINT (-123.765774722222 -23.7657747222222)') != 0:
             f.DumpReadable()
-            return 'fail'
+            pytest.fail()
         ds = None
 
         gdal.Unlink('/vsimem/vdv/ogr_vdv_7.x10')
@@ -348,9 +349,9 @@ def test_ogr_vdv_7():
         gdal.PopErrorHandler()
         assert gdal.GetLastErrorMsg() != ''
         if strict and lyr is not None:
-            return 'fail'
+            pytest.fail()
         elif not strict and lyr is None:
-            return 'fail'
+            pytest.fail()
 
         if profile == 'VDV-452-GERMAN':
             lyr_name = 'REC_ORT'
@@ -363,9 +364,9 @@ def test_ogr_vdv_7():
         gdal.PopErrorHandler()
         assert gdal.GetLastErrorMsg() != ''
         if strict and ret == 0:
-            return 'fail'
+            pytest.fail()
         elif not strict and ret != 0:
-            return 'fail'
+            pytest.fail()
 
         ds = None
 
diff --git a/autotest/ogr/ogr_vfk.py b/autotest/ogr/ogr_vfk.py
index 3b1afaccc514..6bfd81d0828c 100755
--- a/autotest/ogr/ogr_vfk.py
+++ b/autotest/ogr/ogr_vfk.py
@@ -37,6 +37,7 @@
 import gdaltest
 from osgeo import gdal
 from osgeo import ogr
+import pytest
 
 ###############################################################################
 # Open file, check number of layers, get first layer,
@@ -47,7 +48,7 @@ def test_ogr_vfk_1():
 
     gdaltest.vfk_drv = ogr.GetDriverByName('VFK')
     if gdaltest.vfk_drv is None:
-        return 'skip'
+        pytest.skip()
 
     try:
         os.remove('data/bylany.vfk.db')
@@ -83,7 +84,7 @@ def test_ogr_vfk_1():
 def test_ogr_vfk_2():
 
     if gdaltest.vfk_drv is None:
-        return 'skip'
+        pytest.skip()
 
     gdaltest.vfk_layer_par.ResetReading()
 
@@ -111,7 +112,7 @@ def test_ogr_vfk_2():
 def test_ogr_vfk_3():
 
     if gdaltest.vfk_drv is None:
-        return 'skip'
+        pytest.skip()
 
     gdaltest.vfk_layer_sobr = gdaltest.vfk_ds.GetLayer(43)
 
@@ -139,7 +140,7 @@ def test_ogr_vfk_3():
 def test_ogr_vfk_4():
 
     if gdaltest.vfk_drv is None:
-        return 'skip'
+        pytest.skip()
 
     gdaltest.vfk_layer_sbp = gdaltest.vfk_ds.GetLayerByName('SBP')
 
@@ -159,7 +160,7 @@ def test_ogr_vfk_4():
 def test_ogr_vfk_5():
 
     if gdaltest.vfk_drv is None:
-        return 'skip'
+        pytest.skip()
 
     gdaltest.vfk_layer_hp = gdaltest.vfk_ds.GetLayerByName('HP')
 
@@ -179,7 +180,7 @@ def test_ogr_vfk_5():
 def test_ogr_vfk_6():
 
     if gdaltest.vfk_drv is None:
-        return 'skip'
+        pytest.skip()
 
     gdaltest.vfk_layer_par = None
     gdaltest.vfk_layer_sobr = None
@@ -213,7 +214,7 @@ def test_ogr_vfk_6():
 def test_ogr_vfk_7():
 
     if gdaltest.vfk_drv is None:
-        return 'skip'
+        pytest.skip()
 
     defn = gdaltest.vfk_layer_par.GetLayerDefn()
 
@@ -234,7 +235,7 @@ def test_ogr_vfk_7():
 def test_ogr_vfk_8():
 
     if gdaltest.vfk_drv is None:
-        return 'skip'
+        pytest.skip()
 
     # open by SQLite driver first
     vfk_ds_db = ogr.Open('data/bylany.db')
@@ -261,7 +262,7 @@ def test_ogr_vfk_8():
 def test_ogr_vfk_9():
 
     if gdaltest.vfk_drv is None:
-        return 'skip'
+        pytest.skip()
 
     # open with suppressing geometry
     vfk_ds = None
@@ -287,7 +288,7 @@ def test_ogr_vfk_9():
 def test_ogr_vfk_10():
 
     if gdaltest.vfk_drv is None:
-        return 'skip'
+        pytest.skip()
 
     # open with suppressing geometry
     vfk_ds = None
@@ -324,15 +325,14 @@ def count_features():
         return count
 
     if gdaltest.vfk_drv is None:
-        return 'skip'
+        pytest.skip()
 
     count = gdaltest.vfk_layer_par.GetFeatureCount()
     for i in range(2):  # perform check twice, mix with random access
         if count != count_features():
             feat = gdaltest.vfk_layer_par.GetFeature(i)
-            gdaltest.post_reason('did not get expected number of features')
             feat.DumpReadable()
-            return 'fail'
+            pytest.fail('did not get expected number of features')
 
     return 'success'
 
@@ -343,7 +343,7 @@ def count_features():
 def test_ogr_vfk_cleanup():
 
     if gdaltest.vfk_drv is None:
-        return 'skip'
+        pytest.skip()
 
     gdaltest.vfk_layer_par = None
     gdaltest.vfk_layer_hp = None
diff --git a/autotest/ogr/ogr_virtualogr.py b/autotest/ogr/ogr_virtualogr.py
index 2595021191ad..1b405b324136 100755
--- a/autotest/ogr/ogr_virtualogr.py
+++ b/autotest/ogr/ogr_virtualogr.py
@@ -36,6 +36,7 @@
 from osgeo import gdal
 import gdaltest
 import ogrtest
+import pytest
 
 ###############################################################################
 
@@ -73,7 +74,7 @@ def test_ogr_virtualogr_1():
 
     import ogr_sql_sqlite
     if not ogr_sql_sqlite.ogr_sql_sqlite_available():
-        return 'skip'
+        pytest.skip()
 
     # Invalid syntax
     assert not ogr_virtualogr_run_sql("CREATE VIRTUAL TABLE poly USING VirtualOGR()")
@@ -119,7 +120,7 @@ def test_ogr_virtualogr_1():
 def test_ogr_virtualogr_2():
 
     if not ogrtest.has_sqlite_dialect:
-        return 'skip'
+        pytest.skip()
 
     ds = ogr.GetDriverByName('SQLite').CreateDataSource('/vsimem/ogr_virtualogr_2.db')
     ds.ExecuteSQL("CREATE VIRTUAL TABLE foo USING VirtualOGR('data/poly.shp')")
@@ -164,8 +165,7 @@ def test_ogr_virtualogr_2():
 
     if did_not_get_error:
         gdal.Unlink('/vsimem/ogr_virtualogr_2.db')
-        gdaltest.post_reason('expected a failure')
-        return 'fail'
+        pytest.fail('expected a failure')
 
     gdal.ErrorReset()
     gdal.PushErrorHandler('CPLQuietErrorHandler')
@@ -176,8 +176,7 @@ def test_ogr_virtualogr_2():
     if gdal.GetLastErrorMsg() == '':
         ds = None
         gdal.Unlink('/vsimem/ogr_virtualogr_2.db')
-        gdaltest.post_reason('expected an error message')
-        return 'fail'
+        pytest.fail('expected an error message')
     did_not_get_error = gdal.GetLastErrorMsg() == ''
     ds = None
 
@@ -194,12 +193,12 @@ def test_ogr_virtualogr_2():
 def test_ogr_virtualogr_3():
 
     if not ogrtest.has_sqlite_dialect:
-        return 'skip'
+        pytest.skip()
 
     # Find path of libgdal
     libgdal_name = gdaltest.find_lib('gdal')
     if libgdal_name is None:
-        return 'skip'
+        pytest.skip()
     print('Found ' + libgdal_name)
 
     # Find path of libsqlite3 or libspatialite
@@ -207,7 +206,7 @@ def test_ogr_virtualogr_3():
     if libsqlite_name is None:
         libsqlite_name = gdaltest.find_lib('spatialite')
     if libsqlite_name is None:
-        return 'skip'
+        pytest.skip()
     print('Found ' + libsqlite_name)
 
     python_exe = sys.executable
@@ -219,7 +218,7 @@ def test_ogr_virtualogr_3():
     ret = gdaltest.runexternal(python_exe + ' ogr_as_sqlite_extension.py "%s" "%s"' % (libsqlite_name, libgdal_name), check_memleak=False)
 
     if ret.find('skip') == 0:
-        return 'skip'
+        pytest.skip()
     assert ret.find(gdal.VersionInfo('RELEASE_NAME')) >= 0, ('fail : %s' % ret)
 
     return 'success'
@@ -231,7 +230,7 @@ def test_ogr_virtualogr_3():
 def test_ogr_virtualogr_4():
 
     if not ogrtest.has_sqlite_dialect:
-        return 'skip'
+        pytest.skip()
 
     ds = ogr.GetDriverByName('SQLite').CreateDataSource('/vsimem/ogr_virtualogr_4.db')
     sql_lyr = ds.ExecuteSQL("SELECT ogr_datasource_load_layers('data/poly.shp')")
@@ -294,7 +293,7 @@ def test_ogr_virtualogr_4():
 def test_ogr_virtualogr_5():
 
     if not ogrtest.has_sqlite_dialect:
-        return 'skip'
+        pytest.skip()
 
     # Create a CSV with duplicate column name
     fp = gdal.VSIFOpenL('/vsimem/ogr_virtualogr_5.csv', 'wt')
diff --git a/autotest/ogr/ogr_vrt.py b/autotest/ogr/ogr_vrt.py
index 15c129acf116..5a31baab1295 100755
--- a/autotest/ogr/ogr_vrt.py
+++ b/autotest/ogr/ogr_vrt.py
@@ -37,6 +37,7 @@
 from osgeo import osr
 from osgeo import gdal
 import test_cli_utilities
+import pytest
 
 ###############################################################################
 # Open VRT datasource.
@@ -50,7 +51,7 @@ def test_ogr_vrt_1():
 
     if gdaltest.vrt_ds is not None:
         return 'success'
-    return 'fail'
+    pytest.fail()
 
 ###############################################################################
 # Verify the geometries, in the "test2" layer based on x,y,z columns.
@@ -60,7 +61,7 @@ def test_ogr_vrt_1():
 
 def test_ogr_vrt_2():
     if gdaltest.vrt_ds is None:
-        return 'skip'
+        pytest.skip()
 
     lyr = gdaltest.vrt_ds.GetLayerByName('test2')
 
@@ -96,7 +97,7 @@ def test_ogr_vrt_2():
 
 def test_ogr_vrt_3():
     if gdaltest.vrt_ds is None:
-        return 'skip'
+        pytest.skip()
 
     lyr = gdaltest.vrt_ds.GetLayerByName('test3')
 
@@ -127,7 +128,7 @@ def test_ogr_vrt_3():
 
 def test_ogr_vrt_4():
     if gdaltest.vrt_ds is None:
-        return 'skip'
+        pytest.skip()
 
     lyr = gdaltest.vrt_ds.GetLayerByName('test3')
     lyr.ResetReading()
@@ -182,7 +183,7 @@ def test_ogr_vrt_5():
 def test_ogr_vrt_6():
 
     if gdaltest.vrt_ds is None:
-        return 'skip'
+        pytest.skip()
 
     lyr = gdaltest.vrt_ds.GetLayerByName('test3')
     lyr.ResetReading()
@@ -199,7 +200,7 @@ def test_ogr_vrt_6():
 
 def test_ogr_vrt_7():
     if gdaltest.vrt_ds is None:
-        return 'skip'
+        pytest.skip()
 
     lyr = gdaltest.vrt_ds.GetLayerByName('test4')
 
@@ -232,7 +233,7 @@ def test_ogr_vrt_7():
 
 def test_ogr_vrt_8():
     if gdaltest.vrt_ds is None:
-        return 'skip'
+        pytest.skip()
 
     vrt_xml = '<OGRVRTDataSource><OGRVRTLayer name="test4"><SrcDataSource relativeToVRT="0">data/flat.dbf</SrcDataSource><SrcSQL>SELECT * FROM flat</SrcSQL><FID>fid</FID><GeometryType>wkbPoint</GeometryType><GeometryField encoding="PointFromColumns" x="x" y="y" z="z"/></OGRVRTLayer></OGRVRTDataSource>'
     ds = ogr.Open(vrt_xml)
@@ -266,7 +267,7 @@ def test_ogr_vrt_8():
 def test_ogr_vrt_9():
 
     if gdaltest.vrt_ds is None:
-        return 'skip'
+        pytest.skip()
 
     lyr = gdaltest.vrt_ds.GetLayerByName('test3')
     lyr.SetAttributeFilter("other = 'Second'")
@@ -295,7 +296,7 @@ def test_ogr_vrt_9():
 
 def test_ogr_vrt_10():
     if gdaltest.vrt_ds is None:
-        return 'skip'
+        pytest.skip()
 
     vrt_xml = '<OGRVRTDataSource><OGRVRTLayer name="test"><SrcDataSource relativeToVRT="0">data/testpoly.shp</SrcDataSource><SrcLayer>testpoly</SrcLayer></OGRVRTLayer></OGRVRTDataSource>'
     vrt_ds = ogr.Open(vrt_xml)
@@ -316,7 +317,7 @@ def test_ogr_vrt_10():
 
 def test_ogr_vrt_11():
     if gdaltest.vrt_ds is None:
-        return 'skip'
+        pytest.skip()
 
     f = open('tmp/test.csv', 'wb')
     f.write('x,val1,y,val2,style\n'.encode('ascii'))
@@ -348,7 +349,7 @@ def test_ogr_vrt_11():
     feat = vrt_lyr.GetNextFeature()
     if feat.GetStyleString() != 'PEN(c:#FF0000,w:5pt,p:"2px 1pt")':
         feat.DumpReadable()
-        return 'fail'
+        pytest.fail()
 
     feat = ogr.Feature(vrt_lyr.GetLayerDefn())
     geom = ogr.CreateGeometryFromWkt('POINT (3 50)')
@@ -361,7 +362,7 @@ def test_ogr_vrt_11():
     geom = feat.GetGeometryRef()
     if geom.ExportToWkt() != 'POINT (3 50)':
         feat.DumpReadable()
-        return 'fail'
+        pytest.fail()
     assert feat.GetFieldAsString('val1') == 'val21'
 
     # The x and y fields are considered as string by default, so spatial
@@ -405,7 +406,7 @@ def test_ogr_vrt_11():
 
 def test_ogr_vrt_12():
     if gdaltest.vrt_ds is None:
-        return 'skip'
+        pytest.skip()
 
     f = open('tmp/test.csv', 'wb')
     f.write('wkt_geom,val1,val2\n'.encode('ascii'))
@@ -447,7 +448,7 @@ def test_ogr_vrt_12():
 
 def test_ogr_vrt_13():
     if gdaltest.vrt_ds is None:
-        return 'skip'
+        pytest.skip()
 
     f = open('tmp/test.csv', 'wb')
     f.write('wkb_geom,val1,val2\n'.encode('ascii'))
@@ -488,7 +489,7 @@ def test_ogr_vrt_13():
 
 def test_ogr_vrt_14():
     if gdaltest.vrt_ds is None:
-        return 'skip'
+        pytest.skip()
 
     gdal.PushErrorHandler('CPLQuietErrorHandler')
     try:
@@ -553,11 +554,10 @@ def test_ogr_vrt_14():
         if gdal.GetLastErrorMsg().find('GEOS support not enabled') != -1:
             vrt_ds = None
             ogr.GetDriverByName('ESRI Shapefile').DeleteDataSource('tmp/test.shp')
-            return 'skip'
+            pytest.skip()
 
         print(vrt_lyr.GetFeatureCount())
-        gdaltest.post_reason('did not get one feature on rect spatial filter.')
-        return 'fail'
+        pytest.fail('did not get one feature on rect spatial filter.')
 
     vrt_lyr.SetSpatialFilterRect(1, 41, 3, 48.5)
     assert vrt_lyr.GetFeatureCount() == 0, 'Did not get expected zero feature count.'
@@ -577,7 +577,7 @@ def test_ogr_vrt_14():
 
 def test_ogr_vrt_15():
     if gdaltest.vrt_ds is None:
-        return 'skip'
+        pytest.skip()
 
     f = open('tmp/test.csv', 'wb')
     f.write('wkt_geom,val1,val2\n'.encode('ascii'))
@@ -630,7 +630,7 @@ def test_ogr_vrt_15():
 
 def test_ogr_vrt_16():
     if gdaltest.vrt_ds is None:
-        return 'skip'
+        pytest.skip()
 
     f = open('tmp/test.csvt', 'wb')
     f.write('Real,Real,String,String\n'.encode('ascii'))
@@ -672,8 +672,8 @@ def test_ogr_vrt_16():
             vrt_ds = None
             os.remove('tmp/test.csv')
             os.remove('tmp/test.csvt')
-            return 'skip'
-        return 'fail'
+            pytest.skip()
+        pytest.fail()
 
     vrt_lyr.SetSpatialFilterRect(1, 41, 3, 48.5)
     assert vrt_lyr.GetFeatureCount() == 0
@@ -695,7 +695,7 @@ def test_ogr_vrt_16():
 def test_ogr_vrt_17():
 
     if gdaltest.vrt_ds is None:
-        return 'skip'
+        pytest.skip()
 
     vrt_xml = """
 <OGRVRTDataSource>
@@ -745,7 +745,7 @@ def test_ogr_vrt_17():
 def test_ogr_vrt_18():
 
     if gdaltest.vrt_ds is None:
-        return 'skip'
+        pytest.skip()
 
     vrt_xml = """
 <OGRVRTDataSource>
@@ -775,10 +775,10 @@ def test_ogr_vrt_18():
 def test_ogr_vrt_19_optimized():
 
     if gdaltest.vrt_ds is None:
-        return 'skip'
+        pytest.skip()
 
     if test_cli_utilities.get_test_ogrsf_path() is None:
-        return 'skip'
+        pytest.skip()
 
     ret = gdaltest.runexternal(test_cli_utilities.get_test_ogrsf_path() + ' -ro data/poly_vrt.vrt')
 
@@ -793,10 +793,10 @@ def test_ogr_vrt_19_optimized():
 def test_ogr_vrt_19_nonoptimized():
 
     if gdaltest.vrt_ds is None:
-        return 'skip'
+        pytest.skip()
 
     if test_cli_utilities.get_test_ogrsf_path() is None:
-        return 'skip'
+        pytest.skip()
 
     ret = gdaltest.runexternal(test_cli_utilities.get_test_ogrsf_path() + ' -ro data/poly_nonoptimized_vrt.vrt')
 
@@ -810,7 +810,7 @@ def test_ogr_vrt_19_nonoptimized():
 
 def test_ogr_vrt_20():
     if gdaltest.vrt_ds is None:
-        return 'skip'
+        pytest.skip()
 
     gdal.PushErrorHandler('CPLQuietErrorHandler')
     try:
@@ -873,11 +873,10 @@ def test_ogr_vrt_20():
         if gdal.GetLastErrorMsg().find('GEOS support not enabled') != -1:
             vrt_ds = None
             ogr.GetDriverByName('ESRI Shapefile').DeleteDataSource('tmp/test.shp')
-            return 'skip'
+            pytest.skip()
 
         print(vrt_lyr.GetFeatureCount())
-        gdaltest.post_reason('did not get one feature on rect spatial filter.')
-        return 'fail'
+        pytest.fail('did not get one feature on rect spatial filter.')
 
     assert vrt_lyr.TestCapability(ogr.OLCFastFeatureCount) == 1, \
         'Fast feature count not set.'
@@ -907,7 +906,7 @@ def test_ogr_vrt_20():
     if feat.GetGeometryRef() is None or \
        feat.GetGeometryRef().ExportToWkt() != 'POINT (1 2)':
         feat.DumpReadable()
-        return 'fail'
+        pytest.fail()
 
     vrt_ds = None
     ogr.GetDriverByName('ESRI Shapefile').DeleteDataSource('tmp/test.shp')
@@ -921,7 +920,7 @@ def test_ogr_vrt_20():
 def ogr_vrt_21_internal():
 
     if gdaltest.vrt_ds is None:
-        return 'skip'
+        pytest.skip()
 
     ds = ogr.Open('data/vrt_test.vrt')
     lyr = ds.GetLayerByName('test3')
@@ -1034,7 +1033,7 @@ def test_ogr_vrt_21():
 def ogr_vrt_22_internal():
 
     if gdaltest.vrt_ds is None:
-        return 'skip'
+        pytest.skip()
 
     ds = ogr.Open('data/vrt_test.vrt')
     lyr = ds.GetLayerByName('test5')
@@ -1162,8 +1161,7 @@ def test_ogr_vrt_22():
 def test_ogr_vrt_23(shared_ds_flag=''):
 
     if int(gdal.VersionInfo('VERSION_NUM')) < 1900:
-        gdaltest.post_reason('would crash')
-        return 'skip'
+        pytest.skip('would crash')
 
     rec1 = """<OGRVRTDataSource>
     <OGRVRTLayer name="rec1">
@@ -1273,11 +1271,11 @@ def test_ogr_vrt_25():
 def test_ogr_vrt_26():
 
     if ogr.GetDriverByName('SQLite') is None:
-        return 'skip'
+        pytest.skip()
 
     sqlite_ds = ogr.GetDriverByName('SQLite').CreateDataSource('/vsimem/ogr_vrt_26.db')
     if sqlite_ds is None:
-        return 'skip'
+        pytest.skip()
 
     lyr = sqlite_ds.CreateLayer('test')
     lyr.CreateField(ogr.FieldDefn('foo', ogr.OFTString))
@@ -1561,7 +1559,7 @@ def test_ogr_vrt_29():
     feat = lyr.GetNextFeature()
     if ogrtest.check_feature_geometry(feat, 'POINT(426857.987717275274917 5427937.523466162383556)') != 0:
         feat.DumpReadable()
-        return 'fail'
+        pytest.fail()
 
     feat = lyr.GetNextFeature()
 
@@ -1578,7 +1576,7 @@ def test_ogr_vrt_29():
     feat = lyr.GetNextFeature()
     if ogrtest.check_feature_geometry(feat, 'POINT(500000 0)') != 0:
         feat.DumpReadable()
-        return 'fail'
+        pytest.fail()
     feat = None
 
     feat = ogr.Feature(lyr.GetLayerDefn())
@@ -1629,21 +1627,21 @@ def test_ogr_vrt_29():
     feat = lyr.GetNextFeature()
     if ogrtest.check_feature_geometry(feat, 'POINT(3.0 0.0)') != 0:
         feat.DumpReadable()
-        return 'fail'
+        pytest.fail()
 
     lyr.SetAttributeFilter('id = -99')
     lyr.ResetReading()
     feat = lyr.GetNextFeature()
     if ogrtest.check_feature_geometry(feat, 'POINT(3.0 0.0)') != 0:
         feat.DumpReadable()
-        return 'fail'
+        pytest.fail()
 
     lyr.SetAttributeFilter('id = -100')
     lyr.ResetReading()
     feat = lyr.GetNextFeature()
     if feat.GetGeometryRef() is not None:
         feat.DumpReadable()
-        return 'fail'
+        pytest.fail()
 
     feat = ogr.Feature(lyr.GetLayerDefn())
     feat.SetField(0, 1000)
@@ -1665,14 +1663,14 @@ def test_ogr_vrt_29():
     fid = feat.GetFID()
     if feat.GetGeometryRef() is not None:
         feat.DumpReadable()
-        return 'fail'
+        pytest.fail()
 
     gdal.PushErrorHandler('CPLQuietErrorHandler')
     feat = lyr.GetFeature(fid)
     gdal.PopErrorHandler()
     if feat.GetGeometryRef() is not None:
         feat.DumpReadable()
-        return 'fail'
+        pytest.fail()
     feat = None
 
     lyr.DeleteFeature(fid)
@@ -1839,9 +1837,8 @@ def test_ogr_vrt_30():
                         'did not get expected value'
                     assert not feat.IsFieldSet("id3"), 'did not get expected value'
                     if ogrtest.check_feature_geometry(feat, 'POINT(%f %f)' % (2 + int(i / 5) / 5.0, 49 + int(i % 5) / 5.0)) != 0:
-                        gdaltest.post_reason('did not get expected value')
                         feat.DumpReadable()
-                        return 'fail'
+                        pytest.fail('did not get expected value')
                 else:
                     assert feat.GetFID() == i, 'did not get expected value'
                     assert not feat.IsFieldSet("id1"), 'did not get expected value'
@@ -2266,10 +2263,10 @@ def test_ogr_vrt_33():
                 feat = lyr.GetNextFeature()
                 if feat.GetGeomFieldRef(0).ExportToWkt() != 'POINT (1 2)':
                     feat.DumpReadable()
-                    return 'fail'
+                    pytest.fail()
                 if feat.GetGeomFieldRef(1).ExportToWkt() != 'POLYGON ((0 0,0 1,1 1,1 0,0 0))':
                     feat.DumpReadable()
-                    return 'fail'
+                    pytest.fail()
 
         if test_cli_utilities.get_test_ogrsf_path() is not None:
             f = open('tmp/ogr_vrt_33.vrt', 'wb')
@@ -2315,7 +2312,7 @@ def test_ogr_vrt_33():
                 feat = lyr.GetNextFeature()
                 if feat.GetGeomFieldRef(0).ExportToWkt() != 'POLYGON ((0.5 1.0,1 1,1.0 0.5,0.5 0.5,0.5 1.0))':
                     feat.DumpReadable()
-                    return 'fail'
+                    pytest.fail()
 
         if test_cli_utilities.get_test_ogrsf_path() is not None:
             f = open('tmp/ogr_vrt_33.vrt', 'wb')
@@ -2349,7 +2346,7 @@ def test_ogr_vrt_33():
             feat = lyr.GetNextFeature()
             if feat.GetGeomFieldRef(0) is not None:
                 feat.DumpReadable()
-                return 'fail'
+                pytest.fail()
 
     if test_cli_utilities.get_test_ogrsf_path() is not None:
         f = open('tmp/ogr_vrt_33.vrt', 'wb')
@@ -2377,10 +2374,10 @@ def test_ogr_vrt_33():
     feat = lyr.GetNextFeature()
     if feat.GetGeomFieldRef(0).ExportToWkt() != 'POINT (1 2)':
         feat.DumpReadable()
-        return 'fail'
+        pytest.fail()
     if feat.GetGeomFieldRef(1).ExportToWkt() != 'POINT (-1 -2)':
         feat.DumpReadable()
-        return 'fail'
+        pytest.fail()
     lyr.SetSpatialFilterRect(1, 0, 0, 0, 0)
     assert lyr.GetFeatureCount() == 0
     lyr.SetSpatialFilterRect(1, -1.1, -2.1, -0.9, -1.9)
@@ -2393,14 +2390,14 @@ def test_ogr_vrt_33():
     if feat.GetGeomFieldRef(0) is not None or \
        feat.GetGeomFieldRef(1).ExportToWkt() != 'POINT (-1 -2)':
         feat.DumpReadable()
-        return 'fail'
+        pytest.fail()
     lyr.SetIgnoredFields(['foo'])
     lyr.ResetReading()
     feat = lyr.GetNextFeature()
     if feat.GetGeomFieldRef(1) is not None or \
        feat.GetGeomFieldRef(0).ExportToWkt() != 'POINT (1 2)':
         feat.DumpReadable()
-        return 'fail'
+        pytest.fail()
 
     if test_cli_utilities.get_test_ogrsf_path() is not None:
         f = open('tmp/ogr_vrt_33.vrt', 'wb')
@@ -2428,7 +2425,7 @@ def test_ogr_vrt_33():
        feat.GetGeomFieldRef(0).ExportToWkt() == 'POINT (1 2)' or \
        feat.GetGeomFieldRef(1).ExportToWkt() != 'POLYGON ((0 0,0 1,1 1,1 0,0 0))':
         feat.DumpReadable()
-        return 'fail'
+        pytest.fail()
 
     # Warped layer with explicit WarpedGeomFieldName (that is the first field)
     ds_str = """<OGRVRTDataSource>
@@ -2448,7 +2445,7 @@ def test_ogr_vrt_33():
        feat.GetGeomFieldRef(0).ExportToWkt() == 'POINT (1 2)' or \
        feat.GetGeomFieldRef(1).ExportToWkt() != 'POLYGON ((0 0,0 1,1 1,1 0,0 0))':
         feat.DumpReadable()
-        return 'fail'
+        pytest.fail()
 
     # Warped layer with explicit WarpedGeomFieldName (that does NOT exist)
     ds_str = """<OGRVRTDataSource>
@@ -2483,7 +2480,7 @@ def test_ogr_vrt_33():
        feat.GetGeomFieldRef(1).ExportToWkt() == 'POLYGON ((0 0,0 1,1 1,1 0,0 0))' or \
        feat.GetGeomFieldRef(0).ExportToWkt() != 'POINT (1 2)':
         feat.DumpReadable()
-        return 'fail'
+        pytest.fail()
 
     # UnionLayer with default union strategy
 
@@ -2514,7 +2511,7 @@ def test_ogr_vrt_33():
        feat.GetGeomFieldRef(2) is not None or \
        feat.GetGeomFieldRef(3) is not None:
         feat.DumpReadable()
-        return 'fail'
+        pytest.fail()
 
     feat = lyr.GetNextFeature()
     if feat.GetGeomFieldRef(0).ExportToWkt() != 'POINT (3 4)' or \
@@ -2522,7 +2519,7 @@ def test_ogr_vrt_33():
        feat.GetGeomFieldRef(2) is not None or \
        feat.GetGeomFieldRef(3).ExportToWkt() != 'POINT (5 6)':
         feat.DumpReadable()
-        return 'fail'
+        pytest.fail()
 
     ds = None
 
@@ -2561,13 +2558,13 @@ def test_ogr_vrt_33():
     if feat.GetGeomFieldRef(0).ExportToWkt() != 'POINT (1 2)' or \
        feat.GetGeomFieldRef(1).ExportToWkt() != 'POLYGON ((0 0,0 1,1 1,1 0,0 0))':
         feat.DumpReadable()
-        return 'fail'
+        pytest.fail()
 
     feat = lyr.GetNextFeature()
     if feat.GetGeomFieldRef(0).ExportToWkt() != 'POINT (3 4)' or \
        feat.GetGeomFieldRef(1).ExportToWkt() != 'POLYGON ((1 1,1 2,2 2,2 1,1 1))':
         feat.DumpReadable()
-        return 'fail'
+        pytest.fail()
 
     ds = None
 
@@ -2607,13 +2604,13 @@ def test_ogr_vrt_33():
     if feat.GetGeomFieldRef(0).ExportToWkt() != 'POINT (1 2)' or \
        feat.GetGeomFieldRef(1).ExportToWkt() != 'POLYGON ((0 0,0 1,1 1,1 0,0 0))':
         feat.DumpReadable()
-        return 'fail'
+        pytest.fail()
 
     feat = lyr.GetNextFeature()
     if feat.GetGeomFieldRef(0).ExportToWkt() != 'POINT (3 4)' or \
        feat.GetGeomFieldRef(1).ExportToWkt() != 'POLYGON ((1 1,1 2,2 2,2 1,1 1))':
         feat.DumpReadable()
-        return 'fail'
+        pytest.fail()
 
     ds = None
 
@@ -2653,7 +2650,7 @@ def test_ogr_vrt_33():
     if feat.GetGeomFieldRef(0).ExportToWkt() != 'POLYGON ((0 0,0 1,1 1,1 0,0 0))' or \
        feat.GetGeomFieldRef(1).ExportToWkt() != 'POINT (1 2)':
         feat.DumpReadable()
-        return 'fail'
+        pytest.fail()
 
     ds = None
 
@@ -2704,7 +2701,7 @@ def test_ogr_vrt_33():
        feat.GetGeomFieldRef(1).ExportToWkt().find('POINT (') != 0 or \
        feat.GetGeomFieldRef(1).ExportToWkt() == 'POINT (1 2)':
         feat.DumpReadable()
-        return 'fail'
+        pytest.fail()
     ds = None
 
     if test_cli_utilities.get_test_ogrsf_path() is not None:
@@ -2765,7 +2762,7 @@ def test_ogr_vrt_33():
        feat.GetGeomFieldRef(2) is not None or \
        feat.GetGeomFieldRef(3) is not None:
         feat.DumpReadable()
-        return 'fail'
+        pytest.fail()
 
     feat = sql_lyr.GetNextFeature()
     if feat.GetGeomFieldRef(0).ExportToWkt() != 'POINT (3 4)' or \
@@ -2773,7 +2770,7 @@ def test_ogr_vrt_33():
        feat.GetGeomFieldRef(2) is not None or \
        feat.GetGeomFieldRef(3).ExportToWkt() != 'POINT (5 6)':
         feat.DumpReadable()
-        return 'fail'
+        pytest.fail()
     ds.ReleaseResultSet(sql_lyr)
     ds = None
 
@@ -2785,7 +2782,7 @@ def test_ogr_vrt_33():
 
 def test_ogr_vrt_34():
     if gdaltest.vrt_ds is None:
-        return 'skip'
+        pytest.skip()
 
     f = open('tmp/test.csv', 'wb')
     f.write('x,y\n'.encode('ascii'))
@@ -2814,7 +2811,7 @@ def test_ogr_vrt_34():
     f = lyr.GetNextFeature()
     if f.GetGeometryRef().ExportToWkt() != 'POINT (2 49)':
         f.DumpReadable()
-        return 'fail'
+        pytest.fail()
     ds = None
 
     os.unlink('tmp/test.csv')
@@ -2827,7 +2824,7 @@ def test_ogr_vrt_34():
 
 def test_ogr_vrt_35():
     if gdaltest.vrt_ds is None:
-        return 'skip'
+        pytest.skip()
 
     f = open('tmp/test.csv', 'wb')
     f.write('c1,c2,WKT,WKT2\n'.encode('ascii'))
@@ -2891,7 +2888,7 @@ def test_ogr_vrt_35():
 
 def test_ogr_vrt_36():
     if gdaltest.vrt_ds is None:
-        return 'skip'
+        pytest.skip()
 
     ds = ogr.GetDriverByName('ESRI Shapefile').CreateDataSource('/vsimem/ogr_vrt_36.shp')
     lyr = ds.CreateLayer('ogr_vrt_36', geom_type=ogr.wkbPoint)
@@ -2923,7 +2920,7 @@ def test_ogr_vrt_36():
     f = lyr.GetNextFeature()
     if f['id'] != '1':
         f.DumpReadable()
-        return 'fail'
+        pytest.fail()
     ds = None
 
     ogr.GetDriverByName('ESRI Shapefile').DeleteDataSource('/vsimem/ogr_vrt_36.shp')
@@ -2957,7 +2954,7 @@ def test_ogr_vrt_37():
 
 def test_ogr_vrt_38():
     if gdaltest.vrt_ds is None:
-        return 'skip'
+        pytest.skip()
 
     types = [['Point', ogr.wkbPoint],
              ['LineString', ogr.wkbLineString],
@@ -3010,7 +3007,7 @@ def test_ogr_vrt_38():
 
 def test_ogr_vrt_39():
     if gdaltest.vrt_ds is None:
-        return 'skip'
+        pytest.skip()
 
     gdal.FileFromMemBuffer('/vsimem/ogr_vrt_39.csv',
                            """my_fid,val
@@ -3038,7 +3035,7 @@ def test_ogr_vrt_39():
     f = lyr.GetNextFeature()
     if f['val'] != 2:
         f.DumpReadable()
-        return 'fail'
+        pytest.fail()
     ds = None
 
     gdal.Unlink('/vsimem/ogr_vrt_39.csv')
@@ -3053,7 +3050,7 @@ def test_ogr_vrt_39():
 
 def test_ogr_vrt_40():
     if gdaltest.vrt_ds is None:
-        return 'skip'
+        pytest.skip()
 
     gdal.FileFromMemBuffer('/vsimem/ogr_vrt_40.csv',
                            """id,x,y,z,m
@@ -3076,7 +3073,7 @@ def test_ogr_vrt_40():
     f = lyr.GetNextFeature()
     if f.GetGeometryRef().ExportToIsoWkt() != 'POINT ZM (1 2 3 4)':
         f.DumpReadable()
-        return 'fail'
+        pytest.fail()
     ds = None
 
     gdal.Unlink('/vsimem/ogr_vrt_40.csv')
@@ -3108,7 +3105,7 @@ def test_ogr_vrt_41():
 def test_ogr_vrt_cleanup():
 
     if gdaltest.vrt_ds is None:
-        return 'skip'
+        pytest.skip()
 
     gdal.Unlink('/vsimem/rec1.vrt')
     gdal.Unlink('/vsimem/rec2.vrt')
diff --git a/autotest/ogr/ogr_wasp.py b/autotest/ogr/ogr_wasp.py
index 9556fcdf11e1..39974f8e5a9a 100755
--- a/autotest/ogr/ogr_wasp.py
+++ b/autotest/ogr/ogr_wasp.py
@@ -38,6 +38,7 @@
 from osgeo import gdal
 from osgeo import ogr
 from osgeo import osr
+import pytest
 
 ###############################################################################
 # Create wasp datasource
@@ -52,7 +53,7 @@ def test_ogr_wasp_create_ds():
 
     if gdaltest.wasp_ds is not None:
         return 'success'
-    return 'fail'
+    pytest.fail()
 
 ###############################################################################
 # Create elevation .map from linestrings z
@@ -150,11 +151,9 @@ def test_ogr_wasp_elevation_from_linestring_z_toler():
             [h, n] = line.split()
             if int(n) != 2:
                 if ogrtest.have_geos():
-                    gdaltest.post_reason('number of points should be 2 and is %s' % n)
-                    return 'fail'
+                    pytest.fail('number of points should be 2 and is %s' % n)
                 elif int(n) != 3:
-                    gdaltest.post_reason('number of points should be 3 and is %s' % n)
-                    return 'fail'
+                    pytest.fail('number of points should be 3 and is %s' % n)
 
             assert float(h) == j, ('altitude should be %d and is %s' % (j, h))
 
diff --git a/autotest/ogr/ogr_wfs.py b/autotest/ogr/ogr_wfs.py
index ddde4fdf38c1..6d479e3f71ef 100755
--- a/autotest/ogr/ogr_wfs.py
+++ b/autotest/ogr/ogr_wfs.py
@@ -83,16 +83,14 @@ def with_and_without_streaming(request):
 @pytest.mark.skip()
 def test_ogr_wfs_mapserver():
     if gdaltest.wfs_drv is None:
-        return 'skip'
+        pytest.skip()
 
     if gdaltest.gdalurlopen('http://www2.dmsolutions.ca/cgi-bin/mswfs_gmap') is None:
-        print('cannot open URL')
-        return 'skip'
+        pytest.skip('cannot open URL')
 
     ds = ogr.Open('WFS:http://www2.dmsolutions.ca/cgi-bin/mswfs_gmap')
     if ds is None:
-        gdaltest.post_reason('did not managed to open WFS datastore')
-        return 'skip'
+        pytest.skip('did not managed to open WFS datastore')
 
     assert ds.GetLayerCount() == 2, 'did not get expected layer count'
 
@@ -111,9 +109,8 @@ def test_ogr_wfs_mapserver():
     geom = feat.GetGeometryRef()
     geom_wkt = geom.ExportToWkt()
     if geom_wkt.find("POLYGON ((389366.84375 3791519.75") == -1:
-        gdaltest.post_reason('did not get expected feature')
         feat.DumpReadable()
-        return 'fail'
+        pytest.fail('did not get expected feature')
 
     return 'success'
 
@@ -124,12 +121,11 @@ def test_ogr_wfs_mapserver():
 @pytest.mark.skip('FIXME: re-enable after adapting test')
 def test_ogr_wfs_geoserver():
     if gdaltest.wfs_drv is None:
-        return 'skip'
+        pytest.skip()
 
     if gdaltest.gdalurlopen('http://demo.opengeo.org/geoserver/wfs?TYPENAME=za:za_points&SERVICE=WFS&VERSION=1.1.0&REQUEST=DescribeFeatureType') is None:
-        print('cannot open URL')
         gdaltest.geoserver_wfs = False
-        return 'skip'
+        pytest.skip('cannot open URL')
     gdaltest.geoserver_wfs = True
 
     ds = ogr.Open('WFS:http://demo.opengeo.org/geoserver/wfs?TYPENAME=za:za_points')
@@ -148,57 +144,47 @@ def test_ogr_wfs_geoserver():
     feat_count = lyr.GetFeatureCount()
     if feat_count < 14000:
         if gdal.GetLastErrorMsg().find('The connection attempt failed') != -1:
-            print('server probably in a broken state')
-            # Disable it for wfs-t test
             gdaltest.geoserver_wfs = False
-            return 'skip'
-        gdaltest.post_reason('did not get expected feature count')
+            pytest.skip('server probably in a broken state')
         print(feat_count)
-        return 'fail'
+        pytest.fail('did not get expected feature count')
 
     assert lyr.TestCapability(ogr.OLCFastFeatureCount), 'did not get OLCFastFeatureCount'
 
     ds = ogr.Open('WFS:http://demo.opengeo.org/geoserver/wfs?TYPENAME=tiger:poi&MAXFEATURES=10&VERSION=1.1.0')
     if ds is None:
-        print('server perhaps overloaded')
-        return 'skip'
+        pytest.skip('server perhaps overloaded')
     lyr = ds.GetLayer(0)
     gdal.ErrorReset()
     feat = lyr.GetNextFeature()
 
     # This error message is generally the sign of a server in a broken state
     if feat is None and gdal.GetLastErrorMsg().find('<ows:ExceptionText>org.geoserver.platform.ServiceException') != -1:
-        print('server probably in a broken state')
-        # Disable it for wfs-t test
         gdaltest.geoserver_wfs = False
-        return 'skip'
+        pytest.skip('server probably in a broken state')
 
     if feat.GetField('NAME') != 'museam' or \
        ogrtest.check_feature_geometry(feat, 'POINT (-74.0104611 40.70758763)',
                                       max_error=0.000001) != 0:
-        gdaltest.post_reason('did not get expected feature (1)')
         feat.DumpReadable()
-        return 'fail'
+        pytest.fail('did not get expected feature (1)')
 
     # Same with VERSION=1.0.0
     ds = ogr.Open('WFS:http://demo.opengeo.org/geoserver/wfs?TYPENAME=tiger:poi&MAXFEATURES=10&VERSION=1.0.0')
     if ds is None:
-        print('server perhaps overloaded')
-        return 'skip'
+        pytest.skip('server perhaps overloaded')
     lyr = ds.GetLayer(0)
     feat = lyr.GetNextFeature()
     if feat.GetField('NAME') != 'museam' or \
        ogrtest.check_feature_geometry(feat, 'POINT (-74.0104611 40.70758763)',
                                       max_error=0.000001) != 0:
-        gdaltest.post_reason('did not get expected feature (2)')
         feat.DumpReadable()
-        return 'fail'
+        pytest.fail('did not get expected feature (2)')
 
     # Test attribute filter
     ds = ogr.Open("WFS:http://demo.opengeo.org/geoserver/wfs?TYPENAME=tiger:poi")
     if ds is None:
-        print('server perhaps overloaded')
-        return 'skip'
+        pytest.skip('server perhaps overloaded')
     lyr = ds.GetLayer(0)
     lyr.SetAttributeFilter("MAINPAGE is not null and NAME >= 'a' and NAME LIKE 'mu%%eam'")
     feat_count = lyr.GetFeatureCount()
@@ -206,9 +192,8 @@ def test_ogr_wfs_geoserver():
         'did not get expected feature count after SetAttributeFilter (1)'
     feat = lyr.GetNextFeature()
     if feat.GetField('gml_id') != 'poi.1':
-        gdaltest.post_reason('did not get expected feature (3)')
         feat.DumpReadable()
-        return 'fail'
+        pytest.fail('did not get expected feature (3)')
 
     if False:  # pylint: disable=using-constant-test
         # This GeoServer version doesn't understand <GmlObjectId>
@@ -218,9 +203,8 @@ def test_ogr_wfs_geoserver():
             'did not get expected feature count after SetAttributeFilter (2)'
         feat = lyr.GetNextFeature()
         if feat.GetField('gml_id') != 'poi.1':
-            gdaltest.post_reason('did not get expected feature (4)')
             feat.DumpReadable()
-            return 'fail'
+            pytest.fail('did not get expected feature (4)')
 
     return 'success'
 
@@ -231,10 +215,10 @@ def test_ogr_wfs_geoserver():
 @pytest.mark.skip('FIXME: re-enable after adapting test')
 def test_ogr_wfs_geoserver_json():
     if gdaltest.wfs_drv is None:
-        return 'skip'
+        pytest.skip()
 
     if not gdaltest.geoserver_wfs:
-        return 'skip'
+        pytest.skip()
 
     ds = ogr.Open('WFS:http://demo.opengeo.org/geoserver/wfs?TYPENAME=za:za_points&MAXFEATURES=10&VERSION=1.1.0&OUTPUTFORMAT=json')
     assert ds is not None, 'did not managed to open WFS datastore'
@@ -254,9 +238,8 @@ def test_ogr_wfs_geoserver_json():
     # if feat.GetField('name') != 'Alexander Bay' or \
     if ogrtest.check_feature_geometry(feat, 'POINT (16.4827778 -28.5947222)',
                                       max_error=0.000000001) != 0:
-        gdaltest.post_reason('did not get expected feature')
         feat.DumpReadable()
-        return 'fail'
+        pytest.fail('did not get expected feature')
 
     return 'success'
 
@@ -267,10 +250,10 @@ def test_ogr_wfs_geoserver_json():
 @pytest.mark.skip('FIXME: re-enable after adapting test')
 def test_ogr_wfs_geoserver_shapezip():
     if gdaltest.wfs_drv is None:
-        return 'skip'
+        pytest.skip()
 
     if not gdaltest.geoserver_wfs:
-        return 'skip'
+        pytest.skip()
 
     ds = ogr.Open('WFS:http://demo.opengeo.org/geoserver/wfs?TYPENAME=za:za_points&MAXFEATURES=10&VERSION=1.1.0&OUTPUTFORMAT=SHAPE-ZIP')
     assert ds is not None, 'did not managed to open WFS datastore'
@@ -290,9 +273,8 @@ def test_ogr_wfs_geoserver_shapezip():
     # if feat.GetField('name') != 'Alexander Bay' or \
     if ogrtest.check_feature_geometry(feat, 'POINT (16.4827778 -28.5947222)',
                                       max_error=0.000000001) != 0:
-        gdaltest.post_reason('did not get expected feature')
         feat.DumpReadable()
-        return 'fail'
+        pytest.fail('did not get expected feature')
 
     return 'success'
 
@@ -303,10 +285,10 @@ def test_ogr_wfs_geoserver_shapezip():
 @pytest.mark.skip('FIXME: re-enable after adapting test')
 def test_ogr_wfs_geoserver_paging():
     if gdaltest.wfs_drv is None:
-        return 'skip'
+        pytest.skip()
 
     if not gdaltest.geoserver_wfs:
-        return 'skip'
+        pytest.skip()
 
     ds = ogr.Open('WFS:http://demo.opengeo.org/geoserver/wfs?TYPENAME=og:bugsites&VERSION=1.1.0')
     lyr = ds.GetLayer(0)
@@ -359,21 +341,19 @@ def test_ogr_wfs_geoserver_paging():
 @pytest.mark.skip()
 def test_ogr_wfs_deegree():
     if gdaltest.wfs_drv is None:
-        return 'skip'
+        pytest.skip()
 
     if gdaltest.gdalurlopen('http://demo.deegree.org:80/utah-workspace') is None:
         gdaltest.deegree_wfs = False
-        print('cannot open URL')
-        return 'skip'
+        pytest.skip('cannot open URL')
     gdaltest.deegree_wfs = True
 
     ds = ogr.Open("WFS:http://demo.deegree.org:80/utah-workspace/services/wfs?ACCEPTVERSIONS=1.1.0&MAXFEATURES=10")
     if ds is None:
         if gdal.GetLastErrorMsg().find('Error returned by server') < 0:
             gdaltest.deegree_wfs = False
-            return 'skip'
-        gdaltest.post_reason('did not managed to open WFS datastore')
-        return 'fail'
+            pytest.skip()
+        pytest.fail('did not managed to open WFS datastore')
 
     lyr = ds.GetLayerByName('app:SGID024_Springs')
     assert lyr.GetName() == 'app:SGID024_Springs', 'did not get expected layer name'
@@ -387,9 +367,8 @@ def test_ogr_wfs_deegree():
     if feat.GetField('OBJECTID') != 1 or \
        ogrtest.check_feature_geometry(feat, 'POINT (558750.703 4402882.05)',
                                       max_error=0.000000001) != 0:
-        gdaltest.post_reason('did not get expected feature')
         feat.DumpReadable()
-        return 'fail'
+        pytest.fail('did not get expected feature')
 
     # Test attribute filter
     ds = ogr.Open("WFS:http://demo.deegree.org:80/utah-workspace/services/wfs?ACCEPTVERSIONS=1.1.0")
@@ -418,14 +397,14 @@ def test_ogr_wfs_deegree():
 @pytest.mark.skip()
 def test_ogr_wfs_test_ogrsf():
     if gdaltest.wfs_drv is None:
-        return 'skip'
+        pytest.skip()
 
     if not gdaltest.deegree_wfs:
-        return 'skip'
+        pytest.skip()
 
     import test_cli_utilities
     if test_cli_utilities.get_test_ogrsf_path() is None:
-        return 'skip'
+        pytest.skip()
 
     ret = gdaltest.runexternal(test_cli_utilities.get_test_ogrsf_path() + ' -ro "WFS:http://demo.deegree.org:80/utah-workspace/services/wfs?ACCEPTVERSIONS=1.1.0&MAXFEATURES=10" app:SGID024_Springs')
 
@@ -496,44 +475,40 @@ def do_GET(self):
 
 def test_ogr_wfs_fake_wfs_server():
     if gdaltest.wfs_drv is None:
-        return 'skip'
+        pytest.skip()
 
     (process, port) = webserver.launch(handler=WFSHTTPHandler)
     if port == 0:
-        return 'skip'
+        pytest.skip()
 
     gdal.SetConfigOption('OGR_WFS_LOAD_MULTIPLE_LAYER_DEFN', 'NO')
     ds = ogr.Open("WFS:http://127.0.0.1:%d/fakewfs" % port)
     gdal.SetConfigOption('OGR_WFS_LOAD_MULTIPLE_LAYER_DEFN', None)
     if ds is None:
-        gdaltest.post_reason('did not managed to open WFS datastore')
         webserver.server_stop(process, port)
-        return 'fail'
+        pytest.fail('did not managed to open WFS datastore')
 
     lyr = ds.GetLayerByName('rijkswegen')
     if lyr.GetName() != 'rijkswegen':
-        gdaltest.post_reason('did not get expected layer name')
         print(lyr.GetName())
         webserver.server_stop(process, port)
-        return 'fail'
+        pytest.fail('did not get expected layer name')
 
     sr = lyr.GetSpatialRef()
     sr2 = osr.SpatialReference()
     sr2.ImportFromEPSG(28992)
     if not sr.IsSame(sr2):
-        gdaltest.post_reason('did not get expected SRS')
         print(sr)
         webserver.server_stop(process, port)
-        return 'fail'
+        pytest.fail('did not get expected SRS')
 
     feat = lyr.GetNextFeature()
     if feat.GetField('MPLength') != '33513.' or \
        ogrtest.check_feature_geometry(feat, 'MULTICURVE ((154898.65286 568054.62753,160108.36082 566076.78094,164239.254332 563024.70188,170523.31535 561231.219583,172676.42256 559253.37299,175912.80562 557459.89069,180043.699132 553508.779495,183294.491306 552250.182732))',
                                       max_error=0.00001) != 0:
-        gdaltest.post_reason('did not get expected feature')
         feat.DumpReadable()
         webserver.server_stop(process, port)
-        return 'fail'
+        pytest.fail('did not get expected feature')
 
     webserver.server_stop(process, port)
 
@@ -546,10 +521,10 @@ def test_ogr_wfs_fake_wfs_server():
 @pytest.mark.skip('FIXME: re-enable after adapting test')
 def test_ogr_wfs_geoserver_wfst():
     if gdaltest.wfs_drv is None:
-        return 'skip'
+        pytest.skip()
 
     if not gdaltest.geoserver_wfs:
-        return 'skip'
+        pytest.skip()
 
     ds = ogr.Open('WFS:http://demo.opengeo.org/geoserver/wfs?VERSION=1.1.0', update=1)
     assert ds is not None
@@ -563,10 +538,9 @@ def test_ogr_wfs_geoserver_wfst():
     if lyr.CreateFeature(feat) != 0:
         # Likely a bug in the current GeoServer version ??
         if gdal.GetLastErrorMsg().find("No such property 'typeName'") >= 0:
-            return 'skip'
+            pytest.skip()
 
-        gdaltest.post_reason('cannot create feature')
-        return 'fail'
+        pytest.fail('cannot create feature')
 
     print('Feature %d created !' % feat.GetFID())
 
@@ -626,8 +600,7 @@ def test_ogr_wfs_geoserver_wfst():
 def test_ogr_wfs_deegree_wfst():
 
     if gdaltest.gdalurlopen('http://testing.deegree.org/deegree-wfs/services') is None:
-        print('cannot open URL')
-        return 'skip'
+        pytest.skip('cannot open URL')
 
     ds = ogr.Open('WFS:http://testing.deegree.org/deegree-wfs/services', update=1)
     assert ds is not None
@@ -666,17 +639,16 @@ def test_ogr_wfs_deegree_wfst():
 def test_ogr_wfs_ionic_wfst():
 
     if gdaltest.gdalurlopen('http://webservices.ionicsoft.com/ionicweb/wfs/BOSTON_ORA') is None:
-        print('cannot open URL')
         gdaltest.ionic_wfs = False
-        return 'skip'
+        pytest.skip('cannot open URL')
     gdaltest.ionic_wfs = True
 
     ds = ogr.Open('WFS:http://webservices.ionicsoft.com/ionicweb/wfs/BOSTON_ORA', update=1)
     if ds is None:
         if gdal.GetLastErrorMsg().find('HTTP error code : 403') != -1:
             gdaltest.ionic_wfs = False
-            return 'skip'
-        return 'fail'
+            pytest.skip()
+        pytest.fail()
 
     lyr = ds.GetLayerByName('wfs:BUSINESS')
     geom = ogr.CreateGeometryFromWkt('POINT(234000 890000)')
@@ -705,7 +677,7 @@ def test_ogr_wfs_ionic_wfst():
 def test_ogr_wfs_ionic_sql():
 
     if not gdaltest.ionic_wfs:
-        return 'skip'
+        pytest.skip()
 
     ds = ogr.Open('WFS:http://webservices.ionicsoft.com/ionicweb/wfs/BOSTON_ORA')
     assert ds is not None
@@ -759,7 +731,7 @@ def test_ogr_wfs_xmldescriptionfile():
 def test_ogr_wfs_xmldescriptionfile_to_be_updated():
 
     if not gdaltest.geoserver_wfs:
-        return 'skip'
+        pytest.skip()
 
     f = open('tmp/ogr_wfs_xmldescriptionfile_to_be_updated.xml', 'wt')
     f.write('<OGRWFSDataSource>\n')
@@ -807,7 +779,7 @@ def test_ogr_wfs_getcapabilitiesfile():
 
     if ds is None:
         gdal.Unlink('data/getcapabilities_wfs.gfs')
-        return 'fail'
+        pytest.fail()
 
     ds = None
 
@@ -825,11 +797,10 @@ def test_ogr_wfs_deegree_gml321():
     ds = ogr.Open('WFS:http://demo.deegree.org:80/inspire-workspace/services/wfs?ACCEPTVERSIONS=1.1.0&MAXFEATURES=10')
     if ds is None:
         if gdaltest.gdalurlopen('http://demo.deegree.org:80/inspire-workspace/services/wfs?ACCEPTVERSIONS=1.1.0') is None:
-            print('cannot open URL')
-            return 'skip'
+            pytest.skip('cannot open URL')
         if gdal.GetLastErrorMsg().find("Unable to determine the subcontroller for request type 'GetCapabilities' and service type 'WFS'") != -1:
-            return 'skip'
-        return 'fail'
+            pytest.skip()
+        pytest.fail()
 
     lyr = ds.GetLayerByName("ad:Address")
     gdal.ErrorReset()
@@ -848,9 +819,8 @@ def test_ogr_wfs_deegree_wfs200():
     ds = ogr.Open('WFS:http://demo.deegree.org:80/utah-workspace/services/wfs?ACCEPTVERSIONS=2.0.0')
     if ds is None:
         if gdaltest.gdalurlopen('http://demo.deegree.org:80/utah-workspace/services/wfs?ACCEPTVERSIONS=2.0.0') is None:
-            print('cannot open URL')
-            return 'skip'
-        return 'fail'
+            pytest.skip('cannot open URL')
+        pytest.fail()
 
     lyr = ds.GetLayerByName("app:SGID024_Municipalities2004_edited")
     lyr.SetAttributeFilter('OBJECTID = 5')
@@ -862,9 +832,8 @@ def test_ogr_wfs_deegree_wfs200():
     else:
         feat = lyr.GetNextFeature()
         if feat.GetFieldAsInteger('OBJECTID') != 5:
-            gdaltest.post_reason("OBJECTID = 5 filter failed")
             feat.DumpReadable()
-            return 'fail'
+            pytest.fail("OBJECTID = 5 filter failed")
 
     lyr.SetAttributeFilter("gml_id = 'SGID024_MUNICIPALITIES2004_EDITED_5'")
     count = lyr.GetFeatureCount()
@@ -877,9 +846,8 @@ def test_ogr_wfs_deegree_wfs200():
     else:
         feat = lyr.GetNextFeature()
         if feat.GetFieldAsInteger('OBJECTID') != 6:
-            gdaltest.post_reason("gml_id = 'SGID024_MUNICIPALITIES2004_EDITED_5' filter failed")
             feat.DumpReadable()
-            return 'fail'
+            pytest.fail("gml_id = 'SGID024_MUNICIPALITIES2004_EDITED_5' filter failed")
 
     lyr.SetAttributeFilter(None)
     lyr.SetSpatialFilterRect(-1e8, -1e8, 1e8, 1e8)
@@ -901,21 +869,20 @@ def test_ogr_wfs_deegree_sortby():
     ds = ogr.Open('WFS:http://demo.deegree.org:80/utah-workspace/services/wfs?MAXFEATURES=10&VERSION=1.1.0')
     if ds is None:
         if gdaltest.gdalurlopen('http://demo.deegree.org:80/utah-workspace/services/wfs') is None:
-            print('cannot open URL')
-            return 'skip'
-        return 'fail'
+            pytest.skip('cannot open URL')
+        pytest.fail()
 
     lyr = ds.ExecuteSQL("SELECT * FROM \"app:SGID024_Municipalities2004_edited\" ORDER BY OBJECTID DESC")
 
     feat = lyr.GetNextFeature()
     if feat.GetFieldAsInteger('OBJECTID') != 240:
         feat.DumpReadable()
-        return 'fail'
+        pytest.fail()
 
     feat = lyr.GetNextFeature()
     if feat.GetFieldAsInteger('OBJECTID') != 239:
         feat.DumpReadable()
-        return 'fail'
+        pytest.fail()
 
     ds.ReleaseResultSet(lyr)
 
@@ -927,14 +894,13 @@ def test_ogr_wfs_deegree_sortby():
 def ogr_wfs_get_multiple_layer_defn(url):
 
     if not gdaltest.run_slow_tests():
-        return 'skip'
+        pytest.skip()
 
     ds = ogr.Open('WFS:' + url)
     if ds is None:
         if gdaltest.gdalurlopen(url) is None:
-            print('cannot open URL')
-            return 'skip'
-        return 'fail'
+            pytest.skip('cannot open URL')
+        pytest.fail()
 
     # This should be slow only for the first layer
     for i in range(0, ds.GetLayerCount()):
@@ -1788,13 +1754,13 @@ def test_ogr_wfs_vsimem_wfs110_one_layer_getfeature(with_and_without_streaming):
        f.int != 123456789 or f.float != 1.2 or f.double != 1.23 or f.dt != '2015-04-17T12:34:56Z' or \
        f.GetGeometryRef().ExportToWkt() != 'POINT (2 49)':
         f.DumpReadable()
-        return 'fail'
+        pytest.fail()
 
     sql_lyr = ds.ExecuteSQL('SELECT * FROM my_layer')
     f = sql_lyr.GetNextFeature()
     if f.gml_id != 'my_layer.1':
         f.DumpReadable()
-        return 'fail'
+        pytest.fail()
     ds.ReleaseResultSet(sql_lyr)
 
     return 'success'
@@ -2014,7 +1980,7 @@ def test_ogr_wfs_vsimem_wfs110_one_layer_getfeature_ogr_getfeature(with_and_with
     f = lyr.GetFeature(100)
     if f.gml_id != 'my_layer.100':
         f.DumpReadable()
-        return 'fail'
+        pytest.fail()
 
     return 'success'
 
@@ -3226,7 +3192,7 @@ def test_ogr_wfs_vsimem_wfs110_schema_not_understood(with_and_without_streaming)
        f.int != 123456789 or f.float != 1.2 or f.double != 1.23 or f.dt != '2015-04-17T12:34:56Z' or \
        f.GetGeometryRef().ExportToWkt() != 'POINT (2 49)':
         f.DumpReadable()
-        return 'fail'
+        pytest.fail()
 
     return 'success'
 
@@ -3643,24 +3609,24 @@ def test_ogr_wfs_vsimem_wfs200_paging(with_and_without_streaming):
     assert f is not None
     if f.gml_id != 'my_layer.1':
         f.DumpReadable()
-        return 'fail'
+        pytest.fail()
 
     f = lyr.GetNextFeature()
     assert f is not None
     if f.gml_id != 'my_layer.2':
         f.DumpReadable()
-        return 'fail'
+        pytest.fail()
 
     f = lyr.GetNextFeature()
     assert f is not None
     if f.gml_id != 'my_layer.3':
         f.DumpReadable()
-        return 'fail'
+        pytest.fail()
 
     f = lyr.GetNextFeature()
     if f is not None:
         f.DumpReadable()
-        return 'fail'
+        pytest.fail()
 
     # if lyr.GetFeatureCount() != 3:
     #    gdaltest.post_reason('fail')
@@ -3794,12 +3760,12 @@ def test_ogr_wfs_vsimem_wfs200_json(with_and_without_streaming):
     # We currently invert... A bit weird. See comment in code. Probably inappropriate
     if f.str != 'str' or f.GetGeometryRef().ExportToWkt() != 'POINT (49 2)':
         f.DumpReadable()
-        return 'fail'
+        pytest.fail()
 
     f = lyr.GetNextFeature()
     if f is not None:
         f.DumpReadable()
-        return 'fail'
+        pytest.fail()
 
     return 'success'
 
@@ -3872,7 +3838,7 @@ def test_ogr_wfs_vsimem_wfs200_multipart(with_and_without_streaming):
     # We currently invert... A bit weird. See comment in code. Probably inappropriate
     if f.str != 'str' or f.GetGeometryRef().ExportToWkt() != 'POINT (49 2)':
         f.DumpReadable()
-        return 'fail'
+        pytest.fail()
 
     ds = ogr.Open('WFS:/vsimem/wfs200_endpoint_multipart?OUTPUTFORMAT=multipart')
     lyr = ds.GetLayer(0)
@@ -3924,7 +3890,7 @@ def test_ogr_wfs_vsimem_wfs200_multipart(with_and_without_streaming):
     # We currently invert... A bit weird. See comment in code. Probably inappropriate
     if f.str != 'str' or f.GetGeometryRef().ExportToWkt() != 'POINT (49 2)':
         f.DumpReadable()
-        return 'fail'
+        pytest.fail()
 
     return 'success'
 
@@ -4144,25 +4110,25 @@ def test_ogr_wfs_vsimem_wfs200_join(with_and_without_streaming):
        f['lyr1.shape'].ExportToWkt() != 'POINT (2.5 48.5)' or \
        f['lyr2.another_shape'].ExportToWkt() != 'POINT (2 49)':
         f.DumpReadable()
-        return 'fail'
+        pytest.fail()
     f = sql_lyr.GetNextFeature()
     if f['lyr1.gml_id'] != 'lyr1-101' or f['lyr1.str'] != 'foo' or \
        f['lyr2.gml_id'] != 'lyr2-102' or f['lyr2.str2'] != 'foo' or \
        f['lyr1.shape'].ExportToWkt() != 'POINT (2.5 48.5)' or \
        f['lyr2.another_shape'].ExportToWkt() != 'POINT (2 49)':
         f.DumpReadable()
-        return 'fail'
+        pytest.fail()
     f = sql_lyr.GetNextFeature()
     if f is not None:
         f.DumpReadable()
-        return 'fail'
+        pytest.fail()
 
     sql_lyr.ResetReading()
     sql_lyr.ResetReading()
     f = sql_lyr.GetNextFeature()
     if f['lyr1.gml_id'] != 'lyr1-100':
         f.DumpReadable()
-        return 'fail'
+        pytest.fail()
 
     gdal.PushErrorHandler('CPLQuietErrorHandler')
     fc = sql_lyr.GetFeatureCount()
@@ -4253,7 +4219,7 @@ def test_ogr_wfs_vsimem_wfs200_join(with_and_without_streaming):
        f['lyr1.shape'].ExportToWkt() != 'POINT (2.5 48.5)' or \
        f['lyr2.another_shape'].ExportToWkt() != 'POINT (2 49)':
         f.DumpReadable()
-        return 'fail'
+        pytest.fail()
     ds.ReleaseResultSet(sql_lyr)
 
     ds = ogr.Open('WFS:/vsimem/wfs200_endpoint_join')
@@ -4264,7 +4230,7 @@ def test_ogr_wfs_vsimem_wfs200_join(with_and_without_streaming):
        f['my_alias1.shape'].ExportToWkt() != 'POINT (2.5 48.5)' or \
        f['lyr2.another_shape'].ExportToWkt() != 'POINT (2 49)':
         f.DumpReadable()
-        return 'fail'
+        pytest.fail()
     ds.ReleaseResultSet(sql_lyr)
 
     ds = ogr.Open('WFS:/vsimem/wfs200_endpoint_join')
@@ -4281,7 +4247,7 @@ def test_ogr_wfs_vsimem_wfs200_join(with_and_without_streaming):
        f['str_float'] != 123.4 or \
        f['myshape'].ExportToWkt() != 'POINT (2.5 48.5)':
         f.DumpReadable()
-        return 'fail'
+        pytest.fail()
     ds.ReleaseResultSet(sql_lyr)
 
     ds = ogr.Open('WFS:/vsimem/wfs200_endpoint_join')
@@ -4325,7 +4291,7 @@ def test_ogr_wfs_vsimem_wfs200_join(with_and_without_streaming):
        f['lyr1.shape'].ExportToWkt() != 'POINT (2.5 48.5)' or \
        f['lyr2.another_shape'].ExportToWkt() != 'POINT (2 49)':
         f.DumpReadable()
-        return 'fail'
+        pytest.fail()
 
     ds.ReleaseResultSet(sql_lyr)
 
@@ -4335,7 +4301,7 @@ def test_ogr_wfs_vsimem_wfs200_join(with_and_without_streaming):
     f = sql_lyr.GetNextFeature()
     if f['lyr1.gml_id'] != 'lyr1-100':
         f.DumpReadable()
-        return 'fail'
+        pytest.fail()
     ds.ReleaseResultSet(sql_lyr)
 
     gdal.FileFromMemBuffer('/vsimem/wfs200_endpoint_join?SERVICE=WFS&VERSION=2.0.0&REQUEST=GetFeature&TYPENAMES=%28lyr1,lyr2%29&STARTINDEX=0&COUNT=1&FILTER=%3CFilter%20xmlns%3D%22http:%2F%2Fwww.opengis.net%2Ffes%2F2.0%22%20xmlns:gml%3D%22http:%2F%2Fwww.opengis.net%2Fgml%2F3.2%22%3E%3CPropertyIsEqualTo%3E%3CValueReference%3Elyr1%2Fstr%3C%2FValueReference%3E%3CValueReference%3Elyr2%2Fstr2%3C%2FValueReference%3E%3C%2FPropertyIsEqualTo%3E%3C%2FFilter%3E&SORTBY=str%20DESC',
@@ -4344,7 +4310,7 @@ def test_ogr_wfs_vsimem_wfs200_join(with_and_without_streaming):
     f = sql_lyr.GetNextFeature()
     if f['lyr1.gml_id'] != 'lyr1-100':
         f.DumpReadable()
-        return 'fail'
+        pytest.fail()
     ds.ReleaseResultSet(sql_lyr)
 
     gdal.PushErrorHandler()
@@ -4476,7 +4442,7 @@ def test_ogr_wfs_vsimem_wfs200_join_layer_with_namespace_prefix(with_and_without
        f['lyr1.shape'].ExportToWkt() != 'POINT (2.5 48.5)' or \
        f['lyr2.another_shape'].ExportToWkt() != 'POINT (2 49)':
         f.DumpReadable()
-        return 'fail'
+        pytest.fail()
 
     ds.ReleaseResultSet(sql_lyr)
 
diff --git a/autotest/ogr/ogr_wfs3.py b/autotest/ogr/ogr_wfs3.py
index 4e60da04e301..cf006fd0223d 100755
--- a/autotest/ogr/ogr_wfs3.py
+++ b/autotest/ogr/ogr_wfs3.py
@@ -35,6 +35,7 @@
 import gdaltest
 from osgeo import ogr
 import webserver
+import pytest
 
 ###############################################################################
 # Init
@@ -45,12 +46,12 @@ def test_ogr_wfs3_init():
 
     gdaltest.wfs3_drv = ogr.GetDriverByName('WFS3')
     if gdaltest.wfs3_drv is None:
-        return 'skip'
+        pytest.skip()
 
     (gdaltest.webserver_process, gdaltest.webserver_port) = \
         webserver.launch(handler=webserver.DispatcherHttpHandler)
     if gdaltest.webserver_port == 0:
-        return 'skip'
+        pytest.skip()
 
     return 'success'
 
@@ -59,10 +60,10 @@ def test_ogr_wfs3_init():
 
 def test_ogr_wfs3_errors():
     if gdaltest.wfs3_drv is None:
-        return 'skip'
+        pytest.skip()
 
     if gdaltest.webserver_port == 0:
-        return 'skip'
+        pytest.skip()
 
     handler = webserver.SequentialHandler()
     handler.add('GET', '/wfs3/collections', 404)
@@ -134,10 +135,10 @@ def test_ogr_wfs3_errors():
 
 def test_ogr_wfs3_empty_layer():
     if gdaltest.wfs3_drv is None:
-        return 'skip'
+        pytest.skip()
 
     if gdaltest.webserver_port == 0:
-        return 'skip'
+        pytest.skip()
 
     handler = webserver.SequentialHandler()
     handler.add('GET', '/wfs3/collections', 200,
@@ -164,10 +165,10 @@ def test_ogr_wfs3_empty_layer():
 
 def test_ogr_wfs3_fc_links_next_geojson():
     if gdaltest.wfs3_drv is None:
-        return 'skip'
+        pytest.skip()
 
     if gdaltest.webserver_port == 0:
-        return 'skip'
+        pytest.skip()
 
     handler = webserver.SequentialHandler()
     handler.add('GET', '/wfs3/collections', 200, {'Content-Type': 'application/json'},
@@ -209,7 +210,7 @@ def test_ogr_wfs3_fc_links_next_geojson():
         f = lyr.GetNextFeature()
     if f['foo'] != 'bar':
         f.DumpReadable()
-        return 'fail'
+        pytest.fail()
 
     handler = webserver.SequentialHandler()
     handler.add('GET', '/wfs3/foo_next', 200,
@@ -227,7 +228,7 @@ def test_ogr_wfs3_fc_links_next_geojson():
         f = lyr.GetNextFeature()
     if f['foo'] != 'baz':
         f.DumpReadable()
-        return 'fail'
+        pytest.fail()
 
     return 'success'
 
@@ -236,10 +237,10 @@ def test_ogr_wfs3_fc_links_next_geojson():
 
 def test_ogr_wfs3_fc_links_next_headers():
     if gdaltest.wfs3_drv is None:
-        return 'skip'
+        pytest.skip()
 
     if gdaltest.webserver_port == 0:
-        return 'skip'
+        pytest.skip()
 
     handler = webserver.SequentialHandler()
     handler.add('GET', '/wfs3/collections', 200, {'Content-Type': 'application/json'},
@@ -280,7 +281,7 @@ def test_ogr_wfs3_fc_links_next_headers():
         f = lyr.GetNextFeature()
     if f['foo'] != 'bar':
         f.DumpReadable()
-        return 'fail'
+        pytest.fail()
 
     handler = webserver.SequentialHandler()
     handler.add('GET', '/wfs3/foo_next', 200,
@@ -298,7 +299,7 @@ def test_ogr_wfs3_fc_links_next_headers():
         f = lyr.GetNextFeature()
     if f['foo'] != 'baz':
         f.DumpReadable()
-        return 'fail'
+        pytest.fail()
 
     return 'success'
 
@@ -307,10 +308,10 @@ def test_ogr_wfs3_fc_links_next_headers():
 
 def test_ogr_wfs3_spatial_filter():
     if gdaltest.wfs3_drv is None:
-        return 'skip'
+        pytest.skip()
 
     if gdaltest.webserver_port == 0:
-        return 'skip'
+        pytest.skip()
 
     handler = webserver.SequentialHandler()
     handler.add('GET', '/wfs3/collections', 200, {'Content-Type': 'application/json'},
@@ -382,10 +383,10 @@ def test_ogr_wfs3_spatial_filter():
 
 def test_ogr_wfs3_get_feature_count():
     if gdaltest.wfs3_drv is None:
-        return 'skip'
+        pytest.skip()
 
     if gdaltest.webserver_port == 0:
-        return 'skip'
+        pytest.skip()
 
     handler = webserver.SequentialHandler()
     handler.add('GET', '/wfs3/collections', 200, {'Content-Type': 'application/json'},
@@ -448,10 +449,10 @@ def test_ogr_wfs3_get_feature_count():
 
 def test_ogr_wfs3_attribute_filter():
     if gdaltest.wfs3_drv is None:
-        return 'skip'
+        pytest.skip()
 
     if gdaltest.webserver_port == 0:
-        return 'skip'
+        pytest.skip()
 
     handler = webserver.SequentialHandler()
     handler.add('GET', '/wfs3/collections', 200, {'Content-Type': 'application/json'},
@@ -568,7 +569,7 @@ def test_ogr_wfs3_attribute_filter():
 def test_ogr_wfs3_cleanup():
 
     if gdaltest.wfs3_drv is None:
-        return 'skip'
+        pytest.skip()
 
     if gdaltest.webserver_port != 0:
         webserver.server_stop(gdaltest.webserver_process, gdaltest.webserver_port)
diff --git a/autotest/ogr/ogr_xls.py b/autotest/ogr/ogr_xls.py
index 0a298fe5f8e0..2f777f9e183f 100755
--- a/autotest/ogr/ogr_xls.py
+++ b/autotest/ogr/ogr_xls.py
@@ -35,6 +35,7 @@
 import gdaltest
 from osgeo import gdal
 from osgeo import ogr
+import pytest
 
 ###############################################################################
 # Basic tests
@@ -44,7 +45,7 @@ def test_ogr_xls_1():
 
     drv = ogr.GetDriverByName('XLS')
     if drv is None:
-        return 'skip'
+        pytest.skip()
 
     assert drv.TestCapability("foo") == 0
 
@@ -81,7 +82,7 @@ def test_ogr_xls_1():
        feat.GetFieldAsString(3) != '1980/01/01' or \
        feat.GetFieldAsString(4) != '1980/01/01 00:00:00':
         feat.DumpReadable()
-        return 'fail'
+        pytest.fail()
 
     feat = lyr.GetNextFeature()
     feat = lyr.GetNextFeature()
@@ -98,7 +99,7 @@ def test_ogr_xls_2():
 
     drv = ogr.GetDriverByName('XLS')
     if drv is None:
-        return 'skip'
+        pytest.skip()
 
     gdal.SetConfigOption('OGR_XLS_HEADERS', 'DISABLE')
     ds = ogr.Open('data/test972000xp.xls')
@@ -119,7 +120,7 @@ def test_ogr_xls_3():
 
     drv = ogr.GetDriverByName('XLS')
     if drv is None:
-        return 'skip'
+        pytest.skip()
 
     gdal.SetConfigOption('OGR_XLS_FIELD_TYPES', 'STRING')
     ds = ogr.Open('data/test972000xp.xls')
@@ -140,11 +141,11 @@ def test_ogr_xls_4():
 
     drv = ogr.GetDriverByName('XLS')
     if drv is None:
-        return 'skip'
+        pytest.skip()
 
     import test_cli_utilities
     if test_cli_utilities.get_test_ogrsf_path() is None:
-        return 'skip'
+        pytest.skip()
 
     ret = gdaltest.runexternal(test_cli_utilities.get_test_ogrsf_path() + ' -ro data/test972000xp.xls')
 
diff --git a/autotest/ogr/ogr_xlsx.py b/autotest/ogr/ogr_xlsx.py
index 0c99951fe8bc..9ee02ce8faf5 100755
--- a/autotest/ogr/ogr_xlsx.py
+++ b/autotest/ogr/ogr_xlsx.py
@@ -36,6 +36,7 @@
 import gdaltest
 from osgeo import gdal
 from osgeo import ogr
+import pytest
 
 ###############################################################################
 # Check
@@ -87,12 +88,12 @@ def ogr_xlsx_check(ds):
        feat.GetFieldAsString(4) != '2012/01/22' or \
        feat.GetFieldAsString(5) != '2012/01/22 18:49:00':
         feat.DumpReadable()
-        return 'fail'
+        pytest.fail()
 
     feat = lyr.GetNextFeature()
     if feat.IsFieldSet(2):
         feat.DumpReadable()
-        return 'fail'
+        pytest.fail()
 
     return 'success'
 
@@ -104,7 +105,7 @@ def test_ogr_xlsx_1():
 
     drv = ogr.GetDriverByName('XLSX')
     if drv is None:
-        return 'skip'
+        pytest.skip()
 
     assert drv.TestCapability("foo") == 0
 
@@ -121,7 +122,7 @@ def test_ogr_xlsx_2():
 
     drv = ogr.GetDriverByName('XLSX')
     if drv is None:
-        return 'skip'
+        pytest.skip()
 
     gdal.SetConfigOption('OGR_XLSX_HEADERS', 'DISABLE')
     ds = ogr.Open('data/test.xlsx')
@@ -142,7 +143,7 @@ def test_ogr_xlsx_3():
 
     drv = ogr.GetDriverByName('XLSX')
     if drv is None:
-        return 'skip'
+        pytest.skip()
 
     gdal.SetConfigOption('OGR_XLSX_FIELD_TYPES', 'STRING')
     ds = ogr.Open('data/test.xlsx')
@@ -163,11 +164,11 @@ def test_ogr_xlsx_4():
 
     drv = ogr.GetDriverByName('XLSX')
     if drv is None:
-        return 'skip'
+        pytest.skip()
 
     import test_cli_utilities
     if test_cli_utilities.get_test_ogrsf_path() is None:
-        return 'skip'
+        pytest.skip()
 
     ret = gdaltest.runexternal(test_cli_utilities.get_test_ogrsf_path() + ' -ro data/test.xlsx')
 
@@ -183,11 +184,11 @@ def test_ogr_xlsx_5():
 
     drv = ogr.GetDriverByName('XLSX')
     if drv is None:
-        return 'skip'
+        pytest.skip()
 
     import test_cli_utilities
     if test_cli_utilities.get_ogr2ogr_path() is None:
-        return 'skip'
+        pytest.skip()
 
     gdaltest.runexternal(test_cli_utilities.get_ogr2ogr_path() + ' -f XLSX tmp/test.xlsx data/test.xlsx')
 
@@ -207,7 +208,7 @@ def test_ogr_xlsx_6():
 
     drv = ogr.GetDriverByName('XLSX')
     if drv is None:
-        return 'skip'
+        pytest.skip()
 
     # In this dataset the column titles are not recognised by default.
     gdal.SetConfigOption('OGR_XLSX_HEADERS', 'FORCE')
@@ -236,7 +237,7 @@ def test_ogr_xlsx_7():
 
     drv = ogr.GetDriverByName('XLSX')
     if drv is None:
-        return 'skip'
+        pytest.skip()
 
     gdal.Unlink('tmp/ogr_xlsx_7.xlsx')
     shutil.copy('data/test.xlsx', 'tmp/ogr_xlsx_7.xlsx')
@@ -245,9 +246,8 @@ def test_ogr_xlsx_7():
     lyr = ds.GetLayerByName('Feuille7')
     feat = lyr.GetNextFeature()
     if feat.GetFID() != 2:
-        gdaltest.post_reason('did not get expected FID')
         feat.DumpReadable()
-        return 'fail'
+        pytest.fail('did not get expected FID')
     feat.SetField(0, 'modified_value')
     lyr.SetFeature(feat)
     feat = None
@@ -257,13 +257,11 @@ def test_ogr_xlsx_7():
     lyr = ds.GetLayerByName('Feuille7')
     feat = lyr.GetNextFeature()
     if feat.GetFID() != 2:
-        gdaltest.post_reason('did not get expected FID')
         feat.DumpReadable()
-        return 'fail'
+        pytest.fail('did not get expected FID')
     if feat.GetField(0) != 'modified_value':
-        gdaltest.post_reason('did not get expected value')
         feat.DumpReadable()
-        return 'fail'
+        pytest.fail('did not get expected value')
     feat = None
     ds = None
 
@@ -279,7 +277,7 @@ def test_ogr_xlsx_8():
 
     drv = ogr.GetDriverByName('XLSX')
     if drv is None:
-        return 'skip'
+        pytest.skip()
 
     ds = drv.CreateDataSource('/vsimem/ogr_xlsx_8.xlsx')
     lyr = ds.CreateLayer('foo')
@@ -310,7 +308,7 @@ def test_ogr_xlsx_9():
 
     drv = ogr.GetDriverByName('XLSX')
     if drv is None:
-        return 'skip'
+        pytest.skip()
 
     ds = drv.CreateDataSource('/vsimem/ogr_xlsx_9.xlsx')
     lyr = ds.CreateLayer('foo')
@@ -347,7 +345,7 @@ def test_ogr_xlsx_10():
 
     drv = ogr.GetDriverByName('XLSX')
     if drv is None:
-        return 'skip'
+        pytest.skip()
 
     ds = drv.CreateDataSource('/vsimem/ogr_xlsx_10.xlsx')
     lyr = ds.CreateLayer('foo')
@@ -369,13 +367,13 @@ def test_ogr_xlsx_10():
     f = lyr.GetNextFeature()
     if f.GetField(0) != '2015/12/23 12:34:56.789':
         f.DumpReadable()
-        return 'fail'
+        pytest.fail()
     if f.GetField(1) != '2015/12/23 12:34:56':
         f.DumpReadable()
-        return 'fail'
+        pytest.fail()
     if f.GetField(2) != '2015/12/23 12:34:56':
         f.DumpReadable()
-        return 'fail'
+        pytest.fail()
     ds = None
 
     gdal.Unlink('/vsimem/ogr_xlsx_10.xlsx')
@@ -390,7 +388,7 @@ def test_ogr_xlsx_11():
 
     drv = ogr.GetDriverByName('XLSX')
     if drv is None:
-        return 'skip'
+        pytest.skip()
 
     ds = ogr.Open('data/not_all_columns_present.xlsx')
     lyr = ds.GetLayer(0)
@@ -398,7 +396,7 @@ def test_ogr_xlsx_11():
     for i in (0, 27, 28, 29):
         if f['Field%d' % (i + 1)] != 'val%d' % (i + 1):
             f.DumpReadable()
-            return 'fail'
+            pytest.fail()
     ds = None
 
     return 'success'
@@ -412,7 +410,7 @@ def test_ogr_xlsx_12():
 
     drv = ogr.GetDriverByName('XLSX')
     if drv is None:
-        return 'skip'
+        pytest.skip()
 
     ds = ogr.Open('data/absolute_sheet_filename.xlsx')
     lyr = ds.GetLayer(0)
@@ -430,7 +428,7 @@ def test_ogr_xlsx_13():
 
     drv = ogr.GetDriverByName('XLSX')
     if drv is None:
-        return 'skip'
+        pytest.skip()
 
     gdal.SetConfigOption('OGR_XLSX_FIELD_TYPES', None)
     ds = ogr.Open('data/test_missing_row1_data.xlsx')
@@ -477,7 +475,7 @@ def test_ogr_xlsx_14():
 
     drv = ogr.GetDriverByName('XLSX')
     if drv is None:
-        return 'skip'
+        pytest.skip()
 
     gdal.SetConfigOption('OGR_XLSX_FIELD_TYPES', None)
     ds = ogr.Open('data/test_empty_last_field.xlsx')
@@ -524,7 +522,7 @@ def test_ogr_xlsx_15():
 
     drv = ogr.GetDriverByName('XLSX')
     if drv is None:
-        return 'skip'
+        pytest.skip()
 
     out_filename = '/vsimem/ogr_xlsx_15.xlsx'
     gdal.VectorTranslate(out_filename, 'data/poly.shp', options='-f XLSX -nln first')
@@ -546,7 +544,7 @@ def test_ogr_xlsx_boolean():
 
     drv = ogr.GetDriverByName('XLSX')
     if drv is None:
-        return 'skip'
+        pytest.skip()
 
     out_filename = '/vsimem/ogr_xlsx_boolean.xlsx'
     ds = drv.CreateDataSource(out_filename)
diff --git a/autotest/ogr/ograpispy.py b/autotest/ogr/ograpispy.py
index ae1afc134b2b..041d9703e60a 100755
--- a/autotest/ogr/ograpispy.py
+++ b/autotest/ogr/ograpispy.py
@@ -40,6 +40,7 @@
 import test_py_scripts
 from osgeo import ogr
 from osgeo import gdal
+import pytest
 
 ###############################################################################
 # Basic test without snapshoting
@@ -56,19 +57,18 @@ def test_ograpispy_1():
         ogrtest.has_apispy = True
     except OSError:
         ogrtest.has_apispy = False
-        return 'skip'
+        pytest.skip()
 
     ref_data = open('data/testograpispy.py', 'rt').read()
     got_data = open('tmp/ograpispy_1.py', 'rt').read()
 
     if ref_data != got_data:
-        gdaltest.post_reason('did not get expected script')
         print()
         for line in unified_diff(ref_data.splitlines(), got_data.splitlines(),
                                  fromfile='expected', tofile='got',
                                  lineterm=""):
             print(line)
-        return 'fail'
+        pytest.fail('did not get expected script')
 
     return 'success'
 
@@ -79,7 +79,7 @@ def test_ograpispy_1():
 def test_ograpispy_2():
 
     if not ogrtest.has_apispy:
-        return 'skip'
+        pytest.skip()
 
     try:
         shutil.rmtree('tmp/snapshot_1')
diff --git a/autotest/osr/osr_basic.py b/autotest/osr/osr_basic.py
index f438cf1d85c9..ef8bd35c4b99 100755
--- a/autotest/osr/osr_basic.py
+++ b/autotest/osr/osr_basic.py
@@ -280,7 +280,7 @@ def test_osr_basic_8():
     assert fe == 1000.0, 'false easting was unexpectedly updated.'
 
     if 'SetLinearUnitsAndUpdateParameters' not in dir(srs):
-        return 'skip'
+        pytest.skip()
 
     srs.SetFromUserInput('+proj=tmerc +x_0=1000 +datum=WGS84 +units=m')
     srs.SetLinearUnitsAndUpdateParameters('Foot', 0.3048)
@@ -393,7 +393,7 @@ def test_osr_basic_11():
     if srs1.IsSame(srs2):
         return 'success'
 
-    return 'fail'
+    pytest.fail()
 
 ###############################################################################
 # Test URN support for OGC:CRS84.
diff --git a/autotest/osr/osr_compd.py b/autotest/osr/osr_compd.py
index 3b3137c14546..2fcff59ce26f 100755
--- a/autotest/osr/osr_compd.py
+++ b/autotest/osr/osr_compd.py
@@ -226,7 +226,7 @@ def test_osr_compd_5():
     wkt = srs.ExportToPrettyWkt()
 
     if gdaltest.equal_srs_from_wkt(exp_wkt, wkt) == 0:
-        return 'fail'
+        pytest.fail()
     elif exp_wkt != wkt:
         print('warning they are equivalent, but not completely the same')
         print(wkt)
@@ -246,7 +246,7 @@ def test_osr_compd_5():
 def test_osr_compd_6():
 
     if not osr_proj4.have_proj480():
-        return 'skip'
+        pytest.skip()
 
     srs = osr.SpatialReference()
     srs.SetFromUserInput('+proj=utm +zone=11 +ellps=GRS80 +towgs84=0,0,0,0,0,0,0 +units=m +geoidgrids=g2003conus.gtx,g2003alaska.gtx,g2003h01.gtx,g2003p01.gtx +vunits=us-ft +no_defs ')
@@ -277,7 +277,7 @@ def test_osr_compd_6():
     wkt = srs.ExportToPrettyWkt()
 
     if gdaltest.equal_srs_from_wkt(exp_wkt, wkt) == 0:
-        return 'fail'
+        pytest.fail()
     elif exp_wkt != wkt:
         print('warning they are equivalent, but not completely the same')
         print(wkt)
@@ -330,7 +330,7 @@ def test_osr_compd_7():
     wkt = srs.ExportToPrettyWkt()
 
     if gdaltest.equal_srs_from_wkt(exp_wkt, wkt) == 0:
-        return 'fail'
+        pytest.fail()
     elif exp_wkt != wkt:
         print('warning they are equivalent, but not completely the same')
         print(wkt)
diff --git a/autotest/osr/osr_ct.py b/autotest/osr/osr_ct.py
index 23706a0b1d83..445feb587a95 100755
--- a/autotest/osr/osr_ct.py
+++ b/autotest/osr/osr_ct.py
@@ -60,15 +60,12 @@ def test_osr_ct_1():
         ct = osr.CoordinateTransformation(ll_srs, utm_srs)
         gdal.PopErrorHandler()
         if gdal.GetLastErrorMsg().find('Unable to load PROJ.4') != -1:
-            gdaltest.post_reason('PROJ.4 missing, transforms not available.')
-            return 'skip'
+            pytest.skip('PROJ.4 missing, transforms not available.')
     except ValueError:
         gdal.PopErrorHandler()
         if gdal.GetLastErrorMsg().find('Unable to load PROJ.4') != -1:
-            gdaltest.post_reason('PROJ.4 missing, transforms not available.')
-            return 'skip'
-        gdaltest.post_reason(gdal.GetLastErrorMsg())
-        return 'fail'
+            pytest.skip('PROJ.4 missing, transforms not available.')
+        pytest.fail(gdal.GetLastErrorMsg())
 
     assert not (ct is None or ct.this is None), \
         'Unable to create simple CoordinateTransformat.'
@@ -84,7 +81,7 @@ def test_osr_ct_1():
 def test_osr_ct_2():
 
     if gdaltest.have_proj4 == 0:
-        return 'skip'
+        pytest.skip()
 
     utm_srs = osr.SpatialReference()
     utm_srs.SetUTM(11)
@@ -109,7 +106,7 @@ def test_osr_ct_2():
 def test_osr_ct_3():
 
     if gdaltest.have_proj4 == 0:
-        return 'skip'
+        pytest.skip()
 
     utm_srs = osr.SpatialReference()
     utm_srs.SetUTM(11)
@@ -143,7 +140,7 @@ def test_osr_ct_3():
 def test_osr_ct_4():
 
     if gdaltest.have_proj4 == 0:
-        return 'skip'
+        pytest.skip()
 
     utm_srs = osr.SpatialReference()
     utm_srs.SetUTM(11)
@@ -170,7 +167,7 @@ def test_osr_ct_4():
 def test_osr_ct_5():
 
     if gdaltest.have_proj4 == 0:
-        return 'skip'
+        pytest.skip()
 
     utm_srs = osr.SpatialReference()
     utm_srs.SetUTM(11)
@@ -196,7 +193,7 @@ def test_osr_ct_5():
 def test_osr_ct_6():
 
     if gdaltest.have_proj4 == 0:
-        return 'skip'
+        pytest.skip()
 
     ct = osr.CreateCoordinateTransformation(None, None)
     assert ct is None
@@ -226,7 +223,7 @@ def test_osr_ct_6():
 def test_osr_ct_7():
 
     if gdaltest.have_proj4 == 0:
-        return 'skip'
+        pytest.skip()
 
     pm_srs = osr.SpatialReference()
     pm_srs.ImportFromEPSG(3857)
@@ -267,7 +264,7 @@ def test_osr_ct_7():
 def test_osr_ct_8():
 
     if gdaltest.have_proj4 == 0:
-        return 'skip'
+        pytest.skip()
 
     src_srs = osr.SpatialReference()
     src_srs.ImportFromEPSG(3857)
@@ -308,7 +305,7 @@ def test_osr_ct_8():
 def test_osr_ct_cleanup():
 
     if gdaltest.have_proj4 == 0:
-        return 'skip'
+        pytest.skip()
 
     gdaltest.ct = None
 
diff --git a/autotest/osr/osr_ct_proj.py b/autotest/osr/osr_ct_proj.py
index aa0286e6e240..8ee89e06ea11 100755
--- a/autotest/osr/osr_ct_proj.py
+++ b/autotest/osr/osr_ct_proj.py
@@ -144,19 +144,19 @@ def test_proj(src_srs, src_xyz, src_error,
     import osr_ct
     osr_ct.osr_ct_1()
     if gdaltest.have_proj4 == 0:
-        return 'skip'
+        pytest.skip()
 
     if requirements is not None and requirements[:5] == 'GRID:':
         proj_lib = os.getenv('PROJ_LIB')
         if proj_lib is None:
             # print( 'PROJ_LIB unset, skipping test.' )
-            return 'skip'
+            pytest.skip()
 
         try:
             open(proj_lib + '/' + requirements[5:])
         except IOError:
             # print( 'Did not find GRID:%s' % requirements[5:] )
-            return 'skip'
+            pytest.skip()
 
     src = osr.SpatialReference()
     assert src.SetFromUserInput(src_srs) == 0, \
@@ -176,19 +176,15 @@ def test_proj(src_srs, src_xyz, src_error,
         ct = osr.CoordinateTransformation(src, dst)
         gdal.PopErrorHandler()
         if gdal.GetLastErrorMsg().find('Unable to load PROJ.4') != -1:
-            gdaltest.post_reason('PROJ.4 missing, transforms not available.')
-            return 'skip'
+            pytest.skip('PROJ.4 missing, transforms not available.')
     except ValueError:
         gdal.PopErrorHandler()
         if gdal.GetLastErrorMsg().find('Unable to load PROJ.4') != -1:
-            gdaltest.post_reason('PROJ.4 missing, transforms not available.')
-            return 'skip'
-        gdaltest.post_reason('failed to create coordinate transformation. %s' % gdal.GetLastErrorMsg())
-        return 'fail'
+            pytest.skip('PROJ.4 missing, transforms not available.')
+        pytest.fail('failed to create coordinate transformation. %s' % gdal.GetLastErrorMsg())
     except:
         gdal.PopErrorHandler()
-        gdaltest.post_reason('failed to create coordinate transformation. %s' % gdal.GetLastErrorMsg())
-        return 'fail'
+        pytest.fail('failed to create coordinate transformation. %s' % gdal.GetLastErrorMsg())
 
     ######################################################################
     # Transform source point to destination SRS.
diff --git a/autotest/osr/osr_esri.py b/autotest/osr/osr_esri.py
index 1033357b10c7..b7fd3596fb78 100755
--- a/autotest/osr/osr_esri.py
+++ b/autotest/osr/osr_esri.py
@@ -892,7 +892,7 @@ def test_osr_esri_21():
 
     # FIXME ?
     if sys.version_info >= (3, 0, 0):
-        return 'skip'
+        pytest.skip()
 
     result = 'success'
 
diff --git a/autotest/osr/osr_metacrs.py b/autotest/osr/osr_metacrs.py
index ce5a183eb199..5318237a1413 100755
--- a/autotest/osr/osr_metacrs.py
+++ b/autotest/osr/osr_metacrs.py
@@ -65,19 +65,15 @@ def test_metacrs(self, test_line):
             ct = osr.CoordinateTransformation(self.src_srs, self.dst_srs)
             gdal.PopErrorHandler()
             if gdal.GetLastErrorMsg().find('Unable to load PROJ.4') != -1:
-                gdaltest.post_reason('PROJ.4 missing, transforms not available.')
-                return 'skip'
+                pytest.skip('PROJ.4 missing, transforms not available.')
         except ValueError:
             gdal.PopErrorHandler()
             if gdal.GetLastErrorMsg().find('Unable to load PROJ.4') != -1:
-                gdaltest.post_reason('PROJ.4 missing, transforms not available.')
-                return 'skip'
-            gdaltest.post_reason('failed to create coordinate transformation. %s' % gdal.GetLastErrorMsg())
-            return 'fail'
+                pytest.skip('PROJ.4 missing, transforms not available.')
+            pytest.fail('failed to create coordinate transformation. %s' % gdal.GetLastErrorMsg())
         except:
             gdal.PopErrorHandler()
-            gdaltest.post_reason('failed to create coordinate transformation. %s' % gdal.GetLastErrorMsg())
-            return 'fail'
+            pytest.fail('failed to create coordinate transformation. %s' % gdal.GetLastErrorMsg())
 
         ######################################################################
         # Transform source point to destination SRS, swapping EPSG GEOGCS
@@ -104,13 +100,11 @@ def test_metacrs(self, test_line):
                          result[0], result[1], result[2],
                          self.dst_xyz[0], self.dst_xyz[1], self.dst_xyz[2])
 
-            gdaltest.post_reason(err_msg)
-
             gdal.Debug('OSR', 'Src SRS:\n%s\n\nDst SRS:\n%s\n'
                        % (self.src_srs.ExportToPrettyWkt(),
                           self.dst_srs.ExportToPrettyWkt()))
 
-            return 'fail'
+            pytest.fail(err_msg)
 
     def parse_line(self):
         test_line = self.test_line
diff --git a/autotest/osr/osr_proj4.py b/autotest/osr/osr_proj4.py
index 984835ae5d00..f2e16e06ae55 100755
--- a/autotest/osr/osr_proj4.py
+++ b/autotest/osr/osr_proj4.py
@@ -143,8 +143,7 @@ def test_osr_proj4_3():
     if gdal.GetLastErrorMsg().find('No translation') != -1:
         return 'success'
 
-    gdaltest.post_reason('empty srs not handled properly')
-    return 'fail'
+    pytest.fail('empty srs not handled properly')
 
 ###############################################################################
 # Verify that unrecognized projections return an error, not those
@@ -169,8 +168,7 @@ def test_osr_proj4_4():
     if gdal.GetLastErrorMsg().find('No translation') != -1:
         return 'success'
 
-    gdaltest.post_reason('unknown srs not handled properly')
-    return 'fail'
+    pytest.fail('unknown srs not handled properly')
 
 ###############################################################################
 # Verify that prime meridians are preserved when round tripping. (#1940)
@@ -522,7 +520,7 @@ def test_osr_proj4_13():
         gdal.ErrorReset()
         if srs.ImportFromProj4(proj4str) == 0 and gdal.GetLastErrorMsg() == '':
             gdal.PopErrorHandler()
-            return 'fail'
+            pytest.fail()
 
     gdal.PopErrorHandler()
 
@@ -607,7 +605,7 @@ def test_osr_proj4_15():
 
     srs = osr.SpatialReference()
     if srs.ImportFromProj4("+init=IGNF:LAMB93") != 0:
-        return 'skip'
+        pytest.skip()
 
     assert srs.GetAuthorityName(None) == 'IGNF' and srs.GetAuthorityCode(None) == 'LAMB93'
 
@@ -843,7 +841,7 @@ def test_osr_proj4_24():
 def test_osr_proj4_25():
 
     if not have_proj480():
-        return 'skip'
+        pytest.skip()
 
     srs = osr.SpatialReference()
     srs.ImportFromProj4("+proj=merc +geoidgrids=foo +vto_meter=1.0")
@@ -881,7 +879,7 @@ def test_osr_proj4_25():
 def test_osr_proj4_26():
 
     if not have_proj480():
-        return 'skip'
+        pytest.skip()
 
     srs = osr.SpatialReference()
     srs.ImportFromProj4("+proj=merc +geoidgrids=foo +vunits=m")
@@ -912,7 +910,7 @@ def test_osr_proj4_26():
 def test_osr_proj4_27():
 
     if not have_proj480():
-        return 'skip'
+        pytest.skip()
 
     srs = osr.SpatialReference()
     srs.ImportFromProj4("+proj=geos +h=35785831 +lon_0=0 +datum=WGS84 +sweep=x +units=m")
diff --git a/autotest/osr/osr_url.py b/autotest/osr/osr_url.py
index 0738dba7fad5..f4659fe876cf 100755
--- a/autotest/osr/osr_url.py
+++ b/autotest/osr/osr_url.py
@@ -35,6 +35,7 @@
 
 import gdaltest
 from osgeo import osr
+import pytest
 
 expected_wkt = 'GEOGCS["WGS 84",DATUM["WGS_1984",SPHEROID["WGS 84",6378137,298.257223563,AUTHORITY["EPSG","7030"]],AUTHORITY["EPSG","6326"]],PRIMEM["Greenwich",0,AUTHORITY["EPSG","8901"]],UNIT["degree",0.01745329251994328,AUTHORITY["EPSG","9122"]],AUTHORITY["EPSG","4326"]]'
 
@@ -43,7 +44,7 @@ def osr_url_test(url, expected_wkt):
     timeout = 10
     socket.setdefaulttimeout(timeout)
     if gdaltest.gdalurlopen(url) is None:
-        return 'skip'
+        pytest.skip()
 
     # Depend on the Accepts headers that ImportFromUrl sets to request SRS from sr.org
     srs = osr.SpatialReference()
@@ -52,19 +53,18 @@ def osr_url_test(url, expected_wkt):
     try:
         srs.ImportFromUrl(url)
     except AttributeError:  # old-gen bindings don't have this method yet
-        return 'skip'
+        pytest.skip()
     except Exception:
         gdal.PopErrorHandler()
         if gdal.GetLastErrorMsg() == "GDAL/OGR not compiled with libcurl support, remote requests not supported." or \
            gdal.GetLastErrorMsg().find("timed out") != -1:
-            return 'skip'
-        gdaltest.post_reason('exception: ' + gdal.GetLastErrorMsg())
-        return 'fail'
+            pytest.skip()
+        pytest.fail('exception: ' + gdal.GetLastErrorMsg())
 
     gdal.PopErrorHandler()
     if gdal.GetLastErrorMsg() == "GDAL/OGR not compiled with libcurl support, remote requests not supported." or \
        gdal.GetLastErrorMsg().find("timed out") != -1:
-        return 'skip'
+        pytest.skip()
 
     assert gdaltest.equal_srs_from_wkt(expected_wkt,
                                        srs.ExportToWkt())
diff --git a/autotest/pymod/gdaltest.py b/autotest/pymod/gdaltest.py
index 2d733072aa4e..07dbad9ecc5e 100644
--- a/autotest/pymod/gdaltest.py
+++ b/autotest/pymod/gdaltest.py
@@ -279,7 +279,7 @@ def testOpen(self, check_prj=None, check_gt=None, gt_epsilon=None,
         check_stat - band statistics (tuple), stat_epsilon - statistics
         tolerance."""
         if self.testDriver() == 'fail':
-            return 'skip'
+            pytest.skip()
 
         if self.filename_absolute:
             wrk_filename = self.filename
@@ -446,9 +446,8 @@ def testOpen(self, check_prj=None, check_gt=None, gt_epsilon=None,
             return 'success'
         if self.chksum is None or chksum == self.chksum:
             return 'success'
-        post_reason('Checksum for band %d in "%s" is %d, but expected %d.'
+        pytest.fail('Checksum for band %d in "%s" is %d, but expected %d.'
                     % (self.band, self.filename, chksum, self.chksum))
-        return 'fail'
 
     def testCreateCopy(self, check_minmax=1, check_gt=0, check_srs=None,
                        vsimem=0, new_filename=None, strict_in=0,
@@ -457,7 +456,7 @@ def testCreateCopy(self, check_minmax=1, check_gt=0, check_srs=None,
                        dest_open_options=None, quiet_error_handler=True):
 
         if self.testDriver() == 'fail':
-            return 'skip'
+            pytest.skip()
 
         if self.filename_absolute:
             wrk_filename = self.filename
@@ -501,10 +500,9 @@ def testCreateCopy(self, check_minmax=1, check_gt=0, check_srs=None,
                 self.driver.Delete(new_filename)
                 gdal.PopErrorHandler()
                 return 'success'
-            post_reason('CreateCopy() should have failed due to interruption')
             new_ds = None
             self.driver.Delete(new_filename)
-            return 'fail'
+            pytest.fail('CreateCopy() should have failed due to interruption')
 
         assert new_ds is not None, ('Failed to create test file using CreateCopy method.' +
                         '\n' + gdal.GetLastErrorMsg())
@@ -517,10 +515,9 @@ def testCreateCopy(self, check_minmax=1, check_gt=0, check_srs=None,
             if check_checksum_not_null is True:
                 assert bnd.Checksum() != 0, 'Got null checksum on still-open file.'
             elif self.chksum is not None and bnd.Checksum() != self.chksum:
-                post_reason(
+                pytest.fail(
                     'Did not get expected checksum on still-open file.\n'
                     '    Got %d instead of %d.' % (bnd.Checksum(), self.chksum))
-                return 'fail'
             if check_minmax:
                 got_minmax = bnd.ComputeRasterMinMax()
                 assert got_minmax == minmax, \
@@ -544,10 +541,9 @@ def testCreateCopy(self, check_minmax=1, check_gt=0, check_srs=None,
             if check_checksum_not_null is True:
                 assert bnd.Checksum() != 0, 'Got null checksum on reopened file.'
             elif self.chksum_after_reopening is not None and bnd.Checksum() not in self.chksum_after_reopening:
-                post_reason('Did not get expected checksum on reopened file.\n'
+                pytest.fail('Did not get expected checksum on reopened file.\n'
                             '    Got %d instead of %s.'
                             % (bnd.Checksum(), str(self.chksum_after_reopening)))
-                return 'fail'
 
             if check_minmax:
                 got_minmax = bnd.ComputeRasterMinMax()
@@ -597,7 +593,7 @@ def testCreateCopy(self, check_minmax=1, check_gt=0, check_srs=None,
     def testCreate(self, vsimem=0, new_filename=None, out_bands=1,
                    check_minmax=1, dest_open_options=None):
         if self.testDriver() == 'fail':
-            return 'skip'
+            pytest.skip()
 
         if self.filename_absolute:
             wrk_filename = self.filename
@@ -631,8 +627,7 @@ def testCreate(self, vsimem=0, new_filename=None, out_bands=1,
             for band in range(1, out_bands + 1):
                 new_ds.GetRasterBand(band).WriteRaster(0, 0, xsize, ysize, src_img)
         except:
-            post_reason('Failed to write raster bands to test file.')
-            return 'fail'
+            pytest.fail('Failed to write raster bands to test file.')
 
         for band in range(1, out_bands + 1):
             assert self.chksum is None or new_ds.GetRasterBand(band).Checksum() == self.chksum, \
@@ -670,7 +665,7 @@ def testCreate(self, vsimem=0, new_filename=None, out_bands=1,
 
     def testSetGeoTransform(self):
         if self.testDriver() == 'fail':
-            return 'skip'
+            pytest.skip()
 
         wrk_filename = 'data/' + self.filename
         if self.open_options:
@@ -717,7 +712,7 @@ def testSetGeoTransform(self):
 
     def testSetProjection(self, prj=None, expected_prj=None):
         if self.testDriver() == 'fail':
-            return 'skip'
+            pytest.skip()
 
         wrk_filename = 'data/' + self.filename
         if self.open_options:
@@ -774,7 +769,7 @@ def testSetProjection(self, prj=None, expected_prj=None):
 
     def testSetMetadata(self):
         if self.testDriver() == 'fail':
-            return 'skip'
+            pytest.skip()
 
         wrk_filename = 'data/' + self.filename
         if self.open_options:
@@ -817,7 +812,7 @@ def testSetMetadata(self):
 
     def testSetNoDataValue(self, delete=False):
         if self.testDriver() == 'fail':
-            return 'skip'
+            pytest.skip()
 
         wrk_filename = 'data/' + self.filename
         if self.open_options:
@@ -874,7 +869,7 @@ def testSetNoDataValueAndDelete(self):
 
     def testSetDescription(self):
         if self.testDriver() == 'fail':
-            return 'skip'
+            pytest.skip()
 
         wrk_filename = 'data/' + self.filename
         if self.open_options:
@@ -910,7 +905,7 @@ def testSetDescription(self):
 
     def testSetUnitType(self):
         if self.testDriver() == 'fail':
-            return 'skip'
+            pytest.skip()
 
         wrk_filename = 'data/' + self.filename
         if self.open_options:
diff --git a/autotest/pymod/ogrtest.py b/autotest/pymod/ogrtest.py
index 6309d9eb7223..c5359ba7b857 100644
--- a/autotest/pymod/ogrtest.py
+++ b/autotest/pymod/ogrtest.py
@@ -25,6 +25,7 @@
 ###############################################################################
 
 import sys
+import pytest
 
 sys.path.append('../pymod')
 
@@ -171,15 +172,15 @@ def compare_layers(lyr, lyr_ref, excluded_fields=None):
         f = lyr.GetNextFeature()
         if f is None:
             f_ref.DumpReadable()
-            return 'fail'
+            pytest.fail()
         if check_feature(f, f_ref, excluded_fields=excluded_fields) != 0:
             f.DumpReadable()
             f_ref.DumpReadable()
-            return 'fail'
+            pytest.fail()
     f = lyr.GetNextFeature()
     if f is not None:
         f.DumpReadable()
-        return 'fail'
+        pytest.fail()
     return 'success'
 
 ###############################################################################
diff --git a/autotest/pyscripts/test_gdal2tiles.py b/autotest/pyscripts/test_gdal2tiles.py
index da1e90423ffd..73037529a7be 100755
--- a/autotest/pyscripts/test_gdal2tiles.py
+++ b/autotest/pyscripts/test_gdal2tiles.py
@@ -37,12 +37,13 @@
 from osgeo import gdal      # noqa
 import gdaltest             # noqa  # pylint: disable=E0401
 import test_py_scripts      # noqa  # pylint: disable=E0401
+import pytest
 
 
 def test_gdal2tiles_py_simple():
     script_path = test_py_scripts.get_py_script('gdal2tiles')
     if script_path is None:
-        return 'skip'
+        pytest.skip()
 
     shutil.copy('../gdrivers/data/small_world.tif', 'tmp/out_gdal2tiles_smallworld.tif')
 
@@ -60,10 +61,9 @@ def test_gdal2tiles_py_simple():
     expected_cs = [25314, 28114, 6148, 59026]
     for i in range(4):
         if ds.GetRasterBand(i + 1).Checksum() != expected_cs[i]:
-            gdaltest.post_reason('wrong checksum for band %d' % (i + 1))
             for j in range(4):
                 print(ds.GetRasterBand(j + 1).Checksum())
-            return 'fail'
+            pytest.fail('wrong checksum for band %d' % (i + 1))
 
     ds = None
 
@@ -78,7 +78,7 @@ def test_gdal2tiles_py_zoom_option():
 
     script_path = test_py_scripts.get_py_script('gdal2tiles')
     if script_path is None:
-        return 'skip'
+        pytest.skip()
 
     shutil.rmtree('tmp/out_gdal2tiles_smallworld', ignore_errors=True)
 
@@ -95,10 +95,9 @@ def test_gdal2tiles_py_zoom_option():
     expected_cs = [8130, 10496, 65274, 63715]
     for i in range(4):
         if ds.GetRasterBand(i + 1).Checksum() != expected_cs[i]:
-            gdaltest.post_reason('wrong checksum for band %d' % (i + 1))
             for j in range(4):
                 print(ds.GetRasterBand(j + 1).Checksum())
-            return 'fail'
+            pytest.fail('wrong checksum for band %d' % (i + 1))
 
     ds = None
 
@@ -124,7 +123,7 @@ def test_does_not_error_when_source_bounds_close_to_tiles_bound():
 
     script_path = test_py_scripts.get_py_script('gdal2tiles')
     if script_path is None:
-        return 'skip'
+        pytest.skip()
 
     try:
         for in_file in in_files:
@@ -133,10 +132,9 @@ def test_does_not_error_when_source_bounds_close_to_tiles_bound():
                 'gdal2tiles',
                 '-q -z 21-21 %s %s' % (in_file, out_folder))
     except TypeError:
-        gdaltest.post_reason(
+        pytest.fail(
             'Case of tile not getting any data not handled properly '
             '(tiles at the border of the image)')
-        return 'fail'
 
     return 'success'
 
@@ -155,7 +153,7 @@ def test_does_not_error_when_nothing_to_put_in_the_low_zoom_tile():
 
     script_path = test_py_scripts.get_py_script('gdal2tiles')
     if script_path is None:
-        return 'skip'
+        pytest.skip()
 
     try:
         test_py_scripts.run_py_script(
@@ -163,24 +161,23 @@ def test_does_not_error_when_nothing_to_put_in_the_low_zoom_tile():
             'gdal2tiles',
             '-q -z 10 %s %s' % (in_file, out_folder))
     except TypeError:
-        gdaltest.post_reason(
+        pytest.fail(
             'Case of low level tile not getting any data not handled properly '
             '(tile at a zoom level too low)')
-        return 'fail'
 
     return 'success'
 
 
 def test_python2_handles_utf8_by_default():
     if sys.version_info[0] >= 3:
-        return 'skip'
+        pytest.skip()
 
     return _test_utf8(should_raise_unicode=False)
 
 
 def test_python2_gives_warning_if_bad_lc_ctype_and_non_ascii_chars():
     if sys.version_info[0] >= 3:
-        return 'skip'
+        pytest.skip()
 
     lc_ctype = os.environ.get("LC_CTYPE", "")
     os.environ['LC_CTYPE'] = 'fr_FR.latin-1'
@@ -194,7 +191,7 @@ def test_python2_gives_warning_if_bad_lc_ctype_and_non_ascii_chars():
 
 def test_python2_does_not_give_warning_if_bad_lc_ctype_and_all_ascii_chars():
     if sys.version_info[0] >= 3:
-        return 'skip'
+        pytest.skip()
 
     lc_ctype = os.environ.get("LC_CTYPE", "")
     os.environ['LC_CTYPE'] = 'fr_FR.latin-1'
@@ -210,7 +207,7 @@ def test_python2_does_not_give_warning_if_bad_lc_ctype_and_all_ascii_chars():
 
 def test_python2_does_not_give_warning_if_bad_lc_ctype_and_non_ascii_chars_in_folder():
     if sys.version_info[0] >= 3:
-        return 'skip'
+        pytest.skip()
 
     lc_ctype = os.environ.get("LC_CTYPE", "")
     os.environ['LC_CTYPE'] = 'fr_FR.latin-1'
@@ -226,7 +223,7 @@ def test_python2_does_not_give_warning_if_bad_lc_ctype_and_non_ascii_chars_in_fo
 
 def test_python3_handle_utf8_by_default():
     if sys.version_info[0] < 3:
-        return 'skip'
+        pytest.skip()
 
     return _test_utf8(should_raise_unicode=False)
 
@@ -237,7 +234,7 @@ def _test_utf8(should_raise_unicode=False,
                input_file="data/test_utf8_漢字.vrt"):
     script_path = test_py_scripts.get_py_script('gdal2tiles')
     if script_path is None:
-        return 'skip'
+        pytest.skip()
 
     out_folder = 'tmp/utf8_test'
 
@@ -256,8 +253,7 @@ def _test_utf8(should_raise_unicode=False,
     except UnicodeEncodeError:
         if should_raise_unicode:
             return 'success'
-        gdaltest.post_reason('Should be handling filenames with utf8 characters in this context')
-        return 'fail'
+        pytest.fail('Should be handling filenames with utf8 characters in this context')
 
     assert not should_raise_unicode, \
         'Should not be handling filenames with utf8 characters in this context'
@@ -292,7 +288,7 @@ def test_gdal2tiles_py_cleanup():
 def test_exclude_transparent_tiles():
     script_path = test_py_scripts.get_py_script('gdal2tiles')
     if script_path is None:
-        return 'skip'
+        pytest.skip()
 
     output_folder = 'tmp/test_exclude_transparent_tiles'
     os.makedirs(output_folder)
diff --git a/autotest/pyscripts/test_gdal_calc.py b/autotest/pyscripts/test_gdal_calc.py
index 859dbe1b2693..81f183a3ce1e 100755
--- a/autotest/pyscripts/test_gdal_calc.py
+++ b/autotest/pyscripts/test_gdal_calc.py
@@ -38,6 +38,7 @@
 from osgeo import gdal
 import gdaltest
 import test_py_scripts
+import pytest
 
 # test that gdalnumeric is available, if not skip all tests
 gdalnumeric_not_available = False
@@ -56,12 +57,11 @@
 def test_gdal_calc_py_1():
 
     if gdalnumeric_not_available:
-        gdaltest.post_reason('gdalnumeric is not available, skipping all tests')
-        return 'skip'
+        pytest.skip('gdalnumeric is not available, skipping all tests')
 
     script_path = test_py_scripts.get_py_script('gdal_calc')
     if script_path is None:
-        return 'skip'
+        pytest.skip()
 
     shutil.copy('../gcore/data/stefan_full_rgba.tif', 'tmp/test_gdal_calc_py.tif')
 
@@ -94,11 +94,11 @@ def test_gdal_calc_py_1():
 def test_gdal_calc_py_2():
 
     if gdalnumeric_not_available:
-        return 'skip'
+        pytest.skip()
 
     script_path = test_py_scripts.get_py_script('gdal_calc')
     if script_path is None:
-        return 'skip'
+        pytest.skip()
 
     test_py_scripts.run_py_script(script_path, 'gdal_calc', '-A tmp/test_gdal_calc_py.tif --A_band 1 -B tmp/test_gdal_calc_py.tif --B_band 2 --calc=A+B --overwrite --outfile tmp/test_gdal_calc_py_2_1.tif')
     test_py_scripts.run_py_script(script_path, 'gdal_calc', '-A tmp/test_gdal_calc_py.tif --A_band 1 -B tmp/test_gdal_calc_py.tif --B_band 2 --calc=A*B --overwrite --outfile tmp/test_gdal_calc_py_2_2.tif')
@@ -127,11 +127,11 @@ def test_gdal_calc_py_2():
 def test_gdal_calc_py_3():
 
     if gdalnumeric_not_available:
-        return 'skip'
+        pytest.skip()
 
     script_path = test_py_scripts.get_py_script('gdal_calc')
     if script_path is None:
-        return 'skip'
+        pytest.skip()
 
     test_py_scripts.run_py_script(script_path, 'gdal_calc', '-A tmp/test_gdal_calc_py.tif --allBands A --calc=A --overwrite --outfile tmp/test_gdal_calc_py_3.tif')
 
@@ -154,11 +154,11 @@ def test_gdal_calc_py_3():
 def test_gdal_calc_py_4():
 
     if gdalnumeric_not_available:
-        return 'skip'
+        pytest.skip()
 
     script_path = test_py_scripts.get_py_script('gdal_calc')
     if script_path is None:
-        return 'skip'
+        pytest.skip()
 
     # some values are clipped to 255, but this doesn't matter... small values were visually checked
     test_py_scripts.run_py_script(script_path, 'gdal_calc', '-A tmp/test_gdal_calc_py.tif --calc=1 --overwrite --outfile tmp/test_gdal_calc_py_4_1.tif')
@@ -194,12 +194,11 @@ def test_gdal_calc_py_4():
 def test_gdal_calc_py_5():
 
     if gdalnumeric_not_available:
-        gdaltest.post_reason('gdalnumeric is not available, skipping all tests')
-        return 'skip'
+        pytest.skip('gdalnumeric is not available, skipping all tests')
 
     script_path = test_py_scripts.get_py_script('gdal_calc')
     if script_path is None:
-        return 'skip'
+        pytest.skip()
 
     backup_sys_path = sys.path
     sys.path.insert(0, script_path)
@@ -238,12 +237,11 @@ def test_gdal_calc_py_5():
 def test_gdal_calc_py_6():
 
     if gdalnumeric_not_available:
-        gdaltest.post_reason('gdalnumeric is not available, skipping all tests')
-        return 'skip'
+        pytest.skip('gdalnumeric is not available, skipping all tests')
 
     script_path = test_py_scripts.get_py_script('gdal_calc')
     if script_path is None:
-        return 'skip'
+        pytest.skip()
 
     backup_sys_path = sys.path
     sys.path.insert(0, script_path)
@@ -268,12 +266,11 @@ def test_gdal_calc_py_6():
 
 def test_gdal_calc_py_7():
     if gdalnumeric_not_available:
-        gdaltest.post_reason('gdalnumeric is not available, skipping all tests')
-        return 'skip'
+        pytest.skip('gdalnumeric is not available, skipping all tests')
 
     script_path = test_py_scripts.get_py_script('gdal_calc')
     if script_path is None:
-        return 'skip'
+        pytest.skip()
 
     shutil.copy('../gcore/data/stefan_full_rgba.tif', 'tmp/test_gdal_calc_py.tif')
 
diff --git a/autotest/pyscripts/test_gdal_edit.py b/autotest/pyscripts/test_gdal_edit.py
index af958befddc4..c5e6ccb4ee13 100755
--- a/autotest/pyscripts/test_gdal_edit.py
+++ b/autotest/pyscripts/test_gdal_edit.py
@@ -37,6 +37,7 @@
 from osgeo import gdal
 import gdaltest
 import test_py_scripts
+import pytest
 
 # Usage: gdal_edit [--help-general] [-a_srs srs_def] [-a_ullr ulx uly lrx lry]
 #                 [-tr xres yres] [-a_nodata value]
@@ -52,7 +53,7 @@ def test_gdal_edit_py_1():
 
     script_path = test_py_scripts.get_py_script('gdal_edit')
     if script_path is None:
-        return 'skip'
+        pytest.skip()
 
     shutil.copy('../gcore/data/byte.tif', 'tmp/test_gdal_edit_py.tif')
 
@@ -100,7 +101,7 @@ def test_gdal_edit_py_2():
 
     script_path = test_py_scripts.get_py_script('gdal_edit')
     if script_path is None:
-        return 'skip'
+        pytest.skip()
 
     shutil.copy('../gcore/data/byte.tif', 'tmp/test_gdal_edit_py.tif')
 
@@ -125,7 +126,7 @@ def test_gdal_edit_py_3():
 
     script_path = test_py_scripts.get_py_script('gdal_edit')
     if script_path is None:
-        return 'skip'
+        pytest.skip()
 
     shutil.copy('../gcore/data/byte.tif', 'tmp/test_gdal_edit_py.tif')
 
@@ -150,7 +151,7 @@ def test_gdal_edit_py_4():
 
     script_path = test_py_scripts.get_py_script('gdal_edit')
     if script_path is None:
-        return 'skip'
+        pytest.skip()
 
     shutil.copy('../gcore/data/byte.tif', 'tmp/test_gdal_edit_py.tif')
     ds = gdal.Open('tmp/test_gdal_edit_py.tif', gdal.GA_Update)
@@ -175,7 +176,7 @@ def test_gdal_edit_py_4():
 
     try:
         os.stat('tmp/test_gdal_edit_py.tif.aux.xml')
-        return 'fail'
+        pytest.fail()
     except OSError:
         pass
 
@@ -189,13 +190,13 @@ def test_gdal_edit_py_5():
 
     script_path = test_py_scripts.get_py_script('gdal_edit')
     if script_path is None:
-        return 'skip'
+        pytest.skip()
 
     try:
         from osgeo import gdalnumeric
         gdalnumeric.BandRasterIONumPy
     except:
-        return 'skip'
+        pytest.skip()
 
     shutil.copy('../gcore/data/byte.tif', 'tmp/test_gdal_edit_py.tif')
     ds = gdal.Open('tmp/test_gdal_edit_py.tif', gdal.GA_Update)
@@ -245,7 +246,7 @@ def test_gdal_edit_py_6():
 
     script_path = test_py_scripts.get_py_script('gdal_edit')
     if script_path is None:
-        return 'skip'
+        pytest.skip()
 
     shutil.copy('../gcore/data/byte.tif', 'tmp/test_gdal_edit_py.tif')
 
@@ -286,7 +287,7 @@ def test_gdal_edit_py_7():
 
     script_path = test_py_scripts.get_py_script('gdal_edit')
     if script_path is None:
-        return 'skip'
+        pytest.skip()
 
     shutil.copy('../gcore/data/byte.tif', 'tmp/test_gdal_edit_py.tif')
 
@@ -306,7 +307,7 @@ def test_gdal_edit_py_8():
 
     script_path = test_py_scripts.get_py_script('gdal_edit')
     if script_path is None:
-        return 'skip'
+        pytest.skip()
 
     gdal.Translate('tmp/test_gdal_edit_py.tif',
                    '../gcore/data/byte.tif',
@@ -331,7 +332,7 @@ def test_gdal_edit_py_unsetrpc():
 
     script_path = test_py_scripts.get_py_script('gdal_edit')
     if script_path is None:
-        return 'skip'
+        pytest.skip()
 
     gdal.Translate('tmp/test_gdal_edit_py.tif', '../gcore/data/byte_rpc.tif')
 
diff --git a/autotest/pyscripts/test_gdal_fillnodata.py b/autotest/pyscripts/test_gdal_fillnodata.py
index d4f7c06cb2d9..728374dc8346 100755
--- a/autotest/pyscripts/test_gdal_fillnodata.py
+++ b/autotest/pyscripts/test_gdal_fillnodata.py
@@ -36,6 +36,7 @@
 from osgeo import gdal
 import gdaltest
 import test_py_scripts
+import pytest
 
 ###############################################################################
 # Dummy test : there is no nodata value in the source dataset !
@@ -45,7 +46,7 @@ def test_gdal_fillnodata_1():
 
     script_path = test_py_scripts.get_py_script('gdal_fillnodata')
     if script_path is None:
-        return 'skip'
+        pytest.skip()
 
     test_py_scripts.run_py_script(script_path, 'gdal_fillnodata', '../gcore/data/byte.tif tmp/test_gdal_fillnodata_1.tif')
 
@@ -64,7 +65,7 @@ def test_gdal_fillnodata_2():
 
     script_path = test_py_scripts.get_py_script('gdal_fillnodata')
     if script_path is None:
-        return 'skip'
+        pytest.skip()
 
     test_py_scripts.run_py_script(script_path, 'gdal_fillnodata', '../gcore/data/nodata_byte.tif tmp/test_gdal_fillnodata_2.tif')
 
diff --git a/autotest/pyscripts/test_gdal_ls_py.py b/autotest/pyscripts/test_gdal_ls_py.py
index c2d7e0b9e490..58884cd387e1 100755
--- a/autotest/pyscripts/test_gdal_ls_py.py
+++ b/autotest/pyscripts/test_gdal_ls_py.py
@@ -35,6 +35,7 @@
 
 import gdaltest
 import test_py_scripts
+import pytest
 
 ###############################################################################
 
@@ -113,13 +114,12 @@ def test_gdal_ls_py_4():
     ret, ret_str = run_gdal_ls(['', '-l', '/vsizip/../ogr/data/poly.zip'])
 
     if ret_str.find('-r--r--r--  1 unknown unknown          415 2008-02-11 21:35 /vsizip/../ogr/data/poly.zip/poly.PRJ') == -1:
-        print(ret_str)
         if gdaltest.skip_on_travis():
             # FIXME
             # Fails on Travis with dates at 1970-01-01 00:00
             # Looks like a 32/64bit issue with Python bindings of VSIStatL()
-            return 'skip'
-        return 'fail'
+            pytest.skip()
+        pytest.fail(ret_str)
 
     return 'success'
 
@@ -131,19 +131,18 @@ def test_gdal_ls_py_5():
 
     drv = gdal.GetDriverByName('HTTP')
     if drv is None:
-        return 'skip'
+        pytest.skip()
 
     if int(gdal.VersionInfo('VERSION_NUM')) < 1900:
-        gdaltest.post_reason('would stall for a long time')
-        return 'skip'
+        pytest.skip('would stall for a long time')
 
     f = gdal.VSIFOpenL('/vsicurl/https://raw.githubusercontent.com/OSGeo/gdal/master/autotest/ogr/data/poly.zip', 'rb')
     if f is None:
-        return 'skip'
+        pytest.skip()
     d = gdal.VSIFReadL(1, 1, f)
     gdal.VSIFCloseL(f)
     if not d:
-        return 'skip'
+        pytest.skip()
 
     # ret, ret_str = run_gdal_ls(['', '-R', 'https://raw.githubusercontent.com/OSGeo/gdal/master/autotest/ogr/data/'])
     #
@@ -164,26 +163,25 @@ def test_gdal_ls_py_6():
 
     drv = gdal.GetDriverByName('HTTP')
     if drv is None:
-        return 'skip'
+        pytest.skip()
 
     f = gdal.VSIFOpenL('/vsicurl/https://raw.githubusercontent.com/OSGeo/gdal/master/autotest/ogr/data/poly.zip', 'rb')
     if f is None:
-        return 'skip'
+        pytest.skip()
     d = gdal.VSIFReadL(1, 1, f)
     gdal.VSIFCloseL(f)
     if not d:
-        return 'skip'
+        pytest.skip()
 
     ret, ret_str = run_gdal_ls(['', '-l', '/vsizip/vsicurl/https://raw.githubusercontent.com/OSGeo/gdal/master/autotest/ogr/data/poly.zip'])
 
     if ret_str.find('-r--r--r--  1 unknown unknown          415 2008-02-11 21:35 /vsizip/vsicurl/https://raw.githubusercontent.com/OSGeo/gdal/master/autotest/ogr/data/poly.zip/poly.PRJ') == -1:
-        print(ret_str)
         if gdaltest.skip_on_travis():
             # FIXME
             # Fails on Travis with dates at 1970-01-01 00:00
             # Looks like a 32/64bit issue with Python bindings of VSIStatL()
-            return 'skip'
-        return 'fail'
+            pytest.skip()
+        pytest.fail(ret_str)
 
     return 'success'
 
@@ -195,24 +193,22 @@ def test_gdal_ls_py_7():
 
     # Super slow on AppVeyor since a few weeks (Apr 2016)
     if gdal.GetConfigOption('APPVEYOR') is not None:
-        print('Slow on AppVeyor')
-        return 'skip'
+        pytest.skip('Slow on AppVeyor')
 
     drv = gdal.GetDriverByName('HTTP')
     if drv is None:
-        return 'skip'
+        pytest.skip()
 
     if int(gdal.VersionInfo('VERSION_NUM')) < 1900:
-        gdaltest.post_reason('would stall for a long time')
-        return 'skip'
+        pytest.skip('would stall for a long time')
 
     f = gdal.VSIFOpenL('/vsicurl/https://raw.githubusercontent.com/OSGeo/gdal/master/autotest/ogr/data/poly.zip', 'rb')
     if f is None:
-        return 'skip'
+        pytest.skip()
     d = gdal.VSIFReadL(1, 1, f)
     gdal.VSIFCloseL(f)
     if not d:
-        return 'skip'
+        pytest.skip()
 
     # ret, ret_str = run_gdal_ls(['', '-R', '-Rzip', 'https://raw.githubusercontent.com/OSGeo/gdal/master/autotest/ogr/data/'])
 
@@ -231,23 +227,22 @@ def test_gdal_ls_py_7():
 
 def test_gdal_ls_py_8():
     if not gdaltest.run_slow_tests():
-        return 'skip'
+        pytest.skip()
 
     drv = gdal.GetDriverByName('HTTP')
     if drv is None:
-        return 'skip'
+        pytest.skip()
 
     if int(gdal.VersionInfo('VERSION_NUM')) < 1900:
-        gdaltest.post_reason('would stall for a long time')
-        return 'skip'
+        pytest.skip('would stall for a long time')
 
     f = gdal.VSIFOpenL('/vsicurl/https://raw.githubusercontent.com/OSGeo/gdal/master/autotest/ogr/data/poly.zip', 'rb')
     if f is None:
-        return 'skip'
+        pytest.skip()
     d = gdal.VSIFReadL(1, 1, f)
     gdal.VSIFCloseL(f)
     if not d:
-        return 'skip'
+        pytest.skip()
 
     ret, ret_str = run_gdal_ls(['', '-l', '-R', '-Rzip', 'ftp://download.osgeo.org/gdal/data/aig'])
 
diff --git a/autotest/pyscripts/test_gdal_merge.py b/autotest/pyscripts/test_gdal_merge.py
index 790d1961f9f1..d4bd2bd488b9 100755
--- a/autotest/pyscripts/test_gdal_merge.py
+++ b/autotest/pyscripts/test_gdal_merge.py
@@ -37,6 +37,7 @@
 from osgeo import osr
 import gdaltest
 import test_py_scripts
+import pytest
 
 ###############################################################################
 # Basic test
@@ -46,7 +47,7 @@ def test_gdal_merge_1():
 
     script_path = test_py_scripts.get_py_script('gdal_merge')
     if script_path is None:
-        return 'skip'
+        pytest.skip()
 
     test_py_scripts.run_py_script(script_path, 'gdal_merge', '-o tmp/test_gdal_merge_1.tif ../gcore/data/byte.tif')
 
@@ -64,7 +65,7 @@ def test_gdal_merge_2():
 
     script_path = test_py_scripts.get_py_script('gdal_merge')
     if script_path is None:
-        return 'skip'
+        pytest.skip()
 
     drv = gdal.GetDriverByName('GTiff')
     srs = osr.SpatialReference()
@@ -124,7 +125,7 @@ def test_gdal_merge_3():
 
     script_path = test_py_scripts.get_py_script('gdal_merge')
     if script_path is None:
-        return 'skip'
+        pytest.skip()
 
     test_py_scripts.run_py_script(script_path, 'gdal_merge', '-separate -v -o tmp/test_gdal_merge_3.tif tmp/in1.tif tmp/in2.tif tmp/in3.tif tmp/in4.tif')
 
@@ -155,7 +156,7 @@ def test_gdal_merge_4():
 
     script_path = test_py_scripts.get_py_script('gdal_merge')
     if script_path is None:
-        return 'skip'
+        pytest.skip()
 
     test_py_scripts.run_py_script(script_path, 'gdal_merge', '-init 255 -o tmp/test_gdal_merge_4.tif tmp/in2.tif tmp/in3.tif')
 
@@ -174,11 +175,11 @@ def test_gdal_merge_5():
         from osgeo import gdalnumeric
         gdalnumeric.BandRasterIONumPy
     except (ImportError, AttributeError):
-        return 'skip'
+        pytest.skip()
 
     script_path = test_py_scripts.get_py_script('gdal_merge')
     if script_path is None:
-        return 'skip'
+        pytest.skip()
 
     drv = gdal.GetDriverByName('GTiff')
     srs = osr.SpatialReference()
diff --git a/autotest/pyscripts/test_gdal_pansharpen.py b/autotest/pyscripts/test_gdal_pansharpen.py
index 8712eacd01ed..334dca213d70 100755
--- a/autotest/pyscripts/test_gdal_pansharpen.py
+++ b/autotest/pyscripts/test_gdal_pansharpen.py
@@ -35,6 +35,7 @@
 from osgeo import gdal
 import gdaltest
 import test_py_scripts
+import pytest
 
 ###############################################################################
 # Simple test
@@ -44,7 +45,7 @@ def test_gdal_pansharpen_1():
 
     script_path = test_py_scripts.get_py_script('gdal_pansharpen')
     if script_path is None:
-        return 'skip'
+        pytest.skip()
 
     src_ds = gdal.Open('../gdrivers/data/small_world.tif')
     src_data = src_ds.GetRasterBand(1).ReadRaster()
@@ -79,7 +80,7 @@ def test_gdal_pansharpen_2():
 
     script_path = test_py_scripts.get_py_script('gdal_pansharpen')
     if script_path is None:
-        return 'skip'
+        pytest.skip()
 
     test_py_scripts.run_py_script(script_path, 'gdal_pansharpen', ' -q -b 3 -b 1 -bitdepth 8 -threads ALL_CPUS -spat_adjust union -w 0.33333333333333333 -w 0.33333333333333333 -w 0.33333333333333333 -of VRT -r cubic tmp/small_world_pan.tif ../gdrivers/data/small_world.tif,band=1 ../gdrivers/data/small_world.tif,band=2 ../gdrivers/data/small_world.tif,band=3 tmp/out.vrt')
 
@@ -100,7 +101,7 @@ def test_gdal_pansharpen_cleanup():
 
     script_path = test_py_scripts.get_py_script('gdal_pansharpen')
     if script_path is None:
-        return 'skip'
+        pytest.skip()
 
     gdal.GetDriverByName('GTiff').Delete('tmp/small_world_pan.tif')
 
diff --git a/autotest/pyscripts/test_gdal_polygonize.py b/autotest/pyscripts/test_gdal_polygonize.py
index 6a3c23192e1e..a0b8b56c1800 100755
--- a/autotest/pyscripts/test_gdal_polygonize.py
+++ b/autotest/pyscripts/test_gdal_polygonize.py
@@ -38,6 +38,7 @@
 import test_py_scripts
 
 from osgeo import ogr
+import pytest
 
 ###############################################################################
 # Test a fairly simple case, with nodata masking.
@@ -47,7 +48,7 @@ def test_gdal_polygonize_1():
 
     script_path = test_py_scripts.get_py_script('gdal_polygonize')
     if script_path is None:
-        return 'skip'
+        pytest.skip()
 
     # Create a OGR datasource to put results in.
     shp_drv = ogr.GetDriverByName('ESRI Shapefile')
@@ -105,7 +106,7 @@ def test_gdal_polygonize_2():
 
     script_path = test_py_scripts.get_py_script('gdal_polygonize')
     if script_path is None:
-        return 'skip'
+        pytest.skip()
 
     shp_drv = ogr.GetDriverByName('ESRI Shapefile')
     try:
@@ -141,11 +142,11 @@ def test_gdal_polygonize_3():
 
     script_path = test_py_scripts.get_py_script('gdal_polygonize')
     if script_path is None:
-        return 'skip'
+        pytest.skip()
 
     drv = ogr.GetDriverByName('GPKG')
     if drv is None:
-        return 'skip'
+        pytest.skip()
     try:
         os.stat('tmp/out.gpkg')
         drv.DeleteDataSource('tmp/out.gpkg')
@@ -168,8 +169,7 @@ def test_gdal_polygonize_3():
 
     if geom_is_polygon:
         return 'success'
-    gdaltest.post_reason('GetGeomType() returned %d instead of %d or %d (ogr.wkbPolygon or ogr.wkbMultiPolygon)' % (geom_type, ogr.wkbPolygon, ogr.wkbMultiPolygon))
-    return 'fail'
+    pytest.fail('GetGeomType() returned %d instead of %d or %d (ogr.wkbPolygon or ogr.wkbMultiPolygon)' % (geom_type, ogr.wkbPolygon, ogr.wkbMultiPolygon))
 
 ###############################################################################
 # Test -b mask
@@ -179,7 +179,7 @@ def test_gdal_polygonize_4():
 
     script_path = test_py_scripts.get_py_script('gdal_polygonize')
     if script_path is None:
-        return 'skip'
+        pytest.skip()
 
     # Test mask syntax
     test_py_scripts.run_py_script(script_path, 'gdal_polygonize', '-q -f GML -b mask ../gcore/data/byte.tif tmp/out.gml')
diff --git a/autotest/pyscripts/test_gdal_proximity.py b/autotest/pyscripts/test_gdal_proximity.py
index 5ee936941ba5..a5da11877ad3 100755
--- a/autotest/pyscripts/test_gdal_proximity.py
+++ b/autotest/pyscripts/test_gdal_proximity.py
@@ -47,7 +47,7 @@ def test_gdal_proximity_1():
 
     script_path = test_py_scripts.get_py_script('gdal_proximity')
     if script_path is None:
-        return 'skip'
+        pytest.skip()
 
     drv = gdal.GetDriverByName('GTiff')
     dst_ds = drv.Create('tmp/proximity_1.tif', 25, 25, 1, gdal.GDT_Byte)
@@ -77,7 +77,7 @@ def test_gdal_proximity_2():
 
     script_path = test_py_scripts.get_py_script('gdal_proximity')
     if script_path is None:
-        return 'skip'
+        pytest.skip()
 
     test_py_scripts.run_py_script(script_path, 'gdal_proximity', '-q -values 65,64 -maxdist 12 -nodata -1 -fixed-buf-val 255 ../alg/data/pat.tif tmp/proximity_2.tif')
 
@@ -103,7 +103,7 @@ def test_gdal_proximity_3():
 
     script_path = test_py_scripts.get_py_script('gdal_proximity')
     if script_path is None:
-        return 'skip'
+        pytest.skip()
 
     test_py_scripts.run_py_script(script_path, 'gdal_proximity', '-q -values 65,64 -maxdist 12 -nodata 0 -use_input_nodata yes ../alg/data/pat.tif tmp/proximity_3.tif')
 
diff --git a/autotest/pyscripts/test_gdal_retile.py b/autotest/pyscripts/test_gdal_retile.py
index 90ef1d90e887..ea7902bc1a6d 100755
--- a/autotest/pyscripts/test_gdal_retile.py
+++ b/autotest/pyscripts/test_gdal_retile.py
@@ -37,6 +37,7 @@
 from osgeo import osr
 import gdaltest
 import test_py_scripts
+import pytest
 
 ###############################################################################
 # Test gdal_retile.py
@@ -46,7 +47,7 @@ def test_gdal_retile_1():
 
     script_path = test_py_scripts.get_py_script('gdal_retile')
     if script_path is None:
-        return 'skip'
+        pytest.skip()
 
     try:
         os.mkdir('tmp/outretile')
@@ -83,7 +84,7 @@ def test_gdal_retile_2():
 
     script_path = test_py_scripts.get_py_script('gdal_retile')
     if script_path is None:
-        return 'skip'
+        pytest.skip()
 
     try:
         os.mkdir('tmp/outretile2')
@@ -107,7 +108,7 @@ def test_gdal_retile_3():
 
     script_path = test_py_scripts.get_py_script('gdal_retile')
     if script_path is None:
-        return 'skip'
+        pytest.skip()
 
     drv = gdal.GetDriverByName('GTiff')
     srs = osr.SpatialReference()
@@ -183,7 +184,7 @@ def test_gdal_retile_4():
 
     script_path = test_py_scripts.get_py_script('gdal_retile')
     if script_path is None:
-        return 'skip'
+        pytest.skip()
 
     try:
         os.mkdir('tmp/outretile4')
diff --git a/autotest/pyscripts/test_gdal_sieve.py b/autotest/pyscripts/test_gdal_sieve.py
index 1c8f868a0b94..79f98798ab6f 100755
--- a/autotest/pyscripts/test_gdal_sieve.py
+++ b/autotest/pyscripts/test_gdal_sieve.py
@@ -46,7 +46,7 @@ def test_gdal_sieve_1():
 
     script_path = test_py_scripts.get_py_script('gdal_sieve')
     if script_path is None:
-        return 'skip'
+        pytest.skip()
 
     drv = gdal.GetDriverByName('GTiff')
     dst_ds = drv.Create('tmp/sieve_1.tif', 5, 7, 1, gdal.GDT_Byte)
diff --git a/autotest/pyscripts/test_gdalinfo_py.py b/autotest/pyscripts/test_gdalinfo_py.py
index db24624f1453..090581cbc600 100755
--- a/autotest/pyscripts/test_gdalinfo_py.py
+++ b/autotest/pyscripts/test_gdalinfo_py.py
@@ -34,6 +34,7 @@
 
 import gdaltest
 import test_py_scripts
+import pytest
 
 ###############################################################################
 # Simple test
@@ -43,7 +44,7 @@ def test_gdalinfo_py_1():
 
     script_path = test_py_scripts.get_py_script('gdalinfo')
     if script_path is None:
-        return 'skip'
+        pytest.skip()
 
     ret = test_py_scripts.run_py_script(script_path, 'gdalinfo', '../gcore/data/byte.tif')
     assert ret.find('Driver: GTiff/GeoTIFF') != -1
@@ -57,7 +58,7 @@ def test_gdalinfo_py_1():
 def test_gdalinfo_py_2():
     script_path = test_py_scripts.get_py_script('gdalinfo')
     if script_path is None:
-        return 'skip'
+        pytest.skip()
 
     ret = test_py_scripts.run_py_script(script_path, 'gdalinfo', '-checksum ../gcore/data/byte.tif')
     assert ret.find('Checksum=4672') != -1
@@ -71,7 +72,7 @@ def test_gdalinfo_py_2():
 def test_gdalinfo_py_3():
     script_path = test_py_scripts.get_py_script('gdalinfo')
     if script_path is None:
-        return 'skip'
+        pytest.skip()
 
     ret = test_py_scripts.run_py_script(script_path, 'gdalinfo', '../gcore/data/byte.tif')
     assert ret.find('Metadata') != -1
@@ -88,7 +89,7 @@ def test_gdalinfo_py_3():
 def test_gdalinfo_py_4():
     script_path = test_py_scripts.get_py_script('gdalinfo')
     if script_path is None:
-        return 'skip'
+        pytest.skip()
 
     ret = test_py_scripts.run_py_script(script_path, 'gdalinfo', '../gdrivers/data/bug407.gif')
     assert ret.find('0: 255,255,255,255') != -1
@@ -105,7 +106,7 @@ def test_gdalinfo_py_4():
 def test_gdalinfo_py_5():
     script_path = test_py_scripts.get_py_script('gdalinfo')
     if script_path is None:
-        return 'skip'
+        pytest.skip()
 
     try:
         os.remove('../gcore/data/byte.tif.aux.xml')
@@ -130,7 +131,7 @@ def test_gdalinfo_py_5():
 def test_gdalinfo_py_6():
     script_path = test_py_scripts.get_py_script('gdalinfo')
     if script_path is None:
-        return 'skip'
+        pytest.skip()
 
     ret = test_py_scripts.run_py_script(script_path, 'gdalinfo', '../gdrivers/data/int.img')
     assert ret.find('Overviews') != -1
@@ -146,7 +147,7 @@ def test_gdalinfo_py_6():
 def test_gdalinfo_py_7():
     script_path = test_py_scripts.get_py_script('gdalinfo')
     if script_path is None:
-        return 'skip'
+        pytest.skip()
 
     ret = test_py_scripts.run_py_script(script_path, 'gdalinfo', '../gcore/data/gcps.vrt')
     assert ret.find('GCP Projection =') != -1
@@ -168,7 +169,7 @@ def test_gdalinfo_py_7():
 def test_gdalinfo_py_8():
     script_path = test_py_scripts.get_py_script('gdalinfo')
     if script_path is None:
-        return 'skip'
+        pytest.skip()
 
     try:
         os.remove('../gcore/data/byte.tif.aux.xml')
@@ -195,7 +196,7 @@ def test_gdalinfo_py_8():
 def test_gdalinfo_py_9():
     script_path = test_py_scripts.get_py_script('gdalinfo')
     if script_path is None:
-        return 'skip'
+        pytest.skip()
 
     ret = test_py_scripts.run_py_script(script_path, 'gdalinfo', '../gdrivers/data/fake_nsif.ntf')
     assert ret.find('BLOCKA=010000001000000000') == -1, 'Got unexpected extra MD.'
@@ -212,7 +213,7 @@ def test_gdalinfo_py_9():
 def test_gdalinfo_py_10():
     script_path = test_py_scripts.get_py_script('gdalinfo')
     if script_path is None:
-        return 'skip'
+        pytest.skip()
 
     ret = test_py_scripts.run_py_script(script_path, 'gdalinfo', '../gcore/data/byte.tif')
     assert ret.find('Computed Min/Max=74.000,255.000') == -1
diff --git a/autotest/pyscripts/test_gdalmove.py b/autotest/pyscripts/test_gdalmove.py
index 175691a98a63..0282b0988269 100755
--- a/autotest/pyscripts/test_gdalmove.py
+++ b/autotest/pyscripts/test_gdalmove.py
@@ -36,6 +36,7 @@
 from osgeo import gdal
 import gdaltest
 import test_py_scripts
+import pytest
 
 ###############################################################################
 #
@@ -45,7 +46,7 @@ def test_gdalmove_1():
 
     script_path = test_py_scripts.get_py_script('gdalmove')
     if script_path is None:
-        return 'skip'
+        pytest.skip()
 
     shutil.copy('../gcore/data/byte.tif', 'tmp/test_gdalmove_1.tif')
 
diff --git a/autotest/pyscripts/test_ogr2ogr_py.py b/autotest/pyscripts/test_ogr2ogr_py.py
index 7501d8c1099b..a924d9f6ad96 100755
--- a/autotest/pyscripts/test_ogr2ogr_py.py
+++ b/autotest/pyscripts/test_ogr2ogr_py.py
@@ -32,6 +32,7 @@
 import sys
 import os
 import shutil
+import pytest
 
 sys.path.append('../ogr')
 
@@ -50,7 +51,7 @@
 def test_ogr2ogr_py_1():
     script_path = test_py_scripts.get_py_script('ogr2ogr')
     if script_path is None:
-        return 'skip'
+        pytest.skip()
 
     try:
         os.stat('tmp/poly.shp')
@@ -81,7 +82,7 @@ def test_ogr2ogr_py_1():
 def test_ogr2ogr_py_2():
     script_path = test_py_scripts.get_py_script('ogr2ogr')
     if script_path is None:
-        return 'skip'
+        pytest.skip()
 
     try:
         os.stat('tmp/poly.shp')
@@ -106,7 +107,7 @@ def test_ogr2ogr_py_2():
 def test_ogr2ogr_py_3():
     script_path = test_py_scripts.get_py_script('ogr2ogr')
     if script_path is None:
-        return 'skip'
+        pytest.skip()
 
     try:
         os.stat('tmp/poly.shp')
@@ -134,7 +135,7 @@ def test_ogr2ogr_py_3():
 def test_ogr2ogr_py_4():
     script_path = test_py_scripts.get_py_script('ogr2ogr')
     if script_path is None:
-        return 'skip'
+        pytest.skip()
 
     try:
         os.stat('tmp/poly.shp')
@@ -159,7 +160,7 @@ def test_ogr2ogr_py_4():
 def test_ogr2ogr_py_5():
     script_path = test_py_scripts.get_py_script('ogr2ogr')
     if script_path is None:
-        return 'skip'
+        pytest.skip()
 
     try:
         os.stat('tmp/poly.shp')
@@ -195,13 +196,13 @@ def test_ogr2ogr_py_6():
 
     script_path = test_py_scripts.get_py_script('ogr2ogr')
     if script_path is None:
-        return 'skip'
+        pytest.skip()
     if test_cli_utilities.get_ogrinfo_path() is None:
-        return 'skip'
+        pytest.skip()
 
     ogr_pg.ogr_pg_1()
     if gdaltest.pg_ds is None:
-        return 'skip'
+        pytest.skip()
     gdaltest.pg_ds.Destroy()
 
     gdaltest.runexternal(test_cli_utilities.get_ogrinfo_path() + ' PG:"' + gdaltest.pg_connection_string + '" -sql "DELLAYER:tpoly"')
@@ -227,13 +228,13 @@ def test_ogr2ogr_py_7():
 
     script_path = test_py_scripts.get_py_script('ogr2ogr')
     if script_path is None:
-        return 'skip'
+        pytest.skip()
     if test_cli_utilities.get_ogrinfo_path() is None:
-        return 'skip'
+        pytest.skip()
 
     ogr_pg.ogr_pg_1()
     if gdaltest.pg_ds is None:
-        return 'skip'
+        pytest.skip()
     gdaltest.pg_ds.Destroy()
 
     gdaltest.runexternal(test_cli_utilities.get_ogrinfo_path() + ' PG:"' + gdaltest.pg_connection_string + '" -sql "DELLAYER:tpoly"')
@@ -255,7 +256,7 @@ def test_ogr2ogr_py_7():
 def test_ogr2ogr_py_8():
     script_path = test_py_scripts.get_py_script('ogr2ogr')
     if script_path is None:
-        return 'skip'
+        pytest.skip()
 
     try:
         os.stat('tmp/poly.shp')
@@ -280,7 +281,7 @@ def test_ogr2ogr_py_8():
 def test_ogr2ogr_py_9():
     script_path = test_py_scripts.get_py_script('ogr2ogr')
     if script_path is None:
-        return 'skip'
+        pytest.skip()
 
     try:
         os.stat('tmp/poly.shp')
@@ -305,7 +306,7 @@ def test_ogr2ogr_py_9():
 def test_ogr2ogr_py_10():
     script_path = test_py_scripts.get_py_script('ogr2ogr')
     if script_path is None:
-        return 'skip'
+        pytest.skip()
 
     try:
         os.stat('tmp/poly.shp')
@@ -344,7 +345,7 @@ def test_ogr2ogr_py_11():
 
     script_path = test_py_scripts.get_py_script('ogr2ogr')
     if script_path is None:
-        return 'skip'
+        pytest.skip()
 
     try:
         os.stat('tmp/poly.shp')
@@ -370,7 +371,7 @@ def test_ogr2ogr_py_12():
 
     script_path = test_py_scripts.get_py_script('ogr2ogr')
     if script_path is None:
-        return 'skip'
+        pytest.skip()
 
     try:
         os.stat('tmp/poly.shp')
@@ -395,7 +396,7 @@ def test_ogr2ogr_py_12():
 def test_ogr2ogr_py_13():
     script_path = test_py_scripts.get_py_script('ogr2ogr')
     if script_path is None:
-        return 'skip'
+        pytest.skip()
 
     try:
         os.stat('tmp/poly.shp')
@@ -420,7 +421,7 @@ def test_ogr2ogr_py_13():
 def test_ogr2ogr_py_14():
     script_path = test_py_scripts.get_py_script('ogr2ogr')
     if script_path is None:
-        return 'skip'
+        pytest.skip()
 
     try:
         os.stat('tmp/poly.shp')
@@ -448,7 +449,7 @@ def test_ogr2ogr_py_15():
 
     script_path = test_py_scripts.get_py_script('ogr2ogr')
     if script_path is None:
-        return 'skip'
+        pytest.skip()
 
     try:
         os.stat('tmp/poly.shp')
@@ -479,7 +480,7 @@ def test_ogr2ogr_py_15():
 def test_ogr2ogr_py_16():
     script_path = test_py_scripts.get_py_script('ogr2ogr')
     if script_path is None:
-        return 'skip'
+        pytest.skip()
 
     try:
         os.stat('tmp/poly.shp')
@@ -508,7 +509,7 @@ def test_ogr2ogr_py_16():
 def test_ogr2ogr_py_17():
     script_path = test_py_scripts.get_py_script('ogr2ogr')
     if script_path is None:
-        return 'skip'
+        pytest.skip()
 
     try:
         os.stat('tmp/poly.shp')
@@ -533,10 +534,10 @@ def test_ogr2ogr_py_17():
 def test_ogr2ogr_py_18():
     script_path = test_py_scripts.get_py_script('ogr2ogr')
     if script_path is None:
-        return 'skip'
+        pytest.skip()
 
     if not ogrtest.have_geos():
-        return 'skip'
+        pytest.skip()
 
     try:
         os.stat('tmp/wrapdateline_src.shp')
@@ -585,10 +586,10 @@ def test_ogr2ogr_py_18():
 def test_ogr2ogr_py_19():
     script_path = test_py_scripts.get_py_script('ogr2ogr')
     if script_path is None:
-        return 'skip'
+        pytest.skip()
 
     if not ogrtest.have_geos():
-        return 'skip'
+        pytest.skip()
 
     try:
         os.stat('tmp/poly.shp')
@@ -619,7 +620,7 @@ def test_ogr2ogr_py_19():
 def test_ogr2ogr_py_20():
     script_path = test_py_scripts.get_py_script('ogr2ogr')
     if script_path is None:
-        return 'skip'
+        pytest.skip()
 
     try:
         os.remove('tmp/Fields.dbf')
@@ -664,10 +665,9 @@ def test_ogr2ogr_py_20():
     assert ds is not None
     layer_defn = ds.GetLayer(0).GetLayerDefn()
     if layer_defn.GetFieldCount() != 15:
-        gdaltest.post_reason('Unexpected field count: ' + str(ds.GetLayer(0).GetLayerDefn().GetFieldCount()))
         ds.Destroy()
         ogr.GetDriverByName('ESRI Shapefile').DeleteDataSource('tmp/Fields.dbf')
-        return 'fail'
+        pytest.fail('Unexpected field count: ' + str(ds.GetLayer(0).GetLayerDefn().GetFieldCount()))
 
     error_occurred = False
     feat = ds.GetLayer(0).GetNextFeature()
@@ -694,7 +694,7 @@ def test_ogr2ogr_py_20():
 def test_ogr2ogr_py_21():
     script_path = test_py_scripts.get_py_script('ogr2ogr')
     if script_path is None:
-        return 'skip'
+        pytest.skip()
 
     try:
         os.remove('tmp/testogr2ogr21.gtm')
@@ -712,11 +712,10 @@ def test_ogr2ogr_py_21():
     feat = lyr.GetNextFeature()
     if feat.GetFieldAsString('name') != 'NAME' or \
        feat.GetFieldAsString('comment') != 'COMMENT':
-        print(feat.GetFieldAsString('name'))
         print(feat.GetFieldAsString('comment'))
         ds.Destroy()
         os.remove('tmp/testogr2ogr21.gtm')
-        return 'fail'
+        pytest.fail(feat.GetFieldAsString('name'))
 
     ds.Destroy()
     os.remove('tmp/testogr2ogr21.gtm')
@@ -730,7 +729,7 @@ def test_ogr2ogr_py_21():
 def test_ogr2ogr_py_22():
     script_path = test_py_scripts.get_py_script('ogr2ogr')
     if script_path is None:
-        return 'skip'
+        pytest.skip()
 
     test_py_scripts.run_py_script(script_path, 'ogr2ogr',
                                   '-f "MapInfo File" tmp/testogr2ogr22.mif ../utilities/data/dataforogr2ogr21.csv ' +
@@ -743,11 +742,10 @@ def test_ogr2ogr_py_22():
     feat = lyr.GetNextFeature()
     if feat.GetFieldAsString('name') != 'NAME' or \
        feat.GetFieldAsString('comment') != 'COMMENT':
-        print(feat.GetFieldAsString('name'))
         print(feat.GetFieldAsString('comment'))
         ds.Destroy()
         ogr.GetDriverByName('MapInfo File').DeleteDataSource('tmp/testogr2ogr22.mif')
-        return 'fail'
+        pytest.fail(feat.GetFieldAsString('name'))
 
     ds.Destroy()
     ogr.GetDriverByName('MapInfo File').DeleteDataSource('tmp/testogr2ogr22.mif')
@@ -761,9 +759,9 @@ def test_ogr2ogr_py_22():
 def test_ogr2ogr_py_23():
     script_path = test_py_scripts.get_py_script('ogr2ogr')
     if script_path is None:
-        return 'skip'
+        pytest.skip()
     if test_cli_utilities.get_ogr2ogr_path() is None:
-        return 'skip'
+        pytest.skip()
 
     gdaltest.runexternal(test_cli_utilities.get_ogr2ogr_path() +
                          ' -f "MapInfo File" tmp/testogr2ogr23.mif ../utilities/data/dataforogr2ogr21.csv ' +
@@ -776,11 +774,10 @@ def test_ogr2ogr_py_23():
     feat = lyr.GetNextFeature()
     if feat.GetFieldAsString('name') != 'NAME' or \
        feat.GetFieldAsString('comment') != 'COMMENT':
-        print(feat.GetFieldAsString('name'))
         print(feat.GetFieldAsString('comment'))
         ds.Destroy()
         ogr.GetDriverByName('MapInfo File').DeleteDataSource('tmp/testogr2ogr23.mif')
-        return 'fail'
+        pytest.fail(feat.GetFieldAsString('name'))
 
     ds.Destroy()
     ogr.GetDriverByName('MapInfo File').DeleteDataSource('tmp/testogr2ogr23.mif')
@@ -794,10 +791,10 @@ def test_ogr2ogr_py_23():
 def test_ogr2ogr_py_24():
     script_path = test_py_scripts.get_py_script('ogr2ogr')
     if script_path is None:
-        return 'skip'
+        pytest.skip()
 
     if not ogrtest.have_geos():
-        return 'skip'
+        pytest.skip()
 
     try:
         os.stat('tmp/poly.shp')
@@ -826,10 +823,10 @@ def test_ogr2ogr_py_24():
 def test_ogr2ogr_py_25():
     script_path = test_py_scripts.get_py_script('ogr2ogr')
     if script_path is None:
-        return 'skip'
+        pytest.skip()
 
     if not ogrtest.have_geos():
-        return 'skip'
+        pytest.skip()
 
     try:
         os.stat('tmp/poly.shp')
@@ -864,10 +861,10 @@ def test_ogr2ogr_py_25():
 def test_ogr2ogr_py_26():
     script_path = test_py_scripts.get_py_script('ogr2ogr')
     if script_path is None:
-        return 'skip'
+        pytest.skip()
 
     if not ogrtest.have_geos():
-        return 'skip'
+        pytest.skip()
 
     try:
         os.stat('tmp/poly.shp')
@@ -896,10 +893,10 @@ def test_ogr2ogr_py_26():
 def test_ogr2ogr_py_27():
     script_path = test_py_scripts.get_py_script('ogr2ogr')
     if script_path is None:
-        return 'skip'
+        pytest.skip()
 
     if not ogrtest.have_geos():
-        return 'skip'
+        pytest.skip()
 
     try:
         os.stat('tmp/poly.shp')
@@ -935,7 +932,7 @@ def test_ogr2ogr_py_31():
 
     script_path = test_py_scripts.get_py_script('ogr2ogr')
     if script_path is None:
-        return 'skip'
+        pytest.skip()
 
     try:
         os.stat('tmp/poly.shp')
@@ -960,7 +957,7 @@ def test_ogr2ogr_py_32():
 
     script_path = test_py_scripts.get_py_script('ogr2ogr')
     if script_path is None:
-        return 'skip'
+        pytest.skip()
 
     try:
         os.stat('tmp/test_ogr2ogr_32.shp')
@@ -993,7 +990,7 @@ def test_ogr2ogr_py_33():
 
     script_path = test_py_scripts.get_py_script('ogr2ogr')
     if script_path is None:
-        return 'skip'
+        pytest.skip()
 
     try:
         os.stat('tmp/test_ogr2ogr_33_src.csv')
@@ -1022,26 +1019,26 @@ def test_ogr2ogr_py_33():
     feat = lyr.GetFeature(0)
     if feat.GetField("foo") != 'bar':
         feat.DumpReadable()
-        return 'fail'
+        pytest.fail()
     if feat.GetGeometryRef().ExportToWkt() != 'POLYGON ((10 10,10 11,11 11,11 10,10 10))':
         feat.DumpReadable()
-        return 'fail'
+        pytest.fail()
 
     feat = lyr.GetFeature(1)
     if feat.GetField("foo") != 'bar':
         feat.DumpReadable()
-        return 'fail'
+        pytest.fail()
     if feat.GetGeometryRef().ExportToWkt() != 'POLYGON ((100 100,100 200,200 200,200 100,100 100),(125 125,175 125,175 175,125 175,125 125))':
         feat.DumpReadable()
-        return 'fail'
+        pytest.fail()
 
     feat = lyr.GetFeature(2)
     if feat.GetField("foo") != 'baz':
         feat.DumpReadable()
-        return 'fail'
+        pytest.fail()
     if feat.GetGeometryRef().ExportToWkt() != 'POLYGON ((0 0,0 1,1 1,1 0,0 0))':
         feat.DumpReadable()
-        return 'fail'
+        pytest.fail()
 
     ds = None
 
@@ -1059,7 +1056,7 @@ def test_ogr2ogr_py_34():
 
     script_path = test_py_scripts.get_py_script('ogr2ogr')
     if script_path is None:
-        return 'skip'
+        pytest.skip()
 
     try:
         os.stat('tmp/test_ogr2ogr_34_dir')
@@ -1098,7 +1095,7 @@ def test_ogr2ogr_py_35():
 
     script_path = test_py_scripts.get_py_script('ogr2ogr')
     if script_path is None:
-        return 'skip'
+        pytest.skip()
 
     try:
         os.stat('tmp/test_ogr2ogr_35_dir')
@@ -1137,7 +1134,7 @@ def test_ogr2ogr_py_36():
 
     script_path = test_py_scripts.get_py_script('ogr2ogr')
     if script_path is None:
-        return 'skip'
+        pytest.skip()
 
     try:
         os.stat('tmp/test_ogr2ogr_36.shp')
@@ -1166,7 +1163,7 @@ def test_ogr2ogr_py_37():
 
     script_path = test_py_scripts.get_py_script('ogr2ogr')
     if script_path is None:
-        return 'skip'
+        pytest.skip()
 
     try:
         os.stat('tmp/test_ogr2ogr_37_dir.shp')
@@ -1205,7 +1202,7 @@ def test_ogr2ogr_py_38():
 
     script_path = test_py_scripts.get_py_script('ogr2ogr')
     if script_path is None:
-        return 'skip'
+        pytest.skip()
 
     try:
         os.stat('tmp/test_ogr2ogr_38.shp')
@@ -1233,7 +1230,7 @@ def test_ogr2ogr_py_39():
 
     script_path = test_py_scripts.get_py_script('ogr2ogr')
     if script_path is None:
-        return 'skip'
+        pytest.skip()
 
     try:
         os.stat('tmp/test_ogr2ogr_39_dir.shp')
@@ -1271,7 +1268,7 @@ def test_ogr2ogr_py_43():
 
     script_path = test_py_scripts.get_py_script('ogr2ogr')
     if script_path is None:
-        return 'skip'
+        pytest.skip()
 
     try:
         os.stat('tmp/test_ogr2ogr_43_3d.shp')
@@ -1312,7 +1309,7 @@ def test_ogr2ogr_py_44():
 
     script_path = test_py_scripts.get_py_script('ogr2ogr')
     if script_path is None:
-        return 'skip'
+        pytest.skip()
 
     try:
         os.stat('tmp/test_ogr2ogr_44_src.shp')
@@ -1361,7 +1358,7 @@ def test_ogr2ogr_py_45():
 
     script_path = test_py_scripts.get_py_script('ogr2ogr')
     if script_path is None:
-        return 'skip'
+        pytest.skip()
 
     try:
         os.stat('tmp/test_ogr2ogr_44_src.shp')
@@ -1410,7 +1407,7 @@ def test_ogr2ogr_py_46():
 
     script_path = test_py_scripts.get_py_script('ogr2ogr')
     if script_path is None:
-        return 'skip'
+        pytest.skip()
 
     try:
         os.stat('tmp/test_ogr2ogr_45_src.shp')
diff --git a/autotest/pyscripts/test_ogrinfo_py.py b/autotest/pyscripts/test_ogrinfo_py.py
index a20cbd882030..a98cd708ad4d 100755
--- a/autotest/pyscripts/test_ogrinfo_py.py
+++ b/autotest/pyscripts/test_ogrinfo_py.py
@@ -35,6 +35,7 @@
 import gdaltest
 import ogrtest
 import test_py_scripts
+import pytest
 
 ###############################################################################
 # Simple test
@@ -43,7 +44,7 @@
 def test_ogrinfo_py_1():
     script_path = test_py_scripts.get_py_script('ogrinfo')
     if script_path is None:
-        return 'skip'
+        pytest.skip()
 
     ret = test_py_scripts.run_py_script(script_path, 'ogrinfo', '../ogr/data/poly.shp')
     assert ret.find('ESRI Shapefile') != -1
@@ -57,7 +58,7 @@ def test_ogrinfo_py_1():
 def test_ogrinfo_py_2():
     script_path = test_py_scripts.get_py_script('ogrinfo')
     if script_path is None:
-        return 'skip'
+        pytest.skip()
 
     ret = test_py_scripts.run_py_script(script_path, 'ogrinfo', '-ro ../ogr/data/poly.shp')
     assert ret.find('ESRI Shapefile') != -1
@@ -71,7 +72,7 @@ def test_ogrinfo_py_2():
 def test_ogrinfo_py_3():
     script_path = test_py_scripts.get_py_script('ogrinfo')
     if script_path is None:
-        return 'skip'
+        pytest.skip()
 
     ret = test_py_scripts.run_py_script(script_path, 'ogrinfo', '-al ../ogr/data/poly.shp')
     assert ret.find('Feature Count: 10') != -1
@@ -85,7 +86,7 @@ def test_ogrinfo_py_3():
 def test_ogrinfo_py_4():
     script_path = test_py_scripts.get_py_script('ogrinfo')
     if script_path is None:
-        return 'skip'
+        pytest.skip()
 
     ret = test_py_scripts.run_py_script(script_path, 'ogrinfo', '../ogr/data/poly.shp poly')
     assert ret.find('Feature Count: 10') != -1
@@ -99,7 +100,7 @@ def test_ogrinfo_py_4():
 def test_ogrinfo_py_5():
     script_path = test_py_scripts.get_py_script('ogrinfo')
     if script_path is None:
-        return 'skip'
+        pytest.skip()
 
     ret = test_py_scripts.run_py_script(script_path, 'ogrinfo', '../ogr/data/poly.shp -sql "select * from poly"')
     assert ret.find('Feature Count: 10') != -1
@@ -113,7 +114,7 @@ def test_ogrinfo_py_5():
 def test_ogrinfo_py_6():
     script_path = test_py_scripts.get_py_script('ogrinfo')
     if script_path is None:
-        return 'skip'
+        pytest.skip()
 
     ret = test_py_scripts.run_py_script(script_path, 'ogrinfo', '../ogr/data/poly.shp poly -geom=no')
     assert ret.find('Feature Count: 10') != -1
@@ -128,7 +129,7 @@ def test_ogrinfo_py_6():
 def test_ogrinfo_py_7():
     script_path = test_py_scripts.get_py_script('ogrinfo')
     if script_path is None:
-        return 'skip'
+        pytest.skip()
 
     ret = test_py_scripts.run_py_script(script_path, 'ogrinfo', '../ogr/data/poly.shp poly -geom=summary')
     assert ret.find('Feature Count: 10') != -1
@@ -144,7 +145,7 @@ def test_ogrinfo_py_7():
 def test_ogrinfo_py_8():
     script_path = test_py_scripts.get_py_script('ogrinfo')
     if script_path is None:
-        return 'skip'
+        pytest.skip()
 
     ret = test_py_scripts.run_py_script(script_path, 'ogrinfo', '../ogr/data/poly.shp poly -spat 479609 4764629 479764 4764817')
     if ogrtest.have_geos():
@@ -161,7 +162,7 @@ def test_ogrinfo_py_8():
 def test_ogrinfo_py_9():
     script_path = test_py_scripts.get_py_script('ogrinfo')
     if script_path is None:
-        return 'skip'
+        pytest.skip()
 
     ret = test_py_scripts.run_py_script(script_path, 'ogrinfo', '../ogr/data/poly.shp poly -where "EAS_ID=171"')
     assert ret.find('Feature Count: 1') != -1
@@ -175,7 +176,7 @@ def test_ogrinfo_py_9():
 def test_ogrinfo_py_10():
     script_path = test_py_scripts.get_py_script('ogrinfo')
     if script_path is None:
-        return 'skip'
+        pytest.skip()
 
     ret = test_py_scripts.run_py_script(script_path, 'ogrinfo', '../ogr/data/poly.shp poly -fid 9')
     assert ret.find('OGRFeature(poly):9') != -1
@@ -189,7 +190,7 @@ def test_ogrinfo_py_10():
 def test_ogrinfo_py_11():
     script_path = test_py_scripts.get_py_script('ogrinfo')
     if script_path is None:
-        return 'skip'
+        pytest.skip()
 
     ret = test_py_scripts.run_py_script(script_path, 'ogrinfo', '../ogr/data/poly.shp poly -fields=no')
     assert ret.find('AREA (Real') == -1
@@ -204,7 +205,7 @@ def test_ogrinfo_py_11():
 def test_ogrinfo_py_22():
     script_path = test_py_scripts.get_py_script('ogrinfo')
     if script_path is None:
-        return 'skip'
+        pytest.skip()
 
     f = open('tmp/test_ogrinfo_22.csv', 'wt')
     f.write('_WKTgeom1_EPSG_4326,_WKTgeom2_EPSG_32631\n')
@@ -284,7 +285,7 @@ def test_ogrinfo_py_22():
 def test_ogrinfo_py_23():
     script_path = test_py_scripts.get_py_script('ogrinfo')
     if script_path is None:
-        return 'skip'
+        pytest.skip()
 
     f = open('tmp/test_ogrinfo_23.csv', 'wt')
     f.write('_WKTgeom1_EPSG_4326,_WKTgeom2_EPSG_32631\n')
diff --git a/autotest/pyscripts/test_ogrmerge.py b/autotest/pyscripts/test_ogrmerge.py
index 5359d96ae6c0..68f4d8b026ce 100755
--- a/autotest/pyscripts/test_ogrmerge.py
+++ b/autotest/pyscripts/test_ogrmerge.py
@@ -35,6 +35,7 @@
 from osgeo import ogr
 import gdaltest
 import test_py_scripts
+import pytest
 
 ###############################################################################
 # Test -single
@@ -43,7 +44,7 @@
 def test_ogrmerge_1():
     script_path = test_py_scripts.get_py_script('ogrmerge')
     if script_path is None:
-        return 'skip'
+        pytest.skip()
 
     test_py_scripts.run_py_script(script_path, 'ogrmerge',
                                   '-single -o /vsimem/out.shp ../ogr/data/poly.shp ../ogr/data/poly.shp')
@@ -64,7 +65,7 @@ def test_ogrmerge_1():
 def test_ogrmerge_2():
     script_path = test_py_scripts.get_py_script('ogrmerge')
     if script_path is None:
-        return 'skip'
+        pytest.skip()
 
     test_py_scripts.run_py_script(script_path, 'ogrmerge',
                                   '-single -o /vsimem/out.shp ../ogr/data/poly.shp')
@@ -87,7 +88,7 @@ def test_ogrmerge_2():
 def test_ogrmerge_3():
     script_path = test_py_scripts.get_py_script('ogrmerge')
     if script_path is None:
-        return 'skip'
+        pytest.skip()
 
     test_py_scripts.run_py_script(script_path, 'ogrmerge',
                                   '-overwrite_ds -o /vsimem/out.shp ../ogr/data/poly.shp')
@@ -110,7 +111,7 @@ def test_ogrmerge_3():
 def test_ogrmerge_4():
     script_path = test_py_scripts.get_py_script('ogrmerge')
     if script_path is None:
-        return 'skip'
+        pytest.skip()
 
     test_py_scripts.run_py_script(script_path, 'ogrmerge',
                                   '-f VRT -o /vsimem/out.vrt ../ogr/data/poly.shp')
@@ -132,7 +133,7 @@ def test_ogrmerge_4():
 def test_ogrmerge_5():
     script_path = test_py_scripts.get_py_script('ogrmerge')
     if script_path is None:
-        return 'skip'
+        pytest.skip()
 
     test_py_scripts.run_py_script(script_path, 'ogrmerge',
                                   '-f VRT -o /vsimem/out.vrt ../ogr/data/poly.shp ../ogr/data/testpoly.shp -nln '
@@ -158,7 +159,7 @@ def test_ogrmerge_5():
 def test_ogrmerge_6():
     script_path = test_py_scripts.get_py_script('ogrmerge')
     if script_path is None:
-        return 'skip'
+        pytest.skip()
 
     test_py_scripts.run_py_script(script_path, 'ogrmerge',
                                   '-single -f VRT -o /vsimem/out.vrt ../ogr/data/poly.shp '
@@ -170,7 +171,7 @@ def test_ogrmerge_6():
     f = lyr.GetNextFeature()
     if f['source'] != 'foo_../ogr/data/poly.shp_poly_0_poly_0':
         f.DumpReadable()
-        return 'fail'
+        pytest.fail()
     ds = None
 
     gdal.Unlink('/vsimem/out.vrt')
@@ -184,7 +185,7 @@ def test_ogrmerge_6():
 def test_ogrmerge_7():
     script_path = test_py_scripts.get_py_script('ogrmerge')
     if script_path is None:
-        return 'skip'
+        pytest.skip()
 
     # No match in -single mode
     test_py_scripts.run_py_script(script_path, 'ogrmerge',
@@ -239,7 +240,7 @@ def test_ogrmerge_7():
 def test_ogrmerge_8():
     script_path = test_py_scripts.get_py_script('ogrmerge')
     if script_path is None:
-        return 'skip'
+        pytest.skip()
 
     test_py_scripts.run_py_script(script_path, 'ogrmerge',
                                   '-single -f VRT -o /vsimem/out.vrt ../ogr/data/poly.shp '
@@ -269,7 +270,7 @@ def test_ogrmerge_8():
 def test_ogrmerge_9():
     script_path = test_py_scripts.get_py_script('ogrmerge')
     if script_path is None:
-        return 'skip'
+        pytest.skip()
 
     test_py_scripts.run_py_script(script_path, 'ogrmerge',
                                   '-f VRT -o /vsimem/out.vrt ../ogr/data/poly.shp '
@@ -299,7 +300,7 @@ def test_ogrmerge_9():
 def test_ogrmerge_10():
     script_path = test_py_scripts.get_py_script('ogrmerge')
     if script_path is None:
-        return 'skip'
+        pytest.skip()
 
     test_py_scripts.run_py_script(script_path, 'ogrmerge',
                                   '-single -f VRT -o /vsimem/out.vrt ../ogr/data/poly.shp '
@@ -327,7 +328,7 @@ def test_ogrmerge_10():
 def test_ogrmerge_11():
     script_path = test_py_scripts.get_py_script('ogrmerge')
     if script_path is None:
-        return 'skip'
+        pytest.skip()
 
     test_py_scripts.run_py_script(script_path, 'ogrmerge',
                                   '-f VRT -o /vsimem/out.vrt ../ogr/data/poly.shp '
@@ -355,7 +356,7 @@ def test_ogrmerge_11():
 def test_ogrmerge_12():
     script_path = test_py_scripts.get_py_script('ogrmerge')
     if script_path is None:
-        return 'skip'
+        pytest.skip()
 
     with open('tmp/tmp.json', 'wt') as f:
         f.write("""{ "type": "FeatureCollection", "name": "\xc3\xa9ven", "features": [ { "type": "Feature", "properties": {}, "geometry": null} ]}""")
diff --git a/autotest/pyscripts/test_rgb2pct.py b/autotest/pyscripts/test_rgb2pct.py
index f6b598e9b440..11fe2bd89324 100755
--- a/autotest/pyscripts/test_rgb2pct.py
+++ b/autotest/pyscripts/test_rgb2pct.py
@@ -37,6 +37,7 @@
 from osgeo import gdal
 import gdaltest
 import test_py_scripts
+import pytest
 
 ###############################################################################
 # Test rgb2pct
@@ -46,7 +47,7 @@ def test_rgb2pct_1():
 
     script_path = test_py_scripts.get_py_script('rgb2pct')
     if script_path is None:
-        return 'skip'
+        pytest.skip()
 
     test_py_scripts.run_py_script(script_path, 'rgb2pct', '../gcore/data/rgbsmall.tif tmp/test_rgb2pct_1.tif')
 
@@ -65,11 +66,11 @@ def test_pct2rgb_1():
         from osgeo import gdalnumeric
         gdalnumeric.BandRasterIONumPy
     except:
-        return 'skip'
+        pytest.skip()
 
     script_path = test_py_scripts.get_py_script('pct2rgb')
     if script_path is None:
-        return 'skip'
+        pytest.skip()
 
     test_py_scripts.run_py_script(script_path, 'pct2rgb', 'tmp/test_rgb2pct_1.tif tmp/test_pct2rgb_1.tif')
 
@@ -93,7 +94,7 @@ def test_rgb2pct_2():
 
     script_path = test_py_scripts.get_py_script('rgb2pct')
     if script_path is None:
-        return 'skip'
+        pytest.skip()
 
     test_py_scripts.run_py_script(script_path, 'rgb2pct', '-n 16 ../gcore/data/rgbsmall.tif tmp/test_rgb2pct_2.tif')
 
@@ -118,7 +119,7 @@ def test_rgb2pct_3():
 
     script_path = test_py_scripts.get_py_script('rgb2pct')
     if script_path is None:
-        return 'skip'
+        pytest.skip()
 
     test_py_scripts.run_py_script(script_path, 'rgb2pct', '-pct tmp/test_rgb2pct_2.tif ../gcore/data/rgbsmall.tif tmp/test_rgb2pct_3.tif')
 
@@ -144,11 +145,11 @@ def test_pct2rgb_4():
         from osgeo import gdalnumeric
         gdalnumeric.BandRasterIONumPy
     except (ImportError, AttributeError):
-        return 'skip'
+        pytest.skip()
 
     script_path = test_py_scripts.get_py_script('pct2rgb')
     if script_path is None:
-        return 'skip'
+        pytest.skip()
 
     test_py_scripts.run_py_script(script_path, 'pct2rgb', '-rgba ../gcore/data/rat.img tmp/test_pct2rgb_4.tif')
 
diff --git a/autotest/utilities/test_gdal_contour.py b/autotest/utilities/test_gdal_contour.py
index b75e2bc83f60..7550f308bd0f 100755
--- a/autotest/utilities/test_gdal_contour.py
+++ b/autotest/utilities/test_gdal_contour.py
@@ -48,7 +48,7 @@
 
 def test_gdal_contour_1():
     if test_cli_utilities.get_gdal_contour_path() is None:
-        return 'skip'
+        pytest.skip()
 
     try:
         os.remove('tmp/contour.shp')
@@ -134,7 +134,7 @@ def test_gdal_contour_1():
 
 def test_gdal_contour_2():
     if test_cli_utilities.get_gdal_contour_path() is None:
-        return 'skip'
+        pytest.skip()
 
     try:
         os.remove('tmp/contour.shp')
@@ -191,7 +191,7 @@ def test_gdal_contour_2():
 
 def test_gdal_contour_3():
     if test_cli_utilities.get_gdal_contour_path() is None:
-        return 'skip'
+        pytest.skip()
 
     try:
         os.remove('tmp/contour.shp')
@@ -234,7 +234,7 @@ def test_gdal_contour_3():
 
 def test_gdal_contour_4():
     if test_cli_utilities.get_gdal_contour_path() is None:
-        return 'skip'
+        pytest.skip()
 
     try:
         os.remove('tmp/contour_orientation.shp')
@@ -335,7 +335,7 @@ def test_gdal_contour_4():
 
 def test_gdal_contour_5():
     if test_cli_utilities.get_gdal_contour_path() is None:
-        return 'skip'
+        pytest.skip()
 
     ds = None
 
@@ -380,7 +380,7 @@ def test_gdal_contour_5():
 
 def test_gdal_contour_cleanup():
     if test_cli_utilities.get_gdal_contour_path() is None:
-        return 'skip'
+        pytest.skip()
 
     ogr.GetDriverByName('ESRI Shapefile').DeleteDataSource('tmp/contour.shp')
     ogr.GetDriverByName('ESRI Shapefile').DeleteDataSource('tmp/contour_orientation1.shp')
diff --git a/autotest/utilities/test_gdal_grid.py b/autotest/utilities/test_gdal_grid.py
index 7f87763eb73e..92424edf6ad2 100755
--- a/autotest/utilities/test_gdal_grid.py
+++ b/autotest/utilities/test_gdal_grid.py
@@ -56,7 +56,7 @@
 
 def test_gdal_grid_1():
     if gdal_grid is None:
-        return 'skip'
+        pytest.skip()
 
     shape_drv = ogr.GetDriverByName('ESRI Shapefile')
     outfiles.append('tmp/n43.tif')
@@ -124,7 +124,7 @@ def test_gdal_grid_1():
 
 def test_gdal_grid_2():
     if gdal_grid is None:
-        return 'skip'
+        pytest.skip()
 
     # Open reference dataset
     ds_ref = gdal.Open('../gcore/data/byte.tif')
@@ -250,7 +250,7 @@ def test_gdal_grid_2():
 
 def test_gdal_grid_3():
     if gdal_grid is None:
-        return 'skip'
+        pytest.skip()
 
     #################
     # Test generic implementation (no AVX, no SSE)
@@ -275,8 +275,7 @@ def test_gdal_grid_3():
     maxdiff = gdaltest.compare_ds(ds, ds_ref, verbose=0)
     if maxdiff > 1:
         gdaltest.compare_ds(ds, ds_ref, verbose=1)
-        gdaltest.post_reason('Image too different from the reference')
-        return 'fail'
+        pytest.fail('Image too different from the reference')
     ds_ref = None
     ds = None
 
@@ -303,8 +302,7 @@ def test_gdal_grid_3():
     maxdiff = gdaltest.compare_ds(ds, ds_ref, verbose=0)
     if maxdiff > 1:
         gdaltest.compare_ds(ds, ds_ref, verbose=1)
-        gdaltest.post_reason('Image too different from the reference')
-        return 'fail'
+        pytest.fail('Image too different from the reference')
     ds_ref = None
     ds = None
 
@@ -331,8 +329,7 @@ def test_gdal_grid_3():
     maxdiff = gdaltest.compare_ds(ds, ds_ref, verbose=0)
     if maxdiff > 1:
         gdaltest.compare_ds(ds, ds_ref, verbose=1)
-        gdaltest.post_reason('Image too different from the reference')
-        return 'fail'
+        pytest.fail('Image too different from the reference')
     ds_ref = None
     ds = None
 
@@ -354,8 +351,7 @@ def test_gdal_grid_3():
     maxdiff = gdaltest.compare_ds(ds, ds_ref, verbose=0)
     if maxdiff > 1:
         gdaltest.compare_ds(ds, ds_ref, verbose=1)
-        gdaltest.post_reason('Image too different from the reference')
-        return 'fail'
+        pytest.fail('Image too different from the reference')
     ds_ref = None
     ds = None
 
@@ -377,8 +373,7 @@ def test_gdal_grid_3():
     maxdiff = gdaltest.compare_ds(ds, ds_ref, verbose=0)
     if maxdiff > 1:
         gdaltest.compare_ds(ds, ds_ref, verbose=1)
-        gdaltest.post_reason('Image too different from the reference')
-        return 'fail'
+        pytest.fail('Image too different from the reference')
     ds_ref = None
     ds = None
 
@@ -399,8 +394,7 @@ def test_gdal_grid_3():
     maxdiff = gdaltest.compare_ds(ds, ds_ref, verbose=0)
     if maxdiff > 1:
         gdaltest.compare_ds(ds, ds_ref, verbose=1)
-        gdaltest.post_reason('Image too different from the reference')
-        return 'fail'
+        pytest.fail('Image too different from the reference')
     ds_ref = None
     ds = None
 
@@ -412,7 +406,7 @@ def test_gdal_grid_3():
 
 def test_gdal_grid_4():
     if gdal_grid is None:
-        return 'skip'
+        pytest.skip()
 
     #################
     outfiles.append('tmp/grid_average.tif')
@@ -433,8 +427,7 @@ def test_gdal_grid_4():
     ds_ref = None
     if maxdiff > 1:
         gdaltest.compare_ds(ds, ds_ref, verbose=1)
-        gdaltest.post_reason('Image too different from the reference')
-        return 'fail'
+        pytest.fail('Image too different from the reference')
     ds = None
 
     #################
@@ -455,8 +448,7 @@ def test_gdal_grid_4():
     ds_ref = None
     if maxdiff > 1:
         gdaltest.compare_ds(ds, ds_ref, verbose=1)
-        gdaltest.post_reason('Image too different from the reference')
-        return 'fail'
+        pytest.fail('Image too different from the reference')
     ds = None
 
     #################
@@ -477,8 +469,7 @@ def test_gdal_grid_4():
     ds_ref = None
     if maxdiff > 1:
         gdaltest.compare_ds(ds, ds_ref, verbose=1)
-        gdaltest.post_reason('Image too different from the reference')
-        return 'fail'
+        pytest.fail('Image too different from the reference')
     ds = None
 
     #################
@@ -499,8 +490,7 @@ def test_gdal_grid_4():
     ds_ref = None
     if maxdiff > 1:
         gdaltest.compare_ds(ds, ds_ref, verbose=1)
-        gdaltest.post_reason('Image too different from the reference')
-        return 'fail'
+        pytest.fail('Image too different from the reference')
     ds = None
 
     return 'success'
@@ -511,7 +501,7 @@ def test_gdal_grid_4():
 
 def test_gdal_grid_5():
     if gdal_grid is None:
-        return 'skip'
+        pytest.skip()
 
     #################
     outfiles.append('tmp/grid_minimum.tif')
@@ -561,7 +551,7 @@ def test_gdal_grid_5():
 
 def test_gdal_grid_6():
     if gdal_grid is None:
-        return 'skip'
+        pytest.skip()
 
     #################
     outfiles.append('tmp/grid_maximum.tif')
@@ -611,7 +601,7 @@ def test_gdal_grid_6():
 
 def test_gdal_grid_7():
     if gdal_grid is None:
-        return 'skip'
+        pytest.skip()
 
     #################
     outfiles.append('tmp/grid_range.tif')
@@ -662,7 +652,7 @@ def test_gdal_grid_7():
 
 def test_gdal_grid_8():
     if gdal_grid is None:
-        return 'skip'
+        pytest.skip()
 
     #################
     outfiles.append('tmp/grid_count_70_70.tif')
@@ -710,7 +700,7 @@ def test_gdal_grid_8():
 
 def test_gdal_grid_9():
     if gdal_grid is None:
-        return 'skip'
+        pytest.skip()
 
     #################
     outfiles.append('tmp/grid_avdist.tif')
@@ -731,8 +721,7 @@ def test_gdal_grid_9():
     ds_ref = None
     if maxdiff > 1:
         gdaltest.compare_ds(ds, ds_ref, verbose=1)
-        gdaltest.post_reason('Image too different from the reference')
-        return 'fail'
+        pytest.fail('Image too different from the reference')
     ds = None
 
     #################
@@ -754,8 +743,7 @@ def test_gdal_grid_9():
     ds_ref = None
     if maxdiff > 1:
         gdaltest.compare_ds(ds, ds_ref, verbose=1)
-        gdaltest.post_reason('Image too different from the reference')
-        return 'fail'
+        pytest.fail('Image too different from the reference')
     ds = None
 
     return 'success'
@@ -766,7 +754,7 @@ def test_gdal_grid_9():
 
 def test_gdal_grid_10():
     if gdal_grid is None:
-        return 'skip'
+        pytest.skip()
 
     #################
     outfiles.append('tmp/grid_avdist_150_50_-15.tif')
@@ -787,8 +775,7 @@ def test_gdal_grid_10():
     ds_ref = None
     if maxdiff > 1:
         gdaltest.compare_ds(ds, ds_ref, verbose=1)
-        gdaltest.post_reason('Image too different from the reference')
-        return 'fail'
+        pytest.fail('Image too different from the reference')
     ds = None
 
     return 'success'
@@ -799,7 +786,7 @@ def test_gdal_grid_10():
 
 def test_gdal_grid_11():
     if gdal_grid is None:
-        return 'skip'
+        pytest.skip()
 
     outfiles.append('tmp/n43_linear.tif')
 
@@ -824,7 +811,7 @@ def test_gdal_grid_11():
 
 def test_gdal_grid_12():
     if gdal_grid is None:
-        return 'skip'
+        pytest.skip()
 
     #################
     # Test generic implementation (no AVX, no SSE)
@@ -843,8 +830,7 @@ def test_gdal_grid_12():
     maxdiff = gdaltest.compare_ds(ds, ds_ref, verbose=0)
     if maxdiff > 0.00001:
         gdaltest.compare_ds(ds, ds_ref, verbose=1)
-        gdaltest.post_reason('Image too different from the reference')
-        return 'fail'
+        pytest.fail('Image too different from the reference')
     ds_ref = None
     ds = None
 
@@ -865,8 +851,7 @@ def test_gdal_grid_12():
     maxdiff = gdaltest.compare_ds(ds, ds_ref, verbose=0)
     if maxdiff > 0.00001:
         gdaltest.compare_ds(ds, ds_ref, verbose=1)
-        gdaltest.post_reason('Image too different from the reference')
-        return 'fail'
+        pytest.fail('Image too different from the reference')
     ds_ref = None
     ds = None
 
@@ -887,8 +872,7 @@ def test_gdal_grid_12():
     maxdiff = gdaltest.compare_ds(ds, ds_ref, verbose=0)
     if maxdiff > 0.00001:
         gdaltest.compare_ds(ds, ds_ref, verbose=1)
-        gdaltest.post_reason('Image too different from the reference')
-        return 'fail'
+        pytest.fail('Image too different from the reference')
     ds_ref = None
     ds = None
 
@@ -900,10 +884,10 @@ def test_gdal_grid_12():
 
 def test_gdal_grid_clipsrc():
     if gdal_grid is None:
-        return 'skip'
+        pytest.skip()
 
     if not ogrtest.have_geos():
-        return 'skip'
+        pytest.skip()
 
     #################
     outfiles.append('tmp/grid_clipsrc.tif')
diff --git a/autotest/utilities/test_gdal_rasterize.py b/autotest/utilities/test_gdal_rasterize.py
index 828e795c0778..f970d039ac44 100755
--- a/autotest/utilities/test_gdal_rasterize.py
+++ b/autotest/utilities/test_gdal_rasterize.py
@@ -32,6 +32,7 @@
 
 import sys
 import os
+import pytest
 
 sys.path.append('../gcore')
 
@@ -48,7 +49,7 @@
 def test_gdal_rasterize_1():
 
     if test_cli_utilities.get_gdal_rasterize_path() is None:
-        return 'skip'
+        pytest.skip()
 
     # Setup working spatial reference
     # sr_wkt = 'LOCAL_CS["arbitrary"]'
@@ -124,7 +125,7 @@ def test_gdal_rasterize_1():
 def test_gdal_rasterize_2():
 
     if test_cli_utilities.get_gdal_rasterize_path() is None:
-        return 'skip'
+        pytest.skip()
 
     # Create a raster to rasterize into.
 
@@ -156,10 +157,10 @@ def test_gdal_rasterize_2():
 def test_gdal_rasterize_3():
 
     if test_cli_utilities.get_gdal_contour_path() is None:
-        return 'skip'
+        pytest.skip()
 
     if test_cli_utilities.get_gdal_rasterize_path() is None:
-        return 'skip'
+        pytest.skip()
 
     gdaltest.runexternal(test_cli_utilities.get_gdal_contour_path() + ' ../gdrivers/data/n43.dt0 tmp/n43dt0.shp -i 10 -3d')
 
@@ -191,10 +192,10 @@ def test_gdal_rasterize_3():
 def test_gdal_rasterize_4():
 
     if test_cli_utilities.get_gdal_contour_path() is None:
-        return 'skip'
+        pytest.skip()
 
     if test_cli_utilities.get_gdal_rasterize_path() is None:
-        return 'skip'
+        pytest.skip()
 
     gdal.GetDriverByName('GTiff').Delete('tmp/n43dt0.tif')
 
@@ -232,7 +233,7 @@ def test_gdal_rasterize_4():
 def test_gdal_rasterize_5():
 
     if test_cli_utilities.get_gdal_rasterize_path() is None:
-        return 'skip'
+        pytest.skip()
 
     f = open('tmp/test_gdal_rasterize_5.csv', 'wb')
     f.write("""x,y,Value
@@ -280,7 +281,7 @@ def test_gdal_rasterize_5():
 def test_gdal_rasterize_6():
 
     if test_cli_utilities.get_gdal_rasterize_path() is None:
-        return 'skip'
+        pytest.skip()
 
     f = open('tmp/test_gdal_rasterize_6.csv', 'wb')
     f.write("""WKT,Value
@@ -318,18 +319,18 @@ def test_gdal_rasterize_7():
         from osgeo import gdalnumeric
         gdalnumeric.zeros
     except (ImportError, AttributeError):
-        return 'skip'
+        pytest.skip()
 
     if test_cli_utilities.get_gdal_rasterize_path() is None:
-        return 'skip'
+        pytest.skip()
 
     drv = ogr.GetDriverByName('SQLite')
     if drv is None:
-        return 'skip'
+        pytest.skip()
     gdal.PushErrorHandler('CPLQuietErrorHandler')
     ds = drv.CreateDataSource('/vsimem/foo.db', options=['SPATIALITE=YES'])
     if ds is None:
-        return 'skip'
+        pytest.skip()
     ds = None
     gdal.Unlink('/vsimem/foo.db')
     gdal.PopErrorHandler()
@@ -368,7 +369,7 @@ def test_gdal_rasterize_7():
 def test_gdal_rasterize_8():
 
     if test_cli_utilities.get_gdal_rasterize_path() is None:
-        return 'skip'
+        pytest.skip()
 
     f = open('tmp/test_gdal_rasterize_8.csv', 'wb')
     f.write('WKT,Value\n'.encode('ascii'))
@@ -392,7 +393,7 @@ def test_gdal_rasterize_8():
 def test_gdal_rasterize_cleanup():
 
     if test_cli_utilities.get_gdal_rasterize_path() is None:
-        return 'skip'
+        pytest.skip()
 
     gdal.GetDriverByName('GTiff').Delete('tmp/rast1.tif')
     ogr.GetDriverByName('MapInfo File').DeleteDataSource('tmp/rast1.tab')
diff --git a/autotest/utilities/test_gdal_rasterize_lib.py b/autotest/utilities/test_gdal_rasterize_lib.py
index 9b74dee8bea1..50eb24549a5e 100755
--- a/autotest/utilities/test_gdal_rasterize_lib.py
+++ b/autotest/utilities/test_gdal_rasterize_lib.py
@@ -109,7 +109,7 @@ def test_gdal_rasterize_lib_3():
 
     import test_cli_utilities
     if test_cli_utilities.get_gdal_contour_path() is None:
-        return 'skip'
+        pytest.skip()
 
     gdaltest.runexternal(test_cli_utilities.get_gdal_contour_path() + ' ../gdrivers/data/n43.dt0 tmp/n43dt0.shp -i 10 -3d')
 
diff --git a/autotest/utilities/test_gdal_translate.py b/autotest/utilities/test_gdal_translate.py
index 2bafe750c389..541a45792721 100755
--- a/autotest/utilities/test_gdal_translate.py
+++ b/autotest/utilities/test_gdal_translate.py
@@ -36,6 +36,7 @@
 from osgeo import gdal
 import gdaltest
 import test_cli_utilities
+import pytest
 
 ###############################################################################
 # Simple test
@@ -43,7 +44,7 @@
 
 def test_gdal_translate_1():
     if test_cli_utilities.get_gdal_translate_path() is None:
-        return 'skip'
+        pytest.skip()
 
     (_, err) = gdaltest.runexternal_out_and_err(test_cli_utilities.get_gdal_translate_path() + ' ../gcore/data/byte.tif tmp/test1.tif')
     assert (err is None or err == ''), 'got error/warning'
@@ -63,7 +64,7 @@ def test_gdal_translate_1():
 
 def test_gdal_translate_2():
     if test_cli_utilities.get_gdal_translate_path() is None:
-        return 'skip'
+        pytest.skip()
 
     gdaltest.runexternal(test_cli_utilities.get_gdal_translate_path() + ' -of GTiff ../gcore/data/byte.tif tmp/test2.tif')
 
@@ -82,7 +83,7 @@ def test_gdal_translate_2():
 
 def test_gdal_translate_3():
     if test_cli_utilities.get_gdal_translate_path() is None:
-        return 'skip'
+        pytest.skip()
 
     gdaltest.runexternal(test_cli_utilities.get_gdal_translate_path() + ' -ot Int16 ../gcore/data/byte.tif tmp/test3.tif')
 
@@ -103,7 +104,7 @@ def test_gdal_translate_3():
 
 def test_gdal_translate_4():
     if test_cli_utilities.get_gdal_translate_path() is None:
-        return 'skip'
+        pytest.skip()
 
     gdaltest.runexternal(test_cli_utilities.get_gdal_translate_path() + ' -b 3 -b 2 -b 1 ../gcore/data/rgbsmall.tif tmp/test4.tif')
 
@@ -126,7 +127,7 @@ def test_gdal_translate_4():
 
 def test_gdal_translate_5():
     if test_cli_utilities.get_gdal_translate_path() is None:
-        return 'skip'
+        pytest.skip()
 
     gdaltest.runexternal(test_cli_utilities.get_gdal_translate_path() + ' -expand rgb ../gdrivers/data/bug407.gif tmp/test5.tif')
 
@@ -158,7 +159,7 @@ def test_gdal_translate_5():
 
 def test_gdal_translate_6():
     if test_cli_utilities.get_gdal_translate_path() is None:
-        return 'skip'
+        pytest.skip()
 
     gdaltest.runexternal(test_cli_utilities.get_gdal_translate_path() + ' -outsize 40 40 ../gcore/data/byte.tif tmp/test6.tif')
 
@@ -177,7 +178,7 @@ def test_gdal_translate_6():
 
 def test_gdal_translate_7():
     if test_cli_utilities.get_gdal_translate_path() is None:
-        return 'skip'
+        pytest.skip()
 
     gdaltest.runexternal(test_cli_utilities.get_gdal_translate_path() + ' -outsize 200% 200% ../gcore/data/byte.tif tmp/test7.tif')
 
@@ -196,7 +197,7 @@ def test_gdal_translate_7():
 
 def test_gdal_translate_8():
     if test_cli_utilities.get_gdal_translate_path() is None:
-        return 'skip'
+        pytest.skip()
 
     gdaltest.runexternal(test_cli_utilities.get_gdal_translate_path() + ' -a_srs EPSG:26711 -gcp 0 0  440720.000 3751320.000 -gcp 20 0 441920.000 3751320.000 -gcp 20 20 441920.000 3750120.000 0 -gcp 0 20 440720.000 3750120.000 ../gcore/data/byte.tif tmp/test8.tif')
 
@@ -220,7 +221,7 @@ def test_gdal_translate_8():
 
 def test_gdal_translate_9():
     if test_cli_utilities.get_gdal_translate_path() is None:
-        return 'skip'
+        pytest.skip()
 
     gdaltest.runexternal(test_cli_utilities.get_gdal_translate_path() + ' -a_nodata 1 ../gcore/data/byte.tif tmp/test9.tif')
 
@@ -239,7 +240,7 @@ def test_gdal_translate_9():
 
 def test_gdal_translate_10():
     if test_cli_utilities.get_gdal_translate_path() is None:
-        return 'skip'
+        pytest.skip()
 
     gdaltest.runexternal(test_cli_utilities.get_gdal_translate_path() + ' -srcwin 0 0 1 1 ../gcore/data/byte.tif tmp/test10.tif')
 
@@ -258,7 +259,7 @@ def test_gdal_translate_10():
 
 def test_gdal_translate_11():
     if test_cli_utilities.get_gdal_translate_path() is None:
-        return 'skip'
+        pytest.skip()
 
     gdaltest.runexternal(test_cli_utilities.get_gdal_translate_path() + ' -projwin 440720.000 3751320.000 441920.000 3750120.000 ../gcore/data/byte.tif tmp/test11.tif')
 
@@ -280,7 +281,7 @@ def test_gdal_translate_11():
 
 def test_gdal_translate_12():
     if test_cli_utilities.get_gdal_translate_path() is None:
-        return 'skip'
+        pytest.skip()
 
     gdaltest.runexternal(test_cli_utilities.get_gdal_translate_path() + ' -a_ullr 440720.000 3751320.000 441920.000 3750120.000 ../gcore/data/byte.tif tmp/test12.tif')
 
@@ -302,7 +303,7 @@ def test_gdal_translate_12():
 
 def test_gdal_translate_13():
     if test_cli_utilities.get_gdal_translate_path() is None:
-        return 'skip'
+        pytest.skip()
 
     gdaltest.runexternal(test_cli_utilities.get_gdal_translate_path() + ' -mo TIFFTAG_DOCUMENTNAME=test13 ../gcore/data/byte.tif tmp/test13.tif')
 
@@ -322,7 +323,7 @@ def test_gdal_translate_13():
 
 def test_gdal_translate_14():
     if test_cli_utilities.get_gdal_translate_path() is None:
-        return 'skip'
+        pytest.skip()
 
     gdaltest.runexternal(test_cli_utilities.get_gdal_translate_path() + ' -co COMPRESS=LZW ../gcore/data/byte.tif tmp/test14.tif')
 
@@ -342,7 +343,7 @@ def test_gdal_translate_14():
 
 def test_gdal_translate_15():
     if test_cli_utilities.get_gdal_translate_path() is None:
-        return 'skip'
+        pytest.skip()
 
     gdaltest.runexternal(test_cli_utilities.get_gdal_translate_path() + ' -sds ../gdrivers/data/A.TOC tmp/test15.tif')
 
@@ -359,7 +360,7 @@ def test_gdal_translate_15():
 
 def test_gdal_translate_16():
     if test_cli_utilities.get_gdal_translate_path() is None:
-        return 'skip'
+        pytest.skip()
 
     gdaltest.runexternal(test_cli_utilities.get_gdal_translate_path() + ' -of VRT ../gcore/data/byte.tif tmp/test16.vrt')
 
@@ -378,7 +379,7 @@ def test_gdal_translate_16():
 
 def test_gdal_translate_17():
     if test_cli_utilities.get_gdal_translate_path() is None:
-        return 'skip'
+        pytest.skip()
 
     gdaltest.runexternal(test_cli_utilities.get_gdal_translate_path() + ' -of VRT -expand rgba ../gdrivers/data/bug407.gif tmp/test17.vrt')
 
@@ -415,7 +416,7 @@ def test_gdal_translate_17():
 
 def test_gdal_translate_18():
     if test_cli_utilities.get_gdal_translate_path() is None:
-        return 'skip'
+        pytest.skip()
 
     gdaltest.runexternal(test_cli_utilities.get_gdal_translate_path() + ' ../gcore/data/8bit_pal.bmp -of VRT tmp/test18_1.vrt')
     gdaltest.runexternal(test_cli_utilities.get_gdal_translate_path() + ' tmp/test18_1.vrt -expand rgb -of VRT tmp/test18_2.vrt')
@@ -439,7 +440,7 @@ def test_gdal_translate_18():
 
 def test_gdal_translate_19():
     if test_cli_utilities.get_gdal_translate_path() is None:
-        return 'skip'
+        pytest.skip()
 
     ds = gdal.GetDriverByName('GTiff').Create('tmp/test_gdal_translate_19_src.tif', 1, 1, 2)
     ct = gdal.ColorTable()
@@ -469,7 +470,7 @@ def test_gdal_translate_19():
 
 def test_gdal_translate_20():
     if test_cli_utilities.get_gdal_translate_path() is None:
-        return 'skip'
+        pytest.skip()
 
     gdaltest.runexternal(test_cli_utilities.get_gdal_translate_path() + ' -a_nodata 255 ../gcore/data/byte.tif tmp/test_gdal_translate_20_src.tif')
     gdaltest.runexternal(test_cli_utilities.get_gdal_translate_path() + ' -a_nodata None tmp/test_gdal_translate_20_src.tif tmp/test_gdal_translate_20_dst.tif')
@@ -491,7 +492,7 @@ def test_gdal_translate_20():
 
 def test_gdal_translate_21():
     if test_cli_utilities.get_gdal_translate_path() is None:
-        return 'skip'
+        pytest.skip()
 
     gdaltest.runexternal(test_cli_utilities.get_gdal_translate_path() + ' -of HFA ../gcore/data/utmsmall.img tmp/test_gdal_translate_21.img')
 
@@ -513,7 +514,7 @@ def test_gdal_translate_21():
 
 def test_gdal_translate_22():
     if test_cli_utilities.get_gdal_translate_path() is None:
-        return 'skip'
+        pytest.skip()
 
     gdaltest.runexternal(test_cli_utilities.get_gdal_translate_path() + ' -of HFA -scale 0 255 0 128 ../gcore/data/utmsmall.img tmp/test_gdal_translate_22.img')
 
@@ -535,7 +536,7 @@ def test_gdal_translate_22():
 
 def test_gdal_translate_23():
     if test_cli_utilities.get_gdal_translate_path() is None:
-        return 'skip'
+        pytest.skip()
 
     gdaltest.runexternal(test_cli_utilities.get_gdal_translate_path() + ' -stats ../gcore/data/byte.tif tmp/test_gdal_translate_23.tif')
 
@@ -547,8 +548,7 @@ def test_gdal_translate_23():
 
     try:
         os.stat('tmp/test_gdal_translate_23.tif.aux.xml')
-        gdaltest.post_reason('did not expect .aux.xml file presence')
-        return 'fail'
+        pytest.fail('did not expect .aux.xml file presence')
     except OSError:
         pass
 
@@ -562,7 +562,7 @@ def test_gdal_translate_23():
 
 def test_gdal_translate_24():
     if test_cli_utilities.get_gdal_translate_path() is None:
-        return 'skip'
+        pytest.skip()
 
     gdaltest.runexternal(test_cli_utilities.get_gdal_translate_path() + ' -q -srcwin -10 -10 40 40 ../gcore/data/byte.tif tmp/test_gdal_translate_24.tif')
 
@@ -582,7 +582,7 @@ def test_gdal_translate_24():
 
 def test_gdal_translate_25():
     if test_cli_utilities.get_gdal_translate_path() is None:
-        return 'skip'
+        pytest.skip()
 
     gdaltest.runexternal(test_cli_utilities.get_gdal_translate_path() + ' -q ../gdrivers/data/int.img tmp/test_gdal_translate_25.tif -norat')
 
@@ -599,7 +599,7 @@ def test_gdal_translate_25():
 
 def test_gdal_translate_26():
     if test_cli_utilities.get_gdal_translate_path() is None:
-        return 'skip'
+        pytest.skip()
 
     f = open('tmp/test_gdal_translate_26.xyz', 'wb')
     f.write("""X Y Z
@@ -624,9 +624,9 @@ def test_gdal_translate_26():
 
 def test_gdal_translate_27():
     if test_cli_utilities.get_gdal_translate_path() is None:
-        return 'skip'
+        pytest.skip()
     if test_cli_utilities.get_gdalinfo_path() is None:
-        return 'skip'
+        pytest.skip()
 
     f = open('tmp/test_gdal_translate_27.asc', 'wb')
     f.write("""ncols        2
@@ -669,7 +669,7 @@ def test_gdal_translate_27():
 
 def test_gdal_translate_28():
     if test_cli_utilities.get_gdal_translate_path() is None:
-        return 'skip'
+        pytest.skip()
 
     gdaltest.runexternal(test_cli_utilities.get_gdal_translate_path() + ' ../gdrivers/data/float64.asc tmp/test_gdal_translate_28.tif -oo datatype=float64')
 
@@ -685,7 +685,7 @@ def test_gdal_translate_28():
 
 def test_gdal_translate_29():
     if test_cli_utilities.get_gdal_translate_path() is None:
-        return 'skip'
+        pytest.skip()
 
     (_, err) = gdaltest.runexternal_out_and_err(test_cli_utilities.get_gdal_translate_path() + ' ../gcore/data/byte.tif tmp/test_gdal_translate_29.tif -outsize 50% 50% -r cubic')
     assert (err is None or err == ''), 'got error/warning'
@@ -719,7 +719,7 @@ def test_gdal_translate_29():
 
 def test_gdal_translate_30():
     if test_cli_utilities.get_gdal_translate_path() is None:
-        return 'skip'
+        pytest.skip()
 
     gdaltest.runexternal(test_cli_utilities.get_gdal_translate_path() + ' -tr 30 30 ../gcore/data/byte.tif tmp/test_gdal_translate_30.tif')
 
@@ -739,7 +739,7 @@ def test_gdal_translate_30():
 
 def test_gdal_translate_31():
     if test_cli_utilities.get_gdal_translate_path() is None:
-        return 'skip'
+        pytest.skip()
 
     gdaltest.runexternal(test_cli_utilities.get_gdal_translate_path() + ' -projwin_srs EPSG:4267 -projwin -117.641168620797 33.9023526904262 -117.628110837847 33.8915970129613 ../gcore/data/byte.tif tmp/test_gdal_translate_31.tif')
 
@@ -761,7 +761,7 @@ def test_gdal_translate_31():
 
 def test_gdal_translate_32():
     if test_cli_utilities.get_gdal_translate_path() is None:
-        return 'skip'
+        pytest.skip()
 
     gdaltest.runexternal(test_cli_utilities.get_gdal_translate_path() + ' ../gcore/data/byte_rpc.tif tmp/test_gdal_translate_32.tif -srcwin 1 2 13 14 -outsize 150% 300%')
     ds = gdal.Open('tmp/test_gdal_translate_32.tif')
@@ -787,7 +787,7 @@ def test_gdal_translate_32():
 
 def test_gdal_translate_33():
     if test_cli_utilities.get_gdal_translate_path() is None:
-        return 'skip'
+        pytest.skip()
 
     gdaltest.runexternal(test_cli_utilities.get_gdal_translate_path() + ' -outsize 100 0 ../gdrivers/data/small_world.tif tmp/test_gdal_translate_33.tif')
 
@@ -814,7 +814,7 @@ def test_gdal_translate_33():
 
 def test_gdal_translate_34():
     if test_cli_utilities.get_gdal_translate_path() is None:
-        return 'skip'
+        pytest.skip()
 
     gdaltest.runexternal(test_cli_utilities.get_gdal_translate_path() + ' ../gcore/data/oddsize1bit.tif tmp/test_gdal_translate_34.vrt -of VRT -mo FOO=BAR')
 
@@ -832,7 +832,7 @@ def test_gdal_translate_34():
 
 def test_gdal_translate_35():
     if test_cli_utilities.get_gdal_translate_path() is None:
-        return 'skip'
+        pytest.skip()
 
     (_, err) = gdaltest.runexternal_out_and_err(test_cli_utilities.get_gdal_translate_path())
     assert err.find('No source dataset specified') >= 0
@@ -853,7 +853,7 @@ def test_gdal_translate_35():
 
 def test_gdal_translate_36():
     if test_cli_utilities.get_gdal_translate_path() is None:
-        return 'skip'
+        pytest.skip()
 
     gdaltest.runexternal(test_cli_utilities.get_gdal_translate_path() + ' -of gtiff data/onepixelcontinuous.img tmp/test_gdal_translate_36.tif')
 
@@ -876,7 +876,7 @@ def test_gdal_translate_36():
 
 def test_gdal_translate_37():
     if test_cli_utilities.get_gdal_translate_path() is None:
-        return 'skip'
+        pytest.skip()
 
     gdaltest.runexternal(test_cli_utilities.get_gdal_translate_path() + ' -q -of gtiff data/onepixelthematic.img tmp/test_gdal_translate_37.tif')
 
@@ -898,7 +898,7 @@ def test_gdal_translate_37():
 
 def test_gdal_translate_38():
     if test_cli_utilities.get_gdal_translate_path() is None:
-        return 'skip'
+        pytest.skip()
 
     gdaltest.runexternal(test_cli_utilities.get_gdal_translate_path() + ' -q -of hfa tmp/test_gdal_translate_37.tif tmp/test_gdal_translate_38.img')
 
diff --git a/autotest/utilities/test_gdal_translate_lib.py b/autotest/utilities/test_gdal_translate_lib.py
index 5741d35c433c..20b04bcae00e 100755
--- a/autotest/utilities/test_gdal_translate_lib.py
+++ b/autotest/utilities/test_gdal_translate_lib.py
@@ -35,6 +35,7 @@
 
 from osgeo import gdal
 import gdaltest
+import pytest
 
 ###############################################################################
 # Simple test
@@ -476,7 +477,7 @@ def test_gdal_translate_lib_colorinterp():
     try:
         with gdaltest.error_handler():
             gdal.Translate('', src_ds, options='-f MEM -colorinterp_0 alpha')
-        return 'fail'
+        pytest.fail()
     except:
         pass
 
diff --git a/autotest/utilities/test_gdaladdo.py b/autotest/utilities/test_gdaladdo.py
index 01239d4d629b..0730a0cd96e2 100755
--- a/autotest/utilities/test_gdaladdo.py
+++ b/autotest/utilities/test_gdaladdo.py
@@ -32,6 +32,7 @@
 import sys
 import os
 import shutil
+import pytest
 
 sys.path.append('../gcore')
 
@@ -46,7 +47,7 @@
 
 def test_gdaladdo_1():
     if test_cli_utilities.get_gdaladdo_path() is None:
-        return 'skip'
+        pytest.skip()
 
     shutil.copy('../gcore/data/mfloat32.vrt', 'tmp/mfloat32.vrt')
     shutil.copy('../gcore/data/float32.tif', 'tmp/float32.tif')
@@ -70,7 +71,7 @@ def test_gdaladdo_1():
 
 def test_gdaladdo_2():
     if test_cli_utilities.get_gdaladdo_path() is None:
-        return 'skip'
+        pytest.skip()
 
     shutil.copyfile('../gcore/data/nodata_byte.tif', 'tmp/ovr5.tif')
 
@@ -94,7 +95,7 @@ def test_gdaladdo_2():
 
 def test_gdaladdo_3():
     if test_cli_utilities.get_gdaladdo_path() is None:
-        return 'skip'
+        pytest.skip()
 
     gdal.Translate('tmp/test_gdaladdo_3.tif', '../gcore/data/nodata_byte.tif', options='-outsize 1024 1024')
 
@@ -111,8 +112,7 @@ def test_gdaladdo_3():
     try:
         os.stat('tmp/test_gdaladdo_3.tif.ovr')
     except OSError:
-        gdaltest.post_reason('no external overview.')
-        return 'fail'
+        pytest.fail('no external overview.')
 
     return 'success'
 
@@ -122,7 +122,7 @@ def test_gdaladdo_3():
 
 def test_gdaladdo_4():
     if test_cli_utilities.get_gdaladdo_path() is None:
-        return 'skip'
+        pytest.skip()
 
     gdaltest.runexternal(test_cli_utilities.get_gdaladdo_path() + ' -clean tmp/test_gdaladdo_3.tif')
 
@@ -134,8 +134,7 @@ def test_gdaladdo_4():
 
     try:
         os.stat('tmp/test_gdaladdo_3.tif.ovr')
-        gdaltest.post_reason('.ovr file still exists')
-        return 'fail'
+        pytest.fail('.ovr file still exists')
     except OSError:
         pass
 
@@ -149,7 +148,7 @@ def test_gdaladdo_4():
 
 def test_gdaladdo_5():
     if test_cli_utilities.get_gdaladdo_path() is None:
-        return 'skip'
+        pytest.skip()
 
     shutil.copyfile('../gcore/data/nodata_byte.tif', 'tmp/test_gdaladdo_5.tif')
 
diff --git a/autotest/utilities/test_gdalbuildvrt.py b/autotest/utilities/test_gdalbuildvrt.py
index 6734a775765a..a2e70aabbdf5 100755
--- a/autotest/utilities/test_gdalbuildvrt.py
+++ b/autotest/utilities/test_gdalbuildvrt.py
@@ -38,6 +38,7 @@
 from osgeo import osr
 import gdaltest
 import test_cli_utilities
+import pytest
 
 
 ###############################################################################
@@ -68,7 +69,7 @@ def test_gdalbuildvrt_check():
 
 def test_gdalbuildvrt_1():
     if test_cli_utilities.get_gdalbuildvrt_path() is None:
-        return 'skip'
+        pytest.skip()
 
     drv = gdal.GetDriverByName('GTiff')
     srs = osr.SpatialReference()
@@ -110,9 +111,9 @@ def test_gdalbuildvrt_1():
 
 def test_gdalbuildvrt_2():
     if test_cli_utilities.get_gdalbuildvrt_path() is None:
-        return 'skip'
+        pytest.skip()
     if test_cli_utilities.get_gdaltindex_path() is None:
-        return 'skip'
+        pytest.skip()
 
     try:
         os.remove('tmp/tileindex.shp')
@@ -143,7 +144,7 @@ def test_gdalbuildvrt_2():
 
 def test_gdalbuildvrt_3():
     if test_cli_utilities.get_gdalbuildvrt_path() is None:
-        return 'skip'
+        pytest.skip()
 
     open('tmp/filelist.txt', 'wt').write('tmp/gdalbuildvrt1.tif\ntmp/gdalbuildvrt2.tif\ntmp/gdalbuildvrt3.tif\ntmp/gdalbuildvrt4.tif')
 
@@ -157,7 +158,7 @@ def test_gdalbuildvrt_3():
 
 def test_gdalbuildvrt_4():
     if test_cli_utilities.get_gdalbuildvrt_path() is None:
-        return 'skip'
+        pytest.skip()
 
     drv = gdal.GetDriverByName('GTiff')
     wkt = 'GEOGCS[\"WGS 72\",DATUM[\"WGS_1972\"]]'
@@ -177,7 +178,7 @@ def test_gdalbuildvrt_4():
 
 def test_gdalbuildvrt_5():
     if test_cli_utilities.get_gdalbuildvrt_path() is None:
-        return 'skip'
+        pytest.skip()
 
     drv = gdal.GetDriverByName('GTiff')
     srs = osr.SpatialReference()
@@ -199,7 +200,7 @@ def test_gdalbuildvrt_5():
 
 def test_gdalbuildvrt_6():
     if test_cli_utilities.get_gdalbuildvrt_path() is None:
-        return 'skip'
+        pytest.skip()
 
     gdaltest.runexternal(test_cli_utilities.get_gdalbuildvrt_path() + ' -separate tmp/stacked.vrt tmp/gdalbuildvrt1.tif tmp/gdalbuildvrt2.tif tmp/gdalbuildvrt3.tif tmp/gdalbuildvrt4.tif')
 
@@ -228,7 +229,7 @@ def test_gdalbuildvrt_6():
 
 def test_gdalbuildvrt_7():
     if test_cli_utilities.get_gdalbuildvrt_path() is None:
-        return 'skip'
+        pytest.skip()
 
     out_ds = gdal.GetDriverByName('GTiff').Create('tmp/vrtnull1.tif', 20, 10, 3, gdal.GDT_UInt16)
     out_ds.SetGeoTransform([2, 0.1, 0, 49, 0, -0.1])
@@ -285,7 +286,7 @@ def test_gdalbuildvrt_7():
 
 def test_gdalbuildvrt_8():
     if test_cli_utilities.get_gdalbuildvrt_path() is None:
-        return 'skip'
+        pytest.skip()
 
     gdaltest.runexternal(test_cli_utilities.get_gdalbuildvrt_path() + ' -tr 0.05 0.05 tmp/mosaic2.vrt tmp/gdalbuildvrt1.tif tmp/gdalbuildvrt2.tif tmp/gdalbuildvrt3.tif tmp/gdalbuildvrt4.tif')
 
@@ -310,7 +311,7 @@ def test_gdalbuildvrt_8():
 
 def test_gdalbuildvrt_9():
     if test_cli_utilities.get_gdalbuildvrt_path() is None:
-        return 'skip'
+        pytest.skip()
 
     gdaltest.runexternal(test_cli_utilities.get_gdalbuildvrt_path() + ' -te 1 46 5 50 tmp/mosaic2.vrt tmp/gdalbuildvrt1.tif tmp/gdalbuildvrt2.tif tmp/gdalbuildvrt3.tif tmp/gdalbuildvrt4.tif')
 
@@ -335,7 +336,7 @@ def test_gdalbuildvrt_9():
 
 def test_gdalbuildvrt_10():
     if test_cli_utilities.get_gdalbuildvrt_path() is None:
-        return 'skip'
+        pytest.skip()
 
     out_ds = gdal.GetDriverByName('GTiff').Create('tmp/test_gdalbuildvrt_10_1.tif', 10, 10, 1, gdal.GDT_Byte, options=['NBITS=1', 'PHOTOMETRIC=MINISWHITE'])
     out_ds.SetGeoTransform([2, 0.1, 0, 49, 0, -0.1])
@@ -371,7 +372,7 @@ def test_gdalbuildvrt_10():
 
 def test_gdalbuildvrt_11():
     if test_cli_utilities.get_gdalbuildvrt_path() is None:
-        return 'skip'
+        pytest.skip()
 
     out_ds = gdal.GetDriverByName('GTiff').Create('tmp/test_gdalbuildvrt_11_1.tif', 10, 10, 1)
     out_ds.GetRasterBand(1).Fill(255)
@@ -401,7 +402,7 @@ def test_gdalbuildvrt_11():
 
 def test_gdalbuildvrt_12():
     if test_cli_utilities.get_gdalbuildvrt_path() is None:
-        return 'skip'
+        pytest.skip()
 
     (_, err) = gdaltest.runexternal_out_and_err(test_cli_utilities.get_gdalbuildvrt_path() + ' -tap tmp/gdalbuildvrt12.vrt ../gcore/data/byte.tif',
                                                 check_memleak=False)
@@ -429,7 +430,7 @@ def test_gdalbuildvrt_12():
 
 def test_gdalbuildvrt_13():
     if test_cli_utilities.get_gdalbuildvrt_path() is None:
-        return 'skip'
+        pytest.skip()
 
     gdaltest.runexternal(test_cli_utilities.get_gdalbuildvrt_path() + ' tmp/gdalbuildvrt13.vrt ../gcore/data/byte.tif -a_srs EPSG:4326')
 
@@ -445,9 +446,9 @@ def test_gdalbuildvrt_13():
 
 def test_gdalbuildvrt_14():
     if test_cli_utilities.get_gdalbuildvrt_path() is None:
-        return 'skip'
+        pytest.skip()
     if test_cli_utilities.get_gdal_translate_path() is None:
-        return 'skip'
+        pytest.skip()
 
     gdaltest.runexternal(test_cli_utilities.get_gdalbuildvrt_path() + ' tmp/test_gdalbuildvrt_14.vrt ../gcore/data/byte.tif -r cubic -tr 30 30')
 
@@ -470,7 +471,7 @@ def test_gdalbuildvrt_14():
 
 def test_gdalbuildvrt_15():
     if test_cli_utilities.get_gdalbuildvrt_path() is None:
-        return 'skip'
+        pytest.skip()
 
     gdaltest.runexternal(test_cli_utilities.get_gdalbuildvrt_path() + ' tmp/test_gdalbuildvrt_15.vrt ../gcore/data/byte.tif -b 1')
 
@@ -488,7 +489,7 @@ def test_gdalbuildvrt_15():
 
 def test_gdalbuildvrt_16():
     if test_cli_utilities.get_gdalbuildvrt_path() is None:
-        return 'skip'
+        pytest.skip()
 
     (out, err) = gdaltest.runexternal_out_and_err(test_cli_utilities.get_gdalbuildvrt_path() + ' /non_existing_dir/non_existing_subdir/out.vrt ../gcore/data/byte.tif')
 
@@ -507,7 +508,7 @@ def test_gdalbuildvrt_16():
 def test_gdalbuildvrt_cleanup():
 
     if test_cli_utilities.get_gdalbuildvrt_path() is None:
-        return 'skip'
+        pytest.skip()
 
     ogr.GetDriverByName('ESRI Shapefile').DeleteDataSource('tmp/tileindex.shp')
 
diff --git a/autotest/utilities/test_gdaldem.py b/autotest/utilities/test_gdaldem.py
index e35a02a7432b..6a15105f22fa 100755
--- a/autotest/utilities/test_gdaldem.py
+++ b/autotest/utilities/test_gdaldem.py
@@ -37,6 +37,7 @@
 from osgeo import osr
 import gdaltest
 import test_cli_utilities
+import pytest
 
 ###############################################################################
 # Test gdaldem hillshade
@@ -44,7 +45,7 @@
 
 def test_gdaldem_hillshade():
     if test_cli_utilities.get_gdaldem_path() is None:
-        return 'skip'
+        pytest.skip()
 
     (_, err) = gdaltest.runexternal_out_and_err(test_cli_utilities.get_gdaldem_path() + ' hillshade -s 111120 -z 30 ../gdrivers/data/n43.dt0 tmp/n43_hillshade.tif')
     assert (err is None or err == ''), 'got error/warning'
@@ -77,7 +78,7 @@ def test_gdaldem_hillshade():
 
 def test_gdaldem_hillshade_compressed_tiled_output():
     if test_cli_utilities.get_gdaldem_path() is None:
-        return 'skip'
+        pytest.skip()
 
     (_, err) = gdaltest.runexternal_out_and_err(test_cli_utilities.get_gdaldem_path() + ' hillshade -s 111120 -z 30 ../gdrivers/data/n43.dt0 tmp/n43_hillshade_compressed_tiled.tif -co TILED=YES -co COMPRESS=DEFLATE --config GDAL_CACHEMAX 0')
     assert (err is None or err == ''), 'got error/warning'
@@ -103,7 +104,7 @@ def test_gdaldem_hillshade_compressed_tiled_output():
 
 def test_gdaldem_hillshade_combined():
     if test_cli_utilities.get_gdaldem_path() is None:
-        return 'skip'
+        pytest.skip()
 
     gdaltest.runexternal(test_cli_utilities.get_gdaldem_path() + ' hillshade -s 111120 -z 30 -combined ../gdrivers/data/n43.dt0 tmp/n43_hillshade_combined.tif')
 
@@ -135,7 +136,7 @@ def test_gdaldem_hillshade_combined():
 
 def test_gdaldem_hillshade_compute_edges():
     if test_cli_utilities.get_gdaldem_path() is None:
-        return 'skip'
+        pytest.skip()
 
     gdaltest.runexternal(test_cli_utilities.get_gdaldem_path() + ' hillshade -compute_edges -s 111120 -z 30 ../gdrivers/data/n43.dt0 tmp/n43_hillshade_compute_edges.tif')
 
@@ -155,7 +156,7 @@ def test_gdaldem_hillshade_compute_edges():
 
 def test_gdaldem_hillshade_azimuth():
     if test_cli_utilities.get_gdaldem_path() is None:
-        return 'skip'
+        pytest.skip()
 
     from sys import version_info
     ds = gdal.GetDriverByName('GTiff').Create('tmp/pyramid.tif', 100, 100, 1)
@@ -191,7 +192,7 @@ def test_gdaldem_hillshade_azimuth():
 
 def test_gdaldem_hillshade_png():
     if test_cli_utilities.get_gdaldem_path() is None:
-        return 'skip'
+        pytest.skip()
 
     gdaltest.runexternal(test_cli_utilities.get_gdaldem_path() + ' hillshade -of PNG  -s 111120 -z 30 ../gdrivers/data/n43.dt0 tmp/n43_hillshade.png')
 
@@ -211,7 +212,7 @@ def test_gdaldem_hillshade_png():
 
 def test_gdaldem_hillshade_png_compute_edges():
     if test_cli_utilities.get_gdaldem_path() is None:
-        return 'skip'
+        pytest.skip()
 
     gdaltest.runexternal(test_cli_utilities.get_gdaldem_path() + ' hillshade -compute_edges -of PNG  -s 111120 -z 30 ../gdrivers/data/n43.dt0 tmp/n43_hillshade_compute_edges.png')
 
@@ -231,7 +232,7 @@ def test_gdaldem_hillshade_png_compute_edges():
 
 def test_gdaldem_slope():
     if test_cli_utilities.get_gdaldem_path() is None:
-        return 'skip'
+        pytest.skip()
 
     gdaltest.runexternal(test_cli_utilities.get_gdaldem_path() + ' slope -s 111120 ../gdrivers/data/n43.dt0 tmp/n43_slope.tif')
 
@@ -262,7 +263,7 @@ def test_gdaldem_slope():
 
 def test_gdaldem_aspect():
     if test_cli_utilities.get_gdaldem_path() is None:
-        return 'skip'
+        pytest.skip()
 
     gdaltest.runexternal(test_cli_utilities.get_gdaldem_path() + ' aspect ../gdrivers/data/n43.dt0 tmp/n43_aspect.tif')
 
@@ -293,7 +294,7 @@ def test_gdaldem_aspect():
 
 def test_gdaldem_color_relief():
     if test_cli_utilities.get_gdaldem_path() is None:
-        return 'skip'
+        pytest.skip()
 
     gdaltest.runexternal(test_cli_utilities.get_gdaldem_path() + ' color-relief ../gdrivers/data/n43.dt0 data/color_file.txt tmp/n43_colorrelief.tif')
     src_ds = gdal.Open('../gdrivers/data/n43.dt0')
@@ -325,7 +326,7 @@ def test_gdaldem_color_relief():
 
 def test_gdaldem_color_relief_cpt():
     if test_cli_utilities.get_gdaldem_path() is None:
-        return 'skip'
+        pytest.skip()
 
     gdaltest.runexternal(test_cli_utilities.get_gdaldem_path() + ' color-relief ../gdrivers/data/n43.dt0 data/color_file.cpt tmp/n43_colorrelief_cpt.tif')
     src_ds = gdal.Open('../gdrivers/data/n43.dt0')
@@ -357,7 +358,7 @@ def test_gdaldem_color_relief_cpt():
 
 def test_gdaldem_color_relief_vrt():
     if test_cli_utilities.get_gdaldem_path() is None:
-        return 'skip'
+        pytest.skip()
 
     gdaltest.runexternal(test_cli_utilities.get_gdaldem_path() + ' color-relief -of VRT ../gdrivers/data/n43.dt0 data/color_file.txt tmp/n43_colorrelief.vrt')
     src_ds = gdal.Open('../gdrivers/data/n43.dt0')
@@ -387,9 +388,9 @@ def test_gdaldem_color_relief_vrt():
 
 def test_gdaldem_color_relief_from_float32():
     if test_cli_utilities.get_gdaldem_path() is None:
-        return 'skip'
+        pytest.skip()
     if test_cli_utilities.get_gdal_translate_path() is None:
-        return 'skip'
+        pytest.skip()
 
     gdaltest.runexternal(test_cli_utilities.get_gdal_translate_path() + ' -ot Float32 ../gdrivers/data/n43.dt0 tmp/n43_float32.tif')
     gdaltest.runexternal(test_cli_utilities.get_gdaldem_path() + ' color-relief tmp/n43_float32.tif data/color_file.txt tmp/n43_colorrelief_from_float32.tif')
@@ -412,7 +413,7 @@ def test_gdaldem_color_relief_from_float32():
 
 def test_gdaldem_color_relief_png():
     if test_cli_utilities.get_gdaldem_path() is None:
-        return 'skip'
+        pytest.skip()
 
     gdaltest.runexternal(test_cli_utilities.get_gdaldem_path() + ' color-relief -of PNG ../gdrivers/data/n43.dt0 data/color_file.txt tmp/n43_colorrelief.png')
     ds = gdal.Open('tmp/n43_colorrelief.png')
@@ -434,9 +435,9 @@ def test_gdaldem_color_relief_png():
 
 def test_gdaldem_color_relief_from_float32_to_png():
     if test_cli_utilities.get_gdaldem_path() is None:
-        return 'skip'
+        pytest.skip()
     if test_cli_utilities.get_gdal_translate_path() is None:
-        return 'skip'
+        pytest.skip()
 
     gdaltest.runexternal(test_cli_utilities.get_gdaldem_path() + ' color-relief -of PNG tmp/n43_float32.tif data/color_file.txt tmp/n43_colorrelief_from_float32.png')
     ds = gdal.Open('tmp/n43_colorrelief_from_float32.png')
@@ -458,7 +459,7 @@ def test_gdaldem_color_relief_from_float32_to_png():
 
 def test_gdaldem_color_relief_nearest_color_entry():
     if test_cli_utilities.get_gdaldem_path() is None:
-        return 'skip'
+        pytest.skip()
 
     gdaltest.runexternal(test_cli_utilities.get_gdaldem_path() + ' color-relief -nearest_color_entry ../gdrivers/data/n43.dt0 data/color_file.txt tmp/n43_colorrelief_nearest.tif')
     ds = gdal.Open('tmp/n43_colorrelief_nearest.tif')
@@ -480,7 +481,7 @@ def test_gdaldem_color_relief_nearest_color_entry():
 
 def test_gdaldem_color_relief_nearest_color_entry_vrt():
     if test_cli_utilities.get_gdaldem_path() is None:
-        return 'skip'
+        pytest.skip()
 
     gdaltest.runexternal(test_cli_utilities.get_gdaldem_path() + ' color-relief -of VRT -nearest_color_entry ../gdrivers/data/n43.dt0 data/color_file.txt tmp/n43_colorrelief_nearest.vrt')
     ds = gdal.Open('tmp/n43_colorrelief_nearest.vrt')
@@ -502,7 +503,7 @@ def test_gdaldem_color_relief_nearest_color_entry_vrt():
 
 def test_gdaldem_color_relief_nodata_nan():
     if test_cli_utilities.get_gdaldem_path() is None:
-        return 'skip'
+        pytest.skip()
 
     f = open('tmp/nodata_nan_src.asc', 'wt')
     f.write("""ncols        2
@@ -542,7 +543,7 @@ def test_gdaldem_color_relief_nodata_nan():
 
 def test_gdaldem_color_relief_repeated_entry():
     if test_cli_utilities.get_gdaldem_path() is None:
-        return 'skip'
+        pytest.skip()
 
     f = open('tmp/test_gdaldem_color_relief_repeated_entry.asc', 'wt')
     f.write("""ncols        2
diff --git a/autotest/utilities/test_gdalinfo.py b/autotest/utilities/test_gdalinfo.py
index 2e8fad3cff1a..9aab7e659caf 100755
--- a/autotest/utilities/test_gdalinfo.py
+++ b/autotest/utilities/test_gdalinfo.py
@@ -37,6 +37,7 @@
 from osgeo import gdal
 import gdaltest
 import test_cli_utilities
+import pytest
 
 ###############################################################################
 # Simple test
@@ -44,7 +45,7 @@
 
 def test_gdalinfo_1():
     if test_cli_utilities.get_gdalinfo_path() is None:
-        return 'skip'
+        pytest.skip()
 
     (ret, err) = gdaltest.runexternal_out_and_err(test_cli_utilities.get_gdalinfo_path() + ' ../gcore/data/byte.tif')
     assert (err is None or err == ''), 'got error/warning'
@@ -58,7 +59,7 @@ def test_gdalinfo_1():
 
 def test_gdalinfo_2():
     if test_cli_utilities.get_gdalinfo_path() is None:
-        return 'skip'
+        pytest.skip()
 
     ret = gdaltest.runexternal(test_cli_utilities.get_gdalinfo_path() + ' -checksum ../gcore/data/byte.tif')
     assert ret.find('Checksum=4672') != -1
@@ -71,7 +72,7 @@ def test_gdalinfo_2():
 
 def test_gdalinfo_3():
     if test_cli_utilities.get_gdalinfo_path() is None:
-        return 'skip'
+        pytest.skip()
 
     ret = gdaltest.runexternal(test_cli_utilities.get_gdalinfo_path() + ' ../gcore/data/byte.tif')
     assert ret.find('Metadata') != -1
@@ -87,7 +88,7 @@ def test_gdalinfo_3():
 
 def test_gdalinfo_4():
     if test_cli_utilities.get_gdalinfo_path() is None:
-        return 'skip'
+        pytest.skip()
 
     ret = gdaltest.runexternal(test_cli_utilities.get_gdalinfo_path() + ' ../gdrivers/data/bug407.gif')
     assert ret.find('0: 255,255,255,255') != -1
@@ -103,7 +104,7 @@ def test_gdalinfo_4():
 
 def test_gdalinfo_5():
     if test_cli_utilities.get_gdalinfo_path() is None:
-        return 'skip'
+        pytest.skip()
 
     try:
         os.remove('../gcore/data/byte.tif.aux.xml')
@@ -127,7 +128,7 @@ def test_gdalinfo_5():
 
 def test_gdalinfo_6():
     if test_cli_utilities.get_gdalinfo_path() is None:
-        return 'skip'
+        pytest.skip()
 
     ret = gdaltest.runexternal(test_cli_utilities.get_gdalinfo_path() + ' ../gdrivers/data/int.img')
     assert ret.find('Overviews') != -1
@@ -141,7 +142,7 @@ def test_gdalinfo_6():
 
 def test_gdalinfo_7():
     if test_cli_utilities.get_gdalinfo_path() is None:
-        return 'skip'
+        pytest.skip()
 
     ret = gdaltest.runexternal(test_cli_utilities.get_gdalinfo_path() + ' ../gcore/data/gcps.vrt')
     assert ret.find('GCP Projection =') != -1
@@ -162,7 +163,7 @@ def test_gdalinfo_7():
 
 def test_gdalinfo_8():
     if test_cli_utilities.get_gdalinfo_path() is None:
-        return 'skip'
+        pytest.skip()
 
     try:
         os.remove('../gcore/data/byte.tif.aux.xml')
@@ -188,7 +189,7 @@ def test_gdalinfo_8():
 
 def test_gdalinfo_9():
     if test_cli_utilities.get_gdalinfo_path() is None:
-        return 'skip'
+        pytest.skip()
 
     ret = gdaltest.runexternal(test_cli_utilities.get_gdalinfo_path() + ' ../gdrivers/data/fake_nsif.ntf')
     assert ret.find('BLOCKA=010000001000000000') == -1, 'got unexpected extra MD.'
@@ -204,7 +205,7 @@ def test_gdalinfo_9():
 
 def test_gdalinfo_10():
     if test_cli_utilities.get_gdalinfo_path() is None:
-        return 'skip'
+        pytest.skip()
 
     ret = gdaltest.runexternal(test_cli_utilities.get_gdalinfo_path() + ' ../gcore/data/byte.tif')
     assert ret.find('Computed Min/Max=74.000,255.000') == -1
@@ -221,7 +222,7 @@ def test_gdalinfo_10():
 def test_gdalinfo_11():
 
     if test_cli_utilities.get_gdalinfo_path() is None:
-        return 'skip'
+        pytest.skip()
 
     ret = gdaltest.runexternal(test_cli_utilities.get_gdalinfo_path() + ' --version', check_memleak=False)
     assert ret.find(gdal.VersionInfo('--version')) == 0
@@ -234,7 +235,7 @@ def test_gdalinfo_11():
 
 def test_gdalinfo_12():
     if test_cli_utilities.get_gdalinfo_path() is None:
-        return 'skip'
+        pytest.skip()
 
     ret = gdaltest.runexternal(test_cli_utilities.get_gdalinfo_path() + ' --build', check_memleak=False)
     ret = ret.replace('\r\n', '\n')
@@ -248,16 +249,15 @@ def test_gdalinfo_12():
 
 def test_gdalinfo_13():
     if test_cli_utilities.get_gdalinfo_path() is None:
-        return 'skip'
+        pytest.skip()
 
     ret = gdaltest.runexternal(test_cli_utilities.get_gdalinfo_path() + ' --license', check_memleak=False)
     ret = ret.replace('\r\n', '\n')
     if ret.find(gdal.VersionInfo('LICENSE')) != 0:
-        print(ret)
         print(gdal.VersionInfo('LICENSE'))
         if gdaltest.is_travis_branch('mingw'):
             return 'expected_fail'
-        return 'fail'
+        pytest.fail(ret)
 
     return 'success'
 
@@ -267,7 +267,7 @@ def test_gdalinfo_13():
 
 def test_gdalinfo_14():
     if test_cli_utilities.get_gdalinfo_path() is None:
-        return 'skip'
+        pytest.skip()
 
     (_, err) = gdaltest.runexternal_out_and_err(test_cli_utilities.get_gdalinfo_path() + ' --config', check_memleak=False)
     assert err.find('--config option given without a key and value argument') >= 0
@@ -280,7 +280,7 @@ def test_gdalinfo_14():
 
 def test_gdalinfo_15():
     if test_cli_utilities.get_gdalinfo_path() is None:
-        return 'skip'
+        pytest.skip()
 
     (_, err) = gdaltest.runexternal_out_and_err(test_cli_utilities.get_gdalinfo_path() + ' --mempreload', check_memleak=False)
     assert err.find('--mempreload option given without directory path') >= 0
@@ -293,7 +293,7 @@ def test_gdalinfo_15():
 
 def test_gdalinfo_16():
     if test_cli_utilities.get_gdalinfo_path() is None:
-        return 'skip'
+        pytest.skip()
 
     (ret, _) = gdaltest.runexternal_out_and_err(test_cli_utilities.get_gdalinfo_path() + ' --debug on --mempreload ../gcore/data /vsimem/byte.tif', check_memleak=False)
     assert ret.find('Driver: GTiff/GeoTIFF') == 0
@@ -306,7 +306,7 @@ def test_gdalinfo_16():
 
 def test_gdalinfo_17():
     if test_cli_utilities.get_gdalinfo_path() is None:
-        return 'skip'
+        pytest.skip()
 
     (_, err) = gdaltest.runexternal_out_and_err(test_cli_utilities.get_gdalinfo_path() + ' --debug', check_memleak=False)
     assert err.find('--debug option given without debug level') >= 0
@@ -319,7 +319,7 @@ def test_gdalinfo_17():
 
 def test_gdalinfo_18():
     if test_cli_utilities.get_gdalinfo_path() is None:
-        return 'skip'
+        pytest.skip()
 
     (_, err) = gdaltest.runexternal_out_and_err(test_cli_utilities.get_gdalinfo_path() + ' --optfile', check_memleak=False)
     assert err.find('--optfile option given without filename') >= 0
@@ -335,7 +335,7 @@ def test_gdalinfo_18():
 
 def test_gdalinfo_19():
     if test_cli_utilities.get_gdalinfo_path() is None:
-        return 'skip'
+        pytest.skip()
 
     f = open('tmp/optfile.txt', 'wt')
     f.write('# comment\n')
@@ -353,7 +353,7 @@ def test_gdalinfo_19():
 
 def test_gdalinfo_20():
     if test_cli_utilities.get_gdalinfo_path() is None:
-        return 'skip'
+        pytest.skip()
 
     ret = gdaltest.runexternal(test_cli_utilities.get_gdalinfo_path() + ' --formats', check_memleak=False)
     assert ret.find('GTiff -raster- (rw+vs): GeoTIFF') >= 0
@@ -366,7 +366,7 @@ def test_gdalinfo_20():
 
 def test_gdalinfo_21():
     if test_cli_utilities.get_gdalinfo_path() is None:
-        return 'skip'
+        pytest.skip()
 
     (_, err) = gdaltest.runexternal_out_and_err(test_cli_utilities.get_gdalinfo_path() + ' --format', check_memleak=False)
     assert err.find('--format option given without a format code') >= 0
@@ -382,7 +382,7 @@ def test_gdalinfo_21():
 
 def test_gdalinfo_22():
     if test_cli_utilities.get_gdalinfo_path() is None:
-        return 'skip'
+        pytest.skip()
 
     ret = gdaltest.runexternal(test_cli_utilities.get_gdalinfo_path() + ' --format GTiff', check_memleak=False)
 
@@ -408,7 +408,7 @@ def test_gdalinfo_22():
 
 def test_gdalinfo_23():
     if test_cli_utilities.get_gdalinfo_path() is None:
-        return 'skip'
+        pytest.skip()
 
     ret = gdaltest.runexternal(test_cli_utilities.get_gdalinfo_path() + ' --help-general', check_memleak=False)
     assert ret.find('Generic GDAL utility command options') >= 0
@@ -421,7 +421,7 @@ def test_gdalinfo_23():
 
 def test_gdalinfo_24():
     if test_cli_utilities.get_gdalinfo_path() is None:
-        return 'skip'
+        pytest.skip()
 
     ret = gdaltest.runexternal(test_cli_utilities.get_gdalinfo_path() + ' --locale C ../gcore/data/byte.tif', check_memleak=False)
     assert ret.find('Driver: GTiff/GeoTIFF') == 0
@@ -434,7 +434,7 @@ def test_gdalinfo_24():
 
 def test_gdalinfo_25():
     if test_cli_utilities.get_gdalinfo_path() is None:
-        return 'skip'
+        pytest.skip()
 
     ret = gdaltest.runexternal(test_cli_utilities.get_gdalinfo_path() + ' ../gdrivers/data/byte_with_xmp.tif -listmdd', check_memleak=False)
     assert ret.find('Metadata domains:') >= 0
@@ -448,7 +448,7 @@ def test_gdalinfo_25():
 
 def test_gdalinfo_26():
     if test_cli_utilities.get_gdalinfo_path() is None:
-        return 'skip'
+        pytest.skip()
 
     ret = gdaltest.runexternal(test_cli_utilities.get_gdalinfo_path() + ' ../gdrivers/data/byte_with_xmp.tif -mdd all', check_memleak=False)
     assert ret.find('Metadata (xml:XMP)') >= 0
@@ -461,7 +461,7 @@ def test_gdalinfo_26():
 
 def test_gdalinfo_27():
     if test_cli_utilities.get_gdalinfo_path() is None:
-        return 'skip'
+        pytest.skip()
 
     ret = gdaltest.runexternal(test_cli_utilities.get_gdalinfo_path() + ' ../gdrivers/data/float64.asc -oo datatype=float64', check_memleak=False)
     assert ret.find('Type=Float64') >= 0
@@ -474,7 +474,7 @@ def test_gdalinfo_27():
 
 def test_gdalinfo_28():
     if test_cli_utilities.get_gdalinfo_path() is None:
-        return 'skip'
+        pytest.skip()
 
     (ret, err) = gdaltest.runexternal_out_and_err(test_cli_utilities.get_gdalinfo_path() + ' -json ../gcore/data/byte.tif')
     ret = json.loads(ret)
@@ -489,7 +489,7 @@ def test_gdalinfo_28():
 
 def test_gdalinfo_29():
     if test_cli_utilities.get_gdalinfo_path() is None:
-        return 'skip'
+        pytest.skip()
 
     ret = gdaltest.runexternal(test_cli_utilities.get_gdalinfo_path() + ' -json -checksum ../gcore/data/byte.tif')
     ret = json.loads(ret)
@@ -503,7 +503,7 @@ def test_gdalinfo_29():
 
 def test_gdalinfo_30():
     if test_cli_utilities.get_gdalinfo_path() is None:
-        return 'skip'
+        pytest.skip()
 
     ret = gdaltest.runexternal(test_cli_utilities.get_gdalinfo_path() + ' -json ../gcore/data/byte.tif')
     ret = json.loads(ret)
@@ -521,7 +521,7 @@ def test_gdalinfo_30():
 
 def test_gdalinfo_31():
     if test_cli_utilities.get_gdalinfo_path() is None:
-        return 'skip'
+        pytest.skip()
 
     ret = gdaltest.runexternal(test_cli_utilities.get_gdalinfo_path() + ' -json ../gdrivers/data/bug407.gif')
     ret = json.loads(ret)
@@ -539,7 +539,7 @@ def test_gdalinfo_31():
 
 def test_gdalinfo_32():
     if test_cli_utilities.get_gdalinfo_path() is None:
-        return 'skip'
+        pytest.skip()
 
     try:
         os.remove('../gcore/data/byte.tif.aux.xml')
@@ -566,7 +566,7 @@ def test_gdalinfo_32():
 
 def test_gdalinfo_33():
     if test_cli_utilities.get_gdalinfo_path() is None:
-        return 'skip'
+        pytest.skip()
 
     ret = gdaltest.runexternal(test_cli_utilities.get_gdalinfo_path() + ' -json ../gdrivers/data/int.img')
     ret = json.loads(ret)
@@ -581,7 +581,7 @@ def test_gdalinfo_33():
 
 def test_gdalinfo_34():
     if test_cli_utilities.get_gdalinfo_path() is None:
-        return 'skip'
+        pytest.skip()
 
     ret = gdaltest.runexternal(test_cli_utilities.get_gdalinfo_path() + ' -json ../gcore/data/gcps.vrt')
     ret = json.loads(ret)
@@ -601,7 +601,7 @@ def test_gdalinfo_34():
 
 def test_gdalinfo_35():
     if test_cli_utilities.get_gdalinfo_path() is None:
-        return 'skip'
+        pytest.skip()
 
     try:
         os.remove('../gcore/data/byte.tif.aux.xml')
@@ -628,7 +628,7 @@ def test_gdalinfo_35():
 
 def test_gdalinfo_36():
     if test_cli_utilities.get_gdalinfo_path() is None:
-        return 'skip'
+        pytest.skip()
 
     ret = gdaltest.runexternal(test_cli_utilities.get_gdalinfo_path() + ' -json ../gdrivers/data/fake_nsif.ntf')
     ret = json.loads(ret)
@@ -647,7 +647,7 @@ def test_gdalinfo_36():
 
 def test_gdalinfo_37():
     if test_cli_utilities.get_gdalinfo_path() is None:
-        return 'skip'
+        pytest.skip()
 
     ret = gdaltest.runexternal(test_cli_utilities.get_gdalinfo_path() + ' -json ../gcore/data/byte.tif')
     ret = json.loads(ret)
@@ -665,7 +665,7 @@ def test_gdalinfo_37():
 
 def test_gdalinfo_38():
     if test_cli_utilities.get_gdalinfo_path() is None:
-        return 'skip'
+        pytest.skip()
 
     ret = gdaltest.runexternal(test_cli_utilities.get_gdalinfo_path() + ' -json ../gdrivers/data/byte_with_xmp.tif -listmdd', check_memleak=False)
     ret = json.loads(ret)
@@ -680,7 +680,7 @@ def test_gdalinfo_38():
 
 def test_gdalinfo_39():
     if test_cli_utilities.get_gdalinfo_path() is None:
-        return 'skip'
+        pytest.skip()
 
     ret = gdaltest.runexternal(test_cli_utilities.get_gdalinfo_path() + ' -json ../gdrivers/data/byte_with_xmp.tif -mdd all', check_memleak=False)
     ret = json.loads(ret)
@@ -694,7 +694,7 @@ def test_gdalinfo_39():
 
 def test_gdalinfo_40():
     if test_cli_utilities.get_gdalinfo_path() is None:
-        return 'skip'
+        pytest.skip()
 
     ret = gdaltest.runexternal(test_cli_utilities.get_gdalinfo_path() + ' -json ../gdrivers/data/small_world.tif')
     ret = json.loads(ret)
diff --git a/autotest/utilities/test_gdallocationinfo.py b/autotest/utilities/test_gdallocationinfo.py
index 851af46f8050..4bd6dc0e5141 100755
--- a/autotest/utilities/test_gdallocationinfo.py
+++ b/autotest/utilities/test_gdallocationinfo.py
@@ -30,6 +30,7 @@
 ###############################################################################
 
 import sys
+import pytest
 
 sys.path.append('../gcore')
 
@@ -43,7 +44,7 @@
 
 def test_gdallocationinfo_1():
     if test_cli_utilities.get_gdallocationinfo_path() is None:
-        return 'skip'
+        pytest.skip()
 
     (ret, err) = gdaltest.runexternal_out_and_err(test_cli_utilities.get_gdallocationinfo_path() + ' ../gcore/data/byte.tif 0 0')
     assert (err is None or err == ''), 'got error/warning'
@@ -63,7 +64,7 @@ def test_gdallocationinfo_1():
 
 def test_gdallocationinfo_2():
     if test_cli_utilities.get_gdallocationinfo_path() is None:
-        return 'skip'
+        pytest.skip()
 
     ret = gdaltest.runexternal(test_cli_utilities.get_gdallocationinfo_path() + ' -xml ../gcore/data/byte.tif 0 0')
     ret = ret.replace('\r\n', '\n')
@@ -82,7 +83,7 @@ def test_gdallocationinfo_2():
 
 def test_gdallocationinfo_3():
     if test_cli_utilities.get_gdallocationinfo_path() is None:
-        return 'skip'
+        pytest.skip()
 
     ret = gdaltest.runexternal(test_cli_utilities.get_gdallocationinfo_path() + ' -b 1 -valonly ../gcore/data/byte.tif 0 0')
     expected_ret = """107"""
@@ -96,7 +97,7 @@ def test_gdallocationinfo_3():
 
 def test_gdallocationinfo_4():
     if test_cli_utilities.get_gdallocationinfo_path() is None:
-        return 'skip'
+        pytest.skip()
 
     ret = gdaltest.runexternal(test_cli_utilities.get_gdallocationinfo_path() + ' -geoloc ../gcore/data/byte.tif 440720.000 3751320.000')
     ret = ret.replace('\r\n', '\n')
@@ -114,7 +115,7 @@ def test_gdallocationinfo_4():
 
 def test_gdallocationinfo_5():
     if test_cli_utilities.get_gdallocationinfo_path() is None:
-        return 'skip'
+        pytest.skip()
 
     ret = gdaltest.runexternal(test_cli_utilities.get_gdallocationinfo_path() + ' -lifonly ../gcore/data/byte.vrt 0 0')
     expected_ret1 = """../gcore/data/byte.tif"""
@@ -129,7 +130,7 @@ def test_gdallocationinfo_5():
 
 def test_gdallocationinfo_6():
     if test_cli_utilities.get_gdallocationinfo_path() is None:
-        return 'skip'
+        pytest.skip()
 
     src_ds = gdal.Open('../gcore/data/byte.tif')
     ds = gdal.GetDriverByName('GTiff').CreateCopy('tmp/test_gdallocationinfo_6.tif', src_ds)
diff --git a/autotest/utilities/test_gdalsrsinfo.py b/autotest/utilities/test_gdalsrsinfo.py
index 4d11ed0d02ae..6a963cea936c 100755
--- a/autotest/utilities/test_gdalsrsinfo.py
+++ b/autotest/utilities/test_gdalsrsinfo.py
@@ -34,6 +34,7 @@
 
 import gdaltest
 import test_cli_utilities
+import pytest
 
 ###############################################################################
 # Simple test
@@ -41,7 +42,7 @@
 
 def test_gdalsrsinfo_1():
     if test_cli_utilities.get_gdalsrsinfo_path() is None:
-        return 'skip'
+        pytest.skip()
 
     (ret, err) = gdaltest.runexternal_out_and_err(test_cli_utilities.get_gdalsrsinfo_path() + ' ../gcore/data/byte.tif')
     assert (err is None or err == ''), 'got error/warning'
@@ -57,7 +58,7 @@ def test_gdalsrsinfo_1():
 
 def test_gdalsrsinfo_2():
     if test_cli_utilities.get_gdalsrsinfo_path() is None:
-        return 'skip'
+        pytest.skip()
 
     ret = gdaltest.runexternal(test_cli_utilities.get_gdalsrsinfo_path() +
                                ' -o proj4 ../gcore/data/byte.tif')
@@ -72,7 +73,7 @@ def test_gdalsrsinfo_2():
 
 def test_gdalsrsinfo_3():
     if test_cli_utilities.get_gdalsrsinfo_path() is None:
-        return 'skip'
+        pytest.skip()
 
     ret = gdaltest.runexternal(test_cli_utilities.get_gdalsrsinfo_path() +
                                ' -o wkt ../gcore/data/byte.tif')
@@ -90,7 +91,7 @@ def test_gdalsrsinfo_3():
 
 def test_gdalsrsinfo_4():
     if test_cli_utilities.get_gdalsrsinfo_path() is None:
-        return 'skip'
+        pytest.skip()
 
     ret = gdaltest.runexternal(test_cli_utilities.get_gdalsrsinfo_path() +
                                ' -o wkt_esri ../gcore/data/byte.tif')
@@ -105,7 +106,7 @@ def test_gdalsrsinfo_4():
 
 def test_gdalsrsinfo_5():
     if test_cli_utilities.get_gdalsrsinfo_path() is None:
-        return 'skip'
+        pytest.skip()
 
     ret = gdaltest.runexternal(test_cli_utilities.get_gdalsrsinfo_path() +
                                ' -o wkt_noct ../gcore/data/byte.tif')
@@ -122,7 +123,7 @@ def test_gdalsrsinfo_5():
 
 def test_gdalsrsinfo_6():
     if test_cli_utilities.get_gdalsrsinfo_path() is None:
-        return 'skip'
+        pytest.skip()
 
     ret = gdaltest.runexternal(test_cli_utilities.get_gdalsrsinfo_path() +
                                ' -o wkt_simple ../gcore/data/byte.tif')
@@ -165,7 +166,7 @@ def test_gdalsrsinfo_6():
 
 def test_gdalsrsinfo_7():
     if test_cli_utilities.get_gdalsrsinfo_path() is None:
-        return 'skip'
+        pytest.skip()
 
     ret = gdaltest.runexternal(test_cli_utilities.get_gdalsrsinfo_path() +
                                ' -o mapinfo ../gcore/data/byte.tif')
@@ -180,7 +181,7 @@ def test_gdalsrsinfo_7():
 
 def test_gdalsrsinfo_8():
     if test_cli_utilities.get_gdalsrsinfo_path() is None:
-        return 'skip'
+        pytest.skip()
 
     ret = gdaltest.runexternal(test_cli_utilities.get_gdalsrsinfo_path() +
                                ' -o wkt -p EPSG:4326')
@@ -205,7 +206,7 @@ def test_gdalsrsinfo_8():
 
 def test_gdalsrsinfo_9():
     if test_cli_utilities.get_gdalsrsinfo_path() is None:
-        return 'skip'
+        pytest.skip()
 
     _, err = gdaltest.runexternal_out_and_err(
         test_cli_utilities.get_gdalsrsinfo_path() + ' nonexistent_file')
@@ -220,7 +221,7 @@ def test_gdalsrsinfo_9():
 
 def test_gdalsrsinfo_10():
     if test_cli_utilities.get_gdalsrsinfo_path() is None:
-        return 'skip'
+        pytest.skip()
 
     wkt = 'GEOGCS["WGS 84",DATUM["WGS_1984",SPHEROID["WGS 84",6378137,298.257223563,AUTHORITY["EPSG","7030"]],AUTHORITY["EPSG","6326"]],PRIMEM["Greenwich",0,AUTHORITY["EPSG","8901"]],UNIT["degree",0.0174532925199433,AUTHORITY["EPSG","9122"]],AUTHORITY["EPSG","4326"]]'
     if sys.platform == 'win32':
@@ -242,7 +243,7 @@ def test_gdalsrsinfo_10():
 
 def test_gdalsrsinfo_11():
     if test_cli_utilities.get_gdalsrsinfo_path() is None:
-        return 'skip'
+        pytest.skip()
 
     wkt = 'GEOGCS["WGS 84",DATUM["WGS_1984",SPHEROID["WGS 84",6378137,298.257223563,AUTHORITY["EPSG","7030"]],AUTHORITY["EPSG","6326"]],PRIMEM["Greenwich",0,AUTHORITY["EPSG","8901"]],UNIT["degree",0.0174532925199433,AUTHORITY["EPSG","9122"]],BADAUTHORITY["EPSG","4326"]]'
     if sys.platform == 'win32':
@@ -264,7 +265,7 @@ def test_gdalsrsinfo_11():
 
 def test_gdalsrsinfo_12():
     if test_cli_utilities.get_gdalsrsinfo_path() is None:
-        return 'skip'
+        pytest.skip()
 
     ret = gdaltest.runexternal(test_cli_utilities.get_gdalsrsinfo_path() +
                                ' -o wkt EPSG:4326')
@@ -279,7 +280,7 @@ def test_gdalsrsinfo_12():
 
 def test_gdalsrsinfo_13():
     if test_cli_utilities.get_gdalsrsinfo_path() is None:
-        return 'skip'
+        pytest.skip()
 
     ret = gdaltest.runexternal(test_cli_utilities.get_gdalsrsinfo_path() +
                                ' -o wkt "+proj=longlat +datum=WGS84 +no_defs"')
@@ -294,7 +295,7 @@ def test_gdalsrsinfo_13():
 
 def test_gdalsrsinfo_14():
     if test_cli_utilities.get_gdalsrsinfo_path() is None:
-        return 'skip'
+        pytest.skip()
 
     ret = gdaltest.runexternal(test_cli_utilities.get_gdalsrsinfo_path() +
                                ' -o proj4 /vsizip/../gcore/data/byte.tif.zip')
@@ -309,7 +310,7 @@ def test_gdalsrsinfo_14():
 
 def test_gdalsrsinfo_14bis():
     if test_cli_utilities.get_gdalsrsinfo_path() is None:
-        return 'skip'
+        pytest.skip()
 
     ret = gdaltest.runexternal(test_cli_utilities.get_gdalsrsinfo_path() +
                                ' -o proj4 ../ogr/data/Stacks.shp')
@@ -324,7 +325,7 @@ def test_gdalsrsinfo_14bis():
 
 def test_gdalsrsinfo_15():
     if test_cli_utilities.get_gdalsrsinfo_path() is None:
-        return 'skip'
+        pytest.skip()
 
     ret = gdaltest.runexternal(test_cli_utilities.get_gdalsrsinfo_path() +
                                ' -o proj4 ../osr/data/lcc_esri.prj')
@@ -339,7 +340,7 @@ def test_gdalsrsinfo_15():
 
 def test_gdalsrsinfo_16():
     if test_cli_utilities.get_gdalsrsinfo_path() is None:
-        return 'skip'
+        pytest.skip()
 
     cmd = test_cli_utilities.get_gdalsrsinfo_path() +\
         ' GTIFF_RAW:../gcore/data/byte.tif'
@@ -347,8 +348,7 @@ def test_gdalsrsinfo_16():
     try:
         (_, err) = gdaltest.runexternal_out_and_err(cmd)
     except:
-        gdaltest.post_reason('gdalsrsinfo execution failed')
-        return 'fail'
+        pytest.fail('gdalsrsinfo execution failed')
 
     assert err == ''
 
@@ -360,7 +360,7 @@ def test_gdalsrsinfo_16():
 
 def test_gdalsrsinfo_17():
     if test_cli_utilities.get_gdalsrsinfo_path() is None:
-        return 'skip'
+        pytest.skip()
 
     # Zero match
     ret = gdaltest.runexternal(test_cli_utilities.get_gdalsrsinfo_path() +
diff --git a/autotest/utilities/test_gdaltindex.py b/autotest/utilities/test_gdaltindex.py
index 6038a85cc684..174481e2f029 100755
--- a/autotest/utilities/test_gdaltindex.py
+++ b/autotest/utilities/test_gdaltindex.py
@@ -46,7 +46,7 @@
 
 def test_gdaltindex_1():
     if test_cli_utilities.get_gdaltindex_path() is None:
-        return 'skip'
+        pytest.skip()
 
     try:
         os.remove('tmp/tileindex.shp')
@@ -123,7 +123,7 @@ def test_gdaltindex_1():
 
 def test_gdaltindex_2():
     if test_cli_utilities.get_gdaltindex_path() is None:
-        return 'skip'
+        pytest.skip()
 
     (_, ret_stderr) = gdaltest.runexternal_out_and_err(test_cli_utilities.get_gdaltindex_path() + ' tmp/tileindex.shp tmp/gdaltindex1.tif tmp/gdaltindex2.tif tmp/gdaltindex3.tif tmp/gdaltindex4.tif')
 
@@ -146,7 +146,7 @@ def test_gdaltindex_2():
 
 def test_gdaltindex_3():
     if test_cli_utilities.get_gdaltindex_path() is None:
-        return 'skip'
+        pytest.skip()
 
     drv = gdal.GetDriverByName('GTiff')
     wkt = 'GEOGCS[\"WGS 72\",DATUM[\"WGS_1972\"]]'
@@ -175,7 +175,7 @@ def test_gdaltindex_3():
 
 def test_gdaltindex_4():
     if test_cli_utilities.get_gdaltindex_path() is None:
-        return 'skip'
+        pytest.skip()
 
     drv = gdal.GetDriverByName('GTiff')
     wkt = 'GEOGCS[\"WGS 72\",DATUM[\"WGS_1972\"]]'
@@ -200,7 +200,7 @@ def test_gdaltindex_4():
 
 def test_gdaltindex_5():
     if test_cli_utilities.get_gdaltindex_path() is None:
-        return 'skip'
+        pytest.skip()
 
     drv = gdal.GetDriverByName('GTiff')
 
@@ -226,15 +226,15 @@ def test_gdaltindex_5():
         if src_srs_format == '-src_srs_format PROJ':
             if feat.GetField('src_srs').find('+proj=longlat +ellps=WGS72') != 0:
                 feat.DumpReadable()
-                return 'fail'
+                pytest.fail()
         elif src_srs_format == '-src_srs_format WKT':
             if feat.GetField('src_srs').find('GEOGCS["WGS 72"') != 0:
                 feat.DumpReadable()
-                return 'fail'
+                pytest.fail()
         else:
             if feat.GetField('src_srs') != 'EPSG:4322':
                 feat.DumpReadable()
-                return 'fail'
+                pytest.fail()
         ds = None
 
     return 'success'
@@ -245,7 +245,7 @@ def test_gdaltindex_5():
 
 def test_gdaltindex_6():
     if test_cli_utilities.get_gdaltindex_path() is None:
-        return 'skip'
+        pytest.skip()
 
     for option in ['', '-lyr_name tileindex']:
         gdal.PushErrorHandler('CPLQuietErrorHandler')
diff --git a/autotest/utilities/test_gdaltransform.py b/autotest/utilities/test_gdaltransform.py
index 625dd50b4172..f716e82a0a3e 100755
--- a/autotest/utilities/test_gdaltransform.py
+++ b/autotest/utilities/test_gdaltransform.py
@@ -33,6 +33,7 @@
 
 import gdaltest
 import test_cli_utilities
+import pytest
 
 ###############################################################################
 # Test -s_srs and -t_srs
@@ -40,7 +41,7 @@
 
 def test_gdaltransform_1():
     if test_cli_utilities.get_gdaltransform_path() is None:
-        return 'skip'
+        pytest.skip()
 
     strin = '2 49 1\n' + '3 50 2\n'
     ret = gdaltest.runexternal(test_cli_utilities.get_gdaltransform_path() + ' -s_srs EPSG:4326 -t_srs EPSG:4326', strin)
@@ -56,7 +57,7 @@ def test_gdaltransform_1():
 
 def test_gdaltransform_2():
     if test_cli_utilities.get_gdaltransform_path() is None:
-        return 'skip'
+        pytest.skip()
 
     strin = '0 0\n' + '20 0\n' + '20 20\n' + '0 20\n'
     ret = gdaltest.runexternal(test_cli_utilities.get_gdaltransform_path() + ' -gcp 0 0  440720.000 3751320.000 -gcp 20 0 441920.000 3751320.000 -gcp 20 20 441920.000 3750120.000 0 -gcp 0 20 440720.000 3750120.000', strin)
@@ -74,7 +75,7 @@ def test_gdaltransform_2():
 
 def test_gdaltransform_3():
     if test_cli_utilities.get_gdaltransform_path() is None:
-        return 'skip'
+        pytest.skip()
 
     strin = '0 0\n' + '20 0\n' + '20 20\n' + '0 20\n'
     ret = gdaltest.runexternal(test_cli_utilities.get_gdaltransform_path() + ' -tps -gcp 0 0  440720.000 3751320.000 -gcp 20 0 441920.000 3751320.000 -gcp 20 20 441920.000 3750120.000 0 -gcp 0 20 440720.000 3750120.000', strin)
@@ -92,7 +93,7 @@ def test_gdaltransform_3():
 
 def test_gdaltransform_4():
     if test_cli_utilities.get_gdaltransform_path() is None:
-        return 'skip'
+        pytest.skip()
 
     strin = '0 0\n' + '20 0\n' + '20 20\n' + '0 20\n'
     ret = gdaltest.runexternal(test_cli_utilities.get_gdaltransform_path() + ' -order 1 -gcp 0 0  440720.000 3751320.000 -gcp 20 0 441920.000 3751320.000 -gcp 20 20 441920.000 3750120.000 0 -gcp 0 20 440720.000 3750120.000', strin)
@@ -110,7 +111,7 @@ def test_gdaltransform_4():
 
 def test_gdaltransform_5():
     if test_cli_utilities.get_gdaltransform_path() is None:
-        return 'skip'
+        pytest.skip()
 
     strin = '0 0\n'
     ret = gdaltest.runexternal(test_cli_utilities.get_gdaltransform_path() + ' -t_srs EPSG:26711 ../gcore/data/byte.tif', strin)
@@ -129,7 +130,7 @@ def test_gdaltransform_5():
 
 def test_gdaltransform_6():
     if test_cli_utilities.get_gdaltransform_path() is None:
-        return 'skip'
+        pytest.skip()
 
     strin = '440720 3751320\n'
     ret = gdaltest.runexternal(test_cli_utilities.get_gdaltransform_path() + ' ../gcore/data/byte.tif ../gcore/data/byte.tif', strin)
@@ -148,7 +149,7 @@ def test_gdaltransform_6():
 
 def test_gdaltransform_7():
     if test_cli_utilities.get_gdaltransform_path() is None:
-        return 'skip'
+        pytest.skip()
 
     strin = '440720 3751320\n'
     ret = gdaltest.runexternal(test_cli_utilities.get_gdaltransform_path() + ' -t_srs EPSG:26711 ../gcore/data/byte.tif -i', strin)
@@ -167,7 +168,7 @@ def test_gdaltransform_7():
 
 def test_gdaltransform_8():
     if test_cli_utilities.get_gdaltransform_path() is None:
-        return 'skip'
+        pytest.skip()
 
     strin = '2 49 1\n'
     ret = gdaltest.runexternal(test_cli_utilities.get_gdaltransform_path() + ' -to "SRC_SRS=WGS84" -to "DST_SRS=WGS84"', strin)
@@ -182,7 +183,7 @@ def test_gdaltransform_8():
 
 def test_gdaltransform_9():
     if test_cli_utilities.get_gdaltransform_path() is None:
-        return 'skip'
+        pytest.skip()
 
     strin = '0 0 0\n'
     ret = gdaltest.runexternal(test_cli_utilities.get_gdaltransform_path() + ' ../gcore/data/byte.tif -output_xy', strin)
diff --git a/autotest/utilities/test_gdalwarp.py b/autotest/utilities/test_gdalwarp.py
index 130b0e9840f5..7c20be88e861 100755
--- a/autotest/utilities/test_gdalwarp.py
+++ b/autotest/utilities/test_gdalwarp.py
@@ -37,6 +37,7 @@
 from osgeo import gdal
 import gdaltest
 import test_cli_utilities
+import pytest
 
 ###############################################################################
 # Simple test
@@ -44,7 +45,7 @@
 
 def test_gdalwarp_1():
     if test_cli_utilities.get_gdalwarp_path() is None:
-        return 'skip'
+        pytest.skip()
 
     (_, err) = gdaltest.runexternal_out_and_err(test_cli_utilities.get_gdalwarp_path() + ' ../gcore/data/byte.tif tmp/testgdalwarp1.tif')
     assert (err is None or err == ''), 'got error/warning'
@@ -64,7 +65,7 @@ def test_gdalwarp_1():
 
 def test_gdalwarp_2():
     if test_cli_utilities.get_gdalwarp_path() is None:
-        return 'skip'
+        pytest.skip()
 
     gdaltest.runexternal(test_cli_utilities.get_gdalwarp_path() + ' -of GTiff ../gcore/data/byte.tif tmp/testgdalwarp2.tif')
 
@@ -83,7 +84,7 @@ def test_gdalwarp_2():
 
 def test_gdalwarp_3():
     if test_cli_utilities.get_gdalwarp_path() is None:
-        return 'skip'
+        pytest.skip()
 
     gdaltest.runexternal(test_cli_utilities.get_gdalwarp_path() + ' -ot Int16 ../gcore/data/byte.tif tmp/testgdalwarp3.tif')
 
@@ -104,7 +105,7 @@ def test_gdalwarp_3():
 
 def test_gdalwarp_4():
     if test_cli_utilities.get_gdalwarp_path() is None:
-        return 'skip'
+        pytest.skip()
 
     gdaltest.runexternal(test_cli_utilities.get_gdalwarp_path() + ' -t_srs EPSG:32611 ../gcore/data/byte.tif tmp/testgdalwarp4.tif')
 
@@ -123,10 +124,10 @@ def test_gdalwarp_4():
 
 def test_gdalwarp_5():
     if test_cli_utilities.get_gdalwarp_path() is None:
-        return 'skip'
+        pytest.skip()
 
     if test_cli_utilities.get_gdal_translate_path() is None:
-        return 'skip'
+        pytest.skip()
 
     gdaltest.runexternal(test_cli_utilities.get_gdal_translate_path() + ' -a_srs EPSG:26711 -gcp 0 0  440720.000 3751320.000 -gcp 20 0 441920.000 3751320.000 -gcp 20 20 441920.000 3750120.000 0 -gcp 0 20 440720.000 3750120.000 ../gcore/data/byte.tif tmp/testgdalwarp_gcp.tif')
 
@@ -150,7 +151,7 @@ def test_gdalwarp_5():
 
 def test_gdalwarp_6():
     if test_cli_utilities.get_gdalwarp_path() is None:
-        return 'skip'
+        pytest.skip()
 
     gdaltest.runexternal(test_cli_utilities.get_gdalwarp_path() + ' -tps tmp/testgdalwarp_gcp.tif tmp/testgdalwarp6.tif')
 
@@ -172,7 +173,7 @@ def test_gdalwarp_6():
 
 def test_gdalwarp_7():
     if test_cli_utilities.get_gdalwarp_path() is None:
-        return 'skip'
+        pytest.skip()
 
     gdaltest.runexternal(test_cli_utilities.get_gdalwarp_path() + ' -tr 120 120 tmp/testgdalwarp_gcp.tif tmp/testgdalwarp7.tif')
 
@@ -193,7 +194,7 @@ def test_gdalwarp_7():
 
 def test_gdalwarp_8():
     if test_cli_utilities.get_gdalwarp_path() is None:
-        return 'skip'
+        pytest.skip()
 
     gdaltest.runexternal(test_cli_utilities.get_gdalwarp_path() + ' -ts 10 10 tmp/testgdalwarp_gcp.tif tmp/testgdalwarp8.tif')
 
@@ -214,7 +215,7 @@ def test_gdalwarp_8():
 
 def test_gdalwarp_9():
     if test_cli_utilities.get_gdalwarp_path() is None:
-        return 'skip'
+        pytest.skip()
 
     gdaltest.runexternal(test_cli_utilities.get_gdalwarp_path() + ' -te 440720.000 3750120.000 441920.000 3751320.000 tmp/testgdalwarp_gcp.tif tmp/testgdalwarp9.tif')
 
@@ -234,7 +235,7 @@ def test_gdalwarp_9():
 
 def test_gdalwarp_10():
     if test_cli_utilities.get_gdalwarp_path() is None:
-        return 'skip'
+        pytest.skip()
 
     gdaltest.runexternal(test_cli_utilities.get_gdalwarp_path() + ' -ts 40 40 -rn tmp/testgdalwarp_gcp.tif tmp/testgdalwarp10.tif')
 
@@ -253,7 +254,7 @@ def test_gdalwarp_10():
 
 def test_gdalwarp_11():
     if test_cli_utilities.get_gdalwarp_path() is None:
-        return 'skip'
+        pytest.skip()
 
     gdaltest.runexternal(test_cli_utilities.get_gdalwarp_path() + ' -ts 40 40 -rb tmp/testgdalwarp_gcp.tif tmp/testgdalwarp11.tif')
 
@@ -266,8 +267,7 @@ def test_gdalwarp_11():
 
     if maxdiff > 1:
         gdaltest.compare_ds(ds, ref_ds, verbose=1)
-        gdaltest.post_reason('Image too different from reference')
-        return 'fail'
+        pytest.fail('Image too different from reference')
 
     ds = None
 
@@ -279,7 +279,7 @@ def test_gdalwarp_11():
 
 def test_gdalwarp_12():
     if test_cli_utilities.get_gdalwarp_path() is None:
-        return 'skip'
+        pytest.skip()
 
     gdaltest.runexternal(test_cli_utilities.get_gdalwarp_path() + ' -ts 40 40 -rc tmp/testgdalwarp_gcp.tif tmp/testgdalwarp12.tif')
 
@@ -292,8 +292,7 @@ def test_gdalwarp_12():
     if maxdiff > 1:
         gdaltest.compare_ds(ds, ref_ds, verbose=1)
         ref_ds = None
-        gdaltest.post_reason('Image too different from reference')
-        return 'fail'
+        pytest.fail('Image too different from reference')
 
     ds = None
     ref_ds = None
@@ -306,7 +305,7 @@ def test_gdalwarp_12():
 
 def test_gdalwarp_13():
     if test_cli_utilities.get_gdalwarp_path() is None:
-        return 'skip'
+        pytest.skip()
 
     gdaltest.runexternal(test_cli_utilities.get_gdalwarp_path() + ' -ts 40 40 -rcs tmp/testgdalwarp_gcp.tif tmp/testgdalwarp13.tif')
 
@@ -329,7 +328,7 @@ def test_gdalwarp_13():
 
 def test_gdalwarp_14():
     if test_cli_utilities.get_gdalwarp_path() is None:
-        return 'skip'
+        pytest.skip()
 
     gdaltest.runexternal(test_cli_utilities.get_gdalwarp_path() + ' -ts 40 40 -r lanczos tmp/testgdalwarp_gcp.tif tmp/testgdalwarp14.tif')
 
@@ -352,7 +351,7 @@ def test_gdalwarp_14():
 
 def test_gdalwarp_15():
     if test_cli_utilities.get_gdalwarp_path() is None:
-        return 'skip'
+        pytest.skip()
 
     gdaltest.runexternal(test_cli_utilities.get_gdalwarp_path() + ' -dstnodata 1 -t_srs EPSG:32610 tmp/testgdalwarp_gcp.tif tmp/testgdalwarp15.tif')
 
@@ -373,7 +372,7 @@ def test_gdalwarp_15():
 
 def test_gdalwarp_16():
     if test_cli_utilities.get_gdalwarp_path() is None:
-        return 'skip'
+        pytest.skip()
 
     gdaltest.runexternal(test_cli_utilities.get_gdalwarp_path() + ' -of VRT tmp/testgdalwarp_gcp.tif tmp/testgdalwarp16.vrt')
 
@@ -392,7 +391,7 @@ def test_gdalwarp_16():
 
 def test_gdalwarp_17():
     if test_cli_utilities.get_gdalwarp_path() is None:
-        return 'skip'
+        pytest.skip()
 
     gdaltest.runexternal(test_cli_utilities.get_gdalwarp_path() + ' -dstalpha ../gcore/data/rgbsmall.tif tmp/testgdalwarp17.tif')
 
@@ -411,14 +410,13 @@ def test_gdalwarp_17():
 
 def test_gdalwarp_18():
     if test_cli_utilities.get_gdalwarp_path() is None:
-        return 'skip'
+        pytest.skip()
 
     (_, ret_stderr) = gdaltest.runexternal_out_and_err(test_cli_utilities.get_gdalwarp_path() + ' -wm 20 -multi ../gcore/data/byte.tif tmp/testgdalwarp18.tif')
 
     # This error will be returned if GDAL is not compiled with thread support
     if ret_stderr.find('CPLCreateThread() failed in ChunkAndWarpMulti()') != -1:
-        print('GDAL not compiled with thread support')
-        return 'skip'
+        pytest.skip('GDAL not compiled with thread support')
 
     ds = gdal.Open('tmp/testgdalwarp18.tif')
     assert ds is not None
@@ -435,7 +433,7 @@ def test_gdalwarp_18():
 
 def test_gdalwarp_19():
     if test_cli_utilities.get_gdalwarp_path() is None:
-        return 'skip'
+        pytest.skip()
 
     gdaltest.runexternal(test_cli_utilities.get_gdalwarp_path() + ' -et 0 tmp/testgdalwarp_gcp.tif tmp/testgdalwarp19.tif')
 
@@ -454,7 +452,7 @@ def test_gdalwarp_19():
 
 def test_gdalwarp_20():
     if test_cli_utilities.get_gdalwarp_path() is None:
-        return 'skip'
+        pytest.skip()
 
     gdaltest.runexternal(test_cli_utilities.get_gdalwarp_path() + ' -of VRT -et 0 tmp/testgdalwarp_gcp.tif tmp/testgdalwarp20.vrt')
 
@@ -473,7 +471,7 @@ def test_gdalwarp_20():
 
 def test_gdalwarp_21():
     if test_cli_utilities.get_gdalwarp_path() is None:
-        return 'skip'
+        pytest.skip()
 
     gdaltest.runexternal(test_cli_utilities.get_gdalwarp_path() + ' ../gcore/data/utmsmall.tif tmp/testgdalwarp21.tif -cutline data/cutline.vrt -cl cutline')
 
@@ -492,7 +490,7 @@ def test_gdalwarp_21():
 
 def test_gdalwarp_22():
     if test_cli_utilities.get_gdalwarp_path() is None:
-        return 'skip'
+        pytest.skip()
 
     gdaltest.runexternal(test_cli_utilities.get_gdalwarp_path() + ' ../gcore/data/utmsmall.tif tmp/testgdalwarp22.tif -cutline data/cutline.vrt -cl cutline -tr 30 30')
 
@@ -511,7 +509,7 @@ def test_gdalwarp_22():
 
 def test_gdalwarp_23():
     if test_cli_utilities.get_gdalwarp_path() is None:
-        return 'skip'
+        pytest.skip()
 
     gdaltest.runexternal(test_cli_utilities.get_gdalwarp_path() + ' -wo CUTLINE_ALL_TOUCHED=TRUE ../gcore/data/utmsmall.tif tmp/testgdalwarp23.tif -cutline data/cutline.vrt -cl cutline')
 
@@ -530,7 +528,7 @@ def test_gdalwarp_23():
 
 def test_gdalwarp_24():
     if test_cli_utilities.get_gdalwarp_path() is None:
-        return 'skip'
+        pytest.skip()
 
     ds = gdal.GetDriverByName('GTiff').Create('tmp/testgdalwarp24src.tif', 100, 100)
     ds.SetGeoTransform([179.5, 0.01, 0, 45, 0, -0.01])
@@ -555,7 +553,7 @@ def test_gdalwarp_24():
 
 def test_gdalwarp_25():
     if test_cli_utilities.get_gdalwarp_path() is None:
-        return 'skip'
+        pytest.skip()
 
     gdaltest.runexternal(test_cli_utilities.get_gdalwarp_path() + ' -t_srs "+proj=sinu" data/w_jpeg.tiff tmp/testgdalwarp25.tif')
 
@@ -580,7 +578,7 @@ def test_gdalwarp_25():
 
 def test_gdalwarp_26():
     if test_cli_utilities.get_gdalwarp_path() is None:
-        return 'skip'
+        pytest.skip()
 
     gdaltest.runexternal(test_cli_utilities.get_gdalwarp_path() + ' -t_srs "+proj=eck4" data/w_jpeg.tiff tmp/testgdalwarp26.tif')
 
@@ -605,7 +603,7 @@ def test_gdalwarp_26():
 
 def test_gdalwarp_27():
     if test_cli_utilities.get_gdalwarp_path() is None:
-        return 'skip'
+        pytest.skip()
 
     gdaltest.runexternal(test_cli_utilities.get_gdalwarp_path() + ' -t_srs "+proj=vandg" data/w_jpeg.tiff tmp/testgdalwarp27.tif')
 
@@ -630,7 +628,7 @@ def test_gdalwarp_27():
 
 def test_gdalwarp_28():
     if test_cli_utilities.get_gdalwarp_path() is None:
-        return 'skip'
+        pytest.skip()
 
     gdaltest.runexternal(test_cli_utilities.get_gdalwarp_path() + ' -t_srs "+proj=aeqd +lat_0=45 +lon_0=90" data/w_jpeg.tiff tmp/testgdalwarp28.tif')
 
@@ -665,7 +663,7 @@ def test_gdalwarp_28():
 
 def test_gdalwarp_29():
     if test_cli_utilities.get_gdalwarp_path() is None:
-        return 'skip'
+        pytest.skip()
 
     gdaltest.runexternal(test_cli_utilities.get_gdalwarp_path() + ' -t_srs EPSG:3785 data/w_jpeg.tiff tmp/testgdalwarp29.tif')
 
@@ -690,7 +688,7 @@ def test_gdalwarp_29():
 
 def test_gdalwarp_30():
     if test_cli_utilities.get_gdalwarp_path() is None:
-        return 'skip'
+        pytest.skip()
 
     # First run : no parameter
     gdaltest.runexternal(test_cli_utilities.get_gdalwarp_path() + " data/w_jpeg.tiff tmp/testgdalwarp30_1.tif  -t_srs EPSG:3785 -co COMPRESS=LZW -wm 500000  --config GDAL_CACHEMAX 1 -ts 1000 500 -co TILED=YES")
@@ -743,7 +741,7 @@ def test_gdalwarp_30():
 
 def test_gdalwarp_31():
     if test_cli_utilities.get_gdalwarp_path() is None:
-        return 'skip'
+        pytest.skip()
 
     gdaltest.runexternal(test_cli_utilities.get_gdalwarp_path() + " ../gcore/data/byte.tif tmp/testgdalwarp31.tif")
 
@@ -773,7 +771,7 @@ def test_gdalwarp_31():
 
 def test_gdalwarp_32():
     if test_cli_utilities.get_gdalwarp_path() is None:
-        return 'skip'
+        pytest.skip()
 
     (_, err) = gdaltest.runexternal_out_and_err(test_cli_utilities.get_gdalwarp_path() + ' -tap ../gcore/data/byte.tif tmp/testgdalwarp32.tif',
                                                 check_memleak=False)
@@ -802,9 +800,9 @@ def test_gdalwarp_32():
 
 def test_gdalwarp_33():
     if test_cli_utilities.get_gdalwarp_path() is None:
-        return 'skip'
+        pytest.skip()
     if test_cli_utilities.get_gdal_translate_path() is None:
-        return 'skip'
+        pytest.skip()
 
     gdaltest.runexternal(test_cli_utilities.get_gdalwarp_path() + ' -dstalpha ../gcore/data/ycbcr_with_mask.tif tmp/testgdalwarp33.tif')
 
@@ -839,9 +837,9 @@ def test_gdalwarp_33():
 
 def test_gdalwarp_34():
     if test_cli_utilities.get_gdalwarp_path() is None:
-        return 'skip'
+        pytest.skip()
     if test_cli_utilities.get_gdal_translate_path() is None:
-        return 'skip'
+        pytest.skip()
 
     try:
         os.remove('tmp/testgdalwarp34.tif')
@@ -879,7 +877,7 @@ def test_gdalwarp_34():
 
 def test_gdalwarp_35():
     if test_cli_utilities.get_gdalwarp_path() is None:
-        return 'skip'
+        pytest.skip()
 
     gdaltest.runexternal(test_cli_utilities.get_gdalwarp_path() + ' -ts 20 20 -te 440720.000 3750120.000 441920.000 3751320.000 ../gcore/data/byte.tif tmp/testgdalwarp35.tif')
 
@@ -899,7 +897,7 @@ def test_gdalwarp_35():
 
 def test_gdalwarp_36():
     if test_cli_utilities.get_gdalwarp_path() is None:
-        return 'skip'
+        pytest.skip()
 
     gdaltest.runexternal(test_cli_utilities.get_gdalwarp_path() + ' -tr 60 60 -te 440720.000 3750120.000 441920.000 3751320.000 ../gcore/data/byte.tif tmp/testgdalwarp36.tif')
 
@@ -919,7 +917,7 @@ def test_gdalwarp_36():
 
 def test_gdalwarp_37():
     if test_cli_utilities.get_gdalwarp_path() is None:
-        return 'skip'
+        pytest.skip()
 
     gdaltest.runexternal(test_cli_utilities.get_gdalwarp_path() + ' -tr 60 60 ./data/utmsmall.tif tmp/testgdalwarp37.tif')
 
@@ -947,7 +945,7 @@ def test_gdalwarp_37():
 
 def test_gdalwarp_38():
     if test_cli_utilities.get_gdalwarp_path() is None:
-        return 'skip'
+        pytest.skip()
 
     gdaltest.runexternal(test_cli_utilities.get_gdalwarp_path() + ' data/withnodata.asc tmp/testgdalwarp38.tif')
 
@@ -964,7 +962,7 @@ def test_gdalwarp_38():
 
 def test_gdalwarp_39():
     if test_cli_utilities.get_gdalwarp_path() is None:
-        return 'skip'
+        pytest.skip()
 
     gdaltest.runexternal(test_cli_utilities.get_gdalwarp_path() + ' ../gdrivers/data/float64.asc tmp/test_gdalwarp_39.tif -oo DATATYPE=Float64 -overwrite')
 
@@ -980,7 +978,7 @@ def test_gdalwarp_39():
 
 def test_gdalwarp_40():
     if test_cli_utilities.get_gdalwarp_path() is None:
-        return 'skip'
+        pytest.skip()
 
     src_ds = gdal.Open('../gcore/data/byte.tif')
     out_ds = gdal.GetDriverByName('GTiff').CreateCopy('tmp/test_gdalwarp_40_src.tif', src_ds)
@@ -1107,7 +1105,7 @@ def test_gdalwarp_40():
 
 def test_gdalwarp_41():
     if test_cli_utilities.get_gdalwarp_path() is None:
-        return 'skip'
+        pytest.skip()
 
     src_ds = gdal.GetDriverByName('GTiff').Create('tmp/test_gdalwarp_41_src.tif', 666, 666)
     src_ds.SetGeoTransform([-3333500, 10010.510510510510358, 0, 3333500.000000000000000, 0, -10010.510510510510358])
@@ -1153,9 +1151,9 @@ def test_gdalwarp_41():
 
 def test_gdalwarp_42():
     if test_cli_utilities.get_gdalwarp_path() is None:
-        return 'skip'
+        pytest.skip()
     if test_cli_utilities.get_gdal_translate_path() is None:
-        return 'skip'
+        pytest.skip()
 
     gdaltest.runexternal(test_cli_utilities.get_gdal_translate_path() + ' ../gdrivers/data/small_world.tif tmp/small_world_left.tif -srcwin 0 0 200 200 -a_nodata 255')
     gdaltest.runexternal(test_cli_utilities.get_gdal_translate_path() + ' ../gdrivers/data/small_world.tif tmp/small_world_right.tif -srcwin 200 0 200 200  -a_nodata 255')
@@ -1205,9 +1203,9 @@ def test_gdalwarp_42():
 
 def test_gdalwarp_43():
     if test_cli_utilities.get_gdalwarp_path() is None:
-        return 'skip'
+        pytest.skip()
     if test_cli_utilities.get_gdal_translate_path() is None:
-        return 'skip'
+        pytest.skip()
 
     gdaltest.runexternal(test_cli_utilities.get_gdal_translate_path() + ' ../gdrivers/data/small_world.tif tmp/small_world.tif -mo "FOO=BAR" -mo "NODATA_VALUES=62 93 23"')
 
@@ -1228,7 +1226,7 @@ def test_gdalwarp_43():
 
 def test_gdalwarp_44():
     if test_cli_utilities.get_gdalwarp_path() is None:
-        return 'skip'
+        pytest.skip()
 
     # Without  -wo SRC_COORD_PRECISION
     gdaltest.runexternal(test_cli_utilities.get_gdalwarp_path() + ' -q ../gcore/data/byte.tif tmp/test_gdalwarp_44.tif -wm 10 -overwrite -ts 500 500 -r cubic -ot float32 -t_srs EPSG:4326')
@@ -1265,7 +1263,7 @@ def test_gdalwarp_44():
 
 def test_gdalwarp_45():
     if test_cli_utilities.get_gdalwarp_path() is None:
-        return 'skip'
+        pytest.skip()
 
     gdaltest.runexternal(test_cli_utilities.get_gdalwarp_path() + ' -te_srs EPSG:4267 -te -117.641087629972 33.8915301685897 -117.628190189534 33.9024195619201 ../gcore/data/byte.tif tmp/test_gdalwarp_45.tif -overwrite')
 
@@ -1289,9 +1287,9 @@ def test_gdalwarp_45():
 
 def test_gdalwarp_46():
     if test_cli_utilities.get_gdalwarp_path() is None:
-        return 'skip'
+        pytest.skip()
     if test_cli_utilities.get_ogr2ogr_path() is None:
-        return 'skip'
+        pytest.skip()
 
     gdaltest.runexternal(test_cli_utilities.get_gdalwarp_path() + ' ../gcore/data/utmsmall.tif tmp/test_gdalwarp_46.tif -cutline data/cutline.vrt -crop_to_cutline -overwrite')
 
diff --git a/autotest/utilities/test_gdalwarp_lib.py b/autotest/utilities/test_gdalwarp_lib.py
index 3ee1831369ed..e6c2e344a39f 100755
--- a/autotest/utilities/test_gdalwarp_lib.py
+++ b/autotest/utilities/test_gdalwarp_lib.py
@@ -219,8 +219,7 @@ def test_gdalwarp_lib_11():
 
     if maxdiff > 1:
         gdaltest.compare_ds(ds, ref_ds, verbose=1)
-        gdaltest.post_reason('Image too different from reference')
-        return 'fail'
+        pytest.fail('Image too different from reference')
 
     ds = None
 
@@ -240,8 +239,7 @@ def test_gdalwarp_lib_12():
 
     if maxdiff > 1:
         gdaltest.compare_ds(ds, ref_ds, verbose=1)
-        gdaltest.post_reason('Image too different from reference')
-        return 'fail'
+        pytest.fail('Image too different from reference')
 
     ds = None
 
@@ -261,8 +259,7 @@ def test_gdalwarp_lib_13():
 
     if maxdiff > 1:
         gdaltest.compare_ds(ds, ref_ds, verbose=1)
-        gdaltest.post_reason('Image too different from reference')
-        return 'fail'
+        pytest.fail('Image too different from reference')
 
     ds = None
 
@@ -282,8 +279,7 @@ def test_gdalwarp_lib_14():
 
     if maxdiff > 1:
         gdaltest.compare_ds(ds, ref_ds, verbose=1)
-        gdaltest.post_reason('Image too different from reference')
-        return 'fail'
+        pytest.fail('Image too different from reference')
 
     ds = None
 
@@ -905,7 +901,7 @@ def test_gdalwarp_lib_125():
 def test_gdalwarp_lib_126():
 
     if not ogrtest.have_geos():
-        return 'skip'
+        pytest.skip()
 
     ds = ogr.GetDriverByName('ESRI Shapefile').CreateDataSource('/vsimem/cutline.shp')
     lyr = ds.CreateLayer('cutline')
@@ -1014,7 +1010,7 @@ def test_gdalwarp_lib_128():
 
 def test_gdalwarp_lib_129():
     if not ogrtest.have_geos():
-        return 'skip'
+        pytest.skip()
 
     mem_ds = gdal.GetDriverByName('MEM').Create('', 1000, 2000)
     rpc = ["HEIGHT_OFF=1767",
@@ -1577,7 +1573,7 @@ def test_gdalwarp_lib_override_default_output_nodata():
 
     drv = gdal.GetDriverByName('netCDF')
     if drv is None:
-        return 'skip'
+        pytest.skip()
 
     creationoptionlist = drv.GetMetadataItem('DMD_CREATIONOPTIONLIST')
     formats = ['NC']
diff --git a/autotest/utilities/test_gnmutils.py b/autotest/utilities/test_gnmutils.py
index 2d3248989953..67927b4a6478 100755
--- a/autotest/utilities/test_gnmutils.py
+++ b/autotest/utilities/test_gnmutils.py
@@ -37,6 +37,7 @@
 
 import gdaltest
 import test_cli_utilities
+import pytest
 
 ###############################################################################
 # Test create
@@ -45,7 +46,7 @@
 
 def test_gnmmanage_1():
     if test_cli_utilities.get_gnmmanage_path() is None:
-        return 'skip'
+        pytest.skip()
 
     (_, err) = gdaltest.runexternal_out_and_err(test_cli_utilities.get_gnmmanage_path() + ' create -f GNMFile -t_srs EPSG:4326 -dsco net_name=test_gnm -dsco net_description="Test file based GNM" tmp')
     assert (err is None or err == ''), 'got error/warning'
@@ -53,8 +54,7 @@ def test_gnmmanage_1():
     try:
         os.stat('tmp/test_gnm')
     except OSError:
-        gdaltest.post_reason('Expected create tmp/test_gnm')
-        return 'fail'
+        pytest.fail('Expected create tmp/test_gnm')
 
     return 'success'
 
@@ -66,7 +66,7 @@ def test_gnmmanage_1():
 
 def test_gnmmanage_2():
     if test_cli_utilities.get_gnmmanage_path() is None:
-        return 'skip'
+        pytest.skip()
 
     (_, err) = gdaltest.runexternal_out_and_err(test_cli_utilities.get_gnmmanage_path() + ' import ../gnm/data/pipes.shp tmp/test_gnm')
     assert (err is None or err == ''), 'got error/warning'
@@ -83,7 +83,7 @@ def test_gnmmanage_2():
 
 def test_gnmmanage_3():
     if test_cli_utilities.get_gnmmanage_path() is None:
-        return 'skip'
+        pytest.skip()
 
     ret = gdaltest.runexternal(test_cli_utilities.get_gnmmanage_path() + ' info tmp/test_gnm')
 
@@ -100,7 +100,7 @@ def test_gnmmanage_3():
 
 def test_gnmmanage_4():
     if test_cli_utilities.get_gnmmanage_path() is None:
-        return 'skip'
+        pytest.skip()
 
     ret = gdaltest.runexternal(test_cli_utilities.get_gnmmanage_path() + ' autoconnect 0.000001 tmp/test_gnm')
     assert ret.find('success') != -1
@@ -114,9 +114,9 @@ def test_gnmmanage_4():
 
 def test_gnmanalyse_1():
     if test_cli_utilities.get_gnmmanage_path() is None:
-        return 'skip'
+        pytest.skip()
     if test_cli_utilities.get_gnmanalyse_path() is None:
-        return 'skip'
+        pytest.skip()
 
     ret = gdaltest.runexternal(test_cli_utilities.get_gnmanalyse_path() + ' dijkstra 61 50 tmp/test_gnm')
     assert ret.find('Feature Count: 19') != -1
@@ -130,9 +130,9 @@ def test_gnmanalyse_1():
 
 def test_gnmanalyse_2():
     if test_cli_utilities.get_gnmmanage_path() is None:
-        return 'skip'
+        pytest.skip()
     if test_cli_utilities.get_gnmanalyse_path() is None:
-        return 'skip'
+        pytest.skip()
 
     ret = gdaltest.runexternal(test_cli_utilities.get_gnmanalyse_path() + ' kpaths 61 50 3 tmp/test_gnm')
     assert ret.find('Feature Count: 61') != -1
@@ -145,15 +145,14 @@ def test_gnmanalyse_2():
 
 def test_gnm_cleanup():
     if test_cli_utilities.get_gnmmanage_path() is None:
-        return 'skip'
+        pytest.skip()
 
     (_, err) = gdaltest.runexternal_out_and_err(test_cli_utilities.get_gnmmanage_path() + ' delete tmp/test_gnm')
     assert (err is None or err == ''), 'got error/warning'
 
     try:
         os.stat('tmp/test_gnm')
-        gdaltest.post_reason('Expected delete tmp/test_gnm')
-        return 'fail'
+        pytest.fail('Expected delete tmp/test_gnm')
     except OSError:
         pass
 
diff --git a/autotest/utilities/test_nearblack.py b/autotest/utilities/test_nearblack.py
index 7de282c7ef15..98021ddd90a5 100755
--- a/autotest/utilities/test_nearblack.py
+++ b/autotest/utilities/test_nearblack.py
@@ -37,6 +37,7 @@
 from osgeo import gdal
 import gdaltest
 import test_cli_utilities
+import pytest
 
 ###############################################################################
 # Basic test
@@ -44,7 +45,7 @@
 
 def test_nearblack_1():
     if test_cli_utilities.get_nearblack_path() is None:
-        return 'skip'
+        pytest.skip()
 
     (_, err) = gdaltest.runexternal_out_and_err(test_cli_utilities.get_nearblack_path() + ' ../gdrivers/data/rgbsmall.tif -nb 0 -of GTiff -o tmp/nearblack1.tif')
     assert (err is None or err == ''), 'got error/warning'
@@ -78,7 +79,7 @@ def test_nearblack_1():
 
 def test_nearblack_2():
     if test_cli_utilities.get_nearblack_path() is None:
-        return 'skip'
+        pytest.skip()
 
     gdaltest.runexternal(test_cli_utilities.get_nearblack_path() + ' ../gdrivers/data/rgbsmall.tif -setalpha -nb 0 -of GTiff -o tmp/nearblack2.tif -co TILED=YES')
 
@@ -97,7 +98,7 @@ def test_nearblack_2():
 
 def test_nearblack_3():
     if test_cli_utilities.get_nearblack_path() is None:
-        return 'skip'
+        pytest.skip()
 
     shutil.copy('tmp/nearblack2.tif', 'tmp/nearblack3.tif')
     gdaltest.runexternal(test_cli_utilities.get_nearblack_path() + ' -setalpha -nb 0 -of GTiff tmp/nearblack3.tif')
@@ -117,9 +118,9 @@ def test_nearblack_3():
 
 def test_nearblack_4():
     if test_cli_utilities.get_nearblack_path() is None:
-        return 'skip'
+        pytest.skip()
     if test_cli_utilities.get_gdalwarp_path() is None:
-        return 'skip'
+        pytest.skip()
 
     gdaltest.runexternal(test_cli_utilities.get_gdalwarp_path() + ' -wo "INIT_DEST=255" ../gdrivers/data/rgbsmall.tif  tmp/nearblack4_src.tif -srcnodata 0')
     gdaltest.runexternal(test_cli_utilities.get_nearblack_path() + ' -q -setalpha -white -nb 0 -of GTiff tmp/nearblack4_src.tif -o tmp/nearblack4.tif')
@@ -139,7 +140,7 @@ def test_nearblack_4():
 
 def test_nearblack_5():
     if test_cli_utilities.get_nearblack_path() is None:
-        return 'skip'
+        pytest.skip()
 
     gdaltest.runexternal(test_cli_utilities.get_nearblack_path() + ' ../gdrivers/data/rgbsmall.tif --config GDAL_TIFF_INTERNAL_MASK NO -setmask -nb 0 -of GTiff -o tmp/nearblack5.tif -co TILED=YES')
 
@@ -159,7 +160,7 @@ def test_nearblack_5():
 
 def test_nearblack_6():
     if test_cli_utilities.get_nearblack_path() is None:
-        return 'skip'
+        pytest.skip()
 
     shutil.copy('tmp/nearblack5.tif', 'tmp/nearblack6.tif')
     shutil.copy('tmp/nearblack5.tif.msk', 'tmp/nearblack6.tif.msk')
@@ -182,7 +183,7 @@ def test_nearblack_6():
 
 def test_nearblack_7():
     if test_cli_utilities.get_nearblack_path() is None:
-        return 'skip'
+        pytest.skip()
 
     gdaltest.runexternal(test_cli_utilities.get_nearblack_path() + ' data/whiteblackred.tif -o tmp/nearblack7.tif -color 0,0,0 -color 255,255,255 -of GTiff')
 
@@ -203,7 +204,7 @@ def test_nearblack_7():
 
 def test_nearblack_8():
     if test_cli_utilities.get_nearblack_path() is None:
-        return 'skip'
+        pytest.skip()
 
     src_ds = gdal.Open('../gdrivers/data/rgbsmall.tif')
     gdal.GetDriverByName('GTiff').CreateCopy('tmp/nearblack8.tif', src_ds)
diff --git a/autotest/utilities/test_ogr2ogr.py b/autotest/utilities/test_ogr2ogr.py
index c76ac25cdd2a..86d9917c84ed 100755
--- a/autotest/utilities/test_ogr2ogr.py
+++ b/autotest/utilities/test_ogr2ogr.py
@@ -47,7 +47,7 @@
 
 def test_ogr2ogr_1():
     if test_cli_utilities.get_ogr2ogr_path() is None:
-        return 'skip'
+        pytest.skip()
 
     try:
         os.stat('tmp/poly.shp')
@@ -79,7 +79,7 @@ def test_ogr2ogr_1():
 
 def test_ogr2ogr_2():
     if test_cli_utilities.get_ogr2ogr_path() is None:
-        return 'skip'
+        pytest.skip()
 
     try:
         os.stat('tmp/poly.shp')
@@ -103,7 +103,7 @@ def test_ogr2ogr_2():
 
 def test_ogr2ogr_3():
     if test_cli_utilities.get_ogr2ogr_path() is None:
-        return 'skip'
+        pytest.skip()
 
     try:
         os.stat('tmp/poly.shp')
@@ -130,7 +130,7 @@ def test_ogr2ogr_3():
 
 def test_ogr2ogr_4():
     if test_cli_utilities.get_ogr2ogr_path() is None:
-        return 'skip'
+        pytest.skip()
 
     try:
         os.stat('tmp/poly.shp')
@@ -154,7 +154,7 @@ def test_ogr2ogr_4():
 
 def test_ogr2ogr_5():
     if test_cli_utilities.get_ogr2ogr_path() is None:
-        return 'skip'
+        pytest.skip()
 
     try:
         os.stat('tmp/poly.shp')
@@ -192,13 +192,13 @@ def test_ogr2ogr_6():
     import ogr_pg
 
     if test_cli_utilities.get_ogr2ogr_path() is None:
-        return 'skip'
+        pytest.skip()
     if test_cli_utilities.get_ogrinfo_path() is None:
-        return 'skip'
+        pytest.skip()
 
     ogr_pg.ogr_pg_1()
     if gdaltest.pg_ds is None:
-        return 'skip'
+        pytest.skip()
     gdaltest.pg_ds.Destroy()
 
     gdaltest.runexternal(test_cli_utilities.get_ogrinfo_path() + ' PG:"' + gdaltest.pg_connection_string + '" -sql "DELLAYER:tpoly"')
@@ -223,13 +223,13 @@ def test_ogr2ogr_7():
     import ogr_pg
 
     if test_cli_utilities.get_ogr2ogr_path() is None:
-        return 'skip'
+        pytest.skip()
     if test_cli_utilities.get_ogrinfo_path() is None:
-        return 'skip'
+        pytest.skip()
 
     ogr_pg.ogr_pg_1()
     if gdaltest.pg_ds is None:
-        return 'skip'
+        pytest.skip()
     gdaltest.pg_ds.Destroy()
 
     gdaltest.runexternal(test_cli_utilities.get_ogrinfo_path() + ' PG:"' + gdaltest.pg_connection_string + '" -sql "DELLAYER:tpoly"')
@@ -250,7 +250,7 @@ def test_ogr2ogr_7():
 
 def test_ogr2ogr_8():
     if test_cli_utilities.get_ogr2ogr_path() is None:
-        return 'skip'
+        pytest.skip()
 
     try:
         os.stat('tmp/poly.shp')
@@ -274,7 +274,7 @@ def test_ogr2ogr_8():
 
 def test_ogr2ogr_9():
     if test_cli_utilities.get_ogr2ogr_path() is None:
-        return 'skip'
+        pytest.skip()
 
     try:
         os.stat('tmp/poly.shp')
@@ -298,7 +298,7 @@ def test_ogr2ogr_9():
 
 def test_ogr2ogr_10():
     if test_cli_utilities.get_ogr2ogr_path() is None:
-        return 'skip'
+        pytest.skip()
 
     try:
         os.stat('tmp/poly.shp')
@@ -335,7 +335,7 @@ def test_ogr2ogr_10():
 
 def test_ogr2ogr_11():
     if test_cli_utilities.get_ogr2ogr_path() is None:
-        return 'skip'
+        pytest.skip()
 
     try:
         os.stat('tmp/poly.shp')
@@ -359,7 +359,7 @@ def test_ogr2ogr_11():
 
 def test_ogr2ogr_12():
     if test_cli_utilities.get_ogr2ogr_path() is None:
-        return 'skip'
+        pytest.skip()
 
     try:
         os.stat('tmp/poly.shp')
@@ -383,7 +383,7 @@ def test_ogr2ogr_12():
 
 def test_ogr2ogr_13():
     if test_cli_utilities.get_ogr2ogr_path() is None:
-        return 'skip'
+        pytest.skip()
 
     try:
         os.stat('tmp/poly.shp')
@@ -407,7 +407,7 @@ def test_ogr2ogr_13():
 
 def test_ogr2ogr_14():
     if test_cli_utilities.get_ogr2ogr_path() is None:
-        return 'skip'
+        pytest.skip()
 
     try:
         os.stat('tmp/poly.shp')
@@ -434,7 +434,7 @@ def test_ogr2ogr_14():
 def test_ogr2ogr_15():
 
     if test_cli_utilities.get_ogr2ogr_path() is None:
-        return 'skip'
+        pytest.skip()
 
     try:
         os.stat('tmp/poly.shp')
@@ -465,7 +465,7 @@ def test_ogr2ogr_15():
 def test_ogr2ogr_16():
 
     if test_cli_utilities.get_ogr2ogr_path() is None:
-        return 'skip'
+        pytest.skip()
 
     try:
         os.stat('tmp/poly.shp')
@@ -494,7 +494,7 @@ def test_ogr2ogr_16():
 def test_ogr2ogr_17():
 
     if test_cli_utilities.get_ogr2ogr_path() is None:
-        return 'skip'
+        pytest.skip()
 
     try:
         os.stat('tmp/poly.shp')
@@ -519,10 +519,10 @@ def test_ogr2ogr_17():
 def test_ogr2ogr_18():
 
     if test_cli_utilities.get_ogr2ogr_path() is None:
-        return 'skip'
+        pytest.skip()
 
     if not ogrtest.have_geos():
-        return 'skip'
+        pytest.skip()
 
     try:
         os.stat('tmp/wrapdateline_src.shp')
@@ -566,8 +566,7 @@ def test_ogr2ogr_18():
 
     if ret == 0:
         return 'success'
-    print(got_wkt)
-    return 'fail'
+    pytest.fail(got_wkt)
 
 ###############################################################################
 # Test -clipsrc
@@ -575,10 +574,10 @@ def test_ogr2ogr_18():
 
 def test_ogr2ogr_19():
     if test_cli_utilities.get_ogr2ogr_path() is None:
-        return 'skip'
+        pytest.skip()
 
     if not ogrtest.have_geos():
-        return 'skip'
+        pytest.skip()
 
     try:
         os.stat('tmp/poly.shp')
@@ -608,7 +607,7 @@ def test_ogr2ogr_19():
 
 def test_ogr2ogr_20():
     if test_cli_utilities.get_ogr2ogr_path() is None:
-        return 'skip'
+        pytest.skip()
 
     expected_fields = ['a',
                        'A_1',
@@ -648,10 +647,9 @@ def test_ogr2ogr_20():
     assert ds is not None
     layer_defn = ds.GetLayer(0).GetLayerDefn()
     if layer_defn.GetFieldCount() != 15:
-        gdaltest.post_reason('Unexpected field count: ' + str(ds.GetLayer(0).GetLayerDefn().GetFieldCount()))
         ds.Destroy()
         ogr.GetDriverByName('ESRI Shapefile').DeleteDataSource('tmp/Fields.dbf')
-        return 'fail'
+        pytest.fail('Unexpected field count: ' + str(ds.GetLayer(0).GetLayerDefn().GetFieldCount()))
 
     error_occurred = False
     feat = ds.GetLayer(0).GetNextFeature()
@@ -677,7 +675,7 @@ def test_ogr2ogr_20():
 
 def test_ogr2ogr_21():
     if test_cli_utilities.get_ogr2ogr_path() is None:
-        return 'skip'
+        pytest.skip()
 
     try:
         os.remove('tmp/testogr2ogr21.gtm')
@@ -695,11 +693,10 @@ def test_ogr2ogr_21():
     feat = lyr.GetNextFeature()
     if feat.GetFieldAsString('name') != 'NAME' or \
        feat.GetFieldAsString('comment') != 'COMMENT':
-        print(feat.GetFieldAsString('name'))
         print(feat.GetFieldAsString('comment'))
         ds.Destroy()
         os.remove('tmp/testogr2ogr21.gtm')
-        return 'fail'
+        pytest.fail(feat.GetFieldAsString('name'))
 
     ds.Destroy()
     os.remove('tmp/testogr2ogr21.gtm')
@@ -712,7 +709,7 @@ def test_ogr2ogr_21():
 
 def test_ogr2ogr_22():
     if test_cli_utilities.get_ogr2ogr_path() is None:
-        return 'skip'
+        pytest.skip()
 
     gdaltest.runexternal(test_cli_utilities.get_ogr2ogr_path() +
                          ' -f "MapInfo File" tmp/testogr2ogr22.mif data/dataforogr2ogr21.csv ' +
@@ -725,11 +722,10 @@ def test_ogr2ogr_22():
     feat = lyr.GetNextFeature()
     if feat.GetFieldAsString('name') != 'NAME' or \
        feat.GetFieldAsString('comment') != 'COMMENT':
-        print(feat.GetFieldAsString('name'))
         print(feat.GetFieldAsString('comment'))
         ds.Destroy()
         ogr.GetDriverByName('MapInfo File').DeleteDataSource('tmp/testogr2ogr22.mif')
-        return 'fail'
+        pytest.fail(feat.GetFieldAsString('name'))
 
     ds.Destroy()
     ogr.GetDriverByName('MapInfo File').DeleteDataSource('tmp/testogr2ogr22.mif')
@@ -742,7 +738,7 @@ def test_ogr2ogr_22():
 
 def test_ogr2ogr_23():
     if test_cli_utilities.get_ogr2ogr_path() is None:
-        return 'skip'
+        pytest.skip()
 
     gdaltest.runexternal(test_cli_utilities.get_ogr2ogr_path() +
                          ' -f "MapInfo File" tmp/testogr2ogr23.mif data/dataforogr2ogr21.csv ' +
@@ -755,11 +751,10 @@ def test_ogr2ogr_23():
     feat = lyr.GetNextFeature()
     if feat.GetFieldAsString('name') != 'NAME' or \
        feat.GetFieldAsString('comment') != 'COMMENT':
-        print(feat.GetFieldAsString('name'))
         print(feat.GetFieldAsString('comment'))
         ds.Destroy()
         ogr.GetDriverByName('MapInfo File').DeleteDataSource('tmp/testogr2ogr23.mif')
-        return 'fail'
+        pytest.fail(feat.GetFieldAsString('name'))
 
     ds.Destroy()
     ogr.GetDriverByName('MapInfo File').DeleteDataSource('tmp/testogr2ogr23.mif')
@@ -772,10 +767,10 @@ def test_ogr2ogr_23():
 
 def test_ogr2ogr_24():
     if test_cli_utilities.get_ogr2ogr_path() is None:
-        return 'skip'
+        pytest.skip()
 
     if not ogrtest.have_geos():
-        return 'skip'
+        pytest.skip()
 
     try:
         os.stat('tmp/poly.shp')
@@ -803,10 +798,10 @@ def test_ogr2ogr_24():
 
 def test_ogr2ogr_25():
     if test_cli_utilities.get_ogr2ogr_path() is None:
-        return 'skip'
+        pytest.skip()
 
     if not ogrtest.have_geos():
-        return 'skip'
+        pytest.skip()
 
     try:
         os.stat('tmp/poly.shp')
@@ -840,10 +835,10 @@ def test_ogr2ogr_25():
 
 def test_ogr2ogr_26():
     if test_cli_utilities.get_ogr2ogr_path() is None:
-        return 'skip'
+        pytest.skip()
 
     if not ogrtest.have_geos():
-        return 'skip'
+        pytest.skip()
 
     try:
         os.stat('tmp/poly.shp')
@@ -871,10 +866,10 @@ def test_ogr2ogr_26():
 
 def test_ogr2ogr_27():
     if test_cli_utilities.get_ogr2ogr_path() is None:
-        return 'skip'
+        pytest.skip()
 
     if not ogrtest.have_geos():
-        return 'skip'
+        pytest.skip()
 
     try:
         os.stat('tmp/poly.shp')
@@ -909,7 +904,7 @@ def test_ogr2ogr_27():
 def test_ogr2ogr_28():
 
     if test_cli_utilities.get_ogr2ogr_path() is None:
-        return 'skip'
+        pytest.skip()
 
     try:
         os.stat('tmp/wrapdateline_src.shp')
@@ -958,10 +953,10 @@ def test_ogr2ogr_28():
 def test_ogr2ogr_29():
 
     if test_cli_utilities.get_ogr2ogr_path() is None:
-        return 'skip'
+        pytest.skip()
 
     if not ogrtest.have_geos():
-        return 'skip'
+        pytest.skip()
 
     for i in range(2):
         try:
@@ -1021,11 +1016,11 @@ def test_ogr2ogr_29():
 def test_ogr2ogr_30():
 
     if test_cli_utilities.get_ogr2ogr_path() is None:
-        return 'skip'
+        pytest.skip()
 
     ds = ogr.Open('../ogr/data/testlistfields.gml')
     if ds is None:
-        return 'skip'
+        pytest.skip()
     ds = None
 
     gdaltest.runexternal(test_cli_utilities.get_ogr2ogr_path() + ' -splitlistfields tmp/test_ogr2ogr_30.dbf ../ogr/data/testlistfields.gml')
@@ -1043,9 +1038,8 @@ def test_ogr2ogr_30():
        feat.GetField('attrib32') != 5 or \
        feat.GetField('attrib41') != 6.1 or \
        feat.GetField('attrib42') != 7.1:
-        gdaltest.post_reason('did not get expected attribs')
         feat.DumpReadable()
-        return 'fail'
+        pytest.fail('did not get expected attribs')
 
     ds = None
     ogr.GetDriverByName('ESRI Shapefile').DeleteDataSource('tmp/test_ogr2ogr_30.dbf')
@@ -1059,7 +1053,7 @@ def test_ogr2ogr_30():
 def test_ogr2ogr_31():
 
     if test_cli_utilities.get_ogr2ogr_path() is None:
-        return 'skip'
+        pytest.skip()
 
     try:
         os.stat('tmp/poly.shp')
@@ -1083,7 +1077,7 @@ def test_ogr2ogr_31():
 def test_ogr2ogr_32():
 
     if test_cli_utilities.get_ogr2ogr_path() is None:
-        return 'skip'
+        pytest.skip()
 
     try:
         os.stat('tmp/test_ogr2ogr_32.shp')
@@ -1115,7 +1109,7 @@ def test_ogr2ogr_32():
 def test_ogr2ogr_33():
 
     if test_cli_utilities.get_ogr2ogr_path() is None:
-        return 'skip'
+        pytest.skip()
 
     try:
         os.stat('tmp/test_ogr2ogr_33_src.csv')
@@ -1144,26 +1138,26 @@ def test_ogr2ogr_33():
     feat = lyr.GetFeature(0)
     if feat.GetField("foo") != 'bar':
         feat.DumpReadable()
-        return 'fail'
+        pytest.fail()
     if feat.GetGeometryRef().ExportToWkt() != 'POLYGON ((10 10,10 11,11 11,11 10,10 10))':
         feat.DumpReadable()
-        return 'fail'
+        pytest.fail()
 
     feat = lyr.GetFeature(1)
     if feat.GetField("foo") != 'bar':
         feat.DumpReadable()
-        return 'fail'
+        pytest.fail()
     if feat.GetGeometryRef().ExportToWkt() != 'POLYGON ((100 100,100 200,200 200,200 100,100 100),(125 125,175 125,175 175,125 175,125 125))':
         feat.DumpReadable()
-        return 'fail'
+        pytest.fail()
 
     feat = lyr.GetFeature(2)
     if feat.GetField("foo") != 'baz':
         feat.DumpReadable()
-        return 'fail'
+        pytest.fail()
     if feat.GetGeometryRef().ExportToWkt() != 'POLYGON ((0 0,0 1,1 1,1 0,0 0))':
         feat.DumpReadable()
-        return 'fail'
+        pytest.fail()
 
     ds = None
 
@@ -1180,7 +1174,7 @@ def test_ogr2ogr_33():
 def test_ogr2ogr_34():
 
     if test_cli_utilities.get_ogr2ogr_path() is None:
-        return 'skip'
+        pytest.skip()
 
     try:
         os.stat('tmp/test_ogr2ogr_34_dir')
@@ -1218,7 +1212,7 @@ def test_ogr2ogr_34():
 def test_ogr2ogr_35():
 
     if test_cli_utilities.get_ogr2ogr_path() is None:
-        return 'skip'
+        pytest.skip()
 
     try:
         os.stat('tmp/test_ogr2ogr_35_dir')
@@ -1256,7 +1250,7 @@ def test_ogr2ogr_35():
 def test_ogr2ogr_36():
 
     if test_cli_utilities.get_ogr2ogr_path() is None:
-        return 'skip'
+        pytest.skip()
 
     try:
         os.stat('tmp/test_ogr2ogr_36.shp')
@@ -1284,7 +1278,7 @@ def test_ogr2ogr_36():
 def test_ogr2ogr_37():
 
     if test_cli_utilities.get_ogr2ogr_path() is None:
-        return 'skip'
+        pytest.skip()
 
     try:
         os.stat('tmp/test_ogr2ogr_37_dir.shp')
@@ -1322,7 +1316,7 @@ def test_ogr2ogr_37():
 def test_ogr2ogr_38():
 
     if test_cli_utilities.get_ogr2ogr_path() is None:
-        return 'skip'
+        pytest.skip()
 
     try:
         os.stat('tmp/test_ogr2ogr_38.shp')
@@ -1349,7 +1343,7 @@ def test_ogr2ogr_38():
 def test_ogr2ogr_39():
 
     if test_cli_utilities.get_ogr2ogr_path() is None:
-        return 'skip'
+        pytest.skip()
 
     try:
         os.stat('tmp/test_ogr2ogr_39_dir.shp')
@@ -1386,11 +1380,11 @@ def test_ogr2ogr_39():
 def test_ogr2ogr_40():
 
     if test_cli_utilities.get_ogr2ogr_path() is None:
-        return 'skip'
+        pytest.skip()
 
     drv = ogr.GetDriverByName('SQLite')
     if drv is None:
-        return 'skip'
+        pytest.skip()
 
     try:
         ogr.GetDriverByName('SQLite').DeleteDataSource('tmp/test_ogr2ogr_40.db')
@@ -1417,11 +1411,11 @@ def test_ogr2ogr_41():
 
     import ogr_pg
     if test_cli_utilities.get_ogr2ogr_path() is None:
-        return 'skip'
+        pytest.skip()
 
     ogr_pg.ogr_pg_1()
     if gdaltest.pg_ds is None:
-        return 'skip'
+        pytest.skip()
     gdaltest.pg_ds.Destroy()
 
     ds = ogr.Open('PG:' + gdaltest.pg_connection_string)
@@ -1457,7 +1451,7 @@ def test_ogr2ogr_41():
 def test_ogr2ogr_42():
 
     if test_cli_utilities.get_ogr2ogr_path() is None:
-        return 'skip'
+        pytest.skip()
 
     try:
         os.stat('tmp/test_ogr2ogr_42.shp')
@@ -1483,7 +1477,7 @@ def test_ogr2ogr_42():
 def test_ogr2ogr_43():
 
     if test_cli_utilities.get_ogr2ogr_path() is None:
-        return 'skip'
+        pytest.skip()
 
     try:
         os.stat('tmp/test_ogr2ogr_43_3d.shp')
@@ -1523,7 +1517,7 @@ def test_ogr2ogr_43():
 def test_ogr2ogr_44():
 
     if test_cli_utilities.get_ogr2ogr_path() is None:
-        return 'skip'
+        pytest.skip()
 
     try:
         os.stat('tmp/test_ogr2ogr_44_src.shp')
@@ -1571,7 +1565,7 @@ def test_ogr2ogr_44():
 def test_ogr2ogr_45():
 
     if test_cli_utilities.get_ogr2ogr_path() is None:
-        return 'skip'
+        pytest.skip()
 
     try:
         os.stat('tmp/test_ogr2ogr_45_src.shp')
@@ -1619,7 +1613,7 @@ def test_ogr2ogr_45():
 def test_ogr2ogr_46():
 
     if test_cli_utilities.get_ogr2ogr_path() is None:
-        return 'skip'
+        pytest.skip()
 
     try:
         os.stat('tmp/test_ogr2ogr_46_src.shp')
@@ -1667,7 +1661,7 @@ def test_ogr2ogr_46():
 def test_ogr2ogr_47():
 
     if test_cli_utilities.get_ogr2ogr_path() is None:
-        return 'skip'
+        pytest.skip()
 
     f = open('tmp/test_ogr2ogr_47_src.gml', 'wt')
     f.write("""<foo xmlns:gml="http://www.opengis.net/gml">
@@ -1698,7 +1692,7 @@ def test_ogr2ogr_47():
 
     if ds is None:
         os.unlink('tmp/test_ogr2ogr_47_src.gml')
-        return 'skip'
+        pytest.skip()
     ds = None
 
     gdaltest.runexternal(test_cli_utilities.get_ogr2ogr_path() + ' -f GML -t_srs EPSG:4326 tmp/test_ogr2ogr_47_dst.gml tmp/test_ogr2ogr_47_src.gml')
@@ -1723,7 +1717,7 @@ def test_ogr2ogr_47():
 
 def test_ogr2ogr_48():
     if test_cli_utilities.get_ogr2ogr_path() is None:
-        return 'skip'
+        pytest.skip()
 
     gdaltest.runexternal(test_cli_utilities.get_ogr2ogr_path() + ' tmp data/Fields.csv')
     gdaltest.runexternal(test_cli_utilities.get_ogr2ogr_path() + ' -append -fieldmap identity tmp data/Fields.csv')
@@ -1734,10 +1728,9 @@ def test_ogr2ogr_48():
     assert ds is not None
     layer_defn = ds.GetLayer(0).GetLayerDefn()
     if layer_defn.GetFieldCount() != 15:
-        gdaltest.post_reason('Unexpected field count: ' + str(ds.GetLayer(0).GetLayerDefn().GetFieldCount()))
         ds.Destroy()
         ogr.GetDriverByName('ESRI Shapefile').DeleteDataSource('tmp/Fields.dbf')
-        return 'fail'
+        pytest.fail('Unexpected field count: ' + str(ds.GetLayer(0).GetLayerDefn().GetFieldCount()))
 
     error_occurred = False
     lyr = ds.GetLayer(0)
@@ -1767,7 +1760,7 @@ def test_ogr2ogr_48():
 
 def test_ogr2ogr_49():
     if test_cli_utilities.get_ogr2ogr_path() is None:
-        return 'skip'
+        pytest.skip()
 
     gdaltest.runexternal(test_cli_utilities.get_ogr2ogr_path() + ' -f CSV tmp/test_ogr2ogr_49.csv data/duplicatedfields.csv')
     f = open('tmp/test_ogr2ogr_49.csv')
@@ -1787,7 +1780,7 @@ def test_ogr2ogr_49():
 
 def test_ogr2ogr_49_bis():
     if test_cli_utilities.get_ogr2ogr_path() is None:
-        return 'skip'
+        pytest.skip()
 
     gdaltest.runexternal(test_cli_utilities.get_ogr2ogr_path() + ' -f KML tmp/test_ogr2ogr_49_bis.kml data/grid.csv -sql "SELECT field_1 AS name FROM grid WHERE fid = 1"')
     f = open('tmp/test_ogr2ogr_49_bis.kml')
@@ -1819,7 +1812,7 @@ def test_ogr2ogr_49_bis():
 
 def test_ogr2ogr_50():
     if test_cli_utilities.get_ogr2ogr_path() is None:
-        return 'skip'
+        pytest.skip()
 
     f = open('tmp/test_ogr2ogr_50_1.csv', 'wt')
     f.write('id,field1\n')
@@ -1839,12 +1832,12 @@ def test_ogr2ogr_50():
     feat = lyr.GetNextFeature()
     if feat.GetField('field1') != 'foo' or not feat.IsFieldNull('field2'):
         feat.DumpReadable()
-        return 'fail'
+        pytest.fail()
 
     feat = lyr.GetNextFeature()
     if feat.GetField('field1') != 'bar' or feat.GetField('field2') != 'baz':
         feat.DumpReadable()
-        return 'fail'
+        pytest.fail()
     ds = None
 
     os.unlink('tmp/test_ogr2ogr_50.dbf')
@@ -1859,7 +1852,7 @@ def test_ogr2ogr_50():
 
 def test_ogr2ogr_51():
     if test_cli_utilities.get_ogr2ogr_path() is None:
-        return 'skip'
+        pytest.skip()
 
     f = open('tmp/test_ogr2ogr_51_src.csv', 'wt')
     f.write('id,_WKTgeom1_EPSG_4326,foo,_WKTgeom2_EPSG_32631\n')
@@ -1939,7 +1932,7 @@ def test_ogr2ogr_51():
 
 def test_ogr2ogr_52():
     if test_cli_utilities.get_ogr2ogr_path() is None:
-        return 'skip'
+        pytest.skip()
 
     f = open('tmp/test_ogr2ogr_52_src.csv', 'wt')
     f.write('id,WKT\n')
@@ -1974,7 +1967,7 @@ def test_ogr2ogr_52():
 
 def test_ogr2ogr_53():
     if test_cli_utilities.get_ogr2ogr_path() is None:
-        return 'skip'
+        pytest.skip()
 
     f = open('tmp/test_ogr2ogr_53.csv', 'wt')
     f.write('id,i64,b,WKT\n')
@@ -2034,7 +2027,7 @@ def test_ogr2ogr_53():
 
 def test_ogr2ogr_54():
     if test_cli_utilities.get_ogr2ogr_path() is None:
-        return 'skip'
+        pytest.skip()
 
     f = open('tmp/test_ogr2ogr_54.csv', 'wt')
     f.write('fld1,fld2,WKT\n')
@@ -2093,7 +2086,7 @@ def test_ogr2ogr_54():
 
 def test_ogr2ogr_55():
     if test_cli_utilities.get_ogr2ogr_path() is None:
-        return 'skip'
+        pytest.skip()
 
     f = open('tmp/test_ogr2ogr_55.csv', 'wt')
     f.write('fld1,fld2,WKT\n')
@@ -2153,7 +2146,7 @@ def test_ogr2ogr_55():
 
 def test_ogr2ogr_56():
     if test_cli_utilities.get_ogr2ogr_path() is None:
-        return 'skip'
+        pytest.skip()
 
     f = open('tmp/test_ogr2ogr_56.csv', 'wt')
     f.write('str,myid,WKT\n')
@@ -2185,7 +2178,7 @@ def test_ogr2ogr_56():
 
 def test_ogr2ogr_57():
     if test_cli_utilities.get_ogr2ogr_path() is None:
-        return 'skip'
+        pytest.skip()
 
     f = open('tmp/test_ogr2ogr_57.csv', 'wt')
     f.write('id,str,WKT\n')
@@ -2245,9 +2238,9 @@ def test_ogr2ogr_57():
 
 def test_ogr2ogr_58():
     if test_cli_utilities.get_ogr2ogr_path() is None:
-        return 'skip'
+        pytest.skip()
     if ogr.GetDriverByName('SQLite') is None:
-        return 'skip'
+        pytest.skip()
 
     gdaltest.runexternal(test_cli_utilities.get_ogr2ogr_path() + ' -gt 3 -f SQLite tmp/test_ogr2ogr_58.sqlite ../ogr/data/poly.shp')
 
@@ -2266,9 +2259,9 @@ def test_ogr2ogr_58():
 
 def test_ogr2ogr_59():
     if test_cli_utilities.get_ogr2ogr_path() is None:
-        return 'skip'
+        pytest.skip()
     if ogr.GetDriverByName('GPKG') is None:
-        return 'skip'
+        pytest.skip()
 
     ds = ogr.GetDriverByName('GPKG').CreateDataSource('tmp/test_ogr2ogr_59_src.gpkg')
     ds.SetMetadataItem('FOO', 'BAR')
@@ -2309,9 +2302,9 @@ def test_ogr2ogr_59():
 
 def test_ogr2ogr_60():
     if test_cli_utilities.get_ogr2ogr_path() is None:
-        return 'skip'
+        pytest.skip()
     if ogr.GetDriverByName('FileGDB') is None:
-        return 'skip'
+        pytest.skip()
 
     gdaltest.runexternal(test_cli_utilities.get_ogr2ogr_path() + ' -ds_transaction -f FileGDB tmp/test_ogr2ogr_60.gdb ../ogr/data/poly.shp -mapFieldType Integer64=Integer')
 
@@ -2330,7 +2323,7 @@ def test_ogr2ogr_60():
 
 def test_ogr2ogr_61():
     if test_cli_utilities.get_ogr2ogr_path() is None:
-        return 'skip'
+        pytest.skip()
 
     f = open('tmp/test_ogr2ogr_61.csv', 'wt')
     f.write('foo,WKT\n')
@@ -2361,7 +2354,7 @@ def test_ogr2ogr_61():
 
 def test_ogr2ogr_62():
     if test_cli_utilities.get_ogr2ogr_path() is None:
-        return 'skip'
+        pytest.skip()
 
     # Default behaviour
 
@@ -2397,7 +2390,7 @@ def test_ogr2ogr_62():
 
 def test_ogr2ogr_63():
     if test_cli_utilities.get_ogr2ogr_path() is None:
-        return 'skip'
+        pytest.skip()
 
     try:
         os.stat('tmp/poly.shp')
@@ -2416,7 +2409,7 @@ def test_ogr2ogr_63():
 
 def test_ogr2ogr_64():
     if test_cli_utilities.get_ogr2ogr_path() is None:
-        return 'skip'
+        pytest.skip()
 
     try:
         shutil.rmtree('tmp/in_csv')
@@ -2455,7 +2448,7 @@ def test_ogr2ogr_64():
 
 def test_ogr2ogr_65():
     if test_cli_utilities.get_ogr2ogr_path() is None:
-        return 'skip'
+        pytest.skip()
 
     gdaltest.runexternal(test_cli_utilities.get_ogr2ogr_path() + ' tmp/out.csv ../ogr/data/poly.shp')
     ds = gdal.OpenEx('tmp/out.csv')
@@ -2476,7 +2469,7 @@ def test_ogr2ogr_65():
 
 def test_ogr2ogr_66():
     if test_cli_utilities.get_ogr2ogr_path() is None:
-        return 'skip'
+        pytest.skip()
 
     (ret, err) = gdaltest.runexternal_out_and_err(test_cli_utilities.get_ogr2ogr_path() + ' ../ogr/data/poly.shp ../ogr/data/poly.shp')
     assert err.find("Source and destination datasets must be different in non-update mode") >= 0, \
@@ -2495,7 +2488,7 @@ def check_identity_transformation(x, y, srid):
     import struct
 
     if test_cli_utilities.get_ogr2ogr_path() is None:
-        return 'skip'
+        pytest.skip()
 
     shape_drv = ogr.GetDriverByName('ESRI Shapefile')
     for output_shp in ['tmp/output_point.shp', 'tmp/output_point2.shp']:
diff --git a/autotest/utilities/test_ogr2ogr_lib.py b/autotest/utilities/test_ogr2ogr_lib.py
index 915d176a072f..9ddd4e0cff9e 100755
--- a/autotest/utilities/test_ogr2ogr_lib.py
+++ b/autotest/utilities/test_ogr2ogr_lib.py
@@ -397,11 +397,11 @@ def test_ogr2ogr_lib_19():
     f = lyr.GetNextFeature()
     if f['foo'] != 'bar' or f.IsFieldSet('bar'):
         f.DumpReadable()
-        return 'fail'
+        pytest.fail()
     f = lyr.GetNextFeature()
     if f['bar'] != 'foo' or f.IsFieldSet('foo'):
         f.DumpReadable()
-        return 'fail'
+        pytest.fail()
     ds = None
 
     return 'success'
@@ -413,7 +413,7 @@ def test_ogr2ogr_lib_19():
 def test_ogr2ogr_lib_20():
 
     if ogr.GetDriverByName('GPKG') is None:
-        return 'skip'
+        pytest.skip()
 
     src_ds = gdal.GetDriverByName('Memory').Create('', 0, 0, 0)
     lyr = src_ds.CreateLayer('layer', geom_type=ogr.wkbNone)
@@ -474,7 +474,7 @@ def test_ogr2ogr_lib_21():
 def test_ogr2ogr_clipsrc_no_dst_geom():
 
     if not ogrtest.have_geos():
-        return 'skip'
+        pytest.skip()
 
     tmpfilename = '/vsimem/out.csv'
     wkt = 'POLYGON ((479461 4764494,479461 4764196,480012 4764196,480012 4764494,479461 4764494))'
diff --git a/autotest/utilities/test_ogrinfo.py b/autotest/utilities/test_ogrinfo.py
index 108655c473ca..5c56ca819b60 100755
--- a/autotest/utilities/test_ogrinfo.py
+++ b/autotest/utilities/test_ogrinfo.py
@@ -37,6 +37,7 @@
 import gdaltest
 import ogrtest
 import test_cli_utilities
+import pytest
 
 ###############################################################################
 # Simple test
@@ -44,7 +45,7 @@
 
 def test_ogrinfo_1():
     if test_cli_utilities.get_ogrinfo_path() is None:
-        return 'skip'
+        pytest.skip()
 
     (ret, err) = gdaltest.runexternal_out_and_err(test_cli_utilities.get_ogrinfo_path() + ' ../ogr/data/poly.shp')
     assert (err is None or err == ''), 'got error/warning'
@@ -58,7 +59,7 @@ def test_ogrinfo_1():
 
 def test_ogrinfo_2():
     if test_cli_utilities.get_ogrinfo_path() is None:
-        return 'skip'
+        pytest.skip()
 
     ret = gdaltest.runexternal(test_cli_utilities.get_ogrinfo_path() + ' -ro ../ogr/data/poly.shp')
     assert ret.find('ESRI Shapefile') != -1
@@ -71,7 +72,7 @@ def test_ogrinfo_2():
 
 def test_ogrinfo_3():
     if test_cli_utilities.get_ogrinfo_path() is None:
-        return 'skip'
+        pytest.skip()
 
     ret = gdaltest.runexternal(test_cli_utilities.get_ogrinfo_path() + ' -al ../ogr/data/poly.shp')
     assert ret.find('Layer name: poly') != -1
@@ -89,7 +90,7 @@ def test_ogrinfo_3():
 
 def test_ogrinfo_4():
     if test_cli_utilities.get_ogrinfo_path() is None:
-        return 'skip'
+        pytest.skip()
 
     ret = gdaltest.runexternal(test_cli_utilities.get_ogrinfo_path() + ' ../ogr/data/poly.shp poly')
     assert ret.find('Feature Count: 10') != -1
@@ -102,7 +103,7 @@ def test_ogrinfo_4():
 
 def test_ogrinfo_5():
     if test_cli_utilities.get_ogrinfo_path() is None:
-        return 'skip'
+        pytest.skip()
 
     ret = gdaltest.runexternal(test_cli_utilities.get_ogrinfo_path() + ' ../ogr/data/poly.shp -sql "select * from poly"')
     assert ret.find('Feature Count: 10') != -1
@@ -115,7 +116,7 @@ def test_ogrinfo_5():
 
 def test_ogrinfo_6():
     if test_cli_utilities.get_ogrinfo_path() is None:
-        return 'skip'
+        pytest.skip()
 
     ret = gdaltest.runexternal(test_cli_utilities.get_ogrinfo_path() + ' ../ogr/data/poly.shp poly -geom=no')
     assert ret.find('Feature Count: 10') != -1
@@ -129,7 +130,7 @@ def test_ogrinfo_6():
 
 def test_ogrinfo_7():
     if test_cli_utilities.get_ogrinfo_path() is None:
-        return 'skip'
+        pytest.skip()
 
     ret = gdaltest.runexternal(test_cli_utilities.get_ogrinfo_path() + ' ../ogr/data/poly.shp poly -geom=summary')
     assert ret.find('Feature Count: 10') != -1
@@ -144,7 +145,7 @@ def test_ogrinfo_7():
 
 def test_ogrinfo_8():
     if test_cli_utilities.get_ogrinfo_path() is None:
-        return 'skip'
+        pytest.skip()
 
     ret = gdaltest.runexternal(test_cli_utilities.get_ogrinfo_path() + ' ../ogr/data/poly.shp poly -spat 479609 4764629 479764 4764817')
     if ogrtest.have_geos():
@@ -160,7 +161,7 @@ def test_ogrinfo_8():
 
 def test_ogrinfo_9():
     if test_cli_utilities.get_ogrinfo_path() is None:
-        return 'skip'
+        pytest.skip()
 
     ret = gdaltest.runexternal(test_cli_utilities.get_ogrinfo_path() + ' ../ogr/data/poly.shp poly -where "EAS_ID=171"')
     assert ret.find('Feature Count: 1') != -1
@@ -173,7 +174,7 @@ def test_ogrinfo_9():
 
 def test_ogrinfo_10():
     if test_cli_utilities.get_ogrinfo_path() is None:
-        return 'skip'
+        pytest.skip()
 
     ret = gdaltest.runexternal(test_cli_utilities.get_ogrinfo_path() + ' ../ogr/data/poly.shp poly -fid 9')
     assert ret.find('OGRFeature(poly):9') != -1
@@ -186,7 +187,7 @@ def test_ogrinfo_10():
 
 def test_ogrinfo_11():
     if test_cli_utilities.get_ogrinfo_path() is None:
-        return 'skip'
+        pytest.skip()
 
     ret = gdaltest.runexternal(test_cli_utilities.get_ogrinfo_path() + ' ../ogr/data/poly.shp poly -fields=no')
     assert ret.find('AREA (Real') == -1
@@ -200,7 +201,7 @@ def test_ogrinfo_11():
 
 def test_ogrinfo_12():
     if test_cli_utilities.get_ogrinfo_path() is None:
-        return 'skip'
+        pytest.skip()
 
     ret = gdaltest.runexternal(test_cli_utilities.get_ogrinfo_path() + ' --version', check_memleak=False)
     assert ret.find(gdal.VersionInfo('--version')) == 0
@@ -213,7 +214,7 @@ def test_ogrinfo_12():
 
 def test_ogrinfo_13():
     if test_cli_utilities.get_ogrinfo_path() is None:
-        return 'skip'
+        pytest.skip()
 
     (_, err) = gdaltest.runexternal_out_and_err(test_cli_utilities.get_ogrinfo_path() + ' --config', check_memleak=False)
     assert err.find('--config option given without a key and value argument') >= 0
@@ -226,7 +227,7 @@ def test_ogrinfo_13():
 
 def test_ogrinfo_14():
     if test_cli_utilities.get_ogrinfo_path() is None:
-        return 'skip'
+        pytest.skip()
 
     (_, err) = gdaltest.runexternal_out_and_err(test_cli_utilities.get_ogrinfo_path() + ' --mempreload', check_memleak=False)
     assert err.find('--mempreload option given without directory path') >= 0
@@ -239,7 +240,7 @@ def test_ogrinfo_14():
 
 def test_ogrinfo_15():
     if test_cli_utilities.get_ogrinfo_path() is None:
-        return 'skip'
+        pytest.skip()
 
     (ret, _) = gdaltest.runexternal_out_and_err(test_cli_utilities.get_ogrinfo_path() + ' --debug on --mempreload ../ogr/data /vsimem/poly.shp', check_memleak=False)
     assert ret.find("ESRI Shapefile") >= 0
@@ -252,7 +253,7 @@ def test_ogrinfo_15():
 
 def test_ogrinfo_16():
     if test_cli_utilities.get_ogrinfo_path() is None:
-        return 'skip'
+        pytest.skip()
 
     (_, err) = gdaltest.runexternal_out_and_err(test_cli_utilities.get_ogrinfo_path() + ' --debug', check_memleak=False)
     assert err.find('--debug option given without debug level') >= 0
@@ -265,7 +266,7 @@ def test_ogrinfo_16():
 
 def test_ogrinfo_17():
     if test_cli_utilities.get_ogrinfo_path() is None:
-        return 'skip'
+        pytest.skip()
 
     (_, err) = gdaltest.runexternal_out_and_err(test_cli_utilities.get_ogrinfo_path() + ' --optfile', check_memleak=False)
     assert err.find('--optfile option given without filename') >= 0
@@ -288,7 +289,7 @@ def test_ogrinfo_17():
 
 def test_ogrinfo_18():
     if test_cli_utilities.get_ogrinfo_path() is None:
-        return 'skip'
+        pytest.skip()
 
     f = open('tmp/optfile.txt', 'wt')
     f.write('# comment\n')
@@ -306,7 +307,7 @@ def test_ogrinfo_18():
 
 def test_ogrinfo_19():
     if test_cli_utilities.get_ogrinfo_path() is None:
-        return 'skip'
+        pytest.skip()
 
     ret = gdaltest.runexternal(test_cli_utilities.get_ogrinfo_path() + ' --formats', check_memleak=False)
     assert ret.find('ESRI Shapefile -vector- (rw+v): ESRI Shapefile') >= 0
@@ -319,7 +320,7 @@ def test_ogrinfo_19():
 
 def test_ogrinfo_20():
     if test_cli_utilities.get_ogrinfo_path() is None:
-        return 'skip'
+        pytest.skip()
 
     ret = gdaltest.runexternal(test_cli_utilities.get_ogrinfo_path() + ' --help-general', check_memleak=False)
     assert ret.find('Generic GDAL utility command options') >= 0
@@ -332,7 +333,7 @@ def test_ogrinfo_20():
 
 def test_ogrinfo_21():
     if test_cli_utilities.get_ogrinfo_path() is None:
-        return 'skip'
+        pytest.skip()
 
     ret = gdaltest.runexternal(test_cli_utilities.get_ogrinfo_path() + ' --locale C ../ogr/data/poly.shp', check_memleak=False)
     assert ret.find("ESRI Shapefile") >= 0
@@ -345,7 +346,7 @@ def test_ogrinfo_21():
 
 def test_ogrinfo_22():
     if test_cli_utilities.get_ogrinfo_path() is None:
-        return 'skip'
+        pytest.skip()
 
     f = open('tmp/test_ogrinfo_22.csv', 'wt')
     f.write('_WKTgeom1_EPSG_4326,_WKTgeom2_EPSG_32631\n')
@@ -424,7 +425,7 @@ def test_ogrinfo_22():
 
 def test_ogrinfo_23():
     if test_cli_utilities.get_ogrinfo_path() is None:
-        return 'skip'
+        pytest.skip()
 
     f = open('tmp/test_ogrinfo_23.csv', 'wt')
     f.write('_WKTgeom1_EPSG_4326,_WKTgeom2_EPSG_32631\n')
@@ -501,7 +502,7 @@ def test_ogrinfo_23():
 
 def test_ogrinfo_24():
     if test_cli_utilities.get_ogrinfo_path() is None:
-        return 'skip'
+        pytest.skip()
 
     f = open('tmp/test_ogrinfo_24.vrt', 'wt')
     f.write("""<OGRVRTDataSource>
@@ -562,10 +563,9 @@ def test_ogrinfo_24():
     lines = ret.splitlines()
     for i, exp_line in enumerate(expected_lines):
         if exp_line != lines[i]:
-            print(ret)
             if gdaltest.is_travis_branch('mingw'):
                 return 'expected_fail'
-            return 'fail'
+            pytest.fail(ret)
     ret = gdaltest.runexternal(test_cli_utilities.get_ogrinfo_path() + ' -ro -al tmp/test_ogrinfo_24.vrt -so -mdd all', check_memleak=False)
     expected_ret = """INFO: Open of `tmp/test_ogrinfo_24.vrt'
       using driver `OGR_VRT' successful.
@@ -612,10 +612,9 @@ def test_ogrinfo_24():
     lines = ret.splitlines()
     for i, exp_line in enumerate(expected_lines):
         if exp_line != lines[i]:
-            print(ret)
             if gdaltest.is_travis_branch('mingw'):
                 return 'expected_fail'
-            return 'fail'
+            pytest.fail(ret)
 
     ret = gdaltest.runexternal(test_cli_utilities.get_ogrinfo_path() + ' -ro -al tmp/test_ogrinfo_24.vrt -so -nomd', check_memleak=False)
     expected_ret = """INFO: Open of `tmp/test_ogrinfo_24.vrt'
@@ -657,10 +656,9 @@ def test_ogrinfo_24():
     lines = ret.splitlines()
     for i, exp_line in enumerate(expected_lines):
         if exp_line != lines[i]:
-            print(ret)
             if gdaltest.is_travis_branch('mingw'):
                 return 'expected_fail'
-            return 'fail'
+            pytest.fail(ret)
 
     os.unlink('tmp/test_ogrinfo_24.vrt')
 
@@ -672,7 +670,7 @@ def test_ogrinfo_24():
 
 def test_ogrinfo_25():
     if test_cli_utilities.get_ogrinfo_path() is None:
-        return 'skip'
+        pytest.skip()
 
     (ret, err) = gdaltest.runexternal_out_and_err(test_cli_utilities.get_ogrinfo_path() + ' -rl -q ../ogr/data/poly.shp')
     assert (err is None or err == ''), 'got error/warning'
@@ -688,7 +686,7 @@ def test_ogrinfo_25():
 
 def test_ogrinfo_sql_filename():
     if test_cli_utilities.get_ogrinfo_path() is None:
-        return 'skip'
+        pytest.skip()
 
     open('tmp/my.sql', 'wt').write('-- initial comment\nselect * from poly\n-- trailing comment')
     (ret, err) = gdaltest.runexternal_out_and_err(test_cli_utilities.get_ogrinfo_path() + ' -q ../ogr/data/poly.shp -sql @tmp/my.sql')
diff --git a/autotest/utilities/test_ogrlineref.py b/autotest/utilities/test_ogrlineref.py
index 4e90f7091767..030d2b50fc16 100755
--- a/autotest/utilities/test_ogrlineref.py
+++ b/autotest/utilities/test_ogrlineref.py
@@ -30,6 +30,7 @@
 
 import sys
 import os
+import pytest
 
 sys.path.append('../ogr')
 
@@ -44,7 +45,7 @@
 
 def test_ogrlineref_1():
     if not ogrtest.have_geos() or test_cli_utilities.get_ogrlineref_path() is None:
-        return 'skip'
+        pytest.skip()
 
     if os.path.exists('tmp/parts.shp'):
         ogr.GetDriverByName('ESRI Shapefile').DeleteDataSource('tmp/parts.shp')
@@ -63,7 +64,7 @@ def test_ogrlineref_1():
 
 def test_ogrlineref_2():
     if not ogrtest.have_geos() or test_cli_utilities.get_ogrlineref_path() is None:
-        return 'skip'
+        pytest.skip()
 
     ret = gdaltest.runexternal(test_cli_utilities.get_ogrlineref_path() + ' -get_pos -r tmp/parts.shp -x -1.4345 -y 51.9497 -quiet').strip()
 
@@ -78,7 +79,7 @@ def test_ogrlineref_2():
 
 def test_ogrlineref_3():
     if not ogrtest.have_geos() or test_cli_utilities.get_ogrlineref_path() is None:
-        return 'skip'
+        pytest.skip()
 
     ret = gdaltest.runexternal(test_cli_utilities.get_ogrlineref_path() + ' -get_coord -r tmp/parts.shp -m 15977.724709 -quiet').strip()
 
@@ -93,7 +94,7 @@ def test_ogrlineref_3():
 
 def test_ogrlineref_4():
     if not ogrtest.have_geos() or test_cli_utilities.get_ogrlineref_path() is None:
-        return 'skip'
+        pytest.skip()
 
     if os.path.exists('tmp/subline.shp'):
         ogr.GetDriverByName('ESRI Shapefile').DeleteDataSource('tmp/subline.shp')
@@ -117,7 +118,7 @@ def test_ogrlineref_4():
 
 def test_ogrlineref_5():
     if not ogrtest.have_geos() or test_cli_utilities.get_ogrlineref_path() is None:
-        return 'skip'
+        pytest.skip()
 
     if os.path.exists('tmp/parts.kml'):
         ogr.GetDriverByName('KML').DeleteDataSource('tmp/parts.kml')
@@ -126,12 +127,12 @@ def test_ogrlineref_5():
     if os.path.exists('tmp/parts.kml'):
         return 'success'
 
-    return 'fail'
+    pytest.fail()
 
 
 def test_ogrlineref_cleanup():
     if not ogrtest.have_geos() or test_cli_utilities.get_ogrlineref_path() is None:
-        return 'skip'
+        pytest.skip()
 
     if os.path.exists('tmp/parts.shp'):
         ogr.GetDriverByName('ESRI Shapefile').DeleteDataSource('tmp/parts.shp')
diff --git a/autotest/utilities/test_ogrtindex.py b/autotest/utilities/test_ogrtindex.py
index 6fbb155cd925..6304dc4f4bb8 100755
--- a/autotest/utilities/test_ogrtindex.py
+++ b/autotest/utilities/test_ogrtindex.py
@@ -38,6 +38,7 @@
 import ogrtest
 import gdaltest
 import test_cli_utilities
+import pytest
 
 ###############################################################################
 # Simple test
@@ -45,7 +46,7 @@
 
 def test_ogrtindex_1(srs=None):
     if test_cli_utilities.get_ogrtindex_path() is None:
-        return 'skip'
+        pytest.skip()
 
     shape_drv = ogr.GetDriverByName('ESRI Shapefile')
 
@@ -129,7 +130,7 @@ def test_ogrtindex_2():
 def test_ogrtindex_3():
 
     if test_cli_utilities.get_ogrtindex_path() is None:
-        return 'skip'
+        pytest.skip()
 
     shape_drv = ogr.GetDriverByName('ESRI Shapefile')
 
@@ -202,9 +203,8 @@ def test_ogrtindex_3():
         feat = ds.GetLayer(0).GetNextFeature()
         while feat is not None:
             if feat.GetField('src_srs') != expected_srss[i]:
-                print(i, src_srs_format)
                 feat.DumpReadable()
-                return 'fail'
+                pytest.fail(i, src_srs_format)
             assert ogrtest.check_feature_geometry(feat, expected_wkts[i]) == 0, \
                 ('i=%d, wkt=%s' % (i, feat.GetGeometryRef().ExportToWkt()))
             i = i + 1
@@ -224,7 +224,7 @@ def test_ogrtindex_3():
 
 def test_ogrtindex_cleanup():
     if test_cli_utilities.get_ogrtindex_path() is None:
-        return 'skip'
+        pytest.skip()
 
     shape_drv = ogr.GetDriverByName('ESRI Shapefile')
     shape_drv.DeleteDataSource('tmp/tileindex.shp')

From 1e0db0c3cd7cbc07d60a72812d941889637707d8 Mon Sep 17 00:00:00 2001
From: Craig de Stigter <craig.destigter@koordinates.com>
Date: Mon, 10 Dec 2018 09:26:50 +1300
Subject: [PATCH 140/488] Automated: Don't return 'success' from tests

Tests that exit without raising any exceptions are considered to
have passed.
---
 autotest/alg/applyverticalshiftgrid.py        |  14 -
 autotest/alg/contour.py                       |  10 +-
 autotest/alg/cutline.py                       |   2 -
 autotest/alg/dither.py                        |   3 +-
 autotest/alg/polygonize.py                    |   8 +-
 autotest/alg/proximity.py                     |   9 +-
 autotest/alg/rasterize.py                     |  17 +-
 autotest/alg/reproject.py                     |  12 +-
 autotest/alg/sieve.py                         |  24 +-
 autotest/alg/tps.py                           |   2 -
 autotest/alg/transformgeoloc.py               |   2 -
 autotest/alg/warp.py                          | 120 +------
 autotest/gcore/asyncreader.py                 |   3 +-
 autotest/gcore/basic_test.py                  |  39 +-
 autotest/gcore/colortable.py                  |   9 +-
 autotest/gcore/envi_read.py                   |   2 -
 autotest/gcore/gcps2geotransform.py           |  16 -
 autotest/gcore/gdal_api_proxy.py              |  12 -
 autotest/gcore/gdal_stats.py                  |  41 +--
 autotest/gcore/hdf4_read.py                   |  18 -
 autotest/gcore/hfa_read.py                    |   3 +-
 autotest/gcore/hfa_rfc40.py                   |  21 --
 autotest/gcore/hfa_write.py                   |  20 --
 autotest/gcore/histogram.py                   |  12 -
 autotest/gcore/identify.py                    |   8 -
 autotest/gcore/mask.py                        |  56 +--
 autotest/gcore/minixml.py                     |  21 +-
 autotest/gcore/misc.py                        |  40 +--
 autotest/gcore/nodatamaskband.py              |   3 +-
 autotest/gcore/numpy_rw.py                    |  40 +--
 autotest/gcore/overviewds.py                  |  16 +-
 autotest/gcore/pam.py                         |  29 +-
 autotest/gcore/pixfun.py                      |  63 +---
 autotest/gcore/rasterio.py                    |  37 +-
 autotest/gcore/rat.py                         |   6 -
 autotest/gcore/rfc30.py                       |   4 -
 autotest/gcore/testnonboundtoswig.py          |  14 +-
 autotest/gcore/tiff_ovr.py                    | 113 +-----
 autotest/gcore/tiff_read.py                   | 257 ++-----------
 autotest/gcore/tiff_srs.py                    |  24 --
 autotest/gcore/tiff_write.py                  | 339 +-----------------
 autotest/gcore/transformer.py                 |  33 --
 autotest/gcore/virtualmem.py                  |  10 +-
 autotest/gcore/vrt_read.py                    |  69 +---
 autotest/gcore/vrtmisc.py                     |  44 +--
 autotest/gcore/vsiaz.py                       |  31 +-
 autotest/gcore/vsicrypt.py                    |  10 -
 autotest/gcore/vsicurl.py                     |  39 +-
 autotest/gcore/vsicurl_streaming.py           |   2 -
 autotest/gcore/vsifile.py                     |  51 +--
 autotest/gcore/vsigs.py                       |  42 +--
 autotest/gcore/vsihdfs.py                     |   8 -
 autotest/gcore/vsioss.py                      |  35 +-
 autotest/gcore/vsis3.py                       |  56 +--
 autotest/gcore/vsistdin.py                    |   8 -
 autotest/gcore/vsiswift.py                    |  33 +-
 autotest/gcore/vsiwebhdfs.py                  |  27 +-
 autotest/gcore/vsizip.py                      |  42 +--
 autotest/gdrivers/aaigrid.py                  |  21 +-
 autotest/gdrivers/adrg.py                     |  10 -
 autotest/gdrivers/aigrid.py                   |  12 +-
 autotest/gdrivers/arg.py                      |  24 +-
 autotest/gdrivers/bag.py                      |  22 +-
 autotest/gdrivers/blx.py                      |   2 -
 autotest/gdrivers/bsb.py                      |   3 +-
 autotest/gdrivers/bt.py                       |   2 -
 autotest/gdrivers/cals.py                     |   6 -
 autotest/gdrivers/db2.py                      |   7 +-
 autotest/gdrivers/derived.py                  |   9 +-
 autotest/gdrivers/dimap.py                    |   5 +-
 autotest/gdrivers/dods.py                     |   6 +-
 autotest/gdrivers/doq2.py                     |   2 -
 autotest/gdrivers/dted.py                     |  19 +-
 autotest/gdrivers/ecrgtoc.py                  |  10 -
 autotest/gdrivers/ecw.py                      | 122 +------
 autotest/gdrivers/eedai.py                    |  18 -
 autotest/gdrivers/ehdr.py                     |  18 -
 autotest/gdrivers/envi.py                     |  16 -
 autotest/gdrivers/envisat.py                  |  26 +-
 autotest/gdrivers/ers.py                      |  15 -
 autotest/gdrivers/fast.py                     |  10 +-
 autotest/gdrivers/gdalhttp.py                 |  22 +-
 autotest/gdrivers/georaster.py                |   5 +-
 autotest/gdrivers/gif.py                      |  14 +-
 autotest/gdrivers/gpkg.py                     |  89 +----
 autotest/gdrivers/grass.py                    |   3 +-
 autotest/gdrivers/grib.py                     |  82 +----
 autotest/gdrivers/gta.py                      |  11 +-
 autotest/gdrivers/hdf5.py                     |  40 +--
 autotest/gdrivers/hf2.py                      |   3 +-
 autotest/gdrivers/hfa.py                      |  71 +---
 autotest/gdrivers/ida.py                      |   2 -
 autotest/gdrivers/idrisi.py                   |   3 +-
 autotest/gdrivers/ignfheightasciigrid.py      |   9 +-
 autotest/gdrivers/ilwis.py                    |   1 -
 autotest/gdrivers/ingr.py                     |   9 -
 autotest/gdrivers/iris.py                     |   3 +-
 autotest/gdrivers/isce.py                     |   2 -
 autotest/gdrivers/isis.py                     |  47 +--
 autotest/gdrivers/jp2kak.py                   |  22 --
 autotest/gdrivers/jp2lura.py                  | 110 +-----
 autotest/gdrivers/jp2metadata.py              |  12 +-
 autotest/gdrivers/jp2openjpeg.py              | 117 +-----
 autotest/gdrivers/jpeg.py                     |  58 +--
 autotest/gdrivers/jpeg2000.py                 |  31 +-
 autotest/gdrivers/jpeg_profile.py             |   6 -
 autotest/gdrivers/jpipkak.py                  |  10 -
 autotest/gdrivers/kea.py                      |  32 +-
 autotest/gdrivers/kmlsuperoverlay.py          |  14 -
 autotest/gdrivers/kro.py                      |   2 -
 autotest/gdrivers/l1b.py                      |  14 -
 autotest/gdrivers/lcp.py                      |   7 -
 autotest/gdrivers/mbtiles.py                  |  39 +-
 autotest/gdrivers/mem.py                      |  32 +-
 autotest/gdrivers/mg4lidar.py                 |   8 +-
 autotest/gdrivers/mrf.py                      |  35 +-
 autotest/gdrivers/mrsid.py                    |  30 +-
 autotest/gdrivers/netcdf.py                   | 171 +--------
 autotest/gdrivers/netcdf_cf.py                |  20 +-
 autotest/gdrivers/nitf.py                     | 157 +-------
 autotest/gdrivers/ntv2.py                     |   6 -
 autotest/gdrivers/nwt_grd.py                  |   2 +-
 autotest/gdrivers/ozi.py                      |   2 -
 autotest/gdrivers/paux.py                     |   1 -
 autotest/gdrivers/pcidsk.py                   |  27 +-
 autotest/gdrivers/pcraster.py                 |   2 -
 autotest/gdrivers/pdf.py                      |  69 +---
 autotest/gdrivers/pds.py                      |  13 +-
 autotest/gdrivers/pds4.py                     |  23 +-
 autotest/gdrivers/plmosaic.py                 |  51 +--
 autotest/gdrivers/png.py                      |  14 +-
 autotest/gdrivers/png_profile.py              |  10 -
 autotest/gdrivers/postgisraster.py            |  41 +--
 autotest/gdrivers/prf.py                      |   4 -
 autotest/gdrivers/rasdaman.py                 |   6 +-
 autotest/gdrivers/rasterlite.py               |  23 +-
 autotest/gdrivers/rda.py                      |  64 +---
 autotest/gdrivers/rl2.py                      |  24 +-
 autotest/gdrivers/rmf.py                      |  19 +-
 autotest/gdrivers/roipac.py                   |   4 -
 autotest/gdrivers/rpftoc.py                   |   4 -
 autotest/gdrivers/rraster.py                  |  22 +-
 autotest/gdrivers/rs2.py                      |   1 -
 autotest/gdrivers/saga.py                     |   9 +-
 autotest/gdrivers/sdts.py                     |   2 -
 autotest/gdrivers/sentinel2.py                |  69 +---
 autotest/gdrivers/srp.py                      |   7 +-
 autotest/gdrivers/srtmhgt.py                  |  11 +-
 autotest/gdrivers/terragen.py                 |   1 -
 autotest/gdrivers/test_validate_jp2.py        |  26 +-
 autotest/gdrivers/tiff_profile.py             |  14 -
 autotest/gdrivers/til.py                      |   6 +-
 autotest/gdrivers/usgsdem.py                  |   9 +-
 autotest/gdrivers/vicar.py                    |   3 +-
 autotest/gdrivers/vrtderived.py               |  38 +-
 autotest/gdrivers/vrtfilt.py                  |   9 +-
 autotest/gdrivers/vrtlut.py                   |   3 +-
 autotest/gdrivers/vrtmask.py                  |  25 +-
 autotest/gdrivers/vrtovr.py                   |  12 +-
 autotest/gdrivers/vrtpansharpen.py            |  27 +-
 autotest/gdrivers/vrtrawlink.py               |  23 +-
 autotest/gdrivers/vrtwarp.py                  |  22 --
 autotest/gdrivers/wcs.py                      |  24 +-
 autotest/gdrivers/webp.py                     |  11 +-
 autotest/gdrivers/wms.py                      |  45 +--
 autotest/gdrivers/wmts.py                     |  56 +--
 autotest/gdrivers/xyz.py                      |  16 +-
 autotest/gnm/gnm_test.py                      |  10 +-
 autotest/ogr/ogr_arcgen.py                    |  18 +-
 autotest/ogr/ogr_avc.py                       |  10 +-
 autotest/ogr/ogr_basic_test.py                |  43 +--
 autotest/ogr/ogr_bna.py                       |  19 +-
 autotest/ogr/ogr_cad.py                       |  18 +-
 autotest/ogr/ogr_carto.py                     |  18 +-
 autotest/ogr/ogr_cloudant.py                  |  18 +-
 autotest/ogr/ogr_couchdb.py                   |  10 +-
 autotest/ogr/ogr_csv.py                       | 101 +-----
 autotest/ogr/ogr_csw.py                       |  33 +-
 autotest/ogr/ogr_db2.py                       |  23 +-
 autotest/ogr/ogr_db2_hack.py                  |   6 -
 autotest/ogr/ogr_dgn.py                       |  19 +-
 autotest/ogr/ogr_dgnv8.py                     |   9 +-
 autotest/ogr/ogr_dods.py                      |  16 +-
 autotest/ogr/ogr_dxf.py                       | 130 +------
 autotest/ogr/ogr_edigeo.py                    |   2 -
 autotest/ogr/ogr_eeda.py                      |  10 -
 autotest/ogr/ogr_elasticsearch.py             |  31 +-
 autotest/ogr/ogr_factory.py                   |  16 +-
 autotest/ogr/ogr_feature.py                   |  44 +--
 autotest/ogr/ogr_fgdb.py                      |  69 +---
 autotest/ogr/ogr_fgdb_stress_test.py          |  10 +-
 autotest/ogr/ogr_geoconcept.py                |  21 +-
 autotest/ogr/ogr_geojson.py                   | 160 +--------
 autotest/ogr/ogr_geojsonseq.py                |  12 +-
 autotest/ogr/ogr_geom.py                      | 150 +-------
 autotest/ogr/ogr_georss.py                    |  31 +-
 autotest/ogr/ogr_geos.py                      |  64 ----
 autotest/ogr/ogr_gft.py                       |  10 -
 autotest/ogr/ogr_gml_fgd_read.py              |   4 -
 autotest/ogr/ogr_gml_geom.py                  | 129 +------
 autotest/ogr/ogr_gml_read.py                  | 179 +--------
 autotest/ogr/ogr_gmlas.py                     | 134 +------
 autotest/ogr/ogr_gmt.py                       |  12 +-
 autotest/ogr/ogr_gpkg.py                      | 130 +------
 autotest/ogr/ogr_gpsbabel.py                  |   8 -
 autotest/ogr/ogr_gpx.py                       |  24 +-
 autotest/ogr/ogr_grass.py                     |   5 +-
 autotest/ogr/ogr_gtm.py                       |  11 -
 autotest/ogr/ogr_htf.py                       |   4 -
 autotest/ogr/ogr_idrisi.py                    |   6 -
 autotest/ogr/ogr_ili.py                       |  57 +--
 autotest/ogr/ogr_index_test.py                |  27 +-
 autotest/ogr/ogr_ingres.py                    |  20 +-
 autotest/ogr/ogr_jml.py                       |  16 +-
 autotest/ogr/ogr_join_test.py                 |  48 +--
 autotest/ogr/ogr_kml.py                       |  58 +--
 autotest/ogr/ogr_layer_algebra.py             |  24 +-
 autotest/ogr/ogr_libkml.py                    | 110 +-----
 autotest/ogr/ogr_mem.py                       |  39 +-
 autotest/ogr/ogr_mitab.py                     | 117 +-----
 autotest/ogr/ogr_mongodb.py                   |  12 +-
 autotest/ogr/ogr_mssqlspatial.py              |  14 +-
 autotest/ogr/ogr_mvt.py                       |  94 +----
 autotest/ogr/ogr_mysql.py                     |  54 +--
 autotest/ogr/ogr_nas.py                       |  12 +-
 autotest/ogr/ogr_ntf.py                       |   4 -
 autotest/ogr/ogr_oci.py                       |  44 +--
 autotest/ogr/ogr_odbc.py                      |   6 -
 autotest/ogr/ogr_ods.py                       |  22 +-
 autotest/ogr/ogr_ogdi.py                      |  11 -
 autotest/ogr/ogr_openair.py                   |   3 +-
 autotest/ogr/ogr_openfilegdb.py               |  53 +--
 autotest/ogr/ogr_osm.py                       |  33 +-
 autotest/ogr/ogr_pcidsk.py                    |  19 +-
 autotest/ogr/ogr_pdf.py                       |  14 +-
 autotest/ogr/ogr_pds.py                       |   6 +-
 autotest/ogr/ogr_pg.py                        | 204 +----------
 autotest/ogr/ogr_pgdump.py                    |  34 +-
 autotest/ogr/ogr_pgeo.py                      |  18 +-
 autotest/ogr/ogr_plscenes.py                  |  13 +-
 autotest/ogr/ogr_rec.py                       |   2 -
 autotest/ogr/ogr_refcount.py                  |  20 +-
 autotest/ogr/ogr_rfc30.py                     |   2 -
 autotest/ogr/ogr_rfc35_mem.py                 |  20 +-
 autotest/ogr/ogr_rfc35_mitab.py               |  25 +-
 autotest/ogr/ogr_rfc35_shape.py               |  22 +-
 autotest/ogr/ogr_rfc35_sqlite.py              |  20 +-
 autotest/ogr/ogr_rfc41.py                     |  16 -
 autotest/ogr/ogr_s57.py                       |  32 +-
 autotest/ogr/ogr_sde.py                       |  16 +-
 autotest/ogr/ogr_sdts.py                      |   2 -
 autotest/ogr/ogr_segukooa.py                  |  12 +-
 autotest/ogr/ogr_segy.py                      |   6 -
 autotest/ogr/ogr_selafin.py                   |   6 +-
 autotest/ogr/ogr_shape.py                     | 252 ++-----------
 autotest/ogr/ogr_shape_qix.py                 |   4 -
 autotest/ogr/ogr_shape_sbn.py                 |   5 +-
 autotest/ogr/ogr_sosi.py                      |   2 -
 autotest/ogr/ogr_sql_rfc28.py                 |  99 ++---
 autotest/ogr/ogr_sql_sqlite.py                |  54 +--
 autotest/ogr/ogr_sql_test.py                  |  98 ++---
 autotest/ogr/ogr_sqlite.py                    | 130 +------
 autotest/ogr/ogr_style.py                     |   2 -
 autotest/ogr/ogr_sua.py                       |   3 +-
 autotest/ogr/ogr_svg.py                       |   6 +-
 autotest/ogr/ogr_sxf.py                       |   6 +-
 autotest/ogr/ogr_tiger.py                     |   8 +-
 autotest/ogr/ogr_vdv.py                       |  23 +-
 autotest/ogr/ogr_vfk.py                       |  27 +-
 autotest/ogr/ogr_virtualogr.py                |  10 -
 autotest/ogr/ogr_vrt.py                       |  85 +----
 autotest/ogr/ogr_wasp.py                      |  22 +-
 autotest/ogr/ogr_wfs.py                       | 151 +-------
 autotest/ogr/ogr_wfs3.py                      |  24 +-
 autotest/ogr/ogr_wkbwkt_geom.py               |  27 +-
 autotest/ogr/ogr_wktempty.py                  |   2 -
 autotest/ogr/ogr_xls.py                       |   8 -
 autotest/ogr/ogr_xlsx.py                      |  32 +-
 autotest/ogr/ogr_xplane.py                    |  14 +-
 autotest/ogr/ograpispy.py                     |   7 +-
 autotest/osr/osr_basic.py                     |  57 +--
 autotest/osr/osr_compd.py                     |  23 +-
 autotest/osr/osr_ct.py                        |  22 +-
 autotest/osr/osr_ct_proj.py                   |   2 -
 autotest/osr/osr_epsg.py                      |  30 +-
 autotest/osr/osr_erm.py                       |   5 +-
 autotest/osr/osr_esri.py                      |  68 +---
 autotest/osr/osr_getprojectionmethods.py      |   2 -
 autotest/osr/osr_micoordsys.py                |   7 +-
 autotest/osr/osr_ozi.py                       |   6 -
 autotest/osr/osr_pci.py                       |  15 +-
 autotest/osr/osr_pm.py                        |   6 -
 autotest/osr/osr_proj4.py                     |  72 +---
 autotest/osr/osr_url.py                       |   2 -
 autotest/osr/osr_usgs.py                      |   4 -
 autotest/osr/osr_validate.py                  |  12 -
 autotest/osr/osr_xml.py                       |   4 -
 autotest/pymod/gdaltest.py                    |   9 +-
 autotest/pymod/ogrtest.py                     |   3 +-
 autotest/pyscripts/test_gdal2tiles.py         |  21 +-
 autotest/pyscripts/test_gdal_calc.py          |  17 +-
 autotest/pyscripts/test_gdal_edit.py          |  21 +-
 autotest/pyscripts/test_gdal_fillnodata.py    |   7 +-
 autotest/pyscripts/test_gdal_ls_py.py         |  20 +-
 autotest/pyscripts/test_gdal_merge.py         |  13 +-
 autotest/pyscripts/test_gdal_pansharpen.py    |   6 -
 autotest/pyscripts/test_gdal_polygonize.py    |   8 +-
 autotest/pyscripts/test_gdal_proximity.py     |  12 +-
 autotest/pyscripts/test_gdal_retile.py        |  11 +-
 autotest/pyscripts/test_gdal_sieve.py         |   3 +-
 autotest/pyscripts/test_gdalinfo_py.py        |  22 --
 autotest/pyscripts/test_gdalmove.py           |   5 +-
 autotest/pyscripts/test_ogr2ogr_py.py         |  70 +---
 autotest/pyscripts/test_ogrinfo_py.py         |  28 +-
 autotest/pyscripts/test_ogrmerge.py           |  24 --
 autotest/pyscripts/test_rgb2pct.py            |  13 +-
 autotest/utilities/test_gdal_contour.py       |  13 +-
 autotest/utilities/test_gdal_grid.py          |  29 +-
 autotest/utilities/test_gdal_grid_lib.py      |   9 +-
 autotest/utilities/test_gdal_rasterize.py     |  18 -
 autotest/utilities/test_gdal_rasterize_lib.py |  13 +-
 autotest/utilities/test_gdal_translate.py     |  79 +---
 autotest/utilities/test_gdal_translate_lib.py |  52 +--
 autotest/utilities/test_gdaladdo.py           |   9 +-
 autotest/utilities/test_gdalbuildvrt.py       |  24 +-
 autotest/utilities/test_gdalbuildvrt_lib.py   |   4 -
 autotest/utilities/test_gdaldem.py            |  41 +--
 autotest/utilities/test_gdaldem_lib.py        |  37 +-
 autotest/utilities/test_gdalinfo.py           |  82 +----
 autotest/utilities/test_gdalinfo_lib.py       |  16 -
 autotest/utilities/test_gdallocationinfo.py   |  12 -
 autotest/utilities/test_gdalsrsinfo.py        |  36 --
 autotest/utilities/test_gdaltindex.py         |  16 +-
 autotest/utilities/test_gdaltransform.py      |  18 -
 autotest/utilities/test_gdalwarp.py           |  98 +----
 autotest/utilities/test_gdalwarp_lib.py       | 141 +-------
 autotest/utilities/test_gnmutils.py           |  16 +-
 autotest/utilities/test_nearblack.py          |  19 +-
 autotest/utilities/test_nearblack_lib.py      |  14 -
 autotest/utilities/test_ogr2ogr.py            | 128 +------
 autotest/utilities/test_ogr2ogr_lib.py        |  44 +--
 autotest/utilities/test_ogrinfo.py            |  54 +--
 autotest/utilities/test_ogrlineref.py         |  13 +-
 autotest/utilities/test_ogrtindex.py          |   8 +-
 344 files changed, 1097 insertions(+), 9518 deletions(-)

diff --git a/autotest/alg/applyverticalshiftgrid.py b/autotest/alg/applyverticalshiftgrid.py
index 44abde9ad05a..3c60e3a7eb6d 100755
--- a/autotest/alg/applyverticalshiftgrid.py
+++ b/autotest/alg/applyverticalshiftgrid.py
@@ -75,8 +75,6 @@ def test_applyverticalshiftgrid_1():
     cs = out_ds.GetRasterBand(1).Checksum()
     assert cs == 0
 
-    return 'success'
-
 ###############################################################################
 # Error cases
 
@@ -163,8 +161,6 @@ def test_applyverticalshiftgrid_2():
                                              options=['DATATYPE=x'])
     assert out_ds is None
 
-    return 'success'
-
 ###############################################################################
 # Test with grid and src not in same projection
 
@@ -193,8 +189,6 @@ def test_applyverticalshiftgrid_3():
     cs = out_ds.GetRasterBand(1).Checksum()
     assert cs == 4841 or cs == 4854
 
-    return 'success'
-
 ###############################################################################
 # Test nodata
 
@@ -263,8 +257,6 @@ def test_applyverticalshiftgrid_4():
         data = out_ds.GetRasterBand(1).ReadRaster()
     assert data is None
 
-    return 'success'
-
 ###############################################################################
 # Test scaling parameters
 
@@ -291,8 +283,6 @@ def test_applyverticalshiftgrid_5():
     cs = out_ds.GetRasterBand(1).Checksum()
     assert cs == 4672
 
-    return 'success'
-
 ###############################################################################
 # Simulate EGM grids
 
@@ -312,8 +302,6 @@ def test_applyverticalshiftgrid_6():
 
     gdal.Unlink('/vsimem/applyverticalshiftgrid_6.gtx')
 
-    return 'success'
-
 ###############################################################################
 # Simulate USA geoid grids with long origin > 180
 
@@ -333,8 +321,6 @@ def test_applyverticalshiftgrid_7():
 
     gdal.Unlink('/vsimem/applyverticalshiftgrid_7.gtx')
 
-    return 'success'
-
 
 gdaltest_list = [
     test_applyverticalshiftgrid_1,
diff --git a/autotest/alg/contour.py b/autotest/alg/contour.py
index 3a5fe47c8657..cdaae6a4d5d4 100755
--- a/autotest/alg/contour.py
+++ b/autotest/alg/contour.py
@@ -121,8 +121,6 @@ def test_contour_1():
     ogr_ds.ReleaseResultSet(lyr)
     ogr_ds.Destroy()
 
-    return 'success'
-
 ###############################################################################
 # Test with -fl option and -3d option
 
@@ -182,8 +180,6 @@ def test_contour_2():
     ogr_ds.ReleaseResultSet(lyr)
     ogr_ds.Destroy()
 
-    return 'success'
-
 ###############################################################################
 #
 
@@ -205,7 +201,6 @@ def test_contour_real_world_case():
     assert ogr_lyr.GetFeatureCount() == 1
     f = ogr_lyr.GetNextFeature()
     assert ogrtest.check_feature_geometry(f, 'LINESTRING (4.50497512437811 11.5,4.5 11.501996007984,3.5 11.8333333333333,2.5 11.5049751243781,2.490099009901 11.5,2.0 10.5,2.5 10.1666666666667,3.0 9.5,3.5 9.21428571428571,4.49800399201597 8.5,4.5 8.49857346647646,5.5 8.16666666666667,6.5 8.0,7.5 8.0,8.0 7.5,8.5 7.0,9.490099009901 6.5,9.5 6.49667774086379,10.5 6.16666666666667,11.4950248756219 5.5,11.5 5.49833610648919,12.5 5.49667774086379,13.5 5.49800399201597,13.501996007984 5.5,13.5 5.50199600798403,12.501996007984 6.5,12.5 6.50142653352354,11.5 6.509900990099,10.509900990099 7.5,10.5 7.50142653352354,9.5 7.9,8.50332225913621 8.5,8.5 8.50249376558603,7.83333333333333 9.5,7.5 10.0,7.0 10.5,6.5 10.7857142857143,5.5 11.1666666666667,4.50497512437811 11.5)', 0.01) == 0
-    return 'success'
 
 # Test with -p option (polygonize)
 
@@ -275,8 +270,6 @@ def test_contour_3():
     ogr_ds.ReleaseResultSet(lyr)
     ogr_ds.Destroy()
 
-    return 'success'
-
 ###############################################################################
 # Cleanup
 
@@ -288,8 +281,7 @@ def test_contour_cleanup():
     except OSError:
         pass
 
-    return 'success'
-
+    
 
 gdaltest_list = [
     test_contour_1,
diff --git a/autotest/alg/cutline.py b/autotest/alg/cutline.py
index 7f26ad79e036..8fe09ef6b78e 100755
--- a/autotest/alg/cutline.py
+++ b/autotest/alg/cutline.py
@@ -117,8 +117,6 @@ def test_cutline_4():
 
     gdal.Unlink('/vsimem/utmsmall.tif')
 
-    return 'success'
-
 ###############################################################################
 
 
diff --git a/autotest/alg/dither.py b/autotest/alg/dither.py
index ef83b64c4390..b3377ce543e2 100755
--- a/autotest/alg/dither.py
+++ b/autotest/alg/dither.py
@@ -93,8 +93,7 @@ def test_dither_1():
         print('Got: ', cs)
         pytest.fail('got wrong checksum')
 
-    return 'success'
-
+    
 
 gdaltest_list = [
     test_dither_1
diff --git a/autotest/alg/polygonize.py b/autotest/alg/polygonize.py
index 300d0cf99478..6c43b603e67f 100755
--- a/autotest/alg/polygonize.py
+++ b/autotest/alg/polygonize.py
@@ -80,7 +80,7 @@ def test_polygonize_1(is_int_polygonize=True):
             tr = 0
         feat_read.Destroy()
 
-    return 'success' if tr else 'fail'
+    assert tr
 
 
 def test_polygonize_1_float():
@@ -118,7 +118,7 @@ def test_polygonize_2():
 
     tr = ogrtest.check_features_against_list(mem_layer, 'DN', expect)
 
-    return 'success' if tr else 'fail'
+    assert tr
 
 ###############################################################################
 # A more involved case with a complex looping.
@@ -157,7 +157,7 @@ def test_polygonize_3():
         tr = 1
     feat_read.Destroy()
 
-    return 'success' if tr else 'fail'
+    assert tr
 
 ###############################################################################
 # Test a simple case without masking but with 8-connectedness.
@@ -191,7 +191,7 @@ def test_polygonize_4():
 
     tr = ogrtest.check_features_against_list(mem_layer, 'DN', expect)
 
-    return 'success' if tr else 'fail'
+    assert tr
 
 
 gdaltest_list = [
diff --git a/autotest/alg/proximity.py b/autotest/alg/proximity.py
index 37df102cf01c..a6ba81e7a3dc 100755
--- a/autotest/alg/proximity.py
+++ b/autotest/alg/proximity.py
@@ -64,8 +64,7 @@ def test_proximity_1():
     if cs != cs_expected:
         print('Got: ', cs)
         pytest.fail('got wrong checksum')
-    return 'success'
-
+    
 ###############################################################################
 # Try several options
 
@@ -98,8 +97,7 @@ def test_proximity_2():
     if cs != cs_expected:
         print('Got: ', cs)
         pytest.fail('got wrong checksum')
-    return 'success'
-
+    
 ###############################################################################
 # Try input nodata option
 
@@ -132,8 +130,7 @@ def test_proximity_3():
     if cs != cs_expected:
         print('Got: ', cs)
         pytest.fail('got wrong checksum')
-    return 'success'
-
+    
 
 gdaltest_list = [
     test_proximity_1,
diff --git a/autotest/alg/rasterize.py b/autotest/alg/rasterize.py
index 9726526c44af..8730065c3f7b 100755
--- a/autotest/alg/rasterize.py
+++ b/autotest/alg/rasterize.py
@@ -95,8 +95,7 @@ def test_rasterize_1():
         gdal.GetDriverByName('GTiff').CreateCopy('tmp/rasterize_1.tif', target_ds)
         pytest.fail('Did not get expected image checksum')
 
-    return 'success'
-
+    
 ###############################################################################
 # Test rasterization with ALL_TOUCHED.
 
@@ -136,8 +135,7 @@ def test_rasterize_2():
         gdal.GetDriverByName('GTiff').CreateCopy('tmp/rasterize_2.tif', target_ds)
         pytest.fail('Did not get expected image checksum')
 
-    return 'success'
-
+    
 ###############################################################################
 # Rasterization with BURN_VALUE_FROM.
 
@@ -188,8 +186,7 @@ def test_rasterize_3():
         gdal.GetDriverByName('GTiff').CreateCopy('tmp/rasterize_3.tif', target_ds)
         pytest.fail('Did not get expected image checksum')
 
-    return 'success'
-
+    
 ###############################################################################
 # Rasterization with ATTRIBUTE.
 
@@ -243,8 +240,7 @@ def test_rasterize_4():
         gdal.GetDriverByName('GTiff').CreateCopy('tmp/rasterize_4.tif', target_ds)
         pytest.fail('Did not get expected image checksum')
 
-    return 'success'
-
+    
 ###############################################################################
 # Rasterization with MERGE_ALG=ADD.
 
@@ -309,8 +305,7 @@ def test_rasterize_5():
         gdal.GetDriverByName('GTiff').CreateCopy('tmp/rasterize_5.tif', target_ds)
         pytest.fail('Did not get expected image checksum')
 
-    return 'success'
-
+    
 
 ###############################################################################
 # Test bug fix for #5580 (used to hang)
@@ -335,8 +330,6 @@ def test_rasterize_6():
 
     gdal.RasterizeLayer(mask_ds, [1], layer, burn_values=[1], options=["ALL_TOUCHED"])
 
-    return 'success'
-
 
 gdaltest_list = [
     test_rasterize_1,
diff --git a/autotest/alg/reproject.py b/autotest/alg/reproject.py
index 901abb39b3aa..407afcbb5c16 100755
--- a/autotest/alg/reproject.py
+++ b/autotest/alg/reproject.py
@@ -63,8 +63,7 @@ def test_reproject_1():
     if cs != cs_expected:
         print('Got: ', cs)
         pytest.fail('got wrong checksum')
-    return 'success'
-
+    
 ###############################################################################
 # Test a real reprojection case.
 
@@ -95,8 +94,7 @@ def test_reproject_2():
     if cs != cs_expected:
         print('Got: ', cs)
         pytest.fail('got wrong checksum')
-    return 'success'
-
+    
 ###############################################################################
 # Test nodata values
 
@@ -121,8 +119,7 @@ def test_reproject_3():
         import struct
         pytest.fail(struct.unpack('B' * 18, got_data))
 
-    return 'success'
-
+    
 ###############################################################################
 # Test warp options
 
@@ -146,8 +143,7 @@ def test_reproject_4():
         import struct
         pytest.fail(struct.unpack('B' * 18, got_data))
 
-    return 'success'
-
+    
 
 gdaltest_list = [
     test_reproject_1,
diff --git a/autotest/alg/sieve.py b/autotest/alg/sieve.py
index 8c03fdd0240a..b25f67b0a20b 100755
--- a/autotest/alg/sieve.py
+++ b/autotest/alg/sieve.py
@@ -65,8 +65,7 @@ def test_sieve_1():
     if cs != cs_expected:
         print('Got: ', cs)
         pytest.fail('got wrong checksum')
-    return 'success'
-
+    
 ###############################################################################
 # Try eight connected.
 
@@ -95,8 +94,7 @@ def test_sieve_2():
     if cs != cs_expected:
         print('Got: ', cs)
         pytest.fail('got wrong checksum')
-    return 'success'
-
+    
 ###############################################################################
 # Do a sieve resulting in unmergable polygons.
 
@@ -126,8 +124,7 @@ def test_sieve_3():
     if cs != cs_expected:
         print('Got: ', cs)
         pytest.fail('got wrong checksum')
-    return 'success'
-
+    
 ###############################################################################
 # Try the bug 2634 simplified data.
 
@@ -156,8 +153,7 @@ def test_sieve_4():
     if cs != cs_expected:
         print('Got: ', cs)
         pytest.fail('got wrong checksum')
-    return 'success'
-
+    
 
 ###############################################################################
 # Same as sieve_1, but we provide a mask band
@@ -187,8 +183,7 @@ def test_sieve_5():
     if cs != cs_expected:
         print('Got: ', cs)
         pytest.fail('got wrong checksum')
-    return 'success'
-
+    
 ###############################################################################
 # Performance test. When increasing the 'size' parameter, performance
 # should stay roughly linear with the number of pixels (i.e. size^2)
@@ -226,8 +221,7 @@ def test_sieve_6():
         print('Got: ', cs)
         pytest.fail('got wrong checksum')
 
-    return 'success'
-
+    
 ###############################################################################
 # Test with nodata
 
@@ -282,8 +276,7 @@ def test_sieve_7():
     if cs != cs_expected:
         print('Got: ', cs)
         pytest.fail('got wrong checksum')
-    return 'success'
-
+    
 ###############################################################################
 # Test propagation in our search of biggest neighbour
 
@@ -330,8 +323,7 @@ def test_sieve_8():
     if cs != cs_expected:
         print('Got: ', cs)
         pytest.fail('got wrong checksum')
-    return 'success'
-
+    
 
 gdaltest_list = [
     test_sieve_1,
diff --git a/autotest/alg/tps.py b/autotest/alg/tps.py
index 16eacfe793fa..17ea356941de 100755
--- a/autotest/alg/tps.py
+++ b/autotest/alg/tps.py
@@ -59,8 +59,6 @@ def test_tps_1():
                                         'METHOD=GCP_TPS'])
     assert transformer is None
 
-    return 'success'
-
 
 gdaltest_list = [
     test_tps_1,
diff --git a/autotest/alg/transformgeoloc.py b/autotest/alg/transformgeoloc.py
index 302b64d0fd7a..bd42a97c375f 100755
--- a/autotest/alg/transformgeoloc.py
+++ b/autotest/alg/transformgeoloc.py
@@ -82,8 +82,6 @@ def test_transformgeoloc_1():
 
     print(geoloc_ds.ReadAsArray())
 
-    return 'success'
-
 
 gdaltest_list = [
     test_transformgeoloc_1,
diff --git a/autotest/alg/warp.py b/autotest/alg/warp.py
index 30c16db71d2b..4976fe5ce463 100755
--- a/autotest/alg/warp.py
+++ b/autotest/alg/warp.py
@@ -64,8 +64,6 @@ def test_warp_1():
 
     assert maxdiff <= 1, 'Image too different from reference'
 
-    return 'success'
-
 
 def test_warp_1_short():
 
@@ -81,8 +79,6 @@ def test_warp_1_short():
 
     assert maxdiff <= 1, 'Image too different from reference'
 
-    return 'success'
-
 
 def test_warp_1_ushort():
 
@@ -98,8 +94,6 @@ def test_warp_1_ushort():
 
     assert maxdiff <= 1, 'Image too different from reference'
 
-    return 'success'
-
 
 def test_warp_1_float():
 
@@ -115,8 +109,6 @@ def test_warp_1_float():
 
     assert maxdiff <= 1, 'Image too different from reference'
 
-    return 'success'
-
 
 def test_warp_2():
 
@@ -132,8 +124,6 @@ def test_warp_2():
 
     assert maxdiff <= 1, 'Image too different from reference'
 
-    return 'success'
-
 
 def test_warp_2_short():
 
@@ -149,8 +139,6 @@ def test_warp_2_short():
 
     assert maxdiff <= 1, 'Image too different from reference'
 
-    return 'success'
-
 
 def test_warp_2_ushort():
 
@@ -166,8 +154,6 @@ def test_warp_2_ushort():
 
     assert maxdiff <= 1, 'Image too different from reference'
 
-    return 'success'
-
 
 def test_warp_2_downsize():
 
@@ -183,8 +169,6 @@ def test_warp_2_downsize():
 
     assert maxdiff <= 1, 'Image too different from reference'
 
-    return 'success'
-
 
 def test_warp_3():
 
@@ -200,8 +184,6 @@ def test_warp_3():
 
     assert maxdiff <= 1, 'Image too different from reference'
 
-    return 'success'
-
 
 def test_warp_3_short():
 
@@ -217,8 +199,6 @@ def test_warp_3_short():
 
     assert maxdiff <= 1, 'Image too different from reference'
 
-    return 'success'
-
 
 def test_warp_3_ushort():
 
@@ -234,8 +214,6 @@ def test_warp_3_ushort():
 
     assert maxdiff <= 1, 'Image too different from reference'
 
-    return 'success'
-
 
 def test_warp_3_downsize():
 
@@ -251,8 +229,6 @@ def test_warp_3_downsize():
 
     assert maxdiff <= 1, 'Image too different from reference'
 
-    return 'success'
-
 
 def test_warp_3_float_downsize():
 
@@ -268,8 +244,6 @@ def test_warp_3_float_downsize():
 
     assert maxdiff <= 1, 'Image too different from reference'
 
-    return 'success'
-
 
 def test_warp_4():
 
@@ -285,8 +259,6 @@ def test_warp_4():
 
     assert maxdiff <= 1, 'Image too different from reference'
 
-    return 'success'
-
 
 def test_warp_4_short():
 
@@ -302,8 +274,6 @@ def test_warp_4_short():
 
     assert maxdiff <= 1, 'Image too different from reference'
 
-    return 'success'
-
 
 def test_warp_4_ushort():
 
@@ -319,8 +289,6 @@ def test_warp_4_ushort():
 
     assert maxdiff <= 1, 'Image too different from reference'
 
-    return 'success'
-
 
 def test_warp_4_downsize():
 
@@ -336,8 +304,6 @@ def test_warp_4_downsize():
 
     assert maxdiff <= 1, 'Image too different from reference'
 
-    return 'success'
-
 
 def test_warp_4_short_downsize():
 
@@ -353,8 +319,6 @@ def test_warp_4_short_downsize():
 
     assert maxdiff <= 1, 'Image too different from reference'
 
-    return 'success'
-
 
 def test_warp_4_float_downsize():
 
@@ -370,8 +334,6 @@ def test_warp_4_float_downsize():
 
     assert maxdiff <= 1, 'Image too different from reference'
 
-    return 'success'
-
 
 def test_warp_5():
 
@@ -387,8 +349,6 @@ def test_warp_5():
 
     assert maxdiff <= 1, 'Image too different from reference'
 
-    return 'success'
-
 
 def test_warp_5_downsize():
 
@@ -404,8 +364,6 @@ def test_warp_5_downsize():
 
     assert maxdiff <= 1, 'Image too different from reference'
 
-    return 'success'
-
 # Downsampling
 
 
@@ -456,8 +414,6 @@ def test_warp_9():
 
     assert maxdiff <= 1, 'Image too different from reference'
 
-    return 'success'
-
 
 def test_warp_10():
 
@@ -473,8 +429,6 @@ def test_warp_10():
 
     assert maxdiff <= 1, 'Image too different from reference'
 
-    return 'success'
-
 
 def test_warp_11():
 
@@ -685,8 +639,6 @@ def warp_19_internal(size, datatype, resampling_string):
 
     gdaltest.tiff_drv.Delete('tmp/test.tif')
 
-    return 'success'
-
 
 # Test all data types and resampling methods for very small images
 # to test edge behaviour
@@ -719,8 +671,7 @@ def test_warp_19():
                 assert warp_19_internal(size, datatype, method) == 'success', \
                     ('fail with size = %d, data type = %d and method %s' % (size, datatype, method))
 
-    return 'success'
-
+    
 
 # Test fix for #2724 (initialization of destination area to nodata in warped VRT)
 def test_warp_20():
@@ -755,8 +706,6 @@ def test_warp_21():
 
     os.remove('tmp/warp_21.vrt')
 
-    return 'success'
-
 ###############################################################################
 # Test warping with datasets which are "bigger" than the wm parameter.
 # Would have detected issue of #3458
@@ -902,8 +851,6 @@ def test_warp_24():
 
     assert cs == cs_ref, 'did not get expected checksum'
 
-    return 'success'
-
 ###############################################################################
 # Test -refine_gcps (#4143)
 
@@ -916,8 +863,6 @@ def test_warp_25():
 
     assert cs == 4672, 'did not get expected checksum'
 
-    return 'success'
-
 ###############################################################################
 # Test serializing and deserializing TPS transformer
 
@@ -939,8 +884,6 @@ def test_warp_26():
     os.unlink('tmp/warp_25_gcp.vrt')
     os.unlink('tmp/warp_25_warp.vrt')
 
-    return 'success'
-
 ###############################################################################
 # Pure Python reprojection example. Nothing particular, just make use of existing
 # API.
@@ -1013,8 +956,6 @@ def test_warp_27():
     gdal.Unlink('tmp/warp_27.tif')
     gdal.Unlink('tmp/warp_27_ref.tif')
 
-    return 'success'
-
 ###############################################################################
 # Test reading a VRT with a destination alpha band, but no explicit
 # INIT_DEST setting
@@ -1028,8 +969,6 @@ def test_warp_28():
     assert not (cs1 == 0 or cs2 == 0), 'bad checksum'
     ds = None
 
-    return 'success'
-
 ###############################################################################
 # Test multi-thread computations
 
@@ -1088,8 +1027,6 @@ def test_warp_29():
 
     src_ds = None
 
-    return 'success'
-
 ###############################################################################
 # Test warping interruption
 
@@ -1167,8 +1104,6 @@ def test_warp_30():
 
     gdal.Unlink('/vsimem/warp_30.tif')
 
-    return 'success'
-
 # Average (Byte)
 
 
@@ -1186,8 +1121,6 @@ def test_warp_31():
 
     assert maxdiff <= 1, 'Image too different from reference'
 
-    return 'success'
-
 # Average (Float)
 
 
@@ -1205,8 +1138,6 @@ def test_warp_32():
 
     assert maxdiff <= 1, 'Image too different from reference'
 
-    return 'success'
-
 # Mode (Byte)
 
 
@@ -1224,8 +1155,6 @@ def test_warp_33():
 
     assert maxdiff <= 1, 'Image too different from reference'
 
-    return 'success'
-
 # Mode (Int16)
 
 
@@ -1243,8 +1172,6 @@ def test_warp_34():
 
     assert maxdiff <= 1, 'Image too different from reference'
 
-    return 'success'
-
 # Mode (Int16 - signed with negative values)
 
 
@@ -1262,8 +1189,6 @@ def test_warp_35():
 
     assert maxdiff <= 1, 'Image too different from reference'
 
-    return 'success'
-
 # Mode (Int32) - this uses algorithm 2 (inefficient)
 
 
@@ -1281,8 +1206,6 @@ def test_warp_36():
 
     assert maxdiff <= 1, 'Image too different from reference'
 
-    return 'success'
-
 ###############################################################################
 # Test a few error cases
 
@@ -1315,8 +1238,6 @@ def test_warp_37():
     gdal.ErrorReset()
     assert tmp_ds is None
 
-    return 'success'
-
 ###############################################################################
 # Test a warp with GCPs on the *destination* image.
 
@@ -1348,7 +1269,6 @@ def test_warp_38():
     assert cs == exp_cs
 
     os.unlink(out_file)
-    return 'success'
 
 ###############################################################################
 # Test a warp with GCPs for TPS on the *destination* image.
@@ -1381,7 +1301,6 @@ def test_warp_39():
     assert cs == exp_cs
 
     os.unlink(out_file)
-    return 'success'
 
 ###############################################################################
 # test average (#5311)
@@ -1401,8 +1320,6 @@ def test_warp_40():
 
     assert maxdiff <= 1, 'Image too different from reference'
 
-    return 'success'
-
 ###############################################################################
 # test GDALSuggestedWarpOutput (#5693)
 
@@ -1430,8 +1347,7 @@ def test_warp_41():
     for i in range(6):
         assert abs(src_gt[i] - vrt_gt[i]) <= 1e-5
 
-    return 'success'
-
+    
 ###############################################################################
 
 # Maximum
@@ -1451,8 +1367,6 @@ def test_warp_42():
 
     assert maxdiff <= 1, 'Image too different from reference'
 
-    return 'success'
-
 # Minimum
 
 
@@ -1470,8 +1384,6 @@ def test_warp_43():
 
     assert maxdiff <= 1, 'Image too different from reference'
 
-    return 'success'
-
 # Median
 
 
@@ -1489,8 +1401,6 @@ def test_warp_44():
 
     assert maxdiff <= 1, 'Image too different from reference'
 
-    return 'success'
-
 # Quartile 1
 
 
@@ -1508,8 +1418,6 @@ def test_warp_45():
 
     assert maxdiff <= 1, 'Image too different from reference'
 
-    return 'success'
-
 # Quartile 3
 
 
@@ -1527,8 +1435,6 @@ def test_warp_46():
 
     assert maxdiff <= 1, 'Image too different from reference'
 
-    return 'success'
-
 # Maximum (Int16 - signed with negative values)
 
 
@@ -1546,8 +1452,6 @@ def test_warp_47():
 
     assert maxdiff <= 1, 'Image too different from reference'
 
-    return 'success'
-
 # Minimum (Int16 - signed with negative values)
 
 
@@ -1565,8 +1469,6 @@ def test_warp_48():
 
     assert maxdiff <= 1, 'Image too different from reference'
 
-    return 'success'
-
 # Median (Int16 - signed with negative values)
 
 
@@ -1584,8 +1486,6 @@ def test_warp_49():
 
     assert maxdiff <= 1, 'Image too different from reference'
 
-    return 'success'
-
 # Quartile 1 (Int16 - signed with negative values)
 
 
@@ -1603,8 +1503,6 @@ def test_warp_50():
 
     assert maxdiff <= 1, 'Image too different from reference'
 
-    return 'success'
-
 # Quartile 3 (Int16 - signed with negative values)
 
 
@@ -1622,8 +1520,6 @@ def test_warp_51():
 
     assert maxdiff <= 1, 'Image too different from reference'
 
-    return 'success'
-
 ###############################################################################
 # Test fix for #6182
 
@@ -1669,8 +1565,6 @@ def test_warp_52():
     cs = out_ds.GetRasterBand(4).Checksum()
     assert cs == 3188
 
-    return 'success'
-
 ###############################################################################
 # Test Grey+Alpha
 
@@ -1706,8 +1600,7 @@ def test_warp_53():
                     print(option)
                     pytest.fail(alg_name)
 
-    return 'success'
-
+    
 ###############################################################################
 # Test Alpha on UInt16/Int16
 
@@ -1746,8 +1639,6 @@ def test_warp_54():
 
     gdal.Unlink('/vsimem/warp_54.tif')
 
-    return 'success'
-
 ###############################################################################
 # Test warped VRT with source overview, target GT != GenImgProjetion target GT
 # and subsampling (#6972)
@@ -1760,8 +1651,6 @@ def test_warp_55():
     assert cs == 25128
     ds = None
 
-    return 'success'
-
 ###############################################################################
 # Test bilinear interpolation when warping into same coordinate system (and
 # same size). This test crops a single pixel out of a 3-by-3 image.
@@ -1794,8 +1683,7 @@ def test_warp_56():
         assert abs(warped - exp) <= 0.6, \
             'offset: {}, expected: {:.0f}, got: {}'.format(off, exp, warped)
 
-    return 'success'
-
+    
 
 gdaltest_list = [
     test_warp_1,
diff --git a/autotest/gcore/asyncreader.py b/autotest/gcore/asyncreader.py
index cc37db6b26e6..8c56b9998f73 100755
--- a/autotest/gcore/asyncreader.py
+++ b/autotest/gcore/asyncreader.py
@@ -62,8 +62,7 @@ def test_asyncreader_1():
     for i, csum in enumerate(cs):
         assert csum == expected_cs[i], ('did not get expected checksum for band %d' % (i + 1))
 
-    return 'success'
-
+    
 
 gdaltest_list = [test_asyncreader_1]
 
diff --git a/autotest/gcore/basic_test.py b/autotest/gcore/basic_test.py
index d65f62ae1089..15f1146d6860 100755
--- a/autotest/gcore/basic_test.py
+++ b/autotest/gcore/basic_test.py
@@ -53,7 +53,7 @@ def test_basic_test_1():
     ds = gdal.Open('non_existing_ds', gdal.GA_ReadOnly)
     gdal.PopErrorHandler()
     if ds is None and matches_non_existing_error_msg(gdal.GetLastErrorMsg()):
-        return 'success'
+        return
     pytest.fail('did not get expected error message, got %s' % gdal.GetLastErrorMsg())
 
 
@@ -79,14 +79,12 @@ def test_basic_test_strace_non_existing_file():
     # Only 3 calls on the file are legit: open(), stat() and readlink()
     assert len(interesting_lines) <= 3, 'too many system calls accessing file'
 
-    return 'success'
-
 def test_basic_test_2():
     gdal.PushErrorHandler('CPLQuietErrorHandler')
     ds = gdal.Open('non_existing_ds', gdal.GA_Update)
     gdal.PopErrorHandler()
     if ds is None and matches_non_existing_error_msg(gdal.GetLastErrorMsg()):
-        return 'success'
+        return
     pytest.fail('did not get expected error message, got %s' % gdal.GetLastErrorMsg())
 
 
@@ -95,7 +93,7 @@ def test_basic_test_3():
     ds = gdal.Open('', gdal.GA_ReadOnly)
     gdal.PopErrorHandler()
     if ds is None and matches_non_existing_error_msg(gdal.GetLastErrorMsg()):
-        return 'success'
+        return
     pytest.fail('did not get expected error message, got %s' % gdal.GetLastErrorMsg())
 
 
@@ -104,7 +102,7 @@ def test_basic_test_4():
     ds = gdal.Open('', gdal.GA_Update)
     gdal.PopErrorHandler()
     if ds is None and matches_non_existing_error_msg(gdal.GetLastErrorMsg()):
-        return 'success'
+        return
     pytest.fail('did not get expected error message, got %s' % gdal.GetLastErrorMsg())
 
 
@@ -115,7 +113,7 @@ def test_basic_test_5():
     last_error = gdal.GetLastErrorMsg()
     expected = '`data/doctype.xml\' not recognized as a supported file format'
     if ds is None and expected in last_error:
-        return 'success'
+        return
     pytest.fail()
 
 ###############################################################################
@@ -127,8 +125,6 @@ def test_basic_test_6():
     gdal.AllRegister()
     gdal.AllRegister()
 
-    return 'success'
-
 ###############################################################################
 # Test fix for #3077 (check that errors are cleared when using UseExceptions())
 
@@ -150,7 +146,7 @@ def basic_test_7_internal():
 
         assert gdal.GetLastErrorType() == 0, 'got unexpected error type'
 
-        return 'success'
+        return
 
 
 def test_basic_test_7():
@@ -184,8 +180,6 @@ def test_basic_test_8():
     os.unlink('tmp/LICENSE.TXT')
     assert ret.find('fake_license') == 0 or ret.find('GDAL/OGR Licensing') >= 0
 
-    return 'success'
-
 ###############################################################################
 # Test gdal.PushErrorHandler() with a Python error handler
 
@@ -211,8 +205,6 @@ def test_basic_test_9():
 
     assert gdaltest.msg == 'test'
 
-    return 'success'
-
 ###############################################################################
 # Test gdal.PushErrorHandler() with a Python error handler as a method (#5186)
 
@@ -247,8 +239,6 @@ def test_basic_test_10():
 
     assert error_handler.msg == 'test'
 
-    return 'success'
-
 ###############################################################################
 # Test gdal.OpenEx()
 
@@ -327,8 +317,6 @@ def test_basic_test_11():
         gdal.DontUseExceptions()
     assert got_exception
 
-    return 'success'
-
 ###############################################################################
 # Test GDAL layer API
 
@@ -359,8 +347,6 @@ def test_basic_test_12():
     ds.SetStyleTable(ds.GetStyleTable())
     ds = None
 
-    return 'success'
-
 ###############################################################################
 # Test correct sorting of StringList / metadata (#5540, #5557)
 
@@ -395,8 +381,7 @@ def test_basic_test_13():
     for i in range(200):
         assert ds.GetMetadataItem("FILENAME_%d" % i) == '%d' % i
 
-    return 'success'
-
+    
 ###############################################################################
 # Test SetMetadata()
 
@@ -467,8 +452,7 @@ def test_basic_test_14():
     except:
         pass
 
-    return 'success'
-
+    
 ###############################################################################
 # Test errors with progress callback
 
@@ -508,8 +492,6 @@ def test_basic_test_15():
         ds = gdal.GetDriverByName('MEM').CreateCopy('', gdal.GetDriverByName('MEM').Create('', 1, 1), callback=basic_test_15_cbk_bad_ret)
     assert ds is None
 
-    return 'success'
-
 ###############################################################################
 # Test unrecognized and recognized open options prefixed by @
 
@@ -527,8 +509,6 @@ def test_basic_test_16():
     gdal.Unlink('/vsimem/temp.tif')
     assert gdal.GetLastErrorMsg() == 'Invalid value for NUM_THREADS: INVALID'
 
-    return 'success'
-
 ###############################################################################
 # Test mix of gdal/ogr.UseExceptions()/DontUseExceptions()
 
@@ -568,8 +548,7 @@ def test_basic_test_17():
         assert not gdal.GetUseExceptions()
         assert not ogr.GetUseExceptions()
 
-    return 'success'
-
+    
 
 gdaltest_list = [test_basic_test_1,
                  test_basic_test_strace_non_existing_file,
diff --git a/autotest/gcore/colortable.py b/autotest/gcore/colortable.py
index 229421d2d764..578ca084d0bb 100755
--- a/autotest/gcore/colortable.py
+++ b/autotest/gcore/colortable.py
@@ -49,8 +49,7 @@ def test_colortable_1():
     for i in range(len(gdaltest.test_ct_data)):
         gdaltest.test_ct.SetColorEntry(i, gdaltest.test_ct_data[i])
 
-    return 'success'
-
+    
 ###############################################################################
 # verify contents.
 
@@ -69,8 +68,7 @@ def test_colortable_2():
 
             assert g_data[j] == o_v, 'color table mismatch'
 
-    return 'success'
-
+    
 ###############################################################################
 # Test CreateColorRamp()
 
@@ -89,15 +87,12 @@ def test_colortable_3():
 
     assert ct.GetColorEntry(255) == (0, 0, 255, 255)
 
-    return 'success'
-
 ###############################################################################
 # Cleanup.
 
 
 def test_colortable_cleanup():
     gdaltest.test_ct = None
-    return 'success'
 
 
 gdaltest_list = [
diff --git a/autotest/gcore/envi_read.py b/autotest/gcore/envi_read.py
index b9999fec6bf9..f8f99f9baa8a 100755
--- a/autotest/gcore/envi_read.py
+++ b/autotest/gcore/envi_read.py
@@ -49,8 +49,6 @@ def test_envi_1():
 
     assert len(filelist) == 2, 'did not get expected file list.'
 
-    return 'success'
-
 ###############################################################################
 # When imported build a list of units based on the files available.
 
diff --git a/autotest/gcore/gcps2geotransform.py b/autotest/gcore/gcps2geotransform.py
index 5ad2683b962f..aad8f553570a 100755
--- a/autotest/gcore/gcps2geotransform.py
+++ b/autotest/gcore/gcps2geotransform.py
@@ -64,8 +64,6 @@ def test_gcps2gt_1():
     assert gdaltest.geotransform_equals(
             gt, (400000.0, 100.0, 0.0, 370000.0, 0.0, -10.0), 0.000001)
 
-    return 'success'
-
 ###############################################################################
 # Similar but non-exact.
 
@@ -81,8 +79,6 @@ def test_gcps2gt_2():
     assert gdaltest.geotransform_equals(
             gt, (400000.0, 100.0, 0.0, 370000.0025, -5e-05, -9.999975), 0.000001)
 
-    return 'success'
-
 ###############################################################################
 # bApproxOK false, and no good solution.
 
@@ -98,8 +94,6 @@ def test_gcps2gt_3():
     ]), approx_ok)
     assert gt is None, 'Expected failure when no good solution.'
 
-    return 'success'
-
 ###############################################################################
 # Single point - Should return None.
 
@@ -111,8 +105,6 @@ def test_gcps2gt_4():
     ]))
     assert gt is None, 'Expected failure for single GCP.'
 
-    return 'success'
-
 ###############################################################################
 # Two points - simple offset and scale, no rotation.
 
@@ -126,8 +118,6 @@ def test_gcps2gt_5():
     assert gdaltest.geotransform_equals(
             gt, (400000.0, 100.0, 0.0, 370000.0, 0.0, -10.0), 0.000001)
 
-    return 'success'
-
 ###############################################################################
 # Special case for four points in a particular order.  Exact result.
 
@@ -143,8 +133,6 @@ def test_gcps2gt_6():
     assert gdaltest.geotransform_equals(
             gt, (0.0, 1.0, 0.0, 0.0, 0.0, 1.0), 0.000001)
 
-    return 'success'
-
 ###############################################################################
 # Try a case that is hard to do without normalization.
 
@@ -160,8 +148,6 @@ def test_gcps2gt_7():
     assert gdaltest.geotransform_equals(
             gt, (0.0, 1.0, 0.0, 0.0, 0.0, 1.0), 0.000001)
 
-    return 'success'
-
 ###############################################################################
 # A fairly messy real world case without a easy to predict result.
 
@@ -180,8 +166,6 @@ def test_gcps2gt_8():
                    39.227856615716, 2.6091510188921e-05, 1.596921026218e-05)
     assert gdaltest.geotransform_equals(gt, gt_expected, 0.00001)
 
-    return 'success'
-
 
 gdaltest_list = [
     test_gcps2gt_1,
diff --git a/autotest/gcore/gdal_api_proxy.py b/autotest/gcore/gdal_api_proxy.py
index 4bdb6a1de864..ab8bd72bc540 100755
--- a/autotest/gcore/gdal_api_proxy.py
+++ b/autotest/gcore/gdal_api_proxy.py
@@ -54,8 +54,6 @@ def test_gdal_api_proxy_1():
 
     assert ret.find('Failed:    0') != -1
 
-    return 'success'
-
 ###############################################################################
 # Test connection to TCP server
 
@@ -70,8 +68,6 @@ def test_gdal_api_proxy_2():
 
     assert ret.find('Failed:    0') != -1
 
-    return 'success'
-
 ###############################################################################
 # Test connection to Unix socket server
 
@@ -92,8 +88,6 @@ def test_gdal_api_proxy_3():
 
     assert ret.find('Failed:    0') != -1
 
-    return 'success'
-
 ###############################################################################
 # Test -nofork mode
 
@@ -114,8 +108,6 @@ def test_gdal_api_proxy_4():
 
     assert ret.find('Failed:    0') != -1
 
-    return 'success'
-
 ###############################################################################
 #
 
@@ -398,8 +390,6 @@ def test_gdal_api_proxy_sub():
 
     gdal.GetDriverByName('GTiff').Delete('tmp/byte.tif')
 
-    return 'success'
-
 ###############################################################################
 #
 
@@ -413,8 +403,6 @@ def test_gdal_api_proxy_sub_clean():
         gdaltest.api_proxy_server_p.wait()
     gdal.Unlink('tmp/gdalapiproxysocket')
 
-    return 'success'
-
 
 gdaltest_list = [test_gdal_api_proxy_1,
                  test_gdal_api_proxy_2,
diff --git a/autotest/gcore/gdal_stats.py b/autotest/gcore/gdal_stats.py
index 73f35a6436f7..e69c6837dce6 100755
--- a/autotest/gcore/gdal_stats.py
+++ b/autotest/gcore/gdal_stats.py
@@ -110,8 +110,6 @@ def test_stats_dont_force():
     stats = ds.GetRasterBand(1).GetStatistics(0, 0)
     assert stats == [0, 0, 0, -1], 'did not get expected stats'
 
-    return 'success'
-
 
 ###############################################################################
 # Test statistics when stored nodata value doesn't accurately match the nodata
@@ -150,8 +148,6 @@ def test_stats_approx_nodata():
 
     assert minmax == (-3.0, 5.0), 'did not get expected minmax'
 
-    return 'success'
-
 
 ###############################################################################
 # Test read and copy of dataset with nan as nodata value (#3576)
@@ -179,8 +175,6 @@ def test_stats_nan_3():
     gdaltest.gtiff_drv.Delete('tmp/nan32_nodata.tif')
     assert gdaltest.isnan(nodata), ('expected nan, got %f' % nodata)
 
-    return 'success'
-
 ###############################################################################
 # Test reading a VRT with a complex source that define nan as band nodata
 # and complex source nodata (#3576)
@@ -197,8 +191,6 @@ def test_stats_nan_4():
 
     assert gdaltest.isnan(nodata), ('expected nan, got %f' % nodata)
 
-    return 'success'
-
 ###############################################################################
 # Test reading a VRT with a complex source that define 0 as band nodata
 # and complex source nodata (nan must be translated to 0 then) (#3576)
@@ -215,8 +207,6 @@ def test_stats_nan_5():
 
     assert nodata == 0, ('expected nan, got %f' % nodata)
 
-    return 'success'
-
 
 ###############################################################################
 # Test reading a warped VRT with nan as src nodata and dest nodata (#3576)
@@ -232,8 +222,6 @@ def test_stats_nan_6():
 
     assert gdaltest.isnan(nodata), ('expected nan, got %f' % nodata)
 
-    return 'success'
-
 ###############################################################################
 # Test reading a warped VRT with nan as src nodata and 0 as dest nodata (#3576)
 
@@ -249,8 +237,6 @@ def test_stats_nan_7():
 
     assert nodata == 0, ('expected nan, got %f' % nodata)
 
-    return 'success'
-
 
 ###############################################################################
 # Test reading a warped VRT with zero as src nodata and nan as dest nodata (#3576)
@@ -266,8 +252,6 @@ def test_stats_nan_8():
 
     assert gdaltest.isnan(nodata), ('expected nan, got %f' % nodata)
 
-    return 'success'
-
 ###############################################################################
 # Test statistics computation when nodata = +/- inf
 
@@ -295,8 +279,6 @@ def test_stats_nodata_inf():
 
     assert stats == [-2.0, 1.0, -0.5, 1.5], 'did not get expected stats'
 
-    return 'success'
-
 
 ###############################################################################
 # Test deserialization of +inf/-inf values written by Linux and Windows
@@ -308,8 +290,6 @@ def stats_nodata_check(filename, expected_nodata):
 
     assert nodata == expected_nodata, 'did not get expected nodata value'
 
-    return 'success'
-
 
 def test_stats_nodata_neginf_linux():
     return stats_nodata_check('data/stats_nodata_neginf.tif', gdaltest.neginf())
@@ -349,8 +329,6 @@ def test_stats_stddev_huge_values():
     ds = None
     gdal.GetDriverByName('AAIGRID').Delete('/vsimem/stats_stddev_huge_values.asc')
 
-    return 'success'
-
 ###############################################################################
 # Test approximate statistics computation on a square shaped raster whose first column
 # of blocks is nodata only
@@ -374,8 +352,7 @@ def test_stats_square_shape():
         print(hist)
         pytest.fail('did not get expected minmax')
 
-    return 'success'
-
+    
 ###############################################################################
 # Test when nodata = FLT_MIN (#6578)
 
@@ -411,8 +388,6 @@ def test_stats_flt_min():
 
     assert minmax == (0.0, 1.0), 'did not get expected minmax'
 
-    return 'success'
-
 ###############################################################################
 # Test when nodata = DBL_MIN (#6578)
 
@@ -448,8 +423,6 @@ def test_stats_dbl_min():
 
     assert minmax == (0.0, 1.0), 'did not get expected minmax'
 
-    return 'success'
-
 ###############################################################################
 # Test stats on a tiled Byte with partial tiles
 
@@ -547,8 +520,6 @@ def test_stats_byte_partial_tiles():
     assert max([abs(stats[i] - expected_stats[i]) for i in range(4)]) <= 1e-15, \
         'did not get expected stats'
 
-    return 'success'
-
 ###############################################################################
 # Test stats on uint16
 
@@ -648,8 +619,6 @@ def test_stats_uint16():
     assert max([abs(stats[i] - expected_stats[i]) for i in range(4)]) <= 1e-15, \
         'did not get expected stats'
 
-    return 'success'
-
 ###############################################################################
 # Test a case where the nodata value is almost the maximum value of float32
 
@@ -670,8 +639,6 @@ def test_stats_nodata_almost_max_float32():
 
     gdal.GetDriverByName('GTiff').Delete('/vsimem/float32_almost_nodata_max_float32.tif')
 
-    return 'success'
-
 
 ###############################################################################
 # Test STATISTICS_APPROXIMATE
@@ -702,8 +669,6 @@ def test_stats_approx_stats_flag(dt=gdal.GDT_Byte, struct_frmt='B'):
     md = ds.GetRasterBand(1).GetMetadata()
     assert 'STATISTICS_APPROXIMATE' not in md, 'did not get expected metadata'
 
-    return 'success'
-
 
 def test_stats_approx_stats_flag_float():
     return test_stats_approx_stats_flag(dt=gdal.GDT_Float32, struct_frmt='f')
@@ -728,8 +693,6 @@ def test_stats_all_nodata():
         stats = ds.GetRasterBand(1).GetStatistics(approx_ok, force)
     assert stats == [0.0, 0.0, 0.0, 0.0], 'did not get expected stats'
 
-    return 'success'
-
 
 def test_stats_float32_with_nodata_slightly_above_float_max():
 
@@ -738,8 +701,6 @@ def test_stats_float32_with_nodata_slightly_above_float_max():
     assert (my_min, my_max) == (-1.0989999771118164, 0.703338623046875), \
         'did not get expected stats'
 
-    return 'success'
-
 
 ###############################################################################
 # Run tests
diff --git a/autotest/gcore/hdf4_read.py b/autotest/gcore/hdf4_read.py
index fbccb9a6283c..67aae172c308 100755
--- a/autotest/gcore/hdf4_read.py
+++ b/autotest/gcore/hdf4_read.py
@@ -105,8 +105,6 @@ def test_hdf4_read_online_2():
     assert md['X_DATASET'] == 'HDF4_SDS:UNKNOWN:"tmp/cache/A2006005182000.L2_LAC_SST.x.hdf":11', \
         'Did not get expected X_DATASET'
 
-    return 'success'
-
 
 ###############################################################################
 # Test HDF4_EOS:EOS_GRID
@@ -134,8 +132,6 @@ def test_hdf4_read_online_3():
 
     ds = None
 
-    return 'success'
-
 ###############################################################################
 # Test HDF4_SDS:SEAWIFS_L1A
 
@@ -157,8 +153,6 @@ def test_hdf4_read_online_4():
 
     ds = None
 
-    return 'success'
-
 ###############################################################################
 # Test fix for #2208
 
@@ -176,8 +170,6 @@ def test_hdf4_read_online_5():
 
     ret = tst.testOpen()
 
-    return 'success'
-
 ###############################################################################
 # Test fix for #3386 where block size is dataset size
 
@@ -207,8 +199,6 @@ def test_hdf4_read_online_6():
 
     ds = None
 
-    return 'success'
-
 ###############################################################################
 # Test fix for #3386 where block size is smaller than dataset size
 
@@ -237,8 +227,6 @@ def test_hdf4_read_online_7():
 
     ds = None
 
-    return 'success'
-
 
 ###############################################################################
 # Test reading a HDF4_EOS:EOS_GRID where preferred block height reported would be 1
@@ -270,8 +258,6 @@ def test_hdf4_read_online_8():
 
     ds = None
 
-    return 'success'
-
 ###############################################################################
 # Test reading L1G MTL metadata metadata
 
@@ -296,8 +282,6 @@ def test_hdf4_read_online_9():
 
     assert gcp_count == 4, 'did not get expected gcp count'
 
-    return 'success'
-
 ###############################################################################
 # Test that non-tiled access works (#4672)
 
@@ -321,8 +305,6 @@ def test_hdf4_read_online_10():
 
     ds = None
 
-    return 'success'
-
 
 gdaltest_list = [
     test_hdf4_read_online_1,
diff --git a/autotest/gcore/hfa_read.py b/autotest/gcore/hfa_read.py
index 87f7d846ddaa..080f6a99c9b0 100755
--- a/autotest/gcore/hfa_read.py
+++ b/autotest/gcore/hfa_read.py
@@ -65,8 +65,7 @@ def test_hfa_read_completedefn_recursion():
 
     with gdaltest.error_handler():
         gdal.Open('data/hfa_completedefn_recursion.img')
-    return 'success'
-
+    
 
 gdaltest_list = [test_hfa_read_completedefn_recursion]
 
diff --git a/autotest/gcore/hfa_rfc40.py b/autotest/gcore/hfa_rfc40.py
index 6433f8b1a439..258948ed0ccb 100755
--- a/autotest/gcore/hfa_rfc40.py
+++ b/autotest/gcore/hfa_rfc40.py
@@ -171,8 +171,6 @@ def CreateAndWriteRAT(fname):
     # ds.FlushCache()
     ds = None
 
-    return 'success'
-
 
 def ReadAndCheckValues(fname, numrows):
     ds = gdal.Open(fname)
@@ -224,8 +222,6 @@ def ReadAndCheckValues(fname, numrows):
     # print('succeeded reading')
     ds = None
 
-    return 'success'
-
 
 def CheckSetGetValues(fname):
     # check the 'legacy' get and set value calls
@@ -267,8 +263,6 @@ def CheckSetGetValues(fname):
     # ds.FlushCache()
     ds = None
 
-    return 'success'
-
 
 def ExtendAndWrite(fname):
     # write more data to the end of the RAT - will extend it
@@ -294,8 +288,6 @@ def ExtendAndWrite(fname):
     # ds.FlushCache()
     ds = None
 
-    return 'success'
-
 
 def CheckExtension(fname):
     ds = gdal.Open(fname)
@@ -317,8 +309,6 @@ def CheckExtension(fname):
     # print('extension data ok')
     ds = None
 
-    return 'success'
-
 
 def WriteLongStrings(fname):
     # this will force the string column to be re-written to accommodate
@@ -334,8 +324,6 @@ def WriteLongStrings(fname):
     # ds.FlushCache()
     ds = None
 
-    return 'success'
-
 
 def CheckLongStrings(fname):
     ds = gdal.Open(fname)
@@ -349,8 +337,6 @@ def CheckLongStrings(fname):
     # print("checked long strings ok")
     ds = None
 
-    return 'success'
-
 
 def SetLinearBinning(fname):
     ds = gdal.Open(fname, gdal.GA_Update)
@@ -364,8 +350,6 @@ def SetLinearBinning(fname):
     # ds.FlushCache()
     ds = None
 
-    return 'success'
-
 
 def CheckLinearBinning(fname):
     ds = gdal.Open(fname)
@@ -385,8 +369,6 @@ def CheckLinearBinning(fname):
     # print('linear binning ok')
     ds = None
 
-    return 'success'
-
 
 def CheckClone(fname):
     ds = gdal.Open(fname)
@@ -407,8 +389,6 @@ def CheckClone(fname):
     # print("cloned ok")
     ds = None
 
-    return 'success'
-
 # basic tests
 
 
@@ -491,7 +471,6 @@ def test_hfa_rfc40_13():
 
 def test_hfa_rfc40_cleanup():
     gdal.GetDriverByName('HFA').Delete("tmp/test.img")
-    return 'success'
 
 
 gdaltest_list = [
diff --git a/autotest/gcore/hfa_write.py b/autotest/gcore/hfa_write.py
index 74148194fb8d..b4d1777031a9 100755
--- a/autotest/gcore/hfa_write.py
+++ b/autotest/gcore/hfa_write.py
@@ -67,8 +67,6 @@ def test_hfa_write_desc():
 
     gdal.GetDriverByName('HFA').Delete('tmp/test_desc.img')
 
-    return 'success'
-
 ###############################################################################
 # test writing 4 bit files.
 
@@ -89,8 +87,6 @@ def test_hfa_write_4bit():
 
     drv.Delete('tmp/4bit.img')
 
-    return 'success'
-
 ###############################################################################
 # test writing 4 bit files compressed.
 
@@ -112,8 +108,6 @@ def test_hfa_write_4bit_compressed():
 
     drv.Delete('tmp/4bitc.img')
 
-    return 'success'
-
 ###############################################################################
 # Test creating a file with a nodata value, and fetching otherwise unread
 # blocks and verifying they are the nodata value.  (#2427)
@@ -135,8 +129,6 @@ def test_hfa_write_nd_invalid():
 
     drv.Delete('tmp/ndinvalid.img')
 
-    return 'success'
-
 ###############################################################################
 # Test updating .rrd overviews in place (#2524).
 
@@ -152,8 +144,6 @@ def test_hfa_update_overviews():
     assert result == 0, 'BuildOverviews() failed.'
     ds = None
 
-    return 'success'
-
 ###############################################################################
 # Test cleaning external overviews.
 
@@ -180,8 +170,6 @@ def test_hfa_clean_external_overviews():
 
     gdal.GetDriverByName('HFA').Delete('tmp/small.img')
 
-    return 'success'
-
 ###############################################################################
 # Test writing high frequency data (#2525).
 
@@ -197,8 +185,6 @@ def test_hfa_bug_2525():
 
     drv.Delete('tmp/test_hfa.img')
 
-    return 'success'
-
 ###############################################################################
 # Test building external overviews with HFA_USE_RRD=YES
 
@@ -229,8 +215,6 @@ def test_hfa_use_rrd():
 
     gdal.GetDriverByName('HFA').Delete('tmp/small.img')
 
-    return 'success'
-
 
 ###############################################################################
 # Test fix for #4831
@@ -304,8 +288,6 @@ def test_hfa_update_existing_aux_overviews():
 
     gdal.SetConfigOption('USE_RRD', None)
 
-    return 'success'
-
 ###############################################################################
 # Test writing invalid WKT (#5258)
 
@@ -364,8 +346,6 @@ def test_hfa_write_invalid_wkt():
 
     gdal.GetDriverByName('HFA').Delete('/vsimem/hfa_write_invalid_wkt.img')
 
-    return 'success'
-
 ###############################################################################
 # Get the driver, and verify a few things about it.
 
diff --git a/autotest/gcore/histogram.py b/autotest/gcore/histogram.py
index e5945ae8779c..e4c114a32c24 100755
--- a/autotest/gcore/histogram.py
+++ b/autotest/gcore/histogram.py
@@ -51,8 +51,6 @@ def test_histogram_1():
 
     assert hist == exp_hist, 'did not get expected histogram.'
 
-    return 'success'
-
 ###############################################################################
 # Fetch histogram with specified sampling, using keywords.
 
@@ -66,8 +64,6 @@ def test_histogram_2():
 
     assert hist == exp_hist, 'did not get expected histogram.'
 
-    return 'success'
-
 ###############################################################################
 # try on a different data type with out of range values included.
 
@@ -83,8 +79,6 @@ def test_histogram_3():
 
     assert hist == exp_hist, 'did not get expected histogram.'
 
-    return 'success'
-
 ###############################################################################
 # try on a different data type without out of range values included.
 
@@ -104,8 +98,6 @@ def test_histogram_4():
 
     gdal.Unlink('data/int32_withneg.grd.aux.xml')
 
-    return 'success'
-
 ###############################################################################
 # Test GetDefaultHistogram() on the file.
 
@@ -123,8 +115,6 @@ def test_histogram_5():
 
     gdal.Unlink('data/utmsmall.tif.aux.xml')
 
-    return 'success'
-
 ###############################################################################
 # Test GetDefaultHistogram( force = 0 ) on a JPG file (#3304)
 
@@ -138,8 +128,6 @@ def test_histogram_6():
     ds = None
     os.unlink('tmp/albania.jpg')
 
-    return 'success'
-
 
 gdaltest_list = [
     test_histogram_1,
diff --git a/autotest/gcore/identify.py b/autotest/gcore/identify.py
index fffe54656764..b50363090ffb 100755
--- a/autotest/gcore/identify.py
+++ b/autotest/gcore/identify.py
@@ -46,8 +46,6 @@ def test_identify_1():
     assert dr is not None and dr.GetDescription() == 'GTiff', \
         'Got wrong driver for byte.tif'
 
-    return 'success'
-
 ###############################################################################
 # Test a file that won't be recognised.
 
@@ -59,8 +57,6 @@ def test_identify_2():
     dr = gdal.IdentifyDriver('data/byte.pnm.aux.xml', file_list)
     assert dr is None, 'Got a driver for byte.pnm.aux.xml!'
 
-    return 'success'
-
 ###############################################################################
 # Try identify on a directory.
 
@@ -70,8 +66,6 @@ def test_identify_3():
     dr = gdal.IdentifyDriver('data')
     assert dr is None, 'Got a driver for data directory!'
 
-    return 'success'
-
 ###############################################################################
 # Try IdentifyDriverEx
 
@@ -98,8 +92,6 @@ def test_identify_4():
     dr = gdal.IdentifyDriverEx('../gdrivers/data/aea.dat', sibling_files=['aea.dat', 'aea.hdr'])
     assert dr is not None, 'Did not get a driver!'
 
-    return 'success'
-
 
 gdaltest_list = [
     test_identify_1,
diff --git a/autotest/gcore/mask.py b/autotest/gcore/mask.py
index 7900c93c42a8..8113007ce780 100755
--- a/autotest/gcore/mask.py
+++ b/autotest/gcore/mask.py
@@ -57,8 +57,6 @@ def test_mask_1():
     my_min, my_max, mean, stddev = band.GetMaskBand().ComputeStatistics(0)
     assert (my_min, my_max, mean, stddev) == (255, 255, 255, 0), 'Got wrong mask stats'
 
-    return 'success'
-
 ###############################################################################
 # Verify the checksum and flags for "nodata" case.
 
@@ -76,8 +74,6 @@ def test_mask_2():
     cs = band.GetMaskBand().Checksum()
     assert cs == 4209, 'Got wrong mask checksum'
 
-    return 'success'
-
 ###############################################################################
 # Verify the checksum and flags for "alpha" case.
 
@@ -117,8 +113,6 @@ def test_mask_3():
     cs = band.GetMaskBand().Checksum()
     assert cs == 36074, 'Got wrong alpha mask checksum'
 
-    return 'success'
-
 ###############################################################################
 # Copy a *real* masked dataset, and confirm masks copied properly.
 
@@ -148,8 +142,6 @@ def test_mask_4():
     msk = None
     ds = None
 
-    return 'success'
-
 ###############################################################################
 # Create overviews for masked file, and verify the overviews have proper
 # masks built for them.
@@ -205,8 +197,6 @@ def test_mask_5():
 
     gdal.GetDriverByName('PNM').Delete('tmp/mask_4.pnm')
 
-    return 'success'
-
 ###############################################################################
 # Test a TIFF file with 1 band and an embedded mask of 1 bit
 
@@ -227,8 +217,6 @@ def test_mask_6():
 
     gdal.SetConfigOption('GDAL_TIFF_INTERNAL_MASK_TO_8BIT', 'TRUE')
 
-    return 'success'
-
 ###############################################################################
 # Test a TIFF file with 3 bands and an embedded mask of 1 band of 1 bit
 
@@ -250,8 +238,6 @@ def test_mask_7():
 
     gdal.SetConfigOption('GDAL_TIFF_INTERNAL_MASK_TO_8BIT', 'TRUE')
 
-    return 'success'
-
 ###############################################################################
 # Test a TIFF file with 1 band and an embedded mask of 8 bit.
 # Note : The TIFF6 specification, page 37, only allows 1 BitsPerSample && 1 SamplesPerPixel,
@@ -270,8 +256,6 @@ def test_mask_8():
     cs = band.GetMaskBand().Checksum()
     assert cs == 1222, 'Got wrong mask checksum'
 
-    return 'success'
-
 ###############################################################################
 # Test a TIFF file with 3 bands with an embedded mask of 1 bit with 3 bands.
 # Note : The TIFF6 specification, page 37, only allows 1 BitsPerSample && 1 SamplesPerPixel,
@@ -291,8 +275,7 @@ def test_mask_9():
         cs = band.GetMaskBand().Checksum()
         assert cs == 100, 'Got wrong mask checksum'
 
-    return 'success'
-
+    
 ###############################################################################
 # Test a TIFF file with 3 bands with an embedded mask of 8 bit with 3 bands.
 # Note : The TIFF6 specification, page 37, only allows 1 BitsPerSample && 1 SamplesPerPixel,
@@ -312,8 +295,7 @@ def test_mask_10():
         cs = band.GetMaskBand().Checksum()
         assert cs == 1222, 'Got wrong mask checksum'
 
-    return 'success'
-
+    
 ###############################################################################
 # Test a TIFF file with an overview, an embedded mask of 1 bit, and an embedded
 # mask for the overview
@@ -352,8 +334,6 @@ def test_mask_11():
 
     gdal.SetConfigOption('GDAL_TIFF_INTERNAL_MASK_TO_8BIT', 'TRUE')
 
-    return 'success'
-
 
 ###############################################################################
 # Test a TIFF file with 3 bands, an overview, an embedded mask of 1 bit, and an embedded
@@ -393,8 +373,6 @@ def test_mask_12():
 
     gdal.SetConfigOption('GDAL_TIFF_INTERNAL_MASK_TO_8BIT', 'TRUE')
 
-    return 'success'
-
 ###############################################################################
 # Test creation of external TIFF mask band
 
@@ -446,8 +424,7 @@ def test_mask_13():
     except OSError:
         pass
 
-    return 'success'
-
+    
 ###############################################################################
 # Test creation of internal TIFF mask band
 
@@ -530,8 +507,6 @@ def test_mask_14():
 
     drv.Delete('tmp/byte_with_mask.tif')
 
-    return 'success'
-
 ###############################################################################
 # Test creation of internal TIFF overview, mask band and mask band of overview
 
@@ -613,8 +588,6 @@ def mask_and_ovr(order, method):
 
     drv.Delete('tmp/byte_with_ovr_and_mask.tif')
 
-    return 'success'
-
 
 def test_mask_15():
     return mask_and_ovr(1, 'NEAREST')
@@ -669,8 +642,6 @@ def test_mask_19():
     msk = None
     ds = None
 
-    return 'success'
-
 ###############################################################################
 # Extensive test of nodata mask for all data types
 
@@ -700,8 +671,7 @@ def test_mask_20():
         ds = None
         drv.Delete('tmp/mask20.tif')
 
-    return 'success'
-
+    
 ###############################################################################
 # Extensive test of NODATA_VALUES mask for all data types
 
@@ -735,8 +705,7 @@ def test_mask_21():
         ds = None
         drv.Delete('tmp/mask21.tif')
 
-    return 'success'
-
+    
 ###############################################################################
 # Test creation of external TIFF mask band just after Create()
 
@@ -780,8 +749,7 @@ def test_mask_22():
     except OSError:
         pass
 
-    return 'success'
-
+    
 ###############################################################################
 # Test CreateCopy() of a dataset with a mask into a JPEG-compressed TIFF with
 # internal mask (#3800)
@@ -815,8 +783,6 @@ def test_mask_23():
     # 'ERROR 1: TIFFRewriteDirectory:Error fetching directory count' was triggered before
     assert error_msg == ''
 
-    return 'success'
-
 ###############################################################################
 # Test on a GDT_UInt16 RGBA (#5692)
 
@@ -851,8 +817,6 @@ def test_mask_24():
 
     gdal.Unlink('/vsimem/mask_24.tif')
 
-    return 'success'
-
 ###############################################################################
 # Test various error conditions
 
@@ -911,8 +875,7 @@ def test_mask_25():
         ds = gdal.GetDriverByName('MEM').Create('', 1, 1)
         ds.CreateMaskBand(0)
 
-    return 'success'
-
+    
 ###############################################################################
 # Test on a GDT_UInt16 1band data
 
@@ -936,8 +899,6 @@ def test_mask_26():
 
     gdal.Unlink('/vsimem/mask_26.tif')
 
-    return 'success'
-
 ###############################################################################
 # Cleanup.
 
@@ -969,8 +930,7 @@ def test_mask_27():
         ds = None
         drv.Delete('tmp/mask27.tif')
 
-    return 'success'
-
+    
 ###############################################################################
 # Extensive test of real NODATA_VALUES mask for all complex types
 
diff --git a/autotest/gcore/minixml.py b/autotest/gcore/minixml.py
index 06bc2916e80a..17c751b613c6 100755
--- a/autotest/gcore/minixml.py
+++ b/autotest/gcore/minixml.py
@@ -80,8 +80,6 @@ def test_minixml_1():
 
     assert node[2][1] == 'abc', 'Wrong element content.'
 
-    return 'success'
-
 ###############################################################################
 # Serialize an XML Tree
 
@@ -92,7 +90,6 @@ def test_minixml_2():
     doc_target = '<TestDoc style="123">\n  <sub1 />\n  <sub2>abc</sub2>\n</TestDoc>\n'
     doc_got = gdal.SerializeXMLTree(tree)
     assert doc_got == doc_target, 'serialize xml tree failed.'
-    return 'success'
 
 ###############################################################################
 # Read XML document with complex DOCTYPE element.
@@ -135,8 +132,6 @@ def test_minixml_3():
 
     assert len(subnode) == 3, 'Wrong number of children.'
 
-    return 'success'
-
 ###############################################################################
 # Parse and serialize an XML Tree with a <?xml> prolog
 
@@ -147,8 +142,6 @@ def test_minixml_4():
     got_xml = gdal.SerializeXMLTree(gdal.ParseXMLString(xml))
     assert xml == got_xml, 'serialize xml tree failed.'
 
-    return 'success'
-
 ###############################################################################
 # Parse malformed XML.  Complains, but still makes a tree.
 
@@ -171,8 +164,7 @@ def test_minixml_5():
 
         assert tree is not None, ('Tree is None: "%s"' % tree)
 
-    return 'success'
-
+    
 ###############################################################################
 # Parse malformed XML.
 
@@ -205,8 +197,7 @@ def test_minixml_6():
 
         assert tree is None, ('Tree is not None: "%s"' % tree)
 
-    return 'success'
-
+    
 ###############################################################################
 # Parse malformed XML.  Pass without warning, but should not pass.
 
@@ -229,8 +220,7 @@ def test_minixml_7():
 
         assert tree is not None, ('Tree is None: "%s"' % tree)
 
-    return 'success'
-
+    
 ###############################################################################
 # Parse XML with too many nesting
 
@@ -246,15 +236,12 @@ def test_minixml_8():
     assert tree is None, 'expected None tree'
     assert gdal.GetLastErrorMsg() != '', 'expected error message'
 
-    return 'success'
-
 
 ###############################################################################
 # Cleanup
 
 def test_minixml_cleanup():
-    return 'success'
-
+    pass
 
 gdaltest_list = [
     test_minixml_1,
diff --git a/autotest/gcore/misc.py b/autotest/gcore/misc.py
index 365d84d0bb95..97e277f50b2e 100755
--- a/autotest/gcore/misc.py
+++ b/autotest/gcore/misc.py
@@ -51,8 +51,7 @@ def test_misc_1():
         name = 'mem_%d' % i
         tab_ds[i] = drv.Create(name, 1, 1, 1)
         assert tab_ds[i] is not None
-    return 'success'
-
+    
 ###############################################################################
 # Test that OpenShared() works as expected by opening a big number of times
 # the same dataset with it. If it did not work, that would exhaust the system
@@ -66,8 +65,7 @@ def test_misc_2():
         tab_ds[i] = gdal.OpenShared('data/byte.tif')
         assert tab_ds[i] is not None
 
-    return 'success'
-
+    
 ###############################################################################
 # Test OpenShared() with a dataset whose filename != description (#2797)
 
@@ -90,8 +88,6 @@ def test_misc_3():
     ds = None
     ds2 = None
 
-    return 'success'
-
 ###############################################################################
 # Test Create() with invalid arguments
 
@@ -109,8 +105,6 @@ def test_misc_4():
 
     gdal.PopErrorHandler()
 
-    return 'success'
-
 
 ###############################################################################
 def get_filename(drv, dirname):
@@ -378,8 +372,6 @@ def misc_6_internal(datatype, nBands, setDriversDone):
                             pytest.fail(reason)
     ds = None
 
-    return 'success'
-
 
 def test_misc_6():
 
@@ -430,8 +422,6 @@ def test_misc_6():
 
     gdal.PopErrorHandler()
 
-    return 'success'
-
 ###############################################################################
 # Test gdal.InvGeoTransform()
 
@@ -449,8 +439,7 @@ def test_misc_7():
     for i in range(6):
         assert abs(res[i] - expected_inv_gt[i]) <= 1e-6
 
-    return 'success'
-
+    
 ###############################################################################
 # Test gdal.ApplyGeoTransform()
 
@@ -466,8 +455,6 @@ def test_misc_8():
     res = gdal.ApplyGeoTransform(gt, 10, 1)
     assert res == [11.0, 19.0]
 
-    return 'success'
-
 ###############################################################################
 # Test setting and retrieving > 2 GB values for GDAL max cache (#3689)
 
@@ -481,8 +468,6 @@ def test_misc_9():
 
     assert ret_val == 3000000000, 'did not get expected value'
 
-    return 'success'
-
 
 ###############################################################################
 # Test VSIBufferedReaderHandle (fix done in r21358)
@@ -510,8 +495,7 @@ def test_misc_10():
     except OSError:
         pass
 
-    return 'success'
-
+    
 
 ###############################################################################
 # Test that we can open a symlink whose pointed filename isn't a real
@@ -536,8 +520,6 @@ def test_misc_11():
 
     assert desc == 'GTIFF_DIR:1:data/byte.tif', 'did not get expected description'
 
-    return 'success'
-
 ###############################################################################
 # Test CreateCopy() with a target filename in a non-existing dir
 
@@ -603,8 +585,7 @@ def test_misc_12():
 
             gdal.Unlink('/vsimem/misc_12_src.tif')
 
-    return 'success'
-
+    
 ###############################################################################
 # Test CreateCopy() with incompatible driver types (#5912)
 
@@ -625,8 +606,6 @@ def test_misc_13():
     gdal.PopErrorHandler()
     assert out_ds is None
 
-    return 'success'
-
 ###############################################################################
 # Test ConfigureLogging()
 
@@ -691,8 +670,7 @@ def emit(self, record):
         gdal.SetConfigOption('CPL_DEBUG', prev_debug)
         logger.removeHandler(handler)
 
-    return 'success'
-
+    
 
 ###############################################################################
 # Test SetErrorHandler
@@ -753,8 +731,7 @@ def handle1(ecls, ecode, emsg):
         gdal.SetErrorHandler('CPLDefaultErrorHandler')
         gdal.SetConfigOption('CPL_DEBUG', prev_debug)
 
-    return 'success'
-
+    
 ###############################################################################
 
 
@@ -765,8 +742,7 @@ def test_misc_cleanup():
     except OSError:
         pass
 
-    return 'success'
-
+    
 
 gdaltest_list = [test_misc_1,
                  test_misc_2,
diff --git a/autotest/gcore/nodatamaskband.py b/autotest/gcore/nodatamaskband.py
index a90549b16de3..0d38ecdab017 100755
--- a/autotest/gcore/nodatamaskband.py
+++ b/autotest/gcore/nodatamaskband.py
@@ -91,8 +91,7 @@ def test_nodatamaskband_1():
                        0, 255, 255)
         assert data_ar == expected_ar, dt
 
-    return 'success'
-
+    
 
 gdaltest_list = [
     test_nodatamaskband_1,
diff --git a/autotest/gcore/numpy_rw.py b/autotest/gcore/numpy_rw.py
index 39f0b84a4b1a..9808ed47e55e 100755
--- a/autotest/gcore/numpy_rw.py
+++ b/autotest/gcore/numpy_rw.py
@@ -54,8 +54,6 @@ def test_numpy_rw_1():
     gdaltest.numpy_drv = gdal.GetDriverByName('NUMPY')
     assert gdaltest.numpy_drv is not None, 'NUMPY driver not found!'
 
-    return 'success'
-
 ###############################################################################
 # Load a test file into a memory Numpy array, and verify the checksum.
 
@@ -77,8 +75,6 @@ def test_numpy_rw_2():
     assert bnd.Checksum() == 50054, 'Didnt get expected checksum on reopened file'
     ds = None
 
-    return 'success'
-
 ###############################################################################
 # Test loading complex data.
 
@@ -93,8 +89,6 @@ def test_numpy_rw_3():
 
     assert array[2][3] == 116 - 16j, 'complex value read improperly.'
 
-    return 'success'
-
 ###############################################################################
 # Test a band read with downsampling.
 
@@ -110,8 +104,6 @@ def test_numpy_rw_4():
     assert array[2][3] == 123, \
         'Read wrong value - perhaps downsampling algorithm has changed subtly?'
 
-    return 'success'
-
 ###############################################################################
 # Test reading a multi-band file.
 
@@ -144,8 +136,6 @@ def test_numpy_rw_5():
     assert array[0][0][0] == 70 and array[1][0][0] == 97 and array[2][0][0] == 29, \
         'value read improperly.'
 
-    return 'success'
-
 ###############################################################################
 # Check that Band.ReadAsArray() can accept an already allocated array (#2658, #3028)
 
@@ -167,8 +157,6 @@ def test_numpy_rw_6():
     ds2 = gdalnumeric.OpenArray(array)
     assert ds2.GetRasterBand(1).Checksum() == ds.GetRasterBand(1).Checksum()
 
-    return 'success'
-
 ###############################################################################
 # Check that Dataset.ReadAsArray() can accept an already allocated array (#2658, #3028)
 
@@ -209,8 +197,6 @@ def test_numpy_rw_7():
     ds2 = gdalnumeric.OpenArray(array)
     assert ds2.GetRasterBand(1).Checksum() == ds.GetRasterBand(1).Checksum()
 
-    return 'success'
-
 ###############################################################################
 # Check that Dataset.ReadAsArray() with multi-band data
 
@@ -231,8 +217,7 @@ def test_numpy_rw_8():
     for i in range(1, ds.RasterCount):
         assert ds2.GetRasterBand(i).Checksum() == ds.GetRasterBand(i).Checksum()
 
-    return 'success'
-
+    
 ###############################################################################
 # Test Band.WriteArray()
 
@@ -253,8 +238,6 @@ def test_numpy_rw_9():
 
     assert cs == 4672, 'did not get expected checksum'
 
-    return 'success'
-
 ###############################################################################
 # Test signed byte handling
 
@@ -285,8 +268,6 @@ def test_numpy_rw_10():
 
     assert ar3[0][0] == -128 and ar3[0][1] == 127, 'did not get expected result (2)'
 
-    return 'success'
-
 ###############################################################################
 # Test all datatypes
 
@@ -348,8 +329,7 @@ def test_numpy_rw_11():
            (type_tuple[0] != 'float32' and ar3[0][0] != type_tuple[3])), \
             'did not get expected result (2)'
 
-    return 'success'
-
+    
 ###############################################################################
 # Test array with slices (#3542)
 
@@ -379,8 +359,6 @@ def test_numpy_rw_12():
 
     assert slice_read[0][0] == 1 and slice_read[1][0] == 3
 
-    return 'success'
-
 ###############################################################################
 # Test expected errors
 
@@ -552,8 +530,6 @@ def test_numpy_rw_13():
 
     ds = None
 
-    return 'success'
-
 ###############################################################################
 # Test callback of ReadAsArray()
 
@@ -644,8 +620,6 @@ def test_numpy_rw_14():
                           callback_data=last_pct)
     assert not (data is None or abs(last_pct[0] - 1.0) > 1e-5)
 
-    return 'success'
-
 ###############################################################################
 # Test NumPy GetGeoTransform/SetGeoTransform
 
@@ -666,8 +640,6 @@ def test_numpy_rw_15():
     gt = ds.GetGeoTransform()
     assert gt == (1, 2, 3, 4, 5, -6)
 
-    return 'success'
-
 ###############################################################################
 # Test errors of OpenArray()
 
@@ -698,8 +670,6 @@ def test_numpy_rw_16():
         ds = gdal_array.OpenArray(array)
     assert ds is None
 
-    return 'success'
-
 ###############################################################################
 # Test old deprecated way with gdal_array.GetArrayFilename()
 
@@ -728,8 +698,6 @@ def test_numpy_rw_17():
         ds = gdal.Open('NUMPY:::invalid')
     assert ds is None
 
-    return 'success'
-
 ###############################################################################
 # Test the pixel interleave options
 
@@ -757,14 +725,10 @@ def test_numpy_rw_18():
     res = ds.ReadAsArray(interleave='pixel')
     assert numpy.all(img == res)
 
-    return 'success'
-
 
 def test_numpy_rw_cleanup():
     gdaltest.numpy_drv = None
 
-    return 'success'
-
 
 gdaltest_list = [
     test_numpy_rw_1,
diff --git a/autotest/gcore/overviewds.py b/autotest/gcore/overviewds.py
index 35ba70a843b6..57dbf15ff4c7 100755
--- a/autotest/gcore/overviewds.py
+++ b/autotest/gcore/overviewds.py
@@ -48,8 +48,6 @@ def test_overviewds_1():
     ds = gdal.OpenEx('data/byte.tif', open_options=['OVERVIEW_LEVEL=0'])
     assert ds is None
 
-    return 'success'
-
 ###############################################################################
 # Nominal cases
 
@@ -92,8 +90,6 @@ def test_overviewds_2():
     assert ds.GetMetadataItem('RPC', 'FOO') is None
     ds = None
 
-    return 'success'
-
 ###############################################################################
 # Test GCP
 
@@ -141,8 +137,6 @@ def test_overviewds_3():
         assert abs(ref_pnt[i] - pnt[i]) <= 1e-5
     ds = None
 
-    return 'success'
-
 ###############################################################################
 # Test RPC
 
@@ -193,8 +187,7 @@ def test_overviewds_4():
     except OSError:
         pass
 
-    return 'success'
-
+    
 ###############################################################################
 # Test GEOLOCATION
 
@@ -236,8 +229,6 @@ def test_overviewds_5():
         assert abs(pnt[i] - expected_xyz[i]) <= 0.5
     ds = None
 
-    return 'success'
-
 ###############################################################################
 # Test VRT
 
@@ -261,8 +252,6 @@ def test_overviewds_6():
     assert got_cs == expected_cs
     ds = None
 
-    return 'success'
-
 ###############################################################################
 # Cleanup
 
@@ -285,8 +274,7 @@ def test_overviewds_cleanup():
     except OSError:
         pass
 
-    return 'success'
-
+    
 
 gdaltest_list = [test_overviewds_1,
                  test_overviewds_2,
diff --git a/autotest/gcore/pam.py b/autotest/gcore/pam.py
index f37dc1f6d045..9918face763f 100755
--- a/autotest/gcore/pam.py
+++ b/autotest/gcore/pam.py
@@ -67,8 +67,6 @@ def test_pam_1():
 
     assert xml_md[0] == expected_xml, 'xml does not match'
 
-    return 'success'
-
 ###############################################################################
 # Verify that we can write XML to a new file.
 
@@ -91,8 +89,6 @@ def test_pam_2():
 
     ds = None
 
-    return 'success'
-
 ###############################################################################
 # Check that we can read PAM metadata for existing PNM file.
 
@@ -129,8 +125,6 @@ def test_pam_3():
     assert ds.GetRasterBand(1).GetNoDataValue() is None, \
         'got nodata value whereas none was expected'
 
-    return 'success'
-
 ###############################################################################
 # Check that PAM binary encoded nodata values work properly.
 #
@@ -150,8 +144,6 @@ def test_pam_4():
     assert stats[0] == 0 and stats[1] == 4, \
         'Got wrong min/max, likely nodata not working?'
 
-    return 'success'
-
 ###############################################################################
 # Verify that .aux files that don't match the configuration of the
 # dependent file are not utilized. (#2471)
@@ -166,8 +158,6 @@ def test_pam_5():
 
     assert len(filelist) == 1, 'did not get expected file list.'
 
-    return 'success'
-
 ###############################################################################
 # Verify we can read nodata values from .aux files (#2505)
 #
@@ -183,8 +173,6 @@ def test_pam_6():
     assert not os.path.exists('data/f2r23.tif.aux.xml'), \
         'did not expect .aux.xml to be created.'
 
-    return 'success'
-
 ###############################################################################
 # Verify we can create overviews on PNG with PAM disabled (#3693)
 #
@@ -208,8 +196,6 @@ def test_pam_7():
 
     assert ovr_count == 1
 
-    return 'success'
-
 ###############################################################################
 # Test that Band.SetDescription() goes through PAM (#3780)
 #
@@ -231,8 +217,6 @@ def test_pam_8():
 
     assert desc == 'foo'
 
-    return 'success'
-
 ###############################################################################
 # Test that we can retrieve projection from xml:ESRI domain
 #
@@ -267,8 +251,6 @@ def test_pam_9():
 
     assert wkt == expected_wkt
 
-    return 'success'
-
 ###############################################################################
 # Test serializing and deserializing of various band metadata
 
@@ -321,8 +303,6 @@ def test_pam_10():
     gdal.Unlink('/vsimem/pam_10.asc')
     gdal.Unlink('/vsimem/pam_10.asc.aux.xml')
 
-    return 'success'
-
 ###############################################################################
 # Test PamProxyDb mechanism
 
@@ -377,8 +357,6 @@ def test_pam_11():
     ret = test_py_scripts.run_py_script_as_external_script('.', 'pamproxydb', '-test2')
     assert ret.find('success') != -1, ('pamproxydb.py -test2 failed %s' % ret)
 
-    return 'success'
-
 ###############################################################################
 # Test histogram with 64bit counts
 
@@ -415,8 +393,6 @@ def test_pam_12():
     assert hist1[0] == 6000000000
     assert aux_xml.find('<HistCounts>6000000000|') >= 0
 
-    return 'success'
-
 ###############################################################################
 # Test various stuff with PAM disabled
 #
@@ -448,8 +424,6 @@ def test_pam_13():
 
     gdal.SetConfigOption('GDAL_PAM_ENABLED', 'YES')
 
-    return 'success'
-
 
 ###############################################################################
 # Cleanup.
@@ -471,8 +445,7 @@ def test_pam_cleanup():
     except OSError:
         pass
 
-    return 'success'
-
+    
 
 gdaltest_list = [
     test_pam_1,
diff --git a/autotest/gcore/pixfun.py b/autotest/gcore/pixfun.py
index 0a651be22ca0..89e5b1cfa0c5 100755
--- a/autotest/gcore/pixfun.py
+++ b/autotest/gcore/pixfun.py
@@ -63,8 +63,6 @@ def test_pixfun_real_c():
 
     assert numpy.alltrue(data == refdata.real)
 
-    return 'success'
-
 
 ###############################################################################
 # Verify real part extraction from a complex dataset.
@@ -86,8 +84,6 @@ def test_pixfun_real_r():
 
     assert numpy.alltrue(data == refdata.real)
 
-    return 'success'
-
 
 ###############################################################################
 # Verify imaginary part extraction from a complex dataset.
@@ -116,8 +112,6 @@ def test_pixfun_imag_c():
 
     assert numpy.alltrue(data == data_ds)
 
-    return 'success'
-
 
 ###############################################################################
 # Verify imaginary part extraction from a real dataset.
@@ -134,8 +128,6 @@ def test_pixfun_imag_r():
 
     assert numpy.alltrue(data == 0)
 
-    return 'success'
-
 
 ###############################################################################
 # Verify imaginary part extraction from a real dataset.
@@ -157,8 +149,6 @@ def test_pixfun_complex():
 
     assert numpy.allclose(data, refdata + 1j * refdata)
 
-    return 'success'
-
 
 ###############################################################################
 # Verify modulus extraction from a complex (float) dataset.
@@ -180,8 +170,6 @@ def test_pixfun_mod_c():
 
     assert numpy.alltrue(data == numpy.abs(refdata))
 
-    return 'success'
-
 
 ###############################################################################
 # Verify modulus extraction from a real (integer type) dataset.
@@ -203,8 +191,6 @@ def test_pixfun_mod_r():
 
     assert numpy.alltrue(data == numpy.abs(refdata))
 
-    return 'success'
-
 
 ###############################################################################
 # Verify phase extraction from a complex dataset.
@@ -227,8 +213,6 @@ def test_pixfun_phase_c():
 
     assert numpy.allclose(data, numpy.arctan2(refdata.imag, refdata.real))
 
-    return 'success'
-
 
 ###############################################################################
 # Verify phase extraction from a real dataset.
@@ -250,8 +234,6 @@ def test_pixfun_phase_r():
 
     assert numpy.alltrue(data == numpy.arctan2(0, refdata))
 
-    return 'success'
-
 
 ###############################################################################
 # Verify cmplex conjugare computation on a complex dataset.
@@ -273,8 +255,6 @@ def test_pixfun_conj_c():
 
     assert numpy.alltrue(data == numpy.conj(refdata))
 
-    return 'success'
-
 
 ###############################################################################
 # Verify cmplex conjugare computation on a real dataset.
@@ -296,8 +276,6 @@ def test_pixfun_conj_r():
 
     assert numpy.alltrue(data == numpy.conj(refdata))
 
-    return 'success'
-
 
 ###############################################################################
 # Verify the sum of 3 (real) datasets.
@@ -322,8 +300,7 @@ def test_pixfun_sum_r():
 
         assert numpy.alltrue(data == refdata)
 
-    return 'success'
-
+    
 
 ###############################################################################
 # Verify the sum of 3 (two complex and one real) datasets.
@@ -348,8 +325,7 @@ def test_pixfun_sum_c():
 
         assert numpy.alltrue(data == refdata)
 
-    return 'success'
-
+    
 
 ###############################################################################
 # Verify the difference of 2 (real) datasets.
@@ -376,8 +352,6 @@ def test_pixfun_diff_r():
 
     assert numpy.alltrue(data == refdata1 - refdata2)
 
-    return 'success'
-
 
 ###############################################################################
 # Verify the difference of 2 (complex) datasets.
@@ -404,8 +378,6 @@ def test_pixfun_diff_c():
 
     assert numpy.alltrue(data == refdata1 - refdata2)
 
-    return 'success'
-
 
 ###############################################################################
 # Verify the product of 3 (real) datasets.
@@ -430,8 +402,7 @@ def test_pixfun_mul_r():
 
         assert numpy.alltrue(data == refdata)
 
-    return 'success'
-
+    
 
 ###############################################################################
 # Verify the product of 2 (complex) datasets.
@@ -453,8 +424,6 @@ def test_pixfun_mul_c():
 
     assert numpy.alltrue(data == refdata * refdata)
 
-    return 'success'
-
 
 ###############################################################################
 # Verify the product with complex conjugate of a complex datasets.
@@ -476,8 +445,6 @@ def test_pixfun_cmul_c():
 
     assert numpy.alltrue(data == refdata * refdata.conj())
 
-    return 'success'
-
 
 ###############################################################################
 # Verify the product with complex conjugate of two real datasets.
@@ -506,8 +473,6 @@ def test_pixfun_cmul_r():
 
     assert numpy.alltrue(data == refdata1 * refdata2.conj())
 
-    return 'success'
-
 
 ###############################################################################
 # Verify computation of the inverse of a real datasets.
@@ -530,8 +495,6 @@ def test_pixfun_inv_r():
 
     assert numpy.alltrue(data == 1. / refdata)
 
-    return 'success'
-
 
 ###############################################################################
 # Verify computation of the inverse of a complex datasets.
@@ -556,8 +519,6 @@ def test_pixfun_inv_c():
     assert numpy.alltrue(abs(delta.real) < 1e-13)
     assert numpy.alltrue(abs(delta.imag) < 1e-13)
 
-    return 'success'
-
 
 ###############################################################################
 # Verify intensity computation of a complex dataset.
@@ -579,8 +540,6 @@ def test_pixfun_intensity_c():
 
     assert numpy.alltrue(data == (refdata * refdata.conj()).real)
 
-    return 'success'
-
 
 ###############################################################################
 # Verify intensity computation of real dataset.
@@ -602,8 +561,6 @@ def test_pixfun_intensity_r():
 
     assert numpy.alltrue(data == (refdata * refdata.conj()).real)
 
-    return 'success'
-
 
 ###############################################################################
 # Verify square root computation.
@@ -625,8 +582,6 @@ def test_pixfun_sqrt():
 
     assert numpy.alltrue(data == numpy.sqrt(refdata))
 
-    return 'success'
-
 
 ###############################################################################
 # Verify logarithm computation of real dataset.
@@ -648,8 +603,6 @@ def test_pixfun_log10_r():
 
     assert numpy.alltrue(data == numpy.log10(refdata))
 
-    return 'success'
-
 
 ###############################################################################
 # Verify logarithm computation of imag dataset.
@@ -670,8 +623,6 @@ def test_pixfun_log10_c():
     refdata = refds.GetRasterBand(1).ReadAsArray()
     assert numpy.allclose(data, numpy.log10(numpy.abs(refdata)))
 
-    return 'success'
-
 
 ###############################################################################
 # Verify dB computation of real dataset.
@@ -693,8 +644,6 @@ def test_pixfun_dB_r():
 
     assert numpy.allclose(data, 20. * numpy.log10(refdata))
 
-    return 'success'
-
 
 ###############################################################################
 # Verify dB computation of imag dataset.
@@ -715,8 +664,6 @@ def test_pixfun_dB_c():
     refdata = refds.GetRasterBand(1).ReadAsArray()
     assert numpy.allclose(data, 20. * numpy.log10(numpy.abs(refdata)))
 
-    return 'success'
-
 
 ###############################################################################
 # Verify conversion from dB to amplitude.
@@ -739,8 +686,6 @@ def test_pixfun_dB2amp():
     # if not numpy.alltrue(data == 10.**(refdata/20.)):
     assert numpy.allclose(data, 10.**(refdata / 20.))
 
-    return 'success'
-
 
 ###############################################################################
 # Verify conversion from dB to power.
@@ -763,8 +708,6 @@ def test_pixfun_dB2pow():
 
     assert numpy.allclose(data, 10.**(refdata / 10.))
 
-    return 'success'
-
 
 ###############################################################################
 
diff --git a/autotest/gcore/rasterio.py b/autotest/gcore/rasterio.py
index 11d985921c52..555c34179b84 100755
--- a/autotest/gcore/rasterio.py
+++ b/autotest/gcore/rasterio.py
@@ -61,8 +61,6 @@ def test_rasterio_1():
     ds = None
     drv.Delete('tmp/rasterio1.tif')
 
-    return 'success'
-
 ###############################################################################
 # Test writing a 5x4 buffer to a 10x6 raster and read it back
 
@@ -87,8 +85,6 @@ def test_rasterio_2():
     ds = None
     drv.Delete('tmp/rasterio2.tif')
 
-    return 'success'
-
 ###############################################################################
 # Test extensive read & writes into a non tiled raster
 
@@ -130,8 +126,6 @@ def test_rasterio_3():
     ds = None
     drv.Delete('tmp/rasterio3.tif')
 
-    return 'success'
-
 ###############################################################################
 # Test extensive read & writes into a tiled raster
 
@@ -179,8 +173,6 @@ def test_rasterio_4():
     ds = None
     drv.Delete('tmp/rasterio4.tif')
 
-    return 'success'
-
 ###############################################################################
 # Test error cases of ReadRaster()
 
@@ -247,8 +239,6 @@ def test_rasterio_5():
 
     ds = None
 
-    return 'success'
-
 ###############################################################################
 # Test error cases of WriteRaster()
 
@@ -290,8 +280,6 @@ def test_rasterio_6():
 
     ds = None
 
-    return 'success'
-
 ###############################################################################
 # Test that default window reading works via ReadRaster()
 
@@ -306,8 +294,6 @@ def test_rasterio_7():
     data = ds.ReadRaster()
     assert len(data) == 400, 'did not read expected dataset data via ReadRaster()'
 
-    return 'success'
-
 ###############################################################################
 # Test callback of ReadRaster()
 
@@ -433,8 +419,6 @@ def test_rasterio_8():
                          callback_data=tab)
     assert data is None and tab[0] >= 0.50
 
-    return 'success'
-
 ###############################################################################
 # Test resampling algorithm of ReadRaster()
 
@@ -638,8 +622,6 @@ def test_rasterio_9():
     assert cs == 30836
     assert abs(tab[0] - 1.0) <= 1e-5
 
-    return 'success'
-
 ###############################################################################
 # Test error when getting a block
 
@@ -665,8 +647,6 @@ def test_rasterio_10():
     gdal.PopErrorHandler()
     assert data is None
 
-    return 'success'
-
 ###############################################################################
 # Test cubic resampling and nbits
 
@@ -694,8 +674,6 @@ def test_rasterio_11():
     # Would overshoot to 129 if NBITS was ignored
     assert ar.max() == 127
 
-    return 'success'
-
 ###############################################################################
 # Test cubic resampling on dataset RasterIO with an alpha channel
 
@@ -745,8 +723,6 @@ def test_rasterio_12():
     # Alpha band should be different
     assert not numpy.array_equal(ar_ds[0], ar_ds[3])
 
-    return 'success'
-
 ###############################################################################
 # Test cubic resampling with masking
 
@@ -771,8 +747,7 @@ def test_rasterio_13():
         expected_ar = numpy.array([[0, 0, 0, 0, 0, 0, 0, 0], [0, 255, 255, 255, 255, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0]])
         assert numpy.array_equal(ar_ds, expected_ar), dt
 
-    return 'success'
-
+    
 ###############################################################################
 # Test average downsampling by a factor of 2 on exact boundaries
 
@@ -819,8 +794,6 @@ def test_rasterio_14():
     data = struct.unpack('B' * 1, data)
     assert data[0] == 50
 
-    return 'success'
-
 ###############################################################################
 # Test average oversampling by an integer factor (should behave like nearest)
 
@@ -847,8 +820,6 @@ def test_rasterio_15():
     gdal.Unlink('/vsimem/rasterio_15.asc')
     gdal.Unlink('/vsimem/rasterio_15_out.asc')
 
-    return 'success'
-
 ###############################################################################
 # Test mode downsampling by a factor of 2 on exact boundaries
 
@@ -875,8 +846,6 @@ def test_rasterio_16():
     gdal.Unlink('/vsimem/rasterio_16.asc')
     gdal.Unlink('/vsimem/rasterio_16_out.asc')
 
-    return 'success'
-
 ###############################################################################
 
 
@@ -899,8 +868,6 @@ def test_rasterio_lanczos_nodata():
                    0, 0, 0, 0, 22504, 22496, 22564, 22563, 22610)
     assert data_ar == expected_ar
 
-    return 'success'
-
 ###############################################################################
 
 
@@ -967,8 +934,6 @@ def test_rasterio_resampled_value_is_nodata():
 
     gdal.Unlink('/vsimem/in.asc')
 
-    return 'success'
-
 gdaltest_list = [
     test_rasterio_1,
     test_rasterio_2,
diff --git a/autotest/gcore/rat.py b/autotest/gcore/rat.py
index 2be0be8c5df5..8ea5c22b4ed6 100755
--- a/autotest/gcore/rat.py
+++ b/autotest/gcore/rat.py
@@ -79,8 +79,6 @@ def test_rat_1():
 
     gdaltest.saved_rat = rat
 
-    return 'success'
-
 ###############################################################################
 # Save a RAT in a file, written to .aux.xml, read it back and check it.
 
@@ -127,8 +125,6 @@ def test_rat_2():
 
     gdaltest.saved_rat = None
 
-    return 'success'
-
 ###############################################################################
 # Save an empty RAT (#5451)
 
@@ -140,8 +136,6 @@ def test_rat_3():
     ds = None
 
     gdal.GetDriverByName('GTiff').Delete('/vsimem/rat_3.tif')
-
-    return 'success'
 ##############################################################################
 
 
diff --git a/autotest/gcore/rfc30.py b/autotest/gcore/rfc30.py
index 2c4bcc951542..9dc83ecb56b0 100755
--- a/autotest/gcore/rfc30.py
+++ b/autotest/gcore/rfc30.py
@@ -67,8 +67,6 @@ def test_rfc30_1():
 
     assert ds is not None, 'failed to open utf filename (2).'
 
-    return 'success'
-
 ###############################################################################
 # Try creating, then renaming a utf-8 named file.
 
@@ -117,8 +115,6 @@ def test_rfc30_2():
     fd = gdal.VSIFOpenL(new_filename, 'r')
     assert fd is None, 'did unlink fail on utf8 filename?'
 
-    return 'success'
-
 
 gdaltest_list = [test_rfc30_1, test_rfc30_2]
 
diff --git a/autotest/gcore/testnonboundtoswig.py b/autotest/gcore/testnonboundtoswig.py
index b0bfaf7f46fa..649a15fe74ba 100755
--- a/autotest/gcore/testnonboundtoswig.py
+++ b/autotest/gcore/testnonboundtoswig.py
@@ -64,7 +64,7 @@ def test_testnonboundtoswig_init():
     if gdal_handle_init:
         if gdal_handle is None:
             pytest.skip()
-        return 'success'
+        return
 
     gdal_handle_init = True
 
@@ -101,7 +101,7 @@ def test_testnonboundtoswig_init():
             gdal_handle_stdcall = None
             pytest.skip('dynamic version(%s) does not match static version (%s)' % (dynamic_version, static_version))
 
-        return 'success'
+        return
     except:
         pytest.skip('cannot find gdal shared object')
 
@@ -122,8 +122,6 @@ def GDALDestroyDriverManager():
 
     gdal_handle_stdcall.GDALDestroyDriverManager()
 
-    return 'success'
-
 ###############################################################################
 # Call OGRCleanupAll()
 
@@ -141,8 +139,6 @@ def OGRCleanupAll():
 
     gdal_handle_stdcall.OGRCleanupAll()
 
-    return 'success'
-
 ###############################################################################
 # Call OSRCleanup()
 
@@ -160,8 +156,6 @@ def OSRCleanup():
 
     gdal_handle.OSRCleanup()
 
-    return 'success'
-
 ###############################################################################
 # Test GDALSimpleImageWarp
 
@@ -229,8 +223,6 @@ def test_testnonboundtoswig_GDALSimpleImageWarp():
 
     assert cs == 4672
 
-    return 'success'
-
 ###############################################################################
 # Test VRT derived bands with callback functions implemented in Python!
 
@@ -350,8 +342,6 @@ def test_testnonboundtoswig_VRTDerivedBands():
 
     assert ref_data == got_data, 'wrong data'
 
-    return 'success'
-
 
 gdaltest_list = [test_testnonboundtoswig_init,
                  test_testnonboundtoswig_GDALSimpleImageWarp,
diff --git a/autotest/gcore/tiff_ovr.py b/autotest/gcore/tiff_ovr.py
index 3ac1f6f04c5e..31d20b3d31ea 100755
--- a/autotest/gcore/tiff_ovr.py
+++ b/autotest/gcore/tiff_ovr.py
@@ -81,8 +81,7 @@ def tiff_ovr_check(src_ds):
         if ovr_band.Checksum() != 328:
             msg = 'overview wrong checksum: band %d, overview 1, checksum = %d,' % (i, ovr_band.Checksum())
             pytest.fail(msg)
-    return 'success'
-
+    
 ###############################################################################
 # Create a 3 band floating point GeoTIFF file so we can build overviews on it
 # later.  Build overviews on it.
@@ -222,8 +221,6 @@ def test_tiff_ovr_4(both_endian):
 
     wrk_ds = None
 
-    return 'success'
-
 
 ###############################################################################
 # Test average overview generation with nodata.
@@ -243,8 +240,6 @@ def test_tiff_ovr_5(both_endian):
 
     assert cs == exp_cs, 'got wrong overview checksum.'
 
-    return 'success'
-
 ###############################################################################
 # Same as tiff_ovr_5 but with USE_RDD=YES to force external overview
 
@@ -274,8 +269,6 @@ def test_tiff_ovr_6(both_endian):
 
     assert cs == exp_cs, 'got wrong overview checksum.'
 
-    return 'success'
-
 
 ###############################################################################
 # Check nearest resampling on a dataset with a raster band that has a color table
@@ -299,8 +292,6 @@ def test_tiff_ovr_7(both_endian):
 
     assert cs == exp_cs, 'got wrong overview checksum.'
 
-    return 'success'
-
 ###############################################################################
 # Check average resampling on a dataset with a raster band that has a color table
 
@@ -325,8 +316,6 @@ def test_tiff_ovr_8(both_endian):
 
     assert cs == exp_cs, 'got wrong overview checksum.'
 
-    return 'success'
-
 ###############################################################################
 # Test --config COMPRESS_OVERVIEW JPEG --config PHOTOMETRIC_OVERVIEW YCBCR -ro
 # Will also check that pixel interleaving is automatically selected (#3064)
@@ -370,8 +359,6 @@ def test_tiff_ovr_9(both_endian):
 
     assert cs == exp_cs or cs == 5635, 'got wrong overview checksum.'
 
-    return 'success'
-
 ###############################################################################
 # Similar to tiff_ovr_9 but with internal overviews.
 
@@ -401,8 +388,6 @@ def test_tiff_ovr_10(both_endian):
 
     assert cs == exp_cs or cs == 5635, 'got wrong overview checksum.'
 
-    return 'success'
-
 ###############################################################################
 # Overview on a dataset with NODATA_VALUES
 
@@ -440,8 +425,6 @@ def test_tiff_ovr_11(both_endian):
 
     assert cs == exp_cs, 'got wrong overview checksum.'
 
-    return 'success'
-
 ###############################################################################
 # Same as tiff_ovr_11 but with compression to trigger the multiband overview
 # code
@@ -480,8 +463,6 @@ def test_tiff_ovr_12(both_endian):
 
     assert cs == exp_cs, 'got wrong overview checksum.'
 
-    return 'success'
-
 
 ###############################################################################
 # Test gaussian resampling
@@ -512,8 +493,6 @@ def test_tiff_ovr_13(both_endian):
 
     ds = None
 
-    return 'success'
-
 ###############################################################################
 # Check gauss resampling on a dataset with a raster band that has a color table
 
@@ -535,8 +514,6 @@ def test_tiff_ovr_14(both_endian):
 
     assert cs == exp_cs, 'got wrong overview checksum.'
 
-    return 'success'
-
 ###############################################################################
 # Same as tiff_ovr_11 but with gauss, and compression to trigger the multiband overview
 # code
@@ -575,8 +552,6 @@ def test_tiff_ovr_15(both_endian):
 
     assert cs == exp_cs, 'got wrong overview checksum.'
 
-    return 'success'
-
 
 ###############################################################################
 # Test mode resampling on non-byte dataset
@@ -607,8 +582,6 @@ def test_tiff_ovr_16(both_endian):
 
     ds = None
 
-    return 'success'
-
 
 ###############################################################################
 # Test mode resampling on a byte dataset
@@ -631,8 +604,6 @@ def test_tiff_ovr_17(both_endian):
 
     ds = None
 
-    return 'success'
-
 ###############################################################################
 # Check mode resampling on a dataset with a raster band that has a color table
 
@@ -654,8 +625,6 @@ def test_tiff_ovr_18(both_endian):
 
     assert cs == exp_cs, 'got wrong overview checksum.'
 
-    return 'success'
-
 ###############################################################################
 # Check that we can create overviews on a newly create file (#2621)
 # Will cause older libtiff versions (<=3.8.2 for sure) to crash, so skip it
@@ -689,8 +658,6 @@ def test_tiff_ovr_19(both_endian):
 
     ds = None
 
-    return 'success'
-
 
 ###############################################################################
 # Test BIGTIFF_OVERVIEW=YES option
@@ -724,8 +691,6 @@ def test_tiff_ovr_20(both_endian):
     assert (not ((binvalues[2] != 0x2B or binvalues[3] != 0) and
             (binvalues[3] != 0x2B or binvalues[2] != 0)))
 
-    return 'success'
-
 
 ###############################################################################
 # Test BIGTIFF_OVERVIEW=IF_NEEDED option
@@ -759,8 +724,6 @@ def test_tiff_ovr_21(both_endian):
     assert (not ((binvalues[2] != 0x2B or binvalues[3] != 0) and
             (binvalues[3] != 0x2B or binvalues[2] != 0)))
 
-    return 'success'
-
 ###############################################################################
 # Test BIGTIFF_OVERVIEW=NO option when BigTIFF is really needed
 
@@ -790,7 +753,7 @@ def test_tiff_ovr_22(both_endian):
     ds = None
 
     if err != 0:
-        return 'success'
+        return
     pytest.fail()
 
 ###############################################################################
@@ -829,8 +792,6 @@ def test_tiff_ovr_23(both_endian):
     assert (not ((binvalues[2] != 0x2A or binvalues[3] != 0) and
             (binvalues[3] != 0x2A or binvalues[2] != 0)))
 
-    return 'success'
-
 ###############################################################################
 # Test BIGTIFF_OVERVIEW=IF_SAFER option
 
@@ -866,8 +827,6 @@ def test_tiff_ovr_24(both_endian):
     assert (not ((binvalues[2] != 0x2B or binvalues[3] != 0) and
             (binvalues[3] != 0x2B or binvalues[2] != 0)))
 
-    return 'success'
-
 ###############################################################################
 # Test creating overviews after some blocks have been written in the main
 # band and actually flushed
@@ -890,8 +849,6 @@ def test_tiff_ovr_25(both_endian):
 
     assert ds.GetRasterBand(1).GetOverview(0).Checksum() == 2500
 
-    return 'success'
-
 ###############################################################################
 # Test gdal.RegenerateOverview()
 
@@ -911,8 +868,6 @@ def test_tiff_ovr_26(both_endian):
     assert cs == cs_new
     ds = None
 
-    return 'success'
-
 ###############################################################################
 # Test gdal.RegenerateOverviews()
 
@@ -937,8 +892,6 @@ def test_tiff_ovr_27(both_endian):
     assert cs2 == cs2_new
     ds = None
 
-    return 'success'
-
 ###############################################################################
 # Test cleaning overviews.
 
@@ -958,8 +911,6 @@ def test_tiff_ovr_28(both_endian):
     assert ds.GetRasterBand(1).GetOverviewCount() == 0, \
         'Overview(s) appear to still exist after reopen.'
 
-    return 'success'
-
 ###############################################################################
 # Test cleaning external overviews (ovr) on a non-TIFF format.
 
@@ -997,8 +948,6 @@ def test_tiff_ovr_29(both_endian):
 
     gdal.GetDriverByName('PNG').Delete('tmp/ovr29.png')
 
-    return 'success'
-
 ###############################################################################
 # Test fix for #2988.
 
@@ -1026,8 +975,6 @@ def test_tiff_ovr_30(both_endian):
     ds = gdal.Open('tmp/ovr30.tif')
     assert ds.GetProjectionRef().find('4326') != -1
 
-    return 'success'
-
 ###############################################################################
 # Test fix for #3033
 
@@ -1046,8 +993,6 @@ def test_tiff_ovr_31(both_endian):
         ('Checksum is %d. Expected checksum is %d' % (cs, expected_cs))
     ds = None
 
-    return 'success'
-
 ###############################################################################
 # Test Cubic sampling.
 
@@ -1195,8 +1140,6 @@ def test_tiff_ovr_32(both_endian):
 
     gdaltest.tiff_drv.Delete('tmp/ovr32.tif')
 
-    return 'success'
-
 
 ###############################################################################
 # Test creation of overviews on a 1x1 dataset (fix for #3069)
@@ -1216,8 +1159,6 @@ def test_tiff_ovr_33(both_endian):
 
     gdaltest.tiff_drv.Delete('tmp/ovr33.tif')
 
-    return 'success'
-
 
 ###############################################################################
 # Confirm that overviews are used on a Band.RasterIO().
@@ -1241,8 +1182,6 @@ def test_tiff_ovr_34(both_endian):
 
     gdaltest.tiff_drv.Delete('tmp/ovr34.tif')
 
-    return 'success'
-
 ###############################################################################
 # Confirm that overviews are used on a Band.RasterIO().
 
@@ -1266,8 +1205,6 @@ def test_tiff_ovr_35(both_endian):
 
     gdaltest.tiff_drv.Delete('tmp/ovr35.tif')
 
-    return 'success'
-
 ###############################################################################
 # Confirm that overviews are used on a Band.RasterIO() when using BlockBasedRasterIO() (#3124)
 
@@ -1313,8 +1250,6 @@ def test_tiff_ovr_37(both_endian):
     # XXXX : on big-endian host ??? FIXME: To be updated
     assert predictor2_size == 3957, 'did not get expected file size.'
 
-    return 'success'
-
 ###############################################################################
 # Test that the predictor flag gets well propagated to internal overviews
 
@@ -1335,8 +1270,6 @@ def test_tiff_ovr_38(both_endian):
 
     assert file_size <= 21000, 'did not get expected file size.'
 
-    return 'success'
-
 ###############################################################################
 # Test external overviews on all datatypes
 
@@ -1383,8 +1316,7 @@ def test_tiff_ovr_39(both_endian):
         assert cs == expected_cs, \
             ('did not get expected checksum for datatype %s' % gdal.GetDataTypeName(datatype))
 
-    return 'success'
-
+    
 ###############################################################################
 # Test external overviews on 1 bit datasets with AVERAGE_BIT2GRAYSCALE (similar to tiff_ovr_4)
 
@@ -1449,8 +1381,6 @@ def test_tiff_ovr_40(both_endian):
 
     wrk_ds = None
 
-    return 'success'
-
 ###############################################################################
 # Test external overviews on 1 bit datasets with NEAREST
 
@@ -1474,8 +1404,6 @@ def test_tiff_ovr_41(both_endian):
 
     assert cs == 1496, 'did not get expected checksum'
 
-    return 'success'
-
 ###############################################################################
 # Test external overviews on dataset with color table
 
@@ -1507,8 +1435,6 @@ def test_tiff_ovr_42(both_endian):
 
     ds = None
 
-    return 'success'
-
 ###############################################################################
 # Make sure that 16bit overviews with JPEG compression are handled using 12-bit
 # jpeg-in-tiff (#3539)
@@ -1565,8 +1491,6 @@ def test_tiff_ovr_43(both_endian):
 
     gdaltest.tiff_drv.Delete('tmp/ovr43.tif')
 
-    return 'success'
-
 ###############################################################################
 # Test that we can change overview block size through GDAL_TIFF_OVR_BLOCKSIZE configuration
 # option
@@ -1593,8 +1517,6 @@ def test_tiff_ovr_44(both_endian):
 
     assert cs == 1087, 'did not get expected checksum'
 
-    return 'success'
-
 ###############################################################################
 # Same as tiff_ovr_44, but with external overviews
 
@@ -1620,8 +1542,6 @@ def test_tiff_ovr_45(both_endian):
 
     assert cs == 1087, 'did not get expected checksum'
 
-    return 'success'
-
 ###############################################################################
 # Test overview on a dataset where width * height > 2 billion
 
@@ -1717,8 +1637,6 @@ def test_tiff_ovr_46():
 
     gdaltest.tiff_drv.Delete('/vsimem/tiff_ovr_46.tif')
 
-    return 'success'
-
 ###############################################################################
 # Test workaround with libtiff 3.X when creating interleaved overviews
 
@@ -1745,8 +1663,6 @@ def test_tiff_ovr_47(both_endian):
 
     assert cs == 35721, 'did not get expected checksum'
 
-    return 'success'
-
 ###############################################################################
 # Test that we don't average 0's in alpha band
 
@@ -1777,8 +1693,7 @@ def test_tiff_ovr_48(both_endian):
         cs = ds.GetRasterBand(i + 1).Checksum()
         assert cs == 0, i
 
-    return 'success'
-
+    
 ###############################################################################
 # Test possible stride computation issue in GDALRegenerateOverviewsMultiBand (#5653)
 
@@ -1802,8 +1717,6 @@ def test_tiff_ovr_49(both_endian):
     ds = None
     gdal.GetDriverByName('GTiff').Delete('/vsimem/tiff_ovr_49.tif')
 
-    return 'success'
-
 ###############################################################################
 # Test overviews when X dimension is smaller than Y (#5794)
 
@@ -1819,8 +1732,6 @@ def test_tiff_ovr_50(both_endian):
     ds = None
     gdal.GetDriverByName('GTiff').Delete('/vsimem/tiff_ovr_50.tif')
 
-    return 'success'
-
 ###############################################################################
 # Test average overview on a color palette with nodata values (#6371)
 
@@ -1842,8 +1753,6 @@ def test_tiff_ovr_51():
 
     gdal.GetDriverByName('PNG').Delete('/vsimem/tiff_ovr_51.png')
 
-    return 'success'
-
 ###############################################################################
 # Test unsorted external overview building (#6617)
 
@@ -1893,8 +1802,6 @@ def test_tiff_ovr_52():
 
     gdal.GetDriverByName('GTiff').Delete('/vsimem/tiff_ovr_52.tif')
 
-    return 'success'
-
 ###############################################################################
 # Test external overviews building in several steps
 
@@ -1948,8 +1855,6 @@ def test_tiff_ovr_53():
 
     gdal.GetDriverByName('GTiff').Delete('/vsimem/tiff_ovr_53.tif')
 
-    return 'success'
-
 ###############################################################################
 # Test external overviews building in several steps with jpeg compression
 
@@ -1986,8 +1891,6 @@ def test_tiff_ovr_54():
 
     assert not (cs0 == 0 or cs1 == 0)
 
-    return 'success'
-
 ###############################################################################
 
 
@@ -2003,8 +1906,6 @@ def test_tiff_ovr_too_many_levels_contig():
     ds = None
     gdal.GetDriverByName('GTiff').Delete(tmpfilename)
 
-    return 'success'
-
 ###############################################################################
 
 
@@ -2019,8 +1920,6 @@ def test_tiff_ovr_too_many_levels_separate():
     ds = None
     gdal.GetDriverByName('GTiff').Delete(tmpfilename)
 
-    return 'success'
-
 ###############################################################################
 
 
@@ -2037,8 +1936,6 @@ def test_tiff_ovr_too_many_levels_external():
     ds = None
     gdal.GetDriverByName('GTiff').Delete(tmpfilename)
 
-    return 'success'
-
 ###############################################################################
 
 
@@ -2062,8 +1959,6 @@ def test_tiff_ovr_average_multiband_vs_singleband():
 
     assert cs_band == cs_pixel
 
-    return 'success'
-
 
 gdaltest_list = [
     test_tiff_ovr_1,
diff --git a/autotest/gcore/tiff_read.py b/autotest/gcore/tiff_read.py
index 8edd8c80b52c..354dfd440fbd 100755
--- a/autotest/gcore/tiff_read.py
+++ b/autotest/gcore/tiff_read.py
@@ -131,8 +131,6 @@ def test_tiff_read_off():
         ds = gdal.Open('GTIFF_DIR:1:data/byte.tif', gdal.GA_Update)
     assert ds is not None
 
-    return 'success'
-
 
 ###############################################################################
 # Confirm we interpret bands as alpha when we should, and not when we
@@ -195,8 +193,7 @@ def test_tiff_check_alpha():
         assert got_cs == [12603, 58561, 36064, 10807]
         ds = None
 
-    return 'success'
-
+    
 
 ###############################################################################
 # Test reading a CMYK tiff as RGBA image
@@ -218,8 +215,6 @@ def test_tiff_read_cmyk_rgba():
     assert ds.GetRasterBand(1).Checksum() == 23303, \
         ('Expected checksum = %d. Got = %d' % (23303, ds.GetRasterBand(1).Checksum()))
 
-    return 'success'
-
 ###############################################################################
 # Test reading a CMYK tiff as a raw image
 
@@ -234,8 +229,6 @@ def test_tiff_read_cmyk_raw():
     assert ds.GetRasterBand(1).Checksum() == 29430, \
         ('Expected checksum = %d. Got = %d' % (29430, ds.GetRasterBand(1).Checksum()))
 
-    return 'success'
-
 ###############################################################################
 # Test reading a OJPEG image
 
@@ -269,8 +262,7 @@ def test_tiff_read_ojpeg():
     if cs != 0:
         print('Should be 0 with internal libtiff')
 
-    return 'success'
-
+    
 ###############################################################################
 # Read a .tif.gz file
 
@@ -291,7 +283,7 @@ def test_tiff_read_gzip():
         os.stat('data/byte.tif.gz.properties')
         pytest.fail('did not expect data/byte.tif.gz.properties')
     except OSError:
-        return 'success'
+        return
 
 ###############################################################################
 # Read a .tif.zip file (with explicit filename)
@@ -304,8 +296,6 @@ def test_tiff_read_zip_1():
         ('Expected checksum = %d. Got = %d' % (4672, ds.GetRasterBand(1).Checksum()))
     ds = None
 
-    return 'success'
-
 ###############################################################################
 # Read a .tif.zip file (with implicit filename)
 
@@ -317,8 +307,6 @@ def test_tiff_read_zip_2():
         ('Expected checksum = %d. Got = %d' % (4672, ds.GetRasterBand(1).Checksum()))
     ds = None
 
-    return 'success'
-
 ###############################################################################
 # Read a .tif.zip file with a single file in a subdirectory (with explicit filename)
 
@@ -330,8 +318,6 @@ def test_tiff_read_zip_3():
         ('Expected checksum = %d. Got = %d' % (4672, ds.GetRasterBand(1).Checksum()))
     ds = None
 
-    return 'success'
-
 ###############################################################################
 # Read a .tif.zip file with a single file in a subdirectory(with implicit filename)
 
@@ -343,8 +329,6 @@ def test_tiff_read_zip_4():
         ('Expected checksum = %d. Got = %d' % (4672, ds.GetRasterBand(1).Checksum()))
     ds = None
 
-    return 'success'
-
 ###############################################################################
 # Read a .tif.zip file with 2 files in a subdirectory
 
@@ -356,8 +340,6 @@ def test_tiff_read_zip_5():
         ('Expected checksum = %d. Got = %d' % (4672, ds.GetRasterBand(1).Checksum()))
     ds = None
 
-    return 'success'
-
 ###############################################################################
 # Read a .tar file (with explicit filename)
 
@@ -369,8 +351,6 @@ def test_tiff_read_tar_1():
         ('Expected checksum = %d. Got = %d' % (4672, ds.GetRasterBand(1).Checksum()))
     ds = None
 
-    return 'success'
-
 ###############################################################################
 # Read a .tar file (with implicit filename)
 
@@ -382,8 +362,6 @@ def test_tiff_read_tar_2():
         ('Expected checksum = %d. Got = %d' % (4672, ds.GetRasterBand(1).Checksum()))
     ds = None
 
-    return 'success'
-
 ###############################################################################
 # Read a .tgz file (with explicit filename)
 
@@ -397,8 +375,6 @@ def test_tiff_read_tgz_1():
 
     gdal.Unlink('data/byte.tgz.properties')
 
-    return 'success'
-
 ###############################################################################
 # Read a .tgz file (with implicit filename)
 
@@ -412,8 +388,6 @@ def test_tiff_read_tgz_2():
 
     gdal.Unlink('data/byte.tgz.properties')
 
-    return 'success'
-
 ###############################################################################
 # Check handling of non-degree angular units (#601)
 
@@ -426,8 +400,6 @@ def test_tiff_grads():
     assert srs.find('PARAMETER["latitude_of_origin",46.8]') != -1, \
         'Did not get expected latitude of origin.'
 
-    return 'success'
-
 ###############################################################################
 # Check Erdas Citation Parsing for coordinate system.
 
@@ -447,8 +419,7 @@ def test_tiff_citation():
         print('got: ', wkt)
         pytest.fail('Erdas citation processing failing?')
 
-    return 'success'
-
+    
 ###############################################################################
 # Check that we can read linear projection parameters properly (#3901)
 
@@ -488,8 +459,6 @@ def test_tiff_linearparmunits():
     fe = srs.GetProjParm(osr.SRS_PP_FALSE_EASTING)
     assert abs(fe - 2000000.0) <= 0.001, 'did not get expected false easting (3)'
 
-    return 'success'
-
 ###############################################################################
 # Check that the GTIFF_LINEAR_UNITS handling works properly (#3901)
 
@@ -533,8 +502,6 @@ def test_tiff_linearparmunits2():
 
     gdal.SetConfigOption('GTIFF_LINEAR_UNITS', 'DEFAULT')
 
-    return 'success'
-
 ###############################################################################
 # Test GTiffSplitBitmapBand to treat one row 1bit files as scanline blocks (#2622)
 
@@ -553,8 +520,6 @@ def test_tiff_g4_split():
     cs = ds.GetRasterBand(1).Checksum()
     assert cs == 3322, 'Got wrong checksum'
 
-    return 'success'
-
 ###############################################################################
 # Test reading a tiff with multiple images in it
 
@@ -584,8 +549,6 @@ def test_tiff_multi_images():
         ('Expected checksum = %d. Got = %d' % (4672, ds.GetRasterBand(1).Checksum()))
     ds = None
 
-    return 'success'
-
 ###############################################################################
 # Test reading a tiff from a memory buffer (#2931)
 
@@ -622,8 +585,6 @@ def test_tiff_vsimem():
     # Release memory associated to the in-memory file
     gdal.Unlink('/vsimem/tiffinmem')
 
-    return 'success'
-
 ###############################################################################
 # Test reading a tiff from inside a zip in a memory buffer !
 
@@ -647,8 +608,6 @@ def test_tiff_vsizip_and_mem():
     # Release memory associated to the in-memory file
     gdal.Unlink('/vsimem/tiffinmem.zip')
 
-    return 'success'
-
 ###############################################################################
 # Test reading a GeoTIFF with only ProjectedCSTypeGeoKey defined (ticket #3019)
 
@@ -659,8 +618,6 @@ def test_tiff_ProjectedCSTypeGeoKey_only():
     assert ds.GetProjectionRef().find('WGS 84 / UTM zone 31N') != -1
     ds = None
 
-    return 'success'
-
 ###############################################################################
 # Test reading a GeoTIFF with only GTModelTypeGeoKey defined
 
@@ -671,8 +628,6 @@ def test_tiff_GTModelTypeGeoKey_only():
     assert ds.GetProjectionRef().find('LOCAL_CS["unnamed",GEOGCS["unknown",DATUM["unknown",SPHEROID["unretrievable - using WGS84",6378137,298.257223563]],PRIMEM["Greenwich",0],UNIT[,0.0174532925199433]],UNIT["unknown",1]]') == 0
     ds = None
 
-    return 'success'
-
 ###############################################################################
 # Test reading a 12bit jpeg compressed geotiff.
 
@@ -713,8 +668,6 @@ def test_tiff_12bitjpeg():
 
     os.unlink('data/mandrilmini_12bitjpeg.tif.aux.xml')
 
-    return 'success'
-
 ###############################################################################
 # Test that statistics for TIFF files are stored and correctly read from .aux.xml
 
@@ -751,8 +704,7 @@ def test_tiff_read_stats_from_pam():
     except OSError:
         pass
 
-    return 'success'
-
+    
 ###############################################################################
 # Test extracting georeferencing from a .TAB file
 
@@ -797,8 +749,6 @@ def test_tiff_read_from_tab():
 
     assert wkt.find('OSGB_1936') != -1, 'did not get expected SRS'
 
-    return 'success'
-
 ###############################################################################
 # Test reading PixelIsPoint file.
 
@@ -828,8 +778,6 @@ def test_tiff_read_pixelispoint():
 
     gdal.SetConfigOption('GTIFF_POINT_GEO_IGNORE', None)
 
-    return 'success'
-
 ###############################################################################
 # Test reading a GeoTIFF file with a geomatrix in PixelIsPoint format.
 
@@ -859,8 +807,6 @@ def test_tiff_read_geomatrix():
 
     gdal.SetConfigOption('GTIFF_POINT_GEO_IGNORE', None)
 
-    return 'success'
-
 ###############################################################################
 # Test that we don't crash when reading a TIFF with corrupted GeoTIFF tags
 
@@ -877,8 +823,6 @@ def test_tiff_read_corrupted_gtiff():
        err_msg.find('Error fetching data for field') == -1)), \
         'did not get expected error message'
 
-    return 'success'
-
 ###############################################################################
 # Test that we don't crash when reading a TIFF with corrupted GeoTIFF tags
 
@@ -894,8 +838,6 @@ def test_tiff_read_tag_without_null_byte():
         'should have not emitted a warning, but only a CPLDebug() message'
     del ds
 
-    return 'success'
-
 
 ###############################################################################
 # Test the effect of the GTIFF_IGNORE_READ_ERRORS configuration option (#3994)
@@ -921,8 +863,6 @@ def test_tiff_read_buggy_packbits():
     assert ret is not None, 'expected a valid result'
     ds = None
 
-    return 'success'
-
 
 ###############################################################################
 # Test reading a GeoEye _rpc.txt (#3639)
@@ -944,8 +884,6 @@ def test_tiff_read_rpc_txt():
             '+1.000000000000000E+00 -5.207696939454288E-03') == 0), \
         'LINE_DEN_COEFF wrong'
 
-    return 'success'
-
 ###############################################################################
 # Test reading a TIFF with the RPC tag per
 #  http://geotiff.maptools.org/rpc_prop.html
@@ -962,8 +900,6 @@ def test_tiff_read_rpc_tif():
     assert rpc_md['LINE_DEN_COEFF'].find('1 -0.00520769693945429') == 0, \
         'LINE_DEN_COEFF wrong'
 
-    return 'success'
-
 ###############################################################################
 # Test a very small TIFF with only 4 tags :
 # Magic: 0x4949 <little-endian> Version: 0x2a
@@ -988,8 +924,6 @@ def test_tiff_small():
     # Release memory associated to the in-memory file
     gdal.Unlink('/vsimem/small.tif')
 
-    return 'success'
-
 ###############################################################################
 # Test that we can workaround a DoS with
 
@@ -1001,8 +935,6 @@ def test_tiff_dos_strip_chop():
     gdal.PopErrorHandler()
     del ds
 
-    return 'success'
-
 ###############################################################################
 # Test reading EXIF and GPS metadata
 
@@ -1028,8 +960,6 @@ def test_tiff_read_exif_and_gps():
 
     assert (exif_md is None or not exif_md)
 
-    return 'success'
-
 ###############################################################################
 # Test reading a pixel interleaved RGBA JPEG-compressed TIFF
 
@@ -1052,8 +982,6 @@ def test_tiff_jpeg_rgba_pixel_interleaved():
 
     ds = None
 
-    return 'success'
-
 ###############################################################################
 # Test reading a band interleaved RGBA JPEG-compressed TIFF
 
@@ -1076,8 +1004,6 @@ def test_tiff_jpeg_rgba_band_interleaved():
 
     ds = None
 
-    return 'success'
-
 ###############################################################################
 # Test reading a YCbCr JPEG all-in-one-strip multiband TIFF (#3259, #3894)
 
@@ -1099,8 +1025,6 @@ def test_tiff_read_online_1():
 
     assert cs == 62628 or cs == 28554
 
-    return 'success'
-
 ###############################################################################
 # Use GTIFF_DIRECT_IO=YES option combined with /vsicurl to test for multi-range
 # support
@@ -1136,8 +1060,6 @@ def test_tiff_read_online_2():
 
     assert cs == 54935, 'wrong checksum'
 
-    return 'success'
-
 ###############################################################################
 # Test reading a TIFF made of a single-strip that is more than 2GB (#5403)
 
@@ -1165,8 +1087,7 @@ def test_tiff_read_huge4GB():
         ds = None
         os.remove('tmp/huge4GB.tif')
 
-    return 'success'
-
+    
 ###############################################################################
 # Test reading a (small) BigTIFF. Tests GTiffCacheOffsetOrCount8()
 
@@ -1183,8 +1104,6 @@ def test_tiff_read_bigtiff():
 
     assert cs == 4672
 
-    return 'success'
-
 ###############################################################################
 # Test reading in TIFF metadata domain
 
@@ -1208,8 +1127,6 @@ def test_tiff_read_tiff_metadata():
     assert ds.GetRasterBand(4).GetMetadataItem('BLOCK_OFFSET_0_2', 'TIFF') == '11071'
     assert ds.GetRasterBand(4).GetMetadataItem('BLOCK_SIZE_0_2', 'TIFF') == '188'
 
-    return 'success'
-
 ###############################################################################
 # Test reading a JPEG-in-TIFF with tiles of irregular size (corrupted image)
 
@@ -1234,8 +1151,6 @@ def test_tiff_read_irregular_tile_size_jpeg_in_tiff():
     assert gdal.GetLastErrorType() != 0
     gdal.ErrorReset()
 
-    return 'success'
-
 ###############################################################################
 # Test GTIFF_DIRECT_IO and GTIFF_VIRTUAL_MEM_IO optimizations
 
@@ -1608,8 +1523,7 @@ def test_tiff_direct_and_virtual_mem_io():
         print('unreached = %s' % unreached)
         pytest.fail('missing code coverage in VirtualMemIO()')
 
-    return 'success'
-
+    
 ###############################################################################
 # Check read Digital Globe metadata IMD & RPB format
 
@@ -1647,8 +1561,7 @@ def test_tiff_read_md1():
     except OSError:
         pass
 
-    return 'success'
-
+    
 ###############################################################################
 # Check read Digital Globe metadata XML format
 
@@ -1686,8 +1599,7 @@ def test_tiff_read_md2():
     except OSError:
         pass
 
-    return 'success'
-
+    
 ###############################################################################
 # Check read GeoEye metadata format
 
@@ -1725,8 +1637,7 @@ def test_tiff_read_md3():
     except OSError:
         pass
 
-    return 'success'
-
+    
 ###############################################################################
 # Check read OrbView metadata format
 
@@ -1764,8 +1675,7 @@ def test_tiff_read_md4():
     except OSError:
         pass
 
-    return 'success'
-
+    
 ###############################################################################
 # Check read Resurs-DK1 metadata format
 
@@ -1803,8 +1713,7 @@ def test_tiff_read_md5():
     except OSError:
         pass
 
-    return 'success'
-
+    
 ###############################################################################
 # Check read Landsat metadata format
 
@@ -1842,8 +1751,7 @@ def test_tiff_read_md6():
     except OSError:
         pass
 
-    return 'success'
-
+    
 ###############################################################################
 # Check read Spot metadata format
 
@@ -1881,8 +1789,7 @@ def test_tiff_read_md7():
     except OSError:
         pass
 
-    return 'success'
-
+    
 ###############################################################################
 # Check read RapidEye metadata format
 
@@ -1920,8 +1827,7 @@ def test_tiff_read_md8():
     except OSError:
         pass
 
-    return 'success'
-
+    
 ###############################################################################
 # Check read Alos metadata format
 
@@ -1958,8 +1864,7 @@ def test_tiff_read_md9():
     except OSError:
         pass
 
-    return 'success'
-
+    
 ###############################################################################
 # Check read Eros metadata format
 
@@ -1997,8 +1902,7 @@ def test_tiff_read_md10():
     except OSError:
         pass
 
-    return 'success'
-
+    
 ###############################################################################
 # Check read Kompsat metadata format
 
@@ -2036,8 +1940,7 @@ def test_tiff_read_md11():
     except OSError:
         pass
 
-    return 'success'
-
+    
 ###############################################################################
 # Check read Dimap metadata format
 
@@ -2087,8 +1990,6 @@ def test_tiff_read_md12():
 
     assert len(filelist) <= 1, 'did not get expected file list.'
 
-    return 'success'
-
 ###############################################################################
 # Test reading a TIFFTAG_GDAL_NODATA with empty text
 
@@ -2098,8 +1999,6 @@ def test_tiff_read_empty_nodata_tag():
     ds = gdal.Open('data/empty_nodata.tif')
     assert ds.GetRasterBand(1).GetNoDataValue() is None
 
-    return 'success'
-
 ###############################################################################
 # Check that no auxiliary files are read with a simple Open(), reading
 # imagery and getting IMAGE_STRUCTURE metadata
@@ -2131,8 +2030,6 @@ def test_tiff_read_strace_check():
 
     assert len(lines_with_dotdot_gcore) == 1
 
-    return 'success'
-
 ###############################################################################
 # Test GDAL_READDIR_LIMIT_ON_OPEN
 
@@ -2148,8 +2045,6 @@ def test_tiff_read_readdir_limit_on_open():
 
     assert len(filelist) == 3, 'did not get expected file list.'
 
-    return 'success'
-
 ###############################################################################
 #
 
@@ -2166,8 +2061,6 @@ def test_tiff_read_minisblack_as_rgba():
     assert got_cs == [4672, 4672, 4672, 4873]
     ds = None
 
-    return 'success'
-
 ###############################################################################
 #
 
@@ -2184,8 +2077,6 @@ def test_tiff_read_colortable_as_rgba():
     assert got_cs == [2433, 2433, 2433, 4873]
     ds = None
 
-    return 'success'
-
 ###############################################################################
 #
 
@@ -2203,8 +2094,6 @@ def test_tiff_read_logl_as_rgba():
     assert got_cs == [0, 0, 0, 4873]
     ds = None
 
-    return 'success'
-
 ###############################################################################
 #
 
@@ -2241,8 +2130,6 @@ def test_tiff_read_strip_separate_as_rgba():
 
     gdal.Unlink('/vsimem/tiff_read_strip_separate_as_rgba.tif')
 
-    return 'success'
-
 ###############################################################################
 #
 
@@ -2278,8 +2165,6 @@ def test_tiff_read_tiled_separate_as_rgba():
 
     gdal.Unlink('/vsimem/tiff_read_tiled_separate_as_rgba.tif')
 
-    return 'success'
-
 ###############################################################################
 #
 
@@ -2289,7 +2174,6 @@ def test_tiff_read_scanline_more_than_2GB():
     with gdaltest.error_handler():
         ds = gdal.Open('data/scanline_more_than_2GB.tif')
     assert ds is None
-    return 'success'
 
 ###############################################################################
 # Test that we are at least robust to wrong number of ExtraSamples and warn
@@ -2304,8 +2188,6 @@ def test_tiff_read_wrong_number_extrasamples():
     assert gdal.GetLastErrorMsg().find('Wrong number of ExtraSamples') >= 0
     assert ds.GetRasterBand(6).GetRasterColorInterpretation() == gdal.GCI_AlphaBand
 
-    return 'success'
-
 ###############################################################################
 # Test that we can read a one-trip TIFF without StripByteCounts tag
 
@@ -2317,8 +2199,6 @@ def test_tiff_read_one_strip_no_bytecount():
     gdal.PopErrorHandler()
     assert ds.GetRasterBand(1).Checksum() == 1
 
-    return 'success'
-
 ###############################################################################
 # Test GDAL_GEOREF_SOURCES
 
@@ -2384,8 +2264,7 @@ def test_tiff_read_nogeoref():
                 print('Expected ' + expected_srs)
                 pytest.fail('Iteration %d, did not get expected SRS for %s,copy_pam=%s,copy_worldfile=%s,copy_tabfile=%s' % (iteration, config_option_value, str(copy_pam), str(copy_worldfile), str(copy_tabfile)))
 
-    return 'success'
-
+    
 ###############################################################################
 # Test GDAL_GEOREF_SOURCES
 
@@ -2443,8 +2322,7 @@ def test_tiff_read_inconsistent_georef():
                 print('Expected ' + expected_srs)
                 pytest.fail('Iteration %d, did not get expected SRS for %s,copy_pam=%s,copy_worldfile=%s,copy_tabfile=%s' % (iteration, config_option_value, str(copy_pam), str(copy_worldfile), str(copy_tabfile)))
 
-    return 'success'
-
+    
 ###############################################################################
 # Test GDAL_GEOREF_SOURCES
 
@@ -2492,8 +2370,7 @@ def test_tiff_read_gcp_internal_and_auxxml():
                 print('Expected ' + expected_srs)
                 pytest.fail('Iteration %d, did not get expected SRS for %s,copy_pam=%s' % (iteration, config_option_value, str(copy_pam)))
 
-    return 'success'
-
+    
 ###############################################################################
 # Test reading .tif + .aux
 
@@ -2519,8 +2396,6 @@ def test_tiff_read_aux():
     assert handler.msg is None, \
         ('Got message that indicate recursive calls: %s' % handler.msg)
 
-    return 'success'
-
 
 def test_tiff_read_one_band_from_two_bands():
 
@@ -2534,8 +2409,6 @@ def test_tiff_read_one_band_from_two_bands():
     gdal.Unlink('/vsimem/tiff_read_one_band_from_two_bands.tif.aux.xml')
     gdal.Unlink('/vsimem/tiff_read_one_band_from_two_bands_dst.tif')
 
-    return 'success'
-
 
 def test_tiff_read_jpeg_cloud_optimized():
 
@@ -2546,8 +2419,7 @@ def test_tiff_read_jpeg_cloud_optimized():
         assert cs0 == 4743 and cs1 == 1133, i
         ds = None
 
-    return 'success'
-
+    
 # This one was generated with a buggy code that emit JpegTables with mode == 1
 # when creating the overview directory but failed to properly set this mode while
 # writing the imagery. libjpeg-6b emits a 'JPEGLib:Huffman table 0x00 was not defined'
@@ -2567,8 +2439,7 @@ def test_tiff_read_corrupted_jpeg_cloud_optimized():
     elif cs1 != 1133:
         pytest.fail(cs1)
 
-    return 'success'
-
+    
 ###############################################################################
 # Test reading YCbCr images with LZW compression
 
@@ -2599,8 +2470,7 @@ def test_tiff_read_ycbcr_lzw():
         assert got_cs1 == cs1 and got_cs2 == cs2 and got_cs3 == cs3, \
             (filename, got_cs1, got_cs2, got_cs3)
 
-    return 'success'
-
+    
 ###############################################################################
 # Test reading YCbCr images with nbits > 8
 
@@ -2612,8 +2482,6 @@ def test_tiff_read_ycbcr_int12():
     assert ds is None
     assert gdal.GetLastErrorMsg().find('Cannot open TIFF file with') >= 0
 
-    return 'success'
-
 ###############################################################################
 # Test reading band unit from VERT_CS unit (#6675)
 
@@ -2633,8 +2501,6 @@ def test_tiff_read_unit_from_srs():
 
     gdal.Unlink('/vsimem/tiff_read_unit_from_srs.tif')
 
-    return 'success'
-
 ###############################################################################
 # Test reading ArcGIS 9.3 .aux.xml
 
@@ -2650,7 +2516,6 @@ def test_tiff_read_arcgis93_geodataxform_gcp():
        abs(gcp.GCPX - 500000) <= 1e-5 and \
        abs(gcp.GCPY - 4705078.79016612) <= 1e-5 and \
        abs(gcp.GCPZ - 0) <= 1e-5)
-    return 'success'
 
 ###############################################################################
 # Test reading file with block size > signed int 32 bit
@@ -2661,7 +2526,6 @@ def test_tiff_read_block_width_above_32bit():
     with gdaltest.error_handler():
         ds = gdal.Open('data/block_width_above_32bit.tif')
     assert ds is None
-    return 'success'
 
 ###############################################################################
 # Test reading file with image size > signed int 32 bit
@@ -2672,7 +2536,6 @@ def test_tiff_read_image_width_above_32bit():
     with gdaltest.error_handler():
         ds = gdal.Open('data/image_width_above_32bit.tif')
     assert ds is None
-    return 'success'
 
 ###############################################################################
 # Test reading file with image size > signed int 32 bit
@@ -2688,8 +2551,6 @@ def test_tiff_read_second_image_width_above_32bit():
         ds = gdal.Open('GTIFF_DIR:2:data/second_image_width_above_32bit.tif')
     assert ds is None
 
-    return 'success'
-
 ###############################################################################
 # Test reading file with minimal number of warnings without warning
 
@@ -2702,8 +2563,6 @@ def test_tiff_read_minimum_tiff_tags_no_warning():
     ds.GetRasterBand(1).Checksum()
     assert gdal.GetLastErrorMsg() == ''
 
-    return 'success'
-
 ###############################################################################
 # Test reading file with minimal number of warnings but warning
 
@@ -2718,8 +2577,6 @@ def test_tiff_read_minimum_tiff_tags_with_warning():
     ds.GetRasterBand(1).Checksum()
     assert gdal.GetLastErrorMsg() == ''
 
-    return 'success'
-
 
 ###############################################################################
 
@@ -2755,8 +2612,6 @@ def test_tiff_read_unknown_compression():
         ds = gdal.Open('data/unknown_compression.tif')
     assert ds is None
 
-    return 'success'
-
 ###############################################################################
 
 
@@ -2770,8 +2625,7 @@ def test_tiff_read_leak_ZIPSetupDecode():
         for i in range(ds.RasterCount):
             ds.GetRasterBand(i + 1).Checksum()
 
-    return 'success'
-
+    
 ###############################################################################
 
 
@@ -2785,8 +2639,7 @@ def test_tiff_read_excessive_memory_TIFFFillStrip():
         for i in range(ds.RasterCount):
             ds.GetRasterBand(i + 1).Checksum()
 
-    return 'success'
-
+    
 ###############################################################################
 
 
@@ -2799,8 +2652,7 @@ def test_tiff_read_excessive_memory_TIFFFillStrip2():
         ds = gdal.Open('data/excessive-memory-TIFFFillStrip2.tif')
         ds.GetRasterBand(1).Checksum()
 
-    return 'success'
-
+    
 ###############################################################################
 
 
@@ -2813,8 +2665,7 @@ def test_tiff_read_excessive_memory_TIFFFillTile():
         ds = gdal.Open('data/excessive-memory-TIFFFillTile.tif')
         ds.GetRasterBand(1).Checksum()
 
-    return 'success'
-
+    
 ###############################################################################
 
 
@@ -2831,8 +2682,6 @@ def test_tiff_read_big_strip():
     ds = None
     gdal.Unlink('/vsimem/test.tif')
 
-    return 'success'
-
 ###############################################################################
 # (Potentially) test libtiff CHUNKY_STRIP_READ_SUPPORT
 
@@ -2846,8 +2695,6 @@ def test_tiff_read_big_strip_chunky_way():
     ds = None
     gdal.Unlink('/vsimem/test.tif')
 
-    return 'success'
-
 ###############################################################################
 
 
@@ -2864,8 +2711,6 @@ def test_tiff_read_big_tile():
     ds = None
     gdal.Unlink('/vsimem/test.tif')
 
-    return 'success'
-
 ###############################################################################
 
 
@@ -2875,8 +2720,6 @@ def test_tiff_read_huge_tile():
         ds = gdal.Open('data/hugeblocksize.tif')
     assert ds is None
 
-    return 'success'
-
 ###############################################################################
 
 
@@ -2890,8 +2733,7 @@ def test_tiff_read_huge_number_strips():
         ds = gdal.Open('data/huge-number-strips.tif')
         ds.GetRasterBand(1).Checksum()
 
-    return 'success'
-
+    
 ###############################################################################
 
 
@@ -2903,8 +2745,7 @@ def test_tiff_read_huge_implied_number_strips():
     with gdaltest.error_handler():
         gdal.Open('data/huge-implied-number-strips.tif')
 
-    return 'success'
-
+    
 ###############################################################################
 
 
@@ -2925,8 +2766,6 @@ def test_tiff_read_many_blocks():
     ds = None
     gdal.Unlink('/vsimem/test.tif')
 
-    return 'success'
-
 ###############################################################################
 
 
@@ -2941,8 +2780,6 @@ def test_tiff_read_many_blocks_truncated():
         ds.GetRasterBand(1).GetMetadataItem('BLOCK_OFFSET_0_2000000', 'TIFF')
     assert gdal.GetLastErrorMsg() == 'File too short'
 
-    return 'success'
-
 ###############################################################################
 # Test reading  images with nbits > 32
 
@@ -2954,8 +2791,6 @@ def test_tiff_read_uint33():
     assert ds is None
     assert gdal.GetLastErrorMsg().find('Unsupported TIFF configuration') >= 0
 
-    return 'success'
-
 ###############################################################################
 # Test fix for https://bugs.chromium.org/p/oss-fuzz/issues/detail?id=1545
 
@@ -2969,8 +2804,7 @@ def test_tiff_read_corrupted_deflate_singlestrip():
         ds = gdal.Open('data/corrupted_deflate_singlestrip.tif')
         ds.GetRasterBand(1).Checksum()
 
-    return 'success'
-
+    
 ###############################################################################
 # Test fix for https://bugs.chromium.org/p/oss-fuzz/issues/detail?id=1563
 
@@ -2984,8 +2818,7 @@ def test_tiff_read_packbits_not_enough_data():
         ds = gdal.Open('data/packbits-not-enough-data.tif')
         ds.GetRasterBand(1).Checksum()
 
-    return 'success'
-
+    
 ###############################################################################
 # Test reading images with more than 2billion blocks for a single band
 
@@ -2996,8 +2829,6 @@ def test_tiff_read_toomanyblocks():
         ds = gdal.Open('data/toomanyblocks.tif')
     assert ds is None
 
-    return 'success'
-
 
 ###############################################################################
 # Test reading images with more than 2billion blocks for all bands
@@ -3008,8 +2839,6 @@ def test_tiff_read_toomanyblocks_separate():
         ds = gdal.Open('data/toomanyblocks_separate.tif')
     assert ds is None
 
-    return 'success'
-
 ###############################################################################
 # Test reading images where the number of items in StripByteCounts/StripOffsets
 # tag is lesser than the number of strips
@@ -3028,8 +2857,6 @@ def test_tiff_read_size_of_stripbytecount_lower_than_stripcount():
     # There are 3 strips but StripByteCounts has just one element;
     assert ds.GetRasterBand(1).GetMetadataItem('BLOCK_SIZE_0_0', 'TIFF') == '1'
 
-    return 'success'
-
 
 ###############################################################################
 # Test different datatypes for StripOffsets tag with little/big, classic/bigtiff
@@ -3079,8 +2906,7 @@ def test_tiff_read_stripoffset_types():
         if offsets != expected_offsets:
             print(filename, expected_offsets, offsets)
 
-    return 'success'
-
+    
 ###############################################################################
 # Test reading a JPEG-in-TIFF file that contains the 2 denial of service
 # vulnerabilities listed in
@@ -3111,8 +2937,7 @@ def test_tiff_read_progressive_jpeg_denial_of_service():
         del os.environ['LIBTIFF_JPEG_MAX_ALLOWED_SCAN_NUMBER']
         assert gdal.GetLastErrorMsg() != ''
 
-    return 'success'
-
+    
 
 ###############################################################################
 # Test reading old-style LZW
@@ -3128,8 +2953,6 @@ def test_tiff_read_old_style_lzw():
         cs = ds.GetRasterBand(1).Checksum()
     assert cs == 34282
 
-    return 'success'
-
 ###############################################################################
 # Test libtiff mmap interface (actually not using mmap, but our /vsimem
 # mmap emulation)
@@ -3166,8 +2989,6 @@ def test_tiff_read_mmap_interface():
 
     gdal.Unlink(tmpfile)
 
-    return 'success'
-
 
 ###############################################################################
 # Test reading JPEG compressed file whole last strip height is the full
@@ -3189,8 +3010,6 @@ def test_tiff_read_jpeg_too_big_last_stripe():
         cs = ds.GetRasterBand(1).Checksum()
     assert cs == 4557
 
-    return 'success'
-
 
 ###############################################################################
 # Test reading GeoTIFF file with negative ScaleY in GeoPixelScale tag
@@ -3209,8 +3028,7 @@ def test_tiff_read_negative_scaley():
     with gdaltest.config_option('GTIFF_HONOUR_NEGATIVE_SCALEY', 'YES'):
         assert ds.GetGeoTransform()[5] == 60
 
-    return 'success'
-
+    
 ###############################################################################
 # Test ZSTD compression
 
@@ -3280,8 +3098,6 @@ def test_tiff_read_webp_huge_single_strip():
     ds = gdal.Open('data/tif_webp_huge_single_strip.tif')
     assert ds.GetRasterBand(1).Checksum() != 0
 
-    return 'success'
-
 ###############################################################################
 
 
@@ -3289,7 +3105,6 @@ def test_tiff_read_1bit_2bands():
     ds = gdal.Open('data/1bit_2bands.tif')
     cs = (ds.GetRasterBand(1).Checksum(), ds.GetRasterBand(2).Checksum())
     assert cs == (200, 824)
-    return 'success'
 
 ###############################################################################
 # Test LERC compression
@@ -3329,8 +3144,6 @@ def test_tiff_read_overview_of_external_mask():
     assert cs1 == cs2
     assert flags1 == gdal.GMF_PER_DATASET
 
-    return 'success'
-
 ###############################################################################
 
 
diff --git a/autotest/gcore/tiff_srs.py b/autotest/gcore/tiff_srs.py
index 45e87c4246b4..6d6445945f6a 100755
--- a/autotest/gcore/tiff_srs.py
+++ b/autotest/gcore/tiff_srs.py
@@ -62,8 +62,6 @@ def test_tiff_srs_without_linear_units():
 
     assert sr.IsSame(sr2) == 1, 'did not get expected SRS'
 
-    return 'success'
-
 ###############################################################################
 # Test COMPDCS without VerticalCSType
 
@@ -105,8 +103,6 @@ def test_tiff_srs_compd_cs():
 
     assert sr.IsSame(sr2) == 1, 'did not get expected SRS'
 
-    return 'success'
-
 ###############################################################################
 # Test reading a GeoTIFF with both StdParallel1 and ScaleAtNatOrigin defined (#5791)
 
@@ -144,8 +140,6 @@ def test_tiff_srs_weird_mercator_2sp():
 
     assert sr.IsSame(sr2) == 1, 'did not get expected SRS'
 
-    return 'success'
-
 ###############################################################################
 # Test reading ESRI WGS_1984_Web_Mercator_Auxiliary_Sphere
 
@@ -174,8 +168,6 @@ def test_tiff_srs_WGS_1984_Web_Mercator_Auxiliary_Sphere():
     UNIT["Meter",1.0],
     EXTENSION["PROJ4","+proj=merc +a=6378137 +b=6378137 +lat_ts=0.0 +lon_0=0.0 +x_0=0.0 +y_0=0 +k=1.0 +units=m +nadgrids=@null +wktext  +no_defs"]]"""
 
-    return 'success'
-
 ###############################################################################
 # Test writing and reading various angular units
 
@@ -257,8 +249,6 @@ def test_tiff_srs_angular_units():
 
     gdal.Unlink('/vsimem/tiff_srs_angular_units.tif')
 
-    return 'success'
-
 ###############################################################################
 # Test writing and reading a unknown datum but with a known ellipsoid
 
@@ -279,8 +269,6 @@ def test_tiff_custom_datum_known_ellipsoid():
 
     gdal.Unlink('/vsimem/tiff_custom_datum_known_ellipsoid.tif')
 
-    return 'success'
-
 ###############################################################################
 # Test reading a GeoTIFF file with only PCS set, but with a ProjLinearUnitsGeoKey
 # override to another unit (us-feet) ... (#6210)
@@ -301,8 +289,6 @@ def test_tiff_srs_epsg_2853_with_us_feet():
     wkt = ds.GetProjectionRef()
     assert wkt.find('PARAMETER["false_easting",11482916.66') >= 0 and wkt.find('UNIT["us_survey_feet",0.3048006') >= 0 and wkt.find('2853') < 0
 
-    return 'success'
-
 ###############################################################################
 # Test reading a SRS with a PCSCitationGeoKey = "LUnits = ..."
 
@@ -332,8 +318,6 @@ def test_tiff_srs_PCSCitationGeoKey_LUnits():
 
     gdal.Unlink('/vsimem/tiff_srs_PCSCitationGeoKey_LUnits.tif')
 
-    return 'success'
-
 ###############################################################################
 # Test reading a geotiff key ProjectionGeoKey (Short,1): Unknown-3856
 
@@ -346,8 +330,6 @@ def test_tiff_srs_projection_3856():
 
     assert wkt.find('EXTENSION["PROJ4","+proj=merc +a=6378137 +b=6378137 +lat_ts=0.0 +lon_0=0.0 +x_0=0.0 +y_0=0 +k=1.0 +units=m +nadgrids=@null +wktext  +no_defs') >= 0
 
-    return 'success'
-
 ###############################################################################
 # Test reading a geotiff with a LOCAL_CS and a Imagine citation
 
@@ -360,8 +342,6 @@ def test_tiff_srs_imagine_localcs_citation():
 
     assert wkt == 'LOCAL_CS["Projection Name = UTM Units = meters GeoTIFF Units = meters",UNIT["unknown",1]]'
 
-    return 'success'
-
 ###############################################################################
 # Test reading a geotiff with a EPSG code and a TOWGS84 key that must
 # override the default coming from EPSG
@@ -375,8 +355,6 @@ def test_tiff_srs_towgs84_override():
 
     assert wkt.find('TOWGS84[584.8,67,400.3,0.105,0.013,-2.378,10.29]') >= 0
 
-    return 'success'
-
 ###############################################################################
 # Test reading PCSCitationGeoKey (#7199)
 
@@ -389,8 +367,6 @@ def test_tiff_srs_pcscitation():
 
     assert wkt.find('PROJCS["mycitation",') == 0
 
-    return 'success'
-
 
 def _test_tiff_srs(sr, expect_fail):
     """
diff --git a/autotest/gcore/tiff_write.py b/autotest/gcore/tiff_write.py
index a8785efd0740..f057b79c35fc 100755
--- a/autotest/gcore/tiff_write.py
+++ b/autotest/gcore/tiff_write.py
@@ -54,8 +54,6 @@ def test_tiff_write_1():
     drv_md = gdaltest.tiff_drv.GetMetadata()
     assert drv_md['DMD_MIMETYPE'] == 'image/tiff', 'mime type is wrong'
 
-    return 'success'
-
 ###############################################################################
 # Create a simple file by copying from an existing one.
 
@@ -86,8 +84,6 @@ def test_tiff_write_2():
 
     gdaltest.tiff_drv.Delete('tmp/test_2.tif')
 
-    return 'success'
-
 ###############################################################################
 # Create a simple file by copying from an existing one.
 
@@ -109,8 +105,6 @@ def test_tiff_write_3():
 
     gdaltest.tiff_drv.Delete('tmp/test_3.tif')
 
-    return 'success'
-
 ###############################################################################
 # Create a tiled file.
 
@@ -188,8 +182,6 @@ def test_tiff_write_4():
 
     gdaltest.tiff_drv.Delete('tmp/test_4.tif')
 
-    return 'success'
-
 ###############################################################################
 # Write a file with GCPs.
 
@@ -222,8 +214,6 @@ def test_tiff_write_5():
 
     gdaltest.tiff_drv.Delete('tmp/test_5.tif')
 
-    return 'success'
-
 ###############################################################################
 # Test a mixture of reading and writing on a DEFLATE compressed file.
 # May crash with libtiff <= 3.8.2, so skip it if BigTIFF is not supported
@@ -259,8 +249,6 @@ def test_tiff_write_6():
     gdaltest.tiff_write_6_failed = False
     gdaltest.tiff_drv.Delete('tmp/test_6.tif')
 
-    return 'success'
-
 ###############################################################################
 # Test a mixture of reading and writing on a LZW compressed file.
 # Will cause older libtiff versions (<=3.8.2 for sure) to crash, so skip it
@@ -292,8 +280,6 @@ def test_tiff_write_7():
 
     gdaltest.tiff_drv.Delete('tmp/test_7.tif')
 
-    return 'success'
-
 ###############################################################################
 # Test a mixture of reading and writing on a PACKBITS compressed file.
 
@@ -320,8 +306,6 @@ def test_tiff_write_8():
 
     gdaltest.tiff_drv.Delete('tmp/test_8.tif')
 
-    return 'success'
-
 ###############################################################################
 # Create a simple file by copying from an existing one.
 
@@ -343,8 +327,6 @@ def test_tiff_write_9():
 
     gdaltest.tiff_drv.Delete('tmp/test_9.tif')
 
-    return 'success'
-
 ###############################################################################
 # 1bit file but with band interleaving, and odd size (not multiple of 8) #1957
 
@@ -379,8 +361,6 @@ def test_tiff_write_12():
     cs = ds.GetRasterBand(3).Checksum()
     assert cs == 31952 or cs == 30145
 
-    return 'success'
-
 ###############################################################################
 # Write JPEG Compressed YCbCr subsampled image.
 
@@ -411,8 +391,7 @@ def test_tiff_write_13():
     if md['LIBTIFF'] == 'INTERNAL':
         assert size <= 22816, 'fail: bad size'
 
-    return 'success'
-
+    
 ###############################################################################
 # Test creating an in memory copy.
 
@@ -464,8 +443,6 @@ def test_tiff_write_15():
 
     gdaltest.tiff_drv.Delete('tmp/tw_15.tif')
 
-    return 'success'
-
 ###############################################################################
 # Test that we can restrict metadata and georeferencing in the output
 # file using the PROFILE creation option with Create()
@@ -521,8 +498,6 @@ def test_tiff_write_16():
 
     gdaltest.tiff_drv.Delete('tmp/tw_16.tif')
 
-    return 'success'
-
 ###############################################################################
 # Test writing a TIFF with an RPC tag.
 
@@ -579,8 +554,6 @@ def test_tiff_write_17():
 
     gdaltest.tiff_drv.Delete(tmpfilename)
 
-    return 'success'
-
 ###############################################################################
 # Test that above test still work with the optimization in the GDAL_DISABLE_READDIR_ON_OPEN
 # case (#3996)
@@ -655,8 +628,6 @@ def test_tiff_write_18():
 
     gdaltest.tiff_drv.Delete('tmp/tw_18.tif')
 
-    return 'success'
-
 ###############################################################################
 # Test that above test still work with the optimization in the GDAL_DISABLE_READDIR_ON_OPEN
 # case (#3996)
@@ -728,8 +699,7 @@ def test_tiff_write_rpc_txt():
     except IOError:
         pass
 
-    return 'success'
-
+    
 ###############################################################################
 # Test writing a TIFF with an RPC in .aux.xml
 
@@ -766,8 +736,6 @@ def test_tiff_write_rpc_in_pam():
     ds = None
 
     gdaltest.tiff_drv.Delete('tmp/tiff_write_rpc_in_pam.tif')
-
-    return 'success'
 ###############################################################################
 # Test the write of a pixel-interleaved image with NBITS = 7
 
@@ -794,8 +762,6 @@ def test_tiff_write_19():
 
     gdaltest.tiff_drv.Delete('tmp/contig_strip_7.tif')
 
-    return 'success'
-
 ###############################################################################
 # Test write and read of some TIFF tags
 # Expected to fail (properly) with older libtiff versions (<=3.8.2 for sure)
@@ -874,8 +840,6 @@ def test_tiff_write_20():
 
     gdaltest.tiff_drv.Delete('tmp/tags.tif')
 
-    return 'success'
-
 ###############################################################################
 # Test RGBA images with TIFFTAG_EXTRASAMPLES=EXTRASAMPLE_ASSOCALPHA
 
@@ -899,8 +863,6 @@ def test_tiff_write_21():
 
     gdaltest.tiff_drv.Delete('tmp/stefan_full_rgba.tif')
 
-    return 'success'
-
 ###############################################################################
 # Test RGBA images with TIFFTAG_EXTRASAMPLES=EXTRASAMPLE_UNSPECIFIED
 
@@ -924,8 +886,6 @@ def test_tiff_write_22():
 
     gdaltest.tiff_drv.Delete('tmp/stefan_full_rgba_photometric_rgb.tif')
 
-    return 'success'
-
 ###############################################################################
 # Test grey+alpha images with ALPHA=YES
 
@@ -949,8 +909,6 @@ def test_tiff_write_23():
 
     gdaltest.tiff_drv.Delete('tmp/stefan_full_greyalpha.tif')
 
-    return 'success'
-
 ###############################################################################
 # Test grey+alpha images without ALPHA=YES
 
@@ -974,8 +932,6 @@ def test_tiff_write_24():
 
     gdaltest.tiff_drv.Delete('tmp/stefan_full_greyunspecified.tif')
 
-    return 'success'
-
 ###############################################################################
 # Read a CIELAB image to test the RGBA image TIFF interface
 
@@ -994,8 +950,6 @@ def test_tiff_write_25():
     assert src_ds.GetRasterBand(4).GetRasterColorInterpretation() == gdal.GCI_AlphaBand
     src_ds = None
 
-    return 'success'
-
 
 ###############################################################################
 # Test color table in a 8 bit image
@@ -1029,8 +983,6 @@ def test_tiff_write_26():
 
     gdaltest.tiff_drv.Delete('tmp/ct8.tif')
 
-    return 'success'
-
 ###############################################################################
 # Test color table in a 16 bit image
 
@@ -1070,8 +1022,6 @@ def test_tiff_write_27():
     gdaltest.tiff_drv.Delete('tmp/ct16.tif')
     gdaltest.tiff_drv.Delete('tmp/ct16_copy.tif')
 
-    return 'success'
-
 ###############################################################################
 # Test SetRasterColorInterpretation on a 2 channel image
 
@@ -1095,8 +1045,6 @@ def test_tiff_write_28():
 
     gdaltest.tiff_drv.Delete('tmp/greyalpha.tif')
 
-    return 'success'
-
 ###############################################################################
 # Test SetRasterColorInterpretation on a 4 channel image
 
@@ -1147,8 +1095,6 @@ def test_tiff_write_29():
     gdaltest.tiff_drv.Delete('/vsimem/rgb_no_alpha.tif')
     gdaltest.tiff_drv.Delete('/vsimem/rgb_added_alpha.tif')
 
-    return 'success'
-
 
 ###############################################################################
 # Create a BigTIFF image with BigTIFF=YES
@@ -1177,8 +1123,6 @@ def test_tiff_write_30():
     assert (not ((binvalues[2] != 0x2B or binvalues[3] != 0) and
             (binvalues[3] != 0x2B or binvalues[2] != 0)))
 
-    return 'success'
-
 ###############################################################################
 # Create a BigTIFF image implicitly (more than 4Gb).
 
@@ -1208,8 +1152,6 @@ def test_tiff_write_31():
     assert (not ((binvalues[2] != 0x2B or binvalues[3] != 0) and
             (binvalues[3] != 0x2B or binvalues[2] != 0)))
 
-    return 'success'
-
 ###############################################################################
 # Create a rotated image
 
@@ -1248,8 +1190,6 @@ def test_tiff_write_32():
     gdaltest.tiff_drv.Delete('tmp/byte_rotated.tif')
     gdaltest.tiff_drv.Delete('tmp/byte_rotated_copy.tif')
 
-    return 'success'
-
 ###############################################################################
 # Test that metadata is written in .aux.xml file in GeoTIFF profile with CreateCopy
 # (BASELINE is tested by tiff_write_15)
@@ -1295,8 +1235,6 @@ def test_tiff_write_33():
 
     gdaltest.tiff_drv.Delete('tmp/tw_33.tif')
 
-    return 'success'
-
 ###############################################################################
 # Test that metadata is written in .aux.xml file in GeoTIFF profile with Create
 # (BASELINE is tested by tiff_write_16)
@@ -1341,8 +1279,6 @@ def test_tiff_write_34():
 
     gdaltest.tiff_drv.Delete('tmp/tw_34.tif')
 
-    return 'success'
-
 ###############################################################################
 # Test fallback from internal storage of Geotiff metadata to PAM storage
 # when metadata is too big to fit into the GDALGeotiff tag
@@ -1397,8 +1333,6 @@ def test_tiff_write_35():
 
     gdaltest.tiff_drv.Delete('tmp/tw_35.tif')
 
-    return 'success'
-
 ###############################################################################
 # Generic functions for the 8 following tests
 
@@ -1432,8 +1366,6 @@ def tiff_write_big_odd_bits(vrtfilename, tmpfilename, nbits, interleaving):
 
     gdaltest.tiff_drv.Delete(tmpfilename)
 
-    return 'success'
-
 
 ###############################################################################
 # Test copy with NBITS=9, INTERLEAVE=PIXEL
@@ -1519,8 +1451,6 @@ def test_tiff_write_44():
     gdaltest.tiff_drv.Delete('tmp/tw_44.tif')
     gdaltest.tiff_drv.Delete('tmp/tw_44_copy.tif')
 
-    return 'success'
-
 ###############################################################################
 # Test create with NBITS=17 and preservation through CreateCopy of NBITS
 
@@ -1550,8 +1480,6 @@ def test_tiff_write_45():
     gdaltest.tiff_drv.Delete('tmp/tw_45.tif')
     gdaltest.tiff_drv.Delete('tmp/tw_45_copy.tif')
 
-    return 'success'
-
 
 ###############################################################################
 # Test correct round-tripping of ReadBlock/WriteBlock
@@ -1593,8 +1521,6 @@ def test_tiff_write_46():
     gdaltest.tiff_drv.Delete('tmp/tiff_write_46_2.tif')
     gdaltest.tiff_drv.Delete('tmp/tiff_write_46_3.tif')
 
-    return 'success'
-
 ###############################################################################
 # Test #2457
 
@@ -1629,8 +1555,6 @@ def test_tiff_write_48():
 
     gdaltest.tiff_drv.Delete('tmp/tiff_write_48.tif')
 
-    return 'success'
-
 
 ###############################################################################
 # Test copying a CMYK TIFF into another CMYK TIFF
@@ -1659,8 +1583,6 @@ def test_tiff_write_49():
 
     gdaltest.tiff_drv.Delete('tmp/tiff_write_49.tif')
 
-    return 'success'
-
 
 ###############################################################################
 # Test creating a CMYK TIFF from another CMYK TIFF
@@ -1691,8 +1613,6 @@ def test_tiff_write_50():
 
     gdaltest.tiff_drv.Delete('tmp/tiff_write_50.tif')
 
-    return 'success'
-
 
 ###############################################################################
 # Test proper clearing of existing GeoTIFF tags when updating the projection.
@@ -1733,8 +1653,6 @@ def test_tiff_write_51():
     gdaltest.tiff_drv.Delete('tmp/tiff_write_51.tif')
     gdaltest.tiff_drv.Delete('tmp/tiff_write_51_ref.tif')
 
-    return 'success'
-
 ###############################################################################
 # Test the ability to update a paletted TIFF files color table.
 
@@ -1762,8 +1680,6 @@ def test_tiff_write_52():
 
     gdaltest.tiff_drv.Delete('tmp/tiff_write_52.tif')
 
-    return 'success'
-
 ###############################################################################
 # Test the ability to create a paletted image and then update later.
 
@@ -1795,8 +1711,6 @@ def test_tiff_write_53():
 
     gdaltest.tiff_drv.Delete('tmp/tiff_write_53.tif')
 
-    return 'success'
-
 
 ###############################################################################
 # Same as before except we create an overview before reopening the file and
@@ -1830,8 +1744,6 @@ def test_tiff_write_53_bis():
 
     gdaltest.tiff_drv.Delete('tmp/tiff_write_53_bis.tif')
 
-    return 'success'
-
 ###############################################################################
 # Test the ability to create a JPEG compressed TIFF, with PHOTOMETRIC=YCBCR
 # and write data into it without closing it and re-opening it (#2645)
@@ -1858,8 +1770,6 @@ def test_tiff_write_54():
 
     assert cs != 0, 'did not get expected checksum'
 
-    return 'success'
-
 
 ###############################################################################
 # Test creating and reading an equirectangular file with all parameters (#2706)
@@ -1884,8 +1794,6 @@ def test_tiff_write_55():
 
     gdaltest.tiff_drv.Delete('tmp/tiff_write_55.tif')
 
-    return 'success'
-
 ###############################################################################
 # Test clearing the colormap from an existing paletted TIFF file.
 
@@ -1925,8 +1833,6 @@ def test_tiff_write_56():
 
     gdaltest.tiff_drv.Delete('tmp/tiff_write_56.tif')
 
-    return 'success'
-
 ###############################################################################
 # Test replacing normal norm up georef with rotated georef (#2625)
 
@@ -1956,8 +1862,6 @@ def test_tiff_write_57():
 
     gdaltest.tiff_drv.Delete('tmp/tiff57.tif')
 
-    return 'success'
-
 ###############################################################################
 # Test writing partial end strips (#2748)
 
@@ -1981,8 +1885,7 @@ def test_tiff_write_58():
         else:
             print(('Skipping compression method %s' % compression))
 
-    return 'success'
-
+    
 ###############################################################################
 # Test fix for #2759
 
@@ -2085,8 +1988,7 @@ def test_tiff_write_60():
         except OSError:
             pass
 
-    return 'success'
-
+    
 ###############################################################################
 # Test BigTIFF=IF_NEEDED creation option
 
@@ -2116,8 +2018,6 @@ def test_tiff_write_61():
     assert (not ((binvalues[2] != 0x2A or binvalues[3] != 0) and
             (binvalues[3] != 0x2A or binvalues[2] != 0)))
 
-    return 'success'
-
 ###############################################################################
 # Test BigTIFF=IF_SAFER creation option
 
@@ -2147,8 +2047,6 @@ def test_tiff_write_62():
     assert (not ((binvalues[2] != 0x2B or binvalues[3] != 0) and
             (binvalues[3] != 0x2B or binvalues[2] != 0)))
 
-    return 'success'
-
 ###############################################################################
 # Test BigTIFF=NO creation option when creating a BigTIFF file would be required
 
@@ -2167,7 +2065,7 @@ def test_tiff_write_63():
     gdal.PopErrorHandler()
 
     if ds is None:
-        return 'success'
+        return
 
     pytest.fail()
 
@@ -2193,8 +2091,6 @@ def test_tiff_write_64():
 
     gdaltest.tiff_drv.Delete('tmp/tiff_write_64.tif')
 
-    return 'success'
-
 ###############################################################################
 # Verify that we can write XML metadata.
 
@@ -2216,8 +2112,6 @@ def test_tiff_write_65():
 
     gdaltest.tiff_drv.Delete('tmp/tiff_write_65.tif')
 
-    return 'success'
-
 
 ###############################################################################
 # Verify that we can write and read a band-interleaved GeoTIFF with 65535 bands (#2838)
@@ -2241,8 +2135,6 @@ def test_tiff_write_66():
 
     gdaltest.tiff_drv.Delete('tmp/tiff_write_66.tif')
 
-    return 'success'
-
 
 ###############################################################################
 # Verify that we can write and read a pixel-interleaved GeoTIFF with 65535 bands (#2838)
@@ -2266,8 +2158,6 @@ def test_tiff_write_67():
 
     gdaltest.tiff_drv.Delete('tmp/tiff_write_67.tif')
 
-    return 'success'
-
 ###############################################################################
 # Verify that we can set the color table after a Create() (scenario hit by map.tif in #2820)
 
@@ -2290,8 +2180,6 @@ def test_tiff_write_68():
 
     gdaltest.tiff_drv.Delete('tmp/tiff_write_68.tif')
 
-    return 'success'
-
 ###############################################################################
 # Verify GTiffRasterBand::NullBlock() when reading empty block without any nodata value set
 
@@ -2307,8 +2195,6 @@ def test_tiff_write_69():
 
     gdaltest.tiff_drv.Delete('tmp/tiff_write_69.tif')
 
-    return 'success'
-
 ###############################################################################
 # Verify GTiffRasterBand::NullBlock() when reading empty block with nodata value set
 
@@ -2355,8 +2241,6 @@ def test_tiff_write_70():
     gdaltest.tiff_drv.Delete('tmp/tiff_write_70.tif')
     gdaltest.tiff_drv.Delete('tmp/tiff_write_70_ref.tif')
 
-    return 'success'
-
 
 ###############################################################################
 # Test reading in a real BigTIFF file (on filesystems supporting sparse files)
@@ -2402,8 +2286,6 @@ def test_tiff_write_71():
 
     gdaltest.tiff_drv.Delete('tmp/tiff_write_71.tif')
 
-    return 'success'
-
 ###############################################################################
 # With CreateCopy(), check that TIFF directory is in the first bytes of the file
 # and has not been rewritten later (#3021)
@@ -2438,8 +2320,6 @@ def test_tiff_write_72():
     gdaltest.tiff_drv.Delete('tmp/byte.tif')
     gdaltest.tiff_drv.Delete('tmp/tiff_write_72.tif')
 
-    return 'success'
-
 ###############################################################################
 # With Create(), check that TIFF directory is in the first bytes of the file
 # and has not been rewritten later (#3021)
@@ -2488,8 +2368,6 @@ def test_tiff_write_73():
 
     gdaltest.tiff_drv.Delete('tmp/tiff_write_73.tif')
 
-    return 'success'
-
 ###############################################################################
 # Verify we can write 12bit jpeg encoded tiff.
 
@@ -2560,8 +2438,7 @@ def test_tiff_write_74():
 
         gdaltest.tiff_drv.Delete('tmp/test_74.tif')
 
-    return 'success'
-
+    
 ###############################################################################
 # Verify that FlushCache() alone doesn't cause crash (#3067 )
 
@@ -2574,8 +2451,6 @@ def test_tiff_write_75():
 
     gdaltest.tiff_drv.Delete('tmp/tiff_write_75.tif')
 
-    return 'success'
-
 ###############################################################################
 # Test generating a G4 band to use the TIFFWriteScanline()
 
@@ -2596,8 +2471,6 @@ def test_tiff_write_76():
 
     gdaltest.tiff_drv.Delete('tmp/tiff_write_76.tif')
 
-    return 'success'
-
 ###############################################################################
 # Test generating & reading a 8bit all-in-one-strip multiband TIFF (#3904)
 
@@ -2643,8 +2516,6 @@ def test_tiff_write_77():
     src_ds = None
     gdaltest.tiff_drv.Delete('tmp/tiff_write_77_src.tif')
 
-    return 'success'
-
 ###############################################################################
 # Test generating & reading a YCbCr JPEG all-in-one-strip multiband TIFF (#3259)
 
@@ -2707,8 +2578,6 @@ def test_tiff_write_78():
     src_ds = None
     gdaltest.tiff_drv.Delete('tmp/tiff_write_78_src.tif')
 
-    return 'success'
-
 ###############################################################################
 # Test reading & updating GDALMD_AREA_OR_POINT (#3522)
 
@@ -2803,8 +2672,6 @@ def test_tiff_write_79():
 
     gdaltest.tiff_drv.Delete('tmp/tiff_write_79.tif')
 
-    return 'success'
-
 ###############################################################################
 # Test SetOffset() & SetScale()
 
@@ -2903,8 +2770,6 @@ def test_tiff_write_80():
 
     gdaltest.tiff_drv.Delete('tmp/tiff_write_80_bis.tif')
 
-    return 'success'
-
 ###############################################################################
 # Test retrieving GCP from PAM
 
@@ -2936,8 +2801,6 @@ def test_tiff_write_81():
 
     gdaltest.tiff_drv.Delete('tmp/tiff_write_81.tif')
 
-    return 'success'
-
 ###############################################################################
 # Test writing & reading a signedbyte 8 bit geotiff
 
@@ -2956,8 +2819,6 @@ def test_tiff_write_82():
 
     gdaltest.tiff_drv.Delete('tmp/tiff_write_82.tif')
 
-    return 'success'
-
 
 ###############################################################################
 # Test writing & reading an indexed GeoTIFF with an extra transparency band (#3547)
@@ -2993,8 +2854,6 @@ def test_tiff_write_83():
     gdaltest.tiff_drv.Delete('tmp/tiff_write_83.tif')
     gdaltest.tiff_drv.Delete('tmp/tiff_write_83_2.tif')
 
-    return 'success'
-
 ###############################################################################
 # Test propagation of non-standard JPEG quality when the current directory
 # changes in the midst of encoding of tiles (#3539)
@@ -3033,8 +2892,6 @@ def test_tiff_write_84():
 
     assert cs == 0, 'did not get expected checksum'
 
-    return 'success'
-
 ###############################################################################
 # Test SetUnitType()
 
@@ -3120,8 +2977,6 @@ def test_tiff_write_85():
 
     gdaltest.tiff_drv.Delete('tmp/tiff_write_85_bis.tif')
 
-    return 'success'
-
 ###############################################################################
 # Test special handling of xml:ESRI domain.  When the ESRI_XML_PAM config
 # option is set we want to write this to PAM, not into the geotiff itself.
@@ -3205,8 +3060,6 @@ def test_tiff_write_86():
     gdaltest.tiff_drv.Delete('tmp/tiff_write_86.tif')
     gdaltest.tiff_drv.Delete('tmp/tiff_write_86_cc.tif')
 
-    return 'success'
-
 
 ###############################################################################
 # Test COPY_SRC_OVERVIEWS creation option
@@ -3254,8 +3107,6 @@ def test_tiff_write_87():
 
     assert ifd_main == 8 or(ifd_main < ifd_ovr_0 and ifd_ovr_0 < ifd_ovr_1 and ifd_ovr_1 < data_ovr_1 and data_ovr_1 < data_ovr_0 and data_ovr_0 < data_main)
 
-    return 'success'
-
 ###############################################################################
 # Test that COPY_SRC_OVERVIEWS creation option has an influence
 # on BIGTIFF creation
@@ -3313,8 +3164,6 @@ def test_tiff_write_88():
     assert ar[4] == 8 and ar[5] == 0 and ar[6] == 0 and ar[7] == 0, \
         'first IFD is not at offset 8'
 
-    return 'success'
-
 ###############################################################################
 # Test JPEG_QUALITY propagation while creating a (default compressed) mask band
 
@@ -3367,8 +3216,6 @@ def test_tiff_write_89():
 
     gdaltest.tiff_drv.Delete('tmp/tiff_write_89.tif')
 
-    return 'success'
-
 ###############################################################################
 # Test JPEG_QUALITY propagation while creating (internal) overviews
 
@@ -3411,8 +3258,6 @@ def test_tiff_write_90():
 
     gdaltest.tiff_drv.Delete('tmp/tiff_write_90.tif')
 
-    return 'success'
-
 
 ###############################################################################
 # Test JPEG_QUALITY propagation while creating (internal) overviews after re-opening
@@ -3460,8 +3305,6 @@ def test_tiff_write_91():
 
     gdaltest.tiff_drv.Delete('tmp/tiff_write_91.tif')
 
-    return 'success'
-
 
 ###############################################################################
 # Test the effect of JPEG_QUALITY_OVERVIEW while creating (internal) overviews after re-opening
@@ -3514,8 +3357,6 @@ def test_tiff_write_92():
 
     gdaltest.tiff_drv.Delete('tmp/tiff_write_92.tif')
 
-    return 'success'
-
 ###############################################################################
 # Test JPEG_QUALITY_OVERVIEW propagation while creating external overviews
 
@@ -3575,8 +3416,6 @@ def test_tiff_write_93():
 
     gdaltest.tiff_drv.Delete('tmp/tiff_write_93.tif')
 
-    return 'success'
-
 
 ###############################################################################
 # Test CreateCopy() of a dataset with a mask into a JPEG compressed dataset
@@ -3613,8 +3452,6 @@ def test_tiff_write_94():
 
     assert cs == 3, 'wrong checksum'
 
-    return 'success'
-
 ###############################################################################
 # Test that COPY_SRC_OVERVIEWS deal well with rounding issues when computing
 # overview levels from the overview size
@@ -3636,8 +3473,6 @@ def test_tiff_write_95():
 
     assert ok
 
-    return 'success'
-
 ###############################################################################
 # Test that COPY_SRC_OVERVIEWS combined with GDAL_TIFF_INTERNAL_MASK=YES work well
 
@@ -3683,8 +3518,6 @@ def test_tiff_write_96():
        [cs, cs_mask, cs_ovr_1, cs_ovr_mask_1, cs_ovr_2, cs_ovr_mask_2], \
         'did not get expected checksums'
 
-    return 'success'
-
 ###############################################################################
 # Create a simple file by copying from an existing one - PixelIsPoint
 
@@ -3746,8 +3579,6 @@ def test_tiff_write_97():
 
     gdaltest.tiff_drv.Delete('tmp/test_97_2.tif')
 
-    return 'success'
-
 ###############################################################################
 # Create a rotated geotiff file (uses a geomatrix) with - PixelIsPoint
 
@@ -3790,8 +3621,6 @@ def test_tiff_write_98():
 
     gdaltest.tiff_drv.Delete('tmp/test_98.tif')
 
-    return 'success'
-
 ###############################################################################
 # Create copy into a RGB JPEG-IN-TIFF (#3887)
 
@@ -3813,8 +3642,6 @@ def test_tiff_write_99():
 
     assert (cs1, cs2, cs3) == (21629, 21651, 21371), ('%d,%d,%d' % (cs1, cs2, cs3))
 
-    return 'success'
-
 ###############################################################################
 # Create copy into a 2 band JPEG-IN-TIFF (#3887)
 
@@ -3837,8 +3664,6 @@ def test_tiff_write_100():
 
     assert (cs1, cs2) == (3118, 0), ('%d,%d' % (cs1, cs2))
 
-    return 'success'
-
 ###############################################################################
 # Test CHUNKY_STRIP_READ_SUPPORT (#3894)
 # We use random data so the compressed files are big enough to need partial
@@ -3916,8 +3741,6 @@ def test_tiff_write_101():
     src_ds = None
     gdaltest.tiff_drv.Delete('tmp/tiff_write_101.bin')
 
-    return 'success'
-
 ###############################################################################
 # Test writing and reading back COMPD_CS
 
@@ -3955,8 +3778,7 @@ def test_tiff_write_102():
         print(wkt2)
         pytest.fail('dit not get expected COMPD_CS name')
 
-    return 'success'
-
+    
 ###############################################################################
 # Test -co COPY_SRC_OVERVIEWS=YES on a multiband source with external overviews (#3938)
 
@@ -3982,8 +3804,6 @@ def test_tiff_write_103():
 
     assert src_cs == dst_cs, 'did not get expected checksum'
 
-    return 'success'
-
 
 ###############################################################################
 # Confirm as best we can that we can write geotiff files with detailed
@@ -4007,8 +3827,6 @@ def test_tiff_write_104():
 
     gdaltest.tiff_drv.Delete('tmp/test_104.tif')
 
-    return 'success'
-
 ###############################################################################
 # Confirm as best we can that we can write geotiff files with detailed
 # projection parameters with the correct linear units set.  (#3901)
@@ -4039,8 +3857,6 @@ def test_tiff_write_105():
 
     gdaltest.tiff_drv.Delete('tmp/bug4468.tif')
 
-    return 'success'
-
 ###############################################################################
 # Test the direct copy mechanism of JPEG source
 
@@ -4078,8 +3894,7 @@ def test_tiff_write_106(filename='../gdrivers/data/byte_with_xmp.jpg', options=N
         for i in range(nbands):
             assert cs[i] != 0, 'did not get expected checksum'
 
-    return 'success'
-
+    
 
 def test_tiff_write_107():
     return test_tiff_write_106(options=['COMPRESS=JPEG', 'BLOCKYSIZE=8'])
@@ -4180,8 +3995,6 @@ def test_tiff_write_115():
     ds = None
     gdal.Unlink(tmpfilename)
 
-    return 'success'
-
 ###############################################################################
 # Test writing a band interleaved RGBA JPEG-compressed TIFF
 
@@ -4228,8 +4041,6 @@ def test_tiff_write_116():
     ds = None
     gdal.Unlink(tmpfilename)
 
-    return 'success'
-
 ###############################################################################
 # Test bugfix for ticket #4771 (rewriting of a deflate compressed tile, libtiff bug)
 
@@ -4280,8 +4091,6 @@ def test_tiff_write_117():
     assert data is not None, \
         'if GDAL is configured with external libtiff 4.x, it can fail if it is older than 4.0.3. With internal libtiff, should not fail'
 
-    return 'success'
-
 ###############################################################################
 # Test bugfix for ticket #4816
 
@@ -4301,8 +4110,6 @@ def test_tiff_write_118():
 
     assert not md
 
-    return 'success'
-
 ###############################################################################
 # Test bugfix for ticket #4816
 
@@ -4321,8 +4128,6 @@ def test_tiff_write_119():
 
     assert md['foo'] == 'bar'
 
-    return 'success'
-
 ###############################################################################
 # Test bugfix for ticket #4816
 
@@ -4342,8 +4147,6 @@ def test_tiff_write_120():
     assert len(md) == 1
     assert md[0] == '<foo/>'
 
-    return 'success'
-
 ###############################################################################
 # Test error cases of COPY_SRC_OVERVIEWS creation option
 
@@ -4423,8 +4226,6 @@ def test_tiff_write_121():
     assert ds is None
     src_ds = None
 
-    return 'success'
-
 ###############################################################################
 # Test write and read of some TIFFTAG_RESOLUTIONUNIT tags where '*'/'' is
 # specified (gdalwarp conflicts)
@@ -4454,8 +4255,6 @@ def test_tiff_write_122():
 
     gdaltest.tiff_drv.Delete('tmp/tags122.tif')
 
-    return 'success'
-
 ###############################################################################
 # Test implicit photometric interpretation
 
@@ -4628,8 +4427,6 @@ def test_tiff_write_123():
     ds = None
     gdaltest.tiff_drv.Delete('/vsimem/tiff_write_123_rgba_to_undefined.tif')
 
-    return 'success'
-
 ###############################################################################
 # Test error cases with palette creation
 
@@ -4668,8 +4465,6 @@ def test_tiff_write_124():
 
     gdaltest.tiff_drv.Delete('/vsimem/tiff_write_124.tif')
 
-    return 'success'
-
 ###############################################################################
 # Test out-of-memory conditions with SplitBand and SplitBitmapBand
 
@@ -4701,8 +4496,6 @@ def test_tiff_write_125():
 
     gdal.Unlink('/vsimem/tiff_write_125.tif')
 
-    return 'success'
-
 ###############################################################################
 # Test implicit JPEG-in-TIFF overviews
 
@@ -4807,7 +4600,7 @@ def test_tiff_write_126():
     # We need libtiff 4.0.4 (unreleased at that time)
     if md['LIBTIFF'] != 'INTERNAL':
         print('skipping tests that will fail without internal libtiff')
-        return 'success'
+        return
 
     # Test with completely sparse file
     ds = gdaltest.tiff_drv.Create('/vsimem/tiff_write_126.tif', 1024, 1024, options=['COMPRESS=JPEG', 'SPARSE_OK=YES'])
@@ -4833,8 +4626,6 @@ def test_tiff_write_126():
     ds = None
     gdaltest.tiff_drv.Delete('/vsimem/tiff_write_126.tif')
 
-    return 'success'
-
 ###############################################################################
 # Test setting/unsetting metadata in update mode (#5628)
 
@@ -4888,8 +4679,6 @@ def test_tiff_write_127():
 
     gdaltest.tiff_drv.Delete('/vsimem/tiff_write_127.tif')
 
-    return 'success'
-
 ###############################################################################
 # Test lossless copying of a CMYK JPEG into JPEG-in-TIFF (#5712)
 
@@ -4953,8 +4742,6 @@ def test_tiff_write_128():
 
     gdaltest.tiff_drv.Delete('/vsimem/tiff_write_128.tif')
 
-    return 'success'
-
 ###############################################################################
 # Check effective guessing of existing JPEG quality
 
@@ -4997,8 +4784,7 @@ def test_tiff_write_129():
                     print(i)
                     pytest.fail(jpegtablesmode)
 
-    return 'success'
-
+    
 ###############################################################################
 # Test cases where JPEG quality will fail
 
@@ -5035,8 +4821,6 @@ def test_tiff_write_130():
     ds = None
     os.unlink('tmp/byte_jpg_tablesmodezero.tif')
 
-    return 'success'
-
 ###############################################################################
 # Test LZMA compression
 
@@ -5065,8 +4849,6 @@ def test_tiff_write_131(level=1):
 
     gdal.Unlink(filename)
 
-    return 'success'
-
 
 def test_tiff_write_131_level_9():
     return test_tiff_write_131(level=9)
@@ -5111,8 +4893,7 @@ def test_tiff_write_132():
 
         gdaltest.tiff_drv.Delete('/vsimem/tiff_write_132.tif')
 
-    return 'success'
-
+    
 ###############################################################################
 # Test streaming capabilities
 
@@ -5332,8 +5113,6 @@ def test_tiff_write_133():
 
     gdaltest.tiff_drv.Delete('/vsimem/tiff_write_133.tif')
 
-    return 'success'
-
 ###############################################################################
 # Test DISCARD_LSB
 
@@ -5381,8 +5160,6 @@ def test_tiff_write_134():
     ds = None
     gdaltest.tiff_drv.Delete('/vsimem/tiff_write_134.tif')
 
-    return 'success'
-
 ###############################################################################
 # Test clearing GCPs (#5945)
 
@@ -5439,8 +5216,6 @@ def test_tiff_write_135():
 
     gdal.Unlink('/vsimem/tiff_write_135.tif')
 
-    return 'success'
-
 ###############################################################################
 # Test writing a single-strip mono-bit dataset
 
@@ -5461,8 +5236,6 @@ def test_tiff_write_136():
     gdal.Unlink('/vsimem/tiff_write_136.tif')
     gdal.Unlink('/vsimem/tiff_write_136.tif.aux.xml')
 
-    return 'success'
-
 ###############################################################################
 # Test multi-threaded writing
 
@@ -5530,8 +5303,6 @@ def test_tiff_write_137():
     assert cs == 4672, expected_cs
     gdal.Unlink('/vsimem/tiff_write_137.tif')
 
-    return 'success'
-
 ###############################################################################
 # Test that pixel-interleaved writing generates optimal size
 
@@ -5577,8 +5348,6 @@ def test_tiff_write_138():
     gdal.Unlink('/vsimem/tiff_write_138.tif')
     gdal.Unlink('/vsimem/tiff_write_138_saturate.tif')
 
-    return 'success'
-
 ###############################################################################
 # Test that pixel-interleaved writing generates optimal size
 
@@ -5681,8 +5450,6 @@ def test_tiff_write_139():
 
     gdal.Unlink('/vsimem/tiff_write_139.tif')
 
-    return 'success'
-
 ###############################################################################
 # Test setting a band to alpha
 
@@ -5734,8 +5501,6 @@ def test_tiff_write_140():
 
     gdaltest.tiff_drv.Delete('/vsimem/tiff_write_140.tif')
 
-    return 'success'
-
 ###############################################################################
 # Test GEOTIFF_KEYS_FLAVOR=ESRI_PE with EPSG:3857
 
@@ -5758,8 +5523,6 @@ def test_tiff_write_141():
 
     gdaltest.tiff_drv.Delete('/vsimem/tiff_write_141.tif')
 
-    return 'success'
-
 
 ###############################################################################
 # Test PixelIsPoint without SRS (#6225)
@@ -5788,8 +5551,6 @@ def test_tiff_write_142():
 
     assert md == 'Point', 'did not get expected AREA_OR_POINT value'
 
-    return 'success'
-
 ###############################################################################
 # Check that we detect that free space isn't sufficient
 
@@ -5800,8 +5561,6 @@ def test_tiff_write_143():
         ds = gdaltest.tiff_drv.Create('/vsimem/tiff_write_143.tif', 1000000000, 1000000000)
     assert ds is None
 
-    return 'success'
-
 ###############################################################################
 # Test creating a real BigTIFF file > 4 GB with multiple directories (on filesystems supporting sparse files)
 
@@ -5840,8 +5599,6 @@ def test_tiff_write_144():
 
     assert got_cs == 4873 and got_cs_ovr == 1218
 
-    return 'success'
-
 ###############################################################################
 # Test various warnings / errors of Create()
 
@@ -5897,8 +5654,7 @@ def test_tiff_write_145():
             pytest.fail('did not get any warning/error')
         gdal.Unlink(filename)
 
-    return 'success'
-
+    
 ###############################################################################
 # Test implicit JPEG-in-TIFF overviews with RGBA (not completely sure this
 # is a legal formulation since 4 bands should probably be seen as CMYK)
@@ -5923,8 +5679,7 @@ def test_tiff_write_146():
             assert i == 2 or j < 2 or abs(original_stats[i][j] - got_stats[i][j]) <= 5, \
                 'did not get expected statistics'
 
-    return 'success'
-
+    
 ###############################################################################
 # Test that we don't use implicit JPEG-in-TIFF overviews with CMYK when converting
 # to RGBA
@@ -5946,8 +5701,6 @@ def test_tiff_write_147():
     out_ds = None
     gdal.GetDriverByName('GTiff').Delete('/vsimem/tiff_write_147.tif')
 
-    return 'success'
-
 ###############################################################################
 # Test that we can use implicit JPEG-in-TIFF overviews with CMYK in raw mode
 
@@ -5977,8 +5730,7 @@ def test_tiff_write_148():
             assert j < 2 or abs(original_stats[i][j] - got_stats[i][j]) <= 5, \
                 'did not get expected statistics'
 
-    return 'success'
-
+    
 ###############################################################################
 # Test filling missing blocks with nodata
 
@@ -6029,8 +5781,6 @@ def test_tiff_write_149():
     assert cs == expected_cs
     gdaltest.tiff_drv.Delete('/vsimem/tiff_write_149.tif')
 
-    return 'success'
-
 ###############################################################################
 # Test failure when loading block from disk in IWriteBlock()
 
@@ -6047,8 +5797,6 @@ def test_tiff_write_150():
     ds = None
     gdaltest.tiff_drv.Delete('tmp/tiled_bad_offset.tif')
 
-    return 'success'
-
 ###############################################################################
 # Test IWriteBlock() with more than 10 bands
 
@@ -6072,8 +5820,6 @@ def test_tiff_write_151():
     ds = None
     gdaltest.tiff_drv.Delete('/vsimem/tiff_write_151.tif')
 
-    return 'success'
-
 ###############################################################################
 # Test flushing of blocks in a contig multi band file with Create()
 
@@ -6090,8 +5836,6 @@ def test_tiff_write_152():
     ds = None
     gdaltest.tiff_drv.Delete('/vsimem/tiff_write_152.tif')
 
-    return 'success'
-
 ###############################################################################
 # Test that empty blocks are created in a filesystem sparse way
 
@@ -6113,8 +5857,6 @@ def test_tiff_write_153():
 
     assert ret != gdal.VSI_RANGE_STATUS_DATA
 
-    return 'success'
-
 ###############################################################################
 # Test empty block writing skipping and SPARSE_OK in CreateCopy() and Open()
 
@@ -6222,8 +5964,6 @@ def test_tiff_write_154():
     gdaltest.tiff_drv.Delete('/vsimem/tiff_write_154.tif')
     assert not (offset is None or int(offset) == 0)
 
-    return 'success'
-
 ###############################################################################
 # Test reading and writing band description
 
@@ -6252,8 +5992,6 @@ def test_tiff_write_155():
     ds = None
     gdaltest.tiff_drv.Delete('/vsimem/tiff_write_155.tif')
 
-    return 'success'
-
 ###############################################################################
 # Test GetDataCoverageStatus()
 
@@ -6285,8 +6023,6 @@ def test_tiff_write_156():
     ds = None
     gdaltest.tiff_drv.Delete('/vsimem/tiff_write_156.tif')
 
-    return 'success'
-
 ###############################################################################
 # Test Float16
 
@@ -6411,8 +6147,6 @@ def test_tiff_write_157():
 
     gdaltest.tiff_drv.Delete('/vsimem/tiff_write_157.tif')
 
-    return 'success'
-
 ###############################################################################
 # Test GetActualBlockSize() (perhaps not the best place for that...)
 
@@ -6436,8 +6170,6 @@ def test_tiff_write_158():
 
     gdaltest.tiff_drv.Delete('/vsimem/tiff_write_158.tif')
 
-    return 'success'
-
 ###############################################################################
 # Test that COPY_SRC_OVERVIEWS creation option with JPEG compression
 # result in a https://trac.osgeo.org/gdal/wiki/CloudOptimizedGeoTIFF
@@ -6502,8 +6234,7 @@ def test_tiff_write_159():
 
         gdaltest.tiff_drv.Delete('/vsimem/tiff_write_159.tif')
 
-    return 'success'
-
+    
 
 ###############################################################################
 # Test the Create() interface with a BLOCKYSIZE > image height
@@ -6521,8 +6252,6 @@ def test_tiff_write_160():
 
     gdaltest.tiff_drv.Delete('/vsimem/tiff_write_160.tif')
 
-    return 'success'
-
 ###############################################################################
 # Test setting GCPs on an image with already a geotransform and vice-versa (#6751)
 
@@ -6556,8 +6285,6 @@ def test_tiff_write_161():
 
     gdaltest.tiff_drv.Delete('/vsimem/tiff_write_161.tif')
 
-    return 'success'
-
 ###############################################################################
 # Test creating a JPEG compressed file with big tiles (#6757)
 
@@ -6575,8 +6302,6 @@ def test_tiff_write_162():
 
     gdaltest.tiff_drv.Delete('/vsimem/tiff_write_162.tif')
 
-    return 'success'
-
 ###############################################################################
 # Test creating a file that would trigger strip chopping (#6924)
 
@@ -6599,8 +6324,6 @@ def test_tiff_write_163():
 
     gdaltest.tiff_drv.Delete('/vsimem/tiff_write_163.tif')
 
-    return 'success'
-
 ###############################################################################
 # Test that we handle [0,1,0,0,0,1] geotransform as a regular geotransform
 
@@ -6630,8 +6353,6 @@ def test_tiff_write_164():
 
     gdal.Unlink('/vsimem/test.tif')
 
-    return 'success'
-
 ###############################################################################
 # Test the current behaviour of per-band nodata vs per-dataset serialization
 
@@ -6663,8 +6384,6 @@ def test_tiff_write_165():
 
     gdal.Unlink('/vsimem/test.tif')
 
-    return 'success'
-
 ###############################################################################
 # Test reading & writing Z dimension for ModelTiepointTag and ModelPixelScaleTag (#7093)
 
@@ -6749,8 +6468,6 @@ def test_tiff_write_166():
     ds = None
     gdal.Unlink('/vsimem/tiff_write_166.tif')
 
-    return 'success'
-
 ###############################################################################
 
 
@@ -6784,8 +6501,6 @@ def test_tiff_write_167_deflate_zlevel():
 
     assert size2 == size2_create
 
-    return 'success'
-
 ###############################################################################
 # Test CCITTFAX3
 
@@ -6818,7 +6533,6 @@ def test_tiff_write_170_invalid_compresion():
                                                  options=['COMPRESS=INVALID'])
     assert gdal.GetLastErrorMsg() != ''
     gdal.Unlink('/vsimem/out.tif')
-    return 'success'
 
 ###############################################################################
 # Test ZSTD compression
@@ -6888,8 +6602,6 @@ def test_tiff_write_tiled_webp():
     gdaltest.tiff_drv.Delete(filename)
     gdal.Unlink('data/md_ge_rgb_0010000.tif.aux.xml')
 
-    return 'success'
-
 ###############################################################################
 # Test WEBP compression with huge single strip
 
@@ -6919,8 +6631,6 @@ def test_tiff_write_webp_huge_single_strip():
     gdaltest.tiff_drv.Delete(filename)
     gdal.Unlink('data/tif_webp_huge_single_strip.tif.aux.xml')
 
-    return 'success'
-
 
 ###############################################################################
 # GeoTIFF DGIWG tags
@@ -6946,7 +6656,6 @@ def test_tiff_write_172_geometadata_tiff_rsid():
     ds = None
 
     gdal.Unlink(tmpfilename)
-    return 'success'
 
 ###############################################################################
 # Test LERC compression
@@ -7051,8 +6760,6 @@ def test_tiff_write_177_lerc_several_bands_tiling():
     gdal.Unlink(filename)
     assert cs == [30111, 32302, 40026]
 
-    return 'success'
-
 ###############################################################################
 # Test LERC compression with alpha band
 
@@ -7072,8 +6779,6 @@ def test_tiff_write_178_lerc_with_alpha():
     gdal.Unlink(filename)
     assert cs == [12603, 58561, 36064, 10807]
 
-    return 'success'
-
 ###############################################################################
 # Test LERC compression with alpha band with only 0 and 255
 
@@ -7093,8 +6798,6 @@ def test_tiff_write_178_lerc_with_alpha_0_and_255():
     gdal.Unlink(filename)
     assert cs == [13, 13, 13, 13]
 
-    return 'success'
-
 ###############################################################################
 # Test LERC compression with different data types
 
@@ -7133,8 +6836,6 @@ def test_tiff_write_179_lerc_data_types():
     assert gdal.GetLastErrorMsg() != ''
     gdal.Unlink(filename)
 
-    return 'success'
-
 ###############################################################################
 # Test LERC compression with several bands and separate
 
@@ -7154,8 +6855,6 @@ def test_tiff_write_180_lerc_separate():
     gdal.Unlink(filename)
     assert cs == [30111, 32302, 40026]
 
-    return 'success'
-
 ###############################################################################
 # Test set XMP metadata
 
@@ -7185,8 +6884,6 @@ def test_tiff_write_181_xmp():
 
     gdaltest.tiff_drv.Delete('tmp/test_181.tif')
 
-    return 'success'
-
 ###############################################################################
 # Test delete XMP from a dataset
 
@@ -7209,8 +6906,6 @@ def test_tiff_write_182_xmp_delete():
 
     gdaltest.tiff_drv.Delete('tmp/test_182.tif')
 
-    return 'success'
-
 ###############################################################################
 # Ask to run again tests with GDAL_API_PROXY=YES
 
@@ -7225,16 +6920,12 @@ def tiff_write_api_proxy():
 
     assert ret.find('Failed:    0') != -1
 
-    return 'success'
-
 ###############################################################################
 
 
 def test_tiff_write_cleanup():
     gdaltest.tiff_drv = None
 
-    return 'success'
-
 
 gdaltest_list = [
     test_tiff_write_1,
diff --git a/autotest/gcore/transformer.py b/autotest/gcore/transformer.py
index f2abf4af3e1b..b13b753aa049 100755
--- a/autotest/gcore/transformer.py
+++ b/autotest/gcore/transformer.py
@@ -57,8 +57,6 @@ def test_transformer_1():
     assert success and abs(pnt[0] - 20) <= 0.00000001 and abs(pnt[1] - 10) <= 0.00000001 and pnt[2] == 0.0, \
         'got wrong reverse transform result.'
 
-    return 'success'
-
 ###############################################################################
 # Test GCP based transformer with polynomials.
 
@@ -78,8 +76,6 @@ def test_transformer_2():
     assert success and abs(pnt[0] - 20) <= 0.001 and abs(pnt[1] - 10) <= 0.001 and pnt[2] == 0, \
         'got wrong reverse transform result.'
 
-    return 'success'
-
 ###############################################################################
 # Test GCP based transformer with thin plate splines.
 
@@ -99,8 +95,6 @@ def test_transformer_3():
     assert success and abs(pnt[0] - 20) <= 0.001 and abs(pnt[1] - 10) <= 0.001 and pnt[2] == 0, \
         'got wrong reverse transform result.'
 
-    return 'success'
-
 ###############################################################################
 # Test geolocation based transformer.
 
@@ -120,8 +114,6 @@ def test_transformer_4():
     assert success and abs(pnt[0] - 20.436627518907024) <= 0.001 and abs(pnt[1] - 10.484599774610549) <= 0.001 and pnt[2] == 0, \
         'got wrong reverse transform result.'
 
-    return 'success'
-
 ###############################################################################
 # Test RPC based transformer.
 
@@ -254,8 +246,6 @@ def test_transformer_5():
 
     gdal.Unlink('/vsimem/dem.tif')
 
-    return 'success'
-
 
 ###############################################################################
 # Test RPC convergence bug (bug # 5395)
@@ -270,8 +260,6 @@ def test_transformer_6():
     assert success and abs(pnt[0] - 28.26163232) <= 0.0001 and abs(pnt[1] - -27.79853245) <= 0.0001 and pnt[2] == 0, \
         'got wrong forward transform result.'
 
-    return 'success'
-
 ###############################################################################
 # Test Transformer.TransformPoints
 
@@ -286,8 +274,6 @@ def test_transformer_7():
     assert success[0] != 0 and abs(pnt[0][0] - 441920) <= 0.00000001 and abs(pnt[0][1] - 3750720) <= 0.00000001 and pnt[0][2] == 0.0, \
         'got wrong forward transform result.'
 
-    return 'success'
-
 ###############################################################################
 # Test handling of nodata in RPC DEM (#5680)
 
@@ -323,8 +309,6 @@ def test_transformer_8():
 
     gdal.Unlink('/vsimem/dem.tif')
 
-    return 'success'
-
 ###############################################################################
 # Test RPC DEM line optimization
 
@@ -360,8 +344,6 @@ def test_transformer_9():
 
     gdal.Unlink('/vsimem/dem.tif')
 
-    return 'success'
-
 ###############################################################################
 # Test RPC DEM transform from geoid height to ellipsoidal height
 
@@ -436,8 +418,6 @@ def test_transformer_10():
     gdal.Unlink('/vsimem/dem.tif')
     gdal.Unlink('/vsimem/dem.vrt')
 
-    return 'success'
-
 ###############################################################################
 # Test failed inverse RPC transform (#6162)
 
@@ -472,8 +452,6 @@ def test_transformer_11():
     (success, pnt) = tr.TransformPoint(0, 0, 0, 0)
     assert success and abs(pnt[0] - 77.350939956024618) <= 1e-7 and abs(pnt[1] - 38.739703990877814) <= 1e-7
 
-    return 'success'
-
 ###############################################################################
 # Test degenerate cases of TPS transformer
 
@@ -544,8 +522,6 @@ def test_transformer_12():
         tr = gdal.Transformer(ds, None, ['METHOD=GCP_TPS'])
     assert gdal.GetLastErrorMsg() != ''
 
-    return 'success'
-
 ###############################################################################
 # Test inverse RPC transform at DEM edge (#6377)
 
@@ -575,8 +551,6 @@ def test_transformer_13():
     (success, pnt) = tr.TransformPoint(0, 6600, 24)
     assert success and abs(pnt[0] - -108.00066000065341) <= 1e-7 and abs(pnt[1] - 39.157694013439489) <= 1e-7
 
-    return 'success'
-
 ###############################################################################
 # Test inverse RPC transform when iterations do oscillations (#6377)
 
@@ -630,8 +604,6 @@ def test_transformer_14():
     gdal.Unlink('/vsimem/transformer_14.csvt')
     gdal.Unlink('/vsimem/transformer_14.csv')
 
-    return 'success'
-
 ###############################################################################
 # Test inverse RPC transform with DEM in [-180,180] but guessed longitude going
 # beyond
@@ -707,8 +679,6 @@ def test_transformer_15():
     gdal.Unlink('/vsimem/transformer_15_dem.tif')
     gdal.Unlink('/vsimem/transformer_15_dem.vrt')
 
-    return 'success'
-
 ###############################################################################
 # Test approximate sub-transformers in GenImgProjTransformer
 # (we mostly test that the parameters are well recognized and serialized)
@@ -732,8 +702,6 @@ def test_transformer_16():
     gdal.Unlink('/vsimem/transformer_16.tif')
     gdal.Unlink('/vsimem/transformer_16.vrt')
 
-    return 'success'
-
 
 ###############################################################################
 # Test RPC DEM with unexisting RPC DEM file
@@ -744,7 +712,6 @@ def test_transformer_17():
     with gdaltest.error_handler():
         tr = gdal.Transformer(ds, None, ['METHOD=RPC', 'RPC_DEM=/vsimem/i/donot/exist/dem.tif'])
     assert tr is None
-    return 'success'
 
 
 gdaltest_list = [
diff --git a/autotest/gcore/virtualmem.py b/autotest/gcore/virtualmem.py
index 9558b5168ee1..ddf01dc5eccf 100755
--- a/autotest/gcore/virtualmem.py
+++ b/autotest/gcore/virtualmem.py
@@ -108,8 +108,6 @@ def test_virtualmem_1():
     ar_bsq = None
     ds = None
 
-    return 'success'
-
 ###############################################################################
 # Test write mode
 
@@ -138,8 +136,6 @@ def test_virtualmem_2():
 
     assert cs == 57182
 
-    return 'success'
-
 ###############################################################################
 # Test virtual mem auto with a raw driver
 
@@ -185,8 +181,7 @@ def test_virtualmem_3():
 
         gdal.GetDriverByName('EHdr').Delete(tmpfile)
 
-    return 'success'
-
+    
 ###############################################################################
 # Test virtual mem auto with GTiff
 
@@ -253,8 +248,7 @@ def test_virtualmem_4():
 
         gdal.GetDriverByName('GTiff').Delete(tmpfile)
 
-    return 'success'
-
+    
 
 gdaltest_list = [test_virtualmem_1,
                  test_virtualmem_2,
diff --git a/autotest/gcore/vrt_read.py b/autotest/gcore/vrt_read.py
index 7c739f7c86f0..ab35e42666db 100755
--- a/autotest/gcore/vrt_read.py
+++ b/autotest/gcore/vrt_read.py
@@ -88,7 +88,7 @@ def test_vrt_read_1():
     gdal.PopErrorHandler()
 
     if ds is None:
-        return 'success'
+        return
 
     pytest.fail()
 
@@ -112,7 +112,6 @@ def test_vrt_read_2():
     ds.GetGCPs()
 
     ds = None
-    return 'success'
 
 ###############################################################################
 # Test init of band data in case of cascaded VRT (ticket #2867)
@@ -142,8 +141,6 @@ def test_vrt_read_3():
     driver_tif.Delete('tmp/test_mosaic1.tif')
     driver_tif.Delete('tmp/test_mosaic2.tif')
 
-    return 'success'
-
 
 ###############################################################################
 # Test complex source with complex data (#3977)
@@ -185,8 +182,7 @@ def test_vrt_read_4():
         print('scaleddata[0, 0]: %f %f' % (scaleddata[0, 0].real, scaleddata[0, 0].imag))
         pytest.fail('did not get expected value')
 
-    return 'success'
-
+    
 ###############################################################################
 # Test serializing and deserializing of various band metadata
 
@@ -239,8 +235,6 @@ def test_vrt_read_5():
 
     gdal.Unlink('/vsimem/vrt_read_5.vrt')
 
-    return 'success'
-
 ###############################################################################
 # Test GetMinimum() and GetMaximum()
 
@@ -267,8 +261,6 @@ def test_vrt_read_6():
     gdal.GetDriverByName('GTiff').Delete('/vsimem/vrt_read_6.tif')
     gdal.GetDriverByName('VRT').Delete('/vsimem/vrt_read_6.vrt')
 
-    return 'success'
-
 ###############################################################################
 # Test GDALOpen() anti-recursion mechanism
 
@@ -299,8 +291,6 @@ def test_vrt_read_7():
 
     assert error_msg != ''
 
-    return 'success'
-
 ###############################################################################
 # Test ComputeRasterMinMax()
 
@@ -322,8 +312,6 @@ def test_vrt_read_8():
 
     assert vrt_minmax == mem_minmax
 
-    return 'success'
-
 ###############################################################################
 # Test ComputeStatistics()
 
@@ -345,8 +333,6 @@ def test_vrt_read_9():
 
     assert vrt_stats == mem_stats
 
-    return 'success'
-
 ###############################################################################
 # Test GetHistogram() & GetDefaultHistogram()
 
@@ -425,8 +411,6 @@ def test_vrt_read_10():
     gdal.GetDriverByName('GTiff').Delete('/vsimem/vrt_read_10.tif')
     gdal.GetDriverByName('VRT').Delete('/vsimem/vrt_read_10.vrt')
 
-    return 'success'
-
 ###############################################################################
 # Test resolving files from a symlinked vrt using relativeToVRT with an absolute symlink
 
@@ -450,8 +434,6 @@ def test_vrt_read_11():
 
     assert ds is not None
 
-    return 'success'
-
 ###############################################################################
 # Test resolving files from a symlinked vrt using relativeToVRT
 # with a relative symlink pointing to a relative symlink
@@ -476,8 +458,6 @@ def test_vrt_read_12():
 
     assert ds is not None
 
-    return 'success'
-
 ###############################################################################
 # Test resolving files from a symlinked vrt using relativeToVRT with a relative symlink
 
@@ -508,8 +488,6 @@ def test_vrt_read_13():
 
     assert ds is not None
 
-    return 'success'
-
 ###############################################################################
 # Test ComputeStatistics() when the VRT is a subwindow of the source dataset (#5468)
 
@@ -540,8 +518,6 @@ def test_vrt_read_14():
 
     assert vrt_stats[0] == 115.0 and vrt_stats[1] == 173.0
 
-    return 'success'
-
 ###############################################################################
 # Test RasterIO() with resampling on SimpleSource
 
@@ -570,8 +546,6 @@ def test_vrt_read_15():
     cs = vrt_ds.GetRasterBand(1).Checksum()
     assert cs == 1044
 
-    return 'success'
-
 ###############################################################################
 # Test RasterIO() with resampling on ComplexSource
 
@@ -600,8 +574,6 @@ def test_vrt_read_16():
     cs = vrt_ds.GetRasterBand(1).Checksum()
     assert cs == 1044
 
-    return 'success'
-
 ###############################################################################
 # Test RasterIO() with resampling on AveragedSource
 
@@ -625,8 +597,6 @@ def test_vrt_read_17():
     cs = vrt_ds.GetRasterBand(1).Checksum()
     assert cs == 847
 
-    return 'success'
-
 ###############################################################################
 # Test that relative path is correctly VRT-in-VRT
 
@@ -637,8 +607,6 @@ def test_vrt_read_18():
     cs = vrt_ds.GetRasterBand(1).Checksum()
     assert cs == 4672
 
-    return 'success'
-
 ###############################################################################
 # Test shared="0"
 
@@ -670,8 +638,6 @@ def test_vrt_read_19():
     cs = vrt2_ds.GetRasterBand(1).Checksum()
     assert cs == 4672
 
-    return 'success'
-
 
 ###############################################################################
 # Test 2 level of VRT with shared="0"
@@ -725,8 +691,7 @@ def test_vrt_read_20():
     for f in ['tmp/byte.tif', 'tmp/byte1_1.vrt', 'tmp/byte1_2.vrt', 'tmp/byte1_3.vrt', 'tmp/byte2.vrt']:
         os.unlink(f)
 
-    return 'success'
-
+    
 ###############################################################################
 # Test implicit virtual overviews
 
@@ -815,8 +780,6 @@ def test_vrt_read_21():
     gdal.Unlink('/vsimem/vrt_read_21.vrt.ovr')
     gdal.Unlink('/vsimem/byte.tif')
 
-    return 'success'
-
 ###############################################################################
 # Test that we honour NBITS with SimpleSource and ComplexSource
 
@@ -896,8 +859,6 @@ def test_vrt_read_22():
     gdal.Unlink('/vsimem/byte.tif')
     gdal.Unlink('/vsimem/byte.tif.aux.xml')
 
-    return 'success'
-
 ###############################################################################
 # Test non-nearest resampling on a VRT exposing a nodata value but with
 # an underlying dataset without nodata
@@ -950,8 +911,6 @@ def test_vrt_read_23():
 
     gdal.Unlink('/vsimem/vrt_read_23.tif')
 
-    return 'success'
-
 ###############################################################################
 # Test floating point rounding issues when the VRT does a zoom-in
 
@@ -972,8 +931,6 @@ def test_vrt_read_24():
     assert cs == 46612
     ds = None
 
-    return 'success'
-
 ###############################################################################
 # Test GetDataCoverageStatus()
 
@@ -1019,8 +976,6 @@ def test_vrt_read_25():
     (flags, pct) = ds.GetRasterBand(1).GetDataCoverageStatus(10, 10, 20, 20)
     assert flags == gdal.GDAL_DATA_COVERAGE_STATUS_DATA | gdal.GDAL_DATA_COVERAGE_STATUS_EMPTY and pct == 25.0
 
-    return 'success'
-
 
 ###############################################################################
 # Test consistency of RasterIO() with resampling, that is extracting different
@@ -1048,8 +1003,6 @@ def test_vrt_read_26():
 
     assert partial_data[0] == full_data[22 + 1]
 
-    return 'success'
-
 ###############################################################################
 # Test fix for https://bugs.chromium.org/p/oss-fuzz/issues/detail?id=1553
 
@@ -1058,8 +1011,6 @@ def test_vrt_read_27():
 
     gdal.Open('data/empty_gcplist.vrt')
 
-    return 'success'
-
 ###############################################################################
 # Test fix for https://bugs.chromium.org/p/oss-fuzz/issues/detail?id=1551
 
@@ -1070,8 +1021,6 @@ def test_vrt_read_28():
         ds = gdal.Open('<VRTDataset rasterXSize="1 "rasterYSize="1"><VRTRasterBand band="-2147483648"><SimpleSource></SimpleSource></VRTRasterBand></VRTDataset>')
     assert ds is None
 
-    return 'success'
-
 
 ###############################################################################
 # Check VRT source sharing and non-sharing situations (#6949)
@@ -1131,8 +1080,6 @@ def test_vrt_read_29():
 
     gdal.Unlink('tmp/vrt_read_29.tif')
 
-    return 'success'
-
 ###############################################################################
 # Check VRT reading with DatasetRasterIO
 
@@ -1154,8 +1101,6 @@ def test_vrt_read_30():
         assert got[i] == 0
     ds = None
 
-    return 'success'
-
 ###############################################################################
 # Check that we take into account intermediate data type demotion
 
@@ -1186,8 +1131,6 @@ def test_vrt_read_31():
 
     gdal.Unlink('/vsimem/in.asc')
 
-    return 'success'
-
 
 ###############################################################################
 # Test reading a VRT where the NODATA & NoDataValue are slighly below the
@@ -1220,8 +1163,6 @@ def test_vrt_float32_with_nodata_slightly_below_float_min():
 
     assert stats == [-3.0, 5.0, 1.0, 4.0], 'did not get expected stats'
 
-    return 'success'
-
 
 ###############################################################################
 # Fix issue raised in https://lists.osgeo.org/pipermail/gdal-dev/2018-December/049415.html
@@ -1232,8 +1173,6 @@ def test_vrt_subpixel_offset():
     cs = ds.GetRasterBand(1).Checksum()
     assert cs == 4849
 
-    return 'success'
-
 
 ###############################################################################
 # Check bug fix of bug fix of
@@ -1245,8 +1184,6 @@ def test_vrt_dstsize_larger_than_source():
     cs = ds.GetRasterBand(1).Checksum()
     assert cs == 33273
 
-    return 'success'
-
 
 gdaltest_list = [
     test_vrt_read_1,
diff --git a/autotest/gcore/vrtmisc.py b/autotest/gcore/vrtmisc.py
index 1dfaea02500e..2d859692b715 100755
--- a/autotest/gcore/vrtmisc.py
+++ b/autotest/gcore/vrtmisc.py
@@ -47,8 +47,6 @@ def test_vrtmisc_1():
 
     assert cs == 4323, 'did not get expected checksum'
 
-    return 'success'
-
 ###############################################################################
 # Test power scaling
 
@@ -61,8 +59,6 @@ def test_vrtmisc_2():
 
     assert cs == 4159, 'did not get expected checksum'
 
-    return 'success'
-
 ###############################################################################
 # Test power scaling (not <SrcMin> <SrcMax> in VRT file)
 
@@ -85,8 +81,6 @@ def test_vrtmisc_3():
 
     assert cs == 4159, 'did not get expected checksum'
 
-    return 'success'
-
 ###############################################################################
 # Test multi-band linear scaling with a single -scale occurrence.
 
@@ -102,8 +96,6 @@ def test_vrtmisc_4():
     assert cs1 == 4323, 'did not get expected checksum'
     assert cs2 == 4323, 'did not get expected checksum'
 
-    return 'success'
-
 ###############################################################################
 # Test multi-band linear scaling with -scale_XX syntax
 
@@ -119,8 +111,6 @@ def test_vrtmisc_5():
     assert cs1 == 4672, 'did not get expected checksum'
     assert cs2 == 4323, 'did not get expected checksum'
 
-    return 'success'
-
 ###############################################################################
 # Test multi-band linear scaling with repeated -scale syntax
 
@@ -136,8 +126,6 @@ def test_vrtmisc_6():
     assert cs1 == 4672, 'did not get expected checksum'
     assert cs2 == 4323, 'did not get expected checksum'
 
-    return 'success'
-
 ###############################################################################
 # Test multi-band power scaling with a single -scale and -exponent occurrence.
 
@@ -153,8 +141,6 @@ def test_vrtmisc_7():
     assert cs1 == 4159, 'did not get expected checksum'
     assert cs2 == 4159, 'did not get expected checksum'
 
-    return 'success'
-
 ###############################################################################
 # Test multi-band power scaling with -scale_XX and -exponent_XX syntax
 
@@ -170,8 +156,6 @@ def test_vrtmisc_8():
     assert cs1 == 4672, 'did not get expected checksum'
     assert cs2 == 4159, 'did not get expected checksum'
 
-    return 'success'
-
 ###############################################################################
 # Test multi-band linear scaling with repeated -scale and -exponent syntax
 
@@ -187,8 +171,6 @@ def test_vrtmisc_9():
     assert cs1 == 4672, 'did not get expected checksum'
     assert cs2 == 4159, 'did not get expected checksum'
 
-    return 'success'
-
 ###############################################################################
 # Test metadata serialization (#5944)
 
@@ -239,8 +221,6 @@ def test_vrtmisc_10():
 
     gdal.Unlink("/vsimem/vrtmisc_10.vrt")
 
-    return "success"
-
 ###############################################################################
 # Test relativeToVRT is preserved during re-serialization (#5985)
 
@@ -274,8 +254,6 @@ def test_vrtmisc_11():
 
     assert data.find('<SourceFilename relativeToVRT="1">../data/byte.tif</SourceFilename>') >= 0
 
-    return "success"
-
 ###############################################################################
 # Test set/delete nodata
 
@@ -311,8 +289,6 @@ def test_vrtmisc_12():
 
     gdal.Unlink("/vsimem/vrtmisc_12.vrt")
 
-    return "success"
-
 ###############################################################################
 # Test CreateCopy() preserve NBITS
 
@@ -323,8 +299,6 @@ def test_vrtmisc_13():
     out_ds = gdal.GetDriverByName('VRT').CreateCopy('', ds)
     assert out_ds.GetRasterBand(1).GetMetadataItem('NBITS', 'IMAGE_STRUCTURE') == '1'
 
-    return "success"
-
 ###############################################################################
 # Test SrcRect/DstRect are serialized as integers
 
@@ -357,8 +331,6 @@ def test_vrtmisc_14():
     assert (content.find('<SrcRect xOff="0" yOff="0" xSize="1" ySize="123456789"') >= 0 and \
        content.find('<DstRect xOff="0" yOff="0" xSize="1" ySize="123456789"') >= 0)
 
-    return "success"
-
 ###############################################################################
 # Test CreateCopy() preserve SIGNEDBYTE
 
@@ -371,8 +343,6 @@ def test_vrtmisc_15():
     ds = None
     gdal.Unlink('/vsimem/vrtmisc_15.tif')
 
-    return "success"
-
 ###############################################################################
 # Test rounding to closest int for coordinates
 
@@ -424,8 +394,6 @@ def test_vrtmisc_16():
     gdal.Unlink('/vsimem/vrtmisc_16.tif')
     gdal.Unlink('/vsimem/vrtmisc_16.vrt')
 
-    return "success"
-
 ###############################################################################
 # Check that the serialized xml:VRT doesn't include itself (#6767)
 
@@ -441,8 +409,6 @@ def test_vrtmisc_17():
 
     assert xml_vrt.find('xml:VRT') < 0
 
-    return "success"
-
 ###############################################################################
 # Check GetMetadata('xml:VRT') behaviour on a in-memory VRT copied from a VRT
 
@@ -458,8 +424,6 @@ def test_vrtmisc_18():
     assert (xml_vrt.find('<SourceFilename relativeToVRT="1">data/byte.tif</SourceFilename>') >= 0 or \
        xml_vrt.find('<SourceFilename relativeToVRT="1">data\\byte.tif</SourceFilename>') >= 0)
 
-    return "success"
-
 ###############################################################################
 # Check RAT support
 
@@ -501,8 +465,6 @@ def test_vrtmisc_rat():
     gdal.Unlink('/vsimem/vrtmisc_rat.vrt')
     gdal.Unlink('/vsimem/vrtmisc_rat.tif')
 
-    return "success"
-
 ###############################################################################
 # Check ColorTable support
 
@@ -517,8 +479,6 @@ def test_vrtmisc_colortable():
     ds.GetRasterBand(1).SetColorTable(None)
     assert ds.GetRasterBand(1).GetColorTable() is None
 
-    return 'success'
-
 ###############################################################################
 # Check histogram support
 
@@ -537,15 +497,13 @@ def test_vrtmisc_histogram():
     assert hist == (1.0, 2.0, 2, [3000000000, 4])
 
     gdal.Unlink(tmpfile)
-    return 'success'
 
 ###############################################################################
 # Cleanup.
 
 
 def test_vrtmisc_cleanup():
-    return 'success'
-
+    pass
 
 gdaltest_list = [
     test_vrtmisc_1,
diff --git a/autotest/gcore/vsiaz.py b/autotest/gcore/vsiaz.py
index 9069fd16a020..2bb13ff6ea01 100755
--- a/autotest/gcore/vsiaz.py
+++ b/autotest/gcore/vsiaz.py
@@ -58,8 +58,6 @@ def test_vsiaz_init():
 
     assert gdal.GetSignedURL('/vsiaz/foo/bar') is None
 
-    return 'success'
-
 ###############################################################################
 # Error cases
 
@@ -105,7 +103,7 @@ def test_vsiaz_real_server_errors():
         if f is not None:
             gdal.VSIFCloseL(f)
         if gdal.GetConfigOption('APPVEYOR') is not None:
-            return 'success'
+            return
         pytest.fail(gdal.VSIGetLastErrorMsg())
 
     gdal.ErrorReset()
@@ -113,8 +111,6 @@ def test_vsiaz_real_server_errors():
         f = open_for_read('/vsiaz_streaming/foo/bar.baz')
     assert f is None, gdal.VSIGetLastErrorMsg()
 
-    return 'success'
-
 ###############################################################################
 
 
@@ -136,8 +132,6 @@ def test_vsiaz_start_webserver():
     gdal.SetConfigOption('AZURE_STORAGE_ACCESS_KEY', '')
     gdal.SetConfigOption('CPL_AZURE_TIMESTAMP', 'my_timestamp')
 
-    return 'success'
-
 ###############################################################################
 # Test with a fake Azure Blob server
 
@@ -230,8 +224,7 @@ def method(request):
                 print(stat_res)
             pytest.fail()
 
-    return 'success'
-
+    
 ###############################################################################
 # Test ReadDir() with a fake Azure Blob server
 
@@ -346,8 +339,6 @@ def test_vsiaz_fake_readdir():
         dir_contents = gdal.ReadDir('/vsiaz/')
     assert dir_contents == ['mycontainer1', 'mycontainer2']
 
-    return 'success'
-
 ###############################################################################
 # Test write
 
@@ -592,8 +583,7 @@ def method(request):
             pytest.fail(ret)
         gdal.VSIFCloseL(f)
 
-    return 'success'
-
+    
 ###############################################################################
 # Test Unlink()
 
@@ -620,8 +610,6 @@ def test_vsiaz_fake_unlink():
             ret = gdal.Unlink('/vsiaz/az_bucket_test_unlink/myfile')
     assert ret == -1
 
-    return 'success'
-
 ###############################################################################
 # Test Mkdir() / Rmdir()
 
@@ -743,8 +731,6 @@ def test_vsiaz_fake_mkdir_rmdir():
         ret = gdal.Rmdir('/vsiaz/az_bucket_test_mkdir/dir_nonempty')
     assert ret != 0
 
-    return 'success'
-
 ###############################################################################
 
 
@@ -759,8 +745,6 @@ def test_vsiaz_fake_test_BlobEndpointInConnectionString():
     signed_url = gdal.GetSignedURL('/vsiaz/az_fake_bucket/resource')
     assert signed_url.find('http://127.0.0.1:%d/myaccount/az_fake_bucket/resource' % gdaltest.webserver_port) >= 0
 
-    return 'success'
-
 
 ###############################################################################
 
@@ -776,8 +760,6 @@ def test_vsiaz_stop_webserver():
 
     webserver.server_stop(gdaltest.webserver_process, gdaltest.webserver_port)
 
-    return 'success'
-
 ###############################################################################
 # Nominal cases (require valid credentials)
 
@@ -852,7 +834,7 @@ def vsiaz_extra_1():
         ret = gdal.Rmdir(subpath)
         assert ret >= 0, ('Rmdir(%s) should not return an error' % subpath)
 
-        return 'success'
+        return
 
     f = open_for_read('/vsiaz/' + az_resource)
     assert f is not None
@@ -893,8 +875,6 @@ def vsiaz_extra_1():
 
     assert len(ret) == 1
 
-    return 'success'
-
 ###############################################################################
 
 
@@ -903,8 +883,7 @@ def test_vsiaz_cleanup():
     for var in gdaltest.az_vars:
         gdal.SetConfigOption(var, gdaltest.az_vars[var])
 
-    return 'success'
-
+    
 
 gdaltest_list = [test_vsiaz_init,
                  test_vsiaz_real_server_errors,
diff --git a/autotest/gcore/vsicrypt.py b/autotest/gcore/vsicrypt.py
index 9334a0595f98..971c34e4666f 100755
--- a/autotest/gcore/vsicrypt.py
+++ b/autotest/gcore/vsicrypt.py
@@ -249,8 +249,6 @@ def test_vsicrypt_2():
 
     gdal.Unlink('/vsimem/file.bin')
 
-    return 'success'
-
 ###############################################################################
 # Test various options
 
@@ -342,8 +340,6 @@ def test_vsicrypt_3():
 
     gdal.Unlink('/vsimem/subdir_crypt/file2.bin')
 
-    return 'success'
-
 ###############################################################################
 # Test "random" operations against reference filesystem
 
@@ -405,8 +401,6 @@ def test_vsicrypt_4():
     gdal.Unlink(test_file)
     gdal.Unlink(ref_file)
 
-    return 'success'
-
 ###############################################################################
 # Test random filling of last sector
 
@@ -461,8 +455,6 @@ def test_vsicrypt_5():
 
     gdal.Unlink(test_file)
 
-    return 'success'
-
 ###############################################################################
 # Test VSISetCryptKey
 
@@ -529,8 +521,6 @@ def test_vsicrypt_6():
 
     gdal.Unlink('/vsimem/file.bin')
 
-    return 'success'
-
 
 gdaltest_list = [test_vsicrypt_1,
                  test_vsicrypt_2,
diff --git a/autotest/gcore/vsicurl.py b/autotest/gcore/vsicurl.py
index 4fe6c60144f9..73b9e43b2ad2 100755
--- a/autotest/gcore/vsicurl.py
+++ b/autotest/gcore/vsicurl.py
@@ -53,8 +53,6 @@ def test_vsicurl_1():
     ds = ogr.Open('/vsizip/vsicurl/http://publicfiles.dep.state.fl.us/dear/BWR_GIS/2007NWFLULC/NWFWMD2007LULC.zip')
     assert ds is not None
 
-    return 'success'
-
 ###############################################################################
 #
 
@@ -69,8 +67,6 @@ def vsicurl_2():
     ds = gdal.Open('/vsizip//vsicurl/http://eros.usgs.gov/archive/nslrsda/GeoTowns/HongKong/srtm/n22e113.zip/n22e113.bil')
     assert ds is not None
 
-    return 'success'
-
 ###############################################################################
 # This server doesn't support range downloading
 
@@ -85,8 +81,6 @@ def vsicurl_3():
     ds = ogr.Open('/vsizip/vsicurl/http://www.iucnredlist.org/spatial-data/MAMMALS_TERRESTRIAL.zip')
     assert ds is None
 
-    return 'success'
-
 ###############################################################################
 # This server doesn't support range downloading
 
@@ -101,8 +95,6 @@ def test_vsicurl_4():
     ds = ogr.Open('/vsizip/vsicurl/http://lelserver.env.duke.edu:8080/LandscapeTools/export/49/Downloads/1_Habitats.zip')
     assert ds is None
 
-    return 'success'
-
 ###############################################################################
 # Test URL unescaping when reading HTTP file list
 
@@ -117,8 +109,6 @@ def test_vsicurl_5():
     ds = gdal.Open('/vsicurl/http://dds.cr.usgs.gov/srtm/SRTM_image_sample/picture%20examples/N34W119_DEM.tif')
     assert ds is not None
 
-    return 'success'
-
 ###############################################################################
 # Test with FTP server that doesn't support EPSV command
 
@@ -133,8 +123,6 @@ def vsicurl_6_disabled():
     fl = gdal.ReadDir('/vsicurl/ftp://ftp2.cits.rncan.gc.ca/pub/cantopo/250k_tif')
     assert fl
 
-    return 'success'
-
 
 ###############################################################################
 # Test Microsoft-IIS/6.0 listing
@@ -149,8 +137,6 @@ def test_vsicurl_7():
     fl = gdal.ReadDir('/vsicurl/http://ortho.linz.govt.nz/tifs/2005_06')
     assert fl
 
-    return 'success'
-
 ###############################################################################
 # Test interleaved reading between 2 datasets
 
@@ -167,8 +153,6 @@ def vsicurl_8():
     cs = ds1.GetRasterBand(1).Checksum()
     assert cs == 61342
 
-    return 'success'
-
 ###############################################################################
 # Test reading a file with Chinese characters, but the HTTP file listing
 # returns escaped sequences instead of the Chinese characters.
@@ -190,8 +174,6 @@ def test_vsicurl_9():
     ds = gdal.Open('/vsicurl/http://download.osgeo.org/gdal/data/gtiff/' + filename)
     assert ds is not None
 
-    return 'success'
-
 ###############################################################################
 # Test reading a file with escaped Chinese characters.
 
@@ -206,8 +188,6 @@ def test_vsicurl_10():
     ds = gdal.Open('/vsicurl/http://download.osgeo.org/gdal/data/gtiff/xx%E4%B8%AD%E6%96%87.%E4%B8%AD%E6%96%87')
     assert ds is not None
 
-    return 'success'
-
 ###############################################################################
 # Test ReadDir() after reading a file on the same server
 
@@ -229,8 +209,6 @@ def test_vsicurl_11():
     filelist = gdal.ReadDir('/vsicurl/http://download.osgeo.org/gdal/data/gtiff')
     assert filelist is not None and filelist
 
-    return 'success'
-
 ###############################################################################
 
 
@@ -246,8 +224,7 @@ def test_vsicurl_start_webserver():
     if gdaltest.webserver_port == 0:
         pytest.skip()
 
-    return 'success'
-
+    
 ###############################################################################
 
 
@@ -368,8 +345,6 @@ def method(request):
 
     gdal.VSIFCloseL(f)
 
-    return 'success'
-
 ###############################################################################
 # TODO: better testing
 
@@ -379,8 +354,6 @@ def test_vsicurl_test_clear_cache():
     gdal.VSICurlClearCache()
     gdal.VSICurlClearCache()
 
-    return 'success'
-
 ###############################################################################
 
 
@@ -420,8 +393,7 @@ def test_vsicurl_test_retry():
         assert data == 'foo'
         assert error_msg.find('429') >= 0
 
-    return 'success'
-
+    
 ###############################################################################
 
 
@@ -441,8 +413,6 @@ def test_vsicurl_test_fallback_from_head_to_get():
 
     gdal.VSICurlClearCache()
 
-    return 'success'
-
 ###############################################################################
 
 
@@ -477,8 +447,7 @@ def test_vsicurl_test_parse_html_filelist_apache():
     with webserver.install_http_handler(handler):
         assert gdal.VSIStatL('/vsicurl/http://localhost:%d/mydir/i_dont_exist' % gdaltest.webserver_port, gdal.VSI_STAT_EXISTS_FLAG) is None
 
-    return 'success'
-
+    
 ###############################################################################
 
 
@@ -493,8 +462,6 @@ def test_vsicurl_stop_webserver():
 
     webserver.server_stop(gdaltest.webserver_process, gdaltest.webserver_port)
 
-    return 'success'
-
 
 gdaltest_list = [test_vsicurl_1,
                  # vsicurl_2,
diff --git a/autotest/gcore/vsicurl_streaming.py b/autotest/gcore/vsicurl_streaming.py
index 1f4ddba8b03a..eccdfdc60048 100755
--- a/autotest/gcore/vsicurl_streaming.py
+++ b/autotest/gcore/vsicurl_streaming.py
@@ -119,8 +119,6 @@ def test_vsicurl_streaming_1():
 
     gdal.VSIFCloseL(fp)
 
-    return 'success'
-
 
 gdaltest_list = [test_vsicurl_streaming_1]
 
diff --git a/autotest/gcore/vsifile.py b/autotest/gcore/vsifile.py
index 6dfe842fd813..708bf97918ab 100755
--- a/autotest/gcore/vsifile.py
+++ b/autotest/gcore/vsifile.py
@@ -102,8 +102,6 @@ def vsifile_generic(filename):
 
     assert gdal.Unlink(filename) == 0
 
-    return 'success'
-
 ###############################################################################
 # Test /vsimem
 
@@ -159,8 +157,6 @@ def test_vsifile_3():
 
     assert statBuf.size == 10 * 1024 * 1024 * 1024
 
-    return 'success'
-
 ###############################################################################
 # Test fix for #4583 (short reads)
 
@@ -175,8 +171,6 @@ def test_vsifile_4():
     assert data
     gdal.VSIFCloseL(fp)
 
-    return 'success'
-
 ###############################################################################
 # Test vsicache
 
@@ -245,8 +239,6 @@ def test_vsifile_5():
     gdal.SetConfigOption('VSI_CACHE', None)
     gdal.Unlink('tmp/vsifile_5.bin')
 
-    return 'success'
-
 ###############################################################################
 # Test vsicache above 2 GB
 
@@ -284,8 +276,6 @@ def test_vsifile_6():
 
     gdal.Unlink('tmp/vsifile_6.bin')
 
-    return 'success'
-
 ###############################################################################
 # Test limit cases on /vsimem
 
@@ -317,8 +307,6 @@ def test_vsifile_7():
 
     gdal.Unlink('/vsimem/vsifile_7.bin')
 
-    return 'success'
-
 ###############################################################################
 # Test renaming directory in /vsimem
 
@@ -335,8 +323,6 @@ def test_vsifile_8():
     gdal.Unlink('/vsimem/newdir/a')
     gdal.Rmdir('/vsimem/newdir')
 
-    return 'success'
-
 ###############################################################################
 # Test ReadDir()
 
@@ -364,8 +350,6 @@ def test_vsifile_9():
         gdal.Unlink('/vsimem/mydir/%d' % i)
     gdal.Rmdir('/vsimem/mydir')
 
-    return 'success'
-
 ###############################################################################
 # Test fuzzer friendly archive
 
@@ -451,8 +435,6 @@ def test_vsifile_10():
 
     gdal.Unlink('/vsimem/vsifile_10.tar')
 
-    return 'success'
-
 ###############################################################################
 # Test generic Truncate implementation for file extension
 
@@ -477,8 +459,6 @@ def test_vsifile_11():
 
     gdal.Unlink('/vsimem/vsifile_11')
 
-    return 'success'
-
 ###############################################################################
 # Test regular file system sparse file support
 
@@ -507,8 +487,6 @@ def test_vsifile_12():
 
     gdal.Unlink(target_dir + '/vsifile_12')
 
-    return 'success'
-
 ###############################################################################
 # Test reading filename with prefixes without terminating slash
 
@@ -544,8 +522,6 @@ def test_vsifile_13():
     gdal.VSIStatL('/vsistdin')
     gdal.VSIStatL('/vsistdout')
 
-    return 'success'
-
 ###############################################################################
 # Check performance issue (https://bugs.chromium.org/p/oss-fuzz/issues/detail?id=1673)
 
@@ -554,8 +530,7 @@ def test_vsifile_14():
 
     with gdaltest.error_handler():
         gdal.VSIFOpenL('/vsitar//vsitar//vsitar//vsitar//vsitar//vsitar//vsitar//vsitar/a.tgzb.tgzc.tgzd.tgze.tgzf.tgz.h.tgz.i.tgz', 'rb')
-    return 'success'
-
+    
 ###############################################################################
 # Test issue with Eof() not detecting end of corrupted gzip stream (#6944)
 
@@ -584,8 +559,6 @@ def test_vsifile_15():
 
     gdal.VSIFCloseL(fp)
 
-    return 'success'
-
 ###############################################################################
 # Test failed gdal.Rename() with exceptions enabled
 
@@ -613,8 +586,6 @@ def test_vsifile_17():
 
     assert gdal.GetSignedURL('foo') is None
 
-    return 'success'
-
 ###############################################################################
 # Test gdal.GetFileSystemsPrefixes()
 
@@ -624,8 +595,6 @@ def test_vsifile_18():
     prefixes = gdal.GetFileSystemsPrefixes()
     assert '/vsimem/' in prefixes
 
-    return 'success'
-
 ###############################################################################
 # Test gdal.GetFileSystemOptions()
 
@@ -639,8 +608,7 @@ def test_vsifile_19():
             ret = gdal.ParseXMLString(options)
             assert ret is not None, (prefix, options)
 
-    return 'success'
-
+    
 ###############################################################################
 # Test gdal.VSIFReadL with None fp
 
@@ -650,7 +618,7 @@ def test_vsifile_20():
     try:
         gdal.VSIFReadL(1, 1, None)
     except ValueError:
-        return 'success'
+        return
 
     pytest.fail()
 
@@ -685,8 +653,7 @@ def test_vsifile_21():
         data3 = gdal.VSIGetMemFileBuffer_unsafe(filename)
         assert data3 == None
 
-    return 'success'
-
+    
 
 def test_vsifile_22():
     # VSIOpenL doesn't set errorno
@@ -709,8 +676,6 @@ def test_vsifile_22():
     assert gdal.VSIGetLastErrorNo() == 0, \
         ("Expected Err=0 after VSIErrorReset(), got %d" % gdal.VSIGetLastErrorNo())
 
-    return 'success'
-
 
 ###############################################################################
 # Test bugfix for https://github.com/OSGeo/gdal/issues/675
@@ -720,7 +685,6 @@ def test_vsitar_bug_675():
 
     content = gdal.ReadDir('/vsitar/data/tar_with_star_base256_fields.tar')
     assert len(content) == 1
-    return 'success'
 
 ###############################################################################
 # Test multithreaded compression
@@ -749,8 +713,7 @@ def test_vsigzip_multi_thread():
 
         pytest.fail()
 
-    return 'success'
-
+    
 ###############################################################################
 # Test vsisync()
 
@@ -802,8 +765,6 @@ def my_progress(pct, message, user_data):
     gdal.RmdirRecursive('/vsimem/test_sync')
     gdal.RmdirRecursive('/vsimem/out')
 
-    return 'success'
-
 ###############################################################################
 # Test gdal.OpenDir()
 
@@ -872,8 +833,6 @@ def test_vsifile_opendir():
 
     gdal.RmdirRecursive('/vsimem/vsifile_opendir')
 
-    return 'success'
-
 
 gdaltest_list = [test_vsifile_1,
                  test_vsifile_2,
diff --git a/autotest/gcore/vsigs.py b/autotest/gcore/vsigs.py
index 617423fdc5ec..8ca899f885c7 100755
--- a/autotest/gcore/vsigs.py
+++ b/autotest/gcore/vsigs.py
@@ -70,8 +70,7 @@ def test_vsigs_init():
     with gdaltest.config_option('CPL_GCE_SKIP', 'YES'):
         assert gdal.GetSignedURL('/vsigs/foo/bar') is None
 
-    return 'success'
-
+    
 ###############################################################################
 # Error cases
 
@@ -132,7 +131,7 @@ def test_vsigs_1():
         if f is not None:
             gdal.VSIFCloseL(f)
         if gdal.GetConfigOption('APPVEYOR') is not None:
-            return 'success'
+            return
         pytest.fail(gdal.VSIGetLastErrorMsg())
 
     gdal.ErrorReset()
@@ -140,8 +139,6 @@ def test_vsigs_1():
         f = open_for_read('/vsigs_streaming/foo/bar.baz')
     assert f is None and gdal.VSIGetLastErrorMsg() != ''
 
-    return 'success'
-
 ###############################################################################
 
 
@@ -161,8 +158,6 @@ def test_vsigs_start_webserver():
     gdal.SetConfigOption('GS_SECRET_ACCESS_KEY', 'GS_SECRET_ACCESS_KEY')
     gdal.SetConfigOption('GS_ACCESS_KEY_ID', 'GS_ACCESS_KEY_ID')
 
-    return 'success'
-
 ###############################################################################
 # Test with a fake Google Cloud Storage server
 
@@ -245,8 +240,7 @@ def test_vsigs_2():
                 print(stat_res)
             pytest.fail()
 
-    return 'success'
-
+    
 ###############################################################################
 # Test ReadDir() with a fake Google Cloud Storage server
 
@@ -321,8 +315,6 @@ def test_vsigs_readdir():
         dir_contents = gdal.ReadDir('/vsigs/')
     assert dir_contents == ['mybucket']
 
-    return 'success'
-
 ###############################################################################
 # Test write
 
@@ -419,8 +411,7 @@ def method(request):
             ret = gdal.VSIFCloseL(f)
         assert ret != 0
 
-    return 'success'
-
+    
 ###############################################################################
 # Read credentials with OAuth2 refresh_token
 
@@ -494,8 +485,6 @@ def method(request):
     gdal.SetConfigOption('GOA2_AUTH_URL_TOKEN', None)
     gdal.SetConfigOption('GS_OAUTH2_REFRESH_TOKEN', '')
 
-    return 'success'
-
 ###############################################################################
 # Read credentials with OAuth2 refresh_token
 
@@ -570,8 +559,6 @@ def method(request):
     gdal.SetConfigOption('GS_OAUTH2_CLIENT_ID', '')
     gdal.SetConfigOption('GS_OAUTH2_CLIENT_SECRET', '')
 
-    return 'success'
-
 ###############################################################################
 # Read credentials with OAuth2 service account
 
@@ -683,8 +670,6 @@ def method(request):
 
     gdal.Unlink('/vsimem/pkey')
 
-    return 'success'
-
 ###############################################################################
 # Read credentials with OAuth2 service account through a json configuration file
 
@@ -780,8 +765,6 @@ def method(request):
 
     assert data == 'foo'
 
-    return 'success'
-
 ###############################################################################
 # Read credentials from simulated ~/.boto
 
@@ -840,8 +823,6 @@ def method(request):
     gdal.SetConfigOption('CPL_GS_CREDENTIALS_FILE', '')
     gdal.Unlink('/vsimem/.boto')
 
-    return 'success'
-
 ###############################################################################
 # Read credentials from simulated ~/.boto
 
@@ -920,8 +901,6 @@ def method(request):
     gdal.SetConfigOption('GOA2_AUTH_URL_TOKEN', None)
     gdal.Unlink('/vsimem/.boto')
 
-    return 'success'
-
 ###############################################################################
 # Read credentials from simulated GCE instance
 
@@ -997,8 +976,6 @@ def method(request):
     gdal.SetConfigOption('CPL_GCE_CREDENTIALS_URL', '')
     gdal.SetConfigOption('CPL_GCE_CHECK_LOCAL_FILES', None)
 
-    return 'success'
-
 ###############################################################################
 # Read credentials from simulated GCE instance with expiration of the
 # cached credentials
@@ -1067,8 +1044,6 @@ def method(request):
     gdal.SetConfigOption('CPL_GCE_CREDENTIALS_URL', '')
     gdal.SetConfigOption('CPL_GCE_CHECK_LOCAL_FILES', None)
 
-    return 'success'
-
 ###############################################################################
 
 
@@ -1083,8 +1058,6 @@ def test_vsigs_stop_webserver():
 
     webserver.server_stop(gdaltest.webserver_process, gdaltest.webserver_port)
 
-    return 'success'
-
 ###############################################################################
 # Nominal cases (require valid credentials)
 
@@ -1166,7 +1139,7 @@ def vsigs_extra_1():
         ret = gdal.Rmdir(subpath)
         assert ret >= 0, ('Rmdir(%s) should not return an error' % subpath)
 
-        return 'success'
+        return
 
     f = open_for_read('/vsigs/' + gs_resource)
     assert f is not None
@@ -1207,8 +1180,6 @@ def vsigs_extra_1():
 
     assert len(ret) == 1
 
-    return 'success'
-
 ###############################################################################
 
 
@@ -1217,8 +1188,7 @@ def test_vsigs_cleanup():
     for var in gdaltest.gs_vars:
         gdal.SetConfigOption(var, gdaltest.gs_vars[var])
 
-    return 'success'
-
+    
 
 gdaltest_list = [test_vsigs_init,
                  test_vsigs_1,
diff --git a/autotest/gcore/vsihdfs.py b/autotest/gcore/vsihdfs.py
index d6800e72772b..f0ec7ac0511a 100755
--- a/autotest/gcore/vsihdfs.py
+++ b/autotest/gcore/vsihdfs.py
@@ -55,7 +55,6 @@ def test_vsihdfs_1():
     assert data and data.decode('ascii') == ' ipsum'
 
     gdal.VSIFCloseL(fp)
-    return 'success'
 
 # Seek test
 def test_vsihdfs_2():
@@ -80,7 +79,6 @@ def test_vsihdfs_2():
     assert data and data.decode('ascii') == 'laborum'
 
     gdal.VSIFCloseL(fp)
-    return 'success'
 
 # Tell test
 def test_vsihdfs_3():
@@ -98,7 +96,6 @@ def test_vsihdfs_3():
     assert offset == 5
 
     gdal.VSIFCloseL(fp)
-    return 'success'
 
 # Write test
 def test_vsihdfs_4():
@@ -130,7 +127,6 @@ def test_vsihdfs_5():
     assert eof == 0
 
     gdal.VSIFCloseL(fp)
-    return 'success'
 
 # Stat test
 def test_vsihdfs_6():
@@ -145,8 +141,6 @@ def test_vsihdfs_6():
     statBuf = gdal.VSIStatL(filename, 0)
     assert not statBuf
 
-    return 'success'
-
 # ReadDir test
 def test_vsihdfs_7():
     if gdaltest.have_vsihdfs == False:
@@ -156,8 +150,6 @@ def test_vsihdfs_7():
     lst = gdal.ReadDir(dirname)
     assert len(lst) >= 360
 
-    return 'success'
-
 
 gdaltest_list = [test_vsihdfs_1,
                  test_vsihdfs_2,
diff --git a/autotest/gcore/vsioss.py b/autotest/gcore/vsioss.py
index 232958892c58..eec7d38840b1 100755
--- a/autotest/gcore/vsioss.py
+++ b/autotest/gcore/vsioss.py
@@ -57,8 +57,6 @@ def test_visoss_init():
 
     assert gdal.GetSignedURL('/vsioss/foo/bar') is None
 
-    return 'success'
-
 ###############################################################################
 # Error cases
 
@@ -89,8 +87,6 @@ def test_visoss_1():
 
     gdal.SetConfigOption('OSS_ACCESS_KEY_ID', 'OSS_ACCESS_KEY_ID')
 
-    return 'success'
-
 
 def test_visoss_real_test():
 
@@ -108,7 +104,7 @@ def test_visoss_real_test():
         if f is not None:
             gdal.VSIFCloseL(f)
         if gdal.GetConfigOption('APPVEYOR') is not None:
-            return 'success'
+            return
         pytest.fail(gdal.VSIGetLastErrorMsg())
 
     gdal.ErrorReset()
@@ -116,8 +112,6 @@ def test_visoss_real_test():
         f = open_for_read('/vsioss_streaming/foo/bar.baz')
     assert f is None and gdal.VSIGetLastErrorMsg() != ''
 
-    return 'success'
-
 ###############################################################################
 
 
@@ -140,8 +134,6 @@ def test_visoss_start_webserver():
     gdal.SetConfigOption('OSS_VIRTUAL_HOSTING', 'NO')
     gdal.SetConfigOption('OSS_ENDPOINT', '127.0.0.1:%d' % gdaltest.webserver_port)
 
-    return 'success'
-
 ###############################################################################
 
 
@@ -352,8 +344,6 @@ def method(request):
             f = open_for_read('/vsioss_streaming/oss_fake_bucket/no_message_in_error')
     assert f is None and gdal.VSIGetLastErrorMsg().find('<Error>') >= 0
 
-    return 'success'
-
 ###############################################################################
 # Test ReadDir() with a fake OSS server
 
@@ -545,8 +535,6 @@ def method(request):
         dir_contents = gdal.ReadDir('/vsioss/')
     assert dir_contents == ['mybucket']
 
-    return 'success'
-
 ###############################################################################
 # Test simple PUT support with a fake OSS server
 
@@ -666,8 +654,6 @@ def method(request):
         gdal.VSIFCloseL(f)
     assert gdal.GetLastErrorMsg() == ''
 
-    return 'success'
-
 ###############################################################################
 # Test simple DELETE support with a fake OSS server
 
@@ -710,8 +696,6 @@ def test_visoss_5():
             ret = gdal.Unlink('/vsioss/oss_delete_bucket/delete_file_error')
     assert ret != 0
 
-    return 'success'
-
 ###############################################################################
 # Test multipart upload with a fake OSS server
 
@@ -891,8 +875,7 @@ def method(request):
                 gdal.VSIFCloseL(f)
             assert gdal.GetLastErrorMsg() != '', filename
 
-    return 'success'
-
+    
 ###############################################################################
 # Test Mkdir() / Rmdir()
 
@@ -950,8 +933,6 @@ def test_visoss_7():
         ret = gdal.Rmdir('/vsioss/oss_bucket_test_mkdir/dir_nonempty')
     assert ret != 0
 
-    return 'success'
-
 ###############################################################################
 # Test handling of file and directory with same name
 
@@ -990,8 +971,7 @@ def test_visoss_8():
     with webserver.install_http_handler(handler):
         assert stat.S_ISDIR(gdal.VSIStatL('/vsioss/visoss_8/test/').mode)
 
-    return 'success'
-
+    
 ###############################################################################
 
 
@@ -1006,8 +986,6 @@ def test_visoss_stop_webserver():
 
     webserver.server_stop(gdaltest.webserver_process, gdaltest.webserver_port)
 
-    return 'success'
-
 ###############################################################################
 # Nominal cases (require valid credentials)
 
@@ -1088,7 +1066,7 @@ def visoss_extra_1():
         ret = gdal.Rmdir(subpath)
         assert ret >= 0, ('Rmdir(%s) should not return an error' % subpath)
 
-        return 'success'
+        return
 
     f = open_for_read('/vsioss/' + OSS_RESOURCE)
     assert f is not None, ('cannot open %s' % ('/vsioss/' + OSS_RESOURCE))
@@ -1129,8 +1107,6 @@ def visoss_extra_1():
 
     assert len(ret) == 1
 
-    return 'success'
-
 ###############################################################################
 
 
@@ -1139,8 +1115,7 @@ def test_visoss_cleanup():
     for var in gdaltest.oss_vars:
         gdal.SetConfigOption(var, gdaltest.oss_vars[var])
 
-    return 'success'
-
+    
 
 gdaltest_list = [test_visoss_init,
                  test_visoss_1,
diff --git a/autotest/gcore/vsis3.py b/autotest/gcore/vsis3.py
index b323f980460b..c1e06d657264 100755
--- a/autotest/gcore/vsis3.py
+++ b/autotest/gcore/vsis3.py
@@ -64,8 +64,6 @@ def test_vsis3_init():
 
     assert gdal.GetSignedURL('/vsis3/foo/bar') is None
 
-    return 'success'
-
 ###############################################################################
 # Test AWS_NO_SIGN_REQUEST=YES
 
@@ -89,7 +87,6 @@ def test_vsis3_no_sign_request():
             pytest.skip('cannot open URL')
         pytest.fail()
     gdal.VSIFCloseL(f)
-    return 'success'
 
 ###############################################################################
 # Error cases
@@ -129,7 +126,7 @@ def test_vsis3_1():
         if f is not None:
             gdal.VSIFCloseL(f)
         if gdal.GetConfigOption('APPVEYOR') is not None:
-            return 'success'
+            return
         pytest.fail(gdal.VSIGetLastErrorMsg())
 
     gdal.ErrorReset()
@@ -137,8 +134,6 @@ def test_vsis3_1():
         f = open_for_read('/vsis3_streaming/foo/bar.baz')
     assert f is None and gdal.VSIGetLastErrorMsg() != ''
 
-    return 'success'
-
 ###############################################################################
 
 
@@ -161,8 +156,6 @@ def test_vsis3_start_webserver():
     gdal.SetConfigOption('AWS_VIRTUAL_HOSTING', 'NO')
     gdal.SetConfigOption('AWS_S3_ENDPOINT', '127.0.0.1:%d' % gdaltest.webserver_port)
 
-    return 'success'
-
 
 def get_s3_fake_bucket_resource_method(request):
     request.protocol_version = 'HTTP/1.1'
@@ -575,8 +568,6 @@ def method_req_2(self, request):
 
     assert data == 'bar'
 
-    return 'success'
-
 ###############################################################################
 # Test ReadDir() with a fake AWS server
 
@@ -945,8 +936,6 @@ def method_req_2(self, request):
         dir_contents = gdal.ReadDir('/vsis3/s3_test_temporary_redirect_read_dir/test')
     assert dir_contents == ['test2']
 
-    return 'success'
-
 ###############################################################################
 # Test OpenDir() with a fake AWS server
 
@@ -1091,10 +1080,6 @@ def test_vsis3_opendir():
 
     gdal.CloseDir(d)
 
-
-
-    return 'success'
-
 ###############################################################################
 # Test simple PUT support with a fake AWS server
 
@@ -1264,8 +1249,6 @@ def method(request):
         gdal.VSIFCloseL(f)
     assert gdal.GetLastErrorMsg() == ''
 
-    return 'success'
-
 ###############################################################################
 # Test simple DELETE support with a fake AWS server
 
@@ -1340,8 +1323,6 @@ def method(request):
         ret = gdal.Unlink('/vsis3/s3_delete_bucket/redirect')
     assert ret == 0
 
-    return 'success'
-
 ###############################################################################
 # Test multipart upload with a fake AWS server
 
@@ -1536,8 +1517,7 @@ def method(request):
                 gdal.VSIFCloseL(f)
             assert gdal.GetLastErrorMsg() != '', filename
 
-    return 'success'
-
+    
 ###############################################################################
 # Test Mkdir() / Rmdir()
 
@@ -1670,8 +1650,7 @@ def test_vsis3_7():
     with webserver.install_http_handler(handler):
         assert gdal.ReadDir('/vsis3/s3_bucket_test_readdir2/test_dirread') is not None
 
-    return 'success'
-
+    
 ###############################################################################
 # Test handling of file and directory with same name
 
@@ -1710,8 +1689,7 @@ def test_vsis3_8():
     with webserver.install_http_handler(handler):
         assert stat.S_ISDIR(gdal.VSIStatL('/vsis3/vsis3_8/test/').mode)
 
-    return 'success'
-
+    
 ###############################################################################
 # Test vsisync() with SYNC_STRATEGY=ETAG
 
@@ -1856,8 +1834,6 @@ def method(request):
         assert gdal.Sync('/vsimem/subdir/', '/vsis3/out', options=options)
     gdal.RmdirRecursive('/vsimem/subdir')
 
-    return 'success'
-
 ###############################################################################
 # Test vsisync() with SYNC_STRATEGY=TIMESTAMP
 
@@ -1923,8 +1899,6 @@ def test_vsis3_sync_timestamp():
 
     gdal.Unlink('/vsimem/testsync.txt')
 
-    return 'success'
-
 ###############################################################################
 # Read credentials from simulated ~/.aws/credentials
 
@@ -1966,8 +1940,6 @@ def test_vsis3_read_credentials_file():
     gdal.SetConfigOption('CPL_AWS_CREDENTIALS_FILE', '')
     gdal.Unlink('/vsimem/aws_credentials')
 
-    return 'success'
-
 ###############################################################################
 # Read credentials from simulated  ~/.aws/config
 
@@ -2010,8 +1982,6 @@ def test_vsis3_read_config_file():
     gdal.SetConfigOption('AWS_CONFIG_FILE', '')
     gdal.Unlink('/vsimem/aws_config')
 
-    return 'success'
-
 ###############################################################################
 # Read credentials from simulated ~/.aws/credentials and ~/.aws/config
 
@@ -2069,8 +2039,6 @@ def test_vsis3_read_credentials_config_file():
     gdal.SetConfigOption('AWS_CONFIG_FILE', '')
     gdal.Unlink('/vsimem/aws_config')
 
-    return 'success'
-
 ###############################################################################
 # Read credentials from simulated ~/.aws/credentials and ~/.aws/config with
 # a non default profile
@@ -2129,8 +2097,6 @@ def test_vsis3_read_credentials_config_file_non_default():
     gdal.Unlink('/vsimem/aws_config')
     gdal.SetConfigOption('AWS_DEFAULT_PROFILE', '')
 
-    return 'success'
-
 ###############################################################################
 # Read credentials from simulated ~/.aws/credentials and ~/.aws/config
 
@@ -2191,8 +2157,6 @@ def test_vsis3_read_credentials_config_file_inconsistent():
     gdal.SetConfigOption('AWS_CONFIG_FILE', '')
     gdal.Unlink('/vsimem/aws_config')
 
-    return 'success'
-
 ###############################################################################
 # Read credentials from simulated EC2 instance
 
@@ -2250,8 +2214,6 @@ def test_vsis3_read_credentials_ec2():
     gdal.SetConfigOption('CPL_AWS_EC2_CREDENTIALS_URL', '')
     gdal.SetConfigOption('CPL_AWS_AUTODETECT_EC2', None)
 
-    return 'success'
-
 ###############################################################################
 # Read credentials from simulated EC2 instance with expiration of the
 # cached credentials
@@ -2304,8 +2266,6 @@ def test_vsis3_read_credentials_ec2_expiration():
     gdal.SetConfigOption('CPL_AWS_EC2_CREDENTIALS_URL', '')
     gdal.SetConfigOption('CPL_AWS_AUTODETECT_EC2', None)
 
-    return 'success'
-
 ###############################################################################
 
 
@@ -2320,8 +2280,6 @@ def test_vsis3_stop_webserver():
 
     webserver.server_stop(gdaltest.webserver_process, gdaltest.webserver_port)
 
-    return 'success'
-
 ###############################################################################
 # Nominal cases (require valid credentials)
 
@@ -2406,7 +2364,7 @@ def vsis3_extra_1():
         ret = gdal.Rmdir(subpath)
         assert ret >= 0, ('Rmdir(%s) should not return an error' % subpath)
 
-        return 'success'
+        return
 
     f = open_for_read('/vsis3/' + s3_resource)
     assert f is not None, ('cannot open %s' % ('/vsis3/' + s3_resource))
@@ -2447,8 +2405,6 @@ def vsis3_extra_1():
 
     assert len(ret) == 1
 
-    return 'success'
-
 ###############################################################################
 
 
@@ -2461,8 +2417,6 @@ def test_vsis3_cleanup():
     gdal.SetConfigOption('AWS_CONFIG_FILE', None)
     gdal.SetConfigOption('CPL_AWS_EC2_CREDENTIALS_URL', None)
 
-    return 'success'
-
 
 gdaltest_list = [test_vsis3_init,
                  test_vsis3_no_sign_request,
diff --git a/autotest/gcore/vsistdin.py b/autotest/gcore/vsistdin.py
index 0080038d3a65..ff3f77a0bd4a 100755
--- a/autotest/gcore/vsistdin.py
+++ b/autotest/gcore/vsistdin.py
@@ -62,8 +62,6 @@ def test_vsistdin_1():
 
     gdal.Unlink("tmp/vsistdin_1_out.tif")
 
-    return 'success'
-
 ###############################################################################
 # Test on a bigger file (> 1 MB)
 
@@ -86,8 +84,6 @@ def test_vsistdin_2():
 
     gdal.Unlink("tmp/vsistdin_2_out.tif")
 
-    return 'success'
-
 ###############################################################################
 # Test opening /vsistdin/ in write mode (failure expected)
 
@@ -99,8 +95,6 @@ def test_vsistdin_3():
     gdal.PopErrorHandler()
     assert f is None
 
-    return 'success'
-
 ###############################################################################
 # Test fix for #6061
 
@@ -135,8 +129,6 @@ def test_vsistdin_4():
 
     gdal.Unlink("tmp/vsistdin_4_out.tif")
 
-    return 'success'
-
 
 gdaltest_list = [test_vsistdin_1, test_vsistdin_2, test_vsistdin_3, test_vsistdin_4]
 
diff --git a/autotest/gcore/vsiswift.py b/autotest/gcore/vsiswift.py
index 7b3c1d316e82..323360183723 100644
--- a/autotest/gcore/vsiswift.py
+++ b/autotest/gcore/vsiswift.py
@@ -56,8 +56,7 @@ def test_vsiswift_init():
         if gdaltest.swift_vars[var] is not None:
             gdal.SetConfigOption(var, "")
 
-    return 'success'
-
+    
 ###############################################################################
 # Error cases
 
@@ -101,8 +100,6 @@ def test_vsiswift_real_server_errors():
         f = open_for_read('/vsiswift_streaming/foo/bar.baz')
     assert f is None, gdal.VSIGetLastErrorMsg()
 
-    return 'success'
-
 ###############################################################################
 
 
@@ -118,8 +115,7 @@ def test_vsiswift_start_webserver():
     if gdaltest.webserver_port == 0:
         pytest.skip()
 
-    return 'success'
-
+    
 ###############################################################################
 # Test authentication with SWIFT_AUTH_V1_URL + SWIFT_USER + SWIFT_KEY
 
@@ -210,8 +206,6 @@ def method(request):
 
     assert data == 'bar'
 
-    return 'success'
-
 ###############################################################################
 # Test authentication with SWIFT_STORAGE_URL + SWIFT_AUTH_TOKEN
 
@@ -266,8 +260,6 @@ def method(request):
 
     assert data == 'foo'
 
-    return 'success'
-
 ###############################################################################
 # Test VSIStatL()
 
@@ -311,8 +303,7 @@ def test_vsiswift_stat():
         stat_res = gdal.VSIStatL('/vsiswift/foo')
         assert stat_res is not None and stat.S_ISDIR(stat_res.mode)
 
-    return 'success'
-
+    
 ###############################################################################
 # Test ReadDir()
 
@@ -414,8 +405,6 @@ def test_vsiswift_fake_readdir():
         dir_contents = gdal.ReadDir('/vsiswift/foo/')
     assert dir_contents == ['.']
 
-    return 'success'
-
 ###############################################################################
 # Test write
 
@@ -470,8 +459,7 @@ def method(request):
             pytest.fail(ret)
         gdal.VSIFCloseL(f)
 
-    return 'success'
-
+    
 ###############################################################################
 # Test Unlink()
 
@@ -502,8 +490,6 @@ def test_vsiswift_fake_unlink():
             ret = gdal.Unlink('/vsiswift/foo/bar')
     assert ret == -1
 
-    return 'success'
-
 ###############################################################################
 # Test Mkdir() / Rmdir()
 
@@ -593,8 +579,6 @@ def test_vsiswift_fake_mkdir_rmdir():
         ret = gdal.Rmdir('/vsiswift/foo/dir_nonempty')
     assert ret != 0
 
-    return 'success'
-
 ###############################################################################
 
 
@@ -609,8 +593,6 @@ def test_vsiswift_stop_webserver():
 
     webserver.server_stop(gdaltest.webserver_process, gdaltest.webserver_port)
 
-    return 'success'
-
 ###############################################################################
 # Nominal cases (require valid credentials)
 
@@ -685,7 +667,7 @@ def vsiswift_extra_1():
         ret = gdal.Rmdir(subpath)
         assert ret >= 0, ('Rmdir(%s) should not return an error' % subpath)
 
-        return 'success'
+        return
 
     f = open_for_read('/vsiswift/' + swift_resource)
     assert f is not None
@@ -707,8 +689,6 @@ def vsiswift_extra_1():
     f = open_for_read('/vsiswift_streaming/' + swift_resource + '/invalid_resource.baz')
     assert f is None, gdal.VSIGetLastErrorMsg()
 
-    return 'success'
-
 ###############################################################################
 
 
@@ -717,8 +697,7 @@ def test_vsiswift_cleanup():
     for var in gdaltest.swift_vars:
         gdal.SetConfigOption(var, gdaltest.swift_vars[var])
 
-    return 'success'
-
+    
 
 gdaltest_list = [test_vsiswift_init,
                  test_vsiswift_real_server_errors,
diff --git a/autotest/gcore/vsiwebhdfs.py b/autotest/gcore/vsiwebhdfs.py
index 74933f20390d..194645e1c072 100644
--- a/autotest/gcore/vsiwebhdfs.py
+++ b/autotest/gcore/vsiwebhdfs.py
@@ -55,8 +55,7 @@ def test_vsiwebhdfs_init():
         if gdaltest.webhdfs_vars[var] is not None:
             gdal.SetConfigOption(var, "")
 
-    return 'success'
-
+    
 ###############################################################################
 
 
@@ -78,8 +77,6 @@ def test_vsiwebhdfs_start_webserver():
     gdaltest.webhdfs_redirected_url = 'http://non_existing_host:' + \
         str(gdaltest.webserver_port) + '/redirected'
 
-    return 'success'
-
 ###############################################################################
 # Test VSIFOpenL()
 
@@ -137,8 +134,6 @@ def test_vsiwebhdfs_open():
 
     gdal.VSIFCloseL(f)
 
-    return 'success'
-
 ###############################################################################
 # Test VSIStatL()
 
@@ -175,8 +170,6 @@ def test_vsiwebhdfs_stat():
             gdaltest.webhdfs_base_connection + '/unexisting')
     assert stat_res is None
 
-    return 'success'
-
 ###############################################################################
 # Test ReadDir()
 
@@ -211,8 +204,6 @@ def test_vsiwebhdfs_readdir():
             gdaltest.webhdfs_base_connection + 'foo/error_test/')
     assert dir_contents is None
 
-    return 'success'
-
 ###############################################################################
 # Test write
 
@@ -340,8 +331,7 @@ def method(request):
         with webserver.install_http_handler(handler):
             assert gdal.VSIFCloseL(f) != 0
 
-    return 'success'
-
+    
 ###############################################################################
 # Test Unlink()
 
@@ -397,8 +387,6 @@ def test_vsiwebhdfs_unlink():
             ret = gdal.Unlink(gdaltest.webhdfs_base_connection + '/foo/bar')
     assert ret == -1
 
-    return 'success'
-
 ###############################################################################
 # Test Mkdir() / Rmdir()
 
@@ -465,8 +453,6 @@ def test_vsiwebhdfs_mkdir_rmdir():
         ret = gdal.Rmdir(gdaltest.webhdfs_base_connection + '/foo/dir_error')
     assert ret != 0
 
-    return 'success'
-
 ###############################################################################
 
 
@@ -481,8 +467,6 @@ def test_vsiwebhdfs_stop_webserver():
 
     webserver.server_stop(gdaltest.webserver_process, gdaltest.webserver_port)
 
-    return 'success'
-
 ###############################################################################
 # Nominal cases (require valid credentials)
 
@@ -560,7 +544,7 @@ def vsiwebhdfs_extra_1():
         ret = gdal.Rmdir(subpath)
         assert ret >= 0, ('Rmdir(%s) should not return an error' % subpath)
 
-        return 'success'
+        return
 
     f = open_for_read('/vsiwebhdfs/' + webhdfs_url)
     assert f is not None
@@ -569,8 +553,6 @@ def vsiwebhdfs_extra_1():
 
     assert len(ret) == 1
 
-    return 'success'
-
 ###############################################################################
 
 
@@ -579,8 +561,7 @@ def test_vsiwebhdfs_cleanup():
     for var in gdaltest.webhdfs_vars:
         gdal.SetConfigOption(var, gdaltest.webhdfs_vars[var])
 
-    return 'success'
-
+    
 
 gdaltest_list = [test_vsiwebhdfs_init,
                  test_vsiwebhdfs_start_webserver,
diff --git a/autotest/gcore/vsizip.py b/autotest/gcore/vsizip.py
index 083d92792757..e2f5833c638c 100755
--- a/autotest/gcore/vsizip.py
+++ b/autotest/gcore/vsizip.py
@@ -164,8 +164,6 @@ def test_vsizip_1():
     # Test ReadDir on a non existing file
     assert gdal.ReadDir('/vsizip//vsimem/foo.zip') is None
 
-    return 'success'
-
 ###############################################################################
 # Test writing 2 files in the ZIP by closing it completely between the 2
 
@@ -216,8 +214,6 @@ def test_vsizip_2():
 
     gdal.Unlink(zip_name)
 
-    return 'success'
-
 
 ###############################################################################
 # Test opening in write mode a file inside a zip archive whose content has been listed before (testcase for fix of r22625)
@@ -247,8 +243,6 @@ def test_vsizip_3():
 
     assert res == ['foo', 'bar', 'baz']
 
-    return 'success'
-
 ###############################################################################
 # Test ReadRecursive on valid zip
 
@@ -262,8 +256,6 @@ def test_vsizip_4():
                'subdir/subdir/test_rpc.txt', 'subdir/test_rpc.txt',
                'test_rpc.txt', 'uint16.tif']), 'bad content'
 
-    return 'success'
-
 ###############################################################################
 # Test ReadRecursive on deep zip
 
@@ -288,8 +280,6 @@ def test_vsizip_5():
 
     gdal.Unlink("/vsimem/bigdepthzip.zip")
 
-    return 'success'
-
 ###############################################################################
 # Test writing 2 files with same name in a ZIP (#4785)
 
@@ -331,8 +321,6 @@ def test_vsizip_6():
 
     gdal.Unlink("/vsimem/test6.zip")
 
-    return 'success'
-
 ###############################################################################
 # Test that we use the extended field for UTF-8 filenames (#5361).
 
@@ -353,8 +341,7 @@ def test_vsizip_7():
         print(content)
         pytest.fail('bad content')
 
-    return 'success'
-
+    
 ###############################################################################
 # Basic test for ZIP64 support (5 GB file that compresses in less than 4 GB)
 
@@ -363,8 +350,6 @@ def test_vsizip_8():
 
     assert gdal.VSIStatL('/vsizip/vsizip/data/zero.bin.zip.zip/zero.bin.zip').size == 5000 * 1000 * 1000 + 1
 
-    return 'success'
-
 ###############################################################################
 # Basic test for ZIP64 support (5 GB file that is stored)
 
@@ -386,8 +371,6 @@ def test_vsizip_9():
     gdal.VSIFCloseL(f)
     assert data.decode('ascii') == 'HELLO\n'
 
-    return 'success'
-
 ###############################################################################
 # Test that we recode filenames in ZIP (#5361)
 
@@ -413,8 +396,7 @@ def test_vsizip_10():
         print(content)
         pytest.fail('bad content')
 
-    return 'success'
-
+    
 ###############################################################################
 # Test that we don't do anything with ZIP with filenames in UTF-8 already (#5361)
 
@@ -435,8 +417,7 @@ def test_vsizip_11():
         print(content)
         pytest.fail('bad content')
 
-    return 'success'
-
+    
 ###############################################################################
 # Test changing the content of a zip file (#6005)
 
@@ -485,8 +466,6 @@ def test_vsizip_12():
 
     assert content == ['bar.baz']
 
-    return 'success'
-
 ###############################################################################
 # Test ReadDir() truncation
 
@@ -507,8 +486,6 @@ def test_vsizip_13():
 
     gdal.Unlink('/vsimem/vsizip_13.zip')
 
-    return 'success'
-
 ###############################################################################
 # Test that we can recode filenames in ZIP when writing (#6631)
 
@@ -539,8 +516,6 @@ def test_vsizip_14():
 
     gdal.Unlink('/vsimem/vsizip_14.zip')
 
-    return 'success'
-
 ###############################################################################
 # Test multithreaded compression
 
@@ -570,8 +545,7 @@ def test_vsizip_multi_thread():
 
         pytest.fail()
 
-    return 'success'
-
+    
 ###############################################################################
 # Test multithreaded compression, below the threshold where it triggers
 
@@ -593,8 +567,6 @@ def test_vsizip_multi_thread_below_threshold():
 
     assert data == 'hello'
 
-    return 'success'
-
 ###############################################################################
 # Test creating ZIP64 file: uncompressed larger than 4GB, but compressed
 # data stream < 4 GB
@@ -629,8 +601,6 @@ def test_vsizip_create_zip64():
 
     gdal.Unlink(zip_name)
 
-    return 'success'
-
 ###############################################################################
 # Test creating ZIP64 file: compressed data stream > 4 GB
 
@@ -665,8 +635,6 @@ def test_vsizip_create_zip64_stream_larger_than_4G():
 
     gdal.Unlink(zip_name)
 
-    return 'success'
-
 
 ###############################################################################
 def test_vsizip_byte_zip64_local_header_zeroed():
@@ -674,8 +642,6 @@ def test_vsizip_byte_zip64_local_header_zeroed():
     size = gdal.VSIStatL('/vsizip/data/byte_zip64_local_header_zeroed.zip/byte.tif').size
     assert size == 736
 
-    return 'success'
-
 gdaltest_list = [test_vsizip_1,
                  test_vsizip_2,
                  test_vsizip_3,
diff --git a/autotest/gdrivers/aaigrid.py b/autotest/gdrivers/aaigrid.py
index 84072021549f..cba7866175d9 100755
--- a/autotest/gdrivers/aaigrid.py
+++ b/autotest/gdrivers/aaigrid.py
@@ -70,8 +70,6 @@ def test_aaigrid_2():
 
     assert band1.DataType == gdal.GDT_Float32, 'Data type is not Float32!'
 
-    return 'success'
-
 
 ###############################################################################
 # Test reading a file where decimal separator is comma (#3668)
@@ -92,8 +90,6 @@ def test_aaigrid_comma():
 
     assert band1.DataType == gdal.GDT_Float32, 'Data type is not Float32!'
 
-    return 'success'
-
 ###############################################################################
 # Create simple copy and check.
 
@@ -165,8 +161,6 @@ def test_aaigrid_6():
 
     assert b.DataType == gdal.GDT_Float32, 'Data type is not Float32!'
 
-    return 'success'
-
 ###############################################################################
 # Verify data type determination from type of nodata
 
@@ -180,8 +174,6 @@ def test_aaigrid_6bis():
 
     assert b.DataType == gdal.GDT_Int32, 'Data type is not Int32!'
 
-    return 'success'
-
 ###############################################################################
 # Verify writing files with non-square pixels.
 
@@ -216,7 +208,7 @@ def test_aaigrid_9():
     gdal.GetDriverByName('AAIGRID').Delete('tmp/aaigrid.tmp')
 
     if abs(got_minmax[0] - -0.84) < 1e-7:
-        return 'success'
+        return
     pytest.fail()
 
 ###############################################################################
@@ -259,8 +251,7 @@ def test_aaigrid_10():
         except OSError:
             pass
 
-    return 'success'
-
+    
 ###############################################################################
 # Test SIGNIFICANT_DIGITS creation option (same as DECIMAL_PRECISION test)
 
@@ -275,7 +266,7 @@ def test_aaigrid_11():
     gdal.GetDriverByName('AAIGRID').Delete('tmp/aaigrid.tmp')
 
     if abs(got_minmax[0] - -0.84) < 1e-7:
-        return 'success'
+        return
     pytest.fail()
 
 ###############################################################################
@@ -298,7 +289,6 @@ def test_aaigrid_12():
     gdal.GetDriverByName('AAIGRID').Delete('tmp/aaigrid.tmp')
     assert ndv.startswith('nodata_value')
     assert ndv.endswith('-99999.000')
-    return 'success'
 
 ###############################################################################
 # Test no data is written to correct precision WITH SIGNIFICANT_DIGITS.
@@ -320,7 +310,6 @@ def test_aaigrid_13():
     gdal.GetDriverByName('AAIGRID').Delete('tmp/aaigrid.tmp')
     assert ndv.startswith('nodata_value')
     assert ndv.endswith('-1e+05') or ndv.endswith('-1e+005')
-    return 'success'
 
 ###############################################################################
 # Test fix for #6060
@@ -342,8 +331,6 @@ def test_aaigrid_14():
 
     assert data.find('107.0 123') >= 0
 
-    return 'success'
-
 ###############################################################################
 # Test Float64 detection when nodata = DBL_MIN
 
@@ -365,8 +352,6 @@ def test_aaigrid_15():
 
     gdal.Unlink('/vsimem/aaigrid_15.asc')
 
-    return 'success'
-
 ###############################################################################
 
 
diff --git a/autotest/gdrivers/adrg.py b/autotest/gdrivers/adrg.py
index e247f2500dd4..305da669e29f 100755
--- a/autotest/gdrivers/adrg.py
+++ b/autotest/gdrivers/adrg.py
@@ -83,8 +83,6 @@ def test_adrg_copy():
 
     drv.Delete('tmp/ABCDEF01.GEN')
 
-    return 'success'
-
 ###############################################################################
 # Test creating a fake 2 subdataset image and reading it.
 
@@ -121,8 +119,6 @@ def test_adrg_2subdatasets():
     os.remove('tmp/XXXXXX02.IMG')
     os.remove('tmp/TRANSH01.THF')
 
-    return 'success'
-
 ###############################################################################
 # Test creating an in memory copy.
 
@@ -151,8 +147,6 @@ def test_adrg_copy_vsimem():
     drv.Delete('/vsimem/ABCDEF01.GEN')
     gdal.Unlink('/vsimem/TRANSH01.THF')
 
-    return 'success'
-
 ###############################################################################
 # Test reading a fake North Polar dataset (#6560)
 
@@ -168,8 +162,6 @@ def test_adrg_zna_9():
     assert wkt == """PROJCS["ARC_System_Zone_09",GEOGCS["GCS_Sphere",DATUM["D_Sphere",SPHEROID["Sphere",6378137.0,0.0]],PRIMEM["Greenwich",0],UNIT["degree",0.0174532925199433]],PROJECTION["Azimuthal_Equidistant"],PARAMETER["latitude_of_center",90],PARAMETER["longitude_of_center",0],PARAMETER["false_easting",0],PARAMETER["false_northing",0]]""", \
         'Wrong WKT'
 
-    return 'success'
-
 ###############################################################################
 # Test reading a fake South Polar dataset (#6560)
 
@@ -185,8 +177,6 @@ def test_adrg_zna_18():
     assert wkt == """PROJCS["ARC_System_Zone_18",GEOGCS["GCS_Sphere",DATUM["D_Sphere",SPHEROID["Sphere",6378137.0,0.0]],PRIMEM["Greenwich",0],UNIT["degree",0.0174532925199433]],PROJECTION["Azimuthal_Equidistant"],PARAMETER["latitude_of_center",-90],PARAMETER["longitude_of_center",0],PARAMETER["false_easting",0],PARAMETER["false_northing",0]]""", \
         'Wrong WKT'
 
-    return 'success'
-
 
 ###############################################################################
 gdaltest_list = [
diff --git a/autotest/gdrivers/aigrid.py b/autotest/gdrivers/aigrid.py
index f7e0769fc316..f33689d0e582 100755
--- a/autotest/gdrivers/aigrid.py
+++ b/autotest/gdrivers/aigrid.py
@@ -68,8 +68,6 @@ def test_aigrid_2():
 
     assert band1.DataType == gdal.GDT_Byte, 'Data type is not Byte!'
 
-    return 'success'
-
 ###############################################################################
 # Verify the colormap, and nodata setting for test file.
 
@@ -84,8 +82,6 @@ def test_aigrid_3():
     cm = None
 
     assert ds.GetRasterBand(1).GetNoDataValue() == 255.0, 'Wrong nodata value.'
-
-    return 'success'
 ###############################################################################
 # Read test of simple byte reference data with data directory name in all uppercase
 
@@ -110,8 +106,6 @@ def test_aigrid_5():
 
     assert ds.GetRasterBand(1).GetNoDataValue() == 255.0, 'Wrong nodata value.'
 
-    return 'success'
-
 ###############################################################################
 # Verify dataset whose sta.adf is 24 bytes
 
@@ -124,8 +118,6 @@ def test_aigrid_6():
 
     assert ds.GetRasterBand(1).GetMaximum() == 2.0, 'Wrong maximum'
 
-    return 'success'
-
 ###############################################################################
 # Test on real dataset downloaded from http://download.osgeo.org/gdal/data/aig/nzdem
 
@@ -168,7 +160,7 @@ def test_aigrid_online_1():
         rat = ds.GetRasterBand(1).GetDefaultRAT()
     except:
         print('Skipping RAT checking... OG Python bindings have no RAT API')
-        return 'success'
+        return
 
     assert rat is not None, 'No RAT found'
 
@@ -194,8 +186,6 @@ def test_aigrid_online_1():
 
     assert ds.GetRasterBand(1).GetMaximum() == 3627.0, 'Wrong maximum'
 
-    return 'success'
-
 ###############################################################################
 # Test on real dataset downloaded from http://download.osgeo.org/gdal/data/aig/nzdem
 
diff --git a/autotest/gdrivers/arg.py b/autotest/gdrivers/arg.py
index 78902c94c40b..705e62239ff2 100755
--- a/autotest/gdrivers/arg.py
+++ b/autotest/gdrivers/arg.py
@@ -122,8 +122,7 @@ def test_arg_init():
     if gdaltest.argDriver is None:
         pytest.skip()
 
-    return 'success'
-
+    
 
 def test_arg_unsupported():
     if gdaltest.argDriver is None:
@@ -140,8 +139,7 @@ def test_arg_unsupported():
                 ds = gdal.Open('data/arg-' + name + '.arg')
                 assert ds is not None
 
-    return 'success'
-
+    
 
 def test_arg_getrastercount():
     if gdaltest.argDriver is None:
@@ -156,8 +154,7 @@ def test_arg_getrastercount():
 
             assert ds.RasterCount == 1
 
-    return 'success'
-
+    
 
 def test_arg_getgeotransform():
     if gdaltest.argDriver is None:
@@ -179,8 +176,7 @@ def test_arg_getgeotransform():
                     gt[4] == 0 and \
                     gt[5] == -1)
 
-    return 'success'
-
+    
 
 def test_arg_blocksize():
     if gdaltest.argDriver is None:
@@ -210,8 +206,6 @@ def test_arg_blocksize():
 
     assert stat.st_size == (xsize * ysize)
 
-    return 'success'
-
 
 def test_arg_layername():
     """
@@ -251,8 +245,6 @@ def test_arg_layername():
 
     os.unlink('data/arg-int16.arg.aux.xml')
 
-    return 'success'
-
 
 def test_arg_nodata():
     """
@@ -266,8 +258,6 @@ def test_arg_nodata():
 
     assert ds.GetRasterBand(1).GetNoDataValue() == 128
 
-    return 'success'
-
 
 def test_arg_byteorder():
     """
@@ -316,8 +306,7 @@ def test_arg_byteorder():
 
             assert data1 == data2
 
-    return 'success'
-
+    
 
 def test_arg_destroy():
     if gdaltest.argDriver is None:
@@ -328,8 +317,7 @@ def test_arg_destroy():
             os.remove('data/arg-' + name + '.arg')
             os.remove('data/arg-' + name + '.json')
 
-    return 'success'
-
+    
 
 gdaltest_list = [
     test_arg_init,
diff --git a/autotest/gdrivers/bag.py b/autotest/gdrivers/bag.py
index b6575531b131..fafebf28a4e2 100755
--- a/autotest/gdrivers/bag.py
+++ b/autotest/gdrivers/bag.py
@@ -96,8 +96,6 @@ def test_bag_2():
 
     assert not gdaltest.is_file_open('data/true_n_nominal.bag'), 'file still opened.'
 
-    return 'success'
-
 ###############################################################################
 # Test a southern hemisphere falseNorthing sample file.
 
@@ -123,8 +121,6 @@ def test_bag_3():
     assert 'PARAMETER["false_northing",10000000]' in pj, \
         'Did not find false_northing of 10000000'
 
-    return 'success'
-
 ###############################################################################
 #
 
@@ -188,8 +184,6 @@ def test_bag_vr_normal():
     got_md2 = gdal.Info(ds, computeChecksum=True, format='json')
     assert got_md2 == got_md
 
-    return 'success'
-
 ###############################################################################
 #
 
@@ -247,8 +241,7 @@ def test_bag_vr_list_supergrids():
                 'SUPERGRIDS_INDICES=' + invalid_val])
         assert gdal.GetLastErrorMsg() != '', invalid_val
 
-    return 'success'
-
+    
 ###############################################################################
 #
 
@@ -318,8 +311,6 @@ def test_bag_vr_open_supergrids():
                          open_options=['MINX=0'])
     assert gdal.GetLastErrorMsg() != '', 'warning expected'
 
-    return 'success'
-
 ###############################################################################
 #
 
@@ -561,8 +552,7 @@ def test_bag_vr_resampled():
         print(m1_min, M1_min, mean1_min)
         pytest.fail(m2_min, M2_min, mean2_min)
 
-    return 'success'
-
+    
 ###############################################################################
 #
 
@@ -582,8 +572,6 @@ def test_bag_vr_resampled_mask():
     cs = ds.GetRasterBand(1).Checksum()
     assert cs == 4507
 
-    return 'success'
-
 ###############################################################################
 #
 
@@ -613,8 +601,6 @@ def test_bag_vr_resampled_interpolated():
                                        'INTERPOLATION=INVDIST'])
     assert ds is None
 
-    return 'success'
-
 ###############################################################################
 #
 
@@ -653,8 +639,6 @@ def test_bag_write_two_bands():
 
     gdal.Unlink('/vsimem/out.bag')
 
-    return 'success'
-
 ###############################################################################
 #
 
@@ -683,8 +667,6 @@ def test_bag_write_south_up():
 
     gdal.Unlink('/vsimem/out.bag')
 
-    return 'success'
-
 
 gdaltest_list = [test_bag_2,
                  test_bag_3,
diff --git a/autotest/gdrivers/blx.py b/autotest/gdrivers/blx.py
index ae00a018f196..2b3a9ab48a38 100755
--- a/autotest/gdrivers/blx.py
+++ b/autotest/gdrivers/blx.py
@@ -97,8 +97,6 @@ def test_blx_5():
     cs = band.GetOverview(3).Checksum()
     assert cs == 12058, ('wrong overview checksum (%d)' % cs)
 
-    return 'success'
-
 
 gdaltest_list = [
     test_blx_1,
diff --git a/autotest/gdrivers/bsb.py b/autotest/gdrivers/bsb.py
index 686f77609132..cb6926c8cc8e 100755
--- a/autotest/gdrivers/bsb.py
+++ b/autotest/gdrivers/bsb.py
@@ -44,8 +44,7 @@ def test_bsb_0():
     if gdaltest.bsb_dr is None:
         pytest.skip()
 
-    return 'success'
-
+    
 ###############################################################################
 # Test Read
 
diff --git a/autotest/gdrivers/bt.py b/autotest/gdrivers/bt.py
index 4a84a5bbaa04..b37bca8efd8b 100755
--- a/autotest/gdrivers/bt.py
+++ b/autotest/gdrivers/bt.py
@@ -108,8 +108,6 @@ def test_bt_cleanup():
     gdal.Unlink('tmp/int32.tif.prj')
     gdal.Unlink('tmp/float32.tif.prj')
 
-    return 'success'
-
 
 gdaltest_list = [
     test_bt_1,
diff --git a/autotest/gdrivers/cals.py b/autotest/gdrivers/cals.py
index ce0c174fc6fe..91c6787431ac 100755
--- a/autotest/gdrivers/cals.py
+++ b/autotest/gdrivers/cals.py
@@ -77,8 +77,6 @@ def test_cals_3():
     gdal.Unlink('/vsimem/cals_2_tmp.cal.aux.xml')
     gdal.Unlink('/vsimem/cals_2.cal')
 
-    return 'success'
-
 ###############################################################################
 # Test CreateCopy() error conditions
 
@@ -122,8 +120,6 @@ def test_cals_4():
     gdal.PopErrorHandler()
     assert out_ds is None
 
-    return 'success'
-
 ###############################################################################
 # Test PIXEL_PATH & LINE_PROGRESSION metadata item
 
@@ -141,8 +137,6 @@ def test_cals_5():
     out_ds = None
     gdal.Unlink('/vsimem/cals_5.cal')
 
-    return 'success'
-
 ###############################################################################
 
 
diff --git a/autotest/gdrivers/db2.py b/autotest/gdrivers/db2.py
index 31cc2c3f9597..d61faf712d0e 100755
--- a/autotest/gdrivers/db2.py
+++ b/autotest/gdrivers/db2.py
@@ -71,8 +71,6 @@ def test_gpkg_init():
 
     print("\ntest server: " + gdaltest.db2_test_server + "\n")
 
-    return 'success'
-
 ###############################################################################
 #
 
@@ -141,7 +139,7 @@ def check_tile_format(out_ds, expected_format, expected_band_count, expected_ct,
 
     if expected_format is None:
         if mime_type is None:
-            return 'success'
+            return
         pytest.fail()
 
     if expected_format == 'PNG':
@@ -154,7 +152,6 @@ def check_tile_format(out_ds, expected_format, expected_band_count, expected_ct,
     assert mime_type == expected_mime_type
     assert band_count == expected_band_count
     assert expected_ct == has_ct
-    return 'success'
 
 ###############################################################################
 # Single band, PNG
@@ -199,8 +196,6 @@ def test_gpkg_1():
     got_cs = [out_ds.GetRasterBand(i + 1).Checksum() for i in range(4)]
     assert got_cs == expected_cs
 
-    return 'success'
-
 ###############################################################################
 
 
diff --git a/autotest/gdrivers/derived.py b/autotest/gdrivers/derived.py
index 8ea374e750ab..9adc7d89ccbf 100755
--- a/autotest/gdrivers/derived.py
+++ b/autotest/gdrivers/derived.py
@@ -79,8 +79,7 @@ def test_derived_test1():
                 import pprint
                 pprint.pprint("Expected projection: " + str(expected_prj) + ", got: " + str(gt))
                 pytest.fail()
-    return 'success'
-
+    
 
 def test_derived_test2():
     filename = "../gcore/data/cint_sar.tif"
@@ -127,8 +126,7 @@ def test_derived_test2():
                 pprint.pprint("Expected checksum " + str(expected_cs[key]) + ", got " + str(cs))
                 pytest.fail()
 
-    return 'success'
-
+    
 # Error cases
 
 
@@ -159,8 +157,7 @@ def test_derived_test3():
         with gdaltest.error_handler():
             ds.GetRasterBand(1).Checksum()
 
-    return 'success'
-
+    
 
 gdaltest_list = [
     test_derived_test1,
diff --git a/autotest/gdrivers/dimap.py b/autotest/gdrivers/dimap.py
index 9e8e5f29a38a..1641c9ed069b 100755
--- a/autotest/gdrivers/dimap.py
+++ b/autotest/gdrivers/dimap.py
@@ -73,8 +73,6 @@ def test_dimap_1():
     os.unlink('tmp/IMAGERY.TIF')
     os.unlink('tmp/rgbsmall.tif')
 
-    return 'success'
-
 ###############################################################################
 # Open DIMAP 2
 
@@ -99,8 +97,7 @@ def test_dimap_2():
 
         ds = None
 
-    return 'success'
-
+    
 
 gdaltest_list = [
     test_dimap_1,
diff --git a/autotest/gdrivers/dods.py b/autotest/gdrivers/dods.py
index 976265d654b9..b52d430958d1 100755
--- a/autotest/gdrivers/dods.py
+++ b/autotest/gdrivers/dods.py
@@ -53,8 +53,7 @@ def dods_1():
         gdaltest.dods_dr = None
         pytest.fail()
 
-    return 'success'
-
+    
 ###############################################################################
 # Simple read test on a single variable.
 
@@ -112,7 +111,6 @@ def dods_6():
     gdaltest.dods_grid_ds = gdal.Open('http://g0dup05u.ecs.nasa.gov/opendap/AIRS/AIRX3STD.003/2004.12.28/AIRS.2004.12.28.L3.RetStd001.v4.0.9.0.G05253115303.hdf?TotH2OVap_A[y][x]')
     nd = gdaltest.dods_grid_ds.GetRasterBand(1).GetNoDataValue()
     assert nd == -9999.0, 'nodata value wrong or missing.'
-    return 'success'
 
 ###############################################################################
 # Cleanup
@@ -125,8 +123,6 @@ def dods_cleanup():
     gdaltest.dods_dr = None
     gdaltest.dods_grid_ds = None
 
-    return 'success'
-
 
 gdaltest_list = []
 
diff --git a/autotest/gdrivers/doq2.py b/autotest/gdrivers/doq2.py
index f56bc05b2ad7..4585651284fd 100755
--- a/autotest/gdrivers/doq2.py
+++ b/autotest/gdrivers/doq2.py
@@ -63,8 +63,6 @@ def test_doq2_1():
     mem_ds = None
     ds = None
 
-    return 'success'
-
 
 gdaltest_list = [
     test_doq2_1]
diff --git a/autotest/gdrivers/dted.py b/autotest/gdrivers/dted.py
index b5c78074dc6f..41e48c2676ba 100755
--- a/autotest/gdrivers/dted.py
+++ b/autotest/gdrivers/dted.py
@@ -70,8 +70,6 @@ def test_dted_2():
 
     assert band1.DataType == gdal.GDT_Int16, 'Data type is not Int16!'
 
-    return 'success'
-
 ###############################################################################
 # Create simple copy and check.
 
@@ -115,8 +113,6 @@ def test_dted_5():
 
     ds = None
 
-    return 'success'
-
 ###############################################################################
 # Test a DTED Level 2 (made from a DTED Level 0)
 
@@ -138,8 +134,6 @@ def test_dted_6():
 
     ds = None
 
-    return 'success'
-
 ###############################################################################
 # Test a WGS72 georeferenced DTED
 
@@ -157,8 +151,6 @@ def test_dted_7():
     assert prj == 'GEOGCS["WGS 72",DATUM["WGS_1972",SPHEROID["WGS 72",6378135,298.26]],PRIMEM["Greenwich",0],UNIT["degree",0.0174532925199433],AUTHORITY["EPSG","4322"]]', \
         ('Projection does not match expected:\n%s' % prj)
 
-    return 'success'
-
 ###############################################################################
 # Test a file whose checksum is corrupted
 
@@ -183,8 +175,6 @@ def test_dted_8():
     # so we should not get this value
     assert chksum != 49187, 'DTED_VERIFY_CHECKSUM=YES has had no effect!'
 
-    return 'success'
-
 ###############################################################################
 # Test a DTED Level 1 above latitude 50 (made from a DTED Level 0)
 
@@ -220,8 +210,6 @@ def test_dted_9():
 
     assert chksum == 36542, ('Wrong checksum. Checksum found %d' % chksum)
 
-    return 'success'
-
 ###############################################################################
 # Test creating an in memory copy.
 
@@ -258,8 +246,6 @@ def test_dted_11():
 
     assert band1.DataType == gdal.GDT_Int16, 'Data type is not Int16!'
 
-    return 'success'
-
 ###############################################################################
 # Test a DTED file that begins with a HDR record, and not directly the UHL record (#2951)
 
@@ -269,8 +255,6 @@ def test_dted_12():
     ds = gdal.Open('data/w118n033_trunc.dt1')
     assert ds is not None
 
-    return 'success'
-
 ###############################################################################
 # Test a DTED file that has only a few (sequential) columns. Derived from
 # a real-world DTED file
@@ -320,8 +304,7 @@ def test_dted_cleanup():
         os.remove('tmp/n43.dt2')
     except OSError:
         pass
-    return 'success'
-
+    
 
 gdaltest_list = [
     test_dted_1,
diff --git a/autotest/gdrivers/ecrgtoc.py b/autotest/gdrivers/ecrgtoc.py
index c5cab0d6a4f5..bbf0f439976a 100755
--- a/autotest/gdrivers/ecrgtoc.py
+++ b/autotest/gdrivers/ecrgtoc.py
@@ -115,8 +115,6 @@ def test_ecrgtoc_1():
 
     assert cs == 5966, 'bad checksum'
 
-    return 'success'
-
 ###############################################################################
 # Test overviews
 
@@ -134,8 +132,6 @@ def test_ecrgtoc_2():
 
     ds = None
 
-    return 'success'
-
 ###############################################################################
 # Test opening subdataset
 
@@ -174,8 +170,6 @@ def test_ecrgtoc_3():
     gdal.Unlink('/vsimem/clfc/2/000000009s0013.lf2')
     gdal.Unlink('/vsimem/clfc/2/000000009t0013.lf2')
 
-    return 'success'
-
 ###############################################################################
 # Test dataset with 3 subdatasets
 
@@ -275,8 +269,6 @@ def test_ecrgtoc_4():
 
     gdal.Unlink('/vsimem/TOC.xml')
 
-    return 'success'
-
 ###############################################################################
 
 
@@ -306,8 +298,6 @@ def test_ecrgtoc_online_1():
     filelist = ds.GetFileList()
     assert len(filelist) == 7, 'did not get expected filelist'
 
-    return 'success'
-
 
 gdaltest_list = [
     test_ecrgtoc_1,
diff --git a/autotest/gdrivers/ecw.py b/autotest/gdrivers/ecw.py
index 090c40d0aa65..e849b87197e1 100755
--- a/autotest/gdrivers/ecw.py
+++ b/autotest/gdrivers/ecw.py
@@ -67,7 +67,6 @@ def has_write_support():
 def test_ecw_init():
 
     gdaltest.deregister_all_jpeg2000_drivers_but('JP2ECW')
-    return 'success'
 
 ###############################################################################
 # Verify we have the driver.
@@ -103,7 +102,6 @@ def test_ecw_1():
 
     # we set ECW to not resolve projection and datum strings to get 3.x behavior.
     gdal.SetConfigOption("ECW_DO_NOT_RESOLVE_DATUM_PROJECTION", "YES")
-    return 'success'
 
 ###############################################################################
 # Verify various information about our test image.
@@ -133,8 +131,6 @@ def test_ecw_2():
     assert abs(geotransform[0] - 467498.5) <= 0.1 and abs(geotransform[1] - 16.5475) <= 0.001 and abs(geotransform[2] - 0) <= 0.001 and abs(geotransform[3] - 5077883.2825) <= 0.1 and abs(geotransform[4] - 0) <= 0.001 and abs(geotransform[5] - -16.5475) <= 0.001, \
         'geotransform differs from expected'
 
-    return 'success'
-
 ###############################################################################
 # Verify that an write the imagery out to a new file.
 
@@ -158,8 +154,6 @@ def test_ecw_3():
 
     gdaltest.b_ecw_has_write_support = True
 
-    return 'success'
-
 ###############################################################################
 # Verify various information about our generated image.
 
@@ -194,8 +188,6 @@ def test_ecw_4():
 
     ds = None
 
-    return 'success'
-
 ###############################################################################
 # Now try writing a JPEG2000 compressed version of the same with the ECW driver
 
@@ -211,8 +203,6 @@ def test_ecw_5():
     assert version == '1', 'bad VERSION'
     ds = None
 
-    return 'success'
-
 ###############################################################################
 # Verify various information about our generated image.
 
@@ -256,8 +246,6 @@ def test_ecw_6():
 
     ds = None
 
-    return 'success'
-
 ###############################################################################
 # Write the same image to NITF.
 
@@ -271,8 +259,6 @@ def test_ecw_7():
     drv.CreateCopy('tmp/ecw_7.ntf', ds, options=['IC=C8', 'TARGET=75'], strict=0)
     ds = None
 
-    return 'success'
-
 ###############################################################################
 # Verify various information about our generated image.
 
@@ -300,8 +286,6 @@ def test_ecw_8():
 
     ds = None
 
-    return 'success'
-
 ###############################################################################
 # Try writing 16bit JP2 file directly using Create().
 
@@ -327,8 +311,6 @@ def test_ecw_9():
                        buf_type=gdal.GDT_Int16)
     ds = None
 
-    return 'success'
-
 ###############################################################################
 # Verify previous 16bit file.
 
@@ -353,10 +335,6 @@ def test_ecw_10():
     assert abs(geotransform[0] - 100) <= 0.1 and abs(geotransform[1] - 0.1) <= 0.001 and abs(geotransform[2] - 0) <= 0.001 and abs(geotransform[3] - 30) <= 0.1 and abs(geotransform[4] - 0) <= 0.001 and abs(geotransform[5] - -0.1) <= 0.001, \
         'geotransform differs from expected'
 
-    # should check the projection, but I'm too lazy just now.
-
-    return 'success'
-
 ###############################################################################
 # Test direct creation of an NITF/JPEG2000 file.
 
@@ -384,8 +362,6 @@ def test_ecw_11():
 
     ds = None
 
-    return 'success'
-
 ###############################################################################
 # Verify previous file
 
@@ -411,8 +387,6 @@ def test_ecw_12():
 
     ds = None
 
-    return 'success'
-
 ###############################################################################
 # This is intended to verify that the ECWDataset::RasterIO() special case
 # works properly.  It is used to copy subwindow into a memory dataset
@@ -443,8 +417,6 @@ def test_ecw_13():
     assert checksums == (19253, 17848, 19127), \
         'Expected checksums do match expected checksums'
 
-    return 'success'
-
 ###############################################################################
 # Write out image with GCPs.
 
@@ -456,8 +428,6 @@ def test_ecw_14():
     ds = gdal.Open('data/rgb_gcp.vrt')
     gdaltest.jp2ecw_drv.CreateCopy('tmp/rgb_gcp.jp2', ds)
     ds = None
-
-    return 'success'
 ###############################################################################
 # Verify various information about our generated image.
 
@@ -480,8 +450,6 @@ def test_ecw_15():
 
     ds = None
 
-    return 'success'
-
 ###############################################################################
 # Open byte.jp2
 
@@ -538,8 +506,6 @@ def test_ecw_17():
     # Quite a bit of difference...
     assert maxdiff <= 6, 'Image too different from reference'
 
-    return 'success'
-
 ###############################################################################
 # Open byte.jp2.gz (test use of the VSIL API)
 
@@ -592,8 +558,6 @@ def test_ecw_19():
 
     assert ds.GetRasterBand(1).DataType == gdal.GDT_UInt16, 'unexpected data type'
 
-    return 'success'
-
 ###############################################################################
 # Confirm that we have an overview for this image and that the statistics
 # are as expected.
@@ -628,8 +592,6 @@ def test_ecw_20():
                              'expected(%g,%g)' % (mean, stddev, exp_mean,
                                                   exp_stddev))
 
-    return 'success'
-
 ###############################################################################
 # This test is intended to go through an optimized data path (likely
 # one big interleaved read) in the CreateCopy() instead of the line by
@@ -659,8 +621,6 @@ def test_ecw_21():
     assert abs(mean - exp_mean) <= 0.5 and abs(stddev - exp_stddev) <= 0.5, \
         ('mean/stddev of (%g,%g) diffs from expected(%g,%g)' % (mean, stddev, exp_mean, exp_stddev))
 
-    return 'success'
-
 ###############################################################################
 # This tests reading of georeferencing and coordinate system from within an
 # ECW file.
@@ -678,8 +638,6 @@ def test_ecw_22():
 
     assert wkt == expected_wkt, 'did not get expected SRS.'
 
-    return 'success'
-
 ###############################################################################
 # This tests overriding the coordinate system from an .aux.xml file, while
 # preserving the ecw derived georeferencing.
@@ -710,8 +668,7 @@ def test_ecw_23():
     except OSError:
         pass
 
-    return 'success'
-
+    
 ###############################################################################
 # Test that we can alter geotransform on existing ECW
 
@@ -756,8 +713,7 @@ def test_ecw_24():
     except OSError:
         pass
 
-    return 'success'
-
+    
 ###############################################################################
 # Test that we can alter projection info on existing ECW (through SetProjection())
 
@@ -814,8 +770,7 @@ def test_ecw_25():
     except OSError:
         pass
 
-    return 'success'
-
+    
 ###############################################################################
 # Test that we can alter projection info on existing ECW (through SetMetadataItem())
 
@@ -875,8 +830,7 @@ def test_ecw_26():
     except OSError:
         pass
 
-    return 'success'
-
+    
 ###############################################################################
 # Check that we can use .j2w world files (#4651)
 
@@ -894,8 +848,6 @@ def test_ecw_27():
 
     ds = None
 
-    return 'success'
-
 ###############################################################################
 # Check picking use case
 
@@ -921,11 +873,6 @@ def test_ecw_28():
     struct.unpack('B' * 3, multiband_data)
     struct.unpack('B' * 3, data1 + data2 + data3)
 
-    # Due to the nature of ECW, reading one band or several bands does not give
-    # the same results.
-
-    return 'success'
-
 ###############################################################################
 # Test supersampling
 
@@ -1014,8 +961,6 @@ def test_ecw_30():
 
     assert data_readraster == data_readblock
 
-    return 'success'
-
 ###############################################################################
 # Test async reader interface ( SDK >= 4.x )
 
@@ -1058,8 +1003,6 @@ def test_ecw_31():
 
     assert async_buf == ref_buf, 'async_buf != ref_buf'
 
-    return 'success'
-
 ###############################################################################
 # ECW SDK 3.3 has a bug with the ECW format when we query the
 # number of bands of the dataset, but not in the "natural order".
@@ -1100,8 +1043,6 @@ def test_ecw_32():
 
     assert data_321 == data_vrt
 
-    return 'success'
-
 ###############################################################################
 # Test heuristics that detect successive band reading pattern
 
@@ -1154,8 +1095,6 @@ def test_ecw_33():
 
     ds = None
 
-    return 'success'
-
 ###############################################################################
 # Check bugfix for #5262
 
@@ -1191,8 +1130,6 @@ def test_ecw_33_bis():
 
     ds = None
 
-    return 'success'
-
 ###############################################################################
 # Verify that an write the imagery out to a new ecw file. Source file is 16 bit.
 
@@ -1219,8 +1156,6 @@ def test_ecw_34():
     assert got_data == ref_data
     assert version == '3', 'bad VERSION'
 
-    return 'success'
-
 ###############################################################################
 # Verify that an write the imagery out to a new JP2 file. Source file is 16 bit.
 
@@ -1241,7 +1176,6 @@ def test_ecw_35():
     ds = None
 
     assert got_data == ref_data
-    return 'success'
 
 ###############################################################################
 # Make sure that band descriptions are preserved for version 3 ECW files.
@@ -1299,8 +1233,6 @@ def test_ecw_36():
         ('Band 3 color interpretation should be Green but is : ' + gdal.GetColorInterpretationName(dsr.GetRasterBand(3).GetColorInterpretation()))
 
     dsr = None
-
-    return 'success'
 ###############################################################################
 # Make sure that band descriptions are preserved for version 2 ECW files when
 # color space set implicitly to sRGB.
@@ -1337,8 +1269,6 @@ def test_ecw_37():
 
     dsr = None
 
-    return 'success'
-
 ###############################################################################
 # Check opening unicode files.
 
@@ -1372,8 +1302,6 @@ def test_ecw_38():
     # Quite a bit of difference...
     assert maxdiff <= 0, 'Image too different from reference'
 
-    return 'success'
-
 
 ###############################################################################
 # Check writing histograms.
@@ -1401,8 +1329,6 @@ def test_ecw_39():
     ds = None
     assert result, 'Default histogram written incorrectly'
 
-    return 'success'
-
 ###############################################################################
 # Check reading a ECW v3 file
 
@@ -1448,8 +1374,7 @@ def test_ecw_40():
         got_cs = ds.GetRasterBand(i + 1).Checksum()
         assert got_cs == expected_cs_list[i]
 
-    return 'success'
-
+    
 ###############################################################################
 # Check generating statistics & histogram for a ECW v3 file
 
@@ -1524,8 +1449,7 @@ def test_ecw_41():
     except OSError:
         pass
 
-    return 'success'
-
+    
 ###############################################################################
 # Test setting/unsetting file metadata of a ECW v3 file
 
@@ -1600,8 +1524,6 @@ def test_ecw_42():
         assert item not in got_md or item == 'FILE_METADATA_ACQUISITION_DATE', md[item]
     ds = None
 
-    return 'success'
-
 ###############################################################################
 # Test auto-promotion of 1bit alpha band to 8bit
 # Note: only works on reversible files like this one
@@ -1639,8 +1561,6 @@ def test_ecw_43():
     fourth_band = ds.GetRasterBand(4)
     assert fourth_band.GetMetadataItem('NBITS', 'IMAGE_STRUCTURE') == '1'
 
-    return 'success'
-
 ###############################################################################
 # Test metadata retrieval from JP2 file
 
@@ -1678,8 +1598,7 @@ def test_ecw_44():
     for (key, value) in expected_md:
         assert key in got_md and got_md[key] == value
 
-    return 'success'
-
+    
 ###############################################################################
 # Test metadata reading & writing
 
@@ -1763,8 +1682,7 @@ def test_ecw_45():
         assert ds.GetMetadata('xml:XMP')[0] == '<fake_xmp_box/>'
         gdal.Unlink('/vsimem/ecw_45.jp2')
 
-    return 'success'
-
+    
 ###############################################################################
 # Test non nearest upsampling
 
@@ -1793,8 +1711,6 @@ def test_ecw_46():
     cs = mem_ds.GetRasterBand(1).Checksum()
     assert cs == ref_cs
 
-    return 'success'
-
 ###############################################################################
 # /vsi reading with ECW (#6482)
 
@@ -1827,8 +1743,6 @@ def test_ecw_47():
 
     gdal.Unlink('/vsimem/ecw_47.ecw')
 
-    return 'success'
-
 ###############################################################################
 # Test "Upward" orientation is forced by default
 
@@ -1849,8 +1763,6 @@ def test_ecw_48():
     expected_gt = (6138559.5576418638, 195.5116973254697, 0.0, 2274798.7836679211, 0.0, -198.32414964918371)
     assert gt == expected_gt, 'did not get expected geotransform.'
 
-    return 'success'
-
 ###############################################################################
 # Test "Upward" orientation can be overridden with ECW_ALWAYS_UPWARD=FALSE
 
@@ -1870,8 +1782,6 @@ def test_ecw_49():
     expected_gt = (6138559.5576418638, 195.5116973254697, 0.0, 2274798.7836679211, 0.0, 198.32414964918371)
     assert gt == expected_gt, 'did not get expected geotransform.'
 
-    return 'success'
-
 ###############################################################################
 
 
@@ -1891,8 +1801,6 @@ def test_ecw_online_1():
     ds.GetRasterBand(1).Checksum()
     ds = None
 
-    return 'success'
-
 ###############################################################################
 
 
@@ -1917,8 +1825,6 @@ def test_ecw_online_2():
 
     ds = None
 
-    return 'success'
-
 ###############################################################################
 
 
@@ -1950,8 +1856,6 @@ def ecw_online_3():
     # Difference between the image before and after compression
     assert maxdiff <= 16, 'Image too different from reference'
 
-    return 'success'
-
 ###############################################################################
 
 
@@ -1985,8 +1889,6 @@ def test_ecw_online_4():
     # Difference between the image before and after compression
     assert maxdiff <= 1, 'Image too different from reference'
 
-    return 'success'
-
 ###############################################################################
 
 
@@ -2016,8 +1918,6 @@ def test_ecw_online_5():
     assert abs(mean - exp_mean) <= mean_tolerance and abs(stddev - exp_stddev) <= 0.5, \
         ('mean/stddev of (%g,%g) diffs from expected(%g,%g)' % (mean, stddev, exp_mean, exp_stddev))
 
-    return 'success'
-
 ###############################################################################
 # This tests the HTTP driver in fact. To ensure if keeps the original filename,
 # and in particular the .ecw extension, to make the ECW driver happy
@@ -2056,8 +1956,6 @@ def test_ecw_online_6():
         pytest.fail()
     ds = None
 
-    return 'success'
-
 ###############################################################################
 # ECWv2 file with alpha channel (#6028)
 
@@ -2078,8 +1976,6 @@ def test_ecw_online_7():
     assert ds.RasterCount == expected_band_count, \
         ('Expected %d bands, got %d' % (expected_band_count, ds.RasterCount))
 
-    return 'success'
-
 ###############################################################################
 
 
@@ -2166,8 +2062,6 @@ def test_ecw_cleanup():
         pass
     gdaltest.reregister_all_jpeg2000_drivers()
 
-    return 'success'
-
 
 gdaltest_list = [
     test_ecw_init,
diff --git a/autotest/gdrivers/eedai.py b/autotest/gdrivers/eedai.py
index 7cb860c7b7e6..f13ea938621c 100644
--- a/autotest/gdrivers/eedai.py
+++ b/autotest/gdrivers/eedai.py
@@ -61,8 +61,6 @@ def test_eedai_1():
     gdaltest.GOOGLE_APPLICATION_CREDENTIALS = gdal.GetConfigOption('GOOGLE_APPLICATION_CREDENTIALS')
     gdal.SetConfigOption('GOOGLE_APPLICATION_CREDENTIALS', '')
 
-    return 'success'
-
 ###############################################################################
 # Nominal case
 
@@ -337,8 +335,6 @@ def test_eedai_2():
 
     gdal.SetConfigOption('EEDA_BEARER', None)
 
-    return 'success'
-
 ###############################################################################
 # Test OAuth2 with ServiceAccount
 
@@ -389,8 +385,6 @@ def test_eedai_3():
 
     assert ds is not None
 
-    return 'success'
-
 ###############################################################################
 # Test OAuth2 with GOOGLE_APPLICATION_CREDENTIALS
 
@@ -446,8 +440,6 @@ def test_eedai_GOOGLE_APPLICATION_CREDENTIALS():
 
     assert ds is not None
 
-    return 'success'
-
 ###############################################################################
 # Read credentials from simulated GCE instance
 
@@ -514,8 +506,6 @@ def method(request):
 
     assert ds is not None
 
-    return 'success'
-
 ###############################################################################
 # Request in PNG mode
 
@@ -648,8 +638,6 @@ def test_eedai_4():
 
     gdal.SetConfigOption('EEDA_BEARER', None)
 
-    return 'success'
-
 ###############################################################################
 # Request in AUTO GTIFF mode
 
@@ -711,8 +699,6 @@ def test_eedai_geotiff():
 
     gdal.SetConfigOption('EEDA_BEARER', None)
 
-    return 'success'
-
 ###############################################################################
 #
 
@@ -744,8 +730,6 @@ def test_eedai_real_service():
     assert expected == res
     assert ds.ReadRaster(0, 0, 1, 1) is not None
 
-    return 'success'
-
 ###############################################################################
 #
 
@@ -767,8 +751,6 @@ def test_eedai_cleanup():
     gdal.Unlink('/vsimem/ee/projects/earthengine-public/assets/image')
     gdal.RmdirRecursive('/vsimem/ee/')
 
-    return 'success'
-
 
 gdaltest_list = [
     test_eedai_1,
diff --git a/autotest/gdrivers/ehdr.py b/autotest/gdrivers/ehdr.py
index 0d7bb65b1528..5345879d44be 100755
--- a/autotest/gdrivers/ehdr.py
+++ b/autotest/gdrivers/ehdr.py
@@ -100,8 +100,6 @@ def test_ehdr_4():
 
     ds = None
 
-    return 'success'
-
 ###############################################################################
 # verify last dataset's colortable and nodata value.
 
@@ -124,8 +122,6 @@ def test_ehdr_5():
 
     gdal.GetDriverByName('EHdr').Delete('tmp/test_4.bil')
 
-    return 'success'
-
 ###############################################################################
 # Test creating an in memory copy.
 
@@ -169,8 +165,6 @@ def test_ehdr_8():
 
     drv.Delete('tmp/ehdr_8.bil')
 
-    return 'success'
-
 ###############################################################################
 # Test opening worldclim .hdr files that have a few extensions fields in the
 # .hdr file to specify minimum, maximum and projection. Also test that we
@@ -191,8 +185,6 @@ def test_ehdr_9():
 
     ds = None
 
-    return 'success'
-
 ###############################################################################
 # Test detecting floating point file based on image file size (#3933)
 
@@ -228,8 +220,6 @@ def test_ehdr_12():
 
     gdal.GetDriverByName('EHDR').Delete('/vsimem/1bit.bil')
 
-    return 'success'
-
 ###############################################################################
 # Test statistics
 
@@ -269,8 +259,6 @@ def test_ehdr_13():
 
     gdal.GetDriverByName('EHDR').Delete('/vsimem/byte.bil')
 
-    return 'success'
-
 ###############################################################################
 # Test optimized RasterIO() (#5438)
 
@@ -316,8 +304,6 @@ def test_ehdr_14():
     gdal.GetDriverByName('EHDR').Delete('/vsimem/byte.bil')
     gdal.GetDriverByName('EHDR').Delete('/vsimem/byte_reduced.bil')
 
-    return 'success'
-
 ###############################################################################
 # Test support for RAT (#3253)
 
@@ -352,8 +338,6 @@ def test_ehdr_rat():
 
     gdal.GetDriverByName('EHDR').Delete(tmpfile)
 
-    return 'success'
-
 
 ###############################################################################
 # Test STATISTICS_APPROXIMATE
@@ -395,8 +379,6 @@ def test_ehdr_approx_stats_flag():
 
     gdal.GetDriverByName('EHDR').Delete(tmpfile)
 
-    return 'success'
-
 
 gdaltest_list = [
     test_ehdr_1,
diff --git a/autotest/gdrivers/envi.py b/autotest/gdrivers/envi.py
index 8bcef549b83f..69496d963d8b 100755
--- a/autotest/gdrivers/envi.py
+++ b/autotest/gdrivers/envi.py
@@ -200,8 +200,6 @@ def test_envi_8():
 
     gdal.GetDriverByName('ENVI').Delete('/vsimem/foo.bsq')
 
-    return 'success'
-
 ###############################################################################
 # Verify reading a compressed file
 
@@ -232,8 +230,6 @@ def test_envi_10():
 
     assert md['HEIGHT_OFF'] == '3355'
 
-    return 'success'
-
 ###############################################################################
 # Check .sta reading
 
@@ -246,8 +242,6 @@ def test_envi_11():
 
     assert val == [1.0, 3.0, 2.0, 0.5], 'bad stats'
 
-    return 'success'
-
 ###############################################################################
 # Test category names reading and writing
 
@@ -274,8 +268,6 @@ def test_envi_12():
     ds = None
     gdal.GetDriverByName('ENVI').Delete('/vsimem/testenviclasses')
 
-    return 'success'
-
 ###############################################################################
 # Test writing of metadata from the ENVI metadata domain and read it back (#4957)
 
@@ -298,8 +290,6 @@ def test_envi_13():
 
     assert val == 'Landsat TM'
 
-    return 'success'
-
 ###############################################################################
 # Test that the image file is at the expected size on closing (#6662)
 
@@ -314,8 +304,6 @@ def test_envi_14():
 
     gdal.GetDriverByName('ENVI').Delete('/vsimem/envi_14.dat')
 
-    return 'success'
-
 ###############################################################################
 # Test reading and writing geotransform matrix with rotation
 
@@ -338,8 +326,6 @@ def test_envi_15():
     ds = None
     gdal.GetDriverByName('ENVI').Delete('/vsimem/envi_15.dat')
 
-    return 'success'
-
 ###############################################################################
 # Test reading a truncated ENVI dataset (see #915)
 
@@ -361,8 +347,6 @@ def test_envi_truncated():
 
     assert cs == 2315
 
-    return 'success'
-
 
 gdaltest_list = [
     test_envi_1,
diff --git a/autotest/gdrivers/envisat.py b/autotest/gdrivers/envisat.py
index 9e807392d7b1..4aa777a48452 100755
--- a/autotest/gdrivers/envisat.py
+++ b/autotest/gdrivers/envisat.py
@@ -105,8 +105,6 @@ def test_envisat_1(self):
         assert (ds.RasterXSize, ds.RasterYSize) == self.size, \
             ('Bad size. Expected %s, got %s' % (self.size, (ds.RasterXSize, ds.RasterYSize)))
 
-        return 'success'
-
     def test_envisat_2(self):
         if not self.download_file():
             pytest.skip()
@@ -117,8 +115,6 @@ def test_envisat_2(self):
         assert ds.GetRasterBand(1).Checksum() == self.checksum, \
             ('Bad checksum. Expected %d, got %d' % (self.checksum, ds.GetRasterBand(1).Checksum()))
 
-        return 'success'
-
     def test_envisat_3(self):
         # Regression test for #3160 and #3709.
 
@@ -136,8 +132,7 @@ def test_envisat_3(self):
             else:
                 d[lp] = (gcp.GCPX, gcp.GCPY, gcp.GCPZ)
 
-        return 'success'
-
+        
     def test_envisat_4(self):
         # test number of bands
 
@@ -152,8 +147,6 @@ def test_envisat_4(self):
 
         assert ds.RasterCount >= mds_num, 'Not all bands have been detected'
 
-        return 'success'
-
     def test_envisat_5(self):
         # test metadata in RECORDS domain
 
@@ -169,8 +162,6 @@ def test_envisat_5(self):
         assert product[:3] in ('ASA', 'SAR', 'MER') or not record_md, \
             'Unexpected metadata in the "RECORDS" domain.'
 
-        return 'success'
-
 ###############################################################################
 #
 
@@ -194,8 +185,6 @@ def test_envisat_asar_1(self):
 
         assert product[:3] in ('ASA', 'SAR'), 'Wrong sensor ID.'
 
-        return 'success'
-
     def test_envisat_asar_2(self):
         # test metadata in RECORDS domain
 
@@ -232,8 +221,7 @@ def test_envisat_asar_2(self):
                         ('No "%s" or "%s" key in "RECORDS" domain.' %
                             (key0, key1))
 
-        return 'success'
-
+        
 ###############################################################################
 #
 
@@ -257,8 +245,6 @@ def test_envisat_meris_1(self):
 
         assert product[:3] in ('MER',), 'Wrong sensor ID.'
 
-        return 'success'
-
     def test_envisat_meris_2(self):
         # test metadata in RECORDS domain
 
@@ -281,8 +267,7 @@ def test_envisat_meris_2(self):
                 ('No "%s" or "%s" key in "RECORDS" domain.' %
                     (key0, key1))
 
-        return 'success'
-
+        
     def test_envisat_meris_3(self):
         # test Flag bands
 
@@ -329,8 +314,7 @@ def test_envisat_meris_3(self):
         else:
             pytest.fail('Invalid product level: %s.' % level)
 
-        return 'success'
-
+        
     def test_envisat_meris_4(self):
         # test DEM corrections (see #5423)
 
@@ -364,4 +348,4 @@ def test_envisat_meris_4(self):
                     print(r)
                     pytest.fail('Wrong GCP coordinates.')
 
-        return 'success'
+        
diff --git a/autotest/gdrivers/ers.py b/autotest/gdrivers/ers.py
index af0b7281cf02..673cafb4ae45 100755
--- a/autotest/gdrivers/ers.py
+++ b/autotest/gdrivers/ers.py
@@ -50,7 +50,6 @@ def test_ers_1():
     md = ds.GetRasterBand(1).GetMetadata()
     expected_md = {'STATISTICS_MEAN': '-4020.25', 'STATISTICS_MINIMUM': '-4315', 'STATISTICS_MAXIMUM': '-3744', 'STATISTICS_MEDIAN': '-4000'}
     assert md == expected_md
-    return 'success'
 
 ###############################################################################
 # Create simple copy and check.
@@ -100,8 +99,6 @@ def test_ers_5():
 
     ds = None
 
-    return 'success'
-
 ###############################################################################
 # Confirm a copy preserves the signed byte info.
 
@@ -122,8 +119,6 @@ def test_ers_6():
 
     drv.Delete('tmp/8s.ers')
 
-    return 'success'
-
 ###############################################################################
 # Test opening a file with everything in lower case.
 
@@ -136,8 +131,6 @@ def test_ers_7():
 
     assert desc == 'RTP 1st Vertical Derivative', 'did not get expected values.'
 
-    return 'success'
-
 ###############################################################################
 # Test GCP support
 
@@ -174,8 +167,6 @@ def test_ers_8():
 
     drv.Delete('/vsimem/ers_8.ers')
 
-    return 'success'
-
 ###############################################################################
 # Test NoData support (#4207)
 
@@ -201,8 +192,6 @@ def test_ers_9():
 
     assert val == 123, 'did not get expected nodata value'
 
-    return 'success'
-
 ###############################################################################
 # Test PROJ, DATUM, UNITS support (#4229)
 
@@ -297,8 +286,6 @@ def test_ers_10():
 
     assert units == 'METERS', 'did not get expected UNITS'
 
-    return 'success'
-
 ###############################################################################
 # Test fix for https://bugs.chromium.org/p/oss-fuzz/issues/detail?id=8744
 
@@ -306,7 +293,6 @@ def test_ers_10():
 def test_ers_recursive_opening():
     ds = gdal.Open('/vsitar/data/test_ers_recursive.tar/test.ers')
     ds.GetFileList()
-    return 'success'
 
 ###############################################################################
 # Cleanup
@@ -314,7 +300,6 @@ def test_ers_recursive_opening():
 
 def test_ers_cleanup():
     gdaltest.clean_tmp()
-    return 'success'
 
 
 gdaltest_list = [
diff --git a/autotest/gdrivers/fast.py b/autotest/gdrivers/fast.py
index df0ea65ab9be..09c400875cb2 100755
--- a/autotest/gdrivers/fast.py
+++ b/autotest/gdrivers/fast.py
@@ -46,8 +46,7 @@ def test_fast_1():
     if gdaltest.fast_drv is None:
         pytest.skip()
 
-    return 'success'
-
+    
 ###############################################################################
 # Perform simple read test.
 
@@ -99,8 +98,7 @@ def test_fast_3():
         print('expected:', gb_expected[1])
         print('got:', bias)
 
-    return 'success'
-
+    
 ###############################################################################
 # Test geotransform data.
 
@@ -124,8 +122,6 @@ def test_fast_4():
        abs(gt[4] - 0.0) <= tolerance and abs(gt[5] + 15.0) <= tolerance), \
         'FAST geotransform wrong'
 
-    return 'success'
-
 
 ###############################################################################
 # Test 2 bands dataset with checking projections and geotransform.
@@ -267,8 +263,6 @@ def test_fast_9():
 
     assert ds.RasterCount == 7, 'Did not get expected band count.'
 
-    return 'success'
-
 ###############################################################################
 #
 
diff --git a/autotest/gdrivers/gdalhttp.py b/autotest/gdrivers/gdalhttp.py
index 78f1589c975e..7769e0fb6299 100755
--- a/autotest/gdrivers/gdalhttp.py
+++ b/autotest/gdrivers/gdalhttp.py
@@ -107,8 +107,7 @@ def test_http_3():
         conn.close()
         pytest.fail()
 
-    return 'success'
-
+    
 ###############################################################################
 # Verify /vsicurl (ftp)
 
@@ -137,8 +136,6 @@ def http_4_old():
     filelist = ds.GetFileList()
     assert filelist[0] == '/vsicurl/ftp://ftp2.cits.rncan.gc.ca/pub/cantopo/250k_tif/MCR2010_01.tif'
 
-    return 'success'
-
 ###############################################################################
 # Verify /vsicurl (ftp)
 
@@ -170,8 +167,6 @@ def test_http_4():
     filelist = ds.GetFileList()
     assert '/vsicurl/ftp://download.osgeo.org/gdal/data/gtiff/utm.tif' in filelist
 
-    return 'success'
-
 ###############################################################################
 # Test HTTP driver with non VSIL driver
 
@@ -202,8 +197,7 @@ def test_http_5():
     except OSError:
         pass
 
-    return 'success'
-
+    
 ###############################################################################
 # Test HTTP driver with OGR driver
 
@@ -227,8 +221,6 @@ def test_http_6():
         pytest.fail()
     ds = None
 
-    return 'success'
-
 
 ###############################################################################
 
@@ -250,8 +242,7 @@ def test_http_test_ssl_verifystatus():
 
         pytest.fail(last_err)
 
-    return 'success'
-
+    
 ###############################################################################
 
 
@@ -269,16 +260,13 @@ def test_http_test_use_capi_store():
 
     assert ret.find('Failed:    0') != -1
 
-    return 'success'
-
 
 def test_http_test_use_capi_store_sub():
 
     with gdaltest.config_option('GDAL_HTTP_USE_CAPI_STORE', 'YES'):
         gdal.OpenEx('https://google.com', allowed_drivers=['HTTP'])
 
-    return 'success'
-
+    
 ###############################################################################
 #
 
@@ -288,8 +276,6 @@ def test_http_cleanup():
         gdaltest.dods_drv.Register()
     gdaltest.dods_drv = None
 
-    return 'success'
-
 
 gdaltest_list = [test_http_1,
                  test_http_2,
diff --git a/autotest/gdrivers/georaster.py b/autotest/gdrivers/georaster.py
index 3796904ab644..3076f2655f00 100755
--- a/autotest/gdrivers/georaster.py
+++ b/autotest/gdrivers/georaster.py
@@ -85,8 +85,7 @@ def test_georaster_init():
         pytest.skip('ALL_SDO_GEOR_SYSDATA inaccessible, '
                              'likely georaster unavailable.')
 
-    return 'success'
-
+    
 ###############################################################################
 #
 
@@ -470,8 +469,6 @@ def test_georaster_cleanup():
     gdaltest.oci_ds.Destroy()
     gdaltest.oci_ds = None
 
-    return 'success'
-
 ###############################################################################
 #
 
diff --git a/autotest/gdrivers/gif.py b/autotest/gdrivers/gif.py
index 85061498fc48..954767268dae 100755
--- a/autotest/gdrivers/gif.py
+++ b/autotest/gdrivers/gif.py
@@ -56,8 +56,7 @@ def test_gif_1():
         gdaltest.post_reason('mime type is wrong')
         return 'false'
 
-    return 'success'
-
+    
 ###############################################################################
 # Read test of simple byte reference data.
 
@@ -97,8 +96,6 @@ def test_gif_4():
     assert 'GIF_BACKGROUND' in md and md['GIF_BACKGROUND'] == '0', \
         'background metadata missing.'
 
-    return 'success'
-
 ###############################################################################
 # Test creating an in memory copy.
 
@@ -149,8 +146,6 @@ def test_gif_6():
 
     gdaltest.gif_drv.Delete('tmp/nodata_byte.gif')
 
-    return 'success'
-
 
 ###############################################################################
 # Confirm reading with the BIGGIF driver.
@@ -171,8 +166,6 @@ def test_gif_7():
 
     assert ds.GetDriver().ShortName == 'BIGGIF'
 
-    return 'success'
-
 ###############################################################################
 # Confirm that BIGGIF driver is selected for huge gifs
 
@@ -189,8 +182,6 @@ def test_gif_8():
 
     assert ds.GetDriver().ShortName == 'BIGGIF'
 
-    return 'success'
-
 ###############################################################################
 # Test writing to /vsistdout/
 
@@ -210,8 +201,6 @@ def test_gif_9():
 
     gdal.Unlink('/vsimem/tmp.gif')
 
-    return 'success'
-
 ###############################################################################
 # Test interlacing
 
@@ -229,7 +218,6 @@ def test_gif_10():
 
 def test_gif_cleanup():
     gdaltest.clean_tmp()
-    return 'success'
 
 
 gdaltest_list = [
diff --git a/autotest/gdrivers/gpkg.py b/autotest/gdrivers/gpkg.py
index fc175cbdf8d7..eebb5aec6fbb 100755
--- a/autotest/gdrivers/gpkg.py
+++ b/autotest/gdrivers/gpkg.py
@@ -104,8 +104,6 @@ def test_gpkg_init():
 
     gdal.SetConfigOption('GPKG_DEBUG', 'ON')
 
-    return 'success'
-
 ###############################################################################
 #
 
@@ -174,7 +172,7 @@ def check_tile_format(out_ds, expected_format, expected_band_count, expected_ct,
 
     if expected_format is None:
         if mime_type is None:
-            return 'success'
+            return
         pytest.fail()
 
     if expected_format == 'PNG':
@@ -187,7 +185,6 @@ def check_tile_format(out_ds, expected_format, expected_band_count, expected_ct,
     assert mime_type == expected_mime_type
     assert band_count == expected_band_count
     assert expected_ct == has_ct
-    return 'success'
 
 ###############################################################################
 # Single band, PNG
@@ -277,8 +274,6 @@ def test_gpkg_1():
 
     gdal.Unlink('/vsimem/tmp.gpkg')
 
-    return 'success'
-
 ###############################################################################
 # Single band, JPEG
 
@@ -362,8 +357,6 @@ def test_gpkg_2():
 
     gdal.Unlink('/vsimem/tmp.gpkg')
 
-    return 'success'
-
 ###############################################################################
 # Single band, WEBP
 
@@ -466,8 +459,6 @@ def test_gpkg_3():
 
     gdal.Unlink('/vsimem/tmp.gpkg')
 
-    return 'success'
-
 ###############################################################################
 # Three band, PNG
 
@@ -534,8 +525,6 @@ def test_gpkg_4(tile_drv_name='PNG'):
 
     gdal.Unlink('/vsimem/tmp.gpkg')
 
-    return 'success'
-
 ###############################################################################
 # Three band, JPEG
 
@@ -642,8 +631,6 @@ def test_gpkg_7(tile_drv_name='PNG'):
 
     gdal.Unlink('/vsimem/tmp.gpkg')
 
-    return 'success'
-
 ###############################################################################
 # 4 band, JPEG
 
@@ -765,8 +752,6 @@ def test_gpkg_10():
     got_ct = out_ds.GetRasterBand(1).GetColorTable()
     assert got_ct is None
 
-    return 'success'
-
 ###############################################################################
 # Single band with 32 bit color table, JPEG
 
@@ -818,8 +803,6 @@ def test_gpkg_11(tile_drv_name='JPEG'):
 
     gdal.Unlink('/vsimem/tmp.gpkg')
 
-    return 'success'
-
 ###############################################################################
 # Single band with 32 bit color table, WEBP
 
@@ -881,7 +864,6 @@ def test_gpkg_13():
     ds = None
 
     gdal.Unlink('/vsimem/tmp.gpkg')
-    return 'success'
 
 ###############################################################################
 # Test creation and opening options
@@ -1170,7 +1152,6 @@ def test_gpkg_14():
     assert ds is None
 
     gdal.Unlink('/vsimem/tmp.gpkg')
-    return 'success'
 
 ###############################################################################
 # Test error cases
@@ -1289,8 +1270,6 @@ def test_gpkg_15():
 
     gdal.Unlink('/vsimem/tmp.gpkg')
 
-    return 'success'
-
 ###############################################################################
 # Test block/tile caching
 
@@ -1326,8 +1305,6 @@ def test_gpkg_16():
     assert abs(val3 - 0) <= 1
     gdal.Unlink('/vsimem/tmp.gpkg')
 
-    return 'success'
-
 ###############################################################################
 # Test overviews with single band dataset
 
@@ -1461,8 +1438,6 @@ def test_gpkg_17():
 
     gdal.Unlink('/vsimem/tmp.gpkg')
 
-    return 'success'
-
 ###############################################################################
 # Test overviews with 3 band dataset
 
@@ -1564,8 +1539,6 @@ def test_gpkg_18():
 
     gdal.Unlink('/vsimem/tmp.gpkg')
 
-    return 'success'
-
 ###############################################################################
 # Test overviews with 24-bit color palette single band dataset
 
@@ -1605,8 +1578,6 @@ def test_gpkg_19():
     out_ds = None
     gdal.Unlink('/vsimem/tmp.gpkg')
 
-    return 'success'
-
 ###############################################################################
 # Test PNG8
 
@@ -1685,8 +1656,6 @@ def test_gpkg_20():
     out_ds = None
     gdal.Unlink('/vsimem/tmp.gpkg')
 
-    return 'success'
-
 ###############################################################################
 # Test metadata
 
@@ -1923,8 +1892,6 @@ def test_gpkg_21():
 
     gdal.Unlink('/vsimem/tmp.gpkg')
 
-    return 'success'
-
 ###############################################################################
 # Two band, PNG
 
@@ -2002,8 +1969,6 @@ def test_gpkg_22(tile_drv_name='PNG'):
 
     gdal.Unlink('/vsimem/tmp.gpkg')
 
-    return 'success'
-
 ###############################################################################
 # Two band, JPEG
 
@@ -2138,8 +2103,6 @@ def test_gpkg_26():
     gdal.PopErrorHandler()
     assert ds is None
 
-    return 'success'
-
 ###############################################################################
 # Test behaviour with low block cache max
 
@@ -2163,8 +2126,6 @@ def test_gpkg_27():
     got_cs = [out_ds.GetRasterBand(i + 1).Checksum() for i in range(3)]
     assert got_cs == expected_cs
 
-    return 'success'
-
 ###############################################################################
 # Test that reading a block in a band doesn't wipe another band of the same
 # block that would have gone through the GPKG in-memory cache
@@ -2204,8 +2165,6 @@ def test_gpkg_28():
     got_cs = [out_ds.GetRasterBand(i + 1).Checksum() for i in range(3)]
     assert got_cs == expected_cs
 
-    return 'success'
-
 ###############################################################################
 # Variation of gpkg_28 with 2 blocks
 
@@ -2246,8 +2205,6 @@ def test_gpkg_29(x=0):
     got_cs = [out_ds.GetRasterBand(i + 1).Checksum() for i in range(3)]
     assert got_cs == expected_cs
 
-    return 'success'
-
 ###############################################################################
 # Variation of gpkg_29 where the read is done in another block
 
@@ -2281,8 +2238,6 @@ def test_gpkg_31():
     got_cs = [ds.GetRasterBand(i + 1).Checksum() for i in range(4)]
     assert got_cs == expected_cs
 
-    return 'success'
-
 ###############################################################################
 # grey-alpha to RGBA
 
@@ -2313,8 +2268,6 @@ def test_gpkg_32():
     got_cs = [ds.GetRasterBand(i + 1).Checksum() for i in range(ds.RasterCount)]
     assert got_cs == expected_cs
 
-    return 'success'
-
 ###############################################################################
 # Single band with 32 bit color table -> RGBA
 
@@ -2342,8 +2295,6 @@ def test_gpkg_33():
     got_cs = [ds.GetRasterBand(i + 1).Checksum() for i in range(4)]
     assert got_cs == expected_cs
 
-    return 'success'
-
 ###############################################################################
 # Test partial tiles with overviews (#6335)
 
@@ -2370,8 +2321,6 @@ def test_gpkg_34():
     ds = None
     assert gdal.GetLastErrorMsg() == ''
 
-    return 'success'
-
 ###############################################################################
 # Test dirty block flushing while reading block (#6365)
 
@@ -2420,8 +2369,6 @@ def test_gpkg_35():
 
     assert got_data == expected_data
 
-    return 'success'
-
 ###############################################################################
 # Single band with 24 bit color table, PNG, GoogleMapsCompatible
 
@@ -2447,7 +2394,6 @@ def test_gpkg_36():
     out_ds = None
 
     gdal.Unlink('/vsimem/gpkg_36.gpkg')
-    return 'success'
 
 ###############################################################################
 # Test that we don't crash when generating big overview factors on rasters with big dimensions
@@ -2470,7 +2416,6 @@ def test_gpkg_37():
     ds = None
 
     gdal.Unlink('/vsimem/gpkg_37.gpkg')
-    return 'success'
 
 ###############################################################################
 # Test generating more than 1000 tiles
@@ -2507,8 +2452,6 @@ def test_gpkg_38():
     gdal.Unlink(filename)
     assert ds_is_none or gdal.GetLastErrorMsg() != ''
 
-    return 'success'
-
 ###############################################################################
 # Test tile gridded coverage data
 
@@ -2863,8 +2806,6 @@ def test_gpkg_39():
     gdal.Unlink('/vsimem/gpkg_39.gpkg')
     gdal.Unlink('/vsimem/gpkg_39.gpkg.aux.xml')
 
-    return 'success'
-
 ###############################################################################
 # Test VERSION
 
@@ -2946,8 +2887,6 @@ def test_gpkg_40():
 
     gdal.Unlink('/vsimem/gpkg_40.gpkg')
 
-    return 'success'
-
 ###############################################################################
 # Robustness test
 
@@ -2967,8 +2906,6 @@ def test_gpkg_41():
 
     gdal.Unlink('/vsimem/gpkg_41.gpkg')
 
-    return 'success'
-
 ###############################################################################
 # Test opening in vector mode a database without gpkg_geometry_columns
 
@@ -2995,8 +2932,6 @@ def test_gpkg_42():
 
     gdal.Unlink('/vsimem/gpkg_42.gpkg')
 
-    return 'success'
-
 ###############################################################################
 # Test adding raster to a database without pre-existing raster support tables.
 
@@ -3030,8 +2965,6 @@ def test_gpkg_43():
 
     gdal.Unlink('/vsimem/gpkg_43.gpkg')
 
-    return 'success'
-
 ###############################################################################
 # Test opening a .gpkg.sql file
 
@@ -3046,7 +2979,6 @@ def test_gpkg_44():
 
     ds = gdal.Open('data/byte.gpkg.sql')
     assert ds.GetRasterBand(1).Checksum() == 4672, 'validation failed'
-    return 'success'
 
 ###############################################################################
 # Test opening a .gpkg file
@@ -3059,7 +2991,6 @@ def test_gpkg_45():
 
     ds = gdal.Open('data/byte.gpkg')
     assert ds.GetRasterBand(1).Checksum() == 4672, 'validation failed'
-    return 'success'
 
 ###############################################################################
 # Test fix for #6932
@@ -3100,8 +3031,6 @@ def test_gpkg_46():
 
     assert count == 23
 
-    return 'success'
-
 ###############################################################################
 # Test fix for #6976
 
@@ -3123,8 +3052,6 @@ def test_gpkg_47():
 
     gdal.Unlink(tmpfile)
 
-    return 'success'
-
 ###############################################################################
 # Test fix for https://issues.qgis.org/issues/16997 (opening a file with
 # subdatasets on Windows)
@@ -3156,8 +3083,6 @@ def test_gpkg_48():
 
     gdal.Unlink(filename)
 
-    return 'success'
-
 ###############################################################################
 
 
@@ -3188,8 +3113,6 @@ def test_gpkg_delete_raster_layer():
 
     gdal.Unlink(filename)
 
-    return 'success'
-
 
 ###############################################################################
 
@@ -3216,8 +3139,6 @@ def test_gpkg_delete_gridded_coverage_raster_layer():
 
     gdal.Unlink(filename)
 
-    return 'success'
-
 
 ###############################################################################
 def test_gpkg_open_old_gpkg_elevation_tiles_extension():
@@ -3231,8 +3152,6 @@ def test_gpkg_open_old_gpkg_elevation_tiles_extension():
     cs = ds.GetRasterBand(1).Checksum()
     assert cs == 4672
 
-    return 'success'
-
 ###############################################################################
 
 
@@ -3250,8 +3169,7 @@ def test_gpkg_GeneralCmdLineProcessor():
            ret_gdalinfo.find('scope=') < 0 and \
            ret_ogrinfo.find('scope=') < 0)
 
-    return 'success'
-
+    
 ###############################################################################
 
 
@@ -3269,7 +3187,6 @@ def test_gpkg_match_overview_factor():
     ds = None
 
     gdal.Unlink('/vsimem/gpkg_match_overview_factor.gpkg')
-    return 'success'
 
 ###############################################################################
 #
@@ -3285,8 +3202,6 @@ def test_gpkg_cleanup():
 
     gdal.SetConfigOption('GPKG_DEBUG', None)
 
-    return 'success'
-
 ###############################################################################
 
 
diff --git a/autotest/gdrivers/grass.py b/autotest/gdrivers/grass.py
index 915337c38f9c..647184afc00b 100755
--- a/autotest/gdrivers/grass.py
+++ b/autotest/gdrivers/grass.py
@@ -45,8 +45,7 @@ def test_grass_1():
     if gdaltest.grass_drv is None:
         pytest.skip()
 
-    return 'success'
-
+    
 ###############################################################################
 # Read existing simple 1 band GRASS dataset.
 
diff --git a/autotest/gdrivers/grib.py b/autotest/gdrivers/grib.py
index 91325f2ac4c4..5af20a7cc9b1 100755
--- a/autotest/gdrivers/grib.py
+++ b/autotest/gdrivers/grib.py
@@ -117,8 +117,7 @@ def test_grib_grib2_read_nodata():
     for k in expected_md:
         assert k in md and md[k] == expected_md[k], 'Did not get expected metadata'
 
-    return 'success'
-
+    
 ###############################################################################
 # Check grib units (#3606)
 
@@ -135,11 +134,11 @@ def test_grib_read_units():
     md = ds.GetRasterBand(1).GetMetadata()
     if md['GRIB_UNIT'] != '[C]' or md['GRIB_COMMENT'] != 'Minimum temperature [C]':
         print(md)
-        return 'success'
+        return
     ds.GetRasterBand(1).ComputeStatistics(False)
     if abs(ds.GetRasterBand(1).GetMinimum() - 13) > 1:
         print(ds.GetRasterBand(1).GetMinimum())
-        return 'success'
+        return
     ds = None
 
     os.unlink('tmp/ds.mint.bin.aux.xml')
@@ -150,17 +149,15 @@ def test_grib_read_units():
     md = ds.GetRasterBand(1).GetMetadata()
     if md['GRIB_UNIT'] != '[K]' or md['GRIB_COMMENT'] != 'Minimum temperature [K]':
         print(md)
-        return 'success'
+        return
     ds.GetRasterBand(1).ComputeStatistics(False)
     if abs(ds.GetRasterBand(1).GetMinimum() - 286) > 1:
         print(ds.GetRasterBand(1).GetMinimum())
-        return 'success'
+        return
     ds = None
 
     gdal.GetDriverByName('GRIB').Delete('tmp/ds.mint.bin')
 
-    return 'success'
-
 ###############################################################################
 # Handle geotransform for 1xn or nx1 grids.  The geotransform was faulty when
 # grib files had one cell in either direction for geographic projections.  See
@@ -179,8 +176,7 @@ def test_grib_read_geotransform_one_n_or_n_one():
     if gt != egt:
         print(gt, '!=', egt)
         pytest.fail('Invalid geotransform')
-    return 'success'
-
+    
 ###############################################################################
 # This is more a /vsizip/ file test than a GRIB one, but could not easily
 # come up with a pure /vsizip/ test case, so here's a real world use
@@ -195,8 +191,6 @@ def test_grib_read_vsizip():
     ds = gdal.Open('/vsizip/data/grib/gfs.t00z.mastergrb2f03.zip/gfs.t00z.mastergrb2f03')
     assert ds is not None
 
-    return 'success'
-
 ###############################################################################
 # Write PDS numbers to all bands
 
@@ -220,7 +214,6 @@ def test_grib_grib2_test_grib_pds_all_bands():
     ds = None
 
     assert md is None, 'Got pds numbers, when disabled (#5144)'
-    return 'success'
 
 ###############################################################################
 # Test support for template 4.15 (#5768)
@@ -241,12 +234,6 @@ def test_grib_grib2_read_template_4_15():
     assert ret.find('Checksum=') >= 0 or err.find('Is the JPEG2000 driver available?') >= 0, \
         'Could not open file'
 
-    # ds = gdal.Open('data/template4_15.grib')
-    # if ds is None:
-    #    return 'fail'
-
-    return 'success'
-
 ###############################################################################
 # Test support for PNG compressed
 
@@ -263,8 +250,6 @@ def test_grib_grib2_read_png():
     cs = ds.GetRasterBand(1).Checksum()
     assert cs == 41854, 'Could not open file'
 
-    return 'success'
-
 ###############################################################################
 # Test support for GRIB2 Section 4 Template 32, Analysis or forecast at a horizontal level or in a horizontal layer at a point in time for synthetic satellite data.
 
@@ -283,8 +268,7 @@ def test_grib_grib2_read_template_4_32():
     for k in expected_md:
         assert k in md and md[k] == expected_md[k], 'Did not get expected metadata'
 
-    return 'success'
-
+    
 ###############################################################################
 # GRIB2 file with all 0 data
 
@@ -303,8 +287,7 @@ def test_grib_grib2_read_all_zero_data():
     for k in expected_md:
         assert k in md and md[k] == expected_md[k], 'Did not get expected metadata'
 
-    return 'success'
-
+    
 ###############################################################################
 # GRIB1 file with rotate pole lonlat
 
@@ -333,8 +316,7 @@ def test_grib_grib2_read_rotated_pole_lonlat():
     for k in expected_md:
         assert k in md and md[k] == expected_md[k], 'Did not get expected metadata'
 
-    return 'success'
-
+    
 ###############################################################################
 # Test support for GRIB2 Section 4 Template 40, Analysis or forecast at a horizontal level or in a horizontal layer at a point in time for atmospheric chemical constituents
 
@@ -356,8 +338,7 @@ def test_grib_grib2_read_template_4_40():
     for k in expected_md:
         assert k in md and md[k] == expected_md[k], 'Did not get expected metadata'
 
-    return 'success'
-
+    
 ###############################################################################
 # Test support for a unhandled GRIB2 Section 4 Template
 
@@ -374,8 +355,7 @@ def test_grib_grib2_read_template_4_unhandled():
     for k in expected_md:
         assert k in md and md[k] == expected_md[k], 'Did not get expected metadata'
 
-    return 'success'
-
+    
 ###############################################################################
 # Test reading GRIB2 Transverse Mercator grid
 
@@ -396,8 +376,6 @@ def test_grib_grib2_read_transverse_mercator():
     assert max([abs(gt[i] - expected_gt[i]) for i in range(6)]) <= 1e-3, \
         'Did not get expected geotransform'
 
-    return 'success'
-
 ###############################################################################
 # Test reading GRIB2 Mercator grid
 
@@ -421,8 +399,6 @@ def test_grib_grib2_read_mercator():
     assert max([abs(gt[i] - expected_gt[i]) for i in range(6)]) <= 1e-3, \
         'Did not get expected geotransform'
 
-    return 'success'
-
 ###############################################################################
 # Test reading GRIB2 Mercator grid
 
@@ -446,8 +422,6 @@ def test_grib_grib2_read_mercator_2sp():
     assert max([abs(gt[i] - expected_gt[i]) for i in range(6)]) <= 1e-3, \
         'Did not get expected geotransform'
 
-    return 'success'
-
 ###############################################################################
 # Test reading GRIB2 Lambert Conformal Conic grid
 
@@ -471,8 +445,6 @@ def test_grib_grib2_read_lcc():
     assert max([abs(gt[i] - expected_gt[i]) for i in range(6)]) <= 1e-3, \
         'Did not get expected geotransform'
 
-    return 'success'
-
 ###############################################################################
 # Test reading GRIB2 Polar Stereographic grid
 
@@ -496,8 +468,6 @@ def test_grib_grib2_read_polar_stereo():
     assert max([abs(gt[i] - expected_gt[i]) for i in range(6)]) <= 1e-3, \
         'Did not get expected geotransform'
 
-    return 'success'
-
 ###############################################################################
 # Test reading GRIB2 Albers Equal Area grid
 
@@ -521,8 +491,6 @@ def test_grib_grib2_read_aea():
     assert max([abs(gt[i] - expected_gt[i]) for i in range(6)]) <= 1e-3, \
         'Did not get expected geotransform'
 
-    return 'success'
-
 ###############################################################################
 # Test reading GRIB2 Lambert Azimuthal Equal Area grid
 
@@ -546,8 +514,6 @@ def test_grib_grib2_read_laea():
     assert max([abs(gt[i] - expected_gt[i]) for i in range(6)]) <= 1e-3, \
         'Did not get expected geotransform'
 
-    return 'success'
-
 ###############################################################################
 # Test reading GRIB2 with Grid point data - IEEE Floating Point Data (template 5.4)
 
@@ -565,8 +531,6 @@ def test_grib_grib2_read_template_5_4_grid_point_ieee_floating_point():
     cs = ds.GetRasterBand(1).Checksum()
     assert cs == 4727, 'Did not get expected checksum'
 
-    return 'success'
-
 ###############################################################################
 # Test reading GRIB2 with NBITS=0 and DECIMAL_SCALE !=0
 
@@ -590,8 +554,7 @@ def test_grib_grib2_read_section_5_nbits_zero_decimal_scaled():
         cs = ds.GetRasterBand(1).Checksum()
         assert cs == 5, 'Did not get expected checksum'
 
-    return 'success'
-
+    
 ###############################################################################
 # Test reading GRIB2 with complex packing and spatial differencing of order 1
 
@@ -607,8 +570,7 @@ def test_grib_grib2_read_spatial_differencing_order_1():
         gdaltest.post_reason('Did not get expected checksum')
         print(cs)
 
-    return 'success'
-
+    
 ###############################################################################
 # Test GRIB2 creation options
 
@@ -828,8 +790,6 @@ def test_grib_grib2_write_creation_options():
     assert out_ds is None
     gdal.Unlink(tmpfilename)
 
-    return 'success'
-
 ###############################################################################
 # Test GRIB2 write support for projections
 
@@ -953,8 +913,6 @@ def test_grib_grib2_write_projections():
     out_ds = None
     gdal.Unlink(tmpfilename)
 
-    return 'success'
-
 ###############################################################################
 
 
@@ -1215,8 +1173,7 @@ def test_grib_grib2_write_data_encodings():
             gdaltest.post_reason('did not get expected checksum for lossy JPEG2000 with ' + drvname)
             print(cs)
 
-    return 'success'
-
+    
 ###############################################################################
 # Test GRIB2 write support with warnings/errors
 
@@ -1293,8 +1250,6 @@ def test_grib_grib2_write_data_encodings_warnings_and_errors():
         out_ds = gdal.Translate('/i/do_not/exist.grb2', 'data/byte.tif', format='GRIB')
     assert out_ds is None, 'expected null return'
 
-    return 'success'
-
 ###############################################################################
 # Test writing temperatures with automatic Celsius -> Kelvin conversion
 
@@ -1338,8 +1293,7 @@ def test_grib_grib2_write_temperatures():
         assert max([abs((got_vals[i] - expected_vals[i]) / expected_vals[i]) for i in range(4)]) <= 1e-4, \
             ('fail with data_encoding = %s and type = %s' % (data_encoding, str(src_type)))
 
-    return 'success'
-
+    
 ###############################################################################
 
 
@@ -1366,8 +1320,7 @@ def test_grib_grib2_write_nodata():
         ds = None
         gdal.Unlink(tmpfilename)
 
-    return 'success'
-
+    
 ###############################################################################
 # Test GRIB2 file with JPEG2000 codestream on a single line (#6719)
 
@@ -1394,8 +1347,7 @@ def test_grib_online_grib2_jpeg2000_single_line():
     for k in expected_md:
         assert k in md and md[k] == expected_md[k], 'Did not get expected metadata'
 
-    return 'success'
-
+    
 
 gdaltest_list = [
     test_grib_1,
diff --git a/autotest/gdrivers/gta.py b/autotest/gdrivers/gta.py
index deca3c5920a9..212d2bc799a7 100755
--- a/autotest/gdrivers/gta.py
+++ b/autotest/gdrivers/gta.py
@@ -61,8 +61,7 @@ def test_gta_1():
     if gdaltest.gta_drv is None:
         pytest.skip()
 
-    return 'success'
-
+    
 ###############################################################################
 # Test updating existing dataset, check srs, check gt
 
@@ -105,8 +104,6 @@ def test_gta_2():
 
     gdaltest.gta_drv.Delete('/vsimem/byte.gta')
 
-    return 'success'
-
 ###############################################################################
 # Test writing and readings GCPs
 
@@ -139,8 +136,6 @@ def test_gta_3():
 
     gdaltest.gta_drv.Delete('/vsimem/gta_3.gta')
 
-    return 'success'
-
 ###############################################################################
 # Test band metadata
 
@@ -186,8 +181,6 @@ def test_gta_4():
 
     gdaltest.gta_drv.Delete('/vsimem/gta_4.gta')
 
-    return 'success'
-
 ###############################################################################
 # Test compression algorithms
 
@@ -219,8 +212,6 @@ def test_gta_5():
 
     gdaltest.gta_drv.Delete('/vsimem/gta_5.gta')
 
-    return 'success'
-
 
 @pytest.mark.parametrize(
     'filename,checksum',
diff --git a/autotest/gdrivers/hdf5.py b/autotest/gdrivers/hdf5.py
index e804fd1d2aad..fa8d61561098 100755
--- a/autotest/gdrivers/hdf5.py
+++ b/autotest/gdrivers/hdf5.py
@@ -76,8 +76,6 @@ def test_hdf5_2():
 
     assert not gdaltest.is_file_open('data/groups.h5'), 'file still opened.'
 
-    return 'success'
-
 ###############################################################################
 # Confirm that single variable files can be accessed directly without
 # subdataset stuff.
@@ -94,8 +92,6 @@ def test_hdf5_3():
 
     assert not gdaltest.is_file_open('data/u8be.h5'), 'file still opened.'
 
-    return 'success'
-
 ###############################################################################
 # Confirm subdataset access, and checksum.
 
@@ -107,8 +103,6 @@ def test_hdf5_4():
     cs = ds.GetRasterBand(1).Checksum()
     assert cs == 135, 'did not get expected checksum'
 
-    return 'success'
-
 ###############################################################################
 # Similar check on a 16bit dataset.
 
@@ -120,8 +114,6 @@ def test_hdf5_5():
     cs = ds.GetRasterBand(1).Checksum()
     assert cs == 18, 'did not get expected checksum'
 
-    return 'success'
-
 ###############################################################################
 # Test generating an overview on a subdataset.
 
@@ -151,8 +143,6 @@ def test_hdf5_6():
 
     gdaltest.clean_tmp()
 
-    return 'success'
-
 ###############################################################################
 # Coarse metadata check (regression test for #2412).
 
@@ -174,8 +164,7 @@ def test_hdf5_7():
             metadata.pop(key)
         except KeyError:
             pytest.fail('unable to find "%s" key' % key)
-    return 'success'
-
+    
 ###############################################################################
 # Test metadata names.
 
@@ -228,8 +217,7 @@ def scanMetadata(parts):
         for h5dataset in h5datasets:
             assert scanMetadata([h5group, h5dataset]) is None
 
-    return 'success'
-
+    
 ###############################################################################
 # Variable length string metadata check (regression test for #4228).
 
@@ -265,8 +253,7 @@ def test_hdf5_9():
                                  'expected "%s", got "%s" ' %
                                  (key, ref_metadata[key], metadata[key]))
 
-    return 'success'
-
+    
 ###############################################################################
 # Test CSK_DGM.h5 (#4160)
 
@@ -292,8 +279,6 @@ def test_hdf5_10():
     ds = None
     assert not gdaltest.is_file_open('data/CSK_DGM.h5'), 'file still opened.'
 
-    return 'success'
-
 ###############################################################################
 # Test CSK_GEC.h5 (#4160)
 
@@ -319,8 +304,6 @@ def test_hdf5_11():
 
     assert not gdaltest.is_file_open('data/CSK_GEC.h5'), 'file still opened.'
 
-    return 'success'
-
 ###############################################################################
 # Test ODIM_H5 (#5032)
 
@@ -342,8 +325,6 @@ def test_hdf5_12():
     assert (max([abs(got_gt[i] - expected_gt[i]) for i in range(6)]) <= 1e-5 or \
        max([abs(got_gt[i] - expected_gt2[i]) for i in range(6)]) <= 1e-5)
 
-    return 'success'
-
 ###############################################################################
 # Test MODIS L2 HDF5 GCPs (#6666)
 
@@ -361,8 +342,6 @@ def test_hdf5_13():
     assert (abs(got_gcps[0].GCPPixel - 0.5) <= 1e-5 and abs(got_gcps[0].GCPLine - 0.5) <= 1e-5 and \
        abs(got_gcps[0].GCPX - 33.1655693) <= 1e-5 and abs(got_gcps[0].GCPY - 39.3207207) <= 1e-5)
 
-    return 'success'
-
 ###############################################################################
 # Test complex data subsets
 
@@ -381,8 +360,6 @@ def test_hdf5_14():
 
     assert not gdaltest.is_file_open('data/complex.h5'), 'file still opened.'
 
-    return 'success'
-
 ###############################################################################
 # Confirm complex subset data access and checksum
 # Start with Float32
@@ -395,8 +372,6 @@ def test_hdf5_15():
     cs = ds.GetRasterBand(1).Checksum()
     assert cs == 523, 'did not get expected checksum'
 
-    return 'success'
-
 # Repeat for Float64
 
 
@@ -407,8 +382,6 @@ def test_hdf5_16():
     cs = ds.GetRasterBand(1).Checksum()
     assert cs == 511, 'did not get expected checksum'
 
-    return 'success'
-
 # Repeat for Float16
 
 
@@ -419,16 +392,12 @@ def test_hdf5_17():
     cs = ds.GetRasterBand(1).Checksum()
     assert cs == 412, 'did not get expected checksum'
 
-    return 'success'
-
 
 def test_hdf5_single_char_varname():
 
     ds = gdal.Open('HDF5:"data/single_char_varname.h5"://e')
     assert ds is not None
 
-    return 'success'
-
 
 def test_hdf5_virtual_file():
     hdf5_files = [
@@ -444,8 +413,7 @@ def test_hdf5_virtual_file():
     for hdf5_file in hdf5_files:
         assert uffd_compare(hdf5_file) is True
 
-    return 'success'
-
+    
 
 # FIXME: This FTP server seems to have disappeared. Replace with something else?
 hdf5_list = [
diff --git a/autotest/gdrivers/hf2.py b/autotest/gdrivers/hf2.py
index 12b96b6996f9..3520c5d98dfb 100755
--- a/autotest/gdrivers/hf2.py
+++ b/autotest/gdrivers/hf2.py
@@ -81,8 +81,7 @@ def test_hf2_4():
 
 def test_hf2_cleanup():
 
-    return 'success'
-
+    pass
 
 gdaltest_list = [
     test_hf2_1,
diff --git a/autotest/gdrivers/hfa.py b/autotest/gdrivers/hfa.py
index 9e8e842fc45e..a23f5a6fc574 100755
--- a/autotest/gdrivers/hfa.py
+++ b/autotest/gdrivers/hfa.py
@@ -63,8 +63,6 @@ def test_hfa_histread():
 
     assert md['STATISTICS_EXCLUDEDVALUES'] == '0', 'STATISTICS_EXCLUDEDVALUE is wrong.'
 
-    return 'success'
-
 ###############################################################################
 # Verify that if we copy this test image to a new Imagine file the histogram
 # info is preserved.
@@ -98,8 +96,6 @@ def test_hfa_histwrite():
     assert md['STATISTICS_HISTOBINVALUES'] == '0|0|0|0|0|0|0|0|8|0|0|0|0|0|0|0|23|0|0|0|0|0|0|0|0|29|0|0|0|0|0|0|0|46|0|0|0|0|0|0|0|69|0|0|0|0|0|0|0|99|0|0|0|0|0|0|0|0|120|0|0|0|0|0|0|0|178|0|0|0|0|0|0|0|193|0|0|0|0|0|0|0|212|0|0|0|0|0|0|0|281|0|0|0|0|0|0|0|0|365|0|0|0|0|0|0|0|460|0|0|0|0|0|0|0|533|0|0|0|0|0|0|0|544|0|0|0|0|0|0|0|0|626|0|0|0|0|0|0|0|653|0|0|0|0|0|0|0|673|0|0|0|0|0|0|0|629|0|0|0|0|0|0|0|0|586|0|0|0|0|0|0|0|541|0|0|0|0|0|0|0|435|0|0|0|0|0|0|0|348|0|0|0|0|0|0|0|341|0|0|0|0|0|0|0|0|284|0|0|0|0|0|0|0|225|0|0|0|0|0|0|0|237|0|0|0|0|0|0|0|172|0|0|0|0|0|0|0|0|159|0|0|0|0|0|0|0|105|0|0|0|0|0|0|0|824|', \
         'STATISTICS_HISTOBINVALUES is wrong.'
 
-    return 'success'
-
 ###############################################################################
 # Verify that if we copy this test image to a new Imagine file and then re-write the
 # histogram information, the new histogram can then be read back in.
@@ -138,8 +134,6 @@ def test_hfa_histrewrite():
 
     assert histStr == newHist, 'Rewritten STATISTICS_HISTOBINVALUES is wrong.'
 
-    return 'success'
-
 ###############################################################################
 # Verify we can read metadata of int.img.
 
@@ -164,8 +158,6 @@ def test_hfa_int_stats_1():
 
     assert md['LAYER_TYPE'] == 'athematic', 'LAYER_TYPE is wrong.'
 
-    return 'success'
-
 ###############################################################################
 # Verify we can read band statistics of int.img.
 
@@ -186,8 +178,6 @@ def test_hfa_int_stats_2():
 
     assert abs(stats[3] - 44.637237445468) <= tolerance, 'StdDev value is wrong.'
 
-    return 'success'
-
 ###############################################################################
 # Verify we can read metadata of float.img.
 
@@ -220,8 +210,6 @@ def test_hfa_float_stats_1():
 
     assert md['LAYER_TYPE'] == 'athematic', 'LAYER_TYPE is wrong.'
 
-    return 'success'
-
 ###############################################################################
 # Verify we can read band statistics of float.img.
 
@@ -242,8 +230,6 @@ def test_hfa_float_stats_2():
 
     assert abs(stats[3] - 0.044636441749041) <= tolerance, 'StdDev value is wrong.'
 
-    return 'success'
-
 ###############################################################################
 # Verify we can read image data.
 
@@ -258,8 +244,6 @@ def test_hfa_int_read():
 
     assert cs == 6691, 'Checksum value is wrong.'
 
-    return 'success'
-
 ###############################################################################
 # Verify we can read image data.
 
@@ -280,8 +264,6 @@ def test_hfa_float_read():
 
     assert abs(value - 41.021659851074219) <= 0.0001, 'Pixel value is wrong.'
 
-    return 'success'
-
 ###############################################################################
 # verify we can read PE_STRING coordinate system.
 
@@ -294,8 +276,6 @@ def test_hfa_pe_read():
 
     assert wkt == expected, 'failed to read pe string as expected.'
 
-    return 'success'
-
 ###############################################################################
 # Verify we can write PE_STRING nodes.
 
@@ -319,7 +299,6 @@ def test_hfa_pe_write():
 
     ds = None
     drv.Delete('tmp/87test.img')
-    return 'success'
 
 ###############################################################################
 # Verify we can write and read large metadata items.
@@ -340,8 +319,6 @@ def test_hfa_metadata_1():
     assert md['test'] == md_val, 'got wrong metadata back'
     ds = None
 
-    return 'success'
-
 ###############################################################################
 # Verify that writing metadata multiple times does not result in duplicate
 # nodes.
@@ -365,8 +342,6 @@ def test_hfa_metadata_2():
     ds = None
     gdal.GetDriverByName('HFA').Delete('tmp/md_1.img')
 
-    return 'success'
-
 ###############################################################################
 # Verify we can grow the RRD list in cases where this requires
 # moving the HFAEntry to the end of the file.  (bug #1109)
@@ -393,8 +368,6 @@ def test_hfa_grow_rrdlist():
     ds = None
     gdal.GetDriverByName('HFA').Delete('tmp/bug_1109.img')
 
-    return 'success'
-
 ###############################################################################
 # Make sure an old .ige file is deleted when creating a new dataset. (#1784)
 
@@ -442,8 +415,6 @@ def test_hfa_clean_ige():
 
     drv.Delete('tmp/igetest.img')
 
-    return 'success'
-
 ###############################################################################
 # Verify that we can read this corrupt .aux file without hanging (#1907)
 
@@ -464,8 +435,6 @@ def test_hfa_corrupt_aux():
 
     ds = None
 
-    return 'success'
-
 ###############################################################################
 # support MapInformation for units (#1967)
 
@@ -483,7 +452,7 @@ def test_hfa_mapinformation_units():
     expected_wkt = """PROJCS["NAD_1983_StatePlane_Virginia_North_FIPS_4501_Feet",GEOGCS["GCS_North_American_1983",DATUM["North_American_Datum_1983",SPHEROID["GRS_1980",6378137,298.257222101]],PRIMEM["Greenwich",0],UNIT["Degree",0.0174532925199432955],AUTHORITY["EPSG","4269"]],PROJECTION["Lambert_Conformal_Conic_2SP"],PARAMETER["False_Easting",11482916.66666666],PARAMETER["False_Northing",6561666.666666666],PARAMETER["Central_Meridian",-78.5],PARAMETER["Standard_Parallel_1",38.03333333333333],PARAMETER["Standard_Parallel_2",39.2],PARAMETER["Latitude_Of_Origin",37.66666666666666],UNIT["Foot_US",0.304800609601219241]]"""
 
     if gdaltest.equal_srs_from_wkt(expected_wkt, wkt):
-        return 'success'
+        return
     pytest.fail()
 
 ###############################################################################
@@ -507,8 +476,6 @@ def test_hfa_nodata_write():
 
     ds = None
 
-    return 'success'
-
 ###############################################################################
 # Verify written nodata value.
 
@@ -537,8 +504,6 @@ def test_hfa_nodata_read():
 
     gdal.GetDriverByName('HFA').Delete('tmp/nodata.img')
 
-    return 'success'
-
 ###############################################################################
 # Verify we read simple affine geotransforms properly.
 
@@ -561,7 +526,6 @@ def test_hfa_rotated_read():
             pytest.fail('Geotransform differs.')
 
     ds = None
-    return 'success'
 
 ###############################################################################
 # Verify we can write affine geotransforms.
@@ -630,8 +594,6 @@ def test_hfa_rotated_write():
 
     gdal.GetDriverByName('HFA').Delete('tmp/rot.img')
 
-    return 'success'
-
 
 ###############################################################################
 # Test creating an in memory copy.
@@ -718,8 +680,6 @@ def test_hfa_unique_values_color_table():
     ct = None
     ds = None
 
-    return 'success'
-
 ###############################################################################
 # Verify "unique values" based histogram.
 
@@ -754,8 +714,6 @@ def test_hfa_unique_values_hist():
 
     ds = None
 
-    return 'success'
-
 ###############################################################################
 # Verify reading of 3rd order XFORM polynomials.
 
@@ -799,8 +757,6 @@ def test_hfa_xforms_3rd():
 
     ds = None
 
-    return 'success'
-
 ###############################################################################
 # Verify that we can clear an existing color table
 
@@ -833,8 +789,6 @@ def test_hfa_delete_colortable():
 
     gdal.GetDriverByName('HFA').Delete('tmp/i8u.img')
 
-    return 'success'
-
 ###############################################################################
 # Verify that we can clear an existing color table (#2842)
 
@@ -871,8 +825,6 @@ def test_hfa_delete_colortable2():
 
     gdal.GetDriverByName('HFA').Delete('tmp/hfa_delete_colortable2.img')
 
-    return 'success'
-
 ###############################################################################
 # Verify we can read the special histogram metadata from a provided image.
 
@@ -886,8 +838,6 @@ def test_hfa_excluded_values():
     assert md['STATISTICS_EXCLUDEDVALUES'] == '0,8,9', \
         'STATISTICS_EXCLUDEDVALUE is wrong.'
 
-    return 'success'
-
 ###############################################################################
 # verify that we propagate nodata to overviews in .img/.rrd format.
 
@@ -923,8 +873,6 @@ def test_hfa_ov_nodata():
     wrk2_ds = None
     drv.Delete('/vsimem/ov_nodata.img')
 
-    return 'success'
-
 ###############################################################################
 # Confirm that we can read 8bit grayscale overviews for 1bit images.
 
@@ -941,8 +889,6 @@ def test_hfa_read_bit2grayscale():
     assert ds_md['PyramidResamplingType'] == 'AVERAGE_BIT2GRAYSCALE', \
         'wrong pyramid resampling type metadata.'
 
-    return 'success'
-
 ###############################################################################
 # Confirm that we can create overviews in rrd format for an .img file with
 # the bit2grayscale algorithm (#2914)
@@ -980,8 +926,7 @@ def test_hfa_write_bit2grayscale():
     except IOError:
         pass
 
-    return 'success'
-
+    
 ###############################################################################
 # Verify handling of camera model metadata (#2675)
 
@@ -1014,7 +959,6 @@ def test_hfa_camera_md():
     assert gdaltest.equal_srs_from_wkt(srs_wkt, exp_wkt), 'wrong outputProjection'
 
     ds = None
-    return 'success'
 
 ###############################################################################
 # Verify dataset's projection matches expected
@@ -1027,7 +971,6 @@ def hfa_verify_dataset_projection(dataset_path, exp_wkt):
     assert gdaltest.equal_srs_from_wkt(exp_wkt, srs_wkt), 'wrong outputProjection'
 
     ds = None
-    return 'success'
 
 ###############################################################################
 # Verify can read Transverse Mercator (South Orientated) projections
@@ -1106,8 +1049,6 @@ def test_hfa_rde_overviews():
 
     ds = None
 
-    return 'success'
-
 ###############################################################################
 # Check that we can copy and rename a complex file set, and that the internal filenames
 # in the .img and .rrd seem to be updated properly.
@@ -1150,8 +1091,6 @@ def test_hfa_copyfiles():
 
     drv.Delete('tmp/newnamexxx.img')
 
-    return 'success'
-
 
 ###############################################################################
 # Test the ability to write a RAT (#999)
@@ -1188,8 +1127,6 @@ def test_hfa_write_rat():
 
     drv.Delete('tmp/write_rat.img')
 
-    return 'success'
-
 ###############################################################################
 # Test STATISTICS creation option
 
@@ -1218,8 +1155,6 @@ def test_hfa_createcopy_statistics():
 
     assert md['STATISTICS_MINIMUM'] == '74', 'STATISTICS_MINIMUM is wrong.'
 
-    return 'success'
-
 ###############################################################################
 # Test GetUnitType()
 
@@ -1241,8 +1176,6 @@ def test_hfa_read_elevation_units():
     assert unittype == 'meters', 'Failed to read elevation units'
     ds = None
 
-    return 'success'
-
 ###############################################################################
 #
 
diff --git a/autotest/gdrivers/ida.py b/autotest/gdrivers/ida.py
index 27777052b0c4..1c9ea248693f 100755
--- a/autotest/gdrivers/ida.py
+++ b/autotest/gdrivers/ida.py
@@ -68,8 +68,6 @@ def test_ida_2():
 
     assert band1.DataType == gdal.GDT_Byte, 'Data type is not byte.'
 
-    return 'success'
-
 ###############################################################################
 # Create simple copy and check.
 
diff --git a/autotest/gdrivers/idrisi.py b/autotest/gdrivers/idrisi.py
index 83f929fed1cc..8bc1d18a793c 100755
--- a/autotest/gdrivers/idrisi.py
+++ b/autotest/gdrivers/idrisi.py
@@ -88,8 +88,7 @@ def test_idrisi_cleanup():
         print('FIXME?: data/rgbsmall.tif.aux.xml is produced by those tests')
     except OSError:
         pass
-    return 'success'
-
+    
 
 gdaltest_list = [
     test_idrisi_1,
diff --git a/autotest/gdrivers/ignfheightasciigrid.py b/autotest/gdrivers/ignfheightasciigrid.py
index a00341557bcf..59cd21679b5d 100755
--- a/autotest/gdrivers/ignfheightasciigrid.py
+++ b/autotest/gdrivers/ignfheightasciigrid.py
@@ -100,7 +100,6 @@ def test_ignfheightasciigrid_description_multiword():
     ds = gdal.OpenEx(filename)
     desc = ds.GetMetadataItem('DESCRIPTION')
     assert desc == 'MULTI WORD'
-    return 'success'
 
 
 def test_ignfheightasciigrid_invalid():
@@ -146,8 +145,7 @@ def test_ignfheightasciigrid_invalid():
         with gdaltest.error_handler():
             assert not gdal.OpenEx(filename, gdal.OF_RASTER), content
         gdal.Unlink(filename)
-    return 'success'
-
+    
 
 def test_ignfheightasciigrid_huge():
 
@@ -163,7 +161,6 @@ def test_ignfheightasciigrid_huge():
     ds = gdal.OpenEx(filename, gdal.OF_RASTER)
     gdal.Unlink(filename)
     assert ds is None
-    return 'success'
 
 
 def test_ignfheightasciigrid_gra():
@@ -175,7 +172,6 @@ def test_ignfheightasciigrid_gra():
 
     ds = gdal.OpenEx('data/ignfheightasciigrid.gra', gdal.OF_RASTER)
     assert ds.GetRasterBand(1).GetNoDataValue() == 9999
-    return 'success'
 
 
 def test_ignfheightasciigrid_gra_invalid():
@@ -192,8 +188,7 @@ def test_ignfheightasciigrid_gra_invalid():
         with gdaltest.error_handler():
             assert not gdal.OpenEx(filename, gdal.OF_RASTER), content
         gdal.Unlink(filename)
-    return 'success'
-
+    
 
 
 gdaltest_list = [
diff --git a/autotest/gdrivers/ilwis.py b/autotest/gdrivers/ilwis.py
index e0c8c96fedca..ba624a731b15 100755
--- a/autotest/gdrivers/ilwis.py
+++ b/autotest/gdrivers/ilwis.py
@@ -119,7 +119,6 @@ def test_ilwis_5():
 
 def test_ilwis_cleanup():
     gdaltest.clean_tmp()
-    return 'success'
 
 
 gdaltest_list = [
diff --git a/autotest/gdrivers/ingr.py b/autotest/gdrivers/ingr.py
index f2e0b87fb851..d83ef539748d 100755
--- a/autotest/gdrivers/ingr.py
+++ b/autotest/gdrivers/ingr.py
@@ -69,8 +69,6 @@ def test_ingr_3():
     assert ct.GetCount() == 256 and ct.GetColorEntry(8) == (8, 8, 8, 255), \
         'Wrong color table entry.'
 
-    return 'success'
-
 ###############################################################################
 # frmt02 is a plain byte format
 
@@ -173,8 +171,6 @@ def test_ingr_14():
 
     assert cs == 11466 or cs == 11095
 
-    return 'success'
-
 ###############################################################################
 # Same, but through vsimem all in memory.
 
@@ -220,8 +216,6 @@ def test_ingr_17():
 
     assert got_cs == ref_cs
 
-    return 'success'
-
 ###############################################################################
 # Test 'random access' in simple RLE
 
@@ -247,13 +241,10 @@ def test_ingr_18():
 
     assert got_data == expected_data
 
-    return 'success'
-
 
 def test_ingr_cleanup():
 
     gdal.Unlink('data/frmt09.cot.aux.xml')
-    return 'success'
 
 
 gdaltest_list = [
diff --git a/autotest/gdrivers/iris.py b/autotest/gdrivers/iris.py
index 175159520ca2..2ae5d2cb4807 100755
--- a/autotest/gdrivers/iris.py
+++ b/autotest/gdrivers/iris.py
@@ -108,8 +108,7 @@ def test_iris_2():
         value = md[md.find('=') + 1:]
         assert got_metadata[key] == value, ('did not find %s' % key)
 
-    return 'success'
-
+    
 
 gdaltest_list = [
     test_iris_1,
diff --git a/autotest/gdrivers/isce.py b/autotest/gdrivers/isce.py
index 0e49679a7737..da738d7337de 100755
--- a/autotest/gdrivers/isce.py
+++ b/autotest/gdrivers/isce.py
@@ -73,8 +73,6 @@ def test_isce_2():
     val = ds.GetMetadataItem('IMAGE_TYPE', 'ISCE')
     assert val == 'slc'
 
-    return 'success'
-
 ###############################################################################
 # Verify this can be exported losslessly.
 
diff --git a/autotest/gdrivers/isis.py b/autotest/gdrivers/isis.py
index 6fc59a6a1773..2dfe1d7b7e4e 100755
--- a/autotest/gdrivers/isis.py
+++ b/autotest/gdrivers/isis.py
@@ -158,8 +158,6 @@ def test_isis_4():
     ds = None
     gdal.GetDriverByName('ISIS3').Delete('/vsimem/isis_tmp.lbl')
 
-    return 'success'
-
 # Label+image creation + WRITE_BOUNDING_DEGREES=NO option
 
 
@@ -176,7 +174,6 @@ def test_isis_5():
     assert lbl.find('MinimumLongitude') < 0
     ds = None
     gdal.GetDriverByName('ISIS3').Delete('/vsimem/isis_tmp.lbl')
-    return 'success'
 
 # Detached label creation and COMMENT option
 
@@ -202,7 +199,6 @@ def test_isis_6():
     assert ds.GetRasterBand(1).Checksum() == 0
     ds = None
     gdal.GetDriverByName('ISIS3').Delete('/vsimem/isis_tmp.lbl')
-    return 'success'
 
 # Uncompressed GeoTIFF creation
 
@@ -235,8 +231,6 @@ def test_isis_7():
     ds = None
     gdal.GetDriverByName('ISIS3').Delete('/vsimem/isis_tmp.lbl')
 
-    return 'success'
-
 # Compressed GeoTIFF creation
 
 
@@ -260,7 +254,6 @@ def test_isis_8():
     assert ds.GetRasterBand(1).Checksum() == 0
     ds = None
     gdal.GetDriverByName('ISIS3').Delete('/vsimem/isis_tmp.lbl')
-    return 'success'
 
 # Tiled creation + EXTERNAL_FILENAME
 
@@ -282,7 +275,6 @@ def test_isis_9():
     ds = None
     gdal.GetDriverByName('ISIS3').Delete('/vsimem/isis_tmp.lbl')
     assert gdal.VSIStatL('/vsimem/foo.bin') is None
-    return 'success'
 
 # Tiled creation + regular GeoTIFF + EXTERNAL_FILENAME
 
@@ -302,7 +294,6 @@ def test_isis_10():
     ds = None
     gdal.GetDriverByName('ISIS3').Delete('/vsimem/isis_tmp.lbl')
     assert gdal.VSIStatL('/vsimem/foo.tif') is None
-    return 'success'
 
 # Tiled creation + compressed GeoTIFF
 
@@ -320,7 +311,6 @@ def test_isis_11():
     assert ds.GetRasterBand(1).GetBlockSize() == [256, 256]
     ds = None
     gdal.GetDriverByName('ISIS3').Delete('/vsimem/isis_tmp.lbl')
-    return 'success'
 
 # Multiband
 
@@ -336,7 +326,6 @@ def test_isis_12():
         assert cs == expected_cs, (i + 1, cs, expected_cs)
     ds = None
     gdal.GetDriverByName('ISIS3').Delete('/vsimem/isis_tmp.lbl')
-    return 'success'
 
 # Multiband tiled
 
@@ -354,7 +343,6 @@ def test_isis_13():
         assert cs == expected_cs, (i + 1, cs, expected_cs)
     ds = None
     gdal.GetDriverByName('ISIS3').Delete('/vsimem/isis_tmp.lbl')
-    return 'success'
 
 # Multiband with uncompressed GeoTIFF
 
@@ -371,7 +359,6 @@ def test_isis_14():
         assert cs == expected_cs, (i + 1, cs, expected_cs)
     ds = None
     gdal.GetDriverByName('ISIS3').Delete('/vsimem/isis_tmp.lbl')
-    return 'success'
 
 # Multiband with uncompressed tiled GeoTIFF
 
@@ -389,7 +376,6 @@ def test_isis_15():
         assert cs == expected_cs, (i + 1, cs, expected_cs)
     ds = None
     gdal.GetDriverByName('ISIS3').Delete('/vsimem/isis_tmp.lbl')
-    return 'success'
 
 # Test Create() without anything else
 
@@ -432,8 +418,7 @@ def test_isis_16():
                 ds = None
                 gdal.GetDriverByName('ISIS3').Delete('/vsimem/isis_tmp.lbl')
 
-    return 'success'
-
+    
 # Test create copy through Create()
 
 
@@ -594,8 +579,6 @@ def test_isis_18():
 
     gdal.GetDriverByName('ISIS3').Delete('/vsimem/isis_tmp.lbl')
 
-    return 'success'
-
 # Test gdal.Info() with json:ISIS3 metadata domain
 
 
@@ -609,8 +592,6 @@ def test_isis_19():
     res = gdal.Info(ds, extraMDDomains=['json:ISIS3'])
     assert res.find('IsisCube') >= 0
 
-    return 'success'
-
 # Test gdal.Translate() subsetting and label preservation
 
 
@@ -625,8 +606,6 @@ def test_isis_20():
     ds = None
     gdal.GetDriverByName('ISIS3').Delete('/vsimem/isis_tmp.lbl')
 
-    return 'success'
-
 # Test gdal.Warp() and label preservation
 
 
@@ -642,8 +621,6 @@ def test_isis_21():
     ds = None
     gdal.GetDriverByName('ISIS3').Delete('/vsimem/isis_tmp.lbl')
 
-    return 'success'
-
 # Test source JSon use
 
 
@@ -722,8 +699,6 @@ def test_isis_22():
     ds = None
     gdal.GetDriverByName('ISIS3').Delete('/vsimem/isis_tmp.lbl')
 
-    return 'success'
-
 # Test nodata remapping
 
 
@@ -768,8 +743,7 @@ def test_isis_23():
         ds = None
         gdal.GetDriverByName('ISIS3').Delete('/vsimem/isis_tmp.lbl')
 
-    return 'success'
-
+    
 
 def cancel_cbk(pct, msg, user_data):
     # pylint: disable=unused-argument
@@ -1106,8 +1080,6 @@ def test_isis_24():
     # Delete would fail since ds is None
     gdal.Unlink('/vsimem/out.lbl')
 
-    return 'success'
-
 # Test CreateCopy() and scale and offset
 
 
@@ -1123,8 +1095,6 @@ def test_isis_25():
     ds = None
     gdal.GetDriverByName('ISIS3').Delete('/vsimem/out.lbl')
 
-    return 'success'
-
 # Test objects with same name
 
 
@@ -1200,8 +1170,6 @@ def test_isis_26():
     gdal.Unlink('/vsimem/in.lbl')
     gdal.GetDriverByName('ISIS3').Delete('/vsimem/out.lbl')
 
-    return 'success'
-
 # Test history
 
 
@@ -1271,8 +1239,6 @@ def test_isis_27():
     assert content.find('foo') >= 0
     gdal.GetDriverByName('ISIS3').Delete('/vsimem/out.lbl')
 
-    return 'success'
-
 # Test preservation of non-pixel sections
 
 
@@ -1309,7 +1275,7 @@ def test_isis_28():
     fl = ds.GetFileList()
     if fl != ['/vsimem/in.lbl', '/vsimem/in_table']:
         print(fl)
-        return 'success'
+        return
     ds = None
 
     gdal.Translate('/vsimem/in_label.lbl', '/vsimem/in.lbl', format='ISIS3')
@@ -1366,7 +1332,6 @@ def test_isis_28():
 
     gdal.GetDriverByName('ISIS3').Delete('/vsimem/in_label.lbl')
     gdal.GetDriverByName('ISIS3').Delete('/vsimem/in.lbl')
-    return 'success'
 
 # Test complete removal of history
 
@@ -1400,8 +1365,6 @@ def test_isis_29():
     gdal.GetDriverByName('ISIS3').Delete('/vsimem/out.lbl')
     gdal.GetDriverByName('ISIS3').Delete('/vsimem/in.lbl')
 
-    return 'success'
-
 # Test Fill() on a GeoTIFF file
 
 
@@ -1418,8 +1381,6 @@ def test_isis_30():
     gdal.GetDriverByName('ISIS3').Delete('/vsimem/test.lbl')
     assert cs == 1
 
-    return 'success'
-
 # Test correct working of block caching with a GeoTIFF file
 
 
@@ -1438,8 +1399,6 @@ def test_isis_31():
     gdal.GetDriverByName('ISIS3').Delete('/vsimem/test.lbl')
     assert cs == 1
 
-    return 'success'
-
 
 gdaltest_list = [
     test_isis_1,
diff --git a/autotest/gdrivers/jp2kak.py b/autotest/gdrivers/jp2kak.py
index 99453c4446d3..16eca2f85f74 100755
--- a/autotest/gdrivers/jp2kak.py
+++ b/autotest/gdrivers/jp2kak.py
@@ -159,8 +159,6 @@ def test_jp2kak_10():
 
     assert got == expected, 'did not get expected values.'
 
-    return 'success'
-
 ###############################################################################
 # Test handle of 11bit signed file.
 #
@@ -174,7 +172,6 @@ def test_jp2kak_11():
     ds = gdal.Open('data/gtsmall_11_int16.jp2')
     cs = ds.GetRasterBand(1).Checksum()
     assert cs in (63475, 63472, 63452, 63471)
-    return 'success'
 
 ###############################################################################
 # Test handle of 10bit unsigned file.
@@ -189,7 +186,6 @@ def test_jp2kak_12():
     ds = gdal.Open('data/gtsmall_10_uint16.jp2')
     cs = ds.GetRasterBand(1).Checksum()
     assert cs == 63360 or cs == 63357 or cs == 63358
-    return 'success'
 
 
 ###############################################################################
@@ -219,8 +215,6 @@ def test_jp2kak_13():
     checksum = ov_band.Checksum()
     assert checksum in (11776, 11736, 11801), 'did not get expected overview checksum'
 
-    return 'success'
-
 ###############################################################################
 # Test external overviews.
 #
@@ -256,8 +250,6 @@ def test_jp2kak_14():
     jp2_ds = None
     gdaltest.jp2kak_drv.Delete('tmp/jp2kak_13.jp2')
 
-    return 'success'
-
 ###############################################################################
 # Confirm we can read resolution information.
 #
@@ -278,8 +270,6 @@ def test_jp2kak_15():
 
     jp2_ds = None
 
-    return 'success'
-
 ###############################################################################
 # Confirm we can write and then reread resolution information.
 #
@@ -306,8 +296,6 @@ def test_jp2kak_16():
 
     gdaltest.jp2kak_drv.Delete('tmp/jp2kak_16.jp2')
 
-    return 'success'
-
 ###############################################################################
 # Test reading a file with axis orientation set properly for an alternate
 # axis order coordinate system (urn:...:EPSG::4326).
@@ -344,8 +332,6 @@ def test_jp2kak_17():
 
     gdal.SetConfigOption('GDAL_JP2K_ALT_OFFSETVECTOR_ORDER', 'NO')
 
-    return 'success'
-
 ###############################################################################
 # Test lossless copying of Int16
 
@@ -419,8 +405,6 @@ def test_jp2kak_20():
     fourth_band = ds.GetRasterBand(4)
     assert fourth_band.GetMetadataItem('NBITS', 'IMAGE_STRUCTURE') == '1'
 
-    return 'success'
-
 ###############################################################################
 # Test non nearest upsampling
 
@@ -453,8 +437,6 @@ def test_jp2kak_21():
     cs = mem_ds.GetRasterBand(1).Checksum()
     assert cs == ref_cs
 
-    return 'success'
-
 ###############################################################################
 # Test RGBA datasets
 
@@ -477,8 +459,6 @@ def test_jp2kak_22():
 
     gdal.Unlink('/vsimem/jp2kak_22.jp2')
 
-    return 'success'
-
 
 ###############################################################################
 # Cleanup.
@@ -487,8 +467,6 @@ def test_jp2kak_cleanup():
 
     gdaltest.reregister_all_jpeg2000_drivers()
 
-    return 'success'
-
 
 gdaltest_list = [
     test_jp2kak_1,
diff --git a/autotest/gdrivers/jp2lura.py b/autotest/gdrivers/jp2lura.py
index b1d38161436a..747d7fac0453 100755
--- a/autotest/gdrivers/jp2lura.py
+++ b/autotest/gdrivers/jp2lura.py
@@ -65,8 +65,7 @@ def test_jp2lura_1():
         gdaltest.jp2lura_drv = None
         pytest.skip('Driver JP2Lura is registered, but issue with license')
 
-    return 'success'
-
+    
 ###############################################################################
 #
 
@@ -87,8 +86,6 @@ def test_jp2lura_missing_license_num():
 
     assert ds is None
 
-    return 'success'
-
 ###############################################################################
 #
 
@@ -109,8 +106,6 @@ def test_jp2lura_invalid_license_num():
 
     assert ds is None
 
-    return 'success'
-
 ###############################################################################
 
 
@@ -140,7 +135,7 @@ def validate(filename, expected_gmljp2=True, return_error_count=False, oidoc=Non
     if return_error_count:
         return (res.error_count, res.warning_count)
     if res.error_count == 0 and res.warning_count == 0:
-        return 'success'
+        return
     pytest.fail()
 
 ###############################################################################
@@ -201,8 +196,6 @@ def test_jp2lura_3():
     ds = ogr.Open('data/int16.jp2')
     assert ds is None
 
-    return 'success'
-
 ###############################################################################
 # Test copying byte.jp2
 
@@ -262,8 +255,6 @@ def test_jp2lura_4(out_filename='tmp/jp2lura_4.jp2'):
 
     assert cs == 50054, 'bad checksum'
 
-    return 'success'
-
 
 def test_jp2lura_4_vsimem():
     return test_jp2lura_4('/vsimem/jp2lura_4.jp2')
@@ -297,8 +288,6 @@ def test_jp2lura_6():
     ds.GetRasterBand(1).Checksum()
     ds = None
 
-    return 'success'
-
 ###############################################################################
 # Open byte.jp2.gz (test use of the VSIL API)
 
@@ -330,8 +319,6 @@ def test_jp2lura_8():
 
     assert ds.GetRasterBand(1).DataType == gdal.GDT_UInt16, 'unexpected data type'
 
-    return 'success'
-
 ###############################################################################
 # Check that we can use .j2w world files (#4651)
 
@@ -349,8 +336,6 @@ def test_jp2lura_9():
 
     ds = None
 
-    return 'success'
-
 ###############################################################################
 # Test YCBCR420 creation option
 
@@ -373,8 +358,6 @@ def DISABLED_jp2lura_10():
     # Quite a bit of difference...
     assert maxdiff <= 12, 'Image too different from reference'
 
-    return 'success'
-
 ###############################################################################
 # Test auto-promotion of 1bit alpha band to 8bit
 
@@ -411,8 +394,6 @@ def DISABLED_jp2lura_11():
     fourth_band = ds.GetRasterBand(4)
     assert fourth_band.GetMetadataItem('NBITS', 'IMAGE_STRUCTURE') == '1'
 
-    return 'success'
-
 ###############################################################################
 # Check that PAM overrides internal georeferencing (#5279)
 
@@ -454,8 +435,6 @@ def test_jp2lura_12():
 
     assert gt == (1000, 1, 0, 2000, 0, -1)
 
-    return 'success'
-
 ###############################################################################
 # Check that PAM overrides internal GCPs (#5279)
 
@@ -502,8 +481,6 @@ def test_jp2lura_13():
     assert len(gcps) == 1
     assert wkt.find('32631') >= 0
 
-    return 'success'
-
 ###############################################################################
 # Check that we get GCPs even there's no projection info
 
@@ -516,8 +493,6 @@ def test_jp2lura_14():
     ds = gdal.Open('data/byte_2gcps.jp2')
     assert ds.GetGCPCount() == 2
 
-    return 'success'
-
 ###############################################################################
 # Test reading PixelIsPoint file (#5437)
 
@@ -550,8 +525,6 @@ def test_jp2lura_16():
     assert gt == gt_expected, \
         'did not get expected geotransform with GTIFF_POINT_GEO_IGNORE TRUE'
 
-    return 'success'
-
 ###############################################################################
 # Test writing PixelIsPoint file (#5437)
 
@@ -580,8 +553,6 @@ def test_jp2lura_17():
 
     gdal.Unlink('/vsimem/jp2lura_17.jp2')
 
-    return 'success'
-
 ###############################################################################
 # Test when using the decode_area API when one dimension of the dataset is not a
 # multiple of 1024 (#5480)
@@ -604,8 +575,6 @@ def test_jp2lura_18():
 
     gdal.Unlink('/vsimem/jp2lura_18.jp2')
 
-    return 'success'
-
 ###############################################################################
 # Test reading file where GMLJP2 has nul character instead of \n (#5760)
 
@@ -619,8 +588,6 @@ def test_jp2lura_19():
     assert ds.GetProjectionRef() != ''
     ds = None
 
-    return 'success'
-
 ###############################################################################
 # Validate GMLJP2 content against schema
 
@@ -686,8 +653,6 @@ def test_jp2lura_20():
 
     assert xmlvalidate.validate(gmljp2, ogc_schemas_location='tmp/cache/SCHEMAS_OPENGIS_NET')
 
-    return 'success'
-
 ###############################################################################
 # Test RGBA support
 
@@ -794,8 +759,7 @@ def test_jp2lura_22():
 
         assert maxdiff <= 0, 'Image too different from reference'
 
-    return 'success'
-
+    
 ###############################################################################
 # Test NBITS support
 
@@ -824,8 +788,6 @@ def DISABLED_jp2lura_23():
 
     assert maxdiff <= 1, 'Image too different from reference'
 
-    return 'success'
-
 ###############################################################################
 # Test Grey+alpha support
 
@@ -871,8 +833,7 @@ def test_jp2lura_24():
         ds = None
         gdal.Unlink('/vsimem/jp2lura_24.jp2')
 
-    return 'success'
-
+    
 ###############################################################################
 # Test multiband support
 
@@ -902,8 +863,6 @@ def test_jp2lura_25():
 
     assert maxdiff <= 0, 'Image too different from reference'
 
-    return 'success'
-
 ###############################################################################
 # Test CreateCopy() from a JPEG2000 with a 2048x2048 tiling
 
@@ -926,8 +885,6 @@ def test_jp2lura_27():
     gdal.Unlink('/vsimem/jp2lura_27.jp2')
     gdal.Unlink('/vsimem/jp2lura_27.tif')
 
-    return 'success'
-
 ###############################################################################
 # Test CODEBLOCK_WIDTH/_HEIGHT
 
@@ -1025,8 +982,6 @@ def test_jp2lura_28():
 
     gdal.Unlink('/vsimem/jp2lura_28.jp2')
 
-    return 'success'
-
 ###############################################################################
 # Test color table support
 
@@ -1050,8 +1005,6 @@ def test_jp2lura_30():
     gdal.PopErrorHandler()
     assert out_ds is None
 
-    return 'success'
-
 ###############################################################################
 # Test unusual band color interpretation order
 
@@ -1092,8 +1045,6 @@ def DISABLED_jp2lura_31():
     ds = None
     gdal.Unlink('/vsimem/jp2lura_31.jp2')
 
-    return 'success'
-
 ###############################################################################
 # Test crazy tile size
 
@@ -1114,8 +1065,6 @@ def DISABLED_jp2lura_33():
     out_ds = None
     gdal.Unlink('/vsimem/jp2lura_33.jp2')
 
-    return 'success'
-
 ###############################################################################
 # Test opening a file whose dimensions are > 2^31-1
 
@@ -1130,8 +1079,6 @@ def test_jp2lura_34():
     gdal.PopErrorHandler()
     assert ds is None
 
-    return 'success'
-
 
 ###############################################################################
 # Test opening a truncated file
@@ -1146,8 +1093,6 @@ def test_jp2lura_35():
     gdal.PopErrorHandler()
     assert ds is None
 
-    return 'success'
-
 ###############################################################################
 # Test we cannot create files with more than 16384 bands
 
@@ -1163,8 +1108,6 @@ def test_jp2lura_36():
     gdal.PopErrorHandler()
     assert out_ds is None and gdal.VSIStatL('/vsimem/jp2lura_36.jp2') is None
 
-    return 'success'
-
 ###############################################################################
 # Test metadata reading & writing
 
@@ -1258,8 +1201,7 @@ def test_jp2lura_37():
 
         gdal.Unlink('/vsimem/jp2lura_37.jp2')
 
-    return 'success'
-
+    
 ###############################################################################
 # Test non-EPSG SRS (so written with a GML dictionary)
 
@@ -1295,8 +1237,7 @@ def test_jp2lura_38():
     if do_validate:
         assert xmlvalidate.validate(crsdictionary, ogc_schemas_location='tmp/cache/SCHEMAS_OPENGIS_NET')
 
-    return 'success'
-
+    
 ###############################################################################
 # Test GMLJP2OVERRIDE configuration option and DGIWG GMLJP2
 
@@ -1366,8 +1307,6 @@ def test_jp2lura_39():
     ds = None
     gdal.Unlink('/vsimem/jp2lura_39.jp2')
 
-    return 'success'
-
 ###############################################################################
 # Test we can parse GMLJP2 v2.0
 
@@ -1444,8 +1383,6 @@ def test_jp2lura_40():
     ds = None
     gdal.Unlink('/vsimem/jp2lura_40.jp2')
 
-    return 'success'
-
 ###############################################################################
 # Test USE_SRC_CODESTREAM=YES
 
@@ -1488,8 +1425,6 @@ def test_jp2lura_41():
     assert gdal.GetLastErrorMsg() != ''
     gdal.Unlink('/vsimem/jp2lura_41.jp2')
 
-    return 'success'
-
 ###############################################################################
 # Get structure of a JPEG2000 file
 
@@ -1499,8 +1434,6 @@ def test_jp2lura_43():
     ret = gdal.GetJPEG2000StructureAsString('data/byte.jp2', ['ALL=YES'])
     assert ret is not None
 
-    return 'success'
-
 ###############################################################################
 # Test GMLJP2v2
 
@@ -1585,8 +1518,6 @@ def test_jp2lura_45():
 
     gdal.Unlink('/vsimem/jp2lura_45.jp2')
 
-    return 'success'
-
 ###############################################################################
 # Test writing & reading RPC in GeoJP2 box
 
@@ -1607,8 +1538,6 @@ def test_jp2lura_47():
 
     gdal.Unlink('/vsimem/jp2lura_47.jp2')
 
-    return 'success'
-
 ###############################################################################
 # Test reading a dataset whose tile dimensions are larger than dataset ones
 
@@ -1624,8 +1553,6 @@ def test_jp2lura_48():
     assert ds.GetRasterBand(1).Checksum() == 4610
     ds = None
 
-    return 'success'
-
 ###############################################################################
 
 
@@ -1646,8 +1573,6 @@ def test_jp2lura_online_1():
     ds.GetRasterBand(1).Checksum()
     ds = None
 
-    return 'success'
-
 ###############################################################################
 
 
@@ -1673,8 +1598,6 @@ def test_jp2lura_online_2():
 
     ds = None
 
-    return 'success'
-
 ###############################################################################
 
 
@@ -1704,8 +1627,6 @@ def test_jp2lura_online_3():
     # Difference between the image before and after compression
     assert maxdiff <= 17, 'Image too different from reference'
 
-    return 'success'
-
 ###############################################################################
 
 
@@ -1735,8 +1656,6 @@ def test_jp2lura_online_4():
     # Difference between the image before and after compression
     assert maxdiff <= 10, 'Image too different from reference'
 
-    return 'success'
-
 ###############################################################################
 # Try reading JP2Lura with color table
 
@@ -1756,8 +1675,6 @@ def test_jp2lura_online_5():
         'Did not get expected color table'
     ds = None
 
-    return 'success'
-
 ###############################################################################
 # Try reading YCbCr JP2Lura as RGB
 
@@ -1781,8 +1698,6 @@ def test_jp2lura_online_6():
     assert ds is None
     ds = None
 
-    return 'success'
-
 ###############################################################################
 # Test GDAL_GEOREF_SOURCES
 
@@ -1904,8 +1819,7 @@ def test_jp2lura_49():
         gdal.OpenEx('data/inconsitant_geojp2_gmljp2.jp2', open_options=['GEOREF_SOURCES=unhandled'])
         assert gdal.GetLastErrorMsg() != '', 'expected warning'
 
-    return 'success'
-
+    
 
 ###############################################################################
 # Test reading split IEEE-754 Float32
@@ -1979,8 +1893,6 @@ def test_jp2lura_51():
 
     gdaltest.jp2lura_drv.Delete('/vsimem/jp2lura_51.jp2')
 
-    return 'success'
-
 ###############################################################################
 # Test other data types
 
@@ -2015,8 +1927,6 @@ def test_jp2lura_52():
 
     gdaltest.jp2lura_drv.Delete('/vsimem/jp2lura_52.jp2')
 
-    return 'success'
-
 ###############################################################################
 # Test RATE and QUALITY
 
@@ -2062,8 +1972,6 @@ def test_jp2lura_53():
 
     gdaltest.jp2lura_drv.Delete('/vsimem/jp2lura_53.jp2')
 
-    return 'success'
-
 ###############################################################################
 # Test RasterIO edge cases
 
@@ -2093,16 +2001,12 @@ def test_jp2lura_54():
 
     gdaltest.jp2lura_drv.Delete('/vsimem/jp2lura_54.jp2')
 
-    return 'success'
-
 
 ###############################################################################
 def test_jp2lura_cleanup():
 
     gdaltest.reregister_all_jpeg2000_drivers()
 
-    return 'success'
-
 
 gdaltest_list = [
     test_jp2lura_1,
diff --git a/autotest/gdrivers/jp2metadata.py b/autotest/gdrivers/jp2metadata.py
index 3362c94cbf86..9cad5a55f32a 100755
--- a/autotest/gdrivers/jp2metadata.py
+++ b/autotest/gdrivers/jp2metadata.py
@@ -53,8 +53,7 @@ def test_jp2metadata_1():
     expected_gt = (356000.0, 0.5, 0.0, 7596000.0, 0.0, -0.5)
     for i in range(6):
         assert abs(gt[i] - expected_gt[i]) <= 1e-5
-    return 'success'
-
+    
 ###############################################################################
 # Test Pleiades imagery metadata
 
@@ -93,8 +92,7 @@ def test_jp2metadata_2():
     except OSError:
         pass
 
-    return 'success'
-
+    
 ###############################################################################
 # Test reading GMLJP2 file with srsName only on the Envelope, and lots of other
 # metadata junk.  This file is also handled currently with axis reordering
@@ -131,8 +129,6 @@ def test_jp2metadata_3():
 
     gdal.SetConfigOption('GDAL_IGNORE_AXIS_ORIENTATION', 'NO')
 
-    return 'success'
-
 ###############################################################################
 # Test reading a file with axis orientation set properly for an alternate
 # axis order coordinate system (urn:...:EPSG::4326).
@@ -166,8 +162,6 @@ def test_jp2metadata_4():
 
     ds = None
 
-    return 'success'
-
 ###############################################################################
 # Test reading a file with EPSG axis orientation being northing, easting,
 # but with explicit axisName being easting, northing (#5960)
@@ -200,8 +194,6 @@ def test_jp2metadata_5():
 
     ds = None
 
-    return 'success'
-
 
 gdaltest_list = [
     test_jp2metadata_1,
diff --git a/autotest/gdrivers/jp2openjpeg.py b/autotest/gdrivers/jp2openjpeg.py
index d927283a5d69..91742b24d6bd 100755
--- a/autotest/gdrivers/jp2openjpeg.py
+++ b/autotest/gdrivers/jp2openjpeg.py
@@ -54,8 +54,6 @@ def test_jp2openjpeg_1():
 
     gdaltest.deregister_all_jpeg2000_drivers_but('JP2OpenJPEG')
 
-    return 'success'
-
 ###############################################################################
 # Open byte.jp2
 
@@ -114,8 +112,6 @@ def test_jp2openjpeg_3():
     ds = ogr.Open('data/int16.jp2')
     assert ds is None
 
-    return 'success'
-
 ###############################################################################
 # Test copying byte.jp2
 
@@ -173,8 +169,6 @@ def test_jp2openjpeg_4(out_filename='tmp/jp2openjpeg_4.jp2'):
 
     assert cs == 50054, 'bad checksum'
 
-    return 'success'
-
 
 def test_jp2openjpeg_4_vsimem():
     return test_jp2openjpeg_4('/vsimem/jp2openjpeg_4.jp2')
@@ -208,8 +202,6 @@ def test_jp2openjpeg_6():
     ds.GetRasterBand(1).Checksum()
     ds = None
 
-    return 'success'
-
 ###############################################################################
 # Open byte.jp2.gz (test use of the VSIL API)
 
@@ -241,8 +233,6 @@ def test_jp2openjpeg_8():
 
     assert ds.GetRasterBand(1).DataType == gdal.GDT_UInt16, 'unexpected data type'
 
-    return 'success'
-
 ###############################################################################
 # Check that we can use .j2w world files (#4651)
 
@@ -260,8 +250,6 @@ def test_jp2openjpeg_9():
 
     ds = None
 
-    return 'success'
-
 ###############################################################################
 # Test YCBCR420 creation option
 
@@ -284,8 +272,6 @@ def test_jp2openjpeg_10():
     # Quite a bit of difference...
     assert maxdiff <= 12, 'Image too different from reference'
 
-    return 'success'
-
 ###############################################################################
 # Test auto-promotion of 1bit alpha band to 8bit
 
@@ -322,8 +308,6 @@ def test_jp2openjpeg_11():
     fourth_band = ds.GetRasterBand(4)
     assert fourth_band.GetMetadataItem('NBITS', 'IMAGE_STRUCTURE') == '1'
 
-    return 'success'
-
 ###############################################################################
 # Check that PAM overrides internal georeferencing (#5279)
 
@@ -365,8 +349,6 @@ def test_jp2openjpeg_12():
 
     assert gt == (1000, 1, 0, 2000, 0, -1)
 
-    return 'success'
-
 ###############################################################################
 # Check that PAM overrides internal GCPs (#5279)
 
@@ -413,8 +395,6 @@ def test_jp2openjpeg_13():
     assert len(gcps) == 1
     assert wkt.find('32631') >= 0
 
-    return 'success'
-
 ###############################################################################
 # Check that we get GCPs even there's no projection info
 
@@ -427,8 +407,6 @@ def test_jp2openjpeg_14():
     ds = gdal.Open('data/byte_2gcps.jp2')
     assert ds.GetGCPCount() == 2
 
-    return 'success'
-
 ###############################################################################
 # Test multi-threading reading
 
@@ -448,8 +426,6 @@ def test_jp2openjpeg_15():
     gdaltest.jp2openjpeg_drv.Delete('/vsimem/jp2openjpeg_15.jp2')
     assert got_data == data
 
-    return 'success'
-
 ###############################################################################
 # Test reading PixelIsPoint file (#5437)
 
@@ -482,8 +458,6 @@ def test_jp2openjpeg_16():
     assert gt == gt_expected, \
         'did not get expected geotransform with GTIFF_POINT_GEO_IGNORE TRUE'
 
-    return 'success'
-
 ###############################################################################
 # Test writing PixelIsPoint file (#5437)
 
@@ -512,8 +486,6 @@ def test_jp2openjpeg_17():
 
     gdal.Unlink('/vsimem/jp2openjpeg_17.jp2')
 
-    return 'success'
-
 ###############################################################################
 # Test when using the decode_area API when one dimension of the dataset is not a
 # multiple of 1024 (#5480)
@@ -536,8 +508,6 @@ def test_jp2openjpeg_18():
 
     gdal.Unlink('/vsimem/jp2openjpeg_18.jp2')
 
-    return 'success'
-
 ###############################################################################
 # Test reading file where GMLJP2 has nul character instead of \n (#5760)
 
@@ -551,8 +521,6 @@ def test_jp2openjpeg_19():
     assert ds.GetProjectionRef() != ''
     ds = None
 
-    return 'success'
-
 ###############################################################################
 # Validate GMLJP2 content against schema
 
@@ -618,8 +586,6 @@ def test_jp2openjpeg_20():
 
     assert xmlvalidate.validate(gmljp2, ogc_schemas_location='tmp/cache/SCHEMAS_OPENGIS_NET')
 
-    return 'success'
-
 ###############################################################################
 # Test YCC=NO creation option
 
@@ -639,8 +605,6 @@ def test_jp2openjpeg_21():
     # Quite a bit of difference...
     assert maxdiff <= 1, 'Image too different from reference'
 
-    return 'success'
-
 ###############################################################################
 # Test RGBA support
 
@@ -743,8 +707,6 @@ def test_jp2openjpeg_22():
 
     assert maxdiff <= 0, 'Image too different from reference'
 
-    return 'success'
-
 ###############################################################################
 # Test NBITS support
 
@@ -773,8 +735,6 @@ def test_jp2openjpeg_23():
 
     assert maxdiff <= 1, 'Image too different from reference'
 
-    return 'success'
-
 ###############################################################################
 # Test Grey+alpha support
 
@@ -816,8 +776,6 @@ def test_jp2openjpeg_24():
     ds = None
     gdal.Unlink('/vsimem/jp2openjpeg_24.jp2')
 
-    return 'success'
-
 ###############################################################################
 # Test multiband support
 
@@ -847,8 +805,6 @@ def test_jp2openjpeg_25():
 
     assert maxdiff <= 0, 'Image too different from reference'
 
-    return 'success'
-
 ###############################################################################
 
 
@@ -878,7 +834,7 @@ def validate(filename, expected_gmljp2=True, return_error_count=False, oidoc=Non
     if return_error_count:
         return (res.error_count, res.warning_count)
     if res.error_count == 0 and res.warning_count == 0:
-        return 'success'
+        return
     pytest.fail()
 
 ###############################################################################
@@ -1025,8 +981,6 @@ def test_jp2openjpeg_26():
     gdal.PopErrorHandler()
     assert out_ds is None
 
-    return 'success'
-
 ###############################################################################
 # Test CreateCopy() from a JPEG2000 with a 2048x2048 tiling
 
@@ -1049,8 +1003,6 @@ def test_jp2openjpeg_27():
     gdal.Unlink('/vsimem/jp2openjpeg_27.jp2')
     gdal.Unlink('/vsimem/jp2openjpeg_27.tif')
 
-    return 'success'
-
 ###############################################################################
 # Test CODEBLOCK_WIDTH/_HEIGHT
 
@@ -1148,8 +1100,6 @@ def test_jp2openjpeg_28():
 
     gdal.Unlink('/vsimem/jp2openjpeg_28.jp2')
 
-    return 'success'
-
 ###############################################################################
 # Test TILEPARTS option
 
@@ -1185,8 +1135,6 @@ def test_jp2openjpeg_29():
 
     gdal.Unlink('/vsimem/jp2openjpeg_29.jp2')
 
-    return 'success'
-
 ###############################################################################
 # Test color table support
 
@@ -1276,8 +1224,6 @@ def test_jp2openjpeg_30():
     gdal.PopErrorHandler()
     assert out_ds is None
 
-    return 'success'
-
 ###############################################################################
 # Test unusual band color interpretation order
 
@@ -1318,8 +1264,6 @@ def test_jp2openjpeg_31():
     ds = None
     gdal.Unlink('/vsimem/jp2openjpeg_31.jp2')
 
-    return 'success'
-
 ###############################################################################
 # Test creation of "XLBoxes" for JP2C
 
@@ -1337,8 +1281,6 @@ def test_jp2openjpeg_32():
     out_ds = None
     gdal.Unlink('/vsimem/jp2openjpeg_32.jp2')
 
-    return 'success'
-
 ###############################################################################
 # Test crazy tile size
 
@@ -1361,8 +1303,6 @@ def test_jp2openjpeg_33():
     out_ds = None
     gdal.Unlink('/vsimem/jp2openjpeg_33.jp2')
 
-    return 'success'
-
 ###############################################################################
 # Test opening a file whose dimensions are > 2^31-1
 
@@ -1377,8 +1317,6 @@ def test_jp2openjpeg_34():
     gdal.PopErrorHandler()
     assert ds is None
 
-    return 'success'
-
 
 ###############################################################################
 # Test opening a truncated file
@@ -1393,8 +1331,6 @@ def test_jp2openjpeg_35():
     gdal.PopErrorHandler()
     assert ds is None
 
-    return 'success'
-
 ###############################################################################
 # Test we cannot create files with more than 16384 bands
 
@@ -1410,8 +1346,6 @@ def test_jp2openjpeg_36():
     gdal.PopErrorHandler()
     assert out_ds is None and gdal.VSIStatL('/vsimem/jp2openjpeg_36.jp2') is None
 
-    return 'success'
-
 ###############################################################################
 # Test metadata reading & writing
 
@@ -1506,8 +1440,7 @@ def test_jp2openjpeg_37():
         assert validate('/vsimem/jp2openjpeg_37.jp2', expected_gmljp2=False) != 'fail'
         gdal.Unlink('/vsimem/jp2openjpeg_37.jp2')
 
-    return 'success'
-
+    
 ###############################################################################
 # Test non-EPSG SRS (so written with a GML dictionary)
 
@@ -1544,8 +1477,7 @@ def test_jp2openjpeg_38():
     if do_validate:
         assert xmlvalidate.validate(crsdictionary, ogc_schemas_location='tmp/cache/SCHEMAS_OPENGIS_NET')
 
-    return 'success'
-
+    
 ###############################################################################
 # Test GMLJP2OVERRIDE configuration option and DGIWG GMLJP2
 
@@ -1615,8 +1547,6 @@ def test_jp2openjpeg_39():
     ds = None
     gdal.Unlink('/vsimem/jp2openjpeg_39.jp2')
 
-    return 'success'
-
 ###############################################################################
 # Test we can parse GMLJP2 v2.0
 
@@ -1693,8 +1623,6 @@ def test_jp2openjpeg_40():
     ds = None
     gdal.Unlink('/vsimem/jp2openjpeg_40.jp2')
 
-    return 'success'
-
 ###############################################################################
 # Test USE_SRC_CODESTREAM=YES
 
@@ -1735,8 +1663,6 @@ def test_jp2openjpeg_41():
     assert gdal.GetLastErrorMsg() != ''
     gdal.Unlink('/vsimem/jp2openjpeg_41.jp2')
 
-    return 'success'
-
 ###############################################################################
 # Test update of existing file
 
@@ -1872,8 +1798,6 @@ def test_jp2openjpeg_42():
 
     gdal.Unlink('/vsimem/jp2openjpeg_42.jp2')
 
-    return 'success'
-
 ###############################################################################
 # Get structure of a JPEG2000 file
 
@@ -1883,8 +1807,6 @@ def test_jp2openjpeg_43():
     ret = gdal.GetJPEG2000StructureAsString('data/byte.jp2', ['ALL=YES'])
     assert ret is not None
 
-    return 'success'
-
 ###############################################################################
 # Check a file against a OrthoimageryCoverage document
 
@@ -2601,8 +2523,6 @@ def test_jp2openjpeg_45():
 
     gdal.Unlink('/vsimem/jp2openjpeg_45.jp2.aux.xml')
 
-    return 'success'
-
 ###############################################################################
 # Test GMLJP2v2 metadata generator / XPath
 
@@ -2765,8 +2685,6 @@ def test_jp2openjpeg_46():
     # ds = None
     gdal.Unlink('/vsimem/jp2openjpeg_46.jp2')
 
-    return 'success'
-
 ###############################################################################
 # Test writing & reading RPC in GeoJP2 box
 
@@ -2787,8 +2705,6 @@ def test_jp2openjpeg_47():
 
     gdal.Unlink('/vsimem/jp2openjpeg_47.jp2')
 
-    return 'success'
-
 ###############################################################################
 # Test reading a dataset whose tile dimensions are larger than dataset ones
 
@@ -2804,8 +2720,6 @@ def test_jp2openjpeg_48():
     assert ds.GetRasterBand(1).Checksum() == 4610
     ds = None
 
-    return 'success'
-
 ###############################################################################
 
 
@@ -2826,8 +2740,6 @@ def test_jp2openjpeg_online_1():
     ds.GetRasterBand(1).Checksum()
     ds = None
 
-    return 'success'
-
 ###############################################################################
 
 
@@ -2853,8 +2765,6 @@ def test_jp2openjpeg_online_2():
 
     ds = None
 
-    return 'success'
-
 ###############################################################################
 
 
@@ -2884,8 +2794,6 @@ def test_jp2openjpeg_online_3():
     # Difference between the image before and after compression
     assert maxdiff <= 17, 'Image too different from reference'
 
-    return 'success'
-
 ###############################################################################
 
 
@@ -2915,8 +2823,6 @@ def test_jp2openjpeg_online_4():
     # Difference between the image before and after compression
     assert maxdiff <= 10, 'Image too different from reference'
 
-    return 'success'
-
 ###############################################################################
 # Try reading JP2OpenJPEG with color table
 
@@ -2936,8 +2842,6 @@ def test_jp2openjpeg_online_5():
         'Did not get expected color table'
     ds = None
 
-    return 'success'
-
 ###############################################################################
 # Try reading YCbCr JP2OpenJPEG as RGB
 
@@ -2959,8 +2863,6 @@ def test_jp2openjpeg_online_6():
 
     ds = None
 
-    return 'success'
-
 ###############################################################################
 # Test GDAL_GEOREF_SOURCES
 
@@ -3082,8 +2984,7 @@ def test_jp2openjpeg_49():
         gdal.OpenEx('data/inconsitant_geojp2_gmljp2.jp2', open_options=['GEOREF_SOURCES=unhandled'])
         assert gdal.GetLastErrorMsg() != '', 'expected warning'
 
-    return 'success'
-
+    
 ###############################################################################
 # Test opening an image of small dimension with very small tiles (#7012)
 
@@ -3100,8 +3001,6 @@ def test_jp2openjpeg_50():
     cs = ds.GetRasterBand(1).Checksum()
     assert cs == 2046, 'expected warning'
 
-    return 'success'
-
 ###############################################################################
 # Test CODEBLOCK_STYLE
 
@@ -3138,8 +3037,6 @@ def test_jp2openjpeg_codeblock_style():
 
     gdaltest.jp2openjpeg_drv.Delete(filename)
 
-    return 'success'
-
 ###############################################################################
 # Test external overviews
 
@@ -3165,8 +3062,6 @@ def test_jp2openjpeg_external_overviews_single_band():
 
     assert cs == 28926
 
-    return 'success'
-
 ###############################################################################
 # Test external overviews
 
@@ -3192,8 +3087,6 @@ def test_jp2openjpeg_external_overviews_multiple_band():
 
     assert cs == [6233, 7706, 26085]
 
-    return 'success'
-
 ###############################################################################
 
 
@@ -3201,8 +3094,6 @@ def test_jp2openjpeg_cleanup():
 
     gdaltest.reregister_all_jpeg2000_drivers()
 
-    return 'success'
-
 
 gdaltest_list = [
     test_jp2openjpeg_1,
diff --git a/autotest/gdrivers/jpeg.py b/autotest/gdrivers/jpeg.py
index 1468731b6a83..77ec7489a2fa 100755
--- a/autotest/gdrivers/jpeg.py
+++ b/autotest/gdrivers/jpeg.py
@@ -101,8 +101,6 @@ def test_jpeg_2():
     assert 'COMPRESSION' in md and md['COMPRESSION'] == 'JPEG', \
         'missing INTERLEAVE metadata'
 
-    return 'success'
-
 ###############################################################################
 # Create simple copy and check (greyscale) using progressive option.
 
@@ -160,8 +158,7 @@ def test_jpeg_3():
     except OSError:
         pass
 
-    return 'success'
-
+    
 ###############################################################################
 # Verify masked jpeg.
 
@@ -182,8 +179,6 @@ def test_jpeg_4():
     cs = refband.GetMaskBand().Checksum()
     assert cs == 770, 'Wrong mask checksum'
 
-    return 'success'
-
 ###############################################################################
 # Verify CreateCopy() of masked jpeg.
 
@@ -210,8 +205,6 @@ def test_jpeg_5():
     ds2 = None
     gdal.GetDriverByName('JPEG').Delete('tmp/masked.jpg')
 
-    return 'success'
-
 ###############################################################################
 # Verify ability to open file with corrupt metadata (#1904).  Note the file
 # data/vophead.jpg is truncated to keep the size small, but this should
@@ -241,8 +234,6 @@ def test_jpeg_6():
 
     ds = None
 
-    return 'success'
-
 
 ###############################################################################
 # Test creating an in memory copy.
@@ -265,8 +256,6 @@ def test_jpeg_7():
     ds = None
     gdal.GetDriverByName('JPEG').Delete('/vsimem/byte.jpg')
 
-    return 'success'
-
 ###############################################################################
 # Read a CMYK image as a RGB image
 
@@ -304,8 +293,6 @@ def test_jpeg_8():
     assert 'SOURCE_COLOR_SPACE' in md and md['SOURCE_COLOR_SPACE'] == 'CMYK', \
         'missing SOURCE_COLOR_SPACE metadata'
 
-    return 'success'
-
 ###############################################################################
 # Read a CMYK image as a CMYK image
 
@@ -348,8 +335,6 @@ def test_jpeg_9():
     assert ds.GetRasterBand(4).GetRasterColorInterpretation() == gdal.GCI_BlackBand, \
         'Wrong color interpretation.'
 
-    return 'success'
-
 ###############################################################################
 # Check reading a 12-bit JPEG
 
@@ -382,8 +367,7 @@ def test_jpeg_10():
     except OSError:
         pass
 
-    return 'success'
-
+    
 ###############################################################################
 # Check creating a 12-bit JPEG
 
@@ -412,8 +396,6 @@ def test_jpeg_11():
 
     gdal.GetDriverByName('JPEG').Delete('tmp/jpeg11.jpg')
 
-    return 'success'
-
 ###############################################################################
 # Test reading a stored JPEG in ZIP (#3908)
 
@@ -433,8 +415,6 @@ def test_jpeg_12():
 
     ds = None
 
-    return 'success'
-
 ###############################################################################
 # Test writing to /vsistdout/
 
@@ -454,8 +434,6 @@ def test_jpeg_13():
 
     gdal.Unlink('/vsimem/tmp.jpg')
 
-    return 'success'
-
 ###############################################################################
 # Test writing to /vsistdout/
 
@@ -483,8 +461,6 @@ def test_jpeg_14():
 
     gdal.Unlink('/vsimem/tmp.jpg')
 
-    return 'success'
-
 ###############################################################################
 # Test CreateCopy() interruption
 
@@ -543,8 +519,6 @@ def test_jpeg_16():
 
     ds = None
 
-    return 'success'
-
 ###############################################################################
 # Test bogus files
 
@@ -589,8 +563,6 @@ def test_jpeg_17():
     assert (not (gdal.GetLastErrorType() != gdal.CE_Failure or
             gdal.GetLastErrorMsg() == ''))
 
-    return 'success'
-
 ###############################################################################
 # Test situation where we cause a restart and need to reset scale
 
@@ -645,8 +617,6 @@ def test_jpeg_18():
     ds = None
     gdal.Unlink('/vsimem/jpeg_18.jpg')
 
-    return 'success'
-
 ###############################################################################
 # Test MSB ordering of bits in mask (#5102)
 
@@ -712,8 +682,7 @@ def test_jpeg_19():
         gdal.GetDriverByName('JPEG').Delete('/vsimem/jpeg_19.jpg')
         gdal.GetDriverByName('JPEG').Delete('/vsimem/jpeg_19_msb.jpg')
 
-    return 'success'
-
+    
 ###############################################################################
 # Test correct GCP reading with PAM (#5352)
 
@@ -732,8 +701,6 @@ def test_jpeg_20():
 
     gdal.GetDriverByName('JPEG').Delete('/vsimem/jpeg_20.jpg')
 
-    return 'success'
-
 ###############################################################################
 # Test implicit and EXIF overviews
 
@@ -753,8 +720,6 @@ def test_jpeg_21():
         i = i + 1
     ds = None
 
-    return 'success'
-
 ###############################################################################
 # Test generation of EXIF overviews
 
@@ -818,8 +783,6 @@ def test_jpeg_22():
 
     gdal.Unlink('/vsimem/jpeg_22.jpg')
 
-    return 'success'
-
 ###############################################################################
 # Test optimized JPEG IRasterIO
 
@@ -856,8 +819,6 @@ def test_jpeg_23():
     got_cs = [tmp_ds.GetRasterBand(i + 1).Checksum() for i in range(3)]
     assert cs == got_cs
 
-    return 'success'
-
 ###############################################################################
 # Test Arithmetic coding (and if not enabled, will trigger error code handling
 # in CreateCopy())
@@ -889,8 +850,7 @@ def test_jpeg_24():
         ds = None
         gdal.GetDriverByName('JPEG').Delete('/vsimem/byte.jpg')
 
-    return 'success'
-
+    
 ###############################################################################
 # Test COMMENT
 
@@ -909,8 +869,6 @@ def test_jpeg_25():
     ds = None
     gdal.GetDriverByName('JPEG').Delete('/vsimem/byte.jpg')
 
-    return 'success'
-
 ###############################################################################
 # Test creation error
 
@@ -924,8 +882,6 @@ def test_jpeg_26():
     assert ds is None
     gdal.Unlink('/vsimem/jpeg_26.jpg')
 
-    return 'success'
-
 ###############################################################################
 # Test reading a file that contains the 2 denial of service
 # vulnerabilities listed in
@@ -953,8 +909,7 @@ def test_jpeg_27():
         gdal.SetConfigOption('GDAL_JPEG_MAX_ALLOWED_SCAN_NUMBER', None)
         assert gdal.GetLastErrorMsg() != ''
 
-    return 'success'
-
+    
 ###############################################################################
 # Test writing of EXIF and GPS tags
 
@@ -1090,8 +1045,6 @@ def test_jpeg_28():
 
     gdal.Unlink(tmpfilename)
 
-    return 'success'
-
 ###############################################################################
 # Cleanup
 
@@ -1099,7 +1052,6 @@ def test_jpeg_28():
 def test_jpeg_cleanup():
     gdal.Unlink('tmp/albania.jpg')
     gdal.Unlink('tmp/albania.jpg.ovr')
-    return 'success'
 
 
 gdaltest_list = [
diff --git a/autotest/gdrivers/jpeg2000.py b/autotest/gdrivers/jpeg2000.py
index 73aff24a56f4..20d091da2bdc 100755
--- a/autotest/gdrivers/jpeg2000.py
+++ b/autotest/gdrivers/jpeg2000.py
@@ -70,8 +70,6 @@ def test_jpeg2000_1():
 
     gdaltest.deregister_all_jpeg2000_drivers_but('JPEG2000')
 
-    return 'success'
-
 ###############################################################################
 # Open byte.jp2
 
@@ -127,8 +125,6 @@ def test_jpeg2000_3():
     # Quite a bit of difference...
     assert maxdiff <= 6, 'Image too different from reference'
 
-    return 'success'
-
 ###############################################################################
 # Test copying byte.jp2
 
@@ -146,8 +142,7 @@ def test_jpeg2000_4():
         gdaltest.post_reason('This is an expected failure if Jasper has not the jp2_encode_uuid function')
         return 'expected_fail'
 
-    return 'success'
-
+    
 ###############################################################################
 # Test copying int16.jp2
 
@@ -177,8 +172,6 @@ def test_jpeg2000_6():
     ds.GetRasterBand(1).Checksum()
     ds = None
 
-    return 'success'
-
 ###############################################################################
 # Open byte.jp2.gz (test use of the VSIL API)
 
@@ -210,8 +203,6 @@ def test_jpeg2000_8():
 
     assert ds.GetRasterBand(1).DataType == gdal.GDT_UInt16, 'unexpected data type'
 
-    return 'success'
-
 ###############################################################################
 # Check that we can use .j2w world files (#4651)
 
@@ -229,8 +220,6 @@ def test_jpeg2000_9():
 
     ds = None
 
-    return 'success'
-
 ###############################################################################
 # Check writing a file with more than 4 bands (#4686)
 
@@ -258,8 +247,6 @@ def test_jpeg2000_10():
     gdal.Unlink('/vsimem/jpeg2000_10_src.tif')
     gdal.Unlink('/vsimem/jpeg2000_10_dst.tif')
 
-    return 'success'
-
 ###############################################################################
 # Test auto-promotion of 1bit alpha band to 8bit
 
@@ -296,8 +283,6 @@ def test_jpeg2000_11():
     fourth_band = ds.GetRasterBand(4)
     assert fourth_band.GetMetadataItem('NBITS', 'IMAGE_STRUCTURE') == '1'
 
-    return 'success'
-
 ###############################################################################
 
 
@@ -318,8 +303,6 @@ def test_jpeg2000_online_1():
     ds.GetRasterBand(1).Checksum()
     ds = None
 
-    return 'success'
-
 ###############################################################################
 
 
@@ -345,8 +328,6 @@ def test_jpeg2000_online_2():
 
     ds = None
 
-    return 'success'
-
 ###############################################################################
 
 
@@ -377,8 +358,6 @@ def test_jpeg2000_online_3():
     # Difference between the image before and after compression
     assert maxdiff <= 17, 'Image too different from reference'
 
-    return 'success'
-
 ###############################################################################
 
 
@@ -412,8 +391,6 @@ def test_jpeg2000_online_4():
     # Difference between the image before and after compression
     assert maxdiff <= 17, 'Image too different from reference'
 
-    return 'success'
-
 ###############################################################################
 # Try reading JPEG2000 with color table
 
@@ -435,8 +412,6 @@ def test_jpeg2000_online_5():
 
     ds = None
 
-    return 'success'
-
 ###############################################################################
 # Try reading YCbCr JPEG2000 as RGB
 
@@ -458,8 +433,6 @@ def test_jpeg2000_online_6():
 
     ds = None
 
-    return 'success'
-
 ###############################################################################
 
 
@@ -467,8 +440,6 @@ def test_jpeg2000_cleanup():
 
     gdaltest.reregister_all_jpeg2000_drivers()
 
-    return 'success'
-
 
 gdaltest_list = [
     test_jpeg2000_1,
diff --git a/autotest/gdrivers/jpeg_profile.py b/autotest/gdrivers/jpeg_profile.py
index 672e030cfc47..7f46451138d2 100755
--- a/autotest/gdrivers/jpeg_profile.py
+++ b/autotest/gdrivers/jpeg_profile.py
@@ -76,8 +76,6 @@ def test_jpeg_copy_icc():
     driver_tiff.Delete('tmp/icc_test.tiff')
     driver.Delete('tmp/icc_test.jpg')
 
-    return 'success'
-
 ###############################################################################
 # Test writing and reading of ICC profile in CreateCopy() options
 
@@ -115,8 +113,6 @@ def test_jpeg_copy_options_icc():
     driver_tiff.Delete('tmp/icc_test.tiff')
     driver.Delete('tmp/icc_test.jpg')
 
-    return 'success'
-
 ###############################################################################
 # Test writing and reading of 64K+ ICC profile in CreateCopy()
 
@@ -187,8 +183,6 @@ def test_jpeg_copy_icc_64K():
     driver_tiff.Delete('tmp/icc_test.tiff')
     driver.Delete('tmp/icc_test.jpg')
 
-    return 'success'
-
 ###############################################################################################
 
 
diff --git a/autotest/gdrivers/jpipkak.py b/autotest/gdrivers/jpipkak.py
index 1d62a56320c1..dada87f6d4c9 100755
--- a/autotest/gdrivers/jpipkak.py
+++ b/autotest/gdrivers/jpipkak.py
@@ -58,8 +58,6 @@ def test_jpipkak_1():
     assert abs(stats[2] - 6791.121) <= 1.0 and abs(stats[3] - 3046.536) <= 1.0, \
         'did not get expected mean/stddev'
 
-    return 'success'
-
 ###############################################################################
 #
 
@@ -87,8 +85,6 @@ def test_jpipkak_2():
     assert abs(stats[2] - 43.429) <= 1.0 and abs(stats[3] - 18.526) <= 1.0, \
         'did not get expected mean/stddev'
 
-    return 'success'
-
 ###############################################################################
 # Test an 11bit image.
 
@@ -111,8 +107,6 @@ def test_jpipkak_3():
     assert abs(stats[2] - 483.501) <= 1.0 and abs(stats[3] - 117.972) <= 1.0, \
         'did not get expected mean/stddev'
 
-    return 'success'
-
 ###############################################################################
 # Test a 20bit image, reduced to 16bit during processing.
 
@@ -135,8 +129,6 @@ def test_jpipkak_4():
     assert abs(stats[2] - 5333.148) <= 1.0 and abs(stats[3] - 2522.023) <= 1.0, \
         'did not get expected mean/stddev'
 
-    return 'success'
-
 ###############################################################################
 # Test an overview level that will result in multiple fetches with subwindows.
 
@@ -159,8 +151,6 @@ def test_jpipkak_5():
     assert abs(stats[2] - 42.462) <= 1.0 and abs(stats[3] - 20.611) <= 1.0, \
         'did not get expected mean/stddev'
 
-    return 'success'
-
 
 gdaltest_list = [
     test_jpipkak_1,
diff --git a/autotest/gdrivers/kea.py b/autotest/gdrivers/kea.py
index 32e90d32a040..53af961095d0 100755
--- a/autotest/gdrivers/kea.py
+++ b/autotest/gdrivers/kea.py
@@ -42,8 +42,6 @@
 def test_kea_init():
     gdaltest.kea_driver = gdal.GetDriverByName('KEA')
 
-    return 'success'
-
 ###############################################################################
 # Test copying a reference sample with CreateCopy()
 
@@ -75,8 +73,7 @@ def test_kea_2():
         tst = gdaltest.GDALTest('KEA', src_file, 1, 4672)
         ret = tst.testCreateCopy(check_minmax=1)
 
-    return 'success'
-
+    
 ###############################################################################
 # Test Create() for various data types
 
@@ -97,8 +94,7 @@ def test_kea_3():
         tst = gdaltest.GDALTest('KEA', src_file, 1, 4672)
         ret = tst.testCreate(out_bands=1, check_minmax=1)
 
-    return 'success'
-
+    
 ###############################################################################
 # Test Create()/CreateCopy() error cases or limit cases
 
@@ -181,8 +177,6 @@ def test_kea_4():
     gdaltest.kea_driver.Delete('tmp/src.kea')
     gdaltest.kea_driver.Delete('tmp/out.kea')
 
-    return 'success'
-
 ###############################################################################
 # Test Create() creation options
 
@@ -206,8 +200,6 @@ def test_kea_5():
     ds = None
     gdaltest.kea_driver.Delete('tmp/out.kea')
 
-    return 'success'
-
 ###############################################################################
 # Test metadata
 
@@ -259,8 +251,6 @@ def test_kea_6():
     gdaltest.kea_driver.Delete('tmp/out.kea')
     gdaltest.kea_driver.Delete('tmp/out2.kea')
 
-    return 'success'
-
 ###############################################################################
 # Test georef
 
@@ -314,8 +304,6 @@ def test_kea_7():
     gdaltest.kea_driver.Delete('tmp/out.kea')
     gdaltest.kea_driver.Delete('tmp/out2.kea')
 
-    return 'success'
-
 ###############################################################################
 # Test colortable
 
@@ -351,8 +339,7 @@ def test_kea_8():
         gdaltest.kea_driver.Delete('tmp/out.kea')
         gdaltest.kea_driver.Delete('tmp/out2.kea')
 
-    return 'success'
-
+    
 ###############################################################################
 # Test color interpretation
 
@@ -379,8 +366,6 @@ def test_kea_9():
     gdaltest.kea_driver.Delete('tmp/out.kea')
     gdaltest.kea_driver.Delete('tmp/out2.kea')
 
-    return 'success'
-
 ###############################################################################
 # Test nodata
 
@@ -436,8 +421,7 @@ def test_kea_10():
         gdaltest.kea_driver.Delete('tmp/out.kea')
         gdaltest.kea_driver.Delete('tmp/out2.kea')
 
-    return 'success'
-
+    
 ###############################################################################
 # Test AddBand
 
@@ -462,8 +446,6 @@ def test_kea_11():
 
     gdaltest.kea_driver.Delete('tmp/out.kea')
 
-    return 'success'
-
 ###############################################################################
 # Test RAT
 
@@ -570,8 +552,6 @@ def test_kea_12():
     gdaltest.kea_driver.Delete('tmp/out.kea')
     gdaltest.kea_driver.Delete('tmp/out2.kea')
 
-    return 'success'
-
 ###############################################################################
 # Test overviews
 
@@ -599,8 +579,6 @@ def test_kea_13():
     gdaltest.kea_driver.Delete('tmp/out.kea')
     gdaltest.kea_driver.Delete('tmp/out2.kea')
 
-    return 'success'
-
 ###############################################################################
 # Test mask bands
 
@@ -629,8 +607,6 @@ def test_kea_14():
     gdaltest.kea_driver.Delete('tmp/out.kea')
     gdaltest.kea_driver.Delete('tmp/out2.kea')
 
-    return 'success'
-
 
 gdaltest_list = [
     test_kea_init,
diff --git a/autotest/gdrivers/kmlsuperoverlay.py b/autotest/gdrivers/kmlsuperoverlay.py
index e676e2e2d8fc..4f9e945bcb8c 100755
--- a/autotest/gdrivers/kmlsuperoverlay.py
+++ b/autotest/gdrivers/kmlsuperoverlay.py
@@ -89,8 +89,6 @@ def test_kmlsuperoverlay_3():
     shutil.rmtree('tmp/0')
     shutil.rmtree('tmp/1')
 
-    return 'success'
-
 ###############################################################################
 # Test overviews
 
@@ -184,8 +182,6 @@ def test_kmlsuperoverlay_4():
     gdal.Unlink("/vsimem/src.vrt")
     gdal.Unlink("/vsimem/kmlsuperoverlay_4.kmz")
 
-    return 'success'
-
 ###############################################################################
 # Test that a raster which crosses the anti-meridian will be able to be displayed correctly (#4528)
 
@@ -252,8 +248,6 @@ def test_kmlsuperoverlay_5():
     shutil.rmtree('tmp/1')
     os.remove('tmp/tmp.kml')
 
-    return 'success'
-
 ###############################################################################
 # Test raster KML with alternate structure (such as http://opentopo.sdsc.edu/files/Haiti/NGA_Haiti_LiDAR2.kmz))
 
@@ -274,8 +268,6 @@ def test_kmlsuperoverlay_6():
     cs = ds.GetRasterBand(1).GetOverview(0).Checksum()
     assert cs == 61070
 
-    return 'success'
-
 ###############################################################################
 # Test raster KML with single Overlay (such as https://trac.osgeo.org/gdal/ticket/6712)
 
@@ -293,8 +285,6 @@ def test_kmlsuperoverlay_7():
     assert cs == 30111
     assert ds.GetRasterBand(1).GetRasterColorInterpretation() == gdal.GCI_RedBand
 
-    return 'success'
-
 ###############################################################################
 # Test that a raster with lots of blank space doesn't have unnecessary child
 # KML/PNG files in transparent areas
@@ -394,8 +384,6 @@ def test_kmlsuperoverlay_8():
     shutil.rmtree('tmp/3')
     os.remove('tmp/tmp.kml')
 
-    return 'success'
-
 ###############################################################################
 # Cleanup
 
@@ -409,8 +397,6 @@ def test_kmlsuperoverlay_cleanup():
     gdal.Unlink('/vsimem/kmlout.kml')
     gdal.Unlink('/vsimem/kmlout.kmz')
 
-    return 'success'
-
 
 gdaltest_list = [
     test_kmlsuperoverlay_1,
diff --git a/autotest/gdrivers/kro.py b/autotest/gdrivers/kro.py
index d3ea86b89875..def308f499b7 100755
--- a/autotest/gdrivers/kro.py
+++ b/autotest/gdrivers/kro.py
@@ -96,8 +96,6 @@ def test_kro_5():
 
     gdal.Unlink('tmp/kro_5.kro')
 
-    return 'success'
-
 
 gdaltest_list = [
     test_kro_1,
diff --git a/autotest/gdrivers/l1b.py b/autotest/gdrivers/l1b.py
index 9ed9558fcf40..cccc6509cb74 100755
--- a/autotest/gdrivers/l1b.py
+++ b/autotest/gdrivers/l1b.py
@@ -103,8 +103,6 @@ def test_l1b_geoloc():
     cs = ds.GetRasterBand(2).Checksum()
     assert cs == 52616
 
-    return 'success'
-
 ###############################################################################
 #
 
@@ -129,8 +127,6 @@ def test_l1b_solar_zenith_angles_before_noaa_15():
     cs = ds.GetRasterBand(1).Checksum()
     assert cs == 22924
 
-    return 'success'
-
 ###############################################################################
 #
 
@@ -157,8 +153,6 @@ def test_l1b_metadata_before_noaa_15():
 
     os.unlink('tmp/n12gac10bit.l1b_metadata.csv')
 
-    return 'success'
-
 ###############################################################################
 #
 
@@ -187,8 +181,6 @@ def test_l1b_angles_after_noaa_15():
     cs = ds.GetRasterBand(3).Checksum()
     assert cs == 64989
 
-    return 'success'
-
 ###############################################################################
 #
 
@@ -213,8 +205,6 @@ def test_l1b_clouds_after_noaa_15():
     cs = ds.GetRasterBand(1).Checksum()
     assert cs == 0
 
-    return 'success'
-
 ###############################################################################
 #
 
@@ -241,8 +231,6 @@ def test_l1b_metadata_after_noaa_15():
 
     os.unlink('tmp/n16gac10bit.l1b_metadata.csv')
 
-    return 'success'
-
 ###############################################################################
 #
 
@@ -256,8 +244,6 @@ def test_l1b_little_endian():
     assert ds.GetRasterBand(1).GetMaskBand().Checksum() == 25115
     ds = None
 
-    return 'success'
-
 
 gdaltest_list = [
     test_l1b_geoloc,
diff --git a/autotest/gdrivers/lcp.py b/autotest/gdrivers/lcp.py
index cbf231512c67..aebd2bf79fb1 100755
--- a/autotest/gdrivers/lcp.py
+++ b/autotest/gdrivers/lcp.py
@@ -128,8 +128,6 @@ def test_lcp_1():
 
     ds = None
 
-    return 'success'
-
 ###############################################################################
 # test test_USGS_LFNM_Alb83.lcp
 
@@ -218,8 +216,6 @@ def test_lcp_2():
 
     ds = None
 
-    return 'success'
-
 ###############################################################################
 #  Test for empty prj
 
@@ -230,7 +226,6 @@ def test_lcp_3():
     assert ds is not None
     wkt = ds.GetProjection()
     assert wkt is not None, 'Got None from GetProjection()'
-    return 'success'
 
 ###############################################################################
 #  Test that the prj file isn't added to the sibling list if it isn't there.
@@ -242,7 +237,6 @@ def test_lcp_4():
     assert ds is not None
     fl = ds.GetFileList()
     assert len(fl) == 1, 'Invalid file list'
-    return 'success'
 
 ###############################################################################
 #  Test for valid prj
@@ -254,7 +248,6 @@ def test_lcp_5():
     assert ds is not None
     wkt = ds.GetProjection()
     assert not (wkt is None or wkt == ''), 'Got invalid wkt from GetProjection()'
-    return 'success'
 
 ###############################################################################
 #  Test for valid sibling list
diff --git a/autotest/gdrivers/mbtiles.py b/autotest/gdrivers/mbtiles.py
index 80702586bb21..19b992cde371 100755
--- a/autotest/gdrivers/mbtiles.py
+++ b/autotest/gdrivers/mbtiles.py
@@ -46,8 +46,6 @@ def test_mbtiles_1():
 
     gdaltest.mbtiles_drv = gdal.GetDriverByName('MBTiles')
 
-    return 'success'
-
 ###############################################################################
 # Basic test
 
@@ -101,8 +99,6 @@ def test_mbtiles_2():
 
     ds = None
 
-    return 'success'
-
 ###############################################################################
 # Open a /vsicurl/ DB
 
@@ -147,8 +143,7 @@ def test_mbtiles_3():
             pytest.skip()
         pytest.fail('did not get expected LocationInfo on overview')
 
-    return 'success'
-
+    
 ###############################################################################
 #
 
@@ -165,8 +160,7 @@ def test_mbtiles_start_webserver():
     if gdaltest.webserver_port == 0:
         pytest.skip()
 
-    return 'success'
-
+    
 ###############################################################################
 #
 
@@ -191,8 +185,6 @@ def test_mbtiles_http_jpeg_three_bands():
         ds = gdal.Open('/vsicurl/http://localhost:%d/world_l1.mbtiles' % gdaltest.webserver_port)
     assert ds is not None
 
-    return 'success'
-
 ###############################################################################
 #
 
@@ -217,8 +209,6 @@ def test_mbtiles_http_jpeg_single_band():
         ds = gdal.Open('/vsicurl/http://localhost:%d/byte_jpeg.mbtiles' % gdaltest.webserver_port)
     assert ds is not None
 
-    return 'success'
-
 ###############################################################################
 #
 
@@ -243,8 +233,6 @@ def test_mbtiles_http_png():
         ds = gdal.Open('/vsicurl/http://localhost:%d/byte.mbtiles' % gdaltest.webserver_port)
     assert ds is not None
 
-    return 'success'
-
 ###############################################################################
 #
 
@@ -260,8 +248,7 @@ def test_mbtiles_stop_webserver():
     if gdaltest.webserver_port != 0:
         webserver.server_stop(gdaltest.webserver_process, gdaltest.webserver_port)
 
-    return 'success'
-
+    
 ###############################################################################
 # Basic test without any option
 
@@ -291,8 +278,6 @@ def test_mbtiles_4():
 
     ds = None
 
-    return 'success'
-
 ###############################################################################
 # Test write support of a single band dataset
 
@@ -329,8 +314,6 @@ def test_mbtiles_5():
 
     gdal.Unlink('/vsimem/mbtiles_5.mbtiles')
 
-    return 'success'
-
 ###############################################################################
 # Test write support with options
 
@@ -366,8 +349,6 @@ def test_mbtiles_6():
 
     gdal.Unlink('tmp/mbtiles_6.mbtiles')
 
-    return 'success'
-
 ###############################################################################
 # Test building overview
 
@@ -422,8 +403,6 @@ def test_mbtiles_7():
 
     gdal.Unlink('/vsimem/mbtiles_7.mbtiles')
 
-    return 'success'
-
 ###############################################################################
 # Single band with 24 bit color table, PNG
 
@@ -466,7 +445,6 @@ def test_mbtiles_8():
     out_ds = None
 
     gdal.Unlink('/vsimem/mbtiles_8.mbtiles')
-    return 'success'
 
 ###############################################################################
 # Test we are robust to invalid bounds
@@ -494,7 +472,6 @@ def test_mbtiles_9():
     ds = None
 
     gdal.Unlink('/vsimem/mbtiles_9.mbtiles')
-    return 'success'
 
 ###############################################################################
 # Test compaction of temporary database
@@ -520,7 +497,6 @@ def test_mbtiles_10():
     ds = None
 
     gdal.Unlink('/vsimem/mbtiles_10.mbtiles')
-    return 'success'
 
 ###############################################################################
 # Test opening a .mbtiles.sql file
@@ -539,8 +515,6 @@ def test_mbtiles_11():
     ds = gdal.Open('data/byte.mbtiles.sql')
     assert ds.GetRasterBand(1).Checksum() == 4118, 'validation failed'
 
-    return 'success'
-
 ###############################################################################
 
 
@@ -552,8 +526,6 @@ def test_mbtiles_raster_open_in_vector_mode():
     ds = ogr.Open('data/byte.mbtiles')
     assert ds is None
 
-    return 'success'
-
 ###############################################################################
 
 
@@ -617,8 +589,6 @@ def test_mbtiles_create():
 
     gdal.Unlink(filename)
 
-    return 'success'
-
 
 ###############################################################################
 # Cleanup
@@ -628,8 +598,7 @@ def test_mbtiles_cleanup():
     if gdaltest.mbtiles_drv is None:
         pytest.skip()
 
-    return 'success'
-
+    
 
 gdaltest_list = [
     test_mbtiles_1,
diff --git a/autotest/gdrivers/mem.py b/autotest/gdrivers/mem.py
index bb3a5def142e..e39424765b08 100755
--- a/autotest/gdrivers/mem.py
+++ b/autotest/gdrivers/mem.py
@@ -98,8 +98,6 @@ def test_mem_1():
 
     gdaltest.mem_ds = None
 
-    return 'success'
-
 ###############################################################################
 # Open an in-memory array.
 
@@ -175,8 +173,6 @@ def test_mem_2():
 
     free(p)
 
-    return 'success'
-
 ###############################################################################
 # Test creating a MEM dataset with the "MEM:::" name
 
@@ -188,8 +184,6 @@ def test_mem_3():
     assert ds is not None
     ds = None
 
-    return 'success'
-
 ###############################################################################
 # Test creating a band interleaved multi-band MEM dataset
 
@@ -214,8 +208,6 @@ def test_mem_4():
 
     ds = None
 
-    return 'success'
-
 ###############################################################################
 # Test creating a pixel interleaved multi-band MEM dataset
 
@@ -243,8 +235,6 @@ def test_mem_5():
 
     ds = None
 
-    return 'success'
-
 ###############################################################################
 # Test out-of-memory situations
 
@@ -297,8 +287,6 @@ def test_mem_6():
         ret = ds.AddBand(gdal.GDT_Float64)
     assert ret != 0
 
-    return 'success'
-
 ###############################################################################
 # Test AddBand()
 
@@ -311,8 +299,6 @@ def test_mem_7():
     assert ds.RasterCount == 2
     ds = None
 
-    return 'success'
-
 ###############################################################################
 # Test SetDefaultHistogram() / GetDefaultHistogram()
 
@@ -329,8 +315,6 @@ def test_mem_8():
 
     assert hist == (1.0, 2.0, 2, [3000000000, 4])
 
-    return 'success'
-
 ###############################################################################
 # Test RasterIO()
 
@@ -412,8 +396,7 @@ def test_mem_9():
         got_data = out_ds.GetRasterBand(1).ReadRaster(10, 11, 8, 10, 4, 5)
         assert ref_data == got_data, interleave
 
-    return 'success'
-
+    
 ###############################################################################
 # Test BuildOverviews()
 
@@ -503,8 +486,6 @@ def test_mem_10():
     assert ds.GetRasterBand(1).GetOverviewCount() == 0
     ds = None
 
-    return 'success'
-
 ###############################################################################
 # Test CreateMaskBand()
 
@@ -555,8 +536,6 @@ def test_mem_11():
     cs2 = mask2.Checksum()
     assert cs1 == 0 and cs2 == 3
 
-    return 'success'
-
 ###############################################################################
 # Test CreateMaskBand() and overviews.
 
@@ -585,8 +564,6 @@ def test_mem_12():
     cs2 = ds.GetRasterBand(2).GetOverview(0).GetMaskBand().Checksum()
     assert cs2 == cs
 
-    return 'success'
-
 ###############################################################################
 # Check RAT support
 
@@ -599,8 +576,6 @@ def test_mem_rat():
     ds.GetRasterBand(1).SetDefaultRAT(None)
     assert ds.GetRasterBand(1).GetDefaultRAT() is None
 
-    return 'success'
-
 ###############################################################################
 # Check CategoryNames support
 
@@ -613,8 +588,6 @@ def test_mem_categorynames():
     ds.GetRasterBand(1).SetCategoryNames([])
     assert ds.GetRasterBand(1).GetCategoryNames() is None
 
-    return 'success'
-
 
 ###############################################################################
 # Check ColorTable support
@@ -629,15 +602,12 @@ def test_mem_colortable():
     ds.GetRasterBand(1).SetColorTable(None)
     assert ds.GetRasterBand(1).GetColorTable() is None
 
-    return 'success'
-
 
 ###############################################################################
 # cleanup
 
 def test_mem_cleanup():
     gdaltest.mem_ds = None
-    return 'success'
 
 
 gdaltest_list = [
diff --git a/autotest/gdrivers/mg4lidar.py b/autotest/gdrivers/mg4lidar.py
index 063e4d66c73a..4c4f88f63f6d 100755
--- a/autotest/gdrivers/mg4lidar.py
+++ b/autotest/gdrivers/mg4lidar.py
@@ -69,7 +69,7 @@ def test_mg4lidar_1():
     if prj.find('NAD83 / UTM zone 12N') == -1:
         gdaltest.post_reason('did not get expected projection')
         print(prj)
-        return 'success'
+        return
 
     gt = ds.GetGeoTransform()
     ref_gt = (504489.919999999983702, 3.078227571115974, 0, 4795848.389999999664724, 0, -3.078259860787739)
@@ -80,18 +80,16 @@ def test_mg4lidar_1():
     if cs != 13216:
         gdaltest.post_reason('did not get expected checksum')
         print(cs)
-        return 'success'
+        return
 
     cs = ds.GetRasterBand(1).GetOverview(0).Checksum()
     if cs != 64099:
         gdaltest.post_reason('did not get expected overview checksum')
         print(cs)
-        return 'success'
+        return
 
     ds = None
 
-    return 'success'
-
 
 gdaltest_list = [
     test_mg4lidar_1]
diff --git a/autotest/gdrivers/mrf.py b/autotest/gdrivers/mrf.py
index 9468d3bd65b1..92ca148a4971 100755
--- a/autotest/gdrivers/mrf.py
+++ b/autotest/gdrivers/mrf.py
@@ -160,8 +160,7 @@ def test_mrf_overview_near_fact_2():
         gdal.Unlink('/vsimem/out.ppg')
         gdal.Unlink('/vsimem/out.til')
 
-    return 'success'
-
+    
 
 def test_mrf_overview_near_with_nodata_fact_2():
 
@@ -189,8 +188,7 @@ def test_mrf_overview_near_with_nodata_fact_2():
         gdal.Unlink('/vsimem/out.ppg')
         gdal.Unlink('/vsimem/out.til')
 
-    return 'success'
-
+    
 
 def test_mrf_overview_avg_fact_2():
 
@@ -218,8 +216,7 @@ def test_mrf_overview_avg_fact_2():
         gdal.Unlink('/vsimem/out.ppg')
         gdal.Unlink('/vsimem/out.til')
 
-    return 'success'
-
+    
 
 def test_mrf_overview_avg_with_nodata_fact_2():
 
@@ -248,8 +245,7 @@ def test_mrf_overview_avg_with_nodata_fact_2():
         gdal.Unlink('/vsimem/out.ppg')
         gdal.Unlink('/vsimem/out.til')
 
-    return 'success'
-
+    
 
 def test_mrf_overview_near_fact_3():
 
@@ -271,8 +267,6 @@ def test_mrf_overview_near_fact_3():
     gdal.Unlink('/vsimem/out.ppg')
     gdal.Unlink('/vsimem/out.til')
 
-    return 'success'
-
 
 def test_mrf_overview_avg_fact_3():
 
@@ -294,8 +288,6 @@ def test_mrf_overview_avg_fact_3():
     gdal.Unlink('/vsimem/out.ppg')
     gdal.Unlink('/vsimem/out.til')
 
-    return 'success'
-
 
 def test_mrf_overview_avg_with_nodata_fact_3():
 
@@ -324,8 +316,7 @@ def test_mrf_overview_avg_with_nodata_fact_3():
         gdal.Unlink('/vsimem/out.ppg')
         gdal.Unlink('/vsimem/out.til')
 
-    return 'success'
-
+    
 
 def test_mrf_overview_partial_block():
 
@@ -345,8 +336,6 @@ def test_mrf_overview_partial_block():
     gdal.Unlink('/vsimem/out.ppg')
     gdal.Unlink('/vsimem/out.til')
 
-    return 'success'
-
 
 def test_mrf_overview_near_implicit_level():
 
@@ -377,8 +366,6 @@ def test_mrf_overview_near_implicit_level():
     gdal.Unlink('/vsimem/out.ppg')
     gdal.Unlink('/vsimem/out.til')
 
-    return 'success'
-
 
 def test_mrf_overview_external():
 
@@ -400,8 +387,6 @@ def test_mrf_overview_external():
     gdal.Unlink('/vsimem/out.ppg')
     gdal.Unlink('/vsimem/out.til')
 
-    return 'success'
-
 
 def test_mrf_lerc_nodata():
 
@@ -421,8 +406,6 @@ def test_mrf_lerc_nodata():
     gdal.Unlink('/vsimem/out.lrc')
     gdal.Unlink('/vsimem/out.til')
 
-    return 'success'
-
 
 def test_mrf_lerc_with_huffman():
 
@@ -440,8 +423,6 @@ def test_mrf_lerc_with_huffman():
     gdal.Unlink('/vsimem/out.lrc')
     gdal.Unlink('/vsimem/out.til')
 
-    return 'success'
-
 
 def test_mrf_cached_source():
 
@@ -555,8 +536,6 @@ def test_mrf_cached_source():
     gdal.Unlink('tmp/cloning.ppg')
     gdal.Unlink('tmp/cloning.til')
 
-    return 'success'
-
 
 def test_mrf_versioned():
 
@@ -611,8 +590,6 @@ def test_mrf_versioned():
     gdal.Unlink('/vsimem/out.ppg')
     gdal.Unlink('/vsimem/out.til')
 
-    return 'success'
-
 
 def test_mrf_cleanup():
 
@@ -643,8 +620,6 @@ def test_mrf_cleanup():
     gdal.Unlink('/vsimem/out.ppg')
     gdal.Unlink('/vsimem/out.til')
 
-    return 'success'
-
 
 gdaltest_list = [
     test_mrf_overview_near_fact_2,
diff --git a/autotest/gdrivers/mrsid.py b/autotest/gdrivers/mrsid.py
index 0fa3bff26712..67bf0b6920eb 100755
--- a/autotest/gdrivers/mrsid.py
+++ b/autotest/gdrivers/mrsid.py
@@ -128,8 +128,7 @@ def test_mrsid_1():
     if got_prj != prj:
         print('Warning: did not get exactly expected projection. Got %s' % got_prj)
 
-    return 'success'
-
+    
 ###############################################################################
 # Do a direct IO to read the image at a resolution for which there is no
 # builtin overview.  Checks for the bug Steve L found in the optimized
@@ -164,8 +163,6 @@ def test_mrsid_2():
 
     assert mean >= 95 and mean <= 105, 'image mean out of range.'
 
-    return 'success'
-
 ###############################################################################
 # Test overview reading.
 
@@ -192,8 +189,7 @@ def test_mrsid_3():
             print('new = ', new_stat)
             pytest.fail('Statistics differ.')
 
-    return 'success'
-
+    
 ###############################################################################
 # Check a new (V3) file which uses a different form for coordinate sys.
 
@@ -251,8 +247,6 @@ def test_mrsid_5():
 
     gdaltest.deregister_all_jpeg2000_drivers_but('JP2MrSID')
 
-    return 'success'
-
 ###############################################################################
 # Open byte.jp2
 
@@ -311,8 +305,6 @@ def test_mrsid_7():
     ds = None
     ds_ref = None
 
-    return 'success'
-
 ###############################################################################
 # Test PAM override for nodata, coordsys, and geotransform.
 
@@ -350,8 +342,6 @@ def test_mrsid_8():
 
     gdal.GetDriverByName('MrSID').Delete('tmp/mercator.sid')
 
-    return 'success'
-
 ###############################################################################
 # Test VSI*L IO with .sid
 
@@ -374,7 +364,6 @@ def test_mrsid_9():
     ds = None
 
     gdal.Unlink('/vsimem/mrsid_9.sid')
-    return 'success'
 
 ###############################################################################
 # Test VSI*L IO with .jp2
@@ -398,7 +387,6 @@ def test_mrsid_10():
     ds = None
 
     gdal.Unlink('/vsimem/mrsid_10.jp2')
-    return 'success'
 
 ###############################################################################
 # Check that we can use .j2w world files (#4651)
@@ -417,8 +405,6 @@ def test_mrsid_11():
 
     ds = None
 
-    return 'success'
-
 ###############################################################################
 
 
@@ -439,8 +425,6 @@ def test_mrsid_online_1():
     ds.GetRasterBand(1).Checksum()
     ds = None
 
-    return 'success'
-
 ###############################################################################
 
 
@@ -471,8 +455,6 @@ def test_mrsid_online_2():
 
     ds = None
 
-    return 'success'
-
 ###############################################################################
 
 
@@ -506,8 +488,7 @@ def test_mrsid_online_3():
         gdaltest.compare_ds(ds, ds_ref, verbose=1)
         pytest.fail('Image too different from reference')
 
-    return 'success'
-
+    
 ###############################################################################
 
 
@@ -539,8 +520,7 @@ def test_mrsid_online_4():
         print(ds_ref.GetRasterBand(1).Checksum())
         pytest.fail('Image too different from reference')
 
-    return 'success'
-
+    
 ###############################################################################
 # Cleanup.
 
@@ -555,8 +535,6 @@ def test_mrsid_cleanup():
 
     gdaltest.reregister_all_jpeg2000_drivers()
 
-    return 'success'
-
 
 gdaltest_list = [
     test_mrsid_1,
diff --git a/autotest/gdrivers/netcdf.py b/autotest/gdrivers/netcdf.py
index 9ca8a49d5a60..19a521fd829f 100755
--- a/autotest/gdrivers/netcdf.py
+++ b/autotest/gdrivers/netcdf.py
@@ -107,8 +107,6 @@ def netcdf_setup():
           '  has_nc2: ' + str(gdaltest.netcdf_drv_has_nc2) + '  has_nc4: ' +
           str(gdaltest.netcdf_drv_has_nc4))
 
-    return 'success'
-
 ###############################################################################
 # test file copy
 # helper function needed so we can call Process() on it from netcdf_test_copy_timeout()
@@ -198,8 +196,6 @@ def netcdf_test_deflate(ifile, checksum, zlevel=1, timeout=None):
     assert size2 < size1, \
         'Compressed file is not smaller than reference, check your netcdf-4, HDF5 and zlib installation'
 
-    return 'success'
-
 ###############################################################################
 # check support for reading attributes (single values and array values)
 
@@ -241,8 +237,7 @@ def netcdf_check_vars(ifile, vals_global=None, vals_band=None):
         assert mk == v, ("invalid value [%s] for metadata [%s]=[%s]"
                                  % (str(mk), str(k), str(v)))
 
-    return 'success'
-
+    
 
 ###############################################################################
 # Netcdf Tests
@@ -316,8 +311,6 @@ def test_netcdf_2():
 
     gdaltest.clean_tmp()
 
-    return 'success'
-
 ###############################################################################
 
 
@@ -336,8 +329,6 @@ def test_netcdf_3():
     bnd = None
     ds = None
 
-    return 'success'
-
 ###############################################################################
 # In #2582 5dimensional files were causing problems.  Verify use ok.
 
@@ -405,8 +396,6 @@ def test_netcdf_6():
 
     ds = None
 
-    return 'success'
-
 ###############################################################################
 # ticket #3324 check spatial reference reading for cf-1.4 lambert conformal
 # 2 standard parallels.
@@ -432,8 +421,6 @@ def test_netcdf_7():
     ds = None
     sr = None
 
-    return 'success'
-
 ###############################################################################
 # check for cf convention read of albers equal area
 # Previous version compared entire wkt, which varies slightly among driver versions
@@ -462,8 +449,6 @@ def test_netcdf_8():
 
     ds = None
 
-    return 'success'
-
 ###############################################################################
 # check to see if projected systems default to wgs84 if no spheroid def
 
@@ -487,8 +472,6 @@ def test_netcdf_9():
     ds = None
     sr = None
 
-    return 'success'
-
 ###############################################################################
 # check if km pixel size makes it through to gt
 
@@ -520,8 +503,6 @@ def test_netcdf_10():
 
     ds = None
 
-    return 'success'
-
 ###############################################################################
 # check if ll gets caught in km pixel size check
 
@@ -539,8 +520,6 @@ def test_netcdf_11():
 
     ds = None
 
-    return 'success'
-
 ###############################################################################
 # check for scale/offset set/get.
 
@@ -560,8 +539,6 @@ def test_netcdf_12():
 
     ds = None
 
-    return 'success'
-
 ###############################################################################
 # check for scale/offset = None if no scale or offset is available
 
@@ -580,8 +557,6 @@ def test_netcdf_13():
 
     ds = None
 
-    return 'success'
-
 ###############################################################################
 # check for scale/offset for two variables
 
@@ -612,8 +587,6 @@ def test_netcdf_14():
     assert scale == 0.1 and offset == 2.5, \
         ('Incorrect scale(%f) or offset(%f)' % (scale, offset))
 
-    return 'success'
-
 ###############################################################################
 # check support for netcdf-2 (64 bit)
 # This test fails in 1.8.1, because the driver does not support NC2 (bug #3890)
@@ -628,12 +601,11 @@ def test_netcdf_15():
         ds = gdal.Open('data/trmm-nc2.nc')
         assert ds is not None
         ds = None
-        return 'success'
+        return
     else:
         pytest.skip()
 
-    return 'success'
-
+    
 ###############################################################################
 # check support for netcdf-4
 
@@ -664,8 +636,7 @@ def test_netcdf_16():
     else:
         pytest.skip()
 
-    return 'success'
-
+    
 ###############################################################################
 # check support for netcdf-4 - make sure hdf5 is not read by netcdf driver
 
@@ -701,8 +672,7 @@ def test_netcdf_17():
     else:
         pytest.skip()
 
-    return 'success'
-
+    
 ###############################################################################
 # check support for netcdf-4 classic (NC4C)
 
@@ -733,8 +703,7 @@ def test_netcdf_18():
     else:
         pytest.skip()
 
-    return 'success'
-
+    
 ###############################################################################
 # check support for reading with DEFLATE compression, requires NC4
 
@@ -838,8 +807,7 @@ def test_netcdf_22():
     else:
         ds = None
 
-    return 'success'
-
+    
 ###############################################################################
 # check support for hdf4 - make sure  hdf4 file is not read by netcdf driver
 
@@ -873,8 +841,6 @@ def test_netcdf_23():
     name = gdal.IdentifyDriver(ifile).GetDescription()
     assert name != 'netCDF', 'netcdf driver was identified for hdf4 file'
 
-    return 'success'
-
 ###############################################################################
 # check support for reading attributes (single values and array values)
 
@@ -1023,8 +989,7 @@ def test_netcdf_26():
         print('failed create copy with WRITE_BOTTOMUP=NO')
         return result
 
-    return 'success'
-
+    
 ###############################################################################
 # check support for GDAL_NETCDF_BOTTOMUP configuration option
 
@@ -1056,8 +1021,7 @@ def test_netcdf_27():
         print('failed open with GDAL_NETCDF_BOTTOMUP')
         return result
 
-    return 'success'
-
+    
 ###############################################################################
 # check support for writing multi-dimensional files (helper function)
 
@@ -1081,10 +1045,10 @@ def netcdf_test_4dfile(ofile):
         (ret, err) = gdaltest.runexternal_out_and_err('ncdump -h')
     except OSError:
         print('NOTICE: ncdump not found')
-        return 'success'
+        return
     if err is None or 'netcdf library version' not in err:
         print('NOTICE: ncdump not found')
-        return 'success'
+        return
     (ret, err) = gdaltest.runexternal_out_and_err('ncdump -h ' + ofile)
     assert ret != '' and err == '', 'ncdump failed'
 
@@ -1105,8 +1069,6 @@ def netcdf_test_4dfile(ofile):
     #    err = err + ret
     assert err == ''
 
-    return 'success'
-
 ###############################################################################
 # check support for writing multi-dimensional files using CreateCopy()
 
@@ -1209,8 +1171,6 @@ def test_netcdf_31():
 
     ds = None
 
-    return 'success'
-
 ###############################################################################
 # Test NC_UBYTE write/read - netcdf-4 (FORMAT=NC4) only (#5053)
 
@@ -1232,8 +1192,6 @@ def test_netcdf_32():
     result = netcdf_test_copy(ifile, 1, 4672, ofile, ['FORMAT=NC4'])
     result = netcdf_test_copy(ifile, 1, 4672, ofile, ['FORMAT=NC4C'])
 
-    return 'success'
-
 ###############################################################################
 # TEST NC_UBYTE metadata read - netcdf-4 (FORMAT=NC4) only (#5053)
 
@@ -1296,8 +1254,7 @@ def test_netcdf_34():
         proc.terminate()
         pytest.fail('testOpen() for file %s has reached timeout limit of %d seconds' % (filename, timeout))
 
-    return 'success'
-
+    
 ###############################################################################
 # test writing a long metadata > 8196 chars (bug #5113)
 
@@ -1324,8 +1281,6 @@ def test_netcdf_35():
     assert bla[-4:] == '_bla', \
         ('U#bla metadata ends with [%s], expecting [%s]' % (bla[-4:], '_bla'))
 
-    return 'success'
-
 ###############################################################################
 # test for correct geotransform (bug #5114)
 
@@ -1346,8 +1301,6 @@ def test_netcdf_36():
     assert gt == gt_expected, \
         ('got GeoTransform %s, expected %s' % (str(gt), str(gt_expected)))
 
-    return 'success'
-
 
 ###############################################################################
 # test for correct geotransform with longitude wrap
@@ -1369,8 +1322,6 @@ def test_netcdf_36_lonwrap():
     assert gt == gt_expected, \
         ('got GeoTransform %s, expected %s' % (str(gt), str(gt_expected)))
 
-    return 'success'
-
 
 ###############################################################################
 # test for reading gaussian grid (bugs #4513 and #5118)
@@ -1400,8 +1351,6 @@ def test_netcdf_37():
     assert y_vals.startswith('{-87.15909455586265,-83.47893666931698,') and y_vals.endswith(',83.47893666931698,87.15909455586265}'), \
         'got incorrect values in 1D geolocation'
 
-    return 'success'
-
 ###############################################################################
 # test for correct geotransform of projected data in km units (bug #5118)
 
@@ -1424,8 +1373,6 @@ def test_netcdf_38():
     assert gt == gt_expected, \
         ('got GeoTransform %s, expected %s' % (str(gt), str(gt_expected)))
 
-    return 'success'
-
 ###############################################################################
 # Test VRT and NETCDF:
 
@@ -1489,8 +1436,6 @@ def test_netcdf_39():
     gdal.Unlink('tmp/netcdf_39.vrt')
     assert cs == 65463
 
-    return 'success'
-
 ###############################################################################
 # Check support of reading of chunked bottom-up files.
 
@@ -1516,8 +1461,6 @@ def test_netcdf_41():
     assert ds.GetGeoTransform() == (440720, 60, 0, 3751320, 0, -60)
     assert ds.GetProjectionRef().find('26711') >= 0, ds.GetGeoTransform()
 
-    return 'success'
-
 ###############################################################################
 # Test writing & reading GEOLOCATION array
 
@@ -1562,8 +1505,6 @@ def test_netcdf_42():
     ds = gdal.Open('NETCDF:"tmp/netcdf_42.nc":lat')
     assert ds.GetRasterBand(1).Checksum() == 33501
 
-    return 'success'
-
 ###############################################################################
 # Test reading GEOLOCATION array from geotransform (non default)
 
@@ -1588,8 +1529,6 @@ def test_netcdf_43():
         'Y_DATASET': 'NETCDF:"tmp/netcdf_43.nc":lat',
             'Y_BAND': '1'})
 
-    return 'success'
-
 ###############################################################################
 # Test NC_USHORT/UINT read/write - netcdf-4 only (#6337)
 
@@ -1606,8 +1545,7 @@ def test_netcdf_44():
         assert (not (netcdf_test_copy(f, 1, md5, 'tmp/netcdf_44.nc', ['FORMAT=NC4']) !=
                 'success'))
 
-    return 'success'
-
+    
 ###############################################################################
 # Test reading a vector NetCDF 3 file
 
@@ -1652,8 +1590,6 @@ def test_netcdf_45():
     gdal.Unlink('/vsimem/netcdf_45.csvt')
     gdal.Unlink('/vsimem/netcdf_45.prj')
 
-    return 'success'
-
 ###############################################################################
 # Test reading a vector NetCDF 3 file
 
@@ -1670,8 +1606,6 @@ def test_netcdf_46():
 
     assert ret.find('INFO') != -1 and ret.find('ERROR') == -1
 
-    return 'success'
-
 ###############################################################################
 # Test reading a vector NetCDF 4 file
 
@@ -1716,8 +1650,6 @@ def test_netcdf_47():
     gdal.Unlink('/vsimem/netcdf_47.csvt')
     gdal.Unlink('/vsimem/netcdf_47.prj')
 
-    return 'success'
-
 ###############################################################################
 # Test reading a vector NetCDF 3 file without any geometry
 
@@ -1734,8 +1666,6 @@ def test_netcdf_48():
     f = lyr.GetNextFeature()
     assert f['int32'] == 1
 
-    return 'success'
-
 ###############################################################################
 # Test reading a vector NetCDF 3 file with X,Y,Z vars as float
 
@@ -1762,8 +1692,6 @@ def test_netcdf_49():
 
     gdal.Unlink('/vsimem/netcdf_49.csv')
 
-    return 'success'
-
 ###############################################################################
 # Test creating a vector NetCDF 3 file with WKT geometry field
 
@@ -1800,8 +1728,6 @@ def test_netcdf_50():
 
     gdal.Unlink('tmp/netcdf_50.nc')
 
-    return 'success'
-
 ###############################################################################
 # Test creating a vector NetCDF 3 file with X,Y,Z fields
 
@@ -1869,8 +1795,6 @@ def test_netcdf_51():
     gdal.Unlink('/vsimem/netcdf_51.csvt')
     gdal.Unlink('/vsimem/netcdf_51.prj')
 
-    return 'success'
-
 ###############################################################################
 # Test creating a vector NetCDF 3 file with X,Y,Z fields with WRITE_GDAL_TAGS=NO
 
@@ -1914,8 +1838,6 @@ def test_netcdf_51_no_gdal_tags():
     gdal.Unlink('/vsimem/netcdf_51_no_gdal_tags.csvt')
     gdal.Unlink('/vsimem/netcdf_51_no_gdal_tags.prj')
 
-    return 'success'
-
 ###############################################################################
 # Test creating a vector NetCDF 4 file with X,Y,Z fields
 
@@ -1983,8 +1905,6 @@ def test_netcdf_52():
     gdal.Unlink('/vsimem/netcdf_52.csvt')
     gdal.Unlink('/vsimem/netcdf_52.prj')
 
-    return 'success'
-
 ###############################################################################
 # Test creating a vector NetCDF 4 file with WKT geometry field
 
@@ -2024,8 +1944,6 @@ def test_netcdf_53():
 
     gdal.Unlink('tmp/netcdf_53.nc')
 
-    return 'success'
-
 ###############################################################################
 # Test appending to a vector NetCDF 4 file with unusual types (ubyte, ushort...)
 
@@ -2063,8 +1981,6 @@ def test_netcdf_54():
 
     assert src_json == out_json
 
-    return 'success'
-
 ###############################################################################
 # Test auto-grow of bidimensional char variables in a vector NetCDF 4 file
 
@@ -2102,8 +2018,6 @@ def test_netcdf_55():
 
     assert src_json == out_json
 
-    return 'success'
-
 ###############################################################################
 # Test truncation of bidimensional char variables and WKT in a vector NetCDF 3 file
 
@@ -2135,8 +2049,6 @@ def test_netcdf_56():
 
     gdal.Unlink('tmp/netcdf_56.nc')
 
-    return 'success'
-
 ###############################################################################
 # Test one layer per file creation
 
@@ -2181,8 +2093,6 @@ def test_netcdf_57():
 
     shutil.rmtree('tmp/netcdf_57')
 
-    return 'success'
-
 ###############################################################################
 # Test one layer per group (NC4)
 
@@ -2214,8 +2124,6 @@ def test_netcdf_58():
 
     gdal.Unlink('tmp/netcdf_58.nc')
 
-    return 'success'
-
 ###############################################################################
 # check for UnitType set/get.
 
@@ -2273,8 +2181,6 @@ def test_netcdf_60():
 
     gdal.Unlink('/vsimem/netcdf_60.csv')
 
-    return 'success'
-
 ###############################################################################
 # Test appending to a "Indexed ragged array representation of profiles" v1.6.0 H3.5
 
@@ -2307,8 +2213,6 @@ def test_netcdf_61():
     gdal.Unlink('/vsimem/netcdf_61.csv')
     gdal.Unlink('/vsimem/netcdf_61.nc')
 
-    return 'success'
-
 ###############################################################################
 # Test creating a "Indexed ragged array representation of profiles" v1.6.0 H3.5
 
@@ -2336,8 +2240,6 @@ def test_netcdf_62():
 
     gdal.Unlink('/vsimem/netcdf_62.csv')
 
-    return 'success'
-
 
 def test_netcdf_62_ncdump_check():
 
@@ -2361,8 +2263,7 @@ def test_netcdf_62_ncdump_check():
     else:
         pytest.skip()
 
-    return 'success'
-
+    
 
 def test_netcdf_62_cf_check():
 
@@ -2376,8 +2277,6 @@ def test_netcdf_62_cf_check():
 
     gdal.Unlink('/vsimem/netcdf_62.nc')
 
-    return 'success'
-
 ###############################################################################
 # Test creating a NC4 "Indexed ragged array representation of profiles" v1.6.0 H3.5
 
@@ -2409,8 +2308,6 @@ def test_netcdf_63():
 
     gdal.Unlink('/vsimem/netcdf_63.csv')
 
-    return 'success'
-
 
 def test_netcdf_63_ncdump_check():
 
@@ -2439,8 +2336,6 @@ def test_netcdf_63_ncdump_check():
 
     gdal.Unlink('/vsimem/netcdf_63.nc')
 
-    return 'success'
-
 ###############################################################################
 # Test creating a "Indexed ragged array representation of profiles" v1.6.0 H3.5
 # but without a profile field.
@@ -2470,8 +2365,6 @@ def test_netcdf_64():
     gdal.Unlink('/vsimem/netcdf_64.csv')
     gdal.Unlink('/vsimem/netcdf_64.nc')
 
-    return 'success'
-
 ###############################################################################
 # Test creating a NC4 file with empty string fields / WKT fields
 # (they must be filled as empty strings to avoid crashes in netcdf lib)
@@ -2502,8 +2395,6 @@ def test_netcdf_65():
 
     gdal.Unlink('tmp/netcdf_65.nc')
 
-    return 'success'
-
 ###############################################################################
 # Test creating a "Indexed ragged array representation of profiles" v1.6.0 H3.5
 # from a config file
@@ -2606,8 +2497,6 @@ def test_netcdf_66():
 
     gdal.Unlink('/vsimem/netcdf_66.csv')
 
-    return 'success'
-
 
 def test_netcdf_66_ncdump_check():
 
@@ -2635,8 +2524,6 @@ def test_netcdf_66_ncdump_check():
 
     gdal.Unlink('/vsimem/netcdf_66.nc')
 
-    return 'success'
-
 ###############################################################################
 # ticket #5950: optimize IReadBlock() and CheckData() handling of partial
 # blocks in the x axischeck for partial block reading.
@@ -2686,8 +2573,6 @@ def test_netcdf_68():
     wkt = ds.GetProjectionRef()
     assert wkt.find('6933') >= 0
 
-    return 'success'
-
 ###############################################################################
 # Test opening a dataset with a 1D variable with 0 record (#6645)
 
@@ -2700,8 +2585,6 @@ def test_netcdf_69():
     ds = gdal.Open('data/test6645.nc')
     assert ds is not None
 
-    return 'success'
-
 ###############################################################################
 # Test that we don't erroneously identify non-longitude axis as longitude (#6759)
 
@@ -2716,8 +2599,6 @@ def test_netcdf_70():
     expected_gt = [304250.0, 250.0, 0.0, 4952500.0, 0.0, -250.0]
     assert max(abs(gt[i] - expected_gt[i]) for i in range(6)) <= 1e-3
 
-    return 'success'
-
 ###############################################################################
 # Test that we take into account x and y offset and scaling
 # (https://github.com/OSGeo/gdal/pull/200)
@@ -2733,8 +2614,6 @@ def test_netcdf_71():
     expected_gt = (-690769.999174516, 1015.8812500000931, 0.0, 2040932.1838741193, 0.0, 1015.8812499996275)
     assert max(abs(gt[i] - expected_gt[i]) for i in range(6)) <= 1e-3
 
-    return 'success'
-
 ###############################################################################
 # test int64 attributes / dim
 
@@ -2751,8 +2630,6 @@ def test_netcdf_72():
     mdi = ds.GetRasterBand(1).GetMetadataItem('NETCDF_DIM_TIME')
     assert mdi == '123456789012'
 
-    return 'success'
-
 ###############################################################################
 # test geostationary with radian units (https://github.com/OSGeo/gdal/pull/220)
 
@@ -2767,8 +2644,6 @@ def test_netcdf_73():
     expected_gt = (-5979486.362104082, 1087179.4077774752, 0.0, -5979487.123448145, 0.0, 1087179.4077774752)
     assert max([abs(gt[i] - expected_gt[i]) for i in range(6)]) <= 1
 
-    return 'success'
-
 ###############################################################################
 # test geostationary with microradian units (https://github.com/OSGeo/gdal/pull/220)
 
@@ -2783,8 +2658,6 @@ def test_netcdf_74():
     expected_gt = (-5739675.119757546, 615630.8078590936, 0.0, -1032263.7666924844, 0.0, 615630.8078590936)
     assert max([abs(gt[i] - expected_gt[i]) for i in range(6)]) <= 1
 
-    return 'success'
-
 ###############################################################################
 # test opening a ncdump file
 
@@ -2840,8 +2713,7 @@ def test_netcdf_76():
         f.DumpReadable()
         pytest.fail()
 
-    return 'success'
-
+    
 ###############################################################################
 # test opening a raster file that used to be confused with a vector file (#6974)
 
@@ -2858,8 +2730,6 @@ def test_netcdf_77():
     ds = gdal.Open('NETCDF:"data/fake_Oa01_radiance.nc":Oa01_radiance')
     assert not ds.GetMetadata('GEOLOCATION')
 
-    return 'success'
-
 
 ###############################################################################
 # test we handle correctly valid_range={0,255} for a byte dataset with
@@ -2876,8 +2746,6 @@ def test_netcdf_78():
     data = struct.unpack('B' * 4, data)
     assert data == (128, 129, 126, 127)
 
-    return 'success'
-
 ###############################################################################
 # test we handle correctly _Unsigned="true" for a byte dataset with
 # negative nodata value
@@ -2894,8 +2762,6 @@ def test_netcdf_79():
     data = struct.unpack('B' * 4, data)
     assert data == (128, 129, 126, 127)
 
-    return 'success'
-
 ###############################################################################
 # Test creating and opening with accent
 
@@ -2931,8 +2797,6 @@ def test_netcdf_81():
     assert max([abs(gt[i] - expected_gt[i]) for i in range(6)]) <= 1e-3, \
         'Did not get expected geotransform'
 
-    return 'success'
-
 ###############################################################################
 # netCDF file with extra dimensions that are oddly indexed (1D variable
 # corresponding to the dimension but with a differentn ame, no corresponding
@@ -2966,8 +2830,6 @@ def test_netcdf_82():
     }
     assert md == expected_md, 'Did not get expected metadata'
 
-    return 'success'
-
 
 ###############################################################################
 def test_netcdf_uffd():
@@ -2989,8 +2851,7 @@ def test_netcdf_uffd():
     for netcdf_file in netcdf_files:
         assert uffd_compare(netcdf_file) is True
 
-    return 'success'
-
+    
 
 ###############################################################################
 
diff --git a/autotest/gdrivers/netcdf_cf.py b/autotest/gdrivers/netcdf_cf.py
index e0d892aa6e1d..afff02503b21 100755
--- a/autotest/gdrivers/netcdf_cf.py
+++ b/autotest/gdrivers/netcdf_cf.py
@@ -98,17 +98,17 @@ def netcdf_cf_setup():
             gdaltest.netcdf_cf_method = 'local'
             gdaltest.netcdf_cf_files = files
             print('NOTICE: netcdf CF compliance checks: using local checker script')
-            return 'success'
+            return
 
     # skip http method if GDAL_DOWNLOAD_TEST_DATA and GDAL_RUN_SLOW_TESTS are not defined
     if not gdaltest.download_test_data():
         print('NOTICE: skipping netcdf CF compliance checks')
         print('to enable remote http checker script, define GDAL_DOWNLOAD_TEST_DATA=YES')
-        return 'success'
+        return
 
     if not gdaltest.run_slow_tests():
         print('NOTICE: skipping netcdf CF compliance checks')
-        return 'success'
+        return
 
     # http method with curl, should use python module but easier for now
     success = False
@@ -127,13 +127,12 @@ def netcdf_cf_setup():
         gdaltest.netcdf_cf_method = 'http'
         print('NOTICE: netcdf CF compliance checks: using remote HTTP '
               'checker script, consider installing cdms2 locally')
-        return 'success'
+        return
 
     if gdaltest.netcdf_cf_method is None:
         print('NOTICE: skipping netcdf CF compliance checks')
 
-    return 'success'
-
+    
 ###############################################################################
 # build a command used to check ifile
 
@@ -572,7 +571,7 @@ def test_netcdf_cf_1():
         result_cf = netcdf_cf_check_file('tmp/netcdf_18.nc', 'auto', False)
 
     if result != 'fail' and result_cf != 'fail':
-        return 'success'
+        return
     pytest.fail()
 
 
@@ -590,7 +589,7 @@ def test_netcdf_cf_2():
         result_cf = netcdf_cf_check_file('tmp/netcdf_cf_2.nc', 'auto', False)
 
     if result != 'fail' and result_cf != 'fail':
-        return 'success'
+        return
     pytest.fail()
 
 
@@ -617,7 +616,7 @@ def test_netcdf_cf_3():
         result_cf = netcdf_cf_check_file('tmp/netcdf_cf_3.nc', 'auto', False)
 
     if result != 'fail' and result_cf != 'fail':
-        return 'success'
+        return
     pytest.fail()
 
 ###############################################################################
@@ -657,8 +656,7 @@ def test_netcdf_cf_5():
         assert lat_origin == 60, ('Latitude of origin in %s does not match expected: %f'
                                  % (ifile, lat_origin))
 
-    return 'success'
-
+    
 ###############################################################################
 
 
diff --git a/autotest/gdrivers/nitf.py b/autotest/gdrivers/nitf.py
index 5a7e9b0827dc..8243fbd9e980 100755
--- a/autotest/gdrivers/nitf.py
+++ b/autotest/gdrivers/nitf.py
@@ -113,8 +113,6 @@ def nitf_create(creation_options, set_inverted_color_interp=True, createcopy=Fal
 
     ds = None
 
-    return 'success'
-
 ###############################################################################
 # Test direction creation of an non-compressed NITF file.
 
@@ -158,8 +156,6 @@ def nitf_check_created_file(checksum1, checksum2, checksum3, set_inverted_color_
 
     ds = None
 
-    return 'success'
-
 ###############################################################################
 # Verify file created by nitf_4()
 
@@ -206,8 +202,6 @@ def test_nitf_8():
     assert md['NITF_BLOCKA_BLOCK_INSTANCE_01'] == '01' and md['NITF_BLOCKA_BLOCK_COUNT'] == '01' and md['NITF_BLOCKA_N_GRAY_01'] == '00000' and md['NITF_BLOCKA_L_LINES_01'] == '01000' and md['NITF_BLOCKA_LAYOVER_ANGLE_01'] == '000' and md['NITF_BLOCKA_SHADOW_ANGLE_01'] == '000' and md['NITF_BLOCKA_FRLC_LOC_01'] == '+41.319331+020.078400' and md['NITF_BLOCKA_LRLC_LOC_01'] == '+41.317083+020.126072' and md['NITF_BLOCKA_LRFC_LOC_01'] == '+41.281634+020.122570' and md['NITF_BLOCKA_FRFC_LOC_01'] == '+41.283881+020.074924', \
         'BLOCKA metadata has unexpected value.'
 
-    return 'success'
-
 ###############################################################################
 # Create and read a JPEG encoded NITF file.
 
@@ -231,8 +225,6 @@ def test_nitf_9():
     md = ds.GetMetadata('IMAGE_STRUCTURE')
     assert md['COMPRESSION'] == 'JPEG', 'Did not get expected compression value.'
 
-    return 'success'
-
 ###############################################################################
 # For esoteric reasons, createcopy from jpeg compressed nitf files can be
 # tricky.  Verify this is working.
@@ -295,8 +287,6 @@ def test_nitf_12():
     assert segmentCount == '0', \
         'did not find expected SEGMENT_COUNT from metadata item.'
 
-    return 'success'
-
 
 ###############################################################################
 # Test creation of an NITF file in UTM Zone 11, Southern Hemisphere.
@@ -318,8 +308,6 @@ def test_nitf_13():
 
     ds = None
 
-    return 'success'
-
 ###############################################################################
 # Verify previous file
 
@@ -341,8 +329,6 @@ def test_nitf_14():
 
     ds = None
 
-    return 'success'
-
 ###############################################################################
 # Test creating an in memory copy.
 
@@ -388,8 +374,6 @@ def test_nitf_18():
 
     assert ds.RasterCount == 0
 
-    return 'success'
-
 ###############################################################################
 # Test BILEVEL (C1) decompression
 
@@ -415,8 +399,6 @@ def test_nitf_20():
 
     assert ds is None
 
-    return 'success'
-
 
 ###############################################################################
 # Verify that TEXT access via the metadata domain works.
@@ -443,8 +425,6 @@ def test_nitf_21():
 
     assert data0 == 'A', 'did not find expected DATA_0 from metadata item.'
 
-    return 'success'
-
 
 ###############################################################################
 # Write/Read test of simple int32 reference data.
@@ -681,8 +661,6 @@ def test_nitf_29():
 
     ds = None
 
-    return 'success'
-
 ###############################################################################
 # Verify we can write a file with BLOCKA TRE and read it back properly.
 
@@ -758,8 +736,6 @@ def test_nitf_30():
     assert 'NITF_BLOCKA_BLOCK_INSTANCE_01' not in md, \
         'unexpectdly found BLOCKA metadata.'
 
-    return 'success'
-
 ###############################################################################
 # Verify we can write a file with a custom TRE and read it back properly.
 
@@ -851,7 +827,6 @@ def test_nitf_35():
     ds = None
 
     gdal.GetDriverByName('NITF').Delete('tmp/nitf_35.ntf')
-    return 'success'
 
 ###############################################################################
 # Create and read a JPEG encoded NITF file (C3) with several blocks
@@ -897,8 +872,6 @@ def test_nitf_36():
 
     ds = None
 
-    return 'success'
-
 ###############################################################################
 # Create and read a NITF file with 69999 bands
 
@@ -918,8 +891,6 @@ def test_nitf_37():
     assert ds.RasterCount == 69999
     ds = None
 
-    return 'success'
-
 ###############################################################################
 # Create and read a NITF file with 999 images
 
@@ -990,8 +961,6 @@ def test_nitf_38():
     gdal.Unlink('tmp/nitf38.vrt')
     assert cs == expected_cs
 
-    return 'success'
-
 ###############################################################################
 # Create and read a JPEG encoded NITF file (M3) with several blocks
 
@@ -1017,8 +986,6 @@ def test_nitf_39():
 
     ds = None
 
-    return 'success'
-
 ###############################################################################
 # Create a 10 GB NITF file
 
@@ -1071,8 +1038,6 @@ def test_nitf_40():
     val = struct.unpack('B' * 1, bytes_read)[0]
     assert val == 123, ('Bad value at offset %d : %d' % (offset, val))
 
-    return 'success'
-
 
 ###############################################################################
 # Check reading a 12-bit JPEG compressed NITF
@@ -1107,8 +1072,7 @@ def test_nitf_41():
     except OSError:
         pass
 
-    return 'success'
-
+    
 ###############################################################################
 # Check creating a 12-bit JPEG compressed NITF
 
@@ -1135,8 +1099,6 @@ def test_nitf_42():
     assert stats[2] >= 2385 and stats[2] <= 2386
     ds = None
 
-    return 'success'
-
 ###############################################################################
 # Test CreateCopy() in IC=C8 with various JPEG2000 drivers
 
@@ -1210,8 +1172,6 @@ def test_nitf_44():
     assert ds.GetRasterBand(1).Checksum() == 57182
     ds = None
 
-    return 'success'
-
 ###############################################################################
 # Check overviews on a JPEG compressed subdataset
 
@@ -1236,8 +1196,6 @@ def test_nitf_45():
 
     ds = None
 
-    return 'success'
-
 ###############################################################################
 # Check overviews on a JPEG2000 compressed subdataset
 
@@ -1324,8 +1282,6 @@ def test_nitf_47():
 
     ds = None
 
-    return 'success'
-
 ###############################################################################
 # Check building of standard overviews in place of rset overviews.
 
@@ -1365,8 +1321,7 @@ def test_nitf_48():
     except OSError:
         pass
 
-    return 'success'
-
+    
 ###############################################################################
 # Test TEXT and CGM creation options with CreateCopy() (#3376)
 
@@ -1396,21 +1351,19 @@ def test_nitf_49():
        'HEADER_0' not in md or md['HEADER_0'].find('ABC  ') == -1:
         gdaltest.post_reason('did not get expected TEXT metadata')
         print(md)
-        return 'success'
+        return
 
     md = ds2.GetMetadata('CGM')
     if 'SEGMENT_COUNT' not in md or md['SEGMENT_COUNT'] != '1' or \
        'SEGMENT_0_DATA' not in md or md['SEGMENT_0_DATA'] != 'XYZ':
         gdaltest.post_reason('did not get expected CGM metadata')
         print(md)
-        return 'success'
+        return
 
     src_ds = None
     ds = None
     ds2 = None
 
-    return 'success'
-
 ###############################################################################
 # Test TEXT and CGM creation options with Create() (#3376)
 
@@ -1454,19 +1407,17 @@ def test_nitf_50():
        'HEADER_0' not in md or md['HEADER_0'].find('ABC  ') == -1:
         gdaltest.post_reason('did not get expected TEXT metadata')
         print(md)
-        return 'success'
+        return
 
     md = ds.GetMetadata('CGM')
     if 'SEGMENT_COUNT' not in md or md['SEGMENT_COUNT'] != '1' or \
        'SEGMENT_0_DATA' not in md or md['SEGMENT_0_DATA'] != 'XYZ':
         gdaltest.post_reason('did not get expected CGM metadata')
         print(md)
-        return 'success'
+        return
 
     ds = None
 
-    return 'success'
-
 ###############################################################################
 # Test reading very small images with NBPP < 8 or NBPP == 12
 
@@ -1505,8 +1456,7 @@ def test_nitf_51():
                     print('xsize = %d, nbpp = %d' % (xsize, nbpp))
                     pytest.fail('did not get expected data')
 
-    return 'success'
-
+    
 ###############################################################################
 # Test reading GeoSDE TREs
 
@@ -1530,8 +1480,6 @@ def test_nitf_52():
     assert gt == (100000.0, 10.0, 0.0, 5000000.0, 0.0, -10.0), \
         'did not get expected geotransform'
 
-    return 'success'
-
 ###############################################################################
 # Test reading UTM MGRS
 
@@ -1564,8 +1512,6 @@ def test_nitf_53():
     assert gt == (205000.0, 10000.0, 0.0, 5445000.0, 0.0, -10000.0), \
         'did not get expected geotransform'
 
-    return 'success'
-
 ###############################################################################
 # Test reading RPC00B
 
@@ -1584,8 +1530,6 @@ def test_nitf_54():
 
     assert md is not None and 'HEIGHT_OFF' in md
 
-    return 'success'
-
 ###############################################################################
 # Test reading ICHIPB
 
@@ -1604,8 +1548,6 @@ def test_nitf_55():
 
     assert md is not None and 'ICHIP_SCALE_FACTOR' in md
 
-    return 'success'
-
 ###############################################################################
 # Test reading USE00A
 
@@ -1624,8 +1566,6 @@ def test_nitf_56():
 
     assert md is not None and 'NITF_USE00A_ANGLE_TO_NORTH' in md
 
-    return 'success'
-
 ###############################################################################
 # Test reading GEOLOB
 
@@ -1645,10 +1585,9 @@ def test_nitf_57():
     if gt != (-180.0, 1.0, 0.0, 90.0, 0.0, -1.0):
         gdaltest.post_reason('did not get expected geotransform')
         print(gt)
-        return 'success'
-
-    return 'success'
+        return
 
+    
 ###############################################################################
 # Test reading STDIDC
 
@@ -1667,8 +1606,6 @@ def test_nitf_58():
 
     assert md is not None and 'NITF_STDIDC_ACQUISITION_DATE' in md
 
-    return 'success'
-
 ###############################################################################
 # Test reading IMRFCA and IMASDA
 
@@ -1721,8 +1658,6 @@ def test_nitf_read_IMRFCA_IMASDA():
     gdal.Unlink(tmpfile)
     assert md == {}
 
-    return 'success'
-
 ###############################################################################
 # Test georeferencing through .nfw and .hdr files
 
@@ -1745,8 +1680,6 @@ def test_nitf_59():
     assert gt == (149999.5, 1.0, 0.0, 4500000.5, 0.0, -1.0), \
         'did not get expected geotransform'
 
-    return 'success'
-
 ###############################################################################
 # Test reading CADRG polar tile georeferencing (#2940)
 
@@ -1768,8 +1701,7 @@ def test_nitf_60():
     for i in range(6):
         assert abs(gt[i] - ref_gt[i]) <= 1e-6, 'did not get expected geotransform'
 
-    return 'success'
-
+    
 ###############################################################################
 # Test reading TRE from DE segment
 
@@ -1787,8 +1719,6 @@ def test_nitf_61():
 
     assert xml_tre.find('<tre name="RSMDCA"') != -1, 'did not get expected xml:TRE'
 
-    return 'success'
-
 ###############################################################################
 # Test creating & reading image comments
 
@@ -1810,8 +1740,7 @@ def test_nitf_62():
         print("'%s'" % got_comments)
         pytest.fail('did not get expected comments')
 
-    return 'success'
-
+    
 ###############################################################################
 # Test NITFReadImageLine() and NITFWriteImageLine() when nCols < nBlockWidth (#3551)
 
@@ -1849,8 +1778,6 @@ def test_nitf_63():
     assert cs1 == 0 and cs2 == 14186 and cs3 == 15301, \
         ('did not get expected checksums : (%d, %d, %d) instead of (0, 14186, 15301)' % (cs1, cs2, cs3))
 
-    return 'success'
-
 ###############################################################################
 # Test SDE_TRE creation option
 
@@ -1903,8 +1830,6 @@ def test_nitf_64():
     gdal.Unlink('/vsimem/nitf_64.tif')
     gdal.Unlink('/vsimem/nitf_64.ntf')
 
-    return 'success'
-
 ###############################################################################
 # Test creating an image with block_width = image_width > 8192 (#3922)
 
@@ -1923,8 +1848,6 @@ def test_nitf_65():
 
     assert block_xsize == 10000
 
-    return 'success'
-
 ###############################################################################
 # Test creating an image with block_height = image_height > 8192 (#3922)
 
@@ -1943,8 +1866,6 @@ def test_nitf_66():
 
     assert block_ysize == 10000
 
-    return 'success'
-
 ###############################################################################
 # Test that we don't use scanline access in illegal cases (#3926)
 
@@ -1967,8 +1888,6 @@ def test_nitf_67():
 
     assert cs == 4672
 
-    return 'success'
-
 ###############################################################################
 # Test reading NITF_METADATA domain
 
@@ -1983,8 +1902,6 @@ def test_nitf_68():
     assert ds.GetMetadataItem('NITFFileHeader', 'NITF_METADATA')
     ds = None
 
-    return 'success'
-
 ###############################################################################
 # Test SetGCPs() support
 
@@ -2054,8 +1971,6 @@ def test_nitf_69():
        abs(got_gcps[3].GCPX - 2) <= 1e-5 and abs(got_gcps[3].GCPY - 48) <= 1e-5), \
         'wrong gcp'
 
-    return 'success'
-
 ###############################################################################
 # Create and read a JPEG encoded NITF file with NITF dimensions != JPEG dimensions
 
@@ -2087,8 +2002,6 @@ def test_nitf_70():
 
     assert cs == cs_ref
 
-    return 'success'
-
 ###############################################################################
 # Test reading ENGRDA TRE (#6285)
 
@@ -2137,8 +2050,6 @@ def test_nitf_71():
 """
     assert data == expected_data
 
-    return 'success'
-
 ###############################################################################
 # Test writing and reading RPC00B
 
@@ -2158,8 +2069,7 @@ def compare_rpc(src_md, md):
         elif float(src_md[key]) != float(md[key]):
             print(md)
             pytest.fail('fail: %s value is not the one expected' % key)
-    return 'success'
-
+    
 
 def test_nitf_72():
 
@@ -2417,8 +2327,6 @@ def test_nitf_72():
         ds = gdal.GetDriverByName('NITF').CreateCopy('/vsimem/nitf_72.ntf', src_ds)
     assert ds is None, 'fail: expected failure'
 
-    return 'success'
-
 ###############################################################################
 # Test case for https://bugs.chromium.org/p/oss-fuzz/issues/detail?id=1525
 
@@ -2428,8 +2336,7 @@ def test_nitf_73():
     with gdaltest.error_handler():
         gdal.Open('data/oss_fuzz_1525.ntf')
 
-    return 'success'
-
+    
 ###############################################################################
 # Test cases for CCLSTA
 #  - Simple case
@@ -2464,8 +2371,6 @@ def test_nitf_74():
 """
     assert data == expected_data
 
-    return 'success'
-
 #  - TABLE AG.2 case
 
 
@@ -2660,8 +2565,6 @@ def test_nitf_75():
 
     assert data == expected_data
 
-    return 'success'
-
 ###############################################################################
 # Test reading C4 compressed file
 
@@ -2672,8 +2575,6 @@ def test_nitf_read_C4():
     cs = ds.GetRasterBand(1).Checksum()
     assert cs == 53599
 
-    return 'success'
-
 ###############################################################################
 # Test NITF21_CGM_ANNO_Uncompressed_unmasked.ntf for bug #1313 and #1714
 
@@ -2707,8 +2608,6 @@ def test_nitf_online_2():
     assert 'SUBDATASET_1_NAME' in md, 'missing SUBDATASET_1_NAME metadata'
     ds = None
 
-    return 'success'
-
 ###############################################################################
 # Test ARIDPCM (C2) image
 
@@ -2795,8 +2694,7 @@ def test_nitf_online_7():
                                      % filename)
         ds = None
 
-    return 'success'
-
+    
 ###############################################################################
 # Test JPEG-compressed multi-block mono-band image with a data mask subheader (IC=M3, IMODE=B)
 
@@ -2873,8 +2771,7 @@ def test_nitf_online_10():
     for item in tab:
         assert mdCGM[item[0]] == item[1], ('wrong value for %s.' % item[0])
 
-    return 'success'
-
+    
 ###############################################################################
 # 5 text files
 
@@ -2901,8 +2798,6 @@ def test_nitf_online_11():
     assert mdTEXT['DATA_4'] == 'This is test text file 05.\r\n', \
         'did not find expected DATA_4 from metadata.'
 
-    return 'success'
-
 
 ###############################################################################
 # Test 12 bit uncompressed image.
@@ -2961,8 +2856,7 @@ def test_nitf_online_13():
         assert md[item[0]] == item[1], ('wrong value for %s, got %s instead of %s.'
                                  % (item[0], md[item[0]], item[1]))
 
-    return 'success'
-
+    
 
 ###############################################################################
 # Check reading a 12-bit JPEG compressed NITF (multi-block)
@@ -2998,8 +2892,7 @@ def test_nitf_online_14():
     except OSError:
         pass
 
-    return 'success'
-
+    
 ###############################################################################
 # Test opening a IC=C8 NITF file with the various JPEG2000 drivers
 
@@ -3198,8 +3091,6 @@ def test_nitf_online_18():
 
     ds = None
 
-    return 'success'
-
 ###############################################################################
 # Test CADRG tile crossing dateline (#3383)
 
@@ -3234,8 +3125,6 @@ def test_nitf_online_20():
     assert md['NITF_RPF_CurrencyDate'] == '19941201' and md['NITF_RPF_ProductionDate'] == '19980511' and md['NITF_RPF_SignificantDate'] == '19850305', \
         'RPF attribute metadata not captured (#3413)'
 
-    return 'success'
-
 ###############################################################################
 # Check that we can read NITF header located in STREAMING_FILE_HEADER DE
 # segment when header at beginning of file is incomplete
@@ -3254,8 +3143,6 @@ def test_nitf_online_21():
     assert md['NITF_OSTAID'] == 'I_3321A', \
         'did not get expected OSTAID value'
 
-    return 'success'
-
 ###############################################################################
 # Test fix for #3002 (reconcile NITF file with LA segments)
 #
@@ -3334,8 +3221,7 @@ def test_nitf_online_22():
         assert md[item[0]] == item[1], ('(4) wrong value for %s, got %s instead of %s.'
                                  % (item[0], md[item[0]], item[1]))
 
-    return 'success'
-
+    
 ###############################################################################
 # Test reading a M4 compressed file (fixed for #3848)
 
@@ -3378,8 +3264,6 @@ def test_nitf_online_24():
        xml_tre.find('<tre name="ACCPOB"') == -1 or \
        xml_tre.find('<tre name="SOURCB"') == -1)), 'did not get expected xml:TRE'
 
-    return 'success'
-
 ###############################################################################
 # Test reading a HRE file
 
@@ -3399,8 +3283,6 @@ def test_nitf_online_25():
 
     assert xml_tre.find('<tre name="PIAPRD"') != -1, 'did not get expected xml:TRE'
 
-    return 'success'
-
 ###############################################################################
 # Cleanup.
 
@@ -3553,8 +3435,7 @@ def test_nitf_cleanup():
     except RuntimeError:
         pass
 
-    return 'success'
-
+    
 
 gdaltest_list = [
     test_nitf_1,
diff --git a/autotest/gdrivers/ntv2.py b/autotest/gdrivers/ntv2.py
index fa4afe91194b..59dfedd7c992 100755
--- a/autotest/gdrivers/ntv2.py
+++ b/autotest/gdrivers/ntv2.py
@@ -90,8 +90,6 @@ def test_ntv2_5():
     ds = None
     gdal.GetDriverByName('NTv2').Delete('/vsimem/ntv2_5.gsb')
 
-    return 'success'
-
 ###############################################################################
 # Test appending to a big-endian NTv2 grid
 
@@ -108,8 +106,6 @@ def test_ntv2_6():
     ds = None
     gdal.GetDriverByName('NTv2').Delete('/vsimem/ntv2_6.gsb')
 
-    return 'success'
-
 ###############################################################################
 # Test creating a file with invalid filename
 
@@ -124,8 +120,6 @@ def test_ntv2_7():
         ds = gdal.GetDriverByName('NTv2').Create('/does/not/exist.gsb', 1, 1, 4, gdal.GDT_Float32, options=['APPEND_SUBDATASET=YES'])
     assert ds is None
 
-    return 'success'
-
 ###############################################################################
 
 
diff --git a/autotest/gdrivers/nwt_grd.py b/autotest/gdrivers/nwt_grd.py
index 69d51619157e..3f7f23c0eefe 100755
--- a/autotest/gdrivers/nwt_grd.py
+++ b/autotest/gdrivers/nwt_grd.py
@@ -51,7 +51,7 @@ def test_nwt_grd_1():
     tst4 = gdaltest.GDALTest('NWT_GRD', 'nwt_grd.grd', 4, 25856)
     status4 = tst4.testOpen()
     if status1 == 'success' and status2 == 'success' and status3 == 'success' and status4 == 'success':
-        return 'success'
+        return
     pytest.fail()
 
 
diff --git a/autotest/gdrivers/ozi.py b/autotest/gdrivers/ozi.py
index ac19d76a3a9d..1ee70d9edcb6 100755
--- a/autotest/gdrivers/ozi.py
+++ b/autotest/gdrivers/ozi.py
@@ -85,8 +85,6 @@ def test_ozi_online_1():
     cs = ds.GetRasterBand(1).Checksum()
     assert cs == 16025, 'bad checksum'
 
-    return 'success'
-
 
 gdaltest_list = [
     test_ozi_online_1]
diff --git a/autotest/gdrivers/paux.py b/autotest/gdrivers/paux.py
index d982da877ea9..06a41ebd67c9 100755
--- a/autotest/gdrivers/paux.py
+++ b/autotest/gdrivers/paux.py
@@ -70,7 +70,6 @@ def test_paux_3():
 def test_paux_cleanup():
     gdaltest.clean_tmp()
     gdal.Unlink('/vsimem/byte.tif.tst.aux.xml')
-    return 'success'
 
 
 gdaltest_list = [
diff --git a/autotest/gdrivers/pcidsk.py b/autotest/gdrivers/pcidsk.py
index ae377e126be2..3ea281b9bfb3 100755
--- a/autotest/gdrivers/pcidsk.py
+++ b/autotest/gdrivers/pcidsk.py
@@ -81,8 +81,6 @@ def test_pcidsk_4():
     cs = band.GetOverview(0).Checksum()
     assert cs == 8368, ('wrong overview checksum (%d)' % cs)
 
-    return 'success'
-
 ###############################################################################
 # Test writing metadata to a newly created file.
 
@@ -128,8 +126,7 @@ def test_pcidsk_5():
         print(mdalt)
         gdaltest.post_reason('file alt domain metadata broken. ')
 
-    return 'success'
-
+    
 ###############################################################################
 # Test writing metadata to a band.
 
@@ -164,8 +161,7 @@ def test_pcidsk_6():
         print(mdalt)
         gdaltest.post_reason('channel alt domain metadata broken. ')
 
-    return 'success'
-
+    
 ###############################################################################
 # Test creating a color table and reading it back.
 
@@ -216,8 +212,6 @@ def test_pcidsk_7():
 
     assert band.GetColorInterpretation() == gdal.GCI_Undefined, 'Paletted?'
 
-    return 'success'
-
 ###############################################################################
 # Test FILE interleaving.
 
@@ -255,8 +249,6 @@ def pcidsk_9():
 
     gdal.Unlink('/vsimem/pcidsk_9.pix')
 
-    return 'success'
-
 ###############################################################################
 # Test overview creation.
 
@@ -284,8 +276,6 @@ def test_pcidsk_10():
 
     gdal.GetDriverByName('PCIDSK').Delete('/vsimem/pcidsk_10.pix')
 
-    return 'success'
-
 ###############################################################################
 # Test INTERLEAVING=TILED interleaving.
 
@@ -340,8 +330,6 @@ def test_pcidsk_13():
 
     assert cs == 4645, 'bad checksum'
 
-    return 'success'
-
 ###############################################################################
 # Test SetDescription()
 
@@ -366,8 +354,6 @@ def test_pcidsk_14():
 
     assert desc == 'mydescription', 'bad description'
 
-    return 'success'
-
 ###############################################################################
 # Test mixed raster and vector
 
@@ -432,8 +418,6 @@ def test_pcidsk_15():
     gdal.GetDriverByName('PCIDSK').Delete('/vsimem/pcidsk_15.pix')
     gdal.GetDriverByName('PCIDSK').Delete('/vsimem/pcidsk_15_2.pix')
 
-    return 'success'
-
 ###############################################################################
 
 
@@ -450,8 +434,6 @@ def test_pcidsk_external_ovr():
 
     gdal.GetDriverByName('PCIDSK').Delete('/vsimem/test.pix')
 
-    return 'success'
-
 ###############################################################################
 
 
@@ -469,8 +451,6 @@ def test_pcidsk_external_ovr_rrd():
 
     gdal.GetDriverByName('PCIDSK').Delete('/vsimem/test.pix')
 
-    return 'success'
-
 ###############################################################################
 # Check various items from a modern irvine.pix
 
@@ -506,8 +486,6 @@ def test_pcidsk_online_1():
     md = band.GetMetadata('IMAGE_STRUCTURE')
     assert md['NBITS'] == '1', 'did not get expected NBITS=1 metadata.'
 
-    return 'success'
-
 ###############################################################################
 # Cleanup.
 
@@ -515,7 +493,6 @@ def test_pcidsk_online_1():
 def test_pcidsk_cleanup():
     gdaltest.pcidsk_ds = None
     gdaltest.clean_tmp()
-    return 'success'
 
 
 gdaltest_list = [
diff --git a/autotest/gdrivers/pcraster.py b/autotest/gdrivers/pcraster.py
index 17d67aa43efe..096a56387538 100755
--- a/autotest/gdrivers/pcraster.py
+++ b/autotest/gdrivers/pcraster.py
@@ -68,8 +68,6 @@ def test_pcraster_2():
     band1 = ds.GetRasterBand(1)
     assert band1.GetNoDataValue() == 255, 'PCRaster NODATA value wrong or missing.'
 
-    return 'success'
-
 
 gdaltest_list = [
     test_pcraster_1,
diff --git a/autotest/gdrivers/pdf.py b/autotest/gdrivers/pdf.py
index 4a83f5e54a80..7222bdf7c6b0 100755
--- a/autotest/gdrivers/pdf.py
+++ b/autotest/gdrivers/pdf.py
@@ -56,8 +56,7 @@ def pdf_init():
         gdaltest.pdf_drv = None
         pytest.skip()
 
-    return 'success'
-
+    
 ###############################################################################
 # Returns True if we run with poppler
 
@@ -153,8 +152,7 @@ def pdf_online_1():
         cs = ds.GetRasterBand(1).Checksum()
         assert cs != 0, 'bad checksum'
 
-    return 'success'
-
+    
 ###############################################################################
 
 
@@ -190,8 +188,6 @@ def pdf_online_2():
 
     assert wkt.find('GEOGCS["WGS 84"') == 0
 
-    return 'success'
-
 ###############################################################################
 # Test Adobe style geospatial pdf
 
@@ -236,8 +232,7 @@ def pdf_1():
         print(neatline)
         pytest.fail('bad neatline')
 
-    return 'success'
-
+    
 ###############################################################################
 # Test write support with ISO32000 geo encoding
 
@@ -342,8 +337,7 @@ def pdf_ogcbp_lcc():
         print(sr2.ExportToPrettyWkt())
         pytest.fail('wrong wkt')
 
-    return 'success'
-
+    
 ###############################################################################
 # Test no compression
 
@@ -499,8 +493,7 @@ def pdf_rgba_default_compression(options_param=None):
         print(src_cs3)
         print(src_cs4)
 
-    return 'success'
-
+    
 
 def pdf_rgba_default_compression_tiled():
     return pdf_rgba_default_compression(['BLOCKXSIZE=32', 'BLOCKYSIZE=32'])
@@ -605,8 +598,6 @@ def pdf_xmp():
 
     assert len(base_md) == 2
 
-    return 'success'
-
 ###############################################################################
 # Test Info
 
@@ -650,8 +641,6 @@ def pdf_info():
        md['SUBJECT'] == 'subject' and \
        md['TITLE'] == 'title'), "metadata doesn't match"
 
-    return 'success'
-
 ###############################################################################
 # Check SetGeoTransform() / SetProjection()
 
@@ -716,8 +705,6 @@ def pdf_update_gt():
 
     gdaltest.pdf_drv.Delete('tmp/pdf_update_gt.pdf')
 
-    return 'success'
-
 ###############################################################################
 # Check SetMetadataItem() for Info
 
@@ -775,8 +762,6 @@ def pdf_update_info():
 
     gdaltest.pdf_drv.Delete('tmp/pdf_update_info.pdf')
 
-    return 'success'
-
 ###############################################################################
 # Check SetMetadataItem() for xml:XMP
 
@@ -833,8 +818,6 @@ def pdf_update_xmp():
 
     gdaltest.pdf_drv.Delete('tmp/pdf_update_xmp.pdf')
 
-    return 'success'
-
 ###############################################################################
 # Check SetGCPs() but with GCPs that resolve to a geotransform
 
@@ -929,8 +912,6 @@ def pdf_update_gcps(dpi=300):
 
     gdaltest.pdf_drv.Delete(out_filename)
 
-    return 'success'
-
 
 def pdf_update_gcps_iso32000():
     gdal.SetConfigOption('GDAL_PDF_GEO_ENCODING', None)
@@ -1042,8 +1023,6 @@ def pdf_set_5_gcps_ogc_bp(dpi=300):
 
     gdaltest.pdf_drv.Delete(out_filename)
 
-    return 'success'
-
 
 ###############################################################################
 # Check NEATLINE support
@@ -1125,8 +1104,6 @@ def pdf_set_neatline(geo_encoding, dpi=300):
 
     gdaltest.pdf_drv.Delete(out_filename)
 
-    return 'success'
-
 
 def pdf_set_neatline_iso32000():
     return pdf_set_neatline('ISO32000')
@@ -1163,8 +1140,6 @@ def pdf_check_identity_iso32000():
 
     assert data_ref == data_got, 'content does not match reference content'
 
-    return 'success'
-
 ###############################################################################
 # Check that we can generate identical file
 
@@ -1195,8 +1170,6 @@ def pdf_check_identity_ogc_bp():
 
     assert data_ref == data_got, 'content does not match reference content'
 
-    return 'success'
-
 ###############################################################################
 # Check layers support
 
@@ -1247,8 +1220,6 @@ def pdf_layers():
 
     assert not (cs4 == cs1 or cs4 == cs2), 'did not get expected checksum'
 
-    return 'success'
-
 ###############################################################################
 # Test MARGIN, EXTRA_STREAM, EXTRA_LAYER_NAME and EXTRA_IMAGES options
 
@@ -1289,8 +1260,7 @@ def pdf_custom_layout():
         assert layers == ['LAYER_00_NAME=byte_tif', 'LAYER_01_NAME=Footpage_and_logo'], \
             'did not get expected layers'
 
-    return 'success'
-
+    
 ###############################################################################
 # Test CLIPPING_EXTENT, EXTRA_RASTERS, EXTRA_RASTERS_LAYER_NAME, OFF_LAYERS, EXCLUSIVE_LAYERS options
 
@@ -1356,8 +1326,6 @@ def pdf_extra_rasters():
     assert not (pdf_is_poppler() and (cs != 7926 and cs != 8177 and cs != 8174 and cs != 8165)), \
         'bad checksum'
 
-    return 'success'
-
 ###############################################################################
 # Test adding a OGR datasource
 
@@ -1449,8 +1417,6 @@ def pdf_write_ogr():
     # Should have filtered out id = 4
     assert feature_count == 3, 'did not get expected feature count'
 
-    return 'success'
-
 ###############################################################################
 # Test adding a OGR datasource with reprojection of OGR SRS to GDAL SRS
 
@@ -1512,8 +1478,6 @@ def pdf_write_ogr_with_reprojection():
     # Should have filtered out id = 6
     assert feature_count == 5, 'did not get expected feature count'
 
-    return 'success'
-
 ###############################################################################
 # Test direct copy of source JPEG file
 
@@ -1548,8 +1512,6 @@ def pdf_jpeg_direct_copy():
 
     assert offset != -1
 
-    return 'success'
-
 ###############################################################################
 # Test direct copy of source JPEG file within VRT file
 
@@ -1596,8 +1558,6 @@ def pdf_jpeg_in_vrt_direct_copy():
 
     assert offset != -1
 
-    return 'success'
-
 ###############################################################################
 # Test reading georeferencing attached to an image, and not to the page (#4695)
 
@@ -1636,8 +1596,6 @@ def pdf_georef_on_image(src_filename='data/byte.tif'):
 
     assert not pdf_checksum_available() or src_cs == got_cs, 'did not get same checksum'
 
-    return 'success'
-
 
 def pdf_georef_on_image_rgb():
     return pdf_georef_on_image('data/rgbsmall.tif')
@@ -1696,8 +1654,6 @@ def pdf_write_huge():
 
     gdal.Unlink(tmp_filename)
 
-    return 'success'
-
 ###############################################################################
 # Test creating overviews
 
@@ -1736,8 +1692,6 @@ def pdf_overviews():
 
     gdaltest.pdf_drv.Delete(tmp_filename)
 
-    return 'success'
-
 ###############################################################################
 # Test password
 
@@ -1784,8 +1738,6 @@ def pdf_password():
     os.unlink('tmp/password.txt')
     assert ret == 0
 
-    return 'success'
-
 ###############################################################################
 # Test multi page support
 
@@ -1824,8 +1776,6 @@ def pdf_multipage():
         ds = gdal.Open('PDF:1:/does/not/exist.pdf')
     assert ds is None
 
-    return 'success'
-
 ###############################################################################
 # Test PAM metadata support
 
@@ -1846,8 +1796,6 @@ def pdf_metadata():
 
     gdal.GetDriverByName('PDF').Delete('tmp/pdf_metadata.pdf')
 
-    return 'success'
-
 ###############################################################################
 # Test PAM georef support
 
@@ -1874,8 +1822,6 @@ def pdf_pam_georef():
 
     gdal.GetDriverByName('PDF').Delete('tmp/pdf_pam_georef.pdf')
 
-    return 'success'
-
 
 gdaltest_list_for_full_backend = [
     pdf_online_1,
@@ -1974,8 +1920,7 @@ def test_pdf_run_all():
                 gdaltest.pdf_is_checksum_available = None
                 gdaltest.run_tests(gdaltest_list_for_short_backend)
 
-    return 'success'
-
+    
 
 gdaltest_list = [test_pdf_run_all]
 # gdaltest_list = [ pdf_init, pdf_metadata ]
diff --git a/autotest/gdrivers/pds.py b/autotest/gdrivers/pds.py
index 10751b8f0996..963a83d9a67d 100755
--- a/autotest/gdrivers/pds.py
+++ b/autotest/gdrivers/pds.py
@@ -88,8 +88,6 @@ def test_pds_2():
     ds = gdal.Open('data/fl73n003_alt_truncated.img')
     assert ds.GetRasterBand(1).GetNoDataValue() == 7
 
-    return 'success'
-
 ###############################################################################
 # Read a truncated and modified version of ftp://pdsimage2.wr.usgs.gov/cdroms/messenger/MSGRMDS_1001/DATA/2004_232/EN0001426030M.IMG
 # 16bits image
@@ -110,8 +108,6 @@ def test_pds_3():
 
     gdal.PopErrorHandler()
 
-    return 'success'
-
 ###############################################################################
 # Read a hacked example of reading a detached file with an offset #3177.
 
@@ -167,8 +163,7 @@ def test_pds_6():
         print('Exp: ', expected_wkt)
         pytest.fail('did not get expected coordinate system.')
 
-    return 'success'
-
+    
 ###############################################################################
 # Read an uncompressed image via the PDS label. (#3943)
 
@@ -198,8 +193,6 @@ def test_pds_7():
     gdal.SetConfigOption('PDS_SampleProjOffset_Shift', None)
     gdal.SetConfigOption('PDS_LineProjOffset_Shift', None)
 
-    return 'success'
-
 ###############################################################################
 # Test applying adjustment offsets via configuration variables for the
 # geotransform (#3940)
@@ -246,8 +239,6 @@ def test_pds_9():
 
     assert ds.GetProjectionRef()
 
-    return 'success'
-
 ###############################################################################
 # Test PDS label with nested arrays (#6970)
 
@@ -304,8 +295,6 @@ def test_pds_10():
 
     gdal.Unlink('/vsimem/pds_10')
 
-    return 'success'
-
 ###############################################################################
 # Read a hacked example of reading an image where the line offset is not
 # a multiple of the record size
diff --git a/autotest/gdrivers/pds4.py b/autotest/gdrivers/pds4.py
index db2c95cbca3b..3266c7599e2a 100755
--- a/autotest/gdrivers/pds4.py
+++ b/autotest/gdrivers/pds4.py
@@ -74,7 +74,6 @@ def validate_xml(filename):
         'FAIL_IF_VALIDATION_ERROR=YES',
         'CONFIG_FILE=<Configuration><AllowRemoteSchemaDownload>false</AllowRemoteSchemaDownload><SchemaCache><Directory>tmp/cache</Directory></SchemaCache></Configuration>'])
     assert ds is not None
-    return 'success'
 
 ###############################################################################
 # Perform simple read test on PDS4 dataset.
@@ -239,7 +238,6 @@ def test_pds4_8():
     ds = None
 
     gdal.GetDriverByName('PDS4').Delete(filename)
-    return 'success'
 
 ###############################################################################
 # Test nodata / mask
@@ -463,8 +461,6 @@ def test_pds4_9():
     gdal.GetDriverByName('PDS4').Delete(filename)
     gdal.Unlink(template)
 
-    return 'success'
-
 ###############################################################################
 # Test scale / offset
 
@@ -492,8 +488,7 @@ def test_pds4_10():
         gdal.GetDriverByName('PDS4').Delete(filename)
         gdal.GetDriverByName('PDS4').Delete(filename2)
 
-    return 'success'
-
+    
 ###############################################################################
 # Test various data types
 
@@ -526,8 +521,6 @@ def test_pds4_11():
 
     gdal.GetDriverByName('PDS4').Delete(filename)
 
-    return 'success'
-
 ###############################################################################
 # Test various creation options
 
@@ -568,8 +561,6 @@ def test_pds4_12():
 
     gdal.GetDriverByName('PDS4').Delete(filename)
 
-    return 'success'
-
 ###############################################################################
 # Test subdatasets
 
@@ -623,8 +614,6 @@ def test_pds4_13():
         ds = gdal.Open('PDS4:data/byte_pds4_multi_sds.xml:1:3')
     assert ds is None
 
-    return 'success'
-
 ###############################################################################
 # Test error cases
 
@@ -921,8 +910,6 @@ def test_pds4_14():
     gdal.Unlink(filename)
     gdal.Unlink('/vsimem/test.img')
 
-    return 'success'
-
 ###############################################################################
 # Test Create() without geospatial info but from a geospatial enabled template
 
@@ -945,8 +932,6 @@ def test_pds4_15():
 
     gdal.GetDriverByName('PDS4').Delete(filename)
 
-    return 'success'
-
 ###############################################################################
 # Test Create() with geospatial info but from a template without Discipline_Area
 
@@ -1022,8 +1007,6 @@ def test_pds4_16():
     gdal.GetDriverByName('PDS4').Delete(filename)
     gdal.Unlink(template)
 
-    return 'success'
-
 ###############################################################################
 # Test ARRAY_TYPE creation option
 
@@ -1068,8 +1051,6 @@ def test_pds4_17():
 
     gdal.GetDriverByName('PDS4').Delete(filename)
 
-    return 'success'
-
 ###############################################################################
 # Test RADII creation option
 
@@ -1096,8 +1077,6 @@ def test_pds4_18():
 
     gdal.GetDriverByName('PDS4').Delete(filename)
 
-    return 'success'
-
 
 gdaltest_list = [
     test_pds4_1,
diff --git a/autotest/gdrivers/plmosaic.py b/autotest/gdrivers/plmosaic.py
index 6d2df13de6cf..00ffb6bedf2d 100755
--- a/autotest/gdrivers/plmosaic.py
+++ b/autotest/gdrivers/plmosaic.py
@@ -49,7 +49,7 @@ def test_plmosaic_1():
     gdaltest.plmosaic_drv = gdal.GetDriverByName('PLMosaic')
 
     if gdaltest.plmosaic_drv is not None:
-        return 'success'
+        return
     pytest.skip()
 
 ###############################################################################
@@ -68,8 +68,6 @@ def test_plmosaic_2():
     gdal.PopErrorHandler()
     assert ds is None
 
-    return 'success'
-
 ###############################################################################
 # Error case: invalid root URL
 
@@ -86,8 +84,6 @@ def test_plmosaic_3():
     gdal.PopErrorHandler()
     assert ds is None
 
-    return 'success'
-
 ###############################################################################
 # Error case: invalid JSON
 
@@ -106,8 +102,6 @@ def test_plmosaic_4():
     gdal.PopErrorHandler()
     assert ds is None
 
-    return 'success'
-
 ###############################################################################
 # Error case: not a JSON dictionary
 
@@ -126,8 +120,6 @@ def test_plmosaic_5():
     gdal.PopErrorHandler()
     assert ds is None
 
-    return 'success'
-
 ###############################################################################
 # Error case: missing "mosaics" element
 
@@ -146,8 +138,6 @@ def test_plmosaic_6():
     gdal.PopErrorHandler()
     assert ds is None
 
-    return 'success'
-
 ###############################################################################
 # Valid root but no mosaics
 
@@ -167,8 +157,6 @@ def test_plmosaic_7():
     assert ds is None
     ds = None
 
-    return 'success'
-
 ###############################################################################
 # Valid root with 2 mosaics
 
@@ -222,8 +210,6 @@ def test_plmosaic_8():
     assert ds.GetMetadata("SUBDATASETS") == {'SUBDATASET_2_NAME': 'PLMOSAIC:mosaic=another_mosaic_name', 'SUBDATASET_2_DESC': 'Mosaic another_mosaic_name', 'SUBDATASET_1_NAME': 'PLMOSAIC:mosaic=my_mosaic_name', 'SUBDATASET_1_DESC': 'Mosaic my_mosaic_name'}
     ds = None
 
-    return 'success'
-
 ###############################################################################
 # Error case: invalid mosaic
 
@@ -240,8 +226,6 @@ def test_plmosaic_9():
     gdal.PopErrorHandler()
     assert ds is None and gdal.GetLastErrorMsg().find('/vsimem/root/?name__is=does_not_exist') >= 0
 
-    return 'success'
-
 ###############################################################################
 # Invalid mosaic definition: invalid JSON
 
@@ -259,8 +243,6 @@ def test_plmosaic_9bis():
     gdal.SetConfigOption('PL_URL', None)
     assert ds is None and gdal.GetLastErrorMsg().find('JSON parsing error') >= 0
 
-    return 'success'
-
 ###############################################################################
 # Invalid mosaic definition: JSON without mosaics array
 
@@ -278,8 +260,6 @@ def test_plmosaic_9ter():
     gdal.SetConfigOption('PL_URL', None)
     assert ds is None and gdal.GetLastErrorMsg().find('No mosaic my_mosaic') >= 0
 
-    return 'success'
-
 ###############################################################################
 # Invalid mosaic definition: missing parameters
 
@@ -302,8 +282,6 @@ def test_plmosaic_10():
     gdal.SetConfigOption('PL_URL', None)
     assert ds is None and gdal.GetLastErrorMsg().find('Missing required parameter') >= 0
 
-    return 'success'
-
 ###############################################################################
 # Invalid mosaic definition: unsupported projection
 
@@ -332,8 +310,6 @@ def test_plmosaic_11():
     gdal.SetConfigOption('PL_URL', None)
     assert ds is None and gdal.GetLastErrorMsg().find('Unsupported coordinate_system') >= 0
 
-    return 'success'
-
 ###############################################################################
 # Invalid mosaic definition: unsupported datatype
 
@@ -362,8 +338,6 @@ def test_plmosaic_12():
     gdal.SetConfigOption('PL_URL', None)
     assert ds is None and gdal.GetLastErrorMsg().find('Unsupported data_type') >= 0
 
-    return 'success'
-
 ###############################################################################
 # Invalid mosaic definition: unsupported resolution
 
@@ -392,8 +366,6 @@ def test_plmosaic_13():
     gdal.SetConfigOption('PL_URL', None)
     assert ds is None and gdal.GetLastErrorMsg().find('Unsupported resolution') >= 0
 
-    return 'success'
-
 ###############################################################################
 # Invalid mosaic definition: unsupported quad_size
 
@@ -422,8 +394,6 @@ def test_plmosaic_14():
     gdal.SetConfigOption('PL_URL', None)
     assert ds is None and gdal.GetLastErrorMsg().find('Unsupported quad_size') >= 0
 
-    return 'success'
-
 ###############################################################################
 # Nearly valid mosaic definition. Warning about invalid links.tiles
 
@@ -461,8 +431,6 @@ def test_plmosaic_15():
     assert ds.GetRasterBand(1).GetOverview(0) is None
     ds = None
 
-    return 'success'
-
 ###############################################################################
 # Valid mosaic definition
 
@@ -525,8 +493,6 @@ def test_plmosaic_16():
     assert ds.GetMetadata() == {'LAST_ACQUIRED': 'last_date', 'NAME': 'my_mosaic', 'FIRST_ACQUIRED': 'first_date'}
     ds = None
 
-    return 'success'
-
 ###############################################################################
 # Open with explicit MOSAIC dataset open option
 
@@ -648,8 +614,6 @@ def test_plmosaic_17():
     val = struct.unpack('B' * 4, val)
     assert val == (254, 0, 0, 0)
 
-    return 'success'
-
 ###############################################################################
 # Test location info
 
@@ -691,8 +655,6 @@ def test_plmosaic_18():
 """
     ds = None
 
-    return 'success'
-
 ###############################################################################
 # Try error in saving in cache
 
@@ -716,8 +678,6 @@ def test_plmosaic_19():
     assert val == (254, 0, 0, 0)
     ds = None
 
-    return 'success'
-
 ###############################################################################
 # Try disabling cache
 
@@ -739,8 +699,6 @@ def test_plmosaic_20():
     assert val == (254, 0, 0, 0)
     ds = None
 
-    return 'success'
-
 ###############################################################################
 # Try use_tiles
 
@@ -825,8 +783,6 @@ def test_plmosaic_21():
     gdal.PopErrorHandler()
     assert gdal.GetLastErrorMsg().find('Cannot find tile definition, so use_tiles will be ignored') >= 0
 
-    return 'success'
-
 ###############################################################################
 # Valid mosaic definition with bbox
 
@@ -916,8 +872,6 @@ def test_plmosaic_with_bbox():
 </LocationInfo>
 """
 
-    return 'success'
-
 ###############################################################################
 #
 
@@ -946,8 +900,7 @@ def test_plmosaic_cleanup():
     except OSError:
         pass
 
-    return 'success'
-
+    
 
 gdaltest_list = [
     test_plmosaic_1,
diff --git a/autotest/gdrivers/png.py b/autotest/gdrivers/png.py
index 2618a6d368e8..7d1a2e64bba5 100755
--- a/autotest/gdrivers/png.py
+++ b/autotest/gdrivers/png.py
@@ -84,8 +84,7 @@ def test_png_3():
             print('got:', gt)
             pytest.fail('Mixed locale world file read improperly.')
 
-    return 'success'
-
+    
 ###############################################################################
 # Test RGB mode creation and reading.
 
@@ -138,8 +137,6 @@ def test_png_7():
 
     drv.Delete('tmp/png7.png')
 
-    return 'success'
-
 ###############################################################################
 # Test PNG file with broken IDAT chunk. This poor man test of clean
 # recovery from errors caused by reading broken file..
@@ -180,8 +177,6 @@ def test_png_8():
 
     os.remove('tmp/idat_broken.png')
 
-    return 'success'
-
 
 ###############################################################################
 # Test creating an in memory copy.
@@ -210,8 +205,6 @@ def test_png_10():
 
     gdal.Unlink('/vsimem/tmp.png')
 
-    return 'success'
-
 ###############################################################################
 # Test CreateCopy() interruption
 
@@ -253,8 +246,6 @@ def test_png_12():
     got_cs = [tmp_ds.GetRasterBand(i + 1).Checksum() for i in range(ds.RasterCount)]
     assert cs == got_cs
 
-    return 'success'
-
 ###############################################################################
 # Test metadata
 
@@ -272,7 +263,6 @@ def test_png_13():
     # check that no PAM file is created
     assert gdal.VSIStatL('/vsimem/tmp.png.aux.xml') != 0
     gdal.Unlink('/vsimem/tmp.png')
-    return 'success'
 
 ###############################################################################
 # Test support for nbits < 8
@@ -310,8 +300,6 @@ def test_png_14():
     gdal.Unlink('/vsimem/tmp.png')
     assert nbits is None
 
-    return 'success'
-
 
 gdaltest_list = [
     test_png_1,
diff --git a/autotest/gdrivers/png_profile.py b/autotest/gdrivers/png_profile.py
index f9ebb9dd3f54..7be586d82c1d 100755
--- a/autotest/gdrivers/png_profile.py
+++ b/autotest/gdrivers/png_profile.py
@@ -100,8 +100,6 @@ def test_png_copy_icc():
     driver_tiff.Delete('tmp/icc_test.tiff')
     driver.Delete('tmp/icc_test.png')
 
-    return 'success'
-
 
 def cvtTuple2String(t):
     return str(t).lstrip('([').rstrip(')]')
@@ -143,8 +141,6 @@ def test_png_copy_options_icc():
     driver_tiff.Delete('tmp/icc_test.tiff')
     driver.Delete('tmp/icc_test.png')
 
-    return 'success'
-
 ###############################################################################
 # Test writing and reading of ICC colorimetric data from options
 
@@ -211,8 +207,6 @@ def test_png_copy_options_colorimetric_data():
     driver_tiff.Delete('tmp/icc_test.tiff')
     driver.Delete('tmp/icc_test.png')
 
-    return 'success'
-
 ###############################################################################
 # Test writing and reading of ICC colorimetric data in the file
 
@@ -282,8 +276,6 @@ def test_png_copy_colorimetric_data():
     driver_tiff.Delete('tmp/icc_test.tiff')
     driver.Delete('tmp/icc_test.png')
 
-    return 'success'
-
 ###############################################################################
 # Test sRGB
 
@@ -315,8 +307,6 @@ def test_png_sRGB():
     driver_tiff.Delete('tmp/icc_test.tiff')
     driver.Delete('tmp/icc_test.png')
 
-    return 'success'
-
 ############################################################################
 
 
diff --git a/autotest/gdrivers/postgisraster.py b/autotest/gdrivers/postgisraster.py
index 909d2fd2187e..5fc0ebe32057 100755
--- a/autotest/gdrivers/postgisraster.py
+++ b/autotest/gdrivers/postgisraster.py
@@ -103,8 +103,7 @@ def test_postgisraster_init():
     if gdaltest.postgisrasterDriver is None:
         pytest.skip()
 
-    return 'success'
-
+    
 ###############################################################################
 #
 
@@ -117,7 +116,7 @@ def test_postgisraster_test_open_error1():
         ds = gdal.Open(gdaltest.postgisraster_connection_string +
                        "table='nonexistent'")
     if ds is None:
-        return 'success'
+        return
     pytest.fail()
 
 ###############################################################################
@@ -132,7 +131,6 @@ def test_postgisraster_test_open_error2():
     with gdaltest.error_handler():
         ds = gdal.Open(gdaltest.postgisraster_connection_string + "table='utm'")
     assert ds is not None
-    return 'success'
 
 ###############################################################################
 #
@@ -150,7 +148,7 @@ def test_postgisraster_compare_utm():
     dst_ds = gdal.Open(dst_ds.GetMetadata('SUBDATASETS')['SUBDATASET_1_NAME'])
 
     diff = gdaltest.compare_ds(src_ds, dst_ds, width=100, height=100, verbose=1)
-    return 'success' if diff == 0 else 'fail'
+    assert diff == 0
 
 ###############################################################################
 #
@@ -168,7 +166,7 @@ def test_postgisraster_compare_small_world():
     dst_ds = gdal.Open(dst_ds.GetMetadata('SUBDATASETS')['SUBDATASET_1_NAME'])
 
     diff = gdaltest.compare_ds(src_ds, dst_ds, width=40, height=20, verbose=1)
-    return 'success' if diff == 0 else 'fail'
+    assert diff == 0
 
 ###############################################################################
 #
@@ -281,7 +279,7 @@ def test_postgisraster_test_create_copy_bad_conn_string():
 
         new_ds = gdaltest.postgisrasterDriver.CreateCopy("bogus connection string", src_ds, strict=True)
 
-        return 'success' if new_ds is None else 'fail'
+        assert new_ds is None
 
 
 def test_postgisraster_test_create_copy_no_dbname():
@@ -297,7 +295,7 @@ def test_postgisraster_test_create_copy_no_dbname():
 
         new_ds = gdaltest.postgisrasterDriver.CreateCopy("PG: no database name", src_ds, strict=True, options=options)
 
-        return 'success' if new_ds is None else 'fail'
+        assert new_ds is None
 
 
 def test_postgisraster_test_create_copy_no_tablename():
@@ -313,7 +311,7 @@ def test_postgisraster_test_create_copy_no_tablename():
 
         new_ds = gdaltest.postgisrasterDriver.CreateCopy(gdaltest.postgisraster_connection_string, src_ds, strict=True, options=options)
 
-        return 'success' if new_ds is None else 'fail'
+        assert new_ds is None
 
 
 def test_postgisraster_test_create_copy_and_delete():
@@ -333,7 +331,7 @@ def test_postgisraster_test_create_copy_and_delete():
 
     deleted = gdaltest.postgisrasterDriver.Delete(gdaltest.postgisraster_connection_string + "table='small_world_copy'")
 
-    return 'fail' if deleted else 'success'
+    assert not deleted
 
 
 def test_postgisraster_test_create_copy_and_delete_phases():
@@ -409,8 +407,7 @@ def test_postgisraster_test_create_copy_and_delete_phases():
 
         assert not deleted, 'Delete returned an error.'
 
-    return 'success'
-
+    
 
 def test_postgisraster_test_norid():
     """
@@ -436,8 +433,6 @@ def test_postgisraster_test_norid():
     cs = [ds.GetRasterBand(i + 1).Checksum() for i in range(3)]
     assert cs == [30111, 32302, 40026]
 
-    return 'success'
-
 
 def test_postgisraster_test_serial():
     """
@@ -466,8 +461,6 @@ def test_postgisraster_test_serial():
     cs = [ds.GetRasterBand(i + 1).Checksum() for i in range(3)]
     assert cs == [30111, 32302, 40026]
 
-    return 'success'
-
 
 def test_postgisraster_test_unique():
     """
@@ -496,8 +489,6 @@ def test_postgisraster_test_unique():
     cs = [ds.GetRasterBand(i + 1).Checksum() for i in range(3)]
     assert cs == [30111, 32302, 40026]
 
-    return 'success'
-
 
 def test_postgisraster_test_constraint():
 
@@ -507,8 +498,6 @@ def test_postgisraster_test_constraint():
     cs = [ds.GetRasterBand(i + 1).Checksum() for i in range(3)]
     assert cs == [30111, 32302, 40026]
 
-    return 'success'
-
 
 def test_postgisraster_test_constraint_with_spi():
 
@@ -518,8 +507,6 @@ def test_postgisraster_test_constraint_with_spi():
     cs = [ds.GetRasterBand(i + 1).Checksum() for i in range(3)]
     assert cs == [30111, 32302, 40026]
 
-    return 'success'
-
 
 def test_postgisraster_test_outdb():
 
@@ -543,8 +530,6 @@ def test_postgisraster_test_outdb():
     expected_cs = [30111, 32302, 40026] if has_guc else [0, 0, 0]
     assert cs == expected_cs
 
-    return 'success'
-
 
 def test_postgisraster_test_outdb_client_side():
 
@@ -554,8 +539,6 @@ def test_postgisraster_test_outdb_client_side():
     cs = [ds.GetRasterBand(i + 1).Checksum() for i in range(3)]
     assert cs == [30111, 32302, 40026]
 
-    return 'success'
-
 
 def test_postgisraster_test_outdb_client_side_force_ireadblock():
 
@@ -566,8 +549,6 @@ def test_postgisraster_test_outdb_client_side_force_ireadblock():
         cs = [ds.GetRasterBand(i + 1).Checksum() for i in range(3)]
     assert cs == [30111, 32302, 40026]
 
-    return 'success'
-
 
 def test_postgisraster_test_outdb_client_side_if_possible():
 
@@ -577,16 +558,12 @@ def test_postgisraster_test_outdb_client_side_if_possible():
     cs = [ds.GetRasterBand(i + 1).Checksum() for i in range(3)]
     assert cs == [30111, 32302, 40026]
 
-    return 'success'
-
 
 def test_postgisraster_cleanup():
 
     gdal.Unlink('data/small_world.tif.aux.xml')
     gdal.Unlink('data/utm.tif.aux.xml')
 
-    return 'success'
-
 
 gdaltest_list = [
     test_postgisraster_init,
diff --git a/autotest/gdrivers/prf.py b/autotest/gdrivers/prf.py
index 7457a7c8d46d..84c8e05cd391 100755
--- a/autotest/gdrivers/prf.py
+++ b/autotest/gdrivers/prf.py
@@ -66,8 +66,6 @@ def test_prf_2():
 
     ds = None
 
-    return 'success'
-
 
 def test_prf_3():
 
@@ -81,8 +79,6 @@ def test_prf_3():
 
     ds = None
 
-    return 'success'
-
 
 def test_prf_4():
 
diff --git a/autotest/gdrivers/rasdaman.py b/autotest/gdrivers/rasdaman.py
index dd0f941eae8b..8b8157f0ecff 100755
--- a/autotest/gdrivers/rasdaman.py
+++ b/autotest/gdrivers/rasdaman.py
@@ -65,8 +65,6 @@ def test_rasdaman_1():
     cs = ds.GetRasterBand(1).Checksum()
     assert cs == 61774, 'did not get expected checksum'
 
-    return 'success'
-
 ###############################################################################
 # Test opening a non existing collection
 
@@ -76,7 +74,7 @@ def test_rasdaman_2():
         pytest.skip()
 
     ds = gdal.Open("rasdaman:query='select a[$x_lo:$x_hi,$y_lo:$y_hi] from notexisting as a'")
-    return 'success' if ds is None else 'fail'
+    assert ds is None
 
 ###############################################################################
 # Test syntax error
@@ -88,7 +86,7 @@ def test_rasdaman_3():
 
     ds = gdal.Open("rasdaman:query='select'")
 
-    return 'success' if ds is None else 'fail'
+    assert ds is None
 
 
 gdaltest_list = [
diff --git a/autotest/gdrivers/rasterlite.py b/autotest/gdrivers/rasterlite.py
index c016b453bd94..2e4a109dbccd 100755
--- a/autotest/gdrivers/rasterlite.py
+++ b/autotest/gdrivers/rasterlite.py
@@ -52,8 +52,6 @@ def test_rasterlite_1():
     # w.r.t system/OS crashes, unless you know what you are doing.
     gdal.SetConfigOption('OGR_SQLITE_SYNCHRONOUS', 'OFF')
 
-    return 'success'
-
 ###############################################################################
 # Test opening a rasterlite DB without overviews
 
@@ -117,8 +115,6 @@ def test_rasterlite_2():
 
     ds = None
 
-    return 'success'
-
 ###############################################################################
 # Test opening a rasterlite DB with overviews
 
@@ -151,8 +147,6 @@ def test_rasterlite_3():
 
     ds = None
 
-    return 'success'
-
 ###############################################################################
 # Test opening a rasterlite DB with color table and user-defined spatial extent
 
@@ -178,8 +172,6 @@ def test_rasterlite_4():
 
     ds = None
 
-    return 'success'
-
 ###############################################################################
 # Test opening a rasterlite DB with color table and do color table expansion
 
@@ -213,8 +205,6 @@ def test_rasterlite_5():
 
     ds = None
 
-    return 'success'
-
 ###############################################################################
 # Test CreateCopy()
 
@@ -260,8 +250,6 @@ def test_rasterlite_6():
     src_ds = None
     ds = None
 
-    return 'success'
-
 ###############################################################################
 # Test BuildOverviews()
 
@@ -295,8 +283,6 @@ def test_rasterlite_7():
     assert ds.GetRasterBand(1).GetOverview(1).Checksum() == 233, \
         'Wrong checksum for overview 1'
 
-    return 'success'
-
 ###############################################################################
 # Test CleanOverviews()
 
@@ -315,8 +301,6 @@ def test_rasterlite_8():
 
     assert ds.GetRasterBand(1).GetOverviewCount() == 0
 
-    return 'success'
-
 ###############################################################################
 # Create a rasterlite dataset with EPSILON tiles
 
@@ -384,8 +368,6 @@ def test_rasterlite_11():
     assert ds.GetRasterBand(1).GetOverview(1).Checksum() == 215, \
         'Wrong checksum for overview 1'
 
-    return 'success'
-
 ###############################################################################
 # Test opening a .rasterlite file
 
@@ -400,7 +382,6 @@ def test_rasterlite_12():
 
     ds = gdal.Open('data/byte.rasterlite')
     assert ds.GetRasterBand(1).Checksum() == 4672, 'validation failed'
-    return 'success'
 
 ###############################################################################
 # Test opening a .rasterlite.sql file
@@ -419,7 +400,6 @@ def test_rasterlite_13():
 
     ds = gdal.Open('data/byte.rasterlite.sql')
     assert ds.GetRasterBand(1).Checksum() == 4672, 'validation failed'
-    return 'success'
 
 ###############################################################################
 # Cleanup
@@ -450,8 +430,7 @@ def test_rasterlite_cleanup():
     except OSError:
         pass
 
-    return 'success'
-
+    
 
 gdaltest_list = [
     test_rasterlite_1,
diff --git a/autotest/gdrivers/rda.py b/autotest/gdrivers/rda.py
index 2591f0ca9317..87247fd3f3be 100755
--- a/autotest/gdrivers/rda.py
+++ b/autotest/gdrivers/rda.py
@@ -59,8 +59,7 @@ def test_rda_test_presence():
     if gdaltest.webserver_port == 0:
         pytest.skip()
 
-    return 'success'
-
+    
 ###############################################################################
 
 
@@ -84,8 +83,6 @@ def test_rda_bad_connection_string():
         ds = gdal.Open('{"graph-id": "node-id"}')
     assert ds is None
 
-    return 'success'
-
 ###############################################################################
 
 
@@ -98,8 +95,6 @@ def test_rda_missing_credentials():
         ds = gdal.Open('{"graph-id":"foo","node-id":"bar"}')
     assert ds is None
 
-    return 'success'
-
 ###############################################################################
 
 
@@ -160,8 +155,6 @@ def test_rda_failed_authentication():
                 ds = gdal.Open('{"graph-id":"foo","node-id":"bar"}')
     assert ds is None
 
-    return 'success'
-
 ###############################################################################
 
 
@@ -331,8 +324,6 @@ def test_rda_error_metadata():
                 ds = gdal.Open('{"graph-id":"foo","node-id":"bar"}')
     assert ds is None
 
-    return 'success'
-
 ###############################################################################
 
 
@@ -652,8 +643,6 @@ def test_rda_graph_nominal():
 
     gdal.RmdirRecursive('/vsimem/cache_dir')
 
-    return 'success'
-
 ###############################################################################
 
 
@@ -819,40 +808,6 @@ def test_rda_template_nominal():
 
     gdal.RmdirRecursive('/vsimem/cache_dir')
 
-    #
-    # # Test ReadBlock directly
-    # handler = webserver.SequentialHandler()
-    # handler.add('POST', '/auth_url', 200, {}, '{"access_token": "token", "expires_in": 3600}')
-    # handler.add('GET', '/rda_api/metadata/foo/bar/metadata.json', 200, {}, json.dumps(metadata_json))
-    # handler.add('GET', '/rda_api/tile/foo/bar/0/0.tif', 200, {}, tile00_data)
-    # handler.add('GET', '/rda_api/tile/foo/bar/1/0.tif', 200, {}, tile01_data)
-    # handler.add('GET', '/rda_api/tile/foo/bar/0/1.tif', 200, {}, tile10_data)
-    # handler.add('GET', '/rda_api/tile/foo/bar/1/1.tif', 200, {}, tile11_data)
-    # with webserver.install_http_handler(handler):
-    #     with gdaltest.config_options(config_options):
-    #         ds = gdal.Open('{"graph-id":"foo","node-id":"bar","options":{"delete-on-close":false}}')
-    #     data = ds.GetRasterBand(1).ReadBlock(0,0)
-    #
-    # data = struct.unpack('B' * (256 * 256), data)
-    # if data[0] != 255:
-    #     gdaltest.post_reason('fail')
-    #     return 'fail'
-    # if data[256*(256-2)] != 225:
-    #     gdaltest.post_reason('fail')
-    #     return 'fail'
-    #
-    # # Try IReadBlock() when data for other bands is already cached
-    # ds.GetRasterBand(1).FlushCache()
-    # data = ds.GetRasterBand(1).ReadBlock(0,0)
-    # data = struct.unpack('B' * (256 * 256), data)
-    # if data[0] != 255:
-    #     gdaltest.post_reason('fail')
-    #     return 'fail'
-    #
-    # gdal.RmdirRecursive('/vsimem/cache_dir')
-
-    return 'success'
-
 ###############################################################################
 
 def test_rda_template_image_reference_nominal():
@@ -1017,8 +972,6 @@ def test_rda_template_image_reference_nominal():
 
     gdal.RmdirRecursive('/vsimem/cache_dir')
 
-    return 'success'
-
 
 def test_rda_read_gbdx_config():
 
@@ -1073,8 +1026,6 @@ def test_rda_read_gbdx_config():
 
     gdal.Unlink('/vsimem/.gbdx-config')
 
-    return 'success'
-
 ###############################################################################
 
 
@@ -1150,8 +1101,6 @@ def test_rda_download_queue():
         data = ds.ReadRaster(0, 1, 4, 2)
     assert data == ref_data
 
-    return 'success'
-
 ###############################################################################
 
 
@@ -1246,8 +1195,6 @@ def test_rda_rpc():
     ds = None
     gdal.RmdirRecursive('/vsimem/cache_dir')
 
-    return 'success'
-
 ###############################################################################
 
 
@@ -1337,8 +1284,6 @@ def test_rda_real_cache_dir():
 
     gdal.RmdirRecursive(os.path.join(home, '.gdal', 'rda_cache', 'foo'))
 
-    return 'success'
-
 ###############################################################################
 
 
@@ -1398,8 +1343,7 @@ def test_rda_real_expired_authentication():
         with gdaltest.config_options(config_options):
             gdal.Open('{"graph-id":"foo","node-id":"bar"}')
 
-    return 'success'
-
+    
 ###############################################################################
 
 
@@ -1507,8 +1451,6 @@ def test_rda_bad_tile():
         assert data is None
     ds = None
 
-    return 'success'
-
 ###############################################################################
 #
 
@@ -1523,8 +1465,6 @@ def test_rda_cleanup():
 
     gdal.RmdirRecursive('/vsimem/cache_dir')
 
-    return 'success'
-
 
 gdaltest_list = [
     test_rda_test_presence,
diff --git a/autotest/gdrivers/rl2.py b/autotest/gdrivers/rl2.py
index 7cc2cc60528a..f75180441cb7 100755
--- a/autotest/gdrivers/rl2.py
+++ b/autotest/gdrivers/rl2.py
@@ -49,8 +49,7 @@ def test_rl2_1():
         gdaltest.rl2_drv = None
         pytest.skip()
 
-    return 'success'
-
+    
 ###############################################################################
 # Test opening a rl2 DB gray level
 
@@ -96,8 +95,6 @@ def test_rl2_2():
     cs = ds.GetRasterBand(1).GetOverview(0).Checksum()
     assert cs == 1087
 
-    return 'success'
-
 ###############################################################################
 # Test opening a rl2 DB gray level
 
@@ -138,8 +135,6 @@ def test_rl2_3():
     cs = ds.GetRasterBand(1).GetOverview(0).Checksum()
     assert cs == 35686
 
-    return 'success'
-
 ###############################################################################
 # Test opening a rl2 DB paletted
 
@@ -166,8 +161,6 @@ def test_rl2_4():
     cs = ds.GetRasterBand(1).GetOverview(0).Checksum()
     assert cs == 35614
 
-    return 'success'
-
 ###############################################################################
 # Test opening a rl2 DB with various data types
 
@@ -200,8 +193,7 @@ def test_rl2_5():
         if subds_name == 'RASTERLITE2:data/multi_type.rl2:int8':
             assert ds.GetRasterBand(1).GetMetadataItem('PIXELTYPE', 'IMAGE_STRUCTURE') == 'SIGNEDBYTE'
 
-    return 'success'
-
+    
 ###############################################################################
 # Test CreateCopy() on a grayscale uint8
 
@@ -418,8 +410,6 @@ def test_rl2_20():
 
     gdal.Unlink('/vsimem/rl2_20.rl2')
 
-    return 'success'
-
 ###############################################################################
 # Test compression methods
 
@@ -461,8 +451,6 @@ def test_rl2_21():
 
     gdal.Unlink('/vsimem/rl2_21.rl2')
 
-    return 'success'
-
 ###############################################################################
 # Test APPEND_SUBDATASET
 
@@ -498,8 +486,6 @@ def test_rl2_22():
 
     gdal.Unlink('/vsimem/rl2_22.rl2')
 
-    return 'success'
-
 ###############################################################################
 # Test BuildOverviews
 
@@ -525,8 +511,6 @@ def test_rl2_23():
 
     gdal.Unlink('/vsimem/rl2_23.rl2')
 
-    return 'success'
-
 ###############################################################################
 # Test opening a .rl2.sql file
 
@@ -541,7 +525,6 @@ def test_rl2_24():
 
     ds = gdal.Open('data/byte.rl2.sql')
     assert ds.GetRasterBand(1).Checksum() == 4672, 'validation failed'
-    return 'success'
 
 ###############################################################################
 # Test Create()
@@ -554,8 +537,7 @@ def test_rl2_error_create():
 
     with gdaltest.error_handler():
         assert gdaltest.rl2_drv.Create('/vsimem/out.db', 1, 1) is None
-    return 'success'
-
+    
 
 gdaltest_list = [
     test_rl2_1,
diff --git a/autotest/gdrivers/rmf.py b/autotest/gdrivers/rmf.py
index 53189a7ce956..b0cfd69ff10b 100755
--- a/autotest/gdrivers/rmf.py
+++ b/autotest/gdrivers/rmf.py
@@ -176,8 +176,7 @@ def test_rmf_11():
                   (i, ovr_band.Checksum())
             pytest.fail(msg)
 
-    return 'success'
-
+    
 ###############################################################################
 # Check file open with cucled header offsets .
 
@@ -269,8 +268,6 @@ def rmf_build_ov(source, testid, options, ov_sizes, crs, reopen=False, pass_coun
     src_ds = None
     os.remove(test_ds_name)
 
-    return 'success'
-
 ###############################################################################
 # Build overviews on newly created RSW file
 
@@ -454,8 +451,6 @@ def test_rmf_25():
 
     test_ds = None
     os.remove(test_ds_name)
-
-    return 'success'
 ###############################################################################
 # Unit write test
 
@@ -496,8 +491,6 @@ def test_rmf_26():
     test_ds = None
     os.remove(test_ds_name)
 
-    return 'success'
-
 ###############################################################################
 # Test read JPEG compressed RMF dataset
 
@@ -526,8 +519,6 @@ def test_rmf_27():
     assert cs == cs1 or cs == cs2, ('Invalid checksum %s expected %s or %s.' %
                              (str(cs), str(cs1), str(cs2)))
 
-    return 'success'
-
 
 ###############################################################################
 # Check compression metadata
@@ -543,8 +534,6 @@ def test_rmf_28a():
         ('"COMPRESSION" value is "%s" but expected "LZW"' %
                               md['COMPRESSION'])
 
-    return 'success'
-
 
 def test_rmf_28b():
 
@@ -556,8 +545,6 @@ def test_rmf_28b():
         ('"COMPRESSION" value is "%s" but expected "RMF_DEM"' %
                               md['COMPRESSION'])
 
-    return 'success'
-
 
 ###############################################################################
 # Check EPSG code
@@ -589,8 +576,6 @@ def test_rmf_29():
     assert str(sr.GetAuthorityCode(None)) == '3388', ('EPSG code is %s expected 3388.' %
                              str(sr.GetAuthorityCode(None)))
 
-    return 'success'
-
 
 ###############################################################################
 # Check interleaved access
@@ -609,7 +594,6 @@ def test_rmf_30():
           ds.GetRasterBand(3).Checksum()]
     assert cs == expected_cs, ('Invalid checksum %s expected %s.' %
                              (str(cs), str(expected_cs)))
-    return 'success'
 
 
 ###############################################################################
@@ -649,7 +633,6 @@ def test_rmf_31c():
     assert cs == expected_cs1 or cs == expected_cs2, \
         ('Invalid checksum %s expected %s or %s.' %
                              (str(cs), str(expected_cs1), str(expected_cs2)))
-    return 'success'
 
 
 def test_rmf_31d():
diff --git a/autotest/gdrivers/roipac.py b/autotest/gdrivers/roipac.py
index a7bc880dea3e..3bec2bdbdd10 100755
--- a/autotest/gdrivers/roipac.py
+++ b/autotest/gdrivers/roipac.py
@@ -69,8 +69,6 @@ def test_roipac_2():
     val = ds.GetMetadataItem('YMAX', 'ROI_PAC')
     assert val == '9'
 
-    return 'success'
-
 ###############################################################################
 # Verify this can be exported losslessly.
 
@@ -102,8 +100,6 @@ def test_roipac_5():
     scale = band.GetScale()
     assert scale == 2
 
-    return 'success'
-
 ###############################################################################
 # Test .flg
 
diff --git a/autotest/gdrivers/rpftoc.py b/autotest/gdrivers/rpftoc.py
index 2c01e1356bcf..76ebb25cd58e 100755
--- a/autotest/gdrivers/rpftoc.py
+++ b/autotest/gdrivers/rpftoc.py
@@ -72,8 +72,6 @@ def test_rpftoc_3():
     assert 'FILENAME_0' in md and not (md['FILENAME_0'] != 'data/RPFTOC01.ON2' and md['FILENAME_0'] != 'data\\RPFTOC01.ON2'), \
         'missing SUBDATASET_1_NAME metadata'
 
-    return 'success'
-
 ###############################################################################
 # Add an overview
 
@@ -105,8 +103,6 @@ def test_rpftoc_4():
     os.unlink('tmp/A.TOC.1.ovr')
     os.unlink('tmp/RPFTOC01.ON2')
 
-    return 'success'
-
 
 gdaltest_list = [
     test_rpftoc_1,
diff --git a/autotest/gdrivers/rraster.py b/autotest/gdrivers/rraster.py
index fd02ee6fae08..25a423a8ea72 100755
--- a/autotest/gdrivers/rraster.py
+++ b/autotest/gdrivers/rraster.py
@@ -56,7 +56,6 @@ def test_rraster_1(filename='data/byte_rraster.grd', check_prj=None):
     md = ds.GetMetadata()
     assert md == {'CREATOR': "R package 'raster'", 'CREATED': '2016-06-25 17:32:47'}
     assert ds.GetRasterBand(1).GetDescription() == 'byte'
-    return 'success'
 
 ###############################################################################
 
@@ -140,8 +139,6 @@ def test_rraster_rgba(filename='data/rgba_rraster.grd'):
     }
     assert _is_dict_included_in_dict(info, expected_info)
 
-    return 'success'
-
 ###############################################################################
 
 
@@ -159,8 +156,7 @@ def test_rraster_rgba_copy():
             print(creationOptions)
             return ret
 
-    return 'success'
-
+    
 ###############################################################################
 
 
@@ -179,8 +175,6 @@ def test_rraster_ct_rgb(filename='data/byte_rraster_ct_rgb.grd'):
     }
     assert _is_dict_included_in_dict(info, expected_info)
 
-    return 'success'
-
 ###############################################################################
 
 
@@ -212,8 +206,6 @@ def test_rraster_ct_rgba(filename='data/byte_rraster_ct_rgba.grd'):
     }
     assert _is_dict_included_in_dict(info, expected_info)
 
-    return 'success'
-
 ###############################################################################
 
 
@@ -305,8 +297,6 @@ def test_rraster_rat(filename='data/byte_rraster_rat.grd'):
     }
     assert _is_dict_included_in_dict(info, expected_info)
 
-    return 'success'
-
 ###############################################################################
 
 
@@ -339,8 +329,6 @@ def test_rraster_signedbyte():
     gdal.GetDriverByName('RRASTER').Delete(filename)
     gdal.GetDriverByName('RRASTER').Delete(filename2)
 
-    return 'success'
-
 ###############################################################################
 
 
@@ -364,8 +352,6 @@ def test_rraster_datatypes():
 
     gdal.GetDriverByName('RRASTER').Delete(filename)
 
-    return 'success'
-
 ###############################################################################
 
 
@@ -386,8 +372,6 @@ def test_rraster_nodata_and_metadata():
 
     gdal.GetDriverByName('RRASTER').Delete(filename)
 
-    return 'success'
-
 ###############################################################################
 
 
@@ -406,8 +390,6 @@ def test_rraster_update():
 
     gdal.GetDriverByName('RRASTER').Delete(filename)
 
-    return 'success'
-
 ###############################################################################
 
 
@@ -429,8 +411,6 @@ def test_rraster_colorinterpretation():
 
     gdal.GetDriverByName('RRASTER').Delete(filename)
 
-    return 'success'
-
 
 gdaltest_list = [
     test_rraster_1,
diff --git a/autotest/gdrivers/rs2.py b/autotest/gdrivers/rs2.py
index d6c8db58819f..9636b3cfc717 100755
--- a/autotest/gdrivers/rs2.py
+++ b/autotest/gdrivers/rs2.py
@@ -72,7 +72,6 @@ def test_rs2_3():
                     'SAMP_OFF': 'pixelOffset',
                     'SAMP_SCALE': 'pixelScale'}
     assert got_rpc == expected_rpc
-    return 'success'
 
 
 gdaltest_list = [
diff --git a/autotest/gdrivers/saga.py b/autotest/gdrivers/saga.py
index 54de12aad16a..7ddfa4449bbc 100755
--- a/autotest/gdrivers/saga.py
+++ b/autotest/gdrivers/saga.py
@@ -97,8 +97,7 @@ def test_saga_4():
             check_minmax = 1
         ret = tst.testCreateCopy(new_filename='tmp/test4.sdat', check_minmax=check_minmax)
 
-    return 'success'
-
+    
 ###############################################################################
 # Test Create() for various data types
 
@@ -121,8 +120,7 @@ def test_saga_5():
             check_minmax = 1
         ret = tst.testCreate(new_filename='tmp/test5.sdat', out_bands=1, check_minmax=check_minmax)
 
-    return 'success'
-
+    
 ###############################################################################
 # Test creating empty datasets and check that nodata values are properly written
 
@@ -164,8 +162,7 @@ def test_saga_6():
     except OSError:
         pass
 
-    return 'success'
-
+    
 ###############################################################################
 # Test /vsimem
 
diff --git a/autotest/gdrivers/sdts.py b/autotest/gdrivers/sdts.py
index 8ab0195b5595..920ee0efa492 100755
--- a/autotest/gdrivers/sdts.py
+++ b/autotest/gdrivers/sdts.py
@@ -55,8 +55,6 @@ def test_sdts_1():
 
     assert md['TITLE'] == 'ALANSON, MI-24000'
 
-    return 'success'
-
 
 gdaltest_list = [test_sdts_1]
 
diff --git a/autotest/gdrivers/sentinel2.py b/autotest/gdrivers/sentinel2.py
index aea7bf85fdc4..cb44f84ebf6b 100755
--- a/autotest/gdrivers/sentinel2.py
+++ b/autotest/gdrivers/sentinel2.py
@@ -125,8 +125,7 @@ def test_sentinel2_l1c_1():
             ds = gdal.Open(name)
         assert ds is None, name
 
-    return 'success'
-
+    
 ###############################################################################
 # Test opening a L1C subdataset on the 10m bands
 
@@ -236,8 +235,7 @@ def test_sentinel2_l1c_2():
         pprint.pprint(got_md)
         pytest.fail()
 
-    return 'success'
-
+    
 ###############################################################################
 # Test opening a L1C subdataset on the 60m bands and enabling alpha band
 
@@ -260,8 +258,6 @@ def test_sentinel2_l1c_3():
 
     band.ReadRaster()
 
-    return 'success'
-
 ###############################################################################
 # Test opening a L1C subdataset on the PREVIEW bands
 
@@ -286,8 +282,6 @@ def test_sentinel2_l1c_4():
 
     assert band.DataType == gdal.GDT_Byte
 
-    return 'success'
-
 ###############################################################################
 # Test opening invalid XML files
 
@@ -459,8 +453,6 @@ def test_sentinel2_l1c_5():
 
     gdal.Unlink('/vsimem/test.xml')
 
-    return 'success'
-
 ###############################################################################
 # Windows specific test to test support for long filenames
 
@@ -482,8 +474,6 @@ def test_sentinel2_l1c_6():
     ds = gdal.Open(subds_name)
     assert ds is not None and gdal.GetLastErrorMsg() == ''
 
-    return 'success'
-
 ###############################################################################
 # Test with a real JP2 tile
 
@@ -554,8 +544,6 @@ def test_sentinel2_l1c_7():
     gdal.Unlink('/vsimem/test.xml')
     gdal.Unlink('/vsimem/GRANULE/S2A_OPER_MSI_L1C_bla_N01.03/IMG_DATA/S2A_OPER_MSI_L1C_bla_B01.jp2')
 
-    return 'success'
-
 ###############################################################################
 # Test opening a L1C tile
 
@@ -634,8 +622,7 @@ def test_sentinel2_l1c_tile_1():
             ds = gdal.Open(name)
         assert ds is None, name
 
-    return 'success'
-
+    
 ###############################################################################
 # Test opening a L1C tile without main MTD file
 
@@ -675,8 +662,7 @@ def test_sentinel2_l1c_tile_2():
         pprint.pprint(got_md)
         pytest.fail()
 
-    return 'success'
-
+    
 ###############################################################################
 # Test opening a L1C tile subdataset on the 10m bands
 
@@ -783,8 +769,7 @@ def test_sentinel2_l1c_tile_3():
         pprint.pprint(got_md)
         pytest.fail()
 
-    return 'success'
-
+    
 ###############################################################################
 # Test opening a L1C tile subdataset on the 10m bands without main MTD file
 
@@ -853,8 +838,6 @@ def test_sentinel2_l1c_tile_4():
 
     assert band.GetColorInterpretation() == gdal.GCI_AlphaBand
 
-    return 'success'
-
 ###############################################################################
 # Test opening a L1C tile subdataset on the preview bands
 
@@ -885,8 +868,6 @@ def test_sentinel2_l1c_tile_5():
     </SimpleSource>"""
     assert vrt.find(placement_vrt) >= 0
 
-    return 'success'
-
 ###############################################################################
 # Test opening invalid XML files
 
@@ -941,8 +922,6 @@ def test_sentinel2_l1c_tile_6():
     gdal.Unlink('/vsimem/test.xml')
     gdal.Unlink('/vsimem/S2A_OPER_MSI_L1C_bla_N01.03/S2A_OPER_MTD_L1C_bla.xml')
 
-    return 'success'
-
 ###############################################################################
 # Test opening a L1B product
 
@@ -1014,8 +993,7 @@ def test_sentinel2_l1b_1():
             ds = gdal.Open(name)
         assert ds is None, name
 
-    return 'success'
-
+    
 ###############################################################################
 # Test opening a L1B granule
 
@@ -1093,8 +1071,7 @@ def test_sentinel2_l1b_2():
         pprint.pprint(got_md)
         pytest.fail()
 
-    return 'success'
-
+    
 ###############################################################################
 # Test opening a L1B subdataset
 
@@ -1212,8 +1189,6 @@ def test_sentinel2_l1b_3():
 
     assert band.GetMetadataItem('NBITS', 'IMAGE_STRUCTURE') == '12'
 
-    return 'success'
-
 ###############################################################################
 # Test opening a L1B granule (with missing tile, without any ../../main_mtd.xml)
 
@@ -1317,8 +1292,6 @@ def test_sentinel2_l1b_4():
     gdal.Unlink('/vsimem/foo/GRANULE/S2B_OPER_MTD_L1B_N01.03/S2B_OPER_MTD_L1B.xml')
     gdal.Unlink('/vsimem/foo/GRANULE/S2B_OPER_MTD_L1B_N01.03/IMG_DATA/S2B_OPER_MSI_L1B_B01.jp2')
 
-    return 'success'
-
 ###############################################################################
 # Test opening invalid XML files
 
@@ -1488,8 +1461,6 @@ def test_sentinel2_l1b_5():
 
     gdal.Unlink('/vsimem/test.xml')
 
-    return 'success'
-
 ###############################################################################
 # Test opening a L2A product
 
@@ -1588,8 +1559,7 @@ def test_sentinel2_l2a_1():
             ds = gdal.Open(name)
         assert ds is None, name
 
-    return 'success'
-
+    
 ###############################################################################
 # Test opening a L21 subdataset on the 60m bands
 
@@ -1728,8 +1698,7 @@ def test_sentinel2_l2a_2():
         pprint.pprint(got_categories)
         pytest.fail()
 
-    return 'success'
-
+    
 ###############################################################################
 # Test opening invalid XML files
 
@@ -1800,8 +1769,6 @@ def test_sentinel2_l2a_3():
 
     gdal.Unlink('/vsimem/test.xml')
 
-    return 'success'
-
 ###############################################################################
 # Test opening a L2A MSIL2A product
 
@@ -1912,8 +1879,7 @@ def test_sentinel2_l2a_4():
             ds = gdal.Open(name)
         assert ds is None, name
 
-    return 'success'
-
+    
 
 ###############################################################################
 # Test opening a L2A MSIL2A subdataset on the 60m bands
@@ -2017,8 +1983,6 @@ def test_sentinel2_l2a_5():
 
     assert band.DataType == gdal.GDT_UInt16
 
-    return 'success'
-
 ###############################################################################
 # Test opening a L2A MSIL2Ap product
 
@@ -2134,8 +2098,7 @@ def test_sentinel2_l2a_6():
             ds = gdal.Open(name)
         assert ds is None, name
 
-    return 'success'
-
+    
 
 ###############################################################################
 # Test opening a L2A MSIL2Ap subdataset on the 60m bands
@@ -2244,8 +2207,6 @@ def test_sentinel2_l2a_7():
 
     assert band.DataType == gdal.GDT_UInt16
 
-    return 'success'
-
 
 ###############################################################################
 # Test opening a L1C Safe Compact product
@@ -2335,8 +2296,7 @@ def test_sentinel2_l1c_safe_compact_1():
             assert ds is not None
             os.unlink('tmp/S2A_MSIL1C_test.zip')
 
-    return 'success'
-
+    
 ###############################################################################
 # Test opening a L1C Safe Compact subdataset on the 10m bands
 
@@ -2440,8 +2400,7 @@ def test_sentinel2_l1c_safe_compact_2():
         pprint.pprint(got_md)
         pytest.fail()
 
-    return 'success'
-
+    
 ###############################################################################
 # Test opening a L1C subdataset on the TCI bands
 
@@ -2466,8 +2425,6 @@ def test_sentinel2_l1c_safe_compact_3():
 
     assert band.DataType == gdal.GDT_Byte
 
-    return 'success'
-
 
 gdaltest_list = [
     test_sentinel2_l1c_1,
diff --git a/autotest/gdrivers/srp.py b/autotest/gdrivers/srp.py
index f9db3cf1a8bd..a390666e29b0 100755
--- a/autotest/gdrivers/srp.py
+++ b/autotest/gdrivers/srp.py
@@ -73,8 +73,7 @@ def test_srp_1(filename='USRP_PCB0/FKUSRP01.IMG'):
         (key, value) = md.split('=')
         assert key in got_md and got_md[key] == value, ('did not find %s' % md)
 
-    return 'success'
-
+    
 ###############################################################################
 # Read USRP dataset with PCB=4
 
@@ -124,8 +123,7 @@ def test_srp_5():
         (key, value) = md.split('=')
         assert key in got_md and got_md[key] == value, ('did not find %s' % md)
 
-    return 'success'
-
+    
 ###############################################################################
 # Read with subdataset syntax
 
@@ -143,7 +141,6 @@ def test_srp_cleanup():
 
     # FIXME ?
     os.unlink('data/USRP_PCB0/TRANSH01.THF.aux.xml')
-    return 'success'
 
 ###############################################################################
 
diff --git a/autotest/gdrivers/srtmhgt.py b/autotest/gdrivers/srtmhgt.py
index 7e3f017547a6..6f3666f42bad 100755
--- a/autotest/gdrivers/srtmhgt.py
+++ b/autotest/gdrivers/srtmhgt.py
@@ -72,8 +72,6 @@ def test_srtmhgt_1():
 
     assert chksum == 60918, ('Wrong checksum. Checksum found %d' % chksum)
 
-    return 'success'
-
 
 ###############################################################################
 # Test creating an in memory copy.
@@ -99,8 +97,6 @@ def test_srtmhgt_2():
     assert chksum == 60918, ('Wrong checksum. Checksum found %d' % chksum)
     dsDst = None
 
-    return 'success'
-
 ###############################################################################
 # Test reading from a .hgt.zip file
 
@@ -118,8 +114,6 @@ def test_srtmhgt_3():
 
     assert chksum == 60918, ('Wrong checksum. Checksum found %d' % chksum)
 
-    return 'success'
-
 ###############################################################################
 # Test reading from a .SRTMSWBD.raw.zip file (GRASS #3246)
 
@@ -140,8 +134,6 @@ def test_srtmhgt_4():
 
     assert cs == 3636, ('Wrong checksum. Checksum found %d' % cs)
 
-    return 'success'
-
 ###############################################################################
 # Cleanup.
 
@@ -154,8 +146,7 @@ def test_srtmhgt_cleanup():
         os.remove('tmp/n43.dt1.tif')
     except (RuntimeError, OSError):
         pass
-    return 'success'
-
+    
 
 gdaltest_list = [
     test_srtmhgt_1,
diff --git a/autotest/gdrivers/terragen.py b/autotest/gdrivers/terragen.py
index 3ca13b9b81d5..1a623438f0c4 100755
--- a/autotest/gdrivers/terragen.py
+++ b/autotest/gdrivers/terragen.py
@@ -55,7 +55,6 @@ def test_terragen_2():
     ds = None
     gdal.GetDriverByName('TERRAGEN').Delete('/vsimem/out.ter')
     gdal.GetDriverByName('TERRAGEN').Delete('/vsimem/out.tif')
-    return 'success'
 
 
 gdaltest_list = [
diff --git a/autotest/gdrivers/test_validate_jp2.py b/autotest/gdrivers/test_validate_jp2.py
index e0a79bacef14..dbb3f7a0e509 100755
--- a/autotest/gdrivers/test_validate_jp2.py
+++ b/autotest/gdrivers/test_validate_jp2.py
@@ -60,8 +60,6 @@ def test_validate_jp2_1():
     gdaltest.has_validate_jp2_and_build_jp2 = True
     gdaltest.deregister_all_jpeg2000_drivers_but('JP2OpenJPEG')
 
-    return 'success'
-
 ###############################################################################
 
 
@@ -148,8 +146,7 @@ def test_validate_jp2_2():
         pp.pprint(error_report.warning_array)
         pytest.fail('did not get expected errors')
 
-    return 'success'
-
+    
 ###############################################################################
 # Another highly corrupted file
 
@@ -203,8 +200,7 @@ def test_validate_jp2_3():
         pp.pprint(error_report.warning_array)
         pytest.fail('did not get expected errors')
 
-    return 'success'
-
+    
 ###############################################################################
 # Another highly corrupted file
 
@@ -245,8 +241,7 @@ def test_validate_jp2_4():
         pp.pprint(error_report.warning_array)
         pytest.fail('did not get expected errors')
 
-    return 'success'
-
+    
 ###############################################################################
 # Slightly less corrupted file. Test mainly issues with JP2boxes and color table
 # Also a RGN marker
@@ -291,8 +286,7 @@ def test_validate_jp2_5():
         pp.pprint(error_report.warning_array)
         pytest.fail('did not get expected errors')
 
-    return 'success'
-
+    
 ###############################################################################
 # Nominal case with single band data
 
@@ -319,8 +313,7 @@ def test_validate_jp2_6():
         pp.pprint(error_report.warning_array)
         pytest.fail('did not get expected errors')
 
-    return 'success'
-
+    
 ###############################################################################
 # Nominal case with RGBA data
 
@@ -347,8 +340,7 @@ def test_validate_jp2_7():
         pp.pprint(error_report.warning_array)
         pytest.fail('did not get expected errors')
 
-    return 'success'
-
+    
 ###############################################################################
 # Nominal case with color table data
 
@@ -375,8 +367,7 @@ def test_validate_jp2_8():
         pp.pprint(error_report.warning_array)
         pytest.fail('did not get expected errors')
 
-    return 'success'
-
+    
 ###############################################################################
 
 
@@ -385,8 +376,7 @@ def test_validate_jp2_cleanup():
     if gdaltest.has_validate_jp2_and_build_jp2:
         gdaltest.reregister_all_jpeg2000_drivers()
 
-    return 'success'
-
+    
 
 gdaltest_list = [
     test_validate_jp2_1,
diff --git a/autotest/gdrivers/tiff_profile.py b/autotest/gdrivers/tiff_profile.py
index 81f0ffb65ee4..c1e523569cc2 100755
--- a/autotest/gdrivers/tiff_profile.py
+++ b/autotest/gdrivers/tiff_profile.py
@@ -96,8 +96,6 @@ def test_tiff_write_icc():
 
     driver.Delete('tmp/icc_test.tiff')
 
-    return 'success'
-
 ###############################################################################
 # Test writing and reading of ICC profile in CreateCopy()
 
@@ -134,8 +132,6 @@ def test_tiff_copy_icc():
     driver.Delete('tmp/icc_test.tiff')
     driver.Delete('tmp/icc_test2.tiff')
 
-    return 'success'
-
 ###############################################################################
 # Test writing and reading of ICC profile in CreateCopy() options
 
@@ -172,8 +168,6 @@ def test_tiff_copy_options_icc():
     driver.Delete('tmp/icc_test.tiff')
     driver.Delete('tmp/icc_test2.tiff')
 
-    return 'success'
-
 
 def cvtTuple2String(t):
     return str(t).lstrip('([').rstrip(')]')
@@ -257,8 +251,6 @@ def test_tiff_copy_options_colorimetric_data():
     driver.Delete('tmp/icc_test.tiff')
     driver.Delete('tmp/icc_test2.tiff')
 
-    return 'success'
-
 ###############################################################################
 # Test writing and reading of ICC colorimetric data in the file
 
@@ -340,8 +332,6 @@ def test_tiff_copy_colorimetric_data():
     driver.Delete('tmp/icc_test.tiff')
     driver.Delete('tmp/icc_test2.tiff')
 
-    return 'success'
-
 ###############################################################################
 # Test updating ICC profile
 
@@ -377,8 +367,6 @@ def test_tiff_update_icc():
 
     driver.Delete('tmp/icc_test.tiff')
 
-    return 'success'
-
 ###############################################################################
 # Test updating colorimetric options
 
@@ -454,8 +442,6 @@ def test_tiff_update_colorimetric():
 
     driver.Delete('tmp/icc_test.tiff')
 
-    return 'success'
-
 ############################################################################
 
 
diff --git a/autotest/gdrivers/til.py b/autotest/gdrivers/til.py
index 05834d349957..d58baf4023e6 100755
--- a/autotest/gdrivers/til.py
+++ b/autotest/gdrivers/til.py
@@ -75,8 +75,7 @@ def test_til_2():
     except OSError:
         pass
 
-    return 'success'
-
+    
 ###############################################################################
 # Check GetFileList() & XML
 
@@ -107,8 +106,7 @@ def test_til_3():
     except OSError:
         pass
 
-    return 'success'
-
+    
 
 gdaltest_list = [
     test_til_1,
diff --git a/autotest/gdrivers/usgsdem.py b/autotest/gdrivers/usgsdem.py
index 19dab096225c..b3a88fd641be 100755
--- a/autotest/gdrivers/usgsdem.py
+++ b/autotest/gdrivers/usgsdem.py
@@ -116,8 +116,6 @@ def test_usgsdem_5():
 
     ds2 = None
 
-    return 'success'
-
 ###############################################################################
 # Test CreateCopy() without a few creation options. Then create a new copy with TEMPLATE
 # creation option and check that both files are binary identical.
@@ -151,8 +149,6 @@ def test_usgsdem_6():
     f1.close()
     f2.close()
 
-    return 'success'
-
 ###############################################################################
 # Test CreateCopy() with CDED50K profile
 
@@ -184,8 +180,6 @@ def test_usgsdem_7():
 
     ds2 = None
 
-    return 'success'
-
 ###############################################################################
 # Test truncated version of http://download.osgeo.org/gdal/data/usgsdem/various.zip/39109h1.dem
 # Undocumented format
@@ -251,8 +245,7 @@ def test_usgsdem_cleanup():
     except OSError:
         pass
 
-    return 'success'
-
+    
 
 gdaltest_list = [
     test_usgsdem_1,
diff --git a/autotest/gdrivers/vicar.py b/autotest/gdrivers/vicar.py
index 0f6914c41e00..3f490d5cd10d 100755
--- a/autotest/gdrivers/vicar.py
+++ b/autotest/gdrivers/vicar.py
@@ -73,8 +73,7 @@ def test_vicar_1():
     for key in expected_md:
         assert md[key] == expected_md[key]
 
-    return 'success'
-
+    
 
 gdaltest_list = [
     test_vicar_1]
diff --git a/autotest/gdrivers/vrtderived.py b/autotest/gdrivers/vrtderived.py
index ff22238e309c..2cbf0922e7ab 100755
--- a/autotest/gdrivers/vrtderived.py
+++ b/autotest/gdrivers/vrtderived.py
@@ -88,8 +88,6 @@ def test_vrtderived_1():
     node = _xmlsearch(node, gdal.CXT_Text, 'VRTDerivedRasterBand')
     assert node is not None, 'invalid subclass'
 
-    return 'success'
-
 ###############################################################################
 # Verify derived raster band pixel function type
 
@@ -134,8 +132,6 @@ def test_vrtderived_2():
     pixelfunctionlanguage = _xmlsearch(pixelfunctionlanguage, gdal.CXT_Text, 'Python')
     assert pixelfunctionlanguage is not None, 'incorrect PixelFunctionLanguage value'
 
-    return 'success'
-
 ###############################################################################
 # Verify derived raster band transfer type
 
@@ -171,8 +167,6 @@ def test_vrtderived_3():
     node = _xmlsearch(node, gdal.CXT_Text, 'Byte')
     assert node is not None, 'incorrect SourceTransferType value'
 
-    return 'success'
-
 ###############################################################################
 # Check handling of invalid derived raster band transfer type
 
@@ -191,8 +185,6 @@ def test_vrtderived_4():
     gdal.PopErrorHandler()
     assert ret != 0, 'invalid SourceTransferType value not detected'
 
-    return 'success'
-
 ###############################################################################
 # Check Python derived function with BufferRadius=1
 
@@ -211,8 +203,6 @@ def test_vrtderived_5():
     gdal.SetConfigOption('GDAL_VRT_ENABLE_PYTHON', None)
     assert cs == 50577, 'invalid checksum'
 
-    return 'success'
-
 ###############################################################################
 # Check Python derived function with BufferRadius=0 and no source
 
@@ -231,8 +221,6 @@ def test_vrtderived_6():
     gdal.SetConfigOption('GDAL_VRT_ENABLE_PYTHON', None)
     assert cs == 10000, 'invalid checksum'
 
-    return 'success'
-
 ###############################################################################
 # Check Python derived function with no started Python interpreter
 
@@ -287,8 +275,7 @@ def test_vrtderived_7():
             print(err)
         assert ret.find('Checksum=0') >= 0, err
 
-    return 'success'
-
+    
 ###############################################################################
 # Check that GDAL_VRT_ENABLE_PYTHON=NO or undefined is honored
 
@@ -313,8 +300,6 @@ def test_vrtderived_8():
         cs = ds.GetRasterBand(1).Checksum()
     assert cs == 0, 'invalid checksum'
 
-    return 'success'
-
 ###############################################################################
 # Check various failure modes with Python functions
 
@@ -539,8 +524,7 @@ def identity(in_ar, out_ar, xoff, yoff, xsize, ysize, raster_xsize, raster_ysize
         print(gdal.GetLastErrorMsg())
         pytest.fail('invalid checksum')
 
-    return 'success'
-
+    
 
 def vrtderived_code_that_only_makes_sense_with_GDAL_VRT_ENABLE_PYTHON_equal_IF_SAFE_but_that_is_now_disabled():
 
@@ -596,8 +580,7 @@ def my_func(in_ar, out_ar, xoff, yoff, xsize, ysize, raster_xsize, raster_ysize,
         print(gdal.GetLastErrorMsg())
         pytest.fail('invalid checksum')
 
-    return 'success'
-
+    
 ###############################################################################
 # Check Python function in another module
 
@@ -669,8 +652,7 @@ def test_vrtderived_10():
             print(gdal.GetLastErrorMsg())
             pytest.fail('invalid checksum')
 
-    return 'success'
-
+    
 ###############################################################################
 # Test serializing with python code
 
@@ -699,8 +681,6 @@ def test_vrtderived_11():
 
     assert cs == 50577, 'invalid checksum'
 
-    return 'success'
-
 ###############################################################################
 # Test all data types with python code
 
@@ -758,8 +738,7 @@ def test_vrtderived_12():
             print(gdal.GetLastErrorMsg())
             pytest.fail('invalid checksum')
 
-    return 'success'
-
+    
 ###############################################################################
 # Test translating a Python derived VRT
 
@@ -782,8 +761,6 @@ def test_vrtderived_13():
 
     assert cs == 10000, 'invalid checksum'
 
-    return 'success'
-
 ###############################################################################
 # Test statistics functions
 
@@ -813,8 +790,6 @@ def test_vrtderived_14():
     ds = None
     gdal.GetDriverByName('VRT').Delete('/vsimem/vrtderived_14.vrt')
 
-    return 'success'
-
 ###############################################################################
 # Test threading
 
@@ -876,8 +851,7 @@ def test_vrtderived_cleanup():
         os.remove('tmp/derived.vrt')
     except OSError:
         pass
-    return 'success'
-
+    
 
 gdaltest_list = [
     test_vrtderived_1,
diff --git a/autotest/gdrivers/vrtfilt.py b/autotest/gdrivers/vrtfilt.py
index 72ceda4f7288..a497c44f99cd 100755
--- a/autotest/gdrivers/vrtfilt.py
+++ b/autotest/gdrivers/vrtfilt.py
@@ -90,8 +90,6 @@ def test_vrtfilt_3():
     vrt_ds.GetRasterBand(1).SetMetadataItem('source_0', filterSourceXML, 'vrt_sources')
     assert vrt_ds.GetRasterBand(1).Checksum() == 21890
 
-    return 'success'
-
 ###############################################################################
 # Variant for SetMetadataItem('source_0', xml, 'vrt_sources')
 
@@ -119,8 +117,6 @@ def test_vrtfilt_4():
     vrt_ds.GetRasterBand(1).SetMetadataItem('source_0', filterSourceXML, 'new_vrt_sources')
     assert vrt_ds.GetRasterBand(1).Checksum() == 21890
 
-    return 'success'
-
 ###############################################################################
 # Variant for SetMetadata(md, 'vrt_sources')
 
@@ -146,8 +142,6 @@ def test_vrtfilt_5():
     vrt_ds.GetRasterBand(1).SetMetadata(md, 'vrt_sources')
     assert vrt_ds.GetRasterBand(1).Checksum() == 21890
 
-    return 'success'
-
 ###############################################################################
 # Verify separable Gaussian blur filter.
 
@@ -162,8 +156,7 @@ def test_vrtfilt_6():
 
 
 def test_vrtfilt_cleanup():
-    return 'success'
-
+    pass
 
 gdaltest_list = [
     test_vrtfilt_1,
diff --git a/autotest/gdrivers/vrtlut.py b/autotest/gdrivers/vrtlut.py
index 269505fa6524..e0aa1590e261 100755
--- a/autotest/gdrivers/vrtlut.py
+++ b/autotest/gdrivers/vrtlut.py
@@ -47,8 +47,7 @@ def test_vrtlut_1():
 # Cleanup.
 
 def test_vrtlut_cleanup():
-    return 'success'
-
+    pass
 
 gdaltest_list = [
     test_vrtlut_1,
diff --git a/autotest/gdrivers/vrtmask.py b/autotest/gdrivers/vrtmask.py
index 5115d0ce7947..7f0eda5fdef0 100755
--- a/autotest/gdrivers/vrtmask.py
+++ b/autotest/gdrivers/vrtmask.py
@@ -76,8 +76,6 @@ def test_vrtmask_1():
 
     ds = None
 
-    return 'success'
-
 
 ###############################################################################
 # Test with a per band mask band
@@ -116,8 +114,6 @@ def test_vrtmask_2():
 
     ds = None
 
-    return 'success'
-
 ###############################################################################
 # Translate a RGB dataset with a mask into a VRT
 
@@ -147,8 +143,6 @@ def test_vrtmask_3():
 
     assert msk_cs == expected_msk_cs, 'did not get expected mask band checksum'
 
-    return 'success'
-
 ###############################################################################
 # Same with gdalbuildvrt
 
@@ -177,8 +171,6 @@ def test_vrtmask_4():
 
     assert msk_cs == expected_msk_cs, 'did not get expected mask band checksum'
 
-    return 'success'
-
 ###############################################################################
 # Same with gdal_translate
 
@@ -204,8 +196,6 @@ def test_vrtmask_5():
 
     assert msk_cs == expected_msk_cs, 'did not get expected mask band checksum'
 
-    return 'success'
-
 ###############################################################################
 # Same with gdal_translate with explicit -b and -mask arguments
 
@@ -232,8 +222,6 @@ def test_vrtmask_6():
 
     assert msk_cs == expected_msk_cs, 'did not get expected mask band checksum'
 
-    return 'success'
-
 ###############################################################################
 # gdal_translate with RGBmask -> RGBA and then RGBA->RGBmask
 
@@ -280,8 +268,6 @@ def test_vrtmask_7():
 
     assert msk_cs == expected_msk_cs, 'did not get expected mask band checksum'
 
-    return 'success'
-
 ###############################################################################
 # gdal_translate with RGBmask -> RGB
 
@@ -304,8 +290,6 @@ def test_vrtmask_8():
 
     assert flags == gdal.GMF_ALL_VALID
 
-    return 'success'
-
 ###############################################################################
 # gdal_translate with RGBA -> RGB
 
@@ -330,8 +314,6 @@ def test_vrtmask_9():
 
     assert flags == gdal.GMF_ALL_VALID
 
-    return 'success'
-
 ###############################################################################
 # Test fix for #5120 (VRTSourcedRasterBand::AddMaskBandSource() ignores specified window)
 
@@ -357,8 +339,6 @@ def test_vrtmask_10():
 
     assert cs_ref == cs_got
 
-    return 'success'
-
 ###############################################################################
 
 
@@ -389,15 +369,12 @@ def test_vrtmask_11():
     ret = ds.GetRasterBand(1).CreateMaskBand(gdal.GMF_PER_DATASET)
     assert ret == 0
 
-    return 'success'
-
 ###############################################################################
 # Cleanup.
 
 
 def test_vrtmask_cleanup():
-    return 'success'
-
+    pass
 
 gdaltest_list = [
     test_vrtmask_1,
diff --git a/autotest/gdrivers/vrtovr.py b/autotest/gdrivers/vrtovr.py
index cf2a11d5f804..9ecb339490a1 100755
--- a/autotest/gdrivers/vrtovr.py
+++ b/autotest/gdrivers/vrtovr.py
@@ -69,8 +69,6 @@ def test_vrtovr_1():
 
     ds = None
 
-    return 'success'
-
 ###############################################################################
 # Test serialization
 
@@ -113,8 +111,6 @@ def test_vrtovr_2():
 
     gdal.Unlink("/vsimem/vrtovr_2.vrt")
 
-    return 'success'
-
 ###############################################################################
 #
 
@@ -140,8 +136,6 @@ def test_vrtovr_none():
 
     assert not ds.GetRasterBand(1).GetOverview(0)
 
-    return 'success'
-
 ###############################################################################
 #
 
@@ -176,15 +170,13 @@ def test_vrtovr_errors():
     with gdaltest.error_handler():
         assert not ds.GetRasterBand(1).GetOverview(0)
 
-    return 'success'
-
+    
 
 ###############################################################################
 # Cleanup.
 
 def test_vrtovr_cleanup():
-    return 'success'
-
+    pass
 
 gdaltest_list = [
     test_vrtovr_1,
diff --git a/autotest/gdrivers/vrtpansharpen.py b/autotest/gdrivers/vrtpansharpen.py
index c2aa94eae939..97ad37084038 100755
--- a/autotest/gdrivers/vrtpansharpen.py
+++ b/autotest/gdrivers/vrtpansharpen.py
@@ -826,8 +826,6 @@ def test_vrtpansharpen_1():
     gdal.PopErrorHandler()
     assert ret != 0
 
-    return 'success'
-
 ###############################################################################
 # Nominal cases
 
@@ -1022,8 +1020,6 @@ def test_vrtpansharpen_2():
     cs = [vrt_ds.GetRasterBand(i + 1).Checksum() for i in range(vrt_ds.RasterCount)]
     assert cs in ([50261, 4735, 10000, 9742], [50261, 4727, 9998, 9732])
 
-    return 'success'
-
 ###############################################################################
 # Test with overviews
 
@@ -1091,8 +1087,6 @@ def test_vrtpansharpen_3():
 
     vrt_ds = None
 
-    return 'success'
-
 ###############################################################################
 # Test RasterIO() with various buffer datatypes
 
@@ -1132,8 +1126,7 @@ def test_vrtpansharpen_4():
             expected_cs = [4735, 4731]
         assert cs in expected_cs, gdal.GetDataTypeName(dt)
 
-    return 'success'
-
+    
 ###############################################################################
 # Test RasterIO() with various band datatypes
 
@@ -1208,8 +1201,7 @@ def test_vrtpansharpen_5():
         else:
             assert cs == 4450, gdal.GetDataTypeName(dt)
 
-    return 'success'
-
+    
 ###############################################################################
 # Test BitDepth limitations
 
@@ -1292,8 +1284,7 @@ def test_vrtpansharpen_6():
             gdal.Unlink('/vsimem/ms.tif')
             gdal.Unlink('/vsimem/pan.tif')
 
-    return 'success'
-
+    
 ###############################################################################
 # Test bands with different extents
 
@@ -1432,8 +1423,6 @@ def test_vrtpansharpen_7():
     gdal.GetDriverByName('GTiff').Delete('/vsimem/vrtpansharpen_7_pan.tif')
     gdal.GetDriverByName('GTiff').Delete('/vsimem/vrtpansharpen_7_ms.tif')
 
-    return 'success'
-
 ###############################################################################
 # Test SerializeToXML()
 
@@ -1481,8 +1470,6 @@ def test_vrtpansharpen_8():
 
     assert cs1 == expected_cs1 and cs2 == expected_cs2 and cs3 == expected_cs3
 
-    return 'success'
-
 ###############################################################################
 # Test NoData support
 
@@ -1555,8 +1542,6 @@ def test_vrtpansharpen_9():
     gdal.Unlink('/vsimem/small_world_pan_nodata.tif')
     gdal.Unlink('/vsimem/small_world_nodata.tif')
 
-    return 'success'
-
 ###############################################################################
 # Test UInt16 optimizations
 
@@ -1681,8 +1666,6 @@ def test_vrtpansharpen_10():
     ref_data = tmp_ds.ReadRaster(buf_type=gdal.GDT_UInt16)
     assert data == ref_data
 
-    return 'success'
-
 ###############################################################################
 # Test gdal.CreatePansharpenedVRT()
 
@@ -1782,8 +1765,6 @@ def test_vrtpansharpen_11():
     gdal.PopErrorHandler()
     assert vrt_ds is None
 
-    return 'success'
-
 ###############################################################################
 # Cleanup
 
@@ -1795,8 +1776,6 @@ def test_vrtpansharpen_cleanup():
     gdal.GetDriverByName('GTiff').Delete('/vsimem/pan.tif')
     gdal.GetDriverByName('GTiff').Delete('/vsimem/ms.tif')
 
-    return 'success'
-
 
 gdaltest_list = [
     test_vrtpansharpen_1,
diff --git a/autotest/gdrivers/vrtrawlink.py b/autotest/gdrivers/vrtrawlink.py
index 595a357fa00a..4339e0d30127 100755
--- a/autotest/gdrivers/vrtrawlink.py
+++ b/autotest/gdrivers/vrtrawlink.py
@@ -77,8 +77,6 @@ def test_vrtrawlink_2():
     # Force it to be written to disk.
     ds = None
 
-    return 'success'
-
 ###############################################################################
 # Confirm that the newly written file is was saved properly
 
@@ -94,8 +92,6 @@ def test_vrtrawlink_3():
 
     assert len(filelist) == 2, 'Wrong filelist'
 
-    return 'success'
-
 ###############################################################################
 # Add a new band, and we will test if we can write to it.
 
@@ -149,8 +145,6 @@ def test_vrtrawlink_4():
     statinfo = os.stat('tmp/rawlink.dat')
     assert statinfo.st_size == 3354, 'data file is wrong size'
 
-    return 'success'
-
 ###############################################################################
 # Add a new band, and check the relativeToVRT property.
 
@@ -191,8 +185,6 @@ def test_vrtrawlink_5():
        xmlstring.find('<PixelOffset>3</PixelOffset>') >= 0 and \
        xmlstring.find('<LineOffset>93</LineOffset>') >= 0)
 
-    return 'success'
-
 ###############################################################################
 # Add a new band with relativeToVRT=1, and re-open the dataset.
 
@@ -230,8 +222,6 @@ def test_vrtrawlink_6():
     assert os.path.exists('tmp/rawlink6.dat'), \
         'tha raw file is not in the expected location ("tmp/rawlink6.dat")'
 
-    return 'success'
-
 ###############################################################################
 # Add a new band with relativeToVRT=1, change directory and re-open the dataset.
 
@@ -270,8 +260,7 @@ def test_vrtrawlink_7():
     finally:
         os.chdir('..')
 
-    return 'success'
-
+    
 ###############################################################################
 # Test error case (too much memory allocation)
 
@@ -291,8 +280,7 @@ def test_vrtrawlink_8():
         </VRTDataset>""")
         assert not (ds or gdal.GetLastErrorMsg().find('Image file is too small') < 0)
 
-    return 'success'
-
+    
 ###############################################################################
 # Test error case (inexisting file)
 
@@ -307,8 +295,6 @@ def test_vrtrawlink_9():
     </VRTDataset>""")
     assert not (ds or gdal.GetLastErrorMsg().find('Unable to open') < 0)
 
-    return 'success'
-
 ###############################################################################
 # Test error case (invalid byte order)
 
@@ -324,8 +310,6 @@ def test_vrtrawlink_10():
     </VRTDataset>""")
     assert not (ds or gdal.GetLastErrorMsg().find('ByteOrder') < 0)
 
-    return 'success'
-
 ###############################################################################
 # Cleanup.
 
@@ -341,8 +325,7 @@ def test_vrtrawlink_cleanup():
         os.remove('tmp/rawlink7.dat')
     except OSError:
         pass
-    return 'success'
-
+    
 
 gdaltest_list = [
     test_vrtrawlink_1,
diff --git a/autotest/gdrivers/vrtwarp.py b/autotest/gdrivers/vrtwarp.py
index 67fe4641aa3d..89dfaa522c8d 100755
--- a/autotest/gdrivers/vrtwarp.py
+++ b/autotest/gdrivers/vrtwarp.py
@@ -68,8 +68,6 @@ def test_vrtwarp_2():
     assert checksum == expected, ('Got checksum of %d instead of expected %d.'
                              % (checksum, expected))
 
-    return 'success'
-
 ###############################################################################
 # Force the VRT warp file to be written to disk and close it.  Reopen, and
 # verify checksum.
@@ -91,8 +89,6 @@ def test_vrtwarp_3():
     assert checksum == expected, ('Got checksum of %d instead of expected %d.'
                              % (checksum, expected))
 
-    return 'success'
-
 ###############################################################################
 # Test implicit overviews with default source overview level strategy (AUTO)
 
@@ -148,8 +144,6 @@ def test_vrtwarp_4():
     gdal.Unlink('tmp/vrtwarp_4.vrt')
     gdal.Unlink('tmp/vrtwarp_4.tif')
 
-    return 'success'
-
 ###############################################################################
 # Test implicit overviews with selection of the upper source overview level
 
@@ -187,8 +181,6 @@ def test_vrtwarp_5():
 
     gdal.Unlink('tmp/vrtwarp_5.tif')
 
-    return 'success'
-
 ###############################################################################
 # Test implicit overviews with GCP
 
@@ -235,8 +227,6 @@ def test_vrtwarp_6():
     gdal.Unlink('tmp/vrtwarp_6.vrt')
     gdal.Unlink('tmp/vrtwarp_6.tif')
 
-    return 'success'
-
 ###############################################################################
 # Test implicit overviews with GCP (TPS)
 
@@ -279,8 +269,6 @@ def test_vrtwarp_7():
     gdal.Unlink('tmp/vrtwarp_7.vrt')
     gdal.Unlink('tmp/vrtwarp_7.tif')
 
-    return 'success'
-
 ###############################################################################
 # Test implicit overviews with RPC
 
@@ -309,8 +297,6 @@ def test_vrtwarp_8():
     gdal.Unlink('tmp/vrtwarp_8.tif')
     gdal.Unlink('tmp/vrtwarp_8_rpc.txt')
 
-    return 'success'
-
 ###############################################################################
 # Test implicit overviews with GEOLOCATION
 
@@ -366,8 +352,6 @@ def test_vrtwarp_9():
     gdal.Unlink('tmp/sstgeo.vrt.ovr')
     gdal.Unlink('tmp/sstgeo.tif')
 
-    return 'success'
-
 ###############################################################################
 # Test implicit overviews with selection of the full resolution level
 
@@ -404,8 +388,6 @@ def test_vrtwarp_10():
 
     gdal.Unlink('tmp/vrtwarp_10.tif')
 
-    return 'success'
-
 ###############################################################################
 # Test implicit overviews with dest alpha band (#6081)
 
@@ -420,8 +402,6 @@ def test_vrtwarp_11():
 
     assert cs1 == 22122 and cs2 == 56685 and cs3 == 22122
 
-    return 'success'
-
 ###############################################################################
 # Test reading a regular VRT whose source is a warped VRT inlined
 
@@ -432,8 +412,6 @@ def test_vrtwarp_read_vrt_of_warped_vrt():
     cs = ds.GetRasterBand(1).Checksum()
     assert cs == 4672
 
-    return 'success'
-
 ###############################################################################
 # Test different nodata values on bands and partial blocks (#6581)
 
diff --git a/autotest/gdrivers/wcs.py b/autotest/gdrivers/wcs.py
index 903dd299929e..1d3500cf7b5d 100755
--- a/autotest/gdrivers/wcs.py
+++ b/autotest/gdrivers/wcs.py
@@ -67,8 +67,7 @@ def test_wcs_1():
     gdaltest.wcs_ds = None
     if gdaltest.wcs_drv is None:
         pytest.skip()
-    return 'success'
-
+    
 ###############################################################################
 # Open the GeoServer WCS service.
 
@@ -85,7 +84,7 @@ def wcs_2():
     gdaltest.wcs_ds = gdal.Open('tmp/geoserver.wcs')
 
     if gdaltest.wcs_ds is not None:
-        return 'success'
+        return
     pytest.fail('open failed.')
 
 ###############################################################################
@@ -113,8 +112,6 @@ def test_wcs_3():
     assert gdaltest.wcs_ds.GetRasterBand(1).DataType == gdal.GDT_Byte, \
         'wrong band data type'
 
-    return 'success'
-
 ###############################################################################
 # Check checksum
 
@@ -127,8 +124,6 @@ def test_wcs_4():
     cs = gdaltest.wcs_ds.GetRasterBand(1).Checksum()
     assert cs == 58765, ('Wrong checksum: ' + str(cs))
 
-    return 'success'
-
 ###############################################################################
 # Open the service using XML as filename.
 
@@ -152,8 +147,6 @@ def wcs_5():
         'wrong size or bands'
 
     ds = None
-
-    return 'success'
 ###############################################################################
 # Open the srtm plus service.
 
@@ -170,7 +163,7 @@ def old_wcs_2():
     gdaltest.wcs_ds = gdal.Open('tmp/srtmplus.wcs')
 
     if gdaltest.wcs_ds is not None:
-        return 'success'
+        return
     pytest.fail('open failed.')
 
 ###############################################################################
@@ -197,8 +190,6 @@ def old_wcs_3():
     assert gdaltest.wcs_ds.GetRasterBand(1).DataType >= gdal.GDT_Int16, \
         'wrong band data type'
 
-    return 'success'
-
 ###############################################################################
 # Check checksum for a small region.
 
@@ -211,8 +202,6 @@ def old_wcs_4():
     cs = gdaltest.wcs_ds.GetRasterBand(1).Checksum(0, 0, 100, 100)
     assert cs == 10469, ('Wrong checksum: ' + str(cs))
 
-    return 'success'
-
 ###############################################################################
 # Open the srtm plus service using XML as filename.
 
@@ -233,8 +222,6 @@ def old_wcs_5():
 
     ds = None
 
-    return 'success'
-
 ###############################################################################
 
 # utilities
@@ -518,7 +505,7 @@ def test_wcs_6():
                 print(server + ' ' + version + ' non_scaled skipped (no response file)')
     webserver.server_stop(process, port)
 
-    return 'success' if wcs_6_ok else 'fail'
+    assert wcs_6_ok
 
 ###############################################################################
 
@@ -545,8 +532,7 @@ def test_wcs_cleanup():
     except OSError:
         pass
 
-    return 'success'
-
+    
 
 gdaltest_list = [
     test_wcs_1,
diff --git a/autotest/gdrivers/webp.py b/autotest/gdrivers/webp.py
index e12ee743cdab..ac7068e2a365 100755
--- a/autotest/gdrivers/webp.py
+++ b/autotest/gdrivers/webp.py
@@ -46,8 +46,7 @@ def test_webp_1():
     if gdaltest.webp_drv is None:
         pytest.skip()
 
-    return 'success'
-
+    
 ###############################################################################
 # Open() test
 
@@ -62,8 +61,6 @@ def test_webp_2():
     assert cs == 21464 or cs == 21450 or cs == 21459, \
         'did not get expected checksum on band 1'
 
-    return 'success'
-
 ###############################################################################
 # CreateCopy() test
 
@@ -85,8 +82,6 @@ def test_webp_3():
     assert cs1 == 21464 or cs1 == 21502 or cs1 == 21695 or cs1 == 21700, \
         'did not get expected checksum on band 1'
 
-    return 'success'
-
 ###############################################################################
 # CreateCopy() on RGBA
 
@@ -114,8 +109,6 @@ def test_webp_4():
 
     assert cs4 == 10807, 'did not get expected checksum on band 4'
 
-    return 'success'
-
 ###############################################################################
 # CreateCopy() on RGBA with lossless compression
 
@@ -142,8 +135,6 @@ def test_webp_5():
 
     assert cs4 == 10807, 'did not get expected checksum on band 4'
 
-    return 'success'
-
 
 gdaltest_list = [
     test_webp_1,
diff --git a/autotest/gdrivers/wms.py b/autotest/gdrivers/wms.py
index b01f9f573d9d..208bccaf1981 100755
--- a/autotest/gdrivers/wms.py
+++ b/autotest/gdrivers/wms.py
@@ -50,8 +50,7 @@ def test_wms_1():
     gdaltest.wms_drv = gdal.GetDriverByName('WMS')
     if gdaltest.wms_drv is None:
         pytest.skip()
-    return 'success'
-
+    
 ###############################################################################
 # Open the WMS dataset
 
@@ -75,7 +74,7 @@ def wms_2():
     gdaltest.wms_ds = gdal.Open('data/pop_wms.xml')
 
     if gdaltest.wms_ds is not None:
-        return 'success'
+        return
     pytest.fail('open failed.')
 
 ###############################################################################
@@ -105,8 +104,6 @@ def wms_3():
     assert gdaltest.wms_ds.GetRasterBand(1).DataType >= gdal.GDT_Byte, \
         'wrong band data type'
 
-    return 'success'
-
 ###############################################################################
 # Check checksum for a small region.
 
@@ -134,8 +131,6 @@ def wms_4():
 
     assert cs == 57182, ('Wrong checksum: ' + str(cs))
 
-    return 'success'
-
 ###############################################################################
 # Open the WMS service using XML as filename.
 
@@ -159,8 +154,6 @@ def test_wms_5():
 
     ds = None
 
-    return 'success'
-
 ###############################################################################
 # Test TileService
 
@@ -184,8 +177,6 @@ def test_wms_6():
 
     ds = None
 
-    return 'success'
-
 ###############################################################################
 # Test TMS
 
@@ -235,8 +226,6 @@ def test_wms_7():
 
     ds = None
 
-    return 'success'
-
 
 ###############################################################################
 # Test TMS with cache
@@ -451,8 +440,7 @@ def test_wms_8():
     for expected_file in expected_files:
         assert os.path.getmtime(expected_file) > mod_time
 
-    return 'success'
-
+    
 ###############################################################################
 # Test OnEarth Tiled WMS minidriver
 
@@ -485,8 +473,6 @@ def wms_9():
 
     ds = None
 
-    return 'success'
-
 ###############################################################################
 # Test getting subdatasets from GetCapabilities
 
@@ -514,8 +500,6 @@ def wms_10():
 
     ds = None
 
-    return 'success'
-
 ###############################################################################
 # Test getting subdatasets from GetTileService
 
@@ -547,8 +531,6 @@ def test_wms_11():
 
     ds = None
 
-    return 'success'
-
 ###############################################################################
 # Test getting subdatasets from a TMS server
 
@@ -584,8 +566,7 @@ def test_wms_12():
                 pytest.fail('open of %s failed.' % name)
             ds = None
 
-    return 'success'
-
+    
 ###############################################################################
 # Test reading WMS through VRT (test effect of r21866)
 
@@ -603,8 +584,6 @@ def test_wms_13():
         pytest.fail()
     ds = None
 
-    return 'success'
-
 
 ###############################################################################
 # Test reading Virtual Earth layer
@@ -639,8 +618,7 @@ def test_wms_14():
         print("(%d, %d)" % (block_xsize, block_ysize))
         pytest.fail('bad block size')
 
-    return 'success'
-
+    
 ###############################################################################
 # Test reading ArcGIS MapServer JSon definition and CreateCopy()
 
@@ -681,8 +659,6 @@ def test_wms_15():
     ds = None
     gdal.Unlink("/vsimem/wms.xml")
 
-    return 'success'
-
 ###############################################################################
 # Test getting subdatasets from WMS-C Capabilities
 
@@ -760,8 +736,6 @@ def test_wms_16():
 
     ds = None
 
-    return 'success'
-
 ###############################################################################
 # Test a TiledWMS dataset with a color table (#4613)
 
@@ -784,8 +758,6 @@ def wms_17():
 
     ds = None
 
-    return 'success'
-
 ###############################################################################
 # Test a ArcGIS Server
 
@@ -819,8 +791,6 @@ def test_wms_18():
 
     ds = None
 
-    return 'success'
-
 ###############################################################################
 # Test a IIP server
 
@@ -845,8 +815,6 @@ def test_wms_19():
     assert cs != 0, 'Did not get expected checksum.'
 
     ds = None
-
-    return 'success'
 ###############################################################################
 
 
@@ -860,8 +828,7 @@ def test_wms_cleanup():
     except OSError:
         pass
 
-    return 'success'
-
+    
 
 gdaltest_list = [
     test_wms_1,
diff --git a/autotest/gdrivers/wmts.py b/autotest/gdrivers/wmts.py
index c6b2897738f0..307dd7a86a7f 100755
--- a/autotest/gdrivers/wmts.py
+++ b/autotest/gdrivers/wmts.py
@@ -55,7 +55,7 @@ def test_wmts_1():
         gdal.SetConfigOption('CPL_CURL_ENABLE_VSIMEM', 'YES')
         gdal.SetConfigOption('GDAL_DEFAULT_WMS_CACHE_PATH', '/vsimem/cache')
 
-        return 'success'
+        return
     pytest.skip()
 
 ###############################################################################
@@ -87,8 +87,6 @@ def test_wmts_2():
     gdal.PopErrorHandler()
     assert ds is None
 
-    return 'success'
-
 ###############################################################################
 # Error: invalid URL
 
@@ -103,8 +101,6 @@ def test_wmts_3():
     gdal.PopErrorHandler()
     assert ds is None
 
-    return 'success'
-
 ###############################################################################
 # Error: invalid URL
 
@@ -119,8 +115,6 @@ def test_wmts_4():
     gdal.PopErrorHandler()
     assert ds is None
 
-    return 'success'
-
 ###############################################################################
 # Error: invalid XML in GetCapabilities response
 
@@ -137,8 +131,6 @@ def test_wmts_5():
     gdal.PopErrorHandler()
     assert ds is None
 
-    return 'success'
-
 ###############################################################################
 # Error: invalid content in GetCapabilities response
 
@@ -155,8 +147,6 @@ def test_wmts_6():
     gdal.PopErrorHandler()
     assert ds is None
 
-    return 'success'
-
 ###############################################################################
 # Error: no layers
 
@@ -173,8 +163,6 @@ def test_wmts_7():
     gdal.PopErrorHandler()
     assert ds is None
 
-    return 'success'
-
 ###############################################################################
 # Error: missing TileMatrixSetLink and Style
 
@@ -197,8 +185,6 @@ def test_wmts_8():
     gdal.PopErrorHandler()
     assert ds is None
 
-    return 'success'
-
 ###############################################################################
 # Error: missing TileMatrixSet
 
@@ -228,8 +214,6 @@ def test_wmts_9():
     gdal.PopErrorHandler()
     assert ds is None
 
-    return 'success'
-
 ###############################################################################
 # Error: Missing SupportedCRS
 
@@ -262,8 +246,6 @@ def test_wmts_10():
     gdal.PopErrorHandler()
     assert ds is None
 
-    return 'success'
-
 ###############################################################################
 # Error: Cannot find TileMatrix in TileMatrixSet
 
@@ -297,8 +279,6 @@ def test_wmts_11():
     gdal.PopErrorHandler()
     assert ds is None
 
-    return 'success'
-
 ###############################################################################
 # Error: Missing required element in TileMatrix element
 
@@ -333,8 +313,6 @@ def test_wmts_12():
     gdal.PopErrorHandler()
     assert ds is None
 
-    return 'success'
-
 ###############################################################################
 # Error: Missing ResourceURL
 
@@ -376,8 +354,6 @@ def test_wmts_12bis():
     gdal.PopErrorHandler()
     assert ds is None
 
-    return 'success'
-
 ###############################################################################
 # Minimal
 
@@ -478,8 +454,6 @@ def test_wmts_13():
     ds = None
     wmts_CleanCache()
 
-    return 'success'
-
 ###############################################################################
 # Nominal RESTful
 
@@ -712,8 +686,6 @@ def test_wmts_14():
     assert ds is not None
     assert ds.RasterXSize == 256
 
-    return 'success'
-
 ###############################################################################
 # Nominal KVP
 
@@ -856,8 +828,6 @@ def test_wmts_15():
     ds = None
     wmts_CleanCache()
 
-    return 'success'
-
 ###############################################################################
 # AOI from layer WGS84BoundingBox
 
@@ -932,8 +902,6 @@ def test_wmts_16():
         assert abs(got_gt[i] - expected_gt[i]) <= 1e-8
     assert ds.GetProjectionRef().find('4326') >= 0 and ds.GetProjectionRef().find('AXIS') < 0
 
-    return 'success'
-
 ###############################################################################
 # AOI from layer BoundingBox
 
@@ -1008,8 +976,6 @@ def test_wmts_17():
         assert abs(got_gt[i] - expected_gt[i]) <= 1e-8
     assert ds.GetProjectionRef().find('4326') >= 0 and ds.GetProjectionRef().find('AXIS') < 0
 
-    return 'success'
-
 ###############################################################################
 # AOI from TileMatrixSet BoundingBox
 
@@ -1084,8 +1050,6 @@ def test_wmts_18():
         assert abs(got_gt[i] - expected_gt[i]) <= 1e-8
     assert ds.GetProjectionRef().find('4326') >= 0 and ds.GetProjectionRef().find('AXIS') < 0
 
-    return 'success'
-
 ###############################################################################
 # AOI from TileMatrixSetLimits
 
@@ -1165,8 +1129,6 @@ def test_wmts_19():
         assert abs(got_gt[i] - expected_gt[i]) <= 1e-8
     assert ds.GetProjectionRef().find('4326') >= 0 and ds.GetProjectionRef().find('AXIS') < 0
 
-    return 'success'
-
 ###############################################################################
 # AOI from layer BoundingBox but restricted with TileMatrixSetLimits
 
@@ -1250,8 +1212,6 @@ def test_wmts_20():
         assert abs(got_gt[i] - expected_gt[i]) <= 1e-8
     assert ds.GetProjectionRef().find('4326') >= 0 and ds.GetProjectionRef().find('AXIS') < 0
 
-    return 'success'
-
 ###############################################################################
 # Test ExtendBeyondDateLine
 
@@ -1345,8 +1305,6 @@ def test_wmts_21():
 
     assert ds.GetRasterBand(1).ReadRaster(256, 0, 256, 256) == tmp0_ds.GetRasterBand(1).ReadRaster(0, 0, 256, 256)
 
-    return 'success'
-
 ###############################################################################
 # Test when WGS84BoundingBox is a densified reprojection of the tile matrix bbox
 
@@ -1402,8 +1360,6 @@ def test_wmts_22():
     for i in range(6):
         assert abs(got_gt[i] - expected_gt[i]) <= 1e-8
     assert ds.GetProjectionRef().find('3067') >= 0
-
-    return 'success'
 ###############################################################################
 #
 
@@ -1459,8 +1415,7 @@ def wmts_23(imagetype, expected_cs):
         cs = ds.GetRasterBand(i + 1).Checksum()
         assert cs == expected_cs[i]
 
-    return 'success'
-
+    
 
 def test_wmts_23_gray():
     return wmts_23('gray', [60137, 60137, 60137, 4428])
@@ -1536,8 +1491,6 @@ def test_wmts_invalid_global_to_tm_reprojection():
 
     gdal.Unlink(inputXml)
 
-    return 'success'
-
 ###############################################################################
 #
 
@@ -1805,8 +1758,6 @@ def test_wmts_check_no_overflow_zoom_level():
 
     gdal.Unlink(inputXml)
 
-    return 'success'
-
 
 
 ###############################################################################
@@ -1846,8 +1797,7 @@ def test_wmts_cleanup():
     except OSError:
         pass
 
-    return 'success'
-
+    
 
 gdaltest_list = [
     test_wmts_1,
diff --git a/autotest/gdrivers/xyz.py b/autotest/gdrivers/xyz.py
index aaee59699139..e4547cba98e8 100755
--- a/autotest/gdrivers/xyz.py
+++ b/autotest/gdrivers/xyz.py
@@ -58,7 +58,6 @@ def test_xyz_2():
     ds = None
     gdal.GetDriverByName('XYZ').Delete('tmp/float.xyz')
     assert got_cs == expected_cs or got_cs == 24387
-    return 'success'
 
 ###############################################################################
 # Test random access to lines of imagery
@@ -92,7 +91,6 @@ def test_xyz_3():
     assert struct.unpack('B' * 2, buf) == (69, 70)
     ds = None
     gdal.Unlink('/vsimem/grid.xyz')
-    return 'success'
 
 
 ###############################################################################
@@ -132,7 +130,6 @@ def test_xyz_4():
         assert xyz_4_checkline(ds, i, expected[i])
     ds = None
     gdal.Unlink('/vsimem/grid.xyz')
-    return 'success'
 
 
 ###############################################################################
@@ -159,8 +156,7 @@ def test_xyz_5():
     for i in range(6):
         assert abs(got_gt[i] - expected_gt[i]) <= 1e-5
 
-    return 'success'
-
+    
 
 ###############################################################################
 # Test XYZ with comma decimal separator and semi-colon field separator
@@ -186,8 +182,7 @@ def test_xyz_6():
     for i in range(6):
         assert abs(got_gt[i] - expected_gt[i]) <= 1e-5
 
-    return 'success'
-
+    
 
 ###############################################################################
 # Test XYZ with not completely equal stepX and stepY
@@ -226,8 +221,6 @@ def test_xyz_7():
 
     assert cs == 146
 
-    return 'success'
-
 ###############################################################################
 # Test particular case of XYZ file with missed samples (#6934)
 
@@ -250,16 +243,13 @@ def test_xyz_8():
 
     assert cs == 35
 
-    return 'success'
-
 
 ###############################################################################
 # Cleanup
 
 def test_xyz_cleanup():
 
-    return 'success'
-
+    pass
 
 gdaltest_list = [
     test_xyz_1,
diff --git a/autotest/gnm/gnm_test.py b/autotest/gnm/gnm_test.py
index 0a85ab253b28..3da500cba9df 100755
--- a/autotest/gnm/gnm_test.py
+++ b/autotest/gnm/gnm_test.py
@@ -72,7 +72,6 @@ def test_gnm_filenetwork_create():
 
     dn = None
     ogrtest.have_gnm = 1
-    return 'success'
 
 ###############################################################################
 # Open file base network
@@ -93,7 +92,6 @@ def test_gnm_filenetwork_open():
         'GNM: Check GNM description failed'
 
     dn = None
-    return 'success'
 
 ###############################################################################
 # Import layers into file base network
@@ -125,7 +123,6 @@ def test_gnm_import():
     assert ds.GetLayerCount() == 2, 'expected 2 layers'
 
     ds = None
-    return 'success'
 
 ###############################################################################
 # autoconnect
@@ -144,7 +141,6 @@ def test_gnm_autoconnect():
     assert ret == 0, 'failed to connect'
 
     dgn = None
-    return 'success'
 
 ###############################################################################
 # Dijkstra shortest path
@@ -168,7 +164,6 @@ def test_gnm_graph_dijkstra():
 
     dn.ReleaseResultSet(lyr)
     dn = None
-    return 'success'
 
 
 import ogrtest
@@ -194,7 +189,6 @@ def test_gnm_graph_kshortest():
 
     dn.ReleaseResultSet(lyr)
     dn = None
-    return 'success'
 
 ###############################################################################
 # ConnectedComponents
@@ -218,7 +212,6 @@ def test_gnm_graph_connectedcomponents():
 
     dn.ReleaseResultSet(lyr)
     dn = None
-    return 'success'
 
 ###############################################################################
 # Network deleting
@@ -237,8 +230,7 @@ def test_gnm_delete():
     except OSError:
         pass
 
-    return 'success'
-
+    
 
 gdaltest_list = [
     test_gnm_filenetwork_create,
diff --git a/autotest/ogr/ogr_arcgen.py b/autotest/ogr/ogr_arcgen.py
index affd58e97601..6c034241c6ee 100755
--- a/autotest/ogr/ogr_arcgen.py
+++ b/autotest/ogr/ogr_arcgen.py
@@ -61,8 +61,7 @@ def test_ogr_arcgen_points():
         feat.DumpReadable()
         pytest.fail('did not get expected first geom')
 
-    return 'success'
-
+    
 ###############################################################################
 # Read points25d
 
@@ -88,8 +87,7 @@ def test_ogr_arcgen_points25d():
         feat.DumpReadable()
         pytest.fail('did not get expected first geom')
 
-    return 'success'
-
+    
 ###############################################################################
 # Read lines
 
@@ -113,8 +111,7 @@ def test_ogr_arcgen_lines():
         feat.DumpReadable()
         pytest.fail('did not get expected first geom')
 
-    return 'success'
-
+    
 ###############################################################################
 # Read lines25d
 
@@ -138,8 +135,7 @@ def test_ogr_arcgen_lines25d():
         feat.DumpReadable()
         pytest.fail('did not get expected first geom')
 
-    return 'success'
-
+    
 ###############################################################################
 # Read polygons
 
@@ -163,8 +159,7 @@ def test_ogr_arcgen_polygons():
         feat.DumpReadable()
         pytest.fail('did not get expected first geom')
 
-    return 'success'
-
+    
 ###############################################################################
 # Read polygons25d
 
@@ -188,8 +183,7 @@ def test_ogr_arcgen_polygons25d():
         feat.DumpReadable()
         pytest.fail('did not get expected first geom')
 
-    return 'success'
-
+    
 
 gdaltest_list = [
     test_ogr_arcgen_points,
diff --git a/autotest/ogr/ogr_avc.py b/autotest/ogr/ogr_avc.py
index 2c02eff81a0e..9308e11d72a6 100755
--- a/autotest/ogr/ogr_avc.py
+++ b/autotest/ogr/ogr_avc.py
@@ -55,8 +55,6 @@ def check_content(ds):
     assert (ogrtest.check_feature_geometry(feat, 'LINESTRING (340099.875 4100200.0,340400.0625 4100399.5,340900.125 4100200.0,340700.03125 4100199.5)',
                                       max_error=0.01) == 0)
 
-    return 'success'
-
 ###############################################################################
 # Open AVCE00 datasource.
 
@@ -99,8 +97,6 @@ def test_ogr_avc_3():
 
     assert last_error_msg != '', 'expected error message'
 
-    return 'success'
-
 ###############################################################################
 # Open larger AVCBin datasource.
 
@@ -129,8 +125,7 @@ def test_ogr_avc_4():
             f.DumpReadable()
             pytest.fail(filename)
 
-    return 'success'
-
+    
 ###############################################################################
 # Open AVCBin datasource with polygon
 
@@ -163,8 +158,7 @@ def test_ogr_avc_5():
             f.DumpReadable()
             pytest.fail(filename)
 
-    return 'success'
-
+    
 
 gdaltest_list = [
     test_ogr_avc_1,
diff --git a/autotest/ogr/ogr_basic_test.py b/autotest/ogr/ogr_basic_test.py
index a2a3fb6f395e..78fdc21c97d6 100755
--- a/autotest/ogr/ogr_basic_test.py
+++ b/autotest/ogr/ogr_basic_test.py
@@ -46,8 +46,6 @@ def test_ogr_basic_1():
 
     assert gdaltest.ds is not None
 
-    return 'success'
-
 ###############################################################################
 # Test Feature counting.
 
@@ -78,8 +76,6 @@ def test_ogr_basic_2():
     assert count2 == 10, \
         ('Got wrong count with GetNextFeature() - %d, expecting 10' % count2)
 
-    return 'success'
-
 ###############################################################################
 # Test Spatial Query.
 
@@ -123,8 +119,6 @@ def test_ogr_basic_3():
     assert count == 10, \
         ('Clearing spatial query may not have worked properly, getting\n%d features instead of expected 10 features.' % count)
 
-    return 'success'
-
 ###############################################################################
 # Test GetDriver().
 
@@ -136,8 +130,6 @@ def test_ogr_basic_4():
     assert driver.GetName() == 'ESRI Shapefile', \
         ('Got wrong driver name: ' + driver.GetName())
 
-    return 'success'
-
 ###############################################################################
 # Test attribute query on special field fid - per bug 1468.
 
@@ -156,8 +148,6 @@ def test_ogr_basic_5():
 
     assert feat1.GetFID() == 3, 'got wrong feature.'
 
-    return 'success'
-
 
 ###############################################################################
 # Test opening a dataset with an empty string and a non existing dataset
@@ -168,8 +158,6 @@ def test_ogr_basic_6():
 
     assert ogr.Open('non_existing') is None
 
-    return 'success'
-
 ###############################################################################
 # Test ogr.Feature.Equal()
 
@@ -359,8 +347,7 @@ def test_ogr_basic_7():
         feat_almost_clone.DumpReadable()
         pytest.fail()
 
-    return 'success'
-
+    
 ###############################################################################
 # Issue several RegisterAll() to check that OGR drivers are good citizens
 
@@ -371,8 +358,6 @@ def test_ogr_basic_8():
     ogr.RegisterAll()
     ogr.RegisterAll()
 
-    return 'success'
-
 ###############################################################################
 # Test ogr.GeometryTypeToName (#4871)
 
@@ -402,8 +387,7 @@ def test_ogr_basic_9():
     for geom_type_tuple in geom_type_tuples:
         assert ogr.GeometryTypeToName(geom_type_tuple[0]) == geom_type_tuple[1]
 
-    return 'success'
-
+    
 ###############################################################################
 # Run test_ogrsf -all_drivers
 
@@ -418,8 +402,6 @@ def test_ogr_basic_10():
 
     assert ret.find('INFO') != -1 and ret.find('ERROR') == -1
 
-    return 'success'
-
 ###############################################################################
 # Test double call to UseExceptions() (#5704)
 
@@ -438,8 +420,7 @@ def test_ogr_basic_11():
     if used_exceptions_before == 0:
         ogr.DontUseExceptions()
 
-    return 'success'
-
+    
 ###############################################################################
 # Test OFSTBoolean, OFSTInt16 and OFSTFloat32
 
@@ -559,8 +540,6 @@ def test_ogr_basic_12():
     assert gdal.GetLastErrorMsg() != ''
     assert field_def.GetSubType() == ogr.OFSTNone
 
-    return 'success'
-
 ###############################################################################
 # Test OGRParseDate (#6452)
 
@@ -598,8 +577,7 @@ def test_ogr_basic_13():
         f.SetField('date', val)
         assert f.GetField('date') == expected_ret, val
 
-    return 'success'
-
+    
 ###############################################################################
 # Test ogr.Open(.) in an empty directory
 
@@ -615,8 +593,6 @@ def test_ogr_basic_14():
 
     os.rmdir('tmp/ogr_basic_14')
 
-    return 'success'
-
 ###############################################################################
 # Test exceptions with OGRErr return code
 
@@ -633,7 +609,7 @@ def test_ogr_basic_15():
     except RuntimeError as e:
         ok = str(e).find('CreateFeature : unsupported operation on a read-only datasource') >= 0
         assert ok, ('Got: %s' + str(e))
-        return 'success'
+        return
     finally:
         if used_exceptions_before == 0:
             ogr.DontUseExceptions()
@@ -660,8 +636,6 @@ def test_ogr_basic_16():
 
     assert list(ogr_basic_16_gen_list(2)) == [0, 1]
 
-    return 'success'
-
 
 def test_ogr_basic_invalid_unicode():
 
@@ -684,8 +658,7 @@ def test_ogr_basic_invalid_unicode():
     except:
         pass
 
-    return 'success'
-
+    
 
 def test_ogr_basic_dataset_slice():
 
@@ -703,8 +676,6 @@ def test_ogr_basic_dataset_slice():
     lyrs = [lyr.GetName() for lyr in ds[0:3:2]]
     assert lyrs == ['lyr1', 'lyr3']
 
-    return 'success'
-
 
 ###############################################################################
 # cleanup
@@ -714,8 +685,6 @@ def test_ogr_basic_cleanup():
     gdaltest.lyr = None
     gdaltest.ds = None
 
-    return 'success'
-
 
 gdaltest_list = [
     test_ogr_basic_1,
diff --git a/autotest/ogr/ogr_bna.py b/autotest/ogr/ogr_bna.py
index 2cfb1e3ae406..1f0334877a0f 100755
--- a/autotest/ogr/ogr_bna.py
+++ b/autotest/ogr/ogr_bna.py
@@ -61,8 +61,6 @@ def test_ogr_bna_1():
     assert (ogrtest.check_feature_geometry(feat, 'POINT (532.991 429.121)',
                                       max_error=0.0001) == 0)
 
-    return 'success'
-
 ###############################################################################
 # Test lines bna layer.
 
@@ -82,8 +80,6 @@ def test_ogr_bna_2():
     feat = lyr.GetNextFeature()
     assert ogrtest.check_feature_geometry(feat, 'LINESTRING (224.598 307.425,333.043 341.461,396.629 304.952)', max_error=0.0001) == 0
 
-    return 'success'
-
 ###############################################################################
 # Test polygons bna layer.
 
@@ -112,8 +108,6 @@ def test_ogr_bna_3():
     feat = lyr.GetFeature(5)
     assert ogrtest.check_feature_geometry(feat, 'MULTIPOLYGON (((0 0,0 10,10 10,10 0,0 0)))', max_error=0.0001) == 0
 
-    return 'success'
-
 ###############################################################################
 # Test ellipses bna layer.
 
@@ -132,8 +126,6 @@ def test_ogr_bna_4():
     lyr.ResetReading()
     lyr.GetNextFeature()
 
-    return 'success'
-
 
 ###############################################################################
 # Test write support
@@ -154,8 +146,7 @@ def ogr_bna_check_content(lyr1, lyr2):
         feat1 = lyr1.GetNextFeature()
         feat2 = lyr2.GetNextFeature()
 
-    return 'success'
-
+    
 
 def ogr_bna_write(creation_options):
 
@@ -190,8 +181,7 @@ def ogr_bna_write(creation_options):
         dst_lyr = output_ds.GetLayerByName('out_' + layer_name)
         ogr_bna_check_content(src_lyr, dst_lyr)
 
-    return 'success'
-
+    
 
 def test_ogr_bna_5():
 
@@ -217,8 +207,6 @@ def test_ogr_bna_6():
     size = os.stat('tmp/out.bna').st_size
     assert size == 1611, ('Got size %d. Expected %d' % (size, 1611))
 
-    return 'success'
-
 ###############################################################################
 #
 
@@ -232,8 +220,7 @@ def test_ogr_bna_cleanup():
     except OSError:
         pass
 
-    return 'success'
-
+    
 
 gdaltest_list = [
     test_ogr_bna_1,
diff --git a/autotest/ogr/ogr_cad.py b/autotest/ogr/ogr_cad.py
index 84872903cdb3..62cbf9a15f9d 100755
--- a/autotest/ogr/ogr_cad.py
+++ b/autotest/ogr/ogr_cad.py
@@ -52,8 +52,7 @@ def test_ogr_cad_1():
     if gdaltest.cad_dr is None:
         pytest.skip()
 
-    return 'success'
-
+    
 ###############################################################################
 # Check driver properly opens simple file, reads correct feature (ellipse).
 
@@ -111,7 +110,6 @@ def test_ogr_cad_2():
         'did not get expected geometry type.'
 
     gdaltest.cad_ds = None
-    return 'success'
 
 ###############################################################################
 # Check proper read of 3 layers (one circle on each) with different parameters.
@@ -240,7 +238,6 @@ def test_ogr_cad_3():
         'did not get expected geometry type.'
 
     gdaltest.cad_ds = None
-    return 'success'
 
 ###############################################################################
 # Check reading of a single point.
@@ -264,7 +261,6 @@ def test_ogr_cad_4():
         'got feature which does not fit expectations.'
 
     gdaltest.cad_ds = None
-    return 'success'
 
 ###############################################################################
 # Check reading of a simple line.
@@ -288,7 +284,6 @@ def test_ogr_cad_5():
         'got feature which does not fit expectations.'
 
     gdaltest.cad_ds = None
-    return 'success'
 
 ###############################################################################
 # Check reading of a text (point with attached 'text' attribute, and set up
@@ -318,8 +313,7 @@ def test_ogr_cad_6():
                              % (feat.GetStyleString(), expected_style))
         return 'expected_fail'  # cannot sure iconv is buildin
 
-    return 'success'
-
+    
 ###############################################################################
 # Check MTEXT as TEXT geometry.
 
@@ -337,8 +331,6 @@ def test_ogr_cad_7():
         ('Got unexpected style string:\n%s\ninstead of:\n%s.'
                              % (feat.GetStyleString(), expected_style))
 
-    return 'success'
-
 ###############################################################################
 # Check ATTDEF as TEXT geometry.
 
@@ -356,8 +348,6 @@ def test_ogr_cad_8():
         ('Got unexpected style string:\n%s\ninstead of:\n%s.'
                              % (feat.GetStyleString(), expected_style))
 
-    return 'success'
-
 ###############################################################################
 # Open a not handled DWG version
 
@@ -372,8 +362,6 @@ def test_ogr_cad_9():
     msg = gdal.GetLastErrorMsg()
     assert msg.find('does not support this version') >= 0
 
-    return 'success'
-
 ###############################################################################
 # Cleanup
 
@@ -382,8 +370,6 @@ def test_ogr_cad_cleanup():
     gdaltest.cad_layer = None
     gdaltest.cad_ds = None
 
-    return 'success'
-
 
 gdaltest_list = [
     test_ogr_cad_1,
diff --git a/autotest/ogr/ogr_carto.py b/autotest/ogr/ogr_carto.py
index 78458cac0220..e1df94ac1e07 100755
--- a/autotest/ogr/ogr_carto.py
+++ b/autotest/ogr/ogr_carto.py
@@ -52,8 +52,7 @@ def test_ogr_carto_init():
     if ogrtest.carto_drv is None:
         pytest.skip()
 
-    return 'success'
-
+    
 
 ###############################################################################
 #
@@ -814,11 +813,6 @@ def test_ogr_carto_vsimem():
                 ds = ogr.Open('CARTO:foo')
     assert ds.GetLayerByName('a_layer') is not None
 
-
-
-
-    return 'success'
-
 ###############################################################################
 #
 
@@ -836,8 +830,7 @@ def test_ogr_carto_vsimem_cleanup():
     for f in gdal.ReadDir('/vsimem/'):
         gdal.Unlink('/vsimem/' + f)
 
-    return 'success'
-
+    
 ###############################################################################
 #  Run test_ogrsf
 
@@ -863,8 +856,6 @@ def test_ogr_carto_test_ogrsf():
 
     assert ret.find('INFO') != -1 and ret.find('ERROR') == -1
 
-    return 'success'
-
 ###############################################################################
 # Test if driver is available
 
@@ -883,8 +874,7 @@ def ogr_carto_rw_init():
     if ogrtest.carto_drv is None:
         pytest.skip()
 
-    return 'success'
-
+    
 ###############################################################################
 # Read/write/update test
 
@@ -1048,8 +1038,6 @@ def ogr_carto_rw_1():
         pytest.fail()
     ds.ExecuteSQL("DELLAYER:" + lyr_name)
 
-    return 'success'
-
 
 gdaltest_list = [
     test_ogr_carto_init,
diff --git a/autotest/ogr/ogr_cloudant.py b/autotest/ogr/ogr_cloudant.py
index a920c4e8d3e8..8865497073fc 100755
--- a/autotest/ogr/ogr_cloudant.py
+++ b/autotest/ogr/ogr_cloudant.py
@@ -68,8 +68,7 @@ def test_ogr_cloudant_init():
         ogrtest.cloudant_drv = None
         pytest.skip('cannot open %s' % ogrtest.cloudant_test_url)
 
-    return 'success'
-
+    
 ###############################################################################
 # Test GetFeatureCount()
 
@@ -87,8 +86,6 @@ def test_ogr_cloudant_GetFeatureCount():
     count = lyr.GetFeatureCount()
     assert count == 52, 'did not get expected feature count'
 
-    return 'success'
-
 ###############################################################################
 # Test GetNextFeature()
 
@@ -109,8 +106,7 @@ def test_ogr_cloudant_GetNextFeature():
         feat.DumpReadable()
         pytest.fail('did not get expected feature')
 
-    return 'success'
-
+    
 ###############################################################################
 # Test GetSpatialRef()
 
@@ -128,10 +124,9 @@ def test_ogr_cloudant_GetSpatialRef():
     sr = lyr.GetSpatialRef()
 
     if sr is None:
-        return 'success'
-
-    return 'success'
+        return
 
+    
 ###############################################################################
 # Test GetExtent()
 
@@ -152,8 +147,6 @@ def test_ogr_cloudant_GetExtent():
     assert extent == (-179.14734, 179.77847, 17.884813, 71.352561), \
         'did not get expected extent'
 
-    return 'success'
-
 ###############################################################################
 # Test SetSpatialFilter()
 
@@ -179,8 +172,7 @@ def test_ogr_cloudant_SetSpatialFilter():
         feat.DumpReadable()
         pytest.fail('did not get expected feature')
 
-    return 'success'
-
+    
 
 gdaltest_list = [
     test_ogr_cloudant_init,
diff --git a/autotest/ogr/ogr_couchdb.py b/autotest/ogr/ogr_couchdb.py
index 64935d0cf619..872938025bd9 100755
--- a/autotest/ogr/ogr_couchdb.py
+++ b/autotest/ogr/ogr_couchdb.py
@@ -62,8 +62,7 @@ def test_ogr_couchdb_init():
         ogrtest.couchdb_drv = None
         pytest.skip('cannot open %s' % ogrtest.couchdb_test_server)
 
-    return 'success'
-
+    
 ###############################################################################
 # Basic test
 
@@ -85,8 +84,6 @@ def test_ogr_couchdb_1():
         pytest.fail()
     ds.ExecuteSQL('DELLAYER:' + ogrtest.couchdb_temp_layer_name)
 
-    return 'success'
-
 ###############################################################################
 # Test null / unset
 
@@ -126,8 +123,7 @@ def test_ogr_couchdb_2():
         f.DumpReadable()
         pytest.fail()
 
-    return 'success'
-
+    
 
 ###############################################################################
 # Cleanup
@@ -140,8 +136,6 @@ def test_ogr_couchdb_cleanup():
     assert ds is not None
     ds.ExecuteSQL('DELLAYER:' + ogrtest.couchdb_temp_layer_name)
 
-    return 'success'
-
 
 gdaltest_list = [
     test_ogr_couchdb_init,
diff --git a/autotest/ogr/ogr_csv.py b/autotest/ogr/ogr_csv.py
index 4a16b23ffae4..02fafe696817 100755
--- a/autotest/ogr/ogr_csv.py
+++ b/autotest/ogr/ogr_csv.py
@@ -48,7 +48,7 @@ def test_ogr_csv_1():
     gdaltest.csv_ds = ogr.Open('data/prime_meridian.csv')
 
     if gdaltest.csv_ds is not None:
-        return 'success'
+        return
     pytest.fail()
 
 
@@ -76,8 +76,6 @@ def ogr_csv_check_layer(lyr, expect_code_as_numeric):
 
     lyr.ResetReading()
 
-    return 'success'
-
 ###############################################################################
 # Verify the some attributes read properly.
 #
@@ -174,8 +172,7 @@ def test_ogr_csv_3():
         gdal.PopErrorHandler()
         assert ret != 0
 
-    return 'success'
-
+    
 
 ###############################################################################
 # Verify the some attributes read properly.
@@ -201,8 +198,6 @@ def test_ogr_csv_5():
     # Create layer (.csv file)
     gdaltest.csv_lyr2 = ogr_csv_copy_layer('pm2', ['LINEFORMAT=CRLF', ])
 
-    return 'success'
-
 ###############################################################################
 # Verify the some attributes read properly.
 #
@@ -240,8 +235,6 @@ def test_ogr_csv_7():
 
     gdaltest.csv_tmpds = None
 
-    return 'success'
-
 ###############################################################################
 # Reopen and append a record then close.
 #
@@ -264,8 +257,6 @@ def test_ogr_csv_8():
 
     gdaltest.csv_tmpds = None
 
-    return 'success'
-
 ###############################################################################
 # Verify the some attributes read properly.
 #
@@ -296,8 +287,6 @@ def test_ogr_csv_9():
 
     lyr.ResetReading()
 
-    return 'success'
-
 ###############################################################################
 # Verify some capabilities and related stuff.
 #
@@ -344,8 +333,6 @@ def test_ogr_csv_10():
     assert gdaltest.csv_tmpds.TestCapability('DeleteLayer'), \
         'should have deletelayer on updatable ds.'
 
-    return 'success'
-
 ###############################################################################
 
 
@@ -413,8 +400,6 @@ def ogr_csv_check_testcsvt(lyr):
 
     lyr.ResetReading()
 
-    return 'success'
-
 
 ###############################################################################
 # Verify handling of csvt with width and precision specified
@@ -645,8 +630,6 @@ def test_ogr_csv_13():
     tr = ogrtest.check_features_against_list(lyr, 'Z', expect)
     assert tr
 
-    return 'success'
-
 ###############################################################################
 # Copy prime_meridian.csv again, with SEMICOLON as separator
 
@@ -663,8 +646,6 @@ def test_ogr_csv_14():
     # Create layer (.csv file)
     gdaltest.csv_lyr1 = ogr_csv_copy_layer('pm3', ['SEPARATOR=SEMICOLON', ])
 
-    return 'success'
-
 ###############################################################################
 # Verify the some attributes read properly.
 #
@@ -717,8 +698,6 @@ def test_ogr_csv_17():
     feat = csv_lyr.GetNextFeature()
     assert not ogrtest.check_feature_geometry(feat, 'POLYGON((1.001 1.001,3.999 3.999,3.2 1.6,1.001 1.001))')
 
-    return 'success'
-
 
 ###############################################################################
 # Write to /vsistdout/
@@ -736,8 +715,6 @@ def test_ogr_csv_18():
     feat.SetGeometry(geom)
     lyr.CreateFeature(feat)
 
-    return 'success'
-
 ###############################################################################
 # Verify handling of non-numeric values in numeric columns
 
@@ -766,8 +743,6 @@ def test_ogr_csv_19():
     lyr.ResetReading()
     assert ogrtest.check_features_against_list(lyr, 'STRINGCOL', ['foo'])
 
-    return 'success'
-
 
 ###############################################################################
 # Verify handling of column names with numbers
@@ -811,8 +786,6 @@ def test_ogr_csv_20():
     assert got[1] == expect[1], \
         ('column 1 got name %s expected %s' % (str(got[1]), str(expect[1])))
 
-    return 'success'
-
 ###############################################################################
 # Verify handling of numeric column names with quotes (bug #4361)
 
@@ -852,8 +825,7 @@ def test_ogr_csv_21():
         assert got == expect[i], \
             ('column %d got name %s expected %s' % (i, str(got), str(expect[i])))
 
-    return 'success'
-
+    
 
 ###############################################################################
 # Test handling of UTF8 BOM (bug #4623)
@@ -866,8 +838,6 @@ def test_ogr_csv_22():
 
     assert fld0_name == 'id', 'bad field name'
 
-    return 'success'
-
 
 def test_ogr_csv_23():
     # create a CSV file with UTF8 BOM
@@ -913,8 +883,6 @@ def test_ogr_csv_23():
     data = open('tmp/csvwrk/utf8no.csv', 'rb').read()
     assert data[:3] != '\xef\xbb\xbfWKT', "Found UTF8 BOM header on output!"
 
-    return 'success'
-
 ###############################################################################
 # Test single column CSV files
 
@@ -950,8 +918,6 @@ def test_ogr_csv_24():
     gdal.Unlink('/vsimem/single.csv')
     gdal.Unlink('/vsimem/invalid.csv')
 
-    return 'success'
-
 
 ###############################################################################
 # Test newline handling (#4452)
@@ -974,8 +940,6 @@ def test_ogr_csv_25():
     assert data == EXPECTED, \
         ("Newlines changed:\n\texpected=%s\n\tgot=     %s" % (repr(EXPECTED), repr(data)))
 
-    return 'success'
-
 
 ###############################################################################
 # Test number padding behaviour (#4469)
@@ -1005,8 +969,6 @@ def test_ogr_csv_26():
     data = open('tmp/csvwrk/num_padding.csv', 'rb').read().decode('ascii')
     assert data == EXPECTED, ("expected=%s got= %s" % (repr(EXPECTED), repr(data)))
 
-    return 'success'
-
 ###############################################################################
 # Test Eurostat .TSV files
 
@@ -1045,8 +1007,7 @@ def test_ogr_csv_27():
         feat.DumpReadable()
         pytest.fail()
 
-    return 'success'
-
+    
 ###############################################################################
 # Check that we don't rewrite erroneously a file that has no header (#5161).
 
@@ -1068,8 +1029,6 @@ def test_ogr_csv_28():
 
     assert data == '1,2\n'
 
-    return 'success'
-
 ###############################################################################
 # Check multi geometry field support
 
@@ -1111,8 +1070,6 @@ def test_ogr_csv_29():
         pytest.fail()
     ds = None
 
-    return 'success'
-
 ###############################################################################
 # Run test_ogrsf
 
@@ -1127,8 +1084,6 @@ def test_ogr_csv_30():
 
     assert ret.find('INFO') != -1 and ret.find('ERROR') == -1
 
-    return 'success'
-
 ###############################################################################
 # Read geonames.org allCountries.txt
 
@@ -1151,8 +1106,6 @@ def test_ogr_csv_31():
 
     assert lyr.GetFeatureCount() == 10
 
-    return 'success'
-
 ###############################################################################
 # Test AUTODETECT_TYPE=YES
 
@@ -1308,8 +1261,7 @@ def test_ogr_csv_32():
         f.DumpReadable()
         pytest.fail()
 
-    return 'success'
-
+    
 ###############################################################################
 # Test Boolean, Int16 and Float32 support
 
@@ -1365,8 +1317,6 @@ def test_ogr_csv_33():
     gdal.Unlink('/vsimem/subtypes.csv')
     gdal.Unlink('/vsimem/subtypes.csvt')
 
-    return 'success'
-
 ###############################################################################
 # Test Integer64 support
 
@@ -1411,8 +1361,6 @@ def test_ogr_csv_34():
     gdal.Unlink('/vsimem/int64.csv')
     gdal.Unlink('/vsimem/int64.csvt')
 
-    return 'success'
-
 ###############################################################################
 # Test comma separator
 
@@ -1453,8 +1401,6 @@ def test_ogr_csv_35():
 
     gdal.Unlink('/vsimem/ogr_csv_35.csv')
 
-    return 'success'
-
 ###############################################################################
 # Test GEOM_POSSIBLE_NAMES open option
 
@@ -1545,8 +1491,6 @@ def test_ogr_csv_36():
 
     gdal.Unlink('/vsimem/ogr_csv_36.csv')
 
-    return 'success'
-
 ###############################################################################
 # Test X_POSSIBLE_NAMES, Y_POSSIBLE_NAMES and Z_POSSIBLE_NAMES open options
 
@@ -1608,8 +1552,6 @@ def test_ogr_csv_37():
 
     gdal.Unlink('/vsimem/ogr_csv_37.csv')
 
-    return 'success'
-
 ###############################################################################
 # Test GeoCSV WKT type
 
@@ -1641,8 +1583,6 @@ def test_ogr_csv_38():
     gdal.Unlink('/vsimem/ogr_csv_38.csvt')
     gdal.Unlink('/vsimem/ogr_csv_38.prj')
 
-    return 'success'
-
 ###############################################################################
 # Test GeoCSV CoordX and CoordY types
 
@@ -1669,8 +1609,6 @@ def test_ogr_csv_39():
     gdal.Unlink('/vsimem/ogr_csv_39.csv')
     gdal.Unlink('/vsimem/ogr_csv_39.csvt')
 
-    return 'success'
-
 ###############################################################################
 # Test X_POSSIBLE_NAMES, Y_POSSIBLE_NAMES, GEOM_POSSIBLE_NAMES and KEEP_GEOM_COLUMNS=NO together (#6137)
 
@@ -1711,8 +1649,6 @@ def test_ogr_csv_40():
 
     gdal.Unlink('/vsimem/ogr_csv_40.csv')
 
-    return 'success'
-
 ###############################################################################
 # Test GEOM_POSSIBLE_NAMES and KEEP_GEOM_COLUMNS=NO together with empty content in geom column (#6152)
 
@@ -1735,8 +1671,6 @@ def test_ogr_csv_41():
 
     gdal.Unlink('/vsimem/ogr_csv_41.csv')
 
-    return 'success'
-
 ###############################################################################
 # Test writing field with empty content
 
@@ -1753,7 +1687,6 @@ def test_ogr_csv_42():
     ds = None
 
     gdal.Unlink('/vsimem/ogr_csv_42.csv')
-    return 'success'
 
 ###############################################################################
 # Test editing capabilities
@@ -1936,7 +1869,6 @@ def test_ogr_csv_43():
 
     gdal.Unlink('/vsimem/ogr_csv_43.csv')
     gdal.Unlink('/vsimem/ogr_csv_43.csvt')
-    return 'success'
 
 ###############################################################################
 # Test seeking back while creating
@@ -1966,7 +1898,6 @@ def test_ogr_csv_44():
     ds = None
 
     gdal.Unlink('/vsimem/ogr_csv_44.csv')
-    return 'success'
 
 ###############################################################################
 # Test QGIS use case that consists in reopening a file just after calling
@@ -1992,7 +1923,6 @@ def test_ogr_csv_45():
     ds = None
 
     gdal.Unlink('/vsimem/ogr_csv_45.csv')
-    return 'success'
 
 ###############################################################################
 # Test edition of CSV files with X_POSSIBLE_NAMES, Y_POSSIBLE_NAMES open options
@@ -2068,8 +1998,6 @@ def test_ogr_csv_46():
 
     gdal.Unlink('/vsimem/ogr_csv_46.csv')
 
-    return 'success'
-
 ###############################################################################
 # Test writing XYZM
 
@@ -2098,8 +2026,6 @@ def test_ogr_csv_47():
 
     gdal.Unlink('/vsimem/ogr_csv_47.csv')
 
-    return 'success'
-
 ###############################################################################
 # Test reading/writing StringList, etc..
 
@@ -2131,8 +2057,6 @@ def test_ogr_csv_48():
     gdal.Unlink('/vsimem/ogr_csv_48_out.csv')
     gdal.Unlink('/vsimem/ogr_csv_48_out.csvt')
 
-    return 'success'
-
 ###############################################################################
 # Test EMPTY_STRING_AS_NULL=ES
 
@@ -2153,8 +2077,6 @@ def test_ogr_csv_49():
 
     gdal.Unlink('/vsimem/ogr_csv_49.csv')
 
-    return 'success'
-
 ###############################################################################
 
 
@@ -2165,8 +2087,6 @@ def test_ogr_csv_more_than_100_geom_fields():
     lyr = ds.GetLayer(0)
     lyr.GetNextFeature()
 
-    return 'success'
-
 ###############################################################################
 
 
@@ -2199,8 +2119,6 @@ def test_ogr_csv_string_quoting_always():
     gdal.Unlink('/vsimem/ogr_csv_string_quoting_always.csvt')
     gdal.Unlink('/vsimem/ogr_csv_string_quoting_always.prj')
 
-    return 'success'
-
 ###############################################################################
 
 
@@ -2228,8 +2146,6 @@ def test_ogr_csv_string_quoting_if_ambiguous():
 
     gdal.Unlink('/vsimem/ogr_csv_string_quoting_if_ambiguous.csv')
 
-    return 'success'
-
 ###############################################################################
 
 
@@ -2258,8 +2174,6 @@ def test_ogr_csv_string_quoting_if_needed():
 
     gdal.Unlink('/vsimem/ogr_csv_string_quoting_if_needed.csv')
 
-    return 'success'
-
 ###############################################################################
 
 
@@ -2283,8 +2197,6 @@ def test_ogr_csv_iter_and_set_feature():
 
     assert count == 2
 
-    return 'success'
-
 ###############################################################################
 #
 
@@ -2314,8 +2226,7 @@ def test_ogr_csv_cleanup():
     except:
         pass
 
-    return 'success'
-
+    
 
 gdaltest_list = [
     test_ogr_csv_1,
diff --git a/autotest/ogr/ogr_csw.py b/autotest/ogr/ogr_csw.py
index 2026ead6581d..2ba6dfa217ed 100755
--- a/autotest/ogr/ogr_csw.py
+++ b/autotest/ogr/ogr_csw.py
@@ -55,8 +55,7 @@ def ogr_csw_init():
             pytest.skip()
         pytest.skip('failed to open test file.')
 
-    return 'success'
-
+    
 ###############################################################################
 # Test reading a pyCSW server
 
@@ -72,8 +71,6 @@ def test_ogr_csw_pycsw():
     f = lyr.GetNextFeature()
     assert f is not None, 'did not get expected layer name'
 
-    return 'success'
-
 ###############################################################################
 
 
@@ -83,8 +80,6 @@ def test_ogr_csw_vsimem_fail_because_not_enabled():
     gdal.PopErrorHandler()
     assert ds is None
 
-    return 'success'
-
 
 ###############################################################################
 def test_ogr_csw_vsimem_fail_because_no_get_capabilities():
@@ -95,8 +90,6 @@ def test_ogr_csw_vsimem_fail_because_no_get_capabilities():
     gdal.PopErrorHandler()
     assert ds is None
 
-    return 'success'
-
 ###############################################################################
 
 
@@ -111,8 +104,6 @@ def test_ogr_csw_vsimem_fail_because_empty_response():
     assert ds is None
     assert gdal.GetLastErrorMsg().find('Empty content returned by server') >= 0
 
-    return 'success'
-
 ###############################################################################
 
 
@@ -127,8 +118,6 @@ def test_ogr_csw_vsimem_fail_because_no_CSW_Capabilities():
     assert ds is None
     assert gdal.GetLastErrorMsg().find('Cannot find Capabilities.version') >= 0
 
-    return 'success'
-
 ###############################################################################
 
 
@@ -143,8 +132,6 @@ def test_ogr_csw_vsimem_fail_because_exception():
     assert ds is None
     assert gdal.GetLastErrorMsg().find('Error returned by server : <ServiceExceptionReport/>') >= 0
 
-    return 'success'
-
 ###############################################################################
 
 
@@ -159,8 +146,6 @@ def test_ogr_csw_vsimem_fail_because_invalid_xml_capabilities():
     assert ds is None
     assert gdal.GetLastErrorMsg().find('Invalid XML content : <invalid_xml') >= 0
 
-    return 'success'
-
 ###############################################################################
 
 
@@ -177,8 +162,6 @@ def test_ogr_csw_vsimem_fail_because_missing_version():
     assert ds is None
     assert gdal.GetLastErrorMsg().find('Cannot find Capabilities.version') >= 0
 
-    return 'success'
-
 ###############################################################################
 
 
@@ -439,8 +422,6 @@ def test_ogr_csw_vsimem_csw_minimal_instance():
     lyr.SetAttributeFilter(None)
     lyr.SetSpatialFilter(None)
 
-    return 'success'
-
 ###############################################################################
 
 
@@ -495,8 +476,7 @@ def test_ogr_csw_vsimem_csw_output_schema_csw():
         f.DumpReadable()
         pytest.fail()
 
-    return 'success'
-
+    
 ###############################################################################
 
 
@@ -536,8 +516,7 @@ def test_ogr_csw_vsimem_csw_output_schema_gmd():
         f.DumpReadable()
         pytest.fail()
 
-    return 'success'
-
+    
 ###############################################################################
 
 
@@ -579,8 +558,7 @@ def test_ogr_csw_vsimem_csw_output_schema_fgdc():
         f.DumpReadable()
         pytest.fail()
 
-    return 'success'
-
+    
 ###############################################################################
 
 
@@ -590,8 +568,7 @@ def test_ogr_csw_vsimem_cleanup():
     for f in gdal.ReadDir('/vsimem/'):
         gdal.Unlink('/vsimem/' + f)
 
-    return 'success'
-
+    
 
 gdaltest_list = [
     test_ogr_csw_vsimem_fail_because_not_enabled,
diff --git a/autotest/ogr/ogr_db2.py b/autotest/ogr/ogr_db2.py
index 8946403ae91f..91d6161fffd0 100755
--- a/autotest/ogr/ogr_db2.py
+++ b/autotest/ogr/ogr_db2.py
@@ -60,8 +60,7 @@ def test_ogr_db2_check_driver():
     if ogrtest.db2_drv is None:
         pytest.skip()
 
-    return 'success'
-
+    
 ###############################################################################
 # Test if environment variable for DB2 connection is set and we can connect
 
@@ -77,8 +76,7 @@ def test_ogr_db2_init():
         ogrtest.db2_drv = None
         pytest.skip('Environment variable DB2_TEST_SERVER not found')
 
-    return 'success'
-###############################################################################
+    ###############################################################################
 # Test GetFeatureCount()
 
 
@@ -98,8 +96,6 @@ def test_ogr_db2_GetFeatureCount():
     count = lyr.GetFeatureCount()
     assert count == 5, 'did not get expected feature count'
 
-    return 'success'
-
 ###############################################################################
 # Test GetSpatialRef()
 
@@ -125,8 +121,6 @@ def test_ogr_db2_GetSpatialRef():
 
     assert txt.find('GEOGCS[\"GCS_WGS_1984') != -1, 'did not get expected srs'
 
-    return 'success'
-
 
 ###############################################################################
 # Test GetExtent()
@@ -149,8 +143,6 @@ def test_ogr_db2_GetExtent():
     assert extent == (-122.030745, -121.95672, 37.278665, 37.440885), \
         'did not get expected extent'
 
-    return 'success'
-
 ###############################################################################
 # Test GetFeature()
 
@@ -175,8 +167,7 @@ def test_ogr_db2_GetFeature():
         feat.DumpReadable()
         pytest.fail('did not get expected feature')
 
-    return 'success'
-
+    
 ###############################################################################
 # Test SetSpatialFilter()
 
@@ -225,8 +216,6 @@ def test_ogr_db2_SetSpatialFilter():
 
     assert count == 3, 'did not get expected feature count (3)'
 
-    return 'success'
-
 #
 # test what capabilities the DB2 driver provides
 #
@@ -263,8 +252,7 @@ def test_ogr_db2_capabilities():
     print("Layer Capabilities:")
     for cap in capabilities:
         print("  %s = %s" % (cap, layer.TestCapability(cap)))
-    return 'success'
-
+    
 
 def ogr_db2_listdrivers():
     cnt = ogr.GetDriverCount()
@@ -282,8 +270,7 @@ def ogr_db2_listdrivers():
     for i in formatsList:
         print(i)
 
-    return 'success'
-
+    
 
 gdaltest_list = [
     test_ogr_db2_check_driver,
diff --git a/autotest/ogr/ogr_db2_hack.py b/autotest/ogr/ogr_db2_hack.py
index 57149f8144a9..f328713828c8 100755
--- a/autotest/ogr/ogr_db2_hack.py
+++ b/autotest/ogr/ogr_db2_hack.py
@@ -57,8 +57,6 @@ def test_ogr_db2_hack_1():
 
     assert wkb[0] == '1', 'WKB wkbNDR point geometry has wrong byte order'
 
-    return 'success'
-
 ###############################################################################
 # Verify that we can turn DB2 V7.2 mode back off!
 
@@ -82,8 +80,6 @@ def test_ogr_db2_hack_2():
 
     assert wkb[0] == chr(1), 'WKB wkbNDR point geometry has wrong byte order'
 
-    return 'success'
-
 
 ###############################################################################
 # Try a more complex geometry, and verify we can read it back.
@@ -115,8 +111,6 @@ def test_ogr_db2_hack_3():
 
     ogr.SetGenerate_DB2_V72_BYTE_ORDER(0)
 
-    return 'success'
-
 
 gdaltest_list = [
     test_ogr_db2_hack_1,
diff --git a/autotest/ogr/ogr_dgn.py b/autotest/ogr/ogr_dgn.py
index c1d2faf994a0..72cb02d87cfb 100755
--- a/autotest/ogr/ogr_dgn.py
+++ b/autotest/ogr/ogr_dgn.py
@@ -44,8 +44,6 @@ def test_ogr_dgn_1():
 
     gdaltest.dgn_lyr = gdaltest.dgn_ds.GetLayer(0)
 
-    return 'success'
-
 ###############################################################################
 # Check first feature, a text element.
 
@@ -65,8 +63,6 @@ def test_ogr_dgn_2():
     assert feat.GetStyleString() == 'LABEL(t:"Demo Text",c:#ffffff,s:1.000g,f:ENGINEERING)', \
         'Style string different than expected.'
 
-    return 'success'
-
 ###############################################################################
 # Check second feature, a circle.
 
@@ -92,8 +88,6 @@ def test_ogr_dgn_3():
     assert genvelope[0] >= 0.328593 and genvelope[0] <= 0.328594 and genvelope[1] >= 9.68780 and genvelope[1] <= 9.68781 and genvelope[2] >= -0.09611 and genvelope[2] <= -0.09610 and genvelope[3] >= 9.26310 and genvelope[3] <= 9.26311, \
         'geometry extents seem odd'
 
-    return 'success'
-
 ###############################################################################
 # Check third feature, a polygon with fill styling.
 
@@ -115,8 +109,6 @@ def test_ogr_dgn_4():
 
     gdaltest.dgn_lyr.ResetReading()
 
-    return 'success'
-
 ###############################################################################
 # Use attribute query to pick just the type 15 level 2 object.
 
@@ -130,7 +122,7 @@ def test_ogr_dgn_5():
     tr = ogrtest.check_features_against_list(gdaltest.dgn_lyr, 'Type', [15])
     gdaltest.dgn_lyr.SetAttributeFilter(None)
 
-    return 'success' if tr else 'fail'
+    assert tr
 
 ###############################################################################
 # Use spatial filter to just pick the big circle.
@@ -148,7 +140,7 @@ def test_ogr_dgn_6():
     tr = ogrtest.check_features_against_list(gdaltest.dgn_lyr, 'Type', [15])
     gdaltest.dgn_lyr.SetSpatialFilter(None)
 
-    return 'success' if tr else 'fail'
+    assert tr
 
 ###############################################################################
 # Copy our small dgn file to a new dgn file.
@@ -181,8 +173,6 @@ def test_ogr_dgn_7():
     dgn2_lyr = None
     dgn2_ds = None
 
-    return 'success'
-
 ###############################################################################
 # Verify that our copy is pretty similar.
 #
@@ -244,8 +234,6 @@ def test_ogr_dgn_8():
 
     dgn2_ds = None
 
-    return 'success'
-
 ###############################################################################
 # Test delta encoding (#6806)
 
@@ -263,8 +251,6 @@ def test_ogr_dgn_online_1():
 
     assert not ogrtest.check_feature_geometry(feat, wkt)
 
-    return 'success'
-
 ###############################################################################
 #  Cleanup
 
@@ -276,7 +262,6 @@ def test_ogr_dgn_cleanup():
         gdaltest.dgn_ds = None
 
     gdaltest.clean_tmp()
-    return 'success'
 
 
 gdaltest_list = [
diff --git a/autotest/ogr/ogr_dgnv8.py b/autotest/ogr/ogr_dgnv8.py
index 91fa3b5c8427..b016590c39c5 100755
--- a/autotest/ogr/ogr_dgnv8.py
+++ b/autotest/ogr/ogr_dgnv8.py
@@ -51,8 +51,6 @@ def test_ogr_dgnv8_1():
     ds = ogr.Open('data/test_dgnv8.dgn')
     assert ds is not None, 'failed to open test file.'
 
-    return 'success'
-
 ###############################################################################
 # Compare with a reference CSV dump
 
@@ -98,8 +96,6 @@ def test_ogr_dgnv8_3():
 
     assert ret.find('INFO') != -1 and ret.find('ERROR') == -1
 
-    return 'success'
-
 ###############################################################################
 # Test creation code
 
@@ -189,16 +185,13 @@ def test_ogr_dgnv8_5():
     gdal.Unlink(tmp_dgn)
     gdal.Unlink(tmp2_dgn)
 
-    return 'success'
-
 
 ###############################################################################
 #  Cleanup
 
 def test_ogr_dgnv8_cleanup():
 
-    return 'success'
-
+    pass
 
 gdaltest_list = [
     test_ogr_dgnv8_1,
diff --git a/autotest/ogr/ogr_dods.py b/autotest/ogr/ogr_dods.py
index 768f3ea24298..367a3a3e87eb 100755
--- a/autotest/ogr/ogr_dods.py
+++ b/autotest/ogr/ogr_dods.py
@@ -68,8 +68,7 @@ def ogr_dods_1():
     if gdaltest.dods_profiles is None:
         gdaltest.dods_ds = None
         pytest.fail('profiles layer missing, likely AIS stuff not working.')
-    return 'success'
-
+    
 ###############################################################################
 # Read a single feature from the profiles layer and verify a few things.
 #
@@ -96,8 +95,7 @@ def ogr_dods_2():
         feat.Destroy()
         pytest.fail('got more than expected number of features.')
 
-    return 'success'
-
+    
 ###############################################################################
 # Read the normalized form of the same profile, and verify some values.
 #
@@ -134,8 +132,7 @@ def ogr_dods_3():
         feat.Destroy()
         pytest.fail('got more than expected number of features.')
 
-    return 'success'
-
+    
 ###############################################################################
 # Read the "lines" from from the same server and verify some values.
 #
@@ -165,8 +162,7 @@ def ogr_dods_4():
         feat.Destroy()
         pytest.fail('got more than expected number of features.')
 
-    return 'success'
-
+    
 
 ###############################################################################
 # Simple 1D Grid.
@@ -190,8 +186,6 @@ def ogr_dods_5():
     tr = ogrtest.check_features_against_list(lat_lyr, 'latitude', expect)
     assert tr != 0
 
-    return 'success'
-
 ###############################################################################
 #
 
@@ -207,8 +201,6 @@ def ogr_dods_cleanup():
     gdaltest.dods_ds.Destroy()
     gdaltest.dods_ds = None
 
-    return 'success'
-
 
 gdaltest_list = []
 
diff --git a/autotest/ogr/ogr_dxf.py b/autotest/ogr/ogr_dxf.py
index eb7c380d0c9a..050a0ed26b3a 100644
--- a/autotest/ogr/ogr_dxf.py
+++ b/autotest/ogr/ogr_dxf.py
@@ -78,8 +78,7 @@ def test_ogr_dxf_1():
         gdaltest.sample_text += '"abc"'
         gdaltest.sample_text = gdaltest.sample_text.encode('utf-8')
 
-    return 'success'
-
+    
 ###############################################################################
 # Read the first feature, an ellipse and see if it generally meets expectations.
 
@@ -122,8 +121,6 @@ def test_ogr_dxf_2():
         ('first point (%g,%g) not expected location.'
                              % (geom.GetX(0), geom.GetY(0)))
 
-    return 'success'
-
 ###############################################################################
 # Second feature should be a partial ellipse.
 
@@ -145,8 +142,6 @@ def test_ogr_dxf_3():
         ('first point (%g,%g) not expected location.'
                              % (geom.GetX(0), geom.GetY(0)))
 
-    return 'success'
-
 ###############################################################################
 # Third feature: point.
 
@@ -157,8 +152,6 @@ def test_ogr_dxf_4():
 
     assert not ogrtest.check_feature_geometry(feat, 'POINT (83.5 160.0 0)')
 
-    return 'success'
-
 ###############################################################################
 # Fourth feature: LINE
 
@@ -172,8 +165,6 @@ def test_ogr_dxf_5():
     assert feat.GetGeometryRef().GetGeometryType() != ogr.wkbLineString, \
         'not keeping 3D linestring as 3D'
 
-    return 'success'
-
 ###############################################################################
 # Fourth feature: MTEXT
 
@@ -190,8 +181,6 @@ def test_ogr_dxf_6():
     assert feat.GetStyleString() == 'LABEL(f:"Arial",t:"Test",a:30,s:5g,p:7,c:#000000)', \
         'got wrong style string'
 
-    return 'success'
-
 ###############################################################################
 # Partial CIRCLE
 
@@ -214,8 +203,6 @@ def test_ogr_dxf_7():
         ('first point (%g,%g) not expected location.'
                              % (geom.GetX(0), geom.GetY(0)))
 
-    return 'success'
-
 ###############################################################################
 # PaperSpace and dimension
 
@@ -263,8 +250,6 @@ def test_ogr_dxf_8():
     assert feat.GetStyleString() == expected_style, \
         ('Got unexpected style string:\n%s\ninstead of:\n%s' % (feat.GetStyleString(), expected_style))
 
-    return 'success'
-
 ###############################################################################
 # BLOCK (inlined)
 
@@ -304,8 +289,6 @@ def test_ogr_dxf_9():
 
     assert not ogrtest.check_feature_geometry(feat, 'POINT (79.977331629005178 119.698291706738644 0)')
 
-    return 'success'
-
 ###############################################################################
 # LWPOLYLINE in an Object Coordinate System.
 
@@ -336,8 +319,6 @@ def test_ogr_dxf_10():
     ocs_lyr = None
     ocs_ds = None
 
-    return 'success'
-
 ###############################################################################
 # Test reading from an entities-only dxf file (#3412)
 
@@ -362,8 +343,6 @@ def test_ogr_dxf_11():
     eo_lyr = None
     eo_ds = None
 
-    return 'success'
-
 ###############################################################################
 # Write a simple file with a polygon and a line, and read back.
 
@@ -447,8 +426,6 @@ def test_ogr_dxf_12():
 
     os.unlink('tmp/dxf_11.dxf')
 
-    return 'success'
-
 
 ###############################################################################
 # Check smoothed polyline.
@@ -500,8 +477,6 @@ def test_ogr_dxf_13():
 
     ds = None
 
-    return 'success'
-
 
 ###############################################################################
 # Check smooth LWPOLYLINE entity.
@@ -540,8 +515,6 @@ def test_ogr_dxf_14():
 
     ds = None
 
-    return 'success'
-
 ###############################################################################
 # Write a file with dynamic layer creation and confirm that the
 # dynamically created layer 'abc' matches the definition of the default
@@ -622,8 +595,6 @@ def test_ogr_dxf_15():
 
     os.unlink('tmp/dxf_14.dxf')
 
-    return 'success'
-
 
 ###############################################################################
 # Test reading without DXF blocks inlined.
@@ -698,8 +669,6 @@ def test_ogr_dxf_16():
 
     gdal.SetConfigOption('DXF_INLINE_BLOCKS', 'TRUE')
 
-    return 'success'
-
 ###############################################################################
 # Write a file with blocks defined from a source blocks layer.
 
@@ -832,8 +801,6 @@ def test_ogr_dxf_17():
 
     os.unlink('tmp/dxf_17.dxf')
 
-    return 'success'
-
 ###############################################################################
 # Write a file with line patterns, and make sure corresponding Linetypes are
 # created.
@@ -935,8 +902,6 @@ def test_ogr_dxf_18():
 
     os.unlink('tmp/dxf_18.dxf')
 
-    return 'success'
-
 ###############################################################################
 # Test writing a file using references to blocks defined entirely in the
 # template - no blocks layer transferred.
@@ -978,8 +943,6 @@ def test_ogr_dxf_19():
 
     os.unlink('tmp/dxf_19.dxf')
 
-    return 'success'
-
 ###############################################################################
 # SPLINE
 
@@ -994,8 +957,6 @@ def test_ogr_dxf_20():
     assert not ogrtest.check_feature_geometry(feat, 'LINESTRING (10.75 62.75,20.637752769146068 63.434832501489716,29.283239084385464 63.396838394381845,36.766943814562865 62.711565975596599,43.169351828522906 61.454563542054103,48.570947995110252 59.70137939067456,53.05221718316956 57.527561818378146,56.693644261545501 55.008659122085049,59.575714099082703 52.220219598715438,61.778911564625851 49.237791545189509,63.383721527019588 46.136923258427423,64.470628855108572 42.993163035349369,65.120118417737459 39.882059172875508,65.412419131869868 36.878358785215056,65.417809785093752 34.025663008687722,65.193643595004147 31.327113252708507,64.796409941597645 28.783146935042897,64.282598204870823 26.394201473456341,63.708697764820236 24.16071428571431,63.131198001442392 22.083122789582241,62.606588294733939 20.161864402825621,62.191358024691354 18.397376543209894,61.941996571311265 16.790096628500525,61.914993314590184 15.340462076462975,62.166837634524704 14.0489103048627,62.754018911111373 12.915878731465167,63.723652286703427 11.940700981548817,65.053571428571416 11.114552964042769,66.690557841792398 10.424954275262921,68.581246558980226 9.859407264767562,70.672272612748785 9.405414282114966,72.910271035711943 9.050477676863418,75.241876860483572 8.782099798571203,77.613725119677511 8.587782996796603,79.97245084590763 8.4550296210979,82.264689071787842 8.371342021033378,84.437074829931987 8.324222546161321,86.436243152953921 8.301173546040012,88.208926721776336 8.289771106365336,89.722559658784164 8.293223374005688,90.990763736417563 8.349615688917151,92.033410218878885 8.501752503862612,92.870370370370395 8.792438271604945,93.521515455094473 9.264477444907039,94.006716737253413 9.960674476531764,94.345845481049565 10.923833819242011,94.558772950685281 12.196759925800654,94.665370410362868 13.82225724897058,94.685509124284636 15.843130241514663,94.639060356652948 18.302183356195791,94.545895371670113 21.242221045776841,94.421471763308503 24.702030018356666,94.215205541358216 28.660279617432039,93.825673773330607 33.049360720184715,93.15014577259474 37.800473760933045,92.085890852519697 42.844819173995376,90.530178326474584 48.113597393690064,88.380277507828495 53.538008854335445,85.533457709950525 59.049253990249873,81.886988246209697 64.578533235751706,77.338138429975174 70.057047025159264,71.784177574615995 75.415995792790937,65.122374993501282 80.586579972965055,57.25 85.5)')
     ds = None
 
-    return 'success'
-
 ###############################################################################
 # CIRCLE
 
@@ -1010,8 +971,6 @@ def test_ogr_dxf_21():
     assert not ogrtest.check_feature_geometry(feat, 'LINESTRING (5 2 3,4.990256201039297 1.720974105023499 3,4.961072274966281 1.443307596159738 3,4.912590402935223 1.168353236728963 3,4.845046783753276 0.897450576732003 3,4.758770483143634 0.631919426697325 3,4.654181830570403 0.373053427696799 3,4.531790371435708 0.122113748856437 3,4.392192384625703 -0.11967705693282 3,4.23606797749979 -0.351141009169893 3,4.064177772475912 -0.571150438746157 3,3.877359201354605 -0.778633481835989 3,3.676522425435433 -0.972579301909577 3,3.462645901302633 -1.152043014426888 3,3.236771613882987 -1.316150290220167 3,3.0 -1.464101615137754 3,2.75348458715631 -1.595176185196668 3,2.498426373663648 -1.70873541826715 3,2.23606797749979 -1.804226065180614 3,1.967687582398672 -1.881182905103986 3,1.694592710667722 -1.939231012048832 3,1.418113853070614 -1.978087581473093 3,1.139597986810004 -1.997563308076383 3,0.860402013189997 -1.997563308076383 3,0.581886146929387 -1.978087581473094 3,0.305407289332279 -1.939231012048832 3,0.032312417601329 -1.881182905103986 3,-0.236067977499789 -1.804226065180615 3,-0.498426373663648 -1.70873541826715 3,-0.75348458715631 -1.595176185196668 3,-1.0 -1.464101615137755 3,-1.236771613882987 -1.316150290220167 3,-1.462645901302633 -1.152043014426888 3,-1.676522425435433 -0.972579301909577 3,-1.877359201354605 -0.778633481835989 3,-2.064177772475912 -0.571150438746158 3,-2.236067977499789 -0.351141009169893 3,-2.392192384625704 -0.11967705693282 3,-2.531790371435707 0.122113748856436 3,-2.654181830570403 0.373053427696798 3,-2.758770483143633 0.631919426697324 3,-2.845046783753275 0.897450576732001 3,-2.912590402935223 1.168353236728963 3,-2.961072274966281 1.443307596159737 3,-2.990256201039297 1.720974105023498 3,-3.0 2.0 3,-2.990256201039297 2.279025894976499 3,-2.961072274966281 2.556692403840262 3,-2.912590402935223 2.831646763271036 3,-2.845046783753276 3.102549423267996 3,-2.758770483143634 3.368080573302675 3,-2.654181830570404 3.626946572303199 3,-2.531790371435708 3.877886251143563 3,-2.392192384625704 4.119677056932819 3,-2.23606797749979 4.351141009169892 3,-2.064177772475912 4.571150438746157 3,-1.877359201354604 4.778633481835989 3,-1.676522425435434 4.972579301909576 3,-1.462645901302632 5.152043014426889 3,-1.236771613882989 5.316150290220166 3,-1.0 5.464101615137753 3,-0.753484587156311 5.595176185196667 3,-0.498426373663649 5.70873541826715 3,-0.23606797749979 5.804226065180615 3,0.032312417601329 5.881182905103985 3,0.305407289332279 5.939231012048833 3,0.581886146929387 5.978087581473094 3,0.860402013189993 5.997563308076383 3,1.139597986810005 5.997563308076383 3,1.418113853070612 5.978087581473094 3,1.69459271066772 5.939231012048833 3,1.96768758239867 5.881182905103986 3,2.236067977499789 5.804226065180615 3,2.498426373663648 5.70873541826715 3,2.75348458715631 5.595176185196668 3,3.0 5.464101615137754 3,3.236771613882985 5.316150290220168 3,3.462645901302634 5.152043014426887 3,3.676522425435431 4.972579301909578 3,3.877359201354603 4.778633481835991 3,4.064177772475912 4.571150438746159 3,4.23606797749979 4.351141009169893 3,4.392192384625702 4.119677056932823 3,4.531790371435708 3.877886251143563 3,4.654181830570404 3.626946572303201 3,4.758770483143634 3.368080573302675 3,4.845046783753275 3.102549423267999 3,4.912590402935223 2.831646763271039 3,4.961072274966281 2.556692403840263 3,4.990256201039298 2.279025894976499 3,5.0 2.0 3)')
     ds = None
 
-    return 'success'
-
 
 ###############################################################################
 # TEXT
@@ -1088,8 +1047,6 @@ def test_ogr_dxf_22():
 
     ds = None
 
-    return 'success'
-
 
 ###############################################################################
 # POLYGON with hole
@@ -1123,8 +1080,6 @@ def test_ogr_dxf_23():
 
     gdal.Unlink('/vsimem/ogr_dxf_23.dxf')
 
-    return 'success'
-
 ###############################################################################
 # HATCH
 
@@ -1148,8 +1103,6 @@ def test_ogr_dxf_24():
     assert not ogrtest.check_feature_geometry(feat, 'POLYGON ((-1 -1,-1 0,0 0,-1 -1))')
     ds = None
 
-    return 'success'
-
 ###############################################################################
 # 3DFACE
 
@@ -1171,8 +1124,6 @@ def test_ogr_dxf_25():
 
     ds = None
 
-    return 'success'
-
 ###############################################################################
 # SOLID (#5380)
 
@@ -1189,8 +1140,6 @@ def test_ogr_dxf_26():
 
     ds = None
 
-    return 'success'
-
 ###############################################################################
 # Test reading a DXF file without .dxf extensions (#5994)
 
@@ -1204,8 +1153,6 @@ def test_ogr_dxf_27():
 
     gdal.Unlink('/vsimem/a_dxf_without_extension')
 
-    return 'success'
-
 ###############################################################################
 # Test reading a ELLIPSE with Z extrusion axis value of -1.0 (#5075)
 
@@ -1227,8 +1174,6 @@ def test_ogr_dxf_28():
 
     ds = None
 
-    return 'success'
-
 ###############################################################################
 # SPLINE with weights
 
@@ -1258,8 +1203,6 @@ def test_ogr_dxf_29():
 
     ds = None
 
-    return 'success'
-
 ###############################################################################
 # SPLINE closed
 
@@ -1283,8 +1226,6 @@ def test_ogr_dxf_30():
 
     ds = None
 
-    return 'success'
-
 ###############################################################################
 # OCS2WCS transformations 1
 
@@ -1723,8 +1664,7 @@ def test_ogr_dxf_31():
         feat.DumpReadable()
         pytest.fail()
 
-    return 'success'
-
+    
 ###############################################################################
 # OCS2WCS transformations 2. Also test RawCodeValues
 
@@ -2296,8 +2236,7 @@ def test_ogr_dxf_32():
         feat.DumpReadable()
         pytest.fail()
 
-    return 'success'
-
+    
 ###############################################################################
 # Test 3D entities (polyface mesh, cylinder, 3D solid)
 
@@ -2378,8 +2317,7 @@ def test_ogr_dxf_33():
         feat.DumpReadable()
         pytest.fail('wrong style string on second 3DSOLID')
 
-    return 'success'
-
+    
 ###############################################################################
 # Writing Triangle geometry and checking if it is written properly
 
@@ -2412,8 +2350,6 @@ def test_ogr_dxf_34():
 
     gdal.Unlink('tmp/triangle_test.dxf')
 
-    return 'success'
-
 ###############################################################################
 # Test reading hatch with elliptical harts
 
@@ -2519,8 +2455,6 @@ def test_ogr_dxf_35():
         "10.0 5.0 0))"""
     assert ogrtest.check_feature_geometry(feat, expected_wkt) == 0
 
-    return 'success'
-
 ###############################################################################
 # Test reading files with only INSERT content (#7006)
 
@@ -2533,8 +2467,6 @@ def test_ogr_dxf_36():
     lyr = ds.GetLayer(0)
     assert lyr.GetFeatureCount() == 5
 
-    return 'success'
-
 ###############################################################################
 # Create a blocks layer only
 
@@ -2566,8 +2498,6 @@ def test_ogr_dxf_37():
 
     gdal.Unlink('/vsimem/ogr_dxf_37.dxf')
 
-    return 'success'
-
 ###############################################################################
 # Test degenerated cases of SOLID (#7038)
 
@@ -2588,8 +2518,7 @@ def test_ogr_dxf_38():
         f.DumpReadable()
         pytest.fail()
 
-    return 'success'
-
+    
 ###############################################################################
 # Test correct reordering of vertices in SOLID (#7038, #7089)
 
@@ -2609,8 +2538,7 @@ def test_ogr_dxf_39():
         f.DumpReadable()
         pytest.fail()
 
-    return 'success'
-
+    
 ###############################################################################
 # Test handing of OCS vs WCS for MTEXT (#7049)
 
@@ -2624,8 +2552,7 @@ def test_ogr_dxf_40():
         f.DumpReadable()
         pytest.fail()
 
-    return 'success'
-
+    
 ###############################################################################
 # Test handing of OCS vs WCS for SOLID, HATCH and INSERT (#7077, #7098)
 
@@ -2720,8 +2647,7 @@ def test_ogr_dxf_41():
         f.DumpReadable()
         pytest.fail()
 
-    return 'success'
-
+    
 ###############################################################################
 # Test insertion of blocks within blocks (#7106)
 
@@ -2784,8 +2710,6 @@ def test_ogr_dxf_42():
     assert lyr.GetFeatureCount() == 4, \
         ('Merging: Expected 4 features, found %d' % lyr.GetFeatureCount())
 
-    return 'success'
-
 ###############################################################################
 # Ensure recursively-included blocks don't fail badly
 
@@ -2796,8 +2720,6 @@ def test_ogr_dxf_43():
     lyr = ds.GetLayer(0)
     assert lyr.GetFeatureCount() == 1
 
-    return 'success'
-
 ###############################################################################
 # General tests of LEADER and MULTILEADER entities (#7111)
 
@@ -3018,8 +2940,7 @@ def test_ogr_dxf_44():
         f.DumpReadable()
         pytest.fail()
 
-    return 'success'
-
+    
 ###############################################################################
 # Test linetype scaling (#7129) and parsing of complex linetypes (#7134)
 
@@ -3053,8 +2974,6 @@ def test_ogr_dxf_45():
     assert feat.GetStyleString() == 'PEN(c:#000000,p:"35g 22.5g")', \
         'Got wrong style string (4)'
 
-    return 'success'
-
 ###############################################################################
 # Test handling of DIMENSION anonymous block insertion (#7120)
 
@@ -3103,8 +3022,7 @@ def test_ogr_dxf_46():
         f.DumpReadable()
         pytest.fail('Wrong style string on DIMENSION text from block')
 
-    return 'success'
-
+    
 ###############################################################################
 # Test handling of DIMENSION fallback when there is no anonymous block (#7120)
 
@@ -3195,8 +3113,7 @@ def test_ogr_dxf_47():
         f.DumpReadable()
         pytest.fail('Wrong style string on third DIMENSION text')
 
-    return 'success'
-
+    
 ###############################################################################
 # Test ByLayer and ByBlock color values (#7130)
 
@@ -3287,8 +3204,7 @@ def test_ogr_dxf_48():
         f.DumpReadable()
         pytest.fail('Wrong style string on feature 15')
 
-    return 'success'
-
+    
 ###############################################################################
 # Test block attributes (ATTRIB entities) (#7139)
 
@@ -3347,8 +3263,7 @@ def test_ogr_dxf_49():
         f.DumpReadable()
         pytest.fail('Wrong AttributeTag value on second ATTDEF')
 
-    return 'success'
-
+    
 ###############################################################################
 # Test extended text styling (#7151) and additional ByBlock/ByLayer tests (#7130)
 
@@ -3400,8 +3315,7 @@ def test_ogr_dxf_50():
         f.DumpReadable()
         pytest.fail('Wrong style string on feature 5')
 
-    return 'success'
-
+    
 ###############################################################################
 # Test transformation of text inside blocks (ACAdjustText function)
 
@@ -3426,8 +3340,7 @@ def test_ogr_dxf_51():
             f.DumpReadable()
             pytest.fail('Wrong style string on feature %d' % x)
 
-    return 'success'
-
+    
 ###############################################################################
 # Test HELIX, TRACE, HATCH with spline boundary, MLINE, and INSERT with rows/columns
 
@@ -3529,8 +3442,7 @@ def test_ogr_dxf_52():
         f.DumpReadable()
         pytest.fail('Wrong geometry on SPLINE')
 
-    return 'success'
-
+    
 ###############################################################################
 # Test block base points
 
@@ -3545,8 +3457,7 @@ def test_ogr_dxf_53():
         f.DumpReadable()
         pytest.fail('Wrong feature geometry')
 
-    return 'success'
-
+    
 
 ###############################################################################
 def test_ogr_dxf_insert_too_many_errors():
@@ -3554,8 +3465,7 @@ def test_ogr_dxf_insert_too_many_errors():
     with gdaltest.error_handler():
         ogr.Open('data/insert-too-many-errors.dxf')
 
-    return 'success'
-
+    
 
 ###############################################################################
 
@@ -3574,8 +3484,6 @@ def test_ogr_dxf_write_geometry_collection_of_unsupported_type():
     ds = None
     gdal.Unlink(tmpfile)
 
-    return 'success'
-
 ###############################################################################
 # cleanup
 
@@ -3584,8 +3492,6 @@ def test_ogr_dxf_cleanup():
     gdaltest.dxf_layer = None
     gdaltest.dxf_ds = None
 
-    return 'success'
-
 ###############################################################################
 #
 
diff --git a/autotest/ogr/ogr_edigeo.py b/autotest/ogr/ogr_edigeo.py
index 9a587d5abf8f..a2202df1b71c 100755
--- a/autotest/ogr/ogr_edigeo.py
+++ b/autotest/ogr/ogr_edigeo.py
@@ -115,8 +115,6 @@ def test_ogr_edigeo_1():
 
     ds.Destroy()
 
-    return 'success'
-
 
 gdaltest_list = [
     test_ogr_edigeo_1]
diff --git a/autotest/ogr/ogr_eeda.py b/autotest/ogr/ogr_eeda.py
index 420d0aa571a7..de674159378c 100644
--- a/autotest/ogr/ogr_eeda.py
+++ b/autotest/ogr/ogr_eeda.py
@@ -52,8 +52,6 @@ def test_eeda_1():
 
     gdal.SetConfigOption('CPL_CURL_ENABLE_VSIMEM', 'YES')
 
-    return 'success'
-
 ###############################################################################
 # Nominal case
 
@@ -303,8 +301,6 @@ def test_eeda_2():
 
     gdal.SetConfigOption('EEDA_BEARER', None)
 
-    return 'success'
-
 ###############################################################################
 # Nominal case where collection is in eedaconf.json
 
@@ -326,8 +322,6 @@ def test_eeda_3():
 
     gdal.SetConfigOption('EEDA_BEARER', None)
 
-    return 'success'
-
 ###############################################################################
 # Test that name and id variants are handled correctly.
 
@@ -411,8 +405,6 @@ def test_eeda_4():
     gdal.SetConfigOption('EEDA_BEARER', None)
     gdal.SetConfigOption('EEDA_URL', None)
 
-    return 'success'
-
 ###############################################################################
 #
 
@@ -435,8 +427,6 @@ def test_eeda_cleanup():
     gdal.Unlink('/vsimem/ee/projects/earthengine-public/assets/collection:listImages?pageToken=myToken')
     gdal.Unlink('/vsimem/ee/projects/earthengine-public/assets/collection:listImages?filter=raw%5Ffilter')
 
-    return 'success'
-
 
 gdaltest_list = [
     test_eeda_1,
diff --git a/autotest/ogr/ogr_elasticsearch.py b/autotest/ogr/ogr_elasticsearch.py
index 966435adeac7..4ab2e8274b6e 100755
--- a/autotest/ogr/ogr_elasticsearch.py
+++ b/autotest/ogr/ogr_elasticsearch.py
@@ -55,8 +55,6 @@ def test_ogr_elasticsearch_init():
 
     gdal.SetConfigOption('CPL_CURL_ENABLE_VSIMEM', 'YES')
 
-    return 'success'
-
 ###############################################################################
 # Test writing into an nonexistent ElasticSearch datastore.
 
@@ -99,8 +97,6 @@ def test_ogr_elasticsearch_nonexistent_server():
         ds = ogrtest.elasticsearch_drv.Open('ES:/vsimem/fakeelasticsearch')
     assert ds is None, 'managed to open invalid ElasticSearch datastore.'
 
-    return 'success'
-
 ###############################################################################
 # Simple test
 
@@ -339,8 +335,6 @@ def test_ogr_elasticsearch_1():
     gdal.Unlink('/vsimem/map.txt')
     assert lyr is not None
 
-    return 'success'
-
 ###############################################################################
 # Geo_shape geometries
 
@@ -384,8 +378,6 @@ def test_ogr_elasticsearch_2():
     assert ret == 0
     feat = None
 
-    return 'success'
-
 ###############################################################################
 # Test bulk insert and layer name laundering
 
@@ -428,8 +420,6 @@ def test_ogr_elasticsearch_3():
 
     ds = None
 
-    return 'success'
-
 ###############################################################################
 # Test basic read functionality
 
@@ -971,8 +961,6 @@ def test_ogr_elasticsearch_4():
         ret = ds.DeleteLayer(0)
     assert ret != 0
 
-    return 'success'
-
 ###############################################################################
 # Write documents with non geojson structure
 
@@ -1207,8 +1195,6 @@ def test_ogr_elasticsearch_5():
     ret = lyr.SetFeature(f)
     assert ret == 0
 
-    return 'success'
-
 ###############################################################################
 # Test reading circle and envelope geometries
 
@@ -1304,8 +1290,7 @@ def test_ogr_elasticsearch_6():
         f.DumpReadable()
         pytest.fail()
 
-    return 'success'
-
+    
 ###############################################################################
 # Test WRITE_MAPPING option
 
@@ -1337,8 +1322,6 @@ def test_ogr_elasticsearch_7():
 
     assert data == '{ "FeatureCollection": { "properties": { "type": { "type": "string" }, "properties": { "properties": { } }, "geometry": { "type": "geo_shape" } } } }'
 
-    return 'success'
-
 ###############################################################################
 # Test SRS support
 
@@ -1393,8 +1376,6 @@ def test_ogr_elasticsearch_8():
     ret = lyr.CreateFeature(f)
     assert ret == 0
 
-    return 'success'
-
 ###############################################################################
 # Test ElasticSearch 5.X
 
@@ -1501,8 +1482,6 @@ def test_ogr_elasticsearch_9():
     f = lyr.GetNextFeature()
     assert f is not None
 
-    return 'success'
-
 ###############################################################################
 # Test SQL
 
@@ -2094,8 +2073,6 @@ def test_ogr_elasticsearch_10():
     assert f is not None
     ds.ReleaseResultSet(sql_lyr)
 
-    return 'success'
-
 ###############################################################################
 # Test isnull and unset
 
@@ -2225,8 +2202,6 @@ def test_ogr_elasticsearch_11():
     f = None
     assert lyr.SyncToDisk() == 0
 
-    return 'success'
-
 ###############################################################################
 # Test authentication
 
@@ -2271,8 +2246,6 @@ def test_ogr_elasticsearch_authentication():
                      open_options=['USERPWD=user:pwd'])
     assert ds is not None
 
-    return 'success'
-
 ###############################################################################
 # Cleanup
 
@@ -2309,8 +2282,6 @@ def test_ogr_elasticsearch_cleanup():
 
     gdal.SetConfigOption('CPL_CURL_ENABLE_VSIMEM', None)
 
-    return 'success'
-
 
 gdaltest_list = [
     test_ogr_elasticsearch_init,
diff --git a/autotest/ogr/ogr_factory.py b/autotest/ogr/ogr_factory.py
index 41a88bb9affc..e0fc730d6b03 100755
--- a/autotest/ogr/ogr_factory.py
+++ b/autotest/ogr/ogr_factory.py
@@ -55,7 +55,6 @@ def test_ogr_factory_1():
     expected_geom = 'LINESTRING (21.75 33.031088913245533 40,22.374083449152831 32.648634669593925 40,22.972155943227843 32.237161430239802 40,23.537664874825239 31.801177382099848 40,24.064414409750082 31.345459257641004 40,24.546633369868303 30.875 40,24.979038463342047 30.394954059253475 40,25.356892169480634 29.910580919184319 40,25.676054644008637 29.427187473276717 40,25.933029076066084 28.95006988128063 40,26.125 28.484455543377237 40,26.249864142195264 28.035445827688662 40,26.306253464980482 27.607960178621322 40,26.293550155134998 27.206682218403525 40,26.211893392779814 26.836008432340218 40,26.062177826491073 26.5 40)'
 
     assert not ogrtest.check_feature_geometry(geom, expected_geom)
-    return 'success'
 
 ###############################################################################
 # Test forceToPolygon()
@@ -95,8 +94,6 @@ def test_ogr_factory_2():
 
     assert not ogrtest.check_feature_geometry(dst_geom, exp_wkt), dst_geom.ExportToWkt()
 
-    return 'success'
-
 ###############################################################################
 # Test forceToMultiPolygon()
 
@@ -135,8 +132,6 @@ def test_ogr_factory_3():
 
     assert not ogrtest.check_feature_geometry(dst_geom, exp_wkt), dst_geom.ExportToWkt()
 
-    return 'success'
-
 ###############################################################################
 # Test forceToMultiPoint()
 
@@ -159,8 +154,6 @@ def test_ogr_factory_4():
 
     assert not ogrtest.check_feature_geometry(dst_geom, exp_wkt), dst_geom.ExportToWkt()
 
-    return 'success'
-
 ###############################################################################
 # Test forceToMultiLineString()
 
@@ -198,7 +191,6 @@ def test_ogr_factory_5():
     dst_geom = ogr.ForceToMultiLineString(src_geom)
 
     assert not ogrtest.check_feature_geometry(dst_geom, exp_wkt), dst_geom.ExportToWkt()
-    return 'success'
 
 
 ###############################################################################
@@ -265,8 +257,7 @@ def test_ogr_factory_6():
             gdal.PopErrorHandler()
         # print(src_geom.ExportToWkt(), dst_geom1.ExportToWkt(), dst_geom2.ExportToWkt(), dst_geom3.ExportToWkt(), dst_geom4.ExportToWkt())
 
-    return 'success'
-
+    
 ###############################################################################
 # Test forceToLineString()
 
@@ -369,8 +360,6 @@ def test_ogr_factory_7():
 
     assert not ogrtest.check_feature_geometry(dst_geom, exp_wkt), dst_geom.ExportToWkt()
 
-    return 'success'
-
 ###############################################################################
 # Test forceTo()
 
@@ -541,8 +530,7 @@ def test_ogr_factory_8():
             print(target_type)
             pytest.fail(dst_geom.ExportToWkt())
 
-    return 'success'
-
+    
 
 gdaltest_list = [
     test_ogr_factory_1,
diff --git a/autotest/ogr/ogr_feature.py b/autotest/ogr/ogr_feature.py
index 6f4ceb08e606..30999b8b3b55 100755
--- a/autotest/ogr/ogr_feature.py
+++ b/autotest/ogr/ogr_feature.py
@@ -178,8 +178,6 @@ def test_ogr_feature_cp_integer():
     assert (vals == [17, 2147483647, 18, 0, None, None, None, None, 15,
                 2147483647, 17, None])
 
-    return 'success'
-
 ###############################################################################
 # Copy to Integer64
 
@@ -221,8 +219,6 @@ def test_ogr_feature_cp_integer64():
 
     assert check(dst_feature, 'field_stringlist', None)
 
-    return 'success'
-
 ###############################################################################
 # Copy to Real
 
@@ -256,8 +252,6 @@ def test_ogr_feature_cp_real():
 
     assert check(dst_feature, 'field_stringlist', None)
 
-    return 'success'
-
 ###############################################################################
 # Copy to String
 
@@ -292,8 +286,6 @@ def test_ogr_feature_cp_string():
 
     assert check(dst_feature, 'field_stringlist', '(2:abc,def)')
 
-    return 'success'
-
 ###############################################################################
 # Copy to Binary
 
@@ -334,8 +326,6 @@ def test_ogr_feature_cp_binary():
 
     assert check(dst_feature, 'field_stringlist', None)
 
-    return 'success'
-
 ###############################################################################
 # Copy to date
 
@@ -370,8 +360,6 @@ def test_ogr_feature_cp_date():
 
     assert check(dst_feature, 'field_stringlist', None)
 
-    return 'success'
-
 ###############################################################################
 # Copy to time
 
@@ -406,8 +394,6 @@ def test_ogr_feature_cp_time():
 
     assert check(dst_feature, 'field_stringlist', None)
 
-    return 'success'
-
 ###############################################################################
 # Copy to datetime
 
@@ -442,8 +428,6 @@ def test_ogr_feature_cp_datetime():
 
     assert check(dst_feature, 'field_stringlist', None)
 
-    return 'success'
-
 ###############################################################################
 # Copy to integerlist
 
@@ -480,8 +464,6 @@ def test_ogr_feature_cp_integerlist():
 
     assert check(dst_feature, 'field_stringlist', None)
 
-    return 'success'
-
 ###############################################################################
 # Copy to integer64list
 
@@ -516,8 +498,6 @@ def test_ogr_feature_cp_integer64list():
 
     assert check(dst_feature, 'field_stringlist', None)
 
-    return 'success'
-
 ###############################################################################
 # Copy to reallist
 
@@ -552,8 +532,6 @@ def test_ogr_feature_cp_reallist():
 
     assert check(dst_feature, 'field_stringlist', None)
 
-    return 'success'
-
 ###############################################################################
 # Copy to stringlist
 
@@ -588,8 +566,6 @@ def test_ogr_feature_cp_stringlist():
 
     assert check(dst_feature, 'field_stringlist', ['abc', 'def'])
 
-    return 'success'
-
 
 ###############################################################################
 # Test SetField() / GetField() with unicode string
@@ -619,8 +595,6 @@ def test_ogr_feature_unicode():
     src_feature.SetField('field_integer64'.decode('utf-8'), 1)
     assert src_feature.GetField('field_integer64') == 1
 
-    return 'success'
-
 ###############################################################################
 # Test 64bit FID
 
@@ -631,7 +605,6 @@ def test_ogr_feature_64bit_fid():
     f = ogr.Feature(feat_def)
     f.SetFID(123456789012345)
     assert f.GetFID() == 123456789012345
-    return 'success'
 
 ###############################################################################
 # Test 64bit integer
@@ -654,8 +627,7 @@ def test_ogr_feature_overflow_64bit_integer():
     if f.GetField(0) != -9223372036854775808:
         f.DumpReadable()
         pytest.fail()
-    return 'success'
-
+    
 ###############################################################################
 # Test SetNullable(), IsNullable() and Validate()
 
@@ -757,8 +729,6 @@ def test_ogr_feature_nullable_validate():
     gdal.PopErrorHandler()
     assert ret == 0
 
-    return 'success'
-
 ###############################################################################
 # Test SetDefault(), GetDefault(), IsDefaultDriverSpecific() and FillUnsetWithDefault()
 
@@ -825,8 +795,7 @@ def test_ogr_feature_default():
         f.DumpReadable()
         pytest.fail()
 
-    return 'success'
-
+    
 ###############################################################################
 # Test GetNativeData(), SetNativeData(), GetNativeMediaType(), SetNativeMediaType():
 
@@ -880,8 +849,7 @@ def test_ogr_feature_native_data():
         assert f.GetNativeMediaType() == 'native_media_type', dialect
         ds.ReleaseResultSet(sql_lyr)
 
-    return 'success'
-
+    
 ###############################################################################
 # Test assigning our geometry to ourselves
 
@@ -897,8 +865,6 @@ def test_ogr_feature_set_geometry_self():
     f.SetGeometry(f.GetGeometryRef())
     assert f.GetGeometryRef().ExportToWkt() == 'POINT (2 49)'
 
-    return 'success'
-
 ###############################################################################
 # Test SetFieldNull(), IsFieldNull()
 
@@ -962,15 +928,11 @@ def test_ogr_feature_null_field():
 
     f = None
 
-    return 'success'
-
 
 def test_ogr_feature_cleanup():
 
     gdaltest.src_feature = None
 
-    return 'success'
-
 
 gdaltest_list = [
     test_ogr_feature_cp_integer,
diff --git a/autotest/ogr/ogr_fgdb.py b/autotest/ogr/ogr_fgdb.py
index c0ec6d82cf5e..62e55efe9997 100755
--- a/autotest/ogr/ogr_fgdb.py
+++ b/autotest/ogr/ogr_fgdb.py
@@ -62,8 +62,7 @@ def test_ogr_fgdb_init():
     except OSError:
         pass
 
-    return 'success'
-
+    
 ###############################################################################
 
 
@@ -228,8 +227,6 @@ def test_ogr_fgdb_1():
 
     ds = None
 
-    return 'success'
-
 ###############################################################################
 # Test DeleteField()
 
@@ -282,8 +279,6 @@ def test_ogr_fgdb_DeleteField():
     assert feat.GetFieldAsString("str2") == "foo2_\xc3\xa9"
     ds = None
 
-    return 'success'
-
 ###############################################################################
 # Run test_ogrsf
 
@@ -300,8 +295,6 @@ def test_ogr_fgdb_2():
 
     assert ret.find('INFO') != -1 and ret.find('ERROR') == -1
 
-    return 'success'
-
 ###############################################################################
 # Run ogr2ogr
 
@@ -333,8 +326,6 @@ def test_ogr_fgdb_3():
 
     assert ret.find('INFO') != -1 and ret.find('ERROR') == -1
 
-    return 'success'
-
 ###############################################################################
 # Test SQL support
 
@@ -360,8 +351,6 @@ def test_ogr_fgdb_sql():
     ds.ReleaseResultSet(sql_lyr)
     ds = None
 
-    return 'success'
-
 ###############################################################################
 # Test delete layer
 
@@ -400,8 +389,7 @@ def test_ogr_fgdb_4():
 
         assert lyr is None, ('failed at iteration %d' % j)
 
-    return 'success'
-
+    
 ###############################################################################
 # Test DeleteDataSource()
 
@@ -419,8 +407,7 @@ def test_ogr_fgdb_5():
     except OSError:
         pass
 
-    return 'success'
-
+    
 ###############################################################################
 # Test adding a layer to an existing feature dataset
 
@@ -441,8 +428,6 @@ def test_ogr_fgdb_6():
     assert ds.GetLayerCount() == 2
     ds = None
 
-    return 'success'
-
 ###############################################################################
 # Test bulk loading (#4420)
 
@@ -478,8 +463,6 @@ def test_ogr_fgdb_7():
 
     gdal.SetConfigOption('FGDB_BULK_LOAD', None)
 
-    return 'success'
-
 ###############################################################################
 # Test field name laundering (#4458)
 
@@ -516,8 +499,7 @@ def test_ogr_fgdb_8():
         assert lyr_defn.GetFieldIndex(expected_names[i]) == i, \
             ('did not find %s' % expected_names[i])
 
-    return 'success'
-
+    
 ###############################################################################
 # Test layer name laundering (#4466)
 
@@ -562,8 +544,7 @@ def test_ogr_fgdb_9():
     for i, exp_name in enumerate(expected_names):
         assert ds.GetLayerByIndex(i).GetName() == exp_name, ('did not find %s' % exp_name)
 
-    return 'success'
-
+    
 ###############################################################################
 # Test SRS support
 
@@ -655,8 +636,6 @@ def test_ogr_fgdb_10():
     assert lyr.GetSpatialRef().ExportToWkt().find('4230') != -1
     ds = None
 
-    return 'success'
-
 ###############################################################################
 # Test all data types
 
@@ -728,8 +707,6 @@ def test_ogr_fgdb_11():
 
     ds = None
 
-    return 'success'
-
 ###############################################################################
 # Test failed Open()
 
@@ -764,8 +741,6 @@ def test_ogr_fgdb_12():
 
     shutil.rmtree('tmp/dummy.gdb')
 
-    return 'success'
-
 ###############################################################################
 # Test failed CreateDataSource() and DeleteDataSource()
 
@@ -806,8 +781,6 @@ def test_ogr_fgdb_13():
     gdal.PopErrorHandler()
     assert ret != 0
 
-    return 'success'
-
 ###############################################################################
 # Test interleaved opening and closing of databases (#4270)
 
@@ -824,8 +797,7 @@ def test_ogr_fgdb_14():
         ds2 = None
         ds1 = None
 
-    return 'success'
-
+    
 ###############################################################################
 # Test opening a FGDB with both SRID and LatestSRID set (#5638)
 
@@ -848,8 +820,6 @@ def test_ogr_fgdb_15():
     assert got_wkt == expected_wkt
     ds = None
 
-    return 'success'
-
 ###############################################################################
 # Test fix for #5674
 
@@ -946,8 +916,6 @@ def test_ogr_fgdb_17():
 
     ds = None
 
-    return 'success'
-
 ###############################################################################
 # Test default values
 
@@ -1028,8 +996,6 @@ def ogr_fgdb_18_test_results():
         pytest.fail()
     ds = None
 
-    return 'success'
-
 ###############################################################################
 # Test transaction support
 
@@ -1589,8 +1555,7 @@ def test_ogr_fgdb_19():
     if ogrtest.openfilegdb_drv is not None:
         ogrtest.openfilegdb_drv.Deregister()
 
-    return 'success'
-
+    
 # Same, but retry without per-layer copying optimization (in the case
 # this was what was tested in previous step)
 
@@ -2010,8 +1975,7 @@ def test_ogr_fgdb_20():
 
     # sys.exit(0)
 
-    return 'success'
-
+    
 ###############################################################################
 # Test M support
 
@@ -2090,8 +2054,7 @@ def test_ogr_fgdb_21():
             feat.DumpReadable()
             pytest.fail(data)
 
-    return 'success'
-
+    
 ###############################################################################
 # Read curves
 
@@ -2130,8 +2093,7 @@ def test_ogr_fgdb_22():
             print(f.GetGeometryRef().ExportToWkt())
             pytest.fail(f_ref.GetGeometryRef().ExportToWkt())
 
-    return 'success'
-
+    
 ###############################################################################
 # Test opening '.'
 
@@ -2146,8 +2108,6 @@ def test_ogr_fgdb_23():
     os.chdir('../..')
     assert ds is not None
 
-    return 'success'
-
 ###############################################################################
 # Read polygons with M component where the M of the closing point is not the
 # one of the starting point (#7017)
@@ -2175,8 +2135,7 @@ def test_ogr_fgdb_24():
             print(f.GetGeometryRef().ExportToIsoWkt())
             pytest.fail(f_ref.GetGeometryRef().ExportToIsoWkt())
 
-    return 'success'
-
+    
 ###############################################################################
 # Test selecting FID column with OGRSQL
 
@@ -2201,8 +2160,7 @@ def test_ogr_fgdb_25():
         f.DumpReadable()
         pytest.fail()
 
-    return 'success'
-
+    
 ###############################################################################
 # Cleanup
 
@@ -2235,8 +2193,7 @@ def test_ogr_fgdb_cleanup():
         ogrtest.openfilegdb_drv.Register()
         ogrtest.fgdb_drv.Register()
 
-    return 'success'
-
+    
 
 gdaltest_list = [
     test_ogr_fgdb_init,
diff --git a/autotest/ogr/ogr_fgdb_stress_test.py b/autotest/ogr/ogr_fgdb_stress_test.py
index c3db01d735bf..64063022935e 100755
--- a/autotest/ogr/ogr_fgdb_stress_test.py
+++ b/autotest/ogr/ogr_fgdb_stress_test.py
@@ -70,8 +70,6 @@ def ogr_fgdb_stress_test_init():
 
     gdal.Unlink("tmp/test." + ogrtest.reference_ext)
 
-    return 'success'
-
 ###############################################################################
 # Generate databases from random operations
 
@@ -161,8 +159,7 @@ def ogr_fgdb_stress_test_1():
     if in_transaction:
         ds_test.CommitTransaction()
 
-    return 'success'
-
+    
 ###############################################################################
 # Compare databases
 
@@ -197,8 +194,7 @@ def ogr_fgdb_stress_test_2():
 
     # sys.exit(0)
 
-    return 'success'
-
+    
 
 ###############################################################################
 # Cleanup
@@ -214,8 +210,6 @@ def ogr_fgdb_stress_test_cleanup():
 
     gdal.Unlink("tmp/test." + ogrtest.reference_ext)
 
-    return 'success'
-
 
 # Do nothing in whole run of the suite
 gdaltest_list = []
diff --git a/autotest/ogr/ogr_geoconcept.py b/autotest/ogr/ogr_geoconcept.py
index 2f2facd43d82..2b9e00715a3a 100755
--- a/autotest/ogr/ogr_geoconcept.py
+++ b/autotest/ogr/ogr_geoconcept.py
@@ -83,8 +83,6 @@ def test_ogr_gxt_1():
 
     assert lyr.GetSpatialRef().IsSame(srs), 'SRS is not the one expected.'
 
-    return 'success'
-
 ###############################################################################
 # Similar test than previous one with TAB separator.
 
@@ -119,8 +117,6 @@ def test_ogr_gxt_2():
                                       'MULTIPOLYGON (((50000 7130000,600000 7130000,600000 6580000,50000 6580000,50000 7130000)))',
                                       max_error=0.000000001) == 0)
 
-    return 'success'
-
 ###############################################################################
 # Read a GXT file containing 2 points, duplicate it, and check the newly written file
 
@@ -200,8 +196,6 @@ def test_ogr_gxt_3():
     assert (ogrtest.check_feature_geometry(feat, 'POINT(2 3)',
                                       max_error=0.000000001) == 0)
 
-    return 'success'
-
 ###############################################################################
 #
 
@@ -217,8 +211,7 @@ def test_ogr_gxt_multipolygon_singlepart_nohole():
         feat.DumpReadable()
         pytest.fail()
 
-    return 'success'
-
+    
 ###############################################################################
 #
 
@@ -237,8 +230,7 @@ def test_ogr_gxt_multipolygon_singlepart_hole():
         feat.DumpReadable()
         pytest.fail()
 
-    return 'success'
-
+    
 ###############################################################################
 #
 
@@ -257,8 +249,7 @@ def test_ogr_gxt_multipolygon_twoparts_second_with_hole():
         feat.DumpReadable()
         pytest.fail()
 
-    return 'success'
-
+    
 ###############################################################################
 #
 
@@ -277,8 +268,7 @@ def test_ogr_gxt_line():
         feat.DumpReadable()
         pytest.fail()
 
-    return 'success'
-
+    
 ###############################################################################
 #
 
@@ -290,8 +280,7 @@ def test_ogr_gxt_cleanup():
         os.remove('tmp/tmp.gxt')
     except OSError:
         pass
-    return 'success'
-
+    
 
 gdaltest_list = [
     test_ogr_gxt_1,
diff --git a/autotest/ogr/ogr_geojson.py b/autotest/ogr/ogr_geojson.py
index 5ee6073ca7c1..f29a460046ef 100755
--- a/autotest/ogr/ogr_geojson.py
+++ b/autotest/ogr/ogr_geojson.py
@@ -209,7 +209,7 @@ def test_ogr_geojson_1():
     gdaltest.geojson_drv = ogr.GetDriverByName('GeoJSON')
 
     if gdaltest.geojson_drv is not None:
-        return 'success'
+        return
     pytest.fail()
 
 ###############################################################################
@@ -236,8 +236,6 @@ def test_ogr_geojson_2():
 
     lyr = None
 
-    return 'success'
-
 ###############################################################################
 # Test file-based DS with standalone "LineString" feature object.
 
@@ -262,8 +260,6 @@ def test_ogr_geojson_3():
 
     lyr = None
 
-    return 'success'
-
 ##############################################################################
 # Test file-based DS with standalone "Polygon" feature object.
 
@@ -288,8 +284,6 @@ def test_ogr_geojson_4():
 
     lyr = None
 
-    return 'success'
-
 ##############################################################################
 # Test file-based DS with standalone "GeometryCollection" feature object.
 
@@ -314,8 +308,6 @@ def test_ogr_geojson_5():
 
     lyr = None
 
-    return 'success'
-
 ##############################################################################
 # Test file-based DS with standalone "MultiPoint" feature object.
 
@@ -340,8 +332,6 @@ def test_ogr_geojson_6():
 
     lyr = None
 
-    return 'success'
-
 ##############################################################################
 # Test file-based DS with standalone "MultiLineString" feature object.
 
@@ -366,8 +356,6 @@ def test_ogr_geojson_7():
 
     lyr = None
 
-    return 'success'
-
 ##############################################################################
 # Test file-based DS with standalone "MultiPolygon" feature object.
 
@@ -392,8 +380,6 @@ def test_ogr_geojson_8():
 
     lyr = None
 
-    return 'success'
-
 ##############################################################################
 # Test translation of data/gjpoint.shp to GeoJSON file
 
@@ -421,8 +407,7 @@ def test_ogr_geojson_9():
         rc = verify_geojson_copy(test[0], test[1], test[2])
         assert rc, ('Verification of copy of ' + test[0] + '.shp failed')
 
-    return 'success'
-
+    
 ##############################################################################
 # Test translation of data/gjpoint.shp to GZip compressed GeoJSON file
 
@@ -450,8 +435,7 @@ def test_ogr_geojson_10():
         rc = verify_geojson_copy(test[0], test[1], test[2])
         assert rc, ('Verification of copy of ' + test[0] + '.shp failed')
 
-    return 'success'
-
+    
 ###############################################################################
 
 
@@ -486,8 +470,6 @@ def test_ogr_geojson_11():
 
     lyr = None
 
-    return 'success'
-
 ###############################################################################
 # Test DS passed as name with standalone "Point" feature object (#3377)
 
@@ -508,8 +490,6 @@ def test_ogr_geojson_12():
     ret = gdaltest.runexternal(test_cli_utilities.get_ogrinfo_path() + ' -ro -al \'{"type": "Point","coordinates": [100.0, 0.0]}\'')
     assert ret.find(' POINT (100 0)') != -1
 
-    return 'success'
-
 
 ###############################################################################
 # Test writing to stdout (#3381)
@@ -524,8 +504,6 @@ def test_ogr_geojson_13():
     rc = copy_shape_to_geojson(test[0], '/vsistdout/')
     assert rc, ('Failed making copy of ' + test[0] + '.shp')
 
-    return 'success'
-
 ###############################################################################
 # Test reading & writing various degenerated geometries
 
@@ -556,8 +534,6 @@ def test_ogr_geojson_14():
 
     out_ds = None
 
-    return 'success'
-
 ###############################################################################
 # Test Feature.ExportToJson (#3870)
 
@@ -595,8 +571,6 @@ def test_ogr_geojson_15():
 
     assert out == expected_out
 
-    return 'success'
-
 ###############################################################################
 # Test reading ESRI point file
 
@@ -649,8 +623,6 @@ def test_ogr_geojson_16():
     lyr = None
     ds = None
 
-    return 'success'
-
 ###############################################################################
 # Test reading ESRI linestring file
 
@@ -703,8 +675,7 @@ def test_ogr_geojson_17():
         feature.DumpReadable()
         pytest.fail()
 
-    return 'success'
-
+    
 ###############################################################################
 # Test reading ESRI polygon file
 
@@ -746,8 +717,6 @@ def test_ogr_geojson_18():
     lyr = None
     ds = None
 
-    return 'success'
-
 ###############################################################################
 # Test reading ESRI multipoint file
 
@@ -778,8 +747,6 @@ def test_ogr_geojson_19():
     lyr = None
     ds = None
 
-    return 'success'
-
 ###############################################################################
 # Test reading files with no extension (#4314)
 
@@ -813,8 +780,7 @@ def test_ogr_geojson_20():
 
         gdal.Unlink('/vsimem/testgj')
 
-    return 'success'
-
+    
 ###############################################################################
 # Test reading output of geocouch spatiallist
 
@@ -845,8 +811,6 @@ def test_ogr_geojson_21():
     lyr = None
     ds = None
 
-    return 'success'
-
 ###############################################################################
 # Same as ogr_geojson_21 with several features
 
@@ -891,8 +855,6 @@ def test_ogr_geojson_22():
     lyr = None
     ds = None
 
-    return 'success'
-
 ###############################################################################
 # Write GeoJSON with bbox and test SRS writing&reading back
 
@@ -933,8 +895,6 @@ def test_ogr_geojson_23():
     assert data.find('"bbox": [ 1.0, 10.0, 1.0, 10.0 ]') != -1, \
         'did not find first feature bbox'
 
-    return 'success'
-
 ###############################################################################
 # Test alternate form of geojson
 
@@ -991,8 +951,7 @@ def test_ogr_geojson_24():
 
         ds = None
 
-    return 'success'
-
+    
 ###############################################################################
 # Test TopoJSON
 
@@ -1080,8 +1039,6 @@ def test_ogr_geojson_25():
     assert ogrtest.check_feature_geometry(feat, 'LINESTRING (0 0,10 0,0 10,10 0,0 0)') == 0
     ds = None
 
-    return 'success'
-
 ###############################################################################
 # Test 64bit support
 
@@ -1149,8 +1106,6 @@ def test_ogr_geojson_26():
 
     assert data.find('{ "type": "Feature", "id": 1234567890123, "properties": { "int64": 1234567890123, "int64list": [ 1234567890123 ] }, "geometry": null }') >= 0
 
-    return 'success'
-
 ###############################################################################
 # Test workaround for 64bit values (returned as strings)
 
@@ -1189,8 +1144,6 @@ def test_ogr_geojson_27():
     lyr = None
     ds = None
 
-    return 'success'
-
 ###############################################################################
 # Test reading ESRI point file with z value
 
@@ -1243,8 +1196,6 @@ def test_ogr_geojson_28():
     lyr = None
     ds = None
 
-    return 'success'
-
 ###############################################################################
 # Test reading ESRI linestring file with z
 
@@ -1276,8 +1227,6 @@ def test_ogr_geojson_29():
     lyr = None
     ds = None
 
-    return 'success'
-
 ###############################################################################
 # Test reading ESRI multipoint file with z
 
@@ -1309,8 +1258,6 @@ def test_ogr_geojson_30():
     lyr = None
     ds = None
 
-    return 'success'
-
 ###############################################################################
 # Test reading ESRI polygon file with z
 
@@ -1342,8 +1289,6 @@ def test_ogr_geojson_31():
     lyr = None
     ds = None
 
-    return 'success'
-
 ###############################################################################
 # Test reading ESRI multipoint file with m, but no z (hasM=true, hasZ omitted)
 
@@ -1374,8 +1319,6 @@ def test_ogr_geojson_32():
     lyr = None
     ds = None
 
-    return 'success'
-
 ###############################################################################
 # Test reading ESRI multipoint file with hasZ=true, but only 2 components.
 
@@ -1406,8 +1349,6 @@ def test_ogr_geojson_33():
     lyr = None
     ds = None
 
-    return 'success'
-
 ###############################################################################
 # Test reading ESRI multipoint file with z and m
 
@@ -1438,8 +1379,6 @@ def test_ogr_geojson_34():
     lyr = None
     ds = None
 
-    return 'success'
-
 ###############################################################################
 # Test handling of huge coordinates (#5377)
 
@@ -1536,8 +1475,7 @@ def test_ogr_geojson_35():
     for ident in range(2, 8):
         assert data.find('{ "type": "Feature", "id": %d, "properties": { }, "geometry": null }' % ident) != -1
 
-    return 'success'
-
+    
 ###############################################################################
 # Test reading file with UTF-8 BOM (which is supposed to be illegal in JSON...) (#5630)
 
@@ -1551,8 +1489,6 @@ def test_ogr_geojson_36():
     assert ds is not None, 'Failed to open datasource'
     ds = None
 
-    return 'success'
-
 #########################################################################
 # Test boolean type support
 
@@ -1597,8 +1533,6 @@ def test_ogr_geojson_37():
 
     assert data.find('"bool": false, "not_bool": 0, "bool_list": [ false, true ], "notbool_list": [ 0, 3 ]') >= 0
 
-    return 'success'
-
 ###############################################################################
 # Test datetime/date/time type support
 
@@ -1632,8 +1566,7 @@ def test_ogr_geojson_38():
         f.DumpReadable()
         pytest.fail()
 
-    return 'success'
-
+    
 ###############################################################################
 # Test id top-object level
 
@@ -1792,8 +1725,7 @@ def test_ogr_geojson_39():
         feat.DumpReadable()
         pytest.fail()
 
-    return 'success'
-
+    
 ###############################################################################
 # Test nested attributes
 
@@ -1845,8 +1777,7 @@ def test_ogr_geojson_40():
         feat.DumpReadable()
         pytest.fail()
 
-    return 'success'
-
+    
 ###############################################################################
 # Test ogr.CreateGeometryFromJson()
 
@@ -1874,8 +1805,6 @@ def test_ogr_geojson_41():
     srs = g.GetSpatialReference()
     assert not srs
 
-    return 'success'
-
 ###############################################################################
 # Test ESRI FeatureService scrolling
 
@@ -2052,8 +1981,6 @@ def test_ogr_geojson_42():
     gdal.Unlink('/vsimem/geojson/test.json?resultRecordCount=1')
     gdal.Unlink('/vsimem/geojson/test.json?resultRecordCount=1&resultOffset=1')
 
-    return 'success'
-
 ###############################################################################
 # Test Feature without geometry
 
@@ -2076,8 +2003,6 @@ def test_ogr_geojson_43():
     lyr = None
     ds = None
 
-    return 'success'
-
 ###############################################################################
 # Test null Feature (#6166)
 
@@ -2089,8 +2014,7 @@ def test_ogr_geojson_44():
     with gdaltest.error_handler():
         ogr.Open("""{"type": "FeatureCollection", "features":[ null ]}""")
 
-    return 'success'
-
+    
 ###############################################################################
 # Test native data support
 
@@ -2214,8 +2138,6 @@ def test_ogr_geojson_45():
 """
     assert json.loads(got) == json.loads(expected)
 
-    return 'success'
-
 ###############################################################################
 # Test that writing JSon content as value of a string field is serialized as it
 
@@ -2240,8 +2162,6 @@ def test_ogr_geojson_46():
 
     assert data.find('{ "myprop": { "a": "b" } }') >= 0
 
-    return 'success'
-
 ###############################################################################
 # Test update support
 
@@ -2396,8 +2316,6 @@ def test_ogr_geojson_47():
 
     gdal.Unlink('/vsimem/ogr_geojson_47.json')
 
-    return 'success'
-
 ###############################################################################
 # Test update support with file that has a single feature not in a FeatureCollection
 
@@ -2434,8 +2352,6 @@ def test_ogr_geojson_48():
        data.find('FeatureCollection') < 0 and \
        data.find('"myprop": "another_value"') >= 0)
 
-    return 'success'
-
 ###############################################################################
 # Test ARRAY_AS_STRING
 
@@ -2459,8 +2375,6 @@ def test_ogr_geojson_49():
 
     gdal.Unlink('/vsimem/ogr_geojson_49.json')
 
-    return 'success'
-
 ###############################################################################
 # Test that we serialize floating point values with enough significant figures
 
@@ -2529,8 +2443,6 @@ def test_ogr_geojson_50():
 
     assert data.find('0.00001234') >= 0 and data.find('1.23456789012456') >= 0
 
-    return 'success'
-
 ###############################################################################
 # Test writing empty geometries
 
@@ -2593,8 +2505,6 @@ def test_ogr_geojson_51():
 
     assert data.find('{ "id": 7 }, "geometry": { "type": "GeometryCollection", "geometries": [ ] } }') >= 0
 
-    return 'success'
-
 ###############################################################################
 # Test NULL type detection
 
@@ -2621,8 +2531,6 @@ def test_ogr_geojson_52():
     assert fld.GetNameRef() == 'double'
     assert fld.GetType() == ogr.OFTReal
 
-    return 'success'
-
 ###############################################################################
 # Test that M is ignored (this is a test of OGRLayer::CreateFeature() actually)
 
@@ -2646,8 +2554,6 @@ def test_ogr_geojson_53():
 
     assert data.find('{ "type": "Point", "coordinates": [ 1.0, 2.0, 3.0 ] }') >= 0
 
-    return 'success'
-
 ###############################################################################
 # Test NULL type detection when first value is null
 
@@ -2681,7 +2587,6 @@ def test_ogr_geojson_54():
     assert fld.GetWidth() == 1
     fld = lyr.GetLayerDefn().GetFieldDefn(5)
     assert fld.GetType() == ogr.OFTString
-    return 'success'
 
 ###############################################################################
 # Test RFC 7946
@@ -2794,8 +2699,6 @@ def test_ogr_geojson_55():
 """
     assert json.loads(got) == json.loads(expected)
 
-    return 'success'
-
 ###############################################################################
 # Test RFC 7946 (that require geos)
 
@@ -2864,8 +2767,6 @@ def test_ogr_geojson_56():
 """
     assert json.loads(got) == json.loads(expected)
 
-    return 'success'
-
 ###############################################################################
 # Test RFC 7946 and reprojection
 
@@ -3085,8 +2986,6 @@ def test_ogr_geojson_57():
 """
     assert json.loads(got) == json.loads(expected)
 
-    return 'success'
-
 ###############################################################################
 # Test using the name member of FeatureCollection
 
@@ -3110,8 +3009,6 @@ def test_ogr_geojson_58():
     ds = None
     gdal.Unlink('/vsimem/ogr_geojson_58.json')
 
-    return 'success'
-
 ###############################################################################
 # Test using the description member of FeatureCollection
 
@@ -3137,8 +3034,6 @@ def test_ogr_geojson_59():
     ds = None
     gdal.Unlink('/vsimem/ogr_geojson_59.json')
 
-    return 'success'
-
 ###############################################################################
 # Test null vs unset field
 
@@ -3177,8 +3072,6 @@ def test_ogr_geojson_60():
        data.find('"properties": { "foo": null }') >= 0 and \
        data.find('"properties": { }') >= 0)
 
-    return 'success'
-
 
 ###############################################################################
 # Test corner cases
@@ -3208,8 +3101,6 @@ def test_ogr_geojson_61():
     ds = None
     gdal.Unlink('/vsimem/ogr_geojson_61.json')
 
-    return 'success'
-
 ###############################################################################
 # Test crs object
 
@@ -3289,8 +3180,6 @@ def test_ogr_geojson_62():
     srs = lyr.GetSpatialRef()
     assert srs.ExportToWkt().find('32631') >= 0
 
-    return 'success'
-
 ###############################################################################
 # Extensive test of field tye promotion
 
@@ -3325,8 +3214,6 @@ def test_ogr_geojson_64():
     assert (ogrtest.check_feature_geometry(ogr.CreateGeometryFromJson(g.ExportToJson()),
                                       ogr.CreateGeometryFromWkt('LINESTRING (1 2,4 5)')) == 0)
 
-    return 'success'
-
 ###############################################################################
 # Test feature geometry CRS when CRS set on the FeatureCollection
 # See https://github.com/r-spatial/sf/issues/449#issuecomment-319369945
@@ -3350,8 +3237,6 @@ def test_ogr_geojson_65():
     pcs = int(srs.GetAuthorityCode('PROJCS'))
     assert pcs == 32631, 'Spatial reference for individual geometry was not valid'
 
-    return 'success'
-
 ###############################################################################
 # Test features with properties not being a dictionary
 
@@ -3375,8 +3260,6 @@ def test_ogr_geojson_66():
     lyr = ds.GetLayer(0)
     assert lyr.GetLayerDefn().GetFieldCount() == 0
 
-    return 'success'
-
 
 ###############################################################################
 # Test reading GeoJSON files starting with {"features":[{"geometry":.... (#7198)
@@ -3388,7 +3271,6 @@ def test_ogr_geojson_67():
     assert ds.GetDriver().GetName() == 'GeoJSON'
     lyr = ds.GetLayer(0)
     assert lyr.GetFeatureCount() == 1
-    return 'success'
 
 
 ###############################################################################
@@ -3401,7 +3283,6 @@ def test_ogr_geojson_68():
     assert ds.GetDriver().GetName() == 'ESRIJSON'
     lyr = ds.GetLayer(0)
     assert lyr.GetFeatureCount() == 1
-    return 'success'
 
 ###############################################################################
 
@@ -3480,8 +3361,6 @@ def test_ogr_geojson_id_field_and_id_type():
     gdal.Unlink('/vsimem/out.json')
     assert got.find('"id": 35043411, "properties": { "AREA": 215229.266, "EAS_ID": 168 }') >= 0
 
-    return 'success'
-
 ###############################################################################
 
 
@@ -3518,8 +3397,6 @@ def test_ogr_geojson_geom_export_failure():
         geojson = g.ExportToJson()
     assert geojson is None
 
-    return 'success'
-
 ###############################################################################
 
 
@@ -3537,8 +3414,6 @@ def test_ogr_geojson_starting_with_crs():
 }}]}""")
     assert ds is not None
 
-    return 'success'
-
 ###############################################################################
 # Test we properly flush the file in SyncToDisk() in append situations
 
@@ -3571,8 +3446,6 @@ def test_ogr_geojson_append_flush():
     ds2 = None
     gdal.Unlink(tmpfilename)
 
-    return 'success'
-
 
 ###############################################################################
 
@@ -3581,7 +3454,6 @@ def test_ogr_geojson_empty_geometrycollection():
 
     g = ogr.CreateGeometryFromJson('{"type": "GeometryCollection", "geometries": []}')
     assert g.ExportToWkt() == 'GEOMETRYCOLLECTION EMPTY'
-    return 'success'
 
 
 ###############################################################################
@@ -3611,8 +3483,6 @@ def test_ogr_esrijson_without_geometryType():
     f = lyr.GetNextFeature()
     assert f.GetGeometryRef() is not None
 
-    return 'success'
-
 
 ###############################################################################
 
@@ -3632,8 +3502,7 @@ def test_ogr_geojson_read_fields_with_different_case():
         f.DumpReadable()
         pytest.fail()
 
-    return 'success'
-
+    
 ###############################################################################
 # Test bugfix for https://github.com/OSGeo/gdal/issues/1068
 
@@ -3676,7 +3545,6 @@ def test_ogr_geojson_clip_geometries_rfc7946():
     ds = None
 
     gdal.Unlink(tmpfilename)
-    return 'success'
 
 ###############################################################################
 # Test bugfix for https://github.com/OSGeo/gdal/issues/1109
@@ -3737,7 +3605,6 @@ def test_ogr_geojson_non_finite():
     ds = None
 
     gdal.Unlink(tmpfilename)
-    return 'success'
 
 ###############################################################################
 
@@ -3774,8 +3641,7 @@ def test_ogr_geojson_cleanup():
     for f in gdal.ReadDir('/vsimem/geojson'):
         gdal.Unlink('/vsimem/geojson/' + f)
 
-    return 'success'
-
+    
 
 gdaltest_list = [
     test_ogr_geojson_1,
diff --git a/autotest/ogr/ogr_geojsonseq.py b/autotest/ogr/ogr_geojsonseq.py
index db127d48e9a3..8bf6f68e4305 100755
--- a/autotest/ogr/ogr_geojsonseq.py
+++ b/autotest/ogr/ogr_geojsonseq.py
@@ -88,8 +88,6 @@ def _ogr_geojsonseq_create(filename, lco, expect_rs):
 
     ogr.GetDriverByName('GeoJSONSeq').DeleteDataSource(filename)
 
-    return 'success'
-
 
 def test_ogr_geojsonseq_lf():
     return _ogr_geojsonseq_create('/vsimem/test', [], False)
@@ -109,7 +107,6 @@ def test_ogr_geojsonseq_inline():
 {"type":"Feature","properties":{},"geometry":null}""")
     lyr = ds.GetLayer(0)
     assert lyr.GetFeatureCount() == 2
-    return 'success'
 
 
 def test_ogr_geojsonseq_prefix():
@@ -117,7 +114,6 @@ def test_ogr_geojsonseq_prefix():
     ds = ogr.Open("""GeoJSONSeq:data/test.geojsonl""")
     lyr = ds.GetLayer(0)
     assert lyr.GetFeatureCount() == 2
-    return 'success'
 
 
 def test_ogr_geojsonseq_seq_geometries():
@@ -132,8 +128,7 @@ def test_ogr_geojsonseq_seq_geometries():
             f.DumpReadable()
             pytest.fail()
 
-    return 'success'
-
+    
 
 def test_ogr_geojsonseq_reprojection():
 
@@ -159,8 +154,6 @@ def test_ogr_geojsonseq_reprojection():
 
     ogr.GetDriverByName('GeoJSONSeq').DeleteDataSource(filename)
 
-    return 'success'
-
 
 def test_ogr_geojsonseq_read_rs_json_pretty():
 
@@ -176,7 +169,6 @@ def test_ogr_geojsonseq_read_rs_json_pretty():
         f.DumpReadable()
         pytest.fail()
     assert lyr.GetNextFeature() is None
-    return 'success'
 
 
 def test_ogr_geojsonseq_test_ogrsf():
@@ -190,8 +182,6 @@ def test_ogr_geojsonseq_test_ogrsf():
 
     assert ret.find('INFO') != -1 and ret.find('ERROR') == -1
 
-    return 'success'
-
 
 gdaltest_list = [
     test_ogr_geojsonseq_lf,
diff --git a/autotest/ogr/ogr_geom.py b/autotest/ogr/ogr_geom.py
index 389800041436..9aae6ea1788a 100755
--- a/autotest/ogr/ogr_geom.py
+++ b/autotest/ogr/ogr_geom.py
@@ -57,8 +57,6 @@ def test_ogr_geom_area():
     area = geom.Area()
     assert abs(area - 99.5) <= 0.00000000001, ('Area() result wrong, got %g.' % area)
 
-    return 'success'
-
 ###############################################################################
 # Test Area calculation for a LinearRing (which exercises special case of
 # getGeometryType value).
@@ -76,8 +74,6 @@ def test_ogr_geom_area_linearring():
     area = geom.GetArea()
     assert abs(area - 100.0) <= 0.00000000001, ('Area result wrong, got %g.' % area)
 
-    return 'success'
-
 ###############################################################################
 # Test Area calculation for a GeometryCollection
 
@@ -91,8 +87,6 @@ def test_ogr_geom_area_geometrycollection():
     area = geom.Area()
     assert abs(area - 1) <= 0.00000000001, ('Area() result wrong, got %g.' % area)
 
-    return 'success'
-
 ###############################################################################
 # Test Area calculation for a LinearRing whose coordinates are shifted by a
 # huge value With algorithm prior to #3556, this would return 0.
@@ -111,8 +105,6 @@ def test_ogr_geom_area_linearring_big_offset():
     area = geom.GetArea()
     assert abs(area - 100.0) <= 0.00000000001, ('Area result wrong, got %g.' % area)
 
-    return 'success'
-
 ###############################################################################
 # Test Area calculation for a Triangle
 
@@ -130,8 +122,6 @@ def test_ogr_geom_area_triangle():
     area = geom.Area()
     assert abs(area - 4999.5) >= 0.00000000001, ('Area() result wrong, got %g.' % area)
 
-    return 'success'
-
 
 def test_ogr_geom_is_empty():
 
@@ -145,7 +135,6 @@ def test_ogr_geom_is_empty():
     assert geom, ("A geometry could not be created from wkt: %s" % geom_wkt)
 
     assert not geom.IsEmpty(), "IsEmpty returning true for a non-empty geometry"
-    return 'success'
 
 ###############################################################################
 # Test if a Triangle is Empty
@@ -168,7 +157,6 @@ def test_ogr_geom_is_empty_triangle():
     assert geom, ("A geometry could not be created from wkt: %s" % geom_wkt)
 
     assert not geom.IsEmpty(), "IsEmpty returning true for a non-empty geometry"
-    return 'success'
 
 
 def test_ogr_geom_pickle():
@@ -180,8 +168,6 @@ def test_ogr_geom_pickle():
 
     assert geom.Equal(g), "pickled geometries were not equal"
 
-    return 'success'
-
 ###############################################################################
 # Test suite for PolyhedralSurface
 
@@ -262,8 +248,6 @@ def test_ogr_geom_polyhedral_surface():
     wkt = g.ExportToIsoWkt()
     assert wkt == 'POLYHEDRALSURFACE ZM (((0 0 1 2,0 1 1 2,1 1 1 2,0 0 1 2)),((10 10 0 0,10 11 0 0,11 11 0 0,10 10 0 0)))'
 
-    return 'success'
-
 ###############################################################################
 # Test suite for TIN
 
@@ -366,8 +350,6 @@ def test_ogr_geom_tin():
     assert g.AddGeometry(ogr.CreateGeometryFromWkt('POLYGON ((0 0,0 1,1 1,0 0))')) == 0
     assert g.ExportToIsoWkt() == 'TIN (((0 0,0 1,1 1,0 0)))'
 
-    return 'success'
-
 ###############################################################################
 # Test OGRGeometry::getBoundary() result for point.
 
@@ -388,8 +370,6 @@ def test_ogr_geom_boundary_point():
     assert bnd.GetGeometryType() == ogr.wkbGeometryCollection, \
         'Boundary not reported as GEOMETRYCOLLECTION EMPTY'
 
-    return 'success'
-
 ###############################################################################
 # Test OGRGeometry::getBoundary() result for multipoint.
 
@@ -406,8 +386,6 @@ def test_ogr_geom_boundary_multipoint():
     assert bnd.GetGeometryType() == ogr.wkbGeometryCollection, \
         'Boundary not reported as GEOMETRYCOLLECTION EMPTY'
 
-    return 'success'
-
 ###############################################################################
 # Test OGRGeometry::getBoundary() result for linestring.
 
@@ -436,8 +414,6 @@ def test_ogr_geom_boundary_linestring():
 
     assert bnd.GetGeometryCount() == 0, 'Boundary not reported as MULTIPOINT EMPTY'
 
-    return 'success'
-
 ###############################################################################
 # Test OGRGeometry::getBoundary() result for polygon.
 
@@ -454,8 +430,6 @@ def test_ogr_geom_boundary_polygon():
     assert bnd.GetGeometryType() == ogr.wkbLineString, \
         'Boundary not reported as non-empty LINESTRING'
 
-    return 'success'
-
 ###############################################################################
 # Test OGRBuildPolygonFromEdges() on a geometry collection of line strings
 
@@ -486,8 +460,7 @@ def test_ogr_geom_build_from_edges_1():
     except:
         pytest.fail()
 
-    return 'success'
-
+    
 ###############################################################################
 # Test OGRBuildPolygonFromEdges() on a multilinestring
 
@@ -517,8 +490,7 @@ def test_ogr_geom_build_from_edges_2():
     except:
         pytest.fail()
 
-    return 'success'
-
+    
 ###############################################################################
 # Test OGRBuildPolygonFromEdges() on invalid geometries
 
@@ -546,8 +518,7 @@ def test_ogr_geom_build_from_edges_3():
     except:
         pass
 
-    return 'success'
-
+    
 ###############################################################################
 # Test OGRBuildPolygonFromEdges() and identify exterior ring (#3610)
 
@@ -588,8 +559,7 @@ def test_ogr_geom_build_from_edges_4():
     except:
         pytest.fail()
 
-    return 'success'
-
+    
 ###############################################################################
 # Test GetArea() on empty linear ring (#2792)
 
@@ -601,8 +571,6 @@ def test_ogr_geom_area_empty_linearring():
     area = geom.GetArea()
     assert area == 0
 
-    return 'success'
-
 ###############################################################################
 # Test TransformTo()
 
@@ -632,8 +600,6 @@ def test_ogr_geom_transform_to():
         ret = geom.TransformTo(sr2)
     assert not (ret == 0 or gdal.GetLastErrorMsg() == '')
 
-    return 'success'
-
 ###############################################################################
 # Test Transform()
 
@@ -658,8 +624,6 @@ def test_ogr_geom_transform():
     assert abs(geom.GetX() - 426857) <= 1 and abs(geom.GetY() - 5427937) <= 1, \
         geom.ExportToWkt()
 
-    return 'success'
-
 ###############################################################################
 # Test CloseRings()
 
@@ -674,8 +638,6 @@ def test_ogr_geom_closerings():
     geom.CloseRings()
     assert geom.ExportToWkt() == 'POLYGON ((0 0,0 1,1 1,1 0,0 0))'
 
-    return 'success'
-
 ###############################################################################
 # Test Segmentize()
 
@@ -704,8 +666,7 @@ def test_ogr_geom_segmentize():
             print('%.18g' % (g1.GetPoint(i)[0] - g2.GetPoint(g1.GetPointCount() - 1 - i)[0]))
             pytest.fail('%.18g' % (g1.GetPoint(i)[1] - g2.GetPoint(g1.GetPointCount() - 1 - i)[1]))
 
-    return 'success'
-
+    
 ###############################################################################
 # Test Value()
 
@@ -734,8 +695,6 @@ def test_ogr_geom_value():
     expected_p = ogr.CreateGeometryFromWkt('POINT (5 0)')
     assert ogrtest.check_feature_geometry(p, expected_p) == 0
 
-    return 'success'
-
 ###############################################################################
 # Test FlattenTo2D(), GetDimension() and GetCoordinateDimension()
 
@@ -754,8 +713,6 @@ def test_ogr_geom_flattenTo2D():
 
     assert geom.ExportToWkt() == 'POINT (1 2)'
 
-    return 'success'
-
 ###############################################################################
 # Test FlattenTo2D(), GetDimension() and GetCoordinateDimension() for Triangle
 
@@ -774,8 +731,6 @@ def test_ogr_geom_flattenTo2D_triangle():
 
     assert geom.ExportToWkt() == 'TRIANGLE ((0 0,100 0,0 100,0 0))'
 
-    return 'success'
-
 ###############################################################################
 
 
@@ -838,8 +793,6 @@ def test_ogr_geom_linestring_limits():
     geom = ogr.CreateGeometryFromWkt('LINESTRING(0 0, 1 0)')
     assert geom.Length() == 1
 
-    return 'success'
-
 ###############################################################################
 
 
@@ -849,8 +802,6 @@ def test_ogr_geom_coord_round():
     wkt = geom.ExportToWkt()
     assert wkt == 'POINT (370441.86 5591000.59)', 'did not get expected WKT'
 
-    return 'success'
-
 ###############################################################################
 
 
@@ -860,8 +811,6 @@ def test_ogr_geom_coord_round_2():
     wkt = geom.ExportToWkt()
     assert wkt == 'POINT (1.0 169.600374)', 'did not get expected WKT'
 
-    return 'success'
-
 ###############################################################################
 # Test Area calculation for a Point
 
@@ -875,8 +824,6 @@ def test_ogr_geom_area_point():
         area = geom.Area()
     assert area == 0, ('Area() result wrong, got %g.' % area)
 
-    return 'success'
-
 ###############################################################################
 # Test Length calculation for a Point
 
@@ -891,8 +838,6 @@ def test_ogr_geom_length_point():
         length = geom.Length()
     assert length == 0, ('Length() result wrong, got %g.' % length)
 
-    return 'success'
-
 ###############################################################################
 # Test Length calculation for a MultiLineString
 
@@ -906,8 +851,6 @@ def test_ogr_geom_length_multilinestring():
     length = geom.Length()
     assert abs(length - 2) <= 0.00000000001, ('Length() result wrong, got %g.' % length)
 
-    return 'success'
-
 ###############################################################################
 # Test Length calculation for a GeometryCollection
 
@@ -921,8 +864,6 @@ def test_ogr_geom_length_geometrycollection():
     length = geom.Length()
     assert abs(length - 4) <= 0.00000000001, ('Length() result wrong, got %g.' % length)
 
-    return 'success'
-
 ###############################################################################
 # Test Geometry.GetPoints() (#4016)
 
@@ -955,8 +896,6 @@ def test_ogr_geom_getpoints():
     points = geom.GetPoints(nCoordDimension=2)
     assert points == [(0.0, 1.0)], 'did not get expected points (8)'
 
-    return 'success'
-
 ###############################################################################
 # Test OGRGeometry::empty()
 
@@ -969,8 +908,6 @@ def test_ogr_geom_empty():
 
     assert wkt == 'POLYGON EMPTY'
 
-    return 'success'
-
 ###############################################################################
 # Test OGRGeometry::empty() for Triangle
 
@@ -983,8 +920,6 @@ def test_ogr_geom_empty_triangle():
 
     assert wkt == 'TRIANGLE EMPTY'
 
-    return 'success'
-
 ###############################################################################
 # Test parsing WKT made of 2D and 3D parts
 
@@ -1007,8 +942,6 @@ def test_ogr_geom_mixed_coordinate_dimension():
     assert got_wkt == expected_wkt, \
         ('for %s: got %s, expected %s' % (wkt, got_wkt, expected_wkt))
 
-    return 'success'
-
 ###############################################################################
 # Test GetEnvelope3D()
 
@@ -1055,8 +988,6 @@ def test_ogr_geom_getenvelope3d():
     expected_envelope = (0.0, 100.0, 0.0, 100.0, 0.0, 100.0)
     assert envelope == expected_envelope, 'did not get expected envelope (8)'
 
-    return 'success'
-
 ###############################################################################
 # Test importing/exporting XXX Z EMPTY
 
@@ -1075,8 +1006,7 @@ def test_ogr_geom_z_empty():
         out_wkt = g2.ExportToIsoWkt()
         assert in_wkt == out_wkt
 
-    return 'success'
-
+    
 ###############################################################################
 # Test HasCurveGeometry and GetLinearGeometry
 
@@ -1108,8 +1038,6 @@ def test_ogr_geom_getlineargeometry():
     assert g.HasCurveGeometry()
     assert g.HasCurveGeometry(True)
 
-    return 'success'
-
 ###############################################################################
 # Test GetDimension()
 
@@ -1139,8 +1067,6 @@ def test_ogr_geom_getdimension():
     g = ogr.CreateGeometryFromWkt('GEOMETRYCOLLECTION(POINT (0 1), LINESTRING EMPTY, POLYGON EMPTY)')
     assert g.GetDimension() == 2
 
-    return 'success'
-
 ###############################################################################
 # Test triangle
 
@@ -1164,8 +1090,6 @@ def test_ogr_geom_triangle():
     polygon_wkt = ogr.ForceTo(geom.Clone(), ogr.wkbMultiPolygon).ExportToWkt()
     assert polygon_wkt == 'MULTIPOLYGON (((0 0,0 1,1 1,0 0)))'
 
-    return 'success'
-
 ###############################################################################
 # Test importing invalid triangle WKT
 
@@ -1197,8 +1121,6 @@ def test_ogr_geom_triangle_invalid_wkt():
         geom = ogr.CreateGeometryFromWkt(geom_wkt)
     assert geom is None
 
-    return 'success'
-
 ###############################################################################
 # Test OGRTriangle. Tests if the GEOS/SFCGAL methods are working
 
@@ -1218,8 +1140,6 @@ def test_ogr_geom_triangle_sfcgal():
     g4 = ogr.CreateGeometryFromWkt('TRIANGLE ((0.5 0.5 0,0 0 0,1 0 0,0.5 0.5 0))')
     assert g4.Equals(g3)
 
-    return 'success'
-
 ###############################################################################
 # Test OGRCircularString
 
@@ -1585,8 +1505,7 @@ def test_ogr_geom_circularstring():
         out_wkt = g2.ExportToWkt()
         assert in_wkt == out_wkt
 
-    return 'success'
-
+    
 ###############################################################################
 # Test OGRCompoundCurve
 
@@ -1851,8 +1770,7 @@ def test_ogr_geom_compoundcurve():
         out_wkt = g2.ExportToWkt()
         assert in_wkt == out_wkt
 
-    return 'success'
-
+    
 ###############################################################################
 # Test OGRCurvePolygon
 
@@ -2105,8 +2023,6 @@ def test_ogr_geom_curvepolygon():
     g = ogr.CreateGeometryFromWkt('CURVEPOLYGON( COMPOUNDCURVE( CIRCULARSTRING(0 0,0.5 -0.5,1 0,1.5 0.5,2 0), (2 0,2 1,0 1,0 0) ) )')
     assert abs(g.Area() - 2.0) <= 1e-10
 
-    return 'success'
-
 ###############################################################################
 # Test OGRMultiCurve
 
@@ -2183,8 +2099,6 @@ def test_ogr_geom_multicurve():
     gdal.PopErrorHandler()
     assert g is None
 
-    return 'success'
-
 ###############################################################################
 # Test OGRMultiSurface
 
@@ -2271,8 +2185,6 @@ def test_ogr_geom_multisurface():
     gdal.PopErrorHandler()
     assert g is None
 
-    return 'success'
-
 ###############################################################################
 # Test GetCurveGeometry
 
@@ -2612,8 +2524,7 @@ def test_ogr_geom_getcurvegeometry():
         g1 = g1.GetCurveGeometry()
         assert g1.ExportToWkt() == 'CURVEPOLYGON (CIRCULARSTRING (1.5 2.0,0.5 2.0,1.5 2.0))'
 
-    return 'success'
-
+    
 ###############################################################################
 # Test OGR_GT_ functions
 
@@ -2830,8 +2741,7 @@ def test_ogr_geom_gt_functions():
     for (gt, res) in tuples:
         assert ogr.GT_GetLinear(gt) == res
 
-    return 'success'
-
+    
 ###############################################################################
 # Limit cases
 
@@ -2879,8 +2789,7 @@ def test_ogr_geom_api_limit_tests():
 
         p.AddGeometryDirectly(p)
 
-    return 'success'
-
+    
 ###############################################################################
 # Test Equals
 
@@ -2916,8 +2825,6 @@ def test_ogr_geom_equals():
     assert not gc_p_0.Equals(gc_empty)
     assert not gc_p_0.Equals(gc_p_1)
 
-    return 'success'
-
 ###############################################################################
 # Test FlattenTo2D(), SetCoordinateDimension(2) and SetCoordinateDimension(3) with Measured geometries
 
@@ -2992,8 +2899,6 @@ def test_ogr_geom_measured_geometries_to_2D_or_3D():
     g = ogr.CreateGeometryFromWkt('MULTIPOINT (1 2 3 4)')
     assert g.ExportToIsoWkt() == 'MULTIPOINT ZM ((1 2 3 4))'
 
-    return 'success'
-
 ###############################################################################
 # Test PostGIS EWKT with XYM
 
@@ -3007,8 +2912,7 @@ def test_ogr_geom_postgis_ewkt_xym():
         geom = ogr.CreateGeometryFromWkt(before)
         assert geom.ExportToIsoWkt() == after, before
 
-    return 'success'
-
+    
 ###############################################################################
 # Test ogr.wkbCurve / ogr.wkbSurface
 
@@ -3027,8 +2931,7 @@ def test_ogr_geom_curve_surface():
     for (wkb_type, name) in tests:
         assert ogr.GeometryTypeToName(wkb_type) == name
 
-    return 'success'
-
+    
 ###############################################################################
 # Test importing corrupted WKB
 
@@ -3086,8 +2989,7 @@ def test_ogr_geom_import_corrupted_wkb():
                     g = ogr.CreateGeometryFromWkb(str(wkb[0:i]))
             assert g is None, (wkt, i)
 
-    return 'success'
-
+    
 ###############################################################################
 # Test conversions from/into triangle, TIN, PS
 
@@ -3140,8 +3042,6 @@ def test_ogr_geom_triangle_ps_tin_conversion():
     g = ogr.ForceTo(ogr.CreateGeometryFromWkt('POLYHEDRALSURFACE (((0 0,0 1,1 1,0 0)))'), ogr.wkbGeometryCollection)
     assert g.ExportToWkt() == 'GEOMETRYCOLLECTION (POLYGON ((0 0,0 1,1 1,0 0)))'
 
-    return 'success'
-
 ###############################################################################
 
 
@@ -3155,8 +3055,6 @@ def test_ogr_geom_multipoint_envelope_bug():
     minx, maxx, miny, maxy, minz, maxz = g.GetEnvelope3D()
     assert (minx, maxx, miny, maxy, minz, maxz) == (0, 1, 0, 1, 0, 1)
 
-    return 'success'
-
 ###############################################################################
 
 
@@ -3167,8 +3065,6 @@ def test_ogr_geom_polygon_empty_ring():
     g.AddGeometryDirectly(g2)
     assert g.IsEmpty()
 
-    return 'success'
-
 ###############################################################################
 
 
@@ -3183,8 +3079,6 @@ def test_ogr_geom_polygon_intersects_point():
     assert poly.Intersects(point) == 1
     assert poly.Contains(point) == 0
 
-    return 'success'
-
 ###############################################################################
 # Test fix for #7128
 
@@ -3210,8 +3104,7 @@ def test_ogr_geom_geometrycollection():
         g = ogr.CreateGeometryFromWkt(wkt)
         assert g.ExportToWkt() == wkt
 
-    return 'success'
-
+    
 ###############################################################################
 # Test fix for #7126
 
@@ -3229,8 +3122,6 @@ def test_ogr_geom_assignspatialref():
     assert g.GetGeometryRef(2).GetSpatialReference().ExportToWkt() == sr.ExportToWkt()
     assert g.GetGeometryRef(2).GetGeometryRef(0).GetSpatialReference().ExportToWkt() == sr.ExportToWkt()
 
-    return 'success'
-
 ###############################################################################
 
 
@@ -3240,8 +3131,6 @@ def test_ogr_geom_swapxy():
     g.SwapXY()
     assert g.ExportToWkt() == 'GEOMETRYCOLLECTION (POINT (2 1),LINESTRING (2 1,3 2),POLYGON ((0 0,1 0,1 1,0 0)),COMPOUNDCURVE (CIRCULARSTRING (0 0,1 1,0 2)),POLYHEDRALSURFACE (((0 0,1 0,1 1,0 0))))'
 
-    return 'success'
-
 ###############################################################################
 
 
@@ -3296,8 +3185,6 @@ def test_ogr_geom_remove_geometry():
     g = ogr.CreateGeometryFromWkt('POINT (0 0)')
     assert g.RemoveGeometry(0) != 0
 
-    return 'success'
-
 ###############################################################################
 
 
@@ -3318,8 +3205,6 @@ def test_ogr_geom_sfcgal():
     g2 = ogr.CreateGeometryFromWkt('CURVEPOLYGON EMPTY')
     g1.Distance(g2)
 
-    return 'success'
-
 ###############################################################################
 
 
@@ -3327,7 +3212,6 @@ def test_ogr_geom_cannot_add_triangle_to_multisurface():
 
     g = ogr.Geometry(ogr.wkbMultiSurface)
     assert g.AddGeometry(ogr.Geometry(ogr.wkbTriangle)) != 0
-    return 'success'
 
 ###############################################################################
 
@@ -3336,15 +3220,13 @@ def test_ogr_geom_force_polygonzm_to_linestring():
     g = ogr.CreateGeometryFromWkt('POLYGON ZM ((0 0 10 20,0 1 30 40,1 1 50 60,0 0 10 70))')
     wkt = ogr.ForceToLineString(g).ExportToIsoWkt()
     assert wkt == 'LINESTRING ZM (0 0 10 20,0 1 30 40,1 1 50 60,0 0 10 70)'
-    return 'success'
 
 ###############################################################################
 # cleanup
 
 
 def test_ogr_geom_cleanup():
-    return 'success'
-
+    pass
 
 gdaltest_list = [
     test_ogr_geom_area,
diff --git a/autotest/ogr/ogr_georss.py b/autotest/ogr/ogr_georss.py
index a64ee9bcf88a..a430163f19ce 100755
--- a/autotest/ogr/ogr_georss.py
+++ b/autotest/ogr/ogr_georss.py
@@ -78,8 +78,6 @@ def test_ogr_georss_init():
                                   ('content_xml_lang', 'en', ogr.OFTString),
                                   ('content_xml_base', 'http://diveintomark.org/', ogr.OFTString)]
 
-    return 'success'
-
 ###############################################################################
 # Used by ogr_georss_1 and ogr_georss_1ter
 
@@ -103,8 +101,6 @@ def ogr_georss_test_atom(filename):
     assert feat.GetFieldAsString('content').find('<div xmlns="http://www.w3.org/1999/xhtml">') != -1, \
         ('For field "%s", got "%s"' % ('content', feat.GetFieldAsString('content')))
 
-    return 'success'
-
 ###############################################################################
 # Test reading an ATOM document without any geometry
 
@@ -148,8 +144,6 @@ def test_ogr_georss_1bis():
 
     ds = None
 
-    return 'success'
-
 
 ###############################################################################
 # Test reading document created at previous step
@@ -213,8 +207,6 @@ def ogr_georss_test_rss(filename, only_first_feature):
         ('%s' % feat.GetGeometryRef().ExportToWkt())
     assert feat.GetFieldAsString('title') == 'A box'
 
-    return 'success'
-
 ###############################################################################
 # Test reading a RSS 2.0 document with GeoRSS simple geometries
 
@@ -299,8 +291,6 @@ def ogr_georss_create(filename, options):
 
     ds = None
 
-    return 'success'
-
 ###############################################################################
 # Test writing a RSS 2.0 document in Simple dialect (doesn't need read support)
 
@@ -312,8 +302,6 @@ def test_ogr_georss_4():
     content = open('tmp/test_rss2.xml').read()
     assert content.find('<georss:point>49 2') != -1, ('%s' % content)
 
-    return 'success'
-
 ###############################################################################
 # Test reading document created at previous step
 
@@ -334,8 +322,6 @@ def test_ogr_georss_6():
     assert content.find('<georss:where><gml:Point><gml:pos>49 2') != -1, \
         ('%s' % content)
 
-    return 'success'
-
 ###############################################################################
 # Test reading document created at previous step
 
@@ -358,8 +344,6 @@ def test_ogr_georss_8():
     assert not (content.find('<geo:lat>49') == -1 or content.find('<geo:long>2') == -1), \
         ('%s' % content)
 
-    return 'success'
-
 ###############################################################################
 # Test reading document created at previous step
 
@@ -411,8 +395,6 @@ def test_ogr_georss_10():
     assert content.find('<georss:where><gml:Point srsName="urn:ogc:def:crs:EPSG::32631"><gml:pos>500000 4000000') != -1, \
         ('%s' % content)
 
-    return 'success'
-
 ###############################################################################
 # Test reading document created at previous step
 
@@ -442,8 +424,6 @@ def test_ogr_georss_11():
     assert feat.GetGeometryRef().ExportToWkt() == expected_wkt, \
         ('%s' % feat.GetGeometryRef().ExportToWkt())
 
-    return 'success'
-
 ###############################################################################
 # Test various broken documents
 
@@ -473,8 +453,6 @@ def test_ogr_georss_12():
     gdal.PopErrorHandler()
     assert feat.GetGeometryRef() is None
 
-    return 'success'
-
 ###############################################################################
 # Test writing non standard fields
 
@@ -505,8 +483,6 @@ def test_ogr_georss_13():
     assert content.find('<ogr:field2>val2</ogr:field2>') != -1, ('%s' % content)
     assert content.find('<ogr:field3>val3</ogr:field3>') != -1, ('%s' % content)
 
-    return 'success'
-
 ###############################################################################
 # Test reading document created at previous step
 
@@ -528,8 +504,6 @@ def test_ogr_georss_14():
     assert feat.GetFieldAsString('ogr_field3') == 'val3', \
         ('Expected %s. Got %s' % ('val3', feat.GetFieldAsString('ogr_field3')))
 
-    return 'success'
-
 ###############################################################################
 # Test reading an in memory file (#2931)
 
@@ -572,8 +546,6 @@ def test_ogr_georss_15():
     # Release memory associated to the in-memory file
     gdal.Unlink('/vsimem/georssinmem')
 
-    return 'success'
-
 ###############################################################################
 #
 
@@ -592,8 +564,7 @@ def test_ogr_georss_cleanup():
         if len(filename) > 13 and filename[-13:] == '.resolved.gml':
             os.unlink('data/' + filename)
 
-    return 'success'
-
+    
 
 gdaltest_list = [
     test_ogr_georss_init,
diff --git a/autotest/ogr/ogr_geos.py b/autotest/ogr/ogr_geos.py
index 9fd10fee6a3d..0f2dfdfd8db4 100755
--- a/autotest/ogr/ogr_geos.py
+++ b/autotest/ogr/ogr_geos.py
@@ -52,8 +52,6 @@ def test_ogr_geos_union():
 
     assert not ogrtest.check_feature_geometry(result, 'MULTIPOINT (10 20,30 20)')
 
-    return 'success'
-
 ###############################################################################
 # Test polygon intersection.
 
@@ -71,8 +69,6 @@ def test_ogr_geos_intersection():
     assert not ogrtest.check_feature_geometry(result, 'POLYGON ((0 0,5 5,10 0,0 0))'), \
         ('Got: %s' % result.ExportToWkt())
 
-    return 'success'
-
 ###############################################################################
 # Test polygon difference.
 
@@ -91,8 +87,6 @@ def test_ogr_geos_difference():
                                       'POLYGON ((5 5,10 10,10 0,5 5))')), \
         ('Got: %s' % result.ExportToWkt())
 
-    return 'success'
-
 ###############################################################################
 # Test polygon symmetric difference.
 
@@ -111,8 +105,6 @@ def test_ogr_geos_symmetric_difference():
                                       'MULTIPOLYGON (((5 5,0 0,0 10,5 5)),((5 5,10 10,10 0,5 5)))')), \
         ('Got: %s' % result.ExportToWkt())
 
-    return 'success'
-
 ###############################################################################
 # Test polygon symmetric difference.
 
@@ -131,8 +123,6 @@ def test_ogr_geos_sym_difference():
                                       'MULTIPOLYGON (((5 5,0 0,0 10,5 5)),((5 5,10 10,10 0,5 5)))')), \
         ('Got: %s' % result.ExportToWkt())
 
-    return 'success'
-
 ###############################################################################
 # Test Intersect().
 
@@ -156,8 +146,6 @@ def test_ogr_geos_intersect():
 
     assert result == 0, 'wrong result (got true)'
 
-    return 'success'
-
 ###############################################################################
 # Test disjoint().
 
@@ -181,8 +169,6 @@ def test_ogr_geos_disjoint():
 
     assert result != 0, 'wrong result (got false)'
 
-    return 'success'
-
 ###############################################################################
 # Test touches.
 
@@ -206,8 +192,6 @@ def test_ogr_geos_touches():
 
     assert result == 0, 'wrong result (got true)'
 
-    return 'success'
-
 ###############################################################################
 # Test crosses.
 
@@ -231,8 +215,6 @@ def test_ogr_geos_crosses():
 
     assert result == 0, 'wrong result (got true)'
 
-    return 'success'
-
 ###############################################################################
 
 
@@ -252,8 +234,6 @@ def test_ogr_geos_within():
 
     assert result == 0, 'wrong result (got true)'
 
-    return 'success'
-
 ###############################################################################
 
 
@@ -273,8 +253,6 @@ def test_ogr_geos_contains():
 
     assert result == 0, 'wrong result (got true)'
 
-    return 'success'
-
 ###############################################################################
 
 
@@ -298,8 +276,6 @@ def test_ogr_geos_overlaps():
 
     assert result != 0, 'wrong result (got false)'
 
-    return 'success'
-
 ###############################################################################
 
 
@@ -316,8 +292,6 @@ def test_ogr_geos_buffer():
                                       'POLYGON ((0 -1,-0.555570233019607 -0.831469612302542,-0.923879532511288 -0.382683432365087,-0.98078528040323 0.19509032201613,-0.707106781186547 0.707106781186547,9.292893218813452 10.707106781186548,9.690983005625053 10.951056516295154,10.156434465040231 10.987688340595138,10.587785252292473 10.809016994374947,10.891006524188368 10.453990499739547,11 10,11 0,10.866025403784439 -0.5,10.5 -0.866025403784439,10 -1,0 -1))') == 0), \
         ('Got: %s' % result.ExportToWkt())
 
-    return 'success'
-
 ###############################################################################
 
 
@@ -342,8 +316,6 @@ def test_ogr_geos_centroid():
     assert ogrtest.check_feature_geometry(centroid2, 'POINT (8.0 1.0)') == 0, \
         ('Got: %s' % centroid2.ExportToWkt())
 
-    return 'success'
-
 ###############################################################################
 
 
@@ -360,8 +332,6 @@ def test_ogr_geos_centroid_multipolygon():
                                       'POINT (1.5 0.5)') == 0), \
         ('Got: %s' % centroid.ExportToWkt())
 
-    return 'success'
-
 ###############################################################################
 
 
@@ -376,8 +346,6 @@ def test_ogr_geos_centroid_point_empty():
 
     assert centroid.ExportToWkt() == 'POINT EMPTY', ('Got: %s' % centroid.ExportToWkt())
 
-    return 'success'
-
 ###############################################################################
 
 
@@ -394,8 +362,6 @@ def test_ogr_geos_simplify_linestring():
     assert simplify.ExportToWkt() == 'LINESTRING (0 0,10 0)', \
         ('Got: %s' % simplify.ExportToWkt())
 
-    return 'success'
-
 ###############################################################################
 
 
@@ -412,8 +378,6 @@ def test_ogr_geos_simplifypreservetopology_linestring():
     assert simplify.ExportToWkt() == 'LINESTRING (0 0,10 0)', \
         ('Got: %s' % simplify.ExportToWkt())
 
-    return 'success'
-
 ###############################################################################
 
 
@@ -430,8 +394,6 @@ def test_ogr_geos_unioncascaded():
     assert cascadedunion.ExportToWkt() == 'POLYGON ((0 0,0 1,0.5 1.0,0.5 1.5,1.5 1.5,1.5 0.5,1.0 0.5,1 0,0 0))', \
         ('Got: %s' % cascadedunion.ExportToWkt())
 
-    return 'success'
-
 ###############################################################################
 
 
@@ -447,8 +409,6 @@ def test_ogr_geos_convexhull():
     assert convexhull.ExportToWkt() == 'POLYGON ((0 0,0 1,1 1,1 0,0 0))', \
         ('Got: %s' % convexhull.ExportToWkt())
 
-    return 'success'
-
 ###############################################################################
 
 
@@ -465,8 +425,6 @@ def test_ogr_geos_distance():
     assert abs(distance - 1) <= 0.00000000001, \
         ('Distance() result wrong, got %g.' % distance)
 
-    return 'success'
-
 ###############################################################################
 
 
@@ -481,8 +439,6 @@ def test_ogr_geos_isring():
 
     assert isring == 1
 
-    return 'success'
-
 ###############################################################################
 
 
@@ -497,8 +453,6 @@ def test_ogr_geos_issimple_true():
 
     assert isring == 1
 
-    return 'success'
-
 ###############################################################################
 
 
@@ -513,8 +467,6 @@ def test_ogr_geos_issimple_false():
 
     assert isring == 0
 
-    return 'success'
-
 ###############################################################################
 
 
@@ -529,8 +481,6 @@ def test_ogr_geos_isvalid_true():
 
     assert isring == 1
 
-    return 'success'
-
 ###############################################################################
 
 
@@ -545,8 +495,6 @@ def test_ogr_geos_isvalid_true_linestringM():
 
     assert isring == 1
 
-    return 'success'
-
 ###############################################################################
 
 
@@ -561,8 +509,6 @@ def test_ogr_geos_isvalid_true_circularStringM():
 
     assert isring == 1
 
-    return 'success'
-
 ###############################################################################
 
 
@@ -577,8 +523,6 @@ def test_ogr_geos_isvalid_true_triangle():
 
     assert isring == 1
 
-    return 'success'
-
 ###############################################################################
 
 
@@ -594,8 +538,6 @@ def test_ogr_geos_isvalid_false():
 
     assert isring == 0
 
-    return 'success'
-
 ###############################################################################
 
 
@@ -610,8 +552,6 @@ def test_ogr_geos_pointonsurface():
 
     assert pointonsurface.Within(g1) == 1
 
-    return 'success'
-
 ###############################################################################
 
 
@@ -631,8 +571,6 @@ def test_ogr_geos_DelaunayTriangulation():
     assert triangulation.ExportToWkt() == 'GEOMETRYCOLLECTION (POLYGON ((0 1,0 0,1 0,0 1)),POLYGON ((0 1,1 0,1 1,0 1)))', \
         ('Got: %s' % triangulation.ExportToWkt())
 
-    return 'success'
-
 ###############################################################################
 
 
@@ -654,8 +592,6 @@ def test_ogr_geos_polygonize():
     got = g.Polygonize()
     assert got is None, ('Got: %s' % got.ExportToWkt())
 
-    return 'success'
-
 
 gdaltest_list = [
     test_ogr_geos_union,
diff --git a/autotest/ogr/ogr_gft.py b/autotest/ogr/ogr_gft.py
index e7e7081a021b..c49f5b3fb1f8 100755
--- a/autotest/ogr/ogr_gft.py
+++ b/autotest/ogr/ogr_gft.py
@@ -58,8 +58,6 @@ def test_ogr_gft_init():
 
     ogrtest.gft_refresh = '1/woRTxgfN8dLUpRhnOL-BXG-f7VxzXKy_3D5eizH8bS8'
 
-    return 'success'
-
 ###############################################################################
 # Read test on Wikileaks Afgan War Diary 2004-2010 table.
 
@@ -104,8 +102,6 @@ def test_ogr_gft_read():
     assert sql_lyr_count == count, \
         ('did not get expected feature count. Got %d, expected %d' % (sql_lyr_count, count))
 
-    return 'success'
-
 ###############################################################################
 # Write test
 
@@ -167,8 +163,6 @@ def test_ogr_gft_write():
 
     ds = None
 
-    return 'success'
-
 ###############################################################################
 # ogr2ogr test to create a non-spatial GFT table
 
@@ -214,8 +208,6 @@ def test_ogr_gft_ogr2ogr_non_spatial():
 
     ds = None
 
-    return 'success'
-
 ###############################################################################
 # ogr2ogr test to create a spatial GFT table
 
@@ -294,8 +286,6 @@ def test_ogr_gft_ogr2ogr_spatial():
 
     ds = None
 
-    return 'success'
-
 
 gdaltest_list = [
     test_ogr_gft_init,
diff --git a/autotest/ogr/ogr_gml_fgd_read.py b/autotest/ogr/ogr_gml_fgd_read.py
index e25965b86dea..eaa4098722c0 100755
--- a/autotest/ogr/ogr_gml_fgd_read.py
+++ b/autotest/ogr/ogr_gml_fgd_read.py
@@ -82,8 +82,6 @@ def test_ogr_gml_fgd_1():
 
     assert feat.GetField('devDate') == '2015-01-07', 'Wrong attribute value'
 
-    return 'success'
-
 
 ###############################################################################
 # Test reading Japanese FGD GML (v4) BldA file
@@ -113,8 +111,6 @@ def test_ogr_gml_fgd_2():
 
     assert feat.GetField('devDate') == '2017-03-07', 'Wrong attribute value'
 
-    return 'success'
-
 ###############################################################################
 # List test cases
 
diff --git a/autotest/ogr/ogr_gml_geom.py b/autotest/ogr/ogr_gml_geom.py
index c924509a7857..062837bcaef4 100755
--- a/autotest/ogr/ogr_gml_geom.py
+++ b/autotest/ogr/ogr_gml_geom.py
@@ -70,8 +70,7 @@ def test_gml_geom(unit):
         gml_wkt = geom_gml.ExportToWkt()
         pytest.fail('WKT from GML (%s) does not match clean WKT (%s).\ngml was (%s)' % (gml_wkt, clean_wkt, gml))
 
-    return 'success'
-
+    
 ###############################################################################
 # Test geometries with extra spaces at the end, as sometimes are generated
 # by ESRI WFS software.
@@ -83,8 +82,6 @@ def test_gml_space_test():
     assert geom is not None and geom.GetGeometryType() is ogr.wkbLineString and geom.GetPointCount() == 8, \
         'GML not correctly parsed'
 
-    return 'success'
-
 ###############################################################################
 # Test GML 3.x "pos" element for a point.
 
@@ -97,8 +94,6 @@ def test_gml_pos_point():
 
     assert geom.ExportToWkt() == 'POINT (31 29 16)', '<gml:pos> not correctly parsed'
 
-    return 'success'
-
 ###############################################################################
 # Test GML 3.1.1 "pos" element for a polygon. (ticket #3244)
 
@@ -131,8 +126,6 @@ def test_gml_pos_polygon():
     assert geom.ExportToWkt() == 'POLYGON ((0 0,4 0,4 4,0 4,0 0),(1 1,2 1,2 2,1 2,1 1))', \
         '<gml:Polygon> not correctly parsed'
 
-    return 'success'
-
 ###############################################################################
 # Test GML 3.x "posList" element for a linestring.
 
@@ -146,8 +139,6 @@ def test_gml_posList_line():
     assert geom.ExportToWkt() == 'LINESTRING (31 42,53 64,55 76)', \
         '<gml:posList> not correctly parsed'
 
-    return 'success'
-
 
 ###############################################################################
 # Test GML 3.x "posList" element for a 3D linestring.
@@ -161,8 +152,6 @@ def test_gml_posList_line3d():
     assert geom.ExportToWkt() == 'LINESTRING (31 42 1,53 64 2,55 76 3)', \
         '<gml:posList> not correctly parsed'
 
-    return 'success'
-
 ###############################################################################
 # Test GML 3.x "posList" element for a 3D linestring, but with srsDimension
 # set on LineString, not posList
@@ -177,8 +166,6 @@ def test_gml_posList_line3d_2():
     assert geom.ExportToWkt() == 'LINESTRING (31 42 1,53 64 2,55 76 3)', \
         '<gml:posList> not correctly parsed'
 
-    return 'success'
-
 ###############################################################################
 # Test GML 3.x "polygon" element for a point.
 
@@ -191,8 +178,6 @@ def test_gml_polygon():
     assert geom.ExportToWkt() == 'POLYGON ((0 0,4 0,4 4,0 4,0 0),(1 1,2 1,2 2,1 2,1 1))', \
         '<gml:Polygon> not correctly parsed'
 
-    return 'success'
-
 ###############################################################################
 # Private utility function to convert WKT to GML with assigned WGS 84 as SRS.
 
@@ -232,8 +217,6 @@ def test_gml_out_point_srs():
     assert gml[0:31] == '<gml:Point srsName="EPSG:4326">', \
         'No srsName attribute in GML output'
 
-    return 'success'
-
 ###############################################################################
 # Test of Point 3D geometry with SRS assigned
 
@@ -249,8 +232,6 @@ def test_gml_out_point3d_srs():
     assert gml[0:31] == '<gml:Point srsName="EPSG:4326">', \
         'No srsName attribute in GML output'
 
-    return 'success'
-
 ###############################################################################
 # Test of LineString geometry with SRS assigned
 
@@ -266,8 +247,6 @@ def test_gml_out_linestring_srs():
     assert gml[0:36] == '<gml:LineString srsName="EPSG:4326">', \
         'No srsName attribute in GML output'
 
-    return 'success'
-
 ###############################################################################
 # Test of Polygon geometry with SRS assigned
 
@@ -283,8 +262,6 @@ def test_gml_out_polygon_srs():
     assert gml[0:33] == '<gml:Polygon srsName="EPSG:4326">', \
         'No srsName attribute in GML output'
 
-    return 'success'
-
 ###############################################################################
 # Test of MultiPoint geometry with SRS assigned
 
@@ -300,8 +277,6 @@ def test_gml_out_multipoint_srs():
     assert gml[0:36] == '<gml:MultiPoint srsName="EPSG:4326">', \
         'No srsName attribute in GML output'
 
-    return 'success'
-
 ###############################################################################
 # Test of MultiLineString geometry with SRS assigned
 
@@ -317,8 +292,6 @@ def test_gml_out_multilinestring_srs():
     assert gml[0:41] == '<gml:MultiLineString srsName="EPSG:4326">', \
         'No srsName attribute in GML output'
 
-    return 'success'
-
 ###############################################################################
 # Test of MultiPolygon geometry with SRS assigned
 
@@ -338,8 +311,6 @@ def test_gml_out_multipolygon_srs():
     assert gml[39:].find('srsName') == -1, \
         'Got extra srsName attributes on subelements.'
 
-    return 'success'
-
 ###############################################################################
 # Test of GeometryCollection with SRS assigned
 
@@ -355,8 +326,6 @@ def test_gml_out_geometrycollection_srs():
     assert gml[0:39] == '<gml:MultiGeometry srsName="EPSG:4326">', \
         'No srsName attribute in GML output'
 
-    return 'success'
-
 ###############################################################################
 # Test GML Box
 
@@ -379,8 +348,6 @@ def test_gml_Box():
     assert geom.ExportToWkt() == 'POLYGON ((1 2 0,3 2 0,3 4 0,1 4 0,1 2 0))', \
         '<gml:Box> not correctly parsed'
 
-    return 'success'
-
 ###############################################################################
 # Test GML Envelope
 
@@ -397,8 +364,6 @@ def test_gml_Envelope():
     assert geom.ExportToWkt() == 'POLYGON ((1 2,3 2,3 4,1 4,1 2))', \
         '<gml:Envelope> not correctly parsed'
 
-    return 'success'
-
 ###############################################################################
 # Test GML Curve
 
@@ -418,8 +383,6 @@ def test_gml_Curve():
     assert geom.ExportToWkt() == 'LINESTRING (1 2,3 4)', \
         '<gml:Curve> not correctly parsed'
 
-    return 'success'
-
 ###############################################################################
 # Test GML Curve with pointProperty elements
 
@@ -444,8 +407,6 @@ def test_gml_Curve_with_pointProperty():
     assert geom.ExportToWkt() == 'LINESTRING (1 2,3 4)', \
         '<gml:Curve> not correctly parsed'
 
-    return 'success'
-
 ###############################################################################
 # Test GML MultiCurve
 
@@ -470,8 +431,6 @@ def test_gml_MultiCurve():
     assert geom.ExportToWkt() == 'MULTILINESTRING ((1 2,2 3),(3 4,4 5))', \
         '<gml:MultiCurve> not correctly parsed'
 
-    return 'success'
-
 ###############################################################################
 # Test GML MultiSurface with PolygonPatch
 
@@ -551,8 +510,6 @@ def test_gml_MultiSurface():
     assert geom.ExportToWkt() == 'MULTIPOLYGON (((1 2,3 4,5 6,1 2),(2 3,4 5,6 7,2 3),(3 4,5 6,7 8,3 4)),((4 5,6 7,8 9,4 5)))', \
         '<gml:MultiSurface> not correctly parsed'
 
-    return 'success'
-
 
 ###############################################################################
 # Test GML MultiSurface with surfaceMembers
@@ -603,8 +560,6 @@ def test_gml_MultiSurface_surfaceMembers():
     assert geom.ExportToWkt() == 'MULTIPOLYGON (((1 2,3 4,5 6,1 2),(2 3,4 5,6 7,2 3)),((3 4,5 6,7 8,3 4)),((30 40,50 60,70 80,30 40)))', \
         '<gml:MultiSurface> not correctly parsed'
 
-    return 'success'
-
 
 ###############################################################################
 # Test GML MultiCurve with curveMembers
@@ -624,8 +579,6 @@ def test_gml_MultiCurve_curveMembers():
     assert geom.ExportToWkt() == 'MULTILINESTRING ((0 0,1 1))', \
         '<gml:MultiCurve> not correctly parsed'
 
-    return 'success'
-
 ###############################################################################
 # Test GML MultiGeometry with geometryMembers
 
@@ -644,8 +597,6 @@ def test_gml_MultiGeometry_geometryMembers():
     assert geom.ExportToWkt() == 'GEOMETRYCOLLECTION (LINESTRING (0 0,1 1))', \
         '<gml:MultiGeometry> not correctly parsed'
 
-    return 'success'
-
 ###############################################################################
 # Test GML CompositeCurve with curveMembers
 
@@ -668,8 +619,6 @@ def test_gml_CompositeCurve_curveMembers():
     assert geom.ExportToWkt() == 'LINESTRING (0 0,1 1,2 2)', \
         '<gml:CompositeCurve> not correctly parsed'
 
-    return 'success'
-
 ###############################################################################
 # Test GML MultiPoint with pointMembers
 
@@ -691,8 +640,6 @@ def test_gml_MultiCurve_pointMembers():
 
     assert geom.ExportToWkt() == 'MULTIPOINT (0 0,1 1)', \
         '<gml:MultiPoint> not correctly parsed'
-
-    return 'success'
 ###############################################################################
 # Test GML Solid
 
@@ -720,8 +667,6 @@ def test_gml_Solid():
     assert geom.ExportToWkt() == 'POLYHEDRALSURFACE Z (((1 2 0,3 4 0,5 6 0,1 2 0)))', \
         '<gml:Solid> not correctly parsed'
 
-    return 'success'
-
 ###############################################################################
 # Test GML OrientableSurface
 
@@ -747,8 +692,6 @@ def test_gml_OrientableSurface():
     assert geom.ExportToWkt() == 'POLYGON ((-213.475 24.989 0,-213.475 24.989 8,-215.704 25.077 8,-215.704 25.077 0,-213.475 24.989 0))', \
         '<gml:OrientableSurface> not correctly parsed'
 
-    return 'success'
-
 ###############################################################################
 # Test GML Triangle
 
@@ -778,8 +721,7 @@ def test_gml_Triangle():
         print(geom.ExportToWkt())
         pytest.fail('incorrect conversion from OGR -> GML for OGRTriangle')
 
-    return 'success'
-
+    
 ###############################################################################
 # Test GML Rectangle
 
@@ -799,8 +741,6 @@ def test_gml_Rectangle():
     assert geom.ExportToWkt() == 'POLYGON ((0 0,0 1,1 1,1 0,0 0))', \
         '<gml:Rectangle> not correctly parsed'
 
-    return 'success'
-
 ###############################################################################
 # Test GML PolyhedralSurface
 
@@ -970,8 +910,6 @@ def test_gml_PolyhedralSurface():
     assert geom.ExportToWkt().find('POLYHEDRALSURFACE (((0 -1,0 1,') >= 0, \
         '<gml:PolyhedralSurface> not correctly parsed'
 
-    return 'success'
-
 
 ###############################################################################
 # Test GML Tin
@@ -1058,8 +996,7 @@ def test_gml_Tin():
         print(geom.ExportToWkt())
         pytest.fail('OGRGeometry::TriangulatedSurface incorrectly converted')
 
-    return 'success'
-
+    
 ###############################################################################
 # Test concatenated sections (#4451)
 
@@ -1098,8 +1035,6 @@ def test_gml_ConcatenatedDeduplication():
 
     assert not ogrtest.have_geos() or geom.IsValid(), 'geometry not valid'
 
-    return 'success'
-
 ###############################################################################
 # Test OGRFormatDouble() to check for rounding errors (would also apply for KML output, or ogrinfo output)
 
@@ -1116,8 +1051,6 @@ def gml_out_precision():
     got_gml = geom.ExportToGML()
     assert got_gml == expected_gml, 'did not get expected gml'
 
-    return 'success'
-
 ###############################################################################
 # Test various error cases of gml2ogrgeometry.cpp
 
@@ -1290,8 +1223,7 @@ def test_gml_invalid_geoms():
                 assert wkt == expected_wkt, \
                     ('did not get expected result for %s. Got %s instead of %s' % (gml, wkt, expected_wkt))
 
-    return 'success'
-
+    
 ###############################################################################
 # Test write support for GML3
 
@@ -1320,8 +1252,7 @@ def test_gml_write_gml3_geometries():
             gml_out = geom.ExportToGML(['FORMAT=GML3'])
         assert gml_out == gml_in, ('got %s, instead of %s' % (gml_out, gml_in))
 
-    return 'success'
-
+    
 ###############################################################################
 # Test write support for GML3 SRS
 
@@ -1385,8 +1316,6 @@ def test_gml_write_gml3_srs():
     expected_gml = '<gml:Point srsName="http://www.opengis.net/def/crs/EPSG/0/4326"><gml:pos>49 2</gml:pos></gml:Point>'
     assert gml3 == expected_gml, ('got %s, instead of %s' % (gml3, expected_gml))
 
-    return 'success'
-
 ###############################################################################
 # Test that importing too nested GML doesn't cause stack overflows
 
@@ -1409,8 +1338,6 @@ def test_gml_nested():
     gdal.PopErrorHandler()
     assert geom is None, 'expected None'
 
-    return 'success'
-
 ###############################################################################
 # Test GML 3.3 SimplePolygon
 
@@ -1424,8 +1351,6 @@ def test_gml_SimplePolygon():
     assert geom.ExportToWkt() == 'POLYGON ((0 0,1 0,1 1,0 1,0 0))', \
         '<gmlce:SimplePolygon> not correctly parsed'
 
-    return 'success'
-
 ###############################################################################
 # Test GML 3.3 SimpleRectangle
 
@@ -1439,8 +1364,6 @@ def test_gml_SimpleRectangle():
     assert geom.ExportToWkt() == 'POLYGON ((0 0,1 0,1 1,0 1,0 0))', \
         '<gmlce:SimpleRectangle> not correctly parsed'
 
-    return 'success'
-
 ###############################################################################
 # Test GML 3.3 SimpleTriangle
 
@@ -1454,8 +1377,6 @@ def test_gml_SimpleTriangle():
     assert geom.ExportToWkt() == 'TRIANGLE ((0 0,1 0,1 1,0 0))', \
         '<gmlce:SimpleTriangle> not correctly parsed'
 
-    return 'success'
-
 ###############################################################################
 # Test GML 3.3 SimpleMultiPoint
 
@@ -1469,8 +1390,6 @@ def test_gml_SimpleMultiPoint():
     assert geom.ExportToWkt() == 'MULTIPOINT (0 1,2 3)', \
         '<gmlce:SimpleMultiPoint> not correctly parsed'
 
-    return 'success'
-
 ###############################################################################
 # Test  gml:CompositeCurve> in <gml:Ring>
 
@@ -1526,8 +1445,6 @@ def test_gml_CompositeCurveInRing():
 
     assert geom.ExportToWkt() == 'POLYGON ((0 0,0 1,1 1,0 0))'
 
-    return 'success'
-
 ###############################################################################
 # Test <gml:CompositeSurface> in <gml:surfaceMembers> (#5369)
 
@@ -1563,8 +1480,6 @@ def test_gml_CompositeSurface_in_surfaceMembers():
 
     assert geom.ExportToWkt() == 'MULTIPOLYGON (((0 0,0 1,1 1,1 0,0 0)),((2 0,2 1,3 1,3 0,2 0)))'
 
-    return 'success'
-
 ###############################################################################
 # Test <gml:PolygonPatch> with only Interior ring (#5421)
 
@@ -1617,8 +1532,6 @@ def test_gml_MultiSurfaceOfSurfaceOfPolygonPatchWithInteriorRing():
 
     assert geom.ExportToWkt() == 'MULTIPOLYGON (((0 0,0 1,1 1,1 0,0 0),(0.25 0.25,0.25 0.75,0.75 0.75,0.75 0.25,0.25 0.25)),((0 0,0 -1,-1 -1,-1 0,0 0)))'
 
-    return 'success'
-
 ###############################################################################
 # Test ts, cs and decimal attributes of gml:coordinates
 
@@ -1651,8 +1564,7 @@ def test_gml_Coordinates_ts_cs_decimal():
             assert wkt == expected_wkt, \
                 ('did not get expected result for %s. Got %s instead of %s' % (gml, wkt, expected_wkt))
 
-    return 'success'
-
+    
 ###############################################################################
 # Test gml with XML header and comments
 
@@ -1693,8 +1605,7 @@ def test_gml_with_xml_header_and_comments():
             assert wkt == expected_wkt, \
                 ('did not get expected result for %s. Got %s instead of %s' % (gml, wkt, expected_wkt))
 
-    return 'success'
-
+    
 ###############################################################################
 # Test srsDimension attribute on top-level geometry and not on posList (#5606)
 
@@ -1719,8 +1630,6 @@ def test_gml_srsDimension_topgeometry():
 
     assert geom.ExportToWkt() == 'POLYGON ((0 0 10,0 1 10,1 1 10,1 0 10,0 0 10))'
 
-    return 'success'
-
 ###############################################################################
 # Test GML Arc
 
@@ -1739,8 +1648,6 @@ def test_gml_Arc():
     geom2 = ogr.CreateGeometryFromGML(gml2)
     assert geom.Equals(geom2)
 
-    return 'success'
-
 ###############################################################################
 # Test GML ArcByBulge
 
@@ -1752,8 +1659,6 @@ def test_gml_ArcByBulge():
 
     assert ogrtest.check_feature_geometry(geom, ogr.CreateGeometryFromWkt('CIRCULARSTRING (2 0,0 2,-2 0)')) == 0
 
-    return 'success'
-
 ###############################################################################
 # Test GML ArcByCenterPoint
 
@@ -1765,8 +1670,6 @@ def test_gml_ArcByCenterPoint():
 
     assert ogrtest.check_feature_geometry(geom, ogr.CreateGeometryFromWkt('CIRCULARSTRING (1 4,-1 2,1 0)')) == 0
 
-    return 'success'
-
 
 ###############################################################################
 # Test compound curve of ArcByCenterPoint whose ends don't exactly match
@@ -1825,8 +1728,6 @@ def test_gml_CompoundCurve_of_ArcByCenterPoint():
 
     assert ogrtest.check_feature_geometry(geom, ogr.CreateGeometryFromWkt('POLYGON ((-80.4 33.86,-80.27 33.63,-80.305028054229538 33.622017309598967,-80.335422529369936 33.613343178471617,-80.366464292754429 33.606448070493634,-80.398003921948742 33.601365147653873,-80.429889693662162 33.598118851265042,-80.461968286017793 33.596724788982847,-80.494085487001527 33.597189662699385,-80.52608690656875 33.599511237590342,-80.557818688893789 33.603678352435914,-80.589128223167393 33.609670971175497,-80.619864849221443 33.617460275496377,-80.63 33.62,-80.39 33.85))')) == 0
 
-    return 'success'
-
 ###############################################################################
 # Test GML CircleByCenterPoint
 
@@ -1838,8 +1739,6 @@ def test_gml_CircleByCenterPoint():
 
     assert ogrtest.check_feature_geometry(geom, ogr.CreateGeometryFromWkt('CIRCULARSTRING (-1 2,3 2,-1 2)')) == 0
 
-    return 'success'
-
 ###############################################################################
 # Test GML Circle
 
@@ -1889,8 +1788,6 @@ def test_gml_Circle():
     expected_wkt = 'CURVEPOLYGON ( CIRCULARSTRING (-1 0,0 1,-0.707106781186547 -0.707106781186548,-0.923879532511287 -0.38268343236509,-1 0))'
     assert ogrtest.check_feature_geometry(geom, ogr.CreateGeometryFromWkt(expected_wkt)) == 0
 
-    return 'success'
-
 ###############################################################################
 # Test ArcString
 
@@ -1912,8 +1809,6 @@ def test_gml_ArcString():
     geom2 = ogr.CreateGeometryFromGML(gml2)
     assert geom2.ExportToWkt() == 'CIRCULARSTRING (-2 0,-1 -1,0 0,1 -1,2 0,0 2,-2 0)'
 
-    return 'success'
-
 ###############################################################################
 # Test OGRCompoundCurve
 
@@ -1979,8 +1874,6 @@ def test_gml_OGRCompoundCurve():
     geom = ogr.CreateGeometryFromGML(gml)
     assert geom.ExportToWkt() == 'COMPOUNDCURVE ((0 0,1 0,0 0),CIRCULARSTRING (0 0,1 0,0 0),(0 0,-1 0,0 0))'
 
-    return 'success'
-
 ###############################################################################
 # Test OGRCurvePolygon
 
@@ -2018,8 +1911,6 @@ def test_gml_OGRCurvePolygon():
     expected_geom2 = ogr.CreateGeometryFromGML(expected_gml2)
     assert ogrtest.check_feature_geometry(geom2, expected_geom2) == 0, gml2
 
-    return 'success'
-
 ###############################################################################
 # Test OGRMultiSurface
 
@@ -2094,8 +1985,6 @@ def test_gml_OGRMultiSurface():
     expected_gml2 = '<gml:MultiSurface><gml:surfaceMember><gml:Polygon><gml:exterior><gml:LinearRing><gml:posList>0 0 0 1 1 1 1 0 0 0</gml:posList></gml:LinearRing></gml:exterior></gml:Polygon></gml:surfaceMember></gml:MultiSurface>'
     assert gml2 == expected_gml2
 
-    return 'success'
-
 ###############################################################################
 # Test OGRMultiCurve
 
@@ -2164,8 +2053,6 @@ def test_gml_OGRMultiCurve():
     assert geom.ExportToWkt() == 'MULTICURVE (COMPOUNDCURVE (CIRCULARSTRING (0 0,1 1,1 -1),(1 -1,1 1,1 -1)))', \
         '<gml:MultiCurve> not correctly parsed'
 
-    return 'success'
-
 ###############################################################################
 # Test write support for GML namespace declaration
 
@@ -2187,8 +2074,6 @@ def test_gml_write_gml_ns():
     expected_gml = '<gml:Point xmlns:gml="http://www.opengis.net/gml/3.2" gml:id="foo"><gml:pos>500000 4500000</gml:pos></gml:Point>'
     assert gml == expected_gml, ('got %s, instead of %s' % (gml, expected_gml))
 
-    return 'success'
-
 ###############################################################################
 # When imported build a list of units based on the files available.
 
diff --git a/autotest/ogr/ogr_gml_read.py b/autotest/ogr/ogr_gml_read.py
index 45e4600ef0e5..a9e70baf442b 100755
--- a/autotest/ogr/ogr_gml_read.py
+++ b/autotest/ogr/ogr_gml_read.py
@@ -73,8 +73,6 @@ def test_ogr_gml_1():
     feat = lyr.GetNextFeature()
     assert feat is None, 'got unexpected feature.'
 
-    return 'success'
-
 ###############################################################################
 # Do the same test somewhere without a .gfs file.
 
@@ -102,8 +100,6 @@ def test_ogr_gml_2():
     feat = lyr.GetNextFeature()
     assert feat is None, 'got unexpected feature.'
 
-    return 'success'
-
 ###############################################################################
 # Similar test for RNF style line data.
 
@@ -130,8 +126,6 @@ def test_ogr_gml_3():
     feat = lyr.GetNextFeature()
     assert feat is None, 'got unexpected feature.'
 
-    return 'success'
-
 ###############################################################################
 # Test of read GML file with UTF-8 BOM indicator.
 # Test also support for nested GML elements (#3680)
@@ -169,8 +163,6 @@ def test_ogr_gml_4():
 
     assert not ogrtest.check_feature_geometry(feat, wkt)
 
-    return 'success'
-
 
 ###############################################################################
 # Test of read GML file that triggeered bug #2349
@@ -188,8 +180,6 @@ def test_ogr_gml_5():
 
     lyr.GetNextFeature()
 
-    return 'success'
-
 ###############################################################################
 # Test of various FIDs (various prefixes and lengths) (Ticket#1017)
 
@@ -217,8 +207,7 @@ def test_ogr_gml_6():
         gml_ds = None
         os.remove('data' + os.sep + filename + '.gfs')
 
-    return 'success'
-
+    
 ###############################################################################
 # Test of colon terminated prefixes for attribute values (Ticket#2493)
 
@@ -246,8 +235,6 @@ def test_ogr_gml_7():
     assert ldefn.GetFieldDefn(1).GetFieldTypeName(ldefn.GetFieldDefn(1).GetType()) == 'Integer'
     assert ldefn.GetFieldDefn(2).GetFieldTypeName(ldefn.GetFieldDefn(2).GetType()) == 'String'
 
-    return 'success'
-
 ###############################################################################
 # Test a GML file with some non-ASCII UTF-8 content that triggered a bug (Ticket#2948)
 
@@ -265,8 +252,7 @@ def test_ogr_gml_8():
     else:
         assert feat.GetFieldAsString('name') == '\xc4\x80liamanu'
 
-    return 'success'
-
+    
 ###############################################################################
 # Test writing invalid UTF-8 content in a GML file (ticket #2971)
 
@@ -302,8 +288,6 @@ def test_ogr_gml_9():
     os.remove('tmp/broken_utf8.gml')
     os.remove('tmp/broken_utf8.xsd')
 
-    return 'success'
-
 ###############################################################################
 # Test writing different data types in a GML file (ticket #2857)
 # TODO: Add test for other data types as they are added to the driver.
@@ -379,8 +363,6 @@ def test_ogr_gml_10():
     os.remove('tmp/fields.gml')
     os.remove('tmp/fields.xsd')
 
-    return 'success'
-
 ###############################################################################
 # Test reading a geometry element specified with <GeometryElementPath>
 
@@ -418,7 +400,6 @@ def test_ogr_gml_11():
     geom = feat.GetGeometryRef()
     assert geom.ExportToWkt() == 'POINT (3 50)', 'did not get expected geometry'
     ds = None
-    return 'success'
 
 ###############################################################################
 # Test reading a virtual GML file
@@ -442,7 +423,6 @@ def test_ogr_gml_12():
     geom = feat.GetGeometryRef()
     assert geom.ExportToWkt() == 'POINT (3 50)', 'did not get expected geometry'
     ds = None
-    return 'success'
 
 ###############################################################################
 # Test reading GML with StringList, IntegerList and RealList fields
@@ -468,8 +448,6 @@ def test_ogr_gml_13():
         ds = None
     gdal.Unlink('data/testlistfields.gfs')
 
-    return 'success'
-
 ###############################################################################
 # Test xlink resolution
 
@@ -531,8 +509,6 @@ def test_ogr_gml_14():
 
     assert text == expectedtext, 'Problem with file 2'
 
-    return 'success'
-
 ###############################################################################
 # Run test_ogrsf
 
@@ -550,8 +526,6 @@ def test_ogr_gml_15():
 
     assert ret.find('INFO') != -1 and ret.find('ERROR') == -1
 
-    return 'success'
-
 ###############################################################################
 # Read CityGML generic attributes
 
@@ -571,8 +545,7 @@ def test_ogr_gml_16():
         feat.DumpReadable()
         pytest.fail('did not get expected values')
 
-    return 'success'
-
+    
 ###############################################################################
 # Read layer SRS for WFS 1.0.0 return
 
@@ -593,8 +566,6 @@ def test_ogr_gml_17():
     got_wkt = geom.ExportToWkt()
     assert got_wkt == 'POINT (2.09 34.12)', 'did not get expected geometry'
 
-    return 'success'
-
 ###############################################################################
 # Read layer SRS for WFS 1.1.0 return
 
@@ -615,8 +586,6 @@ def test_ogr_gml_18():
     got_wkt = geom.ExportToWkt()
     assert got_wkt == 'POINT (2.09 34.12)', 'did not get expected geometry'
 
-    return 'success'
-
 ###############################################################################
 # Read layer SRS for WFS 1.1.0 return, but without trying to restore
 # (long, lat) order. So we should get EPSGA:4326 and (lat, long) order
@@ -648,8 +617,6 @@ def test_ogr_gml_19():
     got_wkt = geom.ExportToWkt()
     assert got_wkt == 'POINT (34.12 2.09)', 'did not get expected geometry'
 
-    return 'success'
-
 ###############################################################################
 # Test parsing a .xsd where the type definition is before its reference
 
@@ -696,7 +663,7 @@ def test_ogr_gml_20():
         os.stat('data/archsites.gfs')
         pytest.fail('did not expected .gfs -> XSD parsing failed')
     except OSError:
-        return 'success'
+        return
 
 ###############################################################################
 # Test writing GML3
@@ -781,8 +748,6 @@ def test_ogr_gml_21(frmt='GML3'):
     f1.close()
     f2.close()
 
-    return 'success'
-
 
 def test_ogr_gml_21_deegree3():
     return test_ogr_gml_21('GML3Deegree')
@@ -809,7 +774,6 @@ def test_ogr_gml_22():
     assert count == 9, 'did not get expected feature count'
 
     ds = None
-    return 'success'
 
 ###############################################################################
 # Test that use SRS defined in global gml:Envelope if no SRS is set for any
@@ -846,8 +810,6 @@ def test_ogr_gml_23():
     extent = lyr.GetExtent()
     assert extent == (2.0, 3.0, 49.0, 50.0), 'did not get expected layer extent'
 
-    return 'success'
-
 ###############################################################################
 # Test that use SRS defined in global gml:Envelope if no SRS is set for any
 # feature geometry
@@ -886,8 +848,6 @@ def test_ogr_gml_24():
     extent = lyr.GetExtent()
     assert extent == (2.0, 3.0, 49.0, 50.0), 'did not get expected layer extent'
 
-    return 'success'
-
 ###############################################################################
 # Test fixes for #3934 and #3935
 
@@ -917,8 +877,6 @@ def test_ogr_gml_25():
     assert got_wkt == 'POLYGON ((14 21,6 21,6 9,14 9,22 9,22 21,14 21))', \
         'did not get expected geometry'
 
-    return 'success'
-
 ###############################################################################
 # Test writing and reading 3D geoms (GML2)
 
@@ -947,8 +905,6 @@ def test_ogr_gml_26():
 
     ds = None
 
-    return 'success'
-
 ###############################################################################
 # Test writing and reading 3D geoms (GML3)
 
@@ -977,8 +933,6 @@ def test_ogr_gml_27():
 
     ds = None
 
-    return 'success'
-
 ###############################################################################
 # Test writing and reading layers of type wkbNone (#4154)
 
@@ -1013,8 +967,6 @@ def test_ogr_gml_28():
     assert lyr.GetGeomType() == ogr.wkbNone
     ds = None
 
-    return 'success'
-
 ###############################################################################
 # Test reading FME GMLs
 
@@ -1044,8 +996,6 @@ def test_ogr_gml_29():
 
     ds = None
 
-    return 'success'
-
 ###############################################################################
 # Test reading a big field and a big geometry
 
@@ -1088,8 +1038,6 @@ def test_ogr_gml_30():
 
     assert len(geom_wkt) == 2060, 'did not get expected len(geom_wkt)'
 
-    return 'success'
-
 ###############################################################################
 # Test SEQUENTIAL_LAYERS
 
@@ -1118,8 +1066,6 @@ def test_ogr_gml_31():
     feat = lyr.GetNextFeature()
     assert feat.GetFID() == 1, 'did not get feature when reading back first layer'
 
-    return 'success'
-
 ###############################################################################
 # Test SEQUENTIAL_LAYERS without a .gfs
 
@@ -1159,8 +1105,6 @@ def test_ogr_gml_32():
     gdal.Unlink("/vsimem/ogr_gml_31.gml")
     gdal.Unlink("/vsimem/ogr_gml_31.gfs")
 
-    return 'success'
-
 ###############################################################################
 # Test INTERLEAVED_LAYERS
 
@@ -1199,8 +1143,7 @@ def test_ogr_gml_33():
         expected_fid = read_seq[1]
         assert fid == expected_fid, ('failed at step %d' % i)
 
-    return 'success'
-
+    
 ###############################################################################
 # Test writing non-ASCII UTF-8 content (#4117, #4299)
 
@@ -1229,8 +1172,6 @@ def test_ogr_gml_34():
     gdal.Unlink('/vsimem/ogr_gml_34.gml')
     gdal.Unlink('/vsimem/ogr_gml_34.xsd')
 
-    return 'success'
-
 ###############################################################################
 # Test GML_SKIP_RESOLVE_ELEMS=HUGE (#4380)
 
@@ -1288,8 +1229,6 @@ def test_ogr_gml_35():
 
     ds = None
 
-    return 'success'
-
 ###############################################################################
 # Test GML_SKIP_RESOLVE_ELEMS=NONE (and new GMLTopoSurface interpretation)
 
@@ -1340,8 +1279,6 @@ def test_ogr_gml_36(GML_FACE_HOLE_NEGATIVE='NO'):
 
     ds = None
 
-    return 'success'
-
 ###############################################################################
 # Test GML_SKIP_RESOLVE_ELEMS=NONE with old GMLTopoSurface interpretation
 
@@ -1401,8 +1338,6 @@ def test_ogr_gml_38(resolver='HUGE'):
 
     ds = None
 
-    return 'success'
-
 ###############################################################################
 # Test new GMLTopoSurface interpretation (#3934) with standard xlink resolver
 
@@ -1424,8 +1359,6 @@ def test_ogr_gml_40():
     fld_defn = lyr.GetLayerDefn().GetFieldDefn(lyr.GetLayerDefn().GetFieldIndex('CITYNAME'))
     assert fld_defn.GetWidth() == 26
 
-    return 'success'
-
 ###############################################################################
 # Test validating against .xsd
 
@@ -1458,8 +1391,6 @@ def test_ogr_gml_41():
 
     gdaltest.have_gml_validation = True
 
-    return 'success'
-
 ###############################################################################
 # Test validating against .xsd
 
@@ -1493,8 +1424,6 @@ def test_ogr_gml_42():
 
     assert val != 0
 
-    return 'success'
-
 ###############################################################################
 # Test automated downloading of WFS schema
 
@@ -1526,8 +1455,7 @@ def test_ogr_gml_43():
 
         assert not can_download_schema, '.gfs found, but schema could be downloaded'
 
-    return 'success'
-
+    
 ###############################################################################
 # Test providing a custom XSD filename
 
@@ -1580,8 +1508,6 @@ def test_ogr_gml_44():
 
     gdal.Unlink('/vsimem/ogr_gml_44.xsd')
 
-    return 'success'
-
 ###############################################################################
 # Test PREFIX and TARGET_NAMESPACE creation options
 
@@ -1633,8 +1559,6 @@ def test_ogr_gml_45():
 
     assert val != 0
 
-    return 'success'
-
 
 ###############################################################################
 # Validate different kinds of GML files
@@ -1746,8 +1670,7 @@ def test_ogr_gml_46():
         if frmt == 'GML3Deegree':
             break
 
-    return 'success'
-
+    
 ###############################################################################
 # Test validation of WFS GML documents
 
@@ -1778,8 +1701,7 @@ def test_ogr_gml_47():
 
         assert val != 0, ('validation failed for file=%s' % filename)
 
-    return 'success'
-
+    
 ###############################################################################
 # Test that we can parse some particular .xsd files that have the geometry
 # field declared as :
@@ -1808,8 +1730,6 @@ def test_ogr_gml_48():
 
     ds = None
 
-    return 'success'
-
 ###############################################################################
 # Test a pseudo Inspire GML file
 
@@ -1847,8 +1767,6 @@ def test_ogr_gml_49():
     gdal.Unlink('/vsimem/ogr_gml_49.gml')
     gdal.Unlink('/vsimem/ogr_gml_49.gfs')
 
-    return 'success'
-
 ###############################################################################
 # Test support for StringList, IntegerList, RealList
 
@@ -1891,8 +1809,6 @@ def test_ogr_gml_50():
     gdal.Unlink('/vsimem/ogr_gml_50.gml')
     gdal.Unlink('/vsimem/ogr_gml_50.xsd')
 
-    return 'success'
-
 ###############################################################################
 # Test -dsco WRITE_FEATURE_BOUNDED_BY=no -dsco STRIP_PREFIX=YES
 
@@ -1927,8 +1843,7 @@ def test_ogr_gml_51():
         assert feat is not None
         ds = None
 
-    return 'success'
-
+    
 ###############################################################################
 # Test reading MTKGML files
 
@@ -1984,8 +1899,6 @@ def test_ogr_gml_52():
 
     os.remove('data/fake_mtkgml.gfs')
 
-    return 'success'
-
 ###############################################################################
 # Test that we don't recognize .xsd files themselves
 
@@ -1999,8 +1912,6 @@ def test_ogr_gml_53():
     assert ds is None
     ds = None
 
-    return 'success'
-
 ###############################################################################
 # Test that we can open an empty GML datasource (#249, #5205)
 
@@ -2023,8 +1934,6 @@ def test_ogr_gml_54():
 
     gdal.Unlink('data/empty.gfs')
 
-    return 'success'
-
 ###############################################################################
 # Test support for <xs:include> in schemas
 # Necessary for Finnish NLS data
@@ -2046,8 +1955,7 @@ def test_ogr_gml_55():
     except OSError:
         pass
 
-    return 'success'
-
+    
 ###############################################################################
 # Test support for gml:FeaturePropertyType and multiple geometry field
 # Necessary for Finnish NLS data
@@ -2093,8 +2001,7 @@ def test_ogr_gml_56():
     except OSError:
         pass
 
-    return 'success'
-
+    
 ###############################################################################
 # Test write support for multiple geometry field
 
@@ -2153,8 +2060,7 @@ def test_ogr_gml_57():
         gdal.Unlink('/vsimem/ogr_gml_57.gml')
         gdal.Unlink('/vsimem/ogr_gml_57.xsd')
 
-    return 'success'
-
+    
 ###############################################################################
 # Test support for Inspire Cadastral schemas
 
@@ -2362,8 +2268,6 @@ def test_ogr_gml_58():
     lyr = None
     ds = None
 
-    return 'success'
-
 ###############################################################################
 # Test GFS conditions
 
@@ -2401,8 +2305,6 @@ def test_ogr_gml_59():
     lyr = None
     ds = None
 
-    return 'success'
-
 ########################################################
 # Test reading WFS 2.0 GetFeature documents with wfs:FeatureCollection
 # as a wfs:member of the top wfs:FeatureCollection
@@ -2430,8 +2332,6 @@ def test_ogr_gml_60():
 
     gdal.Unlink('data/wfs_200_multiplelayers.gfs')
 
-    return 'success'
-
 ###############################################################################
 # Test reading a element specified with a full path in <ElementPath>
 
@@ -2479,7 +2379,6 @@ def test_ogr_gml_61():
         pytest.fail()
 
     ds = None
-    return 'success'
 
 ###############################################################################
 # Test GML_ATTRIBUTES_TO_OGR_FIELDS option
@@ -2536,8 +2435,7 @@ def test_ogr_gml_62():
         feat = None
         ds = None
 
-    return 'success'
-
+    
 ###############################################################################
 # Test reading RUIAN VFR files
 
@@ -2577,8 +2475,6 @@ def test_ogr_gml_63():
         nfeatures += lyr.GetFeatureCount()
     assert nfeatures == 7
 
-    return 'success'
-
 ###############################################################################
 # Test multiple instances of parsers (#5571)
 
@@ -2597,8 +2493,7 @@ def test_ogr_gml_64():
             feat = lyr.GetNextFeature()
             assert feat is not None, parser
 
-    return 'success'
-
+    
 ###############################################################################
 # Test SRSDIMENSION_LOC=GEOMETRY option (#5606)
 
@@ -2639,8 +2534,7 @@ def test_ogr_gml_65():
         gdal.Unlink(filename)
         gdal.Unlink(filename[0:-3] + "xsd")
 
-    return 'success'
-
+    
 ###############################################################################
 # Test curve geometries
 
@@ -2935,8 +2829,6 @@ def test_ogr_gml_66():
     gdal.Unlink(filename)
     gdal.Unlink(filename[0:-3] + "gfs")
 
-    return 'success'
-
 ###############################################################################
 # Test boolean, int16, integer64 type
 
@@ -3025,8 +2917,6 @@ def test_ogr_gml_67():
     gdal.Unlink(filename)
     gdal.Unlink(filename[0:-3] + "gfs")
 
-    return 'success'
-
 ###############################################################################
 # Test reading GML with xsd with a choice of geometry properites
 
@@ -3052,8 +2942,6 @@ def test_ogr_gml_68():
 
     ds = None
 
-    return 'success'
-
 ###############################################################################
 # Test not nullable fields
 
@@ -3112,8 +3000,6 @@ def test_ogr_gml_69():
     gdal.Unlink("/vsimem/ogr_gml_69.gml")
     gdal.Unlink("/vsimem/ogr_gml_69.xsd")
 
-    return 'success'
-
 ###############################################################################
 # Test default fields (not really supported, but we must do something as we
 # support not nullable fields)
@@ -3149,8 +3035,6 @@ def test_ogr_gml_70():
     gdal.Unlink("/vsimem/ogr_gml_70.gml")
     gdal.Unlink("/vsimem/ogr_gml_70.xsd")
 
-    return 'success'
-
 ###############################################################################
 # Test reading WFS 2.0 layer resulting from a join operation
 
@@ -3198,8 +3082,7 @@ def ogr_gml_71_helper(ds):
         f.DumpReadable()
         pytest.fail()
 
-    return 'success'
-
+    
 
 def test_ogr_gml_71():
 
@@ -3245,8 +3128,6 @@ def test_ogr_gml_71():
     ogr_gml_71_helper(ds)
     ds = None
 
-    return 'success'
-
 ###############################################################################
 # Test name and description
 
@@ -3280,8 +3161,6 @@ def test_ogr_gml_72():
     gdal.Unlink("/vsimem/ogr_gml_72.xsd")
     gdal.Unlink("/vsimem/ogr_gml_72.gfs")
 
-    return 'success'
-
 ###############################################################################
 # Read a CSW GetRecordsResponse document
 
@@ -3316,8 +3195,7 @@ def test_ogr_gml_73():
     except OSError:
         pass
 
-    return 'success'
-
+    
 ###############################################################################
 # Test FORCE_SRS_DETECTION open option
 
@@ -3353,8 +3231,6 @@ def test_ogr_gml_74():
     os.unlink('tmp/ogr_gml_74.gml')
     os.unlink('tmp/ogr_gml_74.gfs')
 
-    return 'success'
-
 ###############################################################################
 # Test we don't open a WMTS Capabilities doc
 
@@ -3395,8 +3271,6 @@ def test_ogr_gml_75():
     assert ds is None
     gdal.Unlink('/vsimem/ogr_gml_75.xml')
 
-    return 'success'
-
 ###############################################################################
 # Test we are robust to content of XML elements bigger than 2 GB
 
@@ -3420,8 +3294,7 @@ def test_ogr_gml_76():
             lyr = ds.GetLayer(0)
             lyr.GetNextFeature()
 
-    return 'success'
-
+    
 ###############################################################################
 # Test interpretation of http://www.opengis.net/def/crs/EPSG/0/ URLs (#6678)
 
@@ -3468,8 +3341,6 @@ def test_ogr_gml_77():
     gdal.Unlink('/vsimem/ogr_gml_77.xml')
     gdal.Unlink('/vsimem/ogr_gml_77.gfs')
 
-    return 'success'
-
 ###############################################################################
 # Test effect of SWAP_COORDINATES (#6678)
 
@@ -3516,8 +3387,6 @@ def test_ogr_gml_78():
     gdal.Unlink('/vsimem/ogr_gml_78.xml')
     gdal.Unlink('/vsimem/ogr_gml_78.gfs')
 
-    return 'success'
-
 ###############################################################################
 # Test SRSNAME_FORMAT
 
@@ -3553,8 +3422,6 @@ def test_ogr_gml_79():
     gdal.Unlink('/vsimem/ogr_gml_79.xml')
     gdal.Unlink('/vsimem/ogr_gml_79.xsd')
 
-    return 'success'
-
 ###############################################################################
 # Test null / unset
 
@@ -3603,8 +3470,6 @@ def test_ogr_gml_80():
     gdal.Unlink('/vsimem/ogr_gml_80.xml')
     gdal.Unlink('/vsimem/ogr_gml_80.xsd')
 
-    return 'success'
-
 
 ###############################################################################
 # Test building a .gfs with a field with xsi:nil="true" (#7027)
@@ -3625,8 +3490,6 @@ def test_ogr_gml_81():
 
     gdal.Unlink('data/test_xsi_nil_gfs.gfs')
 
-    return 'success'
-
 ###############################################################################
 # Test GML_FEATURE_COLLECTION=YES
 
@@ -3662,8 +3525,6 @@ def test_ogr_gml_82():
     gdal.Unlink('/vsimem/ogr_gml_82.gml')
     gdal.Unlink('/vsimem/ogr_gml_82.xsd')
 
-    return 'success'
-
 ###############################################################################
 
 
@@ -3680,8 +3541,6 @@ def test_ogr_gml_gml2_write_geometry_error():
     gdal.Unlink('/vsimem/ogr_gml_83.gml')
     gdal.Unlink('/vsimem/ogr_gml_83.xsd')
 
-    return 'success'
-
 ###############################################################################
 #  Cleanup
 
@@ -3814,8 +3673,6 @@ def test_ogr_gml_clean_files():
             os.unlink('data/' + filename)
     gdal.Unlink('data/test_xsi_nil_gfs.gfs')
 
-    return 'success'
-
 
 gdaltest_list = [
     test_ogr_gml_clean_files,
diff --git a/autotest/ogr/ogr_gmlas.py b/autotest/ogr/ogr_gmlas.py
index 49441b17e6bf..45103013f11f 100755
--- a/autotest/ogr/ogr_gmlas.py
+++ b/autotest/ogr/ogr_gmlas.py
@@ -79,8 +79,7 @@ def compare_ogrinfo_output(gmlfile, reffile, options=''):
         os.system('diff -u ' + reffile + ' ' + tmpfilename)
         # os.unlink(tmpfilename)
         pytest.fail('Got:')
-    return 'success'
-
+    
 ###############################################################################
 # Basic test
 
@@ -130,8 +129,6 @@ def test_ogr_gmlas_test_ogrsf():
 
     assert ret.find('INFO') != -1 and ret.find('ERROR') == -1
 
-    return 'success'
-
 ###############################################################################
 # Test virtual file support
 
@@ -160,8 +157,6 @@ def test_ogr_gmlas_virtual_file():
     gdal.Unlink('/vsimem/ogr_gmlas_8.xml')
     gdal.Unlink('/vsimem/ogr_gmlas_8.xsd')
 
-    return 'success'
-
 ###############################################################################
 # Test opening with XSD option
 
@@ -174,8 +169,6 @@ def test_ogr_gmlas_datafile_with_xsd_option():
     ds = gdal.OpenEx('GMLAS:data/gmlas/gmlas_test1.xml', open_options=['XSD=data/gmlas/gmlas_test1.xsd'])
     assert ds is not None
 
-    return 'success'
-
 ###############################################################################
 # Test opening with just XSD option
 
@@ -188,8 +181,6 @@ def test_ogr_gmlas_no_datafile_with_xsd_option():
     ds = gdal.OpenEx('GMLAS:', open_options=['XSD=data/gmlas/gmlas_test1.xsd'])
     assert ds is not None
 
-    return 'success'
-
 ###############################################################################
 # Test opening with just XSD option but pointing to a non-xsd filename
 
@@ -204,8 +195,6 @@ def test_ogr_gmlas_no_datafile_xsd_which_is_not_xsd():
     assert ds is None
     assert gdal.GetLastErrorMsg().find("invalid content in 'schema' element") >= 0
 
-    return 'success'
-
 ###############################################################################
 # Test opening with nothing
 
@@ -220,8 +209,6 @@ def test_ogr_gmlas_no_datafile_no_xsd():
     assert ds is None
     assert gdal.GetLastErrorMsg().find('XSD open option must be provided when no XML data file is passed') >= 0
 
-    return 'success'
-
 ###############################################################################
 # Test opening an inexisting GML file
 
@@ -236,8 +223,6 @@ def test_ogr_gmlas_non_existing_gml():
     assert ds is None
     assert gdal.GetLastErrorMsg().find('Cannot open /vsimem/i_do_not_exist.gml') >= 0
 
-    return 'success'
-
 ###############################################################################
 # Test opening with just XSD option but pointing to a non existing file
 
@@ -252,8 +237,6 @@ def test_ogr_gmlas_non_existing_xsd():
     assert ds is None
     assert gdal.GetLastErrorMsg().find('Cannot resolve /vsimem/i_do_not_exist.xsd') >= 0
 
-    return 'success'
-
 ###############################################################################
 # Test opening a GML file without schemaLocation
 
@@ -273,8 +256,6 @@ def test_ogr_gmlas_gml_without_schema_location():
 
     gdal.Unlink('/vsimem/ogr_gmlas_gml_without_schema_location.xml')
 
-    return 'success'
-
 ###############################################################################
 # Test invalid schema
 
@@ -289,8 +270,6 @@ def test_ogr_gmlas_invalid_schema():
     assert ds is None
     assert gdal.GetLastErrorMsg().find('invalid content') >= 0
 
-    return 'success'
-
 ###############################################################################
 # Test invalid XML
 
@@ -307,8 +286,6 @@ def test_ogr_gmlas_invalid_xml():
     assert f is None
     assert gdal.GetLastErrorMsg().find('input ended before all started tags were ended') >= 0
 
-    return 'success'
-
 ###############################################################################
 # Test links with gml:ReferenceType
 
@@ -334,8 +311,7 @@ def test_ogr_gmlas_gml_Reference():
         f.DumpReadable()
         pytest.fail()
 
-    return 'success'
-
+    
 ###############################################################################
 # Test that we fix ambiguities in class names
 
@@ -361,8 +337,6 @@ def test_ogr_gmlas_same_element_in_different_ns():
     assert ds.GetLayerByName('elt_elt2_abstractElt_myns_realizationOfAbstractElt') is not None
     assert ds.GetLayerByName('elt_elt2_abstractElt_other_ns_realizationOfAbstractElt') is not None
 
-    return 'success'
-
 ###############################################################################
 # Test a corner case of relative path resolution
 
@@ -375,8 +349,6 @@ def test_ogr_gmlas_corner_case_relative_path():
     ds = ogr.Open('GMLAS:../ogr/data/gmlas/gmlas_test1.xml')
     assert ds is not None
 
-    return 'success'
-
 ###############################################################################
 # Test unexpected repeated element
 
@@ -398,8 +370,6 @@ def test_ogr_gmlas_unexpected_repeated_element():
     assert f is None
     ds = None
 
-    return 'success'
-
 ###############################################################################
 # Test unexpected repeated element
 
@@ -421,8 +391,6 @@ def test_ogr_gmlas_unexpected_repeated_element_variant():
     assert f is None
     ds = None
 
-    return 'success'
-
 ###############################################################################
 # Test reading geometries embedded in a geometry property element
 
@@ -547,8 +515,7 @@ def test_ogr_gmlas_geometryproperty():
         f.DumpReadable()
         pytest.fail()
 
-    return 'success'
-
+    
 ###############################################################################
 # Test reading geometries referenced by a AbstractGeometry element
 
@@ -580,8 +547,7 @@ def test_ogr_gmlas_abstractgeometry():
         f.DumpReadable()
         pytest.fail()
 
-    return 'success'
-
+    
 ###############################################################################
 # Test validation against schema
 
@@ -666,8 +632,6 @@ def test_ogr_gmlas_validate():
     assert ds is not None, myhandler.error_list
     assert not myhandler.error_list
 
-    return 'success'
-
 ###############################################################################
 # Test correct namespace prefix handling
 
@@ -686,8 +650,7 @@ def test_ogr_gmlas_test_ns_prefix():
         f.DumpReadable()
         pytest.fail()
 
-    return 'success'
-
+    
 ###############################################################################
 # Test parsing documents without namespace
 
@@ -704,8 +667,7 @@ def test_ogr_gmlas_no_namespace():
         f.DumpReadable()
         pytest.fail()
 
-    return 'success'
-
+    
 ###############################################################################
 # Test CONFIG_FILE
 
@@ -783,8 +745,6 @@ def test_ogr_gmlas_conf():
             'CONFIG_FILE=<Configuration><Validation enabled="true"><FailIfError>true</FailIfError></Validation></Configuration>'])
     assert ds is None and gdal.GetLastErrorMsg().find('Validation') >= 0
 
-    return 'success'
-
 ###############################################################################
 # Test IgnoredXPaths aspect of config file
 
@@ -893,8 +853,6 @@ def test_ogr_gmlas_conf_ignored_xpath():
     assert lyr.GetLayerDefn().GetFieldIndex('int_array') >= 0
     assert lyr.GetLayerDefn().GetFieldIndex('long') >= 0
 
-    return 'success'
-
 ###############################################################################
 
 
@@ -1066,8 +1024,6 @@ def test_ogr_gmlas_cache():
     gdal.Rmdir('/vsimem/my/gmlas_cache')
     gdal.Rmdir('/vsimem/my')
 
-    return 'success'
-
 
 ###############################################################################
 # Test good working of linking to a child through its id attribute
@@ -1084,8 +1040,7 @@ def test_ogr_gmlas_link_nested_independant_child():
         f.DumpReadable()
         pytest.fail()
 
-    return 'success'
-
+    
 ###############################################################################
 # Test some pattern found in geosciml schemas
 
@@ -1117,8 +1072,7 @@ def test_ogr_gmlas_composition_compositionPart():
         f.DumpReadable()
         pytest.fail()
 
-    return 'success'
-
+    
 ###############################################################################
 # Test that when importing GML we expose by default only elements deriving
 # from _Feature/AbstractFeature
@@ -1134,8 +1088,6 @@ def test_ogr_gmlas_instantiate_only_gml_feature():
     assert ds.GetLayerCount() == 1
     ds = None
 
-    return 'success'
-
 ###############################################################################
 # Test that WFS style timeStamp are ignored for hash generation
 
@@ -1157,8 +1109,7 @@ def test_ogr_gmlas_timestamp_ignored_for_hash():
         f.DumpReadable()
         pytest.fail(pkid)
 
-    return 'success'
-
+    
 ###############################################################################
 # Test dataset GetNextFeature()
 
@@ -1281,8 +1232,6 @@ def test_ogr_gmlas_dataset_getnextfeature():
 
     assert count != 0
 
-    return 'success'
-
 ###############################################################################
 #  Test that with schemas that have a structure like a base:identifier, we
 # will inline it.
@@ -1301,8 +1250,6 @@ def test_ogr_gmlas_inline_identifier():
     lyr = ds.GetLayer(0)
     assert lyr.GetLayerDefn().GetFieldIndex('identifier_foo') >= 0
 
-    return 'success'
-
 ###############################################################################
 #  Test that we can handle things like gml:name and au:name
 
@@ -1319,8 +1266,6 @@ def test_ogr_gmlas_avoid_same_name_inlined_classes():
     lyr = ds.GetLayerByName('myFeature_ns2_dt')
     assert lyr is not None
 
-    return 'success'
-
 
 ###############################################################################
 #  Test validation with an optional fixed attribute that is ignored
@@ -1338,8 +1283,6 @@ def test_ogr_gmlas_validate_ignored_fixed_attribute():
     gdal.PopErrorHandler()
     assert not myhandler.error_list
 
-    return 'success'
-
 
 ###############################################################################
 #  Test REMOVE_UNUSED_LAYERS and REMOVE_UNUSED_FIELDS options
@@ -1378,8 +1321,7 @@ def test_ogr_gmlas_remove_unused_layers_and_fields():
             f.DumpReadable()
         pytest.fail()
 
-    return 'success'
-
+    
 ###############################################################################
 #  Test xlink resolution
 
@@ -1836,8 +1778,6 @@ def test_ogr_gmlas_xlink_resolver():
     gdal.Unlink('/vsimem/subdir2/resource2_super_super_super_super_super_super_super_super_super_super_super_super_super_super_super_super_super_super_super_super_super_super_super_super_super_super_super_super_super_super_super_super_super_super_super_super_super_super_super_super_super_super_super_super_very_long.xml')
     gdal.Unlink('/vsimem/non_matching_resource.xml')
 
-    return 'success'
-
 ###############################################################################
 # Test UTF-8 support
 
@@ -1860,8 +1800,7 @@ def test_ogr_gmlas_recoding():
         f.DumpReadable()
         pytest.fail()
 
-    return 'success'
-
+    
 ###############################################################################
 # Test schema without namespace prefix
 
@@ -1901,8 +1840,7 @@ def test_ogr_gmlas_schema_without_namespace_prefix():
         f.DumpReadable()
         pytest.fail()
 
-    return 'success'
-
+    
 ###############################################################################
 # Test parsing truncated XML
 
@@ -1920,8 +1858,7 @@ def test_ogr_gmlas_truncated_xml():
         f.DumpReadable()
         pytest.fail()
 
-    return 'success'
-
+    
 ###############################################################################
 # Test identifier truncation
 
@@ -1958,8 +1895,6 @@ def test_ogr_gmlas_identifier_truncation():
     assert lyr is not None, ds.GetLayer(3).GetName()
     ds = None
 
-    return 'success'
-
 ###############################################################################
 # Test behaviour when identifiers have same case
 
@@ -1982,8 +1917,6 @@ def test_ogr_gmlas_identifier_case_ambiguity():
     assert lyr is not None, ds.GetLayer(0).GetName()
     ds = None
 
-    return 'success'
-
 ###############################################################################
 # Test writing support
 
@@ -2007,8 +1940,6 @@ def test_ogr_gmlas_writer():
 
     assert ret_ds is not None
 
-    return 'success'
-
 ###############################################################################
 # Check the generated .xml and .xsd
 
@@ -2059,8 +1990,7 @@ def test_ogr_gmlas_writer_check_xml_xsd():
         os.system('diff -u data/gmlas/gmlas_test1_generated.xsd tmp/gmlas_test1_generated.xsd')
         pytest.fail('Got:')
 
-    return 'success'
-
+    
 ###############################################################################
 # Check that the .xml read back by the GMLAS driver has the same content
 # as the original one.
@@ -2125,8 +2055,6 @@ def test_ogr_gmlas_writer_check_xml_read_back():
     gdal.Unlink('tmp/gmlas_test1_generated.xml')
     gdal.Unlink('tmp/gmlas_test1_generated.xsd')
 
-    return 'success'
-
 ###############################################################################
 # Test writing support with geometries
 
@@ -2168,8 +2096,6 @@ def test_ogr_gmlas_writer_gml():
 
     assert content.find('      <ogr:pointPropertyRepeated><gml:Point gml:id="hash_test_1.geom13.1"><gml:pos>1 2</gml:pos></gml:Point></ogr:pointPropertyRepeated>') >= 0
 
-    return 'success'
-
 ###############################################################################
 # Test writing support with geometries and -a_srs
 
@@ -2227,8 +2153,6 @@ def test_ogr_gmlas_writer_gml_assign_srs():
     gdal.Unlink('/vsimem/gmlas_test1_generated_asrs.xml')
     gdal.Unlink('/vsimem/gmlas_test1_generated_asrs.xsd')
 
-    return 'success'
-
 ###############################################################################
 # Test writing support with geometries with original XML content preserved
 
@@ -2268,8 +2192,6 @@ def test_ogr_gmlas_writer_gml_original_xml():
 
     assert content.find('      <ogr:pointPropertyRepeated><gml:Point gml:id="poly.geom.pointPropertyRepeated.2"><gml:pos>1 2</gml:pos></gml:Point></ogr:pointPropertyRepeated>') >= 0
 
-    return 'success'
-
 ###############################################################################
 # Test writing support with XSD, INDENT_SIZE, COMMENT, OUTPUT_XSD_FILENAME, TIMESTAMP options
 
@@ -2386,8 +2308,6 @@ def test_ogr_gmlas_writer_options():
 
     assert content.find('xsi:schemaLocation="http://www.opengis.net/wfs/2.0 /vsimem/fake_wfs.xsd ') >= 0
 
-    return 'success'
-
 ###############################################################################
 # Test writing support error handle
 
@@ -2489,8 +2409,6 @@ def test_ogr_gmlas_writer_errors():
     gdal.Unlink('/vsimem/valid.xml')
     gdal.Unlink('/vsimem/valid.xsd')
 
-    return 'success'
-
 ###############################################################################
 # Test reading a particular construct with group, etc... that could cause
 # crashes
@@ -2513,8 +2431,6 @@ def test_ogr_gmlas_read_fake_gmljp2():
 
     assert count == 5
 
-    return 'success'
-
 ###############################################################################
 #  Test TypingConstraints
 
@@ -2611,8 +2527,6 @@ def test_ogr_gmlas_typing_constraints():
         pytest.fail()
     ds = None
 
-    return 'success'
-
 ###############################################################################
 #  Test swe:DataArray
 
@@ -2684,8 +2598,6 @@ def test_ogr_gmlas_swe_dataarray():
 
     ds = None
 
-    return 'success'
-
 
 ###############################################################################
 #  Test swe:DataRecord
@@ -2716,8 +2628,6 @@ def test_ogr_gmlas_swe_datarecord():
         pytest.fail()
     ds = None
 
-    return 'success'
-
 ###############################################################################
 #  Test a xs:any field at end of a type declaration
 
@@ -2745,8 +2655,7 @@ def test_ogr_gmlas_any_field_at_end_of_declaration():
     if f.GetField('value') != '<something>baz</something>':
         print('Expected fail: value != <something>baz</something>')
 
-    return 'success'
-
+    
 ###############################################################################
 #  Test auxiliary schema without namespace prefix
 
@@ -2763,8 +2672,7 @@ def test_ogr_gmlas_aux_schema_without_namespace_prefix():
         f.DumpReadable()
         pytest.fail()
 
-    return 'success'
-
+    
 ###############################################################################
 # Test importing a GML geometry that is in an element that is a substitutionGroup
 # of another one (#6990)
@@ -2783,8 +2691,6 @@ def test_ogr_gmlas_geometry_as_substitutiongroup():
         pytest.fail()
     ds = None
 
-    return 'success'
-
 ###############################################################################
 
 
@@ -2826,8 +2732,7 @@ def test_ogr_gmlas_no_element_in_first_choice_schema():
         f.DumpReadable()
         pytest.fail()
 
-    return 'success'
-
+    
 
 ###############################################################################
 # Test cross-layer links with xlink:href="#my_id"
@@ -2965,8 +2870,7 @@ def test_ogr_gmlas_internal_xlink_href():
         f.DumpReadable()
         pytest.fail()
 
-    return 'success'
-
+    
 ###############################################################################
 #  Cleanup
 
@@ -2983,8 +2887,6 @@ def test_ogr_gmlas_cleanup():
     gdal.SetConfigOption('GMLAS_WARN_UNEXPECTED', None)
     gdal.SetConfigOption('GDAL_XML_VALIDATION', ogrtest.old_val_GDAL_XML_VALIDATION)
 
-    return 'success'
-
 
 gdaltest_list = [
     test_ogr_gmlas_basic,
diff --git a/autotest/ogr/ogr_gmt.py b/autotest/ogr/ogr_gmt.py
index a7967264d11e..aa2a638083cd 100755
--- a/autotest/ogr/ogr_gmt.py
+++ b/autotest/ogr/ogr_gmt.py
@@ -47,8 +47,6 @@ def test_ogr_gmt_1():
 
     assert gdaltest.gmt_ds is not None
 
-    return 'success'
-
 ###############################################################################
 # Create table from data/poly.shp
 
@@ -90,8 +88,6 @@ def test_ogr_gmt_2():
     gdaltest.gmt_lyr = None
     gdaltest.gmt_ds = None
 
-    return 'success'
-
 ###############################################################################
 # Verify that stuff we just wrote is still OK.
 
@@ -124,7 +120,7 @@ def test_ogr_gmt_3():
     gdaltest.gmt_lyr = None
     gdaltest.gmt_ds = None
 
-    return 'success' if tr else 'fail'
+    assert tr
 
 ###############################################################################
 # Verify reading of multilinestring file. (#3802)
@@ -154,8 +150,6 @@ def test_ogr_gmt_4():
 
     assert feat is None, 'did not get null feature when expected.'
 
-    return 'success'
-
 ###############################################################################
 # Write a multipolygon file and verify it.
 
@@ -217,8 +211,6 @@ def test_ogr_gmt_5():
 
     assert feat is None, 'did not get null feature when expected.'
 
-    return 'success'
-
 
 ###############################################################################
 #
@@ -231,8 +223,6 @@ def test_ogr_gmt_cleanup():
 
     gdaltest.clean_tmp()
 
-    return 'success'
-
 
 gdaltest_list = [
     test_ogr_gmt_1,
diff --git a/autotest/ogr/ogr_gpkg.py b/autotest/ogr/ogr_gpkg.py
index ebb7c286b305..ac0e1eed573c 100755
--- a/autotest/ogr/ogr_gpkg.py
+++ b/autotest/ogr/ogr_gpkg.py
@@ -115,8 +115,6 @@ def test_ogr_gpkg_1():
 
     assert validate('tmp/gpkg_test.gpkg'), 'validation failed'
 
-    return 'success'
-
 ###############################################################################
 # Re-open database to test validity
 
@@ -148,8 +146,6 @@ def test_ogr_gpkg_2():
         pytest.fail()
     gdaltest.gpkg_ds.ReleaseResultSet(sql_lyr)
 
-    return 'success'
-
 
 ###############################################################################
 # Create a layer
@@ -174,8 +170,6 @@ def test_ogr_gpkg_3():
     gdal.PopErrorHandler()
     assert lyr is None, 'layer creation should have failed'
 
-    return 'success'
-
 ###############################################################################
 # Close and re-open to test the layer registration
 
@@ -229,8 +223,6 @@ def test_ogr_gpkg_4():
     assert sql_lyr.GetFeatureCount() == 0
     gdaltest.gpkg_ds.ReleaseResultSet(sql_lyr)
 
-    return 'success'
-
 
 ###############################################################################
 # Delete a layer
@@ -256,8 +248,6 @@ def test_ogr_gpkg_5():
 
     assert gdaltest.gpkg_ds.GetLayerCount() == 0, 'unexpected number of layers (not 0)'
 
-    return 'success'
-
 
 ###############################################################################
 # Add fields
@@ -298,8 +288,6 @@ def test_ogr_gpkg_6():
 
     assert field_defn_out.GetName() == 'dummy', 'wrong field name after reopen'
 
-    return 'success'
-
 
 ###############################################################################
 # Add a feature / read a feature / delete a feature
@@ -374,8 +362,7 @@ def test_ogr_gpkg_7():
     if gdaltest.gpkg_ds.DeleteLayer('field_test_layer') != 0:
         gdaltest.post_reason('got error code from DeleteLayer(field_test_layer)')
 
-    return 'success'
-
+    
 
 ###############################################################################
 # Test a variety of geometry feature types and attribute types
@@ -498,8 +485,6 @@ def test_ogr_gpkg_8():
     assert geom.ExportToWkt() == geom_read.ExportToWkt(), \
         '3d geom output not equal to geom input'
 
-    return 'success'
-
 ###############################################################################
 # Test support for extents and counts
 
@@ -516,8 +501,6 @@ def test_ogr_gpkg_9():
     fcount = lyr.GetFeatureCount()
     assert fcount == 11, 'got bad featurecount'
 
-    return 'success'
-
 ###############################################################################
 # Test non-SELECT SQL commands
 
@@ -540,8 +523,6 @@ def test_ogr_gpkg_11():
     lyr.SetAttributeFilter('fld_integer = 10')
     assert lyr.GetFeatureCount() == 1
 
-    return 'success'
-
 ###############################################################################
 # Test SELECT SQL commands
 
@@ -617,8 +598,6 @@ def test_ogr_gpkg_12():
     assert sql_lyr.GetLayerDefn().GetGeomFieldCount() == 0
     gdaltest.gpkg_ds.ReleaseResultSet(sql_lyr)
 
-    return 'success'
-
 ###############################################################################
 # Test non-spatial tables
 
@@ -667,8 +646,6 @@ def test_ogr_gpkg_13():
     assert sql_lyr.GetFeatureCount() == 1
     gdaltest.gpkg_ds.ReleaseResultSet(sql_lyr)
 
-    return 'success'
-
 ###############################################################################
 # Add various geometries to test spatial filtering
 
@@ -753,8 +730,6 @@ def test_ogr_gpkg_14():
     f = lyr.GetNextFeature()
     assert f is None
 
-    return 'success'
-
 ###############################################################################
 # Test SQL functions
 
@@ -1118,8 +1093,6 @@ def test_ogr_gpkg_15():
     gdaltest.gpkg_ds = None
     gdaltest.gpkg_ds = gdaltest.gpkg_dr.Open('tmp/gpkg_test.gpkg', update=1)
 
-    return 'success'
-
 ###############################################################################
 # Test unknown extensions
 
@@ -1225,8 +1198,6 @@ def test_ogr_gpkg_16():
 
     gdal.Unlink('/vsimem/ogr_gpk_16.gpkg')
 
-    return 'success'
-
 ###############################################################################
 # Run INDIRECT_SQLITE dialect
 
@@ -1244,7 +1215,6 @@ def test_ogr_gpkg_17():
     ds = None
 
     gdal.Unlink('/vsimem/ogr_gpkg_17.gpkg')
-    return 'success'
 
 ###############################################################################
 # Test geometry type extension
@@ -1341,8 +1311,6 @@ def test_ogr_gpkg_18():
 
     gdal.Unlink('/vsimem/ogr_gpkg_18.gpkg')
 
-    return 'success'
-
 ###############################################################################
 # Test metadata
 
@@ -1430,8 +1398,6 @@ def test_ogr_gpkg_19():
     gdal.Unlink('/vsimem/ogr_gpkg_19.gpkg')
     gdal.Unlink('/vsimem/ogr_gpkg_19.gpkg.aux.xml')
 
-    return 'success'
-
 ###############################################################################
 # Test spatial reference system
 
@@ -1528,8 +1494,6 @@ def test_ogr_gpkg_20():
 
     gdal.Unlink('/vsimem/ogr_gpkg_20.gpkg')
 
-    return 'success'
-
 ###############################################################################
 # Test maximum width of text fields
 
@@ -1605,8 +1569,7 @@ def test_ogr_gpkg_21():
     if f.GetField(0) != 'ab':
         gdal.Unlink('/vsimem/ogr_gpkg_21.gpkg')
 
-    return 'success'
-
+    
 ###############################################################################
 # Test FID64 support
 
@@ -1637,8 +1600,6 @@ def test_ogr_gpkg_22():
 
     gdal.Unlink('/vsimem/ogr_gpkg_22.gpkg')
 
-    return 'success'
-
 ###############################################################################
 # Test not nullable fields
 
@@ -1791,8 +1752,6 @@ def test_ogr_gpkg_23():
 
     gdal.Unlink('/vsimem/ogr_gpkg_23.gpkg')
 
-    return 'success'
-
 ###############################################################################
 # Test default values
 
@@ -1902,8 +1861,6 @@ def test_ogr_gpkg_24():
 
     gdal.Unlink('/vsimem/ogr_gpkg_24.gpkg')
 
-    return 'success'
-
 ###############################################################################
 # Test creating a field with the fid name
 
@@ -1983,8 +1940,6 @@ def test_ogr_gpkg_25():
 
     gdaltest.gpkg_dr.DeleteDataSource('/vsimem/ogr_gpkg_25.gpkg')
 
-    return 'success'
-
 ###############################################################################
 # Test dataset transactions
 
@@ -2104,8 +2059,6 @@ def test_ogr_gpkg_26():
 
     gdaltest.gpkg_dr.DeleteDataSource('/vsimem/ogr_gpkg_26.gpkg')
 
-    return 'success'
-
 ###############################################################################
 # Test interface with Spatialite
 
@@ -2139,8 +2092,6 @@ def test_ogr_gpkg_27():
     ds = None
     gdaltest.gpkg_dr.DeleteDataSource('/vsimem/ogr_gpkg_27.gpkg')
 
-    return 'success'
-
 ###############################################################################
 # Test ogr2ogr -a_srs (as the geopackage driver doesn't clone the passed SRS
 # but inc/dec its ref count, which can exhibit issues in GDALVectorTanslate())
@@ -2158,8 +2109,6 @@ def test_ogr_gpkg_28():
     ds = None
     gdaltest.gpkg_dr.DeleteDataSource('/vsimem/ogr_gpkg_28.gpkg')
 
-    return 'success'
-
 ###############################################################################
 # Test XYM / XYZM support
 
@@ -2226,8 +2175,6 @@ def test_ogr_gpkg_29():
 
     gdaltest.gpkg_dr.DeleteDataSource('/vsimem/ogr_gpkg_29.gpkg')
 
-    return 'success'
-
 ###############################################################################
 # Test non standard file extension (#6396)
 
@@ -2252,8 +2199,7 @@ def test_ogr_gpkg_30():
     with gdaltest.error_handler():
         gdaltest.gpkg_dr.DeleteDataSource('/vsimem/ogr_gpkg_30.geopkg')
 
-    return 'success'
-
+    
 ###############################################################################
 # Test CURVE and SURFACE types
 
@@ -2291,8 +2237,6 @@ def test_ogr_gpkg_31():
 
     gdaltest.gpkg_dr.DeleteDataSource('/vsimem/ogr_gpkg_31.gpkg')
 
-    return 'success'
-
 ###############################################################################
 # Run creating a non-spatial layer that isn't registered as 'aspatial' and
 # read it back
@@ -2324,8 +2268,6 @@ def test_ogr_gpkg_32():
 
     gdaltest.gpkg_dr.DeleteDataSource('/vsimem/ogr_gpkg_32.gpkg')
 
-    return 'success'
-
 ###############################################################################
 # Test OGR_CURRENT_DATE
 
@@ -2349,8 +2291,6 @@ def test_ogr_gpkg_33():
 
     gdaltest.gpkg_dr.DeleteDataSource('/vsimem/ogr_gpkg_33.gpkg')
 
-    return 'success'
-
 ###############################################################################
 # Run test_ogrsf
 
@@ -2380,8 +2320,6 @@ def test_ogr_gpkg_test_ogrsf():
 
     assert ret.find('INFO') != -1 and ret.find('ERROR') == -1
 
-    return 'success'
-
 
 ###############################################################################
 # Test rename and delete a layer registered in extensions, metadata, spatial index etc
@@ -2492,8 +2430,6 @@ def test_ogr_gpkg_34():
 
     gdaltest.gpkg_dr.DeleteDataSource(dbname)
 
-    return 'success'
-
 ###############################################################################
 # Test DeleteField()
 
@@ -2593,8 +2529,6 @@ def test_ogr_gpkg_35():
 
     gdaltest.gpkg_dr.DeleteDataSource(dbname)
 
-    return 'success'
-
 ###############################################################################
 # Test AlterFieldDefn()
 
@@ -2721,8 +2655,6 @@ def test_ogr_gpkg_36():
 
     gdaltest.gpkg_dr.DeleteDataSource(dbname)
 
-    return 'success'
-
 ###############################################################################
 # Test ReorderFields()
 
@@ -2793,8 +2725,6 @@ def test_ogr_gpkg_37():
 
     gdaltest.gpkg_dr.DeleteDataSource(dbname)
 
-    return 'success'
-
 ###############################################################################
 # Test GetExtent() and RECOMPUTE EXTENT ON
 
@@ -2872,8 +2802,6 @@ def test_ogr_gpkg_38(options=['SPATIAL_INDEX=YES']):
 
     gdaltest.gpkg_dr.DeleteDataSource(dbname)
 
-    return 'success'
-
 
 def test_ogr_gpkg_38_nospi():
     return test_ogr_gpkg_38(options=['SPATIAL_INDEX=NO'])
@@ -2916,8 +2844,6 @@ def test_ogr_gpkg_39():
 
     gdaltest.gpkg_dr.DeleteDataSource(dbname)
 
-    return 'success'
-
 ###############################################################################
 # Run creating a non-spatial layer that is registered as 'attributes' and
 # read it back
@@ -2949,8 +2875,6 @@ def test_ogr_gpkg_40():
 
     gdaltest.gpkg_dr.DeleteDataSource('/vsimem/ogr_gpkg_40.gpkg')
 
-    return 'success'
-
 ###############################################################################
 # Test tables without integer primary key (#6799), and unrecognized column type
 
@@ -2986,8 +2910,6 @@ def test_ogr_gpkg_41():
 
     gdaltest.gpkg_dr.DeleteDataSource('/vsimem/ogr_gpkg_41.gpkg')
 
-    return 'success'
-
 ###############################################################################
 # Test feature_count
 
@@ -3141,8 +3063,6 @@ def test_ogr_gpkg_42():
 
     gdaltest.gpkg_dr.DeleteDataSource('/vsimem/ogr_gpkg_42.gpkg')
 
-    return 'success'
-
 
 ###############################################################################
 # Test limitations on number of tables
@@ -3179,8 +3099,6 @@ def test_ogr_gpkg_43():
 
     gdaltest.gpkg_dr.DeleteDataSource('/vsimem/ogr_gpkg_43.gpkg')
 
-    return 'success'
-
 
 ###############################################################################
 # Test GeoPackage without metadata table
@@ -3220,8 +3138,6 @@ def test_ogr_gpkg_44():
 
     gdaltest.gpkg_dr.DeleteDataSource('/vsimem/ogr_gpkg_44.gpkg')
 
-    return 'success'
-
 
 ###############################################################################
 # Test non conformant GeoPackage: table with non INTEGER PRIMARY KEY
@@ -3243,8 +3159,6 @@ def test_ogr_gpkg_45():
 
     gdaltest.gpkg_dr.DeleteDataSource('/vsimem/ogr_gpkg_45.gpkg')
 
-    return 'success'
-
 ###############################################################################
 # Test spatial view and spatial index
 
@@ -3338,8 +3252,6 @@ def test_ogr_gpkg_46():
 
     gdaltest.gpkg_dr.DeleteDataSource('/vsimem/ogr_gpkg_46.gpkg')
 
-    return 'success'
-
 ###############################################################################
 # Test corner case of Identify()
 
@@ -3460,8 +3372,6 @@ def test_ogr_gpkg_47():
     gdal.Unlink('/vsimem/ogr_gpkg_47.zip')
     gdaltest.gpkg_dr.DeleteDataSource('/vsimem/ogr_gpkg_47.gpkg')
 
-    return 'success'
-
 ###############################################################################
 # Test insertion of features with unset fields
 
@@ -3517,8 +3427,6 @@ def test_ogr_gpkg_48():
 
     gdaltest.gpkg_dr.DeleteDataSource('/vsimem/ogr_gpkg_48.gpkg')
 
-    return 'success'
-
 ###############################################################################
 # Test CreateGeomField() on a attributes layer
 
@@ -3543,8 +3451,6 @@ def test_ogr_gpkg_49():
 
     gdaltest.gpkg_dr.DeleteDataSource('/vsimem/ogr_gpkg_49.gpkg')
 
-    return 'success'
-
 ###############################################################################
 # Test minimalistic support of definition_12_063
 
@@ -3587,8 +3493,6 @@ def test_ogr_gpkg_50():
 
     gdaltest.gpkg_dr.DeleteDataSource('/vsimem/ogr_gpkg_50.gpkg')
 
-    return 'success'
-
 ###############################################################################
 # Test opening a .gpkg.sql file
 
@@ -3606,8 +3510,6 @@ def test_ogr_gpkg_51():
     f = lyr.GetNextFeature()
     assert f is not None
 
-    return 'success'
-
 ###############################################################################
 # Test opening a .gpkg file
 
@@ -3623,8 +3525,6 @@ def test_ogr_gpkg_52():
         f = lyr.GetNextFeature()
     assert f is not None
 
-    return 'success'
-
 ###############################################################################
 # Test opening a .gpkg file with inconsistency regarding table case (#6916)
 
@@ -3649,8 +3549,7 @@ def test_ogr_gpkg_53():
 
         assert ret.find('INFO') != -1 and ret.find('ERROR') == -1
 
-    return 'success'
-
+    
 ###############################################################################
 # Test editing of a database with 2 layers (https://issues.qgis.org/issues/17034)
 
@@ -3716,8 +3615,6 @@ def test_ogr_gpkg_54():
 
     gdal.Unlink(tmpfile)
 
-    return 'success'
-
 ###############################################################################
 # Test inserting geometries incompatible with declared layer geometry type
 
@@ -3747,8 +3644,6 @@ def test_ogr_gpkg_55():
 
     gdal.Unlink(tmpfile)
 
-    return 'success'
-
 ###############################################################################
 # Test FID identification on SQL result layer
 
@@ -3769,8 +3664,6 @@ def test_ogr_gpkg_56():
     ds = None
     gdal.Unlink('/vsimem/ogr_gpkg_56.gpkg')
 
-    return 'success'
-
 ###############################################################################
 # Test opening a corrupted gpkg with duplicated layer names
 
@@ -3805,8 +3698,6 @@ def test_ogr_gpkg_57():
 
     gdal.Unlink(tmpfile)
 
-    return 'success'
-
 ###############################################################################
 # Test overwriting a layer
 
@@ -3830,8 +3721,6 @@ def test_ogr_gpkg_58():
 
     gdal.Unlink(out_filename)
 
-    return 'success'
-
 ###############################################################################
 # Test CreateSpatialIndex()
 
@@ -3854,8 +3743,6 @@ def test_ogr_gpkg_59():
 
     gdal.Unlink(out_filename)
 
-    return 'success'
-
 ###############################################################################
 # Test savepoints
 
@@ -3893,8 +3780,6 @@ def test_ogr_gpkg_savepoint():
 
     gdal.Unlink(filename)
 
-    return 'success'
-
 ###############################################################################
 # Test that we don't open file handles behind the back of sqlite3
 
@@ -3937,8 +3822,6 @@ def test_ogr_gpkg_wal():
     gdal.Unlink(filename + '-wal')
     gdal.Unlink(filename + '-shm')
 
-    return 'success'
-
 ###############################################################################
 # Test JSon subtype support
 
@@ -4006,8 +3889,6 @@ def test_ogr_gpkg_json():
 
     gdal.Unlink(filename)
 
-    return 'success'
-
 ###############################################################################
 # Remove the test db from the tmp directory
 
@@ -4029,8 +3910,7 @@ def test_ogr_gpkg_cleanup():
     except OSError:
         pass
 
-    return 'success'
-
+    
 ###############################################################################
 
 
diff --git a/autotest/ogr/ogr_gpsbabel.py b/autotest/ogr/ogr_gpsbabel.py
index e0dd86262fcb..0e86d41d0ead 100755
--- a/autotest/ogr/ogr_gpsbabel.py
+++ b/autotest/ogr/ogr_gpsbabel.py
@@ -62,8 +62,6 @@ def test_ogr_gpsbabel_init():
 
     ogrtest.have_gpsbabel = True
 
-    return 'success'
-
 ###############################################################################
 # Test reading with explicit subdriver
 
@@ -78,8 +76,6 @@ def test_ogr_gpsbabel_1():
 
     assert ds.GetLayerCount() == 2
 
-    return 'success'
-
 ###############################################################################
 # Test reading with implicit subdriver
 
@@ -94,8 +90,6 @@ def test_ogr_gpsbabel_2():
 
     assert ds.GetLayerCount() == 2
 
-    return 'success'
-
 ###############################################################################
 # Test writing
 
@@ -137,8 +131,6 @@ def test_ogr_gpsbabel_3():
        res.find('$GPGGA') == -1 or \
        res.find('$GPGSA') == -1)), 'did not get expected result'
 
-    return 'success'
-
 
 gdaltest_list = [
     test_ogr_gpsbabel_init,
diff --git a/autotest/ogr/ogr_gpx.py b/autotest/ogr/ogr_gpx.py
index bbe906d9c6c5..1f47ff7bfa06 100755
--- a/autotest/ogr/ogr_gpx.py
+++ b/autotest/ogr/ogr_gpx.py
@@ -53,8 +53,6 @@ def test_ogr_gpx_init():
 
     assert gdaltest.gpx_ds.GetLayerCount() == 5, 'wrong number of layers'
 
-    return 'success'
-
 ###############################################################################
 # Test waypoints gpx layer.
 
@@ -138,8 +136,6 @@ def test_ogr_gpx_1():
     assert (ogrtest.check_feature_geometry(feat, 'POINT (4 3)',
                                       max_error=0.0001) == 0)
 
-    return 'success'
-
 ###############################################################################
 # Test routes gpx layer.
 
@@ -159,8 +155,6 @@ def test_ogr_gpx_2():
     feat = lyr.GetNextFeature()
     assert ogrtest.check_feature_geometry(feat, 'LINESTRING EMPTY', max_error=0.0001) == 0
 
-    return 'success'
-
 
 ###############################################################################
 # Test route_points gpx layer.
@@ -182,8 +176,6 @@ def test_ogr_gpx_3():
     feat = lyr.GetNextFeature()
     assert ogrtest.check_feature_geometry(feat, 'POINT (6 5)', max_error=0.0001) == 0
 
-    return 'success'
-
 ###############################################################################
 # Test tracks gpx layer.
 
@@ -207,8 +199,6 @@ def test_ogr_gpx_4():
     f_geom = feat.GetGeometryRef()
     assert f_geom.ExportToWkt() == 'MULTILINESTRING EMPTY'
 
-    return 'success'
-
 ###############################################################################
 # Test route_points gpx layer.
 
@@ -230,8 +220,6 @@ def test_ogr_gpx_5():
     feat = lyr.GetNextFeature()
     assert ogrtest.check_feature_geometry(feat, 'POINT (15 14)', max_error=0.0001) == 0
 
-    return 'success'
-
 ###############################################################################
 # Copy our small gpx file to a new gpx file.
 
@@ -311,8 +299,6 @@ def test_ogr_gpx_6():
 
     gdaltest.gpx_ds = ogr.Open('tmp/gpx.gpx')
 
-    return 'success'
-
 ###############################################################################
 # Output extra fields as <extensions>.
 
@@ -380,8 +366,6 @@ def test_ogr_gpx_7():
     tr = ogrtest.check_features_against_list(gpx_lyr, 'ogr_Third_ID', expect)
     assert tr
 
-    return 'success'
-
 ###############################################################################
 # Output extra fields as <extensions>.
 
@@ -472,8 +456,6 @@ def test_ogr_gpx_8():
 
     assert f_content.find(f_ref_content) != -1, 'did not get expected result'
 
-    return 'success'
-
 ###############################################################################
 # Parse file with a <time> extension at track level (#6237)
 
@@ -489,8 +471,7 @@ def test_ogr_gpx_9():
         f.DumpReadable()
         pytest.fail('did not get expected result')
 
-    return 'success'
-
+    
 ###############################################################################
 #
 
@@ -502,8 +483,7 @@ def test_ogr_gpx_cleanup():
         os.remove('tmp/gpx.gpx')
     except OSError:
         pass
-    return 'success'
-
+    
 
 gdaltest_list = [
     test_ogr_gpx_init,
diff --git a/autotest/ogr/ogr_grass.py b/autotest/ogr/ogr_grass.py
index 47b873fa21c2..f9f2a84099d0 100755
--- a/autotest/ogr/ogr_grass.py
+++ b/autotest/ogr/ogr_grass.py
@@ -45,8 +45,7 @@ def test_ogr_grass_1():
     if gdaltest.ogr_grass_drv is None:
         pytest.skip()
 
-    return 'success'
-
+    
 ###############################################################################
 # Read 'point' datasource
 
@@ -69,8 +68,6 @@ def test_ogr_grass_2():
 
     ds = None
 
-    return 'success'
-
 
 gdaltest_list = [
     test_ogr_grass_1,
diff --git a/autotest/ogr/ogr_gtm.py b/autotest/ogr/ogr_gtm.py
index b0a6a588b260..e529877107e7 100755
--- a/autotest/ogr/ogr_gtm.py
+++ b/autotest/ogr/ogr_gtm.py
@@ -54,8 +54,6 @@ def test_ogr_gtm_init():
 
     assert gdaltest.gtm_ds.GetLayerCount() == 2, 'wrong number of layers'
 
-    return 'success'
-
 ###############################################################################
 # Test waypoints gtm layer.
 
@@ -113,8 +111,6 @@ def test_ogr_gtm_read_1():
     wkt = 'POINT (-47.806097491943362 -21.176849600708007)'
     assert not ogrtest.check_feature_geometry(feat, wkt), 'Unexpected geometry'
 
-    return 'success'
-
 ###############################################################################
 # Test tracks gtm layer.
 
@@ -190,8 +186,6 @@ def test_ogr_gtm_read_2():
 
     assert not ogrtest.check_feature_geometry(feat, wkt), 'Unexpected geometry'
 
-    return 'success'
-
 
 ###############################################################################
 # Write test
@@ -244,8 +238,6 @@ def test_ogr_gtm_write_1():
 
     ds = None
 
-    return 'success'
-
 ###############################################################################
 # Check previous test
 
@@ -338,8 +330,6 @@ def test_ogr_gtm_check_write_1():
     wkt = 'LINESTRING (-21.12 -47.1, -21.02 -47.0, -20.92 -46.9)'
     assert not ogrtest.check_feature_geometry(feat, wkt), 'Unexpected geometry'
 
-    return 'success'
-
 
 ###############################################################################
 #
@@ -348,7 +338,6 @@ def test_ogr_gtm_cleanup():
 
     gdaltest.gtm_ds = None
     os.remove('tmp/gtm.gtm')
-    return 'success'
 
 
 gdaltest_list = [
diff --git a/autotest/ogr/ogr_htf.py b/autotest/ogr/ogr_htf.py
index 9ca234887c40..525d36364718 100755
--- a/autotest/ogr/ogr_htf.py
+++ b/autotest/ogr/ogr_htf.py
@@ -81,8 +81,6 @@ def test_ogr_htf_1():
 
     assert feat.GetField('other3') == 'other3', 'did not get expected other3 val'
 
-    return 'success'
-
 ###############################################################################
 # Run test_ogrsf
 
@@ -101,8 +99,6 @@ def test_ogr_htf_2():
 
     assert ret.find('INFO') != -1 and ret.find('ERROR') == -1
 
-    return 'success'
-
 
 gdaltest_list = [
     test_ogr_htf_1,
diff --git a/autotest/ogr/ogr_idrisi.py b/autotest/ogr/ogr_idrisi.py
index 3edec94844b4..efc5d221f5b2 100755
--- a/autotest/ogr/ogr_idrisi.py
+++ b/autotest/ogr/ogr_idrisi.py
@@ -107,8 +107,6 @@ def test_ogr_idrisi_1():
 
     ds = None
 
-    return 'success'
-
 ###############################################################################
 # Test linestring layer
 
@@ -154,8 +152,6 @@ def test_ogr_idrisi_2():
 
     ds = None
 
-    return 'success'
-
 ###############################################################################
 # Test polygon layer
 
@@ -201,8 +197,6 @@ def test_ogr_idrisi_3():
 
     ds = None
 
-    return 'success'
-
 
 gdaltest_list = [
     test_ogr_idrisi_1,
diff --git a/autotest/ogr/ogr_ili.py b/autotest/ogr/ogr_ili.py
index 87839128df05..0606ebd7e5e8 100755
--- a/autotest/ogr/ogr_ili.py
+++ b/autotest/ogr/ogr_ili.py
@@ -57,8 +57,6 @@ def test_ogr_interlis1_1():
 
     gdaltest.have_ili_reader = 1
 
-    return 'success'
-
 ###############################################################################
 # Check that Ili1 point layer is properly read.
 
@@ -107,8 +105,6 @@ def test_ogr_interlis1_2():
     geom = feat.GetGeometryRef()
     assert geom.GetGeometryName() == 'POLYGON', 'Geometry of wrong type.'
 
-    return 'success'
-
 ###############################################################################
 # Ili1 FORMAT DEFAULT test.
 
@@ -142,8 +138,7 @@ def test_ogr_interlis1_3():
             print(feat.GetFieldAsString(i))
             pytest.fail('field value wrong.')
 
-    return 'success'
-
+    
 ###############################################################################
 # Ili1 FORMAT test.
 
@@ -177,8 +172,7 @@ def test_ogr_interlis1_4():
             print(feat.GetFieldAsString(i))
             pytest.fail('field value wrong.')
 
-    return 'success'
-
+    
 ###############################################################################
 # Write Ili1 transfer file without model.
 
@@ -224,8 +218,7 @@ def test_ogr_interlis1_5():
 ENDE"""
         assert expected in itf, "Interlis output doesn't match."
 
-    return 'success'
-
+    
 ###############################################################################
 # Write Ili1 transfer file.
 
@@ -267,8 +260,7 @@ def test_ogr_interlis1_6():
 ENDE"""
         assert expected in itf, "Interlis output doesn't match."
 
-    return 'success'
-
+    
 ###############################################################################
 # Ili1 character encoding test.
 
@@ -341,8 +333,6 @@ def test_ogr_interlis1_7():
         pass
     assert expected in itf, "Interlis output doesn't match."
 
-    return 'success'
-
 ###############################################################################
 # Ili1 VRT rename
 
@@ -378,8 +368,7 @@ def test_ogr_interlis1_9():
             print(feat.GetFieldAsString(i))
             pytest.fail('field value wrong.')
 
-    return 'success'
-
+    
 ###############################################################################
 # Ili1 Area with polygonizing
 
@@ -409,8 +398,7 @@ def test_ogr_interlis1_10():
             feat.DumpReadable()
             pytest.fail()
 
-    return 'success'
-
+    
 ###############################################################################
 # Ili1 multi-geom test (RFC41)
 
@@ -452,8 +440,7 @@ def test_ogr_interlis1_11():
         defn = lyr.GetLayerDefn().GetGeomFieldDefn(i)
         assert defn.GetName() == str(geom_columns[i]), ("Geom field: " + defn.GetName())
 
-    return 'success'
-
+    
 ###############################################################################
 # Ili1 multi-geom test (RFC41)
 
@@ -489,8 +476,7 @@ def test_ogr_interlis1_12():
         defn = lyr.GetLayerDefn().GetGeomFieldDefn(i)
         assert defn.GetName() == str(geom_columns[i]), ("Geom field: " + defn.GetName())
 
-    return 'success'
-
+    
 ###############################################################################
 # Ili1 Surface test.
 
@@ -718,8 +704,7 @@ def test_ogr_interlis1_13():
             feat.DumpReadable()
             pytest.fail()
 
-    return 'success'
-
+    
 ###############################################################################
 # Ili1 Surface test with linear conversion.
 
@@ -862,8 +847,6 @@ def test_ogr_interlis1_13_linear():
 
     gdal.SetConfigOption('OGR_STROKE_CURVE', None)
 
-    return 'success'
-
 ###############################################################################
 # Write Ili1 Arcs.
 
@@ -911,8 +894,7 @@ def test_ogr_interlis1_14():
 """
         assert expected in itf, "Interlis output doesn't match."
 
-    return 'success'
-
+    
 ###############################################################################
 # Reading Ili2 without model
 
@@ -936,8 +918,7 @@ def test_ogr_interlis2_1():
     for i in range(ds.GetLayerCount()):
         assert ds.GetLayer(i).GetName() in layers, 'Did not get right layers'
 
-    return 'success'
-
+    
 ###############################################################################
 # Reading Ili2
 
@@ -1022,8 +1003,7 @@ def test_ogr_interlis2_2():
             feat.DumpReadable()
             pytest.fail()
 
-    return 'success'
-
+    
 
 ###############################################################################
 # Write Ili2 transfer file.
@@ -1114,8 +1094,7 @@ def test_ogr_interlis2_3():
         expected = expected.replace('.11499999999999', '.115')
         xtf = xtf.replace('.11499999999999', '.115')
         assert expected in xtf, "Interlis output doesn't match."
-    return 'success'
-
+    
 ###############################################################################
 # Ili2 Oereb model
 
@@ -1194,8 +1173,7 @@ def test_ogr_interlis2_4():
             print(geom)
             pytest.fail('geom check failed.')
 
-    return 'success'
-
+    
 
 ###############################################################################
 # Check arc segmentation
@@ -1247,8 +1225,6 @@ def test_ogr_interlis_arc1():
     points = line.GetPoints()
     assert len(points) == 81, 'line point count wrong.'
 
-    return 'success'
-
 ###############################################################################
 # Check polyline with arc
 
@@ -1274,8 +1250,7 @@ def test_ogr_interlis_arc2():
             feat.DumpReadable()
             pytest.fail()
 
-    return 'success'
-
+    
 ###############################################################################
 #
 
@@ -1289,8 +1264,6 @@ def test_ogr_interlis_cleanup():
 
     gdaltest.clean_tmp()
 
-    return 'success'
-
 
 gdaltest_list = [
     test_ogr_interlis1_1,
diff --git a/autotest/ogr/ogr_index_test.py b/autotest/ogr/ogr_index_test.py
index c6f52e337326..10878c280dc9 100755
--- a/autotest/ogr/ogr_index_test.py
+++ b/autotest/ogr/ogr_index_test.py
@@ -79,8 +79,6 @@ def test_ogr_index_1():
     gdaltest.p_ds = ogr.OpenShared('index_p.mif', update=0)
     gdaltest.p_lyr = gdaltest.p_ds.GetLayerByName('index_p')
 
-    return 'success'
-
 ###############################################################################
 # Create a dbf file to be our secondary table.  Close it, and reopen shared.
 
@@ -108,8 +106,6 @@ def test_ogr_index_2():
     gdaltest.s_ds = ogr.OpenShared('join_t.dbf', update=1)
     gdaltest.s_lyr = gdaltest.s_ds.GetLayerByName('join_t')
 
-    return 'success'
-
 ###############################################################################
 # Verify a simple join without indexing.
 
@@ -127,7 +123,7 @@ def test_ogr_index_3():
 
     gdaltest.p_ds.ReleaseResultSet(sql_lyr)
 
-    return 'success' if tr else 'fail'
+    assert tr
 
 ###############################################################################
 # Create an INDEX on the SKEY and VALUE field in the join table.
@@ -138,8 +134,6 @@ def test_ogr_index_4():
     gdaltest.s_ds.ExecuteSQL('CREATE INDEX ON join_t USING value')
     gdaltest.s_ds.ExecuteSQL('CREATE INDEX ON join_t USING skey')
 
-    return 'success'
-
 ###############################################################################
 # Check that indexable single int lookup works.
 
@@ -151,7 +145,7 @@ def test_ogr_index_5():
     expect = ['Value 5']
 
     tr = ogrtest.check_features_against_list(gdaltest.s_lyr, 'VALUE', expect)
-    return 'success' if tr else 'fail'
+    assert tr
 
 ###############################################################################
 # Check that indexable single string lookup works.
@@ -171,7 +165,7 @@ def test_ogr_index_6():
     expect = [5]
 
     tr = ogrtest.check_features_against_list(gdaltest.s_lyr, 'SKEY', expect)
-    return 'success' if tr else 'fail'
+    assert tr
 
 
 ###############################################################################
@@ -186,7 +180,7 @@ def test_ogr_index_7():
 
     tr = ogrtest.check_features_against_list(gdaltest.s_lyr, 'SKEY', expect)
 
-    return 'success' if tr else 'fail'
+    assert tr
 
 ###############################################################################
 # Try join again.
@@ -205,7 +199,7 @@ def test_ogr_index_8():
 
     gdaltest.p_ds.ReleaseResultSet(sql_lyr)
 
-    return 'success' if tr else 'fail'
+    assert tr
 
 ###############################################################################
 # Verify that dropping both indexes gets rid of them, and that results still
@@ -265,8 +259,6 @@ def test_ogr_index_9():
     assert xml.find('VALUE') != -1, 'VALUE column is not indexed (2)'
     assert xml.find('SKEY') != -1, 'SKEY column is not indexed (2)'
 
-    return 'success'
-
 ###############################################################################
 # Test fix for #4326
 
@@ -374,8 +366,6 @@ def test_ogr_index_10():
 
     ds = None
 
-    return 'success'
-
 ###############################################################################
 # Test support for OR and AND expression
 
@@ -388,8 +378,7 @@ def ogr_index_11_check(lyr, expected_fids):
         assert feat is not None
         assert feat.GetFID() == expected_fid
 
-    return 'success'
-
+    
 
 def test_ogr_index_11():
 
@@ -424,8 +413,6 @@ def test_ogr_index_11():
 
     ds = None
 
-    return 'success'
-
 ###############################################################################
 
 
@@ -456,8 +443,6 @@ def test_ogr_index_cleanup():
     ogr.GetDriverByName('ESRI Shapefile').DeleteDataSource(
         'tmp/ogr_index_11.dbf')
 
-    return 'success'
-
 
 gdaltest_list = [
     test_ogr_index_1,
diff --git a/autotest/ogr/ogr_ingres.py b/autotest/ogr/ogr_ingres.py
index 6ba7b95b9673..df3f6707a830 100755
--- a/autotest/ogr/ogr_ingres.py
+++ b/autotest/ogr/ogr_ingres.py
@@ -52,8 +52,7 @@ def test_ogr_ingres_1():
     if gdaltest.ingres_ds is None:
         pytest.skip()
 
-    return 'success'
-
+    
 ###############################################################################
 # Create table from data/poly.shp
 
@@ -97,8 +96,7 @@ def test_ogr_ingres_2():
 
         feat = shp_lyr.GetNextFeature()
 
-    return 'success'
-
+    
 ###############################################################################
 # Verify that stuff we just wrote is still OK.
 
@@ -132,7 +130,7 @@ def test_ogr_ingres_3():
     # automating this in the driver.
     read_feat = gdaltest.ingres_lyr.GetNextFeature()
 
-    return 'success' if tr else 'fail'
+    assert tr
 
 ###############################################################################
 # Test ExecuteSQL() results layers without geometry.
@@ -151,7 +149,7 @@ def test_ogr_ingres_4():
 
     gdaltest.ingres_ds.ReleaseResultSet(sql_lyr)
 
-    return 'success' if tr else 'fail'
+    assert tr
 
 ###############################################################################
 # Test ExecuteSQL() results layers with geometry.
@@ -183,7 +181,7 @@ def test_ogr_ingres_5():
 
     gdaltest.ingres_ds.ReleaseResultSet(sql_lyr)
 
-    return 'success' if tr else 'fail'
+    assert tr
 
 ###############################################################################
 # Test spatial filtering.
@@ -206,7 +204,7 @@ def test_ogr_ingres_6():
 
     gdaltest.ingres_lyr.SetSpatialFilter(None)
 
-    return 'success' if tr else 'fail'
+    assert tr
 
 ###############################################################################
 # Test adding a new field.
@@ -249,7 +247,7 @@ def test_ogr_ingres_7():
 
     gdaltest.ingres_lyr.SetAttributeFilter(None)
 
-    return 'success' if tr else 'fail'
+    assert tr
 
 ###############################################################################
 # Test deleting a feature.
@@ -282,8 +280,6 @@ def test_ogr_ingres_8():
 
     assert gdaltest.ingres_lyr.GetFeature(target_fid) is None, 'Got deleted feature!'
 
-    return 'success'
-
 ###############################################################################
 #
 
@@ -296,8 +292,6 @@ def test_ogr_ingres_cleanup():
     gdaltest.ingres_ds.Destroy()
     gdaltest.ingres_ds = None
 
-    return 'success'
-
 
 gdaltest_list = [
     test_ogr_ingres_1,
diff --git a/autotest/ogr/ogr_jml.py b/autotest/ogr/ogr_jml.py
index 8a83b210f13a..86141bc9c111 100755
--- a/autotest/ogr/ogr_jml.py
+++ b/autotest/ogr/ogr_jml.py
@@ -49,8 +49,7 @@ def test_ogr_jml_init():
         gdaltest.jml_read_support = 1
         ds = None
 
-    return 'success'
-
+    
 ###############################################################################
 # Test reading
 
@@ -111,8 +110,7 @@ def test_ogr_jml_1():
         feat.DumpReadable()
         pytest.fail()
 
-    return 'success'
-
+    
 ###############################################################################
 # Test creating a file
 
@@ -394,8 +392,6 @@ def test_ogr_jml_2():
 
     gdal.Unlink('/vsimem/ogr_jml.jml')
 
-    return 'success'
-
 ###############################################################################
 # Run test_ogrsf
 
@@ -413,8 +409,6 @@ def test_ogr_jml_3():
 
     assert ret.find('INFO') != -1 and ret.find('ERROR') == -1
 
-    return 'success'
-
 ###############################################################################
 # Test a few error cases
 
@@ -594,8 +588,6 @@ def test_ogr_jml_4():
     lyr.GetNextFeature()
     ds = None
 
-    return 'success'
-
 ###############################################################################
 # Test reading SRS
 
@@ -611,8 +603,6 @@ def test_ogr_jml_read_srs():
     f = lyr.GetNextFeature()
     assert f.GetGeometryRef() is not None
 
-    return 'success'
-
 ###############################################################################
 #
 
@@ -621,8 +611,6 @@ def test_ogr_jml_cleanup():
 
     gdal.Unlink('/vsimem/ogr_jml.jml')
 
-    return 'success'
-
 
 gdaltest_list = [
     test_ogr_jml_init,
diff --git a/autotest/ogr/ogr_join_test.py b/autotest/ogr/ogr_join_test.py
index a412abce1a73..4b89b163625a 100755
--- a/autotest/ogr/ogr_join_test.py
+++ b/autotest/ogr/ogr_join_test.py
@@ -52,8 +52,6 @@ def test_ogr_join_1():
 
     gdaltest.ds.ReleaseResultSet(sql_lyr)
 
-    return 'success'
-
 ###############################################################################
 # Check the values we are actually getting back (restricting the search a bit)
 
@@ -71,7 +69,7 @@ def test_ogr_join_2():
 
     gdaltest.ds.ReleaseResultSet(sql_lyr)
 
-    return 'success' if tr else 'fail'
+    assert tr
 
 ###############################################################################
 # Try various naming conversions for the selected fields.
@@ -90,7 +88,7 @@ def test_ogr_join_3():
 
     gdaltest.ds.ReleaseResultSet(sql_lyr)
 
-    return 'success' if tr else 'fail'
+    assert tr
 
 ###############################################################################
 # Verify that records for which a join can't be found work ok.
@@ -109,7 +107,7 @@ def test_ogr_join_4():
 
     gdaltest.ds.ReleaseResultSet(sql_lyr)
 
-    return 'success' if tr else 'fail'
+    assert tr
 
 ###############################################################################
 # Verify that table aliases work
@@ -128,7 +126,7 @@ def test_ogr_join_5():
 
     gdaltest.ds.ReleaseResultSet(sql_lyr)
 
-    return 'success' if tr else 'fail'
+    assert tr
 
 ###############################################################################
 # Again, ordering by a primary field.
@@ -147,7 +145,7 @@ def test_ogr_join_6():
 
     gdaltest.ds.ReleaseResultSet(sql_lyr)
 
-    return 'success' if tr else 'fail'
+    assert tr
 
 ###############################################################################
 # Test joining to an external datasource.
@@ -166,7 +164,7 @@ def test_ogr_join_7():
 
     gdaltest.ds.ReleaseResultSet(sql_lyr)
 
-    return 'success' if tr else 'fail'
+    assert tr
 
 ###############################################################################
 # Test doing two joins at once.
@@ -186,7 +184,7 @@ def test_ogr_join_8():
 
     gdaltest.ds.ReleaseResultSet(sql_lyr)
 
-    return 'success' if tr else 'fail'
+    assert tr
 
 ###############################################################################
 # Verify fix for #2788 (memory corruption on wildcard expansion in SQL request
@@ -206,7 +204,7 @@ def test_ogr_join_9():
 
     gdaltest.ds.ReleaseResultSet(sql_lyr)
 
-    return 'success' if tr else 'fail'
+    assert tr
 
 ###############################################################################
 
@@ -223,7 +221,7 @@ def test_ogr_join_10():
 
     gdaltest.ds.ReleaseResultSet(sql_lyr)
 
-    return 'success' if tr else 'fail'
+    assert tr
 
 ###############################################################################
 # Test join on string field
@@ -240,7 +238,7 @@ def test_ogr_join_11():
 
     gdaltest.ds.ReleaseResultSet(sql_lyr)
 
-    return 'success' if tr else 'fail'
+    assert tr
 
 ###############################################################################
 # Test fix for #4112 (join between 2 datasources)
@@ -258,8 +256,6 @@ def test_ogr_join_12():
 
     ds.ReleaseResultSet(sql_lyr)
 
-    return 'success'
-
 ###############################################################################
 # Test joining a float column with a string column (#4321)
 
@@ -276,7 +272,7 @@ def test_ogr_join_13():
 
     gdaltest.ds.ReleaseResultSet(sql_lyr)
 
-    return 'success' if tr else 'fail'
+    assert tr
 
 ###############################################################################
 # Test joining a string column with a float column (#4321, actually addressed by #4259)
@@ -294,7 +290,7 @@ def test_ogr_join_14():
 
     gdaltest.ds.ReleaseResultSet(sql_lyr)
 
-    return 'success' if tr else 'fail'
+    assert tr
 
 ###############################################################################
 # Test multiple joins with expressions (#4521)
@@ -332,8 +328,6 @@ def test_ogr_join_15():
 
     assert val2 == 'c2'
 
-    return 'success'
-
 ###############################################################################
 # Test non-support of a secondarytable.fieldname in a where clause
 
@@ -351,7 +345,7 @@ def test_ogr_join_16():
     assert gdal.GetLastErrorMsg().find('Cannot use field') == 0
 
     if sql_lyr is None:
-        return 'success'
+        return
     pytest.fail()
 
 ###############################################################################
@@ -371,7 +365,7 @@ def test_ogr_join_17():
     assert gdal.GetLastErrorMsg().find('Cannot use field') == 0
 
     if sql_lyr is None:
-        return 'success'
+        return
     pytest.fail()
 
 ###############################################################################
@@ -389,8 +383,6 @@ def test_ogr_join_18():
 
     gdaltest.ds.ReleaseResultSet(sql_lyr)
 
-    return 'success'
-
 ###############################################################################
 # Test unrecognized primary field
 
@@ -406,7 +398,7 @@ def test_ogr_join_19():
     assert gdal.GetLastErrorMsg().find('"poly"."foo" not recognised as an available field') == 0
 
     if sql_lyr is None:
-        return 'success'
+        return
     pytest.fail()
 
 ###############################################################################
@@ -424,7 +416,7 @@ def test_ogr_join_20():
     assert gdal.GetLastErrorMsg().find('"idlink"."foo" not recognised as an available field') == 0
 
     if sql_lyr is None:
-        return 'success'
+        return
     pytest.fail()
 
 ###############################################################################
@@ -444,7 +436,7 @@ def test_ogr_join_21():
     assert gdal.GetLastErrorMsg().find('Field il2.eas_id in JOIN clause does not correspond to the primary table nor the joint (secondary) table') == 0
 
     if sql_lyr is None:
-        return 'success'
+        return
     pytest.fail()
 
 ###############################################################################
@@ -473,8 +465,6 @@ def test_ogr_join_22():
 
     assert val == '2'
 
-    return 'success'
-
 ###############################################################################
 # Test join with NULL keys
 
@@ -505,8 +495,6 @@ def test_ogr_join_23():
 
     ds = None
 
-    return 'success'
-
 ###############################################################################
 
 
@@ -514,8 +502,6 @@ def test_ogr_join_cleanup():
     gdaltest.lyr = None
     gdaltest.ds = None
 
-    return 'success'
-
 
 gdaltest_list = [
     test_ogr_join_1,
diff --git a/autotest/ogr/ogr_kml.py b/autotest/ogr/ogr_kml.py
index f974833a2ac1..7f055d2a38f0 100755
--- a/autotest/ogr/ogr_kml.py
+++ b/autotest/ogr/ogr_kml.py
@@ -73,8 +73,6 @@ def test_ogr_kml_datastore():
 
     assert ogrtest.kml_ds.GetLayerCount() == 6, 'wrong number of layers'
 
-    return 'success'
-
 ###############################################################################
 # Test reading attributes for first layer (point).
 #
@@ -114,8 +112,7 @@ def test_ogr_kml_attributes_1():
         print('got: ', feat.GetField('description'))
         pytest.fail('Wrong description field value')
 
-    return 'success'
-
+    
 ###############################################################################
 # Test reading attributes for another layer (point).
 #
@@ -138,8 +135,6 @@ def test_ogr_kml_attributes_2():
     feat = lyr.GetNextFeature()
     assert feat is None, 'unexpected feature found.'
 
-    return 'success'
-
 ###############################################################################
 # Test reading attributes for another layer (linestring).
 #
@@ -171,8 +166,6 @@ def test_ogr_kml_attributes_3():
     feat = lyr.GetNextFeature()
     assert feat is not None, 'expected feature not found.'
 
-    return 'success'
-
 ###############################################################################
 # Test reading attributes for another layer (polygon).
 #
@@ -200,8 +193,7 @@ def test_ogr_kml_attributes_4():
         i = i + 1
         feat = lyr.GetNextFeature()
 
-    return 'success'
-
+    
 ###############################################################################
 # Test reading of KML point geometry
 #
@@ -236,8 +228,6 @@ def test_ogr_kml_point_read():
 
     assert not ogrtest.check_feature_geometry(feat, wkt)
 
-    return 'success'
-
 ###############################################################################
 # Test reading of KML linestring geometry
 #
@@ -269,8 +259,6 @@ def test_ogr_kml_linestring_read():
     wkt = 'LINESTRING (-112.265654928602004 36.094476726025462 2357,-112.266038452823807 36.093426088386707 2357,-112.266813901345301 36.092510587768807 2357,-112.267782683444494 36.091898273579957 2357,-112.268855751095202 36.091313794118697 2357,-112.269481071721899 36.090367720752099 2357,-112.269526855561097 36.089321714872852 2357,-112.269014456727604 36.088509160604723 2357,-112.268152881533894 36.087538135979557 2357,-112.2670588176031 36.086826852625677 2357,-112.265737458732104 36.086463123013033 2357)'
     assert not ogrtest.check_feature_geometry(feat, wkt)
 
-    return 'success'
-
 ###############################################################################
 # Test reading of KML polygon geometry
 #
@@ -308,8 +296,6 @@ def test_ogr_kml_polygon_read():
     wkt = 'POLYGON ((-122.084437112828397 37.421772530030907 19,-122.084511885574599 37.421911115428962 19,-122.0850470999805 37.421787551215353 19,-122.085071991339106 37.421436630231611 19,-122.084916406231997 37.421372378221157 19,-122.084219386816699 37.421372378016258 19,-122.084219386589993 37.421476171614962 19,-122.083808641999099 37.4214613409357 19,-122.083789972856394 37.421313064107963 19,-122.083279653469802 37.421293288405927 19,-122.083260981920702 37.421392139442979 19,-122.082937362173695 37.421372363998763 19,-122.082906242566693 37.421515697788713 19,-122.082850226966499 37.421762825764652 19,-122.082943578863507 37.421767769696352 19,-122.083217411188002 37.421792485526858 19,-122.0835970430103 37.421748007445601 19,-122.083945555677104 37.421693642376027 19,-122.084007789463698 37.421762838158529 19,-122.084113587521003 37.421748011043917 19,-122.084076247378405 37.421713412923751 19,-122.084144704773905 37.421678815345693 19,-122.084144704222993 37.421817206601972 19,-122.084250333307395 37.421817070044597 19,-122.084437112828397 37.421772530030907 19))'
     assert not ogrtest.check_feature_geometry(feat, wkt)
 
-    return 'success'
-
 ###############################################################################
 # Write test
 
@@ -368,8 +354,6 @@ def test_ogr_kml_write_1():
 
     ds = None
 
-    return 'success'
-
 
 ###############################################################################
 # Check previous test
@@ -419,8 +403,6 @@ def test_ogr_kml_check_write_1():
     assert feat.GetGeometryRef().ExportToWkt() == 'GEOMETRYCOLLECTION (POINT (2 49 1),LINESTRING (0 1 0,2 3 0))', \
         'Unexpected geometry.'
 
-    return 'success'
-
 
 ###############################################################################
 # Test reading attributes with XML content in them
@@ -439,8 +421,7 @@ def test_ogr_kml_xml_attributes():
         print('got: ', feat.GetField('description'))
         pytest.fail('Wrong description field value')
 
-    return 'success'
-
+    
 ###############################################################################
 # Test reading all geometry types (#3558)
 
@@ -457,8 +438,7 @@ def test_ogr_kml_read_geometries():
     while feat is not None:
         feat = lyr.GetNextFeature()
 
-    return 'success'
-
+    
 ###############################################################################
 # Run test_ogrsf
 
@@ -476,8 +456,6 @@ def test_ogr_kml_test_ogrsf():
 
     assert not (ret.find("using driver `KML'") == -1 or ret.find('INFO') == -1 or ret.find('ERROR') != -1)
 
-    return 'success'
-
 ###############################################################################
 # Test fix for #2772
 
@@ -497,8 +475,6 @@ def test_ogr_kml_interleaved_writing():
     # CreateFeature() should fail
     assert ret != 0
 
-    return 'success'
-
 ###############################################################################
 # Test reading KML with only Placemark
 
@@ -513,8 +489,6 @@ def test_ogr_kml_read_placemark():
     feat = lyr.GetNextFeature()
     assert feat is not None
 
-    return 'success'
-
 ###############################################################################
 # Test reading KML without any layer
 
@@ -527,8 +501,6 @@ def test_ogr_kml_read_empty():
     ds = ogr.Open('data/empty.kml')
     assert ds.GetLayerCount() == 0
 
-    return 'success'
-
 ###############################################################################
 # Test reading KML with empty layers
 
@@ -545,8 +517,6 @@ def test_ogr_kml_read_emptylayers():
 
     assert ds.GetLayer(1).GetFeatureCount() == 0
 
-    return 'success'
-
 ###############################################################################
 
 
@@ -558,8 +528,7 @@ def compare_output(content, expected_content):
     for i, content_line in enumerate(content_lines):
         assert content_line.strip() == expected_lines[i].strip(), content
 
-    return 'success'
-
+    
 ###############################################################################
 # Test that we can write a schema
 
@@ -690,8 +659,7 @@ def test_ogr_kml_cleanup():
         print('Re-register LIBKML driver')
         ogrtest.libkml_drv.Register()
 
-    return 'success'
-
+    
 ###############################################################################
 # Test reading KML with folder with empty subfolder and placemark
 
@@ -706,8 +674,6 @@ def test_ogr_kml_read_folder_with_subfolder_placemark():
 
     assert ds.GetLayer(0).GetFeatureCount() == 0
 
-    return 'success'
-
 ###############################################################################
 # Test reading invalid KML (#6878)
 
@@ -721,8 +687,6 @@ def test_ogr_kml_read_truncated():
         ds = ogr.Open('data/truncated.kml')
     assert ds is None
 
-    return 'success'
-
 ###############################################################################
 # Test fix for https://bugs.chromium.org/p/oss-fuzz/issues/detail?id=1591
 
@@ -737,8 +701,6 @@ def test_ogr_kml_read_weird_empty_folders():
 
     assert ds.GetLayer(0).GetFeatureCount() == 0
 
-    return 'success'
-
 ###############################################################################
 # Test fix for https://bugs.chromium.org/p/oss-fuzz/issues/detail?id=1683
 
@@ -752,8 +714,6 @@ def test_ogr_kml_read_junk_content_after_valid_doc():
         ds = ogr.Open('data/junk_content_after_valid_doc.kml')
     assert ds is None
 
-    return 'success'
-
 ###############################################################################
 # Test reading KML with kml: prefix
 
@@ -768,8 +728,6 @@ def test_ogr_kml_read_placemark_with_kml_prefix():
     feat = lyr.GetNextFeature()
     assert feat is not None
 
-    return 'success'
-
 ###############################################################################
 # Test reading KML with duplicated folder name
 
@@ -785,8 +743,6 @@ def test_ogr_kml_read_duplicate_folder_name():
     lyr = ds.GetLayer(1)
     assert lyr.GetName() == 'layer (#2)'
 
-    return 'success'
-
 ###############################################################################
 # Test reading KML with a placemark in root document, and a subfolder (#7221)
 
@@ -805,8 +761,6 @@ def test_ogr_kml_read_placemark_in_root_and_subfolder():
     assert lyr is not None
     assert lyr.GetFeatureCount() == 1
 
-    return 'success'
-
 ###############################################################################
 # Build tests runner
 
diff --git a/autotest/ogr/ogr_layer_algebra.py b/autotest/ogr/ogr_layer_algebra.py
index 9b14446b4d6b..40dc09888516 100755
--- a/autotest/ogr/ogr_layer_algebra.py
+++ b/autotest/ogr/ogr_layer_algebra.py
@@ -157,8 +157,6 @@ def test_algebra_setup():
 
     empty = ds.CreateLayer('empty')
 
-    return 'success'
-
 
 def test_algebra_intersection():
     if not ogrtest.have_geos():
@@ -242,8 +240,6 @@ def test_algebra_intersection():
 
     assert is_same(D1, C), 'D1 != C'
 
-    return 'success'
-
 
 def test_algebra_KEEP_LOWER_DIMENSION_GEOMETRIES():
     if not ogrtest.have_geos():
@@ -307,8 +303,6 @@ def test_algebra_KEEP_LOWER_DIMENSION_GEOMETRIES():
     assert layer3.GetFeatureCount() == 4, \
         'Lower dimension geometries not kept in identity'
 
-    return 'success'
-
 
 def test_algebra_union():
     if not ogrtest.have_geos():
@@ -359,8 +353,7 @@ def test_algebra_union():
         assert C.GetFeatureCount() == 2, \
             ('Layer.Union returned ' + str(C.GetFeatureCount()) + ' features')
 
-    return 'success'
-
+    
 
 def test_algebra_symdifference():
     if not ogrtest.have_geos():
@@ -400,8 +393,6 @@ def test_algebra_symdifference():
     assert C.GetFeatureCount() == 0, \
         ('Layer.SymDifference returned ' + str(C.GetFeatureCount()) + ' features')
 
-    return 'success'
-
 
 def test_algebra_identify():
     if not ogrtest.have_geos():
@@ -440,8 +431,7 @@ def test_algebra_identify():
 
         assert is_same(D1, C), 'D1 != C'
 
-    return 'success'
-
+    
 
 def test_algebra_update():
     if not ogrtest.have_geos():
@@ -480,8 +470,7 @@ def test_algebra_update():
 
         assert is_same(D1, C), 'D1 != C'
 
-    return 'success'
-
+    
 
 def test_algebra_clip():
     if not ogrtest.have_geos():
@@ -520,8 +509,7 @@ def test_algebra_clip():
 
         assert is_same(D1, C), 'D1 != C'
 
-    return 'success'
-
+    
 
 def test_algebra_erase():
     if not ogrtest.have_geos():
@@ -587,8 +575,6 @@ def test_algebra_erase():
 
     recreate_layer_C()
 
-    return 'success'
-
 
 def test_algebra_cleanup():
     if not ogrtest.have_geos():
@@ -605,8 +591,6 @@ def test_algebra_cleanup():
     empty = None
     ds = None
 
-    return 'success'
-
 
 gdaltest_list = [
     test_algebra_setup,
diff --git a/autotest/ogr/ogr_libkml.py b/autotest/ogr/ogr_libkml.py
index c60c52bc6e87..d791a33650f3 100755
--- a/autotest/ogr/ogr_libkml.py
+++ b/autotest/ogr/ogr_libkml.py
@@ -71,8 +71,6 @@ def test_ogr_libkml_datastore():
 
     assert ogrtest.kml_ds.GetLayerCount() == 10, 'wrong number of layers'
 
-    return 'success'
-
 ###############################################################################
 # Test reading attributes for first layer (point).
 #
@@ -112,8 +110,7 @@ def test_ogr_libkml_attributes_1():
         print('got: ', feat.GetField('description'))
         pytest.fail('Wrong description field value')
 
-    return 'success'
-
+    
 ###############################################################################
 # Test reading attributes for another layer (point).
 #
@@ -138,8 +135,6 @@ def test_ogr_libkml_attributes_2():
     feat = lyr.GetNextFeature()
     assert feat is None, 'unexpected feature found.'
 
-    return 'success'
-
 ###############################################################################
 # Test reading attributes for another layer (linestring).
 #
@@ -171,8 +166,6 @@ def test_ogr_libkml_attributes_3():
     feat = lyr.GetNextFeature()
     assert feat is not None, 'expected feature not found.'
 
-    return 'success'
-
 ###############################################################################
 # Test reading attributes for another layer (polygon).
 #
@@ -200,8 +193,7 @@ def test_ogr_libkml_attributes_4():
         i = i + 1
         feat = lyr.GetNextFeature()
 
-    return 'success'
-
+    
 ###############################################################################
 # Test reading of KML point geometry
 #
@@ -236,8 +228,6 @@ def test_ogr_libkml_point_read():
 
     assert not ogrtest.check_feature_geometry(feat, wkt)
 
-    return 'success'
-
 ###############################################################################
 # Test reading of KML linestring geometry
 #
@@ -269,8 +259,6 @@ def test_ogr_libkml_linestring_read():
     wkt = 'LINESTRING (-112.265654928602004 36.094476726025462 2357,-112.266038452823807 36.093426088386707 2357,-112.266813901345301 36.092510587768807 2357,-112.267782683444494 36.091898273579957 2357,-112.268855751095202 36.091313794118697 2357,-112.269481071721899 36.090367720752099 2357,-112.269526855561097 36.089321714872852 2357,-112.269014456727604 36.088509160604723 2357,-112.268152881533894 36.087538135979557 2357,-112.2670588176031 36.086826852625677 2357,-112.265737458732104 36.086463123013033 2357)'
     assert not ogrtest.check_feature_geometry(feat, wkt)
 
-    return 'success'
-
 ###############################################################################
 # Test reading of KML polygon geometry
 #
@@ -308,8 +296,6 @@ def test_ogr_libkml_polygon_read():
     wkt = 'POLYGON ((-122.084437112828397 37.421772530030907 19,-122.084511885574599 37.421911115428962 19,-122.0850470999805 37.421787551215353 19,-122.085071991339106 37.421436630231611 19,-122.084916406231997 37.421372378221157 19,-122.084219386816699 37.421372378016258 19,-122.084219386589993 37.421476171614962 19,-122.083808641999099 37.4214613409357 19,-122.083789972856394 37.421313064107963 19,-122.083279653469802 37.421293288405927 19,-122.083260981920702 37.421392139442979 19,-122.082937362173695 37.421372363998763 19,-122.082906242566693 37.421515697788713 19,-122.082850226966499 37.421762825764652 19,-122.082943578863507 37.421767769696352 19,-122.083217411188002 37.421792485526858 19,-122.0835970430103 37.421748007445601 19,-122.083945555677104 37.421693642376027 19,-122.084007789463698 37.421762838158529 19,-122.084113587521003 37.421748011043917 19,-122.084076247378405 37.421713412923751 19,-122.084144704773905 37.421678815345693 19,-122.084144704222993 37.421817206601972 19,-122.084250333307395 37.421817070044597 19,-122.084437112828397 37.421772530030907 19))'
     assert not ogrtest.check_feature_geometry(feat, wkt)
 
-    return 'success'
-
 ###############################################################################
 # Write test
 
@@ -378,8 +364,6 @@ def ogr_libkml_write(filename):
 
     ds = None
 
-    return 'success'
-
 ###############################################################################
 # Check previous test
 
@@ -433,8 +417,6 @@ def ogr_libkml_check_write(filename):
 
     ds = None
 
-    return 'success'
-
 ###############################################################################
 
 
@@ -501,8 +483,6 @@ def test_ogr_libkml_xml_attributes():
 
     ds = None
 
-    return 'success'
-
 ###############################################################################
 # Test reading all geometry types (#3558)
 #
@@ -522,8 +502,6 @@ def test_ogr_libkml_read_geometries():
 
     ds = None
 
-    return 'success'
-
 ###############################################################################
 # Run test_ogrsf
 
@@ -541,8 +519,6 @@ def test_ogr_libkml_test_ogrsf():
 
     assert not (ret.find("using driver `LIBKML'") == -1 or ret.find('INFO') == -1 or ret.find('ERROR') != -1)
 
-    return 'success'
-
 ###############################################################################
 # Test reading KML with only Placemark
 
@@ -559,8 +535,6 @@ def test_ogr_libkml_read_placemark():
 
     ds = None
 
-    return 'success'
-
 ###############################################################################
 # Test reading KML without any layer
 
@@ -575,8 +549,6 @@ def test_ogr_libkml_read_empty():
 
     ds = None
 
-    return 'success'
-
 ###############################################################################
 # Test reading KML with empty layers
 
@@ -596,8 +568,6 @@ def test_ogr_libkml_read_emptylayers():
 
     ds = None
 
-    return 'success'
-
 ###############################################################################
 # Test reading KML with empty layers
 
@@ -619,8 +589,6 @@ def test_ogr_libkml_read_emptylayers_without_folder():
 
     ds = None
 
-    return 'success'
-
 ###############################################################################
 # Test reading KML with empty layers without_folder
 
@@ -653,8 +621,6 @@ def test_ogr_libkml_read_schema():
 
     ds = None
 
-    return 'success'
-
 ###############################################################################
 # Test reading KML with <Data> elements of <ExtendedData> in case
 # <ExtendedData> doesn't use a <SchemaData> (test changeset r22127)
@@ -685,8 +651,6 @@ def test_ogr_libkml_extended_data_without_schema_data():
 
     ds = None
 
-    return 'success'
-
 ###############################################################################
 # Test reading KML with <gx:Track> element (#5095)
 
@@ -707,8 +671,6 @@ def test_ogr_libkml_gxtrack():
         pytest.fail()
     ds = None
 
-    return 'success'
-
 ###############################################################################
 # Test reading KML with <gx:MultiTrack> element
 
@@ -729,8 +691,6 @@ def test_ogr_libkml_gxmultitrack():
         pytest.fail()
     ds = None
 
-    return 'success'
-
 ###############################################################################
 # Test generating and reading KML with <Camera> element
 
@@ -796,8 +756,6 @@ def test_ogr_libkml_camera():
         pytest.fail()
     ds = None
 
-    return 'success'
-
 ###############################################################################
 # Test generating a LookAt element at Document level
 
@@ -834,8 +792,6 @@ def test_ogr_libkml_write_layer_lookat():
        data.find('<range>150</range>') == -1 or \
        data.find('<altitudeMode>relativeToGround</altitudeMode>') == -1))
 
-    return 'success'
-
 
 ###############################################################################
 # Test generating a Camera element at Document level
@@ -865,8 +821,6 @@ def test_ogr_libkml_write_layer_camera():
        data.find('<roll>10</roll>') == -1 or \
        data.find('<altitudeMode>relativeToGround</altitudeMode>') == -1))
 
-    return 'success'
-
 ###############################################################################
 # Test writing MultiGeometry
 
@@ -901,8 +855,7 @@ def test_ogr_libkml_write_multigeometry():
         feat.DumpReadable()
         pytest.fail()
 
-    return 'success'
-
+    
 ###############################################################################
 # Test writing <snippet>
 
@@ -938,8 +891,7 @@ def test_ogr_libkml_write_snippet():
         feat.DumpReadable()
         pytest.fail()
 
-    return 'success'
-
+    
 ###############################################################################
 # Test writing <atom:author>
 
@@ -966,8 +918,6 @@ def test_ogr_libkml_write_atom_author():
        data.find('<atom:email>foo@bar.com</atom:email>') == -1)), \
         'failure to find an atom string'
 
-    return 'success'
-
 ###############################################################################
 # Test writing <atom:link>
 
@@ -991,8 +941,6 @@ def test_ogr_libkml_write_atom_link():
     assert (not (data.find('<kml xmlns="http://www.opengis.net/kml/2.2" xmlns:atom="http://www.w3.org/2005/Atom">') == -1 or \
        data.find('<atom:link href="http://foo" rel="related"/>') == -1))
 
-    return 'success'
-
 ###############################################################################
 # Test writing <phoneNumber>
 
@@ -1015,8 +963,6 @@ def test_ogr_libkml_write_phonenumber():
 
     assert data.find('<phoneNumber>tel:911</phoneNumber>') != -1
 
-    return 'success'
-
 ###############################################################################
 # Test writing Region
 
@@ -1058,8 +1004,6 @@ def test_ogr_libkml_write_region():
        data.find('<minFadeExtent>1</minFadeExtent>') == -1 or \
        data.find('<maxFadeExtent>2</maxFadeExtent>') == -1))
 
-    return 'success'
-
 ###############################################################################
 # Test writing ScreenOverlay
 
@@ -1102,8 +1046,6 @@ def test_ogr_libkml_write_screenoverlay():
        data.find('<name>name</name>') == -1 or \
        data.find('<description>description</description>') == -1))
 
-    return 'success'
-
 ###############################################################################
 # Test writing Model
 
@@ -1172,8 +1114,7 @@ def test_ogr_libkml_write_model():
         assert gdaltest.gdalurlopen('http://makc.googlecode.com/svn/trunk/flash/sandy_flar2/cube.dae') is None, \
             data
 
-    return 'success'
-
+    
 ###############################################################################
 # Test read / write of style
 
@@ -1410,8 +1351,7 @@ def test_ogr_libkml_read_write_style():
         print(data)
         pytest.fail(styles)
 
-    return 'success'
-
+    
 ###############################################################################
 # Test writing Update
 
@@ -1466,8 +1406,7 @@ def test_ogr_libkml_write_update():
                 data.find('<Delete>') == -1 or \
                 data.find('<Placemark targetId="layer_to_edit.3"/>') == -1))
 
-    return 'success'
-
+    
 ###############################################################################
 # Test writing NetworkLinkControl
 
@@ -1519,8 +1458,7 @@ def test_ogr_libkml_write_networklinkcontrol():
                 data.find('<linkSnippet>linksnippet</linkSnippet>') == -1 or \
                 data.find('<expires>2014-12-31T23:59:59Z</expires>') == -1))
 
-    return 'success'
-
+    
 ###############################################################################
 # Test writing ListStyle
 
@@ -1557,8 +1495,6 @@ def test_ogr_libkml_write_liststyle():
        data.find('<listItemType>checkOffOnly</listItemType>') == -1 or \
        data.find('<listItemType>checkHideChildren</listItemType>') == -1))
 
-    return 'success'
-
 ###############################################################################
 # Test writing NetworkLink
 
@@ -1625,8 +1561,6 @@ def test_ogr_libkml_write_networklink():
        data.find('<viewBoundScale>0.5</viewBoundScale>') == -1 or \
        data.find('<viewFormat>BBOX=[bboxWest],[bboxSouth],[bboxEast],[bboxNorth]</viewFormat>') == -1))
 
-    return 'success'
-
 ###############################################################################
 # Test writing PhotoOverlay
 
@@ -1711,8 +1645,6 @@ def test_ogr_libkml_write_photooverlay():
        data.find('<maxHeight>512</maxHeight>') == -1 or \
        data.find('<gridOrigin>upperLeft</gridOrigin>') == -1))
 
-    return 'success'
-
 ###############################################################################
 # Test writing and reading Data element
 
@@ -1746,8 +1678,6 @@ def test_ogr_libkml_read_write_data():
     feat = lyr.GetNextFeature()
     assert feat.GetField('foo') == 'bar'
 
-    return 'success'
-
 ###############################################################################
 # Test writing layer as Folder
 
@@ -1773,8 +1703,6 @@ def test_ogr_libkml_write_folder():
        data.find('<styleUrl>#test_liststyle</styleUrl>') == -1 or \
        data.find('<Folder id="test2">') == -1))
 
-    return 'success'
-
 ###############################################################################
 # Test writing datasource and layer container propreties
 
@@ -1805,8 +1733,6 @@ def test_ogr_libkml_write_container_properties():
        data.find('<snippet>lyr_snippet</snippet>') == -1 or \
        data.find('<description>lyr_description</description>') == -1))
 
-    return 'success'
-
 ###############################################################################
 # Test reading gx:TimeStamp and gx:TimeSpan
 
@@ -1827,8 +1753,7 @@ def test_ogr_libkml_read_gx_timestamp():
         f.DumpReadable()
         pytest.fail()
 
-    return 'success'
-
+    
 ###############################################################################
 # Test reading KML with kml: prefix
 
@@ -1843,8 +1768,6 @@ def test_ogr_libkml_read_placemark_with_kml_prefix():
     feat = lyr.GetNextFeature()
     assert feat is not None
 
-    return 'success'
-
 ###############################################################################
 # Test reading KML with duplicated folder name
 
@@ -1860,8 +1783,6 @@ def test_ogr_libkml_read_duplicate_folder_name():
     lyr = ds.GetLayer(1)
     assert lyr.GetName() == 'layer (#2)'
 
-    return 'success'
-
 ###############################################################################
 # Test reading KML with a placemark in root document, and a subfolder (#7221)
 
@@ -1880,8 +1801,6 @@ def test_ogr_libkml_read_placemark_in_root_and_subfolder():
     assert lyr is not None
     assert lyr.GetFeatureCount() == 1
 
-    return 'success'
-
 ###############################################################################
 # Test reading KML with coordinate tuples separated by tabulations (#7231)
 
@@ -1899,8 +1818,6 @@ def test_ogr_libkml_read_tab_separated_coord_triplet():
 
     assert not ogrtest.check_feature_geometry(feat, wkt)
 
-    return 'success'
-
 ###############################################################################
 # Test reading KML with coordinate with space only content (#7232)
 
@@ -1918,8 +1835,6 @@ def test_ogr_libkml_read_kml_with_space_content_in_coordinates():
 
     assert not ogrtest.check_feature_geometry(feat, wkt)
 
-    return 'success'
-
 ###############################################################################
 # Test reading a layer referring several schema (github #826)
 
@@ -1953,8 +1868,7 @@ def test_ogr_libkml_read_several_schema():
         feat.DumpReadable()
         pytest.fail()
 
-    return 'success'
-
+    
 ###############################################################################
 
 
@@ -1978,7 +1892,6 @@ def test_ogr_libkml_update_existing_kml():
     assert fc_after == fc_before + 1
 
     gdal.Unlink(filename)
-    return 'success'
 
 ###############################################################################
 #  Cleanup
@@ -2027,8 +1940,7 @@ def test_ogr_libkml_cleanup():
         print('Re-register KML driver')
         ogrtest.kml_drv.Register()
 
-    return 'success'
-
+    
 ###############################################################################
 # Build tests runner
 
diff --git a/autotest/ogr/ogr_mem.py b/autotest/ogr/ogr_mem.py
index 19460238f0fa..cd77d217858a 100755
--- a/autotest/ogr/ogr_mem.py
+++ b/autotest/ogr/ogr_mem.py
@@ -49,8 +49,6 @@ def test_ogr_mem_1():
 
     assert gdaltest.mem_ds is not None
 
-    return 'success'
-
 ###############################################################################
 # Create table from data/poly.shp
 
@@ -97,8 +95,7 @@ def test_ogr_mem_2():
 
         feat = shp_lyr.GetNextFeature()
 
-    return 'success'
-
+    
 ###############################################################################
 # Verify that stuff we just wrote is still OK.
 
@@ -128,7 +125,7 @@ def test_ogr_mem_3():
     gdaltest.poly_feat = None
     gdaltest.shp_ds = None
 
-    return 'success' if tr else 'fail'
+    assert tr
 
 ###############################################################################
 # Write more features with a bunch of different geometries, and verify the
@@ -163,8 +160,7 @@ def test_ogr_mem_4():
 
         assert ogrtest.check_feature_geometry(feat_read, geom) == 0
 
-    return 'success'
-
+    
 ###############################################################################
 # Test ExecuteSQL() results layers without geometry.
 
@@ -182,7 +178,7 @@ def test_ogr_mem_5():
 
     gdaltest.mem_ds.ReleaseResultSet(sql_lyr)
 
-    return 'success' if tr else 'fail'
+    assert tr
 
 ###############################################################################
 # Test ExecuteSQL() results layers with geometry.
@@ -205,7 +201,7 @@ def test_ogr_mem_6():
 
     gdaltest.mem_ds.ReleaseResultSet(sql_lyr)
 
-    return 'success' if tr else 'fail'
+    assert tr
 
 ###############################################################################
 # Test spatial filtering.
@@ -231,7 +227,7 @@ def test_ogr_mem_7():
 
     gdaltest.mem_lyr.SetSpatialFilter(None)
 
-    return 'success' if tr else 'fail'
+    assert tr
 
 ###############################################################################
 # Test adding a new field.
@@ -271,7 +267,7 @@ def test_ogr_mem_8():
 
     gdaltest.mem_lyr.SetAttributeFilter(None)
 
-    return 'success' if tr else 'fail'
+    assert tr
 
 ###############################################################################
 # Test deleting a feature.
@@ -314,8 +310,6 @@ def test_ogr_mem_9():
 
     assert gdaltest.mem_lyr.GetFeature(1000) is None, 'GetFeature() should have failed'
 
-    return 'success'
-
 ###############################################################################
 # Test GetDriver() / name bug (#1674)
 #
@@ -331,8 +325,6 @@ def test_ogr_mem_10():
     assert d2 is not None and d2.GetName() == 'Memory', \
         'Did not get expected driver name.'
 
-    return 'success'
-
 ###############################################################################
 # Verify that we can delete layers properly
 
@@ -364,8 +356,6 @@ def test_ogr_mem_11():
 
     assert lyr.GetName() == 'extra2', 'delete layer seems iffy'
 
-    return 'success'
-
 ###############################################################################
 # Test some date handling
 
@@ -390,8 +380,7 @@ def test_ogr_mem_12():
     result = f.GetFieldAsDateTime(idx)
     for i, value in enumerate(result):
         assert value == expected[i], ('%s != %s' % (result, expected))
-    return 'success'
-
+    
 ###############################################################################
 # Test Get/Set on StringList, IntegerList, RealList
 
@@ -425,8 +414,6 @@ def test_ogr_mem_13():
     feat.SetFieldDoubleList(2, [4., 5.])
     assert feat.GetFieldAsDoubleList(2) == [4., 5.]
 
-    return 'success'
-
 ###############################################################################
 # Test SetNextByIndex
 
@@ -469,8 +456,6 @@ def test_ogr_mem_14():
     feat = lyr.GetNextFeature()
     assert feat.GetFieldAsString(0) == 'third feature', 'did not get expected feature'
 
-    return 'success'
-
 ###############################################################################
 # Test non-linear geometries
 
@@ -507,8 +492,6 @@ def test_ogr_mem_15():
     assert g.GetGeometryType() == ogr.wkbLineString
     ogr.SetNonLinearGeometriesEnabledFlag(old_val)
 
-    return 'success'
-
 ###############################################################################
 # Test map implementation
 
@@ -583,8 +566,6 @@ def test_ogr_mem_16():
     # Create a field so as to test OGRMemLayerIteratorMap
     lyr.CreateField(ogr.FieldDefn('foo'))
 
-    return 'success'
-
 ###############################################################################
 # Test Dataset.GetNextFeature() implementation
 
@@ -657,8 +638,6 @@ def test_ogr_mem_17():
     f = ds.GetNextFeature(include_layer=False)
     assert f is not None
 
-    return 'success'
-
 
 def test_ogr_mem_cleanup():
 
@@ -668,8 +647,6 @@ def test_ogr_mem_cleanup():
     ogr.SetNonLinearGeometriesEnabledFlag(True)
     gdaltest.mem_ds = None
 
-    return 'success'
-
 
 gdaltest_list = [
     test_ogr_mem_1,
diff --git a/autotest/ogr/ogr_mitab.py b/autotest/ogr/ogr_mitab.py
index be8924353a03..9bc2574e5244 100755
--- a/autotest/ogr/ogr_mitab.py
+++ b/autotest/ogr/ogr_mitab.py
@@ -52,7 +52,7 @@ def test_ogr_mitab_1():
     gdaltest.mapinfo_ds = gdaltest.mapinfo_drv.CreateDataSource('tmp')
 
     if gdaltest.mapinfo_ds is not None:
-        return 'success'
+        return
     pytest.fail()
 
 ###############################################################################
@@ -106,8 +106,6 @@ def test_ogr_mitab_2():
 
     gdaltest.mapinfo_ds = None
 
-    return 'success'
-
 ###############################################################################
 # Verify that stuff we just wrote is still OK.
 #
@@ -145,7 +143,7 @@ def test_ogr_mitab_3():
     gdaltest.poly_feat = None
     gdaltest.shp_ds = None
 
-    return 'success' if tr else 'fail'
+    assert tr
 
 ###############################################################################
 # Test ExecuteSQL() results layers with geometry.
@@ -168,7 +166,7 @@ def test_ogr_mitab_4():
 
     gdaltest.mapinfo_ds.ReleaseResultSet(sql_lyr)
 
-    return 'success' if tr else 'fail'
+    assert tr
 
 ###############################################################################
 # Test spatial filtering.
@@ -189,7 +187,7 @@ def test_ogr_mitab_5():
 
     gdaltest.mapinfo_lyr.SetSpatialFilter(None)
 
-    return 'success' if tr else 'fail'
+    assert tr
 
 ###############################################################################
 # Verify that Non-WGS84 datums are populated correctly
@@ -206,8 +204,6 @@ def test_ogr_mitab_6():
     assert datum_name == "New_Zealand_GD49", \
         ("Datum name does not match (expected 'New_Zealand_GD49', got '%s')" % datum_name)
 
-    return 'success'
-
 ###############################################################################
 # Create MIF file.
 
@@ -220,7 +216,7 @@ def test_ogr_mitab_7():
     gdaltest.mapinfo_ds = gdaltest.mapinfo_drv.CreateDataSource('tmp/wrk.mif')
 
     if gdaltest.mapinfo_ds is not None:
-        return 'success'
+        return
     pytest.fail()
 
 ###############################################################################
@@ -269,8 +265,6 @@ def test_ogr_mitab_8():
 
     gdaltest.mapinfo_ds = None
 
-    return 'success'
-
 ###############################################################################
 # Verify that stuff we just wrote is still OK.
 
@@ -303,7 +297,7 @@ def test_ogr_mitab_9():
     gdaltest.poly_feat = None
     gdaltest.shp_ds = None
 
-    return 'success' if tr else 'fail'
+    assert tr
 
 ###############################################################################
 # Read mif file with 2 character .mid delimiter and verify operation.
@@ -333,8 +327,6 @@ def test_ogr_mitab_10():
     lyr = None
     ds = None
 
-    return 'success'
-
 ###############################################################################
 # Verify support for NTF datum with non-greenwich datum per
 #    http://trac.osgeo.org/gdal/ticket/1416
@@ -356,8 +348,6 @@ def test_ogr_mitab_11():
     assert pm_value[:6] == '2.3372', \
         ('got unexpected prime meridian, not paris: ' + pm_value)
 
-    return 'success'
-
 ###############################################################################
 # Verify that a newly created mif layer returns a non null layer definition
 
@@ -376,7 +366,6 @@ def test_ogr_mitab_12():
     ogrtest.quick_create_layer_def(lyr, [('AREA', ogr.OFTReal)])
 
     ds = None
-    return 'success'
 
 ###############################################################################
 # Verify that field widths and precisions are propagated correctly in TAB.
@@ -423,8 +412,6 @@ def test_ogr_mitab_13():
 
     ogr.GetDriverByName('MapInfo File').DeleteDataSource('tmp/testlyrdef.tab')
 
-    return 'success'
-
 ###############################################################################
 # Verify that field widths and precisions are propagated correctly in MIF.
 
@@ -473,8 +460,6 @@ def test_ogr_mitab_14():
 
     ogr.GetDriverByName('MapInfo File').DeleteDataSource('tmp/testlyrdef.mif')
 
-    return 'success'
-
 ###############################################################################
 # Test .mif without .mid (#5141)
 
@@ -509,8 +494,6 @@ def test_ogr_mitab_15():
         pytest.fail()
     gdal.Unlink('/vsimem/nomid.mif')
 
-    return 'success'
-
 ###############################################################################
 # Test empty .mif
 
@@ -529,8 +512,6 @@ def test_ogr_mitab_16():
     assert ds is not None
     ds = None
 
-    return 'success'
-
 ###############################################################################
 # Run test_ogrsf
 
@@ -552,8 +533,6 @@ def test_ogr_mitab_17():
     ret = gdaltest.runexternal(test_cli_utilities.get_test_ogrsf_path() + ' tmp/wrk.mif')
     assert ret.find('INFO') != -1 and ret.find('ERROR') == -1
 
-    return 'success'
-
 ###############################################################################
 # Test EPSG:2154
 # (https://github.com/mapgears/mitab/issues/1)
@@ -586,8 +565,6 @@ def test_ogr_mitab_18():
 
     ogr.GetDriverByName('MapInfo File').DeleteDataSource('/vsimem/ogr_mitab_18.tab')
 
-    return 'success'
-
 ###############################################################################
 # Check that we correctly round coordinate to the appropriate precision
 # (https://github.com/mapgears/mitab/issues/2)
@@ -606,8 +583,7 @@ def test_ogr_mitab_19():
         feat.DumpReadable()
         pytest.fail()
 
-    return 'success'
-
+    
 
 ###############################################################################
 # Check that we take into account the user defined bound file
@@ -746,8 +722,6 @@ def test_ogr_mitab_20():
     gdal.SetConfigOption('MITAB_BOUNDS_FILE', None)
     os.unlink('tmp/mitab_bounds.txt')
 
-    return 'success'
-
 ###############################################################################
 # Create .tab without explicit field
 
@@ -776,8 +750,6 @@ def test_ogr_mitab_21():
 
     ogr.GetDriverByName('MapInfo File').DeleteDataSource('/vsimem/ogr_mitab_21.tab')
 
-    return 'success'
-
 ###############################################################################
 # Test append in update mode
 
@@ -827,8 +799,6 @@ def test_ogr_mitab_22():
 
     ogr.GetDriverByName('MapInfo File').DeleteDataSource(filename)
 
-    return 'success'
-
 ###############################################################################
 # Test creating features then reading
 
@@ -857,8 +827,7 @@ def test_ogr_mitab_23():
 
         ogr.GetDriverByName('MapInfo File').DeleteDataSource(filename)
 
-    return 'success'
-
+    
 ###############################################################################
 # Test creating features then reading then creating again then reading
 
@@ -901,8 +870,7 @@ def test_ogr_mitab_24():
 
         ogr.GetDriverByName('MapInfo File').DeleteDataSource(filename)
 
-    return 'success'
-
+    
 ###############################################################################
 # Test that opening in update mode without doing any change does not alter
 # file
@@ -966,8 +934,7 @@ def test_ogr_mitab_25():
 
         ogr.GetDriverByName('MapInfo File').DeleteDataSource(filename)
 
-    return 'success'
-
+    
 ###############################################################################
 # Test DeleteFeature()
 
@@ -1036,8 +1003,7 @@ def test_ogr_mitab_26():
 
             ogr.GetDriverByName('MapInfo File').DeleteDataSource(filename)
 
-    return 'success'
-
+    
 ###############################################################################
 # Test SetFeature()
 
@@ -1172,8 +1138,6 @@ def test_ogr_mitab_27():
 
     ogr.GetDriverByName('MapInfo File').DeleteDataSource(filename)
 
-    return 'success'
-
 ###############################################################################
 
 
@@ -1255,8 +1219,6 @@ def test_ogr_mitab_28():
 
     ogr.GetDriverByName('MapInfo File').DeleteDataSource(filename)
 
-    return 'success'
-
 
 ###############################################################################
 # Test updating a file with compressed geometries.
@@ -1310,8 +1272,6 @@ def test_ogr_mitab_29():
 
     ogr.GetDriverByName('MapInfo File').DeleteDataSource('tmp/compr_symb_deleted_records.tab')
 
-    return 'success'
-
 ###############################################################################
 # Test SyncToDisk() in create mode
 
@@ -1396,8 +1356,6 @@ def test_ogr_mitab_30(update=0):
     ds = None
     ogr.GetDriverByName('MapInfo File').DeleteDataSource(filename)
 
-    return 'success'
-
 ###############################################################################
 # Test SyncToDisk() in update mode
 
@@ -1423,8 +1381,6 @@ def test_ogr_mitab_32():
         assert f.GetField('a') == 4, update
     ds = None
 
-    return 'success'
-
 ###############################################################################
 # Test opening and modifying a file created with MapInfo that consists of
 # a single object block, without index block
@@ -1487,8 +1443,6 @@ def test_ogr_mitab_33():
 
     ogr.GetDriverByName('MapInfo File').DeleteDataSource('tmp/single_point_mapinfo.tab')
 
-    return 'success'
-
 ###############################################################################
 # Test updating a line that spans over several coordinate blocks
 
@@ -1533,8 +1487,6 @@ def test_ogr_mitab_34():
 
     ogr.GetDriverByName('MapInfo File').DeleteDataSource(filename)
 
-    return 'success'
-
 ###############################################################################
 # Test SRS support
 
@@ -1736,8 +1688,6 @@ def test_ogr_mitab_35():
     wkt = srs.ExportToWkt()
     assert wkt == 'GEOGCS["unnamed",DATUM["MIF 9999,1,1,2,3,4,5,6,7,3",SPHEROID["WGS 72",6378135,298.26],TOWGS84[1,2,3,-4,-5,-6,7]],PRIMEM["non-Greenwich",3],UNIT["degree",0.0174532925199433]]'
 
-    return 'success'
-
 ###############################################################################
 # Test opening and modifying a file with polygons created with MapInfo that consists of
 # a single object block, without index block
@@ -1778,8 +1728,6 @@ def test_ogr_mitab_36():
 
     ogr.GetDriverByName('MapInfo File').DeleteDataSource('tmp/polygon_without_index.tab')
 
-    return 'success'
-
 ###############################################################################
 # Simple testing of Seamless tables
 
@@ -1814,8 +1762,6 @@ def test_ogr_mitab_37():
     f = lyr.GetFeature(4294967297 * 2 + 1)
     assert f is None
 
-    return 'success'
-
 ###############################################################################
 # Open MIF with MID with TAB delimiter and empty first field (#5405)
 
@@ -1829,8 +1775,7 @@ def test_ogr_mitab_38():
         f.DumpReadable()
         pytest.fail()
 
-    return 'success'
-
+    
 ###############################################################################
 # Read various geometry types from .mif
 
@@ -1854,8 +1799,7 @@ def test_ogr_mitab_39():
             f_ref.DumpReadable()
             pytest.fail()
 
-    return 'success'
-
+    
 ###############################################################################
 # Read various geometry types from .mif but potentially truncated
 
@@ -1875,8 +1819,6 @@ def test_ogr_mitab_40():
 
     gdal.Unlink('/vsimem/ogr_mitab_40.mif')
 
-    return 'success'
-
 ###############################################################################
 # Read various geometry types from .tab
 
@@ -1900,8 +1842,7 @@ def test_ogr_mitab_41():
             f_ref.DumpReadable()
             pytest.fail()
 
-    return 'success'
-
+    
 ###############################################################################
 # Read various geometry types from .tab with block size = 32256
 
@@ -1925,8 +1866,7 @@ def test_ogr_mitab_42():
             f_ref.DumpReadable()
             pytest.fail()
 
-    return 'success'
-
+    
 ###############################################################################
 # Test creating tab with block size = 32256
 
@@ -1969,8 +1909,6 @@ def test_ogr_mitab_43():
     gdaltest.mapinfo_drv.DeleteDataSource('/vsimem/all_geoms_block_32256.tab')
     gdal.Unlink('/vsimem/all_geoms_block_32768.dat')
 
-    return 'success'
-
 ###############################################################################
 # Test limitation on width and precision of numeric fields in creation (#6392)
 
@@ -1993,8 +1931,6 @@ def test_ogr_mitab_44():
 
     gdaltest.mapinfo_drv.DeleteDataSource('/vsimem/ogr_mitab_44.mif')
 
-    return 'success'
-
 ###############################################################################
 # Test read/write MapInfo layers with encoding specified
 
@@ -2081,8 +2017,7 @@ def test_ogr_mitab_45():
 
         gdaltest.mapinfo_drv.DeleteDataSource(dsName)
 
-    return 'success'
-
+    
 ###############################################################################
 # Test read MapInfo layers with encoding specified
 
@@ -2131,8 +2066,7 @@ def test_ogr_mitab_46():
                                          ' expected value: "' + expectedValue + '"\n'
                                          ' from dataset :' + dsName)
 
-    return 'success'
-
+    
 ###############################################################################
 # Test opening a dataset with a .ind file
 
@@ -2155,8 +2089,7 @@ def test_ogr_mitab_47():
     for ext in ('tab', 'dat', 'map', 'id'):
         gdal.Unlink('/vsimem/poly_indexed.' + ext)
 
-    return 'success'
-
+    
 ###############################################################################
 # Test writing and reading LCC_1SP
 
@@ -2215,8 +2148,6 @@ def test_ogr_mitab_48():
 
     assert sr_got.IsSame(sr_expected) != 0
 
-    return 'success'
-
 ###############################################################################
 # Test reading an aspatial TAB file.
 
@@ -2233,8 +2164,6 @@ def test_ogr_mitab_49_aspatial():
 
     assert lyr.GetExtent(can_return_null=True) is None
 
-    return 'success'
-
 ###############################################################################
 # Test creating an indexed field
 
@@ -2272,8 +2201,6 @@ def test_ogr_mitab_tab_field_index_creation():
 
     ogr.GetDriverByName('MapInfo File').DeleteDataSource(filename)
 
-    return 'success'
-
 ###############################################################################
 # Test reading a tab_view file
 
@@ -2298,8 +2225,6 @@ def test_ogr_mitab_tab_view():
         pytest.fail('bad feature')
     ds = None
 
-    return 'success'
-
 
 ###############################################################################
 
@@ -2342,8 +2267,6 @@ def test_ogr_mitab_style():
 
     ogr.GetDriverByName('MapInfo File').DeleteDataSource(tmpfile)
 
-    return 'success'
-
 ###############################################################################
 
 
@@ -2368,8 +2291,6 @@ def test_ogr_mitab_tab_write_field_name_with_dot():
 
     ogr.GetDriverByName('MapInfo File').DeleteDataSource(tmpfile)
 
-    return 'success'
-
 ###############################################################################
 #
 
@@ -2386,8 +2307,6 @@ def test_ogr_mitab_cleanup():
     gdaltest.mapinfo_ds = None
     gdaltest.mapinfo_drv.DeleteDataSource('tmp')
 
-    return 'success'
-
 
 gdaltest_list = [
     test_ogr_mitab_1,
diff --git a/autotest/ogr/ogr_mongodb.py b/autotest/ogr/ogr_mongodb.py
index 50f798eb40c1..6bd118037cee 100755
--- a/autotest/ogr/ogr_mongodb.py
+++ b/autotest/ogr/ogr_mongodb.py
@@ -94,8 +94,7 @@ def test_ogr_mongodb_init():
         ogrtest.mongodb_drv = None
         pytest.skip('cannot open %s' % ogrtest.mongodb_test_uri)
 
-    return 'success'
-
+    
 ###############################################################################
 # Test various open methods
 
@@ -244,8 +243,7 @@ def test_ogr_mongodb_1():
         ds = gdal.OpenEx('mongodb:', open_options=open_options)
         assert ds is not None
 
-    return 'success'
-
+    
 ###############################################################################
 # Basic tests
 
@@ -769,8 +767,6 @@ def test_ogr_mongodb_2():
     gdal.PopErrorHandler()
     assert ret != 0
 
-    return 'success'
-
 ###############################################################################
 # test_ogrsf
 
@@ -786,8 +782,6 @@ def test_ogr_mongodb_3():
     ret = gdaltest.runexternal(test_cli_utilities.get_test_ogrsf_path() + ' -ro ' + ogrtest.mongodb_test_uri)
     assert ret.find('INFO') != -1 and ret.find('ERROR') == -1
 
-    return 'success'
-
 ###############################################################################
 # Cleanup
 
@@ -814,8 +808,6 @@ def test_ogr_mongodb_cleanup():
 
     ogrtest.mongodb_ds = None
 
-    return 'success'
-
 
 gdaltest_list = [
     test_ogr_mongodb_init,
diff --git a/autotest/ogr/ogr_mssqlspatial.py b/autotest/ogr/ogr_mssqlspatial.py
index 583a16f59036..3465a4c52113 100755
--- a/autotest/ogr/ogr_mssqlspatial.py
+++ b/autotest/ogr/ogr_mssqlspatial.py
@@ -76,8 +76,6 @@ def test_ogr_mssqlspatial_1():
     # available since SQL Server 2012
     gdaltest.mssqlspatial_has_z_m = (gdaltest.mssqlspatial_version_major >= 11)
 
-    return 'success'
-
 ###############################################################################
 # Create table from data/poly.shp
 
@@ -132,8 +130,6 @@ def test_ogr_mssqlspatial_2():
     assert gdaltest.mssqlspatial_lyr.GetSpatialRef().IsSame(shp_lyr.GetSpatialRef()), \
         'not matching spatial ref'
 
-    return 'success'
-
 ###############################################################################
 # Verify that stuff we just wrote is still OK.
 
@@ -174,7 +170,7 @@ def test_ogr_mssqlspatial_3():
     gdaltest.poly_feat = None
     gdaltest.shp_ds = None
 
-    return 'success' if tr else 'fail'
+    assert tr
 
 ###############################################################################
 # Write more features with a bunch of different geometries, and verify the
@@ -232,8 +228,6 @@ def test_ogr_mssqlspatial_4():
     dst_feat.Destroy()
     gdaltest.mssqlspatial_lyr.ResetReading()  # to close implicit transaction
 
-    return 'success'
-
 ###############################################################################
 # Run test_ogrsf
 
@@ -251,8 +245,6 @@ def test_ogr_mssqlspatial_test_ogrsf():
 
     assert ret.find('INFO') != -1 and ret.find('ERROR') == -1
 
-    return 'success'
-
 ###############################################################################
 # Verify features can be created in an existing table that includes a geometry
 # column but is not registered in the "geometry_columns" table.
@@ -323,8 +315,6 @@ def test_ogr_mssqlspatial_create_feature_in_unregistered_table():
     test_ds.Destroy()
     feature.Destroy()
 
-    return 'success'
-
 ###############################################################################
 #
 
@@ -342,8 +332,6 @@ def test_ogr_mssqlspatial_cleanup():
 
     gdaltest.mssqlspatial_ds = None
 
-    return 'success'
-
 
 gdaltest_list = [
     test_ogr_mssqlspatial_1,
diff --git a/autotest/ogr/ogr_mvt.py b/autotest/ogr/ogr_mvt.py
index 887277edaac2..33d39e8b9694 100644
--- a/autotest/ogr/ogr_mvt.py
+++ b/autotest/ogr/ogr_mvt.py
@@ -119,8 +119,7 @@ def test_ogr_mvt_datatypes():
         f.DumpReadable()
         pytest.fail()
 
-    return 'success'
-
+    
 ###############################################################################
 
 
@@ -139,8 +138,7 @@ def test_ogr_mvt_datatype_promotion():
         assert fld_defn.GetType() == dt, layer_name
         assert fld_defn.GetSubType() == ogr.OFSTNone, layer_name
 
-    return 'success'
-
+    
 ###############################################################################
 
 
@@ -176,8 +174,6 @@ def test_ogr_mvt_limit_cases():
     f = lyr.GetNextFeature()
     assert f.GetGeometryRef().ExportToWkt() == 'POINT (2070 2690)'
 
-    return 'success'
-
 ###############################################################################
 
 
@@ -190,8 +186,7 @@ def test_ogr_mvt_with_extension_fields():
         f.DumpReadable()
         pytest.fail()
 
-    return 'success'
-
+    
 ###############################################################################
 
 
@@ -208,8 +203,7 @@ def test_ogr_mvt_mixed():
         f.DumpReadable()
         pytest.fail()
 
-    return 'success'
-
+    
 ###############################################################################
 
 
@@ -229,8 +223,7 @@ def test_ogr_mvt_linestring():
         f.DumpReadable()
         pytest.fail()
 
-    return 'success'
-
+    
 ###############################################################################
 
 
@@ -250,8 +243,7 @@ def test_ogr_mvt_multilinestring():
         f.DumpReadable()
         pytest.fail()
 
-    return 'success'
-
+    
 
 ###############################################################################
 
@@ -271,8 +263,7 @@ def test_ogr_mvt_polygon():
         f.DumpReadable()
         pytest.fail()
 
-    return 'success'
-
+    
 ###############################################################################
 
 
@@ -290,8 +281,7 @@ def test_ogr_mvt_point_polygon():
         f.DumpReadable()
         pytest.fail()
 
-    return 'success'
-
+    
 ###############################################################################
 
 
@@ -313,8 +303,7 @@ def test_ogr_mvt_point_polygon_clip():
         f.DumpReadable()
         pytest.fail()
 
-    return 'success'
-
+    
 ###############################################################################
 
 
@@ -326,8 +315,6 @@ def test_ogr_mvt_tileset_without_readdir():
     f = lyr.GetNextFeature()
     assert f is not None
 
-    return 'success'
-
 ###############################################################################
 
 
@@ -339,8 +326,6 @@ def test_ogr_mvt_tileset_tilegl():
     f = lyr.GetNextFeature()
     assert f is not None
 
-    return 'success'
-
 ###############################################################################
 
 
@@ -355,8 +340,6 @@ def test_ogr_mvt_tileset_without_metadata_file():
     assert lyr.GetGeomType() == ogr.wkbMultiPolygon
     assert lyr.GetLayerDefn().GetFieldCount() == 2
 
-    return 'success'
-
 ###############################################################################
 
 
@@ -386,8 +369,6 @@ def test_ogr_mvt_tileset_json_field():
             "string_value": "str"
     }), f.GetFieldAsString("json")
 
-    return 'success'
-
 ###############################################################################
 
 
@@ -423,8 +404,7 @@ def test_ogr_mvt_open_variants():
         f.DumpReadable()
         pytest.fail()
 
-    return 'success'
-
+    
 ###############################################################################
 
 
@@ -438,8 +418,7 @@ def test_ogr_mvt_xyz_options():
         f.DumpReadable()
         pytest.fail()
 
-    return 'success'
-
+    
 ###############################################################################
 
 
@@ -454,8 +433,6 @@ def test_ogr_mvt_test_ogrsf_pbf():
 
     assert ret.find('INFO') != -1 and ret.find('ERROR') == -1
 
-    return 'success'
-
 ###############################################################################
 
 
@@ -470,8 +447,6 @@ def test_ogr_mvt_test_ogrsf_directory():
 
     assert ret.find('INFO') != -1 and ret.find('ERROR') == -1
 
-    return 'success'
-
 ###############################################################################
 
 
@@ -494,8 +469,7 @@ def test_ogr_mvt_mbtiles():
         f.DumpReadable()
         pytest.fail()
 
-    return 'success'
-
+    
 ###############################################################################
 
 
@@ -520,8 +494,6 @@ def test_ogr_mvt_mbtiles_json_field():
              'float_value': 1.25
              }), f.GetFieldAsString("json")
 
-    return 'success'
-
 ###############################################################################
 
 
@@ -546,8 +518,6 @@ def test_ogr_mvt_mbtiles_json_field_auto():
              'float_value': 1.25
              }), f.GetFieldAsString("json")
 
-    return 'success'
-
 ###############################################################################
 
 
@@ -565,8 +535,6 @@ def test_ogr_mvt_mbtiles_test_ogrsf():
 
     assert ret.find('INFO') != -1 and ret.find('ERROR') == -1
 
-    return 'success'
-
 ###############################################################################
 
 
@@ -578,8 +546,6 @@ def test_ogr_mvt_mbtiles_open_vector_in_raster_mode():
     ds = gdal.OpenEx('data/mvt/datatypes.mbtiles', gdal.OF_RASTER)
     assert ds is None
 
-    return 'success'
-
 ###############################################################################
 
 
@@ -597,8 +563,6 @@ def test_ogr_mvt_x_y_z_filename_scheme():
     ds = None
     gdal.Unlink(tmpfilename)
 
-    return 'success'
-
 ###############################################################################
 
 
@@ -610,8 +574,6 @@ def test_ogr_mvt_polygon_larger_than_header():
     f = lyr.GetNextFeature()
     assert f is not None
 
-    return 'success'
-
 ###############################################################################
 
 
@@ -665,8 +627,6 @@ def test_ogr_mvt_errors():
     gdal.Unlink(tmpfilename)
     assert ds is None
 
-    return 'success'
-
 ###############################################################################
 
 
@@ -682,8 +642,7 @@ def test_ogr_mvt_http_start():
     if gdaltest.webserver_port == 0:
         pytest.skip()
 
-    return 'success'
-
+    
 ###############################################################################
 
 
@@ -764,8 +723,7 @@ def test_ogr_mvt_http():
         f = lyr.GetNextFeature()
         assert f is not None
 
-    return 'success'
-
+    
 ###############################################################################
 
 
@@ -776,8 +734,6 @@ def test_ogr_mvt_http_stop():
 
     webserver.server_stop(gdaltest.webserver_process, gdaltest.webserver_port)
 
-    return 'success'
-
 ###############################################################################
 
 
@@ -1070,8 +1026,6 @@ def test_ogr_mvt_write_one_layer():
 
     gdal.RmdirRecursive('/vsimem/outmvt')
 
-    return 'success'
-
 ###############################################################################
 
 
@@ -1140,8 +1094,6 @@ def test_ogr_mvt_write_conf():
 
     gdal.RmdirRecursive('/vsimem/outmvt')
 
-    return 'success'
-
 ###############################################################################
 
 
@@ -1172,8 +1124,6 @@ def test_ogr_mvt_write_mbtiles():
 
     gdal.Unlink('/vsimem/out.mbtiles')
 
-    return 'success'
-
 ###############################################################################
 
 
@@ -1217,8 +1167,6 @@ def test_ogr_mvt_write_limitations_max_size():
 
     gdal.Unlink('/vsimem/out.mbtiles')
 
-    return 'success'
-
 ###############################################################################
 
 
@@ -1267,8 +1215,6 @@ def test_ogr_mvt_write_polygon_repaired():
 
     gdal.Unlink('/vsimem/out.mbtiles')
 
-    return 'success'
-
 ###############################################################################
 
 
@@ -1301,8 +1247,6 @@ def test_ogr_mvt_write_conflicting_innner_ring():
 
     gdal.Unlink('/vsimem/out.mbtiles')
 
-    return 'success'
-
 ###############################################################################
 
 
@@ -1336,8 +1280,6 @@ def test_ogr_mvt_write_limitations_max_size_polygon():
 
     gdal.Unlink('/vsimem/out.mbtiles')
 
-    return 'success'
-
 ###############################################################################
 
 
@@ -1377,8 +1319,6 @@ def test_ogr_mvt_write_limitations_max_features():
 
     gdal.Unlink('/vsimem/out.mbtiles')
 
-    return 'success'
-
 ###############################################################################
 
 
@@ -1413,8 +1353,6 @@ def test_ogr_mvt_write_custom_tiling_scheme():
 
     gdal.RmdirRecursive('/vsimem/out')
 
-    return 'success'
-
 ###############################################################################
 
 
@@ -1568,8 +1506,6 @@ def test_ogr_mvt_write_errors():
 
     gdal.RmdirRecursive('/vsimem/foo')
 
-    return 'success'
-
 ###############################################################################
 #
 
@@ -1606,8 +1542,6 @@ def test_ogr_mvt_write_reuse_temp_db():
     gdal.RmdirRecursive('/vsimem/out')
     gdal.Unlink('/vsimem/out.temp.db')
 
-    return 'success'
-
 
 ###############################################################################
 #
diff --git a/autotest/ogr/ogr_mysql.py b/autotest/ogr/ogr_mysql.py
index bffbdebc0ef6..80f816d13eeb 100755
--- a/autotest/ogr/ogr_mysql.py
+++ b/autotest/ogr/ogr_mysql.py
@@ -76,8 +76,6 @@ def test_ogr_mysql_1():
     gdaltest.is_mysql_8_or_later = int(f.GetField(0).split('.')[0]) >= 8 and f.GetField(0).find('MariaDB') < 0
     gdaltest.mysql_ds.ReleaseResultSet(sql_lyr)
 
-    return 'success'
-
 ###############################################################################
 # Create table from data/poly.shp
 
@@ -131,8 +129,6 @@ def test_ogr_mysql_2():
     assert gdaltest.mysql_lyr.GetSpatialRef().IsSame(shp_lyr.GetSpatialRef()), \
         'not matching spatial ref'
 
-    return 'success'
-
 ###############################################################################
 # Verify that stuff we just wrote is still OK.
 
@@ -173,7 +169,7 @@ def test_ogr_mysql_3():
     gdaltest.poly_feat = None
     gdaltest.shp_ds.Destroy()
 
-    return 'success' if tr else 'fail'
+    assert tr
 
 ###############################################################################
 # Write more features with a bunch of different geometries, and verify the
@@ -235,8 +231,7 @@ def test_ogr_mysql_4():
 
         feat_read.Destroy()
 
-    return 'success'
-
+    
 ###############################################################################
 # Test ExecuteSQL() results layers without geometry.
 
@@ -257,7 +252,7 @@ def test_ogr_mysql_5():
 
     gdaltest.mysql_ds.ReleaseResultSet(sql_lyr)
 
-    return 'success' if tr else 'fail'
+    assert tr
 
 ###############################################################################
 # Test ExecuteSQL() results layers with geometry.
@@ -290,7 +285,7 @@ def test_ogr_mysql_6():
 
     gdaltest.mysql_ds.ReleaseResultSet(sql_lyr)
 
-    return 'success' if tr else 'fail'
+    assert tr
 
 ###############################################################################
 # Test spatial filtering.
@@ -321,7 +316,7 @@ def test_ogr_mysql_7():
 
     gdaltest.mysql_lyr.SetSpatialFilter(None)
 
-    return 'success' if tr else 'fail'
+    assert tr
 
 ###############################################################################
 # Write a feature with too long a text value for a fixed length text field.
@@ -357,8 +352,6 @@ def test_ogr_mysql_8():
 
     feat_read.Destroy()
 
-    return 'success'
-
 ###############################################################################
 # Verify inplace update of a feature with SetFeature().
 
@@ -409,8 +402,6 @@ def test_ogr_mysql_9():
 
     feat.Destroy()
 
-    return 'success'
-
 ###############################################################################
 # Verify that DeleteFeature() works properly.
 
@@ -434,7 +425,7 @@ def test_ogr_mysql_10():
     gdaltest.mysql_lyr.SetAttributeFilter(None)
 
     if feat is None:
-        return 'success'
+        return
 
     feat.Destroy()
     pytest.fail('DeleteFeature() seems to have had no effect.')
@@ -460,7 +451,7 @@ def test_ogr_mysql_15():
                                              'eas_id', expect)
     gdaltest.mysql_lyr.SetAttributeFilter(None)
 
-    return 'success' if tr else 'fail'
+    assert tr
 
 
 ###############################################################################
@@ -486,7 +477,7 @@ def test_ogr_mysql_16():
 
     gdaltest.mysql_ds.ReleaseResultSet(lyr)
 
-    return 'success' if tr else 'fail'
+    assert tr
 
 ###############################################################################
 # Test requesting a non-existent table by name (bug 1480).
@@ -504,8 +495,6 @@ def test_ogr_mysql_17():
     assert count == gdaltest.mysql_ds.GetLayerCount(), \
         'layer count changed unexpectedly.'
 
-    return 'success'
-
 ###############################################################################
 # Test getting a layer by name that was not previously a layer.
 
@@ -522,8 +511,6 @@ def ogr_mysql_18():
     assert count + 1 == gdaltest.mysql_ds.GetLayerCount(), \
         'layer count unexpectedly unchanged.'
 
-    return 'success'
-
 ###############################################################################
 # Test reading a layer extent
 
@@ -548,8 +535,7 @@ def test_ogr_mysql_19():
         print(extent)
         pytest.fail('Extents do not match')
 
-    return 'success'
-
+    
 ###############################################################################
 # Test using reserved keywords as column names and table names
 
@@ -576,7 +562,7 @@ def test_ogr_mysql_20():
     layer.ResetReading()
     feat = layer.GetNextFeature()
     if feat.desc == 'desc' and feat.select == 'select':
-        return 'success'
+        return
     pytest.fail()
 
 ###############################################################################
@@ -604,8 +590,6 @@ def test_ogr_mysql_21():
     feat = layer.GetNextFeature()
     assert feat is None
 
-    return 'success'
-
 ###############################################################################
 # Test inserting NULL geometries into a table without a spatial index
 
@@ -629,8 +613,6 @@ def test_ogr_mysql_22():
     feat = layer.GetNextFeature()
     assert feat is not None
 
-    return 'success'
-
 ###############################################################################
 # Check for right precision
 
@@ -667,8 +649,6 @@ def test_ogr_mysql_23():
     gdaltest.mysql_ds.ReleaseResultSet(gdaltest.mysql_lyr)
     gdaltest.mysql_lyr = None
 
-    return 'success'
-
 ###############################################################################
 # Run test_ogrsf
 
@@ -686,8 +666,6 @@ def test_ogr_mysql_24():
 
     assert ret.find('INFO') != -1 and ret.find('ERROR') == -1
 
-    return 'success'
-
 ###############################################################################
 # Test 64 bit FID
 
@@ -727,8 +705,7 @@ def test_ogr_mysql_72():
         f.DumpReadable()
         pytest.fail()
 
-    return 'success'
-
+    
 ###############################################################################
 # Test nullable
 
@@ -778,8 +755,6 @@ def test_ogr_mysql_25():
     assert lyr.GetLayerDefn().GetFieldDefn(lyr.GetLayerDefn().GetFieldIndex('field_nullable')).IsNullable() == 1
     assert lyr.GetLayerDefn().GetGeomFieldDefn(0).IsNullable() == 0
 
-    return 'success'
-
 ###############################################################################
 # Test default values
 
@@ -859,8 +834,6 @@ def test_ogr_mysql_26():
 
     gdal.Unlink('/vsimem/ogr_gpkg_24.gpkg')
 
-    return 'success'
-
 ###############################################################################
 #
 
@@ -898,8 +871,7 @@ def test_ogr_mysql_longlat():
         pytest.fail('Extents do not match')
 
 
-    return 'success'
-
+    
 ###############################################################################
 #
 
@@ -925,8 +897,6 @@ def test_ogr_mysql_cleanup():
     gdaltest.mysql_ds.Destroy()
     gdaltest.mysql_ds = None
 
-    return 'success'
-
 
 gdaltest_list = [
     test_ogr_mysql_1,
diff --git a/autotest/ogr/ogr_nas.py b/autotest/ogr/ogr_nas.py
index 3b1ef9f1a370..9bbcea56571c 100755
--- a/autotest/ogr/ogr_nas.py
+++ b/autotest/ogr/ogr_nas.py
@@ -96,8 +96,6 @@ def test_ogr_nas_1():
 
     ds = None
 
-    return 'success'
-
 ###############################################################################
 # Test reading a sample NAS file from PostNAS
 #
@@ -150,8 +148,6 @@ def test_ogr_nas_2():
 
     ds = None
 
-    return 'success'
-
 ###############################################################################
 # Test that we can open and read empty files successfully.
 #
@@ -170,8 +166,6 @@ def test_ogr_nas_3():
 
     ds = None
 
-    return 'success'
-
 ###############################################################################
 # Test that we can read files with wfs:Delete transactions in them properly.
 #
@@ -216,8 +210,7 @@ def test_ogr_nas_4():
     except OSError:
         pass
 
-    return 'success'
-
+    
 ###############################################################################
 # Test that we can read files with wfsext:Replace transactions properly
 #
@@ -285,8 +278,7 @@ def test_ogr_nas_5():
     except OSError:
         pass
 
-    return 'success'
-
+    
 
 gdaltest_list = [
     test_ogr_nas_1,
diff --git a/autotest/ogr/ogr_ntf.py b/autotest/ogr/ogr_ntf.py
index 8495d3018dd6..e204e95902ae 100755
--- a/autotest/ogr/ogr_ntf.py
+++ b/autotest/ogr/ogr_ntf.py
@@ -126,8 +126,6 @@ def test_ogr_ntf_1():
 
     ds.Destroy()
 
-    return 'success'
-
 
 ###############################################################################
 def test_ogr_ntf_2():
@@ -173,8 +171,6 @@ def test_ogr_ntf_2():
 
     ds.Destroy()
 
-    return 'success'
-
 
 gdaltest_list = [
     test_ogr_ntf_1,
diff --git a/autotest/ogr/ogr_oci.py b/autotest/ogr/ogr_oci.py
index 4da4d4c0d735..17d4fd1dfdcb 100755
--- a/autotest/ogr/ogr_oci.py
+++ b/autotest/ogr/ogr_oci.py
@@ -56,7 +56,7 @@ def test_ogr_oci_1():
     gdaltest.oci_ds = ogr.Open(os.environ['OCI_DSNAME'])
 
     if gdaltest.oci_ds is not None:
-        return 'success'
+        return
     pytest.fail()
 
 ###############################################################################
@@ -117,8 +117,6 @@ def test_ogr_oci_2():
     assert gdaltest.oci_lyr.DeleteFeature(-10) == ogr.OGRERR_NON_EXISTING_FEATURE, \
         'Expected failure of DeleteFeature().'
 
-    return 'success'
-
 ###############################################################################
 # Helper method to reverse ring winding.  This is needed because the
 # winding direction in shapefiles, and in Oracle is opposite for polygons.
@@ -175,7 +173,7 @@ def test_ogr_oci_3():
     gdaltest.poly_feat = None
     gdaltest.shp_ds.Destroy()
 
-    return 'success' if tr else 'fail'
+    assert tr
 
 ###############################################################################
 # Write more features with a bunch of different geometries, and verify the
@@ -213,8 +211,6 @@ def test_ogr_oci_4():
 
     dst_feat.Destroy()
 
-    return 'success'
-
 ###############################################################################
 # Test ExecuteSQL() results layers without geometry.
 
@@ -233,7 +229,7 @@ def test_ogr_oci_5():
 
     gdaltest.oci_ds.ReleaseResultSet(sql_lyr)
 
-    return 'success' if tr else 'fail'
+    assert tr
 
 ###############################################################################
 # Test ExecuteSQL() results layers with geometry.
@@ -257,7 +253,7 @@ def test_ogr_oci_6():
 
     gdaltest.oci_ds.ReleaseResultSet(sql_lyr)
 
-    return 'success' if tr else 'fail'
+    assert tr
 
 ###############################################################################
 # Test spatial filtering.
@@ -280,7 +276,7 @@ def test_ogr_oci_7():
 
     gdaltest.oci_lyr.SetSpatialFilter(None)
 
-    return 'success' if tr else 'fail'
+    assert tr
 
 ###############################################################################
 # Test that we can create a layer with a coordinate system that is mapped
@@ -325,8 +321,6 @@ def test_ogr_oci_8():
     assert srs2.GetAttrValue('GEOGCS|DATUM') == 'Kertau 1948', \
         'Did not get expected datum name'
 
-    return 'success'
-
 ###############################################################################
 # This time we create a layer with a EPSG marked GEOGCS, and verify that
 # the coordinate system gets properly remapped to the Oracle WGS84.
@@ -368,8 +362,6 @@ def test_ogr_oci_9():
     assert srs2.GetAttrValue('GEOGCS|DATUM') == 'WGS 84', \
         'Did not get expected datum name'
 
-    return 'success'
-
 ###############################################################################
 # Test handling of specialized Oracle Rectangle Geometries.
 
@@ -416,7 +408,7 @@ def test_ogr_oci_10():
     feat_read.Destroy()
     gdaltest.oci_ds.ReleaseResultSet(sql_lyr)
 
-    return 'success' if tr else 'fail'
+    assert tr
 
 ###############################################################################
 # Test handling of specialized Oracle circle Geometries.
@@ -455,7 +447,7 @@ def test_ogr_oci_11():
     feat_read.Destroy()
     gdaltest.oci_ds.ReleaseResultSet(sql_lyr)
 
-    return 'success' if tr else 'fail'
+    assert tr
 
 ###############################################################################
 # Test handling of specialized Oracle circular arc linestring Geometries.
@@ -493,7 +485,7 @@ def test_ogr_oci_12():
     feat_read.Destroy()
     gdaltest.oci_ds.ReleaseResultSet(sql_lyr)
 
-    return 'success' if tr else 'fail'
+    assert tr
 
 ###############################################################################
 # Test handling of specialized Oracle circular arc polygon Geometries.
@@ -532,7 +524,7 @@ def test_ogr_oci_13():
     feat_read.Destroy()
     gdaltest.oci_ds.ReleaseResultSet(sql_lyr)
 
-    return 'success' if tr else 'fail'
+    assert tr
 
 ###############################################################################
 # Test handling of compount linestring.
@@ -571,7 +563,7 @@ def test_ogr_oci_14():
     feat_read.Destroy()
     gdaltest.oci_ds.ReleaseResultSet(sql_lyr)
 
-    return 'success' if tr else 'fail'
+    assert tr
 
 ###############################################################################
 # Test handling of compount polygon.
@@ -610,7 +602,7 @@ def test_ogr_oci_15():
     feat_read.Destroy()
     gdaltest.oci_ds.ReleaseResultSet(sql_lyr)
 
-    return 'success' if tr else 'fail'
+    assert tr
 
 ###############################################################################
 # Test deleting an existing layer.
@@ -640,8 +632,6 @@ def test_ogr_oci_16():
     lyr = gdaltest.oci_ds.GetLayerByName('testsrs2')
     assert lyr is None, 'apparently failed to remove testsrs2 layer'
 
-    return 'success'
-
 ###############################################################################
 # Test that synctodisk actually sets the layer bounds metadata.
 
@@ -708,8 +698,6 @@ def test_ogr_oci_17():
 
     oci_ds2 = None
 
-    return 'success'
-
 ###############################################################################
 # Test layer geometry types
 
@@ -768,8 +756,6 @@ def test_ogr_oci_18():
     lyr = oci_ds2.GetLayerByName('test_NONE')
     assert lyr.GetGeomType() == ogr.wkbNone
 
-    return 'success'
-
 ###############################################################################
 # Test date / datetime
 
@@ -797,8 +783,6 @@ def test_ogr_oci_19():
         pytest.fail()
     gdaltest.oci_ds.ReleaseResultSet(sql_lyr)
 
-    return 'success'
-
 ###############################################################################
 # Test not nullable fields
 
@@ -870,8 +854,6 @@ def test_ogr_oci_20():
     feat = lyr.GetNextFeature()
     assert feat.GetGeometryRef() is None
 
-    return 'success'
-
 ###############################################################################
 # Test default values
 
@@ -964,8 +946,6 @@ def test_ogr_oci_21():
 
     gdal.Unlink('/vsimem/ogr_gpkg_24.gpkg')
 
-    return 'success'
-
 ###############################################################################
 #
 
@@ -1000,8 +980,6 @@ def test_ogr_oci_cleanup():
     gdaltest.oci_ds = None
     gdaltest.shp_ds = None
 
-    return 'success'
-
 
 gdaltest_list = [
     test_ogr_oci_1,
diff --git a/autotest/ogr/ogr_odbc.py b/autotest/ogr/ogr_odbc.py
index f2dd88c6096b..f46c0d4294b7 100755
--- a/autotest/ogr/ogr_odbc.py
+++ b/autotest/ogr/ogr_odbc.py
@@ -127,8 +127,6 @@ def test_ogr_odbc_1():
 
     ds = None
 
-    return 'success'
-
 ###############################################################################
 # Run test_ogrsf
 
@@ -145,8 +143,6 @@ def test_ogr_odbc_2():
 
     assert ret.find('INFO') != -1 and ret.find('ERROR') == -1
 
-    return 'success'
-
 ###############################################################################
 # Cleanup
 
@@ -157,8 +153,6 @@ def test_ogr_odbc_cleanup():
 
     gdal.Unlink('tmp/odbc.mdb')
 
-    return 'success'
-
 
 gdaltest_list = [
     test_ogr_odbc_1,
diff --git a/autotest/ogr/ogr_ods.py b/autotest/ogr/ogr_ods.py
index cd658de64519..e3131cfddfce 100755
--- a/autotest/ogr/ogr_ods.py
+++ b/autotest/ogr/ogr_ods.py
@@ -95,8 +95,7 @@ def ogr_ods_check(ds):
         feat.DumpReadable()
         pytest.fail()
 
-    return 'success'
-
+    
 ###############################################################################
 # Basic tests
 
@@ -181,8 +180,7 @@ def test_ogr_ods_kspread_1():
         feat.DumpReadable()
         pytest.fail()
 
-    return 'success'
-
+    
 ###############################################################################
 # Test OGR_ODS_HEADERS = DISABLE
 
@@ -202,8 +200,6 @@ def test_ogr_ods_2():
 
     gdal.SetConfigOption('OGR_ODS_HEADERS', None)
 
-    return 'success'
-
 ###############################################################################
 # Test OGR_ODS_FIELD_TYPES = STRING
 
@@ -223,8 +219,6 @@ def test_ogr_ods_3():
 
     gdal.SetConfigOption('OGR_ODS_FIELD_TYPES', None)
 
-    return 'success'
-
 ###############################################################################
 # Run test_ogrsf
 
@@ -243,8 +237,6 @@ def test_ogr_ods_4():
 
     assert ret.find('INFO') != -1 and ret.find('ERROR') == -1
 
-    return 'success'
-
 ###############################################################################
 # Test write support
 
@@ -310,8 +302,6 @@ def test_ogr_ods_6():
 
     assert res == expected_res, ('did not get expected result: %s' % res)
 
-    return 'success'
-
 ###############################################################################
 # Test update support
 
@@ -352,8 +342,6 @@ def test_ogr_ods_7():
 
     os.unlink(filepath)
 
-    return 'success'
-
 ###############################################################################
 # Test Integer64
 
@@ -389,8 +377,6 @@ def test_ogr_ods_8():
 
     gdal.Unlink('/vsimem/ogr_ods_8.ods')
 
-    return 'success'
-
 ###############################################################################
 # Test DateTime with milliseconds
 
@@ -432,8 +418,6 @@ def test_ogr_ods_9():
 
     gdal.Unlink('/vsimem/ogr_ods_9.ods')
 
-    return 'success'
-
 ###############################################################################
 # Test Boolean
 
@@ -471,8 +455,6 @@ def test_ogr_ods_boolean():
 
     gdal.Unlink(out_filename)
 
-    return 'success'
-
 
 gdaltest_list = [
     test_ogr_ods_1,
diff --git a/autotest/ogr/ogr_ogdi.py b/autotest/ogr/ogr_ogdi.py
index 1b42fcd888d8..02c1a3a9bd31 100755
--- a/autotest/ogr/ogr_ogdi.py
+++ b/autotest/ogr/ogr_ogdi.py
@@ -97,8 +97,6 @@ def test_ogr_ogdi_1():
     assert ogrtest.check_feature_geometry(feat, ref_geom) == 0, \
         feat.GetGeometryRef().ExportToWkt()
 
-    return 'success'
-
 ###############################################################################
 # Run test_ogrsf
 
@@ -118,8 +116,6 @@ def test_ogr_ogdi_2():
 
     assert ret.find('INFO') != -1 and ret.find('ERROR') == -1
 
-    return 'success'
-
 ###############################################################################
 # Test GetFeature()
 
@@ -156,8 +152,6 @@ def test_ogr_ogdi_3():
 
     assert feat11.Equal(feat11_ref), 'features not equal'
 
-    return 'success'
-
 ###############################################################################
 # Extract of full dataset
 
@@ -200,8 +194,6 @@ def test_ogr_ogdi_4():
     assert ds is not None, 'cannot open dataset'
     assert ds.GetLayerCount() == 1, 'did not get expected layer count'
 
-    return 'success'
-
 ###############################################################################
 # Run test_ogrsf
 
@@ -221,8 +213,6 @@ def test_ogr_ogdi_5():
 
     assert ret.find('INFO') != -1 and ret.find('ERROR') == -1
 
-    return 'success'
-
 ###############################################################################
 
 
@@ -232,7 +222,6 @@ def test_ogr_ogdi_cleanup():
         pytest.skip()
 
     ogrtest.ogdi_ds = None
-    return 'success'
 
 
 gdaltest_list = [
diff --git a/autotest/ogr/ogr_openair.py b/autotest/ogr/ogr_openair.py
index 7ae5cc1a912e..b9ab8683dec8 100755
--- a/autotest/ogr/ogr_openair.py
+++ b/autotest/ogr/ogr_openair.py
@@ -69,8 +69,7 @@ def test_ogr_openair_1():
         print('did not get expected geom on labels layer')
         pytest.fail(geom.ExportToWkt())
 
-    return 'success'
-
+    
 
 gdaltest_list = [
     test_ogr_openair_1]
diff --git a/autotest/ogr/ogr_openfilegdb.py b/autotest/ogr/ogr_openfilegdb.py
index 538e33c5f534..5c0f62ba2115 100755
--- a/autotest/ogr/ogr_openfilegdb.py
+++ b/autotest/ogr/ogr_openfilegdb.py
@@ -88,8 +88,7 @@ def test_ogr_openfilegdb_init():
     if ogrtest.fgdb_drv is not None:
         ogrtest.fgdb_drv.Deregister()
 
-    return 'success'
-
+    
 ###############################################################################
 # Make test data
 
@@ -264,8 +263,6 @@ def ogr_openfilegdb_make_test_data():
     os.chdir('..')
     shutil.rmtree('data/testopenfilegdb.gdb')
 
-    return 'success'
-
 ###############################################################################
 # Basic tests
 
@@ -379,8 +376,6 @@ def test_ogr_openfilegdb_1(filename='data/testopenfilegdb.gdb.zip', version10=Tr
 
     ds = None
 
-    return 'success'
-
 
 def test_ogr_openfilegdb_1_92():
     return test_ogr_openfilegdb_1(filename='data/testopenfilegdb92.gdb.zip', version10=False)
@@ -403,8 +398,6 @@ def test_ogr_openfilegdb_2(filename='data/testopenfilegdb.gdb.zip'):
 
     assert ret.find('INFO') != -1 and ret.find('ERROR') == -1
 
-    return 'success'
-
 
 def test_ogr_openfilegdb_2_92():
     return test_ogr_openfilegdb_2(filename='data/testopenfilegdb92.gdb.zip')
@@ -434,8 +427,6 @@ def test_ogr_openfilegdb_3():
 
     ds = None
 
-    return 'success'
-
 ###############################################################################
 # Test use of attribute indexes
 
@@ -621,7 +612,6 @@ def test_ogr_openfilegdb_4():
         assert feat is None, (where_clause, count)
 
     ds = None
-    return 'success'
 
 ###############################################################################
 # Test opening an unzipped dataset
@@ -645,8 +635,6 @@ def test_ogr_openfilegdb_5():
     ds = ogr.Open('tmp/testopenfilegdb.gdb')
     assert ds is not None
 
-    return 'success'
-
 ###############################################################################
 # Test special SQL processing for min/max/count/sum/avg values
 
@@ -692,8 +680,6 @@ def test_ogr_openfilegdb_6():
         pytest.fail()
     ds.ReleaseResultSet(sql_lyr)
 
-    return 'success'
-
 ###############################################################################
 # Test special SQL processing for ORDER BY
 
@@ -760,8 +746,7 @@ def test_ogr_openfilegdb_7():
                 assert ret.find('INFO') != -1 and ret.find('ERROR') == -1, \
                     (sql, feat_count, first_fid)
 
-    return 'success'
-
+    
 ###############################################################################
 # Test reading a .gdbtable without .gdbtablx
 
@@ -798,8 +783,7 @@ def test_ogr_openfilegdb_8():
         i = i + 1
         feat = lyr.GetNextFeature()
 
-    return 'success'
-
+    
 ###############################################################################
 # Test reading a .gdbtable outside a .gdb
 
@@ -819,8 +803,6 @@ def test_ogr_openfilegdb_9():
     feat = lyr.GetNextFeature()
     assert feat is not None
 
-    return 'success'
-
 ###############################################################################
 # Test various error conditions
 
@@ -988,8 +970,7 @@ def test_ogr_openfilegdb_10():
                 gdal.PopErrorHandler()
                 unfuzz(backup)
 
-    return 'success'
-
+    
 ###############################################################################
 # Test spatial filtering
 
@@ -1139,7 +1120,6 @@ def test_ogr_openfilegdb_11():
     feat = None
     lyr = None
     ds = None
-    return 'success'
 
 ###############################################################################
 # Test opening a FGDB with both SRID and LatestSRID set (#5638)
@@ -1156,8 +1136,6 @@ def test_ogr_openfilegdb_12():
     assert got_wkt == expected_wkt
     ds = None
 
-    return 'success'
-
 ###############################################################################
 # Test opening a FGDB v9 with a non spatial table (#5673)
 
@@ -1175,8 +1153,6 @@ def test_ogr_openfilegdb_13():
         pytest.fail()
     ds = None
 
-    return 'success'
-
 ###############################################################################
 # Test not nullable fields
 
@@ -1190,8 +1166,6 @@ def test_ogr_openfilegdb_14():
     assert lyr.GetLayerDefn().GetGeomFieldDefn(0).IsNullable() == 0
     ds = None
 
-    return 'success'
-
 ###############################################################################
 # Test default values
 
@@ -1207,7 +1181,6 @@ def test_ogr_openfilegdb_15():
     assert lyr.GetLayerDefn().GetFieldDefn(lyr.GetLayerDefn().GetFieldIndex('FLOAT32')).GetDefault().find('1.23') == 0
     assert lyr.GetLayerDefn().GetFieldDefn(lyr.GetLayerDefn().GetFieldIndex('FLOAT64')).GetDefault().find('1.23456') == 0
     assert lyr.GetLayerDefn().GetFieldDefn(lyr.GetLayerDefn().GetFieldIndex('DATETIME')).GetDefault() == "'2015/06/30 12:34:56'"
-    return 'success'
 
 
 ###############################################################################
@@ -1232,8 +1205,6 @@ def test_ogr_openfilegdb_16():
     f = lyr.GetFeature(16384)
     assert f is not None
 
-    return 'success'
-
 ###############################################################################
 # Read a MULTILINESTRING ZM with a dummy M array (#6528)
 
@@ -1245,8 +1216,6 @@ def test_ogr_openfilegdb_17():
     f = lyr.GetNextFeature()
     assert f.GetGeometryRef() is not None
 
-    return 'success'
-
 ###############################################################################
 # Read curves
 
@@ -1282,8 +1251,7 @@ def test_ogr_openfilegdb_18():
             print(f.GetGeometryRef().ExportToWkt())
             pytest.fail(f_ref.GetGeometryRef().ExportToWkt())
 
-    return 'success'
-
+    
 ###############################################################################
 # Test opening '.'
 
@@ -1295,8 +1263,6 @@ def test_ogr_openfilegdb_19():
     os.chdir('../..')
     assert ds is not None
 
-    return 'success'
-
 ###############################################################################
 # Read polygons with M component where the M of the closing point is not the
 # one of the starting point (#7017)
@@ -1324,8 +1290,7 @@ def test_ogr_openfilegdb_20():
             print(f.GetGeometryRef().ExportToIsoWkt())
             pytest.fail(f_ref.GetGeometryRef().ExportToIsoWkt())
 
-    return 'success'
-
+    
 ###############################################################################
 # Test selecting FID column with OGRSQL
 
@@ -1350,8 +1315,7 @@ def test_ogr_openfilegdb_21():
         f.DumpReadable()
         pytest.fail()
 
-    return 'success'
-
+    
 ###############################################################################
 # Cleanup
 
@@ -1375,8 +1339,7 @@ def test_ogr_openfilegdb_cleanup():
     except OSError:
         pass
 
-    return 'success'
-
+    
 
 gdaltest_list = [
     test_ogr_openfilegdb_init,
diff --git a/autotest/ogr/ogr_osm.py b/autotest/ogr/ogr_osm.py
index 87b4b8f292a8..123b2ad2a106 100755
--- a/autotest/ogr/ogr_osm.py
+++ b/autotest/ogr/ogr_osm.py
@@ -224,8 +224,6 @@ def test_ogr_osm_1(filename='data/test.pbf'):
 
     ds = None
 
-    return 'success'
-
 ###############################################################################
 # Test .osm
 
@@ -342,8 +340,6 @@ def test_ogr_osm_4():
 
     assert not is_none
 
-    return 'success'
-
 ###############################################################################
 # Test optimizations for early attribute filter evaluation
 
@@ -382,8 +378,6 @@ def test_ogr_osm_5():
 
     assert not is_none, test
 
-    return 'success'
-
 ###############################################################################
 # Test ogr2ogr -sql
 
@@ -414,8 +408,6 @@ def test_ogr_osm_6():
 
     assert count == 3
 
-    return 'success'
-
 ###############################################################################
 # Test optimization when reading only the points layer through a SQL request
 # with SQLite dialect (#4825)
@@ -437,8 +429,6 @@ def test_ogr_osm_7():
 
     assert count == 1
 
-    return 'success'
-
 ###############################################################################
 # Test 64-bit ids
 
@@ -467,8 +457,7 @@ def test_ogr_osm_8():
         feat.DumpReadable()
         pytest.fail()
 
-    return 'success'
-
+    
 ###############################################################################
 # Same as ogr_osm_8 but with OSM_USE_CUSTOM_INDEXING=NO
 
@@ -561,8 +550,7 @@ def test_ogr_osm_10():
         gdal.PopErrorHandler()
         assert feat is None and gdal.GetLastErrorMsg() != ''
 
-    return 'success'
-
+    
 ###############################################################################
 # Test all_tags
 
@@ -589,8 +577,7 @@ def test_ogr_osm_11():
         feat.DumpReadable()
         pytest.fail()
 
-    return 'success'
-
+    
 
 ###############################################################################
 # Test that attribute filter set on a line layer is well taken into
@@ -615,8 +602,6 @@ def test_ogr_osm_12():
         assert i != 1 or count == 1
     ds = None
 
-    return 'success'
-
 ###############################################################################
 # Test test_uncompressed_dense_true_nometadata.pbf
 
@@ -657,8 +642,6 @@ def test_ogr_osm_13():
 
     gdal.Unlink('/vsimem/ogr_osm_13.osm')
 
-    return 'success'
-
 ###############################################################################
 # Test that we handle polygons in other_relations (#6475)
 
@@ -702,8 +685,6 @@ def test_ogr_osm_14():
 
     gdal.Unlink('/vsimem/ogr_osm_14.osm')
 
-    return 'success'
-
 ###############################################################################
 # Test Dataset.GetNextFeature()
 
@@ -775,8 +756,6 @@ def test_ogr_osm_15():
 
     ds = None
 
-    return 'success'
-
 ###############################################################################
 # Test laundering of tags (https://github.com/OSGeo/gdal/pull/161)
 
@@ -813,8 +792,6 @@ def test_ogr_osm_16():
     gdal.Unlink('/vsimem/ogr_osm_16.osm')
     gdal.Unlink('/vsimem/ogr_osm_16_conf.ini')
 
-    return 'success'
-
 ###############################################################################
 # Test converting an empty OSM file (this essentially tests the behaviour of
 # GDALVectorTranslate() in random feature mode, when there is no feature)
@@ -836,8 +813,6 @@ def test_ogr_osm_17():
 
     assert layer_count == 4
 
-    return 'success'
-
 ###############################################################################
 # Test correct reading of .pbf files with multiple densenode blocks and
 # regarding EOF
@@ -857,8 +832,6 @@ def test_ogr_osm_18():
 
     assert count == 2
 
-    return 'success'
-
 
 gdaltest_list = [
     test_ogr_osm_1,
diff --git a/autotest/ogr/ogr_pcidsk.py b/autotest/ogr/ogr_pcidsk.py
index 23fc3d53195f..ac415bc152df 100755
--- a/autotest/ogr/ogr_pcidsk.py
+++ b/autotest/ogr/ogr_pcidsk.py
@@ -116,8 +116,6 @@ def test_ogr_pcidsk_1():
 
     ds = None
 
-    return 'success'
-
 ###############################################################################
 # Test reading
 
@@ -162,8 +160,6 @@ def test_ogr_pcidsk_2():
 
     ds = None
 
-    return 'success'
-
 ###############################################################################
 # Check with test_ogrsf
 
@@ -210,8 +206,6 @@ def test_ogr_pcidsk_4():
     assert ds is None
     ds = None
 
-    return 'success'
-
 ###############################################################################
 # Test that we can open a raster only pcidsk in update mode
 
@@ -228,8 +222,6 @@ def test_ogr_pcidsk_5():
     assert ds is not None
     ds = None
 
-    return 'success'
-
 ###############################################################################
 
 
@@ -256,8 +248,6 @@ def test_ogr_pcidsk_add_field_to_non_empty_layer():
 
     ogr.GetDriverByName('PCIDSK').DeleteDataSource(tmpfile)
 
-    return 'success'
-
 ###############################################################################
 
 
@@ -276,8 +266,6 @@ def test_ogr_pcidsk_too_many_layers():
 
     ogr.GetDriverByName('PCIDSK').DeleteDataSource(tmpfile)
 
-    return 'success'
-
 
 ###############################################################################
 # Check a polygon layer
@@ -304,8 +292,7 @@ def test_ogr_pcidsk_online_1():
         feat.DumpReadable()
         pytest.fail()
 
-    return 'success'
-
+    
 ###############################################################################
 # Check a polygon layer
 
@@ -326,8 +313,6 @@ def test_ogr_pcidsk_online_2():
 
     assert ret.find('INFO') != -1 and ret.find('ERROR') == -1
 
-    return 'success'
-
 ###############################################################################
 # Cleanup
 
@@ -336,8 +321,6 @@ def test_ogr_pcidsk_cleanup():
 
     gdal.Unlink('tmp/ogr_pcidsk_1.pix')
 
-    return 'success'
-
 
 gdaltest_list = [
     test_ogr_pcidsk_1,
diff --git a/autotest/ogr/ogr_pdf.py b/autotest/ogr/ogr_pdf.py
index 943d2a96af60..8c8d7f2f8d98 100755
--- a/autotest/ogr/ogr_pdf.py
+++ b/autotest/ogr/ogr_pdf.py
@@ -123,8 +123,7 @@ def test_ogr_pdf_1(name='tmp/ogr_pdf_1.pdf', write_attributes='YES'):
         assert wantedstream.encode('utf-8') in data, \
             'Wrong text data in written PDF stream'
 
-    return 'success'
-
+    
 ###############################################################################
 # Test read support
 
@@ -195,8 +194,6 @@ def test_ogr_pdf_2(name='tmp/ogr_pdf_1.pdf', has_attributes=True):
 
     ds = None
 
-    return 'success'
-
 ###############################################################################
 # Test write support without writing attributes
 
@@ -247,8 +244,6 @@ def test_ogr_pdf_5():
     lyr = ds.GetLayer(0)
     assert lyr.GetFeatureCount() == 8
 
-    return 'success'
-
 ###############################################################################
 # Test read support with a non-OGR datasource
 
@@ -294,8 +289,6 @@ def test_ogr_pdf_online_1():
         pytest.fail()
     assert feat.GetField('ID') == 'VL46'
 
-    return 'success'
-
 ###############################################################################
 # Test read support of non-structured content
 
@@ -360,8 +353,7 @@ def test_ogr_pdf_online_2():
         assert ds.GetLayer(i).GetGeomType() == expected_layers[i][1], \
             ('%d : %d' % (i, ds.GetLayer(i).GetGeomType()))
 
-    return 'success'
-
+    
 ###############################################################################
 # Cleanup
 
@@ -374,8 +366,6 @@ def test_ogr_pdf_cleanup():
     ogr.GetDriverByName('PDF').DeleteDataSource('tmp/ogr_pdf_1.pdf')
     ogr.GetDriverByName('PDF').DeleteDataSource('tmp/ogr_pdf_2.pdf')
 
-    return 'success'
-
 
 gdaltest_list = [
     test_ogr_pdf_1,
diff --git a/autotest/ogr/ogr_pds.py b/autotest/ogr/ogr_pds.py
index 85c26f5391bf..5672fc50572a 100755
--- a/autotest/ogr/ogr_pds.py
+++ b/autotest/ogr/ogr_pds.py
@@ -67,8 +67,7 @@ def test_ogr_pds_1():
         feat.DumpReadable()
         pytest.fail()
 
-    return 'success'
-
+    
 ###############################################################################
 # Read IEEE_FLOAT columns (see https://github.com/OSGeo/gdal/issues/570)
 
@@ -82,8 +81,7 @@ def test_ogr_pds_2():
         f.DumpReadable()
         pytest.fail()
 
-    return 'success'
-
+    
 
 gdaltest_list = [
     test_ogr_pds_1,
diff --git a/autotest/ogr/ogr_pg.py b/autotest/ogr/ogr_pg.py
index a715ac21bcfd..a1b8429a50d1 100755
--- a/autotest/ogr/ogr_pg.py
+++ b/autotest/ogr/ogr_pg.py
@@ -159,8 +159,7 @@ def test_ogr_pg_1():
         gdaltest.pg_has_postgis = False
         print('PostGIS NOT available !')
 
-    return 'success'
-
+    
 ###############################################################################
 # Create table from data/poly.shp
 
@@ -241,8 +240,6 @@ def test_ogr_pg_2(with_and_without_postgis):
 
     dst_feat.Destroy()
 
-    return 'success'
-
 
 ###############################################################################
 # Test reading a layer extent
@@ -280,8 +277,7 @@ def test_ogr_pg_19(with_and_without_postgis):
             print(extent)
             pytest.fail('Wrong estimated extent')
 
-    return 'success'
-
+    
 ###############################################################################
 # Test reading a SQL result layer extent
 
@@ -342,7 +338,7 @@ def test_ogr_pg_3(with_and_without_postgis):
 
     gdaltest.poly_feat = None
 
-    return 'success' if tr else 'fail'
+    assert tr
 
 ###############################################################################
 # Write more features with a bunch of different geometries, and verify the
@@ -387,8 +383,6 @@ def test_ogr_pg_4(with_and_without_postgis):
     dst_feat.Destroy()
     gdaltest.pg_lyr.ResetReading()  # to close implicit transaction
 
-    return 'success'
-
 ###############################################################################
 # Test ExecuteSQL() results layers without geometry.
 
@@ -408,7 +402,7 @@ def test_ogr_pg_5(with_and_without_postgis):
 
     gdaltest.pg_ds.ReleaseResultSet(sql_lyr)
 
-    return 'success' if tr else 'fail'
+    assert tr
 
 ###############################################################################
 # Test ExecuteSQL() results layers with geometry.
@@ -442,7 +436,7 @@ def test_ogr_pg_6(with_and_without_postgis):
 
     gdaltest.pg_ds.ReleaseResultSet(sql_lyr)
 
-    return 'success' if tr else 'fail'
+    assert tr
 
 ###############################################################################
 # Test spatial filtering.
@@ -473,7 +467,7 @@ def test_ogr_pg_7(with_and_without_postgis):
 
     gdaltest.pg_lyr.SetSpatialFilter(None)
 
-    return 'success' if tr else 'fail'
+    assert tr
 
 ###############################################################################
 # Write a feature with too long a text value for a fixed length text field.
@@ -507,8 +501,6 @@ def test_ogr_pg_8(with_and_without_postgis):
 
     feat_read.Destroy()
 
-    return 'success'
-
 ###############################################################################
 # Verify inplace update of a feature with SetFeature().
 
@@ -571,8 +563,6 @@ def test_ogr_pg_9(with_and_without_postgis):
 
     feat.Destroy()
 
-    return 'success'
-
 ###############################################################################
 # Verify that DeleteFeature() works properly.
 
@@ -603,8 +593,6 @@ def test_ogr_pg_10(with_and_without_postgis):
     assert gdaltest.pg_lyr.DeleteFeature(-10) == ogr.OGRERR_NON_EXISTING_FEATURE, \
         'Expected failure of DeleteFeature().'
 
-    return 'success'
-
 ###############################################################################
 # Create table from data/poly.shp in INSERT mode.
 
@@ -657,8 +645,6 @@ def test_ogr_pg_11(with_and_without_postgis):
 
     gdal.SetConfigOption('PG_USE_COPY', gdaltest.pg_use_copy)
 
-    return 'success'
-
 ###############################################################################
 # Verify that stuff we just wrote is still OK.
 
@@ -687,8 +673,6 @@ def test_ogr_pg_12(with_and_without_postgis):
     gdaltest.poly_feat = None
     gdaltest.pgc_lyr.ResetReading()  # to close implicit transaction
 
-    return 'success'
-
 ###############################################################################
 # Create a table with some date fields.
 
@@ -723,8 +707,6 @@ def test_ogr_pg_13(with_and_without_postgis):
     # Create a populated records.
     gdaltest.pg_ds.ExecuteSQL("INSERT INTO datetest ( ogrdate, ogrtime, ogrdatetime, tsz, ts, dt, tm) VALUES ( '2005-10-12 10:41:33-05', '2005-10-12 10:41:33-05', '2005-10-12 10:41:33-05', '2005-10-12 10:41:33-05','2005-10-12 10:41:33-05','2005-10-12 10:41:33-05','2005-10-12 10:41:33-05' )")
 
-    return 'success'
-
 ###############################################################################
 # Verify that stuff we just wrote is still OK.
 # Fetch in several timezones to test our timezone processing.
@@ -786,8 +768,6 @@ def test_ogr_pg_14(with_and_without_postgis):
     feat = None
     ds.Destroy()
 
-    return 'success'
-
 ###############################################################################
 # Test very large query.
 
@@ -809,7 +789,7 @@ def test_ogr_pg_15(with_and_without_postgis):
                                              'eas_id', expect)
     gdaltest.pg_lyr.SetAttributeFilter(None)
 
-    return 'success' if tr else 'fail'
+    assert tr
 
 
 ###############################################################################
@@ -835,7 +815,7 @@ def test_ogr_pg_16(with_and_without_postgis):
 
     gdaltest.pg_ds.ReleaseResultSet(lyr)
 
-    return 'success' if tr else 'fail'
+    assert tr
 
 ###############################################################################
 # Test requesting a non-existent table by name (bug 1480).
@@ -856,8 +836,6 @@ def test_ogr_pg_17(with_and_without_postgis):
 
     assert count == gdaltest.pg_ds.GetLayerCount(), 'layer count changed unexpectedly.'
 
-    return 'success'
-
 ###############################################################################
 # Test getting a layer by name that was not previously a layer.
 
@@ -874,8 +852,6 @@ def test_ogr_pg_18(with_and_without_postgis):
     assert count + 1 == gdaltest.pg_ds.GetLayerCount(), \
         'layer count unexpectedly unchanged.'
 
-    return 'success'
-
 
 ###############################################################################
 # Test reading 4-dim geometry in EWKT format
@@ -956,8 +932,6 @@ def test_ogr_pg_20(with_and_without_postgis):
 
     layer = None
 
-    return 'success'
-
 ###############################################################################
 # Test reading 4-dimension geometries in EWKB format
 
@@ -987,8 +961,6 @@ def test_ogr_pg_21(with_and_without_postgis):
     gdaltest.pg_ds.ReleaseResultSet(layer)
     layer = None
 
-    return 'success'
-
 ###############################################################################
 # Check if the sub geometries of TIN and POLYHEDRALSURFACE are valid
 
@@ -1028,8 +1000,7 @@ def test_ogr_pg_21_subgeoms(with_and_without_postgis):
         feat.Destroy()
         feat = None
 
-    return 'success'
-
+    
 ###############################################################################
 # Check if the 3d geometries of TIN, Triangle and POLYHEDRALSURFACE are valid
 
@@ -1074,7 +1045,6 @@ def test_ogr_pg_21_3d_geometries():
             ('Unexpected WKT, expected %s and got %s' % (wkt_expected[i], wkt))
 
     gdaltest.pg_ds.ExecuteSQL("DROP TABLE zgeoms")
-    return 'success'
 
 ###############################################################################
 # Create table from data/poly.shp under specified SCHEMA
@@ -1132,8 +1102,6 @@ def test_ogr_pg_22(with_and_without_postgis):
 
     assert found is not False, ('layer from schema \'' + schema_name + '\' not listed')
 
-    return 'success'
-
 ###############################################################################
 # Create table with all data types
 
@@ -1225,8 +1193,6 @@ def test_ogr_pg_23(with_and_without_postgis):
     sql += "'{100.1,200.1}', '{100.12,200.12}', ARRAY[100.12,200.12], ARRAY[10,20], ARRAY[10.12,20.12], '{1,0}', " + geom_str + " )"
     gdaltest.pg_ds.ExecuteSQL(sql)
 
-    return 'success'
-
 ###############################################################################
 
 
@@ -1308,8 +1274,6 @@ def check_value_23(layer_defn, feat):
     wkt = geom.ExportToWkt()
     assert wkt == 'POINT (10 20)', ('Wrong WKT :' + wkt)
 
-    return 'success'
-
 ###############################################################################
 # Test with PG: connection
 
@@ -1332,8 +1296,6 @@ def test_ogr_pg_24(with_and_without_postgis):
 
     ds.Destroy()
 
-    return 'success'
-
 ###############################################################################
 # Test with PG: connection and SELECT query
 
@@ -1358,8 +1320,6 @@ def test_ogr_pg_25(with_and_without_postgis):
 
     ds.Destroy()
 
-    return 'success'
-
 ###############################################################################
 # Duplicate all data types in INSERT mode
 
@@ -1406,8 +1366,6 @@ def test_ogr_pg_28(with_and_without_postgis):
 
     gdal.SetConfigOption('PG_USE_COPY', gdaltest.pg_use_copy)
 
-    return 'success'
-
 ###############################################################################
 # Test with PG: connection
 
@@ -1435,8 +1393,6 @@ def test_ogr_pg_29(with_and_without_postgis):
 
     ds.Destroy()
 
-    return 'success'
-
 ###############################################################################
 # Duplicate all data types in PG_USE_COPY mode
 
@@ -1480,8 +1436,6 @@ def test_ogr_pg_30(with_and_without_postgis):
 
     gdal.SetConfigOption('PG_USE_COPY', gdaltest.pg_use_copy)
 
-    return 'success'
-
 
 ###############################################################################
 # Test the tables= connection string option
@@ -1517,8 +1471,6 @@ def test_ogr_pg_31(with_and_without_postgis):
 
     ds.Destroy()
 
-    return 'success'
-
 ###############################################################################
 # Test approximate srtext (#2123, #3508)
 
@@ -1645,8 +1597,6 @@ def test_ogr_pg_32(with_and_without_postgis):
         pytest.fail('did not get expected count after step (5)')
     gdaltest.pg_ds.ReleaseResultSet(sql_lyr)
 
-    return 'success'
-
 ###############################################################################
 # Test encoding as UTF8
 
@@ -1665,8 +1615,6 @@ def test_ogr_pg_33(with_and_without_postgis):
     gdaltest.pg_lyr.CreateFeature(dst_feat)
     dst_feat.Destroy()
 
-    return 'success'
-
 ###############################################################################
 # Test encoding as Latin1
 
@@ -1701,8 +1649,6 @@ def test_ogr_pg_34(with_and_without_postgis):
     gdaltest.pg_lyr.CreateFeature(dst_feat)
     dst_feat.Destroy()
 
-    return 'success'
-
 
 ###############################################################################
 # Test for buffer overflows
@@ -1733,8 +1679,7 @@ def test_ogr_pg_35(with_and_without_postgis):
     finally:
         gdal.PopErrorHandler()
 
-    return 'success'
-
+    
 ###############################################################################
 # Test support for inherited tables : tables inherited from a Postgis Table
 
@@ -1782,8 +1727,6 @@ def test_ogr_pg_36(with_and_without_postgis):
 
     ds.Destroy()
 
-    return 'success'
-
 
 def test_ogr_pg_36_bis(with_and_without_postgis):
 
@@ -1801,8 +1744,6 @@ def test_ogr_pg_36_bis(with_and_without_postgis):
 
     ds.Destroy()
 
-    return 'success'
-
 ###############################################################################
 # Test support for inherited tables : Postgis table inherited from a non-Postgis table
 
@@ -1828,8 +1769,6 @@ def test_ogr_pg_37(with_and_without_postgis):
 
     ds.Destroy()
 
-    return 'success'
-
 ###############################################################################
 # Test support for multiple geometry columns (RFC 41)
 
@@ -1886,8 +1825,6 @@ def test_ogr_pg_38(with_and_without_postgis):
 
     ds.Destroy()
 
-    return 'success'
-
 ###############################################################################
 # Test support for named views
 
@@ -1902,7 +1839,7 @@ def test_ogr_pg_39(with_and_without_postgis):
         found = ogr_pg_check_layer_in_list(ds, 'testview')
         assert found is not False, 'layer testview not listed'
         ds.Destroy()
-        return 'success'
+        return
 
     gdaltest.pg_ds.ExecuteSQL("CREATE VIEW testview AS SELECT * FROM table37_inherited")
     if not gdaltest.pg_has_postgis_2:
@@ -1956,8 +1893,6 @@ def test_ogr_pg_39(with_and_without_postgis):
 
     ds.Destroy()
 
-    return 'success'
-
 ###############################################################################
 # Test GetFeature() with an invalid id
 
@@ -1969,8 +1904,6 @@ def test_ogr_pg_40(with_and_without_postgis):
     layer = gdaltest.pg_ds.GetLayerByName('tpoly')
     assert layer.GetFeature(0) is None
 
-    return 'success'
-
 ###############################################################################
 # Test active_schema= option
 
@@ -2017,8 +1950,6 @@ def test_ogr_pg_41(with_and_without_postgis):
 
     ds.Destroy()
 
-    return 'success'
-
 ###############################################################################
 # Test schemas= option
 
@@ -2059,8 +1990,6 @@ def test_ogr_pg_42(with_and_without_postgis):
 
     ds.Destroy()
 
-    return 'success'
-
 
 ###############################################################################
 # Test schemas= option
@@ -2086,8 +2015,6 @@ def test_ogr_pg_43(with_and_without_postgis):
 
     ds.Destroy()
 
-    return 'success'
-
 ###############################################################################
 # Test for table and column names that need quoting (#2945)
 
@@ -2129,8 +2056,6 @@ def test_ogr_pg_44(with_and_without_postgis):
 
     ds.Destroy()
 
-    return 'success'
-
 ###############################################################################
 # Test SetNextByIndex (#3117)
 
@@ -2158,8 +2083,6 @@ def test_ogr_pg_45(with_and_without_postgis):
     feat = lyr.GetNextFeature()
     assert feat.GetFID() == tab_feat[3].GetFID(), 'did not get expected feature'
 
-    return 'success'
-
 ###############################################################################
 # Test that we can read more than 500 features and update each one
 # with SetFeature()
@@ -2217,8 +2140,6 @@ def test_ogr_pg_46(with_and_without_postgis):
 
     gdaltest.pg_ds.ReleaseResultSet(sqllyr)
 
-    return 'success'
-
 ###############################################################################
 # Test that we can handle 'geography' column type introduced in PostGIS 1.5
 
@@ -2321,8 +2242,6 @@ def test_ogr_pg_47(with_and_without_postgis):
     feat.Destroy()
     gdaltest.pg_ds.ReleaseResultSet(sql_lyr)
 
-    return 'success'
-
 ###############################################################################
 # Test that we can read a table without any primary key (#2082)
 # Test also the effect of PG_LIST_ALL_TABLES with a non spatial table in a
@@ -2388,8 +2307,7 @@ def test_ogr_pg_48(with_and_without_postgis):
         feat.DumpReadable()
         pytest.fail('did not get expected other_id')
 
-    return 'success'
-
+    
 ###############################################################################
 # Go on with previous test but set PGSQL_OGR_FID this time
 
@@ -2414,8 +2332,7 @@ def test_ogr_pg_49(with_and_without_postgis):
         feat.DumpReadable()
         pytest.fail('did not get expected FID')
 
-    return 'success'
-
+    
 ###############################################################################
 # Write and read NaN values (#3667)
 # This tests writing using COPY and INSERT
@@ -2478,8 +2395,6 @@ def test_ogr_pg_50(with_and_without_postgis):
 
     gdaltest.pg_lyr.ResetReading()  # to close implicit transaction
 
-    return 'success'
-
 ###############################################################################
 # Run test_ogrsf
 
@@ -2497,8 +2412,6 @@ def test_ogr_pg_51(with_and_without_postgis):
 
     assert ret.find('INFO') != -1 and ret.find('ERROR') == -1
 
-    return 'success'
-
 ###############################################################################
 # Run test_ogrsf with -sql
 
@@ -2516,8 +2429,6 @@ def test_ogr_pg_52(with_and_without_postgis):
 
     assert ret.find('INFO') != -1 and ret.find('ERROR') == -1
 
-    return 'success'
-
 ###############################################################################
 # Test creating a layer with explicitly wkbNone geometry type.
 
@@ -2571,8 +2482,6 @@ def test_ogr_pg_53(with_and_without_postgis):
     lyr = ds.GetLayerByName('no_geometry_table')
     assert lyr.GetLayerDefn().GetFieldCount() == 2
 
-    return 'success'
-
 ###############################################################################
 # Check that we can overwrite a non-spatial geometry table (#4012)
 
@@ -2595,8 +2504,6 @@ def test_ogr_pg_53_bis(with_and_without_postgis):
     feat = lyr.GetNextFeature()
     assert feat.GetField(0) == 'baz'
 
-    return 'success'
-
 ###############################################################################
 # Test reading AsEWKB()
 
@@ -2619,8 +2526,6 @@ def test_ogr_pg_54(with_and_without_postgis):
     geom = feat.GetGeometryRef()
     assert geom.ExportToWkt() == 'POINT (0 1 2)'
 
-    return 'success'
-
 ###############################################################################
 # Test reading geoms as Base64 encoded strings
 
@@ -2650,8 +2555,6 @@ def test_ogr_pg_55(with_and_without_postgis):
     assert feat.GetGeometryRef().ExportToWkt() == 'POINT (1 2 3)'
     ds = None
 
-    return 'success'
-
 ###############################################################################
 # Test insertion of features with first field being a 0-character string in a
 # non-spatial table and without FID in COPY mode (#4040)
@@ -2734,8 +2637,6 @@ def test_ogr_pg_56(with_and_without_postgis):
 
     ds = None
 
-    return 'success'
-
 ###############################################################################
 # Test inserting an empty feature
 
@@ -2753,8 +2654,6 @@ def test_ogr_pg_57(with_and_without_postgis):
 
     assert ret == 0
 
-    return 'success'
-
 ###############################################################################
 # Test RFC35
 
@@ -2803,8 +2702,6 @@ def test_ogr_pg_58(with_and_without_postgis):
 
     assert lyr.GetLayerDefn().GetFieldCount() == 1, 'failed (4)'
 
-    return 'success'
-
 ###############################################################################
 # Check that we can use -nln with a layer name that is recognized by GetLayerByName()
 # but which is not the layer name.
@@ -2831,8 +2728,6 @@ def test_ogr_pg_59(with_and_without_postgis):
 
     assert fc == 35, 'did not get expected feature count'
 
-    return 'success'
-
 ###############################################################################
 # Test that we can insert a feature that has a FID on a table with a
 # non-incrementing PK.
@@ -2863,8 +2758,6 @@ def test_ogr_pg_60(with_and_without_postgis):
     feat = lyr.GetFeature(100)
     assert feat is not None, 'did not get feature'
 
-    return 'success'
-
 ###############################################################################
 # Test insertion of features with FID set in COPY mode (#4495)
 
@@ -2909,8 +2802,6 @@ def test_ogr_pg_61(with_and_without_postgis):
 
     ds = None
 
-    return 'success'
-
 ###############################################################################
 # Test ExecuteSQL() and getting SRID of the request (#4699)
 
@@ -2940,8 +2831,6 @@ def test_ogr_pg_62(with_and_without_postgis):
     gdaltest.pg_ds.ReleaseResultSet(sql_lyr)
     assert not (got_srs is None or got_srs.ExportToWkt().find('4326') == -1)
 
-    return 'success'
-
 ###############################################################################
 # Test COLUMN_TYPES layer creation option (#4788)
 
@@ -2977,8 +2866,6 @@ def test_ogr_pg_63(with_and_without_postgis):
     assert feat.GetField('foo') == 123
     assert feat.GetField('baw') == 123456789012345
 
-    return 'success'
-
 ###############################################################################
 # Test OGR_TRUNCATE config. option (#5091)
 
@@ -3014,8 +2901,6 @@ def test_ogr_pg_64(with_and_without_postgis):
     # Just one feature because of truncation
     assert lyr.GetFeatureCount() == 1
 
-    return 'success'
-
 ###############################################################################
 # Test RFC 41
 
@@ -3132,8 +3017,7 @@ def test_ogr_pg_65(with_and_without_postgis):
         assert lyr.GetLayerDefn().GetGeomFieldDefn(1).GetSpatialRef() is None
         assert lyr.GetLayerDefn().GetGeomFieldDefn(2).GetSpatialRef().ExportToWkt().find('32631') >= 0
 
-    return 'success'
-
+    
 ###############################################################################
 # Run test_ogrsf
 
@@ -3154,8 +3038,6 @@ def test_ogr_pg_66(with_and_without_postgis):
 
     assert ret.find('INFO') != -1 and ret.find('ERROR') == -1
 
-    return 'success'
-
 ###############################################################################
 # Test retrieving SRID from values (#5131)
 
@@ -3197,8 +3079,6 @@ def test_ogr_pg_67(with_and_without_postgis):
     assert lyr.GetSpatialRef() is not None
     ds = None
 
-    return 'success'
-
 ###############################################################################
 # Test retrieving SRID from values even if we don't have select rights on geometry_columns (#5131)
 
@@ -3247,8 +3127,6 @@ def test_ogr_pg_68(with_and_without_postgis):
 
     assert got_srs2 is not None
 
-    return 'success'
-
 ###############################################################################
 # Test deferred loading of tables (#5450)
 
@@ -3282,8 +3160,6 @@ def test_ogr_pg_69(with_and_without_postgis):
     gdaltest.pg_ds = ogr.Open('PG:' + gdaltest.pg_connection_string)
     assert gdaltest.pg_ds.GetLayerByName('TPOLY') is not None
 
-    return 'success'
-
 ###############################################################################
 # Test historical non-differed creation of tables (#5547)
 
@@ -3334,8 +3210,7 @@ def test_ogr_pg_70(with_and_without_postgis):
         ds.ReleaseResultSet(geography_columns_lyr)
         ds = None
 
-    return 'success'
-
+    
 ###############################################################################
 # Test interoperability of WKT/WKB with PostGIS.
 
@@ -3456,8 +3331,7 @@ def test_ogr_pg_71(with_and_without_postgis):
 
         assert out_wkt == wkt
 
-    return 'success'
-
+    
 ###############################################################################
 # Test 64 bit FID
 
@@ -3510,8 +3384,6 @@ def test_ogr_pg_72(with_and_without_postgis):
 
     lyr.ResetReading()  # to close implicit transaction
 
-    return 'success'
-
 ###############################################################################
 # Test not nullable fields
 
@@ -3595,8 +3467,6 @@ def test_ogr_pg_73(with_and_without_postgis):
     assert sql_lyr.GetLayerDefn().GetGeomFieldDefn(sql_lyr.GetLayerDefn().GetGeomFieldIndex('geomfield_nullable')).IsNullable() == 1
     ds.ReleaseResultSet(sql_lyr)
 
-    return 'success'
-
 ###############################################################################
 # Test default values
 
@@ -3734,8 +3604,6 @@ def test_ogr_pg_74(with_and_without_postgis):
     assert lyr.GetLayerDefn().GetFieldDefn(lyr.GetLayerDefn().GetFieldIndex('field_string')).GetDefault() == "'c'"
     assert lyr.GetLayerDefn().GetFieldDefn(lyr.GetLayerDefn().GetFieldIndex('field_int')).GetDefault() is None
 
-    return 'success'
-
 ###############################################################################
 # Test creating a field with the fid name
 
@@ -3822,8 +3690,6 @@ def test_ogr_pg_75(with_and_without_postgis):
     f = None
     lyr.ResetReading()  # to close implicit transaction
 
-    return 'success'
-
 ###############################################################################
 # Test transactions RFC 54
 
@@ -3938,8 +3804,6 @@ def ogr_pg_76_scenario1(lyr1, lyr2):
     assert (lastcmd, level, savepoint, usertransac) == ('COMMIT', 0, 0, 0)
     assert lyr1.GetFeatureCount() == 4
 
-    return 'success'
-
 
 # Scenario 2 : a CreateFeature done in the middle of GetNextFeature(), themselves between a user transaction
 def ogr_pg_76_scenario2(lyr1, lyr2with_and_without_postgis):
@@ -4014,8 +3878,6 @@ def ogr_pg_76_scenario2(lyr1, lyr2with_and_without_postgis):
     (lastcmd, level, savepoint, usertransac) = ogr_pg_76_get_transaction_state(gdaltest.pg_ds)
     assert (lastcmd, level, savepoint, usertransac) == ('', 0, 0, 0)
 
-    return 'success'
-
 # Scenario 3 : StartTransaction(), GetNextFeature(), CommitTransaction(), GetNextFeature()
 
 
@@ -4054,8 +3916,6 @@ def ogr_pg_76_scenario3(lyr1, lyr2with_and_without_postgis):
 
     lyr2.ResetReading()
 
-    return 'success'
-
 # Scenario 4 : GetNextFeature(), StartTransaction(), CreateFeature(), CommitTransaction(), GetNextFeature(), ResetReading()
 
 
@@ -4114,8 +3974,6 @@ def ogr_pg_76_scenario4(lyr1, lyr2with_and_without_postgis):
     (lastcmd, level, savepoint, usertransac) = ogr_pg_76_get_transaction_state(gdaltest.pg_ds)
     assert (lastcmd, level, savepoint, usertransac) == ('COMMIT', 0, 0, 0)
 
-    return 'success'
-
 ###############################################################################
 # Test ogr2ogr can insert multiple layers at once
 
@@ -4169,8 +4027,7 @@ def test_ogr_pg_77(with_and_without_postgis):
     except OSError:
         pass
 
-    return 'success'
-
+    
 ###############################################################################
 # Test manually added geometry constraints
 
@@ -4249,8 +4106,6 @@ def test_ogr_pg_78(with_and_without_postgis):
     assert ogr_pg_78_found
     assert ogr_pg_78_2_found
 
-    return 'success'
-
 ###############################################################################
 # Test PRELUDE_STATEMENTS and CLOSING_STATEMENTS open options
 
@@ -4315,8 +4170,6 @@ def test_ogr_pg_79(with_and_without_postgis):
         ds = None
     assert gdal.GetLastErrorMsg() != ''
 
-    return 'success'
-
 ###############################################################################
 # Test retrieving an error from ExecuteSQL() (#6194)
 
@@ -4332,8 +4185,6 @@ def test_ogr_pg_80():
     assert gdal.GetLastErrorMsg() != ''
     assert sql_lyr is None
 
-    return 'success'
-
 ###############################################################################
 # Test that ogr2ogr -skip properly rollbacks transactions (#6328)
 
@@ -4377,8 +4228,6 @@ def test_ogr_pg_81():
         pytest.fail()
     lyr.ResetReading()  # flushes implicit transaction
 
-    return 'success'
-
 ###############################################################################
 # Test that GEOMETRY_NAME works even when the geometry column creation is
 # done through CreateGeomField (#6366)
@@ -4395,8 +4244,6 @@ def test_ogr_pg_82():
     lyr.CreateGeomField(ogr.GeomFieldDefn('my_geom', ogr.wkbPoint))
     assert lyr.GetLayerDefn().GetGeomFieldDefn(0).GetName() == 'another_name'
 
-    return 'success'
-
 ###############################################################################
 # Test ZM support
 
@@ -4458,8 +4305,7 @@ def test_ogr_pg_83():
         assert got_wkt == expected_wkt, (geom_type, options, wkt, expected_wkt, got_wkt)
         lyr.ResetReading()  # flushes implicit transaction
 
-    return 'success'
-
+    
 ###############################################################################
 # Test description
 
@@ -4515,8 +4361,6 @@ def test_ogr_pg_84():
     assert lyr.GetMetadataItem('DESCRIPTION') is None
     ds = None
 
-    return 'success'
-
 ###############################################################################
 # Test append of several layers in PG_USE_COPY mode (#6411)
 
@@ -4569,8 +4413,6 @@ def test_ogr_pg_85():
     lyr = gdaltest.pg_ds.GetLayerByName('ogr_pg_85_2')
     assert lyr.GetFeatureCount() == 2
 
-    return 'success'
-
 ###############################################################################
 # Test OFTBinary
 
@@ -4610,8 +4452,6 @@ def test_ogr_pg_86():
 
     gdal.SetConfigOption('PG_USE_COPY', old_val)
 
-    return 'success'
-
 ###############################################################################
 # Test sequence updating (#7032)
 
@@ -4641,8 +4481,6 @@ def test_ogr_pg_87():
     lyr.CreateFeature(f)
     assert f.GetFID() == 12
 
-    return 'success'
-
 ###############################################################################
 # Test JSON subtype
 
@@ -4672,8 +4510,6 @@ def test_ogr_pg_json():
     assert sql_lyr.GetLayerDefn().GetFieldDefn(0).GetSubType() == ogr.OFSTJSON
     gdaltest.pg_ds.ReleaseResultSet(sql_lyr)
 
-    return 'success'
-
 ###############################################################################
 #
 
@@ -4754,8 +4590,6 @@ def test_ogr_pg_table_cleanup(with_and_without_postgis):
     gdaltest.pg_ds.ExecuteSQL('DROP SCHEMA \"AutoTest-schema\" CASCADE')
     gdal.PopErrorHandler()
 
-    return 'success'
-
 
 def test_ogr_pg_cleanup(with_and_without_postgis):
 
@@ -4768,8 +4602,6 @@ def test_ogr_pg_cleanup(with_and_without_postgis):
     gdaltest.pg_ds.Destroy()
     gdaltest.pg_ds = None
 
-    return 'success'
-
 # NOTE: The ogr_pg_19 intentionally executed after ogr_pg_2
 
 
diff --git a/autotest/ogr/ogr_pgdump.py b/autotest/ogr/ogr_pgdump.py
index c8a6fc6da549..af64d17437e2 100755
--- a/autotest/ogr/ogr_pgdump.py
+++ b/autotest/ogr/ogr_pgdump.py
@@ -103,8 +103,6 @@ def test_ogr_pgdump_1():
        sql.find("""INSERT INTO "public"."tpoly" ("wkb_geometry" , "area", "eas_id", "prfedea") VALUES ('01030000800100000005000000000000C01A481D4100000080072D5241000000000000000000000060AA461D4100000080FF2C524100000000000000000000006060461D41000000400C2D52410000000000000000000000A0DF471D4100000000142D52410000000000000000000000C01A481D4100000080072D52410000000000000000', 5268.813, 170, '35043413');""") == -1 or \
        sql.find("""COMMIT;""") == -1))
 
-    return 'success'
-
 ###############################################################################
 # Create table from data/poly.shp with PG_USE_COPY=YES
 
@@ -175,8 +173,6 @@ def test_ogr_pgdump_2():
        sql.find("""\.""") == -1 or \
        sql.find("""COMMIT;""") == -1))
 
-    return 'success'
-
 
 ###############################################################################
 # Create table from data/poly.shp without any geometry
@@ -259,8 +255,6 @@ def test_ogr_pgdump_3():
        sql.find("""\\.""") == -1 or \
        sql.find("""COMMIT;""") == -1))
 
-    return 'success'
-
 ###############################################################################
 # Test multi-geometry support
 
@@ -306,8 +300,6 @@ def test_ogr_pgdump_4():
        sql.find("""INSERT INTO "public"."test" DEFAULT VALUES""") == -1 or \
        sql.find("""INSERT INTO "public"."test" ("point_nosrs" , "poly" ) VALUES (GeomFromEWKT('SRID=-1;POINT (1 2)'::TEXT) , GeomFromEWKT('SRID=4326;POLYGON ((0 0 0,0 1 0,1 1 0,1 0 0,0 0 0))'::TEXT) )""") == -1))
 
-    return 'success'
-
 ###############################################################################
 # Test non nullable field support
 
@@ -362,8 +354,6 @@ def test_ogr_pgdump_5():
        sql.find("""ALTER TABLE "public"."test" ADD COLUMN "field_nullable" VARCHAR;""") == -1 or \
        sql.find("""ALTER TABLE "test" ALTER COLUMN "geomfield_not_nullable" SET NOT NULL;""") == -1))
 
-    return 'success'
-
 ###############################################################################
 # Test default values
 
@@ -454,8 +444,6 @@ def test_ogr_pgdump_6():
        sql.find("""ALTER TABLE "public"."test" ADD COLUMN "field_time" time DEFAULT CURRENT_TIME;""") == -1 or \
        sql.find("""b\t456\t4.56\t\\N\t2015/06/30 12:34:56\t2015/06/30 12:34:56\t2015/06/30\t12:34:56""") < 0))
 
-    return 'success'
-
 ###############################################################################
 # Test creating a field with the fid name (PG_USE_COPY=NO)
 
@@ -545,8 +533,6 @@ def test_ogr_pgdump_7():
        sql.find("""INSERT INTO "public"."test" ("str2") VALUES ('second string');""") == -1 or \
        sql.find("""INSERT INTO "public"."test" ("myfid" , "str", "str2") VALUES (12, 'first string', 'second string');""") == -1))
 
-    return 'success'
-
 ###############################################################################
 # Test creating a field with the fid name (PG_USE_COPY=NO)
 
@@ -644,8 +630,6 @@ def test_ogr_pgdump_8():
        sql.find("""INSERT INTO "public"."test" ("str2") VALUES ('second string');""") == -1 or \
        sql.find("""12\tfirst string\tsecond string""") == -1))
 
-    return 'success'
-
 ###############################################################################
 # Test creating a field with the fid name (PG_USE_COPY=NO)
 
@@ -707,8 +691,6 @@ def test_ogr_pgdump_9(pg_use_copy='YES'):
        sql.find("""%s%s""" % (val5, eofield)) >= 0 and \
        sql.find("""%s%s""" % ('a' + val4, eofield)) >= 0)
 
-    return 'success'
-
 
 def test_ogr_pgdump_10():
     return test_ogr_pgdump_9('NO')
@@ -737,8 +719,6 @@ def test_ogr_pgdump_11():
     assert (sql.find('0101000000000000000000F87F000000000000F87F') >= 0 or \
        sql.find('0101000000000000000000F8FF000000000000F8FF') >= 0)
 
-    return 'success'
-
 ###############################################################################
 # Test that GEOMETRY_NAME works even when the geometry column creation is
 # done through CreateGeomField (#6366)
@@ -761,8 +741,6 @@ def test_ogr_pgdump_12():
 
     assert sql.find('another_name') >= 0
 
-    return 'success'
-
 ###############################################################################
 # Test ZM support
 
@@ -827,8 +805,7 @@ def test_ogr_pgdump_13():
         for expected_string in expected_strings:
             assert sql.find(expected_string) >= 0, (geom_type, options, wkt, expected_string)
 
-    return 'success'
-
+    
 ###############################################################################
 # Test description
 
@@ -877,8 +854,6 @@ def test_ogr_pgdump_14():
     gdal.Unlink('/vsimem/ogr_pgdump_14.sql')
     assert sql.find("""COMMENT ON TABLE "public"."ogr_pgdump_14" IS 'baz';""") >= 0
 
-    return 'success'
-
 ###############################################################################
 # NULL vs unset
 
@@ -905,8 +880,6 @@ def test_ogr_pgdump_15():
     assert (sql.find('INSERT INTO "public"."test" ("str") VALUES (NULL)') >= 0 or \
        sql.find('INSERT INTO "public"."test" DEFAULT VALUES') >= 0)
 
-    return 'success'
-
 ###############################################################################
 # Test sequence updating
 
@@ -935,8 +908,6 @@ def test_ogr_pgdump_16():
 
     gdal.SetConfigOption('PG_USE_COPY', None)
 
-    return 'success'
-
 ###############################################################################
 # Cleanup
 
@@ -951,8 +922,7 @@ def test_ogr_pgdump_cleanup():
         os.remove('tmp/ogr_pgdump_4.sql')
     except OSError:
         pass
-    return 'success'
-
+    
 
 gdaltest_list = [
     test_ogr_pgdump_1,
diff --git a/autotest/ogr/ogr_pgeo.py b/autotest/ogr/ogr_pgeo.py
index b23c500b84d2..8a49be276fb1 100755
--- a/autotest/ogr/ogr_pgeo.py
+++ b/autotest/ogr/ogr_pgeo.py
@@ -102,8 +102,6 @@ def ogr_pgeo_1(tested_driver='PGeo', other_driver='MDB'):
     feat_count = lyr.GetFeatureCount()
     assert feat_count == 9418, 'did not get expected feature count'
 
-    return 'success'
-
 
 def ogr_pgeo_mdb_1():
     return ogr_pgeo_1('MDB', 'PGeo')
@@ -139,8 +137,6 @@ def ogr_pgeo_2():
     feat_count = lyr.GetFeatureCount()
     assert feat_count == 9418, 'did not get expected feature count'
 
-    return 'success'
-
 ###############################################################################
 # Test attribute filter
 
@@ -167,8 +163,6 @@ def ogr_pgeo_3():
     feat_count = lyr.GetFeatureCount()
     assert feat_count == 9418, 'did not get expected feature count'
 
-    return 'success'
-
 ###############################################################################
 # Test ExecuteSQL()
 
@@ -191,8 +185,6 @@ def ogr_pgeo_4():
 
     ogrtest.pgeo_ds.ReleaseResultSet(sql_lyr)
 
-    return 'success'
-
 ###############################################################################
 # Test GetFeature()
 
@@ -207,8 +199,7 @@ def ogr_pgeo_5():
         feat.DumpReadable()
         pytest.fail('did not get expected attributes')
 
-    return 'success'
-
+    
 ###############################################################################
 # Run test_ogrsf
 
@@ -225,8 +216,6 @@ def ogr_pgeo_6():
 
     assert ret.find('INFO') != -1 and ret.find('ERROR') == -1
 
-    return 'success'
-
 ###############################################################################
 # Run test_ogrsf with -sql
 
@@ -243,8 +232,6 @@ def ogr_pgeo_7():
 
     assert ret.find('INFO') != -1 and ret.find('ERROR') == -1
 
-    return 'success'
-
 ###############################################################################
 
 
@@ -258,7 +245,6 @@ def ogr_pgeo_cleanup():
         pytest.skip()
 
     ogrtest.pgeo_ds = None
-    return 'success'
 
 
 gdaltest_list_internal = [
@@ -284,8 +270,6 @@ def test_ogr_pgeo_main():
     gdaltest.run_tests([ogr_pgeo_mdb_1])
     gdaltest.run_tests(gdaltest_list_internal)
 
-    return 'success'
-
 
 gdaltest_list = [
     test_ogr_pgeo_main
diff --git a/autotest/ogr/ogr_plscenes.py b/autotest/ogr/ogr_plscenes.py
index 3db20212ac42..4cb0379547ff 100755
--- a/autotest/ogr/ogr_plscenes.py
+++ b/autotest/ogr/ogr_plscenes.py
@@ -47,7 +47,7 @@ def test_ogr_plscenes_init():
     gdaltest.plscenes_drv = ogr.GetDriverByName('PLScenes')
 
     if gdaltest.plscenes_drv is not None:
-        return 'success'
+        return
     pytest.skip()
 
 ###############################################################################
@@ -73,8 +73,6 @@ def test_ogr_plscenes_data_v1_catalog_no_paging():
 
     gdal.Unlink('/vsimem/data_v1/item-types')
 
-    return 'success'
-
 ###############################################################################
 # Test Data V1 API catalog listing with catalog paging
 
@@ -104,8 +102,6 @@ def test_ogr_plscenes_data_v1_catalog_paging():
     gdal.Unlink('/vsimem/data_v1/item-types/page_2')
     gdal.Unlink('/vsimem/data_v1/item-types/PSScene4Band')
 
-    return 'success'
-
 ###############################################################################
 # Test Data V1 API
 
@@ -522,8 +518,7 @@ def test_ogr_plscenes_data_v1_nominal():
     for filename in fl:
         gdal.Unlink(filename)
 
-    return 'success'
-
+    
 ###############################################################################
 # Test robustness to errors in Data V1 API
 
@@ -624,8 +619,6 @@ def test_ogr_plscenes_data_v1_errors():
     gdal.Unlink('/vsimem/data_v1/item-types')
     gdal.Unlink('/vsimem/data_v1/quick-search?_page_size=250&POSTFIELDS={"item_types":["PSScene3Band"],"filter":{"type":"AndFilter","config":[]}}')
 
-    return 'success'
-
 ###############################################################################
 # Test Data V1 API against real server
 
@@ -712,8 +705,6 @@ def test_ogr_plscenes_data_v1_live():
     assert ds is not None
     assert ds.RasterCount != 0
 
-    return 'success'
-
 
 gdaltest_list = [
     test_ogr_plscenes_init,
diff --git a/autotest/ogr/ogr_rec.py b/autotest/ogr/ogr_rec.py
index 042bbadb72dd..a19af7aba6ff 100755
--- a/autotest/ogr/ogr_rec.py
+++ b/autotest/ogr/ogr_rec.py
@@ -48,8 +48,6 @@ def test_ogr_rec_1():
 
     assert ret.find('INFO') != -1 and ret.find('ERROR') == -1
 
-    return 'success'
-
 
 gdaltest_list = [
     test_ogr_rec_1
diff --git a/autotest/ogr/ogr_refcount.py b/autotest/ogr/ogr_refcount.py
index 0fa2f70dddda..7bdbff85bf32 100755
--- a/autotest/ogr/ogr_refcount.py
+++ b/autotest/ogr/ogr_refcount.py
@@ -52,8 +52,7 @@ def test_ogr_refcount_1():
         gdaltest.post_reason('Reference count not 1 on one of datasources.')
         return 'failed'
 
-    return 'success'
-
+    
 ###############################################################################
 # Verify that reopening one of the datasets returns the existing shared handle.
 
@@ -80,8 +79,6 @@ def test_ogr_refcount_2():
 
     gdaltest.ds_3 = ds_3
 
-    return 'success'
-
 ###############################################################################
 # Verify that releasing the datasources has the expected behaviour.
 
@@ -96,12 +93,6 @@ def test_ogr_refcount_3():
 
     gdaltest.ds_1.Release()
 
-    # if ogr.GetOpenDSCount() != 1:
-    #    gdaltest.post_reason( 'Open DS count not back to one.' )
-    #    return 'failed'
-
-    return 'success'
-
 ###############################################################################
 # Verify that we can walk the open datasource list.
 
@@ -117,20 +108,13 @@ def test_ogr_refcount_4():
     except:
         pass
 
-    return 'success'
-
+    
 ###############################################################################
 
 
 def test_ogr_refcount_cleanup():
     gdaltest.ds_2.Release()
 
-    # if ogr.GetOpenDSCount() != 0:
-    #    gdaltest.post_reason( 'Open DS count not back to zero.' )
-    #    return 'failed'
-
-    return 'success'
-
 
 gdaltest_list = [
     test_ogr_refcount_1,
diff --git a/autotest/ogr/ogr_rfc30.py b/autotest/ogr/ogr_rfc30.py
index 38c4b9716333..3bffd94553af 100755
--- a/autotest/ogr/ogr_rfc30.py
+++ b/autotest/ogr/ogr_rfc30.py
@@ -54,8 +54,6 @@ def ogr_rfc30_1_internal(filename, layer_name):
 
     ogr.GetDriverByName('ESRI Shapefile').DeleteDataSource(filename)
 
-    return 'success'
-
 
 def test_ogr_rfc30_1():
 
diff --git a/autotest/ogr/ogr_rfc35_mem.py b/autotest/ogr/ogr_rfc35_mem.py
index 8270f7309186..fea9018410df 100755
--- a/autotest/ogr/ogr_rfc35_mem.py
+++ b/autotest/ogr/ogr_rfc35_mem.py
@@ -81,8 +81,6 @@ def test_ogr_rfc35_mem_1():
     fd.SetWidth(20)
     lyr.CreateField(fd)
 
-    return 'success'
-
 ###############################################################################
 # Test ReorderField()
 
@@ -122,8 +120,7 @@ def CheckFeatures(lyr, field1='foo5', field2='bar10', field3='baz15', field4='ba
         feat = lyr.GetNextFeature()
         i = i + 1
 
-    return 'success'
-
+    
 
 def CheckColumnOrder(lyr, expected_order):
 
@@ -131,8 +128,7 @@ def CheckColumnOrder(lyr, expected_order):
     for i, exp_order in enumerate(expected_order):
         assert lyr_defn.GetFieldDefn(i).GetName() == exp_order
 
-    return 'success'
-
+    
 
 def Check(lyr, expected_order):
 
@@ -140,8 +136,6 @@ def Check(lyr, expected_order):
 
     ret = CheckFeatures(lyr)
 
-    return 'success'
-
 
 def test_ogr_rfc35_mem_2():
 
@@ -186,8 +180,6 @@ def test_ogr_rfc35_mem_2():
     gdal.PopErrorHandler()
     assert ret != 0
 
-    return 'success'
-
 ###############################################################################
 # Test AlterFieldDefn() for change of name and width
 
@@ -229,8 +221,6 @@ def test_ogr_rfc35_mem_3():
 
     ret = CheckFeatures(lyr, field3='baz5')
 
-    return 'success'
-
 ###############################################################################
 # Test AlterFieldDefn() for change of type
 
@@ -321,8 +311,6 @@ def test_ogr_rfc35_mem_4():
 
     ret = CheckFeatures(lyr, field3='baz5')
 
-    return 'success'
-
 ###############################################################################
 # Test DeleteField()
 
@@ -362,8 +350,6 @@ def test_ogr_rfc35_mem_5():
 
     ret = CheckFeatures(lyr, field1=None, field2=None, field3=None, field4=None)
 
-    return 'success'
-
 ###############################################################################
 # Initiate the test file
 
@@ -372,8 +358,6 @@ def test_ogr_rfc35_mem_cleanup():
 
     gdaltest.rfc35_mem_ds = None
 
-    return 'success'
-
 
 gdaltest_list = [
     test_ogr_rfc35_mem_1,
diff --git a/autotest/ogr/ogr_rfc35_mitab.py b/autotest/ogr/ogr_rfc35_mitab.py
index 759d9fa093e4..a488b0850a22 100755
--- a/autotest/ogr/ogr_rfc35_mitab.py
+++ b/autotest/ogr/ogr_rfc35_mitab.py
@@ -56,8 +56,6 @@ def CheckFileSize(src_filename):
     assert statBufSrc.size == statBufDst.size, \
         ('src_size = %d, dst_size = %d', statBufSrc.size, statBufDst.size)
 
-    return 'success'
-
 ###############################################################################
 # Initiate the test file
 
@@ -103,8 +101,6 @@ def test_ogr_rfc35_mitab_1():
     fd.SetWidth(20)
     lyr.CreateField(fd)
 
-    return 'success'
-
 ###############################################################################
 # Test ReorderField()
 
@@ -140,8 +136,7 @@ def CheckFeatures(lyr, field1='foo5', field2='bar10', field3='baz15', field4='ba
         feat = lyr.GetNextFeature()
         i = i + 1
 
-    return 'success'
-
+    
 
 def CheckColumnOrder(lyr, expected_order):
 
@@ -149,8 +144,7 @@ def CheckColumnOrder(lyr, expected_order):
     for i, exp_order in enumerate(expected_order):
         assert lyr_defn.GetFieldDefn(i).GetName() == exp_order
 
-    return 'success'
-
+    
 
 def Check(lyr, expected_order):
 
@@ -165,8 +159,6 @@ def Check(lyr, expected_order):
 
     ret = CheckFeatures(lyr_reopen)
 
-    return 'success'
-
 
 def test_ogr_rfc35_mitab_2():
 
@@ -275,8 +267,7 @@ def test_ogr_rfc35_mitab_2():
         gdaltest.post_reason(ret)
         return ret
 
-    return 'success'
-
+    
 ###############################################################################
 # Test AlterFieldDefn() for change of name and width
 
@@ -329,8 +320,6 @@ def test_ogr_rfc35_mitab_3():
 
     ret = CheckFeatures(lyr, field3='baz5')
 
-    return 'success'
-
 ###############################################################################
 # Test AlterFieldDefn() for change of type
 
@@ -490,8 +479,7 @@ def test_ogr_rfc35_mitab_4():
         gdaltest.post_reason(ret)
         return ret
 
-    return 'success'
-
+    
 ###############################################################################
 # Test DeleteField()
 
@@ -571,8 +559,7 @@ def test_ogr_rfc35_mitab_5():
         gdaltest.post_reason(ret)
         return ret
 
-    return 'success'
-
+    
 ###############################################################################
 # Initiate the test file
 
@@ -581,8 +568,6 @@ def test_ogr_rfc35_mitab_cleanup():
 
     ogr.GetDriverByName('MapInfo File').DeleteDataSource('/vsimem/rfc35_test.tab')
 
-    return 'success'
-
 
 gdaltest_list = [
     test_ogr_rfc35_mitab_1,
diff --git a/autotest/ogr/ogr_rfc35_shape.py b/autotest/ogr/ogr_rfc35_shape.py
index e5b039792872..258bad1ebdae 100755
--- a/autotest/ogr/ogr_rfc35_shape.py
+++ b/autotest/ogr/ogr_rfc35_shape.py
@@ -56,8 +56,6 @@ def CheckFileSize(src_filename):
     assert statBufSrc.size == statBufDst.size, \
         ('src_size = %d, dst_size = %d', statBufSrc.size, statBufDst.size)
 
-    return 'success'
-
 ###############################################################################
 # Initiate the test file
 
@@ -103,8 +101,6 @@ def test_ogr_rfc35_shape_1():
     fd.SetWidth(20)
     lyr.CreateField(fd)
 
-    return 'success'
-
 ###############################################################################
 # Test ReorderField()
 
@@ -140,8 +136,7 @@ def CheckFeatures(lyr, field1='foo5', field2='bar10', field3='baz15', field4='ba
         feat = lyr.GetNextFeature()
         i = i + 1
 
-    return 'success'
-
+    
 
 def CheckColumnOrder(lyr, expected_order):
 
@@ -149,8 +144,7 @@ def CheckColumnOrder(lyr, expected_order):
     for i, exp_order in enumerate(expected_order):
         assert lyr_defn.GetFieldDefn(i).GetName() == exp_order
 
-    return 'success'
-
+    
 
 def Check(lyr, expected_order):
 
@@ -165,8 +159,6 @@ def Check(lyr, expected_order):
 
     ret = CheckFeatures(lyr_reopen)
 
-    return 'success'
-
 
 def test_ogr_rfc35_shape_2():
 
@@ -221,8 +213,6 @@ def test_ogr_rfc35_shape_2():
 
     ret = CheckFeatures(lyr)
 
-    return 'success'
-
 ###############################################################################
 # Test AlterFieldDefn() for change of name and width
 
@@ -269,8 +259,6 @@ def test_ogr_rfc35_shape_3():
 
     ret = CheckFeatures(lyr, field3='baz5')
 
-    return 'success'
-
 ###############################################################################
 # Test AlterFieldDefn() for change of type
 
@@ -403,8 +391,6 @@ def test_ogr_rfc35_shape_4():
 
     ret = CheckFeatures(lyr, field3='baz5')
 
-    return 'success'
-
 ###############################################################################
 # Test DeleteField()
 
@@ -464,8 +450,6 @@ def test_ogr_rfc35_shape_5():
 
     ret = CheckFeatures(lyr, field1=None, field2=None, field3=None, field4=None)
 
-    return 'success'
-
 ###############################################################################
 # Initiate the test file
 
@@ -474,8 +458,6 @@ def test_ogr_rfc35_shape_cleanup():
 
     ogr.GetDriverByName('ESRI Shapefile').DeleteDataSource('/vsimem/rfc35_test.dbf')
 
-    return 'success'
-
 
 gdaltest_list = [
     test_ogr_rfc35_shape_1,
diff --git a/autotest/ogr/ogr_rfc35_sqlite.py b/autotest/ogr/ogr_rfc35_sqlite.py
index 0a66076094a3..beb02251836f 100755
--- a/autotest/ogr/ogr_rfc35_sqlite.py
+++ b/autotest/ogr/ogr_rfc35_sqlite.py
@@ -100,8 +100,6 @@ def test_ogr_rfc35_sqlite_1():
     fd.SetWidth(20)
     lyr.CreateField(fd)
 
-    return 'success'
-
 ###############################################################################
 # Test ReorderField()
 
@@ -136,8 +134,7 @@ def CheckFeatures(lyr, field1='foo5', field2='bar10', field3='baz15', field4='ba
         feat = lyr.GetNextFeature()
         i = i + 1
 
-    return 'success'
-
+    
 
 def CheckColumnOrder(lyr, expected_order):
 
@@ -145,8 +142,7 @@ def CheckColumnOrder(lyr, expected_order):
     for i, exp_order in enumerate(expected_order):
         assert lyr_defn.GetFieldDefn(i).GetName() == exp_order
 
-    return 'success'
-
+    
 
 def Check(lyr, expected_order):
 
@@ -154,8 +150,6 @@ def Check(lyr, expected_order):
 
     ret = CheckFeatures(lyr)
 
-    return 'success'
-
 
 def test_ogr_rfc35_sqlite_2():
 
@@ -204,8 +198,6 @@ def test_ogr_rfc35_sqlite_2():
     gdal.PopErrorHandler()
     assert ret != 0
 
-    return 'success'
-
 ###############################################################################
 # Test AlterFieldDefn() for change of name and width
 
@@ -250,8 +242,6 @@ def test_ogr_rfc35_sqlite_3():
 
     ret = CheckFeatures(lyr, field3='baz5')
 
-    return 'success'
-
 ###############################################################################
 # Test AlterFieldDefn() for change of type
 
@@ -345,8 +335,6 @@ def test_ogr_rfc35_sqlite_4():
 
     ret = CheckFeatures(lyr, field3='baz5')
 
-    return 'success'
-
 ###############################################################################
 # Test DeleteField()
 
@@ -389,8 +377,6 @@ def test_ogr_rfc35_sqlite_5():
 
     ret = CheckFeatures(lyr, field1=None, field2=None, field3=None, field4=None)
 
-    return 'success'
-
 ###############################################################################
 # Initiate the test file
 
@@ -403,8 +389,6 @@ def test_ogr_rfc35_sqlite_cleanup():
     gdaltest.rfc35_sqlite_ds = None
     ogr.GetDriverByName('SQLite').DeleteDataSource(gdaltest.rfc35_sqlite_ds_name)
 
-    return 'success'
-
 
 gdaltest_list = [
     test_ogr_rfc35_sqlite_1,
diff --git a/autotest/ogr/ogr_rfc41.py b/autotest/ogr/ogr_rfc41.py
index f916e40b1e8d..532a5527ff99 100755
--- a/autotest/ogr/ogr_rfc41.py
+++ b/autotest/ogr/ogr_rfc41.py
@@ -84,8 +84,6 @@ def test_ogr_rfc41_1():
 
     gfld_defn = None
 
-    return 'success'
-
 
 ###############################################################################
 # Test OGRFeatureDefn methods related to OGRGeomFieldDefn class
@@ -179,8 +177,6 @@ def test_ogr_rfc41_2():
 
     feature_defn = None
 
-    return 'success'
-
 ###############################################################################
 # Test OGRFeature methods
 
@@ -257,8 +253,6 @@ def test_ogr_rfc41_3():
     feature_default.SetFrom(feature)
     assert feature_default.GetGeomFieldRef(0).ExportToWkt() == 'POLYGON EMPTY'
 
-    return 'success'
-
 ###############################################################################
 # Test OGRLayer methods
 
@@ -331,8 +325,6 @@ def test_ogr_rfc41_4():
     geom = dup_feat.GetGeomFieldRef('another_geom_field')
     assert geom.ExportToWkt() == 'POLYGON ((10 10,10 11,11 11,11 10,10 10))'
 
-    return 'success'
-
 ###############################################################################
 # Test Python field accessors facilities
 
@@ -392,8 +384,6 @@ def test_ogr_rfc41_5():
     assert f['geomfield'].ExportToWkt() == wkt2
     assert f.geomfield.ExportToWkt() == wkt2
 
-    return 'success'
-
 ###############################################################################
 # Test OGRSQL with geometries
 
@@ -679,8 +669,6 @@ def test_ogr_rfc41_6():
 
     ds = None
 
-    return 'success'
-
 ###############################################################################
 # Test crazy OGRSQL
 
@@ -712,8 +700,6 @@ def test_ogr_rfc41_7():
 
     ds = None
 
-    return 'success'
-
 ###############################################################################
 # Test SQLite dialect
 
@@ -780,8 +766,6 @@ def test_ogr_rfc41_8():
     feat = None
     ds.ReleaseResultSet(sql_lyr)
 
-    return 'success'
-
 
 gdaltest_list = [
     test_ogr_rfc41_1,
diff --git a/autotest/ogr/ogr_s57.py b/autotest/ogr/ogr_s57.py
index ee16d6aeece0..ef76dba682e0 100755
--- a/autotest/ogr/ogr_s57.py
+++ b/autotest/ogr/ogr_s57.py
@@ -56,8 +56,6 @@ def test_ogr_s57_1():
     gdaltest.s57_ds = ogr.Open('data/1B5X02NE.000')
     assert gdaltest.s57_ds is not None, 'failed to open test file.'
 
-    return 'success'
-
 ###############################################################################
 # Verify we have the set of expected layers and that some rough information
 # matches our expectations.
@@ -98,8 +96,7 @@ def test_ogr_s57_2():
         assert lyr.GetLayerDefn().GetGeomType() == lyr_info[1], \
             ('Expected %d layer type in layer %s, but got %d.' % (lyr_info[1], lyr_info[0], lyr.GetLayerDefn().GetGeomType()))
 
-    return 'success'
-
+    
 ###############################################################################
 # Check the COALNE feature.
 
@@ -119,8 +116,6 @@ def test_ogr_s57_3():
 
     assert not ogrtest.check_feature_geometry(feat, wkt)
 
-    return 'success'
-
 ###############################################################################
 # Check the M_QUAL feature.
 
@@ -140,8 +135,6 @@ def test_ogr_s57_4():
 
     assert not ogrtest.check_feature_geometry(feat, wkt)
 
-    return 'success'
-
 ###############################################################################
 # Check the SOUNDG feature.
 
@@ -163,8 +156,6 @@ def test_ogr_s57_5():
 
     gdaltest.s57_ds = None
 
-    return 'success'
-
 ###############################################################################
 # Test reading features from dataset with some double byte attributes. (#1526)
 
@@ -180,8 +171,6 @@ def test_ogr_s57_6():
     assert feat.GetField('INFORM') == 'During South winds nautophone is not always heard in S direction from lighthouse' and len(feat.GetField('NINFOM')) >= 1, \
         'FOGSIG: did not get expected attributes'
 
-    return 'success'
-
 ###############################################################################
 # Test handling of a dataset with a multilinestring feature (#2147).
 
@@ -198,8 +187,6 @@ def test_ogr_s57_7():
 
     assert not ogrtest.check_feature_geometry(feat, exp_wkt)
 
-    return 'success'
-
 ###############################################################################
 # Run test_ogrsf
 
@@ -214,8 +201,6 @@ def test_ogr_s57_8():
 
     assert ret.find('INFO') != -1 and ret.find('ERROR') == -1
 
-    return 'success'
-
 ###############################################################################
 # Test S57 to S57 conversion
 
@@ -268,8 +253,6 @@ def test_ogr_s57_9():
 
     gdal.Unlink('tmp/ogr_s57_9.000')
 
-    return 'success'
-
 ###############################################################################
 # Test opening a fake very small S57 file
 
@@ -280,7 +263,6 @@ def test_ogr_s57_10():
     lyr = ds.GetLayer(0)
     f = lyr.GetNextFeature()
     assert f['DSID_EXPP'] == 2
-    return 'success'
 
 ###############################################################################
 # Test opening a fake very small S57 file with ISO8211 record with zero length,
@@ -293,7 +275,6 @@ def test_ogr_s57_11():
     lyr = ds.GetLayer(0)
     f = lyr.GetNextFeature()
     assert f['DSID_EXPP'] == 2
-    return 'success'
 
 ###############################################################################
 # Test decoding of Dutch inland ENCs (#3881).
@@ -320,8 +301,6 @@ def test_ogr_s57_online_1():
 
     ds = None
 
-    return 'success'
-
 ###############################################################################
 # Test with ENC 3.0 TDS - tile without updates.
 
@@ -351,8 +330,6 @@ def test_ogr_s57_online_2():
 
     ds = None
 
-    return 'success'
-
 ###############################################################################
 # Test with ENC 3.0 TDS - tile with updates.
 
@@ -384,8 +361,6 @@ def test_ogr_s57_online_3():
 
     gdaltest.clean_tmp()
 
-    return 'success'
-
 ###############################################################################
 # Test ENC LL2 (#5048)
 
@@ -416,8 +391,7 @@ def test_ogr_s57_online_4():
         if mystr and sys.version_info < (3, 0, 0):
             mystr.decode('UTF-8').encode('UTF-8')
 
-    return 'success'
-
+    
 ###############################################################################
 #  Cleanup
 
@@ -426,8 +400,6 @@ def test_ogr_s57_cleanup():
 
     gdaltest.s57_ds = None
 
-    return 'success'
-
 
 gdaltest_list = [
     test_ogr_s57_1,
diff --git a/autotest/ogr/ogr_sde.py b/autotest/ogr/ogr_sde.py
index e3b32d844019..fea7582ae7d8 100755
--- a/autotest/ogr/ogr_sde.py
+++ b/autotest/ogr/ogr_sde.py
@@ -71,8 +71,6 @@ def test_ogr_sde_1():
     ds = ogr.Open(base, update=1)
     ds.Destroy()
 
-    return 'success'
-
 
 def test_ogr_sde_2():
     "Test creation of a layer"
@@ -112,7 +110,6 @@ def test_ogr_sde_2():
         feat = shp_lyr.GetNextFeature()
 
     dst_feat.Destroy()
-    return 'success'
 
 
 def test_ogr_sde_3():
@@ -128,8 +125,6 @@ def test_ogr_sde_3():
 
     ds.Destroy()
 
-    return 'success'
-
 
 def test_ogr_sde_4():
     "Test basic version creation"
@@ -149,8 +144,6 @@ def test_ogr_sde_4():
     ds = ogr.Open(base, update=1)
     ds.Destroy()
 
-    return 'success'
-
 
 def test_ogr_sde_5():
     "Test versioned editing"
@@ -211,7 +204,6 @@ def test_ogr_sde_5():
         gdaltest.post_reason("datetime handling did not work -- expected '2008/03/19 16:15:00' got '%s' " % df)
     ds4.Destroy()
     del ds4
-    return 'success'
 
 
 def test_ogr_sde_6():
@@ -232,8 +224,7 @@ def test_ogr_sde_6():
     extent = l1.GetExtent(force=1)
     if extent != (478316.0, 481645.0, 4762881.0, 4765611.0):
         gdaltest.post_reason("forced extent did not equal expected value")
-    return 'success'
-
+    
 
 def test_ogr_sde_7():
     "Bad layer test"
@@ -275,8 +266,6 @@ def test_ogr_sde_7():
         gdaltest.post_reason("we got a layer when we should not have")
     ds.Destroy()
 
-    return 'success'
-
 
 def test_ogr_sde_8():
     "Test spatial references"
@@ -319,7 +308,6 @@ def test_ogr_sde_8():
         feat = shp_lyr.GetNextFeature()
 
     dst_feat.Destroy()
-    return 'success'
 
 
 def test_ogr_sde_cleanup():
@@ -330,8 +318,6 @@ def test_ogr_sde_cleanup():
     ds.DeleteLayer('%s.%s' % (sde_user.upper(), 'TPOLY'))
     ds.Destroy()
 
-    return 'success'
-
 
 gdaltest_list = [
     test_ogr_sde_1,
diff --git a/autotest/ogr/ogr_sdts.py b/autotest/ogr/ogr_sdts.py
index 33a050a02fbb..ab5202817d72 100755
--- a/autotest/ogr/ogr_sdts.py
+++ b/autotest/ogr/ogr_sdts.py
@@ -70,8 +70,6 @@ def test_ogr_sdts_1():
 
     gdaltest.sdts_ds = None
 
-    return 'success'
-
 
 ###############################################################################
 #
diff --git a/autotest/ogr/ogr_segukooa.py b/autotest/ogr/ogr_segukooa.py
index 10b3e15b7192..e2f741af3c28 100755
--- a/autotest/ogr/ogr_segukooa.py
+++ b/autotest/ogr/ogr_segukooa.py
@@ -73,8 +73,7 @@ def test_ogr_segp1_points():
         feat.DumpReadable()
         pytest.fail('did not get expected first geom')
 
-    return 'success'
-
+    
 ###############################################################################
 # Read SEGP1 lines
 
@@ -111,8 +110,7 @@ def test_ogr_segp1_lines():
         feat.DumpReadable()
         pytest.fail('did not get expected first geom')
 
-    return 'success'
-
+    
 ###############################################################################
 # Read UKOOA
 
@@ -149,8 +147,7 @@ def test_ogr_ukooa_points():
         feat.DumpReadable()
         pytest.fail('did not get expected first geom')
 
-    return 'success'
-
+    
 ###############################################################################
 # Read UKOOA lines
 
@@ -187,8 +184,7 @@ def test_ogr_ukooa_lines():
         feat.DumpReadable()
         pytest.fail('did not get expected first geom')
 
-    return 'success'
-
+    
 
 gdaltest_list = [
     test_ogr_segp1_points,
diff --git a/autotest/ogr/ogr_segy.py b/autotest/ogr/ogr_segy.py
index 6084d5b26832..7a0cdec7696b 100755
--- a/autotest/ogr/ogr_segy.py
+++ b/autotest/ogr/ogr_segy.py
@@ -82,8 +82,6 @@ def test_ogr_segy_1():
     feat = lyr.GetNextFeature()
     assert feat is None
 
-    return 'success'
-
 ###############################################################################
 # Read ASCII header SEG-Y
 
@@ -97,10 +95,6 @@ def test_ogr_segy_2():
     lyr = ds.GetLayer(0)
     assert lyr.GetGeomType() == ogr.wkbPoint, 'bad layer geometry type'
 
-    # TODO(schwehr): Test the values of fields and data.
-
-    return 'success'
-
 
 gdaltest_list = [
     test_ogr_segy_1,
diff --git a/autotest/ogr/ogr_selafin.py b/autotest/ogr/ogr_selafin.py
index 6d20e1fdd619..4b9ff954aa80 100755
--- a/autotest/ogr/ogr_selafin.py
+++ b/autotest/ogr/ogr_selafin.py
@@ -56,7 +56,7 @@ def test_ogr_selafin_create_ds():
     gdaltest.selafin_ds = selafin_drv.CreateDataSource('tmp/tmp.slf')
 
     if gdaltest.selafin_ds is not None:
-        return 'success'
+        return
     pytest.fail()
 
 ###############################################################################
@@ -85,7 +85,6 @@ def test_ogr_selafin_create_nodes():
     # return
     del gdaltest.selafin_ds
     del layer
-    return 'success'
 
 ###############################################################################
 # Add a set of elements to the datasource
@@ -139,7 +138,6 @@ def test_ogr_selafin_create_elements():
         'wrong value of attribute in element layer'
     # return
     del gdaltest.selafin_ds
-    return 'success'
 
 ###############################################################################
 # Add a field and set its values for point features
@@ -174,7 +172,6 @@ def test_ogr_selafin_set_field():
         'wrong value of attribute in point layer'
     # return
     del gdaltest.selafin_ds
-    return 'success'
 
 
 ###############################################################################
@@ -184,7 +181,6 @@ def test_ogr_selafin_cleanup():
 
     selafin_drv = ogr.GetDriverByName('Selafin')
     selafin_drv.DeleteDataSource('tmp/tmp.slf')
-    return 'success'
 
 
 gdaltest_list = [
diff --git a/autotest/ogr/ogr_shape.py b/autotest/ogr/ogr_shape.py
index c1b5f9ac9329..10c207ab4028 100755
--- a/autotest/ogr/ogr_shape.py
+++ b/autotest/ogr/ogr_shape.py
@@ -52,7 +52,7 @@ def test_ogr_shape_1():
     gdaltest.shape_ds = shape_drv.CreateDataSource('tmp')
 
     if gdaltest.shape_ds is not None:
-        return 'success'
+        return
     pytest.fail()
 
 ###############################################################################
@@ -99,8 +99,6 @@ def test_ogr_shape_2():
     # Destroy required.
     shp_ds.Destroy()
 
-    return 'success'
-
 ###############################################################################
 # Verify that stuff we just wrote is still OK.
 
@@ -129,7 +127,7 @@ def test_ogr_shape_3():
 
     gdaltest.poly_feat = None
 
-    return 'success' if tr else 'fail'
+    assert tr
 
 ###############################################################################
 # Write a feature without a geometry, and verify that it works OK.
@@ -158,8 +156,7 @@ def test_ogr_shape_4():
         print(feat_read.GetGeometryRef().ExportToWkt())
         pytest.fail('Didnt get null geometry as expected.')
 
-    return 'success'
-
+    
 ###############################################################################
 # Test ExecuteSQL() results layers without geometry.
 
@@ -177,7 +174,7 @@ def test_ogr_shape_5():
 
     gdaltest.shape_ds.ReleaseResultSet(sql_lyr)
 
-    return 'success' if tr else 'fail'
+    assert tr
 
 ###############################################################################
 # Test ExecuteSQL() results layers with geometry.
@@ -200,7 +197,7 @@ def test_ogr_shape_6():
 
     gdaltest.shape_ds.ReleaseResultSet(sql_lyr)
 
-    return 'success' if tr else 'fail'
+    assert tr
 
 ###############################################################################
 # Test spatial filtering.
@@ -223,7 +220,7 @@ def test_ogr_shape_7():
 
     gdaltest.shape_lyr.SetSpatialFilter(None)
 
-    return 'success' if tr else 'fail'
+    assert tr
 
 ###############################################################################
 # Create spatial index, and verify we get the same results.
@@ -258,8 +255,6 @@ def test_ogr_shape_8():
 
     assert not os.access('tmp/tpoly.qix', os.F_OK), 'tpoly.qix not deleted'
 
-    return 'success'
-
 ###############################################################################
 # Test that we don't return a polygon if we are "inside" but non-overlapping.
 
@@ -276,9 +271,9 @@ def test_ogr_shape_9():
     gdaltest.shape_lyr.SetSpatialFilterRect(-10, -130, 10, -110)
 
     if ogrtest.have_geos() and gdaltest.shape_lyr.GetFeatureCount() == 0:
-        return 'success'
+        return
     if not ogrtest.have_geos() and gdaltest.shape_lyr.GetFeatureCount() == 1:
-        return 'success'
+        return
     pytest.fail()
 
 ###############################################################################
@@ -295,7 +290,7 @@ def test_ogr_shape_10():
     tr = ogrtest.check_features_against_list(gdaltest.shape_lyr, 'FID',
                                              [0, 4, 8])
 
-    return 'success' if tr else 'fail'
+    assert tr
 
 ###############################################################################
 # Do a mixed indexed attribute and spatial query.
@@ -323,7 +318,7 @@ def test_ogr_shape_11():
     gdaltest.shape_lyr.SetAttributeFilter(None)
     gdaltest.shape_lyr.SetSpatialFilter(None)
 
-    return 'success' if tr else 'fail'
+    assert tr
 
 ###############################################################################
 # Check that multipolygon of asm.shp is properly returned.
@@ -358,8 +353,7 @@ def test_ogr_shape_12():
         assert pnt_count == counts[i], ('Polygon %d has %d points instead of %d.' %
                                   (i, pnt_count, counts[i]))
 
-    return 'success'
-
+    
 ###############################################################################
 # Perform a SetFeature() on a couple features, resetting the size.
 
@@ -397,8 +391,6 @@ def test_ogr_shape_13():
 
     assert gdaltest.shape_lyr.SetFeature(feat) == 0, 'SetFeature() failed.'
 
-    return 'success'
-
 ###############################################################################
 # Verify last changes.
 
@@ -432,8 +424,6 @@ def test_ogr_shape_14():
     assert ogrtest.check_feature_geometry(feat, 'POLYGON ((0 0, 0 60, 100 60, 100 0, 0 0))') == 0, \
         'Geometry update failed, FID 8.'
 
-    return 'success'
-
 ###############################################################################
 # Delete a feature, and verify reduced count.
 
@@ -461,8 +451,6 @@ def test_ogr_shape_15():
 
     assert count == 10, 'Did not get expected FID count.'
 
-    return 'success'
-
 ###############################################################################
 # Repack and verify a few things.
 
@@ -494,8 +482,6 @@ def test_ogr_shape_16():
 
     feat = gdaltest.shape_lyr.GetFeature(9)
 
-    return 'success'
-
 ###############################################################################
 # Test adding a field to the schema of a populated layer.
 
@@ -522,8 +508,6 @@ def test_ogr_shape_16_1():
 
     assert feat.IsFieldNull('NEWFLD'), 'Expected NULL NEWFLD value!'
 
-    return 'success'
-
 ###############################################################################
 # Simple test with point shapefile with no associated .dbf
 
@@ -567,8 +551,6 @@ def test_ogr_shape_17():
     os.remove('tmp/can_caps.shp')
     os.remove('tmp/can_caps.shx')
 
-    return 'success'
-
 ###############################################################################
 # Test reading data/poly.PRJ file with mixed-case file name
 
@@ -593,8 +575,7 @@ def test_ogr_shape_18():
         print('existing = %s' % srs_lyr.ExportToPrettyWkt())
         pytest.fail('Projections differ')
 
-    return 'success'
-
+    
 ###############################################################################
 # Test polygon formation logic - recognising what rings are inner/outer
 # and deciding on polygon vs. multipolygon (#1217)
@@ -612,8 +593,6 @@ def test_ogr_shape_19():
     assert (ogrtest.check_feature_geometry(feat, wkt,
                                       max_error=0.00000001) == 0)
 
-    return 'success'
-
 ###############################################################################
 # Test empty multipoint, multiline, multipolygon.
 # From GDAL 1.6.0, the expected behaviour is to return a feature with a NULL geometry
@@ -648,8 +627,6 @@ def test_ogr_shape_20():
     assert feat is not None
     assert feat.GetGeometryRef() is None
 
-    return 'success'
-
 ###############################################################################
 # Test robutness towards broken/unfriendly shapefiles
 
@@ -684,8 +661,7 @@ def test_ogr_shape_21():
 
         assert feat is None or feat.GetGeometryRef() is None
 
-    return 'success'
-
+    
 
 ###############################################################################
 # Test writing and reading all handled data types
@@ -730,8 +706,6 @@ def test_ogr_shape_22():
        feat_read.GetField('STRING') == 'aString' and \
        feat_read.GetFieldAsString('DATE') == '2005/10/12')
 
-    return 'success'
-
 
 ###############################################################################
 # Function used internally by ogr_shape_23.
@@ -770,14 +744,12 @@ def ogr_shape_23_write_valid_and_invalid(layer_name, wkt, invalid_wkt, wkbType,
     feat_read = read_lyr.GetNextFeature()
 
     if isEmpty and feat_read.GetGeometryRef() is None:
-        return 'success'
+        return
 
     assert (ogrtest.check_feature_geometry(feat_read, ogr.CreateGeometryFromWkt(wkt),
                                       max_error=0.000000001) == 0), \
         feat_read.GetGeometryRef().ExportToWkt()
 
-    return 'success'
-
 
 def ogr_shape_23_write_geom(layer_name, geom, expected_geom, wkbType):
 
@@ -807,14 +779,12 @@ def ogr_shape_23_write_geom(layer_name, geom, expected_geom, wkbType):
 
     if expected_geom is None:
         assert feat_read.GetGeometryRef() is None, feat_read.GetGeometryRef().ExportToWkt()
-        return 'success'
+        return
 
     assert (ogrtest.check_feature_geometry(feat_read, expected_geom,
                                       max_error=0.000000001) == 0), \
         feat_read.GetGeometryRef().ExportToWkt()
 
-    return 'success'
-
 
 ###############################################################################
 # Test writing and reading all handled geometry types
@@ -962,8 +932,6 @@ def test_ogr_shape_23():
     assert ogr_shape_23_write_geom(layer_name, geom, ogr.CreateGeometryFromWkt(geom.ExportToWkt()), ogr.wkbUnknown) == 'success', \
         ('Test for layer %s failed' % layer_name)
 
-    return 'success'
-
 
 ###############################################################################
 # Test reading a polygon whose outer and the inner ring touches at one point (#2589)
@@ -980,8 +948,6 @@ def test_ogr_shape_24():
     assert ogr_shape_23_write_geom(layer_name, geom, ogr.CreateGeometryFromWkt(geom.ExportToWkt()), ogr.wkbUnknown) == 'success', \
         ('Test for layer %s failed' % layer_name)
 
-    return 'success'
-
 ###############################################################################
 # Test reading a multipolygon with one part inside the bounding box of the other
 # part, but not inside it, and sharing the same first point... (#2589)
@@ -1005,8 +971,6 @@ def test_ogr_shape_25():
     gdal.SetConfigOption('OGR_ORGANIZE_POLYGONS', '')
     assert ret == 'success', ('Test for layer %s failed' % layer_name)
 
-    return 'success'
-
 
 ###############################################################################
 # Test a polygon made of one outer ring and two inner rings (special case
@@ -1020,8 +984,6 @@ def test_ogr_shape_26():
     ret = ogr_shape_23_write_geom(layer_name, geom, ogr.CreateGeometryFromWkt(geom.ExportToWkt()), ogr.wkbUnknown)
     assert ret == 'success', ('Test for layer %s failed' % layer_name)
 
-    return 'success'
-
 ###############################################################################
 # Test alternate date formatting (#2746)
 
@@ -1141,8 +1103,6 @@ def test_ogr_shape_28():
 
     ds = None
 
-    return 'success'
-
 ###############################################################################
 # Test that REPACK doesn't change extension case (#3293)
 
@@ -1172,8 +1132,7 @@ def test_ogr_shape_29():
             lst
         assert filename.find('packed') < 0, lst
 
-    return 'success'
-
+    
 ###############################################################################
 # Test that REPACK doesn't change extension case (#3293)
 
@@ -1198,8 +1157,7 @@ def test_ogr_shape_30():
     for filename in lst:
         assert filename in ['.', '..', 'lowercase.shp', 'lowercase.shx', 'lowercase.dbf'], lst
 
-    return 'success'
-
+    
 ###############################################################################
 # Test truncation of long and duplicate field names.
 # FIXME: Empty field names are allowed now!
@@ -1270,7 +1228,6 @@ def test_ogr_shape_31():
             error_occurred = True
 
     assert not error_occurred
-    return 'success'
 
 ###############################################################################
 # Test creating a nearly 4GB (2^32 Bytes) .shp (#3236)
@@ -1332,8 +1289,7 @@ def test_ogr_shape_32():
                                           max_error=0.000000001) == 0), \
             ('Wrong geometry encountered at FID', i, ':', (feat_read.GetGeometryRef().ExportToWkt()))
 
-    return 'success'
-
+    
 ###############################################################################
 # Check that we can detect correct winding order even with polygons with big
 # coordinate offset (#3356)
@@ -1349,8 +1305,6 @@ def test_ogr_shape_33():
                                       max_error=0.000000001) == 0), \
         ('Wrong geometry : %s' % feat_read.GetGeometryRef().ExportToWkt())
 
-    return 'success'
-
 
 ###############################################################################
 # Check that we can write correct winding order even with polygons with big
@@ -1375,8 +1329,6 @@ def test_ogr_shape_34():
                                       max_error=0.000000001) == 0), \
         ('Wrong geometry : %s' % feat_read.GetGeometryRef().ExportToWkt())
 
-    return 'success'
-
 ###############################################################################
 # Check that we can read & write a VSI*L dataset
 
@@ -1404,8 +1356,6 @@ def test_ogr_shape_35():
                                       max_error=0.000000001) == 0), \
         ('Wrong geometry : %s' % feat_read.GetGeometryRef().ExportToWkt())
 
-    return 'success'
-
 ###############################################################################
 # Check that we can read from the root of a .ZIP file
 
@@ -1426,8 +1376,6 @@ def test_ogr_shape_36():
                                       max_error=0.000000001) == 0), \
         ('Wrong geometry : %s' % feat_read.GetGeometryRef().ExportToWkt())
 
-    return 'success'
-
 ###############################################################################
 # Check that we can read from the root of a .tar.gz file
 
@@ -1459,8 +1407,6 @@ def test_ogr_shape_37():
     ds = None
     gdal.Unlink('data/poly.tar.gz.properties')
 
-    return 'success'
-
 ###############################################################################
 # Check that we can read from a .tar file
 
@@ -1489,8 +1435,6 @@ def test_ogr_shape_37_bis():
                                       max_error=0.000000001) == 0), \
         ('Wrong geometry : %s' % feat_read.GetGeometryRef().ExportToWkt())
 
-    return 'success'
-
 ###############################################################################
 # Check that we cannot create duplicated layers
 
@@ -1505,8 +1449,6 @@ def test_ogr_shape_38():
 
     assert lyr is None, 'should not have created a new layer'
 
-    return 'success'
-
 ###############################################################################
 # Check that we can detect correct winding order even with polygons with big
 # coordinate offset (#3356)
@@ -1522,8 +1464,6 @@ def test_ogr_shape_39():
                                       max_error=0.000000001) == 0), \
         ('Wrong geometry : %s' % feat_read.GetGeometryRef().ExportToWkt())
 
-    return 'success'
-
 
 ###############################################################################
 # Make some changes to a shapefile and check the index files. qix, sbn & sbx
@@ -1590,8 +1530,7 @@ def test_ogr_shape_40():
     for f in indexfiles:
         assert not os.path.exists(os.path.join('tmp', f)), ('DeleteFeature(): ' + f)
 
-    return 'success'
-
+    
 ###############################################################################
 # Run test_ogrsf
 
@@ -1614,8 +1553,6 @@ def test_ogr_shape_41():
 
     assert ret.find('INFO') != -1 and ret.find('ERROR') == -1
 
-    return 'success'
-
 ###############################################################################
 # Run test_ogrsf with -sql
 
@@ -1638,8 +1575,6 @@ def test_ogr_shape_42():
 
     assert ret.find('INFO') != -1 and ret.find('ERROR') == -1
 
-    return 'success'
-
 ###############################################################################
 # Test /vsizip//vsicurl/
 
@@ -1667,8 +1602,6 @@ def test_ogr_shape_43():
     f = lyr.GetNextFeature()
     assert f is not None, 'did not get expected feature'
 
-    return 'success'
-
 ###############################################################################
 # Test /vsicurl/ on a directory
 
@@ -1696,8 +1629,6 @@ def ogr_shape_44_DISABLED():
     f = lyr.GetNextFeature()
     assert f is not None, 'did not get expected feature'
 
-    return 'success'
-
 ###############################################################################
 # Test ignored fields works ok on a shapefile.
 
@@ -1745,8 +1676,6 @@ def test_ogr_shape_45():
     shp_layer = None
     shp_ds = None
 
-    return 'success'
-
 ###############################################################################
 # This is a very weird use case : the user creates/open a datasource
 # made of a single shapefile 'foo.shp' and wants to add a new layer
@@ -1769,8 +1698,6 @@ def test_ogr_shape_46():
     assert ds.GetLayerCount() == 1
     ds = None
 
-    return 'success'
-
 ###############################################################################
 # Test that we can open a symlink whose pointed filename isn't a real
 # file, but a filename that OGR recognizes
@@ -1790,8 +1717,6 @@ def test_ogr_shape_47():
 
     os.remove('tmp/poly.zip')
 
-    return 'success'
-
 ###############################################################################
 # Test RECOMPUTE EXTENT ON (#4027)
 
@@ -1860,8 +1785,6 @@ def test_ogr_shape_48():
     ds = None
     ogr.GetDriverByName('ESRI Shapefile').DeleteDataSource('/vsimem/ogr_shape_48.shp')
 
-    return 'success'
-
 ###############################################################################
 # Test that we can read at an LDID/87 file and recode to UTF-8.
 
@@ -1884,8 +1807,6 @@ def test_ogr_shape_49():
 
     assert name == gdaltest.exp_name, 'Did not get expected name, encoding problems?'
 
-    return 'success'
-
 ###############################################################################
 # Test that we can read encoded field names
 
@@ -1917,8 +1838,6 @@ def test_ogr_shape_50():
 
     assert reconv_possible, 'TestCapability(OLCStringsAsUTF8) should return TRUE'
 
-    return 'success'
-
 ###############################################################################
 # Test that we can add a field when there's no dbf file initially
 
@@ -1957,8 +1876,6 @@ def test_ogr_shape_51():
 
     assert value == 'bar', 'did not get expected value'
 
-    return 'success'
-
 ###############################################################################
 # Test fix for #3356
 
@@ -1994,8 +1911,6 @@ def test_ogr_shape_52():
 
     ds = None
 
-    return 'success'
-
 ###############################################################################
 # Test various expected error cases
 
@@ -2233,8 +2148,6 @@ def test_ogr_shape_53():
     lyr = None
     ds = None
 
-    return 'success'
-
 ###############################################################################
 # Test accessing a shape datasource with hundreds of layers (#4306)
 
@@ -2263,8 +2176,7 @@ def ogr_shape_54_test_layer(ds, layer_index):
            feat.GetGeometryRef().ExportToWkt() == 'POINT (%d %d)' % (layer_index, layer_index + 1)), \
             ('failed for layer %d' % layer_index)
 
-    return 'success'
-
+    
 
 def test_ogr_shape_54():
 
@@ -2361,8 +2273,6 @@ def test_ogr_shape_54():
 
     ds = None
 
-    return 'success'
-
 ###############################################################################
 # Test that we cannot add more fields that the maximum allowed
 
@@ -2404,8 +2314,6 @@ def test_ogr_shape_55():
 
     ds = None
 
-    return 'success'
-
 ###############################################################################
 # Test that we cannot add more fields that the maximum allowed record length
 
@@ -2447,8 +2355,6 @@ def test_ogr_shape_56():
 
     ds = None
 
-    return 'success'
-
 ###############################################################################
 # Test that we emit a warning if the truncation of a field value occurs
 
@@ -2481,8 +2387,6 @@ def test_ogr_shape_57():
 
     ds = None
 
-    return 'success'
-
 ###############################################################################
 # Test creating and reading back all geometry types
 
@@ -2533,8 +2437,6 @@ def test_ogr_shape_58():
 
     ds = None
 
-    return 'success'
-
 ###############################################################################
 # Test reading a shape with XYM geometries
 
@@ -2582,8 +2484,6 @@ def test_ogr_shape_59():
     geom = None
     feat = None
 
-    return 'success'
-
 ###############################################################################
 # Test reading a shape with XYZM geometries
 
@@ -2610,8 +2510,6 @@ def test_ogr_shape_60():
     geom = None
     feat = None
 
-    return 'success'
-
 ###############################################################################
 # Test field auto-growing
 
@@ -2662,8 +2560,6 @@ def test_ogr_shape_61():
     val = feat.GetFieldAsInteger(1)
     assert val == 34, 'did not get expected field value'
 
-    return 'success'
-
 ###############################################################################
 # Test field resizing
 
@@ -2721,8 +2617,6 @@ def test_ogr_shape_62():
 
     ds = None
 
-    return 'success'
-
 ###############################################################################
 # More testing of recoding
 
@@ -2773,8 +2667,6 @@ def test_ogr_shape_63():
     gdal.Unlink('/vsimem/ogr_shape_63.dbf')
     gdal.Unlink('/vsimem/ogr_shape_63.cpg')
 
-    return 'success'
-
 ###############################################################################
 # Test creating layers whose name include dot character
 
@@ -2816,8 +2708,6 @@ def test_ogr_shape_64():
     gdal.Unlink('/vsimem/ogr_shape_64/a.c.dbf')
     gdal.Unlink('/vsimem/ogr_shape_64')
 
-    return 'success'
-
 ###############################################################################
 # Test reading a DBF with a 'nan' as a numeric value (#4799)
 
@@ -2833,8 +2723,6 @@ def test_ogr_shape_65():
 
     assert gdaltest.isnan(val)
 
-    return 'success'
-
 ###############################################################################
 # Test failures when creating files and datasources
 
@@ -2868,8 +2756,6 @@ def test_ogr_shape_66():
     assert ds is None
     os.unlink('tmp/foo')
 
-    return 'success'
-
 ###############################################################################
 # Test opening an empty .sbn spatial index
 
@@ -2894,8 +2780,6 @@ def test_ogr_shape_67():
     os.unlink('tmp/emptyshapefilewithsbn.shp')
     os.unlink('tmp/emptyshapefilewithsbn.shx')
 
-    return 'success'
-
 ###############################################################################
 # Test opening a shape datasource with files with mixed case and then REPACK
 
@@ -2972,8 +2856,7 @@ def test_ogr_shape_68():
             assert new_shp_size == ori_shp_size
             assert new_shx_size == ori_shx_size
 
-    return 'success'
-
+    
 ###############################################################################
 # Test fix for #5135 (creating a field of type Integer with a big width)
 
@@ -3000,8 +2883,6 @@ def test_ogr_shape_69():
 
     ogr.GetDriverByName('ESRI Shapefile').DeleteDataSource('/vsimem/ogr_shape_69.shp')
 
-    return 'success'
-
 ###############################################################################
 # Test fix for https://github.com/OSGeo/gdal/pull/17
 # (shapefile opened twice on Windows)
@@ -3041,8 +2922,6 @@ def test_ogr_shape_70():
 
     assert errmsg != ''
 
-    return 'success'
-
 ###############################################################################
 # Test heterogeneous file permissions on .shp and .dbf.
 
@@ -3071,8 +2950,6 @@ def test_ogr_shape_71():
 
     assert ok
 
-    return 'success'
-
 ###############################################################################
 # Test shapefile size limit
 
@@ -3146,8 +3023,6 @@ def test_ogr_shape_72():
     assert feat.GetGeometryRef().ExportToWkt() == 'POINT (7 8)'
     ds = None
 
-    return 'success'
-
 ###############################################################################
 # Test that isClockwise() works correctly on a degenerated ring that passes
 # twice by the same point (#5342)
@@ -3177,8 +3052,6 @@ def test_ogr_shape_73():
         pytest.fail()
     ds = None
 
-    return 'success'
-
 ###############################################################################
 # Test organizePolygons() in OGR_ORGANIZE_POLYGONS=DEFAULT mode when
 # two outer rings are touching, by the first vertex of one.
@@ -3213,8 +3086,6 @@ def test_ogr_shape_74():
         pytest.fail()
     ds = None
 
-    return 'success'
-
 ###############################################################################
 # Test GetFileList()
 
@@ -3238,8 +3109,6 @@ def test_ogr_shape_75():
     assert ds.GetFileList() == ['data/emptyshapefilewithsbn.shp', 'data/emptyshapefilewithsbn.shx', 'data/emptyshapefilewithsbn.sbn', 'data/emptyshapefilewithsbn.sbx']
     ds = None
 
-    return 'success'
-
 ###############################################################################
 # Test opening shapefile whose .prj has a UTF-8 BOM marker
 
@@ -3251,8 +3120,6 @@ def test_ogr_shape_76():
     sr = lyr.GetSpatialRef()
     assert sr.ExportToWkt().find('GEOGCS["NAD83"') == 0
 
-    return 'success'
-
 ###############################################################################
 # Test opening shapefile whose .shx doesn't follow the official shapefile spec (#5608)
 
@@ -3265,8 +3132,6 @@ def test_ogr_shape_77():
     geom = feat.GetGeometryRef()
     assert geom.ExportToWkt() == 'LINESTRING (0 1,2 3)'
 
-    return 'success'
-
 ###############################################################################
 # Test writing integer values through double fields, and cases of truncation or
 # loss of precision (#5625)
@@ -3322,8 +3187,6 @@ def test_ogr_shape_78():
         pytest.fail('did not get expected value')
     ds = None
 
-    return 'success'
-
 ###############################################################################
 # Test adding a field after creating features with 0 field
 
@@ -3354,8 +3217,6 @@ def test_ogr_shape_79():
     assert lyr.GetLayerDefn().GetFieldCount() == 2
     ds = None
 
-    return 'success'
-
 ###############################################################################
 # Test reading a shape with invalid extent (nan values) (#5702)
 
@@ -3367,7 +3228,6 @@ def test_ogr_shape_80():
     extent = lyr.GetExtent()
     assert extent is None or extent[0] == extent[0]
     ds = None
-    return 'success'
 
 ###############################################################################
 # Test REPACK after SetFeature() and geometry change (#XXXX)
@@ -3437,8 +3297,6 @@ def test_ogr_shape_81():
 
     ds = None
 
-    return 'success'
-
 ###############################################################################
 # Test string length more than 254 bytes in UTF-8 encoding cut to 254 bytes
 
@@ -3506,8 +3364,6 @@ def test_ogr_shape_82():
     feat = gdaltest.shape_lyr.GetFeature(1)  # en
     assert feat.cut_field == result_en, 'Wrong en string cut'
 
-    return 'success'
-
 ###############################################################################
 # Test behaviour with curve geometries
 
@@ -3526,8 +3382,6 @@ def test_ogr_shape_83():
     assert f.GetGeometryRef().GetGeometryType() == ogr.wkbPolygon
     ds = None
 
-    return 'success'
-
 ###############################################################################
 # Test SPATIAL_INDEX creation option
 
@@ -3544,8 +3398,6 @@ def test_ogr_shape_84():
 
     assert gdal.VSIStatL('/vsimem/ogr_shape_84.qix') is not None
 
-    return 'success'
-
 ###############################################################################
 # Test Integer64
 
@@ -3615,8 +3467,6 @@ def test_ogr_shape_85():
     assert f.GetField(0) == 123456789012345678
     ds = None
 
-    return 'success'
-
 ###############################################################################
 # Robustness: test reading a non-conformant shapefile that mixes different shape type
 # OGR can not produce such a file (unless patched)
@@ -3631,8 +3481,6 @@ def test_ogr_shape_86():
     ds.ReleaseResultSet(sql_lyr)
     assert val == 6
 
-    return 'success'
-
 ###############################################################################
 # Check we accept opening standalone .dbf files with weird header lengths (#6035)
 
@@ -3644,8 +3492,6 @@ def test_ogr_shape_87():
     f = lyr.GetNextFeature()
     assert f.GetField(0) == 1
 
-    return 'success'
-
 ###############################################################################
 # Test REPACK after SetFeature() and geometry change, without DBF
 
@@ -3672,8 +3518,6 @@ def test_ogr_shape_88():
 
     ds = None
 
-    return 'success'
-
 ###############################################################################
 # Test reading geometry bigger than 10 MB
 
@@ -3719,8 +3563,6 @@ def test_ogr_shape_89():
 
     ds = None
 
-    return 'success'
-
 ###############################################################################
 # Test reading a lot of geometries
 
@@ -3760,8 +3602,6 @@ def test_ogr_shape_90():
 
     ds = None
 
-    return 'success'
-
 ###############################################################################
 # Test reading XYM geometries but with missing M array (#6317)
 
@@ -3778,8 +3618,7 @@ def test_ogr_shape_91():
     for _ in lyr:
         pass
 
-    return 'success'
-
+    
 ###############################################################################
 # Test reading multipoint Z geometries without M
 
@@ -3792,8 +3631,6 @@ def test_ogr_shape_92():
     wkt = f.GetGeometryRef().ExportToIsoWkt()
     assert wkt == 'MULTIPOINT Z ((0 1 2),(3 4 5))'
 
-    return 'success'
-
 ###############################################################################
 # Test reading point Z geometries without M
 
@@ -3806,8 +3643,6 @@ def test_ogr_shape_93():
     wkt = f.GetGeometryRef().ExportToIsoWkt()
     assert wkt == 'POINT Z (1 2 3)'
 
-    return 'success'
-
 ###############################################################################
 # Test SHPT creation option / CreateLayer(geom_type = xxx)
 
@@ -3874,8 +3709,7 @@ def test_ogr_shape_94():
             ds = None
             ogr.GetDriverByName('ESRI Shapefile').DeleteDataSource('/vsimem/ogr_shape_94.shp')
 
-    return 'success'
-
+    
 ###############################################################################
 # Test demoting of ZM to Z when the M values are nodata
 
@@ -3904,8 +3738,6 @@ def test_ogr_shape_95():
     lyr = ds.GetLayer(0)
     assert lyr.GetGeomType() == ogr.wkbPointZM
 
-    return 'success'
-
 ###############################################################################
 # Test updating a XYM shapefile (#6331)
 
@@ -3935,8 +3767,6 @@ def test_ogr_shape_96():
 
     ogr.GetDriverByName('ESRI Shapefile').DeleteDataSource('/vsimem/ogr_shape_96.shp')
 
-    return 'success'
-
 ###############################################################################
 # Test updating a XYZM shapefile
 
@@ -3966,8 +3796,6 @@ def test_ogr_shape_97():
 
     ogr.GetDriverByName('ESRI Shapefile').DeleteDataSource('/vsimem/ogr_shape_97.shp')
 
-    return 'success'
-
 ###############################################################################
 # Test restore function when .shx file is missing
 
@@ -3998,8 +3826,6 @@ def test_ogr_shape_98():
 
     assert ref_shx == got_shx, 'Rebuilt shx is different from original shx.'
 
-    return 'success'
-
 ###############################################################################
 # Import TOWGS84 from EPSG when possible (#6485)
 
@@ -4044,8 +3870,6 @@ def test_ogr_shape_99():
 
     ogr.GetDriverByName('ESRI Shapefile').DeleteDataSource('/vsimem/ogr_shape_99.shp')
 
-    return 'success'
-
 ###############################################################################
 # Test REPACK with both implementations
 
@@ -4132,8 +3956,7 @@ def test_ogr_shape_100():
 
         ogr.GetDriverByName('ESRI Shapefile').DeleteDataSource('tmp/ogr_shape_100.shp')
 
-    return 'success'
-
+    
 ###############################################################################
 # Test auto repack
 
@@ -4226,8 +4049,7 @@ def test_ogr_shape_101():
 
         ogr.GetDriverByName('ESRI Shapefile').DeleteDataSource('/vsimem/ogr_shape_101.shp')
 
-    return 'success'
-
+    
 ###############################################################################
 # Test reading invalid .prj
 
@@ -4244,8 +4066,6 @@ def test_ogr_shape_102():
     ds = None
     ogr.GetDriverByName('ESRI Shapefile').DeleteDataSource('/vsimem/ogr_shape_102.shp')
 
-    return 'success'
-
 ###############################################################################
 # Test handling of EOF character
 
@@ -4425,8 +4245,6 @@ def test_ogr_shape_103():
 
     ogr.GetDriverByName('ESRI Shapefile').DeleteDataSource(filename)
 
-    return 'success'
-
 ###############################################################################
 # Test writing MULTIPATCH
 
@@ -4470,8 +4288,7 @@ def test_ogr_shape_104():
 
         ogr.GetDriverByName('ESRI Shapefile').DeleteDataSource(filename)
 
-    return 'success'
-
+    
 ###############################################################################
 # Test reading .dbf with substantial padding after last field definition.
 
@@ -4484,8 +4301,6 @@ def test_ogr_shape_105():
     f = lyr.GetNextFeature()
     assert f['id'] == '1' and f['foo'] == '2'
 
-    return 'success'
-
 ###############################################################################
 # Test that rewriting the last shape reuses the space it took. (#6787)
 
@@ -4517,8 +4332,6 @@ def test_ogr_shape_106():
 
     shape_drv.DeleteDataSource('/vsimem/ogr_shape_106.shp')
 
-    return 'success'
-
 ###############################################################################
 # Compare to VSI*L file
 
@@ -4633,8 +4446,6 @@ def test_ogr_shape_107():
     shape_drv.DeleteDataSource(copy_filename)
     shape_drv.DeleteDataSource(filename)
 
-    return 'success'
-
 ###############################################################################
 # Test spatial + attribute filter
 
@@ -4648,8 +4459,6 @@ def test_ogr_shape_108():
     lyr.SetAttributeFilter("1=1")
     assert lyr.GetFeatureCount() == expected_fc
 
-    return 'success'
-
 
 ###############################################################################
 # Test writing invalid polygon
@@ -4671,8 +4480,6 @@ def test_ogr_shape_109():
     ds = None
     shape_drv.DeleteDataSource(filename)
 
-    return 'success'
-
 
 ###############################################################################
 
@@ -4693,8 +4500,6 @@ def test_ogr_shape_110_write_invalid_multipatch():
     ds = None
     shape_drv.DeleteDataSource(filename)
 
-    return 'success'
-
 
 ###############################################################################
 
@@ -4722,8 +4527,6 @@ def test_ogr_shape_111_delete_field_no_record():
 
     shape_drv.DeleteDataSource(filename)
 
-    return 'success'
-
 ###############################################################################
 
 
@@ -4765,8 +4568,7 @@ def test_ogr_shape_cleanup():
     if os.path.exists('tmp/ogr_shape_100.shp'):
         shape_drv.DeleteDataSource('tmp/ogr_shape_100.shp')
 
-    return 'success'
-
+    
 
 gdaltest_list = [
     test_ogr_shape_1,
diff --git a/autotest/ogr/ogr_shape_qix.py b/autotest/ogr/ogr_shape_qix.py
index 54b3bbebe328..f75ce36065b5 100755
--- a/autotest/ogr/ogr_shape_qix.py
+++ b/autotest/ogr/ogr_shape_qix.py
@@ -71,8 +71,6 @@ def check_qix_non_overlapping_geoms(lyr):
     fc = lyr.GetFeatureCount()
     assert fc == fc_ref, ('expected %d. got %d' % (fc_ref, fc))
 
-    return 'success'
-
 ###############################################################################
 
 
@@ -214,8 +212,6 @@ def check_qix_random_geoms(lyr):
     fc = lyr.GetFeatureCount()
     assert fc == fc_ref, ('expected %d. got %d' % (fc_ref, fc))
 
-    return 'success'
-
 ###############################################################################
 
 
diff --git a/autotest/ogr/ogr_shape_sbn.py b/autotest/ogr/ogr_shape_sbn.py
index 8e35983e5600..d0c524c58626 100755
--- a/autotest/ogr/ogr_shape_sbn.py
+++ b/autotest/ogr/ogr_shape_sbn.py
@@ -98,8 +98,6 @@ def search_all_features(lyr):
 
     assert fc == fc_ref, ('layer %s: expected %d. got %d' % (lyr.GetName(), fc_ref, fc))
 
-    return 'success'
-
 ###############################################################################
 # Test
 
@@ -126,8 +124,7 @@ def test_ogr_shape_sbn_1():
         lyr = ds.GetLayer(i)
         ret = search_all_features(lyr)
 
-    return 'success'
-
+    
 ###############################################################################
 # Test
 
diff --git a/autotest/ogr/ogr_sosi.py b/autotest/ogr/ogr_sosi.py
index e3173cdc97f0..e1f942a8d003 100755
--- a/autotest/ogr/ogr_sosi.py
+++ b/autotest/ogr/ogr_sosi.py
@@ -55,8 +55,6 @@ def test_ogr_sosi_1():
 
     assert ret.find('INFO') != -1 and ret.find('ERROR') == -1
 
-    return 'success'
-
 
 gdaltest_list = [
     test_ogr_sosi_1]
diff --git a/autotest/ogr/ogr_sql_rfc28.py b/autotest/ogr/ogr_sql_rfc28.py
index 4327ff2b4330..d5339ea4aa5d 100755
--- a/autotest/ogr/ogr_sql_rfc28.py
+++ b/autotest/ogr/ogr_sql_rfc28.py
@@ -54,8 +54,6 @@ def test_ogr_rfc28_1():
     assert count == 3, \
         ('Got wrong count with GetFeatureCount() - %d, expecting 3' % count)
 
-    return 'success'
-
 ###############################################################################
 # Test CONCAT operator in the context of a WHERE clause.
 
@@ -68,7 +66,6 @@ def test_ogr_rfc28_2():
         ('Got wrong count with GetFeatureCount() - %d, expecting 1' % count)
 
     gdaltest.lyr.SetAttributeFilter('')
-    return 'success'
 
 ###############################################################################
 # Test '+' operator on strings.
@@ -82,7 +79,6 @@ def test_ogr_rfc28_3():
         ('Got wrong count with GetFeatureCount() - %d, expecting 1' % count)
 
     gdaltest.lyr.SetAttributeFilter('')
-    return 'success'
 
 ###############################################################################
 # Test '%' operator.
@@ -96,7 +92,6 @@ def test_ogr_rfc28_4():
         ('Got wrong count with GetFeatureCount() - %d, expecting 2' % count)
 
     gdaltest.lyr.SetAttributeFilter('')
-    return 'success'
 
 ###############################################################################
 # Test '%' operator.
@@ -110,7 +105,6 @@ def test_ogr_rfc28_5():
         ('Got wrong count with GetFeatureCount() - %d, expecting 2' % count)
 
     gdaltest.lyr.SetAttributeFilter('')
-    return 'success'
 
 ###############################################################################
 # Test support for a quoted field name.
@@ -124,7 +118,6 @@ def test_ogr_rfc28_6():
         ('Got wrong count with GetFeatureCount() - %d, expecting 1' % count)
 
     gdaltest.lyr.SetAttributeFilter('')
-    return 'success'
 
 ###############################################################################
 # test with distinguished name for field in where clause.
@@ -139,7 +132,6 @@ def test_ogr_rfc28_7_wrong_quoting():
         ('Got wrong count with GetFeatureCount() - %d, expecting 1' % count)
 
     gdaltest.ds.ReleaseResultSet(ql)
-    return 'success'
 
 
 def test_ogr_rfc28_7_good_quoting():
@@ -150,7 +142,6 @@ def test_ogr_rfc28_7_good_quoting():
         ('Got wrong count with GetFeatureCount() - %d, expecting 1' % count)
 
     gdaltest.ds.ReleaseResultSet(ql)
-    return 'success'
 
 ###############################################################################
 # test with distinguished name for field in target columns.
@@ -169,7 +160,7 @@ def test_ogr_rfc28_8_wrong_quoting():
 
     gdaltest.ds.ReleaseResultSet(ql)
 
-    return 'success' if tr else 'fail'
+    assert tr
 
 
 def test_ogr_rfc28_8_good_quoting():
@@ -184,7 +175,7 @@ def test_ogr_rfc28_8_good_quoting():
 
     gdaltest.ds.ReleaseResultSet(ql)
 
-    return 'success' if tr else 'fail'
+    assert tr
 
 ###############################################################################
 # Test with quoted funky (non-identifier) name.
@@ -201,7 +192,7 @@ def test_ogr_rfc28_9():
 
     expect = ['8902']
     tr = ogrtest.check_features_against_list(lyr, 'PRIME_MERIDIAN_CODE', expect)
-    return 'success' if tr else 'fail'
+    assert tr
 
 # TODO: unparse quoting?
 ###############################################################################
@@ -220,7 +211,7 @@ def test_ogr_rfc28_10():
     tr = ogrtest.check_features_against_list(lyr, 'PRIME_MERIDIAN_CODE', expect)
     ds.ReleaseResultSet(lyr)
 
-    return 'success' if tr else 'fail'
+    assert tr
 
 ###############################################################################
 # test quoted funky names in output columns list.
@@ -238,7 +229,7 @@ def test_ogr_rfc28_11():
     tr = ogrtest.check_features_against_list(lyr, 'Funky @Name', expect)
     ds.ReleaseResultSet(lyr)
 
-    return 'success' if tr else 'fail'
+    assert tr
 
 ###############################################################################
 # test selecting fixed string fields.
@@ -266,7 +257,7 @@ def test_ogr_rfc28_12():
 
     gdaltest.ds.ReleaseResultSet(lyr)
 
-    return 'success' if tr else 'fail'
+    assert tr
 
 ###############################################################################
 # Test SUBSTR operator in the context of a WHERE clause.
@@ -280,7 +271,6 @@ def test_ogr_rfc28_13():
         ('Got wrong count with GetFeatureCount() - %d, expecting 1' % count)
 
     gdaltest.lyr.SetAttributeFilter('')
-    return 'success'
 
 ###############################################################################
 # test selecting fixed string fields.
@@ -294,7 +284,7 @@ def test_ogr_rfc28_14():
 
     gdaltest.ds.ReleaseResultSet(lyr)
 
-    return 'success' if tr else 'fail'
+    assert tr
 
 ###############################################################################
 # Test CONCAT with more than two arguments.
@@ -308,7 +298,7 @@ def test_ogr_rfc28_15():
 
     gdaltest.ds.ReleaseResultSet(lyr)
 
-    return 'success' if tr else 'fail'
+    assert tr
 
 ###############################################################################
 # Test parse support for negative numbers (#3724)
@@ -338,7 +328,7 @@ def test_ogr_rfc28_16():
 
     gdaltest.ds.ReleaseResultSet(lyr)
 
-    return 'success' if tr else 'fail'
+    assert tr
 
 ###############################################################################
 # Test evaluation of division - had a problem with type conversion.
@@ -364,7 +354,7 @@ def test_ogr_rfc28_17():
 
     gdaltest.ds.ReleaseResultSet(lyr)
 
-    return 'success' if tr else 'fail'
+    assert tr
 
 
 ###############################################################################
@@ -382,7 +372,7 @@ def test_ogr_rfc28_18():
 
     gdaltest.ds.ReleaseResultSet(lyr)
 
-    return 'success' if tr else 'fail'
+    assert tr
 
 
 ###############################################################################
@@ -399,8 +389,6 @@ def test_ogr_rfc28_19():
     assert count == 8, \
         ('Got wrong count with GetFeatureCount() - %d, expecting 8' % count)
 
-    return 'success'
-
 
 ###############################################################################
 # Verify arithmetic operator precedence and unary minus
@@ -422,8 +410,6 @@ def test_ogr_rfc28_20():
 
     ds = None
 
-    return 'success'
-
 ###############################################################################
 # Verify that BETWEEN works
 
@@ -445,8 +431,6 @@ def test_ogr_rfc28_21():
     assert count_between == count_ge_and_le, \
         ('Got wrong count with GetFeatureCount() - %d, expecting %d' % (count_between, count_ge_and_le))
 
-    return 'success'
-
 ###############################################################################
 # Verify that NOT BETWEEN works
 
@@ -468,8 +452,6 @@ def test_ogr_rfc28_22():
     assert count_not_between == count_not_ge_and_le, \
         ('Got wrong count with GetFeatureCount() - %d, expecting %d' % (count_not_between, count_not_ge_and_le))
 
-    return 'success'
-
 ###############################################################################
 # Verify that NOT LIKE works
 
@@ -491,8 +473,6 @@ def test_ogr_rfc28_23():
     assert count_not_like1 == count_not_like2, \
         ('Got wrong count with GetFeatureCount() - %d, expecting %d' % (count_not_like1, count_not_like2))
 
-    return 'success'
-
 ###############################################################################
 # Verify that NULL works
 
@@ -525,8 +505,6 @@ def test_ogr_rfc28_24():
     assert count == 10, \
         ('Got wrong count with GetFeatureCount() - %d, expecting %d' % (count, 10))
 
-    return 'success'
-
 ###############################################################################
 # Verify that LIKE pattern ESCAPE escape_char works
 
@@ -542,8 +520,6 @@ def test_ogr_rfc28_25():
     assert count == 1, \
         ('Got wrong count with GetFeatureCount() - %d, expecting 1' % count)
 
-    return 'success'
-
 ###############################################################################
 # Test SUBSTR with negative offsets
 
@@ -556,7 +532,7 @@ def test_ogr_rfc28_26():
 
     gdaltest.ds.ReleaseResultSet(lyr)
 
-    return 'success' if tr else 'fail'
+    assert tr
 
 ###############################################################################
 # Test that we correctly let floating point values as floating point, and not as integer (#4634)"
@@ -570,7 +546,7 @@ def test_ogr_rfc28_27():
 
     gdaltest.ds.ReleaseResultSet(lyr)
 
-    return 'success' if count == 10 else 'fail'
+    assert count == 10
 
 ###############################################################################
 # Extensive test of the evaluation of arithmetic and logical operators
@@ -585,8 +561,6 @@ def ogr_rfc28_28_test(formula, expected_val):
     assert got == expected_val, \
         ('bad result for %s : %s' % (formula, str(expected_val)))
 
-    return 'success'
-
 
 def test_ogr_rfc28_28():
 
@@ -667,8 +641,7 @@ def test_ogr_rfc28_28():
         if ret == 'fail':
             return ret
 
-    return 'success'
-
+    
 ###############################################################################
 # Test behaviour of binary operations when one operand is a NULL value
 
@@ -681,7 +654,7 @@ def test_ogr_rfc28_29():
 
     gdaltest.ds.ReleaseResultSet(lyr)
 
-    return 'success' if count == 0 else 'fail'
+    assert count == 0
 
 ###############################################################################
 # Test behaviour of binary operations on strings when one operand is a NULL value
@@ -695,7 +668,7 @@ def test_ogr_rfc28_30():
 
     gdaltest.ds.ReleaseResultSet(lyr)
 
-    return 'success' if count == 0 else 'fail'
+    assert count == 0
 
 ###############################################################################
 # Test UNION ALL
@@ -709,7 +682,7 @@ def test_ogr_rfc28_31():
 
     gdaltest.ds.ReleaseResultSet(lyr)
 
-    return 'success' if count != 6 + 7 else 'fail'
+    assert count != 6 + 7
 
 ###############################################################################
 # Test UNION ALL with parenthesis
@@ -723,7 +696,7 @@ def test_ogr_rfc28_32():
 
     gdaltest.ds.ReleaseResultSet(lyr)
 
-    return 'success' if count != 6 + 7 else 'fail'
+    assert count != 6 + 7
 
 ###############################################################################
 # Test lack of end-of-string character
@@ -735,7 +708,7 @@ def test_ogr_rfc28_33():
     lyr = gdaltest.ds.ExecuteSQL("select * from idlink where name='foo")
     gdal.PopErrorHandler()
 
-    return 'success' if lyr is None else 'fail'
+    assert lyr is None
 
 ###############################################################################
 # Test wildcard expansion of an unknown table.
@@ -749,7 +722,7 @@ def test_ogr_rfc28_34():
     assert (gdal.GetLastErrorMsg().find(
             'Table foo not recognised from foo.* definition') == 0)
 
-    return 'success' if lyr is None else 'fail'
+    assert lyr is None
 
 ###############################################################################
 # Test selecting more than one distinct
@@ -762,7 +735,7 @@ def test_ogr_rfc28_35():
     gdal.PopErrorHandler()
     assert gdal.GetLastErrorMsg().find('SQL Expression Parsing Error') == 0
 
-    return 'success' if lyr is None else 'fail'
+    assert lyr is None
 
 ###############################################################################
 # Test selecting more than one distinct
@@ -775,7 +748,7 @@ def test_ogr_rfc28_35_bis():
     gdal.PopErrorHandler()
     assert gdal.GetLastErrorMsg().find('SELECT DISTINCT not supported on multiple columns') == 0
 
-    return 'success' if lyr is None else 'fail'
+    assert lyr is None
 
 ###############################################################################
 # Test selecting more than one distinct
@@ -788,7 +761,7 @@ def test_ogr_rfc28_35_ter():
     gdal.PopErrorHandler()
     assert gdal.GetLastErrorMsg().find('SELECT DISTINCT not supported on multiple columns') == 0
 
-    return 'success' if lyr is None else 'fail'
+    assert lyr is None
 
 ###############################################################################
 # Test ORDER BY a DISTINCT list by more than one key
@@ -804,7 +777,6 @@ def test_ogr_rfc28_36():
     gdal.PopErrorHandler()
     assert gdal.GetLastErrorMsg().find("Can't ORDER BY a DISTINCT list by more than one key") == 0
     gdaltest.ds.ReleaseResultSet(lyr)
-    return 'success'
 
 ###############################################################################
 # Test different fields for ORDER BY and DISTINCT
@@ -820,7 +792,6 @@ def test_ogr_rfc28_37():
     gdal.PopErrorHandler()
     assert gdal.GetLastErrorMsg().find("Only selected DISTINCT field can be used for ORDER BY") == 0
     gdaltest.ds.ReleaseResultSet(lyr)
-    return 'success'
 
 ###############################################################################
 # Test invalid SUBSTR
@@ -842,8 +813,6 @@ def test_ogr_rfc28_38():
     assert gdal.GetLastErrorMsg().find("Wrong argument type for SUBSTR()") == 0
     assert lyr is None
 
-    return 'success'
-
 ###############################################################################
 # Test COUNT() on a 0-row result
 
@@ -856,7 +825,7 @@ def test_ogr_rfc28_39():
 
     gdaltest.ds.ReleaseResultSet(lyr)
 
-    return 'success' if tr else 'fail'
+    assert tr
 
 ###############################################################################
 # Test MIN(), MAX() and AVG() on a date (#5333)
@@ -888,7 +857,6 @@ def test_ogr_rfc28_40():
     assert tr2
 
     assert tr3
-    return 'success'
 
 
 ###############################################################################
@@ -916,8 +884,6 @@ def test_ogr_rfc28_41():
 
     ds = None
 
-    return 'success'
-
 ###############################################################################
 # Test boolean and int16 support
 
@@ -972,8 +938,6 @@ def test_ogr_rfc28_42():
     assert f.GetField('SUM_b') == 1
     gdaltest.ds.ReleaseResultSet(lyr)
 
-    return 'success'
-
 ###############################################################################
 # Test integer64 support
 
@@ -1023,7 +987,6 @@ def test_ogr_rfc28_43():
         f.DumpReadable()
         pytest.fail()
     gdaltest.ds.ReleaseResultSet(lyr)
-    return 'success'
 
 ###############################################################################
 # Test crazy quoting of table and fields
@@ -1091,8 +1054,6 @@ def test_ogr_rfc28_44():
     assert f is not None
     gdaltest.ds.ReleaseResultSet(lyr)
 
-    return 'success'
-
 ###############################################################################
 # Test 'FROM table_name AS alias'
 
@@ -1106,7 +1067,6 @@ def test_ogr_rfc28_45():
         ('Got wrong count with GetFeatureCount() - %d, expecting 1' % count)
 
     gdaltest.ds.ReleaseResultSet(ql)
-    return 'success'
 
 ###############################################################################
 # Test fid special column and 64 bit
@@ -1162,8 +1122,6 @@ def test_ogr_rfc28_46():
 
     ds = None
 
-    return 'success'
-
 ###############################################################################
 # Test LIMIT and OFFSET
 
@@ -1255,8 +1213,6 @@ def test_ogr_rfc28_47():
     gdaltest.ds.ReleaseResultSet(lyr)
     assert tr
 
-    return 'success'
-
 ###############################################################################
 # Test date/datetime comparisons (#6810)
 
@@ -1331,8 +1287,6 @@ def test_ogr_rfc28_48():
     lyr.SetAttributeFilter("dt BETWEEN dt AND '2017/02/17 11:06:33.999'")
     assert lyr.GetFeatureCount() == 0
 
-    return 'success'
-
 
 ###############################################################################
 def test_ogr_rfc28_int_overflows():
@@ -1380,8 +1334,7 @@ def test_ogr_rfc28_int_overflows():
         assert f.GetField(0) == res, (sql, res, f.GetField(0))
         ds.ReleaseResultSet(sql_lyr)
 
-    return 'success'
-
+    
 
 ###############################################################################
 
@@ -1390,8 +1343,6 @@ def test_ogr_rfc28_cleanup():
     gdaltest.lyr = None
     gdaltest.ds = None
 
-    return 'success'
-
 
 gdaltest_list = [
     test_ogr_rfc28_1,
diff --git a/autotest/ogr/ogr_sql_sqlite.py b/autotest/ogr/ogr_sql_sqlite.py
index 820000058c38..ec82039615f6 100755
--- a/autotest/ogr/ogr_sql_sqlite.py
+++ b/autotest/ogr/ogr_sql_sqlite.py
@@ -269,8 +269,6 @@ def test_ogr_sql_sqlite_1():
 
     ds = None
 
-    return 'success'
-
 ###############################################################################
 # Tests that involve geometry  (but without needing Spatialite)
 
@@ -377,8 +375,6 @@ def test_ogr_sql_sqlite_2():
 
     ds.ReleaseResultSet(sql_lyr)
 
-    return 'success'
-
 ###############################################################################
 # Test that involves a join
 
@@ -408,8 +404,6 @@ def test_ogr_sql_sqlite_3():
 
     ds = None
 
-    return 'success'
-
 ###############################################################################
 # Test that involves a self-join (to check that we can open twice the same table)
 
@@ -429,8 +423,6 @@ def test_ogr_sql_sqlite_4():
 
     ds = None
 
-    return 'success'
-
 ###############################################################################
 # Test that involves spatialite
 
@@ -465,8 +457,6 @@ def test_ogr_sql_sqlite_5():
 
     assert count == 1
 
-    return 'success'
-
 ###############################################################################
 # If Spatialite available, retry some tests without it, to check that
 # we are fully compatible with regular SQLite
@@ -490,8 +480,6 @@ def test_ogr_sql_sqlite_6():
 
     gdal.SetConfigOption('OGR_SQLITE_DIALECT_USE_SPATIALITE', None)
 
-    return 'success'
-
 ###############################################################################
 # Test if there's a text column called GEOMETRY already in the table
 
@@ -539,8 +527,6 @@ def test_ogr_sql_sqlite_7():
     feat = None
     ds.ReleaseResultSet(sql_lyr)
 
-    return 'success'
-
 ###############################################################################
 # Test join with an external datasource
 
@@ -563,7 +549,7 @@ def test_ogr_sql_sqlite_8():
 
     ds.ReleaseResultSet(sql_lyr)
 
-    return 'success' if tr else 'fail'
+    assert tr
 
 ###############################################################################
 # Check parsing of sub-selects
@@ -587,8 +573,7 @@ def test_ogr_sql_sqlite_9():
     if cnt != 7:
         return' fail'
 
-    return 'success'
-
+    
 ###############################################################################
 # Test optimized count(*)
 
@@ -611,8 +596,7 @@ def test_ogr_sql_sqlite_10():
     if cnt != 10:
         return' fail'
 
-    return 'success'
-
+    
 ###############################################################################
 # Test correct parsing of litterals
 
@@ -641,8 +625,7 @@ def test_ogr_sql_sqlite_11():
     if cnt != 1:
         return' fail'
 
-    return 'success'
-
+    
 ###############################################################################
 # Test various error conditions
 
@@ -674,8 +657,6 @@ def test_ogr_sql_sqlite_12():
 
     ds = None
 
-    return 'success'
-
 ###############################################################################
 # Test ogr_layer_Extent(), ogr_layer_SRID() and ogr_layer_GeometryType()
 
@@ -802,8 +783,6 @@ def test_ogr_sql_sqlite_13():
 
     ds = None
 
-    return 'success'
-
 ###############################################################################
 #
 
@@ -868,8 +847,6 @@ def ogr_sql_sqlite_14_and_15(sql):
 
     assert (got_one and got_two)
 
-    return 'success'
-
 ###############################################################################
 # Test 'idx_layername_geometryname' spatial index recognition
 
@@ -1192,8 +1169,7 @@ def test_ogr_sql_sqlite_start_webserver():
     if ogrtest.webserver_port == 0:
         pytest.skip()
 
-    return 'success'
-
+    
 ###############################################################################
 # Test ogr_geocode()
 
@@ -1562,8 +1538,6 @@ def test_ogr_sql_sqlite_24():
         pytest.fail()
     ds.ReleaseResultSet(sql_lyr)
 
-    return 'success'
-
 ###############################################################################
 
 
@@ -1574,8 +1548,6 @@ def test_ogr_sql_sqlite_stop_webserver():
 
     webserver.server_stop(ogrtest.webserver_process, ogrtest.webserver_port)
 
-    return 'success'
-
 ###############################################################################
 # If Spatialite is NOT available, test some of the minimal spatial functions
 # implemented. Test it also if spatialite is available, so we have a cross
@@ -1642,8 +1614,6 @@ def test_ogr_sql_sqlite_25():
 
     assert val2_sql is None
 
-    return 'success'
-
 
 def test_ogr_sql_sqlite_26():
 
@@ -1766,8 +1736,7 @@ def test_ogr_sql_sqlite_26():
         ds.ReleaseResultSet(sql_lyr)
         assert geom_sql is None, ('fail with %s' % op_str)
 
-    return 'success'
-
+    
 
 ###############################################################################
 # Test MIN(), MAX() on a date
@@ -1799,8 +1768,6 @@ def test_ogr_sql_sqlite_27():
 
     assert tr2
 
-    return 'success'
-
 ###############################################################################
 # Test hstore_get_value()
 
@@ -1841,8 +1808,7 @@ def test_ogr_sql_sqlite_28():
             pytest.fail(sql)
         ds.ReleaseResultSet(sql_lyr)
 
-    return 'success'
-
+    
 ###############################################################################
 # Test compat with curve geometries
 
@@ -1869,8 +1835,6 @@ def test_ogr_sql_sqlite_29():
 
     assert got_wkt == 'CIRCULARSTRING (0 0,1 0,0 0)'
 
-    return 'success'
-
 ###############################################################################
 # Test compat with M geometries
 
@@ -1911,8 +1875,6 @@ def test_ogr_sql_sqlite_30():
 
     assert got_wkt == 'LINESTRING ZM (1 2 3 4)'
 
-    return 'success'
-
 ###############################################################################
 # Test filtering complex field name
 
@@ -1937,8 +1899,6 @@ def test_ogr_sql_sqlite_31():
 
     assert value == 25
 
-    return 'success'
-
 
 gdaltest_list = [
     test_ogr_sql_sqlite_1,
diff --git a/autotest/ogr/ogr_sql_test.py b/autotest/ogr/ogr_sql_test.py
index ce273e945daa..4598845c51bf 100755
--- a/autotest/ogr/ogr_sql_test.py
+++ b/autotest/ogr/ogr_sql_test.py
@@ -55,8 +55,6 @@ def test_ogr_sql_1():
     assert count == 10, \
         ('Got wrong count with GetFeatureCount() - %d, expecting 10' % count)
 
-    return 'success'
-
 ###############################################################################
 # Test DISTINCT handling
 
@@ -71,7 +69,7 @@ def test_ogr_sql_2():
 
     gdaltest.ds.ReleaseResultSet(sql_lyr)
 
-    return 'success' if tr else 'fail'
+    assert tr
 
 ###############################################################################
 # Test ORDER BY handling
@@ -87,7 +85,7 @@ def test_ogr_sql_3():
 
     gdaltest.ds.ReleaseResultSet(sql_lyr)
 
-    return 'success' if tr else 'fail'
+    assert tr
 
 ###############################################################################
 # Test ORDER BY DESC handling
@@ -103,7 +101,7 @@ def test_ogr_sql_3_desc():
 
     gdaltest.ds.ReleaseResultSet(sql_lyr)
 
-    return 'success' if tr else 'fail'
+    assert tr
 
 ###############################################################################
 # Test DISTINCT and ORDER BY on strings.
@@ -119,7 +117,7 @@ def test_ogr_sql_4():
 
     gdaltest.ds.ReleaseResultSet(sql_lyr)
 
-    return 'success' if tr else 'fail'
+    assert tr
 
 ###############################################################################
 # Test column functions.
@@ -146,8 +144,6 @@ def test_ogr_sql_5():
         pytest.fail()
     gdaltest.ds.ReleaseResultSet(sql_lyr)
 
-    return 'success'
-
 ###############################################################################
 # Test simple COUNT() function.
 
@@ -162,7 +158,7 @@ def test_ogr_sql_6():
 
     gdaltest.ds.ReleaseResultSet(sql_lyr)
 
-    return 'success' if tr else 'fail'
+    assert tr
 
 ###############################################################################
 # Verify that selecting the FID works properly.
@@ -178,7 +174,7 @@ def test_ogr_sql_7():
 
     gdaltest.ds.ReleaseResultSet(sql_lyr)
 
-    return 'success' if tr else 'fail'
+    assert tr
 
 ###############################################################################
 # Verify that wildcard expansion works properly.
@@ -194,7 +190,7 @@ def test_ogr_sql_8():
 
     gdaltest.ds.ReleaseResultSet(sql_lyr)
 
-    return 'success' if tr else 'fail'
+    assert tr
 
 ###############################################################################
 # Verify that quoted table names work.
@@ -210,7 +206,7 @@ def test_ogr_sql_9():
 
     gdaltest.ds.ReleaseResultSet(sql_lyr)
 
-    return 'success' if tr else 'fail'
+    assert tr
 
 ###############################################################################
 # Test the ILIKE operator.
@@ -226,7 +222,7 @@ def test_ogr_sql_10():
 
     gdaltest.ds.ReleaseResultSet(sql_lyr)
 
-    return 'success' if tr else 'fail'
+    assert tr
 
 ###############################################################################
 # Test MAX() on empty dataset.
@@ -242,7 +238,7 @@ def test_ogr_sql_11():
 
     gdaltest.ds.ReleaseResultSet(sql_lyr)
 
-    return 'success' if tr else 'fail'
+    assert tr
 
 ###############################################################################
 # Test DISTINCT on empty dataset.
@@ -258,7 +254,7 @@ def test_ogr_sql_12():
 
     gdaltest.ds.ReleaseResultSet(sql_lyr)
 
-    return 'success' if tr else 'fail'
+    assert tr
 
 ###############################################################################
 # Verify selection of, and on ogr_geometry.
@@ -275,7 +271,7 @@ def test_ogr_sql_13():
 
     gdaltest.ds.ReleaseResultSet(sql_lyr)
 
-    return 'success' if tr else 'fail'
+    assert tr
 
 ###############################################################################
 # Verify selection of, and on ogr_style and ogr_geom_wkt.
@@ -295,7 +291,7 @@ def test_ogr_sql_14():
     ds.ReleaseResultSet(sql_lyr)
     ds = None
 
-    return 'success' if tr else 'fail'
+    assert tr
 
 ###############################################################################
 # Verify that selecting with filtering by FID works properly.
@@ -311,7 +307,7 @@ def test_ogr_sql_15():
 
     gdaltest.ds.ReleaseResultSet(sql_lyr)
 
-    return 'success' if tr else 'fail'
+    assert tr
 
 ###############################################################################
 
@@ -328,7 +324,7 @@ def test_ogr_sql_16():
     ds.ReleaseResultSet(sql_lyr)
     ds = None
 
-    return 'success' if tr else 'fail'
+    assert tr
 
 
 ###############################################################################
@@ -374,7 +370,7 @@ def test_ogr_sql_17():
     ds.ReleaseResultSet(sql_lyr)
     ds = None
 
-    return 'success' if tr else 'fail'
+    assert tr
 
 
 ###############################################################################
@@ -414,8 +410,6 @@ def test_ogr_sql_18():
     ds.ReleaseResultSet(sql_lyr)
     ds = None
 
-    return 'success'
-
 ###############################################################################
 # Test empty request string
 
@@ -428,8 +422,6 @@ def test_ogr_sql_19():
 
     assert sql_lyr is None
 
-    return 'success'
-
 ###############################################################################
 # Test query "SELECT * from my_layer" on layer without any field (#2788)
 
@@ -452,8 +444,6 @@ def test_ogr_sql_20():
     mem_ds.ReleaseResultSet(sql_lyr)
     mem_ds = None
 
-    return 'success'
-
 ###############################################################################
 # Test query "SELECT *, fid from my_layer" on layer without any field (#2788)
 
@@ -469,8 +459,6 @@ def test_ogr_sql_21():
     mem_ds.ReleaseResultSet(sql_lyr)
     mem_ds = None
 
-    return 'success'
-
 ###############################################################################
 # Test multiple expansion of '*' as in "SELECT *, fid, *, my_layer.* from my_layer" (#2788)
 
@@ -494,8 +482,6 @@ def test_ogr_sql_22():
     mem_ds.ReleaseResultSet(sql_lyr)
     mem_ds = None
 
-    return 'success'
-
 ###############################################################################
 # Test query "SELECT DISTINCT test from my_layer" (#2788)
 
@@ -521,8 +507,6 @@ def test_ogr_sql_23():
     mem_ds.ReleaseResultSet(sql_lyr)
     mem_ds = None
 
-    return 'success'
-
 ###############################################################################
 # Test that style strings get carried with OGR SQL SELECT results. (#2808)
 
@@ -575,8 +559,6 @@ def test_ogr_sql_25():
 
     mem_ds = None
 
-    return 'success'
-
 ###############################################################################
 # Test query 'SELECT 'literal_value' AS column_name FROM a_table'
 #
@@ -599,8 +581,6 @@ def test_ogr_sql_26():
 
     mem_ds = None
 
-    return 'success'
-
 ###############################################################################
 
 ###############################################################################
@@ -623,7 +603,7 @@ def test_ogr_sql_27():
     ds.ReleaseResultSet(sql_lyr)
     ds = None
 
-    return 'success' if tr else 'fail'
+    assert tr
 
 
 ###############################################################################
@@ -796,8 +776,6 @@ def test_ogr_sql_28():
 
     ds = None
 
-    return 'success'
-
 ###############################################################################
 # Verify that IS NULL and IS NOT NULL are working
 
@@ -834,8 +812,6 @@ def test_ogr_sql_29():
 
     assert count_is_not_null == 2, 'IS NOT NULL failed'
 
-    return 'success'
-
 ###############################################################################
 # Verify a select mixing a count(*) with something else works without errors
 
@@ -853,7 +829,7 @@ def test_ogr_sql_30():
 
     assert gdal.GetLastErrorMsg() == ''
 
-    return 'success' if val_count == 10 else 'fail'
+    assert val_count == 10
 
 ###############################################################################
 # Regression test for #4022
@@ -872,7 +848,7 @@ def test_ogr_sql_31():
 
     assert gdal.GetLastErrorMsg() == ''
 
-    return 'success' if val is None else 'fail'
+    assert val is None
 
 ###############################################################################
 # Regression test for #4022 (same as above, but with dialect = 'OGRSQL')
@@ -892,7 +868,7 @@ def test_ogr_sql_32():
 
     assert gdal.GetLastErrorMsg() == ''
 
-    return 'success' if val is None else 'fail'
+    assert val is None
 
 ###############################################################################
 # Check ALTER TABLE commands
@@ -935,8 +911,6 @@ def test_ogr_sql_33():
 
     ds = None
 
-    return 'success'
-
 ###############################################################################
 # Test implicit conversion from string to numeric (#4259)
 
@@ -957,8 +931,6 @@ def test_ogr_sql_34():
     gdal.PopErrorHandler()
     assert sql_lyr is None
 
-    return 'success'
-
 ###############################################################################
 # Test huge SQL queries (#4262)
 
@@ -974,7 +946,7 @@ def test_ogr_sql_35():
 
     gdaltest.ds.ReleaseResultSet(sql_lyr)
 
-    return 'success' if count_cols == 1024 else 'fail'
+    assert count_cols == 1024
 
 ###############################################################################
 # Test select distinct on null values (#4353)
@@ -1022,8 +994,7 @@ def test_ogr_sql_36():
             pytest.fail('field %s' % fieldname)
         ds.ReleaseResultSet(sql_lyr)
 
-    return 'success'
-
+    
 ###############################################################################
 # Test select count([distinct] column) with null values (#4354)
 
@@ -1105,8 +1076,6 @@ def test_ogr_sql_37():
         pytest.fail()
     ds.ReleaseResultSet(sql_lyr)
 
-    return 'success'
-
 ###############################################################################
 # Test "SELECT MAX(OGR_GEOM_AREA) FROM XXXX" (#4633)
 
@@ -1121,7 +1090,7 @@ def test_ogr_sql_38():
     gdaltest.ds.ReleaseResultSet(sql_lyr)
 
     if abs(val - 1634833.39062) < 1e-5:
-        return 'success'
+        return
     pytest.fail(val)
 
 ###############################################################################
@@ -1138,7 +1107,7 @@ def test_ogr_sql_39():
     gdaltest.ds.ReleaseResultSet(sql_lyr)
 
     if abs(val - 5268.813) < 1e-5:
-        return 'success'
+        return
     pytest.fail(val)
 
 ###############################################################################
@@ -1153,7 +1122,7 @@ def test_ogr_sql_40():
 
     gdaltest.ds.ReleaseResultSet(sql_lyr)
 
-    return 'success' if feat.GetFID() == 9 else 'fail'
+    assert feat.GetFID() == 9
 
 ###############################################################################
 # Test ORDER BY on a string special field
@@ -1167,7 +1136,7 @@ def test_ogr_sql_41():
 
     gdaltest.ds.ReleaseResultSet(sql_lyr)
 
-    return 'success' if feat.GetFID() == 0 else 'fail'
+    assert feat.GetFID() == 0
 
 ###############################################################################
 # Test comparing to empty string
@@ -1186,8 +1155,6 @@ def test_ogr_sql_42():
     gdaltest.ds.ReleaseResultSet(sql_lyr)
     assert feat is not None
 
-    return 'success'
-
 ###############################################################################
 # Test escape sequences
 
@@ -1259,8 +1226,7 @@ def test_ogr_sql_44():
             pytest.fail(sql)
         gdaltest.ds.ReleaseResultSet(sql_lyr)
 
-    return 'success'
-
+    
 ###############################################################################
 # Test 64 bit GetFeatureCount()
 
@@ -1295,8 +1261,6 @@ def test_ogr_sql_45():
     f = None
     ds.ReleaseResultSet(sql_lyr)
 
-    return 'success'
-
 ###############################################################################
 # Test strict SQL quoting
 
@@ -1357,8 +1321,6 @@ def test_ogr_sql_46():
     gdal.PopErrorHandler()
     assert sql_lyr is None
 
-    return 'success'
-
 ###############################################################################
 # Test NULL sorting (#6155)
 
@@ -1377,8 +1339,6 @@ def test_ogr_sql_47():
         prec_val = new_val
     ds.ReleaseResultSet(sql_lyr)
 
-    return 'success'
-
 ###############################################################################
 # Test sorting of more than 100 elements
 
@@ -1405,15 +1365,11 @@ def test_ogr_sql_48():
     ds.ReleaseResultSet(sql_lyr)
     assert i == 1001
 
-    return 'success'
-
 
 def test_ogr_sql_cleanup():
     gdaltest.lyr = None
     gdaltest.ds = None
 
-    return 'success'
-
 
 gdaltest_list = [
     test_ogr_sql_1,
diff --git a/autotest/ogr/ogr_sqlite.py b/autotest/ogr/ogr_sqlite.py
index 5b0c54455d18..b9fa6e9f30f8 100755
--- a/autotest/ogr/ogr_sqlite.py
+++ b/autotest/ogr/ogr_sqlite.py
@@ -75,7 +75,7 @@ def test_ogr_sqlite_1():
     gdaltest.sl_ds = sqlite_dr.CreateDataSource('tmp/sqlite_test.db')
 
     if gdaltest.sl_ds is not None:
-        return 'success'
+        return
     pytest.fail()
 
 ###############################################################################
@@ -177,8 +177,6 @@ def test_ogr_sqlite_2():
 
     gdaltest.sl_lyr.CommitTransaction()
 
-    return 'success'
-
 ###############################################################################
 # Verify that stuff we just wrote is still OK.
 
@@ -218,7 +216,7 @@ def test_ogr_sqlite_3():
     gdaltest.poly_feat = None
     gdaltest.shp_ds = None
 
-    return 'success' if tr else 'fail'
+    assert tr
 
 ###############################################################################
 # Write more features with a bunch of different geometries, and verify the
@@ -256,8 +254,7 @@ def test_ogr_sqlite_4():
 
         assert ogrtest.check_feature_geometry(feat_read, geom) == 0
 
-    return 'success'
-
+    
 ###############################################################################
 # Test ExecuteSQL() results layers without geometry.
 
@@ -277,7 +274,7 @@ def test_ogr_sqlite_5():
 
     gdaltest.sl_ds.ReleaseResultSet(sql_lyr)
 
-    return 'success' if tr else 'fail'
+    assert tr
 
 ###############################################################################
 # Test ExecuteSQL() results layers with geometry.
@@ -299,7 +296,7 @@ def test_ogr_sqlite_6():
 
     gdaltest.sl_ds.ReleaseResultSet(sql_lyr)
 
-    return 'success' if tr else 'fail'
+    assert tr
 
 ###############################################################################
 # Test spatial filtering.
@@ -330,7 +327,7 @@ def test_ogr_sqlite_7():
 
     gdaltest.sl_lyr.SetSpatialFilter(None)
 
-    return 'success' if tr else 'fail'
+    assert tr
 
 ###############################################################################
 # Test transactions with rollback.
@@ -384,8 +381,6 @@ def test_ogr_sqlite_8():
     feat_read.Destroy()
     dst_feat.Destroy()
 
-    return 'success'
-
 ###############################################################################
 # Test SetFeature()
 
@@ -436,8 +431,6 @@ def test_ogr_sqlite_9():
     feat_read.Destroy()
     feat_read_2.Destroy()
 
-    return 'success'
-
 ###############################################################################
 # Test GetFeature()
 
@@ -468,8 +461,7 @@ def test_ogr_sqlite_10():
         feat_read_2.DumpReadable()
         pytest.fail('GetFeature() result seems to not match expected.')
 
-    return 'success'
-
+    
 ###############################################################################
 # Test FORMAT=WKB creation option
 
@@ -503,8 +495,6 @@ def test_ogr_sqlite_11():
 
     gdaltest.sl_lyr.ResetReading()
 
-    return 'success'
-
 ###############################################################################
 # Test FORMAT=WKT creation option
 
@@ -551,8 +541,6 @@ def test_ogr_sqlite_12():
 
     gdaltest.sl_ds.ReleaseResultSet(sql_lyr)
 
-    return 'success'
-
 ###############################################################################
 # Test SRID support
 
@@ -588,8 +576,6 @@ def test_ogr_sqlite_13():
     assert feat.GetFieldAsInteger('count') == 1
     gdaltest.sl_ds.ReleaseResultSet(sql_lyr)
 
-    return 'success'
-
 
 ###############################################################################
 # Test all column types
@@ -639,8 +625,6 @@ def test_ogr_sqlite_14():
 
     gdaltest.sl_lyr.ResetReading()
 
-    return 'success'
-
 ###############################################################################
 # Test FORMAT=SPATIALITE layer creation option
 
@@ -709,8 +693,6 @@ def test_ogr_sqlite_15():
 
     gdaltest.sl_ds.ReleaseResultSet(sql_lyr)
 
-    return 'success'
-
 
 ###############################################################################
 # Test reading geometries in FGF (FDO Geometry Format) binary representation.
@@ -788,8 +770,6 @@ def test_ogr_sqlite_16():
 
     gdaltest.sl_lyr.ResetReading()
 
-    return 'success'
-
 ###############################################################################
 # Test SPATIALITE dataset creation option
 
@@ -807,7 +787,7 @@ def test_ogr_sqlite_17():
 
     if not gdaltest.has_spatialite:
         assert ds is None
-        return 'success'
+        return
 
     gdal.PushErrorHandler('CPLQuietErrorHandler')
     lyr = ds.CreateLayer('will_fail', options=['FORMAT=WKB'])
@@ -837,8 +817,6 @@ def test_ogr_sqlite_17():
     wkt = srs.ExportToWkt()
     assert wkt.find('4326') != -1, 'did not identify correctly SRS'
 
-    return 'success'
-
 ###############################################################################
 # Create a layer with a non EPSG SRS into a SPATIALITE DB (#3506)
 
@@ -874,8 +852,6 @@ def test_ogr_sqlite_18():
         pytest.fail()
     gdaltest.sl_ds.ReleaseResultSet(sql_lyr)
 
-    return 'success'
-
 ###############################################################################
 # Create a SpatiaLite DB with INIT_WITH_EPSG=YES
 
@@ -912,8 +888,6 @@ def test_ogr_sqlite_19():
     # Currently the injection of the EPSG DB as proj.4 strings adds 3915 entries
     assert nb_srs >= 3915, 'did not get expected SRS count'
 
-    return 'success'
-
 ###############################################################################
 # Create a SpatiaLite DB with INIT_WITH_EPSG=NO
 
@@ -948,8 +922,6 @@ def test_ogr_sqlite_19_bis():
 
     gdal.Unlink('/vsimem/spatialite_test_without_epsg.db')
 
-    return 'success'
-
 ###############################################################################
 # Create a regular DB with INIT_WITH_EPSG=YES
 
@@ -979,8 +951,6 @@ def test_ogr_sqlite_20():
     # Currently the injection of the EPSG DB as proj.4 strings adds 3945 entries
     assert nb_srs >= 3945, 'did not get expected SRS count'
 
-    return 'success'
-
 ###############################################################################
 # Test CopyLayer() from a table layer (#3617)
 
@@ -997,8 +967,6 @@ def test_ogr_sqlite_21():
     copy_lyr_count = copy_lyr.GetFeatureCount()
     assert src_lyr_count == copy_lyr_count, 'did not get same number of features'
 
-    return 'success'
-
 ###############################################################################
 # Test CopyLayer() from a result layer (#3617)
 
@@ -1017,8 +985,6 @@ def test_ogr_sqlite_22():
 
     gdaltest.sl_ds.ReleaseResultSet(src_lyr)
 
-    return 'success'
-
 ###############################################################################
 # Test ignored fields works ok
 
@@ -1064,8 +1030,6 @@ def test_ogr_sqlite_23():
 
     assert feat.GetFieldAsInteger('EAS_ID') == 179, 'missing or wrong eas_id'
 
-    return 'success'
-
 ###############################################################################
 # Test that ExecuteSQL() with OGRSQL dialect doesn't forward the where clause to sqlite (#4022)
 
@@ -1127,8 +1091,6 @@ def test_ogr_sqlite_24():
 
     ds = None
 
-    return 'success'
-
 ###############################################################################
 # Test opening a /vsicurl/ DB
 
@@ -1172,8 +1134,6 @@ def test_ogr_sqlite_25():
 
     assert lyr.GetLayerDefn().GetFieldCount() != 0
 
-    return 'success'
-
 ###############################################################################
 # Test creating a :memory: DB
 
@@ -1193,8 +1153,6 @@ def test_ogr_sqlite_26():
 
     assert count == 1, 'expected existing geometry_columns'
 
-    return 'success'
-
 ###############################################################################
 # Run test_ogrsf
 
@@ -1238,8 +1196,6 @@ def test_ogr_sqlite_27():
 
     assert ret.find('INFO') != -1 and ret.find('ERROR') == -1
 
-    return 'success'
-
 ###############################################################################
 # Run test_ogrsf on a spatialite enabled DB
 
@@ -1277,8 +1233,6 @@ def test_ogr_sqlite_28():
 
     assert ret.find('INFO') != -1 and ret.find('ERROR') == -1
 
-    return 'success'
-
 ###############################################################################
 # Test CreateFeature() with empty feature
 
@@ -1300,8 +1254,6 @@ def test_ogr_sqlite_29():
 
     ds = None
 
-    return 'success'
-
 ###############################################################################
 # Test ExecuteSQL() with empty result set (#4684)
 
@@ -1321,8 +1273,6 @@ def test_ogr_sqlite_30():
 
     gdaltest.sl_ds.ReleaseResultSet(sql_lyr)
 
-    return 'success'
-
 ###############################################################################
 # Test if SpatiaLite is available
 
@@ -1499,8 +1449,6 @@ def test_ogr_spatialite_2():
 
     ds.Destroy()
 
-    return 'success'
-
 ###############################################################################
 # Test VirtualShape feature of SpatiaLite
 
@@ -1525,7 +1473,7 @@ def test_ogr_spatialite_3():
 
     ds.Destroy()
 
-    return 'success' if tr else 'fail'
+    assert tr
 
 ###############################################################################
 # Test updating a spatialite DB (#3471 and #3474)
@@ -1579,8 +1527,6 @@ def test_ogr_spatialite_4():
     assert nb_idx_before + 1 == nb_idx_after, \
         ('nb_idx_before=%d, nb_idx_after=%d' % (nb_idx_before, nb_idx_after))
 
-    return 'success'
-
 ###############################################################################
 # Test writing and reading back spatialite geometries (#4092)
 
@@ -1710,8 +1656,6 @@ def test_ogr_spatialite_5(bUseComprGeom=False):
 
     ds = None
 
-    return 'success'
-
 
 ###############################################################################
 # Test writing and reading back spatialite geometries in compressed form
@@ -1851,8 +1795,6 @@ def test_ogr_spatialite_6():
         pytest.fail()
     ds = None
 
-    return 'success'
-
 ###############################################################################
 # Test VirtualShape:xxx.shp
 
@@ -1873,8 +1815,6 @@ def test_ogr_spatialite_7():
     f = lyr.GetNextFeature()
     assert f.GetGeometryRef() is not None
 
-    return 'success'
-
 ###############################################################################
 # Test tables with multiple geometry columns (#4768)
 
@@ -2025,8 +1965,6 @@ def test_ogr_spatialite_8():
 
     ds = None
 
-    return 'success'
-
 ###############################################################################
 # Test tables with multiple geometry columns (#4768)
 
@@ -2091,8 +2029,6 @@ def test_ogr_sqlite_31():
 
     ds = None
 
-    return 'success'
-
 ###############################################################################
 # Test datetime support
 
@@ -2141,8 +2077,6 @@ def test_ogr_sqlite_32():
 
     ds = None
 
-    return 'success'
-
 ###############################################################################
 # Test SRID layer creation option
 
@@ -2161,9 +2095,9 @@ def test_ogr_sqlite_33():
             options = []
         else:
             if not gdaltest.has_spatialite:
-                return 'success'
+                return
             if gdaltest.spatialite_version.find('2.3') == 0:
-                return 'success'
+                return
             options = ['SPATIALITE=YES']
 
         ds = ogr.GetDriverByName('SQLite').CreateDataSource('tmp/ogr_sqlite_33.sqlite', options=options)
@@ -2208,8 +2142,7 @@ def test_ogr_sqlite_33():
 
         ds = None
 
-    return 'success'
-
+    
 ###############################################################################
 # Test REGEXP support (#4823)
 
@@ -2272,8 +2205,7 @@ def test_ogr_sqlite_34():
             gdaltest.sl_ds.ReleaseResultSet(sql_lyr)
             assert val == 1
 
-    return 'success'
-
+    
 ###############################################################################
 # Test SetAttributeFilter() on SQL result layer
 
@@ -2357,8 +2289,6 @@ def test_ogr_sqlite_35():
 
     ds = None
 
-    return 'success'
-
 ###############################################################################
 # Test FID64 support
 
@@ -2392,8 +2322,6 @@ def test_ogr_sqlite_36():
     f = lyr.GetNextFeature()
     assert f.GetFID() == 1234567890123
 
-    return 'success'
-
 ###############################################################################
 # Test not nullable fields
 
@@ -2479,8 +2407,6 @@ def test_ogr_sqlite_37():
     assert lyr.GetLayerDefn().GetGeomFieldDefn(lyr.GetLayerDefn().GetGeomFieldIndex('geomfield_nullable')).IsNullable() == 1
     ds = None
 
-    return 'success'
-
 ###############################################################################
 # Test  default values
 
@@ -2587,8 +2513,6 @@ def test_ogr_sqlite_38():
 
     ds = None
 
-    return 'success'
-
 ###############################################################################
 # Test spatial filters with point extent
 
@@ -2610,8 +2534,6 @@ def test_ogr_spatialite_9():
     ds = None
     ogr.GetDriverByName('SQLite').DeleteDataSource('/vsimem/ogr_spatialite_9.sqlite')
 
-    return 'success'
-
 ###############################################################################
 # Test not nullable fields
 
@@ -2652,8 +2574,6 @@ def test_ogr_spatialite_10():
     assert lyr.GetLayerDefn().GetGeomFieldDefn(lyr.GetLayerDefn().GetGeomFieldIndex('geomfield_nullable')).IsNullable() == 1
     ds = None
 
-    return 'success'
-
 
 ###############################################################################
 # Test creating a field with the fid name
@@ -2729,8 +2649,6 @@ def test_ogr_sqlite_39():
 
     ogr.GetDriverByName('SQLite').DeleteDataSource('/vsimem/ogr_sqlite_39.sqlite')
 
-    return 'success'
-
 ###############################################################################
 # Test dataset transactions
 
@@ -2851,8 +2769,6 @@ def test_ogr_sqlite_40():
 
     ogr.GetDriverByName('SQLite').DeleteDataSource('/vsimem/ogr_sqlite_40.sqlite')
 
-    return 'success'
-
 ###############################################################################
 # Test reading dates from Julian day floating point representation
 
@@ -2875,8 +2791,6 @@ def test_ogr_sqlite_41():
 
     ogr.GetDriverByName('SQLite').DeleteDataSource('/vsimem/ogr_sqlite_41.sqlite')
 
-    return 'success'
-
 ###############################################################################
 # Test ExecuteSQL() heuristics (#6107)
 
@@ -2930,8 +2844,6 @@ def test_ogr_sqlite_42():
 
     ogr.GetDriverByName('SQLite').DeleteDataSource('/vsimem/ogr_sqlite_42.sqlite')
 
-    return 'success'
-
 ###############################################################################
 # Test file:foo?mode=memory&cache=shared (#6150)
 
@@ -2949,8 +2861,6 @@ def test_ogr_sqlite_43():
     ds = ogr.Open('file:foo?mode=memory&cache=shared')
     assert ds is not None
 
-    return 'success'
-
 ###############################################################################
 # Test reading/writing StringList, etc..
 
@@ -2988,8 +2898,6 @@ def test_ogr_sqlite_44():
     gdal.Unlink('/vsimem/ogr_sqlite_44_out.csv')
     gdal.Unlink('/vsimem/ogr_sqlite_44_out.csvt')
 
-    return 'success'
-
 ###############################################################################
 # Test WAL and opening in read-only (#6776)
 
@@ -3023,8 +2931,6 @@ def test_ogr_sqlite_45():
     gdal.Unlink('tmp/ogr_sqlite_45.db')
     gdal.Unlink('tmp/ogr_sqlite_45_bis.db')
 
-    return 'success'
-
 
 ###############################################################################
 # Test creating unsupported geometry types
@@ -3051,8 +2957,6 @@ def test_ogr_spatialite_11():
 
     gdal.Unlink('/vsimem/ogr_spatialite_11.sqlite')
 
-    return 'success'
-
 ###############################################################################
 # Test opening a .sql file
 
@@ -3070,8 +2974,6 @@ def test_ogr_spatialite_12():
     f = lyr.GetNextFeature()
     assert f is not None
 
-    return 'success'
-
 
 ###############################################################################
 
@@ -3100,7 +3002,6 @@ def test_ogr_sqlite_iterate_and_update():
     ds = None
 
     gdal.Unlink(filename)
-    return 'success'
 
 ###############################################################################
 #
@@ -3213,8 +3114,7 @@ def test_ogr_sqlite_cleanup():
         os.remove('tmp/ogr_spatialite_10.sqlite')
     except OSError:
         pass
-    return 'success'
-
+    
 ###############################################################################
 # Ask to run again tests in a new python process without libspatialite loaded
 
@@ -3229,8 +3129,6 @@ def test_ogr_sqlite_without_spatialite():
 
     assert ret.find('Failed:    0') != -1
 
-    return 'success'
-
 
 gdaltest_list = [
     test_ogr_sqlite_1,
diff --git a/autotest/ogr/ogr_style.py b/autotest/ogr/ogr_style.py
index df21c3cb6368..7d4bac06adea 100755
--- a/autotest/ogr/ogr_style.py
+++ b/autotest/ogr/ogr_style.py
@@ -102,8 +102,6 @@ def test_ogr_style_styletable():
 
     ds = None
 
-    return 'success'
-
 ###############################################################################
 # Build tests runner
 
diff --git a/autotest/ogr/ogr_sua.py b/autotest/ogr/ogr_sua.py
index 0b1cf9eb6303..5585c97b06dd 100755
--- a/autotest/ogr/ogr_sua.py
+++ b/autotest/ogr/ogr_sua.py
@@ -62,8 +62,7 @@ def test_ogr_sua_1():
         print('did not get expected second geom')
         pytest.fail(geom.ExportToWkt())
 
-    return 'success'
-
+    
 
 gdaltest_list = [
     test_ogr_sua_1]
diff --git a/autotest/ogr/ogr_svg.py b/autotest/ogr/ogr_svg.py
index 897752676a94..aa73c6a5e6cf 100755
--- a/autotest/ogr/ogr_svg.py
+++ b/autotest/ogr/ogr_svg.py
@@ -52,8 +52,6 @@ def test_ogr_svg_init():
 
     assert gdaltest.svg_ds.GetLayerCount() == 3, 'wrong number of layers'
 
-    return 'success'
-
 ###############################################################################
 # Test
 
@@ -98,8 +96,7 @@ def test_ogr_svg_1():
         feat.DumpReadable()
         pytest.fail()
 
-    return 'success'
-
+    
 ###############################################################################
 #
 
@@ -107,7 +104,6 @@ def test_ogr_svg_1():
 def test_ogr_svg_cleanup():
 
     gdaltest.svg_ds = None
-    return 'success'
 
 
 gdaltest_list = [
diff --git a/autotest/ogr/ogr_sxf.py b/autotest/ogr/ogr_sxf.py
index c8d77c9632d4..9f282af4311a 100755
--- a/autotest/ogr/ogr_sxf.py
+++ b/autotest/ogr/ogr_sxf.py
@@ -45,7 +45,7 @@ def test_ogr_sxf_1():
         gdaltest.sxf_ds = ogr.Open('data/100_test.sxf')
 
     if gdaltest.sxf_ds is not None:
-        return 'success'
+        return
     pytest.fail()
 
 
@@ -62,8 +62,6 @@ def test_ogr_sxf_2():
 
     assert ret.find('INFO') != -1 and ret.find('ERROR') == -1
 
-    return 'success'
-
 ###############################################################################
 #
 
@@ -75,8 +73,6 @@ def test_ogr_sxf_cleanup():
 
     gdaltest.sxf_ds = None
 
-    return 'success'
-
 
 gdaltest_list = [
     test_ogr_sxf_1,
diff --git a/autotest/ogr/ogr_tiger.py b/autotest/ogr/ogr_tiger.py
index cfc481d60fdb..be3421fb00be 100755
--- a/autotest/ogr/ogr_tiger.py
+++ b/autotest/ogr/ogr_tiger.py
@@ -90,8 +90,6 @@ def test_ogr_tiger_1():
     assert feat.MODULE == 'TGR01001' and feat.TLMINID == 2822718, \
         'got wrong TLIDRange attributes'
 
-    return 'success'
-
 ###############################################################################
 # Run test_ogrsf
 
@@ -109,8 +107,6 @@ def test_ogr_tiger_2():
 
     assert ret.find('INFO') != -1 and ret.find('ERROR') == -1
 
-    return 'success'
-
 ###############################################################################
 # Test TIGER writing
 
@@ -216,8 +212,7 @@ def test_ogr_tiger_4():
 
         gdal.Unlink('/vsimem/tigertest/' + filename)
 
-    return 'success'
-
+    
 ###############################################################################
 
 
@@ -227,7 +222,6 @@ def test_ogr_tiger_cleanup():
         pytest.skip()
 
     ogrtest.tiger_ds = None
-    return 'success'
 
 
 gdaltest_list = [
diff --git a/autotest/ogr/ogr_vdv.py b/autotest/ogr/ogr_vdv.py
index 7f288b88a23d..c7dd1b73f564 100755
--- a/autotest/ogr/ogr_vdv.py
+++ b/autotest/ogr/ogr_vdv.py
@@ -70,8 +70,7 @@ def test_ogr_idf_1():
         f.DumpReadable()
         pytest.fail()
 
-    return 'success'
-
+    
 ###############################################################################
 #
 
@@ -113,8 +112,7 @@ def test_ogr_idf_3d():
         f.DumpReadable()
         pytest.fail()
 
-    return 'success'
-
+    
 ###############################################################################
 # Run test_ogrsf on .idf
 
@@ -129,8 +127,6 @@ def test_ogr_idf_2():
 
     assert ret.find('INFO') != -1 and ret.find('ERROR') == -1
 
-    return 'success'
-
 ###############################################################################
 # Create a VDV file
 
@@ -185,8 +181,6 @@ def test_ogr_vdv_1(filename='tmp/test.x10', dsco=None, lco=None):
     ds.CreateLayer('empty2', options=lco)
     ds = None
 
-    return 'success'
-
 ###############################################################################
 # Read it
 
@@ -254,8 +248,6 @@ def test_ogr_vdv_2(src_filename='tmp/test.x10'):
 
     gdal.Unlink(out_filename)
 
-    return 'success'
-
 ###############################################################################
 # Run test_ogrsf on it
 
@@ -270,8 +262,6 @@ def test_ogr_vdv_3():
 
     assert ret.find('INFO') != -1 and ret.find('ERROR') == -1
 
-    return 'success'
-
 ###############################################################################
 # Create a VDV directory
 
@@ -300,8 +290,6 @@ def test_ogr_vdv_6():
 
     assert ret.find('INFO') != -1 and ret.find('ERROR') == -1
 
-    return 'success'
-
 ###############################################################################
 # Run VDV452
 
@@ -372,8 +360,7 @@ def test_ogr_vdv_7():
 
         gdal.Unlink('/vsimem/vdv/ogr_vdv_7.x10')
 
-    return 'success'
-
+    
 ###############################################################################
 # Test a few error cases
 
@@ -521,8 +508,6 @@ def test_ogr_vdv_8():
 
     gdal.Unlink(out_filename)
 
-    return 'success'
-
 ###############################################################################
 # Cleanup
 
@@ -539,8 +524,6 @@ def test_ogr_vdv_cleanup():
             gdal.Unlink('tmp/test_x10/' + f)
     gdal.Rmdir('tmp/test_x10')
 
-    return 'success'
-
 
 gdaltest_list = [
     test_ogr_idf_1,
diff --git a/autotest/ogr/ogr_vfk.py b/autotest/ogr/ogr_vfk.py
index 6bfd81d0828c..b85a13ed1a5e 100755
--- a/autotest/ogr/ogr_vfk.py
+++ b/autotest/ogr/ogr_vfk.py
@@ -75,8 +75,6 @@ def test_ogr_vfk_1():
     fc = gdaltest.vfk_layer_par.GetFeatureCount()
     assert fc == 1, ('did not get expected feature count, got %d' % fc)
 
-    return 'success'
-
 ###############################################################################
 # Read the first feature from layer 'PAR', check envelope
 
@@ -103,8 +101,6 @@ def test_ogr_vfk_2():
     assert area >= exp_area - 0.5 and area <= exp_area + 0.5, \
         ('envelope area not as expected, got %g.' % area)
 
-    return 'success'
-
 ###############################################################################
 # Read features from layer 'SOBR', test attribute query
 
@@ -131,8 +127,6 @@ def test_ogr_vfk_3():
 
     assert count == 1, ('did not get expected number of features, got %d' % count)
 
-    return 'success'
-
 ###############################################################################
 # Read features from layer 'SBP', test random access, check length
 
@@ -151,8 +145,6 @@ def test_ogr_vfk_4():
 
     assert length == 10, ('did not get expected length, got %d' % length)
 
-    return 'success'
-
 ###############################################################################
 # Read features from layer 'HP', check geometry type
 
@@ -171,8 +163,6 @@ def test_ogr_vfk_5():
     assert geom_type == ogr.wkbLineString, \
         ('did not get expected geometry type, got %d' % geom_type)
 
-    return 'success'
-
 ###############################################################################
 # Re-Open file (test .db persistence)
 
@@ -205,8 +195,6 @@ def test_ogr_vfk_6():
     fc = gdaltest.vfk_layer_par.GetFeatureCount()
     assert fc == 1, ('did not get expected feature count, got %d' % fc)
 
-    return 'success'
-
 ###############################################################################
 # Read PAR layer, check data types (Integer64 new in GDAL 2.2)
 
@@ -226,8 +214,7 @@ def test_ogr_vfk_7():
         assert col.GetName() == name and col.GetType() == ctype, \
             "PAR: '{}' column name/type mismatch".format(name)
 
-    return 'success'
-
+    
 ###############################################################################
 # Open DB file as datasource (new in GDAL 2.2)
 
@@ -253,8 +240,6 @@ def test_ogr_vfk_8():
 
     del os.environ['OGR_VFK_DB_READ']
 
-    return 'success'
-
 ###############################################################################
 # Open datasource with SUPPRESS_GEOMETRY open option (new in GDAL 2.3)
 
@@ -279,8 +264,6 @@ def test_ogr_vfk_9():
     assert geom_type == ogr.wkbNone, \
         ('did not get expected geometry type, got %d' % geom_type)
 
-    return 'success'
-
 ###############################################################################
 # Open datasource with FILE_FIELD open option (new in GDAL 2.4)
 
@@ -306,8 +289,6 @@ def test_ogr_vfk_10():
 
     assert file_field == 'bylany.vfk', 'did not get expected file field value'
 
-    return 'success'
-
 ###############################################################################
 # Read PAR layer, check sequential feature access consistency
 
@@ -334,8 +315,7 @@ def count_features():
             feat.DumpReadable()
             pytest.fail('did not get expected number of features')
 
-    return 'success'
-
+    
 ###############################################################################
 # cleanup
 
@@ -355,8 +335,7 @@ def test_ogr_vfk_cleanup():
     except OSError:
         pass
 
-    return 'success'
-
+    
 ###############################################################################
 #
 
diff --git a/autotest/ogr/ogr_virtualogr.py b/autotest/ogr/ogr_virtualogr.py
index 1b405b324136..579528c40f05 100755
--- a/autotest/ogr/ogr_virtualogr.py
+++ b/autotest/ogr/ogr_virtualogr.py
@@ -111,8 +111,6 @@ def test_ogr_virtualogr_1():
     # Too many arguments
     assert not ogr_virtualogr_run_sql("CREATE VIRTUAL TABLE poly USING VirtualOGR('data/poly.shp', 0, 'poly', 1, 1, bla)")
 
-    return 'success'
-
 ###############################################################################
 # Test detection of suspicious use of VirtualOGR
 
@@ -184,8 +182,6 @@ def test_ogr_virtualogr_2():
 
     assert not did_not_get_error, 'expected a failure'
 
-    return 'success'
-
 ###############################################################################
 # Test GDAL as a SQLite3 dynamically loaded extension
 
@@ -221,8 +217,6 @@ def test_ogr_virtualogr_3():
         pytest.skip()
     assert ret.find(gdal.VersionInfo('RELEASE_NAME')) >= 0, ('fail : %s' % ret)
 
-    return 'success'
-
 ###############################################################################
 # Test ogr_datasource_load_layers()
 
@@ -284,8 +278,6 @@ def test_ogr_virtualogr_4():
     ds = None
     gdal.Unlink('/vsimem/ogr_virtualogr_4.db')
 
-    return 'success'
-
 ###############################################################################
 # Test failed CREATE VIRTUAL TABLE USING VirtualOGR
 
@@ -312,8 +304,6 @@ def test_ogr_virtualogr_5():
 
     gdal.Unlink('/vsimem/ogr_virtualogr_5.csv')
 
-    return 'success'
-
 
 gdaltest_list = [
     test_ogr_virtualogr_1,
diff --git a/autotest/ogr/ogr_vrt.py b/autotest/ogr/ogr_vrt.py
index 5a31baab1295..021509cdc3cf 100755
--- a/autotest/ogr/ogr_vrt.py
+++ b/autotest/ogr/ogr_vrt.py
@@ -50,7 +50,7 @@ def test_ogr_vrt_1():
         gdaltest.vrt_ds = ogr.Open('data/vrt_test.vrt')
 
     if gdaltest.vrt_ds is not None:
-        return 'success'
+        return
     pytest.fail()
 
 ###############################################################################
@@ -87,8 +87,6 @@ def test_ogr_vrt_2():
 
     assert feat.GetFID() == 1, 'Unexpected fid'
 
-    return 'success'
-
 ###############################################################################
 # Same test on layer 3 derived from WKT column.
 #
@@ -120,8 +118,6 @@ def test_ogr_vrt_3():
 
     assert feat.GetFID() == 2, 'Unexpected fid'
 
-    return 'success'
-
 
 ###############################################################################
 # Test a spatial query.
@@ -148,8 +144,6 @@ def test_ogr_vrt_4():
 
     lyr.SetSpatialFilter(None)
 
-    return 'success'
-
 
 ###############################################################################
 # Test an attribute query.
@@ -174,8 +168,6 @@ def test_ogr_vrt_5():
 
     lyr.SetAttributeFilter(None)
 
-    return 'success'
-
 ###############################################################################
 # Test GetFeature() on layer with FID coming from a column.
 
@@ -191,8 +183,6 @@ def test_ogr_vrt_6():
     feat = lyr.GetFeature(2)
     assert feat.GetField('other') == 'Second', 'GetFeature() did not work properly.'
 
-    return 'success'
-
 ###############################################################################
 # Same as test 3, but on the result of an SQL query.
 #
@@ -223,8 +213,6 @@ def test_ogr_vrt_7():
 
     assert feat.GetFID() == 2, 'Unexpected fid'
 
-    return 'success'
-
 ###############################################################################
 # Similar test, but now we put the whole VRT contents directly into the
 # "filename".
@@ -258,8 +246,6 @@ def test_ogr_vrt_8():
 
     assert feat.GetFID() == 2, 'Unexpected fid'
 
-    return 'success'
-
 
 ###############################################################################
 # Test that attribute filters are passed through to an underlying layer.
@@ -287,8 +273,6 @@ def test_ogr_vrt_9():
     sub_ds.Release()
     sub_ds = None
 
-    return 'success'
-
 ###############################################################################
 # Test capabilities
 #
@@ -308,8 +292,6 @@ def test_ogr_vrt_10():
     assert vrt_lyr.TestCapability(ogr.OLCFastGetExtent) == src_lyr.TestCapability(ogr.OLCFastGetExtent)
     assert vrt_lyr.TestCapability(ogr.OLCRandomRead) == src_lyr.TestCapability(ogr.OLCRandomRead)
 
-    return 'success'
-
 ###############################################################################
 # Test VRT write capabilities with PointFromColumns geometries
 # Test also the reportGeomSrcColumn attribute
@@ -398,8 +380,6 @@ def test_ogr_vrt_11():
     os.remove('tmp/test.csv')
     os.remove('tmp/test.csvt')
 
-    return 'success'
-
 ###############################################################################
 # Test VRT write capabilities with WKT geometries
 
@@ -440,8 +420,6 @@ def test_ogr_vrt_12():
 
     os.remove('tmp/test.csv')
 
-    return 'success'
-
 ###############################################################################
 # Test VRT write capabilities with WKB geometries
 
@@ -481,8 +459,6 @@ def test_ogr_vrt_13():
 
     os.remove('tmp/test.csv')
 
-    return 'success'
-
 ###############################################################################
 # Test SrcRegion element for VGS_Direct
 
@@ -569,8 +545,6 @@ def test_ogr_vrt_14():
     vrt_ds = None
     ogr.GetDriverByName('ESRI Shapefile').DeleteDataSource('tmp/test.shp')
 
-    return 'success'
-
 
 ###############################################################################
 # Test SrcRegion element for VGS_WKT
@@ -622,8 +596,6 @@ def test_ogr_vrt_15():
 
     os.remove('tmp/test.csv')
 
-    return 'success'
-
 
 ###############################################################################
 # Test SrcRegion element for VGS_PointFromColumns
@@ -686,8 +658,6 @@ def test_ogr_vrt_16():
     os.remove('tmp/test.csv')
     os.remove('tmp/test.csvt')
 
-    return 'success'
-
 
 ###############################################################################
 # Test explicit field definitions.
@@ -735,8 +705,6 @@ def test_ogr_vrt_17():
     assert feat.GetField(0) == 8901 and feat.GetField(1) == "Greenwich" and feat.GetField(2) is None, \
         'did not get expected field value(s).'
 
-    return 'success'
-
 ###############################################################################
 # Test that attribute filters are *not* passed to sublayer by default
 # when explicit fields are defined.
@@ -766,8 +734,6 @@ def test_ogr_vrt_18():
 
     assert feat.GetField(0) == 8904, 'Attribute filter not working properly'
 
-    return 'success'
-
 ###############################################################################
 # Run test_ogrsf (optimized path)
 
@@ -784,8 +750,6 @@ def test_ogr_vrt_19_optimized():
 
     assert ret.find('INFO') != -1 and ret.find('ERROR') == -1
 
-    return 'success'
-
 ###############################################################################
 # Run test_ogrsf (non optimized path)
 
@@ -802,8 +766,6 @@ def test_ogr_vrt_19_nonoptimized():
 
     assert ret.find('INFO') != -1 and ret.find('ERROR') == -1
 
-    return 'success'
-
 ###############################################################################
 # Test VGS_Direct
 
@@ -911,8 +873,6 @@ def test_ogr_vrt_20():
     vrt_ds = None
     ogr.GetDriverByName('ESRI Shapefile').DeleteDataSource('tmp/test.shp')
 
-    return 'success'
-
 ###############################################################################
 # Test lazy initialization with valid layer
 
@@ -1014,8 +974,6 @@ def ogr_vrt_21_internal():
     lyr.SyncToDisk()
     ds = None
 
-    return 'success'
-
 
 def test_ogr_vrt_21():
     gdal.PushErrorHandler('CPLQuietErrorHandler')
@@ -1142,8 +1100,6 @@ def ogr_vrt_22_internal():
     lyr.RollbackTransaction()
     ds = None
 
-    return 'success'
-
 
 def test_ogr_vrt_22():
     gdal.PushErrorHandler('CPLQuietErrorHandler')
@@ -1193,8 +1149,6 @@ def test_ogr_vrt_23(shared_ds_flag=''):
     gdal.Unlink('/vsimem/rec1.vrt')
     gdal.Unlink('/vsimem/rec2.vrt')
 
-    return 'success'
-
 ###############################################################################
 # Test anti-recursion mechanism on shared DS
 
@@ -1231,8 +1185,6 @@ def test_ogr_vrt_24():
     gdal.Unlink('/vsimem/rec1.vrt')
     gdal.Unlink('/vsimem/rec2.vrt')
 
-    return 'success'
-
 
 ###############################################################################
 # Test GetFIDColumn()
@@ -1262,8 +1214,6 @@ def test_ogr_vrt_25():
 
     ds = None
 
-    return 'success'
-
 ###############################################################################
 # Test transaction support
 
@@ -1318,8 +1268,6 @@ def test_ogr_vrt_26():
 
     ogr.GetDriverByName('SQLite').DeleteDataSource('/vsimem/ogr_vrt_26.db')
 
-    return 'success'
-
 ###############################################################################
 # Test shapebin geometry
 
@@ -1359,8 +1307,6 @@ def test_ogr_vrt_27():
 
     gdal.Unlink('/vsimem/ogr_vrt_27.csv')
 
-    return 'success'
-
 ###############################################################################
 # Invalid VRT testing
 
@@ -1407,8 +1353,6 @@ def test_ogr_vrt_28():
     gdal.PopErrorHandler()
     assert gdal.GetLastErrorMsg() != '', 'expected error message on datasource opening'
 
-    return 'success'
-
 ###############################################################################
 # Test OGRVRTWarpedLayer
 
@@ -1729,8 +1673,6 @@ def test_ogr_vrt_29():
     os.unlink('tmp/ogr_vrt_29.vrt')
     os.unlink('tmp/ogr_vrt_29_2.vrt')
 
-    return 'success'
-
 
 ###############################################################################
 # Test OGRVRTUnionLayer
@@ -2126,8 +2068,6 @@ def test_ogr_vrt_30():
         gdal.Unlink(filename)
     os.unlink('tmp/ogr_vrt_30.vrt')
 
-    return 'success'
-
 ###############################################################################
 # Test anti-recursion mechanism with union layer
 
@@ -2172,8 +2112,6 @@ def test_ogr_vrt_31(shared_ds_flag=''):
     gdal.Unlink('/vsimem/rec1.vrt')
     gdal.Unlink('/vsimem/rec2.vrt')
 
-    return 'success'
-
 ###############################################################################
 # Test anti-recursion mechanism on shared DS
 
@@ -2774,8 +2712,6 @@ def test_ogr_vrt_33():
     ds.ReleaseResultSet(sql_lyr)
     ds = None
 
-    return 'success'
-
 ###############################################################################
 # Test SetIgnoredFields() with with PointFromColumns geometries
 
@@ -2816,8 +2752,6 @@ def test_ogr_vrt_34():
 
     os.unlink('tmp/test.csv')
 
-    return 'success'
-
 ###############################################################################
 # Test nullable fields
 
@@ -2880,8 +2814,6 @@ def test_ogr_vrt_35():
     os.unlink('tmp/test.vrt')
     os.unlink('tmp/test2.vrt')
 
-    return 'success'
-
 ###############################################################################
 # Test editing direct geometries
 
@@ -2926,8 +2858,6 @@ def test_ogr_vrt_36():
     ogr.GetDriverByName('ESRI Shapefile').DeleteDataSource('/vsimem/ogr_vrt_36.shp')
     gdal.Unlink('/vsimem/ogr_vrt_36.vrt')
 
-    return 'success'
-
 ###############################################################################
 # Test implict non-spatial layers (#6336)
 
@@ -2946,8 +2876,6 @@ def test_ogr_vrt_37():
     lyr = ds.GetLayerByName('test6')
     assert lyr.GetLayerDefn().GetGeomFieldCount() == 0
 
-    return 'success'
-
 ###############################################################################
 # Test reading geometry type
 
@@ -2999,8 +2927,6 @@ def test_ogr_vrt_38():
 
     gdal.Unlink('/vsimem/ogr_vrt_38.vrt')
 
-    return 'success'
-
 ###############################################################################
 # Test that attribute filtering works with <FID>
 
@@ -3042,8 +2968,6 @@ def test_ogr_vrt_39():
     gdal.Unlink('/vsimem/ogr_vrt_39.csvt')
     gdal.Unlink('/vsimem/ogr_vrt_39.vrt')
 
-    return 'success'
-
 ###############################################################################
 # Test PointZM support with encoding="PointFromColumns"
 
@@ -3079,8 +3003,6 @@ def test_ogr_vrt_40():
     gdal.Unlink('/vsimem/ogr_vrt_40.csv')
     gdal.Unlink('/vsimem/ogr_vrt_40.vrt')
 
-    return 'success'
-
 ###############################################################################
 # Test GetExtent() on erroneous definition
 
@@ -3096,8 +3018,7 @@ def test_ogr_vrt_41():
     with gdaltest.error_handler():
         lyr.GetExtent()
 
-    return 'success'
-
+    
 ###############################################################################
 #
 
@@ -3123,8 +3044,6 @@ def test_ogr_vrt_cleanup():
 
     gdaltest.vrt_ds = None
 
-    return 'success'
-
 
 gdaltest_list = [
     test_ogr_vrt_1,
diff --git a/autotest/ogr/ogr_wasp.py b/autotest/ogr/ogr_wasp.py
index 39974f8e5a9a..0c08bfabb54d 100755
--- a/autotest/ogr/ogr_wasp.py
+++ b/autotest/ogr/ogr_wasp.py
@@ -52,7 +52,7 @@ def test_ogr_wasp_create_ds():
     gdaltest.wasp_ds = wasp_drv.CreateDataSource('tmp.map')
 
     if gdaltest.wasp_ds is not None:
-        return 'success'
+        return
     pytest.fail()
 
 ###############################################################################
@@ -103,8 +103,6 @@ def test_ogr_wasp_elevation_from_linestring_z():
 
     assert j == 10, ('nb of feature should be 10 and is %d' % j)
 
-    return 'success'
-
 ###############################################################################
 # Create elevation .map from linestrings z with simplification
 
@@ -162,8 +160,6 @@ def test_ogr_wasp_elevation_from_linestring_z_toler():
 
     assert j == 10, ('nb of feature should be 10 and is %d' % j)
 
-    return 'success'
-
 
 ###############################################################################
 # Create elevation .map from linestrings field
@@ -208,8 +204,7 @@ def test_ogr_wasp_elevation_from_linestring_field():
             j += 1
         i += 1
 
-    return 'success'
-
+    
 ###############################################################################
 # Create roughness .map from linestrings fields
 
@@ -261,8 +256,6 @@ def test_ogr_wasp_roughness_from_linestring_fields():
 
     assert j == 10, ('nb of feature should be 10 and is %d' % j)
 
-    return 'success'
-
 ###############################################################################
 # Create .map from polygons z
 
@@ -280,7 +273,7 @@ def test_ogr_wasp_roughness_from_polygon_z():
 
     if layer is None:
         assert not ogrtest.have_geos(), 'unable to create layer'
-        return 'success'
+        return
 
     dfn = ogr.FeatureDefn()
 
@@ -320,7 +313,6 @@ def test_ogr_wasp_roughness_from_polygon_z():
 
     assert res == set([(0, 1), (0, 5), (1, 2), (2, 3), (3, 4), (4, 5)]), \
         'wrong values f=in boundaries'
-    return 'success'
 
 ###############################################################################
 # Create .map from polygons field
@@ -340,7 +332,7 @@ def test_ogr_wasp_roughness_from_polygon_field():
 
     if layer is None:
         assert not ogrtest.have_geos(), 'unable to create layer'
-        return 'success'
+        return
 
     layer.CreateField(ogr.FieldDefn('roughness', ogr.OFTReal))
     layer.CreateField(ogr.FieldDefn('dummy', ogr.OFTString))
@@ -382,7 +374,6 @@ def test_ogr_wasp_roughness_from_polygon_field():
 
     assert res == set([(0, 1), (0, 5), (1, 2), (2, 3), (3, 4), (4, 5)]), \
         'wrong values f=in boundaries'
-    return 'success'
 
 ###############################################################################
 # Test merging of linestrings
@@ -403,7 +394,7 @@ def test_ogr_wasp_merge():
 
     if layer is None:
         assert not ogrtest.have_geos(), 'unable to create layer'
-        return 'success'
+        return
 
     dfn = ogr.FeatureDefn()
 
@@ -444,7 +435,6 @@ def test_ogr_wasp_merge():
     assert j == 6, ('there should be 6 boundaries and there are %d' % j)
 
     assert res == [(0, 1)] * 6, 'wrong values f=in boundaries'
-    return 'success'
 ###############################################################################
 # Read map file
 
@@ -467,7 +457,6 @@ def test_ogr_wasp_reading():
         i += 1
 
     assert i == 10
-    return 'success'
 ###############################################################################
 # Cleanup
 
@@ -476,7 +465,6 @@ def test_ogr_wasp_cleanup():
 
     wasp_drv = ogr.GetDriverByName('WAsP')
     wasp_drv.DeleteDataSource('tmp.map')
-    return 'success'
 
 
 gdaltest_list = [
diff --git a/autotest/ogr/ogr_wfs.py b/autotest/ogr/ogr_wfs.py
index 6d479e3f71ef..8994f95790f8 100755
--- a/autotest/ogr/ogr_wfs.py
+++ b/autotest/ogr/ogr_wfs.py
@@ -112,8 +112,7 @@ def test_ogr_wfs_mapserver():
         feat.DumpReadable()
         pytest.fail('did not get expected feature')
 
-    return 'success'
-
+    
 
 ###############################################################################
 # Test reading a GeoServer WFS server
@@ -206,8 +205,7 @@ def test_ogr_wfs_geoserver():
             feat.DumpReadable()
             pytest.fail('did not get expected feature (4)')
 
-    return 'success'
-
+    
 ###############################################################################
 # Test reading a GeoServer WFS server with OUTPUTFORMAT=json
 
@@ -241,8 +239,7 @@ def test_ogr_wfs_geoserver_json():
         feat.DumpReadable()
         pytest.fail('did not get expected feature')
 
-    return 'success'
-
+    
 
 ###############################################################################
 # Test reading a GeoServer WFS server with OUTPUTFORMAT=SHAPE-ZIP
@@ -276,8 +273,7 @@ def test_ogr_wfs_geoserver_shapezip():
         feat.DumpReadable()
         pytest.fail('did not get expected feature')
 
-    return 'success'
-
+    
 ###############################################################################
 # Test WFS paging
 
@@ -332,8 +328,6 @@ def test_ogr_wfs_geoserver_paging():
     assert feature_count_wfs110 == feature_count_ref, feature_count_wfs100
 
     assert feature_count_wfs110_at_hand == feature_count_ref
-
-    return 'success'
 ###############################################################################
 # Test reading a Deegree WFS server
 
@@ -388,8 +382,7 @@ def test_ogr_wfs_deegree():
     #    gdaltest.post_reason('did not get expected feature count after SetAttributeFilter (2)')
     #    print(feat_count)
     #    return 'fail'
-    return 'success'
-
+    
 ###############################################################################
 # Run test_ogrsf
 
@@ -410,8 +403,6 @@ def test_ogr_wfs_test_ogrsf():
 
     assert ret.find('INFO') != -1 and ret.find('ERROR') == -1
 
-    return 'success'
-
 
 ###############################################################################
 do_log = False
@@ -512,8 +503,6 @@ def test_ogr_wfs_fake_wfs_server():
 
     webserver.server_stop(process, port)
 
-    return 'success'
-
 ###############################################################################
 # Test CreateFeature() / UpdateFeature() / DeleteFeature() (WFS-T)
 
@@ -589,8 +578,6 @@ def test_ogr_wfs_geoserver_wfst():
     sql_lyr = ds.ExecuteSQL("DELETE FROM za:za_points WHERE type = 'type_set_by_ogr_wfs_8_test' OR type = 'type_set_by_ogr_wfs_8_test_2'")
     ds.ReleaseResultSet(sql_lyr)
 
-    return 'success'
-
 
 ###############################################################################
 # Test CreateFeature() / UpdateFeature() / DeleteFeature() with expected
@@ -629,8 +616,7 @@ def test_ogr_wfs_deegree_wfst():
     if ret != 0:
         print('expected fail on SetFeature')
 
-    return 'success'
-
+    
 ###############################################################################
 # Test CreateFeature() / UpdateFeature() / DeleteFeature() on a WFS 1.0.0 server
 
@@ -667,8 +653,6 @@ def test_ogr_wfs_ionic_wfst():
 
     ds.ExecuteSQL("DELETE FROM wfs:BUSINESS WHERE gml_id = '%s'" % gmlid)
 
-    return 'success'
-
 ###############################################################################
 # Test ExecuteSQL() where SQL should be turned into PROPERTYNAME and FILTER parameters
 
@@ -689,8 +673,6 @@ def test_ogr_wfs_ionic_sql():
 
     assert count == 1
 
-    return 'success'
-
 ###############################################################################
 # Test opening a datasource from a XML description file
 # The following test should issue 0 WFS http request
@@ -721,8 +703,6 @@ def test_ogr_wfs_xmldescriptionfile():
 
     ds = None
 
-    return 'success'
-
 ###############################################################################
 # Test opening a datasource from a XML description file that has just the URL
 
@@ -766,8 +746,6 @@ def test_ogr_wfs_xmldescriptionfile_to_be_updated():
 
     os.unlink('tmp/ogr_wfs_xmldescriptionfile_to_be_updated.xml')
 
-    return 'success'
-
 ###############################################################################
 # Test opening a datasource directly from a GetCapabilities answer XML file
 # The following test should issue 0 WFS http request
@@ -785,8 +763,6 @@ def test_ogr_wfs_getcapabilitiesfile():
 
     gdal.Unlink('data/getcapabilities_wfs.gfs')
 
-    return 'success'
-
 ###############################################################################
 # Test opening a datastore which only support GML 3.2.1 output
 
@@ -807,8 +783,6 @@ def test_ogr_wfs_deegree_gml321():
     lyr.GetFeatureCount()
     assert gdal.GetLastErrorMsg() == ''
 
-    return 'success'
-
 ###############################################################################
 # Test WFS 2.0.0 support
 
@@ -857,8 +831,6 @@ def test_ogr_wfs_deegree_wfs200():
     assert allcount == spatialfiltercount and allcount != 0, \
         'spatialfiltercount != allcount'
 
-    return 'success'
-
 ###############################################################################
 # Test WFS SORTBY support
 
@@ -886,8 +858,6 @@ def test_ogr_wfs_deegree_sortby():
 
     ds.ReleaseResultSet(lyr)
 
-    return 'success'
-
 ###############################################################################
 
 
@@ -907,8 +877,7 @@ def ogr_wfs_get_multiple_layer_defn(url):
         lyr = ds.GetLayer(i)
         print('Layer %s has %d fields' % (lyr.GetName(), lyr.GetLayerDefn().GetFieldCount()))
 
-    return 'success'
-
+    
 ###############################################################################
 # Test a ESRI server
 
@@ -970,8 +939,6 @@ def test_ogr_wfs_vsimem_fail_because_not_enabled(with_and_without_streaming):
     gdal.PopErrorHandler()
     assert ds is None
 
-    return 'success'
-
 
 ###############################################################################
 def test_ogr_wfs_vsimem_fail_because_no_get_capabilities(with_and_without_streaming):
@@ -983,8 +950,6 @@ def test_ogr_wfs_vsimem_fail_because_no_get_capabilities(with_and_without_stream
     gdal.PopErrorHandler()
     assert ds is None
 
-    return 'success'
-
 ###############################################################################
 
 
@@ -1000,8 +965,6 @@ def test_ogr_wfs_vsimem_fail_because_empty_response(with_and_without_streaming):
     assert ds is None
     assert gdal.GetLastErrorMsg().find('Empty content returned by server') >= 0
 
-    return 'success'
-
 ###############################################################################
 
 
@@ -1017,8 +980,6 @@ def test_ogr_wfs_vsimem_fail_because_no_WFS_Capabilities(with_and_without_stream
     assert ds is None
     assert gdal.GetLastErrorMsg().find('Cannot find <WFS_Capabilities>') >= 0
 
-    return 'success'
-
 ###############################################################################
 
 
@@ -1034,8 +995,6 @@ def test_ogr_wfs_vsimem_fail_because_exception(with_and_without_streaming):
     assert ds is None
     assert gdal.GetLastErrorMsg().find('Error returned by server : <ServiceExceptionReport/>') >= 0
 
-    return 'success'
-
 ###############################################################################
 
 
@@ -1051,8 +1010,6 @@ def test_ogr_wfs_vsimem_fail_because_invalid_xml_capabilities(with_and_without_s
     assert ds is None
     assert gdal.GetLastErrorMsg().find('Invalid XML content : <invalid_xml') >= 0
 
-    return 'success'
-
 ###############################################################################
 
 
@@ -1070,8 +1027,6 @@ def test_ogr_wfs_vsimem_fail_because_missing_featuretypelist(with_and_without_st
     assert ds is None
     assert gdal.GetLastErrorMsg().find('Cannot find <FeatureTypeList>') >= 0
 
-    return 'success'
-
 ###############################################################################
 
 
@@ -1137,8 +1092,6 @@ def test_ogr_wfs_vsimem_wfs110_open_getcapabilities_file(with_and_without_stream
     assert ds is not None
     assert ds.GetLayerCount() == 1
 
-    return 'success'
-
 ###############################################################################
 
 
@@ -1169,8 +1122,6 @@ def test_ogr_wfs_vsimem_wfs110_minimal_instance(with_and_without_streaming):
     gdal.PopErrorHandler()
     assert ds is None
 
-    return 'success'
-
 ###############################################################################
 
 
@@ -1205,8 +1156,6 @@ def test_ogr_wfs_vsimem_wfs110_one_layer_missing_describefeaturetype(with_and_wi
 
     lyr_defn = lyr.GetLayerDefn()
 
-    return 'success'
-
 ###############################################################################
 
 
@@ -1228,8 +1177,6 @@ def test_ogr_wfs_vsimem_wfs110_one_layer_invalid_describefeaturetype(with_and_wi
     assert gdal.GetLastErrorMsg() != ''
     assert lyr_defn.GetFieldCount() == 0
 
-    return 'success'
-
 ###############################################################################
 
 
@@ -1251,8 +1198,6 @@ def test_ogr_wfs_vsimem_wfs110_one_layer_describefeaturetype_missing_schema(with
     assert gdal.GetLastErrorMsg() != ''
     assert lyr_defn.GetFieldCount() == 0
 
-    return 'success'
-
 ###############################################################################
 
 
@@ -1316,8 +1261,6 @@ def test_ogr_wfs_vsimem_wfs110_one_layer_describefeaturetype(with_and_without_st
     lyr_defn = lyr.GetLayerDefn()
     assert lyr_defn.GetFieldCount() == 7
 
-    return 'success'
-
 
 ###############################################################################
 def test_ogr_wfs_vsimem_wfs110_one_layer_xmldescriptionfile_to_be_updated(with_and_without_streaming):
@@ -1426,8 +1369,6 @@ def test_ogr_wfs_vsimem_wfs110_one_layer_xmldescriptionfile_to_be_updated(with_a
     assert lyr.GetLayerDefn().GetFieldCount() == 2
     ds = None
 
-    return 'success'
-
 ###############################################################################
 
 
@@ -1445,8 +1386,6 @@ def test_ogr_wfs_vsimem_wfs110_one_layer_missing_getfeaturecount_no_hits(with_an
     assert gdal.GetLastErrorMsg() != ''
     assert count == 0
 
-    return 'success'
-
 ###############################################################################
 
 
@@ -1487,8 +1426,6 @@ def test_ogr_wfs_vsimem_wfs110_one_layer_missing_getfeaturecount_with_hits(with_
     assert gdal.GetLastErrorMsg() != ''
     assert count == 0
 
-    return 'success'
-
 ###############################################################################
 
 
@@ -1509,8 +1446,6 @@ def test_ogr_wfs_vsimem_wfs110_one_layer_invalid_getfeaturecount_with_hits(with_
     assert gdal.GetLastErrorMsg() != ''
     assert count == 0
 
-    return 'success'
-
 ###############################################################################
 
 
@@ -1531,8 +1466,6 @@ def test_ogr_wfs_vsimem_wfs110_one_layer_getfeaturecount_with_hits_missing_Featu
     assert gdal.GetLastErrorMsg() != ''
     assert count == 0
 
-    return 'success'
-
 ###############################################################################
 
 
@@ -1553,8 +1486,6 @@ def test_ogr_wfs_vsimem_wfs110_one_layer_getfeaturecount_with_hits_invalid_xml(w
     assert gdal.GetLastErrorMsg() != ''
     assert count == 0
 
-    return 'success'
-
 ###############################################################################
 
 
@@ -1575,8 +1506,6 @@ def test_ogr_wfs_vsimem_wfs110_one_layer_getfeaturecount_with_hits_ServiceExcept
     assert gdal.GetLastErrorMsg() != ''
     assert count == 0
 
-    return 'success'
-
 
 ###############################################################################
 def test_ogr_wfs_vsimem_wfs110_one_layer_getfeaturecount_with_hits_missing_numberOfFeatures(with_and_without_streaming):
@@ -1596,8 +1525,6 @@ def test_ogr_wfs_vsimem_wfs110_one_layer_getfeaturecount_with_hits_missing_numbe
     assert gdal.GetLastErrorMsg() != ''
     assert count == 0
 
-    return 'success'
-
 ###############################################################################
 
 
@@ -1626,8 +1553,6 @@ def test_ogr_wfs_vsimem_wfs110_one_layer_getfeaturecount_with_hits(with_and_with
     count = lyr.GetFeatureCount()
     assert count == 1
 
-    return 'success'
-
 ###############################################################################
 
 
@@ -1645,8 +1570,6 @@ def test_ogr_wfs_vsimem_wfs110_one_layer_missing_getfeature(with_and_without_str
     assert gdal.GetLastErrorMsg() != ''
     assert f is None
 
-    return 'success'
-
 ###############################################################################
 
 
@@ -1668,8 +1591,6 @@ def test_ogr_wfs_vsimem_wfs110_one_layer_invalid_getfeature(with_and_without_str
     assert gdal.GetLastErrorMsg() != ''
     assert f is None
 
-    return 'success'
-
 ###############################################################################
 
 
@@ -1691,8 +1612,6 @@ def test_ogr_wfs_vsimem_wfs110_one_layer_exception_getfeature(with_and_without_s
     assert gdal.GetLastErrorMsg().find('Error returned by server') >= 0
     assert f is None
 
-    return 'success'
-
 ###############################################################################
 
 
@@ -1763,8 +1682,6 @@ def test_ogr_wfs_vsimem_wfs110_one_layer_getfeature(with_and_without_streaming):
         pytest.fail()
     ds.ReleaseResultSet(sql_lyr)
 
-    return 'success'
-
 ###############################################################################
 
 
@@ -1776,8 +1693,6 @@ def test_ogr_wfs_vsimem_wfs110_one_layer_getextent(with_and_without_streaming):
     lyr = ds.GetLayer(0)
     assert lyr.GetExtent() == (2, 2, 49, 49)
 
-    return 'success'
-
 ###############################################################################
 
 
@@ -1798,8 +1713,6 @@ def test_ogr_wfs_vsimem_wfs110_one_layer_getextent_without_getfeature(with_and_w
     assert gdal.GetLastErrorMsg() != ''
     assert extent == (0, 0, 0, 0)
 
-    return 'success'
-
 ###############################################################################
 
 
@@ -1885,8 +1798,7 @@ def test_ogr_wfs_vsimem_wfs110_one_layer_getextent_optimized(with_and_without_st
         for i in range(4):
             assert abs(expected_extent[i] - got_extent[i]) <= 1e-5
 
-    return 'success'
-
+    
 ###############################################################################
 
 
@@ -1982,8 +1894,7 @@ def test_ogr_wfs_vsimem_wfs110_one_layer_getfeature_ogr_getfeature(with_and_with
         f.DumpReadable()
         pytest.fail()
 
-    return 'success'
-
+    
 ###############################################################################
 
 
@@ -2019,8 +1930,6 @@ def test_ogr_wfs_vsimem_wfs110_one_layer_filter_gml_id_failed(with_and_without_s
     assert gdal.GetLastErrorMsg() != ''
     assert f is None
 
-    return 'success'
-
 ###############################################################################
 
 
@@ -2068,8 +1977,6 @@ def test_ogr_wfs_vsimem_wfs110_one_layer_filter_gml_id_success(with_and_without_
     f = lyr.GetNextFeature()
     assert f is not None
 
-    return 'success'
-
 ###############################################################################
 
 
@@ -2117,8 +2024,6 @@ def test_ogr_wfs_vsimem_wfs110_one_layer_filter(with_and_without_streaming):
     f = lyr.GetNextFeature()
     assert f is not None
 
-    return 'success'
-
 ###############################################################################
 
 
@@ -2276,8 +2181,6 @@ def test_ogr_wfs_vsimem_wfs110_one_layer_filter_spatial_ops(with_and_without_str
     assert f is None
     ds.ReleaseResultSet(sql_lyr)
 
-    return 'success'
-
 ###############################################################################
 
 
@@ -2338,8 +2241,7 @@ def test_ogr_wfs_vsimem_wfs110_one_layer_spatial_filter(with_and_without_streami
         f = lyr.GetNextFeature()
         assert f is not None
 
-    return 'success'
-
+    
 ###############################################################################
 
 
@@ -2388,8 +2290,6 @@ def test_ogr_wfs_vsimem_wfs110_one_layer_spatial_filter_and_attribute_filter(wit
     f = lyr.GetNextFeature()
     assert f is not None
 
-    return 'success'
-
 ###############################################################################
 
 
@@ -2786,8 +2686,6 @@ def test_ogr_wfs_vsimem_wfs110_insertfeature(with_and_without_streaming):
     gdal.Unlink(wfs_insert_url)
     wfs_insert_url = None
 
-    return 'success'
-
 ###############################################################################
 
 
@@ -2950,8 +2848,6 @@ def test_ogr_wfs_vsimem_wfs110_updatefeature(with_and_without_streaming):
     ret = lyr.SetFeature(f)
     assert ret == 0
 
-    return 'success'
-
 ###############################################################################
 
 
@@ -3094,8 +2990,6 @@ def test_ogr_wfs_vsimem_wfs110_deletefeature(with_and_without_streaming):
     gdal.PopErrorHandler()
     assert sql_lyr is None and gdal.GetLastErrorMsg() != ''
 
-    return 'success'
-
 ###############################################################################
 
 
@@ -3194,8 +3088,7 @@ def test_ogr_wfs_vsimem_wfs110_schema_not_understood(with_and_without_streaming)
         f.DumpReadable()
         pytest.fail()
 
-    return 'success'
-
+    
 ###############################################################################
 
 
@@ -3340,8 +3233,6 @@ def test_ogr_wfs_vsimem_wfs110_multiple_layers(with_and_without_streaming):
     lyr_defn = lyr.GetLayerDefn()
     assert lyr_defn.GetFieldCount() == 2
 
-    return 'success'
-
 ###############################################################################
 
 
@@ -3437,8 +3328,6 @@ def test_ogr_wfs_vsimem_wfs110_multiple_layers_same_name_different_ns(with_and_w
     lyr_defn = lyr.GetLayerDefn()
     assert lyr_defn.GetFieldCount() == 3
 
-    return 'success'
-
 ###############################################################################
 
 
@@ -3633,8 +3522,7 @@ def test_ogr_wfs_vsimem_wfs200_paging(with_and_without_streaming):
     #    print(lyr.GetFeatureCount())
     #    return 'fail'
 
-    return 'success'
-
+    
 
 ###############################################################################
 def test_ogr_wfs_vsimem_wfs200_json(with_and_without_streaming):
@@ -3767,8 +3655,7 @@ def test_ogr_wfs_vsimem_wfs200_json(with_and_without_streaming):
         f.DumpReadable()
         pytest.fail()
 
-    return 'success'
-
+    
 
 ###############################################################################
 def test_ogr_wfs_vsimem_wfs200_multipart(with_and_without_streaming):
@@ -3892,8 +3779,7 @@ def test_ogr_wfs_vsimem_wfs200_multipart(with_and_without_streaming):
         f.DumpReadable()
         pytest.fail()
 
-    return 'success'
-
+    
 ###############################################################################
 
 
@@ -4330,8 +4216,6 @@ def test_ogr_wfs_vsimem_wfs200_join(with_and_without_streaming):
 
     ds = None
 
-    return 'success'
-
 ###############################################################################
 
 
@@ -4446,8 +4330,6 @@ def test_ogr_wfs_vsimem_wfs200_join_layer_with_namespace_prefix(with_and_without
 
     ds.ReleaseResultSet(sql_lyr)
 
-    return 'success'
-
 ###############################################################################
 
 
@@ -4608,8 +4490,6 @@ def test_ogr_wfs_vsimem_wfs200_join_distinct(with_and_without_streaming):
 
     ds.ReleaseResultSet(sql_lyr)
 
-    return 'success'
-
 ###############################################################################
 
 
@@ -4620,8 +4500,7 @@ def test_ogr_wfs_vsimem_cleanup(with_and_without_streaming):
     for f in gdal.ReadDir('/vsimem/'):
         gdal.Unlink('/vsimem/' + f)
 
-    return 'success'
-
+    
 
 gdaltest_list = [
     test_ogr_wfs_vsimem_fail_because_not_enabled,
diff --git a/autotest/ogr/ogr_wfs3.py b/autotest/ogr/ogr_wfs3.py
index cf006fd0223d..ebed648ce49c 100755
--- a/autotest/ogr/ogr_wfs3.py
+++ b/autotest/ogr/ogr_wfs3.py
@@ -53,8 +53,7 @@ def test_ogr_wfs3_init():
     if gdaltest.webserver_port == 0:
         pytest.skip()
 
-    return 'success'
-
+    
 ###############################################################################
 
 
@@ -128,8 +127,6 @@ def test_ogr_wfs3_errors():
     assert ds.GetLayer(-1) is None
     assert ds.GetLayer(0) is None
 
-    return 'success'
-
 ###############################################################################
 
 
@@ -158,8 +155,7 @@ def test_ogr_wfs3_empty_layer():
     with webserver.install_http_handler(handler):
         assert lyr.GetLayerDefn().GetFieldCount() == 0
 
-    return 'success'
-
+    
 ###############################################################################
 
 
@@ -230,8 +226,7 @@ def test_ogr_wfs3_fc_links_next_geojson():
         f.DumpReadable()
         pytest.fail()
 
-    return 'success'
-
+    
 ###############################################################################
 
 
@@ -301,8 +296,7 @@ def test_ogr_wfs3_fc_links_next_headers():
         f.DumpReadable()
         pytest.fail()
 
-    return 'success'
-
+    
 ###############################################################################
 
 
@@ -376,8 +370,6 @@ def test_ogr_wfs3_spatial_filter():
         f = lyr.GetNextFeature()
     assert f is not None
 
-    return 'success'
-
 ###############################################################################
 
 
@@ -442,8 +434,7 @@ def test_ogr_wfs3_get_feature_count():
     with webserver.install_http_handler(handler):
         assert lyr.GetFeatureCount() == 1234
 
-    return 'success'
-
+    
 ###############################################################################
 
 
@@ -561,8 +552,6 @@ def test_ogr_wfs3_attribute_filter():
         f = lyr.GetNextFeature()
     assert f is not None
 
-    return 'success'
-
 ###############################################################################
 
 
@@ -574,8 +563,7 @@ def test_ogr_wfs3_cleanup():
     if gdaltest.webserver_port != 0:
         webserver.server_stop(gdaltest.webserver_process, gdaltest.webserver_port)
 
-    return 'success'
-
+    
 
 gdaltest_list = [
     test_ogr_wfs3_init,
diff --git a/autotest/ogr/ogr_wkbwkt_geom.py b/autotest/ogr/ogr_wkbwkt_geom.py
index ac84c70a8330..d08e45a663a0 100755
--- a/autotest/ogr/ogr_wkbwkt_geom.py
+++ b/autotest/ogr/ogr_wkbwkt_geom.py
@@ -108,8 +108,6 @@ def test_wkbwkt_geom(unit):
 
     geom_wkt.Destroy()
 
-    return 'success'
-
 ###############################################################################
 # Test geometry with very large exponents of coordinate values.
 
@@ -127,8 +125,6 @@ def test_ogr_wkbwkt_geom_bigexponents():
 
     assert str(wkt) == str(expect), 'trimming long float numbers failed.'
 
-    return 'success'
-
 
 ###############################################################################
 # Test importing broken/unhandled WKT.
@@ -365,8 +361,7 @@ def test_ogr_wkbwkt_test_broken_geom():
         gdal.PopErrorHandler()
         assert geom is None, ('geom %s instantiated but not expected' % wkt)
 
-    return 'success'
-
+    
 ###############################################################################
 # Test importing WKT SF1.2
 
@@ -490,8 +485,7 @@ def test_ogr_wkbwkt_test_import_wkt_sf12():
             ('in=%s, out=%s, expected=%s.' % (wkt_tuple[0], out_wkt,
                                                  wkt_tuple[1]))
 
-    return 'success'
-
+    
 ###############################################################################
 # Test that importing the wkb that would be equivalent to MULTIPOINT(POLYGON((0 0))
 # doesn't work
@@ -506,8 +500,6 @@ def test_ogr_wkbwkt_test_import_bad_multipoint_wkb():
     gdal.PopErrorHandler()
     assert geom is None
 
-    return 'success'
-
 ###############################################################################
 # Test WKT -> WKB -> WKT roundtripping for GEOMETRYCOLLECTION
 
@@ -534,8 +526,7 @@ def test_ogr_wkbwkt_test_geometrycollection_wktwkb():
         wkt2 = g.ExportToWkt()
         assert wkt == wkt2, ('fail for %s' % wkt)
 
-    return 'success'
-
+    
 ###############################################################################
 # Test that importing too nested WKT doesn't cause stack overflows
 
@@ -554,8 +545,6 @@ def test_ogr_wkbwkt_test_geometrycollection_wkt_recursion():
     gdal.PopErrorHandler()
     assert geom is None, 'expected None'
 
-    return 'success'
-
 ###############################################################################
 # Test that importing too nested WKB doesn't cause stack overflows
 
@@ -578,8 +567,6 @@ def test_ogr_wkbwkt_test_geometrycollection_wkb_recursion():
     gdal.PopErrorHandler()
     assert geom is None, 'expected None'
 
-    return 'success'
-
 ###############################################################################
 # Test ISO WKT compliant export of MULTIPOINT
 
@@ -591,8 +578,6 @@ def test_ogr_wkbwkt_export_wkt_iso_multipoint():
     out_wkt = g.ExportToIsoWkt()
     assert out_wkt == wkt
 
-    return 'success'
-
 ###############################################################################
 # Test exporting WKT with non finite values (#6319)
 
@@ -604,8 +589,6 @@ def test_ogr_wkt_inf_nan():
     out_wkt = g.ExportToWkt()
     assert out_wkt == 'POINT (inf -inf nan)'
 
-    return 'success'
-
 ###############################################################################
 # Test corrupted WKT
 
@@ -616,8 +599,6 @@ def test_ogr_wkt_multicurve_compoundcurve_corrupted():
         g = ogr.CreateGeometryFromWkt('MULTICURVE(COMPOUNDCURVE')
     assert g is None
 
-    return 'success'
-
 ###############################################################################
 # Test corrupted WKT
 
@@ -628,8 +609,6 @@ def test_ogr_wkt_multipolygon_corrupted():
         g = ogr.CreateGeometryFromWkt('MULTIPOLYGON(POLYGON((N')
     assert g is None
 
-    return 'success'
-
 ###############################################################################
 # When imported build a list of units based on the files available.
 
diff --git a/autotest/ogr/ogr_wktempty.py b/autotest/ogr/ogr_wktempty.py
index 0e1af663544e..1f4c50e79e34 100755
--- a/autotest/ogr/ogr_wktempty.py
+++ b/autotest/ogr/ogr_wktempty.py
@@ -139,8 +139,6 @@ def test_ogr_wktempty_test_partial_empty_geoms():
     assert geom.ExportToWkt() == wkt, \
         ('WKT is wrong: ' + geom.ExportToWkt() + '. Expected value is: ' + wkt)
 
-    return 'success'
-
 
 gdaltest_list = [test_ogr_wktempty_test_partial_empty_geoms]
 
diff --git a/autotest/ogr/ogr_xls.py b/autotest/ogr/ogr_xls.py
index 2f777f9e183f..cf77eb3b2bd2 100755
--- a/autotest/ogr/ogr_xls.py
+++ b/autotest/ogr/ogr_xls.py
@@ -89,8 +89,6 @@ def test_ogr_xls_1():
     feat = lyr.GetNextFeature()
     assert feat is None
 
-    return 'success'
-
 ###############################################################################
 # Test OGR_XLS_HEADERS = DISABLE
 
@@ -110,8 +108,6 @@ def test_ogr_xls_2():
 
     gdal.SetConfigOption('OGR_XLS_HEADERS', None)
 
-    return 'success'
-
 ###############################################################################
 # Test OGR_XLS_FIELD_TYPES = STRING
 
@@ -131,8 +127,6 @@ def test_ogr_xls_3():
 
     gdal.SetConfigOption('OGR_XLS_FIELD_TYPES', None)
 
-    return 'success'
-
 ###############################################################################
 # Run test_ogrsf
 
@@ -151,8 +145,6 @@ def test_ogr_xls_4():
 
     assert ret.find('INFO') != -1 and ret.find('ERROR') == -1
 
-    return 'success'
-
 
 gdaltest_list = [
     test_ogr_xls_1,
diff --git a/autotest/ogr/ogr_xlsx.py b/autotest/ogr/ogr_xlsx.py
index 9ee02ce8faf5..f429b40130e3 100755
--- a/autotest/ogr/ogr_xlsx.py
+++ b/autotest/ogr/ogr_xlsx.py
@@ -95,8 +95,7 @@ def ogr_xlsx_check(ds):
         feat.DumpReadable()
         pytest.fail()
 
-    return 'success'
-
+    
 ###############################################################################
 # Basic tests
 
@@ -133,8 +132,6 @@ def test_ogr_xlsx_2():
 
     gdal.SetConfigOption('OGR_XLSX_HEADERS', None)
 
-    return 'success'
-
 ###############################################################################
 # Test OGR_XLSX_FIELD_TYPES = STRING
 
@@ -154,8 +151,6 @@ def test_ogr_xlsx_3():
 
     gdal.SetConfigOption('OGR_XLSX_FIELD_TYPES', None)
 
-    return 'success'
-
 ###############################################################################
 # Run test_ogrsf
 
@@ -174,8 +169,6 @@ def test_ogr_xlsx_4():
 
     assert ret.find('INFO') != -1 and ret.find('ERROR') == -1
 
-    return 'success'
-
 ###############################################################################
 # Test write support
 
@@ -227,8 +220,6 @@ def test_ogr_xlsx_6():
 
     gdal.SetConfigOption('OGR_XLSX_HEADERS', None)
 
-    return 'success'
-
 ###############################################################################
 # Test update support
 
@@ -267,8 +258,6 @@ def test_ogr_xlsx_7():
 
     os.unlink('tmp/ogr_xlsx_7.xlsx')
 
-    return 'success'
-
 ###############################################################################
 # Test number of columns > 26 (#5774)
 
@@ -298,8 +287,6 @@ def test_ogr_xlsx_8():
 
     gdal.Unlink('/vsimem/ogr_xlsx_8.xlsx')
 
-    return 'success'
-
 ###############################################################################
 # Test Integer64
 
@@ -335,8 +322,6 @@ def test_ogr_xlsx_9():
 
     gdal.Unlink('/vsimem/ogr_xlsx_9.xlsx')
 
-    return 'success'
-
 ###############################################################################
 # Test DateTime with milliseconds
 
@@ -378,8 +363,6 @@ def test_ogr_xlsx_10():
 
     gdal.Unlink('/vsimem/ogr_xlsx_10.xlsx')
 
-    return 'success'
-
 ###############################################################################
 # Test reading sheet with more than 26 columns with holes (#6363)"
 
@@ -399,8 +382,6 @@ def test_ogr_xlsx_11():
             pytest.fail()
     ds = None
 
-    return 'success'
-
 ###############################################################################
 # Test reading a sheet whose file is stored as "absolute" in
 # workbook.xml.rels (#6733)
@@ -418,8 +399,6 @@ def test_ogr_xlsx_12():
     assert f is not None
     ds = None
 
-    return 'success'
-
 ###############################################################################
 # Test that data types are correctly picked up even if first row is missing data
 
@@ -465,8 +444,7 @@ def test_ogr_xlsx_13():
         assert lyr.GetLayerDefn().GetFieldDefn(i).GetType() == typ, \
             'invalid type for field {}'.format(i + 1)
 
-    return 'success'
-
+    
 ###############################################################################
 # Test that field names are picked up even if last field has no data
 
@@ -512,8 +490,7 @@ def test_ogr_xlsx_14():
         assert lyr.GetLayerDefn().GetFieldDefn(i).GetType() == typ, \
             'invalid type for field {}'.format(i + 1)
 
-    return 'success'
-
+    
 ###############################################################################
 # Test appending a layer to an existing document
 
@@ -534,7 +511,6 @@ def test_ogr_xlsx_15():
     ds = None
 
     gdal.Unlink(out_filename)
-    return 'success'
 
 ###############################################################################
 # Test Boolean
@@ -568,8 +544,6 @@ def test_ogr_xlsx_boolean():
 
     gdal.Unlink(out_filename)
 
-    return 'success'
-
 
 gdaltest_list = [
     test_ogr_xlsx_1,
diff --git a/autotest/ogr/ogr_xplane.py b/autotest/ogr/ogr_xplane.py
index 5d2f2fb578df..bf1378c4340a 100755
--- a/autotest/ogr/ogr_xplane.py
+++ b/autotest/ogr/ogr_xplane.py
@@ -72,8 +72,7 @@ def test_ogr_xplane_apt_dat():
         for item in layer[2]:
             assert feat_read.GetField(item[0]) == item[1], layer[0]
 
-    return 'success'
-
+    
 
 ###############################################################################
 # Test apt.dat v810 reading
@@ -112,8 +111,7 @@ def test_ogr_xplane_apt_v810_dat():
         for item in layer[2]:
             assert feat_read.GetField(item[0]) == item[1], layer[0]
 
-    return 'success'
-
+    
 ###############################################################################
 # Test nav.dat reading
 
@@ -143,8 +141,6 @@ def test_ogr_xplane_nav_dat():
 
     xplane_nav_ds = None
 
-    return 'success'
-
 
 ###############################################################################
 # Test awy.dat reading
@@ -167,8 +163,7 @@ def test_ogr_xplane_awy_dat():
         for item in layer[2]:
             assert feat_read.GetField(item[0]) == item[1], layer[0]
 
-    return 'success'
-
+    
 ###############################################################################
 # Test fix.dat reading
 
@@ -190,8 +185,7 @@ def test_ogr_xplane_fix_dat():
         for item in layer[2]:
             assert feat_read.GetField(item[0]) == item[1], layer[0]
 
-    return 'success'
-
+    
 ###############################################################################
 #
 
diff --git a/autotest/ogr/ograpispy.py b/autotest/ogr/ograpispy.py
index 041d9703e60a..f56dbd5d644d 100755
--- a/autotest/ogr/ograpispy.py
+++ b/autotest/ogr/ograpispy.py
@@ -70,8 +70,7 @@ def test_ograpispy_1():
             print(line)
         pytest.fail('did not get expected script')
 
-    return 'success'
-
+    
 ###############################################################################
 # With snapshoting
 
@@ -123,8 +122,6 @@ def test_ograpispy_2():
 
     shutil.rmtree('tmp/snapshot_1/working')
 
-    return 'success'
-
 ###############################################################################
 #
 
@@ -144,8 +141,6 @@ def test_ograpispy_cleanup():
         pass
     gdal.Unlink('/vsimem/test2.csv')
 
-    return 'success'
-
 
 gdaltest_list = [
     test_ograpispy_1,
diff --git a/autotest/osr/osr_basic.py b/autotest/osr/osr_basic.py
index ef8bd35c4b99..2226dc846c76 100755
--- a/autotest/osr/osr_basic.py
+++ b/autotest/osr/osr_basic.py
@@ -82,8 +82,7 @@ def test_osr_basic_1():
                                  % (utm_srs.GetAuthorityName(auth[0]),
                                      auth[1], auth[0]))
 
-    return 'success'
-
+    
 ###############################################################################
 # Simple default NAD83 State Plane zone.
 
@@ -124,8 +123,7 @@ def test_osr_basic_2():
                                  % (srs.GetAuthorityCode(auth[0]),
                                     auth[1], auth[0]))
 
-    return 'success'
-
+    
 ###############################################################################
 # NAD83 State Plane zone, but overridden to be in Feet.
 
@@ -186,8 +184,7 @@ def test_osr_basic_3():
         print('%.16g' % srs.GetTargetLinearUnits(None))
         pytest.fail('Didnt get Foot linear units')
 
-    return 'success'
-
+    
 
 ###############################################################################
 # Translate a coordinate system with nad shift into to PROJ.4 and back
@@ -212,8 +209,6 @@ def test_osr_basic_4():
     assert srs2.GetTOWGS84() == (1, 2, 3, 0, 0, 0, 0), \
         'GetTOWGS84() result is wrong after PROJ.4 conversion.'
 
-    return 'success'
-
 ###############################################################################
 # Test URN support for OGC:CRS84.
 
@@ -224,8 +219,6 @@ def test_osr_basic_5():
     wkt_2 = osr.GetUserInputAsWKT('WGS84')
     assert wkt_1 == wkt_2, 'CRS84 lookup not as expected.'
 
-    return 'success'
-
 ###############################################################################
 # Test URN support for EPSG
 
@@ -251,8 +244,7 @@ def test_osr_basic_6():
         print(wkt_1)
         pytest.fail('EPSG:4326 urn lookup not as expected.')
 
-    return 'success'
-
+    
 ###############################################################################
 # Test URN support for auto projection.
 
@@ -263,8 +255,6 @@ def test_osr_basic_7():
     wkt_2 = 'PROJCS["UTM Zone 11, Northern Hemisphere",GEOGCS["WGS 84",DATUM["WGS_1984",SPHEROID["WGS 84",6378137,298.257223563,AUTHORITY["EPSG","7030"]],AUTHORITY["EPSG","6326"]],PRIMEM["Greenwich",0,AUTHORITY["EPSG","8901"]],UNIT["degree",0.0174532925199433,AUTHORITY["EPSG","9122"]],AUTHORITY["EPSG","4326"]],PROJECTION["Transverse_Mercator"],PARAMETER["latitude_of_origin",0],PARAMETER["central_meridian",-117],PARAMETER["scale_factor",0.9996],PARAMETER["false_easting",500000],PARAMETER["false_northing",0],UNIT["Meter",1,AUTHORITY["EPSG","9001"]]]'
     assert wkt_1 == wkt_2, 'AUTO42001 urn lookup not as expected.'
 
-    return 'success'
-
 ###############################################################################
 # Test the SetLinearUnitsAndUpdateParameters() method.
 
@@ -290,8 +280,6 @@ def test_osr_basic_8():
 
     assert abs(fe - 3280.840) <= 0.01, 'wrong updated false easting value.'
 
-    return 'success'
-
 ###############################################################################
 # Test the Validate() method.
 
@@ -302,8 +290,6 @@ def test_osr_basic_9():
     srs.SetFromUserInput("PROJCS[\"unnamed\",GEOGCS[\"unnamed ellipse\",DATUM[\"unknown\",SPHEROID[\"unnamed\",6378137,0]],PRIMEM[\"Greenwich\",0],UNIT[\"degree\",0.0174532925199433]],PROJECTION[\"Mercator_2SP\"],PARAMETER[\"standard_parallel_1\",0],PARAMETER[\"latitude_of_origin\",0],PARAMETER[\"central_meridian\",0],PARAMETER[\"false_easting\",0],PARAMETER[\"false_northing\",0],UNIT[\"Meter\",1],EXTENSION[\"PROJ4\",\"+proj=merc +a=6378137 +b=6378137 +lat_ts=0.0 +lon_0=0.0 +x_0=0.0 +y_0=0 +k=1.0 +units=m +nadgrids=@null +wktext  +no_defs\"]]")
     assert srs.Validate() == 0
 
-    return 'success'
-
 
 ###############################################################################
 # Test the Validate() method on PROJCS with AXIS definition (#2739)
@@ -337,8 +323,6 @@ def test_osr_basic_10():
 
     assert srs.Validate() == 0
 
-    return 'success'
-
 ###############################################################################
 # Test the IsSame() method (and the IsSameGeogCS() method through that)
 
@@ -391,7 +375,7 @@ def test_osr_basic_11():
     AXIS["Northing",NORTH]]""")
 
     if srs1.IsSame(srs2):
-        return 'success'
+        return
 
     pytest.fail()
 
@@ -405,8 +389,6 @@ def test_osr_basic_12():
     wkt_2 = osr.GetUserInputAsWKT('WGS84')
     assert wkt_1 == wkt_2, 'CRS:84 lookup not as expected.'
 
-    return 'success'
-
 ###############################################################################
 # Test GEOCCS lookup in supporting data files.
 
@@ -425,8 +407,6 @@ def test_osr_basic_13():
 
     assert srs.Validate() == 0, 'epsg geoccs import does not validate!'
 
-    return 'success'
-
 ###############################################################################
 # Manually setup a simple geocentric/wgs84 srs.
 
@@ -447,8 +427,6 @@ def test_osr_basic_14():
 
     assert srs.Validate() == 0, 'geocentric srs not recognised as valid.'
 
-    return 'success'
-
 ###############################################################################
 # Test validation and fixup methods.
 
@@ -476,8 +454,6 @@ def test_osr_basic_15():
 
     assert srs.Validate() == 0, 'Fixup() failed to correct srs.'
 
-    return 'success'
-
 ###############################################################################
 # Test OSRSetGeocCS()
 
@@ -551,8 +527,7 @@ def test_osr_basic_16():
         print('Expected:%s' % expect_wkt)
         pytest.fail('Did not get expected result.')
 
-    return 'success'
-
+    
 ###############################################################################
 # Test OGC URL support
 
@@ -563,8 +538,6 @@ def test_osr_basic_17():
     wkt_2 = osr.GetUserInputAsWKT('http://www.opengis.net/def/crs/EPSG/0/4326')
     assert wkt_1 == wkt_2, 'CRS URL parsing not as expected.'
 
-    return 'success'
-
 ###############################################################################
 # Test OGC URL support for compound CRS
 
@@ -575,8 +548,6 @@ def test_osr_basic_18():
     wkt = osr.GetUserInputAsWKT('http://www.opengis.net/def/crs-compound?1=http://www.opengis.net/def/crs/EPSG/0/4326&2=http://www.opengis.net/def/crs/EPSG/0/4326')
     assert wkt.find('COMPD_CS') == 0, 'CRS URL parsing not as expected.'
 
-    return 'success'
-
 ###############################################################################
 # Test well known GCS names against their corresponding EPSG definitions (#6080)
 
@@ -615,8 +586,6 @@ def test_osr_basic_19():
 
     assert sr.ExportToWkt() == sr_ref.ExportToWkt()
 
-    return 'success'
-
 ###############################################################################
 # Test GetAxisName() and GetAxisOrientation() and GetAngularUnitsName()
 
@@ -636,8 +605,6 @@ def test_osr_basic_20():
 
     assert sr.GetAngularUnitsName() == 'degree'
 
-    return 'success'
-
 ###############################################################################
 # Test IsSame() with equivalent forms of Mercator_1SP and Mercator_2SP
 
@@ -694,8 +661,6 @@ def test_osr_basic_21():
 
     assert sr1.IsSame(sr2_not_equivalent) != 1
 
-    return 'success'
-
 ###############################################################################
 # Test LCC_2SP -> LCC_1SP -> LCC_2SP
 
@@ -873,8 +838,6 @@ def test_osr_basic_22():
     expected_sr3.ImportFromWkt(expected_sr3_wkt)
     assert sr3.IsSame(expected_sr3) != 0
 
-    return 'success'
-
 ###############################################################################
 # Test LCC_1SP -> LCC_2SP -> LCC_1SP
 
@@ -935,8 +898,6 @@ def test_osr_basic_23():
     sr3 = sr2.ConvertToOtherProjection(osr.SRS_PT_LAMBERT_CONFORMAL_CONIC_1SP)
     assert sr3.IsSame(sr) != 0
 
-    return 'success'
-
 ###############################################################################
 # Test Mercator_1SP -> Mercator_2SP -> Mercator_1SP
 
@@ -987,8 +948,6 @@ def test_osr_basic_24():
     sr3 = sr2.ConvertToOtherProjection(osr.SRS_PT_MERCATOR_1SP)
     assert sr3.IsSame(sr) != 0
 
-    return 'success'
-
 ###############################################################################
 # Test corner cases of ConvertToOtherProjection()
 
@@ -1247,8 +1206,6 @@ def test_osr_basic_25():
     sr2 = sr.ConvertToOtherProjection('Lambert_Conformal_Conic_1SP')
     assert sr2 is None
 
-    return 'success'
-
 ###############################################################################
 # Test corner cases of osr.SetGeocCS()
 
@@ -1270,8 +1227,6 @@ def test_osr_basic_setgeogcs():
     assert sr.SetGeogCS(None, None, None, 0, 0, None, 0, None, 0) != 0, sr.ExportToWkt()
     assert sr.ExportToWkt() == 'FOO["bar",GEOGCS[]]'
 
-    return 'success'
-
 ###############################################################################
 
 
diff --git a/autotest/osr/osr_compd.py b/autotest/osr/osr_compd.py
index 2fcff59ce26f..e17e6d91f442 100755
--- a/autotest/osr/osr_compd.py
+++ b/autotest/osr/osr_compd.py
@@ -69,8 +69,6 @@ def test_osr_compd_1():
 
     assert srs.Validate() == 0, 'Validate() failed.'
 
-    return 'success'
-
 ###############################################################################
 # Test SetFromUserInput()
 
@@ -84,8 +82,6 @@ def test_osr_compd_2():
 
     assert srs.IsProjected(), 'Projected COMPD_CS not recognised as projected.'
 
-    return 'success'
-
 ###############################################################################
 # Test expansion of compound coordinate systems from EPSG definition.
 
@@ -132,11 +128,6 @@ def test_osr_compd_3():
     wkt = srs.ExportToPrettyWkt()
     assert gdaltest.equal_srs_from_wkt(exp_wkt, wkt) != 0, \
         'did not get expected compound cs for EPSG:7401'
-    # elif exp_wkt != wkt:
-    #    print('warning they are equivalent, but not completely the same')
-    #    print(wkt)
-
-    return 'success'
 
 ###############################################################################
 # Test expansion of GCS+VERTCS compound coordinate system.
@@ -173,11 +164,6 @@ def test_osr_compd_4():
 
     assert gdaltest.equal_srs_from_wkt(exp_wkt, wkt) != 0, \
         'did not get expected compound cs for EPSG:7400'
-    # elif exp_wkt != wkt:
-    #    print('warning they are equivalent, but not completely the same')
-    #    print(wkt)
-
-    return 'success'
 
 ###############################################################################
 # Test that compound coordinate systems with grid shift files are
@@ -237,8 +223,6 @@ def test_osr_compd_5():
     proj4 = srs.ExportToProj4()
     assert proj4 == exp_proj4, ('Did not get expected proj.4 string, got:' + proj4)
 
-    return 'success'
-
 ###############################################################################
 # Test conversion from PROJ.4 to WKT including vertical units.
 
@@ -288,8 +272,6 @@ def test_osr_compd_6():
     proj4 = srs.ExportToProj4()
     assert proj4 == exp_proj4, ('Did not get expected proj.4 string, got:' + proj4)
 
-    return 'success'
-
 ###############################################################################
 # Test SetCompound()
 
@@ -343,8 +325,7 @@ def test_osr_compd_7():
         print('%.16g' % srs.GetTargetLinearUnits(None))
         pytest.fail('Didnt get expected linear units')
 
-    return 'success'
-
+    
 ###############################################################################
 # Test ImportFromURN()
 
@@ -359,8 +340,6 @@ def test_osr_compd_8():
     wkt = srs.ExportToWkt()
     assert wkt.find('COMPD_CS') == 0, 'COMPD_CS not recognised as compound.'
 
-    return 'success'
-
 
 gdaltest_list = [
     test_osr_compd_1,
diff --git a/autotest/osr/osr_ct.py b/autotest/osr/osr_ct.py
index 445feb587a95..3bfa14ed443a 100755
--- a/autotest/osr/osr_ct.py
+++ b/autotest/osr/osr_ct.py
@@ -72,8 +72,6 @@ def test_osr_ct_1():
 
     gdaltest.have_proj4 = 1
 
-    return 'success'
-
 ###############################################################################
 # Actually perform a simple LL to UTM conversion.
 
@@ -95,7 +93,6 @@ def test_osr_ct_2():
     result = gdaltest.ct.TransformPoint(-117.5, 32.0, 0.0)
     assert abs(result[0] - 452772.06) <= 0.01 and abs(result[1] - 3540544.89) <= 0.01 and abs(result[2] - 0.0) <= 0.01, \
         'Wrong LL to UTM result'
-    return 'success'
 
 ###############################################################################
 # Transform an OGR geometry ... this is mostly aimed at ensuring that
@@ -130,8 +127,6 @@ def test_osr_ct_3():
 
     pnt = None
 
-    return 'success'
-
 ###############################################################################
 # Actually perform a simple LL to UTM conversion.
 # Works for both OG and NG bindings
@@ -157,8 +152,7 @@ def test_osr_ct_4():
         assert abs(result[i][0] - 452772.06) <= 0.01 and abs(result[i][1] - 3540544.89) <= 0.01 and abs(result[i][2] - 0.0) <= 0.01, \
             'Wrong LL to UTM result'
 
-    return 'success'
-
+    
 ###############################################################################
 # Same test, but with any sequence of tuples instead of a tuple of tuple
 # New in NG bindings (#3020)
@@ -184,8 +178,7 @@ def test_osr_ct_5():
         assert abs(result[i][0] - 452772.06) <= 0.01 and abs(result[i][1] - 3540544.89) <= 0.01 and abs(result[i][2] - 0.0) <= 0.01, \
             'Wrong LL to UTM result'
 
-    return 'success'
-
+    
 ###############################################################################
 # Test osr.CreateCoordinateTransformation() method
 
@@ -214,8 +207,7 @@ def test_osr_ct_6():
         assert abs(result[i][0] - 452772.06) <= 0.01 and abs(result[i][1] - 3540544.89) <= 0.01 and abs(result[i][2] - 0.0) <= 0.01, \
             'Wrong LL to UTM result'
 
-    return 'success'
-
+    
 ###############################################################################
 # Actually perform a simple Pseudo Mercator to LL conversion.
 
@@ -255,8 +247,7 @@ def test_osr_ct_7():
         print('Expected: %s' % expected_pnt.ExportToWkt())
         pytest.fail('Failed to transform from Pseudo Mercator to LL')
 
-    return 'success'
-
+    
 ###############################################################################
 # Test WebMercator -> WGS84 optimized transform
 
@@ -296,8 +287,7 @@ def test_osr_ct_8():
                 print('Expected: %s' % str(expected_result))
                 pytest.fail('Failed to transform from Pseudo Mercator to LL')
 
-    return 'success'
-
+    
 ###############################################################################
 # Cleanup
 
@@ -309,8 +299,6 @@ def test_osr_ct_cleanup():
 
     gdaltest.ct = None
 
-    return 'success'
-
 
 gdaltest_list = [
     test_osr_ct_1,
diff --git a/autotest/osr/osr_ct_proj.py b/autotest/osr/osr_ct_proj.py
index 8ee89e06ea11..512aaf745261 100755
--- a/autotest/osr/osr_ct_proj.py
+++ b/autotest/osr/osr_ct_proj.py
@@ -212,5 +212,3 @@ def test_proj(src_srs, src_xyz, src_error,
 
     assert error <= src_error, \
         ('Back to source error is %g.%s' % (error, additionnal_error_str))
-
-    return 'success'
diff --git a/autotest/osr/osr_epsg.py b/autotest/osr/osr_epsg.py
index 37ccadde360d..da1db403e62a 100755
--- a/autotest/osr/osr_epsg.py
+++ b/autotest/osr/osr_epsg.py
@@ -51,8 +51,7 @@ def test_osr_epsg_1():
         print(srs.ExportToPrettyWkt())
         pytest.fail('Wrong central meridian, override missed?')
 
-    return 'success'
-
+    
 ###############################################################################
 # Check that EPSG:4312 lookup has the towgs84 values set properly
 # from gcs.override.csv.
@@ -68,8 +67,7 @@ def test_osr_epsg_2():
         print(srs.ExportToPrettyWkt())
         pytest.fail('Wrong TOWGS84, override missed?')
 
-    return 'success'
-
+    
 ###############################################################################
 # Check that various EPSG lookups based on Pulvoko 1942 have the
 # towgs84 values set properly (#3579)
@@ -89,8 +87,7 @@ def test_osr_epsg_3():
                 print(srs.ExportToPrettyWkt())
                 pytest.fail('For EPSG:%d. Wrong TOWGS84, override missed?' % epsg)
 
-    return 'success'
-
+    
 ###############################################################################
 #   Check that EPSG:4326 is *not* considered as lat/long (#3813)
 
@@ -104,8 +101,6 @@ def test_osr_epsg_4():
 
     assert srs.ExportToWkt().find('AXIS') == -1, 'should not have AXIS node'
 
-    return 'success'
-
 ###############################################################################
 #   Check that EPSGA:4326 is considered as lat/long
 
@@ -119,8 +114,6 @@ def test_osr_epsg_5():
 
     assert srs.ExportToWkt().find('AXIS') != -1, 'should  have AXIS node'
 
-    return 'success'
-
 ###############################################################################
 #   Test datum shift for OSGB 36
 
@@ -133,8 +126,6 @@ def test_osr_epsg_6():
     assert srs.ExportToWkt().find('TOWGS84[446.448,-125.157,542.06,0.15,0.247,0.842,-20.489]') != -1, \
         'did not get expected TOWGS84'
 
-    return 'success'
-
 ###############################################################################
 #   Check that EPSG:2193 is *not* considered as N/E
 
@@ -148,8 +139,6 @@ def test_osr_epsg_7():
 
     assert srs.ExportToWkt().find('AXIS') == -1, 'should not have AXIS node'
 
-    return 'success'
-
 ###############################################################################
 #   Check that EPSGA:2193 is considered as N/E
 
@@ -163,8 +152,6 @@ def test_osr_epsg_8():
 
     assert srs.ExportToWkt().find('AXIS') != -1, 'should  have AXIS node'
 
-    return 'success'
-
 ###############################################################################
 #   Check EPSG:3857
 
@@ -178,8 +165,6 @@ def test_osr_epsg_9():
 
     assert srs.Validate() == 0, 'Does not validate'
 
-    return 'success'
-
 ###############################################################################
 #   Test AutoIdentifyEPSG() on Polar Stereographic
 
@@ -240,8 +225,6 @@ def test_osr_epsg_10():
     srs_ref.ImportFromEPSG(3995)
     assert srs.IsSame(srs_ref) != 0
 
-    return 'success'
-
 ###############################################################################
 # Test datum shift for EPSG:2065 (PCS based override)
 
@@ -254,8 +237,6 @@ def test_osr_epsg_11():
     assert srs.ExportToWkt().find('TOWGS84[570.8,85.7,462.8,4.998,1.587,5.261,3.56]') != -1, \
         'did not get expected TOWGS84'
 
-    return 'success'
-
 ###############################################################################
 # Test IsSame() on SRS that differs only by their PROJ4 EXTENSION (besides
 # different EPSG codes)
@@ -270,7 +251,6 @@ def test_osr_epsg_12():
     sr2.ImportFromEPSG(3395)
 
     assert not sr1.IsSame(sr2)
-    return 'success'
 
 ###############################################################################
 # Test FindMatches()
@@ -368,8 +348,6 @@ def test_osr_epsg_13():
     assert len(matches) == 1 and matches[0][1] == 50
     assert matches[0][0].IsSame(sr) != 1
 
-    return 'success'
-
 ###############################################################################
 
 
@@ -378,7 +356,6 @@ def test_osr_epsg_gcs_deprecated():
     sr = osr.SpatialReference()
     sr.ImportFromEPSG(4268)
     assert sr.ExportToWkt().find('NAD27 Michigan (deprecated)') >= 0
-    return 'success'
 
 ###############################################################################
 
@@ -388,7 +365,6 @@ def test_osr_epsg_geoccs_deprecated():
     sr = osr.SpatialReference()
     sr.ImportFromEPSG(4346)
     assert sr.ExportToWkt().find('ETRS89 (geocentric) (deprecated)') >= 0
-    return 'success'
 
 ###############################################################################
 
diff --git a/autotest/osr/osr_erm.py b/autotest/osr/osr_erm.py
index ed953d142620..8bbfdcf83ef8 100755
--- a/autotest/osr/osr_erm.py
+++ b/autotest/osr/osr_erm.py
@@ -46,8 +46,7 @@ def test_osr_erm_1():
         assert srs.GetInvFlattening() == 0.0 and not abs(srs.GetSemiMajor() - srs.GetSemiMinor() > 0.0000005), \
             'Wrong ERMapper spherical datum parameters (bug #3787). Be sure your "ecw_cs.wkt" is from 20890 revision or newer.'
 
-    return 'success'
-
+    
 ###############################################################################
 # Confirm that unsupported SRSes will be translated from/to EPSG:n
 # format (#3955)
@@ -65,8 +64,6 @@ def test_osr_erm_2():
 
     assert srs2.IsSame(srs), 'EPSG:n import does not match.'
 
-    return 'success'
-
 
 gdaltest_list = [
     test_osr_erm_1,
diff --git a/autotest/osr/osr_esri.py b/autotest/osr/osr_esri.py
index b7fd3596fb78..49a0136d23a9 100755
--- a/autotest/osr/osr_esri.py
+++ b/autotest/osr/osr_esri.py
@@ -71,8 +71,6 @@ def test_osr_esri_1():
         ('Got wrong DATUM name (%s) after ESRI unmorph.' %
                              srs.GetAttrValue('DATUM'))
 
-    return 'success'
-
 ###############################################################################
 # Verify that exact correct form of UTM names is established when
 # translating certain GEOGCSes to ESRI format.
@@ -93,8 +91,6 @@ def test_osr_esri_2():
         ('Got wrong PROJCS name (%s) after ESRI morph.' %
                              srs.GetAttrValue('PROJCS'))
 
-    return 'success'
-
 ###############################################################################
 # Verify that Unnamed is changed to Unknown in morphToESRI().
 
@@ -110,8 +106,6 @@ def test_osr_esri_3():
         ('Got wrong PROJCS name (%s) after ESRI morph.' %
                              srs.GetAttrValue('PROJCS'))
 
-    return 'success'
-
 ###############################################################################
 # Verify Polar Stereographic translations work properly OGR to ESRI.
 
@@ -131,8 +125,6 @@ def test_osr_esri_4():
         ('Got wrong parameter value (%g) after ESRI morph.' %
                              srs.GetProjParm('standard_parallel_1'))
 
-    return 'success'
-
 ###############################################################################
 # Verify Polar Stereographic translations work properly ESRI to OGR.
 
@@ -152,8 +144,6 @@ def test_osr_esri_5():
         ('Got wrong parameter value (%g) after ESRI morph.' %
                              srs.GetProjParm('latitude_of_origin'))
 
-    return 'success'
-
 ###############################################################################
 # Verify Lambert 2SP with a 1.0 scale factor still gets translated to 2SP
 # per bug 187.
@@ -170,8 +160,6 @@ def test_osr_esri_6():
         ('Got wrong PROJECTION name (%s) after ESRI morph, expected 2SP' %
             srs.GetAttrValue('PROJECTION'))
 
-    return 'success'
-
 ###############################################################################
 # Verify that FEET is treated as US survey feet per bug #1533.
 
@@ -220,8 +208,7 @@ def test_osr_esri_7():
         print('got: ', srs_prj.ExportToPrettyWkt())
         pytest.fail('old style ESRI projection imported wrong, perhaps linear units?')
 
-    return 'success'
-
+    
 ###############################################################################
 # Verify that handling of numerically specified units (see bug #1533)
 
@@ -268,8 +255,6 @@ def test_osr_esri_8():
     assert srs_prj.IsSame(srs_wkt), \
         'old style ESRI projection imported wrong, perhaps linear units?'
 
-    return 'success'
-
 ###############################################################################
 # Verify Equidistant Conic handling.
 
@@ -299,8 +284,7 @@ def test_osr_esri_9():
         print('Expected: ', expected)
         pytest.fail('Did not get expected Equidistant Conic SRS after morphToESRI')
 
-    return 'success'
-
+    
 ###############################################################################
 # Verify Plate_Carree handling.
 
@@ -330,8 +314,7 @@ def test_osr_esri_10():
         print('Expected: ', expected)
         pytest.fail('Did not get expected Equidistant_Cylindrical SRS after morphToESRI')
 
-    return 'success'
-
+    
 ###############################################################################
 # Verify arc/info style TM handling.
 
@@ -363,8 +346,7 @@ def test_osr_esri_11():
         print('Expected: ', expected)
         pytest.fail('Did not get expected TM SRS after morphFromESRI')
 
-    return 'success'
-
+    
 ###############################################################################
 # Test automatic morphing of ESRI-style LCC WKT prefixed with 'ESRI::'
 
@@ -392,8 +374,6 @@ def test_osr_esri_12():
         ('Got wrong UNIT name (%s) after ESRI morph.' %
                              srs.GetAttrValue('UNIT'))
 
-    return 'success'
-
 ###############################################################################
 # Test automatic morphing of ESRI-style LCC WKT prefixed with 'ESRI::'
 # but read directly from file.
@@ -422,8 +402,6 @@ def test_osr_esri_13():
         ('Got wrong UNIT name (%s) after ESRI morph.' %
                              srs.GetAttrValue('UNIT'))
 
-    return 'success'
-
 
 ###############################################################################
 # Verify that state plane epsg authority values are not applied if the
@@ -449,8 +427,6 @@ def test_osr_esri_14():
     assert srs.GetAuthorityCode('PROJCS') == '32104', \
         'Did not get epsg authority code when expected.'
 
-    return 'success'
-
 ###############################################################################
 # Verify hotine oblique mercator handling, particularly handling
 # of the rectified_grid_angle parameter.
@@ -480,8 +456,7 @@ def test_osr_esri_15():
         print('Expected: ', expected)
         pytest.fail('Did not get expected HOM projection after morphing')
 
-    return 'success'
-
+    
 ###############################################################################
 # Verify translation of equirectangular to equidistant cylindrical with
 # cleanup of parameters.
@@ -499,8 +474,6 @@ def test_osr_esri_16():
 
     assert expected == wkt, 'Did not get expected equidistant cylindrical.'
 
-    return 'success'
-
 
 ###############################################################################
 # Test LAEA support (#3017)
@@ -531,8 +504,7 @@ def test_osr_esri_17():
         print('Expected: ', expected)
         pytest.fail('Did not get expected LAEA SRS after morphFromESRI')
 
-    return 'success'
-
+    
 ###############################################################################
 # Test EC morphing.
 
@@ -576,8 +548,7 @@ def test_osr_esri_18():
         print('Expected: ', srs_expected.ExportToPrettyWkt())
         pytest.fail('Did not get expected EC SRS after morphToESRI')
 
-    return 'success'
-
+    
 ###############################################################################
 # Test spheroid remapping (per #3904)
 
@@ -605,8 +576,7 @@ def test_osr_esri_19():
         print('Got:      ', srs.ExportToPrettyWkt())
         pytest.fail('Did not get expected spheroid name after morphToESRI')
 
-    return 'success'
-
+    
 ###############################################################################
 # Test esri->ogc, esri->proj / ogc->esri, ogc->proj / proj->esri, proj->ogc
 
@@ -1136,8 +1106,6 @@ def test_osr_esri_24():
     assert srs.GetProjParm(osr.SRS_PP_LATITUDE_OF_ORIGIN, 1000.0) != 1000.0, \
         'Failed to set latitude_of_origin'
 
-    return 'success'
-
 ###############################################################################
 # Test Pseudo-Mercator (#3962)
 #
@@ -1180,8 +1148,7 @@ def test_osr_esri_25():
         print('Got:      (%f, %f, %f)' % (x, y, z))
         pytest.fail('Expected: (%f, %f, %f)' % (exp_x, exp_y, exp_z))
 
-    return 'success'
-
+    
 ###############################################################################
 # Test LCC_1SP (#2072)
 #
@@ -1193,8 +1160,6 @@ def test_osr_esri_26():
     srs.MorphFromESRI()
     assert srs.Validate() == 0, srs.ExportToWkt()
 
-    return 'success'
-
 ###############################################################################
 # Test Mercator_2SP (#4861)
 
@@ -1247,8 +1212,6 @@ def test_osr_esri_27():
     PARAMETER["Standard_Parallel_1",4.45405154589751],
     UNIT["Meter",1.0]]"""
 
-    return 'success'
-
 
 ###############################################################################
 # Test Mercator_1SP (#4861)
@@ -1312,8 +1275,6 @@ def test_osr_esri_28():
     PARAMETER["false_northing",900000],
     PARAMETER["standard_parallel_1",4.45405154""") == 0
 
-    return 'success'
-
 ###############################################################################
 # Test Web Mercator
 
@@ -1391,8 +1352,6 @@ def test_osr_esri_29():
     EXTENSION["PROJ4","+proj=merc +a=6378137 +b=6378137 +lat_ts=0.0 +lon_0=0.0 +x_0=0.0 +y_0=0 +k=1.0 +units=m +nadgrids=@null +wktext +no_defs"],
     AUTHORITY["EPSG","3857"]]"""
 
-    return 'success'
-
 ###############################################################################
 # Verify import of custom ellipsoid
 
@@ -1416,8 +1375,6 @@ def test_osr_esri_30():
 
     assert srs_prj.IsSame(srs_wkt)
 
-    return 'success'
-
 ###############################################################################
 # Verify import of old-style Mercator
 
@@ -1464,8 +1421,6 @@ def test_osr_esri_31():
 
     assert srs_prj.IsSame(srs_wkt)
 
-    return 'success'
-
 ###############################################################################
 # Bad Equidistant Conic
 
@@ -1483,8 +1438,7 @@ def test_osr_esri_32():
         assert result == ogr.OGRERR_CORRUPT_DATA, \
             'Corrupt EQUIDISTANT_CONIC not marked corrupt'
 
-    return 'success'
-
+    
 ###############################################################################
 # Test morphing invalid PROJCS WKT does not crash
 
@@ -1496,8 +1450,6 @@ def test_osr_esri_33():
     sr.MorphFromESRI()
     sr.MorphToESRI()
 
-    return 'success'
-
 ###############################################################################
 #
 
diff --git a/autotest/osr/osr_getprojectionmethods.py b/autotest/osr/osr_getprojectionmethods.py
index b332c167a14f..4c46ae88d8fd 100755
--- a/autotest/osr/osr_getprojectionmethods.py
+++ b/autotest/osr/osr_getprojectionmethods.py
@@ -43,8 +43,6 @@ def test_osr_getprojectionmethods_1():
     methods = osr.GetProjectionMethods()
     assert methods[0][0] == 'Transverse_Mercator'
 
-    return 'success'
-
 
 gdaltest_list = [
     test_osr_getprojectionmethods_1,
diff --git a/autotest/osr/osr_micoordsys.py b/autotest/osr/osr_micoordsys.py
index d8b217444f40..13c82e4d5f4d 100755
--- a/autotest/osr/osr_micoordsys.py
+++ b/autotest/osr/osr_micoordsys.py
@@ -54,8 +54,7 @@ def test_osr_micoordsys_1():
         print(srs.ExportToPrettyWkt())
         pytest.fail('Can not export Lambert Conformal Conic projection.')
 
-    return 'success'
-
+    
 ###############################################################################
 # Test the osr.SpatialReference.ExportToMICoordSys() function.
 #
@@ -82,8 +81,6 @@ def test_osr_micoordsys_2():
     assert proj == 'Earth Projection 3, 62, "m", -117.474542888889, 33.7644620277778, 33.9036340277778, 33.6252900277778, 0, 0', \
         'Can not import Lambert Conformal Conic projection.'
 
-    return 'success'
-
 ###############################################################################
 # Test EPSG:3857
 #
@@ -108,8 +105,6 @@ def test_osr_micoordsys_3():
 
     assert proj == 'Earth Projection 10, 157, "m", 0'
 
-    return 'success'
-
 
 gdaltest_list = [
     test_osr_micoordsys_1,
diff --git a/autotest/osr/osr_ozi.py b/autotest/osr/osr_ozi.py
index 258727465dd3..8a9c345ae14f 100755
--- a/autotest/osr/osr_ozi.py
+++ b/autotest/osr/osr_ozi.py
@@ -53,8 +53,6 @@ def test_osr_ozi_1():
 
     assert gdaltest.equal_srs_from_wkt(expected, srs.ExportToWkt())
 
-    return 'success'
-
 ###############################################################################
 # Test with another datum known by OZI and whose EPSG code is known
 
@@ -75,8 +73,6 @@ def test_osr_ozi_2():
 
     assert gdaltest.equal_srs_from_wkt(srs_ref.ExportToWkt(), srs.ExportToWkt())
 
-    return 'success'
-
 ###############################################################################
 # Test with another datum known by OZI and whose EPSG code is unknown
 
@@ -96,8 +92,6 @@ def test_osr_ozi_3():
 
     assert gdaltest.equal_srs_from_wkt(expected, srs.ExportToWkt())
 
-    return 'success'
-
 
 gdaltest_list = [
     test_osr_ozi_1,
diff --git a/autotest/osr/osr_pci.py b/autotest/osr/osr_pci.py
index 47526ff177bc..4c41699c6a0f 100755
--- a/autotest/osr/osr_pci.py
+++ b/autotest/osr/osr_pci.py
@@ -53,8 +53,6 @@ def test_osr_pci_1():
     assert pci_parms[0] == 'EC          E015' and pci_parms[1] == 'METRE' and pci_parms[2] == prj_parms, \
         'ExportToPCI result wrong.'
 
-    return 'success'
-
 ###############################################################################
 # Test the osr.SpatialReference.ExportToPCI() function.
 #
@@ -81,8 +79,6 @@ def test_osr_pci_2():
     assert proj == 'LCC         D-01' and units == 'METRE' and abs(parms[2] - -117.4745429) <= 0.0000005 and abs(parms[3] - 33.76446203) <= 0.0000005 and abs(parms[4] - 33.90363403) <= 0.0000005 and abs(parms[5] - 33.62529003) <= 0.0000005, \
         'Can not import Lambert Conformal Conic projection.'
 
-    return 'success'
-
 ###############################################################################
 # Test MGRS interpretation. (#3379)
 #
@@ -120,8 +116,7 @@ def test_osr_pci_3():
     if wkt.find('13, Northern Hemi') == -1:
         gdaltest.post_reason('did get southern  hemisphere!')
 
-    return 'success'
-
+    
 ###############################################################################
 # Test Datum lookup in pci_datum.txt
 #
@@ -142,8 +137,6 @@ def test_osr_pci_4():
     assert pci_parms[0] == 'LONG/LAT    D506' and pci_parms[1] == 'DEGREE' and pci_parms[2] == prj_parms, \
         'ExportToPCI result wrong.'
 
-    return 'success'
-
 ###############################################################################
 # Test Datum ellisoid lookup in pci_ellpis.txt
 #
@@ -164,8 +157,6 @@ def test_osr_pci_5():
     assert pci_parms[0] == 'LONG/LAT    E224' and pci_parms[1] == 'DEGREE' and pci_parms[2] == prj_parms, \
         'ExportToPCI result wrong.'
 
-    return 'success'
-
 ###############################################################################
 # Test Datum lookup in pci_datum.txt
 #
@@ -186,8 +177,6 @@ def test_osr_pci_6():
     assert pci_parms[0] == 'LONG/LAT    D030' and pci_parms[1] == 'DEGREE' and pci_parms[2] == prj_parms, \
         'ExportToPCI result wrong.'
 
-    return 'success'
-
 ###############################################################################
 # Make sure we can translate a datum with only the TOWGS84 parameters to
 # to identify it.
@@ -205,8 +194,6 @@ def test_osr_pci_7():
     assert pci_parms[0] == 'LONG/LAT    D506' and pci_parms[1] == 'DEGREE' and pci_parms[2] == prj_parms, \
         'ExportToPCI result wrong.'
 
-    return 'success'
-
 
 gdaltest_list = [
     test_osr_pci_1,
diff --git a/autotest/osr/osr_pm.py b/autotest/osr/osr_pm.py
index 39d6f4d578ee..63f1d1568596 100755
--- a/autotest/osr/osr_pm.py
+++ b/autotest/osr/osr_pm.py
@@ -51,8 +51,6 @@ def test_osr_pm_1():
     assert abs(srs.GetProjParm(osr.SRS_PP_CENTRAL_MERIDIAN) - 0.0) <= 0.0000005, \
         'Wrong central meridian.'
 
-    return 'success'
-
 ###############################################################################
 # Check that EPSG:27572 lookup has the prime meridian properly set,
 # and the central meridian in the PROJ.4 string.
@@ -68,8 +66,6 @@ def test_osr_pm_2():
 
     assert proj4_srs.find('+lon_0=0') != -1, '+lon_0 is wrong.'
 
-    return 'success'
-
 ###############################################################################
 # Convert PROJ.4 format to WKT and verify that PM and central meridian
 # are properly preserved.
@@ -86,8 +82,6 @@ def test_osr_pm_3():
     assert abs(srs.GetProjParm(osr.SRS_PP_CENTRAL_MERIDIAN) + 3.0) <= 0.0000005, \
         'Wrong central meridian.'
 
-    return 'success'
-
 
 ###############################################################################
 
diff --git a/autotest/osr/osr_proj4.py b/autotest/osr/osr_proj4.py
index f2e16e06ae55..5e6f995ec1b9 100755
--- a/autotest/osr/osr_proj4.py
+++ b/autotest/osr/osr_proj4.py
@@ -101,8 +101,6 @@ def test_osr_proj4_1():
     assert abs(srs.GetProjParm(osr.SRS_PP_SCALE_FACTOR) - 1.000035) <= 0.0000005, \
         '+k_0 not supported on import from PROJ.4?'
 
-    return 'success'
-
 ###############################################################################
 # Verify that we can import strings with parameter values that are exponents
 # and contain a plus sign.  As per bug 355 in GDAL/OGR's bugzilla.
@@ -121,8 +119,7 @@ def test_osr_proj4_2():
         print(srs.ExportToPrettyWkt())
         pytest.fail('does not validate')
 
-    return 'success'
-
+    
 ###############################################################################
 # Verify that empty srs'es don't cause a crash (#1718).
 #
@@ -141,7 +138,7 @@ def test_osr_proj4_3():
         gdal.PopErrorHandler()
 
     if gdal.GetLastErrorMsg().find('No translation') != -1:
-        return 'success'
+        return
 
     pytest.fail('empty srs not handled properly')
 
@@ -166,7 +163,7 @@ def test_osr_proj4_4():
         gdal.PopErrorHandler()
 
     if gdal.GetLastErrorMsg().find('No translation') != -1:
-        return 'success'
+        return
 
     pytest.fail('unknown srs not handled properly')
 
@@ -195,8 +192,7 @@ def test_osr_proj4_5():
         print(srs.ExportToPrettyWkt())
         print(srs2.ExportToPrettyWkt())
 
-    return 'success'
-
+    
 ###############################################################################
 # Confirm handling of non-zero latitude of origin mercator (#3026)
 #
@@ -260,8 +256,7 @@ def test_osr_proj4_6():
         print('Expect:%s' % expect_wkt)
         pytest.fail('did not get expected mercator_2sp result.')
 
-    return 'success'
-
+    
 ###############################################################################
 # Confirm handling of somerc (#3032).
 #
@@ -304,8 +299,7 @@ def test_osr_proj4_7():
         print('Got: %s' % srs.ExportToPrettyWkt())
         pytest.fail('did not get expected wkt.')
 
-    return 'success'
-
+    
 ###############################################################################
 # Check EPSG:3857, confirm Google Mercator hackery.
 
@@ -325,8 +319,6 @@ def test_osr_proj4_8():
     proj4 = srs.ExportToProj4()
     assert proj4 == expected, 'did not get expected EPSG:3785 (google mercator) result.'
 
-    return 'success'
-
 ###############################################################################
 # NAD27 is a bit special - make sure no towgs84 values come through.
 #
@@ -347,8 +339,6 @@ def test_osr_proj4_9():
     proj4 = srs.ExportToProj4()
     assert proj4 == expected, 'did not get expected "NAD27"'
 
-    return 'success'
-
 ###############################################################################
 # Does geocentric work okay?
 #
@@ -373,8 +363,7 @@ def test_osr_proj4_10():
         print(srs2.ExportToPrettyWkt())
         pytest.fail('round trip via PROJ.4 damaged srs?')
 
-    return 'success'
-
+    
 ###############################################################################
 # Test round-tripping of all supported projection methods
 #
@@ -467,8 +456,7 @@ def test_osr_proj4_11():
 
         assert out == proj4str, 'round trip via PROJ.4 failed'
 
-    return 'success'
-
+    
 ###############################################################################
 # Test importing +init=epsg:XXX
 #
@@ -496,8 +484,7 @@ def test_osr_proj4_12():
         print('Expected:%s' % expect_wkt)
         pytest.fail('Did not get expected result.')
 
-    return 'success'
-
+    
 ###############################################################################
 # Test error cases
 #
@@ -524,8 +511,6 @@ def test_osr_proj4_13():
 
     gdal.PopErrorHandler()
 
-    return 'success'
-
 ###############################################################################
 # Test etmerc (#4853)
 #
@@ -594,8 +579,7 @@ def test_osr_proj4_14():
         print('Expected:%s' % expect_proj4str)
         pytest.fail('Did not get expected result.')
 
-    return 'success'
-
+    
 ###############################################################################
 # Test other authorities than EPSG, e.g. IGNF:XXXX
 #
@@ -611,8 +595,6 @@ def test_osr_proj4_15():
 
     assert srs.Validate() == 0
 
-    return 'success'
-
 ###############################################################################
 # Test unit parsing
 #
@@ -652,8 +634,7 @@ def almost(a, b):
         to_met = srs.GetLinearUnits()
         assert almost(to_met, u[1]), \
             ('Did not get expected units: %s vs %s' % (str(u), str(to_met)))
-    return 'success'
-
+    
 ###############################################################################
 # Test unit parsing for name assignment
 #
@@ -689,8 +670,7 @@ def test_osr_proj4_17():
         unit_name = srs.GetLinearUnitsName()
         assert unit_name == u[1], \
             ('Did not get expected unit name: %s vs %s' % (str(u), str(unit_name)))
-    return 'success'
-
+    
 ###############################################################################
 # Test fix for #5511
 #
@@ -710,8 +690,7 @@ def test_osr_proj4_18():
             print(p)
             pytest.fail('round trip via PROJ.4 failed')
 
-    return 'success'
-
+    
 ###############################################################################
 # Test EXTENSION and AUTHORITY in DATUM
 
@@ -727,8 +706,7 @@ def test_osr_proj4_19():
         print(srs.ExportToPrettyWkt())
         pytest.fail('does not validate')
 
-    return 'success'
-
+    
 ###############################################################################
 # Test EXTENSION in GOGCS
 
@@ -745,8 +723,7 @@ def test_osr_proj4_20():
         print(srs.ExportToPrettyWkt())
         pytest.fail('does not validate')
 
-    return 'success'
-
+    
 ###############################################################################
 # Test importing datum other than WGS84, WGS72, NAD27 or NAD83
 
@@ -762,8 +739,6 @@ def test_osr_proj4_21():
 
     assert got.find('+proj=longlat +datum=nzgd49') == 0
 
-    return 'success'
-
 ###############################################################################
 # Test importing ellipsoid defined with +R
 
@@ -776,8 +751,6 @@ def test_osr_proj4_22():
 
     assert got.find('+proj=longlat +a=1 +b=1') == 0
 
-    return 'success'
-
 ###############################################################################
 # Test importing ellipsoid defined with +a and +f
 
@@ -797,8 +770,6 @@ def test_osr_proj4_23():
 
     assert got.find('+proj=longlat +a=2 +b=1') == 0
 
-    return 'success'
-
 ###############################################################################
 # Test importing linear units defined with +to_meter
 
@@ -832,8 +803,6 @@ def test_osr_proj4_24():
 
     assert got.find('+to_meter=0.4') >= 0
 
-    return 'success'
-
 ###############################################################################
 # Test importing linear units defined with +vto_meter
 
@@ -870,8 +839,6 @@ def test_osr_proj4_25():
 
     assert got.find('+vto_meter=0.4') >= 0
 
-    return 'success'
-
 ###############################################################################
 # Test importing linear units defined with +vunits
 
@@ -901,8 +868,6 @@ def test_osr_proj4_26():
 
     assert got.find('+vunits=us-yd') >= 0
 
-    return 'success'
-
 ###############################################################################
 # Test geostationary +sweep (#6030)
 
@@ -918,8 +883,6 @@ def test_osr_proj4_27():
 
     assert got.find('+proj=geos +h=35785831 +lon_0=0 +datum=WGS84 +sweep=x +units=m') >= 0
 
-    return 'success'
-
 ###############################################################################
 # Test importing +init=epsg: with an override
 
@@ -932,8 +895,6 @@ def test_osr_proj4_28():
 
     assert got.find('32631') < 0
 
-    return 'success'
-
 
 def test_osr_proj4_28_missing_proj_epsg_dict():
 
@@ -943,7 +904,6 @@ def test_osr_proj4_28_missing_proj_epsg_dict():
 
     ret = gdaltest.runexternal(python_exe + ' osr_proj4.py osr_proj4_28')
     assert ret.find('fail') < 0
-    return 'success'
 
 
 def test_osr_proj4_error_cases_export_mercator():
@@ -962,8 +922,6 @@ def test_osr_proj4_error_cases_export_mercator():
         got = srs.ExportToProj4()
     assert got == ''
 
-    return 'success'
-
 
 gdaltest_list = [
     test_osr_proj4_1,
diff --git a/autotest/osr/osr_url.py b/autotest/osr/osr_url.py
index f4659fe876cf..1246ea090337 100755
--- a/autotest/osr/osr_url.py
+++ b/autotest/osr/osr_url.py
@@ -69,8 +69,6 @@ def osr_url_test(url, expected_wkt):
     assert gdaltest.equal_srs_from_wkt(expected_wkt,
                                        srs.ExportToWkt())
 
-    return 'success'
-
 
 def test_osr_url_1():
     return osr_url_test('http://spatialreference.org/ref/epsg/4326/', expected_wkt)
diff --git a/autotest/osr/osr_usgs.py b/autotest/osr/osr_usgs.py
index 2a0fd40f8f4a..43be0644f295 100755
--- a/autotest/osr/osr_usgs.py
+++ b/autotest/osr/osr_usgs.py
@@ -54,8 +54,6 @@ def test_osr_usgs_1():
     assert abs(srs.GetProjParm(osr.SRS_PP_STANDARD_PARALLEL_1) - 47.0) <= 0.0000005 and abs(srs.GetProjParm(osr.SRS_PP_STANDARD_PARALLEL_2) - 62.0) <= 0.0000005 and abs(srs.GetProjParm(osr.SRS_PP_LATITUDE_OF_CENTER) - 54.5) <= 0.0000005 and abs(srs.GetProjParm(osr.SRS_PP_LONGITUDE_OF_CENTER) - 45.0) <= 0.0000005 and abs(srs.GetProjParm(osr.SRS_PP_FALSE_EASTING) - 0.0) <= 0.0000005 and abs(srs.GetProjParm(osr.SRS_PP_FALSE_NORTHING) - 0.0) <= 0.0000005, \
         'Can not import Equidistant Conic projection.'
 
-    return 'success'
-
 ###############################################################################
 # Test the osr.SpatialReference.ExportToUSGS() function.
 #
@@ -82,8 +80,6 @@ def test_osr_usgs_2():
     assert proj_code == 4 and datum_code == 0 and abs(gdal.PackedDMSToDec(parms[2]) - 33.90363403) <= 0.0000005 and abs(gdal.PackedDMSToDec(parms[3]) - 33.62529003) <= 0.0000005 and abs(gdal.PackedDMSToDec(parms[4]) - -117.4745429) <= 0.0000005 and abs(gdal.PackedDMSToDec(parms[5]) - 33.76446203) <= 0.0000005, \
         'Can not import Lambert Conformal Conic projection.'
 
-    return 'success'
-
 
 gdaltest_list = [
     test_osr_usgs_1,
diff --git a/autotest/osr/osr_validate.py b/autotest/osr/osr_validate.py
index 3878f2063664..835c6f392b93 100755
--- a/autotest/osr/osr_validate.py
+++ b/autotest/osr/osr_validate.py
@@ -44,8 +44,6 @@ def test_osr_validate_1():
     empty_srs = osr.SpatialReference()
     assert empty_srs.Validate() != 0
 
-    return 'success'
-
 ###############################################################################
 # Unrecognized root node
 
@@ -56,8 +54,6 @@ def test_osr_validate_2():
     srs.ImportFromWkt("FOO[]")
     assert srs.Validate() != 0
 
-    return 'success'
-
 ###############################################################################
 # COMPD_CS errors
 
@@ -84,8 +80,6 @@ def test_osr_validate_3():
     srs.ImportFromWkt("""COMPD_CS["MYNAME",FOO[]]""")
     assert srs.Validate() != 0
 
-    return 'success'
-
 ###############################################################################
 # VERT_CS errors
 
@@ -132,8 +126,6 @@ def test_osr_validate_4():
     srs.ImportFromWkt("""VERT_CS["MYNAME",VERT_DATUM["MYNAME",2005,AUTHORITY["EPSG","0"]],UNIT["metre",1],AXIS["foo",foo],AXIS["bar",bar]]""")
     assert srs.Validate() != 0
 
-    return 'success'
-
 ###############################################################################
 # GEOCCS errors
 
@@ -187,8 +179,6 @@ def test_osr_validate_5():
     srs.ImportFromWkt('GEOCCS["My Geocentric",DATUM["WGS_1984",SPHEROID["WGS 84",6378137,298.257223563,AUTHORITY["EPSG","7030"]],TOWGS84[0,0,0,0,0,0,0],AUTHORITY["EPSG","6326"]],PRIMEM["Greenwich",0,AUTHORITY["EPSG","8901"]],AXIS["foo",foo],UNIT["meter",1]]')
     assert srs.Validate() != 0
 
-    return 'success'
-
 ###############################################################################
 # PROJCS errors
 
@@ -257,8 +247,6 @@ def test_osr_validate_6():
     srs.ImportFromWkt('PROJCS["WGS 84 / UTM zone 31N"]')
     assert srs.Validate() != 0
 
-    return 'success'
-
 ###############################################################################
 
 
diff --git a/autotest/osr/osr_xml.py b/autotest/osr/osr_xml.py
index 7adcc4d9f7ab..0667ca3ee235 100755
--- a/autotest/osr/osr_xml.py
+++ b/autotest/osr/osr_xml.py
@@ -182,8 +182,6 @@ def test_osr_xml_1():
 
     assert got == expected
 
-    return 'success'
-
 ###############################################################################
 # Test the osr.SpatialReference.ExportToXML() function.
 #
@@ -204,8 +202,6 @@ def test_osr_xml_2():
 
     assert got == expected
 
-    return 'success'
-
 
 gdaltest_list = [
     test_osr_xml_1,
diff --git a/autotest/pymod/gdaltest.py b/autotest/pymod/gdaltest.py
index 07dbad9ecc5e..50e46ec42052 100644
--- a/autotest/pymod/gdaltest.py
+++ b/autotest/pymod/gdaltest.py
@@ -268,8 +268,7 @@ def testDriver(self):
             self.driver = gdal.GetDriverByName(self.drivername)
             assert self.driver is not None, (self.drivername + ' driver not found!')
 
-        return 'success'
-
+        
     def testOpen(self, check_prj=None, check_gt=None, gt_epsilon=None,
                  check_stat=None, check_approx_stat=None,
                  stat_epsilon=None, skip_checksum=None, check_min=None,
@@ -443,9 +442,9 @@ def testOpen(self, check_prj=None, check_gt=None, gt_epsilon=None,
         assert not is_file_open(wrk_filename), 'file still open after dataset closing'
 
         if skip_checksum is not None:
-            return 'success'
+            return
         if self.chksum is None or chksum == self.chksum:
-            return 'success'
+            return
         pytest.fail('Checksum for band %d in "%s" is %d, but expected %d.'
                     % (self.band, self.filename, chksum, self.chksum))
 
@@ -499,7 +498,7 @@ def testCreateCopy(self, check_minmax=1, check_gt=0, check_srs=None,
                 gdal.PushErrorHandler('CPLQuietErrorHandler')
                 self.driver.Delete(new_filename)
                 gdal.PopErrorHandler()
-                return 'success'
+                return
             new_ds = None
             self.driver.Delete(new_filename)
             pytest.fail('CreateCopy() should have failed due to interruption')
diff --git a/autotest/pymod/ogrtest.py b/autotest/pymod/ogrtest.py
index c5359ba7b857..7ddf1e87eba3 100644
--- a/autotest/pymod/ogrtest.py
+++ b/autotest/pymod/ogrtest.py
@@ -181,8 +181,7 @@ def compare_layers(lyr, lyr_ref, excluded_fields=None):
     if f is not None:
         f.DumpReadable()
         pytest.fail()
-    return 'success'
-
+    
 ###############################################################################
 
 
diff --git a/autotest/pyscripts/test_gdal2tiles.py b/autotest/pyscripts/test_gdal2tiles.py
index 73037529a7be..5903db8fdf3f 100755
--- a/autotest/pyscripts/test_gdal2tiles.py
+++ b/autotest/pyscripts/test_gdal2tiles.py
@@ -71,8 +71,7 @@ def test_gdal2tiles_py_simple():
         assert os.path.exists('tmp/out_gdal2tiles_smallworld/' + filename), \
             ('%s missing' % filename)
 
-    return 'success'
-
+    
 
 def test_gdal2tiles_py_zoom_option():
 
@@ -104,8 +103,6 @@ def test_gdal2tiles_py_zoom_option():
     ds = gdal.Open('tmp/out_gdal2tiles_smallworld/doc.kml')
     assert ds is not None, 'did not get kml'
 
-    return 'success'
-
 
 def test_does_not_error_when_source_bounds_close_to_tiles_bound():
     """
@@ -136,8 +133,7 @@ def test_does_not_error_when_source_bounds_close_to_tiles_bound():
             'Case of tile not getting any data not handled properly '
             '(tiles at the border of the image)')
 
-    return 'success'
-
+    
 
 def test_does_not_error_when_nothing_to_put_in_the_low_zoom_tile():
     """
@@ -165,8 +161,7 @@ def test_does_not_error_when_nothing_to_put_in_the_low_zoom_tile():
             'Case of low level tile not getting any data not handled properly '
             '(tile at a zoom level too low)')
 
-    return 'success'
-
+    
 
 def test_python2_handles_utf8_by_default():
     if sys.version_info[0] >= 3:
@@ -252,7 +247,7 @@ def _test_utf8(should_raise_unicode=False,
         print(ret)
     except UnicodeEncodeError:
         if should_raise_unicode:
-            return 'success'
+            return
         pytest.fail('Should be handling filenames with utf8 characters in this context')
 
     assert not should_raise_unicode, \
@@ -270,8 +265,7 @@ def _test_utf8(should_raise_unicode=False,
     except OSError:
         pass
 
-    return 'success'
-
+    
 
 def test_gdal2tiles_py_cleanup():
 
@@ -282,8 +276,7 @@ def test_gdal2tiles_py_cleanup():
         except Exception:
             pass
 
-    return 'success'
-
+    
 
 def test_exclude_transparent_tiles():
     script_path = test_py_scripts.get_py_script('gdal2tiles')
@@ -316,7 +309,7 @@ def test_exclude_transparent_tiles():
         assert ['22705.png'] == dir_files, \
             ('Generated empty tiles for row 21900: %s' % dir_files)
 
-        return 'success'
+        return
 
     finally:
         shutil.rmtree(output_folder)
diff --git a/autotest/pyscripts/test_gdal_calc.py b/autotest/pyscripts/test_gdal_calc.py
index 81f183a3ce1e..ce4e0c6c0f13 100755
--- a/autotest/pyscripts/test_gdal_calc.py
+++ b/autotest/pyscripts/test_gdal_calc.py
@@ -85,8 +85,6 @@ def test_gdal_calc_py_1():
     ds2 = None
     ds3 = None
 
-    return 'success'
-
 ###############################################################################
 # test simple formulas
 
@@ -118,8 +116,6 @@ def test_gdal_calc_py_2():
     ds2 = None
     ds3 = None
 
-    return 'success'
-
 
 ###############################################################################
 # test --allBands option (simple copy)
@@ -145,8 +141,6 @@ def test_gdal_calc_py_3():
 
     ds = None
 
-    return 'success'
-
 ###############################################################################
 # test --allBands option (simple calc)
 
@@ -185,8 +179,6 @@ def test_gdal_calc_py_4():
 
     ds2 = None
 
-    return 'success'
-
 ###############################################################################
 # test python interface, basic copy
 
@@ -228,8 +220,6 @@ def test_gdal_calc_py_5():
     ds2 = None
     ds3 = None
 
-    return 'success'
-
 ###############################################################################
 # test nodata
 
@@ -259,8 +249,6 @@ def test_gdal_calc_py_6():
     result = ds.GetRasterBand(1).ComputeRasterMinMax()
     assert result == (90, 255)
 
-    return 'success'
-
 ###############################################################################
 # test --optfile
 
@@ -319,8 +307,6 @@ def test_gdal_calc_py_7():
     ds3 = None
     ds4 = None
 
-    return 'success'
-
 def test_gdal_calc_py_cleanup():
 
     lst = ['tmp/test_gdal_calc_py.tif',
@@ -352,8 +338,7 @@ def test_gdal_calc_py_cleanup():
         except OSError:
             pass
 
-    return 'success'
-
+    
 
 gdaltest_list = [
     test_gdal_calc_py_1,
diff --git a/autotest/pyscripts/test_gdal_edit.py b/autotest/pyscripts/test_gdal_edit.py
index c5e6ccb4ee13..91ba3e0ef3c1 100755
--- a/autotest/pyscripts/test_gdal_edit.py
+++ b/autotest/pyscripts/test_gdal_edit.py
@@ -91,8 +91,6 @@ def test_gdal_edit_py_1():
 
     assert md[val] == 'UTF8'
 
-    return 'success'
-
 ###############################################################################
 # Test -unsetgt
 
@@ -116,8 +114,6 @@ def test_gdal_edit_py_2():
 
     assert wkt != ''
 
-    return 'success'
-
 ###############################################################################
 # Test -a_srs ''
 
@@ -141,8 +137,6 @@ def test_gdal_edit_py_3():
 
     assert wkt == ''
 
-    return 'success'
-
 ###############################################################################
 # Test -unsetstats
 
@@ -180,8 +174,7 @@ def test_gdal_edit_py_4():
     except OSError:
         pass
 
-    return 'success'
-
+    
 ###############################################################################
 # Test -stats
 
@@ -236,8 +229,6 @@ def test_gdal_edit_py_5():
     assert stat_min is not None and float(stat_min) == 26
     ds = None
 
-    return 'success'
-
 ###############################################################################
 # Test -setstats
 
@@ -278,8 +269,6 @@ def test_gdal_edit_py_6():
     assert stat_stddev is not None and float(stat_stddev) == 30
     ds = None
 
-    return 'success'
-
 ###############################################################################
 # Test -scale and -offset
 
@@ -297,8 +286,6 @@ def test_gdal_edit_py_7():
     assert ds.GetRasterBand(1).GetScale() == 2
     assert ds.GetRasterBand(1).GetOffset() == 3
 
-    return 'success'
-
 ###############################################################################
 # Test -colorinterp_X
 
@@ -323,8 +310,6 @@ def test_gdal_edit_py_8():
     ds = gdal.Open('tmp/test_gdal_edit_py.tif')
     assert ds.GetRasterBand(4).GetColorInterpretation() == gdal.GCI_Undefined
 
-    return 'success'
-
 ###############################################################################
 
 
@@ -342,8 +327,6 @@ def test_gdal_edit_py_unsetrpc():
     ds = gdal.Open('tmp/test_gdal_edit_py.tif')
     assert not ds.GetMetadata('RPC')
 
-    return 'success'
-
 ###############################################################################
 # Cleanup
 
@@ -352,8 +335,6 @@ def test_gdal_edit_py_cleanup():
 
     gdal.Unlink('tmp/test_gdal_edit_py.tif')
 
-    return 'success'
-
 
 gdaltest_list = [
     test_gdal_edit_py_1,
diff --git a/autotest/pyscripts/test_gdal_fillnodata.py b/autotest/pyscripts/test_gdal_fillnodata.py
index 728374dc8346..e4a61ea9a67d 100755
--- a/autotest/pyscripts/test_gdal_fillnodata.py
+++ b/autotest/pyscripts/test_gdal_fillnodata.py
@@ -54,8 +54,6 @@ def test_gdal_fillnodata_1():
     assert ds.GetRasterBand(1).Checksum() == 4672
     ds = None
 
-    return 'success'
-
 ###############################################################################
 # Make sure we copy the no data value to the dst when created
 # No data value for nodata_byte.tif is 0.
@@ -74,8 +72,6 @@ def test_gdal_fillnodata_2():
         'Failed to copy No Data Value to dst dataset.'
     ds = None
 
-    return 'success'
-
 
 ###############################################################################
 # Cleanup
@@ -89,8 +85,7 @@ def test_gdal_fillnodata_cleanup():
         except OSError:
             pass
 
-    return 'success'
-
+    
 
 gdaltest_list = [
     test_gdal_fillnodata_1,
diff --git a/autotest/pyscripts/test_gdal_ls_py.py b/autotest/pyscripts/test_gdal_ls_py.py
index 58884cd387e1..6107799d3cea 100755
--- a/autotest/pyscripts/test_gdal_ls_py.py
+++ b/autotest/pyscripts/test_gdal_ls_py.py
@@ -82,8 +82,6 @@ def test_gdal_ls_py_1():
 
     assert ret_str.find('poly.shp') != -1
 
-    return 'success'
-
 ###############################################################################
 # List one dir
 
@@ -93,8 +91,6 @@ def test_gdal_ls_py_2():
 
     assert ret_str.find('poly.shp') != -1
 
-    return 'success'
-
 ###############################################################################
 # List recursively
 
@@ -104,8 +100,6 @@ def test_gdal_ls_py_3():
 
     assert ret_str.find('PROJ_UNITS') != -1
 
-    return 'success'
-
 ###############################################################################
 # List in a .zip
 
@@ -121,8 +115,7 @@ def test_gdal_ls_py_4():
             pytest.skip()
         pytest.fail(ret_str)
 
-    return 'success'
-
+    
 ###############################################################################
 # List dir in /vsicurl/
 
@@ -153,8 +146,7 @@ def test_gdal_ls_py_5():
     #    print(ret_str)
     #    return 'fail'
 
-    return 'success'
-
+    
 ###############################################################################
 # List in a .zip in /vsicurl/
 
@@ -183,8 +175,7 @@ def test_gdal_ls_py_6():
             pytest.skip()
         pytest.fail(ret_str)
 
-    return 'success'
-
+    
 ###############################################################################
 # List dir in /vsicurl/ and recurse in zip
 
@@ -219,8 +210,7 @@ def test_gdal_ls_py_7():
     #    print(ret_str)
     #    return 'fail'
 
-    return 'success'
-
+    
 ###############################################################################
 # List FTP dir in /vsicurl/
 
@@ -250,8 +240,6 @@ def test_gdal_ls_py_8():
 
     assert ret_str.find('-r--r--r--  1 unknown unknown        24576 2007-03-29 12:20 /vsizip//vsicurl/ftp://download.osgeo.org/gdal/data/aig/nzdem.zip/nzdem/info/arc0002r.001') != -1
 
-    return 'success'
-
 
 gdaltest_list = [
     test_gdal_ls_py_1,
diff --git a/autotest/pyscripts/test_gdal_merge.py b/autotest/pyscripts/test_gdal_merge.py
index d4bd2bd488b9..fcec8b2fce7a 100755
--- a/autotest/pyscripts/test_gdal_merge.py
+++ b/autotest/pyscripts/test_gdal_merge.py
@@ -55,8 +55,6 @@ def test_gdal_merge_1():
     assert ds.GetRasterBand(1).Checksum() == 4672
     ds = None
 
-    return 'success'
-
 ###############################################################################
 # Merge 4 tiles
 
@@ -115,8 +113,6 @@ def test_gdal_merge_2():
 
     assert ds.GetRasterBand(1).Checksum() == 3508, 'Wrong checksum'
 
-    return 'success'
-
 ###############################################################################
 # Test -separate and -v options
 
@@ -146,8 +142,6 @@ def test_gdal_merge_3():
 
     assert ds.GetRasterBand(1).Checksum() == 0, 'Wrong checksum'
 
-    return 'success'
-
 ###############################################################################
 # Test -init option
 
@@ -164,8 +158,6 @@ def test_gdal_merge_4():
 
     assert ds.GetRasterBand(1).Checksum() == 4725, 'Wrong checksum'
 
-    return 'success'
-
 ###############################################################################
 # Test merging with alpha band (#3669)
 
@@ -221,8 +213,6 @@ def test_gdal_merge_5():
     assert ds.GetRasterBand(3).Checksum() == 0, 'Wrong checksum'
     assert ds.GetRasterBand(4).Checksum() == cs, 'Wrong checksum'
 
-    return 'success'
-
 ###############################################################################
 # Cleanup
 
@@ -246,8 +236,7 @@ def test_gdal_merge_cleanup():
         except OSError:
             pass
 
-    return 'success'
-
+    
 
 gdaltest_list = [
     test_gdal_merge_1,
diff --git a/autotest/pyscripts/test_gdal_pansharpen.py b/autotest/pyscripts/test_gdal_pansharpen.py
index 334dca213d70..4cc1a7065f2a 100755
--- a/autotest/pyscripts/test_gdal_pansharpen.py
+++ b/autotest/pyscripts/test_gdal_pansharpen.py
@@ -70,8 +70,6 @@ def test_gdal_pansharpen_1():
 
     assert cs == [4735, 10000, 9742]
 
-    return 'success'
-
 ###############################################################################
 # Full options
 
@@ -91,8 +89,6 @@ def test_gdal_pansharpen_2():
 
     assert cs == [9742, 4735]
 
-    return 'success'
-
 ###############################################################################
 # Cleanup
 
@@ -105,8 +101,6 @@ def test_gdal_pansharpen_cleanup():
 
     gdal.GetDriverByName('GTiff').Delete('tmp/small_world_pan.tif')
 
-    return 'success'
-
 
 gdaltest_list = [
     test_gdal_pansharpen_1,
diff --git a/autotest/pyscripts/test_gdal_polygonize.py b/autotest/pyscripts/test_gdal_polygonize.py
index a0b8b56c1800..f0b885bcf752 100755
--- a/autotest/pyscripts/test_gdal_polygonize.py
+++ b/autotest/pyscripts/test_gdal_polygonize.py
@@ -96,7 +96,7 @@ def test_gdal_polygonize_1():
     shp_drv = ogr.GetDriverByName('ESRI Shapefile')
     shp_drv.DeleteDataSource('tmp/poly.shp')
 
-    return 'success' if tr else 'fail'
+    assert tr
 
 ###############################################################################
 # Test a simple case without masking.
@@ -135,7 +135,7 @@ def test_gdal_polygonize_2():
     shp_drv = ogr.GetDriverByName('ESRI Shapefile')
     shp_drv.DeleteDataSource('tmp/out.shp')
 
-    return 'success' if tr else 'fail'
+    assert tr
 
 
 def test_gdal_polygonize_3():
@@ -168,7 +168,7 @@ def test_gdal_polygonize_3():
     drv.DeleteDataSource('tmp/out.gpkg')
 
     if geom_is_polygon:
-        return 'success'
+        return
     pytest.fail('GetGeomType() returned %d instead of %d or %d (ogr.wkbPolygon or ogr.wkbMultiPolygon)' % (geom_type, ogr.wkbPolygon, ogr.wkbMultiPolygon))
 
 ###############################################################################
@@ -199,8 +199,6 @@ def test_gdal_polygonize_4():
 
     assert content.find('<ogr:geometryProperty><gml:Polygon srsName="EPSG:26711"><gml:outerBoundaryIs><gml:LinearRing><gml:coordinates>440720,3751320 440720,3750120 441920,3750120 441920,3751320 440720,3751320</gml:coordinates></gml:LinearRing></gml:outerBoundaryIs></gml:Polygon></ogr:geometryProperty>') >= 0
 
-    return 'success'
-
 
 gdaltest_list = [
     test_gdal_polygonize_1,
diff --git a/autotest/pyscripts/test_gdal_proximity.py b/autotest/pyscripts/test_gdal_proximity.py
index a5da11877ad3..4efa7760bd79 100755
--- a/autotest/pyscripts/test_gdal_proximity.py
+++ b/autotest/pyscripts/test_gdal_proximity.py
@@ -67,8 +67,7 @@ def test_gdal_proximity_1():
     if cs != cs_expected:
         print('Got: ', cs)
         pytest.fail('got wrong checksum')
-    return 'success'
-
+    
 ###############################################################################
 # Try several options
 
@@ -93,8 +92,7 @@ def test_gdal_proximity_2():
     if cs != cs_expected:
         print('Got: ', cs)
         pytest.fail('got wrong checksum')
-    return 'success'
-
+    
 ###############################################################################
 # Try input nodata option
 
@@ -119,8 +117,7 @@ def test_gdal_proximity_3():
     if cs != cs_expected:
         print('Got: ', cs)
         pytest.fail('got wrong checksum')
-    return 'success'
-
+    
 ###############################################################################
 # Cleanup
 
@@ -136,8 +133,7 @@ def test_gdal_proximity_cleanup():
         except OSError:
             pass
 
-    return 'success'
-
+    
 
 gdaltest_list = [
     test_gdal_proximity_1,
diff --git a/autotest/pyscripts/test_gdal_retile.py b/autotest/pyscripts/test_gdal_retile.py
index ea7902bc1a6d..e0b7e9d36ae7 100755
--- a/autotest/pyscripts/test_gdal_retile.py
+++ b/autotest/pyscripts/test_gdal_retile.py
@@ -74,8 +74,6 @@ def test_gdal_retile_1():
     #    return 'fail'
     ds = None
 
-    return 'success'
-
 ###############################################################################
 # Test gdal_retile.py with RGBA dataset
 
@@ -98,8 +96,6 @@ def test_gdal_retile_2():
     assert ds.GetRasterBand(4).Checksum() == 35, 'wrong checksum for band 4'
     ds = None
 
-    return 'success'
-
 ###############################################################################
 # Test gdal_retile.py with input images of different pixel sizes
 
@@ -174,8 +170,6 @@ def test_gdal_retile_3():
 
     assert ds.GetRasterBand(1).Checksum() == 38999, 'Wrong checksum'
 
-    return 'success'
-
 
 ###############################################################################
 # Test gdal_retile.py -overlap
@@ -249,8 +243,7 @@ def test_gdal_retile_4():
         assert ds.RasterYSize == height, filename
         ds = None
 
-    return 'success'
-
+    
 ###############################################################################
 # Cleanup
 
@@ -288,8 +281,6 @@ def test_gdal_retile_cleanup():
 
     shutil.rmtree('tmp/outretile4')
 
-    return 'success'
-
 
 gdaltest_list = [
     test_gdal_retile_1,
diff --git a/autotest/pyscripts/test_gdal_sieve.py b/autotest/pyscripts/test_gdal_sieve.py
index 79f98798ab6f..7e2c42f41dd0 100755
--- a/autotest/pyscripts/test_gdal_sieve.py
+++ b/autotest/pyscripts/test_gdal_sieve.py
@@ -72,8 +72,7 @@ def test_gdal_sieve_1():
     if cs != cs_expected:
         print('Got: ', cs)
         pytest.fail('got wrong checksum')
-    return 'success'
-
+    
 
 gdaltest_list = [
     test_gdal_sieve_1,
diff --git a/autotest/pyscripts/test_gdalinfo_py.py b/autotest/pyscripts/test_gdalinfo_py.py
index 090581cbc600..30541a036ef7 100755
--- a/autotest/pyscripts/test_gdalinfo_py.py
+++ b/autotest/pyscripts/test_gdalinfo_py.py
@@ -49,8 +49,6 @@ def test_gdalinfo_py_1():
     ret = test_py_scripts.run_py_script(script_path, 'gdalinfo', '../gcore/data/byte.tif')
     assert ret.find('Driver: GTiff/GeoTIFF') != -1
 
-    return 'success'
-
 ###############################################################################
 # Test -checksum option
 
@@ -63,8 +61,6 @@ def test_gdalinfo_py_2():
     ret = test_py_scripts.run_py_script(script_path, 'gdalinfo', '-checksum ../gcore/data/byte.tif')
     assert ret.find('Checksum=4672') != -1
 
-    return 'success'
-
 ###############################################################################
 # Test -nomd option
 
@@ -80,8 +76,6 @@ def test_gdalinfo_py_3():
     ret = test_py_scripts.run_py_script(script_path, 'gdalinfo', '-nomd ../gcore/data/byte.tif')
     assert ret.find('Metadata') == -1
 
-    return 'success'
-
 ###############################################################################
 # Test -noct option
 
@@ -97,8 +91,6 @@ def test_gdalinfo_py_4():
     ret = test_py_scripts.run_py_script(script_path, 'gdalinfo', '-noct ../gdrivers/data/bug407.gif')
     assert ret.find('0: 255,255,255,255') == -1
 
-    return 'success'
-
 ###############################################################################
 # Test -stats option
 
@@ -122,8 +114,6 @@ def test_gdalinfo_py_5():
     # We will blow an exception if the file does not exist now!
     os.remove('../gcore/data/byte.tif.aux.xml')
 
-    return 'success'
-
 ###############################################################################
 # Test a dataset with overviews and RAT
 
@@ -135,10 +125,6 @@ def test_gdalinfo_py_6():
 
     ret = test_py_scripts.run_py_script(script_path, 'gdalinfo', '../gdrivers/data/int.img')
     assert ret.find('Overviews') != -1
-    # if ret.find('GDALRasterAttributeTable') == -1:
-    #    return 'fail'
-
-    return 'success'
 
 ###############################################################################
 # Test a dataset with GCPs
@@ -160,8 +146,6 @@ def test_gdalinfo_py_7():
     assert ret.find('PROJCS["NAD27 / UTM zone 11N"') == -1
     assert ret.find('(100,100) -> (446720,3745320,0)') == -1
 
-    return 'success'
-
 ###############################################################################
 # Test -hist option
 
@@ -187,8 +171,6 @@ def test_gdalinfo_py_8():
     # We will blow an exception if the file does not exist now!
     os.remove('../gcore/data/byte.tif.aux.xml')
 
-    return 'success'
-
 ###############################################################################
 # Test -mdd option
 
@@ -204,8 +186,6 @@ def test_gdalinfo_py_9():
     ret = test_py_scripts.run_py_script(script_path, 'gdalinfo', '-mdd TRE ../gdrivers/data/fake_nsif.ntf')
     assert ret.find('BLOCKA=010000001000000000') != -1, 'did not get extra MD.'
 
-    return 'success'
-
 ###############################################################################
 # Test -mm option
 
@@ -221,8 +201,6 @@ def test_gdalinfo_py_10():
     ret = test_py_scripts.run_py_script(script_path, 'gdalinfo', '-mm ../gcore/data/byte.tif')
     assert ret.find('Computed Min/Max=74.000,255.000') != -1
 
-    return 'success'
-
 
 gdaltest_list = [
     test_gdalinfo_py_1,
diff --git a/autotest/pyscripts/test_gdalmove.py b/autotest/pyscripts/test_gdalmove.py
index 0282b0988269..e758f1c8976b 100755
--- a/autotest/pyscripts/test_gdalmove.py
+++ b/autotest/pyscripts/test_gdalmove.py
@@ -61,8 +61,6 @@ def test_gdalmove_1():
     assert wkt.find('32611') >= 0, 'bad geotransform'
     ds = None
 
-    return 'success'
-
 ###############################################################################
 # Cleanup
 
@@ -76,8 +74,7 @@ def test_gdalmove_cleanup():
         except OSError:
             pass
 
-    return 'success'
-
+    
 
 gdaltest_list = [
     test_gdalmove_1,
diff --git a/autotest/pyscripts/test_ogr2ogr_py.py b/autotest/pyscripts/test_ogr2ogr_py.py
index a924d9f6ad96..31c11600ce5a 100755
--- a/autotest/pyscripts/test_ogr2ogr_py.py
+++ b/autotest/pyscripts/test_ogr2ogr_py.py
@@ -73,8 +73,6 @@ def test_ogr2ogr_py_1():
 
     ogr.GetDriverByName('ESRI Shapefile').DeleteDataSource('tmp/poly.shp')
 
-    return 'success'
-
 ###############################################################################
 # Test -sql
 
@@ -98,8 +96,6 @@ def test_ogr2ogr_py_2():
 
     ogr.GetDriverByName('ESRI Shapefile').DeleteDataSource('tmp/poly.shp')
 
-    return 'success'
-
 ###############################################################################
 # Test -spat
 
@@ -126,8 +122,6 @@ def test_ogr2ogr_py_3():
 
     ogr.GetDriverByName('ESRI Shapefile').DeleteDataSource('tmp/poly.shp')
 
-    return 'success'
-
 ###############################################################################
 # Test -where
 
@@ -151,8 +145,6 @@ def test_ogr2ogr_py_4():
 
     ogr.GetDriverByName('ESRI Shapefile').DeleteDataSource('tmp/poly.shp')
 
-    return 'success'
-
 ###############################################################################
 # Test -append
 
@@ -184,8 +176,6 @@ def test_ogr2ogr_py_5():
 
     ogr.GetDriverByName('ESRI Shapefile').DeleteDataSource('tmp/poly.shp')
 
-    return 'success'
-
 ###############################################################################
 # Test -overwrite
 
@@ -216,8 +206,6 @@ def test_ogr2ogr_py_6():
 
     gdaltest.runexternal(test_cli_utilities.get_ogrinfo_path() + ' PG:"' + gdaltest.pg_connection_string + '" -sql "DELLAYER:tpoly"')
 
-    return 'success'
-
 ###############################################################################
 # Test -gt
 
@@ -247,8 +235,6 @@ def test_ogr2ogr_py_7():
 
     gdaltest.runexternal(test_cli_utilities.get_ogrinfo_path() + ' PG:"' + gdaltest.pg_connection_string + '" -sql "DELLAYER:tpoly"')
 
-    return 'success'
-
 ###############################################################################
 # Test -t_srs
 
@@ -272,8 +258,6 @@ def test_ogr2ogr_py_8():
 
     ogr.GetDriverByName('ESRI Shapefile').DeleteDataSource('tmp/poly.shp')
 
-    return 'success'
-
 ###############################################################################
 # Test -a_srs
 
@@ -297,8 +281,6 @@ def test_ogr2ogr_py_9():
 
     ogr.GetDriverByName('ESRI Shapefile').DeleteDataSource('tmp/poly.shp')
 
-    return 'success'
-
 ###############################################################################
 # Test -select
 
@@ -361,8 +343,6 @@ def test_ogr2ogr_py_11():
 
     ogr.GetDriverByName('ESRI Shapefile').DeleteDataSource('tmp/poly.shp')
 
-    return 'success'
-
 ###############################################################################
 # Test -nlt
 
@@ -387,8 +367,6 @@ def test_ogr2ogr_py_12():
 
     ogr.GetDriverByName('ESRI Shapefile').DeleteDataSource('tmp/poly.shp')
 
-    return 'success'
-
 ###############################################################################
 # Add explicit source layer name
 
@@ -412,8 +390,6 @@ def test_ogr2ogr_py_13():
 
     ogr.GetDriverByName('ESRI Shapefile').DeleteDataSource('tmp/poly.shp')
 
-    return 'success'
-
 ###############################################################################
 # Test -segmentize
 
@@ -439,8 +415,6 @@ def test_ogr2ogr_py_14():
 
     ogr.GetDriverByName('ESRI Shapefile').DeleteDataSource('tmp/poly.shp')
 
-    return 'success'
-
 ###############################################################################
 # Test -overwrite with a shapefile
 
@@ -471,7 +445,6 @@ def test_ogr2ogr_py_15():
     ds.Destroy()
 
     ogr.GetDriverByName('ESRI Shapefile').DeleteDataSource('tmp/poly.shp')
-    return 'success'
 
 ###############################################################################
 # Test -fid
@@ -500,7 +473,6 @@ def test_ogr2ogr_py_16():
     src_ds.Destroy()
 
     ogr.GetDriverByName('ESRI Shapefile').DeleteDataSource('tmp/poly.shp')
-    return 'success'
 
 ###############################################################################
 # Test -progress
@@ -525,7 +497,6 @@ def test_ogr2ogr_py_17():
     ds.Destroy()
 
     ogr.GetDriverByName('ESRI Shapefile').DeleteDataSource('tmp/poly.shp')
-    return 'success'
 
 ###############################################################################
 # Test -wrapdateline
@@ -577,7 +548,7 @@ def test_ogr2ogr_py_18():
     ogr.GetDriverByName('ESRI Shapefile').DeleteDataSource('tmp/wrapdateline_src.shp')
     ogr.GetDriverByName('ESRI Shapefile').DeleteDataSource('tmp/wrapdateline_dst.shp')
 
-    return 'success' if ret == 0 else 'fail'
+    assert ret == 0
 
 ###############################################################################
 # Test -clipsrc
@@ -609,8 +580,6 @@ def test_ogr2ogr_py_19():
 
     ogr.GetDriverByName('ESRI Shapefile').DeleteDataSource('tmp/poly.shp')
 
-    return 'success'
-
 ###############################################################################
 # Test correct remap of fields when laundering to Shapefile format
 # Test that the data is going into the right field
@@ -684,8 +653,6 @@ def test_ogr2ogr_py_20():
 
     assert not error_occurred
 
-    return 'success'
-
 ###############################################################################
 # Test ogr2ogr when the output driver has already created the fields
 # at dataset creation (#3247)
@@ -720,8 +687,6 @@ def test_ogr2ogr_py_21():
     ds.Destroy()
     os.remove('tmp/testogr2ogr21.gtm')
 
-    return 'success'
-
 
 ###############################################################################
 # Test ogr2ogr when the output driver delays the destination layer defn creation (#3384)
@@ -750,8 +715,6 @@ def test_ogr2ogr_py_22():
     ds.Destroy()
     ogr.GetDriverByName('MapInfo File').DeleteDataSource('tmp/testogr2ogr22.mif')
 
-    return 'success'
-
 ###############################################################################
 # Same as previous but with -select
 
@@ -782,8 +745,6 @@ def test_ogr2ogr_py_23():
     ds.Destroy()
     ogr.GetDriverByName('MapInfo File').DeleteDataSource('tmp/testogr2ogr23.mif')
 
-    return 'success'
-
 ###############################################################################
 # Test -clipsrc with WKT geometry (#3530)
 
@@ -814,8 +775,6 @@ def test_ogr2ogr_py_24():
 
     ogr.GetDriverByName('ESRI Shapefile').DeleteDataSource('tmp/poly.shp')
 
-    return 'success'
-
 ###############################################################################
 # Test -clipsrc with clip from external datasource
 
@@ -852,8 +811,6 @@ def test_ogr2ogr_py_25():
     ogr.GetDriverByName('ESRI Shapefile').DeleteDataSource('tmp/poly.shp')
     os.remove('tmp/clip.csv')
 
-    return 'success'
-
 ###############################################################################
 # Test -clipdst with WKT geometry (#3530)
 
@@ -884,8 +841,6 @@ def test_ogr2ogr_py_26():
 
     ogr.GetDriverByName('ESRI Shapefile').DeleteDataSource('tmp/poly.shp')
 
-    return 'success'
-
 ###############################################################################
 # Test -clipdst with clip from external datasource
 
@@ -922,8 +877,6 @@ def test_ogr2ogr_py_27():
     ogr.GetDriverByName('ESRI Shapefile').DeleteDataSource('tmp/poly.shp')
     os.remove('tmp/clip.csv')
 
-    return 'success'
-
 ###############################################################################
 # Test that -overwrite work if the output file doesn't yet exist (#3825)
 
@@ -947,7 +900,6 @@ def test_ogr2ogr_py_31():
     ds.Destroy()
 
     ogr.GetDriverByName('ESRI Shapefile').DeleteDataSource('tmp/poly.shp')
-    return 'success'
 
 ###############################################################################
 # Test that -append/-overwrite to a single-file shapefile work without specifying -nln
@@ -980,7 +932,6 @@ def test_ogr2ogr_py_32():
     ds = None
 
     ogr.GetDriverByName('ESRI Shapefile').DeleteDataSource('tmp/test_ogr2ogr_32.shp')
-    return 'success'
 
 ###############################################################################
 # Test -explodecollections
@@ -1044,7 +995,6 @@ def test_ogr2ogr_py_33():
 
     ogr.GetDriverByName('CSV').DeleteDataSource('tmp/test_ogr2ogr_33_src.csv')
     ogr.GetDriverByName('ESRI Shapefile').DeleteDataSource('tmp/test_ogr2ogr_33_dst.shp')
-    return 'success'
 
 ###############################################################################
 # Test 'ogr2ogr someDirThatDoesNotExist src.shp -nln someDirThatDoesNotExist'
@@ -1085,7 +1035,6 @@ def test_ogr2ogr_py_34():
     ds = None
 
     ogr.GetDriverByName('ESRI Shapefile').DeleteDataSource('tmp/test_ogr2ogr_34_dir')
-    return 'success'
 
 ###############################################################################
 # Test 'ogr2ogr someDirThatDoesNotExist src.shp'
@@ -1124,7 +1073,6 @@ def test_ogr2ogr_py_35():
     ds = None
 
     ogr.GetDriverByName('ESRI Shapefile').DeleteDataSource('tmp/test_ogr2ogr_35_dir')
-    return 'success'
 
 ###############################################################################
 # Test ogr2ogr -zfield
@@ -1153,8 +1101,6 @@ def test_ogr2ogr_py_36():
 
     assert wkt.find(' 168,') != -1
 
-    return 'success'
-
 ###############################################################################
 # Test 'ogr2ogr someDirThatDoesNotExist.shp dataSourceWithMultipleLayer'
 
@@ -1191,8 +1137,6 @@ def test_ogr2ogr_py_37():
     ogr.GetDriverByName('ESRI Shapefile').DeleteDataSource('tmp/test_ogr2ogr_37_src')
     ogr.GetDriverByName('ESRI Shapefile').DeleteDataSource('tmp/test_ogr2ogr_37_dir.shp')
 
-    return 'success'
-
 ###############################################################################
 # Test that we take into account the fields by the where clause when combining
 # -select and -where (#4015)
@@ -1220,8 +1164,6 @@ def test_ogr2ogr_py_38():
 
     ogr.GetDriverByName('ESRI Shapefile').DeleteDataSource('tmp/test_ogr2ogr_38.shp')
 
-    return 'success'
-
 ###############################################################################
 # Test 'ogr2ogr someDirThatDoesNotExist.shp dataSourceWithMultipleLayer -sql "select * from alayer"' (#4268)
 
@@ -1258,8 +1200,6 @@ def test_ogr2ogr_py_39():
     ogr.GetDriverByName('ESRI Shapefile').DeleteDataSource('tmp/test_ogr2ogr_39_src')
     ogr.GetDriverByName('ESRI Shapefile').DeleteDataSource('tmp/test_ogr2ogr_39.shp')
 
-    return 'success'
-
 ###############################################################################
 # Test -dim 3 and -dim 2
 
@@ -1299,8 +1239,6 @@ def test_ogr2ogr_py_43():
     ogr.GetDriverByName('ESRI Shapefile').DeleteDataSource('tmp/test_ogr2ogr_43_2d.shp')
     ogr.GetDriverByName('ESRI Shapefile').DeleteDataSource('tmp/test_ogr2ogr_43_3d.shp')
 
-    return 'success'
-
 ###############################################################################
 # Test -nlt PROMOTE_TO_MULTI for polygon/multipolygon
 
@@ -1348,8 +1286,6 @@ def test_ogr2ogr_py_44():
     os.unlink('tmp/test_ogr2ogr_44.gml')
     os.unlink('tmp/test_ogr2ogr_44.xsd')
 
-    return 'success'
-
 ###############################################################################
 # Test -nlt PROMOTE_TO_MULTI for polygon/multipolygon
 
@@ -1397,8 +1333,6 @@ def test_ogr2ogr_py_45():
     os.unlink('tmp/test_ogr2ogr_44.gml')
     os.unlink('tmp/test_ogr2ogr_44.xsd')
 
-    return 'success'
-
 ###############################################################################
 # Test -nlt PROMOTE_TO_MULTI for linestring/multilinestring
 
@@ -1446,8 +1380,6 @@ def test_ogr2ogr_py_46():
     gdal.Unlink('tmp/test_ogr2ogr_45.gml')
     gdal.Unlink('tmp/test_ogr2ogr_45.xsd')
 
-    return 'success'
-
 
 gdaltest_list = [
     test_ogr2ogr_py_1,
diff --git a/autotest/pyscripts/test_ogrinfo_py.py b/autotest/pyscripts/test_ogrinfo_py.py
index a98cd708ad4d..e70299f3d0fa 100755
--- a/autotest/pyscripts/test_ogrinfo_py.py
+++ b/autotest/pyscripts/test_ogrinfo_py.py
@@ -49,8 +49,6 @@ def test_ogrinfo_py_1():
     ret = test_py_scripts.run_py_script(script_path, 'ogrinfo', '../ogr/data/poly.shp')
     assert ret.find('ESRI Shapefile') != -1
 
-    return 'success'
-
 ###############################################################################
 # Test -ro option
 
@@ -63,8 +61,6 @@ def test_ogrinfo_py_2():
     ret = test_py_scripts.run_py_script(script_path, 'ogrinfo', '-ro ../ogr/data/poly.shp')
     assert ret.find('ESRI Shapefile') != -1
 
-    return 'success'
-
 ###############################################################################
 # Test -al option
 
@@ -77,8 +73,6 @@ def test_ogrinfo_py_3():
     ret = test_py_scripts.run_py_script(script_path, 'ogrinfo', '-al ../ogr/data/poly.shp')
     assert ret.find('Feature Count: 10') != -1
 
-    return 'success'
-
 ###############################################################################
 # Test layer name
 
@@ -91,8 +85,6 @@ def test_ogrinfo_py_4():
     ret = test_py_scripts.run_py_script(script_path, 'ogrinfo', '../ogr/data/poly.shp poly')
     assert ret.find('Feature Count: 10') != -1
 
-    return 'success'
-
 ###############################################################################
 # Test -sql option
 
@@ -105,8 +97,6 @@ def test_ogrinfo_py_5():
     ret = test_py_scripts.run_py_script(script_path, 'ogrinfo', '../ogr/data/poly.shp -sql "select * from poly"')
     assert ret.find('Feature Count: 10') != -1
 
-    return 'success'
-
 ###############################################################################
 # Test -geom=NO option
 
@@ -120,8 +110,6 @@ def test_ogrinfo_py_6():
     assert ret.find('Feature Count: 10') != -1
     assert ret.find('POLYGON') == -1
 
-    return 'success'
-
 ###############################################################################
 # Test -geom=SUMMARY option
 
@@ -136,8 +124,6 @@ def test_ogrinfo_py_7():
     assert ret.find('POLYGON (') == -1
     assert ret.find('POLYGON :') != -1
 
-    return 'success'
-
 ###############################################################################
 # Test -spat option
 
@@ -150,10 +136,10 @@ def test_ogrinfo_py_8():
     ret = test_py_scripts.run_py_script(script_path, 'ogrinfo', '../ogr/data/poly.shp poly -spat 479609 4764629 479764 4764817')
     if ogrtest.have_geos():
         assert ret.find('Feature Count: 4') != -1
-        return 'success'
+        return
     else:
         assert ret.find('Feature Count: 5') != -1
-        return 'success'
+        return
 
 ###############################################################################
 # Test -where option
@@ -167,8 +153,6 @@ def test_ogrinfo_py_9():
     ret = test_py_scripts.run_py_script(script_path, 'ogrinfo', '../ogr/data/poly.shp poly -where "EAS_ID=171"')
     assert ret.find('Feature Count: 1') != -1
 
-    return 'success'
-
 ###############################################################################
 # Test -fid option
 
@@ -181,8 +165,6 @@ def test_ogrinfo_py_10():
     ret = test_py_scripts.run_py_script(script_path, 'ogrinfo', '../ogr/data/poly.shp poly -fid 9')
     assert ret.find('OGRFeature(poly):9') != -1
 
-    return 'success'
-
 ###############################################################################
 # Test -fields=no option
 
@@ -196,8 +178,6 @@ def test_ogrinfo_py_11():
     assert ret.find('AREA (Real') == -1
     assert ret.find('POLYGON (') != -1
 
-    return 'success'
-
 ###############################################################################
 # Test RFC 41 support
 
@@ -276,8 +256,6 @@ def test_ogrinfo_py_22():
 
     os.unlink('tmp/test_ogrinfo_22.csv')
 
-    return 'success'
-
 ###############################################################################
 # Test -geomfield (RFC 41) support
 
@@ -354,8 +332,6 @@ def test_ogrinfo_py_23():
 
     os.unlink('tmp/test_ogrinfo_23.csv')
 
-    return 'success'
-
 
 gdaltest_list = [
     test_ogrinfo_py_1,
diff --git a/autotest/pyscripts/test_ogrmerge.py b/autotest/pyscripts/test_ogrmerge.py
index 68f4d8b026ce..a7b2f01a9387 100755
--- a/autotest/pyscripts/test_ogrmerge.py
+++ b/autotest/pyscripts/test_ogrmerge.py
@@ -56,8 +56,6 @@ def test_ogrmerge_1():
 
     ogr.GetDriverByName('ESRI Shapefile').DeleteDataSource('/vsimem/out.shp')
 
-    return 'success'
-
 ###############################################################################
 # Test -append and glob
 
@@ -79,8 +77,6 @@ def test_ogrmerge_2():
 
     ogr.GetDriverByName('ESRI Shapefile').DeleteDataSource('/vsimem/out.shp')
 
-    return 'success'
-
 ###############################################################################
 # Test -overwrite_ds
 
@@ -102,8 +98,6 @@ def test_ogrmerge_3():
 
     ogr.GetDriverByName('ESRI Shapefile').DeleteDataSource('/vsimem/out.shp')
 
-    return 'success'
-
 ###############################################################################
 # Test -f VRT
 
@@ -124,8 +118,6 @@ def test_ogrmerge_4():
 
     gdal.Unlink('/vsimem/out.vrt')
 
-    return 'success'
-
 ###############################################################################
 # Test -nln
 
@@ -150,8 +142,6 @@ def test_ogrmerge_5():
 
     gdal.Unlink('/vsimem/out.vrt')
 
-    return 'success'
-
 ###############################################################################
 # Test -src_layer_field_name -src_layer_field_content
 
@@ -176,8 +166,6 @@ def test_ogrmerge_6():
 
     gdal.Unlink('/vsimem/out.vrt')
 
-    return 'success'
-
 ###############################################################################
 # Test -src_geom_type
 
@@ -231,8 +219,6 @@ def test_ogrmerge_7():
 
     gdal.Unlink('/vsimem/out.vrt')
 
-    return 'success'
-
 ###############################################################################
 # Test -s_srs -t_srs in -single mode
 
@@ -261,8 +247,6 @@ def test_ogrmerge_8():
 
     assert content.find('<TargetSRS>EPSG:4326</TargetSRS>') >= 0
 
-    return 'success'
-
 ###############################################################################
 # Test -s_srs -t_srs in default mode
 
@@ -291,8 +275,6 @@ def test_ogrmerge_9():
 
     assert content.find('<TargetSRS>EPSG:4326</TargetSRS>') >= 0
 
-    return 'success'
-
 ###############################################################################
 # Test -a_srs in -single mode
 
@@ -319,8 +301,6 @@ def test_ogrmerge_10():
 
     assert content.find('<LayerSRS>EPSG:32630</LayerSRS>') >= 0
 
-    return 'success'
-
 ###############################################################################
 # Test -a_srs in default mode
 
@@ -347,8 +327,6 @@ def test_ogrmerge_11():
 
     assert content.find('<LayerSRS>EPSG:32630</LayerSRS>') >= 0
 
-    return 'success'
-
 ###############################################################################
 # Test layer names with accents
 
@@ -371,8 +349,6 @@ def test_ogrmerge_12():
     gdal.Unlink('tmp/tmp.json')
     gdal.Unlink('/vsimem/out.vrt')
 
-    return 'success'
-
 
 gdaltest_list = [
     test_ogrmerge_1,
diff --git a/autotest/pyscripts/test_rgb2pct.py b/autotest/pyscripts/test_rgb2pct.py
index 11fe2bd89324..b68e2cd44a87 100755
--- a/autotest/pyscripts/test_rgb2pct.py
+++ b/autotest/pyscripts/test_rgb2pct.py
@@ -55,8 +55,6 @@ def test_rgb2pct_1():
     assert ds.GetRasterBand(1).Checksum() == 31231
     ds = None
 
-    return 'success'
-
 ###############################################################################
 # Test pct2rgb
 
@@ -84,8 +82,6 @@ def test_pct2rgb_1():
     ds = None
     ori_ds = None
 
-    return 'success'
-
 ###############################################################################
 # Test rgb2pct -n option
 
@@ -109,8 +105,6 @@ def test_rgb2pct_2():
 
     ds = None
 
-    return 'success'
-
 ###############################################################################
 # Test rgb2pct -pct option
 
@@ -134,8 +128,6 @@ def test_rgb2pct_3():
 
     ds = None
 
-    return 'success'
-
 ###############################################################################
 # Test pct2rgb with big CT (>256 entries)
 
@@ -170,8 +162,6 @@ def test_pct2rgb_4():
     ds = None
     ori_ds = None
 
-    return 'success'
-
 
 ###############################################################################
 # Cleanup
@@ -190,8 +180,7 @@ def test_rgb2pct_cleanup():
         except OSError:
             pass
 
-    return 'success'
-
+    
 
 gdaltest_list = [
     test_rgb2pct_1,
diff --git a/autotest/utilities/test_gdal_contour.py b/autotest/utilities/test_gdal_contour.py
index 7550f308bd0f..21a93998feae 100755
--- a/autotest/utilities/test_gdal_contour.py
+++ b/autotest/utilities/test_gdal_contour.py
@@ -126,8 +126,6 @@ def test_gdal_contour_1():
     ds.ReleaseResultSet(lyr)
     ds.Destroy()
 
-    return 'success'
-
 ###############################################################################
 # Test with -fl option and -3d option
 
@@ -183,8 +181,6 @@ def test_gdal_contour_2():
     ds.ReleaseResultSet(lyr)
     ds.Destroy()
 
-    return 'success'
-
 ###############################################################################
 # Test on a real DEM
 
@@ -226,8 +222,6 @@ def test_gdal_contour_3():
     ds.ReleaseResultSet(lyr)
     ds.Destroy()
 
-    return 'success'
-
 ###############################################################################
 # Test contour orientation
 
@@ -327,7 +321,7 @@ def test_gdal_contour_4():
     ds.ReleaseResultSet(lyr)
     ds.Destroy()
 
-    return 'fail' if test_failed else 'success'
+    assert not test_failed
 
 ###############################################################################
 # Test contour orientation
@@ -372,7 +366,7 @@ def test_gdal_contour_5():
     ds.ReleaseResultSet(lyr)
     ds.Destroy()
 
-    return 'fail' if test_failed else 'success'
+    assert not test_failed
 
 ###############################################################################
 # Cleanup
@@ -391,8 +385,7 @@ def test_gdal_contour_cleanup():
     except OSError:
         pass
 
-    return 'success'
-
+    
 
 gdaltest_list = [
     test_gdal_contour_1,
diff --git a/autotest/utilities/test_gdal_grid.py b/autotest/utilities/test_gdal_grid.py
index 92424edf6ad2..3a02213baa8a 100755
--- a/autotest/utilities/test_gdal_grid.py
+++ b/autotest/utilities/test_gdal_grid.py
@@ -116,8 +116,6 @@ def test_gdal_grid_1():
     ds = None
     ds2 = None
 
-    return 'success'
-
 ###############################################################################
 # Test Nearest Neighbour gridding algorithm
 
@@ -242,8 +240,6 @@ def test_gdal_grid_2():
         pytest.fail('bad checksum')
     ds = None
 
-    return 'success'
-
 ###############################################################################
 # Test Inverse Distance to a Power gridding algorithm
 
@@ -398,8 +394,6 @@ def test_gdal_grid_3():
     ds_ref = None
     ds = None
 
-    return 'success'
-
 ###############################################################################
 # Test Moving Average gridding algorithm
 
@@ -493,8 +487,6 @@ def test_gdal_grid_4():
         pytest.fail('Image too different from the reference')
     ds = None
 
-    return 'success'
-
 ###############################################################################
 # Test Minimum data metric
 
@@ -543,8 +535,6 @@ def test_gdal_grid_5():
     ds_ref = None
     ds = None
 
-    return 'success'
-
 ###############################################################################
 # Test Maximum data metric
 
@@ -593,8 +583,6 @@ def test_gdal_grid_6():
     ds_ref = None
     ds = None
 
-    return 'success'
-
 ###############################################################################
 # Test Range data metric
 
@@ -644,8 +632,6 @@ def test_gdal_grid_7():
     ds_ref = None
     ds = None
 
-    return 'success'
-
 ###############################################################################
 # Test Count data metric
 
@@ -692,8 +678,6 @@ def test_gdal_grid_8():
     ds_ref = None
     ds = None
 
-    return 'success'
-
 ###############################################################################
 # Test Average Distance data metric
 
@@ -746,8 +730,6 @@ def test_gdal_grid_9():
         pytest.fail('Image too different from the reference')
     ds = None
 
-    return 'success'
-
 ###############################################################################
 # Test Average Distance Between Points data metric
 
@@ -778,8 +760,6 @@ def test_gdal_grid_10():
         pytest.fail('Image too different from the reference')
     ds = None
 
-    return 'success'
-
 ###############################################################################
 # Test linear
 
@@ -803,8 +783,6 @@ def test_gdal_grid_11():
     ds = None
     ds2 = None
 
-    return 'success'
-
 ###############################################################################
 # Test Inverse Distance to a Power with Nearest Neighbor gridding algorithm
 
@@ -876,8 +854,6 @@ def test_gdal_grid_12():
     ds_ref = None
     ds = None
 
-    return 'success'
-
 ###############################################################################
 # Test -clipsrc
 
@@ -911,8 +887,6 @@ def test_gdal_grid_clipsrc():
     assert not (cs == 0 or cs == 4672), 'bad checksum'
     ds = None
 
-    return 'success'
-
 ###############################################################################
 # Cleanup
 
@@ -924,8 +898,7 @@ def test_gdal_grid_cleanup():
     for outfile in outfiles:
         drv.Delete(outfile)
 
-    return 'success'
-
+    
 
 gdaltest_list = [
     test_gdal_grid_1,
diff --git a/autotest/utilities/test_gdal_grid_lib.py b/autotest/utilities/test_gdal_grid_lib.py
index 2b4d937c8752..44256a496d51 100755
--- a/autotest/utilities/test_gdal_grid_lib.py
+++ b/autotest/utilities/test_gdal_grid_lib.py
@@ -85,8 +85,6 @@ def test_gdal_grid_lib_1():
     ds = None
     ds2 = None
 
-    return 'success'
-
 ###############################################################################
 # Test with a point number not multiple of 8 or 16
 
@@ -123,8 +121,7 @@ def test_gdal_grid_lib_2():
         cs = ds2.GetRasterBand(1).Checksum()
         assert cs == 1064
 
-    return 'success'
-
+    
 ###############################################################################
 # Test bugfix for #7101 (segmentation fault with linear interpolation)
 
@@ -138,8 +135,6 @@ def test_gdal_grid_lib_3():
               width=115, height=93, outputBounds=[37.3495161160827, 55.6901531392856, 37.3497618734837, 55.6902650179072],
               format='MEM', algorithm='linear')
 
-    return 'success'
-
 ###############################################################################
 # Cleanup
 
@@ -148,8 +143,6 @@ def test_gdal_grid_lib_cleanup():
 
     ogr.GetDriverByName('ESRI Shapefile').DeleteDataSource('/vsimem/tmp')
 
-    return 'success'
-
 
 gdaltest_list = [
     test_gdal_grid_lib_1,
diff --git a/autotest/utilities/test_gdal_rasterize.py b/autotest/utilities/test_gdal_rasterize.py
index f970d039ac44..508d2af65416 100755
--- a/autotest/utilities/test_gdal_rasterize.py
+++ b/autotest/utilities/test_gdal_rasterize.py
@@ -116,8 +116,6 @@ def test_gdal_rasterize_1():
 
     target_ds = None
 
-    return 'success'
-
 ###############################################################################
 # Test rasterization with ALL_TOUCHED (adapted from alg/rasterize.py).
 
@@ -148,8 +146,6 @@ def test_gdal_rasterize_2():
 
     target_ds = None
 
-    return 'success'
-
 ###############################################################################
 # Test creating an output file
 
@@ -183,8 +179,6 @@ def test_gdal_rasterize_3():
     wkt = ds.GetProjectionRef()
     assert wkt.find("WGS_1984") != -1, 'did not get expected SRS'
 
-    return 'success'
-
 ###############################################################################
 # Same but with -tr argument
 
@@ -224,8 +218,6 @@ def test_gdal_rasterize_4():
     wkt = ds.GetProjectionRef()
     assert wkt.find("WGS_1984") != -1, 'did not get expected SRS'
 
-    return 'success'
-
 ###############################################################################
 # Test point rasterization (#3774)
 
@@ -272,8 +264,6 @@ def test_gdal_rasterize_5():
 
     ds = None
 
-    return 'success'
-
 ###############################################################################
 # Test on the fly reprojection of input data
 
@@ -307,8 +297,6 @@ def test_gdal_rasterize_6():
 
     ds = None
 
-    return 'success'
-
 ###############################################################################
 # Test SQLITE dialect in SQL
 
@@ -359,8 +347,6 @@ def test_gdal_rasterize_7():
 
     ds = None
 
-    return 'success'
-
 ###############################################################################
 # Make sure we create output that encompasses all the input points on a point
 # layer, #6058.
@@ -386,8 +372,6 @@ def test_gdal_rasterize_8():
 
     ds = None
 
-    return 'success'
-
 
 ###########################################
 def test_gdal_rasterize_cleanup():
@@ -419,8 +403,6 @@ def test_gdal_rasterize_cleanup():
     gdal.GetDriverByName('GTiff').Delete('tmp/test_gdal_rasterize_8.tif')
     os.unlink('tmp/test_gdal_rasterize_8.csv')
 
-    return 'success'
-
 
 gdaltest_list = [
     test_gdal_rasterize_1,
diff --git a/autotest/utilities/test_gdal_rasterize_lib.py b/autotest/utilities/test_gdal_rasterize_lib.py
index 50eb24549a5e..35bfbae7089b 100755
--- a/autotest/utilities/test_gdal_rasterize_lib.py
+++ b/autotest/utilities/test_gdal_rasterize_lib.py
@@ -99,8 +99,6 @@ def test_gdal_rasterize_lib_1():
 
     target_ds = None
 
-    return 'success'
-
 ###############################################################################
 # Test creating an output file
 
@@ -137,8 +135,6 @@ def test_gdal_rasterize_lib_3():
     wkt = ds.GetProjectionRef()
     assert wkt.find("WGS_1984") != -1, 'did not get expected SRS'
 
-    return 'success'
-
 ###############################################################################
 # Rasterization without georeferencing
 
@@ -170,8 +166,6 @@ def test_gdal_rasterize_lib_100():
 
     target_ds = None
 
-    return 'success'
-
 ###############################################################################
 # Rasterization on empty geometry
 
@@ -203,8 +197,6 @@ def test_gdal_rasterize_lib_101():
 
     target_ds = None
 
-    return 'success'
-
 ###############################################################################
 # Rasterization on raster with RPC
 
@@ -263,8 +255,6 @@ def test_gdal_rasterize_lib_102():
     assert checksum == 2003, 'Did not get expected image checksum'
     target_ds = None
 
-    return 'success'
-
 ###############################################################################
 # Simple rasterization with all values of the optim option
 
@@ -330,8 +320,7 @@ def test_gdal_rasterize_lib_4():
 
         target_ds = None
 
-    return 'success'
-
+    
 
 gdaltest_list = [
     test_gdal_rasterize_lib_1,
diff --git a/autotest/utilities/test_gdal_translate.py b/autotest/utilities/test_gdal_translate.py
index 541a45792721..1597b13da82b 100755
--- a/autotest/utilities/test_gdal_translate.py
+++ b/autotest/utilities/test_gdal_translate.py
@@ -56,8 +56,6 @@ def test_gdal_translate_1():
 
     ds = None
 
-    return 'success'
-
 
 ###############################################################################
 # Test -of option
@@ -75,8 +73,6 @@ def test_gdal_translate_2():
 
     ds = None
 
-    return 'success'
-
 
 ###############################################################################
 # Test -ot option
@@ -96,8 +92,6 @@ def test_gdal_translate_3():
 
     ds = None
 
-    return 'success'
-
 ###############################################################################
 # Test -b option
 
@@ -119,8 +113,6 @@ def test_gdal_translate_4():
 
     ds = None
 
-    return 'success'
-
 ###############################################################################
 # Test -expand option
 
@@ -151,8 +143,6 @@ def test_gdal_translate_5():
 
     ds = None
 
-    return 'success'
-
 
 ###############################################################################
 # Test -outsize option in absolute mode
@@ -170,8 +160,6 @@ def test_gdal_translate_6():
 
     ds = None
 
-    return 'success'
-
 ###############################################################################
 # Test -outsize option in percentage mode
 
@@ -189,8 +177,6 @@ def test_gdal_translate_7():
 
     ds = None
 
-    return 'success'
-
 ###############################################################################
 # Test -a_srs and -gcp options
 
@@ -213,8 +199,6 @@ def test_gdal_translate_8():
 
     ds = None
 
-    return 'success'
-
 
 ###############################################################################
 # Test -a_nodata option
@@ -232,8 +216,6 @@ def test_gdal_translate_9():
 
     ds = None
 
-    return 'success'
-
 
 ###############################################################################
 # Test -srcwin option
@@ -251,8 +233,6 @@ def test_gdal_translate_10():
 
     ds = None
 
-    return 'success'
-
 ###############################################################################
 # Test -projwin option
 
@@ -273,8 +253,6 @@ def test_gdal_translate_11():
 
     ds = None
 
-    return 'success'
-
 ###############################################################################
 # Test -a_ullr option
 
@@ -295,8 +273,6 @@ def test_gdal_translate_12():
 
     ds = None
 
-    return 'success'
-
 ###############################################################################
 # Test -mo option
 
@@ -315,8 +291,6 @@ def test_gdal_translate_13():
 
     ds = None
 
-    return 'success'
-
 ###############################################################################
 # Test -co option
 
@@ -335,8 +309,6 @@ def test_gdal_translate_14():
 
     ds = None
 
-    return 'success'
-
 ###############################################################################
 # Test -sds option
 
@@ -352,8 +324,6 @@ def test_gdal_translate_15():
 
     ds = None
 
-    return 'success'
-
 ###############################################################################
 # Test -of VRT which is a special case
 
@@ -371,8 +341,6 @@ def test_gdal_translate_16():
 
     ds = None
 
-    return 'success'
-
 ###############################################################################
 # Test -expand option to VRT
 
@@ -408,8 +376,6 @@ def test_gdal_translate_17():
 
     ds = None
 
-    return 'success'
-
 
 ###############################################################################
 # Test translation of a VRT made of VRT
@@ -432,8 +398,6 @@ def test_gdal_translate_18():
 
     ds = None
 
-    return 'success'
-
 
 ###############################################################################
 # Test -expand rgba on a color indexed dataset with an alpha band
@@ -462,8 +426,6 @@ def test_gdal_translate_19():
 
     ds = None
 
-    return 'success'
-
 ###############################################################################
 # Test -a_nodata None
 
@@ -483,8 +445,6 @@ def test_gdal_translate_20():
 
     ds = None
 
-    return 'success'
-
 ###############################################################################
 # Test that statistics are copied only when appropriate (#3889)
 # in that case, they must be copied
@@ -505,8 +465,6 @@ def test_gdal_translate_21():
     assert md['STATISTICS_HISTOBINVALUES'] == '0|0|0|0|0|0|0|0|8|0|0|0|0|0|0|0|23|0|0|0|0|0|0|0|0|29|0|0|0|0|0|0|0|46|0|0|0|0|0|0|0|69|0|0|0|0|0|0|0|99|0|0|0|0|0|0|0|0|120|0|0|0|0|0|0|0|178|0|0|0|0|0|0|0|193|0|0|0|0|0|0|0|212|0|0|0|0|0|0|0|281|0|0|0|0|0|0|0|0|365|0|0|0|0|0|0|0|460|0|0|0|0|0|0|0|533|0|0|0|0|0|0|0|544|0|0|0|0|0|0|0|0|626|0|0|0|0|0|0|0|653|0|0|0|0|0|0|0|673|0|0|0|0|0|0|0|629|0|0|0|0|0|0|0|0|586|0|0|0|0|0|0|0|541|0|0|0|0|0|0|0|435|0|0|0|0|0|0|0|348|0|0|0|0|0|0|0|341|0|0|0|0|0|0|0|0|284|0|0|0|0|0|0|0|225|0|0|0|0|0|0|0|237|0|0|0|0|0|0|0|172|0|0|0|0|0|0|0|0|159|0|0|0|0|0|0|0|105|0|0|0|0|0|0|0|824|', \
         'STATISTICS_HISTOBINVALUES is wrong.'
 
-    return 'success'
-
 ###############################################################################
 # Test that statistics are copied only when appropriate (#3889)
 # in that case, they must *NOT* be copied
@@ -528,8 +486,6 @@ def test_gdal_translate_22():
     assert 'STATISTICS_HISTOBINVALUES' not in md, \
         'did not expected a STATISTICS_HISTOBINVALUES value.'
 
-    return 'success'
-
 ###############################################################################
 # Test -stats option (#3889)
 
@@ -554,8 +510,6 @@ def test_gdal_translate_23():
 
     gdal.Unlink('../gcore/data/byte.tif.aux.xml')
 
-    return 'success'
-
 ###############################################################################
 # Test -srcwin option when partially outside
 
@@ -574,8 +528,6 @@ def test_gdal_translate_24():
 
     ds = None
 
-    return 'success'
-
 ###############################################################################
 # Test -norat
 
@@ -591,8 +543,6 @@ def test_gdal_translate_25():
 
     ds = None
 
-    return 'success'
-
 ###############################################################################
 # Test -a_nodata and -stats (#5463)
 
@@ -616,8 +566,6 @@ def test_gdal_translate_26():
 
     ds = None
 
-    return 'success'
-
 ###############################################################################
 # Test that we don't preserve statistics when we ought not.
 
@@ -661,8 +609,6 @@ def test_gdal_translate_27():
     assert ds.GetRasterBand(1).GetMetadataItem('STATISTICS_MINIMUM') is None
     ds = None
 
-    return 'success'
-
 ###############################################################################
 # Test -oo
 
@@ -677,8 +623,6 @@ def test_gdal_translate_28():
     assert ds.GetRasterBand(1).DataType == gdal.GDT_Float64
     ds = None
 
-    return 'success'
-
 ###############################################################################
 # Test -r
 
@@ -711,8 +655,6 @@ def test_gdal_translate_29():
 
     ds = None
 
-    return 'success'
-
 ###############################################################################
 # Test -tr option
 
@@ -731,8 +673,6 @@ def test_gdal_translate_30():
 
     ds = None
 
-    return 'success'
-
 ###############################################################################
 # Test -projwin_srs option
 
@@ -753,8 +693,6 @@ def test_gdal_translate_31():
 
     ds = None
 
-    return 'success'
-
 ###############################################################################
 # Test subsetting a file with a RPC
 
@@ -779,8 +717,6 @@ def test_gdal_translate_32():
        abs(float(md['SAMP_OFF']) - (13464 - -10)) <= 1e-5 and \
        abs(float(md['SAMP_SCALE']) - 13464) <= 1e-5)
 
-    return 'success'
-
 ###############################################################################
 # Test -outsize option in auto mode
 
@@ -806,8 +742,6 @@ def test_gdal_translate_33():
     (_, err) = gdaltest.runexternal_out_and_err(test_cli_utilities.get_gdal_translate_path() + ' -outsize 0 0 ../gdrivers/data/small_world.tif tmp/test_gdal_translate_33.tif')
     assert err.find('-outsize 0 0 invalid') >= 0
 
-    return 'success'
-
 ###############################################################################
 # Test NBITS is preserved
 
@@ -824,8 +758,6 @@ def test_gdal_translate_34():
 
     os.unlink('tmp/test_gdal_translate_34.vrt')
 
-    return 'success'
-
 ###############################################################################
 # Test various errors (missing source or dest...)
 
@@ -846,8 +778,6 @@ def test_gdal_translate_35():
     (_, err) = gdaltest.runexternal_out_and_err(test_cli_utilities.get_gdal_translate_path() + ' ../gcore/data/byte.tif /non_existing_path/non_existing.tif')
     assert err.find('Attempt to create new tiff file') >= 0
 
-    return 'success'
-
 ###############################################################################
 # Test RAT is copied from hfa to gtiff - continuous/athematic
 
@@ -869,8 +799,6 @@ def test_gdal_translate_36():
     rat = None
     ds = None
 
-    return 'success'
-
 ###############################################################################
 # Test RAT is copied from hfa to gtiff - thematic
 
@@ -892,8 +820,6 @@ def test_gdal_translate_37():
     rat = None
     ds = None
 
-    return 'success'
-
 # Test RAT is copied round trip back to hfa
 
 def test_gdal_translate_38():
@@ -914,8 +840,6 @@ def test_gdal_translate_38():
     rat = None
     ds = None
 
-    return 'success'
-
 ###############################################################################
 # Cleanup
 
@@ -1044,8 +968,7 @@ def test_gdal_translate_cleanup():
         gdal.GetDriverByName('HFA').Delete('tmp/test_gdal_translate_38.img')
     except:
         pass
-    return 'success'
-
+    
 
 gdaltest_list = [
     test_gdal_translate_1,
diff --git a/autotest/utilities/test_gdal_translate_lib.py b/autotest/utilities/test_gdal_translate_lib.py
index 20b04bcae00e..e57f674286c6 100755
--- a/autotest/utilities/test_gdal_translate_lib.py
+++ b/autotest/utilities/test_gdal_translate_lib.py
@@ -59,8 +59,6 @@ def test_gdal_translate_lib_1():
 
     ds = None
 
-    return 'success'
-
 ###############################################################################
 # Test format option and callback
 
@@ -84,8 +82,6 @@ def test_gdal_translate_lib_2():
 
     ds = None
 
-    return 'success'
-
 ###############################################################################
 # Test outputType option
 
@@ -102,8 +98,6 @@ def test_gdal_translate_lib_3():
 
     ds = None
 
-    return 'success'
-
 ###############################################################################
 # Test bandList option
 
@@ -123,8 +117,6 @@ def test_gdal_translate_lib_4():
 
     ds = None
 
-    return 'success'
-
 ###############################################################################
 # Test rgbExpand option
 
@@ -152,8 +144,6 @@ def test_gdal_translate_lib_5():
 
     ds = None
 
-    return 'success'
-
 ###############################################################################
 # Test oXSizePixel and oYSizePixel option
 
@@ -168,8 +158,6 @@ def test_gdal_translate_lib_6():
 
     ds = None
 
-    return 'success'
-
 ###############################################################################
 # Test oXSizePct and oYSizePct option
 
@@ -184,8 +172,6 @@ def test_gdal_translate_lib_7():
 
     ds = None
 
-    return 'success'
-
 ###############################################################################
 # Test outputSRS and GCPs options
 
@@ -206,8 +192,6 @@ def test_gdal_translate_lib_8():
 
     ds = None
 
-    return 'success'
-
 ###############################################################################
 # Test nodata option
 
@@ -222,8 +206,6 @@ def test_gdal_translate_lib_9():
 
     ds = None
 
-    return 'success'
-
 ###############################################################################
 # Test srcWin option
 
@@ -238,8 +220,6 @@ def test_gdal_translate_lib_10():
 
     ds = None
 
-    return 'success'
-
 ###############################################################################
 # Test projWin option
 
@@ -257,8 +237,6 @@ def test_gdal_translate_lib_11():
 
     ds = None
 
-    return 'success'
-
 ###############################################################################
 # Test outputBounds option
 
@@ -276,8 +254,6 @@ def test_gdal_translate_lib_12():
 
     ds = None
 
-    return 'success'
-
 ###############################################################################
 # Test metadataOptions
 
@@ -293,8 +269,6 @@ def test_gdal_translate_lib_13():
 
     ds = None
 
-    return 'success'
-
 ###############################################################################
 # Test creationOptions
 
@@ -310,8 +284,6 @@ def test_gdal_translate_lib_14():
 
     ds = None
 
-    return 'success'
-
 ###############################################################################
 # Test internal wrappers
 
@@ -332,8 +304,7 @@ def test_gdal_translate_lib_100():
     except:
         pass
 
-    return 'success'
-
+    
 ###############################################################################
 # Test behaviour with SIGNEDBYTE
 
@@ -350,7 +321,6 @@ def test_gdal_translate_lib_101():
     ds2 = None
     gdal.Unlink('/vsimem/test_gdal_translate_lib_101.tif')
     gdal.Unlink('/vsimem/test_gdal_translate_lib_101_2.tif')
-    return 'success'
 
 ###############################################################################
 # Test -scale
@@ -372,8 +342,7 @@ def test_gdal_translate_lib_102():
     for i in range(4):
         assert abs(stats[i] - expected_stats[i]) <= 1e-3
 
-    return 'success'
-
+    
 ###############################################################################
 # Test that -projwin with nearest neighbor resampling uses integer source
 # pixel boundaries (#6610)
@@ -389,8 +358,6 @@ def test_gdal_translate_lib_103():
     assert gdaltest.geotransform_equals(gdal.Open('../gcore/data/byte.tif').GetGeoTransform(), ds.GetGeoTransform(), 1e-9), \
         'Bad geotransform'
 
-    return 'success'
-
 ###############################################################################
 # Test translate with a MEM source to a anonymous VRT
 
@@ -402,8 +369,6 @@ def test_gdal_translate_lib_104():
     ds = gdal.Translate('', '../gcore/data/byte.tif', format='VRT', width=1, height=1)
     assert ds.GetRasterBand(1).Checksum() == 3, 'Bad checksum'
 
-    return 'success'
-
 ###############################################################################
 # Test GCPs propagation in "VRT path"
 
@@ -419,8 +384,7 @@ def test_gdal_translate_lib_gcp_vrt_path():
         assert ds.GetGCPs()[i].GCPPixel == src_ds.GetGCPs()[i].GCPPixel
         assert ds.GetGCPs()[i].GCPLine == src_ds.GetGCPs()[i].GCPLine
 
-    return 'success'
-
+    
 ###############################################################################
 # Test RPC propagation in "VRT path"
 
@@ -431,8 +395,6 @@ def test_gdal_translate_lib_rcp_vrt_path():
     ds = gdal.Translate('', src_ds, format='MEM', metadataOptions=['FOO=BAR'])
     assert ds.GetMetadata('RPC') == src_ds.GetMetadata('RPC')
 
-    return 'success'
-
 ###############################################################################
 # Test GeoLocation propagation in "VRT path"
 
@@ -444,8 +406,6 @@ def test_gdal_translate_lib_geolocation_vrt_path():
     assert ds.GetMetadata('GEOLOCATION') == src_ds.GetMetadata('GEOLOCATION')
     gdal.Unlink('/vsimem/temp.vrt')
 
-    return 'success'
-
 ###############################################################################
 # Test -colorinterp and -colorinterp_X
 
@@ -481,8 +441,7 @@ def test_gdal_translate_lib_colorinterp():
     except:
         pass
 
-    return 'success'
-
+    
 ###############################################################################
 # Cleanup
 
@@ -498,8 +457,7 @@ def test_gdal_translate_lib_cleanup():
         except OSError:
             pass
 
-    return 'success'
-
+    
 
 gdaltest_list = [
     test_gdal_translate_lib_1,
diff --git a/autotest/utilities/test_gdaladdo.py b/autotest/utilities/test_gdaladdo.py
index 0730a0cd96e2..bfc0e7c73116 100755
--- a/autotest/utilities/test_gdaladdo.py
+++ b/autotest/utilities/test_gdaladdo.py
@@ -87,8 +87,6 @@ def test_gdaladdo_2():
 
     os.remove('tmp/ovr5.tif')
 
-    return 'success'
-
 ###############################################################################
 # Test -ro
 
@@ -114,8 +112,7 @@ def test_gdaladdo_3():
     except OSError:
         pytest.fail('no external overview.')
 
-    return 'success'
-
+    
 ###############################################################################
 # Test -clean
 
@@ -140,8 +137,6 @@ def test_gdaladdo_4():
 
     os.remove('tmp/test_gdaladdo_3.tif')
 
-    return 'success'
-
 ###############################################################################
 # Test implicit levels
 
@@ -183,8 +178,6 @@ def test_gdaladdo_5():
 
     os.remove('tmp/test_gdaladdo_5.tif')
 
-    return 'success'
-
 
 gdaltest_list = [
     test_gdaladdo_1,
diff --git a/autotest/utilities/test_gdalbuildvrt.py b/autotest/utilities/test_gdalbuildvrt.py
index a2e70aabbdf5..23400eb47b52 100755
--- a/autotest/utilities/test_gdalbuildvrt.py
+++ b/autotest/utilities/test_gdalbuildvrt.py
@@ -61,8 +61,6 @@ def test_gdalbuildvrt_check():
 
     assert ds.GetRasterBand(1).Checksum() == 3508, 'Wrong checksum'
 
-    return 'success'
-
 
 ###############################################################################
 # Simple test
@@ -221,8 +219,6 @@ def test_gdalbuildvrt_6():
 
     assert ds.GetRasterBand(1).Checksum() == 0, 'Wrong checksum'
 
-    return 'success'
-
 ###############################################################################
 # Test source rasters with nodata
 
@@ -278,8 +274,6 @@ def test_gdalbuildvrt_7():
 
     ds = None
 
-    return 'success'
-
 ###############################################################################
 # Test -tr option
 
@@ -364,8 +358,6 @@ def test_gdalbuildvrt_10():
 
     ds = None
 
-    return 'success'
-
 ###############################################################################
 # Test that we can stack ungeoreference single band images with -separate (#3432)
 
@@ -394,8 +386,6 @@ def test_gdalbuildvrt_11():
 
     ds = None
 
-    return 'success'
-
 ###############################################################################
 # Test -tap option
 
@@ -422,8 +412,6 @@ def test_gdalbuildvrt_12():
     assert ds.RasterXSize == 13 and ds.RasterYSize == 25, \
         ('Wrong raster dimensions : %d x %d' % (ds.RasterXSize, ds.RasterYSize))
 
-    return 'success'
-
 ###############################################################################
 # Test -a_srs
 
@@ -438,8 +426,6 @@ def test_gdalbuildvrt_13():
     assert ds.GetProjectionRef().find('4326') != -1
     ds = None
 
-    return 'success'
-
 ###############################################################################
 # Test -r
 
@@ -463,8 +449,6 @@ def test_gdalbuildvrt_14():
 
     assert cs == cs_ref
 
-    return 'success'
-
 ###############################################################################
 # Test -b
 
@@ -481,8 +465,6 @@ def test_gdalbuildvrt_15():
 
     assert cs == 4672
 
-    return 'success'
-
 ###############################################################################
 # Test output to non writable file
 
@@ -499,8 +481,7 @@ def test_gdalbuildvrt_16():
         # We don't get the error code on Travis mingw
         assert err.find('ERROR') >= 0, out
 
-    return 'success'
-
+    
 ###############################################################################
 # Cleanup
 
@@ -542,8 +523,7 @@ def test_gdalbuildvrt_cleanup():
     except OSError:
         pass
 
-    return 'success'
-
+    
 
 gdaltest_list = [
     test_gdalbuildvrt_1,
diff --git a/autotest/utilities/test_gdalbuildvrt_lib.py b/autotest/utilities/test_gdalbuildvrt_lib.py
index c6d8a15ce2e9..e2b3cc956981 100755
--- a/autotest/utilities/test_gdalbuildvrt_lib.py
+++ b/autotest/utilities/test_gdalbuildvrt_lib.py
@@ -65,8 +65,6 @@ def test_gdalbuildvrt_lib_1():
 
     assert ds.GetRasterBand(1).Checksum() == 4672, 'Bad checksum'
 
-    return 'success'
-
 ###############################################################################
 # Test callback
 
@@ -89,8 +87,6 @@ def test_gdalbuildvrt_lib_2():
 
     ds = None
 
-    return 'success'
-
 
 gdaltest_list = [
     test_gdalbuildvrt_lib_1,
diff --git a/autotest/utilities/test_gdaldem.py b/autotest/utilities/test_gdaldem.py
index 6a15105f22fa..9d0c665c1002 100755
--- a/autotest/utilities/test_gdaldem.py
+++ b/autotest/utilities/test_gdaldem.py
@@ -70,8 +70,6 @@ def test_gdaldem_hillshade():
     src_ds = None
     ds = None
 
-    return 'success'
-
 ###############################################################################
 # Test gdaldem hillshade
 
@@ -96,8 +94,6 @@ def test_gdaldem_hillshade_compressed_tiled_output():
     assert stat_uncompressed.st_size >= stat_compressed.st_size, \
         'failure: compressed size greater than uncompressed one'
 
-    return 'success'
-
 ###############################################################################
 # Test gdaldem hillshade -combined
 
@@ -128,8 +124,6 @@ def test_gdaldem_hillshade_combined():
     src_ds = None
     ds = None
 
-    return 'success'
-
 ###############################################################################
 # Test gdaldem hillshade with -compute_edges
 
@@ -148,8 +142,6 @@ def test_gdaldem_hillshade_compute_edges():
 
     ds = None
 
-    return 'success'
-
 ###############################################################################
 # Test gdaldem hillshade with -az parameter
 
@@ -184,8 +176,6 @@ def test_gdaldem_hillshade_azimuth():
     ds = None
     ds_ref = None
 
-    return 'success'
-
 ###############################################################################
 # Test gdaldem hillshade to PNG
 
@@ -204,8 +194,6 @@ def test_gdaldem_hillshade_png():
 
     ds = None
 
-    return 'success'
-
 ###############################################################################
 # Test gdaldem hillshade to PNG with -compute_edges
 
@@ -224,8 +212,6 @@ def test_gdaldem_hillshade_png_compute_edges():
 
     ds = None
 
-    return 'success'
-
 ###############################################################################
 # Test gdaldem slope
 
@@ -255,8 +241,6 @@ def test_gdaldem_slope():
     src_ds = None
     ds = None
 
-    return 'success'
-
 ###############################################################################
 # Test gdaldem aspect
 
@@ -286,8 +270,6 @@ def test_gdaldem_aspect():
     src_ds = None
     ds = None
 
-    return 'success'
-
 ###############################################################################
 # Test gdaldem color relief
 
@@ -318,8 +300,6 @@ def test_gdaldem_color_relief():
     src_ds = None
     ds = None
 
-    return 'success'
-
 
 ###############################################################################
 # Test gdaldem color relief on a GMT .cpt file
@@ -350,8 +330,6 @@ def test_gdaldem_color_relief_cpt():
     src_ds = None
     ds = None
 
-    return 'success'
-
 ###############################################################################
 # Test gdaldem color relief to VRT
 
@@ -380,8 +358,6 @@ def test_gdaldem_color_relief_vrt():
     src_ds = None
     ds = None
 
-    return 'success'
-
 ###############################################################################
 # Test gdaldem color relief from a Float32 dataset
 
@@ -405,8 +381,6 @@ def test_gdaldem_color_relief_from_float32():
 
     ds = None
 
-    return 'success'
-
 ###############################################################################
 # Test gdaldem color relief to PNG
 
@@ -427,8 +401,6 @@ def test_gdaldem_color_relief_png():
 
     ds = None
 
-    return 'success'
-
 ###############################################################################
 # Test gdaldem color relief from a Float32 to PNG
 
@@ -451,8 +423,6 @@ def test_gdaldem_color_relief_from_float32_to_png():
 
     ds = None
 
-    return 'success'
-
 ###############################################################################
 # Test gdaldem color relief with -nearest_color_entry
 
@@ -473,8 +443,6 @@ def test_gdaldem_color_relief_nearest_color_entry():
 
     ds = None
 
-    return 'success'
-
 ###############################################################################
 # Test gdaldem color relief with -nearest_color_entry and -of VRT
 
@@ -495,8 +463,6 @@ def test_gdaldem_color_relief_nearest_color_entry_vrt():
 
     ds = None
 
-    return 'success'
-
 ###############################################################################
 # Test gdaldem color relief with a nan nodata
 
@@ -535,8 +501,6 @@ def test_gdaldem_color_relief_nodata_nan():
     os.unlink('tmp/nodata_nan_plt.txt')
     os.unlink('tmp/nodata_nan_out.tif')
 
-    return 'success'
-
 ###############################################################################
 # Test gdaldem color relief with entries with repeated DEM values in the color table (#6422)
 
@@ -589,8 +553,6 @@ def test_gdaldem_color_relief_repeated_entry():
     os.unlink('tmp/test_gdaldem_color_relief_repeated_entry_out.tif')
     os.unlink('tmp/test_gdaldem_color_relief_repeated_entry_out.vrt')
 
-    return 'success'
-
 ###############################################################################
 # Cleanup
 
@@ -670,8 +632,7 @@ def test_gdaldem_cleanup():
         os.remove('tmp/n43_colorrelief_nearest.vrt')
     except OSError:
         pass
-    return 'success'
-
+    
 
 gdaltest_list = [
     test_gdaldem_hillshade,
diff --git a/autotest/utilities/test_gdaldem_lib.py b/autotest/utilities/test_gdaldem_lib.py
index 23d15c209a16..b1372d29d704 100755
--- a/autotest/utilities/test_gdaldem_lib.py
+++ b/autotest/utilities/test_gdaldem_lib.py
@@ -64,8 +64,6 @@ def test_gdaldem_lib_hillshade():
     src_ds = None
     ds = None
 
-    return 'success'
-
 ###############################################################################
 # Test gdaldem hillshade with source being floating point
 
@@ -92,8 +90,6 @@ def test_gdaldem_lib_hillshade_float():
     src_ds = None
     ds = None
 
-    return 'success'
-
 ###############################################################################
 # Test gdaldem hillshade with source being floating point
 
@@ -122,8 +118,6 @@ def test_gdaldem_lib_hillshade_float_png():
 
     gdal.GetDriverByName('PNG').Delete('/vsimem/test_gdaldem_lib_hillshade_float_png.png')
 
-    return 'success'
-
 ###############################################################################
 # Test gdaldem hillshade -combined
 
@@ -150,8 +144,6 @@ def test_gdaldem_lib_hillshade_combined():
     src_ds = None
     ds = None
 
-    return 'success'
-
 ###############################################################################
 # Test gdaldem hillshade -alg ZevenbergenThorne
 
@@ -178,8 +170,6 @@ def test_gdaldem_lib_hillshade_ZevenbergenThorne():
     src_ds = None
     ds = None
 
-    return 'success'
-
 ###############################################################################
 # Test gdaldem hillshade -alg ZevenbergenThorne -combined
 
@@ -206,8 +196,6 @@ def test_gdaldem_lib_hillshade_ZevenbergenThorne_combined():
     src_ds = None
     ds = None
 
-    return 'success'
-
 ###############################################################################
 # Test gdaldem hillshade with -compute_edges
 
@@ -223,8 +211,6 @@ def test_gdaldem_lib_hillshade_compute_edges():
 
     ds = None
 
-    return 'success'
-
 ###############################################################################
 # Test gdaldem hillshade with -compute_edges with floating point
 
@@ -240,8 +226,6 @@ def test_gdaldem_lib_hillshade_compute_edges_float():
 
     ds = None
 
-    return 'success'
-
 ###############################################################################
 # Test gdaldem hillshade with -az parameter
 
@@ -271,8 +255,6 @@ def test_gdaldem_lib_hillshade_azimuth():
     ds = None
     ds_ref = None
 
-    return 'success'
-
 ###############################################################################
 # Test gdaldem hillshade -multidirectional
 
@@ -288,8 +270,6 @@ def test_gdaldem_lib_hillshade_multidirectional():
 
     ds = None
 
-    return 'success'
-
 ###############################################################################
 # Test gdaldem hillshade -multidirectional
 
@@ -305,8 +285,6 @@ def test_gdaldem_lib_hillshade_multidirectional_ZevenbergenThorne():
 
     ds = None
 
-    return 'success'
-
 ###############################################################################
 # Test gdaldem color relief
 
@@ -337,8 +315,6 @@ def test_gdaldem_lib_color_relief():
     src_ds = None
     ds = None
 
-    return 'success'
-
 ###############################################################################
 # Test gdaldem tpi
 
@@ -354,8 +330,6 @@ def test_gdaldem_lib_tpi():
 
     ds = None
 
-    return 'success'
-
 ###############################################################################
 # Test gdaldem tri
 
@@ -371,8 +345,6 @@ def test_gdaldem_lib_tri():
 
     ds = None
 
-    return 'success'
-
 ###############################################################################
 # Test gdaldem roughness
 
@@ -388,8 +360,6 @@ def test_gdaldem_lib_roughness():
 
     ds = None
 
-    return 'success'
-
 ###############################################################################
 # Test gdaldem slope -alg ZevenbergenThorne
 
@@ -403,8 +373,6 @@ def test_gdaldem_lib_slope_ZevenbergenThorne():
     cs = ds.GetRasterBand(1).Checksum()
     assert cs == 64393, 'Bad checksum'
 
-    return 'success'
-
 ###############################################################################
 # Test gdaldem aspect -alg ZevenbergenThorne
 
@@ -418,8 +386,6 @@ def test_gdaldem_lib_aspect_ZevenbergenThorne():
     cs = ds.GetRasterBand(1).Checksum()
     assert cs == 50539, 'Bad checksum'
 
-    return 'success'
-
 ###############################################################################
 # Test gdaldem hillshade with nodata values
 
@@ -481,8 +447,7 @@ def test_gdaldem_lib_nodata():
         print(ds.ReadAsArray())  # Should be 0 0 0 0 181 0 0 0 0
         pytest.fail('Bad checksum')
 
-    return 'success'
-
+    
 
 gdaltest_list = [
     test_gdaldem_lib_hillshade,
diff --git a/autotest/utilities/test_gdalinfo.py b/autotest/utilities/test_gdalinfo.py
index 9aab7e659caf..b8d394e949a1 100755
--- a/autotest/utilities/test_gdalinfo.py
+++ b/autotest/utilities/test_gdalinfo.py
@@ -51,8 +51,6 @@ def test_gdalinfo_1():
     assert (err is None or err == ''), 'got error/warning'
     assert ret.find('Driver: GTiff/GeoTIFF') != -1
 
-    return 'success'
-
 ###############################################################################
 # Test -checksum option
 
@@ -64,8 +62,6 @@ def test_gdalinfo_2():
     ret = gdaltest.runexternal(test_cli_utilities.get_gdalinfo_path() + ' -checksum ../gcore/data/byte.tif')
     assert ret.find('Checksum=4672') != -1
 
-    return 'success'
-
 ###############################################################################
 # Test -nomd option
 
@@ -80,8 +76,6 @@ def test_gdalinfo_3():
     ret = gdaltest.runexternal(test_cli_utilities.get_gdalinfo_path() + ' -nomd ../gcore/data/byte.tif')
     assert ret.find('Metadata') == -1
 
-    return 'success'
-
 ###############################################################################
 # Test -noct option
 
@@ -96,8 +90,6 @@ def test_gdalinfo_4():
     ret = gdaltest.runexternal(test_cli_utilities.get_gdalinfo_path() + ' -noct ../gdrivers/data/bug407.gif')
     assert ret.find('0: 255,255,255,255') == -1
 
-    return 'success'
-
 ###############################################################################
 # Test -stats option
 
@@ -120,8 +112,6 @@ def test_gdalinfo_5():
     # We will blow an exception if the file does not exist now!
     os.remove('../gcore/data/byte.tif.aux.xml')
 
-    return 'success'
-
 ###############################################################################
 # Test a dataset with overviews and RAT
 
@@ -134,8 +124,6 @@ def test_gdalinfo_6():
     assert ret.find('Overviews') != -1
     assert ret.find('GDALRasterAttributeTable') != -1
 
-    return 'success'
-
 ###############################################################################
 # Test a dataset with GCPs
 
@@ -155,8 +143,6 @@ def test_gdalinfo_7():
     assert ret.find('PROJCS["NAD27 / UTM zone 11N"') == -1
     assert ret.find('(100,100) -> (446720,3745320,0)') == -1
 
-    return 'success'
-
 ###############################################################################
 # Test -hist option
 
@@ -181,8 +167,6 @@ def test_gdalinfo_8():
     # We will blow an exception if the file does not exist now!
     os.remove('../gcore/data/byte.tif.aux.xml')
 
-    return 'success'
-
 ###############################################################################
 # Test -mdd option
 
@@ -197,8 +181,6 @@ def test_gdalinfo_9():
     ret = gdaltest.runexternal(test_cli_utilities.get_gdalinfo_path() + ' -mdd TRE ../gdrivers/data/fake_nsif.ntf')
     assert ret.find('BLOCKA=010000001000000000') != -1, 'did not get extra MD.'
 
-    return 'success'
-
 ###############################################################################
 # Test -mm option
 
@@ -213,8 +195,6 @@ def test_gdalinfo_10():
     ret = gdaltest.runexternal(test_cli_utilities.get_gdalinfo_path() + ' -mm ../gcore/data/byte.tif')
     assert ret.find('Computed Min/Max=74.000,255.000') != -1
 
-    return 'success'
-
 ###############################################################################
 # Test gdalinfo --version
 
@@ -227,8 +207,6 @@ def test_gdalinfo_11():
     ret = gdaltest.runexternal(test_cli_utilities.get_gdalinfo_path() + ' --version', check_memleak=False)
     assert ret.find(gdal.VersionInfo('--version')) == 0
 
-    return 'success'
-
 ###############################################################################
 # Test gdalinfo --build
 
@@ -241,8 +219,6 @@ def test_gdalinfo_12():
     ret = ret.replace('\r\n', '\n')
     assert ret.find(gdal.VersionInfo('BUILD_INFO')) == 0
 
-    return 'success'
-
 ###############################################################################
 # Test gdalinfo --license
 
@@ -259,8 +235,7 @@ def test_gdalinfo_13():
             return 'expected_fail'
         pytest.fail(ret)
 
-    return 'success'
-
+    
 ###############################################################################
 # Test erroneous use of --config.
 
@@ -272,8 +247,6 @@ def test_gdalinfo_14():
     (_, err) = gdaltest.runexternal_out_and_err(test_cli_utilities.get_gdalinfo_path() + ' --config', check_memleak=False)
     assert err.find('--config option given without a key and value argument') >= 0
 
-    return 'success'
-
 ###############################################################################
 # Test erroneous use of --mempreload.
 
@@ -285,8 +258,6 @@ def test_gdalinfo_15():
     (_, err) = gdaltest.runexternal_out_and_err(test_cli_utilities.get_gdalinfo_path() + ' --mempreload', check_memleak=False)
     assert err.find('--mempreload option given without directory path') >= 0
 
-    return 'success'
-
 ###############################################################################
 # Test --mempreload
 
@@ -298,8 +269,6 @@ def test_gdalinfo_16():
     (ret, _) = gdaltest.runexternal_out_and_err(test_cli_utilities.get_gdalinfo_path() + ' --debug on --mempreload ../gcore/data /vsimem/byte.tif', check_memleak=False)
     assert ret.find('Driver: GTiff/GeoTIFF') == 0
 
-    return 'success'
-
 ###############################################################################
 # Test erroneous use of --debug.
 
@@ -311,8 +280,6 @@ def test_gdalinfo_17():
     (_, err) = gdaltest.runexternal_out_and_err(test_cli_utilities.get_gdalinfo_path() + ' --debug', check_memleak=False)
     assert err.find('--debug option given without debug level') >= 0
 
-    return 'success'
-
 ###############################################################################
 # Test erroneous use of --optfile.
 
@@ -327,8 +294,6 @@ def test_gdalinfo_18():
     (_, err) = gdaltest.runexternal_out_and_err(test_cli_utilities.get_gdalinfo_path() + ' --optfile /foo/bar', check_memleak=False)
     assert err.find('Unable to open optfile') >= 0
 
-    return 'success'
-
 ###############################################################################
 # Test --optfile
 
@@ -345,8 +310,6 @@ def test_gdalinfo_19():
     os.unlink('tmp/optfile.txt')
     assert ret.find('Driver: GTiff/GeoTIFF') == 0
 
-    return 'success'
-
 ###############################################################################
 # Test --formats
 
@@ -358,8 +321,6 @@ def test_gdalinfo_20():
     ret = gdaltest.runexternal(test_cli_utilities.get_gdalinfo_path() + ' --formats', check_memleak=False)
     assert ret.find('GTiff -raster- (rw+vs): GeoTIFF') >= 0
 
-    return 'success'
-
 ###############################################################################
 # Test erroneous use of --format.
 
@@ -374,8 +335,6 @@ def test_gdalinfo_21():
     (_, err) = gdaltest.runexternal_out_and_err(test_cli_utilities.get_gdalinfo_path() + ' --format foo_bar', check_memleak=False)
     assert err.find('--format option given with format') >= 0
 
-    return 'success'
-
 ###############################################################################
 # Test --format
 
@@ -400,8 +359,7 @@ def test_gdalinfo_22():
     for expected_string in expected_strings:
         assert ret.find(expected_string) >= 0, ('did not find %s' % expected_string)
 
-    return 'success'
-
+    
 ###############################################################################
 # Test --help-general
 
@@ -413,8 +371,6 @@ def test_gdalinfo_23():
     ret = gdaltest.runexternal(test_cli_utilities.get_gdalinfo_path() + ' --help-general', check_memleak=False)
     assert ret.find('Generic GDAL utility command options') >= 0
 
-    return 'success'
-
 ###############################################################################
 # Test --locale
 
@@ -426,8 +382,6 @@ def test_gdalinfo_24():
     ret = gdaltest.runexternal(test_cli_utilities.get_gdalinfo_path() + ' --locale C ../gcore/data/byte.tif', check_memleak=False)
     assert ret.find('Driver: GTiff/GeoTIFF') == 0
 
-    return 'success'
-
 ###############################################################################
 # Test -listmdd
 
@@ -440,8 +394,6 @@ def test_gdalinfo_25():
     assert ret.find('Metadata domains:') >= 0
     assert ret.find('  xml:XMP') >= 0
 
-    return 'success'
-
 ###############################################################################
 # Test -mdd all
 
@@ -453,8 +405,6 @@ def test_gdalinfo_26():
     ret = gdaltest.runexternal(test_cli_utilities.get_gdalinfo_path() + ' ../gdrivers/data/byte_with_xmp.tif -mdd all', check_memleak=False)
     assert ret.find('Metadata (xml:XMP)') >= 0
 
-    return 'success'
-
 ###############################################################################
 # Test -oo
 
@@ -466,8 +416,6 @@ def test_gdalinfo_27():
     ret = gdaltest.runexternal(test_cli_utilities.get_gdalinfo_path() + ' ../gdrivers/data/float64.asc -oo datatype=float64', check_memleak=False)
     assert ret.find('Type=Float64') >= 0
 
-    return 'success'
-
 ###############################################################################
 # Simple -json test
 
@@ -481,8 +429,6 @@ def test_gdalinfo_28():
     assert (err is None or err == ''), 'got error/warning'
     assert ret['driverShortName'] == 'GTiff'
 
-    return 'success'
-
 ###############################################################################
 # Test -json -checksum option
 
@@ -495,8 +441,6 @@ def test_gdalinfo_29():
     ret = json.loads(ret)
     assert ret['bands'][0]['checksum'] == 4672
 
-    return 'success'
-
 ###############################################################################
 # Test -json -nomd option
 
@@ -513,8 +457,6 @@ def test_gdalinfo_30():
     ret = json.loads(ret)
     assert 'metadata' not in ret
 
-    return 'success'
-
 ###############################################################################
 # Test -json -noct option
 
@@ -531,8 +473,6 @@ def test_gdalinfo_31():
     ret = json.loads(ret)
     assert 'colorTable' not in ret['bands'][0]
 
-    return 'success'
-
 ###############################################################################
 # Test -stats option
 
@@ -558,8 +498,6 @@ def test_gdalinfo_32():
     # We will blow an exception if the file does not exist now!
     os.remove('../gcore/data/byte.tif.aux.xml')
 
-    return 'success'
-
 ###############################################################################
 # Test a dataset with overviews and RAT
 
@@ -573,8 +511,6 @@ def test_gdalinfo_33():
     assert 'overviews' in ret['bands'][0]
     assert 'rat' in ret
 
-    return 'success'
-
 ###############################################################################
 # Test a dataset with GCPs
 
@@ -593,8 +529,6 @@ def test_gdalinfo_34():
     ret = json.loads(ret)
     assert 'gcps' not in ret
 
-    return 'success'
-
 ###############################################################################
 # Test -hist option
 
@@ -620,8 +554,6 @@ def test_gdalinfo_35():
     # We will blow an exception if the file does not exist now!
     os.remove('../gcore/data/byte.tif.aux.xml')
 
-    return 'success'
-
 ###############################################################################
 # Test -mdd option
 
@@ -639,8 +571,6 @@ def test_gdalinfo_36():
     assert ret['metadata']['TRE']['BLOCKA'].find('010000001000000000') != -1, \
         'did not get extra MD.'
 
-    return 'success'
-
 ###############################################################################
 # Test -mm option
 
@@ -657,8 +587,6 @@ def test_gdalinfo_37():
     ret = json.loads(ret)
     assert ret['bands'][0]['computedMin'] == 74.000
 
-    return 'success'
-
 ###############################################################################
 # Test -listmdd
 
@@ -672,8 +600,6 @@ def test_gdalinfo_38():
     assert 'metadataDomains' in ret['metadata']
     assert ret['metadata']['metadataDomains'][0] == 'xml:XMP'
 
-    return 'success'
-
 ###############################################################################
 # Test -mdd all
 
@@ -686,8 +612,6 @@ def test_gdalinfo_39():
     ret = json.loads(ret)
     assert 'xml:XMP' in ret['metadata']
 
-    return 'success'
-
 ###############################################################################
 # Test -json wgs84Extent
 
@@ -704,8 +628,6 @@ def test_gdalinfo_40():
     assert 'coordinates' in ret['wgs84Extent']
     assert ret['wgs84Extent']['coordinates'] == [[[-180.0, 90.0], [-180.0, -90.0], [180.0, -90.0], [180.0, 90.0], [-180.0, 90.0]]]
 
-    return 'success'
-
 
 gdaltest_list = [
     test_gdalinfo_1,
diff --git a/autotest/utilities/test_gdalinfo_lib.py b/autotest/utilities/test_gdalinfo_lib.py
index a83e18b173c4..921fc45af33d 100755
--- a/autotest/utilities/test_gdalinfo_lib.py
+++ b/autotest/utilities/test_gdalinfo_lib.py
@@ -46,8 +46,6 @@ def test_gdalinfo_lib_1():
     ret = gdal.Info(ds)
     assert ret.find('Driver: GTiff/GeoTIFF') != -1, 'did not get expected string.'
 
-    return 'success'
-
 ###############################################################################
 # Test Json format
 
@@ -59,8 +57,6 @@ def test_gdalinfo_lib_2():
     ret = gdal.Info(ds, format='json')
     assert ret['driverShortName'] == 'GTiff', 'wrong value for driverShortName.'
 
-    return 'success'
-
 ###############################################################################
 # Test extraMDDomains()
 
@@ -77,8 +73,6 @@ def test_gdalinfo_lib_3():
     assert ret['metadata']['TRE']['BLOCKA'].find('010000001000000000') != -1, \
         'did not get extra MD.'
 
-    return 'success'
-
 ###############################################################################
 # Test allMetadata
 
@@ -90,8 +84,6 @@ def test_gdalinfo_lib_4():
     ret = gdal.Info(ds, allMetadata=True, format='json')
     assert 'xml:XMP' in ret['metadata']
 
-    return 'success'
-
 ###############################################################################
 # Test all options
 
@@ -115,8 +107,6 @@ def test_gdalinfo_lib_5():
 
     gdal.Unlink('../gdrivers/data/byte.tif.aux.xml')
 
-    return 'success'
-
 ###############################################################################
 # Test command line syntax + dataset as string
 
@@ -126,8 +116,6 @@ def test_gdalinfo_lib_6():
     ret = gdal.Info('../gcore/data/byte.tif', options='-json')
     assert ret['driverShortName'] == 'GTiff', 'wrong value for driverShortName.'
 
-    return 'success'
-
 ###############################################################################
 # Test with unicode strings
 
@@ -137,8 +125,6 @@ def test_gdalinfo_lib_7():
     ret = gdal.Info('../gcore/data/byte.tif'.encode('ascii').decode('ascii'), options='-json'.encode('ascii').decode('ascii'))
     assert ret['driverShortName'] == 'GTiff', 'wrong value for driverShortName.'
 
-    return 'success'
-
 ###############################################################################
 
 
@@ -148,8 +134,6 @@ def test_gdalinfo_lib_nodatavalues():
     ret = gdal.Info(ds)
     assert ret.find('PER_DATASET NODATA') >= 0, 'wrong value for mask flags.'
 
-    return 'success'
-
 
 gdaltest_list = [
     test_gdalinfo_lib_1,
diff --git a/autotest/utilities/test_gdallocationinfo.py b/autotest/utilities/test_gdallocationinfo.py
index 4bd6dc0e5141..087bb82efc19 100755
--- a/autotest/utilities/test_gdallocationinfo.py
+++ b/autotest/utilities/test_gdallocationinfo.py
@@ -56,8 +56,6 @@ def test_gdallocationinfo_1():
     Value: 107"""
     assert ret.find(expected_ret) == 0
 
-    return 'success'
-
 ###############################################################################
 # Test -xml
 
@@ -75,8 +73,6 @@ def test_gdallocationinfo_2():
 </Report>"""
     assert ret.find(expected_ret) == 0
 
-    return 'success'
-
 ###############################################################################
 # Test -valonly
 
@@ -89,8 +85,6 @@ def test_gdallocationinfo_3():
     expected_ret = """107"""
     assert ret.find(expected_ret) == 0
 
-    return 'success'
-
 ###############################################################################
 # Test -geoloc
 
@@ -107,8 +101,6 @@ def test_gdallocationinfo_4():
     Value: 107"""
     assert ret.find(expected_ret) == 0
 
-    return 'success'
-
 ###############################################################################
 # Test -lifonly
 
@@ -122,8 +114,6 @@ def test_gdallocationinfo_5():
     expected_ret2 = """../gcore/data\\byte.tif"""
     assert ret.find(expected_ret1) >= 0 or ret.find(expected_ret2) >= 0
 
-    return 'success'
-
 ###############################################################################
 # Test -overview
 
@@ -144,8 +134,6 @@ def test_gdallocationinfo_6():
     expected_ret = """Value: 130"""
     assert ret.find(expected_ret) >= 0
 
-    return 'success'
-
 
 gdaltest_list = [
     test_gdallocationinfo_1,
diff --git a/autotest/utilities/test_gdalsrsinfo.py b/autotest/utilities/test_gdalsrsinfo.py
index 6a963cea936c..34f4ef7521ba 100755
--- a/autotest/utilities/test_gdalsrsinfo.py
+++ b/autotest/utilities/test_gdalsrsinfo.py
@@ -50,8 +50,6 @@ def test_gdalsrsinfo_1():
     assert ret.find('PROJ.4 :') != -1
     assert ret.find('OGC WKT :') != -1
 
-    return 'success'
-
 ###############################################################################
 # Test -o proj4 option
 
@@ -65,8 +63,6 @@ def test_gdalsrsinfo_2():
 
     assert ret.strip() == "+proj=utm +zone=11 +datum=NAD27 +units=m +no_defs"
 
-    return 'success'
-
 ###############################################################################
 # Test -o wkt option
 
@@ -83,8 +79,6 @@ def test_gdalsrsinfo_3():
     third_val = 'PROJCS["NAD27 / UTM zone 11N",GEOGCS["NAD27",DATUM["North_American_Datum_1927",SPHEROID["Clarke 1866",6378206.4,294.9786982138982,AUTHORITY["EPSG","7008"]],AUTHORITY["EPSG","6267"]],PRIMEM["Greenwich",0,AUTHORITY["EPSG","8901"]],UNIT["degree",0.0174532925199433,AUTHORITY["EPSG","9122"]],AUTHORITY["EPSG","4267"]],PROJECTION["Transverse_Mercator"],PARAMETER["latitude_of_origin",0],PARAMETER["central_meridian",-117],PARAMETER["scale_factor",0.9996],PARAMETER["false_easting",500000],PARAMETER["false_northing",0],UNIT["metre",1,AUTHORITY["EPSG","9001"]],AXIS["Easting",EAST],AXIS["Northing",NORTH],AUTHORITY["EPSG","26711"]]'
     assert ret.strip() == first_val or ret.strip() == second_val or ret.strip() == third_val
 
-    return 'success'
-
 ###############################################################################
 # Test -o wkt_esri option
 
@@ -98,8 +92,6 @@ def test_gdalsrsinfo_4():
 
     assert ret.strip() == 'PROJCS["NAD_1927_UTM_Zone_11N",GEOGCS["GCS_North_American_1927",DATUM["D_North_American_1927",SPHEROID["Clarke_1866",6378206.4,294.9786982]],PRIMEM["Greenwich",0],UNIT["Degree",0.017453292519943295]],PROJECTION["Transverse_Mercator"],PARAMETER["latitude_of_origin",0],PARAMETER["central_meridian",-117],PARAMETER["scale_factor",0.9996],PARAMETER["false_easting",500000],PARAMETER["false_northing",0],UNIT["Meter",1]]'
 
-    return 'success'
-
 ###############################################################################
 # Test -o wkt_old option
 
@@ -115,8 +107,6 @@ def test_gdalsrsinfo_5():
     second_val = 'PROJCS["NAD27 / UTM zone 11N",GEOGCS["NAD27",DATUM["North_American_Datum_1927",SPHEROID["Clarke 1866",6378206.4,294.9786982138982]],PRIMEM["Greenwich",0],UNIT["degree",0.0174532925199433]],PROJECTION["Transverse_Mercator"],PARAMETER["latitude_of_origin",0],PARAMETER["central_meridian",-117],PARAMETER["scale_factor",0.9996],PARAMETER["false_easting",500000],PARAMETER["false_northing",0],UNIT["metre",1]]'
     assert ret.strip() == first_val or ret.strip() == second_val
 
-    return 'success'
-
 ###############################################################################
 # Test -o wkt_simple option
 
@@ -158,8 +148,6 @@ def test_gdalsrsinfo_6():
 
     assert ret.strip() == first_val or ret.strip() == second_val
 
-    return 'success'
-
 ###############################################################################
 # Test -o mapinfo option
 
@@ -173,8 +161,6 @@ def test_gdalsrsinfo_7():
 
     assert ret.strip() == """'Earth Projection 8, 62, "m", -117, 0, 0.9996, 500000, 0'"""
 
-    return 'success'
-
 
 ###############################################################################
 # Test -p option
@@ -198,8 +184,6 @@ def test_gdalsrsinfo_8():
         AUTHORITY["EPSG","9122"]],
     AUTHORITY["EPSG","4326"]]"""
 
-    return 'success'
-
 
 ###############################################################################
 # Test nonexistent file.
@@ -213,8 +197,6 @@ def test_gdalsrsinfo_9():
 
     assert err.strip() == "ERROR 1: ERROR - failed to load SRS definition from nonexistent_file"
 
-    return 'success'
-
 
 ###############################################################################
 # Test -V option - valid
@@ -235,8 +217,6 @@ def test_gdalsrsinfo_10():
 
     assert ret.find('Validate Succeeds') != -1
 
-    return 'success'
-
 ###############################################################################
 # Test -V option - invalid
 
@@ -257,8 +237,6 @@ def test_gdalsrsinfo_11():
 
     assert ret.find('Validate Fails') != -1
 
-    return 'success'
-
 ###############################################################################
 # Test EPSG:epsg format
 
@@ -272,8 +250,6 @@ def test_gdalsrsinfo_12():
 
     assert ret.strip() == """GEOGCS["WGS 84",DATUM["WGS_1984",SPHEROID["WGS 84",6378137,298.257223563,AUTHORITY["EPSG","7030"]],AUTHORITY["EPSG","6326"]],PRIMEM["Greenwich",0,AUTHORITY["EPSG","8901"]],UNIT["degree",0.0174532925199433,AUTHORITY["EPSG","9122"]],AUTHORITY["EPSG","4326"]]"""
 
-    return 'success'
-
 
 ###############################################################################
 # Test proj4 format
@@ -287,8 +263,6 @@ def test_gdalsrsinfo_13():
 
     assert ret.strip() == """GEOGCS["WGS 84",DATUM["WGS_1984",SPHEROID["WGS 84",6378137,298.257223563,AUTHORITY["EPSG","7030"]],AUTHORITY["EPSG","6326"]],PRIMEM["Greenwich",0,AUTHORITY["EPSG","8901"]],UNIT["degree",0.0174532925199433,AUTHORITY["EPSG","9122"]],AUTHORITY["EPSG","4326"]]"""
 
-    return 'success'
-
 ###############################################################################
 # Test VSILFILE format
 
@@ -302,8 +276,6 @@ def test_gdalsrsinfo_14():
 
     assert ret.strip() == "+proj=utm +zone=11 +datum=NAD27 +units=m +no_defs"
 
-    return 'success'
-
 ###############################################################################
 # Test .shp format
 
@@ -317,8 +289,6 @@ def test_gdalsrsinfo_14bis():
 
     assert ret.strip() == "+proj=lcc +lat_1=30.28333333333333 +lat_2=28.38333333333333 +lat_0=27.83333333333333 +lon_0=-99 +x_0=600000 +y_0=3999999.9998984 +ellps=GRS80 +towgs84=0,0,0,0,0,0,0 +units=us-ft +no_defs"
 
-    return 'success'
-
 ###############################################################################
 # Test .prj format
 
@@ -332,8 +302,6 @@ def test_gdalsrsinfo_15():
 
     assert ret.strip() == "+proj=lcc +lat_1=34.33333333333334 +lat_2=36.16666666666666 +lat_0=33.75 +lon_0=-79 +x_0=609601.22 +y_0=0 +datum=NAD83 +units=m +no_defs"
 
-    return 'success'
-
 ###############################################################################
 # Test DRIVER:file syntax (bug #4493) -  similar test should be done with OGR
 
@@ -352,8 +320,6 @@ def test_gdalsrsinfo_16():
 
     assert err == ''
 
-    return 'success'
-
 ###############################################################################
 # Test -e
 
@@ -379,8 +345,6 @@ def test_gdalsrsinfo_17():
                                """ -e "GEOGCS[\"myLKS94\",DATUM[\"Lithuania_1994_ETRS89\",SPHEROID[\"GRS_1980\",6378137,298.257222101],TOWGS84[0,0,0,0,0,0,0]],PRIMEM[\"Greenwich\",0],UNIT[\"degree\",0.0174532925199433]]" """)
     assert ret.find('EPSG:4126') >= 0 and ret.find('EPSG:4669') >= 0
 
-    return 'success'
-
 ###############################################################################
 #
 
diff --git a/autotest/utilities/test_gdaltindex.py b/autotest/utilities/test_gdaltindex.py
index 174481e2f029..c856a515c790 100755
--- a/autotest/utilities/test_gdaltindex.py
+++ b/autotest/utilities/test_gdaltindex.py
@@ -115,8 +115,6 @@ def test_gdaltindex_1():
         feat = ds.GetLayer(0).GetNextFeature()
     ds.Destroy()
 
-    return 'success'
-
 ###############################################################################
 # Try adding the same rasters again
 
@@ -137,8 +135,6 @@ def test_gdaltindex_2():
     assert ds.GetLayer(0).GetFeatureCount() == 4
     ds.Destroy()
 
-    return 'success'
-
 
 ###############################################################################
 # Try adding a raster in another projection with -skip_different_projection
@@ -166,8 +162,6 @@ def test_gdaltindex_3():
     assert ds.GetLayer(0).GetFeatureCount() == 4
     ds.Destroy()
 
-    return 'success'
-
 ###############################################################################
 # Try adding a raster in another projection with -t_srs
 # 5th tile should be inserted, will not be if there is a srs transformation error
@@ -192,8 +186,6 @@ def test_gdaltindex_4():
         ('got %d features, expecting 5' % ds.GetLayer(0).GetFeatureCount())
     ds.Destroy()
 
-    return 'success'
-
 ###############################################################################
 # Test -src_srs_name, -src_srs_format options
 
@@ -237,8 +229,7 @@ def test_gdaltindex_5():
                 pytest.fail()
         ds = None
 
-    return 'success'
-
+    
 ###############################################################################
 # Test -f, -lyr_name
 
@@ -258,8 +249,7 @@ def test_gdaltindex_6():
             ('got %d features, expecting 1' % lyr.GetFeatureCount())
         ds = None
 
-    return 'success'
-
+    
 ###############################################################################
 # Cleanup
 
@@ -279,8 +269,6 @@ def test_gdaltindex_cleanup():
     drv.Delete('tmp/gdaltindex5.tif')
     drv.Delete('tmp/gdaltindex6.tif')
 
-    return 'success'
-
 
 gdaltest_list = [
     test_gdaltindex_1,
diff --git a/autotest/utilities/test_gdaltransform.py b/autotest/utilities/test_gdaltransform.py
index f716e82a0a3e..6ec83cf1950e 100755
--- a/autotest/utilities/test_gdaltransform.py
+++ b/autotest/utilities/test_gdaltransform.py
@@ -49,8 +49,6 @@ def test_gdaltransform_1():
     assert ret.find('2 49 1') != -1
     assert ret.find('3 50 2') != -1
 
-    return 'success'
-
 ###############################################################################
 # Test -gcp
 
@@ -67,8 +65,6 @@ def test_gdaltransform_2():
     assert ret.find('441920 3750120') != -1
     assert ret.find('440720 3750120') != -1
 
-    return 'success'
-
 ###############################################################################
 # Test -gcp -tps
 
@@ -85,8 +81,6 @@ def test_gdaltransform_3():
     assert ret.find('441920 3750120') != -1
     assert ret.find('440720 3750120') != -1
 
-    return 'success'
-
 ###############################################################################
 # Test -gcp -order 1
 
@@ -103,8 +97,6 @@ def test_gdaltransform_4():
     assert ret.find('441920 3750120') != -1
     assert ret.find('440720 3750120') != -1
 
-    return 'success'
-
 ###############################################################################
 # Test with input file and -t_srs
 
@@ -122,8 +114,6 @@ def test_gdaltransform_5():
 
     assert abs(x - 440720) <= 1e-4 and abs(y - 3751320) <= 1e-4, ret
 
-    return 'success'
-
 ###############################################################################
 # Test with input file and output file
 
@@ -141,8 +131,6 @@ def test_gdaltransform_6():
 
     assert abs(x - 440720) <= 1e-4 and abs(y - 3751320) <= 1e-4, ret
 
-    return 'success'
-
 
 ###############################################################################
 # Test with input file and -t_srs and -i
@@ -160,8 +148,6 @@ def test_gdaltransform_7():
 
     assert abs(x - 0) <= 1e-4 and abs(y - 0) <= 1e-4, ret
 
-    return 'success'
-
 ###############################################################################
 # Test -to
 
@@ -175,8 +161,6 @@ def test_gdaltransform_8():
 
     assert ret.find('2 49 1') != -1
 
-    return 'success'
-
 ###############################################################################
 # Test -output_xy
 
@@ -191,8 +175,6 @@ def test_gdaltransform_9():
     text_split = ret.split(' ')
     assert len(text_split) == 2, ret
 
-    return 'success'
-
 
 gdaltest_list = [
     test_gdaltransform_1,
diff --git a/autotest/utilities/test_gdalwarp.py b/autotest/utilities/test_gdalwarp.py
index 7c20be88e861..f25297c2e6eb 100755
--- a/autotest/utilities/test_gdalwarp.py
+++ b/autotest/utilities/test_gdalwarp.py
@@ -57,8 +57,6 @@ def test_gdalwarp_1():
 
     ds = None
 
-    return 'success'
-
 
 ###############################################################################
 # Test -of option
@@ -76,8 +74,6 @@ def test_gdalwarp_2():
 
     ds = None
 
-    return 'success'
-
 
 ###############################################################################
 # Test -ot option
@@ -97,8 +93,6 @@ def test_gdalwarp_3():
 
     ds = None
 
-    return 'success'
-
 ###############################################################################
 # Test -t_srs option
 
@@ -116,8 +110,6 @@ def test_gdalwarp_4():
 
     ds = None
 
-    return 'success'
-
 ###############################################################################
 # Test warping from GCPs without any explicit option
 
@@ -143,8 +135,6 @@ def test_gdalwarp_5():
 
     ds = None
 
-    return 'success'
-
 
 ###############################################################################
 # Test warping from GCPs with -tps
@@ -165,8 +155,6 @@ def test_gdalwarp_6():
 
     ds = None
 
-    return 'success'
-
 
 ###############################################################################
 # Test -tr
@@ -186,8 +174,6 @@ def test_gdalwarp_7():
 
     ds = None
 
-    return 'success'
-
 ###############################################################################
 # Test -ts
 
@@ -207,8 +193,6 @@ def test_gdalwarp_8():
 
     ds = None
 
-    return 'success'
-
 ###############################################################################
 # Test -te
 
@@ -227,8 +211,6 @@ def test_gdalwarp_9():
 
     ds = None
 
-    return 'success'
-
 ###############################################################################
 # Test -rn
 
@@ -246,8 +228,6 @@ def test_gdalwarp_10():
 
     ds = None
 
-    return 'success'
-
 ###############################################################################
 # Test -rb
 
@@ -271,8 +251,6 @@ def test_gdalwarp_11():
 
     ds = None
 
-    return 'success'
-
 
 ###############################################################################
 # Test -rc
@@ -297,8 +275,6 @@ def test_gdalwarp_12():
     ds = None
     ref_ds = None
 
-    return 'success'
-
 
 ###############################################################################
 # Test -rcs
@@ -320,8 +296,6 @@ def test_gdalwarp_13():
 
     ds = None
 
-    return 'success'
-
 
 ###############################################################################
 # Test -r lanczos
@@ -343,8 +317,6 @@ def test_gdalwarp_14():
 
     ds = None
 
-    return 'success'
-
 ###############################################################################
 # Test -dstnodata
 
@@ -364,8 +336,6 @@ def test_gdalwarp_15():
 
     ds = None
 
-    return 'success'
-
 ###############################################################################
 # Test -of VRT which is a special case
 
@@ -383,8 +353,6 @@ def test_gdalwarp_16():
 
     ds = None
 
-    return 'success'
-
 ###############################################################################
 # Test -dstalpha
 
@@ -402,8 +370,6 @@ def test_gdalwarp_17():
 
     ds = None
 
-    return 'success'
-
 ###############################################################################
 # Test -wm -multi
 
@@ -425,8 +391,6 @@ def test_gdalwarp_18():
 
     ds = None
 
-    return 'success'
-
 ###############################################################################
 # Test -et 0 which is a special case
 
@@ -444,8 +408,6 @@ def test_gdalwarp_19():
 
     ds = None
 
-    return 'success'
-
 ###############################################################################
 # Test -of VRT -et 0 which is a special case
 
@@ -463,8 +425,6 @@ def test_gdalwarp_20():
 
     ds = None
 
-    return 'success'
-
 
 ###############################################################################
 # Test cutline from OGR datasource.
@@ -482,8 +442,6 @@ def test_gdalwarp_21():
 
     ds = None
 
-    return 'success'
-
 
 ###############################################################################
 # Test with a cutline and an output at a different resolution.
@@ -501,8 +459,6 @@ def test_gdalwarp_22():
 
     ds = None
 
-    return 'success'
-
 
 ###############################################################################
 # Test cutline with ALL_TOUCHED enabled.
@@ -520,8 +476,6 @@ def test_gdalwarp_23():
 
     ds = None
 
-    return 'success'
-
 ###############################################################################
 # Test warping an image crossing the 180E/180W longitude (#3206)
 
@@ -545,8 +499,6 @@ def test_gdalwarp_24():
 
     ds = None
 
-    return 'success'
-
 ###############################################################################
 # Test warping a full EPSG:4326 extent to +proj=sinu (#2305)
 
@@ -570,8 +522,6 @@ def test_gdalwarp_25():
 
     ds = None
 
-    return 'success'
-
 ###############################################################################
 # Test warping a full EPSG:4326 extent to +proj=eck4 (#2305)
 
@@ -595,8 +545,6 @@ def test_gdalwarp_26():
 
     ds = None
 
-    return 'success'
-
 ###############################################################################
 # Test warping a full EPSG:4326 extent to +proj=vandg (#2305)
 
@@ -620,8 +568,6 @@ def test_gdalwarp_27():
 
     ds = None
 
-    return 'success'
-
 ###############################################################################
 # Test warping a full EPSG:4326 extent to +proj=aeqd +lat_0=45 +lon_0=90 (#2305)
 
@@ -655,8 +601,6 @@ def test_gdalwarp_28():
 
     ds = None
 
-    return 'success'
-
 ###############################################################################
 # Test warping a full EPSG:4326 extent to EPSG:3785 (#2305)
 
@@ -680,8 +624,6 @@ def test_gdalwarp_29():
 
     ds = None
 
-    return 'success'
-
 ###############################################################################
 # Test the effect of the -wo OPTIMIZE_SIZE=TRUE and -wo STREAMABLE_OUTPUT=TRUE options (#3459, #1866)
 
@@ -733,8 +675,6 @@ def test_gdalwarp_30():
     assert file_size1 > file_size3, \
         'Size with -wo STREAMABLE_OUTPUT=TRUE larger than without !'
 
-    return 'success'
-
 ###############################################################################
 # Test -overwrite (#3759)
 
@@ -763,8 +703,6 @@ def test_gdalwarp_31():
 
     assert cs1 == 4672 and cs2 == 4672 and cs3 == 4727 and err != '' and err2 == ''
 
-    return 'success'
-
 ###############################################################################
 # Test -tap
 
@@ -792,8 +730,6 @@ def test_gdalwarp_32():
 
     ds = None
 
-    return 'success'
-
 ###############################################################################
 # Test warping a JPEG compressed image with a mask into a RGBA image
 
@@ -829,8 +765,6 @@ def test_gdalwarp_33():
 
     assert cs == expected_cs, 'did not get expected checksum on alpha band'
 
-    return 'success'
-
 ###############################################################################
 # Test warping multiple sources
 
@@ -869,8 +803,7 @@ def test_gdalwarp_34():
     for i in range(6):
         assert abs(gt[i] - expected_gt[i]) <= 1e-5, 'bad gt'
 
-    return 'success'
-
+    
 ###############################################################################
 # Test -ts and -te optimization (doesn't need calling GDALSuggestedWarpOutput2, #4804)
 
@@ -889,8 +822,6 @@ def test_gdalwarp_35():
 
     ds = None
 
-    return 'success'
-
 ###############################################################################
 # Test -tr and -te optimization (doesn't need calling GDALSuggestedWarpOutput2, #4804)
 
@@ -909,8 +840,6 @@ def test_gdalwarp_36():
 
     ds = None
 
-    return 'success'
-
 ###############################################################################
 # Test metadata copying - stats should not be copied (#5319)
 
@@ -937,8 +866,6 @@ def test_gdalwarp_37():
 
     ds = None
 
-    return 'success'
-
 ###############################################################################
 # Test implicit nodata setting (#5675)
 
@@ -954,8 +881,6 @@ def test_gdalwarp_38():
     assert ds.GetRasterBand(1).GetNoDataValue() == -999
     ds = None
 
-    return 'success'
-
 ###############################################################################
 # Test -oo
 
@@ -970,8 +895,6 @@ def test_gdalwarp_39():
     assert ds.GetRasterBand(1).DataType == gdal.GDT_Float64
     ds = None
 
-    return 'success'
-
 ###############################################################################
 # Test -ovr
 
@@ -1097,8 +1020,6 @@ def test_gdalwarp_40():
     assert ds.GetRasterBand(1).Checksum() == expected_cs
     ds = None
 
-    return 'success'
-
 ###############################################################################
 # Test source fill ratio heuristics (#3120)
 
@@ -1143,8 +1064,6 @@ def test_gdalwarp_41():
     assert ds.GetRasterBand(1).Checksum() == 65068
     ds = None
 
-    return 'success'
-
 ###############################################################################
 # Test warping multiple source images, in one step or several, with INIT_DEST/nodata (#5909, #5387)
 
@@ -1195,8 +1114,6 @@ def test_gdalwarp_42():
     assert got_cs == expected_cs
     ds = None
 
-    return 'success'
-
 ###############################################################################
 # Test that NODATA_VALUES is honoured, but not transferred when adding an alpha channel.
 
@@ -1218,8 +1135,6 @@ def test_gdalwarp_43():
     expected_cs = [30106, 32285, 40022, 64261]
     assert got_cs == expected_cs
 
-    return 'success'
-
 ###############################################################################
 # Test effect of -wo SRC_COORD_PRECISION
 
@@ -1255,8 +1170,6 @@ def test_gdalwarp_44():
 
     assert cs3 == cs4
 
-    return 'success'
-
 ###############################################################################
 # Test -te_srs
 
@@ -1279,8 +1192,6 @@ def test_gdalwarp_45():
 
     ds = None
 
-    return 'success'
-
 
 ###############################################################################
 # Test -crop_to_cutline
@@ -1321,8 +1232,6 @@ def test_gdalwarp_46():
 
     ds = None
 
-    return 'success'
-
 
 ###############################################################################
 # Cleanup
@@ -1331,7 +1240,7 @@ def test_gdalwarp_cleanup():
 
     # We don't clean up when run in debug mode.
     if gdal.GetConfigOption('CPL_DEBUG', 'OFF') == 'ON':
-        return 'success'
+        return
 
     for i in range(37):
         try:
@@ -1428,8 +1337,7 @@ def test_gdalwarp_cleanup():
     except OSError:
         pass
 
-    return 'success'
-
+    
 
 gdaltest_list = [
     test_gdalwarp_cleanup,
diff --git a/autotest/utilities/test_gdalwarp_lib.py b/autotest/utilities/test_gdalwarp_lib.py
index e6c2e344a39f..fce359a83b3d 100755
--- a/autotest/utilities/test_gdalwarp_lib.py
+++ b/autotest/utilities/test_gdalwarp_lib.py
@@ -53,8 +53,6 @@ def test_gdalwarp_lib_1():
 
     dstDS = None
 
-    return 'success'
-
 
 ###############################################################################
 # Test -of option
@@ -68,8 +66,6 @@ def test_gdalwarp_lib_2():
 
     dstDS = None
 
-    return 'success'
-
 
 ###############################################################################
 # Test -ot option
@@ -85,8 +81,6 @@ def test_gdalwarp_lib_3():
 
     dstDS = None
 
-    return 'success'
-
 ###############################################################################
 # Test -t_srs option
 
@@ -100,8 +94,6 @@ def test_gdalwarp_lib_4():
 
     dstDS = None
 
-    return 'success'
-
 ###############################################################################
 # Test warping from GCPs without any explicit option
 
@@ -120,8 +112,6 @@ def test_gdalwarp_lib_5():
 
     dstDS = None
 
-    return 'success'
-
 
 ###############################################################################
 # Test warping from GCPs with -tps
@@ -138,8 +128,6 @@ def test_gdalwarp_lib_6():
 
     dstDS = None
 
-    return 'success'
-
 
 ###############################################################################
 # Test -tr
@@ -156,8 +144,6 @@ def test_gdalwarp_lib_7():
 
     dstDS = None
 
-    return 'success'
-
 ###############################################################################
 # Test -ts
 
@@ -174,8 +160,6 @@ def test_gdalwarp_lib_8():
 
     dstDS = None
 
-    return 'success'
-
 ###############################################################################
 # Test -te
 
@@ -189,8 +173,6 @@ def test_gdalwarp_lib_9():
 
     ds = None
 
-    return 'success'
-
 ###############################################################################
 # Test -rn
 
@@ -203,8 +185,6 @@ def test_gdalwarp_lib_10():
 
     ds = None
 
-    return 'success'
-
 ###############################################################################
 # Test -rb
 
@@ -223,8 +203,6 @@ def test_gdalwarp_lib_11():
 
     ds = None
 
-    return 'success'
-
 ###############################################################################
 # Test -rc
 
@@ -243,8 +221,6 @@ def test_gdalwarp_lib_12():
 
     ds = None
 
-    return 'success'
-
 ###############################################################################
 # Test -rcs
 
@@ -263,8 +239,6 @@ def test_gdalwarp_lib_13():
 
     ds = None
 
-    return 'success'
-
 ###############################################################################
 # Test -r lanczos
 
@@ -283,8 +257,6 @@ def test_gdalwarp_lib_14():
 
     ds = None
 
-    return 'success'
-
 ###############################################################################
 # Test -dstnodata
 
@@ -299,8 +271,6 @@ def test_gdalwarp_lib_15():
 
     ds = None
 
-    return 'success'
-
 ###############################################################################
 # Test -of VRT which is a special case
 
@@ -321,8 +291,6 @@ def test_gdalwarp_lib_16():
         ds = gdal.Warp('/i_dont/exist/test_gdalwarp_lib_16.vrt', 'tmp/testgdalwarp_gcp.tif', format='VRT')
     assert ds is None
 
-    return 'success'
-
 ###############################################################################
 # Test -dstalpha
 
@@ -336,8 +304,6 @@ def test_gdalwarp_lib_17():
 
     ds = None
 
-    return 'success'
-
 ###############################################################################
 # Test -et 0 which is a special case
 
@@ -351,8 +317,6 @@ def test_gdalwarp_lib_19():
 
     ds = None
 
-    return 'success'
-
 ###############################################################################
 # Test cutline from OGR datasource.
 
@@ -366,8 +330,6 @@ def test_gdalwarp_lib_21():
 
     ds = None
 
-    return 'success'
-
 ###############################################################################
 # Test cutline with ALL_TOUCHED enabled.
 
@@ -381,8 +343,6 @@ def test_gdalwarp_lib_23():
 
     ds = None
 
-    return 'success'
-
 ###############################################################################
 # Test -tap
 
@@ -401,8 +361,6 @@ def test_gdalwarp_lib_32():
 
     ds = None
 
-    return 'success'
-
 ###############################################################################
 # Test warping multiple sources
 
@@ -427,8 +385,7 @@ def test_gdalwarp_lib_34():
     for i in range(6):
         assert abs(gt[i] - expected_gt[i]) <= 1e-5, 'bad gt'
 
-    return 'success'
-
+    
 ###############################################################################
 # Test -te_srs
 
@@ -440,8 +397,6 @@ def test_gdalwarp_lib_45():
 
     ds = None
 
-    return 'success'
-
 ###############################################################################
 # Test -crop_to_cutline
 
@@ -506,8 +461,6 @@ def test_gdalwarp_lib_46():
 
     gdal.Unlink(cutlineDSName)
 
-    return 'success'
-
 ###############################################################################
 # Test callback
 
@@ -530,8 +483,6 @@ def test_gdalwarp_lib_100():
 
     ds = None
 
-    return 'success'
-
 ###############################################################################
 # Test with color table
 
@@ -541,8 +492,6 @@ def test_gdalwarp_lib_101():
     ds = gdal.Warp('', '../gdrivers/data/small_world_pct.tif', format='MEM')
     assert ds.GetRasterBand(1).GetColorTable() is not None, 'Did not get color table'
 
-    return 'success'
-
 ###############################################################################
 # Test with a dataset with no bands
 
@@ -553,7 +502,6 @@ def test_gdalwarp_lib_102():
     with gdaltest.error_handler():
         ds = gdal.Warp('', ['../gdrivers/data/small_world_pct.tif', no_band_ds], format='MEM')
     assert ds is None, 'Did not expected dataset'
-    return 'success'
 
 ###############################################################################
 # Test failed transformer
@@ -564,7 +512,6 @@ def test_gdalwarp_lib_103():
     with gdaltest.error_handler():
         ds = gdal.Warp('', ['../gdrivers/data/small_world_pct.tif', '../gcore/data/stefan_full_rgba.tif'], format='MEM')
     assert ds is None, 'Did not expected dataset'
-    return 'success'
 
 ###############################################################################
 # Test no usable source image
@@ -575,7 +522,6 @@ def test_gdalwarp_lib_104():
     with gdaltest.error_handler():
         ds = gdal.Warp('', [], format='MEM')
     assert ds is None, 'Did not expected dataset'
-    return 'success'
 
 ###############################################################################
 # Test failure in GDALSuggestedWarpOutput2
@@ -589,8 +535,7 @@ def test_gdalwarp_lib_105():
     with gdaltest.error_handler():
         gdal.Warp('', ['../gdrivers/data/small_world_pct.tif', '../gcore/data/byte.tif'], format='MEM', dstSRS='EPSG:32645', width=100, height=100)
 
-    return 'success'
-
+    
 ###############################################################################
 # Test failure in creation
 
@@ -600,7 +545,6 @@ def test_gdalwarp_lib_106():
     with gdaltest.error_handler():
         ds = gdal.Warp('/not_existing_dir/not_existing_file', ['../gdrivers/data/small_world_pct.tif', '../gcore/data/byte.tif'])
     assert ds is None, 'Did not expected dataset'
-    return 'success'
 
 ###############################################################################
 # Test forced width only
@@ -611,8 +555,6 @@ def test_gdalwarp_lib_107():
     ds = gdal.Warp('', '../gcore/data/byte.tif', format='MEM', width=20)
     assert ds.GetRasterBand(1).Checksum() == 4672, 'Bad checksum'
 
-    return 'success'
-
 ###############################################################################
 # Test forced height only
 
@@ -622,8 +564,6 @@ def test_gdalwarp_lib_108():
     ds = gdal.Warp('', '../gcore/data/byte.tif', format='MEM', height=20)
     assert ds.GetRasterBand(1).Checksum() == 4672, 'Bad checksum'
 
-    return 'success'
-
 ###############################################################################
 # Test wrong cutline name
 
@@ -633,7 +573,6 @@ def test_gdalwarp_lib_109():
     with gdaltest.error_handler():
         ds = gdal.Warp('', '../gcore/data/byte.tif', format='MEM', cutlineDSName='/does/not/exist')
     assert ds is None, 'Did not expected dataset'
-    return 'success'
 
 ###############################################################################
 # Test wrong cutline layer name
@@ -644,7 +583,6 @@ def test_gdalwarp_lib_110():
     with gdaltest.error_handler():
         ds = gdal.Warp('', '../gcore/data/byte.tif', format='MEM', cutlineDSName='data/cutline.vrt', cutlineLayer='wrong_name')
     assert ds is None, 'Did not expected dataset'
-    return 'success'
 
 ###############################################################################
 # Test cutline SQL
@@ -659,8 +597,6 @@ def test_gdalwarp_lib_111():
 
     ds = None
 
-    return 'success'
-
 ###############################################################################
 # Test cutline without geometry
 
@@ -678,8 +614,6 @@ def test_gdalwarp_lib_112():
     assert ds is None, 'Did not expected dataset'
     ogr.GetDriverByName('ESRI Shapefile').DeleteDataSource('/vsimem/cutline.shp')
 
-    return 'success'
-
 ###############################################################################
 # Test cutline with non polygon geometry
 
@@ -698,8 +632,6 @@ def test_gdalwarp_lib_113():
     assert ds is None, 'Did not expected dataset'
     ogr.GetDriverByName('ESRI Shapefile').DeleteDataSource('/vsimem/cutline.shp')
 
-    return 'success'
-
 ###############################################################################
 # Test cutline without feature
 
@@ -714,8 +646,6 @@ def test_gdalwarp_lib_114():
     assert ds is None, 'Did not expected dataset'
     ogr.GetDriverByName('ESRI Shapefile').DeleteDataSource('/vsimem/cutline.shp')
 
-    return 'success'
-
 ###############################################################################
 # Test source dataset without band
 
@@ -729,8 +659,6 @@ def test_gdalwarp_lib_115():
         ret = gdal.Warp(out_ds, no_band_ds, cutlineDSName='data/cutline.vrt', cutlineLayer='cutline')
     assert ret == 0, 'Expected failure'
 
-    return 'success'
-
 ###############################################################################
 # Test failed cropToCutline due to invalid SRC_SRS
 
@@ -741,8 +669,6 @@ def test_gdalwarp_lib_116():
         ds = gdal.Warp('', '../gcore/data/utmsmall.tif', format='MEM', cutlineDSName='data/cutline.vrt', cutlineLayer='cutline', cropToCutline=True, transformerOptions=['SRC_SRS=invalid'])
     assert ds is None, 'Did not expected dataset'
 
-    return 'success'
-
 ###############################################################################
 # Test failed cropToCutline due to invalid DST_SRS
 
@@ -753,8 +679,6 @@ def test_gdalwarp_lib_117():
         ds = gdal.Warp('', '../gcore/data/utmsmall.tif', format='MEM', cutlineDSName='data/cutline.vrt', cutlineLayer='cutline', cropToCutline=True, transformerOptions=['DST_SRS=invalid'])
     assert ds is None, 'Did not expected dataset'
 
-    return 'success'
-
 ###############################################################################
 # Test failed cropToCutline due to no source raster
 
@@ -765,8 +689,6 @@ def test_gdalwarp_lib_118():
         ds = gdal.Warp('', [], format='MEM', cutlineDSName='data/cutline.vrt', cutlineLayer='cutline', cropToCutline=True)
     assert ds is None, 'Did not expected dataset'
 
-    return 'success'
-
 ###############################################################################
 # Test failed cropToCutline due to source raster without projection
 
@@ -778,8 +700,6 @@ def test_gdalwarp_lib_119():
         ds = gdal.Warp('', no_proj_ds, format='MEM', cutlineDSName='data/cutline.vrt', cutlineLayer='cutline', cropToCutline=True)
     assert ds is None, 'Did not expected dataset'
 
-    return 'success'
-
 ###############################################################################
 # Test failed cropToCutline due to source raster with dummy projection
 
@@ -792,8 +712,6 @@ def test_gdalwarp_lib_120():
         ds = gdal.Warp('', dummy_proj_ds, format='MEM', cutlineDSName='data/cutline.vrt', cutlineLayer='cutline', cropToCutline=True)
     assert ds is None, 'Did not expected dataset'
 
-    return 'success'
-
 ###############################################################################
 # Test internal wrappers
 
@@ -822,8 +740,7 @@ def test_gdalwarp_lib_121():
     with gdaltest.error_handler():
         gdal.wrapper_GDALWarpDestDS(gdal.GetDriverByName('MEM').Create('', 1, 1), [], None, gdal.TermProgress)
 
-    return 'success'
-
+    
 ###############################################################################
 # Test unnamed output VRT
 
@@ -832,7 +749,6 @@ def test_gdalwarp_lib_122():
 
     ds = gdal.Warp('', '../gcore/data/byte.tif', format='VRT')
     assert ds.GetRasterBand(1).Checksum() == 4672, 'Bad checksum'
-    return 'success'
 
 ###############################################################################
 # Test failure during warping
@@ -844,8 +760,6 @@ def test_gdalwarp_lib_123():
         ds = gdal.Warp('', '../gcore/data/byte_truncated.tif', format='MEM')
     assert ds is None
 
-    return 'success'
-
 ###############################################################################
 # Test warping to dataset with existing nodata
 
@@ -868,8 +782,6 @@ def test_gdalwarp_lib_124():
     cs = out_ds.GetRasterBand(1).Checksum()
     assert cs == expected_cs, 'Bad checksum'
 
-    return 'success'
-
 ###############################################################################
 # Test that statistics are not propagated
 
@@ -892,8 +804,7 @@ def test_gdalwarp_lib_125():
 
         assert out_ds.GetRasterBand(1).GetMetadataItem('STATISTICS_MINIUM') is None, i
 
-    return 'success'
-
+    
 ###############################################################################
 # Test cutline with invalid geometry
 
@@ -915,8 +826,6 @@ def test_gdalwarp_lib_126():
     assert ds is None, 'Did not expected dataset'
     ogr.GetDriverByName('ESRI Shapefile').DeleteDataSource('/vsimem/cutline.shp')
 
-    return 'success'
-
 ###############################################################################
 # Test -srcnodata (#6315)
 
@@ -927,8 +836,6 @@ def test_gdalwarp_lib_127():
     assert ds.GetRasterBand(1).GetNoDataValue() == 1, 'bad nodata value'
     assert ds.GetRasterBand(1).Checksum() == 4672, 'bad checksum'
 
-    return 'success'
-
 ###############################################################################
 # Test automatic densification of cutline (#6375)
 
@@ -976,7 +883,7 @@ def test_gdalwarp_lib_128():
     # Below steps depend on GEOS
     if not ogrtest.have_geos():
         gdal.Unlink(cutlineDSName)
-        return 'success'
+        return
 
     gdal.SetConfigOption('GDALWARP_DENSIFY_CUTLINE', 'ONLY_IF_INVALID')
     ds = gdal.Warp('', mem_ds, format='MEM', cutlineDSName=cutlineDSName,
@@ -1001,8 +908,6 @@ def test_gdalwarp_lib_128():
 
     gdal.Unlink(cutlineDSName)
 
-    return 'success'
-
 ###############################################################################
 # Test automatic densification of cutline, but with initial guess leading
 # to an invalid geometry (#6375)
@@ -1052,8 +957,6 @@ def test_gdalwarp_lib_129():
 
     gdal.Unlink(cutlineDSName)
 
-    return 'success'
-
 ###############################################################################
 # Test automatic detection and setting of alpha channel, and setting RGB on
 # GTiff output
@@ -1098,8 +1001,6 @@ def test_gdalwarp_lib_130():
     gdal.Unlink('/vsimem/test_gdalwarp_lib_130.tif')
     gdal.Unlink('/vsimem/test_gdalwarp_lib_130_dst.tif')
 
-    return 'success'
-
 ###############################################################################
 # Test -nosrcalpha
 
@@ -1124,8 +1025,6 @@ def test_gdalwarp_lib_131():
     gdal.Unlink('/vsimem/test_gdalwarp_lib_131_dst.tif')
     gdal.Unlink('/vsimem/test_gdalwarp_lib_131_dst.tif.aux.xml')
 
-    return 'success'
-
 ###############################################################################
 # Test that alpha blending works by warping onto an existing dataset
 # with alpha > 0 and < 255
@@ -1168,8 +1067,7 @@ def test_gdalwarp_lib_132():
         gdal.Unlink('/vsimem/test_gdalwarp_lib_132_dst.tif')
         gdal.Unlink('/vsimem/test_gdalwarp_lib_132_dst.tif.aux.xml')
 
-    return 'success'
-
+    
 ###############################################################################
 # Test cutline with multiple touching polygons
 
@@ -1199,8 +1097,6 @@ def test_gdalwarp_lib_133():
 
     ogr.GetDriverByName('ESRI Shapefile').DeleteDataSource('/vsimem/test_gdalwarp_lib_133.shp')
 
-    return 'success'
-
 ###############################################################################
 # Test SRC_METHOD=NO_GEOTRANSFORM and DST_METHOD=NO_GEOTRANSFORM (#6721)
 
@@ -1236,8 +1132,6 @@ def test_gdalwarp_lib_134():
 
     ogr.GetDriverByName('ESRI Shapefile').DeleteDataSource('/vsimem/test_gdalwarp_lib_134.shp')
 
-    return 'success'
-
 ###############################################################################
 # Test vertical datum shift
 
@@ -1509,8 +1403,6 @@ def test_gdalwarp_lib_135():
     gdal.GetDriverByName('GTiff').Delete('/vsimem/ungeoref_grid.tif')
     gdal.GetDriverByName('GTiff').Delete('/vsimem/empty_grid.tif')
 
-    return 'success'
-
 ###############################################################################
 # Test error code path linked with failed warper initialization
 
@@ -1525,8 +1417,6 @@ def test_gdalwarp_lib_136():
         ds = gdal.Warp('', '../gcore/data/utmsmall.tif', format='VRT', warpOptions=['CUTLINE=invalid'])
     assert ds is None
 
-    return 'success'
-
 ###############################################################################
 # Test warping two input datasets with different SRS, with no explicit target SRS
 
@@ -1547,8 +1437,6 @@ def test_gdalwarp_lib_several_sources_with_different_srs_no_explicit_target_srs(
     cs = out_ds.GetRasterBand(1).Checksum()
     assert cs == 5048
 
-    return 'success'
-
 ###############################################################################
 # Test fix for https://trac.osgeo.org/gdal/ticket/7243
 
@@ -1563,8 +1451,6 @@ def test_gdalwarp_lib_touching_dateline():
     out_ds = gdal.Warp('', src_ds, dstSRS='EPSG:4326', format='MEM')
     assert out_ds.RasterXSize == 319
 
-    return 'success'
-
 ###############################################################################
 # Test fix for https://trac.osgeo.org/gdal/ticket/7245
 
@@ -1591,8 +1477,7 @@ def test_gdalwarp_lib_override_default_output_nodata():
         ds = None
         os.unlink('tmp/out.nc')
 
-    return 'success'
-
+    
 ###############################################################################
 # Test automatting setting (or not) of SKIP_NOSOURCE=YES
 
@@ -1687,8 +1572,6 @@ def test_gdalwarp_lib_auto_skip_nosource():
 
     gdal.Unlink(tmpfilename)
 
-    return 'success'
-
 ###############################################################################
 # Test warping a full EPSG:4326 extent to +proj=ortho
 # (https://github.com/OSGeo/gdal/issues/862)
@@ -1710,8 +1593,6 @@ def test_gdalwarp_lib_to_ortho():
     # Fail if the last line is completely black
     assert line.count(0) != out_ds.RasterXSize, 'last line is completely black'
 
-    return 'success'
-
 
 ###############################################################################
 def test_gdalwarp_lib_insufficient_dst_band_count():
@@ -1721,8 +1602,7 @@ def test_gdalwarp_lib_insufficient_dst_band_count():
     with gdaltest.error_handler():
         assert gdal.Warp(dst_ds, src_ds) == 0
 
-    return 'success'
-
+    
 ###############################################################################
 # Cleanup
 
@@ -1731,7 +1611,7 @@ def test_gdalwarp_lib_cleanup():
 
     # We don't clean up when run in debug mode.
     if gdal.GetConfigOption('CPL_DEBUG', 'OFF') == 'ON':
-        return 'success'
+        return
 
     for i in range(2):
         try:
@@ -1743,8 +1623,7 @@ def test_gdalwarp_lib_cleanup():
     except OSError:
         pass
 
-    return 'success'
-
+    
 
 gdaltest_list = [
     test_gdalwarp_lib_cleanup,
diff --git a/autotest/utilities/test_gnmutils.py b/autotest/utilities/test_gnmutils.py
index 67927b4a6478..5ab1e30f53a9 100755
--- a/autotest/utilities/test_gnmutils.py
+++ b/autotest/utilities/test_gnmutils.py
@@ -56,8 +56,7 @@ def test_gnmmanage_1():
     except OSError:
         pytest.fail('Expected create tmp/test_gnm')
 
-    return 'success'
-
+    
 ###############################################################################
 # Test import
 # gnmmanage import /home/bishop/tmp/data/pipes.shp /home/bishop/tmp/test_gnm --config CPL_DEBUG ON
@@ -74,8 +73,6 @@ def test_gnmmanage_2():
     (_, err) = gdaltest.runexternal_out_and_err(test_cli_utilities.get_gnmmanage_path() + ' import ../gnm/data/wells.shp tmp/test_gnm')
     assert (err is None or err == ''), 'got error/warning'
 
-    return 'success'
-
 ###############################################################################
 # Test info
 # gnmmanage info /home/bishop/tmp/test_gnm
@@ -91,8 +88,6 @@ def test_gnmmanage_3():
     assert ret.find('Network name: test_gnm.') != -1
     assert ret.find('Network description') != -1
 
-    return 'success'
-
 ###############################################################################
 # Test autoconect
 # gnmmanage autoconnect 0.000001 /home/bishop/tmp/test_gnm --config CPL_DEBUG ON
@@ -105,8 +100,6 @@ def test_gnmmanage_4():
     ret = gdaltest.runexternal(test_cli_utilities.get_gnmmanage_path() + ' autoconnect 0.000001 tmp/test_gnm')
     assert ret.find('success') != -1
 
-    return 'success'
-
 ###############################################################################
 # Test dijkstra
 # gnmanalyse dijkstra 61 50 -alo "fetch_vertex=OFF" -ds /home/bishop/tmp/di.shp -lco "SHPT=ARC" /home/bishop/tmp/test_gnm --config CPL_DEBUG ON
@@ -121,8 +114,6 @@ def test_gnmanalyse_1():
     ret = gdaltest.runexternal(test_cli_utilities.get_gnmanalyse_path() + ' dijkstra 61 50 tmp/test_gnm')
     assert ret.find('Feature Count: 19') != -1
 
-    return 'success'
-
 ###############################################################################
 # Test kpaths
 # gnmanalyse kpaths 61 50 3 -alo "fetch_vertex=OFF" -ds /home/bishop/tmp/kp.shp -lco "SHPT=ARC" /home/bishop/tmp/test_gnm --config CPL_DEBUG ON
@@ -137,8 +128,6 @@ def test_gnmanalyse_2():
     ret = gdaltest.runexternal(test_cli_utilities.get_gnmanalyse_path() + ' kpaths 61 50 3 tmp/test_gnm')
     assert ret.find('Feature Count: 61') != -1
 
-    return 'success'
-
 ###############################################################################
 # Test cleanup
 
@@ -156,8 +145,7 @@ def test_gnm_cleanup():
     except OSError:
         pass
 
-    return 'success'
-
+    
 
 gdaltest_list = [
     test_gnmmanage_1,
diff --git a/autotest/utilities/test_nearblack.py b/autotest/utilities/test_nearblack.py
index 98021ddd90a5..ab737ab0c1cc 100755
--- a/autotest/utilities/test_nearblack.py
+++ b/autotest/utilities/test_nearblack.py
@@ -71,8 +71,6 @@ def test_nearblack_1():
     src_ds = None
     ds = None
 
-    return 'success'
-
 ###############################################################################
 # Add alpha band
 
@@ -90,8 +88,6 @@ def test_nearblack_2():
 
     ds = None
 
-    return 'success'
-
 ###############################################################################
 # Set existing alpha band
 
@@ -110,8 +106,6 @@ def test_nearblack_3():
 
     ds = None
 
-    return 'success'
-
 ###############################################################################
 # Test -white
 
@@ -132,8 +126,6 @@ def test_nearblack_4():
 
     ds = None
 
-    return 'success'
-
 ###############################################################################
 # Add mask band
 
@@ -152,8 +144,6 @@ def test_nearblack_5():
 
     ds = None
 
-    return 'success'
-
 ###############################################################################
 # Set existing mask band
 
@@ -175,8 +165,6 @@ def test_nearblack_6():
 
     ds = None
 
-    return 'success'
-
 ###############################################################################
 # Test -color
 
@@ -196,8 +184,6 @@ def test_nearblack_7():
 
     ds = None
 
-    return 'success'
-
 ###############################################################################
 # Test in-place update
 
@@ -222,8 +208,6 @@ def test_nearblack_8():
 
     assert ds.GetRasterBand(3).Checksum() == 21309, 'Bad checksum band 3'
 
-    return 'success'
-
 ###############################################################################
 # Cleanup
 
@@ -273,8 +257,7 @@ def test_nearblack_cleanup():
         os.remove('tmp/nearblack8.tif')
     except OSError:
         pass
-    return 'success'
-
+    
 
 gdaltest_list = [
     test_nearblack_1,
diff --git a/autotest/utilities/test_nearblack_lib.py b/autotest/utilities/test_nearblack_lib.py
index 3f860a04e60d..04670efd1dbb 100755
--- a/autotest/utilities/test_nearblack_lib.py
+++ b/autotest/utilities/test_nearblack_lib.py
@@ -62,8 +62,6 @@ def test_nearblack_lib_1():
     src_ds = None
     ds = None
 
-    return 'success'
-
 ###############################################################################
 # Add alpha band
 
@@ -77,8 +75,6 @@ def test_nearblack_lib_2():
 
     ds = None
 
-    return 'success'
-
 ###############################################################################
 # Set existing alpha band
 
@@ -93,8 +89,6 @@ def test_nearblack_lib_3():
 
     ds = None
 
-    return 'success'
-
 ###############################################################################
 # Test -white
 
@@ -109,8 +103,6 @@ def test_nearblack_lib_4():
 
     ds = None
 
-    return 'success'
-
 ###############################################################################
 # Add mask band
 
@@ -128,8 +120,6 @@ def test_nearblack_lib_5():
     gdal.Unlink('/vsimem/test_nearblack_lib_5.tif')
     gdal.Unlink('/vsimem/test_nearblack_lib_5.tif.msk')
 
-    return 'success'
-
 ###############################################################################
 # Test -color
 
@@ -145,8 +135,6 @@ def test_nearblack_lib_7():
 
     ds = None
 
-    return 'success'
-
 ###############################################################################
 # Test in-place update
 
@@ -164,8 +152,6 @@ def test_nearblack_lib_8():
 
     assert ds.GetRasterBand(3).Checksum() == 21309, 'Bad checksum band 3'
 
-    return 'success'
-
 
 gdaltest_list = [
     test_nearblack_lib_1,
diff --git a/autotest/utilities/test_ogr2ogr.py b/autotest/utilities/test_ogr2ogr.py
index 86d9917c84ed..54ce2b8a0b87 100755
--- a/autotest/utilities/test_ogr2ogr.py
+++ b/autotest/utilities/test_ogr2ogr.py
@@ -71,8 +71,6 @@ def test_ogr2ogr_1():
 
     ogr.GetDriverByName('ESRI Shapefile').DeleteDataSource('tmp/poly.shp')
 
-    return 'success'
-
 ###############################################################################
 # Test -sql
 
@@ -95,8 +93,6 @@ def test_ogr2ogr_2():
 
     ogr.GetDriverByName('ESRI Shapefile').DeleteDataSource('tmp/poly.shp')
 
-    return 'success'
-
 ###############################################################################
 # Test -spat
 
@@ -122,8 +118,6 @@ def test_ogr2ogr_3():
 
     ogr.GetDriverByName('ESRI Shapefile').DeleteDataSource('tmp/poly.shp')
 
-    return 'success'
-
 ###############################################################################
 # Test -where
 
@@ -146,8 +140,6 @@ def test_ogr2ogr_4():
 
     ogr.GetDriverByName('ESRI Shapefile').DeleteDataSource('tmp/poly.shp')
 
-    return 'success'
-
 ###############################################################################
 # Test -append
 
@@ -181,8 +173,6 @@ def test_ogr2ogr_5():
 
     ogr.GetDriverByName('ESRI Shapefile').DeleteDataSource('tmp/poly.shp')
 
-    return 'success'
-
 ###############################################################################
 # Test -overwrite
 
@@ -212,8 +202,6 @@ def test_ogr2ogr_6():
 
     gdaltest.runexternal(test_cli_utilities.get_ogrinfo_path() + ' PG:"' + gdaltest.pg_connection_string + '" -sql "DELLAYER:tpoly"')
 
-    return 'success'
-
 ###############################################################################
 # Test -gt
 
@@ -242,8 +230,6 @@ def test_ogr2ogr_7():
 
     gdaltest.runexternal(test_cli_utilities.get_ogrinfo_path() + ' PG:"' + gdaltest.pg_connection_string + '" -sql "DELLAYER:tpoly"')
 
-    return 'success'
-
 ###############################################################################
 # Test -t_srs
 
@@ -266,8 +252,6 @@ def test_ogr2ogr_8():
 
     ogr.GetDriverByName('ESRI Shapefile').DeleteDataSource('tmp/poly.shp')
 
-    return 'success'
-
 ###############################################################################
 # Test -a_srs
 
@@ -290,8 +274,6 @@ def test_ogr2ogr_9():
 
     ogr.GetDriverByName('ESRI Shapefile').DeleteDataSource('tmp/poly.shp')
 
-    return 'success'
-
 ###############################################################################
 # Test -select
 
@@ -351,8 +333,6 @@ def test_ogr2ogr_11():
 
     ogr.GetDriverByName('ESRI Shapefile').DeleteDataSource('tmp/poly.shp')
 
-    return 'success'
-
 ###############################################################################
 # Test -nlt
 
@@ -375,8 +355,6 @@ def test_ogr2ogr_12():
 
     ogr.GetDriverByName('ESRI Shapefile').DeleteDataSource('tmp/poly.shp')
 
-    return 'success'
-
 ###############################################################################
 # Add explicit source layer name
 
@@ -399,8 +377,6 @@ def test_ogr2ogr_13():
 
     ogr.GetDriverByName('ESRI Shapefile').DeleteDataSource('tmp/poly.shp')
 
-    return 'success'
-
 ###############################################################################
 # Test -segmentize
 
@@ -425,8 +401,6 @@ def test_ogr2ogr_14():
 
     ogr.GetDriverByName('ESRI Shapefile').DeleteDataSource('tmp/poly.shp')
 
-    return 'success'
-
 ###############################################################################
 # Test -overwrite with a shapefile
 
@@ -456,7 +430,6 @@ def test_ogr2ogr_15():
     ds.Destroy()
 
     ogr.GetDriverByName('ESRI Shapefile').DeleteDataSource('tmp/poly.shp')
-    return 'success'
 
 ###############################################################################
 # Test -fid
@@ -485,7 +458,6 @@ def test_ogr2ogr_16():
     src_ds.Destroy()
 
     ogr.GetDriverByName('ESRI Shapefile').DeleteDataSource('tmp/poly.shp')
-    return 'success'
 
 ###############################################################################
 # Test -progress
@@ -510,7 +482,6 @@ def test_ogr2ogr_17():
     ds.Destroy()
 
     ogr.GetDriverByName('ESRI Shapefile').DeleteDataSource('tmp/poly.shp')
-    return 'success'
 
 ###############################################################################
 # Test -wrapdateline
@@ -565,7 +536,7 @@ def test_ogr2ogr_18():
     ogr.GetDriverByName('ESRI Shapefile').DeleteDataSource('tmp/wrapdateline_dst.shp')
 
     if ret == 0:
-        return 'success'
+        return
     pytest.fail(got_wkt)
 
 ###############################################################################
@@ -597,8 +568,6 @@ def test_ogr2ogr_19():
 
     ogr.GetDriverByName('ESRI Shapefile').DeleteDataSource('tmp/poly.shp')
 
-    return 'success'
-
 ###############################################################################
 # Test correct remap of fields when laundering to Shapefile format
 # Test that the data is going into the right field
@@ -666,8 +635,6 @@ def test_ogr2ogr_20():
 
     assert not error_occurred
 
-    return 'success'
-
 ###############################################################################
 # Test ogr2ogr when the output driver has already created the fields
 # at dataset creation (#3247)
@@ -701,8 +668,6 @@ def test_ogr2ogr_21():
     ds.Destroy()
     os.remove('tmp/testogr2ogr21.gtm')
 
-    return 'success'
-
 
 ###############################################################################
 # Test ogr2ogr when the output driver delays the destination layer defn creation (#3384)
@@ -730,8 +695,6 @@ def test_ogr2ogr_22():
     ds.Destroy()
     ogr.GetDriverByName('MapInfo File').DeleteDataSource('tmp/testogr2ogr22.mif')
 
-    return 'success'
-
 ###############################################################################
 # Same as previous but with -select
 
@@ -759,8 +722,6 @@ def test_ogr2ogr_23():
     ds.Destroy()
     ogr.GetDriverByName('MapInfo File').DeleteDataSource('tmp/testogr2ogr23.mif')
 
-    return 'success'
-
 ###############################################################################
 # Test -clipsrc with WKT geometry (#3530)
 
@@ -790,8 +751,6 @@ def test_ogr2ogr_24():
 
     ogr.GetDriverByName('ESRI Shapefile').DeleteDataSource('tmp/poly.shp')
 
-    return 'success'
-
 ###############################################################################
 # Test -clipsrc with clip from external datasource
 
@@ -827,8 +786,6 @@ def test_ogr2ogr_25():
     ogr.GetDriverByName('ESRI Shapefile').DeleteDataSource('tmp/poly.shp')
     os.remove('tmp/clip.csv')
 
-    return 'success'
-
 ###############################################################################
 # Test -clipdst with WKT geometry (#3530)
 
@@ -858,8 +815,6 @@ def test_ogr2ogr_26():
 
     ogr.GetDriverByName('ESRI Shapefile').DeleteDataSource('tmp/poly.shp')
 
-    return 'success'
-
 ###############################################################################
 # Test -clipdst with clip from external datasource
 
@@ -895,8 +850,6 @@ def test_ogr2ogr_27():
     ogr.GetDriverByName('ESRI Shapefile').DeleteDataSource('tmp/poly.shp')
     os.remove('tmp/clip.csv')
 
-    return 'success'
-
 
 ###############################################################################
 # Test -wrapdateline on linestrings
@@ -944,7 +897,7 @@ def test_ogr2ogr_28():
     ogr.GetDriverByName('ESRI Shapefile').DeleteDataSource('tmp/wrapdateline_src.shp')
     ogr.GetDriverByName('ESRI Shapefile').DeleteDataSource('tmp/wrapdateline_dst.shp')
 
-    return 'success' if ret == 0 else 'fail'
+    assert ret == 0
 
 ###############################################################################
 # Test -wrapdateline on polygons
@@ -1007,8 +960,7 @@ def test_ogr2ogr_29():
 
         assert ret == 0
 
-    return 'success'
-
+    
 ###############################################################################
 # Test -splitlistfields option
 
@@ -1044,8 +996,6 @@ def test_ogr2ogr_30():
     ds = None
     ogr.GetDriverByName('ESRI Shapefile').DeleteDataSource('tmp/test_ogr2ogr_30.dbf')
 
-    return 'success'
-
 ###############################################################################
 # Test that -overwrite work if the output file doesn't yet exist (#3825)
 
@@ -1068,7 +1018,6 @@ def test_ogr2ogr_31():
     ds.Destroy()
 
     ogr.GetDriverByName('ESRI Shapefile').DeleteDataSource('tmp/poly.shp')
-    return 'success'
 
 ###############################################################################
 # Test that -append/-overwrite to a single-file shapefile work without specifying -nln
@@ -1100,7 +1049,6 @@ def test_ogr2ogr_32():
     ds = None
 
     ogr.GetDriverByName('ESRI Shapefile').DeleteDataSource('tmp/test_ogr2ogr_32.shp')
-    return 'success'
 
 ###############################################################################
 # Test -explodecollections
@@ -1163,7 +1111,6 @@ def test_ogr2ogr_33():
 
     ogr.GetDriverByName('CSV').DeleteDataSource('tmp/test_ogr2ogr_33_src.csv')
     ogr.GetDriverByName('ESRI Shapefile').DeleteDataSource('tmp/test_ogr2ogr_33_dst.shp')
-    return 'success'
 
 ###############################################################################
 # Test 'ogr2ogr someDirThatDoesNotExist src.shp -nln someDirThatDoesNotExist'
@@ -1203,7 +1150,6 @@ def test_ogr2ogr_34():
     ds = None
 
     ogr.GetDriverByName('ESRI Shapefile').DeleteDataSource('tmp/test_ogr2ogr_34_dir')
-    return 'success'
 
 ###############################################################################
 # Test 'ogr2ogr someDirThatDoesNotExist src.shp'
@@ -1241,7 +1187,6 @@ def test_ogr2ogr_35():
     ds = None
 
     ogr.GetDriverByName('ESRI Shapefile').DeleteDataSource('tmp/test_ogr2ogr_35_dir')
-    return 'success'
 
 ###############################################################################
 # Test ogr2ogr -zfield
@@ -1269,8 +1214,6 @@ def test_ogr2ogr_36():
 
     assert wkt.find(' 168,') != -1
 
-    return 'success'
-
 ###############################################################################
 # Test 'ogr2ogr someDirThatDoesNotExist.shp dataSourceWithMultipleLayer'
 
@@ -1306,8 +1249,6 @@ def test_ogr2ogr_37():
     ogr.GetDriverByName('ESRI Shapefile').DeleteDataSource('tmp/test_ogr2ogr_37_src')
     ogr.GetDriverByName('ESRI Shapefile').DeleteDataSource('tmp/test_ogr2ogr_37_dir.shp')
 
-    return 'success'
-
 ###############################################################################
 # Test that we take into account the fields by the where clause when combining
 # -select and -where (#4015)
@@ -1334,8 +1275,6 @@ def test_ogr2ogr_38():
 
     ogr.GetDriverByName('ESRI Shapefile').DeleteDataSource('tmp/test_ogr2ogr_38.shp')
 
-    return 'success'
-
 ###############################################################################
 # Test 'ogr2ogr someDirThatDoesNotExist.shp dataSourceWithMultipleLayer -sql "select * from alayer"' (#4268)
 
@@ -1371,8 +1310,6 @@ def test_ogr2ogr_39():
     ogr.GetDriverByName('ESRI Shapefile').DeleteDataSource('tmp/test_ogr2ogr_39_src')
     ogr.GetDriverByName('ESRI Shapefile').DeleteDataSource('tmp/test_ogr2ogr_39.shp')
 
-    return 'success'
-
 ###############################################################################
 # Test 'ogr2ogr -update asqlite.db asqlite.db layersrc -nln layerdst' (#4270)
 
@@ -1401,8 +1338,6 @@ def test_ogr2ogr_40():
 
     ogr.GetDriverByName('SQLite').DeleteDataSource('tmp/test_ogr2ogr_40.db')
 
-    return 'success'
-
 ###############################################################################
 # Test 'ogr2ogr -update PG:xxxx PG:xxxx layersrc -nln layerdst' (#4270)
 
@@ -1442,8 +1377,6 @@ def test_ogr2ogr_41():
     ds.ExecuteSQL('DELLAYER:test_ogr2ogr_41_target')
     ds = None
 
-    return 'success'
-
 ###############################################################################
 # Test combination of -select and -where FID=xx (#4500)
 
@@ -1468,8 +1401,6 @@ def test_ogr2ogr_42():
 
     ogr.GetDriverByName('ESRI Shapefile').DeleteDataSource('tmp/test_ogr2ogr_42.shp')
 
-    return 'success'
-
 ###############################################################################
 # Test -dim 3 and -dim 2
 
@@ -1508,8 +1439,6 @@ def test_ogr2ogr_43():
     ogr.GetDriverByName('ESRI Shapefile').DeleteDataSource('tmp/test_ogr2ogr_43_2d.shp')
     ogr.GetDriverByName('ESRI Shapefile').DeleteDataSource('tmp/test_ogr2ogr_43_3d.shp')
 
-    return 'success'
-
 ###############################################################################
 # Test -nlt PROMOTE_TO_MULTI for polygon/multipolygon
 
@@ -1556,8 +1485,6 @@ def test_ogr2ogr_44():
     os.unlink('tmp/test_ogr2ogr_44.gml')
     os.unlink('tmp/test_ogr2ogr_44.xsd')
 
-    return 'success'
-
 ###############################################################################
 # Test -nlt PROMOTE_TO_MULTI for linestring/multilinestring
 
@@ -1604,8 +1531,6 @@ def test_ogr2ogr_45():
     os.unlink('tmp/test_ogr2ogr_45.gml')
     os.unlink('tmp/test_ogr2ogr_45.xsd')
 
-    return 'success'
-
 ###############################################################################
 # Test -gcp (#4604)
 
@@ -1652,8 +1577,6 @@ def test_ogr2ogr_46():
 
     ogr.GetDriverByName('ESRI Shapefile').DeleteDataSource('tmp/test_ogr2ogr_46_src.shp')
 
-    return 'success'
-
 ###############################################################################
 # Test reprojection with features with different SRS
 
@@ -1709,8 +1632,6 @@ def test_ogr2ogr_47():
     os.unlink('tmp/test_ogr2ogr_47_src.gml')
     os.unlink('tmp/test_ogr2ogr_47_src.gfs')
 
-    return 'success'
-
 ###############################################################################
 # Test fieldmap option
 
@@ -1751,8 +1672,6 @@ def test_ogr2ogr_48():
 
     assert not error_occurred
 
-    return 'success'
-
 ###############################################################################
 # Test detection of duplicated field names in source layer and renaming
 # in target layer
@@ -1772,8 +1691,6 @@ def test_ogr2ogr_49():
     assert (lines[0].find('foo,bar,foo3,foo2,baz,foo4') == 0 and \
        lines[1].find('val_foo,val_bar,val_foo3,val_foo2,val_baz,val_foo4') == 0)
 
-    return 'success'
-
 ###############################################################################
 # Test detection of duplicated field names is case insensitive (#5208)
 
@@ -1804,8 +1721,7 @@ def test_ogr2ogr_49_bis():
     for i, line in enumerate(lines):
         assert line.strip() == expected_lines[i].strip(), lines
 
-    return 'success'
-
+    
 ###############################################################################
 # Test -addfields
 
@@ -1844,8 +1760,6 @@ def test_ogr2ogr_50():
     os.unlink('tmp/test_ogr2ogr_50_1.csv')
     os.unlink('tmp/test_ogr2ogr_50_2.csv')
 
-    return 'success'
-
 ###############################################################################
 # Test RFC 41 support
 
@@ -1924,8 +1838,6 @@ def test_ogr2ogr_51():
     os.unlink('tmp/test_ogr2ogr_51_src.csv')
     os.unlink('tmp/test_ogr2ogr_51_dst.csv')
 
-    return 'success'
-
 ###############################################################################
 # Test -nlt CONVERT_TO_LINEAR and -nlt CONVERT_TO_CURVE
 
@@ -1959,8 +1871,6 @@ def test_ogr2ogr_52():
     os.unlink('tmp/test_ogr2ogr_52_dst.csv')
     os.unlink('tmp/test_ogr2ogr_52_dst2.csv')
 
-    return 'success'
-
 ###############################################################################
 # Test -mapFieldType and 64 bit integers
 
@@ -2019,8 +1929,6 @@ def test_ogr2ogr_53():
     os.unlink('tmp/test_ogr2ogr_53.csv')
     os.unlink('tmp/test_ogr2ogr_53.csvt')
 
-    return 'success'
-
 ###############################################################################
 # Test behaviour with nullable fields
 
@@ -2078,8 +1986,6 @@ def test_ogr2ogr_54():
     os.unlink('tmp/test_ogr2ogr_54.csv')
     os.unlink('tmp/test_ogr2ogr_54.vrt')
 
-    return 'success'
-
 ###############################################################################
 # Test behaviour with default values
 
@@ -2138,8 +2044,6 @@ def test_ogr2ogr_55():
     os.unlink('tmp/test_ogr2ogr_55.csvt')
     os.unlink('tmp/test_ogr2ogr_55.vrt')
 
-    return 'success'
-
 ###############################################################################
 # Test behaviour when creating a field with same name as FID column.
 
@@ -2170,8 +2074,6 @@ def test_ogr2ogr_56():
     os.unlink('tmp/test_ogr2ogr_56.csv')
     os.unlink('tmp/test_ogr2ogr_56.csvt')
 
-    return 'success'
-
 ###############################################################################
 # Test default propagation of FID column name and values, and -unsetFid
 
@@ -2230,8 +2132,6 @@ def test_ogr2ogr_57():
     os.unlink('tmp/test_ogr2ogr_57.csvt')
     os.unlink('tmp/test_ogr2ogr_57.vrt')
 
-    return 'success'
-
 ###############################################################################
 # Test datasource transactions
 
@@ -2251,8 +2151,6 @@ def test_ogr2ogr_58():
 
     ogr.GetDriverByName('SQLite').DeleteDataSource('tmp/test_ogr2ogr_58.sqlite')
 
-    return 'success'
-
 ###############################################################################
 # Test metadata support
 
@@ -2294,8 +2192,6 @@ def test_ogr2ogr_59():
 
     ogr.GetDriverByName('GPKG').DeleteDataSource('tmp/test_ogr2ogr_59_src.gpkg')
 
-    return 'success'
-
 ###############################################################################
 # Test forced datasource transactions
 
@@ -2315,8 +2211,6 @@ def test_ogr2ogr_60():
 
     ogr.GetDriverByName('FileGDB').DeleteDataSource('tmp/test_ogr2ogr_60.gdb')
 
-    return 'success'
-
 ###############################################################################
 # Test -spat_srs
 
@@ -2346,8 +2240,6 @@ def test_ogr2ogr_61():
     ogr.GetDriverByName('ESRI Shapefile').DeleteDataSource('tmp/test_ogr2ogr_61_2.shp')
     os.unlink('tmp/test_ogr2ogr_61.csv')
 
-    return 'success'
-
 ###############################################################################
 # Test -noNativeData
 
@@ -2382,8 +2274,6 @@ def test_ogr2ogr_62():
 
     assert data.find('bar') < 0 and data.find('baz') < 0
 
-    return 'success'
-
 ###############################################################################
 # Test --formats
 
@@ -2401,7 +2291,6 @@ def test_ogr2ogr_63():
     (ret, err) = gdaltest.runexternal_out_and_err(test_cli_utilities.get_ogr2ogr_path() + ' --formats')
     assert ret.find('Supported Formats') >= 0, err
     assert err.find('ERROR') < 0, ret
-    return 'success'
 
 ###############################################################################
 # Test appending multiple layers, whose one already exists (#6345)
@@ -2440,8 +2329,6 @@ def test_ogr2ogr_64():
     shutil.rmtree('tmp/in_csv')
     shutil.rmtree('tmp/out_csv')
 
-    return 'success'
-
 ###############################################################################
 # Test detection of extension
 
@@ -2461,8 +2348,7 @@ def test_ogr2ogr_65():
         print(ret)
         pytest.fail('expected a warning about probably wrong extension')
 
-    return 'success'
-
+    
 ###############################################################################
 # Test accidental overriding of dataset when dst and src filenames are the same (#1465)
 
@@ -2475,8 +2361,6 @@ def test_ogr2ogr_66():
     assert err.find("Source and destination datasets must be different in non-update mode") >= 0, \
         ret
 
-    return 'success'
-
 
 def hexify_double(val):
     val = hex(val)
@@ -2534,7 +2418,7 @@ def check_identity_transformation(x, y, srid):
     shape_drv.DeleteDataSource('tmp/output_point.shp')
     os.remove('tmp/input_point.csv')
 
-    return 'success' if ok else 'fail'
+    assert ok
 
 ###############################################################################
 # Test coordinates values are preserved for identity transformations
diff --git a/autotest/utilities/test_ogr2ogr_lib.py b/autotest/utilities/test_ogr2ogr_lib.py
index 9ddd4e0cff9e..3861dcc41d9d 100755
--- a/autotest/utilities/test_ogr2ogr_lib.py
+++ b/autotest/utilities/test_ogr2ogr_lib.py
@@ -53,8 +53,6 @@ def test_ogr2ogr_lib_1():
     assert feat0.GetFieldAsString('PRFEDEA') == '35043411', \
         'Did not get expected value for field PRFEDEA'
 
-    return 'success'
-
 ###############################################################################
 # Test SQLStatement
 
@@ -80,8 +78,6 @@ def test_ogr2ogr_lib_2():
     assert ds is not None and ds.GetLayer(0).GetFeatureCount() == 10
     gdal.Unlink('/vsimem/sql.txt')
 
-    return 'success'
-
 ###############################################################################
 # Test WHERE
 
@@ -98,8 +94,6 @@ def test_ogr2ogr_lib_3():
     assert ds is not None and ds.GetLayer(0).GetFeatureCount() == 1
     gdal.Unlink('/vsimem/filter.txt')
 
-    return 'success'
-
 ###############################################################################
 # Test accessMode
 
@@ -128,8 +122,6 @@ def test_ogr2ogr_lib_4():
     ds = None
     ogr.GetDriverByName('ESRI Shapefile').DeleteDataSource('/vsimem/poly.shp')
 
-    return 'success'
-
 ###############################################################################
 # Test dstSRS
 
@@ -140,8 +132,6 @@ def test_ogr2ogr_lib_5():
     ds = gdal.VectorTranslate('', srcDS, format='Memory', dstSRS='EPSG:4326')
     assert str(ds.GetLayer(0).GetSpatialRef()).find('1984') != -1
 
-    return 'success'
-
 ###############################################################################
 # Test selFields
 
@@ -179,8 +169,6 @@ def test_ogr2ogr_lib_7():
     ds = None
     ogr.GetDriverByName('ESRI Shapefile').DeleteDataSource('/vsimem/poly.shp')
 
-    return 'success'
-
 ###############################################################################
 # Add explicit source layer name
 
@@ -195,8 +183,6 @@ def test_ogr2ogr_lib_8():
     ds = gdal.VectorTranslate('', srcDS, format='Memory', layers='poly')
     assert ds is not None and ds.GetLayer(0).GetFeatureCount() == 10
 
-    return 'success'
-
 ###############################################################################
 # Test -segmentize
 
@@ -209,8 +195,6 @@ def test_ogr2ogr_lib_9():
     feat = ds.GetLayer(0).GetNextFeature()
     assert feat.GetGeometryRef().GetGeometryRef(0).GetPointCount() == 36
 
-    return 'success'
-
 ###############################################################################
 # Test overwrite with a shapefile
 
@@ -228,7 +212,6 @@ def test_ogr2ogr_lib_10():
     ds = None
 
     ogr.GetDriverByName('ESRI Shapefile').DeleteDataSource('/vsimem/tmp')
-    return 'success'
 
 ###############################################################################
 # Test filter
@@ -243,8 +226,7 @@ def test_ogr2ogr_lib_11():
     else:
         assert ds is not None and ds.GetLayer(0).GetFeatureCount() == 5
 
-    return 'success'
-
+    
 ###############################################################################
 # Test callback
 
@@ -263,8 +245,6 @@ def test_ogr2ogr_lib_12():
 
     assert tab[0] == 1.0, 'Bad percentage'
 
-    return 'success'
-
 ###############################################################################
 # Test callback with failure
 
@@ -282,8 +262,6 @@ def test_ogr2ogr_lib_13():
         ds = gdal.VectorTranslate('', '../ogr/data/poly.shp', format='Memory', callback=mycallback_with_failure)
     assert ds is None
 
-    return 'success'
-
 ###############################################################################
 # Test internal wrappers
 
@@ -296,8 +274,7 @@ def test_ogr2ogr_lib_14():
     except RuntimeError:
         pass
 
-    return 'success'
-
+    
 ###############################################################################
 # Test non existing zfield
 
@@ -310,8 +287,6 @@ def test_ogr2ogr_lib_15():
     lyr = ds.GetLayer(0)
     assert lyr.GetGeomType() == ogr.wkbPolygon
 
-    return 'success'
-
 ###############################################################################
 # Test -dim
 
@@ -346,8 +321,7 @@ def test_ogr2ogr_lib_16():
             print(wkt_before)
             pytest.fail(dim)
 
-    return 'success'
-
+    
 ###############################################################################
 # Test gdal.VectorTranslate(dst_ds, ...) without accessMode specified (#6612)
 
@@ -360,8 +334,6 @@ def test_ogr2ogr_lib_17():
     assert lyr.GetFeatureCount() == 10
     ds = None
 
-    return 'success'
-
 ###############################################################################
 # Test -limit
 
@@ -374,8 +346,6 @@ def test_ogr2ogr_lib_18():
     assert lyr.GetFeatureCount() == 1
     ds = None
 
-    return 'success'
-
 ###############################################################################
 # Test -addFields + -select
 
@@ -404,8 +374,6 @@ def test_ogr2ogr_lib_19():
         pytest.fail()
     ds = None
 
-    return 'success'
-
 
 ###############################################################################
 # Test preservation of source geometry field name
@@ -436,8 +404,6 @@ def test_ogr2ogr_lib_20():
     ds = None
     gdal.Unlink('/vsimem/out.gpkg')
 
-    return 'success'
-
 
 ###############################################################################
 # Verify -append and -select options are an invalid combination
@@ -465,8 +431,6 @@ def test_ogr2ogr_lib_21():
     assert gdal.GetLastErrorNo() == gdalconst.CPLE_IllegalArg, \
         'expected use of -select and -append together to be invalid'
 
-    return 'success'
-
 
 ###############################################################################
 
@@ -487,8 +451,6 @@ def test_ogr2ogr_clipsrc_no_dst_geom():
 
     gdal.Unlink(tmpfilename)
 
-    return 'success'
-
 gdaltest_list = [
     test_ogr2ogr_lib_1,
     test_ogr2ogr_lib_2,
diff --git a/autotest/utilities/test_ogrinfo.py b/autotest/utilities/test_ogrinfo.py
index 5c56ca819b60..d39e9070dccd 100755
--- a/autotest/utilities/test_ogrinfo.py
+++ b/autotest/utilities/test_ogrinfo.py
@@ -51,8 +51,6 @@ def test_ogrinfo_1():
     assert (err is None or err == ''), 'got error/warning'
     assert ret.find('ESRI Shapefile') != -1
 
-    return 'success'
-
 ###############################################################################
 # Test -ro option
 
@@ -64,8 +62,6 @@ def test_ogrinfo_2():
     ret = gdaltest.runexternal(test_cli_utilities.get_ogrinfo_path() + ' -ro ../ogr/data/poly.shp')
     assert ret.find('ESRI Shapefile') != -1
 
-    return 'success'
-
 ###############################################################################
 # Test -al option
 
@@ -82,8 +78,6 @@ def test_ogrinfo_3():
     assert ret.find('PROJCS["OSGB') != -1
     assert ret.find('AREA: Real (') != -1
 
-    return 'success'
-
 ###############################################################################
 # Test layer name
 
@@ -95,8 +89,6 @@ def test_ogrinfo_4():
     ret = gdaltest.runexternal(test_cli_utilities.get_ogrinfo_path() + ' ../ogr/data/poly.shp poly')
     assert ret.find('Feature Count: 10') != -1
 
-    return 'success'
-
 ###############################################################################
 # Test -sql option
 
@@ -108,8 +100,6 @@ def test_ogrinfo_5():
     ret = gdaltest.runexternal(test_cli_utilities.get_ogrinfo_path() + ' ../ogr/data/poly.shp -sql "select * from poly"')
     assert ret.find('Feature Count: 10') != -1
 
-    return 'success'
-
 ###############################################################################
 # Test -geom=NO option
 
@@ -122,8 +112,6 @@ def test_ogrinfo_6():
     assert ret.find('Feature Count: 10') != -1
     assert ret.find('POLYGON') == -1
 
-    return 'success'
-
 ###############################################################################
 # Test -geom=SUMMARY option
 
@@ -137,8 +125,6 @@ def test_ogrinfo_7():
     assert ret.find('POLYGON (') == -1
     assert ret.find('POLYGON :') != -1
 
-    return 'success'
-
 ###############################################################################
 # Test -spat option
 
@@ -150,10 +136,10 @@ def test_ogrinfo_8():
     ret = gdaltest.runexternal(test_cli_utilities.get_ogrinfo_path() + ' ../ogr/data/poly.shp poly -spat 479609 4764629 479764 4764817')
     if ogrtest.have_geos():
         assert ret.find('Feature Count: 4') != -1
-        return 'success'
+        return
     else:
         assert ret.find('Feature Count: 5') != -1
-        return 'success'
+        return
 
 ###############################################################################
 # Test -where option
@@ -166,8 +152,6 @@ def test_ogrinfo_9():
     ret = gdaltest.runexternal(test_cli_utilities.get_ogrinfo_path() + ' ../ogr/data/poly.shp poly -where "EAS_ID=171"')
     assert ret.find('Feature Count: 1') != -1
 
-    return 'success'
-
 ###############################################################################
 # Test -fid option
 
@@ -179,8 +163,6 @@ def test_ogrinfo_10():
     ret = gdaltest.runexternal(test_cli_utilities.get_ogrinfo_path() + ' ../ogr/data/poly.shp poly -fid 9')
     assert ret.find('OGRFeature(poly):9') != -1
 
-    return 'success'
-
 ###############################################################################
 # Test -fields=no option
 
@@ -193,8 +175,6 @@ def test_ogrinfo_11():
     assert ret.find('AREA (Real') == -1
     assert ret.find('POLYGON (') != -1
 
-    return 'success'
-
 ###############################################################################
 # Test ogrinfo --version
 
@@ -206,8 +186,6 @@ def test_ogrinfo_12():
     ret = gdaltest.runexternal(test_cli_utilities.get_ogrinfo_path() + ' --version', check_memleak=False)
     assert ret.find(gdal.VersionInfo('--version')) == 0
 
-    return 'success'
-
 ###############################################################################
 # Test erroneous use of --config
 
@@ -219,8 +197,6 @@ def test_ogrinfo_13():
     (_, err) = gdaltest.runexternal_out_and_err(test_cli_utilities.get_ogrinfo_path() + ' --config', check_memleak=False)
     assert err.find('--config option given without a key and value argument') >= 0
 
-    return 'success'
-
 ###############################################################################
 # Test erroneous use of --mempreload.
 
@@ -232,8 +208,6 @@ def test_ogrinfo_14():
     (_, err) = gdaltest.runexternal_out_and_err(test_cli_utilities.get_ogrinfo_path() + ' --mempreload', check_memleak=False)
     assert err.find('--mempreload option given without directory path') >= 0
 
-    return 'success'
-
 ###############################################################################
 # Test --mempreload
 
@@ -245,8 +219,6 @@ def test_ogrinfo_15():
     (ret, _) = gdaltest.runexternal_out_and_err(test_cli_utilities.get_ogrinfo_path() + ' --debug on --mempreload ../ogr/data /vsimem/poly.shp', check_memleak=False)
     assert ret.find("ESRI Shapefile") >= 0
 
-    return 'success'
-
 ###############################################################################
 # Test erroneous use of --debug.
 
@@ -258,8 +230,6 @@ def test_ogrinfo_16():
     (_, err) = gdaltest.runexternal_out_and_err(test_cli_utilities.get_ogrinfo_path() + ' --debug', check_memleak=False)
     assert err.find('--debug option given without debug level') >= 0
 
-    return 'success'
-
 ###############################################################################
 # Test erroneous use of --optfile.
 
@@ -281,8 +251,6 @@ def test_ogrinfo_17():
     os.unlink('tmp/optfile.txt')
     assert err.find('--config option given without a key and value argument') >= 0
 
-    return 'success'
-
 ###############################################################################
 # Test --optfile
 
@@ -299,8 +267,6 @@ def test_ogrinfo_18():
     os.unlink('tmp/optfile.txt')
     assert ret.find("ESRI Shapefile") >= 0
 
-    return 'success'
-
 ###############################################################################
 # Test --formats
 
@@ -312,8 +278,6 @@ def test_ogrinfo_19():
     ret = gdaltest.runexternal(test_cli_utilities.get_ogrinfo_path() + ' --formats', check_memleak=False)
     assert ret.find('ESRI Shapefile -vector- (rw+v): ESRI Shapefile') >= 0
 
-    return 'success'
-
 ###############################################################################
 # Test --help-general
 
@@ -325,8 +289,6 @@ def test_ogrinfo_20():
     ret = gdaltest.runexternal(test_cli_utilities.get_ogrinfo_path() + ' --help-general', check_memleak=False)
     assert ret.find('Generic GDAL utility command options') >= 0
 
-    return 'success'
-
 ###############################################################################
 # Test --locale
 
@@ -338,8 +300,6 @@ def test_ogrinfo_21():
     ret = gdaltest.runexternal(test_cli_utilities.get_ogrinfo_path() + ' --locale C ../ogr/data/poly.shp', check_memleak=False)
     assert ret.find("ESRI Shapefile") >= 0
 
-    return 'success'
-
 ###############################################################################
 # Test RFC 41 support
 
@@ -417,8 +377,6 @@ def test_ogrinfo_22():
 
     os.unlink('tmp/test_ogrinfo_22.csv')
 
-    return 'success'
-
 ###############################################################################
 # Test -geomfield (RFC 41) support
 
@@ -494,8 +452,6 @@ def test_ogrinfo_23():
 
     os.unlink('tmp/test_ogrinfo_23.csv')
 
-    return 'success'
-
 ###############################################################################
 # Test metadata
 
@@ -662,8 +618,6 @@ def test_ogrinfo_24():
 
     os.unlink('tmp/test_ogrinfo_24.vrt')
 
-    return 'success'
-
 ###############################################################################
 # Test -rl
 
@@ -677,8 +631,6 @@ def test_ogrinfo_25():
     assert ret.find('OGRFeature(poly):0') >= 0 and ret.find('OGRFeature(poly):9') >= 0, \
         'wrong output'
 
-    return 'success'
-
 
 ###############################################################################
 # Test SQLStatement with -sql @filename syntax
@@ -695,8 +647,6 @@ def test_ogrinfo_sql_filename():
     assert ret.find('OGRFeature(poly):0') >= 0 and ret.find('OGRFeature(poly):9') >= 0, \
         'wrong output'
 
-    return 'success'
-
 
 gdaltest_list = [
     test_ogrinfo_1,
diff --git a/autotest/utilities/test_ogrlineref.py b/autotest/utilities/test_ogrlineref.py
index 030d2b50fc16..71a621b3a771 100755
--- a/autotest/utilities/test_ogrlineref.py
+++ b/autotest/utilities/test_ogrlineref.py
@@ -56,8 +56,6 @@ def test_ogrlineref_1():
     ds = ogr.Open('tmp/parts.shp')
     assert ds is not None and ds.GetLayer(0).GetFeatureCount() == 9
 
-    return 'success'
-
 ###############################################################################
 # get_pos test
 
@@ -71,8 +69,6 @@ def test_ogrlineref_2():
     expected = '15977.724709'
     assert ret == expected, ('"%s" != %s' % (ret.strip(), expected))
 
-    return 'success'
-
 ###############################################################################
 # get_coord test
 
@@ -86,8 +82,6 @@ def test_ogrlineref_3():
     expected = '-1.435097,51.950080,0.000000'
     assert ret == expected, ('%s != %s' % (ret.strip(), expected))
 
-    return 'success'
-
 ###############################################################################
 # get_subline test
 
@@ -110,8 +104,6 @@ def test_ogrlineref_4():
 
     ogr.GetDriverByName('ESRI Shapefile').DeleteDataSource('tmp/subline.shp')
 
-    return 'success'
-
 ###############################################################################
 # test kml
 
@@ -125,7 +117,7 @@ def test_ogrlineref_5():
 
     gdaltest.runexternal_out_and_err(test_cli_utilities.get_ogrlineref_path() + ' -create -f "KML" -l data/path.shp -p data/mstones.shp -pm pos -o tmp/parts.kml -s 222')
     if os.path.exists('tmp/parts.kml'):
-        return 'success'
+        return
 
     pytest.fail()
 
@@ -139,8 +131,7 @@ def test_ogrlineref_cleanup():
     if os.path.exists('tmp/parts.kml'):
         ogr.GetDriverByName('KML').DeleteDataSource('tmp/parts.kml')
 
-    return 'success'
-
+    
 
 gdaltest_list = [
     test_ogrlineref_1,
diff --git a/autotest/utilities/test_ogrtindex.py b/autotest/utilities/test_ogrtindex.py
index 6304dc4f4bb8..88d4aa1384bf 100755
--- a/autotest/utilities/test_ogrtindex.py
+++ b/autotest/utilities/test_ogrtindex.py
@@ -110,8 +110,6 @@ def test_ogrtindex_1(srs=None):
         feat = ds.GetLayer(0).GetNextFeature()
     ds.Destroy()
 
-    return 'success'
-
 ###############################################################################
 # Same test but with a SRS set on the different tiles to index
 
@@ -216,8 +214,7 @@ def test_ogrtindex_3():
     if os.path.exists('tmp/tileindex.db'):
         os.unlink('tmp/tileindex.db')
 
-    return 'success'
-
+    
 ###############################################################################
 # Cleanup
 
@@ -235,8 +232,7 @@ def test_ogrtindex_cleanup():
     if os.path.exists('tmp/point4.shp'):
         shape_drv.DeleteDataSource('tmp/point4.shp')
 
-    return 'success'
-
+    
 
 gdaltest_list = [
     test_ogrtindex_1,

From b81466c11b97f7ffc4b531e4d83a03d882b89849 Mon Sep 17 00:00:00 2001
From: Craig de Stigter <craig.destigter@koordinates.com>
Date: Mon, 10 Dec 2018 09:27:28 +1300
Subject: [PATCH 141/488] Automated: Remove gdaltest_list

No longer needed
---
 autotest/alg/applyverticalshiftgrid.py        |   9 -
 autotest/alg/contour.py                       |   7 -
 autotest/alg/cutline.py                       |   6 -
 autotest/alg/dither.py                        |   3 -
 autotest/alg/polygonize.py                    |   7 -
 autotest/alg/proximity.py                     |   5 -
 autotest/alg/rasterize.py                     |   8 -
 autotest/alg/reproject.py                     |   6 -
 autotest/alg/sieve.py                         |  10 -
 autotest/alg/tps.py                           |   3 -
 autotest/alg/transformgeoloc.py               |   3 -
 autotest/alg/warp.py                          |  75 -------
 autotest/gcore/asyncreader.py                 |   1 -
 autotest/gcore/basic_test.py                  |  18 --
 autotest/gcore/bmp_read.py                    |   1 -
 autotest/gcore/bmp_write.py                   |   1 -
 autotest/gcore/colortable.py                  |   5 -
 autotest/gcore/envi_read.py                   |   1 -
 autotest/gcore/gcps2geotransform.py           |  10 -
 autotest/gcore/gdal_api_proxy.py              |   4 -
 autotest/gcore/gdal_stats.py                  |  29 ---
 autotest/gcore/geoloc.py                      |   2 -
 autotest/gcore/hdf4_read.py                   |  12 --
 autotest/gcore/hfa_read.py                    |   1 -
 autotest/gcore/hfa_rfc40.py                   |  16 --
 autotest/gcore/hfa_write.py                   |  10 -
 autotest/gcore/histogram.py                   |   8 -
 autotest/gcore/identify.py                    |   5 -
 autotest/gcore/mask.py                        |  32 ---
 autotest/gcore/minixml.py                     |  10 -
 autotest/gcore/misc.py                        |  16 --
 autotest/gcore/nodatamaskband.py              |   3 -
 autotest/gcore/numpy_rw.py                    |  20 --
 autotest/gcore/overviewds.py                  |   7 -
 autotest/gcore/pam.py                         |  15 --
 autotest/gcore/pixfun.py                      |  32 ---
 autotest/gcore/rasterio.py                    |  20 --
 autotest/gcore/rat.py                         |   5 -
 autotest/gcore/rfc30.py                       |   1 -
 autotest/gcore/testnonboundtoswig.py          |   3 -
 autotest/gcore/thread_test.py                 |   1 -
 autotest/gcore/tiff_ovr.py                    |  61 ------
 autotest/gcore/tiff_read.py                   | 130 ------------
 autotest/gcore/tiff_srs.py                    |  14 --
 autotest/gcore/tiff_write.py                  | 200 ------------------
 autotest/gcore/transformer.py                 |  19 --
 autotest/gcore/virtualmem.py                  |   4 -
 autotest/gcore/vrt_read.py                    |  38 ----
 autotest/gcore/vrtmisc.py                     |  23 --
 autotest/gcore/vsiaz.py                       |  11 -
 autotest/gcore/vsicrypt.py                    |   6 -
 autotest/gcore/vsicurl.py                     |  18 --
 autotest/gcore/vsicurl_streaming.py           |   1 -
 autotest/gcore/vsifile.py                     |  26 ---
 autotest/gcore/vsigs.py                       |  16 --
 autotest/gcore/vsihdfs.py                     |   7 -
 autotest/gcore/vsioss.py                      |  13 --
 autotest/gcore/vsis3.py                       |  23 --
 autotest/gcore/vsistdin.py                    |   1 -
 autotest/gcore/vsiswift.py                    |  12 --
 autotest/gcore/vsiwebhdfs.py                  |  10 -
 autotest/gcore/vsizip.py                      |  20 --
 autotest/gdrivers/aaigrid.py                  |  18 --
 autotest/gdrivers/ace2.py                     |   2 -
 autotest/gdrivers/adrg.py                     |   9 -
 autotest/gdrivers/aigrid.py                   |   9 -
 autotest/gdrivers/arg.py                      |  10 -
 autotest/gdrivers/bag.py                      |  12 --
 autotest/gdrivers/blx.py                      |   7 -
 autotest/gdrivers/bsb.py                      |   9 -
 autotest/gdrivers/bt.py                       |   8 -
 autotest/gdrivers/byn.py                      |   3 -
 autotest/gdrivers/cals.py                     |   7 -
 autotest/gdrivers/ceos.py                     |   2 -
 autotest/gdrivers/cpg.py                      |   2 -
 autotest/gdrivers/ctg.py                      |   2 -
 autotest/gdrivers/db2.py                      |   4 -
 autotest/gdrivers/derived.py                  |   5 -
 autotest/gdrivers/dimap.py                    |   3 -
 autotest/gdrivers/dipex.py                    |   2 -
 autotest/gdrivers/dods.py                     |   1 -
 autotest/gdrivers/doq1.py                     |   2 -
 autotest/gdrivers/doq2.py                     |   2 -
 autotest/gdrivers/dted.py                     |  18 --
 autotest/gdrivers/e00grid.py                  |   3 -
 autotest/gdrivers/ecrgtoc.py                  |   6 -
 autotest/gdrivers/ecw.py                      |  60 ------
 autotest/gdrivers/eedai.py                    |  11 -
 autotest/gdrivers/ehdr.py                     |  17 --
 autotest/gdrivers/eir.py                      |   2 -
 autotest/gdrivers/elas.py                     |   3 -
 autotest/gdrivers/envi.py                     |  18 --
 autotest/gdrivers/ers.py                      |  14 --
 autotest/gdrivers/fast.py                     |  10 -
 autotest/gdrivers/fujibas.py                  |   2 -
 autotest/gdrivers/gdalhttp.py                 |  10 -
 autotest/gdrivers/genbin.py                   |   3 -
 autotest/gdrivers/georaster.py                |  17 --
 autotest/gdrivers/gff.py                      |   2 -
 autotest/gdrivers/gif.py                      |  12 --
 autotest/gdrivers/gmt.py                      |   3 -
 autotest/gdrivers/gpkg.py                     |  57 -----
 autotest/gdrivers/grass.py                    |   4 -
 autotest/gdrivers/grassasciigrid.py           |   3 -
 autotest/gdrivers/grib.py                     |  34 ---
 autotest/gdrivers/gsc.py                      |   2 -
 autotest/gdrivers/gsg.py                      |  10 -
 autotest/gdrivers/gta.py                      |   7 -
 autotest/gdrivers/gtx.py                      |   2 -
 autotest/gdrivers/gxf.py                      |   1 -
 autotest/gdrivers/hdf5.py                     |  20 --
 autotest/gdrivers/hf2.py                      |   6 -
 autotest/gdrivers/hfa.py                      |  44 ----
 autotest/gdrivers/ida.py                      |   9 -
 autotest/gdrivers/idrisi.py                   |   6 -
 autotest/gdrivers/ignfheightasciigrid.py      |  14 --
 autotest/gdrivers/ilwis.py                    |   7 -
 autotest/gdrivers/ingr.py                     |  20 --
 autotest/gdrivers/iris.py                     |   3 -
 autotest/gdrivers/isce.py                     |   6 -
 autotest/gdrivers/isis.py                     |  32 ---
 autotest/gdrivers/isis2.py                    |   4 -
 autotest/gdrivers/jdem.py                     |   2 -
 autotest/gdrivers/jp2kak.py                   |  22 --
 autotest/gdrivers/jp2lura.py                  |  64 ------
 autotest/gdrivers/jp2metadata.py              |   7 -
 autotest/gdrivers/jp2openjpeg.py              |  62 ------
 autotest/gdrivers/jpeg.py                     |  30 ---
 autotest/gdrivers/jpeg2000.py                 |  19 --
 autotest/gdrivers/jpeg_profile.py             |   5 -
 autotest/gdrivers/jpegls.py                   |   3 -
 autotest/gdrivers/jpipkak.py                  |   7 -
 autotest/gdrivers/kea.py                      |  17 --
 autotest/gdrivers/kmlsuperoverlay.py          |  10 -
 autotest/gdrivers/kro.py                      |   7 -
 autotest/gdrivers/l1b.py                      |   9 -
 autotest/gdrivers/lan.py                      |   3 -
 autotest/gdrivers/lcp.py                      |  24 ---
 autotest/gdrivers/leveller.py                 |   2 -
 autotest/gdrivers/loslas.py                   |   3 -
 autotest/gdrivers/mbtiles.py                  |  20 --
 autotest/gdrivers/mem.py                      |  17 --
 autotest/gdrivers/mff.py                      |   4 -
 autotest/gdrivers/mff2.py                     |   2 -
 autotest/gdrivers/mg4lidar.py                 |   2 -
 autotest/gdrivers/mrf.py                      |  18 --
 autotest/gdrivers/mrsid.py                    |  17 --
 autotest/gdrivers/ndf.py                      |   2 -
 autotest/gdrivers/netcdf.py                   |  91 --------
 autotest/gdrivers/netcdf_cf.py                |   7 -
 autotest/gdrivers/ngsgeoid.py                 |   4 -
 autotest/gdrivers/nitf.py                     | 126 -----------
 autotest/gdrivers/ntv1.py                     |   3 -
 autotest/gdrivers/ntv2.py                     |  12 --
 autotest/gdrivers/nwt_grc.py                  |   2 -
 autotest/gdrivers/nwt_grd.py                  |   2 -
 autotest/gdrivers/ozi.py                      |   2 -
 autotest/gdrivers/paux.py                     |   5 -
 autotest/gdrivers/pcidsk.py                   |  20 --
 autotest/gdrivers/pcraster.py                 |   3 -
 autotest/gdrivers/pdf.py                      |   1 -
 autotest/gdrivers/pds.py                      |  13 --
 autotest/gdrivers/pds4.py                     |  19 --
 autotest/gdrivers/plmosaic.py                 |  26 ---
 autotest/gdrivers/png.py                      |  16 --
 autotest/gdrivers/png_profile.py              |   7 -
 autotest/gdrivers/pnm.py                      |   6 -
 autotest/gdrivers/postgisraster.py            |  25 ---
 autotest/gdrivers/prf.py                      |   6 -
 autotest/gdrivers/r.py                        |   5 -
 autotest/gdrivers/rasdaman.py                 |   4 -
 autotest/gdrivers/rasterlite.py               |  15 --
 autotest/gdrivers/rda.py                      |  16 --
 autotest/gdrivers/rik.py                      |   4 -
 autotest/gdrivers/rl2.py                      |  27 ---
 autotest/gdrivers/rmf.py                      |  47 ----
 autotest/gdrivers/roipac.py                   |   8 -
 autotest/gdrivers/rpftoc.py                   |   5 -
 autotest/gdrivers/rraster.py                  |  17 --
 autotest/gdrivers/rs2.py                      |   4 -
 autotest/gdrivers/safe.py                     |   6 -
 autotest/gdrivers/saga.py                     |   9 -
 autotest/gdrivers/sar_ceos.py                 |   2 -
 autotest/gdrivers/sdts.py                     |   1 -
 autotest/gdrivers/sentinel2.py                |  30 ---
 autotest/gdrivers/sgi.py                      |   5 -
 autotest/gdrivers/sigdem.py                   |   5 -
 autotest/gdrivers/snodas.py                   |   2 -
 autotest/gdrivers/srp.py                      |   9 -
 autotest/gdrivers/srtmhgt.py                  |   7 -
 autotest/gdrivers/terragen.py                 |   4 -
 autotest/gdrivers/test_validate_jp2.py        |  10 -
 autotest/gdrivers/tiff_profile.py             |   9 -
 autotest/gdrivers/til.py                      |   4 -
 autotest/gdrivers/usgsdem.py                  |  13 --
 autotest/gdrivers/vicar.py                    |   2 -
 autotest/gdrivers/vrtderived.py               |  18 --
 autotest/gdrivers/vrtfilt.py                  |   8 -
 autotest/gdrivers/vrtlut.py                   |   3 -
 autotest/gdrivers/vrtmask.py                  |  13 --
 autotest/gdrivers/vrtovr.py                   |   6 -
 autotest/gdrivers/vrtpansharpen.py            |  14 --
 autotest/gdrivers/vrtrawlink.py               |  12 --
 autotest/gdrivers/vrtwarp.py                  |  14 --
 autotest/gdrivers/wcs.py                      |   8 -
 autotest/gdrivers/webp.py                     |   6 -
 autotest/gdrivers/wms.py                      |  21 --
 autotest/gdrivers/wmts.py                     |  32 ---
 autotest/gdrivers/xpm.py                      |   1 -
 autotest/gdrivers/xyz.py                      |  10 -
 autotest/gdrivers/zmap.py                     |   3 -
 autotest/gnm/gnm_test.py                      |  10 -
 autotest/kml_generate_test_files.py           |   1 -
 autotest/ogr/ogr_arcgen.py                    |   7 -
 autotest/ogr/ogr_as_sqlite_extension.py       |   1 -
 autotest/ogr/ogr_avc.py                       |   7 -
 autotest/ogr/ogr_basic_test.py                |  20 --
 autotest/ogr/ogr_bna.py                       |   8 -
 autotest/ogr/ogr_cad.py                       |  11 -
 autotest/ogr/ogr_carto.py                     |   6 -
 autotest/ogr/ogr_cloudant.py                  |   8 -
 autotest/ogr/ogr_couchdb.py                   |   6 -
 autotest/ogr/ogr_csv.py                       |  57 -----
 autotest/ogr/ogr_csw.py                       |  14 --
 autotest/ogr/ogr_db2.py                       |  11 -
 autotest/ogr/ogr_db2_hack.py                  |   5 -
 autotest/ogr/ogr_dgn.py                       |  11 -
 autotest/ogr/ogr_dgnv8.py                     |   7 -
 autotest/ogr/ogr_dods.py                      |   1 -
 autotest/ogr/ogr_dxf.py                       |  57 -----
 autotest/ogr/ogr_edigeo.py                    |   2 -
 autotest/ogr/ogr_eeda.py                      |   6 -
 autotest/ogr/ogr_elasticsearch.py             |  17 --
 autotest/ogr/ogr_factory.py                   |  10 -
 autotest/ogr/ogr_feature.py                   |  22 --
 autotest/ogr/ogr_fgdb.py                      |  32 ---
 autotest/ogr/ogr_fgdb_stress_test.py          |   1 -
 autotest/ogr/ogr_geoconcept.py                |  10 -
 autotest/ogr/ogr_geojson.py                   |  79 -------
 autotest/ogr/ogr_geojsonseq.py                |  11 -
 autotest/ogr/ogr_geom.py                      |  70 ------
 autotest/ogr/ogr_georss.py                    |  21 --
 autotest/ogr/ogr_geos.py                      |  34 ---
 autotest/ogr/ogr_gft.py                       |   7 -
 autotest/ogr/ogr_gml_fgd_read.py              |   4 -
 autotest/ogr/ogr_gml_geom.py                  |  62 ------
 autotest/ogr/ogr_gml_read.py                  |  88 --------
 autotest/ogr/ogr_gmlas.py                     |  59 ------
 autotest/ogr/ogr_gmt.py                       |   7 -
 autotest/ogr/ogr_gpkg.py                      |  66 ------
 autotest/ogr/ogr_gpsbabel.py                  |   5 -
 autotest/ogr/ogr_gpx.py                       |  16 --
 autotest/ogr/ogr_grass.py                     |   4 -
 autotest/ogr/ogr_gtm.py                       |   7 -
 autotest/ogr/ogr_htf.py                       |   3 -
 autotest/ogr/ogr_idrisi.py                    |   5 -
 autotest/ogr/ogr_ili.py                       |  22 --
 autotest/ogr/ogr_index_test.py                |  13 --
 autotest/ogr/ogr_ingres.py                    |  10 -
 autotest/ogr/ogr_jml.py                       |   8 -
 autotest/ogr/ogr_join_test.py                 |  25 ---
 autotest/ogr/ogr_kml.py                       |  29 ---
 autotest/ogr/ogr_layer_algebra.py             |  12 --
 autotest/ogr/ogr_libkml.py                    |  57 -----
 autotest/ogr/ogr_mem.py                       |  19 --
 autotest/ogr/ogr_mitab.py                     |  56 -----
 autotest/ogr/ogr_mongodb.py                   |   7 -
 autotest/ogr/ogr_mssqlspatial.py              |   9 -
 autotest/ogr/ogr_mvt.py                       |  42 ----
 autotest/ogr/ogr_mysql.py                     |  30 ---
 autotest/ogr/ogr_nas.py                       |   6 -
 autotest/ogr/ogr_ntf.py                       |   3 -
 autotest/ogr/ogr_oci.py                       |  23 --
 autotest/ogr/ogr_odbc.py                      |   5 -
 autotest/ogr/ogr_ods.py                       |  13 --
 autotest/ogr/ogr_ogdi.py                      |   7 -
 autotest/ogr/ogr_openair.py                   |   2 -
 autotest/ogr/ogr_openfilegdb.py               |  30 ---
 autotest/ogr/ogr_osm.py                       |  25 ---
 autotest/ogr/ogr_pcidsk.py                    |  11 -
 autotest/ogr/ogr_pdf.py                       |  11 -
 autotest/ogr/ogr_pds.py                       |   4 -
 autotest/ogr/ogr_pg.py                        |  94 --------
 autotest/ogr/ogr_pgdump.py                    |  18 --
 autotest/ogr/ogr_pgeo.py                      |   3 -
 autotest/ogr/ogr_plscenes.py                  |   8 -
 autotest/ogr/ogr_rec.py                       |   3 -
 autotest/ogr/ogr_refcount.py                  |   6 -
 autotest/ogr/ogr_rfc30.py                     |   1 -
 autotest/ogr/ogr_rfc35_mem.py                 |   7 -
 autotest/ogr/ogr_rfc35_mitab.py               |   7 -
 autotest/ogr/ogr_rfc35_shape.py               |   7 -
 autotest/ogr/ogr_rfc35_sqlite.py              |   7 -
 autotest/ogr/ogr_rfc41.py                     |  10 -
 autotest/ogr/ogr_s57.py                       |  17 --
 autotest/ogr/ogr_sde.py                       |  12 --
 autotest/ogr/ogr_sdts.py                      |   2 -
 autotest/ogr/ogr_segukooa.py                  |   6 -
 autotest/ogr/ogr_segy.py                      |   4 -
 autotest/ogr/ogr_selafin.py                   |   7 -
 autotest/ogr/ogr_shape.py                     | 115 ----------
 autotest/ogr/ogr_shape_qix.py                 |   6 -
 autotest/ogr/ogr_shape_sbn.py                 |   4 -
 autotest/ogr/ogr_sosi.py                      |   2 -
 autotest/ogr/ogr_sql_rfc28.py                 |  55 -----
 autotest/ogr/ogr_sql_sqlite.py                |  35 ---
 autotest/ogr/ogr_sql_test.py                  |  51 -----
 autotest/ogr/ogr_sqlite.py                    |  64 ------
 autotest/ogr/ogr_style.py                     |   2 -
 autotest/ogr/ogr_sua.py                       |   2 -
 autotest/ogr/ogr_svg.py                       |   4 -
 autotest/ogr/ogr_sxf.py                       |   4 -
 autotest/ogr/ogr_tiger.py                     |   6 -
 autotest/ogr/ogr_vdv.py                       |  14 --
 autotest/ogr/ogr_vfk.py                       |  13 --
 autotest/ogr/ogr_virtualogr.py                |   7 -
 autotest/ogr/ogr_vrt.py                       |  44 ----
 autotest/ogr/ogr_wasp.py                      |  12 --
 autotest/ogr/ogr_wfs.py                       |  60 ------
 autotest/ogr/ogr_wfs3.py                      |  11 -
 autotest/ogr/ogr_wkbwkt_geom.py               |  13 --
 autotest/ogr/ogr_wktempty.py                  |   1 -
 autotest/ogr/ogr_xls.py                       |   6 -
 autotest/ogr/ogr_xlsx.py                      |  18 --
 autotest/ogr/ogr_xplane.py                    |   6 -
 autotest/ogr/ograpispy.py                     |   5 -
 autotest/osr/osr_basic.py                     |  28 ---
 autotest/osr/osr_compd.py                     |  10 -
 autotest/osr/osr_ct.py                        |  11 -
 autotest/osr/osr_epsg.py                      |  17 --
 autotest/osr/osr_erm.py                       |   4 -
 autotest/osr/osr_esri.py                      |  35 ---
 autotest/osr/osr_getprojectionmethods.py      |   3 -
 autotest/osr/osr_micoordsys.py                |   4 -
 autotest/osr/osr_ozi.py                       |   5 -
 autotest/osr/osr_pci.py                       |   9 -
 autotest/osr/osr_pm.py                        |   5 -
 autotest/osr/osr_proj4.py                     |  32 ---
 autotest/osr/osr_url.py                       |   4 -
 autotest/osr/osr_usgs.py                      |   4 -
 autotest/osr/osr_validate.py                  |   7 -
 autotest/osr/osr_xml.py                       |   3 -
 autotest/pyscripts/test_gdal2tiles.py         |  13 --
 autotest/pyscripts/test_gdal_calc.py          |  10 -
 autotest/pyscripts/test_gdal_edit.py          |  12 --
 autotest/pyscripts/test_gdal_fillnodata.py    |   5 -
 autotest/pyscripts/test_gdal_ls_py.py         |  10 -
 autotest/pyscripts/test_gdal_merge.py         |   8 -
 autotest/pyscripts/test_gdal_pansharpen.py    |   5 -
 autotest/pyscripts/test_gdal_polygonize.py    |   6 -
 autotest/pyscripts/test_gdal_proximity.py     |   6 -
 autotest/pyscripts/test_gdal_retile.py        |   7 -
 autotest/pyscripts/test_gdal_sieve.py         |   3 -
 autotest/pyscripts/test_gdalinfo_py.py        |  12 --
 autotest/pyscripts/test_gdalmove.py           |   4 -
 autotest/pyscripts/test_ogr2ogr_py.py         |  41 ----
 autotest/pyscripts/test_ogrinfo_py.py         |  15 --
 autotest/pyscripts/test_ogrmerge.py           |  14 --
 autotest/pyscripts/test_rgb2pct.py            |   8 -
 autotest/utilities/test_gdal_contour.py       |   8 -
 autotest/utilities/test_gdal_grid.py          |  16 --
 autotest/utilities/test_gdal_grid_lib.py      |   6 -
 autotest/utilities/test_gdal_rasterize.py     |  11 -
 autotest/utilities/test_gdal_rasterize_lib.py |   8 -
 autotest/utilities/test_gdal_translate.py     |  41 ----
 autotest/utilities/test_gdal_translate_lib.py |  26 ---
 autotest/utilities/test_gdaladdo.py           |   7 -
 autotest/utilities/test_gdalbuildvrt.py       |  19 --
 autotest/utilities/test_gdalbuildvrt_lib.py   |   4 -
 autotest/utilities/test_gdaldem.py            |  22 --
 autotest/utilities/test_gdaldem_lib.py        |  20 --
 autotest/utilities/test_gdalinfo.py           |  42 ----
 autotest/utilities/test_gdalinfo_lib.py       |  10 -
 autotest/utilities/test_gdallocationinfo.py   |   8 -
 autotest/utilities/test_gdalsrsinfo.py        |  21 --
 autotest/utilities/test_gdaltindex.py         |   9 -
 autotest/utilities/test_gdaltransform.py      |  11 -
 autotest/utilities/test_gdalwarp.py           |  50 -----
 autotest/utilities/test_gdalwarp_lib.py       |  71 -------
 autotest/utilities/test_gnmutils.py           |   9 -
 autotest/utilities/test_nearblack.py          |  11 -
 autotest/utilities/test_nearblack_lib.py      |   9 -
 autotest/utilities/test_ogr2ogr.py            |  70 ------
 autotest/utilities/test_ogr2ogr_lib.py        |  24 ---
 autotest/utilities/test_ogrinfo.py            |  28 ---
 autotest/utilities/test_ogrlineref.py         |   8 -
 autotest/utilities/test_ogrtindex.py          |   6 -
 387 files changed, 6007 deletions(-)

diff --git a/autotest/alg/applyverticalshiftgrid.py b/autotest/alg/applyverticalshiftgrid.py
index 3c60e3a7eb6d..d9f624d1c07b 100755
--- a/autotest/alg/applyverticalshiftgrid.py
+++ b/autotest/alg/applyverticalshiftgrid.py
@@ -322,15 +322,6 @@ def test_applyverticalshiftgrid_7():
     gdal.Unlink('/vsimem/applyverticalshiftgrid_7.gtx')
 
 
-gdaltest_list = [
-    test_applyverticalshiftgrid_1,
-    test_applyverticalshiftgrid_2,
-    test_applyverticalshiftgrid_3,
-    test_applyverticalshiftgrid_4,
-    test_applyverticalshiftgrid_5,
-    test_applyverticalshiftgrid_6,
-    test_applyverticalshiftgrid_7
-]
 
 if __name__ == '__main__':
 
diff --git a/autotest/alg/contour.py b/autotest/alg/contour.py
index cdaae6a4d5d4..d644ef574965 100755
--- a/autotest/alg/contour.py
+++ b/autotest/alg/contour.py
@@ -283,13 +283,6 @@ def test_contour_cleanup():
 
     
 
-gdaltest_list = [
-    test_contour_1,
-    test_contour_2,
-    test_contour_real_world_case,
-    test_contour_3,
-    test_contour_cleanup
-]
 
 
 if __name__ == '__main__':
diff --git a/autotest/alg/cutline.py b/autotest/alg/cutline.py
index 8fe09ef6b78e..cdfa0284e6ad 100755
--- a/autotest/alg/cutline.py
+++ b/autotest/alg/cutline.py
@@ -120,12 +120,6 @@ def test_cutline_4():
 ###############################################################################
 
 
-gdaltest_list = [
-    test_cutline_1,
-    test_cutline_2,
-    test_cutline_3,
-    test_cutline_4
-]
 
 if __name__ == '__main__':
 
diff --git a/autotest/alg/dither.py b/autotest/alg/dither.py
index b3377ce543e2..65d4f1bf6be2 100755
--- a/autotest/alg/dither.py
+++ b/autotest/alg/dither.py
@@ -95,9 +95,6 @@ def test_dither_1():
 
     
 
-gdaltest_list = [
-    test_dither_1
-]
 
 
 if __name__ == '__main__':
diff --git a/autotest/alg/polygonize.py b/autotest/alg/polygonize.py
index 6c43b603e67f..2e5ac498bc34 100755
--- a/autotest/alg/polygonize.py
+++ b/autotest/alg/polygonize.py
@@ -194,13 +194,6 @@ def test_polygonize_4():
     assert tr
 
 
-gdaltest_list = [
-    test_polygonize_1,
-    test_polygonize_1_float,
-    test_polygonize_2,
-    test_polygonize_3,
-    test_polygonize_4
-]
 
 if __name__ == '__main__':
 
diff --git a/autotest/alg/proximity.py b/autotest/alg/proximity.py
index a6ba81e7a3dc..9530f227b449 100755
--- a/autotest/alg/proximity.py
+++ b/autotest/alg/proximity.py
@@ -132,11 +132,6 @@ def test_proximity_3():
         pytest.fail('got wrong checksum')
     
 
-gdaltest_list = [
-    test_proximity_1,
-    test_proximity_2,
-    test_proximity_3
-]
 
 if __name__ == '__main__':
 
diff --git a/autotest/alg/rasterize.py b/autotest/alg/rasterize.py
index 8730065c3f7b..5b0163e015d6 100755
--- a/autotest/alg/rasterize.py
+++ b/autotest/alg/rasterize.py
@@ -331,14 +331,6 @@ def test_rasterize_6():
     gdal.RasterizeLayer(mask_ds, [1], layer, burn_values=[1], options=["ALL_TOUCHED"])
 
 
-gdaltest_list = [
-    test_rasterize_1,
-    test_rasterize_2,
-    test_rasterize_3,
-    test_rasterize_4,
-    test_rasterize_5,
-    test_rasterize_6
-]
 
 if __name__ == '__main__':
 
diff --git a/autotest/alg/reproject.py b/autotest/alg/reproject.py
index 407afcbb5c16..a96f5807fc68 100755
--- a/autotest/alg/reproject.py
+++ b/autotest/alg/reproject.py
@@ -145,12 +145,6 @@ def test_reproject_4():
 
     
 
-gdaltest_list = [
-    test_reproject_1,
-    test_reproject_2,
-    test_reproject_3,
-    test_reproject_4
-]
 
 if __name__ == '__main__':
 
diff --git a/autotest/alg/sieve.py b/autotest/alg/sieve.py
index b25f67b0a20b..4395d3c1e350 100755
--- a/autotest/alg/sieve.py
+++ b/autotest/alg/sieve.py
@@ -325,16 +325,6 @@ def test_sieve_8():
         pytest.fail('got wrong checksum')
     
 
-gdaltest_list = [
-    test_sieve_1,
-    test_sieve_2,
-    test_sieve_3,
-    test_sieve_4,
-    test_sieve_5,
-    test_sieve_6,
-    test_sieve_7,
-    test_sieve_8
-]
 
 if __name__ == '__main__':
 
diff --git a/autotest/alg/tps.py b/autotest/alg/tps.py
index 17ea356941de..2f14d6f6c33f 100755
--- a/autotest/alg/tps.py
+++ b/autotest/alg/tps.py
@@ -60,9 +60,6 @@ def test_tps_1():
     assert transformer is None
 
 
-gdaltest_list = [
-    test_tps_1,
-]
 
 if __name__ == '__main__':
 
diff --git a/autotest/alg/transformgeoloc.py b/autotest/alg/transformgeoloc.py
index bd42a97c375f..7446b86305b2 100755
--- a/autotest/alg/transformgeoloc.py
+++ b/autotest/alg/transformgeoloc.py
@@ -83,9 +83,6 @@ def test_transformgeoloc_1():
     print(geoloc_ds.ReadAsArray())
 
 
-gdaltest_list = [
-    test_transformgeoloc_1,
-]
 
 if __name__ == '__main__':
 
diff --git a/autotest/alg/warp.py b/autotest/alg/warp.py
index 4976fe5ce463..0e9c186fe2f2 100755
--- a/autotest/alg/warp.py
+++ b/autotest/alg/warp.py
@@ -1685,81 +1685,6 @@ def test_warp_56():
 
     
 
-gdaltest_list = [
-    test_warp_1,
-    test_warp_1_short,
-    test_warp_1_ushort,
-    test_warp_1_float,
-    test_warp_2,
-    test_warp_2_short,
-    test_warp_2_ushort,
-    test_warp_2_downsize,
-    test_warp_3,
-    test_warp_3_short,
-    test_warp_3_ushort,
-    test_warp_3_downsize,
-    test_warp_3_float_downsize,
-    test_warp_4,
-    test_warp_4_short,
-    test_warp_4_ushort,
-    test_warp_4_downsize,
-    test_warp_4_short_downsize,
-    test_warp_4_float_downsize,
-    test_warp_5,
-    test_warp_5_downsize,
-    test_warp_6,
-    test_warp_7,
-    test_warp_8,
-    test_warp_9,
-    test_warp_10,
-    test_warp_11,
-    test_warp_12,
-    test_warp_13,
-    test_warp_14,
-    test_warp_15,
-    test_warp_16,
-    test_warp_17,
-    test_warp_18,
-    test_warp_19,
-    test_warp_20,
-    test_warp_21,
-    test_warp_22,
-    test_warp_23,
-    test_warp_24,
-    test_warp_25,
-    test_warp_26,
-    test_warp_27,
-    test_warp_28,
-    test_warp_29,
-    test_warp_30,
-    test_warp_31,
-    test_warp_32,
-    test_warp_33,
-    test_warp_34,
-    test_warp_35,
-    test_warp_36,
-    test_warp_37,
-    test_warp_38,
-    test_warp_39,
-    test_warp_39,
-    test_warp_40,
-    test_warp_41,
-    test_warp_42,
-    test_warp_43,
-    test_warp_44,
-    test_warp_45,
-    test_warp_46,
-    test_warp_47,
-    test_warp_48,
-    test_warp_49,
-    test_warp_50,
-    test_warp_51,
-    test_warp_52,
-    test_warp_53,
-    test_warp_54,
-    test_warp_55,
-    test_warp_56
-]
 # gdaltest_list = [ warp_55 ]
 
 if __name__ == '__main__':
diff --git a/autotest/gcore/asyncreader.py b/autotest/gcore/asyncreader.py
index 8c56b9998f73..f88a0c2b49fa 100755
--- a/autotest/gcore/asyncreader.py
+++ b/autotest/gcore/asyncreader.py
@@ -64,7 +64,6 @@ def test_asyncreader_1():
 
     
 
-gdaltest_list = [test_asyncreader_1]
 
 
 if __name__ == '__main__':
diff --git a/autotest/gcore/basic_test.py b/autotest/gcore/basic_test.py
index 15f1146d6860..8ffa13179263 100755
--- a/autotest/gcore/basic_test.py
+++ b/autotest/gcore/basic_test.py
@@ -550,24 +550,6 @@ def test_basic_test_17():
 
     
 
-gdaltest_list = [test_basic_test_1,
-                 test_basic_test_strace_non_existing_file,
-                 test_basic_test_2,
-                 test_basic_test_3,
-                 test_basic_test_4,
-                 test_basic_test_5,
-                 test_basic_test_6,
-                 test_basic_test_7,
-                 test_basic_test_8,
-                 test_basic_test_9,
-                 test_basic_test_10,
-                 test_basic_test_11,
-                 test_basic_test_12,
-                 test_basic_test_13,
-                 test_basic_test_14,
-                 test_basic_test_15,
-                 test_basic_test_16,
-                 test_basic_test_17]
 
 
 if __name__ == '__main__':
diff --git a/autotest/gcore/bmp_read.py b/autotest/gcore/bmp_read.py
index a948cf70884d..ee4c0dd11dce 100755
--- a/autotest/gcore/bmp_read.py
+++ b/autotest/gcore/bmp_read.py
@@ -73,7 +73,6 @@ def test_bmp_online_2():
     return tst.testOpen()
 
 
-gdaltest_list = [test_bmp_online_1, test_bmp_online_2]
 
 if __name__ == '__main__':
 
diff --git a/autotest/gcore/bmp_write.py b/autotest/gcore/bmp_write.py
index a68e90c89288..6b156447f9a5 100755
--- a/autotest/gcore/bmp_write.py
+++ b/autotest/gcore/bmp_write.py
@@ -47,7 +47,6 @@ def test_bmp_vsimem():
 ###############################################################################
 # When imported build a list of units based on the files available.
 
-gdaltest_list = [test_bmp_vsimem]
 
 
 init_list = [
diff --git a/autotest/gcore/colortable.py b/autotest/gcore/colortable.py
index 578ca084d0bb..9b34ea8e63fa 100755
--- a/autotest/gcore/colortable.py
+++ b/autotest/gcore/colortable.py
@@ -95,11 +95,6 @@ def test_colortable_cleanup():
     gdaltest.test_ct = None
 
 
-gdaltest_list = [
-    test_colortable_1,
-    test_colortable_2,
-    test_colortable_3,
-    test_colortable_cleanup]
 
 if __name__ == '__main__':
 
diff --git a/autotest/gcore/envi_read.py b/autotest/gcore/envi_read.py
index f8f99f9baa8a..ce3601dcf4c2 100755
--- a/autotest/gcore/envi_read.py
+++ b/autotest/gcore/envi_read.py
@@ -77,7 +77,6 @@ def test_envi_open(filename, checksum):
     ut.testOpen()
 
 
-gdaltest_list = [test_envi_1]
 
 if __name__ == '__main__':
 
diff --git a/autotest/gcore/gcps2geotransform.py b/autotest/gcore/gcps2geotransform.py
index aad8f553570a..bce8670cb825 100755
--- a/autotest/gcore/gcps2geotransform.py
+++ b/autotest/gcore/gcps2geotransform.py
@@ -167,16 +167,6 @@ def test_gcps2gt_8():
     assert gdaltest.geotransform_equals(gt, gt_expected, 0.00001)
 
 
-gdaltest_list = [
-    test_gcps2gt_1,
-    test_gcps2gt_2,
-    test_gcps2gt_3,
-    test_gcps2gt_4,
-    test_gcps2gt_5,
-    test_gcps2gt_6,
-    test_gcps2gt_7,
-    test_gcps2gt_8,
-]
 
 if __name__ == '__main__':
 
diff --git a/autotest/gcore/gdal_api_proxy.py b/autotest/gcore/gdal_api_proxy.py
index ab8bd72bc540..845f25cbd9b5 100755
--- a/autotest/gcore/gdal_api_proxy.py
+++ b/autotest/gcore/gdal_api_proxy.py
@@ -404,10 +404,6 @@ def test_gdal_api_proxy_sub_clean():
     gdal.Unlink('tmp/gdalapiproxysocket')
 
 
-gdaltest_list = [test_gdal_api_proxy_1,
-                 test_gdal_api_proxy_2,
-                 test_gdal_api_proxy_3,
-                 test_gdal_api_proxy_4]
 
 if __name__ == '__main__':
 
diff --git a/autotest/gcore/gdal_stats.py b/autotest/gcore/gdal_stats.py
index e69c6837dce6..b87a5e33a3fd 100755
--- a/autotest/gcore/gdal_stats.py
+++ b/autotest/gcore/gdal_stats.py
@@ -706,35 +706,6 @@ def test_stats_float32_with_nodata_slightly_above_float_max():
 # Run tests
 
 
-gdaltest_list = [
-    test_stats_nan_1,
-    test_stats_nan_2,
-    test_stats_signedbyte,
-    test_stats_dont_force,
-    test_stats_approx_nodata,
-    test_stats_nan_3,
-    test_stats_nan_4,
-    test_stats_nan_5,
-    test_stats_nan_6,
-    test_stats_nan_7,
-    test_stats_nan_8,
-    test_stats_nodata_inf,
-    test_stats_nodata_neginf_linux,
-    test_stats_nodata_neginf_msvc,
-    test_stats_nodata_posinf_linux,
-    test_stats_nodata_posinf_msvc,
-    test_stats_stddev_huge_values,
-    test_stats_square_shape,
-    test_stats_flt_min,
-    test_stats_dbl_min,
-    test_stats_byte_partial_tiles,
-    test_stats_uint16,
-    test_stats_nodata_almost_max_float32,
-    test_stats_approx_stats_flag,
-    test_stats_approx_stats_flag_float,
-    test_stats_all_nodata,
-    test_stats_float32_with_nodata_slightly_above_float_max,
-]
 
 if __name__ == '__main__':
 
diff --git a/autotest/gcore/geoloc.py b/autotest/gcore/geoloc.py
index 72649bb88aeb..f5918d06e6db 100755
--- a/autotest/gcore/geoloc.py
+++ b/autotest/gcore/geoloc.py
@@ -44,8 +44,6 @@ def test_geoloc_1():
     return tst.testOpen(check_filelist=False)
 
 
-gdaltest_list = [
-    test_geoloc_1]
 
 if __name__ == '__main__':
 
diff --git a/autotest/gcore/hdf4_read.py b/autotest/gcore/hdf4_read.py
index 67aae172c308..a2d8cf0e490c 100755
--- a/autotest/gcore/hdf4_read.py
+++ b/autotest/gcore/hdf4_read.py
@@ -306,18 +306,6 @@ def test_hdf4_read_online_10():
     ds = None
 
 
-gdaltest_list = [
-    test_hdf4_read_online_1,
-    test_hdf4_read_online_2,
-    test_hdf4_read_online_3,
-    test_hdf4_read_online_4,
-    test_hdf4_read_online_5,
-    test_hdf4_read_online_6,
-    test_hdf4_read_online_7,
-    test_hdf4_read_online_8,
-    test_hdf4_read_online_9,
-    test_hdf4_read_online_10,
-]
 
 if __name__ == '__main__':
 
diff --git a/autotest/gcore/hfa_read.py b/autotest/gcore/hfa_read.py
index 080f6a99c9b0..759c9d478805 100755
--- a/autotest/gcore/hfa_read.py
+++ b/autotest/gcore/hfa_read.py
@@ -67,7 +67,6 @@ def test_hfa_read_completedefn_recursion():
         gdal.Open('data/hfa_completedefn_recursion.img')
     
 
-gdaltest_list = [test_hfa_read_completedefn_recursion]
 
 if __name__ == '__main__':
 
diff --git a/autotest/gcore/hfa_rfc40.py b/autotest/gcore/hfa_rfc40.py
index 258948ed0ccb..0dcf05be62a7 100755
--- a/autotest/gcore/hfa_rfc40.py
+++ b/autotest/gcore/hfa_rfc40.py
@@ -473,22 +473,6 @@ def test_hfa_rfc40_cleanup():
     gdal.GetDriverByName('HFA').Delete("tmp/test.img")
 
 
-gdaltest_list = [
-    test_hfa_rfc40_1,
-    test_hfa_rfc40_2,
-    test_hfa_rfc40_3,
-    test_hfa_rfc40_4,
-    test_hfa_rfc40_5,
-    test_hfa_rfc40_6,
-    test_hfa_rfc40_7,
-    test_hfa_rfc40_8,
-    test_hfa_rfc40_9,
-    test_hfa_rfc40_10,
-    test_hfa_rfc40_11,
-    test_hfa_rfc40_12,
-    test_hfa_rfc40_13,
-    test_hfa_rfc40_cleanup,
-]
 
 if __name__ == '__main__':
 
diff --git a/autotest/gcore/hfa_write.py b/autotest/gcore/hfa_write.py
index b4d1777031a9..39f45e6a3a1b 100755
--- a/autotest/gcore/hfa_write.py
+++ b/autotest/gcore/hfa_write.py
@@ -423,16 +423,6 @@ def test_hfa_create_compress(filename, checksum, testfunction):
     getattr(ut, testfunction)()
 
 
-gdaltest_list = [test_hfa_write_desc,
-                 test_hfa_write_4bit,
-                 test_hfa_write_4bit_compressed,
-                 test_hfa_write_nd_invalid,
-                 test_hfa_update_overviews,
-                 test_hfa_clean_external_overviews,
-                 test_hfa_bug_2525,
-                 test_hfa_use_rrd,
-                 test_hfa_update_existing_aux_overviews,
-                 test_hfa_write_invalid_wkt]
 
 
 if __name__ == '__main__':
diff --git a/autotest/gcore/histogram.py b/autotest/gcore/histogram.py
index e4c114a32c24..46eb7f89b251 100755
--- a/autotest/gcore/histogram.py
+++ b/autotest/gcore/histogram.py
@@ -129,14 +129,6 @@ def test_histogram_6():
     os.unlink('tmp/albania.jpg')
 
 
-gdaltest_list = [
-    test_histogram_1,
-    test_histogram_2,
-    test_histogram_3,
-    test_histogram_4,
-    test_histogram_5,
-    test_histogram_6
-]
 
 if __name__ == '__main__':
 
diff --git a/autotest/gcore/identify.py b/autotest/gcore/identify.py
index b50363090ffb..3a86630916ca 100755
--- a/autotest/gcore/identify.py
+++ b/autotest/gcore/identify.py
@@ -93,11 +93,6 @@ def test_identify_4():
     assert dr is not None, 'Did not get a driver!'
 
 
-gdaltest_list = [
-    test_identify_1,
-    test_identify_2,
-    test_identify_3,
-    test_identify_4]
 
 if __name__ == '__main__':
 
diff --git a/autotest/gcore/mask.py b/autotest/gcore/mask.py
index 8113007ce780..b9622b3d3fdd 100755
--- a/autotest/gcore/mask.py
+++ b/autotest/gcore/mask.py
@@ -934,38 +934,6 @@ def test_mask_27():
 ###############################################################################
 # Extensive test of real NODATA_VALUES mask for all complex types
 
-gdaltest_list = [
-    test_mask_1,
-    test_mask_2,
-    test_mask_3,
-    test_mask_4,
-    test_mask_5,
-    test_mask_6,
-    test_mask_7,
-    test_mask_8,
-    test_mask_9,
-    test_mask_10,
-    test_mask_11,
-    test_mask_12,
-    test_mask_13,
-    test_mask_14,
-    test_mask_15,
-    test_mask_16,
-    test_mask_17,
-    test_mask_18,
-    test_mask_15_avg,
-    test_mask_16_avg,
-    test_mask_17_avg,
-    test_mask_18_avg,
-    test_mask_19,
-    test_mask_20,
-    test_mask_21,
-    test_mask_22,
-    test_mask_23,
-    test_mask_24,
-    test_mask_25,
-    test_mask_26,
-    test_mask_27]
 
 if __name__ == '__main__':
 
diff --git a/autotest/gcore/minixml.py b/autotest/gcore/minixml.py
index 17c751b613c6..bf300ed44cdc 100755
--- a/autotest/gcore/minixml.py
+++ b/autotest/gcore/minixml.py
@@ -243,16 +243,6 @@ def test_minixml_8():
 def test_minixml_cleanup():
     pass
 
-gdaltest_list = [
-    test_minixml_1,
-    test_minixml_2,
-    test_minixml_3,
-    test_minixml_4,
-    test_minixml_5,
-    test_minixml_6,
-    test_minixml_7,
-    test_minixml_8,
-    test_minixml_cleanup]
 
 if __name__ == '__main__':
 
diff --git a/autotest/gcore/misc.py b/autotest/gcore/misc.py
index 97e277f50b2e..1a28c316d34f 100755
--- a/autotest/gcore/misc.py
+++ b/autotest/gcore/misc.py
@@ -744,22 +744,6 @@ def test_misc_cleanup():
 
     
 
-gdaltest_list = [test_misc_1,
-                 test_misc_2,
-                 test_misc_3,
-                 test_misc_4,
-                 test_misc_5,
-                 test_misc_6,
-                 test_misc_7,
-                 test_misc_8,
-                 test_misc_9,
-                 test_misc_10,
-                 test_misc_11,
-                 test_misc_12,
-                 test_misc_13,
-                 test_misc_14,
-                 test_misc_15,
-                 test_misc_cleanup]
 
 # gdaltest_list = [ misc_6 ]
 
diff --git a/autotest/gcore/nodatamaskband.py b/autotest/gcore/nodatamaskband.py
index 0d38ecdab017..9c3363ccd657 100755
--- a/autotest/gcore/nodatamaskband.py
+++ b/autotest/gcore/nodatamaskband.py
@@ -93,9 +93,6 @@ def test_nodatamaskband_1():
 
     
 
-gdaltest_list = [
-    test_nodatamaskband_1,
-]
 
 if __name__ == '__main__':
 
diff --git a/autotest/gcore/numpy_rw.py b/autotest/gcore/numpy_rw.py
index 9808ed47e55e..d1a041b17f11 100755
--- a/autotest/gcore/numpy_rw.py
+++ b/autotest/gcore/numpy_rw.py
@@ -730,26 +730,6 @@ def test_numpy_rw_cleanup():
     gdaltest.numpy_drv = None
 
 
-gdaltest_list = [
-    test_numpy_rw_1,
-    test_numpy_rw_2,
-    test_numpy_rw_3,
-    test_numpy_rw_4,
-    test_numpy_rw_5,
-    test_numpy_rw_6,
-    test_numpy_rw_7,
-    test_numpy_rw_8,
-    test_numpy_rw_9,
-    test_numpy_rw_10,
-    test_numpy_rw_11,
-    test_numpy_rw_12,
-    test_numpy_rw_13,
-    test_numpy_rw_14,
-    test_numpy_rw_15,
-    test_numpy_rw_16,
-    test_numpy_rw_17,
-    test_numpy_rw_18,
-    test_numpy_rw_cleanup]
 
 if __name__ == '__main__':
 
diff --git a/autotest/gcore/overviewds.py b/autotest/gcore/overviewds.py
index 57dbf15ff4c7..5156fe2dad05 100755
--- a/autotest/gcore/overviewds.py
+++ b/autotest/gcore/overviewds.py
@@ -276,13 +276,6 @@ def test_overviewds_cleanup():
 
     
 
-gdaltest_list = [test_overviewds_1,
-                 test_overviewds_2,
-                 test_overviewds_3,
-                 test_overviewds_4,
-                 test_overviewds_5,
-                 test_overviewds_6,
-                 test_overviewds_cleanup]
 
 if __name__ == '__main__':
 
diff --git a/autotest/gcore/pam.py b/autotest/gcore/pam.py
index 9918face763f..429c5ccf6012 100755
--- a/autotest/gcore/pam.py
+++ b/autotest/gcore/pam.py
@@ -447,21 +447,6 @@ def test_pam_cleanup():
 
     
 
-gdaltest_list = [
-    test_pam_1,
-    test_pam_2,
-    test_pam_3,
-    test_pam_4,
-    test_pam_5,
-    test_pam_6,
-    test_pam_7,
-    test_pam_8,
-    test_pam_9,
-    test_pam_10,
-    test_pam_11,
-    test_pam_12,
-    test_pam_13,
-    test_pam_cleanup]
 
 if __name__ == '__main__':
 
diff --git a/autotest/gcore/pixfun.py b/autotest/gcore/pixfun.py
index 89e5b1cfa0c5..f77c393c0c43 100755
--- a/autotest/gcore/pixfun.py
+++ b/autotest/gcore/pixfun.py
@@ -711,38 +711,6 @@ def test_pixfun_dB2pow():
 
 ###############################################################################
 
-gdaltest_list = [
-    test_pixfun_real_c,
-    test_pixfun_real_r,
-    test_pixfun_imag_c,
-    test_pixfun_imag_r,
-    test_pixfun_complex,
-    test_pixfun_mod_c,
-    test_pixfun_mod_r,
-    test_pixfun_phase_c,
-    test_pixfun_phase_r,
-    test_pixfun_conj_c,
-    test_pixfun_conj_r,
-    test_pixfun_sum_r,
-    test_pixfun_sum_c,
-    test_pixfun_diff_r,
-    test_pixfun_diff_c,
-    test_pixfun_mul_r,
-    test_pixfun_mul_c,
-    test_pixfun_cmul_c,
-    test_pixfun_cmul_r,
-    test_pixfun_inv_r,
-    test_pixfun_inv_c,
-    test_pixfun_intensity_c,
-    test_pixfun_intensity_r,
-    test_pixfun_sqrt,
-    test_pixfun_log10_r,
-    test_pixfun_log10_c,
-    test_pixfun_dB_r,
-    test_pixfun_dB_c,
-    test_pixfun_dB2amp,
-    test_pixfun_dB2pow,
-]
 
 
 if __name__ == '__main__':
diff --git a/autotest/gcore/rasterio.py b/autotest/gcore/rasterio.py
index 555c34179b84..b215f2cf5f0f 100755
--- a/autotest/gcore/rasterio.py
+++ b/autotest/gcore/rasterio.py
@@ -934,26 +934,6 @@ def test_rasterio_resampled_value_is_nodata():
 
     gdal.Unlink('/vsimem/in.asc')
 
-gdaltest_list = [
-    test_rasterio_1,
-    test_rasterio_2,
-    test_rasterio_3,
-    test_rasterio_4,
-    test_rasterio_5,
-    test_rasterio_6,
-    test_rasterio_7,
-    test_rasterio_8,
-    test_rasterio_9,
-    test_rasterio_10,
-    test_rasterio_11,
-    test_rasterio_12,
-    test_rasterio_13,
-    test_rasterio_14,
-    test_rasterio_15,
-    test_rasterio_16,
-    test_rasterio_lanczos_nodata,
-    test_rasterio_resampled_value_is_nodata,
-]
 
 # gdaltest_list = [ rasterio_16 ]
 
diff --git a/autotest/gcore/rat.py b/autotest/gcore/rat.py
index 8ea5c22b4ed6..95d27bda5862 100755
--- a/autotest/gcore/rat.py
+++ b/autotest/gcore/rat.py
@@ -139,11 +139,6 @@ def test_rat_3():
 ##############################################################################
 
 
-gdaltest_list = [
-    test_rat_1,
-    test_rat_2,
-    test_rat_3,
-    None]
 
 if __name__ == '__main__':
 
diff --git a/autotest/gcore/rfc30.py b/autotest/gcore/rfc30.py
index 9dc83ecb56b0..e4df738a2bf1 100755
--- a/autotest/gcore/rfc30.py
+++ b/autotest/gcore/rfc30.py
@@ -116,7 +116,6 @@ def test_rfc30_2():
     assert fd is None, 'did unlink fail on utf8 filename?'
 
 
-gdaltest_list = [test_rfc30_1, test_rfc30_2]
 
 if __name__ == '__main__':
 
diff --git a/autotest/gcore/testnonboundtoswig.py b/autotest/gcore/testnonboundtoswig.py
index 649a15fe74ba..d3973ae15340 100755
--- a/autotest/gcore/testnonboundtoswig.py
+++ b/autotest/gcore/testnonboundtoswig.py
@@ -343,9 +343,6 @@ def test_testnonboundtoswig_VRTDerivedBands():
     assert ref_data == got_data, 'wrong data'
 
 
-gdaltest_list = [test_testnonboundtoswig_init,
-                 test_testnonboundtoswig_GDALSimpleImageWarp,
-                 test_testnonboundtoswig_VRTDerivedBands]
 
 if __name__ == '__main__':
 
diff --git a/autotest/gcore/thread_test.py b/autotest/gcore/thread_test.py
index af98d219867c..587086227480 100755
--- a/autotest/gcore/thread_test.py
+++ b/autotest/gcore/thread_test.py
@@ -83,7 +83,6 @@ def test_thread_test_1():
     return ret
 
 
-gdaltest_list = [test_thread_test_1]
 
 
 if __name__ == '__main__':
diff --git a/autotest/gcore/tiff_ovr.py b/autotest/gcore/tiff_ovr.py
index 31d20b3d31ea..8800936259da 100755
--- a/autotest/gcore/tiff_ovr.py
+++ b/autotest/gcore/tiff_ovr.py
@@ -1960,67 +1960,6 @@ def test_tiff_ovr_average_multiband_vs_singleband():
     assert cs_band == cs_pixel
 
 
-gdaltest_list = [
-    test_tiff_ovr_1,
-    test_tiff_ovr_2,
-    test_tiff_ovr_3,
-    test_tiff_ovr_3bis,
-    test_tiff_ovr_4,
-    test_tiff_ovr_5,
-    test_tiff_ovr_6,
-    test_tiff_ovr_7,
-    test_tiff_ovr_8,
-    test_tiff_ovr_9,
-    test_tiff_ovr_10,
-    test_tiff_ovr_11,
-    test_tiff_ovr_12,
-    test_tiff_ovr_13,
-    test_tiff_ovr_14,
-    test_tiff_ovr_15,
-    test_tiff_ovr_16,
-    test_tiff_ovr_17,
-    test_tiff_ovr_18,
-    test_tiff_ovr_19,
-    test_tiff_ovr_20,
-    test_tiff_ovr_21,
-    test_tiff_ovr_22,
-    test_tiff_ovr_23,
-    test_tiff_ovr_24,
-    test_tiff_ovr_25,
-    test_tiff_ovr_26,
-    test_tiff_ovr_27,
-    test_tiff_ovr_28,
-    test_tiff_ovr_29,
-    test_tiff_ovr_30,
-    test_tiff_ovr_31,
-    test_tiff_ovr_32,
-    test_tiff_ovr_33,
-    test_tiff_ovr_34,
-    test_tiff_ovr_35,
-    test_tiff_ovr_36,
-    test_tiff_ovr_37,
-    test_tiff_ovr_38,
-    test_tiff_ovr_39,
-    test_tiff_ovr_40,
-    test_tiff_ovr_41,
-    test_tiff_ovr_42,
-    test_tiff_ovr_43,
-    test_tiff_ovr_44,
-    test_tiff_ovr_45,
-    test_tiff_ovr_46,
-    test_tiff_ovr_47,
-    test_tiff_ovr_48,
-    test_tiff_ovr_49,
-    test_tiff_ovr_50,
-    test_tiff_ovr_51,
-    test_tiff_ovr_52,
-    test_tiff_ovr_53,
-    test_tiff_ovr_54,
-    test_tiff_ovr_too_many_levels_contig,
-    test_tiff_ovr_too_many_levels_separate,
-    test_tiff_ovr_too_many_levels_external,
-    test_tiff_ovr_average_multiband_vs_singleband
-]
 
 if __name__ == '__main__':
 
diff --git a/autotest/gcore/tiff_read.py b/autotest/gcore/tiff_read.py
index 354dfd440fbd..e01f0acbb042 100755
--- a/autotest/gcore/tiff_read.py
+++ b/autotest/gcore/tiff_read.py
@@ -3147,136 +3147,6 @@ def test_tiff_read_overview_of_external_mask():
 ###############################################################################
 
 
-gdaltest_list = [
-    test_tiff_read_off,
-    test_tiff_check_alpha,
-    test_tiff_read_cmyk_rgba,
-    test_tiff_read_cmyk_raw,
-    test_tiff_read_ojpeg,
-    test_tiff_read_gzip,
-    test_tiff_read_zip_1,
-    test_tiff_read_zip_2,
-    test_tiff_read_zip_3,
-    test_tiff_read_zip_4,
-    test_tiff_read_zip_5,
-    test_tiff_read_tar_1,
-    test_tiff_read_tar_2,
-    test_tiff_read_tgz_1,
-    test_tiff_read_tgz_2,
-    test_tiff_grads,
-    test_tiff_citation,
-    test_tiff_linearparmunits,
-    test_tiff_linearparmunits2,
-    test_tiff_g4_split,
-    test_tiff_multi_images,
-    test_tiff_vsimem,
-    test_tiff_vsizip_and_mem,
-    test_tiff_ProjectedCSTypeGeoKey_only,
-    test_tiff_GTModelTypeGeoKey_only,
-    test_tiff_12bitjpeg,
-    test_tiff_read_stats_from_pam,
-    test_tiff_read_from_tab,
-    test_tiff_read_pixelispoint,
-    test_tiff_read_geomatrix,
-    test_tiff_read_corrupted_gtiff,
-    test_tiff_read_tag_without_null_byte,
-    test_tiff_read_buggy_packbits,
-    test_tiff_read_rpc_txt,
-    test_tiff_read_rpc_tif,
-    test_tiff_small,
-    test_tiff_dos_strip_chop,
-    test_tiff_read_exif_and_gps,
-    test_tiff_jpeg_rgba_pixel_interleaved,
-    test_tiff_jpeg_rgba_band_interleaved,
-    test_tiff_read_huge4GB,
-    test_tiff_read_bigtiff,
-    test_tiff_read_tiff_metadata,
-    test_tiff_read_irregular_tile_size_jpeg_in_tiff,
-    test_tiff_direct_and_virtual_mem_io,
-    test_tiff_read_empty_nodata_tag,
-    test_tiff_read_strace_check,
-    test_tiff_read_readdir_limit_on_open,
-    test_tiff_read_minisblack_as_rgba,
-    test_tiff_read_colortable_as_rgba,
-    test_tiff_read_logl_as_rgba,
-    test_tiff_read_strip_separate_as_rgba,
-    test_tiff_read_tiled_separate_as_rgba,
-    test_tiff_read_scanline_more_than_2GB,
-    test_tiff_read_wrong_number_extrasamples,
-    test_tiff_read_one_strip_no_bytecount,
-
-    test_tiff_read_md1,
-    test_tiff_read_md2,
-    test_tiff_read_md3,
-    test_tiff_read_md4,
-    test_tiff_read_md5,
-    test_tiff_read_md6,
-    test_tiff_read_md7,
-    test_tiff_read_md8,
-    test_tiff_read_md9,
-    test_tiff_read_md10,
-    test_tiff_read_md11,
-    test_tiff_read_md12,
-
-    test_tiff_read_nogeoref,
-    test_tiff_read_inconsistent_georef,
-    test_tiff_read_gcp_internal_and_auxxml,
-
-    test_tiff_read_aux,
-
-    test_tiff_read_one_band_from_two_bands,
-
-    test_tiff_read_jpeg_cloud_optimized,
-    test_tiff_read_corrupted_jpeg_cloud_optimized,
-
-    test_tiff_read_ycbcr_lzw,
-    test_tiff_read_ycbcr_int12,
-
-    test_tiff_read_unit_from_srs,
-    test_tiff_read_arcgis93_geodataxform_gcp,
-    test_tiff_read_block_width_above_32bit,
-    test_tiff_read_image_width_above_32bit,
-    test_tiff_read_second_image_width_above_32bit,
-    test_tiff_read_minimum_tiff_tags_no_warning,
-    test_tiff_read_minimum_tiff_tags_with_warning,
-    test_tiff_read_unknown_compression,
-    test_tiff_read_leak_ZIPSetupDecode,
-    test_tiff_read_excessive_memory_TIFFFillStrip,
-    test_tiff_read_excessive_memory_TIFFFillStrip2,
-    test_tiff_read_excessive_memory_TIFFFillTile,
-    test_tiff_read_big_strip,
-    test_tiff_read_big_strip_chunky_way,
-    test_tiff_read_big_tile,
-    test_tiff_read_huge_tile,
-    test_tiff_read_huge_number_strips,
-    test_tiff_read_huge_implied_number_strips,
-    test_tiff_read_many_blocks,
-    test_tiff_read_many_blocks_truncated,
-    test_tiff_read_uint33,
-    test_tiff_read_corrupted_deflate_singlestrip,
-    test_tiff_read_packbits_not_enough_data,
-    test_tiff_read_toomanyblocks,
-    test_tiff_read_toomanyblocks_separate,
-    test_tiff_read_size_of_stripbytecount_lower_than_stripcount,
-    test_tiff_read_stripoffset_types,
-    test_tiff_read_progressive_jpeg_denial_of_service,
-    test_tiff_read_old_style_lzw,
-    test_tiff_read_mmap_interface,
-    test_tiff_read_jpeg_too_big_last_stripe,
-    test_tiff_read_negative_scaley,
-    test_tiff_read_zstd,
-    test_tiff_read_zstd_corrupted,
-    test_tiff_read_zstd_corrupted2,
-    test_tiff_read_1bit_2bands,
-    test_tiff_read_lerc,
-    test_tiff_read_overview_of_external_mask,
-
-    test_tiff_read_online_1,
-    test_tiff_read_online_2,
-
-    test_tiff_read_webp,
-    test_tiff_read_webp_huge_single_strip,
-]
 
 
 if __name__ == '__main__':
diff --git a/autotest/gcore/tiff_srs.py b/autotest/gcore/tiff_srs.py
index 6d6445945f6a..0b3bf4f55560 100755
--- a/autotest/gcore/tiff_srs.py
+++ b/autotest/gcore/tiff_srs.py
@@ -473,20 +473,6 @@ def test_tiff_srs_proj4(proj4):
     _test_tiff_srs(sr, False)
 
 
-gdaltest_list = [
-    test_tiff_srs_without_linear_units,
-    test_tiff_srs_compd_cs,
-    test_tiff_srs_weird_mercator_2sp,
-    test_tiff_srs_WGS_1984_Web_Mercator_Auxiliary_Sphere,
-    test_tiff_srs_angular_units,
-    test_tiff_custom_datum_known_ellipsoid,
-    test_tiff_srs_epsg_2853_with_us_feet,
-    test_tiff_srs_PCSCitationGeoKey_LUnits,
-    test_tiff_srs_projection_3856,
-    test_tiff_srs_imagine_localcs_citation,
-    test_tiff_srs_towgs84_override,
-    test_tiff_srs_pcscitation,
-]
 
 if __name__ == '__main__':
 
diff --git a/autotest/gcore/tiff_write.py b/autotest/gcore/tiff_write.py
index f057b79c35fc..01754c9fb8c0 100755
--- a/autotest/gcore/tiff_write.py
+++ b/autotest/gcore/tiff_write.py
@@ -6927,206 +6927,6 @@ def test_tiff_write_cleanup():
     gdaltest.tiff_drv = None
 
 
-gdaltest_list = [
-    test_tiff_write_1,
-    test_tiff_write_2,
-    test_tiff_write_3,
-    test_tiff_write_4,
-    test_tiff_write_5,
-    test_tiff_write_6,
-    test_tiff_write_7,
-    test_tiff_write_8,
-    test_tiff_write_9,
-    test_tiff_write_10,
-    test_tiff_write_11,
-    test_tiff_write_12,
-    test_tiff_write_13,
-    test_tiff_write_14,
-    test_tiff_write_15,
-    test_tiff_write_16,
-    test_tiff_write_17,
-    test_tiff_write_17_disable_readdir,
-    test_tiff_write_18,
-    test_tiff_write_18_disable_readdir,
-    test_tiff_write_rpc_txt,
-    test_tiff_write_rpc_in_pam,
-    test_tiff_write_19,
-    test_tiff_write_20,
-    test_tiff_write_21,
-    test_tiff_write_22,
-    test_tiff_write_23,
-    test_tiff_write_24,
-    test_tiff_write_25,
-    test_tiff_write_26,
-    test_tiff_write_27,
-    test_tiff_write_28,
-    test_tiff_write_29,
-    test_tiff_write_30,
-    test_tiff_write_31,
-    test_tiff_write_32,
-    test_tiff_write_33,
-    test_tiff_write_34,
-    test_tiff_write_35,
-    test_tiff_write_36,
-    test_tiff_write_37,
-    test_tiff_write_38,
-    test_tiff_write_39,
-    test_tiff_write_40,
-    test_tiff_write_41,
-    test_tiff_write_42,
-    test_tiff_write_43,
-    test_tiff_write_44,
-    test_tiff_write_45,
-    test_tiff_write_46,
-    test_tiff_write_47,
-    test_tiff_write_48,
-    test_tiff_write_49,
-    test_tiff_write_50,
-    test_tiff_write_51,
-    test_tiff_write_52,
-    test_tiff_write_53,
-    test_tiff_write_53_bis,
-    test_tiff_write_54,
-    test_tiff_write_55,
-    test_tiff_write_56,
-    test_tiff_write_57,
-    test_tiff_write_58,
-    test_tiff_write_59,
-    test_tiff_write_60,
-    test_tiff_write_61,
-    test_tiff_write_62,
-    test_tiff_write_63,
-    test_tiff_write_64,
-    test_tiff_write_65,
-    test_tiff_write_66,
-    test_tiff_write_67,
-    test_tiff_write_68,
-    test_tiff_write_69,
-    test_tiff_write_70,
-    test_tiff_write_71,
-    test_tiff_write_72,
-    test_tiff_write_73,
-    test_tiff_write_74,
-    test_tiff_write_75,
-    test_tiff_write_76,
-    test_tiff_write_77,
-    test_tiff_write_78,
-    test_tiff_write_79,
-    test_tiff_write_80,
-    test_tiff_write_81,
-    test_tiff_write_82,
-    test_tiff_write_83,
-    test_tiff_write_84,
-    test_tiff_write_85,
-    test_tiff_write_86,
-    test_tiff_write_87,
-    test_tiff_write_88,
-    test_tiff_write_89,  # leaks mem
-    test_tiff_write_90,  # leaks mem
-    test_tiff_write_91,  # leaks mem
-    test_tiff_write_92,  # leaks mem
-    test_tiff_write_93,  # leaks mem
-    test_tiff_write_94,  # leaks mem
-    test_tiff_write_95,
-    test_tiff_write_96,  # leaks mem
-    test_tiff_write_97,
-    test_tiff_write_98,
-    test_tiff_write_99,
-    test_tiff_write_100,
-    test_tiff_write_101,
-    test_tiff_write_102,
-    test_tiff_write_103,
-    test_tiff_write_104,
-    test_tiff_write_105,
-    test_tiff_write_106,
-    test_tiff_write_107,
-    test_tiff_write_108,
-    test_tiff_write_109,
-    test_tiff_write_110,
-    test_tiff_write_111,
-    test_tiff_write_111_bis,
-    test_tiff_write_111_ter,
-    test_tiff_write_112,
-    test_tiff_write_113,
-    test_tiff_write_114,
-    test_tiff_write_115,
-    test_tiff_write_116,
-    test_tiff_write_117,
-    test_tiff_write_118,
-    test_tiff_write_119,
-    test_tiff_write_120,
-    test_tiff_write_121,
-    test_tiff_write_122,
-    test_tiff_write_123,
-    test_tiff_write_124,
-    test_tiff_write_125,
-    test_tiff_write_126,
-    test_tiff_write_127,
-    test_tiff_write_128,
-    test_tiff_write_129,
-    test_tiff_write_130,
-    test_tiff_write_131,
-    test_tiff_write_131_level_9,
-    test_tiff_write_132,
-    test_tiff_write_133,
-    test_tiff_write_134,
-    test_tiff_write_135,
-    test_tiff_write_136,
-    test_tiff_write_137,
-    test_tiff_write_138,
-    test_tiff_write_139,
-    test_tiff_write_140,
-    test_tiff_write_141,
-    test_tiff_write_142,
-    test_tiff_write_143,
-    test_tiff_write_144,
-    test_tiff_write_145,
-    test_tiff_write_146,
-    test_tiff_write_147,
-    test_tiff_write_148,
-    test_tiff_write_149,
-    test_tiff_write_150,
-    test_tiff_write_151,
-    test_tiff_write_152,
-    test_tiff_write_153,
-    test_tiff_write_154,
-    test_tiff_write_155,
-    test_tiff_write_156,
-    test_tiff_write_157,
-    test_tiff_write_158,
-    test_tiff_write_159,
-    test_tiff_write_160,
-    test_tiff_write_161,
-    test_tiff_write_162,
-    test_tiff_write_163,
-    test_tiff_write_164,
-    test_tiff_write_165,
-    test_tiff_write_166,
-    test_tiff_write_167_deflate_zlevel,
-    test_tiff_write_168_ccitfax3,
-    test_tiff_write_169_ccitrle,
-    test_tiff_write_170_invalid_compresion,
-    test_tiff_write_171_zstd,
-    test_tiff_write_171_zstd_predictor,
-    test_tiff_write_172_geometadata_tiff_rsid,
-    test_tiff_write_173_lerc,
-    test_tiff_write_174_lerc_deflate,
-    test_tiff_write_174_lerc_deflate_with_level,
-    test_tiff_write_175_lerc_zstd,
-    test_tiff_write_175_lerc_zstd_with_level,
-    test_tiff_write_176_lerc_max_z_error,
-    test_tiff_write_177_lerc_several_bands_tiling,
-    test_tiff_write_178_lerc_with_alpha,
-    test_tiff_write_178_lerc_with_alpha_0_and_255,
-    test_tiff_write_179_lerc_data_types,
-    test_tiff_write_180_lerc_separate,
-    test_tiff_write_181_xmp,
-    test_tiff_write_182_xmp_delete,
-    # tiff_write_api_proxy,
-    test_tiff_write_webp,
-    test_tiff_write_tiled_webp,
-    test_tiff_write_webp_huge_single_strip,
-    test_tiff_write_cleanup]
 
 
 # gdaltest_list = [ tiff_write_1, tiff_write_176_lerc_max_z_error ]
diff --git a/autotest/gcore/transformer.py b/autotest/gcore/transformer.py
index b13b753aa049..72bc79556735 100755
--- a/autotest/gcore/transformer.py
+++ b/autotest/gcore/transformer.py
@@ -714,25 +714,6 @@ def test_transformer_17():
     assert tr is None
 
 
-gdaltest_list = [
-    test_transformer_1,
-    test_transformer_2,
-    test_transformer_3,
-    test_transformer_4,
-    test_transformer_5,
-    test_transformer_6,
-    test_transformer_7,
-    test_transformer_8,
-    test_transformer_9,
-    test_transformer_10,
-    test_transformer_11,
-    test_transformer_12,
-    test_transformer_13,
-    test_transformer_14,
-    test_transformer_15,
-    test_transformer_16,
-    test_transformer_17
-]
 
 disabled_gdaltest_list = [
     test_transformer_11
diff --git a/autotest/gcore/virtualmem.py b/autotest/gcore/virtualmem.py
index ddf01dc5eccf..0efa2ace28a6 100755
--- a/autotest/gcore/virtualmem.py
+++ b/autotest/gcore/virtualmem.py
@@ -250,10 +250,6 @@ def test_virtualmem_4():
 
     
 
-gdaltest_list = [test_virtualmem_1,
-                 test_virtualmem_2,
-                 test_virtualmem_3,
-                 test_virtualmem_4]
 
 
 if __name__ == '__main__':
diff --git a/autotest/gcore/vrt_read.py b/autotest/gcore/vrt_read.py
index ab35e42666db..5712460759a9 100755
--- a/autotest/gcore/vrt_read.py
+++ b/autotest/gcore/vrt_read.py
@@ -1185,44 +1185,6 @@ def test_vrt_dstsize_larger_than_source():
     assert cs == 33273
 
 
-gdaltest_list = [
-    test_vrt_read_1,
-    test_vrt_read_2,
-    test_vrt_read_3,
-    test_vrt_read_4,
-    test_vrt_read_5,
-    test_vrt_read_6,
-    test_vrt_read_7,
-    test_vrt_read_8,
-    test_vrt_read_9,
-    test_vrt_read_10,
-    test_vrt_read_11,
-    test_vrt_read_12,
-    test_vrt_read_13,
-    test_vrt_read_14,
-    test_vrt_read_15,
-    test_vrt_read_16,
-    test_vrt_read_17,
-    test_vrt_read_18,
-    test_vrt_read_19,
-    test_vrt_read_20,
-    test_vrt_read_21,
-    test_vrt_read_22,
-    test_vrt_read_23,
-    test_vrt_read_24,
-    test_vrt_read_25,
-    test_vrt_read_26,
-    test_vrt_read_27,
-    test_vrt_read_28,
-    test_vrt_read_29,
-    test_vrt_read_30,
-    test_vrt_read_31,
-    test_vrt_float32_with_nodata_slightly_below_float_min,
-    test_vrt_subpixel_offset,
-    test_vrt_dstsize_larger_than_source,
-]
-
-
 if __name__ == '__main__':
 
     gdaltest.setup_run('vrt_read')
diff --git a/autotest/gcore/vrtmisc.py b/autotest/gcore/vrtmisc.py
index 2d859692b715..c335204c1ca4 100755
--- a/autotest/gcore/vrtmisc.py
+++ b/autotest/gcore/vrtmisc.py
@@ -505,29 +505,6 @@ def test_vrtmisc_histogram():
 def test_vrtmisc_cleanup():
     pass
 
-gdaltest_list = [
-    test_vrtmisc_1,
-    test_vrtmisc_2,
-    test_vrtmisc_3,
-    test_vrtmisc_4,
-    test_vrtmisc_5,
-    test_vrtmisc_6,
-    test_vrtmisc_7,
-    test_vrtmisc_8,
-    test_vrtmisc_9,
-    test_vrtmisc_10,
-    test_vrtmisc_11,
-    test_vrtmisc_12,
-    test_vrtmisc_13,
-    test_vrtmisc_14,
-    test_vrtmisc_15,
-    test_vrtmisc_16,
-    test_vrtmisc_17,
-    test_vrtmisc_18,
-    test_vrtmisc_rat,
-    test_vrtmisc_colortable,
-    test_vrtmisc_histogram,
-    test_vrtmisc_cleanup]
 
 if __name__ == '__main__':
 
diff --git a/autotest/gcore/vsiaz.py b/autotest/gcore/vsiaz.py
index 2bb13ff6ea01..91dabb2c207d 100755
--- a/autotest/gcore/vsiaz.py
+++ b/autotest/gcore/vsiaz.py
@@ -885,17 +885,6 @@ def test_vsiaz_cleanup():
 
     
 
-gdaltest_list = [test_vsiaz_init,
-                 test_vsiaz_real_server_errors,
-                 test_vsiaz_start_webserver,
-                 test_vsiaz_fake_basic,
-                 test_vsiaz_fake_readdir,
-                 test_vsiaz_fake_write,
-                 test_vsiaz_fake_unlink,
-                 test_vsiaz_fake_mkdir_rmdir,
-                 test_vsiaz_fake_test_BlobEndpointInConnectionString,
-                 test_vsiaz_stop_webserver,
-                 test_vsiaz_cleanup]
 
 # gdaltest_list = [ vsiaz_init, vsiaz_start_webserver, vsiaz_fake_mkdir_rmdir, vsiaz_stop_webserver, vsiaz_cleanup ]
 
diff --git a/autotest/gcore/vsicrypt.py b/autotest/gcore/vsicrypt.py
index 971c34e4666f..d0d4488d89b5 100755
--- a/autotest/gcore/vsicrypt.py
+++ b/autotest/gcore/vsicrypt.py
@@ -522,12 +522,6 @@ def test_vsicrypt_6():
     gdal.Unlink('/vsimem/file.bin')
 
 
-gdaltest_list = [test_vsicrypt_1,
-                 test_vsicrypt_2,
-                 test_vsicrypt_3,
-                 test_vsicrypt_4,
-                 test_vsicrypt_5,
-                 test_vsicrypt_6]
 
 if __name__ == '__main__':
 
diff --git a/autotest/gcore/vsicurl.py b/autotest/gcore/vsicurl.py
index 73b9e43b2ad2..15196cc38eb1 100755
--- a/autotest/gcore/vsicurl.py
+++ b/autotest/gcore/vsicurl.py
@@ -463,24 +463,6 @@ def test_vsicurl_stop_webserver():
     webserver.server_stop(gdaltest.webserver_process, gdaltest.webserver_port)
 
 
-gdaltest_list = [test_vsicurl_1,
-                 # vsicurl_2,
-                 # vsicurl_3,
-                 test_vsicurl_4,
-                 test_vsicurl_5,
-                 #vsicurl_6_disabled,
-                 test_vsicurl_7,
-                 # vsicurl_8,
-                 test_vsicurl_9,
-                 test_vsicurl_10,
-                 test_vsicurl_11,
-                 test_vsicurl_start_webserver,
-                 test_vsicurl_test_redirect,
-                 test_vsicurl_test_clear_cache,
-                 test_vsicurl_test_retry,
-                 test_vsicurl_test_fallback_from_head_to_get,
-                 test_vsicurl_test_parse_html_filelist_apache,
-                 test_vsicurl_stop_webserver]
 
 if __name__ == '__main__':
 
diff --git a/autotest/gcore/vsicurl_streaming.py b/autotest/gcore/vsicurl_streaming.py
index eccdfdc60048..30cbc0e9751b 100755
--- a/autotest/gcore/vsicurl_streaming.py
+++ b/autotest/gcore/vsicurl_streaming.py
@@ -120,7 +120,6 @@ def test_vsicurl_streaming_1():
     gdal.VSIFCloseL(fp)
 
 
-gdaltest_list = [test_vsicurl_streaming_1]
 
 if __name__ == '__main__':
 
diff --git a/autotest/gcore/vsifile.py b/autotest/gcore/vsifile.py
index 708bf97918ab..b2e3d2602ffb 100755
--- a/autotest/gcore/vsifile.py
+++ b/autotest/gcore/vsifile.py
@@ -834,32 +834,6 @@ def test_vsifile_opendir():
     gdal.RmdirRecursive('/vsimem/vsifile_opendir')
 
 
-gdaltest_list = [test_vsifile_1,
-                 test_vsifile_2,
-                 test_vsifile_3,
-                 test_vsifile_4,
-                 test_vsifile_5,
-                 test_vsifile_6,
-                 test_vsifile_7,
-                 test_vsifile_8,
-                 test_vsifile_9,
-                 test_vsifile_10,
-                 test_vsifile_11,
-                 test_vsifile_12,
-                 test_vsifile_13,
-                 test_vsifile_14,
-                 test_vsifile_15,
-                 test_vsifile_16,
-                 test_vsifile_17,
-                 test_vsifile_18,
-                 test_vsifile_19,
-                 test_vsifile_20,
-                 test_vsifile_21,
-                 test_vsifile_22,
-                 test_vsitar_bug_675,
-                 test_vsigzip_multi_thread,
-                 test_vsifile_opendir,
-                 test_vsisync]
 
 if __name__ == '__main__':
 
diff --git a/autotest/gcore/vsigs.py b/autotest/gcore/vsigs.py
index 8ca899f885c7..49b9b49e4b6f 100755
--- a/autotest/gcore/vsigs.py
+++ b/autotest/gcore/vsigs.py
@@ -1190,22 +1190,6 @@ def test_vsigs_cleanup():
 
     
 
-gdaltest_list = [test_vsigs_init,
-                 test_vsigs_1,
-                 test_vsigs_start_webserver,
-                 test_vsigs_2,
-                 test_vsigs_readdir,
-                 test_vsigs_write,
-                 test_vsigs_read_credentials_refresh_token_default_gdal_app,
-                 test_vsigs_read_credentials_refresh_token_custom_app,
-                 test_vsigs_read_credentials_oauth2_service_account,
-                 test_vsigs_read_credentials_oauth2_service_account_json_file,
-                 test_vsigs_read_credentials_file,
-                 test_vsigs_read_credentials_file_refresh_token,
-                 test_vsigs_read_credentials_gce,
-                 test_vsigs_read_credentials_gce_expiration,
-                 test_vsigs_stop_webserver,
-                 test_vsigs_cleanup]
 
 # gdaltest_list = [ vsigs_init, vsigs_start_webserver, vsigs_write, vsigs_stop_webserver, vsigs_cleanup ]
 
diff --git a/autotest/gcore/vsihdfs.py b/autotest/gcore/vsihdfs.py
index f0ec7ac0511a..21f5efc40f43 100755
--- a/autotest/gcore/vsihdfs.py
+++ b/autotest/gcore/vsihdfs.py
@@ -151,13 +151,6 @@ def test_vsihdfs_7():
     assert len(lst) >= 360
 
 
-gdaltest_list = [test_vsihdfs_1,
-                 test_vsihdfs_2,
-                 test_vsihdfs_3,
-                 test_vsihdfs_4,
-                 test_vsihdfs_5,
-                 test_vsihdfs_6,
-                 test_vsihdfs_7]
 
 if __name__ == '__main__':
 
diff --git a/autotest/gcore/vsioss.py b/autotest/gcore/vsioss.py
index eec7d38840b1..dcc5ca5cb690 100755
--- a/autotest/gcore/vsioss.py
+++ b/autotest/gcore/vsioss.py
@@ -1117,19 +1117,6 @@ def test_visoss_cleanup():
 
     
 
-gdaltest_list = [test_visoss_init,
-                 test_visoss_1,
-                 test_visoss_real_test,
-                 test_visoss_start_webserver,
-                 test_visoss_2,
-                 test_visoss_3,
-                 test_visoss_4,
-                 test_visoss_5,
-                 test_visoss_6,
-                 test_visoss_7,
-                 test_visoss_8,
-                 test_visoss_stop_webserver,
-                 test_visoss_cleanup]
 
 # gdaltest_list = [ visoss_init, visoss_start_webserver, visoss_8, visoss_stop_webserver, visoss_cleanup ]
 
diff --git a/autotest/gcore/vsis3.py b/autotest/gcore/vsis3.py
index c1e06d657264..c7f433204110 100755
--- a/autotest/gcore/vsis3.py
+++ b/autotest/gcore/vsis3.py
@@ -2418,29 +2418,6 @@ def test_vsis3_cleanup():
     gdal.SetConfigOption('CPL_AWS_EC2_CREDENTIALS_URL', None)
 
 
-gdaltest_list = [test_vsis3_init,
-                 test_vsis3_no_sign_request,
-                 test_vsis3_1,
-                 test_vsis3_start_webserver,
-                 test_vsis3_2,
-                 test_vsis3_readdir,
-                 test_vsis3_opendir,
-                 test_vsis3_4,
-                 test_vsis3_5,
-                 test_vsis3_6,
-                 test_vsis3_7,
-                 test_vsis3_8,
-                 test_vsis3_sync_etag,
-                 test_vsis3_sync_timestamp,
-                 test_vsis3_read_credentials_file,
-                 test_vsis3_read_config_file,
-                 test_vsis3_read_credentials_config_file,
-                 test_vsis3_read_credentials_config_file_non_default,
-                 test_vsis3_read_credentials_config_file_inconsistent,
-                 test_vsis3_read_credentials_ec2,
-                 test_vsis3_read_credentials_ec2_expiration,
-                 test_vsis3_stop_webserver,
-                 test_vsis3_cleanup]
 
 # gdaltest_list = [ vsis3_init, vsis3_start_webserver, vsis3_opendir, vsis3_stop_webserver, vsis3_cleanup ]
 
diff --git a/autotest/gcore/vsistdin.py b/autotest/gcore/vsistdin.py
index ff3f77a0bd4a..749d030276cc 100755
--- a/autotest/gcore/vsistdin.py
+++ b/autotest/gcore/vsistdin.py
@@ -130,7 +130,6 @@ def test_vsistdin_4():
     gdal.Unlink("tmp/vsistdin_4_out.tif")
 
 
-gdaltest_list = [test_vsistdin_1, test_vsistdin_2, test_vsistdin_3, test_vsistdin_4]
 
 
 if __name__ == '__main__':
diff --git a/autotest/gcore/vsiswift.py b/autotest/gcore/vsiswift.py
index 323360183723..3fd4d8ff4eb6 100644
--- a/autotest/gcore/vsiswift.py
+++ b/autotest/gcore/vsiswift.py
@@ -699,18 +699,6 @@ def test_vsiswift_cleanup():
 
     
 
-gdaltest_list = [test_vsiswift_init,
-                 test_vsiswift_real_server_errors,
-                 test_vsiswift_start_webserver,
-                 test_vsiswift_fake_auth_v1_url,
-                 test_vsiswift_fake_auth_storage_url_and_auth_token,
-                 test_vsiswift_stat,
-                 test_vsiswift_fake_readdir,
-                 test_vsiswift_fake_write,
-                 test_vsiswift_fake_unlink,
-                 test_vsiswift_fake_mkdir_rmdir,
-                 test_vsiswift_stop_webserver,
-                 test_vsiswift_cleanup]
 
 # gdaltest_list = [ vsiswift_init, vsiswift_start_webserver, vsiswift_fake_mkdir_rmdir, vsiswift_stop_webserver, vsiswift_cleanup ]
 
diff --git a/autotest/gcore/vsiwebhdfs.py b/autotest/gcore/vsiwebhdfs.py
index 194645e1c072..82142c677cf4 100644
--- a/autotest/gcore/vsiwebhdfs.py
+++ b/autotest/gcore/vsiwebhdfs.py
@@ -563,16 +563,6 @@ def test_vsiwebhdfs_cleanup():
 
     
 
-gdaltest_list = [test_vsiwebhdfs_init,
-                 test_vsiwebhdfs_start_webserver,
-                 test_vsiwebhdfs_open,
-                 test_vsiwebhdfs_stat,
-                 test_vsiwebhdfs_readdir,
-                 test_vsiwebhdfs_write,
-                 test_vsiwebhdfs_unlink,
-                 test_vsiwebhdfs_mkdir_rmdir,
-                 test_vsiwebhdfs_stop_webserver,
-                 test_vsiwebhdfs_cleanup]
 
 gdaltest_list_extra = [vsiwebhdfs_extra_1]
 
diff --git a/autotest/gcore/vsizip.py b/autotest/gcore/vsizip.py
index e2f5833c638c..0b6c15870167 100755
--- a/autotest/gcore/vsizip.py
+++ b/autotest/gcore/vsizip.py
@@ -642,26 +642,6 @@ def test_vsizip_byte_zip64_local_header_zeroed():
     size = gdal.VSIStatL('/vsizip/data/byte_zip64_local_header_zeroed.zip/byte.tif').size
     assert size == 736
 
-gdaltest_list = [test_vsizip_1,
-                 test_vsizip_2,
-                 test_vsizip_3,
-                 test_vsizip_4,
-                 test_vsizip_5,
-                 test_vsizip_6,
-                 test_vsizip_7,
-                 test_vsizip_8,
-                 test_vsizip_9,
-                 test_vsizip_10,
-                 test_vsizip_11,
-                 test_vsizip_12,
-                 test_vsizip_13,
-                 test_vsizip_14,
-                 test_vsizip_multi_thread,
-                 test_vsizip_multi_thread_below_threshold,
-                 test_vsizip_create_zip64,
-                 test_vsizip_create_zip64_stream_larger_than_4G,
-                 test_vsizip_byte_zip64_local_header_zeroed,
-                 ]
 
 
 if __name__ == '__main__':
diff --git a/autotest/gdrivers/aaigrid.py b/autotest/gdrivers/aaigrid.py
index cba7866175d9..173a0869f735 100755
--- a/autotest/gdrivers/aaigrid.py
+++ b/autotest/gdrivers/aaigrid.py
@@ -355,24 +355,6 @@ def test_aaigrid_15():
 ###############################################################################
 
 
-gdaltest_list = [
-    test_aaigrid_1,
-    test_aaigrid_2,
-    test_aaigrid_comma,
-    test_aaigrid_3,
-    test_aaigrid_4,
-    test_aaigrid_5,
-    test_aaigrid_6,
-    test_aaigrid_6bis,
-    test_aaigrid_7,
-    test_aaigrid_8,
-    test_aaigrid_9,
-    test_aaigrid_10,
-    test_aaigrid_11,
-    test_aaigrid_12,
-    test_aaigrid_13,
-    test_aaigrid_14,
-    test_aaigrid_15]
 
 if __name__ == '__main__':
 
diff --git a/autotest/gdrivers/ace2.py b/autotest/gdrivers/ace2.py
index be61f932cae4..60bbf40d6698 100755
--- a/autotest/gdrivers/ace2.py
+++ b/autotest/gdrivers/ace2.py
@@ -65,8 +65,6 @@ def test_ace2_1():
     return ret
 
 
-gdaltest_list = [
-    test_ace2_1]
 
 if __name__ == '__main__':
 
diff --git a/autotest/gdrivers/adrg.py b/autotest/gdrivers/adrg.py
index 305da669e29f..584dba21321c 100755
--- a/autotest/gdrivers/adrg.py
+++ b/autotest/gdrivers/adrg.py
@@ -179,15 +179,6 @@ def test_adrg_zna_18():
 
 
 ###############################################################################
-gdaltest_list = [
-    test_adrg_read_gen,
-    test_adrg_read_transh,
-    test_adrg_read_subdataset_img,
-    test_adrg_copy,
-    test_adrg_2subdatasets,
-    test_adrg_copy_vsimem,
-    test_adrg_zna_9,
-    test_adrg_zna_18]
 
 if __name__ == '__main__':
 
diff --git a/autotest/gdrivers/aigrid.py b/autotest/gdrivers/aigrid.py
index f33689d0e582..5e87386bd489 100755
--- a/autotest/gdrivers/aigrid.py
+++ b/autotest/gdrivers/aigrid.py
@@ -213,15 +213,6 @@ def test_aigrid_online_2():
 ###############################################################################
 
 
-gdaltest_list = [
-    test_aigrid_1,
-    test_aigrid_2,
-    test_aigrid_3,
-    test_aigrid_4,
-    test_aigrid_5,
-    test_aigrid_6,
-    test_aigrid_online_1,
-    test_aigrid_online_2]
 
 if __name__ == '__main__':
 
diff --git a/autotest/gdrivers/arg.py b/autotest/gdrivers/arg.py
index 705e62239ff2..2c0d34df0630 100755
--- a/autotest/gdrivers/arg.py
+++ b/autotest/gdrivers/arg.py
@@ -319,16 +319,6 @@ def test_arg_destroy():
 
     
 
-gdaltest_list = [
-    test_arg_init,
-    test_arg_unsupported,
-    test_arg_getrastercount,
-    test_arg_getgeotransform,
-    test_arg_blocksize,
-    test_arg_layername,
-    test_arg_nodata,
-    test_arg_byteorder,
-    test_arg_destroy]
 
 if __name__ == '__main__':
 
diff --git a/autotest/gdrivers/bag.py b/autotest/gdrivers/bag.py
index fafebf28a4e2..85ad5c22e4cd 100755
--- a/autotest/gdrivers/bag.py
+++ b/autotest/gdrivers/bag.py
@@ -668,18 +668,6 @@ def test_bag_write_south_up():
     gdal.Unlink('/vsimem/out.bag')
 
 
-gdaltest_list = [test_bag_2,
-                 test_bag_3,
-                 test_bag_vr_normal,
-                 test_bag_vr_list_supergrids,
-                 test_bag_vr_open_supergrids,
-                 test_bag_vr_resampled,
-                 test_bag_vr_resampled_mask,
-                 test_bag_vr_resampled_interpolated,
-                 test_bag_write_single_band,
-                 test_bag_write_two_bands,
-                 test_bag_write_south_up,
-                 ]
 
 if __name__ == '__main__':
 
diff --git a/autotest/gdrivers/blx.py b/autotest/gdrivers/blx.py
index 2b3a9ab48a38..eb439504f3f1 100755
--- a/autotest/gdrivers/blx.py
+++ b/autotest/gdrivers/blx.py
@@ -98,13 +98,6 @@ def test_blx_5():
     assert cs == 12058, ('wrong overview checksum (%d)' % cs)
 
 
-gdaltest_list = [
-    test_blx_1,
-    test_blx_2,
-    test_blx_3,
-    test_blx_4,
-    test_blx_5
-]
 
 
 if __name__ == '__main__':
diff --git a/autotest/gdrivers/bsb.py b/autotest/gdrivers/bsb.py
index cb6926c8cc8e..b0c5431df9f1 100755
--- a/autotest/gdrivers/bsb.py
+++ b/autotest/gdrivers/bsb.py
@@ -135,15 +135,6 @@ def test_bsb_6():
     return ret
 
 
-gdaltest_list = [
-    test_bsb_0,
-    test_bsb_1,
-    test_bsb_2,
-    test_bsb_3,
-    test_bsb_4,
-    test_bsb_5,
-    test_bsb_6
-]
 
 
 if __name__ == '__main__':
diff --git a/autotest/gdrivers/bt.py b/autotest/gdrivers/bt.py
index b37bca8efd8b..2e6815440e4d 100755
--- a/autotest/gdrivers/bt.py
+++ b/autotest/gdrivers/bt.py
@@ -109,14 +109,6 @@ def test_bt_cleanup():
     gdal.Unlink('tmp/float32.tif.prj')
 
 
-gdaltest_list = [
-    test_bt_1,
-    test_bt_2,
-    test_bt_3,
-    test_bt_4,
-    test_bt_5,
-    test_bt_6,
-    test_bt_cleanup]
 
 if __name__ == '__main__':
 
diff --git a/autotest/gdrivers/byn.py b/autotest/gdrivers/byn.py
index c583427d8fa9..1c01c728e596 100755
--- a/autotest/gdrivers/byn.py
+++ b/autotest/gdrivers/byn.py
@@ -55,9 +55,6 @@ def test_byn_2():
 ###############################################################################
 #
 
-gdaltest_list = [
-    test_byn_1,
-    test_byn_2]
 
 if __name__ == '__main__':
 
diff --git a/autotest/gdrivers/cals.py b/autotest/gdrivers/cals.py
index 91c6787431ac..21f4d8aa59ec 100755
--- a/autotest/gdrivers/cals.py
+++ b/autotest/gdrivers/cals.py
@@ -140,13 +140,6 @@ def test_cals_5():
 ###############################################################################
 
 
-gdaltest_list = [
-    test_cals_1,
-    test_cals_2,
-    test_cals_3,
-    test_cals_4,
-    test_cals_5,
-]
 
 
 if __name__ == '__main__':
diff --git a/autotest/gdrivers/ceos.py b/autotest/gdrivers/ceos.py
index ae124654e242..b7c61392d101 100755
--- a/autotest/gdrivers/ceos.py
+++ b/autotest/gdrivers/ceos.py
@@ -45,8 +45,6 @@ def test_ceos_1():
     return tst.testOpen()
 
 
-gdaltest_list = [
-    test_ceos_1]
 
 if __name__ == '__main__':
 
diff --git a/autotest/gdrivers/cpg.py b/autotest/gdrivers/cpg.py
index 34215b1d8e3e..af2d0110e937 100755
--- a/autotest/gdrivers/cpg.py
+++ b/autotest/gdrivers/cpg.py
@@ -43,8 +43,6 @@ def test_cpg_1():
     return tst.testOpen()
 
 
-gdaltest_list = [
-    test_cpg_1]
 
 if __name__ == '__main__':
 
diff --git a/autotest/gdrivers/ctg.py b/autotest/gdrivers/ctg.py
index be26b9b4e507..8fb24973bb55 100755
--- a/autotest/gdrivers/ctg.py
+++ b/autotest/gdrivers/ctg.py
@@ -78,8 +78,6 @@ def test_ctg_1():
     return ret
 
 
-gdaltest_list = [
-    test_ctg_1]
 
 if __name__ == '__main__':
 
diff --git a/autotest/gdrivers/db2.py b/autotest/gdrivers/db2.py
index d61faf712d0e..00e6f7e89aa8 100755
--- a/autotest/gdrivers/db2.py
+++ b/autotest/gdrivers/db2.py
@@ -199,10 +199,6 @@ def test_gpkg_1():
 ###############################################################################
 
 
-gdaltest_list = [
-    test_gpkg_init,
-    test_gpkg_1
-]
 # gdaltest_list = [ gpkg_init, gpkg_26, gpkg_cleanup ]
 if __name__ == '__main__':
 
diff --git a/autotest/gdrivers/derived.py b/autotest/gdrivers/derived.py
index 9adc7d89ccbf..d7e12ee3bf46 100755
--- a/autotest/gdrivers/derived.py
+++ b/autotest/gdrivers/derived.py
@@ -159,11 +159,6 @@ def test_derived_test3():
 
     
 
-gdaltest_list = [
-    test_derived_test1,
-    test_derived_test2,
-    test_derived_test3
-]
 
 if __name__ == '__main__':
 
diff --git a/autotest/gdrivers/dimap.py b/autotest/gdrivers/dimap.py
index 1641c9ed069b..82bfd5f5053d 100755
--- a/autotest/gdrivers/dimap.py
+++ b/autotest/gdrivers/dimap.py
@@ -99,9 +99,6 @@ def test_dimap_2():
 
     
 
-gdaltest_list = [
-    test_dimap_1,
-    test_dimap_2]
 
 if __name__ == '__main__':
 
diff --git a/autotest/gdrivers/dipex.py b/autotest/gdrivers/dipex.py
index 454b921faf66..8a7de2492396 100755
--- a/autotest/gdrivers/dipex.py
+++ b/autotest/gdrivers/dipex.py
@@ -43,8 +43,6 @@ def test_dipex_1():
     return tst.testOpen()
 
 
-gdaltest_list = [
-    test_dipex_1]
 
 if __name__ == '__main__':
 
diff --git a/autotest/gdrivers/dods.py b/autotest/gdrivers/dods.py
index b52d430958d1..556621bc2319 100755
--- a/autotest/gdrivers/dods.py
+++ b/autotest/gdrivers/dods.py
@@ -124,7 +124,6 @@ def dods_cleanup():
     gdaltest.dods_grid_ds = None
 
 
-gdaltest_list = []
 
 manual_gdaltest_list = [
     dods_1,
diff --git a/autotest/gdrivers/doq1.py b/autotest/gdrivers/doq1.py
index 3dbd3416ddd7..e23159a84132 100755
--- a/autotest/gdrivers/doq1.py
+++ b/autotest/gdrivers/doq1.py
@@ -47,8 +47,6 @@ def test_doq1_1():
     return ret
 
 
-gdaltest_list = [
-    test_doq1_1]
 
 if __name__ == '__main__':
 
diff --git a/autotest/gdrivers/doq2.py b/autotest/gdrivers/doq2.py
index 4585651284fd..4c61a9276a5e 100755
--- a/autotest/gdrivers/doq2.py
+++ b/autotest/gdrivers/doq2.py
@@ -64,8 +64,6 @@ def test_doq2_1():
     ds = None
 
 
-gdaltest_list = [
-    test_doq2_1]
 
 if __name__ == '__main__':
 
diff --git a/autotest/gdrivers/dted.py b/autotest/gdrivers/dted.py
index 41e48c2676ba..e3082ab76562 100755
--- a/autotest/gdrivers/dted.py
+++ b/autotest/gdrivers/dted.py
@@ -306,24 +306,6 @@ def test_dted_cleanup():
         pass
     
 
-gdaltest_list = [
-    test_dted_1,
-    test_dted_2,
-    test_dted_3,
-    test_dted_4,
-    test_dted_5,
-    test_dted_6,
-    test_dted_7,
-    test_dted_8,
-    test_dted_9,
-    test_dted_10,
-    test_dted_11,
-    test_dted_12,
-    test_dted_13,
-    test_dted_14,
-    test_dted_15,
-    test_dted_cleanup
-]
 
 
 if __name__ == '__main__':
diff --git a/autotest/gdrivers/e00grid.py b/autotest/gdrivers/e00grid.py
index 878434f0c808..a8484b52e196 100755
--- a/autotest/gdrivers/e00grid.py
+++ b/autotest/gdrivers/e00grid.py
@@ -121,9 +121,6 @@ def test_e00grid_2():
     return ret
 
 
-gdaltest_list = [
-    test_e00grid_1,
-    test_e00grid_2]
 
 if __name__ == '__main__':
 
diff --git a/autotest/gdrivers/ecrgtoc.py b/autotest/gdrivers/ecrgtoc.py
index bbf0f439976a..e1f1e77abb9a 100755
--- a/autotest/gdrivers/ecrgtoc.py
+++ b/autotest/gdrivers/ecrgtoc.py
@@ -299,12 +299,6 @@ def test_ecrgtoc_online_1():
     assert len(filelist) == 7, 'did not get expected filelist'
 
 
-gdaltest_list = [
-    test_ecrgtoc_1,
-    test_ecrgtoc_2,
-    test_ecrgtoc_3,
-    test_ecrgtoc_4,
-    test_ecrgtoc_online_1]
 
 if __name__ == '__main__':
 
diff --git a/autotest/gdrivers/ecw.py b/autotest/gdrivers/ecw.py
index e849b87197e1..b9b5c267846d 100755
--- a/autotest/gdrivers/ecw.py
+++ b/autotest/gdrivers/ecw.py
@@ -2063,66 +2063,6 @@ def test_ecw_cleanup():
     gdaltest.reregister_all_jpeg2000_drivers()
 
 
-gdaltest_list = [
-    test_ecw_init,
-    test_ecw_1,
-    test_ecw_2,
-    test_ecw_3,
-    test_ecw_4,
-    test_ecw_5,
-    test_ecw_6,
-    test_ecw_7,
-    test_ecw_8,
-    test_ecw_9,
-    test_ecw_10,
-    test_ecw_11,
-    test_ecw_12,
-    test_ecw_13,
-    test_ecw_14,
-    test_ecw_15,
-    test_ecw_16,
-    test_ecw_17,
-    test_ecw_18,
-    test_ecw_19,
-    test_ecw_20,
-    test_ecw_21,
-    test_ecw_22,
-    test_ecw_23,
-    test_ecw_24,
-    test_ecw_25,
-    test_ecw_26,
-    test_ecw_27,
-    test_ecw_28,
-    test_ecw_29,
-    test_ecw_30,
-    test_ecw_31,
-    test_ecw_32,
-    test_ecw_33,
-    test_ecw_33_bis,
-    test_ecw_34,
-    test_ecw_35,
-    test_ecw_36,
-    test_ecw_37,
-    test_ecw_38,
-    test_ecw_39,
-    test_ecw_40,
-    test_ecw_41,
-    test_ecw_42,
-    test_ecw_43,
-    test_ecw_44,
-    test_ecw_45,
-    test_ecw_46,
-    test_ecw_47,
-    test_ecw_48,
-    test_ecw_49,
-    test_ecw_online_1,
-    test_ecw_online_2,
-    # JTO this test does not make sense. It tests difference between two files pixel by pixel but compression is lossy# ecw_online_3,
-    test_ecw_online_4,
-    test_ecw_online_5,
-    test_ecw_online_6,
-    test_ecw_online_7,
-    test_ecw_cleanup]
 
 if __name__ == '__main__':
 
diff --git a/autotest/gdrivers/eedai.py b/autotest/gdrivers/eedai.py
index f13ea938621c..d15db0fc5e84 100644
--- a/autotest/gdrivers/eedai.py
+++ b/autotest/gdrivers/eedai.py
@@ -752,17 +752,6 @@ def test_eedai_cleanup():
     gdal.RmdirRecursive('/vsimem/ee/')
 
 
-gdaltest_list = [
-    test_eedai_1,
-    test_eedai_2,
-    test_eedai_3,
-    test_eedai_GOOGLE_APPLICATION_CREDENTIALS,
-    test_eedai_gce_credentials,
-    test_eedai_4,
-    test_eedai_geotiff,
-    test_eedai_cleanup,
-    test_eedai_real_service,
-]
 
 if __name__ == '__main__':
 
diff --git a/autotest/gdrivers/ehdr.py b/autotest/gdrivers/ehdr.py
index 5345879d44be..f4c43bf7b977 100755
--- a/autotest/gdrivers/ehdr.py
+++ b/autotest/gdrivers/ehdr.py
@@ -380,23 +380,6 @@ def test_ehdr_approx_stats_flag():
     gdal.GetDriverByName('EHDR').Delete(tmpfile)
 
 
-gdaltest_list = [
-    test_ehdr_1,
-    test_ehdr_2,
-    test_ehdr_3,
-    test_ehdr_4,
-    test_ehdr_5,
-    test_ehdr_6,
-    test_ehdr_7,
-    test_ehdr_8,
-    test_ehdr_9,
-    test_ehdr_10,
-    test_ehdr_11,
-    test_ehdr_12,
-    test_ehdr_13,
-    test_ehdr_14,
-    test_ehdr_rat,
-    test_ehdr_approx_stats_flag]
 
 if __name__ == '__main__':
 
diff --git a/autotest/gdrivers/eir.py b/autotest/gdrivers/eir.py
index 93957037ac36..46e61cd243d3 100755
--- a/autotest/gdrivers/eir.py
+++ b/autotest/gdrivers/eir.py
@@ -43,8 +43,6 @@ def test_eir_1():
     return tst.testOpen()
 
 
-gdaltest_list = [
-    test_eir_1]
 
 if __name__ == '__main__':
 
diff --git a/autotest/gdrivers/elas.py b/autotest/gdrivers/elas.py
index 7284b5a729b4..7ba61fc20596 100755
--- a/autotest/gdrivers/elas.py
+++ b/autotest/gdrivers/elas.py
@@ -52,9 +52,6 @@ def test_elas_2():
     return tst.testCreate()
 
 
-gdaltest_list = [
-    test_elas_1,
-    test_elas_2]
 
 if __name__ == '__main__':
 
diff --git a/autotest/gdrivers/envi.py b/autotest/gdrivers/envi.py
index 69496d963d8b..a3aa428d0064 100755
--- a/autotest/gdrivers/envi.py
+++ b/autotest/gdrivers/envi.py
@@ -348,24 +348,6 @@ def test_envi_truncated():
     assert cs == 2315
 
 
-gdaltest_list = [
-    test_envi_1,
-    test_envi_2,
-    test_envi_3,
-    test_envi_4,
-    test_envi_5,
-    test_envi_6,
-    test_envi_7,
-    test_envi_8,
-    test_envi_9,
-    test_envi_10,
-    test_envi_11,
-    test_envi_12,
-    test_envi_13,
-    test_envi_14,
-    test_envi_15,
-    test_envi_truncated,
-]
 
 
 if __name__ == '__main__':
diff --git a/autotest/gdrivers/ers.py b/autotest/gdrivers/ers.py
index 673cafb4ae45..e26fef3daaf6 100755
--- a/autotest/gdrivers/ers.py
+++ b/autotest/gdrivers/ers.py
@@ -302,20 +302,6 @@ def test_ers_cleanup():
     gdaltest.clean_tmp()
 
 
-gdaltest_list = [
-    test_ers_1,
-    test_ers_2,
-    test_ers_3,
-    test_ers_4,
-    test_ers_5,
-    test_ers_6,
-    test_ers_7,
-    test_ers_8,
-    test_ers_9,
-    test_ers_10,
-    test_ers_recursive_opening,
-    test_ers_cleanup
-]
 
 
 if __name__ == '__main__':
diff --git a/autotest/gdrivers/fast.py b/autotest/gdrivers/fast.py
index 09c400875cb2..34ff93e56778 100755
--- a/autotest/gdrivers/fast.py
+++ b/autotest/gdrivers/fast.py
@@ -267,16 +267,6 @@ def test_fast_9():
 #
 
 
-gdaltest_list = [
-    test_fast_1,
-    test_fast_2,
-    test_fast_3,
-    test_fast_4,
-    test_fast_5,
-    test_fast_6,
-    test_fast_7,
-    test_fast_8,
-    test_fast_9]
 
 if __name__ == '__main__':
 
diff --git a/autotest/gdrivers/fujibas.py b/autotest/gdrivers/fujibas.py
index 4ea6859260c6..470b0c1c9c14 100755
--- a/autotest/gdrivers/fujibas.py
+++ b/autotest/gdrivers/fujibas.py
@@ -43,8 +43,6 @@ def test_fujibas_1():
     return tst.testOpen()
 
 
-gdaltest_list = [
-    test_fujibas_1]
 
 if __name__ == '__main__':
 
diff --git a/autotest/gdrivers/gdalhttp.py b/autotest/gdrivers/gdalhttp.py
index 7769e0fb6299..9cdb1bf79fd8 100755
--- a/autotest/gdrivers/gdalhttp.py
+++ b/autotest/gdrivers/gdalhttp.py
@@ -277,16 +277,6 @@ def test_http_cleanup():
     gdaltest.dods_drv = None
 
 
-gdaltest_list = [test_http_1,
-                 test_http_2,
-                 test_http_3,
-                 # http_4_old,
-                 test_http_4,
-                 test_http_5,
-                 test_http_6,
-                 test_http_test_ssl_verifystatus,
-                 test_http_test_use_capi_store,
-                 test_http_cleanup]
 
 # gdaltest_list = [ http_test_use_capi_store ]
 
diff --git a/autotest/gdrivers/genbin.py b/autotest/gdrivers/genbin.py
index 75db02c423b8..22c41db8dbad 100755
--- a/autotest/gdrivers/genbin.py
+++ b/autotest/gdrivers/genbin.py
@@ -72,9 +72,6 @@ def test_genbin_1():
     return tst.testOpen(check_prj=prj, check_gt=gt)
 
 
-gdaltest_list = [
-    test_genbin_1
-]
 
 
 if __name__ == '__main__':
diff --git a/autotest/gdrivers/georaster.py b/autotest/gdrivers/georaster.py
index 3076f2655f00..06062c7bc1bf 100755
--- a/autotest/gdrivers/georaster.py
+++ b/autotest/gdrivers/georaster.py
@@ -473,23 +473,6 @@ def test_georaster_cleanup():
 #
 
 
-gdaltest_list = [
-    test_georaster_init,
-    test_georaster_byte,
-    test_georaster_int16,
-    test_georaster_int32,
-    test_georaster_rgb_b1,
-    test_georaster_rgb_b2,
-    test_georaster_rgb_b3_bsq,
-    test_georaster_rgb_b3_bip,
-    test_georaster_rgb_b3_bil,
-    test_georaster_byte_deflate,
-    test_georaster_rgb_deflate_b3,
-    test_georaster_1bit,
-    test_georaster_2bit,
-    test_georaster_4bit,
-    test_georaster_cleanup
-]
 
 if __name__ == '__main__':
 
diff --git a/autotest/gdrivers/gff.py b/autotest/gdrivers/gff.py
index 1310546e2620..f03f7925ddf5 100755
--- a/autotest/gdrivers/gff.py
+++ b/autotest/gdrivers/gff.py
@@ -51,8 +51,6 @@ def test_gff_1():
     return ret
 
 
-gdaltest_list = [
-    test_gff_1]
 
 if __name__ == '__main__':
 
diff --git a/autotest/gdrivers/gif.py b/autotest/gdrivers/gif.py
index 954767268dae..9b352610b6aa 100755
--- a/autotest/gdrivers/gif.py
+++ b/autotest/gdrivers/gif.py
@@ -220,18 +220,6 @@ def test_gif_cleanup():
     gdaltest.clean_tmp()
 
 
-gdaltest_list = [
-    test_gif_1,
-    test_gif_2,
-    test_gif_3,
-    test_gif_4,
-    test_gif_5,
-    test_gif_6,
-    test_gif_7,
-    test_gif_8,
-    test_gif_9,
-    test_gif_10,
-    test_gif_cleanup]
 
 if __name__ == '__main__':
 
diff --git a/autotest/gdrivers/gmt.py b/autotest/gdrivers/gmt.py
index f56f8a2f8a5d..16dde2795e3e 100755
--- a/autotest/gdrivers/gmt.py
+++ b/autotest/gdrivers/gmt.py
@@ -68,9 +68,6 @@ def test_gmt_2():
 ###############################################################################
 
 
-gdaltest_list = [
-    test_gmt_1,
-    test_gmt_2]
 
 
 if __name__ == '__main__':
diff --git a/autotest/gdrivers/gpkg.py b/autotest/gdrivers/gpkg.py
index eebb5aec6fbb..1d2b2af422dc 100755
--- a/autotest/gdrivers/gpkg.py
+++ b/autotest/gdrivers/gpkg.py
@@ -3205,63 +3205,6 @@ def test_gpkg_cleanup():
 ###############################################################################
 
 
-gdaltest_list = [
-    test_gpkg_init,
-    test_gpkg_1,
-    test_gpkg_2,
-    test_gpkg_3,
-    test_gpkg_4,
-    test_gpkg_5,
-    test_gpkg_6,
-    test_gpkg_7,
-    test_gpkg_8,
-    test_gpkg_9,
-    test_gpkg_10,
-    test_gpkg_11,
-    test_gpkg_12,
-    test_gpkg_13,
-    test_gpkg_14,
-    test_gpkg_15,
-    test_gpkg_16,
-    test_gpkg_17,
-    test_gpkg_18,
-    test_gpkg_19,
-    test_gpkg_20,
-    test_gpkg_21,
-    test_gpkg_22,
-    test_gpkg_23,
-    test_gpkg_24,
-    test_gpkg_25,
-    test_gpkg_26,
-    test_gpkg_27,
-    test_gpkg_28,
-    test_gpkg_29,
-    test_gpkg_30,
-    test_gpkg_31,
-    test_gpkg_32,
-    test_gpkg_33,
-    test_gpkg_34,
-    test_gpkg_35,
-    test_gpkg_36,
-    test_gpkg_37,
-    test_gpkg_38,
-    test_gpkg_39,
-    test_gpkg_40,
-    test_gpkg_41,
-    test_gpkg_42,
-    test_gpkg_43,
-    test_gpkg_44,
-    test_gpkg_45,
-    test_gpkg_46,
-    test_gpkg_47,
-    test_gpkg_48,
-    test_gpkg_delete_raster_layer,
-    test_gpkg_open_old_gpkg_elevation_tiles_extension,
-    test_gpkg_GeneralCmdLineProcessor,
-    test_gpkg_match_overview_factor,
-    test_gpkg_delete_gridded_coverage_raster_layer,
-    test_gpkg_cleanup,
-]
 # gdaltest_list = [ gpkg_init, gpkg_47, gpkg_cleanup ]
 if __name__ == '__main__':
 
diff --git a/autotest/gdrivers/grass.py b/autotest/gdrivers/grass.py
index 647184afc00b..14cc291db675 100755
--- a/autotest/gdrivers/grass.py
+++ b/autotest/gdrivers/grass.py
@@ -78,10 +78,6 @@ def test_grass_2():
     return ret
 
 
-gdaltest_list = [
-    test_grass_1,
-    test_grass_2
-]
 
 
 if __name__ == '__main__':
diff --git a/autotest/gdrivers/grassasciigrid.py b/autotest/gdrivers/grassasciigrid.py
index 0bd1d434ea9c..dffd5f40e01b 100755
--- a/autotest/gdrivers/grassasciigrid.py
+++ b/autotest/gdrivers/grassasciigrid.py
@@ -46,9 +46,6 @@ def test_grassasciigrid_1():
 ###############################################################################
 
 
-gdaltest_list = [
-    test_grassasciigrid_1
-]
 
 if __name__ == '__main__':
 
diff --git a/autotest/gdrivers/grib.py b/autotest/gdrivers/grib.py
index 5af20a7cc9b1..7f44faa82f84 100755
--- a/autotest/gdrivers/grib.py
+++ b/autotest/gdrivers/grib.py
@@ -1349,40 +1349,6 @@ def test_grib_online_grib2_jpeg2000_single_line():
 
     
 
-gdaltest_list = [
-    test_grib_1,
-    test_grib_2,
-    test_grib_read_different_sizes_messages,
-    test_grib_grib2_read_nodata,
-    test_grib_read_units,
-    test_grib_read_geotransform_one_n_or_n_one,
-    test_grib_read_vsizip,
-    test_grib_grib2_test_grib_pds_all_bands,
-    test_grib_grib2_read_template_4_15,
-    test_grib_grib2_read_png,
-    test_grib_grib2_read_template_4_32,
-    test_grib_grib2_read_all_zero_data,
-    test_grib_grib2_read_rotated_pole_lonlat,
-    test_grib_grib2_read_template_4_40,
-    test_grib_grib2_read_template_4_unhandled,
-    test_grib_grib2_read_transverse_mercator,
-    test_grib_grib2_read_mercator,
-    test_grib_grib2_read_mercator_2sp,
-    test_grib_grib2_read_lcc,
-    test_grib_grib2_read_polar_stereo,
-    test_grib_grib2_read_aea,
-    test_grib_grib2_read_laea,
-    test_grib_grib2_read_template_5_4_grid_point_ieee_floating_point,
-    test_grib_grib2_read_section_5_nbits_zero_decimal_scaled,
-    test_grib_grib2_read_spatial_differencing_order_1,
-    test_grib_grib2_write_creation_options,
-    test_grib_grib2_write_projections,
-    test_grib_grib2_write_data_encodings,
-    test_grib_grib2_write_data_encodings_warnings_and_errors,
-    test_grib_grib2_write_temperatures,
-    test_grib_grib2_write_nodata,
-    test_grib_online_grib2_jpeg2000_single_line
-]
 
 if __name__ == '__main__':
 
diff --git a/autotest/gdrivers/gsc.py b/autotest/gdrivers/gsc.py
index d49863368799..ac6613952c80 100755
--- a/autotest/gdrivers/gsc.py
+++ b/autotest/gdrivers/gsc.py
@@ -43,8 +43,6 @@ def test_gsc_1():
     return tst.testOpen()
 
 
-gdaltest_list = [
-    test_gsc_1]
 
 if __name__ == '__main__':
 
diff --git a/autotest/gdrivers/gsg.py b/autotest/gdrivers/gsg.py
index 5f352ffd00f8..79adf4692fdc 100755
--- a/autotest/gdrivers/gsg.py
+++ b/autotest/gdrivers/gsg.py
@@ -95,16 +95,6 @@ def test_gsg_8():
 ###############################################################################
 
 
-gdaltest_list = [
-    test_gsg_1,
-    test_gsg_2,
-    test_gsg_3,
-    test_gsg_4,
-    test_gsg_5,
-    test_gsg_6,
-    test_gsg_7,
-    test_gsg_8
-]
 
 
 if __name__ == '__main__':
diff --git a/autotest/gdrivers/gta.py b/autotest/gdrivers/gta.py
index 212d2bc799a7..7c09212af463 100755
--- a/autotest/gdrivers/gta.py
+++ b/autotest/gdrivers/gta.py
@@ -226,13 +226,6 @@ def test_gta_create(filename, checksum):
     ut.testCreateCopy()
 
 
-gdaltest_list = [
-    test_gta_1,
-    test_gta_2,
-    test_gta_3,
-    test_gta_4,
-    test_gta_5,
-]
 
 if __name__ == '__main__':
 
diff --git a/autotest/gdrivers/gtx.py b/autotest/gdrivers/gtx.py
index eaa51597c2bf..16eb7b5d006f 100755
--- a/autotest/gdrivers/gtx.py
+++ b/autotest/gdrivers/gtx.py
@@ -44,8 +44,6 @@ def test_gtx_1():
     return tst.testOpen(check_gt=gt, check_prj='WGS84')
 
 
-gdaltest_list = [
-    test_gtx_1]
 
 if __name__ == '__main__':
 
diff --git a/autotest/gdrivers/gxf.py b/autotest/gdrivers/gxf.py
index b45ff327ded8..0b3a9cf2c78b 100755
--- a/autotest/gdrivers/gxf.py
+++ b/autotest/gdrivers/gxf.py
@@ -96,7 +96,6 @@ def test_gxf(downloadURL, fileName, checksum, download_size):
     assert ds.GetRasterBand(1).Checksum() == checksum, 'Bad checksum. Expected %d, got %d' % (checksum, ds.GetRasterBand(1).Checksum())
 
 
-gdaltest_list = [test_gxf_1, test_gxf_2]
 
 
 if __name__ == '__main__':
diff --git a/autotest/gdrivers/hdf5.py b/autotest/gdrivers/hdf5.py
index fa8d61561098..452d4f6b1784 100755
--- a/autotest/gdrivers/hdf5.py
+++ b/autotest/gdrivers/hdf5.py
@@ -440,26 +440,6 @@ def test_hdf5(downloadURL, fileName, subdatasetname, checksum, download_size):
     assert ds.GetRasterBand(1).Checksum() == checksum, 'Bad checksum. Expected %d, got %d' % (checksum, ds.GetRasterBand(1).Checksum())
 
 
-gdaltest_list = [
-    test_hdf5_2,
-    test_hdf5_3,
-    test_hdf5_4,
-    test_hdf5_5,
-    test_hdf5_6,
-    test_hdf5_7,
-    test_hdf5_8,
-    test_hdf5_9,
-    test_hdf5_10,
-    test_hdf5_11,
-    test_hdf5_12,
-    test_hdf5_13,
-    test_hdf5_14,
-    test_hdf5_15,
-    test_hdf5_16,
-    test_hdf5_17,
-    test_hdf5_single_char_varname,
-    test_hdf5_virtual_file,
-]
 
 
 if __name__ == '__main__':
diff --git a/autotest/gdrivers/hf2.py b/autotest/gdrivers/hf2.py
index 3520c5d98dfb..f39a4eb923d9 100755
--- a/autotest/gdrivers/hf2.py
+++ b/autotest/gdrivers/hf2.py
@@ -83,12 +83,6 @@ def test_hf2_cleanup():
 
     pass
 
-gdaltest_list = [
-    test_hf2_1,
-    test_hf2_2,
-    test_hf2_3,
-    test_hf2_4,
-    test_hf2_cleanup]
 
 if __name__ == '__main__':
 
diff --git a/autotest/gdrivers/hfa.py b/autotest/gdrivers/hfa.py
index a23f5a6fc574..277b88b168b6 100755
--- a/autotest/gdrivers/hfa.py
+++ b/autotest/gdrivers/hfa.py
@@ -1180,50 +1180,6 @@ def test_hfa_read_elevation_units():
 #
 
 
-gdaltest_list = [
-    test_hfa_histread,
-    test_hfa_histwrite,
-    test_hfa_histrewrite,
-    test_hfa_int_stats_1,
-    test_hfa_int_stats_2,
-    test_hfa_float_stats_1,
-    test_hfa_float_stats_2,
-    test_hfa_int_read,
-    test_hfa_float_read,
-    test_hfa_pe_read,
-    test_hfa_pe_write,
-    test_hfa_metadata_1,
-    test_hfa_metadata_2,
-    test_hfa_grow_rrdlist,
-    test_hfa_clean_ige,
-    test_hfa_corrupt_aux,
-    test_hfa_mapinformation_units,
-    test_hfa_nodata_write,
-    test_hfa_nodata_read,
-    test_hfa_rotated_read,
-    test_hfa_rotated_write,
-    test_hfa_vsimem,
-    test_hfa_proName,
-    test_hfa_read_empty_compressed,
-    test_hfa_unique_values_color_table,
-    test_hfa_unique_values_hist,
-    test_hfa_xforms_3rd,
-    test_hfa_delete_colortable,
-    test_hfa_delete_colortable2,
-    test_hfa_excluded_values,
-    test_hfa_ov_nodata,
-    test_hfa_read_bit2grayscale,
-    test_hfa_write_bit2grayscale,
-    test_hfa_camera_md,
-    test_hfa_rde_overviews,
-    test_hfa_copyfiles,
-    test_hfa_write_rat,
-    test_hfa_createcopy_statistics,
-    test_hfa_read_tmso_projection,
-    test_hfa_read_homva_projection,
-    test_hfa_write_tmso_projection,
-    test_hfa_write_homva_projection,
-    test_hfa_read_elevation_units]
 
 if __name__ == '__main__':
 
diff --git a/autotest/gdrivers/ida.py b/autotest/gdrivers/ida.py
index 1c9ea248693f..eab677709125 100755
--- a/autotest/gdrivers/ida.py
+++ b/autotest/gdrivers/ida.py
@@ -172,15 +172,6 @@ def test_ida_7():
     return gdaltest.ida_tst.testSetProjection(prj=prj)
 
 
-gdaltest_list = [
-    test_ida_1,
-    test_ida_2,
-    test_ida_3,
-    test_ida_4,
-    test_ida_5,
-    test_ida_6,
-    test_ida_7
-]
 
 
 if __name__ == '__main__':
diff --git a/autotest/gdrivers/idrisi.py b/autotest/gdrivers/idrisi.py
index 8bc1d18a793c..8376a2ad0311 100755
--- a/autotest/gdrivers/idrisi.py
+++ b/autotest/gdrivers/idrisi.py
@@ -90,12 +90,6 @@ def test_idrisi_cleanup():
         pass
     
 
-gdaltest_list = [
-    test_idrisi_1,
-    test_idrisi_2,
-    test_idrisi_3,
-    test_idrisi_4,
-    test_idrisi_cleanup]
 
 if __name__ == '__main__':
 
diff --git a/autotest/gdrivers/ignfheightasciigrid.py b/autotest/gdrivers/ignfheightasciigrid.py
index 59cd21679b5d..d0cc2355abfe 100755
--- a/autotest/gdrivers/ignfheightasciigrid.py
+++ b/autotest/gdrivers/ignfheightasciigrid.py
@@ -191,20 +191,6 @@ def test_ignfheightasciigrid_gra_invalid():
     
 
 
-gdaltest_list = [
-    test_ignfheightasciigrid_1,
-    test_ignfheightasciigrid_2,
-    test_ignfheightasciigrid_3,
-    test_ignfheightasciigrid_4,
-    test_ignfheightasciigrid_5,
-    test_ignfheightasciigrid_6,
-    test_ignfheightasciigrid_7,
-    test_ignfheightasciigrid_description_multiword,
-    test_ignfheightasciigrid_invalid,
-    test_ignfheightasciigrid_huge,
-    test_ignfheightasciigrid_gra,
-    test_ignfheightasciigrid_gra_invalid,
-]
 
 
 if __name__ == '__main__':
diff --git a/autotest/gdrivers/ilwis.py b/autotest/gdrivers/ilwis.py
index ba624a731b15..5424d74a8904 100755
--- a/autotest/gdrivers/ilwis.py
+++ b/autotest/gdrivers/ilwis.py
@@ -121,13 +121,6 @@ def test_ilwis_cleanup():
     gdaltest.clean_tmp()
 
 
-gdaltest_list = [
-    test_ilwis_1,
-    test_ilwis_2,
-    test_ilwis_3,
-    test_ilwis_4,
-    test_ilwis_5,
-    test_ilwis_cleanup]
 
 if __name__ == '__main__':
 
diff --git a/autotest/gdrivers/ingr.py b/autotest/gdrivers/ingr.py
index d83ef539748d..532faa5308d9 100755
--- a/autotest/gdrivers/ingr.py
+++ b/autotest/gdrivers/ingr.py
@@ -247,26 +247,6 @@ def test_ingr_cleanup():
     gdal.Unlink('data/frmt09.cot.aux.xml')
 
 
-gdaltest_list = [
-    test_ingr_1,
-    test_ingr_2,
-    test_ingr_3,
-    test_ingr_4,
-    test_ingr_5,
-    test_ingr_6,
-    test_ingr_7,
-    test_ingr_8,
-    test_ingr_9,
-    test_ingr_10,
-    test_ingr_11,
-    test_ingr_12,
-    test_ingr_13,
-    test_ingr_14,
-    test_ingr_15,
-    test_ingr_16,
-    test_ingr_17,
-    test_ingr_18,
-    test_ingr_cleanup]
 
 if __name__ == '__main__':
 
diff --git a/autotest/gdrivers/iris.py b/autotest/gdrivers/iris.py
index 2ae5d2cb4807..39d382d69537 100755
--- a/autotest/gdrivers/iris.py
+++ b/autotest/gdrivers/iris.py
@@ -110,9 +110,6 @@ def test_iris_2():
 
     
 
-gdaltest_list = [
-    test_iris_1,
-    test_iris_2]
 
 if __name__ == '__main__':
 
diff --git a/autotest/gdrivers/isce.py b/autotest/gdrivers/isce.py
index da738d7337de..686d17b41453 100755
--- a/autotest/gdrivers/isce.py
+++ b/autotest/gdrivers/isce.py
@@ -92,12 +92,6 @@ def test_isce_4():
     return tst.testCreateCopy(check_gt=0, new_filename='isce.tst.slc', vsimem=1)
 
 
-gdaltest_list = [
-    test_isce_1,
-    test_isce_2,
-    test_isce_3,
-    test_isce_4,
-]
 
 
 if __name__ == '__main__':
diff --git a/autotest/gdrivers/isis.py b/autotest/gdrivers/isis.py
index 2dfe1d7b7e4e..45c57e4b30b2 100755
--- a/autotest/gdrivers/isis.py
+++ b/autotest/gdrivers/isis.py
@@ -1400,38 +1400,6 @@ def test_isis_31():
     assert cs == 1
 
 
-gdaltest_list = [
-    test_isis_1,
-    test_isis_2,
-    test_isis_3,
-    test_isis_4,
-    test_isis_5,
-    test_isis_6,
-    test_isis_7,
-    test_isis_8,
-    test_isis_9,
-    test_isis_10,
-    test_isis_11,
-    test_isis_12,
-    test_isis_13,
-    test_isis_14,
-    test_isis_15,
-    test_isis_16,
-    test_isis_17,
-    test_isis_18,
-    test_isis_19,
-    test_isis_20,
-    test_isis_21,
-    test_isis_22,
-    test_isis_23,
-    test_isis_24,
-    test_isis_25,
-    test_isis_26,
-    test_isis_27,
-    test_isis_28,
-    test_isis_29,
-    test_isis_30,
-    test_isis_31]
 
 
 if __name__ == '__main__':
diff --git a/autotest/gdrivers/isis2.py b/autotest/gdrivers/isis2.py
index c4a6141aade1..098eda5ff147 100755
--- a/autotest/gdrivers/isis2.py
+++ b/autotest/gdrivers/isis2.py
@@ -79,10 +79,6 @@ def test_isis2_3():
     return tst.testCreateCopy(vsimem=1)
 
 
-gdaltest_list = [
-    test_isis2_1,
-    test_isis2_2,
-    test_isis2_3]
 
 if __name__ == '__main__':
 
diff --git a/autotest/gdrivers/jdem.py b/autotest/gdrivers/jdem.py
index bce9c65185e8..961901556b38 100755
--- a/autotest/gdrivers/jdem.py
+++ b/autotest/gdrivers/jdem.py
@@ -43,8 +43,6 @@ def test_jdem_1():
     return tst.testOpen()
 
 
-gdaltest_list = [
-    test_jdem_1]
 
 if __name__ == '__main__':
 
diff --git a/autotest/gdrivers/jp2kak.py b/autotest/gdrivers/jp2kak.py
index 16eca2f85f74..be52d78bbfdf 100755
--- a/autotest/gdrivers/jp2kak.py
+++ b/autotest/gdrivers/jp2kak.py
@@ -468,28 +468,6 @@ def test_jp2kak_cleanup():
     gdaltest.reregister_all_jpeg2000_drivers()
 
 
-gdaltest_list = [
-    test_jp2kak_1,
-    test_jp2kak_2,
-    test_jp2kak_3,
-    test_jp2kak_4,
-    test_jp2kak_5,
-    test_jp2kak_8,
-    test_jp2kak_9,
-    test_jp2kak_10,
-    test_jp2kak_11,
-    test_jp2kak_12,
-    test_jp2kak_13,
-    test_jp2kak_14,
-    test_jp2kak_15,
-    test_jp2kak_16,
-    test_jp2kak_17,
-    test_jp2kak_18,
-    test_jp2kak_19,
-    test_jp2kak_20,
-    test_jp2kak_21,
-    test_jp2kak_22,
-    test_jp2kak_cleanup]
 
 if __name__ == '__main__':
 
diff --git a/autotest/gdrivers/jp2lura.py b/autotest/gdrivers/jp2lura.py
index 747d7fac0453..3a5699fefb8b 100755
--- a/autotest/gdrivers/jp2lura.py
+++ b/autotest/gdrivers/jp2lura.py
@@ -2008,70 +2008,6 @@ def test_jp2lura_cleanup():
     gdaltest.reregister_all_jpeg2000_drivers()
 
 
-gdaltest_list = [
-    test_jp2lura_1,
-    test_jp2lura_missing_license_num,
-    test_jp2lura_invalid_license_num,
-    test_jp2lura_2,
-    test_jp2lura_3,
-    test_jp2lura_4,
-    test_jp2lura_4_vsimem,
-    test_jp2lura_5,
-    test_jp2lura_6,
-    test_jp2lura_7,
-    test_jp2lura_8,
-    test_jp2lura_9,
-    # jp2lura_10,
-    # jp2lura_11,
-    test_jp2lura_12,
-    test_jp2lura_13,
-    test_jp2lura_14,
-    test_jp2lura_16,
-    test_jp2lura_17,
-    test_jp2lura_18,
-    test_jp2lura_19,
-    test_jp2lura_20,
-    # jp2lura_21,
-    test_jp2lura_22,
-    # jp2lura_23,
-    test_jp2lura_24,
-    test_jp2lura_25,
-    # jp2lura_26,
-    test_jp2lura_27,
-    test_jp2lura_28,
-    # jp2lura_29,
-    test_jp2lura_30,
-    # jp2lura_31,
-    # jp2lura_32,
-    # jp2lura_33,
-    test_jp2lura_34,
-    test_jp2lura_35,
-    test_jp2lura_36,
-    test_jp2lura_37,
-    test_jp2lura_38,
-    test_jp2lura_39,
-    test_jp2lura_40,
-    test_jp2lura_41,
-    # jp2lura_42,
-    test_jp2lura_43,
-    # jp2lura_44,
-    test_jp2lura_45,
-    # jp2lura_46,
-    test_jp2lura_47,
-    test_jp2lura_48,
-    test_jp2lura_49,
-    test_jp2lura_50,
-    test_jp2lura_51,
-    test_jp2lura_52,
-    test_jp2lura_53,
-    test_jp2lura_54,
-    test_jp2lura_online_1,
-    test_jp2lura_online_2,
-    test_jp2lura_online_3,
-    test_jp2lura_online_4,
-    test_jp2lura_online_5,
-    test_jp2lura_online_6,
-    test_jp2lura_cleanup]
 
 disabled_gdaltest_list = [
     test_jp2lura_1,
diff --git a/autotest/gdrivers/jp2metadata.py b/autotest/gdrivers/jp2metadata.py
index 9cad5a55f32a..6a5139f87e5e 100755
--- a/autotest/gdrivers/jp2metadata.py
+++ b/autotest/gdrivers/jp2metadata.py
@@ -195,13 +195,6 @@ def test_jp2metadata_5():
     ds = None
 
 
-gdaltest_list = [
-    test_jp2metadata_1,
-    test_jp2metadata_2,
-    test_jp2metadata_3,
-    test_jp2metadata_4,
-    test_jp2metadata_5
-]
 
 
 if __name__ == '__main__':
diff --git a/autotest/gdrivers/jp2openjpeg.py b/autotest/gdrivers/jp2openjpeg.py
index 91742b24d6bd..442643cb6e25 100755
--- a/autotest/gdrivers/jp2openjpeg.py
+++ b/autotest/gdrivers/jp2openjpeg.py
@@ -3095,68 +3095,6 @@ def test_jp2openjpeg_cleanup():
     gdaltest.reregister_all_jpeg2000_drivers()
 
 
-gdaltest_list = [
-    test_jp2openjpeg_1,
-    test_jp2openjpeg_2,
-    test_jp2openjpeg_3,
-    test_jp2openjpeg_4,
-    test_jp2openjpeg_4_vsimem,
-    test_jp2openjpeg_5,
-    test_jp2openjpeg_6,
-    test_jp2openjpeg_7,
-    test_jp2openjpeg_8,
-    test_jp2openjpeg_9,
-    test_jp2openjpeg_10,
-    test_jp2openjpeg_11,
-    test_jp2openjpeg_12,
-    test_jp2openjpeg_13,
-    test_jp2openjpeg_14,
-    test_jp2openjpeg_15,
-    test_jp2openjpeg_16,
-    test_jp2openjpeg_17,
-    test_jp2openjpeg_18,
-    test_jp2openjpeg_19,
-    test_jp2openjpeg_20,
-    test_jp2openjpeg_21,
-    test_jp2openjpeg_22,
-    test_jp2openjpeg_23,
-    test_jp2openjpeg_24,
-    test_jp2openjpeg_25,
-    test_jp2openjpeg_26,
-    test_jp2openjpeg_27,
-    test_jp2openjpeg_28,
-    test_jp2openjpeg_29,
-    test_jp2openjpeg_30,
-    test_jp2openjpeg_31,
-    test_jp2openjpeg_32,
-    test_jp2openjpeg_33,
-    test_jp2openjpeg_34,
-    test_jp2openjpeg_35,
-    test_jp2openjpeg_36,
-    test_jp2openjpeg_37,
-    test_jp2openjpeg_38,
-    test_jp2openjpeg_39,
-    test_jp2openjpeg_40,
-    test_jp2openjpeg_41,
-    test_jp2openjpeg_42,
-    test_jp2openjpeg_43,
-    test_jp2openjpeg_44,
-    test_jp2openjpeg_45,
-    test_jp2openjpeg_46,
-    test_jp2openjpeg_47,
-    test_jp2openjpeg_48,
-    test_jp2openjpeg_49,
-    test_jp2openjpeg_50,
-    test_jp2openjpeg_codeblock_style,
-    test_jp2openjpeg_external_overviews_single_band,
-    test_jp2openjpeg_external_overviews_multiple_band,
-    test_jp2openjpeg_online_1,
-    test_jp2openjpeg_online_2,
-    test_jp2openjpeg_online_3,
-    test_jp2openjpeg_online_4,
-    test_jp2openjpeg_online_5,
-    test_jp2openjpeg_online_6,
-    test_jp2openjpeg_cleanup]
 
 disabled_gdaltest_list = [
     test_jp2openjpeg_1,
diff --git a/autotest/gdrivers/jpeg.py b/autotest/gdrivers/jpeg.py
index 77ec7489a2fa..923726bbb0da 100755
--- a/autotest/gdrivers/jpeg.py
+++ b/autotest/gdrivers/jpeg.py
@@ -1054,36 +1054,6 @@ def test_jpeg_cleanup():
     gdal.Unlink('tmp/albania.jpg.ovr')
 
 
-gdaltest_list = [
-    test_jpeg_1,
-    test_jpeg_2,
-    test_jpeg_3,
-    test_jpeg_4,
-    test_jpeg_5,
-    test_jpeg_6,
-    test_jpeg_7,
-    test_jpeg_8,
-    test_jpeg_9,
-    test_jpeg_10,
-    test_jpeg_11,
-    test_jpeg_12,
-    test_jpeg_13,
-    test_jpeg_14,
-    test_jpeg_15,
-    test_jpeg_16,
-    test_jpeg_17,
-    test_jpeg_18,
-    test_jpeg_19,
-    test_jpeg_20,
-    test_jpeg_21,
-    test_jpeg_22,
-    test_jpeg_23,
-    test_jpeg_24,
-    test_jpeg_25,
-    test_jpeg_26,
-    test_jpeg_27,
-    test_jpeg_28,
-    test_jpeg_cleanup]
 
 # gdaltest_list = [ jpeg_28 ]
 
diff --git a/autotest/gdrivers/jpeg2000.py b/autotest/gdrivers/jpeg2000.py
index 20d091da2bdc..fcee3196be79 100755
--- a/autotest/gdrivers/jpeg2000.py
+++ b/autotest/gdrivers/jpeg2000.py
@@ -441,25 +441,6 @@ def test_jpeg2000_cleanup():
     gdaltest.reregister_all_jpeg2000_drivers()
 
 
-gdaltest_list = [
-    test_jpeg2000_1,
-    test_jpeg2000_2,
-    test_jpeg2000_3,
-    test_jpeg2000_4,
-    test_jpeg2000_5,
-    test_jpeg2000_6,
-    test_jpeg2000_7,
-    test_jpeg2000_8,
-    test_jpeg2000_9,
-    test_jpeg2000_10,
-    test_jpeg2000_11,
-    test_jpeg2000_online_1,
-    test_jpeg2000_online_2,
-    test_jpeg2000_online_3,
-    test_jpeg2000_online_4,
-    test_jpeg2000_online_5,
-    test_jpeg2000_online_6,
-    test_jpeg2000_cleanup]
 
 if __name__ == '__main__':
 
diff --git a/autotest/gdrivers/jpeg_profile.py b/autotest/gdrivers/jpeg_profile.py
index 7f46451138d2..ca8b25a5a941 100755
--- a/autotest/gdrivers/jpeg_profile.py
+++ b/autotest/gdrivers/jpeg_profile.py
@@ -186,11 +186,6 @@ def test_jpeg_copy_icc_64K():
 ###############################################################################################
 
 
-gdaltest_list = [
-    test_jpeg_copy_icc,
-    test_jpeg_copy_options_icc,
-    test_jpeg_copy_icc_64K,
-]
 
 if __name__ == '__main__':
 
diff --git a/autotest/gdrivers/jpegls.py b/autotest/gdrivers/jpegls.py
index 125d77ae94e5..5d68a2e1cb5c 100755
--- a/autotest/gdrivers/jpegls.py
+++ b/autotest/gdrivers/jpegls.py
@@ -58,9 +58,6 @@ def test_jpegls_2():
     return tst.testCreateCopy(vsimem=1)
 
 
-gdaltest_list = [
-    test_jpegls_1,
-    test_jpegls_2]
 
 
 if __name__ == '__main__':
diff --git a/autotest/gdrivers/jpipkak.py b/autotest/gdrivers/jpipkak.py
index dada87f6d4c9..9fccb8dd4ff0 100755
--- a/autotest/gdrivers/jpipkak.py
+++ b/autotest/gdrivers/jpipkak.py
@@ -152,13 +152,6 @@ def test_jpipkak_5():
         'did not get expected mean/stddev'
 
 
-gdaltest_list = [
-    test_jpipkak_1,
-    test_jpipkak_2,
-    test_jpipkak_3,
-    test_jpipkak_4,
-    test_jpipkak_5
-]
 
 if __name__ == '__main__':
 
diff --git a/autotest/gdrivers/kea.py b/autotest/gdrivers/kea.py
index 53af961095d0..24fa88cf7912 100755
--- a/autotest/gdrivers/kea.py
+++ b/autotest/gdrivers/kea.py
@@ -608,23 +608,6 @@ def test_kea_14():
     gdaltest.kea_driver.Delete('tmp/out2.kea')
 
 
-gdaltest_list = [
-    test_kea_init,
-    test_kea_1,
-    test_kea_2,
-    test_kea_3,
-    test_kea_4,
-    test_kea_5,
-    test_kea_6,
-    test_kea_7,
-    test_kea_8,
-    test_kea_9,
-    test_kea_10,
-    test_kea_11,
-    test_kea_12,
-    test_kea_13,
-    test_kea_14
-]
 
 if __name__ == '__main__':
 
diff --git a/autotest/gdrivers/kmlsuperoverlay.py b/autotest/gdrivers/kmlsuperoverlay.py
index 4f9e945bcb8c..ee7cf805321a 100755
--- a/autotest/gdrivers/kmlsuperoverlay.py
+++ b/autotest/gdrivers/kmlsuperoverlay.py
@@ -398,16 +398,6 @@ def test_kmlsuperoverlay_cleanup():
     gdal.Unlink('/vsimem/kmlout.kmz')
 
 
-gdaltest_list = [
-    test_kmlsuperoverlay_1,
-    test_kmlsuperoverlay_2,
-    test_kmlsuperoverlay_3,
-    test_kmlsuperoverlay_4,
-    test_kmlsuperoverlay_5,
-    test_kmlsuperoverlay_6,
-    test_kmlsuperoverlay_7,
-    test_kmlsuperoverlay_8,
-    test_kmlsuperoverlay_cleanup]
 
 if __name__ == '__main__':
 
diff --git a/autotest/gdrivers/kro.py b/autotest/gdrivers/kro.py
index def308f499b7..2d4817100cc7 100755
--- a/autotest/gdrivers/kro.py
+++ b/autotest/gdrivers/kro.py
@@ -97,13 +97,6 @@ def test_kro_5():
     gdal.Unlink('tmp/kro_5.kro')
 
 
-gdaltest_list = [
-    test_kro_1,
-    test_kro_2,
-    test_kro_3,
-    test_kro_4,
-    test_kro_5,
-]
 
 
 if __name__ == '__main__':
diff --git a/autotest/gdrivers/l1b.py b/autotest/gdrivers/l1b.py
index cccc6509cb74..a6fed09a5f72 100755
--- a/autotest/gdrivers/l1b.py
+++ b/autotest/gdrivers/l1b.py
@@ -245,15 +245,6 @@ def test_l1b_little_endian():
     ds = None
 
 
-gdaltest_list = [
-    test_l1b_geoloc,
-    test_l1b_solar_zenith_angles_before_noaa_15,
-    test_l1b_metadata_before_noaa_15,
-    test_l1b_angles_after_noaa_15,
-    test_l1b_clouds_after_noaa_15,
-    test_l1b_metadata_after_noaa_15,
-    test_l1b_little_endian,
-]
 
 
 if __name__ == '__main__':
diff --git a/autotest/gdrivers/lan.py b/autotest/gdrivers/lan.py
index 9d1d5171ae61..c893ff107e5d 100755
--- a/autotest/gdrivers/lan.py
+++ b/autotest/gdrivers/lan.py
@@ -52,9 +52,6 @@ def test_lan_2():
     return tst.testOpen()
 
 
-gdaltest_list = [
-    test_lan_1,
-    test_lan_2]
 
 if __name__ == '__main__':
 
diff --git a/autotest/gdrivers/lcp.py b/autotest/gdrivers/lcp.py
index aebd2bf79fb1..15adec427e59 100755
--- a/autotest/gdrivers/lcp.py
+++ b/autotest/gdrivers/lcp.py
@@ -878,30 +878,6 @@ def test_lcp_23():
     return retval
 
 
-gdaltest_list = [
-    test_lcp_1,
-    test_lcp_2,
-    test_lcp_3,
-    test_lcp_4,
-    test_lcp_5,
-    test_lcp_6,
-    test_lcp_7,
-    test_lcp_8,
-    test_lcp_9,
-    test_lcp_10,
-    test_lcp_11,
-    test_lcp_12,
-    test_lcp_13,
-    test_lcp_14,
-    test_lcp_15,
-    test_lcp_16,
-    test_lcp_17,
-    test_lcp_18,
-    test_lcp_19,
-    test_lcp_20,
-    test_lcp_21,
-    test_lcp_22,
-    test_lcp_23]
 
 if __name__ == '__main__':
 
diff --git a/autotest/gdrivers/leveller.py b/autotest/gdrivers/leveller.py
index 99c425064406..a29db4106e40 100755
--- a/autotest/gdrivers/leveller.py
+++ b/autotest/gdrivers/leveller.py
@@ -43,8 +43,6 @@ def test_leveller_1():
     return tst.testOpen()
 
 
-gdaltest_list = [
-    test_leveller_1]
 
 
 if __name__ == '__main__':
diff --git a/autotest/gdrivers/loslas.py b/autotest/gdrivers/loslas.py
index eb64973208dd..960d7b6c3249 100755
--- a/autotest/gdrivers/loslas.py
+++ b/autotest/gdrivers/loslas.py
@@ -62,9 +62,6 @@ def test_loslas_online_1():
     return tst.testOpen(check_gt=gt, check_stat=stats, check_prj='WGS84')
 
 
-gdaltest_list = [
-    test_loslas_online_1,
-]
 
 
 if __name__ == '__main__':
diff --git a/autotest/gdrivers/mbtiles.py b/autotest/gdrivers/mbtiles.py
index 19b992cde371..62654acc546a 100755
--- a/autotest/gdrivers/mbtiles.py
+++ b/autotest/gdrivers/mbtiles.py
@@ -600,26 +600,6 @@ def test_mbtiles_cleanup():
 
     
 
-gdaltest_list = [
-    test_mbtiles_1,
-    test_mbtiles_2,
-    test_mbtiles_3,
-    test_mbtiles_start_webserver,
-    test_mbtiles_http_jpeg_three_bands,
-    test_mbtiles_http_jpeg_single_band,
-    test_mbtiles_http_png,
-    test_mbtiles_stop_webserver,
-    test_mbtiles_4,
-    test_mbtiles_5,
-    test_mbtiles_6,
-    test_mbtiles_7,
-    test_mbtiles_8,
-    test_mbtiles_9,
-    test_mbtiles_10,
-    test_mbtiles_11,
-    test_mbtiles_raster_open_in_vector_mode,
-    test_mbtiles_create,
-    test_mbtiles_cleanup]
 
 # gdaltest_list = [ mbtiles_1, mbtiles_create ]
 
diff --git a/autotest/gdrivers/mem.py b/autotest/gdrivers/mem.py
index e39424765b08..dbdce678d49c 100755
--- a/autotest/gdrivers/mem.py
+++ b/autotest/gdrivers/mem.py
@@ -610,23 +610,6 @@ def test_mem_cleanup():
     gdaltest.mem_ds = None
 
 
-gdaltest_list = [
-    test_mem_1,
-    test_mem_2,
-    test_mem_3,
-    test_mem_4,
-    test_mem_5,
-    test_mem_6,
-    test_mem_7,
-    test_mem_8,
-    test_mem_9,
-    test_mem_10,
-    test_mem_11,
-    test_mem_12,
-    test_mem_rat,
-    test_mem_categorynames,
-    test_mem_colortable,
-    test_mem_cleanup]
 
 if __name__ == '__main__':
 
diff --git a/autotest/gdrivers/mff.py b/autotest/gdrivers/mff.py
index 5455dbd5afd1..cc3ad602e8bc 100755
--- a/autotest/gdrivers/mff.py
+++ b/autotest/gdrivers/mff.py
@@ -61,10 +61,6 @@ def test_mff_3():
     return tst.testOpen()
 
 
-gdaltest_list = [
-    test_mff_1,
-    test_mff_2,
-    test_mff_3]
 
 if __name__ == '__main__':
 
diff --git a/autotest/gdrivers/mff2.py b/autotest/gdrivers/mff2.py
index c2ff923ec224..40dacc996e62 100755
--- a/autotest/gdrivers/mff2.py
+++ b/autotest/gdrivers/mff2.py
@@ -43,8 +43,6 @@ def test_mff2_1():
     return tst.testOpen()
 
 
-gdaltest_list = [
-    test_mff2_1]
 
 if __name__ == '__main__':
 
diff --git a/autotest/gdrivers/mg4lidar.py b/autotest/gdrivers/mg4lidar.py
index 4c4f88f63f6d..1057bc55f5e8 100755
--- a/autotest/gdrivers/mg4lidar.py
+++ b/autotest/gdrivers/mg4lidar.py
@@ -91,8 +91,6 @@ def test_mg4lidar_1():
     ds = None
 
 
-gdaltest_list = [
-    test_mg4lidar_1]
 
 if __name__ == '__main__':
 
diff --git a/autotest/gdrivers/mrf.py b/autotest/gdrivers/mrf.py
index 92ca148a4971..17e82583e906 100755
--- a/autotest/gdrivers/mrf.py
+++ b/autotest/gdrivers/mrf.py
@@ -621,24 +621,6 @@ def test_mrf_cleanup():
     gdal.Unlink('/vsimem/out.til')
 
 
-gdaltest_list = [
-    test_mrf_overview_near_fact_2,
-    test_mrf_overview_near_with_nodata_fact_2,
-    test_mrf_overview_avg_fact_2,
-    test_mrf_overview_avg_with_nodata_fact_2,
-    test_mrf_overview_near_fact_3,
-    test_mrf_overview_avg_fact_3,
-    test_mrf_overview_avg_with_nodata_fact_3,
-    test_mrf_overview_partial_block,
-    test_mrf_overview_near_implicit_level,
-    test_mrf_overview_external,
-    test_mrf_lerc_nodata,
-    test_mrf_lerc_with_huffman,
-    test_mrf_cached_source,
-    test_mrf_versioned,
-    test_mrf_zen_test,
-    test_mrf_cleanup,
-]
 
 if __name__ == '__main__':
 
diff --git a/autotest/gdrivers/mrsid.py b/autotest/gdrivers/mrsid.py
index 67bf0b6920eb..e753541c78fb 100755
--- a/autotest/gdrivers/mrsid.py
+++ b/autotest/gdrivers/mrsid.py
@@ -536,23 +536,6 @@ def test_mrsid_cleanup():
     gdaltest.reregister_all_jpeg2000_drivers()
 
 
-gdaltest_list = [
-    test_mrsid_1,
-    test_mrsid_2,
-    test_mrsid_3,
-    test_mrsid_4,
-    test_mrsid_5,
-    test_mrsid_6,
-    test_mrsid_7,
-    test_mrsid_8,
-    test_mrsid_9,
-    test_mrsid_10,
-    test_mrsid_11,
-    test_mrsid_online_1,
-    test_mrsid_online_2,
-    test_mrsid_online_3,
-    test_mrsid_online_4,
-    test_mrsid_cleanup]
 
 if __name__ == '__main__':
 
diff --git a/autotest/gdrivers/ndf.py b/autotest/gdrivers/ndf.py
index cc513056e853..39b1420ac892 100755
--- a/autotest/gdrivers/ndf.py
+++ b/autotest/gdrivers/ndf.py
@@ -70,8 +70,6 @@ def test_ndf_1():
                         check_prj=wkt)
 
 
-gdaltest_list = [
-    test_ndf_1]
 
 if __name__ == '__main__':
 
diff --git a/autotest/gdrivers/netcdf.py b/autotest/gdrivers/netcdf.py
index 19a521fd829f..f0c20312f3b4 100755
--- a/autotest/gdrivers/netcdf.py
+++ b/autotest/gdrivers/netcdf.py
@@ -2859,97 +2859,6 @@ def test_netcdf_uffd():
 # main tests list
 
 
-gdaltest_list = [
-    test_netcdf_1,
-    test_netcdf_2,
-    test_netcdf_3,
-    test_netcdf_4,
-    test_netcdf_5,
-    test_netcdf_6,
-    test_netcdf_7,
-    test_netcdf_8,
-    test_netcdf_9,
-    test_netcdf_10,
-    test_netcdf_11,
-    test_netcdf_12,
-    test_netcdf_13,
-    test_netcdf_14,
-    test_netcdf_15,
-    test_netcdf_16,
-    test_netcdf_17,
-    test_netcdf_18,
-    test_netcdf_19,
-    test_netcdf_20,
-    test_netcdf_21,
-    test_netcdf_22,
-    test_netcdf_23,
-    test_netcdf_24,
-    test_netcdf_25,
-    test_netcdf_26,
-    test_netcdf_27,
-    test_netcdf_28,
-    test_netcdf_29,
-    test_netcdf_30,
-    test_netcdf_31,
-    test_netcdf_32,
-    test_netcdf_33,
-    test_netcdf_34,
-    test_netcdf_35,
-    test_netcdf_36,
-    test_netcdf_36_lonwrap,
-    test_netcdf_37,
-    test_netcdf_38,
-    test_netcdf_39,
-    test_netcdf_40,
-    test_netcdf_41,
-    test_netcdf_42,
-    test_netcdf_43,
-    test_netcdf_44,
-    test_netcdf_45,
-    test_netcdf_46,
-    test_netcdf_47,
-    test_netcdf_48,
-    test_netcdf_49,
-    test_netcdf_50,
-    test_netcdf_51,
-    test_netcdf_51_no_gdal_tags,
-    test_netcdf_52,
-    test_netcdf_53,
-    test_netcdf_54,
-    test_netcdf_55,
-    test_netcdf_56,
-    test_netcdf_57,
-    test_netcdf_58,
-    test_netcdf_59,
-    test_netcdf_60,
-    test_netcdf_61,
-    test_netcdf_62,
-    test_netcdf_62_ncdump_check,
-    test_netcdf_62_cf_check,
-    test_netcdf_63,
-    test_netcdf_63_ncdump_check,
-    test_netcdf_64,
-    test_netcdf_65,
-    test_netcdf_66,
-    test_netcdf_66_ncdump_check,
-    test_netcdf_67,
-    test_netcdf_68,
-    test_netcdf_69,
-    test_netcdf_70,
-    test_netcdf_71,
-    test_netcdf_72,
-    test_netcdf_73,
-    test_netcdf_74,
-    test_netcdf_75,
-    test_netcdf_76,
-    test_netcdf_77,
-    test_netcdf_78,
-    test_netcdf_79,
-    test_netcdf_80,
-    test_netcdf_81,
-    test_netcdf_82,
-    test_netcdf_uffd,
-]
 
 ###############################################################################
 #  basic file creation tests
diff --git a/autotest/gdrivers/netcdf_cf.py b/autotest/gdrivers/netcdf_cf.py
index afff02503b21..294fc6f69e45 100755
--- a/autotest/gdrivers/netcdf_cf.py
+++ b/autotest/gdrivers/netcdf_cf.py
@@ -660,13 +660,6 @@ def test_netcdf_cf_5():
 ###############################################################################
 
 
-gdaltest_list = [
-    test_netcdf_cf_1,
-    test_netcdf_cf_2,
-    test_netcdf_cf_3,
-    test_netcdf_cf_4,
-    test_netcdf_cf_5,
-    None]
 
 if __name__ == '__main__':
 
diff --git a/autotest/gdrivers/ngsgeoid.py b/autotest/gdrivers/ngsgeoid.py
index e7af8efaf01e..157ce4e2b98f 100755
--- a/autotest/gdrivers/ngsgeoid.py
+++ b/autotest/gdrivers/ngsgeoid.py
@@ -52,10 +52,6 @@ def test_ngsgeoid_2():
     return tst.testOpen(check_gt=(229.99166666666667, 0.016666666666670001, 0.0, 40.00833333333334, 0.0, -0.016666666666670001), check_prj='WGS84')
 
 
-gdaltest_list = [
-    test_ngsgeoid_1,
-    test_ngsgeoid_2
-]
 
 if __name__ == '__main__':
 
diff --git a/autotest/gdrivers/nitf.py b/autotest/gdrivers/nitf.py
index 8243fbd9e980..78b2c1be3abe 100755
--- a/autotest/gdrivers/nitf.py
+++ b/autotest/gdrivers/nitf.py
@@ -3437,132 +3437,6 @@ def test_nitf_cleanup():
 
     
 
-gdaltest_list = [
-    test_nitf_1,
-    test_nitf_2,
-    test_nitf_3,
-    test_nitf_4,
-    test_nitf_5,
-    test_nitf_6,
-    test_nitf_7,
-    test_nitf_8,
-    test_nitf_9,
-    test_nitf_10,
-    test_nitf_11,
-    test_nitf_12,
-    test_nitf_13,
-    test_nitf_14,
-    test_nitf_15,
-    test_nitf_16,
-    test_nitf_17,
-    test_nitf_18,
-    test_nitf_19,
-    test_nitf_20,
-    test_nitf_21,
-    test_nitf_22,
-    test_nitf_23,
-    test_nitf_24,
-    test_nitf_25,
-    test_nitf_26,
-    test_nitf_27,
-    test_nitf_28_jp2ecw,
-    test_nitf_28_jp2mrsid,
-    test_nitf_28_jp2kak,
-    test_nitf_28_jp2openjpeg,
-    test_nitf_28_jp2openjpeg_bis,
-    test_nitf_29,
-    test_nitf_30,
-    test_nitf_31,
-    test_nitf_32,
-    test_nitf_33,
-    test_nitf_34,
-    test_nitf_35,
-    test_nitf_36,
-    test_nitf_37,
-    test_nitf_38,
-    test_nitf_39,
-    test_nitf_40,
-    test_nitf_41,
-    test_nitf_42,
-    test_nitf_43_jasper,
-    test_nitf_43_jp2ecw,
-    test_nitf_43_jp2kak,
-    test_nitf_44,
-    test_nitf_45,
-    # nitf_46_jp2ecw,
-    # nitf_46_jp2mrsid,
-    # nitf_46_jp2kak,
-    test_nitf_46_jasper,
-    # nitf_46_openjpeg,
-    test_nitf_47,
-    test_nitf_48,
-    test_nitf_49,
-    test_nitf_50,
-    test_nitf_51,
-    test_nitf_52,
-    test_nitf_53,
-    test_nitf_54,
-    test_nitf_55,
-    test_nitf_56,
-    test_nitf_57,
-    test_nitf_58,
-    test_nitf_read_IMRFCA_IMASDA,
-    test_nitf_59,
-    test_nitf_60,
-    test_nitf_61,
-    test_nitf_62,
-    test_nitf_63,
-    test_nitf_64,
-    test_nitf_65,
-    test_nitf_66,
-    test_nitf_67,
-    test_nitf_68,
-    test_nitf_69,
-    test_nitf_70,
-    test_nitf_71,
-    test_nitf_72,
-    test_nitf_73,
-    test_nitf_74,
-    test_nitf_75,
-    test_nitf_read_C4,
-    test_nitf_online_1,
-    test_nitf_online_2,
-    test_nitf_online_3,
-    test_nitf_online_4,
-    test_nitf_online_5,
-    test_nitf_online_6,
-    test_nitf_online_7,
-    test_nitf_online_8,
-    test_nitf_online_9,
-    test_nitf_online_10,
-    test_nitf_online_11,
-    test_nitf_online_12,
-    test_nitf_online_13,
-    test_nitf_online_14,
-    test_nitf_online_15_jp2ecw,
-    test_nitf_online_15_jp2mrsid,
-    test_nitf_online_15_jp2kak,
-    test_nitf_online_15_jasper,
-    test_nitf_online_15_openjpeg,
-    test_nitf_online_16_jp2ecw,
-    test_nitf_online_16_jp2mrsid,
-    test_nitf_online_16_jp2kak,
-    test_nitf_online_16_jasper,
-    test_nitf_online_16_openjpeg,
-    test_nitf_online_17_jp2ecw,
-    test_nitf_online_17_jp2mrsid,
-    test_nitf_online_17_jp2kak,
-    test_nitf_online_17_jasper,
-    test_nitf_online_17_openjpeg,
-    test_nitf_online_18,
-    test_nitf_online_19,
-    test_nitf_online_20,
-    test_nitf_online_21,
-    test_nitf_online_22,
-    test_nitf_online_23,
-    test_nitf_online_24,
-    test_nitf_online_25,
-    test_nitf_cleanup]
 
 # gdaltest_list = [ nitf_72 ]
 
diff --git a/autotest/gdrivers/ntv1.py b/autotest/gdrivers/ntv1.py
index 7e42d3f5d508..a83d72b336a2 100755
--- a/autotest/gdrivers/ntv1.py
+++ b/autotest/gdrivers/ntv1.py
@@ -45,9 +45,6 @@ def test_ntv1_1():
     return tst.testOpen(check_gt=gt, check_prj='WGS84')
 
 
-gdaltest_list = [
-    test_ntv1_1,
-]
 
 
 if __name__ == '__main__':
diff --git a/autotest/gdrivers/ntv2.py b/autotest/gdrivers/ntv2.py
index 59dfedd7c992..0e9d6863c34a 100755
--- a/autotest/gdrivers/ntv2.py
+++ b/autotest/gdrivers/ntv2.py
@@ -164,18 +164,6 @@ def test_ntv2_online_3():
     return tst.testCreate(vsimem=1, out_bands=4)
 
 
-gdaltest_list = [
-    test_ntv2_1,
-    test_ntv2_2,
-    test_ntv2_3,
-    test_ntv2_4,
-    test_ntv2_5,
-    test_ntv2_6,
-    test_ntv2_7,
-    test_ntv2_online_1,
-    test_ntv2_online_2,
-    test_ntv2_online_3,
-]
 
 
 if __name__ == '__main__':
diff --git a/autotest/gdrivers/nwt_grc.py b/autotest/gdrivers/nwt_grc.py
index 425342b9b71d..1b7d27cf34b6 100755
--- a/autotest/gdrivers/nwt_grc.py
+++ b/autotest/gdrivers/nwt_grc.py
@@ -43,8 +43,6 @@ def test_nwt_grc_1():
     return tst.testOpen()
 
 
-gdaltest_list = [
-    test_nwt_grc_1]
 
 if __name__ == '__main__':
 
diff --git a/autotest/gdrivers/nwt_grd.py b/autotest/gdrivers/nwt_grd.py
index 3f7f23c0eefe..cad17009cc8a 100755
--- a/autotest/gdrivers/nwt_grd.py
+++ b/autotest/gdrivers/nwt_grd.py
@@ -67,8 +67,6 @@ def test_nwt_grd_2():
     return ret
 
 
-gdaltest_list = [
-    test_nwt_grd_1, test_nwt_grd_2]
 
 if __name__ == '__main__':
 
diff --git a/autotest/gdrivers/ozi.py b/autotest/gdrivers/ozi.py
index 1ee70d9edcb6..96ab724d2baf 100755
--- a/autotest/gdrivers/ozi.py
+++ b/autotest/gdrivers/ozi.py
@@ -86,8 +86,6 @@ def test_ozi_online_1():
     assert cs == 16025, 'bad checksum'
 
 
-gdaltest_list = [
-    test_ozi_online_1]
 
 if __name__ == '__main__':
 
diff --git a/autotest/gdrivers/paux.py b/autotest/gdrivers/paux.py
index 06a41ebd67c9..e2736cff16b0 100755
--- a/autotest/gdrivers/paux.py
+++ b/autotest/gdrivers/paux.py
@@ -72,11 +72,6 @@ def test_paux_cleanup():
     gdal.Unlink('/vsimem/byte.tif.tst.aux.xml')
 
 
-gdaltest_list = [
-    test_paux_1,
-    test_paux_2,
-    test_paux_3,
-    test_paux_cleanup]
 
 if __name__ == '__main__':
 
diff --git a/autotest/gdrivers/pcidsk.py b/autotest/gdrivers/pcidsk.py
index 3ea281b9bfb3..c8eb8f0f8a41 100755
--- a/autotest/gdrivers/pcidsk.py
+++ b/autotest/gdrivers/pcidsk.py
@@ -495,26 +495,6 @@ def test_pcidsk_cleanup():
     gdaltest.clean_tmp()
 
 
-gdaltest_list = [
-    test_pcidsk_1,
-    test_pcidsk_2,
-    test_pcidsk_3,
-    test_pcidsk_4,
-    test_pcidsk_5,
-    test_pcidsk_6,
-    test_pcidsk_7,
-    test_pcidsk_8,
-    # pcidsk_9,
-    test_pcidsk_10,
-    test_pcidsk_11,
-    test_pcidsk_12,
-    test_pcidsk_13,
-    test_pcidsk_14,
-    test_pcidsk_15,
-    test_pcidsk_external_ovr,
-    test_pcidsk_external_ovr_rrd,
-    test_pcidsk_online_1,
-    test_pcidsk_cleanup]
 
 if __name__ == '__main__':
 
diff --git a/autotest/gdrivers/pcraster.py b/autotest/gdrivers/pcraster.py
index 096a56387538..fa99404dfef8 100755
--- a/autotest/gdrivers/pcraster.py
+++ b/autotest/gdrivers/pcraster.py
@@ -69,9 +69,6 @@ def test_pcraster_2():
     assert band1.GetNoDataValue() == 255, 'PCRaster NODATA value wrong or missing.'
 
 
-gdaltest_list = [
-    test_pcraster_1,
-    test_pcraster_2]
 
 
 if __name__ == '__main__':
diff --git a/autotest/gdrivers/pdf.py b/autotest/gdrivers/pdf.py
index 7222bdf7c6b0..8a56549973ed 100755
--- a/autotest/gdrivers/pdf.py
+++ b/autotest/gdrivers/pdf.py
@@ -1922,7 +1922,6 @@ def test_pdf_run_all():
 
     
 
-gdaltest_list = [test_pdf_run_all]
 # gdaltest_list = [ pdf_init, pdf_metadata ]
 
 if __name__ == '__main__':
diff --git a/autotest/gdrivers/pds.py b/autotest/gdrivers/pds.py
index 963a83d9a67d..e7642e9307f4 100755
--- a/autotest/gdrivers/pds.py
+++ b/autotest/gdrivers/pds.py
@@ -318,19 +318,6 @@ def test_pds_band_storage_type_line_interleaved():
     return tst.testOpen()
 
 
-gdaltest_list = [
-    test_pds_1,
-    test_pds_2,
-    test_pds_3,
-    test_pds_4,
-    test_pds_5,
-    test_pds_6,
-    test_pds_7,
-    test_pds_8,
-    test_pds_9,
-    test_pds_10,
-    test_pds_line_offset_not_multiple_of_record,
-    test_pds_band_storage_type_line_interleaved]
 
 if __name__ == '__main__':
 
diff --git a/autotest/gdrivers/pds4.py b/autotest/gdrivers/pds4.py
index 3266c7599e2a..764cb45283f9 100755
--- a/autotest/gdrivers/pds4.py
+++ b/autotest/gdrivers/pds4.py
@@ -1078,25 +1078,6 @@ def test_pds4_18():
     gdal.GetDriverByName('PDS4').Delete(filename)
 
 
-gdaltest_list = [
-    test_pds4_1,
-    test_pds4_2,
-    test_pds4_3,
-    test_pds4_4,
-    test_pds4_5,
-    test_pds4_6,
-    test_pds4_7,
-    test_pds4_8,
-    test_pds4_9,
-    test_pds4_10,
-    test_pds4_11,
-    test_pds4_12,
-    test_pds4_13,
-    test_pds4_14,
-    test_pds4_15,
-    test_pds4_16,
-    test_pds4_17,
-    test_pds4_18]
 
 if __name__ == '__main__':
 
diff --git a/autotest/gdrivers/plmosaic.py b/autotest/gdrivers/plmosaic.py
index 00ffb6bedf2d..32dfa28240c8 100755
--- a/autotest/gdrivers/plmosaic.py
+++ b/autotest/gdrivers/plmosaic.py
@@ -902,32 +902,6 @@ def test_plmosaic_cleanup():
 
     
 
-gdaltest_list = [
-    test_plmosaic_1,
-    test_plmosaic_2,
-    test_plmosaic_3,
-    test_plmosaic_4,
-    test_plmosaic_5,
-    test_plmosaic_6,
-    test_plmosaic_7,
-    test_plmosaic_8,
-    test_plmosaic_9,
-    test_plmosaic_9bis,
-    test_plmosaic_9ter,
-    test_plmosaic_10,
-    test_plmosaic_11,
-    test_plmosaic_12,
-    test_plmosaic_13,
-    test_plmosaic_14,
-    test_plmosaic_15,
-    test_plmosaic_16,
-    test_plmosaic_17,
-    test_plmosaic_18,
-    test_plmosaic_19,
-    test_plmosaic_20,
-    test_plmosaic_21,
-    test_plmosaic_with_bbox,
-    test_plmosaic_cleanup]
 
 if __name__ == '__main__':
 
diff --git a/autotest/gdrivers/png.py b/autotest/gdrivers/png.py
index 7d1a2e64bba5..f1ba98e04249 100755
--- a/autotest/gdrivers/png.py
+++ b/autotest/gdrivers/png.py
@@ -301,22 +301,6 @@ def test_png_14():
     assert nbits is None
 
 
-gdaltest_list = [
-    test_png_1,
-    test_png_2,
-    test_png_3,
-    test_png_4,
-    test_png_5,
-    test_png_6,
-    test_png_7,
-    test_png_8,
-    test_png_9,
-    test_png_10,
-    test_png_11,
-    test_png_12,
-    test_png_13,
-    test_png_14
-]
 
 if __name__ == '__main__':
 
diff --git a/autotest/gdrivers/png_profile.py b/autotest/gdrivers/png_profile.py
index 7be586d82c1d..7e25ce6848a7 100755
--- a/autotest/gdrivers/png_profile.py
+++ b/autotest/gdrivers/png_profile.py
@@ -310,13 +310,6 @@ def test_png_sRGB():
 ############################################################################
 
 
-gdaltest_list = [
-    test_png_copy_icc,
-    test_png_copy_options_icc,
-    test_png_copy_options_colorimetric_data,
-    test_png_copy_colorimetric_data,
-    test_png_sRGB,
-]
 
 if __name__ == '__main__':
 
diff --git a/autotest/gdrivers/pnm.py b/autotest/gdrivers/pnm.py
index 3b6be6c058a0..f4658d84067b 100755
--- a/autotest/gdrivers/pnm.py
+++ b/autotest/gdrivers/pnm.py
@@ -74,12 +74,6 @@ def test_pnm_4():
     return tst.testCreateCopy()
 
 
-gdaltest_list = [
-    test_pnm_1,
-    test_pnm_2,
-    test_pnm_3,
-    test_pnm_4
-]
 
 
 if __name__ == '__main__':
diff --git a/autotest/gdrivers/postgisraster.py b/autotest/gdrivers/postgisraster.py
index 5fc0ebe32057..cc6340c7ef35 100755
--- a/autotest/gdrivers/postgisraster.py
+++ b/autotest/gdrivers/postgisraster.py
@@ -565,31 +565,6 @@ def test_postgisraster_cleanup():
     gdal.Unlink('data/utm.tif.aux.xml')
 
 
-gdaltest_list = [
-    test_postgisraster_init,
-    test_postgisraster_test_open_error1,
-    test_postgisraster_test_open_error2,
-    test_postgisraster_compare_utm,
-    test_postgisraster_compare_small_world,
-    test_postgisraster_test_utm_open,
-    test_postgisraster_test_small_world_open_b1,
-    test_postgisraster_test_small_world_open_b2,
-    test_postgisraster_test_small_world_open_b3,
-    test_postgisraster_test_create_copy_bad_conn_string,
-    test_postgisraster_test_create_copy_no_dbname,
-    test_postgisraster_test_create_copy_no_tablename,
-    test_postgisraster_test_create_copy_and_delete,
-    test_postgisraster_test_create_copy_and_delete_phases,
-    test_postgisraster_test_norid,
-    test_postgisraster_test_serial,
-    test_postgisraster_test_unique,
-    test_postgisraster_test_constraint,
-    test_postgisraster_test_constraint_with_spi,
-    test_postgisraster_test_outdb,
-    test_postgisraster_test_outdb_client_side,
-    test_postgisraster_test_outdb_client_side_force_ireadblock,
-    test_postgisraster_test_outdb_client_side_if_possible,
-    test_postgisraster_cleanup]
 
 if __name__ == '__main__':
 
diff --git a/autotest/gdrivers/prf.py b/autotest/gdrivers/prf.py
index 84c8e05cd391..0947b90eb57c 100755
--- a/autotest/gdrivers/prf.py
+++ b/autotest/gdrivers/prf.py
@@ -89,12 +89,6 @@ def test_prf_4():
 ###############################################################################
 
 
-gdaltest_list = [
-    test_prf_1,
-    test_prf_2,
-    test_prf_3,
-    test_prf_4
-]
 
 if __name__ == '__main__':
 
diff --git a/autotest/gdrivers/r.py b/autotest/gdrivers/r.py
index 9fa2492de4c2..4a4a8b9f0a69 100755
--- a/autotest/gdrivers/r.py
+++ b/autotest/gdrivers/r.py
@@ -74,11 +74,6 @@ def test_r_4():
 ###############################################################################
 
 
-gdaltest_list = [
-    test_r_1,
-    test_r_2,
-    test_r_3,
-    test_r_4]
 
 if __name__ == '__main__':
 
diff --git a/autotest/gdrivers/rasdaman.py b/autotest/gdrivers/rasdaman.py
index 8b8157f0ecff..029511c018fe 100755
--- a/autotest/gdrivers/rasdaman.py
+++ b/autotest/gdrivers/rasdaman.py
@@ -89,10 +89,6 @@ def test_rasdaman_3():
     assert ds is None
 
 
-gdaltest_list = [
-    test_rasdaman_1,
-    test_rasdaman_2,
-    test_rasdaman_3]
 
 if __name__ == '__main__':
 
diff --git a/autotest/gdrivers/rasterlite.py b/autotest/gdrivers/rasterlite.py
index 2e4a109dbccd..ec4809fe59c1 100755
--- a/autotest/gdrivers/rasterlite.py
+++ b/autotest/gdrivers/rasterlite.py
@@ -432,21 +432,6 @@ def test_rasterlite_cleanup():
 
     
 
-gdaltest_list = [
-    test_rasterlite_1,
-    test_rasterlite_2,
-    test_rasterlite_3,
-    test_rasterlite_4,
-    test_rasterlite_5,
-    test_rasterlite_6,
-    test_rasterlite_7,
-    test_rasterlite_8,
-    test_rasterlite_9,
-    test_rasterlite_10,
-    test_rasterlite_11,
-    test_rasterlite_12,
-    test_rasterlite_13,
-    test_rasterlite_cleanup]
 
 if __name__ == '__main__':
 
diff --git a/autotest/gdrivers/rda.py b/autotest/gdrivers/rda.py
index 87247fd3f3be..248b2ecaa0af 100755
--- a/autotest/gdrivers/rda.py
+++ b/autotest/gdrivers/rda.py
@@ -1466,22 +1466,6 @@ def test_rda_cleanup():
     gdal.RmdirRecursive('/vsimem/cache_dir')
 
 
-gdaltest_list = [
-    test_rda_test_presence,
-    test_rda_bad_connection_string,
-    test_rda_missing_credentials,
-    test_rda_failed_authentication,
-    test_rda_error_metadata,
-    test_rda_graph_nominal,
-    test_rda_template_nominal,
-    test_rda_template_image_reference_nominal,
-    test_rda_read_gbdx_config,
-    test_rda_download_queue,
-    test_rda_rpc,
-    test_rda_real_cache_dir,
-    test_rda_real_expired_authentication,
-    test_rda_bad_tile,
-    test_rda_cleanup]
 
 if __name__ == '__main__':
 
diff --git a/autotest/gdrivers/rik.py b/autotest/gdrivers/rik.py
index 55d02b4e0ea0..160f41e54bc3 100755
--- a/autotest/gdrivers/rik.py
+++ b/autotest/gdrivers/rik.py
@@ -83,10 +83,6 @@ def test_rik_online_2():
     return tst.testOpen()
 
 
-gdaltest_list = [
-    test_rik_online_1,
-    test_rik_online_2
-]
 
 
 if __name__ == '__main__':
diff --git a/autotest/gdrivers/rl2.py b/autotest/gdrivers/rl2.py
index f75180441cb7..29a6668e33cf 100755
--- a/autotest/gdrivers/rl2.py
+++ b/autotest/gdrivers/rl2.py
@@ -539,33 +539,6 @@ def test_rl2_error_create():
         assert gdaltest.rl2_drv.Create('/vsimem/out.db', 1, 1) is None
     
 
-gdaltest_list = [
-    test_rl2_1,
-    test_rl2_2,
-    test_rl2_3,
-    test_rl2_4,
-    test_rl2_5,
-    test_rl2_6,
-    test_rl2_7,
-    test_rl2_8,
-    test_rl2_9,
-    test_rl2_10,
-    test_rl2_11,
-    test_rl2_12,
-    test_rl2_13,
-    test_rl2_14,
-    test_rl2_15,
-    test_rl2_16,
-    test_rl2_17,
-    test_rl2_18,
-    test_rl2_19,
-    test_rl2_20,
-    test_rl2_21,
-    test_rl2_22,
-    test_rl2_23,
-    test_rl2_24,
-    test_rl2_error_create,
-]
 
 if __name__ == '__main__':
 
diff --git a/autotest/gdrivers/rmf.py b/autotest/gdrivers/rmf.py
index b0cfd69ff10b..821b007bf962 100755
--- a/autotest/gdrivers/rmf.py
+++ b/autotest/gdrivers/rmf.py
@@ -775,53 +775,6 @@ def test_rmf_33c():
 ###############################################################################
 
 
-gdaltest_list = [
-    test_rmf_1,
-    test_rmf_2,
-    test_rmf_3,
-    test_rmf_4,
-    test_rmf_5,
-    test_rmf_6,
-    test_rmf_7,
-    test_rmf_8,
-    test_rmf_9,
-    test_rmf_10,
-    test_rmf_11,
-    test_rmf_12a,
-    test_rmf_12b,
-    test_rmf_12c,
-    test_rmf_12d,
-    test_rmf_13,
-    test_rmf_14,
-    test_rmf_15,
-    test_rmf_16,
-    test_rmf_17,
-    test_rmf_18,
-    test_rmf_19,
-    test_rmf_20,
-    test_rmf_21,
-    test_rmf_22,
-    test_rmf_23,
-    test_rmf_24,
-    test_rmf_25,
-    test_rmf_26,
-    test_rmf_27,
-    test_rmf_28a,
-    test_rmf_28b,
-    test_rmf_29,
-    test_rmf_30,
-    test_rmf_31a,
-    test_rmf_31b,
-    test_rmf_31c,
-    test_rmf_31d,
-    test_rmf_31e,
-    test_rmf_32a,
-    test_rmf_32b,
-    test_rmf_32c,
-    test_rmf_33a,
-    test_rmf_33b,
-    test_rmf_33c,
-]
 
 if __name__ == '__main__':
 
diff --git a/autotest/gdrivers/roipac.py b/autotest/gdrivers/roipac.py
index 3bec2bdbdd10..a03275d31dfa 100755
--- a/autotest/gdrivers/roipac.py
+++ b/autotest/gdrivers/roipac.py
@@ -112,14 +112,6 @@ def test_roipac_6():
     return ret
 
 
-gdaltest_list = [
-    test_roipac_1,
-    test_roipac_2,
-    test_roipac_3,
-    test_roipac_4,
-    test_roipac_5,
-    test_roipac_6,
-]
 
 
 if __name__ == '__main__':
diff --git a/autotest/gdrivers/rpftoc.py b/autotest/gdrivers/rpftoc.py
index 76ebb25cd58e..c027b32ebdc8 100755
--- a/autotest/gdrivers/rpftoc.py
+++ b/autotest/gdrivers/rpftoc.py
@@ -104,11 +104,6 @@ def test_rpftoc_4():
     os.unlink('tmp/RPFTOC01.ON2')
 
 
-gdaltest_list = [
-    test_rpftoc_1,
-    test_rpftoc_2,
-    test_rpftoc_3,
-    test_rpftoc_4]
 
 if __name__ == '__main__':
 
diff --git a/autotest/gdrivers/rraster.py b/autotest/gdrivers/rraster.py
index 25a423a8ea72..da12d76e8e57 100755
--- a/autotest/gdrivers/rraster.py
+++ b/autotest/gdrivers/rraster.py
@@ -412,23 +412,6 @@ def test_rraster_colorinterpretation():
     gdal.GetDriverByName('RRASTER').Delete(filename)
 
 
-gdaltest_list = [
-    test_rraster_1,
-    test_rraster_1_copy,
-    test_rraster_rgba,
-    test_rraster_rgba_copy,
-    test_rraster_ct_rgb,
-    test_rraster_ct_rgb_copy,
-    test_rraster_ct_rgba,
-    test_rraster_ct_rgba_copy,
-    test_rraster_rat,
-    test_rraster_rat_copy,
-    test_rraster_signedbyte,
-    test_rraster_datatypes,
-    test_rraster_nodata_and_metadata,
-    test_rraster_update,
-    test_rraster_colorinterpretation,
-]
 
 
 if __name__ == '__main__':
diff --git a/autotest/gdrivers/rs2.py b/autotest/gdrivers/rs2.py
index 9636b3cfc717..c5ba666b2565 100755
--- a/autotest/gdrivers/rs2.py
+++ b/autotest/gdrivers/rs2.py
@@ -74,10 +74,6 @@ def test_rs2_3():
     assert got_rpc == expected_rpc
 
 
-gdaltest_list = [
-    test_rs2_1,
-    test_rs2_2,
-    test_rs2_3]
 
 if __name__ == '__main__':
 
diff --git a/autotest/gdrivers/safe.py b/autotest/gdrivers/safe.py
index 88e069b3dff8..08f0e35c181f 100755
--- a/autotest/gdrivers/safe.py
+++ b/autotest/gdrivers/safe.py
@@ -77,12 +77,6 @@ def test_safe_5():
     return tst.testOpen()
 
 
-gdaltest_list = [
-    test_safe_1,
-    test_safe_2,
-    test_safe_3,
-    test_safe_4,
-    test_safe_5]
 
 if __name__ == '__main__':
 
diff --git a/autotest/gdrivers/saga.py b/autotest/gdrivers/saga.py
index 7ddfa4449bbc..cdbc8d056382 100755
--- a/autotest/gdrivers/saga.py
+++ b/autotest/gdrivers/saga.py
@@ -193,15 +193,6 @@ def test_saga_8():
     UNIT["Meter",1]]""")
 
 
-gdaltest_list = [
-    test_saga_1,
-    test_saga_2,
-    test_saga_3,
-    test_saga_4,
-    test_saga_5,
-    test_saga_6,
-    test_saga_7,
-    test_saga_8]
 
 if __name__ == '__main__':
 
diff --git a/autotest/gdrivers/sar_ceos.py b/autotest/gdrivers/sar_ceos.py
index f9085f964c4e..a8c66d607efa 100755
--- a/autotest/gdrivers/sar_ceos.py
+++ b/autotest/gdrivers/sar_ceos.py
@@ -52,8 +52,6 @@ def test_sar_ceos_online_1():
     return tst.testOpen()
 
 
-gdaltest_list = [
-    test_sar_ceos_online_1]
 
 if __name__ == '__main__':
 
diff --git a/autotest/gdrivers/sdts.py b/autotest/gdrivers/sdts.py
index 920ee0efa492..aa29c99922b3 100755
--- a/autotest/gdrivers/sdts.py
+++ b/autotest/gdrivers/sdts.py
@@ -56,7 +56,6 @@ def test_sdts_1():
     assert md['TITLE'] == 'ALANSON, MI-24000'
 
 
-gdaltest_list = [test_sdts_1]
 
 if __name__ == '__main__':
 
diff --git a/autotest/gdrivers/sentinel2.py b/autotest/gdrivers/sentinel2.py
index cb44f84ebf6b..f6ae93ea8bf8 100755
--- a/autotest/gdrivers/sentinel2.py
+++ b/autotest/gdrivers/sentinel2.py
@@ -2426,36 +2426,6 @@ def test_sentinel2_l1c_safe_compact_3():
     assert band.DataType == gdal.GDT_Byte
 
 
-gdaltest_list = [
-    test_sentinel2_l1c_1,
-    test_sentinel2_l1c_2,
-    test_sentinel2_l1c_3,
-    test_sentinel2_l1c_4,
-    test_sentinel2_l1c_5,
-    test_sentinel2_l1c_6,
-    test_sentinel2_l1c_7,
-    test_sentinel2_l1c_tile_1,
-    test_sentinel2_l1c_tile_2,
-    test_sentinel2_l1c_tile_3,
-    test_sentinel2_l1c_tile_4,
-    test_sentinel2_l1c_tile_5,
-    test_sentinel2_l1c_tile_6,
-    test_sentinel2_l1b_1,
-    test_sentinel2_l1b_2,
-    test_sentinel2_l1b_3,
-    test_sentinel2_l1b_4,
-    test_sentinel2_l1b_5,
-    test_sentinel2_l2a_1,
-    test_sentinel2_l2a_2,
-    test_sentinel2_l2a_3,
-    test_sentinel2_l2a_4,
-    test_sentinel2_l2a_5,
-    test_sentinel2_l2a_6,
-    test_sentinel2_l2a_7,
-    test_sentinel2_l1c_safe_compact_1,
-    test_sentinel2_l1c_safe_compact_2,
-    test_sentinel2_l1c_safe_compact_3
-]
 
 if __name__ == '__main__':
 
diff --git a/autotest/gdrivers/sgi.py b/autotest/gdrivers/sgi.py
index fa58c02f93e7..1e072677a134 100755
--- a/autotest/gdrivers/sgi.py
+++ b/autotest/gdrivers/sgi.py
@@ -64,11 +64,6 @@ def test_sgi_3():
     return tst.testCreate()
 
 
-gdaltest_list = [
-    test_sgi_1,
-    test_sgi_2,
-    test_sgi_3,
-]
 
 
 if __name__ == '__main__':
diff --git a/autotest/gdrivers/sigdem.py b/autotest/gdrivers/sigdem.py
index 2f8ecc40bc7f..f67cb3510fb8 100755
--- a/autotest/gdrivers/sigdem.py
+++ b/autotest/gdrivers/sigdem.py
@@ -70,11 +70,6 @@ def test_sigdem_in_memory():
 ###############################################################################
 
 
-gdaltest_list = [
-    test_sigdem_copy_check_prj,
-    test_sigdem_non_square,
-    test_sigdem_in_memory
-]
 
 if __name__ == '__main__':
 
diff --git a/autotest/gdrivers/snodas.py b/autotest/gdrivers/snodas.py
index 602664710fc8..df35fde0f6a6 100755
--- a/autotest/gdrivers/snodas.py
+++ b/autotest/gdrivers/snodas.py
@@ -65,8 +65,6 @@ def test_snodas_1():
     return ret
 
 
-gdaltest_list = [
-    test_snodas_1]
 
 if __name__ == '__main__':
 
diff --git a/autotest/gdrivers/srp.py b/autotest/gdrivers/srp.py
index a390666e29b0..6e6010d40515 100755
--- a/autotest/gdrivers/srp.py
+++ b/autotest/gdrivers/srp.py
@@ -145,15 +145,6 @@ def test_srp_cleanup():
 ###############################################################################
 
 
-gdaltest_list = [
-    test_srp_1,
-    test_srp_2,
-    test_srp_3,
-    test_srp_4,
-    test_srp_5,
-    test_srp_6,
-    test_srp_cleanup
-]
 
 if __name__ == '__main__':
 
diff --git a/autotest/gdrivers/srtmhgt.py b/autotest/gdrivers/srtmhgt.py
index 6f3666f42bad..b54aed0e8db1 100755
--- a/autotest/gdrivers/srtmhgt.py
+++ b/autotest/gdrivers/srtmhgt.py
@@ -148,13 +148,6 @@ def test_srtmhgt_cleanup():
         pass
     
 
-gdaltest_list = [
-    test_srtmhgt_1,
-    test_srtmhgt_2,
-    test_srtmhgt_3,
-    test_srtmhgt_4,
-    test_srtmhgt_cleanup
-]
 
 
 if __name__ == '__main__':
diff --git a/autotest/gdrivers/terragen.py b/autotest/gdrivers/terragen.py
index 1a623438f0c4..287c92f611ac 100755
--- a/autotest/gdrivers/terragen.py
+++ b/autotest/gdrivers/terragen.py
@@ -57,10 +57,6 @@ def test_terragen_2():
     gdal.GetDriverByName('TERRAGEN').Delete('/vsimem/out.tif')
 
 
-gdaltest_list = [
-    test_terragen_1,
-    test_terragen_2
-]
 
 
 if __name__ == '__main__':
diff --git a/autotest/gdrivers/test_validate_jp2.py b/autotest/gdrivers/test_validate_jp2.py
index dbb3f7a0e509..e6a1470f2826 100755
--- a/autotest/gdrivers/test_validate_jp2.py
+++ b/autotest/gdrivers/test_validate_jp2.py
@@ -378,16 +378,6 @@ def test_validate_jp2_cleanup():
 
     
 
-gdaltest_list = [
-    test_validate_jp2_1,
-    test_validate_jp2_2,
-    test_validate_jp2_3,
-    test_validate_jp2_4,
-    test_validate_jp2_5,
-    test_validate_jp2_6,
-    test_validate_jp2_7,
-    test_validate_jp2_cleanup,
-]
 
 if __name__ == '__main__':
 
diff --git a/autotest/gdrivers/tiff_profile.py b/autotest/gdrivers/tiff_profile.py
index c1e523569cc2..b06feb5a31f6 100755
--- a/autotest/gdrivers/tiff_profile.py
+++ b/autotest/gdrivers/tiff_profile.py
@@ -445,15 +445,6 @@ def test_tiff_update_colorimetric():
 ############################################################################
 
 
-gdaltest_list = [
-    test_tiff_write_icc,
-    test_tiff_copy_icc,
-    test_tiff_copy_options_icc,
-    test_tiff_copy_options_colorimetric_data,
-    test_tiff_copy_colorimetric_data,
-    test_tiff_update_icc,
-    test_tiff_update_colorimetric,
-]
 
 if __name__ == '__main__':
 
diff --git a/autotest/gdrivers/til.py b/autotest/gdrivers/til.py
index d58baf4023e6..69273022be6c 100755
--- a/autotest/gdrivers/til.py
+++ b/autotest/gdrivers/til.py
@@ -108,10 +108,6 @@ def test_til_3():
 
     
 
-gdaltest_list = [
-    test_til_1,
-    test_til_2,
-    test_til_3]
 
 if __name__ == '__main__':
 
diff --git a/autotest/gdrivers/usgsdem.py b/autotest/gdrivers/usgsdem.py
index b3a88fd641be..fd937237bd1d 100755
--- a/autotest/gdrivers/usgsdem.py
+++ b/autotest/gdrivers/usgsdem.py
@@ -247,19 +247,6 @@ def test_usgsdem_cleanup():
 
     
 
-gdaltest_list = [
-    test_usgsdem_1,
-    test_usgsdem_2,
-    test_usgsdem_3,
-    test_usgsdem_4,
-    test_usgsdem_5,
-    test_usgsdem_6,
-    test_usgsdem_7,
-    test_usgsdem_8,
-    test_usgsdem_9,
-    test_usgsdem_with_extra_values_at_end_of_profile,
-    test_usgsdem_with_spaces_after_byte_864,
-    test_usgsdem_cleanup]
 
 if __name__ == '__main__':
 
diff --git a/autotest/gdrivers/vicar.py b/autotest/gdrivers/vicar.py
index 3f490d5cd10d..385b31514f98 100755
--- a/autotest/gdrivers/vicar.py
+++ b/autotest/gdrivers/vicar.py
@@ -75,8 +75,6 @@ def test_vicar_1():
 
     
 
-gdaltest_list = [
-    test_vicar_1]
 
 if __name__ == '__main__':
 
diff --git a/autotest/gdrivers/vrtderived.py b/autotest/gdrivers/vrtderived.py
index 2cbf0922e7ab..2dd34b7273f1 100755
--- a/autotest/gdrivers/vrtderived.py
+++ b/autotest/gdrivers/vrtderived.py
@@ -853,24 +853,6 @@ def test_vrtderived_cleanup():
         pass
     
 
-gdaltest_list = [
-    test_vrtderived_1,
-    test_vrtderived_2,
-    test_vrtderived_3,
-    test_vrtderived_4,
-    test_vrtderived_5,
-    test_vrtderived_6,
-    test_vrtderived_7,
-    test_vrtderived_8,
-    test_vrtderived_9,
-    test_vrtderived_10,
-    test_vrtderived_11,
-    test_vrtderived_12,
-    test_vrtderived_13,
-    test_vrtderived_14,
-    test_vrtderived_15,
-    test_vrtderived_cleanup,
-]
 
 if __name__ == '__main__':
 
diff --git a/autotest/gdrivers/vrtfilt.py b/autotest/gdrivers/vrtfilt.py
index a497c44f99cd..e8b6ec50d9a6 100755
--- a/autotest/gdrivers/vrtfilt.py
+++ b/autotest/gdrivers/vrtfilt.py
@@ -158,14 +158,6 @@ def test_vrtfilt_6():
 def test_vrtfilt_cleanup():
     pass
 
-gdaltest_list = [
-    test_vrtfilt_1,
-    test_vrtfilt_2,
-    test_vrtfilt_3,
-    test_vrtfilt_4,
-    test_vrtfilt_5,
-    test_vrtfilt_6,
-    test_vrtfilt_cleanup]
 
 if __name__ == '__main__':
 
diff --git a/autotest/gdrivers/vrtlut.py b/autotest/gdrivers/vrtlut.py
index e0aa1590e261..e5fe5da486ec 100755
--- a/autotest/gdrivers/vrtlut.py
+++ b/autotest/gdrivers/vrtlut.py
@@ -49,9 +49,6 @@ def test_vrtlut_1():
 def test_vrtlut_cleanup():
     pass
 
-gdaltest_list = [
-    test_vrtlut_1,
-    test_vrtlut_cleanup]
 
 if __name__ == '__main__':
 
diff --git a/autotest/gdrivers/vrtmask.py b/autotest/gdrivers/vrtmask.py
index 7f0eda5fdef0..1b89e0279162 100755
--- a/autotest/gdrivers/vrtmask.py
+++ b/autotest/gdrivers/vrtmask.py
@@ -376,19 +376,6 @@ def test_vrtmask_11():
 def test_vrtmask_cleanup():
     pass
 
-gdaltest_list = [
-    test_vrtmask_1,
-    test_vrtmask_2,
-    test_vrtmask_3,
-    test_vrtmask_4,
-    test_vrtmask_5,
-    test_vrtmask_6,
-    test_vrtmask_7,
-    test_vrtmask_8,
-    test_vrtmask_9,
-    test_vrtmask_10,
-    test_vrtmask_11,
-    test_vrtmask_cleanup]
 
 if __name__ == '__main__':
 
diff --git a/autotest/gdrivers/vrtovr.py b/autotest/gdrivers/vrtovr.py
index 9ecb339490a1..16cca218e65c 100755
--- a/autotest/gdrivers/vrtovr.py
+++ b/autotest/gdrivers/vrtovr.py
@@ -178,12 +178,6 @@ def test_vrtovr_errors():
 def test_vrtovr_cleanup():
     pass
 
-gdaltest_list = [
-    test_vrtovr_1,
-    test_vrtovr_2,
-    test_vrtovr_none,
-    test_vrtovr_errors,
-    test_vrtovr_cleanup]
 
 if __name__ == '__main__':
 
diff --git a/autotest/gdrivers/vrtpansharpen.py b/autotest/gdrivers/vrtpansharpen.py
index 97ad37084038..a68bdc373cd8 100755
--- a/autotest/gdrivers/vrtpansharpen.py
+++ b/autotest/gdrivers/vrtpansharpen.py
@@ -1777,20 +1777,6 @@ def test_vrtpansharpen_cleanup():
     gdal.GetDriverByName('GTiff').Delete('/vsimem/ms.tif')
 
 
-gdaltest_list = [
-    test_vrtpansharpen_1,
-    test_vrtpansharpen_2,
-    test_vrtpansharpen_3,
-    test_vrtpansharpen_4,
-    test_vrtpansharpen_5,
-    test_vrtpansharpen_6,
-    test_vrtpansharpen_7,
-    test_vrtpansharpen_8,
-    test_vrtpansharpen_9,
-    test_vrtpansharpen_10,
-    test_vrtpansharpen_11,
-    test_vrtpansharpen_cleanup,
-]
 
 # gdaltest_list= [ vrtpansharpen_1, vrtpansharpen_8 ]
 
diff --git a/autotest/gdrivers/vrtrawlink.py b/autotest/gdrivers/vrtrawlink.py
index 4339e0d30127..9df5769349fd 100755
--- a/autotest/gdrivers/vrtrawlink.py
+++ b/autotest/gdrivers/vrtrawlink.py
@@ -327,18 +327,6 @@ def test_vrtrawlink_cleanup():
         pass
     
 
-gdaltest_list = [
-    test_vrtrawlink_1,
-    test_vrtrawlink_2,
-    test_vrtrawlink_3,
-    test_vrtrawlink_4,
-    test_vrtrawlink_5,
-    test_vrtrawlink_6,
-    test_vrtrawlink_7,
-    test_vrtrawlink_8,
-    test_vrtrawlink_9,
-    test_vrtrawlink_10,
-    test_vrtrawlink_cleanup]
 
 if __name__ == '__main__':
 
diff --git a/autotest/gdrivers/vrtwarp.py b/autotest/gdrivers/vrtwarp.py
index 89dfaa522c8d..a72f82caedfa 100755
--- a/autotest/gdrivers/vrtwarp.py
+++ b/autotest/gdrivers/vrtwarp.py
@@ -416,20 +416,6 @@ def test_vrtwarp_read_vrt_of_warped_vrt():
 # Test different nodata values on bands and partial blocks (#6581)
 
 
-gdaltest_list = [
-    test_vrtwarp_1,
-    test_vrtwarp_2,
-    test_vrtwarp_3,
-    test_vrtwarp_4,
-    test_vrtwarp_5,
-    test_vrtwarp_6,
-    test_vrtwarp_7,
-    test_vrtwarp_8,
-    test_vrtwarp_9,
-    test_vrtwarp_10,
-    test_vrtwarp_11,
-    test_vrtwarp_read_vrt_of_warped_vrt
-]
 
 
 if __name__ == '__main__':
diff --git a/autotest/gdrivers/wcs.py b/autotest/gdrivers/wcs.py
index 1d3500cf7b5d..1735b2b66852 100755
--- a/autotest/gdrivers/wcs.py
+++ b/autotest/gdrivers/wcs.py
@@ -534,14 +534,6 @@ def test_wcs_cleanup():
 
     
 
-gdaltest_list = [
-    test_wcs_1,
-    # wcs_2, #FIXME: re-enable after adapting test
-    test_wcs_3,
-    test_wcs_4,
-    # wcs_5, #FIXME: re-enable after adapting test
-    test_wcs_6,
-    test_wcs_cleanup]
 
 
 if __name__ == '__main__':
diff --git a/autotest/gdrivers/webp.py b/autotest/gdrivers/webp.py
index ac7068e2a365..8c66affe1f79 100755
--- a/autotest/gdrivers/webp.py
+++ b/autotest/gdrivers/webp.py
@@ -136,12 +136,6 @@ def test_webp_5():
     assert cs4 == 10807, 'did not get expected checksum on band 4'
 
 
-gdaltest_list = [
-    test_webp_1,
-    test_webp_2,
-    test_webp_3,
-    test_webp_4,
-    test_webp_5]
 
 if __name__ == '__main__':
 
diff --git a/autotest/gdrivers/wms.py b/autotest/gdrivers/wms.py
index 208bccaf1981..9ceeefc3c590 100755
--- a/autotest/gdrivers/wms.py
+++ b/autotest/gdrivers/wms.py
@@ -830,27 +830,6 @@ def test_wms_cleanup():
 
     
 
-gdaltest_list = [
-    test_wms_1,
-    # wms_2,
-    # wms_3,
-    # wms_4,
-    test_wms_5,
-    test_wms_6,
-    test_wms_7,
-    test_wms_8,
-    # wms_9,
-    # wms_10,
-    test_wms_11,
-    test_wms_12,
-    test_wms_13,
-    test_wms_14,
-    test_wms_15,
-    test_wms_16,
-    # wms_17,
-    test_wms_18,
-    test_wms_19,
-    test_wms_cleanup]
 
 
 if __name__ == '__main__':
diff --git a/autotest/gdrivers/wmts.py b/autotest/gdrivers/wmts.py
index 307dd7a86a7f..66f73bd46619 100755
--- a/autotest/gdrivers/wmts.py
+++ b/autotest/gdrivers/wmts.py
@@ -1799,38 +1799,6 @@ def test_wmts_cleanup():
 
     
 
-gdaltest_list = [
-    test_wmts_1,
-    test_wmts_2,
-    test_wmts_3,
-    test_wmts_4,
-    test_wmts_5,
-    test_wmts_6,
-    test_wmts_7,
-    test_wmts_8,
-    test_wmts_9,
-    test_wmts_10,
-    test_wmts_11,
-    test_wmts_12,
-    test_wmts_12bis,
-    test_wmts_13,
-    test_wmts_14,
-    test_wmts_15,
-    test_wmts_16,
-    test_wmts_17,
-    test_wmts_18,
-    test_wmts_19,
-    test_wmts_20,
-    test_wmts_21,
-    test_wmts_22,
-    test_wmts_23_gray,
-    test_wmts_23_grayalpha,
-    test_wmts_23_pal,
-    test_wmts_23_rgb,
-    test_wmts_23_rgba,
-    test_wmts_invalid_global_to_tm_reprojection,
-    test_wmts_check_no_overflow_zoom_level,
-    test_wmts_cleanup]
 
 if __name__ == '__main__':
 
diff --git a/autotest/gdrivers/xpm.py b/autotest/gdrivers/xpm.py
index deca08c9570c..435a4c2a54e0 100755
--- a/autotest/gdrivers/xpm.py
+++ b/autotest/gdrivers/xpm.py
@@ -59,7 +59,6 @@ def test_xpm_1():
     return tst.testCreateCopy(vsimem=1, check_minmax=False)
 
 
-gdaltest_list = [test_xpm_1]
 
 
 if __name__ == '__main__':
diff --git a/autotest/gdrivers/xyz.py b/autotest/gdrivers/xyz.py
index e4547cba98e8..2a893a860396 100755
--- a/autotest/gdrivers/xyz.py
+++ b/autotest/gdrivers/xyz.py
@@ -251,16 +251,6 @@ def test_xyz_cleanup():
 
     pass
 
-gdaltest_list = [
-    test_xyz_1,
-    test_xyz_2,
-    test_xyz_3,
-    test_xyz_4,
-    test_xyz_5,
-    test_xyz_6,
-    test_xyz_7,
-    test_xyz_8,
-    test_xyz_cleanup]
 
 if __name__ == '__main__':
 
diff --git a/autotest/gdrivers/zmap.py b/autotest/gdrivers/zmap.py
index aceb5bb4dd68..cd80d3e60455 100755
--- a/autotest/gdrivers/zmap.py
+++ b/autotest/gdrivers/zmap.py
@@ -43,9 +43,6 @@ def test_zmap_1():
     return tst.testCreateCopy(vsimem=1, check_gt=(-67.00041667, 0.00083333, 0.0, 50.000416667, 0.0, -0.00083333))
 
 
-gdaltest_list = [
-    test_zmap_1
-]
 
 if __name__ == '__main__':
 
diff --git a/autotest/gnm/gnm_test.py b/autotest/gnm/gnm_test.py
index 3da500cba9df..1e35881c832e 100755
--- a/autotest/gnm/gnm_test.py
+++ b/autotest/gnm/gnm_test.py
@@ -232,16 +232,6 @@ def test_gnm_delete():
 
     
 
-gdaltest_list = [
-    test_gnm_filenetwork_create,
-    test_gnm_filenetwork_open,
-    test_gnm_import,
-    test_gnm_autoconnect,
-    test_gnm_graph_dijkstra,
-    test_gnm_graph_kshortest,
-    test_gnm_graph_connectedcomponents,
-    test_gnm_delete
-]
 
 if __name__ == '__main__':
 
diff --git a/autotest/kml_generate_test_files.py b/autotest/kml_generate_test_files.py
index 8fc14f0dda42..79ee80140f24 100644
--- a/autotest/kml_generate_test_files.py
+++ b/autotest/kml_generate_test_files.py
@@ -355,7 +355,6 @@ def generate_kmlsuperoverlay(filename):
     src_ds = None
 
 
-gdaltest_list = []
 
 if __name__ == '__main__':
 
diff --git a/autotest/ogr/ogr_arcgen.py b/autotest/ogr/ogr_arcgen.py
index 6c034241c6ee..3fbf4912e19a 100755
--- a/autotest/ogr/ogr_arcgen.py
+++ b/autotest/ogr/ogr_arcgen.py
@@ -185,13 +185,6 @@ def test_ogr_arcgen_polygons25d():
 
     
 
-gdaltest_list = [
-    test_ogr_arcgen_points,
-    test_ogr_arcgen_points25d,
-    test_ogr_arcgen_lines,
-    test_ogr_arcgen_lines25d,
-    test_ogr_arcgen_polygons,
-    test_ogr_arcgen_polygons25d]
 
 
 if __name__ == '__main__':
diff --git a/autotest/ogr/ogr_as_sqlite_extension.py b/autotest/ogr/ogr_as_sqlite_extension.py
index 0d38949d3c2d..4d5630b10d6b 100755
--- a/autotest/ogr/ogr_as_sqlite_extension.py
+++ b/autotest/ogr/ogr_as_sqlite_extension.py
@@ -110,7 +110,6 @@ def do(sqlite3name, gdalname):
         sys.exit(1)
 
 
-gdaltest_list = []
 
 if __name__ == '__main__':
     if len(sys.argv) != 3:
diff --git a/autotest/ogr/ogr_avc.py b/autotest/ogr/ogr_avc.py
index 9308e11d72a6..72df29344419 100755
--- a/autotest/ogr/ogr_avc.py
+++ b/autotest/ogr/ogr_avc.py
@@ -160,13 +160,6 @@ def test_ogr_avc_5():
 
     
 
-gdaltest_list = [
-    test_ogr_avc_1,
-    test_ogr_avc_2,
-    test_ogr_avc_3,
-    test_ogr_avc_4,
-    test_ogr_avc_5
-]
 
 if __name__ == '__main__':
 
diff --git a/autotest/ogr/ogr_basic_test.py b/autotest/ogr/ogr_basic_test.py
index 78fdc21c97d6..a086f72972e0 100755
--- a/autotest/ogr/ogr_basic_test.py
+++ b/autotest/ogr/ogr_basic_test.py
@@ -686,26 +686,6 @@ def test_ogr_basic_cleanup():
     gdaltest.ds = None
 
 
-gdaltest_list = [
-    test_ogr_basic_1,
-    test_ogr_basic_2,
-    test_ogr_basic_3,
-    test_ogr_basic_4,
-    test_ogr_basic_5,
-    test_ogr_basic_6,
-    test_ogr_basic_7,
-    test_ogr_basic_8,
-    test_ogr_basic_9,
-    test_ogr_basic_10,
-    test_ogr_basic_11,
-    test_ogr_basic_12,
-    test_ogr_basic_13,
-    test_ogr_basic_14,
-    test_ogr_basic_15,
-    test_ogr_basic_16,
-    test_ogr_basic_invalid_unicode,
-    test_ogr_basic_dataset_slice,
-    test_ogr_basic_cleanup]
 
 # gdaltest_list = [ ogr_basic_13 ]
 
diff --git a/autotest/ogr/ogr_bna.py b/autotest/ogr/ogr_bna.py
index 1f0334877a0f..16dd0f993bbd 100755
--- a/autotest/ogr/ogr_bna.py
+++ b/autotest/ogr/ogr_bna.py
@@ -222,14 +222,6 @@ def test_ogr_bna_cleanup():
 
     
 
-gdaltest_list = [
-    test_ogr_bna_1,
-    test_ogr_bna_2,
-    test_ogr_bna_3,
-    test_ogr_bna_4,
-    test_ogr_bna_5,
-    test_ogr_bna_6,
-    test_ogr_bna_cleanup]
 
 if __name__ == '__main__':
 
diff --git a/autotest/ogr/ogr_cad.py b/autotest/ogr/ogr_cad.py
index 62cbf9a15f9d..bbfd22536915 100755
--- a/autotest/ogr/ogr_cad.py
+++ b/autotest/ogr/ogr_cad.py
@@ -371,17 +371,6 @@ def test_ogr_cad_cleanup():
     gdaltest.cad_ds = None
 
 
-gdaltest_list = [
-    test_ogr_cad_1,
-    test_ogr_cad_2,
-    test_ogr_cad_3,
-    test_ogr_cad_4,
-    test_ogr_cad_5,
-    test_ogr_cad_6,
-    test_ogr_cad_7,
-    test_ogr_cad_8,
-    test_ogr_cad_9,
-    test_ogr_cad_cleanup]
 
 if __name__ == '__main__':
 
diff --git a/autotest/ogr/ogr_carto.py b/autotest/ogr/ogr_carto.py
index e1df94ac1e07..f739bd905aea 100755
--- a/autotest/ogr/ogr_carto.py
+++ b/autotest/ogr/ogr_carto.py
@@ -1039,12 +1039,6 @@ def ogr_carto_rw_1():
     ds.ExecuteSQL("DELLAYER:" + lyr_name)
 
 
-gdaltest_list = [
-    test_ogr_carto_init,
-    test_ogr_carto_vsimem,
-    test_ogr_carto_vsimem_cleanup,
-    test_ogr_carto_test_ogrsf
-]
 
 
 gdaltest_rw_list = [
diff --git a/autotest/ogr/ogr_cloudant.py b/autotest/ogr/ogr_cloudant.py
index 8865497073fc..bb40da9e26dd 100755
--- a/autotest/ogr/ogr_cloudant.py
+++ b/autotest/ogr/ogr_cloudant.py
@@ -174,14 +174,6 @@ def test_ogr_cloudant_SetSpatialFilter():
 
     
 
-gdaltest_list = [
-    test_ogr_cloudant_init,
-    test_ogr_cloudant_GetFeatureCount,
-    test_ogr_cloudant_GetNextFeature,
-    test_ogr_cloudant_GetSpatialRef,
-    test_ogr_cloudant_GetExtent,
-    test_ogr_cloudant_SetSpatialFilter
-]
 
 if __name__ == '__main__':
 
diff --git a/autotest/ogr/ogr_couchdb.py b/autotest/ogr/ogr_couchdb.py
index 872938025bd9..27e2d49e024e 100755
--- a/autotest/ogr/ogr_couchdb.py
+++ b/autotest/ogr/ogr_couchdb.py
@@ -137,12 +137,6 @@ def test_ogr_couchdb_cleanup():
     ds.ExecuteSQL('DELLAYER:' + ogrtest.couchdb_temp_layer_name)
 
 
-gdaltest_list = [
-    test_ogr_couchdb_init,
-    test_ogr_couchdb_1,
-    test_ogr_couchdb_2,
-    test_ogr_couchdb_cleanup
-]
 
 if __name__ == '__main__':
 
diff --git a/autotest/ogr/ogr_csv.py b/autotest/ogr/ogr_csv.py
index 02fafe696817..b85e857ba0bf 100755
--- a/autotest/ogr/ogr_csv.py
+++ b/autotest/ogr/ogr_csv.py
@@ -2228,63 +2228,6 @@ def test_ogr_csv_cleanup():
 
     
 
-gdaltest_list = [
-    test_ogr_csv_1,
-    test_ogr_csv_2,
-    test_ogr_csv_3,
-    test_ogr_csv_4,
-    test_ogr_csv_5,
-    test_ogr_csv_6,
-    test_ogr_csv_6,
-    test_ogr_csv_7,
-    test_ogr_csv_8,
-    test_ogr_csv_9,
-    test_ogr_csv_10,
-    test_ogr_csv_11,
-    test_ogr_csv_12,
-    test_ogr_csv_13,
-    test_ogr_csv_14,
-    test_ogr_csv_15,
-    test_ogr_csv_16,
-    test_ogr_csv_17,
-    test_ogr_csv_18,
-    test_ogr_csv_19,
-    test_ogr_csv_20,
-    test_ogr_csv_21,
-    test_ogr_csv_22,
-    test_ogr_csv_23,
-    test_ogr_csv_24,
-    test_ogr_csv_25,
-    test_ogr_csv_26,
-    test_ogr_csv_27,
-    test_ogr_csv_28,
-    test_ogr_csv_29,
-    test_ogr_csv_30,
-    test_ogr_csv_31,
-    test_ogr_csv_32,
-    test_ogr_csv_33,
-    test_ogr_csv_34,
-    test_ogr_csv_35,
-    test_ogr_csv_36,
-    test_ogr_csv_37,
-    test_ogr_csv_38,
-    test_ogr_csv_39,
-    test_ogr_csv_40,
-    test_ogr_csv_41,
-    test_ogr_csv_42,
-    test_ogr_csv_43,
-    test_ogr_csv_44,
-    test_ogr_csv_45,
-    test_ogr_csv_46,
-    test_ogr_csv_47,
-    test_ogr_csv_48,
-    test_ogr_csv_49,
-    test_ogr_csv_more_than_100_geom_fields,
-    test_ogr_csv_string_quoting_always,
-    test_ogr_csv_string_quoting_if_ambiguous,
-    test_ogr_csv_string_quoting_if_needed,
-    test_ogr_csv_iter_and_set_feature,
-    test_ogr_csv_cleanup]
 
 if __name__ == '__main__':
 
diff --git a/autotest/ogr/ogr_csw.py b/autotest/ogr/ogr_csw.py
index 2ba6dfa217ed..12db9e6ab45b 100755
--- a/autotest/ogr/ogr_csw.py
+++ b/autotest/ogr/ogr_csw.py
@@ -570,20 +570,6 @@ def test_ogr_csw_vsimem_cleanup():
 
     
 
-gdaltest_list = [
-    test_ogr_csw_vsimem_fail_because_not_enabled,
-    test_ogr_csw_vsimem_fail_because_no_get_capabilities,
-    test_ogr_csw_vsimem_fail_because_empty_response,
-    test_ogr_csw_vsimem_fail_because_no_CSW_Capabilities,
-    test_ogr_csw_vsimem_fail_because_exception,
-    test_ogr_csw_vsimem_fail_because_invalid_xml_capabilities,
-    test_ogr_csw_vsimem_fail_because_missing_version,
-    test_ogr_csw_vsimem_csw_minimal_instance,
-    test_ogr_csw_vsimem_csw_output_schema_csw,
-    test_ogr_csw_vsimem_csw_output_schema_gmd,
-    test_ogr_csw_vsimem_csw_output_schema_fgdc,
-    test_ogr_csw_vsimem_cleanup,
-]
 
 if __name__ == '__main__':
 
diff --git a/autotest/ogr/ogr_db2.py b/autotest/ogr/ogr_db2.py
index 91d6161fffd0..f758bcce9367 100755
--- a/autotest/ogr/ogr_db2.py
+++ b/autotest/ogr/ogr_db2.py
@@ -272,17 +272,6 @@ def ogr_db2_listdrivers():
 
     
 
-gdaltest_list = [
-    test_ogr_db2_check_driver,
-    test_ogr_db2_init,
-    # ogr_db2_listdrivers,
-    test_ogr_db2_GetSpatialRef,
-    test_ogr_db2_GetExtent,
-    test_ogr_db2_GetFeature,
-    test_ogr_db2_SetSpatialFilter,
-    test_ogr_db2_capabilities,
-    test_ogr_db2_GetFeatureCount
-]
 
 if __name__ == '__main__':
 
diff --git a/autotest/ogr/ogr_db2_hack.py b/autotest/ogr/ogr_db2_hack.py
index f328713828c8..d37d5ef13bb5 100755
--- a/autotest/ogr/ogr_db2_hack.py
+++ b/autotest/ogr/ogr_db2_hack.py
@@ -112,11 +112,6 @@ def test_ogr_db2_hack_3():
     ogr.SetGenerate_DB2_V72_BYTE_ORDER(0)
 
 
-gdaltest_list = [
-    test_ogr_db2_hack_1,
-    test_ogr_db2_hack_2,
-    test_ogr_db2_hack_3
-]
 
 if __name__ == '__main__':
 
diff --git a/autotest/ogr/ogr_dgn.py b/autotest/ogr/ogr_dgn.py
index 72cb02d87cfb..b00e19de438f 100755
--- a/autotest/ogr/ogr_dgn.py
+++ b/autotest/ogr/ogr_dgn.py
@@ -264,17 +264,6 @@ def test_ogr_dgn_cleanup():
     gdaltest.clean_tmp()
 
 
-gdaltest_list = [
-    test_ogr_dgn_1,
-    test_ogr_dgn_2,
-    test_ogr_dgn_3,
-    test_ogr_dgn_4,
-    test_ogr_dgn_5,
-    test_ogr_dgn_6,
-    test_ogr_dgn_7,
-    test_ogr_dgn_8,
-    test_ogr_dgn_online_1,
-    test_ogr_dgn_cleanup]
 
 if __name__ == '__main__':
 
diff --git a/autotest/ogr/ogr_dgnv8.py b/autotest/ogr/ogr_dgnv8.py
index b016590c39c5..4f3b63488daa 100755
--- a/autotest/ogr/ogr_dgnv8.py
+++ b/autotest/ogr/ogr_dgnv8.py
@@ -193,13 +193,6 @@ def test_ogr_dgnv8_cleanup():
 
     pass
 
-gdaltest_list = [
-    test_ogr_dgnv8_1,
-    test_ogr_dgnv8_2,
-    test_ogr_dgnv8_3,
-    test_ogr_dgnv8_4,
-    test_ogr_dgnv8_5,
-    test_ogr_dgnv8_cleanup]
 
 if __name__ == '__main__':
 
diff --git a/autotest/ogr/ogr_dods.py b/autotest/ogr/ogr_dods.py
index 367a3a3e87eb..a67e80452950 100755
--- a/autotest/ogr/ogr_dods.py
+++ b/autotest/ogr/ogr_dods.py
@@ -202,7 +202,6 @@ def ogr_dods_cleanup():
     gdaltest.dods_ds = None
 
 
-gdaltest_list = []
 
 manual_gdaltest_list = [
     ogr_dods_1,
diff --git a/autotest/ogr/ogr_dxf.py b/autotest/ogr/ogr_dxf.py
index 050a0ed26b3a..7fff66698d82 100644
--- a/autotest/ogr/ogr_dxf.py
+++ b/autotest/ogr/ogr_dxf.py
@@ -3496,63 +3496,6 @@ def test_ogr_dxf_cleanup():
 #
 
 
-gdaltest_list = [
-    test_ogr_dxf_1,
-    test_ogr_dxf_2,
-    test_ogr_dxf_3,
-    test_ogr_dxf_4,
-    test_ogr_dxf_5,
-    test_ogr_dxf_6,
-    test_ogr_dxf_7,
-    test_ogr_dxf_8,
-    test_ogr_dxf_9,
-    test_ogr_dxf_10,
-    test_ogr_dxf_11,
-    test_ogr_dxf_12,
-    test_ogr_dxf_13,
-    test_ogr_dxf_14,
-    test_ogr_dxf_15,
-    test_ogr_dxf_16,
-    test_ogr_dxf_17,
-    test_ogr_dxf_18,
-    test_ogr_dxf_19,
-    test_ogr_dxf_20,
-    test_ogr_dxf_21,
-    test_ogr_dxf_22,
-    test_ogr_dxf_23,
-    test_ogr_dxf_24,
-    test_ogr_dxf_25,
-    test_ogr_dxf_26,
-    test_ogr_dxf_27,
-    test_ogr_dxf_28,
-    test_ogr_dxf_29,
-    test_ogr_dxf_30,
-    test_ogr_dxf_31,
-    test_ogr_dxf_32,
-    test_ogr_dxf_33,
-    test_ogr_dxf_34,
-    test_ogr_dxf_35,
-    test_ogr_dxf_36,
-    test_ogr_dxf_37,
-    test_ogr_dxf_38,
-    test_ogr_dxf_39,
-    test_ogr_dxf_40,
-    test_ogr_dxf_41,
-    test_ogr_dxf_42,
-    test_ogr_dxf_43,
-    test_ogr_dxf_44,
-    test_ogr_dxf_45,
-    test_ogr_dxf_46,
-    test_ogr_dxf_47,
-    test_ogr_dxf_48,
-    test_ogr_dxf_49,
-    test_ogr_dxf_50,
-    test_ogr_dxf_51,
-    test_ogr_dxf_52,
-    test_ogr_dxf_53,
-    test_ogr_dxf_insert_too_many_errors,
-    test_ogr_dxf_write_geometry_collection_of_unsupported_type,
-    test_ogr_dxf_cleanup]
 
 if __name__ == '__main__':
 
diff --git a/autotest/ogr/ogr_edigeo.py b/autotest/ogr/ogr_edigeo.py
index a2202df1b71c..5ff2404929d9 100755
--- a/autotest/ogr/ogr_edigeo.py
+++ b/autotest/ogr/ogr_edigeo.py
@@ -116,8 +116,6 @@ def test_ogr_edigeo_1():
     ds.Destroy()
 
 
-gdaltest_list = [
-    test_ogr_edigeo_1]
 
 if __name__ == '__main__':
 
diff --git a/autotest/ogr/ogr_eeda.py b/autotest/ogr/ogr_eeda.py
index de674159378c..d70c065cfa07 100644
--- a/autotest/ogr/ogr_eeda.py
+++ b/autotest/ogr/ogr_eeda.py
@@ -428,12 +428,6 @@ def test_eeda_cleanup():
     gdal.Unlink('/vsimem/ee/projects/earthengine-public/assets/collection:listImages?filter=raw%5Ffilter')
 
 
-gdaltest_list = [
-    test_eeda_1,
-    test_eeda_2,
-    test_eeda_3,
-    test_eeda_4,
-    test_eeda_cleanup]
 
 if __name__ == '__main__':
 
diff --git a/autotest/ogr/ogr_elasticsearch.py b/autotest/ogr/ogr_elasticsearch.py
index 4ab2e8274b6e..93ad881a5075 100755
--- a/autotest/ogr/ogr_elasticsearch.py
+++ b/autotest/ogr/ogr_elasticsearch.py
@@ -2283,23 +2283,6 @@ def test_ogr_elasticsearch_cleanup():
     gdal.SetConfigOption('CPL_CURL_ENABLE_VSIMEM', None)
 
 
-gdaltest_list = [
-    test_ogr_elasticsearch_init,
-    test_ogr_elasticsearch_nonexistent_server,
-    test_ogr_elasticsearch_1,
-    test_ogr_elasticsearch_2,
-    test_ogr_elasticsearch_3,
-    test_ogr_elasticsearch_4,
-    test_ogr_elasticsearch_5,
-    test_ogr_elasticsearch_6,
-    test_ogr_elasticsearch_7,
-    test_ogr_elasticsearch_8,
-    test_ogr_elasticsearch_9,
-    test_ogr_elasticsearch_10,
-    test_ogr_elasticsearch_11,
-    test_ogr_elasticsearch_authentication,
-    test_ogr_elasticsearch_cleanup,
-]
 
 # gdaltest_list = [ ogr_elasticsearch_init, ogr_elasticsearch_10 ]
 
diff --git a/autotest/ogr/ogr_factory.py b/autotest/ogr/ogr_factory.py
index e0fc730d6b03..9d5051f4a3c9 100755
--- a/autotest/ogr/ogr_factory.py
+++ b/autotest/ogr/ogr_factory.py
@@ -532,16 +532,6 @@ def test_ogr_factory_8():
 
     
 
-gdaltest_list = [
-    test_ogr_factory_1,
-    test_ogr_factory_2,
-    test_ogr_factory_3,
-    test_ogr_factory_4,
-    test_ogr_factory_5,
-    test_ogr_factory_6,
-    test_ogr_factory_7,
-    test_ogr_factory_8,
-]
 
 if __name__ == '__main__':
 
diff --git a/autotest/ogr/ogr_feature.py b/autotest/ogr/ogr_feature.py
index 30999b8b3b55..6b99cf69e8c0 100755
--- a/autotest/ogr/ogr_feature.py
+++ b/autotest/ogr/ogr_feature.py
@@ -934,28 +934,6 @@ def test_ogr_feature_cleanup():
     gdaltest.src_feature = None
 
 
-gdaltest_list = [
-    test_ogr_feature_cp_integer,
-    test_ogr_feature_cp_integer64,
-    test_ogr_feature_cp_real,
-    test_ogr_feature_cp_string,
-    test_ogr_feature_cp_binary,
-    test_ogr_feature_cp_date,
-    test_ogr_feature_cp_time,
-    test_ogr_feature_cp_datetime,
-    test_ogr_feature_cp_integerlist,
-    test_ogr_feature_cp_integer64list,
-    test_ogr_feature_cp_reallist,
-    test_ogr_feature_cp_stringlist,
-    test_ogr_feature_unicode,
-    test_ogr_feature_64bit_fid,
-    test_ogr_feature_overflow_64bit_integer,
-    test_ogr_feature_nullable_validate,
-    test_ogr_feature_default,
-    test_ogr_feature_native_data,
-    test_ogr_feature_set_geometry_self,
-    test_ogr_feature_null_field,
-    test_ogr_feature_cleanup]
 
 if __name__ == '__main__':
 
diff --git a/autotest/ogr/ogr_fgdb.py b/autotest/ogr/ogr_fgdb.py
index 62e55efe9997..d9133d93d622 100755
--- a/autotest/ogr/ogr_fgdb.py
+++ b/autotest/ogr/ogr_fgdb.py
@@ -2195,38 +2195,6 @@ def test_ogr_fgdb_cleanup():
 
     
 
-gdaltest_list = [
-    test_ogr_fgdb_init,
-    test_ogr_fgdb_1,
-    test_ogr_fgdb_DeleteField,
-    test_ogr_fgdb_2,
-    test_ogr_fgdb_3,
-    test_ogr_fgdb_sql,
-    test_ogr_fgdb_4,
-    test_ogr_fgdb_5,
-    test_ogr_fgdb_6,
-    test_ogr_fgdb_7,
-    test_ogr_fgdb_8,
-    test_ogr_fgdb_9,
-    test_ogr_fgdb_10,
-    test_ogr_fgdb_11,
-    test_ogr_fgdb_12,
-    test_ogr_fgdb_13,
-    test_ogr_fgdb_14,
-    test_ogr_fgdb_15,
-    test_ogr_fgdb_16,
-    test_ogr_fgdb_17,
-    test_ogr_fgdb_18,
-    test_ogr_fgdb_19,
-    test_ogr_fgdb_19bis,
-    test_ogr_fgdb_20,
-    test_ogr_fgdb_21,
-    test_ogr_fgdb_22,
-    test_ogr_fgdb_23,
-    test_ogr_fgdb_24,
-    test_ogr_fgdb_25,
-    test_ogr_fgdb_cleanup,
-]
 
 disabled_gdaltest_list = [
     test_ogr_fgdb_init,
diff --git a/autotest/ogr/ogr_fgdb_stress_test.py b/autotest/ogr/ogr_fgdb_stress_test.py
index 64063022935e..656f55ceb746 100755
--- a/autotest/ogr/ogr_fgdb_stress_test.py
+++ b/autotest/ogr/ogr_fgdb_stress_test.py
@@ -212,7 +212,6 @@ def ogr_fgdb_stress_test_cleanup():
 
 
 # Do nothing in whole run of the suite
-gdaltest_list = []
 
 explicit_gdaltest_list = [ogr_fgdb_stress_test_init,
                           ogr_fgdb_stress_test_1,
diff --git a/autotest/ogr/ogr_geoconcept.py b/autotest/ogr/ogr_geoconcept.py
index 2b9e00715a3a..307763e472a9 100755
--- a/autotest/ogr/ogr_geoconcept.py
+++ b/autotest/ogr/ogr_geoconcept.py
@@ -282,16 +282,6 @@ def test_ogr_gxt_cleanup():
         pass
     
 
-gdaltest_list = [
-    test_ogr_gxt_1,
-    test_ogr_gxt_2,
-    test_ogr_gxt_3,
-    test_ogr_gxt_multipolygon_singlepart_nohole,
-    test_ogr_gxt_multipolygon_singlepart_hole,
-    test_ogr_gxt_multipolygon_twoparts_second_with_hole,
-    test_ogr_gxt_line,
-    test_ogr_gxt_cleanup,
-    None]
 
 if __name__ == '__main__':
 
diff --git a/autotest/ogr/ogr_geojson.py b/autotest/ogr/ogr_geojson.py
index f29a460046ef..023d67d3d1d7 100755
--- a/autotest/ogr/ogr_geojson.py
+++ b/autotest/ogr/ogr_geojson.py
@@ -3643,85 +3643,6 @@ def test_ogr_geojson_cleanup():
 
     
 
-gdaltest_list = [
-    test_ogr_geojson_1,
-    test_ogr_geojson_2,
-    test_ogr_geojson_3,
-    test_ogr_geojson_4,
-    test_ogr_geojson_5,
-    test_ogr_geojson_6,
-    test_ogr_geojson_7,
-    test_ogr_geojson_8,
-    test_ogr_geojson_9,
-    test_ogr_geojson_10,
-    test_ogr_geojson_11,
-    test_ogr_geojson_12,
-    test_ogr_geojson_13,
-    test_ogr_geojson_14,
-    test_ogr_geojson_15,
-    test_ogr_geojson_16,
-    test_ogr_geojson_17,
-    test_ogr_geojson_18,
-    test_ogr_geojson_19,
-    test_ogr_geojson_20,
-    test_ogr_geojson_21,
-    test_ogr_geojson_22,
-    test_ogr_geojson_23,
-    test_ogr_geojson_24,
-    test_ogr_geojson_25,
-    test_ogr_geojson_26,
-    test_ogr_geojson_27,
-    test_ogr_geojson_28,
-    test_ogr_geojson_29,
-    test_ogr_geojson_30,
-    test_ogr_geojson_31,
-    test_ogr_geojson_32,
-    test_ogr_geojson_33,
-    test_ogr_geojson_34,
-    test_ogr_geojson_35,
-    test_ogr_geojson_36,
-    test_ogr_geojson_37,
-    test_ogr_geojson_38,
-    test_ogr_geojson_39,
-    test_ogr_geojson_40,
-    test_ogr_geojson_41,
-    test_ogr_geojson_42,
-    test_ogr_geojson_43,
-    test_ogr_geojson_44,
-    test_ogr_geojson_45,
-    test_ogr_geojson_46,
-    test_ogr_geojson_47,
-    test_ogr_geojson_48,
-    test_ogr_geojson_49,
-    test_ogr_geojson_50,
-    test_ogr_geojson_51,
-    test_ogr_geojson_52,
-    test_ogr_geojson_53,
-    test_ogr_geojson_54,
-    test_ogr_geojson_55,
-    test_ogr_geojson_56,
-    test_ogr_geojson_57,
-    test_ogr_geojson_58,
-    test_ogr_geojson_59,
-    test_ogr_geojson_60,
-    test_ogr_geojson_61,
-    test_ogr_geojson_62,
-    test_ogr_geojson_63,
-    test_ogr_geojson_64,
-    test_ogr_geojson_65,
-    test_ogr_geojson_66,
-    test_ogr_geojson_67,
-    test_ogr_geojson_68,
-    test_ogr_geojson_id_field_and_id_type,
-    test_ogr_geojson_geom_export_failure,
-    test_ogr_geojson_starting_with_crs,
-    test_ogr_geojson_append_flush,
-    test_ogr_geojson_empty_geometrycollection,
-    test_ogr_esrijson_without_geometryType,
-    test_ogr_geojson_read_fields_with_different_case,
-    test_ogr_geojson_clip_geometries_rfc7946,
-    test_ogr_geojson_non_finite,
-    test_ogr_geojson_cleanup]
 
 if __name__ == '__main__':
 
diff --git a/autotest/ogr/ogr_geojsonseq.py b/autotest/ogr/ogr_geojsonseq.py
index 8bf6f68e4305..50bac327b50b 100755
--- a/autotest/ogr/ogr_geojsonseq.py
+++ b/autotest/ogr/ogr_geojsonseq.py
@@ -183,17 +183,6 @@ def test_ogr_geojsonseq_test_ogrsf():
     assert ret.find('INFO') != -1 and ret.find('ERROR') == -1
 
 
-gdaltest_list = [
-    test_ogr_geojsonseq_lf,
-    test_ogr_geojsonseq_rs,
-    test_ogr_geojsonseq_rs_auto,
-    test_ogr_geojsonseq_inline,
-    test_ogr_geojsonseq_prefix,
-    test_ogr_geojsonseq_seq_geometries,
-    test_ogr_geojsonseq_reprojection,
-    test_ogr_geojsonseq_read_rs_json_pretty,
-    test_ogr_geojsonseq_test_ogrsf,
-]
 
 if __name__ == '__main__':
 
diff --git a/autotest/ogr/ogr_geom.py b/autotest/ogr/ogr_geom.py
index 9aae6ea1788a..753bc13cb656 100755
--- a/autotest/ogr/ogr_geom.py
+++ b/autotest/ogr/ogr_geom.py
@@ -3228,76 +3228,6 @@ def test_ogr_geom_force_polygonzm_to_linestring():
 def test_ogr_geom_cleanup():
     pass
 
-gdaltest_list = [
-    test_ogr_geom_area,
-    test_ogr_geom_polyhedral_surface,
-    test_ogr_geom_tin,
-    test_ogr_geom_area_triangle,
-    test_ogr_geom_area_linearring,
-    test_ogr_geom_area_linearring_big_offset,
-    test_ogr_geom_area_geometrycollection,
-    test_ogr_geom_is_empty,
-    test_ogr_geom_is_empty_triangle,
-    test_ogr_geom_pickle,
-    test_ogr_geom_boundary_point,
-    test_ogr_geom_boundary_multipoint,
-    test_ogr_geom_boundary_linestring,
-    test_ogr_geom_boundary_polygon,
-    test_ogr_geom_build_from_edges_1,
-    test_ogr_geom_build_from_edges_2,
-    test_ogr_geom_build_from_edges_3,
-    test_ogr_geom_build_from_edges_4,
-    test_ogr_geom_area_empty_linearring,
-    test_ogr_geom_transform_to,
-    test_ogr_geom_transform,
-    test_ogr_geom_closerings,
-    test_ogr_geom_segmentize,
-    test_ogr_geom_value,
-    test_ogr_geom_flattenTo2D,
-    test_ogr_geom_flattenTo2D_triangle,
-    test_ogr_geom_linestring_limits,
-    test_ogr_geom_coord_round,
-    test_ogr_geom_coord_round_2,
-    test_ogr_geom_area_point,
-    test_ogr_geom_length_point,
-    test_ogr_geom_length_multilinestring,
-    test_ogr_geom_length_geometrycollection,
-    test_ogr_geom_empty_triangle,
-    test_ogr_geom_triangle,
-    test_ogr_geom_triangle_invalid_wkt,
-    test_ogr_geom_triangle_sfcgal,
-    test_ogr_geom_empty,
-    test_ogr_geom_getpoints,
-    test_ogr_geom_mixed_coordinate_dimension,
-    test_ogr_geom_getenvelope3d,
-    test_ogr_geom_z_empty,
-    test_ogr_geom_getlineargeometry,
-    test_ogr_geom_getdimension,
-    test_ogr_geom_circularstring,
-    test_ogr_geom_compoundcurve,
-    test_ogr_geom_curvepolygon,
-    test_ogr_geom_multicurve,
-    test_ogr_geom_multisurface,
-    test_ogr_geom_getcurvegeometry,
-    test_ogr_geom_gt_functions,
-    test_ogr_geom_api_limit_tests,
-    test_ogr_geom_equals,
-    test_ogr_geom_measured_geometries_to_2D_or_3D,
-    test_ogr_geom_postgis_ewkt_xym,
-    test_ogr_geom_curve_surface,
-    test_ogr_geom_import_corrupted_wkb,
-    test_ogr_geom_triangle_ps_tin_conversion,
-    test_ogr_geom_multipoint_envelope_bug,
-    test_ogr_geom_polygon_empty_ring,
-    test_ogr_geom_polygon_intersects_point,
-    test_ogr_geom_geometrycollection,
-    test_ogr_geom_assignspatialref,
-    test_ogr_geom_swapxy,
-    test_ogr_geom_remove_geometry,
-    test_ogr_geom_sfcgal,
-    test_ogr_geom_cannot_add_triangle_to_multisurface,
-    test_ogr_geom_force_polygonzm_to_linestring,
-    test_ogr_geom_cleanup]
 
 # gdaltest_list = [ ogr_geom_triangle_ps_tin_conversion ]
 
diff --git a/autotest/ogr/ogr_georss.py b/autotest/ogr/ogr_georss.py
index a430163f19ce..d94401a22182 100755
--- a/autotest/ogr/ogr_georss.py
+++ b/autotest/ogr/ogr_georss.py
@@ -566,27 +566,6 @@ def test_ogr_georss_cleanup():
 
     
 
-gdaltest_list = [
-    test_ogr_georss_init,
-    test_ogr_georss_1,
-    test_ogr_georss_1_atom_ns,
-    test_ogr_georss_1bis,
-    test_ogr_georss_1ter,
-    test_ogr_georss_2,
-    test_ogr_georss_3,
-    test_ogr_georss_4,
-    test_ogr_georss_5,
-    test_ogr_georss_6,
-    test_ogr_georss_7,
-    test_ogr_georss_8,
-    test_ogr_georss_9,
-    test_ogr_georss_10,
-    test_ogr_georss_11,
-    test_ogr_georss_12,
-    test_ogr_georss_13,
-    test_ogr_georss_14,
-    test_ogr_georss_15,
-    test_ogr_georss_cleanup]
 
 if __name__ == '__main__':
 
diff --git a/autotest/ogr/ogr_geos.py b/autotest/ogr/ogr_geos.py
index 0f2dfdfd8db4..3ccdaa87cd9c 100755
--- a/autotest/ogr/ogr_geos.py
+++ b/autotest/ogr/ogr_geos.py
@@ -593,40 +593,6 @@ def test_ogr_geos_polygonize():
     assert got is None, ('Got: %s' % got.ExportToWkt())
 
 
-gdaltest_list = [
-    test_ogr_geos_union,
-    test_ogr_geos_intersection,
-    test_ogr_geos_difference,
-    test_ogr_geos_symmetric_difference,
-    test_ogr_geos_sym_difference,
-    test_ogr_geos_intersect,
-    test_ogr_geos_disjoint,
-    test_ogr_geos_touches,
-    test_ogr_geos_crosses,
-    test_ogr_geos_within,
-    test_ogr_geos_contains,
-    test_ogr_geos_overlaps,
-    test_ogr_geos_buffer,
-    test_ogr_geos_centroid,
-    test_ogr_geos_centroid_multipolygon,
-    test_ogr_geos_centroid_point_empty,
-    test_ogr_geos_simplify_linestring,
-    test_ogr_geos_simplifypreservetopology_linestring,
-    test_ogr_geos_unioncascaded,
-    test_ogr_geos_convexhull,
-    test_ogr_geos_distance,
-    test_ogr_geos_isring,
-    test_ogr_geos_issimple_true,
-    test_ogr_geos_issimple_false,
-    test_ogr_geos_isvalid_true,
-    test_ogr_geos_isvalid_true_linestringM,
-    test_ogr_geos_isvalid_true_circularStringM,
-    test_ogr_geos_isvalid_true_triangle,
-    test_ogr_geos_isvalid_false,
-    test_ogr_geos_pointonsurface,
-    test_ogr_geos_DelaunayTriangulation,
-    test_ogr_geos_polygonize,
-]
 
 if __name__ == '__main__':
 
diff --git a/autotest/ogr/ogr_gft.py b/autotest/ogr/ogr_gft.py
index c49f5b3fb1f8..e9b0a127f7f8 100755
--- a/autotest/ogr/ogr_gft.py
+++ b/autotest/ogr/ogr_gft.py
@@ -287,13 +287,6 @@ def test_ogr_gft_ogr2ogr_spatial():
     ds = None
 
 
-gdaltest_list = [
-    test_ogr_gft_init,
-    test_ogr_gft_read,
-    test_ogr_gft_write,
-    test_ogr_gft_ogr2ogr_non_spatial,
-    test_ogr_gft_ogr2ogr_spatial,
-]
 
 if __name__ == '__main__':
 
diff --git a/autotest/ogr/ogr_gml_fgd_read.py b/autotest/ogr/ogr_gml_fgd_read.py
index eaa4098722c0..ea8120cf038f 100755
--- a/autotest/ogr/ogr_gml_fgd_read.py
+++ b/autotest/ogr/ogr_gml_fgd_read.py
@@ -115,10 +115,6 @@ def test_ogr_gml_fgd_2():
 # List test cases
 
 
-gdaltest_list = [
-    test_ogr_gml_fgd_1,
-    test_ogr_gml_fgd_2
-]
 
 
 if __name__ == '__main__':
diff --git a/autotest/ogr/ogr_gml_geom.py b/autotest/ogr/ogr_gml_geom.py
index 062837bcaef4..f2fc680973fa 100755
--- a/autotest/ogr/ogr_gml_geom.py
+++ b/autotest/ogr/ogr_gml_geom.py
@@ -2081,68 +2081,6 @@ def test_gml_write_gml_ns():
 # sys.stdin.readline()
 
 
-gdaltest_list = [
-    test_gml_space_test,
-    test_gml_pos_point,
-    test_gml_pos_polygon,
-    test_gml_posList_line,
-    test_gml_posList_line3d,
-    test_gml_posList_line3d_2,
-    test_gml_polygon,
-    test_gml_out_point_srs,
-    test_gml_out_point3d_srs,
-    test_gml_out_linestring_srs,
-    test_gml_out_polygon_srs,
-    test_gml_out_multipoint_srs,
-    test_gml_out_multilinestring_srs,
-    test_gml_out_multipolygon_srs,
-    test_gml_out_geometrycollection_srs,
-    test_gml_Box,
-    test_gml_Envelope,
-    test_gml_Curve,
-    test_gml_Curve_with_pointProperty,
-    test_gml_MultiCurve,
-    test_gml_MultiSurface,
-    test_gml_MultiSurface_surfaceMembers,
-    test_gml_MultiCurve_curveMembers,
-    test_gml_MultiGeometry_geometryMembers,
-    test_gml_CompositeCurve_curveMembers,
-    test_gml_MultiCurve_pointMembers,
-    test_gml_Solid,
-    test_gml_OrientableSurface,
-    test_gml_Triangle,
-    test_gml_Rectangle,
-    test_gml_Tin,
-    test_gml_PolyhedralSurface,
-    test_gml_ConcatenatedDeduplication,
-    # gml_out_precision,
-    test_gml_invalid_geoms,
-    test_gml_write_gml3_geometries,
-    test_gml_write_gml3_srs,
-    test_gml_nested,
-    test_gml_SimplePolygon,
-    test_gml_SimpleRectangle,
-    test_gml_SimpleTriangle,
-    test_gml_SimpleMultiPoint,
-    test_gml_CompositeCurveInRing,
-    test_gml_CompositeSurface_in_surfaceMembers,
-    test_gml_MultiSurfaceOfSurfaceOfPolygonPatchWithInteriorRing,
-    test_gml_Coordinates_ts_cs_decimal,
-    test_gml_with_xml_header_and_comments,
-    test_gml_srsDimension_topgeometry,
-    test_gml_Arc,
-    test_gml_ArcByBulge,
-    test_gml_ArcByCenterPoint,
-    test_gml_CompoundCurve_of_ArcByCenterPoint,
-    test_gml_CircleByCenterPoint,
-    test_gml_Circle,
-    test_gml_ArcString,
-    test_gml_OGRCompoundCurve,
-    test_gml_OGRCurvePolygon,
-    test_gml_OGRMultiSurface,
-    test_gml_OGRMultiCurve,
-    test_gml_write_gml_ns,
-]
 
 
 if __name__ == '__main__':
diff --git a/autotest/ogr/ogr_gml_read.py b/autotest/ogr/ogr_gml_read.py
index a9e70baf442b..77a11142777e 100755
--- a/autotest/ogr/ogr_gml_read.py
+++ b/autotest/ogr/ogr_gml_read.py
@@ -3674,94 +3674,6 @@ def test_ogr_gml_clean_files():
     gdal.Unlink('data/test_xsi_nil_gfs.gfs')
 
 
-gdaltest_list = [
-    test_ogr_gml_clean_files,
-    test_ogr_gml_1,
-    test_ogr_gml_2,
-    test_ogr_gml_3,
-    test_ogr_gml_4,
-    test_ogr_gml_5,
-    test_ogr_gml_6,
-    test_ogr_gml_7,
-    test_ogr_gml_8,
-    test_ogr_gml_9,
-    test_ogr_gml_10,
-    test_ogr_gml_11,
-    test_ogr_gml_12,
-    test_ogr_gml_13,
-    test_ogr_gml_14,
-    test_ogr_gml_15,
-    test_ogr_gml_16,
-    test_ogr_gml_17,
-    test_ogr_gml_18,
-    test_ogr_gml_19,
-    test_ogr_gml_20,
-    test_ogr_gml_21,
-    test_ogr_gml_21_deegree3,
-    test_ogr_gml_21_gml32,
-    test_ogr_gml_22,
-    test_ogr_gml_23,
-    test_ogr_gml_24,
-    test_ogr_gml_25,
-    test_ogr_gml_26,
-    test_ogr_gml_27,
-    test_ogr_gml_28,
-    test_ogr_gml_29,
-    test_ogr_gml_30,
-    test_ogr_gml_31,
-    test_ogr_gml_32,
-    test_ogr_gml_33,
-    test_ogr_gml_34,
-    test_ogr_gml_35,
-    test_ogr_gml_36,
-    test_ogr_gml_37,
-    test_ogr_gml_38,
-    test_ogr_gml_39,
-    test_ogr_gml_40,
-    test_ogr_gml_41,
-    test_ogr_gml_42,
-    test_ogr_gml_43,
-    test_ogr_gml_44,
-    test_ogr_gml_45,
-    test_ogr_gml_46,
-    test_ogr_gml_47,
-    test_ogr_gml_48,
-    test_ogr_gml_49,
-    test_ogr_gml_50,
-    test_ogr_gml_51,
-    test_ogr_gml_52,
-    test_ogr_gml_53,
-    test_ogr_gml_54,
-    test_ogr_gml_55,
-    test_ogr_gml_56,
-    test_ogr_gml_57,
-    test_ogr_gml_58,
-    test_ogr_gml_59,
-    test_ogr_gml_60,
-    test_ogr_gml_61,
-    test_ogr_gml_62,
-    test_ogr_gml_63,
-    test_ogr_gml_64,
-    test_ogr_gml_65,
-    test_ogr_gml_66,
-    test_ogr_gml_67,
-    test_ogr_gml_68,
-    test_ogr_gml_69,
-    test_ogr_gml_70,
-    test_ogr_gml_71,
-    test_ogr_gml_72,
-    test_ogr_gml_73,
-    test_ogr_gml_74,
-    test_ogr_gml_75,
-    test_ogr_gml_76,
-    test_ogr_gml_77,
-    test_ogr_gml_78,
-    test_ogr_gml_79,
-    test_ogr_gml_80,
-    test_ogr_gml_81,
-    test_ogr_gml_82,
-    test_ogr_gml_gml2_write_geometry_error,
-    test_ogr_gml_cleanup]
 
 disabled_gdaltest_list = [
     test_ogr_gml_clean_files,
diff --git a/autotest/ogr/ogr_gmlas.py b/autotest/ogr/ogr_gmlas.py
index 45103013f11f..cf3d1dafd929 100755
--- a/autotest/ogr/ogr_gmlas.py
+++ b/autotest/ogr/ogr_gmlas.py
@@ -2888,65 +2888,6 @@ def test_ogr_gmlas_cleanup():
     gdal.SetConfigOption('GDAL_XML_VALIDATION', ogrtest.old_val_GDAL_XML_VALIDATION)
 
 
-gdaltest_list = [
-    test_ogr_gmlas_basic,
-    test_ogr_gmlas_test_ogrsf,
-    test_ogr_gmlas_virtual_file,
-    test_ogr_gmlas_datafile_with_xsd_option,
-    test_ogr_gmlas_no_datafile_with_xsd_option,
-    test_ogr_gmlas_no_datafile_xsd_which_is_not_xsd,
-    test_ogr_gmlas_no_datafile_no_xsd,
-    test_ogr_gmlas_non_existing_gml,
-    test_ogr_gmlas_non_existing_xsd,
-    test_ogr_gmlas_gml_without_schema_location,
-    test_ogr_gmlas_invalid_schema,
-    test_ogr_gmlas_invalid_xml,
-    test_ogr_gmlas_gml_Reference,
-    test_ogr_gmlas_same_element_in_different_ns,
-    test_ogr_gmlas_corner_case_relative_path,
-    test_ogr_gmlas_unexpected_repeated_element,
-    test_ogr_gmlas_unexpected_repeated_element_variant,
-    test_ogr_gmlas_geometryproperty,
-    test_ogr_gmlas_abstractgeometry,
-    test_ogr_gmlas_validate,
-    test_ogr_gmlas_test_ns_prefix,
-    test_ogr_gmlas_no_namespace,
-    test_ogr_gmlas_conf,
-    test_ogr_gmlas_conf_ignored_xpath,
-    test_ogr_gmlas_cache,
-    test_ogr_gmlas_link_nested_independant_child,
-    test_ogr_gmlas_composition_compositionPart,
-    test_ogr_gmlas_instantiate_only_gml_feature,
-    test_ogr_gmlas_timestamp_ignored_for_hash,
-    test_ogr_gmlas_dataset_getnextfeature,
-    test_ogr_gmlas_inline_identifier,
-    test_ogr_gmlas_avoid_same_name_inlined_classes,
-    test_ogr_gmlas_validate_ignored_fixed_attribute,
-    test_ogr_gmlas_remove_unused_layers_and_fields,
-    test_ogr_gmlas_xlink_resolver,
-    test_ogr_gmlas_recoding,
-    test_ogr_gmlas_schema_without_namespace_prefix,
-    test_ogr_gmlas_truncated_xml,
-    test_ogr_gmlas_identifier_truncation,
-    test_ogr_gmlas_identifier_case_ambiguity,
-    test_ogr_gmlas_writer,
-    test_ogr_gmlas_writer_check_xml_xsd,
-    test_ogr_gmlas_writer_check_xml_read_back,
-    test_ogr_gmlas_writer_gml,
-    test_ogr_gmlas_writer_gml_assign_srs,
-    test_ogr_gmlas_writer_gml_original_xml,
-    test_ogr_gmlas_writer_options,
-    test_ogr_gmlas_writer_errors,
-    test_ogr_gmlas_read_fake_gmljp2,
-    test_ogr_gmlas_typing_constraints,
-    test_ogr_gmlas_swe_dataarray,
-    test_ogr_gmlas_swe_datarecord,
-    test_ogr_gmlas_any_field_at_end_of_declaration,
-    test_ogr_gmlas_aux_schema_without_namespace_prefix,
-    test_ogr_gmlas_geometry_as_substitutiongroup,
-    test_ogr_gmlas_no_element_in_first_choice_schema,
-    test_ogr_gmlas_internal_xlink_href,
-    test_ogr_gmlas_cleanup]
 
 # gdaltest_list = [ ogr_gmlas_basic, ogr_gmlas_aux_schema_without_namespace_prefix, ogr_gmlas_cleanup ]
 
diff --git a/autotest/ogr/ogr_gmt.py b/autotest/ogr/ogr_gmt.py
index aa2a638083cd..030dd86469fb 100755
--- a/autotest/ogr/ogr_gmt.py
+++ b/autotest/ogr/ogr_gmt.py
@@ -224,13 +224,6 @@ def test_ogr_gmt_cleanup():
     gdaltest.clean_tmp()
 
 
-gdaltest_list = [
-    test_ogr_gmt_1,
-    test_ogr_gmt_2,
-    test_ogr_gmt_3,
-    test_ogr_gmt_4,
-    test_ogr_gmt_5,
-    test_ogr_gmt_cleanup]
 
 if __name__ == '__main__':
 
diff --git a/autotest/ogr/ogr_gpkg.py b/autotest/ogr/ogr_gpkg.py
index ac0e1eed573c..321a13d46fab 100755
--- a/autotest/ogr/ogr_gpkg.py
+++ b/autotest/ogr/ogr_gpkg.py
@@ -3914,72 +3914,6 @@ def test_ogr_gpkg_cleanup():
 ###############################################################################
 
 
-gdaltest_list = [
-    test_ogr_gpkg_1,
-    test_ogr_gpkg_2,
-    test_ogr_gpkg_3,
-    test_ogr_gpkg_4,
-    test_ogr_gpkg_5,
-    test_ogr_gpkg_6,
-    test_ogr_gpkg_7,
-    test_ogr_gpkg_8,
-    test_ogr_gpkg_9,
-    test_ogr_gpkg_11,
-    test_ogr_gpkg_12,
-    test_ogr_gpkg_13,
-    test_ogr_gpkg_14,
-    test_ogr_gpkg_15,
-    test_ogr_gpkg_16,
-    test_ogr_gpkg_17,
-    test_ogr_gpkg_18,
-    test_ogr_gpkg_19,
-    test_ogr_gpkg_20,
-    test_ogr_gpkg_21,
-    test_ogr_gpkg_22,
-    test_ogr_gpkg_23,
-    test_ogr_gpkg_24,
-    test_ogr_gpkg_25,
-    test_ogr_gpkg_26,
-    test_ogr_gpkg_27,
-    test_ogr_gpkg_28,
-    test_ogr_gpkg_29,
-    test_ogr_gpkg_30,
-    test_ogr_gpkg_31,
-    test_ogr_gpkg_32,
-    test_ogr_gpkg_33,
-    test_ogr_gpkg_34,
-    test_ogr_gpkg_35,
-    test_ogr_gpkg_36,
-    test_ogr_gpkg_37,
-    test_ogr_gpkg_38,
-    test_ogr_gpkg_38_nospi,
-    test_ogr_gpkg_39,
-    test_ogr_gpkg_40,
-    test_ogr_gpkg_41,
-    test_ogr_gpkg_42,
-    test_ogr_gpkg_43,
-    test_ogr_gpkg_44,
-    test_ogr_gpkg_45,
-    test_ogr_gpkg_46,
-    test_ogr_gpkg_47,
-    test_ogr_gpkg_48,
-    test_ogr_gpkg_49,
-    test_ogr_gpkg_50,
-    test_ogr_gpkg_51,
-    test_ogr_gpkg_52,
-    test_ogr_gpkg_53,
-    test_ogr_gpkg_54,
-    test_ogr_gpkg_55,
-    test_ogr_gpkg_56,
-    test_ogr_gpkg_57,
-    test_ogr_gpkg_58,
-    test_ogr_gpkg_59,
-    test_ogr_gpkg_savepoint,
-    test_ogr_gpkg_wal,
-    test_ogr_gpkg_json,
-    test_ogr_gpkg_test_ogrsf,
-    test_ogr_gpkg_cleanup,
-]
 
 # gdaltest_list = [ ogr_gpkg_1, ogr_gpkg_47, ogr_gpkg_cleanup ]
 
diff --git a/autotest/ogr/ogr_gpsbabel.py b/autotest/ogr/ogr_gpsbabel.py
index 0e86d41d0ead..1e9773fddda2 100755
--- a/autotest/ogr/ogr_gpsbabel.py
+++ b/autotest/ogr/ogr_gpsbabel.py
@@ -132,11 +132,6 @@ def test_ogr_gpsbabel_3():
        res.find('$GPGSA') == -1)), 'did not get expected result'
 
 
-gdaltest_list = [
-    test_ogr_gpsbabel_init,
-    test_ogr_gpsbabel_1,
-    test_ogr_gpsbabel_2,
-    test_ogr_gpsbabel_3]
 
 
 if __name__ == '__main__':
diff --git a/autotest/ogr/ogr_gpx.py b/autotest/ogr/ogr_gpx.py
index 1f47ff7bfa06..2350b1c0e4a1 100755
--- a/autotest/ogr/ogr_gpx.py
+++ b/autotest/ogr/ogr_gpx.py
@@ -485,22 +485,6 @@ def test_ogr_gpx_cleanup():
         pass
     
 
-gdaltest_list = [
-    test_ogr_gpx_init,
-    test_ogr_gpx_1,
-    test_ogr_gpx_2,
-    test_ogr_gpx_3,
-    test_ogr_gpx_4,
-    test_ogr_gpx_5,
-    test_ogr_gpx_6,
-    # Rerun test 1, 2 and 4 with generated tmp/tmp.gpx
-    test_ogr_gpx_1,
-    test_ogr_gpx_2,
-    test_ogr_gpx_4,
-    test_ogr_gpx_7,
-    test_ogr_gpx_8,
-    test_ogr_gpx_9,
-    test_ogr_gpx_cleanup]
 
 if __name__ == '__main__':
 
diff --git a/autotest/ogr/ogr_grass.py b/autotest/ogr/ogr_grass.py
index f9f2a84099d0..6011fdbaa31d 100755
--- a/autotest/ogr/ogr_grass.py
+++ b/autotest/ogr/ogr_grass.py
@@ -69,10 +69,6 @@ def test_ogr_grass_2():
     ds = None
 
 
-gdaltest_list = [
-    test_ogr_grass_1,
-    test_ogr_grass_2
-]
 
 
 if __name__ == '__main__':
diff --git a/autotest/ogr/ogr_gtm.py b/autotest/ogr/ogr_gtm.py
index e529877107e7..b464f1a2c23e 100755
--- a/autotest/ogr/ogr_gtm.py
+++ b/autotest/ogr/ogr_gtm.py
@@ -340,13 +340,6 @@ def test_ogr_gtm_cleanup():
     os.remove('tmp/gtm.gtm')
 
 
-gdaltest_list = [
-    test_ogr_gtm_init,
-    test_ogr_gtm_read_1,
-    test_ogr_gtm_read_2,
-    test_ogr_gtm_write_1,
-    test_ogr_gtm_check_write_1,
-    test_ogr_gtm_cleanup]
 
 if __name__ == '__main__':
 
diff --git a/autotest/ogr/ogr_htf.py b/autotest/ogr/ogr_htf.py
index 525d36364718..bb2d2c63c5f0 100755
--- a/autotest/ogr/ogr_htf.py
+++ b/autotest/ogr/ogr_htf.py
@@ -100,9 +100,6 @@ def test_ogr_htf_2():
     assert ret.find('INFO') != -1 and ret.find('ERROR') == -1
 
 
-gdaltest_list = [
-    test_ogr_htf_1,
-    test_ogr_htf_2]
 
 
 if __name__ == '__main__':
diff --git a/autotest/ogr/ogr_idrisi.py b/autotest/ogr/ogr_idrisi.py
index efc5d221f5b2..577160256fbc 100755
--- a/autotest/ogr/ogr_idrisi.py
+++ b/autotest/ogr/ogr_idrisi.py
@@ -198,11 +198,6 @@ def test_ogr_idrisi_3():
     ds = None
 
 
-gdaltest_list = [
-    test_ogr_idrisi_1,
-    test_ogr_idrisi_2,
-    test_ogr_idrisi_3,
-]
 
 if __name__ == '__main__':
 
diff --git a/autotest/ogr/ogr_ili.py b/autotest/ogr/ogr_ili.py
index 0606ebd7e5e8..0d88c9d5d88a 100755
--- a/autotest/ogr/ogr_ili.py
+++ b/autotest/ogr/ogr_ili.py
@@ -1265,28 +1265,6 @@ def test_ogr_interlis_cleanup():
     gdaltest.clean_tmp()
 
 
-gdaltest_list = [
-    test_ogr_interlis1_1,
-    test_ogr_interlis1_2,
-    test_ogr_interlis1_3,
-    test_ogr_interlis1_4,
-    test_ogr_interlis1_5,
-    test_ogr_interlis1_6,
-    test_ogr_interlis1_7,
-    test_ogr_interlis1_9,
-    test_ogr_interlis1_10,
-    test_ogr_interlis1_11,
-    test_ogr_interlis1_12,
-    test_ogr_interlis1_13,
-    test_ogr_interlis1_13_linear,
-    test_ogr_interlis1_14,
-    test_ogr_interlis2_1,
-    test_ogr_interlis2_2,
-    test_ogr_interlis2_3,
-    test_ogr_interlis2_4,
-    test_ogr_interlis_arc1,
-    test_ogr_interlis_arc2,
-    test_ogr_interlis_cleanup]
 
 if __name__ == '__main__':
 
diff --git a/autotest/ogr/ogr_index_test.py b/autotest/ogr/ogr_index_test.py
index 10878c280dc9..cf32441a50f7 100755
--- a/autotest/ogr/ogr_index_test.py
+++ b/autotest/ogr/ogr_index_test.py
@@ -444,19 +444,6 @@ def test_ogr_index_cleanup():
         'tmp/ogr_index_11.dbf')
 
 
-gdaltest_list = [
-    test_ogr_index_1,
-    test_ogr_index_2,
-    test_ogr_index_3,
-    test_ogr_index_4,
-    test_ogr_index_5,
-    test_ogr_index_6,
-    test_ogr_index_7,
-    test_ogr_index_8,
-    test_ogr_index_9,
-    test_ogr_index_10,
-    test_ogr_index_11,
-    test_ogr_index_cleanup]
 
 if __name__ == '__main__':
 
diff --git a/autotest/ogr/ogr_ingres.py b/autotest/ogr/ogr_ingres.py
index df3f6707a830..030a6d3d7e07 100755
--- a/autotest/ogr/ogr_ingres.py
+++ b/autotest/ogr/ogr_ingres.py
@@ -293,16 +293,6 @@ def test_ogr_ingres_cleanup():
     gdaltest.ingres_ds = None
 
 
-gdaltest_list = [
-    test_ogr_ingres_1,
-    test_ogr_ingres_2,
-    test_ogr_ingres_3,
-    test_ogr_ingres_4,
-    test_ogr_ingres_5,
-    test_ogr_ingres_6,
-    test_ogr_ingres_7,
-    test_ogr_ingres_8,
-    test_ogr_ingres_cleanup]
 
 if __name__ == '__main__':
 
diff --git a/autotest/ogr/ogr_jml.py b/autotest/ogr/ogr_jml.py
index 86141bc9c111..96ef059230e4 100755
--- a/autotest/ogr/ogr_jml.py
+++ b/autotest/ogr/ogr_jml.py
@@ -612,14 +612,6 @@ def test_ogr_jml_cleanup():
     gdal.Unlink('/vsimem/ogr_jml.jml')
 
 
-gdaltest_list = [
-    test_ogr_jml_init,
-    test_ogr_jml_1,
-    test_ogr_jml_2,
-    test_ogr_jml_3,
-    test_ogr_jml_4,
-    test_ogr_jml_read_srs,
-    test_ogr_jml_cleanup]
 
 if __name__ == '__main__':
 
diff --git a/autotest/ogr/ogr_join_test.py b/autotest/ogr/ogr_join_test.py
index 4b89b163625a..d95f6cf5d892 100755
--- a/autotest/ogr/ogr_join_test.py
+++ b/autotest/ogr/ogr_join_test.py
@@ -503,31 +503,6 @@ def test_ogr_join_cleanup():
     gdaltest.ds = None
 
 
-gdaltest_list = [
-    test_ogr_join_1,
-    test_ogr_join_2,
-    test_ogr_join_3,
-    test_ogr_join_4,
-    test_ogr_join_5,
-    test_ogr_join_6,
-    test_ogr_join_7,
-    test_ogr_join_8,
-    test_ogr_join_9,
-    test_ogr_join_10,
-    test_ogr_join_11,
-    test_ogr_join_12,
-    test_ogr_join_13,
-    test_ogr_join_14,
-    test_ogr_join_15,
-    test_ogr_join_16,
-    test_ogr_join_17,
-    test_ogr_join_18,
-    test_ogr_join_19,
-    test_ogr_join_20,
-    test_ogr_join_21,
-    test_ogr_join_22,
-    test_ogr_join_23,
-    test_ogr_join_cleanup]
 
 if __name__ == '__main__':
 
diff --git a/autotest/ogr/ogr_kml.py b/autotest/ogr/ogr_kml.py
index 7f055d2a38f0..3446fa200151 100755
--- a/autotest/ogr/ogr_kml.py
+++ b/autotest/ogr/ogr_kml.py
@@ -765,35 +765,6 @@ def test_ogr_kml_read_placemark_in_root_and_subfolder():
 # Build tests runner
 
 
-gdaltest_list = [
-    test_ogr_kml_datastore,
-    test_ogr_kml_attributes_1,
-    test_ogr_kml_attributes_2,
-    test_ogr_kml_attributes_3,
-    test_ogr_kml_attributes_4,
-    test_ogr_kml_point_read,
-    test_ogr_kml_linestring_read,
-    test_ogr_kml_polygon_read,
-    test_ogr_kml_write_1,
-    test_ogr_kml_check_write_1,
-    test_ogr_kml_xml_attributes,
-    test_ogr_kml_read_geometries,
-    test_ogr_kml_test_ogrsf,
-    test_ogr_kml_interleaved_writing,
-    test_ogr_kml_read_placemark,
-    test_ogr_kml_read_empty,
-    test_ogr_kml_read_emptylayers,
-    test_ogr_kml_write_schema,
-    test_ogr_kml_empty_layer,
-    test_ogr_kml_two_layers,
-    test_ogr_kml_read_folder_with_subfolder_placemark,
-    test_ogr_kml_read_truncated,
-    test_ogr_kml_read_weird_empty_folders,
-    test_ogr_kml_read_junk_content_after_valid_doc,
-    test_ogr_kml_read_placemark_with_kml_prefix,
-    test_ogr_kml_read_duplicate_folder_name,
-    test_ogr_kml_read_placemark_in_root_and_subfolder,
-    test_ogr_kml_cleanup]
 
 if __name__ == '__main__':
 
diff --git a/autotest/ogr/ogr_layer_algebra.py b/autotest/ogr/ogr_layer_algebra.py
index 40dc09888516..bb03ede13c96 100755
--- a/autotest/ogr/ogr_layer_algebra.py
+++ b/autotest/ogr/ogr_layer_algebra.py
@@ -592,18 +592,6 @@ def test_algebra_cleanup():
     ds = None
 
 
-gdaltest_list = [
-    test_algebra_setup,
-    test_algebra_intersection,
-    test_algebra_KEEP_LOWER_DIMENSION_GEOMETRIES,
-    test_algebra_union,
-    test_algebra_symdifference,
-    test_algebra_identify,
-    test_algebra_update,
-    test_algebra_clip,
-    test_algebra_erase,
-    test_algebra_cleanup,
-]
 
 if __name__ == '__main__':
 
diff --git a/autotest/ogr/ogr_libkml.py b/autotest/ogr/ogr_libkml.py
index d791a33650f3..5bb5af3b8c68 100755
--- a/autotest/ogr/ogr_libkml.py
+++ b/autotest/ogr/ogr_libkml.py
@@ -1945,63 +1945,6 @@ def test_ogr_libkml_cleanup():
 # Build tests runner
 
 
-gdaltest_list = [
-    test_ogr_libkml_datastore,
-    test_ogr_libkml_attributes_1,
-    test_ogr_libkml_attributes_2,
-    test_ogr_libkml_attributes_3,
-    test_ogr_libkml_attributes_4,
-    test_ogr_libkml_point_read,
-    test_ogr_libkml_linestring_read,
-    test_ogr_libkml_polygon_read,
-    test_ogr_libkml_write_kml,
-    test_ogr_libkml_check_write_kml,
-    test_ogr_libkml_write_kmz,
-    test_ogr_libkml_check_write_kmz,
-    test_ogr_libkml_write_kmz_use_doc_off,
-    test_ogr_libkml_check_write_kmz_use_doc_off,
-    test_ogr_libkml_write_dir,
-    test_ogr_libkml_check_write_dir,
-    test_ogr_libkml_xml_attributes,
-    test_ogr_libkml_read_geometries,
-    test_ogr_libkml_test_ogrsf,
-    test_ogr_libkml_read_placemark,
-    test_ogr_libkml_read_empty,
-    test_ogr_libkml_read_emptylayers,
-    test_ogr_libkml_read_emptylayers_without_folder,
-    test_ogr_libkml_read_schema,
-    test_ogr_libkml_extended_data_without_schema_data,
-    test_ogr_libkml_gxtrack,
-    test_ogr_libkml_gxmultitrack,
-    test_ogr_libkml_camera,
-    test_ogr_libkml_write_layer_lookat,
-    test_ogr_libkml_write_layer_camera,
-    test_ogr_libkml_write_multigeometry,
-    test_ogr_libkml_write_snippet,
-    test_ogr_libkml_write_atom_author,
-    test_ogr_libkml_write_atom_link,
-    test_ogr_libkml_write_phonenumber,
-    test_ogr_libkml_write_region,
-    test_ogr_libkml_write_screenoverlay,
-    test_ogr_libkml_write_model,
-    test_ogr_libkml_read_write_style,
-    test_ogr_libkml_write_update,
-    test_ogr_libkml_write_networklinkcontrol,
-    test_ogr_libkml_write_liststyle,
-    test_ogr_libkml_write_networklink,
-    test_ogr_libkml_write_photooverlay,
-    test_ogr_libkml_read_write_data,
-    test_ogr_libkml_write_folder,
-    test_ogr_libkml_write_container_properties,
-    test_ogr_libkml_read_gx_timestamp,
-    test_ogr_libkml_read_placemark_with_kml_prefix,
-    test_ogr_libkml_read_duplicate_folder_name,
-    test_ogr_libkml_read_placemark_in_root_and_subfolder,
-    test_ogr_libkml_read_tab_separated_coord_triplet,
-    test_ogr_libkml_read_kml_with_space_content_in_coordinates,
-    test_ogr_libkml_read_several_schema,
-    test_ogr_libkml_update_existing_kml,
-    test_ogr_libkml_cleanup]
 
 if __name__ == '__main__':
 
diff --git a/autotest/ogr/ogr_mem.py b/autotest/ogr/ogr_mem.py
index cd77d217858a..9df85101bf01 100755
--- a/autotest/ogr/ogr_mem.py
+++ b/autotest/ogr/ogr_mem.py
@@ -648,25 +648,6 @@ def test_ogr_mem_cleanup():
     gdaltest.mem_ds = None
 
 
-gdaltest_list = [
-    test_ogr_mem_1,
-    test_ogr_mem_2,
-    test_ogr_mem_3,
-    test_ogr_mem_4,
-    test_ogr_mem_5,
-    test_ogr_mem_6,
-    test_ogr_mem_7,
-    test_ogr_mem_8,
-    test_ogr_mem_9,
-    test_ogr_mem_10,
-    test_ogr_mem_11,
-    test_ogr_mem_12,
-    test_ogr_mem_13,
-    test_ogr_mem_14,
-    test_ogr_mem_15,
-    test_ogr_mem_16,
-    test_ogr_mem_17,
-    test_ogr_mem_cleanup]
 
 if __name__ == '__main__':
 
diff --git a/autotest/ogr/ogr_mitab.py b/autotest/ogr/ogr_mitab.py
index 9bc2574e5244..7b7e1ece7778 100755
--- a/autotest/ogr/ogr_mitab.py
+++ b/autotest/ogr/ogr_mitab.py
@@ -2308,62 +2308,6 @@ def test_ogr_mitab_cleanup():
     gdaltest.mapinfo_drv.DeleteDataSource('tmp')
 
 
-gdaltest_list = [
-    test_ogr_mitab_1,
-    test_ogr_mitab_2,
-    test_ogr_mitab_3,
-    test_ogr_mitab_4,
-    test_ogr_mitab_5,
-    test_ogr_mitab_6,
-    test_ogr_mitab_7,
-    test_ogr_mitab_8,
-    test_ogr_mitab_9,
-    test_ogr_mitab_10,
-    test_ogr_mitab_11,
-    test_ogr_mitab_12,
-    test_ogr_mitab_13,
-    test_ogr_mitab_14,
-    test_ogr_mitab_15,
-    test_ogr_mitab_16,
-    test_ogr_mitab_17,
-    test_ogr_mitab_18,
-    test_ogr_mitab_19,
-    test_ogr_mitab_20,
-    test_ogr_mitab_21,
-    test_ogr_mitab_22,
-    test_ogr_mitab_23,
-    test_ogr_mitab_24,
-    test_ogr_mitab_25,
-    test_ogr_mitab_26,
-    test_ogr_mitab_27,
-    test_ogr_mitab_28,
-    test_ogr_mitab_29,
-    test_ogr_mitab_30,
-    test_ogr_mitab_31,
-    test_ogr_mitab_32,
-    test_ogr_mitab_33,
-    test_ogr_mitab_34,
-    test_ogr_mitab_35,
-    test_ogr_mitab_36,
-    test_ogr_mitab_37,
-    test_ogr_mitab_38,
-    test_ogr_mitab_39,
-    test_ogr_mitab_40,
-    test_ogr_mitab_41,
-    test_ogr_mitab_42,
-    test_ogr_mitab_43,
-    test_ogr_mitab_44,
-    test_ogr_mitab_45,
-    test_ogr_mitab_46,
-    test_ogr_mitab_47,
-    test_ogr_mitab_48,
-    test_ogr_mitab_49_aspatial,
-    test_ogr_mitab_tab_field_index_creation,
-    test_ogr_mitab_tab_view,
-    test_ogr_mitab_style,
-    test_ogr_mitab_tab_write_field_name_with_dot,
-    test_ogr_mitab_cleanup
-]
 
 if __name__ == '__main__':
 
diff --git a/autotest/ogr/ogr_mongodb.py b/autotest/ogr/ogr_mongodb.py
index 6bd118037cee..42d65980e542 100755
--- a/autotest/ogr/ogr_mongodb.py
+++ b/autotest/ogr/ogr_mongodb.py
@@ -809,13 +809,6 @@ def test_ogr_mongodb_cleanup():
     ogrtest.mongodb_ds = None
 
 
-gdaltest_list = [
-    test_ogr_mongodb_init,
-    test_ogr_mongodb_1,
-    test_ogr_mongodb_2,
-    test_ogr_mongodb_3,
-    test_ogr_mongodb_cleanup,
-]
 
 if __name__ == '__main__':
 
diff --git a/autotest/ogr/ogr_mssqlspatial.py b/autotest/ogr/ogr_mssqlspatial.py
index 3465a4c52113..a7e70988d916 100755
--- a/autotest/ogr/ogr_mssqlspatial.py
+++ b/autotest/ogr/ogr_mssqlspatial.py
@@ -333,15 +333,6 @@ def test_ogr_mssqlspatial_cleanup():
     gdaltest.mssqlspatial_ds = None
 
 
-gdaltest_list = [
-    test_ogr_mssqlspatial_1,
-    test_ogr_mssqlspatial_2,
-    test_ogr_mssqlspatial_3,
-    test_ogr_mssqlspatial_4,
-    test_ogr_mssqlspatial_test_ogrsf,
-    test_ogr_mssqlspatial_create_feature_in_unregistered_table,
-    test_ogr_mssqlspatial_cleanup
-]
 
 if __name__ == '__main__':
 
diff --git a/autotest/ogr/ogr_mvt.py b/autotest/ogr/ogr_mvt.py
index 33d39e8b9694..3b6133c19c76 100644
--- a/autotest/ogr/ogr_mvt.py
+++ b/autotest/ogr/ogr_mvt.py
@@ -1546,48 +1546,6 @@ def test_ogr_mvt_write_reuse_temp_db():
 ###############################################################################
 #
 
-gdaltest_list = [
-    test_ogr_mvt_datatypes,
-    test_ogr_mvt_datatype_promotion,
-    test_ogr_mvt_limit_cases,
-    test_ogr_mvt_with_extension_fields,
-    test_ogr_mvt_mixed,
-    test_ogr_mvt_linestring,
-    test_ogr_mvt_multilinestring,
-    test_ogr_mvt_polygon,
-    test_ogr_mvt_point_polygon,
-    test_ogr_mvt_point_polygon_clip,
-    test_ogr_mvt_tileset_without_readdir,
-    test_ogr_mvt_tileset_without_metadata_file,
-    test_ogr_mvt_tileset_json_field,
-    test_ogr_mvt_tileset_tilegl,
-    test_ogr_mvt_open_variants,
-    test_ogr_mvt_xyz_options,
-    test_ogr_mvt_test_ogrsf_pbf,
-    test_ogr_mvt_test_ogrsf_directory,
-    test_ogr_mvt_mbtiles,
-    test_ogr_mvt_mbtiles_json_field,
-    test_ogr_mvt_mbtiles_json_field_auto,
-    test_ogr_mvt_mbtiles_open_vector_in_raster_mode,
-    test_ogr_mvt_mbtiles_test_ogrsf,
-    test_ogr_mvt_x_y_z_filename_scheme,
-    test_ogr_mvt_polygon_larger_than_header,
-    test_ogr_mvt_errors,
-    test_ogr_mvt_http_start,
-    test_ogr_mvt_http,
-    test_ogr_mvt_http_stop,
-    test_ogr_mvt_write_one_layer,
-    test_ogr_mvt_write_conf,
-    test_ogr_mvt_write_mbtiles,
-    test_ogr_mvt_write_polygon_repaired,
-    test_ogr_mvt_write_conflicting_innner_ring,
-    test_ogr_mvt_write_limitations_max_size,
-    test_ogr_mvt_write_limitations_max_size_polygon,
-    test_ogr_mvt_write_limitations_max_features,
-    test_ogr_mvt_write_custom_tiling_scheme,
-    test_ogr_mvt_write_errors,
-    test_ogr_mvt_write_reuse_temp_db,
-]
 
 # gdaltest_list = [ ogr_mvt_http_start, ogr_mvt_http, ogr_mvt_http_stop ]
 
diff --git a/autotest/ogr/ogr_mysql.py b/autotest/ogr/ogr_mysql.py
index 80f816d13eeb..10c1112a8bd1 100755
--- a/autotest/ogr/ogr_mysql.py
+++ b/autotest/ogr/ogr_mysql.py
@@ -898,36 +898,6 @@ def test_ogr_mysql_cleanup():
     gdaltest.mysql_ds = None
 
 
-gdaltest_list = [
-    test_ogr_mysql_1,
-    #    ogr_mysql_cleanup,
-    test_ogr_mysql_2,
-    test_ogr_mysql_19,
-    test_ogr_mysql_3,
-    test_ogr_mysql_4,
-    test_ogr_mysql_5,
-    test_ogr_mysql_6,
-    test_ogr_mysql_7,
-    test_ogr_mysql_8,
-    test_ogr_mysql_9,
-    test_ogr_mysql_10,
-    # ogr_mysql_11 to _14 are PG only features
-    test_ogr_mysql_15,
-    test_ogr_mysql_16,
-    test_ogr_mysql_17,
-    # Fails but it is probably OK
-    #    ogr_mysql_18,
-    test_ogr_mysql_20,
-    test_ogr_mysql_21,
-    test_ogr_mysql_22,
-    test_ogr_mysql_23,
-    test_ogr_mysql_24,
-    test_ogr_mysql_72,
-    test_ogr_mysql_25,
-    test_ogr_mysql_26,
-    test_ogr_mysql_longlat,
-    test_ogr_mysql_cleanup
-]
 
 if __name__ == '__main__':
 
diff --git a/autotest/ogr/ogr_nas.py b/autotest/ogr/ogr_nas.py
index 9bbcea56571c..d7b5ace02f13 100755
--- a/autotest/ogr/ogr_nas.py
+++ b/autotest/ogr/ogr_nas.py
@@ -280,12 +280,6 @@ def test_ogr_nas_5():
 
     
 
-gdaltest_list = [
-    test_ogr_nas_1,
-    test_ogr_nas_2,
-    test_ogr_nas_3,
-    test_ogr_nas_4,
-    test_ogr_nas_5]
 
 if __name__ == '__main__':
 
diff --git a/autotest/ogr/ogr_ntf.py b/autotest/ogr/ogr_ntf.py
index e204e95902ae..d6d1756b7f18 100755
--- a/autotest/ogr/ogr_ntf.py
+++ b/autotest/ogr/ogr_ntf.py
@@ -172,9 +172,6 @@ def test_ogr_ntf_2():
     ds.Destroy()
 
 
-gdaltest_list = [
-    test_ogr_ntf_1,
-    test_ogr_ntf_2]
 
 if __name__ == '__main__':
 
diff --git a/autotest/ogr/ogr_oci.py b/autotest/ogr/ogr_oci.py
index 17d4fd1dfdcb..88ff461c1fb3 100755
--- a/autotest/ogr/ogr_oci.py
+++ b/autotest/ogr/ogr_oci.py
@@ -981,29 +981,6 @@ def test_ogr_oci_cleanup():
     gdaltest.shp_ds = None
 
 
-gdaltest_list = [
-    test_ogr_oci_1,
-    test_ogr_oci_2,
-    test_ogr_oci_3,
-    test_ogr_oci_4,
-    test_ogr_oci_5,
-    test_ogr_oci_6,
-    test_ogr_oci_7,
-    test_ogr_oci_8,
-    test_ogr_oci_9,
-    test_ogr_oci_10,
-    test_ogr_oci_11,
-    test_ogr_oci_12,
-    test_ogr_oci_13,
-    test_ogr_oci_14,
-    test_ogr_oci_15,
-    test_ogr_oci_16,
-    test_ogr_oci_17,
-    test_ogr_oci_18,
-    test_ogr_oci_19,
-    test_ogr_oci_20,
-    test_ogr_oci_21,
-    test_ogr_oci_cleanup]
 
 if __name__ == '__main__':
 
diff --git a/autotest/ogr/ogr_odbc.py b/autotest/ogr/ogr_odbc.py
index f46c0d4294b7..011e41bf222c 100755
--- a/autotest/ogr/ogr_odbc.py
+++ b/autotest/ogr/ogr_odbc.py
@@ -154,11 +154,6 @@ def test_ogr_odbc_cleanup():
     gdal.Unlink('tmp/odbc.mdb')
 
 
-gdaltest_list = [
-    test_ogr_odbc_1,
-    test_ogr_odbc_2,
-    test_ogr_odbc_cleanup
-]
 
 if __name__ == '__main__':
 
diff --git a/autotest/ogr/ogr_ods.py b/autotest/ogr/ogr_ods.py
index e3131cfddfce..8a29d972a8c7 100755
--- a/autotest/ogr/ogr_ods.py
+++ b/autotest/ogr/ogr_ods.py
@@ -456,19 +456,6 @@ def test_ogr_ods_boolean():
     gdal.Unlink(out_filename)
 
 
-gdaltest_list = [
-    test_ogr_ods_1,
-    test_ogr_ods_kspread_1,
-    test_ogr_ods_2,
-    test_ogr_ods_3,
-    test_ogr_ods_4,
-    test_ogr_ods_5,
-    test_ogr_ods_6,
-    test_ogr_ods_7,
-    test_ogr_ods_8,
-    test_ogr_ods_9,
-    test_ogr_ods_boolean,
-]
 
 if __name__ == '__main__':
 
diff --git a/autotest/ogr/ogr_ogdi.py b/autotest/ogr/ogr_ogdi.py
index 02c1a3a9bd31..ddce9fa88e03 100755
--- a/autotest/ogr/ogr_ogdi.py
+++ b/autotest/ogr/ogr_ogdi.py
@@ -224,13 +224,6 @@ def test_ogr_ogdi_cleanup():
     ogrtest.ogdi_ds = None
 
 
-gdaltest_list = [
-    test_ogr_ogdi_1,
-    test_ogr_ogdi_2,
-    test_ogr_ogdi_3,
-    test_ogr_ogdi_4,
-    test_ogr_ogdi_5,
-    test_ogr_ogdi_cleanup]
 
 if __name__ == '__main__':
 
diff --git a/autotest/ogr/ogr_openair.py b/autotest/ogr/ogr_openair.py
index b9ab8683dec8..fb474b44d560 100755
--- a/autotest/ogr/ogr_openair.py
+++ b/autotest/ogr/ogr_openair.py
@@ -71,8 +71,6 @@ def test_ogr_openair_1():
 
     
 
-gdaltest_list = [
-    test_ogr_openair_1]
 
 
 if __name__ == '__main__':
diff --git a/autotest/ogr/ogr_openfilegdb.py b/autotest/ogr/ogr_openfilegdb.py
index 5c0f62ba2115..0b8356c129ed 100755
--- a/autotest/ogr/ogr_openfilegdb.py
+++ b/autotest/ogr/ogr_openfilegdb.py
@@ -1341,36 +1341,6 @@ def test_ogr_openfilegdb_cleanup():
 
     
 
-gdaltest_list = [
-    test_ogr_openfilegdb_init,
-    # ogr_openfilegdb_make_test_data,
-    test_ogr_openfilegdb_1,
-    test_ogr_openfilegdb_1_92,
-    test_ogr_openfilegdb_1_93,
-    test_ogr_openfilegdb_2,
-    test_ogr_openfilegdb_2_92,
-    test_ogr_openfilegdb_2_93,
-    test_ogr_openfilegdb_3,
-    test_ogr_openfilegdb_4,
-    test_ogr_openfilegdb_5,
-    test_ogr_openfilegdb_6,
-    test_ogr_openfilegdb_7,
-    test_ogr_openfilegdb_8,
-    test_ogr_openfilegdb_9,
-    test_ogr_openfilegdb_10,
-    test_ogr_openfilegdb_11,
-    test_ogr_openfilegdb_12,
-    test_ogr_openfilegdb_13,
-    test_ogr_openfilegdb_14,
-    test_ogr_openfilegdb_15,
-    test_ogr_openfilegdb_16,
-    test_ogr_openfilegdb_17,
-    test_ogr_openfilegdb_18,
-    test_ogr_openfilegdb_19,
-    test_ogr_openfilegdb_20,
-    test_ogr_openfilegdb_21,
-    test_ogr_openfilegdb_cleanup,
-]
 
 if __name__ == '__main__':
 
diff --git a/autotest/ogr/ogr_osm.py b/autotest/ogr/ogr_osm.py
index 123b2ad2a106..f945127f86d9 100755
--- a/autotest/ogr/ogr_osm.py
+++ b/autotest/ogr/ogr_osm.py
@@ -833,31 +833,6 @@ def test_ogr_osm_18():
     assert count == 2
 
 
-gdaltest_list = [
-    test_ogr_osm_1,
-    test_ogr_osm_2,
-    test_ogr_osm_3,
-    test_ogr_osm_3_sqlite_nodes,
-    test_ogr_osm_3_custom_compress_nodes,
-    test_ogr_osm_3_all_layers,
-    test_ogr_osm_4,
-    test_ogr_osm_5,
-    test_ogr_osm_6,
-    test_ogr_osm_7,
-    test_ogr_osm_8,
-    test_ogr_osm_9,
-    test_ogr_osm_10,
-    test_ogr_osm_11,
-    test_ogr_osm_12,
-    test_ogr_osm_test_uncompressed_dense_true_nometadata_pbf,
-    test_ogr_osm_test_uncompressed_dense_false_pbf,
-    test_ogr_osm_13,
-    test_ogr_osm_14,
-    test_ogr_osm_15,
-    test_ogr_osm_16,
-    test_ogr_osm_17,
-    test_ogr_osm_18,
-]
 
 if __name__ == '__main__':
 
diff --git a/autotest/ogr/ogr_pcidsk.py b/autotest/ogr/ogr_pcidsk.py
index ac415bc152df..5ed79c2b604b 100755
--- a/autotest/ogr/ogr_pcidsk.py
+++ b/autotest/ogr/ogr_pcidsk.py
@@ -322,17 +322,6 @@ def test_ogr_pcidsk_cleanup():
     gdal.Unlink('tmp/ogr_pcidsk_1.pix')
 
 
-gdaltest_list = [
-    test_ogr_pcidsk_1,
-    test_ogr_pcidsk_2,
-    test_ogr_pcidsk_3,
-    test_ogr_pcidsk_4,
-    test_ogr_pcidsk_5,
-    test_ogr_pcidsk_add_field_to_non_empty_layer,
-    test_ogr_pcidsk_too_many_layers,
-    test_ogr_pcidsk_online_1,
-    test_ogr_pcidsk_online_2,
-    test_ogr_pcidsk_cleanup]
 
 if __name__ == '__main__':
 
diff --git a/autotest/ogr/ogr_pdf.py b/autotest/ogr/ogr_pdf.py
index 8c8d7f2f8d98..3092edb0448a 100755
--- a/autotest/ogr/ogr_pdf.py
+++ b/autotest/ogr/ogr_pdf.py
@@ -367,17 +367,6 @@ def test_ogr_pdf_cleanup():
     ogr.GetDriverByName('PDF').DeleteDataSource('tmp/ogr_pdf_2.pdf')
 
 
-gdaltest_list = [
-    test_ogr_pdf_1,
-    test_ogr_pdf_2,
-    test_ogr_pdf_3,
-    test_ogr_pdf_4,
-    test_ogr_pdf_4_podofo,
-    test_ogr_pdf_5,
-    test_ogr_pdf_online_1,
-    test_ogr_pdf_online_2,
-    test_ogr_pdf_cleanup
-]
 
 if __name__ == '__main__':
 
diff --git a/autotest/ogr/ogr_pds.py b/autotest/ogr/ogr_pds.py
index 5672fc50572a..5497c8144de7 100755
--- a/autotest/ogr/ogr_pds.py
+++ b/autotest/ogr/ogr_pds.py
@@ -83,10 +83,6 @@ def test_ogr_pds_2():
 
     
 
-gdaltest_list = [
-    test_ogr_pds_1,
-    test_ogr_pds_2,
-]
 
 if __name__ == '__main__':
 
diff --git a/autotest/ogr/ogr_pg.py b/autotest/ogr/ogr_pg.py
index a1b8429a50d1..03405fa378ee 100755
--- a/autotest/ogr/ogr_pg.py
+++ b/autotest/ogr/ogr_pg.py
@@ -4605,100 +4605,6 @@ def test_ogr_pg_cleanup(with_and_without_postgis):
 # NOTE: The ogr_pg_19 intentionally executed after ogr_pg_2
 
 
-gdaltest_list = [
-    test_ogr_pg_table_cleanup,
-    test_ogr_pg_2,
-    test_ogr_pg_19,
-    test_ogr_pg_19_2,
-    test_ogr_pg_3,
-    test_ogr_pg_4,
-    test_ogr_pg_5,
-    test_ogr_pg_6,
-    test_ogr_pg_7,
-    test_ogr_pg_8,
-    test_ogr_pg_9,
-    test_ogr_pg_10,
-    test_ogr_pg_11,
-    test_ogr_pg_12,
-    test_ogr_pg_13,
-    test_ogr_pg_14,
-    test_ogr_pg_15,
-    test_ogr_pg_16,
-    test_ogr_pg_17,
-    test_ogr_pg_18,
-    test_ogr_pg_20,
-    test_ogr_pg_21,
-    test_ogr_pg_21_subgeoms,
-    test_ogr_pg_21_3d_geometries,
-    test_ogr_pg_22,
-    test_ogr_pg_23,
-    test_ogr_pg_24,
-    test_ogr_pg_25,
-    test_ogr_pg_28,
-    test_ogr_pg_29,
-    test_ogr_pg_30,
-    test_ogr_pg_31,
-    test_ogr_pg_32,
-    test_ogr_pg_33,
-    test_ogr_pg_34,
-    test_ogr_pg_35,
-    test_ogr_pg_36,
-    test_ogr_pg_36_bis,
-    test_ogr_pg_37,
-    test_ogr_pg_38,
-    test_ogr_pg_39,
-    test_ogr_pg_40,
-    test_ogr_pg_41,
-    test_ogr_pg_42,
-    test_ogr_pg_43,
-    test_ogr_pg_44,
-    test_ogr_pg_45,
-    test_ogr_pg_46,
-    test_ogr_pg_47,
-    test_ogr_pg_48,
-    test_ogr_pg_49,
-    test_ogr_pg_50,
-    test_ogr_pg_51,
-    test_ogr_pg_52,
-    test_ogr_pg_53,
-    test_ogr_pg_53_bis,
-    test_ogr_pg_54,
-    test_ogr_pg_55,
-    test_ogr_pg_56,
-    test_ogr_pg_57,
-    test_ogr_pg_58,
-    test_ogr_pg_59,
-    test_ogr_pg_60,
-    test_ogr_pg_61,
-    test_ogr_pg_62,
-    test_ogr_pg_63,
-    test_ogr_pg_64,
-    test_ogr_pg_65,
-    test_ogr_pg_66,
-    test_ogr_pg_67,
-    test_ogr_pg_68,
-    test_ogr_pg_69,
-    test_ogr_pg_70,
-    test_ogr_pg_71,
-    test_ogr_pg_72,
-    test_ogr_pg_73,
-    test_ogr_pg_74,
-    test_ogr_pg_75,
-    test_ogr_pg_76,
-    test_ogr_pg_77,
-    test_ogr_pg_78,
-    test_ogr_pg_79,
-    test_ogr_pg_80,
-    test_ogr_pg_81,
-    test_ogr_pg_82,
-    test_ogr_pg_83,
-    test_ogr_pg_84,
-    test_ogr_pg_85,
-    test_ogr_pg_86,
-    test_ogr_pg_87,
-    test_ogr_pg_json,
-    test_ogr_pg_cleanup
-]
 
 
 if __name__ == '__main__':
diff --git a/autotest/ogr/ogr_pgdump.py b/autotest/ogr/ogr_pgdump.py
index af64d17437e2..01f8c9539fa8 100755
--- a/autotest/ogr/ogr_pgdump.py
+++ b/autotest/ogr/ogr_pgdump.py
@@ -924,24 +924,6 @@ def test_ogr_pgdump_cleanup():
         pass
     
 
-gdaltest_list = [
-    test_ogr_pgdump_1,
-    test_ogr_pgdump_2,
-    test_ogr_pgdump_3,
-    test_ogr_pgdump_4,
-    test_ogr_pgdump_5,
-    test_ogr_pgdump_6,
-    test_ogr_pgdump_7,
-    test_ogr_pgdump_8,
-    test_ogr_pgdump_9,
-    test_ogr_pgdump_10,
-    test_ogr_pgdump_11,
-    test_ogr_pgdump_12,
-    test_ogr_pgdump_13,
-    test_ogr_pgdump_14,
-    test_ogr_pgdump_15,
-    test_ogr_pgdump_16,
-    test_ogr_pgdump_cleanup]
 
 
 if __name__ == '__main__':
diff --git a/autotest/ogr/ogr_pgeo.py b/autotest/ogr/ogr_pgeo.py
index 8a49be276fb1..4210e1ba5928 100755
--- a/autotest/ogr/ogr_pgeo.py
+++ b/autotest/ogr/ogr_pgeo.py
@@ -271,9 +271,6 @@ def test_ogr_pgeo_main():
     gdaltest.run_tests(gdaltest_list_internal)
 
 
-gdaltest_list = [
-    test_ogr_pgeo_main
-]
 
 if __name__ == '__main__':
 
diff --git a/autotest/ogr/ogr_plscenes.py b/autotest/ogr/ogr_plscenes.py
index 4cb0379547ff..dda3aba64416 100755
--- a/autotest/ogr/ogr_plscenes.py
+++ b/autotest/ogr/ogr_plscenes.py
@@ -706,14 +706,6 @@ def test_ogr_plscenes_data_v1_live():
     assert ds.RasterCount != 0
 
 
-gdaltest_list = [
-    test_ogr_plscenes_init,
-    test_ogr_plscenes_data_v1_catalog_no_paging,
-    test_ogr_plscenes_data_v1_catalog_paging,
-    test_ogr_plscenes_data_v1_nominal,
-    test_ogr_plscenes_data_v1_errors,
-    test_ogr_plscenes_data_v1_live
-]
 
 if __name__ == '__main__':
 
diff --git a/autotest/ogr/ogr_rec.py b/autotest/ogr/ogr_rec.py
index a19af7aba6ff..78f91d01162a 100755
--- a/autotest/ogr/ogr_rec.py
+++ b/autotest/ogr/ogr_rec.py
@@ -49,9 +49,6 @@ def test_ogr_rec_1():
     assert ret.find('INFO') != -1 and ret.find('ERROR') == -1
 
 
-gdaltest_list = [
-    test_ogr_rec_1
-]
 
 if __name__ == '__main__':
 
diff --git a/autotest/ogr/ogr_refcount.py b/autotest/ogr/ogr_refcount.py
index 7bdbff85bf32..5469f8b17116 100755
--- a/autotest/ogr/ogr_refcount.py
+++ b/autotest/ogr/ogr_refcount.py
@@ -116,12 +116,6 @@ def test_ogr_refcount_cleanup():
     gdaltest.ds_2.Release()
 
 
-gdaltest_list = [
-    test_ogr_refcount_1,
-    test_ogr_refcount_2,
-    test_ogr_refcount_3,
-    test_ogr_refcount_4,
-    test_ogr_refcount_cleanup]
 
 if __name__ == '__main__':
 
diff --git a/autotest/ogr/ogr_rfc30.py b/autotest/ogr/ogr_rfc30.py
index 3bffd94553af..23b70e18d2f5 100755
--- a/autotest/ogr/ogr_rfc30.py
+++ b/autotest/ogr/ogr_rfc30.py
@@ -82,7 +82,6 @@ def test_ogr_rfc30_1_bis():
     return ogr_rfc30_1_internal(filename, layer_name)
 
 
-gdaltest_list = [test_ogr_rfc30_1, test_ogr_rfc30_1_bis]
 
 if __name__ == '__main__':
 
diff --git a/autotest/ogr/ogr_rfc35_mem.py b/autotest/ogr/ogr_rfc35_mem.py
index fea9018410df..ac8a55726beb 100755
--- a/autotest/ogr/ogr_rfc35_mem.py
+++ b/autotest/ogr/ogr_rfc35_mem.py
@@ -359,13 +359,6 @@ def test_ogr_rfc35_mem_cleanup():
     gdaltest.rfc35_mem_ds = None
 
 
-gdaltest_list = [
-    test_ogr_rfc35_mem_1,
-    test_ogr_rfc35_mem_2,
-    test_ogr_rfc35_mem_3,
-    test_ogr_rfc35_mem_4,
-    test_ogr_rfc35_mem_5,
-    test_ogr_rfc35_mem_cleanup]
 
 
 if __name__ == '__main__':
diff --git a/autotest/ogr/ogr_rfc35_mitab.py b/autotest/ogr/ogr_rfc35_mitab.py
index a488b0850a22..bfc93677ba1d 100755
--- a/autotest/ogr/ogr_rfc35_mitab.py
+++ b/autotest/ogr/ogr_rfc35_mitab.py
@@ -569,13 +569,6 @@ def test_ogr_rfc35_mitab_cleanup():
     ogr.GetDriverByName('MapInfo File').DeleteDataSource('/vsimem/rfc35_test.tab')
 
 
-gdaltest_list = [
-    test_ogr_rfc35_mitab_1,
-    test_ogr_rfc35_mitab_2,
-    test_ogr_rfc35_mitab_3,
-    test_ogr_rfc35_mitab_4,
-    test_ogr_rfc35_mitab_5,
-    test_ogr_rfc35_mitab_cleanup]
 
 
 if __name__ == '__main__':
diff --git a/autotest/ogr/ogr_rfc35_shape.py b/autotest/ogr/ogr_rfc35_shape.py
index 258bad1ebdae..6324ed5be478 100755
--- a/autotest/ogr/ogr_rfc35_shape.py
+++ b/autotest/ogr/ogr_rfc35_shape.py
@@ -459,13 +459,6 @@ def test_ogr_rfc35_shape_cleanup():
     ogr.GetDriverByName('ESRI Shapefile').DeleteDataSource('/vsimem/rfc35_test.dbf')
 
 
-gdaltest_list = [
-    test_ogr_rfc35_shape_1,
-    test_ogr_rfc35_shape_2,
-    test_ogr_rfc35_shape_3,
-    test_ogr_rfc35_shape_4,
-    test_ogr_rfc35_shape_5,
-    test_ogr_rfc35_shape_cleanup]
 
 
 if __name__ == '__main__':
diff --git a/autotest/ogr/ogr_rfc35_sqlite.py b/autotest/ogr/ogr_rfc35_sqlite.py
index beb02251836f..221f2a31b285 100755
--- a/autotest/ogr/ogr_rfc35_sqlite.py
+++ b/autotest/ogr/ogr_rfc35_sqlite.py
@@ -390,13 +390,6 @@ def test_ogr_rfc35_sqlite_cleanup():
     ogr.GetDriverByName('SQLite').DeleteDataSource(gdaltest.rfc35_sqlite_ds_name)
 
 
-gdaltest_list = [
-    test_ogr_rfc35_sqlite_1,
-    test_ogr_rfc35_sqlite_2,
-    test_ogr_rfc35_sqlite_3,
-    test_ogr_rfc35_sqlite_4,
-    test_ogr_rfc35_sqlite_5,
-    test_ogr_rfc35_sqlite_cleanup]
 
 
 if __name__ == '__main__':
diff --git a/autotest/ogr/ogr_rfc41.py b/autotest/ogr/ogr_rfc41.py
index 532a5527ff99..2cdff66f2928 100755
--- a/autotest/ogr/ogr_rfc41.py
+++ b/autotest/ogr/ogr_rfc41.py
@@ -767,16 +767,6 @@ def test_ogr_rfc41_8():
     ds.ReleaseResultSet(sql_lyr)
 
 
-gdaltest_list = [
-    test_ogr_rfc41_1,
-    test_ogr_rfc41_2,
-    test_ogr_rfc41_3,
-    test_ogr_rfc41_4,
-    test_ogr_rfc41_5,
-    test_ogr_rfc41_6,
-    test_ogr_rfc41_7,
-    test_ogr_rfc41_8,
-]
 
 if __name__ == '__main__':
 
diff --git a/autotest/ogr/ogr_s57.py b/autotest/ogr/ogr_s57.py
index ef76dba682e0..0e6ae9bf9e17 100755
--- a/autotest/ogr/ogr_s57.py
+++ b/autotest/ogr/ogr_s57.py
@@ -401,23 +401,6 @@ def test_ogr_s57_cleanup():
     gdaltest.s57_ds = None
 
 
-gdaltest_list = [
-    test_ogr_s57_1,
-    test_ogr_s57_2,
-    test_ogr_s57_3,
-    test_ogr_s57_4,
-    test_ogr_s57_5,
-    test_ogr_s57_6,
-    test_ogr_s57_7,
-    test_ogr_s57_8,
-    test_ogr_s57_9,
-    test_ogr_s57_10,
-    test_ogr_s57_11,
-    test_ogr_s57_online_1,
-    test_ogr_s57_online_2,
-    test_ogr_s57_online_3,
-    test_ogr_s57_online_4,
-    test_ogr_s57_cleanup]
 
 if __name__ == '__main__':
 
diff --git a/autotest/ogr/ogr_sde.py b/autotest/ogr/ogr_sde.py
index fea7582ae7d8..1252ec856b31 100755
--- a/autotest/ogr/ogr_sde.py
+++ b/autotest/ogr/ogr_sde.py
@@ -319,18 +319,6 @@ def test_ogr_sde_cleanup():
     ds.Destroy()
 
 
-gdaltest_list = [
-    test_ogr_sde_1,
-    test_ogr_sde_2,
-    test_ogr_sde_3,
-    test_ogr_sde_4,
-    test_ogr_sde_5,
-    test_ogr_sde_6,
-    test_ogr_sde_7,
-    test_ogr_sde_8,
-
-    test_ogr_sde_cleanup
-]
 
 if __name__ == '__main__':
 
diff --git a/autotest/ogr/ogr_sdts.py b/autotest/ogr/ogr_sdts.py
index ab5202817d72..c6e3e46d6c20 100755
--- a/autotest/ogr/ogr_sdts.py
+++ b/autotest/ogr/ogr_sdts.py
@@ -74,8 +74,6 @@ def test_ogr_sdts_1():
 ###############################################################################
 #
 
-gdaltest_list = [
-    test_ogr_sdts_1]
 
 if __name__ == '__main__':
 
diff --git a/autotest/ogr/ogr_segukooa.py b/autotest/ogr/ogr_segukooa.py
index e2f741af3c28..39d56057fe37 100755
--- a/autotest/ogr/ogr_segukooa.py
+++ b/autotest/ogr/ogr_segukooa.py
@@ -186,12 +186,6 @@ def test_ogr_ukooa_lines():
 
     
 
-gdaltest_list = [
-    test_ogr_segp1_points,
-    test_ogr_segp1_lines,
-    test_ogr_ukooa_points,
-    test_ogr_ukooa_lines,
-]
 
 
 if __name__ == '__main__':
diff --git a/autotest/ogr/ogr_segy.py b/autotest/ogr/ogr_segy.py
index 7a0cdec7696b..223374b3e16e 100755
--- a/autotest/ogr/ogr_segy.py
+++ b/autotest/ogr/ogr_segy.py
@@ -96,10 +96,6 @@ def test_ogr_segy_2():
     assert lyr.GetGeomType() == ogr.wkbPoint, 'bad layer geometry type'
 
 
-gdaltest_list = [
-    test_ogr_segy_1,
-    test_ogr_segy_2,
-]
 
 
 if __name__ == '__main__':
diff --git a/autotest/ogr/ogr_selafin.py b/autotest/ogr/ogr_selafin.py
index 4b9ff954aa80..caf10bfe5865 100755
--- a/autotest/ogr/ogr_selafin.py
+++ b/autotest/ogr/ogr_selafin.py
@@ -183,13 +183,6 @@ def test_ogr_selafin_cleanup():
     selafin_drv.DeleteDataSource('tmp/tmp.slf')
 
 
-gdaltest_list = [
-    test_ogr_selafin_create_ds,
-    test_ogr_selafin_create_nodes,
-    test_ogr_selafin_create_elements,
-    test_ogr_selafin_set_field,
-    test_ogr_selafin_cleanup
-]
 
 if __name__ == '__main__':
     gdal.PushErrorHandler('CPLQuietErrorHandler')
diff --git a/autotest/ogr/ogr_shape.py b/autotest/ogr/ogr_shape.py
index 10c207ab4028..e848fb6b5731 100755
--- a/autotest/ogr/ogr_shape.py
+++ b/autotest/ogr/ogr_shape.py
@@ -4570,121 +4570,6 @@ def test_ogr_shape_cleanup():
 
     
 
-gdaltest_list = [
-    test_ogr_shape_1,
-    test_ogr_shape_2,
-    test_ogr_shape_3,
-    test_ogr_shape_4,
-    test_ogr_shape_5,
-    test_ogr_shape_6,
-    test_ogr_shape_7,
-    test_ogr_shape_8,
-    test_ogr_shape_9,
-    test_ogr_shape_10,
-    test_ogr_shape_11,
-    test_ogr_shape_12,
-    test_ogr_shape_13,
-    test_ogr_shape_14,
-    test_ogr_shape_15,
-    test_ogr_shape_16,
-    test_ogr_shape_16_1,
-    test_ogr_shape_17,
-    test_ogr_shape_18,
-    test_ogr_shape_19,
-    test_ogr_shape_20,
-    test_ogr_shape_21,
-    test_ogr_shape_22,
-    test_ogr_shape_23,
-    test_ogr_shape_24,
-    test_ogr_shape_25,
-    test_ogr_shape_26,
-    test_ogr_shape_27,
-    test_ogr_shape_28,
-    test_ogr_shape_29,
-    test_ogr_shape_30,
-    test_ogr_shape_31,
-    test_ogr_shape_32,
-    test_ogr_shape_33,
-    test_ogr_shape_34,
-    test_ogr_shape_35,
-    test_ogr_shape_36,
-    test_ogr_shape_37,
-    test_ogr_shape_37_bis,
-    test_ogr_shape_38,
-    test_ogr_shape_39,
-    test_ogr_shape_40,
-    test_ogr_shape_41,
-    test_ogr_shape_42,
-    test_ogr_shape_43,
-    # ogr_shape_44,
-    test_ogr_shape_45,
-    test_ogr_shape_46,
-    test_ogr_shape_47,
-    test_ogr_shape_48,
-    test_ogr_shape_49,
-    test_ogr_shape_50,
-    test_ogr_shape_51,
-    test_ogr_shape_52,
-    test_ogr_shape_53,
-    test_ogr_shape_54,
-    test_ogr_shape_55,
-    test_ogr_shape_56,
-    test_ogr_shape_57,
-    test_ogr_shape_58,
-    test_ogr_shape_59,
-    test_ogr_shape_60,
-    test_ogr_shape_61,
-    test_ogr_shape_62,
-    test_ogr_shape_63,
-    test_ogr_shape_64,
-    test_ogr_shape_65,
-    test_ogr_shape_66,
-    test_ogr_shape_67,
-    test_ogr_shape_68,
-    test_ogr_shape_69,
-    test_ogr_shape_70,
-    test_ogr_shape_71,
-    test_ogr_shape_72,
-    test_ogr_shape_73,
-    test_ogr_shape_74,
-    test_ogr_shape_75,
-    test_ogr_shape_76,
-    test_ogr_shape_77,
-    test_ogr_shape_78,
-    test_ogr_shape_79,
-    test_ogr_shape_80,
-    test_ogr_shape_81,
-    test_ogr_shape_82,
-    test_ogr_shape_83,
-    test_ogr_shape_84,
-    test_ogr_shape_85,
-    test_ogr_shape_86,
-    test_ogr_shape_87,
-    test_ogr_shape_88,
-    test_ogr_shape_89,
-    test_ogr_shape_90,
-    test_ogr_shape_91,
-    test_ogr_shape_92,
-    test_ogr_shape_93,
-    test_ogr_shape_94,
-    test_ogr_shape_95,
-    test_ogr_shape_96,
-    test_ogr_shape_97,
-    test_ogr_shape_98,
-    test_ogr_shape_99,
-    test_ogr_shape_100,
-    test_ogr_shape_101,
-    test_ogr_shape_102,
-    test_ogr_shape_103,
-    test_ogr_shape_104,
-    test_ogr_shape_105,
-    test_ogr_shape_106,
-    test_ogr_shape_107,
-    test_ogr_shape_108,
-    test_ogr_shape_109,
-    test_ogr_shape_110_write_invalid_multipatch,
-    test_ogr_shape_111_delete_field_no_record,
-    test_ogr_shape_cleanup]
 
 # gdaltest_list = [ ogr_shape_107 ]
 
diff --git a/autotest/ogr/ogr_shape_qix.py b/autotest/ogr/ogr_shape_qix.py
index f75ce36065b5..20895c7963c7 100755
--- a/autotest/ogr/ogr_shape_qix.py
+++ b/autotest/ogr/ogr_shape_qix.py
@@ -261,12 +261,6 @@ def test_ogr_shape_qix_4():
     return ret
 
 
-gdaltest_list = [
-    test_ogr_shape_qix_1,
-    test_ogr_shape_qix_2,
-    test_ogr_shape_qix_3,
-    test_ogr_shape_qix_4,
-]
 
 if __name__ == '__main__':
 
diff --git a/autotest/ogr/ogr_shape_sbn.py b/autotest/ogr/ogr_shape_sbn.py
index d0c524c58626..2aaea32942ad 100755
--- a/autotest/ogr/ogr_shape_sbn.py
+++ b/autotest/ogr/ogr_shape_sbn.py
@@ -136,10 +136,6 @@ def test_ogr_shape_sbn_2():
     return search_all_features(lyr)
 
 
-gdaltest_list = [
-    test_ogr_shape_sbn_1,
-    test_ogr_shape_sbn_2,
-]
 
 if __name__ == '__main__':
 
diff --git a/autotest/ogr/ogr_sosi.py b/autotest/ogr/ogr_sosi.py
index e1f942a8d003..cc1f9401e8ef 100755
--- a/autotest/ogr/ogr_sosi.py
+++ b/autotest/ogr/ogr_sosi.py
@@ -56,8 +56,6 @@ def test_ogr_sosi_1():
     assert ret.find('INFO') != -1 and ret.find('ERROR') == -1
 
 
-gdaltest_list = [
-    test_ogr_sosi_1]
 
 if __name__ == '__main__':
 
diff --git a/autotest/ogr/ogr_sql_rfc28.py b/autotest/ogr/ogr_sql_rfc28.py
index d5339ea4aa5d..d527d5a07ea3 100755
--- a/autotest/ogr/ogr_sql_rfc28.py
+++ b/autotest/ogr/ogr_sql_rfc28.py
@@ -1344,61 +1344,6 @@ def test_ogr_rfc28_cleanup():
     gdaltest.ds = None
 
 
-gdaltest_list = [
-    test_ogr_rfc28_1,
-    test_ogr_rfc28_2,
-    test_ogr_rfc28_3,
-    test_ogr_rfc28_4,
-    test_ogr_rfc28_5,
-    test_ogr_rfc28_6,
-    test_ogr_rfc28_7_wrong_quoting,
-    test_ogr_rfc28_7_good_quoting,
-    test_ogr_rfc28_8_wrong_quoting,
-    test_ogr_rfc28_8_good_quoting,
-    test_ogr_rfc28_9,
-    test_ogr_rfc28_10,
-    test_ogr_rfc28_11,
-    test_ogr_rfc28_12,
-    test_ogr_rfc28_13,
-    test_ogr_rfc28_14,
-    test_ogr_rfc28_15,
-    test_ogr_rfc28_16,
-    test_ogr_rfc28_17,
-    test_ogr_rfc28_18,
-    test_ogr_rfc28_19,
-    test_ogr_rfc28_20,
-    test_ogr_rfc28_21,
-    test_ogr_rfc28_22,
-    test_ogr_rfc28_23,
-    test_ogr_rfc28_24,
-    test_ogr_rfc28_25,
-    test_ogr_rfc28_26,
-    test_ogr_rfc28_27,
-    test_ogr_rfc28_28,
-    test_ogr_rfc28_29,
-    test_ogr_rfc28_30,
-    test_ogr_rfc28_31,
-    test_ogr_rfc28_32,
-    test_ogr_rfc28_33,
-    test_ogr_rfc28_34,
-    test_ogr_rfc28_35,
-    test_ogr_rfc28_35_bis,
-    test_ogr_rfc28_35_ter,
-    test_ogr_rfc28_36,
-    test_ogr_rfc28_37,
-    test_ogr_rfc28_38,
-    test_ogr_rfc28_39,
-    test_ogr_rfc28_40,
-    test_ogr_rfc28_41,
-    test_ogr_rfc28_42,
-    test_ogr_rfc28_43,
-    test_ogr_rfc28_44,
-    test_ogr_rfc28_45,
-    test_ogr_rfc28_46,
-    test_ogr_rfc28_47,
-    test_ogr_rfc28_48,
-    test_ogr_rfc28_int_overflows,
-    test_ogr_rfc28_cleanup]
 
 if __name__ == '__main__':
 
diff --git a/autotest/ogr/ogr_sql_sqlite.py b/autotest/ogr/ogr_sql_sqlite.py
index ec82039615f6..199753af17f3 100755
--- a/autotest/ogr/ogr_sql_sqlite.py
+++ b/autotest/ogr/ogr_sql_sqlite.py
@@ -1900,41 +1900,6 @@ def test_ogr_sql_sqlite_31():
     assert value == 25
 
 
-gdaltest_list = [
-    test_ogr_sql_sqlite_1,
-    test_ogr_sql_sqlite_2,
-    test_ogr_sql_sqlite_3,
-    test_ogr_sql_sqlite_4,
-    test_ogr_sql_sqlite_5,
-    test_ogr_sql_sqlite_6,
-    test_ogr_sql_sqlite_7,
-    test_ogr_sql_sqlite_8,
-    test_ogr_sql_sqlite_9,
-    test_ogr_sql_sqlite_10,
-    test_ogr_sql_sqlite_11,
-    test_ogr_sql_sqlite_12,
-    test_ogr_sql_sqlite_13,
-    test_ogr_sql_sqlite_14,
-    test_ogr_sql_sqlite_15,
-    test_ogr_sql_sqlite_start_webserver,
-    test_ogr_sql_sqlite_16,
-    test_ogr_sql_sqlite_17,
-    test_ogr_sql_sqlite_18,
-    test_ogr_sql_sqlite_19,
-    test_ogr_sql_sqlite_20,
-    test_ogr_sql_sqlite_21,
-    test_ogr_sql_sqlite_22,
-    test_ogr_sql_sqlite_23,
-    test_ogr_sql_sqlite_stop_webserver,
-    test_ogr_sql_sqlite_24,
-    test_ogr_sql_sqlite_25,
-    test_ogr_sql_sqlite_26,
-    test_ogr_sql_sqlite_27,
-    test_ogr_sql_sqlite_28,
-    test_ogr_sql_sqlite_29,
-    test_ogr_sql_sqlite_30,
-    test_ogr_sql_sqlite_31
-]
 
 if __name__ == '__main__':
 
diff --git a/autotest/ogr/ogr_sql_test.py b/autotest/ogr/ogr_sql_test.py
index 4598845c51bf..0b63837b2187 100755
--- a/autotest/ogr/ogr_sql_test.py
+++ b/autotest/ogr/ogr_sql_test.py
@@ -1371,57 +1371,6 @@ def test_ogr_sql_cleanup():
     gdaltest.ds = None
 
 
-gdaltest_list = [
-    test_ogr_sql_1,
-    test_ogr_sql_2,
-    test_ogr_sql_3,
-    test_ogr_sql_3_desc,
-    test_ogr_sql_4,
-    test_ogr_sql_5,
-    test_ogr_sql_6,
-    test_ogr_sql_7,
-    test_ogr_sql_8,
-    test_ogr_sql_9,
-    test_ogr_sql_10,
-    test_ogr_sql_11,
-    test_ogr_sql_12,
-    test_ogr_sql_13,
-    test_ogr_sql_14,
-    test_ogr_sql_15,
-    test_ogr_sql_16,
-    test_ogr_sql_17,
-    test_ogr_sql_18,
-    test_ogr_sql_19,
-    test_ogr_sql_20,
-    test_ogr_sql_21,
-    test_ogr_sql_22,
-    test_ogr_sql_23,
-    test_ogr_sql_24,
-    test_ogr_sql_25,
-    test_ogr_sql_26,
-    test_ogr_sql_27,
-    test_ogr_sql_28,
-    test_ogr_sql_29,
-    test_ogr_sql_30,
-    test_ogr_sql_31,
-    test_ogr_sql_32,
-    test_ogr_sql_33,
-    test_ogr_sql_34,
-    test_ogr_sql_35,
-    test_ogr_sql_36,
-    test_ogr_sql_37,
-    test_ogr_sql_38,
-    test_ogr_sql_39,
-    test_ogr_sql_40,
-    test_ogr_sql_41,
-    test_ogr_sql_42,
-    test_ogr_sql_43,
-    test_ogr_sql_44,
-    test_ogr_sql_45,
-    test_ogr_sql_46,
-    test_ogr_sql_47,
-    test_ogr_sql_48,
-    test_ogr_sql_cleanup]
 
 if __name__ == '__main__':
 
diff --git a/autotest/ogr/ogr_sqlite.py b/autotest/ogr/ogr_sqlite.py
index b9fa6e9f30f8..0301f7b6af79 100755
--- a/autotest/ogr/ogr_sqlite.py
+++ b/autotest/ogr/ogr_sqlite.py
@@ -3130,70 +3130,6 @@ def test_ogr_sqlite_without_spatialite():
     assert ret.find('Failed:    0') != -1
 
 
-gdaltest_list = [
-    test_ogr_sqlite_1,
-    test_ogr_sqlite_2,
-    test_ogr_sqlite_3,
-    test_ogr_sqlite_4,
-    test_ogr_sqlite_5,
-    test_ogr_sqlite_6,
-    test_ogr_sqlite_7,
-    test_ogr_sqlite_8,
-    test_ogr_sqlite_9,
-    test_ogr_sqlite_10,
-    test_ogr_sqlite_11,
-    test_ogr_sqlite_12,
-    test_ogr_sqlite_13,
-    test_ogr_sqlite_14,
-    test_ogr_sqlite_15,
-    test_ogr_sqlite_16,
-    test_ogr_sqlite_20,
-    test_ogr_sqlite_21,
-    test_ogr_sqlite_22,
-    test_ogr_sqlite_23,
-    test_ogr_sqlite_24,
-    test_ogr_sqlite_25,
-    test_ogr_sqlite_26,
-    test_ogr_sqlite_27,
-    test_ogr_sqlite_28,
-    test_ogr_sqlite_29,
-    test_ogr_sqlite_30,
-    test_ogr_spatialite_1,
-    test_ogr_sqlite_17,
-    test_ogr_sqlite_18,
-    test_ogr_sqlite_19,
-    test_ogr_sqlite_19_bis,
-    test_ogr_spatialite_2,
-    test_ogr_spatialite_3,
-    test_ogr_spatialite_4,
-    test_ogr_spatialite_5,
-    test_ogr_spatialite_compressed_geom_5,
-    test_ogr_spatialite_6,
-    test_ogr_spatialite_7,
-    test_ogr_spatialite_8,
-    test_ogr_sqlite_31,
-    test_ogr_sqlite_32,
-    test_ogr_sqlite_33,
-    test_ogr_sqlite_34,
-    test_ogr_sqlite_35,
-    test_ogr_sqlite_36,
-    test_ogr_sqlite_37,
-    test_ogr_sqlite_38,
-    test_ogr_spatialite_9,
-    test_ogr_spatialite_10,
-    test_ogr_sqlite_39,
-    test_ogr_sqlite_40,
-    test_ogr_sqlite_41,
-    test_ogr_sqlite_42,
-    test_ogr_sqlite_43,
-    test_ogr_sqlite_44,
-    test_ogr_sqlite_45,
-    test_ogr_sqlite_iterate_and_update,
-    test_ogr_spatialite_11,
-    test_ogr_spatialite_12,
-    test_ogr_sqlite_cleanup,
-    test_ogr_sqlite_without_spatialite,
-]
 
 disabled_gdaltest_list = [
     test_ogr_sqlite_1,
diff --git a/autotest/ogr/ogr_style.py b/autotest/ogr/ogr_style.py
index 7d4bac06adea..d60958cf8dc0 100755
--- a/autotest/ogr/ogr_style.py
+++ b/autotest/ogr/ogr_style.py
@@ -106,8 +106,6 @@ def test_ogr_style_styletable():
 # Build tests runner
 
 
-gdaltest_list = [
-    test_ogr_style_styletable]
 
 if __name__ == '__main__':
 
diff --git a/autotest/ogr/ogr_sua.py b/autotest/ogr/ogr_sua.py
index 5585c97b06dd..8d0d3dfc20fd 100755
--- a/autotest/ogr/ogr_sua.py
+++ b/autotest/ogr/ogr_sua.py
@@ -64,8 +64,6 @@ def test_ogr_sua_1():
 
     
 
-gdaltest_list = [
-    test_ogr_sua_1]
 
 
 if __name__ == '__main__':
diff --git a/autotest/ogr/ogr_svg.py b/autotest/ogr/ogr_svg.py
index aa73c6a5e6cf..9c2238a86bf5 100755
--- a/autotest/ogr/ogr_svg.py
+++ b/autotest/ogr/ogr_svg.py
@@ -106,10 +106,6 @@ def test_ogr_svg_cleanup():
     gdaltest.svg_ds = None
 
 
-gdaltest_list = [
-    test_ogr_svg_init,
-    test_ogr_svg_1,
-    test_ogr_svg_cleanup]
 
 if __name__ == '__main__':
 
diff --git a/autotest/ogr/ogr_sxf.py b/autotest/ogr/ogr_sxf.py
index 9f282af4311a..d77da2f25cca 100755
--- a/autotest/ogr/ogr_sxf.py
+++ b/autotest/ogr/ogr_sxf.py
@@ -74,10 +74,6 @@ def test_ogr_sxf_cleanup():
     gdaltest.sxf_ds = None
 
 
-gdaltest_list = [
-    test_ogr_sxf_1,
-    test_ogr_sxf_2,
-    test_ogr_sxf_cleanup]
 
 if __name__ == '__main__':
 
diff --git a/autotest/ogr/ogr_tiger.py b/autotest/ogr/ogr_tiger.py
index be3421fb00be..190004327fde 100755
--- a/autotest/ogr/ogr_tiger.py
+++ b/autotest/ogr/ogr_tiger.py
@@ -224,12 +224,6 @@ def test_ogr_tiger_cleanup():
     ogrtest.tiger_ds = None
 
 
-gdaltest_list = [
-    test_ogr_tiger_1,
-    test_ogr_tiger_2,
-    test_ogr_tiger_3,
-    test_ogr_tiger_4,
-    test_ogr_tiger_cleanup]
 
 if __name__ == '__main__':
 
diff --git a/autotest/ogr/ogr_vdv.py b/autotest/ogr/ogr_vdv.py
index c7dd1b73f564..c75aebacb9e6 100755
--- a/autotest/ogr/ogr_vdv.py
+++ b/autotest/ogr/ogr_vdv.py
@@ -525,20 +525,6 @@ def test_ogr_vdv_cleanup():
     gdal.Rmdir('tmp/test_x10')
 
 
-gdaltest_list = [
-    test_ogr_idf_1,
-    test_ogr_idf_1_with_temp_sqlite_db,
-    test_ogr_idf_3d,
-    test_ogr_idf_2,
-    test_ogr_vdv_1,
-    test_ogr_vdv_2,
-    test_ogr_vdv_3,
-    test_ogr_vdv_4,
-    test_ogr_vdv_5,
-    test_ogr_vdv_6,
-    test_ogr_vdv_7,
-    test_ogr_vdv_8,
-    test_ogr_vdv_cleanup]
 
 
 if __name__ == '__main__':
diff --git a/autotest/ogr/ogr_vfk.py b/autotest/ogr/ogr_vfk.py
index b85a13ed1a5e..ba9b6fa0a033 100755
--- a/autotest/ogr/ogr_vfk.py
+++ b/autotest/ogr/ogr_vfk.py
@@ -340,19 +340,6 @@ def test_ogr_vfk_cleanup():
 #
 
 
-gdaltest_list = [
-    test_ogr_vfk_1,
-    test_ogr_vfk_2,
-    test_ogr_vfk_3,
-    test_ogr_vfk_4,
-    test_ogr_vfk_5,
-    test_ogr_vfk_6,
-    test_ogr_vfk_7,
-    test_ogr_vfk_8,
-    test_ogr_vfk_9,
-    test_ogr_vfk_10,
-    test_ogr_vfk_11,
-    test_ogr_vfk_cleanup]
 
 if __name__ == '__main__':
     gdaltest.setup_run('ogr_vfk')
diff --git a/autotest/ogr/ogr_virtualogr.py b/autotest/ogr/ogr_virtualogr.py
index 579528c40f05..09298c1f0c6a 100755
--- a/autotest/ogr/ogr_virtualogr.py
+++ b/autotest/ogr/ogr_virtualogr.py
@@ -305,13 +305,6 @@ def test_ogr_virtualogr_5():
     gdal.Unlink('/vsimem/ogr_virtualogr_5.csv')
 
 
-gdaltest_list = [
-    test_ogr_virtualogr_1,
-    test_ogr_virtualogr_2,
-    test_ogr_virtualogr_3,
-    test_ogr_virtualogr_4,
-    test_ogr_virtualogr_5,
-]
 
 if __name__ == '__main__':
 
diff --git a/autotest/ogr/ogr_vrt.py b/autotest/ogr/ogr_vrt.py
index 021509cdc3cf..5f00623937d2 100755
--- a/autotest/ogr/ogr_vrt.py
+++ b/autotest/ogr/ogr_vrt.py
@@ -3045,50 +3045,6 @@ def test_ogr_vrt_cleanup():
     gdaltest.vrt_ds = None
 
 
-gdaltest_list = [
-    test_ogr_vrt_1,
-    test_ogr_vrt_2,
-    test_ogr_vrt_3,
-    test_ogr_vrt_4,
-    test_ogr_vrt_5,
-    test_ogr_vrt_6,
-    test_ogr_vrt_7,
-    test_ogr_vrt_8,
-    test_ogr_vrt_9,
-    test_ogr_vrt_10,
-    test_ogr_vrt_11,
-    test_ogr_vrt_12,
-    test_ogr_vrt_13,
-    test_ogr_vrt_14,
-    test_ogr_vrt_15,
-    test_ogr_vrt_16,
-    test_ogr_vrt_17,
-    test_ogr_vrt_18,
-    test_ogr_vrt_19_optimized,
-    test_ogr_vrt_19_nonoptimized,
-    test_ogr_vrt_20,
-    test_ogr_vrt_21,
-    test_ogr_vrt_22,
-    test_ogr_vrt_23,
-    test_ogr_vrt_24,
-    test_ogr_vrt_25,
-    test_ogr_vrt_26,
-    test_ogr_vrt_27,
-    test_ogr_vrt_28,
-    test_ogr_vrt_29,
-    test_ogr_vrt_30,
-    test_ogr_vrt_31,
-    test_ogr_vrt_32,
-    test_ogr_vrt_33,
-    test_ogr_vrt_34,
-    test_ogr_vrt_35,
-    test_ogr_vrt_36,
-    test_ogr_vrt_37,
-    test_ogr_vrt_38,
-    test_ogr_vrt_39,
-    test_ogr_vrt_40,
-    test_ogr_vrt_41,
-    test_ogr_vrt_cleanup]
 
 if __name__ == '__main__':
 
diff --git a/autotest/ogr/ogr_wasp.py b/autotest/ogr/ogr_wasp.py
index 0c08bfabb54d..43fd5cb5268f 100755
--- a/autotest/ogr/ogr_wasp.py
+++ b/autotest/ogr/ogr_wasp.py
@@ -467,18 +467,6 @@ def test_ogr_wasp_cleanup():
     wasp_drv.DeleteDataSource('tmp.map')
 
 
-gdaltest_list = [
-    test_ogr_wasp_create_ds,
-    test_ogr_wasp_elevation_from_linestring_z,
-    test_ogr_wasp_elevation_from_linestring_z_toler,
-    test_ogr_wasp_elevation_from_linestring_field,
-    test_ogr_wasp_roughness_from_linestring_fields,
-    test_ogr_wasp_roughness_from_polygon_z,
-    test_ogr_wasp_roughness_from_polygon_field,
-    test_ogr_wasp_merge,
-    test_ogr_wasp_reading,
-    test_ogr_wasp_cleanup
-]
 
 if __name__ == '__main__':
     gdal.PushErrorHandler('CPLQuietErrorHandler')
diff --git a/autotest/ogr/ogr_wfs.py b/autotest/ogr/ogr_wfs.py
index 8994f95790f8..0e07a77c755c 100755
--- a/autotest/ogr/ogr_wfs.py
+++ b/autotest/ogr/ogr_wfs.py
@@ -4502,66 +4502,6 @@ def test_ogr_wfs_vsimem_cleanup(with_and_without_streaming):
 
     
 
-gdaltest_list = [
-    test_ogr_wfs_vsimem_fail_because_not_enabled,
-    test_ogr_wfs_vsimem_fail_because_no_get_capabilities,
-    test_ogr_wfs_vsimem_fail_because_empty_response,
-    test_ogr_wfs_vsimem_fail_because_no_WFS_Capabilities,
-    test_ogr_wfs_vsimem_fail_because_exception,
-    test_ogr_wfs_vsimem_fail_because_invalid_xml_capabilities,
-    test_ogr_wfs_vsimem_fail_because_missing_featuretypelist,
-    test_ogr_wfs_vsimem_wfs110_open_getcapabilities_file,
-    test_ogr_wfs_vsimem_wfs110_minimal_instance,
-    test_ogr_wfs_vsimem_wfs110_one_layer_missing_describefeaturetype,
-    test_ogr_wfs_vsimem_wfs110_one_layer_invalid_describefeaturetype,
-    test_ogr_wfs_vsimem_wfs110_one_layer_describefeaturetype_missing_schema,
-    test_ogr_wfs_vsimem_wfs110_one_layer_describefeaturetype,
-    test_ogr_wfs_vsimem_wfs110_one_layer_xmldescriptionfile_to_be_updated,
-    test_ogr_wfs_vsimem_wfs110_one_layer_missing_getfeaturecount_no_hits,
-    test_ogr_wfs_vsimem_wfs110_one_layer_missing_getfeaturecount_with_hits,
-    test_ogr_wfs_vsimem_wfs110_one_layer_invalid_getfeaturecount_with_hits,
-    test_ogr_wfs_vsimem_wfs110_one_layer_getfeaturecount_with_hits_missing_FeatureCollection,
-    test_ogr_wfs_vsimem_wfs110_one_layer_getfeaturecount_with_hits_invalid_xml,
-    test_ogr_wfs_vsimem_wfs110_one_layer_getfeaturecount_with_hits_ServiceExceptionReport,
-    test_ogr_wfs_vsimem_wfs110_one_layer_getfeaturecount_with_hits_missing_numberOfFeatures,
-    test_ogr_wfs_vsimem_wfs110_one_layer_getfeaturecount_with_hits,
-    test_ogr_wfs_vsimem_wfs110_one_layer_missing_getfeature,
-    test_ogr_wfs_vsimem_wfs110_one_layer_invalid_getfeature,
-    test_ogr_wfs_vsimem_wfs110_one_layer_exception_getfeature,
-    test_ogr_wfs_vsimem_wfs110_one_layer_getfeature,
-    test_ogr_wfs_vsimem_wfs110_one_layer_getextent,
-    test_ogr_wfs_vsimem_wfs110_one_layer_getextent_without_getfeature,
-    test_ogr_wfs_vsimem_wfs110_one_layer_getextent_optimized,
-    test_ogr_wfs_vsimem_wfs110_one_layer_getfeature_ogr_getfeature,
-    test_ogr_wfs_vsimem_wfs110_one_layer_filter_gml_id_failed,
-    test_ogr_wfs_vsimem_wfs110_one_layer_filter_gml_id_success,
-    test_ogr_wfs_vsimem_wfs110_one_layer_filter,
-    test_ogr_wfs_vsimem_wfs110_one_layer_filter_spatial_ops,
-    test_ogr_wfs_vsimem_wfs110_one_layer_spatial_filter,
-    test_ogr_wfs_vsimem_wfs110_one_layer_spatial_filter_and_attribute_filter,
-    test_ogr_wfs_vsimem_wfs110_insertfeature,
-    test_ogr_wfs_vsimem_wfs110_updatefeature,
-    test_ogr_wfs_vsimem_wfs110_deletefeature,
-    test_ogr_wfs_vsimem_wfs110_schema_not_understood,
-    test_ogr_wfs_vsimem_wfs110_multiple_layers,
-    test_ogr_wfs_vsimem_wfs110_multiple_layers_same_name_different_ns,
-    test_ogr_wfs_vsimem_wfs200_paging,
-    test_ogr_wfs_vsimem_wfs200_json,
-    test_ogr_wfs_vsimem_wfs200_multipart,
-    test_ogr_wfs_vsimem_wfs200_join,
-    test_ogr_wfs_vsimem_wfs200_join_layer_with_namespace_prefix,
-    test_ogr_wfs_vsimem_wfs200_join_distinct,
-    test_ogr_wfs_vsimem_cleanup,
-    test_ogr_wfs_fake_wfs_server,
-    test_ogr_wfs_xmldescriptionfile,
-    test_ogr_wfs_getcapabilitiesfile,
-    test_ogr_wfs_esri_2,
-    test_ogr_wfs_cubewerx,
-    test_ogr_wfs_tinyows,
-    test_ogr_wfs_erdas_apollo,
-    test_ogr_wfs_intergraph,
-    test_ogr_wfs_mapinfo,
-]
 
 if __name__ == '__main__':
 
diff --git a/autotest/ogr/ogr_wfs3.py b/autotest/ogr/ogr_wfs3.py
index ebed648ce49c..87edbf7365d9 100755
--- a/autotest/ogr/ogr_wfs3.py
+++ b/autotest/ogr/ogr_wfs3.py
@@ -565,17 +565,6 @@ def test_ogr_wfs3_cleanup():
 
     
 
-gdaltest_list = [
-    test_ogr_wfs3_init,
-    test_ogr_wfs3_errors,
-    test_ogr_wfs3_empty_layer,
-    test_ogr_wfs3_fc_links_next_geojson,
-    test_ogr_wfs3_fc_links_next_headers,
-    test_ogr_wfs3_spatial_filter,
-    test_ogr_wfs3_get_feature_count,
-    test_ogr_wfs3_attribute_filter,
-    test_ogr_wfs3_cleanup,
-]
 
 if __name__ == '__main__':
 
diff --git a/autotest/ogr/ogr_wkbwkt_geom.py b/autotest/ogr/ogr_wkbwkt_geom.py
index d08e45a663a0..d682be3ec5b5 100755
--- a/autotest/ogr/ogr_wkbwkt_geom.py
+++ b/autotest/ogr/ogr_wkbwkt_geom.py
@@ -616,19 +616,6 @@ def test_ogr_wkt_multipolygon_corrupted():
 # sys.stdin.readline()
 
 
-gdaltest_list = [
-    test_ogr_wkbwkt_geom_bigexponents,
-    test_ogr_wkbwkt_test_broken_geom,
-    test_ogr_wkbwkt_test_import_wkt_sf12,
-    test_ogr_wkbwkt_test_import_bad_multipoint_wkb,
-    test_ogr_wkbwkt_test_geometrycollection_wktwkb,
-    test_ogr_wkbwkt_test_geometrycollection_wkt_recursion,
-    test_ogr_wkbwkt_test_geometrycollection_wkb_recursion,
-    test_ogr_wkbwkt_export_wkt_iso_multipoint,
-    test_ogr_wkt_inf_nan,
-    test_ogr_wkt_multicurve_compoundcurve_corrupted,
-    test_ogr_wkt_multipolygon_corrupted,
-]
 
 if __name__ == '__main__':
 
diff --git a/autotest/ogr/ogr_wktempty.py b/autotest/ogr/ogr_wktempty.py
index 1f4c50e79e34..c25f1b775212 100755
--- a/autotest/ogr/ogr_wktempty.py
+++ b/autotest/ogr/ogr_wktempty.py
@@ -140,7 +140,6 @@ def test_ogr_wktempty_test_partial_empty_geoms():
         ('WKT is wrong: ' + geom.ExportToWkt() + '. Expected value is: ' + wkt)
 
 
-gdaltest_list = [test_ogr_wktempty_test_partial_empty_geoms]
 
 if __name__ == '__main__':
 
diff --git a/autotest/ogr/ogr_xls.py b/autotest/ogr/ogr_xls.py
index cf77eb3b2bd2..4367c4fae559 100755
--- a/autotest/ogr/ogr_xls.py
+++ b/autotest/ogr/ogr_xls.py
@@ -146,12 +146,6 @@ def test_ogr_xls_4():
     assert ret.find('INFO') != -1 and ret.find('ERROR') == -1
 
 
-gdaltest_list = [
-    test_ogr_xls_1,
-    test_ogr_xls_2,
-    test_ogr_xls_3,
-    test_ogr_xls_4
-]
 
 if __name__ == '__main__':
 
diff --git a/autotest/ogr/ogr_xlsx.py b/autotest/ogr/ogr_xlsx.py
index f429b40130e3..cd841f499816 100755
--- a/autotest/ogr/ogr_xlsx.py
+++ b/autotest/ogr/ogr_xlsx.py
@@ -545,24 +545,6 @@ def test_ogr_xlsx_boolean():
     gdal.Unlink(out_filename)
 
 
-gdaltest_list = [
-    test_ogr_xlsx_1,
-    test_ogr_xlsx_2,
-    test_ogr_xlsx_3,
-    test_ogr_xlsx_4,
-    test_ogr_xlsx_5,
-    test_ogr_xlsx_6,
-    test_ogr_xlsx_7,
-    test_ogr_xlsx_8,
-    test_ogr_xlsx_9,
-    test_ogr_xlsx_10,
-    test_ogr_xlsx_11,
-    test_ogr_xlsx_12,
-    test_ogr_xlsx_13,
-    test_ogr_xlsx_14,
-    test_ogr_xlsx_15,
-    test_ogr_xlsx_boolean,
-]
 
 if __name__ == '__main__':
 
diff --git a/autotest/ogr/ogr_xplane.py b/autotest/ogr/ogr_xplane.py
index bf1378c4340a..a3a04b68322a 100755
--- a/autotest/ogr/ogr_xplane.py
+++ b/autotest/ogr/ogr_xplane.py
@@ -190,12 +190,6 @@ def test_ogr_xplane_fix_dat():
 #
 
 
-gdaltest_list = [
-    test_ogr_xplane_apt_dat,
-    test_ogr_xplane_apt_v810_dat,
-    test_ogr_xplane_nav_dat,
-    test_ogr_xplane_awy_dat,
-    test_ogr_xplane_fix_dat]
 
 if __name__ == '__main__':
 
diff --git a/autotest/ogr/ograpispy.py b/autotest/ogr/ograpispy.py
index f56dbd5d644d..118a72024048 100755
--- a/autotest/ogr/ograpispy.py
+++ b/autotest/ogr/ograpispy.py
@@ -142,11 +142,6 @@ def test_ograpispy_cleanup():
     gdal.Unlink('/vsimem/test2.csv')
 
 
-gdaltest_list = [
-    test_ograpispy_1,
-    test_ograpispy_2,
-    test_ograpispy_cleanup
-]
 
 if __name__ == '__main__':
 
diff --git a/autotest/osr/osr_basic.py b/autotest/osr/osr_basic.py
index 2226dc846c76..3fff249c40ff 100755
--- a/autotest/osr/osr_basic.py
+++ b/autotest/osr/osr_basic.py
@@ -1230,34 +1230,6 @@ def test_osr_basic_setgeogcs():
 ###############################################################################
 
 
-gdaltest_list = [
-    test_osr_basic_1,
-    test_osr_basic_2,
-    test_osr_basic_3,
-    test_osr_basic_4,
-    test_osr_basic_5,
-    test_osr_basic_6,
-    test_osr_basic_7,
-    test_osr_basic_8,
-    test_osr_basic_9,
-    test_osr_basic_10,
-    test_osr_basic_11,
-    test_osr_basic_12,
-    test_osr_basic_13,
-    test_osr_basic_14,
-    test_osr_basic_15,
-    test_osr_basic_16,
-    test_osr_basic_17,
-    test_osr_basic_18,
-    test_osr_basic_19,
-    test_osr_basic_20,
-    test_osr_basic_21,
-    test_osr_basic_22,
-    test_osr_basic_23,
-    test_osr_basic_24,
-    test_osr_basic_25,
-    test_osr_basic_setgeogcs,
-    None]
 
 if __name__ == '__main__':
 
diff --git a/autotest/osr/osr_compd.py b/autotest/osr/osr_compd.py
index e17e6d91f442..28fbcdc9a6b3 100755
--- a/autotest/osr/osr_compd.py
+++ b/autotest/osr/osr_compd.py
@@ -341,16 +341,6 @@ def test_osr_compd_8():
     assert wkt.find('COMPD_CS') == 0, 'COMPD_CS not recognised as compound.'
 
 
-gdaltest_list = [
-    test_osr_compd_1,
-    test_osr_compd_2,
-    test_osr_compd_3,
-    test_osr_compd_4,
-    test_osr_compd_5,
-    test_osr_compd_6,
-    test_osr_compd_7,
-    test_osr_compd_8,
-    None]
 
 if __name__ == '__main__':
 
diff --git a/autotest/osr/osr_ct.py b/autotest/osr/osr_ct.py
index 3bfa14ed443a..65b57d734e47 100755
--- a/autotest/osr/osr_ct.py
+++ b/autotest/osr/osr_ct.py
@@ -300,17 +300,6 @@ def test_osr_ct_cleanup():
     gdaltest.ct = None
 
 
-gdaltest_list = [
-    test_osr_ct_1,
-    test_osr_ct_2,
-    test_osr_ct_3,
-    test_osr_ct_4,
-    test_osr_ct_5,
-    test_osr_ct_6,
-    test_osr_ct_7,
-    test_osr_ct_8,
-    test_osr_ct_cleanup,
-    None]
 
 if __name__ == '__main__':
 
diff --git a/autotest/osr/osr_epsg.py b/autotest/osr/osr_epsg.py
index da1db403e62a..aa5c3500f317 100755
--- a/autotest/osr/osr_epsg.py
+++ b/autotest/osr/osr_epsg.py
@@ -369,23 +369,6 @@ def test_osr_epsg_geoccs_deprecated():
 ###############################################################################
 
 
-gdaltest_list = [
-    test_osr_epsg_1,
-    test_osr_epsg_2,
-    test_osr_epsg_3,
-    test_osr_epsg_4,
-    test_osr_epsg_5,
-    test_osr_epsg_6,
-    test_osr_epsg_7,
-    test_osr_epsg_8,
-    test_osr_epsg_9,
-    test_osr_epsg_10,
-    test_osr_epsg_11,
-    test_osr_epsg_12,
-    test_osr_epsg_13,
-    test_osr_epsg_gcs_deprecated,
-    test_osr_epsg_geoccs_deprecated,
-    None]
 
 if __name__ == '__main__':
 
diff --git a/autotest/osr/osr_erm.py b/autotest/osr/osr_erm.py
index 8bbfdcf83ef8..05659460d51e 100755
--- a/autotest/osr/osr_erm.py
+++ b/autotest/osr/osr_erm.py
@@ -65,10 +65,6 @@ def test_osr_erm_2():
     assert srs2.IsSame(srs), 'EPSG:n import does not match.'
 
 
-gdaltest_list = [
-    test_osr_erm_1,
-    test_osr_erm_2,
-    None]
 
 if __name__ == '__main__':
 
diff --git a/autotest/osr/osr_esri.py b/autotest/osr/osr_esri.py
index 49a0136d23a9..e3d3770df56a 100755
--- a/autotest/osr/osr_esri.py
+++ b/autotest/osr/osr_esri.py
@@ -1454,41 +1454,6 @@ def test_osr_esri_33():
 #
 
 
-gdaltest_list = [
-    test_osr_esri_1,
-    test_osr_esri_2,
-    test_osr_esri_3,
-    test_osr_esri_4,
-    test_osr_esri_5,
-    test_osr_esri_6,
-    test_osr_esri_7,
-    test_osr_esri_8,
-    test_osr_esri_9,
-    test_osr_esri_10,
-    test_osr_esri_11,
-    test_osr_esri_12,
-    test_osr_esri_13,
-    test_osr_esri_14,
-    test_osr_esri_15,
-    test_osr_esri_16,
-    test_osr_esri_17,
-    test_osr_esri_18,
-    test_osr_esri_19,
-    test_osr_esri_20,
-    test_osr_esri_21,
-    test_osr_esri_22,
-    test_osr_esri_23,
-    test_osr_esri_24,
-    test_osr_esri_25,
-    test_osr_esri_26,
-    test_osr_esri_27,
-    test_osr_esri_28,
-    test_osr_esri_29,
-    test_osr_esri_30,
-    test_osr_esri_31,
-    test_osr_esri_32,
-    test_osr_esri_33,
-    None]
 
 if __name__ == '__main__':
 
diff --git a/autotest/osr/osr_getprojectionmethods.py b/autotest/osr/osr_getprojectionmethods.py
index 4c46ae88d8fd..c155eb15822f 100755
--- a/autotest/osr/osr_getprojectionmethods.py
+++ b/autotest/osr/osr_getprojectionmethods.py
@@ -44,9 +44,6 @@ def test_osr_getprojectionmethods_1():
     assert methods[0][0] == 'Transverse_Mercator'
 
 
-gdaltest_list = [
-    test_osr_getprojectionmethods_1,
-    None]
 
 if __name__ == '__main__':
 
diff --git a/autotest/osr/osr_micoordsys.py b/autotest/osr/osr_micoordsys.py
index 13c82e4d5f4d..9e6286afcfac 100755
--- a/autotest/osr/osr_micoordsys.py
+++ b/autotest/osr/osr_micoordsys.py
@@ -106,10 +106,6 @@ def test_osr_micoordsys_3():
     assert proj == 'Earth Projection 10, 157, "m", 0'
 
 
-gdaltest_list = [
-    test_osr_micoordsys_1,
-    test_osr_micoordsys_2,
-    test_osr_micoordsys_3]
 
 if __name__ == '__main__':
 
diff --git a/autotest/osr/osr_ozi.py b/autotest/osr/osr_ozi.py
index 8a9c345ae14f..b420bcdabf2f 100755
--- a/autotest/osr/osr_ozi.py
+++ b/autotest/osr/osr_ozi.py
@@ -93,11 +93,6 @@ def test_osr_ozi_3():
     assert gdaltest.equal_srs_from_wkt(expected, srs.ExportToWkt())
 
 
-gdaltest_list = [
-    test_osr_ozi_1,
-    test_osr_ozi_2,
-    test_osr_ozi_3,
-    None]
 
 if __name__ == '__main__':
 
diff --git a/autotest/osr/osr_pci.py b/autotest/osr/osr_pci.py
index 4c41699c6a0f..a2a499b545cc 100755
--- a/autotest/osr/osr_pci.py
+++ b/autotest/osr/osr_pci.py
@@ -195,15 +195,6 @@ def test_osr_pci_7():
         'ExportToPCI result wrong.'
 
 
-gdaltest_list = [
-    test_osr_pci_1,
-    test_osr_pci_2,
-    test_osr_pci_3,
-    test_osr_pci_4,
-    test_osr_pci_5,
-    test_osr_pci_6,
-    test_osr_pci_7,
-    None]
 
 if __name__ == '__main__':
 
diff --git a/autotest/osr/osr_pm.py b/autotest/osr/osr_pm.py
index 63f1d1568596..9332e4b087e3 100755
--- a/autotest/osr/osr_pm.py
+++ b/autotest/osr/osr_pm.py
@@ -85,11 +85,6 @@ def test_osr_pm_3():
 
 ###############################################################################
 
-gdaltest_list = [
-    test_osr_pm_1,
-    test_osr_pm_2,
-    test_osr_pm_3,
-    None]
 
 if __name__ == '__main__':
 
diff --git a/autotest/osr/osr_proj4.py b/autotest/osr/osr_proj4.py
index 5e6f995ec1b9..7348b654b7e3 100755
--- a/autotest/osr/osr_proj4.py
+++ b/autotest/osr/osr_proj4.py
@@ -923,38 +923,6 @@ def test_osr_proj4_error_cases_export_mercator():
     assert got == ''
 
 
-gdaltest_list = [
-    test_osr_proj4_1,
-    test_osr_proj4_2,
-    test_osr_proj4_3,
-    test_osr_proj4_4,
-    test_osr_proj4_5,
-    test_osr_proj4_6,
-    test_osr_proj4_7,
-    test_osr_proj4_8,
-    test_osr_proj4_9,
-    test_osr_proj4_10,
-    test_osr_proj4_11,
-    test_osr_proj4_12,
-    test_osr_proj4_13,
-    test_osr_proj4_14,
-    test_osr_proj4_15,
-    test_osr_proj4_16,
-    test_osr_proj4_17,
-    test_osr_proj4_18,
-    test_osr_proj4_19,
-    test_osr_proj4_20,
-    test_osr_proj4_21,
-    test_osr_proj4_22,
-    test_osr_proj4_23,
-    test_osr_proj4_24,
-    test_osr_proj4_25,
-    test_osr_proj4_26,
-    test_osr_proj4_27,
-    test_osr_proj4_28,
-    test_osr_proj4_28_missing_proj_epsg_dict,
-    test_osr_proj4_error_cases_export_mercator,
-]
 
 
 if __name__ == '__main__':
diff --git a/autotest/osr/osr_url.py b/autotest/osr/osr_url.py
index 1246ea090337..333fc74cd42e 100755
--- a/autotest/osr/osr_url.py
+++ b/autotest/osr/osr_url.py
@@ -78,10 +78,6 @@ def test_osr_url_2():
     return osr_url_test('http://spatialreference.org/ref/epsg/4326/ogcwkt/', expected_wkt)
 
 
-gdaltest_list = [
-    test_osr_url_1,
-    test_osr_url_2,
-    None]
 
 if __name__ == '__main__':
 
diff --git a/autotest/osr/osr_usgs.py b/autotest/osr/osr_usgs.py
index 43be0644f295..06d251adbfd8 100755
--- a/autotest/osr/osr_usgs.py
+++ b/autotest/osr/osr_usgs.py
@@ -81,10 +81,6 @@ def test_osr_usgs_2():
         'Can not import Lambert Conformal Conic projection.'
 
 
-gdaltest_list = [
-    test_osr_usgs_1,
-    test_osr_usgs_2,
-    None]
 
 if __name__ == '__main__':
 
diff --git a/autotest/osr/osr_validate.py b/autotest/osr/osr_validate.py
index 835c6f392b93..832072e9148f 100755
--- a/autotest/osr/osr_validate.py
+++ b/autotest/osr/osr_validate.py
@@ -250,13 +250,6 @@ def test_osr_validate_6():
 ###############################################################################
 
 
-gdaltest_list = [
-    test_osr_validate_1,
-    test_osr_validate_2,
-    test_osr_validate_3,
-    test_osr_validate_4,
-    test_osr_validate_5,
-    test_osr_validate_6]
 
 if __name__ == '__main__':
 
diff --git a/autotest/osr/osr_xml.py b/autotest/osr/osr_xml.py
index 0667ca3ee235..472368864fe3 100755
--- a/autotest/osr/osr_xml.py
+++ b/autotest/osr/osr_xml.py
@@ -203,9 +203,6 @@ def test_osr_xml_2():
     assert got == expected
 
 
-gdaltest_list = [
-    test_osr_xml_1,
-    test_osr_xml_2]
 
 if __name__ == '__main__':
 
diff --git a/autotest/pyscripts/test_gdal2tiles.py b/autotest/pyscripts/test_gdal2tiles.py
index 5903db8fdf3f..bd97bffde704 100755
--- a/autotest/pyscripts/test_gdal2tiles.py
+++ b/autotest/pyscripts/test_gdal2tiles.py
@@ -315,19 +315,6 @@ def test_exclude_transparent_tiles():
         shutil.rmtree(output_folder)
 
 
-gdaltest_list = [
-    test_gdal2tiles_py_simple,
-    test_gdal2tiles_py_zoom_option,
-    test_does_not_error_when_source_bounds_close_to_tiles_bound,
-    test_does_not_error_when_nothing_to_put_in_the_low_zoom_tile,
-    test_python3_handle_utf8_by_default,
-    test_python2_handles_utf8_by_default,
-    test_python2_gives_warning_if_bad_lc_ctype_and_non_ascii_chars,
-    test_python2_does_not_give_warning_if_bad_lc_ctype_and_all_ascii_chars,
-    test_python2_does_not_give_warning_if_bad_lc_ctype_and_non_ascii_chars_in_folder,
-    test_gdal2tiles_py_cleanup,
-    test_exclude_transparent_tiles,
-]
 
 
 if __name__ == '__main__':
diff --git a/autotest/pyscripts/test_gdal_calc.py b/autotest/pyscripts/test_gdal_calc.py
index ce4e0c6c0f13..31f4fcc3e300 100755
--- a/autotest/pyscripts/test_gdal_calc.py
+++ b/autotest/pyscripts/test_gdal_calc.py
@@ -340,16 +340,6 @@ def test_gdal_calc_py_cleanup():
 
     
 
-gdaltest_list = [
-    test_gdal_calc_py_1,
-    test_gdal_calc_py_2,
-    test_gdal_calc_py_3,
-    test_gdal_calc_py_4,
-    test_gdal_calc_py_5,
-    test_gdal_calc_py_6,
-    test_gdal_calc_py_7,
-    test_gdal_calc_py_cleanup
-]
 
 
 if __name__ == '__main__':
diff --git a/autotest/pyscripts/test_gdal_edit.py b/autotest/pyscripts/test_gdal_edit.py
index 91ba3e0ef3c1..3ee0b2195985 100755
--- a/autotest/pyscripts/test_gdal_edit.py
+++ b/autotest/pyscripts/test_gdal_edit.py
@@ -336,18 +336,6 @@ def test_gdal_edit_py_cleanup():
     gdal.Unlink('tmp/test_gdal_edit_py.tif')
 
 
-gdaltest_list = [
-    test_gdal_edit_py_1,
-    test_gdal_edit_py_2,
-    test_gdal_edit_py_3,
-    test_gdal_edit_py_4,
-    test_gdal_edit_py_5,
-    test_gdal_edit_py_6,
-    test_gdal_edit_py_7,
-    test_gdal_edit_py_8,
-    test_gdal_edit_py_unsetrpc,
-    test_gdal_edit_py_cleanup,
-]
 
 
 if __name__ == '__main__':
diff --git a/autotest/pyscripts/test_gdal_fillnodata.py b/autotest/pyscripts/test_gdal_fillnodata.py
index e4a61ea9a67d..2b73cfea380c 100755
--- a/autotest/pyscripts/test_gdal_fillnodata.py
+++ b/autotest/pyscripts/test_gdal_fillnodata.py
@@ -87,11 +87,6 @@ def test_gdal_fillnodata_cleanup():
 
     
 
-gdaltest_list = [
-    test_gdal_fillnodata_1,
-    test_gdal_fillnodata_2,
-    test_gdal_fillnodata_cleanup
-]
 
 
 if __name__ == '__main__':
diff --git a/autotest/pyscripts/test_gdal_ls_py.py b/autotest/pyscripts/test_gdal_ls_py.py
index 6107799d3cea..8e3e2a772e90 100755
--- a/autotest/pyscripts/test_gdal_ls_py.py
+++ b/autotest/pyscripts/test_gdal_ls_py.py
@@ -241,16 +241,6 @@ def test_gdal_ls_py_8():
     assert ret_str.find('-r--r--r--  1 unknown unknown        24576 2007-03-29 12:20 /vsizip//vsicurl/ftp://download.osgeo.org/gdal/data/aig/nzdem.zip/nzdem/info/arc0002r.001') != -1
 
 
-gdaltest_list = [
-    test_gdal_ls_py_1,
-    test_gdal_ls_py_2,
-    test_gdal_ls_py_3,
-    test_gdal_ls_py_4,
-    test_gdal_ls_py_5,
-    test_gdal_ls_py_6,
-    test_gdal_ls_py_7,
-    test_gdal_ls_py_8,
-]
 
 if __name__ == '__main__':
 
diff --git a/autotest/pyscripts/test_gdal_merge.py b/autotest/pyscripts/test_gdal_merge.py
index fcec8b2fce7a..3405d93a6712 100755
--- a/autotest/pyscripts/test_gdal_merge.py
+++ b/autotest/pyscripts/test_gdal_merge.py
@@ -238,14 +238,6 @@ def test_gdal_merge_cleanup():
 
     
 
-gdaltest_list = [
-    test_gdal_merge_1,
-    test_gdal_merge_2,
-    test_gdal_merge_3,
-    test_gdal_merge_4,
-    test_gdal_merge_5,
-    test_gdal_merge_cleanup
-]
 
 
 if __name__ == '__main__':
diff --git a/autotest/pyscripts/test_gdal_pansharpen.py b/autotest/pyscripts/test_gdal_pansharpen.py
index 4cc1a7065f2a..75ffb9e05e4c 100755
--- a/autotest/pyscripts/test_gdal_pansharpen.py
+++ b/autotest/pyscripts/test_gdal_pansharpen.py
@@ -102,11 +102,6 @@ def test_gdal_pansharpen_cleanup():
     gdal.GetDriverByName('GTiff').Delete('tmp/small_world_pan.tif')
 
 
-gdaltest_list = [
-    test_gdal_pansharpen_1,
-    test_gdal_pansharpen_2,
-    test_gdal_pansharpen_cleanup
-]
 
 if __name__ == '__main__':
 
diff --git a/autotest/pyscripts/test_gdal_polygonize.py b/autotest/pyscripts/test_gdal_polygonize.py
index f0b885bcf752..d5b6fd7ecd3f 100755
--- a/autotest/pyscripts/test_gdal_polygonize.py
+++ b/autotest/pyscripts/test_gdal_polygonize.py
@@ -200,12 +200,6 @@ def test_gdal_polygonize_4():
     assert content.find('<ogr:geometryProperty><gml:Polygon srsName="EPSG:26711"><gml:outerBoundaryIs><gml:LinearRing><gml:coordinates>440720,3751320 440720,3750120 441920,3750120 441920,3751320 440720,3751320</gml:coordinates></gml:LinearRing></gml:outerBoundaryIs></gml:Polygon></ogr:geometryProperty>') >= 0
 
 
-gdaltest_list = [
-    test_gdal_polygonize_1,
-    test_gdal_polygonize_2,
-    test_gdal_polygonize_3,
-    test_gdal_polygonize_4
-]
 
 if __name__ == '__main__':
 
diff --git a/autotest/pyscripts/test_gdal_proximity.py b/autotest/pyscripts/test_gdal_proximity.py
index 4efa7760bd79..72bbf4d13bec 100755
--- a/autotest/pyscripts/test_gdal_proximity.py
+++ b/autotest/pyscripts/test_gdal_proximity.py
@@ -135,12 +135,6 @@ def test_gdal_proximity_cleanup():
 
     
 
-gdaltest_list = [
-    test_gdal_proximity_1,
-    test_gdal_proximity_2,
-    test_gdal_proximity_3,
-    test_gdal_proximity_cleanup,
-]
 
 if __name__ == '__main__':
 
diff --git a/autotest/pyscripts/test_gdal_retile.py b/autotest/pyscripts/test_gdal_retile.py
index e0b7e9d36ae7..8e1bd7699a22 100755
--- a/autotest/pyscripts/test_gdal_retile.py
+++ b/autotest/pyscripts/test_gdal_retile.py
@@ -282,13 +282,6 @@ def test_gdal_retile_cleanup():
     shutil.rmtree('tmp/outretile4')
 
 
-gdaltest_list = [
-    test_gdal_retile_1,
-    test_gdal_retile_2,
-    test_gdal_retile_3,
-    test_gdal_retile_4,
-    test_gdal_retile_cleanup
-]
 
 
 if __name__ == '__main__':
diff --git a/autotest/pyscripts/test_gdal_sieve.py b/autotest/pyscripts/test_gdal_sieve.py
index 7e2c42f41dd0..6762dafdc508 100755
--- a/autotest/pyscripts/test_gdal_sieve.py
+++ b/autotest/pyscripts/test_gdal_sieve.py
@@ -74,9 +74,6 @@ def test_gdal_sieve_1():
         pytest.fail('got wrong checksum')
     
 
-gdaltest_list = [
-    test_gdal_sieve_1,
-]
 
 if __name__ == '__main__':
 
diff --git a/autotest/pyscripts/test_gdalinfo_py.py b/autotest/pyscripts/test_gdalinfo_py.py
index 30541a036ef7..1317e2730fba 100755
--- a/autotest/pyscripts/test_gdalinfo_py.py
+++ b/autotest/pyscripts/test_gdalinfo_py.py
@@ -202,18 +202,6 @@ def test_gdalinfo_py_10():
     assert ret.find('Computed Min/Max=74.000,255.000') != -1
 
 
-gdaltest_list = [
-    test_gdalinfo_py_1,
-    test_gdalinfo_py_2,
-    test_gdalinfo_py_3,
-    test_gdalinfo_py_4,
-    test_gdalinfo_py_5,
-    test_gdalinfo_py_6,
-    test_gdalinfo_py_7,
-    test_gdalinfo_py_8,
-    test_gdalinfo_py_9,
-    test_gdalinfo_py_10
-]
 
 
 if __name__ == '__main__':
diff --git a/autotest/pyscripts/test_gdalmove.py b/autotest/pyscripts/test_gdalmove.py
index e758f1c8976b..39b5ca63b3e6 100755
--- a/autotest/pyscripts/test_gdalmove.py
+++ b/autotest/pyscripts/test_gdalmove.py
@@ -76,10 +76,6 @@ def test_gdalmove_cleanup():
 
     
 
-gdaltest_list = [
-    test_gdalmove_1,
-    test_gdalmove_cleanup
-]
 
 
 if __name__ == '__main__':
diff --git a/autotest/pyscripts/test_ogr2ogr_py.py b/autotest/pyscripts/test_ogr2ogr_py.py
index 31c11600ce5a..d2fac520648d 100755
--- a/autotest/pyscripts/test_ogr2ogr_py.py
+++ b/autotest/pyscripts/test_ogr2ogr_py.py
@@ -1381,47 +1381,6 @@ def test_ogr2ogr_py_46():
     gdal.Unlink('tmp/test_ogr2ogr_45.xsd')
 
 
-gdaltest_list = [
-    test_ogr2ogr_py_1,
-    test_ogr2ogr_py_2,
-    test_ogr2ogr_py_3,
-    test_ogr2ogr_py_4,
-    test_ogr2ogr_py_5,
-    test_ogr2ogr_py_6,
-    test_ogr2ogr_py_7,
-    test_ogr2ogr_py_8,
-    test_ogr2ogr_py_9,
-    test_ogr2ogr_py_10,
-    test_ogr2ogr_py_11,
-    test_ogr2ogr_py_12,
-    test_ogr2ogr_py_13,
-    # test_ogr2ogr_py_14,
-    test_ogr2ogr_py_15,
-    test_ogr2ogr_py_16,
-    test_ogr2ogr_py_17,
-    # test_ogr2ogr_py_18,
-    test_ogr2ogr_py_19,
-    test_ogr2ogr_py_20,
-    test_ogr2ogr_py_21,
-    test_ogr2ogr_py_22,
-    test_ogr2ogr_py_23,
-    test_ogr2ogr_py_24,
-    test_ogr2ogr_py_25,
-    test_ogr2ogr_py_26,
-    test_ogr2ogr_py_27,
-    test_ogr2ogr_py_31,
-    test_ogr2ogr_py_32,
-    test_ogr2ogr_py_33,
-    test_ogr2ogr_py_34,
-    test_ogr2ogr_py_35,
-    test_ogr2ogr_py_36,
-    test_ogr2ogr_py_37,
-    test_ogr2ogr_py_38,
-    test_ogr2ogr_py_39,
-    test_ogr2ogr_py_43,
-    test_ogr2ogr_py_44,
-    test_ogr2ogr_py_45,
-    test_ogr2ogr_py_46]
 
 if __name__ == '__main__':
 
diff --git a/autotest/pyscripts/test_ogrinfo_py.py b/autotest/pyscripts/test_ogrinfo_py.py
index e70299f3d0fa..755ea403b6d7 100755
--- a/autotest/pyscripts/test_ogrinfo_py.py
+++ b/autotest/pyscripts/test_ogrinfo_py.py
@@ -333,21 +333,6 @@ def test_ogrinfo_py_23():
     os.unlink('tmp/test_ogrinfo_23.csv')
 
 
-gdaltest_list = [
-    test_ogrinfo_py_1,
-    test_ogrinfo_py_2,
-    test_ogrinfo_py_3,
-    test_ogrinfo_py_4,
-    test_ogrinfo_py_5,
-    test_ogrinfo_py_6,
-    test_ogrinfo_py_7,
-    test_ogrinfo_py_8,
-    test_ogrinfo_py_9,
-    test_ogrinfo_py_10,
-    test_ogrinfo_py_11,
-    test_ogrinfo_py_22,
-    test_ogrinfo_py_23,
-]
 
 
 if __name__ == '__main__':
diff --git a/autotest/pyscripts/test_ogrmerge.py b/autotest/pyscripts/test_ogrmerge.py
index a7b2f01a9387..0f79e2cc34af 100755
--- a/autotest/pyscripts/test_ogrmerge.py
+++ b/autotest/pyscripts/test_ogrmerge.py
@@ -350,20 +350,6 @@ def test_ogrmerge_12():
     gdal.Unlink('/vsimem/out.vrt')
 
 
-gdaltest_list = [
-    test_ogrmerge_1,
-    test_ogrmerge_2,
-    test_ogrmerge_3,
-    test_ogrmerge_4,
-    test_ogrmerge_5,
-    test_ogrmerge_6,
-    test_ogrmerge_7,
-    test_ogrmerge_8,
-    test_ogrmerge_9,
-    test_ogrmerge_10,
-    test_ogrmerge_11,
-    test_ogrmerge_12
-]
 
 
 if __name__ == '__main__':
diff --git a/autotest/pyscripts/test_rgb2pct.py b/autotest/pyscripts/test_rgb2pct.py
index b68e2cd44a87..0422e1ba3281 100755
--- a/autotest/pyscripts/test_rgb2pct.py
+++ b/autotest/pyscripts/test_rgb2pct.py
@@ -182,14 +182,6 @@ def test_rgb2pct_cleanup():
 
     
 
-gdaltest_list = [
-    test_rgb2pct_1,
-    test_pct2rgb_1,
-    test_rgb2pct_2,
-    test_rgb2pct_3,
-    test_pct2rgb_4,
-    test_rgb2pct_cleanup
-]
 
 
 if __name__ == '__main__':
diff --git a/autotest/utilities/test_gdal_contour.py b/autotest/utilities/test_gdal_contour.py
index 21a93998feae..3c126368a694 100755
--- a/autotest/utilities/test_gdal_contour.py
+++ b/autotest/utilities/test_gdal_contour.py
@@ -387,14 +387,6 @@ def test_gdal_contour_cleanup():
 
     
 
-gdaltest_list = [
-    test_gdal_contour_1,
-    test_gdal_contour_2,
-    test_gdal_contour_3,
-    test_gdal_contour_4,
-    test_gdal_contour_5,
-    test_gdal_contour_cleanup
-]
 
 
 if __name__ == '__main__':
diff --git a/autotest/utilities/test_gdal_grid.py b/autotest/utilities/test_gdal_grid.py
index 3a02213baa8a..049db1e3a3de 100755
--- a/autotest/utilities/test_gdal_grid.py
+++ b/autotest/utilities/test_gdal_grid.py
@@ -900,22 +900,6 @@ def test_gdal_grid_cleanup():
 
     
 
-gdaltest_list = [
-    test_gdal_grid_1,
-    test_gdal_grid_2,
-    test_gdal_grid_3,
-    test_gdal_grid_4,
-    test_gdal_grid_5,
-    test_gdal_grid_6,
-    test_gdal_grid_7,
-    test_gdal_grid_8,
-    test_gdal_grid_9,
-    test_gdal_grid_10,
-    test_gdal_grid_11,
-    test_gdal_grid_12,
-    test_gdal_grid_clipsrc,
-    test_gdal_grid_cleanup
-]
 
 
 if __name__ == '__main__':
diff --git a/autotest/utilities/test_gdal_grid_lib.py b/autotest/utilities/test_gdal_grid_lib.py
index 44256a496d51..6f3222ecf2b2 100755
--- a/autotest/utilities/test_gdal_grid_lib.py
+++ b/autotest/utilities/test_gdal_grid_lib.py
@@ -144,12 +144,6 @@ def test_gdal_grid_lib_cleanup():
     ogr.GetDriverByName('ESRI Shapefile').DeleteDataSource('/vsimem/tmp')
 
 
-gdaltest_list = [
-    test_gdal_grid_lib_1,
-    test_gdal_grid_lib_2,
-    test_gdal_grid_lib_3,
-    test_gdal_grid_lib_cleanup,
-]
 
 
 if __name__ == '__main__':
diff --git a/autotest/utilities/test_gdal_rasterize.py b/autotest/utilities/test_gdal_rasterize.py
index 508d2af65416..a8240f4c3b63 100755
--- a/autotest/utilities/test_gdal_rasterize.py
+++ b/autotest/utilities/test_gdal_rasterize.py
@@ -404,17 +404,6 @@ def test_gdal_rasterize_cleanup():
     os.unlink('tmp/test_gdal_rasterize_8.csv')
 
 
-gdaltest_list = [
-    test_gdal_rasterize_1,
-    test_gdal_rasterize_2,
-    test_gdal_rasterize_3,
-    test_gdal_rasterize_4,
-    test_gdal_rasterize_5,
-    test_gdal_rasterize_6,
-    test_gdal_rasterize_7,
-    test_gdal_rasterize_8,
-    test_gdal_rasterize_cleanup
-]
 
 if __name__ == '__main__':
 
diff --git a/autotest/utilities/test_gdal_rasterize_lib.py b/autotest/utilities/test_gdal_rasterize_lib.py
index 35bfbae7089b..512920d1bbb1 100755
--- a/autotest/utilities/test_gdal_rasterize_lib.py
+++ b/autotest/utilities/test_gdal_rasterize_lib.py
@@ -322,14 +322,6 @@ def test_gdal_rasterize_lib_4():
 
     
 
-gdaltest_list = [
-    test_gdal_rasterize_lib_1,
-    test_gdal_rasterize_lib_3,
-    test_gdal_rasterize_lib_100,
-    test_gdal_rasterize_lib_101,
-    test_gdal_rasterize_lib_102,
-    test_gdal_rasterize_lib_4
-]
 
 if __name__ == '__main__':
 
diff --git a/autotest/utilities/test_gdal_translate.py b/autotest/utilities/test_gdal_translate.py
index 1597b13da82b..1f414d14182a 100755
--- a/autotest/utilities/test_gdal_translate.py
+++ b/autotest/utilities/test_gdal_translate.py
@@ -970,47 +970,6 @@ def test_gdal_translate_cleanup():
         pass
     
 
-gdaltest_list = [
-    test_gdal_translate_1,
-    test_gdal_translate_2,
-    test_gdal_translate_3,
-    test_gdal_translate_4,
-    test_gdal_translate_5,
-    test_gdal_translate_6,
-    test_gdal_translate_7,
-    test_gdal_translate_8,
-    test_gdal_translate_9,
-    test_gdal_translate_10,
-    test_gdal_translate_11,
-    test_gdal_translate_12,
-    test_gdal_translate_13,
-    test_gdal_translate_14,
-    test_gdal_translate_15,
-    test_gdal_translate_16,
-    test_gdal_translate_17,
-    test_gdal_translate_18,
-    test_gdal_translate_19,
-    test_gdal_translate_20,
-    test_gdal_translate_21,
-    test_gdal_translate_22,
-    test_gdal_translate_23,
-    test_gdal_translate_24,
-    test_gdal_translate_25,
-    test_gdal_translate_26,
-    test_gdal_translate_27,
-    test_gdal_translate_28,
-    test_gdal_translate_29,
-    test_gdal_translate_30,
-    test_gdal_translate_31,
-    test_gdal_translate_32,
-    test_gdal_translate_33,
-    test_gdal_translate_34,
-    test_gdal_translate_35,
-    test_gdal_translate_36,
-    test_gdal_translate_37,
-    test_gdal_translate_38,
-    test_gdal_translate_cleanup
-]
 
 
 if __name__ == '__main__':
diff --git a/autotest/utilities/test_gdal_translate_lib.py b/autotest/utilities/test_gdal_translate_lib.py
index e57f674286c6..eae0a2319cf2 100755
--- a/autotest/utilities/test_gdal_translate_lib.py
+++ b/autotest/utilities/test_gdal_translate_lib.py
@@ -459,32 +459,6 @@ def test_gdal_translate_lib_cleanup():
 
     
 
-gdaltest_list = [
-    test_gdal_translate_lib_1,
-    test_gdal_translate_lib_2,
-    test_gdal_translate_lib_3,
-    test_gdal_translate_lib_4,
-    test_gdal_translate_lib_5,
-    test_gdal_translate_lib_6,
-    test_gdal_translate_lib_7,
-    test_gdal_translate_lib_8,
-    test_gdal_translate_lib_9,
-    test_gdal_translate_lib_10,
-    test_gdal_translate_lib_11,
-    test_gdal_translate_lib_12,
-    test_gdal_translate_lib_13,
-    test_gdal_translate_lib_14,
-    test_gdal_translate_lib_100,
-    test_gdal_translate_lib_101,
-    test_gdal_translate_lib_102,
-    test_gdal_translate_lib_103,
-    test_gdal_translate_lib_104,
-    test_gdal_translate_lib_gcp_vrt_path,
-    test_gdal_translate_lib_rcp_vrt_path,
-    test_gdal_translate_lib_geolocation_vrt_path,
-    test_gdal_translate_lib_colorinterp,
-    test_gdal_translate_lib_cleanup
-]
 
 
 if __name__ == '__main__':
diff --git a/autotest/utilities/test_gdaladdo.py b/autotest/utilities/test_gdaladdo.py
index bfc0e7c73116..c22d277ba21e 100755
--- a/autotest/utilities/test_gdaladdo.py
+++ b/autotest/utilities/test_gdaladdo.py
@@ -179,13 +179,6 @@ def test_gdaladdo_5():
     os.remove('tmp/test_gdaladdo_5.tif')
 
 
-gdaltest_list = [
-    test_gdaladdo_1,
-    test_gdaladdo_2,
-    test_gdaladdo_3,
-    test_gdaladdo_4,
-    test_gdaladdo_5
-]
 
 
 if __name__ == '__main__':
diff --git a/autotest/utilities/test_gdalbuildvrt.py b/autotest/utilities/test_gdalbuildvrt.py
index 23400eb47b52..bad1be7fba4f 100755
--- a/autotest/utilities/test_gdalbuildvrt.py
+++ b/autotest/utilities/test_gdalbuildvrt.py
@@ -525,25 +525,6 @@ def test_gdalbuildvrt_cleanup():
 
     
 
-gdaltest_list = [
-    test_gdalbuildvrt_1,
-    test_gdalbuildvrt_2,
-    test_gdalbuildvrt_3,
-    test_gdalbuildvrt_4,
-    #    test_gdalbuildvrt_5,
-    test_gdalbuildvrt_6,
-    test_gdalbuildvrt_7,
-    test_gdalbuildvrt_8,
-    test_gdalbuildvrt_9,
-    test_gdalbuildvrt_10,
-    test_gdalbuildvrt_11,
-    test_gdalbuildvrt_12,
-    test_gdalbuildvrt_13,
-    test_gdalbuildvrt_14,
-    test_gdalbuildvrt_15,
-    test_gdalbuildvrt_16,
-    test_gdalbuildvrt_cleanup
-]
 
 
 if __name__ == '__main__':
diff --git a/autotest/utilities/test_gdalbuildvrt_lib.py b/autotest/utilities/test_gdalbuildvrt_lib.py
index e2b3cc956981..82c88a6077e4 100755
--- a/autotest/utilities/test_gdalbuildvrt_lib.py
+++ b/autotest/utilities/test_gdalbuildvrt_lib.py
@@ -88,10 +88,6 @@ def test_gdalbuildvrt_lib_2():
     ds = None
 
 
-gdaltest_list = [
-    test_gdalbuildvrt_lib_1,
-    test_gdalbuildvrt_lib_2,
-]
 
 
 if __name__ == '__main__':
diff --git a/autotest/utilities/test_gdaldem.py b/autotest/utilities/test_gdaldem.py
index 9d0c665c1002..6e79d7942b32 100755
--- a/autotest/utilities/test_gdaldem.py
+++ b/autotest/utilities/test_gdaldem.py
@@ -634,28 +634,6 @@ def test_gdaldem_cleanup():
         pass
     
 
-gdaltest_list = [
-    test_gdaldem_hillshade,
-    test_gdaldem_hillshade_compressed_tiled_output,
-    test_gdaldem_hillshade_combined,
-    test_gdaldem_hillshade_compute_edges,
-    test_gdaldem_hillshade_azimuth,
-    test_gdaldem_hillshade_png,
-    test_gdaldem_hillshade_png_compute_edges,
-    test_gdaldem_slope,
-    test_gdaldem_aspect,
-    test_gdaldem_color_relief,
-    test_gdaldem_color_relief_cpt,
-    test_gdaldem_color_relief_vrt,
-    test_gdaldem_color_relief_from_float32,
-    test_gdaldem_color_relief_png,
-    test_gdaldem_color_relief_from_float32_to_png,
-    test_gdaldem_color_relief_nearest_color_entry,
-    test_gdaldem_color_relief_nearest_color_entry_vrt,
-    test_gdaldem_color_relief_nodata_nan,
-    test_gdaldem_color_relief_repeated_entry,
-    test_gdaldem_cleanup
-]
 
 
 if __name__ == '__main__':
diff --git a/autotest/utilities/test_gdaldem_lib.py b/autotest/utilities/test_gdaldem_lib.py
index b1372d29d704..2d9700311bba 100755
--- a/autotest/utilities/test_gdaldem_lib.py
+++ b/autotest/utilities/test_gdaldem_lib.py
@@ -449,26 +449,6 @@ def test_gdaldem_lib_nodata():
 
     
 
-gdaltest_list = [
-    test_gdaldem_lib_hillshade,
-    test_gdaldem_lib_hillshade_float,
-    test_gdaldem_lib_hillshade_float_png,
-    test_gdaldem_lib_hillshade_combined,
-    test_gdaldem_lib_hillshade_ZevenbergenThorne,
-    test_gdaldem_lib_hillshade_ZevenbergenThorne_combined,
-    test_gdaldem_lib_hillshade_compute_edges,
-    test_gdaldem_lib_hillshade_compute_edges_float,
-    test_gdaldem_lib_hillshade_azimuth,
-    test_gdaldem_lib_hillshade_multidirectional,
-    test_gdaldem_lib_hillshade_multidirectional_ZevenbergenThorne,
-    test_gdaldem_lib_color_relief,
-    test_gdaldem_lib_tpi,
-    test_gdaldem_lib_tri,
-    test_gdaldem_lib_roughness,
-    test_gdaldem_lib_slope_ZevenbergenThorne,
-    test_gdaldem_lib_aspect_ZevenbergenThorne,
-    test_gdaldem_lib_nodata
-]
 
 
 if __name__ == '__main__':
diff --git a/autotest/utilities/test_gdalinfo.py b/autotest/utilities/test_gdalinfo.py
index b8d394e949a1..9b6a0aa43851 100755
--- a/autotest/utilities/test_gdalinfo.py
+++ b/autotest/utilities/test_gdalinfo.py
@@ -629,48 +629,6 @@ def test_gdalinfo_40():
     assert ret['wgs84Extent']['coordinates'] == [[[-180.0, 90.0], [-180.0, -90.0], [180.0, -90.0], [180.0, 90.0], [-180.0, 90.0]]]
 
 
-gdaltest_list = [
-    test_gdalinfo_1,
-    test_gdalinfo_2,
-    test_gdalinfo_3,
-    test_gdalinfo_4,
-    test_gdalinfo_5,
-    test_gdalinfo_6,
-    test_gdalinfo_7,
-    test_gdalinfo_8,
-    test_gdalinfo_9,
-    test_gdalinfo_10,
-    test_gdalinfo_11,
-    test_gdalinfo_12,
-    test_gdalinfo_13,
-    test_gdalinfo_14,
-    test_gdalinfo_15,
-    test_gdalinfo_16,
-    test_gdalinfo_17,
-    test_gdalinfo_18,
-    test_gdalinfo_19,
-    test_gdalinfo_20,
-    test_gdalinfo_21,
-    test_gdalinfo_22,
-    test_gdalinfo_23,
-    test_gdalinfo_24,
-    test_gdalinfo_25,
-    test_gdalinfo_26,
-    test_gdalinfo_27,
-    test_gdalinfo_28,
-    test_gdalinfo_29,
-    test_gdalinfo_30,
-    test_gdalinfo_31,
-    test_gdalinfo_32,
-    test_gdalinfo_33,
-    test_gdalinfo_34,
-    test_gdalinfo_35,
-    test_gdalinfo_36,
-    test_gdalinfo_37,
-    test_gdalinfo_38,
-    test_gdalinfo_39,
-    test_gdalinfo_40,
-]
 
 
 if __name__ == '__main__':
diff --git a/autotest/utilities/test_gdalinfo_lib.py b/autotest/utilities/test_gdalinfo_lib.py
index 921fc45af33d..62e58a35904d 100755
--- a/autotest/utilities/test_gdalinfo_lib.py
+++ b/autotest/utilities/test_gdalinfo_lib.py
@@ -135,16 +135,6 @@ def test_gdalinfo_lib_nodatavalues():
     assert ret.find('PER_DATASET NODATA') >= 0, 'wrong value for mask flags.'
 
 
-gdaltest_list = [
-    test_gdalinfo_lib_1,
-    test_gdalinfo_lib_2,
-    test_gdalinfo_lib_3,
-    test_gdalinfo_lib_4,
-    test_gdalinfo_lib_5,
-    test_gdalinfo_lib_6,
-    test_gdalinfo_lib_7,
-    test_gdalinfo_lib_nodatavalues,
-]
 
 if __name__ == '__main__':
 
diff --git a/autotest/utilities/test_gdallocationinfo.py b/autotest/utilities/test_gdallocationinfo.py
index 087bb82efc19..673c9072bb5a 100755
--- a/autotest/utilities/test_gdallocationinfo.py
+++ b/autotest/utilities/test_gdallocationinfo.py
@@ -135,14 +135,6 @@ def test_gdallocationinfo_6():
     assert ret.find(expected_ret) >= 0
 
 
-gdaltest_list = [
-    test_gdallocationinfo_1,
-    test_gdallocationinfo_2,
-    test_gdallocationinfo_3,
-    test_gdallocationinfo_4,
-    test_gdallocationinfo_5,
-    test_gdallocationinfo_6,
-]
 
 
 if __name__ == '__main__':
diff --git a/autotest/utilities/test_gdalsrsinfo.py b/autotest/utilities/test_gdalsrsinfo.py
index 34f4ef7521ba..2308fd2b404b 100755
--- a/autotest/utilities/test_gdalsrsinfo.py
+++ b/autotest/utilities/test_gdalsrsinfo.py
@@ -349,27 +349,6 @@ def test_gdalsrsinfo_17():
 #
 
 
-gdaltest_list = [
-    test_gdalsrsinfo_1,
-    test_gdalsrsinfo_2,
-    test_gdalsrsinfo_3,
-    test_gdalsrsinfo_4,
-    test_gdalsrsinfo_5,
-    test_gdalsrsinfo_6,
-    test_gdalsrsinfo_7,
-    test_gdalsrsinfo_8,
-    test_gdalsrsinfo_9,
-    test_gdalsrsinfo_10,
-    test_gdalsrsinfo_11,
-    test_gdalsrsinfo_12,
-    test_gdalsrsinfo_13,
-    test_gdalsrsinfo_14,
-    test_gdalsrsinfo_14bis,
-    test_gdalsrsinfo_15,
-    test_gdalsrsinfo_16,
-    test_gdalsrsinfo_17,
-    None
-]
 
 
 if __name__ == '__main__':
diff --git a/autotest/utilities/test_gdaltindex.py b/autotest/utilities/test_gdaltindex.py
index c856a515c790..48e21813e29d 100755
--- a/autotest/utilities/test_gdaltindex.py
+++ b/autotest/utilities/test_gdaltindex.py
@@ -270,15 +270,6 @@ def test_gdaltindex_cleanup():
     drv.Delete('tmp/gdaltindex6.tif')
 
 
-gdaltest_list = [
-    test_gdaltindex_1,
-    test_gdaltindex_2,
-    test_gdaltindex_3,
-    test_gdaltindex_4,
-    test_gdaltindex_5,
-    test_gdaltindex_6,
-    test_gdaltindex_cleanup
-]
 
 
 if __name__ == '__main__':
diff --git a/autotest/utilities/test_gdaltransform.py b/autotest/utilities/test_gdaltransform.py
index 6ec83cf1950e..dcf03ac33ea9 100755
--- a/autotest/utilities/test_gdaltransform.py
+++ b/autotest/utilities/test_gdaltransform.py
@@ -176,17 +176,6 @@ def test_gdaltransform_9():
     assert len(text_split) == 2, ret
 
 
-gdaltest_list = [
-    test_gdaltransform_1,
-    test_gdaltransform_2,
-    test_gdaltransform_3,
-    test_gdaltransform_4,
-    test_gdaltransform_5,
-    test_gdaltransform_6,
-    test_gdaltransform_7,
-    test_gdaltransform_8,
-    test_gdaltransform_9
-]
 
 
 if __name__ == '__main__':
diff --git a/autotest/utilities/test_gdalwarp.py b/autotest/utilities/test_gdalwarp.py
index f25297c2e6eb..4a85137a8f68 100755
--- a/autotest/utilities/test_gdalwarp.py
+++ b/autotest/utilities/test_gdalwarp.py
@@ -1339,56 +1339,6 @@ def test_gdalwarp_cleanup():
 
     
 
-gdaltest_list = [
-    test_gdalwarp_cleanup,
-    test_gdalwarp_1,
-    test_gdalwarp_2,
-    test_gdalwarp_3,
-    test_gdalwarp_4,
-    test_gdalwarp_5,
-    test_gdalwarp_6,
-    test_gdalwarp_7,
-    test_gdalwarp_8,
-    test_gdalwarp_9,
-    test_gdalwarp_10,
-    test_gdalwarp_11,
-    test_gdalwarp_12,
-    test_gdalwarp_13,
-    test_gdalwarp_14,
-    test_gdalwarp_15,
-    test_gdalwarp_16,
-    test_gdalwarp_17,
-    test_gdalwarp_18,
-    test_gdalwarp_19,
-    test_gdalwarp_20,
-    test_gdalwarp_21,
-    test_gdalwarp_22,
-    test_gdalwarp_23,
-    test_gdalwarp_24,
-    test_gdalwarp_25,
-    test_gdalwarp_26,
-    test_gdalwarp_27,
-    test_gdalwarp_28,
-    test_gdalwarp_29,
-    test_gdalwarp_30,
-    test_gdalwarp_31,
-    test_gdalwarp_32,
-    test_gdalwarp_33,
-    test_gdalwarp_34,
-    test_gdalwarp_35,
-    test_gdalwarp_36,
-    test_gdalwarp_37,
-    test_gdalwarp_38,
-    test_gdalwarp_39,
-    test_gdalwarp_40,
-    test_gdalwarp_41,
-    test_gdalwarp_42,
-    test_gdalwarp_43,
-    test_gdalwarp_44,
-    test_gdalwarp_45,
-    test_gdalwarp_46,
-    test_gdalwarp_cleanup
-]
 
 disabled_gdaltest_list = [
     test_gdalwarp_cleanup,
diff --git a/autotest/utilities/test_gdalwarp_lib.py b/autotest/utilities/test_gdalwarp_lib.py
index fce359a83b3d..df1417c004f2 100755
--- a/autotest/utilities/test_gdalwarp_lib.py
+++ b/autotest/utilities/test_gdalwarp_lib.py
@@ -1625,77 +1625,6 @@ def test_gdalwarp_lib_cleanup():
 
     
 
-gdaltest_list = [
-    test_gdalwarp_lib_cleanup,
-    test_gdalwarp_lib_1,
-    test_gdalwarp_lib_2,
-    test_gdalwarp_lib_3,
-    test_gdalwarp_lib_4,
-    test_gdalwarp_lib_5,
-    test_gdalwarp_lib_6,
-    test_gdalwarp_lib_7,
-    test_gdalwarp_lib_8,
-    test_gdalwarp_lib_9,
-    test_gdalwarp_lib_10,
-    test_gdalwarp_lib_11,
-    test_gdalwarp_lib_12,
-    test_gdalwarp_lib_13,
-    test_gdalwarp_lib_14,
-    test_gdalwarp_lib_15,
-    test_gdalwarp_lib_16,
-    test_gdalwarp_lib_17,
-    test_gdalwarp_lib_19,
-    test_gdalwarp_lib_21,
-    test_gdalwarp_lib_23,
-    test_gdalwarp_lib_32,
-    test_gdalwarp_lib_34,
-    test_gdalwarp_lib_45,
-    test_gdalwarp_lib_46,
-    test_gdalwarp_lib_100,
-    test_gdalwarp_lib_101,
-    test_gdalwarp_lib_102,
-    test_gdalwarp_lib_103,
-    test_gdalwarp_lib_104,
-    test_gdalwarp_lib_105,
-    test_gdalwarp_lib_106,
-    test_gdalwarp_lib_107,
-    test_gdalwarp_lib_108,
-    test_gdalwarp_lib_109,
-    test_gdalwarp_lib_110,
-    test_gdalwarp_lib_111,
-    test_gdalwarp_lib_112,
-    test_gdalwarp_lib_113,
-    test_gdalwarp_lib_114,
-    test_gdalwarp_lib_115,
-    test_gdalwarp_lib_116,
-    test_gdalwarp_lib_117,
-    test_gdalwarp_lib_118,
-    test_gdalwarp_lib_119,
-    test_gdalwarp_lib_120,
-    test_gdalwarp_lib_121,
-    test_gdalwarp_lib_122,
-    test_gdalwarp_lib_123,
-    test_gdalwarp_lib_124,
-    test_gdalwarp_lib_125,
-    test_gdalwarp_lib_126,
-    test_gdalwarp_lib_127,
-    test_gdalwarp_lib_128,
-    test_gdalwarp_lib_129,
-    test_gdalwarp_lib_130,
-    test_gdalwarp_lib_131,
-    test_gdalwarp_lib_132,
-    test_gdalwarp_lib_133,
-    test_gdalwarp_lib_134,
-    test_gdalwarp_lib_135,
-    test_gdalwarp_lib_136,
-    test_gdalwarp_lib_several_sources_with_different_srs_no_explicit_target_srs,
-    test_gdalwarp_lib_touching_dateline,
-    test_gdalwarp_lib_override_default_output_nodata,
-    test_gdalwarp_lib_auto_skip_nosource,
-    test_gdalwarp_lib_to_ortho,
-    test_gdalwarp_lib_insufficient_dst_band_count,
-    test_gdalwarp_lib_cleanup,
-]
 
 if __name__ == '__main__':
 
diff --git a/autotest/utilities/test_gnmutils.py b/autotest/utilities/test_gnmutils.py
index 5ab1e30f53a9..0b65aab24a19 100755
--- a/autotest/utilities/test_gnmutils.py
+++ b/autotest/utilities/test_gnmutils.py
@@ -147,15 +147,6 @@ def test_gnm_cleanup():
 
     
 
-gdaltest_list = [
-    test_gnmmanage_1,
-    test_gnmmanage_2,
-    test_gnmmanage_3,
-    test_gnmmanage_4,
-    test_gnmanalyse_1,
-    test_gnmanalyse_2,
-    test_gnm_cleanup
-]
 
 
 if __name__ == '__main__':
diff --git a/autotest/utilities/test_nearblack.py b/autotest/utilities/test_nearblack.py
index ab737ab0c1cc..c1b87c384336 100755
--- a/autotest/utilities/test_nearblack.py
+++ b/autotest/utilities/test_nearblack.py
@@ -259,17 +259,6 @@ def test_nearblack_cleanup():
         pass
     
 
-gdaltest_list = [
-    test_nearblack_1,
-    test_nearblack_2,
-    test_nearblack_3,
-    test_nearblack_4,
-    test_nearblack_5,
-    test_nearblack_6,
-    test_nearblack_7,
-    test_nearblack_8,
-    test_nearblack_cleanup
-]
 
 
 if __name__ == '__main__':
diff --git a/autotest/utilities/test_nearblack_lib.py b/autotest/utilities/test_nearblack_lib.py
index 04670efd1dbb..14174b7f0505 100755
--- a/autotest/utilities/test_nearblack_lib.py
+++ b/autotest/utilities/test_nearblack_lib.py
@@ -153,15 +153,6 @@ def test_nearblack_lib_8():
     assert ds.GetRasterBand(3).Checksum() == 21309, 'Bad checksum band 3'
 
 
-gdaltest_list = [
-    test_nearblack_lib_1,
-    test_nearblack_lib_2,
-    test_nearblack_lib_3,
-    test_nearblack_lib_4,
-    test_nearblack_lib_5,
-    test_nearblack_lib_7,
-    test_nearblack_lib_8,
-]
 
 
 if __name__ == '__main__':
diff --git a/autotest/utilities/test_ogr2ogr.py b/autotest/utilities/test_ogr2ogr.py
index 54ce2b8a0b87..9c83368df70b 100755
--- a/autotest/utilities/test_ogr2ogr.py
+++ b/autotest/utilities/test_ogr2ogr.py
@@ -2438,76 +2438,6 @@ def test_ogr2ogr_67():
     return ret
 
 
-gdaltest_list = [
-    test_ogr2ogr_1,
-    test_ogr2ogr_2,
-    test_ogr2ogr_3,
-    test_ogr2ogr_4,
-    test_ogr2ogr_5,
-    test_ogr2ogr_6,
-    test_ogr2ogr_7,
-    test_ogr2ogr_8,
-    test_ogr2ogr_9,
-    test_ogr2ogr_10,
-    test_ogr2ogr_11,
-    test_ogr2ogr_12,
-    test_ogr2ogr_13,
-    test_ogr2ogr_14,
-    test_ogr2ogr_15,
-    test_ogr2ogr_16,
-    test_ogr2ogr_17,
-    test_ogr2ogr_18,
-    test_ogr2ogr_19,
-    test_ogr2ogr_20,
-    test_ogr2ogr_21,
-    test_ogr2ogr_22,
-    test_ogr2ogr_23,
-    test_ogr2ogr_24,
-    test_ogr2ogr_25,
-    test_ogr2ogr_26,
-    test_ogr2ogr_27,
-    test_ogr2ogr_28,
-    test_ogr2ogr_29,
-    test_ogr2ogr_30,
-    test_ogr2ogr_31,
-    test_ogr2ogr_32,
-    test_ogr2ogr_33,
-    test_ogr2ogr_34,
-    test_ogr2ogr_35,
-    test_ogr2ogr_36,
-    test_ogr2ogr_37,
-    test_ogr2ogr_38,
-    test_ogr2ogr_39,
-    test_ogr2ogr_40,
-    test_ogr2ogr_41,
-    test_ogr2ogr_42,
-    test_ogr2ogr_43,
-    test_ogr2ogr_44,
-    test_ogr2ogr_45,
-    test_ogr2ogr_46,
-    test_ogr2ogr_47,
-    test_ogr2ogr_48,
-    test_ogr2ogr_49,
-    test_ogr2ogr_49_bis,
-    test_ogr2ogr_50,
-    test_ogr2ogr_51,
-    test_ogr2ogr_52,
-    test_ogr2ogr_53,
-    test_ogr2ogr_54,
-    test_ogr2ogr_55,
-    test_ogr2ogr_56,
-    test_ogr2ogr_57,
-    test_ogr2ogr_58,
-    test_ogr2ogr_59,
-    test_ogr2ogr_60,
-    test_ogr2ogr_61,
-    test_ogr2ogr_62,
-    test_ogr2ogr_63,
-    test_ogr2ogr_64,
-    test_ogr2ogr_65,
-    test_ogr2ogr_66,
-    test_ogr2ogr_67
-]
 
 # gdaltest_list = [ test_ogr2ogr_51 ]
 
diff --git a/autotest/utilities/test_ogr2ogr_lib.py b/autotest/utilities/test_ogr2ogr_lib.py
index 3861dcc41d9d..06db0af68a58 100755
--- a/autotest/utilities/test_ogr2ogr_lib.py
+++ b/autotest/utilities/test_ogr2ogr_lib.py
@@ -451,30 +451,6 @@ def test_ogr2ogr_clipsrc_no_dst_geom():
 
     gdal.Unlink(tmpfilename)
 
-gdaltest_list = [
-    test_ogr2ogr_lib_1,
-    test_ogr2ogr_lib_2,
-    test_ogr2ogr_lib_3,
-    test_ogr2ogr_lib_4,
-    test_ogr2ogr_lib_5,
-    test_ogr2ogr_lib_6,
-    test_ogr2ogr_lib_7,
-    test_ogr2ogr_lib_8,
-    test_ogr2ogr_lib_9,
-    test_ogr2ogr_lib_10,
-    test_ogr2ogr_lib_11,
-    test_ogr2ogr_lib_12,
-    test_ogr2ogr_lib_13,
-    test_ogr2ogr_lib_14,
-    test_ogr2ogr_lib_15,
-    test_ogr2ogr_lib_16,
-    test_ogr2ogr_lib_17,
-    test_ogr2ogr_lib_18,
-    test_ogr2ogr_lib_19,
-    test_ogr2ogr_lib_20,
-    test_ogr2ogr_lib_21,
-    test_ogr2ogr_clipsrc_no_dst_geom,
-]
 
 if __name__ == '__main__':
 
diff --git a/autotest/utilities/test_ogrinfo.py b/autotest/utilities/test_ogrinfo.py
index d39e9070dccd..9c304bd635cb 100755
--- a/autotest/utilities/test_ogrinfo.py
+++ b/autotest/utilities/test_ogrinfo.py
@@ -648,34 +648,6 @@ def test_ogrinfo_sql_filename():
         'wrong output'
 
 
-gdaltest_list = [
-    test_ogrinfo_1,
-    test_ogrinfo_2,
-    test_ogrinfo_3,
-    test_ogrinfo_4,
-    test_ogrinfo_5,
-    test_ogrinfo_6,
-    test_ogrinfo_7,
-    test_ogrinfo_8,
-    test_ogrinfo_9,
-    test_ogrinfo_10,
-    test_ogrinfo_11,
-    test_ogrinfo_12,
-    test_ogrinfo_13,
-    test_ogrinfo_14,
-    test_ogrinfo_15,
-    test_ogrinfo_16,
-    test_ogrinfo_17,
-    test_ogrinfo_18,
-    test_ogrinfo_19,
-    test_ogrinfo_20,
-    test_ogrinfo_21,
-    test_ogrinfo_22,
-    test_ogrinfo_23,
-    test_ogrinfo_24,
-    test_ogrinfo_25,
-    test_ogrinfo_sql_filename,
-]
 
 
 if __name__ == '__main__':
diff --git a/autotest/utilities/test_ogrlineref.py b/autotest/utilities/test_ogrlineref.py
index 71a621b3a771..ce4bc97fafc2 100755
--- a/autotest/utilities/test_ogrlineref.py
+++ b/autotest/utilities/test_ogrlineref.py
@@ -133,14 +133,6 @@ def test_ogrlineref_cleanup():
 
     
 
-gdaltest_list = [
-    test_ogrlineref_1,
-    test_ogrlineref_2,
-    test_ogrlineref_3,
-    test_ogrlineref_4,
-    test_ogrlineref_5,
-    test_ogrlineref_cleanup
-]
 
 if __name__ == '__main__':
 
diff --git a/autotest/utilities/test_ogrtindex.py b/autotest/utilities/test_ogrtindex.py
index 88d4aa1384bf..6520da4f2e32 100755
--- a/autotest/utilities/test_ogrtindex.py
+++ b/autotest/utilities/test_ogrtindex.py
@@ -234,12 +234,6 @@ def test_ogrtindex_cleanup():
 
     
 
-gdaltest_list = [
-    test_ogrtindex_1,
-    test_ogrtindex_2,
-    test_ogrtindex_3,
-    test_ogrtindex_cleanup
-]
 
 
 if __name__ == '__main__':

From 9412c2dbf8b37d031c09bc7d3389a40055993175 Mon Sep 17 00:00:00 2001
From: Craig de Stigter <craig.destigter@koordinates.com>
Date: Mon, 10 Dec 2018 09:28:05 +1300
Subject: [PATCH 142/488] Automated: Remove __main__ block from tests

No longer needed
---
 autotest/alg/applyverticalshiftgrid.py        |  7 --
 autotest/alg/contour.py                       |  7 --
 autotest/alg/cutline.py                       |  7 --
 autotest/alg/dither.py                        |  4 -
 autotest/alg/polygonize.py                    |  7 --
 autotest/alg/proximity.py                     |  7 --
 autotest/alg/rasterize.py                     |  7 --
 autotest/alg/reproject.py                     |  7 --
 autotest/alg/sieve.py                         |  7 --
 autotest/alg/tps.py                           |  7 --
 autotest/alg/transformgeoloc.py               |  7 --
 autotest/alg/warp.py                          |  7 --
 autotest/gcore/asyncreader.py                 |  7 --
 autotest/gcore/basic_test.py                  | 18 -----
 autotest/gcore/bmp_read.py                    |  7 --
 autotest/gcore/bmp_write.py                   |  7 --
 autotest/gcore/colortable.py                  |  7 --
 autotest/gcore/envi_read.py                   |  7 --
 autotest/gcore/gcps2geotransform.py           |  7 --
 autotest/gcore/gdal_api_proxy.py              | 81 -------------------
 autotest/gcore/gdal_stats.py                  |  7 --
 autotest/gcore/geoloc.py                      |  7 --
 autotest/gcore/hdf4_read.py                   |  7 --
 autotest/gcore/hfa_read.py                    |  7 --
 autotest/gcore/hfa_rfc40.py                   |  7 --
 autotest/gcore/hfa_write.py                   |  7 --
 autotest/gcore/histogram.py                   |  7 --
 autotest/gcore/identify.py                    |  7 --
 autotest/gcore/mask.py                        |  7 --
 autotest/gcore/minixml.py                     |  6 --
 autotest/gcore/misc.py                        |  7 --
 autotest/gcore/nodatamaskband.py              |  7 --
 autotest/gcore/numpy_rw.py                    |  7 --
 autotest/gcore/overviewds.py                  |  7 --
 autotest/gcore/pam.py                         |  7 --
 autotest/gcore/pixfun.py                      |  4 -
 autotest/gcore/rasterio.py                    |  7 --
 autotest/gcore/rat.py                         |  6 --
 autotest/gcore/rfc30.py                       |  7 --
 autotest/gcore/testnonboundtoswig.py          |  7 --
 autotest/gcore/thread_test.py                 |  7 --
 autotest/gcore/tiff_ovr.py                    |  7 --
 autotest/gcore/tiff_read.py                   |  7 --
 autotest/gcore/tiff_srs.py                    |  7 --
 autotest/gcore/tiff_write.py                  | 11 ---
 autotest/gcore/transformer.py                 |  9 ---
 autotest/gcore/virtualmem.py                  |  7 --
 autotest/gcore/vrt_read.py                    |  9 ---
 autotest/gcore/vrtmisc.py                     |  7 --
 autotest/gcore/vsiaz.py                       | 11 ---
 autotest/gcore/vsicrypt.py                    |  7 --
 autotest/gcore/vsicurl.py                     | 11 ---
 autotest/gcore/vsicurl_streaming.py           |  9 ---
 autotest/gcore/vsifile.py                     |  7 --
 autotest/gcore/vsigs.py                       | 11 ---
 autotest/gcore/vsihdfs.py                     |  7 --
 autotest/gcore/vsioss.py                      | 11 ---
 autotest/gcore/vsis3.py                       | 11 ---
 autotest/gcore/vsistdin.py                    |  7 --
 autotest/gcore/vsiswift.py                    | 11 ---
 autotest/gcore/vsiwebhdfs.py                  | 12 ---
 autotest/gcore/vsizip.py                      |  7 --
 autotest/gdrivers/aaigrid.py                  |  7 --
 autotest/gdrivers/ace2.py                     |  7 --
 autotest/gdrivers/adrg.py                     |  7 --
 autotest/gdrivers/aigrid.py                   |  7 --
 autotest/gdrivers/arg.py                      |  7 --
 autotest/gdrivers/bag.py                      |  7 --
 autotest/gdrivers/blx.py                      |  7 --
 autotest/gdrivers/bsb.py                      |  7 --
 autotest/gdrivers/bt.py                       |  7 --
 autotest/gdrivers/byn.py                      |  7 --
 autotest/gdrivers/cals.py                     |  7 --
 autotest/gdrivers/ceos.py                     |  7 --
 autotest/gdrivers/cpg.py                      |  7 --
 autotest/gdrivers/ctg.py                      |  7 --
 autotest/gdrivers/db2.py                      |  7 --
 autotest/gdrivers/derived.py                  |  7 --
 autotest/gdrivers/dimap.py                    |  7 --
 autotest/gdrivers/dipex.py                    |  7 --
 autotest/gdrivers/dods.py                     |  9 ---
 autotest/gdrivers/doq1.py                     |  7 --
 autotest/gdrivers/doq2.py                     |  7 --
 autotest/gdrivers/dted.py                     |  7 --
 autotest/gdrivers/e00grid.py                  |  7 --
 autotest/gdrivers/ecrgtoc.py                  |  7 --
 autotest/gdrivers/ecw.py                      |  7 --
 autotest/gdrivers/eedai.py                    |  7 --
 autotest/gdrivers/ehdr.py                     |  7 --
 autotest/gdrivers/eir.py                      |  7 --
 autotest/gdrivers/elas.py                     |  7 --
 autotest/gdrivers/envi.py                     |  7 --
 autotest/gdrivers/ers.py                      |  7 --
 autotest/gdrivers/fast.py                     |  7 --
 autotest/gdrivers/fujibas.py                  |  7 --
 autotest/gdrivers/gdalhttp.py                 | 10 ---
 autotest/gdrivers/genbin.py                   |  7 --
 autotest/gdrivers/georaster.py                | 12 ---
 autotest/gdrivers/gff.py                      |  7 --
 autotest/gdrivers/gif.py                      |  7 --
 autotest/gdrivers/gmt.py                      |  7 --
 autotest/gdrivers/gpkg.py                     |  7 --
 autotest/gdrivers/grass.py                    |  7 --
 autotest/gdrivers/grassasciigrid.py           |  7 --
 autotest/gdrivers/grib.py                     |  7 --
 autotest/gdrivers/gsc.py                      |  7 --
 autotest/gdrivers/gsg.py                      |  7 --
 autotest/gdrivers/gta.py                      |  7 --
 autotest/gdrivers/gtx.py                      |  7 --
 autotest/gdrivers/gxf.py                      |  7 --
 autotest/gdrivers/hdf5.py                     |  7 --
 autotest/gdrivers/hf2.py                      |  7 --
 autotest/gdrivers/hfa.py                      |  7 --
 autotest/gdrivers/ida.py                      |  7 --
 autotest/gdrivers/idrisi.py                   |  7 --
 autotest/gdrivers/ignfheightasciigrid.py      |  7 --
 autotest/gdrivers/ilwis.py                    |  7 --
 autotest/gdrivers/ingr.py                     |  7 --
 autotest/gdrivers/iris.py                     |  7 --
 autotest/gdrivers/isce.py                     |  7 --
 autotest/gdrivers/isis.py                     |  7 --
 autotest/gdrivers/isis2.py                    |  7 --
 autotest/gdrivers/jdem.py                     |  7 --
 autotest/gdrivers/jp2kak.py                   |  7 --
 autotest/gdrivers/jp2lura.py                  |  8 --
 autotest/gdrivers/jp2metadata.py              |  7 --
 autotest/gdrivers/jp2openjpeg.py              |  8 --
 autotest/gdrivers/jpeg.py                     |  7 --
 autotest/gdrivers/jpeg2000.py                 |  7 --
 autotest/gdrivers/jpeg_profile.py             |  7 --
 autotest/gdrivers/jpegls.py                   |  7 --
 autotest/gdrivers/jpipkak.py                  |  7 --
 autotest/gdrivers/kea.py                      |  7 --
 autotest/gdrivers/kmlsuperoverlay.py          |  7 --
 autotest/gdrivers/kro.py                      |  7 --
 autotest/gdrivers/l1b.py                      |  7 --
 autotest/gdrivers/lan.py                      |  7 --
 autotest/gdrivers/lcp.py                      |  7 --
 autotest/gdrivers/leveller.py                 |  7 --
 autotest/gdrivers/loslas.py                   |  7 --
 autotest/gdrivers/mbtiles.py                  |  7 --
 autotest/gdrivers/mem.py                      |  7 --
 autotest/gdrivers/mff.py                      |  7 --
 autotest/gdrivers/mff2.py                     |  7 --
 autotest/gdrivers/mg4lidar.py                 |  7 --
 autotest/gdrivers/mrf.py                      |  7 --
 autotest/gdrivers/mrsid.py                    |  7 --
 autotest/gdrivers/ndf.py                      |  7 --
 autotest/gdrivers/netcdf.py                   |  7 --
 autotest/gdrivers/netcdf_cf.py                | 10 ---
 autotest/gdrivers/netcdf_cfchecks.py          |  8 --
 autotest/gdrivers/ngsgeoid.py                 |  7 --
 autotest/gdrivers/nitf.py                     |  7 --
 autotest/gdrivers/ntv1.py                     |  7 --
 autotest/gdrivers/ntv2.py                     |  7 --
 autotest/gdrivers/nwt_grc.py                  |  7 --
 autotest/gdrivers/nwt_grd.py                  |  7 --
 autotest/gdrivers/ozi.py                      |  7 --
 autotest/gdrivers/paux.py                     |  7 --
 autotest/gdrivers/pcidsk.py                   |  7 --
 autotest/gdrivers/pcraster.py                 |  7 --
 autotest/gdrivers/pdf.py                      |  7 --
 autotest/gdrivers/pds.py                      |  7 --
 autotest/gdrivers/pds4.py                     |  7 --
 autotest/gdrivers/plmosaic.py                 |  7 --
 autotest/gdrivers/png.py                      |  7 --
 autotest/gdrivers/png_profile.py              |  7 --
 autotest/gdrivers/pnm.py                      |  7 --
 autotest/gdrivers/postgisraster.py            |  7 --
 autotest/gdrivers/prf.py                      |  7 --
 autotest/gdrivers/r.py                        |  7 --
 autotest/gdrivers/rasdaman.py                 |  7 --
 autotest/gdrivers/rasterlite.py               |  7 --
 autotest/gdrivers/rda.py                      |  7 --
 autotest/gdrivers/rik.py                      |  7 --
 autotest/gdrivers/rl2.py                      |  7 --
 autotest/gdrivers/rmf.py                      |  7 --
 autotest/gdrivers/roipac.py                   |  7 --
 autotest/gdrivers/rpftoc.py                   |  7 --
 autotest/gdrivers/rraster.py                  |  7 --
 autotest/gdrivers/rs2.py                      |  7 --
 autotest/gdrivers/safe.py                     |  7 --
 autotest/gdrivers/saga.py                     |  7 --
 autotest/gdrivers/sar_ceos.py                 |  7 --
 autotest/gdrivers/sdts.py                     |  7 --
 autotest/gdrivers/sentinel2.py                |  7 --
 autotest/gdrivers/sgi.py                      |  7 --
 autotest/gdrivers/sigdem.py                   |  7 --
 autotest/gdrivers/snodas.py                   |  7 --
 autotest/gdrivers/srp.py                      |  7 --
 autotest/gdrivers/srtmhgt.py                  |  7 --
 autotest/gdrivers/terragen.py                 |  7 --
 autotest/gdrivers/test_validate_jp2.py        |  7 --
 autotest/gdrivers/tiff_profile.py             |  7 --
 autotest/gdrivers/til.py                      |  7 --
 autotest/gdrivers/usgsdem.py                  |  7 --
 autotest/gdrivers/vicar.py                    |  7 --
 autotest/gdrivers/vrtderived.py               |  7 --
 autotest/gdrivers/vrtfilt.py                  |  7 --
 autotest/gdrivers/vrtlut.py                   |  7 --
 autotest/gdrivers/vrtmask.py                  |  7 --
 autotest/gdrivers/vrtovr.py                   |  7 --
 autotest/gdrivers/vrtpansharpen.py            |  7 --
 autotest/gdrivers/vrtrawlink.py               |  7 --
 autotest/gdrivers/vrtwarp.py                  |  7 --
 autotest/gdrivers/wcs.py                      |  7 --
 autotest/gdrivers/webp.py                     |  7 --
 autotest/gdrivers/wms.py                      |  7 --
 autotest/gdrivers/wmts.py                     |  7 --
 autotest/gdrivers/xpm.py                      |  7 --
 autotest/gdrivers/xyz.py                      |  7 --
 autotest/gdrivers/zmap.py                     |  7 --
 autotest/gnm/gnm_test.py                      |  7 --
 autotest/kml_generate_test_files.py           |  6 --
 autotest/ogr/ogr_arcgen.py                    |  7 --
 autotest/ogr/ogr_as_sqlite_extension.py       |  6 --
 autotest/ogr/ogr_avc.py                       |  7 --
 autotest/ogr/ogr_basic_test.py                |  7 --
 autotest/ogr/ogr_bna.py                       |  7 --
 autotest/ogr/ogr_cad.py                       |  7 --
 autotest/ogr/ogr_carto.py                     | 11 ---
 autotest/ogr/ogr_cloudant.py                  |  7 --
 autotest/ogr/ogr_couchdb.py                   |  7 --
 autotest/ogr/ogr_csv.py                       |  7 --
 autotest/ogr/ogr_csw.py                       |  7 --
 autotest/ogr/ogr_db2.py                       |  8 --
 autotest/ogr/ogr_db2_hack.py                  |  7 --
 autotest/ogr/ogr_dgn.py                       |  7 --
 autotest/ogr/ogr_dgnv8.py                     |  7 --
 autotest/ogr/ogr_dods.py                      |  8 --
 autotest/ogr/ogr_dxf.py                       |  7 --
 autotest/ogr/ogr_edigeo.py                    |  7 --
 autotest/ogr/ogr_eeda.py                      |  7 --
 autotest/ogr/ogr_elasticsearch.py             |  7 --
 autotest/ogr/ogr_factory.py                   |  7 --
 autotest/ogr/ogr_feature.py                   |  7 --
 autotest/ogr/ogr_fgdb.py                      |  8 --
 autotest/ogr/ogr_fgdb_stress_test.py          |  8 --
 autotest/ogr/ogr_geoconcept.py                |  7 --
 autotest/ogr/ogr_geojson.py                   |  7 --
 autotest/ogr/ogr_geojsonseq.py                |  7 --
 autotest/ogr/ogr_geom.py                      |  7 --
 autotest/ogr/ogr_georss.py                    |  7 --
 autotest/ogr/ogr_geos.py                      |  7 --
 autotest/ogr/ogr_gft.py                       |  7 --
 autotest/ogr/ogr_gml_fgd_read.py              |  7 --
 autotest/ogr/ogr_gml_geom.py                  |  7 --
 autotest/ogr/ogr_gml_read.py                  |  8 --
 autotest/ogr/ogr_gmlas.py                     |  8 --
 autotest/ogr/ogr_gmt.py                       |  7 --
 autotest/ogr/ogr_gpkg.py                      |  7 --
 autotest/ogr/ogr_gpsbabel.py                  |  7 --
 autotest/ogr/ogr_gpx.py                       |  7 --
 autotest/ogr/ogr_grass.py                     |  7 --
 autotest/ogr/ogr_gtm.py                       |  7 --
 autotest/ogr/ogr_htf.py                       |  7 --
 autotest/ogr/ogr_idrisi.py                    |  7 --
 autotest/ogr/ogr_ili.py                       |  7 --
 autotest/ogr/ogr_index_test.py                |  7 --
 autotest/ogr/ogr_ingres.py                    |  7 --
 autotest/ogr/ogr_jml.py                       |  7 --
 autotest/ogr/ogr_join_test.py                 |  7 --
 autotest/ogr/ogr_kml.py                       |  7 --
 autotest/ogr/ogr_layer_algebra.py             |  7 --
 autotest/ogr/ogr_libkml.py                    |  7 --
 autotest/ogr/ogr_mem.py                       |  7 --
 autotest/ogr/ogr_mitab.py                     |  7 --
 autotest/ogr/ogr_mongodb.py                   | 10 ---
 autotest/ogr/ogr_mssqlspatial.py              |  7 --
 autotest/ogr/ogr_mvt.py                       |  7 --
 autotest/ogr/ogr_mysql.py                     |  7 --
 autotest/ogr/ogr_nas.py                       |  7 --
 autotest/ogr/ogr_ntf.py                       |  7 --
 autotest/ogr/ogr_oci.py                       | 12 ---
 autotest/ogr/ogr_odbc.py                      |  7 --
 autotest/ogr/ogr_ods.py                       |  7 --
 autotest/ogr/ogr_ogdi.py                      |  7 --
 autotest/ogr/ogr_openair.py                   |  7 --
 autotest/ogr/ogr_openfilegdb.py               |  7 --
 autotest/ogr/ogr_osm.py                       |  7 --
 autotest/ogr/ogr_pcidsk.py                    |  7 --
 autotest/ogr/ogr_pdf.py                       |  7 --
 autotest/ogr/ogr_pds.py                       |  7 --
 autotest/ogr/ogr_pg.py                        |  7 --
 autotest/ogr/ogr_pgdump.py                    |  7 --
 autotest/ogr/ogr_pgeo.py                      |  7 --
 autotest/ogr/ogr_plscenes.py                  |  7 --
 autotest/ogr/ogr_rec.py                       |  7 --
 autotest/ogr/ogr_refcount.py                  |  7 --
 autotest/ogr/ogr_rfc30.py                     |  7 --
 autotest/ogr/ogr_rfc35_mem.py                 |  7 --
 autotest/ogr/ogr_rfc35_mitab.py               |  7 --
 autotest/ogr/ogr_rfc35_shape.py               |  7 --
 autotest/ogr/ogr_rfc35_sqlite.py              |  7 --
 autotest/ogr/ogr_rfc41.py                     |  7 --
 autotest/ogr/ogr_s57.py                       |  7 --
 autotest/ogr/ogr_sde.py                       |  7 --
 autotest/ogr/ogr_sdts.py                      |  7 --
 autotest/ogr/ogr_segukooa.py                  |  7 --
 autotest/ogr/ogr_segy.py                      |  7 --
 autotest/ogr/ogr_selafin.py                   | 10 ---
 autotest/ogr/ogr_shape.py                     |  7 --
 autotest/ogr/ogr_shape_qix.py                 |  7 --
 autotest/ogr/ogr_shape_sbn.py                 |  7 --
 autotest/ogr/ogr_sosi.py                      |  7 --
 autotest/ogr/ogr_sql_rfc28.py                 |  7 --
 autotest/ogr/ogr_sql_sqlite.py                |  7 --
 autotest/ogr/ogr_sql_test.py                  |  7 --
 autotest/ogr/ogr_sqlite.py                    | 12 ---
 autotest/ogr/ogr_style.py                     |  7 --
 autotest/ogr/ogr_sua.py                       |  7 --
 autotest/ogr/ogr_svg.py                       |  7 --
 autotest/ogr/ogr_sxf.py                       |  7 --
 autotest/ogr/ogr_tiger.py                     |  7 --
 autotest/ogr/ogr_vdv.py                       |  7 --
 autotest/ogr/ogr_vfk.py                       |  6 --
 autotest/ogr/ogr_virtualogr.py                |  7 --
 autotest/ogr/ogr_vrt.py                       |  7 --
 autotest/ogr/ogr_wasp.py                      | 10 ---
 autotest/ogr/ogr_wfs.py                       |  7 --
 autotest/ogr/ogr_wfs3.py                      |  7 --
 autotest/ogr/ogr_wkbwkt_geom.py               |  7 --
 autotest/ogr/ogr_wktempty.py                  |  7 --
 autotest/ogr/ogr_xls.py                       |  7 --
 autotest/ogr/ogr_xlsx.py                      |  7 --
 autotest/ogr/ogr_xplane.py                    |  7 --
 autotest/ogr/ograpispy.py                     |  7 --
 autotest/osr/osr_basic.py                     |  7 --
 autotest/osr/osr_compd.py                     |  7 --
 autotest/osr/osr_ct.py                        |  7 --
 autotest/osr/osr_epsg.py                      |  7 --
 autotest/osr/osr_erm.py                       |  7 --
 autotest/osr/osr_esri.py                      |  9 ---
 autotest/osr/osr_getprojectionmethods.py      |  7 --
 autotest/osr/osr_micoordsys.py                |  7 --
 autotest/osr/osr_ozi.py                       |  7 --
 autotest/osr/osr_pci.py                       |  7 --
 autotest/osr/osr_pm.py                        |  7 --
 autotest/osr/osr_proj4.py                     | 12 ---
 autotest/osr/osr_url.py                       |  7 --
 autotest/osr/osr_usgs.py                      |  7 --
 autotest/osr/osr_validate.py                  |  7 --
 autotest/osr/osr_xml.py                       |  7 --
 autotest/pymod/webserver.py                   |  2 -
 autotest/pymod/xmlvalidate.py                 | 67 ---------------
 autotest/pyscripts/test_gdal2tiles.py         |  5 --
 autotest/pyscripts/test_gdal_calc.py          |  7 --
 autotest/pyscripts/test_gdal_edit.py          |  7 --
 autotest/pyscripts/test_gdal_fillnodata.py    |  7 --
 autotest/pyscripts/test_gdal_ls_py.py         | 10 ---
 autotest/pyscripts/test_gdal_merge.py         |  7 --
 autotest/pyscripts/test_gdal_pansharpen.py    |  7 --
 autotest/pyscripts/test_gdal_polygonize.py    |  7 --
 autotest/pyscripts/test_gdal_proximity.py     |  7 --
 autotest/pyscripts/test_gdal_retile.py        |  7 --
 autotest/pyscripts/test_gdal_sieve.py         |  7 --
 autotest/pyscripts/test_gdalinfo_py.py        |  7 --
 autotest/pyscripts/test_gdalmove.py           |  7 --
 autotest/pyscripts/test_ogr2ogr_py.py         |  7 --
 autotest/pyscripts/test_ogrinfo_py.py         |  7 --
 autotest/pyscripts/test_ogrmerge.py           |  7 --
 autotest/pyscripts/test_rgb2pct.py            |  7 --
 autotest/utilities/test_gdal_contour.py       |  7 --
 autotest/utilities/test_gdal_grid.py          |  7 --
 autotest/utilities/test_gdal_grid_lib.py      |  7 --
 autotest/utilities/test_gdal_rasterize.py     |  7 --
 autotest/utilities/test_gdal_rasterize_lib.py |  7 --
 autotest/utilities/test_gdal_translate.py     |  7 --
 autotest/utilities/test_gdal_translate_lib.py |  7 --
 autotest/utilities/test_gdaladdo.py           |  7 --
 autotest/utilities/test_gdalbuildvrt.py       |  7 --
 autotest/utilities/test_gdalbuildvrt_lib.py   |  7 --
 autotest/utilities/test_gdaldem.py            |  7 --
 autotest/utilities/test_gdaldem_lib.py        |  7 --
 autotest/utilities/test_gdalinfo.py           |  7 --
 autotest/utilities/test_gdalinfo_lib.py       |  7 --
 autotest/utilities/test_gdallocationinfo.py   |  7 --
 autotest/utilities/test_gdalsrsinfo.py        |  7 --
 autotest/utilities/test_gdaltindex.py         |  7 --
 autotest/utilities/test_gdaltransform.py      |  7 --
 autotest/utilities/test_gdalwarp.py           |  8 --
 autotest/utilities/test_gdalwarp_lib.py       |  7 --
 autotest/utilities/test_gnmutils.py           |  7 --
 autotest/utilities/test_nearblack.py          |  7 --
 autotest/utilities/test_nearblack_lib.py      |  7 --
 autotest/utilities/test_ogr2ogr.py            |  7 --
 autotest/utilities/test_ogr2ogr_lib.py        |  7 --
 autotest/utilities/test_ogrinfo.py            |  7 --
 autotest/utilities/test_ogrlineref.py         |  7 --
 autotest/utilities/test_ogrtindex.py          |  7 --
 390 files changed, 2952 deletions(-)

diff --git a/autotest/alg/applyverticalshiftgrid.py b/autotest/alg/applyverticalshiftgrid.py
index d9f624d1c07b..302dd646849f 100755
--- a/autotest/alg/applyverticalshiftgrid.py
+++ b/autotest/alg/applyverticalshiftgrid.py
@@ -323,10 +323,3 @@ def test_applyverticalshiftgrid_7():
 
 
 
-if __name__ == '__main__':
-
-    gdaltest.setup_run('applyverticalshiftgrid')
-
-    gdaltest.run_tests(gdaltest_list)
-
-    sys.exit(gdaltest.summarize())
diff --git a/autotest/alg/contour.py b/autotest/alg/contour.py
index d644ef574965..56ea5bf4e32a 100755
--- a/autotest/alg/contour.py
+++ b/autotest/alg/contour.py
@@ -285,10 +285,3 @@ def test_contour_cleanup():
 
 
 
-if __name__ == '__main__':
-
-    gdaltest.setup_run('contour')
-
-    gdaltest.run_tests(gdaltest_list)
-
-    sys.exit(gdaltest.summarize())
diff --git a/autotest/alg/cutline.py b/autotest/alg/cutline.py
index cdfa0284e6ad..af3f51588493 100755
--- a/autotest/alg/cutline.py
+++ b/autotest/alg/cutline.py
@@ -121,10 +121,3 @@ def test_cutline_4():
 
 
 
-if __name__ == '__main__':
-
-    gdaltest.setup_run('cutline')
-
-    gdaltest.run_tests(gdaltest_list)
-
-    sys.exit(gdaltest.summarize())
diff --git a/autotest/alg/dither.py b/autotest/alg/dither.py
index 65d4f1bf6be2..54c7a7c53d75 100755
--- a/autotest/alg/dither.py
+++ b/autotest/alg/dither.py
@@ -97,7 +97,3 @@ def test_dither_1():
 
 
 
-if __name__ == '__main__':
-    gdaltest.setup_run('dither')
-    gdaltest.run_tests(gdaltest_list)
-    sys.exit(gdaltest.summarize())
diff --git a/autotest/alg/polygonize.py b/autotest/alg/polygonize.py
index 2e5ac498bc34..aeef0d578199 100755
--- a/autotest/alg/polygonize.py
+++ b/autotest/alg/polygonize.py
@@ -195,10 +195,3 @@ def test_polygonize_4():
 
 
 
-if __name__ == '__main__':
-
-    gdaltest.setup_run('polygonize')
-
-    gdaltest.run_tests(gdaltest_list)
-
-    sys.exit(gdaltest.summarize())
diff --git a/autotest/alg/proximity.py b/autotest/alg/proximity.py
index 9530f227b449..dd63b20e5ae7 100755
--- a/autotest/alg/proximity.py
+++ b/autotest/alg/proximity.py
@@ -133,10 +133,3 @@ def test_proximity_3():
     
 
 
-if __name__ == '__main__':
-
-    gdaltest.setup_run('proximity')
-
-    gdaltest.run_tests(gdaltest_list)
-
-    sys.exit(gdaltest.summarize())
diff --git a/autotest/alg/rasterize.py b/autotest/alg/rasterize.py
index 5b0163e015d6..91137b6c76f8 100755
--- a/autotest/alg/rasterize.py
+++ b/autotest/alg/rasterize.py
@@ -332,10 +332,3 @@ def test_rasterize_6():
 
 
 
-if __name__ == '__main__':
-
-    gdaltest.setup_run('rasterize')
-
-    gdaltest.run_tests(gdaltest_list)
-
-    sys.exit(gdaltest.summarize())
diff --git a/autotest/alg/reproject.py b/autotest/alg/reproject.py
index a96f5807fc68..b59be5bce084 100755
--- a/autotest/alg/reproject.py
+++ b/autotest/alg/reproject.py
@@ -146,10 +146,3 @@ def test_reproject_4():
     
 
 
-if __name__ == '__main__':
-
-    gdaltest.setup_run('reproject')
-
-    gdaltest.run_tests(gdaltest_list)
-
-    sys.exit(gdaltest.summarize())
diff --git a/autotest/alg/sieve.py b/autotest/alg/sieve.py
index 4395d3c1e350..9d85e1ba9e4f 100755
--- a/autotest/alg/sieve.py
+++ b/autotest/alg/sieve.py
@@ -326,10 +326,3 @@ def test_sieve_8():
     
 
 
-if __name__ == '__main__':
-
-    gdaltest.setup_run('sieve')
-
-    gdaltest.run_tests(gdaltest_list)
-
-    sys.exit(gdaltest.summarize())
diff --git a/autotest/alg/tps.py b/autotest/alg/tps.py
index 2f14d6f6c33f..6c800b61e5ce 100755
--- a/autotest/alg/tps.py
+++ b/autotest/alg/tps.py
@@ -61,10 +61,3 @@ def test_tps_1():
 
 
 
-if __name__ == '__main__':
-
-    gdaltest.setup_run('tps')
-
-    gdaltest.run_tests(gdaltest_list)
-
-    sys.exit(gdaltest.summarize())
diff --git a/autotest/alg/transformgeoloc.py b/autotest/alg/transformgeoloc.py
index 7446b86305b2..5d3191f0e512 100755
--- a/autotest/alg/transformgeoloc.py
+++ b/autotest/alg/transformgeoloc.py
@@ -84,10 +84,3 @@ def test_transformgeoloc_1():
 
 
 
-if __name__ == '__main__':
-
-    gdaltest.setup_run('transform_geoloc')
-
-    gdaltest.run_tests(gdaltest_list)
-
-    sys.exit(gdaltest.summarize())
diff --git a/autotest/alg/warp.py b/autotest/alg/warp.py
index 0e9c186fe2f2..b89f288de783 100755
--- a/autotest/alg/warp.py
+++ b/autotest/alg/warp.py
@@ -1687,10 +1687,3 @@ def test_warp_56():
 
 # gdaltest_list = [ warp_55 ]
 
-if __name__ == '__main__':
-
-    gdaltest.setup_run('warp')
-
-    gdaltest.run_tests(gdaltest_list)
-
-    sys.exit(gdaltest.summarize())
diff --git a/autotest/gcore/asyncreader.py b/autotest/gcore/asyncreader.py
index f88a0c2b49fa..782083fd8e72 100755
--- a/autotest/gcore/asyncreader.py
+++ b/autotest/gcore/asyncreader.py
@@ -66,10 +66,3 @@ def test_asyncreader_1():
 
 
 
-if __name__ == '__main__':
-
-    gdaltest.setup_run('asyncreader')
-
-    gdaltest.run_tests(gdaltest_list)
-
-    sys.exit(gdaltest.summarize())
diff --git a/autotest/gcore/basic_test.py b/autotest/gcore/basic_test.py
index 8ffa13179263..7d3d2e38f28b 100755
--- a/autotest/gcore/basic_test.py
+++ b/autotest/gcore/basic_test.py
@@ -552,21 +552,3 @@ def test_basic_test_17():
 
 
 
-if __name__ == '__main__':
-
-    if len(sys.argv) == 3 and sys.argv[1] == "LICENSE":
-        if sys.argv[2] == '0':
-            gdal.SetConfigOption('GDAL_DATA', '/foo')
-        else:
-            gdal.SetConfigOption('GDAL_DATA', 'tmp')
-        gdal.VersionInfo('LICENSE')
-        print(gdal.VersionInfo('LICENSE'))
-        import testnonboundtoswig
-        testnonboundtoswig.GDALDestroyDriverManager()
-        sys.exit(0)
-
-    gdaltest.setup_run('basic_test')
-
-    gdaltest.run_tests(gdaltest_list)
-
-    sys.exit(gdaltest.summarize())
diff --git a/autotest/gcore/bmp_read.py b/autotest/gcore/bmp_read.py
index ee4c0dd11dce..4049a6c30a72 100755
--- a/autotest/gcore/bmp_read.py
+++ b/autotest/gcore/bmp_read.py
@@ -74,10 +74,3 @@ def test_bmp_online_2():
 
 
 
-if __name__ == '__main__':
-
-    gdaltest.setup_run('bmp_read')
-
-    gdaltest.run_tests(gdaltest_list)
-
-    sys.exit(gdaltest.summarize())
diff --git a/autotest/gcore/bmp_write.py b/autotest/gcore/bmp_write.py
index 6b156447f9a5..06768b06e659 100755
--- a/autotest/gcore/bmp_write.py
+++ b/autotest/gcore/bmp_write.py
@@ -72,10 +72,3 @@ def test_bmp_create(filename, checksum, testfunction):
     getattr(ut, testfunction)()
 
 
-if __name__ == '__main__':
-
-    gdaltest.setup_run('bmp_write')
-
-    gdaltest.run_tests(gdaltest_list)
-
-    sys.exit(gdaltest.summarize())
diff --git a/autotest/gcore/colortable.py b/autotest/gcore/colortable.py
index 9b34ea8e63fa..558ce50b8606 100755
--- a/autotest/gcore/colortable.py
+++ b/autotest/gcore/colortable.py
@@ -96,10 +96,3 @@ def test_colortable_cleanup():
 
 
 
-if __name__ == '__main__':
-
-    gdaltest.setup_run('colortable')
-
-    gdaltest.run_tests(gdaltest_list)
-
-    sys.exit(gdaltest.summarize())
diff --git a/autotest/gcore/envi_read.py b/autotest/gcore/envi_read.py
index ce3601dcf4c2..279eebb46190 100755
--- a/autotest/gcore/envi_read.py
+++ b/autotest/gcore/envi_read.py
@@ -78,10 +78,3 @@ def test_envi_open(filename, checksum):
 
 
 
-if __name__ == '__main__':
-
-    gdaltest.setup_run('envi_read')
-
-    gdaltest.run_tests(gdaltest_list)
-
-    sys.exit(gdaltest.summarize())
diff --git a/autotest/gcore/gcps2geotransform.py b/autotest/gcore/gcps2geotransform.py
index bce8670cb825..0b82852ce2ca 100755
--- a/autotest/gcore/gcps2geotransform.py
+++ b/autotest/gcore/gcps2geotransform.py
@@ -168,10 +168,3 @@ def test_gcps2gt_8():
 
 
 
-if __name__ == '__main__':
-
-    gdaltest.setup_run('gcps2geotransform')
-
-    gdaltest.run_tests(gdaltest_list)
-
-    sys.exit(gdaltest.summarize())
diff --git a/autotest/gcore/gdal_api_proxy.py b/autotest/gcore/gdal_api_proxy.py
index 845f25cbd9b5..8796977a3890 100755
--- a/autotest/gcore/gdal_api_proxy.py
+++ b/autotest/gcore/gdal_api_proxy.py
@@ -405,84 +405,3 @@ def test_gdal_api_proxy_sub_clean():
 
 
 
-if __name__ == '__main__':
-
-    if len(sys.argv) >= 3 and sys.argv[2] == '-1':
-
-        gdal.SetConfigOption('GDAL_API_PROXY', 'YES')
-        if sys.platform == 'win32':
-            gdalserver_path = sys.argv[1]
-            gdal.SetConfigOption('GDAL_API_PROXY_SERVER', gdalserver_path)
-
-        gdaltest.api_proxy_server_p = None
-        gdaltest_list = [test_gdal_api_proxy_sub]
-
-    elif len(sys.argv) >= 3 and sys.argv[2] == '-2':
-
-        gdalserver_path = sys.argv[1]
-
-        p = None
-        for port in [8080, 8081, 8082]:
-            p = subprocess.Popen([gdalserver_path, '-tcpserver', '%d' % port])
-            time.sleep(1)
-            if p.poll() is None:
-                break
-            try:
-                p.terminate()
-            except (AttributeError, OSError):
-                pass
-            p.wait()
-            p = None
-
-        if p is not None:
-            gdal.SetConfigOption('GDAL_API_PROXY', 'YES')
-            gdal.SetConfigOption('GDAL_API_PROXY_SERVER', 'localhost:%d' % port)
-            print('port = %d' % port)
-            gdaltest.api_proxy_server_p = p
-            gdaltest_list = [test_gdal_api_proxy_sub, test_gdal_api_proxy_sub_clean]
-        else:
-            gdaltest_list = []
-
-    elif len(sys.argv) >= 3 and sys.argv[2] == '-3':
-
-        gdalserver_path = sys.argv[1]
-
-        p = subprocess.Popen([gdalserver_path, '-unixserver', 'tmp/gdalapiproxysocket'])
-        time.sleep(1)
-        if p.poll() is None:
-            gdal.SetConfigOption('GDAL_API_PROXY', 'YES')
-            gdal.SetConfigOption('GDAL_API_PROXY_SERVER', 'tmp/gdalapiproxysocket')
-            gdaltest.api_proxy_server_p = p
-            gdaltest_list = [test_gdal_api_proxy_sub, test_gdal_api_proxy_sub_clean]
-        else:
-            try:
-                p.terminate()
-            except (AttributeError, OSError):
-                pass
-            p.wait()
-            gdaltest_list = []
-
-    elif len(sys.argv) >= 3 and sys.argv[2] == '-4':
-
-        gdalserver_path = sys.argv[1]
-
-        p = subprocess.Popen([gdalserver_path, '-nofork', '-unixserver', 'tmp/gdalapiproxysocket'])
-        time.sleep(1)
-        if p.poll() is None:
-            gdal.SetConfigOption('GDAL_API_PROXY', 'YES')
-            gdal.SetConfigOption('GDAL_API_PROXY_SERVER', 'tmp/gdalapiproxysocket')
-            gdaltest.api_proxy_server_p = p
-            gdaltest_list = [test_gdal_api_proxy_sub, test_gdal_api_proxy_sub_clean]
-        else:
-            try:
-                p.terminate()
-            except (AttributeError, OSError):
-                pass
-            p.wait()
-            gdaltest_list = []
-
-    gdaltest.setup_run('gdal_api_proxy')
-
-    gdaltest.run_tests(gdaltest_list)
-
-    sys.exit(gdaltest.summarize())
diff --git a/autotest/gcore/gdal_stats.py b/autotest/gcore/gdal_stats.py
index b87a5e33a3fd..338f0ec4afc7 100755
--- a/autotest/gcore/gdal_stats.py
+++ b/autotest/gcore/gdal_stats.py
@@ -707,10 +707,3 @@ def test_stats_float32_with_nodata_slightly_above_float_max():
 
 
 
-if __name__ == '__main__':
-
-    gdaltest.setup_run('gdal_stats')
-
-    gdaltest.run_tests(gdaltest_list)
-
-    sys.exit(gdaltest.summarize())
diff --git a/autotest/gcore/geoloc.py b/autotest/gcore/geoloc.py
index f5918d06e6db..7ed1bfc4bbcb 100755
--- a/autotest/gcore/geoloc.py
+++ b/autotest/gcore/geoloc.py
@@ -45,10 +45,3 @@ def test_geoloc_1():
 
 
 
-if __name__ == '__main__':
-
-    gdaltest.setup_run('geoloc')
-
-    gdaltest.run_tests(gdaltest_list)
-
-    sys.exit(gdaltest.summarize())
diff --git a/autotest/gcore/hdf4_read.py b/autotest/gcore/hdf4_read.py
index a2d8cf0e490c..07a440ce9e92 100755
--- a/autotest/gcore/hdf4_read.py
+++ b/autotest/gcore/hdf4_read.py
@@ -307,10 +307,3 @@ def test_hdf4_read_online_10():
 
 
 
-if __name__ == '__main__':
-
-    gdaltest.setup_run('hdf4_read')
-
-    gdaltest.run_tests(gdaltest_list)
-
-    sys.exit(gdaltest.summarize())
diff --git a/autotest/gcore/hfa_read.py b/autotest/gcore/hfa_read.py
index 759c9d478805..3256c7199822 100755
--- a/autotest/gcore/hfa_read.py
+++ b/autotest/gcore/hfa_read.py
@@ -68,10 +68,3 @@ def test_hfa_read_completedefn_recursion():
     
 
 
-if __name__ == '__main__':
-
-    gdaltest.setup_run('hfa_read')
-
-    gdaltest.run_tests(gdaltest_list)
-
-    sys.exit(gdaltest.summarize())
diff --git a/autotest/gcore/hfa_rfc40.py b/autotest/gcore/hfa_rfc40.py
index 0dcf05be62a7..935b66748db4 100755
--- a/autotest/gcore/hfa_rfc40.py
+++ b/autotest/gcore/hfa_rfc40.py
@@ -474,10 +474,3 @@ def test_hfa_rfc40_cleanup():
 
 
 
-if __name__ == '__main__':
-
-    gdaltest.setup_run('hfa_rfc40')
-
-    gdaltest.run_tests(gdaltest_list)
-
-    sys.exit(gdaltest.summarize())
diff --git a/autotest/gcore/hfa_write.py b/autotest/gcore/hfa_write.py
index 39f45e6a3a1b..d3ca4bc8c698 100755
--- a/autotest/gcore/hfa_write.py
+++ b/autotest/gcore/hfa_write.py
@@ -425,10 +425,3 @@ def test_hfa_create_compress(filename, checksum, testfunction):
 
 
 
-if __name__ == '__main__':
-
-    gdaltest.setup_run('hfa_write')
-
-    gdaltest.run_tests(gdaltest_list)
-
-    sys.exit(gdaltest.summarize())
diff --git a/autotest/gcore/histogram.py b/autotest/gcore/histogram.py
index 46eb7f89b251..81b7f0b692d8 100755
--- a/autotest/gcore/histogram.py
+++ b/autotest/gcore/histogram.py
@@ -130,10 +130,3 @@ def test_histogram_6():
 
 
 
-if __name__ == '__main__':
-
-    gdaltest.setup_run('histogram')
-
-    gdaltest.run_tests(gdaltest_list)
-
-    sys.exit(gdaltest.summarize())
diff --git a/autotest/gcore/identify.py b/autotest/gcore/identify.py
index 3a86630916ca..e07a8a101ecb 100755
--- a/autotest/gcore/identify.py
+++ b/autotest/gcore/identify.py
@@ -94,10 +94,3 @@ def test_identify_4():
 
 
 
-if __name__ == '__main__':
-
-    gdaltest.setup_run('identify')
-
-    gdaltest.run_tests(gdaltest_list)
-
-    sys.exit(gdaltest.summarize())
diff --git a/autotest/gcore/mask.py b/autotest/gcore/mask.py
index b9622b3d3fdd..eca86107bc86 100755
--- a/autotest/gcore/mask.py
+++ b/autotest/gcore/mask.py
@@ -935,10 +935,3 @@ def test_mask_27():
 # Extensive test of real NODATA_VALUES mask for all complex types
 
 
-if __name__ == '__main__':
-
-    gdaltest.setup_run('mask')
-
-    gdaltest.run_tests(gdaltest_list)
-
-    sys.exit(gdaltest.summarize())
diff --git a/autotest/gcore/minixml.py b/autotest/gcore/minixml.py
index bf300ed44cdc..b2fde5514591 100755
--- a/autotest/gcore/minixml.py
+++ b/autotest/gcore/minixml.py
@@ -244,9 +244,3 @@ def test_minixml_cleanup():
     pass
 
 
-if __name__ == '__main__':
-
-    gdaltest.setup_run('minixml')
-    gdaltest.run_tests(gdaltest_list)
-
-    sys.exit(gdaltest.summarize())
diff --git a/autotest/gcore/misc.py b/autotest/gcore/misc.py
index 1a28c316d34f..f72482fd07eb 100755
--- a/autotest/gcore/misc.py
+++ b/autotest/gcore/misc.py
@@ -747,10 +747,3 @@ def test_misc_cleanup():
 
 # gdaltest_list = [ misc_6 ]
 
-if __name__ == '__main__':
-
-    gdaltest.setup_run('misc')
-
-    gdaltest.run_tests(gdaltest_list)
-
-    sys.exit(gdaltest.summarize())
diff --git a/autotest/gcore/nodatamaskband.py b/autotest/gcore/nodatamaskband.py
index 9c3363ccd657..18b6d0283042 100755
--- a/autotest/gcore/nodatamaskband.py
+++ b/autotest/gcore/nodatamaskband.py
@@ -94,10 +94,3 @@ def test_nodatamaskband_1():
     
 
 
-if __name__ == '__main__':
-
-    gdaltest.setup_run('nodatamaskband')
-
-    gdaltest.run_tests(gdaltest_list)
-
-    sys.exit(gdaltest.summarize())
diff --git a/autotest/gcore/numpy_rw.py b/autotest/gcore/numpy_rw.py
index d1a041b17f11..71b956191e38 100755
--- a/autotest/gcore/numpy_rw.py
+++ b/autotest/gcore/numpy_rw.py
@@ -731,10 +731,3 @@ def test_numpy_rw_cleanup():
 
 
 
-if __name__ == '__main__':
-
-    gdaltest.setup_run('numpy_rw')
-
-    gdaltest.run_tests(gdaltest_list)
-
-    sys.exit(gdaltest.summarize())
diff --git a/autotest/gcore/overviewds.py b/autotest/gcore/overviewds.py
index 5156fe2dad05..5e01d3bf8b09 100755
--- a/autotest/gcore/overviewds.py
+++ b/autotest/gcore/overviewds.py
@@ -277,10 +277,3 @@ def test_overviewds_cleanup():
     
 
 
-if __name__ == '__main__':
-
-    gdaltest.setup_run('overviewds')
-
-    gdaltest.run_tests(gdaltest_list)
-
-    sys.exit(gdaltest.summarize())
diff --git a/autotest/gcore/pam.py b/autotest/gcore/pam.py
index 429c5ccf6012..49fb98fd06dd 100755
--- a/autotest/gcore/pam.py
+++ b/autotest/gcore/pam.py
@@ -448,10 +448,3 @@ def test_pam_cleanup():
     
 
 
-if __name__ == '__main__':
-
-    gdaltest.setup_run('pam')
-
-    gdaltest.run_tests(gdaltest_list)
-
-    sys.exit(gdaltest.summarize())
diff --git a/autotest/gcore/pixfun.py b/autotest/gcore/pixfun.py
index f77c393c0c43..a38633a61007 100755
--- a/autotest/gcore/pixfun.py
+++ b/autotest/gcore/pixfun.py
@@ -713,7 +713,3 @@ def test_pixfun_dB2pow():
 
 
 
-if __name__ == '__main__':
-    gdaltest.setup_run('pixfun')
-    gdaltest.run_tests(gdaltest_list)
-    sys.exit(gdaltest.summarize())
diff --git a/autotest/gcore/rasterio.py b/autotest/gcore/rasterio.py
index b215f2cf5f0f..e4827321d544 100755
--- a/autotest/gcore/rasterio.py
+++ b/autotest/gcore/rasterio.py
@@ -937,10 +937,3 @@ def test_rasterio_resampled_value_is_nodata():
 
 # gdaltest_list = [ rasterio_16 ]
 
-if __name__ == '__main__':
-
-    gdaltest.setup_run('rasterio')
-
-    gdaltest.run_tests(gdaltest_list)
-
-    sys.exit(gdaltest.summarize())
diff --git a/autotest/gcore/rat.py b/autotest/gcore/rat.py
index 95d27bda5862..eec7de8ba444 100755
--- a/autotest/gcore/rat.py
+++ b/autotest/gcore/rat.py
@@ -140,9 +140,3 @@ def test_rat_3():
 
 
 
-if __name__ == '__main__':
-
-    gdaltest.setup_run('rat')
-    gdaltest.run_tests(gdaltest_list)
-
-    sys.exit(gdaltest.summarize())
diff --git a/autotest/gcore/rfc30.py b/autotest/gcore/rfc30.py
index e4df738a2bf1..1a2d212ae2bf 100755
--- a/autotest/gcore/rfc30.py
+++ b/autotest/gcore/rfc30.py
@@ -117,10 +117,3 @@ def test_rfc30_2():
 
 
 
-if __name__ == '__main__':
-
-    gdaltest.setup_run('rfc30')
-
-    gdaltest.run_tests(gdaltest_list)
-
-    sys.exit(gdaltest.summarize())
diff --git a/autotest/gcore/testnonboundtoswig.py b/autotest/gcore/testnonboundtoswig.py
index d3973ae15340..a535d6f727fd 100755
--- a/autotest/gcore/testnonboundtoswig.py
+++ b/autotest/gcore/testnonboundtoswig.py
@@ -344,10 +344,3 @@ def test_testnonboundtoswig_VRTDerivedBands():
 
 
 
-if __name__ == '__main__':
-
-    gdaltest.setup_run('testnonboundtoswig')
-
-    gdaltest.run_tests(gdaltest_list)
-
-    sys.exit(gdaltest.summarize())
diff --git a/autotest/gcore/thread_test.py b/autotest/gcore/thread_test.py
index 587086227480..9c06c1182ef1 100755
--- a/autotest/gcore/thread_test.py
+++ b/autotest/gcore/thread_test.py
@@ -85,10 +85,3 @@ def test_thread_test_1():
 
 
 
-if __name__ == '__main__':
-
-    gdaltest.setup_run('thread_test')
-
-    gdaltest.run_tests(gdaltest_list)
-
-    sys.exit(gdaltest.summarize())
diff --git a/autotest/gcore/tiff_ovr.py b/autotest/gcore/tiff_ovr.py
index 8800936259da..99c6489e0b47 100755
--- a/autotest/gcore/tiff_ovr.py
+++ b/autotest/gcore/tiff_ovr.py
@@ -1961,10 +1961,3 @@ def test_tiff_ovr_average_multiband_vs_singleband():
 
 
 
-if __name__ == '__main__':
-
-    gdaltest.setup_run('tiff_ovr')
-
-    gdaltest.run_tests(gdaltest_list)
-
-    sys.exit(gdaltest.summarize())
diff --git a/autotest/gcore/tiff_read.py b/autotest/gcore/tiff_read.py
index e01f0acbb042..fb43c5ee3d93 100755
--- a/autotest/gcore/tiff_read.py
+++ b/autotest/gcore/tiff_read.py
@@ -3149,10 +3149,3 @@ def test_tiff_read_overview_of_external_mask():
 
 
 
-if __name__ == '__main__':
-
-    gdaltest.setup_run('tiff_read')
-
-    gdaltest.run_tests(gdaltest_list)
-
-    sys.exit(gdaltest.summarize())
diff --git a/autotest/gcore/tiff_srs.py b/autotest/gcore/tiff_srs.py
index 0b3bf4f55560..48ae7d921d7d 100755
--- a/autotest/gcore/tiff_srs.py
+++ b/autotest/gcore/tiff_srs.py
@@ -474,10 +474,3 @@ def test_tiff_srs_proj4(proj4):
 
 
 
-if __name__ == '__main__':
-
-    gdaltest.setup_run('tiff_srs')
-
-    gdaltest.run_tests(gdaltest_list)
-
-    sys.exit(gdaltest.summarize())
diff --git a/autotest/gcore/tiff_write.py b/autotest/gcore/tiff_write.py
index 01754c9fb8c0..18b38cb2ff4f 100755
--- a/autotest/gcore/tiff_write.py
+++ b/autotest/gcore/tiff_write.py
@@ -6931,14 +6931,3 @@ def test_tiff_write_cleanup():
 
 # gdaltest_list = [ tiff_write_1, tiff_write_176_lerc_max_z_error ]
 
-if __name__ == '__main__':
-
-    if len(sys.argv) >= 2 and sys.argv[1] == '-api_proxy':
-        run_tiff_write_api_proxy = False
-        gdal.SetConfigOption('GDAL_API_PROXY', 'YES')
-
-    gdaltest.setup_run('tiff_write')
-
-    gdaltest.run_tests(gdaltest_list)
-
-    sys.exit(gdaltest.summarize())
diff --git a/autotest/gcore/transformer.py b/autotest/gcore/transformer.py
index 72bc79556735..8e09a9513c87 100755
--- a/autotest/gcore/transformer.py
+++ b/autotest/gcore/transformer.py
@@ -718,12 +718,3 @@ def test_transformer_17():
 disabled_gdaltest_list = [
     test_transformer_11
 ]
-
-
-if __name__ == '__main__':
-
-    gdaltest.setup_run('transformer')
-
-    gdaltest.run_tests(gdaltest_list)
-
-    sys.exit(gdaltest.summarize())
diff --git a/autotest/gcore/virtualmem.py b/autotest/gcore/virtualmem.py
index 0efa2ace28a6..63d7e9300b7d 100755
--- a/autotest/gcore/virtualmem.py
+++ b/autotest/gcore/virtualmem.py
@@ -252,10 +252,3 @@ def test_virtualmem_4():
 
 
 
-if __name__ == '__main__':
-
-    gdaltest.setup_run('virtualmem')
-
-    gdaltest.run_tests(gdaltest_list)
-
-    sys.exit(gdaltest.summarize())
diff --git a/autotest/gcore/vrt_read.py b/autotest/gcore/vrt_read.py
index 5712460759a9..a77a0dd18596 100755
--- a/autotest/gcore/vrt_read.py
+++ b/autotest/gcore/vrt_read.py
@@ -1183,12 +1183,3 @@ def test_vrt_dstsize_larger_than_source():
     ds = gdal.Open('data/dstsize_larger_than_source.vrt')
     cs = ds.GetRasterBand(1).Checksum()
     assert cs == 33273
-
-
-if __name__ == '__main__':
-
-    gdaltest.setup_run('vrt_read')
-
-    gdaltest.run_tests(gdaltest_list)
-
-    sys.exit(gdaltest.summarize())
diff --git a/autotest/gcore/vrtmisc.py b/autotest/gcore/vrtmisc.py
index c335204c1ca4..5cb5717f81cf 100755
--- a/autotest/gcore/vrtmisc.py
+++ b/autotest/gcore/vrtmisc.py
@@ -506,10 +506,3 @@ def test_vrtmisc_cleanup():
     pass
 
 
-if __name__ == '__main__':
-
-    gdaltest.setup_run('vrtmisc')
-
-    gdaltest.run_tests(gdaltest_list)
-
-    sys.exit(gdaltest.summarize())
diff --git a/autotest/gcore/vsiaz.py b/autotest/gcore/vsiaz.py
index 91dabb2c207d..dd710cb56b26 100755
--- a/autotest/gcore/vsiaz.py
+++ b/autotest/gcore/vsiaz.py
@@ -889,14 +889,3 @@ def test_vsiaz_cleanup():
 # gdaltest_list = [ vsiaz_init, vsiaz_start_webserver, vsiaz_fake_mkdir_rmdir, vsiaz_stop_webserver, vsiaz_cleanup ]
 
 gdaltest_list_extra = [vsiaz_extra_1]
-
-if __name__ == '__main__':
-
-    gdaltest.setup_run('vsiaz')
-
-    if gdal.GetConfigOption('RUN_MANUAL_ONLY', None):
-        gdaltest.run_tests(gdaltest_list_extra)
-    else:
-        gdaltest.run_tests(gdaltest_list + gdaltest_list_extra + [test_vsiaz_cleanup])
-
-    sys.exit(gdaltest.summarize())
diff --git a/autotest/gcore/vsicrypt.py b/autotest/gcore/vsicrypt.py
index d0d4488d89b5..7f43650829d8 100755
--- a/autotest/gcore/vsicrypt.py
+++ b/autotest/gcore/vsicrypt.py
@@ -523,10 +523,3 @@ def test_vsicrypt_6():
 
 
 
-if __name__ == '__main__':
-
-    gdaltest.setup_run('vsicrypt')
-
-    gdaltest.run_tests(gdaltest_list)
-
-    sys.exit(gdaltest.summarize())
diff --git a/autotest/gcore/vsicurl.py b/autotest/gcore/vsicurl.py
index 15196cc38eb1..2b78d6b55a0a 100755
--- a/autotest/gcore/vsicurl.py
+++ b/autotest/gcore/vsicurl.py
@@ -464,14 +464,3 @@ def test_vsicurl_stop_webserver():
 
 
 
-if __name__ == '__main__':
-
-    if gdal.GetConfigOption('GDAL_RUN_SLOW_TESTS', '').upper() != 'NO':
-        print('Enabling slow tests as GDAL_RUN_SLOW_TESTS is not defined')
-        gdal.SetConfigOption('GDAL_RUN_SLOW_TESTS', 'YES')
-
-    gdaltest.setup_run('vsicurl')
-
-    gdaltest.run_tests(gdaltest_list)
-
-    sys.exit(gdaltest.summarize())
diff --git a/autotest/gcore/vsicurl_streaming.py b/autotest/gcore/vsicurl_streaming.py
index 30cbc0e9751b..554f51b87412 100755
--- a/autotest/gcore/vsicurl_streaming.py
+++ b/autotest/gcore/vsicurl_streaming.py
@@ -121,12 +121,3 @@ def test_vsicurl_streaming_1():
 
 
 
-if __name__ == '__main__':
-
-    gdal.SetConfigOption('GDAL_RUN_SLOW_TESTS', 'YES')
-
-    gdaltest.setup_run('vsicurl_streaming')
-
-    gdaltest.run_tests(gdaltest_list)
-
-    sys.exit(gdaltest.summarize())
diff --git a/autotest/gcore/vsifile.py b/autotest/gcore/vsifile.py
index b2e3d2602ffb..e202c856885d 100755
--- a/autotest/gcore/vsifile.py
+++ b/autotest/gcore/vsifile.py
@@ -835,10 +835,3 @@ def test_vsifile_opendir():
 
 
 
-if __name__ == '__main__':
-
-    gdaltest.setup_run('vsifile')
-
-    gdaltest.run_tests(gdaltest_list)
-
-    sys.exit(gdaltest.summarize())
diff --git a/autotest/gcore/vsigs.py b/autotest/gcore/vsigs.py
index 49b9b49e4b6f..a4bc6763de56 100755
--- a/autotest/gcore/vsigs.py
+++ b/autotest/gcore/vsigs.py
@@ -1194,14 +1194,3 @@ def test_vsigs_cleanup():
 # gdaltest_list = [ vsigs_init, vsigs_start_webserver, vsigs_write, vsigs_stop_webserver, vsigs_cleanup ]
 
 gdaltest_list_extra = [vsigs_extra_1]
-
-if __name__ == '__main__':
-
-    gdaltest.setup_run('vsigs')
-
-    if gdal.GetConfigOption('RUN_MANUAL_ONLY', None):
-        gdaltest.run_tests(gdaltest_list_extra)
-    else:
-        gdaltest.run_tests(gdaltest_list + gdaltest_list_extra + [test_vsigs_cleanup])
-
-    sys.exit(gdaltest.summarize())
diff --git a/autotest/gcore/vsihdfs.py b/autotest/gcore/vsihdfs.py
index 21f5efc40f43..86e119393dd3 100755
--- a/autotest/gcore/vsihdfs.py
+++ b/autotest/gcore/vsihdfs.py
@@ -152,10 +152,3 @@ def test_vsihdfs_7():
 
 
 
-if __name__ == '__main__':
-
-    gdaltest.setup_run('vsihdfs')
-
-    gdaltest.run_tests(gdaltest_list)
-
-    sys.exit(gdaltest.summarize())
diff --git a/autotest/gcore/vsioss.py b/autotest/gcore/vsioss.py
index dcc5ca5cb690..149d41eb8bd3 100755
--- a/autotest/gcore/vsioss.py
+++ b/autotest/gcore/vsioss.py
@@ -1121,14 +1121,3 @@ def test_visoss_cleanup():
 # gdaltest_list = [ visoss_init, visoss_start_webserver, visoss_8, visoss_stop_webserver, visoss_cleanup ]
 
 gdaltest_list_extra = [visoss_extra_1]
-
-if __name__ == '__main__':
-
-    gdaltest.setup_run('vsioss')
-
-    if gdal.GetConfigOption('RUN_MANUAL_ONLY', None):
-        gdaltest.run_tests(gdaltest_list_extra)
-    else:
-        gdaltest.run_tests(gdaltest_list + gdaltest_list_extra + [test_visoss_cleanup])
-
-    sys.exit(gdaltest.summarize())
diff --git a/autotest/gcore/vsis3.py b/autotest/gcore/vsis3.py
index c7f433204110..aad207d44541 100755
--- a/autotest/gcore/vsis3.py
+++ b/autotest/gcore/vsis3.py
@@ -2422,14 +2422,3 @@ def test_vsis3_cleanup():
 # gdaltest_list = [ vsis3_init, vsis3_start_webserver, vsis3_opendir, vsis3_stop_webserver, vsis3_cleanup ]
 
 gdaltest_list_extra = [vsis3_extra_1]
-
-if __name__ == '__main__':
-
-    gdaltest.setup_run('vsis3')
-
-    if gdal.GetConfigOption('RUN_MANUAL_ONLY', None):
-        gdaltest.run_tests(gdaltest_list_extra)
-    else:
-        gdaltest.run_tests(gdaltest_list + gdaltest_list_extra + [test_vsis3_cleanup])
-
-    sys.exit(gdaltest.summarize())
diff --git a/autotest/gcore/vsistdin.py b/autotest/gcore/vsistdin.py
index 749d030276cc..e37925856f8a 100755
--- a/autotest/gcore/vsistdin.py
+++ b/autotest/gcore/vsistdin.py
@@ -132,10 +132,3 @@ def test_vsistdin_4():
 
 
 
-if __name__ == '__main__':
-
-    gdaltest.setup_run('vsistdin')
-
-    gdaltest.run_tests(gdaltest_list)
-
-    sys.exit(gdaltest.summarize())
diff --git a/autotest/gcore/vsiswift.py b/autotest/gcore/vsiswift.py
index 3fd4d8ff4eb6..57e648e83cf1 100644
--- a/autotest/gcore/vsiswift.py
+++ b/autotest/gcore/vsiswift.py
@@ -703,14 +703,3 @@ def test_vsiswift_cleanup():
 # gdaltest_list = [ vsiswift_init, vsiswift_start_webserver, vsiswift_fake_mkdir_rmdir, vsiswift_stop_webserver, vsiswift_cleanup ]
 
 gdaltest_list_extra = [vsiswift_extra_1]
-
-if __name__ == '__main__':
-
-    gdaltest.setup_run('vsiswift')
-
-    if gdal.GetConfigOption('RUN_MANUAL_ONLY', None):
-        gdaltest.run_tests(gdaltest_list_extra)
-    else:
-        gdaltest.run_tests(gdaltest_list + gdaltest_list_extra + [test_vsiswift_cleanup])
-
-    sys.exit(gdaltest.summarize())
diff --git a/autotest/gcore/vsiwebhdfs.py b/autotest/gcore/vsiwebhdfs.py
index 82142c677cf4..487eb40e034f 100644
--- a/autotest/gcore/vsiwebhdfs.py
+++ b/autotest/gcore/vsiwebhdfs.py
@@ -565,15 +565,3 @@ def test_vsiwebhdfs_cleanup():
 
 
 gdaltest_list_extra = [vsiwebhdfs_extra_1]
-
-if __name__ == '__main__':
-
-    gdaltest.setup_run('vsiwebhdfs')
-
-    if gdal.GetConfigOption('RUN_MANUAL_ONLY', None):
-        gdaltest.run_tests(gdaltest_list_extra)
-    else:
-        gdaltest.run_tests(
-            gdaltest_list + gdaltest_list_extra + [test_vsiwebhdfs_cleanup])
-
-    sys.exit(gdaltest.summarize())
diff --git a/autotest/gcore/vsizip.py b/autotest/gcore/vsizip.py
index 0b6c15870167..a67af096b5b1 100755
--- a/autotest/gcore/vsizip.py
+++ b/autotest/gcore/vsizip.py
@@ -644,10 +644,3 @@ def test_vsizip_byte_zip64_local_header_zeroed():
 
 
 
-if __name__ == '__main__':
-
-    gdaltest.setup_run('vsizip')
-
-    gdaltest.run_tests(gdaltest_list)
-
-    sys.exit(gdaltest.summarize())
diff --git a/autotest/gdrivers/aaigrid.py b/autotest/gdrivers/aaigrid.py
index 173a0869f735..71c62253bdcc 100755
--- a/autotest/gdrivers/aaigrid.py
+++ b/autotest/gdrivers/aaigrid.py
@@ -356,10 +356,3 @@ def test_aaigrid_15():
 
 
 
-if __name__ == '__main__':
-
-    gdaltest.setup_run('aaigrid')
-
-    gdaltest.run_tests(gdaltest_list)
-
-    sys.exit(gdaltest.summarize())
diff --git a/autotest/gdrivers/ace2.py b/autotest/gdrivers/ace2.py
index 60bbf40d6698..d75b6e56d8a4 100755
--- a/autotest/gdrivers/ace2.py
+++ b/autotest/gdrivers/ace2.py
@@ -66,10 +66,3 @@ def test_ace2_1():
 
 
 
-if __name__ == '__main__':
-
-    gdaltest.setup_run('ace2')
-
-    gdaltest.run_tests(gdaltest_list)
-
-    sys.exit(gdaltest.summarize())
diff --git a/autotest/gdrivers/adrg.py b/autotest/gdrivers/adrg.py
index 584dba21321c..ecf76bdbc9e7 100755
--- a/autotest/gdrivers/adrg.py
+++ b/autotest/gdrivers/adrg.py
@@ -180,10 +180,3 @@ def test_adrg_zna_18():
 
 ###############################################################################
 
-if __name__ == '__main__':
-
-    gdaltest.setup_run('adrg')
-
-    gdaltest.run_tests(gdaltest_list)
-
-    sys.exit(gdaltest.summarize())
diff --git a/autotest/gdrivers/aigrid.py b/autotest/gdrivers/aigrid.py
index 5e87386bd489..d9cd8fe731e6 100755
--- a/autotest/gdrivers/aigrid.py
+++ b/autotest/gdrivers/aigrid.py
@@ -214,10 +214,3 @@ def test_aigrid_online_2():
 
 
 
-if __name__ == '__main__':
-
-    gdaltest.setup_run('aigrid')
-
-    gdaltest.run_tests(gdaltest_list)
-
-    sys.exit(gdaltest.summarize())
diff --git a/autotest/gdrivers/arg.py b/autotest/gdrivers/arg.py
index 2c0d34df0630..dbe8cb7fedd0 100755
--- a/autotest/gdrivers/arg.py
+++ b/autotest/gdrivers/arg.py
@@ -320,10 +320,3 @@ def test_arg_destroy():
     
 
 
-if __name__ == '__main__':
-
-    gdaltest.setup_run('ARG')
-
-    gdaltest.run_tests(gdaltest_list)
-
-    sys.exit(gdaltest.summarize())
diff --git a/autotest/gdrivers/bag.py b/autotest/gdrivers/bag.py
index 85ad5c22e4cd..3b8dbac5814a 100755
--- a/autotest/gdrivers/bag.py
+++ b/autotest/gdrivers/bag.py
@@ -669,10 +669,3 @@ def test_bag_write_south_up():
 
 
 
-if __name__ == '__main__':
-
-    gdaltest.setup_run('hdf5')
-
-    gdaltest.run_tests(gdaltest_list)
-
-    sys.exit(gdaltest.summarize())
diff --git a/autotest/gdrivers/blx.py b/autotest/gdrivers/blx.py
index eb439504f3f1..8d47f8100e29 100755
--- a/autotest/gdrivers/blx.py
+++ b/autotest/gdrivers/blx.py
@@ -100,10 +100,3 @@ def test_blx_5():
 
 
 
-if __name__ == '__main__':
-
-    gdaltest.setup_run('blx')
-
-    gdaltest.run_tests(gdaltest_list)
-
-    sys.exit(gdaltest.summarize())
diff --git a/autotest/gdrivers/bsb.py b/autotest/gdrivers/bsb.py
index b0c5431df9f1..2c77d869992c 100755
--- a/autotest/gdrivers/bsb.py
+++ b/autotest/gdrivers/bsb.py
@@ -137,10 +137,3 @@ def test_bsb_6():
 
 
 
-if __name__ == '__main__':
-
-    gdaltest.setup_run('BSB')
-
-    gdaltest.run_tests(gdaltest_list)
-
-    sys.exit(gdaltest.summarize())
diff --git a/autotest/gdrivers/bt.py b/autotest/gdrivers/bt.py
index 2e6815440e4d..69fcca9e974a 100755
--- a/autotest/gdrivers/bt.py
+++ b/autotest/gdrivers/bt.py
@@ -110,10 +110,3 @@ def test_bt_cleanup():
 
 
 
-if __name__ == '__main__':
-
-    gdaltest.setup_run('bt')
-
-    gdaltest.run_tests(gdaltest_list)
-
-    sys.exit(gdaltest.summarize())
diff --git a/autotest/gdrivers/byn.py b/autotest/gdrivers/byn.py
index 1c01c728e596..c0ff5743d8ad 100755
--- a/autotest/gdrivers/byn.py
+++ b/autotest/gdrivers/byn.py
@@ -56,10 +56,3 @@ def test_byn_2():
 #
 
 
-if __name__ == '__main__':
-
-    gdaltest.setup_run('byn')
-
-    gdaltest.run_tests(gdaltest_list)
-
-    sys.exit(gdaltest.summarize())
diff --git a/autotest/gdrivers/cals.py b/autotest/gdrivers/cals.py
index 21f4d8aa59ec..ebbec9e785a0 100755
--- a/autotest/gdrivers/cals.py
+++ b/autotest/gdrivers/cals.py
@@ -142,10 +142,3 @@ def test_cals_5():
 
 
 
-if __name__ == '__main__':
-
-    gdaltest.setup_run('cals')
-
-    gdaltest.run_tests(gdaltest_list)
-
-    sys.exit(gdaltest.summarize())
diff --git a/autotest/gdrivers/ceos.py b/autotest/gdrivers/ceos.py
index b7c61392d101..b3f5f753c56b 100755
--- a/autotest/gdrivers/ceos.py
+++ b/autotest/gdrivers/ceos.py
@@ -46,10 +46,3 @@ def test_ceos_1():
 
 
 
-if __name__ == '__main__':
-
-    gdaltest.setup_run('ceos')
-
-    gdaltest.run_tests(gdaltest_list)
-
-    sys.exit(gdaltest.summarize())
diff --git a/autotest/gdrivers/cpg.py b/autotest/gdrivers/cpg.py
index af2d0110e937..cb7813610972 100755
--- a/autotest/gdrivers/cpg.py
+++ b/autotest/gdrivers/cpg.py
@@ -44,10 +44,3 @@ def test_cpg_1():
 
 
 
-if __name__ == '__main__':
-
-    gdaltest.setup_run('cpg')
-
-    gdaltest.run_tests(gdaltest_list)
-
-    sys.exit(gdaltest.summarize())
diff --git a/autotest/gdrivers/ctg.py b/autotest/gdrivers/ctg.py
index 8fb24973bb55..948e0138bed9 100755
--- a/autotest/gdrivers/ctg.py
+++ b/autotest/gdrivers/ctg.py
@@ -79,10 +79,3 @@ def test_ctg_1():
 
 
 
-if __name__ == '__main__':
-
-    gdaltest.setup_run('ctg')
-
-    gdaltest.run_tests(gdaltest_list)
-
-    sys.exit(gdaltest.summarize())
diff --git a/autotest/gdrivers/db2.py b/autotest/gdrivers/db2.py
index 00e6f7e89aa8..832a4b9ee4af 100755
--- a/autotest/gdrivers/db2.py
+++ b/autotest/gdrivers/db2.py
@@ -200,10 +200,3 @@ def test_gpkg_1():
 
 
 # gdaltest_list = [ gpkg_init, gpkg_26, gpkg_cleanup ]
-if __name__ == '__main__':
-
-    gdaltest.setup_run('gpkg')
-
-    gdaltest.run_tests(gdaltest_list)
-
-    sys.exit(gdaltest.summarize())
diff --git a/autotest/gdrivers/derived.py b/autotest/gdrivers/derived.py
index d7e12ee3bf46..6726b24f1183 100755
--- a/autotest/gdrivers/derived.py
+++ b/autotest/gdrivers/derived.py
@@ -160,10 +160,3 @@ def test_derived_test3():
     
 
 
-if __name__ == '__main__':
-
-    gdaltest.setup_run('derived')
-
-    gdaltest.run_tests(gdaltest_list)
-
-    sys.exit(gdaltest.summarize())
diff --git a/autotest/gdrivers/dimap.py b/autotest/gdrivers/dimap.py
index 82bfd5f5053d..ee0016ac3cca 100755
--- a/autotest/gdrivers/dimap.py
+++ b/autotest/gdrivers/dimap.py
@@ -100,10 +100,3 @@ def test_dimap_2():
     
 
 
-if __name__ == '__main__':
-
-    gdaltest.setup_run('dimap')
-
-    gdaltest.run_tests(gdaltest_list)
-
-    sys.exit(gdaltest.summarize())
diff --git a/autotest/gdrivers/dipex.py b/autotest/gdrivers/dipex.py
index 8a7de2492396..914fe474e766 100755
--- a/autotest/gdrivers/dipex.py
+++ b/autotest/gdrivers/dipex.py
@@ -44,10 +44,3 @@ def test_dipex_1():
 
 
 
-if __name__ == '__main__':
-
-    gdaltest.setup_run('dipex')
-
-    gdaltest.run_tests(gdaltest_list)
-
-    sys.exit(gdaltest.summarize())
diff --git a/autotest/gdrivers/dods.py b/autotest/gdrivers/dods.py
index 556621bc2319..d7b61dc1ee27 100755
--- a/autotest/gdrivers/dods.py
+++ b/autotest/gdrivers/dods.py
@@ -133,12 +133,3 @@ def dods_cleanup():
     dods_5,
     dods_6,
     dods_cleanup]
-
-
-if __name__ == '__main__':
-
-    gdaltest.setup_run('dods')
-
-    gdaltest.run_tests(manual_gdaltest_list)
-
-    sys.exit(gdaltest.summarize())
diff --git a/autotest/gdrivers/doq1.py b/autotest/gdrivers/doq1.py
index e23159a84132..0907f4f83263 100755
--- a/autotest/gdrivers/doq1.py
+++ b/autotest/gdrivers/doq1.py
@@ -48,10 +48,3 @@ def test_doq1_1():
 
 
 
-if __name__ == '__main__':
-
-    gdaltest.setup_run('doq')
-
-    gdaltest.run_tests(gdaltest_list)
-
-    sys.exit(gdaltest.summarize())
diff --git a/autotest/gdrivers/doq2.py b/autotest/gdrivers/doq2.py
index 4c61a9276a5e..51f59eaa77f1 100755
--- a/autotest/gdrivers/doq2.py
+++ b/autotest/gdrivers/doq2.py
@@ -65,10 +65,3 @@ def test_doq2_1():
 
 
 
-if __name__ == '__main__':
-
-    gdaltest.setup_run('doq2')
-
-    gdaltest.run_tests(gdaltest_list)
-
-    sys.exit(gdaltest.summarize())
diff --git a/autotest/gdrivers/dted.py b/autotest/gdrivers/dted.py
index e3082ab76562..2c6c2399cee1 100755
--- a/autotest/gdrivers/dted.py
+++ b/autotest/gdrivers/dted.py
@@ -308,10 +308,3 @@ def test_dted_cleanup():
 
 
 
-if __name__ == '__main__':
-
-    gdaltest.setup_run('dted')
-
-    gdaltest.run_tests(gdaltest_list)
-
-    sys.exit(gdaltest.summarize())
diff --git a/autotest/gdrivers/e00grid.py b/autotest/gdrivers/e00grid.py
index a8484b52e196..613d8e53547a 100755
--- a/autotest/gdrivers/e00grid.py
+++ b/autotest/gdrivers/e00grid.py
@@ -122,10 +122,3 @@ def test_e00grid_2():
 
 
 
-if __name__ == '__main__':
-
-    gdaltest.setup_run('e00grid')
-
-    gdaltest.run_tests(gdaltest_list)
-
-    sys.exit(gdaltest.summarize())
diff --git a/autotest/gdrivers/ecrgtoc.py b/autotest/gdrivers/ecrgtoc.py
index e1f1e77abb9a..74923947f668 100755
--- a/autotest/gdrivers/ecrgtoc.py
+++ b/autotest/gdrivers/ecrgtoc.py
@@ -300,10 +300,3 @@ def test_ecrgtoc_online_1():
 
 
 
-if __name__ == '__main__':
-
-    gdaltest.setup_run('ecrgtoc')
-
-    gdaltest.run_tests(gdaltest_list)
-
-    sys.exit(gdaltest.summarize())
diff --git a/autotest/gdrivers/ecw.py b/autotest/gdrivers/ecw.py
index b9b5c267846d..4eda951d5d3d 100755
--- a/autotest/gdrivers/ecw.py
+++ b/autotest/gdrivers/ecw.py
@@ -2064,10 +2064,3 @@ def test_ecw_cleanup():
 
 
 
-if __name__ == '__main__':
-
-    gdaltest.setup_run('ecw')
-
-    gdaltest.run_tests(gdaltest_list)
-
-    sys.exit(gdaltest.summarize())
diff --git a/autotest/gdrivers/eedai.py b/autotest/gdrivers/eedai.py
index d15db0fc5e84..67fa4311b04a 100644
--- a/autotest/gdrivers/eedai.py
+++ b/autotest/gdrivers/eedai.py
@@ -753,10 +753,3 @@ def test_eedai_cleanup():
 
 
 
-if __name__ == '__main__':
-
-    gdaltest.setup_run('eedai')
-
-    gdaltest.run_tests(gdaltest_list)
-
-    sys.exit(gdaltest.summarize())
diff --git a/autotest/gdrivers/ehdr.py b/autotest/gdrivers/ehdr.py
index f4c43bf7b977..9ada3952a8ed 100755
--- a/autotest/gdrivers/ehdr.py
+++ b/autotest/gdrivers/ehdr.py
@@ -381,10 +381,3 @@ def test_ehdr_approx_stats_flag():
 
 
 
-if __name__ == '__main__':
-
-    gdaltest.setup_run('ehdr')
-
-    gdaltest.run_tests(gdaltest_list)
-
-    sys.exit(gdaltest.summarize())
diff --git a/autotest/gdrivers/eir.py b/autotest/gdrivers/eir.py
index 46e61cd243d3..89268b66ddf3 100755
--- a/autotest/gdrivers/eir.py
+++ b/autotest/gdrivers/eir.py
@@ -44,10 +44,3 @@ def test_eir_1():
 
 
 
-if __name__ == '__main__':
-
-    gdaltest.setup_run('eir')
-
-    gdaltest.run_tests(gdaltest_list)
-
-    sys.exit(gdaltest.summarize())
diff --git a/autotest/gdrivers/elas.py b/autotest/gdrivers/elas.py
index 7ba61fc20596..ea755e59a3f5 100755
--- a/autotest/gdrivers/elas.py
+++ b/autotest/gdrivers/elas.py
@@ -53,10 +53,3 @@ def test_elas_2():
 
 
 
-if __name__ == '__main__':
-
-    gdaltest.setup_run('elas')
-
-    gdaltest.run_tests(gdaltest_list)
-
-    sys.exit(gdaltest.summarize())
diff --git a/autotest/gdrivers/envi.py b/autotest/gdrivers/envi.py
index a3aa428d0064..3cca270508a2 100755
--- a/autotest/gdrivers/envi.py
+++ b/autotest/gdrivers/envi.py
@@ -350,10 +350,3 @@ def test_envi_truncated():
 
 
 
-if __name__ == '__main__':
-
-    gdaltest.setup_run('envi')
-
-    gdaltest.run_tests(gdaltest_list)
-
-    sys.exit(gdaltest.summarize())
diff --git a/autotest/gdrivers/ers.py b/autotest/gdrivers/ers.py
index e26fef3daaf6..547af90e945d 100755
--- a/autotest/gdrivers/ers.py
+++ b/autotest/gdrivers/ers.py
@@ -304,10 +304,3 @@ def test_ers_cleanup():
 
 
 
-if __name__ == '__main__':
-
-    gdaltest.setup_run('ers')
-
-    gdaltest.run_tests(gdaltest_list)
-
-    sys.exit(gdaltest.summarize())
diff --git a/autotest/gdrivers/fast.py b/autotest/gdrivers/fast.py
index 34ff93e56778..bc5fed59657a 100755
--- a/autotest/gdrivers/fast.py
+++ b/autotest/gdrivers/fast.py
@@ -268,10 +268,3 @@ def test_fast_9():
 
 
 
-if __name__ == '__main__':
-
-    gdaltest.setup_run('fast')
-
-    gdaltest.run_tests(gdaltest_list)
-
-    sys.exit(gdaltest.summarize())
diff --git a/autotest/gdrivers/fujibas.py b/autotest/gdrivers/fujibas.py
index 470b0c1c9c14..e6ff03e206e9 100755
--- a/autotest/gdrivers/fujibas.py
+++ b/autotest/gdrivers/fujibas.py
@@ -44,10 +44,3 @@ def test_fujibas_1():
 
 
 
-if __name__ == '__main__':
-
-    gdaltest.setup_run('fujibas')
-
-    gdaltest.run_tests(gdaltest_list)
-
-    sys.exit(gdaltest.summarize())
diff --git a/autotest/gdrivers/gdalhttp.py b/autotest/gdrivers/gdalhttp.py
index 9cdb1bf79fd8..e3b4afbcdec1 100755
--- a/autotest/gdrivers/gdalhttp.py
+++ b/autotest/gdrivers/gdalhttp.py
@@ -280,13 +280,3 @@ def test_http_cleanup():
 
 # gdaltest_list = [ http_test_use_capi_store ]
 
-if __name__ == '__main__':
-
-    gdaltest.setup_run('http')
-
-    if len(sys.argv) == 2 and sys.argv[1] == '-use_capi_store':
-        gdaltest_list = [test_http_test_use_capi_store_sub]
-
-    gdaltest.run_tests(gdaltest_list)
-
-    sys.exit(gdaltest.summarize())
diff --git a/autotest/gdrivers/genbin.py b/autotest/gdrivers/genbin.py
index 22c41db8dbad..1cb91f15e73a 100755
--- a/autotest/gdrivers/genbin.py
+++ b/autotest/gdrivers/genbin.py
@@ -74,10 +74,3 @@ def test_genbin_1():
 
 
 
-if __name__ == '__main__':
-
-    gdaltest.setup_run('genbin')
-
-    gdaltest.run_tests(gdaltest_list)
-
-    sys.exit(gdaltest.summarize())
diff --git a/autotest/gdrivers/georaster.py b/autotest/gdrivers/georaster.py
index 06062c7bc1bf..93ffc4564f4c 100755
--- a/autotest/gdrivers/georaster.py
+++ b/autotest/gdrivers/georaster.py
@@ -474,15 +474,3 @@ def test_georaster_cleanup():
 
 
 
-if __name__ == '__main__':
-
-    if 'OCI_DSNAME' not in os.environ:
-        print('Enter ORACLE connection (e.g. OCI:scott/tiger@orcl): ')
-        oci_dsname = sys.stdin.readline().strip()
-        os.environ['OCI_DSNAME'] = oci_dsname
-
-    gdaltest.setup_run('GeoRaster')
-
-    gdaltest.run_tests(gdaltest_list)
-
-    sys.exit(gdaltest.summarize())
diff --git a/autotest/gdrivers/gff.py b/autotest/gdrivers/gff.py
index f03f7925ddf5..e8553f2f84fa 100755
--- a/autotest/gdrivers/gff.py
+++ b/autotest/gdrivers/gff.py
@@ -52,10 +52,3 @@ def test_gff_1():
 
 
 
-if __name__ == '__main__':
-
-    gdaltest.setup_run('gff')
-
-    gdaltest.run_tests(gdaltest_list)
-
-    sys.exit(gdaltest.summarize())
diff --git a/autotest/gdrivers/gif.py b/autotest/gdrivers/gif.py
index 9b352610b6aa..c9d3db8ee11d 100755
--- a/autotest/gdrivers/gif.py
+++ b/autotest/gdrivers/gif.py
@@ -221,10 +221,3 @@ def test_gif_cleanup():
 
 
 
-if __name__ == '__main__':
-
-    gdaltest.setup_run('gif')
-
-    gdaltest.run_tests(gdaltest_list)
-
-    sys.exit(gdaltest.summarize())
diff --git a/autotest/gdrivers/gmt.py b/autotest/gdrivers/gmt.py
index 16dde2795e3e..e4bf9ecefb09 100755
--- a/autotest/gdrivers/gmt.py
+++ b/autotest/gdrivers/gmt.py
@@ -70,10 +70,3 @@ def test_gmt_2():
 
 
 
-if __name__ == '__main__':
-
-    gdaltest.setup_run('gmt')
-
-    gdaltest.run_tests(gdaltest_list)
-
-    sys.exit(gdaltest.summarize())
diff --git a/autotest/gdrivers/gpkg.py b/autotest/gdrivers/gpkg.py
index 1d2b2af422dc..54c39ea77615 100755
--- a/autotest/gdrivers/gpkg.py
+++ b/autotest/gdrivers/gpkg.py
@@ -3206,10 +3206,3 @@ def test_gpkg_cleanup():
 
 
 # gdaltest_list = [ gpkg_init, gpkg_47, gpkg_cleanup ]
-if __name__ == '__main__':
-
-    gdaltest.setup_run('gpkg')
-
-    gdaltest.run_tests(gdaltest_list)
-
-    sys.exit(gdaltest.summarize())
diff --git a/autotest/gdrivers/grass.py b/autotest/gdrivers/grass.py
index 14cc291db675..6cf41c2bbca2 100755
--- a/autotest/gdrivers/grass.py
+++ b/autotest/gdrivers/grass.py
@@ -80,10 +80,3 @@ def test_grass_2():
 
 
 
-if __name__ == '__main__':
-
-    gdaltest.setup_run('GRASS')
-
-    gdaltest.run_tests(gdaltest_list)
-
-    sys.exit(gdaltest.summarize())
diff --git a/autotest/gdrivers/grassasciigrid.py b/autotest/gdrivers/grassasciigrid.py
index dffd5f40e01b..a7f7775839a4 100755
--- a/autotest/gdrivers/grassasciigrid.py
+++ b/autotest/gdrivers/grassasciigrid.py
@@ -47,10 +47,3 @@ def test_grassasciigrid_1():
 
 
 
-if __name__ == '__main__':
-
-    gdaltest.setup_run('grassasciigrid')
-
-    gdaltest.run_tests(gdaltest_list)
-
-    sys.exit(gdaltest.summarize())
diff --git a/autotest/gdrivers/grib.py b/autotest/gdrivers/grib.py
index 7f44faa82f84..db9b39c6518f 100755
--- a/autotest/gdrivers/grib.py
+++ b/autotest/gdrivers/grib.py
@@ -1350,10 +1350,3 @@ def test_grib_online_grib2_jpeg2000_single_line():
     
 
 
-if __name__ == '__main__':
-
-    gdaltest.setup_run('grib')
-
-    gdaltest.run_tests(gdaltest_list)
-
-    sys.exit(gdaltest.summarize())
diff --git a/autotest/gdrivers/gsc.py b/autotest/gdrivers/gsc.py
index ac6613952c80..11fc5460c0b3 100755
--- a/autotest/gdrivers/gsc.py
+++ b/autotest/gdrivers/gsc.py
@@ -44,10 +44,3 @@ def test_gsc_1():
 
 
 
-if __name__ == '__main__':
-
-    gdaltest.setup_run('gsc')
-
-    gdaltest.run_tests(gdaltest_list)
-
-    sys.exit(gdaltest.summarize())
diff --git a/autotest/gdrivers/gsg.py b/autotest/gdrivers/gsg.py
index 79adf4692fdc..3b3482498df5 100755
--- a/autotest/gdrivers/gsg.py
+++ b/autotest/gdrivers/gsg.py
@@ -97,10 +97,3 @@ def test_gsg_8():
 
 
 
-if __name__ == '__main__':
-
-    gdaltest.setup_run('gsg')
-
-    gdaltest.run_tests(gdaltest_list)
-
-    sys.exit(gdaltest.summarize())
diff --git a/autotest/gdrivers/gta.py b/autotest/gdrivers/gta.py
index 7c09212af463..8d05cc5386c3 100755
--- a/autotest/gdrivers/gta.py
+++ b/autotest/gdrivers/gta.py
@@ -227,10 +227,3 @@ def test_gta_create(filename, checksum):
 
 
 
-if __name__ == '__main__':
-
-    gdaltest.setup_run('gta')
-
-    gdaltest.run_tests(gdaltest_list)
-
-    sys.exit(gdaltest.summarize())
diff --git a/autotest/gdrivers/gtx.py b/autotest/gdrivers/gtx.py
index 16eb7b5d006f..d4607ef908f5 100755
--- a/autotest/gdrivers/gtx.py
+++ b/autotest/gdrivers/gtx.py
@@ -45,10 +45,3 @@ def test_gtx_1():
 
 
 
-if __name__ == '__main__':
-
-    gdaltest.setup_run('gtx')
-
-    gdaltest.run_tests(gdaltest_list)
-
-    sys.exit(gdaltest.summarize())
diff --git a/autotest/gdrivers/gxf.py b/autotest/gdrivers/gxf.py
index 0b3a9cf2c78b..df87482388ac 100755
--- a/autotest/gdrivers/gxf.py
+++ b/autotest/gdrivers/gxf.py
@@ -98,10 +98,3 @@ def test_gxf(downloadURL, fileName, checksum, download_size):
 
 
 
-if __name__ == '__main__':
-
-    gdaltest.setup_run('gxf')
-
-    gdaltest.run_tests(gdaltest_list)
-
-    sys.exit(gdaltest.summarize())
diff --git a/autotest/gdrivers/hdf5.py b/autotest/gdrivers/hdf5.py
index 452d4f6b1784..693e8e45c3ed 100755
--- a/autotest/gdrivers/hdf5.py
+++ b/autotest/gdrivers/hdf5.py
@@ -442,10 +442,3 @@ def test_hdf5(downloadURL, fileName, subdatasetname, checksum, download_size):
 
 
 
-if __name__ == '__main__':
-
-    gdaltest.setup_run('hdf5')
-
-    gdaltest.run_tests(gdaltest_list)
-
-    sys.exit(gdaltest.summarize())
diff --git a/autotest/gdrivers/hf2.py b/autotest/gdrivers/hf2.py
index f39a4eb923d9..0640950fd1a4 100755
--- a/autotest/gdrivers/hf2.py
+++ b/autotest/gdrivers/hf2.py
@@ -84,10 +84,3 @@ def test_hf2_cleanup():
     pass
 
 
-if __name__ == '__main__':
-
-    gdaltest.setup_run('hf2')
-
-    gdaltest.run_tests(gdaltest_list)
-
-    sys.exit(gdaltest.summarize())
diff --git a/autotest/gdrivers/hfa.py b/autotest/gdrivers/hfa.py
index 277b88b168b6..f80a116a1626 100755
--- a/autotest/gdrivers/hfa.py
+++ b/autotest/gdrivers/hfa.py
@@ -1181,10 +1181,3 @@ def test_hfa_read_elevation_units():
 
 
 
-if __name__ == '__main__':
-
-    gdaltest.setup_run('hfa')
-
-    gdaltest.run_tests(gdaltest_list)
-
-    sys.exit(gdaltest.summarize())
diff --git a/autotest/gdrivers/ida.py b/autotest/gdrivers/ida.py
index eab677709125..268dc1b56064 100755
--- a/autotest/gdrivers/ida.py
+++ b/autotest/gdrivers/ida.py
@@ -174,10 +174,3 @@ def test_ida_7():
 
 
 
-if __name__ == '__main__':
-
-    gdaltest.setup_run('ida')
-
-    gdaltest.run_tests(gdaltest_list)
-
-    sys.exit(gdaltest.summarize())
diff --git a/autotest/gdrivers/idrisi.py b/autotest/gdrivers/idrisi.py
index 8376a2ad0311..1152a343c5db 100755
--- a/autotest/gdrivers/idrisi.py
+++ b/autotest/gdrivers/idrisi.py
@@ -91,10 +91,3 @@ def test_idrisi_cleanup():
     
 
 
-if __name__ == '__main__':
-
-    gdaltest.setup_run('idrisi')
-
-    gdaltest.run_tests(gdaltest_list)
-
-    sys.exit(gdaltest.summarize())
diff --git a/autotest/gdrivers/ignfheightasciigrid.py b/autotest/gdrivers/ignfheightasciigrid.py
index d0cc2355abfe..ec7224c35637 100755
--- a/autotest/gdrivers/ignfheightasciigrid.py
+++ b/autotest/gdrivers/ignfheightasciigrid.py
@@ -193,10 +193,3 @@ def test_ignfheightasciigrid_gra_invalid():
 
 
 
-if __name__ == '__main__':
-
-    gdaltest.setup_run('IGNFHeightASCIIGrid')
-
-    gdaltest.run_tests(gdaltest_list)
-
-    sys.exit(gdaltest.summarize())
diff --git a/autotest/gdrivers/ilwis.py b/autotest/gdrivers/ilwis.py
index 5424d74a8904..495da3826f12 100755
--- a/autotest/gdrivers/ilwis.py
+++ b/autotest/gdrivers/ilwis.py
@@ -122,10 +122,3 @@ def test_ilwis_cleanup():
 
 
 
-if __name__ == '__main__':
-
-    gdaltest.setup_run('ilwis')
-
-    gdaltest.run_tests(gdaltest_list)
-
-    sys.exit(gdaltest.summarize())
diff --git a/autotest/gdrivers/ingr.py b/autotest/gdrivers/ingr.py
index 532faa5308d9..471d6b39c831 100755
--- a/autotest/gdrivers/ingr.py
+++ b/autotest/gdrivers/ingr.py
@@ -248,10 +248,3 @@ def test_ingr_cleanup():
 
 
 
-if __name__ == '__main__':
-
-    gdaltest.setup_run('ingr')
-
-    gdaltest.run_tests(gdaltest_list)
-
-    sys.exit(gdaltest.summarize())
diff --git a/autotest/gdrivers/iris.py b/autotest/gdrivers/iris.py
index 39d382d69537..fb7ba46fe89f 100755
--- a/autotest/gdrivers/iris.py
+++ b/autotest/gdrivers/iris.py
@@ -111,10 +111,3 @@ def test_iris_2():
     
 
 
-if __name__ == '__main__':
-
-    gdaltest.setup_run('iris')
-
-    gdaltest.run_tests(gdaltest_list)
-
-    sys.exit(gdaltest.summarize())
diff --git a/autotest/gdrivers/isce.py b/autotest/gdrivers/isce.py
index 686d17b41453..82e62cde96df 100755
--- a/autotest/gdrivers/isce.py
+++ b/autotest/gdrivers/isce.py
@@ -94,10 +94,3 @@ def test_isce_4():
 
 
 
-if __name__ == '__main__':
-
-    gdaltest.setup_run('isce')
-
-    gdaltest.run_tests(gdaltest_list)
-
-    sys.exit(gdaltest.summarize())
diff --git a/autotest/gdrivers/isis.py b/autotest/gdrivers/isis.py
index 45c57e4b30b2..b051255a732e 100755
--- a/autotest/gdrivers/isis.py
+++ b/autotest/gdrivers/isis.py
@@ -1402,10 +1402,3 @@ def test_isis_31():
 
 
 
-if __name__ == '__main__':
-
-    gdaltest.setup_run('isis')
-
-    gdaltest.run_tests(gdaltest_list)
-
-    sys.exit(gdaltest.summarize())
diff --git a/autotest/gdrivers/isis2.py b/autotest/gdrivers/isis2.py
index 098eda5ff147..6641dd15057b 100755
--- a/autotest/gdrivers/isis2.py
+++ b/autotest/gdrivers/isis2.py
@@ -80,10 +80,3 @@ def test_isis2_3():
 
 
 
-if __name__ == '__main__':
-
-    gdaltest.setup_run('isis2')
-
-    gdaltest.run_tests(gdaltest_list)
-
-    sys.exit(gdaltest.summarize())
diff --git a/autotest/gdrivers/jdem.py b/autotest/gdrivers/jdem.py
index 961901556b38..9abb1eed6819 100755
--- a/autotest/gdrivers/jdem.py
+++ b/autotest/gdrivers/jdem.py
@@ -44,10 +44,3 @@ def test_jdem_1():
 
 
 
-if __name__ == '__main__':
-
-    gdaltest.setup_run('jdem')
-
-    gdaltest.run_tests(gdaltest_list)
-
-    sys.exit(gdaltest.summarize())
diff --git a/autotest/gdrivers/jp2kak.py b/autotest/gdrivers/jp2kak.py
index be52d78bbfdf..27d8ceaa6012 100755
--- a/autotest/gdrivers/jp2kak.py
+++ b/autotest/gdrivers/jp2kak.py
@@ -469,10 +469,3 @@ def test_jp2kak_cleanup():
 
 
 
-if __name__ == '__main__':
-
-    gdaltest.setup_run('jp2kak')
-
-    gdaltest.run_tests(gdaltest_list)
-
-    sys.exit(gdaltest.summarize())
diff --git a/autotest/gdrivers/jp2lura.py b/autotest/gdrivers/jp2lura.py
index 3a5699fefb8b..a4add964d9c5 100755
--- a/autotest/gdrivers/jp2lura.py
+++ b/autotest/gdrivers/jp2lura.py
@@ -2013,11 +2013,3 @@ def test_jp2lura_cleanup():
     test_jp2lura_1,
     test_jp2lura_53,
     test_jp2lura_cleanup]
-
-if __name__ == '__main__':
-
-    gdaltest.setup_run('jp2lura')
-
-    gdaltest.run_tests(gdaltest_list)
-
-    sys.exit(gdaltest.summarize())
diff --git a/autotest/gdrivers/jp2metadata.py b/autotest/gdrivers/jp2metadata.py
index 6a5139f87e5e..4fbc991e98f7 100755
--- a/autotest/gdrivers/jp2metadata.py
+++ b/autotest/gdrivers/jp2metadata.py
@@ -197,10 +197,3 @@ def test_jp2metadata_5():
 
 
 
-if __name__ == '__main__':
-
-    gdaltest.setup_run('jp2metadata')
-
-    gdaltest.run_tests(gdaltest_list)
-
-    sys.exit(gdaltest.summarize())
diff --git a/autotest/gdrivers/jp2openjpeg.py b/autotest/gdrivers/jp2openjpeg.py
index 442643cb6e25..9016d6c4b1e7 100755
--- a/autotest/gdrivers/jp2openjpeg.py
+++ b/autotest/gdrivers/jp2openjpeg.py
@@ -3100,11 +3100,3 @@ def test_jp2openjpeg_cleanup():
     test_jp2openjpeg_1,
     test_jp2openjpeg_45,
     test_jp2openjpeg_cleanup]
-
-if __name__ == '__main__':
-
-    gdaltest.setup_run('jp2openjpeg')
-
-    gdaltest.run_tests(gdaltest_list)
-
-    sys.exit(gdaltest.summarize())
diff --git a/autotest/gdrivers/jpeg.py b/autotest/gdrivers/jpeg.py
index 923726bbb0da..047cdb73750e 100755
--- a/autotest/gdrivers/jpeg.py
+++ b/autotest/gdrivers/jpeg.py
@@ -1057,10 +1057,3 @@ def test_jpeg_cleanup():
 
 # gdaltest_list = [ jpeg_28 ]
 
-if __name__ == '__main__':
-
-    gdaltest.setup_run('jpeg')
-
-    gdaltest.run_tests(gdaltest_list)
-
-    sys.exit(gdaltest.summarize())
diff --git a/autotest/gdrivers/jpeg2000.py b/autotest/gdrivers/jpeg2000.py
index fcee3196be79..77bd33bb2c0f 100755
--- a/autotest/gdrivers/jpeg2000.py
+++ b/autotest/gdrivers/jpeg2000.py
@@ -442,10 +442,3 @@ def test_jpeg2000_cleanup():
 
 
 
-if __name__ == '__main__':
-
-    gdaltest.setup_run('jpeg2000')
-
-    gdaltest.run_tests(gdaltest_list)
-
-    sys.exit(gdaltest.summarize())
diff --git a/autotest/gdrivers/jpeg_profile.py b/autotest/gdrivers/jpeg_profile.py
index ca8b25a5a941..1ecff301cfc7 100755
--- a/autotest/gdrivers/jpeg_profile.py
+++ b/autotest/gdrivers/jpeg_profile.py
@@ -187,10 +187,3 @@ def test_jpeg_copy_icc_64K():
 
 
 
-if __name__ == '__main__':
-
-    gdaltest.setup_run('jpeg_profile')
-
-    gdaltest.run_tests(gdaltest_list)
-
-    sys.exit(gdaltest.summarize())
diff --git a/autotest/gdrivers/jpegls.py b/autotest/gdrivers/jpegls.py
index 5d68a2e1cb5c..2c289654d0de 100755
--- a/autotest/gdrivers/jpegls.py
+++ b/autotest/gdrivers/jpegls.py
@@ -60,10 +60,3 @@ def test_jpegls_2():
 
 
 
-if __name__ == '__main__':
-
-    gdaltest.setup_run('JPEGLS')
-
-    gdaltest.run_tests(gdaltest_list)
-
-    sys.exit(gdaltest.summarize())
diff --git a/autotest/gdrivers/jpipkak.py b/autotest/gdrivers/jpipkak.py
index 9fccb8dd4ff0..bdba2f36aa8f 100755
--- a/autotest/gdrivers/jpipkak.py
+++ b/autotest/gdrivers/jpipkak.py
@@ -153,10 +153,3 @@ def test_jpipkak_5():
 
 
 
-if __name__ == '__main__':
-
-    gdaltest.setup_run('jpipkak')
-
-    gdaltest.run_tests(gdaltest_list)
-
-    sys.exit(gdaltest.summarize())
diff --git a/autotest/gdrivers/kea.py b/autotest/gdrivers/kea.py
index 24fa88cf7912..980185f57980 100755
--- a/autotest/gdrivers/kea.py
+++ b/autotest/gdrivers/kea.py
@@ -609,10 +609,3 @@ def test_kea_14():
 
 
 
-if __name__ == '__main__':
-
-    gdaltest.setup_run('kea')
-
-    gdaltest.run_tests(gdaltest_list)
-
-    sys.exit(gdaltest.summarize())
diff --git a/autotest/gdrivers/kmlsuperoverlay.py b/autotest/gdrivers/kmlsuperoverlay.py
index ee7cf805321a..fedb8f2ce33c 100755
--- a/autotest/gdrivers/kmlsuperoverlay.py
+++ b/autotest/gdrivers/kmlsuperoverlay.py
@@ -399,10 +399,3 @@ def test_kmlsuperoverlay_cleanup():
 
 
 
-if __name__ == '__main__':
-
-    gdaltest.setup_run(' kmlsuperoverlay')
-
-    gdaltest.run_tests(gdaltest_list)
-
-    sys.exit(gdaltest.summarize())
diff --git a/autotest/gdrivers/kro.py b/autotest/gdrivers/kro.py
index 2d4817100cc7..9ff8a20807cf 100755
--- a/autotest/gdrivers/kro.py
+++ b/autotest/gdrivers/kro.py
@@ -99,10 +99,3 @@ def test_kro_5():
 
 
 
-if __name__ == '__main__':
-
-    gdaltest.setup_run('KRO')
-
-    gdaltest.run_tests(gdaltest_list)
-
-    sys.exit(gdaltest.summarize())
diff --git a/autotest/gdrivers/l1b.py b/autotest/gdrivers/l1b.py
index a6fed09a5f72..a1f71804f2c0 100755
--- a/autotest/gdrivers/l1b.py
+++ b/autotest/gdrivers/l1b.py
@@ -247,10 +247,3 @@ def test_l1b_little_endian():
 
 
 
-if __name__ == '__main__':
-
-    gdaltest.setup_run('l1b')
-
-    gdaltest.run_tests(gdaltest_list)
-
-    sys.exit(gdaltest.summarize())
diff --git a/autotest/gdrivers/lan.py b/autotest/gdrivers/lan.py
index c893ff107e5d..d72fb00d1da2 100755
--- a/autotest/gdrivers/lan.py
+++ b/autotest/gdrivers/lan.py
@@ -53,10 +53,3 @@ def test_lan_2():
 
 
 
-if __name__ == '__main__':
-
-    gdaltest.setup_run('lan')
-
-    gdaltest.run_tests(gdaltest_list)
-
-    sys.exit(gdaltest.summarize())
diff --git a/autotest/gdrivers/lcp.py b/autotest/gdrivers/lcp.py
index 15adec427e59..2efc55c2a822 100755
--- a/autotest/gdrivers/lcp.py
+++ b/autotest/gdrivers/lcp.py
@@ -879,10 +879,3 @@ def test_lcp_23():
 
 
 
-if __name__ == '__main__':
-
-    gdaltest.setup_run('lcp')
-
-    gdaltest.run_tests(gdaltest_list)
-
-    sys.exit(gdaltest.summarize())
diff --git a/autotest/gdrivers/leveller.py b/autotest/gdrivers/leveller.py
index a29db4106e40..589709d2f91a 100755
--- a/autotest/gdrivers/leveller.py
+++ b/autotest/gdrivers/leveller.py
@@ -45,10 +45,3 @@ def test_leveller_1():
 
 
 
-if __name__ == '__main__':
-
-    gdaltest.setup_run('leveller')
-
-    gdaltest.run_tests(gdaltest_list)
-
-    sys.exit(gdaltest.summarize())
diff --git a/autotest/gdrivers/loslas.py b/autotest/gdrivers/loslas.py
index 960d7b6c3249..bf9a8f1a7a7f 100755
--- a/autotest/gdrivers/loslas.py
+++ b/autotest/gdrivers/loslas.py
@@ -64,10 +64,3 @@ def test_loslas_online_1():
 
 
 
-if __name__ == '__main__':
-
-    gdaltest.setup_run('LOSLAS')
-
-    gdaltest.run_tests(gdaltest_list)
-
-    sys.exit(gdaltest.summarize())
diff --git a/autotest/gdrivers/mbtiles.py b/autotest/gdrivers/mbtiles.py
index 62654acc546a..82237bd2047e 100755
--- a/autotest/gdrivers/mbtiles.py
+++ b/autotest/gdrivers/mbtiles.py
@@ -603,10 +603,3 @@ def test_mbtiles_cleanup():
 
 # gdaltest_list = [ mbtiles_1, mbtiles_create ]
 
-if __name__ == '__main__':
-
-    gdaltest.setup_run('mbtiles')
-
-    gdaltest.run_tests(gdaltest_list)
-
-    sys.exit(gdaltest.summarize())
diff --git a/autotest/gdrivers/mem.py b/autotest/gdrivers/mem.py
index dbdce678d49c..bd297c3c0656 100755
--- a/autotest/gdrivers/mem.py
+++ b/autotest/gdrivers/mem.py
@@ -611,10 +611,3 @@ def test_mem_cleanup():
 
 
 
-if __name__ == '__main__':
-
-    gdaltest.setup_run('mem')
-
-    gdaltest.run_tests(gdaltest_list)
-
-    sys.exit(gdaltest.summarize())
diff --git a/autotest/gdrivers/mff.py b/autotest/gdrivers/mff.py
index cc3ad602e8bc..f7de138b73b4 100755
--- a/autotest/gdrivers/mff.py
+++ b/autotest/gdrivers/mff.py
@@ -62,10 +62,3 @@ def test_mff_3():
 
 
 
-if __name__ == '__main__':
-
-    gdaltest.setup_run('mff')
-
-    gdaltest.run_tests(gdaltest_list)
-
-    sys.exit(gdaltest.summarize())
diff --git a/autotest/gdrivers/mff2.py b/autotest/gdrivers/mff2.py
index 40dacc996e62..45db784d07e1 100755
--- a/autotest/gdrivers/mff2.py
+++ b/autotest/gdrivers/mff2.py
@@ -44,10 +44,3 @@ def test_mff2_1():
 
 
 
-if __name__ == '__main__':
-
-    gdaltest.setup_run('mff2')
-
-    gdaltest.run_tests(gdaltest_list)
-
-    sys.exit(gdaltest.summarize())
diff --git a/autotest/gdrivers/mg4lidar.py b/autotest/gdrivers/mg4lidar.py
index 1057bc55f5e8..9d470e8c8d66 100755
--- a/autotest/gdrivers/mg4lidar.py
+++ b/autotest/gdrivers/mg4lidar.py
@@ -92,10 +92,3 @@ def test_mg4lidar_1():
 
 
 
-if __name__ == '__main__':
-
-    gdaltest.setup_run('mg4lidar')
-
-    gdaltest.run_tests(gdaltest_list)
-
-    sys.exit(gdaltest.summarize())
diff --git a/autotest/gdrivers/mrf.py b/autotest/gdrivers/mrf.py
index 17e82583e906..0de865c73d9a 100755
--- a/autotest/gdrivers/mrf.py
+++ b/autotest/gdrivers/mrf.py
@@ -622,10 +622,3 @@ def test_mrf_cleanup():
 
 
 
-if __name__ == '__main__':
-
-    gdaltest.setup_run('mrf')
-
-    gdaltest.run_tests(gdaltest_list)
-
-    sys.exit(gdaltest.summarize())
diff --git a/autotest/gdrivers/mrsid.py b/autotest/gdrivers/mrsid.py
index e753541c78fb..b85af17ba175 100755
--- a/autotest/gdrivers/mrsid.py
+++ b/autotest/gdrivers/mrsid.py
@@ -537,10 +537,3 @@ def test_mrsid_cleanup():
 
 
 
-if __name__ == '__main__':
-
-    gdaltest.setup_run('mrsid')
-
-    gdaltest.run_tests(gdaltest_list)
-
-    sys.exit(gdaltest.summarize())
diff --git a/autotest/gdrivers/ndf.py b/autotest/gdrivers/ndf.py
index 39b1420ac892..b64e29596365 100755
--- a/autotest/gdrivers/ndf.py
+++ b/autotest/gdrivers/ndf.py
@@ -71,10 +71,3 @@ def test_ndf_1():
 
 
 
-if __name__ == '__main__':
-
-    gdaltest.setup_run('ndf')
-
-    gdaltest.run_tests(gdaltest_list)
-
-    sys.exit(gdaltest.summarize())
diff --git a/autotest/gdrivers/netcdf.py b/autotest/gdrivers/netcdf.py
index f0c20312f3b4..a6acc4f0fca2 100755
--- a/autotest/gdrivers/netcdf.py
+++ b/autotest/gdrivers/netcdf.py
@@ -2911,10 +2911,3 @@ def test_netcdf_functions_2(filename, checksum, options, testfunction):
 ###############################################################################
 #  other tests
 
-if __name__ == '__main__':
-
-    gdaltest.setup_run('netcdf')
-
-    gdaltest.run_tests(gdaltest_list)
-
-    sys.exit(gdaltest.summarize())
diff --git a/autotest/gdrivers/netcdf_cf.py b/autotest/gdrivers/netcdf_cf.py
index 294fc6f69e45..aeedf0352b7b 100755
--- a/autotest/gdrivers/netcdf_cf.py
+++ b/autotest/gdrivers/netcdf_cf.py
@@ -661,13 +661,3 @@ def test_netcdf_cf_5():
 
 
 
-if __name__ == '__main__':
-
-    gdaltest.setup_run('netcdf_cf')
-
-    gdaltest.run_tests(gdaltest_list)
-
-    # make sure we cleanup
-    gdaltest.clean_tmp()
-
-    sys.exit(gdaltest.summarize())
diff --git a/autotest/gdrivers/netcdf_cfchecks.py b/autotest/gdrivers/netcdf_cfchecks.py
index 35a5e2b99264..01a5a28211ef 100755
--- a/autotest/gdrivers/netcdf_cfchecks.py
+++ b/autotest/gdrivers/netcdf_cfchecks.py
@@ -2615,11 +2615,3 @@ def getargs(arglist):
 # Main Program
 # --------------------------
 
-if __name__ == '__main__':
-
-    (badc, coards, uploader, useFileName, standardName, areaTypes, udunitsDat, version, files) = getargs(sys.argv)
-
-    inst = CFChecker(uploader=uploader, useFileName=useFileName, badc=badc, coards=coards, cfStandardNamesXML=standardName, cfAreaTypesXML=areaTypes, udunitsDat=udunitsDat, version=version)
-    for f in files:
-        rc = inst.checker(f)
-        sys.exit(rc)
diff --git a/autotest/gdrivers/ngsgeoid.py b/autotest/gdrivers/ngsgeoid.py
index 157ce4e2b98f..977f15fac151 100755
--- a/autotest/gdrivers/ngsgeoid.py
+++ b/autotest/gdrivers/ngsgeoid.py
@@ -53,10 +53,3 @@ def test_ngsgeoid_2():
 
 
 
-if __name__ == '__main__':
-
-    gdaltest.setup_run('ngsgeoid')
-
-    gdaltest.run_tests(gdaltest_list)
-
-    sys.exit(gdaltest.summarize())
diff --git a/autotest/gdrivers/nitf.py b/autotest/gdrivers/nitf.py
index 78b2c1be3abe..6f53851138db 100755
--- a/autotest/gdrivers/nitf.py
+++ b/autotest/gdrivers/nitf.py
@@ -3440,10 +3440,3 @@ def test_nitf_cleanup():
 
 # gdaltest_list = [ nitf_72 ]
 
-if __name__ == '__main__':
-
-    gdaltest.setup_run('nitf')
-
-    gdaltest.run_tests(gdaltest_list)
-
-    sys.exit(gdaltest.summarize())
diff --git a/autotest/gdrivers/ntv1.py b/autotest/gdrivers/ntv1.py
index a83d72b336a2..778742de9a6e 100755
--- a/autotest/gdrivers/ntv1.py
+++ b/autotest/gdrivers/ntv1.py
@@ -47,10 +47,3 @@ def test_ntv1_1():
 
 
 
-if __name__ == '__main__':
-
-    gdaltest.setup_run('NTV1')
-
-    gdaltest.run_tests(gdaltest_list)
-
-    sys.exit(gdaltest.summarize())
diff --git a/autotest/gdrivers/ntv2.py b/autotest/gdrivers/ntv2.py
index 0e9d6863c34a..ad19148412a0 100755
--- a/autotest/gdrivers/ntv2.py
+++ b/autotest/gdrivers/ntv2.py
@@ -166,10 +166,3 @@ def test_ntv2_online_3():
 
 
 
-if __name__ == '__main__':
-
-    gdaltest.setup_run('NTV2')
-
-    gdaltest.run_tests(gdaltest_list)
-
-    sys.exit(gdaltest.summarize())
diff --git a/autotest/gdrivers/nwt_grc.py b/autotest/gdrivers/nwt_grc.py
index 1b7d27cf34b6..42c2e00e8dce 100755
--- a/autotest/gdrivers/nwt_grc.py
+++ b/autotest/gdrivers/nwt_grc.py
@@ -44,10 +44,3 @@ def test_nwt_grc_1():
 
 
 
-if __name__ == '__main__':
-
-    gdaltest.setup_run('nwt_grc')
-
-    gdaltest.run_tests(gdaltest_list)
-
-    sys.exit(gdaltest.summarize())
diff --git a/autotest/gdrivers/nwt_grd.py b/autotest/gdrivers/nwt_grd.py
index cad17009cc8a..a1e8f19608d3 100755
--- a/autotest/gdrivers/nwt_grd.py
+++ b/autotest/gdrivers/nwt_grd.py
@@ -68,10 +68,3 @@ def test_nwt_grd_2():
 
 
 
-if __name__ == '__main__':
-
-    gdaltest.setup_run('nwt_grd')
-
-    gdaltest.run_tests(gdaltest_list)
-
-    sys.exit(gdaltest.summarize())
diff --git a/autotest/gdrivers/ozi.py b/autotest/gdrivers/ozi.py
index 96ab724d2baf..2c844406c0fb 100755
--- a/autotest/gdrivers/ozi.py
+++ b/autotest/gdrivers/ozi.py
@@ -87,10 +87,3 @@ def test_ozi_online_1():
 
 
 
-if __name__ == '__main__':
-
-    gdaltest.setup_run('OZI')
-
-    gdaltest.run_tests(gdaltest_list)
-
-    sys.exit(gdaltest.summarize())
diff --git a/autotest/gdrivers/paux.py b/autotest/gdrivers/paux.py
index e2736cff16b0..18ce4e8e3f79 100755
--- a/autotest/gdrivers/paux.py
+++ b/autotest/gdrivers/paux.py
@@ -73,10 +73,3 @@ def test_paux_cleanup():
 
 
 
-if __name__ == '__main__':
-
-    gdaltest.setup_run('paux')
-
-    gdaltest.run_tests(gdaltest_list)
-
-    sys.exit(gdaltest.summarize())
diff --git a/autotest/gdrivers/pcidsk.py b/autotest/gdrivers/pcidsk.py
index c8eb8f0f8a41..27e76f950716 100755
--- a/autotest/gdrivers/pcidsk.py
+++ b/autotest/gdrivers/pcidsk.py
@@ -496,10 +496,3 @@ def test_pcidsk_cleanup():
 
 
 
-if __name__ == '__main__':
-
-    gdaltest.setup_run('pcidsk')
-
-    gdaltest.run_tests(gdaltest_list)
-
-    sys.exit(gdaltest.summarize())
diff --git a/autotest/gdrivers/pcraster.py b/autotest/gdrivers/pcraster.py
index fa99404dfef8..9978e4dcaa8e 100755
--- a/autotest/gdrivers/pcraster.py
+++ b/autotest/gdrivers/pcraster.py
@@ -71,10 +71,3 @@ def test_pcraster_2():
 
 
 
-if __name__ == '__main__':
-
-    gdaltest.setup_run('pcraster')
-
-    gdaltest.run_tests(gdaltest_list)
-
-    sys.exit(gdaltest.summarize())
diff --git a/autotest/gdrivers/pdf.py b/autotest/gdrivers/pdf.py
index 8a56549973ed..fa105369b252 100755
--- a/autotest/gdrivers/pdf.py
+++ b/autotest/gdrivers/pdf.py
@@ -1924,10 +1924,3 @@ def test_pdf_run_all():
 
 # gdaltest_list = [ pdf_init, pdf_metadata ]
 
-if __name__ == '__main__':
-
-    gdaltest.setup_run('PDF')
-
-    gdaltest.run_tests(gdaltest_list)
-
-    sys.exit(gdaltest.summarize())
diff --git a/autotest/gdrivers/pds.py b/autotest/gdrivers/pds.py
index e7642e9307f4..c235936f3847 100755
--- a/autotest/gdrivers/pds.py
+++ b/autotest/gdrivers/pds.py
@@ -319,10 +319,3 @@ def test_pds_band_storage_type_line_interleaved():
 
 
 
-if __name__ == '__main__':
-
-    gdaltest.setup_run('pds')
-
-    gdaltest.run_tests(gdaltest_list)
-
-    sys.exit(gdaltest.summarize())
diff --git a/autotest/gdrivers/pds4.py b/autotest/gdrivers/pds4.py
index 764cb45283f9..2fa6af3d1296 100755
--- a/autotest/gdrivers/pds4.py
+++ b/autotest/gdrivers/pds4.py
@@ -1079,10 +1079,3 @@ def test_pds4_18():
 
 
 
-if __name__ == '__main__':
-
-    gdaltest.setup_run('pds4')
-
-    gdaltest.run_tests(gdaltest_list)
-
-    sys.exit(gdaltest.summarize())
diff --git a/autotest/gdrivers/plmosaic.py b/autotest/gdrivers/plmosaic.py
index 32dfa28240c8..6350196a2353 100755
--- a/autotest/gdrivers/plmosaic.py
+++ b/autotest/gdrivers/plmosaic.py
@@ -903,10 +903,3 @@ def test_plmosaic_cleanup():
     
 
 
-if __name__ == '__main__':
-
-    gdaltest.setup_run('plmosaic')
-
-    gdaltest.run_tests(gdaltest_list)
-
-    sys.exit(gdaltest.summarize())
diff --git a/autotest/gdrivers/png.py b/autotest/gdrivers/png.py
index f1ba98e04249..33dc5d205761 100755
--- a/autotest/gdrivers/png.py
+++ b/autotest/gdrivers/png.py
@@ -302,10 +302,3 @@ def test_png_14():
 
 
 
-if __name__ == '__main__':
-
-    gdaltest.setup_run('png')
-
-    gdaltest.run_tests(gdaltest_list)
-
-    sys.exit(gdaltest.summarize())
diff --git a/autotest/gdrivers/png_profile.py b/autotest/gdrivers/png_profile.py
index 7e25ce6848a7..4fcad2eb723d 100755
--- a/autotest/gdrivers/png_profile.py
+++ b/autotest/gdrivers/png_profile.py
@@ -311,10 +311,3 @@ def test_png_sRGB():
 
 
 
-if __name__ == '__main__':
-
-    gdaltest.setup_run('png_profile')
-
-    gdaltest.run_tests(gdaltest_list)
-
-    sys.exit(gdaltest.summarize())
diff --git a/autotest/gdrivers/pnm.py b/autotest/gdrivers/pnm.py
index f4658d84067b..65686dfe36c4 100755
--- a/autotest/gdrivers/pnm.py
+++ b/autotest/gdrivers/pnm.py
@@ -76,10 +76,3 @@ def test_pnm_4():
 
 
 
-if __name__ == '__main__':
-
-    gdaltest.setup_run('ppm')
-
-    gdaltest.run_tests(gdaltest_list)
-
-    sys.exit(gdaltest.summarize())
diff --git a/autotest/gdrivers/postgisraster.py b/autotest/gdrivers/postgisraster.py
index cc6340c7ef35..249e224e5599 100755
--- a/autotest/gdrivers/postgisraster.py
+++ b/autotest/gdrivers/postgisraster.py
@@ -566,10 +566,3 @@ def test_postgisraster_cleanup():
 
 
 
-if __name__ == '__main__':
-
-    gdaltest.setup_run('WKTRASTER')
-
-    gdaltest.run_tests(gdaltest_list)
-
-    sys.exit(gdaltest.summarize())
diff --git a/autotest/gdrivers/prf.py b/autotest/gdrivers/prf.py
index 0947b90eb57c..50a768feda49 100755
--- a/autotest/gdrivers/prf.py
+++ b/autotest/gdrivers/prf.py
@@ -90,10 +90,3 @@ def test_prf_4():
 
 
 
-if __name__ == '__main__':
-
-    gdaltest.setup_run('prf')
-
-    gdaltest.run_tests(gdaltest_list)
-
-    sys.exit(gdaltest.summarize())
diff --git a/autotest/gdrivers/r.py b/autotest/gdrivers/r.py
index 4a4a8b9f0a69..a65d4dc6aec0 100755
--- a/autotest/gdrivers/r.py
+++ b/autotest/gdrivers/r.py
@@ -75,10 +75,3 @@ def test_r_4():
 
 
 
-if __name__ == '__main__':
-
-    gdaltest.setup_run('r')
-
-    gdaltest.run_tests(gdaltest_list)
-
-    sys.exit(gdaltest.summarize())
diff --git a/autotest/gdrivers/rasdaman.py b/autotest/gdrivers/rasdaman.py
index 029511c018fe..6ba3a7bdb676 100755
--- a/autotest/gdrivers/rasdaman.py
+++ b/autotest/gdrivers/rasdaman.py
@@ -90,10 +90,3 @@ def test_rasdaman_3():
 
 
 
-if __name__ == '__main__':
-
-    gdaltest.setup_run('RASDAMAN')
-
-    gdaltest.run_tests(gdaltest_list)
-
-    sys.exit(gdaltest.summarize())
diff --git a/autotest/gdrivers/rasterlite.py b/autotest/gdrivers/rasterlite.py
index ec4809fe59c1..14e3b5f18775 100755
--- a/autotest/gdrivers/rasterlite.py
+++ b/autotest/gdrivers/rasterlite.py
@@ -433,10 +433,3 @@ def test_rasterlite_cleanup():
     
 
 
-if __name__ == '__main__':
-
-    gdaltest.setup_run('rasterlite')
-
-    gdaltest.run_tests(gdaltest_list)
-
-    sys.exit(gdaltest.summarize())
diff --git a/autotest/gdrivers/rda.py b/autotest/gdrivers/rda.py
index 248b2ecaa0af..5c827aec23e6 100755
--- a/autotest/gdrivers/rda.py
+++ b/autotest/gdrivers/rda.py
@@ -1467,10 +1467,3 @@ def test_rda_cleanup():
 
 
 
-if __name__ == '__main__':
-
-    gdaltest.setup_run('RDA')
-
-    gdaltest.run_tests(gdaltest_list)
-
-    sys.exit(gdaltest.summarize())
diff --git a/autotest/gdrivers/rik.py b/autotest/gdrivers/rik.py
index 160f41e54bc3..d10c4c4341da 100755
--- a/autotest/gdrivers/rik.py
+++ b/autotest/gdrivers/rik.py
@@ -85,10 +85,3 @@ def test_rik_online_2():
 
 
 
-if __name__ == '__main__':
-
-    gdaltest.setup_run('RIK')
-
-    gdaltest.run_tests(gdaltest_list)
-
-    sys.exit(gdaltest.summarize())
diff --git a/autotest/gdrivers/rl2.py b/autotest/gdrivers/rl2.py
index 29a6668e33cf..313cf9233972 100755
--- a/autotest/gdrivers/rl2.py
+++ b/autotest/gdrivers/rl2.py
@@ -540,10 +540,3 @@ def test_rl2_error_create():
     
 
 
-if __name__ == '__main__':
-
-    gdaltest.setup_run('rl2')
-
-    gdaltest.run_tests(gdaltest_list)
-
-    sys.exit(gdaltest.summarize())
diff --git a/autotest/gdrivers/rmf.py b/autotest/gdrivers/rmf.py
index 821b007bf962..a31597ef50cf 100755
--- a/autotest/gdrivers/rmf.py
+++ b/autotest/gdrivers/rmf.py
@@ -776,10 +776,3 @@ def test_rmf_33c():
 
 
 
-if __name__ == '__main__':
-
-    gdaltest.setup_run('rmf')
-
-    gdaltest.run_tests(gdaltest_list)
-
-    sys.exit(gdaltest.summarize())
diff --git a/autotest/gdrivers/roipac.py b/autotest/gdrivers/roipac.py
index a03275d31dfa..9795a59e3dbf 100755
--- a/autotest/gdrivers/roipac.py
+++ b/autotest/gdrivers/roipac.py
@@ -114,10 +114,3 @@ def test_roipac_6():
 
 
 
-if __name__ == '__main__':
-
-    gdaltest.setup_run('roipac')
-
-    gdaltest.run_tests(gdaltest_list)
-
-    sys.exit(gdaltest.summarize())
diff --git a/autotest/gdrivers/rpftoc.py b/autotest/gdrivers/rpftoc.py
index c027b32ebdc8..d678ad73150e 100755
--- a/autotest/gdrivers/rpftoc.py
+++ b/autotest/gdrivers/rpftoc.py
@@ -105,10 +105,3 @@ def test_rpftoc_4():
 
 
 
-if __name__ == '__main__':
-
-    gdaltest.setup_run('rpftoc')
-
-    gdaltest.run_tests(gdaltest_list)
-
-    sys.exit(gdaltest.summarize())
diff --git a/autotest/gdrivers/rraster.py b/autotest/gdrivers/rraster.py
index da12d76e8e57..b35e35d146cd 100755
--- a/autotest/gdrivers/rraster.py
+++ b/autotest/gdrivers/rraster.py
@@ -414,10 +414,3 @@ def test_rraster_colorinterpretation():
 
 
 
-if __name__ == '__main__':
-
-    gdaltest.setup_run('RRASTER')
-
-    gdaltest.run_tests(gdaltest_list)
-
-    sys.exit(gdaltest.summarize())
diff --git a/autotest/gdrivers/rs2.py b/autotest/gdrivers/rs2.py
index c5ba666b2565..779b880a3b8e 100755
--- a/autotest/gdrivers/rs2.py
+++ b/autotest/gdrivers/rs2.py
@@ -75,10 +75,3 @@ def test_rs2_3():
 
 
 
-if __name__ == '__main__':
-
-    gdaltest.setup_run('rs2')
-
-    gdaltest.run_tests(gdaltest_list)
-
-    sys.exit(gdaltest.summarize())
diff --git a/autotest/gdrivers/safe.py b/autotest/gdrivers/safe.py
index 08f0e35c181f..63144ae48fce 100755
--- a/autotest/gdrivers/safe.py
+++ b/autotest/gdrivers/safe.py
@@ -78,10 +78,3 @@ def test_safe_5():
 
 
 
-if __name__ == '__main__':
-
-    gdaltest.setup_run('safe')
-
-    gdaltest.run_tests(gdaltest_list)
-
-    sys.exit(gdaltest.summarize())
diff --git a/autotest/gdrivers/saga.py b/autotest/gdrivers/saga.py
index cdbc8d056382..16a2ba112e62 100755
--- a/autotest/gdrivers/saga.py
+++ b/autotest/gdrivers/saga.py
@@ -194,10 +194,3 @@ def test_saga_8():
 
 
 
-if __name__ == '__main__':
-
-    gdaltest.setup_run('saga')
-
-    gdaltest.run_tests(gdaltest_list)
-
-    sys.exit(gdaltest.summarize())
diff --git a/autotest/gdrivers/sar_ceos.py b/autotest/gdrivers/sar_ceos.py
index a8c66d607efa..1e3ff995d956 100755
--- a/autotest/gdrivers/sar_ceos.py
+++ b/autotest/gdrivers/sar_ceos.py
@@ -53,10 +53,3 @@ def test_sar_ceos_online_1():
 
 
 
-if __name__ == '__main__':
-
-    gdaltest.setup_run('sar_ceos')
-
-    gdaltest.run_tests(gdaltest_list)
-
-    sys.exit(gdaltest.summarize())
diff --git a/autotest/gdrivers/sdts.py b/autotest/gdrivers/sdts.py
index aa29c99922b3..ff98a734f2cc 100755
--- a/autotest/gdrivers/sdts.py
+++ b/autotest/gdrivers/sdts.py
@@ -57,10 +57,3 @@ def test_sdts_1():
 
 
 
-if __name__ == '__main__':
-
-    gdaltest.setup_run('sdts')
-
-    gdaltest.run_tests(gdaltest_list)
-
-    sys.exit(gdaltest.summarize())
diff --git a/autotest/gdrivers/sentinel2.py b/autotest/gdrivers/sentinel2.py
index f6ae93ea8bf8..5bd74760a4f9 100755
--- a/autotest/gdrivers/sentinel2.py
+++ b/autotest/gdrivers/sentinel2.py
@@ -2427,10 +2427,3 @@ def test_sentinel2_l1c_safe_compact_3():
 
 
 
-if __name__ == '__main__':
-
-    gdaltest.setup_run('sentinel2')
-
-    gdaltest.run_tests(gdaltest_list)
-
-    sys.exit(gdaltest.summarize())
diff --git a/autotest/gdrivers/sgi.py b/autotest/gdrivers/sgi.py
index 1e072677a134..544790c6eb5c 100755
--- a/autotest/gdrivers/sgi.py
+++ b/autotest/gdrivers/sgi.py
@@ -66,10 +66,3 @@ def test_sgi_3():
 
 
 
-if __name__ == '__main__':
-
-    gdaltest.setup_run('SGI')
-
-    gdaltest.run_tests(gdaltest_list)
-
-    sys.exit(gdaltest.summarize())
diff --git a/autotest/gdrivers/sigdem.py b/autotest/gdrivers/sigdem.py
index f67cb3510fb8..6264407c7fea 100755
--- a/autotest/gdrivers/sigdem.py
+++ b/autotest/gdrivers/sigdem.py
@@ -71,10 +71,3 @@ def test_sigdem_in_memory():
 
 
 
-if __name__ == '__main__':
-
-    gdaltest.setup_run('sigdem')
-
-    gdaltest.run_tests(gdaltest_list)
-
-    sys.exit(gdaltest.summarize())
diff --git a/autotest/gdrivers/snodas.py b/autotest/gdrivers/snodas.py
index df35fde0f6a6..7fff5eaf474b 100755
--- a/autotest/gdrivers/snodas.py
+++ b/autotest/gdrivers/snodas.py
@@ -66,10 +66,3 @@ def test_snodas_1():
 
 
 
-if __name__ == '__main__':
-
-    gdaltest.setup_run('snodas')
-
-    gdaltest.run_tests(gdaltest_list)
-
-    sys.exit(gdaltest.summarize())
diff --git a/autotest/gdrivers/srp.py b/autotest/gdrivers/srp.py
index 6e6010d40515..811386289507 100755
--- a/autotest/gdrivers/srp.py
+++ b/autotest/gdrivers/srp.py
@@ -146,10 +146,3 @@ def test_srp_cleanup():
 
 
 
-if __name__ == '__main__':
-
-    gdaltest.setup_run('srp')
-
-    gdaltest.run_tests(gdaltest_list)
-
-    sys.exit(gdaltest.summarize())
diff --git a/autotest/gdrivers/srtmhgt.py b/autotest/gdrivers/srtmhgt.py
index b54aed0e8db1..57baf81a943e 100755
--- a/autotest/gdrivers/srtmhgt.py
+++ b/autotest/gdrivers/srtmhgt.py
@@ -150,10 +150,3 @@ def test_srtmhgt_cleanup():
 
 
 
-if __name__ == '__main__':
-
-    gdaltest.setup_run('srtmhgt')
-
-    gdaltest.run_tests(gdaltest_list)
-
-    sys.exit(gdaltest.summarize())
diff --git a/autotest/gdrivers/terragen.py b/autotest/gdrivers/terragen.py
index 287c92f611ac..5e6bd65fc316 100755
--- a/autotest/gdrivers/terragen.py
+++ b/autotest/gdrivers/terragen.py
@@ -59,10 +59,3 @@ def test_terragen_2():
 
 
 
-if __name__ == '__main__':
-
-    gdaltest.setup_run('TERRAGEN')
-
-    gdaltest.run_tests(gdaltest_list)
-
-    sys.exit(gdaltest.summarize())
diff --git a/autotest/gdrivers/test_validate_jp2.py b/autotest/gdrivers/test_validate_jp2.py
index e6a1470f2826..8a7db1c1b35b 100755
--- a/autotest/gdrivers/test_validate_jp2.py
+++ b/autotest/gdrivers/test_validate_jp2.py
@@ -379,10 +379,3 @@ def test_validate_jp2_cleanup():
     
 
 
-if __name__ == '__main__':
-
-    gdaltest.setup_run('test_validate_jp2')
-
-    gdaltest.run_tests(gdaltest_list)
-
-    sys.exit(gdaltest.summarize())
diff --git a/autotest/gdrivers/tiff_profile.py b/autotest/gdrivers/tiff_profile.py
index b06feb5a31f6..043ccd75ccc4 100755
--- a/autotest/gdrivers/tiff_profile.py
+++ b/autotest/gdrivers/tiff_profile.py
@@ -446,10 +446,3 @@ def test_tiff_update_colorimetric():
 
 
 
-if __name__ == '__main__':
-
-    gdaltest.setup_run('tiff_profile')
-
-    gdaltest.run_tests(gdaltest_list)
-
-    sys.exit(gdaltest.summarize())
diff --git a/autotest/gdrivers/til.py b/autotest/gdrivers/til.py
index 69273022be6c..2e60ee30ae48 100755
--- a/autotest/gdrivers/til.py
+++ b/autotest/gdrivers/til.py
@@ -109,10 +109,3 @@ def test_til_3():
     
 
 
-if __name__ == '__main__':
-
-    gdaltest.setup_run('til')
-
-    gdaltest.run_tests(gdaltest_list)
-
-    sys.exit(gdaltest.summarize())
diff --git a/autotest/gdrivers/usgsdem.py b/autotest/gdrivers/usgsdem.py
index fd937237bd1d..79f735ef6dc9 100755
--- a/autotest/gdrivers/usgsdem.py
+++ b/autotest/gdrivers/usgsdem.py
@@ -248,10 +248,3 @@ def test_usgsdem_cleanup():
     
 
 
-if __name__ == '__main__':
-
-    gdaltest.setup_run('usgsdem')
-
-    gdaltest.run_tests(gdaltest_list)
-
-    sys.exit(gdaltest.summarize())
diff --git a/autotest/gdrivers/vicar.py b/autotest/gdrivers/vicar.py
index 385b31514f98..8fd5d22e5630 100755
--- a/autotest/gdrivers/vicar.py
+++ b/autotest/gdrivers/vicar.py
@@ -76,10 +76,3 @@ def test_vicar_1():
     
 
 
-if __name__ == '__main__':
-
-    gdaltest.setup_run('vicar')
-
-    gdaltest.run_tests(gdaltest_list)
-
-    sys.exit(gdaltest.summarize())
diff --git a/autotest/gdrivers/vrtderived.py b/autotest/gdrivers/vrtderived.py
index 2dd34b7273f1..b569fdf81382 100755
--- a/autotest/gdrivers/vrtderived.py
+++ b/autotest/gdrivers/vrtderived.py
@@ -854,10 +854,3 @@ def test_vrtderived_cleanup():
     
 
 
-if __name__ == '__main__':
-
-    gdaltest.setup_run('vrtderived')
-
-    gdaltest.run_tests(gdaltest_list)
-
-    sys.exit(gdaltest.summarize())
diff --git a/autotest/gdrivers/vrtfilt.py b/autotest/gdrivers/vrtfilt.py
index e8b6ec50d9a6..0accf969bb39 100755
--- a/autotest/gdrivers/vrtfilt.py
+++ b/autotest/gdrivers/vrtfilt.py
@@ -159,10 +159,3 @@ def test_vrtfilt_cleanup():
     pass
 
 
-if __name__ == '__main__':
-
-    gdaltest.setup_run('vrtfilt')
-
-    gdaltest.run_tests(gdaltest_list)
-
-    sys.exit(gdaltest.summarize())
diff --git a/autotest/gdrivers/vrtlut.py b/autotest/gdrivers/vrtlut.py
index e5fe5da486ec..aacd3e1f8d79 100755
--- a/autotest/gdrivers/vrtlut.py
+++ b/autotest/gdrivers/vrtlut.py
@@ -50,10 +50,3 @@ def test_vrtlut_cleanup():
     pass
 
 
-if __name__ == '__main__':
-
-    gdaltest.setup_run('vrtlut')
-
-    gdaltest.run_tests(gdaltest_list)
-
-    sys.exit(gdaltest.summarize())
diff --git a/autotest/gdrivers/vrtmask.py b/autotest/gdrivers/vrtmask.py
index 1b89e0279162..edbc14ef1e7f 100755
--- a/autotest/gdrivers/vrtmask.py
+++ b/autotest/gdrivers/vrtmask.py
@@ -377,10 +377,3 @@ def test_vrtmask_cleanup():
     pass
 
 
-if __name__ == '__main__':
-
-    gdaltest.setup_run('vrtmask')
-
-    gdaltest.run_tests(gdaltest_list)
-
-    sys.exit(gdaltest.summarize())
diff --git a/autotest/gdrivers/vrtovr.py b/autotest/gdrivers/vrtovr.py
index 16cca218e65c..ccf37addec63 100755
--- a/autotest/gdrivers/vrtovr.py
+++ b/autotest/gdrivers/vrtovr.py
@@ -179,10 +179,3 @@ def test_vrtovr_cleanup():
     pass
 
 
-if __name__ == '__main__':
-
-    gdaltest.setup_run('vrtovr')
-
-    gdaltest.run_tests(gdaltest_list)
-
-    sys.exit(gdaltest.summarize())
diff --git a/autotest/gdrivers/vrtpansharpen.py b/autotest/gdrivers/vrtpansharpen.py
index a68bdc373cd8..49b55d01adb8 100755
--- a/autotest/gdrivers/vrtpansharpen.py
+++ b/autotest/gdrivers/vrtpansharpen.py
@@ -1780,10 +1780,3 @@ def test_vrtpansharpen_cleanup():
 
 # gdaltest_list= [ vrtpansharpen_1, vrtpansharpen_8 ]
 
-if __name__ == '__main__':
-
-    gdaltest.setup_run('vrtpansharpen')
-
-    gdaltest.run_tests(gdaltest_list)
-
-    sys.exit(gdaltest.summarize())
diff --git a/autotest/gdrivers/vrtrawlink.py b/autotest/gdrivers/vrtrawlink.py
index 9df5769349fd..ed38b22b359b 100755
--- a/autotest/gdrivers/vrtrawlink.py
+++ b/autotest/gdrivers/vrtrawlink.py
@@ -328,10 +328,3 @@ def test_vrtrawlink_cleanup():
     
 
 
-if __name__ == '__main__':
-
-    gdaltest.setup_run('vrtrawlink')
-
-    gdaltest.run_tests(gdaltest_list)
-
-    sys.exit(gdaltest.summarize())
diff --git a/autotest/gdrivers/vrtwarp.py b/autotest/gdrivers/vrtwarp.py
index a72f82caedfa..beaeb287f27d 100755
--- a/autotest/gdrivers/vrtwarp.py
+++ b/autotest/gdrivers/vrtwarp.py
@@ -418,10 +418,3 @@ def test_vrtwarp_read_vrt_of_warped_vrt():
 
 
 
-if __name__ == '__main__':
-
-    gdaltest.setup_run('vrtwarp')
-
-    gdaltest.run_tests(gdaltest_list)
-
-    sys.exit(gdaltest.summarize())
diff --git a/autotest/gdrivers/wcs.py b/autotest/gdrivers/wcs.py
index 1735b2b66852..77a4718a78fb 100755
--- a/autotest/gdrivers/wcs.py
+++ b/autotest/gdrivers/wcs.py
@@ -536,10 +536,3 @@ def test_wcs_cleanup():
 
 
 
-if __name__ == '__main__':
-
-    gdaltest.setup_run('wcs')
-
-    gdaltest.run_tests(gdaltest_list)
-
-    sys.exit(gdaltest.summarize())
diff --git a/autotest/gdrivers/webp.py b/autotest/gdrivers/webp.py
index 8c66affe1f79..539d28279538 100755
--- a/autotest/gdrivers/webp.py
+++ b/autotest/gdrivers/webp.py
@@ -137,10 +137,3 @@ def test_webp_5():
 
 
 
-if __name__ == '__main__':
-
-    gdaltest.setup_run('webp')
-
-    gdaltest.run_tests(gdaltest_list)
-
-    sys.exit(gdaltest.summarize())
diff --git a/autotest/gdrivers/wms.py b/autotest/gdrivers/wms.py
index 9ceeefc3c590..554753afa242 100755
--- a/autotest/gdrivers/wms.py
+++ b/autotest/gdrivers/wms.py
@@ -832,10 +832,3 @@ def test_wms_cleanup():
 
 
 
-if __name__ == '__main__':
-
-    gdaltest.setup_run('wms')
-
-    gdaltest.run_tests(gdaltest_list)
-
-    sys.exit(gdaltest.summarize())
diff --git a/autotest/gdrivers/wmts.py b/autotest/gdrivers/wmts.py
index 66f73bd46619..715962025548 100755
--- a/autotest/gdrivers/wmts.py
+++ b/autotest/gdrivers/wmts.py
@@ -1800,10 +1800,3 @@ def test_wmts_cleanup():
     
 
 
-if __name__ == '__main__':
-
-    gdaltest.setup_run('wmts')
-
-    gdaltest.run_tests(gdaltest_list)
-
-    sys.exit(gdaltest.summarize())
diff --git a/autotest/gdrivers/xpm.py b/autotest/gdrivers/xpm.py
index 435a4c2a54e0..48c587652b7b 100755
--- a/autotest/gdrivers/xpm.py
+++ b/autotest/gdrivers/xpm.py
@@ -61,10 +61,3 @@ def test_xpm_1():
 
 
 
-if __name__ == '__main__':
-
-    gdaltest.setup_run('xpm')
-
-    gdaltest.run_tests(gdaltest_list)
-
-    sys.exit(gdaltest.summarize())
diff --git a/autotest/gdrivers/xyz.py b/autotest/gdrivers/xyz.py
index 2a893a860396..042e8f697808 100755
--- a/autotest/gdrivers/xyz.py
+++ b/autotest/gdrivers/xyz.py
@@ -252,10 +252,3 @@ def test_xyz_cleanup():
     pass
 
 
-if __name__ == '__main__':
-
-    gdaltest.setup_run('xyz')
-
-    gdaltest.run_tests(gdaltest_list)
-
-    sys.exit(gdaltest.summarize())
diff --git a/autotest/gdrivers/zmap.py b/autotest/gdrivers/zmap.py
index cd80d3e60455..d43ad48b2d57 100755
--- a/autotest/gdrivers/zmap.py
+++ b/autotest/gdrivers/zmap.py
@@ -44,10 +44,3 @@ def test_zmap_1():
 
 
 
-if __name__ == '__main__':
-
-    gdaltest.setup_run('zmap')
-
-    gdaltest.run_tests(gdaltest_list)
-
-    sys.exit(gdaltest.summarize())
diff --git a/autotest/gnm/gnm_test.py b/autotest/gnm/gnm_test.py
index 1e35881c832e..5265f626987b 100755
--- a/autotest/gnm/gnm_test.py
+++ b/autotest/gnm/gnm_test.py
@@ -233,10 +233,3 @@ def test_gnm_delete():
     
 
 
-if __name__ == '__main__':
-
-    gdaltest.setup_run('gnm_test')
-
-    gdaltest.run_tests(gdaltest_list)
-
-    sys.exit(gdaltest.summarize())
diff --git a/autotest/kml_generate_test_files.py b/autotest/kml_generate_test_files.py
index 79ee80140f24..57d2b9b151e1 100644
--- a/autotest/kml_generate_test_files.py
+++ b/autotest/kml_generate_test_files.py
@@ -356,9 +356,3 @@ def generate_kmlsuperoverlay(filename):
 
 
 
-if __name__ == '__main__':
-
-    generate_libkml('test_ogrlibkml.kml')
-    generate_libkml('test_ogrlibkml.kmz')
-    generate_libkml_update('test_ogrlibkml_update.kml')
-    generate_kmlsuperoverlay('test_superoverlay.kmz')
diff --git a/autotest/ogr/ogr_arcgen.py b/autotest/ogr/ogr_arcgen.py
index 3fbf4912e19a..57e2f6c74c78 100755
--- a/autotest/ogr/ogr_arcgen.py
+++ b/autotest/ogr/ogr_arcgen.py
@@ -187,10 +187,3 @@ def test_ogr_arcgen_polygons25d():
 
 
 
-if __name__ == '__main__':
-
-    gdaltest.setup_run('ogr_arcgen')
-
-    gdaltest.run_tests(gdaltest_list)
-
-    sys.exit(gdaltest.summarize())
diff --git a/autotest/ogr/ogr_as_sqlite_extension.py b/autotest/ogr/ogr_as_sqlite_extension.py
index 4d5630b10d6b..8a72e4baf759 100755
--- a/autotest/ogr/ogr_as_sqlite_extension.py
+++ b/autotest/ogr/ogr_as_sqlite_extension.py
@@ -111,9 +111,3 @@ def do(sqlite3name, gdalname):
 
 
 
-if __name__ == '__main__':
-    if len(sys.argv) != 3:
-        print('python ogr_as_sqlite_extension name_of_libsqlite3 name_of_libgdal')
-        sys.exit(1)
-
-    do(sys.argv[1], sys.argv[2])
diff --git a/autotest/ogr/ogr_avc.py b/autotest/ogr/ogr_avc.py
index 72df29344419..7614beb05bfa 100755
--- a/autotest/ogr/ogr_avc.py
+++ b/autotest/ogr/ogr_avc.py
@@ -161,10 +161,3 @@ def test_ogr_avc_5():
     
 
 
-if __name__ == '__main__':
-
-    gdaltest.setup_run('ogr_avc')
-
-    gdaltest.run_tests(gdaltest_list)
-
-    sys.exit(gdaltest.summarize())
diff --git a/autotest/ogr/ogr_basic_test.py b/autotest/ogr/ogr_basic_test.py
index a086f72972e0..63dbcd33b56a 100755
--- a/autotest/ogr/ogr_basic_test.py
+++ b/autotest/ogr/ogr_basic_test.py
@@ -689,10 +689,3 @@ def test_ogr_basic_cleanup():
 
 # gdaltest_list = [ ogr_basic_13 ]
 
-if __name__ == '__main__':
-
-    gdaltest.setup_run('ogr_basic_test')
-
-    gdaltest.run_tests(gdaltest_list)
-
-    sys.exit(gdaltest.summarize())
diff --git a/autotest/ogr/ogr_bna.py b/autotest/ogr/ogr_bna.py
index 16dd0f993bbd..6b8a4f5e695e 100755
--- a/autotest/ogr/ogr_bna.py
+++ b/autotest/ogr/ogr_bna.py
@@ -223,10 +223,3 @@ def test_ogr_bna_cleanup():
     
 
 
-if __name__ == '__main__':
-
-    gdaltest.setup_run('ogr_bna')
-
-    gdaltest.run_tests(gdaltest_list)
-
-    sys.exit(gdaltest.summarize())
diff --git a/autotest/ogr/ogr_cad.py b/autotest/ogr/ogr_cad.py
index bbfd22536915..2c39aac9a61e 100755
--- a/autotest/ogr/ogr_cad.py
+++ b/autotest/ogr/ogr_cad.py
@@ -372,10 +372,3 @@ def test_ogr_cad_cleanup():
 
 
 
-if __name__ == '__main__':
-
-    gdaltest.setup_run('ogr_cad')
-
-    gdaltest.run_tests(gdaltest_list)
-
-    sys.exit(gdaltest.summarize())
diff --git a/autotest/ogr/ogr_carto.py b/autotest/ogr/ogr_carto.py
index f739bd905aea..b7864bdd09e2 100755
--- a/autotest/ogr/ogr_carto.py
+++ b/autotest/ogr/ogr_carto.py
@@ -1045,14 +1045,3 @@ def ogr_carto_rw_1():
     ogr_carto_rw_init,
     ogr_carto_rw_1,
 ]
-
-if __name__ == '__main__':
-
-    gdaltest.setup_run('ogr_carto')
-
-    if gdal.GetConfigOption('CARTO_CONNECTION') is None:
-        gdaltest.run_tests(gdaltest_list)
-    else:
-        gdaltest.run_tests(gdaltest_rw_list)
-
-    sys.exit(gdaltest.summarize())
diff --git a/autotest/ogr/ogr_cloudant.py b/autotest/ogr/ogr_cloudant.py
index bb40da9e26dd..478f1c29ef43 100755
--- a/autotest/ogr/ogr_cloudant.py
+++ b/autotest/ogr/ogr_cloudant.py
@@ -175,10 +175,3 @@ def test_ogr_cloudant_SetSpatialFilter():
     
 
 
-if __name__ == '__main__':
-
-    gdaltest.setup_run('ogr_cloudant')
-
-    gdaltest.run_tests(gdaltest_list)
-
-    sys.exit(gdaltest.summarize())
diff --git a/autotest/ogr/ogr_couchdb.py b/autotest/ogr/ogr_couchdb.py
index 27e2d49e024e..d8d1b72474b4 100755
--- a/autotest/ogr/ogr_couchdb.py
+++ b/autotest/ogr/ogr_couchdb.py
@@ -138,10 +138,3 @@ def test_ogr_couchdb_cleanup():
 
 
 
-if __name__ == '__main__':
-
-    gdaltest.setup_run('ogr_couchdb')
-
-    gdaltest.run_tests(gdaltest_list)
-
-    sys.exit(gdaltest.summarize())
diff --git a/autotest/ogr/ogr_csv.py b/autotest/ogr/ogr_csv.py
index b85e857ba0bf..c8f1375e816e 100755
--- a/autotest/ogr/ogr_csv.py
+++ b/autotest/ogr/ogr_csv.py
@@ -2229,10 +2229,3 @@ def test_ogr_csv_cleanup():
     
 
 
-if __name__ == '__main__':
-
-    gdaltest.setup_run('ogr_csv')
-
-    gdaltest.run_tests(gdaltest_list)
-
-    sys.exit(gdaltest.summarize())
diff --git a/autotest/ogr/ogr_csw.py b/autotest/ogr/ogr_csw.py
index 12db9e6ab45b..7a355c525197 100755
--- a/autotest/ogr/ogr_csw.py
+++ b/autotest/ogr/ogr_csw.py
@@ -571,10 +571,3 @@ def test_ogr_csw_vsimem_cleanup():
     
 
 
-if __name__ == '__main__':
-
-    gdaltest.setup_run('ogr_csw')
-
-    gdaltest.run_tests(gdaltest_list)
-
-    sys.exit(gdaltest.summarize())
diff --git a/autotest/ogr/ogr_db2.py b/autotest/ogr/ogr_db2.py
index f758bcce9367..149c812e19c2 100755
--- a/autotest/ogr/ogr_db2.py
+++ b/autotest/ogr/ogr_db2.py
@@ -273,11 +273,3 @@ def ogr_db2_listdrivers():
     
 
 
-if __name__ == '__main__':
-
-    gdaltest.setup_run('ogr_db2')
-    if os.name == 'nt':
-        gdaltest.run_tests(gdaltest_list)
-    else:
-        print("These tests only run on Windows")
-    sys.exit(gdaltest.summarize())
diff --git a/autotest/ogr/ogr_db2_hack.py b/autotest/ogr/ogr_db2_hack.py
index d37d5ef13bb5..b96707106a3b 100755
--- a/autotest/ogr/ogr_db2_hack.py
+++ b/autotest/ogr/ogr_db2_hack.py
@@ -113,10 +113,3 @@ def test_ogr_db2_hack_3():
 
 
 
-if __name__ == '__main__':
-
-    gdaltest.setup_run('ogr_db2_hack')
-
-    gdaltest.run_tests(gdaltest_list)
-
-    sys.exit(gdaltest.summarize())
diff --git a/autotest/ogr/ogr_dgn.py b/autotest/ogr/ogr_dgn.py
index b00e19de438f..6f9e014d7ddf 100755
--- a/autotest/ogr/ogr_dgn.py
+++ b/autotest/ogr/ogr_dgn.py
@@ -265,10 +265,3 @@ def test_ogr_dgn_cleanup():
 
 
 
-if __name__ == '__main__':
-
-    gdaltest.setup_run('ogr_dgn')
-
-    gdaltest.run_tests(gdaltest_list)
-
-    sys.exit(gdaltest.summarize())
diff --git a/autotest/ogr/ogr_dgnv8.py b/autotest/ogr/ogr_dgnv8.py
index 4f3b63488daa..f5189cceeb67 100755
--- a/autotest/ogr/ogr_dgnv8.py
+++ b/autotest/ogr/ogr_dgnv8.py
@@ -194,10 +194,3 @@ def test_ogr_dgnv8_cleanup():
     pass
 
 
-if __name__ == '__main__':
-
-    gdaltest.setup_run('ogr_dgnv8')
-
-    gdaltest.run_tests(gdaltest_list)
-
-    sys.exit(gdaltest.summarize())
diff --git a/autotest/ogr/ogr_dods.py b/autotest/ogr/ogr_dods.py
index a67e80452950..760f7d4a0ceb 100755
--- a/autotest/ogr/ogr_dods.py
+++ b/autotest/ogr/ogr_dods.py
@@ -210,11 +210,3 @@ def ogr_dods_cleanup():
     ogr_dods_4,
     ogr_dods_5,
     ogr_dods_cleanup]
-
-if __name__ == '__main__':
-
-    gdaltest.setup_run('ogr_dods')
-
-    gdaltest.run_tests(manual_gdaltest_list)
-
-    sys.exit(gdaltest.summarize())
diff --git a/autotest/ogr/ogr_dxf.py b/autotest/ogr/ogr_dxf.py
index 7fff66698d82..9a31735b06bb 100644
--- a/autotest/ogr/ogr_dxf.py
+++ b/autotest/ogr/ogr_dxf.py
@@ -3497,10 +3497,3 @@ def test_ogr_dxf_cleanup():
 
 
 
-if __name__ == '__main__':
-
-    gdaltest.setup_run('ogr_dxf')
-
-    gdaltest.run_tests(gdaltest_list)
-
-    sys.exit(gdaltest.summarize())
diff --git a/autotest/ogr/ogr_edigeo.py b/autotest/ogr/ogr_edigeo.py
index 5ff2404929d9..c067f5e6cbad 100755
--- a/autotest/ogr/ogr_edigeo.py
+++ b/autotest/ogr/ogr_edigeo.py
@@ -117,10 +117,3 @@ def test_ogr_edigeo_1():
 
 
 
-if __name__ == '__main__':
-
-    gdaltest.setup_run('ogr_edigeo')
-
-    gdaltest.run_tests(gdaltest_list)
-
-    sys.exit(gdaltest.summarize())
diff --git a/autotest/ogr/ogr_eeda.py b/autotest/ogr/ogr_eeda.py
index d70c065cfa07..d7a18455d0b1 100644
--- a/autotest/ogr/ogr_eeda.py
+++ b/autotest/ogr/ogr_eeda.py
@@ -429,10 +429,3 @@ def test_eeda_cleanup():
 
 
 
-if __name__ == '__main__':
-
-    gdaltest.setup_run('ogr_eeda')
-
-    gdaltest.run_tests(gdaltest_list)
-
-    sys.exit(gdaltest.summarize())
diff --git a/autotest/ogr/ogr_elasticsearch.py b/autotest/ogr/ogr_elasticsearch.py
index 93ad881a5075..ed58f82af924 100755
--- a/autotest/ogr/ogr_elasticsearch.py
+++ b/autotest/ogr/ogr_elasticsearch.py
@@ -2286,10 +2286,3 @@ def test_ogr_elasticsearch_cleanup():
 
 # gdaltest_list = [ ogr_elasticsearch_init, ogr_elasticsearch_10 ]
 
-if __name__ == '__main__':
-
-    gdaltest.setup_run('ogr_elasticsearch')
-
-    gdaltest.run_tests(gdaltest_list)
-
-    sys.exit(gdaltest.summarize())
diff --git a/autotest/ogr/ogr_factory.py b/autotest/ogr/ogr_factory.py
index 9d5051f4a3c9..eed7f0a652f9 100755
--- a/autotest/ogr/ogr_factory.py
+++ b/autotest/ogr/ogr_factory.py
@@ -533,10 +533,3 @@ def test_ogr_factory_8():
     
 
 
-if __name__ == '__main__':
-
-    gdaltest.setup_run('ogr_factory')
-
-    gdaltest.run_tests(gdaltest_list)
-
-    sys.exit(gdaltest.summarize())
diff --git a/autotest/ogr/ogr_feature.py b/autotest/ogr/ogr_feature.py
index 6b99cf69e8c0..27d4a5c5308d 100755
--- a/autotest/ogr/ogr_feature.py
+++ b/autotest/ogr/ogr_feature.py
@@ -935,10 +935,3 @@ def test_ogr_feature_cleanup():
 
 
 
-if __name__ == '__main__':
-
-    gdaltest.setup_run('ogr_feature')
-
-    gdaltest.run_tests(gdaltest_list)
-
-    sys.exit(gdaltest.summarize())
diff --git a/autotest/ogr/ogr_fgdb.py b/autotest/ogr/ogr_fgdb.py
index d9133d93d622..0259e0737254 100755
--- a/autotest/ogr/ogr_fgdb.py
+++ b/autotest/ogr/ogr_fgdb.py
@@ -2201,11 +2201,3 @@ def test_ogr_fgdb_cleanup():
     test_ogr_fgdb_20,
     test_ogr_fgdb_cleanup
 ]
-
-if __name__ == '__main__':
-
-    gdaltest.setup_run('ogr_fgdb')
-
-    gdaltest.run_tests(gdaltest_list)
-
-    sys.exit(gdaltest.summarize())
diff --git a/autotest/ogr/ogr_fgdb_stress_test.py b/autotest/ogr/ogr_fgdb_stress_test.py
index 656f55ceb746..c61509c65ff9 100755
--- a/autotest/ogr/ogr_fgdb_stress_test.py
+++ b/autotest/ogr/ogr_fgdb_stress_test.py
@@ -217,11 +217,3 @@ def ogr_fgdb_stress_test_cleanup():
                           ogr_fgdb_stress_test_1,
                           ogr_fgdb_stress_test_2,
                           ogr_fgdb_stress_test_cleanup]
-
-if __name__ == '__main__':
-
-    gdaltest.setup_run('ogr_fgdb_stress_test')
-
-    gdaltest.run_tests(explicit_gdaltest_list)
-
-    sys.exit(gdaltest.summarize())
diff --git a/autotest/ogr/ogr_geoconcept.py b/autotest/ogr/ogr_geoconcept.py
index 307763e472a9..5c7a2b8c58da 100755
--- a/autotest/ogr/ogr_geoconcept.py
+++ b/autotest/ogr/ogr_geoconcept.py
@@ -283,10 +283,3 @@ def test_ogr_gxt_cleanup():
     
 
 
-if __name__ == '__main__':
-
-    gdaltest.setup_run('ogr_gxt')
-
-    gdaltest.run_tests(gdaltest_list)
-
-    sys.exit(gdaltest.summarize())
diff --git a/autotest/ogr/ogr_geojson.py b/autotest/ogr/ogr_geojson.py
index 023d67d3d1d7..10c2cc409727 100755
--- a/autotest/ogr/ogr_geojson.py
+++ b/autotest/ogr/ogr_geojson.py
@@ -3644,10 +3644,3 @@ def test_ogr_geojson_cleanup():
     
 
 
-if __name__ == '__main__':
-
-    gdaltest.setup_run('ogr_geojson')
-
-    gdaltest.run_tests(gdaltest_list)
-
-    sys.exit(gdaltest.summarize())
diff --git a/autotest/ogr/ogr_geojsonseq.py b/autotest/ogr/ogr_geojsonseq.py
index 50bac327b50b..7f167bcadcee 100755
--- a/autotest/ogr/ogr_geojsonseq.py
+++ b/autotest/ogr/ogr_geojsonseq.py
@@ -184,10 +184,3 @@ def test_ogr_geojsonseq_test_ogrsf():
 
 
 
-if __name__ == '__main__':
-
-    gdaltest.setup_run('ogr_geojsonseq')
-
-    gdaltest.run_tests(gdaltest_list)
-
-    sys.exit(gdaltest.summarize())
diff --git a/autotest/ogr/ogr_geom.py b/autotest/ogr/ogr_geom.py
index 753bc13cb656..818afb253c0d 100755
--- a/autotest/ogr/ogr_geom.py
+++ b/autotest/ogr/ogr_geom.py
@@ -3231,10 +3231,3 @@ def test_ogr_geom_cleanup():
 
 # gdaltest_list = [ ogr_geom_triangle_ps_tin_conversion ]
 
-if __name__ == '__main__':
-
-    gdaltest.setup_run('ogr_geom')
-
-    gdaltest.run_tests(gdaltest_list)
-
-    sys.exit(gdaltest.summarize())
diff --git a/autotest/ogr/ogr_georss.py b/autotest/ogr/ogr_georss.py
index d94401a22182..134041f8a3d6 100755
--- a/autotest/ogr/ogr_georss.py
+++ b/autotest/ogr/ogr_georss.py
@@ -567,10 +567,3 @@ def test_ogr_georss_cleanup():
     
 
 
-if __name__ == '__main__':
-
-    gdaltest.setup_run('ogr_georss')
-
-    gdaltest.run_tests(gdaltest_list)
-
-    sys.exit(gdaltest.summarize())
diff --git a/autotest/ogr/ogr_geos.py b/autotest/ogr/ogr_geos.py
index 3ccdaa87cd9c..d054eade1b99 100755
--- a/autotest/ogr/ogr_geos.py
+++ b/autotest/ogr/ogr_geos.py
@@ -594,10 +594,3 @@ def test_ogr_geos_polygonize():
 
 
 
-if __name__ == '__main__':
-
-    gdaltest.setup_run('ogr_geos')
-
-    gdaltest.run_tests(gdaltest_list)
-
-    sys.exit(gdaltest.summarize())
diff --git a/autotest/ogr/ogr_gft.py b/autotest/ogr/ogr_gft.py
index e9b0a127f7f8..da922f1a0c70 100755
--- a/autotest/ogr/ogr_gft.py
+++ b/autotest/ogr/ogr_gft.py
@@ -288,10 +288,3 @@ def test_ogr_gft_ogr2ogr_spatial():
 
 
 
-if __name__ == '__main__':
-
-    gdaltest.setup_run('ogr_gft')
-
-    gdaltest.run_tests(gdaltest_list)
-
-    sys.exit(gdaltest.summarize())
diff --git a/autotest/ogr/ogr_gml_fgd_read.py b/autotest/ogr/ogr_gml_fgd_read.py
index ea8120cf038f..2d94e566fea8 100755
--- a/autotest/ogr/ogr_gml_fgd_read.py
+++ b/autotest/ogr/ogr_gml_fgd_read.py
@@ -117,10 +117,3 @@ def test_ogr_gml_fgd_2():
 
 
 
-if __name__ == '__main__':
-
-    gdaltest.setup_run('ogr_gml_fgd_read')
-
-    gdaltest.run_tests(gdaltest_list)
-
-    sys.exit(gdaltest.summarize())
diff --git a/autotest/ogr/ogr_gml_geom.py b/autotest/ogr/ogr_gml_geom.py
index f2fc680973fa..73eeec81aa64 100755
--- a/autotest/ogr/ogr_gml_geom.py
+++ b/autotest/ogr/ogr_gml_geom.py
@@ -2083,10 +2083,3 @@ def test_gml_write_gml_ns():
 
 
 
-if __name__ == '__main__':
-
-    gdaltest.setup_run('ogr_gml_geom')
-
-    gdaltest.run_tests(gdaltest_list)
-
-    sys.exit(gdaltest.summarize())
diff --git a/autotest/ogr/ogr_gml_read.py b/autotest/ogr/ogr_gml_read.py
index 77a11142777e..66699abcc544 100755
--- a/autotest/ogr/ogr_gml_read.py
+++ b/autotest/ogr/ogr_gml_read.py
@@ -3680,11 +3680,3 @@ def test_ogr_gml_clean_files():
     test_ogr_gml_1,
     test_ogr_gml_82,
     test_ogr_gml_cleanup]
-
-if __name__ == '__main__':
-
-    gdaltest.setup_run('ogr_gml_read')
-
-    gdaltest.run_tests(gdaltest_list)
-
-    sys.exit(gdaltest.summarize())
diff --git a/autotest/ogr/ogr_gmlas.py b/autotest/ogr/ogr_gmlas.py
index cf3d1dafd929..fbc742185f88 100755
--- a/autotest/ogr/ogr_gmlas.py
+++ b/autotest/ogr/ogr_gmlas.py
@@ -2896,11 +2896,3 @@ def test_ogr_gmlas_cleanup():
     ogr_gmlas_extra_piezometre,
     ogr_gmlas_extra_eureg
 ]
-
-if __name__ == '__main__':
-
-    gdaltest.setup_run('ogr_gmlas')
-
-    gdaltest.run_tests(gdaltest_list + gdaltest_extra_list)
-
-    sys.exit(gdaltest.summarize())
diff --git a/autotest/ogr/ogr_gmt.py b/autotest/ogr/ogr_gmt.py
index 030dd86469fb..540b7e932482 100755
--- a/autotest/ogr/ogr_gmt.py
+++ b/autotest/ogr/ogr_gmt.py
@@ -225,10 +225,3 @@ def test_ogr_gmt_cleanup():
 
 
 
-if __name__ == '__main__':
-
-    gdaltest.setup_run('ogr_gmt')
-
-    gdaltest.run_tests(gdaltest_list)
-
-    sys.exit(gdaltest.summarize())
diff --git a/autotest/ogr/ogr_gpkg.py b/autotest/ogr/ogr_gpkg.py
index 321a13d46fab..1b37126e6516 100755
--- a/autotest/ogr/ogr_gpkg.py
+++ b/autotest/ogr/ogr_gpkg.py
@@ -3917,10 +3917,3 @@ def test_ogr_gpkg_cleanup():
 
 # gdaltest_list = [ ogr_gpkg_1, ogr_gpkg_47, ogr_gpkg_cleanup ]
 
-if __name__ == '__main__':
-
-    gdaltest.setup_run('ogr_gpkg')
-
-    gdaltest.run_tests(gdaltest_list)
-
-    sys.exit(gdaltest.summarize())
diff --git a/autotest/ogr/ogr_gpsbabel.py b/autotest/ogr/ogr_gpsbabel.py
index 1e9773fddda2..656a769ea029 100755
--- a/autotest/ogr/ogr_gpsbabel.py
+++ b/autotest/ogr/ogr_gpsbabel.py
@@ -134,10 +134,3 @@ def test_ogr_gpsbabel_3():
 
 
 
-if __name__ == '__main__':
-
-    gdaltest.setup_run('ogr_gpsbabel')
-
-    gdaltest.run_tests(gdaltest_list)
-
-    sys.exit(gdaltest.summarize())
diff --git a/autotest/ogr/ogr_gpx.py b/autotest/ogr/ogr_gpx.py
index 2350b1c0e4a1..72acdcf7ac1b 100755
--- a/autotest/ogr/ogr_gpx.py
+++ b/autotest/ogr/ogr_gpx.py
@@ -486,10 +486,3 @@ def test_ogr_gpx_cleanup():
     
 
 
-if __name__ == '__main__':
-
-    gdaltest.setup_run('ogr_gpx')
-
-    gdaltest.run_tests(gdaltest_list)
-
-    sys.exit(gdaltest.summarize())
diff --git a/autotest/ogr/ogr_grass.py b/autotest/ogr/ogr_grass.py
index 6011fdbaa31d..474e74a41b82 100755
--- a/autotest/ogr/ogr_grass.py
+++ b/autotest/ogr/ogr_grass.py
@@ -71,10 +71,3 @@ def test_ogr_grass_2():
 
 
 
-if __name__ == '__main__':
-
-    gdaltest.setup_run('GRASS')
-
-    gdaltest.run_tests(gdaltest_list)
-
-    sys.exit(gdaltest.summarize())
diff --git a/autotest/ogr/ogr_gtm.py b/autotest/ogr/ogr_gtm.py
index b464f1a2c23e..5523730b1389 100755
--- a/autotest/ogr/ogr_gtm.py
+++ b/autotest/ogr/ogr_gtm.py
@@ -341,10 +341,3 @@ def test_ogr_gtm_cleanup():
 
 
 
-if __name__ == '__main__':
-
-    gdaltest.setup_run('ogr_gtm')
-
-    gdaltest.run_tests(gdaltest_list)
-
-    sys.exit(gdaltest.summarize())
diff --git a/autotest/ogr/ogr_htf.py b/autotest/ogr/ogr_htf.py
index bb2d2c63c5f0..3aaa23011794 100755
--- a/autotest/ogr/ogr_htf.py
+++ b/autotest/ogr/ogr_htf.py
@@ -102,10 +102,3 @@ def test_ogr_htf_2():
 
 
 
-if __name__ == '__main__':
-
-    gdaltest.setup_run('ogr_htf')
-
-    gdaltest.run_tests(gdaltest_list)
-
-    sys.exit(gdaltest.summarize())
diff --git a/autotest/ogr/ogr_idrisi.py b/autotest/ogr/ogr_idrisi.py
index 577160256fbc..1decf066e949 100755
--- a/autotest/ogr/ogr_idrisi.py
+++ b/autotest/ogr/ogr_idrisi.py
@@ -199,10 +199,3 @@ def test_ogr_idrisi_3():
 
 
 
-if __name__ == '__main__':
-
-    gdaltest.setup_run('ogr_idrisi')
-
-    gdaltest.run_tests(gdaltest_list)
-
-    sys.exit(gdaltest.summarize())
diff --git a/autotest/ogr/ogr_ili.py b/autotest/ogr/ogr_ili.py
index 0d88c9d5d88a..eccb55b963d9 100755
--- a/autotest/ogr/ogr_ili.py
+++ b/autotest/ogr/ogr_ili.py
@@ -1266,10 +1266,3 @@ def test_ogr_interlis_cleanup():
 
 
 
-if __name__ == '__main__':
-
-    gdaltest.setup_run('ogr_ili')
-
-    gdaltest.run_tests(gdaltest_list)
-
-    sys.exit(gdaltest.summarize())
diff --git a/autotest/ogr/ogr_index_test.py b/autotest/ogr/ogr_index_test.py
index cf32441a50f7..f37869b8b96e 100755
--- a/autotest/ogr/ogr_index_test.py
+++ b/autotest/ogr/ogr_index_test.py
@@ -445,10 +445,3 @@ def test_ogr_index_cleanup():
 
 
 
-if __name__ == '__main__':
-
-    gdaltest.setup_run('ogr_index_test')
-
-    gdaltest.run_tests(gdaltest_list)
-
-    sys.exit(gdaltest.summarize())
diff --git a/autotest/ogr/ogr_ingres.py b/autotest/ogr/ogr_ingres.py
index 030a6d3d7e07..ad0f3efd87ee 100755
--- a/autotest/ogr/ogr_ingres.py
+++ b/autotest/ogr/ogr_ingres.py
@@ -294,10 +294,3 @@ def test_ogr_ingres_cleanup():
 
 
 
-if __name__ == '__main__':
-
-    gdaltest.setup_run('ogr_ingres')
-
-    gdaltest.run_tests(gdaltest_list)
-
-    sys.exit(gdaltest.summarize())
diff --git a/autotest/ogr/ogr_jml.py b/autotest/ogr/ogr_jml.py
index 96ef059230e4..cb0334b4982f 100755
--- a/autotest/ogr/ogr_jml.py
+++ b/autotest/ogr/ogr_jml.py
@@ -613,10 +613,3 @@ def test_ogr_jml_cleanup():
 
 
 
-if __name__ == '__main__':
-
-    gdaltest.setup_run('ogr_jml')
-
-    gdaltest.run_tests(gdaltest_list)
-
-    sys.exit(gdaltest.summarize())
diff --git a/autotest/ogr/ogr_join_test.py b/autotest/ogr/ogr_join_test.py
index d95f6cf5d892..d07b3c00aa5d 100755
--- a/autotest/ogr/ogr_join_test.py
+++ b/autotest/ogr/ogr_join_test.py
@@ -504,10 +504,3 @@ def test_ogr_join_cleanup():
 
 
 
-if __name__ == '__main__':
-
-    gdaltest.setup_run('ogr_join_test')
-
-    gdaltest.run_tests(gdaltest_list)
-
-    sys.exit(gdaltest.summarize())
diff --git a/autotest/ogr/ogr_kml.py b/autotest/ogr/ogr_kml.py
index 3446fa200151..105b1d49109b 100755
--- a/autotest/ogr/ogr_kml.py
+++ b/autotest/ogr/ogr_kml.py
@@ -766,10 +766,3 @@ def test_ogr_kml_read_placemark_in_root_and_subfolder():
 
 
 
-if __name__ == '__main__':
-
-    gdaltest.setup_run('ogr_kml')
-
-    gdaltest.run_tests(gdaltest_list)
-
-    sys.exit(gdaltest.summarize())
diff --git a/autotest/ogr/ogr_layer_algebra.py b/autotest/ogr/ogr_layer_algebra.py
index bb03ede13c96..00e3769462f3 100755
--- a/autotest/ogr/ogr_layer_algebra.py
+++ b/autotest/ogr/ogr_layer_algebra.py
@@ -593,10 +593,3 @@ def test_algebra_cleanup():
 
 
 
-if __name__ == '__main__':
-
-    gdaltest.setup_run('algebra')
-
-    gdaltest.run_tests(gdaltest_list)
-
-    sys.exit(gdaltest.summarize())
diff --git a/autotest/ogr/ogr_libkml.py b/autotest/ogr/ogr_libkml.py
index 5bb5af3b8c68..c742205d1f2d 100755
--- a/autotest/ogr/ogr_libkml.py
+++ b/autotest/ogr/ogr_libkml.py
@@ -1946,10 +1946,3 @@ def test_ogr_libkml_cleanup():
 
 
 
-if __name__ == '__main__':
-
-    gdaltest.setup_run('ogr_libkml')
-
-    gdaltest.run_tests(gdaltest_list)
-
-    sys.exit(gdaltest.summarize())
diff --git a/autotest/ogr/ogr_mem.py b/autotest/ogr/ogr_mem.py
index 9df85101bf01..422cb31543a8 100755
--- a/autotest/ogr/ogr_mem.py
+++ b/autotest/ogr/ogr_mem.py
@@ -649,10 +649,3 @@ def test_ogr_mem_cleanup():
 
 
 
-if __name__ == '__main__':
-
-    gdaltest.setup_run('ogr_mem')
-
-    gdaltest.run_tests(gdaltest_list)
-
-    sys.exit(gdaltest.summarize())
diff --git a/autotest/ogr/ogr_mitab.py b/autotest/ogr/ogr_mitab.py
index 7b7e1ece7778..d49d216a8dce 100755
--- a/autotest/ogr/ogr_mitab.py
+++ b/autotest/ogr/ogr_mitab.py
@@ -2309,10 +2309,3 @@ def test_ogr_mitab_cleanup():
 
 
 
-if __name__ == '__main__':
-
-    gdaltest.setup_run('ogr_mitab')
-
-    gdaltest.run_tests(gdaltest_list)
-
-    sys.exit(gdaltest.summarize())
diff --git a/autotest/ogr/ogr_mongodb.py b/autotest/ogr/ogr_mongodb.py
index 42d65980e542..848dd44e9c8f 100755
--- a/autotest/ogr/ogr_mongodb.py
+++ b/autotest/ogr/ogr_mongodb.py
@@ -810,13 +810,3 @@ def test_ogr_mongodb_cleanup():
 
 
 
-if __name__ == '__main__':
-
-    import locale
-    locale.setlocale(locale.LC_ALL, '')
-
-    gdaltest.setup_run('ogr_mongodb')
-
-    gdaltest.run_tests(gdaltest_list)
-
-    sys.exit(gdaltest.summarize())
diff --git a/autotest/ogr/ogr_mssqlspatial.py b/autotest/ogr/ogr_mssqlspatial.py
index a7e70988d916..24764df76e8d 100755
--- a/autotest/ogr/ogr_mssqlspatial.py
+++ b/autotest/ogr/ogr_mssqlspatial.py
@@ -334,10 +334,3 @@ def test_ogr_mssqlspatial_cleanup():
 
 
 
-if __name__ == '__main__':
-
-    gdaltest.setup_run('ogr_mssqlspatial')
-
-    gdaltest.run_tests(gdaltest_list)
-
-    sys.exit(gdaltest.summarize())
diff --git a/autotest/ogr/ogr_mvt.py b/autotest/ogr/ogr_mvt.py
index 3b6133c19c76..1bc90437687f 100644
--- a/autotest/ogr/ogr_mvt.py
+++ b/autotest/ogr/ogr_mvt.py
@@ -1549,10 +1549,3 @@ def test_ogr_mvt_write_reuse_temp_db():
 
 # gdaltest_list = [ ogr_mvt_http_start, ogr_mvt_http, ogr_mvt_http_stop ]
 
-if __name__ == '__main__':
-
-    gdaltest.setup_run('ogr_mvt')
-
-    gdaltest.run_tests(gdaltest_list)
-
-    sys.exit(gdaltest.summarize())
diff --git a/autotest/ogr/ogr_mysql.py b/autotest/ogr/ogr_mysql.py
index 10c1112a8bd1..10e0371a1689 100755
--- a/autotest/ogr/ogr_mysql.py
+++ b/autotest/ogr/ogr_mysql.py
@@ -899,10 +899,3 @@ def test_ogr_mysql_cleanup():
 
 
 
-if __name__ == '__main__':
-
-    gdaltest.setup_run('ogr_mysql')
-
-    gdaltest.run_tests(gdaltest_list)
-
-    sys.exit(gdaltest.summarize())
diff --git a/autotest/ogr/ogr_nas.py b/autotest/ogr/ogr_nas.py
index d7b5ace02f13..a1cc3579f541 100755
--- a/autotest/ogr/ogr_nas.py
+++ b/autotest/ogr/ogr_nas.py
@@ -281,10 +281,3 @@ def test_ogr_nas_5():
     
 
 
-if __name__ == '__main__':
-
-    gdaltest.setup_run('ogr_nas')
-
-    gdaltest.run_tests(gdaltest_list)
-
-    sys.exit(gdaltest.summarize())
diff --git a/autotest/ogr/ogr_ntf.py b/autotest/ogr/ogr_ntf.py
index d6d1756b7f18..0b4575c7d47a 100755
--- a/autotest/ogr/ogr_ntf.py
+++ b/autotest/ogr/ogr_ntf.py
@@ -173,10 +173,3 @@ def test_ogr_ntf_2():
 
 
 
-if __name__ == '__main__':
-
-    gdaltest.setup_run('ogr_ntf')
-
-    gdaltest.run_tests(gdaltest_list)
-
-    sys.exit(gdaltest.summarize())
diff --git a/autotest/ogr/ogr_oci.py b/autotest/ogr/ogr_oci.py
index 88ff461c1fb3..30e171c8f849 100755
--- a/autotest/ogr/ogr_oci.py
+++ b/autotest/ogr/ogr_oci.py
@@ -982,15 +982,3 @@ def test_ogr_oci_cleanup():
 
 
 
-if __name__ == '__main__':
-
-    if 'OCI_DSNAME' not in os.environ:
-        print('Enter ORACLE DataSource (e.g. OCI:scott/tiger):')
-        oci_dsname = sys.stdin.readline().strip()
-        os.environ['OCI_DSNAME'] = oci_dsname
-
-    gdaltest.setup_run('ogr_oci')
-
-    gdaltest.run_tests(gdaltest_list)
-
-    sys.exit(gdaltest.summarize())
diff --git a/autotest/ogr/ogr_odbc.py b/autotest/ogr/ogr_odbc.py
index 011e41bf222c..e0d006c2c3bb 100755
--- a/autotest/ogr/ogr_odbc.py
+++ b/autotest/ogr/ogr_odbc.py
@@ -155,10 +155,3 @@ def test_ogr_odbc_cleanup():
 
 
 
-if __name__ == '__main__':
-
-    gdaltest.setup_run('ogr_odbc')
-
-    gdaltest.run_tests(gdaltest_list)
-
-    sys.exit(gdaltest.summarize())
diff --git a/autotest/ogr/ogr_ods.py b/autotest/ogr/ogr_ods.py
index 8a29d972a8c7..16cc568c7d39 100755
--- a/autotest/ogr/ogr_ods.py
+++ b/autotest/ogr/ogr_ods.py
@@ -457,10 +457,3 @@ def test_ogr_ods_boolean():
 
 
 
-if __name__ == '__main__':
-
-    gdaltest.setup_run('ogr_ods')
-
-    gdaltest.run_tests(gdaltest_list)
-
-    sys.exit(gdaltest.summarize())
diff --git a/autotest/ogr/ogr_ogdi.py b/autotest/ogr/ogr_ogdi.py
index ddce9fa88e03..92f883faf941 100755
--- a/autotest/ogr/ogr_ogdi.py
+++ b/autotest/ogr/ogr_ogdi.py
@@ -225,10 +225,3 @@ def test_ogr_ogdi_cleanup():
 
 
 
-if __name__ == '__main__':
-
-    gdaltest.setup_run('ogr_ogdi')
-
-    gdaltest.run_tests(gdaltest_list)
-
-    sys.exit(gdaltest.summarize())
diff --git a/autotest/ogr/ogr_openair.py b/autotest/ogr/ogr_openair.py
index fb474b44d560..f7f6ebba1c4b 100755
--- a/autotest/ogr/ogr_openair.py
+++ b/autotest/ogr/ogr_openair.py
@@ -73,10 +73,3 @@ def test_ogr_openair_1():
 
 
 
-if __name__ == '__main__':
-
-    gdaltest.setup_run('ogr_openair')
-
-    gdaltest.run_tests(gdaltest_list)
-
-    sys.exit(gdaltest.summarize())
diff --git a/autotest/ogr/ogr_openfilegdb.py b/autotest/ogr/ogr_openfilegdb.py
index 0b8356c129ed..cf943e773053 100755
--- a/autotest/ogr/ogr_openfilegdb.py
+++ b/autotest/ogr/ogr_openfilegdb.py
@@ -1342,10 +1342,3 @@ def test_ogr_openfilegdb_cleanup():
     
 
 
-if __name__ == '__main__':
-
-    gdaltest.setup_run('ogr_openfilegdb')
-
-    gdaltest.run_tests(gdaltest_list)
-
-    sys.exit(gdaltest.summarize())
diff --git a/autotest/ogr/ogr_osm.py b/autotest/ogr/ogr_osm.py
index f945127f86d9..4e4c63dfb4eb 100755
--- a/autotest/ogr/ogr_osm.py
+++ b/autotest/ogr/ogr_osm.py
@@ -834,10 +834,3 @@ def test_ogr_osm_18():
 
 
 
-if __name__ == '__main__':
-
-    gdaltest.setup_run('ogr_osm')
-
-    gdaltest.run_tests(gdaltest_list)
-
-    sys.exit(gdaltest.summarize())
diff --git a/autotest/ogr/ogr_pcidsk.py b/autotest/ogr/ogr_pcidsk.py
index 5ed79c2b604b..3a9f18add3b5 100755
--- a/autotest/ogr/ogr_pcidsk.py
+++ b/autotest/ogr/ogr_pcidsk.py
@@ -323,10 +323,3 @@ def test_ogr_pcidsk_cleanup():
 
 
 
-if __name__ == '__main__':
-
-    gdaltest.setup_run('ogr_pcidsk')
-
-    gdaltest.run_tests(gdaltest_list)
-
-    sys.exit(gdaltest.summarize())
diff --git a/autotest/ogr/ogr_pdf.py b/autotest/ogr/ogr_pdf.py
index 3092edb0448a..1f49fe59f3fa 100755
--- a/autotest/ogr/ogr_pdf.py
+++ b/autotest/ogr/ogr_pdf.py
@@ -368,10 +368,3 @@ def test_ogr_pdf_cleanup():
 
 
 
-if __name__ == '__main__':
-
-    gdaltest.setup_run('ogr_pdf')
-
-    gdaltest.run_tests(gdaltest_list)
-
-    sys.exit(gdaltest.summarize())
diff --git a/autotest/ogr/ogr_pds.py b/autotest/ogr/ogr_pds.py
index 5497c8144de7..b8b519bcd542 100755
--- a/autotest/ogr/ogr_pds.py
+++ b/autotest/ogr/ogr_pds.py
@@ -84,10 +84,3 @@ def test_ogr_pds_2():
     
 
 
-if __name__ == '__main__':
-
-    gdaltest.setup_run('ogr_pds')
-
-    gdaltest.run_tests(gdaltest_list)
-
-    sys.exit(gdaltest.summarize())
diff --git a/autotest/ogr/ogr_pg.py b/autotest/ogr/ogr_pg.py
index 03405fa378ee..d4aad51cf33c 100755
--- a/autotest/ogr/ogr_pg.py
+++ b/autotest/ogr/ogr_pg.py
@@ -4607,10 +4607,3 @@ def test_ogr_pg_cleanup(with_and_without_postgis):
 
 
 
-if __name__ == '__main__':
-
-    gdaltest.setup_run('ogr_pg')
-
-    gdaltest.run_tests(gdaltest_list)
-
-    sys.exit(gdaltest.summarize())
diff --git a/autotest/ogr/ogr_pgdump.py b/autotest/ogr/ogr_pgdump.py
index 01f8c9539fa8..55fe1ed0d5df 100755
--- a/autotest/ogr/ogr_pgdump.py
+++ b/autotest/ogr/ogr_pgdump.py
@@ -926,10 +926,3 @@ def test_ogr_pgdump_cleanup():
 
 
 
-if __name__ == '__main__':
-
-    gdaltest.setup_run('ogr_pgdump')
-
-    gdaltest.run_tests(gdaltest_list)
-
-    sys.exit(gdaltest.summarize())
diff --git a/autotest/ogr/ogr_pgeo.py b/autotest/ogr/ogr_pgeo.py
index 4210e1ba5928..7bd827f910a3 100755
--- a/autotest/ogr/ogr_pgeo.py
+++ b/autotest/ogr/ogr_pgeo.py
@@ -272,10 +272,3 @@ def test_ogr_pgeo_main():
 
 
 
-if __name__ == '__main__':
-
-    gdaltest.setup_run('ogr_pgeo')
-
-    gdaltest.run_tests(gdaltest_list)
-
-    sys.exit(gdaltest.summarize())
diff --git a/autotest/ogr/ogr_plscenes.py b/autotest/ogr/ogr_plscenes.py
index dda3aba64416..c2b4626e84e4 100755
--- a/autotest/ogr/ogr_plscenes.py
+++ b/autotest/ogr/ogr_plscenes.py
@@ -707,10 +707,3 @@ def test_ogr_plscenes_data_v1_live():
 
 
 
-if __name__ == '__main__':
-
-    gdaltest.setup_run('ogr_plscenes')
-
-    gdaltest.run_tests(gdaltest_list)
-
-    sys.exit(gdaltest.summarize())
diff --git a/autotest/ogr/ogr_rec.py b/autotest/ogr/ogr_rec.py
index 78f91d01162a..a3a17789d446 100755
--- a/autotest/ogr/ogr_rec.py
+++ b/autotest/ogr/ogr_rec.py
@@ -50,10 +50,3 @@ def test_ogr_rec_1():
 
 
 
-if __name__ == '__main__':
-
-    gdaltest.setup_run('ogr_rec')
-
-    gdaltest.run_tests(gdaltest_list)
-
-    sys.exit(gdaltest.summarize())
diff --git a/autotest/ogr/ogr_refcount.py b/autotest/ogr/ogr_refcount.py
index 5469f8b17116..8f1aa9decb4b 100755
--- a/autotest/ogr/ogr_refcount.py
+++ b/autotest/ogr/ogr_refcount.py
@@ -117,10 +117,3 @@ def test_ogr_refcount_cleanup():
 
 
 
-if __name__ == '__main__':
-
-    gdaltest.setup_run('ogr_refcount')
-
-    gdaltest.run_tests(gdaltest_list)
-
-    sys.exit(gdaltest.summarize())
diff --git a/autotest/ogr/ogr_rfc30.py b/autotest/ogr/ogr_rfc30.py
index 23b70e18d2f5..026120ea56db 100755
--- a/autotest/ogr/ogr_rfc30.py
+++ b/autotest/ogr/ogr_rfc30.py
@@ -83,10 +83,3 @@ def test_ogr_rfc30_1_bis():
 
 
 
-if __name__ == '__main__':
-
-    gdaltest.setup_run('ogr_rfc30')
-
-    gdaltest.run_tests(gdaltest_list)
-
-    sys.exit(gdaltest.summarize())
diff --git a/autotest/ogr/ogr_rfc35_mem.py b/autotest/ogr/ogr_rfc35_mem.py
index ac8a55726beb..6701d566f8a2 100755
--- a/autotest/ogr/ogr_rfc35_mem.py
+++ b/autotest/ogr/ogr_rfc35_mem.py
@@ -361,10 +361,3 @@ def test_ogr_rfc35_mem_cleanup():
 
 
 
-if __name__ == '__main__':
-
-    gdaltest.setup_run('ogr_rfc35_mem')
-
-    gdaltest.run_tests(gdaltest_list)
-
-    sys.exit(gdaltest.summarize())
diff --git a/autotest/ogr/ogr_rfc35_mitab.py b/autotest/ogr/ogr_rfc35_mitab.py
index bfc93677ba1d..046424b8a3c8 100755
--- a/autotest/ogr/ogr_rfc35_mitab.py
+++ b/autotest/ogr/ogr_rfc35_mitab.py
@@ -571,10 +571,3 @@ def test_ogr_rfc35_mitab_cleanup():
 
 
 
-if __name__ == '__main__':
-
-    gdaltest.setup_run('ogr_rfc35_mitab')
-
-    gdaltest.run_tests(gdaltest_list)
-
-    sys.exit(gdaltest.summarize())
diff --git a/autotest/ogr/ogr_rfc35_shape.py b/autotest/ogr/ogr_rfc35_shape.py
index 6324ed5be478..b2e1dfa4e2d6 100755
--- a/autotest/ogr/ogr_rfc35_shape.py
+++ b/autotest/ogr/ogr_rfc35_shape.py
@@ -461,10 +461,3 @@ def test_ogr_rfc35_shape_cleanup():
 
 
 
-if __name__ == '__main__':
-
-    gdaltest.setup_run('ogr_rfc35_shape')
-
-    gdaltest.run_tests(gdaltest_list)
-
-    sys.exit(gdaltest.summarize())
diff --git a/autotest/ogr/ogr_rfc35_sqlite.py b/autotest/ogr/ogr_rfc35_sqlite.py
index 221f2a31b285..29f478b41dc4 100755
--- a/autotest/ogr/ogr_rfc35_sqlite.py
+++ b/autotest/ogr/ogr_rfc35_sqlite.py
@@ -392,10 +392,3 @@ def test_ogr_rfc35_sqlite_cleanup():
 
 
 
-if __name__ == '__main__':
-
-    gdaltest.setup_run('ogr_rfc35_sqlite')
-
-    gdaltest.run_tests(gdaltest_list)
-
-    sys.exit(gdaltest.summarize())
diff --git a/autotest/ogr/ogr_rfc41.py b/autotest/ogr/ogr_rfc41.py
index 2cdff66f2928..56f48f9fea59 100755
--- a/autotest/ogr/ogr_rfc41.py
+++ b/autotest/ogr/ogr_rfc41.py
@@ -768,10 +768,3 @@ def test_ogr_rfc41_8():
 
 
 
-if __name__ == '__main__':
-
-    gdaltest.setup_run('ogr_rfc41')
-
-    gdaltest.run_tests(gdaltest_list)
-
-    sys.exit(gdaltest.summarize())
diff --git a/autotest/ogr/ogr_s57.py b/autotest/ogr/ogr_s57.py
index 0e6ae9bf9e17..d389d92ecd76 100755
--- a/autotest/ogr/ogr_s57.py
+++ b/autotest/ogr/ogr_s57.py
@@ -402,10 +402,3 @@ def test_ogr_s57_cleanup():
 
 
 
-if __name__ == '__main__':
-
-    gdaltest.setup_run('ogr_s57')
-
-    gdaltest.run_tests(gdaltest_list)
-
-    sys.exit(gdaltest.summarize())
diff --git a/autotest/ogr/ogr_sde.py b/autotest/ogr/ogr_sde.py
index 1252ec856b31..f05bcae5d871 100755
--- a/autotest/ogr/ogr_sde.py
+++ b/autotest/ogr/ogr_sde.py
@@ -320,10 +320,3 @@ def test_ogr_sde_cleanup():
 
 
 
-if __name__ == '__main__':
-
-    gdaltest.setup_run('ogr_sde')
-
-    gdaltest.run_tests(gdaltest_list)
-
-    sys.exit(gdaltest.summarize())
diff --git a/autotest/ogr/ogr_sdts.py b/autotest/ogr/ogr_sdts.py
index c6e3e46d6c20..ffa5f360fbdd 100755
--- a/autotest/ogr/ogr_sdts.py
+++ b/autotest/ogr/ogr_sdts.py
@@ -75,10 +75,3 @@ def test_ogr_sdts_1():
 #
 
 
-if __name__ == '__main__':
-
-    gdaltest.setup_run('ogr_sdts')
-
-    gdaltest.run_tests(gdaltest_list)
-
-    sys.exit(gdaltest.summarize())
diff --git a/autotest/ogr/ogr_segukooa.py b/autotest/ogr/ogr_segukooa.py
index 39d56057fe37..f0e70b73a0da 100755
--- a/autotest/ogr/ogr_segukooa.py
+++ b/autotest/ogr/ogr_segukooa.py
@@ -188,10 +188,3 @@ def test_ogr_ukooa_lines():
 
 
 
-if __name__ == '__main__':
-
-    gdaltest.setup_run('ogr_segukooa')
-
-    gdaltest.run_tests(gdaltest_list)
-
-    sys.exit(gdaltest.summarize())
diff --git a/autotest/ogr/ogr_segy.py b/autotest/ogr/ogr_segy.py
index 223374b3e16e..0b1cd0fd1deb 100755
--- a/autotest/ogr/ogr_segy.py
+++ b/autotest/ogr/ogr_segy.py
@@ -98,10 +98,3 @@ def test_ogr_segy_2():
 
 
 
-if __name__ == '__main__':
-
-    gdaltest.setup_run('ogr_segy')
-
-    gdaltest.run_tests(gdaltest_list)
-
-    sys.exit(gdaltest.summarize())
diff --git a/autotest/ogr/ogr_selafin.py b/autotest/ogr/ogr_selafin.py
index caf10bfe5865..c602da43c670 100755
--- a/autotest/ogr/ogr_selafin.py
+++ b/autotest/ogr/ogr_selafin.py
@@ -184,13 +184,3 @@ def test_ogr_selafin_cleanup():
 
 
 
-if __name__ == '__main__':
-    gdal.PushErrorHandler('CPLQuietErrorHandler')
-    ogrtest.have_geos()
-    gdal.PopErrorHandler()
-
-    gdaltest.setup_run('ogr_selafin')
-
-    gdaltest.run_tests(gdaltest_list)
-
-    sys.exit(gdaltest.summarize())
diff --git a/autotest/ogr/ogr_shape.py b/autotest/ogr/ogr_shape.py
index e848fb6b5731..eaf293411261 100755
--- a/autotest/ogr/ogr_shape.py
+++ b/autotest/ogr/ogr_shape.py
@@ -4573,10 +4573,3 @@ def test_ogr_shape_cleanup():
 
 # gdaltest_list = [ ogr_shape_107 ]
 
-if __name__ == '__main__':
-
-    gdaltest.setup_run('ogr_shape')
-
-    gdaltest.run_tests(gdaltest_list)
-
-    sys.exit(gdaltest.summarize())
diff --git a/autotest/ogr/ogr_shape_qix.py b/autotest/ogr/ogr_shape_qix.py
index 20895c7963c7..895c343289c4 100755
--- a/autotest/ogr/ogr_shape_qix.py
+++ b/autotest/ogr/ogr_shape_qix.py
@@ -262,10 +262,3 @@ def test_ogr_shape_qix_4():
 
 
 
-if __name__ == '__main__':
-
-    gdaltest.setup_run('ogr_shape_qix')
-
-    gdaltest.run_tests(gdaltest_list)
-
-    sys.exit(gdaltest.summarize())
diff --git a/autotest/ogr/ogr_shape_sbn.py b/autotest/ogr/ogr_shape_sbn.py
index 2aaea32942ad..6c5475e34c9b 100755
--- a/autotest/ogr/ogr_shape_sbn.py
+++ b/autotest/ogr/ogr_shape_sbn.py
@@ -137,10 +137,3 @@ def test_ogr_shape_sbn_2():
 
 
 
-if __name__ == '__main__':
-
-    gdaltest.setup_run('ogr_shape_sbn')
-
-    gdaltest.run_tests(gdaltest_list)
-
-    sys.exit(gdaltest.summarize())
diff --git a/autotest/ogr/ogr_sosi.py b/autotest/ogr/ogr_sosi.py
index cc1f9401e8ef..15c3d867cffc 100755
--- a/autotest/ogr/ogr_sosi.py
+++ b/autotest/ogr/ogr_sosi.py
@@ -57,10 +57,3 @@ def test_ogr_sosi_1():
 
 
 
-if __name__ == '__main__':
-
-    gdaltest.setup_run('ogr_sosi')
-
-    gdaltest.run_tests(gdaltest_list)
-
-    sys.exit(gdaltest.summarize())
diff --git a/autotest/ogr/ogr_sql_rfc28.py b/autotest/ogr/ogr_sql_rfc28.py
index d527d5a07ea3..bc238677f266 100755
--- a/autotest/ogr/ogr_sql_rfc28.py
+++ b/autotest/ogr/ogr_sql_rfc28.py
@@ -1345,10 +1345,3 @@ def test_ogr_rfc28_cleanup():
 
 
 
-if __name__ == '__main__':
-
-    gdaltest.setup_run('ogr_sql_rfc28')
-
-    gdaltest.run_tests(gdaltest_list)
-
-    sys.exit(gdaltest.summarize())
diff --git a/autotest/ogr/ogr_sql_sqlite.py b/autotest/ogr/ogr_sql_sqlite.py
index 199753af17f3..b537792c6193 100755
--- a/autotest/ogr/ogr_sql_sqlite.py
+++ b/autotest/ogr/ogr_sql_sqlite.py
@@ -1901,10 +1901,3 @@ def test_ogr_sql_sqlite_31():
 
 
 
-if __name__ == '__main__':
-
-    gdaltest.setup_run('ogr_sql_sqlite')
-
-    gdaltest.run_tests(gdaltest_list)
-
-    sys.exit(gdaltest.summarize())
diff --git a/autotest/ogr/ogr_sql_test.py b/autotest/ogr/ogr_sql_test.py
index 0b63837b2187..035a35266615 100755
--- a/autotest/ogr/ogr_sql_test.py
+++ b/autotest/ogr/ogr_sql_test.py
@@ -1372,10 +1372,3 @@ def test_ogr_sql_cleanup():
 
 
 
-if __name__ == '__main__':
-
-    gdaltest.setup_run('ogr_sql_test')
-
-    gdaltest.run_tests(gdaltest_list)
-
-    sys.exit(gdaltest.summarize())
diff --git a/autotest/ogr/ogr_sqlite.py b/autotest/ogr/ogr_sqlite.py
index 0301f7b6af79..9a1fc2de110f 100755
--- a/autotest/ogr/ogr_sqlite.py
+++ b/autotest/ogr/ogr_sqlite.py
@@ -3136,15 +3136,3 @@ def test_ogr_sqlite_without_spatialite():
     test_ogr_sqlite_45,
     test_ogr_sqlite_cleanup,
 ]
-
-if __name__ == '__main__':
-
-    if len(sys.argv) >= 2 and sys.argv[1] == '-without_spatialite':
-        run_without_spatialite = False
-        gdal.SetConfigOption('SPATIALITE_LOAD', 'NO')
-
-    gdaltest.setup_run('ogr_sqlite')
-
-    gdaltest.run_tests(gdaltest_list)
-
-    sys.exit(gdaltest.summarize())
diff --git a/autotest/ogr/ogr_style.py b/autotest/ogr/ogr_style.py
index d60958cf8dc0..2b83b58903f1 100755
--- a/autotest/ogr/ogr_style.py
+++ b/autotest/ogr/ogr_style.py
@@ -107,10 +107,3 @@ def test_ogr_style_styletable():
 
 
 
-if __name__ == '__main__':
-
-    gdaltest.setup_run('ogr_style')
-
-    gdaltest.run_tests(gdaltest_list)
-
-    sys.exit(gdaltest.summarize())
diff --git a/autotest/ogr/ogr_sua.py b/autotest/ogr/ogr_sua.py
index 8d0d3dfc20fd..779e9522082b 100755
--- a/autotest/ogr/ogr_sua.py
+++ b/autotest/ogr/ogr_sua.py
@@ -66,10 +66,3 @@ def test_ogr_sua_1():
 
 
 
-if __name__ == '__main__':
-
-    gdaltest.setup_run('ogr_sua')
-
-    gdaltest.run_tests(gdaltest_list)
-
-    sys.exit(gdaltest.summarize())
diff --git a/autotest/ogr/ogr_svg.py b/autotest/ogr/ogr_svg.py
index 9c2238a86bf5..24943f10bfb7 100755
--- a/autotest/ogr/ogr_svg.py
+++ b/autotest/ogr/ogr_svg.py
@@ -107,10 +107,3 @@ def test_ogr_svg_cleanup():
 
 
 
-if __name__ == '__main__':
-
-    gdaltest.setup_run('ogr_svg')
-
-    gdaltest.run_tests(gdaltest_list)
-
-    sys.exit(gdaltest.summarize())
diff --git a/autotest/ogr/ogr_sxf.py b/autotest/ogr/ogr_sxf.py
index d77da2f25cca..ae4f5d674955 100755
--- a/autotest/ogr/ogr_sxf.py
+++ b/autotest/ogr/ogr_sxf.py
@@ -75,10 +75,3 @@ def test_ogr_sxf_cleanup():
 
 
 
-if __name__ == '__main__':
-
-    gdaltest.setup_run('ogr_sxf')
-
-    gdaltest.run_tests(gdaltest_list)
-
-    sys.exit(gdaltest.summarize())
diff --git a/autotest/ogr/ogr_tiger.py b/autotest/ogr/ogr_tiger.py
index 190004327fde..84751ae4f0ab 100755
--- a/autotest/ogr/ogr_tiger.py
+++ b/autotest/ogr/ogr_tiger.py
@@ -225,10 +225,3 @@ def test_ogr_tiger_cleanup():
 
 
 
-if __name__ == '__main__':
-
-    gdaltest.setup_run('ogr_tiger')
-
-    gdaltest.run_tests(gdaltest_list)
-
-    sys.exit(gdaltest.summarize())
diff --git a/autotest/ogr/ogr_vdv.py b/autotest/ogr/ogr_vdv.py
index c75aebacb9e6..dc435b2a1349 100755
--- a/autotest/ogr/ogr_vdv.py
+++ b/autotest/ogr/ogr_vdv.py
@@ -527,10 +527,3 @@ def test_ogr_vdv_cleanup():
 
 
 
-if __name__ == '__main__':
-
-    gdaltest.setup_run('ogr_vdv')
-
-    gdaltest.run_tests(gdaltest_list)
-
-    sys.exit(gdaltest.summarize())
diff --git a/autotest/ogr/ogr_vfk.py b/autotest/ogr/ogr_vfk.py
index ba9b6fa0a033..2ea85f952945 100755
--- a/autotest/ogr/ogr_vfk.py
+++ b/autotest/ogr/ogr_vfk.py
@@ -341,9 +341,3 @@ def test_ogr_vfk_cleanup():
 
 
 
-if __name__ == '__main__':
-    gdaltest.setup_run('ogr_vfk')
-
-    gdaltest.run_tests(gdaltest_list)
-
-    sys.exit(gdaltest.summarize())
diff --git a/autotest/ogr/ogr_virtualogr.py b/autotest/ogr/ogr_virtualogr.py
index 09298c1f0c6a..35669d209ffc 100755
--- a/autotest/ogr/ogr_virtualogr.py
+++ b/autotest/ogr/ogr_virtualogr.py
@@ -306,10 +306,3 @@ def test_ogr_virtualogr_5():
 
 
 
-if __name__ == '__main__':
-
-    gdaltest.setup_run('ogr_virtualogr')
-
-    gdaltest.run_tests(gdaltest_list)
-
-    sys.exit(gdaltest.summarize())
diff --git a/autotest/ogr/ogr_vrt.py b/autotest/ogr/ogr_vrt.py
index 5f00623937d2..61223dc50ed5 100755
--- a/autotest/ogr/ogr_vrt.py
+++ b/autotest/ogr/ogr_vrt.py
@@ -3046,10 +3046,3 @@ def test_ogr_vrt_cleanup():
 
 
 
-if __name__ == '__main__':
-
-    gdaltest.setup_run('ogr_vrt')
-
-    gdaltest.run_tests(gdaltest_list)
-
-    sys.exit(gdaltest.summarize())
diff --git a/autotest/ogr/ogr_wasp.py b/autotest/ogr/ogr_wasp.py
index 43fd5cb5268f..52b5ce3c8d14 100755
--- a/autotest/ogr/ogr_wasp.py
+++ b/autotest/ogr/ogr_wasp.py
@@ -468,13 +468,3 @@ def test_ogr_wasp_cleanup():
 
 
 
-if __name__ == '__main__':
-    gdal.PushErrorHandler('CPLQuietErrorHandler')
-    ogrtest.have_geos()
-    gdal.PopErrorHandler()
-
-    gdaltest.setup_run('ogr_wasp')
-
-    gdaltest.run_tests(gdaltest_list)
-
-    sys.exit(gdaltest.summarize())
diff --git a/autotest/ogr/ogr_wfs.py b/autotest/ogr/ogr_wfs.py
index 0e07a77c755c..8e82b6da4977 100755
--- a/autotest/ogr/ogr_wfs.py
+++ b/autotest/ogr/ogr_wfs.py
@@ -4503,10 +4503,3 @@ def test_ogr_wfs_vsimem_cleanup(with_and_without_streaming):
     
 
 
-if __name__ == '__main__':
-
-    gdaltest.setup_run('ogr_wfs')
-
-    gdaltest.run_tests(gdaltest_list)
-
-    sys.exit(gdaltest.summarize())
diff --git a/autotest/ogr/ogr_wfs3.py b/autotest/ogr/ogr_wfs3.py
index 87edbf7365d9..97e82d8696a7 100755
--- a/autotest/ogr/ogr_wfs3.py
+++ b/autotest/ogr/ogr_wfs3.py
@@ -566,10 +566,3 @@ def test_ogr_wfs3_cleanup():
     
 
 
-if __name__ == '__main__':
-
-    gdaltest.setup_run('ogr_wfs3')
-
-    gdaltest.run_tests(gdaltest_list)
-
-    sys.exit(gdaltest.summarize())
diff --git a/autotest/ogr/ogr_wkbwkt_geom.py b/autotest/ogr/ogr_wkbwkt_geom.py
index d682be3ec5b5..efb4239c7630 100755
--- a/autotest/ogr/ogr_wkbwkt_geom.py
+++ b/autotest/ogr/ogr_wkbwkt_geom.py
@@ -617,10 +617,3 @@ def test_ogr_wkt_multipolygon_corrupted():
 
 
 
-if __name__ == '__main__':
-
-    gdaltest.setup_run('ogr_wkbwkt_geom')
-
-    gdaltest.run_tests(gdaltest_list)
-
-    sys.exit(gdaltest.summarize())
diff --git a/autotest/ogr/ogr_wktempty.py b/autotest/ogr/ogr_wktempty.py
index c25f1b775212..21c6cfe302c0 100755
--- a/autotest/ogr/ogr_wktempty.py
+++ b/autotest/ogr/ogr_wktempty.py
@@ -141,10 +141,3 @@ def test_ogr_wktempty_test_partial_empty_geoms():
 
 
 
-if __name__ == '__main__':
-
-    gdaltest.setup_run('ogr_wktempty')
-
-    gdaltest.run_tests(gdaltest_list)
-
-    sys.exit(gdaltest.summarize())
diff --git a/autotest/ogr/ogr_xls.py b/autotest/ogr/ogr_xls.py
index 4367c4fae559..09f0d94da33f 100755
--- a/autotest/ogr/ogr_xls.py
+++ b/autotest/ogr/ogr_xls.py
@@ -147,10 +147,3 @@ def test_ogr_xls_4():
 
 
 
-if __name__ == '__main__':
-
-    gdaltest.setup_run('ogr_xls')
-
-    gdaltest.run_tests(gdaltest_list)
-
-    sys.exit(gdaltest.summarize())
diff --git a/autotest/ogr/ogr_xlsx.py b/autotest/ogr/ogr_xlsx.py
index cd841f499816..3914557e6f8f 100755
--- a/autotest/ogr/ogr_xlsx.py
+++ b/autotest/ogr/ogr_xlsx.py
@@ -546,10 +546,3 @@ def test_ogr_xlsx_boolean():
 
 
 
-if __name__ == '__main__':
-
-    gdaltest.setup_run('ogr_xlsx')
-
-    gdaltest.run_tests(gdaltest_list)
-
-    sys.exit(gdaltest.summarize())
diff --git a/autotest/ogr/ogr_xplane.py b/autotest/ogr/ogr_xplane.py
index a3a04b68322a..2f0eb61db6a4 100755
--- a/autotest/ogr/ogr_xplane.py
+++ b/autotest/ogr/ogr_xplane.py
@@ -191,10 +191,3 @@ def test_ogr_xplane_fix_dat():
 
 
 
-if __name__ == '__main__':
-
-    gdaltest.setup_run('ogr_xplane')
-
-    gdaltest.run_tests(gdaltest_list)
-
-    sys.exit(gdaltest.summarize())
diff --git a/autotest/ogr/ograpispy.py b/autotest/ogr/ograpispy.py
index 118a72024048..f543785d36c8 100755
--- a/autotest/ogr/ograpispy.py
+++ b/autotest/ogr/ograpispy.py
@@ -143,10 +143,3 @@ def test_ograpispy_cleanup():
 
 
 
-if __name__ == '__main__':
-
-    gdaltest.setup_run('ograpispy')
-
-    gdaltest.run_tests(gdaltest_list)
-
-    sys.exit(gdaltest.summarize())
diff --git a/autotest/osr/osr_basic.py b/autotest/osr/osr_basic.py
index 3fff249c40ff..ca554ebd1d38 100755
--- a/autotest/osr/osr_basic.py
+++ b/autotest/osr/osr_basic.py
@@ -1231,10 +1231,3 @@ def test_osr_basic_setgeogcs():
 
 
 
-if __name__ == '__main__':
-
-    gdaltest.setup_run('osr_basic')
-
-    gdaltest.run_tests(gdaltest_list)
-
-    sys.exit(gdaltest.summarize())
diff --git a/autotest/osr/osr_compd.py b/autotest/osr/osr_compd.py
index 28fbcdc9a6b3..7049b4f95fc2 100755
--- a/autotest/osr/osr_compd.py
+++ b/autotest/osr/osr_compd.py
@@ -342,10 +342,3 @@ def test_osr_compd_8():
 
 
 
-if __name__ == '__main__':
-
-    gdaltest.setup_run('osr_compd')
-
-    gdaltest.run_tests(gdaltest_list)
-
-    sys.exit(gdaltest.summarize())
diff --git a/autotest/osr/osr_ct.py b/autotest/osr/osr_ct.py
index 65b57d734e47..0a1b567019d7 100755
--- a/autotest/osr/osr_ct.py
+++ b/autotest/osr/osr_ct.py
@@ -301,10 +301,3 @@ def test_osr_ct_cleanup():
 
 
 
-if __name__ == '__main__':
-
-    gdaltest.setup_run('osr_ct')
-
-    gdaltest.run_tests(gdaltest_list)
-
-    sys.exit(gdaltest.summarize())
diff --git a/autotest/osr/osr_epsg.py b/autotest/osr/osr_epsg.py
index aa5c3500f317..837a26827e57 100755
--- a/autotest/osr/osr_epsg.py
+++ b/autotest/osr/osr_epsg.py
@@ -370,10 +370,3 @@ def test_osr_epsg_geoccs_deprecated():
 
 
 
-if __name__ == '__main__':
-
-    gdaltest.setup_run('osr_epsg')
-
-    gdaltest.run_tests(gdaltest_list)
-
-    sys.exit(gdaltest.summarize())
diff --git a/autotest/osr/osr_erm.py b/autotest/osr/osr_erm.py
index 05659460d51e..07df4371ea74 100755
--- a/autotest/osr/osr_erm.py
+++ b/autotest/osr/osr_erm.py
@@ -66,10 +66,3 @@ def test_osr_erm_2():
 
 
 
-if __name__ == '__main__':
-
-    gdaltest.setup_run('osr_erm')
-
-    gdaltest.run_tests(gdaltest_list)
-
-    sys.exit(gdaltest.summarize())
diff --git a/autotest/osr/osr_esri.py b/autotest/osr/osr_esri.py
index e3d3770df56a..9f2b8f7eafa9 100755
--- a/autotest/osr/osr_esri.py
+++ b/autotest/osr/osr_esri.py
@@ -1455,12 +1455,3 @@ def test_osr_esri_33():
 
 
 
-if __name__ == '__main__':
-
-    gdaltest.setup_run('osr_esri')
-
-    # make sure GDAL_FIX_ESRI_WKT does not interfere with tests
-    gdal.SetConfigOption('GDAL_FIX_ESRI_WKT', 'NO')
-    gdaltest.run_tests(gdaltest_list)
-
-    sys.exit(gdaltest.summarize())
diff --git a/autotest/osr/osr_getprojectionmethods.py b/autotest/osr/osr_getprojectionmethods.py
index c155eb15822f..0465f0b71832 100755
--- a/autotest/osr/osr_getprojectionmethods.py
+++ b/autotest/osr/osr_getprojectionmethods.py
@@ -45,10 +45,3 @@ def test_osr_getprojectionmethods_1():
 
 
 
-if __name__ == '__main__':
-
-    gdaltest.setup_run('osr_getprojectionmethods')
-
-    gdaltest.run_tests(gdaltest_list)
-
-    sys.exit(gdaltest.summarize())
diff --git a/autotest/osr/osr_micoordsys.py b/autotest/osr/osr_micoordsys.py
index 9e6286afcfac..b27af193fcfb 100755
--- a/autotest/osr/osr_micoordsys.py
+++ b/autotest/osr/osr_micoordsys.py
@@ -107,10 +107,3 @@ def test_osr_micoordsys_3():
 
 
 
-if __name__ == '__main__':
-
-    gdaltest.setup_run('osr_micoordsys')
-
-    gdaltest.run_tests(gdaltest_list)
-
-    sys.exit(gdaltest.summarize())
diff --git a/autotest/osr/osr_ozi.py b/autotest/osr/osr_ozi.py
index b420bcdabf2f..655d20395034 100755
--- a/autotest/osr/osr_ozi.py
+++ b/autotest/osr/osr_ozi.py
@@ -94,10 +94,3 @@ def test_osr_ozi_3():
 
 
 
-if __name__ == '__main__':
-
-    gdaltest.setup_run('osr_ozi')
-
-    gdaltest.run_tests(gdaltest_list)
-
-    sys.exit(gdaltest.summarize())
diff --git a/autotest/osr/osr_pci.py b/autotest/osr/osr_pci.py
index a2a499b545cc..a4e586c8b99f 100755
--- a/autotest/osr/osr_pci.py
+++ b/autotest/osr/osr_pci.py
@@ -196,10 +196,3 @@ def test_osr_pci_7():
 
 
 
-if __name__ == '__main__':
-
-    gdaltest.setup_run('osr_pci')
-
-    gdaltest.run_tests(gdaltest_list)
-
-    sys.exit(gdaltest.summarize())
diff --git a/autotest/osr/osr_pm.py b/autotest/osr/osr_pm.py
index 9332e4b087e3..0c7c9a6ff911 100755
--- a/autotest/osr/osr_pm.py
+++ b/autotest/osr/osr_pm.py
@@ -86,10 +86,3 @@ def test_osr_pm_3():
 ###############################################################################
 
 
-if __name__ == '__main__':
-
-    gdaltest.setup_run('osr_pm')
-
-    gdaltest.run_tests(gdaltest_list)
-
-    sys.exit(gdaltest.summarize())
diff --git a/autotest/osr/osr_proj4.py b/autotest/osr/osr_proj4.py
index 7348b654b7e3..87d215eec924 100755
--- a/autotest/osr/osr_proj4.py
+++ b/autotest/osr/osr_proj4.py
@@ -925,15 +925,3 @@ def test_osr_proj4_error_cases_export_mercator():
 
 
 
-if __name__ == '__main__':
-
-    if len(sys.argv) == 2 and sys.argv[1] == "osr_proj4_28":
-        os.putenv('PROJ_LIB', '/i/dont_exist')
-        gdaltest.run_tests([test_osr_proj4_28])
-        sys.exit(0)
-
-    gdaltest.setup_run('osr_proj4')
-
-    gdaltest.run_tests(gdaltest_list)
-
-    sys.exit(gdaltest.summarize())
diff --git a/autotest/osr/osr_url.py b/autotest/osr/osr_url.py
index 333fc74cd42e..97532700cfe7 100755
--- a/autotest/osr/osr_url.py
+++ b/autotest/osr/osr_url.py
@@ -79,10 +79,3 @@ def test_osr_url_2():
 
 
 
-if __name__ == '__main__':
-
-    gdaltest.setup_run('osr_url')
-
-    gdaltest.run_tests(gdaltest_list)
-
-    sys.exit(gdaltest.summarize())
diff --git a/autotest/osr/osr_usgs.py b/autotest/osr/osr_usgs.py
index 06d251adbfd8..2385e18484e9 100755
--- a/autotest/osr/osr_usgs.py
+++ b/autotest/osr/osr_usgs.py
@@ -82,10 +82,3 @@ def test_osr_usgs_2():
 
 
 
-if __name__ == '__main__':
-
-    gdaltest.setup_run('osr_usgs')
-
-    gdaltest.run_tests(gdaltest_list)
-
-    sys.exit(gdaltest.summarize())
diff --git a/autotest/osr/osr_validate.py b/autotest/osr/osr_validate.py
index 832072e9148f..b3ccc7e2d6e2 100755
--- a/autotest/osr/osr_validate.py
+++ b/autotest/osr/osr_validate.py
@@ -251,10 +251,3 @@ def test_osr_validate_6():
 
 
 
-if __name__ == '__main__':
-
-    gdaltest.setup_run('osr_validate')
-
-    gdaltest.run_tests(gdaltest_list)
-
-    sys.exit(gdaltest.summarize())
diff --git a/autotest/osr/osr_xml.py b/autotest/osr/osr_xml.py
index 472368864fe3..3ca5109791da 100755
--- a/autotest/osr/osr_xml.py
+++ b/autotest/osr/osr_xml.py
@@ -204,10 +204,3 @@ def test_osr_xml_2():
 
 
 
-if __name__ == '__main__':
-
-    gdaltest.setup_run('osr_xml')
-
-    gdaltest.run_tests(gdaltest_list)
-
-    sys.exit(gdaltest.summarize())
diff --git a/autotest/pymod/webserver.py b/autotest/pymod/webserver.py
index 6af0022a7661..7daf4e52df16 100644
--- a/autotest/pymod/webserver.py
+++ b/autotest/pymod/webserver.py
@@ -458,5 +458,3 @@ def main():
     server.run_server(10)
 
 
-if __name__ == '__main__':
-    main()
diff --git a/autotest/pymod/xmlvalidate.py b/autotest/pymod/xmlvalidate.py
index 7c0f695cb228..c53f4b638855 100644
--- a/autotest/pymod/xmlvalidate.py
+++ b/autotest/pymod/xmlvalidate.py
@@ -473,70 +473,3 @@ def Usage():
 # Main
 
 
-if __name__ == '__main__':
-    argv = sys.argv[1:]
-    i = 0
-    filename = None
-    xsd_filename = None
-    ogc_schemas_location = None
-    inspire_schemas_location = None
-    application_schema_ns = 'http://mapserver.gis.umn.edu/mapserver'
-
-    if has_local_ogc_schemas('SCHEMAS_OPENGIS_NET'):
-        ogc_schemas_location = 'SCHEMAS_OPENGIS_NET'
-
-    if has_local_inspire_schemas('inspire_schemas'):
-        inspire_schemas_location = 'inspire_schemas'
-        # transform_inspire_abs_links_to_ref_links('inspire_schemas')
-
-    target_dir = '.'
-
-    while i < len(argv):
-        if argv[i] == "-target_dir":
-            i = i + 1
-            target_dir = argv[i]
-        elif argv[i] == "-download_ogc_schemas":
-            ret = download_ogc_schemas(target_dir=target_dir, force_download=True)
-            if i == len(argv) - 1:
-                if ret:
-                    sys.exit(0)
-                else:
-                    sys.exit(1)
-        elif argv[i] == "-download_inspire_schemas":
-            ret = download_inspire_schemas(target_dir=target_dir, force_download=True)
-            if i == len(argv) - 1:
-                if ret:
-                    sys.exit(0)
-                else:
-                    sys.exit(1)
-        elif argv[i] == "-schema":
-            i = i + 1
-            xsd_filename = argv[i]
-        elif argv[i] == "-ogc_schemas_location":
-            i = i + 1
-            ogc_schemas_location = argv[i]
-        elif argv[i] == "-inspire_schemas_location":
-            i = i + 1
-            inspire_schemas_location = argv[i]
-        elif argv[i] == "-app_schema_ns":
-            i = i + 1
-            application_schema_ns = argv[i]
-        elif argv[i][0] == '-':
-            print('Unhandled option : %s' % argv[i])
-            print('')
-            Usage()
-        else:
-            filename = argv[i]
-
-        i = i + 1
-
-    if filename is None:
-        Usage()
-
-    if validate(filename, xsd_filename=xsd_filename,
-                application_schema_ns=application_schema_ns,
-                ogc_schemas_location=ogc_schemas_location,
-                inspire_schemas_location=inspire_schemas_location):
-        sys.exit(0)
-    else:
-        sys.exit(1)
diff --git a/autotest/pyscripts/test_gdal2tiles.py b/autotest/pyscripts/test_gdal2tiles.py
index bd97bffde704..d66a7c95e8c8 100755
--- a/autotest/pyscripts/test_gdal2tiles.py
+++ b/autotest/pyscripts/test_gdal2tiles.py
@@ -317,8 +317,3 @@ def test_exclude_transparent_tiles():
 
 
 
-if __name__ == '__main__':
-
-    gdaltest.setup_run('test_gdal2tiles_py')
-    gdaltest.run_tests(gdaltest_list)
-    sys.exit(gdaltest.summarize())
diff --git a/autotest/pyscripts/test_gdal_calc.py b/autotest/pyscripts/test_gdal_calc.py
index 31f4fcc3e300..27d68d30aaa9 100755
--- a/autotest/pyscripts/test_gdal_calc.py
+++ b/autotest/pyscripts/test_gdal_calc.py
@@ -342,10 +342,3 @@ def test_gdal_calc_py_cleanup():
 
 
 
-if __name__ == '__main__':
-
-    gdaltest.setup_run('test_gdal_calc_py')
-
-    gdaltest.run_tests(gdaltest_list)
-
-    sys.exit(gdaltest.summarize())
diff --git a/autotest/pyscripts/test_gdal_edit.py b/autotest/pyscripts/test_gdal_edit.py
index 3ee0b2195985..06d7b099f47e 100755
--- a/autotest/pyscripts/test_gdal_edit.py
+++ b/autotest/pyscripts/test_gdal_edit.py
@@ -338,10 +338,3 @@ def test_gdal_edit_py_cleanup():
 
 
 
-if __name__ == '__main__':
-
-    gdaltest.setup_run('test_gdal_edit_py')
-
-    gdaltest.run_tests(gdaltest_list)
-
-    sys.exit(gdaltest.summarize())
diff --git a/autotest/pyscripts/test_gdal_fillnodata.py b/autotest/pyscripts/test_gdal_fillnodata.py
index 2b73cfea380c..0b617d6486f1 100755
--- a/autotest/pyscripts/test_gdal_fillnodata.py
+++ b/autotest/pyscripts/test_gdal_fillnodata.py
@@ -89,10 +89,3 @@ def test_gdal_fillnodata_cleanup():
 
 
 
-if __name__ == '__main__':
-
-    gdaltest.setup_run('test_gdal_fillnodata')
-
-    gdaltest.run_tests(gdaltest_list)
-
-    sys.exit(gdaltest.summarize())
diff --git a/autotest/pyscripts/test_gdal_ls_py.py b/autotest/pyscripts/test_gdal_ls_py.py
index 8e3e2a772e90..5c70c9fe7fa7 100755
--- a/autotest/pyscripts/test_gdal_ls_py.py
+++ b/autotest/pyscripts/test_gdal_ls_py.py
@@ -242,13 +242,3 @@ def test_gdal_ls_py_8():
 
 
 
-if __name__ == '__main__':
-
-    if gdal.GetConfigOption('GDAL_RUN_SLOW_TESTS') is None:
-        gdal.SetConfigOption('GDAL_RUN_SLOW_TESTS', 'YES')
-
-    gdaltest.setup_run('test_gdal_ls_py')
-
-    gdaltest.run_tests(gdaltest_list)
-
-    sys.exit(gdaltest.summarize())
diff --git a/autotest/pyscripts/test_gdal_merge.py b/autotest/pyscripts/test_gdal_merge.py
index 3405d93a6712..b8ccbe8cfd5c 100755
--- a/autotest/pyscripts/test_gdal_merge.py
+++ b/autotest/pyscripts/test_gdal_merge.py
@@ -240,10 +240,3 @@ def test_gdal_merge_cleanup():
 
 
 
-if __name__ == '__main__':
-
-    gdaltest.setup_run('test_gdal_merge')
-
-    gdaltest.run_tests(gdaltest_list)
-
-    sys.exit(gdaltest.summarize())
diff --git a/autotest/pyscripts/test_gdal_pansharpen.py b/autotest/pyscripts/test_gdal_pansharpen.py
index 75ffb9e05e4c..8ab8f896f11b 100755
--- a/autotest/pyscripts/test_gdal_pansharpen.py
+++ b/autotest/pyscripts/test_gdal_pansharpen.py
@@ -103,10 +103,3 @@ def test_gdal_pansharpen_cleanup():
 
 
 
-if __name__ == '__main__':
-
-    gdaltest.setup_run('test_gdal_pansharpen')
-
-    gdaltest.run_tests(gdaltest_list)
-
-    sys.exit(gdaltest.summarize())
diff --git a/autotest/pyscripts/test_gdal_polygonize.py b/autotest/pyscripts/test_gdal_polygonize.py
index d5b6fd7ecd3f..4513cca9cebe 100755
--- a/autotest/pyscripts/test_gdal_polygonize.py
+++ b/autotest/pyscripts/test_gdal_polygonize.py
@@ -201,10 +201,3 @@ def test_gdal_polygonize_4():
 
 
 
-if __name__ == '__main__':
-
-    gdaltest.setup_run('test_gdal_polygonize')
-
-    gdaltest.run_tests(gdaltest_list)
-
-    sys.exit(gdaltest.summarize())
diff --git a/autotest/pyscripts/test_gdal_proximity.py b/autotest/pyscripts/test_gdal_proximity.py
index 72bbf4d13bec..603adab32330 100755
--- a/autotest/pyscripts/test_gdal_proximity.py
+++ b/autotest/pyscripts/test_gdal_proximity.py
@@ -136,10 +136,3 @@ def test_gdal_proximity_cleanup():
     
 
 
-if __name__ == '__main__':
-
-    gdaltest.setup_run('test_gdal_proximity')
-
-    gdaltest.run_tests(gdaltest_list)
-
-    sys.exit(gdaltest.summarize())
diff --git a/autotest/pyscripts/test_gdal_retile.py b/autotest/pyscripts/test_gdal_retile.py
index 8e1bd7699a22..e7a461a055ea 100755
--- a/autotest/pyscripts/test_gdal_retile.py
+++ b/autotest/pyscripts/test_gdal_retile.py
@@ -284,10 +284,3 @@ def test_gdal_retile_cleanup():
 
 
 
-if __name__ == '__main__':
-
-    gdaltest.setup_run('gdal_retile')
-
-    gdaltest.run_tests(gdaltest_list)
-
-    sys.exit(gdaltest.summarize())
diff --git a/autotest/pyscripts/test_gdal_sieve.py b/autotest/pyscripts/test_gdal_sieve.py
index 6762dafdc508..e1415c3b1fa9 100755
--- a/autotest/pyscripts/test_gdal_sieve.py
+++ b/autotest/pyscripts/test_gdal_sieve.py
@@ -75,10 +75,3 @@ def test_gdal_sieve_1():
     
 
 
-if __name__ == '__main__':
-
-    gdaltest.setup_run('test_gdal_sieve')
-
-    gdaltest.run_tests(gdaltest_list)
-
-    sys.exit(gdaltest.summarize())
diff --git a/autotest/pyscripts/test_gdalinfo_py.py b/autotest/pyscripts/test_gdalinfo_py.py
index 1317e2730fba..0e27a40fe6fa 100755
--- a/autotest/pyscripts/test_gdalinfo_py.py
+++ b/autotest/pyscripts/test_gdalinfo_py.py
@@ -204,10 +204,3 @@ def test_gdalinfo_py_10():
 
 
 
-if __name__ == '__main__':
-
-    gdaltest.setup_run('test_gdalinfo_py')
-
-    gdaltest.run_tests(gdaltest_list)
-
-    sys.exit(gdaltest.summarize())
diff --git a/autotest/pyscripts/test_gdalmove.py b/autotest/pyscripts/test_gdalmove.py
index 39b5ca63b3e6..fd4f5e55b8ba 100755
--- a/autotest/pyscripts/test_gdalmove.py
+++ b/autotest/pyscripts/test_gdalmove.py
@@ -78,10 +78,3 @@ def test_gdalmove_cleanup():
 
 
 
-if __name__ == '__main__':
-
-    gdaltest.setup_run('test_gdalmove')
-
-    gdaltest.run_tests(gdaltest_list)
-
-    sys.exit(gdaltest.summarize())
diff --git a/autotest/pyscripts/test_ogr2ogr_py.py b/autotest/pyscripts/test_ogr2ogr_py.py
index d2fac520648d..fab5fbab75a4 100755
--- a/autotest/pyscripts/test_ogr2ogr_py.py
+++ b/autotest/pyscripts/test_ogr2ogr_py.py
@@ -1382,10 +1382,3 @@ def test_ogr2ogr_py_46():
 
 
 
-if __name__ == '__main__':
-
-    gdaltest.setup_run('test_ogr2ogr_py')
-
-    gdaltest.run_tests(gdaltest_list)
-
-    sys.exit(gdaltest.summarize())
diff --git a/autotest/pyscripts/test_ogrinfo_py.py b/autotest/pyscripts/test_ogrinfo_py.py
index 755ea403b6d7..0a540e89a16f 100755
--- a/autotest/pyscripts/test_ogrinfo_py.py
+++ b/autotest/pyscripts/test_ogrinfo_py.py
@@ -335,10 +335,3 @@ def test_ogrinfo_py_23():
 
 
 
-if __name__ == '__main__':
-
-    gdaltest.setup_run('test_ogrinfo_py')
-
-    gdaltest.run_tests(gdaltest_list)
-
-    sys.exit(gdaltest.summarize())
diff --git a/autotest/pyscripts/test_ogrmerge.py b/autotest/pyscripts/test_ogrmerge.py
index 0f79e2cc34af..dd9fd8be2b1b 100755
--- a/autotest/pyscripts/test_ogrmerge.py
+++ b/autotest/pyscripts/test_ogrmerge.py
@@ -352,10 +352,3 @@ def test_ogrmerge_12():
 
 
 
-if __name__ == '__main__':
-
-    gdaltest.setup_run('test_ogrmerge')
-
-    gdaltest.run_tests(gdaltest_list)
-
-    sys.exit(gdaltest.summarize())
diff --git a/autotest/pyscripts/test_rgb2pct.py b/autotest/pyscripts/test_rgb2pct.py
index 0422e1ba3281..fb8927e43159 100755
--- a/autotest/pyscripts/test_rgb2pct.py
+++ b/autotest/pyscripts/test_rgb2pct.py
@@ -184,10 +184,3 @@ def test_rgb2pct_cleanup():
 
 
 
-if __name__ == '__main__':
-
-    gdaltest.setup_run('test_rgb2pct')
-
-    gdaltest.run_tests(gdaltest_list)
-
-    sys.exit(gdaltest.summarize())
diff --git a/autotest/utilities/test_gdal_contour.py b/autotest/utilities/test_gdal_contour.py
index 3c126368a694..ccd73a33e2ba 100755
--- a/autotest/utilities/test_gdal_contour.py
+++ b/autotest/utilities/test_gdal_contour.py
@@ -389,10 +389,3 @@ def test_gdal_contour_cleanup():
 
 
 
-if __name__ == '__main__':
-
-    gdaltest.setup_run('test_gdal_contour')
-
-    gdaltest.run_tests(gdaltest_list)
-
-    sys.exit(gdaltest.summarize())
diff --git a/autotest/utilities/test_gdal_grid.py b/autotest/utilities/test_gdal_grid.py
index 049db1e3a3de..40a72ed59818 100755
--- a/autotest/utilities/test_gdal_grid.py
+++ b/autotest/utilities/test_gdal_grid.py
@@ -902,10 +902,3 @@ def test_gdal_grid_cleanup():
 
 
 
-if __name__ == '__main__':
-
-    gdaltest.setup_run('test_gdal_grid')
-
-    gdaltest.run_tests(gdaltest_list)
-
-    sys.exit(gdaltest.summarize())
diff --git a/autotest/utilities/test_gdal_grid_lib.py b/autotest/utilities/test_gdal_grid_lib.py
index 6f3222ecf2b2..1b9ed24cf21e 100755
--- a/autotest/utilities/test_gdal_grid_lib.py
+++ b/autotest/utilities/test_gdal_grid_lib.py
@@ -146,10 +146,3 @@ def test_gdal_grid_lib_cleanup():
 
 
 
-if __name__ == '__main__':
-
-    gdaltest.setup_run('test_gdal_grid_lib')
-
-    gdaltest.run_tests(gdaltest_list)
-
-    sys.exit(gdaltest.summarize())
diff --git a/autotest/utilities/test_gdal_rasterize.py b/autotest/utilities/test_gdal_rasterize.py
index a8240f4c3b63..54932c147407 100755
--- a/autotest/utilities/test_gdal_rasterize.py
+++ b/autotest/utilities/test_gdal_rasterize.py
@@ -405,10 +405,3 @@ def test_gdal_rasterize_cleanup():
 
 
 
-if __name__ == '__main__':
-
-    gdaltest.setup_run('test_gdal_rasterize')
-
-    gdaltest.run_tests(gdaltest_list)
-
-    sys.exit(gdaltest.summarize())
diff --git a/autotest/utilities/test_gdal_rasterize_lib.py b/autotest/utilities/test_gdal_rasterize_lib.py
index 512920d1bbb1..fad7f4ec5cc1 100755
--- a/autotest/utilities/test_gdal_rasterize_lib.py
+++ b/autotest/utilities/test_gdal_rasterize_lib.py
@@ -323,10 +323,3 @@ def test_gdal_rasterize_lib_4():
     
 
 
-if __name__ == '__main__':
-
-    gdaltest.setup_run('test_gdal_rasterize_lib')
-
-    gdaltest.run_tests(gdaltest_list)
-
-    sys.exit(gdaltest.summarize())
diff --git a/autotest/utilities/test_gdal_translate.py b/autotest/utilities/test_gdal_translate.py
index 1f414d14182a..4cb92ecc90f3 100755
--- a/autotest/utilities/test_gdal_translate.py
+++ b/autotest/utilities/test_gdal_translate.py
@@ -972,10 +972,3 @@ def test_gdal_translate_cleanup():
 
 
 
-if __name__ == '__main__':
-
-    gdaltest.setup_run('test_gdal_translate')
-
-    gdaltest.run_tests(gdaltest_list)
-
-    sys.exit(gdaltest.summarize())
diff --git a/autotest/utilities/test_gdal_translate_lib.py b/autotest/utilities/test_gdal_translate_lib.py
index eae0a2319cf2..9152d012aecd 100755
--- a/autotest/utilities/test_gdal_translate_lib.py
+++ b/autotest/utilities/test_gdal_translate_lib.py
@@ -461,10 +461,3 @@ def test_gdal_translate_lib_cleanup():
 
 
 
-if __name__ == '__main__':
-
-    gdaltest.setup_run('test_gdal_translate_lib')
-
-    gdaltest.run_tests(gdaltest_list)
-
-    sys.exit(gdaltest.summarize())
diff --git a/autotest/utilities/test_gdaladdo.py b/autotest/utilities/test_gdaladdo.py
index c22d277ba21e..6713dab848ca 100755
--- a/autotest/utilities/test_gdaladdo.py
+++ b/autotest/utilities/test_gdaladdo.py
@@ -181,10 +181,3 @@ def test_gdaladdo_5():
 
 
 
-if __name__ == '__main__':
-
-    gdaltest.setup_run('test_gdaladdo')
-
-    gdaltest.run_tests(gdaltest_list)
-
-    sys.exit(gdaltest.summarize())
diff --git a/autotest/utilities/test_gdalbuildvrt.py b/autotest/utilities/test_gdalbuildvrt.py
index bad1be7fba4f..6ecf9ee9132f 100755
--- a/autotest/utilities/test_gdalbuildvrt.py
+++ b/autotest/utilities/test_gdalbuildvrt.py
@@ -527,10 +527,3 @@ def test_gdalbuildvrt_cleanup():
 
 
 
-if __name__ == '__main__':
-
-    gdaltest.setup_run('test_gdalbuildvrt')
-
-    gdaltest.run_tests(gdaltest_list)
-
-    sys.exit(gdaltest.summarize())
diff --git a/autotest/utilities/test_gdalbuildvrt_lib.py b/autotest/utilities/test_gdalbuildvrt_lib.py
index 82c88a6077e4..73599a29ac8b 100755
--- a/autotest/utilities/test_gdalbuildvrt_lib.py
+++ b/autotest/utilities/test_gdalbuildvrt_lib.py
@@ -90,10 +90,3 @@ def test_gdalbuildvrt_lib_2():
 
 
 
-if __name__ == '__main__':
-
-    gdaltest.setup_run('test_gdalbuildvrt_lib')
-
-    gdaltest.run_tests(gdaltest_list)
-
-    sys.exit(gdaltest.summarize())
diff --git a/autotest/utilities/test_gdaldem.py b/autotest/utilities/test_gdaldem.py
index 6e79d7942b32..ce2f6d24f020 100755
--- a/autotest/utilities/test_gdaldem.py
+++ b/autotest/utilities/test_gdaldem.py
@@ -636,10 +636,3 @@ def test_gdaldem_cleanup():
 
 
 
-if __name__ == '__main__':
-
-    gdaltest.setup_run('test_gdaldem')
-
-    gdaltest.run_tests(gdaltest_list)
-
-    sys.exit(gdaltest.summarize())
diff --git a/autotest/utilities/test_gdaldem_lib.py b/autotest/utilities/test_gdaldem_lib.py
index 2d9700311bba..76ae96221bae 100755
--- a/autotest/utilities/test_gdaldem_lib.py
+++ b/autotest/utilities/test_gdaldem_lib.py
@@ -451,10 +451,3 @@ def test_gdaldem_lib_nodata():
 
 
 
-if __name__ == '__main__':
-
-    gdaltest.setup_run('test_gdaldem_lib')
-
-    gdaltest.run_tests(gdaltest_list)
-
-    sys.exit(gdaltest.summarize())
diff --git a/autotest/utilities/test_gdalinfo.py b/autotest/utilities/test_gdalinfo.py
index 9b6a0aa43851..976b924fbe11 100755
--- a/autotest/utilities/test_gdalinfo.py
+++ b/autotest/utilities/test_gdalinfo.py
@@ -631,10 +631,3 @@ def test_gdalinfo_40():
 
 
 
-if __name__ == '__main__':
-
-    gdaltest.setup_run('test_gdalinfo')
-
-    gdaltest.run_tests(gdaltest_list)
-
-    sys.exit(gdaltest.summarize())
diff --git a/autotest/utilities/test_gdalinfo_lib.py b/autotest/utilities/test_gdalinfo_lib.py
index 62e58a35904d..4a1d273ca762 100755
--- a/autotest/utilities/test_gdalinfo_lib.py
+++ b/autotest/utilities/test_gdalinfo_lib.py
@@ -136,10 +136,3 @@ def test_gdalinfo_lib_nodatavalues():
 
 
 
-if __name__ == '__main__':
-
-    gdaltest.setup_run('test_gdalinfo_lib')
-
-    gdaltest.run_tests(gdaltest_list)
-
-    sys.exit(gdaltest.summarize())
diff --git a/autotest/utilities/test_gdallocationinfo.py b/autotest/utilities/test_gdallocationinfo.py
index 673c9072bb5a..c0e220afe5e3 100755
--- a/autotest/utilities/test_gdallocationinfo.py
+++ b/autotest/utilities/test_gdallocationinfo.py
@@ -137,10 +137,3 @@ def test_gdallocationinfo_6():
 
 
 
-if __name__ == '__main__':
-
-    gdaltest.setup_run('test_gdallocationinfo')
-
-    gdaltest.run_tests(gdaltest_list)
-
-    sys.exit(gdaltest.summarize())
diff --git a/autotest/utilities/test_gdalsrsinfo.py b/autotest/utilities/test_gdalsrsinfo.py
index 2308fd2b404b..e50088efbc6a 100755
--- a/autotest/utilities/test_gdalsrsinfo.py
+++ b/autotest/utilities/test_gdalsrsinfo.py
@@ -351,10 +351,3 @@ def test_gdalsrsinfo_17():
 
 
 
-if __name__ == '__main__':
-
-    gdaltest.setup_run('test_gdalsrsinfo')
-
-    gdaltest.run_tests(gdaltest_list)
-
-    sys.exit(gdaltest.summarize())
diff --git a/autotest/utilities/test_gdaltindex.py b/autotest/utilities/test_gdaltindex.py
index 48e21813e29d..4e6c916ee0ea 100755
--- a/autotest/utilities/test_gdaltindex.py
+++ b/autotest/utilities/test_gdaltindex.py
@@ -272,10 +272,3 @@ def test_gdaltindex_cleanup():
 
 
 
-if __name__ == '__main__':
-
-    gdaltest.setup_run('test_gdaltindex')
-
-    gdaltest.run_tests(gdaltest_list)
-
-    sys.exit(gdaltest.summarize())
diff --git a/autotest/utilities/test_gdaltransform.py b/autotest/utilities/test_gdaltransform.py
index dcf03ac33ea9..6aaaa11ae4aa 100755
--- a/autotest/utilities/test_gdaltransform.py
+++ b/autotest/utilities/test_gdaltransform.py
@@ -178,10 +178,3 @@ def test_gdaltransform_9():
 
 
 
-if __name__ == '__main__':
-
-    gdaltest.setup_run('test_gdaltransform')
-
-    gdaltest.run_tests(gdaltest_list)
-
-    sys.exit(gdaltest.summarize())
diff --git a/autotest/utilities/test_gdalwarp.py b/autotest/utilities/test_gdalwarp.py
index 4a85137a8f68..a2907ded0f1c 100755
--- a/autotest/utilities/test_gdalwarp.py
+++ b/autotest/utilities/test_gdalwarp.py
@@ -1344,11 +1344,3 @@ def test_gdalwarp_cleanup():
     test_gdalwarp_cleanup,
     test_gdalwarp_46,
     test_gdalwarp_cleanup]
-
-if __name__ == '__main__':
-
-    gdaltest.setup_run('test_gdalwarp')
-
-    gdaltest.run_tests(gdaltest_list)
-
-    sys.exit(gdaltest.summarize())
diff --git a/autotest/utilities/test_gdalwarp_lib.py b/autotest/utilities/test_gdalwarp_lib.py
index df1417c004f2..9f07181cf728 100755
--- a/autotest/utilities/test_gdalwarp_lib.py
+++ b/autotest/utilities/test_gdalwarp_lib.py
@@ -1626,10 +1626,3 @@ def test_gdalwarp_lib_cleanup():
     
 
 
-if __name__ == '__main__':
-
-    gdaltest.setup_run('test_gdalwarp_lib')
-
-    gdaltest.run_tests(gdaltest_list)
-
-    sys.exit(gdaltest.summarize())
diff --git a/autotest/utilities/test_gnmutils.py b/autotest/utilities/test_gnmutils.py
index 0b65aab24a19..3113a329992d 100755
--- a/autotest/utilities/test_gnmutils.py
+++ b/autotest/utilities/test_gnmutils.py
@@ -149,10 +149,3 @@ def test_gnm_cleanup():
 
 
 
-if __name__ == '__main__':
-
-    gdaltest.setup_run('test_gnmutils')
-
-    gdaltest.run_tests(gdaltest_list)
-
-    sys.exit(gdaltest.summarize())
diff --git a/autotest/utilities/test_nearblack.py b/autotest/utilities/test_nearblack.py
index c1b87c384336..e58d6c25c27e 100755
--- a/autotest/utilities/test_nearblack.py
+++ b/autotest/utilities/test_nearblack.py
@@ -261,10 +261,3 @@ def test_nearblack_cleanup():
 
 
 
-if __name__ == '__main__':
-
-    gdaltest.setup_run('test_nearblack')
-
-    gdaltest.run_tests(gdaltest_list)
-
-    sys.exit(gdaltest.summarize())
diff --git a/autotest/utilities/test_nearblack_lib.py b/autotest/utilities/test_nearblack_lib.py
index 14174b7f0505..34e7a7108526 100755
--- a/autotest/utilities/test_nearblack_lib.py
+++ b/autotest/utilities/test_nearblack_lib.py
@@ -155,10 +155,3 @@ def test_nearblack_lib_8():
 
 
 
-if __name__ == '__main__':
-
-    gdaltest.setup_run('test_nearblack_lib')
-
-    gdaltest.run_tests(gdaltest_list)
-
-    sys.exit(gdaltest.summarize())
diff --git a/autotest/utilities/test_ogr2ogr.py b/autotest/utilities/test_ogr2ogr.py
index 9c83368df70b..db9a8c848291 100755
--- a/autotest/utilities/test_ogr2ogr.py
+++ b/autotest/utilities/test_ogr2ogr.py
@@ -2441,10 +2441,3 @@ def test_ogr2ogr_67():
 
 # gdaltest_list = [ test_ogr2ogr_51 ]
 
-if __name__ == '__main__':
-
-    gdaltest.setup_run('test_ogr2ogr')
-
-    gdaltest.run_tests(gdaltest_list)
-
-    sys.exit(gdaltest.summarize())
diff --git a/autotest/utilities/test_ogr2ogr_lib.py b/autotest/utilities/test_ogr2ogr_lib.py
index 06db0af68a58..e5c254a83f03 100755
--- a/autotest/utilities/test_ogr2ogr_lib.py
+++ b/autotest/utilities/test_ogr2ogr_lib.py
@@ -452,10 +452,3 @@ def test_ogr2ogr_clipsrc_no_dst_geom():
     gdal.Unlink(tmpfilename)
 
 
-if __name__ == '__main__':
-
-    gdaltest.setup_run('test_ogr2ogr_lib')
-
-    gdaltest.run_tests(gdaltest_list)
-
-    sys.exit(gdaltest.summarize())
diff --git a/autotest/utilities/test_ogrinfo.py b/autotest/utilities/test_ogrinfo.py
index 9c304bd635cb..ef496fc9f014 100755
--- a/autotest/utilities/test_ogrinfo.py
+++ b/autotest/utilities/test_ogrinfo.py
@@ -650,10 +650,3 @@ def test_ogrinfo_sql_filename():
 
 
 
-if __name__ == '__main__':
-
-    gdaltest.setup_run('test_ogrinfo')
-
-    gdaltest.run_tests(gdaltest_list)
-
-    sys.exit(gdaltest.summarize())
diff --git a/autotest/utilities/test_ogrlineref.py b/autotest/utilities/test_ogrlineref.py
index ce4bc97fafc2..4f8346d34ab1 100755
--- a/autotest/utilities/test_ogrlineref.py
+++ b/autotest/utilities/test_ogrlineref.py
@@ -134,10 +134,3 @@ def test_ogrlineref_cleanup():
     
 
 
-if __name__ == '__main__':
-
-    gdaltest.setup_run('test_ogrlineref')
-
-    gdaltest.run_tests(gdaltest_list)
-
-    sys.exit(gdaltest.summarize())
diff --git a/autotest/utilities/test_ogrtindex.py b/autotest/utilities/test_ogrtindex.py
index 6520da4f2e32..308f682b7aca 100755
--- a/autotest/utilities/test_ogrtindex.py
+++ b/autotest/utilities/test_ogrtindex.py
@@ -236,10 +236,3 @@ def test_ogrtindex_cleanup():
 
 
 
-if __name__ == '__main__':
-
-    gdaltest.setup_run('test_ogrtindex')
-
-    gdaltest.run_tests(gdaltest_list)
-
-    sys.exit(gdaltest.summarize())

From 2ab160940525d696c4b96e47c20c195f1d3e90e2 Mon Sep 17 00:00:00 2001
From: Craig de Stigter <craig.destigter@koordinates.com>
Date: Mon, 10 Dec 2018 09:28:41 +1300
Subject: [PATCH 143/488] Automated: Use pytest.raises() where necessary

pytest.fail() raises an exception, which means it doesn't work as
expected in a catchall try/except block.
Pytest provides a pytest.raises() contextmanager which does this better.
---
 autotest/gcore/basic_test.py                  | 48 ++++-------
 autotest/gcore/hfa_write.py                   |  6 +-
 autotest/gcore/mask.py                        | 24 ++----
 autotest/gcore/numpy_rw.py                    | 84 +++++++------------
 autotest/gcore/rasterio.py                    |  6 +-
 autotest/gcore/tiff_ovr.py                    |  6 +-
 autotest/gcore/tiff_read.py                   | 78 ++++++-----------
 autotest/gcore/tiff_write.py                  | 84 +++++++------------
 autotest/gdrivers/ecw.py                      | 42 ++++------
 autotest/gdrivers/gdalhttp.py                 |  6 +-
 autotest/gdrivers/hfa.py                      | 12 +--
 autotest/gdrivers/jp2metadata.py              |  6 +-
 autotest/gdrivers/jpeg.py                     |  6 +-
 autotest/gdrivers/jpeg_profile.py             | 18 ++--
 autotest/gdrivers/png_profile.py              | 18 ++--
 autotest/gdrivers/tiff_profile.py             | 18 ++--
 autotest/gdrivers/til.py                      | 12 +--
 autotest/gdrivers/vrtmask.py                  |  6 +-
 autotest/gnm/gnm_test.py                      |  6 +-
 autotest/ogr/ogr_fgdb.py                      | 42 ++++------
 autotest/ogr/ogr_gml_read.py                  | 30 +++----
 autotest/ogr/ogr_index_test.py                | 12 +--
 autotest/ogr/ogr_rfc41.py                     | 18 ++--
 autotest/ogr/ogr_shape.py                     |  6 +-
 autotest/ogr/ogr_sql_test.py                  |  6 +-
 autotest/pyscripts/test_gdal_edit.py          |  6 +-
 autotest/utilities/test_gdal_translate.py     |  6 +-
 autotest/utilities/test_gdal_translate_lib.py |  6 +-
 autotest/utilities/test_gdaladdo.py           |  6 +-
 autotest/utilities/test_gnmutils.py           |  6 +-
 30 files changed, 213 insertions(+), 417 deletions(-)

diff --git a/autotest/gcore/basic_test.py b/autotest/gcore/basic_test.py
index 7d3d2e38f28b..53cfabac6d92 100755
--- a/autotest/gcore/basic_test.py
+++ b/autotest/gcore/basic_test.py
@@ -393,41 +393,31 @@ def test_basic_test_14():
     ds.SetMetadata('foo')
     assert ds.GetMetadata_List() == ['foo']
 
-    try:
+    with pytest.raises(Exception):
         ds.SetMetadata(5)
-        pytest.fail()
-    except:
-        pass
+    
 
     ds.SetMetadata(['foo=bar'])
     assert ds.GetMetadata_List() == ['foo=bar']
 
-    try:
+    with pytest.raises(Exception):
         ds.SetMetadata([5])
-        pytest.fail()
-    except:
-        pass
+    
 
     ds.SetMetadata({'foo': 'baz'})
     assert ds.GetMetadata_List() == ['foo=baz']
 
-    try:
+    with pytest.raises(Exception):
         ds.SetMetadata({'foo': 5})
-        pytest.fail()
-    except:
-        pass
+    
 
-    try:
+    with pytest.raises(Exception):
         ds.SetMetadata({5: 'baz'})
-        pytest.fail()
-    except:
-        pass
+    
 
-    try:
+    with pytest.raises(Exception):
         ds.SetMetadata({5: 6})
-        pytest.fail()
-    except:
-        pass
+    
 
     if sys.version_info >= (3, 0, 0):
         val = '\u00e9ven'
@@ -440,17 +430,13 @@ def test_basic_test_14():
     ds.SetMetadata({val: 'baz'})
     assert ds.GetMetadata()[val] == 'baz'
 
-    try:
+    with pytest.raises(Exception):
         ds.SetMetadata({val: 5})
-        pytest.fail()
-    except:
-        pass
+    
 
-    try:
+    with pytest.raises(Exception):
         ds.SetMetadata({5: val})
-        pytest.fail()
-    except:
-        pass
+    
 
     
 ###############################################################################
@@ -473,12 +459,10 @@ def basic_test_15_cbk_bad_ret(a, b, c):
 
 def test_basic_test_15():
 
-    try:
+    with pytest.raises(Exception):
         with gdaltest.error_handler():
             gdal.GetDriverByName('MEM').CreateCopy('', gdal.GetDriverByName('MEM').Create('', 1, 1), callback='foo')
-        pytest.fail()
-    except:
-        pass
+            
 
     with gdaltest.error_handler():
         ds = gdal.GetDriverByName('MEM').CreateCopy('', gdal.GetDriverByName('MEM').Create('', 1, 1), callback=basic_test_15_cbk_no_argument)
diff --git a/autotest/gcore/hfa_write.py b/autotest/gcore/hfa_write.py
index d3ca4bc8c698..b363bb942e0c 100755
--- a/autotest/gcore/hfa_write.py
+++ b/autotest/gcore/hfa_write.py
@@ -162,11 +162,9 @@ def test_hfa_clean_external_overviews():
     assert ds.GetRasterBand(1).GetOverviewCount() == 0, 'Overviews still exist.'
     ds = None
 
-    try:
+    with pytest.raises(OSError, message='small.rrd still present.'):
         os.stat('tmp/small.rrd')
-        pytest.fail('small.rrd still present.')
-    except OSError:
-        pass
+    
 
     gdal.GetDriverByName('HFA').Delete('tmp/small.img')
 
diff --git a/autotest/gcore/mask.py b/autotest/gcore/mask.py
index eca86107bc86..af45c865b8b7 100755
--- a/autotest/gcore/mask.py
+++ b/autotest/gcore/mask.py
@@ -418,11 +418,9 @@ def test_mask_13():
 
     drv.Delete('tmp/byte_with_mask.tif')
 
-    try:
+    with pytest.raises(OSError, message='tmp/byte_with_mask.tif.msk is still there'):
         os.stat('tmp/byte_with_mask.tif.msk')
-        pytest.fail('tmp/byte_with_mask.tif.msk is still there')
-    except OSError:
-        pass
+    
 
     
 ###############################################################################
@@ -473,11 +471,9 @@ def test_mask_14():
 
     ds = None
 
-    try:
+    with pytest.raises(OSError, message='tmp/byte_with_mask.tif.msk should not exist'):
         os.stat('tmp/byte_with_mask.tif.msk')
-        pytest.fail('tmp/byte_with_mask.tif.msk should not exist')
-    except OSError:
-        pass
+    
 
     gdal.SetConfigOption('GDAL_TIFF_INTERNAL_MASK_TO_8BIT', 'FALSE')
     ds = gdal.Open('tmp/byte_with_mask.tif')
@@ -561,11 +557,9 @@ def mask_and_ovr(order, method):
 
     ds = None
 
-    try:
+    with pytest.raises(OSError, message='tmp/byte_with_mask.tif.msk should not exist'):
         os.stat('tmp/byte_with_ovr_and_mask.tif.msk')
-        pytest.fail('tmp/byte_with_mask.tif.msk should not exist')
-    except OSError:
-        pass
+    
 
     gdal.SetConfigOption('GDAL_TIFF_INTERNAL_MASK_TO_8BIT', 'FALSE')
     ds = gdal.Open('tmp/byte_with_ovr_and_mask.tif')
@@ -743,11 +737,9 @@ def test_mask_22():
 
     drv.Delete('tmp/mask_22.tif')
 
-    try:
+    with pytest.raises(OSError, message='tmp/mask_22.tif.msk is still there'):
         os.stat('tmp/mask_22.tif.msk')
-        pytest.fail('tmp/mask_22.tif.msk is still there')
-    except OSError:
-        pass
+    
 
     
 ###############################################################################
diff --git a/autotest/gcore/numpy_rw.py b/autotest/gcore/numpy_rw.py
index 71b956191e38..124c93a74f72 100755
--- a/autotest/gcore/numpy_rw.py
+++ b/autotest/gcore/numpy_rw.py
@@ -379,52 +379,42 @@ def test_numpy_rw_13():
 
     # Try reading into unsupported array type
     ar = numpy.empty([1, 2], dtype=numpy.int64)
-    try:
+    with pytest.raises(Exception, message='expected "ValueError: array does not have '
+                             'corresponding GDAL data type"'):
         ds.GetRasterBand(1).ReadAsArray(buf_obj=ar)
-        pytest.fail('expected "ValueError: array does not have '
-                             'corresponding GDAL data type"')
-    except:
-        pass
+    
 
     # Try call with inconsistent parameters.
     ar = numpy.empty([1, 2], dtype=numpy.uint8)
-    try:
+    with pytest.raises(Exception, message='expected "Specified buf_ysize not consistent '
+                             'with buffer shape"'):
         ds.GetRasterBand(1).ReadAsArray(buf_obj=ar, buf_xsize=2,
                                         buf_ysize=2)
-        pytest.fail('expected "Specified buf_ysize not consistent '
-                             'with buffer shape"')
-    except:
-        pass
+    
 
     # Same with 3 dimensions
     ar = numpy.empty([1, 1, 2], dtype=numpy.uint8)
-    try:
+    with pytest.raises(Exception, message='expected "Specified buf_ysize not consistent '
+                             'with buffer shape"'):
         ds.GetRasterBand(1).ReadAsArray(buf_obj=ar, buf_xsize=2,
                                         buf_ysize=2)
-        pytest.fail('expected "Specified buf_ysize not consistent '
-                             'with buffer shape"')
-    except:
-        pass
+    
 
     # Try call with inconsistent parameters.
     ar = numpy.empty([1, 2], dtype=numpy.uint8)
-    try:
+    with pytest.raises(Exception, message='expected "Specified buf_xsize not consistent '
+                             'with buffer shape"'):
         ds.GetRasterBand(1).ReadAsArray(buf_obj=ar, buf_xsize=1,
                                         buf_ysize=1)
-        pytest.fail('expected "Specified buf_xsize not consistent '
-                             'with buffer shape"')
-    except:
-        pass
+    
 
     # Inconsistent data type
     ar = numpy.empty([1, 2], dtype=numpy.uint8)
-    try:
+    with pytest.raises(Exception, message='expected "Specified buf_type not consistent '
+                             'with array type"'):
         ds.GetRasterBand(1).ReadAsArray(buf_obj=ar,
                                         buf_type=gdal.GDT_Int16)
-        pytest.fail('expected "Specified buf_type not consistent '
-                             'with array type"')
-    except:
-        pass
+    
 
     # This one should be OK !
     ar = numpy.zeros([1, 2], dtype=numpy.uint8)
@@ -461,55 +451,43 @@ def test_numpy_rw_13():
         ds.GetRasterBand(i + 1).WriteArray(ar[i])
 
     ar = numpy.empty([3, 1, 2], dtype=numpy.int64)
-    try:
+    with pytest.raises(Exception, message='expected "ValueError: array does not have '
+                             'corresponding GDAL data type"'):
         ds.ReadAsArray(buf_obj=ar)
-        pytest.fail('expected "ValueError: array does not have '
-                             'corresponding GDAL data type"')
-    except:
-        pass
+    
 
     # Try call with inconsistent parameters.
     ar = numpy.empty([3, 1, 2], dtype=numpy.uint8)
-    try:
+    with pytest.raises(Exception, message='expected "Specified buf_ysize not consistent '
+                             'with buffer shape"'):
         ds.ReadAsArray(buf_obj=ar, buf_xsize=2, buf_ysize=2)
-        pytest.fail('expected "Specified buf_ysize not consistent '
-                             'with buffer shape"')
-    except:
-        pass
+    
 
     # With 2 dimensions
     ar = numpy.empty([1, 2], dtype=numpy.uint8)
-    try:
+    with pytest.raises(Exception, message='expected "ValueError: Array should have 3 '
+                             'dimensions"'):
         ds.ReadAsArray(buf_obj=ar)
-        pytest.fail('expected "ValueError: Array should have 3 '
-                             'dimensions"')
-    except:
-        pass
+    
 
     # Try call with inconsistent parameters
     ar = numpy.empty([3, 1, 2], dtype=numpy.uint8)
-    try:
+    with pytest.raises(Exception, message='expected "Specified buf_xsize not consistent '
+                             'with buffer shape"'):
         ds.ReadAsArray(buf_obj=ar, buf_xsize=1, buf_ysize=1)
-        pytest.fail('expected "Specified buf_xsize not consistent '
-                             'with buffer shape"')
-    except:
-        pass
+    
 
     # Inconsistent data type
     ar = numpy.empty([3, 1, 2], dtype=numpy.uint8)
-    try:
+    with pytest.raises(Exception, message='expected "Specified buf_type not consistent with array type"'):
         ds.ReadAsArray(buf_obj=ar, buf_type=gdal.GDT_Int16)
-        pytest.fail('expected "Specified buf_type not consistent with array type"')
-    except:
-        pass
+    
 
     # Not enough space in first dimension
     ar = numpy.empty([2, 1, 2], dtype=numpy.uint8)
-    try:
+    with pytest.raises(Exception, message='expected "Array should have space for 3 bands"'):
         ds.ReadAsArray(buf_obj=ar)
-        pytest.fail('expected "Array should have space for 3 bands"')
-    except:
-        pass
+    
 
     # This one should be OK !
     ar = numpy.zeros([3, 1, 2], dtype=numpy.uint8)
diff --git a/autotest/gcore/rasterio.py b/autotest/gcore/rasterio.py
index e4827321d544..324baa1e8885 100755
--- a/autotest/gcore/rasterio.py
+++ b/autotest/gcore/rasterio.py
@@ -248,11 +248,9 @@ def test_rasterio_6():
     ds = gdal.GetDriverByName('MEM').Create('', 2, 2)
 
     for obj in [ds, ds.GetRasterBand(1)]:
-        try:
+        with pytest.raises(Exception, message='expected exception'):
             obj.WriteRaster(0, 0, 2, 2, None)
-            pytest.fail('expected exception')
-        except:
-            pass
+        
 
         gdal.ErrorReset()
         gdal.PushErrorHandler('CPLQuietErrorHandler')
diff --git a/autotest/gcore/tiff_ovr.py b/autotest/gcore/tiff_ovr.py
index 99c6489e0b47..d25981d22649 100755
--- a/autotest/gcore/tiff_ovr.py
+++ b/autotest/gcore/tiff_ovr.py
@@ -940,11 +940,9 @@ def test_tiff_ovr_29(both_endian):
 
     png_ds = None
 
-    try:
+    with pytest.raises(OSError, message='.ovr file still present'):
         os.stat('tmp/ovr29.png.ovr')
-        pytest.fail('.ovr file still present')
-    except OSError:
-        pass
+    
 
     gdal.GetDriverByName('PNG').Delete('tmp/ovr29.png')
 
diff --git a/autotest/gcore/tiff_read.py b/autotest/gcore/tiff_read.py
index fb43c5ee3d93..a5f80c8f2cf2 100755
--- a/autotest/gcore/tiff_read.py
+++ b/autotest/gcore/tiff_read.py
@@ -738,11 +738,9 @@ def test_tiff_read_from_tab():
 
     gdal.GetDriverByName('GTiff').Delete('tmp/tiff_read_from_tab.tif')
 
-    try:
+    with pytest.raises(OSError, message='did not expect to find .tab file at that point'):
         os.stat('tmp/tiff_read_from_tab.tab')
-        pytest.fail('did not expect to find .tab file at that point')
-    except OSError:
-        pass
+    
 
     assert gt == (400000.0, 25.0, 0.0, 1300000.0, 0.0, -25.0), \
         'did not get expected geotransform'
@@ -1555,11 +1553,9 @@ def test_tiff_read_md1():
 
     ds = None
 
-    try:
+    with pytest.raises(OSError, message='Expected not generation of data/md_dg.tif.aux.xml'):
         os.stat('data/md_dg.tif.aux.xml')
-        pytest.fail('Expected not generation of data/md_dg.tif.aux.xml')
-    except OSError:
-        pass
+    
 
     
 ###############################################################################
@@ -1593,11 +1589,9 @@ def test_tiff_read_md2():
 
     ds = None
 
-    try:
+    with pytest.raises(OSError, message='Expected not generation of data/md_dg_2.tif.aux.xml'):
         os.stat('data/md_dg_2.tif.aux.xml')
-        pytest.fail('Expected not generation of data/md_dg_2.tif.aux.xml')
-    except OSError:
-        pass
+    
 
     
 ###############################################################################
@@ -1631,11 +1625,9 @@ def test_tiff_read_md3():
 
     ds = None
 
-    try:
+    with pytest.raises(OSError, message='Expected not generation of data/md_ge_rgb_0010000.tif.aux.xml'):
         os.stat('data/md_ge_rgb_0010000.tif.aux.xml')
-        pytest.fail('Expected not generation of data/md_ge_rgb_0010000.tif.aux.xml')
-    except OSError:
-        pass
+    
 
     
 ###############################################################################
@@ -1669,11 +1661,9 @@ def test_tiff_read_md4():
 
     ds = None
 
-    try:
+    with pytest.raises(OSError, message='Expected not generation of data/md_ov.tif.aux.xml'):
         os.stat('data/md_ov.tif.aux.xml')
-        pytest.fail('Expected not generation of data/md_ov.tif.aux.xml')
-    except OSError:
-        pass
+    
 
     
 ###############################################################################
@@ -1707,11 +1697,9 @@ def test_tiff_read_md5():
 
     ds = None
 
-    try:
+    with pytest.raises(OSError, message='Expected not generation of data/md_rdk1.tif.aux.xml'):
         os.stat('data/md_rdk1.tif.aux.xml')
-        pytest.fail('Expected not generation of data/md_rdk1.tif.aux.xml')
-    except OSError:
-        pass
+    
 
     
 ###############################################################################
@@ -1745,11 +1733,9 @@ def test_tiff_read_md6():
 
     ds = None
 
-    try:
+    with pytest.raises(OSError, message='Expected not generation of data/md_ls_b1.tif.aux.xml'):
         os.stat('data/md_ls_b1.tif.aux.xml')
-        pytest.fail('Expected not generation of data/md_ls_b1.tif.aux.xml')
-    except OSError:
-        pass
+    
 
     
 ###############################################################################
@@ -1783,11 +1769,9 @@ def test_tiff_read_md7():
 
     ds = None
 
-    try:
+    with pytest.raises(OSError, message='Expected not generation of data/spot/md_spot.tif.aux.xml'):
         os.stat('data/spot/md_spot.tif.aux.xml')
-        pytest.fail('Expected not generation of data/spot/md_spot.tif.aux.xml')
-    except OSError:
-        pass
+    
 
     
 ###############################################################################
@@ -1821,11 +1805,9 @@ def test_tiff_read_md8():
 
     ds = None
 
-    try:
+    with pytest.raises(OSError, message='Expected not generation of data/md_re.tif.aux.xml'):
         os.stat('data/md_re.tif.aux.xml')
-        pytest.fail('Expected not generation of data/md_re.tif.aux.xml')
-    except OSError:
-        pass
+    
 
     
 ###############################################################################
@@ -1858,11 +1840,9 @@ def test_tiff_read_md9():
 
     ds = None
 
-    try:
+    with pytest.raises(OSError, message='Expected not generation of data/alos/IMG-md_alos.tif.aux.xml'):
         os.stat('data/alos/IMG-md_alos.tif.aux.xml')
-        pytest.fail('Expected not generation of data/alos/IMG-md_alos.tif.aux.xml')
-    except OSError:
-        pass
+    
 
     
 ###############################################################################
@@ -1896,11 +1876,9 @@ def test_tiff_read_md10():
 
     ds = None
 
-    try:
+    with pytest.raises(OSError, message='Expected not generation of data/md_eros.tif.aux.xml'):
         os.stat('data/md_eros.tif.aux.xml')
-        pytest.fail('Expected not generation of data/md_eros.tif.aux.xml')
-    except OSError:
-        pass
+    
 
     
 ###############################################################################
@@ -1934,11 +1912,9 @@ def test_tiff_read_md11():
 
     ds = None
 
-    try:
+    with pytest.raises(OSError, message='Expected not generation of data/md_kompsat.tif.aux.xml'):
         os.stat('data/md_kompsat.tif.aux.xml')
-        pytest.fail('Expected not generation of data/md_kompsat.tif.aux.xml')
-    except OSError:
-        pass
+    
 
     
 ###############################################################################
@@ -1971,11 +1947,9 @@ def test_tiff_read_md12():
 
     ds = None
 
-    try:
+    with pytest.raises(OSError, message='Expected not generation of data/md_kompsat.tif.aux.xml'):
         os.stat('data/md_kompsat.tif.aux.xml')
-        pytest.fail('Expected not generation of data/md_kompsat.tif.aux.xml')
-    except OSError:
-        pass
+    
 
     # Test not valid DIMAP product [https://github.com/OSGeo/gdal/issues/431]
     shutil.copy('../gdrivers/data/dimap2/IMG_foo_R2C1.TIF', 'tmp/IMG_foo_temp.TIF')
diff --git a/autotest/gcore/tiff_write.py b/autotest/gcore/tiff_write.py
index 18b38cb2ff4f..b9f57e842d43 100755
--- a/autotest/gcore/tiff_write.py
+++ b/autotest/gcore/tiff_write.py
@@ -671,11 +671,9 @@ def test_tiff_write_rpc_txt():
         pass
 
     # confirm there is no .RPB file created by default.
-    try:
+    with pytest.raises(IOError, message='unexpectedly found .RPB file'):
         open('tmp/tiff_write_rpc_txt.RPB').read()
-        pytest.fail('unexpectedly found .RPB file')
-    except IOError:
-        pass
+    
 
     try:
         open('tmp/tiff_write_rpc_txt_RPC.TXT').read()
@@ -693,11 +691,9 @@ def test_tiff_write_rpc_txt():
 
     # Confirm _RPC.TXT file is cleaned up.  If not likely the
     # file list functionality is not working properly.
-    try:
+    with pytest.raises(IOError, message='_RPC.TXT did not get cleaned up.'):
         open('tmp/tiff_write_rpc_txt_RPC.TXT').read()
-        pytest.fail('_RPC.TXT did not get cleaned up.')
-    except IOError:
-        pass
+    
 
     
 ###############################################################################
@@ -722,11 +718,9 @@ def test_tiff_write_rpc_in_pam():
         pytest.fail('missing .aux.xml file.')
 
     # confirm there is no .RPB file created.
-    try:
+    with pytest.raises(IOError, message='unexpectedly found .RPB file'):
         open('tmp/tiff_write_rpc_txt.RPB').read()
-        pytest.fail('unexpectedly found .RPB file')
-    except IOError:
-        pass
+    
 
     # Open the dataset, and confirm the RPC data is still intact.
     ds = gdal.Open('tmp/tiff_write_rpc_in_pam.tif')
@@ -793,11 +787,9 @@ def test_tiff_write_20():
 
     # hopefully it's closed now!
 
-    try:
+    with pytest.raises(OSError, message='did not expected .aux.xml file'):
         os.stat('tmp/tags.tif.aux.xml')
-        pytest.fail('did not expected .aux.xml file')
-    except OSError:
-        pass
+    
 
     new_ds = gdal.Open('tmp/tags.tif')
     md = new_ds.GetMetadata()
@@ -814,11 +806,9 @@ def test_tiff_write_20():
     ds.SetMetadataItem('TIFFTAG_SOFTWARE', None)
     ds = None
 
-    try:
+    with pytest.raises(OSError, message='did not expected .aux.xml file'):
         os.stat('tmp/tags.tif.aux.xml')
-        pytest.fail('did not expected .aux.xml file')
-    except OSError:
-        pass
+    
 
     ds = gdal.Open('tmp/tags.tif')
     assert ds.GetMetadataItem('TIFFTAG_SOFTWARE') is None, \
@@ -1960,11 +1950,9 @@ def test_tiff_write_60():
         ds = None
         gdaltest.tiff_drv.Delete('tmp/tiff_write_60.tif')
 
-        try:
+        with pytest.raises(OSError, message='%s should have been deleted' % options_tuple[1]):
             os.stat(options_tuple[1])
-            pytest.fail('%s should have been deleted' % options_tuple[1])
-        except OSError:
-            pass
+        
 
         # CreateCopy case
         src_ds = gdal.Open('data/byte.tif')
@@ -1982,11 +1970,9 @@ def test_tiff_write_60():
         ds = None
         gdaltest.tiff_drv.Delete('tmp/tiff_write_60.tif')
 
-        try:
+        with pytest.raises(OSError, message='%s should have been deleted' % options_tuple[1]):
             os.stat(options_tuple[1])
-            pytest.fail('%s should have been deleted' % options_tuple[1])
-        except OSError:
-            pass
+        
 
     
 ###############################################################################
@@ -2228,11 +2214,9 @@ def test_tiff_write_70():
     assert ds.GetRasterBand(1).GetNoDataValue() is None
     ds = None
 
-    try:
+    with pytest.raises(OSError):
         os.stat('tmp/tiff_write_70.tif.aux.xml')
-        pytest.fail()
-    except OSError:
-        pass
+    
 
     ds = gdal.Open('tmp/tiff_write_70.tif')
     assert ds.GetRasterBand(1).GetNoDataValue() is None
@@ -2607,12 +2591,10 @@ def test_tiff_write_79():
                 ds.GetProjectionRef()
             ds.SetMetadataItem('AREA_OR_POINT', 'Point')
             ds = None
-            try:
+            with pytest.raises(OSError, message='got to PAM'):
                 # check that it doesn't go to PAM
                 os.stat('tmp/tiff_write_79.tif.aux.xml')
-                pytest.fail('got to PAM')
-            except OSError:
-                pass
+            
 
             # So should get 'Area'
             ds = gdal.Open('tmp/tiff_write_79.tif')
@@ -2633,12 +2615,10 @@ def test_tiff_write_79():
                 assert mdi == 'Point', \
                     ('(3) did not get expected value. do_projection_ref = %d, check_just_after = %d' % (do_projection_ref, check_just_after))
             ds = None
-            try:
+            with pytest.raises(OSError, message='got to PAM'):
                 # check that it doesn't go to PAM
                 os.stat('tmp/tiff_write_79.tif.aux.xml')
-                pytest.fail('got to PAM')
-            except OSError:
-                pass
+            
 
             # Now should get 'Point'
             ds = gdal.Open('tmp/tiff_write_79.tif')
@@ -2684,12 +2664,10 @@ def test_tiff_write_80():
     ds.GetRasterBand(1).SetOffset(1000)
     ds = None
 
-    try:
+    with pytest.raises(OSError, message='got to PAM, but not expected...'):
         # check that it doesn't go to PAM
         os.stat('tmp/tiff_write_80.tif.aux.xml')
-        pytest.fail('got to PAM, but not expected...')
-    except OSError:
-        pass
+    
 
     ds = gdal.Open('tmp/tiff_write_80.tif')
     scale = ds.GetRasterBand(1).GetScale()
@@ -2755,12 +2733,10 @@ def test_tiff_write_80():
     ds.GetRasterBand(1).SetOffset(0)
     ds = None
 
-    try:
+    with pytest.raises(OSError, message='PAM file should be deleted'):
         # check that there is no more any PAM file
         os.stat('tmp/tiff_write_80_bis.tif.aux.xml')
-        pytest.fail('PAM file should be deleted')
-    except OSError:
-        pass
+    
 
     ds = gdal.Open('tmp/tiff_write_80_bis.tif')
     scale = ds.GetRasterBand(1).GetScale()
@@ -2903,12 +2879,10 @@ def test_tiff_write_85():
     ds.GetRasterBand(1).SetUnitType('ft')
     ds = None
 
-    try:
+    with pytest.raises(OSError, message='got to PAM, but not expected...'):
         # check that it doesn't go to PAM
         os.stat('tmp/tiff_write_85.tif.aux.xml')
-        pytest.fail('got to PAM, but not expected...')
-    except OSError:
-        pass
+    
 
     ds = gdal.Open('tmp/tiff_write_85.tif')
     unittype = ds.GetRasterBand(1).GetUnitType()
@@ -2963,12 +2937,10 @@ def test_tiff_write_85():
     ds.GetRasterBand(1).SetUnitType(None)
     ds = None
 
-    try:
+    with pytest.raises(OSError, message='PAM file should be deleted'):
         # check that there is no more any PAM file
         os.stat('tmp/tiff_write_85_bis.tif.aux.xml')
-        pytest.fail('PAM file should be deleted')
-    except OSError:
-        pass
+    
 
     ds = gdal.Open('tmp/tiff_write_85_bis.tif')
     unittype = ds.GetRasterBand(1).GetUnitType()
diff --git a/autotest/gdrivers/ecw.py b/autotest/gdrivers/ecw.py
index 4eda951d5d3d..48763caa6d5a 100755
--- a/autotest/gdrivers/ecw.py
+++ b/autotest/gdrivers/ecw.py
@@ -695,11 +695,9 @@ def test_ecw_24():
     ds.SetGeoTransform(gt)
     ds = None
 
-    try:
+    with pytest.raises(OSError):
         os.stat('tmp/spif83.ecw.aux.xml')
-        pytest.fail()
-    except OSError:
-        pass
+    
 
     ds = gdal.Open('tmp/spif83.ecw')
     got_gt = ds.GetGeoTransform()
@@ -746,11 +744,9 @@ def test_ecw_25():
     ds.SetProjection(wkt)
     ds = None
 
-    try:
+    with pytest.raises(OSError):
         os.stat('tmp/spif83.ecw.aux.xml')
-        pytest.fail()
-    except OSError:
-        pass
+    
 
     ds = gdal.Open('tmp/spif83.ecw')
     got_proj = ds.GetMetadataItem("PROJ", "ECW")
@@ -802,11 +798,9 @@ def test_ecw_26():
     ds.SetMetadataItem("UNITS", units, "ECW")
     ds = None
 
-    try:
+    with pytest.raises(OSError):
         os.stat('tmp/spif83.ecw.aux.xml')
-        pytest.fail()
-    except OSError:
-        pass
+    
 
     ds = gdal.Open('tmp/spif83.ecw')
     got_proj = ds.GetMetadataItem("PROJ", "ECW")
@@ -1407,11 +1401,9 @@ def test_ecw_41():
     ds = None
 
     # Check that there's no .aux.xml file
-    try:
+    with pytest.raises(OSError):
         os.stat('tmp/stefan_full_rgba_ecwv3_meta.ecw.aux.xml')
-        pytest.fail()
-    except OSError:
-        pass
+    
 
     ds = gdal.Open('tmp/stefan_full_rgba_ecwv3_meta.ecw')
     assert ds.GetRasterBand(1).GetMinimum() == 0
@@ -1443,11 +1435,9 @@ def test_ecw_41():
     ds = None
 
     # Check that there's no .aux.xml file
-    try:
+    with pytest.raises(OSError):
         os.stat('tmp/stefan_full_rgba_ecwv3_meta.ecw.aux.xml')
-        pytest.fail()
-    except OSError:
-        pass
+    
 
     
 ###############################################################################
@@ -1481,11 +1471,9 @@ def test_ecw_42():
     ds = None
 
     # Check that there's no .aux.xml file
-    try:
+    with pytest.raises(OSError):
         os.stat('tmp/stefan_full_rgba_ecwv3_meta.ecw.aux.xml')
-        pytest.fail()
-    except OSError:
-        pass
+    
 
     # Check item values
     ds = gdal.Open('tmp/stefan_full_rgba_ecwv3_meta.ecw')
@@ -1511,11 +1499,9 @@ def test_ecw_42():
     ds = None
 
     # Check that there's no .aux.xml file
-    try:
+    with pytest.raises(OSError):
         os.stat('tmp/stefan_full_rgba_ecwv3_meta.ecw.aux.xml')
-        pytest.fail()
-    except OSError:
-        pass
+    
 
     # Check item values
     ds = gdal.Open('tmp/stefan_full_rgba_ecwv3_meta.ecw')
diff --git a/autotest/gdrivers/gdalhttp.py b/autotest/gdrivers/gdalhttp.py
index e3b4afbcdec1..63fb1a925cae 100755
--- a/autotest/gdrivers/gdalhttp.py
+++ b/autotest/gdrivers/gdalhttp.py
@@ -191,11 +191,9 @@ def test_http_5():
     filename = ds.GetDescription()
     ds = None
 
-    try:
+    with pytest.raises(OSError, message='file %s should have been removed' % filename):
         os.stat(filename)
-        pytest.fail('file %s should have been removed' % filename)
-    except OSError:
-        pass
+    
 
     
 ###############################################################################
diff --git a/autotest/gdrivers/hfa.py b/autotest/gdrivers/hfa.py
index f80a116a1626..83556695fc8f 100755
--- a/autotest/gdrivers/hfa.py
+++ b/autotest/gdrivers/hfa.py
@@ -407,11 +407,9 @@ def test_hfa_clean_ige():
     out_ds = drv.CreateCopy('tmp/igetest.img', src_ds)
     del out_ds
 
-    try:
+    with pytest.raises(IOError, message='ige file not cleaned up properly.'):
         open('tmp/igetest.ige')
-        pytest.fail('ige file not cleaned up properly.')
-    except IOError:
-        pass
+    
 
     drv.Delete('tmp/igetest.img')
 
@@ -920,11 +918,9 @@ def test_hfa_write_bit2grayscale():
     gdal.SetConfigOption('HFA_USE_RRD', 'NO')
 
     # as an aside, confirm the .rrd file was deleted.
-    try:
+    with pytest.raises(IOError, message='tmp/small1bit.rrd not deleted!'):
         open('tmp/small1bit.rrd')
-        pytest.fail('tmp/small1bit.rrd not deleted!')
-    except IOError:
-        pass
+    
 
     
 ###############################################################################
diff --git a/autotest/gdrivers/jp2metadata.py b/autotest/gdrivers/jp2metadata.py
index 4fbc991e98f7..e8dbb1cbd439 100755
--- a/autotest/gdrivers/jp2metadata.py
+++ b/autotest/gdrivers/jp2metadata.py
@@ -86,11 +86,9 @@ def test_jp2metadata_2():
 
     ds = None
 
-    try:
+    with pytest.raises(OSError, message='Expected not generation of data/IMG_md_ple_R1C1.jp2.aux.xml'):
         os.stat('data/IMG_md_ple_R1C1.jp2.aux.xml')
-        pytest.fail('Expected not generation of data/IMG_md_ple_R1C1.jp2.aux.xml')
-    except OSError:
-        pass
+    
 
     
 ###############################################################################
diff --git a/autotest/gdrivers/jpeg.py b/autotest/gdrivers/jpeg.py
index 047cdb73750e..78853c41fbe8 100755
--- a/autotest/gdrivers/jpeg.py
+++ b/autotest/gdrivers/jpeg.py
@@ -152,11 +152,9 @@ def test_jpeg_3():
 
     gdal.GetDriverByName('JPEG').Delete('tmp/byte.jpg')
 
-    try:
+    with pytest.raises(OSError, message='did not expect to find .wld file at that point'):
         os.stat('tmp/byte.wld')
-        pytest.fail('did not expect to find .wld file at that point')
-    except OSError:
-        pass
+    
 
     
 ###############################################################################
diff --git a/autotest/gdrivers/jpeg_profile.py b/autotest/gdrivers/jpeg_profile.py
index 1ecff301cfc7..d12dc55c29c3 100755
--- a/autotest/gdrivers/jpeg_profile.py
+++ b/autotest/gdrivers/jpeg_profile.py
@@ -144,11 +144,9 @@ def test_jpeg_copy_icc_64K():
     comment = ds2.GetMetadataItem('COMMENT')
     ds2 = None
 
-    try:
+    with pytest.raises(OSError):
         os.stat('tmp/icc_test.jpg.aux.xml')
-        pytest.fail()
-    except OSError:
-        pass
+    
 
     assert comment == 'foo'
 
@@ -159,11 +157,9 @@ def test_jpeg_copy_icc_64K():
     md = ds2.GetMetadata("COLOR_PROFILE")
     ds2 = None
 
-    try:
+    with pytest.raises(OSError):
         os.stat('tmp/icc_test.jpg.aux.xml')
-        pytest.fail()
-    except OSError:
-        pass
+    
 
     assert md['SOURCE_ICC_PROFILE'] == icc
 
@@ -172,11 +168,9 @@ def test_jpeg_copy_icc_64K():
     source_icc_profile = ds2.GetMetadataItem("SOURCE_ICC_PROFILE", "COLOR_PROFILE")
     ds2 = None
 
-    try:
+    with pytest.raises(OSError):
         os.stat('tmp/icc_test.jpg.aux.xml')
-        pytest.fail()
-    except OSError:
-        pass
+    
 
     assert source_icc_profile == icc
 
diff --git a/autotest/gdrivers/png_profile.py b/autotest/gdrivers/png_profile.py
index 4fcad2eb723d..7b9106074279 100755
--- a/autotest/gdrivers/png_profile.py
+++ b/autotest/gdrivers/png_profile.py
@@ -65,22 +65,18 @@ def test_png_copy_icc():
 
     assert md['SOURCE_ICC_PROFILE'] == icc
 
-    try:
+    with pytest.raises(OSError):
         os.stat('tmp/icc_test.png.aux.xml')
-        pytest.fail()
-    except OSError:
-        pass
+    
 
     # Check again with dataset from Open()
     ds2 = gdal.Open('tmp/icc_test.png')
     md = ds2.GetMetadata("COLOR_PROFILE")
     ds2 = None
 
-    try:
+    with pytest.raises(OSError):
         os.stat('tmp/icc_test.png.aux.xml')
-        pytest.fail()
-    except OSError:
-        pass
+    
 
     assert md['SOURCE_ICC_PROFILE'] == icc
 
@@ -89,11 +85,9 @@ def test_png_copy_icc():
     source_icc_profile = ds2.GetMetadataItem("SOURCE_ICC_PROFILE", "COLOR_PROFILE")
     ds2 = None
 
-    try:
+    with pytest.raises(OSError):
         os.stat('tmp/icc_test.png.aux.xml')
-        pytest.fail()
-    except OSError:
-        pass
+    
 
     assert source_icc_profile == icc
 
diff --git a/autotest/gdrivers/tiff_profile.py b/autotest/gdrivers/tiff_profile.py
index 043ccd75ccc4..02b83f57072b 100755
--- a/autotest/gdrivers/tiff_profile.py
+++ b/autotest/gdrivers/tiff_profile.py
@@ -60,11 +60,9 @@ def test_tiff_write_icc():
     md = ds.GetMetadata("COLOR_PROFILE")
     ds = None
 
-    try:
+    with pytest.raises(OSError):
         os.stat('tmp/icc_test.tiff.aux.xml')
-        pytest.fail()
-    except OSError:
-        pass
+    
 
     assert md['SOURCE_ICC_PROFILE'] == icc
 
@@ -73,11 +71,9 @@ def test_tiff_write_icc():
     md = ds.GetMetadata("COLOR_PROFILE")
     ds = None
 
-    try:
+    with pytest.raises(OSError):
         os.stat('tmp/icc_test.tiff.aux.xml')
-        pytest.fail()
-    except OSError:
-        pass
+    
 
     assert md['SOURCE_ICC_PROFILE'] == icc
 
@@ -86,11 +82,9 @@ def test_tiff_write_icc():
     source_icc_profile = ds.GetMetadataItem("SOURCE_ICC_PROFILE", "COLOR_PROFILE")
     ds = None
 
-    try:
+    with pytest.raises(OSError):
         os.stat('tmp/icc_test.tiff.aux.xml')
-        pytest.fail()
-    except OSError:
-        pass
+    
 
     assert source_icc_profile == icc
 
diff --git a/autotest/gdrivers/til.py b/autotest/gdrivers/til.py
index 2e60ee30ae48..286612448df3 100755
--- a/autotest/gdrivers/til.py
+++ b/autotest/gdrivers/til.py
@@ -69,11 +69,9 @@ def test_til_2():
 
     ds = None
 
-    try:
+    with pytest.raises(OSError, message='Expected not generation of data/testtil.til.aux.xml'):
         os.stat('data/testtil.til.aux.xml')
-        pytest.fail('Expected not generation of data/testtil.til.aux.xml')
-    except OSError:
-        pass
+    
 
     
 ###############################################################################
@@ -100,11 +98,9 @@ def test_til_3():
 
     ds = None
 
-    try:
+    with pytest.raises(OSError, message='Expected not generation of data/testtil.til.aux.xml'):
         os.stat('data/testtil.til.aux.xml')
-        pytest.fail('Expected not generation of data/testtil.til.aux.xml')
-    except OSError:
-        pass
+    
 
     
 
diff --git a/autotest/gdrivers/vrtmask.py b/autotest/gdrivers/vrtmask.py
index edbc14ef1e7f..478a94da7611 100755
--- a/autotest/gdrivers/vrtmask.py
+++ b/autotest/gdrivers/vrtmask.py
@@ -257,11 +257,9 @@ def test_vrtmask_7():
     ds = None
 
     os.remove('tmp/vrtmask_7_rgba.tif')
-    try:
+    with pytest.raises(OSError, message='did not expect tmp/vrtmask_7_rgba.tif.msk'):
         os.remove('tmp/vrtmask_7_rgba.tif.msk')
-        pytest.fail('did not expect tmp/vrtmask_7_rgba.tif.msk')
-    except OSError:
-        pass
+    
     os.remove('tmp/vrtmask_7_rgbmask.vrt')
 
     assert alpha_cs == expected_msk_cs, 'did not get expected alpha band checksum'
diff --git a/autotest/gnm/gnm_test.py b/autotest/gnm/gnm_test.py
index 5265f626987b..1911c6305103 100755
--- a/autotest/gnm/gnm_test.py
+++ b/autotest/gnm/gnm_test.py
@@ -224,11 +224,9 @@ def test_gnm_delete():
 
     gdal.GetDriverByName('GNMFile').Delete('tmp/test_gnm')
 
-    try:
+    with pytest.raises(OSError, message='Expected delete tmp/test_gnm'):
         os.stat('tmp/test_gnm')
-        pytest.fail('Expected delete tmp/test_gnm')
-    except OSError:
-        pass
+    
 
     
 
diff --git a/autotest/ogr/ogr_fgdb.py b/autotest/ogr/ogr_fgdb.py
index 0259e0737254..36e01bb8255f 100755
--- a/autotest/ogr/ogr_fgdb.py
+++ b/autotest/ogr/ogr_fgdb.py
@@ -401,11 +401,9 @@ def test_ogr_fgdb_5():
     assert ogrtest.fgdb_drv.DeleteDataSource("tmp/test.gdb") == 0, \
         'DeleteDataSource() failed'
 
-    try:
+    with pytest.raises(OSError, message="tmp/test.gdb still existing"):
         os.stat("tmp/test.gdb")
-        pytest.fail("tmp/test.gdb still existing")
-    except OSError:
-        pass
+    
 
     
 ###############################################################################
@@ -1104,11 +1102,9 @@ def test_ogr_fgdb_19():
         os.stat('tmp/test.gdb.ogredited')
     except OSError:
         pytest.fail()
-    try:
+    with pytest.raises(OSError):
         os.stat('tmp/test.gdb.ogrtmp')
-        pytest.fail()
-    except OSError:
-        pass
+    
 
     ret = lyr.CreateField(ogr.FieldDefn('foobar', ogr.OFTString))
     assert ret == 0
@@ -1172,17 +1168,13 @@ def test_ogr_fgdb_19():
     # Test that CommitTransaction() works
     assert ds.CommitTransaction() == 0
 
-    try:
+    with pytest.raises(OSError):
         os.stat('tmp/test.gdb.ogredited')
-        pytest.fail()
-    except OSError:
-        pass
+    
 
-    try:
+    with pytest.raises(OSError):
         os.stat('tmp/test.gdb.ogrtmp')
-        pytest.fail()
-    except OSError:
-        pass
+    
 
     lst = gdal.ReadDir('tmp/test.gdb')
     for filename in lst:
@@ -1225,17 +1217,13 @@ def test_ogr_fgdb_19():
 
     assert ds.RollbackTransaction() == 0
 
-    try:
+    with pytest.raises(OSError):
         os.stat('tmp/test.gdb.ogredited')
-        pytest.fail()
-    except OSError:
-        pass
+    
 
-    try:
+    with pytest.raises(OSError):
         os.stat('tmp/test.gdb.ogrtmp')
-        pytest.fail()
-    except OSError:
-        pass
+    
 
     assert lyr.GetFeatureCount() == old_count
 
@@ -1434,11 +1422,9 @@ def test_ogr_fgdb_19():
             ds = None
 
             if case == 'CASE4':
-                try:
+                with pytest.raises(OSError, message=case):
                     os.stat('tmp/test.gdb.ogredited')
-                    pytest.fail(case)
-                except OSError:
-                    pass
+                
             else:
                 shutil.rmtree('tmp/test.gdb.ogredited')
 
diff --git a/autotest/ogr/ogr_gml_read.py b/autotest/ogr/ogr_gml_read.py
index 66699abcc544..4b037d387e34 100755
--- a/autotest/ogr/ogr_gml_read.py
+++ b/autotest/ogr/ogr_gml_read.py
@@ -1206,11 +1206,9 @@ def test_ogr_gml_35():
     ds = ogr.Open('tmp/GmlTopo-sample.xml')
     gdal.SetConfigOption('GML_SKIP_RESOLVE_ELEMS', None)
 
-    try:
+    with pytest.raises(OSError, message='did not expect tmp/GmlTopo-sample.sqlite'):
         os.stat('tmp/GmlTopo-sample.sqlite')
-        pytest.fail('did not expect tmp/GmlTopo-sample.sqlite')
-    except OSError:
-        pass
+    
 
     assert gdal.GetLastErrorMsg() == '', 'did not expect error'
     assert ds.GetLayerCount() == 3, ('expected 3 layers, got %d' % ds.GetLayerCount())
@@ -1323,11 +1321,9 @@ def test_ogr_gml_38(resolver='HUGE'):
     gdal.SetConfigOption('GML_FACE_HOLE_NEGATIVE', None)
 
     if resolver == 'HUGE':
-        try:
+        with pytest.raises(OSError, message='did not expect tmp/sample_gml_face_hole_negative_no.sqlite'):
             os.stat('tmp/sample_gml_face_hole_negative_no.sqlite')
-            pytest.fail('did not expect tmp/sample_gml_face_hole_negative_no.sqlite')
-        except OSError:
-            pass
+        
 
     assert gdal.GetLastErrorMsg() == '', 'did not expect error'
 
@@ -1949,11 +1945,9 @@ def test_ogr_gml_55():
     assert lyr.GetLayerDefn().GetFieldDefn(0).GetType() == ogr.OFTString
     ds = None
 
-    try:
+    with pytest.raises(OSError):
         os.unlink('data/ogr_gml_55.gfs')
-        pytest.fail()
-    except OSError:
-        pass
+    
 
     
 ###############################################################################
@@ -1995,11 +1989,9 @@ def test_ogr_gml_56():
     assert feat.GetField('gml_id') == 'subFeatureRepeated.1'
     ds = None
 
-    try:
+    with pytest.raises(OSError):
         os.unlink('data/ogr_gml_56.gfs')
-        pytest.fail()
-    except OSError:
-        pass
+    
 
     
 ###############################################################################
@@ -3095,11 +3087,9 @@ def test_ogr_gml_71():
     ogr_gml_71_helper(ds)
     ds = None
 
-    try:
+    with pytest.raises(OSError):
         os.unlink('data/wfsjointlayer.gfs')
-        pytest.fail()
-    except OSError:
-        pass
+    
 
     # With .xsd but that is only partially understood
     ds = gdal.OpenEx('data/wfsjointlayer.gml', open_options=['XSD=data/wfsjointlayer_not_understood.xsd'])
diff --git a/autotest/ogr/ogr_index_test.py b/autotest/ogr/ogr_index_test.py
index f37869b8b96e..18f219b33a25 100755
--- a/autotest/ogr/ogr_index_test.py
+++ b/autotest/ogr/ogr_index_test.py
@@ -223,11 +223,9 @@ def test_ogr_index_9():
     # After dataset closing, check that the index files do not exist after
     # dropping the index
     for filename in ['join_t.idm', 'join_t.ind']:
-        try:
+        with pytest.raises(OSError, message="%s should not exist" % filename):
             os.stat(filename)
-            pytest.fail("%s should not exist" % filename)
-        except OSError:
-            pass
+        
 
     # Re-create an index
     gdaltest.s_ds = ogr.OpenShared('join_t.dbf', update=1)
@@ -432,11 +430,9 @@ def test_ogr_index_cleanup():
     ogr.GetDriverByName('ESRI Shapefile').DeleteDataSource('join_t.dbf')
 
     for filename in ['join_t.idm', 'join_t.ind']:
-        try:
+        with pytest.raises(OSError, message="%s should not exist" % filename):
             os.stat(filename)
-            pytest.fail("%s should not exist" % filename)
-        except OSError:
-            pass
+        
 
     ogr.GetDriverByName('ESRI Shapefile').DeleteDataSource(
         'tmp/ogr_index_10.shp')
diff --git a/autotest/ogr/ogr_rfc41.py b/autotest/ogr/ogr_rfc41.py
index 56f48f9fea59..db98b1ba430b 100755
--- a/autotest/ogr/ogr_rfc41.py
+++ b/autotest/ogr/ogr_rfc41.py
@@ -344,23 +344,17 @@ def test_ogr_rfc41_5():
     assert f['geomfield'] is None
     assert f.geomfield is None
 
-    try:
+    with pytest.raises(KeyError):
         f['nonexistent_field']
-        pytest.fail()
-    except KeyError:
-        pass
+    
 
-    try:
+    with pytest.raises(AttributeError):
         f.nonexistent_field
-        pytest.fail()
-    except AttributeError:
-        pass
+    
 
-    try:
+    with pytest.raises(KeyError):
         f['nonexistent_field'] = 'foo'
-        pytest.fail()
-    except KeyError:
-        pass
+    
 
     # This works.  Default Python behaviour. Stored in a dictionary
     f.nonexistent_field = 'bar'
diff --git a/autotest/ogr/ogr_shape.py b/autotest/ogr/ogr_shape.py
index eaf293411261..0ad73d6875e8 100755
--- a/autotest/ogr/ogr_shape.py
+++ b/autotest/ogr/ogr_shape.py
@@ -2771,11 +2771,9 @@ def test_ogr_shape_67():
     ds.ExecuteSQL('DROP SPATIAL INDEX ON emptyshapefilewithsbn')
     ds = None
 
-    try:
+    with pytest.raises(OSError):
         os.stat('tmp/emptyshapefilewithsbn.sbn')
-        pytest.fail()
-    except OSError:
-        pass
+    
 
     os.unlink('tmp/emptyshapefilewithsbn.shp')
     os.unlink('tmp/emptyshapefilewithsbn.shx')
diff --git a/autotest/ogr/ogr_sql_test.py b/autotest/ogr/ogr_sql_test.py
index 035a35266615..57106ccc1e4a 100755
--- a/autotest/ogr/ogr_sql_test.py
+++ b/autotest/ogr/ogr_sql_test.py
@@ -627,11 +627,9 @@ def test_ogr_sql_28():
     field_defn = ogr.FieldDefn("strfield2", ogr.OFTString)
     lyr.CreateField(field_defn)
 
-    try:
+    with pytest.raises(Exception, message='expected error on NULL query'):
         sql_lyr = ds.ExecuteSQL(None)
-        pytest.fail('expected error on NULL query')
-    except:
-        pass
+    
 
     queries = [
         '',
diff --git a/autotest/pyscripts/test_gdal_edit.py b/autotest/pyscripts/test_gdal_edit.py
index 06d7b099f47e..b9ea6f9a02eb 100755
--- a/autotest/pyscripts/test_gdal_edit.py
+++ b/autotest/pyscripts/test_gdal_edit.py
@@ -168,11 +168,9 @@ def test_gdal_edit_py_4():
             band.GetMetadataItem('FOO') is None))
     ds = band = None
 
-    try:
+    with pytest.raises(OSError):
         os.stat('tmp/test_gdal_edit_py.tif.aux.xml')
-        pytest.fail()
-    except OSError:
-        pass
+    
 
     
 ###############################################################################
diff --git a/autotest/utilities/test_gdal_translate.py b/autotest/utilities/test_gdal_translate.py
index 4cb92ecc90f3..d48b32b950b2 100755
--- a/autotest/utilities/test_gdal_translate.py
+++ b/autotest/utilities/test_gdal_translate.py
@@ -502,11 +502,9 @@ def test_gdal_translate_23():
 
     assert md['STATISTICS_MINIMUM'] == '74', 'STATISTICS_MINIMUM is wrong.'
 
-    try:
+    with pytest.raises(OSError, message='did not expect .aux.xml file presence'):
         os.stat('tmp/test_gdal_translate_23.tif.aux.xml')
-        pytest.fail('did not expect .aux.xml file presence')
-    except OSError:
-        pass
+    
 
     gdal.Unlink('../gcore/data/byte.tif.aux.xml')
 
diff --git a/autotest/utilities/test_gdal_translate_lib.py b/autotest/utilities/test_gdal_translate_lib.py
index 9152d012aecd..9c9b9af8e988 100755
--- a/autotest/utilities/test_gdal_translate_lib.py
+++ b/autotest/utilities/test_gdal_translate_lib.py
@@ -434,12 +434,10 @@ def test_gdal_translate_lib_colorinterp():
     assert ds.GetRasterBand(3).GetColorInterpretation() == gdal.GCI_BlueBand
 
     # Test invalid colorinterp_
-    try:
+    with pytest.raises(Exception):
         with gdaltest.error_handler():
             gdal.Translate('', src_ds, options='-f MEM -colorinterp_0 alpha')
-        pytest.fail()
-    except:
-        pass
+            
 
     
 ###############################################################################
diff --git a/autotest/utilities/test_gdaladdo.py b/autotest/utilities/test_gdaladdo.py
index 6713dab848ca..434733495274 100755
--- a/autotest/utilities/test_gdaladdo.py
+++ b/autotest/utilities/test_gdaladdo.py
@@ -129,11 +129,9 @@ def test_gdaladdo_4():
 
     assert cnt == 0, 'did not clean overviews.'
 
-    try:
+    with pytest.raises(OSError, message='.ovr file still exists'):
         os.stat('tmp/test_gdaladdo_3.tif.ovr')
-        pytest.fail('.ovr file still exists')
-    except OSError:
-        pass
+    
 
     os.remove('tmp/test_gdaladdo_3.tif')
 
diff --git a/autotest/utilities/test_gnmutils.py b/autotest/utilities/test_gnmutils.py
index 3113a329992d..47a0942b5be1 100755
--- a/autotest/utilities/test_gnmutils.py
+++ b/autotest/utilities/test_gnmutils.py
@@ -139,11 +139,9 @@ def test_gnm_cleanup():
     (_, err) = gdaltest.runexternal_out_and_err(test_cli_utilities.get_gnmmanage_path() + ' delete tmp/test_gnm')
     assert (err is None or err == ''), 'got error/warning'
 
-    try:
+    with pytest.raises(OSError, message='Expected delete tmp/test_gnm'):
         os.stat('tmp/test_gnm')
-        pytest.fail('Expected delete tmp/test_gnm')
-    except OSError:
-        pass
+    
 
     
 

From 2e4ce80882ac182fbef7d4db2b5aee28497b9a5a Mon Sep 17 00:00:00 2001
From: Craig de Stigter <craig.destigter@koordinates.com>
Date: Mon, 10 Dec 2018 09:29:00 +1300
Subject: [PATCH 144/488] Automated: Some autoflake cleanup

Remove unused vars/imports, using:
```
autoflake --in-place --remove-unused-variables --imports 'gdaltest,ogrtest,pytest'
```
---
 autotest/alg/applyverticalshiftgrid.py        |  1 -
 autotest/alg/contour.py                       |  1 -
 autotest/alg/cutline.py                       |  1 -
 autotest/alg/dither.py                        |  1 -
 autotest/alg/polygonize.py                    |  1 -
 autotest/alg/proximity.py                     |  1 -
 autotest/alg/rasterize.py                     |  1 -
 autotest/alg/reproject.py                     |  1 -
 autotest/alg/sieve.py                         |  1 -
 autotest/alg/tps.py                           |  1 -
 autotest/alg/transformgeoloc.py               |  1 -
 autotest/alg/warp.py                          |  1 -
 autotest/gcore/asyncreader.py                 |  1 -
 autotest/gcore/bmp_read.py                    |  1 -
 autotest/gcore/bmp_write.py                   |  1 -
 autotest/gcore/colortable.py                  |  1 -
 autotest/gcore/envi_read.py                   |  1 -
 autotest/gcore/gcps2geotransform.py           |  1 -
 autotest/gcore/gdal_api_proxy.py              |  2 --
 autotest/gcore/gdal_stats.py                  |  1 -
 autotest/gcore/geoloc.py                      |  1 -
 autotest/gcore/hdf4_read.py                   | 15 +++++------
 autotest/gcore/hfa_read.py                    |  1 -
 autotest/gcore/hfa_rfc40.py                   |  1 -
 autotest/gcore/hfa_srs.py                     |  1 -
 autotest/gcore/hfa_write.py                   |  1 -
 autotest/gcore/histogram.py                   |  1 -
 autotest/gcore/identify.py                    |  1 -
 autotest/gcore/mask.py                        |  1 -
 autotest/gcore/minixml.py                     |  1 -
 autotest/gcore/misc.py                        |  1 -
 autotest/gcore/numpy_rw.py                    |  1 -
 autotest/gcore/overviewds.py                  |  1 -
 autotest/gcore/pam.py                         |  1 -
 autotest/gcore/pixfun.py                      |  1 -
 autotest/gcore/rat.py                         |  1 -
 autotest/gcore/rfc30.py                       |  1 -
 autotest/gcore/testnonboundtoswig.py          |  1 -
 autotest/gcore/thread_test.py                 |  1 -
 autotest/gcore/tiff_srs.py                    |  1 -
 autotest/gcore/transformer.py                 |  1 -
 autotest/gcore/vrtmisc.py                     |  1 -
 autotest/gcore/vsicrypt.py                    |  1 -
 autotest/gcore/vsicurl.py                     |  1 -
 autotest/gcore/vsicurl_streaming.py           |  1 -
 autotest/gcore/vsihdfs.py                     |  1 -
 autotest/gcore/vsistdin.py                    |  1 -
 autotest/gcore/vsizip.py                      |  1 -
 autotest/gdrivers/aaigrid.py                  |  1 -
 autotest/gdrivers/ace2.py                     |  1 -
 autotest/gdrivers/adrg.py                     |  1 -
 autotest/gdrivers/aigrid.py                   |  3 +--
 autotest/gdrivers/arg.py                      |  1 -
 autotest/gdrivers/bag.py                      |  1 -
 autotest/gdrivers/blx.py                      |  1 -
 autotest/gdrivers/bsb.py                      |  1 -
 autotest/gdrivers/bt.py                       |  1 -
 autotest/gdrivers/byn.py                      |  1 -
 autotest/gdrivers/cals.py                     |  1 -
 autotest/gdrivers/ceos.py                     |  1 -
 autotest/gdrivers/cpg.py                      |  1 -
 autotest/gdrivers/ctg.py                      |  1 -
 autotest/gdrivers/derived.py                  |  1 -
 autotest/gdrivers/dimap.py                    |  1 -
 autotest/gdrivers/dipex.py                    |  1 -
 autotest/gdrivers/dods.py                     |  1 -
 autotest/gdrivers/doq1.py                     |  1 -
 autotest/gdrivers/doq2.py                     |  1 -
 autotest/gdrivers/dted.py                     |  1 -
 autotest/gdrivers/e00grid.py                  |  1 -
 autotest/gdrivers/ecrgtoc.py                  |  1 -
 autotest/gdrivers/ehdr.py                     |  1 -
 autotest/gdrivers/eir.py                      |  1 -
 autotest/gdrivers/elas.py                     |  1 -
 autotest/gdrivers/envi.py                     |  1 -
 autotest/gdrivers/ers.py                      |  1 -
 autotest/gdrivers/fast.py                     |  1 -
 autotest/gdrivers/fujibas.py                  |  1 -
 autotest/gdrivers/genbin.py                   |  1 -
 autotest/gdrivers/georaster.py                |  1 -
 autotest/gdrivers/gff.py                      |  1 -
 autotest/gdrivers/gif.py                      |  1 -
 autotest/gdrivers/gmt.py                      |  1 -
 autotest/gdrivers/grass.py                    |  1 -
 autotest/gdrivers/grassasciigrid.py           |  1 -
 autotest/gdrivers/gsc.py                      |  1 -
 autotest/gdrivers/gsg.py                      |  1 -
 autotest/gdrivers/gta.py                      |  1 -
 autotest/gdrivers/gtx.py                      |  1 -
 autotest/gdrivers/gxf.py                      |  1 -
 autotest/gdrivers/hdf5.py                     |  1 -
 autotest/gdrivers/hf2.py                      |  1 -
 autotest/gdrivers/hfa.py                      |  1 -
 autotest/gdrivers/ida.py                      |  1 -
 autotest/gdrivers/idrisi.py                   |  1 -
 autotest/gdrivers/ilwis.py                    |  1 -
 autotest/gdrivers/ingr.py                     |  3 +--
 autotest/gdrivers/iris.py                     |  1 -
 autotest/gdrivers/isce.py                     |  1 -
 autotest/gdrivers/isis.py                     |  1 -
 autotest/gdrivers/isis2.py                    |  1 -
 autotest/gdrivers/jdem.py                     |  1 -
 autotest/gdrivers/jp2kak.py                   |  1 -
 autotest/gdrivers/jp2metadata.py              |  1 -
 autotest/gdrivers/jpeg2000.py                 |  1 -
 autotest/gdrivers/jpeg_profile.py             |  1 -
 autotest/gdrivers/jpegls.py                   |  1 -
 autotest/gdrivers/jpipkak.py                  |  1 -
 autotest/gdrivers/kea.py                      |  1 -
 autotest/gdrivers/kmlsuperoverlay.py          |  1 -
 autotest/gdrivers/kro.py                      |  1 -
 autotest/gdrivers/l1b.py                      |  1 -
 autotest/gdrivers/lan.py                      |  1 -
 autotest/gdrivers/lcp.py                      |  1 -
 autotest/gdrivers/leveller.py                 |  1 -
 autotest/gdrivers/loslas.py                   |  1 -
 autotest/gdrivers/mem.py                      |  1 -
 autotest/gdrivers/mff.py                      |  1 -
 autotest/gdrivers/mff2.py                     |  1 -
 autotest/gdrivers/mg4lidar.py                 |  1 -
 autotest/gdrivers/mrf.py                      |  1 -
 autotest/gdrivers/mrsid.py                    |  1 -
 autotest/gdrivers/ndf.py                      |  1 -
 autotest/gdrivers/netcdf.py                   | 12 ++++-----
 autotest/gdrivers/netcdf_cf.py                |  1 -
 autotest/gdrivers/ngsgeoid.py                 |  1 -
 autotest/gdrivers/nitf.py                     |  2 +-
 autotest/gdrivers/ntv2.py                     |  1 -
 autotest/gdrivers/nwt_grc.py                  |  1 -
 autotest/gdrivers/nwt_grd.py                  |  1 -
 autotest/gdrivers/ozi.py                      |  1 -
 autotest/gdrivers/paux.py                     |  1 -
 autotest/gdrivers/pcidsk.py                   |  1 -
 autotest/gdrivers/pcraster.py                 |  1 -
 autotest/gdrivers/pds.py                      |  1 -
 autotest/gdrivers/pds4.py                     |  1 -
 autotest/gdrivers/plmosaic.py                 |  1 -
 autotest/gdrivers/png.py                      |  1 -
 autotest/gdrivers/png_profile.py              |  1 -
 autotest/gdrivers/pnm.py                      |  1 -
 autotest/gdrivers/postgisraster.py            |  1 -
 autotest/gdrivers/prf.py                      |  1 -
 autotest/gdrivers/r.py                        |  1 -
 autotest/gdrivers/rasdaman.py                 |  1 -
 autotest/gdrivers/rasterlite.py               |  1 -
 autotest/gdrivers/rda.py                      |  1 -
 autotest/gdrivers/rik.py                      |  1 -
 autotest/gdrivers/rl2.py                      |  1 -
 autotest/gdrivers/rmf.py                      |  9 +++----
 autotest/gdrivers/roipac.py                   |  1 -
 autotest/gdrivers/rpftoc.py                   |  1 -
 autotest/gdrivers/rraster.py                  |  1 -
 autotest/gdrivers/rs2.py                      |  1 -
 autotest/gdrivers/safe.py                     |  1 -
 autotest/gdrivers/saga.py                     |  1 -
 autotest/gdrivers/sar_ceos.py                 |  1 -
 autotest/gdrivers/sdts.py                     |  1 -
 autotest/gdrivers/sgi.py                      |  1 -
 autotest/gdrivers/sigdem.py                   |  1 -
 autotest/gdrivers/snodas.py                   |  1 -
 autotest/gdrivers/srp.py                      |  1 -
 autotest/gdrivers/srtmhgt.py                  |  1 -
 autotest/gdrivers/terragen.py                 |  1 -
 autotest/gdrivers/til.py                      |  1 -
 autotest/gdrivers/usgsdem.py                  |  1 -
 autotest/gdrivers/vicar.py                    |  1 -
 autotest/gdrivers/vrtderived.py               |  1 -
 autotest/gdrivers/vrtfilt.py                  |  1 -
 autotest/gdrivers/vrtlut.py                   |  1 -
 autotest/gdrivers/vrtmask.py                  |  1 -
 autotest/gdrivers/vrtovr.py                   |  1 -
 autotest/gdrivers/vrtpansharpen.py            |  1 -
 autotest/gdrivers/vrtrawlink.py               |  1 -
 autotest/gdrivers/vrtwarp.py                  |  1 -
 autotest/gdrivers/wcs.py                      |  1 -
 autotest/gdrivers/webp.py                     |  1 -
 autotest/gdrivers/wms.py                      |  1 -
 autotest/gdrivers/wmts.py                     |  1 -
 autotest/gdrivers/xpm.py                      |  1 -
 autotest/gdrivers/xyz.py                      |  1 -
 autotest/gdrivers/zmap.py                     |  1 -
 autotest/gnm/gnm_test.py                      |  1 -
 autotest/ogr/ogr_arcgen.py                    |  1 -
 autotest/ogr/ogr_avc.py                       |  1 -
 autotest/ogr/ogr_bna.py                       |  1 -
 autotest/ogr/ogr_cad.py                       |  1 -
 autotest/ogr/ogr_carto.py                     |  1 -
 autotest/ogr/ogr_cloudant.py                  |  1 -
 autotest/ogr/ogr_couchdb.py                   |  1 -
 autotest/ogr/ogr_csw.py                       |  1 -
 autotest/ogr/ogr_db2.py                       |  1 -
 autotest/ogr/ogr_db2_hack.py                  |  1 -
 autotest/ogr/ogr_dgn.py                       |  1 -
 autotest/ogr/ogr_dgnv8.py                     |  1 -
 autotest/ogr/ogr_dods.py                      |  1 -
 autotest/ogr/ogr_dxf.py                       |  1 -
 autotest/ogr/ogr_edigeo.py                    |  1 -
 autotest/ogr/ogr_eeda.py                      |  1 -
 autotest/ogr/ogr_elasticsearch.py             |  1 -
 autotest/ogr/ogr_factory.py                   |  1 -
 autotest/ogr/ogr_fgdb.py                      |  1 -
 autotest/ogr/ogr_fgdb_stress_test.py          |  1 -
 autotest/ogr/ogr_geoconcept.py                |  1 -
 autotest/ogr/ogr_geojson.py                   |  1 -
 autotest/ogr/ogr_geojsonseq.py                |  1 -
 autotest/ogr/ogr_georss.py                    |  1 -
 autotest/ogr/ogr_geos.py                      |  1 -
 autotest/ogr/ogr_gft.py                       |  1 -
 autotest/ogr/ogr_gml_fgd_read.py              |  1 -
 autotest/ogr/ogr_gml_geom.py                  |  1 -
 autotest/ogr/ogr_gml_read.py                  |  2 +-
 autotest/ogr/ogr_gmt.py                       |  1 -
 autotest/ogr/ogr_gpsbabel.py                  |  1 -
 autotest/ogr/ogr_gpx.py                       |  1 -
 autotest/ogr/ogr_grass.py                     |  1 -
 autotest/ogr/ogr_gtm.py                       |  1 -
 autotest/ogr/ogr_htf.py                       |  1 -
 autotest/ogr/ogr_idrisi.py                    |  1 -
 autotest/ogr/ogr_ili.py                       |  1 -
 autotest/ogr/ogr_index_test.py                | 11 ++++----
 autotest/ogr/ogr_ingres.py                    |  1 -
 autotest/ogr/ogr_jml.py                       |  1 -
 autotest/ogr/ogr_join_test.py                 |  1 -
 autotest/ogr/ogr_kml.py                       |  1 -
 autotest/ogr/ogr_layer_algebra.py             |  1 -
 autotest/ogr/ogr_libkml.py                    |  1 -
 autotest/ogr/ogr_mem.py                       |  1 -
 autotest/ogr/ogr_mongodb.py                   |  1 -
 autotest/ogr/ogr_mssqlspatial.py              |  1 -
 autotest/ogr/ogr_mysql.py                     |  1 -
 autotest/ogr/ogr_nas.py                       |  1 -
 autotest/ogr/ogr_ntf.py                       |  1 -
 autotest/ogr/ogr_oci.py                       |  1 -
 autotest/ogr/ogr_ods.py                       |  1 -
 autotest/ogr/ogr_ogdi.py                      |  1 -
 autotest/ogr/ogr_openair.py                   |  1 -
 autotest/ogr/ogr_osm.py                       |  1 -
 autotest/ogr/ogr_pcidsk.py                    |  1 -
 autotest/ogr/ogr_pdf.py                       |  1 -
 autotest/ogr/ogr_pds.py                       |  1 -
 autotest/ogr/ogr_pgeo.py                      |  1 -
 autotest/ogr/ogr_plscenes.py                  |  1 -
 autotest/ogr/ogr_rec.py                       |  1 -
 autotest/ogr/ogr_refcount.py                  |  1 -
 autotest/ogr/ogr_rfc30.py                     |  1 -
 autotest/ogr/ogr_rfc35_mem.py                 |  5 ++--
 autotest/ogr/ogr_rfc35_mitab.py               |  9 +++----
 autotest/ogr/ogr_rfc35_shape.py               |  9 +++----
 autotest/ogr/ogr_rfc35_sqlite.py              |  5 ++--
 autotest/ogr/ogr_rfc41.py                     |  1 -
 autotest/ogr/ogr_sde.py                       |  1 -
 autotest/ogr/ogr_sdts.py                      |  1 -
 autotest/ogr/ogr_segukooa.py                  |  1 -
 autotest/ogr/ogr_segy.py                      |  1 -
 autotest/ogr/ogr_selafin.py                   |  2 --
 autotest/ogr/ogr_shape.py                     | 26 +++++++++----------
 autotest/ogr/ogr_shape_qix.py                 |  1 -
 autotest/ogr/ogr_shape_sbn.py                 |  3 +--
 autotest/ogr/ogr_sosi.py                      |  1 -
 autotest/ogr/ogr_sql_rfc28.py                 |  1 -
 autotest/ogr/ogr_sql_sqlite.py                |  7 +++--
 autotest/ogr/ogr_style.py                     |  1 -
 autotest/ogr/ogr_sua.py                       |  1 -
 autotest/ogr/ogr_svg.py                       |  1 -
 autotest/ogr/ogr_sxf.py                       |  1 -
 autotest/ogr/ogr_tiger.py                     |  1 -
 autotest/ogr/ogr_vfk.py                       |  1 -
 autotest/ogr/ogr_vrt.py                       |  1 -
 autotest/ogr/ogr_wasp.py                      |  1 -
 autotest/ogr/ogr_wfs3.py                      |  1 -
 autotest/ogr/ogr_wkbwkt_geom.py               |  1 -
 autotest/ogr/ogr_wktempty.py                  |  1 -
 autotest/ogr/ogr_xls.py                       |  1 -
 autotest/ogr/ogr_xlsx.py                      |  1 -
 autotest/ogr/ogr_xplane.py                    |  1 -
 autotest/ogr/ograpispy.py                     |  1 -
 autotest/osr/osr_basic.py                     |  1 -
 autotest/osr/osr_compd.py                     |  1 -
 autotest/osr/osr_ct.py                        |  1 -
 autotest/osr/osr_epsg.py                      |  1 -
 autotest/osr/osr_erm.py                       |  1 -
 autotest/osr/osr_getprojectionmethods.py      |  1 -
 autotest/osr/osr_micoordsys.py                |  1 -
 autotest/osr/osr_ozi.py                       |  1 -
 autotest/osr/osr_pci.py                       |  1 -
 autotest/osr/osr_pm.py                        |  1 -
 autotest/osr/osr_proj4.py                     |  1 -
 autotest/osr/osr_url.py                       |  1 -
 autotest/osr/osr_usgs.py                      |  1 -
 autotest/osr/osr_validate.py                  |  1 -
 autotest/osr/osr_xml.py                       |  1 -
 autotest/pyscripts/test_gdal_fillnodata.py    |  1 -
 autotest/pyscripts/test_gdal_merge.py         |  1 -
 autotest/pyscripts/test_gdal_pansharpen.py    |  1 -
 autotest/pyscripts/test_gdal_polygonize.py    |  1 -
 autotest/pyscripts/test_gdal_proximity.py     |  1 -
 autotest/pyscripts/test_gdal_retile.py        |  1 -
 autotest/pyscripts/test_gdal_sieve.py         |  1 -
 autotest/pyscripts/test_gdalinfo_py.py        |  1 -
 autotest/pyscripts/test_gdalmove.py           |  1 -
 autotest/pyscripts/test_ogrinfo_py.py         |  1 -
 autotest/pyscripts/test_ogrmerge.py           |  1 -
 autotest/pyscripts/test_rgb2pct.py            |  1 -
 autotest/utilities/test_gdal_contour.py       |  1 -
 autotest/utilities/test_gdal_grid_lib.py      |  1 -
 autotest/utilities/test_gdal_rasterize_lib.py |  1 -
 autotest/utilities/test_gdal_translate.py     |  1 -
 autotest/utilities/test_gdal_translate_lib.py |  1 -
 autotest/utilities/test_gdalbuildvrt.py       |  1 -
 autotest/utilities/test_gdalbuildvrt_lib.py   |  1 -
 autotest/utilities/test_gdaldem.py            |  1 -
 autotest/utilities/test_gdaldem_lib.py        |  1 -
 autotest/utilities/test_gdalinfo.py           |  1 -
 autotest/utilities/test_gdalinfo_lib.py       |  1 -
 autotest/utilities/test_gdaltindex.py         |  1 -
 autotest/utilities/test_gdaltransform.py      |  1 -
 autotest/utilities/test_gdalwarp.py           |  1 -
 autotest/utilities/test_gdalwarp_lib.py       |  1 -
 autotest/utilities/test_gnmutils.py           |  1 -
 autotest/utilities/test_nearblack.py          |  1 -
 autotest/utilities/test_nearblack_lib.py      |  1 -
 autotest/utilities/test_ogrinfo.py            |  1 -
 autotest/utilities/test_ogrtindex.py          |  1 -
 323 files changed, 55 insertions(+), 376 deletions(-)

diff --git a/autotest/alg/applyverticalshiftgrid.py b/autotest/alg/applyverticalshiftgrid.py
index 302dd646849f..688c69c622bc 100755
--- a/autotest/alg/applyverticalshiftgrid.py
+++ b/autotest/alg/applyverticalshiftgrid.py
@@ -29,7 +29,6 @@
 # DEALINGS IN THE SOFTWARE.
 ###############################################################################
 
-import sys
 
 
 import gdaltest
diff --git a/autotest/alg/contour.py b/autotest/alg/contour.py
index 56ea5bf4e32a..8722d2dfd9fa 100755
--- a/autotest/alg/contour.py
+++ b/autotest/alg/contour.py
@@ -30,7 +30,6 @@
 
 import array
 import os
-import sys
 
 
 from osgeo import gdal
diff --git a/autotest/alg/cutline.py b/autotest/alg/cutline.py
index af3f51588493..8dc96d8b263a 100755
--- a/autotest/alg/cutline.py
+++ b/autotest/alg/cutline.py
@@ -30,7 +30,6 @@
 # DEALINGS IN THE SOFTWARE.
 ###############################################################################
 
-import sys
 
 
 from osgeo import gdal
diff --git a/autotest/alg/dither.py b/autotest/alg/dither.py
index 54c7a7c53d75..fc7046e5d2be 100755
--- a/autotest/alg/dither.py
+++ b/autotest/alg/dither.py
@@ -29,7 +29,6 @@
 # DEALINGS IN THE SOFTWARE.
 ###############################################################################
 
-import sys
 
 
 import gdaltest
diff --git a/autotest/alg/polygonize.py b/autotest/alg/polygonize.py
index aeef0d578199..7345c27f778c 100755
--- a/autotest/alg/polygonize.py
+++ b/autotest/alg/polygonize.py
@@ -29,7 +29,6 @@
 # DEALINGS IN THE SOFTWARE.
 ###############################################################################
 
-import sys
 
 
 import gdaltest
diff --git a/autotest/alg/proximity.py b/autotest/alg/proximity.py
index dd63b20e5ae7..baac6f479dcf 100755
--- a/autotest/alg/proximity.py
+++ b/autotest/alg/proximity.py
@@ -28,7 +28,6 @@
 # DEALINGS IN THE SOFTWARE.
 ###############################################################################
 
-import sys
 
 
 import gdaltest
diff --git a/autotest/alg/rasterize.py b/autotest/alg/rasterize.py
index 91137b6c76f8..b0ec2e5e1555 100755
--- a/autotest/alg/rasterize.py
+++ b/autotest/alg/rasterize.py
@@ -29,7 +29,6 @@
 ###############################################################################
 
 import struct
-import sys
 
 
 import gdaltest
diff --git a/autotest/alg/reproject.py b/autotest/alg/reproject.py
index b59be5bce084..71882c90b181 100755
--- a/autotest/alg/reproject.py
+++ b/autotest/alg/reproject.py
@@ -29,7 +29,6 @@
 # DEALINGS IN THE SOFTWARE.
 ###############################################################################
 
-import sys
 
 
 import gdaltest
diff --git a/autotest/alg/sieve.py b/autotest/alg/sieve.py
index 9d85e1ba9e4f..25a5c5c4c6a1 100755
--- a/autotest/alg/sieve.py
+++ b/autotest/alg/sieve.py
@@ -29,7 +29,6 @@
 # DEALINGS IN THE SOFTWARE.
 ###############################################################################
 
-import sys
 
 
 import gdaltest
diff --git a/autotest/alg/tps.py b/autotest/alg/tps.py
index 6c800b61e5ce..426fff879d3c 100755
--- a/autotest/alg/tps.py
+++ b/autotest/alg/tps.py
@@ -29,7 +29,6 @@
 # DEALINGS IN THE SOFTWARE.
 ###############################################################################
 
-import sys
 
 
 import gdaltest
diff --git a/autotest/alg/transformgeoloc.py b/autotest/alg/transformgeoloc.py
index 5d3191f0e512..6bd129834231 100755
--- a/autotest/alg/transformgeoloc.py
+++ b/autotest/alg/transformgeoloc.py
@@ -30,7 +30,6 @@
 # DEALINGS IN THE SOFTWARE.
 ###############################################################################
 
-import sys
 
 
 import gdaltest
diff --git a/autotest/alg/warp.py b/autotest/alg/warp.py
index b89f288de783..6d308d299909 100755
--- a/autotest/alg/warp.py
+++ b/autotest/alg/warp.py
@@ -33,7 +33,6 @@
 ###############################################################################
 
 import os
-import sys
 import shutil
 
 
diff --git a/autotest/gcore/asyncreader.py b/autotest/gcore/asyncreader.py
index 782083fd8e72..8a1a4b55efe2 100755
--- a/autotest/gcore/asyncreader.py
+++ b/autotest/gcore/asyncreader.py
@@ -28,7 +28,6 @@
 # DEALINGS IN THE SOFTWARE.
 ###############################################################################
 
-import sys
 
 
 import gdaltest
diff --git a/autotest/gcore/bmp_read.py b/autotest/gcore/bmp_read.py
index 4049a6c30a72..84b656523ec8 100755
--- a/autotest/gcore/bmp_read.py
+++ b/autotest/gcore/bmp_read.py
@@ -26,7 +26,6 @@
 # Boston, MA 02111-1307, USA.
 ###############################################################################
 
-import sys
 
 import pytest
 
diff --git a/autotest/gcore/bmp_write.py b/autotest/gcore/bmp_write.py
index 06768b06e659..b996dce49cc7 100755
--- a/autotest/gcore/bmp_write.py
+++ b/autotest/gcore/bmp_write.py
@@ -27,7 +27,6 @@
 # Boston, MA 02111-1307, USA.
 ###############################################################################
 
-import sys
 
 import pytest
 
diff --git a/autotest/gcore/colortable.py b/autotest/gcore/colortable.py
index 558ce50b8606..a0d7c9438b81 100755
--- a/autotest/gcore/colortable.py
+++ b/autotest/gcore/colortable.py
@@ -30,7 +30,6 @@
 # DEALINGS IN THE SOFTWARE.
 ###############################################################################
 
-import sys
 
 
 import gdaltest
diff --git a/autotest/gcore/envi_read.py b/autotest/gcore/envi_read.py
index 279eebb46190..b49bd4cc51d4 100755
--- a/autotest/gcore/envi_read.py
+++ b/autotest/gcore/envi_read.py
@@ -27,7 +27,6 @@
 # Boston, MA 02111-1307, USA.
 ###############################################################################
 
-import sys
 
 import pytest
 
diff --git a/autotest/gcore/gcps2geotransform.py b/autotest/gcore/gcps2geotransform.py
index 0b82852ce2ca..2cb6e25e92c5 100755
--- a/autotest/gcore/gcps2geotransform.py
+++ b/autotest/gcore/gcps2geotransform.py
@@ -29,7 +29,6 @@
 # DEALINGS IN THE SOFTWARE.
 ###############################################################################
 
-import sys
 from osgeo import gdal
 
 
diff --git a/autotest/gcore/gdal_api_proxy.py b/autotest/gcore/gdal_api_proxy.py
index 8796977a3890..ab152a987384 100755
--- a/autotest/gcore/gdal_api_proxy.py
+++ b/autotest/gcore/gdal_api_proxy.py
@@ -30,8 +30,6 @@
 ###############################################################################
 
 import sys
-import subprocess
-import time
 from osgeo import gdal
 
 
diff --git a/autotest/gcore/gdal_stats.py b/autotest/gcore/gdal_stats.py
index 338f0ec4afc7..7619d97db01d 100755
--- a/autotest/gcore/gdal_stats.py
+++ b/autotest/gcore/gdal_stats.py
@@ -28,7 +28,6 @@
 ###############################################################################
 
 import os
-import sys
 import struct
 import shutil
 
diff --git a/autotest/gcore/geoloc.py b/autotest/gcore/geoloc.py
index 7ed1bfc4bbcb..94991b0f34d4 100755
--- a/autotest/gcore/geoloc.py
+++ b/autotest/gcore/geoloc.py
@@ -29,7 +29,6 @@
 # DEALINGS IN THE SOFTWARE.
 ###############################################################################
 
-import sys
 
 
 import gdaltest
diff --git a/autotest/gcore/hdf4_read.py b/autotest/gcore/hdf4_read.py
index 07a440ce9e92..8dfa67bc6723 100755
--- a/autotest/gcore/hdf4_read.py
+++ b/autotest/gcore/hdf4_read.py
@@ -26,7 +26,6 @@
 # Boston, MA 02111-1307, USA.
 ###############################################################################
 
-import sys
 
 import pytest
 
@@ -96,7 +95,7 @@ def test_hdf4_read_online_2():
 
     tst = gdaltest.GDALTest('HDF4Image', 'HDF4_SDS:UNKNOWN:"tmp/cache/A2006005182000.L2_LAC_SST.x.hdf":13', 1, 13209, filename_absolute=1)
 
-    ret = tst.testOpen()
+    tst.testOpen()
 
     ds = gdal.Open('HDF4_SDS:UNKNOWN:"tmp/cache/A2006005182000.L2_LAC_SST.x.hdf":13')
     md = ds.GetMetadata('GEOLOCATION')
@@ -119,7 +118,7 @@ def test_hdf4_read_online_3():
 
     tst = gdaltest.GDALTest('HDF4Image', 'tmp/cache/MO36MW14.chlor_MODIS.ADD2001089.004.2002186190207.hdf', 1, 34723, filename_absolute=1)
 
-    ret = tst.testOpen()
+    tst.testOpen()
 
     ds = gdal.Open('tmp/cache/MO36MW14.chlor_MODIS.ADD2001089.004.2002186190207.hdf')
     gt = ds.GetGeoTransform()
@@ -146,7 +145,7 @@ def test_hdf4_read_online_4():
 
     tst = gdaltest.GDALTest('HDF4Image', 'tmp/cache/S2002196124536.L1A_HDUN.BartonBendish.extract.hdf', 1, 33112, filename_absolute=1)
 
-    ret = tst.testOpen()
+    tst.testOpen()
 
     ds = gdal.Open('tmp/cache/S2002196124536.L1A_HDUN.BartonBendish.extract.hdf')
     assert ds.RasterCount == 8, 'did not get expected band number'
@@ -168,7 +167,7 @@ def test_hdf4_read_online_5():
 
     tst = gdaltest.GDALTest('HDF4Image', 'tmp/cache/199101.s04m1pfv50-sst-16b.hdf', 1, 41173, filename_absolute=1)
 
-    ret = tst.testOpen()
+    tst.testOpen()
 
 ###############################################################################
 # Test fix for #3386 where block size is dataset size
@@ -186,7 +185,7 @@ def test_hdf4_read_online_6():
     # Test with quoting of components
     tst = gdaltest.GDALTest('HDF4Image', 'HDF4_EOS:EOS_GRID:"tmp/cache/MOD09Q1G_EVI.A2006233.h07v03.005.2008338190308.hdf":"MODIS_NACP_EVI":"MODIS_EVI"', 1, 12197, filename_absolute=1)
 
-    ret = tst.testOpen()
+    tst.testOpen()
 
     ds = gdal.Open('HDF4_EOS:EOS_GRID:tmp/cache/MOD09Q1G_EVI.A2006233.h07v03.005.2008338190308.hdf:MODIS_NACP_EVI:MODIS_EVI')
 
@@ -214,7 +213,7 @@ def test_hdf4_read_online_7():
 
     tst = gdaltest.GDALTest('HDF4Image', 'HDF4_EOS:EOS_GRID:tmp/cache/MOD09A1.A2010041.h06v03.005.2010051001103.hdf:MOD_Grid_500m_Surface_Reflectance:sur_refl_b01', 1, 54894, filename_absolute=1)
 
-    ret = tst.testOpen()
+    tst.testOpen()
 
     ds = gdal.Open('HDF4_EOS:EOS_GRID:tmp/cache/MOD09A1.A2010041.h06v03.005.2010051001103.hdf:MOD_Grid_500m_Surface_Reflectance:sur_refl_b01')
 
@@ -243,7 +242,7 @@ def test_hdf4_read_online_8():
 
     tst = gdaltest.GDALTest('HDF4Image', 'HDF4_EOS:EOS_GRID:tmp/cache/MOD13Q1.A2006161.h21v13.005.2008234103220.hdf:MODIS_Grid_16DAY_250m_500m_VI:250m 16 days NDVI', 1, 53837, filename_absolute=1)
 
-    ret = tst.testOpen()
+    tst.testOpen()
 
     ds = gdal.Open('HDF4_EOS:EOS_GRID:tmp/cache/MOD13Q1.A2006161.h21v13.005.2008234103220.hdf:MODIS_Grid_16DAY_250m_500m_VI:250m 16 days NDVI')
 
diff --git a/autotest/gcore/hfa_read.py b/autotest/gcore/hfa_read.py
index 3256c7199822..2d0a2454fef1 100755
--- a/autotest/gcore/hfa_read.py
+++ b/autotest/gcore/hfa_read.py
@@ -28,7 +28,6 @@
 # DEALINGS IN THE SOFTWARE.
 ###############################################################################
 
-import sys
 
 import pytest
 
diff --git a/autotest/gcore/hfa_rfc40.py b/autotest/gcore/hfa_rfc40.py
index 935b66748db4..327469a561f8 100755
--- a/autotest/gcore/hfa_rfc40.py
+++ b/autotest/gcore/hfa_rfc40.py
@@ -30,7 +30,6 @@
 # DEALINGS IN THE SOFTWARE.
 ###############################################################################
 
-import sys
 from osgeo import gdal
 
 import pytest
diff --git a/autotest/gcore/hfa_srs.py b/autotest/gcore/hfa_srs.py
index 9f82bae3fe12..2d256f850e11 100755
--- a/autotest/gcore/hfa_srs.py
+++ b/autotest/gcore/hfa_srs.py
@@ -28,7 +28,6 @@
 # DEALINGS IN THE SOFTWARE.
 ###############################################################################
 
-import sys
 
 import pytest
 
diff --git a/autotest/gcore/hfa_write.py b/autotest/gcore/hfa_write.py
index b363bb942e0c..fccc657e2a7d 100755
--- a/autotest/gcore/hfa_write.py
+++ b/autotest/gcore/hfa_write.py
@@ -31,7 +31,6 @@
 ###############################################################################
 
 import os
-import sys
 import shutil
 
 import pytest
diff --git a/autotest/gcore/histogram.py b/autotest/gcore/histogram.py
index 81b7f0b692d8..ce3ce7c344ad 100755
--- a/autotest/gcore/histogram.py
+++ b/autotest/gcore/histogram.py
@@ -30,7 +30,6 @@
 ###############################################################################
 
 import os
-import sys
 import shutil
 
 
diff --git a/autotest/gcore/identify.py b/autotest/gcore/identify.py
index e07a8a101ecb..9288ec0bde7d 100755
--- a/autotest/gcore/identify.py
+++ b/autotest/gcore/identify.py
@@ -28,7 +28,6 @@
 # DEALINGS IN THE SOFTWARE.
 ###############################################################################
 
-import sys
 
 
 import gdaltest
diff --git a/autotest/gcore/mask.py b/autotest/gcore/mask.py
index af45c865b8b7..bd47f9b81eb7 100755
--- a/autotest/gcore/mask.py
+++ b/autotest/gcore/mask.py
@@ -30,7 +30,6 @@
 ###############################################################################
 
 import os
-import sys
 
 
 import gdaltest
diff --git a/autotest/gcore/minixml.py b/autotest/gcore/minixml.py
index b2fde5514591..bcd68f411e6c 100755
--- a/autotest/gcore/minixml.py
+++ b/autotest/gcore/minixml.py
@@ -29,7 +29,6 @@
 # DEALINGS IN THE SOFTWARE.
 ###############################################################################
 
-import sys
 
 
 import gdaltest
diff --git a/autotest/gcore/misc.py b/autotest/gcore/misc.py
index f72482fd07eb..8d9cd7a5da1f 100755
--- a/autotest/gcore/misc.py
+++ b/autotest/gcore/misc.py
@@ -29,7 +29,6 @@
 # DEALINGS IN THE SOFTWARE.
 ###############################################################################
 
-import sys
 import os
 import shutil
 from osgeo import gdal
diff --git a/autotest/gcore/numpy_rw.py b/autotest/gcore/numpy_rw.py
index 124c93a74f72..342560f7c8c7 100755
--- a/autotest/gcore/numpy_rw.py
+++ b/autotest/gcore/numpy_rw.py
@@ -29,7 +29,6 @@
 # DEALINGS IN THE SOFTWARE.
 ###############################################################################
 
-import sys
 
 
 import gdaltest
diff --git a/autotest/gcore/overviewds.py b/autotest/gcore/overviewds.py
index 5e01d3bf8b09..054c1fe6c031 100755
--- a/autotest/gcore/overviewds.py
+++ b/autotest/gcore/overviewds.py
@@ -30,7 +30,6 @@
 ###############################################################################
 
 import os
-import sys
 import shutil
 
 
diff --git a/autotest/gcore/pam.py b/autotest/gcore/pam.py
index 49fb98fd06dd..285a3bca4c41 100755
--- a/autotest/gcore/pam.py
+++ b/autotest/gcore/pam.py
@@ -31,7 +31,6 @@
 ###############################################################################
 
 import os
-import sys
 import shutil
 import stat
 
diff --git a/autotest/gcore/pixfun.py b/autotest/gcore/pixfun.py
index a38633a61007..be1e13ff6cfb 100755
--- a/autotest/gcore/pixfun.py
+++ b/autotest/gcore/pixfun.py
@@ -28,7 +28,6 @@
 # DEALINGS IN THE SOFTWARE.
 ###############################################################################
 
-import sys
 import pytest
 
 try:
diff --git a/autotest/gcore/rat.py b/autotest/gcore/rat.py
index eec7de8ba444..9ec0499ce279 100755
--- a/autotest/gcore/rat.py
+++ b/autotest/gcore/rat.py
@@ -30,7 +30,6 @@
 # DEALINGS IN THE SOFTWARE.
 ###############################################################################
 
-import sys
 
 
 import gdaltest
diff --git a/autotest/gcore/rfc30.py b/autotest/gcore/rfc30.py
index 1a2d212ae2bf..f4b9706a21b6 100755
--- a/autotest/gcore/rfc30.py
+++ b/autotest/gcore/rfc30.py
@@ -29,7 +29,6 @@
 # DEALINGS IN THE SOFTWARE.
 ###############################################################################
 
-import sys
 from sys import version_info
 from osgeo import gdal
 
diff --git a/autotest/gcore/testnonboundtoswig.py b/autotest/gcore/testnonboundtoswig.py
index a535d6f727fd..19bd4c27ff12 100755
--- a/autotest/gcore/testnonboundtoswig.py
+++ b/autotest/gcore/testnonboundtoswig.py
@@ -29,7 +29,6 @@
 # DEALINGS IN THE SOFTWARE.
 ###############################################################################
 
-import sys
 from sys import version_info
 from osgeo import gdal
 import pytest
diff --git a/autotest/gcore/thread_test.py b/autotest/gcore/thread_test.py
index 9c06c1182ef1..051ca8fb3fe2 100755
--- a/autotest/gcore/thread_test.py
+++ b/autotest/gcore/thread_test.py
@@ -29,7 +29,6 @@
 # DEALINGS IN THE SOFTWARE.
 ###############################################################################
 
-import sys
 import threading
 
 
diff --git a/autotest/gcore/tiff_srs.py b/autotest/gcore/tiff_srs.py
index 48ae7d921d7d..69f05a0793e4 100755
--- a/autotest/gcore/tiff_srs.py
+++ b/autotest/gcore/tiff_srs.py
@@ -28,7 +28,6 @@
 # DEALINGS IN THE SOFTWARE.
 ###############################################################################
 
-import sys
 
 import pytest
 
diff --git a/autotest/gcore/transformer.py b/autotest/gcore/transformer.py
index 8e09a9513c87..0a36f894a5b5 100755
--- a/autotest/gcore/transformer.py
+++ b/autotest/gcore/transformer.py
@@ -30,7 +30,6 @@
 # DEALINGS IN THE SOFTWARE.
 ###############################################################################
 
-import sys
 
 
 import gdaltest
diff --git a/autotest/gcore/vrtmisc.py b/autotest/gcore/vrtmisc.py
index 5cb5717f81cf..7a32308f2fc8 100755
--- a/autotest/gcore/vrtmisc.py
+++ b/autotest/gcore/vrtmisc.py
@@ -29,7 +29,6 @@
 # DEALINGS IN THE SOFTWARE.
 ###############################################################################
 
-import sys
 from osgeo import gdal
 
 
diff --git a/autotest/gcore/vsicrypt.py b/autotest/gcore/vsicrypt.py
index 7f43650829d8..f8eafc7a7743 100755
--- a/autotest/gcore/vsicrypt.py
+++ b/autotest/gcore/vsicrypt.py
@@ -30,7 +30,6 @@
 ###############################################################################
 
 import struct
-import sys
 from osgeo import gdal
 
 
diff --git a/autotest/gcore/vsicurl.py b/autotest/gcore/vsicurl.py
index 2b78d6b55a0a..a6abc7174194 100755
--- a/autotest/gcore/vsicurl.py
+++ b/autotest/gcore/vsicurl.py
@@ -28,7 +28,6 @@
 # DEALINGS IN THE SOFTWARE.
 ###############################################################################
 
-import sys
 from sys import version_info
 import time
 from osgeo import gdal
diff --git a/autotest/gcore/vsicurl_streaming.py b/autotest/gcore/vsicurl_streaming.py
index 554f51b87412..089b5a138ccc 100755
--- a/autotest/gcore/vsicurl_streaming.py
+++ b/autotest/gcore/vsicurl_streaming.py
@@ -28,7 +28,6 @@
 # DEALINGS IN THE SOFTWARE.
 ###############################################################################
 
-import sys
 import time
 from osgeo import gdal
 
diff --git a/autotest/gcore/vsihdfs.py b/autotest/gcore/vsihdfs.py
index 86e119393dd3..369e4896401e 100755
--- a/autotest/gcore/vsihdfs.py
+++ b/autotest/gcore/vsihdfs.py
@@ -30,7 +30,6 @@
 # DEALINGS IN THE SOFTWARE.
 ###############################################################################
 
-import sys
 import os
 from osgeo import gdal
 
diff --git a/autotest/gcore/vsistdin.py b/autotest/gcore/vsistdin.py
index e37925856f8a..51ad030d978d 100755
--- a/autotest/gcore/vsistdin.py
+++ b/autotest/gcore/vsistdin.py
@@ -29,7 +29,6 @@
 ###############################################################################
 
 import os
-import sys
 
 
 import gdaltest
diff --git a/autotest/gcore/vsizip.py b/autotest/gcore/vsizip.py
index a67af096b5b1..e96d0a7b7f87 100755
--- a/autotest/gcore/vsizip.py
+++ b/autotest/gcore/vsizip.py
@@ -30,7 +30,6 @@
 ###############################################################################
 
 import random
-import sys
 
 
 import gdaltest
diff --git a/autotest/gdrivers/aaigrid.py b/autotest/gdrivers/aaigrid.py
index 71c62253bdcc..8527940054a2 100755
--- a/autotest/gdrivers/aaigrid.py
+++ b/autotest/gdrivers/aaigrid.py
@@ -32,7 +32,6 @@
 ###############################################################################
 
 import os
-import sys
 from osgeo import gdal
 
 
diff --git a/autotest/gdrivers/ace2.py b/autotest/gdrivers/ace2.py
index d75b6e56d8a4..b0c22425203a 100755
--- a/autotest/gdrivers/ace2.py
+++ b/autotest/gdrivers/ace2.py
@@ -28,7 +28,6 @@
 # DEALINGS IN THE SOFTWARE.
 ###############################################################################
 
-import sys
 from osgeo import gdal
 
 
diff --git a/autotest/gdrivers/adrg.py b/autotest/gdrivers/adrg.py
index ecf76bdbc9e7..7eaaa7de946f 100755
--- a/autotest/gdrivers/adrg.py
+++ b/autotest/gdrivers/adrg.py
@@ -30,7 +30,6 @@
 ###############################################################################
 
 import os
-import sys
 import shutil
 from osgeo import gdal
 
diff --git a/autotest/gdrivers/aigrid.py b/autotest/gdrivers/aigrid.py
index d9cd8fe731e6..008986f0074a 100755
--- a/autotest/gdrivers/aigrid.py
+++ b/autotest/gdrivers/aigrid.py
@@ -30,7 +30,6 @@
 ###############################################################################
 
 import os
-import sys
 from osgeo import gdal
 
 
@@ -152,7 +151,7 @@ def test_aigrid_online_1():
             pytest.skip()
 
     tst = gdaltest.GDALTest('AIG', 'tmp/cache/nzdem/nzdem500/hdr.adf', 1, 45334, filename_absolute=1)
-    ret = tst.testOpen()
+    tst.testOpen()
 
     ds = gdal.Open('tmp/cache/nzdem/nzdem500/hdr.adf')
 
diff --git a/autotest/gdrivers/arg.py b/autotest/gdrivers/arg.py
index dbe8cb7fedd0..16ae26c85a9d 100755
--- a/autotest/gdrivers/arg.py
+++ b/autotest/gdrivers/arg.py
@@ -29,7 +29,6 @@
 ###############################################################################
 
 import os
-import sys
 import struct
 from copy import copy
 from osgeo import gdal
diff --git a/autotest/gdrivers/bag.py b/autotest/gdrivers/bag.py
index 3b8dbac5814a..75a0c6146207 100755
--- a/autotest/gdrivers/bag.py
+++ b/autotest/gdrivers/bag.py
@@ -30,7 +30,6 @@
 # DEALINGS IN THE SOFTWARE.
 ###############################################################################
 
-import sys
 
 import pytest
 
diff --git a/autotest/gdrivers/blx.py b/autotest/gdrivers/blx.py
index 8d47f8100e29..0dfff762bc68 100755
--- a/autotest/gdrivers/blx.py
+++ b/autotest/gdrivers/blx.py
@@ -28,7 +28,6 @@
 # DEALINGS IN THE SOFTWARE.
 ###############################################################################
 
-import sys
 from osgeo import gdal
 
 
diff --git a/autotest/gdrivers/bsb.py b/autotest/gdrivers/bsb.py
index 2c77d869992c..264c2341d8d4 100755
--- a/autotest/gdrivers/bsb.py
+++ b/autotest/gdrivers/bsb.py
@@ -28,7 +28,6 @@
 # DEALINGS IN THE SOFTWARE.
 ###############################################################################
 
-import sys
 from osgeo import gdal
 
 
diff --git a/autotest/gdrivers/bt.py b/autotest/gdrivers/bt.py
index 69fcca9e974a..e2d38950b829 100755
--- a/autotest/gdrivers/bt.py
+++ b/autotest/gdrivers/bt.py
@@ -28,7 +28,6 @@
 # DEALINGS IN THE SOFTWARE.
 ###############################################################################
 
-import sys
 from osgeo import osr
 
 
diff --git a/autotest/gdrivers/byn.py b/autotest/gdrivers/byn.py
index c0ff5743d8ad..7fe9add179fd 100755
--- a/autotest/gdrivers/byn.py
+++ b/autotest/gdrivers/byn.py
@@ -30,7 +30,6 @@
 # DEALINGS IN THE SOFTWARE.
 ###############################################################################
 
-import sys
 
 
 import gdaltest
diff --git a/autotest/gdrivers/cals.py b/autotest/gdrivers/cals.py
index ebbec9e785a0..678928086e1c 100755
--- a/autotest/gdrivers/cals.py
+++ b/autotest/gdrivers/cals.py
@@ -28,7 +28,6 @@
 # DEALINGS IN THE SOFTWARE.
 ###############################################################################
 
-import sys
 
 
 from osgeo import gdal
diff --git a/autotest/gdrivers/ceos.py b/autotest/gdrivers/ceos.py
index b3f5f753c56b..0b2f316002f6 100755
--- a/autotest/gdrivers/ceos.py
+++ b/autotest/gdrivers/ceos.py
@@ -28,7 +28,6 @@
 # DEALINGS IN THE SOFTWARE.
 ###############################################################################
 
-import sys
 
 
 import gdaltest
diff --git a/autotest/gdrivers/cpg.py b/autotest/gdrivers/cpg.py
index cb7813610972..4c44e203a934 100755
--- a/autotest/gdrivers/cpg.py
+++ b/autotest/gdrivers/cpg.py
@@ -28,7 +28,6 @@
 # DEALINGS IN THE SOFTWARE.
 ###############################################################################
 
-import sys
 
 
 import gdaltest
diff --git a/autotest/gdrivers/ctg.py b/autotest/gdrivers/ctg.py
index 948e0138bed9..8322fc51f677 100755
--- a/autotest/gdrivers/ctg.py
+++ b/autotest/gdrivers/ctg.py
@@ -28,7 +28,6 @@
 # DEALINGS IN THE SOFTWARE.
 ###############################################################################
 
-import sys
 from osgeo import gdal
 
 
diff --git a/autotest/gdrivers/derived.py b/autotest/gdrivers/derived.py
index 6726b24f1183..2a470ffb3587 100755
--- a/autotest/gdrivers/derived.py
+++ b/autotest/gdrivers/derived.py
@@ -28,7 +28,6 @@
 # DEALINGS IN THE SOFTWARE.
 ###############################################################################
 
-import sys
 from osgeo import gdal
 
 
diff --git a/autotest/gdrivers/dimap.py b/autotest/gdrivers/dimap.py
index ee0016ac3cca..c72176a65101 100755
--- a/autotest/gdrivers/dimap.py
+++ b/autotest/gdrivers/dimap.py
@@ -29,7 +29,6 @@
 ###############################################################################
 
 import os
-import sys
 import shutil
 from osgeo import gdal
 
diff --git a/autotest/gdrivers/dipex.py b/autotest/gdrivers/dipex.py
index 914fe474e766..b4ebd39f645e 100755
--- a/autotest/gdrivers/dipex.py
+++ b/autotest/gdrivers/dipex.py
@@ -28,7 +28,6 @@
 # DEALINGS IN THE SOFTWARE.
 ###############################################################################
 
-import sys
 
 
 import gdaltest
diff --git a/autotest/gdrivers/dods.py b/autotest/gdrivers/dods.py
index d7b61dc1ee27..a79c1fb1baea 100755
--- a/autotest/gdrivers/dods.py
+++ b/autotest/gdrivers/dods.py
@@ -28,7 +28,6 @@
 # DEALINGS IN THE SOFTWARE.
 ###############################################################################
 
-import sys
 from osgeo import gdal
 
 
diff --git a/autotest/gdrivers/doq1.py b/autotest/gdrivers/doq1.py
index 0907f4f83263..3a9d448275ac 100755
--- a/autotest/gdrivers/doq1.py
+++ b/autotest/gdrivers/doq1.py
@@ -28,7 +28,6 @@
 # DEALINGS IN THE SOFTWARE.
 ###############################################################################
 
-import sys
 from osgeo import gdal
 
 
diff --git a/autotest/gdrivers/doq2.py b/autotest/gdrivers/doq2.py
index 51f59eaa77f1..093d06aa009c 100755
--- a/autotest/gdrivers/doq2.py
+++ b/autotest/gdrivers/doq2.py
@@ -28,7 +28,6 @@
 # DEALINGS IN THE SOFTWARE.
 ###############################################################################
 
-import sys
 from osgeo import gdal
 
 
diff --git a/autotest/gdrivers/dted.py b/autotest/gdrivers/dted.py
index 2c6c2399cee1..67190c9dcaeb 100755
--- a/autotest/gdrivers/dted.py
+++ b/autotest/gdrivers/dted.py
@@ -31,7 +31,6 @@
 ###############################################################################
 
 import os
-import sys
 from osgeo import gdal
 
 
diff --git a/autotest/gdrivers/e00grid.py b/autotest/gdrivers/e00grid.py
index 613d8e53547a..b80797229e63 100755
--- a/autotest/gdrivers/e00grid.py
+++ b/autotest/gdrivers/e00grid.py
@@ -28,7 +28,6 @@
 # DEALINGS IN THE SOFTWARE.
 ###############################################################################
 
-import sys
 from osgeo import gdal
 
 
diff --git a/autotest/gdrivers/ecrgtoc.py b/autotest/gdrivers/ecrgtoc.py
index 74923947f668..cd8b9181ecdc 100755
--- a/autotest/gdrivers/ecrgtoc.py
+++ b/autotest/gdrivers/ecrgtoc.py
@@ -29,7 +29,6 @@
 ###############################################################################
 
 import os
-import sys
 from osgeo import gdal
 
 
diff --git a/autotest/gdrivers/ehdr.py b/autotest/gdrivers/ehdr.py
index 9ada3952a8ed..ec9068bca114 100755
--- a/autotest/gdrivers/ehdr.py
+++ b/autotest/gdrivers/ehdr.py
@@ -32,7 +32,6 @@
 
 import array
 import struct
-import sys
 
 from osgeo import gdal
 
diff --git a/autotest/gdrivers/eir.py b/autotest/gdrivers/eir.py
index 89268b66ddf3..8abf87b0686d 100755
--- a/autotest/gdrivers/eir.py
+++ b/autotest/gdrivers/eir.py
@@ -28,7 +28,6 @@
 # DEALINGS IN THE SOFTWARE.
 ###############################################################################
 
-import sys
 
 
 import gdaltest
diff --git a/autotest/gdrivers/elas.py b/autotest/gdrivers/elas.py
index ea755e59a3f5..a1a47af112cb 100755
--- a/autotest/gdrivers/elas.py
+++ b/autotest/gdrivers/elas.py
@@ -28,7 +28,6 @@
 # DEALINGS IN THE SOFTWARE.
 ###############################################################################
 
-import sys
 
 
 import gdaltest
diff --git a/autotest/gdrivers/envi.py b/autotest/gdrivers/envi.py
index 3cca270508a2..e8b09067dee6 100755
--- a/autotest/gdrivers/envi.py
+++ b/autotest/gdrivers/envi.py
@@ -32,7 +32,6 @@
 # DEALINGS IN THE SOFTWARE.
 ###############################################################################
 
-import sys
 from osgeo import gdal
 
 
diff --git a/autotest/gdrivers/ers.py b/autotest/gdrivers/ers.py
index 547af90e945d..2ec2d6e806e5 100755
--- a/autotest/gdrivers/ers.py
+++ b/autotest/gdrivers/ers.py
@@ -30,7 +30,6 @@
 # DEALINGS IN THE SOFTWARE.
 ###############################################################################
 
-import sys
 from osgeo import gdal
 from osgeo import osr
 
diff --git a/autotest/gdrivers/fast.py b/autotest/gdrivers/fast.py
index bc5fed59657a..4858b04b96c9 100755
--- a/autotest/gdrivers/fast.py
+++ b/autotest/gdrivers/fast.py
@@ -29,7 +29,6 @@
 # DEALINGS IN THE SOFTWARE.
 ###############################################################################
 
-import sys
 from osgeo import gdal
 
 
diff --git a/autotest/gdrivers/fujibas.py b/autotest/gdrivers/fujibas.py
index e6ff03e206e9..702a80996b12 100755
--- a/autotest/gdrivers/fujibas.py
+++ b/autotest/gdrivers/fujibas.py
@@ -28,7 +28,6 @@
 # DEALINGS IN THE SOFTWARE.
 ###############################################################################
 
-import sys
 
 
 import gdaltest
diff --git a/autotest/gdrivers/genbin.py b/autotest/gdrivers/genbin.py
index 1cb91f15e73a..e06170f8a76c 100755
--- a/autotest/gdrivers/genbin.py
+++ b/autotest/gdrivers/genbin.py
@@ -28,7 +28,6 @@
 # DEALINGS IN THE SOFTWARE.
 ###############################################################################
 
-import sys
 
 
 import gdaltest
diff --git a/autotest/gdrivers/georaster.py b/autotest/gdrivers/georaster.py
index 93ffc4564f4c..1213321fd060 100755
--- a/autotest/gdrivers/georaster.py
+++ b/autotest/gdrivers/georaster.py
@@ -29,7 +29,6 @@
 ###############################################################################
 
 import os
-import sys
 from osgeo import gdal
 from osgeo import ogr
 
diff --git a/autotest/gdrivers/gff.py b/autotest/gdrivers/gff.py
index e8553f2f84fa..088a324ca3ef 100755
--- a/autotest/gdrivers/gff.py
+++ b/autotest/gdrivers/gff.py
@@ -28,7 +28,6 @@
 # DEALINGS IN THE SOFTWARE.
 ###############################################################################
 
-import sys
 from osgeo import gdal
 
 
diff --git a/autotest/gdrivers/gif.py b/autotest/gdrivers/gif.py
index c9d3db8ee11d..fdf8628a2b81 100755
--- a/autotest/gdrivers/gif.py
+++ b/autotest/gdrivers/gif.py
@@ -29,7 +29,6 @@
 # DEALINGS IN THE SOFTWARE.
 ###############################################################################
 
-import sys
 from osgeo import gdal
 
 
diff --git a/autotest/gdrivers/gmt.py b/autotest/gdrivers/gmt.py
index e4bf9ecefb09..6057595c4c57 100755
--- a/autotest/gdrivers/gmt.py
+++ b/autotest/gdrivers/gmt.py
@@ -28,7 +28,6 @@
 # DEALINGS IN THE SOFTWARE.
 ###############################################################################
 
-import sys
 from osgeo import gdal
 
 
diff --git a/autotest/gdrivers/grass.py b/autotest/gdrivers/grass.py
index 6cf41c2bbca2..f06ac4b5b306 100755
--- a/autotest/gdrivers/grass.py
+++ b/autotest/gdrivers/grass.py
@@ -28,7 +28,6 @@
 # DEALINGS IN THE SOFTWARE.
 ###############################################################################
 
-import sys
 from osgeo import gdal
 
 
diff --git a/autotest/gdrivers/grassasciigrid.py b/autotest/gdrivers/grassasciigrid.py
index a7f7775839a4..32e3154d72c2 100755
--- a/autotest/gdrivers/grassasciigrid.py
+++ b/autotest/gdrivers/grassasciigrid.py
@@ -28,7 +28,6 @@
 # DEALINGS IN THE SOFTWARE.
 ###############################################################################
 
-import sys
 
 
 import gdaltest
diff --git a/autotest/gdrivers/gsc.py b/autotest/gdrivers/gsc.py
index 11fc5460c0b3..c4e603c3832d 100755
--- a/autotest/gdrivers/gsc.py
+++ b/autotest/gdrivers/gsc.py
@@ -28,7 +28,6 @@
 # DEALINGS IN THE SOFTWARE.
 ###############################################################################
 
-import sys
 
 
 import gdaltest
diff --git a/autotest/gdrivers/gsg.py b/autotest/gdrivers/gsg.py
index 3b3482498df5..1d42b45c1d89 100755
--- a/autotest/gdrivers/gsg.py
+++ b/autotest/gdrivers/gsg.py
@@ -28,7 +28,6 @@
 # DEALINGS IN THE SOFTWARE.
 ###############################################################################
 
-import sys
 
 
 import gdaltest
diff --git a/autotest/gdrivers/gta.py b/autotest/gdrivers/gta.py
index 8d05cc5386c3..8fca58d1ea23 100755
--- a/autotest/gdrivers/gta.py
+++ b/autotest/gdrivers/gta.py
@@ -28,7 +28,6 @@
 # DEALINGS IN THE SOFTWARE.
 ###############################################################################
 
-import sys
 
 import pytest
 
diff --git a/autotest/gdrivers/gtx.py b/autotest/gdrivers/gtx.py
index d4607ef908f5..a754adc01929 100755
--- a/autotest/gdrivers/gtx.py
+++ b/autotest/gdrivers/gtx.py
@@ -28,7 +28,6 @@
 # DEALINGS IN THE SOFTWARE.
 ###############################################################################
 
-import sys
 
 
 import gdaltest
diff --git a/autotest/gdrivers/gxf.py b/autotest/gdrivers/gxf.py
index df87482388ac..fce7b770e6ea 100755
--- a/autotest/gdrivers/gxf.py
+++ b/autotest/gdrivers/gxf.py
@@ -29,7 +29,6 @@
 # DEALINGS IN THE SOFTWARE.
 ###############################################################################
 
-import sys
 
 import pytest
 
diff --git a/autotest/gdrivers/hdf5.py b/autotest/gdrivers/hdf5.py
index 693e8e45c3ed..e7b9dc289ef9 100755
--- a/autotest/gdrivers/hdf5.py
+++ b/autotest/gdrivers/hdf5.py
@@ -29,7 +29,6 @@
 # DEALINGS IN THE SOFTWARE.
 ###############################################################################
 
-import sys
 import shutil
 
 import pytest
diff --git a/autotest/gdrivers/hf2.py b/autotest/gdrivers/hf2.py
index 0640950fd1a4..f3fba5bce9f0 100755
--- a/autotest/gdrivers/hf2.py
+++ b/autotest/gdrivers/hf2.py
@@ -29,7 +29,6 @@
 ###############################################################################
 
 import os
-import sys
 
 
 import gdaltest
diff --git a/autotest/gdrivers/hfa.py b/autotest/gdrivers/hfa.py
index 83556695fc8f..5b0be5b6db9c 100755
--- a/autotest/gdrivers/hfa.py
+++ b/autotest/gdrivers/hfa.py
@@ -30,7 +30,6 @@
 ###############################################################################
 
 import os
-import sys
 import array
 from osgeo import gdal
 
diff --git a/autotest/gdrivers/ida.py b/autotest/gdrivers/ida.py
index 268dc1b56064..78399c6f2f88 100755
--- a/autotest/gdrivers/ida.py
+++ b/autotest/gdrivers/ida.py
@@ -28,7 +28,6 @@
 # DEALINGS IN THE SOFTWARE.
 ###############################################################################
 
-import sys
 from osgeo import gdal
 
 
diff --git a/autotest/gdrivers/idrisi.py b/autotest/gdrivers/idrisi.py
index 1152a343c5db..93d98b55e52b 100755
--- a/autotest/gdrivers/idrisi.py
+++ b/autotest/gdrivers/idrisi.py
@@ -30,7 +30,6 @@
 ###############################################################################
 
 import os
-import sys
 
 
 import gdaltest
diff --git a/autotest/gdrivers/ilwis.py b/autotest/gdrivers/ilwis.py
index 495da3826f12..dc088c798226 100755
--- a/autotest/gdrivers/ilwis.py
+++ b/autotest/gdrivers/ilwis.py
@@ -28,7 +28,6 @@
 # DEALINGS IN THE SOFTWARE.
 ###############################################################################
 
-import sys
 
 
 import gdaltest
diff --git a/autotest/gdrivers/ingr.py b/autotest/gdrivers/ingr.py
index 471d6b39c831..3394026e356a 100755
--- a/autotest/gdrivers/ingr.py
+++ b/autotest/gdrivers/ingr.py
@@ -31,7 +31,6 @@
 ###############################################################################
 
 import os
-import sys
 from osgeo import gdal
 
 
@@ -62,7 +61,7 @@ def test_ingr_2():
 def test_ingr_3():
 
     tst = gdaltest.GDALTest('INGR', '8bit_pal.cot', 1, 4855)
-    result = tst.testOpen()
+    tst.testOpen()
 
     ds = gdal.Open('data/8bit_pal.cot')
     ct = ds.GetRasterBand(1).GetRasterColorTable()
diff --git a/autotest/gdrivers/iris.py b/autotest/gdrivers/iris.py
index fb7ba46fe89f..4aa09de92802 100755
--- a/autotest/gdrivers/iris.py
+++ b/autotest/gdrivers/iris.py
@@ -29,7 +29,6 @@
 # DEALINGS IN THE SOFTWARE.
 ###############################################################################
 
-import sys
 from osgeo import gdal
 
 
diff --git a/autotest/gdrivers/isce.py b/autotest/gdrivers/isce.py
index 82e62cde96df..3d3f73604ae7 100755
--- a/autotest/gdrivers/isce.py
+++ b/autotest/gdrivers/isce.py
@@ -29,7 +29,6 @@
 # DEALINGS IN THE SOFTWARE.
 ###############################################################################
 
-import sys
 from osgeo import gdal
 
 
diff --git a/autotest/gdrivers/isis.py b/autotest/gdrivers/isis.py
index b051255a732e..970ed3d767a0 100755
--- a/autotest/gdrivers/isis.py
+++ b/autotest/gdrivers/isis.py
@@ -31,7 +31,6 @@
 
 import json
 import struct
-import sys
 
 
 from osgeo import gdal
diff --git a/autotest/gdrivers/isis2.py b/autotest/gdrivers/isis2.py
index 6641dd15057b..9d82e0b53827 100755
--- a/autotest/gdrivers/isis2.py
+++ b/autotest/gdrivers/isis2.py
@@ -28,7 +28,6 @@
 # DEALINGS IN THE SOFTWARE.
 ###############################################################################
 
-import sys
 
 
 import gdaltest
diff --git a/autotest/gdrivers/jdem.py b/autotest/gdrivers/jdem.py
index 9abb1eed6819..d869b0d715a8 100755
--- a/autotest/gdrivers/jdem.py
+++ b/autotest/gdrivers/jdem.py
@@ -28,7 +28,6 @@
 # DEALINGS IN THE SOFTWARE.
 ###############################################################################
 
-import sys
 
 
 import gdaltest
diff --git a/autotest/gdrivers/jp2kak.py b/autotest/gdrivers/jp2kak.py
index 27d8ceaa6012..27aff615acc3 100755
--- a/autotest/gdrivers/jp2kak.py
+++ b/autotest/gdrivers/jp2kak.py
@@ -30,7 +30,6 @@
 # DEALINGS IN THE SOFTWARE.
 ###############################################################################
 
-import sys
 from osgeo import gdal
 
 
diff --git a/autotest/gdrivers/jp2metadata.py b/autotest/gdrivers/jp2metadata.py
index e8dbb1cbd439..c5a82cc2729c 100755
--- a/autotest/gdrivers/jp2metadata.py
+++ b/autotest/gdrivers/jp2metadata.py
@@ -28,7 +28,6 @@
 # DEALINGS IN THE SOFTWARE.
 ###############################################################################
 
-import sys
 import os
 
 
diff --git a/autotest/gdrivers/jpeg2000.py b/autotest/gdrivers/jpeg2000.py
index 77bd33bb2c0f..f6ed292ed9e3 100755
--- a/autotest/gdrivers/jpeg2000.py
+++ b/autotest/gdrivers/jpeg2000.py
@@ -28,7 +28,6 @@
 # DEALINGS IN THE SOFTWARE.
 ###############################################################################
 
-import sys
 from osgeo import gdal
 
 
diff --git a/autotest/gdrivers/jpeg_profile.py b/autotest/gdrivers/jpeg_profile.py
index d12dc55c29c3..193e58dc3654 100755
--- a/autotest/gdrivers/jpeg_profile.py
+++ b/autotest/gdrivers/jpeg_profile.py
@@ -31,7 +31,6 @@
 # http://sourceforge.net/projects/openicc/files/OpenICC-Profiles/
 
 import os
-import sys
 import base64
 
 
diff --git a/autotest/gdrivers/jpegls.py b/autotest/gdrivers/jpegls.py
index 2c289654d0de..39b83ba62f0a 100755
--- a/autotest/gdrivers/jpegls.py
+++ b/autotest/gdrivers/jpegls.py
@@ -28,7 +28,6 @@
 # DEALINGS IN THE SOFTWARE.
 ###############################################################################
 
-import sys
 from osgeo import gdal
 
 
diff --git a/autotest/gdrivers/jpipkak.py b/autotest/gdrivers/jpipkak.py
index bdba2f36aa8f..14122dec2c2d 100755
--- a/autotest/gdrivers/jpipkak.py
+++ b/autotest/gdrivers/jpipkak.py
@@ -28,7 +28,6 @@
 # DEALINGS IN THE SOFTWARE.
 ###############################################################################
 
-import sys
 from osgeo import gdal
 
 
diff --git a/autotest/gdrivers/kea.py b/autotest/gdrivers/kea.py
index 980185f57980..542545e0a4bc 100755
--- a/autotest/gdrivers/kea.py
+++ b/autotest/gdrivers/kea.py
@@ -29,7 +29,6 @@
 # DEALINGS IN THE SOFTWARE.
 ###############################################################################
 
-import sys
 from osgeo import gdal
 
 
diff --git a/autotest/gdrivers/kmlsuperoverlay.py b/autotest/gdrivers/kmlsuperoverlay.py
index fedb8f2ce33c..252c46097674 100755
--- a/autotest/gdrivers/kmlsuperoverlay.py
+++ b/autotest/gdrivers/kmlsuperoverlay.py
@@ -30,7 +30,6 @@
 ###############################################################################
 
 import os
-import sys
 import shutil
 from osgeo import gdal
 
diff --git a/autotest/gdrivers/kro.py b/autotest/gdrivers/kro.py
index 9ff8a20807cf..d194421af6db 100755
--- a/autotest/gdrivers/kro.py
+++ b/autotest/gdrivers/kro.py
@@ -29,7 +29,6 @@
 # DEALINGS IN THE SOFTWARE.
 ###############################################################################
 
-import sys
 from osgeo import gdal
 
 
diff --git a/autotest/gdrivers/l1b.py b/autotest/gdrivers/l1b.py
index a1f71804f2c0..686043bfac7b 100755
--- a/autotest/gdrivers/l1b.py
+++ b/autotest/gdrivers/l1b.py
@@ -30,7 +30,6 @@
 ###############################################################################
 
 import os
-import sys
 
 import pytest
 
diff --git a/autotest/gdrivers/lan.py b/autotest/gdrivers/lan.py
index d72fb00d1da2..4dde4f7244ec 100755
--- a/autotest/gdrivers/lan.py
+++ b/autotest/gdrivers/lan.py
@@ -28,7 +28,6 @@
 # DEALINGS IN THE SOFTWARE.
 ###############################################################################
 
-import sys
 
 
 import gdaltest
diff --git a/autotest/gdrivers/lcp.py b/autotest/gdrivers/lcp.py
index 2efc55c2a822..c9922caeea2e 100755
--- a/autotest/gdrivers/lcp.py
+++ b/autotest/gdrivers/lcp.py
@@ -30,7 +30,6 @@
 ###############################################################################
 
 import os
-import sys
 from osgeo import gdal
 
 
diff --git a/autotest/gdrivers/leveller.py b/autotest/gdrivers/leveller.py
index 589709d2f91a..bc589655218a 100755
--- a/autotest/gdrivers/leveller.py
+++ b/autotest/gdrivers/leveller.py
@@ -28,7 +28,6 @@
 # DEALINGS IN THE SOFTWARE.
 ###############################################################################
 
-import sys
 
 
 import gdaltest
diff --git a/autotest/gdrivers/loslas.py b/autotest/gdrivers/loslas.py
index bf9a8f1a7a7f..33dcbdf466db 100755
--- a/autotest/gdrivers/loslas.py
+++ b/autotest/gdrivers/loslas.py
@@ -29,7 +29,6 @@
 ###############################################################################
 
 import os
-import sys
 
 
 import gdaltest
diff --git a/autotest/gdrivers/mem.py b/autotest/gdrivers/mem.py
index bd297c3c0656..a22eaa2f4564 100755
--- a/autotest/gdrivers/mem.py
+++ b/autotest/gdrivers/mem.py
@@ -29,7 +29,6 @@
 # DEALINGS IN THE SOFTWARE.
 ###############################################################################
 
-import sys
 import array
 from osgeo import gdal
 
diff --git a/autotest/gdrivers/mff.py b/autotest/gdrivers/mff.py
index f7de138b73b4..82e4710acef2 100755
--- a/autotest/gdrivers/mff.py
+++ b/autotest/gdrivers/mff.py
@@ -28,7 +28,6 @@
 # DEALINGS IN THE SOFTWARE.
 ###############################################################################
 
-import sys
 
 
 import gdaltest
diff --git a/autotest/gdrivers/mff2.py b/autotest/gdrivers/mff2.py
index 45db784d07e1..943bfb83be50 100755
--- a/autotest/gdrivers/mff2.py
+++ b/autotest/gdrivers/mff2.py
@@ -28,7 +28,6 @@
 # DEALINGS IN THE SOFTWARE.
 ###############################################################################
 
-import sys
 
 
 import gdaltest
diff --git a/autotest/gdrivers/mg4lidar.py b/autotest/gdrivers/mg4lidar.py
index 9d470e8c8d66..5b1939d6522d 100755
--- a/autotest/gdrivers/mg4lidar.py
+++ b/autotest/gdrivers/mg4lidar.py
@@ -29,7 +29,6 @@
 ###############################################################################
 
 import os
-import sys
 
 
 import gdaltest
diff --git a/autotest/gdrivers/mrf.py b/autotest/gdrivers/mrf.py
index 0de865c73d9a..3738640948c9 100755
--- a/autotest/gdrivers/mrf.py
+++ b/autotest/gdrivers/mrf.py
@@ -28,7 +28,6 @@
 # DEALINGS IN THE SOFTWARE.
 ###############################################################################
 
-import sys
 import glob
 
 import pytest
diff --git a/autotest/gdrivers/mrsid.py b/autotest/gdrivers/mrsid.py
index b85af17ba175..72d05be3fab9 100755
--- a/autotest/gdrivers/mrsid.py
+++ b/autotest/gdrivers/mrsid.py
@@ -30,7 +30,6 @@
 ###############################################################################
 
 import os
-import sys
 import shutil
 from osgeo import gdal
 
diff --git a/autotest/gdrivers/ndf.py b/autotest/gdrivers/ndf.py
index b64e29596365..a968b5ffeafd 100755
--- a/autotest/gdrivers/ndf.py
+++ b/autotest/gdrivers/ndf.py
@@ -28,7 +28,6 @@
 # DEALINGS IN THE SOFTWARE.
 ###############################################################################
 
-import sys
 
 
 import gdaltest
diff --git a/autotest/gdrivers/netcdf.py b/autotest/gdrivers/netcdf.py
index a6acc4f0fca2..239631c23950 100755
--- a/autotest/gdrivers/netcdf.py
+++ b/autotest/gdrivers/netcdf.py
@@ -907,7 +907,7 @@ def test_netcdf_25():
     if gdaltest.netcdf_drv is None:
         pytest.skip()
 
-    result = netcdf_test_copy('data/nc_vars.nc', 1, None, 'tmp/netcdf_25.nc')
+    netcdf_test_copy('data/nc_vars.nc', 1, None, 'tmp/netcdf_25.nc')
 
     vals_global = {'NC_GLOBAL#test': 'testval',
                    'NC_GLOBAL#valid_range_i': '0,255',
@@ -1082,7 +1082,7 @@ def test_netcdf_28():
     ofile = 'tmp/netcdf_28.nc'
 
     # copy file
-    result = netcdf_test_copy(ifile, 0, None, ofile)
+    netcdf_test_copy(ifile, 0, None, ofile)
 
     # test file
     return netcdf_test_4dfile(ofile)
@@ -1268,7 +1268,7 @@ def test_netcdf_35():
     ofile = 'tmp/netcdf_35.nc'
 
     # copy file
-    result = netcdf_test_copy(ifile, 0, None, ofile)
+    netcdf_test_copy(ifile, 0, None, ofile)
 
     # test long metadata is copied correctly
     ds = gdal.Open(ofile)
@@ -1786,7 +1786,7 @@ def test_netcdf_51():
     import netcdf_cf
     if netcdf_cf.netcdf_cf_setup() == 'success' and \
        gdaltest.netcdf_cf_method is not None:
-        result_cf = netcdf_cf.netcdf_cf_check_file('tmp/netcdf_51.nc', 'auto', False)
+        netcdf_cf.netcdf_cf_check_file('tmp/netcdf_51.nc', 'auto', False)
 
     gdal.Unlink('tmp/netcdf_51.nc')
     gdal.Unlink('tmp/netcdf_51.csv')
@@ -1896,7 +1896,7 @@ def test_netcdf_52():
     import netcdf_cf
     if netcdf_cf.netcdf_cf_setup() == 'success' and \
        gdaltest.netcdf_cf_method is not None:
-        result_cf = netcdf_cf.netcdf_cf_check_file('tmp/netcdf_52.nc', 'auto', False)
+        netcdf_cf.netcdf_cf_check_file('tmp/netcdf_52.nc', 'auto', False)
 
     gdal.Unlink('tmp/netcdf_52.nc')
     gdal.Unlink('tmp/netcdf_52.csv')
@@ -2273,7 +2273,7 @@ def test_netcdf_62_cf_check():
     import netcdf_cf
     if netcdf_cf.netcdf_cf_setup() == 'success' and \
        gdaltest.netcdf_cf_method is not None:
-        result_cf = netcdf_cf.netcdf_cf_check_file('tmp/netcdf_62.nc', 'auto', False)
+        netcdf_cf.netcdf_cf_check_file('tmp/netcdf_62.nc', 'auto', False)
 
     gdal.Unlink('/vsimem/netcdf_62.nc')
 
diff --git a/autotest/gdrivers/netcdf_cf.py b/autotest/gdrivers/netcdf_cf.py
index aeedf0352b7b..54446dfdf254 100755
--- a/autotest/gdrivers/netcdf_cf.py
+++ b/autotest/gdrivers/netcdf_cf.py
@@ -30,7 +30,6 @@
 ###############################################################################
 
 import os
-import sys
 import imp  # for netcdf_cf_setup()
 from netcdf import netcdf_setup, netcdf_test_copy
 from osgeo import gdal
diff --git a/autotest/gdrivers/ngsgeoid.py b/autotest/gdrivers/ngsgeoid.py
index 977f15fac151..1561d239b810 100755
--- a/autotest/gdrivers/ngsgeoid.py
+++ b/autotest/gdrivers/ngsgeoid.py
@@ -28,7 +28,6 @@
 # DEALINGS IN THE SOFTWARE.
 ###############################################################################
 
-import sys
 
 
 import gdaltest
diff --git a/autotest/gdrivers/nitf.py b/autotest/gdrivers/nitf.py
index 6f53851138db..53b82692c4f5 100755
--- a/autotest/gdrivers/nitf.py
+++ b/autotest/gdrivers/nitf.py
@@ -3275,7 +3275,7 @@ def test_nitf_online_25():
 
     tst = gdaltest.GDALTest('NITF', 'tmp/cache/Case1_HRE10G324642N1170747W_Uxx.hr5', 1, 7099, filename_absolute=1)
 
-    ret = tst.testOpen()
+    tst.testOpen()
 
     ds = gdal.Open('tmp/cache/Case1_HRE10G324642N1170747W_Uxx.hr5')
     xml_tre = ds.GetMetadata('xml:TRE')[0]
diff --git a/autotest/gdrivers/ntv2.py b/autotest/gdrivers/ntv2.py
index ad19148412a0..560e5c1ed49a 100755
--- a/autotest/gdrivers/ntv2.py
+++ b/autotest/gdrivers/ntv2.py
@@ -29,7 +29,6 @@
 ###############################################################################
 
 import os
-import sys
 
 
 from osgeo import gdal
diff --git a/autotest/gdrivers/nwt_grc.py b/autotest/gdrivers/nwt_grc.py
index 42c2e00e8dce..993fbb7d0249 100755
--- a/autotest/gdrivers/nwt_grc.py
+++ b/autotest/gdrivers/nwt_grc.py
@@ -28,7 +28,6 @@
 # DEALINGS IN THE SOFTWARE.
 ###############################################################################
 
-import sys
 
 
 import gdaltest
diff --git a/autotest/gdrivers/nwt_grd.py b/autotest/gdrivers/nwt_grd.py
index a1e8f19608d3..d4906cf89356 100755
--- a/autotest/gdrivers/nwt_grd.py
+++ b/autotest/gdrivers/nwt_grd.py
@@ -28,7 +28,6 @@
 # DEALINGS IN THE SOFTWARE.
 ###############################################################################
 
-import sys
 import shutil
 
 
diff --git a/autotest/gdrivers/ozi.py b/autotest/gdrivers/ozi.py
index 2c844406c0fb..6582ebc7efbe 100755
--- a/autotest/gdrivers/ozi.py
+++ b/autotest/gdrivers/ozi.py
@@ -29,7 +29,6 @@
 ###############################################################################
 
 import os
-import sys
 from osgeo import gdal
 
 
diff --git a/autotest/gdrivers/paux.py b/autotest/gdrivers/paux.py
index 18ce4e8e3f79..82f295b06ebe 100755
--- a/autotest/gdrivers/paux.py
+++ b/autotest/gdrivers/paux.py
@@ -28,7 +28,6 @@
 # DEALINGS IN THE SOFTWARE.
 ###############################################################################
 
-import sys
 
 
 from osgeo import gdal
diff --git a/autotest/gdrivers/pcidsk.py b/autotest/gdrivers/pcidsk.py
index 27e76f950716..c94bd9789292 100755
--- a/autotest/gdrivers/pcidsk.py
+++ b/autotest/gdrivers/pcidsk.py
@@ -30,7 +30,6 @@
 # DEALINGS IN THE SOFTWARE.
 ###############################################################################
 
-import sys
 from osgeo import gdal
 from osgeo import ogr
 
diff --git a/autotest/gdrivers/pcraster.py b/autotest/gdrivers/pcraster.py
index 9978e4dcaa8e..d567bf1068c8 100755
--- a/autotest/gdrivers/pcraster.py
+++ b/autotest/gdrivers/pcraster.py
@@ -28,7 +28,6 @@
 # DEALINGS IN THE SOFTWARE.
 ###############################################################################
 
-import sys
 from osgeo import gdal
 
 
diff --git a/autotest/gdrivers/pds.py b/autotest/gdrivers/pds.py
index c235936f3847..f84f5254b1cf 100755
--- a/autotest/gdrivers/pds.py
+++ b/autotest/gdrivers/pds.py
@@ -30,7 +30,6 @@
 ###############################################################################
 
 import os
-import sys
 from osgeo import gdal
 
 
diff --git a/autotest/gdrivers/pds4.py b/autotest/gdrivers/pds4.py
index 2fa6af3d1296..b911ba36eefb 100755
--- a/autotest/gdrivers/pds4.py
+++ b/autotest/gdrivers/pds4.py
@@ -31,7 +31,6 @@
 import contextlib
 import os
 import struct
-import sys
 
 
 from osgeo import gdal
diff --git a/autotest/gdrivers/plmosaic.py b/autotest/gdrivers/plmosaic.py
index 6350196a2353..7c859ae35b25 100755
--- a/autotest/gdrivers/plmosaic.py
+++ b/autotest/gdrivers/plmosaic.py
@@ -30,7 +30,6 @@
 ###############################################################################
 
 import os
-import sys
 import shutil
 import struct
 
diff --git a/autotest/gdrivers/png.py b/autotest/gdrivers/png.py
index 33dc5d205761..69b73eb852fc 100755
--- a/autotest/gdrivers/png.py
+++ b/autotest/gdrivers/png.py
@@ -30,7 +30,6 @@
 ###############################################################################
 
 import os
-import sys
 from osgeo import gdal
 
 
diff --git a/autotest/gdrivers/png_profile.py b/autotest/gdrivers/png_profile.py
index 7b9106074279..eb592e33a485 100755
--- a/autotest/gdrivers/png_profile.py
+++ b/autotest/gdrivers/png_profile.py
@@ -31,7 +31,6 @@
 # http://sourceforge.net/projects/openicc/files/OpenICC-Profiles/
 
 import os
-import sys
 import base64
 
 
diff --git a/autotest/gdrivers/pnm.py b/autotest/gdrivers/pnm.py
index 65686dfe36c4..d4b245a43c80 100755
--- a/autotest/gdrivers/pnm.py
+++ b/autotest/gdrivers/pnm.py
@@ -28,7 +28,6 @@
 # DEALINGS IN THE SOFTWARE.
 ###############################################################################
 
-import sys
 
 
 import gdaltest
diff --git a/autotest/gdrivers/postgisraster.py b/autotest/gdrivers/postgisraster.py
index 249e224e5599..52f1edef70a3 100755
--- a/autotest/gdrivers/postgisraster.py
+++ b/autotest/gdrivers/postgisraster.py
@@ -31,7 +31,6 @@
 # DEALINGS IN THE SOFTWARE.
 ###############################################################################
 
-import sys
 from osgeo import gdal
 from osgeo import ogr
 from osgeo import osr
diff --git a/autotest/gdrivers/prf.py b/autotest/gdrivers/prf.py
index 50a768feda49..18d056238c2f 100755
--- a/autotest/gdrivers/prf.py
+++ b/autotest/gdrivers/prf.py
@@ -24,7 +24,6 @@
 # DEALINGS IN THE SOFTWARE.
 ###############################################################################
 
-import sys
 
 
 import gdaltest
diff --git a/autotest/gdrivers/r.py b/autotest/gdrivers/r.py
index a65d4dc6aec0..17e2257c4918 100755
--- a/autotest/gdrivers/r.py
+++ b/autotest/gdrivers/r.py
@@ -28,7 +28,6 @@
 # DEALINGS IN THE SOFTWARE.
 ###############################################################################
 
-import sys
 
 
 import gdaltest
diff --git a/autotest/gdrivers/rasdaman.py b/autotest/gdrivers/rasdaman.py
index 6ba3a7bdb676..2d34da99eb6c 100755
--- a/autotest/gdrivers/rasdaman.py
+++ b/autotest/gdrivers/rasdaman.py
@@ -28,7 +28,6 @@
 # DEALINGS IN THE SOFTWARE.
 ###############################################################################
 
-import sys
 from osgeo import gdal
 
 
diff --git a/autotest/gdrivers/rasterlite.py b/autotest/gdrivers/rasterlite.py
index 14e3b5f18775..370baad9de1e 100755
--- a/autotest/gdrivers/rasterlite.py
+++ b/autotest/gdrivers/rasterlite.py
@@ -30,7 +30,6 @@
 ###############################################################################
 
 import os
-import sys
 from osgeo import gdal
 from osgeo import ogr
 
diff --git a/autotest/gdrivers/rda.py b/autotest/gdrivers/rda.py
index 5c827aec23e6..7831308c736b 100755
--- a/autotest/gdrivers/rda.py
+++ b/autotest/gdrivers/rda.py
@@ -31,7 +31,6 @@
 
 import os
 import struct
-import sys
 import json
 
 
diff --git a/autotest/gdrivers/rik.py b/autotest/gdrivers/rik.py
index d10c4c4341da..f8467fe62dbd 100755
--- a/autotest/gdrivers/rik.py
+++ b/autotest/gdrivers/rik.py
@@ -29,7 +29,6 @@
 ###############################################################################
 
 import os
-import sys
 from osgeo import gdal
 
 
diff --git a/autotest/gdrivers/rl2.py b/autotest/gdrivers/rl2.py
index 313cf9233972..895943b9cfc5 100755
--- a/autotest/gdrivers/rl2.py
+++ b/autotest/gdrivers/rl2.py
@@ -29,7 +29,6 @@
 # DEALINGS IN THE SOFTWARE.
 ###############################################################################
 
-import sys
 from osgeo import gdal, ogr
 
 
diff --git a/autotest/gdrivers/rmf.py b/autotest/gdrivers/rmf.py
index a31597ef50cf..1cadcc95c563 100755
--- a/autotest/gdrivers/rmf.py
+++ b/autotest/gdrivers/rmf.py
@@ -29,7 +29,6 @@
 ###############################################################################
 
 import os
-import sys
 
 
 import gdaltest
@@ -80,12 +79,12 @@ def test_rmf_5():
 
     tst = gdaltest.GDALTest('rmf', 'rgbsmall-lzw.rsw', 1, 40503)
     with gdaltest.error_handler():
-        ret = tst.testOpen()
+        tst.testOpen()
 
     
     tst = gdaltest.GDALTest('rmf', 'rgbsmall-lzw.rsw', 2, 41429)
     with gdaltest.error_handler():
-        ret = tst.testOpen()
+        tst.testOpen()
 
     
     tst = gdaltest.GDALTest('rmf', 'rgbsmall-lzw.rsw', 3, 40238)
@@ -97,11 +96,11 @@ def test_rmf_6():
 
     tst = gdaltest.GDALTest('rmf', 'big-endian.rsw', 1, 7782)
     with gdaltest.error_handler():
-        ret = tst.testOpen()
+        tst.testOpen()
     
     tst = gdaltest.GDALTest('rmf', 'big-endian.rsw', 2, 8480)
     with gdaltest.error_handler():
-        ret = tst.testOpen()
+        tst.testOpen()
     
     tst = gdaltest.GDALTest('rmf', 'big-endian.rsw', 3, 4195)
     with gdaltest.error_handler():
diff --git a/autotest/gdrivers/roipac.py b/autotest/gdrivers/roipac.py
index 9795a59e3dbf..e5e24087670f 100755
--- a/autotest/gdrivers/roipac.py
+++ b/autotest/gdrivers/roipac.py
@@ -29,7 +29,6 @@
 # DEALINGS IN THE SOFTWARE.
 ###############################################################################
 
-import sys
 from osgeo import gdal
 
 
diff --git a/autotest/gdrivers/rpftoc.py b/autotest/gdrivers/rpftoc.py
index d678ad73150e..8d7e4c3956ea 100755
--- a/autotest/gdrivers/rpftoc.py
+++ b/autotest/gdrivers/rpftoc.py
@@ -29,7 +29,6 @@
 ###############################################################################
 
 import os
-import sys
 import shutil
 from osgeo import gdal
 
diff --git a/autotest/gdrivers/rraster.py b/autotest/gdrivers/rraster.py
index b35e35d146cd..81a1fb7fae56 100755
--- a/autotest/gdrivers/rraster.py
+++ b/autotest/gdrivers/rraster.py
@@ -30,7 +30,6 @@
 ###############################################################################
 
 import pprint
-import sys
 from osgeo import gdal
 from osgeo import osr
 
diff --git a/autotest/gdrivers/rs2.py b/autotest/gdrivers/rs2.py
index 779b880a3b8e..f90d3ce8df26 100755
--- a/autotest/gdrivers/rs2.py
+++ b/autotest/gdrivers/rs2.py
@@ -28,7 +28,6 @@
 # DEALINGS IN THE SOFTWARE.
 ###############################################################################
 
-import sys
 
 
 from osgeo import gdal
diff --git a/autotest/gdrivers/safe.py b/autotest/gdrivers/safe.py
index 63144ae48fce..50b73b645bb6 100755
--- a/autotest/gdrivers/safe.py
+++ b/autotest/gdrivers/safe.py
@@ -28,7 +28,6 @@
 # DEALINGS IN THE SOFTWARE.
 ###############################################################################
 
-import sys
 
 
 import gdaltest
diff --git a/autotest/gdrivers/saga.py b/autotest/gdrivers/saga.py
index 16a2ba112e62..59f78667157e 100755
--- a/autotest/gdrivers/saga.py
+++ b/autotest/gdrivers/saga.py
@@ -30,7 +30,6 @@
 ###############################################################################
 
 import os
-import sys
 from osgeo import gdal
 
 
diff --git a/autotest/gdrivers/sar_ceos.py b/autotest/gdrivers/sar_ceos.py
index 1e3ff995d956..510a8f1b2648 100755
--- a/autotest/gdrivers/sar_ceos.py
+++ b/autotest/gdrivers/sar_ceos.py
@@ -28,7 +28,6 @@
 # DEALINGS IN THE SOFTWARE.
 ###############################################################################
 
-import sys
 
 
 import gdaltest
diff --git a/autotest/gdrivers/sdts.py b/autotest/gdrivers/sdts.py
index ff98a734f2cc..1f8ef7b3bf99 100755
--- a/autotest/gdrivers/sdts.py
+++ b/autotest/gdrivers/sdts.py
@@ -28,7 +28,6 @@
 # DEALINGS IN THE SOFTWARE.
 ###############################################################################
 
-import sys
 from osgeo import gdal
 from osgeo import osr
 
diff --git a/autotest/gdrivers/sgi.py b/autotest/gdrivers/sgi.py
index 544790c6eb5c..8a3496778b14 100755
--- a/autotest/gdrivers/sgi.py
+++ b/autotest/gdrivers/sgi.py
@@ -28,7 +28,6 @@
 # DEALINGS IN THE SOFTWARE.
 ###############################################################################
 
-import sys
 
 
 import gdaltest
diff --git a/autotest/gdrivers/sigdem.py b/autotest/gdrivers/sigdem.py
index 6264407c7fea..d636c9b21731 100755
--- a/autotest/gdrivers/sigdem.py
+++ b/autotest/gdrivers/sigdem.py
@@ -29,7 +29,6 @@
 # DEALINGS IN THE SOFTWARE.
 ###############################################################################
 
-import sys
 
 
 import gdaltest
diff --git a/autotest/gdrivers/snodas.py b/autotest/gdrivers/snodas.py
index 7fff5eaf474b..7220259549ec 100755
--- a/autotest/gdrivers/snodas.py
+++ b/autotest/gdrivers/snodas.py
@@ -28,7 +28,6 @@
 # DEALINGS IN THE SOFTWARE.
 ###############################################################################
 
-import sys
 from osgeo import gdal
 
 
diff --git a/autotest/gdrivers/srp.py b/autotest/gdrivers/srp.py
index 811386289507..8e14c7a61fa9 100755
--- a/autotest/gdrivers/srp.py
+++ b/autotest/gdrivers/srp.py
@@ -30,7 +30,6 @@
 ###############################################################################
 
 import os
-import sys
 from osgeo import gdal
 from osgeo import osr
 
diff --git a/autotest/gdrivers/srtmhgt.py b/autotest/gdrivers/srtmhgt.py
index 57baf81a943e..f3e9ffbad2a5 100755
--- a/autotest/gdrivers/srtmhgt.py
+++ b/autotest/gdrivers/srtmhgt.py
@@ -30,7 +30,6 @@
 ###############################################################################
 
 import os
-import sys
 from osgeo import gdal
 
 
diff --git a/autotest/gdrivers/terragen.py b/autotest/gdrivers/terragen.py
index 5e6bd65fc316..d71699120007 100755
--- a/autotest/gdrivers/terragen.py
+++ b/autotest/gdrivers/terragen.py
@@ -27,7 +27,6 @@
 # DEALINGS IN THE SOFTWARE.
 ###############################################################################
 
-import sys
 
 
 from osgeo import gdal
diff --git a/autotest/gdrivers/til.py b/autotest/gdrivers/til.py
index 286612448df3..807aec107dc3 100755
--- a/autotest/gdrivers/til.py
+++ b/autotest/gdrivers/til.py
@@ -29,7 +29,6 @@
 ###############################################################################
 
 import os
-import sys
 
 
 import gdaltest
diff --git a/autotest/gdrivers/usgsdem.py b/autotest/gdrivers/usgsdem.py
index 79f735ef6dc9..753767f6b03c 100755
--- a/autotest/gdrivers/usgsdem.py
+++ b/autotest/gdrivers/usgsdem.py
@@ -29,7 +29,6 @@
 ###############################################################################
 
 import os
-import sys
 from osgeo import gdal
 from osgeo import osr
 
diff --git a/autotest/gdrivers/vicar.py b/autotest/gdrivers/vicar.py
index 8fd5d22e5630..a505ae2a21a4 100755
--- a/autotest/gdrivers/vicar.py
+++ b/autotest/gdrivers/vicar.py
@@ -29,7 +29,6 @@
 # DEALINGS IN THE SOFTWARE.
 ###############################################################################
 
-import sys
 from osgeo import gdal
 
 
diff --git a/autotest/gdrivers/vrtderived.py b/autotest/gdrivers/vrtderived.py
index b569fdf81382..214fafc297d2 100755
--- a/autotest/gdrivers/vrtderived.py
+++ b/autotest/gdrivers/vrtderived.py
@@ -31,7 +31,6 @@
 
 import os
 import shutil
-import sys
 import threading
 from osgeo import gdal
 
diff --git a/autotest/gdrivers/vrtfilt.py b/autotest/gdrivers/vrtfilt.py
index 0accf969bb39..10acaaf180db 100755
--- a/autotest/gdrivers/vrtfilt.py
+++ b/autotest/gdrivers/vrtfilt.py
@@ -29,7 +29,6 @@
 # DEALINGS IN THE SOFTWARE.
 ###############################################################################
 
-import sys
 from osgeo import gdal
 
 
diff --git a/autotest/gdrivers/vrtlut.py b/autotest/gdrivers/vrtlut.py
index aacd3e1f8d79..3bbe8f21eeb9 100755
--- a/autotest/gdrivers/vrtlut.py
+++ b/autotest/gdrivers/vrtlut.py
@@ -28,7 +28,6 @@
 # DEALINGS IN THE SOFTWARE.
 ###############################################################################
 
-import sys
 
 
 import gdaltest
diff --git a/autotest/gdrivers/vrtmask.py b/autotest/gdrivers/vrtmask.py
index 478a94da7611..06afc9ceb35e 100755
--- a/autotest/gdrivers/vrtmask.py
+++ b/autotest/gdrivers/vrtmask.py
@@ -30,7 +30,6 @@
 ###############################################################################
 
 import os
-import sys
 from osgeo import gdal
 
 
diff --git a/autotest/gdrivers/vrtovr.py b/autotest/gdrivers/vrtovr.py
index ccf37addec63..b3d205d0bbd9 100755
--- a/autotest/gdrivers/vrtovr.py
+++ b/autotest/gdrivers/vrtovr.py
@@ -28,7 +28,6 @@
 # DEALINGS IN THE SOFTWARE.
 ###############################################################################
 
-import sys
 from osgeo import gdal
 
 
diff --git a/autotest/gdrivers/vrtpansharpen.py b/autotest/gdrivers/vrtpansharpen.py
index 49b55d01adb8..d23808e1134e 100755
--- a/autotest/gdrivers/vrtpansharpen.py
+++ b/autotest/gdrivers/vrtpansharpen.py
@@ -28,7 +28,6 @@
 # DEALINGS IN THE SOFTWARE.
 ###############################################################################
 
-import sys
 import shutil
 from osgeo import gdal
 
diff --git a/autotest/gdrivers/vrtrawlink.py b/autotest/gdrivers/vrtrawlink.py
index ed38b22b359b..a2c46c1ad41b 100755
--- a/autotest/gdrivers/vrtrawlink.py
+++ b/autotest/gdrivers/vrtrawlink.py
@@ -31,7 +31,6 @@
 ###############################################################################
 
 import os
-import sys
 from osgeo import gdal
 
 
diff --git a/autotest/gdrivers/vrtwarp.py b/autotest/gdrivers/vrtwarp.py
index beaeb287f27d..05a0cd523966 100755
--- a/autotest/gdrivers/vrtwarp.py
+++ b/autotest/gdrivers/vrtwarp.py
@@ -30,7 +30,6 @@
 
 import os
 import shutil
-import sys
 from osgeo import gdal
 
 
diff --git a/autotest/gdrivers/wcs.py b/autotest/gdrivers/wcs.py
index 77a4718a78fb..7196de0c4115 100755
--- a/autotest/gdrivers/wcs.py
+++ b/autotest/gdrivers/wcs.py
@@ -31,7 +31,6 @@
 ###############################################################################
 
 import os
-import sys
 import numbers
 import re
 import shutil
diff --git a/autotest/gdrivers/webp.py b/autotest/gdrivers/webp.py
index 539d28279538..135c901128f5 100755
--- a/autotest/gdrivers/webp.py
+++ b/autotest/gdrivers/webp.py
@@ -29,7 +29,6 @@
 # DEALINGS IN THE SOFTWARE.
 ###############################################################################
 
-import sys
 from osgeo import gdal
 
 
diff --git a/autotest/gdrivers/wms.py b/autotest/gdrivers/wms.py
index 554753afa242..3e635ed4ec6b 100755
--- a/autotest/gdrivers/wms.py
+++ b/autotest/gdrivers/wms.py
@@ -31,7 +31,6 @@
 ###############################################################################
 
 import os
-import sys
 import shutil
 from time import sleep
 import hashlib
diff --git a/autotest/gdrivers/wmts.py b/autotest/gdrivers/wmts.py
index 715962025548..c541796da89a 100755
--- a/autotest/gdrivers/wmts.py
+++ b/autotest/gdrivers/wmts.py
@@ -29,7 +29,6 @@
 # DEALINGS IN THE SOFTWARE.
 ###############################################################################
 
-import sys
 import shutil
 
 
diff --git a/autotest/gdrivers/xpm.py b/autotest/gdrivers/xpm.py
index 48c587652b7b..7564daa68eb6 100755
--- a/autotest/gdrivers/xpm.py
+++ b/autotest/gdrivers/xpm.py
@@ -28,7 +28,6 @@
 # DEALINGS IN THE SOFTWARE.
 ###############################################################################
 
-import sys
 
 import pytest
 
diff --git a/autotest/gdrivers/xyz.py b/autotest/gdrivers/xyz.py
index 042e8f697808..8609c423da64 100755
--- a/autotest/gdrivers/xyz.py
+++ b/autotest/gdrivers/xyz.py
@@ -29,7 +29,6 @@
 # DEALINGS IN THE SOFTWARE.
 ###############################################################################
 
-import sys
 import struct
 from osgeo import gdal
 
diff --git a/autotest/gdrivers/zmap.py b/autotest/gdrivers/zmap.py
index d43ad48b2d57..e39bcc745a06 100755
--- a/autotest/gdrivers/zmap.py
+++ b/autotest/gdrivers/zmap.py
@@ -28,7 +28,6 @@
 # DEALINGS IN THE SOFTWARE.
 ###############################################################################
 
-import sys
 
 
 import gdaltest
diff --git a/autotest/gnm/gnm_test.py b/autotest/gnm/gnm_test.py
index 1911c6305103..c61a54090690 100755
--- a/autotest/gnm/gnm_test.py
+++ b/autotest/gnm/gnm_test.py
@@ -32,7 +32,6 @@
 ###############################################################################
 
 import os
-import sys
 import shutil
 
 
diff --git a/autotest/ogr/ogr_arcgen.py b/autotest/ogr/ogr_arcgen.py
index 57e2f6c74c78..2ead1857cbea 100755
--- a/autotest/ogr/ogr_arcgen.py
+++ b/autotest/ogr/ogr_arcgen.py
@@ -28,7 +28,6 @@
 # DEALINGS IN THE SOFTWARE.
 ###############################################################################
 
-import sys
 
 
 import gdaltest
diff --git a/autotest/ogr/ogr_avc.py b/autotest/ogr/ogr_avc.py
index 7614beb05bfa..1838f416ba91 100755
--- a/autotest/ogr/ogr_avc.py
+++ b/autotest/ogr/ogr_avc.py
@@ -28,7 +28,6 @@
 # DEALINGS IN THE SOFTWARE.
 ###############################################################################
 
-import sys
 
 
 import gdaltest
diff --git a/autotest/ogr/ogr_bna.py b/autotest/ogr/ogr_bna.py
index 6b8a4f5e695e..3932ecdcc65e 100755
--- a/autotest/ogr/ogr_bna.py
+++ b/autotest/ogr/ogr_bna.py
@@ -30,7 +30,6 @@
 ###############################################################################
 
 import os
-import sys
 
 
 import gdaltest
diff --git a/autotest/ogr/ogr_cad.py b/autotest/ogr/ogr_cad.py
index 2c39aac9a61e..279ebc5b9402 100755
--- a/autotest/ogr/ogr_cad.py
+++ b/autotest/ogr/ogr_cad.py
@@ -30,7 +30,6 @@
 #  OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 #  SOFTWARE.
 ################################################################################
-import sys
 
 
 import gdaltest
diff --git a/autotest/ogr/ogr_carto.py b/autotest/ogr/ogr_carto.py
index b7864bdd09e2..c78fc1a20c94 100755
--- a/autotest/ogr/ogr_carto.py
+++ b/autotest/ogr/ogr_carto.py
@@ -29,7 +29,6 @@
 # DEALINGS IN THE SOFTWARE.
 ###############################################################################
 
-import sys
 import uuid
 
 
diff --git a/autotest/ogr/ogr_cloudant.py b/autotest/ogr/ogr_cloudant.py
index 478f1c29ef43..47125e15dbd3 100755
--- a/autotest/ogr/ogr_cloudant.py
+++ b/autotest/ogr/ogr_cloudant.py
@@ -31,7 +31,6 @@
 ###############################################################################
 
 import os
-import sys
 
 
 import gdaltest
diff --git a/autotest/ogr/ogr_couchdb.py b/autotest/ogr/ogr_couchdb.py
index d8d1b72474b4..a43f27f870f1 100755
--- a/autotest/ogr/ogr_couchdb.py
+++ b/autotest/ogr/ogr_couchdb.py
@@ -30,7 +30,6 @@
 ###############################################################################
 
 import os
-import sys
 import uuid
 
 
diff --git a/autotest/ogr/ogr_csw.py b/autotest/ogr/ogr_csw.py
index 7a355c525197..0905575b2e6e 100755
--- a/autotest/ogr/ogr_csw.py
+++ b/autotest/ogr/ogr_csw.py
@@ -29,7 +29,6 @@
 # DEALINGS IN THE SOFTWARE.
 ###############################################################################
 
-import sys
 
 import pytest
 
diff --git a/autotest/ogr/ogr_db2.py b/autotest/ogr/ogr_db2.py
index 149c812e19c2..eb8ae86820d0 100755
--- a/autotest/ogr/ogr_db2.py
+++ b/autotest/ogr/ogr_db2.py
@@ -39,7 +39,6 @@
 # These tests currently only run on Windows
 
 import os
-import sys
 
 
 import gdaltest
diff --git a/autotest/ogr/ogr_db2_hack.py b/autotest/ogr/ogr_db2_hack.py
index b96707106a3b..79509cf53cf4 100755
--- a/autotest/ogr/ogr_db2_hack.py
+++ b/autotest/ogr/ogr_db2_hack.py
@@ -27,7 +27,6 @@
 # Boston, MA 02111-1307, USA.
 ###############################################################################
 
-import sys
 
 
 import gdaltest
diff --git a/autotest/ogr/ogr_dgn.py b/autotest/ogr/ogr_dgn.py
index 6f9e014d7ddf..3ede5e77cd6e 100755
--- a/autotest/ogr/ogr_dgn.py
+++ b/autotest/ogr/ogr_dgn.py
@@ -25,7 +25,6 @@
 # Boston, MA 02111-1307, USA.
 ###############################################################################
 
-import sys
 
 
 import gdaltest
diff --git a/autotest/ogr/ogr_dgnv8.py b/autotest/ogr/ogr_dgnv8.py
index f5189cceeb67..529b2ac6cea4 100755
--- a/autotest/ogr/ogr_dgnv8.py
+++ b/autotest/ogr/ogr_dgnv8.py
@@ -30,7 +30,6 @@
 
 import os
 import shutil
-import sys
 
 
 import gdaltest
diff --git a/autotest/ogr/ogr_dods.py b/autotest/ogr/ogr_dods.py
index 760f7d4a0ceb..8bddf4b22e7b 100755
--- a/autotest/ogr/ogr_dods.py
+++ b/autotest/ogr/ogr_dods.py
@@ -26,7 +26,6 @@
 # Boston, MA 02111-1307, USA.
 ###############################################################################
 
-import sys
 
 
 import gdaltest
diff --git a/autotest/ogr/ogr_dxf.py b/autotest/ogr/ogr_dxf.py
index 9a31735b06bb..58823a6c827e 100644
--- a/autotest/ogr/ogr_dxf.py
+++ b/autotest/ogr/ogr_dxf.py
@@ -31,7 +31,6 @@
 ###############################################################################
 
 import os
-import sys
 from sys import version_info
 
 
diff --git a/autotest/ogr/ogr_edigeo.py b/autotest/ogr/ogr_edigeo.py
index c067f5e6cbad..a37fdf02e456 100755
--- a/autotest/ogr/ogr_edigeo.py
+++ b/autotest/ogr/ogr_edigeo.py
@@ -30,7 +30,6 @@
 ###############################################################################
 
 import os
-import sys
 from osgeo import ogr
 
 
diff --git a/autotest/ogr/ogr_eeda.py b/autotest/ogr/ogr_eeda.py
index d7a18455d0b1..8cb646b03924 100644
--- a/autotest/ogr/ogr_eeda.py
+++ b/autotest/ogr/ogr_eeda.py
@@ -30,7 +30,6 @@
 ###############################################################################
 
 import json
-import sys
 
 
 from osgeo import gdal, ogr
diff --git a/autotest/ogr/ogr_elasticsearch.py b/autotest/ogr/ogr_elasticsearch.py
index ed58f82af924..01d4359b82f6 100755
--- a/autotest/ogr/ogr_elasticsearch.py
+++ b/autotest/ogr/ogr_elasticsearch.py
@@ -28,7 +28,6 @@
 # DEALINGS IN THE SOFTWARE.
 ###############################################################################
 
-import sys
 
 
 import ogrtest
diff --git a/autotest/ogr/ogr_factory.py b/autotest/ogr/ogr_factory.py
index eed7f0a652f9..b95f036dd1c5 100755
--- a/autotest/ogr/ogr_factory.py
+++ b/autotest/ogr/ogr_factory.py
@@ -30,7 +30,6 @@
 # DEALINGS IN THE SOFTWARE.
 ###############################################################################
 
-import sys
 
 
 import ogrtest
diff --git a/autotest/ogr/ogr_fgdb.py b/autotest/ogr/ogr_fgdb.py
index 36e01bb8255f..773d8a89bd2e 100755
--- a/autotest/ogr/ogr_fgdb.py
+++ b/autotest/ogr/ogr_fgdb.py
@@ -30,7 +30,6 @@
 ###############################################################################
 
 import os
-import sys
 import shutil
 
 
diff --git a/autotest/ogr/ogr_fgdb_stress_test.py b/autotest/ogr/ogr_fgdb_stress_test.py
index c61509c65ff9..a0c840020cbb 100755
--- a/autotest/ogr/ogr_fgdb_stress_test.py
+++ b/autotest/ogr/ogr_fgdb_stress_test.py
@@ -31,7 +31,6 @@
 
 
 import random
-import sys
 import shutil
 
 
diff --git a/autotest/ogr/ogr_geoconcept.py b/autotest/ogr/ogr_geoconcept.py
index 5c7a2b8c58da..25f9e18bbcf9 100755
--- a/autotest/ogr/ogr_geoconcept.py
+++ b/autotest/ogr/ogr_geoconcept.py
@@ -30,7 +30,6 @@
 ###############################################################################
 
 import os
-import sys
 
 
 import gdaltest
diff --git a/autotest/ogr/ogr_geojson.py b/autotest/ogr/ogr_geojson.py
index 10c2cc409727..6f38468ff64d 100755
--- a/autotest/ogr/ogr_geojson.py
+++ b/autotest/ogr/ogr_geojson.py
@@ -31,7 +31,6 @@
 import json
 import math
 import os
-import sys
 
 
 from osgeo import osr
diff --git a/autotest/ogr/ogr_geojsonseq.py b/autotest/ogr/ogr_geojsonseq.py
index 7f167bcadcee..d1e222dcbd75 100755
--- a/autotest/ogr/ogr_geojsonseq.py
+++ b/autotest/ogr/ogr_geojsonseq.py
@@ -28,7 +28,6 @@
 # DEALINGS IN THE SOFTWARE.
 ###############################################################################
 
-import sys
 
 
 from osgeo import gdal
diff --git a/autotest/ogr/ogr_georss.py b/autotest/ogr/ogr_georss.py
index 134041f8a3d6..39f9164b2d81 100755
--- a/autotest/ogr/ogr_georss.py
+++ b/autotest/ogr/ogr_georss.py
@@ -30,7 +30,6 @@
 ###############################################################################
 
 import os
-import sys
 
 
 import gdaltest
diff --git a/autotest/ogr/ogr_geos.py b/autotest/ogr/ogr_geos.py
index d054eade1b99..ee6d2481c348 100755
--- a/autotest/ogr/ogr_geos.py
+++ b/autotest/ogr/ogr_geos.py
@@ -27,7 +27,6 @@
 # Boston, MA 02111-1307, USA.
 ###############################################################################
 
-import sys
 
 
 import gdaltest
diff --git a/autotest/ogr/ogr_gft.py b/autotest/ogr/ogr_gft.py
index da922f1a0c70..f8a551f7bc8f 100755
--- a/autotest/ogr/ogr_gft.py
+++ b/autotest/ogr/ogr_gft.py
@@ -30,7 +30,6 @@
 ###############################################################################
 
 import os
-import sys
 
 
 import gdaltest
diff --git a/autotest/ogr/ogr_gml_fgd_read.py b/autotest/ogr/ogr_gml_fgd_read.py
index 2d94e566fea8..9ac522809205 100755
--- a/autotest/ogr/ogr_gml_fgd_read.py
+++ b/autotest/ogr/ogr_gml_fgd_read.py
@@ -29,7 +29,6 @@
 # DEALINGS IN THE SOFTWARE.
 ###############################################################################
 
-import sys
 
 
 import gdaltest
diff --git a/autotest/ogr/ogr_gml_geom.py b/autotest/ogr/ogr_gml_geom.py
index 73eeec81aa64..41bd789946d9 100755
--- a/autotest/ogr/ogr_gml_geom.py
+++ b/autotest/ogr/ogr_gml_geom.py
@@ -28,7 +28,6 @@
 ###############################################################################
 
 import os
-import sys
 
 import pytest
 
diff --git a/autotest/ogr/ogr_gml_read.py b/autotest/ogr/ogr_gml_read.py
index 4b037d387e34..1297730edf56 100755
--- a/autotest/ogr/ogr_gml_read.py
+++ b/autotest/ogr/ogr_gml_read.py
@@ -1048,7 +1048,7 @@ def test_ogr_gml_31():
         pytest.skip()
 
     gdal.SetConfigOption('GML_READ_MODE', 'SEQUENTIAL_LAYERS')
-    ret = test_ogr_gml_29()
+    test_ogr_gml_29()
     gdal.SetConfigOption('GML_READ_MODE', None)
 
     # Test reading second layer and then first layer
diff --git a/autotest/ogr/ogr_gmt.py b/autotest/ogr/ogr_gmt.py
index 540b7e932482..1cf48546f5a6 100755
--- a/autotest/ogr/ogr_gmt.py
+++ b/autotest/ogr/ogr_gmt.py
@@ -28,7 +28,6 @@
 # DEALINGS IN THE SOFTWARE.
 ###############################################################################
 
-import sys
 
 
 import gdaltest
diff --git a/autotest/ogr/ogr_gpsbabel.py b/autotest/ogr/ogr_gpsbabel.py
index 656a769ea029..a6a516a444e3 100755
--- a/autotest/ogr/ogr_gpsbabel.py
+++ b/autotest/ogr/ogr_gpsbabel.py
@@ -28,7 +28,6 @@
 # DEALINGS IN THE SOFTWARE.
 ###############################################################################
 
-import sys
 
 
 import gdaltest
diff --git a/autotest/ogr/ogr_gpx.py b/autotest/ogr/ogr_gpx.py
index 72acdcf7ac1b..1815245aef03 100755
--- a/autotest/ogr/ogr_gpx.py
+++ b/autotest/ogr/ogr_gpx.py
@@ -29,7 +29,6 @@
 ###############################################################################
 
 import os
-import sys
 
 
 import gdaltest
diff --git a/autotest/ogr/ogr_grass.py b/autotest/ogr/ogr_grass.py
index 474e74a41b82..ac1aacf349d9 100755
--- a/autotest/ogr/ogr_grass.py
+++ b/autotest/ogr/ogr_grass.py
@@ -28,7 +28,6 @@
 # DEALINGS IN THE SOFTWARE.
 ###############################################################################
 
-import sys
 from osgeo import ogr
 
 
diff --git a/autotest/ogr/ogr_gtm.py b/autotest/ogr/ogr_gtm.py
index 5523730b1389..a26e69005cbd 100755
--- a/autotest/ogr/ogr_gtm.py
+++ b/autotest/ogr/ogr_gtm.py
@@ -30,7 +30,6 @@
 ###############################################################################
 
 import os
-import sys
 
 
 import gdaltest
diff --git a/autotest/ogr/ogr_htf.py b/autotest/ogr/ogr_htf.py
index 3aaa23011794..6436d016855d 100755
--- a/autotest/ogr/ogr_htf.py
+++ b/autotest/ogr/ogr_htf.py
@@ -28,7 +28,6 @@
 # DEALINGS IN THE SOFTWARE.
 ###############################################################################
 
-import sys
 
 
 import gdaltest
diff --git a/autotest/ogr/ogr_idrisi.py b/autotest/ogr/ogr_idrisi.py
index 1decf066e949..cfbb0e43187a 100755
--- a/autotest/ogr/ogr_idrisi.py
+++ b/autotest/ogr/ogr_idrisi.py
@@ -28,7 +28,6 @@
 # DEALINGS IN THE SOFTWARE.
 ###############################################################################
 
-import sys
 from osgeo import ogr
 
 
diff --git a/autotest/ogr/ogr_ili.py b/autotest/ogr/ogr_ili.py
index eccb55b963d9..af3ac896b56e 100755
--- a/autotest/ogr/ogr_ili.py
+++ b/autotest/ogr/ogr_ili.py
@@ -26,7 +26,6 @@
 # Boston, MA 02111-1307, USA.
 ###############################################################################
 
-import sys
 
 
 import gdaltest
diff --git a/autotest/ogr/ogr_index_test.py b/autotest/ogr/ogr_index_test.py
index 18f219b33a25..3bf99c179efa 100755
--- a/autotest/ogr/ogr_index_test.py
+++ b/autotest/ogr/ogr_index_test.py
@@ -27,7 +27,6 @@
 ###############################################################################
 
 import os
-import sys
 
 
 import gdaltest
@@ -395,19 +394,19 @@ def test_ogr_index_11():
     ds.ExecuteSQL('CREATE INDEX ON ogr_index_11 USING strfield')
 
     lyr.SetAttributeFilter("intfield = 1 OR strfield = 'bar'")
-    ret = ogr_index_11_check(lyr, [0, 1, 3])
+    ogr_index_11_check(lyr, [0, 1, 3])
 
     lyr.SetAttributeFilter("intfield = 1 AND strfield = 'bar'")
-    ret = ogr_index_11_check(lyr, [1])
+    ogr_index_11_check(lyr, [1])
 
     lyr.SetAttributeFilter("intfield = 1 AND strfield = 'foo'")
-    ret = ogr_index_11_check(lyr, [0])
+    ogr_index_11_check(lyr, [0])
 
     lyr.SetAttributeFilter("intfield = 3 AND strfield = 'foo'")
-    ret = ogr_index_11_check(lyr, [])
+    ogr_index_11_check(lyr, [])
 
     lyr.SetAttributeFilter("intfield IN (1, 2, 3)")
-    ret = ogr_index_11_check(lyr, [0, 1, 2, 3, 4])
+    ogr_index_11_check(lyr, [0, 1, 2, 3, 4])
 
     ds = None
 
diff --git a/autotest/ogr/ogr_ingres.py b/autotest/ogr/ogr_ingres.py
index ad0f3efd87ee..d997e19195c5 100755
--- a/autotest/ogr/ogr_ingres.py
+++ b/autotest/ogr/ogr_ingres.py
@@ -28,7 +28,6 @@
 # DEALINGS IN THE SOFTWARE.
 ###############################################################################
 
-import sys
 
 
 import gdaltest
diff --git a/autotest/ogr/ogr_jml.py b/autotest/ogr/ogr_jml.py
index cb0334b4982f..7745b6f0b392 100755
--- a/autotest/ogr/ogr_jml.py
+++ b/autotest/ogr/ogr_jml.py
@@ -29,7 +29,6 @@
 # DEALINGS IN THE SOFTWARE.
 ###############################################################################
 
-import sys
 
 
 import gdaltest
diff --git a/autotest/ogr/ogr_join_test.py b/autotest/ogr/ogr_join_test.py
index d07b3c00aa5d..dee0031407c7 100755
--- a/autotest/ogr/ogr_join_test.py
+++ b/autotest/ogr/ogr_join_test.py
@@ -27,7 +27,6 @@
 # Boston, MA 02111-1307, USA.
 ###############################################################################
 
-import sys
 
 
 import gdaltest
diff --git a/autotest/ogr/ogr_kml.py b/autotest/ogr/ogr_kml.py
index 105b1d49109b..b686280c2e27 100755
--- a/autotest/ogr/ogr_kml.py
+++ b/autotest/ogr/ogr_kml.py
@@ -31,7 +31,6 @@
 ###############################################################################
 
 import os
-import sys
 
 
 import gdaltest
diff --git a/autotest/ogr/ogr_layer_algebra.py b/autotest/ogr/ogr_layer_algebra.py
index 00e3769462f3..dce7d3d15793 100755
--- a/autotest/ogr/ogr_layer_algebra.py
+++ b/autotest/ogr/ogr_layer_algebra.py
@@ -29,7 +29,6 @@
 # DEALINGS IN THE SOFTWARE.
 ###############################################################################
 
-import sys
 
 
 import gdaltest
diff --git a/autotest/ogr/ogr_libkml.py b/autotest/ogr/ogr_libkml.py
index c742205d1f2d..bfca09c9a46c 100755
--- a/autotest/ogr/ogr_libkml.py
+++ b/autotest/ogr/ogr_libkml.py
@@ -29,7 +29,6 @@
 # DEALINGS IN THE SOFTWARE.
 ###############################################################################
 
-import sys
 
 
 import gdaltest
diff --git a/autotest/ogr/ogr_mem.py b/autotest/ogr/ogr_mem.py
index 422cb31543a8..ed0de9de324c 100755
--- a/autotest/ogr/ogr_mem.py
+++ b/autotest/ogr/ogr_mem.py
@@ -29,7 +29,6 @@
 # DEALINGS IN THE SOFTWARE.
 ###############################################################################
 
-import sys
 
 
 import gdaltest
diff --git a/autotest/ogr/ogr_mongodb.py b/autotest/ogr/ogr_mongodb.py
index 848dd44e9c8f..9270cf770a6a 100755
--- a/autotest/ogr/ogr_mongodb.py
+++ b/autotest/ogr/ogr_mongodb.py
@@ -30,7 +30,6 @@
 ###############################################################################
 
 import os
-import sys
 import uuid
 
 
diff --git a/autotest/ogr/ogr_mssqlspatial.py b/autotest/ogr/ogr_mssqlspatial.py
index 24764df76e8d..ce19b62a4570 100755
--- a/autotest/ogr/ogr_mssqlspatial.py
+++ b/autotest/ogr/ogr_mssqlspatial.py
@@ -29,7 +29,6 @@
 # DEALINGS IN THE SOFTWARE.
 ###############################################################################
 
-import sys
 
 
 import gdaltest
diff --git a/autotest/ogr/ogr_mysql.py b/autotest/ogr/ogr_mysql.py
index 10e0371a1689..b204304b7a43 100755
--- a/autotest/ogr/ogr_mysql.py
+++ b/autotest/ogr/ogr_mysql.py
@@ -27,7 +27,6 @@
 # Boston, MA 02111-1307, USA.
 ###############################################################################
 
-import sys
 
 
 import gdaltest
diff --git a/autotest/ogr/ogr_nas.py b/autotest/ogr/ogr_nas.py
index a1cc3579f541..5940c3d064a4 100755
--- a/autotest/ogr/ogr_nas.py
+++ b/autotest/ogr/ogr_nas.py
@@ -29,7 +29,6 @@
 ###############################################################################
 
 import os
-import sys
 
 
 import gdaltest
diff --git a/autotest/ogr/ogr_ntf.py b/autotest/ogr/ogr_ntf.py
index 0b4575c7d47a..09d18efe13fe 100755
--- a/autotest/ogr/ogr_ntf.py
+++ b/autotest/ogr/ogr_ntf.py
@@ -77,7 +77,6 @@
 
 
 import os
-import sys
 from osgeo import ogr
 
 
diff --git a/autotest/ogr/ogr_oci.py b/autotest/ogr/ogr_oci.py
index 30e171c8f849..0c969734e831 100755
--- a/autotest/ogr/ogr_oci.py
+++ b/autotest/ogr/ogr_oci.py
@@ -27,7 +27,6 @@
 ###############################################################################
 
 import os
-import sys
 
 
 import gdaltest
diff --git a/autotest/ogr/ogr_ods.py b/autotest/ogr/ogr_ods.py
index 16cc568c7d39..cea0a864b1e8 100755
--- a/autotest/ogr/ogr_ods.py
+++ b/autotest/ogr/ogr_ods.py
@@ -29,7 +29,6 @@
 ###############################################################################
 
 import os
-import sys
 import shutil
 
 
diff --git a/autotest/ogr/ogr_ogdi.py b/autotest/ogr/ogr_ogdi.py
index 92f883faf941..dd890633f782 100755
--- a/autotest/ogr/ogr_ogdi.py
+++ b/autotest/ogr/ogr_ogdi.py
@@ -29,7 +29,6 @@
 ###############################################################################
 
 import os
-import sys
 from osgeo import ogr
 
 
diff --git a/autotest/ogr/ogr_openair.py b/autotest/ogr/ogr_openair.py
index f7f6ebba1c4b..153f2534c34c 100755
--- a/autotest/ogr/ogr_openair.py
+++ b/autotest/ogr/ogr_openair.py
@@ -28,7 +28,6 @@
 # DEALINGS IN THE SOFTWARE.
 ###############################################################################
 
-import sys
 
 
 import gdaltest
diff --git a/autotest/ogr/ogr_osm.py b/autotest/ogr/ogr_osm.py
index 4e4c63dfb4eb..a4587e83665b 100755
--- a/autotest/ogr/ogr_osm.py
+++ b/autotest/ogr/ogr_osm.py
@@ -30,7 +30,6 @@
 ###############################################################################
 
 import os
-import sys
 from osgeo import ogr
 from osgeo import gdal
 
diff --git a/autotest/ogr/ogr_pcidsk.py b/autotest/ogr/ogr_pcidsk.py
index 3a9f18add3b5..35dd1204e151 100755
--- a/autotest/ogr/ogr_pcidsk.py
+++ b/autotest/ogr/ogr_pcidsk.py
@@ -28,7 +28,6 @@
 # DEALINGS IN THE SOFTWARE.
 ###############################################################################
 
-import sys
 
 
 import gdaltest
diff --git a/autotest/ogr/ogr_pdf.py b/autotest/ogr/ogr_pdf.py
index 1f49fe59f3fa..4cb73d54f9b1 100755
--- a/autotest/ogr/ogr_pdf.py
+++ b/autotest/ogr/ogr_pdf.py
@@ -29,7 +29,6 @@
 # DEALINGS IN THE SOFTWARE.
 ###############################################################################
 
-import sys
 
 
 import gdaltest
diff --git a/autotest/ogr/ogr_pds.py b/autotest/ogr/ogr_pds.py
index b8b519bcd542..deacf521fd49 100755
--- a/autotest/ogr/ogr_pds.py
+++ b/autotest/ogr/ogr_pds.py
@@ -28,7 +28,6 @@
 # DEALINGS IN THE SOFTWARE.
 ###############################################################################
 
-import sys
 
 
 import gdaltest
diff --git a/autotest/ogr/ogr_pgeo.py b/autotest/ogr/ogr_pgeo.py
index 7bd827f910a3..6c0f195cade9 100755
--- a/autotest/ogr/ogr_pgeo.py
+++ b/autotest/ogr/ogr_pgeo.py
@@ -30,7 +30,6 @@
 ###############################################################################
 
 import os
-import sys
 from osgeo import ogr
 
 
diff --git a/autotest/ogr/ogr_plscenes.py b/autotest/ogr/ogr_plscenes.py
index c2b4626e84e4..c192413845c0 100755
--- a/autotest/ogr/ogr_plscenes.py
+++ b/autotest/ogr/ogr_plscenes.py
@@ -29,7 +29,6 @@
 # DEALINGS IN THE SOFTWARE.
 ###############################################################################
 
-import sys
 
 
 from osgeo import ogr
diff --git a/autotest/ogr/ogr_rec.py b/autotest/ogr/ogr_rec.py
index a3a17789d446..768d1603f35f 100755
--- a/autotest/ogr/ogr_rec.py
+++ b/autotest/ogr/ogr_rec.py
@@ -29,7 +29,6 @@
 # DEALINGS IN THE SOFTWARE.
 ###############################################################################
 
-import sys
 
 
 import gdaltest
diff --git a/autotest/ogr/ogr_refcount.py b/autotest/ogr/ogr_refcount.py
index 8f1aa9decb4b..2031da9623c0 100755
--- a/autotest/ogr/ogr_refcount.py
+++ b/autotest/ogr/ogr_refcount.py
@@ -26,7 +26,6 @@
 # Boston, MA 02111-1307, USA.
 ###############################################################################
 
-import sys
 
 
 import gdaltest
diff --git a/autotest/ogr/ogr_rfc30.py b/autotest/ogr/ogr_rfc30.py
index 026120ea56db..2d7a668f44e5 100755
--- a/autotest/ogr/ogr_rfc30.py
+++ b/autotest/ogr/ogr_rfc30.py
@@ -28,7 +28,6 @@
 # DEALINGS IN THE SOFTWARE.
 ###############################################################################
 
-import sys
 from sys import version_info
 from osgeo import ogr
 
diff --git a/autotest/ogr/ogr_rfc35_mem.py b/autotest/ogr/ogr_rfc35_mem.py
index 6701d566f8a2..3dad00cc5bf4 100755
--- a/autotest/ogr/ogr_rfc35_mem.py
+++ b/autotest/ogr/ogr_rfc35_mem.py
@@ -28,7 +28,6 @@
 # DEALINGS IN THE SOFTWARE.
 ###############################################################################
 
-import sys
 
 
 import gdaltest
@@ -132,9 +131,9 @@ def CheckColumnOrder(lyr, expected_order):
 
 def Check(lyr, expected_order):
 
-    ret = CheckColumnOrder(lyr, expected_order)
+    CheckColumnOrder(lyr, expected_order)
 
-    ret = CheckFeatures(lyr)
+    CheckFeatures(lyr)
 
 
 def test_ogr_rfc35_mem_2():
diff --git a/autotest/ogr/ogr_rfc35_mitab.py b/autotest/ogr/ogr_rfc35_mitab.py
index 046424b8a3c8..66dac53f2c9b 100755
--- a/autotest/ogr/ogr_rfc35_mitab.py
+++ b/autotest/ogr/ogr_rfc35_mitab.py
@@ -29,7 +29,6 @@
 # DEALINGS IN THE SOFTWARE.
 ###############################################################################
 
-import sys
 
 
 import gdaltest
@@ -148,16 +147,16 @@ def CheckColumnOrder(lyr, expected_order):
 
 def Check(lyr, expected_order):
 
-    ret = CheckColumnOrder(lyr, expected_order)
+    CheckColumnOrder(lyr, expected_order)
 
-    ret = CheckFeatures(lyr)
+    CheckFeatures(lyr)
 
     ds = ogr.Open('/vsimem/rfc35_test.tab', update=1)
     lyr_reopen = ds.GetLayer(0)
 
-    ret = CheckColumnOrder(lyr_reopen, expected_order)
+    CheckColumnOrder(lyr_reopen, expected_order)
 
-    ret = CheckFeatures(lyr_reopen)
+    CheckFeatures(lyr_reopen)
 
 
 def test_ogr_rfc35_mitab_2():
diff --git a/autotest/ogr/ogr_rfc35_shape.py b/autotest/ogr/ogr_rfc35_shape.py
index b2e1dfa4e2d6..54b1b85bfe3f 100755
--- a/autotest/ogr/ogr_rfc35_shape.py
+++ b/autotest/ogr/ogr_rfc35_shape.py
@@ -29,7 +29,6 @@
 # DEALINGS IN THE SOFTWARE.
 ###############################################################################
 
-import sys
 
 
 import gdaltest
@@ -148,16 +147,16 @@ def CheckColumnOrder(lyr, expected_order):
 
 def Check(lyr, expected_order):
 
-    ret = CheckColumnOrder(lyr, expected_order)
+    CheckColumnOrder(lyr, expected_order)
 
-    ret = CheckFeatures(lyr)
+    CheckFeatures(lyr)
 
     ds = ogr.Open('/vsimem/rfc35_test.dbf', update=1)
     lyr_reopen = ds.GetLayer(0)
 
-    ret = CheckColumnOrder(lyr_reopen, expected_order)
+    CheckColumnOrder(lyr_reopen, expected_order)
 
-    ret = CheckFeatures(lyr_reopen)
+    CheckFeatures(lyr_reopen)
 
 
 def test_ogr_rfc35_shape_2():
diff --git a/autotest/ogr/ogr_rfc35_sqlite.py b/autotest/ogr/ogr_rfc35_sqlite.py
index 29f478b41dc4..7cb7f012fd30 100755
--- a/autotest/ogr/ogr_rfc35_sqlite.py
+++ b/autotest/ogr/ogr_rfc35_sqlite.py
@@ -28,7 +28,6 @@
 # DEALINGS IN THE SOFTWARE.
 ###############################################################################
 
-import sys
 
 
 import gdaltest
@@ -146,9 +145,9 @@ def CheckColumnOrder(lyr, expected_order):
 
 def Check(lyr, expected_order):
 
-    ret = CheckColumnOrder(lyr, expected_order)
+    CheckColumnOrder(lyr, expected_order)
 
-    ret = CheckFeatures(lyr)
+    CheckFeatures(lyr)
 
 
 def test_ogr_rfc35_sqlite_2():
diff --git a/autotest/ogr/ogr_rfc41.py b/autotest/ogr/ogr_rfc41.py
index db98b1ba430b..b0a9a5a54117 100755
--- a/autotest/ogr/ogr_rfc41.py
+++ b/autotest/ogr/ogr_rfc41.py
@@ -29,7 +29,6 @@
 # DEALINGS IN THE SOFTWARE.
 ###############################################################################
 
-import sys
 
 
 import gdaltest
diff --git a/autotest/ogr/ogr_sde.py b/autotest/ogr/ogr_sde.py
index f05bcae5d871..49861ee53b0c 100755
--- a/autotest/ogr/ogr_sde.py
+++ b/autotest/ogr/ogr_sde.py
@@ -28,7 +28,6 @@
 #  DEALINGS IN THE SOFTWARE.
 ###############################################################################
 
-import sys
 
 
 import gdaltest
diff --git a/autotest/ogr/ogr_sdts.py b/autotest/ogr/ogr_sdts.py
index ffa5f360fbdd..7d8e4af1ade9 100755
--- a/autotest/ogr/ogr_sdts.py
+++ b/autotest/ogr/ogr_sdts.py
@@ -28,7 +28,6 @@
 # DEALINGS IN THE SOFTWARE.
 ###############################################################################
 
-import sys
 
 
 import gdaltest
diff --git a/autotest/ogr/ogr_segukooa.py b/autotest/ogr/ogr_segukooa.py
index f0e70b73a0da..26f6e3099b00 100755
--- a/autotest/ogr/ogr_segukooa.py
+++ b/autotest/ogr/ogr_segukooa.py
@@ -28,7 +28,6 @@
 # DEALINGS IN THE SOFTWARE.
 ###############################################################################
 
-import sys
 
 
 import gdaltest
diff --git a/autotest/ogr/ogr_segy.py b/autotest/ogr/ogr_segy.py
index 0b1cd0fd1deb..401d23212d72 100755
--- a/autotest/ogr/ogr_segy.py
+++ b/autotest/ogr/ogr_segy.py
@@ -28,7 +28,6 @@
 # DEALINGS IN THE SOFTWARE.
 ###############################################################################
 
-import sys
 
 
 import gdaltest
diff --git a/autotest/ogr/ogr_selafin.py b/autotest/ogr/ogr_selafin.py
index c602da43c670..4e9351c6632e 100755
--- a/autotest/ogr/ogr_selafin.py
+++ b/autotest/ogr/ogr_selafin.py
@@ -29,12 +29,10 @@
 ###############################################################################
 
 import os
-import sys
 import math
 
 
 import gdaltest
-import ogrtest
 from osgeo import gdal
 from osgeo import ogr
 from osgeo import osr
diff --git a/autotest/ogr/ogr_shape.py b/autotest/ogr/ogr_shape.py
index 0ad73d6875e8..cec44e7effed 100755
--- a/autotest/ogr/ogr_shape.py
+++ b/autotest/ogr/ogr_shape.py
@@ -2196,16 +2196,16 @@ def test_ogr_shape_54():
     # Test access to the N layers in sequence
     ds = ogr.Open(ds_name)
     for i in range(N):
-        ret = ogr_shape_54_test_layer(ds, i)
+        ogr_shape_54_test_layer(ds, i)
 
     # Now some 'random' access
-    ret = ogr_shape_54_test_layer(ds, N - 1 - LRUListSize)
-    ret = ogr_shape_54_test_layer(ds, N - LRUListSize / 2)
-    ret = ogr_shape_54_test_layer(ds, N - LRUListSize / 4)
-    ret = ogr_shape_54_test_layer(ds, 0)
-    ret = ogr_shape_54_test_layer(ds, 0)
-    ret = ogr_shape_54_test_layer(ds, 2)
-    ret = ogr_shape_54_test_layer(ds, 1)
+    ogr_shape_54_test_layer(ds, N - 1 - LRUListSize)
+    ogr_shape_54_test_layer(ds, N - LRUListSize / 2)
+    ogr_shape_54_test_layer(ds, N - LRUListSize / 4)
+    ogr_shape_54_test_layer(ds, 0)
+    ogr_shape_54_test_layer(ds, 0)
+    ogr_shape_54_test_layer(ds, 2)
+    ogr_shape_54_test_layer(ds, 1)
     ds = None
 
     # Test adding a new layer
@@ -2215,21 +2215,21 @@ def test_ogr_shape_54():
 
     # Test accessing the new layer
     ds = ogr.Open(ds_name)
-    ret = ogr_shape_54_test_layer(ds, N)
+    ogr_shape_54_test_layer(ds, N)
     ds = None
 
     # Test deleting layers
     ds = ogr.Open(ds_name, update=1)
     for i in range(N):
-        ret = ogr_shape_54_test_layer(ds, i)
+        ogr_shape_54_test_layer(ds, i)
     for i in range(N - LRUListSize + 1, N):
         ds.ExecuteSQL('DROP TABLE layer%03d' % i)
-    ret = ogr_shape_54_test_layer(ds, N - LRUListSize)
+    ogr_shape_54_test_layer(ds, N - LRUListSize)
     ogr_shape_54_create_layer(ds, N + 2)
     for i in range(0, N - LRUListSize + 1):
         ds.ExecuteSQL('DROP TABLE layer%03d' % i)
-    ret = ogr_shape_54_test_layer(ds, N)
-    ret = ogr_shape_54_test_layer(ds, N + 2)
+    ogr_shape_54_test_layer(ds, N)
+    ogr_shape_54_test_layer(ds, N + 2)
     ds = None
 
     # Destroy and recreate datasource
diff --git a/autotest/ogr/ogr_shape_qix.py b/autotest/ogr/ogr_shape_qix.py
index 895c343289c4..9c33d85bdc18 100755
--- a/autotest/ogr/ogr_shape_qix.py
+++ b/autotest/ogr/ogr_shape_qix.py
@@ -29,7 +29,6 @@
 # DEALINGS IN THE SOFTWARE.
 ###############################################################################
 
-import sys
 import random
 
 
diff --git a/autotest/ogr/ogr_shape_sbn.py b/autotest/ogr/ogr_shape_sbn.py
index 6c5475e34c9b..8c5fe8894ffa 100755
--- a/autotest/ogr/ogr_shape_sbn.py
+++ b/autotest/ogr/ogr_shape_sbn.py
@@ -29,7 +29,6 @@
 # DEALINGS IN THE SOFTWARE.
 ###############################################################################
 
-import sys
 import os
 
 
@@ -122,7 +121,7 @@ def test_ogr_shape_sbn_1():
     ds = ogr.Open('tmp/cache/CochitiDamShapeFiles')
     for i in range(ds.GetLayerCount()):
         lyr = ds.GetLayer(i)
-        ret = search_all_features(lyr)
+        search_all_features(lyr)
 
     
 ###############################################################################
diff --git a/autotest/ogr/ogr_sosi.py b/autotest/ogr/ogr_sosi.py
index 15c3d867cffc..496f4051c16e 100755
--- a/autotest/ogr/ogr_sosi.py
+++ b/autotest/ogr/ogr_sosi.py
@@ -29,7 +29,6 @@
 # DEALINGS IN THE SOFTWARE.
 ###############################################################################
 
-import sys
 from osgeo import ogr
 
 
diff --git a/autotest/ogr/ogr_sql_rfc28.py b/autotest/ogr/ogr_sql_rfc28.py
index bc238677f266..1c1142996c32 100755
--- a/autotest/ogr/ogr_sql_rfc28.py
+++ b/autotest/ogr/ogr_sql_rfc28.py
@@ -30,7 +30,6 @@
 # DEALINGS IN THE SOFTWARE.
 ###############################################################################
 
-import sys
 
 
 from osgeo import gdal
diff --git a/autotest/ogr/ogr_sql_sqlite.py b/autotest/ogr/ogr_sql_sqlite.py
index b537792c6193..b184f19c5353 100755
--- a/autotest/ogr/ogr_sql_sqlite.py
+++ b/autotest/ogr/ogr_sql_sqlite.py
@@ -34,7 +34,6 @@
 except ImportError:
     from http.server import BaseHTTPRequestHandler
 
-import sys
 
 
 from osgeo import ogr
@@ -472,11 +471,11 @@ def test_ogr_sql_sqlite_6():
 
     gdal.SetConfigOption('OGR_SQLITE_DIALECT_USE_SPATIALITE', 'NO')
 
-    ret = test_ogr_sql_sqlite_1()
+    test_ogr_sql_sqlite_1()
 
-    ret = test_ogr_sql_sqlite_2()
+    test_ogr_sql_sqlite_2()
 
-    ret = test_ogr_sql_sqlite_4()
+    test_ogr_sql_sqlite_4()
 
     gdal.SetConfigOption('OGR_SQLITE_DIALECT_USE_SPATIALITE', None)
 
diff --git a/autotest/ogr/ogr_style.py b/autotest/ogr/ogr_style.py
index 2b83b58903f1..44d144a04639 100755
--- a/autotest/ogr/ogr_style.py
+++ b/autotest/ogr/ogr_style.py
@@ -29,7 +29,6 @@
 # DEALINGS IN THE SOFTWARE.
 ###############################################################################
 
-import sys
 
 
 import gdaltest
diff --git a/autotest/ogr/ogr_sua.py b/autotest/ogr/ogr_sua.py
index 779e9522082b..a95e2c35aad2 100755
--- a/autotest/ogr/ogr_sua.py
+++ b/autotest/ogr/ogr_sua.py
@@ -28,7 +28,6 @@
 # DEALINGS IN THE SOFTWARE.
 ###############################################################################
 
-import sys
 
 
 import gdaltest
diff --git a/autotest/ogr/ogr_svg.py b/autotest/ogr/ogr_svg.py
index 24943f10bfb7..a0e085136252 100755
--- a/autotest/ogr/ogr_svg.py
+++ b/autotest/ogr/ogr_svg.py
@@ -28,7 +28,6 @@
 # DEALINGS IN THE SOFTWARE.
 ###############################################################################
 
-import sys
 
 
 import gdaltest
diff --git a/autotest/ogr/ogr_sxf.py b/autotest/ogr/ogr_sxf.py
index ae4f5d674955..d104d4a9cf48 100755
--- a/autotest/ogr/ogr_sxf.py
+++ b/autotest/ogr/ogr_sxf.py
@@ -26,7 +26,6 @@
 # Boston, MA 02111-1307, USA.
 ###############################################################################
 
-import sys
 
 
 import gdaltest
diff --git a/autotest/ogr/ogr_tiger.py b/autotest/ogr/ogr_tiger.py
index 84751ae4f0ab..474fd9b7f60f 100755
--- a/autotest/ogr/ogr_tiger.py
+++ b/autotest/ogr/ogr_tiger.py
@@ -29,7 +29,6 @@
 ###############################################################################
 
 import os
-import sys
 import shutil
 from osgeo import gdal
 from osgeo import ogr
diff --git a/autotest/ogr/ogr_vfk.py b/autotest/ogr/ogr_vfk.py
index 2ea85f952945..3ab6a8dcdc34 100755
--- a/autotest/ogr/ogr_vfk.py
+++ b/autotest/ogr/ogr_vfk.py
@@ -31,7 +31,6 @@
 ###############################################################################
 
 import os
-import sys
 
 
 import gdaltest
diff --git a/autotest/ogr/ogr_vrt.py b/autotest/ogr/ogr_vrt.py
index 61223dc50ed5..85467ba2a068 100755
--- a/autotest/ogr/ogr_vrt.py
+++ b/autotest/ogr/ogr_vrt.py
@@ -28,7 +28,6 @@
 ###############################################################################
 
 import os
-import sys
 
 
 import gdaltest
diff --git a/autotest/ogr/ogr_wasp.py b/autotest/ogr/ogr_wasp.py
index 52b5ce3c8d14..56189c7254ba 100755
--- a/autotest/ogr/ogr_wasp.py
+++ b/autotest/ogr/ogr_wasp.py
@@ -29,7 +29,6 @@
 # DEALINGS IN THE SOFTWARE.
 ###############################################################################
 
-import sys
 import math
 
 
diff --git a/autotest/ogr/ogr_wfs3.py b/autotest/ogr/ogr_wfs3.py
index 97e82d8696a7..1aebb2008270 100755
--- a/autotest/ogr/ogr_wfs3.py
+++ b/autotest/ogr/ogr_wfs3.py
@@ -29,7 +29,6 @@
 # DEALINGS IN THE SOFTWARE.
 ###############################################################################
 
-import sys
 
 
 import gdaltest
diff --git a/autotest/ogr/ogr_wkbwkt_geom.py b/autotest/ogr/ogr_wkbwkt_geom.py
index efb4239c7630..9cc006cad32b 100755
--- a/autotest/ogr/ogr_wkbwkt_geom.py
+++ b/autotest/ogr/ogr_wkbwkt_geom.py
@@ -28,7 +28,6 @@
 ###############################################################################
 
 import os
-import sys
 
 import pytest
 
diff --git a/autotest/ogr/ogr_wktempty.py b/autotest/ogr/ogr_wktempty.py
index 21c6cfe302c0..98e2c9f75f8f 100755
--- a/autotest/ogr/ogr_wktempty.py
+++ b/autotest/ogr/ogr_wktempty.py
@@ -26,7 +26,6 @@
 # Boston, MA 02111-1307, USA.
 ###############################################################################
 
-import sys
 
 import pytest
 
diff --git a/autotest/ogr/ogr_xls.py b/autotest/ogr/ogr_xls.py
index 09f0d94da33f..6ffac6f34b84 100755
--- a/autotest/ogr/ogr_xls.py
+++ b/autotest/ogr/ogr_xls.py
@@ -29,7 +29,6 @@
 # DEALINGS IN THE SOFTWARE.
 ###############################################################################
 
-import sys
 
 
 import gdaltest
diff --git a/autotest/ogr/ogr_xlsx.py b/autotest/ogr/ogr_xlsx.py
index 3914557e6f8f..5d2167b51e5c 100755
--- a/autotest/ogr/ogr_xlsx.py
+++ b/autotest/ogr/ogr_xlsx.py
@@ -29,7 +29,6 @@
 ###############################################################################
 
 import os
-import sys
 import shutil
 
 
diff --git a/autotest/ogr/ogr_xplane.py b/autotest/ogr/ogr_xplane.py
index 2f0eb61db6a4..10493a0e514a 100755
--- a/autotest/ogr/ogr_xplane.py
+++ b/autotest/ogr/ogr_xplane.py
@@ -28,7 +28,6 @@
 # DEALINGS IN THE SOFTWARE.
 ###############################################################################
 
-import sys
 
 
 import gdaltest
diff --git a/autotest/ogr/ograpispy.py b/autotest/ogr/ograpispy.py
index f543785d36c8..47ef18218ffa 100755
--- a/autotest/ogr/ograpispy.py
+++ b/autotest/ogr/ograpispy.py
@@ -30,7 +30,6 @@
 ###############################################################################
 
 import os
-import sys
 import shutil
 from difflib import unified_diff
 
diff --git a/autotest/osr/osr_basic.py b/autotest/osr/osr_basic.py
index ca554ebd1d38..0032f05e76bd 100755
--- a/autotest/osr/osr_basic.py
+++ b/autotest/osr/osr_basic.py
@@ -31,7 +31,6 @@
 # DEALINGS IN THE SOFTWARE.
 ###############################################################################
 
-import sys
 
 
 import gdaltest
diff --git a/autotest/osr/osr_compd.py b/autotest/osr/osr_compd.py
index 7049b4f95fc2..4a6557cb0194 100755
--- a/autotest/osr/osr_compd.py
+++ b/autotest/osr/osr_compd.py
@@ -30,7 +30,6 @@
 # DEALINGS IN THE SOFTWARE.
 ###############################################################################
 
-import sys
 import osr_proj4
 
 
diff --git a/autotest/osr/osr_ct.py b/autotest/osr/osr_ct.py
index 0a1b567019d7..a7c646534a4c 100755
--- a/autotest/osr/osr_ct.py
+++ b/autotest/osr/osr_ct.py
@@ -31,7 +31,6 @@
 # DEALINGS IN THE SOFTWARE.
 ###############################################################################
 
-import sys
 
 
 from osgeo import gdal
diff --git a/autotest/osr/osr_epsg.py b/autotest/osr/osr_epsg.py
index 837a26827e57..51760abfed2c 100755
--- a/autotest/osr/osr_epsg.py
+++ b/autotest/osr/osr_epsg.py
@@ -30,7 +30,6 @@
 # DEALINGS IN THE SOFTWARE.
 ###############################################################################
 
-import sys
 
 
 import gdaltest
diff --git a/autotest/osr/osr_erm.py b/autotest/osr/osr_erm.py
index 07df4371ea74..32eca36915ce 100755
--- a/autotest/osr/osr_erm.py
+++ b/autotest/osr/osr_erm.py
@@ -25,7 +25,6 @@
 # Boston, MA 02111-1307, USA.
 ###############################################################################
 
-import sys
 
 
 import gdaltest
diff --git a/autotest/osr/osr_getprojectionmethods.py b/autotest/osr/osr_getprojectionmethods.py
index 0465f0b71832..09cf2e9197ae 100755
--- a/autotest/osr/osr_getprojectionmethods.py
+++ b/autotest/osr/osr_getprojectionmethods.py
@@ -28,7 +28,6 @@
 # DEALINGS IN THE SOFTWARE.
 ###############################################################################
 
-import sys
 
 
 import gdaltest
diff --git a/autotest/osr/osr_micoordsys.py b/autotest/osr/osr_micoordsys.py
index b27af193fcfb..76adc9375051 100755
--- a/autotest/osr/osr_micoordsys.py
+++ b/autotest/osr/osr_micoordsys.py
@@ -28,7 +28,6 @@
 # DEALINGS IN THE SOFTWARE.
 ###############################################################################
 
-import sys
 
 
 import gdaltest
diff --git a/autotest/osr/osr_ozi.py b/autotest/osr/osr_ozi.py
index 655d20395034..7aa98606f351 100755
--- a/autotest/osr/osr_ozi.py
+++ b/autotest/osr/osr_ozi.py
@@ -28,7 +28,6 @@
 # DEALINGS IN THE SOFTWARE.
 ###############################################################################
 
-import sys
 
 
 import gdaltest
diff --git a/autotest/osr/osr_pci.py b/autotest/osr/osr_pci.py
index a4e586c8b99f..ebf332bc775b 100755
--- a/autotest/osr/osr_pci.py
+++ b/autotest/osr/osr_pci.py
@@ -25,7 +25,6 @@
 # Boston, MA 02111-1307, USA.
 ###############################################################################
 
-import sys
 
 
 import gdaltest
diff --git a/autotest/osr/osr_pm.py b/autotest/osr/osr_pm.py
index 0c7c9a6ff911..3c04cc03ee8b 100755
--- a/autotest/osr/osr_pm.py
+++ b/autotest/osr/osr_pm.py
@@ -29,7 +29,6 @@
 # DEALINGS IN THE SOFTWARE.
 ###############################################################################
 
-import sys
 
 
 import gdaltest
diff --git a/autotest/osr/osr_proj4.py b/autotest/osr/osr_proj4.py
index 87d215eec924..acc6d4d9173c 100755
--- a/autotest/osr/osr_proj4.py
+++ b/autotest/osr/osr_proj4.py
@@ -31,7 +31,6 @@
 # DEALINGS IN THE SOFTWARE.
 ###############################################################################
 
-import os
 import sys
 
 
diff --git a/autotest/osr/osr_url.py b/autotest/osr/osr_url.py
index 97532700cfe7..381d2c8953a1 100755
--- a/autotest/osr/osr_url.py
+++ b/autotest/osr/osr_url.py
@@ -29,7 +29,6 @@
 # DEALINGS IN THE SOFTWARE.
 ###############################################################################
 
-import sys
 import socket
 
 
diff --git a/autotest/osr/osr_usgs.py b/autotest/osr/osr_usgs.py
index 2385e18484e9..95b84af1176f 100755
--- a/autotest/osr/osr_usgs.py
+++ b/autotest/osr/osr_usgs.py
@@ -28,7 +28,6 @@
 # DEALINGS IN THE SOFTWARE.
 ###############################################################################
 
-import sys
 
 
 import gdaltest
diff --git a/autotest/osr/osr_validate.py b/autotest/osr/osr_validate.py
index b3ccc7e2d6e2..39c32fbd5e64 100755
--- a/autotest/osr/osr_validate.py
+++ b/autotest/osr/osr_validate.py
@@ -29,7 +29,6 @@
 # DEALINGS IN THE SOFTWARE.
 ###############################################################################
 
-import sys
 
 
 import gdaltest
diff --git a/autotest/osr/osr_xml.py b/autotest/osr/osr_xml.py
index 3ca5109791da..c25a9fe65975 100755
--- a/autotest/osr/osr_xml.py
+++ b/autotest/osr/osr_xml.py
@@ -29,7 +29,6 @@
 ###############################################################################
 
 import re
-import sys
 
 
 import gdaltest
diff --git a/autotest/pyscripts/test_gdal_fillnodata.py b/autotest/pyscripts/test_gdal_fillnodata.py
index 0b617d6486f1..cf19f2866e80 100755
--- a/autotest/pyscripts/test_gdal_fillnodata.py
+++ b/autotest/pyscripts/test_gdal_fillnodata.py
@@ -29,7 +29,6 @@
 ###############################################################################
 
 
-import sys
 import os
 
 
diff --git a/autotest/pyscripts/test_gdal_merge.py b/autotest/pyscripts/test_gdal_merge.py
index b8ccbe8cfd5c..661b7d8399e8 100755
--- a/autotest/pyscripts/test_gdal_merge.py
+++ b/autotest/pyscripts/test_gdal_merge.py
@@ -29,7 +29,6 @@
 ###############################################################################
 
 
-import sys
 import os
 
 
diff --git a/autotest/pyscripts/test_gdal_pansharpen.py b/autotest/pyscripts/test_gdal_pansharpen.py
index 8ab8f896f11b..bf70ad05093c 100755
--- a/autotest/pyscripts/test_gdal_pansharpen.py
+++ b/autotest/pyscripts/test_gdal_pansharpen.py
@@ -29,7 +29,6 @@
 # DEALINGS IN THE SOFTWARE.
 ###############################################################################
 
-import sys
 
 
 from osgeo import gdal
diff --git a/autotest/pyscripts/test_gdal_polygonize.py b/autotest/pyscripts/test_gdal_polygonize.py
index 4513cca9cebe..354d7d53ebc4 100755
--- a/autotest/pyscripts/test_gdal_polygonize.py
+++ b/autotest/pyscripts/test_gdal_polygonize.py
@@ -30,7 +30,6 @@
 ###############################################################################
 
 import os
-import sys
 
 
 import gdaltest
diff --git a/autotest/pyscripts/test_gdal_proximity.py b/autotest/pyscripts/test_gdal_proximity.py
index 603adab32330..9de51468ee25 100755
--- a/autotest/pyscripts/test_gdal_proximity.py
+++ b/autotest/pyscripts/test_gdal_proximity.py
@@ -30,7 +30,6 @@
 ###############################################################################
 
 import os
-import sys
 
 
 import gdaltest
diff --git a/autotest/pyscripts/test_gdal_retile.py b/autotest/pyscripts/test_gdal_retile.py
index e7a461a055ea..567a4ced8523 100755
--- a/autotest/pyscripts/test_gdal_retile.py
+++ b/autotest/pyscripts/test_gdal_retile.py
@@ -29,7 +29,6 @@
 ###############################################################################
 
 import shutil
-import sys
 import os
 
 
diff --git a/autotest/pyscripts/test_gdal_sieve.py b/autotest/pyscripts/test_gdal_sieve.py
index e1415c3b1fa9..02bcbd12934c 100755
--- a/autotest/pyscripts/test_gdal_sieve.py
+++ b/autotest/pyscripts/test_gdal_sieve.py
@@ -29,7 +29,6 @@
 # DEALINGS IN THE SOFTWARE.
 ###############################################################################
 
-import sys
 
 
 import gdaltest
diff --git a/autotest/pyscripts/test_gdalinfo_py.py b/autotest/pyscripts/test_gdalinfo_py.py
index 0e27a40fe6fa..3500b8a69968 100755
--- a/autotest/pyscripts/test_gdalinfo_py.py
+++ b/autotest/pyscripts/test_gdalinfo_py.py
@@ -28,7 +28,6 @@
 # DEALINGS IN THE SOFTWARE.
 ###############################################################################
 
-import sys
 import os
 
 
diff --git a/autotest/pyscripts/test_gdalmove.py b/autotest/pyscripts/test_gdalmove.py
index fd4f5e55b8ba..87bcd5156fd4 100755
--- a/autotest/pyscripts/test_gdalmove.py
+++ b/autotest/pyscripts/test_gdalmove.py
@@ -30,7 +30,6 @@
 
 import os
 import shutil
-import sys
 
 
 from osgeo import gdal
diff --git a/autotest/pyscripts/test_ogrinfo_py.py b/autotest/pyscripts/test_ogrinfo_py.py
index 0a540e89a16f..7c433549eb1f 100755
--- a/autotest/pyscripts/test_ogrinfo_py.py
+++ b/autotest/pyscripts/test_ogrinfo_py.py
@@ -28,7 +28,6 @@
 # DEALINGS IN THE SOFTWARE.
 ###############################################################################
 
-import sys
 import os
 
 
diff --git a/autotest/pyscripts/test_ogrmerge.py b/autotest/pyscripts/test_ogrmerge.py
index dd9fd8be2b1b..8d1a539c76b3 100755
--- a/autotest/pyscripts/test_ogrmerge.py
+++ b/autotest/pyscripts/test_ogrmerge.py
@@ -28,7 +28,6 @@
 # DEALINGS IN THE SOFTWARE.
 ###############################################################################
 
-import sys
 
 
 from osgeo import gdal
diff --git a/autotest/pyscripts/test_rgb2pct.py b/autotest/pyscripts/test_rgb2pct.py
index fb8927e43159..780825e6ac18 100755
--- a/autotest/pyscripts/test_rgb2pct.py
+++ b/autotest/pyscripts/test_rgb2pct.py
@@ -29,7 +29,6 @@
 ###############################################################################
 
 
-import sys
 import os
 import struct
 
diff --git a/autotest/utilities/test_gdal_contour.py b/autotest/utilities/test_gdal_contour.py
index ccd73a33e2ba..de00f78bf167 100755
--- a/autotest/utilities/test_gdal_contour.py
+++ b/autotest/utilities/test_gdal_contour.py
@@ -29,7 +29,6 @@
 # DEALINGS IN THE SOFTWARE.
 ###############################################################################
 
-import sys
 import os
 import array
 
diff --git a/autotest/utilities/test_gdal_grid_lib.py b/autotest/utilities/test_gdal_grid_lib.py
index 1b9ed24cf21e..051c42a11f99 100755
--- a/autotest/utilities/test_gdal_grid_lib.py
+++ b/autotest/utilities/test_gdal_grid_lib.py
@@ -29,7 +29,6 @@
 # DEALINGS IN THE SOFTWARE.
 ###############################################################################
 
-import sys
 import struct
 
 
diff --git a/autotest/utilities/test_gdal_rasterize_lib.py b/autotest/utilities/test_gdal_rasterize_lib.py
index fad7f4ec5cc1..d3afd247295d 100755
--- a/autotest/utilities/test_gdal_rasterize_lib.py
+++ b/autotest/utilities/test_gdal_rasterize_lib.py
@@ -30,7 +30,6 @@
 # DEALINGS IN THE SOFTWARE.
 ###############################################################################
 
-import sys
 
 
 from osgeo import gdal, ogr, osr
diff --git a/autotest/utilities/test_gdal_translate.py b/autotest/utilities/test_gdal_translate.py
index d48b32b950b2..911d6e36ba00 100755
--- a/autotest/utilities/test_gdal_translate.py
+++ b/autotest/utilities/test_gdal_translate.py
@@ -29,7 +29,6 @@
 # DEALINGS IN THE SOFTWARE.
 ###############################################################################
 
-import sys
 import os
 
 
diff --git a/autotest/utilities/test_gdal_translate_lib.py b/autotest/utilities/test_gdal_translate_lib.py
index 9c9b9af8e988..48d471b57fdb 100755
--- a/autotest/utilities/test_gdal_translate_lib.py
+++ b/autotest/utilities/test_gdal_translate_lib.py
@@ -29,7 +29,6 @@
 # DEALINGS IN THE SOFTWARE.
 ###############################################################################
 
-import sys
 import os
 
 
diff --git a/autotest/utilities/test_gdalbuildvrt.py b/autotest/utilities/test_gdalbuildvrt.py
index 6ecf9ee9132f..9e49d78124a2 100755
--- a/autotest/utilities/test_gdalbuildvrt.py
+++ b/autotest/utilities/test_gdalbuildvrt.py
@@ -29,7 +29,6 @@
 # DEALINGS IN THE SOFTWARE.
 ###############################################################################
 
-import sys
 import os
 
 
diff --git a/autotest/utilities/test_gdalbuildvrt_lib.py b/autotest/utilities/test_gdalbuildvrt_lib.py
index 73599a29ac8b..b0368a753e86 100755
--- a/autotest/utilities/test_gdalbuildvrt_lib.py
+++ b/autotest/utilities/test_gdalbuildvrt_lib.py
@@ -29,7 +29,6 @@
 # DEALINGS IN THE SOFTWARE.
 ###############################################################################
 
-import sys
 
 
 from osgeo import gdal
diff --git a/autotest/utilities/test_gdaldem.py b/autotest/utilities/test_gdaldem.py
index ce2f6d24f020..2076c778e319 100755
--- a/autotest/utilities/test_gdaldem.py
+++ b/autotest/utilities/test_gdaldem.py
@@ -29,7 +29,6 @@
 # DEALINGS IN THE SOFTWARE.
 ###############################################################################
 
-import sys
 import os
 
 
diff --git a/autotest/utilities/test_gdaldem_lib.py b/autotest/utilities/test_gdaldem_lib.py
index 76ae96221bae..6c4c2dacae11 100755
--- a/autotest/utilities/test_gdaldem_lib.py
+++ b/autotest/utilities/test_gdaldem_lib.py
@@ -30,7 +30,6 @@
 ###############################################################################
 
 import struct
-import sys
 
 
 from osgeo import gdal
diff --git a/autotest/utilities/test_gdalinfo.py b/autotest/utilities/test_gdalinfo.py
index 976b924fbe11..61982e4551ce 100755
--- a/autotest/utilities/test_gdalinfo.py
+++ b/autotest/utilities/test_gdalinfo.py
@@ -29,7 +29,6 @@
 # DEALINGS IN THE SOFTWARE.
 ###############################################################################
 
-import sys
 import os
 import json
 
diff --git a/autotest/utilities/test_gdalinfo_lib.py b/autotest/utilities/test_gdalinfo_lib.py
index 4a1d273ca762..1d0c574f3fed 100755
--- a/autotest/utilities/test_gdalinfo_lib.py
+++ b/autotest/utilities/test_gdalinfo_lib.py
@@ -29,7 +29,6 @@
 # DEALINGS IN THE SOFTWARE.
 ###############################################################################
 
-import sys
 
 
 from osgeo import gdal
diff --git a/autotest/utilities/test_gdaltindex.py b/autotest/utilities/test_gdaltindex.py
index 4e6c916ee0ea..82c734c56467 100755
--- a/autotest/utilities/test_gdaltindex.py
+++ b/autotest/utilities/test_gdaltindex.py
@@ -29,7 +29,6 @@
 # DEALINGS IN THE SOFTWARE.
 ###############################################################################
 
-import sys
 import os
 
 
diff --git a/autotest/utilities/test_gdaltransform.py b/autotest/utilities/test_gdaltransform.py
index 6aaaa11ae4aa..559c0d946530 100755
--- a/autotest/utilities/test_gdaltransform.py
+++ b/autotest/utilities/test_gdaltransform.py
@@ -28,7 +28,6 @@
 # DEALINGS IN THE SOFTWARE.
 ###############################################################################
 
-import sys
 
 
 import gdaltest
diff --git a/autotest/utilities/test_gdalwarp.py b/autotest/utilities/test_gdalwarp.py
index a2907ded0f1c..0887b9280993 100755
--- a/autotest/utilities/test_gdalwarp.py
+++ b/autotest/utilities/test_gdalwarp.py
@@ -29,7 +29,6 @@
 # DEALINGS IN THE SOFTWARE.
 ###############################################################################
 
-import sys
 import os
 import stat
 
diff --git a/autotest/utilities/test_gdalwarp_lib.py b/autotest/utilities/test_gdalwarp_lib.py
index 9f07181cf728..e537b0147b0e 100755
--- a/autotest/utilities/test_gdalwarp_lib.py
+++ b/autotest/utilities/test_gdalwarp_lib.py
@@ -31,7 +31,6 @@
 ###############################################################################
 
 import struct
-import sys
 import os
 
 
diff --git a/autotest/utilities/test_gnmutils.py b/autotest/utilities/test_gnmutils.py
index 47a0942b5be1..f5c660961df7 100755
--- a/autotest/utilities/test_gnmutils.py
+++ b/autotest/utilities/test_gnmutils.py
@@ -31,7 +31,6 @@
 # DEALINGS IN THE SOFTWARE.
 ###############################################################################
 
-import sys
 import os
 
 
diff --git a/autotest/utilities/test_nearblack.py b/autotest/utilities/test_nearblack.py
index e58d6c25c27e..ca78ce0d6f70 100755
--- a/autotest/utilities/test_nearblack.py
+++ b/autotest/utilities/test_nearblack.py
@@ -29,7 +29,6 @@
 # DEALINGS IN THE SOFTWARE.
 ###############################################################################
 
-import sys
 import os
 import shutil
 
diff --git a/autotest/utilities/test_nearblack_lib.py b/autotest/utilities/test_nearblack_lib.py
index 34e7a7108526..1f565460c622 100755
--- a/autotest/utilities/test_nearblack_lib.py
+++ b/autotest/utilities/test_nearblack_lib.py
@@ -29,7 +29,6 @@
 # DEALINGS IN THE SOFTWARE.
 ###############################################################################
 
-import sys
 
 
 from osgeo import gdal
diff --git a/autotest/utilities/test_ogrinfo.py b/autotest/utilities/test_ogrinfo.py
index ef496fc9f014..84bc9a901f23 100755
--- a/autotest/utilities/test_ogrinfo.py
+++ b/autotest/utilities/test_ogrinfo.py
@@ -29,7 +29,6 @@
 # DEALINGS IN THE SOFTWARE.
 ###############################################################################
 
-import sys
 import os
 
 
diff --git a/autotest/utilities/test_ogrtindex.py b/autotest/utilities/test_ogrtindex.py
index 308f682b7aca..d8cb0824fe32 100755
--- a/autotest/utilities/test_ogrtindex.py
+++ b/autotest/utilities/test_ogrtindex.py
@@ -29,7 +29,6 @@
 # DEALINGS IN THE SOFTWARE.
 ###############################################################################
 
-import sys
 import os
 
 

From 3e128bede9d23a5d2c9640f8f35d3e1586a8c0d2 Mon Sep 17 00:00:00 2001
From: Craig de Stigter <craig.destigter@koordinates.com>
Date: Mon, 22 Oct 2018 10:12:48 +1300
Subject: [PATCH 145/488] Assorted manual test failure fixes

---
 autotest/alg/__init__.py                |   0
 autotest/alg/warp.py                    |   6 +-
 autotest/conftest.py                    |  17 +
 autotest/gcore/__init__.py              |   0
 autotest/gcore/basic_test.py            |  62 ++--
 autotest/gcore/gdal_api_proxy.py        | 135 ++++++--
 autotest/gcore/testnonboundtoswig.py    |  76 ++--
 autotest/gcore/tiff_ovr.py              |   6 +-
 autotest/gcore/tiff_srs.py              |  10 +-
 autotest/gcore/vsicrypt.py              |  20 +-
 autotest/gdrivers/__init__.py           |   0
 autotest/gdrivers/bag.py                |   2 +-
 autotest/gdrivers/eedai.py              |  45 ++-
 autotest/gdrivers/grib.py               | 124 ++-----
 autotest/gdrivers/mrf.py                |   2 +-
 autotest/gdrivers/netcdf.py             |  98 ++----
 autotest/gdrivers/netcdf_cf.py          |   6 +-
 autotest/gdrivers/nitf.py               |  37 +-
 autotest/gdrivers/nwt_grd.py            |  11 +-
 autotest/gdrivers/pdf.py                | 443 ++++++------------------
 autotest/gdrivers/wcs.py                |  15 +-
 autotest/gnm/__init__.py                |   0
 autotest/ogr/__init__.py                |   0
 autotest/ogr/ogr_as_sqlite_extension.py |   5 +
 autotest/ogr/ogr_gpkg.py                | 123 ++++---
 autotest/ogr/ogr_mitab.py               |   6 +-
 autotest/ogr/ogr_mysql.py               |  51 ++-
 autotest/ogr/ogr_pg.py                  | 216 ++++++------
 autotest/ogr/ogr_rfc35_mitab.py         | 194 ++++-------
 autotest/ogr/ogr_rfc35_shape.py         |  95 +++--
 autotest/ogr/ogr_rfc35_sqlite.py        |  43 ++-
 autotest/ogr/ogr_rfc41.py               |  11 +-
 autotest/ogr/ogr_shape.py               |  50 +--
 autotest/ogr/ogr_sql_sqlite.py          | 199 +++--------
 autotest/ogr/ogr_sqlite.py              | 423 ++++++++--------------
 autotest/ogr/ogr_virtualogr.py          |  29 +-
 autotest/osr/__init__.py                |   0
 autotest/osr/osr_compd.py               |   2 +-
 autotest/osr/osr_ct_proj.py             |   2 +-
 autotest/pymod/gdaltest.py              |  31 +-
 autotest/pyscripts/__init__.py          |   0
 autotest/pyscripts/test_gdal2tiles.py   |   1 -
 autotest/pyscripts/test_gdal_ls_py.py   |  49 ++-
 autotest/pyscripts/test_ogr2ogr_py.py   |   6 +-
 autotest/pyscripts/test_ogrmerge.py     | 102 +++---
 autotest/utilities/__init__.py          |   0
 autotest/utilities/test_gdaladdo.py     |   5 +-
 autotest/utilities/test_gdalbuildvrt.py |  18 +-
 autotest/utilities/test_ogr2ogr.py      |   6 +-
 49 files changed, 1051 insertions(+), 1731 deletions(-)
 create mode 100644 autotest/alg/__init__.py
 create mode 100644 autotest/gcore/__init__.py
 create mode 100644 autotest/gdrivers/__init__.py
 create mode 100644 autotest/gnm/__init__.py
 create mode 100644 autotest/ogr/__init__.py
 create mode 100644 autotest/osr/__init__.py
 create mode 100644 autotest/pyscripts/__init__.py
 create mode 100644 autotest/utilities/__init__.py

diff --git a/autotest/alg/__init__.py b/autotest/alg/__init__.py
new file mode 100644
index 000000000000..e69de29bb2d1
diff --git a/autotest/alg/warp.py b/autotest/alg/warp.py
index 6d308d299909..171c455b804a 100755
--- a/autotest/alg/warp.py
+++ b/autotest/alg/warp.py
@@ -634,7 +634,7 @@ def warp_19_internal(size, datatype, resampling_string):
 
     gdaltest.tiff_drv.Delete('tmp/testwarp.tif')
 
-    assert checksum == checksum_ref, 'Result different from source'
+    assert checksum == checksum_ref
 
     gdaltest.tiff_drv.Delete('tmp/test.tif')
 
@@ -667,10 +667,8 @@ def test_warp_19():
         print('Testing size = %d ...' % size)
         for method in methods:
             for datatype in datatypes:
-                assert warp_19_internal(size, datatype, method) == 'success', \
-                    ('fail with size = %d, data type = %d and method %s' % (size, datatype, method))
+                warp_19_internal(size, datatype, method)
 
-    
 
 # Test fix for #2724 (initialization of destination area to nodata in warped VRT)
 def test_warp_20():
diff --git a/autotest/conftest.py b/autotest/conftest.py
index 15a7b9af9333..9ee67d794b6a 100644
--- a/autotest/conftest.py
+++ b/autotest/conftest.py
@@ -11,6 +11,10 @@
 # Put the pymod dir on the path, so modules can `import gdaltest`
 sys.path.insert(0, os.path.join(os.path.dirname(__file__), "pymod"))
 
+# put the autotest dir on the path too. This lets us import all test modules
+sys.path.insert(1, os.path.dirname(__file__))
+
+
 # These files may be non-importable, and don't contain tests anyway.
 # So we skip searching them during test collection.
 collect_ignore = ["gdrivers/netcdf_cfchecks.py"]
@@ -45,6 +49,19 @@ def chdir_to_test_file(request):
     os.chdir(old)
 
 
+@pytest.fixture(scope='session', autouse=True)
+def cleanup_on_exit():
+    yield
+
+    from gcore import testnonboundtoswig
+
+    # Do it twice to ensure that cleanup routines properly do their jobs
+    for _ in range(2):
+        testnonboundtoswig.OSRCleanup()
+        testnonboundtoswig.GDALDestroyDriverManager()
+        testnonboundtoswig.OGRCleanupAll()
+
+
 def pytest_collection_modifyitems(config, items):
     # skip tests with @pytest.mark.require_driver(name) when the driver isn't available
     skip = pytest.mark.skip("Driver not present")
diff --git a/autotest/gcore/__init__.py b/autotest/gcore/__init__.py
new file mode 100644
index 000000000000..e69de29bb2d1
diff --git a/autotest/gcore/basic_test.py b/autotest/gcore/basic_test.py
index 53cfabac6d92..3edaac5238e7 100755
--- a/autotest/gcore/basic_test.py
+++ b/autotest/gcore/basic_test.py
@@ -68,7 +68,7 @@ def test_basic_test_strace_non_existing_file():
         " \" ")
     try:
         (_, err) = gdaltest.runexternal_out_and_err(cmd)
-    except:
+    except Exception:
         # strace not available
         pytest.skip()
 
@@ -79,6 +79,7 @@ def test_basic_test_strace_non_existing_file():
     # Only 3 calls on the file are legit: open(), stat() and readlink()
     assert len(interesting_lines) <= 3, 'too many system calls accessing file'
 
+
 def test_basic_test_2():
     gdal.PushErrorHandler('CPLQuietErrorHandler')
     ds = gdal.Open('non_existing_ds', gdal.GA_Update)
@@ -130,23 +131,24 @@ def test_basic_test_6():
 
 
 def basic_test_7_internal():
-    try:
+
+    with pytest.raises(Exception):
         gdal.Open('non_existing_ds', gdal.GA_ReadOnly)
-        pytest.fail('opening should have thrown an exception')
-    except:
-        # Special case: we should still be able to get the error message
-        # until we call a new GDAL function
-        assert matches_non_existing_error_msg(gdal.GetLastErrorMsg()), \
-            ('did not get expected error message, got %s' % gdal.GetLastErrorMsg())
 
-        assert gdal.GetLastErrorType() != 0, 'did not get expected error type'
+    # Special case: we should still be able to get the error message
+    # until we call a new GDAL function
+    assert matches_non_existing_error_msg(gdal.GetLastErrorMsg()), ('did not get expected error message, got %s' % gdal.GetLastErrorMsg())
 
-        # Should issue an implicit CPLErrorReset()
-        gdal.GetCacheMax()
+    # Special case: we should still be able to get the error message
+    # until we call a new GDAL function
+    assert matches_non_existing_error_msg(gdal.GetLastErrorMsg()), 'did not get expected error message, got %s' % gdal.GetLastErrorMsg()
 
-        assert gdal.GetLastErrorType() == 0, 'got unexpected error type'
+    assert gdal.GetLastErrorType() != 0, 'did not get expected error type'
 
-        return
+    # Should issue an implicit CPLErrorReset()
+    gdal.GetCacheMax()
+
+    assert gdal.GetLastErrorType() == 0, 'got unexpected error type'
 
 
 def test_basic_test_7():
@@ -170,15 +172,22 @@ def test_basic_test_8():
     if sys.platform == 'win32':
         python_exe = python_exe.replace('\\', '/')
 
-    ret = gdaltest.runexternal(python_exe + ' basic_test.py LICENSE 0')
-    assert ret.find('GDAL/OGR is released under the MIT/X license') == 0 or ret.find('GDAL/OGR Licensing') >= 0
+    license_text = gdal.VersionInfo('LICENSE')
+    assert (
+        license_text.startswith('GDAL/OGR is released under the MIT/X license')
+        or 'GDAL/OGR Licensing' in license_text
+    )
+
+    with gdaltest.config_option('GDAL_DATA', 'tmp'):
+        with open('tmp/LICENSE.TXT', 'wt') as f:
+            f.write('fake_license')
+            license_text = gdal.VersionInfo('LICENSE')
+        os.unlink('tmp/LICENSE.TXT')
+        assert (
+            license_text.startswith('fake_license')
+            or 'GDAL/OGR Licensing' in license_text
+        )
 
-    f = open('tmp/LICENSE.TXT', 'wt')
-    f.write('fake_license')
-    f.close()
-    ret = gdaltest.runexternal(python_exe + ' basic_test.py LICENSE 1')
-    os.unlink('tmp/LICENSE.TXT')
-    assert ret.find('fake_license') == 0 or ret.find('GDAL/OGR Licensing') >= 0
 
 ###############################################################################
 # Test gdal.PushErrorHandler() with a Python error handler
@@ -381,7 +390,7 @@ def test_basic_test_13():
     for i in range(200):
         assert ds.GetMetadataItem("FILENAME_%d" % i) == '%d' % i
 
-    
+
 ###############################################################################
 # Test SetMetadata()
 
@@ -458,22 +467,23 @@ def basic_test_15_cbk_bad_ret(a, b, c):
 
 
 def test_basic_test_15():
+    mem_driver = gdal.GetDriverByName('MEM')
 
     with pytest.raises(Exception):
         with gdaltest.error_handler():
             gdal.GetDriverByName('MEM').CreateCopy('', gdal.GetDriverByName('MEM').Create('', 1, 1), callback='foo')
-            
+
 
     with gdaltest.error_handler():
-        ds = gdal.GetDriverByName('MEM').CreateCopy('', gdal.GetDriverByName('MEM').Create('', 1, 1), callback=basic_test_15_cbk_no_argument)
+        ds = mem_driver.CreateCopy('', mem_driver.Create('', 1, 1), callback=basic_test_15_cbk_no_argument)
     assert ds is None
 
     with gdaltest.error_handler():
-        ds = gdal.GetDriverByName('MEM').CreateCopy('', gdal.GetDriverByName('MEM').Create('', 1, 1), callback=basic_test_15_cbk_no_ret)
+        ds = mem_driver.CreateCopy('', mem_driver.Create('', 1, 1), callback=basic_test_15_cbk_no_ret)
     assert ds is not None
 
     with gdaltest.error_handler():
-        ds = gdal.GetDriverByName('MEM').CreateCopy('', gdal.GetDriverByName('MEM').Create('', 1, 1), callback=basic_test_15_cbk_bad_ret)
+        ds = mem_driver.CreateCopy('', mem_driver.Create('', 1, 1), callback=basic_test_15_cbk_bad_ret)
     assert ds is None
 
 ###############################################################################
diff --git a/autotest/gcore/gdal_api_proxy.py b/autotest/gcore/gdal_api_proxy.py
index ab152a987384..a0708896dffe 100755
--- a/autotest/gcore/gdal_api_proxy.py
+++ b/autotest/gcore/gdal_api_proxy.py
@@ -30,47 +30,49 @@
 ###############################################################################
 
 import sys
+import subprocess
+import time
 from osgeo import gdal
 
 
-import gdaltest
 import pytest
 
 ###############################################################################
 # Test forked gdalserver
 
 
-def test_gdal_api_proxy_1():
-
-    import test_py_scripts
+@pytest.fixture
+def gdalserver_path():
     import test_cli_utilities
-    gdaltest.gdalserver_path = test_cli_utilities.get_cli_utility_path('gdalserver')
-    if gdaltest.gdalserver_path is None:
-        gdaltest.gdalserver_path = 'gdalserver'
+    gdalserver_path = test_cli_utilities.get_cli_utility_path('gdalserver')
+    if gdalserver_path is None:
+        gdalserver_path = 'gdalserver'
+    return gdalserver_path
 
-    ret = test_py_scripts.run_py_script_as_external_script('.', 'gdal_api_proxy', ' \"%s\" -1' % gdaltest.gdalserver_path, display_live_on_parent_stdout=True)
 
-    assert ret.find('Failed:    0') != -1
+def test_gdal_api_proxy_1(gdalserver_path):
+    subprocess.check_call([
+        sys.executable, 'gdal_api_proxy.py', gdalserver_path, '-2',
+    ])
 
 ###############################################################################
 # Test connection to TCP server
 
 
-def test_gdal_api_proxy_2():
+def test_gdal_api_proxy_2(gdalserver_path):
 
     if sys.version_info < (2, 6, 0):
         pytest.skip()
 
-    import test_py_scripts
-    ret = test_py_scripts.run_py_script_as_external_script('.', 'gdal_api_proxy', ' \"%s\" -2' % gdaltest.gdalserver_path, display_live_on_parent_stdout=True)
-
-    assert ret.find('Failed:    0') != -1
+    subprocess.check_call([
+        sys.executable, 'gdal_api_proxy.py', gdalserver_path, '-2',
+    ])
 
 ###############################################################################
 # Test connection to Unix socket server
 
 
-def test_gdal_api_proxy_3():
+def test_gdal_api_proxy_3(gdalserver_path):
 
     if sys.version_info < (2, 6, 0):
         pytest.skip()
@@ -81,16 +83,15 @@ def test_gdal_api_proxy_3():
     if sys.platform == 'darwin':
         pytest.skip("Fails on MacOSX ('ERROR 1: posix_spawnp() failed'. Not sure why.")
 
-    import test_py_scripts
-    ret = test_py_scripts.run_py_script_as_external_script('.', 'gdal_api_proxy', ' \"%s\" -3' % gdaltest.gdalserver_path, display_live_on_parent_stdout=True)
-
-    assert ret.find('Failed:    0') != -1
+    subprocess.check_call([
+        sys.executable, 'gdal_api_proxy.py', gdalserver_path, '-3',
+    ])
 
 ###############################################################################
 # Test -nofork mode
 
 
-def test_gdal_api_proxy_4():
+def test_gdal_api_proxy_4(gdalserver_path):
 
     if sys.version_info < (2, 6, 0):
         pytest.skip()
@@ -101,16 +102,15 @@ def test_gdal_api_proxy_4():
     if sys.platform == 'darwin':
         pytest.skip("Fails on MacOSX ('ERROR 1: posix_spawnp() failed'. Not sure why.")
 
-    import test_py_scripts
-    ret = test_py_scripts.run_py_script_as_external_script('.', 'gdal_api_proxy', ' \"%s\" -4' % gdaltest.gdalserver_path, display_live_on_parent_stdout=True)
-
-    assert ret.find('Failed:    0') != -1
+    subprocess.check_call([
+        sys.executable, 'gdal_api_proxy.py', gdalserver_path, '-4',
+    ])
 
 ###############################################################################
 #
 
 
-def test_gdal_api_proxy_sub():
+def _gdal_api_proxy_sub():
 
     src_ds = gdal.Open('data/byte.tif')
     src_cs = src_ds.GetRasterBand(1).Checksum()
@@ -392,14 +392,93 @@ def test_gdal_api_proxy_sub():
 #
 
 
-def test_gdal_api_proxy_sub_clean():
+def _gdal_api_proxy_sub_clean():
     if gdaltest.api_proxy_server_p is not None:
         try:
             gdaltest.api_proxy_server_p.terminate()
-        except:
+        except Exception:
             pass
         gdaltest.api_proxy_server_p.wait()
     gdal.Unlink('tmp/gdalapiproxysocket')
 
 
-
+if __name__ == '__main__':
+    sys.path.insert(0, '../pymod')
+    import gdaltest
+
+    if len(sys.argv) >= 3 and sys.argv[2] == '-1':
+
+        gdal.SetConfigOption('GDAL_API_PROXY', 'YES')
+        if sys.platform == 'win32':
+            gdalserver_path = sys.argv[1]  # noqa
+            gdal.SetConfigOption('GDAL_API_PROXY_SERVER', gdalserver_path)
+
+        gdaltest.api_proxy_server_p = None
+        gdaltest_list = [_gdal_api_proxy_sub]
+
+    elif len(sys.argv) >= 3 and sys.argv[2] == '-2':
+
+        gdalserver_path = sys.argv[1]
+
+        p = None
+        for port in [8080, 8081, 8082]:
+            p = subprocess.Popen([gdalserver_path, '-tcpserver', '%d' % port])
+            time.sleep(1)
+            if p.poll() is None:
+                break
+            try:
+                p.terminate()
+            except (AttributeError, OSError):
+                pass
+            p.wait()
+            p = None
+
+        if p is not None:
+            gdal.SetConfigOption('GDAL_API_PROXY', 'YES')
+            gdal.SetConfigOption('GDAL_API_PROXY_SERVER', 'localhost:%d' % port)
+            print('port = %d' % port)
+            gdaltest.api_proxy_server_p = p
+            gdaltest_list = [_gdal_api_proxy_sub, _gdal_api_proxy_sub_clean]
+        else:
+            gdaltest_list = []
+
+    elif len(sys.argv) >= 3 and sys.argv[2] == '-3':
+
+        gdalserver_path = sys.argv[1]
+
+        p = subprocess.Popen([gdalserver_path, '-unixserver', 'tmp/gdalapiproxysocket'])
+        time.sleep(1)
+        if p.poll() is None:
+            gdal.SetConfigOption('GDAL_API_PROXY', 'YES')
+            gdal.SetConfigOption('GDAL_API_PROXY_SERVER', 'tmp/gdalapiproxysocket')
+            gdaltest.api_proxy_server_p = p
+            gdaltest_list = [_gdal_api_proxy_sub, _gdal_api_proxy_sub_clean]
+        else:
+            try:
+                p.terminate()
+            except (AttributeError, OSError):
+                pass
+            p.wait()
+            gdaltest_list = []
+
+    elif len(sys.argv) >= 3 and sys.argv[2] == '-4':
+
+        gdalserver_path = sys.argv[1]
+
+        p = subprocess.Popen([gdalserver_path, '-nofork', '-unixserver', 'tmp/gdalapiproxysocket'])
+        time.sleep(1)
+        if p.poll() is None:
+            gdal.SetConfigOption('GDAL_API_PROXY', 'YES')
+            gdal.SetConfigOption('GDAL_API_PROXY_SERVER', 'tmp/gdalapiproxysocket')
+            gdaltest.api_proxy_server_p = p
+            gdaltest_list = [_gdal_api_proxy_sub, _gdal_api_proxy_sub_clean]
+        else:
+            try:
+                p.terminate()
+            except (AttributeError, OSError):
+                pass
+            p.wait()
+            gdaltest_list = []
+
+    for func in gdaltest_list:
+        func()
diff --git a/autotest/gcore/testnonboundtoswig.py b/autotest/gcore/testnonboundtoswig.py
index 19bd4c27ff12..2ee689177b73 100755
--- a/autotest/gcore/testnonboundtoswig.py
+++ b/autotest/gcore/testnonboundtoswig.py
@@ -56,14 +56,14 @@ def find_libgdal():
 # Init
 
 
-def test_testnonboundtoswig_init():
-
+@pytest.fixture(scope='module', autouse=True)
+def setup():
     global gdal_handle_init, gdal_handle, gdal_handle_stdcall
 
     if gdal_handle_init:
         if gdal_handle is None:
             pytest.skip()
-        return
+        return gdal_handle
 
     gdal_handle_init = True
 
@@ -100,60 +100,43 @@ def test_testnonboundtoswig_init():
             gdal_handle_stdcall = None
             pytest.skip('dynamic version(%s) does not match static version (%s)' % (dynamic_version, static_version))
 
-        return
-    except:
-        pytest.skip('cannot find gdal shared object')
+        return gdal_handle
+    except Exception:
+        print('cannot find gdal shared object')
+        pytest.skip()
 
 ###############################################################################
 # Call GDALDestroyDriverManager()
 
 
 def GDALDestroyDriverManager():
+    if gdal_handle_stdcall:
+        gdal_handle_stdcall.GDALDestroyDriverManager.argtypes = []
+        gdal_handle_stdcall.GDALDestroyDriverManager.restype = None
 
-    if gdal_handle is None:
-        test_testnonboundtoswig_init()
-
-    if gdal_handle is None:
-        pytest.skip()
-
-    gdal_handle_stdcall.GDALDestroyDriverManager.argtypes = []
-    gdal_handle_stdcall.GDALDestroyDriverManager.restype = None
-
-    gdal_handle_stdcall.GDALDestroyDriverManager()
+        gdal_handle_stdcall.GDALDestroyDriverManager()
 
 ###############################################################################
 # Call OGRCleanupAll()
 
 
 def OGRCleanupAll():
+    if gdal_handle_stdcall:
+        gdal_handle_stdcall.OGRCleanupAll.argtypes = []
+        gdal_handle_stdcall.OGRCleanupAll.restype = None
 
-    if gdal_handle is None:
-        test_testnonboundtoswig_init()
-
-    if gdal_handle is None:
-        pytest.skip()
-
-    gdal_handle_stdcall.OGRCleanupAll.argtypes = []
-    gdal_handle_stdcall.OGRCleanupAll.restype = None
-
-    gdal_handle_stdcall.OGRCleanupAll()
+        gdal_handle_stdcall.OGRCleanupAll()
 
 ###############################################################################
 # Call OSRCleanup()
 
 
 def OSRCleanup():
+    if gdal_handle:
+        gdal_handle.OSRCleanup.argtypes = []
+        gdal_handle.OSRCleanup.restype = None
 
-    if gdal_handle is None:
-        test_testnonboundtoswig_init()
-
-    if gdal_handle is None:
-        pytest.skip()
-
-    gdal_handle.OSRCleanup.argtypes = []
-    gdal_handle.OSRCleanup.restype = None
-
-    gdal_handle.OSRCleanup()
+        gdal_handle.OSRCleanup()
 
 ###############################################################################
 # Test GDALSimpleImageWarp
@@ -161,9 +144,6 @@ def OSRCleanup():
 
 def test_testnonboundtoswig_GDALSimpleImageWarp():
 
-    if gdal_handle is None:
-        pytest.skip()
-
     src_ds = gdal.Open('data/byte.tif')
     gt = src_ds.GetGeoTransform()
     wkt = src_ds.GetProjectionRef()
@@ -248,29 +228,29 @@ def GDALTypeToCTypes(gdaltype):
 def my_pyDerivedPixelFunc(papoSources, nSources, pData, nBufXSize, nBufYSize, eSrcType, eBufType, nPixelSpace, nLineSpace):
     if nSources != 1:
         print(nSources)
-        gdaltest.post_reason('did not get expected nSources')
+        print('did not get expected nSources')
         return 1
 
     srcctype = GDALTypeToCTypes(eSrcType)
     if srcctype is None:
         print(eSrcType)
-        gdaltest.post_reason('did not get expected eSrcType')
+        print('did not get expected eSrcType')
         return 1
 
     dstctype = GDALTypeToCTypes(eBufType)
     if dstctype is None:
         print(eBufType)
-        gdaltest.post_reason('did not get expected eBufType')
+        print('did not get expected eBufType')
         return 1
 
     if nPixelSpace != gdal.GetDataTypeSize(eBufType) / 8:
         print(nPixelSpace)
-        gdaltest.post_reason('did not get expected nPixelSpace')
+        print('did not get expected nPixelSpace')
         return 1
 
     if (nLineSpace % nPixelSpace) != 0:
         print(nLineSpace)
-        gdaltest.post_reason('did not get expected nLineSpace')
+        print('did not get expected nLineSpace')
         return 1
 
     nLineStride = (int)(nLineSpace / nPixelSpace)
@@ -286,9 +266,6 @@ def my_pyDerivedPixelFunc(papoSources, nSources, pData, nBufXSize, nBufYSize, eS
 
 def test_testnonboundtoswig_VRTDerivedBands():
 
-    if gdal_handle is None:
-        pytest.skip()
-
     DerivedPixelFuncType = ctypes.CFUNCTYPE(ctypes.c_int,  # ret CPLErr
                                             ctypes.POINTER(ctypes.c_void_p),  # void **papoSources
                                             ctypes.c_int,  # int nSources
@@ -339,7 +316,4 @@ def test_testnonboundtoswig_VRTDerivedBands():
 
     assert ref_cs == got_cs, 'wrong checksum'
 
-    assert ref_data == got_data, 'wrong data'
-
-
-
+    assert ref_data == got_data
diff --git a/autotest/gcore/tiff_ovr.py b/autotest/gcore/tiff_ovr.py
index d25981d22649..1a672e9cbdd3 100755
--- a/autotest/gcore/tiff_ovr.py
+++ b/autotest/gcore/tiff_ovr.py
@@ -135,7 +135,10 @@ def test_tiff_ovr_2(both_endian):
 
 def test_tiff_ovr_3(both_endian):
 
-    os.unlink('tmp/mfloat32.tif.ovr')
+    try:
+        os.unlink('tmp/mfloat32.tif.ovr')
+    except OSError:
+        pass
 
     src_ds = gdal.Open('tmp/mfloat32.tif', gdal.GA_Update)
 
@@ -322,6 +325,7 @@ def test_tiff_ovr_8(both_endian):
 
 
 def test_tiff_ovr_9(both_endian):
+    gdaltest.tiff_drv.Delete('tmp/ovr9.tif')
 
     drv = gdal.GetDriverByName('GTiff')
     md = drv.GetMetadata()
diff --git a/autotest/gcore/tiff_srs.py b/autotest/gcore/tiff_srs.py
index 69f05a0793e4..a9eee51dfa44 100755
--- a/autotest/gcore/tiff_srs.py
+++ b/autotest/gcore/tiff_srs.py
@@ -452,11 +452,11 @@ def test_tiff_srs(use_epsg_code, epsg_code, epsg_proj4_broken):
 @pytest.mark.parametrize(
     'proj4',
     [
-        ['+proj=eqdc +lat_0=%.16g +lon_0=%.16g +lat_1=%.16g +lat_2=%.16g" +x_0=%.16g +y_0=%.16g' % (1, 2, 3, 4, 5, 6)],
-        ['+proj=mill +lat_0=%.16g +lon_0=%.16g +x_0=%.16g +y_0=%.16g +R_A' % (1, 2, 3, 4)],
-        ['+proj=gnom +lat_0=%.16g +lon_0=%.16g +x_0=%.16g +y_0=%.16g' % (1, 2, 3, 4)],
-        ['+proj=robin +lon_0=%.16g +x_0=%.16g +y_0=%.16g' % (1, 2, 3)],
-        ['+proj=sinu +lon_0=%.16g +x_0=%.16g +y_0=%.16g' % (1, 2, 3)],
+        '+proj=eqdc +lat_0=%.16g +lon_0=%.16g +lat_1=%.16g +lat_2=%.16g" +x_0=%.16g +y_0=%.16g' % (1, 2, 3, 4, 5, 6),
+        '+proj=mill +lat_0=%.16g +lon_0=%.16g +x_0=%.16g +y_0=%.16g +R_A' % (1, 2, 3, 4),
+        '+proj=gnom +lat_0=%.16g +lon_0=%.16g +x_0=%.16g +y_0=%.16g' % (1, 2, 3, 4),
+        '+proj=robin +lon_0=%.16g +x_0=%.16g +y_0=%.16g' % (1, 2, 3),
+        '+proj=sinu +lon_0=%.16g +x_0=%.16g +y_0=%.16g' % (1, 2, 3),
     ],
     ids=[
         'eqdc',
diff --git a/autotest/gcore/vsicrypt.py b/autotest/gcore/vsicrypt.py
index f8eafc7a7743..808baca9f435 100755
--- a/autotest/gcore/vsicrypt.py
+++ b/autotest/gcore/vsicrypt.py
@@ -36,6 +36,8 @@
 import gdaltest
 import pytest
 
+from gcore.testnonboundtoswig import setup as testnonboundtoswig_setup  # noqa
+
 ###############################################################################
 # Use common test for /vsicrypt
 
@@ -458,24 +460,18 @@ def test_vsicrypt_5():
 # Test VSISetCryptKey
 
 
-def test_vsicrypt_6():
+def test_vsicrypt_6(testnonboundtoswig_setup):
 
     try:
         import ctypes
     except ImportError:
         pytest.skip()
-    import testnonboundtoswig
-
-    testnonboundtoswig.testnonboundtoswig_init()
-
-    if testnonboundtoswig.gdal_handle is None:
-        pytest.skip()
 
-    testnonboundtoswig.gdal_handle.VSISetCryptKey.argtypes = [ctypes.c_char_p, ctypes.c_int]
-    testnonboundtoswig.gdal_handle.VSISetCryptKey.restype = None
+    testnonboundtoswig_setup.VSISetCryptKey.argtypes = [ctypes.c_char_p, ctypes.c_int]
+    testnonboundtoswig_setup.VSISetCryptKey.restype = None
 
     # Set a valid key
-    testnonboundtoswig.gdal_handle.VSISetCryptKey('DONT_USE_IN_PROD'.encode('ASCII'), 16)
+    testnonboundtoswig_setup.VSISetCryptKey('DONT_USE_IN_PROD'.encode('ASCII'), 16)
 
     if not gdaltest.has_vsicrypt:
         pytest.skip()
@@ -503,7 +499,7 @@ def test_vsicrypt_6():
     assert content == 'hello'
 
     # Set a too short key
-    testnonboundtoswig.gdal_handle.VSISetCryptKey('bbc'.encode('ASCII'), 3)
+    testnonboundtoswig_setup.VSISetCryptKey('bbc'.encode('ASCII'), 3)
     with gdaltest.error_handler():
         fp = gdal.VSIFOpenL('/vsicrypt//vsimem/file.bin', 'rb')
     assert fp is None
@@ -513,7 +509,7 @@ def test_vsicrypt_6():
     assert fp is None
 
     # Erase key
-    testnonboundtoswig.gdal_handle.VSISetCryptKey(None, 0)
+    testnonboundtoswig_setup.VSISetCryptKey(None, 0)
     with gdaltest.error_handler():
         fp = gdal.VSIFOpenL('/vsicrypt//vsimem/file.bin', 'wb+')
     assert fp is None
diff --git a/autotest/gdrivers/__init__.py b/autotest/gdrivers/__init__.py
new file mode 100644
index 000000000000..e69de29bb2d1
diff --git a/autotest/gdrivers/bag.py b/autotest/gdrivers/bag.py
index 75a0c6146207..f6b34d4d6b7c 100755
--- a/autotest/gdrivers/bag.py
+++ b/autotest/gdrivers/bag.py
@@ -41,7 +41,7 @@
 pytestmark = pytest.mark.require_driver('BAG')
 
 
-@pytest.fixture(autouse=True)
+@pytest.fixture(autouse=True, scope='module')
 def check_no_file_leaks():
     num_files = len(gdaltest.get_opened_files())
 
diff --git a/autotest/gdrivers/eedai.py b/autotest/gdrivers/eedai.py
index 67fa4311b04a..15826fd93dc5 100644
--- a/autotest/gdrivers/eedai.py
+++ b/autotest/gdrivers/eedai.py
@@ -703,6 +703,27 @@ def test_eedai_geotiff():
 #
 
 
+def test_eedai_cleanup():
+
+    if gdaltest.eedai_drv is None:
+        pytest.skip()
+
+    gdal.SetConfigOption('CPL_CURL_ENABLE_VSIMEM', None)
+    gdal.SetConfigOption('EEDA_BEARER', gdaltest.EEDA_BEARER)
+    gdal.SetConfigOption('EEDA_URL', gdaltest.EEDA_URL)
+    gdal.SetConfigOption('EEDA_PRIVATE_KEY', gdaltest.EEDA_PRIVATE_KEY)
+    gdal.SetConfigOption('EEDA_CLIENT_EMAIL', gdaltest.EEDA_CLIENT_EMAIL)
+    gdal.SetConfigOption('GO2A_AUD', None)
+    gdal.SetConfigOption('GOA2_NOW', None)
+    gdal.SetConfigOption('GOOGLE_APPLICATION_CREDENTIALS', gdaltest.GOOGLE_APPLICATION_CREDENTIALS)
+
+    gdal.Unlink('/vsimem/ee/projects/earthengine-public/assets/image')
+    gdal.RmdirRecursive('/vsimem/ee/')
+
+###############################################################################
+#
+
+
 def test_eedai_real_service():
 
     if gdaltest.eedai_drv is None:
@@ -729,27 +750,3 @@ def test_eedai_real_service():
     expected = {'files': [], 'cornerCoordinates': {'upperRight': [20015109.354, 10007554.677], 'lowerLeft': [-20015109.354, -10007554.677], 'lowerRight': [20015109.354, -10007554.677], 'upperLeft': [-20015109.354, 10007554.677], 'center': [9.6e-06, 6e-06]}, 'wgs84Extent': {'type': 'Polygon', 'coordinates': [[]]}, 'description': 'EEDAI:MODIS/006/MYD09GA/2017_05_24', 'driverShortName': 'EEDAI', 'driverLongName': 'Earth Engine Data API Image', 'bands': [{'description': 'num_observations_1km', 'band': 1, 'colorInterpretation': 'Undefined', 'overviews': [{'size': [21600, 10800]}, {'size': [10800, 5400]}, {'size': [5400, 2700]}, {'size': [2700, 1350]}, {'size': [1350, 675]}, {'size': [675, 337]}, {'size': [337, 168]}, {'size': [168, 84]}], 'type': 'Byte', 'block': [256, 256], 'metadata': {'IMAGE_STRUCTURE': {'PIXELTYPE': 'SIGNEDBYTE'}}}, {'description': 'state_1km', 'band': 2, 'colorInterpretation': 'Undefined', 'overviews': [{'size': [21600, 10800]}, {'size': [10800, 5400]}, {'size': [5400, 2700]}, {'size': [2700, 1350]}, {'size': [1350, 675]}, {'size': [675, 337]}, {'size': [337, 168]}, {'size': [168, 84]}], 'type': 'UInt16', 'block': [256, 256], 'metadata': {}}, {'description': 'SensorZenith', 'band': 3, 'colorInterpretation': 'Undefined', 'overviews': [{'size': [21600, 10800]}, {'size': [10800, 5400]}, {'size': [5400, 2700]}, {'size': [2700, 1350]}, {'size': [1350, 675]}, {'size': [675, 337]}, {'size': [337, 168]}, {'size': [168, 84]}], 'type': 'Int16', 'block': [256, 256], 'metadata': {}}, {'description': 'SensorAzimuth', 'band': 4, 'colorInterpretation': 'Undefined', 'overviews': [{'size': [21600, 10800]}, {'size': [10800, 5400]}, {'size': [5400, 2700]}, {'size': [2700, 1350]}, {'size': [1350, 675]}, {'size': [675, 337]}, {'size': [337, 168]}, {'size': [168, 84]}], 'type': 'Int16', 'block': [256, 256], 'metadata': {}}, {'description': 'Range', 'band': 5, 'colorInterpretation': 'Undefined', 'overviews': [{'size': [21600, 10800]}, {'size': [10800, 5400]}, {'size': [5400, 2700]}, {'size': [2700, 1350]}, {'size': [1350, 675]}, {'size': [675, 337]}, {'size': [337, 168]}, {'size': [168, 84]}], 'type': 'UInt16', 'block': [256, 256], 'metadata': {}}, {'description': 'SolarZenith', 'band': 6, 'colorInterpretation': 'Undefined', 'overviews': [{'size': [21600, 10800]}, {'size': [10800, 5400]}, {'size': [5400, 2700]}, {'size': [2700, 1350]}, {'size': [1350, 675]}, {'size': [675, 337]}, {'size': [337, 168]}, {'size': [168, 84]}], 'type': 'Int16', 'block': [256, 256], 'metadata': {}}, {'description': 'SolarAzimuth', 'band': 7, 'colorInterpretation': 'Undefined', 'overviews': [{'size': [21600, 10800]}, {'size': [10800, 5400]}, {'size': [5400, 2700]}, {'size': [2700, 1350]}, {'size': [1350, 675]}, {'size': [675, 337]}, {'size': [337, 168]}, {'size': [168, 84]}], 'type': 'Int16', 'block': [256, 256], 'metadata': {}}, {'description': 'gflags', 'band': 8, 'colorInterpretation': 'Undefined', 'overviews': [{'size': [21600, 10800]}, {'size': [10800, 5400]}, {'size': [5400, 2700]}, {'size': [2700, 1350]}, {'size': [1350, 675]}, {'size': [675, 337]}, {'size': [337, 168]}, {'size': [168, 84]}], 'type': 'Byte', 'block': [256, 256], 'metadata': {}}, {'description': 'orbit_pnt', 'band': 9, 'colorInterpretation': 'Undefined', 'overviews': [{'size': [21600, 10800]}, {'size': [10800, 5400]}, {'size': [5400, 2700]}, {'size': [2700, 1350]}, {'size': [1350, 675]}, {'size': [675, 337]}, {'size': [337, 168]}, {'size': [168, 84]}], 'type': 'Byte', 'block': [256, 256], 'metadata': {'IMAGE_STRUCTURE': {'PIXELTYPE': 'SIGNEDBYTE'}}}, {'description': 'granule_pnt', 'band': 10, 'colorInterpretation': 'Undefined', 'overviews': [{'size': [21600, 10800]}, {'size': [10800, 5400]}, {'size': [5400, 2700]}, {'size': [2700, 1350]}, {'size': [1350, 675]}, {'size': [675, 337]}, {'size': [337, 168]}, {'size': [168, 84]}], 'type': 'Byte', 'block': [256, 256], 'metadata': {}}], 'coordinateSystem': {'wkt': 'PROJCS["MODIS Sinusoidal",\n    GEOGCS["WGS 84",\n        DATUM["WGS_1984",\n            SPHEROID["WGS 84",6378137,298.257223563,\n                AUTHORITY["EPSG","7030"]],\n            AUTHORITY["EPSG","6326"]],\n        PRIMEM["Greenwich",0,\n            AUTHORITY["EPSG","8901"]],\n        UNIT["degree",0.01745329251994328,\n            AUTHORITY["EPSG","9122"]],\n        AUTHORITY["EPSG","4326"]],\n    PROJECTION["Sinusoidal"],\n    PARAMETER["false_easting",0.0],\n    PARAMETER["false_northing",0.0],\n    PARAMETER["central_meridian",0.0],\n    PARAMETER["semi_major",6371007.181],\n    PARAMETER["semi_minor",6371007.181],\n    UNIT["m",1.0],\n    AUTHORITY["SR-ORG","6974"]]'}, 'geoTransform': [-20015109.354, 926.625433056, 0.0, 10007554.677, 0.0, -926.625433055], 'metadata': {'IMAGE_STRUCTURE': {'INTERLEAVE': 'PIXEL'}, 'SUBDATASETS': {'SUBDATASET_2_NAME': 'EEDAI:MODIS/006/MYD09GA/2017_05_24:num_observations_500m,sur_refl_b01,sur_refl_b02,sur_refl_b03,sur_refl_b04,sur_refl_b05,sur_refl_b06,sur_refl_b07,QC_500m,obscov_500m,iobs_res,q_scan', 'SUBDATASET_2_DESC': 'Bands num_observations_500m,sur_refl_b01,sur_refl_b02,sur_refl_b03,sur_refl_b04,sur_refl_b05,sur_refl_b06,sur_refl_b07,QC_500m,obscov_500m,iobs_res,q_scan of MODIS/006/MYD09GA/2017_05_24', 'SUBDATASET_1_NAME': 'EEDAI:MODIS/006/MYD09GA/2017_05_24:num_observations_1km,state_1km,SensorZenith,SensorAzimuth,Range,SolarZenith,SolarAzimuth,gflags,orbit_pnt,granule_pnt', 'SUBDATASET_1_DESC': 'Bands num_observations_1km,state_1km,SensorZenith,SensorAzimuth,Range,SolarZenith,SolarAzimuth,gflags,orbit_pnt,granule_pnt of MODIS/006/MYD09GA/2017_05_24'}}, 'size': [43200, 21600]}
     assert expected == res
     assert ds.ReadRaster(0, 0, 1, 1) is not None
-
-###############################################################################
-#
-
-
-def test_eedai_cleanup():
-
-    if gdaltest.eedai_drv is None:
-        pytest.skip()
-
-    gdal.SetConfigOption('CPL_CURL_ENABLE_VSIMEM', None)
-    gdal.SetConfigOption('EEDA_BEARER', gdaltest.EEDA_BEARER)
-    gdal.SetConfigOption('EEDA_URL', gdaltest.EEDA_URL)
-    gdal.SetConfigOption('EEDA_PRIVATE_KEY', gdaltest.EEDA_PRIVATE_KEY)
-    gdal.SetConfigOption('EEDA_CLIENT_EMAIL', gdaltest.EEDA_CLIENT_EMAIL)
-    gdal.SetConfigOption('GO2A_AUD', None)
-    gdal.SetConfigOption('GOA2_NOW', None)
-    gdal.SetConfigOption('GOOGLE_APPLICATION_CREDENTIALS', gdaltest.GOOGLE_APPLICATION_CREDENTIALS)
-
-    gdal.Unlink('/vsimem/ee/projects/earthengine-public/assets/image')
-    gdal.RmdirRecursive('/vsimem/ee/')
-
-
-
diff --git a/autotest/gdrivers/grib.py b/autotest/gdrivers/grib.py
index db9b39c6518f..6873bfe42b6f 100755
--- a/autotest/gdrivers/grib.py
+++ b/autotest/gdrivers/grib.py
@@ -43,6 +43,9 @@
 import gdaltest
 
 
+pytestmark = pytest.mark.require_driver('GRIB')
+
+
 def has_jp2kdrv():
     for i in range(gdal.GetDriverCount()):
         if gdal.GetDriver(i).ShortName.startswith('JP2'):
@@ -54,14 +57,9 @@ def has_jp2kdrv():
 
 
 def test_grib_1():
-
-    gdaltest.grib_drv = gdal.GetDriverByName('GRIB')
-    if gdaltest.grib_drv is None:
-        pytest.skip()
-
     # Test proj4 presence
     import osr_ct
-    osr_ct.osr_ct_1()
+    osr_ct.test_osr_ct_1()
 
     tst = gdaltest.GDALTest('GRIB', 'grib/ds.mint.bin', 2, 46927)
     return tst.testOpen()
@@ -72,9 +70,6 @@ def test_grib_1():
 
 def test_grib_2():
 
-    if gdaltest.grib_drv is None:
-        pytest.skip()
-
     tst = gdaltest.GDALTest('GRIB', 'grib/Sample_QuikSCAT.grb', 4, 50714)
     return tst.testOpen()
 
@@ -85,9 +80,6 @@ def test_grib_2():
 
 def test_grib_read_different_sizes_messages():
 
-    if gdaltest.grib_drv is None:
-        pytest.skip()
-
     tst = gdaltest.GDALTest('GRIB', 'grib/bug3246.grb', 4, 4081)
     gdal.PushErrorHandler('CPLQuietErrorHandler')
     result = tst.testOpen()
@@ -106,9 +98,6 @@ def test_grib_read_different_sizes_messages():
 
 def test_grib_grib2_read_nodata():
 
-    if gdaltest.grib_drv is None:
-        pytest.skip()
-
     ds = gdal.Open('data/grib/ds.mint.bin')
     assert ds.GetRasterBand(1).GetNoDataValue() == 9999
     assert ds.GetRasterBand(2).GetNoDataValue() == 9999
@@ -117,16 +106,13 @@ def test_grib_grib2_read_nodata():
     for k in expected_md:
         assert k in md and md[k] == expected_md[k], 'Did not get expected metadata'
 
-    
+
 ###############################################################################
 # Check grib units (#3606)
 
 
 def test_grib_read_units():
 
-    if gdaltest.grib_drv is None:
-        pytest.skip()
-
     gdal.Unlink('tmp/ds.mint.bin.aux.xml')
 
     shutil.copy('data/grib/ds.mint.bin', 'tmp/ds.mint.bin')
@@ -166,9 +152,6 @@ def test_grib_read_units():
 
 def test_grib_read_geotransform_one_n_or_n_one():
 
-    if gdaltest.grib_drv is None:
-        pytest.skip()
-
     ds = gdal.Open('data/grib/one_one.grib2')
     egt = (-114.25, 0.5, 0.0, 47.250, 0.0, -0.5)
     gt = ds.GetGeoTransform()
@@ -185,9 +168,6 @@ def test_grib_read_geotransform_one_n_or_n_one():
 
 def test_grib_read_vsizip():
 
-    if gdaltest.grib_drv is None:
-        pytest.skip()
-
     ds = gdal.Open('/vsizip/data/grib/gfs.t00z.mastergrb2f03.zip/gfs.t00z.mastergrb2f03')
     assert ds is not None
 
@@ -196,9 +176,6 @@ def test_grib_read_vsizip():
 
 
 def test_grib_grib2_test_grib_pds_all_bands():
-
-    if gdaltest.grib_drv is None:
-        pytest.skip()
     ds = gdal.Open('/vsizip/data/grib/gfs.t00z.mastergrb2f03.zip/gfs.t00z.mastergrb2f03')
     assert ds is not None
     band = ds.GetRasterBand(2)
@@ -221,9 +198,6 @@ def test_grib_grib2_test_grib_pds_all_bands():
 
 def test_grib_grib2_read_template_4_15():
 
-    if gdaltest.grib_drv is None:
-        pytest.skip()
-
     import test_cli_utilities
     if test_cli_utilities.get_gdalinfo_path() is None:
         pytest.skip()
@@ -240,9 +214,6 @@ def test_grib_grib2_read_template_4_15():
 
 def test_grib_grib2_read_png():
 
-    if gdaltest.grib_drv is None:
-        pytest.skip()
-
     if gdal.GetDriverByName('PNG') is None:
         pytest.skip()
 
@@ -256,9 +227,6 @@ def test_grib_grib2_read_png():
 
 def test_grib_grib2_read_template_4_32():
 
-    if gdaltest.grib_drv is None:
-        pytest.skip()
-
     # First band extracted from http://nomads.ncep.noaa.gov/pub/data/nccf/com/hur/prod/hwrf.2017102006/twenty-se27w.2017102006.hwrfsat.core.0p02.f000.grb2
     ds = gdal.Open('data/grib/twenty-se27w.2017102006.hwrfsat.core.0p02.f000_truncated.grb2')
     cs = ds.GetRasterBand(1).Checksum()
@@ -268,16 +236,13 @@ def test_grib_grib2_read_template_4_32():
     for k in expected_md:
         assert k in md and md[k] == expected_md[k], 'Did not get expected metadata'
 
-    
+
 ###############################################################################
 # GRIB2 file with all 0 data
 
 
 def test_grib_grib2_read_all_zero_data():
 
-    if gdaltest.grib_drv is None:
-        pytest.skip()
-
     # From http://dd.weather.gc.ca/model_wave/great_lakes/erie/grib2/00/CMC_rdwps_lake-erie_ICEC_SFC_0_latlon0.05x0.05_2017111800_P000.grib2
     ds = gdal.Open('data/grib/CMC_rdwps_lake-erie_ICEC_SFC_0_latlon0.05x0.05_2017111800_P000.grib2')
     cs = ds.GetRasterBand(1).Checksum()
@@ -287,16 +252,13 @@ def test_grib_grib2_read_all_zero_data():
     for k in expected_md:
         assert k in md and md[k] == expected_md[k], 'Did not get expected metadata'
 
-    
+
 ###############################################################################
 # GRIB1 file with rotate pole lonlat
 
 
 def test_grib_grib2_read_rotated_pole_lonlat():
 
-    if gdaltest.grib_drv is None:
-        pytest.skip()
-
     ds = gdal.Open('/vsisparse/data/grib/rotated_pole.grb.xml')
 
     assert ds.RasterXSize == 726 and ds.RasterYSize == 550, \
@@ -316,16 +278,13 @@ def test_grib_grib2_read_rotated_pole_lonlat():
     for k in expected_md:
         assert k in md and md[k] == expected_md[k], 'Did not get expected metadata'
 
-    
+
 ###############################################################################
 # Test support for GRIB2 Section 4 Template 40, Analysis or forecast at a horizontal level or in a horizontal layer at a point in time for atmospheric chemical constituents
 
 
 def test_grib_grib2_read_template_4_40():
 
-    if gdaltest.grib_drv is None:
-        pytest.skip()
-
     # We could use some other encoding that JP2K...
     if not has_jp2kdrv():
         pytest.skip()
@@ -338,16 +297,13 @@ def test_grib_grib2_read_template_4_40():
     for k in expected_md:
         assert k in md and md[k] == expected_md[k], 'Did not get expected metadata'
 
-    
+
 ###############################################################################
 # Test support for a unhandled GRIB2 Section 4 Template
 
 
 def test_grib_grib2_read_template_4_unhandled():
 
-    if gdaltest.grib_drv is None:
-        pytest.skip()
-
     with gdaltest.error_handler():
         ds = gdal.Open('data/grib/template_4_65535.grb2')
     md = ds.GetRasterBand(1).GetMetadata()
@@ -355,16 +311,13 @@ def test_grib_grib2_read_template_4_unhandled():
     for k in expected_md:
         assert k in md and md[k] == expected_md[k], 'Did not get expected metadata'
 
-    
+
 ###############################################################################
 # Test reading GRIB2 Transverse Mercator grid
 
 
 def test_grib_grib2_read_transverse_mercator():
 
-    if gdaltest.grib_drv is None:
-        pytest.skip()
-
     ds = gdal.Open('data/grib/transverse_mercator.grb2')
 
     projection = ds.GetProjectionRef()
@@ -382,9 +335,6 @@ def test_grib_grib2_read_transverse_mercator():
 
 def test_grib_grib2_read_mercator():
 
-    if gdaltest.grib_drv is None:
-        pytest.skip()
-
     if gdaltest.have_proj4 == 0:
         pytest.skip()
 
@@ -399,15 +349,13 @@ def test_grib_grib2_read_mercator():
     assert max([abs(gt[i] - expected_gt[i]) for i in range(6)]) <= 1e-3, \
         'Did not get expected geotransform'
 
+
 ###############################################################################
 # Test reading GRIB2 Mercator grid
 
 
 def test_grib_grib2_read_mercator_2sp():
 
-    if gdaltest.grib_drv is None:
-        pytest.skip()
-
     if gdaltest.have_proj4 == 0:
         pytest.skip()
 
@@ -422,15 +370,13 @@ def test_grib_grib2_read_mercator_2sp():
     assert max([abs(gt[i] - expected_gt[i]) for i in range(6)]) <= 1e-3, \
         'Did not get expected geotransform'
 
+
 ###############################################################################
 # Test reading GRIB2 Lambert Conformal Conic grid
 
 
 def test_grib_grib2_read_lcc():
 
-    if gdaltest.grib_drv is None:
-        pytest.skip()
-
     if gdaltest.have_proj4 == 0:
         pytest.skip()
 
@@ -445,15 +391,13 @@ def test_grib_grib2_read_lcc():
     assert max([abs(gt[i] - expected_gt[i]) for i in range(6)]) <= 1e-3, \
         'Did not get expected geotransform'
 
+
 ###############################################################################
 # Test reading GRIB2 Polar Stereographic grid
 
 
 def test_grib_grib2_read_polar_stereo():
 
-    if gdaltest.grib_drv is None:
-        pytest.skip()
-
     if gdaltest.have_proj4 == 0:
         pytest.skip()
 
@@ -468,15 +412,13 @@ def test_grib_grib2_read_polar_stereo():
     assert max([abs(gt[i] - expected_gt[i]) for i in range(6)]) <= 1e-3, \
         'Did not get expected geotransform'
 
+
 ###############################################################################
 # Test reading GRIB2 Albers Equal Area grid
 
 
 def test_grib_grib2_read_aea():
 
-    if gdaltest.grib_drv is None:
-        pytest.skip()
-
     if gdaltest.have_proj4 == 0:
         pytest.skip()
 
@@ -491,15 +433,13 @@ def test_grib_grib2_read_aea():
     assert max([abs(gt[i] - expected_gt[i]) for i in range(6)]) <= 1e-3, \
         'Did not get expected geotransform'
 
+
 ###############################################################################
 # Test reading GRIB2 Lambert Azimuthal Equal Area grid
 
 
 def test_grib_grib2_read_laea():
 
-    if gdaltest.grib_drv is None:
-        pytest.skip()
-
     if gdaltest.have_proj4 == 0:
         pytest.skip()
 
@@ -514,15 +454,13 @@ def test_grib_grib2_read_laea():
     assert max([abs(gt[i] - expected_gt[i]) for i in range(6)]) <= 1e-3, \
         'Did not get expected geotransform'
 
+
 ###############################################################################
 # Test reading GRIB2 with Grid point data - IEEE Floating Point Data (template 5.4)
 
 
 def test_grib_grib2_read_template_5_4_grid_point_ieee_floating_point():
 
-    if gdaltest.grib_drv is None:
-        pytest.skip()
-
     ds = gdal.Open('data/grib/ieee754_single.grb2')
     cs = ds.GetRasterBand(1).Checksum()
     assert cs == 4727, 'Did not get expected checksum'
@@ -531,15 +469,13 @@ def test_grib_grib2_read_template_5_4_grid_point_ieee_floating_point():
     cs = ds.GetRasterBand(1).Checksum()
     assert cs == 4727, 'Did not get expected checksum'
 
+
 ###############################################################################
 # Test reading GRIB2 with NBITS=0 and DECIMAL_SCALE !=0
 
 
 def test_grib_grib2_read_section_5_nbits_zero_decimal_scaled():
 
-    if gdaltest.grib_drv is None:
-        pytest.skip()
-
     ds = gdal.Open('data/grib/simple_packing_nbits_zero_decimal_scaled.grb2')
     cs = ds.GetRasterBand(1).Checksum()
     assert cs == 5, 'Did not get expected checksum'
@@ -554,32 +490,26 @@ def test_grib_grib2_read_section_5_nbits_zero_decimal_scaled():
         cs = ds.GetRasterBand(1).Checksum()
         assert cs == 5, 'Did not get expected checksum'
 
-    
+
 ###############################################################################
 # Test reading GRIB2 with complex packing and spatial differencing of order 1
 
 
 def test_grib_grib2_read_spatial_differencing_order_1():
 
-    if gdaltest.grib_drv is None:
-        pytest.skip()
-
     ds = gdal.Open('data/grib/spatial_differencing_order_1.grb2')
     cs = ds.GetRasterBand(1).Checksum()
     if cs != 46650:
         gdaltest.post_reason('Did not get expected checksum')
         print(cs)
 
-    
+
 ###############################################################################
 # Test GRIB2 creation options
 
 
 def test_grib_grib2_write_creation_options():
 
-    if gdaltest.grib_drv is None:
-        pytest.skip()
-
     tmpfilename = '/vsimem/out.grb2'
     gdal.Translate(tmpfilename, 'data/byte.tif', format='GRIB',
                    creationOptions=[
@@ -796,9 +726,6 @@ def test_grib_grib2_write_creation_options():
 
 def test_grib_grib2_write_projections():
 
-    if gdaltest.grib_drv is None:
-        pytest.skip()
-
     filenames = ['albers_equal_area.grb2',
                  'lambert_azimuthal_equal_area.grb2',
                  'lambert_conformal_conic.grb2',
@@ -945,9 +872,6 @@ def _grib_read_section(filename, sect_num_to_read):
 
 def test_grib_grib2_write_data_encodings():
 
-    if gdaltest.grib_drv is None:
-        pytest.skip()
-
     # Template 5 numbers
     GS5_SIMPLE = 0
     GS5_CMPLX = 2
@@ -1173,16 +1097,13 @@ def test_grib_grib2_write_data_encodings():
             gdaltest.post_reason('did not get expected checksum for lossy JPEG2000 with ' + drvname)
             print(cs)
 
-    
+
 ###############################################################################
 # Test GRIB2 write support with warnings/errors
 
 
 def test_grib_grib2_write_data_encodings_warnings_and_errors():
 
-    if gdaltest.grib_drv is None:
-        pytest.skip()
-
     # Cases where warnings are expected
     tests = []
     tests += [['data/byte.tif', ['DATA_ENCODING=SIMPLE_PACKING', 'DECIMAL_SCALE_FACTOR=1'], 4672]]
@@ -1293,7 +1214,7 @@ def test_grib_grib2_write_temperatures():
         assert max([abs((got_vals[i] - expected_vals[i]) / expected_vals[i]) for i in range(4)]) <= 1e-4, \
             ('fail with data_encoding = %s and type = %s' % (data_encoding, str(src_type)))
 
-    
+
 ###############################################################################
 
 
@@ -1327,9 +1248,6 @@ def test_grib_grib2_write_nodata():
 
 def test_grib_online_grib2_jpeg2000_single_line():
 
-    if gdaltest.grib_drv is None:
-        pytest.skip()
-
     if not has_jp2kdrv():
         pytest.skip()
 
diff --git a/autotest/gdrivers/mrf.py b/autotest/gdrivers/mrf.py
index 3738640948c9..62891d34645f 100755
--- a/autotest/gdrivers/mrf.py
+++ b/autotest/gdrivers/mrf.py
@@ -77,7 +77,7 @@
 def test_mrf(src_filename, chksum, chksum_after_reopening, options):
     if src_filename == '12bit_rose_extract.jpg':
         import jpeg
-        jpeg.jpeg_1()
+        jpeg.test_jpeg_1()
         if gdaltest.jpeg_version == '9b':
             pytest.skip()
 
diff --git a/autotest/gdrivers/netcdf.py b/autotest/gdrivers/netcdf.py
index 239631c23950..46a50556777f 100755
--- a/autotest/gdrivers/netcdf.py
+++ b/autotest/gdrivers/netcdf.py
@@ -56,17 +56,9 @@
 # Get netcdf version and test for supported files
 
 
-@pytest.fixture(autouse=True)
-def check_no_file_leaks():
-    num_files = len(gdaltest.get_opened_files())
-
-    yield
-
-    diff = len(gdaltest.get_opened_files()) - num_files
-    assert diff == 0, 'Leak of file handles: %d leaked' % diff
-
-
+@pytest.fixture(autouse=True, scope='module')
 def netcdf_setup():
+    # NOTE: this is also used by netcdf_cf.py
 
     gdaltest.netcdf_drv_version = 'unknown'
     gdaltest.netcdf_drv_has_nc2 = False
@@ -107,6 +99,15 @@ def netcdf_setup():
           '  has_nc2: ' + str(gdaltest.netcdf_drv_has_nc2) + '  has_nc4: ' +
           str(gdaltest.netcdf_drv_has_nc4))
 
+    gdaltest.count_opened_files = len(gdaltest.get_opened_files())
+
+
+@pytest.fixture(autouse=True, scope='module')
+def netcdf_teardown():
+    diff = len(gdaltest.get_opened_files()) - gdaltest.count_opened_files
+    assert diff == 0, 'Leak of file handles: %d leaked' % diff
+
+
 ###############################################################################
 # test file copy
 # helper function needed so we can call Process() on it from netcdf_test_copy_timeout()
@@ -126,15 +127,13 @@ def netcdf_test_copy_timeout(ifile, band, checksum, ofile, opts=None, driver='NE
 
     from multiprocessing import Process
 
-    result = 'success'
-
     drv = gdal.GetDriverByName(driver)
 
     if os.path.exists(ofile):
         drv.Delete(ofile)
 
     if timeout is None:
-        result = netcdf_test_copy(ifile, band, checksum, ofile, opts, driver)
+        netcdf_test_copy(ifile, band, checksum, ofile, opts, driver)
 
     else:
         sys.stdout.write('.')
@@ -151,9 +150,7 @@ def netcdf_test_copy_timeout(ifile, band, checksum, ofile, opts=None, driver='NE
             if os.path.exists(ofile):
                 drv.Delete(ofile)
             print('testCreateCopy() for file %s has reached timeout limit of %d seconds' % (ofile, timeout))
-            result = 'fail'
-
-    return result
+            pytest.fail()
 
 ###############################################################################
 # check support for DEFLATE compression, requires HDF5 and zlib
@@ -180,11 +177,9 @@ def netcdf_test_deflate(ifile, checksum, zlevel=1, timeout=None):
 
     assert os.path.exists(ifile), ('ifile %s does not exist' % ifile)
 
-    result1 = netcdf_test_copy_timeout(ifile, 1, checksum, ofile1, ofile1_opts, 'NETCDF', timeout)
-
-    result2 = netcdf_test_copy_timeout(ifile, 1, checksum, ofile2, ofile2_opts, 'NETCDF', timeout)
+    netcdf_test_copy_timeout(ifile, 1, checksum, ofile1, ofile1_opts, 'NETCDF', timeout)
 
-    assert not (result1 == 'fail' or result2 == 'fail')
+    netcdf_test_copy_timeout(ifile, 1, checksum, ofile2, ofile2_opts, 'NETCDF', timeout)
 
     # make sure compressed file is smaller than uncompressed files
     try:
@@ -248,9 +243,6 @@ def netcdf_check_vars(ifile, vals_global=None, vals_band=None):
 
 def test_netcdf_1():
 
-    # setup netcdf environment
-    netcdf_setup()
-
     if gdaltest.netcdf_drv is None:
         pytest.skip()
 
@@ -260,11 +252,9 @@ def test_netcdf_1():
     # We don't want to gum up the test stream output with the
     # 'Warning 1: No UNIDATA NC_GLOBAL:Conventions attribute' message.
     gdal.PushErrorHandler('CPLQuietErrorHandler')
-    result = tst.testOpen()
+    tst.testOpen()
     gdal.PopErrorHandler()
 
-    return result
-
 ###############################################################################
 # Verify a simple createcopy operation.  We can't do the trivial gdaltest
 # operation because the new file will only be accessible via subdatasets.
@@ -973,23 +963,15 @@ def test_netcdf_26():
     # test default config
     test = gdaltest.GDALTest('NETCDF', '../data/int16-nogeo.nc', 1, 4672)
     gdal.PushErrorHandler('CPLQuietErrorHandler')
-    result = test.testCreateCopy(check_gt=0, check_srs=0, check_minmax=0)
+    test.testCreateCopy(check_gt=0, check_srs=0, check_minmax=0)
     gdal.PopErrorHandler()
 
-    if result != 'success':
-        print('failed create copy without WRITE_BOTTOMUP')
-        return result
-
     # test WRITE_BOTTOMUP=NO
     test = gdaltest.GDALTest('NETCDF', '../data/int16-nogeo.nc', 1, 4855,
                              options=['WRITE_BOTTOMUP=NO'])
-    result = test.testCreateCopy(check_gt=0, check_srs=0, check_minmax=0)
+    test.testCreateCopy(check_gt=0, check_srs=0, check_minmax=0)
 
-    if result != 'success':
-        print('failed create copy with WRITE_BOTTOMUP=NO')
-        return result
 
-    
 ###############################################################################
 # check support for GDAL_NETCDF_BOTTOMUP configuration option
 
@@ -1003,25 +985,17 @@ def test_netcdf_27():
     test = gdaltest.GDALTest('NETCDF', '../data/int16-nogeo.nc', 1, 4672)
     config_bak = gdal.GetConfigOption('GDAL_NETCDF_BOTTOMUP')
     gdal.SetConfigOption('GDAL_NETCDF_BOTTOMUP', None)
-    result = test.testOpen()
+    test.testOpen()
     gdal.SetConfigOption('GDAL_NETCDF_BOTTOMUP', config_bak)
 
-    if result != 'success':
-        print('failed open without GDAL_NETCDF_BOTTOMUP')
-        return result
-
     # test GDAL_NETCDF_BOTTOMUP=NO
     test = gdaltest.GDALTest('NETCDF', '../data/int16-nogeo.nc', 1, 4855)
     config_bak = gdal.GetConfigOption('GDAL_NETCDF_BOTTOMUP')
     gdal.SetConfigOption('GDAL_NETCDF_BOTTOMUP', 'NO')
-    result = test.testOpen()
+    test.testOpen()
     gdal.SetConfigOption('GDAL_NETCDF_BOTTOMUP', config_bak)
 
-    if result != 'success':
-        print('failed open with GDAL_NETCDF_BOTTOMUP')
-        return result
 
-    
 ###############################################################################
 # check support for writing multi-dimensional files (helper function)
 
@@ -1121,14 +1095,10 @@ def test_netcdf_29():
         ('gdalwarp returned error\n' + str(ret) + ' ' + str(err))
 
     # copy vrt to netcdf, with proper dimension rolling
-    result = netcdf_test_copy(ofile1, 0, None, ofile)
+    netcdf_test_copy(ofile1, 0, None, ofile)
 
     # test file
-    result = netcdf_test_4dfile(ofile)
-    if result == 'fail':
-        print('test failed - does gdalwarp support metadata copying?')
-
-    return result
+    netcdf_test_4dfile(ofile)
 
 ###############################################################################
 # check support for file with nan values (bug #4705)
@@ -1542,10 +1512,8 @@ def test_netcdf_44():
         pytest.skip()
 
     for f, md5 in ('data/ushort.nc', 18), ('data/uint.nc', 10):
-        assert (not (netcdf_test_copy(f, 1, md5, 'tmp/netcdf_44.nc', ['FORMAT=NC4']) !=
-                'success'))
+        netcdf_test_copy(f, 1, md5, 'tmp/netcdf_44.nc', ['FORMAT=NC4'])
 
-    
 ###############################################################################
 # Test reading a vector NetCDF 3 file
 
@@ -1784,8 +1752,8 @@ def test_netcdf_51():
     ds = None
 
     import netcdf_cf
-    if netcdf_cf.netcdf_cf_setup() == 'success' and \
-       gdaltest.netcdf_cf_method is not None:
+    netcdf_cf.netcdf_cf_setup()
+    if gdaltest.netcdf_cf_method is not None:
         netcdf_cf.netcdf_cf_check_file('tmp/netcdf_51.nc', 'auto', False)
 
     gdal.Unlink('tmp/netcdf_51.nc')
@@ -1894,8 +1862,8 @@ def test_netcdf_52():
     ds = None
 
     import netcdf_cf
-    if netcdf_cf.netcdf_cf_setup() == 'success' and \
-       gdaltest.netcdf_cf_method is not None:
+    netcdf_cf.netcdf_cf_setup()
+    if gdaltest.netcdf_cf_method is not None:
         netcdf_cf.netcdf_cf_check_file('tmp/netcdf_52.nc', 'auto', False)
 
     gdal.Unlink('tmp/netcdf_52.nc')
@@ -2271,8 +2239,8 @@ def test_netcdf_62_cf_check():
         pytest.skip()
 
     import netcdf_cf
-    if netcdf_cf.netcdf_cf_setup() == 'success' and \
-       gdaltest.netcdf_cf_method is not None:
+    netcdf_cf.netcdf_cf_setup()
+    if gdaltest.netcdf_cf_method is not None:
         netcdf_cf.netcdf_cf_check_file('tmp/netcdf_62.nc', 'auto', False)
 
     gdal.Unlink('/vsimem/netcdf_62.nc')
@@ -2551,15 +2519,11 @@ def test_netcdf_67():
     # so for the moment compare the full image
     ds = gdal.Open('data/partial_block_ticket5950.nc', gdal.GA_ReadOnly)
     ref = numpy.arange(1, 10).reshape((3, 3))
-    if numpy.array_equal(ds.GetRasterBand(1).ReadAsArray(), ref):
-        result = 'success'
-    else:
-        result = 'fail'
+    if not numpy.array_equal(ds.GetRasterBand(1).ReadAsArray(), ref):
+        pytest.fail()
     ds = None
     gdal.SetConfigOption('GDAL_NETCDF_BOTTOMUP', None)
 
-    return result
-
 
 ###############################################################################
 # Test reading SRS from srid attribute (#6613)
diff --git a/autotest/gdrivers/netcdf_cf.py b/autotest/gdrivers/netcdf_cf.py
index 54446dfdf254..e5aa99c9d3b4 100755
--- a/autotest/gdrivers/netcdf_cf.py
+++ b/autotest/gdrivers/netcdf_cf.py
@@ -31,7 +31,7 @@
 
 import os
 import imp  # for netcdf_cf_setup()
-from netcdf import netcdf_setup, netcdf_test_copy
+from gdrivers.netcdf import netcdf_setup, netcdf_test_copy  # noqa
 from osgeo import gdal
 from osgeo import osr
 
@@ -548,10 +548,8 @@ def netcdf_cfproj_test_cf(proj, projNc):
 
 ###############################################################################
 # test copy and CF compliance for lat/lon (no datum, no GEOGCS) file, tif->nc->tif
-def test_netcdf_cf_1():
-
+def test_netcdf_cf_1(netcdf_setup):  # noqa
     # setup netcdf and netcdf_cf environment
-    netcdf_setup()
     netcdf_cf_setup()
 
     if gdaltest.netcdf_drv is None:
diff --git a/autotest/gdrivers/nitf.py b/autotest/gdrivers/nitf.py
index 53b82692c4f5..12ed2a37fd01 100755
--- a/autotest/gdrivers/nitf.py
+++ b/autotest/gdrivers/nitf.py
@@ -47,6 +47,14 @@
 # Write/Read test of simple byte reference data.
 
 
+@pytest.fixture(scope='module')
+def not_jpeg_9b():
+    import jpeg
+    jpeg.test_jpeg_1()
+    if gdaltest.jpeg_version == '9b':
+        pytest.skip()
+
+
 def test_nitf_1():
 
     tst = gdaltest.GDALTest('NITF', 'byte.tif', 1, 4672)
@@ -1042,13 +1050,7 @@ def test_nitf_40():
 ###############################################################################
 # Check reading a 12-bit JPEG compressed NITF
 
-def test_nitf_41():
-
-    import jpeg
-    jpeg.jpeg_1()
-    if gdaltest.jpeg_version == '9b':
-        pytest.skip()
-
+def test_nitf_41(not_jpeg_9b):
     # Check if JPEG driver supports 12bit JPEG reading/writing
     jpg_drv = gdal.GetDriverByName('JPEG')
     md = jpg_drv.GetMetadata()
@@ -1072,16 +1074,12 @@ def test_nitf_41():
     except OSError:
         pass
 
-    
+
 ###############################################################################
 # Check creating a 12-bit JPEG compressed NITF
 
 
-def test_nitf_42():
-
-    if gdaltest.jpeg_version == '9b':
-        pytest.skip()
-
+def test_nitf_42(not_jpeg_9b):
     # Check if JPEG driver supports 12bit JPEG reading/writing
     jpg_drv = gdal.GetDriverByName('JPEG')
     md = jpg_drv.GetMetadata()
@@ -2114,7 +2112,7 @@ def test_nitf_72():
 
     gdal.GetDriverByName('NITF').Delete('/vsimem/nitf_72.ntf')
 
-    assert compare_rpc(src_md, md)
+    compare_rpc(src_md, md)
 
     expected_RPC00B_max_precision = '11234.562345.6734567845678-89.8765-179.1234-987698765467890-12.3456-123.4567-1234+0.000000E+0+9.876543E+9+9.876543E-9-9.876543E+9-9.876543E-9+0.000000E+0+9.876543E+9+9.876543E-9-9.876543E+9-9.876543E-9+0.000000E+0+9.876543E+9+9.876543E-9-9.876543E+9-9.876543E-9+0.000000E+0+9.876543E+9+9.876543E-9-9.876543E+9-9.876543E-9+1.000000E+0+9.876543E+9+9.876543E-9-9.876543E+9-9.876543E-9+0.000000E+0+9.876543E+9+9.876543E-9-9.876543E+9-9.876543E-9+0.000000E+0+9.876543E+9+9.876543E-9-9.876543E+9-9.876543E-9+0.000000E+0+9.876543E+9+9.876543E-9-9.876543E+9-9.876543E-9+2.000000E+0+9.876543E+9+9.876543E-9-9.876543E+9-9.876543E-9+0.000000E+0+9.876543E+9+9.876543E-9-9.876543E+9-9.876543E-9+0.000000E+0+9.876543E+9+9.876543E-9-9.876543E+9-9.876543E-9+0.000000E+0+9.876543E+9+9.876543E-9-9.876543E+9-9.876543E-9+3.000000E+0+9.876543E+9+9.876543E-9-9.876543E+9-9.876543E-9+0.000000E+0+9.876543E+9+9.876543E-9-9.876543E+9-9.876543E-9+0.000000E+0+9.876543E+9+9.876543E-9-9.876543E+9-9.876543E-9+0.000000E+0+9.876543E+9+9.876543E-9-9.876543E+9-9.876543E-9'
     assert RPC00B == expected_RPC00B_max_precision, 'fail: did not get expected RPC00B'
@@ -2213,7 +2211,7 @@ def test_nitf_72():
 
     gdal.GetDriverByName('NITF').Delete('/vsimem/nitf_72.ntf')
 
-    assert compare_rpc(src_md, md)
+    compare_rpc(src_md, md)
 
     expected_RPC00B = '10123.000234.0000345604567+08.0000+017.0000+098709876506789+12.0000+109.0000+0034+0.000000E+0+9.870000E+9+9.876543E-9-9.876543E+9-9.876543E-9+0.000000E+0+9.876543E+9+9.876543E-9-9.876543E+9-9.876543E-9+0.000000E+0+9.876543E+9+9.876543E-9-9.876543E+9-9.876543E-9+0.000000E+0+9.876543E+9+9.876543E-9-9.876543E+9-9.876543E-9+1.000000E+0+9.876543E+9+9.876543E-9-9.876543E+9-9.876543E-9+0.000000E+0+9.876543E+9+9.876543E-9-9.876543E+9-9.876543E-9+0.000000E+0+9.876543E+9+9.876543E-9-9.876543E+9-9.876543E-9+0.000000E+0+9.876543E+9+9.876543E-9-9.876543E+9-9.876543E-9+2.000000E+0+9.876543E+9+9.876543E-9-9.876543E+9-9.876543E-9+0.000000E+0+9.876543E+9+9.876543E-9-9.876543E+9-9.876543E-9+0.000000E+0+9.876543E+9+9.876543E-9-9.876543E+9-9.876543E-9+0.000000E+0+9.876543E+9+9.876543E-9-9.876543E+9-9.876543E-9+3.000000E+0+9.876543E+9+9.876543E-9-9.876543E+9-9.876543E-9+0.000000E+0+9.876543E+9+9.876543E-9-9.876543E+9-9.876543E-9+0.000000E+0+9.876543E+9+9.876543E-9-9.876543E+9-9.876543E-9+0.000000E+0+9.876543E+9+9.876543E-9-9.876543E+9-9.876543E-9'
     assert RPC00B == expected_RPC00B, 'fail: did not get expected RPC00B'
@@ -2298,7 +2296,7 @@ def test_nitf_72():
         'fail: _RPC.TXT file not reported in file list'
 
     # Check that we get full precision from the _RPC.TXT file
-    assert compare_rpc(src_md, md)
+    compare_rpc(src_md, md)
 
     assert RPC00B == expected_RPC00B, 'fail: did not get expected RPC00B'
 
@@ -2856,12 +2854,12 @@ def test_nitf_online_13():
         assert md[item[0]] == item[1], ('wrong value for %s, got %s instead of %s.'
                                  % (item[0], md[item[0]], item[1]))
 
-    
+
 
 ###############################################################################
 # Check reading a 12-bit JPEG compressed NITF (multi-block)
 
-def test_nitf_online_14():
+def test_nitf_online_14(not_jpeg_9b):
 
     if not gdaltest.download_file('http://download.osgeo.org/gdal/data/nitf/nitf2.0/U_4020h.ntf', 'U_4020h.ntf'):
         pytest.skip()
@@ -2871,9 +2869,6 @@ def test_nitf_online_14():
     except OSError:
         pass
 
-    if gdaltest.jpeg_version == '9b':
-        pytest.skip()
-
     # Check if JPEG driver supports 12bit JPEG reading/writing
     jpg_drv = gdal.GetDriverByName('JPEG')
     md = jpg_drv.GetMetadata()
diff --git a/autotest/gdrivers/nwt_grd.py b/autotest/gdrivers/nwt_grd.py
index d4906cf89356..edd593b3b325 100755
--- a/autotest/gdrivers/nwt_grd.py
+++ b/autotest/gdrivers/nwt_grd.py
@@ -42,16 +42,13 @@
 def test_nwt_grd_1():
 
     tst1 = gdaltest.GDALTest('NWT_GRD', 'nwt_grd.grd', 1, 28093)
-    status1 = tst1.testOpen()
+    tst1.testOpen()
     tst2 = gdaltest.GDALTest('NWT_GRD', 'nwt_grd.grd', 2, 33690)
-    status2 = tst2.testOpen()
+    tst2.testOpen()
     tst3 = gdaltest.GDALTest('NWT_GRD', 'nwt_grd.grd', 3, 20365)
-    status3 = tst3.testOpen()
+    tst3.testOpen()
     tst4 = gdaltest.GDALTest('NWT_GRD', 'nwt_grd.grd', 4, 25856)
-    status4 = tst4.testOpen()
-    if status1 == 'success' and status2 == 'success' and status3 == 'success' and status4 == 'success':
-        return
-    pytest.fail()
+    tst4.testOpen()
 
 
 def test_nwt_grd_2():
diff --git a/autotest/gdrivers/pdf.py b/autotest/gdrivers/pdf.py
index fa105369b252..77db876508b8 100755
--- a/autotest/gdrivers/pdf.py
+++ b/autotest/gdrivers/pdf.py
@@ -36,27 +36,51 @@
 from osgeo import osr
 import pytest
 
-sys.path.append('../osr')
-
 import gdaltest
 import ogrtest
 
+
+pytestmark = pytest.mark.require_driver('PDF')
+
 ###############################################################################
 # Test driver presence
 
 
-def pdf_init():
-
+@pytest.fixture(
+    params=['POPPLER', 'PODOFO', 'PDFIUM']
+)
+def poppler_or_pdfium_or_podofo(request):
+    """
+    Runs tests with all three backends.
+    """
+    backend = request.param
     gdaltest.pdf_drv = gdal.GetDriverByName('PDF')
-    if gdaltest.pdf_drv is None:
+
+    md = gdaltest.pdf_drv.GetMetadata()
+    if 'HAVE_%s' % backend not in md:
         pytest.skip()
 
+    with gdaltest.config_option('GDAL_PDF_LIB', backend):
+        yield backend
+
+
+@pytest.fixture(
+    params=['POPPLER', 'PDFIUM']
+)
+def poppler_or_pdfium(request):
+    """
+    Runs tests with poppler or pdfium, but not podofo
+    """
+    backend = request.param
+    gdaltest.pdf_drv = gdal.GetDriverByName('PDF')
+
     md = gdaltest.pdf_drv.GetMetadata()
-    if 'HAVE_POPPLER' not in md and 'HAVE_PODOFO' not in md and 'HAVE_PDFIUM' not in md:
-        gdaltest.pdf_drv = None
+    if 'HAVE_%s' % backend not in md:
         pytest.skip()
 
-    
+    with gdaltest.config_option('GDAL_PDF_LIB', backend):
+        yield backend
+
 ###############################################################################
 # Returns True if we run with poppler
 
@@ -111,11 +135,7 @@ def pdf_checksum_available():
 # Test OGC best practice geospatial PDF
 
 
-def pdf_online_1():
-
-    if gdaltest.pdf_drv is None:
-        pytest.skip()
-
+def test_pdf_online_1(poppler_or_pdfium):
     if not gdaltest.download_file('http://www.agc.army.mil/GeoPDFgallery/Imagery/Cherrydale_eDOQQ_1m_0_033_R1C1.pdf', 'Cherrydale_eDOQQ_1m_0_033_R1C1.pdf'):
         pytest.skip()
 
@@ -156,11 +176,7 @@ def pdf_online_1():
 ###############################################################################
 
 
-def pdf_online_2():
-
-    if gdaltest.pdf_drv is None:
-        pytest.skip()
-
+def test_pdf_online_2(poppler_or_pdfium):
     try:
         os.stat('tmp/cache/Cherrydale_eDOQQ_1m_0_033_R1C1.pdf')
     except OSError:
@@ -192,11 +208,7 @@ def pdf_online_2():
 # Test Adobe style geospatial pdf
 
 
-def pdf_1():
-
-    if gdaltest.pdf_drv is None:
-        pytest.skip()
-
+def test_pdf_1(poppler_or_pdfium):
     gdal.SetConfigOption('GDAL_PDF_DPI', '200')
     ds = gdal.Open('data/adobe_style_geospatial.pdf')
     gdal.SetConfigOption('GDAL_PDF_DPI', None)
@@ -237,11 +249,7 @@ def pdf_1():
 # Test write support with ISO32000 geo encoding
 
 
-def pdf_iso32000():
-
-    if gdaltest.pdf_drv is None:
-        pytest.skip()
-
+def test_pdf_iso32000(poppler_or_pdfium_or_podofo):
     tst = gdaltest.GDALTest('PDF', 'byte.tif', 1, None)
     ret = tst.testCreateCopy(check_minmax=0, check_gt=1, check_srs=True, check_checksum_not_null=pdf_checksum_available())
 
@@ -251,11 +259,7 @@ def pdf_iso32000():
 # Test write support with ISO32000 geo encoding, with DPI=300
 
 
-def pdf_iso32000_dpi_300():
-
-    if gdaltest.pdf_drv is None:
-        pytest.skip()
-
+def test_pdf_iso32000_dpi_300(poppler_or_pdfium):
     tst = gdaltest.GDALTest('PDF', 'byte.tif', 1, None, options=['DPI=300'])
     ret = tst.testCreateCopy(check_minmax=0, check_gt=1, check_srs=True, check_checksum_not_null=pdf_checksum_available())
 
@@ -265,11 +269,7 @@ def pdf_iso32000_dpi_300():
 # Test write support with OGC_BP geo encoding
 
 
-def pdf_ogcbp():
-
-    if gdaltest.pdf_drv is None:
-        pytest.skip()
-
+def test_pdf_ogcbp(poppler_or_pdfium_or_podofo):
     gdal.SetConfigOption('GDAL_PDF_OGC_BP_WRITE_WKT', 'FALSE')
     tst = gdaltest.GDALTest('PDF', 'byte.tif', 1, None, options=['GEO_ENCODING=OGC_BP'])
     ret = tst.testCreateCopy(check_minmax=0, check_gt=1, check_srs=True, check_checksum_not_null=pdf_checksum_available())
@@ -281,11 +281,7 @@ def pdf_ogcbp():
 # Test write support with OGC_BP geo encoding, with DPI=300
 
 
-def pdf_ogcbp_dpi_300():
-
-    if gdaltest.pdf_drv is None:
-        pytest.skip()
-
+def test_pdf_ogcbp_dpi_300(poppler_or_pdfium):
     gdal.SetConfigOption('GDAL_PDF_OGC_BP_WRITE_WKT', 'FALSE')
     tst = gdaltest.GDALTest('PDF', 'byte.tif', 1, None, options=['GEO_ENCODING=OGC_BP', 'DPI=300'])
     ret = tst.testCreateCopy(check_minmax=0, check_gt=1, check_srs=True, check_checksum_not_null=pdf_checksum_available())
@@ -294,11 +290,7 @@ def pdf_ogcbp_dpi_300():
     return ret
 
 
-def pdf_ogcbp_lcc():
-
-    if gdaltest.pdf_drv is None:
-        pytest.skip()
-
+def test_pdf_ogcbp_lcc(poppler_or_pdfium):
     wkt = """PROJCS["NAD83 / Utah North",
     GEOGCS["NAD83",
         DATUM["North_American_Datum_1983",
@@ -342,11 +334,7 @@ def pdf_ogcbp_lcc():
 # Test no compression
 
 
-def pdf_no_compression():
-
-    if gdaltest.pdf_drv is None:
-        pytest.skip()
-
+def test_pdf_no_compression(poppler_or_pdfium):
     tst = gdaltest.GDALTest('PDF', 'byte.tif', 1, None, options=['COMPRESS=NONE'])
     ret = tst.testCreateCopy(check_minmax=0, check_gt=0, check_srs=None, check_checksum_not_null=pdf_checksum_available())
 
@@ -356,18 +344,16 @@ def pdf_no_compression():
 # Test compression methods
 
 
-def pdf_jpeg_compression(filename='byte.tif'):
-
-    if gdaltest.pdf_drv is None:
-        pytest.skip()
-
+def _test_pdf_jpeg_compression(filename):
     if gdal.GetDriverByName('JPEG') is None:
         pytest.skip()
 
     tst = gdaltest.GDALTest('PDF', filename, 1, None, options=['COMPRESS=JPEG'])
-    ret = tst.testCreateCopy(check_minmax=0, check_gt=0, check_srs=None, check_checksum_not_null=pdf_checksum_available())
+    tst.testCreateCopy(check_minmax=0, check_gt=0, check_srs=None, check_checksum_not_null=pdf_checksum_available())
 
-    return ret
+
+def test_pdf_jpeg_compression(poppler_or_pdfium):
+    _test_pdf_jpeg_compression('byte.tif')
 
 
 def pdf_get_J2KDriver(drv_name):
@@ -382,10 +368,6 @@ def pdf_get_J2KDriver(drv_name):
 
 
 def pdf_jpx_compression(filename, drv_name=None):
-
-    if gdaltest.pdf_drv is None:
-        pytest.skip()
-
     if drv_name is None:
         if pdf_get_J2KDriver('JP2KAK') is None and \
            pdf_get_J2KDriver('JP2ECW') is None and \
@@ -406,32 +388,32 @@ def pdf_jpx_compression(filename, drv_name=None):
     return ret
 
 
-def pdf_jp2_auto_compression():
+def test_pdf_jp2_auto_compression(poppler_or_pdfium):
     return pdf_jpx_compression('utm.tif')
 
 
-def pdf_jp2kak_compression():
+def test_pdf_jp2kak_compression(poppler_or_pdfium):
     return pdf_jpx_compression('utm.tif', 'JP2KAK')
 
 
-def pdf_jp2ecw_compression():
+def test_pdf_jp2ecw_compression(poppler_or_pdfium):
     return pdf_jpx_compression('utm.tif', 'JP2ECW')
 
 
-def pdf_jp2openjpeg_compression():
+def test_pdf_jp2openjpeg_compression(poppler_or_pdfium):
     return pdf_jpx_compression('utm.tif', 'JP2OpenJpeg')
 
 
-def pdf_jpeg2000_compression():
+def test_pdf_jpeg2000_compression(poppler_or_pdfium):
     return pdf_jpx_compression('utm.tif', 'JPEG2000')
 
 
-def pdf_jp2ecw_compression_rgb():
+def test_pdf_jp2ecw_compression_rgb(poppler_or_pdfium):
     return pdf_jpx_compression('rgbsmall.tif', 'JP2ECW')
 
 
-def pdf_jpeg_compression_rgb():
-    return pdf_jpeg_compression('rgbsmall.tif')
+def test_pdf_jpeg_compression_rgb(poppler_or_pdfium):
+    return _test_pdf_jpeg_compression('rgbsmall.tif')
 
 ###############################################################################
 # Test RGBA
@@ -439,9 +421,6 @@ def pdf_jpeg_compression_rgb():
 
 def pdf_rgba_default_compression(options_param=None):
     options_param = [] if options_param is None else options_param
-    if gdaltest.pdf_drv is None:
-        pytest.skip()
-
     if not pdf_checksum_available():
         pytest.skip()
 
@@ -495,33 +474,25 @@ def pdf_rgba_default_compression(options_param=None):
 
     
 
-def pdf_rgba_default_compression_tiled():
+def test_pdf_rgba_default_compression_tiled(poppler_or_pdfium_or_podofo):
     return pdf_rgba_default_compression(['BLOCKXSIZE=32', 'BLOCKYSIZE=32'])
 
 
-def pdf_jpeg_compression_rgba():
-    return pdf_jpeg_compression('../../gcore/data/stefan_full_rgba.tif')
+def test_pdf_jpeg_compression_rgba(poppler_or_pdfium):
+    return _test_pdf_jpeg_compression('../../gcore/data/stefan_full_rgba.tif')
 
 ###############################################################################
 # Test PREDICTOR=2
 
 
-def pdf_predictor_2():
-
-    if gdaltest.pdf_drv is None:
-        pytest.skip()
-
+def test_pdf_predictor_2(poppler_or_pdfium):
     tst = gdaltest.GDALTest('PDF', 'utm.tif', 1, None, options=['PREDICTOR=2'])
     ret = tst.testCreateCopy(check_minmax=0, check_gt=0, check_srs=None, check_checksum_not_null=pdf_checksum_available())
 
     return ret
 
 
-def pdf_predictor_2_rgb():
-
-    if gdaltest.pdf_drv is None:
-        pytest.skip()
-
+def test_pdf_predictor_2_rgb(poppler_or_pdfium):
     tst = gdaltest.GDALTest('PDF', 'rgbsmall.tif', 1, None, options=['PREDICTOR=2'])
     ret = tst.testCreateCopy(check_minmax=0, check_gt=0, check_srs=None, check_checksum_not_null=pdf_checksum_available())
 
@@ -531,22 +502,14 @@ def pdf_predictor_2_rgb():
 # Test tiling
 
 
-def pdf_tiled():
-
-    if gdaltest.pdf_drv is None:
-        pytest.skip()
-
+def test_pdf_tiled(poppler_or_pdfium):
     tst = gdaltest.GDALTest('PDF', 'utm.tif', 1, None, options=['COMPRESS=DEFLATE', 'TILED=YES'])
     ret = tst.testCreateCopy(check_minmax=0, check_gt=0, check_srs=None, check_checksum_not_null=pdf_checksum_available())
 
     return ret
 
 
-def pdf_tiled_128():
-
-    if gdaltest.pdf_drv is None:
-        pytest.skip()
-
+def test_pdf_tiled_128(poppler_or_pdfium):
     tst = gdaltest.GDALTest('PDF', 'utm.tif', 1, None, options=['BLOCKXSIZE=128', 'BLOCKYSIZE=128'])
     ret = tst.testCreateCopy(check_minmax=0, check_gt=0, check_srs=None, check_checksum_not_null=pdf_checksum_available())
 
@@ -556,11 +519,7 @@ def pdf_tiled_128():
 # Test raster with color table
 
 
-def pdf_color_table():
-
-    if gdaltest.pdf_drv is None:
-        pytest.skip()
-
+def test_pdf_color_table(poppler_or_pdfium):
     if gdal.GetDriverByName('GIF') is None:
         pytest.skip()
 
@@ -573,11 +532,7 @@ def pdf_color_table():
 # Test XMP support
 
 
-def pdf_xmp():
-
-    if gdaltest.pdf_drv is None:
-        pytest.skip()
-
+def test_pdf_xmp(poppler_or_pdfium):
     src_ds = gdal.Open('data/adobe_style_geospatial_with_xmp.pdf')
     gdaltest.pdf_drv.CreateCopy('tmp/pdf_xmp.pdf', src_ds, options=['WRITE_INFO=NO'])
     out_ds = gdal.Open('tmp/pdf_xmp.pdf')
@@ -602,11 +557,7 @@ def pdf_xmp():
 # Test Info
 
 
-def pdf_info():
-
-    if gdaltest.pdf_drv is None:
-        pytest.skip()
-
+def test_pdf_info(poppler_or_pdfium):
     try:
         val = '\xc3\xa9'.decode('UTF-8')
     except:
@@ -645,11 +596,7 @@ def pdf_info():
 # Check SetGeoTransform() / SetProjection()
 
 
-def pdf_update_gt():
-
-    if gdaltest.pdf_drv is None:
-        pytest.skip()
-
+def test_pdf_update_gt(poppler_or_pdfium_or_podofo):
     src_ds = gdal.Open('data/byte.tif')
     ds = gdaltest.pdf_drv.CreateCopy('tmp/pdf_update_gt.pdf', src_ds)
     ds = None
@@ -709,11 +656,7 @@ def pdf_update_gt():
 # Check SetMetadataItem() for Info
 
 
-def pdf_update_info():
-
-    if gdaltest.pdf_drv is None:
-        pytest.skip()
-
+def test_pdf_update_info(poppler_or_pdfium_or_podofo):
     src_ds = gdal.Open('data/byte.tif')
     ds = gdaltest.pdf_drv.CreateCopy('tmp/pdf_update_info.pdf', src_ds)
     ds = None
@@ -766,11 +709,7 @@ def pdf_update_info():
 # Check SetMetadataItem() for xml:XMP
 
 
-def pdf_update_xmp():
-
-    if gdaltest.pdf_drv is None:
-        pytest.skip()
-
+def test_pdf_update_xmp(poppler_or_pdfium_or_podofo):
     src_ds = gdal.Open('data/byte.tif')
     ds = gdaltest.pdf_drv.CreateCopy('tmp/pdf_update_xmp.pdf', src_ds)
     ds = None
@@ -822,11 +761,8 @@ def pdf_update_xmp():
 # Check SetGCPs() but with GCPs that resolve to a geotransform
 
 
-def pdf_update_gcps(dpi=300):
-
-    if gdaltest.pdf_drv is None:
-        pytest.skip()
-
+def _pdf_update_gcps(poppler_or_pdfium):
+    dpi = 300
     out_filename = 'tmp/pdf_update_gcps.pdf'
 
     src_ds = gdal.Open('data/byte.tif')
@@ -913,27 +849,22 @@ def pdf_update_gcps(dpi=300):
     gdaltest.pdf_drv.Delete(out_filename)
 
 
-def pdf_update_gcps_iso32000():
+def test_pdf_update_gcps_iso32000(poppler_or_pdfium):
     gdal.SetConfigOption('GDAL_PDF_GEO_ENCODING', None)
-    ret = pdf_update_gcps()
-    return ret
+    _pdf_update_gcps(poppler_or_pdfium)
 
 
-def pdf_update_gcps_ogc_bp():
+def test_pdf_update_gcps_ogc_bp(poppler_or_pdfium):
     gdal.SetConfigOption('GDAL_PDF_GEO_ENCODING', 'OGC_BP')
-    ret = pdf_update_gcps()
+    _pdf_update_gcps(poppler_or_pdfium)
     gdal.SetConfigOption('GDAL_PDF_GEO_ENCODING', None)
-    return ret
 
 ###############################################################################
 # Check SetGCPs() but with GCPs that do *not* resolve to a geotransform
 
 
-def pdf_set_5_gcps_ogc_bp(dpi=300):
-
-    if gdaltest.pdf_drv is None:
-        pytest.skip()
-
+def test_pdf_set_5_gcps_ogc_bp(poppler_or_pdfium):
+    dpi = 300
     out_filename = 'tmp/pdf_set_5_gcps_ogc_bp.pdf'
 
     src_ds = gdal.Open('data/byte.tif')
@@ -1027,11 +958,7 @@ def pdf_set_5_gcps_ogc_bp(dpi=300):
 ###############################################################################
 # Check NEATLINE support
 
-def pdf_set_neatline(geo_encoding, dpi=300):
-
-    if gdaltest.pdf_drv is None:
-        pytest.skip()
-
+def _pdf_set_neatline(pdf_backend, geo_encoding, dpi=300):
     out_filename = 'tmp/pdf_set_neatline.pdf'
 
     if geo_encoding == 'ISO32000':
@@ -1105,22 +1032,18 @@ def pdf_set_neatline(geo_encoding, dpi=300):
     gdaltest.pdf_drv.Delete(out_filename)
 
 
-def pdf_set_neatline_iso32000():
-    return pdf_set_neatline('ISO32000')
+def test_pdf_set_neatline_iso32000(poppler_or_pdfium):
+    return _pdf_set_neatline(poppler_or_pdfium, 'ISO32000')
 
 
-def pdf_set_neatline_ogc_bp():
-    return pdf_set_neatline('OGC_BP')
+def test_pdf_set_neatline_ogc_bp(poppler_or_pdfium):
+    return _pdf_set_neatline(poppler_or_pdfium, 'OGC_BP')
 
 ###############################################################################
 # Check that we can generate identical file
 
 
-def pdf_check_identity_iso32000():
-
-    if gdaltest.pdf_drv is None:
-        pytest.skip()
-
+def test_pdf_check_identity_iso32000(poppler_or_pdfium):
     out_filename = 'tmp/pdf_check_identity_iso32000.pdf'
 
     src_ds = gdal.Open('data/test_pdf.vrt')
@@ -1144,11 +1067,7 @@ def pdf_check_identity_iso32000():
 # Check that we can generate identical file
 
 
-def pdf_check_identity_ogc_bp():
-
-    if gdaltest.pdf_drv is None:
-        pytest.skip()
-
+def test_pdf_check_identity_ogc_bp(poppler_or_pdfium):
     out_filename = 'tmp/pdf_check_identity_ogc_bp.pdf'
 
     src_ds = gdal.Open('data/test_pdf.vrt')
@@ -1174,11 +1093,7 @@ def pdf_check_identity_ogc_bp():
 # Check layers support
 
 
-def pdf_layers():
-
-    if gdaltest.pdf_drv is None:
-        pytest.skip()
-
+def test_pdf_layers(poppler_or_pdfium):
     if not pdf_is_poppler() and not pdf_is_pdfium():
         pytest.skip()
 
@@ -1224,11 +1139,7 @@ def pdf_layers():
 # Test MARGIN, EXTRA_STREAM, EXTRA_LAYER_NAME and EXTRA_IMAGES options
 
 
-def pdf_custom_layout():
-
-    if gdaltest.pdf_drv is None:
-        pytest.skip()
-
+def test_pdf_custom_layout(poppler_or_pdfium):
     js = """button = app.alert({cMsg: 'This file was generated by GDAL. Do you want to visit its website ?', cTitle: 'Question', nIcon:2, nType:2});
 if (button == 4) app.launchURL('http://gdal.org/');"""
 
@@ -1265,11 +1176,7 @@ def pdf_custom_layout():
 # Test CLIPPING_EXTENT, EXTRA_RASTERS, EXTRA_RASTERS_LAYER_NAME, OFF_LAYERS, EXCLUSIVE_LAYERS options
 
 
-def pdf_extra_rasters():
-
-    if gdaltest.pdf_drv is None:
-        pytest.skip()
-
+def test_pdf_extra_rasters(poppler_or_pdfium):
     subbyte = """<VRTDataset rasterXSize="10" rasterYSize="10">
   <SRS>PROJCS["NAD27 / UTM zone 11N",GEOGCS["NAD27",DATUM["North_American_Datum_1927",SPHEROID["Clarke 1866",6378206.4,294.9786982139006,AUTHORITY["EPSG","7008"]],AUTHORITY["EPSG","6267"]],PRIMEM["Greenwich",0],UNIT["degree",0.0174532925199433],AUTHORITY["EPSG","4267"]],PROJECTION["Transverse_Mercator"],PARAMETER["latitude_of_origin",0],PARAMETER["central_meridian",-117],PARAMETER["scale_factor",0.9996],PARAMETER["false_easting",500000],PARAMETER["false_northing",0],UNIT["metre",1,AUTHORITY["EPSG","9001"]],AUTHORITY["EPSG","26711"]]</SRS>
   <GeoTransform>  4.4102000000000000e+05,  6.0000000000000000e+01,  0.0000000000000000e+00,  3.7510200000000000e+06,  0.0000000000000000e+00, -6.0000000000000000e+01</GeoTransform>
@@ -1330,11 +1237,7 @@ def pdf_extra_rasters():
 # Test adding a OGR datasource
 
 
-def pdf_write_ogr():
-
-    if gdaltest.pdf_drv is None:
-        pytest.skip()
-
+def test_pdf_write_ogr(poppler_or_pdfium):
     f = gdal.VSIFOpenL('tmp/test.csv', 'wb')
     data = """id,foo,WKT,style
 1,bar,"MULTIPOLYGON (((440720 3751320,440720 3750120,441020 3750120,441020 3751320,440720 3751320),(440800 3751200,440900 3751200,440900 3751000,440800 3751000,440800 3751200)),((441720 3751320,441720 3750120,441920 3750120,441920 3751320,441720 3751320)))",
@@ -1421,13 +1324,9 @@ def pdf_write_ogr():
 # Test adding a OGR datasource with reprojection of OGR SRS to GDAL SRS
 
 
-def pdf_write_ogr_with_reprojection():
-
-    if gdaltest.pdf_drv is None:
-        pytest.skip()
-
-    import osr_ct
-    osr_ct.osr_ct_1()
+def test_pdf_write_ogr_with_reprojection(poppler_or_pdfium):
+    from osr import osr_ct
+    osr_ct.test_osr_ct_1()
     if gdaltest.have_proj4 == 0:
         pytest.skip()
 
@@ -1482,11 +1381,7 @@ def pdf_write_ogr_with_reprojection():
 # Test direct copy of source JPEG file
 
 
-def pdf_jpeg_direct_copy():
-
-    if gdaltest.pdf_drv is None:
-        pytest.skip()
-
+def test_pdf_jpeg_direct_copy(poppler_or_pdfium):
     if gdal.GetDriverByName('JPEG') is None:
         pytest.skip()
 
@@ -1516,11 +1411,7 @@ def pdf_jpeg_direct_copy():
 # Test direct copy of source JPEG file within VRT file
 
 
-def pdf_jpeg_in_vrt_direct_copy():
-
-    if gdaltest.pdf_drv is None:
-        pytest.skip()
-
+def test_pdf_jpeg_in_vrt_direct_copy(poppler_or_pdfium):
     if gdal.GetDriverByName('JPEG') is None:
         pytest.skip()
 
@@ -1562,11 +1453,11 @@ def pdf_jpeg_in_vrt_direct_copy():
 # Test reading georeferencing attached to an image, and not to the page (#4695)
 
 
-def pdf_georef_on_image(src_filename='data/byte.tif'):
-
-    if gdaltest.pdf_drv is None:
-        pytest.skip()
-
+@pytest.mark.parametrize(
+    'src_filename',
+    ['data/byte.tif', 'data/rgbsmall.tif']
+)
+def pdf_georef_on_image(src_filename, pdf_backend):
     src_ds = gdal.Open(src_filename)
     gdal.SetConfigOption('GDAL_PDF_WRITE_GEOREF_ON_IMAGE', 'YES')
     out_ds = gdaltest.pdf_drv.CreateCopy('tmp/pdf_georef_on_image.pdf', src_ds, options=['MARGIN=10', 'GEO_ENCODING=NONE'])
@@ -1597,18 +1488,11 @@ def pdf_georef_on_image(src_filename='data/byte.tif'):
     assert not pdf_checksum_available() or src_cs == got_cs, 'did not get same checksum'
 
 
-def pdf_georef_on_image_rgb():
-    return pdf_georef_on_image('data/rgbsmall.tif')
-
 ###############################################################################
 # Test writing a PDF that hits Acrobat limits in term of page dimensions (#5412)
 
 
-def pdf_write_huge():
-
-    if gdaltest.pdf_drv is None:
-        pytest.skip()
-
+def test_pdf_write_huge(poppler_or_pdfium):
     if pdf_is_poppler() or pdf_is_pdfium():
         tmp_filename = '/vsimem/pdf_write_huge.pdf'
     else:
@@ -1658,11 +1542,7 @@ def pdf_write_huge():
 # Test creating overviews
 
 
-def pdf_overviews():
-
-    if gdaltest.pdf_drv is None:
-        pytest.skip()
-
+def test_pdf_overviews(poppler_or_pdfium):
     if not pdf_is_poppler() and not pdf_is_pdfium():
         pytest.skip()
     tmp_filename = '/vsimem/pdf_overviews.pdf'
@@ -1696,11 +1576,7 @@ def pdf_overviews():
 # Test password
 
 
-def pdf_password():
-
-    if gdaltest.pdf_drv is None:
-        pytest.skip()
-
+def test_pdf_password(poppler_or_pdfium_or_podofo):
     # User password of this test file is user_password and owner password is
     # owner_password
 
@@ -1742,11 +1618,7 @@ def pdf_password():
 # Test multi page support
 
 
-def pdf_multipage():
-
-    if gdaltest.pdf_drv is None:
-        pytest.skip()
-
+def test_pdf_multipage(poppler_or_pdfium_or_podofo):
     # byte_and_rgbsmall_2pages.pdf was generated with :
     # 1) gdal_translate gcore/data/byte.tif byte.pdf -of PDF
     # 2) gdal_translate gcore/data/rgbsmall.tif rgbsmall.pdf -of PDF
@@ -1780,11 +1652,7 @@ def pdf_multipage():
 # Test PAM metadata support
 
 
-def pdf_metadata():
-
-    if gdaltest.pdf_drv is None:
-        pytest.skip()
-
+def test_pdf_metadata(poppler_or_pdfium):
     gdal.Translate('tmp/pdf_metadata.pdf', 'data/byte.tif', format='PDF', metadataOptions=['FOO=BAR'])
     ds = gdal.Open('tmp/pdf_metadata.pdf')
     md = ds.GetMetadata()
@@ -1800,11 +1668,7 @@ def pdf_metadata():
 # Test PAM georef support
 
 
-def pdf_pam_georef():
-
-    if gdaltest.pdf_drv is None:
-        pytest.skip()
-
+def test_pdf_pam_georef(poppler_or_pdfium):
     src_ds = gdal.Open('data/byte.tif')
 
     # Default behaviour should result in no PAM file
@@ -1821,106 +1685,3 @@ def pdf_pam_georef():
     ds = None
 
     gdal.GetDriverByName('PDF').Delete('tmp/pdf_pam_georef.pdf')
-
-
-gdaltest_list_for_full_backend = [
-    pdf_online_1,
-    pdf_online_2,
-    pdf_1,
-    pdf_iso32000,
-    pdf_iso32000_dpi_300,
-    pdf_ogcbp,
-    pdf_ogcbp_dpi_300,
-    pdf_ogcbp_lcc,
-    pdf_no_compression,
-    pdf_jpeg_compression,
-    pdf_jp2_auto_compression,
-    pdf_jp2kak_compression,
-    pdf_jp2ecw_compression,
-    pdf_jp2openjpeg_compression,
-    pdf_jpeg2000_compression,
-    pdf_jp2ecw_compression_rgb,
-    pdf_jpeg_compression_rgb,
-    pdf_rgba_default_compression,
-    pdf_rgba_default_compression_tiled,
-    pdf_jpeg_compression_rgba,
-    pdf_predictor_2,
-    pdf_predictor_2_rgb,
-    pdf_tiled,
-    pdf_tiled_128,
-    pdf_color_table,
-    pdf_xmp,
-    pdf_info,
-    pdf_update_gt,
-    pdf_update_info,
-    pdf_update_xmp,
-    pdf_update_gcps_iso32000,
-    pdf_update_gcps_ogc_bp,
-    pdf_set_5_gcps_ogc_bp,
-    pdf_set_neatline_iso32000,
-    pdf_set_neatline_ogc_bp,
-    pdf_check_identity_iso32000,
-    pdf_check_identity_ogc_bp,
-    pdf_layers,
-    pdf_custom_layout,
-    pdf_extra_rasters,
-    pdf_write_ogr,
-    pdf_write_ogr_with_reprojection,
-    pdf_jpeg_direct_copy,
-    pdf_jpeg_in_vrt_direct_copy,
-    pdf_georef_on_image,
-    pdf_georef_on_image_rgb,
-    pdf_write_huge,
-    pdf_overviews,
-    pdf_password,
-    pdf_multipage,
-    pdf_metadata,
-    pdf_pam_georef]
-
-gdaltest_list_for_short_backend = [
-    pdf_iso32000,
-    pdf_ogcbp,
-    pdf_update_gt,
-    pdf_update_info,
-    pdf_update_xmp,
-    pdf_rgba_default_compression_tiled,
-    pdf_password,
-    pdf_multipage
-]
-
-
-def test_pdf_run_all():
-    gdaltest.run_tests([pdf_init])
-
-    if gdaltest.pdf_drv is not None:
-        if pdf_is_poppler():
-            print('Using poppler')
-        elif pdf_is_pdfium():
-            print('Using pdfium')
-        else:
-            print('Using podofo')
-
-    gdaltest.run_tests(gdaltest_list_for_full_backend)
-
-    if gdal.GetConfigOption('GDAL_PDF_LIB') is None:
-        # Switch from pdfium to poppler if both are available
-        if gdaltest.pdf_drv is not None:
-            md = gdaltest.pdf_drv.GetMetadata()
-            if 'HAVE_POPPLER' in md and 'HAVE_PDFIUM' in md:
-                gdal.SetConfigOption("GDAL_PDF_LIB", "POPPLER")
-                print('Using poppler now')
-                gdaltest.run_tests(gdaltest_list_for_full_backend)
-
-        # Switch from poppler/pdfium to podofo if both are available
-        if gdaltest.pdf_drv is not None:
-            md = gdaltest.pdf_drv.GetMetadata()
-            if ('HAVE_POPPLER' in md or 'HAVE_PDFIUM' in md) and 'HAVE_PODOFO' in md:
-                gdal.SetConfigOption("GDAL_PDF_LIB", "PODOFO")
-                print('Using podofo now')
-                gdaltest.pdf_is_checksum_available = None
-                gdaltest.run_tests(gdaltest_list_for_short_backend)
-
-    
-
-# gdaltest_list = [ pdf_init, pdf_metadata ]
-
diff --git a/autotest/gdrivers/wcs.py b/autotest/gdrivers/wcs.py
index 7196de0c4115..8962a435f833 100755
--- a/autotest/gdrivers/wcs.py
+++ b/autotest/gdrivers/wcs.py
@@ -34,16 +34,19 @@
 import numbers
 import re
 import shutil
-import urlparse
-import pytest
+
+try:
+    import urllib.parse as urlparse
+except ImportError:
+    import urlparse
 try:
     from BaseHTTPServer import BaseHTTPRequestHandler
 except ImportError:
     from http.server import BaseHTTPRequestHandler
 
-from osgeo import gdal
-
+import pytest
 
+from osgeo import gdal
 import webserver
 import gdaltest
 
@@ -230,9 +233,9 @@ def read_urls():
     retval = {}
     fname = 'data/wcs/urls'
     f = open(fname, 'rb')
-    content = f.read()
+    text = f.read().decode('utf-8')
     f.close()
-    for line in content.splitlines():
+    for line in text.splitlines():
         items = line.split()
         if items[1].endswith('2'):
             items[1] = items[1][:-1]
diff --git a/autotest/gnm/__init__.py b/autotest/gnm/__init__.py
new file mode 100644
index 000000000000..e69de29bb2d1
diff --git a/autotest/ogr/__init__.py b/autotest/ogr/__init__.py
new file mode 100644
index 000000000000..e69de29bb2d1
diff --git a/autotest/ogr/ogr_as_sqlite_extension.py b/autotest/ogr/ogr_as_sqlite_extension.py
index 8a72e4baf759..ac49ee9333ea 100755
--- a/autotest/ogr/ogr_as_sqlite_extension.py
+++ b/autotest/ogr/ogr_as_sqlite_extension.py
@@ -110,4 +110,9 @@ def do(sqlite3name, gdalname):
         sys.exit(1)
 
 
+if __name__ == '__main__':
+    if len(sys.argv) != 3:
+        print('python ogr_as_sqlite_extension name_of_libsqlite3 name_of_libgdal')
+        sys.exit(1)
 
+    do(sys.argv[1], sys.argv[2])
diff --git a/autotest/ogr/ogr_gpkg.py b/autotest/ogr/ogr_gpkg.py
index 1b37126e6516..5e87c511bef2 100755
--- a/autotest/ogr/ogr_gpkg.py
+++ b/autotest/ogr/ogr_gpkg.py
@@ -35,53 +35,48 @@
 import sys
 import pytest
 
-# Make sure we run from the directory of the script
-if os.path.basename(sys.argv[0]) == os.path.basename(__file__):
-    if os.path.dirname(sys.argv[0]) != '':
-        os.chdir(os.path.dirname(sys.argv[0]))
-
-sys.path.append('../../gdal/swig/python/samples')
-
 from osgeo import gdal
 from osgeo import ogr
 from osgeo import osr
 import gdaltest
 
-sys.path.append(os.path.normpath(os.path.join(os.path.dirname(__file__), '../osr')))
-import osr_proj4
-sys.path.pop()
+from osr import osr_proj4
 
 ###############################################################################
 # Validate a geopackage
 
-try:
-    import validate_gpkg
-    has_validate = True
-except ImportError:
-    has_validate = False
+
+def _validate_check(filename):
+    path = '../../gdal/swig/python/samples'
+    if path not in sys.path:
+        sys.path.append(path)
+    try:
+        import validate_gpkg
+    except ImportError:
+        return
+    validate_gpkg.check(filename)
 
 
 def validate(filename, quiet=False):
-    if has_validate:
-        my_filename = filename
-        if my_filename.startswith('/vsimem/'):
-            my_filename = 'tmp/validate.gpkg'
-            f = gdal.VSIFOpenL(filename, 'rb')
-            if f is None:
-                print('Cannot open %s' % filename)
-                return False
-            content = gdal.VSIFReadL(1, 10000000, f)
-            gdal.VSIFCloseL(f)
-            open(my_filename, 'wb').write(content)
-        try:
-            validate_gpkg.check(my_filename)
-        except Exception as e:
-            if not quiet:
-                print(e)
+    my_filename = filename
+    if my_filename.startswith('/vsimem/'):
+        my_filename = 'tmp/validate.gpkg'
+        f = gdal.VSIFOpenL(filename, 'rb')
+        if f is None:
+            print('Cannot open %s' % filename)
             return False
-        finally:
-            if my_filename != filename:
-                os.unlink(my_filename)
+        content = gdal.VSIFReadL(1, 10000000, f)
+        gdal.VSIFCloseL(f)
+        open(my_filename, 'wb').write(content)
+    try:
+        _validate_check(my_filename)
+    except Exception as e:
+        if not quiet:
+            print(e)
+        return False
+    finally:
+        if my_filename != filename:
+            os.unlink(my_filename)
     return True
 
 ###############################################################################
@@ -2291,35 +2286,6 @@ def test_ogr_gpkg_33():
 
     gdaltest.gpkg_dr.DeleteDataSource('/vsimem/ogr_gpkg_33.gpkg')
 
-###############################################################################
-# Run test_ogrsf
-
-
-def test_ogr_gpkg_test_ogrsf():
-
-    if gdaltest.gpkg_dr is None:
-        pytest.skip()
-
-    # Do integrity check first
-    sql_lyr = gdaltest.gpkg_ds.ExecuteSQL("PRAGMA integrity_check")
-    feat = sql_lyr.GetNextFeature()
-    assert feat.GetField(0) == 'ok', 'integrity check failed'
-    gdaltest.gpkg_ds.ReleaseResultSet(sql_lyr)
-
-    import test_cli_utilities
-    if test_cli_utilities.get_test_ogrsf_path() is None:
-        pytest.skip()
-
-    gdaltest.gpkg_ds = None
-    # sys.exit(0)
-    ret = gdaltest.runexternal(test_cli_utilities.get_test_ogrsf_path() + ' tmp/gpkg_test.gpkg --config OGR_SQLITE_SYNCHRONOUS OFF')
-
-    assert ret.find('INFO') != -1 and ret.find('ERROR') == -1
-
-    ret = gdaltest.runexternal(test_cli_utilities.get_test_ogrsf_path() + ' tmp/gpkg_test.gpkg -sql "select * from tbl_linestring_renamed" --config OGR_SQLITE_SYNCHRONOUS OFF')
-
-    assert ret.find('INFO') != -1 and ret.find('ERROR') == -1
-
 
 ###############################################################################
 # Test rename and delete a layer registered in extensions, metadata, spatial index etc
@@ -3822,6 +3788,37 @@ def test_ogr_gpkg_wal():
     gdal.Unlink(filename + '-wal')
     gdal.Unlink(filename + '-shm')
 
+
+###############################################################################
+# Run test_ogrsf
+
+
+def test_ogr_gpkg_test_ogrsf():
+
+    if gdaltest.gpkg_dr is None:
+        pytest.skip()
+
+    # Do integrity check first
+    sql_lyr = gdaltest.gpkg_ds.ExecuteSQL("PRAGMA integrity_check")
+    feat = sql_lyr.GetNextFeature()
+    assert feat.GetField(0) == 'ok', 'integrity check failed'
+    gdaltest.gpkg_ds.ReleaseResultSet(sql_lyr)
+
+    import test_cli_utilities
+    if test_cli_utilities.get_test_ogrsf_path() is None:
+        pytest.skip()
+
+    gdaltest.gpkg_ds = None
+    # sys.exit(0)
+    ret = gdaltest.runexternal(test_cli_utilities.get_test_ogrsf_path() + ' tmp/gpkg_test.gpkg --config OGR_SQLITE_SYNCHRONOUS OFF')
+
+    assert ret.find('INFO') != -1 and ret.find('ERROR') == -1
+
+    ret = gdaltest.runexternal(test_cli_utilities.get_test_ogrsf_path() + ' tmp/gpkg_test.gpkg -sql "select * from tbl_linestring_renamed" --config OGR_SQLITE_SYNCHRONOUS OFF')
+
+    assert ret.find('INFO') != -1 and ret.find('ERROR') == -1
+
+
 ###############################################################################
 # Test JSon subtype support
 
diff --git a/autotest/ogr/ogr_mitab.py b/autotest/ogr/ogr_mitab.py
index d49d216a8dce..ef81e18b5b7a 100755
--- a/autotest/ogr/ogr_mitab.py
+++ b/autotest/ogr/ogr_mitab.py
@@ -377,7 +377,7 @@ def test_ogr_mitab_13():
         pytest.skip()
 
     import ogr_gml_read
-    ogr_gml_read.ogr_gml_1()
+    ogr_gml_read.test_ogr_gml_1()
 
     if test_cli_utilities.get_ogr2ogr_path() is None:
         pytest.skip()
@@ -422,7 +422,7 @@ def test_ogr_mitab_14():
         pytest.skip()
 
     import ogr_gml_read
-    ogr_gml_read.ogr_gml_1()
+    ogr_gml_read.test_ogr_gml_1()
 
     if test_cli_utilities.get_ogr2ogr_path() is None:
         pytest.skip()
@@ -522,7 +522,7 @@ def test_ogr_mitab_17():
         pytest.skip()
 
     import ogr_gml_read
-    ogr_gml_read.ogr_gml_1()
+    ogr_gml_read.test_ogr_gml_1()
 
     if test_cli_utilities.get_test_ogrsf_path() is None:
         pytest.skip()
diff --git a/autotest/ogr/ogr_mysql.py b/autotest/ogr/ogr_mysql.py
index b204304b7a43..c3f323d7c342 100755
--- a/autotest/ogr/ogr_mysql.py
+++ b/autotest/ogr/ogr_mysql.py
@@ -128,6 +128,31 @@ def test_ogr_mysql_2():
     assert gdaltest.mysql_lyr.GetSpatialRef().IsSame(shp_lyr.GetSpatialRef()), \
         'not matching spatial ref'
 
+###############################################################################
+# Test reading a layer extent
+
+
+def test_ogr_mysql_19():
+
+    if gdaltest.mysql_ds is None:
+        pytest.skip()
+
+    layer = gdaltest.mysql_ds.GetLayerByName('tpoly')
+    if layer is None:
+        pytest.fail('did not get tpoly layer')
+
+    extent = layer.GetExtent()
+    expect = (478315.53125, 481645.3125, 4762880.5, 4765610.5)
+
+    minx = abs(extent[0] - expect[0])
+    maxx = abs(extent[1] - expect[1])
+    miny = abs(extent[2] - expect[2])
+    maxy = abs(extent[3] - expect[3])
+
+    if max(minx, maxx, miny, maxy) > 0.0001:
+        print(extent)
+        pytest.fail('Extents do not match')
+
 ###############################################################################
 # Verify that stuff we just wrote is still OK.
 
@@ -511,32 +536,6 @@ def ogr_mysql_18():
         'layer count unexpectedly unchanged.'
 
 ###############################################################################
-# Test reading a layer extent
-
-
-def test_ogr_mysql_19():
-
-    if gdaltest.mysql_ds is None:
-        pytest.skip()
-
-    layer = gdaltest.mysql_ds.GetLayerByName('tpoly')
-    assert layer is not None, 'did not get tpoly layer'
-
-    extent = layer.GetExtent()
-    expect = (478315.53125, 481645.3125, 4762880.5, 4765610.5)
-
-    minx = abs(extent[0] - expect[0])
-    maxx = abs(extent[1] - expect[1])
-    miny = abs(extent[2] - expect[2])
-    maxy = abs(extent[3] - expect[3])
-
-    if max(minx, maxx, miny, maxy) > 0.0001:
-        print(extent)
-        pytest.fail('Extents do not match')
-
-    
-###############################################################################
-# Test using reserved keywords as column names and table names
 
 
 def test_ogr_mysql_20():
diff --git a/autotest/ogr/ogr_pg.py b/autotest/ogr/ogr_pg.py
index d4aad51cf33c..6172698de101 100755
--- a/autotest/ogr/ogr_pg.py
+++ b/autotest/ogr/ogr_pg.py
@@ -68,8 +68,9 @@ def ogr_pg_check_layer_in_list(ds, layer_name):
 
 
 @pytest.fixture(
-    scope='module',
     params=['postgis', 'no-postgis'],
+    scope='module',
+    autouse=True
 )
 def with_and_without_postgis(request):
     test_ogr_pg_1()
@@ -81,9 +82,8 @@ def with_and_without_postgis(request):
     if with_postgis and not gdaltest.pg_has_postgis:
         pytest.skip()
 
-    gdal.SetConfigOption("PG_USE_POSTGIS", 'YES' if with_postgis else 'NO')
-    yield with_postgis
-    gdal.SetConfigOption("PG_USE_POSTGIS", "YES")
+    with gdaltest.config_option("PG_USE_POSTGIS", 'YES' if with_postgis else 'NO'):
+        yield with_postgis
 
 
 ###############################################################################
@@ -164,7 +164,7 @@ def test_ogr_pg_1():
 # Create table from data/poly.shp
 
 
-def test_ogr_pg_2(with_and_without_postgis):
+def test_ogr_pg_2():
 
     if gdaltest.pg_ds is None:
         pytest.skip()
@@ -245,7 +245,7 @@ def test_ogr_pg_2(with_and_without_postgis):
 # Test reading a layer extent
 
 
-def test_ogr_pg_19(with_and_without_postgis):
+def test_ogr_pg_19():
 
     if gdaltest.pg_ds is None:
         pytest.skip()
@@ -282,7 +282,7 @@ def test_ogr_pg_19(with_and_without_postgis):
 # Test reading a SQL result layer extent
 
 
-def test_ogr_pg_19_2(with_and_without_postgis):
+def test_ogr_pg_19_2():
 
     if gdaltest.pg_ds is None:
         pytest.skip()
@@ -306,7 +306,7 @@ def test_ogr_pg_19_2(with_and_without_postgis):
 # Verify that stuff we just wrote is still OK.
 
 
-def test_ogr_pg_3(with_and_without_postgis):
+def test_ogr_pg_3():
     if gdaltest.pg_ds is None:
         pytest.skip()
 
@@ -345,7 +345,7 @@ def test_ogr_pg_3(with_and_without_postgis):
 # geometries are still OK.
 
 
-def test_ogr_pg_4(with_and_without_postgis):
+def test_ogr_pg_4():
 
     if gdaltest.pg_ds is None:
         pytest.skip()
@@ -387,7 +387,7 @@ def test_ogr_pg_4(with_and_without_postgis):
 # Test ExecuteSQL() results layers without geometry.
 
 
-def test_ogr_pg_5(with_and_without_postgis):
+def test_ogr_pg_5():
 
     if gdaltest.pg_ds is None:
         pytest.skip()
@@ -408,7 +408,7 @@ def test_ogr_pg_5(with_and_without_postgis):
 # Test ExecuteSQL() results layers with geometry.
 
 
-def test_ogr_pg_6(with_and_without_postgis):
+def test_ogr_pg_6():
 
     if gdaltest.pg_ds is None:
         pytest.skip()
@@ -442,7 +442,7 @@ def test_ogr_pg_6(with_and_without_postgis):
 # Test spatial filtering.
 
 
-def test_ogr_pg_7(with_and_without_postgis):
+def test_ogr_pg_7():
 
     if gdaltest.pg_ds is None:
         pytest.skip()
@@ -478,7 +478,7 @@ def test_ogr_pg_7(with_and_without_postgis):
 # No geometry in this test.
 
 
-def test_ogr_pg_8(with_and_without_postgis):
+def test_ogr_pg_8():
 
     if gdaltest.pg_ds is None:
         pytest.skip()
@@ -505,7 +505,7 @@ def test_ogr_pg_8(with_and_without_postgis):
 # Verify inplace update of a feature with SetFeature().
 
 
-def test_ogr_pg_9(with_and_without_postgis):
+def test_ogr_pg_9():
 
     if gdaltest.pg_ds is None:
         pytest.skip()
@@ -567,7 +567,7 @@ def test_ogr_pg_9(with_and_without_postgis):
 # Verify that DeleteFeature() works properly.
 
 
-def test_ogr_pg_10(with_and_without_postgis):
+def test_ogr_pg_10():
 
     if gdaltest.pg_ds is None:
         pytest.skip()
@@ -597,7 +597,7 @@ def test_ogr_pg_10(with_and_without_postgis):
 # Create table from data/poly.shp in INSERT mode.
 
 
-def test_ogr_pg_11(with_and_without_postgis):
+def test_ogr_pg_11():
 
     if gdaltest.pg_ds is None:
         pytest.skip()
@@ -649,7 +649,7 @@ def test_ogr_pg_11(with_and_without_postgis):
 # Verify that stuff we just wrote is still OK.
 
 
-def test_ogr_pg_12(with_and_without_postgis):
+def test_ogr_pg_12():
     if gdaltest.pg_ds is None:
         pytest.skip()
 
@@ -677,7 +677,7 @@ def test_ogr_pg_12(with_and_without_postgis):
 # Create a table with some date fields.
 
 
-def test_ogr_pg_13(with_and_without_postgis):
+def test_ogr_pg_13():
 
     if gdaltest.pg_ds is None:
         pytest.skip()
@@ -712,7 +712,7 @@ def test_ogr_pg_13(with_and_without_postgis):
 # Fetch in several timezones to test our timezone processing.
 
 
-def test_ogr_pg_14(with_and_without_postgis):
+def test_ogr_pg_14():
     if gdaltest.pg_ds is None:
         pytest.skip()
 
@@ -772,7 +772,7 @@ def test_ogr_pg_14(with_and_without_postgis):
 # Test very large query.
 
 
-def test_ogr_pg_15(with_and_without_postgis):
+def test_ogr_pg_15():
 
     if gdaltest.pg_ds is None:
         pytest.skip()
@@ -795,7 +795,7 @@ def test_ogr_pg_15(with_and_without_postgis):
 ###############################################################################
 # Test very large statement.
 
-def test_ogr_pg_16(with_and_without_postgis):
+def test_ogr_pg_16():
 
     if gdaltest.pg_ds is None:
         pytest.skip()
@@ -821,7 +821,7 @@ def test_ogr_pg_16(with_and_without_postgis):
 # Test requesting a non-existent table by name (bug 1480).
 
 
-def test_ogr_pg_17(with_and_without_postgis):
+def test_ogr_pg_17():
 
     if gdaltest.pg_ds is None:
         pytest.skip()
@@ -840,7 +840,7 @@ def test_ogr_pg_17(with_and_without_postgis):
 # Test getting a layer by name that was not previously a layer.
 
 
-def test_ogr_pg_18(with_and_without_postgis):
+def test_ogr_pg_18():
 
     if gdaltest.pg_ds is None or not gdaltest.pg_has_postgis:
         pytest.skip()
@@ -857,7 +857,7 @@ def test_ogr_pg_18(with_and_without_postgis):
 # Test reading 4-dim geometry in EWKT format
 
 
-def test_ogr_pg_20(with_and_without_postgis):
+def test_ogr_pg_20():
 
     if gdaltest.pg_ds is None or not gdaltest.pg_has_postgis:
         pytest.skip()
@@ -936,7 +936,7 @@ def test_ogr_pg_20(with_and_without_postgis):
 # Test reading 4-dimension geometries in EWKB format
 
 
-def test_ogr_pg_21(with_and_without_postgis):
+def test_ogr_pg_21():
 
     if gdaltest.pg_ds is None or not gdaltest.pg_has_postgis:
         pytest.skip()
@@ -965,7 +965,7 @@ def test_ogr_pg_21(with_and_without_postgis):
 # Check if the sub geometries of TIN and POLYHEDRALSURFACE are valid
 
 
-def test_ogr_pg_21_subgeoms(with_and_without_postgis):
+def test_ogr_pg_21_subgeoms():
 
     if gdaltest.pg_ds is None or not gdaltest.pg_has_postgis:
         pytest.skip()
@@ -1005,9 +1005,9 @@ def test_ogr_pg_21_subgeoms(with_and_without_postgis):
 # Check if the 3d geometries of TIN, Triangle and POLYHEDRALSURFACE are valid
 
 
-def test_ogr_pg_21_3d_geometries():
+def test_ogr_pg_21_3d_geometries(with_and_without_postgis):
 
-    if gdaltest.pg_ds is None:
+    if gdaltest.pg_ds is None or not with_and_without_postgis:
         pytest.skip()
 
     gdaltest.pg_ds = ogr.Open('PG:' + gdaltest.pg_connection_string, update=1)
@@ -1051,7 +1051,7 @@ def test_ogr_pg_21_3d_geometries():
 # This test checks if schema support and schema name quoting works well.
 
 
-def test_ogr_pg_22(with_and_without_postgis):
+def test_ogr_pg_22():
 
     if gdaltest.pg_ds is None:
         pytest.skip()
@@ -1106,7 +1106,7 @@ def test_ogr_pg_22(with_and_without_postgis):
 # Create table with all data types
 
 
-def test_ogr_pg_23(with_and_without_postgis):
+def test_ogr_pg_23():
 
     if gdaltest.pg_ds is None:
         pytest.skip()
@@ -1278,7 +1278,7 @@ def check_value_23(layer_defn, feat):
 # Test with PG: connection
 
 
-def test_ogr_pg_24(with_and_without_postgis):
+def test_ogr_pg_24():
 
     if gdaltest.pg_ds is None:
         pytest.skip()
@@ -1300,7 +1300,7 @@ def test_ogr_pg_24(with_and_without_postgis):
 # Test with PG: connection and SELECT query
 
 
-def test_ogr_pg_25(with_and_without_postgis):
+def test_ogr_pg_25():
 
     if gdaltest.pg_ds is None:
         pytest.skip()
@@ -1324,7 +1324,7 @@ def test_ogr_pg_25(with_and_without_postgis):
 # Duplicate all data types in INSERT mode
 
 
-def test_ogr_pg_28(with_and_without_postgis):
+def test_ogr_pg_28():
 
     if gdaltest.pg_ds is None:
         pytest.skip()
@@ -1370,7 +1370,7 @@ def test_ogr_pg_28(with_and_without_postgis):
 # Test with PG: connection
 
 
-def test_ogr_pg_29(with_and_without_postgis):
+def test_ogr_pg_29():
 
     if gdaltest.pg_ds is None:
         pytest.skip()
@@ -1397,7 +1397,7 @@ def test_ogr_pg_29(with_and_without_postgis):
 # Duplicate all data types in PG_USE_COPY mode
 
 
-def test_ogr_pg_30(with_and_without_postgis):
+def test_ogr_pg_30():
 
     if gdaltest.pg_ds is None:
         pytest.skip()
@@ -1440,7 +1440,7 @@ def test_ogr_pg_30(with_and_without_postgis):
 ###############################################################################
 # Test the tables= connection string option
 
-def test_ogr_pg_31(with_and_without_postgis):
+def test_ogr_pg_31():
 
     if gdaltest.pg_ds is None:
         pytest.skip()
@@ -1475,7 +1475,7 @@ def test_ogr_pg_31(with_and_without_postgis):
 # Test approximate srtext (#2123, #3508)
 
 
-def test_ogr_pg_32(with_and_without_postgis):
+def test_ogr_pg_32():
 
     if gdaltest.pg_ds is None or not gdaltest.pg_has_postgis:
         pytest.skip()
@@ -1601,7 +1601,7 @@ def test_ogr_pg_32(with_and_without_postgis):
 # Test encoding as UTF8
 
 
-def test_ogr_pg_33(with_and_without_postgis):
+def test_ogr_pg_33():
 
     if gdaltest.pg_ds is None:
         pytest.skip()
@@ -1619,7 +1619,7 @@ def test_ogr_pg_33(with_and_without_postgis):
 # Test encoding as Latin1
 
 
-def test_ogr_pg_34(with_and_without_postgis):
+def test_ogr_pg_34():
 
     if gdaltest.pg_ds is None:
         pytest.skip()
@@ -1653,7 +1653,7 @@ def test_ogr_pg_34(with_and_without_postgis):
 ###############################################################################
 # Test for buffer overflows
 
-def test_ogr_pg_35(with_and_without_postgis):
+def test_ogr_pg_35():
 
     if gdaltest.pg_ds is None:
         pytest.skip()
@@ -1684,7 +1684,7 @@ def test_ogr_pg_35(with_and_without_postgis):
 # Test support for inherited tables : tables inherited from a Postgis Table
 
 
-def test_ogr_pg_36(with_and_without_postgis):
+def test_ogr_pg_36():
 
     if gdaltest.pg_ds is None:
         pytest.skip()
@@ -1728,7 +1728,7 @@ def test_ogr_pg_36(with_and_without_postgis):
     ds.Destroy()
 
 
-def test_ogr_pg_36_bis(with_and_without_postgis):
+def test_ogr_pg_36_bis():
 
     if gdaltest.pg_ds is None:
         pytest.skip()
@@ -1748,7 +1748,7 @@ def test_ogr_pg_36_bis(with_and_without_postgis):
 # Test support for inherited tables : Postgis table inherited from a non-Postgis table
 
 
-def test_ogr_pg_37(with_and_without_postgis):
+def test_ogr_pg_37():
 
     if gdaltest.pg_ds is None or not gdaltest.pg_has_postgis:
         pytest.skip()
@@ -1773,7 +1773,7 @@ def test_ogr_pg_37(with_and_without_postgis):
 # Test support for multiple geometry columns (RFC 41)
 
 
-def test_ogr_pg_38(with_and_without_postgis):
+def test_ogr_pg_38():
     if gdaltest.pg_ds is None or not gdaltest.pg_has_postgis:
         pytest.skip()
 
@@ -1829,7 +1829,7 @@ def test_ogr_pg_38(with_and_without_postgis):
 # Test support for named views
 
 
-def test_ogr_pg_39(with_and_without_postgis):
+def test_ogr_pg_39():
     if gdaltest.pg_ds is None:
         pytest.skip()
 
@@ -1897,7 +1897,7 @@ def test_ogr_pg_39(with_and_without_postgis):
 # Test GetFeature() with an invalid id
 
 
-def test_ogr_pg_40(with_and_without_postgis):
+def test_ogr_pg_40():
     if gdaltest.pg_ds is None:
         pytest.skip()
 
@@ -1908,7 +1908,7 @@ def test_ogr_pg_40(with_and_without_postgis):
 # Test active_schema= option
 
 
-def test_ogr_pg_41(with_and_without_postgis):
+def test_ogr_pg_41():
     if gdaltest.pg_ds is None:
         pytest.skip()
 
@@ -1954,7 +1954,7 @@ def test_ogr_pg_41(with_and_without_postgis):
 # Test schemas= option
 
 
-def test_ogr_pg_42(with_and_without_postgis):
+def test_ogr_pg_42():
     if gdaltest.pg_ds is None:
         pytest.skip()
 
@@ -1994,7 +1994,7 @@ def test_ogr_pg_42(with_and_without_postgis):
 ###############################################################################
 # Test schemas= option
 
-def test_ogr_pg_43(with_and_without_postgis):
+def test_ogr_pg_43():
     if gdaltest.pg_ds is None:
         pytest.skip()
 
@@ -2019,7 +2019,7 @@ def test_ogr_pg_43(with_and_without_postgis):
 # Test for table and column names that need quoting (#2945)
 
 
-def test_ogr_pg_44(with_and_without_postgis):
+def test_ogr_pg_44():
 
     if gdaltest.pg_ds is None:
         pytest.skip()
@@ -2060,7 +2060,7 @@ def test_ogr_pg_44(with_and_without_postgis):
 # Test SetNextByIndex (#3117)
 
 
-def test_ogr_pg_45(with_and_without_postgis):
+def test_ogr_pg_45():
 
     if gdaltest.pg_ds is None:
         pytest.skip()
@@ -2088,7 +2088,7 @@ def test_ogr_pg_45(with_and_without_postgis):
 # with SetFeature()
 
 
-def test_ogr_pg_46(with_and_without_postgis):
+def test_ogr_pg_46():
 
     if gdaltest.pg_ds is None:
         pytest.skip()
@@ -2144,7 +2144,7 @@ def test_ogr_pg_46(with_and_without_postgis):
 # Test that we can handle 'geography' column type introduced in PostGIS 1.5
 
 
-def test_ogr_pg_47(with_and_without_postgis):
+def test_ogr_pg_47():
 
     if gdaltest.pg_ds is None:
         pytest.skip()
@@ -2248,7 +2248,7 @@ def test_ogr_pg_47(with_and_without_postgis):
 # PostGIS DB.
 
 
-def test_ogr_pg_48(with_and_without_postgis):
+def test_ogr_pg_48():
 
     if gdaltest.pg_ds is None:
         pytest.skip()
@@ -2312,7 +2312,7 @@ def test_ogr_pg_48(with_and_without_postgis):
 # Go on with previous test but set PGSQL_OGR_FID this time
 
 
-def test_ogr_pg_49(with_and_without_postgis):
+def test_ogr_pg_49():
 
     if gdaltest.pg_ds is None:
         pytest.skip()
@@ -2338,7 +2338,7 @@ def test_ogr_pg_49(with_and_without_postgis):
 # This tests writing using COPY and INSERT
 
 
-def test_ogr_pg_50(with_and_without_postgis):
+def test_ogr_pg_50():
 
     if gdaltest.pg_ds is None:
         pytest.skip()
@@ -2399,7 +2399,7 @@ def test_ogr_pg_50(with_and_without_postgis):
 # Run test_ogrsf
 
 
-def test_ogr_pg_51(with_and_without_postgis):
+def test_ogr_pg_51():
 
     if gdaltest.pg_ds is None:
         pytest.skip()
@@ -2416,7 +2416,7 @@ def test_ogr_pg_51(with_and_without_postgis):
 # Run test_ogrsf with -sql
 
 
-def test_ogr_pg_52(with_and_without_postgis):
+def test_ogr_pg_52():
 
     if gdaltest.pg_ds is None:
         pytest.skip()
@@ -2433,12 +2433,12 @@ def test_ogr_pg_52(with_and_without_postgis):
 # Test creating a layer with explicitly wkbNone geometry type.
 
 
-def test_ogr_pg_53(with_and_without_postgis):
+def test_ogr_pg_53():
 
     if gdaltest.pg_ds is None:
         pytest.skip()
 
-    lyr = gdaltest.pg_ds.CreateLayer('no_geometry_table', geom_type=ogr.wkbNone)
+    lyr = gdaltest.pg_ds.CreateLayer('no_geometry_table', geom_type=ogr.wkbNone, options=['OVERWRITE=YES'])
     field_defn = ogr.FieldDefn('foo')
     lyr.CreateField(field_defn)
 
@@ -2486,7 +2486,7 @@ def test_ogr_pg_53(with_and_without_postgis):
 # Check that we can overwrite a non-spatial geometry table (#4012)
 
 
-def test_ogr_pg_53_bis(with_and_without_postgis):
+def test_ogr_pg_53_bis():
     import test_cli_utilities
     if test_cli_utilities.get_ogr2ogr_path() is None:
         pytest.skip()
@@ -2508,7 +2508,7 @@ def test_ogr_pg_53_bis(with_and_without_postgis):
 # Test reading AsEWKB()
 
 
-def test_ogr_pg_54(with_and_without_postgis):
+def test_ogr_pg_54():
 
     if gdaltest.pg_ds is None:
         pytest.skip()
@@ -2530,7 +2530,7 @@ def test_ogr_pg_54(with_and_without_postgis):
 # Test reading geoms as Base64 encoded strings
 
 
-def test_ogr_pg_55(with_and_without_postgis):
+def test_ogr_pg_55():
 
     if gdaltest.pg_ds is None:
         pytest.skip()
@@ -2560,7 +2560,7 @@ def test_ogr_pg_55(with_and_without_postgis):
 # non-spatial table and without FID in COPY mode (#4040)
 
 
-def test_ogr_pg_56(with_and_without_postgis):
+def test_ogr_pg_56():
 
     if gdaltest.pg_ds is None:
         pytest.skip()
@@ -2641,7 +2641,7 @@ def test_ogr_pg_56(with_and_without_postgis):
 # Test inserting an empty feature
 
 
-def test_ogr_pg_57(with_and_without_postgis):
+def test_ogr_pg_57():
 
     if gdaltest.pg_ds is None:
         pytest.skip()
@@ -2658,7 +2658,7 @@ def test_ogr_pg_57(with_and_without_postgis):
 # Test RFC35
 
 
-def test_ogr_pg_58(with_and_without_postgis):
+def test_ogr_pg_58():
 
     if gdaltest.pg_ds is None:
         pytest.skip()
@@ -2707,7 +2707,7 @@ def test_ogr_pg_58(with_and_without_postgis):
 # but which is not the layer name.
 
 
-def test_ogr_pg_59(with_and_without_postgis):
+def test_ogr_pg_59():
 
     if gdaltest.pg_ds is None:
         pytest.skip()
@@ -2733,7 +2733,7 @@ def test_ogr_pg_59(with_and_without_postgis):
 # non-incrementing PK.
 
 
-def test_ogr_pg_60(with_and_without_postgis):
+def test_ogr_pg_60():
 
     if gdaltest.pg_ds is None:
         pytest.skip()
@@ -2762,7 +2762,7 @@ def test_ogr_pg_60(with_and_without_postgis):
 # Test insertion of features with FID set in COPY mode (#4495)
 
 
-def test_ogr_pg_61(with_and_without_postgis):
+def test_ogr_pg_61():
 
     if gdaltest.pg_ds is None:
         pytest.skip()
@@ -2806,7 +2806,7 @@ def test_ogr_pg_61(with_and_without_postgis):
 # Test ExecuteSQL() and getting SRID of the request (#4699)
 
 
-def test_ogr_pg_62(with_and_without_postgis):
+def test_ogr_pg_62():
 
     if gdaltest.pg_ds is None:
         pytest.skip()
@@ -2835,7 +2835,7 @@ def test_ogr_pg_62(with_and_without_postgis):
 # Test COLUMN_TYPES layer creation option (#4788)
 
 
-def test_ogr_pg_63(with_and_without_postgis):
+def test_ogr_pg_63():
 
     if gdaltest.pg_ds is None:
         pytest.skip()
@@ -2870,7 +2870,7 @@ def test_ogr_pg_63(with_and_without_postgis):
 # Test OGR_TRUNCATE config. option (#5091)
 
 
-def test_ogr_pg_64(with_and_without_postgis):
+def test_ogr_pg_64():
 
     if gdaltest.pg_ds is None:
         pytest.skip()
@@ -2905,7 +2905,7 @@ def test_ogr_pg_64(with_and_without_postgis):
 # Test RFC 41
 
 
-def test_ogr_pg_65(with_and_without_postgis):
+def test_ogr_pg_65():
 
     if gdaltest.pg_ds is None:
         pytest.skip()
@@ -3022,7 +3022,7 @@ def test_ogr_pg_65(with_and_without_postgis):
 # Run test_ogrsf
 
 
-def test_ogr_pg_66(with_and_without_postgis):
+def test_ogr_pg_66():
 
     if gdaltest.pg_ds is None:
         pytest.skip()
@@ -3042,7 +3042,7 @@ def test_ogr_pg_66(with_and_without_postgis):
 # Test retrieving SRID from values (#5131)
 
 
-def test_ogr_pg_67(with_and_without_postgis):
+def test_ogr_pg_67():
 
     if gdaltest.pg_ds is None:
         pytest.skip()
@@ -3083,7 +3083,7 @@ def test_ogr_pg_67(with_and_without_postgis):
 # Test retrieving SRID from values even if we don't have select rights on geometry_columns (#5131)
 
 
-def test_ogr_pg_68(with_and_without_postgis):
+def test_ogr_pg_68():
 
     if gdaltest.pg_ds is None:
         pytest.skip()
@@ -3135,7 +3135,7 @@ def has_run_load_tables(ds):
     return int(ds.GetMetadataItem("bHasLoadTables", "_DEBUG_"))
 
 
-def test_ogr_pg_69(with_and_without_postgis):
+def test_ogr_pg_69():
 
     if gdaltest.pg_ds is None:
         pytest.skip()
@@ -3164,7 +3164,7 @@ def test_ogr_pg_69(with_and_without_postgis):
 # Test historical non-differed creation of tables (#5547)
 
 
-def test_ogr_pg_70(with_and_without_postgis):
+def test_ogr_pg_70():
 
     if gdaltest.pg_ds is None:
         pytest.skip()
@@ -3215,7 +3215,7 @@ def test_ogr_pg_70(with_and_without_postgis):
 # Test interoperability of WKT/WKB with PostGIS.
 
 
-def test_ogr_pg_71(with_and_without_postgis):
+def test_ogr_pg_71():
 
     if gdaltest.pg_ds is None:
         pytest.skip()
@@ -3336,7 +3336,7 @@ def test_ogr_pg_71(with_and_without_postgis):
 # Test 64 bit FID
 
 
-def test_ogr_pg_72(with_and_without_postgis):
+def test_ogr_pg_72():
 
     if gdaltest.pg_ds is None:
         pytest.skip()
@@ -3388,7 +3388,7 @@ def test_ogr_pg_72(with_and_without_postgis):
 # Test not nullable fields
 
 
-def test_ogr_pg_73(with_and_without_postgis):
+def test_ogr_pg_73():
 
     if gdaltest.pg_ds is None:
         pytest.skip()
@@ -3471,7 +3471,7 @@ def test_ogr_pg_73(with_and_without_postgis):
 # Test default values
 
 
-def test_ogr_pg_74(with_and_without_postgis):
+def test_ogr_pg_74():
 
     if gdaltest.pg_ds is None:
         pytest.skip()
@@ -3608,7 +3608,7 @@ def test_ogr_pg_74(with_and_without_postgis):
 # Test creating a field with the fid name
 
 
-def test_ogr_pg_75(with_and_without_postgis):
+def test_ogr_pg_75():
 
     if gdaltest.pg_ds is None:
         pytest.skip()
@@ -3701,7 +3701,7 @@ def ogr_pg_76_get_transaction_state(ds):
             int(ds.GetMetadataItem("bUserTransactionActive", "_DEBUG_")))
 
 
-def test_ogr_pg_76(with_and_without_postgis):
+def test_ogr_pg_76():
 
     if gdaltest.pg_ds is None:
         pytest.skip()
@@ -3806,7 +3806,7 @@ def ogr_pg_76_scenario1(lyr1, lyr2):
 
 
 # Scenario 2 : a CreateFeature done in the middle of GetNextFeature(), themselves between a user transaction
-def ogr_pg_76_scenario2(lyr1, lyr2with_and_without_postgis):
+def ogr_pg_76_scenario2(lyr1, lyr2):
 
     assert gdaltest.pg_ds.StartTransaction() == 0
     (lastcmd, level, savepoint, usertransac) = ogr_pg_76_get_transaction_state(gdaltest.pg_ds)
@@ -3881,7 +3881,7 @@ def ogr_pg_76_scenario2(lyr1, lyr2with_and_without_postgis):
 # Scenario 3 : StartTransaction(), GetNextFeature(), CommitTransaction(), GetNextFeature()
 
 
-def ogr_pg_76_scenario3(lyr1, lyr2with_and_without_postgis):
+def ogr_pg_76_scenario3(lyr1, lyr2):
 
     assert gdaltest.pg_ds.StartTransaction() == 0
     (lastcmd, level, savepoint, usertransac) = ogr_pg_76_get_transaction_state(gdaltest.pg_ds)
@@ -3919,7 +3919,7 @@ def ogr_pg_76_scenario3(lyr1, lyr2with_and_without_postgis):
 # Scenario 4 : GetNextFeature(), StartTransaction(), CreateFeature(), CommitTransaction(), GetNextFeature(), ResetReading()
 
 
-def ogr_pg_76_scenario4(lyr1, lyr2with_and_without_postgis):
+def ogr_pg_76_scenario4(lyr1, lyr2):
 
     (lastcmd, level, savepoint, usertransac) = ogr_pg_76_get_transaction_state(gdaltest.pg_ds)
     assert (lastcmd, level, savepoint, usertransac) == ('', 0, 0, 0)
@@ -3978,7 +3978,7 @@ def ogr_pg_76_scenario4(lyr1, lyr2with_and_without_postgis):
 # Test ogr2ogr can insert multiple layers at once
 
 
-def test_ogr_pg_77(with_and_without_postgis):
+def test_ogr_pg_77():
     import test_cli_utilities
     if test_cli_utilities.get_ogr2ogr_path() is None:
         pytest.skip()
@@ -4032,7 +4032,7 @@ def test_ogr_pg_77(with_and_without_postgis):
 # Test manually added geometry constraints
 
 
-def test_ogr_pg_78(with_and_without_postgis):
+def test_ogr_pg_78():
 
     if gdaltest.pg_ds is None or not gdaltest.pg_has_postgis_2:
         pytest.skip()
@@ -4110,7 +4110,7 @@ def test_ogr_pg_78(with_and_without_postgis):
 # Test PRELUDE_STATEMENTS and CLOSING_STATEMENTS open options
 
 
-def test_ogr_pg_79(with_and_without_postgis):
+def test_ogr_pg_79():
 
     if gdaltest.pg_ds is None:
         pytest.skip()
@@ -4174,9 +4174,9 @@ def test_ogr_pg_79(with_and_without_postgis):
 # Test retrieving an error from ExecuteSQL() (#6194)
 
 
-def test_ogr_pg_80():
+def test_ogr_pg_80(with_and_without_postgis):
 
-    if gdaltest.pg_ds is None:
+    if gdaltest.pg_ds is None or not with_and_without_postgis:
         pytest.skip()
 
     gdal.ErrorReset()
@@ -4189,9 +4189,9 @@ def test_ogr_pg_80():
 # Test that ogr2ogr -skip properly rollbacks transactions (#6328)
 
 
-def test_ogr_pg_81():
+def test_ogr_pg_81(with_and_without_postgis):
 
-    if gdaltest.pg_ds is None:
+    if gdaltest.pg_ds is None or not with_and_without_postgis:
         pytest.skip()
 
     gdaltest.pg_ds.ReleaseResultSet(gdaltest.pg_ds.ExecuteSQL("create table ogr_pg_81_1(id varchar unique, foo varchar); SELECT AddGeometryColumn('ogr_pg_81_1','dummy',-1,'POINT',2);"))
@@ -4235,9 +4235,9 @@ def test_ogr_pg_81():
 # is not-nullable, and hence the CreateGeomField() interface is used.
 
 
-def test_ogr_pg_82():
+def test_ogr_pg_82(with_and_without_postgis):
 
-    if gdaltest.pg_ds is None or not gdaltest.pg_has_postgis:
+    if gdaltest.pg_ds is None or not gdaltest.pg_has_postgis or not with_and_without_postgis:
         pytest.skip()
 
     lyr = gdaltest.pg_ds.CreateLayer('ogr_pg_82', geom_type=ogr.wkbNone, options=['GEOMETRY_NAME=another_name'])
@@ -4248,9 +4248,9 @@ def test_ogr_pg_82():
 # Test ZM support
 
 
-def test_ogr_pg_83():
+def test_ogr_pg_83(with_and_without_postgis):
 
-    if gdaltest.pg_ds is None or not gdaltest.pg_has_postgis:
+    if gdaltest.pg_ds is None or not gdaltest.pg_has_postgis or not with_and_without_postgis:
         pytest.skip()
 
     tests = [[ogr.wkbUnknown, [], 'POINT ZM (1 2 3 4)', 'POINT (1 2)'],
@@ -4310,9 +4310,9 @@ def test_ogr_pg_83():
 # Test description
 
 
-def test_ogr_pg_84():
+def test_ogr_pg_84(with_and_without_postgis):
 
-    if gdaltest.pg_ds is None:
+    if gdaltest.pg_ds is None or not with_and_without_postgis:
         pytest.skip()
 
     ds = ogr.Open('PG:' + gdaltest.pg_connection_string, update=1)
@@ -4365,9 +4365,9 @@ def test_ogr_pg_84():
 # Test append of several layers in PG_USE_COPY mode (#6411)
 
 
-def test_ogr_pg_85():
+def test_ogr_pg_85(with_and_without_postgis):
 
-    if gdaltest.pg_ds is None:
+    if gdaltest.pg_ds is None or not with_and_without_postgis:
         pytest.skip()
 
     gdaltest.pg_ds.CreateLayer('ogr_pg_85_1')
@@ -4417,9 +4417,9 @@ def test_ogr_pg_85():
 # Test OFTBinary
 
 
-def test_ogr_pg_86():
+def test_ogr_pg_86(with_and_without_postgis):
 
-    if gdaltest.pg_ds is None:
+    if gdaltest.pg_ds is None or not with_and_without_postgis:
         pytest.skip()
 
     old_val = gdal.GetConfigOption('PG_USE_COPY')
@@ -4456,9 +4456,9 @@ def test_ogr_pg_86():
 # Test sequence updating (#7032)
 
 
-def test_ogr_pg_87():
+def test_ogr_pg_87(with_and_without_postgis):
 
-    if gdaltest.pg_ds is None:
+    if gdaltest.pg_ds is None or not with_and_without_postgis:
         pytest.skip()
 
     lyr = gdaltest.pg_ds.CreateLayer('ogr_pg_87')
@@ -4514,7 +4514,7 @@ def test_ogr_pg_json():
 #
 
 
-def test_ogr_pg_table_cleanup(with_and_without_postgis):
+def test_ogr_pg_table_cleanup():
 
     if gdaltest.pg_ds is None:
         pytest.skip()
@@ -4591,7 +4591,7 @@ def test_ogr_pg_table_cleanup(with_and_without_postgis):
     gdal.PopErrorHandler()
 
 
-def test_ogr_pg_cleanup(with_and_without_postgis):
+def test_ogr_pg_cleanup():
 
     if gdaltest.pg_ds is None:
         pytest.skip()
diff --git a/autotest/ogr/ogr_rfc35_mitab.py b/autotest/ogr/ogr_rfc35_mitab.py
index 66dac53f2c9b..a494a109b250 100755
--- a/autotest/ogr/ogr_rfc35_mitab.py
+++ b/autotest/ogr/ogr_rfc35_mitab.py
@@ -30,7 +30,6 @@
 ###############################################################################
 
 
-
 import gdaltest
 from osgeo import ogr
 from osgeo import gdal
@@ -41,19 +40,17 @@
 
 
 def CheckFileSize(src_filename):
-
     import test_py_scripts
     script_path = test_py_scripts.get_py_script('ogr2ogr')
     if script_path is None:
         pytest.skip()
 
-    test_py_scripts.run_py_script(script_path, 'ogr2ogr', '-f "MapInfo File" /vsimem/CheckFileSize.tab ' + src_filename)
+    test_py_scripts.run_py_script(script_path, 'ogr2ogr', '-f "MapInfo File" tmp/CheckFileSize.tab ' + src_filename)
     statBufSrc = gdal.VSIStatL(src_filename[0:-3] + "dat", gdal.VSI_STAT_EXISTS_FLAG | gdal.VSI_STAT_NATURE_FLAG | gdal.VSI_STAT_SIZE_FLAG)
-    statBufDst = gdal.VSIStatL('/vsimem/CheckFileSize.dat', gdal.VSI_STAT_EXISTS_FLAG | gdal.VSI_STAT_NATURE_FLAG | gdal.VSI_STAT_SIZE_FLAG)
-    ogr.GetDriverByName('MapInfo File').DeleteDataSource('/vsimem/CheckFileSize.tab')
+    statBufDst = gdal.VSIStatL('tmp/CheckFileSize.dat', gdal.VSI_STAT_EXISTS_FLAG | gdal.VSI_STAT_NATURE_FLAG | gdal.VSI_STAT_SIZE_FLAG)
+    ogr.GetDriverByName('MapInfo File').DeleteDataSource('tmp/CheckFileSize.tab')
 
-    assert statBufSrc.size == statBufDst.size, \
-        ('src_size = %d, dst_size = %d', statBufSrc.size, statBufDst.size)
+    assert statBufSrc.size == statBufDst.size
 
 ###############################################################################
 # Initiate the test file
@@ -61,7 +58,7 @@ def CheckFileSize(src_filename):
 
 def test_ogr_rfc35_mitab_1():
 
-    ds = ogr.GetDriverByName('MapInfo File').CreateDataSource('/vsimem/rfc35_test.tab')
+    ds = ogr.GetDriverByName('MapInfo File').CreateDataSource('tmp/rfc35_test.tab')
     lyr = ds.CreateLayer('rfc35_test')
 
     lyr.ReorderFields([])
@@ -143,7 +140,7 @@ def CheckColumnOrder(lyr, expected_order):
     for i, exp_order in enumerate(expected_order):
         assert lyr_defn.GetFieldDefn(i).GetName() == exp_order
 
-    
+
 
 def Check(lyr, expected_order):
 
@@ -151,7 +148,7 @@ def Check(lyr, expected_order):
 
     CheckFeatures(lyr)
 
-    ds = ogr.Open('/vsimem/rfc35_test.tab', update=1)
+    ds = ogr.Open('tmp/rfc35_test.tab', update=1)
     lyr_reopen = ds.GetLayer(0)
 
     CheckColumnOrder(lyr_reopen, expected_order)
@@ -161,7 +158,7 @@ def Check(lyr, expected_order):
 
 def test_ogr_rfc35_mitab_2():
 
-    ds = ogr.Open('/vsimem/rfc35_test.tab', update=1)
+    ds = ogr.Open('tmp/rfc35_test.tab', update=1)
     lyr = ds.GetLayer(0)
 
     assert lyr.TestCapability(ogr.OLCReorderFields) == 1
@@ -176,75 +173,51 @@ def test_ogr_rfc35_mitab_2():
 
     assert lyr.ReorderField(1, 3) == 0
     # ds = None
-    # ds = ogr.Open('/vsimem/rfc35_test.tab', update = 1)
+    # ds = ogr.Open('tmp/rfc35_test.tab', update = 1)
     # lyr = ds.GetLayer(0)
-    ret = Check(lyr, ['foo5', 'baz15', 'baw20', 'bar10'])
-    if ret != 'success':
-        gdaltest.post_reason(ret)
-        return ret
+    Check(lyr, ['foo5', 'baz15', 'baw20', 'bar10'])
 
     lyr.ReorderField(3, 1)
     # ds = None
-    # ds = ogr.Open('/vsimem/rfc35_test.tab', update = 1)
+    # ds = ogr.Open('tmp/rfc35_test.tab', update = 1)
     # lyr = ds.GetLayer(0)
-    ret = Check(lyr, ['foo5', 'bar10', 'baz15', 'baw20'])
-    if ret != 'success':
-        gdaltest.post_reason(ret)
-        return ret
+    Check(lyr, ['foo5', 'bar10', 'baz15', 'baw20'])
 
     lyr.ReorderField(0, 2)
     # ds = None
-    # ds = ogr.Open('/vsimem/rfc35_test.tab', update = 1)
+    # ds = ogr.Open('tmp/rfc35_test.tab', update = 1)
     # lyr = ds.GetLayer(0)
-    ret = Check(lyr, ['bar10', 'baz15', 'foo5', 'baw20'])
-    if ret != 'success':
-        gdaltest.post_reason(ret)
-        return ret
+    Check(lyr, ['bar10', 'baz15', 'foo5', 'baw20'])
 
     lyr.ReorderField(2, 0)
     # ds = None
-    # ds = ogr.Open('/vsimem/rfc35_test.tab', update = 1)
+    # ds = ogr.Open('tmp/rfc35_test.tab', update = 1)
     # lyr = ds.GetLayer(0)
-    ret = Check(lyr, ['foo5', 'bar10', 'baz15', 'baw20'])
-    if ret != 'success':
-        gdaltest.post_reason(ret)
-        return ret
+    Check(lyr, ['foo5', 'bar10', 'baz15', 'baw20'])
 
     lyr.ReorderField(0, 1)
     # ds = None
-    # ds = ogr.Open('/vsimem/rfc35_test.tab', update = 1)
+    # ds = ogr.Open('tmp/rfc35_test.tab', update = 1)
     # lyr = ds.GetLayer(0)
-    ret = Check(lyr, ['bar10', 'foo5', 'baz15', 'baw20'])
-    if ret != 'success':
-        gdaltest.post_reason(ret)
-        return ret
+    Check(lyr, ['bar10', 'foo5', 'baz15', 'baw20'])
 
     lyr.ReorderField(1, 0)
     # ds = None
-    # ds = ogr.Open('/vsimem/rfc35_test.tab', update = 1)
+    # ds = ogr.Open('tmp/rfc35_test.tab', update = 1)
     # lyr = ds.GetLayer(0)
-    ret = Check(lyr, ['foo5', 'bar10', 'baz15', 'baw20'])
-    if ret != 'success':
-        gdaltest.post_reason(ret)
-        return ret
+    Check(lyr, ['foo5', 'bar10', 'baz15', 'baw20'])
 
     lyr.ReorderFields([3, 2, 1, 0])
     # ds = None
-    # ds = ogr.Open('/vsimem/rfc35_test.tab', update = 1)
+    # ds = ogr.Open('tmp/rfc35_test.tab', update = 1)
     # lyr = ds.GetLayer(0)
-    ret = Check(lyr, ['baw20', 'baz15', 'bar10', 'foo5'])
-    if ret != 'success':
-        gdaltest.post_reason(ret)
-        return ret
+    Check(lyr, ['baw20', 'baz15', 'bar10', 'foo5'])
 
     lyr.ReorderFields([3, 2, 1, 0])
     # ds = None
-    # ds = ogr.Open('/vsimem/rfc35_test.tab', update = 1)
+    # ds = ogr.Open('tmp/rfc35_test.tab', update = 1)
     # lyr = ds.GetLayer(0)
-    ret = Check(lyr, ['foo5', 'bar10', 'baz15', 'baw20'])
-    if ret != 'success':
-        gdaltest.post_reason(ret)
-        return ret
+    Check(lyr, ['foo5', 'bar10', 'baz15', 'baw20'])
 
     gdal.PushErrorHandler('CPLQuietErrorHandler')
     ret = lyr.ReorderFields([0, 0, 0, 0])
@@ -253,27 +226,21 @@ def test_ogr_rfc35_mitab_2():
 
     # ds = None
 
-    # ds = ogr.Open('/vsimem/rfc35_test.tab', update = 1)
+    # ds = ogr.Open('tmp/rfc35_test.tab', update = 1)
     lyr = ds.GetLayer(0)
 
-    ret = CheckColumnOrder(lyr, ['foo5', 'bar10', 'baz15', 'baw20'])
-    if ret != 'success':
-        gdaltest.post_reason(ret)
-        return ret
+    CheckColumnOrder(lyr, ['foo5', 'bar10', 'baz15', 'baw20'])
+
+    CheckFeatures(lyr)
 
-    ret = CheckFeatures(lyr)
-    if ret != 'success':
-        gdaltest.post_reason(ret)
-        return ret
 
-    
 ###############################################################################
 # Test AlterFieldDefn() for change of name and width
 
 
 def test_ogr_rfc35_mitab_3():
 
-    ds = ogr.Open('/vsimem/rfc35_test.tab', update=1)
+    ds = ogr.Open('tmp/rfc35_test.tab', update=1)
     lyr = ds.GetLayer(0)
 
     fd = ogr.FieldDefn("baz25", ogr.OFTString)
@@ -293,10 +260,7 @@ def test_ogr_rfc35_mitab_3():
 
     lyr.AlterFieldDefn(lyr_defn.GetFieldIndex("baz15"), fd, ogr.ALTER_ALL_FLAG)
 
-    ret = CheckFeatures(lyr, field3='baz25')
-    if ret != 'success':
-        gdaltest.post_reason(ret)
-        return ret
+    CheckFeatures(lyr, field3='baz25')
 
     fd = ogr.FieldDefn("baz5", ogr.OFTString)
     fd.SetWidth(5)
@@ -304,20 +268,17 @@ def test_ogr_rfc35_mitab_3():
     lyr_defn = lyr.GetLayerDefn()
     lyr.AlterFieldDefn(lyr_defn.GetFieldIndex("baz25"), fd, ogr.ALTER_ALL_FLAG)
 
-    ret = CheckFeatures(lyr, field3='baz5')
-    if ret != 'success':
-        gdaltest.post_reason(ret)
-        return ret
+    CheckFeatures(lyr, field3='baz5')
 
     ds = None
 
-    ds = ogr.Open('/vsimem/rfc35_test.tab', update=1)
+    ds = ogr.Open('tmp/rfc35_test.tab', update=1)
     lyr = ds.GetLayer(0)
     lyr_defn = lyr.GetLayerDefn()
     fld_defn = lyr_defn.GetFieldDefn(lyr_defn.GetFieldIndex('baz5'))
     assert fld_defn.GetWidth() == 5
 
-    ret = CheckFeatures(lyr, field3='baz5')
+    CheckFeatures(lyr, field3='baz5')
 
 ###############################################################################
 # Test AlterFieldDefn() for change of type
@@ -325,7 +286,7 @@ def test_ogr_rfc35_mitab_3():
 
 def test_ogr_rfc35_mitab_4():
 
-    ds = ogr.Open('/vsimem/rfc35_test.tab', update=1)
+    ds = ogr.Open('tmp/rfc35_test.tab', update=1)
     lyr = ds.GetLayer(0)
     lyr_defn = lyr.GetLayerDefn()
 
@@ -353,10 +314,7 @@ def test_ogr_rfc35_mitab_4():
     assert feat.GetField("intfield") == 12345
     feat = None
 
-    ret = CheckFeatures(lyr, field3='baz5')
-    if ret != 'success':
-        gdaltest.post_reason(ret)
-        return ret
+    CheckFeatures(lyr, field3='baz5')
 
     if False:  # pylint: disable=using-constant-test
         fd.SetWidth(5)
@@ -367,15 +325,12 @@ def test_ogr_rfc35_mitab_4():
         assert feat.GetField("intfield") == 12345
         feat = None
 
-        ret = CheckFeatures(lyr, field3='baz5')
-        if ret != 'success':
-            gdaltest.post_reason(ret)
-            return ret
+        CheckFeatures(lyr, field3='baz5')
 
     ds = None
 
     if False:  # pylint: disable=using-constant-test
-        ds = ogr.Open('/vsimem/rfc35_test.tab', update=1)
+        ds = ogr.Open('tmp/rfc35_test.tab', update=1)
         lyr = ds.GetLayer(0)
         lyr_defn = lyr.GetLayerDefn()
 
@@ -387,20 +342,14 @@ def test_ogr_rfc35_mitab_4():
         assert feat.GetField("intfield") == 1234
         feat = None
 
-        ret = CheckFeatures(lyr, field3='baz5')
-        if ret != 'success':
-            gdaltest.post_reason(ret)
-            return ret
+        CheckFeatures(lyr, field3='baz5')
 
         ds = None
 
         # Check that the file size has decreased after column shrinking
-        ret = CheckFileSize('/vsimem/rfc35_test.tab')
-        if ret == 'fail':
-            gdaltest.post_reason(ret)
-            return ret
+        CheckFileSize('tmp/rfc35_test.tab')
 
-    ds = ogr.Open('/vsimem/rfc35_test.tab', update=1)
+    ds = ogr.Open('tmp/rfc35_test.tab', update=1)
     lyr = ds.GetLayer(0)
     lyr_defn = lyr.GetLayerDefn()
 
@@ -413,14 +362,11 @@ def test_ogr_rfc35_mitab_4():
     assert feat.GetField("oldintfld") == '12345'
     feat = None
 
-    ret = CheckFeatures(lyr, field3='baz5')
-    if ret != 'success':
-        gdaltest.post_reason(ret)
-        return ret
+    CheckFeatures(lyr, field3='baz5')
 
     ds = None
 
-    ds = ogr.Open('/vsimem/rfc35_test.tab', update=1)
+    ds = ogr.Open('tmp/rfc35_test.tab', update=1)
     lyr = ds.GetLayer(0)
     lyr_defn = lyr.GetLayerDefn()
 
@@ -429,10 +375,7 @@ def test_ogr_rfc35_mitab_4():
     assert feat.GetField("oldintfld") == '12345'
     feat = None
 
-    ret = CheckFeatures(lyr, field3='baz5')
-    if ret != 'success':
-        gdaltest.post_reason(ret)
-        return ret
+    CheckFeatures(lyr, field3='baz5')
 
     lyr.DeleteField(lyr_defn.GetFieldIndex("oldintfld"))
 
@@ -457,14 +400,11 @@ def test_ogr_rfc35_mitab_4():
     assert feat.GetField("oldintfld") == '98765'
     feat = None
 
-    ret = CheckFeatures(lyr, field3='baz5')
-    if ret != 'success':
-        gdaltest.post_reason(ret)
-        return ret
+    CheckFeatures(lyr, field3='baz5')
 
     ds = None
 
-    ds = ogr.Open('/vsimem/rfc35_test.tab', update=1)
+    ds = ogr.Open('tmp/rfc35_test.tab', update=1)
     lyr = ds.GetLayer(0)
     lyr_defn = lyr.GetLayerDefn()
 
@@ -473,19 +413,16 @@ def test_ogr_rfc35_mitab_4():
     assert feat.GetField("oldintfld") == '98765'
     feat = None
 
-    ret = CheckFeatures(lyr, field3='baz5')
-    if ret != 'success':
-        gdaltest.post_reason(ret)
-        return ret
+    CheckFeatures(lyr, field3='baz5')
+
 
-    
 ###############################################################################
 # Test DeleteField()
 
 
 def test_ogr_rfc35_mitab_5():
 
-    ds = ogr.Open('/vsimem/rfc35_test.tab', update=1)
+    ds = ogr.Open('tmp/rfc35_test.tab', update=1)
     lyr = ds.GetLayer(0)
     lyr_defn = lyr.GetLayerDefn()
 
@@ -503,36 +440,27 @@ def test_ogr_rfc35_mitab_5():
     gdal.PopErrorHandler()
     assert ret != 0
 
-    ret = CheckFeatures(lyr, field3='baz5')
-    if ret != 'success':
-        gdaltest.post_reason(ret)
-        return ret
+    CheckFeatures(lyr, field3='baz5')
 
     assert lyr.DeleteField(lyr_defn.GetFieldIndex('baw20')) == 0
 
     ds = None
 
     # Check that the file size has decreased after column removing
-    ret = CheckFileSize('/vsimem/rfc35_test.tab')
+    CheckFileSize('tmp/rfc35_test.tab')
     if ret == 'fail':
         gdaltest.post_reason(ret)
         return ret
 
-    ds = ogr.Open('/vsimem/rfc35_test.tab', update=1)
+    ds = ogr.Open('tmp/rfc35_test.tab', update=1)
     lyr = ds.GetLayer(0)
     lyr_defn = lyr.GetLayerDefn()
 
-    ret = CheckFeatures(lyr, field3='baz5', field4=None)
-    if ret != 'success':
-        gdaltest.post_reason(ret)
-        return ret
+    CheckFeatures(lyr, field3='baz5', field4=None)
 
     assert lyr.DeleteField(lyr_defn.GetFieldIndex('baz5')) == 0
 
-    ret = CheckFeatures(lyr, field3=None, field4=None)
-    if ret != 'success':
-        gdaltest.post_reason(ret)
-        return ret
+    CheckFeatures(lyr, field3=None, field4=None)
 
     assert lyr.DeleteField(lyr_defn.GetFieldIndex('foo5')) == 0
 
@@ -542,30 +470,24 @@ def test_ogr_rfc35_mitab_5():
     gdal.PopErrorHandler()
     assert ret != 0
 
-    ret = CheckFeatures(lyr, field1=None, field2=None, field3=None, field4=None)
-    if ret != 'success':
-        gdaltest.post_reason(ret)
-        return ret
+    CheckFeatures(lyr, field1=None, field2=None, field3=None, field4=None)
 
     ds = None
 
-    ds = ogr.Open('/vsimem/rfc35_test.tab', update=1)
+    ds = ogr.Open('tmp/rfc35_test.tab', update=1)
     lyr = ds.GetLayer(0)
     lyr_defn = lyr.GetLayerDefn()
 
-    ret = CheckFeatures(lyr, field1=None, field2=None, field3=None, field4=None)
-    if ret != 'success':
-        gdaltest.post_reason(ret)
-        return ret
+    CheckFeatures(lyr, field1=None, field2=None, field3=None, field4=None)
+
 
-    
 ###############################################################################
 # Initiate the test file
 
 
 def test_ogr_rfc35_mitab_cleanup():
 
-    ogr.GetDriverByName('MapInfo File').DeleteDataSource('/vsimem/rfc35_test.tab')
+    ogr.GetDriverByName('MapInfo File').DeleteDataSource('tmp/rfc35_test.tab')
 
 
 
diff --git a/autotest/ogr/ogr_rfc35_shape.py b/autotest/ogr/ogr_rfc35_shape.py
index 54b1b85bfe3f..6ab987455d46 100755
--- a/autotest/ogr/ogr_rfc35_shape.py
+++ b/autotest/ogr/ogr_rfc35_shape.py
@@ -30,8 +30,6 @@
 ###############################################################################
 
 
-
-import gdaltest
 from osgeo import ogr
 from osgeo import gdal
 import pytest
@@ -39,7 +37,6 @@
 ###############################################################################
 #
 
-
 def CheckFileSize(src_filename):
 
     import test_py_scripts
@@ -47,10 +44,10 @@ def CheckFileSize(src_filename):
     if script_path is None:
         pytest.skip()
 
-    test_py_scripts.run_py_script(script_path, 'ogr2ogr', '/vsimem/CheckFileSize.dbf ' + src_filename)
+    test_py_scripts.run_py_script(script_path, 'ogr2ogr', 'tmp/CheckFileSize.dbf ' + src_filename)
     statBufSrc = gdal.VSIStatL(src_filename, gdal.VSI_STAT_EXISTS_FLAG | gdal.VSI_STAT_NATURE_FLAG | gdal.VSI_STAT_SIZE_FLAG)
-    statBufDst = gdal.VSIStatL('/vsimem/CheckFileSize.dbf', gdal.VSI_STAT_EXISTS_FLAG | gdal.VSI_STAT_NATURE_FLAG | gdal.VSI_STAT_SIZE_FLAG)
-    ogr.GetDriverByName('ESRI Shapefile').DeleteDataSource('/vsimem/CheckFileSize.dbf')
+    statBufDst = gdal.VSIStatL('tmp/CheckFileSize.dbf', gdal.VSI_STAT_EXISTS_FLAG | gdal.VSI_STAT_NATURE_FLAG | gdal.VSI_STAT_SIZE_FLAG)
+    ogr.GetDriverByName('ESRI Shapefile').DeleteDataSource('tmp/CheckFileSize.dbf')
 
     assert statBufSrc.size == statBufDst.size, \
         ('src_size = %d, dst_size = %d', statBufSrc.size, statBufDst.size)
@@ -61,7 +58,7 @@ def CheckFileSize(src_filename):
 
 def test_ogr_rfc35_shape_1():
 
-    ds = ogr.GetDriverByName('ESRI Shapefile').CreateDataSource('/vsimem/rfc35_test.dbf')
+    ds = ogr.GetDriverByName('ESRI Shapefile').CreateDataSource('tmp/rfc35_test.dbf')
     lyr = ds.CreateLayer('rfc35_test')
 
     lyr.ReorderFields([])
@@ -151,7 +148,7 @@ def Check(lyr, expected_order):
 
     CheckFeatures(lyr)
 
-    ds = ogr.Open('/vsimem/rfc35_test.dbf', update=1)
+    ds = ogr.Open('tmp/rfc35_test.dbf', update=1)
     lyr_reopen = ds.GetLayer(0)
 
     CheckColumnOrder(lyr_reopen, expected_order)
@@ -161,7 +158,7 @@ def Check(lyr, expected_order):
 
 def test_ogr_rfc35_shape_2():
 
-    ds = ogr.Open('/vsimem/rfc35_test.dbf', update=1)
+    ds = ogr.Open('tmp/rfc35_test.dbf', update=1)
     lyr = ds.GetLayer(0)
 
     assert lyr.TestCapability(ogr.OLCReorderFields) == 1
@@ -175,28 +172,28 @@ def test_ogr_rfc35_shape_2():
     feat = None
 
     assert lyr.ReorderField(1, 3) == 0
-    ret = Check(lyr, ['foo5', 'baz15', 'baw20', 'bar10'])
+    Check(lyr, ['foo5', 'baz15', 'baw20', 'bar10'])
 
     lyr.ReorderField(3, 1)
-    ret = Check(lyr, ['foo5', 'bar10', 'baz15', 'baw20'])
+    Check(lyr, ['foo5', 'bar10', 'baz15', 'baw20'])
 
     lyr.ReorderField(0, 2)
-    ret = Check(lyr, ['bar10', 'baz15', 'foo5', 'baw20'])
+    Check(lyr, ['bar10', 'baz15', 'foo5', 'baw20'])
 
     lyr.ReorderField(2, 0)
-    ret = Check(lyr, ['foo5', 'bar10', 'baz15', 'baw20'])
+    Check(lyr, ['foo5', 'bar10', 'baz15', 'baw20'])
 
     lyr.ReorderField(0, 1)
-    ret = Check(lyr, ['bar10', 'foo5', 'baz15', 'baw20'])
+    Check(lyr, ['bar10', 'foo5', 'baz15', 'baw20'])
 
     lyr.ReorderField(1, 0)
-    ret = Check(lyr, ['foo5', 'bar10', 'baz15', 'baw20'])
+    Check(lyr, ['foo5', 'bar10', 'baz15', 'baw20'])
 
     lyr.ReorderFields([3, 2, 1, 0])
-    ret = Check(lyr, ['baw20', 'baz15', 'bar10', 'foo5'])
+    Check(lyr, ['baw20', 'baz15', 'bar10', 'foo5'])
 
     lyr.ReorderFields([3, 2, 1, 0])
-    ret = Check(lyr, ['foo5', 'bar10', 'baz15', 'baw20'])
+    Check(lyr, ['foo5', 'bar10', 'baz15', 'baw20'])
 
     gdal.PushErrorHandler('CPLQuietErrorHandler')
     ret = lyr.ReorderFields([0, 0, 0, 0])
@@ -205,12 +202,12 @@ def test_ogr_rfc35_shape_2():
 
     ds = None
 
-    ds = ogr.Open('/vsimem/rfc35_test.dbf', update=1)
+    ds = ogr.Open('tmp/rfc35_test.dbf', update=1)
     lyr = ds.GetLayer(0)
 
-    ret = CheckColumnOrder(lyr, ['foo5', 'bar10', 'baz15', 'baw20'])
+    CheckColumnOrder(lyr, ['foo5', 'bar10', 'baz15', 'baw20'])
 
-    ret = CheckFeatures(lyr)
+    CheckFeatures(lyr)
 
 ###############################################################################
 # Test AlterFieldDefn() for change of name and width
@@ -218,7 +215,7 @@ def test_ogr_rfc35_shape_2():
 
 def test_ogr_rfc35_shape_3():
 
-    ds = ogr.Open('/vsimem/rfc35_test.dbf', update=1)
+    ds = ogr.Open('tmp/rfc35_test.dbf', update=1)
     lyr = ds.GetLayer(0)
 
     fd = ogr.FieldDefn("baz25", ogr.OFTString)
@@ -238,7 +235,7 @@ def test_ogr_rfc35_shape_3():
 
     lyr.AlterFieldDefn(lyr_defn.GetFieldIndex("baz15"), fd, ogr.ALTER_ALL_FLAG)
 
-    ret = CheckFeatures(lyr, field3='baz25')
+    CheckFeatures(lyr, field3='baz25')
 
     fd = ogr.FieldDefn("baz5", ogr.OFTString)
     fd.SetWidth(5)
@@ -246,17 +243,17 @@ def test_ogr_rfc35_shape_3():
     lyr_defn = lyr.GetLayerDefn()
     lyr.AlterFieldDefn(lyr_defn.GetFieldIndex("baz25"), fd, ogr.ALTER_ALL_FLAG)
 
-    ret = CheckFeatures(lyr, field3='baz5')
+    CheckFeatures(lyr, field3='baz5')
 
     ds = None
 
-    ds = ogr.Open('/vsimem/rfc35_test.dbf', update=1)
+    ds = ogr.Open('tmp/rfc35_test.dbf', update=1)
     lyr = ds.GetLayer(0)
     lyr_defn = lyr.GetLayerDefn()
     fld_defn = lyr_defn.GetFieldDefn(lyr_defn.GetFieldIndex('baz5'))
     assert fld_defn.GetWidth() == 5
 
-    ret = CheckFeatures(lyr, field3='baz5')
+    CheckFeatures(lyr, field3='baz5')
 
 ###############################################################################
 # Test AlterFieldDefn() for change of type
@@ -264,7 +261,7 @@ def test_ogr_rfc35_shape_3():
 
 def test_ogr_rfc35_shape_4():
 
-    ds = ogr.Open('/vsimem/rfc35_test.dbf', update=1)
+    ds = ogr.Open('tmp/rfc35_test.dbf', update=1)
     lyr = ds.GetLayer(0)
     lyr_defn = lyr.GetLayerDefn()
 
@@ -289,7 +286,7 @@ def test_ogr_rfc35_shape_4():
     assert feat.GetField("intfield") == 12345
     feat = None
 
-    ret = CheckFeatures(lyr, field3='baz5')
+    CheckFeatures(lyr, field3='baz5')
 
     fd.SetWidth(5)
     lyr.AlterFieldDefn(lyr_defn.GetFieldIndex("intfield"), fd, ogr.ALTER_ALL_FLAG)
@@ -299,11 +296,11 @@ def test_ogr_rfc35_shape_4():
     assert feat.GetField("intfield") == 12345
     feat = None
 
-    ret = CheckFeatures(lyr, field3='baz5')
+    CheckFeatures(lyr, field3='baz5')
 
     ds = None
 
-    ds = ogr.Open('/vsimem/rfc35_test.dbf', update=1)
+    ds = ogr.Open('tmp/rfc35_test.dbf', update=1)
     lyr = ds.GetLayer(0)
     lyr_defn = lyr.GetLayerDefn()
 
@@ -315,16 +312,14 @@ def test_ogr_rfc35_shape_4():
     assert feat.GetField("intfield") == 1234
     feat = None
 
-    ret = CheckFeatures(lyr, field3='baz5')
+    CheckFeatures(lyr, field3='baz5')
 
     ds = None
 
     # Check that the file size has decreased after column shrinking
-    ret = CheckFileSize('/vsimem/rfc35_test.dbf')
-    if ret == 'fail':
-        return ret
+    CheckFileSize('tmp/rfc35_test.dbf')
 
-    ds = ogr.Open('/vsimem/rfc35_test.dbf', update=1)
+    ds = ogr.Open('tmp/rfc35_test.dbf', update=1)
     lyr = ds.GetLayer(0)
     lyr_defn = lyr.GetLayerDefn()
 
@@ -337,11 +332,11 @@ def test_ogr_rfc35_shape_4():
     assert feat.GetField("oldintfld") == '1234'
     feat = None
 
-    ret = CheckFeatures(lyr, field3='baz5')
+    CheckFeatures(lyr, field3='baz5')
 
     ds = None
 
-    ds = ogr.Open('/vsimem/rfc35_test.dbf', update=1)
+    ds = ogr.Open('tmp/rfc35_test.dbf', update=1)
     lyr = ds.GetLayer(0)
     lyr_defn = lyr.GetLayerDefn()
 
@@ -350,7 +345,7 @@ def test_ogr_rfc35_shape_4():
     assert feat.GetField("oldintfld") == '1234'
     feat = None
 
-    ret = CheckFeatures(lyr, field3='baz5')
+    CheckFeatures(lyr, field3='baz5')
 
     lyr.DeleteField(lyr_defn.GetFieldIndex("oldintfld"))
 
@@ -375,11 +370,11 @@ def test_ogr_rfc35_shape_4():
     assert feat.GetField("oldintfld") == '98765'
     feat = None
 
-    ret = CheckFeatures(lyr, field3='baz5')
+    CheckFeatures(lyr, field3='baz5')
 
     ds = None
 
-    ds = ogr.Open('/vsimem/rfc35_test.dbf', update=1)
+    ds = ogr.Open('tmp/rfc35_test.dbf', update=1)
     lyr = ds.GetLayer(0)
     lyr_defn = lyr.GetLayerDefn()
 
@@ -388,7 +383,7 @@ def test_ogr_rfc35_shape_4():
     assert feat.GetField("oldintfld") == '98765'
     feat = None
 
-    ret = CheckFeatures(lyr, field3='baz5')
+    CheckFeatures(lyr, field3='baz5')
 
 ###############################################################################
 # Test DeleteField()
@@ -396,7 +391,7 @@ def test_ogr_rfc35_shape_4():
 
 def test_ogr_rfc35_shape_5():
 
-    ds = ogr.Open('/vsimem/rfc35_test.dbf', update=1)
+    ds = ogr.Open('tmp/rfc35_test.dbf', update=1)
     lyr = ds.GetLayer(0)
     lyr_defn = lyr.GetLayerDefn()
 
@@ -414,40 +409,40 @@ def test_ogr_rfc35_shape_5():
     gdal.PopErrorHandler()
     assert ret != 0
 
-    ret = CheckFeatures(lyr, field3='baz5')
+    CheckFeatures(lyr, field3='baz5')
 
     assert lyr.DeleteField(lyr_defn.GetFieldIndex('baw20')) == 0
 
     ds = None
 
     # Check that the file size has decreased after column removing
-    ret = CheckFileSize('/vsimem/rfc35_test.dbf')
+    CheckFileSize('tmp/rfc35_test.dbf')
     if ret == 'fail':
         return ret
 
-    ds = ogr.Open('/vsimem/rfc35_test.dbf', update=1)
+    ds = ogr.Open('tmp/rfc35_test.dbf', update=1)
     lyr = ds.GetLayer(0)
     lyr_defn = lyr.GetLayerDefn()
 
-    ret = CheckFeatures(lyr, field3='baz5', field4=None)
+    CheckFeatures(lyr, field3='baz5', field4=None)
 
     assert lyr.DeleteField(lyr_defn.GetFieldIndex('baz5')) == 0
 
-    ret = CheckFeatures(lyr, field3=None, field4=None)
+    CheckFeatures(lyr, field3=None, field4=None)
 
     assert lyr.DeleteField(lyr_defn.GetFieldIndex('foo5')) == 0
 
     assert lyr.DeleteField(lyr_defn.GetFieldIndex('bar10')) == 0
 
-    ret = CheckFeatures(lyr, field1=None, field2=None, field3=None, field4=None)
+    CheckFeatures(lyr, field1=None, field2=None, field3=None, field4=None)
 
     ds = None
 
-    ds = ogr.Open('/vsimem/rfc35_test.dbf', update=1)
+    ds = ogr.Open('tmp/rfc35_test.dbf', update=1)
     lyr = ds.GetLayer(0)
     lyr_defn = lyr.GetLayerDefn()
 
-    ret = CheckFeatures(lyr, field1=None, field2=None, field3=None, field4=None)
+    CheckFeatures(lyr, field1=None, field2=None, field3=None, field4=None)
 
 ###############################################################################
 # Initiate the test file
@@ -455,7 +450,7 @@ def test_ogr_rfc35_shape_5():
 
 def test_ogr_rfc35_shape_cleanup():
 
-    ogr.GetDriverByName('ESRI Shapefile').DeleteDataSource('/vsimem/rfc35_test.dbf')
+    ogr.GetDriverByName('ESRI Shapefile').DeleteDataSource('tmp/rfc35_test.dbf')
 
 
 
diff --git a/autotest/ogr/ogr_rfc35_sqlite.py b/autotest/ogr/ogr_rfc35_sqlite.py
index 7cb7f012fd30..d8eede33d6f0 100755
--- a/autotest/ogr/ogr_rfc35_sqlite.py
+++ b/autotest/ogr/ogr_rfc35_sqlite.py
@@ -141,12 +141,9 @@ def CheckColumnOrder(lyr, expected_order):
     for i, exp_order in enumerate(expected_order):
         assert lyr_defn.GetFieldDefn(i).GetName() == exp_order
 
-    
 
 def Check(lyr, expected_order):
-
     CheckColumnOrder(lyr, expected_order)
-
     CheckFeatures(lyr)
 
 
@@ -169,28 +166,28 @@ def test_ogr_rfc35_sqlite_2():
 
     assert lyr.ReorderField(1, 3) == 0
 
-    ret = Check(lyr, ['foo5', 'baz15', 'baw20', 'bar10'])
+    Check(lyr, ['foo5', 'baz15', 'baw20', 'bar10'])
 
     lyr.ReorderField(3, 1)
-    ret = Check(lyr, ['foo5', 'bar10', 'baz15', 'baw20'])
+    Check(lyr, ['foo5', 'bar10', 'baz15', 'baw20'])
 
     lyr.ReorderField(0, 2)
-    ret = Check(lyr, ['bar10', 'baz15', 'foo5', 'baw20'])
+    Check(lyr, ['bar10', 'baz15', 'foo5', 'baw20'])
 
     lyr.ReorderField(2, 0)
-    ret = Check(lyr, ['foo5', 'bar10', 'baz15', 'baw20'])
+    Check(lyr, ['foo5', 'bar10', 'baz15', 'baw20'])
 
     lyr.ReorderField(0, 1)
-    ret = Check(lyr, ['bar10', 'foo5', 'baz15', 'baw20'])
+    Check(lyr, ['bar10', 'foo5', 'baz15', 'baw20'])
 
     lyr.ReorderField(1, 0)
-    ret = Check(lyr, ['foo5', 'bar10', 'baz15', 'baw20'])
+    Check(lyr, ['foo5', 'bar10', 'baz15', 'baw20'])
 
     lyr.ReorderFields([3, 2, 1, 0])
-    ret = Check(lyr, ['baw20', 'baz15', 'bar10', 'foo5'])
+    Check(lyr, ['baw20', 'baz15', 'bar10', 'foo5'])
 
     lyr.ReorderFields([3, 2, 1, 0])
-    ret = Check(lyr, ['foo5', 'bar10', 'baz15', 'baw20'])
+    Check(lyr, ['foo5', 'bar10', 'baz15', 'baw20'])
 
     gdal.PushErrorHandler('CPLQuietErrorHandler')
     ret = lyr.ReorderFields([0, 0, 0, 0])
@@ -225,7 +222,7 @@ def test_ogr_rfc35_sqlite_3():
 
     lyr.AlterFieldDefn(lyr_defn.GetFieldIndex("baz15"), fd, ogr.ALTER_ALL_FLAG)
 
-    ret = CheckFeatures(lyr, field3='baz25')
+    CheckFeatures(lyr, field3='baz25')
 
     fd = ogr.FieldDefn("baz5", ogr.OFTString)
     fd.SetWidth(5)
@@ -233,13 +230,13 @@ def test_ogr_rfc35_sqlite_3():
     lyr_defn = lyr.GetLayerDefn()
     lyr.AlterFieldDefn(lyr_defn.GetFieldIndex("baz25"), fd, ogr.ALTER_ALL_FLAG)
 
-    ret = CheckFeatures(lyr, field3='baz5')
+    CheckFeatures(lyr, field3='baz5')
 
     lyr_defn = lyr.GetLayerDefn()
     fld_defn = lyr_defn.GetFieldDefn(lyr_defn.GetFieldIndex('baz5'))
     assert fld_defn.GetWidth() == 5
 
-    ret = CheckFeatures(lyr, field3='baz5')
+    CheckFeatures(lyr, field3='baz5')
 
 ###############################################################################
 # Test AlterFieldDefn() for change of type
@@ -274,7 +271,7 @@ def test_ogr_rfc35_sqlite_4():
     assert feat.GetField("intfield") == 12345
     feat = None
 
-    ret = CheckFeatures(lyr, field3='baz5')
+    CheckFeatures(lyr, field3='baz5')
 
     fd.SetWidth(5)
     lyr.AlterFieldDefn(lyr_defn.GetFieldIndex("intfield"), fd, ogr.ALTER_ALL_FLAG)
@@ -284,7 +281,7 @@ def test_ogr_rfc35_sqlite_4():
     assert feat.GetField("intfield") == 12345
     feat = None
 
-    ret = CheckFeatures(lyr, field3='baz5')
+    CheckFeatures(lyr, field3='baz5')
 
     fd.SetWidth(4)
     lyr.AlterFieldDefn(lyr_defn.GetFieldIndex("intfield"), fd, ogr.ALTER_ALL_FLAG)
@@ -295,7 +292,7 @@ def test_ogr_rfc35_sqlite_4():
     assert feat.GetField("intfield") == 12345
     feat = None
 
-    ret = CheckFeatures(lyr, field3='baz5')
+    CheckFeatures(lyr, field3='baz5')
 
     fd = ogr.FieldDefn("oldintfld", ogr.OFTString)
     fd.SetWidth(15)
@@ -307,7 +304,7 @@ def test_ogr_rfc35_sqlite_4():
     assert feat.GetField("oldintfld") == '12345'
     feat = None
 
-    ret = CheckFeatures(lyr, field3='baz5')
+    CheckFeatures(lyr, field3='baz5')
 
     lyr.DeleteField(lyr_defn.GetFieldIndex("oldintfld"))
 
@@ -332,7 +329,7 @@ def test_ogr_rfc35_sqlite_4():
     assert feat.GetField("oldintfld") == '98765'
     feat = None
 
-    ret = CheckFeatures(lyr, field3='baz5')
+    CheckFeatures(lyr, field3='baz5')
 
 ###############################################################################
 # Test DeleteField()
@@ -360,21 +357,21 @@ def test_ogr_rfc35_sqlite_5():
 
     assert lyr.DeleteField(0) == 0
 
-    ret = CheckFeatures(lyr, field3='baz5')
+    CheckFeatures(lyr, field3='baz5')
 
     assert lyr.DeleteField(lyr_defn.GetFieldIndex('baw20')) == 0
 
-    ret = CheckFeatures(lyr, field3='baz5', field4=None)
+    CheckFeatures(lyr, field3='baz5', field4=None)
 
     assert lyr.DeleteField(lyr_defn.GetFieldIndex('baz5')) == 0
 
-    ret = CheckFeatures(lyr, field3=None, field4=None)
+    CheckFeatures(lyr, field3=None, field4=None)
 
     assert lyr.DeleteField(lyr_defn.GetFieldIndex('foo5')) == 0
 
     assert lyr.DeleteField(lyr_defn.GetFieldIndex('bar10')) == 0
 
-    ret = CheckFeatures(lyr, field1=None, field2=None, field3=None, field4=None)
+    CheckFeatures(lyr, field1=None, field2=None, field3=None, field4=None)
 
 ###############################################################################
 # Initiate the test file
diff --git a/autotest/ogr/ogr_rfc41.py b/autotest/ogr/ogr_rfc41.py
index b0a9a5a54117..fc6721c5265c 100755
--- a/autotest/ogr/ogr_rfc41.py
+++ b/autotest/ogr/ogr_rfc41.py
@@ -30,13 +30,13 @@
 ###############################################################################
 
 
-
-import gdaltest
 from osgeo import ogr
 from osgeo import osr
 from osgeo import gdal
 import pytest
 
+from ogr.ogr_sql_sqlite import require_ogr_sql_sqlite  # noqa
+
 ###############################################################################
 # Test OGRGeomFieldDefn class
 
@@ -697,12 +697,7 @@ def test_ogr_rfc41_7():
 # Test SQLite dialect
 
 
-def test_ogr_rfc41_8():
-
-    import ogr_sql_sqlite
-    if not ogr_sql_sqlite.ogr_sql_sqlite_available():
-        pytest.skip()
-
+def test_ogr_rfc41_8(require_ogr_sql_sqlite):
     ds = ogr.GetDriverByName('memory').CreateDataSource('')
     lyr = ds.CreateLayer('mytable', geom_type=ogr.wkbPolygon)
     lyr.GetLayerDefn().GetGeomFieldDefn(0).SetName('geomfield')
diff --git a/autotest/ogr/ogr_shape.py b/autotest/ogr/ogr_shape.py
index cec44e7effed..08aae78b68af 100755
--- a/autotest/ogr/ogr_shape.py
+++ b/autotest/ogr/ogr_shape.py
@@ -740,7 +740,7 @@ def ogr_shape_23_write_valid_and_invalid(layer_name, wkt, invalid_wkt, wkbType,
     gdaltest.shape_ds = ogr.GetDriverByName('ESRI Shapefile').Open('tmp', update=1)
 
     read_lyr = gdaltest.shape_ds.GetLayerByName(layer_name)
-    assert read_lyr.GetFeatureCount() == 1
+    assert read_lyr.GetFeatureCount() == 1, layer_name
     feat_read = read_lyr.GetNextFeature()
 
     if isEmpty and feat_read.GetGeometryRef() is None:
@@ -822,11 +822,9 @@ def test_ogr_shape_23():
     # Write a feature in a new layer (geometry type unset at layer creation)
 
     for item in test_geom_array:
-        assert ogr_shape_23_write_valid_and_invalid(item[0], item[1], item[2], ogr.wkbUnknown, 0) == 'success', \
-            ('Test for layer %s failed' % item[0])
+        ogr_shape_23_write_valid_and_invalid(item[0], item[1], item[2], ogr.wkbUnknown, 0)
     for item in test_empty_geom_array:
-        assert ogr_shape_23_write_valid_and_invalid(item[0], item[1], item[2], ogr.wkbUnknown, 1) == 'success', \
-            ('Test for layer %s failed' % item[0])
+        ogr_shape_23_write_valid_and_invalid(item[0], item[1], item[2], ogr.wkbUnknown, 1)
 
     #######################################################
     # Same test but use the wkb type when creating the layer
@@ -837,11 +835,9 @@ def test_ogr_shape_23():
     gdaltest.shape_ds = shape_drv.CreateDataSource('tmp')
 
     for item in test_geom_array:
-        assert ogr_shape_23_write_valid_and_invalid(item[0], item[1], item[2], item[3], 0) == 'success', \
-            ('(2) Test for layer %s failed' % item[0])
+        ogr_shape_23_write_valid_and_invalid(item[0], item[1], item[2], item[3], 0)
     for item in test_empty_geom_array:
-        assert ogr_shape_23_write_valid_and_invalid(item[0], item[1], item[2], item[3], 1) == 'success', \
-            ('(2) Test for layer %s failed' % item[0])
+        ogr_shape_23_write_valid_and_invalid(item[0], item[1], item[2], item[3], 1)
 
     #######################################################
     # Test writing of a geometrycollection
@@ -880,8 +876,7 @@ def test_ogr_shape_23():
     geom = ogr.CreateGeometryFromWkt(wkt)
     geom.AddGeometry(ogr.Geometry(type=ogr.wkbPoint))
 
-    assert ogr_shape_23_write_geom(layer_name, geom, ogr.CreateGeometryFromWkt(geom.ExportToWkt()), ogr.wkbUnknown) == 'success', \
-        ('Test for layer %s failed' % layer_name)
+    ogr_shape_23_write_geom(layer_name, geom, ogr.CreateGeometryFromWkt(geom.ExportToWkt()), ogr.wkbUnknown)
 
     #######################################################
     # Test writing of a multilinestring with an empty linestring inside
@@ -890,8 +885,7 @@ def test_ogr_shape_23():
     geom = ogr.CreateGeometryFromWkt(wkt)
     geom.AddGeometry(ogr.Geometry(type=ogr.wkbLineString))
 
-    assert ogr_shape_23_write_geom(layer_name, geom, ogr.CreateGeometryFromWkt(geom.ExportToWkt()), ogr.wkbUnknown) == 'success', \
-        ('Test for layer %s failed' % layer_name)
+    ogr_shape_23_write_geom(layer_name, geom, ogr.CreateGeometryFromWkt(geom.ExportToWkt()), ogr.wkbUnknown)
 
     #######################################################
     # Test writing of a polygon with an empty external ring
@@ -906,8 +900,7 @@ def test_ogr_shape_23():
     ring.AddPoint_2D(0, 0)
     geom.AddGeometry(ring)
 
-    assert ogr_shape_23_write_geom(layer_name, geom, None, ogr.wkbUnknown) == 'success', \
-        ('Test for layer %s failed' % layer_name)
+    ogr_shape_23_write_geom(layer_name, geom, None, ogr.wkbUnknown)
 
     #######################################################
     # Test writing of a polygon with an empty external ring
@@ -916,8 +909,7 @@ def test_ogr_shape_23():
     geom = ogr.CreateGeometryFromWkt(wkt)
     geom.AddGeometry(ogr.Geometry(type=ogr.wkbLinearRing))
 
-    assert ogr_shape_23_write_geom(layer_name, geom, ogr.CreateGeometryFromWkt(geom.ExportToWkt()), ogr.wkbUnknown) == 'success', \
-        ('Test for layer %s failed' % layer_name)
+    ogr_shape_23_write_geom(layer_name, geom, ogr.CreateGeometryFromWkt(geom.ExportToWkt()), ogr.wkbUnknown)
 
     #######################################################
     # Test writing of a multipolygon with an empty polygon and a polygon with an empty external ring
@@ -929,8 +921,7 @@ def test_ogr_shape_23():
     poly.AddGeometry(ogr.Geometry(type=ogr.wkbLinearRing))
     geom.AddGeometry(poly)
 
-    assert ogr_shape_23_write_geom(layer_name, geom, ogr.CreateGeometryFromWkt(geom.ExportToWkt()), ogr.wkbUnknown) == 'success', \
-        ('Test for layer %s failed' % layer_name)
+    ogr_shape_23_write_geom(layer_name, geom, ogr.CreateGeometryFromWkt(geom.ExportToWkt()), ogr.wkbUnknown)
 
 
 ###############################################################################
@@ -945,8 +936,7 @@ def test_ogr_shape_24():
     wkt = 'MULTIPOLYGON(((0 0,0 10,10 10,0 0), (0 0,1 1,0 1,0 0)), ((100 100,100 200,200 200,200 100,100 100)))'
     geom = ogr.CreateGeometryFromWkt(wkt)
 
-    assert ogr_shape_23_write_geom(layer_name, geom, ogr.CreateGeometryFromWkt(geom.ExportToWkt()), ogr.wkbUnknown) == 'success', \
-        ('Test for layer %s failed' % layer_name)
+    ogr_shape_23_write_geom(layer_name, geom, ogr.CreateGeometryFromWkt(geom.ExportToWkt()), ogr.wkbUnknown)
 
 ###############################################################################
 # Test reading a multipolygon with one part inside the bounding box of the other
@@ -958,8 +948,7 @@ def test_ogr_shape_25():
     wkt = 'MULTIPOLYGON(((10 5, 5 5,5 0,0 0,0 10,10 10,10 5)),((10 5,10 0,5 0,5 4.9,10 5)), ((100 100,100 200,200 200,200 100,100 100)))'
     geom = ogr.CreateGeometryFromWkt(wkt)
 
-    assert ogr_shape_23_write_geom(layer_name, geom, ogr.CreateGeometryFromWkt(geom.ExportToWkt()), ogr.wkbUnknown) == 'success', \
-        ('Test for layer %s failed' % layer_name)
+    ogr_shape_23_write_geom(layer_name, geom, ogr.CreateGeometryFromWkt(geom.ExportToWkt()), ogr.wkbUnknown)
 
     # Same test, but use OGR_ORGANIZE_POLYGONS=DEFAULT to avoid relying only on the winding order
     layer_name = 'touchingrings3'
@@ -967,9 +956,8 @@ def test_ogr_shape_25():
     geom = ogr.CreateGeometryFromWkt(wkt)
 
     gdal.SetConfigOption('OGR_ORGANIZE_POLYGONS', 'DEFAULT')
-    ret = ogr_shape_23_write_geom(layer_name, geom, ogr.CreateGeometryFromWkt(geom.ExportToWkt()), ogr.wkbUnknown)
+    ogr_shape_23_write_geom(layer_name, geom, ogr.CreateGeometryFromWkt(geom.ExportToWkt()), ogr.wkbUnknown)
     gdal.SetConfigOption('OGR_ORGANIZE_POLYGONS', '')
-    assert ret == 'success', ('Test for layer %s failed' % layer_name)
 
 
 ###############################################################################
@@ -981,31 +969,23 @@ def test_ogr_shape_26():
     wkt = 'POLYGON ((100 100,100 200,200 200,200 100,100 100),(110 110,120 110,120 120,110 120,110 110),(130 110,140 110,140 120,130 120,130 110))'
     geom = ogr.CreateGeometryFromWkt(wkt)
 
-    ret = ogr_shape_23_write_geom(layer_name, geom, ogr.CreateGeometryFromWkt(geom.ExportToWkt()), ogr.wkbUnknown)
-    assert ret == 'success', ('Test for layer %s failed' % layer_name)
+    ogr_shape_23_write_geom(layer_name, geom, ogr.CreateGeometryFromWkt(geom.ExportToWkt()), ogr.wkbUnknown)
 
 ###############################################################################
 # Test alternate date formatting (#2746)
 
 
 def test_ogr_shape_27():
-
-    result = 'success'
-
     ds = ogr.Open('data/water_main_dist.dbf')
     lyr = ds.GetLayer(0)
     feat = lyr.GetNextFeature()
 
-    if feat.installe_1 != '1989/04/25':
-        print(feat.installe_1)
-        gdaltest.post_reason('got wrong date result!')
-        result = 'fail'
+    assert feat.installe_1 == '1989/04/25', 'got wrong date result!'
 
     feat = None
     lyr = None
     ds = None
 
-    return result
 
 ###############################################################################
 # Test reading a 3 GB .DBF (#3011)
diff --git a/autotest/ogr/ogr_sql_sqlite.py b/autotest/ogr/ogr_sql_sqlite.py
index b184f19c5353..8e1e5fe19239 100755
--- a/autotest/ogr/ogr_sql_sqlite.py
+++ b/autotest/ogr/ogr_sql_sqlite.py
@@ -35,7 +35,6 @@
     from http.server import BaseHTTPRequestHandler
 
 
-
 from osgeo import ogr
 from osgeo import osr
 from osgeo import gdal
@@ -44,20 +43,33 @@
 import webserver
 import pytest
 
+
+@pytest.fixture(autouse=True)
+def clear_config_options():
+    gdal.SetConfigOption('OGR_GEOCODE_CACHE_FILE', None)
+    gdal.SetConfigOption('OGR_GEOCODE_APPLICATION', None)
+    gdal.SetConfigOption('OGR_GEOCODE_EMAIL', None)
+    gdal.SetConfigOption('OGR_GEOCODE_QUERY_TEMPLATE', None)
+    gdal.SetConfigOption('OGR_GEOCODE_DELAY', None)
+    gdal.SetConfigOption('OGR_GEOCODE_SERVICE', None)
+    gdal.SetConfigOption('OGR_GEOCODE_USERNAME', None)
+    gdal.SetConfigOption('OGR_GEOCODE_KEY', None)
+    gdal.SetConfigOption('OGR_SQLITE_DIALECT_USE_SPATIALITE', None)
+
+
 ###############################################################################
 # Detect OGR SQLite dialect availability
 
 
-def ogr_sql_sqlite_available():
-
-    ogrtest.has_sqlite_dialect = False
+@pytest.fixture(autouse=True, scope='module')
+def require_ogr_sql_sqlite():
     if ogr.GetDriverByName('SQLite') is None:
-        return False
+        pytest.skip()
 
     # If we have SQLite VFS support, then SQLite dialect should be available
     ds = ogr.GetDriverByName('SQLite').CreateDataSource('/vsimem/ogr_sql_sqlite_available.db')
     if ds is None:
-        return False
+        pytest.skip()
     ds = None
     gdal.Unlink('/vsimem/ogr_sql_sqlite_available.db')
 
@@ -65,21 +77,12 @@ def ogr_sql_sqlite_available():
     sql_lyr = ds.ExecuteSQL("SELECT * FROM sqlite_master", dialect='SQLite')
     ds.ReleaseResultSet(sql_lyr)
     assert sql_lyr is not None
-    ogrtest.has_sqlite_dialect = True
-    return True
 
 ###############################################################################
 # Tests that don't involve geometry
 
 
 def test_ogr_sql_sqlite_1():
-
-    ret = ogr_sql_sqlite_available()
-    if ret == 'fail':
-        return ret
-    if not ret:
-        pytest.skip()
-
     ds = ogr.GetDriverByName("Memory").CreateDataSource("my_ds")
     for geom in [ogr.wkbNone, ogr.wkbUnknown]:
         lyr = ds.CreateLayer("my_layer", geom_type=geom)
@@ -274,9 +277,6 @@ def test_ogr_sql_sqlite_1():
 
 def test_ogr_sql_sqlite_2():
 
-    if not ogrtest.has_sqlite_dialect:
-        pytest.skip()
-
     ds = ogr.GetDriverByName("Memory").CreateDataSource("my_ds")
 
     srs = osr.SpatialReference()
@@ -380,9 +380,6 @@ def test_ogr_sql_sqlite_2():
 
 def test_ogr_sql_sqlite_3():
 
-    if not ogrtest.has_sqlite_dialect:
-        pytest.skip()
-
     ds = ogr.Open('data')
 
     sql_lyr = ds.ExecuteSQL("SELECT p.*, idlink.* FROM poly p LEFT JOIN idlink USING (EAS_ID) ORDER BY EAS_ID", dialect='SQLite')
@@ -409,9 +406,6 @@ def test_ogr_sql_sqlite_3():
 
 def test_ogr_sql_sqlite_4():
 
-    if not ogrtest.has_sqlite_dialect:
-        pytest.skip()
-
     ds = ogr.Open('data')
 
     sql_lyr = ds.ExecuteSQL("SELECT p.* FROM poly p JOIN poly USING (EAS_ID)", dialect='SQLite')
@@ -428,9 +422,6 @@ def test_ogr_sql_sqlite_4():
 
 def test_ogr_sql_sqlite_5():
 
-    if not ogrtest.has_sqlite_dialect:
-        pytest.skip()
-
     gdal.PushErrorHandler('CPLQuietErrorHandler')
     ds = ogr.GetDriverByName('SQLite').CreateDataSource('/vsimem/foo.db', options=['SPATIALITE=YES'])
     ogrtest.has_spatialite = ds is not None
@@ -463,9 +454,6 @@ def test_ogr_sql_sqlite_5():
 
 def test_ogr_sql_sqlite_6():
 
-    if not ogrtest.has_sqlite_dialect:
-        pytest.skip()
-
     if ogrtest.has_spatialite is False:
         pytest.skip()
 
@@ -477,7 +465,6 @@ def test_ogr_sql_sqlite_6():
 
     test_ogr_sql_sqlite_4()
 
-    gdal.SetConfigOption('OGR_SQLITE_DIALECT_USE_SPATIALITE', None)
 
 ###############################################################################
 # Test if there's a text column called GEOMETRY already in the table
@@ -485,9 +472,6 @@ def test_ogr_sql_sqlite_6():
 
 def test_ogr_sql_sqlite_7():
 
-    if not ogrtest.has_sqlite_dialect:
-        pytest.skip()
-
     ds = ogr.GetDriverByName("Memory").CreateDataSource("my_ds")
 
     lyr = ds.CreateLayer("my_layer")
@@ -532,9 +516,6 @@ def test_ogr_sql_sqlite_7():
 
 def test_ogr_sql_sqlite_8():
 
-    if not ogrtest.has_sqlite_dialect:
-        pytest.skip()
-
     ds = ogr.Open('data')
 
     expect = [171, 172, 173, 179]
@@ -556,9 +537,6 @@ def test_ogr_sql_sqlite_8():
 
 def test_ogr_sql_sqlite_9():
 
-    if not ogrtest.has_sqlite_dialect:
-        pytest.skip()
-
     ds = ogr.Open('data')
 
     sql_lyr = ds.ExecuteSQL("SELECT count(*) as cnt FROM (SELECT * FROM (SELECT * FROM\n'data'.poly my_alias))p,(SELECT * FROM 'data'.idlink) il WHERE p.EAS_ID = il.EAS_id", dialect='SQLite')
@@ -572,16 +550,13 @@ def test_ogr_sql_sqlite_9():
     if cnt != 7:
         return' fail'
 
-    
+
 ###############################################################################
 # Test optimized count(*)
 
 
 def test_ogr_sql_sqlite_10():
 
-    if not ogrtest.has_sqlite_dialect:
-        pytest.skip()
-
     ds = ogr.Open('data')
 
     sql_lyr = ds.ExecuteSQL("SELECT count(*) as cnt FROM poly", dialect='SQLite')
@@ -595,16 +570,13 @@ def test_ogr_sql_sqlite_10():
     if cnt != 10:
         return' fail'
 
-    
+
 ###############################################################################
 # Test correct parsing of litterals
 
 
 def test_ogr_sql_sqlite_11():
 
-    if not ogrtest.has_sqlite_dialect:
-        pytest.skip()
-
     ds = ogr.GetDriverByName("Memory").CreateDataSource("my_ds")
 
     lyr = ds.CreateLayer("my_layer")
@@ -624,16 +596,13 @@ def test_ogr_sql_sqlite_11():
     if cnt != 1:
         return' fail'
 
-    
+
 ###############################################################################
 # Test various error conditions
 
 
 def test_ogr_sql_sqlite_12():
 
-    if not ogrtest.has_sqlite_dialect:
-        pytest.skip()
-
     ds = ogr.GetDriverByName("Memory").CreateDataSource("my_ds")
 
     # Invalid SQL
@@ -662,9 +631,6 @@ def test_ogr_sql_sqlite_12():
 
 def test_ogr_sql_sqlite_13():
 
-    if not ogrtest.has_sqlite_dialect:
-        pytest.skip()
-
     ds = ogr.GetDriverByName("Memory").CreateDataSource("my_ds")
 
     srs = osr.SpatialReference()
@@ -852,9 +818,6 @@ def ogr_sql_sqlite_14_and_15(sql):
 
 def test_ogr_sql_sqlite_14():
 
-    if not ogrtest.has_sqlite_dialect:
-        pytest.skip()
-
     if ogrtest.has_spatialite is False:
         pytest.skip()
 
@@ -871,9 +834,6 @@ def test_ogr_sql_sqlite_14():
 
 def test_ogr_sql_sqlite_15():
 
-    if not ogrtest.has_sqlite_dialect:
-        pytest.skip()
-
     if ogrtest.has_spatialite is False:
         pytest.skip()
 
@@ -1158,9 +1118,6 @@ def test_ogr_sql_sqlite_start_webserver():
     ogrtest.webserver_process = None
     ogrtest.webserver_port = 0
 
-    if not ogrtest.has_sqlite_dialect:
-        pytest.skip()
-
     if gdal.GetDriverByName('HTTP') is None:
         pytest.skip()
 
@@ -1168,16 +1125,13 @@ def test_ogr_sql_sqlite_start_webserver():
     if ogrtest.webserver_port == 0:
         pytest.skip()
 
-    
+
 ###############################################################################
 # Test ogr_geocode()
 
 
 def test_ogr_sql_sqlite_16(service=None, template='http://127.0.0.1:%d/geocoding?q=%%s'):
 
-    if not ogrtest.has_sqlite_dialect:
-        pytest.skip()
-
     if ogrtest.webserver_port == 0:
         pytest.skip()
 
@@ -1191,8 +1145,6 @@ def test_ogr_sql_sqlite_16(service=None, template='http://127.0.0.1:%d/geocoding
     elif service == 'BING':
         gdal.SetConfigOption('OGR_GEOCODE_KEY', 'fakekey')
 
-    ret = 'success'
-
     for cache_filename in ['tmp/ogr_geocode_cache.sqlite', 'tmp/ogr_geocode_cache.csv']:
 
         gdal.Unlink(cache_filename)
@@ -1215,9 +1167,8 @@ def test_ogr_sql_sqlite_16(service=None, template='http://127.0.0.1:%d/geocoding
             feat = sql_lyr.GetNextFeature()
             if feat is None:
                 print(sql)
-                ret = 'fail'
                 ds.ReleaseResultSet(sql_lyr)
-                break
+                pytest.fail()
 
             if ((sql == "SELECT ogr_geocode('Paris')" or
                  sql == "SELECT ogr_geocode('Paris', 'geometry')") and feat.GetGeometryRef() is None) or \
@@ -1225,28 +1176,24 @@ def test_ogr_sql_sqlite_16(service=None, template='http://127.0.0.1:%d/geocoding
                     (sql == "SELECT ogr_geocode('Paris', 'raw')" and not feat.IsFieldSet('raw')):
                 feat.DumpReadable()
                 print(sql)
-                ret = 'fail'
                 ds.ReleaseResultSet(sql_lyr)
-                break
+                pytest.fail()
 
             ds.ReleaseResultSet(sql_lyr)
 
-        if ret == 'success':
-            for sql in ["SELECT ogr_geocode('NonExistingPlace')", "SELECT ogr_geocode('Error')"]:
-                sql_lyr = ds.ExecuteSQL(sql, dialect='SQLite')
-                feat = sql_lyr.GetNextFeature()
-                if feat is None:
-                    ret = 'fail'
-                    ds.ReleaseResultSet(sql_lyr)
-                    break
-
-                if feat.GetGeometryRef() is not None:
-                    feat.DumpReadable()
-                    ret = 'fail'
-                    ds.ReleaseResultSet(sql_lyr)
-                    break
+        for sql in ["SELECT ogr_geocode('NonExistingPlace')", "SELECT ogr_geocode('Error')"]:
+            sql_lyr = ds.ExecuteSQL(sql, dialect='SQLite')
+            feat = sql_lyr.GetNextFeature()
+            if feat is None:
+                ds.ReleaseResultSet(sql_lyr)
+                pytest.fail()
 
+            if feat.GetGeometryRef() is not None:
+                feat.DumpReadable()
                 ds.ReleaseResultSet(sql_lyr)
+                pytest.fail()
+
+            ds.ReleaseResultSet(sql_lyr)
 
         # Test various syntax errors
         sql_lyr = ds.ExecuteSQL("SELECT ogr_geocode()", dialect='SQLite')
@@ -1265,31 +1212,17 @@ def test_ogr_sql_sqlite_16(service=None, template='http://127.0.0.1:%d/geocoding
 
         # Check cache existence
         cache_ds = ogr.Open(cache_filename)
-        if cache_ds is None:
-            ret = 'fail'
+        assert cache_ds is not None
         if cache_ds.GetDriver().GetName().lower() != cache_filename[cache_filename.find('.') + 1:].lower():
             print(cache_ds.GetDriver().GetName())
             print(cache_filename)
-            ret = 'fail'
+            pytest.fail()
         cache_ds = None
 
         gdal.Unlink(cache_filename)
 
         ds = None
 
-        if ret != 'success':
-            break
-
-    gdal.SetConfigOption('OGR_GEOCODE_CACHE_FILE', None)
-    gdal.SetConfigOption('OGR_GEOCODE_APPLICATION', None)
-    gdal.SetConfigOption('OGR_GEOCODE_EMAIL', None)
-    gdal.SetConfigOption('OGR_GEOCODE_QUERY_TEMPLATE', None)
-    gdal.SetConfigOption('OGR_GEOCODE_DELAY', None)
-    gdal.SetConfigOption('OGR_GEOCODE_SERVICE', None)
-    gdal.SetConfigOption('OGR_GEOCODE_USERNAME', None)
-    gdal.SetConfigOption('OGR_GEOCODE_KEY', None)
-
-    return ret
 
 ###############################################################################
 # Test ogr_geocode_reverse()
@@ -1297,9 +1230,6 @@ def test_ogr_sql_sqlite_16(service=None, template='http://127.0.0.1:%d/geocoding
 
 def test_ogr_sql_sqlite_17(service=None, template='http://127.0.0.1:%d/reversegeocoding?lon={lon}&lat={lat}'):
 
-    if not ogrtest.has_sqlite_dialect:
-        pytest.skip()
-
     if ogrtest.webserver_port == 0:
         pytest.skip()
 
@@ -1313,8 +1243,6 @@ def test_ogr_sql_sqlite_17(service=None, template='http://127.0.0.1:%d/reversege
     elif service == 'BING':
         gdal.SetConfigOption('OGR_GEOCODE_KEY', 'fakekey')
 
-    ret = 'success'
-
     for cache_filename in ['tmp/ogr_geocode_cache.sqlite', 'tmp/ogr_geocode_cache.csv']:
 
         gdal.Unlink(cache_filename)
@@ -1344,9 +1272,8 @@ def test_ogr_sql_sqlite_17(service=None, template='http://127.0.0.1:%d/reversege
             feat = sql_lyr.GetNextFeature()
             if feat is None:
                 print(sql)
-                ret = 'fail'
                 ds.ReleaseResultSet(sql_lyr)
-                break
+                pytest.fail()
 
             if sql.find('raw') != -1:
                 field_to_test = 'raw'
@@ -1355,9 +1282,8 @@ def test_ogr_sql_sqlite_17(service=None, template='http://127.0.0.1:%d/reversege
             if not feat.IsFieldSet(field_to_test):
                 feat.DumpReadable()
                 print(sql)
-                ret = 'fail'
                 ds.ReleaseResultSet(sql_lyr)
-                break
+                pytest.fail()
 
             ds.ReleaseResultSet(sql_lyr)
 
@@ -1385,28 +1311,13 @@ def test_ogr_sql_sqlite_17(service=None, template='http://127.0.0.1:%d/reversege
 
         # Check cache existence
         cache_ds = ogr.Open(cache_filename)
-        if cache_ds is None:
-            ret = 'fail'
+        assert cache_ds is not None
         cache_ds = None
 
         gdal.Unlink(cache_filename)
 
         ds = None
 
-        if ret != 'success':
-            break
-
-    gdal.SetConfigOption('OGR_GEOCODE_CACHE_FILE', None)
-    gdal.SetConfigOption('OGR_GEOCODE_APPLICATION', None)
-    gdal.SetConfigOption('OGR_GEOCODE_EMAIL', None)
-    gdal.SetConfigOption('OGR_GEOCODE_REVERSE_QUERY_TEMPLATE', None)
-    gdal.SetConfigOption('OGR_GEOCODE_DELAY', None)
-    gdal.SetConfigOption('OGR_GEOCODE_SERVICE', None)
-    gdal.SetConfigOption('OGR_GEOCODE_USERNAME', None)
-    gdal.SetConfigOption('OGR_GEOCODE_KEY', None)
-
-    return ret
-
 ###############################################################################
 # Test ogr_geocode() with Yahoo geocoding service
 
@@ -1461,9 +1372,6 @@ def test_ogr_sql_sqlite_23():
 
 def test_ogr_sql_sqlite_24():
 
-    if not ogrtest.has_sqlite_dialect:
-        pytest.skip()
-
     ds = ogr.GetDriverByName("Memory").CreateDataSource("my_ds")
 
     # Very short string
@@ -1568,9 +1476,6 @@ def ogr_sql_sqlite_25_test_errors(ds, fct):
 
 def test_ogr_sql_sqlite_25():
 
-    if not ogrtest.has_sqlite_dialect:
-        pytest.skip()
-
     # if ogrtest.has_spatialite is True:
     #    return 'skip'
 
@@ -1616,9 +1521,6 @@ def test_ogr_sql_sqlite_25():
 
 def test_ogr_sql_sqlite_26():
 
-    if not ogrtest.has_sqlite_dialect:
-        pytest.skip()
-
     if not ogrtest.have_geos():
         pytest.skip()
 
@@ -1656,7 +1558,7 @@ def test_ogr_sql_sqlite_26():
             op = getattr(geom, op_str)
             b_geos = op()
             if b_sql != b_geos:
-                if ogrtest.has_sqlite_dialect and wkt == 'POLYGON EMPTY':
+                if wkt == 'POLYGON EMPTY':
                     print('difference wit op = %s and wkt = POLYGON EMPTY' % op_str)
                 else:
                     print(wkt)
@@ -1735,16 +1637,13 @@ def test_ogr_sql_sqlite_26():
         ds.ReleaseResultSet(sql_lyr)
         assert geom_sql is None, ('fail with %s' % op_str)
 
-    
+
 
 ###############################################################################
 # Test MIN(), MAX() on a date
 
 def test_ogr_sql_sqlite_27():
 
-    if not ogrtest.has_sqlite_dialect:
-        pytest.skip()
-
     ds = ogr.GetDriverByName('Memory').CreateDataSource('')
     lyr = ds.CreateLayer('test')
     lyr.CreateField(ogr.FieldDefn('DATE', ogr.OFTDateTime))
@@ -1773,9 +1672,6 @@ def test_ogr_sql_sqlite_27():
 
 def test_ogr_sql_sqlite_28():
 
-    if not ogrtest.has_sqlite_dialect:
-        pytest.skip()
-
     ds = ogr.GetDriverByName('Memory').CreateDataSource('')
 
     # Invalid parameters
@@ -1807,16 +1703,13 @@ def test_ogr_sql_sqlite_28():
             pytest.fail(sql)
         ds.ReleaseResultSet(sql_lyr)
 
-    
+
 ###############################################################################
 # Test compat with curve geometries
 
 
 def test_ogr_sql_sqlite_29():
 
-    if not ogrtest.has_sqlite_dialect:
-        pytest.skip()
-
     ds = ogr.GetDriverByName('Memory').CreateDataSource('')
     lyr = ds.CreateLayer('test', geom_type=ogr.wkbCircularString)
     f = ogr.Feature(lyr.GetLayerDefn())
@@ -1840,9 +1733,6 @@ def test_ogr_sql_sqlite_29():
 
 def test_ogr_sql_sqlite_30():
 
-    if not ogrtest.has_sqlite_dialect:
-        pytest.skip()
-
     ds = ogr.GetDriverByName('Memory').CreateDataSource('')
     lyr = ds.CreateLayer('testm', geom_type=ogr.wkbLineStringM)
     f = ogr.Feature(lyr.GetLayerDefn())
@@ -1880,9 +1770,6 @@ def test_ogr_sql_sqlite_30():
 
 def test_ogr_sql_sqlite_31():
 
-    if not ogrtest.has_sqlite_dialect:
-        pytest.skip()
-
     ds = ogr.GetDriverByName('Memory').CreateDataSource('')
     lyr = ds.CreateLayer('test')
     lyr.CreateField(ogr.FieldDefn('50M3 @w35Om3 N@M3', ogr.OFTInteger))
diff --git a/autotest/ogr/ogr_sqlite.py b/autotest/ogr/ogr_sqlite.py
index 9a1fc2de110f..bcf22f814dbe 100755
--- a/autotest/ogr/ogr_sqlite.py
+++ b/autotest/ogr/ogr_sqlite.py
@@ -35,19 +35,40 @@
 import shutil
 import pytest
 
-# Make sure we run from the directory of the script
-if os.path.basename(sys.argv[0]) == os.path.basename(__file__):
-    if os.path.dirname(sys.argv[0]) != '':
-        os.chdir(os.path.dirname(sys.argv[0]))
-
-
 from osgeo import gdal
 from osgeo import ogr
 from osgeo import osr
 import gdaltest
 import ogrtest
 
-run_without_spatialite = True
+
+pytestmark = [
+    pytest.mark.require_driver('SQLite'),
+    # pytest.mark.usefixtures('tmp_dir'),
+]
+
+
+###############################################################################
+# Test if SpatiaLite is available
+
+@pytest.fixture(scope='module')
+def spatialite():
+    sl_ds = ogr.Open('tmp/sqlite_test.db', update=1)
+
+    gdal.PushErrorHandler('CPLQuietErrorHandler')
+    sql_lyr = sl_ds.ExecuteSQL("SELECT spatialite_version()")
+    gdal.PopErrorHandler()
+    if sql_lyr is None:
+        pytest.skip()
+    else:
+        feat = sql_lyr.GetNextFeature()
+        print('Spatialite : %s' % feat.GetFieldAsString(0))
+        gdaltest.spatialite_version = feat.GetFieldAsString(0)
+        gdaltest.has_spatialite = True
+        sl_ds.ReleaseResultSet(sql_lyr)
+
+        return gdaltest.spatialite_version
+
 
 ###############################################################################
 # Create a fresh database.
@@ -74,9 +95,7 @@ def test_ogr_sqlite_1():
 
     gdaltest.sl_ds = sqlite_dr.CreateDataSource('tmp/sqlite_test.db')
 
-    if gdaltest.sl_ds is not None:
-        return
-    pytest.fail()
+    assert gdaltest.sl_ds is not None
 
 ###############################################################################
 # Create table from data/poly.shp
@@ -254,7 +273,7 @@ def test_ogr_sqlite_4():
 
         assert ogrtest.check_feature_geometry(feat_read, geom) == 0
 
-    
+
 ###############################################################################
 # Test ExecuteSQL() results layers without geometry.
 
@@ -774,7 +793,7 @@ def test_ogr_sqlite_16():
 # Test SPATIALITE dataset creation option
 
 
-def test_ogr_sqlite_17():
+def test_ogr_sqlite_17(spatialite):
 
     if gdaltest.sl_ds is None:
         pytest.skip()
@@ -785,10 +804,6 @@ def test_ogr_sqlite_17():
     with gdaltest.error_handler():
         ds = ogr.GetDriverByName('SQLite').CreateDataSource('tmp/spatialite_test.db', options=['SPATIALITE=YES'])
 
-    if not gdaltest.has_spatialite:
-        assert ds is None
-        return
-
     gdal.PushErrorHandler('CPLQuietErrorHandler')
     lyr = ds.CreateLayer('will_fail', options=['FORMAT=WKB'])
     gdal.PopErrorHandler()
@@ -817,18 +832,15 @@ def test_ogr_sqlite_17():
     wkt = srs.ExportToWkt()
     assert wkt.find('4326') != -1, 'did not identify correctly SRS'
 
+
 ###############################################################################
 # Create a layer with a non EPSG SRS into a SPATIALITE DB (#3506)
 
 
-def test_ogr_sqlite_18():
-
+def test_ogr_sqlite_18(spatialite):
     if gdaltest.sl_ds is None:
         pytest.skip()
 
-    if not gdaltest.has_spatialite:
-        pytest.skip()
-
     ds = ogr.Open('tmp/spatialite_test.db', update=1)
     srs = osr.SpatialReference()
     srs.SetFromUserInput('+proj=vandg')
@@ -856,7 +868,7 @@ def test_ogr_sqlite_18():
 # Create a SpatiaLite DB with INIT_WITH_EPSG=YES
 
 
-def test_ogr_sqlite_19():
+def test_ogr_sqlite_19(spatialite):
 
     if gdaltest.sl_ds is None:
         pytest.skip()
@@ -864,10 +876,7 @@ def test_ogr_sqlite_19():
     if int(gdal.VersionInfo('VERSION_NUM')) < 1800:
         pytest.skip()
 
-    if not gdaltest.has_spatialite:
-        pytest.skip()
-
-    if gdaltest.spatialite_version != '2.3.1':
+    if spatialite != '2.3.1':
         pytest.skip()
 
     ds = ogr.GetDriverByName('SQLite').CreateDataSource('tmp/spatialite_test_with_epsg.db', options=['SPATIALITE=YES', 'INIT_WITH_EPSG=YES'])
@@ -888,19 +897,17 @@ def test_ogr_sqlite_19():
     # Currently the injection of the EPSG DB as proj.4 strings adds 3915 entries
     assert nb_srs >= 3915, 'did not get expected SRS count'
 
+
 ###############################################################################
 # Create a SpatiaLite DB with INIT_WITH_EPSG=NO
 
 
-def test_ogr_sqlite_19_bis():
+def test_ogr_sqlite_19_bis(spatialite):
 
     if gdaltest.sl_ds is None:
         pytest.skip()
 
-    if not gdaltest.has_spatialite:
-        pytest.skip()
-
-    if int(gdaltest.spatialite_version[0:gdaltest.spatialite_version.find('.')]) < 4:
+    if int(spatialite[0:spatialite.find('.')]) < 4:
         pytest.skip()
 
     ds = ogr.GetDriverByName('SQLite').CreateDataSource('/vsimem/spatialite_test_without_epsg.db', options=['SPATIALITE=YES', 'INIT_WITH_EPSG=NO'])
@@ -951,6 +958,7 @@ def test_ogr_sqlite_20():
     # Currently the injection of the EPSG DB as proj.4 strings adds 3945 entries
     assert nb_srs >= 3945, 'did not get expected SRS count'
 
+
 ###############################################################################
 # Test CopyLayer() from a table layer (#3617)
 
@@ -1273,38 +1281,12 @@ def test_ogr_sqlite_30():
 
     gdaltest.sl_ds.ReleaseResultSet(sql_lyr)
 
-###############################################################################
-# Test if SpatiaLite is available
-
-
-def test_ogr_spatialite_1():
-
-    if gdaltest.sl_ds is None:
-        pytest.skip()
-
-    gdal.PushErrorHandler('CPLQuietErrorHandler')
-    sql_lyr = gdaltest.sl_ds.ExecuteSQL("SELECT spatialite_version()")
-    gdal.PopErrorHandler()
-    if sql_lyr is None:
-        res = 'skip'
-    else:
-        feat = sql_lyr.GetNextFeature()
-        print('Spatialite : %s' % feat.GetFieldAsString(0))
-        gdaltest.spatialite_version = feat.GetFieldAsString(0)
-        gdaltest.has_spatialite = True
-        gdaltest.sl_ds.ReleaseResultSet(sql_lyr)
-        res = 'success'
-
-    return res
 
 ###############################################################################
 # Test spatial filter when SpatiaLite is available
 
 
-def test_ogr_spatialite_2():
-
-    if not gdaltest.has_spatialite:
-        pytest.skip()
+def test_ogr_spatialite_2(spatialite):
 
     ds = ogr.Open('tmp/spatialite_test.db', update=1)
     srs = osr.SpatialReference()
@@ -1453,10 +1435,7 @@ def test_ogr_spatialite_2():
 # Test VirtualShape feature of SpatiaLite
 
 
-def test_ogr_spatialite_3():
-
-    if not gdaltest.has_spatialite:
-        pytest.skip()
+def test_ogr_spatialite_3(spatialite):
 
     ds = ogr.Open('tmp/spatialite_test.db', update=1)
     ds.ExecuteSQL('CREATE VIRTUAL TABLE testpoly USING VirtualShape(data/testpoly, CP1252, -1)')
@@ -1479,10 +1458,7 @@ def test_ogr_spatialite_3():
 # Test updating a spatialite DB (#3471 and #3474)
 
 
-def test_ogr_spatialite_4():
-
-    if not gdaltest.has_spatialite:
-        pytest.skip()
+def test_ogr_spatialite_4(spatialite):
 
     ds = ogr.Open('tmp/spatialite_test.db', update=1)
 
@@ -1527,13 +1503,18 @@ def test_ogr_spatialite_4():
     assert nb_idx_before + 1 == nb_idx_after, \
         ('nb_idx_before=%d, nb_idx_after=%d' % (nb_idx_before, nb_idx_after))
 
+
 ###############################################################################
 # Test writing and reading back spatialite geometries (#4092)
+# Test writing and reading back spatialite geometries in compressed form
 
 
-def test_ogr_spatialite_5(bUseComprGeom=False):
-
-    if not gdaltest.has_spatialite:
+@pytest.mark.parametrize(
+    'bUseComprGeom',
+    [False, True]
+)
+def test_ogr_spatialite_5(spatialite, bUseComprGeom):
+    if bUseComprGeom and spatialite == '2.3.1':
         pytest.skip()
 
     try:
@@ -1657,29 +1638,12 @@ def test_ogr_spatialite_5(bUseComprGeom=False):
     ds = None
 
 
-###############################################################################
-# Test writing and reading back spatialite geometries in compressed form
-
-def test_ogr_spatialite_compressed_geom_5():
-
-    if not gdaltest.has_spatialite:
-        pytest.skip()
-
-    if gdaltest.spatialite_version == '2.3.1':
-        pytest.skip()
-
-    return test_ogr_spatialite_5(bUseComprGeom=True)
-
 ###############################################################################
 # Test spatialite spatial views
 
 
-def test_ogr_spatialite_6():
-
-    if not gdaltest.has_spatialite:
-        pytest.skip()
-
-    if gdaltest.spatialite_version.find('2.3') == 0:
+def test_ogr_spatialite_6(spatialite):
+    if spatialite.find('2.3') == 0:
         pytest.skip()
 
     try:
@@ -1799,11 +1763,7 @@ def test_ogr_spatialite_6():
 # Test VirtualShape:xxx.shp
 
 
-def test_ogr_spatialite_7():
-
-    if not gdaltest.has_spatialite:
-        pytest.skip()
-
+def test_ogr_spatialite_7(spatialite):
     ds = ogr.Open('VirtualShape:data/poly.shp')
     assert ds is not None
 
@@ -1819,12 +1779,8 @@ def test_ogr_spatialite_7():
 # Test tables with multiple geometry columns (#4768)
 
 
-def test_ogr_spatialite_8():
-
-    if not gdaltest.has_spatialite:
-        pytest.skip()
-
-    if gdaltest.spatialite_version.find('2.3') == 0:
+def test_ogr_spatialite_8(spatialite):
+    if spatialite.find('2.3') == 0:
         pytest.skip()
 
     try:
@@ -2081,68 +2037,71 @@ def test_ogr_sqlite_32():
 # Test SRID layer creation option
 
 
-def test_ogr_sqlite_33():
-
+@pytest.mark.parametrize(
+    'use_spatialite',
+    [
+        False,
+        pytest.param(True, marks=pytest.mark.usefixtures('spatialite')),
+    ]
+)
+def test_ogr_sqlite_33(use_spatialite):
     if gdaltest.sl_ds is None:
         pytest.skip()
 
-    for i in range(2):
-        try:
-            os.remove('tmp/ogr_sqlite_33.sqlite')
-        except OSError:
-            pass
-        if i == 0:
-            options = []
-        else:
-            if not gdaltest.has_spatialite:
-                return
-            if gdaltest.spatialite_version.find('2.3') == 0:
-                return
-            options = ['SPATIALITE=YES']
-
-        ds = ogr.GetDriverByName('SQLite').CreateDataSource('tmp/ogr_sqlite_33.sqlite', options=options)
-
-        if i == 0:
-            # To make sure that the entry is added in spatial_ref_sys
-            srs = osr.SpatialReference()
-            srs.ImportFromEPSG(4326)
-            lyr = ds.CreateLayer('test1', srs=srs)
-
-        # Test with existing entry
-        lyr = ds.CreateLayer('test2', options=['SRID=4326'])
-
-        # Test with non-existing entry
-        gdal.PushErrorHandler('CPLQuietErrorHandler')
-        lyr = ds.CreateLayer('test3', options=['SRID=123456'])
-        gdal.PopErrorHandler()
-        ds = None
-
-        ds = ogr.Open('tmp/ogr_sqlite_33.sqlite')
-        lyr = ds.GetLayerByName('test2')
-        srs = lyr.GetSpatialRef()
-        assert srs.ExportToWkt().find('4326') != -1, i
-
-        # 123456 should be referenced in geometry_columns...
-        sql_lyr = ds.ExecuteSQL('SELECT * from geometry_columns WHERE srid=123456')
-        feat = sql_lyr.GetNextFeature()
-        is_none = feat is None
-        feat = None
-        ds.ReleaseResultSet(sql_lyr)
 
-        assert not is_none, i
+    try:
+        os.remove('tmp/ogr_sqlite_33.sqlite')
+    except OSError:
+        pass
+    if not use_spatialite:
+        options = []
+    else:
+        if gdaltest.spatialite_version.find('2.3') == 0:
+            return
+        options = ['SPATIALITE=YES']
 
-        # ... but not in spatial_ref_sys
-        sql_lyr = ds.ExecuteSQL('SELECT * from spatial_ref_sys WHERE srid=123456')
-        feat = sql_lyr.GetNextFeature()
-        is_none = feat is None
-        feat = None
-        ds.ReleaseResultSet(sql_lyr)
+    ds = ogr.GetDriverByName('SQLite').CreateDataSource('tmp/ogr_sqlite_33.sqlite', options=options)
 
-        assert is_none, i
+    if not use_spatialite:
+        # To make sure that the entry is added in spatial_ref_sys
+        srs = osr.SpatialReference()
+        srs.ImportFromEPSG(4326)
+        lyr = ds.CreateLayer('test1', srs=srs)
+
+    # Test with existing entry
+    lyr = ds.CreateLayer('test2', options=['SRID=4326'])
+
+    # Test with non-existing entry
+    gdal.PushErrorHandler('CPLQuietErrorHandler')
+    lyr = ds.CreateLayer('test3', options=['SRID=123456'])
+    gdal.PopErrorHandler()
+    ds = None
+
+    ds = ogr.Open('tmp/ogr_sqlite_33.sqlite')
+    lyr = ds.GetLayerByName('test2')
+    srs = lyr.GetSpatialRef()
+    if srs.ExportToWkt().find('4326') == -1:
+        pytest.fail('failure')
+
+    # 123456 should be referenced in geometry_columns...
+    sql_lyr = ds.ExecuteSQL('SELECT * from geometry_columns WHERE srid=123456')
+    feat = sql_lyr.GetNextFeature()
+    is_none = feat is None
+    feat = None
+    ds.ReleaseResultSet(sql_lyr)
+
+    assert not is_none
+
+    # ... but not in spatial_ref_sys
+    sql_lyr = ds.ExecuteSQL('SELECT * from spatial_ref_sys WHERE srid=123456')
+    feat = sql_lyr.GetNextFeature()
+    is_none = feat is None
+    feat = None
+    ds.ReleaseResultSet(sql_lyr)
+
+    assert is_none
 
-        ds = None
 
-    
 ###############################################################################
 # Test REGEXP support (#4823)
 
@@ -2205,17 +2164,26 @@ def test_ogr_sqlite_34():
             gdaltest.sl_ds.ReleaseResultSet(sql_lyr)
             assert val == 1
 
-    
+
 ###############################################################################
 # Test SetAttributeFilter() on SQL result layer
 
 
-def test_ogr_sqlite_35():
+@pytest.mark.parametrize(
+    'use_spatialite',
+    [
+        False,
+        pytest.param(True, marks=pytest.mark.usefixtures('spatialite')),
+    ]
+)
+def test_ogr_sqlite_35(use_spatialite):
 
     if gdaltest.sl_ds is None:
         pytest.skip()
 
-    if gdaltest.has_spatialite and gdaltest.spatialite_version.find('2.3') < 0:
+    if use_spatialite:
+        if gdaltest.spatialite_version.find('2.3') >= 0:
+            pytest.skip()
         options = ['SPATIALITE=YES']
     else:
         options = []
@@ -2517,11 +2485,7 @@ def test_ogr_sqlite_38():
 # Test spatial filters with point extent
 
 
-def test_ogr_spatialite_9():
-
-    if not gdaltest.has_spatialite:
-        pytest.skip()
-
+def test_ogr_spatialite_9(spatialite):
     ds = ogr.GetDriverByName('SQLite').CreateDataSource('/vsimem/ogr_spatialite_9.sqlite', options=['SPATIALITE=YES'])
     lyr = ds.CreateLayer('point', geom_type=ogr.wkbPoint)
     feat = ogr.Feature(lyr.GetLayerDefn())
@@ -2538,10 +2502,7 @@ def test_ogr_spatialite_9():
 # Test not nullable fields
 
 
-def test_ogr_spatialite_10():
-
-    if not gdaltest.has_spatialite:
-        pytest.skip()
+def test_ogr_spatialite_10(spatialite):
     try:
         os.remove('tmp/ogr_spatialite_10.sqlite')
     except OSError:
@@ -2653,12 +2614,19 @@ def test_ogr_sqlite_39():
 # Test dataset transactions
 
 
-def test_ogr_sqlite_40():
+@pytest.mark.parametrize(
+    'use_spatialite',
+    [
+        False,
+        pytest.param(True, marks=pytest.mark.usefixtures('spatialite')),
+    ]
+)
+def test_ogr_sqlite_40(use_spatialite):
 
     if gdaltest.sl_ds is None:
         pytest.skip()
 
-    if gdaltest.has_spatialite:
+    if use_spatialite:
         options = ['SPATIALITE=YES']
     else:
         options = []
@@ -2935,11 +2903,7 @@ def test_ogr_sqlite_45():
 ###############################################################################
 # Test creating unsupported geometry types
 
-def test_ogr_spatialite_11():
-
-    if not gdaltest.has_spatialite:
-        pytest.skip()
-
+def test_ogr_spatialite_11(spatialite):
     ds = ogr.GetDriverByName('SQLite').CreateDataSource('/vsimem/ogr_spatialite_11.sqlite', options=['SPATIALITE=YES'])
 
     # Will be converted to LineString
@@ -2961,11 +2925,7 @@ def test_ogr_spatialite_11():
 # Test opening a .sql file
 
 
-def test_ogr_spatialite_12():
-
-    if not gdaltest.has_spatialite:
-        pytest.skip()
-
+def test_ogr_spatialite_12(spatialite):
     if gdal.GetDriverByName('SQLite').GetMetadataItem("ENABLE_SQL_SQLITE_FORMAT") != 'YES':
         pytest.skip()
 
@@ -3027,112 +2987,17 @@ def test_ogr_sqlite_cleanup():
 
     gdaltest.shp_ds = None
 
-    try:
-        os.remove('tmp/sqlite_test.db')
-    except OSError:
-        pass
-
-    try:
-        os.remove('tmp/spatialite_test.db')
-    except OSError:
-        pass
-
-    try:
-        os.remove('tmp/spatialite_test_with_epsg.db')
-    except OSError:
-        pass
-
-    try:
-        os.remove('tmp/non_spatialite_test_with_epsg.db')
-    except OSError:
-        pass
-    try:
-        os.remove('tmp/test24.sqlite')
-    except OSError:
-        pass
-
-    try:
-        os.remove('tmp/ogr_spatialite_5.sqlite')
-    except OSError:
-        pass
-
-    try:
-        os.remove('tmp/ogr_spatialite_6.sqlite')
-    except OSError:
-        pass
-
-    try:
-        os.remove('tmp/ogr_sqlite_27.sqlite')
-    except OSError:
-        pass
-
-    try:
-        os.remove('tmp/ogr_sqlite_29.sqlite')
-    except OSError:
-        pass
-
-    try:
-        os.remove('tmp/ogr_spatialite_8.sqlite')
-    except OSError:
-        pass
-
-    try:
-        os.remove('tmp/ogr_sqlite_31.sqlite')
-    except OSError:
-        pass
-
-    try:
-        os.remove('tmp/ogr_sqlite_32.sqlite')
-    except OSError:
-        pass
-
-    try:
-        os.remove('tmp/ogr_sqlite_33.sqlite')
-    except OSError:
-        pass
-
-    try:
-        os.remove('tmp/ogr_sqlite_35.sqlite')
-    except OSError:
-        pass
-
-    try:
-        os.remove('tmp/ogr_sqlite_36.sqlite')
-    except OSError:
-        pass
 
-    try:
-        os.remove('tmp/ogr_sqlite_37.sqlite')
-    except OSError:
-        pass
-
-    try:
-        os.remove('tmp/ogr_sqlite_38.sqlite')
-    except OSError:
-        pass
-    try:
-        os.remove('tmp/ogr_spatialite_10.sqlite')
-    except OSError:
-        pass
-    
 ###############################################################################
 # Ask to run again tests in a new python process without libspatialite loaded
+# TODO: I don't think this is really feasible with pytest (?)
 
+# def test_ogr_sqlite_without_spatialite():
 
-def test_ogr_sqlite_without_spatialite():
+#     if not gdaltest.has_spatialite or not run_without_spatialite:
+#         pytest.skip()
 
-    if not gdaltest.has_spatialite or not run_without_spatialite:
-        pytest.skip()
-
-    import test_py_scripts
-    ret = test_py_scripts.run_py_script_as_external_script('.', 'ogr_sqlite', ' -without_spatialite', display_live_on_parent_stdout=True)
-
-    assert ret.find('Failed:    0') != -1
+#     import test_py_scripts
+#     ret = test_py_scripts.run_py_script_as_external_script('.', 'ogr_sqlite', ' -without_spatialite', display_live_on_parent_stdout=True)
 
-
-
-disabled_gdaltest_list = [
-    test_ogr_sqlite_1,
-    test_ogr_sqlite_45,
-    test_ogr_sqlite_cleanup,
-]
+#     assert ret.find('Failed:    0') != -1
diff --git a/autotest/ogr/ogr_virtualogr.py b/autotest/ogr/ogr_virtualogr.py
index 35669d209ffc..ca0f5aa0ac59 100755
--- a/autotest/ogr/ogr_virtualogr.py
+++ b/autotest/ogr/ogr_virtualogr.py
@@ -35,12 +35,17 @@
 from osgeo import ogr
 from osgeo import gdal
 import gdaltest
-import ogrtest
 import pytest
 
+# Linter says this isn't used, but it actually is via pytest magic :)
+from ogr.ogr_sql_sqlite import require_ogr_sql_sqlite  # noqa
+
 ###############################################################################
 
 
+pytestmark = pytest.mark.usefixtures('require_ogr_sql_sqlite')
+
+
 def ogr_virtualogr_run_sql(sql_statement):
 
     ds = ogr.GetDriverByName('SQLite').CreateDataSource(':memory:')
@@ -71,11 +76,6 @@ def ogr_virtualogr_run_sql(sql_statement):
 
 
 def test_ogr_virtualogr_1():
-
-    import ogr_sql_sqlite
-    if not ogr_sql_sqlite.ogr_sql_sqlite_available():
-        pytest.skip()
-
     # Invalid syntax
     assert not ogr_virtualogr_run_sql("CREATE VIRTUAL TABLE poly USING VirtualOGR()")
 
@@ -116,10 +116,6 @@ def test_ogr_virtualogr_1():
 
 
 def test_ogr_virtualogr_2():
-
-    if not ogrtest.has_sqlite_dialect:
-        pytest.skip()
-
     ds = ogr.GetDriverByName('SQLite').CreateDataSource('/vsimem/ogr_virtualogr_2.db')
     ds.ExecuteSQL("CREATE VIRTUAL TABLE foo USING VirtualOGR('data/poly.shp')")
     ds.ExecuteSQL("CREATE TABLE spy_table (spy_content VARCHAR)")
@@ -187,10 +183,6 @@ def test_ogr_virtualogr_2():
 
 
 def test_ogr_virtualogr_3():
-
-    if not ogrtest.has_sqlite_dialect:
-        pytest.skip()
-
     # Find path of libgdal
     libgdal_name = gdaltest.find_lib('gdal')
     if libgdal_name is None:
@@ -215,17 +207,13 @@ def test_ogr_virtualogr_3():
 
     if ret.find('skip') == 0:
         pytest.skip()
-    assert ret.find(gdal.VersionInfo('RELEASE_NAME')) >= 0, ('fail : %s' % ret)
+    assert gdal.VersionInfo('RELEASE_NAME') in ret
 
 ###############################################################################
 # Test ogr_datasource_load_layers()
 
 
 def test_ogr_virtualogr_4():
-
-    if not ogrtest.has_sqlite_dialect:
-        pytest.skip()
-
     ds = ogr.GetDriverByName('SQLite').CreateDataSource('/vsimem/ogr_virtualogr_4.db')
     sql_lyr = ds.ExecuteSQL("SELECT ogr_datasource_load_layers('data/poly.shp')")
     ds.ReleaseResultSet(sql_lyr)
@@ -284,9 +272,6 @@ def test_ogr_virtualogr_4():
 
 def test_ogr_virtualogr_5():
 
-    if not ogrtest.has_sqlite_dialect:
-        pytest.skip()
-
     # Create a CSV with duplicate column name
     fp = gdal.VSIFOpenL('/vsimem/ogr_virtualogr_5.csv', 'wt')
     line = 'foo,foo\n'
diff --git a/autotest/osr/__init__.py b/autotest/osr/__init__.py
new file mode 100644
index 000000000000..e69de29bb2d1
diff --git a/autotest/osr/osr_compd.py b/autotest/osr/osr_compd.py
index 4a6557cb0194..b5b1f07d972c 100755
--- a/autotest/osr/osr_compd.py
+++ b/autotest/osr/osr_compd.py
@@ -30,7 +30,7 @@
 # DEALINGS IN THE SOFTWARE.
 ###############################################################################
 
-import osr_proj4
+from osr import osr_proj4
 
 
 import gdaltest
diff --git a/autotest/osr/osr_ct_proj.py b/autotest/osr/osr_ct_proj.py
index 512aaf745261..ce6ef2e59424 100755
--- a/autotest/osr/osr_ct_proj.py
+++ b/autotest/osr/osr_ct_proj.py
@@ -142,7 +142,7 @@ def test_proj(src_srs, src_xyz, src_error,
              dst_srs, dst_xyz, dst_error, unit_name, options, requirements):
 
     import osr_ct
-    osr_ct.osr_ct_1()
+    osr_ct.test_osr_ct_1()
     if gdaltest.have_proj4 == 0:
         pytest.skip()
 
diff --git a/autotest/pymod/gdaltest.py b/autotest/pymod/gdaltest.py
index 50e46ec42052..0aeb70a39cb9 100644
--- a/autotest/pymod/gdaltest.py
+++ b/autotest/pymod/gdaltest.py
@@ -266,9 +266,9 @@ def __init__(self, drivername, filename, band, chksum,
     def testDriver(self):
         if self.driver is None:
             self.driver = gdal.GetDriverByName(self.drivername)
-            assert self.driver is not None, (self.drivername + ' driver not found!')
+            if self.driver is None:
+                pytest.skip(self.drivername + ' driver not found!')
 
-        
     def testOpen(self, check_prj=None, check_gt=None, gt_epsilon=None,
                  check_stat=None, check_approx_stat=None,
                  stat_epsilon=None, skip_checksum=None, check_min=None,
@@ -277,8 +277,7 @@ def testOpen(self, check_prj=None, check_gt=None, gt_epsilon=None,
         matrix (tuple), gt_epsilon - geotransformation tolerance,
         check_stat - band statistics (tuple), stat_epsilon - statistics
         tolerance."""
-        if self.testDriver() == 'fail':
-            pytest.skip()
+        self.testDriver()
 
         if self.filename_absolute:
             wrk_filename = self.filename
@@ -454,8 +453,7 @@ def testCreateCopy(self, check_minmax=1, check_gt=0, check_srs=None,
                        check_checksum_not_null=None, interrupt_during_copy=False,
                        dest_open_options=None, quiet_error_handler=True):
 
-        if self.testDriver() == 'fail':
-            pytest.skip()
+        self.testDriver()
 
         if self.filename_absolute:
             wrk_filename = self.filename
@@ -591,8 +589,7 @@ def testCreateCopy(self, check_minmax=1, check_gt=0, check_srs=None,
 
     def testCreate(self, vsimem=0, new_filename=None, out_bands=1,
                    check_minmax=1, dest_open_options=None):
-        if self.testDriver() == 'fail':
-            pytest.skip()
+        self.testDriver()
 
         if self.filename_absolute:
             wrk_filename = self.filename
@@ -663,8 +660,7 @@ def testCreate(self, vsimem=0, new_filename=None, out_bands=1,
             self.driver.Delete(new_filename)
 
     def testSetGeoTransform(self):
-        if self.testDriver() == 'fail':
-            pytest.skip()
+        self.testDriver()
 
         wrk_filename = 'data/' + self.filename
         if self.open_options:
@@ -710,8 +706,7 @@ def testSetGeoTransform(self):
             self.driver.Delete(new_filename)
 
     def testSetProjection(self, prj=None, expected_prj=None):
-        if self.testDriver() == 'fail':
-            pytest.skip()
+        self.testDriver()
 
         wrk_filename = 'data/' + self.filename
         if self.open_options:
@@ -767,8 +762,7 @@ def testSetProjection(self, prj=None, expected_prj=None):
             self.driver.Delete(new_filename)
 
     def testSetMetadata(self):
-        if self.testDriver() == 'fail':
-            pytest.skip()
+        self.testDriver()
 
         wrk_filename = 'data/' + self.filename
         if self.open_options:
@@ -810,8 +804,7 @@ def testSetMetadata(self):
             self.driver.Delete(new_filename)
 
     def testSetNoDataValue(self, delete=False):
-        if self.testDriver() == 'fail':
-            pytest.skip()
+        self.testDriver()
 
         wrk_filename = 'data/' + self.filename
         if self.open_options:
@@ -867,8 +860,7 @@ def testSetNoDataValueAndDelete(self):
         return self.testSetNoDataValue(delete=True)
 
     def testSetDescription(self):
-        if self.testDriver() == 'fail':
-            pytest.skip()
+        self.testDriver()
 
         wrk_filename = 'data/' + self.filename
         if self.open_options:
@@ -903,8 +895,7 @@ def testSetDescription(self):
             self.driver.Delete(new_filename)
 
     def testSetUnitType(self):
-        if self.testDriver() == 'fail':
-            pytest.skip()
+        self.testDriver()
 
         wrk_filename = 'data/' + self.filename
         if self.open_options:
diff --git a/autotest/pyscripts/__init__.py b/autotest/pyscripts/__init__.py
new file mode 100644
index 000000000000..e69de29bb2d1
diff --git a/autotest/pyscripts/test_gdal2tiles.py b/autotest/pyscripts/test_gdal2tiles.py
index d66a7c95e8c8..c72707ff3a02 100755
--- a/autotest/pyscripts/test_gdal2tiles.py
+++ b/autotest/pyscripts/test_gdal2tiles.py
@@ -265,7 +265,6 @@ def _test_utf8(should_raise_unicode=False,
     except OSError:
         pass
 
-    
 
 def test_gdal2tiles_py_cleanup():
 
diff --git a/autotest/pyscripts/test_gdal_ls_py.py b/autotest/pyscripts/test_gdal_ls_py.py
index 5c70c9fe7fa7..5bf1d8119568 100755
--- a/autotest/pyscripts/test_gdal_ls_py.py
+++ b/autotest/pyscripts/test_gdal_ls_py.py
@@ -43,7 +43,7 @@
 def run_gdal_ls(argv):
     script_path = test_py_scripts.get_py_script('gdal_ls')
     if script_path is None:
-        return ('skip', None)
+        pytest.skip()
 
     saved_syspath = sys.path
     sys.path.append(script_path)
@@ -51,7 +51,7 @@ def run_gdal_ls(argv):
         import gdal_ls
     except ImportError:
         sys.path = saved_syspath
-        return ('fail', None)
+        pytest.fail()
 
     sys.path = saved_syspath
 
@@ -66,11 +66,9 @@ def run_gdal_ls(argv):
     retstr = outstr.getvalue()
     outstr.close()
 
-    if ret != 0:
-        gdaltest.post_reason('got error code : %d' % ret)
-        return ('fail', 'None')
+    assert ret == 0, 'got error code : %d' % ret
 
-    return ('success', retstr)
+    return retstr
 
 ###############################################################################
 # List one file
@@ -78,7 +76,7 @@ def run_gdal_ls(argv):
 
 def test_gdal_ls_py_1():
     # TODO: Why the '' as the first element of the list here and below?
-    ret, ret_str = run_gdal_ls(['', '-l', '../ogr/data/poly.shp'])
+    ret_str = run_gdal_ls(['', '-l', '../ogr/data/poly.shp'])
 
     assert ret_str.find('poly.shp') != -1
 
@@ -87,7 +85,7 @@ def test_gdal_ls_py_1():
 
 
 def test_gdal_ls_py_2():
-    ret, ret_str = run_gdal_ls(['', '-l', '../ogr/data'])
+    ret_str = run_gdal_ls(['', '-l', '../ogr/data'])
 
     assert ret_str.find('poly.shp') != -1
 
@@ -96,16 +94,17 @@ def test_gdal_ls_py_2():
 
 
 def test_gdal_ls_py_3():
-    ret, ret_str = run_gdal_ls(['', '-R', '../ogr/data'])
+    ret_str = run_gdal_ls(['', '-R', '../ogr/data'])
 
     assert ret_str.find('PROJ_UNITS') != -1
 
+
 ###############################################################################
 # List in a .zip
 
 
 def test_gdal_ls_py_4():
-    ret, ret_str = run_gdal_ls(['', '-l', '/vsizip/../ogr/data/poly.zip'])
+    ret_str = run_gdal_ls(['', '-l', '/vsizip/../ogr/data/poly.zip'])
 
     if ret_str.find('-r--r--r--  1 unknown unknown          415 2008-02-11 21:35 /vsizip/../ogr/data/poly.zip/poly.PRJ') == -1:
         if gdaltest.skip_on_travis():
@@ -115,7 +114,7 @@ def test_gdal_ls_py_4():
             pytest.skip()
         pytest.fail(ret_str)
 
-    
+
 ###############################################################################
 # List dir in /vsicurl/
 
@@ -137,16 +136,14 @@ def test_gdal_ls_py_5():
     if not d:
         pytest.skip()
 
-    # ret, ret_str = run_gdal_ls(['', '-R', 'https://raw.githubusercontent.com/OSGeo/gdal/master/autotest/ogr/data/'])
-    #
-    # if ret != 'success':
-    #    return ret
+    # ret_str = run_gdal_ls(['', '-R', 'https://raw.githubusercontent.com/OSGeo/gdal/master/autotest/ogr/data/'])
+
     #
     # if ret_str.find('/vsicurl/https://raw.githubusercontent.com/OSGeo/gdal/master/autotest/ogr/data/wkb_wkt/3d_broken_line.wkb') == -1:
     #    print(ret_str)
-    #    return 'fail'
+    #    pytest.fail()
+
 
-    
 ###############################################################################
 # List in a .zip in /vsicurl/
 
@@ -165,7 +162,7 @@ def test_gdal_ls_py_6():
     if not d:
         pytest.skip()
 
-    ret, ret_str = run_gdal_ls(['', '-l', '/vsizip/vsicurl/https://raw.githubusercontent.com/OSGeo/gdal/master/autotest/ogr/data/poly.zip'])
+    ret_str = run_gdal_ls(['', '-l', '/vsizip/vsicurl/https://raw.githubusercontent.com/OSGeo/gdal/master/autotest/ogr/data/poly.zip'])
 
     if ret_str.find('-r--r--r--  1 unknown unknown          415 2008-02-11 21:35 /vsizip/vsicurl/https://raw.githubusercontent.com/OSGeo/gdal/master/autotest/ogr/data/poly.zip/poly.PRJ') == -1:
         if gdaltest.skip_on_travis():
@@ -175,7 +172,7 @@ def test_gdal_ls_py_6():
             pytest.skip()
         pytest.fail(ret_str)
 
-    
+
 ###############################################################################
 # List dir in /vsicurl/ and recurse in zip
 
@@ -201,16 +198,13 @@ def test_gdal_ls_py_7():
     if not d:
         pytest.skip()
 
-    # ret, ret_str = run_gdal_ls(['', '-R', '-Rzip', 'https://raw.githubusercontent.com/OSGeo/gdal/master/autotest/ogr/data/'])
-
-    # if ret != 'success':
-    #    return ret
+    # ret_str = run_gdal_ls(['', '-R', '-Rzip', 'https://raw.githubusercontent.com/OSGeo/gdal/master/autotest/ogr/data/'])
 
     # if ret_str.find('/vsizip//vsicurl/https://raw.githubusercontent.com/OSGeo/gdal/master/autotest/ogr/data/poly.zip/poly.PRJ') == -1:
     #    print(ret_str)
-    #    return 'fail'
+    #    pytest.fail()
+
 
-    
 ###############################################################################
 # List FTP dir in /vsicurl/
 
@@ -234,11 +228,8 @@ def test_gdal_ls_py_8():
     if not d:
         pytest.skip()
 
-    ret, ret_str = run_gdal_ls(['', '-l', '-R', '-Rzip', 'ftp://download.osgeo.org/gdal/data/aig'])
+    ret_str = run_gdal_ls(['', '-l', '-R', '-Rzip', 'ftp://download.osgeo.org/gdal/data/aig'])
 
     assert ret_str.find('-r--r--r--  1 unknown unknown        24576 2007-03-29 00:00 /vsicurl/ftp://download.osgeo.org/gdal/data/aig/nzdem/info/arc0002r.001') != -1
 
     assert ret_str.find('-r--r--r--  1 unknown unknown        24576 2007-03-29 12:20 /vsizip//vsicurl/ftp://download.osgeo.org/gdal/data/aig/nzdem.zip/nzdem/info/arc0002r.001') != -1
-
-
-
diff --git a/autotest/pyscripts/test_ogr2ogr_py.py b/autotest/pyscripts/test_ogr2ogr_py.py
index fab5fbab75a4..290be0eb95cc 100755
--- a/autotest/pyscripts/test_ogr2ogr_py.py
+++ b/autotest/pyscripts/test_ogr2ogr_py.py
@@ -190,7 +190,7 @@ def test_ogr2ogr_py_6():
     if test_cli_utilities.get_ogrinfo_path() is None:
         pytest.skip()
 
-    ogr_pg.ogr_pg_1()
+    ogr_pg.test_ogr_pg_1()
     if gdaltest.pg_ds is None:
         pytest.skip()
     gdaltest.pg_ds.Destroy()
@@ -220,7 +220,7 @@ def test_ogr2ogr_py_7():
     if test_cli_utilities.get_ogrinfo_path() is None:
         pytest.skip()
 
-    ogr_pg.ogr_pg_1()
+    ogr_pg.test_ogr_pg_1()
     if gdaltest.pg_ds is None:
         pytest.skip()
     gdaltest.pg_ds.Destroy()
@@ -394,6 +394,7 @@ def test_ogr2ogr_py_13():
 # Test -segmentize
 
 
+@pytest.mark.xfail
 def test_ogr2ogr_py_14():
     script_path = test_py_scripts.get_py_script('ogr2ogr')
     if script_path is None:
@@ -502,6 +503,7 @@ def test_ogr2ogr_py_17():
 # Test -wrapdateline
 
 
+@pytest.mark.xfail
 def test_ogr2ogr_py_18():
     script_path = test_py_scripts.get_py_script('ogr2ogr')
     if script_path is None:
diff --git a/autotest/pyscripts/test_ogrmerge.py b/autotest/pyscripts/test_ogrmerge.py
index 8d1a539c76b3..d88b5c6e69f1 100755
--- a/autotest/pyscripts/test_ogrmerge.py
+++ b/autotest/pyscripts/test_ogrmerge.py
@@ -46,14 +46,14 @@ def test_ogrmerge_1():
         pytest.skip()
 
     test_py_scripts.run_py_script(script_path, 'ogrmerge',
-                                  '-single -o /vsimem/out.shp ../ogr/data/poly.shp ../ogr/data/poly.shp')
+                                  '-single -o tmp/out.shp ../ogr/data/poly.shp ../ogr/data/poly.shp')
 
-    ds = ogr.Open('/vsimem/out.shp')
+    ds = ogr.Open('tmp/out.shp')
     lyr = ds.GetLayer(0)
     assert lyr.GetFeatureCount() == 20
     ds = None
 
-    ogr.GetDriverByName('ESRI Shapefile').DeleteDataSource('/vsimem/out.shp')
+    ogr.GetDriverByName('ESRI Shapefile').DeleteDataSource('tmp/out.shp')
 
 ###############################################################################
 # Test -append and glob
@@ -65,16 +65,16 @@ def test_ogrmerge_2():
         pytest.skip()
 
     test_py_scripts.run_py_script(script_path, 'ogrmerge',
-                                  '-single -o /vsimem/out.shp ../ogr/data/poly.shp')
+                                  '-single -o tmp/out.shp ../ogr/data/poly.shp')
     test_py_scripts.run_py_script(script_path, 'ogrmerge',
-                                  '-append -single -o /vsimem/out.shp "../ogr/data/p*ly.shp"')
+                                  '-append -single -o tmp/out.shp "../ogr/data/p*ly.shp"')
 
-    ds = ogr.Open('/vsimem/out.shp')
+    ds = ogr.Open('tmp/out.shp')
     lyr = ds.GetLayer(0)
     assert lyr.GetFeatureCount() == 20
     ds = None
 
-    ogr.GetDriverByName('ESRI Shapefile').DeleteDataSource('/vsimem/out.shp')
+    ogr.GetDriverByName('ESRI Shapefile').DeleteDataSource('tmp/out.shp')
 
 ###############################################################################
 # Test -overwrite_ds
@@ -86,16 +86,16 @@ def test_ogrmerge_3():
         pytest.skip()
 
     test_py_scripts.run_py_script(script_path, 'ogrmerge',
-                                  '-overwrite_ds -o /vsimem/out.shp ../ogr/data/poly.shp')
+                                  '-overwrite_ds -o tmp/out.shp ../ogr/data/poly.shp')
     test_py_scripts.run_py_script(script_path, 'ogrmerge',
-                                  '-overwrite_ds -single -o /vsimem/out.shp ../ogr/data/poly.shp')
+                                  '-overwrite_ds -single -o tmp/out.shp ../ogr/data/poly.shp')
 
-    ds = ogr.Open('/vsimem/out.shp')
+    ds = ogr.Open('tmp/out.shp')
     lyr = ds.GetLayer(0)
     assert lyr.GetFeatureCount() == 10
     ds = None
 
-    ogr.GetDriverByName('ESRI Shapefile').DeleteDataSource('/vsimem/out.shp')
+    ogr.GetDriverByName('ESRI Shapefile').DeleteDataSource('tmp/out.shp')
 
 ###############################################################################
 # Test -f VRT
@@ -107,15 +107,15 @@ def test_ogrmerge_4():
         pytest.skip()
 
     test_py_scripts.run_py_script(script_path, 'ogrmerge',
-                                  '-f VRT -o /vsimem/out.vrt ../ogr/data/poly.shp')
+                                  '-f VRT -o tmp/out.vrt ../ogr/data/poly.shp')
 
-    ds = ogr.Open('/vsimem/out.vrt')
+    ds = ogr.Open('tmp/out.vrt')
     lyr = ds.GetLayer(0)
     assert lyr.GetName() == 'poly'
     assert lyr.GetFeatureCount() == 10
     ds = None
 
-    gdal.Unlink('/vsimem/out.vrt')
+    gdal.Unlink('tmp/out.vrt')
 
 ###############################################################################
 # Test -nln
@@ -127,10 +127,10 @@ def test_ogrmerge_5():
         pytest.skip()
 
     test_py_scripts.run_py_script(script_path, 'ogrmerge',
-                                  '-f VRT -o /vsimem/out.vrt ../ogr/data/poly.shp ../ogr/data/testpoly.shp -nln '
+                                  '-f VRT -o tmp/out.vrt ../ogr/data/poly.shp ../ogr/data/testpoly.shp -nln '
                                   '"foo_{DS_NAME}_{DS_BASENAME}_{DS_INDEX}_{LAYER_NAME}_{LAYER_INDEX}"')
 
-    ds = ogr.Open('/vsimem/out.vrt')
+    ds = ogr.Open('tmp/out.vrt')
     lyr = ds.GetLayer(0)
     assert lyr.GetName() == 'foo_../ogr/data/poly.shp_poly_0_poly_0'
     assert lyr.GetFeatureCount() == 10
@@ -139,7 +139,7 @@ def test_ogrmerge_5():
     assert lyr.GetFeatureCount() == 14
     ds = None
 
-    gdal.Unlink('/vsimem/out.vrt')
+    gdal.Unlink('tmp/out.vrt')
 
 ###############################################################################
 # Test -src_layer_field_name -src_layer_field_content
@@ -151,11 +151,11 @@ def test_ogrmerge_6():
         pytest.skip()
 
     test_py_scripts.run_py_script(script_path, 'ogrmerge',
-                                  '-single -f VRT -o /vsimem/out.vrt ../ogr/data/poly.shp '
+                                  '-single -f VRT -o tmp/out.vrt ../ogr/data/poly.shp '
                                   '-src_layer_field_name source -src_layer_field_content '
                                   '"foo_{DS_NAME}_{DS_BASENAME}_{DS_INDEX}_{LAYER_NAME}_{LAYER_INDEX}"')
 
-    ds = ogr.Open('/vsimem/out.vrt')
+    ds = ogr.Open('tmp/out.vrt')
     lyr = ds.GetLayer(0)
     f = lyr.GetNextFeature()
     if f['source'] != 'foo_../ogr/data/poly.shp_poly_0_poly_0':
@@ -163,7 +163,7 @@ def test_ogrmerge_6():
         pytest.fail()
     ds = None
 
-    gdal.Unlink('/vsimem/out.vrt')
+    gdal.Unlink('tmp/out.vrt')
 
 ###############################################################################
 # Test -src_geom_type
@@ -176,47 +176,47 @@ def test_ogrmerge_7():
 
     # No match in -single mode
     test_py_scripts.run_py_script(script_path, 'ogrmerge',
-                                  '-single -f VRT -o /vsimem/out.vrt ../ogr/data/poly.shp '
+                                  '-single -f VRT -o tmp/out.vrt ../ogr/data/poly.shp '
                                   '-src_geom_type POINT')
 
-    ds = ogr.Open('/vsimem/out.vrt')
+    ds = ogr.Open('tmp/out.vrt')
     assert ds.GetLayerCount() == 0
     ds = None
 
-    gdal.Unlink('/vsimem/out.vrt')
+    gdal.Unlink('tmp/out.vrt')
 
     # Match in single mode
     test_py_scripts.run_py_script(script_path, 'ogrmerge',
-                                  '-single -f VRT -o /vsimem/out.vrt ../ogr/data/poly.shp '
+                                  '-single -f VRT -o tmp/out.vrt ../ogr/data/poly.shp '
                                   '-src_geom_type POLYGON')
 
-    ds = ogr.Open('/vsimem/out.vrt')
+    ds = ogr.Open('tmp/out.vrt')
     assert ds.GetLayerCount() == 1
     ds = None
 
-    gdal.Unlink('/vsimem/out.vrt')
+    gdal.Unlink('tmp/out.vrt')
 
     # No match in default mode
     test_py_scripts.run_py_script(script_path, 'ogrmerge',
-                                  '-f VRT -o /vsimem/out.vrt ../ogr/data/poly.shp '
+                                  '-f VRT -o tmp/out.vrt ../ogr/data/poly.shp '
                                   '-src_geom_type POINT')
 
-    ds = ogr.Open('/vsimem/out.vrt')
+    ds = ogr.Open('tmp/out.vrt')
     assert ds.GetLayerCount() == 0
     ds = None
 
-    gdal.Unlink('/vsimem/out.vrt')
+    gdal.Unlink('tmp/out.vrt')
 
     # Match in default mode
     test_py_scripts.run_py_script(script_path, 'ogrmerge',
-                                  '-f VRT -o /vsimem/out.vrt ../ogr/data/poly.shp '
+                                  '-f VRT -o tmp/out.vrt ../ogr/data/poly.shp '
                                   '-src_geom_type POLYGON')
 
-    ds = ogr.Open('/vsimem/out.vrt')
+    ds = ogr.Open('tmp/out.vrt')
     assert ds.GetLayerCount() == 1
     ds = None
 
-    gdal.Unlink('/vsimem/out.vrt')
+    gdal.Unlink('tmp/out.vrt')
 
 ###############################################################################
 # Test -s_srs -t_srs in -single mode
@@ -228,19 +228,19 @@ def test_ogrmerge_8():
         pytest.skip()
 
     test_py_scripts.run_py_script(script_path, 'ogrmerge',
-                                  '-single -f VRT -o /vsimem/out.vrt ../ogr/data/poly.shp '
+                                  '-single -f VRT -o tmp/out.vrt ../ogr/data/poly.shp '
                                   '-s_srs EPSG:32630 -t_srs EPSG:4326')
 
-    ds = ogr.Open('/vsimem/out.vrt')
+    ds = ogr.Open('tmp/out.vrt')
     assert ds is not None
     ds = None
 
-    f = gdal.VSIFOpenL('/vsimem/out.vrt', 'rb')
+    f = gdal.VSIFOpenL('tmp/out.vrt', 'rb')
     content = ''
     if f is not None:
         content = gdal.VSIFReadL(1, 10000, f).decode('UTF-8')
         gdal.VSIFCloseL(f)
-    gdal.Unlink('/vsimem/out.vrt')
+    gdal.Unlink('tmp/out.vrt')
 
     assert content.find('<SrcSRS>EPSG:32630</SrcSRS>') >= 0
 
@@ -256,19 +256,19 @@ def test_ogrmerge_9():
         pytest.skip()
 
     test_py_scripts.run_py_script(script_path, 'ogrmerge',
-                                  '-f VRT -o /vsimem/out.vrt ../ogr/data/poly.shp '
+                                  '-f VRT -o tmp/out.vrt ../ogr/data/poly.shp '
                                   '-s_srs EPSG:32630 -t_srs EPSG:4326')
 
-    ds = ogr.Open('/vsimem/out.vrt')
+    ds = ogr.Open('tmp/out.vrt')
     assert ds is not None
     ds = None
 
-    f = gdal.VSIFOpenL('/vsimem/out.vrt', 'rb')
+    f = gdal.VSIFOpenL('tmp/out.vrt', 'rb')
     content = ''
     if f is not None:
         content = gdal.VSIFReadL(1, 10000, f).decode('UTF-8')
         gdal.VSIFCloseL(f)
-    gdal.Unlink('/vsimem/out.vrt')
+    gdal.Unlink('tmp/out.vrt')
 
     assert content.find('<SrcSRS>EPSG:32630</SrcSRS>') >= 0
 
@@ -284,19 +284,19 @@ def test_ogrmerge_10():
         pytest.skip()
 
     test_py_scripts.run_py_script(script_path, 'ogrmerge',
-                                  '-single -f VRT -o /vsimem/out.vrt ../ogr/data/poly.shp '
+                                  '-single -f VRT -o tmp/out.vrt ../ogr/data/poly.shp '
                                   '-a_srs EPSG:32630')
 
-    ds = ogr.Open('/vsimem/out.vrt')
+    ds = ogr.Open('tmp/out.vrt')
     assert ds is not None
     ds = None
 
-    f = gdal.VSIFOpenL('/vsimem/out.vrt', 'rb')
+    f = gdal.VSIFOpenL('tmp/out.vrt', 'rb')
     content = ''
     if f is not None:
         content = gdal.VSIFReadL(1, 10000, f).decode('UTF-8')
         gdal.VSIFCloseL(f)
-    gdal.Unlink('/vsimem/out.vrt')
+    gdal.Unlink('tmp/out.vrt')
 
     assert content.find('<LayerSRS>EPSG:32630</LayerSRS>') >= 0
 
@@ -310,19 +310,19 @@ def test_ogrmerge_11():
         pytest.skip()
 
     test_py_scripts.run_py_script(script_path, 'ogrmerge',
-                                  '-f VRT -o /vsimem/out.vrt ../ogr/data/poly.shp '
+                                  '-f VRT -o tmp/out.vrt ../ogr/data/poly.shp '
                                   '-a_srs EPSG:32630')
 
-    ds = ogr.Open('/vsimem/out.vrt')
+    ds = ogr.Open('tmp/out.vrt')
     assert ds is not None
     ds = None
 
-    f = gdal.VSIFOpenL('/vsimem/out.vrt', 'rb')
+    f = gdal.VSIFOpenL('tmp/out.vrt', 'rb')
     content = ''
     if f is not None:
         content = gdal.VSIFReadL(1, 10000, f).decode('UTF-8')
         gdal.VSIFCloseL(f)
-    gdal.Unlink('/vsimem/out.vrt')
+    gdal.Unlink('tmp/out.vrt')
 
     assert content.find('<LayerSRS>EPSG:32630</LayerSRS>') >= 0
 
@@ -339,14 +339,14 @@ def test_ogrmerge_12():
         f.write("""{ "type": "FeatureCollection", "name": "\xc3\xa9ven", "features": [ { "type": "Feature", "properties": {}, "geometry": null} ]}""")
 
     test_py_scripts.run_py_script(script_path, 'ogrmerge',
-                                  '-f VRT -o /vsimem/out.vrt tmp/tmp.json')
+                                  '-f VRT -o tmp/out.vrt tmp/tmp.json')
 
-    ds = ogr.Open('/vsimem/out.vrt')
+    ds = ogr.Open('tmp/out.vrt')
     assert ds is not None
     ds = None
 
     gdal.Unlink('tmp/tmp.json')
-    gdal.Unlink('/vsimem/out.vrt')
+    gdal.Unlink('tmp/out.vrt')
 
 
 
diff --git a/autotest/utilities/__init__.py b/autotest/utilities/__init__.py
new file mode 100644
index 000000000000..e69de29bb2d1
diff --git a/autotest/utilities/test_gdaladdo.py b/autotest/utilities/test_gdaladdo.py
index 434733495274..f4465ac73633 100755
--- a/autotest/utilities/test_gdaladdo.py
+++ b/autotest/utilities/test_gdaladdo.py
@@ -29,17 +29,14 @@
 # DEALINGS IN THE SOFTWARE.
 ###############################################################################
 
-import sys
 import os
 import shutil
 import pytest
 
-sys.path.append('../gcore')
-
 from osgeo import gdal
 import gdaltest
 import test_cli_utilities
-import tiff_ovr
+from gcore import tiff_ovr
 
 ###############################################################################
 # Similar to tiff_ovr_1
diff --git a/autotest/utilities/test_gdalbuildvrt.py b/autotest/utilities/test_gdalbuildvrt.py
index 9e49d78124a2..39af722a63ec 100755
--- a/autotest/utilities/test_gdalbuildvrt.py
+++ b/autotest/utilities/test_gdalbuildvrt.py
@@ -41,7 +41,7 @@
 
 
 ###############################################################################
-def test_gdalbuildvrt_check():
+def gdalbuildvrt_check():
 
     ds = gdal.Open('tmp/mosaic.vrt')
     assert ds.GetProjectionRef().find('WGS 84') != -1, \
@@ -100,7 +100,7 @@ def test_gdalbuildvrt_1():
     (_, err) = gdaltest.runexternal_out_and_err(test_cli_utilities.get_gdalbuildvrt_path() + ' tmp/mosaic.vrt tmp/gdalbuildvrt1.tif tmp/gdalbuildvrt2.tif tmp/gdalbuildvrt3.tif tmp/gdalbuildvrt4.tif')
     assert (err is None or err == ''), 'got error/warning'
 
-    return test_gdalbuildvrt_check()
+    return gdalbuildvrt_check()
 
 ###############################################################################
 # Test with tile index
@@ -133,7 +133,7 @@ def test_gdalbuildvrt_2():
 
     gdaltest.runexternal(test_cli_utilities.get_gdalbuildvrt_path() + ' tmp/mosaic.vrt tmp/tileindex.shp')
 
-    return test_gdalbuildvrt_check()
+    return gdalbuildvrt_check()
 
 ###############################################################################
 # Test with file list
@@ -147,7 +147,7 @@ def test_gdalbuildvrt_3():
 
     gdaltest.runexternal(test_cli_utilities.get_gdalbuildvrt_path() + ' -input_file_list tmp/filelist.txt tmp/mosaic.vrt')
 
-    return test_gdalbuildvrt_check()
+    return gdalbuildvrt_check()
 
 
 ###############################################################################
@@ -167,12 +167,14 @@ def test_gdalbuildvrt_4():
 
     gdaltest.runexternal(test_cli_utilities.get_gdalbuildvrt_path() + ' tmp/mosaic.vrt tmp/gdalbuildvrt1.tif tmp/gdalbuildvrt2.tif tmp/gdalbuildvrt3.tif tmp/gdalbuildvrt4.tif tmp/gdalbuildvrt5.tif')
 
-    return test_gdalbuildvrt_check()
+    return gdalbuildvrt_check()
 
 ###############################################################################
 # Try adding a raster with different band count
 
 
+# NOTE: fails. commented out originally in 4ef886421c99a4451f8873cb6e094d45ecc86d3f, not sure why
+@pytest.mark.xfail
 def test_gdalbuildvrt_5():
     if test_cli_utilities.get_gdalbuildvrt_path() is None:
         pytest.skip()
@@ -189,7 +191,7 @@ def test_gdalbuildvrt_5():
 
     gdaltest.runexternal(test_cli_utilities.get_gdalbuildvrt_path() + ' tmp/mosaic.vrt tmp/gdalbuildvrt1.tif tmp/gdalbuildvrt2.tif tmp/gdalbuildvrt3.tif tmp/gdalbuildvrt4.tif tmp/gdalbuildvrt5.tif')
 
-    return test_gdalbuildvrt_check()
+    return gdalbuildvrt_check()
 
 ###############################################################################
 # Test -separate option
@@ -296,7 +298,7 @@ def test_gdalbuildvrt_8():
 
     gdaltest.runexternal(test_cli_utilities.get_gdalbuildvrt_path() + ' -tr 0.1 0.1 tmp/mosaic.vrt tmp/mosaic2.vrt')
 
-    return test_gdalbuildvrt_check()
+    return gdalbuildvrt_check()
 
 ###############################################################################
 # Test -te option
@@ -321,7 +323,7 @@ def test_gdalbuildvrt_9():
 
     gdaltest.runexternal(test_cli_utilities.get_gdalbuildvrt_path() + ' -te 2 47 4 49 tmp/mosaic.vrt tmp/mosaic2.vrt')
 
-    return test_gdalbuildvrt_check()
+    return gdalbuildvrt_check()
 
 ###############################################################################
 # Test explicit nodata setting (#3254)
diff --git a/autotest/utilities/test_ogr2ogr.py b/autotest/utilities/test_ogr2ogr.py
index db9a8c848291..64f4b54bdc81 100755
--- a/autotest/utilities/test_ogr2ogr.py
+++ b/autotest/utilities/test_ogr2ogr.py
@@ -186,7 +186,7 @@ def test_ogr2ogr_6():
     if test_cli_utilities.get_ogrinfo_path() is None:
         pytest.skip()
 
-    ogr_pg.ogr_pg_1()
+    ogr_pg.test_ogr_pg_1()
     if gdaltest.pg_ds is None:
         pytest.skip()
     gdaltest.pg_ds.Destroy()
@@ -215,7 +215,7 @@ def test_ogr2ogr_7():
     if test_cli_utilities.get_ogrinfo_path() is None:
         pytest.skip()
 
-    ogr_pg.ogr_pg_1()
+    ogr_pg.test_ogr_pg_1()
     if gdaltest.pg_ds is None:
         pytest.skip()
     gdaltest.pg_ds.Destroy()
@@ -1348,7 +1348,7 @@ def test_ogr2ogr_41():
     if test_cli_utilities.get_ogr2ogr_path() is None:
         pytest.skip()
 
-    ogr_pg.ogr_pg_1()
+    ogr_pg.test_ogr_pg_1()
     if gdaltest.pg_ds is None:
         pytest.skip()
     gdaltest.pg_ds.Destroy()

From 9771c21fbccfd684b268783d7514749e83ed3c2c Mon Sep 17 00:00:00 2001
From: Craig de Stigter <craig.destigter@koordinates.com>
Date: Mon, 5 Nov 2018 15:50:34 +1300
Subject: [PATCH 146/488] Some more autoflake cleanup

Autoflake is ... flakey. I don't know why it didn't find this stuff the first time.
---
 autotest/alg/contour.py                       |  1 -
 autotest/alg/dither.py                        |  1 -
 autotest/alg/polygonize.py                    |  1 -
 autotest/alg/proximity.py                     |  1 -
 autotest/alg/rasterize.py                     |  1 -
 autotest/alg/reproject.py                     |  1 -
 autotest/alg/sieve.py                         |  1 -
 autotest/alg/transformgeoloc.py               |  1 -
 autotest/gcore/asyncreader.py                 |  1 -
 autotest/gcore/hfa_rfc40.py                   |  1 -
 autotest/gcore/histogram.py                   |  1 -
 autotest/gcore/identify.py                    |  1 -
 autotest/gcore/nodatamaskband.py              |  8 -------
 autotest/gcore/overviewds.py                  |  1 -
 autotest/gcore/pixfun.py                      |  1 -
 autotest/gcore/rasterio.py                    |  1 -
 autotest/gcore/thread_test.py                 |  1 -
 autotest/gcore/tiff_srs.py                    |  1 -
 autotest/gcore/virtualmem.py                  |  1 -
 autotest/gcore/vrtmisc.py                     |  1 -
 autotest/gcore/vsicrypt.py                    |  2 +-
 autotest/gcore/vsistdin.py                    |  1 -
 autotest/gdrivers/bag.py                      |  2 +-
 autotest/gdrivers/dimap.py                    |  1 -
 autotest/gdrivers/doq2.py                     |  1 -
 autotest/gdrivers/isis.py                     | 22 ++++++++---------
 autotest/gdrivers/jp2metadata.py              |  1 -
 autotest/gdrivers/jpeg_profile.py             |  1 -
 autotest/gdrivers/kea.py                      |  4 ++--
 autotest/gdrivers/mrsid.py                    |  2 +-
 autotest/gdrivers/netcdf.py                   | 10 ++++----
 autotest/gdrivers/nwt_grd.py                  |  1 -
 autotest/gdrivers/pds.py                      | 12 ++++------
 autotest/gdrivers/png_profile.py              |  1 -
 autotest/gdrivers/rmf.py                      |  6 ++---
 autotest/gdrivers/rraster.py                  | 24 ++++++-------------
 autotest/gdrivers/saga.py                     |  4 ++--
 autotest/gdrivers/srp.py                      |  7 ++----
 autotest/gdrivers/srtmhgt.py                  |  1 -
 autotest/gdrivers/tiff_profile.py             |  1 -
 autotest/gdrivers/vrtpansharpen.py            |  1 -
 autotest/gnm/gnm_test.py                      |  1 -
 autotest/ogr/ogr_arcgen.py                    |  1 -
 autotest/ogr/ogr_avc.py                       |  1 -
 autotest/ogr/ogr_bna.py                       |  4 ++--
 autotest/ogr/ogr_db2.py                       |  1 -
 autotest/ogr/ogr_db2_hack.py                  |  1 -
 autotest/ogr/ogr_eeda.py                      |  1 -
 autotest/ogr/ogr_factory.py                   |  1 -
 autotest/ogr/ogr_fgdb_stress_test.py          |  1 -
 autotest/ogr/ogr_idrisi.py                    |  1 -
 autotest/ogr/ogr_layer_algebra.py             |  1 -
 autotest/ogr/ogr_openair.py                   |  1 -
 autotest/ogr/ogr_rfc30.py                     |  1 -
 autotest/ogr/ogr_rfc35_mem.py                 | 10 ++++----
 autotest/ogr/ogr_rfc41.py                     |  2 +-
 autotest/ogr/ogr_segukooa.py                  |  1 -
 autotest/ogr/ogr_segy.py                      |  1 -
 autotest/ogr/ogr_selafin.py                   |  1 -
 autotest/ogr/ogr_shape_qix.py                 |  1 -
 autotest/ogr/ogr_sqlite.py                    |  1 -
 autotest/ogr/ogr_style.py                     |  1 -
 autotest/ogr/ogr_sua.py                       |  1 -
 autotest/ogr/ogr_vrt.py                       |  2 +-
 autotest/ogr/ogr_wktempty.py                  |  1 -
 autotest/ogr/ogr_xplane.py                    |  1 -
 autotest/ogr/ograpispy.py                     |  1 -
 autotest/osr/osr_epsg.py                      |  1 -
 autotest/osr/osr_erm.py                       |  1 -
 autotest/osr/osr_getprojectionmethods.py      |  1 -
 autotest/osr/osr_micoordsys.py                |  1 -
 autotest/osr/osr_pm.py                        |  1 -
 autotest/osr/osr_usgs.py                      |  1 -
 autotest/osr/osr_validate.py                  |  1 -
 autotest/pymod/gdaltest_python2.py            |  2 +-
 autotest/pymod/test_py_scripts.py             |  1 -
 autotest/pyscripts/test_gdal2tiles.py         |  1 -
 autotest/pyscripts/test_gdal_calc.py          |  1 -
 autotest/pyscripts/test_gdal_edit.py          |  1 -
 autotest/pyscripts/test_gdal_fillnodata.py    |  1 -
 autotest/pyscripts/test_gdal_merge.py         |  1 -
 autotest/pyscripts/test_gdal_pansharpen.py    |  1 -
 autotest/pyscripts/test_gdal_polygonize.py    |  1 -
 autotest/pyscripts/test_gdal_proximity.py     |  1 -
 autotest/pyscripts/test_gdal_retile.py        |  1 -
 autotest/pyscripts/test_gdal_sieve.py         |  1 -
 autotest/pyscripts/test_gdalinfo_py.py        |  1 -
 autotest/pyscripts/test_gdalmove.py           |  1 -
 autotest/pyscripts/test_ogrinfo_py.py         |  1 -
 autotest/pyscripts/test_ogrmerge.py           |  1 -
 autotest/utilities/test_gdal_grid_lib.py      |  1 -
 autotest/utilities/test_gdalbuildvrt_lib.py   |  1 -
 autotest/utilities/test_gdalinfo_lib.py       |  1 -
 autotest/utilities/test_nearblack_lib.py      |  1 -
 gdal/ci/travis/trusty_clang/before_install.sh | 10 ++++----
 95 files changed, 56 insertions(+), 154 deletions(-)

diff --git a/autotest/alg/contour.py b/autotest/alg/contour.py
index 8722d2dfd9fa..8092a7a0fe0e 100755
--- a/autotest/alg/contour.py
+++ b/autotest/alg/contour.py
@@ -34,7 +34,6 @@
 
 from osgeo import gdal
 from osgeo import ogr
-import gdaltest
 import ogrtest
 import pytest
 
diff --git a/autotest/alg/dither.py b/autotest/alg/dither.py
index fc7046e5d2be..6233f6399c5a 100755
--- a/autotest/alg/dither.py
+++ b/autotest/alg/dither.py
@@ -31,7 +31,6 @@
 
 
 
-import gdaltest
 
 from osgeo import gdal
 import pytest
diff --git a/autotest/alg/polygonize.py b/autotest/alg/polygonize.py
index 7345c27f778c..41bc879ba4ff 100755
--- a/autotest/alg/polygonize.py
+++ b/autotest/alg/polygonize.py
@@ -31,7 +31,6 @@
 
 
 
-import gdaltest
 import ogrtest
 
 from osgeo import gdal, ogr
diff --git a/autotest/alg/proximity.py b/autotest/alg/proximity.py
index baac6f479dcf..ba1f98c5c40c 100755
--- a/autotest/alg/proximity.py
+++ b/autotest/alg/proximity.py
@@ -30,7 +30,6 @@
 
 
 
-import gdaltest
 
 from osgeo import gdal
 import pytest
diff --git a/autotest/alg/rasterize.py b/autotest/alg/rasterize.py
index b0ec2e5e1555..19a0cc67c42d 100755
--- a/autotest/alg/rasterize.py
+++ b/autotest/alg/rasterize.py
@@ -31,7 +31,6 @@
 import struct
 
 
-import gdaltest
 import ogrtest
 
 from osgeo import gdal, ogr, osr
diff --git a/autotest/alg/reproject.py b/autotest/alg/reproject.py
index 71882c90b181..24f34cb24e95 100755
--- a/autotest/alg/reproject.py
+++ b/autotest/alg/reproject.py
@@ -31,7 +31,6 @@
 
 
 
-import gdaltest
 
 from osgeo import gdal
 from osgeo import osr
diff --git a/autotest/alg/sieve.py b/autotest/alg/sieve.py
index 25a5c5c4c6a1..154b7532ddc1 100755
--- a/autotest/alg/sieve.py
+++ b/autotest/alg/sieve.py
@@ -31,7 +31,6 @@
 
 
 
-import gdaltest
 
 from osgeo import gdal
 import pytest
diff --git a/autotest/alg/transformgeoloc.py b/autotest/alg/transformgeoloc.py
index 6bd129834231..34b43e40cc4a 100755
--- a/autotest/alg/transformgeoloc.py
+++ b/autotest/alg/transformgeoloc.py
@@ -32,7 +32,6 @@
 
 
 
-import gdaltest
 from osgeo import gdal
 from osgeo import osr
 import pytest
diff --git a/autotest/gcore/asyncreader.py b/autotest/gcore/asyncreader.py
index 8a1a4b55efe2..9c855b148102 100755
--- a/autotest/gcore/asyncreader.py
+++ b/autotest/gcore/asyncreader.py
@@ -30,7 +30,6 @@
 
 
 
-import gdaltest
 from osgeo import gdal
 
 ###############################################################################
diff --git a/autotest/gcore/hfa_rfc40.py b/autotest/gcore/hfa_rfc40.py
index 327469a561f8..223c993ea9b1 100755
--- a/autotest/gcore/hfa_rfc40.py
+++ b/autotest/gcore/hfa_rfc40.py
@@ -34,7 +34,6 @@
 
 import pytest
 
-import gdaltest
 
 try:
     import numpy
diff --git a/autotest/gcore/histogram.py b/autotest/gcore/histogram.py
index ce3ce7c344ad..d4c6293db7c7 100755
--- a/autotest/gcore/histogram.py
+++ b/autotest/gcore/histogram.py
@@ -35,7 +35,6 @@
 
 from osgeo import gdal
 
-import gdaltest
 
 ###############################################################################
 # Fetch simple histogram.
diff --git a/autotest/gcore/identify.py b/autotest/gcore/identify.py
index 9288ec0bde7d..6557097d9356 100755
--- a/autotest/gcore/identify.py
+++ b/autotest/gcore/identify.py
@@ -30,7 +30,6 @@
 
 
 
-import gdaltest
 from osgeo import gdal
 
 ###############################################################################
diff --git a/autotest/gcore/nodatamaskband.py b/autotest/gcore/nodatamaskband.py
index 18b6d0283042..7436a5c582ea 100755
--- a/autotest/gcore/nodatamaskband.py
+++ b/autotest/gcore/nodatamaskband.py
@@ -30,11 +30,7 @@
 ###############################################################################
 
 import struct
-import sys
 
-sys.path.append('../pymod')
-
-import gdaltest
 from osgeo import gdal
 
 
@@ -90,7 +86,3 @@ def test_nodatamaskband_1():
         expected_ar = (255, 0, 255,
                        0, 255, 255)
         assert data_ar == expected_ar, dt
-
-    
-
-
diff --git a/autotest/gcore/overviewds.py b/autotest/gcore/overviewds.py
index 054c1fe6c031..c41456804bea 100755
--- a/autotest/gcore/overviewds.py
+++ b/autotest/gcore/overviewds.py
@@ -33,7 +33,6 @@
 import shutil
 
 
-import gdaltest
 from osgeo import gdal
 import pytest
 
diff --git a/autotest/gcore/pixfun.py b/autotest/gcore/pixfun.py
index be1e13ff6cfb..f7ca48f3be41 100755
--- a/autotest/gcore/pixfun.py
+++ b/autotest/gcore/pixfun.py
@@ -39,7 +39,6 @@
 from osgeo import gdal
 
 
-import gdaltest
 
 ###############################################################################
 # Verify real part extraction from a complex dataset.
diff --git a/autotest/gcore/rasterio.py b/autotest/gcore/rasterio.py
index 324baa1e8885..8aa9def3644c 100755
--- a/autotest/gcore/rasterio.py
+++ b/autotest/gcore/rasterio.py
@@ -33,7 +33,6 @@
 import sys
 
 
-import gdaltest
 from osgeo import gdal
 import pytest
 
diff --git a/autotest/gcore/thread_test.py b/autotest/gcore/thread_test.py
index 051ca8fb3fe2..c4ebd7b82f42 100755
--- a/autotest/gcore/thread_test.py
+++ b/autotest/gcore/thread_test.py
@@ -32,7 +32,6 @@
 import threading
 
 
-import gdaltest
 from osgeo import gdal
 import pytest
 
diff --git a/autotest/gcore/tiff_srs.py b/autotest/gcore/tiff_srs.py
index a9eee51dfa44..22aadb04e08a 100755
--- a/autotest/gcore/tiff_srs.py
+++ b/autotest/gcore/tiff_srs.py
@@ -35,7 +35,6 @@
 from osgeo import osr
 
 
-import gdaltest
 
 
 ###############################################################################
diff --git a/autotest/gcore/virtualmem.py b/autotest/gcore/virtualmem.py
index 63d7e9300b7d..cf8f40ff75a5 100755
--- a/autotest/gcore/virtualmem.py
+++ b/autotest/gcore/virtualmem.py
@@ -32,7 +32,6 @@
 import sys
 
 
-import gdaltest
 from osgeo import gdal
 import pytest
 
diff --git a/autotest/gcore/vrtmisc.py b/autotest/gcore/vrtmisc.py
index 7a32308f2fc8..e1f0f7b2d83b 100755
--- a/autotest/gcore/vrtmisc.py
+++ b/autotest/gcore/vrtmisc.py
@@ -32,7 +32,6 @@
 from osgeo import gdal
 
 
-import gdaltest
 
 ###############################################################################
 # Test linear scaling
diff --git a/autotest/gcore/vsicrypt.py b/autotest/gcore/vsicrypt.py
index 808baca9f435..7bab69755c65 100755
--- a/autotest/gcore/vsicrypt.py
+++ b/autotest/gcore/vsicrypt.py
@@ -460,7 +460,7 @@ def test_vsicrypt_5():
 # Test VSISetCryptKey
 
 
-def test_vsicrypt_6(testnonboundtoswig_setup):
+def test_vsicrypt_6(testnonboundtoswig_setup):  # noqa
 
     try:
         import ctypes
diff --git a/autotest/gcore/vsistdin.py b/autotest/gcore/vsistdin.py
index 51ad030d978d..aefa24aa442b 100755
--- a/autotest/gcore/vsistdin.py
+++ b/autotest/gcore/vsistdin.py
@@ -31,7 +31,6 @@
 import os
 
 
-import gdaltest
 from osgeo import gdal
 import test_cli_utilities
 import pytest
diff --git a/autotest/gdrivers/bag.py b/autotest/gdrivers/bag.py
index f6b34d4d6b7c..0b03b38ebf69 100755
--- a/autotest/gdrivers/bag.py
+++ b/autotest/gdrivers/bag.py
@@ -627,7 +627,7 @@ def test_bag_write_two_bands():
                             options=['BLOCK_SIZE=2',
                                      'VAR_ABSTRACT=foo',
                                      'VAR_XML_IDENTIFICATION_CITATION=<bar/>'])
-    ret = tst.testCreateCopy(quiet_error_handler=False,
+    tst.testCreateCopy(quiet_error_handler=False,
                              delete_copy=False,
                              new_filename='/vsimem/out.bag')
 
diff --git a/autotest/gdrivers/dimap.py b/autotest/gdrivers/dimap.py
index c72176a65101..d083c2cc34a4 100755
--- a/autotest/gdrivers/dimap.py
+++ b/autotest/gdrivers/dimap.py
@@ -33,7 +33,6 @@
 from osgeo import gdal
 
 
-import gdaltest
 
 ###############################################################################
 # Open and verify a the GCPs and metadata.
diff --git a/autotest/gdrivers/doq2.py b/autotest/gdrivers/doq2.py
index 093d06aa009c..33aafd26f129 100755
--- a/autotest/gdrivers/doq2.py
+++ b/autotest/gdrivers/doq2.py
@@ -31,7 +31,6 @@
 from osgeo import gdal
 
 
-import gdaltest
 
 ###############################################################################
 # Read a truncated and modified version of C3607614.NWS
diff --git a/autotest/gdrivers/isis.py b/autotest/gdrivers/isis.py
index 970ed3d767a0..e9650ac1243b 100755
--- a/autotest/gdrivers/isis.py
+++ b/autotest/gdrivers/isis.py
@@ -116,7 +116,7 @@ def test_isis_3():
 def test_isis_4():
 
     tst = gdaltest.GDALTest('ISIS3', 'isis3_detached.lbl', 1, 9978)
-    ret = tst.testCreateCopy(new_filename='/vsimem/isis_tmp.lbl',
+    tst.testCreateCopy(new_filename='/vsimem/isis_tmp.lbl',
                              delete_copy=0)
     ds = gdal.Open('/vsimem/isis_tmp.lbl')
     assert ds.GetMetadataDomainList() == ['', 'json:ISIS3']
@@ -132,7 +132,7 @@ def test_isis_4():
     # Preserve source Mapping group as well
     tst = gdaltest.GDALTest('ISIS3', 'isis3_detached.lbl', 1, 9978,
                             options=['USE_SRC_MAPPING=YES'])
-    ret = tst.testCreateCopy(new_filename='/vsimem/isis_tmp.lbl',
+    tst.testCreateCopy(new_filename='/vsimem/isis_tmp.lbl',
                              delete_copy=0)
     ds = gdal.Open('/vsimem/isis_tmp.lbl')
     lbl = ds.GetMetadata_List('json:ISIS3')[0]
@@ -147,7 +147,7 @@ def test_isis_4():
                                      'LONGITUDE_DIRECTION=PositiveEast',
                                      'LATITUDE_TYPE=Planetocentric',
                                      'TARGET_NAME=my_label'])
-    ret = tst.testCreateCopy(new_filename='/vsimem/isis_tmp.lbl',
+    tst.testCreateCopy(new_filename='/vsimem/isis_tmp.lbl',
                              delete_copy=0)
     ds = gdal.Open('/vsimem/isis_tmp.lbl')
     lbl = ds.GetMetadata_List('json:ISIS3')[0]
@@ -165,7 +165,7 @@ def test_isis_5():
     tst = gdaltest.GDALTest('ISIS3', 'isis3_detached.lbl', 1, 9978,
                             options=['USE_SRC_LABEL=NO',
                                      'WRITE_BOUNDING_DEGREES=NO'])
-    ret = tst.testCreateCopy(new_filename='/vsimem/isis_tmp.lbl',
+    tst.testCreateCopy(new_filename='/vsimem/isis_tmp.lbl',
                              delete_copy=0)
     assert gdal.VSIStatL('/vsimem/isis_tmp.cub') is None
     ds = gdal.Open('/vsimem/isis_tmp.lbl')
@@ -183,7 +183,7 @@ def test_isis_6():
                             options=['DATA_LOCATION=EXTERNAL',
                                      'USE_SRC_LABEL=NO',
                                      'COMMENT=my comment'])
-    ret = tst.testCreateCopy(new_filename='/vsimem/isis_tmp.lbl',
+    tst.testCreateCopy(new_filename='/vsimem/isis_tmp.lbl',
                              delete_copy=0)
     assert gdal.VSIStatL('/vsimem/isis_tmp.cub') is not None
     f = gdal.VSIFOpenL('/vsimem/isis_tmp.lbl', 'rb')
@@ -207,7 +207,7 @@ def test_isis_7():
     tst = gdaltest.GDALTest('ISIS3', 'isis3_detached.lbl', 1, 9978,
                             options=['DATA_LOCATION=GEOTIFF',
                                      'USE_SRC_LABEL=NO'])
-    ret = tst.testCreateCopy(new_filename='/vsimem/isis_tmp.lbl',
+    tst.testCreateCopy(new_filename='/vsimem/isis_tmp.lbl',
                              delete_copy=0)
     assert gdal.VSIStatL('/vsimem/isis_tmp.tif') is not None
     ds = gdal.Open('/vsimem/isis_tmp.lbl')
@@ -221,7 +221,7 @@ def test_isis_7():
                             options=['DATA_LOCATION=GEOTIFF',
                                      'GEOTIFF_AS_REGULAR_EXTERNAL=NO',
                                      'USE_SRC_LABEL=NO'])
-    ret = tst.testCreateCopy(new_filename='/vsimem/isis_tmp.lbl',
+    tst.testCreateCopy(new_filename='/vsimem/isis_tmp.lbl',
                              delete_copy=0)
     assert gdal.VSIStatL('/vsimem/isis_tmp.tif') is not None
     ds = gdal.Open('/vsimem/isis_tmp.lbl')
@@ -239,7 +239,7 @@ def test_isis_8():
                             options=['DATA_LOCATION=GEOTIFF',
                                      'USE_SRC_LABEL=NO',
                                      'GEOTIFF_OPTIONS=COMPRESS=LZW'])
-    ret = tst.testCreateCopy(new_filename='/vsimem/isis_tmp.lbl',
+    tst.testCreateCopy(new_filename='/vsimem/isis_tmp.lbl',
                              delete_copy=0)
     assert gdal.VSIStatL('/vsimem/isis_tmp.tif') is not None
     ds = gdal.Open('/vsimem/isis_tmp.lbl')
@@ -264,7 +264,7 @@ def test_isis_9():
                                      'USE_SRC_LABEL=NO',
                                      'TILED=YES',
                                      'EXTERNAL_FILENAME=/vsimem/foo.bin'])
-    ret = tst.testCreateCopy(new_filename='/vsimem/isis_tmp.lbl',
+    tst.testCreateCopy(new_filename='/vsimem/isis_tmp.lbl',
                              delete_copy=0)
     assert gdal.VSIStatL('/vsimem/foo.bin') is not None
     ds = gdal.Open('/vsimem/isis_tmp.lbl')
@@ -286,7 +286,7 @@ def test_isis_10():
                                      'TILED=YES',
                                      'BLOCKXSIZE=16', 'BLOCKYSIZE=32',
                                      'EXTERNAL_FILENAME=/vsimem/foo.tif'])
-    ret = tst.testCreateCopy(new_filename='/vsimem/isis_tmp.lbl',
+    tst.testCreateCopy(new_filename='/vsimem/isis_tmp.lbl',
                              delete_copy=0)
     ds = gdal.Open('/vsimem/foo.tif')
     assert ds.GetRasterBand(1).GetBlockSize() == [16, 32]
@@ -304,7 +304,7 @@ def test_isis_11():
                                      'DATA_LOCATION=GEOTIFF',
                                      'TILED=YES',
                                      'GEOTIFF_OPTIONS=COMPRESS=LZW'])
-    ret = tst.testCreateCopy(new_filename='/vsimem/isis_tmp.lbl',
+    tst.testCreateCopy(new_filename='/vsimem/isis_tmp.lbl',
                              delete_copy=0)
     ds = gdal.Open('/vsimem/isis_tmp.tif')
     assert ds.GetRasterBand(1).GetBlockSize() == [256, 256]
diff --git a/autotest/gdrivers/jp2metadata.py b/autotest/gdrivers/jp2metadata.py
index c5a82cc2729c..c8008ef6af6b 100755
--- a/autotest/gdrivers/jp2metadata.py
+++ b/autotest/gdrivers/jp2metadata.py
@@ -33,7 +33,6 @@
 
 from osgeo import gdal
 
-import gdaltest
 import pytest
 
 
diff --git a/autotest/gdrivers/jpeg_profile.py b/autotest/gdrivers/jpeg_profile.py
index 193e58dc3654..ce6cc9fa0ccc 100755
--- a/autotest/gdrivers/jpeg_profile.py
+++ b/autotest/gdrivers/jpeg_profile.py
@@ -34,7 +34,6 @@
 import base64
 
 
-import gdaltest
 from osgeo import gdal
 import pytest
 
diff --git a/autotest/gdrivers/kea.py b/autotest/gdrivers/kea.py
index 542545e0a4bc..c0587d787168 100755
--- a/autotest/gdrivers/kea.py
+++ b/autotest/gdrivers/kea.py
@@ -70,7 +70,7 @@ def test_kea_2():
 
     for src_file in src_files:
         tst = gdaltest.GDALTest('KEA', src_file, 1, 4672)
-        ret = tst.testCreateCopy(check_minmax=1)
+        tst.testCreateCopy(check_minmax=1)
 
     
 ###############################################################################
@@ -91,7 +91,7 @@ def test_kea_3():
 
     for src_file in src_files:
         tst = gdaltest.GDALTest('KEA', src_file, 1, 4672)
-        ret = tst.testCreate(out_bands=1, check_minmax=1)
+        tst.testCreate(out_bands=1, check_minmax=1)
 
     
 ###############################################################################
diff --git a/autotest/gdrivers/mrsid.py b/autotest/gdrivers/mrsid.py
index 72d05be3fab9..013e4559ce38 100755
--- a/autotest/gdrivers/mrsid.py
+++ b/autotest/gdrivers/mrsid.py
@@ -111,7 +111,7 @@ def test_mrsid_1():
     UNIT["metre",1,
         AUTHORITY["EPSG","9001"]]]"""
 
-    ret = tst.testOpen(check_gt=gt,
+    tst.testOpen(check_gt=gt,
                        check_stat=(0.0, 255.0, 103.319, 55.153),
                        check_approx_stat=(2.0, 243.0, 103.131, 43.978))
 
diff --git a/autotest/gdrivers/netcdf.py b/autotest/gdrivers/netcdf.py
index 46a50556777f..b6a3422727fd 100755
--- a/autotest/gdrivers/netcdf.py
+++ b/autotest/gdrivers/netcdf.py
@@ -292,7 +292,7 @@ def test_netcdf_2():
         AUTHORITY["EPSG","9001"]],
     AUTHORITY["EPSG","26711"]]"""
 
-    result = tst.testOpen(check_prj=wkt)
+    tst.testOpen(check_prj=wkt)
 
     # Test that in raster-only mode, update isn't supported (not sure what would be missing for that...)
     with gdaltest.error_handler():
@@ -924,7 +924,7 @@ def netcdf_25_nc4():
     if not gdaltest.netcdf_drv_has_nc4:
         pytest.skip()
 
-    result = netcdf_test_copy('data/nc4_vars.nc', 1, None, 'tmp/netcdf_25_nc4.nc', ['FORMAT=NC4'])
+    netcdf_test_copy('data/nc4_vars.nc', 1, None, 'tmp/netcdf_25_nc4.nc', ['FORMAT=NC4'])
 
     vals_global = {'NC_GLOBAL#test': 'testval',
                    'NC_GLOBAL#test_string': 'testval_string',
@@ -1159,8 +1159,8 @@ def test_netcdf_32():
     # gdal.SetConfigOption('CPL_DEBUG', 'ON')
 
     # test basic read/write
-    result = netcdf_test_copy(ifile, 1, 4672, ofile, ['FORMAT=NC4'])
-    result = netcdf_test_copy(ifile, 1, 4672, ofile, ['FORMAT=NC4C'])
+    netcdf_test_copy(ifile, 1, 4672, ofile, ['FORMAT=NC4'])
+    netcdf_test_copy(ifile, 1, 4672, ofile, ['FORMAT=NC4C'])
 
 ###############################################################################
 # TEST NC_UBYTE metadata read - netcdf-4 (FORMAT=NC4) only (#5053)
@@ -1174,7 +1174,7 @@ def test_netcdf_33():
     ifile = 'data/nc_vars.nc'
     ofile = 'tmp/netcdf_33.nc'
 
-    result = netcdf_test_copy(ifile, 1, None, ofile, ['FORMAT=NC4'])
+    netcdf_test_copy(ifile, 1, None, ofile, ['FORMAT=NC4'])
 
     return netcdf_check_vars('tmp/netcdf_33.nc')
 
diff --git a/autotest/gdrivers/nwt_grd.py b/autotest/gdrivers/nwt_grd.py
index edd593b3b325..4b3cbbbab89a 100755
--- a/autotest/gdrivers/nwt_grd.py
+++ b/autotest/gdrivers/nwt_grd.py
@@ -33,7 +33,6 @@
 
 from osgeo import gdal
 import gdaltest
-import pytest
 
 ###############################################################################
 # Test a GRD dataset with three bands + Z
diff --git a/autotest/gdrivers/pds.py b/autotest/gdrivers/pds.py
index f84f5254b1cf..f1a90d508c1e 100755
--- a/autotest/gdrivers/pds.py
+++ b/autotest/gdrivers/pds.py
@@ -47,11 +47,10 @@ def test_pds_1():
     expected_gt = (-10668384.903788566589355, 926.115274429321289, 0, 3852176.483988761901855, 0, -926.115274429321289)
     gdal.SetConfigOption('PDS_SampleProjOffset_Shift', '-0.5')
     gdal.SetConfigOption('PDS_LineProjOffset_Shift', '-0.5')
-    ret = tst.testOpen(check_prj=expected_prj,
+    tst.testOpen(check_prj=expected_prj,
                        check_gt=expected_gt)
     gdal.SetConfigOption('PDS_SampleProjOffset_Shift', None)
     gdal.SetConfigOption('PDS_LineProjOffset_Shift', None)
-    return ret
 
 
 ###############################################################################
@@ -73,7 +72,7 @@ def test_pds_2():
     expected_gt = (587861.55900404998, 75.000002980232239, 0.0, -7815243.4746123618, 0.0, -75.000002980232239)
     gdal.SetConfigOption('PDS_SampleProjOffset_Shift', '-0.5')
     gdal.SetConfigOption('PDS_LineProjOffset_Shift', '-0.5')
-    ret = tst.testOpen(check_prj=expected_prj,
+    tst.testOpen(check_prj=expected_prj,
                        check_gt=expected_gt)
     gdal.SetConfigOption('PDS_SampleProjOffset_Shift', None)
     gdal.SetConfigOption('PDS_LineProjOffset_Shift', None)
@@ -117,10 +116,9 @@ def test_pds_4():
     gt_expected = (6119184.3590369327, 1.0113804322107001, 0.0, -549696.39009125973, 0.0, -1.0113804322107001)
     gdal.SetConfigOption('PDS_SampleProjOffset_Shift', '-0.5')
     gdal.SetConfigOption('PDS_LineProjOffset_Shift', '-0.5')
-    ret = tst.testOpen(check_gt=gt_expected)
+    tst.testOpen(check_gt=gt_expected)
     gdal.SetConfigOption('PDS_SampleProjOffset_Shift', None)
     gdal.SetConfigOption('PDS_LineProjOffset_Shift', None)
-    return ret
 
 ###############################################################################
 # Read a hacked example of reading a detached file with an offset #3355.
@@ -147,7 +145,7 @@ def test_pds_6():
 
     gdal.SetConfigOption('PDS_SampleProjOffset_Shift', '-0.5')
     gdal.SetConfigOption('PDS_LineProjOffset_Shift', '-0.5')
-    ret = tst.testOpen(check_gt=gt_expected)
+    tst.testOpen(check_gt=gt_expected)
     gdal.SetConfigOption('PDS_SampleProjOffset_Shift', None)
     gdal.SetConfigOption('PDS_LineProjOffset_Shift', None)
 
@@ -187,7 +185,7 @@ def test_pds_7():
 
     gdal.SetConfigOption('PDS_SampleProjOffset_Shift', '-0.5')
     gdal.SetConfigOption('PDS_LineProjOffset_Shift', '-0.5')
-    ret = tst.testOpen(check_prj=prj_expected,
+    tst.testOpen(check_prj=prj_expected,
                        check_gt=gt_expected)
     gdal.SetConfigOption('PDS_SampleProjOffset_Shift', None)
     gdal.SetConfigOption('PDS_LineProjOffset_Shift', None)
diff --git a/autotest/gdrivers/png_profile.py b/autotest/gdrivers/png_profile.py
index eb592e33a485..94613ec89f52 100755
--- a/autotest/gdrivers/png_profile.py
+++ b/autotest/gdrivers/png_profile.py
@@ -34,7 +34,6 @@
 import base64
 
 
-import gdaltest
 from osgeo import gdal
 import pytest
 
diff --git a/autotest/gdrivers/rmf.py b/autotest/gdrivers/rmf.py
index 1cadcc95c563..72bb839df417 100755
--- a/autotest/gdrivers/rmf.py
+++ b/autotest/gdrivers/rmf.py
@@ -63,15 +63,15 @@ def test_rmf_3():
 def test_rmf_4():
 
     tst = gdaltest.GDALTest('rmf', 'rgbsmall.rsw', 1, 21212)
-    ret = tst.testOpen(check_gt=(-44.840320, 0.003432, 0,
+    tst.testOpen(check_gt=(-44.840320, 0.003432, 0,
                                  -22.932584, 0, -0.003432))
 
     tst = gdaltest.GDALTest('rmf', 'rgbsmall.rsw', 2, 21053)
-    ret = tst.testOpen(check_gt=(-44.840320, 0.003432, 0,
+    tst.testOpen(check_gt=(-44.840320, 0.003432, 0,
                                  -22.932584, 0, -0.003432))
 
     tst = gdaltest.GDALTest('rmf', 'rgbsmall.rsw', 3, 21349)
-    return tst.testOpen(check_gt=(-44.840320, 0.003432, 0,
+    tst.testOpen(check_gt=(-44.840320, 0.003432, 0,
                                   -22.932584, 0, -0.003432))
 
 
diff --git a/autotest/gdrivers/rraster.py b/autotest/gdrivers/rraster.py
index 81a1fb7fae56..6357a528c92a 100755
--- a/autotest/gdrivers/rraster.py
+++ b/autotest/gdrivers/rraster.py
@@ -46,7 +46,7 @@ def test_rraster_1(filename='data/byte_rraster.grd', check_prj=None):
     ref_ds = gdal.Open('data/byte.tif')
     if check_prj is None:
         check_prj = ref_ds.GetProjectionRef()
-    ret = tst.testOpen(check_prj=check_prj,
+    tst.testOpen(check_prj=check_prj,
                        check_gt=ref_ds.GetGeoTransform(),
                        check_min=74,
                        check_max=255)
@@ -66,11 +66,9 @@ def test_rraster_1_copy():
     assert not gdal.VSIStatL(filename + '.aux.xml'), 'did not expect .aux.xml'
     sr = osr.SpatialReference()
     sr.SetFromUserInput('+proj=utm +zone=11 +ellps=clrk66 +nadgrids=@conus,@alaska,@ntv2_0.gsb,@ntv1_can.dat +units=m +no_defs')
-    ret = test_rraster_1(filename, check_prj=sr.ExportToWkt())
+    test_rraster_1(filename, check_prj=sr.ExportToWkt())
     gdal.GetDriverByName('RRASTER').Delete(filename)
 
-    return ret
-
 ###############################################################################
 
 
@@ -149,11 +147,9 @@ def test_rraster_rgba_copy():
         gdal.Translate(filename, 'data/rgba_rraster.grd', format='RRASTER',
                        creationOptions=creationOptions)
         assert not gdal.VSIStatL(filename + '.aux.xml'), 'did not expect .aux.xml'
-        ret = test_rraster_rgba(filename)
+        print(creationOptions)
+        test_rraster_rgba(filename)
         gdal.GetDriverByName('RRASTER').Delete(filename)
-        if ret != 'success':
-            print(creationOptions)
-            return ret
 
     
 ###############################################################################
@@ -182,11 +178,9 @@ def test_rraster_ct_rgb_copy():
     filename = '/vsimem/byte_rraster_ct_rgb.grd'
     gdal.Translate(filename, 'data/byte_rraster_ct_rgb.grd', format='RRASTER')
     assert not gdal.VSIStatL(filename + '.aux.xml'), 'did not expect .aux.xml'
-    ret = test_rraster_ct_rgb(filename)
+    test_rraster_ct_rgb(filename)
     gdal.GetDriverByName('RRASTER').Delete(filename)
 
-    return ret
-
 ###############################################################################
 
 
@@ -213,11 +207,9 @@ def test_rraster_ct_rgba_copy():
     filename = '/vsimem/byte_rraster_ct_rgba.grd'
     gdal.Translate(filename, 'data/byte_rraster_ct_rgba.grd', format='RRASTER')
     assert not gdal.VSIStatL(filename + '.aux.xml'), 'did not expect .aux.xml'
-    ret = test_rraster_ct_rgba(filename)
+    test_rraster_ct_rgba(filename)
     gdal.GetDriverByName('RRASTER').Delete(filename)
 
-    return ret
-
 ###############################################################################
 
 
@@ -304,11 +296,9 @@ def test_rraster_rat_copy():
     filename = '/vsimem/byte_rraster_rat.grd'
     gdal.Translate(filename, 'data/byte_rraster_rat.grd', format='RRASTER')
     assert not gdal.VSIStatL(filename + '.aux.xml'), 'did not expect .aux.xml'
-    ret = test_rraster_rat(filename)
+    test_rraster_rat(filename)
     gdal.GetDriverByName('RRASTER').Delete(filename)
 
-    return ret
-
 ###############################################################################
 
 
diff --git a/autotest/gdrivers/saga.py b/autotest/gdrivers/saga.py
index 59f78667157e..6a3c556c61d2 100755
--- a/autotest/gdrivers/saga.py
+++ b/autotest/gdrivers/saga.py
@@ -94,7 +94,7 @@ def test_saga_4():
             check_minmax = 0
         else:
             check_minmax = 1
-        ret = tst.testCreateCopy(new_filename='tmp/test4.sdat', check_minmax=check_minmax)
+        tst.testCreateCopy(new_filename='tmp/test4.sdat', check_minmax=check_minmax)
 
     
 ###############################################################################
@@ -117,7 +117,7 @@ def test_saga_5():
             check_minmax = 0
         else:
             check_minmax = 1
-        ret = tst.testCreate(new_filename='tmp/test5.sdat', out_bands=1, check_minmax=check_minmax)
+        tst.testCreate(new_filename='tmp/test5.sdat', out_bands=1, check_minmax=check_minmax)
 
     
 ###############################################################################
diff --git a/autotest/gdrivers/srp.py b/autotest/gdrivers/srp.py
index 8e14c7a61fa9..42fd5d497fea 100755
--- a/autotest/gdrivers/srp.py
+++ b/autotest/gdrivers/srp.py
@@ -46,7 +46,7 @@ def test_srp_1(filename='USRP_PCB0/FKUSRP01.IMG'):
     srs.ImportFromEPSG(32600 + 17)
 
     tst = gdaltest.GDALTest('SRP', filename, 1, 24576)
-    ret = tst.testOpen(check_prj=srs.ExportToWkt(), check_gt=(500000.0, 5.0, 0.0, 5000000.0, 0.0, -5.0))
+    tst.testOpen(check_prj=srs.ExportToWkt(), check_gt=(500000.0, 5.0, 0.0, 5000000.0, 0.0, -5.0))
 
     ds = gdal.Open('data/' + filename)
     assert ds.GetRasterBand(1).GetColorInterpretation() == gdal.GCI_PaletteIndex
@@ -130,7 +130,7 @@ def test_srp_5():
 def test_srp_6():
 
     tst = gdaltest.GDALTest('SRP', 'SRP:data/USRP_PCB4/FKUSRP01.GEN,data/USRP_PCB4/FKUSRP01.IMG', 1, 24576, filename_absolute=1)
-    return tst.testOpen()
+    tst.testOpen()
 
 
 ###############################################################################
@@ -142,6 +142,3 @@ def test_srp_cleanup():
     os.unlink('data/USRP_PCB0/TRANSH01.THF.aux.xml')
 
 ###############################################################################
-
-
-
diff --git a/autotest/gdrivers/srtmhgt.py b/autotest/gdrivers/srtmhgt.py
index f3e9ffbad2a5..26ae584e08b9 100755
--- a/autotest/gdrivers/srtmhgt.py
+++ b/autotest/gdrivers/srtmhgt.py
@@ -33,7 +33,6 @@
 from osgeo import gdal
 
 
-import gdaltest
 import pytest
 
 
diff --git a/autotest/gdrivers/tiff_profile.py b/autotest/gdrivers/tiff_profile.py
index 02b83f57072b..aea4f4193305 100755
--- a/autotest/gdrivers/tiff_profile.py
+++ b/autotest/gdrivers/tiff_profile.py
@@ -35,7 +35,6 @@
 import base64
 
 
-import gdaltest
 from osgeo import gdal
 import pytest
 
diff --git a/autotest/gdrivers/vrtpansharpen.py b/autotest/gdrivers/vrtpansharpen.py
index d23808e1134e..b63c31e98bbe 100755
--- a/autotest/gdrivers/vrtpansharpen.py
+++ b/autotest/gdrivers/vrtpansharpen.py
@@ -32,7 +32,6 @@
 from osgeo import gdal
 
 
-import gdaltest
 import pytest
 
 ###############################################################################
diff --git a/autotest/gnm/gnm_test.py b/autotest/gnm/gnm_test.py
index c61a54090690..4224f711b0e6 100755
--- a/autotest/gnm/gnm_test.py
+++ b/autotest/gnm/gnm_test.py
@@ -35,7 +35,6 @@
 import shutil
 
 
-import gdaltest
 
 from osgeo import gdal
 from osgeo import gnm
diff --git a/autotest/ogr/ogr_arcgen.py b/autotest/ogr/ogr_arcgen.py
index 2ead1857cbea..8ee14b5c00ba 100755
--- a/autotest/ogr/ogr_arcgen.py
+++ b/autotest/ogr/ogr_arcgen.py
@@ -30,7 +30,6 @@
 
 
 
-import gdaltest
 import ogrtest
 from osgeo import ogr
 import pytest
diff --git a/autotest/ogr/ogr_avc.py b/autotest/ogr/ogr_avc.py
index 1838f416ba91..3f810e8c0d3d 100755
--- a/autotest/ogr/ogr_avc.py
+++ b/autotest/ogr/ogr_avc.py
@@ -30,7 +30,6 @@
 
 
 
-import gdaltest
 import ogrtest
 from osgeo import ogr
 from osgeo import gdal
diff --git a/autotest/ogr/ogr_bna.py b/autotest/ogr/ogr_bna.py
index 3932ecdcc65e..11f0ca0d9033 100755
--- a/autotest/ogr/ogr_bna.py
+++ b/autotest/ogr/ogr_bna.py
@@ -194,14 +194,14 @@ def test_ogr_bna_6():
     except OSError:
         pass
 
-    ret = ogr_bna_write(['LINEFORMAT=LF', 'MULTILINE=NO', 'COORDINATE_PRECISION=3'])
+    ogr_bna_write(['LINEFORMAT=LF', 'MULTILINE=NO', 'COORDINATE_PRECISION=3'])
 
     size = os.stat('tmp/out.bna').st_size
     assert size == 1601, ('Got size %d. Expected %d' % (size, 1601))
 
     os.remove('tmp/out.bna')
 
-    ret = ogr_bna_write(['LINEFORMAT=CRLF', 'MULTILINE=NO', 'COORDINATE_PRECISION=3'])
+    ogr_bna_write(['LINEFORMAT=CRLF', 'MULTILINE=NO', 'COORDINATE_PRECISION=3'])
 
     size = os.stat('tmp/out.bna').st_size
     assert size == 1611, ('Got size %d. Expected %d' % (size, 1611))
diff --git a/autotest/ogr/ogr_db2.py b/autotest/ogr/ogr_db2.py
index eb8ae86820d0..e9dd071ae0c3 100755
--- a/autotest/ogr/ogr_db2.py
+++ b/autotest/ogr/ogr_db2.py
@@ -41,7 +41,6 @@
 import os
 
 
-import gdaltest
 import ogrtest
 from osgeo import ogr
 import pytest
diff --git a/autotest/ogr/ogr_db2_hack.py b/autotest/ogr/ogr_db2_hack.py
index 79509cf53cf4..6557e157a510 100755
--- a/autotest/ogr/ogr_db2_hack.py
+++ b/autotest/ogr/ogr_db2_hack.py
@@ -29,7 +29,6 @@
 
 
 
-import gdaltest
 from osgeo import ogr
 import pytest
 
diff --git a/autotest/ogr/ogr_eeda.py b/autotest/ogr/ogr_eeda.py
index 8cb646b03924..c7b75c6f12f9 100644
--- a/autotest/ogr/ogr_eeda.py
+++ b/autotest/ogr/ogr_eeda.py
@@ -34,7 +34,6 @@
 
 from osgeo import gdal, ogr
 
-import gdaltest
 import ogrtest
 import pytest
 
diff --git a/autotest/ogr/ogr_factory.py b/autotest/ogr/ogr_factory.py
index b95f036dd1c5..b3b19ee4803b 100755
--- a/autotest/ogr/ogr_factory.py
+++ b/autotest/ogr/ogr_factory.py
@@ -33,7 +33,6 @@
 
 
 import ogrtest
-import gdaltest
 from osgeo import gdal
 from osgeo import ogr
 import pytest
diff --git a/autotest/ogr/ogr_fgdb_stress_test.py b/autotest/ogr/ogr_fgdb_stress_test.py
index a0c840020cbb..24edbac1e631 100755
--- a/autotest/ogr/ogr_fgdb_stress_test.py
+++ b/autotest/ogr/ogr_fgdb_stress_test.py
@@ -34,7 +34,6 @@
 import shutil
 
 
-import gdaltest
 import ogrtest
 from osgeo import gdal
 from osgeo import ogr
diff --git a/autotest/ogr/ogr_idrisi.py b/autotest/ogr/ogr_idrisi.py
index cfbb0e43187a..e823342154d6 100755
--- a/autotest/ogr/ogr_idrisi.py
+++ b/autotest/ogr/ogr_idrisi.py
@@ -31,7 +31,6 @@
 from osgeo import ogr
 
 
-import gdaltest
 import ogrtest
 import pytest
 
diff --git a/autotest/ogr/ogr_layer_algebra.py b/autotest/ogr/ogr_layer_algebra.py
index dce7d3d15793..637c2fe0ae42 100755
--- a/autotest/ogr/ogr_layer_algebra.py
+++ b/autotest/ogr/ogr_layer_algebra.py
@@ -31,7 +31,6 @@
 
 
 
-import gdaltest
 import ogrtest
 
 from osgeo import ogr
diff --git a/autotest/ogr/ogr_openair.py b/autotest/ogr/ogr_openair.py
index 153f2534c34c..6dec943a0a7a 100755
--- a/autotest/ogr/ogr_openair.py
+++ b/autotest/ogr/ogr_openair.py
@@ -30,7 +30,6 @@
 
 
 
-import gdaltest
 import ogrtest
 from osgeo import ogr
 import pytest
diff --git a/autotest/ogr/ogr_rfc30.py b/autotest/ogr/ogr_rfc30.py
index 2d7a668f44e5..9710d528fa52 100755
--- a/autotest/ogr/ogr_rfc30.py
+++ b/autotest/ogr/ogr_rfc30.py
@@ -32,7 +32,6 @@
 from osgeo import ogr
 
 
-import gdaltest
 import pytest
 
 ###############################################################################
diff --git a/autotest/ogr/ogr_rfc35_mem.py b/autotest/ogr/ogr_rfc35_mem.py
index 3dad00cc5bf4..baafade8294d 100755
--- a/autotest/ogr/ogr_rfc35_mem.py
+++ b/autotest/ogr/ogr_rfc35_mem.py
@@ -250,7 +250,7 @@ def test_ogr_rfc35_mem_4():
     assert feat.GetField("intfield") == 12345
     feat = None
 
-    ret = CheckFeatures(lyr, field3='baz5')
+    CheckFeatures(lyr, field3='baz5')
 
     fd.SetWidth(5)
     lyr.AlterFieldDefn(lyr_defn.GetFieldIndex("intfield"), fd, ogr.ALTER_ALL_FLAG)
@@ -260,7 +260,7 @@ def test_ogr_rfc35_mem_4():
     assert feat.GetField("intfield") == 12345
     feat = None
 
-    ret = CheckFeatures(lyr, field3='baz5')
+    CheckFeatures(lyr, field3='baz5')
 
     fd.SetWidth(4)
     lyr.AlterFieldDefn(lyr_defn.GetFieldIndex("intfield"), fd, ogr.ALTER_ALL_FLAG)
@@ -271,7 +271,7 @@ def test_ogr_rfc35_mem_4():
     assert feat.GetField("intfield") == 12345
     feat = None
 
-    ret = CheckFeatures(lyr, field3='baz5')
+    CheckFeatures(lyr, field3='baz5')
 
     fd = ogr.FieldDefn("oldintfld", ogr.OFTString)
     fd.SetWidth(15)
@@ -283,7 +283,7 @@ def test_ogr_rfc35_mem_4():
     assert feat.GetField("oldintfld") == '12345'
     feat = None
 
-    ret = CheckFeatures(lyr, field3='baz5')
+    CheckFeatures(lyr, field3='baz5')
 
     lyr.DeleteField(lyr_defn.GetFieldIndex("oldintfld"))
 
@@ -308,7 +308,7 @@ def test_ogr_rfc35_mem_4():
     assert feat.GetField("oldintfld") == '98765'
     feat = None
 
-    ret = CheckFeatures(lyr, field3='baz5')
+    CheckFeatures(lyr, field3='baz5')
 
 ###############################################################################
 # Test DeleteField()
diff --git a/autotest/ogr/ogr_rfc41.py b/autotest/ogr/ogr_rfc41.py
index fc6721c5265c..096c8ca44064 100755
--- a/autotest/ogr/ogr_rfc41.py
+++ b/autotest/ogr/ogr_rfc41.py
@@ -697,7 +697,7 @@ def test_ogr_rfc41_7():
 # Test SQLite dialect
 
 
-def test_ogr_rfc41_8(require_ogr_sql_sqlite):
+def test_ogr_rfc41_8(require_ogr_sql_sqlite):  # noqa
     ds = ogr.GetDriverByName('memory').CreateDataSource('')
     lyr = ds.CreateLayer('mytable', geom_type=ogr.wkbPolygon)
     lyr.GetLayerDefn().GetGeomFieldDefn(0).SetName('geomfield')
diff --git a/autotest/ogr/ogr_segukooa.py b/autotest/ogr/ogr_segukooa.py
index 26f6e3099b00..ef5f092b30de 100755
--- a/autotest/ogr/ogr_segukooa.py
+++ b/autotest/ogr/ogr_segukooa.py
@@ -30,7 +30,6 @@
 
 
 
-import gdaltest
 import ogrtest
 from osgeo import ogr
 import pytest
diff --git a/autotest/ogr/ogr_segy.py b/autotest/ogr/ogr_segy.py
index 401d23212d72..fefd4603036e 100755
--- a/autotest/ogr/ogr_segy.py
+++ b/autotest/ogr/ogr_segy.py
@@ -30,7 +30,6 @@
 
 
 
-import gdaltest
 import ogrtest
 from osgeo import ogr
 import pytest
diff --git a/autotest/ogr/ogr_selafin.py b/autotest/ogr/ogr_selafin.py
index 4e9351c6632e..147a2d5efead 100755
--- a/autotest/ogr/ogr_selafin.py
+++ b/autotest/ogr/ogr_selafin.py
@@ -33,7 +33,6 @@
 
 
 import gdaltest
-from osgeo import gdal
 from osgeo import ogr
 from osgeo import osr
 import pytest
diff --git a/autotest/ogr/ogr_shape_qix.py b/autotest/ogr/ogr_shape_qix.py
index 9c33d85bdc18..b32b53dfd5e3 100755
--- a/autotest/ogr/ogr_shape_qix.py
+++ b/autotest/ogr/ogr_shape_qix.py
@@ -32,7 +32,6 @@
 import random
 
 
-import gdaltest
 from osgeo import ogr
 
 ###############################################################################
diff --git a/autotest/ogr/ogr_sqlite.py b/autotest/ogr/ogr_sqlite.py
index bcf22f814dbe..a17d665f6ec2 100755
--- a/autotest/ogr/ogr_sqlite.py
+++ b/autotest/ogr/ogr_sqlite.py
@@ -31,7 +31,6 @@
 ###############################################################################
 
 import os
-import sys
 import shutil
 import pytest
 
diff --git a/autotest/ogr/ogr_style.py b/autotest/ogr/ogr_style.py
index 44d144a04639..fb3390230c6a 100755
--- a/autotest/ogr/ogr_style.py
+++ b/autotest/ogr/ogr_style.py
@@ -31,7 +31,6 @@
 
 
 
-import gdaltest
 from osgeo import ogr
 from osgeo import gdal
 
diff --git a/autotest/ogr/ogr_sua.py b/autotest/ogr/ogr_sua.py
index a95e2c35aad2..7101f2c807b1 100755
--- a/autotest/ogr/ogr_sua.py
+++ b/autotest/ogr/ogr_sua.py
@@ -30,7 +30,6 @@
 
 
 
-import gdaltest
 import ogrtest
 from osgeo import ogr
 import pytest
diff --git a/autotest/ogr/ogr_vrt.py b/autotest/ogr/ogr_vrt.py
index 85467ba2a068..72ba66dd1c18 100755
--- a/autotest/ogr/ogr_vrt.py
+++ b/autotest/ogr/ogr_vrt.py
@@ -1154,7 +1154,7 @@ def test_ogr_vrt_23(shared_ds_flag=''):
 
 def test_ogr_vrt_24():
 
-    ret = test_ogr_vrt_23(' shared="1"')
+    test_ogr_vrt_23(' shared="1"')
 
     rec1 = """<OGRVRTDataSource>
     <OGRVRTLayer name="test">
diff --git a/autotest/ogr/ogr_wktempty.py b/autotest/ogr/ogr_wktempty.py
index 98e2c9f75f8f..f8bf223249f0 100755
--- a/autotest/ogr/ogr_wktempty.py
+++ b/autotest/ogr/ogr_wktempty.py
@@ -29,7 +29,6 @@
 
 import pytest
 
-import gdaltest
 from osgeo import ogr
 
 
diff --git a/autotest/ogr/ogr_xplane.py b/autotest/ogr/ogr_xplane.py
index 10493a0e514a..3524084ab775 100755
--- a/autotest/ogr/ogr_xplane.py
+++ b/autotest/ogr/ogr_xplane.py
@@ -30,7 +30,6 @@
 
 
 
-import gdaltest
 from osgeo import ogr
 
 ###############################################################################
diff --git a/autotest/ogr/ograpispy.py b/autotest/ogr/ograpispy.py
index 47ef18218ffa..2b454cb3fad2 100755
--- a/autotest/ogr/ograpispy.py
+++ b/autotest/ogr/ograpispy.py
@@ -34,7 +34,6 @@
 from difflib import unified_diff
 
 
-import gdaltest
 import ogrtest
 import test_py_scripts
 from osgeo import ogr
diff --git a/autotest/osr/osr_epsg.py b/autotest/osr/osr_epsg.py
index 51760abfed2c..bf4c98f5a9f8 100755
--- a/autotest/osr/osr_epsg.py
+++ b/autotest/osr/osr_epsg.py
@@ -32,7 +32,6 @@
 
 
 
-import gdaltest
 from osgeo import osr
 import pytest
 
diff --git a/autotest/osr/osr_erm.py b/autotest/osr/osr_erm.py
index 32eca36915ce..c5f52f20387b 100755
--- a/autotest/osr/osr_erm.py
+++ b/autotest/osr/osr_erm.py
@@ -27,7 +27,6 @@
 
 
 
-import gdaltest
 from osgeo import osr
 
 ###############################################################################
diff --git a/autotest/osr/osr_getprojectionmethods.py b/autotest/osr/osr_getprojectionmethods.py
index 09cf2e9197ae..ac424fcfc95f 100755
--- a/autotest/osr/osr_getprojectionmethods.py
+++ b/autotest/osr/osr_getprojectionmethods.py
@@ -30,7 +30,6 @@
 
 
 
-import gdaltest
 from osgeo import osr
 
 
diff --git a/autotest/osr/osr_micoordsys.py b/autotest/osr/osr_micoordsys.py
index 76adc9375051..1eb716ddb2f5 100755
--- a/autotest/osr/osr_micoordsys.py
+++ b/autotest/osr/osr_micoordsys.py
@@ -30,7 +30,6 @@
 
 
 
-import gdaltest
 from osgeo import osr
 import pytest
 
diff --git a/autotest/osr/osr_pm.py b/autotest/osr/osr_pm.py
index 3c04cc03ee8b..2ba01afb401f 100755
--- a/autotest/osr/osr_pm.py
+++ b/autotest/osr/osr_pm.py
@@ -31,7 +31,6 @@
 
 
 
-import gdaltest
 from osgeo import osr
 
 ###############################################################################
diff --git a/autotest/osr/osr_usgs.py b/autotest/osr/osr_usgs.py
index 95b84af1176f..c71a7b229b3e 100755
--- a/autotest/osr/osr_usgs.py
+++ b/autotest/osr/osr_usgs.py
@@ -30,7 +30,6 @@
 
 
 
-import gdaltest
 from osgeo import gdal
 from osgeo import osr
 
diff --git a/autotest/osr/osr_validate.py b/autotest/osr/osr_validate.py
index 39c32fbd5e64..e1b0e63b84f0 100755
--- a/autotest/osr/osr_validate.py
+++ b/autotest/osr/osr_validate.py
@@ -31,7 +31,6 @@
 
 
 
-import gdaltest
 from osgeo import osr
 
 ###############################################################################
diff --git a/autotest/pymod/gdaltest_python2.py b/autotest/pymod/gdaltest_python2.py
index 35c27fbcea77..81b96206088a 100644
--- a/autotest/pymod/gdaltest_python2.py
+++ b/autotest/pymod/gdaltest_python2.py
@@ -108,7 +108,7 @@ def gdalurlopen(url, timeout=10):
         print('HTTP service for %s is down (HTTP Error: %s)' % (url, e.reason))
         socket.setdefaulttimeout(old_timeout)
         return None
-    except socket.timeout as e:
+    except socket.timeout:
         print('HTTP service for %s is down (timeout)' % url)
         socket.setdefaulttimeout(old_timeout)
         return None
diff --git a/autotest/pymod/test_py_scripts.py b/autotest/pymod/test_py_scripts.py
index 930dc69eb538..de0fde6d4709 100644
--- a/autotest/pymod/test_py_scripts.py
+++ b/autotest/pymod/test_py_scripts.py
@@ -32,7 +32,6 @@
 import os
 import sys
 import gdaltest
-from osgeo import gdal
 
 ###############################################################################
 # Return the path in which the Python script is found
diff --git a/autotest/pyscripts/test_gdal2tiles.py b/autotest/pyscripts/test_gdal2tiles.py
index c72707ff3a02..0cdff6257494 100755
--- a/autotest/pyscripts/test_gdal2tiles.py
+++ b/autotest/pyscripts/test_gdal2tiles.py
@@ -35,7 +35,6 @@
 
 
 from osgeo import gdal      # noqa
-import gdaltest             # noqa  # pylint: disable=E0401
 import test_py_scripts      # noqa  # pylint: disable=E0401
 import pytest
 
diff --git a/autotest/pyscripts/test_gdal_calc.py b/autotest/pyscripts/test_gdal_calc.py
index 27d68d30aaa9..7cb779a13356 100755
--- a/autotest/pyscripts/test_gdal_calc.py
+++ b/autotest/pyscripts/test_gdal_calc.py
@@ -36,7 +36,6 @@
 
 
 from osgeo import gdal
-import gdaltest
 import test_py_scripts
 import pytest
 
diff --git a/autotest/pyscripts/test_gdal_edit.py b/autotest/pyscripts/test_gdal_edit.py
index b9ea6f9a02eb..c3e10533d96e 100755
--- a/autotest/pyscripts/test_gdal_edit.py
+++ b/autotest/pyscripts/test_gdal_edit.py
@@ -35,7 +35,6 @@
 
 
 from osgeo import gdal
-import gdaltest
 import test_py_scripts
 import pytest
 
diff --git a/autotest/pyscripts/test_gdal_fillnodata.py b/autotest/pyscripts/test_gdal_fillnodata.py
index cf19f2866e80..25aaed681ff4 100755
--- a/autotest/pyscripts/test_gdal_fillnodata.py
+++ b/autotest/pyscripts/test_gdal_fillnodata.py
@@ -33,7 +33,6 @@
 
 
 from osgeo import gdal
-import gdaltest
 import test_py_scripts
 import pytest
 
diff --git a/autotest/pyscripts/test_gdal_merge.py b/autotest/pyscripts/test_gdal_merge.py
index 661b7d8399e8..954db227d2ec 100755
--- a/autotest/pyscripts/test_gdal_merge.py
+++ b/autotest/pyscripts/test_gdal_merge.py
@@ -34,7 +34,6 @@
 
 from osgeo import gdal
 from osgeo import osr
-import gdaltest
 import test_py_scripts
 import pytest
 
diff --git a/autotest/pyscripts/test_gdal_pansharpen.py b/autotest/pyscripts/test_gdal_pansharpen.py
index bf70ad05093c..006752aa5e5d 100755
--- a/autotest/pyscripts/test_gdal_pansharpen.py
+++ b/autotest/pyscripts/test_gdal_pansharpen.py
@@ -32,7 +32,6 @@
 
 
 from osgeo import gdal
-import gdaltest
 import test_py_scripts
 import pytest
 
diff --git a/autotest/pyscripts/test_gdal_polygonize.py b/autotest/pyscripts/test_gdal_polygonize.py
index 354d7d53ebc4..a8229bbf5993 100755
--- a/autotest/pyscripts/test_gdal_polygonize.py
+++ b/autotest/pyscripts/test_gdal_polygonize.py
@@ -32,7 +32,6 @@
 import os
 
 
-import gdaltest
 import ogrtest
 import test_py_scripts
 
diff --git a/autotest/pyscripts/test_gdal_proximity.py b/autotest/pyscripts/test_gdal_proximity.py
index 9de51468ee25..c8ad3321247e 100755
--- a/autotest/pyscripts/test_gdal_proximity.py
+++ b/autotest/pyscripts/test_gdal_proximity.py
@@ -32,7 +32,6 @@
 import os
 
 
-import gdaltest
 import test_py_scripts
 
 from osgeo import gdal
diff --git a/autotest/pyscripts/test_gdal_retile.py b/autotest/pyscripts/test_gdal_retile.py
index 567a4ced8523..dc5b22582c34 100755
--- a/autotest/pyscripts/test_gdal_retile.py
+++ b/autotest/pyscripts/test_gdal_retile.py
@@ -34,7 +34,6 @@
 
 from osgeo import gdal
 from osgeo import osr
-import gdaltest
 import test_py_scripts
 import pytest
 
diff --git a/autotest/pyscripts/test_gdal_sieve.py b/autotest/pyscripts/test_gdal_sieve.py
index 02bcbd12934c..9bb1e20b6ede 100755
--- a/autotest/pyscripts/test_gdal_sieve.py
+++ b/autotest/pyscripts/test_gdal_sieve.py
@@ -31,7 +31,6 @@
 
 
 
-import gdaltest
 import test_py_scripts
 
 from osgeo import gdal
diff --git a/autotest/pyscripts/test_gdalinfo_py.py b/autotest/pyscripts/test_gdalinfo_py.py
index 3500b8a69968..f3ce0607e01b 100755
--- a/autotest/pyscripts/test_gdalinfo_py.py
+++ b/autotest/pyscripts/test_gdalinfo_py.py
@@ -31,7 +31,6 @@
 import os
 
 
-import gdaltest
 import test_py_scripts
 import pytest
 
diff --git a/autotest/pyscripts/test_gdalmove.py b/autotest/pyscripts/test_gdalmove.py
index 87bcd5156fd4..069b3927f7ff 100755
--- a/autotest/pyscripts/test_gdalmove.py
+++ b/autotest/pyscripts/test_gdalmove.py
@@ -33,7 +33,6 @@
 
 
 from osgeo import gdal
-import gdaltest
 import test_py_scripts
 import pytest
 
diff --git a/autotest/pyscripts/test_ogrinfo_py.py b/autotest/pyscripts/test_ogrinfo_py.py
index 7c433549eb1f..b5bcf2830f2a 100755
--- a/autotest/pyscripts/test_ogrinfo_py.py
+++ b/autotest/pyscripts/test_ogrinfo_py.py
@@ -31,7 +31,6 @@
 import os
 
 
-import gdaltest
 import ogrtest
 import test_py_scripts
 import pytest
diff --git a/autotest/pyscripts/test_ogrmerge.py b/autotest/pyscripts/test_ogrmerge.py
index d88b5c6e69f1..a3a24dda54db 100755
--- a/autotest/pyscripts/test_ogrmerge.py
+++ b/autotest/pyscripts/test_ogrmerge.py
@@ -32,7 +32,6 @@
 
 from osgeo import gdal
 from osgeo import ogr
-import gdaltest
 import test_py_scripts
 import pytest
 
diff --git a/autotest/utilities/test_gdal_grid_lib.py b/autotest/utilities/test_gdal_grid_lib.py
index 051c42a11f99..e08620c7a548 100755
--- a/autotest/utilities/test_gdal_grid_lib.py
+++ b/autotest/utilities/test_gdal_grid_lib.py
@@ -34,7 +34,6 @@
 
 from osgeo import gdal, ogr
 
-import gdaltest
 import ogrtest
 
 ###############################################################################
diff --git a/autotest/utilities/test_gdalbuildvrt_lib.py b/autotest/utilities/test_gdalbuildvrt_lib.py
index b0368a753e86..f9f89161efeb 100755
--- a/autotest/utilities/test_gdalbuildvrt_lib.py
+++ b/autotest/utilities/test_gdalbuildvrt_lib.py
@@ -32,7 +32,6 @@
 
 
 from osgeo import gdal
-import gdaltest
 
 ###############################################################################
 # Simple test
diff --git a/autotest/utilities/test_gdalinfo_lib.py b/autotest/utilities/test_gdalinfo_lib.py
index 1d0c574f3fed..433954f2e644 100755
--- a/autotest/utilities/test_gdalinfo_lib.py
+++ b/autotest/utilities/test_gdalinfo_lib.py
@@ -32,7 +32,6 @@
 
 
 from osgeo import gdal
-import gdaltest
 
 ###############################################################################
 # Simple test
diff --git a/autotest/utilities/test_nearblack_lib.py b/autotest/utilities/test_nearblack_lib.py
index 1f565460c622..9d19481f5e05 100755
--- a/autotest/utilities/test_nearblack_lib.py
+++ b/autotest/utilities/test_nearblack_lib.py
@@ -32,7 +32,6 @@
 
 
 from osgeo import gdal
-import gdaltest
 
 ###############################################################################
 # Basic test
diff --git a/gdal/ci/travis/trusty_clang/before_install.sh b/gdal/ci/travis/trusty_clang/before_install.sh
index 13b96b1828bc..3d19a7e07653 100755
--- a/gdal/ci/travis/trusty_clang/before_install.sh
+++ b/gdal/ci/travis/trusty_clang/before_install.sh
@@ -27,11 +27,13 @@ sudo apt-get install -y libogdi3.2-dev
 sudo apt-get install -y mono-mcs libmono-system-drawing4.0-cil
 # Boost for Mongo
 #sudo apt-get install -y libboost-regex-dev libboost-system-dev libboost-thread-dev
-sudo pip install pyflakes
+sudo pip install flake8
 sudo apt-get install doxygen texlive-latex-base
-pyflakes autotest
-pyflakes gdal/swig/python/scripts
-pyflakes gdal/swig/python/samples
+# flake8 codes to just emulate pyflakes (http://flake8.pycqa.org/en/latest/user/error-codes.html)
+FLAKE8="flake8 --select=F401,F402,F403,F404,F405,F406,F407,F601,F602,F621,F622,F631,F701,F702,F703,F704,F705,F706,F707,F721,F722,F811,F812,F821,F822,F823,F831,F841,F901"
+$FLAKE8 autotest
+$FLAKE8 gdal/swig/python/scripts
+$FLAKE8 gdal/swig/python/samples
 psql -c "drop database if exists autotest" -U postgres
 psql -c "create database autotest" -U postgres
 psql -c "create extension postgis" -d autotest -U postgres

From 20c4ebd2cf9a99f8e77f064d6d10d21e996ccecb Mon Sep 17 00:00:00 2001
From: Craig de Stigter <craig.destigter@koordinates.com>
Date: Wed, 7 Nov 2018 14:33:00 +1300
Subject: [PATCH 147/488] Remove cleanup_on_exit hook

This was ported from gdaltest.summarize(), but doesn't seem to
be actually necessary, and in some cases seems to cause a double-free
at process exit now that we're running all tests in one process.
---
 autotest/conftest.py | 13 -------------
 1 file changed, 13 deletions(-)

diff --git a/autotest/conftest.py b/autotest/conftest.py
index 9ee67d794b6a..f859ca16295a 100644
--- a/autotest/conftest.py
+++ b/autotest/conftest.py
@@ -49,19 +49,6 @@ def chdir_to_test_file(request):
     os.chdir(old)
 
 
-@pytest.fixture(scope='session', autouse=True)
-def cleanup_on_exit():
-    yield
-
-    from gcore import testnonboundtoswig
-
-    # Do it twice to ensure that cleanup routines properly do their jobs
-    for _ in range(2):
-        testnonboundtoswig.OSRCleanup()
-        testnonboundtoswig.GDALDestroyDriverManager()
-        testnonboundtoswig.OGRCleanupAll()
-
-
 def pytest_collection_modifyitems(config, items):
     # skip tests with @pytest.mark.require_driver(name) when the driver isn't available
     skip = pytest.mark.skip("Driver not present")

From d4cacb3e1e62ec915b0b3fcbfd4205dc261aabbc Mon Sep 17 00:00:00 2001
From: Craig de Stigter <craig.destigter@koordinates.com>
Date: Mon, 12 Nov 2018 19:05:43 +1300
Subject: [PATCH 148/488] Fix license-checking test

This test didn't make a lot of sense without the subprocess part,
since VersionInfo() caches the result in the current process.

This test didn't fail in all environments; I'm not really sure why.
But this new version should work in all.
---
 autotest/gcore/basic_test.py            | 28 +++++++++----------
 autotest/gcore/basic_test_subprocess.py | 37 +++++++++++++++++++++++++
 2 files changed, 51 insertions(+), 14 deletions(-)
 create mode 100755 autotest/gcore/basic_test_subprocess.py

diff --git a/autotest/gcore/basic_test.py b/autotest/gcore/basic_test.py
index 3edaac5238e7..bf7567069970 100755
--- a/autotest/gcore/basic_test.py
+++ b/autotest/gcore/basic_test.py
@@ -30,6 +30,7 @@
 ###############################################################################
 
 import os
+import subprocess
 import sys
 
 
@@ -178,15 +179,19 @@ def test_basic_test_8():
         or 'GDAL/OGR Licensing' in license_text
     )
 
-    with gdaltest.config_option('GDAL_DATA', 'tmp'):
-        with open('tmp/LICENSE.TXT', 'wt') as f:
-            f.write('fake_license')
-            license_text = gdal.VersionInfo('LICENSE')
-        os.unlink('tmp/LICENSE.TXT')
-        assert (
-            license_text.startswith('fake_license')
-            or 'GDAL/OGR Licensing' in license_text
-        )
+    # Use a subprocess to avoid the cached license text
+    env = os.environ.copy()
+    env['GDAL_DATA'] = 'tmp'
+    with open('tmp/LICENSE.TXT', 'wt') as f:
+        f.write('fake_license')
+    license_text = subprocess.check_output(
+        [sys.executable, 'basic_test_subprocess.py'],
+        env=env
+    ).decode('utf-8')
+    os.unlink('tmp/LICENSE.TXT')
+    assert (
+        license_text.startswith(u'fake_license')
+    )
 
 
 ###############################################################################
@@ -541,8 +546,3 @@ def test_basic_test_17():
         assert not flag, 'expected failure'
         assert not gdal.GetUseExceptions()
         assert not ogr.GetUseExceptions()
-
-    
-
-
-
diff --git a/autotest/gcore/basic_test_subprocess.py b/autotest/gcore/basic_test_subprocess.py
new file mode 100755
index 000000000000..0cd8457c542a
--- /dev/null
+++ b/autotest/gcore/basic_test_subprocess.py
@@ -0,0 +1,37 @@
+#!/usr/bin/env python
+# -*- coding: utf-8 -*-
+###############################################################################
+# $Id$
+#
+# Project:  GDAL/OGR Test Suite
+# Purpose:  Test basic GDAL open
+# Author:   Even Rouault <even dot rouault at mines dash paris dot org>
+#
+###############################################################################
+# Copyright (c) 2008-2013, Even Rouault <even dot rouault at mines-paris dot org>
+#
+# Permission is hereby granted, free of charge, to any person obtaining a
+# copy of this software and associated documentation files (the "Software"),
+# to deal in the Software without restriction, including without limitation
+# the rights to use, copy, modify, merge, publish, distribute, sublicense,
+# and/or sell copies of the Software, and to permit persons to whom the
+# Software is furnished to do so, subject to the following conditions:
+#
+# The above copyright notice and this permission notice shall be included
+# in all copies or substantial portions of the Software.
+#
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+# OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
+# THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+# FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
+# DEALINGS IN THE SOFTWARE.
+###############################################################################
+
+from osgeo import gdal
+
+
+if __name__ == '__main__':
+    # test_basic_test_8
+    print(gdal.VersionInfo('LICENSE'))

From a57ee5aedcdb5e48f869690acb0a3bbf7131ae4b Mon Sep 17 00:00:00 2001
From: Craig de Stigter <craig.destigter@koordinates.com>
Date: Mon, 12 Nov 2018 21:40:27 +1300
Subject: [PATCH 149/488] Disable a LC_CTYPE test in test_gdal2tiles

This test is tricky in that it tests some non-nominal behaviour of gdal2tiles
regarding encoding settings. The failure here must be due to using an external
process now instead of the current python interpreter.

The issue now is that the 'if not os.path.isfile(input_file)' check
at line 1211 of gdal2tiles choke on non-ASCII input, whereas previously
it was a unicode string at that point, and the check at line 1252 would
emit the WARNING.

In other words, this probably never worked to begin with, but the old test
behaviour masked that.
---
 autotest/pyscripts/test_gdal2tiles.py | 1 +
 1 file changed, 1 insertion(+)

diff --git a/autotest/pyscripts/test_gdal2tiles.py b/autotest/pyscripts/test_gdal2tiles.py
index 0cdff6257494..74c764936e31 100755
--- a/autotest/pyscripts/test_gdal2tiles.py
+++ b/autotest/pyscripts/test_gdal2tiles.py
@@ -169,6 +169,7 @@ def test_python2_handles_utf8_by_default():
     return _test_utf8(should_raise_unicode=False)
 
 
+@pytest.mark.skip("This behaviour doesn't actually work as expected")
 def test_python2_gives_warning_if_bad_lc_ctype_and_non_ascii_chars():
     if sys.version_info[0] >= 3:
         pytest.skip()

From d87dc34c05ea611d061bce01e5ea2c8533713b57 Mon Sep 17 00:00:00 2001
From: Craig de Stigter <craig.destigter@koordinates.com>
Date: Thu, 15 Nov 2018 10:03:39 +1300
Subject: [PATCH 150/488] Fix sqlite tests when compiled without spatialite

---
 autotest/ogr/ogr_sqlite.py | 131 +++++++++++++++----------------------
 1 file changed, 52 insertions(+), 79 deletions(-)

diff --git a/autotest/ogr/ogr_sqlite.py b/autotest/ogr/ogr_sqlite.py
index a17d665f6ec2..697a99e80d13 100755
--- a/autotest/ogr/ogr_sqlite.py
+++ b/autotest/ogr/ogr_sqlite.py
@@ -43,30 +43,41 @@
 
 pytestmark = [
     pytest.mark.require_driver('SQLite'),
-    # pytest.mark.usefixtures('tmp_dir'),
 ]
 
 
 ###############################################################################
 # Test if SpatiaLite is available
 
-@pytest.fixture(scope='module')
-def spatialite():
-    sl_ds = ogr.Open('tmp/sqlite_test.db', update=1)
-
+@pytest.fixture(autouse=True, scope='module')
+def setup():
     gdal.PushErrorHandler('CPLQuietErrorHandler')
-    sql_lyr = sl_ds.ExecuteSQL("SELECT spatialite_version()")
-    gdal.PopErrorHandler()
-    if sql_lyr is None:
-        pytest.skip()
-    else:
+    ds = ogr.GetDriverByName('SQLite').CreateDataSource('/vsimem/foo.db', options=['SPATIALITE=YES'])
+    gdaltest.spatialite_version = None
+    if ds is not None:
+        sql_lyr = ds.ExecuteSQL("SELECT spatialite_version()")
         feat = sql_lyr.GetNextFeature()
-        print('Spatialite : %s' % feat.GetFieldAsString(0))
         gdaltest.spatialite_version = feat.GetFieldAsString(0)
-        gdaltest.has_spatialite = True
-        sl_ds.ReleaseResultSet(sql_lyr)
+        print('Spatialite : %s' % gdaltest.spatialite_version)
+        ds.ReleaseResultSet(sql_lyr)
+    ds = None
+    gdal.Unlink('/vsimem/foo.db')
+    gdal.PopErrorHandler()
 
+
+@pytest.fixture()
+def require_spatialite(setup):
+    if gdaltest.spatialite_version is None:
+        pytest.skip('Spatialite not available')
+    return gdaltest.spatialite_version
+
+
+@pytest.fixture(params=['no-spatialite', 'spatialite'])
+def with_and_without_spatialite(request):
+    if request.param == 'spatialite':
         return gdaltest.spatialite_version
+    else:
+        return None
 
 
 ###############################################################################
@@ -74,9 +85,7 @@ def spatialite():
 
 
 def test_ogr_sqlite_1():
-
     gdaltest.sl_ds = None
-    gdaltest.has_spatialite = False
 
     sqlite_dr = ogr.GetDriverByName('SQLite')
     if sqlite_dr is None:
@@ -792,7 +801,7 @@ def test_ogr_sqlite_16():
 # Test SPATIALITE dataset creation option
 
 
-def test_ogr_sqlite_17(spatialite):
+def test_ogr_sqlite_17(require_spatialite):
 
     if gdaltest.sl_ds is None:
         pytest.skip()
@@ -836,7 +845,7 @@ def test_ogr_sqlite_17(spatialite):
 # Create a layer with a non EPSG SRS into a SPATIALITE DB (#3506)
 
 
-def test_ogr_sqlite_18(spatialite):
+def test_ogr_sqlite_18(require_spatialite):
     if gdaltest.sl_ds is None:
         pytest.skip()
 
@@ -867,7 +876,7 @@ def test_ogr_sqlite_18(spatialite):
 # Create a SpatiaLite DB with INIT_WITH_EPSG=YES
 
 
-def test_ogr_sqlite_19(spatialite):
+def test_ogr_sqlite_19(require_spatialite):
 
     if gdaltest.sl_ds is None:
         pytest.skip()
@@ -875,7 +884,7 @@ def test_ogr_sqlite_19(spatialite):
     if int(gdal.VersionInfo('VERSION_NUM')) < 1800:
         pytest.skip()
 
-    if spatialite != '2.3.1':
+    if require_spatialite != '2.3.1':
         pytest.skip()
 
     ds = ogr.GetDriverByName('SQLite').CreateDataSource('tmp/spatialite_test_with_epsg.db', options=['SPATIALITE=YES', 'INIT_WITH_EPSG=YES'])
@@ -901,12 +910,13 @@ def test_ogr_sqlite_19(spatialite):
 # Create a SpatiaLite DB with INIT_WITH_EPSG=NO
 
 
-def test_ogr_sqlite_19_bis(spatialite):
+def test_ogr_sqlite_19_bis(require_spatialite):
 
     if gdaltest.sl_ds is None:
         pytest.skip()
 
-    if int(spatialite[0:spatialite.find('.')]) < 4:
+    spatialite_major_ver = int(require_spatialite.split('.')[0])
+    if spatialite_major_ver < 4:
         pytest.skip()
 
     ds = ogr.GetDriverByName('SQLite').CreateDataSource('/vsimem/spatialite_test_without_epsg.db', options=['SPATIALITE=YES', 'INIT_WITH_EPSG=NO'])
@@ -1285,7 +1295,7 @@ def test_ogr_sqlite_30():
 # Test spatial filter when SpatiaLite is available
 
 
-def test_ogr_spatialite_2(spatialite):
+def test_ogr_spatialite_2(require_spatialite):
 
     ds = ogr.Open('tmp/spatialite_test.db', update=1)
     srs = osr.SpatialReference()
@@ -1434,7 +1444,7 @@ def test_ogr_spatialite_2(spatialite):
 # Test VirtualShape feature of SpatiaLite
 
 
-def test_ogr_spatialite_3(spatialite):
+def test_ogr_spatialite_3(require_spatialite):
 
     ds = ogr.Open('tmp/spatialite_test.db', update=1)
     ds.ExecuteSQL('CREATE VIRTUAL TABLE testpoly USING VirtualShape(data/testpoly, CP1252, -1)')
@@ -1457,7 +1467,7 @@ def test_ogr_spatialite_3(spatialite):
 # Test updating a spatialite DB (#3471 and #3474)
 
 
-def test_ogr_spatialite_4(spatialite):
+def test_ogr_spatialite_4(require_spatialite):
 
     ds = ogr.Open('tmp/spatialite_test.db', update=1)
 
@@ -1512,8 +1522,8 @@ def test_ogr_spatialite_4(spatialite):
     'bUseComprGeom',
     [False, True]
 )
-def test_ogr_spatialite_5(spatialite, bUseComprGeom):
-    if bUseComprGeom and spatialite == '2.3.1':
+def test_ogr_spatialite_5(require_spatialite, bUseComprGeom):
+    if bUseComprGeom and require_spatialite == '2.3.1':
         pytest.skip()
 
     try:
@@ -1641,8 +1651,8 @@ def test_ogr_spatialite_5(spatialite, bUseComprGeom):
 # Test spatialite spatial views
 
 
-def test_ogr_spatialite_6(spatialite):
-    if spatialite.find('2.3') == 0:
+def test_ogr_spatialite_6(require_spatialite):
+    if gdaltest.spatialite_version.startswith('2.3'):
         pytest.skip()
 
     try:
@@ -1762,7 +1772,7 @@ def test_ogr_spatialite_6(spatialite):
 # Test VirtualShape:xxx.shp
 
 
-def test_ogr_spatialite_7(spatialite):
+def test_ogr_spatialite_7(require_spatialite):
     ds = ogr.Open('VirtualShape:data/poly.shp')
     assert ds is not None
 
@@ -1778,8 +1788,8 @@ def test_ogr_spatialite_7(spatialite):
 # Test tables with multiple geometry columns (#4768)
 
 
-def test_ogr_spatialite_8(spatialite):
-    if spatialite.find('2.3') == 0:
+def test_ogr_spatialite_8(require_spatialite):
+    if require_spatialite.find('2.3') == 0:
         pytest.skip()
 
     try:
@@ -2036,23 +2046,15 @@ def test_ogr_sqlite_32():
 # Test SRID layer creation option
 
 
-@pytest.mark.parametrize(
-    'use_spatialite',
-    [
-        False,
-        pytest.param(True, marks=pytest.mark.usefixtures('spatialite')),
-    ]
-)
-def test_ogr_sqlite_33(use_spatialite):
+def test_ogr_sqlite_33(with_and_without_spatialite):
     if gdaltest.sl_ds is None:
         pytest.skip()
 
-
     try:
         os.remove('tmp/ogr_sqlite_33.sqlite')
     except OSError:
         pass
-    if not use_spatialite:
+    if not with_and_without_spatialite:
         options = []
     else:
         if gdaltest.spatialite_version.find('2.3') == 0:
@@ -2061,7 +2063,7 @@ def test_ogr_sqlite_33(use_spatialite):
 
     ds = ogr.GetDriverByName('SQLite').CreateDataSource('tmp/ogr_sqlite_33.sqlite', options=options)
 
-    if not use_spatialite:
+    if not with_and_without_spatialite:
         # To make sure that the entry is added in spatial_ref_sys
         srs = osr.SpatialReference()
         srs.ImportFromEPSG(4326)
@@ -2168,19 +2170,12 @@ def test_ogr_sqlite_34():
 # Test SetAttributeFilter() on SQL result layer
 
 
-@pytest.mark.parametrize(
-    'use_spatialite',
-    [
-        False,
-        pytest.param(True, marks=pytest.mark.usefixtures('spatialite')),
-    ]
-)
-def test_ogr_sqlite_35(use_spatialite):
+def test_ogr_sqlite_35(with_and_without_spatialite):
 
     if gdaltest.sl_ds is None:
         pytest.skip()
 
-    if use_spatialite:
+    if with_and_without_spatialite:
         if gdaltest.spatialite_version.find('2.3') >= 0:
             pytest.skip()
         options = ['SPATIALITE=YES']
@@ -2484,7 +2479,7 @@ def test_ogr_sqlite_38():
 # Test spatial filters with point extent
 
 
-def test_ogr_spatialite_9(spatialite):
+def test_ogr_spatialite_9(require_spatialite):
     ds = ogr.GetDriverByName('SQLite').CreateDataSource('/vsimem/ogr_spatialite_9.sqlite', options=['SPATIALITE=YES'])
     lyr = ds.CreateLayer('point', geom_type=ogr.wkbPoint)
     feat = ogr.Feature(lyr.GetLayerDefn())
@@ -2501,7 +2496,7 @@ def test_ogr_spatialite_9(spatialite):
 # Test not nullable fields
 
 
-def test_ogr_spatialite_10(spatialite):
+def test_ogr_spatialite_10(require_spatialite):
     try:
         os.remove('tmp/ogr_spatialite_10.sqlite')
     except OSError:
@@ -2613,19 +2608,12 @@ def test_ogr_sqlite_39():
 # Test dataset transactions
 
 
-@pytest.mark.parametrize(
-    'use_spatialite',
-    [
-        False,
-        pytest.param(True, marks=pytest.mark.usefixtures('spatialite')),
-    ]
-)
-def test_ogr_sqlite_40(use_spatialite):
+def test_ogr_sqlite_40(with_and_without_spatialite):
 
     if gdaltest.sl_ds is None:
         pytest.skip()
 
-    if use_spatialite:
+    if with_and_without_spatialite:
         options = ['SPATIALITE=YES']
     else:
         options = []
@@ -2902,7 +2890,7 @@ def test_ogr_sqlite_45():
 ###############################################################################
 # Test creating unsupported geometry types
 
-def test_ogr_spatialite_11(spatialite):
+def test_ogr_spatialite_11(require_spatialite):
     ds = ogr.GetDriverByName('SQLite').CreateDataSource('/vsimem/ogr_spatialite_11.sqlite', options=['SPATIALITE=YES'])
 
     # Will be converted to LineString
@@ -2924,7 +2912,7 @@ def test_ogr_spatialite_11(spatialite):
 # Test opening a .sql file
 
 
-def test_ogr_spatialite_12(spatialite):
+def test_ogr_spatialite_12(require_spatialite):
     if gdal.GetDriverByName('SQLite').GetMetadataItem("ENABLE_SQL_SQLITE_FORMAT") != 'YES':
         pytest.skip()
 
@@ -2985,18 +2973,3 @@ def test_ogr_sqlite_cleanup():
     gdaltest.sl_ds = None
 
     gdaltest.shp_ds = None
-
-
-###############################################################################
-# Ask to run again tests in a new python process without libspatialite loaded
-# TODO: I don't think this is really feasible with pytest (?)
-
-# def test_ogr_sqlite_without_spatialite():
-
-#     if not gdaltest.has_spatialite or not run_without_spatialite:
-#         pytest.skip()
-
-#     import test_py_scripts
-#     ret = test_py_scripts.run_py_script_as_external_script('.', 'ogr_sqlite', ' -without_spatialite', display_live_on_parent_stdout=True)
-
-#     assert ret.find('Failed:    0') != -1

From ada1eb4fda37b9b604a51b1468a88d1ce45b5f5a Mon Sep 17 00:00:00 2001
From: Craig de Stigter <craig.destigter@koordinates.com>
Date: Fri, 16 Nov 2018 12:01:49 +1300
Subject: [PATCH 151/488] Run tests in per-module subprocesses in the address
 sanitizer env

---
 .../travis/gcc52_stdcpp14_sanitize/script.sh  | 39 +++++++++++++++----
 1 file changed, 31 insertions(+), 8 deletions(-)

diff --git a/gdal/ci/travis/gcc52_stdcpp14_sanitize/script.sh b/gdal/ci/travis/gcc52_stdcpp14_sanitize/script.sh
index e0671307622c..6e670430584d 100755
--- a/gdal/ci/travis/gcc52_stdcpp14_sanitize/script.sh
+++ b/gdal/ci/travis/gcc52_stdcpp14_sanitize/script.sh
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash
 
 set -e
 
@@ -6,7 +6,6 @@ export PATH=$PWD/install-gcc-5.2.0/bin:$PATH
 export LD_LIBRARY_PATH=$PWD/install-gcc-5.2.0/lib64
 export PRELOAD=$PWD/install-gcc-5.2.0/lib64/libasan.so.2.0.0:$PWD/install-gcc-5.2.0/lib64/libubsan.so.0.0.0
 #export PRELOAD=$PWD/install-gcc-5.2.0/lib64/libubsan.so.0.0.0
-export ASAN_OPTIONS=allocator_may_return_null=1 
 export PYTEST="pytest -v -p no:sugar --color=no"
 
 cd gdal
@@ -35,10 +34,10 @@ cd ../autotest
 #unzip PGeoTest.zip
 #cd ../../..
 # Don't run these
-PYTESTARGS="--ignore ogr/ogr_fgdb.py --ignore ogr/ogr_pgeo.py"
+rm ogr/ogr_fgdb.py ogr/ogr_pgeo.py
 
 # Too old spatialite version
-PYTESTARGS="$PYTESTARGS --ignore ogr/ogr_sqlite.py --ignore gdrivers/rasterlite.py"
+rm ogr/ogr_sqlite.py gdrivers/rasterlite.py
 
 # install test dependencies
 # note: pip 9 is installed on the box, but it hits a strange error after upgrading setuptools.
@@ -46,10 +45,34 @@ PYTESTARGS="$PYTESTARGS --ignore ogr/ogr_sqlite.py --ignore gdrivers/rasterlite.
 sudo -H pip install -U pip
 sudo -H pip install -U -r ./requirements.txt
 
-# Run all the Python autotests
-SKIP_MEM_INTENSIVE_TEST=YES SKIP_VIRTUALMEM=YES LD_PRELOAD=$PRELOAD ASAN_OPTIONS=detect_leaks=0 \
-    GDALTEST_ASAN_OPTIONS=detect_leaks=1,print_suppressions=0,suppressions=$PWD/asan_suppressions.txt \
-    $PYTEST $PYTESTARGS
+
+# Run each module in its own pytest process.
+# This makes sure the output from the address sanitizer is relevant
+# and it doesn't blow out RAM too much.
+# Unfortunately it's also a reasonably large slowdown since we have to wait
+# for a python interpreter and all modules to load between each module.
+# (and add a grep to get rid of the extra pytest header headers/etc)
+# 
+# NOTE: `find ... -exec` always exits with 0 even when the tests failed.
+# That turns out to be what we want here though, since we want
+# to not fail when the address sanitizer finds errors.
+# So we tee the output to a file and grep it to discover if the tests failed.
+export SKIP_MEM_INTENSIVE_TEST=YES SKIP_VIRTUALMEM=YES LD_PRELOAD=$PRELOAD \
+    ASAN_OPTIONS=detect_leaks=1,print_suppressions=0,suppressions=$PWD/asan_suppressions.txt
+find \
+    ogr gcore gdrivers osr alg gnm utilities pyscripts \
+    -name '*.py' ! -name netcdf_cfchecks.py ! -name "__init__.py" \
+    -print \
+    -exec $PYTEST -o console_output_style=classic {} \; \
+    | tee ./test-output.txt
+
+# Check if the tests failed and error out.
+if grep -P '===.*\d+ failed' ./test-output.txt > /dev/null ; then
+    echo 'Tests failed'
+    exit 1
+else
+    echo 'Tests passed'
+fi
 
 # A bit messy, but force testing with libspatialite 4.0dev (that has been patched a bit to remove any hard-coded SRS definition so it is very small)
 #cd ogr

From a0d6a077c7a3b15dbf0e14d019ceb16be3e90100 Mon Sep 17 00:00:00 2001
From: Craig de Stigter <craig.destigter@koordinates.com>
Date: Sun, 18 Nov 2018 11:29:36 +1300
Subject: [PATCH 152/488] Remove run_tests() function, remove last usages of it

---
 autotest/ogr/ogr_pgeo.py   | 63 +++++++++---------------
 autotest/pymod/gdaltest.py | 99 --------------------------------------
 2 files changed, 24 insertions(+), 138 deletions(-)

diff --git a/autotest/ogr/ogr_pgeo.py b/autotest/ogr/ogr_pgeo.py
index 6c0f195cade9..ed9c63926e67 100755
--- a/autotest/ogr/ogr_pgeo.py
+++ b/autotest/ogr/ogr_pgeo.py
@@ -37,11 +37,26 @@
 import ogrtest
 import pytest
 
+
+@pytest.fixture(
+    params=['PGeo', 'MDB'],
+    autouse=True,
+)
+def drv(request):
+    """
+    Run all tests against both PGeo and MDB drivers
+    """
+    if request.param == 'PGeo':
+        switch_driver('PGeo', 'MDB')
+    else:
+        switch_driver('MDB', 'PGeo')
+
+
 ###############################################################################
 # Basic testing
 
 
-def ogr_pgeo_1(tested_driver='PGeo', other_driver='MDB'):
+def switch_driver(tested_driver='PGeo', other_driver='MDB'):
 
     ogrtest.pgeo_ds = None
 
@@ -63,7 +78,7 @@ def ogr_pgeo_1(tested_driver='PGeo', other_driver='MDB'):
     drv = ogr.GetDriverByName(tested_driver)
 
     if drv is None:
-        pytest.skip()
+        pytest.skip("Driver not available: %s" % tested_driver)
 
     if not gdaltest.download_file('http://download.osgeo.org/gdal/data/pgeo/PGeoTest.zip', 'PGeoTest.zip'):
         pytest.skip()
@@ -102,14 +117,11 @@ def ogr_pgeo_1(tested_driver='PGeo', other_driver='MDB'):
     assert feat_count == 9418, 'did not get expected feature count'
 
 
-def ogr_pgeo_mdb_1():
-    return ogr_pgeo_1('MDB', 'PGeo')
-
 ###############################################################################
 # Test spatial filter
 
 
-def ogr_pgeo_2():
+def test_ogr_pgeo_2():
     if ogrtest.pgeo_ds is None:
         pytest.skip()
 
@@ -140,7 +152,7 @@ def ogr_pgeo_2():
 # Test attribute filter
 
 
-def ogr_pgeo_3():
+def test_ogr_pgeo_3():
     if ogrtest.pgeo_ds is None:
         pytest.skip()
 
@@ -166,7 +178,7 @@ def ogr_pgeo_3():
 # Test ExecuteSQL()
 
 
-def ogr_pgeo_4():
+def test_ogr_pgeo_4():
     if ogrtest.pgeo_ds is None:
         pytest.skip()
 
@@ -188,7 +200,7 @@ def ogr_pgeo_4():
 # Test GetFeature()
 
 
-def ogr_pgeo_5():
+def test_ogr_pgeo_5():
     if ogrtest.pgeo_ds is None:
         pytest.skip()
 
@@ -203,7 +215,7 @@ def ogr_pgeo_5():
 # Run test_ogrsf
 
 
-def ogr_pgeo_6():
+def test_ogr_pgeo_6():
     if ogrtest.pgeo_ds is None:
         pytest.skip()
 
@@ -219,7 +231,7 @@ def ogr_pgeo_6():
 # Run test_ogrsf with -sql
 
 
-def ogr_pgeo_7():
+def test_ogr_pgeo_7():
     if ogrtest.pgeo_ds is None:
         pytest.skip()
 
@@ -234,7 +246,7 @@ def ogr_pgeo_7():
 ###############################################################################
 
 
-def ogr_pgeo_cleanup():
+def test_ogr_pgeo_cleanup():
 
     if ogrtest.other_driver is not None:
         print('Reregistering %s driver' % ogrtest.other_driver.GetName())
@@ -244,30 +256,3 @@ def ogr_pgeo_cleanup():
         pytest.skip()
 
     ogrtest.pgeo_ds = None
-
-
-gdaltest_list_internal = [
-    ogr_pgeo_2,
-    ogr_pgeo_3,
-    ogr_pgeo_4,
-    ogr_pgeo_5,
-    ogr_pgeo_6,
-    ogr_pgeo_7,
-    ogr_pgeo_cleanup]
-
-###############################################################################
-#
-
-
-def test_ogr_pgeo_main():
-
-    # Run with the PGeo driver only (MDB disabled)
-    gdaltest.run_tests([ogr_pgeo_1])
-    gdaltest.run_tests(gdaltest_list_internal)
-
-    # Run with the MDB driver only (PGeo disabled)
-    gdaltest.run_tests([ogr_pgeo_mdb_1])
-    gdaltest.run_tests(gdaltest_list_internal)
-
-
-
diff --git a/autotest/pymod/gdaltest.py b/autotest/pymod/gdaltest.py
index 0aeb70a39cb9..27fb48df682d 100644
--- a/autotest/pymod/gdaltest.py
+++ b/autotest/pymod/gdaltest.py
@@ -87,105 +87,6 @@ def git_status():
     out, _ = runexternal_out_and_err('git status --porcelain .')
     return out
 
-###############################################################################
-
-
-def run_tests(test_list):
-    global success_counter, failure_counter, expected_failure_counter, blow_counter, skip_counter
-    global reason, failure_summary, cur_name
-    global start_time, end_time
-
-    before_vsimem = gdal.ReadDirRecursive('/vsimem/')
-    try:
-        git_status_before = git_status()
-    except OSError:
-        git_status_before = ''
-
-    set_time = start_time is None
-    if set_time:
-        start_time = time.time()
-    had_errors_this_script = 0
-
-    for test_item in test_list:
-        if test_item is None:
-            continue
-
-        try:
-            (func, name) = test_item
-            if func.__name__[:4] == 'test':
-                outline = '  TEST: ' + func.__name__[4:] + ': ' + name + ' ... '
-            else:
-                outline = '  TEST: ' + func.__name__ + ': ' + name + ' ... '
-        except TypeError:
-            func = test_item
-            name = func.__name__
-            outline = '  TEST: ' + name + ' ... '
-
-        sys.stdout.write(outline)
-        sys.stdout.flush()
-
-        reason = None
-        result = run_func(func)
-
-        if result[:4] == 'fail':
-            if had_errors_this_script == 0:
-                failure_summary.append('Script: ' + cur_name)
-                had_errors_this_script = 1
-            failure_summary.append(outline + result)
-            if reason is not None:
-                failure_summary.append('    ' + reason)
-
-        if reason is not None:
-            print(('    ' + reason))
-
-        if result == 'success':
-            success_counter = success_counter + 1
-        elif result == 'expected_fail':
-            expected_failure_counter = expected_failure_counter + 1
-        elif result == 'fail':
-            failure_counter = failure_counter + 1
-        elif result == 'skip':
-            skip_counter = skip_counter + 1
-        elif result == 'fail (blowup)':
-            blow_counter = blow_counter + 1
-        else:
-            failure_counter = failure_counter + 1
-            print('Unexpected return value: %s' % result)
-            if had_errors_this_script == 0:
-                failure_summary.append('Script: ' + cur_name)
-                had_errors_this_script = 1
-            failure_summary.append(outline + result + ' (unexpected value)')
-            if reason is not None:
-                failure_summary.append('    ' + reason)
-
-    if set_time:
-        end_time = time.time()
-
-    after_vsimem = gdal.ReadDirRecursive('/vsimem/')
-    if before_vsimem is None:
-        before_vsimem = []
-    if after_vsimem is None:
-        after_vsimem = []
-    if len(after_vsimem) > len(before_vsimem):
-        failure_counter = failure_counter + 1
-        print('Temporary /vsimem/ files remaining: %s' % str(after_vsimem))
-        if had_errors_this_script == 0:
-            failure_summary.append('Script: ' + cur_name)
-            had_errors_this_script = 1
-        failure_summary.append('  /vsimem/ temporary files remaining')
-
-    try:
-        git_status_after = git_status()
-    except OSError:
-        git_status_after = ''
-    if git_status_after != git_status_before:
-        failure_counter = failure_counter + 1
-        print('Temporary files remaining: %s' % str(git_status_after))
-        if had_errors_this_script == 0:
-            failure_summary.append('Script: ' + cur_name)
-            had_errors_this_script = 1
-        failure_summary.append('  Temporary files remaining')
-
 
 ###############################################################################
 

From b65c5d13f1657b35a44916d18a6f320eb02c3d8b Mon Sep 17 00:00:00 2001
From: Craig de Stigter <craig.destigter@koordinates.com>
Date: Tue, 20 Nov 2018 21:24:58 +1100
Subject: [PATCH 153/488] MinGW build tweaks

---
 autotest/pymod/gdaltest_python2.py      | 82 +------------------------
 autotest/pymod/gdaltest_python3.py      |  1 -
 autotest/pyscripts/test_ogr2ogr_py.py   |  4 +-
 autotest/utilities/test_gdalbuildvrt.py | 28 +++++----
 autotest/utilities/test_gdaldem.py      | 10 ++-
 gdal/ci/travis/mingw_w64/script.sh      | 11 ++--
 gdal/scripts/vagrant/gdal-mingw.sh      |  4 +-
 7 files changed, 37 insertions(+), 103 deletions(-)

diff --git a/autotest/pymod/gdaltest_python2.py b/autotest/pymod/gdaltest_python2.py
index 81b96206088a..8c71c2494985 100644
--- a/autotest/pymod/gdaltest_python2.py
+++ b/autotest/pymod/gdaltest_python2.py
@@ -35,7 +35,6 @@
 import subprocess
 import shlex
 import sys
-from sys import version_info
 from Queue import Queue
 from threading import Thread
 
@@ -125,7 +124,7 @@ def warn_if_memleak(cmd, out_str):
         print(out_str)
 
 
-def spawn_async26(cmd):
+def spawn_async(cmd):
     command = shlex.split(cmd)
     try:
         process = subprocess.Popen(command, stdout=subprocess.PIPE)
@@ -134,28 +133,11 @@ def spawn_async26(cmd):
         return (None, None)
 
 
-def spawn_async(cmd):
-    if version_info >= (2, 6, 0):
-        return spawn_async26(cmd)
-
-    import popen2
-    try:
-        process = popen2.Popen3(cmd)
-    except OSError:
-        return (None, None)
-    if process is None:
-        return (None, None)
-    process.tochild.close()
-    return (process, process.fromchild)
-
-
 def wait_process(process):
     process.wait()
 
-# Compatible with Python 2.6 or above
-
 
-def _runexternal_subprocess(cmd, strin=None, check_memleak=True, display_live_on_parent_stdout=False, encoding=None):
+def runexternal(cmd, strin=None, check_memleak=True, display_live_on_parent_stdout=False, encoding=None):
     # pylint: disable=unused-argument
     command = shlex.split(cmd)
     command = [elt.replace('\x00', '') for elt in command]
@@ -178,7 +160,6 @@ def _runexternal_subprocess(cmd, strin=None, check_memleak=True, display_live_on
                 sys.stdout.write(c)
         else:
             ret = p.stdout.read()
-        p.stdout.close()
     else:
         ret = ''
 
@@ -191,43 +172,6 @@ def _runexternal_subprocess(cmd, strin=None, check_memleak=True, display_live_on
     return ret
 
 
-def runexternal(cmd, strin=None, check_memleak=True, display_live_on_parent_stdout=False, encoding=None):
-    from gdaltest import is_travis_branch
-    if not is_travis_branch('mingw'):
-        return _runexternal_subprocess(cmd,
-                                       strin=strin,
-                                       check_memleak=check_memleak,
-                                       display_live_on_parent_stdout=display_live_on_parent_stdout,
-                                       encoding=encoding)
-
-    if strin is None:
-        ret_stdout = os.popen(cmd)
-    else:
-        (ret_stdin, ret_stdout) = os.popen2(cmd)
-        ret_stdin.write(strin)
-        ret_stdin.close()
-
-    if display_live_on_parent_stdout:
-        out_str = ''
-        while True:
-            c = ret_stdout.read(1)
-            if c == '':
-                break
-            out_str = out_str + c
-            sys.stdout.write(c)
-        ret_stdout.close()
-    else:
-        out_str = ret_stdout.read()
-    ret_stdout.close()
-
-    if check_memleak:
-        warn_if_memleak(cmd, out_str)
-
-    if encoding is not None:
-        out_str = out_str.decode(encoding)
-    return out_str
-
-
 def read_in_thread(f, q):
     q.put(f.read())
     f.close()
@@ -270,24 +214,4 @@ def _runexternal_out_and_err_subprocess(cmd, check_memleak=True):
 
 
 def runexternal_out_and_err(cmd, check_memleak=True):
-    from gdaltest import is_travis_branch
-    if not is_travis_branch('mingw'):
-        return _runexternal_out_and_err_subprocess(cmd, check_memleak=check_memleak)
-
-    (ret_stdin, ret_stdout, ret_stderr) = os.popen3(cmd)
-    ret_stdin.close()
-
-    q_stdout = Queue()
-    t_stdout = Thread(target=read_in_thread, args=(ret_stdout, q_stdout))
-    q_stderr = Queue()
-    t_stderr = Thread(target=read_in_thread, args=(ret_stderr, q_stderr))
-    t_stdout.start()
-    t_stderr.start()
-
-    out_str = q_stdout.get()
-    err_str = q_stderr.get()
-
-    if check_memleak:
-        warn_if_memleak(cmd, out_str)
-
-    return (out_str, err_str)
+    return _runexternal_out_and_err_subprocess(cmd, check_memleak=check_memleak)
diff --git a/autotest/pymod/gdaltest_python3.py b/autotest/pymod/gdaltest_python3.py
index 2196ea4f541a..0e3402bbecf1 100644
--- a/autotest/pymod/gdaltest_python3.py
+++ b/autotest/pymod/gdaltest_python3.py
@@ -152,7 +152,6 @@ def runexternal(cmd, strin=None, check_memleak=True, display_live_on_parent_stdo
                 sys.stdout.write(c)
         else:
             ret = p.stdout.read().decode(encoding)
-        p.stdout.close()
     else:
         ret = ''
 
diff --git a/autotest/pyscripts/test_ogr2ogr_py.py b/autotest/pyscripts/test_ogr2ogr_py.py
index 290be0eb95cc..256d3defeebf 100755
--- a/autotest/pyscripts/test_ogr2ogr_py.py
+++ b/autotest/pyscripts/test_ogr2ogr_py.py
@@ -394,7 +394,7 @@ def test_ogr2ogr_py_13():
 # Test -segmentize
 
 
-@pytest.mark.xfail
+@pytest.mark.skip()
 def test_ogr2ogr_py_14():
     script_path = test_py_scripts.get_py_script('ogr2ogr')
     if script_path is None:
@@ -503,7 +503,7 @@ def test_ogr2ogr_py_17():
 # Test -wrapdateline
 
 
-@pytest.mark.xfail
+@pytest.mark.skip()
 def test_ogr2ogr_py_18():
     script_path = test_py_scripts.get_py_script('ogr2ogr')
     if script_path is None:
diff --git a/autotest/utilities/test_gdalbuildvrt.py b/autotest/utilities/test_gdalbuildvrt.py
index 39af722a63ec..f1f800dce58c 100755
--- a/autotest/utilities/test_gdalbuildvrt.py
+++ b/autotest/utilities/test_gdalbuildvrt.py
@@ -44,22 +44,24 @@
 def gdalbuildvrt_check():
 
     ds = gdal.Open('tmp/mosaic.vrt')
-    assert ds.GetProjectionRef().find('WGS 84') != -1, \
-        ('Expected WGS 84\nGot : %s' % (ds.GetProjectionRef()))
-
-    gt = ds.GetGeoTransform()
-    expected_gt = [2, 0.1, 0, 49, 0, -0.1]
-    for i in range(6):
-        assert not abs(gt[i] - expected_gt[i] > 1e-5), \
-            ('Expected : %s\nGot : %s' % (expected_gt, gt))
+    try:
+        assert ds.GetProjectionRef().find('WGS 84') != -1, \
+            ('Expected WGS 84\nGot : %s' % (ds.GetProjectionRef()))
 
-    assert ds.RasterXSize == 20 and ds.RasterYSize == 20, \
-        ('Wrong raster dimensions : %d x %d' % (ds.RasterXSize, ds.RasterYSize))
+        gt = ds.GetGeoTransform()
+        expected_gt = [2, 0.1, 0, 49, 0, -0.1]
+        for i in range(6):
+            assert not abs(gt[i] - expected_gt[i] > 1e-5), \
+                ('Expected : %s\nGot : %s' % (expected_gt, gt))
 
-    assert ds.RasterCount == 1, ('Wrong raster count : %d ' % (ds.RasterCount))
+        assert ds.RasterXSize == 20 and ds.RasterYSize == 20, \
+            ('Wrong raster dimensions : %d x %d' % (ds.RasterXSize, ds.RasterYSize))
 
-    assert ds.GetRasterBand(1).Checksum() == 3508, 'Wrong checksum'
+        assert ds.RasterCount == 1, ('Wrong raster count : %d ' % (ds.RasterCount))
 
+        assert ds.GetRasterBand(1).Checksum() == 3508, 'Wrong checksum'
+    finally:
+        del ds
 
 ###############################################################################
 # Simple test
@@ -174,7 +176,7 @@ def test_gdalbuildvrt_4():
 
 
 # NOTE: fails. commented out originally in 4ef886421c99a4451f8873cb6e094d45ecc86d3f, not sure why
-@pytest.mark.xfail
+@pytest.mark.skip()
 def test_gdalbuildvrt_5():
     if test_cli_utilities.get_gdalbuildvrt_path() is None:
         pytest.skip()
diff --git a/autotest/utilities/test_gdaldem.py b/autotest/utilities/test_gdaldem.py
index 2076c778e319..72faa60f9773 100755
--- a/autotest/utilities/test_gdaldem.py
+++ b/autotest/utilities/test_gdaldem.py
@@ -528,7 +528,10 @@ def test_gdaldem_color_relief_repeated_entry():
     f.write('nv 5 5 5\n')
     f.close()
 
-    gdaltest.runexternal(test_cli_utilities.get_gdaldem_path() + ' color-relief tmp/test_gdaldem_color_relief_repeated_entry.asc tmp/test_gdaldem_color_relief_repeated_entry.txt tmp/test_gdaldem_color_relief_repeated_entry_out.tif')
+    gdaltest.runexternal(
+        test_cli_utilities.get_gdaldem_path() + ' color-relief tmp/test_gdaldem_color_relief_repeated_entry.asc tmp/test_gdaldem_color_relief_repeated_entry.txt tmp/test_gdaldem_color_relief_repeated_entry_out.tif',
+        display_live_on_parent_stdout=True,
+    )
 
     ds = gdal.Open('tmp/test_gdaldem_color_relief_repeated_entry_out.tif')
     val = ds.GetRasterBand(1).ReadRaster()
@@ -538,7 +541,10 @@ def test_gdaldem_color_relief_repeated_entry():
     val = struct.unpack('B' * 6, val)
     assert val == (1, 1, 5, 10, 10, 25)
 
-    gdaltest.runexternal(test_cli_utilities.get_gdaldem_path() + ' color-relief tmp/test_gdaldem_color_relief_repeated_entry.asc tmp/test_gdaldem_color_relief_repeated_entry.txt tmp/test_gdaldem_color_relief_repeated_entry_out.vrt -of VRT')
+    gdaltest.runexternal(
+        test_cli_utilities.get_gdaldem_path() + ' color-relief tmp/test_gdaldem_color_relief_repeated_entry.asc tmp/test_gdaldem_color_relief_repeated_entry.txt tmp/test_gdaldem_color_relief_repeated_entry_out.vrt -of VRT',
+        display_live_on_parent_stdout=True,
+    )
 
     ds = gdal.Open('tmp/test_gdaldem_color_relief_repeated_entry_out.vrt')
     val = ds.GetRasterBand(1).ReadRaster()
diff --git a/gdal/ci/travis/mingw_w64/script.sh b/gdal/ci/travis/mingw_w64/script.sh
index d8a42e41d1b0..7c9ef0bd82ee 100755
--- a/gdal/ci/travis/mingw_w64/script.sh
+++ b/gdal/ci/travis/mingw_w64/script.sh
@@ -7,8 +7,8 @@ cd gdal
 wine64 apps/gdalinfo.exe --version
 cd ../autotest
 # Does not work under wine
-rm gcore/gdal_api_proxy.py
-rm gcore/rfc30.py
+rm gcore/gdal_api_proxy.py gcore/rfc30.py
+rm gnm/gnm_test.py
 
 # For some reason this crashes in the matrix .travis.yml but not in standalone branch
 rm pyscripts/test_gdal2tiles.py
@@ -19,8 +19,11 @@ export PYTHON_DIR="$HOME/.wine/drive_c/Python27"
 curl https://bootstrap.pypa.io/get-pip.py -o get-pip.py
 wine64 "$PYTHON_DIR/python.exe" get-pip.py
 rm get-pip.py
-wine64 "$PYTHON_DIR/Scripts/pip2.7.exe" install -U -r ./requirements.txt
-export PYTEST="wine64 $PYTHON_DIR/Scripts/pytest.exe -v -p no:sugar --color=no"
+# running pip2.7.exe doesn't seem to work in wine. workaround is use `-m pip`
+# https://forum.winehq.org/viewtopic.php?f=2&t=22522
+wine64 "$PYTHON_DIR/python.exe" -m pip install -U -r ./requirements.txt
+# same issue with running pytest.exe
+export PYTEST="wine64 $PYTHON_DIR/python.exe -m pytest -v -p no:sugar --color=no"
 
 
 # Run all the Python autotests
diff --git a/gdal/scripts/vagrant/gdal-mingw.sh b/gdal/scripts/vagrant/gdal-mingw.sh
index 791bd921b310..0d9c11f1366b 100755
--- a/gdal/scripts/vagrant/gdal-mingw.sh
+++ b/gdal/scripts/vagrant/gdal-mingw.sh
@@ -37,8 +37,8 @@ ln -sf /usr/x86_64-w64-mingw32/lib/libgeos-3-5-0.dll "$HOME/.wine/drive_c/window
     ln -sf "$PWD/.libs/libgdal-20.dll" "$HOME/.wine/drive_c/windows"
 
     # Python bindings
-    wget -N -nv -P /var/cache/wget/ http://www.python.org/ftp/python/2.7.3/python-2.7.3.amd64.msi
-    wine64 msiexec /i /var/cache/wget/python-2.7.3.amd64.msi
+    sudo wget -N -nv -P /var/cache/wget/ http://www.python.org/ftp/python/2.7.15/python-2.7.15.amd64.msi
+    wine64 msiexec /i /var/cache/wget/python-2.7.15.amd64.msi
     cd swig/python
     gendef "$HOME/.wine/drive_c/Python27/python27.dll"
     x86_64-w64-mingw32-dlltool --dllname "$HOME/.wine/drive_c/Python27/python27.dll" --input-def python27.def --output-lib "$HOME/.wine/drive_c/Python27/libs/libpython27.a"

From 7e62d38aea9518f536d3b2df5125d2698ca74768 Mon Sep 17 00:00:00 2001
From: Craig de Stigter <craig.destigter@koordinates.com>
Date: Thu, 29 Nov 2018 14:39:27 +1300
Subject: [PATCH 154/488] Add some basic docs. Remove pin for pytest; v4 should
 work ok

---
 CONTRIBUTING.md              |  3 +-
 autotest/README              | 15 ----------
 autotest/README.md           | 56 ++++++++++++++++++++++++++++++++++++
 autotest/requirements.txt    |  2 +-
 autotest/virtualenv-setup.sh | 25 ----------------
 gdal/scripts/vagrant/gdal.sh | 10 +++++++
 6 files changed, 69 insertions(+), 42 deletions(-)
 delete mode 100644 autotest/README
 create mode 100644 autotest/README.md
 delete mode 100755 autotest/virtualenv-setup.sh

diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index 076a35c1a505..4f25fe990dad 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -21,7 +21,8 @@ gdalinfo --version
 Run autotest suite:
 ```
 cd ../autotest
-python run_all.py
+pip install -r requirements.txt
+pytest
 ```
 
 Git workflows with GDAL
diff --git a/autotest/README b/autotest/README
deleted file mode 100644
index 27628ccda5c7..000000000000
--- a/autotest/README
+++ /dev/null
@@ -1,15 +0,0 @@
----------------------
-GDAL Autotest Package
----------------------
-
-
-Notes about availability of GDAL sample and test data
------------------------------------------------------
-
-The GDAL Team makes every effort to assure that all sample data files
-available from GDAL download server (http://download.osgeo.org/gdal/data/) and
-test data files used in GDAL Autotest package (https://github.com/OSGeo/gdal/tree/master/autotest)
-are available as public and freely redistributable geodata.
-
---
-http://gdal.org/
diff --git a/autotest/README.md b/autotest/README.md
new file mode 100644
index 000000000000..5e866c0404d7
--- /dev/null
+++ b/autotest/README.md
@@ -0,0 +1,56 @@
+# GDAL test suite
+
+
+## How to run tests
+
+1. You need to install `pytest` to run the test suite. This should do it:
+
+```bash
+cd autotest
+pip install -r ./requirements.txt
+```
+
+2. Then, run tests with:
+
+```bash
+pytest
+```
+
+3. Some quick usage tips:
+
+```bash
+# get more verbose output; don't capture stdout/stdin
+pytest -vvs
+
+# run all the gcore tests
+pytest gcore/
+
+# run a particular module only
+pytest gcore/basic_test.py
+```
+
+
+## GDAL's tests are not independent
+
+GDAL's test functions are not currently independent of each other. In particular, running individual test functions from a given module may not work. Most tests were originally written with the assumption that entire modules will be run at once.
+
+Practically, this means that you should avoid using:
+
+
+* pytest's `--last-failed` / `--lf` option (since it runs only failed tests, not the whole module)
+* test specifiers that run individual tests (e.g. `pytest gcore/basic_test.py::test_basic_test_1` )
+* the xunit plugin to run tests in parallel, unless you also use `--dist=loadfile`. (This may have other issues; untested)
+
+This will hopefully be addressed in the future. When writing new tests, please try to make them independent of each other.
+
+
+## Notes about availability of GDAL sample and test data
+
+The GDAL Team makes every effort to assure that all sample data files
+available from GDAL download server (http://download.osgeo.org/gdal/data/) and
+test data files used in GDAL Autotest package (https://github.com/OSGeo/gdal/tree/master/autotest)
+are available as public and freely redistributable geodata.
+
+--
+
+http://gdal.org/
diff --git a/autotest/requirements.txt b/autotest/requirements.txt
index e2f6c9d29d3f..fdfaccb5fd14 100644
--- a/autotest/requirements.txt
+++ b/autotest/requirements.txt
@@ -1,2 +1,2 @@
-pytest>=3,<3.10
+pytest>=3
 pytest-sugar
diff --git a/autotest/virtualenv-setup.sh b/autotest/virtualenv-setup.sh
deleted file mode 100755
index b3124df127b2..000000000000
--- a/autotest/virtualenv-setup.sh
+++ /dev/null
@@ -1,25 +0,0 @@
-#!/bin/bash
-set -eu
-
-# install pip
-curl https://bootstrap.pypa.io/get-pip.py | sudo -H python
-
-# install virtualenv
-sudo -H pip install virtualenv
-
-virtualenv ~/venv
-rm -f ~/venv/lib/python2.7/no-global-site-packages.txt
-
-~/venv/bin/pip install -Ur /vagrant/autotest/requirements.txt
-
-# Set things up for gdb: https://stackoverflow.com/a/30430059/988527
-sudo apt-get install -y python2.7-dbg
-mkdir ~/venv/bin/.debug
-ln -s /usr/lib/debug/usr/bin/python2.7-gdb.py ~/venv/bin/.debug/python-gdb.py
-ln -s /usr/lib/debug/usr/bin/python2.7 ~/venv/bin/.debug/
-
-echo "
-
-created virtualenv in ~/venv. To activate it:
-    source ~/venv/bin/activate
-"
diff --git a/gdal/scripts/vagrant/gdal.sh b/gdal/scripts/vagrant/gdal.sh
index f5f54198bd91..ba591c599060 100755
--- a/gdal/scripts/vagrant/gdal.sh
+++ b/gdal/scripts/vagrant/gdal.sh
@@ -71,3 +71,13 @@ make generate
 make
 make vagrant_safe_test
 cd ../..
+
+# Install pytest.
+# First install pip 9, which is the last version which can upgrade the system's `six`
+# 10+ throws an error :/
+curl https://bootstrap.pypa.io/get-pip.py 'pip<10' | sudo -H python
+
+sudo -H pip install -Ur /vagrant/autotest/requirements.txt
+
+# Add python symbols so gdb is friendlier
+sudo apt-get install -y python2.7-dbg

From 33b7a95943d911d04404090d6c0c62b56a6ad80d Mon Sep 17 00:00:00 2001
From: Craig de Stigter <craig.destigter@koordinates.com>
Date: Thu, 29 Nov 2018 16:06:02 +1300
Subject: [PATCH 155/488] Remove a number of gdaltest_list mentions, no longer
 needed/used

---
 autotest/alg/warp.py                |  5 -----
 autotest/gcore/misc.py              |  6 -----
 autotest/gcore/rasterio.py          |  4 ----
 autotest/gcore/tiff_write.py        |  6 -----
 autotest/gcore/transformer.py       |  6 -----
 autotest/gcore/vsiaz.py             | 11 ++--------
 autotest/gcore/vsigs.py             | 19 +++++-----------
 autotest/gcore/vsioss.py            | 15 ++++---------
 autotest/gcore/vsis3.py             | 17 +++++----------
 autotest/gcore/vsiswift.py          | 11 ++--------
 autotest/gcore/vsiwebhdfs.py        |  9 ++------
 autotest/gdrivers/db2.py            |  3 ---
 autotest/gdrivers/dods.py           | 34 +++++++++++++----------------
 autotest/gdrivers/gdalhttp.py       |  5 -----
 autotest/gdrivers/gpkg.py           |  3 ---
 autotest/gdrivers/jp2lura.py        |  7 ------
 autotest/gdrivers/jp2openjpeg.py    |  7 ------
 autotest/gdrivers/jpeg.py           |  5 -----
 autotest/gdrivers/mbtiles.py        |  6 -----
 autotest/gdrivers/nitf.py           |  6 -----
 autotest/gdrivers/vrtpansharpen.py  |  5 -----
 autotest/ogr/ogr_basic_test.py      |  5 -----
 autotest/ogr/ogr_elasticsearch.py   |  5 -----
 autotest/ogr/ogr_fgdb.py            |  9 --------
 autotest/ogr/ogr_geom.py            |  4 ----
 autotest/ogr/ogr_gml_read.py        |  8 -------
 autotest/ogr/ogr_gpkg.py            |  5 -----
 autotest/ogr/ogr_mvt.py             |  4 ----
 autotest/ogr/ogr_pg.py              |  2 +-
 autotest/ogr/ogr_shape.py           |  6 -----
 autotest/utilities/test_gdalwarp.py |  8 -------
 autotest/utilities/test_ogr2ogr.py  |  5 -----
 32 files changed, 38 insertions(+), 213 deletions(-)

diff --git a/autotest/alg/warp.py b/autotest/alg/warp.py
index 171c455b804a..2f03746e51c1 100755
--- a/autotest/alg/warp.py
+++ b/autotest/alg/warp.py
@@ -1679,8 +1679,3 @@ def test_warp_56():
         warped = pix_ds.GetRasterBand(1).ReadAsArray()[0, 0]
         assert abs(warped - exp) <= 0.6, \
             'offset: {}, expected: {:.0f}, got: {}'.format(off, exp, warped)
-
-    
-
-# gdaltest_list = [ warp_55 ]
-
diff --git a/autotest/gcore/misc.py b/autotest/gcore/misc.py
index 8d9cd7a5da1f..32c5d1a2ff80 100755
--- a/autotest/gcore/misc.py
+++ b/autotest/gcore/misc.py
@@ -740,9 +740,3 @@ def test_misc_cleanup():
         shutil.rmtree('tmp/tmp')
     except OSError:
         pass
-
-    
-
-
-# gdaltest_list = [ misc_6 ]
-
diff --git a/autotest/gcore/rasterio.py b/autotest/gcore/rasterio.py
index 8aa9def3644c..e6ee3b191e7c 100755
--- a/autotest/gcore/rasterio.py
+++ b/autotest/gcore/rasterio.py
@@ -930,7 +930,3 @@ def test_rasterio_resampled_value_is_nodata():
     assert data_ar == expected_ar
 
     gdal.Unlink('/vsimem/in.asc')
-
-
-# gdaltest_list = [ rasterio_16 ]
-
diff --git a/autotest/gcore/tiff_write.py b/autotest/gcore/tiff_write.py
index b9f57e842d43..78b9225b7f3a 100755
--- a/autotest/gcore/tiff_write.py
+++ b/autotest/gcore/tiff_write.py
@@ -6897,9 +6897,3 @@ def tiff_write_api_proxy():
 
 def test_tiff_write_cleanup():
     gdaltest.tiff_drv = None
-
-
-
-
-# gdaltest_list = [ tiff_write_1, tiff_write_176_lerc_max_z_error ]
-
diff --git a/autotest/gcore/transformer.py b/autotest/gcore/transformer.py
index 0a36f894a5b5..a7c43e5af579 100755
--- a/autotest/gcore/transformer.py
+++ b/autotest/gcore/transformer.py
@@ -711,9 +711,3 @@ def test_transformer_17():
     with gdaltest.error_handler():
         tr = gdal.Transformer(ds, None, ['METHOD=RPC', 'RPC_DEM=/vsimem/i/donot/exist/dem.tif'])
     assert tr is None
-
-
-
-disabled_gdaltest_list = [
-    test_transformer_11
-]
diff --git a/autotest/gcore/vsiaz.py b/autotest/gcore/vsiaz.py
index dd710cb56b26..1f9499317a96 100755
--- a/autotest/gcore/vsiaz.py
+++ b/autotest/gcore/vsiaz.py
@@ -764,14 +764,14 @@ def test_vsiaz_stop_webserver():
 # Nominal cases (require valid credentials)
 
 
-def vsiaz_extra_1():
+def test_vsiaz_extra_1():
 
     if not gdaltest.built_against_curl():
         pytest.skip()
 
     az_resource = gdal.GetConfigOption('AZ_RESOURCE')
     if az_resource is None:
-        pytest.skip('Missing AZ_RESOURCE for running gdaltest_list_extra')
+        pytest.skip('Missing AZ_RESOURCE')
 
     if az_resource.find('/') < 0:
         path = '/vsiaz/' + az_resource
@@ -882,10 +882,3 @@ def test_vsiaz_cleanup():
 
     for var in gdaltest.az_vars:
         gdal.SetConfigOption(var, gdaltest.az_vars[var])
-
-    
-
-
-# gdaltest_list = [ vsiaz_init, vsiaz_start_webserver, vsiaz_fake_mkdir_rmdir, vsiaz_stop_webserver, vsiaz_cleanup ]
-
-gdaltest_list_extra = [vsiaz_extra_1]
diff --git a/autotest/gcore/vsigs.py b/autotest/gcore/vsigs.py
index a4bc6763de56..e59b7fff022a 100755
--- a/autotest/gcore/vsigs.py
+++ b/autotest/gcore/vsigs.py
@@ -1062,21 +1062,21 @@ def test_vsigs_stop_webserver():
 # Nominal cases (require valid credentials)
 
 
-def vsigs_extra_1():
+def test_vsigs_extra_1():
 
     if not gdaltest.built_against_curl():
         pytest.skip()
 
     # if gdal.GetConfigOption('GS_SECRET_ACCESS_KEY') is None:
-    #    print('Missing GS_SECRET_ACCESS_KEY for running gdaltest_list_extra')
-    #    return 'skip'
+    #    print('Missing GS_SECRET_ACCESS_KEY')
+    #    pytest.skip()
     # elif gdal.GetConfigOption('GS_ACCESS_KEY_ID') is None:
-    #    print('Missing GS_ACCESS_KEY_ID for running gdaltest_list_extra')
-    #    return 'skip'
+    #    print('Missing GS_ACCESS_KEY_ID')
+    #    pytest.skip()
 
     gs_resource = gdal.GetConfigOption('GS_RESOURCE')
     if gs_resource is None:
-        pytest.skip('Missing GS_RESOURCE for running gdaltest_list_extra')
+        pytest.skip('Missing GS_RESOURCE')
 
     if gs_resource.find('/') < 0:
         path = '/vsigs/' + gs_resource
@@ -1187,10 +1187,3 @@ def test_vsigs_cleanup():
 
     for var in gdaltest.gs_vars:
         gdal.SetConfigOption(var, gdaltest.gs_vars[var])
-
-    
-
-
-# gdaltest_list = [ vsigs_init, vsigs_start_webserver, vsigs_write, vsigs_stop_webserver, vsigs_cleanup ]
-
-gdaltest_list_extra = [vsigs_extra_1]
diff --git a/autotest/gcore/vsioss.py b/autotest/gcore/vsioss.py
index 149d41eb8bd3..877bf2f13ec4 100755
--- a/autotest/gcore/vsioss.py
+++ b/autotest/gcore/vsioss.py
@@ -990,7 +990,7 @@ def test_visoss_stop_webserver():
 # Nominal cases (require valid credentials)
 
 
-def visoss_extra_1():
+def test_visoss_extra_1():
 
     if not gdaltest.built_against_curl():
         pytest.skip()
@@ -999,11 +999,11 @@ def visoss_extra_1():
     OSS_RESOURCE = gdal.GetConfigOption('OSS_RESOURCE')
 
     if gdal.GetConfigOption('OSS_SECRET_ACCESS_KEY') is None:
-        pytest.skip('Missing OSS_SECRET_ACCESS_KEY for running gdaltest_list_extra')
+        pytest.skip('Missing OSS_SECRET_ACCESS_KEY')
     elif gdal.GetConfigOption('OSS_ACCESS_KEY_ID') is None:
-        pytest.skip('Missing OSS_ACCESS_KEY_ID for running gdaltest_list_extra')
+        pytest.skip('Missing OSS_ACCESS_KEY_ID')
     elif OSS_RESOURCE is None:
-        pytest.skip('Missing OSS_RESOURCE for running gdaltest_list_extra')
+        pytest.skip('Missing OSS_RESOURCE')
 
     if OSS_RESOURCE.find('/') < 0:
         path = '/vsioss/' + OSS_RESOURCE
@@ -1114,10 +1114,3 @@ def test_visoss_cleanup():
 
     for var in gdaltest.oss_vars:
         gdal.SetConfigOption(var, gdaltest.oss_vars[var])
-
-    
-
-
-# gdaltest_list = [ visoss_init, visoss_start_webserver, visoss_8, visoss_stop_webserver, visoss_cleanup ]
-
-gdaltest_list_extra = [visoss_extra_1]
diff --git a/autotest/gcore/vsis3.py b/autotest/gcore/vsis3.py
index aad207d44541..f10f39328122 100755
--- a/autotest/gcore/vsis3.py
+++ b/autotest/gcore/vsis3.py
@@ -2284,7 +2284,7 @@ def test_vsis3_stop_webserver():
 # Nominal cases (require valid credentials)
 
 
-def vsis3_extra_1():
+def test_vsis3_extra_1():
 
     if not gdaltest.built_against_curl():
         pytest.skip()
@@ -2297,11 +2297,12 @@ def vsis3_extra_1():
 
     if not os.path.exists(credentials_filename):
         if gdal.GetConfigOption('AWS_SECRET_ACCESS_KEY') is None:
-            pytest.skip('Missing AWS_SECRET_ACCESS_KEY for running gdaltest_list_extra')
+            pytest.skip('Missing AWS_SECRET_ACCESS_KEY')
         elif gdal.GetConfigOption('AWS_ACCESS_KEY_ID') is None:
-            pytest.skip('Missing AWS_ACCESS_KEY_ID for running gdaltest_list_extra')
-    elif s3_resource is None:
-        pytest.skip('Missing S3_RESOURCE for running gdaltest_list_extra')
+            pytest.skip('Missing AWS_ACCESS_KEY_ID')
+
+    if s3_resource is None:
+        pytest.skip('Missing S3_RESOURCE')
 
     if s3_resource.find('/') < 0:
         path = '/vsis3/' + s3_resource
@@ -2416,9 +2417,3 @@ def test_vsis3_cleanup():
     gdal.SetConfigOption('CPL_AWS_CREDENTIALS_FILE', None)
     gdal.SetConfigOption('AWS_CONFIG_FILE', None)
     gdal.SetConfigOption('CPL_AWS_EC2_CREDENTIALS_URL', None)
-
-
-
-# gdaltest_list = [ vsis3_init, vsis3_start_webserver, vsis3_opendir, vsis3_stop_webserver, vsis3_cleanup ]
-
-gdaltest_list_extra = [vsis3_extra_1]
diff --git a/autotest/gcore/vsiswift.py b/autotest/gcore/vsiswift.py
index 57e648e83cf1..5cb0c55600a9 100644
--- a/autotest/gcore/vsiswift.py
+++ b/autotest/gcore/vsiswift.py
@@ -597,14 +597,14 @@ def test_vsiswift_stop_webserver():
 # Nominal cases (require valid credentials)
 
 
-def vsiswift_extra_1():
+def test_vsiswift_extra_1():
 
     if not gdaltest.built_against_curl():
         pytest.skip()
 
     swift_resource = gdal.GetConfigOption('SWIFT_RESOURCE')
     if swift_resource is None:
-        pytest.skip('Missing SWIFT_RESOURCE for running gdaltest_list_extra')
+        pytest.skip('Missing SWIFT_RESOURCE')
 
     if swift_resource.find('/') < 0:
         path = '/vsiswift/' + swift_resource
@@ -696,10 +696,3 @@ def test_vsiswift_cleanup():
 
     for var in gdaltest.swift_vars:
         gdal.SetConfigOption(var, gdaltest.swift_vars[var])
-
-    
-
-
-# gdaltest_list = [ vsiswift_init, vsiswift_start_webserver, vsiswift_fake_mkdir_rmdir, vsiswift_stop_webserver, vsiswift_cleanup ]
-
-gdaltest_list_extra = [vsiswift_extra_1]
diff --git a/autotest/gcore/vsiwebhdfs.py b/autotest/gcore/vsiwebhdfs.py
index 487eb40e034f..2789283aac1a 100644
--- a/autotest/gcore/vsiwebhdfs.py
+++ b/autotest/gcore/vsiwebhdfs.py
@@ -471,14 +471,14 @@ def test_vsiwebhdfs_stop_webserver():
 # Nominal cases (require valid credentials)
 
 
-def vsiwebhdfs_extra_1():
+def test_vsiwebhdfs_extra_1():
 
     if not gdaltest.built_against_curl():
         pytest.skip()
 
     webhdfs_url = gdal.GetConfigOption('WEBHDFS_URL')
     if webhdfs_url is None:
-        pytest.skip('Missing WEBHDFS_URL for running gdaltest_list_extra')
+        pytest.skip('Missing WEBHDFS_URL')
 
     if webhdfs_url.endswith('/webhdfs/v1') or webhdfs_url.endswith('/webhdfs/v1/'):
         path = '/vsiwebhdfs/' + webhdfs_url
@@ -560,8 +560,3 @@ def test_vsiwebhdfs_cleanup():
 
     for var in gdaltest.webhdfs_vars:
         gdal.SetConfigOption(var, gdaltest.webhdfs_vars[var])
-
-    
-
-
-gdaltest_list_extra = [vsiwebhdfs_extra_1]
diff --git a/autotest/gdrivers/db2.py b/autotest/gdrivers/db2.py
index 832a4b9ee4af..6806ac8b5512 100755
--- a/autotest/gdrivers/db2.py
+++ b/autotest/gdrivers/db2.py
@@ -197,6 +197,3 @@ def test_gpkg_1():
     assert got_cs == expected_cs
 
 ###############################################################################
-
-
-# gdaltest_list = [ gpkg_init, gpkg_26, gpkg_cleanup ]
diff --git a/autotest/gdrivers/dods.py b/autotest/gdrivers/dods.py
index a79c1fb1baea..8ef21f59dc70 100755
--- a/autotest/gdrivers/dods.py
+++ b/autotest/gdrivers/dods.py
@@ -38,7 +38,8 @@
 ###############################################################################
 # Open DODS datasource.
 
-def dods_1():
+@pytest.mark.skip()
+def test_dods_1():
     gdaltest.dods_ds = None
     gdaltest.dods_dr = None
 
@@ -52,12 +53,13 @@ def dods_1():
         gdaltest.dods_dr = None
         pytest.fail()
 
-    
+
 ###############################################################################
 # Simple read test on a single variable.
 
 
-def dods_2():
+@pytest.mark.skip()
+def test_dods_2():
     if gdaltest.dods_dr is None:
         pytest.skip()
     tst = gdaltest.GDALTest('dods', 'http://disc1.sci.gsfc.nasa.gov/opendap/tovs/TOVSAMNF/1985/032/TOVS_MONTHLY_PM_8502_NF.HDF.Z?Data-Set-11', 1, 3391, filename_absolute=1)
@@ -67,7 +69,8 @@ def dods_2():
 # Access all grids at once.
 
 
-def dods_3():
+@pytest.mark.skip()
+def test_dods_3():
     if gdaltest.dods_dr is None:
         pytest.skip()
     tst = gdaltest.GDALTest('dods', 'http://disc1.sci.gsfc.nasa.gov/opendap/tovs/TOVSAMNF/1985/032/TOVS_MONTHLY_PM_8502_NF.HDF.Z', 12, 43208, filename_absolute=1)
@@ -77,7 +80,8 @@ def dods_3():
 # Test explicit transpose.
 
 
-def dods_4():
+@pytest.mark.skip()
+def test_dods_4():
     if gdaltest.dods_dr is None:
         pytest.skip()
     tst = gdaltest.GDALTest('dods', 'http://disc1.sci.gsfc.nasa.gov/opendap/tovs/TOVSAMNF/1985/032/TOVS_MONTHLY_PM_8502_NF.HDF.Z?Data-Set-11[y][x]', 1, 3391, filename_absolute=1)
@@ -87,7 +91,8 @@ def dods_4():
 # Test explicit flipping.
 
 
-def dods_5():
+@pytest.mark.skip()
+def test_dods_5():
     if gdaltest.dods_dr is None:
         pytest.skip()
 
@@ -98,7 +103,8 @@ def dods_5():
 # Check nodata value.
 
 
-def dods_6():
+@pytest.mark.skip()
+def test_dods_6():
     if gdaltest.dods_dr is None:
         pytest.skip()
 
@@ -115,20 +121,10 @@ def dods_6():
 # Cleanup
 
 
-def dods_cleanup():
+@pytest.mark.skip()
+def test_dods_cleanup():
     if gdaltest.dods_dr is None:
         pytest.skip()
 
     gdaltest.dods_dr = None
     gdaltest.dods_grid_ds = None
-
-
-
-manual_gdaltest_list = [
-    dods_1,
-    dods_2,
-    dods_3,
-    dods_4,
-    dods_5,
-    dods_6,
-    dods_cleanup]
diff --git a/autotest/gdrivers/gdalhttp.py b/autotest/gdrivers/gdalhttp.py
index 63fb1a925cae..88887e528436 100755
--- a/autotest/gdrivers/gdalhttp.py
+++ b/autotest/gdrivers/gdalhttp.py
@@ -273,8 +273,3 @@ def test_http_cleanup():
     if gdaltest.dods_drv is not None:
         gdaltest.dods_drv.Register()
     gdaltest.dods_drv = None
-
-
-
-# gdaltest_list = [ http_test_use_capi_store ]
-
diff --git a/autotest/gdrivers/gpkg.py b/autotest/gdrivers/gpkg.py
index 54c39ea77615..721bc05d8ca0 100755
--- a/autotest/gdrivers/gpkg.py
+++ b/autotest/gdrivers/gpkg.py
@@ -3203,6 +3203,3 @@ def test_gpkg_cleanup():
     gdal.SetConfigOption('GPKG_DEBUG', None)
 
 ###############################################################################
-
-
-# gdaltest_list = [ gpkg_init, gpkg_47, gpkg_cleanup ]
diff --git a/autotest/gdrivers/jp2lura.py b/autotest/gdrivers/jp2lura.py
index a4add964d9c5..da332d9ea5a9 100755
--- a/autotest/gdrivers/jp2lura.py
+++ b/autotest/gdrivers/jp2lura.py
@@ -2006,10 +2006,3 @@ def test_jp2lura_54():
 def test_jp2lura_cleanup():
 
     gdaltest.reregister_all_jpeg2000_drivers()
-
-
-
-disabled_gdaltest_list = [
-    test_jp2lura_1,
-    test_jp2lura_53,
-    test_jp2lura_cleanup]
diff --git a/autotest/gdrivers/jp2openjpeg.py b/autotest/gdrivers/jp2openjpeg.py
index 9016d6c4b1e7..278ec548802e 100755
--- a/autotest/gdrivers/jp2openjpeg.py
+++ b/autotest/gdrivers/jp2openjpeg.py
@@ -3093,10 +3093,3 @@ def test_jp2openjpeg_external_overviews_multiple_band():
 def test_jp2openjpeg_cleanup():
 
     gdaltest.reregister_all_jpeg2000_drivers()
-
-
-
-disabled_gdaltest_list = [
-    test_jp2openjpeg_1,
-    test_jp2openjpeg_45,
-    test_jp2openjpeg_cleanup]
diff --git a/autotest/gdrivers/jpeg.py b/autotest/gdrivers/jpeg.py
index 78853c41fbe8..08f7d4c7eea4 100755
--- a/autotest/gdrivers/jpeg.py
+++ b/autotest/gdrivers/jpeg.py
@@ -1050,8 +1050,3 @@ def test_jpeg_28():
 def test_jpeg_cleanup():
     gdal.Unlink('tmp/albania.jpg')
     gdal.Unlink('tmp/albania.jpg.ovr')
-
-
-
-# gdaltest_list = [ jpeg_28 ]
-
diff --git a/autotest/gdrivers/mbtiles.py b/autotest/gdrivers/mbtiles.py
index 82237bd2047e..4af598b0b7a4 100755
--- a/autotest/gdrivers/mbtiles.py
+++ b/autotest/gdrivers/mbtiles.py
@@ -597,9 +597,3 @@ def test_mbtiles_cleanup():
 
     if gdaltest.mbtiles_drv is None:
         pytest.skip()
-
-    
-
-
-# gdaltest_list = [ mbtiles_1, mbtiles_create ]
-
diff --git a/autotest/gdrivers/nitf.py b/autotest/gdrivers/nitf.py
index 12ed2a37fd01..4d434e74a052 100755
--- a/autotest/gdrivers/nitf.py
+++ b/autotest/gdrivers/nitf.py
@@ -3429,9 +3429,3 @@ def test_nitf_cleanup():
         gdal.GetDriverByName('NITF').Delete('tmp/nitf63.ntf')
     except RuntimeError:
         pass
-
-    
-
-
-# gdaltest_list = [ nitf_72 ]
-
diff --git a/autotest/gdrivers/vrtpansharpen.py b/autotest/gdrivers/vrtpansharpen.py
index b63c31e98bbe..f3626e17edf4 100755
--- a/autotest/gdrivers/vrtpansharpen.py
+++ b/autotest/gdrivers/vrtpansharpen.py
@@ -1773,8 +1773,3 @@ def test_vrtpansharpen_cleanup():
     gdal.GetDriverByName('GTiff').Delete('tmp/small_world.tif')
     gdal.GetDriverByName('GTiff').Delete('/vsimem/pan.tif')
     gdal.GetDriverByName('GTiff').Delete('/vsimem/ms.tif')
-
-
-
-# gdaltest_list= [ vrtpansharpen_1, vrtpansharpen_8 ]
-
diff --git a/autotest/ogr/ogr_basic_test.py b/autotest/ogr/ogr_basic_test.py
index 63dbcd33b56a..94ea8d329d99 100755
--- a/autotest/ogr/ogr_basic_test.py
+++ b/autotest/ogr/ogr_basic_test.py
@@ -684,8 +684,3 @@ def test_ogr_basic_dataset_slice():
 def test_ogr_basic_cleanup():
     gdaltest.lyr = None
     gdaltest.ds = None
-
-
-
-# gdaltest_list = [ ogr_basic_13 ]
-
diff --git a/autotest/ogr/ogr_elasticsearch.py b/autotest/ogr/ogr_elasticsearch.py
index 01d4359b82f6..f82671c8e628 100755
--- a/autotest/ogr/ogr_elasticsearch.py
+++ b/autotest/ogr/ogr_elasticsearch.py
@@ -2280,8 +2280,3 @@ def test_ogr_elasticsearch_cleanup():
     ogr_elasticsearch_delete_files()
 
     gdal.SetConfigOption('CPL_CURL_ENABLE_VSIMEM', None)
-
-
-
-# gdaltest_list = [ ogr_elasticsearch_init, ogr_elasticsearch_10 ]
-
diff --git a/autotest/ogr/ogr_fgdb.py b/autotest/ogr/ogr_fgdb.py
index 773d8a89bd2e..8497cdba8726 100755
--- a/autotest/ogr/ogr_fgdb.py
+++ b/autotest/ogr/ogr_fgdb.py
@@ -2177,12 +2177,3 @@ def test_ogr_fgdb_cleanup():
         # Force OpenFileGDB first
         ogrtest.openfilegdb_drv.Register()
         ogrtest.fgdb_drv.Register()
-
-    
-
-
-disabled_gdaltest_list = [
-    test_ogr_fgdb_init,
-    test_ogr_fgdb_20,
-    test_ogr_fgdb_cleanup
-]
diff --git a/autotest/ogr/ogr_geom.py b/autotest/ogr/ogr_geom.py
index 818afb253c0d..1e39f1c61693 100755
--- a/autotest/ogr/ogr_geom.py
+++ b/autotest/ogr/ogr_geom.py
@@ -3227,7 +3227,3 @@ def test_ogr_geom_force_polygonzm_to_linestring():
 
 def test_ogr_geom_cleanup():
     pass
-
-
-# gdaltest_list = [ ogr_geom_triangle_ps_tin_conversion ]
-
diff --git a/autotest/ogr/ogr_gml_read.py b/autotest/ogr/ogr_gml_read.py
index 1297730edf56..272b4f6eab69 100755
--- a/autotest/ogr/ogr_gml_read.py
+++ b/autotest/ogr/ogr_gml_read.py
@@ -3662,11 +3662,3 @@ def test_ogr_gml_clean_files():
         if len(filename) > 13 and filename[-13:] == '.resolved.gml':
             os.unlink('data/' + filename)
     gdal.Unlink('data/test_xsi_nil_gfs.gfs')
-
-
-
-disabled_gdaltest_list = [
-    test_ogr_gml_clean_files,
-    test_ogr_gml_1,
-    test_ogr_gml_82,
-    test_ogr_gml_cleanup]
diff --git a/autotest/ogr/ogr_gpkg.py b/autotest/ogr/ogr_gpkg.py
index 5e87c511bef2..1376cd920430 100755
--- a/autotest/ogr/ogr_gpkg.py
+++ b/autotest/ogr/ogr_gpkg.py
@@ -3909,8 +3909,3 @@ def test_ogr_gpkg_cleanup():
 
     
 ###############################################################################
-
-
-
-# gdaltest_list = [ ogr_gpkg_1, ogr_gpkg_47, ogr_gpkg_cleanup ]
-
diff --git a/autotest/ogr/ogr_mvt.py b/autotest/ogr/ogr_mvt.py
index 1bc90437687f..a58b53d883c5 100644
--- a/autotest/ogr/ogr_mvt.py
+++ b/autotest/ogr/ogr_mvt.py
@@ -1545,7 +1545,3 @@ def test_ogr_mvt_write_reuse_temp_db():
 
 ###############################################################################
 #
-
-
-# gdaltest_list = [ ogr_mvt_http_start, ogr_mvt_http, ogr_mvt_http_stop ]
-
diff --git a/autotest/ogr/ogr_pg.py b/autotest/ogr/ogr_pg.py
index 6172698de101..c8887b8d451d 100755
--- a/autotest/ogr/ogr_pg.py
+++ b/autotest/ogr/ogr_pg.py
@@ -64,7 +64,7 @@ def ogr_pg_check_layer_in_list(ds, layer_name):
 #
 
 ###############################################################################
-# Run gdaltest_list_internal with PostGIS enabled and then with PostGIS disabled
+# Run tests with PostGIS enabled and then with PostGIS disabled
 
 
 @pytest.fixture(
diff --git a/autotest/ogr/ogr_shape.py b/autotest/ogr/ogr_shape.py
index 08aae78b68af..0e049cd76fb8 100755
--- a/autotest/ogr/ogr_shape.py
+++ b/autotest/ogr/ogr_shape.py
@@ -4545,9 +4545,3 @@ def test_ogr_shape_cleanup():
     shape_drv.DeleteDataSource('/vsimem/ogr_shape_90.shp')
     if os.path.exists('tmp/ogr_shape_100.shp'):
         shape_drv.DeleteDataSource('tmp/ogr_shape_100.shp')
-
-    
-
-
-# gdaltest_list = [ ogr_shape_107 ]
-
diff --git a/autotest/utilities/test_gdalwarp.py b/autotest/utilities/test_gdalwarp.py
index 0887b9280993..0ebbc8db9c18 100755
--- a/autotest/utilities/test_gdalwarp.py
+++ b/autotest/utilities/test_gdalwarp.py
@@ -1335,11 +1335,3 @@ def test_gdalwarp_cleanup():
         os.remove('tmp/cutline_4326.prj')
     except OSError:
         pass
-
-    
-
-
-disabled_gdaltest_list = [
-    test_gdalwarp_cleanup,
-    test_gdalwarp_46,
-    test_gdalwarp_cleanup]
diff --git a/autotest/utilities/test_ogr2ogr.py b/autotest/utilities/test_ogr2ogr.py
index 64f4b54bdc81..e7600dc5bd2a 100755
--- a/autotest/utilities/test_ogr2ogr.py
+++ b/autotest/utilities/test_ogr2ogr.py
@@ -2436,8 +2436,3 @@ def test_ogr2ogr_67():
     # both as latitutude/longitude in degrees.
     ret = check_identity_transformation(x, y, 4326)
     return ret
-
-
-
-# gdaltest_list = [ test_ogr2ogr_51 ]
-

From 41e15ace94b92aabb1b0b2b1975ca8535ab29ab1 Mon Sep 17 00:00:00 2001
From: Craig de Stigter <craig.destigter@koordinates.com>
Date: Thu, 29 Nov 2018 21:39:05 +1300
Subject: [PATCH 156/488] Update appveyor/windows build to use pytest

---
 appveyor.yml                  |  3 ++-
 autotest/gdrivers/gdalhttp.py | 33 +++++++++++++++++++++++----------
 gdal/swig/makefile.vc         |  2 +-
 3 files changed, 26 insertions(+), 12 deletions(-)

diff --git a/appveyor.yml b/appveyor.yml
index 02b57110ea26..466f881754de 100644
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -155,7 +155,8 @@ test_script:
       cd $env:APPVEYOR_BUILD_FOLDER\autotest\cpp
       exec { nmake /f makefile.vc check MSVC_VER=$env:MSVC_VER $env:WIN64_ARG }
       cd $env:APPVEYOR_BUILD_FOLDER\autotest
-      exec { python run_all.py }
+      exec { pip install -Ur requirements.txt }
+      exec { pytest -v }
       cd $env:APPVEYOR_BUILD_FOLDER\gdal\swig\csharp
       exec { nmake /f makefile.vc test}
 
diff --git a/autotest/gdrivers/gdalhttp.py b/autotest/gdrivers/gdalhttp.py
index 88887e528436..40c496dcd5d1 100755
--- a/autotest/gdrivers/gdalhttp.py
+++ b/autotest/gdrivers/gdalhttp.py
@@ -31,14 +31,21 @@
 ###############################################################################
 
 import os
+import subprocess
 import sys
 from osgeo import gdal
 from osgeo import ogr
 
-
-import gdaltest
 import pytest
 
+try:
+    import gdaltest
+except ImportError:
+    # running as a subprocess in the windows build (see __main__ block),
+    # so conftest.py hasn't run, so sys.path doesn't have pymod in it
+    sys.path.append('../pymod')
+    import gdaltest
+
 ###############################################################################
 # Verify we have the driver.
 
@@ -222,7 +229,7 @@ def test_http_6():
 
 ###############################################################################
 
-def test_http_test_ssl_verifystatus():
+def test_http_ssl_verifystatus():
 
     if gdal.GetDriverByName('HTTP') is None:
         pytest.skip()
@@ -244,22 +251,23 @@ def test_http_test_ssl_verifystatus():
 ###############################################################################
 
 
-def test_http_test_use_capi_store():
+def test_http_use_capi_store():
 
     if gdal.GetDriverByName('HTTP') is None:
         pytest.skip()
 
     if sys.platform != 'win32':
         with gdaltest.error_handler():
-            return test_http_test_use_capi_store_sub()
-
-    import test_py_scripts
-    ret = test_py_scripts.run_py_script_as_external_script('.', 'gdalhttp', ' -use_capi_store', display_live_on_parent_stdout=True)
+            return test_http_use_capi_store_sub()
 
-    assert ret.find('Failed:    0') != -1
+    # Prints this to stderr in many cases (but doesn't error)
+    # Warning 6: GDAL_HTTP_USE_CAPI_STORE requested, but libcurl too old, non-Windows platform or OpenSSL missing.
+    subprocess.check_call(
+        [sys.executable, 'gdalhttp.py', '-use_capi_store'],
+    )
 
 
-def test_http_test_use_capi_store_sub():
+def test_http_use_capi_store_sub():
 
     with gdaltest.config_option('GDAL_HTTP_USE_CAPI_STORE', 'YES'):
         gdal.OpenEx('https://google.com', allowed_drivers=['HTTP'])
@@ -273,3 +281,8 @@ def test_http_cleanup():
     if gdaltest.dods_drv is not None:
         gdaltest.dods_drv.Register()
     gdaltest.dods_drv = None
+
+
+if __name__ == '__main__':
+    if len(sys.argv) == 2 and sys.argv[1] == '-use_capi_store':
+        test_http_use_capi_store_sub()
diff --git a/gdal/swig/makefile.vc b/gdal/swig/makefile.vc
index 4ff4a4a3170d..d9e4a64b22fc 100644
--- a/gdal/swig/makefile.vc
+++ b/gdal/swig/makefile.vc
@@ -88,7 +88,7 @@ java_install: java
 
 test: gdalvars
 	cd $(GDAL_HOME)\..\gdalautotest
-	$(PYDIR)/python.exe run_all.py
+	$(PYDIR)/python.exe -m pytest -v
 
 clean:
         -del setup.ini

From 10d7106a6b5d1178db1aa132f1bee22eae7a9214 Mon Sep 17 00:00:00 2001
From: Craig de Stigter <craig.destigter@koordinates.com>
Date: Fri, 30 Nov 2018 08:30:11 +1300
Subject: [PATCH 157/488] Include but skip dods/gmlas tests. Include fgdb
 stress tests if fgdb driver

---
 autotest/ogr/ogr_dods.py             | 28 ++++++++++++----------------
 autotest/ogr/ogr_fgdb_stress_test.py | 20 ++++++++------------
 autotest/ogr/ogr_gmlas.py            | 16 ++++------------
 3 files changed, 24 insertions(+), 40 deletions(-)

diff --git a/autotest/ogr/ogr_dods.py b/autotest/ogr/ogr_dods.py
index 8bddf4b22e7b..ee24da6ddf67 100755
--- a/autotest/ogr/ogr_dods.py
+++ b/autotest/ogr/ogr_dods.py
@@ -38,7 +38,8 @@
 # Open DODS datasource.
 
 
-def ogr_dods_1():
+@pytest.mark.skip()
+def test_ogr_dods_1():
     gdaltest.dods_ds = None
     ogrtest.dods_drv = ogr.GetDriverByName('DODS')
 
@@ -73,7 +74,8 @@ def ogr_dods_1():
 #
 
 
-def ogr_dods_2():
+@pytest.mark.skip()
+def test_ogr_dods_2():
 
     if gdaltest.dods_ds is None:
         pytest.skip()
@@ -100,7 +102,8 @@ def ogr_dods_2():
 #
 
 
-def ogr_dods_3():
+@pytest.mark.skip()
+def test_ogr_dods_3():
 
     if gdaltest.dods_ds is None:
         pytest.skip()
@@ -137,7 +140,8 @@ def ogr_dods_3():
 #
 
 
-def ogr_dods_4():
+@pytest.mark.skip()
+def test_ogr_dods_4():
 
     if gdaltest.dods_ds is None:
         pytest.skip()
@@ -167,7 +171,8 @@ def ogr_dods_4():
 # Simple 1D Grid.
 #
 
-def ogr_dods_5():
+@pytest.mark.skip()
+def test_ogr_dods_5():
 
     if ogrtest.dods_drv is None:
         pytest.skip()
@@ -189,7 +194,8 @@ def ogr_dods_5():
 #
 
 
-def ogr_dods_cleanup():
+@pytest.mark.skip()
+def test_ogr_dods_cleanup():
 
     if gdaltest.dods_ds is None:
         pytest.skip()
@@ -199,13 +205,3 @@ def ogr_dods_cleanup():
     gdaltest.dods_normalized = None
     gdaltest.dods_ds.Destroy()
     gdaltest.dods_ds = None
-
-
-
-manual_gdaltest_list = [
-    ogr_dods_1,
-    ogr_dods_2,
-    ogr_dods_3,
-    ogr_dods_4,
-    ogr_dods_5,
-    ogr_dods_cleanup]
diff --git a/autotest/ogr/ogr_fgdb_stress_test.py b/autotest/ogr/ogr_fgdb_stress_test.py
index 24edbac1e631..8a286316ecca 100755
--- a/autotest/ogr/ogr_fgdb_stress_test.py
+++ b/autotest/ogr/ogr_fgdb_stress_test.py
@@ -44,7 +44,8 @@
 # Test if driver is available
 
 
-def ogr_fgdb_stress_test_init():
+@pytest.mark.skip()
+def test_ogr_fgdb_stress_init():
 
     ogrtest.fgdb_drv = None
     ogrtest.openfilegdb_drv = None
@@ -72,7 +73,8 @@ def ogr_fgdb_stress_test_init():
 # Generate databases from random operations
 
 
-def ogr_fgdb_stress_test_1():
+@pytest.mark.skip()
+def test_ogr_fgdb_stress_1():
     if ogrtest.fgdb_drv is None:
         pytest.skip()
 
@@ -162,7 +164,8 @@ def ogr_fgdb_stress_test_1():
 # Compare databases
 
 
-def ogr_fgdb_stress_test_2():
+@pytest.mark.skip()
+def test_ogr_fgdb_stress_2():
     if ogrtest.fgdb_drv is None:
         pytest.skip()
 
@@ -197,7 +200,8 @@ def ogr_fgdb_stress_test_2():
 ###############################################################################
 # Cleanup
 
-def ogr_fgdb_stress_test_cleanup():
+@pytest.mark.skip()
+def test_ogr_fgdb_stress_cleanup():
     if ogrtest.fgdb_drv is None:
         pytest.skip()
 
@@ -207,11 +211,3 @@ def ogr_fgdb_stress_test_cleanup():
         pass
 
     gdal.Unlink("tmp/test." + ogrtest.reference_ext)
-
-
-# Do nothing in whole run of the suite
-
-explicit_gdaltest_list = [ogr_fgdb_stress_test_init,
-                          ogr_fgdb_stress_test_1,
-                          ogr_fgdb_stress_test_2,
-                          ogr_fgdb_stress_test_cleanup]
diff --git a/autotest/ogr/ogr_gmlas.py b/autotest/ogr/ogr_gmlas.py
index fbc742185f88..98d2b265aebe 100755
--- a/autotest/ogr/ogr_gmlas.py
+++ b/autotest/ogr/ogr_gmlas.py
@@ -2694,7 +2694,8 @@ def test_ogr_gmlas_geometry_as_substitutiongroup():
 ###############################################################################
 
 
-def ogr_gmlas_extra_piezometre():
+@pytest.mark.skip()
+def test_ogr_gmlas_extra_piezometre():
 
     if ogr.GetDriverByName('GMLAS') is None:
         pytest.skip()
@@ -2706,7 +2707,8 @@ def ogr_gmlas_extra_piezometre():
 ###############################################################################
 
 
-def ogr_gmlas_extra_eureg():
+@pytest.mark.skip()
+def test_ogr_gmlas_extra_eureg():
 
     if ogr.GetDriverByName('GMLAS') is None:
         pytest.skip()
@@ -2886,13 +2888,3 @@ def test_ogr_gmlas_cleanup():
 
     gdal.SetConfigOption('GMLAS_WARN_UNEXPECTED', None)
     gdal.SetConfigOption('GDAL_XML_VALIDATION', ogrtest.old_val_GDAL_XML_VALIDATION)
-
-
-
-# gdaltest_list = [ ogr_gmlas_basic, ogr_gmlas_aux_schema_without_namespace_prefix, ogr_gmlas_cleanup ]
-
-# Test only work if using "python ogr_gmlas.py"
-gdaltest_extra_list = [
-    ogr_gmlas_extra_piezometre,
-    ogr_gmlas_extra_eureg
-]

From 6c3d9aae2d57b5c3551012097b68a160b812f658 Mon Sep 17 00:00:00 2001
From: Craig de Stigter <craig.destigter@koordinates.com>
Date: Fri, 30 Nov 2018 15:55:44 +1300
Subject: [PATCH 158/488] Add more verbosity to test output in CI

Pytest truncates expressions from failed asserts, which is a bit counterproductive in CI
---
 appveyor.yml                                     | 2 +-
 gdal/ci/travis/gcc52_stdcpp14_sanitize/script.sh | 2 +-
 gdal/ci/travis/mingw_w64/script.sh               | 2 +-
 gdal/ci/travis/osx/script.sh                     | 2 +-
 gdal/ci/travis/python3/script.sh                 | 2 +-
 gdal/ci/travis/trusty_32bit/script.sh            | 2 +-
 gdal/ci/travis/trusty_clang/script.sh            | 2 +-
 gdal/ci/travis/ubuntu_1604/script.sh             | 2 +-
 gdal/ci/travis/ubuntu_1804/script.sh             | 2 +-
 gdal/swig/makefile.vc                            | 2 +-
 10 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/appveyor.yml b/appveyor.yml
index 466f881754de..5b6c93ee34bc 100644
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -156,7 +156,7 @@ test_script:
       exec { nmake /f makefile.vc check MSVC_VER=$env:MSVC_VER $env:WIN64_ARG }
       cd $env:APPVEYOR_BUILD_FOLDER\autotest
       exec { pip install -Ur requirements.txt }
-      exec { pytest -v }
+      exec { pytest -vv }
       cd $env:APPVEYOR_BUILD_FOLDER\gdal\swig\csharp
       exec { nmake /f makefile.vc test}
 
diff --git a/gdal/ci/travis/gcc52_stdcpp14_sanitize/script.sh b/gdal/ci/travis/gcc52_stdcpp14_sanitize/script.sh
index 6e670430584d..f4a4e9d2a3cb 100755
--- a/gdal/ci/travis/gcc52_stdcpp14_sanitize/script.sh
+++ b/gdal/ci/travis/gcc52_stdcpp14_sanitize/script.sh
@@ -6,7 +6,7 @@ export PATH=$PWD/install-gcc-5.2.0/bin:$PATH
 export LD_LIBRARY_PATH=$PWD/install-gcc-5.2.0/lib64
 export PRELOAD=$PWD/install-gcc-5.2.0/lib64/libasan.so.2.0.0:$PWD/install-gcc-5.2.0/lib64/libubsan.so.0.0.0
 #export PRELOAD=$PWD/install-gcc-5.2.0/lib64/libubsan.so.0.0.0
-export PYTEST="pytest -v -p no:sugar --color=no"
+export PYTEST="pytest -vv -p no:sugar --color=no"
 
 cd gdal
 
diff --git a/gdal/ci/travis/mingw_w64/script.sh b/gdal/ci/travis/mingw_w64/script.sh
index 7c9ef0bd82ee..04d4372b16ef 100755
--- a/gdal/ci/travis/mingw_w64/script.sh
+++ b/gdal/ci/travis/mingw_w64/script.sh
@@ -23,7 +23,7 @@ rm get-pip.py
 # https://forum.winehq.org/viewtopic.php?f=2&t=22522
 wine64 "$PYTHON_DIR/python.exe" -m pip install -U -r ./requirements.txt
 # same issue with running pytest.exe
-export PYTEST="wine64 $PYTHON_DIR/python.exe -m pytest -v -p no:sugar --color=no"
+export PYTEST="wine64 $PYTHON_DIR/python.exe -m pytest -vv -p no:sugar --color=no"
 
 
 # Run all the Python autotests
diff --git a/gdal/ci/travis/osx/script.sh b/gdal/ci/travis/osx/script.sh
index df2adccaaf4d..1435d1c73b1c 100755
--- a/gdal/ci/travis/osx/script.sh
+++ b/gdal/ci/travis/osx/script.sh
@@ -3,7 +3,7 @@
 set -e
 
 export PYTHONPATH=$PWD/gdal/swig/python/build/lib.macosx-10.12-intel-2.7:$PWD/gdal/swig/python/build/lib.macosx-10.11-x86_64-2.7
-export PYTEST="pytest -v -p no:sugar --color=no"
+export PYTEST="pytest -vv -p no:sugar --color=no"
 
 echo 'Running CPP unit tests'
 (cd autotest/cpp && GDAL_SKIP=JP2ECW make quick_test)
diff --git a/gdal/ci/travis/python3/script.sh b/gdal/ci/travis/python3/script.sh
index 3d12b0ec5a45..c99defb39fc5 100755
--- a/gdal/ci/travis/python3/script.sh
+++ b/gdal/ci/travis/python3/script.sh
@@ -36,7 +36,7 @@ cd ../../..
 curl -sSL 'https://bootstrap.pypa.io/get-pip.py' | sudo python3
 sudo -H pip3 install -U -r ./requirements.txt
 
-PYTEST="python3 $(which pytest) -v -p no:sugar --color=no"
+PYTEST="python3 $(which pytest) -vv -p no:sugar --color=no"
 
 # Run ogr_fgdb.py in isolation from the rest
 $PYTEST ogr/ogr_fgdb.py
diff --git a/gdal/ci/travis/trusty_32bit/script.sh b/gdal/ci/travis/trusty_32bit/script.sh
index 35d99a2d371c..58fa5a7661c6 100755
--- a/gdal/ci/travis/trusty_32bit/script.sh
+++ b/gdal/ci/travis/trusty_32bit/script.sh
@@ -4,7 +4,7 @@ set -e
 
 export chroot="$PWD"/buildroot.i386
 export LC_ALL=en_US.utf8
-export PYTEST="pytest -v -p no:sugar --color=no"
+export PYTEST="pytest -vv -p no:sugar --color=no"
 
 i386 chroot "$chroot" sh -c "cd $PWD/autotest/cpp && make quick_test"
 # Compile and test vsipreload
diff --git a/gdal/ci/travis/trusty_clang/script.sh b/gdal/ci/travis/trusty_clang/script.sh
index 20ff2a564bea..2c88405419b7 100755
--- a/gdal/ci/travis/trusty_clang/script.sh
+++ b/gdal/ci/travis/trusty_clang/script.sh
@@ -6,7 +6,7 @@ set -e
 # Run it in isolation
 export JAVA_HOME=/usr/lib/jvm/java-8-openjdk-amd64
 export PATH=$JAVA_HOME/jre/bin:$PATH
-export PYTEST="pytest -v -p no:sugar --color=no"
+export PYTEST="pytest -vv -p no:sugar --color=no"
 
 cd gdal
 # Perl unit tests
diff --git a/gdal/ci/travis/ubuntu_1604/script.sh b/gdal/ci/travis/ubuntu_1604/script.sh
index 7a6ed17900ad..eea8de532c1d 100755
--- a/gdal/ci/travis/ubuntu_1604/script.sh
+++ b/gdal/ci/travis/ubuntu_1604/script.sh
@@ -4,7 +4,7 @@ set -e
 
 export chroot="$PWD"/xenial
 export LC_ALL=en_US.utf8
-export PYTEST="pytest -v -p no:sugar --color=no"
+export PYTEST="pytest -vv -p no:sugar --color=no"
 
 chroot "$chroot" sh -c "cd $PWD/autotest/cpp && make quick_test"
 # Compile and test vsipreload
diff --git a/gdal/ci/travis/ubuntu_1804/script.sh b/gdal/ci/travis/ubuntu_1804/script.sh
index ec960477bcab..54e87fde0af1 100755
--- a/gdal/ci/travis/ubuntu_1804/script.sh
+++ b/gdal/ci/travis/ubuntu_1804/script.sh
@@ -4,7 +4,7 @@ set -e
 
 export chroot="$PWD"/bionic
 export LC_ALL=en_US.utf8
-export PYTEST="pytest -v -p no:sugar --color=no"
+export PYTEST="pytest -vv -p no:sugar --color=no"
 
 chroot "$chroot" sh -c "cd $PWD/autotest/cpp && make quick_test"
 # Compile and test vsipreload
diff --git a/gdal/swig/makefile.vc b/gdal/swig/makefile.vc
index d9e4a64b22fc..a989b7892089 100644
--- a/gdal/swig/makefile.vc
+++ b/gdal/swig/makefile.vc
@@ -88,7 +88,7 @@ java_install: java
 
 test: gdalvars
 	cd $(GDAL_HOME)\..\gdalautotest
-	$(PYDIR)/python.exe -m pytest -v
+	$(PYDIR)/python.exe -m pytest -vv
 
 clean:
         -del setup.ini

From b54e910cc1c320253f180a93c34ef973870eba50 Mon Sep 17 00:00:00 2001
From: Craig de Stigter <craig.destigter@koordinates.com>
Date: Sat, 1 Dec 2018 09:11:12 +1300
Subject: [PATCH 159/488] Make vrt_read_29 test not care whether gdal.Translate
 closes the dest file

---
 autotest/gcore/vrt_read.py | 15 +++++++--------
 1 file changed, 7 insertions(+), 8 deletions(-)

diff --git a/autotest/gcore/vrt_read.py b/autotest/gcore/vrt_read.py
index a77a0dd18596..9bfb0d983e43 100755
--- a/autotest/gcore/vrt_read.py
+++ b/autotest/gcore/vrt_read.py
@@ -31,7 +31,6 @@
 ###############################################################################
 
 import os
-import sys
 import shutil
 import struct
 
@@ -1028,11 +1027,10 @@ def test_vrt_read_28():
 def test_vrt_read_29():
 
     f = open('data/byte.tif')
-    lst_before = gdaltest.get_opened_files()
+    lst_before = sorted(gdaltest.get_opened_files())
     if not lst_before:
         pytest.skip()
     f.close()
-    lst_before = gdaltest.get_opened_files()
 
     gdal.Translate('tmp/vrt_read_29.tif', 'data/byte.tif')
 
@@ -1057,17 +1055,18 @@ def test_vrt_read_29():
     </VRTRasterBand>
     </VRTDataset>"""
 
+    lst_before = sorted(gdaltest.get_opened_files())
     ds = gdal.Open(vrt_text)
     # Just after opening, we shouldn't have read the source
-    lst = gdaltest.get_opened_files()
-    assert lst.sort() == lst_before.sort()
+    lst = sorted(gdaltest.get_opened_files())
+    assert lst == lst_before
 
     # Check that the 2 bands share the same source handle
     ds.GetRasterBand(1).Checksum()
-    lst = gdaltest.get_opened_files()
+    lst = sorted(gdaltest.get_opened_files())
     assert len(lst) == len(lst_before) + 1
     ds.GetRasterBand(2).Checksum()
-    lst = gdaltest.get_opened_files()
+    lst = sorted(gdaltest.get_opened_files())
     assert len(lst) == len(lst_before) + 1
 
     # Open a second VRT dataset handle
@@ -1075,7 +1074,7 @@ def test_vrt_read_29():
 
     # Check that it consumes an extra handle
     ds2.GetRasterBand(1).Checksum()
-    lst = gdaltest.get_opened_files()
+    lst = sorted(gdaltest.get_opened_files())
     assert len(lst) == len(lst_before) + 2
 
     gdal.Unlink('tmp/vrt_read_29.tif')

From 46e92b776a18cfa27a49c558804e3688f78ad4a6 Mon Sep 17 00:00:00 2001
From: Craig de Stigter <craig.destigter@koordinates.com>
Date: Mon, 10 Dec 2018 09:06:16 +1300
Subject: [PATCH 160/488] Tweak the IDs in parametrized tests to be more useful

---
 autotest/gcore/hfa_srs.py       | 13 +++++++++----
 autotest/gcore/tiff_srs.py      | 15 ++++++++++-----
 autotest/gdrivers/mrf.py        | 11 +++++++++--
 autotest/ogr/ogr_gml_geom.py    |  8 ++++----
 autotest/ogr/ogr_sqlite.py      |  3 ++-
 autotest/ogr/ogr_wfs.py         |  6 +++++-
 autotest/ogr/ogr_wkbwkt_geom.py | 10 +++++-----
 autotest/ogr/ogr_wktempty.py    | 12 +++++++++---
 8 files changed, 53 insertions(+), 25 deletions(-)

diff --git a/autotest/gcore/hfa_srs.py b/autotest/gcore/hfa_srs.py
index 2d256f850e11..49ba42295436 100755
--- a/autotest/gcore/hfa_srs.py
+++ b/autotest/gcore/hfa_srs.py
@@ -35,11 +35,9 @@
 from osgeo import osr
 
 
-
 ###############################################################################
 # Write a HFA/Imagine and read it back to check its SRS
-
-@pytest.mark.parametrize('epsg_code,epsg_broken', [
+epsg_list = [
     [2758, False],  # tmerc
     [2036, True],  # sterea   # failure caused by revert done in r22803
     [2046, False],  # tmerc
@@ -59,7 +57,14 @@
     [2056, False],  # somerc
     [2027, False],  # utm
     [4326, False],  # longlat
-])
+]
+
+
+@pytest.mark.parametrize(
+    'epsg_code,epsg_broken',
+    epsg_list,
+    ids=[str(r[0]) for r in epsg_list],
+)
 def test_hfa_srs(epsg_code, epsg_broken):
     sr = osr.SpatialReference()
     sr.ImportFromEPSG(epsg_code)
diff --git a/autotest/gcore/tiff_srs.py b/autotest/gcore/tiff_srs.py
index 22aadb04e08a..b74f302bf6f9 100755
--- a/autotest/gcore/tiff_srs.py
+++ b/autotest/gcore/tiff_srs.py
@@ -35,8 +35,6 @@
 from osgeo import osr
 
 
-
-
 ###############################################################################
 # Test fix for #4677:
 
@@ -397,8 +395,7 @@ def _test_tiff_srs(sr, expect_fail):
 ###############################################################################
 # Write a geotiff and read it back to check its SRS
 
-@pytest.mark.parametrize('use_epsg_code', [0, 1])
-@pytest.mark.parametrize('epsg_code,epsg_proj4_broken', [
+epsg_list = [
     [2758, False],  # tmerc
     [2036, False],  # sterea
     [2046, False],  # tmerc
@@ -434,7 +431,15 @@ def _test_tiff_srs(sr, expect_fail):
     [31491, False],  # Germany Zone projection
     [3857, True],  # Web Mercator
     [102113, True],  # ESRI WGS_1984_Web_Mercator
-])
+]
+
+
+@pytest.mark.parametrize('use_epsg_code', [0, 1])
+@pytest.mark.parametrize(
+    'epsg_code,epsg_proj4_broken',
+    epsg_list,
+    ids=[str(r[0]) for r in epsg_list],
+)
 def test_tiff_srs(use_epsg_code, epsg_code, epsg_proj4_broken):
     sr = osr.SpatialReference()
     sr.ImportFromEPSG(epsg_code)
diff --git a/autotest/gdrivers/mrf.py b/autotest/gdrivers/mrf.py
index 62891d34645f..2b3ed195394e 100755
--- a/autotest/gdrivers/mrf.py
+++ b/autotest/gdrivers/mrf.py
@@ -38,7 +38,7 @@
 import gdaltest
 
 
-@pytest.mark.parametrize('src_filename,chksum,chksum_after_reopening,options', [
+mrf_list = [
     ('byte.tif', 4672, [4672], []),
     ('byte.tif', 4672, [4672], ['COMPRESS=DEFLATE']),
     ('byte.tif', 4672, [4672], ['COMPRESS=NONE']),
@@ -73,7 +73,14 @@
     ('rgbsmall.tif', 21212, [21261, 21209, 21254, 21215], ['INTERLEAVE=PIXEL', 'COMPRESS=JPEG', 'QUALITY=99', 'PHOTOMETRIC=RGB']),
     ('rgbsmall.tif', 21212, [21283, 21127, 21278, 21124], ['INTERLEAVE=PIXEL', 'COMPRESS=JPEG', 'QUALITY=99', 'PHOTOMETRIC=YCC']),
     ('12bit_rose_extract.jpg', 30075, [29650, 29680, 29680, 29650], ['COMPRESS=JPEG']),
-])
+]
+
+
+@pytest.mark.parametrize(
+    'src_filename,chksum,chksum_after_reopening,options',
+    mrf_list,
+    ids=['{0}-{3}'.format(*r) for r in mrf_list],
+)
 def test_mrf(src_filename, chksum, chksum_after_reopening, options):
     if src_filename == '12bit_rose_extract.jpg':
         import jpeg
diff --git a/autotest/ogr/ogr_gml_geom.py b/autotest/ogr/ogr_gml_geom.py
index 41bd789946d9..2fb7dd71e473 100755
--- a/autotest/ogr/ogr_gml_geom.py
+++ b/autotest/ogr/ogr_gml_geom.py
@@ -41,14 +41,14 @@
 
 
 @pytest.mark.parametrize(
-    'unit',
+    'filename',
     [
-        f[:-4] for f in os.listdir(os.path.join(os.path.dirname(__file__), 'data/wkb_wkt'))
+        f for f in os.listdir(os.path.join(os.path.dirname(__file__), 'data/wkb_wkt'))
         if f[-4:] == '.wkt'
     ]
 )
-def test_gml_geom(unit):
-    raw_wkt = open('data/wkb_wkt/' + unit + '.wkt').read()
+def test_gml_geom(filename):
+    raw_wkt = open('data/wkb_wkt/' + filename).read()
 
     ######################################################################
     # Convert WKT to GML.
diff --git a/autotest/ogr/ogr_sqlite.py b/autotest/ogr/ogr_sqlite.py
index 697a99e80d13..a51a29410d78 100755
--- a/autotest/ogr/ogr_sqlite.py
+++ b/autotest/ogr/ogr_sqlite.py
@@ -1520,7 +1520,8 @@ def test_ogr_spatialite_4(require_spatialite):
 
 @pytest.mark.parametrize(
     'bUseComprGeom',
-    [False, True]
+    [False, True],
+    ids=['dont-compress-geometries', 'compress-geometries']
 )
 def test_ogr_spatialite_5(require_spatialite, bUseComprGeom):
     if bUseComprGeom and require_spatialite == '2.3.1':
diff --git a/autotest/ogr/ogr_wfs.py b/autotest/ogr/ogr_wfs.py
index 8e82b6da4977..2968d0c95bc8 100755
--- a/autotest/ogr/ogr_wfs.py
+++ b/autotest/ogr/ogr_wfs.py
@@ -70,7 +70,11 @@ def ogr_wfs_init():
         pytest.skip('failed to open test file.')
 
 
-@pytest.fixture(params=['NO', None], scope='module')
+@pytest.fixture(
+    params=['NO', None],
+    scope='module',
+    ids=['without-streaming', 'with-streaming']
+)
 def with_and_without_streaming(request):
     with gdaltest.config_option('OGR_WFS_USE_STREAMING', request.param):
         yield
diff --git a/autotest/ogr/ogr_wkbwkt_geom.py b/autotest/ogr/ogr_wkbwkt_geom.py
index 9cc006cad32b..42adcaf04c8f 100755
--- a/autotest/ogr/ogr_wkbwkt_geom.py
+++ b/autotest/ogr/ogr_wkbwkt_geom.py
@@ -39,15 +39,15 @@
 
 
 @pytest.mark.parametrize(
-    'unit',
+    'filename',
     [
-        f[:-4] for f in os.listdir(os.path.join(os.path.dirname(__file__), 'data/wkb_wkt'))
+        f for f in os.listdir(os.path.join(os.path.dirname(__file__), 'data/wkb_wkt'))
         if f[-4:] == '.wkb'
     ]
 )
-def test_wkbwkt_geom(unit):
-    raw_wkb = open('data/wkb_wkt/' + unit + '.wkb', 'rb').read()
-    raw_wkt = open('data/wkb_wkt/' + unit + '.wkt').read()
+def test_wkbwkt_geom(filename):
+    raw_wkb = open('data/wkb_wkt/' + filename, 'rb').read()
+    raw_wkt = open('data/wkb_wkt/' + os.path.splitext(filename)[0] + '.wkt').read()
 
     ######################################################################
     # Compare the WKT derived from the WKB file to the WKT provided
diff --git a/autotest/ogr/ogr_wktempty.py b/autotest/ogr/ogr_wktempty.py
index f8bf223249f0..678f5362a3d5 100755
--- a/autotest/ogr/ogr_wktempty.py
+++ b/autotest/ogr/ogr_wktempty.py
@@ -31,8 +31,7 @@
 
 from osgeo import ogr
 
-
-@pytest.mark.parametrize("test_input,expected", [
+wkt_list = [
     ('GEOMETRYCOLLECTION(EMPTY)', 'GEOMETRYCOLLECTION EMPTY'),
     ('MULTIPOLYGON( EMPTY )', 'MULTIPOLYGON EMPTY'),
     ('MULTILINESTRING(EMPTY)', 'MULTILINESTRING EMPTY'),
@@ -48,7 +47,14 @@
     ('POINT EMPTY', 'POINT EMPTY'),
     ('LINESTRING EMPTY', 'LINESTRING EMPTY'),
     ('POLYGON EMPTY', 'POLYGON EMPTY')
-])
+]
+
+
+@pytest.mark.parametrize(
+    "test_input,expected",
+    wkt_list,
+    ids=[r[0] for r in wkt_list]
+)
 def test_empty_wkt(test_input, expected):
     geom = ogr.CreateGeometryFromWkt(test_input)
     wkt = geom.ExportToWkt()

From b2453ed994e9e776cf789735c09be5bb32c96245 Mon Sep 17 00:00:00 2001
From: Craig de Stigter <craig.destigter@koordinates.com>
Date: Tue, 11 Dec 2018 13:15:18 +1300
Subject: [PATCH 161/488] Fix bug in vagrantfile script to install pip

---
 gdal/scripts/vagrant/gdal.sh | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/gdal/scripts/vagrant/gdal.sh b/gdal/scripts/vagrant/gdal.sh
index ba591c599060..7e508d3269ab 100755
--- a/gdal/scripts/vagrant/gdal.sh
+++ b/gdal/scripts/vagrant/gdal.sh
@@ -75,7 +75,8 @@ cd ../..
 # Install pytest.
 # First install pip 9, which is the last version which can upgrade the system's `six`
 # 10+ throws an error :/
-curl https://bootstrap.pypa.io/get-pip.py 'pip<10' | sudo -H python
+curl -sSL https://bootstrap.pypa.io/get-pip.py -o /tmp/get-pip.py
+sudo -H python /tmp/get-pip.py 'pip<10'
 
 sudo -H pip install -Ur /vagrant/autotest/requirements.txt
 

From 839969c4dc09bdca63d37511113804e1fc0d4d01 Mon Sep 17 00:00:00 2001
From: Craig de Stigter <craig.destigter@koordinates.com>
Date: Wed, 12 Dec 2018 11:40:20 +1300
Subject: [PATCH 162/488] Auto-cleanup of `a.find(b) != -1` in the test suite

`a.find(b) != -1`
    --> `b in a`

`a.find(b) == -1`
    --> `b not in a`

`a.find(b) == 0`
    --> `a.startswith(b)

`a.find(b) != 0`
    --> `not a.startswith(b)

This was done using this bowler script https://gist.github.com/craigds/47137592566be7564e0cb4cfb6e0ecdf
---
 autotest/gcore/basic_test.py                |   2 +-
 autotest/gcore/pam.py                       |   4 +-
 autotest/gcore/tiff_read.py                 |  10 +-
 autotest/gcore/tiff_srs.py                  |  24 ++---
 autotest/gcore/tiff_write.py                |   8 +-
 autotest/gcore/transformer.py               |  14 +--
 autotest/gcore/vrt_read.py                  |  10 +-
 autotest/gcore/vrtmisc.py                   |  28 ++---
 autotest/gcore/vsiaz.py                     |   4 +-
 autotest/gcore/vsicurl.py                   |   2 +-
 autotest/gcore/vsigs.py                     |   4 +-
 autotest/gcore/vsioss.py                    |   2 +-
 autotest/gcore/vsis3.py                     |   2 +-
 autotest/gcore/vsiswift.py                  |   2 +-
 autotest/gdrivers/aaigrid.py                |   2 +-
 autotest/gdrivers/bag.py                    |   6 +-
 autotest/gdrivers/ehdr.py                   |   2 +-
 autotest/gdrivers/ers.py                    |   2 +-
 autotest/gdrivers/gdalhttp.py               |   2 +-
 autotest/gdrivers/gpkg.py                   |  12 +--
 autotest/gdrivers/grib.py                   |   4 +-
 autotest/gdrivers/hdf5.py                   |   6 +-
 autotest/gdrivers/isis.py                   | 113 ++++++++++----------
 autotest/gdrivers/jp2lura.py                |  10 +-
 autotest/gdrivers/jp2metadata.py            |   2 +-
 autotest/gdrivers/jp2openjpeg.py            |  46 ++++----
 autotest/gdrivers/mrf.py                    |   2 +-
 autotest/gdrivers/netcdf.py                 |  48 ++++-----
 autotest/gdrivers/nitf.py                   |   4 +-
 autotest/gdrivers/pdf.py                    |  12 +--
 autotest/gdrivers/pds4.py                   |  40 +++----
 autotest/gdrivers/rl2.py                    |   2 +-
 autotest/gdrivers/sentinel2.py              |  18 ++--
 autotest/gdrivers/vrtderived.py             |  16 +--
 autotest/gdrivers/vrtrawlink.py             |   6 +-
 autotest/gdrivers/wms.py                    |  14 +--
 autotest/gdrivers/xmp.py                    |   4 +-
 autotest/ogr/ogr_cad.py                     |   2 +-
 autotest/ogr/ogr_csv.py                     |  14 +--
 autotest/ogr/ogr_elasticsearch.py           |   2 +-
 autotest/ogr/ogr_fgdb.py                    |  10 +-
 autotest/ogr/ogr_geojson.py                 | 108 +++++++++----------
 autotest/ogr/ogr_gml_read.py                |  14 +--
 autotest/ogr/ogr_gmlas.py                   |  32 +++---
 autotest/ogr/ogr_gpkg.py                    |  14 +--
 autotest/ogr/ogr_jml.py                     |   8 +-
 autotest/ogr/ogr_kml.py                     |   2 +-
 autotest/ogr/ogr_mitab.py                   |   4 +-
 autotest/ogr/ogr_oci.py                     |   2 +-
 autotest/ogr/ogr_openfilegdb.py             |   2 +-
 autotest/ogr/ogr_pg.py                      |   8 +-
 autotest/ogr/ogr_pgdump.py                  |  42 ++++----
 autotest/ogr/ogr_shape.py                   |   2 +-
 autotest/ogr/ogr_sqlite.py                  |   6 +-
 autotest/ogr/ogr_virtualogr.py              |   2 +-
 autotest/ogr/ogr_wfs.py                     |   2 +-
 autotest/osr/osr_basic.py                   |   2 +-
 autotest/osr/osr_compd.py                   |   2 +-
 autotest/osr/osr_esri.py                    |   8 +-
 autotest/osr/osr_micoordsys.py              |   2 +-
 autotest/osr/osr_proj4.py                   |  38 +++----
 autotest/pymod/gdaltest.py                  |   6 +-
 autotest/pymod/xmlvalidate.py               |   8 +-
 autotest/pyscripts/test_gdal_polygonize.py  |   4 +-
 autotest/pyscripts/test_gdalmove.py         |   2 +-
 autotest/pyscripts/test_ogrinfo_py.py       |   2 +-
 autotest/pyscripts/test_ogrmerge.py         |  12 +--
 autotest/utilities/test_gdal_grid.py        |   4 +-
 autotest/utilities/test_gdal_translate.py   |  10 +-
 autotest/utilities/test_gdalbuildvrt.py     |   4 +-
 autotest/utilities/test_gdalinfo.py         |  40 +++----
 autotest/utilities/test_gdalinfo_lib.py     |   2 +-
 autotest/utilities/test_gdallocationinfo.py |  12 +--
 autotest/utilities/test_gdalsrsinfo.py      |   6 +-
 autotest/utilities/test_gdalwarp_lib.py     |   4 +-
 autotest/utilities/test_ogr2ogr.py          |  62 +++++------
 autotest/utilities/test_ogrinfo.py          |  30 +++---
 77 files changed, 512 insertions(+), 513 deletions(-)

diff --git a/autotest/gcore/basic_test.py b/autotest/gcore/basic_test.py
index bf7567069970..920deba2e46f 100755
--- a/autotest/gcore/basic_test.py
+++ b/autotest/gcore/basic_test.py
@@ -75,7 +75,7 @@ def test_basic_test_strace_non_existing_file():
 
     interesting_lines = []
     for line in err.split('\n'):
-        if line.find('non_existing_ds') >= 0:
+        if 'non_existing_ds' in line:
             interesting_lines += [ line ]
     # Only 3 calls on the file are legit: open(), stat() and readlink()
     assert len(interesting_lines) <= 3, 'too many system calls accessing file'
diff --git a/autotest/gcore/pam.py b/autotest/gcore/pam.py
index 285a3bca4c41..4ce32c6b287c 100755
--- a/autotest/gcore/pam.py
+++ b/autotest/gcore/pam.py
@@ -337,7 +337,7 @@ def test_pam_11():
     gdal.ErrorReset()
     ds = None
     error_msg = gdal.GetLastErrorMsg()
-    assert error_msg.find('Unable to save auxiliary information') == 0, \
+    assert error_msg.startswith('Unable to save auxiliary information'), \
         'warning was expected at that point'
 
     # Check that we actually have no saved statistics
@@ -390,7 +390,7 @@ def test_pam_12():
 
     assert hist1 == hist2
     assert hist1[0] == 6000000000
-    assert aux_xml.find('<HistCounts>6000000000|') >= 0
+    assert '<HistCounts>6000000000|' in aux_xml
 
 ###############################################################################
 # Test various stuff with PAM disabled
diff --git a/autotest/gcore/tiff_read.py b/autotest/gcore/tiff_read.py
index a5f80c8f2cf2..c14fd3bd9c24 100755
--- a/autotest/gcore/tiff_read.py
+++ b/autotest/gcore/tiff_read.py
@@ -1999,7 +1999,7 @@ def test_tiff_read_strace_check():
 
     lines_with_dotdot_gcore = []
     for line in err.split('\n'):
-        if line.find('../gcore') >= 0:
+        if '../gcore' in line:
             lines_with_dotdot_gcore += [line]
 
     assert len(lines_with_dotdot_gcore) == 1
@@ -2233,7 +2233,7 @@ def test_tiff_read_nogeoref():
                 print('Expected ' + str(expected_gt))
                 pytest.fail('Iteration %d, did not get expected gt for %s,copy_pam=%s,copy_worldfile=%s,copy_tabfile=%s' % (iteration, config_option_value, str(copy_pam), str(copy_worldfile), str(copy_tabfile)))
 
-            if (expected_srs == '' and srs_wkt != '') or (expected_srs != '' and srs_wkt.find(expected_srs) < 0):
+            if (expected_srs == '' and srs_wkt != '') or (expected_srs != '' and expected_srs not in srs_wkt):
                 print('Got ' + srs_wkt)
                 print('Expected ' + expected_srs)
                 pytest.fail('Iteration %d, did not get expected SRS for %s,copy_pam=%s,copy_worldfile=%s,copy_tabfile=%s' % (iteration, config_option_value, str(copy_pam), str(copy_worldfile), str(copy_tabfile)))
@@ -2291,7 +2291,7 @@ def test_tiff_read_inconsistent_georef():
                 print('Expected ' + str(expected_gt))
                 pytest.fail('Iteration %d, did not get expected gt for %s,copy_pam=%s,copy_worldfile=%s,copy_tabfile=%s' % (iteration, config_option_value, str(copy_pam), str(copy_worldfile), str(copy_tabfile)))
 
-            if (expected_srs == '' and srs_wkt != '') or (expected_srs != '' and srs_wkt.find(expected_srs) < 0):
+            if (expected_srs == '' and srs_wkt != '') or (expected_srs != '' and expected_srs not in srs_wkt):
                 print('Got ' + srs_wkt)
                 print('Expected ' + expected_srs)
                 pytest.fail('Iteration %d, did not get expected SRS for %s,copy_pam=%s,copy_worldfile=%s,copy_tabfile=%s' % (iteration, config_option_value, str(copy_pam), str(copy_worldfile), str(copy_tabfile)))
@@ -2339,7 +2339,7 @@ def test_tiff_read_gcp_internal_and_auxxml():
                 print('Expected ' + str(expected_gcp_count))
                 pytest.fail('Iteration %d, did not get expected gcp count for %s,copy_pam=%s' % (iteration, config_option_value, str(copy_pam)))
 
-            if (expected_srs == '' and srs_wkt != '') or (expected_srs != '' and srs_wkt.find(expected_srs) < 0):
+            if (expected_srs == '' and srs_wkt != '') or (expected_srs != '' and expected_srs not in srs_wkt):
                 print('Got ' + srs_wkt)
                 print('Expected ' + expected_srs)
                 pytest.fail('Iteration %d, did not get expected SRS for %s,copy_pam=%s' % (iteration, config_option_value, str(copy_pam)))
@@ -2355,7 +2355,7 @@ def __init__(self):
 
     def handler(self, eErrClass, err_no, msg):
         # pylint: disable=unused-argument
-        if msg.find('File open of') >= 0:
+        if 'File open of' in msg:
             self.msg = msg
 
 
diff --git a/autotest/gcore/tiff_srs.py b/autotest/gcore/tiff_srs.py
index b74f302bf6f9..6180338270ad 100755
--- a/autotest/gcore/tiff_srs.py
+++ b/autotest/gcore/tiff_srs.py
@@ -179,8 +179,8 @@ def test_tiff_srs_angular_units():
     ds = None
     ds = gdal.Open('/vsimem/tiff_srs_angular_units.tif')
     wkt = ds.GetProjectionRef()
-    assert (wkt.find('UNIT["arc-second",4.848136811095361e-06]') >= 0 or \
-       wkt.find('UNIT["arc-second",4.848136811095361e-006]') >= 0)
+    assert ('UNIT["arc-second",4.848136811095361e-06]' in wkt or \
+       'UNIT["arc-second",4.848136811095361e-006]' in wkt)
     ds = None
 
     ds = gdal.GetDriverByName('GTiff').Create('/vsimem/tiff_srs_angular_units.tif', 1, 1)
@@ -192,7 +192,7 @@ def test_tiff_srs_angular_units():
     ds = None
     ds = gdal.Open('/vsimem/tiff_srs_angular_units.tif')
     wkt = ds.GetProjectionRef()
-    assert wkt.find('UNIT["arc-minute",0.0002908882086657216]') >= 0
+    assert 'UNIT["arc-minute",0.0002908882086657216]' in wkt
     ds = None
 
     ds = gdal.GetDriverByName('GTiff').Create('/vsimem/tiff_srs_angular_units.tif', 1, 1)
@@ -204,7 +204,7 @@ def test_tiff_srs_angular_units():
     ds = None
     ds = gdal.Open('/vsimem/tiff_srs_angular_units.tif')
     wkt = ds.GetProjectionRef()
-    assert wkt.find('UNIT["grad",0.01570796326794897]') >= 0
+    assert 'UNIT["grad",0.01570796326794897]' in wkt
     ds = None
 
     ds = gdal.GetDriverByName('GTiff').Create('/vsimem/tiff_srs_angular_units.tif', 1, 1)
@@ -216,7 +216,7 @@ def test_tiff_srs_angular_units():
     ds = None
     ds = gdal.Open('/vsimem/tiff_srs_angular_units.tif')
     wkt = ds.GetProjectionRef()
-    assert wkt.find('UNIT["gon",0.01570796326794897]') >= 0
+    assert 'UNIT["gon",0.01570796326794897]' in wkt
     ds = None
 
     ds = gdal.GetDriverByName('GTiff').Create('/vsimem/tiff_srs_angular_units.tif', 1, 1)
@@ -228,7 +228,7 @@ def test_tiff_srs_angular_units():
     ds = None
     ds = gdal.Open('/vsimem/tiff_srs_angular_units.tif')
     wkt = ds.GetProjectionRef()
-    assert wkt.find('UNIT["radian",1]') >= 0
+    assert 'UNIT["radian",1]' in wkt
     ds = None
 
     ds = gdal.GetDriverByName('GTiff').Create('/vsimem/tiff_srs_angular_units.tif', 1, 1)
@@ -240,7 +240,7 @@ def test_tiff_srs_angular_units():
     ds = None
     ds = gdal.Open('/vsimem/tiff_srs_angular_units.tif')
     wkt = ds.GetProjectionRef()
-    assert wkt.find('UNIT["custom",1.23]') >= 0
+    assert 'UNIT["custom",1.23]' in wkt
     ds = None
 
     gdal.Unlink('/vsimem/tiff_srs_angular_units.tif')
@@ -277,13 +277,13 @@ def test_tiff_srs_epsg_2853_with_us_feet():
     ds = gdal.Open('data/epsg_2853_with_us_feet.tif')
     gdal.SetConfigOption('GTIFF_IMPORT_FROM_EPSG', old_val)
     wkt = ds.GetProjectionRef()
-    assert wkt.find('PARAMETER["false_easting",11482916.66') >= 0 and wkt.find('UNIT["us_survey_feet",0.3048006') >= 0 and wkt.find('2853') < 0
+    assert 'PARAMETER["false_easting",11482916.66' in wkt and 'UNIT["us_survey_feet",0.3048006' in wkt and '2853' not in wkt
 
     gdal.SetConfigOption('GTIFF_IMPORT_FROM_EPSG', 'NO')
     ds = gdal.Open('data/epsg_2853_with_us_feet.tif')
     gdal.SetConfigOption('GTIFF_IMPORT_FROM_EPSG', old_val)
     wkt = ds.GetProjectionRef()
-    assert wkt.find('PARAMETER["false_easting",11482916.66') >= 0 and wkt.find('UNIT["us_survey_feet",0.3048006') >= 0 and wkt.find('2853') < 0
+    assert 'PARAMETER["false_easting",11482916.66' in wkt and 'UNIT["us_survey_feet",0.3048006' in wkt and '2853' not in wkt
 
 ###############################################################################
 # Test reading a SRS with a PCSCitationGeoKey = "LUnits = ..."
@@ -324,7 +324,7 @@ def test_tiff_srs_projection_3856():
     wkt = ds.GetProjectionRef()
     ds = None
 
-    assert wkt.find('EXTENSION["PROJ4","+proj=merc +a=6378137 +b=6378137 +lat_ts=0.0 +lon_0=0.0 +x_0=0.0 +y_0=0 +k=1.0 +units=m +nadgrids=@null +wktext  +no_defs') >= 0
+    assert 'EXTENSION["PROJ4","+proj=merc +a=6378137 +b=6378137 +lat_ts=0.0 +lon_0=0.0 +x_0=0.0 +y_0=0 +k=1.0 +units=m +nadgrids=@null +wktext  +no_defs' in wkt
 
 ###############################################################################
 # Test reading a geotiff with a LOCAL_CS and a Imagine citation
@@ -349,7 +349,7 @@ def test_tiff_srs_towgs84_override():
     wkt = ds.GetProjectionRef()
     ds = None
 
-    assert wkt.find('TOWGS84[584.8,67,400.3,0.105,0.013,-2.378,10.29]') >= 0
+    assert 'TOWGS84[584.8,67,400.3,0.105,0.013,-2.378,10.29]' in wkt
 
 ###############################################################################
 # Test reading PCSCitationGeoKey (#7199)
@@ -361,7 +361,7 @@ def test_tiff_srs_pcscitation():
     wkt = ds.GetProjectionRef()
     ds = None
 
-    assert wkt.find('PROJCS["mycitation",') == 0
+    assert wkt.startswith('PROJCS["mycitation",')
 
 
 def _test_tiff_srs(sr, expect_fail):
diff --git a/autotest/gcore/tiff_write.py b/autotest/gcore/tiff_write.py
index 78b9225b7f3a..4bf0414cd734 100755
--- a/autotest/gcore/tiff_write.py
+++ b/autotest/gcore/tiff_write.py
@@ -3739,9 +3739,9 @@ def test_tiff_write_102():
 
     gdaltest.tiff_drv.Delete('/vsimem/tiff_write_102.tif')
 
-    assert wkt1.find('COMPD_CS') == 0, 'expected COMPD_CS, but got something else'
+    assert wkt1.startswith('COMPD_CS'), 'expected COMPD_CS, but got something else'
 
-    assert wkt2.find('COMPD_CS') != 0, 'got COMPD_CS, but did not expected it'
+    assert not wkt2.startswith('COMPD_CS'), 'got COMPD_CS, but did not expected it'
 
     sr2 = osr.SpatialReference()
     sr2.SetFromUserInput(wkt1)
@@ -5489,9 +5489,9 @@ def test_tiff_write_141():
     wkt = ds.GetProjectionRef()
     ds = None
 
-    assert wkt.find('PROJCS["WGS_1984_Web_Mercator_Auxiliary_Sphere"') == 0
+    assert wkt.startswith('PROJCS["WGS_1984_Web_Mercator_Auxiliary_Sphere"')
 
-    assert wkt.find('EXTENSION["PROJ4"') >= 0
+    assert 'EXTENSION["PROJ4"' in wkt
 
     gdaltest.tiff_drv.Delete('/vsimem/tiff_write_141.tif')
 
diff --git a/autotest/gcore/transformer.py b/autotest/gcore/transformer.py
index a7c43e5af579..162434a3b980 100755
--- a/autotest/gcore/transformer.py
+++ b/autotest/gcore/transformer.py
@@ -591,14 +591,14 @@ def test_transformer_14():
     if f is not None:
         content = gdal.VSIFReadL(1, 1000, f).decode('ASCII')
         gdal.VSIFCloseL(f)
-    assert content.find('Integer,Real,Real,Real,String,Real,Real') == 0
+    assert content.startswith('Integer,Real,Real,Real,String,Real,Real')
 
     f = gdal.VSIFOpenL('/vsimem/transformer_14.csv', 'rb')
     if f is not None:
         content = gdal.VSIFReadL(1, 1000, f).decode('ASCII')
         gdal.VSIFCloseL(f)
-    assert content.find("""iter,long,lat,height,WKT,error_pixel_x,error_pixel_y
-0,""") == 0
+    assert content.startswith("""iter,long,lat,height,WKT,error_pixel_x,error_pixel_y
+0,""")
 
     gdal.Unlink('/vsimem/transformer_14.csvt')
     gdal.Unlink('/vsimem/transformer_14.csv')
@@ -691,10 +691,10 @@ def test_transformer_16():
     if f is not None:
         content = gdal.VSIFReadL(1, 10000, f).decode('ASCII')
         gdal.VSIFCloseL(f)
-    assert (content.find('<MaxErrorForward>6.05</MaxErrorForward>') >= 0 and \
-       content.find('<MaxErrorReverse>0.1</MaxErrorReverse>') >= 0 and \
-       content.find('<MaxErrorForward>0.0001</MaxErrorForward>') >= 0 and \
-       content.find('<MaxErrorReverse>6.1</MaxErrorReverse>') >= 0)
+    assert ('<MaxErrorForward>6.05</MaxErrorForward>' in content and \
+       '<MaxErrorReverse>0.1</MaxErrorReverse>' in content and \
+       '<MaxErrorForward>0.0001</MaxErrorForward>' in content and \
+       '<MaxErrorReverse>6.1</MaxErrorReverse>' in content)
     ds = gdal.Translate('', '/vsimem/transformer_16.vrt', format='MEM')
     assert ds.GetRasterBand(1).Checksum() == 4727
     ds = None
diff --git a/autotest/gcore/vrt_read.py b/autotest/gcore/vrt_read.py
index 9bfb0d983e43..50deef22fa55 100755
--- a/autotest/gcore/vrt_read.py
+++ b/autotest/gcore/vrt_read.py
@@ -354,7 +354,7 @@ def test_vrt_read_10():
 
     assert vrt_hist == mem_hist
 
-    assert content.find('<Histograms>') >= 0
+    assert '<Histograms>' in content
 
     # Single source optimization
     for i in range(2):
@@ -378,7 +378,7 @@ def test_vrt_read_10():
         content = gdal.VSIFReadL(1, 10000, f).decode('ascii')
         gdal.VSIFCloseL(f)
 
-        assert content.find('<Histograms>') >= 0
+        assert '<Histograms>' in content
 
     # Two sources general case
     for i in range(2):
@@ -405,7 +405,7 @@ def test_vrt_read_10():
         content = gdal.VSIFReadL(1, 10000, f).decode('ascii')
         gdal.VSIFCloseL(f)
 
-        assert content.find('<Histograms>') >= 0
+        assert '<Histograms>' in content
 
     gdal.GetDriverByName('GTiff').Delete('/vsimem/vrt_read_10.tif')
     gdal.GetDriverByName('VRT').Delete('/vsimem/vrt_read_10.vrt')
@@ -685,7 +685,7 @@ def test_vrt_read_20():
   </VRTRasterBand>
 </VRTDataset>""")
     ret = gdaltest.runexternal(test_cli_utilities.get_gdalinfo_path() + ' -checksum tmp/byte2.vrt --config VRT_SHARED_SOURCE 0 --config GDAL_MAX_DATASET_POOL_SIZE 3')
-    assert ret.find('Checksum=4672') >= 0
+    assert 'Checksum=4672' in ret
 
     for f in ['tmp/byte.tif', 'tmp/byte1_1.vrt', 'tmp/byte1_2.vrt', 'tmp/byte1_3.vrt', 'tmp/byte2.vrt']:
         os.unlink(f)
@@ -1153,7 +1153,7 @@ def test_vrt_float32_with_nodata_slightly_below_float_min():
     gdal.Unlink('tmp/minfloat_nodata_slightly_out_of_float.vrt')
 
     # Check that the values were 'normalized' when regenerating the VRT
-    assert vrt_content.find('-3.402823466385289') < 0, \
+    assert '-3.402823466385289' not in vrt_content, \
         'did not get expected nodata in rewritten VRT'
 
     if nodata != -3.4028234663852886e+38:
diff --git a/autotest/gcore/vrtmisc.py b/autotest/gcore/vrtmisc.py
index e1f0f7b2d83b..51b1a3864856 100755
--- a/autotest/gcore/vrtmisc.py
+++ b/autotest/gcore/vrtmisc.py
@@ -250,7 +250,7 @@ def test_vrtmisc_11():
 
     gdal.Unlink("tmp/vrtmisc_11.vrt")
 
-    assert data.find('<SourceFilename relativeToVRT="1">../data/byte.tif</SourceFilename>') >= 0
+    assert '<SourceFilename relativeToVRT="1">../data/byte.tif</SourceFilename>' in data
 
 ###############################################################################
 # Test set/delete nodata
@@ -313,8 +313,8 @@ def test_vrtmisc_14():
     gdal.Unlink("/vsimem/vrtmisc_14_src.tif")
     gdal.Unlink("/vsimem/vrtmisc_14.vrt")
 
-    assert (content.find('<SrcRect xOff="0" yOff="0" xSize="123456789" ySize="1"') >= 0 and \
-       content.find('<DstRect xOff="0" yOff="0" xSize="123456789" ySize="1"') >= 0)
+    assert ('<SrcRect xOff="0" yOff="0" xSize="123456789" ySize="1"' in content and \
+       '<DstRect xOff="0" yOff="0" xSize="123456789" ySize="1"' in content)
 
     src_ds = gdal.GetDriverByName('GTiff').Create('/vsimem/vrtmisc_14_src.tif', 1, 123456789, options=['SPARSE_OK=YES', 'TILED=YES'])
     gdal.GetDriverByName('VRT').CreateCopy('/vsimem/vrtmisc_14.vrt', src_ds)
@@ -326,8 +326,8 @@ def test_vrtmisc_14():
     gdal.Unlink("/vsimem/vrtmisc_14_src.tif")
     gdal.Unlink("/vsimem/vrtmisc_14.vrt")
 
-    assert (content.find('<SrcRect xOff="0" yOff="0" xSize="1" ySize="123456789"') >= 0 and \
-       content.find('<DstRect xOff="0" yOff="0" xSize="1" ySize="123456789"') >= 0)
+    assert ('<SrcRect xOff="0" yOff="0" xSize="1" ySize="123456789"' in content and \
+       '<DstRect xOff="0" yOff="0" xSize="1" ySize="123456789"' in content)
 
 ###############################################################################
 # Test CreateCopy() preserve SIGNEDBYTE
@@ -352,10 +352,10 @@ def test_vrtmisc_16():
     content = gdal.VSIFReadL(1, 100000, fp).decode('latin1')
     gdal.VSIFCloseL(fp)
 
-    assert content.find('<SrcRect xOff="0" yOff="0" xSize="952" ySize="1189"') >= 0
-    assert content.find('<DstRect xOff="0" yOff="0" xSize="952" ySize="1189"') >= 0
-    assert content.find('<SrcRect xOff="0" yOff="0" xSize="494" ySize="893"') >= 0
-    assert content.find('<DstRect xOff="1680" yOff="5922" xSize="494" ySize="893"') >= 0
+    assert '<SrcRect xOff="0" yOff="0" xSize="952" ySize="1189"' in content
+    assert '<DstRect xOff="0" yOff="0" xSize="952" ySize="1189"' in content
+    assert '<SrcRect xOff="0" yOff="0" xSize="494" ySize="893"' in content
+    assert '<DstRect xOff="1680" yOff="5922" xSize="494" ySize="893"' in content
 
     gdal.GetDriverByName('GTiff').CreateCopy('/vsimem/vrtmisc_16.tif', gdal.Open('/vsimem/vrtmisc_16.vrt'))
     ds = gdal.Open('/vsimem/vrtmisc_16.tif')
@@ -405,7 +405,7 @@ def test_vrtmisc_17():
 
     gdal.Unlink('/vsimem/vrtmisc_17.vrt')
 
-    assert xml_vrt.find('xml:VRT') < 0
+    assert 'xml:VRT' not in xml_vrt
 
 ###############################################################################
 # Check GetMetadata('xml:VRT') behaviour on a in-memory VRT copied from a VRT
@@ -419,8 +419,8 @@ def test_vrtmisc_18():
     assert gdal.GetLastErrorMsg() == ''
     vrt_ds = None
 
-    assert (xml_vrt.find('<SourceFilename relativeToVRT="1">data/byte.tif</SourceFilename>') >= 0 or \
-       xml_vrt.find('<SourceFilename relativeToVRT="1">data\\byte.tif</SourceFilename>') >= 0)
+    assert ('<SourceFilename relativeToVRT="1">data/byte.tif</SourceFilename>' in xml_vrt or \
+       '<SourceFilename relativeToVRT="1">data\\byte.tif</SourceFilename>' in xml_vrt)
 
 ###############################################################################
 # Check RAT support
@@ -439,7 +439,7 @@ def test_vrtmisc_rat():
     assert gdal.GetLastErrorMsg() == ''
     vrt_ds = None
 
-    assert xml_vrt.find('<GDALRasterAttributeTable tableType="thematic">') >= 0
+    assert '<GDALRasterAttributeTable tableType="thematic">' in xml_vrt
 
     vrt_ds = gdal.Translate('/vsimem/vrtmisc_rat.vrt', ds, format='VRT', srcWin=[0, 0, 1, 1])
 
@@ -447,7 +447,7 @@ def test_vrtmisc_rat():
     assert gdal.GetLastErrorMsg() == ''
     vrt_ds = None
 
-    assert xml_vrt.find('<GDALRasterAttributeTable tableType="thematic">') >= 0
+    assert '<GDALRasterAttributeTable tableType="thematic">' in xml_vrt
 
     ds = None
 
diff --git a/autotest/gcore/vsiaz.py b/autotest/gcore/vsiaz.py
index 1f9499317a96..0601e0cdbd31 100755
--- a/autotest/gcore/vsiaz.py
+++ b/autotest/gcore/vsiaz.py
@@ -743,7 +743,7 @@ def test_vsiaz_fake_test_BlobEndpointInConnectionString():
                          'DefaultEndpointsProtocol=http;AccountName=myaccount;AccountKey=MY_ACCOUNT_KEY;BlobEndpoint=http://127.0.0.1:%d/myaccount' % gdaltest.webserver_port)
 
     signed_url = gdal.GetSignedURL('/vsiaz/az_fake_bucket/resource')
-    assert signed_url.find('http://127.0.0.1:%d/myaccount/az_fake_bucket/resource' % gdaltest.webserver_port) >= 0
+    assert 'http://127.0.0.1:%d/myaccount/az_fake_bucket/resource' % gdaltest.webserver_port in signed_url
 
 
 ###############################################################################
@@ -773,7 +773,7 @@ def test_vsiaz_extra_1():
     if az_resource is None:
         pytest.skip('Missing AZ_RESOURCE')
 
-    if az_resource.find('/') < 0:
+    if '/' not in az_resource:
         path = '/vsiaz/' + az_resource
         statres = gdal.VSIStatL(path)
         assert statres is not None and stat.S_ISDIR(statres.mode), \
diff --git a/autotest/gcore/vsicurl.py b/autotest/gcore/vsicurl.py
index a6abc7174194..a85b19a191ef 100755
--- a/autotest/gcore/vsicurl.py
+++ b/autotest/gcore/vsicurl.py
@@ -390,7 +390,7 @@ def test_vsicurl_test_retry():
         error_msg = gdal.GetLastErrorMsg()
         gdal.VSIFCloseL(f)
         assert data == 'foo'
-        assert error_msg.find('429') >= 0
+        assert '429' in error_msg
 
     
 ###############################################################################
diff --git a/autotest/gcore/vsigs.py b/autotest/gcore/vsigs.py
index e59b7fff022a..1aa54244159a 100755
--- a/autotest/gcore/vsigs.py
+++ b/autotest/gcore/vsigs.py
@@ -90,7 +90,7 @@ def test_vsigs_1():
         gdal.VSIFCloseL(f)
         pytest.fail()
     last_err = gdal.GetLastErrorMsg()
-    assert last_err.find('Cannot read') >= 0
+    assert 'Cannot read' in last_err
 
     # Invalid content for header file
     with gdaltest.config_option('GDAL_HTTP_HEADER_FILE', 'vsigs.py'):
@@ -1078,7 +1078,7 @@ def test_vsigs_extra_1():
     if gs_resource is None:
         pytest.skip('Missing GS_RESOURCE')
 
-    if gs_resource.find('/') < 0:
+    if '/' not in gs_resource:
         path = '/vsigs/' + gs_resource
         statres = gdal.VSIStatL(path)
         assert statres is not None and stat.S_ISDIR(statres.mode), \
diff --git a/autotest/gcore/vsioss.py b/autotest/gcore/vsioss.py
index 877bf2f13ec4..633c8329b569 100755
--- a/autotest/gcore/vsioss.py
+++ b/autotest/gcore/vsioss.py
@@ -1005,7 +1005,7 @@ def test_visoss_extra_1():
     elif OSS_RESOURCE is None:
         pytest.skip('Missing OSS_RESOURCE')
 
-    if OSS_RESOURCE.find('/') < 0:
+    if '/' not in OSS_RESOURCE:
         path = '/vsioss/' + OSS_RESOURCE
         statres = gdal.VSIStatL(path)
         assert statres is not None and stat.S_ISDIR(statres.mode), \
diff --git a/autotest/gcore/vsis3.py b/autotest/gcore/vsis3.py
index f10f39328122..4d72f4aaca24 100755
--- a/autotest/gcore/vsis3.py
+++ b/autotest/gcore/vsis3.py
@@ -2304,7 +2304,7 @@ def test_vsis3_extra_1():
     if s3_resource is None:
         pytest.skip('Missing S3_RESOURCE')
 
-    if s3_resource.find('/') < 0:
+    if '/' not in s3_resource:
         path = '/vsis3/' + s3_resource
         statres = gdal.VSIStatL(path)
         assert statres is not None and stat.S_ISDIR(statres.mode), \
diff --git a/autotest/gcore/vsiswift.py b/autotest/gcore/vsiswift.py
index 5cb0c55600a9..7871b3a164ac 100644
--- a/autotest/gcore/vsiswift.py
+++ b/autotest/gcore/vsiswift.py
@@ -606,7 +606,7 @@ def test_vsiswift_extra_1():
     if swift_resource is None:
         pytest.skip('Missing SWIFT_RESOURCE')
 
-    if swift_resource.find('/') < 0:
+    if '/' not in swift_resource:
         path = '/vsiswift/' + swift_resource
         statres = gdal.VSIStatL(path)
         assert statres is not None and stat.S_ISDIR(statres.mode), \
diff --git a/autotest/gdrivers/aaigrid.py b/autotest/gdrivers/aaigrid.py
index 8527940054a2..1f8af1a269bc 100755
--- a/autotest/gdrivers/aaigrid.py
+++ b/autotest/gdrivers/aaigrid.py
@@ -328,7 +328,7 @@ def test_aaigrid_14():
 
     gdal.GetDriverByName('AAIGRID').Delete('/vsimem/aaigrid_14.asc')
 
-    assert data.find('107.0 123') >= 0
+    assert '107.0 123' in data
 
 ###############################################################################
 # Test Float64 detection when nodata = DBL_MIN
diff --git a/autotest/gdrivers/bag.py b/autotest/gdrivers/bag.py
index 0b03b38ebf69..ecc8d4a3f942 100755
--- a/autotest/gdrivers/bag.py
+++ b/autotest/gdrivers/bag.py
@@ -89,7 +89,7 @@ def test_bag_2():
 
     # Test the xml:BAG metadata domain
     xmlBag = ds.GetMetadata('xml:BAG')[0]
-    assert xmlBag.find('<?xml') == 0, 'did not get xml:BAG metadata'
+    assert xmlBag.startswith('<?xml'), 'did not get xml:BAG metadata'
 
     ds = None
 
@@ -633,8 +633,8 @@ def test_bag_write_two_bands():
 
     ds = gdal.Open('/vsimem/out.bag')
     xml = ds.GetMetadata_List('xml:BAG')[0]
-    assert xml.find('<bar />') >= 0
-    assert xml.find('Generated by GDAL ') >= 0
+    assert '<bar />' in xml
+    assert 'Generated by GDAL ' in xml
 
     gdal.Unlink('/vsimem/out.bag')
 
diff --git a/autotest/gdrivers/ehdr.py b/autotest/gdrivers/ehdr.py
index ec9068bca114..6d43cffd0b92 100755
--- a/autotest/gdrivers/ehdr.py
+++ b/autotest/gdrivers/ehdr.py
@@ -180,7 +180,7 @@ def test_ehdr_9():
     assert ds.GetRasterBand(1).GetMinimum() == -191, 'wrong minimum value'
 
     wkt = ds.GetProjectionRef()
-    assert wkt.find('GEOGCS["WGS 84') == 0, 'wrong projection'
+    assert wkt.startswith('GEOGCS["WGS 84'), 'wrong projection'
 
     ds = None
 
diff --git a/autotest/gdrivers/ers.py b/autotest/gdrivers/ers.py
index 2ec2d6e806e5..d3f2b1b2c382 100755
--- a/autotest/gdrivers/ers.py
+++ b/autotest/gdrivers/ers.py
@@ -251,7 +251,7 @@ def test_ers_10():
         ('GetMetadata() not consistent with '
                              'GetMetadataItem()')
 
-    assert wkt.find("""PROJCS["MGA55""") == 0, 'did not get expected projection'
+    assert wkt.startswith("""PROJCS["MGA55"""), 'did not get expected projection'
 
     ds = drv.Create('/vsimem/ers_10.ers', 1, 1, options=['DATUM=GDA94', 'PROJ=MGA55', 'UNITS=FEET'])
     ds = None
diff --git a/autotest/gdrivers/gdalhttp.py b/autotest/gdrivers/gdalhttp.py
index 40c496dcd5d1..4d078e2e0e96 100755
--- a/autotest/gdrivers/gdalhttp.py
+++ b/autotest/gdrivers/gdalhttp.py
@@ -239,7 +239,7 @@ def test_http_ssl_verifystatus():
             # For now this URL doesn't support OCSP stapling...
             gdal.OpenEx('https://google.com', allowed_drivers=['HTTP'])
     last_err = gdal.GetLastErrorMsg()
-    if last_err.find('No OCSP response received') < 0 and last_err.find('libcurl too old') < 0:
+    if 'No OCSP response received' not in last_err and 'libcurl too old' not in last_err:
 
         # The test actually works on Travis Mac
         if sys.platform == 'darwin' and gdal.GetConfigOption('TRAVIS', None) is not None:
diff --git a/autotest/gdrivers/gpkg.py b/autotest/gdrivers/gpkg.py
index 721bc05d8ca0..d82e4c2818b6 100755
--- a/autotest/gdrivers/gpkg.py
+++ b/autotest/gdrivers/gpkg.py
@@ -3109,7 +3109,7 @@ def test_gpkg_delete_raster_layer():
     content = gdal.VSIFReadL(1, 1000000, f).decode('latin1')
     gdal.VSIFCloseL(f)
 
-    assert content.find('foo') < 0
+    assert 'foo' not in content
 
     gdal.Unlink(filename)
 
@@ -3135,7 +3135,7 @@ def test_gpkg_delete_gridded_coverage_raster_layer():
     content = gdal.VSIFReadL(1, 1000000, f).decode('latin1')
     gdal.VSIFCloseL(f)
 
-    assert content.find('foo') < 0
+    assert 'foo' not in content
 
     gdal.Unlink(filename)
 
@@ -3164,10 +3164,10 @@ def test_gpkg_GeneralCmdLineProcessor():
     if test_cli_utilities.get_gdalinfo_path() is not None and test_cli_utilities.get_ogrinfo_path() is not None:
         ret_gdalinfo = gdaltest.runexternal(test_cli_utilities.get_gdalinfo_path() + ' --format GPKG')
         ret_ogrinfo = gdaltest.runexternal(test_cli_utilities.get_ogrinfo_path() + ' --format GPKG')
-        assert (ret_gdalinfo.find('<CreationOptionList>') >= 0 and \
-           ret_ogrinfo.find('<CreationOptionList>') >= 0 and \
-           ret_gdalinfo.find('scope=') < 0 and \
-           ret_ogrinfo.find('scope=') < 0)
+        assert ('<CreationOptionList>' in ret_gdalinfo and \
+           '<CreationOptionList>' in ret_ogrinfo and \
+           'scope=' not in ret_gdalinfo and \
+           'scope=' not in ret_ogrinfo)
 
     
 ###############################################################################
diff --git a/autotest/gdrivers/grib.py b/autotest/gdrivers/grib.py
index 6873bfe42b6f..3daa4ac7de2b 100755
--- a/autotest/gdrivers/grib.py
+++ b/autotest/gdrivers/grib.py
@@ -205,7 +205,7 @@ def test_grib_grib2_read_template_4_15():
     ret, err = gdaltest.runexternal_out_and_err(test_cli_utilities.get_gdalinfo_path() + ' data/grib/template_4_15.grb2 -checksum')
 
     # This is a JPEG2000 compressed file, so just check we can open it or that we get a message saying there's no JPEG2000 driver available
-    assert ret.find('Checksum=') >= 0 or err.find('Is the JPEG2000 driver available?') >= 0, \
+    assert 'Checksum=' in ret or 'Is the JPEG2000 driver available?' in err, \
         'Could not open file'
 
 ###############################################################################
@@ -765,7 +765,7 @@ def test_grib_grib2_write_projections():
     wkt = out_ds.GetProjectionRef()
     out_ds = None
     gdal.Unlink(tmpfilename)
-    assert wkt.find('SPHEROID["GRS80",6378137,298.257222101]') >= 0
+    assert 'SPHEROID["GRS80",6378137,298.257222101]' in wkt
 
     # Test writing Mercator_1SP with scale != 1 (will be read as Mercator_2SP)
     src_ds = gdal.Warp('', 'data/byte.tif', format='MEM', dstSRS="""PROJCS["unnamed",
diff --git a/autotest/gdrivers/hdf5.py b/autotest/gdrivers/hdf5.py
index e7b9dc289ef9..4f60e426d6ab 100755
--- a/autotest/gdrivers/hdf5.py
+++ b/autotest/gdrivers/hdf5.py
@@ -267,7 +267,7 @@ def test_hdf5_10():
 
     ds = gdal.Open('HDF5:"data/CSK_DGM.h5"://S01/SBI')
     got_gcpprojection = ds.GetGCPProjection()
-    assert got_gcpprojection.find('GEOGCS["WGS 84",DATUM["WGS_1984"') == 0
+    assert got_gcpprojection.startswith('GEOGCS["WGS 84",DATUM["WGS_1984"')
 
     got_gcps = ds.GetGCPs()
     assert len(got_gcps) == 4
@@ -292,7 +292,7 @@ def test_hdf5_11():
 
     ds = gdal.Open('HDF5:"data/CSK_GEC.h5"://S01/SBI')
     got_projection = ds.GetProjection()
-    assert got_projection.find('PROJCS["Transverse_Mercator",GEOGCS["WGS 84",DATUM["WGS_1984"') == 0
+    assert got_projection.startswith('PROJCS["Transverse_Mercator",GEOGCS["WGS 84",DATUM["WGS_1984"')
 
     got_gt = ds.GetGeoTransform()
     expected_gt = (275592.5, 2.5, 0.0, 4998152.5, 0.0, -2.5)
@@ -314,7 +314,7 @@ def test_hdf5_12():
 
     ds = gdal.Open('tmp/cache/norsa.ss.ppi-00.5-dbz.aeqd-1000.20070601T000039Z.hdf')
     got_projection = ds.GetProjection()
-    assert got_projection.find('Azimuthal_Equidistant') >= 0
+    assert 'Azimuthal_Equidistant' in got_projection
 
     got_gt = ds.GetGeoTransform()
     expected_gt = (-240890.02470187756, 1001.7181388478905, 0.0, 239638.21326987055, 0.0, -1000.3790932482976)
diff --git a/autotest/gdrivers/isis.py b/autotest/gdrivers/isis.py
index e9650ac1243b..a762a38c4afd 100755
--- a/autotest/gdrivers/isis.py
+++ b/autotest/gdrivers/isis.py
@@ -122,8 +122,8 @@ def test_isis_4():
     assert ds.GetMetadataDomainList() == ['', 'json:ISIS3']
     lbl = ds.GetMetadata_List('json:ISIS3')[0]
     # Couldn't be preserved, since points to dangling file
-    assert lbl.find('OriginalLabel') < 0
-    assert lbl.find('PositiveWest') < 0
+    assert 'OriginalLabel' not in lbl
+    assert 'PositiveWest' not in lbl
     assert ds.GetRasterBand(1).GetMaskFlags() == 0
     assert ds.GetRasterBand(1).GetMaskBand().Checksum() == 12220
     ds = None
@@ -136,8 +136,8 @@ def test_isis_4():
                              delete_copy=0)
     ds = gdal.Open('/vsimem/isis_tmp.lbl')
     lbl = ds.GetMetadata_List('json:ISIS3')[0]
-    assert lbl.find('PositiveWest') >= 0
-    assert lbl.find('Planetographic') >= 0
+    assert 'PositiveWest' in lbl
+    assert 'Planetographic' in lbl
     ds = None
     gdal.GetDriverByName('ISIS3').Delete('/vsimem/isis_tmp.lbl')
 
@@ -151,9 +151,9 @@ def test_isis_4():
                              delete_copy=0)
     ds = gdal.Open('/vsimem/isis_tmp.lbl')
     lbl = ds.GetMetadata_List('json:ISIS3')[0]
-    assert lbl.find('PositiveEast') >= 0
-    assert lbl.find('Planetocentric') >= 0
-    assert lbl.find('my_label') >= 0
+    assert 'PositiveEast' in lbl
+    assert 'Planetocentric' in lbl
+    assert 'my_label' in lbl
     ds = None
     gdal.GetDriverByName('ISIS3').Delete('/vsimem/isis_tmp.lbl')
 
@@ -170,7 +170,7 @@ def test_isis_5():
     assert gdal.VSIStatL('/vsimem/isis_tmp.cub') is None
     ds = gdal.Open('/vsimem/isis_tmp.lbl')
     lbl = ds.GetMetadata_List('json:ISIS3')[0]
-    assert lbl.find('MinimumLongitude') < 0
+    assert 'MinimumLongitude' not in lbl
     ds = None
     gdal.GetDriverByName('ISIS3').Delete('/vsimem/isis_tmp.lbl')
 
@@ -189,7 +189,7 @@ def test_isis_6():
     f = gdal.VSIFOpenL('/vsimem/isis_tmp.lbl', 'rb')
     content = gdal.VSIFReadL(1, 10000, f).decode('ASCII')
     gdal.VSIFCloseL(f)
-    assert content.find('#my comment') >= 0
+    assert '#my comment' in content
     assert len(content) != 10000
     ds = gdal.Open('/vsimem/isis_tmp.lbl', gdal.GA_Update)
     ds.GetRasterBand(1).Fill(0)
@@ -212,7 +212,7 @@ def test_isis_7():
     assert gdal.VSIStatL('/vsimem/isis_tmp.tif') is not None
     ds = gdal.Open('/vsimem/isis_tmp.lbl')
     lbl = ds.GetMetadata_List('json:ISIS3')[0]
-    assert lbl.find('"Format":"BandSequential"') >= 0
+    assert '"Format":"BandSequential"' in lbl
     ds = None
     gdal.GetDriverByName('ISIS3').Delete('/vsimem/isis_tmp.lbl')
 
@@ -226,7 +226,7 @@ def test_isis_7():
     assert gdal.VSIStatL('/vsimem/isis_tmp.tif') is not None
     ds = gdal.Open('/vsimem/isis_tmp.lbl')
     lbl = ds.GetMetadata_List('json:ISIS3')[0]
-    assert lbl.find('"Format":"GeoTIFF"') >= 0
+    assert '"Format":"GeoTIFF"' in lbl
     ds = None
     gdal.GetDriverByName('ISIS3').Delete('/vsimem/isis_tmp.lbl')
 
@@ -244,7 +244,7 @@ def test_isis_8():
     assert gdal.VSIStatL('/vsimem/isis_tmp.tif') is not None
     ds = gdal.Open('/vsimem/isis_tmp.lbl')
     lbl = ds.GetMetadata_List('json:ISIS3')[0]
-    assert lbl.find('"Format":"GeoTIFF"') >= 0
+    assert '"Format":"GeoTIFF"' in lbl
     ds = None
     ds = gdal.Open('/vsimem/isis_tmp.lbl', gdal.GA_Update)
     ds.GetRasterBand(1).Fill(0)
@@ -269,8 +269,8 @@ def test_isis_9():
     assert gdal.VSIStatL('/vsimem/foo.bin') is not None
     ds = gdal.Open('/vsimem/isis_tmp.lbl')
     lbl = ds.GetMetadata_List('json:ISIS3')[0]
-    assert (lbl.find('"Format":"Tile"') >= 0 and lbl.find('"TileSamples":256') >= 0 and \
-       lbl.find('"TileLines":256') >= 0)
+    assert ('"Format":"Tile"' in lbl and '"TileSamples":256' in lbl and \
+       '"TileLines":256' in lbl)
     ds = None
     gdal.GetDriverByName('ISIS3').Delete('/vsimem/isis_tmp.lbl')
     assert gdal.VSIStatL('/vsimem/foo.bin') is None
@@ -534,12 +534,12 @@ def test_isis_18():
     ds = None
     ds = gdal.Open('/vsimem/isis_tmp.lbl')
     lbl = ds.GetMetadata_List('json:ISIS3')[0]
-    assert lbl.find('"TargetName":"my_target"') >= 0
-    assert lbl.find('"LatitudeType":"Planetographic"') >= 0
-    assert lbl.find('"MinimumLatitude":2.5') >= 0
-    assert lbl.find('"MinimumLongitude":1.5') >= 0
-    assert lbl.find('"MaximumLatitude":4.5') >= 0
-    assert lbl.find('"MaximumLongitude":3.5') >= 0
+    assert '"TargetName":"my_target"' in lbl
+    assert '"LatitudeType":"Planetographic"' in lbl
+    assert '"MinimumLatitude":2.5' in lbl
+    assert '"MinimumLongitude":1.5' in lbl
+    assert '"MaximumLatitude":4.5' in lbl
+    assert '"MaximumLongitude":3.5' in lbl
     ds = None
 
     sr = osr.SpatialReference()
@@ -551,12 +551,12 @@ def test_isis_18():
     ds = None
     ds = gdal.Open('/vsimem/isis_tmp.lbl')
     lbl = ds.GetMetadata_List('json:ISIS3')[0]
-    assert lbl.find('"LongitudeDirection":"PositiveWest"') >= 0
-    assert lbl.find('"LongitudeDomain":180') >= 0
-    assert lbl.find('"MinimumLatitude":-60') >= 0
-    assert lbl.find('"MinimumLongitude":-110') >= 0
-    assert lbl.find('"MaximumLatitude":40') >= 0
-    assert lbl.find('"MaximumLongitude":-10') >= 0
+    assert '"LongitudeDirection":"PositiveWest"' in lbl
+    assert '"LongitudeDomain":180' in lbl
+    assert '"MinimumLatitude":-60' in lbl
+    assert '"MinimumLongitude":-110' in lbl
+    assert '"MaximumLatitude":40' in lbl
+    assert '"MaximumLongitude":-10' in lbl
     ds = None
 
     sr = osr.SpatialReference()
@@ -568,12 +568,12 @@ def test_isis_18():
     ds = None
     ds = gdal.Open('/vsimem/isis_tmp.lbl')
     lbl = ds.GetMetadata_List('json:ISIS3')[0]
-    assert lbl.find('"MinimumLatitude":-60') >= 0
-    assert lbl.find('"MinimumLongitude":90') >= 0
-    assert lbl.find('"MaximumLatitude":40') >= 0
-    assert lbl.find('"MaximumLongitude":350') >= 0
-    assert lbl.find('"UpperLeftCornerX":-21547') >= 0
-    assert lbl.find('"UpperLeftCornerY":86188') >= 0
+    assert '"MinimumLatitude":-60' in lbl
+    assert '"MinimumLongitude":90' in lbl
+    assert '"MaximumLatitude":40' in lbl
+    assert '"MaximumLongitude":350' in lbl
+    assert '"UpperLeftCornerX":-21547' in lbl
+    assert '"UpperLeftCornerY":86188' in lbl
     ds = None
 
     gdal.GetDriverByName('ISIS3').Delete('/vsimem/isis_tmp.lbl')
@@ -589,7 +589,7 @@ def test_isis_19():
 
     ds = gdal.Open('data/isis3_detached.lbl')
     res = gdal.Info(ds, extraMDDomains=['json:ISIS3'])
-    assert res.find('IsisCube') >= 0
+    assert 'IsisCube' in res
 
 # Test gdal.Translate() subsetting and label preservation
 
@@ -601,7 +601,7 @@ def test_isis_20():
                        format='ISIS3', srcWin=[0, 0, 1, 1])
     ds = gdal.Open('/vsimem/isis_tmp.lbl')
     lbl = ds.GetMetadata_List('json:ISIS3')[0]
-    assert lbl.find('AMadeUpValue') >= 0
+    assert 'AMadeUpValue' in lbl
     ds = None
     gdal.GetDriverByName('ISIS3').Delete('/vsimem/isis_tmp.lbl')
 
@@ -616,7 +616,7 @@ def test_isis_21():
     ds = gdal.Open('/vsimem/isis_tmp.lbl')
     assert ds.GetRasterBand(1).Checksum() == 9978
     lbl = ds.GetMetadata_List('json:ISIS3')[0]
-    assert lbl.find('AMadeUpValue') >= 0
+    assert 'AMadeUpValue' in lbl
     ds = None
     gdal.GetDriverByName('ISIS3').Delete('/vsimem/isis_tmp.lbl')
 
@@ -678,23 +678,23 @@ def test_isis_22():
     content = gdal.VSIFReadL(1, 10000, f).decode('ASCII')
     gdal.VSIFCloseL(f)
 
-    assert (content.find('foo       = bar') >= 0 and \
-       content.find('  bar       = (123, 124.0, 2.5, xyz') >= 0 and \
-       content.find('               anotherveeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeee-') >= 0 and \
-       content.find('               eeeeeeeeeeeeeeeeeeeeeeeerylooooongtext, 234, 456, 789, 234, 567,') >= 0 and \
-       content.find('               890, 123456789.0, 123456789.0, 123456789.0, 123456789.0,') >= 0 and \
-       content.find('               123456789.0)') >= 0 and \
-       content.find('baz       = 5 <M>') >= 0 and \
-       content.find('baw       = "with space"') >= 0 and \
-       content.find('very_long = aveeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeee-') >= 0)
+    assert ('foo       = bar' in content and \
+       '  bar       = (123, 124.0, 2.5, xyz' in content and \
+       '               anotherveeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeee-' in content and \
+       '               eeeeeeeeeeeeeeeeeeeeeeeerylooooongtext, 234, 456, 789, 234, 567,' in content and \
+       '               890, 123456789.0, 123456789.0, 123456789.0, 123456789.0,' in content and \
+       '               123456789.0)' in content and \
+       'baz       = 5 <M>' in content and \
+       'baw       = "with space"' in content and \
+       'very_long = aveeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeee-' in content)
 
     ds = gdal.Open('/vsimem/isis_tmp.lbl')
     lbl = ds.GetMetadata_List('json:ISIS3')[0]
-    assert (lbl.find('"foo":"bar"') >= 0 and lbl.find('123') >= 0 and \
-       lbl.find('2.5') >= 0 and lbl.find('xyz') >= 0 and \
-       lbl.find('"value":5') >= 0 and lbl.find('"unit":"M"') >= 0 and \
-       lbl.find('"baw":"with space"') >= 0 and \
-       lbl.find('"very_long":"aveeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeerylooooongtext"') >= 0)
+    assert ('"foo":"bar"' in lbl and '123' in lbl and \
+       '2.5' in lbl and 'xyz' in lbl and \
+       '"value":5' in lbl and '"unit":"M"' in lbl and \
+       '"baw":"with space"' in lbl and \
+       '"very_long":"aveeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeerylooooongtext"' in lbl)
     ds = None
     gdal.GetDriverByName('ISIS3').Delete('/vsimem/isis_tmp.lbl')
 
@@ -1144,8 +1144,7 @@ def test_isis_26():
     content = gdal.VSIFReadL(1, 10000, f).decode('ASCII')
     gdal.VSIFCloseL(f)
 
-    assert (content.find(
-        """Object = Table
+    assert ("""Object = Table
   Name = first_table
 End_Object
 
@@ -1164,7 +1163,7 @@ def test_isis_26():
 Object = foo
   x = C
 End_Object
-""") >= 0)
+""" in content)
 
     gdal.Unlink('/vsimem/in.lbl')
     gdal.GetDriverByName('ISIS3').Delete('/vsimem/out.lbl')
@@ -1216,10 +1215,10 @@ def test_isis_27():
                     pytest.fail(dst_location)
                 history = content[offset:]
 
-            if history.find('Object = ') != 0 or \
-                    history.find('FROM = out.lbl') < 0 or \
-                    history.find('TO   = out2.lbl') < 0 or \
-                    history.find('TO = out.lbl') < 0:
+            if not history.startswith('Object = ') or \
+                    'FROM = out.lbl' not in history or \
+                    'TO   = out2.lbl' not in history or \
+                    'TO = out.lbl' not in history:
                 print(src_location)
                 print(dst_location)
                 pytest.fail(content)
@@ -1235,7 +1234,7 @@ def test_isis_27():
     if f is not None:
         content = gdal.VSIFReadL(1, 10000, f).decode('ASCII')
         gdal.VSIFCloseL(f)
-    assert content.find('foo') >= 0
+    assert 'foo' in content
     gdal.GetDriverByName('ISIS3').Delete('/vsimem/out.lbl')
 
 # Test preservation of non-pixel sections
diff --git a/autotest/gdrivers/jp2lura.py b/autotest/gdrivers/jp2lura.py
index da332d9ea5a9..c31881a2ae1d 100755
--- a/autotest/gdrivers/jp2lura.py
+++ b/autotest/gdrivers/jp2lura.py
@@ -418,7 +418,7 @@ def test_jp2lura_12():
 
     gdaltest.jp2lura_drv.Delete('tmp/jp2lura_12.jp2')
 
-    assert wkt.find('32631') >= 0
+    assert '32631' in wkt
 
     # Override geotransform
     shutil.copy('data/byte.jp2', 'tmp/jp2lura_12.jp2')
@@ -458,7 +458,7 @@ def test_jp2lura_13():
     wkt = ds.GetGCPProjection()
     assert count == 4
     assert len(gcps) == 4
-    assert wkt.find('4326') >= 0
+    assert '4326' in wkt
     ds = None
 
     # Override GCP
@@ -479,7 +479,7 @@ def test_jp2lura_13():
 
     assert count == 1
     assert len(gcps) == 1
-    assert wkt.find('32631') >= 0
+    assert '32631' in wkt
 
 ###############################################################################
 # Check that we get GCPs even there's no projection info
@@ -1749,7 +1749,7 @@ def test_jp2lura_49():
             print('Expected ' + str(expected_gt))
             pytest.fail('Did not get expected gt for %s,copy_pam=%s,copy_worldfile=%s' % (config_option_value, str(copy_pam), str(copy_worldfile)))
 
-        if (expected_srs == '' and srs_wkt != '') or (expected_srs != '' and srs_wkt.find(expected_srs) < 0):
+        if (expected_srs == '' and srs_wkt != '') or (expected_srs != '' and expected_srs not in srs_wkt):
             print('Got ' + srs_wkt)
             print('Expected ' + expected_srs)
             pytest.fail('Did not get expected SRS for %s,copy_pam=%s,copy_worldfile=%s' % (config_option_value, str(copy_pam), str(copy_worldfile)))
@@ -1804,7 +1804,7 @@ def test_jp2lura_49():
             print('Expected ' + str(expected_gt))
             pytest.fail('Did not get expected gt for %s,copy_pam=%s,copy_worldfile=%s' % (config_option_value, str(copy_pam), str(copy_worldfile)))
 
-        if (expected_srs == '' and srs_wkt != '') or (expected_srs != '' and srs_wkt.find(expected_srs) < 0):
+        if (expected_srs == '' and srs_wkt != '') or (expected_srs != '' and expected_srs not in srs_wkt):
             print('Got ' + srs_wkt)
             print('Expected ' + expected_srs)
             pytest.fail('Did not get expected SRS for %s,copy_pam=%s,copy_worldfile=%s' % (config_option_value, str(copy_pam), str(copy_worldfile)))
diff --git a/autotest/gdrivers/jp2metadata.py b/autotest/gdrivers/jp2metadata.py
index c8008ef6af6b..88cd1ddd41aa 100755
--- a/autotest/gdrivers/jp2metadata.py
+++ b/autotest/gdrivers/jp2metadata.py
@@ -47,7 +47,7 @@ def test_jp2metadata_1():
 
     wkt = ds.GetProjectionRef()
     gt = ds.GetGeoTransform()
-    assert wkt.find('PROJCS["ETRS89') == 0
+    assert wkt.startswith('PROJCS["ETRS89')
     expected_gt = (356000.0, 0.5, 0.0, 7596000.0, 0.0, -0.5)
     for i in range(6):
         assert abs(gt[i] - expected_gt[i]) <= 1e-5
diff --git a/autotest/gdrivers/jp2openjpeg.py b/autotest/gdrivers/jp2openjpeg.py
index 278ec548802e..de6cfde3f1ea 100755
--- a/autotest/gdrivers/jp2openjpeg.py
+++ b/autotest/gdrivers/jp2openjpeg.py
@@ -332,7 +332,7 @@ def test_jp2openjpeg_12():
 
     gdaltest.jp2openjpeg_drv.Delete('tmp/jp2openjpeg_12.jp2')
 
-    assert wkt.find('32631') >= 0
+    assert '32631' in wkt
 
     # Override geotransform
     shutil.copy('data/byte.jp2', 'tmp/jp2openjpeg_12.jp2')
@@ -372,7 +372,7 @@ def test_jp2openjpeg_13():
     wkt = ds.GetGCPProjection()
     assert count == 4
     assert len(gcps) == 4
-    assert wkt.find('4326') >= 0
+    assert '4326' in wkt
     ds = None
 
     # Override GCP
@@ -393,7 +393,7 @@ def test_jp2openjpeg_13():
 
     assert count == 1
     assert len(gcps) == 1
-    assert wkt.find('32631') >= 0
+    assert '32631' in wkt
 
 ###############################################################################
 # Check that we get GCPs even there's no projection info
@@ -1945,8 +1945,8 @@ def test_jp2openjpeg_45():
     del out_ds
     ds = gdal.Open('/vsimem/jp2openjpeg_45.jp2')
     gmljp2 = ds.GetMetadata_List("xml:gml.root-instance")[0]
-    assert gmljp2.find('some_gml_id') >= 0
-    assert gmljp2.find('urn:ogc:def:crs:EPSG::26711') >= 0
+    assert 'some_gml_id' in gmljp2
+    assert 'urn:ogc:def:crs:EPSG::26711' in gmljp2
     ds = None
     gdal.Unlink('/vsimem/jp2openjpeg_45.jp2')
 
@@ -1958,7 +1958,7 @@ def test_jp2openjpeg_45():
         del out_ds
         ds = gdal.Open('/vsimem/jp2openjpeg_45.jp2')
         gmljp2 = ds.GetMetadata_List("xml:gml.root-instance")[0]
-        assert gmljp2.find(predefined[1]) >= 0
+        assert predefined[1] in gmljp2
         ds = None
         gdal.Unlink('/vsimem/jp2openjpeg_45.jp2')
 
@@ -1970,7 +1970,7 @@ def test_jp2openjpeg_45():
     del out_ds
     ds = gdal.Open('/vsimem/jp2openjpeg_45.jp2')
     gmljp2 = ds.GetMetadata_List("xml:gml.root-instance")[0]
-    assert gmljp2.find('<gmlcov:rangeType></gmlcov:rangeType>') >= 0
+    assert '<gmlcov:rangeType></gmlcov:rangeType>' in gmljp2
     ds = None
     gdal.Unlink('/vsimem/jp2openjpeg_45.jp2')
 
@@ -1990,7 +1990,7 @@ def test_jp2openjpeg_45():
     del out_ds
     ds = gdal.Open('/vsimem/jp2openjpeg_45.jp2')
     gmljp2 = ds.GetMetadata_List("xml:gml.root-instance")[0]
-    assert gmljp2.find("custom_datarecord") >= 0, predefined[0]
+    assert "custom_datarecord" in gmljp2, predefined[0]
     ds = None
     gdal.Unlink('/vsimem/jp2openjpeg_45.jp2')
 
@@ -2365,7 +2365,7 @@ def test_jp2openjpeg_45():
 
     ds = gdal.Open('/vsimem/jp2openjpeg_45.jp2')
     gmljp2 = ds.GetMetadata_List("xml:gml.root-instance")[0]
-    assert gmljp2.find('my_GMLJP2RectifiedGridCoverage') >= 0
+    assert 'my_GMLJP2RectifiedGridCoverage' in gmljp2
     first_metadata_pos = gmljp2.find("First metadata")
     second_metadata_pos = gmljp2.find("Second metadata")
     third_metadata_pos = gmljp2.find("Third metadata")
@@ -2416,26 +2416,26 @@ def test_jp2openjpeg_45():
     # print(gmljp2)
 
     myshape_gml = ds.GetMetadata_List("xml:myshape.gml")[0]
-    assert myshape_gml.find("""<ogr1:FeatureCollection gml:id="ID_GMLJP2_0_1_aFeatureCollection" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://ogr.maptools.org/1 gmljp2://xml/myshape.xsd" xmlns:ogr1="http://ogr.maptools.org/1" xmlns:gml="http://www.opengis.net/gml/3.2">""") >= 0
-    assert myshape_gml.find("""http://www.opengis.net/def/crs/EPSG/0/4326""") >= 0
+    assert """<ogr1:FeatureCollection gml:id="ID_GMLJP2_0_1_aFeatureCollection" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://ogr.maptools.org/1 gmljp2://xml/myshape.xsd" xmlns:ogr1="http://ogr.maptools.org/1" xmlns:gml="http://www.opengis.net/gml/3.2">""" in myshape_gml
+    assert """http://www.opengis.net/def/crs/EPSG/0/4326""" in myshape_gml
 
     myshape_xsd = ds.GetMetadata_List("xml:myshape.xsd")[0]
-    assert myshape_xsd.find("""<xs:schema targetNamespace="http://ogr.maptools.org/1" xmlns:ogr1="http://ogr.maptools.org/1" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:gml="http://www.opengis.net/gml/3.2" xmlns:gmlsf="http://www.opengis.net/gmlsf/2.0" elementFormDefault="qualified" version="1.0">""") >= 0
+    assert """<xs:schema targetNamespace="http://ogr.maptools.org/1" xmlns:ogr1="http://ogr.maptools.org/1" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:gml="http://www.opengis.net/gml/3.2" xmlns:gmlsf="http://www.opengis.net/gmlsf/2.0" elementFormDefault="qualified" version="1.0">""" in myshape_xsd
 
     myshape2_gml = ds.GetMetadata_List("xml:myshape2.gml")[0]
-    assert myshape2_gml.find("""<ogr2:FeatureCollection gml:id="ID_GMLJP2_0_2_aFeatureCollection" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://ogr.maptools.org/ gmljp2://xml/a_schema.xsd" xmlns:ogr2="http://ogr.maptools.org/" xmlns:gml="http://www.opengis.net/gml/3.2">""") >= 0
+    assert """<ogr2:FeatureCollection gml:id="ID_GMLJP2_0_2_aFeatureCollection" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://ogr.maptools.org/ gmljp2://xml/a_schema.xsd" xmlns:ogr2="http://ogr.maptools.org/" xmlns:gml="http://www.opengis.net/gml/3.2">""" in myshape2_gml
 
     feature2_gml = ds.GetMetadata_List("xml:feature2.gml")[0]
-    assert feature2_gml.find("""<FeatureCollection xmlns:ogr="http://ogr.maptools.org/" xmlns:gml="http://www.opengis.net/gml/3.2" xsi:schemaLocation="http://ogr.maptools.org/ gmljp2://xml/a_schema.xsd" gml:id="ID_GMLJP2_0_3_myFC3">""") >= 0
+    assert """<FeatureCollection xmlns:ogr="http://ogr.maptools.org/" xmlns:gml="http://www.opengis.net/gml/3.2" xsi:schemaLocation="http://ogr.maptools.org/ gmljp2://xml/a_schema.xsd" gml:id="ID_GMLJP2_0_3_myFC3">""" in feature2_gml
 
     feature3_gml = ds.GetMetadata_List("xml:feature3.gml")[0]
-    assert feature3_gml.find("""<FeatureCollection xmlns:ogr="http://ogr.maptools.org/" xmlns:gml="http://www.opengis.net/gml/3.2" xsi:schemaLocation="http://www.opengis.net/gml/3.2 http://schemas.opengis.net/gml/3.2.1/gml.xsd http://ogr.maptools.org/ gmljp2://xml/a_schema.xsd" gml:id="ID_GMLJP2_0_4_myFC4">""") >= 0
+    assert """<FeatureCollection xmlns:ogr="http://ogr.maptools.org/" xmlns:gml="http://www.opengis.net/gml/3.2" xsi:schemaLocation="http://www.opengis.net/gml/3.2 http://schemas.opengis.net/gml/3.2.1/gml.xsd http://ogr.maptools.org/ gmljp2://xml/a_schema.xsd" gml:id="ID_GMLJP2_0_4_myFC4">""" in feature3_gml
 
     myshape2_xsd = ds.GetMetadata_List("xml:a_schema.xsd")[0]
-    assert myshape2_xsd.find("""<xs:schema xmlns:ogr="http://ogr.maptools.org/" """) >= 0
+    assert """<xs:schema xmlns:ogr="http://ogr.maptools.org/" """ in myshape2_xsd
 
     duplicated_xsd = ds.GetMetadata_List("xml:duplicated.xsd")[0]
-    assert duplicated_xsd.find("""<xs:schema xmlns:ogr="http://ogr.maptools.org/" """) >= 0, \
+    assert """<xs:schema xmlns:ogr="http://ogr.maptools.org/" """ in duplicated_xsd, \
         myshape2_xsd
 
     ds = None
@@ -2569,10 +2569,10 @@ def test_jp2openjpeg_46():
 
     ds = gdal.Open('/vsimem/jp2openjpeg_46.jp2')
     gmljp2 = ds.GetMetadata_List("xml:gml.root-instance")[0]
-    if gmljp2.find("""<gmljp2:metadata>1 str trueX
+    if """<gmljp2:metadata>1 str trueX
         <B>my_value</B>
-yeah: """) < 0:
-        if gmljp2.find("""<gmljp2:metadata>1 str true""") >= 0:
+yeah: """ not in gmljp2:
+        if """<gmljp2:metadata>1 str true""" in gmljp2:
             pytest.skip()
         pytest.fail(gmljp2)
     ds = None
@@ -2607,7 +2607,7 @@ def test_jp2openjpeg_46():
 
         gdal.Unlink('/vsimem/jp2openjpeg_46.jp2')
 
-        assert gmljp2.find('<gmljp2:metadata>') < 0, invalid_template
+        assert '<gmljp2:metadata>' not in gmljp2, invalid_template
 
     # Nonexistent template.
     gdal.FileFromMemBuffer("/vsimem/source.xml", """<A/>""")
@@ -2914,7 +2914,7 @@ def test_jp2openjpeg_49():
             print('Expected ' + str(expected_gt))
             pytest.fail('Did not get expected gt for %s,copy_pam=%s,copy_worldfile=%s' % (config_option_value, str(copy_pam), str(copy_worldfile)))
 
-        if (expected_srs == '' and srs_wkt != '') or (expected_srs != '' and srs_wkt.find(expected_srs) < 0):
+        if (expected_srs == '' and srs_wkt != '') or (expected_srs != '' and expected_srs not in srs_wkt):
             print('Got ' + srs_wkt)
             print('Expected ' + expected_srs)
             pytest.fail('Did not get expected SRS for %s,copy_pam=%s,copy_worldfile=%s' % (config_option_value, str(copy_pam), str(copy_worldfile)))
@@ -2969,7 +2969,7 @@ def test_jp2openjpeg_49():
             print('Expected ' + str(expected_gt))
             pytest.fail('Did not get expected gt for %s,copy_pam=%s,copy_worldfile=%s' % (config_option_value, str(copy_pam), str(copy_worldfile)))
 
-        if (expected_srs == '' and srs_wkt != '') or (expected_srs != '' and srs_wkt.find(expected_srs) < 0):
+        if (expected_srs == '' and srs_wkt != '') or (expected_srs != '' and expected_srs not in srs_wkt):
             print('Got ' + srs_wkt)
             print('Expected ' + expected_srs)
             pytest.fail('Did not get expected SRS for %s,copy_pam=%s,copy_worldfile=%s' % (config_option_value, str(copy_pam), str(copy_worldfile)))
diff --git a/autotest/gdrivers/mrf.py b/autotest/gdrivers/mrf.py
index 2b3ed195394e..f1ab53e926af 100755
--- a/autotest/gdrivers/mrf.py
+++ b/autotest/gdrivers/mrf.py
@@ -98,7 +98,7 @@ def test_mrf(src_filename, chksum, chksum_after_reopening, options):
 
     check_minmax = 'COMPRESS=JPEG' not in ut.options
     for x in ut.options:
-        if x.find('OPTIONS:LERC_PREC=') >= 0:
+        if 'OPTIONS:LERC_PREC=' in x:
             check_minmax = False
     return ut.testCreateCopy(check_minmax=check_minmax)
 
diff --git a/autotest/gdrivers/netcdf.py b/autotest/gdrivers/netcdf.py
index b6a3422727fd..03551704ca40 100755
--- a/autotest/gdrivers/netcdf.py
+++ b/autotest/gdrivers/netcdf.py
@@ -1687,7 +1687,7 @@ def test_netcdf_50():
     out_ds = gdal.OpenEx('tmp/netcdf_50.nc', gdal.OF_VECTOR)
     out_lyr = out_ds.GetLayer(0)
     srs = out_lyr.GetSpatialRef().ExportToWkt()
-    assert srs.find('PROJCS["OSGB 1936') >= 0
+    assert 'PROJCS["OSGB 1936' in srs
     out_f = out_lyr.GetNextFeature()
     out_f.SetFID(-1)
     out_json = out_f.ExportToJson()
@@ -1903,7 +1903,7 @@ def test_netcdf_53():
     out_ds = gdal.OpenEx('tmp/netcdf_53.nc', gdal.OF_VECTOR)
     out_lyr = out_ds.GetLayer(0)
     srs = out_lyr.GetSpatialRef().ExportToWkt()
-    assert srs.find('PROJCS["OSGB 1936') >= 0
+    assert 'PROJCS["OSGB 1936' in srs
     out_f = out_lyr.GetNextFeature()
     out_f.SetFID(-1)
     out_json = out_f.ExportToJson()
@@ -2221,13 +2221,13 @@ def test_netcdf_62_ncdump_check():
         err = None
     if err is not None and 'netcdf library version' in err:
         (ret, err) = gdaltest.runexternal_out_and_err('ncdump -h tmp/netcdf_62.nc')
-        assert (ret.find('profile = 2') >= 0 and \
-           ret.find('record = UNLIMITED') >= 0 and \
-           ret.find('profile:cf_role = "profile_id"') >= 0 and \
-           ret.find('parentIndex:instance_dimension = "profile"') >= 0 and \
-           ret.find(':featureType = "profile"') >= 0 and \
-           ret.find('char station(profile') >= 0 and \
-           ret.find('char foo(record') >= 0)
+        assert ('profile = 2' in ret and \
+           'record = UNLIMITED' in ret and \
+           'profile:cf_role = "profile_id"' in ret and \
+           'parentIndex:instance_dimension = "profile"' in ret and \
+           ':featureType = "profile"' in ret and \
+           'char station(profile' in ret and \
+           'char foo(record' in ret)
     else:
         pytest.skip()
 
@@ -2292,12 +2292,12 @@ def test_netcdf_63_ncdump_check():
         err = None
     if err is not None and 'netcdf library version' in err:
         (ret, err) = gdaltest.runexternal_out_and_err('ncdump -h tmp/netcdf_63.nc')
-        assert (ret.find('profile = UNLIMITED') >= 0 and \
-           ret.find('record = UNLIMITED') >= 0 and \
-           ret.find('profile:cf_role = "profile_id"') >= 0 and \
-           ret.find('parentIndex:instance_dimension = "profile"') >= 0 and \
-           ret.find(':featureType = "profile"') >= 0 and \
-           ret.find('char station(record') >= 0)
+        assert ('profile = UNLIMITED' in ret and \
+           'record = UNLIMITED' in ret and \
+           'profile:cf_role = "profile_id"' in ret and \
+           'parentIndex:instance_dimension = "profile"' in ret and \
+           ':featureType = "profile"' in ret and \
+           'char station(record' in ret)
     else:
         gdal.Unlink('/vsimem/netcdf_63.nc')
         pytest.skip()
@@ -2478,14 +2478,14 @@ def test_netcdf_66_ncdump_check():
         err = None
     if err is not None and 'netcdf library version' in err:
         (ret, err) = gdaltest.runexternal_out_and_err('ncdump -h tmp/netcdf_66.nc')
-        assert (ret.find('char my_station(obs, my_station_max_width)') >= 0 and \
-           ret.find('my_station:long_name = "my station attribute"') >= 0 and \
-           ret.find('lon:my_extra_lon_attribute = "foo"') >= 0 and \
-           ret.find('lat:long_name') < 0 and \
-           ret.find('id:my_extra_attribute = 5.23') >= 0 and \
-           ret.find('profile:cf_role = "profile_id"') >= 0 and \
-           ret.find('parentIndex:instance_dimension = "profile"') >= 0 and \
-           ret.find(':featureType = "profile"') >= 0)
+        assert ('char my_station(obs, my_station_max_width)' in ret and \
+           'my_station:long_name = "my station attribute"' in ret and \
+           'lon:my_extra_lon_attribute = "foo"' in ret and \
+           'lat:long_name' not in ret and \
+           'id:my_extra_attribute = 5.23' in ret and \
+           'profile:cf_role = "profile_id"' in ret and \
+           'parentIndex:instance_dimension = "profile"' in ret and \
+           ':featureType = "profile"' in ret)
     else:
         gdal.Unlink('/vsimem/netcdf_66.nc')
         pytest.skip()
@@ -2535,7 +2535,7 @@ def test_netcdf_68():
 
     ds = gdal.Open('data/srid.nc')
     wkt = ds.GetProjectionRef()
-    assert wkt.find('6933') >= 0
+    assert '6933' in wkt
 
 ###############################################################################
 # Test opening a dataset with a 1D variable with 0 record (#6645)
diff --git a/autotest/gdrivers/nitf.py b/autotest/gdrivers/nitf.py
index 4d434e74a052..90230be2e78e 100755
--- a/autotest/gdrivers/nitf.py
+++ b/autotest/gdrivers/nitf.py
@@ -1504,7 +1504,7 @@ def test_nitf_53():
     gt = ds.GetGeoTransform()
     ds = None
 
-    assert wkt.find("""PROJCS["UTM Zone 31, Northern Hemisphere",GEOGCS["WGS 84""") == 0, \
+    assert wkt.startswith("""PROJCS["UTM Zone 31, Northern Hemisphere",GEOGCS["WGS 84"""), \
         'did not get expected SRS'
 
     assert gt == (205000.0, 10000.0, 0.0, 5445000.0, 0.0, -10000.0), \
@@ -1672,7 +1672,7 @@ def test_nitf_59():
     gt = ds.GetGeoTransform()
     ds = None
 
-    assert wkt.find("""PROJCS["UTM Zone 31, Northern Hemisphere",GEOGCS["WGS 84""") == 0, \
+    assert wkt.startswith("""PROJCS["UTM Zone 31, Northern Hemisphere",GEOGCS["WGS 84"""), \
         'did not get expected SRS'
 
     assert gt == (149999.5, 1.0, 0.0, 4500000.5, 0.0, -1.0), \
diff --git a/autotest/gdrivers/pdf.py b/autotest/gdrivers/pdf.py
index 77db876508b8..b19ca458046b 100755
--- a/autotest/gdrivers/pdf.py
+++ b/autotest/gdrivers/pdf.py
@@ -123,7 +123,7 @@ def pdf_checksum_available():
         return gdaltest.pdf_is_checksum_available
 
     (_, err) = gdaltest.runexternal_out_and_err("pdftoppm -v")
-    if err.find('pdftoppm version') == 0:
+    if err.startswith('pdftoppm version'):
         gdaltest.pdf_is_checksum_available = True
         return gdaltest.pdf_is_checksum_available
     print('Cannot compute to checksum due to missing pdftoppm')
@@ -166,7 +166,7 @@ def test_pdf_online_1(poppler_or_pdfium):
             for j in range(6):
                 assert abs(gt[j] - other_expected_gt[j]) <= 1e-15, 'bad geotransform'
 
-    assert wkt.find('GEOGCS["WGS 84"') == 0, 'bad WKT'
+    assert wkt.startswith('GEOGCS["WGS 84"'), 'bad WKT'
 
     if pdf_checksum_available():
         cs = ds.GetRasterBand(1).Checksum()
@@ -202,7 +202,7 @@ def test_pdf_online_2(poppler_or_pdfium):
             for j in range(6):
                 assert abs(gt[j] - other_expected_gt[j]) <= 1e-15, 'bad geotransform'
 
-    assert wkt.find('GEOGCS["WGS 84"') == 0
+    assert wkt.startswith('GEOGCS["WGS 84"')
 
 ###############################################################################
 # Test Adobe style geospatial pdf
@@ -456,8 +456,8 @@ def pdf_rgba_default_compression(options_param=None):
     if cs4 < 0:
         pytest.skip()
 
-    assert (content.find('Type = dictionary, Num = 3, Gen = 0') == 0 and \
-       content.find('      Type = dictionary, Num = 3, Gen = 0') >= 0), \
+    assert (content.startswith('Type = dictionary, Num = 3, Gen = 0') and \
+       '      Type = dictionary, Num = 3, Gen = 0' in content), \
         'wrong object dump'
 
     assert cs4 != 0, 'wrong checksum'
@@ -1292,7 +1292,7 @@ def test_pdf_write_ogr(poppler_or_pdfium):
             ds = gdal.OpenEx('tmp/pdf_write_ogr.pdf', open_options=['RENDERING_OPTIONS=%s' % opt])
             cs = ds.GetRasterBand(1).Checksum()
             # When misconfigured Poppler with fonts, use this to avoid error
-            if opt.find('TEXT') >= 0 and gdal.GetLastErrorMsg().find('font') >= 0:
+            if 'TEXT' in opt and gdal.GetLastErrorMsg().find('font') >= 0:
                 cs = -cs
             cs_tab.append(cs)
             ds = None
diff --git a/autotest/gdrivers/pds4.py b/autotest/gdrivers/pds4.py
index b911ba36eefb..b11483f97877 100755
--- a/autotest/gdrivers/pds4.py
+++ b/autotest/gdrivers/pds4.py
@@ -103,7 +103,7 @@ def test_pds4_1():
 
 def hide_substitution_warnings_error_handler_cbk(typ, errno, msg):
     # pylint: disable=unused-argument
-    if msg.find('substituted') < 0 and msg.find('VAR_TITLE not defined') < 0:
+    if 'substituted' not in msg and 'VAR_TITLE not defined' not in msg:
         print(msg)
 
 
@@ -549,14 +549,14 @@ def test_pds4_12():
     if f:
         data = gdal.VSIFReadL(1, 10000, f).decode('ascii')
         gdal.VSIFCloseL(f)
-    assert data.find('<logical_identifier>logical_identifier</logical_identifier>') >= 0
-    assert data.find('<cart:west_bounding_coordinate unit="deg">1</cart:west_bounding_coordinate>') >= 0
-    assert data.find('<cart:east_bounding_coordinate unit="deg">3</cart:east_bounding_coordinate>') >= 0
-    assert data.find('<cart:north_bounding_coordinate unit="deg">4</cart:north_bounding_coordinate>') >= 0
-    assert data.find('<cart:south_bounding_coordinate unit="deg">2</cart:south_bounding_coordinate>') >= 0
-    assert data.find('<cart:latitude_type>planetographic</cart:latitude_type>') >= 0
-    assert data.find('<cart:longitude_direction>Positive West</cart:longitude_direction>') >= 0
-    assert data.find('<file_name>myimage.raw</file_name>') >= 0
+    assert '<logical_identifier>logical_identifier</logical_identifier>' in data
+    assert '<cart:west_bounding_coordinate unit="deg">1</cart:west_bounding_coordinate>' in data
+    assert '<cart:east_bounding_coordinate unit="deg">3</cart:east_bounding_coordinate>' in data
+    assert '<cart:north_bounding_coordinate unit="deg">4</cart:north_bounding_coordinate>' in data
+    assert '<cart:south_bounding_coordinate unit="deg">2</cart:south_bounding_coordinate>' in data
+    assert '<cart:latitude_type>planetographic</cart:latitude_type>' in data
+    assert '<cart:longitude_direction>Positive West</cart:longitude_direction>' in data
+    assert '<file_name>myimage.raw</file_name>' in data
 
     gdal.GetDriverByName('PDS4').Delete(filename)
 
@@ -927,7 +927,7 @@ def test_pds4_15():
     if f:
         data = gdal.VSIFReadL(1, 10000, f).decode('ascii')
         gdal.VSIFCloseL(f)
-    assert data.find('<cart:Cartography>') < 0
+    assert '<cart:Cartography>' not in data
 
     gdal.GetDriverByName('PDS4').Delete(filename)
 
@@ -999,9 +999,9 @@ def test_pds4_16():
     if f:
         data = gdal.VSIFReadL(1, 10000, f).decode('ascii')
         gdal.VSIFCloseL(f)
-    assert data.find('http://pds.nasa.gov/pds4/pds/v1 https://pds.nasa.gov/pds4/pds/v1/PDS4_PDS_1800.xsd http://pds.nasa.gov/pds4/cart/v1 https://pds.nasa.gov/pds4/cart/v1/PDS4_CART_1700.xsd"') >= 0
-    assert data.find('xmlns:cart="http://pds.nasa.gov/pds4/cart/v1"') >= 0
-    assert data.find('<cart:Cartography>') >= 0
+    assert 'http://pds.nasa.gov/pds4/pds/v1 https://pds.nasa.gov/pds4/pds/v1/PDS4_PDS_1800.xsd http://pds.nasa.gov/pds4/cart/v1 https://pds.nasa.gov/pds4/cart/v1/PDS4_CART_1700.xsd"' in data
+    assert 'xmlns:cart="http://pds.nasa.gov/pds4/cart/v1"' in data
+    assert '<cart:Cartography>' in data
 
     gdal.GetDriverByName('PDS4').Delete(filename)
     gdal.Unlink(template)
@@ -1024,9 +1024,9 @@ def test_pds4_17():
     if f:
         data = gdal.VSIFReadL(1, 10000, f).decode('ascii')
         gdal.VSIFCloseL(f)
-    assert (data.find('<Array_2D>') >= 0 and data.find('<axes>2</axes>') >= 0 and \
-       data.find('<axis_name>Band</axis_name>') < 0 and \
-       data.find('<sequence_number>3</sequence_number>') < 0)
+    assert ('<Array_2D>' in data and '<axes>2</axes>' in data and \
+       '<axis_name>Band</axis_name>' not in data and \
+       '<sequence_number>3</sequence_number>' not in data)
 
     gdal.GetDriverByName('PDS4').Delete(filename)
 
@@ -1046,7 +1046,7 @@ def test_pds4_17():
     if f:
         data = gdal.VSIFReadL(1, 10000, f).decode('ascii')
         gdal.VSIFCloseL(f)
-    assert data.find('<Array_3D_Spectrum>') >= 0 and data.find('<axes>3</axes>') >= 0
+    assert '<Array_3D_Spectrum>' in data and '<axes>3</axes>' in data
 
     gdal.GetDriverByName('PDS4').Delete(filename)
 
@@ -1070,9 +1070,9 @@ def test_pds4_18():
     if f:
         data = gdal.VSIFReadL(1, 10000, f).decode('ascii')
         gdal.VSIFCloseL(f)
-    assert (data.find('<cart:semi_major_radius unit="m">1</cart:semi_major_radius>') >= 0 and \
-       data.find('<cart:semi_minor_radius unit="m">1</cart:semi_minor_radius>') >= 0 and \
-       data.find('<cart:polar_radius unit="m">2</cart:polar_radius>') >= 0)
+    assert ('<cart:semi_major_radius unit="m">1</cart:semi_major_radius>' in data and \
+       '<cart:semi_minor_radius unit="m">1</cart:semi_minor_radius>' in data and \
+       '<cart:polar_radius unit="m">2</cart:polar_radius>' in data)
 
     gdal.GetDriverByName('PDS4').Delete(filename)
 
diff --git a/autotest/gdrivers/rl2.py b/autotest/gdrivers/rl2.py
index 895943b9cfc5..bd7fea48dea6 100755
--- a/autotest/gdrivers/rl2.py
+++ b/autotest/gdrivers/rl2.py
@@ -73,7 +73,7 @@ def test_rl2_2():
         assert abs(gt[i] - expected_gt[i]) <= 1e-15
 
     wkt = ds.GetProjectionRef()
-    assert wkt.find('26711') >= 0
+    assert '26711' in wkt
 
     assert ds.GetRasterBand(1).GetColorInterpretation() == gdal.GCI_GrayIndex
 
diff --git a/autotest/gdrivers/sentinel2.py b/autotest/gdrivers/sentinel2.py
index 5bd74760a4f9..f9dac856f667 100755
--- a/autotest/gdrivers/sentinel2.py
+++ b/autotest/gdrivers/sentinel2.py
@@ -194,7 +194,7 @@ def test_sentinel2_l1c_2():
       <SrcRect xOff="0" yOff="0" xSize="10980" ySize="10980" />
       <DstRect xOff="10004" yOff="10000" xSize="10980" ySize="10980" />
     </SimpleSource>"""
-    assert vrt.find(placement_vrt) >= 0
+    assert placement_vrt in vrt
 
     assert ds.GetMetadata('xml:SENTINEL2') is not None
 
@@ -728,7 +728,7 @@ def test_sentinel2_l1c_tile_3():
       <SrcRect xOff="0" yOff="0" xSize="10980" ySize="10980" />
       <DstRect xOff="0" yOff="0" xSize="10980" ySize="10980" />
     </SimpleSource>"""
-    assert vrt.find(placement_vrt) >= 0
+    assert placement_vrt in vrt
 
     assert ds.GetMetadata('xml:SENTINEL2') is not None
 
@@ -812,7 +812,7 @@ def test_sentinel2_l1c_tile_4():
       <SrcRect xOff="0" yOff="0" xSize="10980" ySize="10980" />
       <DstRect xOff="0" yOff="0" xSize="10980" ySize="10980" />
     </SimpleSource>"""
-    assert vrt.find(placement_vrt) >= 0
+    assert placement_vrt in vrt
 
     assert ds.GetMetadata('xml:SENTINEL2') is not None
 
@@ -866,7 +866,7 @@ def test_sentinel2_l1c_tile_5():
       <SrcRect xOff="0" yOff="0" xSize="343" ySize="343" />
       <DstRect xOff="0" yOff="0" xSize="343" ySize="343" />
     </SimpleSource>"""
-    assert vrt.find(placement_vrt) >= 0
+    assert placement_vrt in vrt
 
 ###############################################################################
 # Test opening invalid XML files
@@ -1169,7 +1169,7 @@ def test_sentinel2_l1b_3():
       <SrcRect xOff="0" yOff="0" xSize="1276" ySize="384" />
       <DstRect xOff="0" yOff="0" xSize="1276" ySize="384" />
     </SimpleSource>"""
-    assert vrt.find(placement_vrt) >= 0
+    assert placement_vrt in vrt
 
     assert ds.GetMetadata('xml:SENTINEL2') is not None
 
@@ -1643,7 +1643,7 @@ def test_sentinel2_l2a_2():
       <SrcRect xOff="0" yOff="0" xSize="1830" ySize="1830" />
       <DstRect xOff="0" yOff="0" xSize="1830" ySize="1830" />
     </SimpleSource>"""
-    assert vrt.find(placement_vrt) >= 0
+    assert placement_vrt in vrt
 
     assert ds.GetMetadata('xml:SENTINEL2') is not None
 
@@ -1963,7 +1963,7 @@ def test_sentinel2_l2a_5():
       <SrcRect xOff="0" yOff="0" xSize="1830" ySize="1830" />
       <DstRect xOff="0" yOff="0" xSize="1830" ySize="1830" />
     </SimpleSource>"""
-    assert vrt.find(placement_vrt) >= 0
+    assert placement_vrt in vrt
 
     assert ds.GetMetadata('xml:SENTINEL2') is not None
 
@@ -2187,7 +2187,7 @@ def test_sentinel2_l2a_7():
       <SrcRect xOff="0" yOff="0" xSize="1830" ySize="1830" />
       <DstRect xOff="0" yOff="0" xSize="1830" ySize="1830" />
     </SimpleSource>"""
-    assert vrt.find(placement_vrt) >= 0
+    assert placement_vrt in vrt
 
     assert ds.GetMetadata('xml:SENTINEL2') is not None
 
@@ -2359,7 +2359,7 @@ def test_sentinel2_l1c_safe_compact_2():
       <DstRect xOff="0" yOff="0" xSize="10980" ySize="10980" />
     </SimpleSource>
 """
-    assert vrt.find(placement_vrt) >= 0
+    assert placement_vrt in vrt
 
     assert ds.GetMetadata('xml:SENTINEL2') is not None
 
diff --git a/autotest/gdrivers/vrtderived.py b/autotest/gdrivers/vrtderived.py
index 214fafc297d2..81e83002d553 100755
--- a/autotest/gdrivers/vrtderived.py
+++ b/autotest/gdrivers/vrtderived.py
@@ -234,9 +234,9 @@ def test_vrtderived_7():
     if gdal.GetConfigOption('CPL_DEBUG') is not None:
         print(err)
     # Either we cannot find a Python library, either it works
-    if ret.find('Checksum=0') >= 0:
+    if 'Checksum=0' in ret:
         print('Did not manage to find a Python library')
-    elif ret.find('Checksum=50577') < 0:
+    elif 'Checksum=50577' not in ret:
         print(err)
         pytest.fail(ret)
 
@@ -244,9 +244,9 @@ def test_vrtderived_7():
     if gdal.GetConfigOption('CPL_DEBUG') is not None:
         print(err)
 # Either we cannot find a Python library, either it works
-    if ret.find('Checksum=0') >= 0:
+    if 'Checksum=0' in ret:
         print('Did not manage to find a Python library')
-    elif ret.find('Checksum=50577') < 0:
+    elif 'Checksum=50577' not in ret:
         print(err)
         pytest.fail(ret)
 
@@ -254,9 +254,9 @@ def test_vrtderived_7():
     if gdal.GetConfigOption('CPL_DEBUG') is not None:
         print(err)
 # Either we cannot find a Python library, either it works
-    if ret.find('Checksum=0') >= 0:
+    if 'Checksum=0' in ret:
         print('Did not manage to find a Python library')
-    elif ret.find('Checksum=50577') < 0:
+    elif 'Checksum=50577' not in ret:
         print(err)
         pytest.fail(ret)
 
@@ -264,7 +264,7 @@ def test_vrtderived_7():
     ret, err = gdaltest.runexternal_out_and_err(test_cli_utilities.get_gdalinfo_path() + ' -checksum data/n43_hillshade.vrt --config GDAL_VRT_ENABLE_PYTHON YES --config PYTHONSO foo')
     if gdal.GetConfigOption('CPL_DEBUG') is not None:
         print(err)
-    assert ret.find('Checksum=0') >= 0, err
+    assert 'Checksum=0' in ret, err
 
     # Valid shared object name, but without Python symbols
     libgdal_so = gdaltest.find_lib('gdal')
@@ -272,7 +272,7 @@ def test_vrtderived_7():
         ret, err = gdaltest.runexternal_out_and_err(test_cli_utilities.get_gdalinfo_path() + ' -checksum data/n43_hillshade.vrt --config GDAL_VRT_ENABLE_PYTHON YES --config PYTHONSO "%s"' % libgdal_so)
         if gdal.GetConfigOption('CPL_DEBUG') is not None:
             print(err)
-        assert ret.find('Checksum=0') >= 0, err
+        assert 'Checksum=0' in ret, err
 
     
 ###############################################################################
diff --git a/autotest/gdrivers/vrtrawlink.py b/autotest/gdrivers/vrtrawlink.py
index a2c46c1ad41b..b04b3f235156 100755
--- a/autotest/gdrivers/vrtrawlink.py
+++ b/autotest/gdrivers/vrtrawlink.py
@@ -180,9 +180,9 @@ def test_vrtrawlink_5():
 
     assert node is not None and node[2][1] == "1", 'incorrect relativeToVRT value'
 
-    assert (xmlstring.find('<ImageOffset>100</ImageOffset>') >= 0 and \
-       xmlstring.find('<PixelOffset>3</PixelOffset>') >= 0 and \
-       xmlstring.find('<LineOffset>93</LineOffset>') >= 0)
+    assert ('<ImageOffset>100</ImageOffset>' in xmlstring and \
+       '<PixelOffset>3</PixelOffset>' in xmlstring and \
+       '<LineOffset>93</LineOffset>' in xmlstring)
 
 ###############################################################################
 # Add a new band with relativeToVRT=1, and re-open the dataset.
diff --git a/autotest/gdrivers/wms.py b/autotest/gdrivers/wms.py
index 3e635ed4ec6b..62d8809d2ffc 100755
--- a/autotest/gdrivers/wms.py
+++ b/autotest/gdrivers/wms.py
@@ -603,7 +603,7 @@ def test_wms_14():
         'wrong size or bands'
 
     wkt = ds.GetProjectionRef()
-    assert wkt.find('PROJCS["Google Maps Global Mercator"') == 0, \
+    assert wkt.startswith('PROJCS["Google Maps Global Mercator"'), \
         ('Got wrong SRS: ' + wkt)
 
     gt = ds.GetGeoTransform()
@@ -642,7 +642,7 @@ def test_wms_15():
         'wrong size or bands'
 
     wkt = ds.GetProjectionRef()
-    assert wkt.find('PROJCS["WGS 84 / Pseudo-Mercator"') == 0, ('Got wrong SRS: ' + wkt)
+    assert wkt.startswith('PROJCS["WGS 84 / Pseudo-Mercator"'), ('Got wrong SRS: ' + wkt)
 
     gt = ds.GetGeoTransform()
     assert abs(gt[0] - -20037508.342787001) <= 0.00001 and abs(gt[3] - 20037508.342787001) <= 0.00001 and abs(gt[1] - 0.037322767717361482) <= 0.00001 and abs(gt[2] - 0) <= 0.00001 and abs(gt[5] - -0.037322767717361482) <= 0.00001 and abs(gt[4] - 0) <= 0.00001, \
@@ -702,15 +702,15 @@ def test_wms_16():
     val = ds.GetRasterBand(1).GetMetadataItem(pixel, "LocationInfo")
 
     # Some bug in GeoServer ?
-    if val is not None and val.find('java.lang.NoSuchMethodError: org.geoserver.wms.WMS.pixelToWorld') >= 0:
+    if val is not None and 'java.lang.NoSuchMethodError: org.geoserver.wms.WMS.pixelToWorld' in val:
         pytest.skip(val)
 
-    if val is not None and (val.find('Gateway Time-out') >= 0 or
-                            val.find('HTTP error code : 5') >= 0):
+    if val is not None and ('Gateway Time-out' in val or
+                            'HTTP error code : 5' in val):
         pytest.skip()
 
     if val is None or val.find('<og:cat>86</og:cat>') == -1:
-        if val.find('java.lang.NullPointerException') >= 0 or val.find('504 Gateway Time-out') >= 0 or val.find('java.lang.OutOfMemoryError') >= 0:
+        if 'java.lang.NullPointerException' in val or '504 Gateway Time-out' in val or 'java.lang.OutOfMemoryError' in val:
             pytest.skip(val)
 
         print(val)
@@ -727,7 +727,7 @@ def test_wms_16():
     # Ask an overview band
     val2 = ds.GetRasterBand(1).GetOverview(0).GetMetadataItem(pixel, "LocationInfo")
     if val2 != val:
-        if val2.find('java.lang.NullPointerException') >= 0 or val2.find('504 Gateway Time-out') >= 0 or val2.find('java.lang.OutOfMemoryError') >= 0:
+        if 'java.lang.NullPointerException' in val2 or '504 Gateway Time-out' in val2 or 'java.lang.OutOfMemoryError' in val2:
             pytest.skip(val2)
 
         print(val2)
diff --git a/autotest/gdrivers/xmp.py b/autotest/gdrivers/xmp.py
index 8e956bc2c3a3..6a565f23117c 100755
--- a/autotest/gdrivers/xmp.py
+++ b/autotest/gdrivers/xmp.py
@@ -87,7 +87,7 @@ def test_xmp(drivername, filename, expect_xmp):
     # we set ECW to not resolve projection and datum strings to get 3.x behavior.
     gdal.SetConfigOption("ECW_DO_NOT_RESOLVE_DATUM_PROJECTION", "YES")
 
-    if filename.find('.jp2') >= 0:
+    if '.jp2' in filename:
         gdaltest.deregister_all_jpeg2000_drivers_but(drivername)
 
     try:
@@ -107,5 +107,5 @@ def test_xmp(drivername, filename, expect_xmp):
 
         ds = None
     finally:
-        if filename.find('.jp2') >= 0:
+        if '.jp2' in filename:
             gdaltest.reregister_all_jpeg2000_drivers()
diff --git a/autotest/ogr/ogr_cad.py b/autotest/ogr/ogr_cad.py
index 279ebc5b9402..1549eb822362 100755
--- a/autotest/ogr/ogr_cad.py
+++ b/autotest/ogr/ogr_cad.py
@@ -359,7 +359,7 @@ def test_ogr_cad_9():
         ds = gdal.OpenEx('data/AC1018_signature.dwg', allowed_drivers=['CAD'])
     assert ds is None
     msg = gdal.GetLastErrorMsg()
-    assert msg.find('does not support this version') >= 0
+    assert 'does not support this version' in msg
 
 ###############################################################################
 # Cleanup
diff --git a/autotest/ogr/ogr_csv.py b/autotest/ogr/ogr_csv.py
index c8f1375e816e..f3785b2aa0d5 100755
--- a/autotest/ogr/ogr_csv.py
+++ b/autotest/ogr/ogr_csv.py
@@ -1397,7 +1397,7 @@ def test_ogr_csv_35():
     data = gdal.VSIFReadL(1, 10000, f).decode('ascii')
     gdal.VSIFCloseL(f)
 
-    assert data.find('FIELD_1 "FIELD 2"') >= 0 and data.find('VAL1 "VAL 2"') >= 0
+    assert 'FIELD_1 "FIELD 2"' in data and 'VAL1 "VAL 2"' in data
 
     gdal.Unlink('/vsimem/ogr_csv_35.csv')
 
@@ -2044,13 +2044,13 @@ def test_ogr_csv_48():
     data = gdal.VSIFReadL(1, 10000, f).decode('ascii')
     gdal.VSIFCloseL(f)
 
-    assert data.find('stringlist,intlist,int64list,reallist\n"[ ""a"", """" ]",[ 1 ],[ 1234567890123 ],[ 0.125') == 0
+    assert data.startswith('stringlist,intlist,int64list,reallist\n"[ ""a"", """" ]",[ 1 ],[ 1234567890123 ],[ 0.125')
 
     f = gdal.VSIFOpenL('/vsimem/ogr_csv_48_out.csvt', 'rb')
     data = gdal.VSIFReadL(1, 10000, f).decode('ascii')
     gdal.VSIFCloseL(f)
 
-    assert data.find('JSonStringList,JSonIntegerList,JSonInteger64List,JSonRealList') == 0
+    assert data.startswith('JSonStringList,JSonIntegerList,JSonInteger64List,JSonRealList')
 
     gdal.Unlink('/vsimem/ogr_csv_48.csv')
     gdal.Unlink('/vsimem/ogr_csv_48.csvt')
@@ -2101,7 +2101,7 @@ def test_ogr_csv_string_quoting_always():
     data = gdal.VSIFReadL(1, 10000, f).decode('ascii')
     gdal.VSIFCloseL(f)
 
-    assert data.find('"AREA","EAS_ID","PRFEDEA"\n215229.266,"168","35043411"') == 0
+    assert data.startswith('"AREA","EAS_ID","PRFEDEA"\n215229.266,"168","35043411"')
 
     ds = gdal.OpenEx('/vsimem/ogr_csv_string_quoting_always.csv', gdal.OF_UPDATE | gdal.OF_VECTOR)
     gdal.VectorTranslate(ds, 'data/poly.shp',
@@ -2113,7 +2113,7 @@ def test_ogr_csv_string_quoting_always():
     data = gdal.VSIFReadL(1, 10000, f).decode('ascii')
     gdal.VSIFCloseL(f)
 
-    assert data.find('"AREA","EAS_ID","PRFEDEA"\n215229.266,"168","35043411"\n247328.172,"179","35043423"') == 0
+    assert data.startswith('"AREA","EAS_ID","PRFEDEA"\n215229.266,"168","35043411"\n247328.172,"179","35043423"')
 
     gdal.Unlink('/vsimem/ogr_csv_string_quoting_always.csv')
     gdal.Unlink('/vsimem/ogr_csv_string_quoting_always.csvt')
@@ -2142,7 +2142,7 @@ def test_ogr_csv_string_quoting_if_ambiguous():
     data = gdal.VSIFReadL(1, 10000, f).decode('ascii')
     gdal.VSIFCloseL(f)
 
-    assert data.find('"00123",x,"1.25"') >= 0
+    assert '"00123",x,"1.25"' in data
 
     gdal.Unlink('/vsimem/ogr_csv_string_quoting_if_ambiguous.csv')
 
@@ -2170,7 +2170,7 @@ def test_ogr_csv_string_quoting_if_needed():
     data = gdal.VSIFReadL(1, 10000, f).decode('ascii')
     gdal.VSIFCloseL(f)
 
-    assert data.find('00123,x,1.25') >= 0
+    assert '00123,x,1.25' in data
 
     gdal.Unlink('/vsimem/ogr_csv_string_quoting_if_needed.csv')
 
diff --git a/autotest/ogr/ogr_elasticsearch.py b/autotest/ogr/ogr_elasticsearch.py
index f82671c8e628..a5c24e537e36 100755
--- a/autotest/ogr/ogr_elasticsearch.py
+++ b/autotest/ogr/ogr_elasticsearch.py
@@ -1275,7 +1275,7 @@ def test_ogr_elasticsearch_6():
 
     f = lyr.GetNextFeature()
     ref_txt = f['geometry'].ExportToWkt()
-    if ref_txt.find('POLYGON ((') != 0:
+    if not ref_txt.startswith('POLYGON (('):
         f.DumpReadable()
         pytest.fail()
 
diff --git a/autotest/ogr/ogr_fgdb.py b/autotest/ogr/ogr_fgdb.py
index 8497cdba8726..288b53fc19db 100755
--- a/autotest/ogr/ogr_fgdb.py
+++ b/autotest/ogr/ogr_fgdb.py
@@ -1177,7 +1177,7 @@ def test_ogr_fgdb_19():
 
     lst = gdal.ReadDir('tmp/test.gdb')
     for filename in lst:
-        assert filename.find('.tmp') < 0, lst
+        assert '.tmp' not in filename, lst
 
     lyr_tmp = ds.GetLayer(0)
     lyr_tmp = ds.GetLayer(0)
@@ -1339,7 +1339,7 @@ def test_ogr_fgdb_19():
 
         lst = gdal.ReadDir('tmp/test.gdb')
         for filename in lst:
-            assert filename.find('.tmp') < 0, lst
+            assert '.tmp' not in filename, lst
 
         # Test an error case where we simulate a failure in renaming
         # a file in original directory
@@ -1370,7 +1370,7 @@ def test_ogr_fgdb_19():
 
         lst = gdal.ReadDir('tmp/test.gdb')
         for filename in lst:
-            assert filename.find('.tmp') < 0, lst
+            assert '.tmp' not in filename, lst
 
         # Test an error case where we simulate a failure in moving
         # a file into original directory
@@ -1397,7 +1397,7 @@ def test_ogr_fgdb_19():
         # Remove left over .tmp files
         lst = gdal.ReadDir('tmp/test.gdb')
         for filename in lst:
-            if filename.find('.tmp') >= 0:
+            if '.tmp' in filename:
                 os.remove('tmp/test.gdb/' + filename)
 
         # Test not critical error in removing a temporary file
@@ -1430,7 +1430,7 @@ def test_ogr_fgdb_19():
             # Remove left over .tmp files
             lst = gdal.ReadDir('tmp/test.gdb')
             for filename in lst:
-                if filename.find('.tmp') >= 0:
+                if '.tmp' in filename:
                     os.remove('tmp/test.gdb/' + filename)
 
     else:
diff --git a/autotest/ogr/ogr_geojson.py b/autotest/ogr/ogr_geojson.py
index 6f38468ff64d..9add1634928a 100755
--- a/autotest/ogr/ogr_geojson.py
+++ b/autotest/ogr/ogr_geojson.py
@@ -1103,7 +1103,7 @@ def test_ogr_geojson_26():
 
     gdal.Unlink('/vsimem/ogr_geojson_26.json')
 
-    assert data.find('{ "type": "Feature", "id": 1234567890123, "properties": { "int64": 1234567890123, "int64list": [ 1234567890123 ] }, "geometry": null }') >= 0
+    assert '{ "type": "Feature", "id": 1234567890123, "properties": { "int64": 1234567890123, "int64list": [ 1234567890123 ] }, "geometry": null }' in data
 
 ###############################################################################
 # Test workaround for 64bit values (returned as strings)
@@ -1530,7 +1530,7 @@ def test_ogr_geojson_37():
 
     gdal.Unlink('/vsimem/ogr_geojson_37.json')
 
-    assert data.find('"bool": false, "not_bool": 0, "bool_list": [ false, true ], "notbool_list": [ 0, 3 ]') >= 0
+    assert '"bool": false, "not_bool": 0, "bool_list": [ false, true ], "notbool_list": [ 0, 3 ]' in data
 
 ###############################################################################
 # Test datetime/date/time type support
@@ -2076,16 +2076,16 @@ def test_ogr_geojson_45():
 
     gdal.Unlink('/vsimem/ogr_geojson_45.json')
 
-    assert (data.find('"bbox": [ 0, 1, 2, 0, 1, 2 ],') >= 0 and \
-       data.find('"foo": "bar"') >= 0 and data.find('"bar": "baz"') >= 0 and \
-       data.find('"foo_feature": "bar_feature"') >= 0 and \
-       data.find('"foo_gc": "bar_gc"') >= 0 and \
-       data.find('"foo_point": "bar_point"') >= 0 and data.find('3') >= 0 and \
-       data.find('"foo_linestring": "bar_linestring"') >= 0 and data.find('4') >= 0 and \
-       data.find('"foo_multipoint": "bar_multipoint"') >= 0 and data.find('5') >= 0 and \
-       data.find('"foo_multilinestring": "bar_multilinestring"') >= 0 and data.find('6') >= 0 and \
-       data.find('"foo_polygon": "bar_polygon"') >= 0 and data.find('7') >= 0 and \
-       data.find('"foo_multipolygon": "bar_multipolygon"') >= 0 and data.find('8') >= 0)
+    assert ('"bbox": [ 0, 1, 2, 0, 1, 2 ],' in data and \
+       '"foo": "bar"' in data and '"bar": "baz"' in data and \
+       '"foo_feature": "bar_feature"' in data and \
+       '"foo_gc": "bar_gc"' in data and \
+       '"foo_point": "bar_point"' in data and '3' in data and \
+       '"foo_linestring": "bar_linestring"' in data and '4' in data and \
+       '"foo_multipoint": "bar_multipoint"' in data and '5' in data and \
+       '"foo_multilinestring": "bar_multilinestring"' in data and '6' in data and \
+       '"foo_polygon": "bar_polygon"' in data and '7' in data and \
+       '"foo_multipolygon": "bar_multipolygon"' in data and '8' in data)
 
     # Test native support with string id
     src_ds = gdal.OpenEx("""{
@@ -2159,7 +2159,7 @@ def test_ogr_geojson_46():
 
     gdal.Unlink('/vsimem/ogr_geojson_46.json')
 
-    assert data.find('{ "myprop": { "a": "b" } }') >= 0
+    assert '{ "myprop": { "a": "b" } }' in data
 
 ###############################################################################
 # Test update support
@@ -2194,9 +2194,9 @@ def test_ogr_geojson_47():
         data = None
 
     # we don't want crs if there's no in the source
-    assert (data.find('"foo": "bar"') >= 0 and data.find('"bar": "baz"') >= 0 and \
-       data.find('crs') < 0 and \
-       data.find('"myprop": "another_value"') >= 0)
+    assert ('"foo": "bar"' in data and '"bar": "baz"' in data and \
+       'crs' not in data and \
+       '"myprop": "another_value"' in data)
 
     # Test append support
     ds = ogr.Open('/vsimem/ogr_geojson_47.json', update=1)
@@ -2239,11 +2239,11 @@ def test_ogr_geojson_47():
         data = None
 
     # we don't want crs if there's no in the source
-    assert (data.find('"foo": "bar"') >= 0 and data.find('"bar": "baz"') >= 0 and \
-       data.find('crs') < 0 and \
-       data.find('"myprop": "another_value"') >= 0 and \
-       data.find('"myprop": "value_of_point_4_5"') >= 0 and \
-       data.find('id') < 0)
+    assert ('"foo": "bar"' in data and '"bar": "baz"' in data and \
+       'crs' not in data and \
+       '"myprop": "another_value"' in data and \
+       '"myprop": "value_of_point_4_5"' in data and \
+       'id' not in data)
 
     gdal.Unlink('/vsimem/ogr_geojson_47.json')
 
@@ -2290,7 +2290,7 @@ def test_ogr_geojson_47():
     else:
         data = None
 
-    assert data.find('something') >= 0
+    assert 'something' in data
 
     # Test appending to feature collection with "bbox"
     gdal.FileFromMemBuffer('/vsimem/ogr_geojson_47.json', """{ "type": "FeatureCollection", "bbox": [0,0,0,0], "features": [ { "type": "Feature", "geometry": { "type": "Point", "coordinates": [0,0]} } ]}""")
@@ -2311,7 +2311,7 @@ def test_ogr_geojson_47():
     else:
         data = None
 
-    assert data.find('bbox') >= 0
+    assert 'bbox' in data
 
     gdal.Unlink('/vsimem/ogr_geojson_47.json')
 
@@ -2345,11 +2345,11 @@ def test_ogr_geojson_48():
     gdal.Unlink('/vsimem/ogr_geojson_48.json')
 
     # we don't want crs if there's no in the source
-    assert (data.find('"bar": "baz"') >= 0 and \
-       data.find('"bbox": [ 3.0, 50.0, 3.0, 50.0 ]') >= 0 and \
-       data.find('crs') < 0 and \
-       data.find('FeatureCollection') < 0 and \
-       data.find('"myprop": "another_value"') >= 0)
+    assert ('"bar": "baz"' in data and \
+       '"bbox": [ 3.0, 50.0, 3.0, 50.0 ]' in data and \
+       'crs' not in data and \
+       'FeatureCollection' not in data and \
+       '"myprop": "another_value"' in data)
 
 ###############################################################################
 # Test ARRAY_AS_STRING
@@ -2401,7 +2401,7 @@ def test_ogr_geojson_50():
 
     gdal.Unlink('/vsimem/ogr_geojson_50.json')
 
-    assert data.find('1.23456789012456') >= 0 or data.find('5268.813 ') >= 0
+    assert '1.23456789012456' in data or '5268.813 ' in data
 
     # If SIGNIFICANT_FIGURES is explicitly specified, and COORDINATE_PRECISION not,
     # then it also applies to coordinates
@@ -2420,7 +2420,7 @@ def test_ogr_geojson_50():
 
     gdal.Unlink('/vsimem/ogr_geojson_50.json')
 
-    assert data.find('1.23456789012456') >= 0 or data.find('-5') >= 0
+    assert '1.23456789012456' in data or '-5' in data
 
     # If SIGNIFICANT_FIGURES is explicitly specified, and COORDINATE_PRECISION too,
     # then SIGNIFICANT_FIGURES only applies to non-coordinates floating point values.
@@ -2440,7 +2440,7 @@ def test_ogr_geojson_50():
 
     gdal.Unlink('/vsimem/ogr_geojson_50.json')
 
-    assert data.find('0.00001234') >= 0 and data.find('1.23456789012456') >= 0
+    assert '0.00001234' in data and '1.23456789012456' in data
 
 ###############################################################################
 # Test writing empty geometries
@@ -2490,19 +2490,19 @@ def test_ogr_geojson_51():
 
     gdal.Unlink('/vsimem/ogr_geojson_51.json')
 
-    assert data.find('{ "id": 1 }, "geometry": null') >= 0
+    assert '{ "id": 1 }, "geometry": null' in data
 
-    assert data.find('{ "id": 2 }, "geometry": { "type": "LineString", "coordinates": [ ] } }') >= 0
+    assert '{ "id": 2 }, "geometry": { "type": "LineString", "coordinates": [ ] } }' in data
 
-    assert data.find('{ "id": 3 }, "geometry": { "type": "Polygon", "coordinates": [ ] } }') >= 0
+    assert '{ "id": 3 }, "geometry": { "type": "Polygon", "coordinates": [ ] } }' in data
 
-    assert data.find('{ "id": 4 }, "geometry": { "type": "MultiPoint", "coordinates": [ ] } }') >= 0
+    assert '{ "id": 4 }, "geometry": { "type": "MultiPoint", "coordinates": [ ] } }' in data
 
-    assert data.find('{ "id": 5 }, "geometry": { "type": "MultiLineString", "coordinates": [ ] } }') >= 0
+    assert '{ "id": 5 }, "geometry": { "type": "MultiLineString", "coordinates": [ ] } }' in data
 
-    assert data.find('{ "id": 6 }, "geometry": { "type": "MultiPolygon", "coordinates": [ ] } }') >= 0
+    assert '{ "id": 6 }, "geometry": { "type": "MultiPolygon", "coordinates": [ ] } }' in data
 
-    assert data.find('{ "id": 7 }, "geometry": { "type": "GeometryCollection", "geometries": [ ] } }') >= 0
+    assert '{ "id": 7 }, "geometry": { "type": "GeometryCollection", "geometries": [ ] } }' in data
 
 ###############################################################################
 # Test NULL type detection
@@ -2551,7 +2551,7 @@ def test_ogr_geojson_53():
 
     gdal.Unlink('/vsimem/ogr_geojson_53.json')
 
-    assert data.find('{ "type": "Point", "coordinates": [ 1.0, 2.0, 3.0 ] }') >= 0
+    assert '{ "type": "Point", "coordinates": [ 1.0, 2.0, 3.0 ] }' in data
 
 ###############################################################################
 # Test NULL type detection when first value is null
@@ -3067,9 +3067,9 @@ def test_ogr_geojson_60():
     gdal.VSIFCloseL(fp)
 
     gdal.Unlink('/vsimem/ogr_geojson_60.json')
-    assert (data.find('"properties": { "foo": "bar" }') >= 0 and \
-       data.find('"properties": { "foo": null }') >= 0 and \
-       data.find('"properties": { }') >= 0)
+    assert ('"properties": { "foo": "bar" }' in data and \
+       '"properties": { "foo": null }' in data and \
+       '"properties": { }' in data)
 
 
 ###############################################################################
@@ -3290,75 +3290,75 @@ def test_ogr_geojson_id_field_and_id_type():
 
     gdal.VectorTranslate('/vsimem/out.json', 'data/poly.shp', options='-f GeoJSON -lco ID_TYPE=String -preserve_fid -limit 1 -fid 2')
     got = read_file('/vsimem/out.json')
-    assert got.find('"id": "2", "properties": { "AREA": 261752.781, "EAS_ID": 171, "PRFEDEA": "35043414" }') >= 0
+    assert '"id": "2", "properties": { "AREA": 261752.781, "EAS_ID": 171, "PRFEDEA": "35043414" }' in got
 
     gdal.VectorTranslate('/vsimem/out.json', 'data/poly.shp', options='-f GeoJSON -lco ID_TYPE=Integer -preserve_fid -limit 1 -fid 2')
     got = read_file('/vsimem/out.json')
-    assert got.find('"id": 2, "properties": { "AREA": 261752.781, "EAS_ID": 171, "PRFEDEA": "35043414" }') >= 0
+    assert '"id": 2, "properties": { "AREA": 261752.781, "EAS_ID": 171, "PRFEDEA": "35043414" }' in got
 
     gdal.VectorTranslate('/vsimem/out.json', 'data/poly.shp', format='GeoJSON', layerCreationOptions=['ID_FIELD=EAS_ID'], limit=1)
     got = read_file('/vsimem/out.json')
-    assert got.find('"id": 168, "properties": { "AREA": 215229.266, "PRFEDEA": "35043411" }') >= 0
+    assert '"id": 168, "properties": { "AREA": 215229.266, "PRFEDEA": "35043411" }' in got
 
     src_ds = gdal.OpenEx('/vsimem/out.json', open_options=['NATIVE_DATA=YES'])
     gdal.VectorTranslate('/vsimem/out2.json', src_ds, format='GeoJSON')
     src_ds = None
     got = read_file('/vsimem/out2.json')
     gdal.Unlink('/vsimem/out2.json')
-    assert got.find('"id": 168, "properties": { "AREA": 215229.266, "PRFEDEA": "35043411" }') >= 0
+    assert '"id": 168, "properties": { "AREA": 215229.266, "PRFEDEA": "35043411" }' in got
 
     src_ds = gdal.OpenEx('/vsimem/out.json', open_options=['NATIVE_DATA=YES'])
     gdal.VectorTranslate('/vsimem/out2.json', src_ds, format='GeoJSON', layerCreationOptions=['ID_TYPE=String'])
     src_ds = None
     got = read_file('/vsimem/out2.json')
     gdal.Unlink('/vsimem/out2.json')
-    assert got.find('"id": "168", "properties": { "AREA": 215229.266, "PRFEDEA": "35043411" }') >= 0
+    assert '"id": "168", "properties": { "AREA": 215229.266, "PRFEDEA": "35043411" }' in got
 
     src_ds = gdal.OpenEx('/vsimem/out.json', open_options=['NATIVE_DATA=YES'])
     gdal.VectorTranslate('/vsimem/out2.json', src_ds, format='GeoJSON', layerCreationOptions=['ID_TYPE=Integer'])
     src_ds = None
     got = read_file('/vsimem/out2.json')
     gdal.Unlink('/vsimem/out2.json')
-    assert got.find('"id": 168, "properties": { "AREA": 215229.266, "PRFEDEA": "35043411" }') >= 0
+    assert '"id": 168, "properties": { "AREA": 215229.266, "PRFEDEA": "35043411" }' in got
 
     gdal.Unlink('/vsimem/out.json')
 
     gdal.VectorTranslate('/vsimem/out.json', 'data/poly.shp', format='GeoJSON', layerCreationOptions=['ID_FIELD=EAS_ID', 'ID_TYPE=String'], limit=1)
     got = read_file('/vsimem/out.json')
-    assert got.find('"id": "168", "properties": { "AREA": 215229.266, "PRFEDEA": "35043411" }') >= 0
+    assert '"id": "168", "properties": { "AREA": 215229.266, "PRFEDEA": "35043411" }' in got
 
     src_ds = gdal.OpenEx('/vsimem/out.json', open_options=['NATIVE_DATA=YES'])
     gdal.VectorTranslate('/vsimem/out2.json', src_ds, format='GeoJSON')
     src_ds = None
     got = read_file('/vsimem/out2.json')
     gdal.Unlink('/vsimem/out2.json')
-    assert got.find('"id": "168", "properties": { "AREA": 215229.266, "PRFEDEA": "35043411" }') >= 0
+    assert '"id": "168", "properties": { "AREA": 215229.266, "PRFEDEA": "35043411" }' in got
 
     src_ds = gdal.OpenEx('/vsimem/out.json', open_options=['NATIVE_DATA=YES'])
     gdal.VectorTranslate('/vsimem/out2.json', src_ds, format='GeoJSON', layerCreationOptions=['ID_TYPE=String'])
     src_ds = None
     got = read_file('/vsimem/out2.json')
     gdal.Unlink('/vsimem/out2.json')
-    assert got.find('"id": "168", "properties": { "AREA": 215229.266, "PRFEDEA": "35043411" }') >= 0
+    assert '"id": "168", "properties": { "AREA": 215229.266, "PRFEDEA": "35043411" }' in got
 
     src_ds = gdal.OpenEx('/vsimem/out.json', open_options=['NATIVE_DATA=YES'])
     gdal.VectorTranslate('/vsimem/out2.json', src_ds, format='GeoJSON', layerCreationOptions=['ID_TYPE=Integer'])
     src_ds = None
     got = read_file('/vsimem/out2.json')
     gdal.Unlink('/vsimem/out2.json')
-    assert got.find('"id": 168, "properties": { "AREA": 215229.266, "PRFEDEA": "35043411" }') >= 0
+    assert '"id": 168, "properties": { "AREA": 215229.266, "PRFEDEA": "35043411" }' in got
 
     gdal.Unlink('/vsimem/out.json')
 
     gdal.VectorTranslate('/vsimem/out.json', 'data/poly.shp', format='GeoJSON', layerCreationOptions=['ID_FIELD=PRFEDEA'], limit=1)
     got = read_file('/vsimem/out.json')
     gdal.Unlink('/vsimem/out.json')
-    assert got.find('"id": "35043411", "properties": { "AREA": 215229.266, "EAS_ID": 168 }') >= 0
+    assert '"id": "35043411", "properties": { "AREA": 215229.266, "EAS_ID": 168 }' in got
 
     gdal.VectorTranslate('/vsimem/out.json', 'data/poly.shp', format='GeoJSON', layerCreationOptions=['ID_FIELD=PRFEDEA', 'ID_TYPE=Integer'], limit=1)
     got = read_file('/vsimem/out.json')
     gdal.Unlink('/vsimem/out.json')
-    assert got.find('"id": 35043411, "properties": { "AREA": 215229.266, "EAS_ID": 168 }') >= 0
+    assert '"id": 35043411, "properties": { "AREA": 215229.266, "EAS_ID": 168 }' in got
 
 ###############################################################################
 
diff --git a/autotest/ogr/ogr_gml_read.py b/autotest/ogr/ogr_gml_read.py
index 272b4f6eab69..5fa8becfa867 100755
--- a/autotest/ogr/ogr_gml_read.py
+++ b/autotest/ogr/ogr_gml_read.py
@@ -1863,7 +1863,7 @@ def test_ogr_gml_52():
         srs = lyr.GetSpatialRef()
         assert srs is not None
         wkt = srs.ExportToWkt()
-        assert wkt.find('3067') >= 0
+        assert '3067' in wkt
 
         feat = lyr.GetNextFeature()
         if feat.GetField('gid') != '1' or \
@@ -2513,7 +2513,7 @@ def test_ogr_gml_65():
         data = gdal.VSIFReadL(1, 10000, f).decode('ascii')
         gdal.VSIFCloseL(f)
 
-        assert data.find(expected) >= 0
+        assert expected in data
 
         ds = ogr.Open(filename)
         lyr = ds.GetLayer(0)
@@ -3170,7 +3170,7 @@ def test_ogr_gml_73():
         lyr = ds.GetLayer(i)
         sr = lyr.GetSpatialRef()
         got_wkt = sr.ExportToWkt()
-        assert got_wkt.find('4326') >= 0, 'did not get expected SRS'
+        assert '4326' in got_wkt, 'did not get expected SRS'
 
         feat = lyr.GetNextFeature()
         geom = feat.GetGeometryRef()
@@ -3406,7 +3406,7 @@ def test_ogr_gml_79():
             data = gdal.VSIFReadL(1, 10000, f).decode('utf-8')
             gdal.VSIFCloseL(f)
 
-        assert data.find(expected_srsname) >= 0 and data.find(expected_coords) >= 0, \
+        assert expected_srsname in data and expected_coords in data, \
             srsname_format
 
     gdal.Unlink('/vsimem/ogr_gml_79.xml')
@@ -3503,14 +3503,14 @@ def test_ogr_gml_82():
     if f is not None:
         data = gdal.VSIFReadL(1, 10000, f).decode('utf-8')
         gdal.VSIFCloseL(f)
-    assert data.find('gml:FeatureCollection') >= 0
+    assert 'gml:FeatureCollection' in data
 
     f = gdal.VSIFOpenL("/vsimem/ogr_gml_82.xsd", "rb")
     if f is not None:
         data = gdal.VSIFReadL(1, 10000, f).decode('utf-8')
         gdal.VSIFCloseL(f)
-    assert data.find('name = "FeatureCollection"') < 0
-    assert data.find('gmlsf') < 0
+    assert 'name = "FeatureCollection"' not in data
+    assert 'gmlsf' not in data
 
     gdal.Unlink('/vsimem/ogr_gml_82.gml')
     gdal.Unlink('/vsimem/ogr_gml_82.xsd')
diff --git a/autotest/ogr/ogr_gmlas.py b/autotest/ogr/ogr_gmlas.py
index 98d2b265aebe..b41a417f497b 100755
--- a/autotest/ogr/ogr_gmlas.py
+++ b/autotest/ogr/ogr_gmlas.py
@@ -2086,15 +2086,15 @@ def test_ogr_gmlas_writer_gml():
     gdal.Unlink('/vsimem/ogr_gmlas_writer_gml.xml')
     gdal.Unlink('/vsimem/ogr_gmlas_writer_gml.xsd')
 
-    assert content.find('xmlns:gml="http://fake_gml32"') >= 0
+    assert 'xmlns:gml="http://fake_gml32"' in content
 
-    assert content.find('<ogr:geometryProperty><gml:Point srsName="http://www.opengis.net/def/crs/EPSG/0/4326" gml:id="hash_test_1.geom0"><gml:pos>49 2</gml:pos></gml:Point></ogr:geometryProperty>') >= 0
+    assert '<ogr:geometryProperty><gml:Point srsName="http://www.opengis.net/def/crs/EPSG/0/4326" gml:id="hash_test_1.geom0"><gml:pos>49 2</gml:pos></gml:Point></ogr:geometryProperty>' in content
 
-    assert content.find('<ogr:pointProperty><gml:Point srsName="http://www.opengis.net/def/crs/EPSG/0/4326" gml:id="hash_test_1.geom2"><gml:pos>50 3</gml:pos></gml:Point></ogr:pointProperty>') >= 0
+    assert '<ogr:pointProperty><gml:Point srsName="http://www.opengis.net/def/crs/EPSG/0/4326" gml:id="hash_test_1.geom2"><gml:pos>50 3</gml:pos></gml:Point></ogr:pointProperty>' in content
 
-    assert content.find('      <ogr:pointPropertyRepeated><gml:Point gml:id="hash_test_1.geom13.0"><gml:pos>0 1</gml:pos></gml:Point></ogr:pointPropertyRepeated>') >= 0
+    assert '      <ogr:pointPropertyRepeated><gml:Point gml:id="hash_test_1.geom13.0"><gml:pos>0 1</gml:pos></gml:Point></ogr:pointPropertyRepeated>' in content
 
-    assert content.find('      <ogr:pointPropertyRepeated><gml:Point gml:id="hash_test_1.geom13.1"><gml:pos>1 2</gml:pos></gml:Point></ogr:pointPropertyRepeated>') >= 0
+    assert '      <ogr:pointPropertyRepeated><gml:Point gml:id="hash_test_1.geom13.1"><gml:pos>1 2</gml:pos></gml:Point></ogr:pointPropertyRepeated>' in content
 
 ###############################################################################
 # Test writing support with geometries and -a_srs
@@ -2126,7 +2126,7 @@ def test_ogr_gmlas_writer_gml_assign_srs():
     gdal.Unlink('/vsimem/ogr_gmlas_writer_gml.xml')
     gdal.Unlink('/vsimem/ogr_gmlas_writer_gml.xsd')
 
-    assert content.find('http://www.opengis.net/def/crs/EPSG/0/32631') >= 0
+    assert 'http://www.opengis.net/def/crs/EPSG/0/32631' in content
 
     # No geometry, but to test that the proxied ExecuteSQL() works
 
@@ -2186,11 +2186,11 @@ def test_ogr_gmlas_writer_gml_original_xml():
     gdal.Unlink('/vsimem/ogr_gmlas_writer_gml.xml')
     gdal.Unlink('/vsimem/ogr_gmlas_writer_gml.xsd')
 
-    assert content.find('<ogr:geometryProperty> <gml:Point gml:id="poly.geom.Geometry" srsName="urn:ogc:def:crs:EPSG::4326"> <gml:pos>49 2</gml:pos> </gml:Point> </ogr:geometryProperty>') >= 0
+    assert '<ogr:geometryProperty> <gml:Point gml:id="poly.geom.Geometry" srsName="urn:ogc:def:crs:EPSG::4326"> <gml:pos>49 2</gml:pos> </gml:Point> </ogr:geometryProperty>' in content
 
-    assert content.find('      <ogr:pointPropertyRepeated><gml:Point gml:id="poly.geom.pointPropertyRepeated.1"><gml:pos>0 1</gml:pos></gml:Point></ogr:pointPropertyRepeated>') >= 0
+    assert '      <ogr:pointPropertyRepeated><gml:Point gml:id="poly.geom.pointPropertyRepeated.1"><gml:pos>0 1</gml:pos></gml:Point></ogr:pointPropertyRepeated>' in content
 
-    assert content.find('      <ogr:pointPropertyRepeated><gml:Point gml:id="poly.geom.pointPropertyRepeated.2"><gml:pos>1 2</gml:pos></gml:Point></ogr:pointPropertyRepeated>') >= 0
+    assert '      <ogr:pointPropertyRepeated><gml:Point gml:id="poly.geom.pointPropertyRepeated.2"><gml:pos>1 2</gml:pos></gml:Point></ogr:pointPropertyRepeated>' in content
 
 ###############################################################################
 # Test writing support with XSD, INDENT_SIZE, COMMENT, OUTPUT_XSD_FILENAME, TIMESTAMP options
@@ -2228,16 +2228,16 @@ def test_ogr_gmlas_writer_options():
     gdal.Unlink('/vsimem/my_schema.xsd')
 
     # Test indentation size
-    assert content.find('\n        <ogr:test gml:id="poly.0">') >= 0
+    assert '\n        <ogr:test gml:id="poly.0">' in content
 
     # Test comment
-    assert content.find('\n<!-- - - -a comment- - - -->') >= 0
+    assert '\n<!-- - - -a comment- - - -->' in content
 
     # Test OUTPUT_XSD_FILENAME
-    assert content.find('/vsimem/my_schema.xsd') >= 0
+    assert '/vsimem/my_schema.xsd' in content
 
     # Test SRSNAME_FORMAT=OGC_URN
-    assert content.find('<ogr:geometryProperty><gml:Point srsName="urn:ogc:def:crs:EPSG::4326" gml:id="hash_test_1.geom0"><gml:pos>49 2</gml:pos></gml:Point></ogr:geometryProperty>') >= 0
+    assert '<ogr:geometryProperty><gml:Point srsName="urn:ogc:def:crs:EPSG::4326" gml:id="hash_test_1.geom0"><gml:pos>49 2</gml:pos></gml:Point></ogr:geometryProperty>' in content
 
     # Test TIMESTAMP option
     src_ds = gdal.OpenEx('GMLAS:data/gmlas/gmlas_geometryproperty_gml32_no_error.gml',
@@ -2259,8 +2259,8 @@ def test_ogr_gmlas_writer_options():
 
     assert gdal.VSIStatL('/vsimem/my_schema.xsd') is None
 
-    assert (content.find('timeStamp="1970-01-01T12:34:56Z"') >= 0 and \
-       content.find('xsi:schemaLocation="http://www.opengis.net/wfs/2.0 http://schemas.opengis.net/wfs/2.0/wfs.xsd ') >= 0)
+    assert ('timeStamp="1970-01-01T12:34:56Z"' in content and \
+       'xsi:schemaLocation="http://www.opengis.net/wfs/2.0 http://schemas.opengis.net/wfs/2.0/wfs.xsd ' in content)
 
     # Test WFS20_SCHEMALOCATION option
     src_ds = gdal.OpenEx('GMLAS:data/gmlas/gmlas_geometryproperty_gml32_no_error.gml',
@@ -2306,7 +2306,7 @@ def test_ogr_gmlas_writer_options():
 
     assert gdal.VSIStatL('/vsimem/my_schema.xsd') is None
 
-    assert content.find('xsi:schemaLocation="http://www.opengis.net/wfs/2.0 /vsimem/fake_wfs.xsd ') >= 0
+    assert 'xsi:schemaLocation="http://www.opengis.net/wfs/2.0 /vsimem/fake_wfs.xsd ' in content
 
 ###############################################################################
 # Test writing support error handle
diff --git a/autotest/ogr/ogr_gpkg.py b/autotest/ogr/ogr_gpkg.py
index 1376cd920430..403c63110370 100755
--- a/autotest/ogr/ogr_gpkg.py
+++ b/autotest/ogr/ogr_gpkg.py
@@ -2324,7 +2324,7 @@ def test_ogr_gpkg_34():
     content = gdal.VSIFReadL(1, 1000000, f).decode('latin1')
     gdal.VSIFCloseL(f)
 
-    assert content.find(layer_name) >= 0
+    assert layer_name in content
 
     ds = ogr.Open(dbname, update=1)
     new_layer_name = """weird2'layer"name"""
@@ -2341,7 +2341,7 @@ def test_ogr_gpkg_34():
     content = gdal.VSIFReadL(1, 1000000, f).decode('latin1')
     gdal.VSIFCloseL(f)
 
-    assert content.find(layer_name) < 0
+    assert layer_name not in content
     layer_name = new_layer_name
 
     ds = ogr.Open(dbname, update=1)
@@ -2359,7 +2359,7 @@ def test_ogr_gpkg_34():
     content = gdal.VSIFReadL(1, 1000000, f).decode('latin1')
     gdal.VSIFCloseL(f)
 
-    assert content.find(layer_name) < 0
+    assert layer_name not in content
 
     gdaltest.gpkg_dr.DeleteDataSource(dbname)
 
@@ -2390,9 +2390,9 @@ def test_ogr_gpkg_34():
     content = gdal.VSIFReadL(1, 1000000, f).decode('latin1')
     gdal.VSIFCloseL(f)
 
-    assert content.find(layer_name) < 0
+    assert layer_name not in content
 
-    assert content.find('another_layer_name') < 0
+    assert 'another_layer_name' not in content
 
     gdaltest.gpkg_dr.DeleteDataSource(dbname)
 
@@ -2491,7 +2491,7 @@ def test_ogr_gpkg_35():
     content = gdal.VSIFReadL(1, 1000000, f).decode('latin1')
     gdal.VSIFCloseL(f)
 
-    assert content.find('bar_i_will_disappear') < 0
+    assert 'bar_i_will_disappear' not in content
 
     gdaltest.gpkg_dr.DeleteDataSource(dbname)
 
@@ -2602,7 +2602,7 @@ def test_ogr_gpkg_36():
     content = gdal.VSIFReadL(1, 1000000, f).decode('latin1')
     gdal.VSIFCloseL(f)
 
-    assert content.find('foo') < 0
+    assert 'foo' not in content
 
     gdaltest.gpkg_dr.DeleteDataSource(dbname)
 
diff --git a/autotest/ogr/ogr_jml.py b/autotest/ogr/ogr_jml.py
index 7745b6f0b392..b6f6ae9d538f 100755
--- a/autotest/ogr/ogr_jml.py
+++ b/autotest/ogr/ogr_jml.py
@@ -335,7 +335,7 @@ def test_ogr_jml_2():
     data = gdal.VSIFReadL(1, 10000, f).decode('ascii')
     gdal.VSIFCloseL(f)
 
-    assert data.find('112233') >= 0 and data.find('445566') >= 0
+    assert '112233' in data and '445566' in data
 
     gdal.Unlink('/vsimem/ogr_jml.jml')
 
@@ -351,7 +351,7 @@ def test_ogr_jml_2():
     data = gdal.VSIFReadL(1, 10000, f).decode('ascii')
     gdal.VSIFCloseL(f)
 
-    assert data.find('R_G_B') < 0
+    assert 'R_G_B' not in data
 
     gdal.Unlink('/vsimem/ogr_jml.jml')
 
@@ -368,7 +368,7 @@ def test_ogr_jml_2():
     data = gdal.VSIFReadL(1, 10000, f).decode('ascii')
     gdal.VSIFCloseL(f)
 
-    assert data.find('OGR_STYLE') >= 0 and data.find('PEN(c:#445566)') >= 0
+    assert 'OGR_STYLE' in data and 'PEN(c:#445566)' in data
 
     gdal.Unlink('/vsimem/ogr_jml.jml')
 
@@ -387,7 +387,7 @@ def test_ogr_jml_2():
     data = gdal.VSIFReadL(1, 10000, f).decode('ascii')
     gdal.VSIFCloseL(f)
 
-    assert data.find('OGR_STYLE') >= 0 and data.find('PEN(c:#445566)') >= 0 and data.find('112233') >= 0
+    assert 'OGR_STYLE' in data and 'PEN(c:#445566)' in data and '112233' in data
 
     gdal.Unlink('/vsimem/ogr_jml.jml')
 
diff --git a/autotest/ogr/ogr_kml.py b/autotest/ogr/ogr_kml.py
index b686280c2e27..e4db61a7c4d2 100755
--- a/autotest/ogr/ogr_kml.py
+++ b/autotest/ogr/ogr_kml.py
@@ -363,7 +363,7 @@ def test_ogr_kml_check_write_1():
         pytest.skip()
 
     content = open('tmp/kml.kml').read()
-    assert content.find('Schema') < 0, 'Did not expect Schema tags.'
+    assert 'Schema' not in content, 'Did not expect Schema tags.'
 
     ds = ogr.Open('tmp/kml.kml')
     lyr = ds.GetLayerByName('test_wgs84')
diff --git a/autotest/ogr/ogr_mitab.py b/autotest/ogr/ogr_mitab.py
index ef81e18b5b7a..40df8bcf3210 100755
--- a/autotest/ogr/ogr_mitab.py
+++ b/autotest/ogr/ogr_mitab.py
@@ -556,11 +556,11 @@ def test_ogr_mitab_18():
         lyr = ds.GetLayer(0)
         sr_got = lyr.GetSpatialRef()
         wkt = sr_got.ExportToWkt()
-        if wkt.find('2154') < 0:
+        if '2154' not in wkt:
             print(filename)
             pytest.fail(sr_got)
         proj4 = sr_got.ExportToProj4()
-        assert proj4.find('+proj=lcc +lat_1=49 +lat_2=44 +lat_0=46.5 +lon_0=3 +x_0=700000 +y_0=6600000 +ellps=GRS80 +towgs84=0,0,0,0,0,0,0 +units=m +no_defs') == 0
+        assert proj4.startswith('+proj=lcc +lat_1=49 +lat_2=44 +lat_0=46.5 +lon_0=3 +x_0=700000 +y_0=6600000 +ellps=GRS80 +towgs84=0,0,0,0,0,0,0 +units=m +no_defs')
         ds = None
 
     ogr.GetDriverByName('MapInfo File').DeleteDataSource('/vsimem/ogr_mitab_18.tab')
diff --git a/autotest/ogr/ogr_oci.py b/autotest/ogr/ogr_oci.py
index 0c969734e831..510c439090f1 100755
--- a/autotest/ogr/ogr_oci.py
+++ b/autotest/ogr/ogr_oci.py
@@ -746,7 +746,7 @@ def test_ogr_oci_18():
         assert feat.GetGeometryRef().ExportToWkt() == wkt
 
     dsname = os.environ['OCI_DSNAME']
-    if dsname.find('@') < 0:
+    if '@' not in dsname:
         dsname = dsname + '@:test_NONE'
     else:
         dsname = dsname + ':test_NONE'
diff --git a/autotest/ogr/ogr_openfilegdb.py b/autotest/ogr/ogr_openfilegdb.py
index cf943e773053..961ea63b1367 100755
--- a/autotest/ogr/ogr_openfilegdb.py
+++ b/autotest/ogr/ogr_openfilegdb.py
@@ -739,7 +739,7 @@ def test_ogr_openfilegdb_7():
         ds.ReleaseResultSet(sql_lyr)
         assert optimized == expected_optimized, (sql, feat_count, first_fid)
 
-        if optimized and sql.find('big_layer') < 0:
+        if optimized and 'big_layer' not in sql:
             import test_cli_utilities
             if test_cli_utilities.get_test_ogrsf_path() is not None:
                 ret = gdaltest.runexternal(test_cli_utilities.get_test_ogrsf_path() + ' -ro data/testopenfilegdb.gdb.zip -sql "%s"' % sql)
diff --git a/autotest/ogr/ogr_pg.py b/autotest/ogr/ogr_pg.py
index c8887b8d451d..f7f8ab8ada9a 100755
--- a/autotest/ogr/ogr_pg.py
+++ b/autotest/ogr/ogr_pg.py
@@ -3258,7 +3258,7 @@ def test_ogr_pg_71():
         if not gdaltest.pg_has_postgis_2 and wkt == 'CURVEPOLYGON EMPTY':
             continue
         # Parsing error of WKT by PostGIS 1.X
-        if not gdaltest.pg_has_postgis_2 and wkt.find('MULTICURVE') >= 0 and wkt.find('CIRCULARSTRING') >= 0:
+        if not gdaltest.pg_has_postgis_2 and 'MULTICURVE' in wkt and 'CIRCULARSTRING' in wkt:
             continue
 
         postgis_in_wkt = wkt
@@ -3280,7 +3280,7 @@ def test_ogr_pg_71():
         gdaltest.pg_ds.ReleaseResultSet(lyr)
 
         expected_wkt = wkt
-        if not gdaltest.pg_has_postgis_2 and wkt.find('EMPTY') >= 0:
+        if not gdaltest.pg_has_postgis_2 and 'EMPTY' in wkt:
             expected_wkt = 'GEOMETRYCOLLECTION EMPTY'
         assert out_wkt == expected_wkt
 
@@ -3299,7 +3299,7 @@ def test_ogr_pg_71():
         gdaltest.pg_ds.ReleaseResultSet(lyr)
 
         expected_wkt = wkt
-        if not gdaltest.pg_has_postgis_2 and wkt.find('EMPTY') >= 0:
+        if not gdaltest.pg_has_postgis_2 and 'EMPTY' in wkt:
             expected_wkt = 'GEOMETRYCOLLECTION EMPTY'
         assert out_wkt == expected_wkt
 
@@ -3318,7 +3318,7 @@ def test_ogr_pg_71():
         fid = f.GetFID()
 
         # AsEWKT() in PostGIS 1.X does not like CIRCULARSTRING EMPTY
-        if not gdaltest.pg_has_postgis_2 and wkt.find('CIRCULARSTRING') >= 0 and wkt.find('EMPTY') >= 0:
+        if not gdaltest.pg_has_postgis_2 and 'CIRCULARSTRING' in wkt and 'EMPTY' in wkt:
             continue
 
         lyr = gdaltest.pg_ds.ExecuteSQL("SELECT %s(wkb_geometry) FROM %s WHERE ogc_fid = %d" % (fct, active_lyr.GetName(), fid))
diff --git a/autotest/ogr/ogr_pgdump.py b/autotest/ogr/ogr_pgdump.py
index 55fe1ed0d5df..8820fa9675b4 100755
--- a/autotest/ogr/ogr_pgdump.py
+++ b/autotest/ogr/ogr_pgdump.py
@@ -434,7 +434,7 @@ def test_ogr_pgdump_6():
 
     gdal.Unlink('/vsimem/ogr_pgdump_6.sql')
 
-    assert (not (sql.find("""a\t456\t4.56\t\\N\t2015/06/30 12:34:56\t2015/06/30 12:34:56\t2015/06/30\t12:34:56""") < 0 or \
+    assert (not ("""a\t456\t4.56\t\\N\t2015/06/30 12:34:56\t2015/06/30 12:34:56\t2015/06/30\t12:34:56""" not in sql or \
        sql.find("""ALTER TABLE "public"."test" ADD COLUMN "field_string" VARCHAR DEFAULT 'a''b';""") == -1 or \
        sql.find("""ALTER TABLE "public"."test" ADD COLUMN "field_int" INTEGER DEFAULT 123;""") == -1 or \
        sql.find("""ALTER TABLE "public"."test" ADD COLUMN "field_real" FLOAT8 DEFAULT 1.23;""") == -1 or \
@@ -442,7 +442,7 @@ def test_ogr_pgdump_6():
        sql.find("""ALTER TABLE "public"."test" ADD COLUMN "field_datetime2" timestamp with time zone DEFAULT '2015/06/30 12:34:56+00'::timestamp with time zone;""") == -1 or \
        sql.find("""ALTER TABLE "public"."test" ADD COLUMN "field_date" date DEFAULT CURRENT_DATE;""") == -1 or \
        sql.find("""ALTER TABLE "public"."test" ADD COLUMN "field_time" time DEFAULT CURRENT_TIME;""") == -1 or \
-       sql.find("""b\t456\t4.56\t\\N\t2015/06/30 12:34:56\t2015/06/30 12:34:56\t2015/06/30\t12:34:56""") < 0))
+       """b\t456\t4.56\t\\N\t2015/06/30 12:34:56\t2015/06/30 12:34:56\t2015/06/30\t12:34:56""" not in sql))
 
 ###############################################################################
 # Test creating a field with the fid name (PG_USE_COPY=NO)
@@ -527,8 +527,8 @@ def test_ogr_pgdump_7():
 
     gdal.Unlink('/vsimem/ogr_pgdump_7.sql')
 
-    assert (not (sql.find("""CREATE TABLE "public"."test" (    "myfid" SERIAL,    CONSTRAINT "test_pk" PRIMARY KEY ("myfid") )""") < 0 or \
-       sql.find("""ALTER TABLE "public"."test" ADD COLUMN "myfid" """) >= 0 or \
+    assert (not ("""CREATE TABLE "public"."test" (    "myfid" SERIAL,    CONSTRAINT "test_pk" PRIMARY KEY ("myfid") )""" not in sql or \
+       """ALTER TABLE "public"."test" ADD COLUMN "myfid" """ in sql or \
        sql.find("""INSERT INTO "public"."test" ("myfid" , "str", "str2") VALUES (10, 'first string', 'second string');""") == -1 or \
        sql.find("""INSERT INTO "public"."test" ("str2") VALUES ('second string');""") == -1 or \
        sql.find("""INSERT INTO "public"."test" ("myfid" , "str", "str2") VALUES (12, 'first string', 'second string');""") == -1))
@@ -624,8 +624,8 @@ def test_ogr_pgdump_8():
 
     gdal.Unlink('/vsimem/ogr_pgdump_8.sql')
 
-    assert (not (sql.find("""CREATE TABLE "public"."test" (    "myfid" SERIAL,    CONSTRAINT "test_pk" PRIMARY KEY ("myfid") )""") < 0 or \
-       sql.find("""ALTER TABLE "public"."test" ADD COLUMN "myfid" """) >= 0 or \
+    assert (not ("""CREATE TABLE "public"."test" (    "myfid" SERIAL,    CONSTRAINT "test_pk" PRIMARY KEY ("myfid") )""" not in sql or \
+       """ALTER TABLE "public"."test" ADD COLUMN "myfid" """ in sql or \
        sql.find("""10\tfirst string\tsecond string""") == -1 or \
        sql.find("""INSERT INTO "public"."test" ("str2") VALUES ('second string');""") == -1 or \
        sql.find("""12\tfirst string\tsecond string""") == -1))
@@ -686,10 +686,10 @@ def test_ogr_pgdump_9(pg_use_copy='YES'):
         eofield = '\t'
     else:
         eofield = "'"
-    assert (sql.find("""01234%s""" % eofield) >= 0 and \
-       sql.find("""ABCDE%s""" % eofield) >= 0 and \
-       sql.find("""%s%s""" % (val5, eofield)) >= 0 and \
-       sql.find("""%s%s""" % ('a' + val4, eofield)) >= 0)
+    assert ("""01234%s""" % eofield in sql and \
+       """ABCDE%s""" % eofield in sql and \
+       """%s%s""" % (val5, eofield) in sql and \
+       """%s%s""" % ('a' + val4, eofield) in sql)
 
 
 def test_ogr_pgdump_10():
@@ -716,8 +716,8 @@ def test_ogr_pgdump_11():
     gdal.Unlink('/vsimem/ogr_pgdump_11.sql')
 
     # clang -m32 generates F8FF..., instead of F87F... for all other systems
-    assert (sql.find('0101000000000000000000F87F000000000000F87F') >= 0 or \
-       sql.find('0101000000000000000000F8FF000000000000F8FF') >= 0)
+    assert ('0101000000000000000000F87F000000000000F87F' in sql or \
+       '0101000000000000000000F8FF000000000000F8FF' in sql)
 
 ###############################################################################
 # Test that GEOMETRY_NAME works even when the geometry column creation is
@@ -739,7 +739,7 @@ def test_ogr_pgdump_12():
 
     gdal.Unlink('/vsimem/ogr_pgdump_12.sql')
 
-    assert sql.find('another_name') >= 0
+    assert 'another_name' in sql
 
 ###############################################################################
 # Test ZM support
@@ -782,7 +782,7 @@ def test_ogr_pgdump_13():
         gdal.Unlink('/vsimem/ogr_pgdump_13.sql')
 
         for expected_string in expected_strings:
-            assert sql.find(expected_string) >= 0, (geom_type, options, wkt, expected_string)
+            assert expected_string in sql, (geom_type, options, wkt, expected_string)
 
         if 'GEOM_TYPE=geography' in options:
             continue
@@ -803,7 +803,7 @@ def test_ogr_pgdump_13():
         gdal.Unlink('/vsimem/ogr_pgdump_13.sql')
 
         for expected_string in expected_strings:
-            assert sql.find(expected_string) >= 0, (geom_type, options, wkt, expected_string)
+            assert expected_string in sql, (geom_type, options, wkt, expected_string)
 
     
 ###############################################################################
@@ -826,7 +826,7 @@ def test_ogr_pgdump_14():
 
     gdal.Unlink('/vsimem/ogr_pgdump_14.sql')
 
-    assert sql.find("""COMMENT ON TABLE "public"."ogr_pgdump_14" IS 'foo';""") >= 0 and sql.find('bar') < 0 and sql.find('baz') < 0
+    assert """COMMENT ON TABLE "public"."ogr_pgdump_14" IS 'foo';""" in sql and 'bar' not in sql and 'baz' not in sql
 
     # Set with SetMetadataItem()
     ds = ogr.GetDriverByName('PGDump').CreateDataSource('/vsimem/ogr_pgdump_14.sql', options=['LINEFORMAT=LF'])
@@ -839,7 +839,7 @@ def test_ogr_pgdump_14():
     gdal.VSIFCloseL(f)
 
     gdal.Unlink('/vsimem/ogr_pgdump_14.sql')
-    assert sql.find("""COMMENT ON TABLE "public"."ogr_pgdump_14" IS 'bar';""") >= 0
+    assert """COMMENT ON TABLE "public"."ogr_pgdump_14" IS 'bar';""" in sql
 
     # Set with SetMetadata()
     ds = ogr.GetDriverByName('PGDump').CreateDataSource('/vsimem/ogr_pgdump_14.sql', options=['LINEFORMAT=LF'])
@@ -852,7 +852,7 @@ def test_ogr_pgdump_14():
     gdal.VSIFCloseL(f)
 
     gdal.Unlink('/vsimem/ogr_pgdump_14.sql')
-    assert sql.find("""COMMENT ON TABLE "public"."ogr_pgdump_14" IS 'baz';""") >= 0
+    assert """COMMENT ON TABLE "public"."ogr_pgdump_14" IS 'baz';""" in sql
 
 ###############################################################################
 # NULL vs unset
@@ -877,8 +877,8 @@ def test_ogr_pgdump_15():
 
     gdal.Unlink('/vsimem/ogr_pgdump_15.sql')
 
-    assert (sql.find('INSERT INTO "public"."test" ("str") VALUES (NULL)') >= 0 or \
-       sql.find('INSERT INTO "public"."test" DEFAULT VALUES') >= 0)
+    assert ('INSERT INTO "public"."test" ("str") VALUES (NULL)' in sql or \
+       'INSERT INTO "public"."test" DEFAULT VALUES' in sql)
 
 ###############################################################################
 # Test sequence updating
@@ -904,7 +904,7 @@ def test_ogr_pgdump_16():
 
         gdal.Unlink('/vsimem/ogr_pgdump_16.sql')
 
-        assert sql.find("""SELECT setval(pg_get_serial_sequence('"public"."test"', 'ogc_fid'), MAX("ogc_fid")) FROM "public"."test";""") >= 0
+        assert """SELECT setval(pg_get_serial_sequence('"public"."test"', 'ogc_fid'), MAX("ogc_fid")) FROM "public"."test";""" in sql
 
     gdal.SetConfigOption('PG_USE_COPY', None)
 
diff --git a/autotest/ogr/ogr_shape.py b/autotest/ogr/ogr_shape.py
index 0e049cd76fb8..c31e6449b2d9 100755
--- a/autotest/ogr/ogr_shape.py
+++ b/autotest/ogr/ogr_shape.py
@@ -1110,7 +1110,7 @@ def test_ogr_shape_29():
     for filename in lst:
         assert filename in ['.', '..', 'UPPERCASE.SHP', 'UPPERCASE.SHX', 'UPPERCASE.DBF', 'UPPERCASE.CPG'], \
             lst
-        assert filename.find('packed') < 0, lst
+        assert 'packed' not in filename, lst
 
     
 ###############################################################################
diff --git a/autotest/ogr/ogr_sqlite.py b/autotest/ogr/ogr_sqlite.py
index a51a29410d78..0fe17b1358a5 100755
--- a/autotest/ogr/ogr_sqlite.py
+++ b/autotest/ogr/ogr_sqlite.py
@@ -1790,7 +1790,7 @@ def test_ogr_spatialite_7(require_spatialite):
 
 
 def test_ogr_spatialite_8(require_spatialite):
-    if require_spatialite.find('2.3') == 0:
+    if require_spatialite.startswith('2.3'):
         pytest.skip()
 
     try:
@@ -2840,13 +2840,13 @@ def test_ogr_sqlite_44():
     data = gdal.VSIFReadL(1, 10000, f).decode('ascii')
     gdal.VSIFCloseL(f)
 
-    assert data.find('stringlist,intlist,int64list,reallist,wkt\n"[ ""a"", """" ]",[ 1 ],[ 1234567890123 ],[ 0.125') == 0
+    assert data.startswith('stringlist,intlist,int64list,reallist,wkt\n"[ ""a"", """" ]",[ 1 ],[ 1234567890123 ],[ 0.125')
 
     f = gdal.VSIFOpenL('/vsimem/ogr_sqlite_44_out.csvt', 'rb')
     data = gdal.VSIFReadL(1, 10000, f).decode('ascii')
     gdal.VSIFCloseL(f)
 
-    assert data.find('JSonStringList,JSonIntegerList,JSonInteger64List,JSonRealList') == 0
+    assert data.startswith('JSonStringList,JSonIntegerList,JSonInteger64List,JSonRealList')
 
     gdal.Unlink('/vsimem/ogr_sqlite_44.csv')
     gdal.Unlink('/vsimem/ogr_sqlite_44.csvt')
diff --git a/autotest/ogr/ogr_virtualogr.py b/autotest/ogr/ogr_virtualogr.py
index ca0f5aa0ac59..d0d2ba915050 100755
--- a/autotest/ogr/ogr_virtualogr.py
+++ b/autotest/ogr/ogr_virtualogr.py
@@ -205,7 +205,7 @@ def test_ogr_virtualogr_3():
 
     ret = gdaltest.runexternal(python_exe + ' ogr_as_sqlite_extension.py "%s" "%s"' % (libsqlite_name, libgdal_name), check_memleak=False)
 
-    if ret.find('skip') == 0:
+    if ret.startswith('skip'):
         pytest.skip()
     assert gdal.VersionInfo('RELEASE_NAME') in ret
 
diff --git a/autotest/ogr/ogr_wfs.py b/autotest/ogr/ogr_wfs.py
index 2968d0c95bc8..b7e30630ac06 100755
--- a/autotest/ogr/ogr_wfs.py
+++ b/autotest/ogr/ogr_wfs.py
@@ -702,7 +702,7 @@ def test_ogr_wfs_xmldescriptionfile():
     getcapabilitieslayer = ds.GetLayerByName('WFSGetCapabilities')
     getcapabilitieslayer_feat = getcapabilitieslayer.GetNextFeature()
     getcapabilitieslayer_content = getcapabilitieslayer_feat.GetFieldAsString(0)
-    assert getcapabilitieslayer_content.find('<WFS_Capabilities') == 0, \
+    assert getcapabilitieslayer_content.startswith('<WFS_Capabilities'), \
         'did not get expected result'
 
     ds = None
diff --git a/autotest/osr/osr_basic.py b/autotest/osr/osr_basic.py
index 0032f05e76bd..65616c7dfd69 100755
--- a/autotest/osr/osr_basic.py
+++ b/autotest/osr/osr_basic.py
@@ -545,7 +545,7 @@ def test_osr_basic_18():
 
     # This is a dummy one, but who cares
     wkt = osr.GetUserInputAsWKT('http://www.opengis.net/def/crs-compound?1=http://www.opengis.net/def/crs/EPSG/0/4326&2=http://www.opengis.net/def/crs/EPSG/0/4326')
-    assert wkt.find('COMPD_CS') == 0, 'CRS URL parsing not as expected.'
+    assert wkt.startswith('COMPD_CS'), 'CRS URL parsing not as expected.'
 
 ###############################################################################
 # Test well known GCS names against their corresponding EPSG definitions (#6080)
diff --git a/autotest/osr/osr_compd.py b/autotest/osr/osr_compd.py
index b5b1f07d972c..1094fc1121f2 100755
--- a/autotest/osr/osr_compd.py
+++ b/autotest/osr/osr_compd.py
@@ -337,7 +337,7 @@ def test_osr_compd_8():
     assert srs.Validate() == 0, 'Does not validate'
 
     wkt = srs.ExportToWkt()
-    assert wkt.find('COMPD_CS') == 0, 'COMPD_CS not recognised as compound.'
+    assert wkt.startswith('COMPD_CS'), 'COMPD_CS not recognised as compound.'
 
 
 
diff --git a/autotest/osr/osr_esri.py b/autotest/osr/osr_esri.py
index 9f2b8f7eafa9..ef6d5f1134e2 100755
--- a/autotest/osr/osr_esri.py
+++ b/autotest/osr/osr_esri.py
@@ -1248,7 +1248,7 @@ def test_osr_esri_28():
     srs.MorphToESRI()
     got_wkt = srs.ExportToPrettyWkt()
     # Do not do exact test because of subtle difference of precision among compilers
-    assert got_wkt.find("""PROJCS["Segara_Jakarta_NEIEZ_deprecated",
+    assert got_wkt.startswith("""PROJCS["Segara_Jakarta_NEIEZ_deprecated",
     GEOGCS["GCS_Segara (Jakarta)",
         DATUM["D_Gunung_Segara",
             SPHEROID["Bessel_1841",6377397.155,299.1528128]],
@@ -1258,12 +1258,12 @@ def test_osr_esri_28():
     PARAMETER["central_meridian",110],
     PARAMETER["false_easting",3900000],
     PARAMETER["false_northing",900000],
-    PARAMETER["standard_parallel_1",4.45405154""") == 0
+    PARAMETER["standard_parallel_1",4.45405154""")
 
     srs.MorphFromESRI()
     got_wkt = srs.ExportToPrettyWkt()
     # Do not do exact test because of subtle difference of precision among compilers
-    assert got_wkt.find("""PROJCS["Segara_Jakarta_NEIEZ_deprecated",
+    assert got_wkt.startswith("""PROJCS["Segara_Jakarta_NEIEZ_deprecated",
     GEOGCS["GCS_Segara (Jakarta)",
         DATUM["Gunung_Segara_Jakarta",
             SPHEROID["Bessel_1841",6377397.155,299.1528128]],
@@ -1273,7 +1273,7 @@ def test_osr_esri_28():
     PARAMETER["central_meridian",110],
     PARAMETER["false_easting",3900000],
     PARAMETER["false_northing",900000],
-    PARAMETER["standard_parallel_1",4.45405154""") == 0
+    PARAMETER["standard_parallel_1",4.45405154""")
 
 ###############################################################################
 # Test Web Mercator
diff --git a/autotest/osr/osr_micoordsys.py b/autotest/osr/osr_micoordsys.py
index 1eb716ddb2f5..521033ce796d 100755
--- a/autotest/osr/osr_micoordsys.py
+++ b/autotest/osr/osr_micoordsys.py
@@ -96,7 +96,7 @@ def test_osr_micoordsys_3():
     srs = osr.SpatialReference()
     srs.ImportFromMICoordSys('Earth Projection 10, 157, "m", 0')
     wkt = srs.ExportToWkt()
-    assert wkt.find('EXTENSION["PROJ4"') >= 0
+    assert 'EXTENSION["PROJ4"' in wkt
 
     # Transform again to MITAB (we no longer have the EPSG code, so we rely on PROJ4 extension node)
     proj = srs.ExportToMICoordSys()
diff --git a/autotest/osr/osr_proj4.py b/autotest/osr/osr_proj4.py
index acc6d4d9173c..f528e6990026 100755
--- a/autotest/osr/osr_proj4.py
+++ b/autotest/osr/osr_proj4.py
@@ -478,7 +478,7 @@ def test_osr_proj4_12():
     srs.ImportFromProj4("+init=epsg:4326")
     wkt = srs.ExportToPrettyWkt()
 
-    if wkt.find("""GEOGCS["WGS 84""") != 0:
+    if not wkt.startswith("""GEOGCS["WGS 84"""):
         print('Got:%s' % wkt)
         print('Expected:%s' % expect_wkt)
         pytest.fail('Did not get expected result.')
@@ -736,7 +736,7 @@ def test_osr_proj4_21():
     got = srs.ExportToProj4()
     gdal.SetConfigOption('OVERRIDE_PROJ_DATUM_WITH_TOWGS84', None)
 
-    assert got.find('+proj=longlat +datum=nzgd49') == 0
+    assert got.startswith('+proj=longlat +datum=nzgd49')
 
 ###############################################################################
 # Test importing ellipsoid defined with +R
@@ -748,7 +748,7 @@ def test_osr_proj4_22():
     srs.ImportFromProj4("+proj=longlat +R=1")
     got = srs.ExportToProj4()
 
-    assert got.find('+proj=longlat +a=1 +b=1') == 0
+    assert got.startswith('+proj=longlat +a=1 +b=1')
 
 ###############################################################################
 # Test importing ellipsoid defined with +a and +f
@@ -761,13 +761,13 @@ def test_osr_proj4_23():
     srs.ImportFromProj4("+proj=longlat +a=1 +f=0")
     got = srs.ExportToProj4()
 
-    assert got.find('+proj=longlat +a=1 +b=1') == 0
+    assert got.startswith('+proj=longlat +a=1 +b=1')
 
     srs = osr.SpatialReference()
     srs.ImportFromProj4("+proj=longlat +a=2 +f=0.5")
     got = srs.ExportToProj4()
 
-    assert got.find('+proj=longlat +a=2 +b=1') == 0
+    assert got.startswith('+proj=longlat +a=2 +b=1')
 
 ###############################################################################
 # Test importing linear units defined with +to_meter
@@ -779,28 +779,28 @@ def test_osr_proj4_24():
     srs.ImportFromProj4("+proj=merc +to_meter=1.0")
     got = srs.ExportToProj4()
 
-    assert got.find('+units=m') >= 0
+    assert '+units=m' in got
 
     # Intl foot
     srs = osr.SpatialReference()
     srs.ImportFromProj4("+proj=merc +to_meter=0.3048")
     got = srs.ExportToProj4()
 
-    assert got.find('+units=ft') >= 0
+    assert '+units=ft' in got
 
     # US foot
     srs = osr.SpatialReference()
     srs.ImportFromProj4("+proj=merc +to_meter=0.3048006096012192")
     got = srs.ExportToProj4()
 
-    assert got.find('+units=us-ft') >= 0
+    assert '+units=us-ft' in got
 
     # unknown
     srs = osr.SpatialReference()
     srs.ImportFromProj4("+proj=merc +to_meter=0.4")
     got = srs.ExportToProj4()
 
-    assert got.find('+to_meter=0.4') >= 0
+    assert '+to_meter=0.4' in got
 
 ###############################################################################
 # Test importing linear units defined with +vto_meter
@@ -815,28 +815,28 @@ def test_osr_proj4_25():
     srs.ImportFromProj4("+proj=merc +geoidgrids=foo +vto_meter=1.0")
     got = srs.ExportToProj4()
 
-    assert got.find('+vunits=m') >= 0
+    assert '+vunits=m' in got
 
     # Intl foot
     srs = osr.SpatialReference()
     srs.ImportFromProj4("+proj=merc +geoidgrids=foo +vto_meter=0.3048")
     got = srs.ExportToProj4()
 
-    assert got.find('+vunits=ft') >= 0
+    assert '+vunits=ft' in got
 
     # US foot
     srs = osr.SpatialReference()
     srs.ImportFromProj4("+proj=merc +geoidgrids=foo +vto_meter=0.3048006096012192")
     got = srs.ExportToProj4()
 
-    assert got.find('+vunits=us-ft') >= 0
+    assert '+vunits=us-ft' in got
 
     # Unknown
     srs = osr.SpatialReference()
     srs.ImportFromProj4("+proj=merc +geoidgrids=foo +vto_meter=0.4")
     got = srs.ExportToProj4()
 
-    assert got.find('+vto_meter=0.4') >= 0
+    assert '+vto_meter=0.4' in got
 
 ###############################################################################
 # Test importing linear units defined with +vunits
@@ -851,21 +851,21 @@ def test_osr_proj4_26():
     srs.ImportFromProj4("+proj=merc +geoidgrids=foo +vunits=m")
     got = srs.ExportToProj4()
 
-    assert got.find('+vunits=m') >= 0
+    assert '+vunits=m' in got
 
     # Intl foot
     srs = osr.SpatialReference()
     srs.ImportFromProj4("+proj=merc +geoidgrids=foo +vunits=ft")
     got = srs.ExportToProj4()
 
-    assert got.find('+vunits=ft') >= 0
+    assert '+vunits=ft' in got
 
     # US yard
     srs = osr.SpatialReference()
     srs.ImportFromProj4("+proj=merc +geoidgrids=foo +vunits=us-yd")
     got = srs.ExportToProj4()
 
-    assert got.find('+vunits=us-yd') >= 0
+    assert '+vunits=us-yd' in got
 
 ###############################################################################
 # Test geostationary +sweep (#6030)
@@ -880,7 +880,7 @@ def test_osr_proj4_27():
     srs.ImportFromProj4("+proj=geos +h=35785831 +lon_0=0 +datum=WGS84 +sweep=x +units=m")
     got = srs.ExportToProj4()
 
-    assert got.find('+proj=geos +h=35785831 +lon_0=0 +datum=WGS84 +sweep=x +units=m') >= 0
+    assert '+proj=geos +h=35785831 +lon_0=0 +datum=WGS84 +sweep=x +units=m' in got
 
 ###############################################################################
 # Test importing +init=epsg: with an override
@@ -892,7 +892,7 @@ def test_osr_proj4_28():
     srs.ImportFromProj4("+init=epsg:32631 +units=cm")
     got = srs.ExportToWkt()
 
-    assert got.find('32631') < 0
+    assert '32631' not in got
 
 
 def test_osr_proj4_28_missing_proj_epsg_dict():
@@ -902,7 +902,7 @@ def test_osr_proj4_28_missing_proj_epsg_dict():
         python_exe = python_exe.replace('\\', '/')
 
     ret = gdaltest.runexternal(python_exe + ' osr_proj4.py osr_proj4_28')
-    assert ret.find('fail') < 0
+    assert 'fail' not in ret
 
 
 def test_osr_proj4_error_cases_export_mercator():
diff --git a/autotest/pymod/gdaltest.py b/autotest/pymod/gdaltest.py
index 27fb48df682d..38b8558bf55a 100644
--- a/autotest/pymod/gdaltest.py
+++ b/autotest/pymod/gdaltest.py
@@ -1335,11 +1335,11 @@ def skip_on_travis():
 def is_travis_branch(name):
     if 'TRAVIS_BRANCH' in os.environ:
         val = os.environ['TRAVIS_BRANCH']
-        if val.find(name) >= 0:
+        if name in val:
             return True
     if 'BUILD_NAME' in os.environ:
         val = os.environ['BUILD_NAME']
-        if val.find(name) >= 0:
+        if name in val:
             return True
     return False
 
@@ -1555,7 +1555,7 @@ def get_opened_files():
 
 def is_file_open(filename):
     for got_filename in get_opened_files():
-        if got_filename.find(filename) >= 0:
+        if filename in got_filename:
             return True
     return False
 
diff --git a/autotest/pymod/xmlvalidate.py b/autotest/pymod/xmlvalidate.py
index c53f4b638855..e75e64eed91c 100644
--- a/autotest/pymod/xmlvalidate.py
+++ b/autotest/pymod/xmlvalidate.py
@@ -47,7 +47,7 @@ def ingest_file_and_strip_mime(filename):
             continue
         if line == '\n':
             continue
-        if line.find('Content-Type') >= 0:
+        if 'Content-Type' in line:
             continue
         data = data + line
     f.close()
@@ -83,7 +83,7 @@ def validate(xml_filename_or_content, xsd_filename=None,
              inspire_schemas_location=None):
 
     try:
-        if xml_filename_or_content.find('<') == 0:
+        if xml_filename_or_content.startswith('<'):
             doc = etree.XML(xml_filename_or_content)
         else:
             doc = etree.XML(ingest_file_and_strip_mime(xml_filename_or_content))
@@ -204,7 +204,7 @@ def validate(xml_filename_or_content, xsd_filename=None,
 def transform_abs_links_to_ref_links(path, level=0):
     for filename in os.listdir(path):
         filename = os.path.join(path, filename)
-        if os.path.isdir(filename) and filename.find('examples') < 0:
+        if os.path.isdir(filename) and 'examples' not in filename:
             transform_abs_links_to_ref_links(filename, level + 1)
         elif filename.endswith('.xsd'):
             f = open(filename, 'rt')
@@ -253,7 +253,7 @@ def transform_abs_links_to_ref_links(path, level=0):
 def transform_inspire_abs_links_to_ref_links(path, level=0):
     for filename in os.listdir(path):
         filename = os.path.join(path, filename)
-        if os.path.isdir(filename) and filename.find('examples') < 0:
+        if os.path.isdir(filename) and 'examples' not in filename:
             transform_inspire_abs_links_to_ref_links(filename, level + 1)
         elif filename.endswith('.xsd'):
             f = open(filename, 'rt')
diff --git a/autotest/pyscripts/test_gdal_polygonize.py b/autotest/pyscripts/test_gdal_polygonize.py
index a8229bbf5993..b596f974b582 100755
--- a/autotest/pyscripts/test_gdal_polygonize.py
+++ b/autotest/pyscripts/test_gdal_polygonize.py
@@ -186,7 +186,7 @@ def test_gdal_polygonize_4():
 
     os.unlink('tmp/out.gml')
 
-    assert content.find('<ogr:geometryProperty><gml:Polygon srsName="EPSG:26711"><gml:outerBoundaryIs><gml:LinearRing><gml:coordinates>440720,3751320 440720,3750120 441920,3750120 441920,3751320 440720,3751320</gml:coordinates></gml:LinearRing></gml:outerBoundaryIs></gml:Polygon></ogr:geometryProperty>') >= 0
+    assert '<ogr:geometryProperty><gml:Polygon srsName="EPSG:26711"><gml:outerBoundaryIs><gml:LinearRing><gml:coordinates>440720,3751320 440720,3750120 441920,3750120 441920,3751320 440720,3751320</gml:coordinates></gml:LinearRing></gml:outerBoundaryIs></gml:Polygon></ogr:geometryProperty>' in content
 
     # Test mask,1 syntax
     test_py_scripts.run_py_script(script_path, 'gdal_polygonize', '-q -f GML -b mask,1 ../gcore/data/byte.tif tmp/out.gml')
@@ -195,7 +195,7 @@ def test_gdal_polygonize_4():
 
     os.unlink('tmp/out.gml')
 
-    assert content.find('<ogr:geometryProperty><gml:Polygon srsName="EPSG:26711"><gml:outerBoundaryIs><gml:LinearRing><gml:coordinates>440720,3751320 440720,3750120 441920,3750120 441920,3751320 440720,3751320</gml:coordinates></gml:LinearRing></gml:outerBoundaryIs></gml:Polygon></ogr:geometryProperty>') >= 0
+    assert '<ogr:geometryProperty><gml:Polygon srsName="EPSG:26711"><gml:outerBoundaryIs><gml:LinearRing><gml:coordinates>440720,3751320 440720,3750120 441920,3750120 441920,3751320 440720,3751320</gml:coordinates></gml:LinearRing></gml:outerBoundaryIs></gml:Polygon></ogr:geometryProperty>' in content
 
 
 
diff --git a/autotest/pyscripts/test_gdalmove.py b/autotest/pyscripts/test_gdalmove.py
index 069b3927f7ff..c189f6bc968e 100755
--- a/autotest/pyscripts/test_gdalmove.py
+++ b/autotest/pyscripts/test_gdalmove.py
@@ -56,7 +56,7 @@ def test_gdalmove_1():
     for i in range(6):
         assert abs(got_gt[i] - expected_gt[i]) / abs(got_gt[i]) <= 1e-5, 'bad gt'
     wkt = ds.GetProjection()
-    assert wkt.find('32611') >= 0, 'bad geotransform'
+    assert '32611' in wkt, 'bad geotransform'
     ds = None
 
 ###############################################################################
diff --git a/autotest/pyscripts/test_ogrinfo_py.py b/autotest/pyscripts/test_ogrinfo_py.py
index b5bcf2830f2a..d046275449f9 100755
--- a/autotest/pyscripts/test_ogrinfo_py.py
+++ b/autotest/pyscripts/test_ogrinfo_py.py
@@ -191,7 +191,7 @@ def test_ogrinfo_py_22():
     f.close()
 
     ret = test_py_scripts.run_py_script(script_path, 'ogrinfo', 'tmp/test_ogrinfo_22.csv')
-    assert ret.find('1: test_ogrinfo_22 (Unknown (any), Unknown (any))') >= 0
+    assert '1: test_ogrinfo_22 (Unknown (any), Unknown (any))' in ret
 
     ret = test_py_scripts.run_py_script(script_path, 'ogrinfo', '-al tmp/test_ogrinfo_22.csv')
     expected_ret = """INFO: Open of `tmp/test_ogrinfo_22.csv'
diff --git a/autotest/pyscripts/test_ogrmerge.py b/autotest/pyscripts/test_ogrmerge.py
index a3a24dda54db..1c0278686f8a 100755
--- a/autotest/pyscripts/test_ogrmerge.py
+++ b/autotest/pyscripts/test_ogrmerge.py
@@ -241,9 +241,9 @@ def test_ogrmerge_8():
         gdal.VSIFCloseL(f)
     gdal.Unlink('tmp/out.vrt')
 
-    assert content.find('<SrcSRS>EPSG:32630</SrcSRS>') >= 0
+    assert '<SrcSRS>EPSG:32630</SrcSRS>' in content
 
-    assert content.find('<TargetSRS>EPSG:4326</TargetSRS>') >= 0
+    assert '<TargetSRS>EPSG:4326</TargetSRS>' in content
 
 ###############################################################################
 # Test -s_srs -t_srs in default mode
@@ -269,9 +269,9 @@ def test_ogrmerge_9():
         gdal.VSIFCloseL(f)
     gdal.Unlink('tmp/out.vrt')
 
-    assert content.find('<SrcSRS>EPSG:32630</SrcSRS>') >= 0
+    assert '<SrcSRS>EPSG:32630</SrcSRS>' in content
 
-    assert content.find('<TargetSRS>EPSG:4326</TargetSRS>') >= 0
+    assert '<TargetSRS>EPSG:4326</TargetSRS>' in content
 
 ###############################################################################
 # Test -a_srs in -single mode
@@ -297,7 +297,7 @@ def test_ogrmerge_10():
         gdal.VSIFCloseL(f)
     gdal.Unlink('tmp/out.vrt')
 
-    assert content.find('<LayerSRS>EPSG:32630</LayerSRS>') >= 0
+    assert '<LayerSRS>EPSG:32630</LayerSRS>' in content
 
 ###############################################################################
 # Test -a_srs in default mode
@@ -323,7 +323,7 @@ def test_ogrmerge_11():
         gdal.VSIFCloseL(f)
     gdal.Unlink('tmp/out.vrt')
 
-    assert content.find('<LayerSRS>EPSG:32630</LayerSRS>') >= 0
+    assert '<LayerSRS>EPSG:32630</LayerSRS>' in content
 
 ###############################################################################
 # Test layer names with accents
diff --git a/autotest/utilities/test_gdal_grid.py b/autotest/utilities/test_gdal_grid.py
index 40a72ed59818..1923a776c711 100755
--- a/autotest/utilities/test_gdal_grid.py
+++ b/autotest/utilities/test_gdal_grid.py
@@ -287,7 +287,7 @@ def test_gdal_grid_3():
     # Create a GDAL dataset from the values of "grid.csv".
     print('Step 2: Trying SSE optimized version...')
     (_, err) = gdaltest.runexternal_out_and_err(gdal_grid + ' --debug on --config GDAL_USE_AVX NO -txe 440720.0 441920.0 -tye 3751320.0 3750120.0 -outsize 20 20 -ot Float64 -l grid -a invdist:power=2.0:smoothing=0.0:radius1=0.0:radius2=0.0:angle=0.0:max_points=0:min_points=0:nodata=0.0 data/grid.vrt ' + outfiles[-1])
-    if err.find('SSE') >= 0:
+    if 'SSE' in err:
         print('...SSE optimized version used')
     else:
         print('...SSE optimized version NOT used')
@@ -314,7 +314,7 @@ def test_gdal_grid_3():
     # Create a GDAL dataset from the values of "grid.csv".
     print('Step 3: Trying AVX optimized version...')
     (_, err) = gdaltest.runexternal_out_and_err(gdal_grid + ' --debug on -txe 440720.0 441920.0 -tye 3751320.0 3750120.0 -outsize 20 20 -ot Float64 -l grid -a invdist:power=2.0:smoothing=0.0:radius1=0.0:radius2=0.0:angle=0.0:max_points=0:min_points=0:nodata=0.0 data/grid.vrt ' + outfiles[-1])
-    if err.find('AVX') >= 0:
+    if 'AVX' in err:
         print('...AVX optimized version used')
     else:
         print('...AVX optimized version NOT used')
diff --git a/autotest/utilities/test_gdal_translate.py b/autotest/utilities/test_gdal_translate.py
index 911d6e36ba00..2cc8b9c818ba 100755
--- a/autotest/utilities/test_gdal_translate.py
+++ b/autotest/utilities/test_gdal_translate.py
@@ -737,7 +737,7 @@ def test_gdal_translate_33():
     os.unlink('tmp/test_gdal_translate_33.tif')
 
     (_, err) = gdaltest.runexternal_out_and_err(test_cli_utilities.get_gdal_translate_path() + ' -outsize 0 0 ../gdrivers/data/small_world.tif tmp/test_gdal_translate_33.tif')
-    assert err.find('-outsize 0 0 invalid') >= 0
+    assert '-outsize 0 0 invalid' in err
 
 ###############################################################################
 # Test NBITS is preserved
@@ -764,16 +764,16 @@ def test_gdal_translate_35():
         pytest.skip()
 
     (_, err) = gdaltest.runexternal_out_and_err(test_cli_utilities.get_gdal_translate_path())
-    assert err.find('No source dataset specified') >= 0
+    assert 'No source dataset specified' in err
 
     (_, err) = gdaltest.runexternal_out_and_err(test_cli_utilities.get_gdal_translate_path() + ' ../gcore/data/byte.tif')
-    assert err.find('No target dataset specified') >= 0
+    assert 'No target dataset specified' in err
 
     (_, err) = gdaltest.runexternal_out_and_err(test_cli_utilities.get_gdal_translate_path() + ' /non_existing_path/non_existing.tif /vsimem/out.tif')
-    assert err.find('does not exist in the file system') >= 0 or err.find('No such file or directory') >= 0
+    assert 'does not exist in the file system' in err or 'No such file or directory' in err
 
     (_, err) = gdaltest.runexternal_out_and_err(test_cli_utilities.get_gdal_translate_path() + ' ../gcore/data/byte.tif /non_existing_path/non_existing.tif')
-    assert err.find('Attempt to create new tiff file') >= 0
+    assert 'Attempt to create new tiff file' in err
 
 ###############################################################################
 # Test RAT is copied from hfa to gtiff - continuous/athematic
diff --git a/autotest/utilities/test_gdalbuildvrt.py b/autotest/utilities/test_gdalbuildvrt.py
index f1f800dce58c..c3992fddd18e 100755
--- a/autotest/utilities/test_gdalbuildvrt.py
+++ b/autotest/utilities/test_gdalbuildvrt.py
@@ -479,10 +479,10 @@ def test_gdalbuildvrt_16():
     (out, err) = gdaltest.runexternal_out_and_err(test_cli_utilities.get_gdalbuildvrt_path() + ' /non_existing_dir/non_existing_subdir/out.vrt ../gcore/data/byte.tif')
 
     if not gdaltest.is_travis_branch('mingw'):
-        assert err.find('ERROR ret code = 1') >= 0, out
+        assert 'ERROR ret code = 1' in err, out
     else:
         # We don't get the error code on Travis mingw
-        assert err.find('ERROR') >= 0, out
+        assert 'ERROR' in err, out
 
     
 ###############################################################################
diff --git a/autotest/utilities/test_gdalinfo.py b/autotest/utilities/test_gdalinfo.py
index 61982e4551ce..89d6e668a846 100755
--- a/autotest/utilities/test_gdalinfo.py
+++ b/autotest/utilities/test_gdalinfo.py
@@ -204,7 +204,7 @@ def test_gdalinfo_11():
         pytest.skip()
 
     ret = gdaltest.runexternal(test_cli_utilities.get_gdalinfo_path() + ' --version', check_memleak=False)
-    assert ret.find(gdal.VersionInfo('--version')) == 0
+    assert ret.startswith(gdal.VersionInfo('--version'))
 
 ###############################################################################
 # Test gdalinfo --build
@@ -216,7 +216,7 @@ def test_gdalinfo_12():
 
     ret = gdaltest.runexternal(test_cli_utilities.get_gdalinfo_path() + ' --build', check_memleak=False)
     ret = ret.replace('\r\n', '\n')
-    assert ret.find(gdal.VersionInfo('BUILD_INFO')) == 0
+    assert ret.startswith(gdal.VersionInfo('BUILD_INFO'))
 
 ###############################################################################
 # Test gdalinfo --license
@@ -228,7 +228,7 @@ def test_gdalinfo_13():
 
     ret = gdaltest.runexternal(test_cli_utilities.get_gdalinfo_path() + ' --license', check_memleak=False)
     ret = ret.replace('\r\n', '\n')
-    if ret.find(gdal.VersionInfo('LICENSE')) != 0:
+    if not ret.startswith(gdal.VersionInfo('LICENSE')):
         print(gdal.VersionInfo('LICENSE'))
         if gdaltest.is_travis_branch('mingw'):
             return 'expected_fail'
@@ -244,7 +244,7 @@ def test_gdalinfo_14():
         pytest.skip()
 
     (_, err) = gdaltest.runexternal_out_and_err(test_cli_utilities.get_gdalinfo_path() + ' --config', check_memleak=False)
-    assert err.find('--config option given without a key and value argument') >= 0
+    assert '--config option given without a key and value argument' in err
 
 ###############################################################################
 # Test erroneous use of --mempreload.
@@ -255,7 +255,7 @@ def test_gdalinfo_15():
         pytest.skip()
 
     (_, err) = gdaltest.runexternal_out_and_err(test_cli_utilities.get_gdalinfo_path() + ' --mempreload', check_memleak=False)
-    assert err.find('--mempreload option given without directory path') >= 0
+    assert '--mempreload option given without directory path' in err
 
 ###############################################################################
 # Test --mempreload
@@ -266,7 +266,7 @@ def test_gdalinfo_16():
         pytest.skip()
 
     (ret, _) = gdaltest.runexternal_out_and_err(test_cli_utilities.get_gdalinfo_path() + ' --debug on --mempreload ../gcore/data /vsimem/byte.tif', check_memleak=False)
-    assert ret.find('Driver: GTiff/GeoTIFF') == 0
+    assert ret.startswith('Driver: GTiff/GeoTIFF')
 
 ###############################################################################
 # Test erroneous use of --debug.
@@ -277,7 +277,7 @@ def test_gdalinfo_17():
         pytest.skip()
 
     (_, err) = gdaltest.runexternal_out_and_err(test_cli_utilities.get_gdalinfo_path() + ' --debug', check_memleak=False)
-    assert err.find('--debug option given without debug level') >= 0
+    assert '--debug option given without debug level' in err
 
 ###############################################################################
 # Test erroneous use of --optfile.
@@ -288,10 +288,10 @@ def test_gdalinfo_18():
         pytest.skip()
 
     (_, err) = gdaltest.runexternal_out_and_err(test_cli_utilities.get_gdalinfo_path() + ' --optfile', check_memleak=False)
-    assert err.find('--optfile option given without filename') >= 0
+    assert '--optfile option given without filename' in err
 
     (_, err) = gdaltest.runexternal_out_and_err(test_cli_utilities.get_gdalinfo_path() + ' --optfile /foo/bar', check_memleak=False)
-    assert err.find('Unable to open optfile') >= 0
+    assert 'Unable to open optfile' in err
 
 ###############################################################################
 # Test --optfile
@@ -307,7 +307,7 @@ def test_gdalinfo_19():
     f.close()
     ret = gdaltest.runexternal(test_cli_utilities.get_gdalinfo_path() + ' --optfile tmp/optfile.txt', check_memleak=False)
     os.unlink('tmp/optfile.txt')
-    assert ret.find('Driver: GTiff/GeoTIFF') == 0
+    assert ret.startswith('Driver: GTiff/GeoTIFF')
 
 ###############################################################################
 # Test --formats
@@ -318,7 +318,7 @@ def test_gdalinfo_20():
         pytest.skip()
 
     ret = gdaltest.runexternal(test_cli_utilities.get_gdalinfo_path() + ' --formats', check_memleak=False)
-    assert ret.find('GTiff -raster- (rw+vs): GeoTIFF') >= 0
+    assert 'GTiff -raster- (rw+vs): GeoTIFF' in ret
 
 ###############################################################################
 # Test erroneous use of --format.
@@ -329,10 +329,10 @@ def test_gdalinfo_21():
         pytest.skip()
 
     (_, err) = gdaltest.runexternal_out_and_err(test_cli_utilities.get_gdalinfo_path() + ' --format', check_memleak=False)
-    assert err.find('--format option given without a format code') >= 0
+    assert '--format option given without a format code' in err
 
     (_, err) = gdaltest.runexternal_out_and_err(test_cli_utilities.get_gdalinfo_path() + ' --format foo_bar', check_memleak=False)
-    assert err.find('--format option given with format') >= 0
+    assert '--format option given with format' in err
 
 ###############################################################################
 # Test --format
@@ -356,7 +356,7 @@ def test_gdalinfo_22():
         'Creation Datatypes',
         '<CreationOptionList>']
     for expected_string in expected_strings:
-        assert ret.find(expected_string) >= 0, ('did not find %s' % expected_string)
+        assert expected_string in ret, ('did not find %s' % expected_string)
 
     
 ###############################################################################
@@ -368,7 +368,7 @@ def test_gdalinfo_23():
         pytest.skip()
 
     ret = gdaltest.runexternal(test_cli_utilities.get_gdalinfo_path() + ' --help-general', check_memleak=False)
-    assert ret.find('Generic GDAL utility command options') >= 0
+    assert 'Generic GDAL utility command options' in ret
 
 ###############################################################################
 # Test --locale
@@ -379,7 +379,7 @@ def test_gdalinfo_24():
         pytest.skip()
 
     ret = gdaltest.runexternal(test_cli_utilities.get_gdalinfo_path() + ' --locale C ../gcore/data/byte.tif', check_memleak=False)
-    assert ret.find('Driver: GTiff/GeoTIFF') == 0
+    assert ret.startswith('Driver: GTiff/GeoTIFF')
 
 ###############################################################################
 # Test -listmdd
@@ -390,8 +390,8 @@ def test_gdalinfo_25():
         pytest.skip()
 
     ret = gdaltest.runexternal(test_cli_utilities.get_gdalinfo_path() + ' ../gdrivers/data/byte_with_xmp.tif -listmdd', check_memleak=False)
-    assert ret.find('Metadata domains:') >= 0
-    assert ret.find('  xml:XMP') >= 0
+    assert 'Metadata domains:' in ret
+    assert '  xml:XMP' in ret
 
 ###############################################################################
 # Test -mdd all
@@ -402,7 +402,7 @@ def test_gdalinfo_26():
         pytest.skip()
 
     ret = gdaltest.runexternal(test_cli_utilities.get_gdalinfo_path() + ' ../gdrivers/data/byte_with_xmp.tif -mdd all', check_memleak=False)
-    assert ret.find('Metadata (xml:XMP)') >= 0
+    assert 'Metadata (xml:XMP)' in ret
 
 ###############################################################################
 # Test -oo
@@ -413,7 +413,7 @@ def test_gdalinfo_27():
         pytest.skip()
 
     ret = gdaltest.runexternal(test_cli_utilities.get_gdalinfo_path() + ' ../gdrivers/data/float64.asc -oo datatype=float64', check_memleak=False)
-    assert ret.find('Type=Float64') >= 0
+    assert 'Type=Float64' in ret
 
 ###############################################################################
 # Simple -json test
diff --git a/autotest/utilities/test_gdalinfo_lib.py b/autotest/utilities/test_gdalinfo_lib.py
index 433954f2e644..ebea42bba363 100755
--- a/autotest/utilities/test_gdalinfo_lib.py
+++ b/autotest/utilities/test_gdalinfo_lib.py
@@ -130,7 +130,7 @@ def test_gdalinfo_lib_nodatavalues():
 
     ds = gdal.Translate('', '../gcore/data/byte.tif', options='-of VRT -b 1 -b 1 -b 1 -mo "NODATA_VALUES=0 1 2"')
     ret = gdal.Info(ds)
-    assert ret.find('PER_DATASET NODATA') >= 0, 'wrong value for mask flags.'
+    assert 'PER_DATASET NODATA' in ret, 'wrong value for mask flags.'
 
 
 
diff --git a/autotest/utilities/test_gdallocationinfo.py b/autotest/utilities/test_gdallocationinfo.py
index c0e220afe5e3..d2f54b874bc5 100755
--- a/autotest/utilities/test_gdallocationinfo.py
+++ b/autotest/utilities/test_gdallocationinfo.py
@@ -54,7 +54,7 @@ def test_gdallocationinfo_1():
   Location: (0P,0L)
   Band 1:
     Value: 107"""
-    assert ret.find(expected_ret) == 0
+    assert ret.startswith(expected_ret)
 
 ###############################################################################
 # Test -xml
@@ -71,7 +71,7 @@ def test_gdallocationinfo_2():
     <Value>107</Value>
   </BandReport>
 </Report>"""
-    assert ret.find(expected_ret) == 0
+    assert ret.startswith(expected_ret)
 
 ###############################################################################
 # Test -valonly
@@ -83,7 +83,7 @@ def test_gdallocationinfo_3():
 
     ret = gdaltest.runexternal(test_cli_utilities.get_gdallocationinfo_path() + ' -b 1 -valonly ../gcore/data/byte.tif 0 0')
     expected_ret = """107"""
-    assert ret.find(expected_ret) == 0
+    assert ret.startswith(expected_ret)
 
 ###############################################################################
 # Test -geoloc
@@ -99,7 +99,7 @@ def test_gdallocationinfo_4():
   Location: (0P,0L)
   Band 1:
     Value: 107"""
-    assert ret.find(expected_ret) == 0
+    assert ret.startswith(expected_ret)
 
 ###############################################################################
 # Test -lifonly
@@ -112,7 +112,7 @@ def test_gdallocationinfo_5():
     ret = gdaltest.runexternal(test_cli_utilities.get_gdallocationinfo_path() + ' -lifonly ../gcore/data/byte.vrt 0 0')
     expected_ret1 = """../gcore/data/byte.tif"""
     expected_ret2 = """../gcore/data\\byte.tif"""
-    assert ret.find(expected_ret1) >= 0 or ret.find(expected_ret2) >= 0
+    assert expected_ret1 in ret or expected_ret2 in ret
 
 ###############################################################################
 # Test -overview
@@ -132,7 +132,7 @@ def test_gdallocationinfo_6():
 
     gdal.GetDriverByName('GTiff').Delete('tmp/test_gdallocationinfo_6.tif')
     expected_ret = """Value: 130"""
-    assert ret.find(expected_ret) >= 0
+    assert expected_ret in ret
 
 
 
diff --git a/autotest/utilities/test_gdalsrsinfo.py b/autotest/utilities/test_gdalsrsinfo.py
index e50088efbc6a..e78fcb06d625 100755
--- a/autotest/utilities/test_gdalsrsinfo.py
+++ b/autotest/utilities/test_gdalsrsinfo.py
@@ -332,18 +332,18 @@ def test_gdalsrsinfo_17():
     ret = gdaltest.runexternal(test_cli_utilities.get_gdalsrsinfo_path() +
                                ' -e "LOCAL_CS[foo]"')
 
-    assert ret.find('EPSG:-1') >= 0
+    assert 'EPSG:-1' in ret
 
     # One match
     ret = gdaltest.runexternal(test_cli_utilities.get_gdalsrsinfo_path() +
                                ' -e ../osr/data/lcc_esri.prj')
 
-    assert ret.find('EPSG:32119') >= 0
+    assert 'EPSG:32119' in ret
 
     # Two matches
     ret = gdaltest.runexternal(test_cli_utilities.get_gdalsrsinfo_path() +
                                """ -e "GEOGCS[\"myLKS94\",DATUM[\"Lithuania_1994_ETRS89\",SPHEROID[\"GRS_1980\",6378137,298.257222101],TOWGS84[0,0,0,0,0,0,0]],PRIMEM[\"Greenwich\",0],UNIT[\"degree\",0.0174532925199433]]" """)
-    assert ret.find('EPSG:4126') >= 0 and ret.find('EPSG:4669') >= 0
+    assert 'EPSG:4126' in ret and 'EPSG:4669' in ret
 
 ###############################################################################
 #
diff --git a/autotest/utilities/test_gdalwarp_lib.py b/autotest/utilities/test_gdalwarp_lib.py
index e537b0147b0e..0d005b3d73d9 100755
--- a/autotest/utilities/test_gdalwarp_lib.py
+++ b/autotest/utilities/test_gdalwarp_lib.py
@@ -1462,9 +1462,9 @@ def test_gdalwarp_lib_override_default_output_nodata():
 
     creationoptionlist = drv.GetMetadataItem('DMD_CREATIONOPTIONLIST')
     formats = ['NC']
-    if creationoptionlist.find('<Value>NC2</Value>') >= 0:
+    if '<Value>NC2</Value>' in creationoptionlist:
         formats += ['NC2']
-    if creationoptionlist.find('<Value>NC4</Value>') >= 0:
+    if '<Value>NC4</Value>' in creationoptionlist:
         formats += ['NC4', 'NC4C']
 
     for frmt in formats:
diff --git a/autotest/utilities/test_ogr2ogr.py b/autotest/utilities/test_ogr2ogr.py
index e7600dc5bd2a..d4614297f129 100755
--- a/autotest/utilities/test_ogr2ogr.py
+++ b/autotest/utilities/test_ogr2ogr.py
@@ -1857,7 +1857,7 @@ def test_ogr2ogr_52():
     content = f.read()
     f.close()
 
-    assert content.find('LINESTRING (0 0,') >= 0
+    assert 'LINESTRING (0 0,' in content
 
     gdaltest.runexternal(test_cli_utilities.get_ogr2ogr_path() + ' -f CSV tmp/test_ogr2ogr_52_dst2.csv tmp/test_ogr2ogr_52_dst.csv -select id -nln test_ogr2ogr_52_dst2 -dsco GEOMETRY=AS_WKT -nlt CONVERT_TO_CURVE')
 
@@ -1865,7 +1865,7 @@ def test_ogr2ogr_52():
     content = f.read()
     f.close()
 
-    assert content.find('COMPOUNDCURVE ((0 0,') >= 0
+    assert 'COMPOUNDCURVE ((0 0,' in content
 
     os.unlink('tmp/test_ogr2ogr_52_src.csv')
     os.unlink('tmp/test_ogr2ogr_52_dst.csv')
@@ -1894,12 +1894,12 @@ def test_ogr2ogr_53():
     content = f.read()
     f.close()
 
-    assert (content.find('<SimpleField name="id" type="int"></SimpleField>') >= 0 and \
-       content.find('<SimpleData name="id">1</SimpleData>') >= 0 and \
-       content.find('<SimpleField name="i64" type="float"></SimpleField>') >= 0 and \
-       content.find('<SimpleData name="i64">123456789012</SimpleData>') >= 0 and \
-       content.find('<SimpleField name="b" type="string"></SimpleField>') >= 0 and \
-       content.find('<SimpleData name="b">1</SimpleData>') >= 0)
+    assert ('<SimpleField name="id" type="int"></SimpleField>' in content and \
+       '<SimpleData name="id">1</SimpleData>' in content and \
+       '<SimpleField name="i64" type="float"></SimpleField>' in content and \
+       '<SimpleData name="i64">123456789012</SimpleData>' in content and \
+       '<SimpleField name="b" type="string"></SimpleField>' in content and \
+       '<SimpleData name="b">1</SimpleData>' in content)
 
     os.unlink('tmp/test_ogr2ogr_53.kml')
 
@@ -1910,7 +1910,7 @@ def test_ogr2ogr_53():
     content = f.read()
     f.close()
 
-    assert content.find('"123456789012.0"') >= 0
+    assert '"123456789012.0"' in content
 
     os.unlink('tmp/test_ogr2ogr_53.bna')
 
@@ -1921,8 +1921,8 @@ def test_ogr2ogr_53():
     content = f.read()
     f.close()
 
-    assert (content.find('<SimpleField name="i64" type="string"></SimpleField>') >= 0 and \
-       content.find('<SimpleData name="i64">123456789012</SimpleData>') >= 0)
+    assert ('<SimpleField name="i64" type="string"></SimpleField>' in content and \
+       '<SimpleData name="i64">123456789012</SimpleData>' in content)
 
     os.unlink('tmp/test_ogr2ogr_53.kml')
 
@@ -1962,9 +1962,9 @@ def test_ogr2ogr_54():
     content = f.read()
     f.close()
 
-    assert (content.find('<xs:element name="WKT" type="gml:GeometryPropertyType" nillable="true" minOccurs="1" maxOccurs="1"/>') >= 0 and \
-       content.find('<xs:element name="fld1" nillable="true" minOccurs="1" maxOccurs="1">') >= 0 and \
-       content.find('<xs:element name="fld2" nillable="true" minOccurs="0" maxOccurs="1">') >= 0)
+    assert ('<xs:element name="WKT" type="gml:GeometryPropertyType" nillable="true" minOccurs="1" maxOccurs="1"/>' in content and \
+       '<xs:element name="fld1" nillable="true" minOccurs="1" maxOccurs="1">' in content and \
+       '<xs:element name="fld2" nillable="true" minOccurs="0" maxOccurs="1">' in content)
 
     os.unlink('tmp/test_ogr2ogr_54.gml')
     os.unlink('tmp/test_ogr2ogr_54.xsd')
@@ -1976,9 +1976,9 @@ def test_ogr2ogr_54():
     content = f.read()
     f.close()
 
-    assert (content.find('<xs:element name="WKT" type="gml:GeometryPropertyType" nillable="true" minOccurs="0" maxOccurs="1"/>') >= 0 and \
-       content.find('<xs:element name="fld1" nillable="true" minOccurs="0" maxOccurs="1">') >= 0 and \
-       content.find('<xs:element name="fld2" nillable="true" minOccurs="0" maxOccurs="1">') >= 0)
+    assert ('<xs:element name="WKT" type="gml:GeometryPropertyType" nillable="true" minOccurs="0" maxOccurs="1"/>' in content and \
+       '<xs:element name="fld1" nillable="true" minOccurs="0" maxOccurs="1">' in content and \
+       '<xs:element name="fld2" nillable="true" minOccurs="0" maxOccurs="1">' in content)
 
     os.unlink('tmp/test_ogr2ogr_54.gml')
     os.unlink('tmp/test_ogr2ogr_54.xsd')
@@ -2023,7 +2023,7 @@ def test_ogr2ogr_55():
     content = f.read()
     f.close()
 
-    assert content.find('<ogr:fld2>2</ogr:fld2>') >= 0
+    assert '<ogr:fld2>2</ogr:fld2>' in content
 
     os.unlink('tmp/test_ogr2ogr_55.gml')
     os.unlink('tmp/test_ogr2ogr_55.xsd')
@@ -2035,7 +2035,7 @@ def test_ogr2ogr_55():
     content = f.read()
     f.close()
 
-    assert content.find('<ogr:fld2>') < 0
+    assert '<ogr:fld2>' not in content
 
     os.unlink('tmp/test_ogr2ogr_55.gml')
     os.unlink('tmp/test_ogr2ogr_55.xsd')
@@ -2067,8 +2067,8 @@ def test_ogr2ogr_56():
     content = f.read()
     f.close()
 
-    assert (content.find("""ALTER TABLE "public"."test_ogr2ogr_56" ADD COLUMN "myid"" """) < 0 and \
-       content.find("""INSERT INTO "public"."test_ogr2ogr_56" ("wkb_geometry" , "myid" , "str", "wkt") VALUES ('010100000000000000000000000000000000000000', 10, 'aaa', 'POINT(0 0)');""") >= 0)
+    assert ("""ALTER TABLE "public"."test_ogr2ogr_56" ADD COLUMN "myid"" """ not in content and \
+       """INSERT INTO "public"."test_ogr2ogr_56" ("wkb_geometry" , "myid" , "str", "wkt") VALUES ('010100000000000000000000000000000000000000', 10, 'aaa', 'POINT(0 0)');""" in content)
 
     os.unlink('tmp/test_ogr2ogr_56.sql')
     os.unlink('tmp/test_ogr2ogr_56.csv')
@@ -2111,8 +2111,8 @@ def test_ogr2ogr_57():
     content = f.read()
     f.close()
 
-    assert (content.find("""CREATE TABLE "public"."test_ogr2ogr_57" (    "id" SERIAL,    CONSTRAINT "test_ogr2ogr_57_pk" PRIMARY KEY ("id") )""") >= 0 and \
-       content.find("""INSERT INTO "public"."test_ogr2ogr_57" ("wkt" , "id" , "str") VALUES ('010100000000000000000000000000000000000000', 10, 'a')""") >= 0)
+    assert ("""CREATE TABLE "public"."test_ogr2ogr_57" (    "id" SERIAL,    CONSTRAINT "test_ogr2ogr_57_pk" PRIMARY KEY ("id") )""" in content and \
+       """INSERT INTO "public"."test_ogr2ogr_57" ("wkt" , "id" , "str") VALUES ('010100000000000000000000000000000000000000', 10, 'a')""" in content)
 
     os.unlink('tmp/test_ogr2ogr_57.sql')
 
@@ -2123,8 +2123,8 @@ def test_ogr2ogr_57():
     content = f.read()
     f.close()
 
-    assert (content.find("""CREATE TABLE "public"."test_ogr2ogr_57" (    "ogc_fid" SERIAL,    CONSTRAINT "test_ogr2ogr_57_pk" PRIMARY KEY ("ogc_fid") )""") >= 0 and \
-       content.find("""INSERT INTO "public"."test_ogr2ogr_57" ("wkt" , "str") VALUES ('010100000000000000000000000000000000000000', 'a')""") >= 0)
+    assert ("""CREATE TABLE "public"."test_ogr2ogr_57" (    "ogc_fid" SERIAL,    CONSTRAINT "test_ogr2ogr_57_pk" PRIMARY KEY ("ogc_fid") )""" in content and \
+       """INSERT INTO "public"."test_ogr2ogr_57" ("wkt" , "str") VALUES ('010100000000000000000000000000000000000000', 'a')""" in content)
 
     os.unlink('tmp/test_ogr2ogr_57.sql')
 
@@ -2261,7 +2261,7 @@ def test_ogr2ogr_62():
     gdal.VSIFCloseL(fp)
     os.unlink('tmp/test_ogr2ogr_62.json')
 
-    assert data.find('bar') >= 0 and data.find('baz') >= 0
+    assert 'bar' in data and 'baz' in data
 
     # Test -noNativeData
     gdaltest.runexternal(test_cli_utilities.get_ogr2ogr_path() + """ -f GeoJSON tmp/test_ogr2ogr_62.json tmp/test_ogr2ogr_62_in.json -noNativeData""")
@@ -2272,7 +2272,7 @@ def test_ogr2ogr_62():
     os.unlink('tmp/test_ogr2ogr_62.json')
     os.unlink('tmp/test_ogr2ogr_62_in.json')
 
-    assert data.find('bar') < 0 and data.find('baz') < 0
+    assert 'bar' not in data and 'baz' not in data
 
 ###############################################################################
 # Test --formats
@@ -2289,8 +2289,8 @@ def test_ogr2ogr_63():
         pass
 
     (ret, err) = gdaltest.runexternal_out_and_err(test_cli_utilities.get_ogr2ogr_path() + ' --formats')
-    assert ret.find('Supported Formats') >= 0, err
-    assert err.find('ERROR') < 0, ret
+    assert 'Supported Formats' in ret, err
+    assert 'ERROR' not in err, ret
 
 ###############################################################################
 # Test appending multiple layers, whose one already exists (#6345)
@@ -2344,7 +2344,7 @@ def test_ogr2ogr_65():
     gdal.Unlink('tmp/out.csv')
 
     (ret, err) = gdaltest.runexternal_out_and_err(test_cli_utilities.get_ogr2ogr_path() + ' /vsimem/out.xxx ../ogr/data/poly.shp')
-    if err.find("Cannot guess") < 0:
+    if "Cannot guess" not in err:
         print(ret)
         pytest.fail('expected a warning about probably wrong extension')
 
@@ -2358,7 +2358,7 @@ def test_ogr2ogr_66():
         pytest.skip()
 
     (ret, err) = gdaltest.runexternal_out_and_err(test_cli_utilities.get_ogr2ogr_path() + ' ../ogr/data/poly.shp ../ogr/data/poly.shp')
-    assert err.find("Source and destination datasets must be different in non-update mode") >= 0, \
+    assert "Source and destination datasets must be different in non-update mode" in err, \
         ret
 
 
diff --git a/autotest/utilities/test_ogrinfo.py b/autotest/utilities/test_ogrinfo.py
index 84bc9a901f23..3858918365f1 100755
--- a/autotest/utilities/test_ogrinfo.py
+++ b/autotest/utilities/test_ogrinfo.py
@@ -183,7 +183,7 @@ def test_ogrinfo_12():
         pytest.skip()
 
     ret = gdaltest.runexternal(test_cli_utilities.get_ogrinfo_path() + ' --version', check_memleak=False)
-    assert ret.find(gdal.VersionInfo('--version')) == 0
+    assert ret.startswith(gdal.VersionInfo('--version'))
 
 ###############################################################################
 # Test erroneous use of --config
@@ -194,7 +194,7 @@ def test_ogrinfo_13():
         pytest.skip()
 
     (_, err) = gdaltest.runexternal_out_and_err(test_cli_utilities.get_ogrinfo_path() + ' --config', check_memleak=False)
-    assert err.find('--config option given without a key and value argument') >= 0
+    assert '--config option given without a key and value argument' in err
 
 ###############################################################################
 # Test erroneous use of --mempreload.
@@ -205,7 +205,7 @@ def test_ogrinfo_14():
         pytest.skip()
 
     (_, err) = gdaltest.runexternal_out_and_err(test_cli_utilities.get_ogrinfo_path() + ' --mempreload', check_memleak=False)
-    assert err.find('--mempreload option given without directory path') >= 0
+    assert '--mempreload option given without directory path' in err
 
 ###############################################################################
 # Test --mempreload
@@ -216,7 +216,7 @@ def test_ogrinfo_15():
         pytest.skip()
 
     (ret, _) = gdaltest.runexternal_out_and_err(test_cli_utilities.get_ogrinfo_path() + ' --debug on --mempreload ../ogr/data /vsimem/poly.shp', check_memleak=False)
-    assert ret.find("ESRI Shapefile") >= 0
+    assert "ESRI Shapefile" in ret
 
 ###############################################################################
 # Test erroneous use of --debug.
@@ -227,7 +227,7 @@ def test_ogrinfo_16():
         pytest.skip()
 
     (_, err) = gdaltest.runexternal_out_and_err(test_cli_utilities.get_ogrinfo_path() + ' --debug', check_memleak=False)
-    assert err.find('--debug option given without debug level') >= 0
+    assert '--debug option given without debug level' in err
 
 ###############################################################################
 # Test erroneous use of --optfile.
@@ -238,17 +238,17 @@ def test_ogrinfo_17():
         pytest.skip()
 
     (_, err) = gdaltest.runexternal_out_and_err(test_cli_utilities.get_ogrinfo_path() + ' --optfile', check_memleak=False)
-    assert err.find('--optfile option given without filename') >= 0
+    assert '--optfile option given without filename' in err
 
     (_, err) = gdaltest.runexternal_out_and_err(test_cli_utilities.get_ogrinfo_path() + ' --optfile /foo/bar', check_memleak=False)
-    assert err.find('Unable to open optfile') >= 0
+    assert 'Unable to open optfile' in err
 
     f = open('tmp/optfile.txt', 'wt')
     f.write('--config foo\n')
     f.close()
     (_, err) = gdaltest.runexternal_out_and_err(test_cli_utilities.get_ogrinfo_path() + ' --optfile tmp/optfile.txt', check_memleak=False)
     os.unlink('tmp/optfile.txt')
-    assert err.find('--config option given without a key and value argument') >= 0
+    assert '--config option given without a key and value argument' in err
 
 ###############################################################################
 # Test --optfile
@@ -264,7 +264,7 @@ def test_ogrinfo_18():
     f.close()
     ret = gdaltest.runexternal(test_cli_utilities.get_ogrinfo_path() + ' --optfile tmp/optfile.txt', check_memleak=False)
     os.unlink('tmp/optfile.txt')
-    assert ret.find("ESRI Shapefile") >= 0
+    assert "ESRI Shapefile" in ret
 
 ###############################################################################
 # Test --formats
@@ -275,7 +275,7 @@ def test_ogrinfo_19():
         pytest.skip()
 
     ret = gdaltest.runexternal(test_cli_utilities.get_ogrinfo_path() + ' --formats', check_memleak=False)
-    assert ret.find('ESRI Shapefile -vector- (rw+v): ESRI Shapefile') >= 0
+    assert 'ESRI Shapefile -vector- (rw+v): ESRI Shapefile' in ret
 
 ###############################################################################
 # Test --help-general
@@ -286,7 +286,7 @@ def test_ogrinfo_20():
         pytest.skip()
 
     ret = gdaltest.runexternal(test_cli_utilities.get_ogrinfo_path() + ' --help-general', check_memleak=False)
-    assert ret.find('Generic GDAL utility command options') >= 0
+    assert 'Generic GDAL utility command options' in ret
 
 ###############################################################################
 # Test --locale
@@ -297,7 +297,7 @@ def test_ogrinfo_21():
         pytest.skip()
 
     ret = gdaltest.runexternal(test_cli_utilities.get_ogrinfo_path() + ' --locale C ../ogr/data/poly.shp', check_memleak=False)
-    assert ret.find("ESRI Shapefile") >= 0
+    assert "ESRI Shapefile" in ret
 
 ###############################################################################
 # Test RFC 41 support
@@ -313,7 +313,7 @@ def test_ogrinfo_22():
     f.close()
 
     ret = gdaltest.runexternal(test_cli_utilities.get_ogrinfo_path() + ' tmp/test_ogrinfo_22.csv', check_memleak=False)
-    assert ret.find('1: test_ogrinfo_22 (Unknown (any), Unknown (any))') >= 0
+    assert '1: test_ogrinfo_22 (Unknown (any), Unknown (any))' in ret
 
     ret = gdaltest.runexternal(test_cli_utilities.get_ogrinfo_path() + ' -al tmp/test_ogrinfo_22.csv', check_memleak=False)
     expected_ret = """INFO: Open of `tmp/test_ogrinfo_22.csv'
@@ -627,7 +627,7 @@ def test_ogrinfo_25():
 
     (ret, err) = gdaltest.runexternal_out_and_err(test_cli_utilities.get_ogrinfo_path() + ' -rl -q ../ogr/data/poly.shp')
     assert (err is None or err == ''), 'got error/warning'
-    assert ret.find('OGRFeature(poly):0') >= 0 and ret.find('OGRFeature(poly):9') >= 0, \
+    assert 'OGRFeature(poly):0' in ret and 'OGRFeature(poly):9' in ret, \
         'wrong output'
 
 
@@ -643,7 +643,7 @@ def test_ogrinfo_sql_filename():
     (ret, err) = gdaltest.runexternal_out_and_err(test_cli_utilities.get_ogrinfo_path() + ' -q ../ogr/data/poly.shp -sql @tmp/my.sql')
     os.unlink('tmp/my.sql')
     assert (err is None or err == ''), 'got error/warning'
-    assert ret.find('OGRFeature(poly):0') >= 0 and ret.find('OGRFeature(poly):9') >= 0, \
+    assert 'OGRFeature(poly):0' in ret and 'OGRFeature(poly):9' in ret, \
         'wrong output'
 
 

From 545d0423e15cc28a5aca3a9852fab80b80601162 Mon Sep 17 00:00:00 2001
From: Craig de Stigter <craig.destigter@koordinates.com>
Date: Wed, 12 Dec 2018 11:49:36 +1300
Subject: [PATCH 163/488] Auto-cleanup of `a.find(b) != -1` in all non-test
 python scripts

`a.find(b) != -1`
    --> `b in a`

`a.find(b) == -1`
    --> `b not in a`

`a.find(b) == 0`
    --> `a.startswith(b)

`a.find(b) != 0`
    --> `not a.startswith(b)

This was done using this bowler script https://gist.github.com/craigds/47137592566be7564e0cb4cfb6e0ecdf
---
 gdal/scripts/completionFinder.py         |  2 +-
 gdal/swig/python/samples/dump_jp2.py     |  2 +-
 gdal/swig/python/samples/validate_jp2.py |  4 +-
 gdal/swig/python/scripts/ogrmerge.py     | 16 ++++----
 gdal/update_copyright.py                 | 52 ++++++++++++------------
 5 files changed, 38 insertions(+), 38 deletions(-)

diff --git a/gdal/scripts/completionFinder.py b/gdal/scripts/completionFinder.py
index 65fd1e8be82f..6e986c56d0cc 100644
--- a/gdal/scripts/completionFinder.py
+++ b/gdal/scripts/completionFinder.py
@@ -152,7 +152,7 @@ def getCompletionScript(name, optList):
     # adapt format parsing command : GDAL type of OGR type
 
     isGdal = True
-    if name.find("ogr") == 0:
+    if name.startswith("ogr"):
         isGdal = False
 
     # gdal type
diff --git a/gdal/swig/python/samples/dump_jp2.py b/gdal/swig/python/samples/dump_jp2.py
index 1f6b105b9155..09961b47a408 100755
--- a/gdal/swig/python/samples/dump_jp2.py
+++ b/gdal/swig/python/samples/dump_jp2.py
@@ -82,7 +82,7 @@ def dump_crsdictionary(filename, out_crsdictionary):
     for domain in mdd_list:
         if domain.startswith('xml:'):
             mdd_item = ds.GetMetadata(domain)[0]
-            if mdd_item.find('<Dictionary') >= 0 or mdd_item.find('<gml:Dictionary') >= 0:
+            if '<Dictionary' in mdd_item or '<gml:Dictionary' in mdd_item:
                 if out_crsdictionary == '-':
                     print(mdd_item)
                 else:
diff --git a/gdal/swig/python/samples/validate_jp2.py b/gdal/swig/python/samples/validate_jp2.py
index b977a772e3a2..b285ffe721f6 100755
--- a/gdal/swig/python/samples/validate_jp2.py
+++ b/gdal/swig/python/samples/validate_jp2.py
@@ -431,7 +431,7 @@ def validate(filename, oidoc, inspire_tg, expected_gmljp2, ogc_schemas_location,
         gmljp2_found = gmljp2 is not None
         if expected_gmljp2 and not gmljp2_found:
             error_report.EmitError('GMLJP2', 'No GMLJP2 box found whereas it was expected')
-        if gmljp2_found and inspire_tg and gmljp2.find('gmljp2:GMLJP2CoverageCollection') >= 0:
+        if gmljp2_found and inspire_tg and 'gmljp2:GMLJP2CoverageCollection' in gmljp2:
             error_report.EmitError('INSPIRE_TG', 'GMLJP2 v2 box found, but Inspire TG require GMLJP2 v1', conformance_class='A.8.6')
         if gmljp2_found and ogc_schemas_location != 'disabled':
             if ogc_schemas_location is not None:
@@ -481,7 +481,7 @@ def validate(filename, oidoc, inspire_tg, expected_gmljp2, ogc_schemas_location,
             JPXCLFound = False
 
             if expected_ftyp_branding is None:
-                if gmljp2_found and gmljp2.find('gmljp2:GMLJP2CoverageCollection') >= 0:
+                if gmljp2_found and 'gmljp2:GMLJP2CoverageCollection' in gmljp2:
                     expected_ftyp_branding = 'jpx '
                 else:
                     expected_ftyp_branding = 'jp2 '
diff --git a/gdal/swig/python/scripts/ogrmerge.py b/gdal/swig/python/scripts/ogrmerge.py
index 06762e15ee9c..f30ef17cbccf 100755
--- a/gdal/swig/python/scripts/ogrmerge.py
+++ b/gdal/swig/python/scripts/ogrmerge.py
@@ -421,7 +421,7 @@ def process(argv, progress=None, progress_arg=None):
                 basename = None
                 if os.path.exists(src_dsname):
                     basename = os.path.basename(src_dsname)
-                    if basename.find('.') >= 0:
+                    if '.' in basename:
                         basename = '.'.join(basename.split(".")[0:-1])
 
                 if basename == src_lyr_name:
@@ -457,8 +457,8 @@ def process(argv, progress=None, progress_arg=None):
                 if EQUAL(output_format, 'VRT') and \
                    os.path.exists(src_dsname) and \
                    not os.path.isabs(src_dsname) and \
-                   vrt_filename.find('/') < 0 and \
-                   vrt_filename.find('\\') < 0:
+                   '/' not in vrt_filename and \
+                   '\\' not in vrt_filename:
                     attrs = {'relativeToVRT': '1'}
                 writer.write_element_value('SrcDataSource', src_dsname,
                                            attrs=attrs)
@@ -507,7 +507,7 @@ def process(argv, progress=None, progress_arg=None):
                 basename = None
                 if os.path.exists(src_dsname):
                     basename = os.path.basename(src_dsname)
-                    if basename.find('.') >= 0:
+                    if '.' in basename:
                         basename = '.'.join(basename.split(".")[0:-1])
 
                 if basename == src_lyr_name:
@@ -522,9 +522,9 @@ def process(argv, progress=None, progress_arg=None):
 
                 if basename is not None:
                     layer_name = layer_name.replace('{DS_BASENAME}', basename)
-                elif layer_name.find('{DS_BASENAME}') >= 0:
+                elif '{DS_BASENAME}' in layer_name:
                     if skip_failures:
-                        if layer_name.find('{DS_INDEX}') < 0:
+                        if '{DS_INDEX}' not in layer_name:
                             layer_name = layer_name.replace(
                                 '{DS_BASENAME}', 'Dataset%d' % src_ds_idx)
                     else:
@@ -554,8 +554,8 @@ def process(argv, progress=None, progress_arg=None):
                 if EQUAL(output_format, 'VRT') and \
                    os.path.exists(src_dsname) and \
                    not os.path.isabs(src_dsname) and \
-                   vrt_filename.find('/') < 0 and \
-                   vrt_filename.find('\\') < 0:
+                   '/' not in vrt_filename and \
+                   '\\' not in vrt_filename:
                     attrs = {'relativeToVRT': '1'}
                 writer.write_element_value('SrcDataSource', src_dsname,
                                            attrs=attrs)
diff --git a/gdal/update_copyright.py b/gdal/update_copyright.py
index df68fca995fe..bc248de8e06e 100644
--- a/gdal/update_copyright.py
+++ b/gdal/update_copyright.py
@@ -40,28 +40,28 @@
 
 for dirname, dirnames, filenames in os.walk('.'):
 
-    if dirname.find('.svn') >= 0:
+    if '.svn' in dirname:
         continue
-    if dirname.find('.git') >= 0:
+    if '.git' in dirname:
         continue
-    if dirname.find('libpng') >= 0:
+    if 'libpng' in dirname:
         continue
-    if dirname.find('libjpeg') >= 0:
+    if 'libjpeg' in dirname:
         continue
-    if dirname.find('libtiff') >= 0:
+    if 'libtiff' in dirname:
         continue
-    if dirname.find('giflib') >= 0:
+    if 'giflib' in dirname:
         continue
-    if dirname.find('libgeotiff') >= 0:
+    if 'libgeotiff' in dirname:
         continue
-    if dirname.find('libjson') >= 0:
+    if 'libjson' in dirname:
         continue
 
     # print path to all filenames.
     for filename in filenames:
-        if filename.find('.svn') >= 0:
+        if '.svn' in filename:
             continue
-        if filename.find('.h') < 0 and filename.find('.c') < 0 and filename.find('.py') < 0:
+        if '.h' not in filename and '.c' not in filename and '.py' not in filename:
             continue
         if filename == 'e00read.c' or filename == 'e00compr.h':
             continue
@@ -80,7 +80,7 @@
         commits_to_ignore = []
         while i < nlines:
             line = lines[i][0:-1]
-            if line.find('Author:') == 0 and line.find(git_author) >= 0:
+            if line.startswith('Author:') and git_author in line:
                 i = i + 1
                 # line = lines[i][0:-1]
                 # year = int(line.split(' ')[7])
@@ -90,12 +90,12 @@
                 ignore_commit = False
                 while i < nlines:
                     line = lines[i][0:-1]
-                    if line.find('commit') == 0:
+                    if line.startswith('commit'):
                         break
-                    if line.find('(by') >= 0 or line.find('contributed by') >= 0 or \
-                       line.find('patch') >= 0 or line.find('Patch') >= 0 or \
-                       line.find('Update copyright') >= 0 or line.find('From: ') >= 0 or \
-                       line.find('Add BLX Magellan Topo driver') >= 0:
+                    if '(by' in line or 'contributed by' in line or \
+                       'patch' in line or 'Patch' in line or \
+                       'Update copyright' in line or 'From: ' in line or \
+                       'Add BLX Magellan Topo driver' in line:
                         ignore_commit = True
                     i = i + 1
                 if ignore_commit:
@@ -118,9 +118,9 @@
             line = lines[i][0:-1]
             ignore = False
             for commit in commits_to_ignore:
-                if line.find(commit) == 0:
+                if line.startswith(commit):
                     ignore = True
-            if not ignore and line.find('Copyright') < 0:
+            if not ignore and 'Copyright' not in line:
                 idx = line.find("(" + git_author)
                 if idx > 0:
                     count_matching_lines = count_matching_lines + 1
@@ -144,31 +144,31 @@
         i = 0
         nlines = len(lines)
         already_added = False
-        if filename.find('.py') >= 0:
+        if '.py' in filename:
             prefix = '# '
         else:
             prefix = ' * '
         while i < nlines:
             line = lines[i]
-            if not already_added and line.find('Copyright') >= 0:
+            if not already_added and 'Copyright' in line:
                 already_added = True
-                if line.find('#  ') == 0:
+                if line.startswith('#  '):
                     prefix = '#  '
-                elif line.find('# * ') == 0:
+                elif line.startswith('# * '):
                     prefix = '# * '
-                elif line.find('// ') == 0:
+                elif line.startswith('// '):
                     prefix = '// '
-                while line.find(author_in_file) < 0:
+                while author_in_file not in line:
                     f2.write(line)
                     i = i + 1
                     line = lines[i]
-                    if (line.find('Copyright') < 0 and len(line.strip()) < 10) or line.find('Permission to use') > 0:
+                    if ('Copyright' not in line and len(line.strip()) < 10) or line.find('Permission to use') > 0:
                         break
                 if minyear < maxyear:
                     f2.write('%sCopyright (c) %d-%d, %s\n' % (prefix, minyear, maxyear, full_author))
                 else:
                     f2.write('%sCopyright (c) %d, %s\n' % (prefix, minyear, full_author))
-                if line.find(author_in_file) < 0:
+                if author_in_file not in line:
                     f2.write(line)
             else:
                 f2.write(line)

From ff047cd07b801f9dddee9b40595357e5958fbd5c Mon Sep 17 00:00:00 2001
From: Even Rouault <even.rouault@spatialys.com>
Date: Thu, 13 Dec 2018 01:40:57 +0100
Subject: [PATCH 164/488] VRT: fix potential int overflow on invalid VRT. Fixes
 https://bugs.chromium.org/p/oss-fuzz/issues/detail?id=11814. Credit to OSS
 Fuzz

---
 autotest/gcore/vrt_read.py    | 32 +++++++++++++++++++++++++++++
 gdal/frmts/vrt/vrtsources.cpp | 38 +++++++++++++++++++++++++++--------
 2 files changed, 62 insertions(+), 8 deletions(-)

diff --git a/autotest/gcore/vrt_read.py b/autotest/gcore/vrt_read.py
index 50deef22fa55..ce86bb2961c0 100755
--- a/autotest/gcore/vrt_read.py
+++ b/autotest/gcore/vrt_read.py
@@ -1182,3 +1182,35 @@ def test_vrt_dstsize_larger_than_source():
     ds = gdal.Open('data/dstsize_larger_than_source.vrt')
     cs = ds.GetRasterBand(1).Checksum()
     assert cs == 33273
+
+
+def test_vrt_invalid_srcrect():
+
+    vrt_text = """<VRTDataset rasterXSize="20" rasterYSize="20">
+    <VRTRasterBand dataType="Byte" band="1">
+        <SimpleSource>
+        <SourceFilename relative="1">data/byte.tif</SourceFilename>
+        <SourceBand>1</SourceBand>
+        <SourceProperties RasterXSize="20" RasterYSize="20" DataType="Byte" BlockXSize="20" BlockYSize="20" />
+        <SrcRect xOff="0" yOff="0" xSize="-10" ySize="20" />
+        <DstRect xOff="0" yOff="0" xSize="20" ySize="20" />
+        </SimpleSource>
+    </VRTRasterBand>
+    </VRTDataset>"""
+    assert gdal.Open(vrt_text) is None
+
+
+def test_vrt_invalid_srcrect():
+
+    vrt_text = """<VRTDataset rasterXSize="20" rasterYSize="20">
+    <VRTRasterBand dataType="Byte" band="1">
+        <SimpleSource>
+        <SourceFilename relative="1">data/byte.tif</SourceFilename>
+        <SourceBand>1</SourceBand>
+        <SourceProperties RasterXSize="20" RasterYSize="20" DataType="Byte" BlockXSize="20" BlockYSize="20" />
+        <SrcRect xOff="0" yOff="0" xSize="20" ySize="20" />
+        <DstRect xOff="0" yOff="0" xSize="20" ySize="1e400" />
+        </SimpleSource>
+    </VRTRasterBand>
+    </VRTDataset>"""
+    assert gdal.Open(vrt_text) is None
diff --git a/gdal/frmts/vrt/vrtsources.cpp b/gdal/frmts/vrt/vrtsources.cpp
index 350347dc637e..5abfd9c8fe80 100644
--- a/gdal/frmts/vrt/vrtsources.cpp
+++ b/gdal/frmts/vrt/vrtsources.cpp
@@ -751,10 +751,21 @@ CPLErr VRTSimpleSource::XMLInit( CPLXMLNode *psSrc, const char *pszVRTPath,
     CPLXMLNode * const psSrcRect = CPLGetXMLNode(psSrc,"SrcRect");
     if( psSrcRect )
     {
-        SetSrcWindow( CPLAtof(CPLGetXMLValue(psSrcRect,"xOff","-1")),
-                      CPLAtof(CPLGetXMLValue(psSrcRect,"yOff","-1")),
-                      CPLAtof(CPLGetXMLValue(psSrcRect,"xSize","-1")),
-                      CPLAtof(CPLGetXMLValue(psSrcRect,"ySize","-1")) );
+        double xOff = CPLAtof(CPLGetXMLValue(psSrcRect,"xOff","-1"));
+        double yOff = CPLAtof(CPLGetXMLValue(psSrcRect,"yOff","-1"));
+        double xSize = CPLAtof(CPLGetXMLValue(psSrcRect,"xSize","-1"));
+        double ySize = CPLAtof(CPLGetXMLValue(psSrcRect,"ySize","-1"));
+        if( !CPLIsFinite(xOff) || !CPLIsFinite(yOff) ||
+            !CPLIsFinite(xSize) || !CPLIsFinite(ySize) ||
+            xOff < INT_MIN || xOff > INT_MAX ||
+            yOff < INT_MIN || yOff > INT_MAX ||
+            !(xSize > 0 || xSize == -1) || xSize > INT_MAX ||
+            !(ySize > 0 || ySize == -1) || ySize > INT_MAX )
+        {
+            CPLError(CE_Failure, CPLE_AppDefined, "Wrong values in SrcRect");
+            return CE_Failure;
+        }
+        SetSrcWindow( xOff, yOff, xSize, ySize );
     }
     else
     {
@@ -767,10 +778,21 @@ CPLErr VRTSimpleSource::XMLInit( CPLXMLNode *psSrc, const char *pszVRTPath,
     CPLXMLNode * const psDstRect = CPLGetXMLNode(psSrc,"DstRect");
     if( psDstRect )
     {
-        SetDstWindow( CPLAtof(CPLGetXMLValue(psDstRect,"xOff","-1")),
-                      CPLAtof(CPLGetXMLValue(psDstRect,"yOff","-1")),
-                      CPLAtof(CPLGetXMLValue(psDstRect,"xSize","-1")),
-                      CPLAtof(CPLGetXMLValue(psDstRect,"ySize","-1")) );
+        double xOff = CPLAtof(CPLGetXMLValue(psDstRect,"xOff","-1"));
+        double yOff = CPLAtof(CPLGetXMLValue(psDstRect,"yOff","-1"));
+        double xSize = CPLAtof(CPLGetXMLValue(psDstRect,"xSize","-1"));
+        double ySize = CPLAtof(CPLGetXMLValue(psDstRect,"ySize","-1"));
+        if( !CPLIsFinite(xOff) || !CPLIsFinite(yOff) ||
+            !CPLIsFinite(xSize) || !CPLIsFinite(ySize) ||
+            xOff < INT_MIN || xOff > INT_MAX ||
+            yOff < INT_MIN || yOff > INT_MAX ||
+            !(xSize > 0 || xSize == -1) || xSize > INT_MAX ||
+            !(ySize > 0 || ySize == -1) || ySize > INT_MAX )
+        {
+            CPLError(CE_Failure, CPLE_AppDefined, "Wrong values in DstRect");
+            return CE_Failure;
+        }
+        SetDstWindow( xOff, yOff, xSize, ySize );
     }
     else
     {

From 4db9ec884a59751d80c7482f9f3d621ef3c640f6 Mon Sep 17 00:00:00 2001
From: Dmitry Baryshnikov <bishop.dev@gmail.com>
Date: Thu, 13 Dec 2018 11:54:36 +0300
Subject: [PATCH 165/488] NGW: Add NextGIS Web driver

---
 autotest/gdrivers/ngw.py                      |  175 +++
 autotest/ogr/ogr_ngw.py                       |  429 +++++++
 gdal/frmts/formats_list.html                  |   11 +-
 gdal/ogr/ogrsf_frmts/GNUmakefile              |    2 +-
 gdal/ogr/ogrsf_frmts/generic/GNUmakefile      |    5 +-
 gdal/ogr/ogrsf_frmts/generic/makefile.vc      |    5 +-
 .../ogrsf_frmts/generic/ogrregisterall.cpp    |    4 +
 gdal/ogr/ogrsf_frmts/makefile.vc              |    9 +-
 gdal/ogr/ogrsf_frmts/ngw/GNUmakefile          |   18 +
 gdal/ogr/ogrsf_frmts/ngw/drv_ngw.html         |  217 ++++
 gdal/ogr/ogrsf_frmts/ngw/drv_ngw_raster.html  |  165 +++
 gdal/ogr/ogrsf_frmts/ngw/gdalngwdataset.cpp   |  923 ++++++++++++++
 gdal/ogr/ogrsf_frmts/ngw/makefile.vc          |   13 +
 gdal/ogr/ogrsf_frmts/ngw/ngw_api.cpp          |  647 ++++++++++
 gdal/ogr/ogrsf_frmts/ngw/ogr_ngw.h            |  256 ++++
 gdal/ogr/ogrsf_frmts/ngw/ogrngwdriver.cpp     |  293 +++++
 gdal/ogr/ogrsf_frmts/ngw/ogrngwlayer.cpp      | 1117 +++++++++++++++++
 gdal/ogr/ogrsf_frmts/ogr_formats.html         |    7 +
 gdal/ogr/ogrsf_frmts/ogrsf_frmts.h            |    1 +
 gdal/port/cpl_json.cpp                        |    6 +-
 20 files changed, 4289 insertions(+), 14 deletions(-)
 create mode 100644 autotest/gdrivers/ngw.py
 create mode 100644 autotest/ogr/ogr_ngw.py
 create mode 100644 gdal/ogr/ogrsf_frmts/ngw/GNUmakefile
 create mode 100644 gdal/ogr/ogrsf_frmts/ngw/drv_ngw.html
 create mode 100644 gdal/ogr/ogrsf_frmts/ngw/drv_ngw_raster.html
 create mode 100644 gdal/ogr/ogrsf_frmts/ngw/gdalngwdataset.cpp
 create mode 100644 gdal/ogr/ogrsf_frmts/ngw/makefile.vc
 create mode 100644 gdal/ogr/ogrsf_frmts/ngw/ngw_api.cpp
 create mode 100644 gdal/ogr/ogrsf_frmts/ngw/ogr_ngw.h
 create mode 100644 gdal/ogr/ogrsf_frmts/ngw/ogrngwdriver.cpp
 create mode 100644 gdal/ogr/ogrsf_frmts/ngw/ogrngwlayer.cpp

diff --git a/autotest/gdrivers/ngw.py b/autotest/gdrivers/ngw.py
new file mode 100644
index 000000000000..63d79822232c
--- /dev/null
+++ b/autotest/gdrivers/ngw.py
@@ -0,0 +1,175 @@
+#!/usr/bin/env python
+# -*- coding: utf-8 -*-
+###############################################################################
+# $Id$
+#
+# Project:  GDAL/OGR Test Suite
+# Purpose:  Test NGW support.
+# Author:   Dmitry Baryshnikov <polimax@mail.ru>
+#
+###############################################################################
+# Copyright (c) 2018, NextGIS <info@nextgis.com>
+#
+# Permission is hereby granted, free of charge, to any person obtaining a
+# copy of this software and associated documentation files (the "Software"),
+# to deal in the Software without restriction, including without limitation
+# the rights to use, copy, modify, merge, publish, distribute, sublicense,
+# and/or sell copies of the Software, and to permit persons to whom the
+# Software is furnished to do so, subject to the following conditions:
+#
+# The above copyright notice and this permission notice shall be included
+# in all copies or substantial portions of the Software.
+#
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+# OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
+# THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+# FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
+# DEALINGS IN THE SOFTWARE.
+###############################################################################
+
+import sys
+import shutil
+from osgeo import gdal
+
+sys.path.append('../pymod')
+
+import gdaltest
+import pytest
+
+def check_availability(url):
+    version_url = url + '/api/component/pyramid/pkg_version'
+    return gdaltest.gdalurlopen(version_url) is not None
+
+###############################################################################
+# Verify we have the driver.
+
+def test_ngw_1():
+
+    gdaltest.ngw_drv = gdal.GetDriverByName('NGW')
+    if gdaltest.ngw_drv is None:
+        pytest.skip()
+
+    # TODO: Change to 'http://dev.nextgis.com/sandbox' after adding raster create copy support.
+    gdaltest.ngw_test_server = 'https://demo.nextgis.com'
+
+    if check_availability(gdaltest.ngw_test_server) == False:
+        gdaltest.ngw_drv = None
+        pytest.skip()
+
+###############################################################################
+# Open the NGW dataset
+
+def test_ngw_2():
+
+    if gdaltest.ngw_drv is None:
+        pytest.skip()
+
+    if check_availability(gdaltest.ngw_test_server) == False:
+        gdaltest.ngw_drv = None
+        pytest.skip()
+
+    url = 'NGW:' + gdaltest.ngw_test_server + '/resource/1734'
+    gdaltest.ngw_ds = gdal.Open(url)
+
+    assert gdaltest.ngw_ds is not None, 'Open {} failed.'.format(url)
+
+###############################################################################
+# Check various things about the configuration.
+
+def test_ngw_3():
+
+    if gdaltest.ngw_drv is None or gdaltest.ngw_ds is None:
+        pytest.skip()
+
+    if check_availability(gdaltest.ngw_test_server) == False:
+        gdaltest.ngw_drv = None
+        pytest.skip()
+
+    assert gdaltest.ngw_ds.RasterXSize == 1073741824 and \
+           gdaltest.ngw_ds.RasterYSize == 1073741824 and \
+           gdaltest.ngw_ds.RasterCount == 4, 'Wrong size or band count.'
+
+    wkt = gdaltest.ngw_ds.GetProjectionRef()
+    assert wkt[:33] == 'PROJCS["WGS 84 / Pseudo-Mercator"', 'Got wrong SRS: ' + wkt
+
+    gt = gdaltest.ngw_ds.GetGeoTransform()
+    # -20037508.34, 0.037322767712175846, 0.0, 20037508.34, 0.0, -0.037322767712175846
+    assert abs(gt[0] - -20037508.34) < 0.00001 \
+       or abs(gt[3] - 20037508.34) < 0.00001 \
+       or abs(gt[1] - 0.037322767712175846) < 0.00001 \
+       or abs(gt[2] - 0.0) < 0.00001 \
+       or abs(gt[5] - -0.037322767712175846) < 0.00001 \
+       or abs(gt[4] - 0.0) < 0.00001, 'Wrong geotransform. {}'.format(gt)
+
+    assert gdaltest.ngw_ds.GetRasterBand(1).GetOverviewCount() > 0, 'No overviews!'
+    assert gdaltest.ngw_ds.GetRasterBand(1).DataType == gdal.GDT_Byte, \
+        'Wrong band data type.'
+
+###############################################################################
+# Check checksum for a small region.
+
+def test_ngw_4():
+
+    if gdaltest.ngw_drv is None or gdaltest.ngw_ds is None:
+        pytest.skip()
+
+    if check_availability(gdaltest.ngw_test_server) == False:
+        gdaltest.ngw_drv = None
+        pytest.skip()
+
+    gdal.SetConfigOption('CPL_ACCUM_ERROR_MSG', 'ON')
+    gdal.PushErrorHandler('CPLQuietErrorHandler')
+
+    cs = gdaltest.ngw_ds.GetRasterBand(1).Checksum(0, 0, 100, 100)
+
+    gdal.PopErrorHandler()
+    gdal.SetConfigOption('CPL_ACCUM_ERROR_MSG', 'OFF')
+    msg = gdal.GetLastErrorMsg()
+    gdal.ErrorReset()
+
+    if msg is not None and msg != '':
+        print('Last error message: {}.'.format(msg))
+        pytest.skip()
+
+    assert cs == 57182, 'Wrong checksum: ' + str(cs)
+
+###############################################################################
+# Test getting subdatasets from GetCapabilities
+
+def test_ngw_5():
+
+    if gdaltest.ngw_drv is None:
+        pytest.skip()
+
+    if check_availability(gdaltest.ngw_test_server) == False:
+        gdaltest.ngw_drv = None
+        pytest.skip()
+
+    url = 'NGW:' + gdaltest.ngw_test_server + '/resource/1730'
+    ds = gdal.Open(url)
+    assert ds is not None, 'Open of {} failed.'.format(url)
+
+    subdatasets = ds.GetMetadata("SUBDATASETS")
+    assert subdatasets, 'Did not get expected subdataset count.'
+
+    ds = None
+
+    name = subdatasets['SUBDATASET_0_NAME']
+    ds = gdal.Open(name)
+    assert ds is not None, 'Open of {} failed.'.format(name)
+
+    ds = None
+
+###############################################################################
+
+def test_ngw_cleanup():
+
+    gdaltest.ngw_ds = None
+    gdaltest.clean_tmp()
+
+    try:
+        shutil.rmtree('gdalwmscache')
+    except OSError:
+        pass
diff --git a/autotest/ogr/ogr_ngw.py b/autotest/ogr/ogr_ngw.py
new file mode 100644
index 000000000000..0fc9ce65ab17
--- /dev/null
+++ b/autotest/ogr/ogr_ngw.py
@@ -0,0 +1,429 @@
+#!/usr/bin/env python
+# -*- coding: utf-8 -*-
+################################################################################
+#  Project: OGR NextGIS Web Driver
+#  Purpose: Tests OGR NGW Driver capabilities
+#  Author: Dmitry Baryshnikov, polimax@mail.ru
+#  Language: Python
+################################################################################
+#  The MIT License (MIT)
+#
+#  Copyright (c) 2018, NextGIS <info@nextgis.com>
+#
+#  Permission is hereby granted, free of charge, to any person obtaining a copy
+#  of this software and associated documentation files (the "Software"), to deal
+#  in the Software without restriction, including without limitation the rights
+#  to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+#  copies of the Software, and to permit persons to whom the Software is
+#  furnished to do so, subject to the following conditions:
+#
+#  The above copyright notice and this permission notice shall be included in all
+#  copies or substantial portions of the Software.
+#
+#  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+#  IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+#  FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+#  AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+#  LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+#  OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+#  SOFTWARE.
+################################################################################
+
+import sys
+
+sys.path.append('../pymod')
+
+import gdaltest
+from osgeo import gdal
+from osgeo import ogr
+from osgeo import osr
+import time
+import pytest
+
+def check_availability(url):
+    version_url = url + '/api/component/pyramid/pkg_version'
+    return gdaltest.gdalurlopen(version_url) is not None
+
+###############################################################################
+# Check driver existence.
+
+def test_ogr_ngw_1():
+
+    gdaltest.ngw_ds = None
+    gdaltest.ngw_drv = None
+
+    gdaltest.ngw_drv = gdal.GetDriverByName('NGW')
+    if gdaltest.ngw_drv is None:
+        pytest.skip()
+
+    gdaltest.ngw_test_server = 'http://dev.nextgis.com/sandbox'
+
+    if check_availability(gdaltest.ngw_test_server) == False:
+        gdaltest.ngw_drv = None
+        pytest.skip()
+
+###############################################################################
+# Check create datasource.
+
+def test_ogr_ngw_2():
+    if gdaltest.ngw_drv is None:
+        pytest.skip()
+
+    if check_availability(gdaltest.ngw_test_server) == False:
+        gdaltest.ngw_drv = None
+        pytest.skip()
+
+    create_url = 'NGW:' + gdaltest.ngw_test_server + '/resource/0/gdaltest_group_' + str(int(time.time()))
+    gdal.PushErrorHandler()
+    gdaltest.ngw_ds = gdaltest.ngw_drv.Create(create_url, 0, 0, 0, gdal.GDT_Unknown, \
+        options=['DESCRIPTION=GDAL Test group',])
+    gdal.PopErrorHandler()
+
+    assert gdaltest.ngw_ds is not None, 'Create datasource failed.'
+    assert gdaltest.ngw_ds.GetMetadataItem('description', '') == 'GDAL Test group', \
+        'Did not get expected datasource description.'
+
+    assert int(gdaltest.ngw_ds.GetMetadataItem('id', '')) > 0, \
+        'Did not get expected datasource identifier.'
+
+###############################################################################
+# Check rename datasource.
+
+def test_ogr_ngw_3():
+    if gdaltest.ngw_drv is None:
+        pytest.skip()
+
+    if check_availability(gdaltest.ngw_test_server) == False:
+        gdaltest.ngw_drv = None
+        pytest.skip()
+
+    new_name = 'gdaltest_group_' + str(int(time.time()) - 2)
+    ds_resource_id = gdaltest.ngw_ds.GetMetadataItem('id', '')
+    rename_url = 'NGW:' + gdaltest.ngw_test_server + '/resource/' + ds_resource_id
+
+    assert gdaltest.ngw_drv.Rename(new_name, rename_url) == gdal.CE_None, \
+        'Rename datasource failed.'
+
+###############################################################################
+# Check datasource metadata.
+
+def test_ogr_ngw_4():
+    if gdaltest.ngw_drv is None:
+        pytest.skip()
+
+    if check_availability(gdaltest.ngw_test_server) == False:
+        gdaltest.ngw_drv = None
+        pytest.skip()
+
+    ds_resource_id = gdaltest.ngw_ds.GetMetadataItem('id', '')
+    gdaltest.ngw_ds.SetMetadataItem('test_int.d', '777', 'NGW')
+    gdaltest.ngw_ds.SetMetadataItem('test_float.f', '777.555', 'NGW')
+    gdaltest.ngw_ds.SetMetadataItem('test_string', 'metadata test', 'NGW')
+
+    gdaltest.ngw_ds = None
+    url = 'NGW:' + gdaltest.ngw_test_server + '/resource/' + ds_resource_id
+    gdaltest.ngw_ds = gdal.OpenEx(url, gdal.OF_UPDATE) # gdaltest.ngw_drv.Open(url, update=1)
+    assert gdaltest.ngw_ds is not None, \
+        'Open datasource failed.'
+
+    md_item = gdaltest.ngw_ds.GetMetadataItem('test_int.d', 'NGW')
+    assert md_item == '777', \
+        'Did not get expected datasource metadata item. test_int.d is equal {}, but should {}.'.format(md_item, '777')
+
+    md_item = gdaltest.ngw_ds.GetMetadataItem('test_float.f', 'NGW')
+    assert abs(float(md_item) - 777.555) < 0.00001, \
+        'Did not get expected datasource metadata item. test_float.f is equal {}, but should {}.'.format(md_item, '777.555')
+
+    md_item = gdaltest.ngw_ds.GetMetadataItem('test_string', 'NGW')
+    assert md_item == 'metadata test', \
+        'Did not get expected datasource metadata item. test_string is equal {}, but should {}.'.format(md_item, 'metadata test')
+
+def create_fields(lyr):
+    fld_defn = ogr.FieldDefn('STRFIELD', ogr.OFTString)
+    lyr.CreateField(fld_defn)
+    lyr.SetMetadataItem('FIELD_0_ALIAS', 'String field test')
+    fld_defn = ogr.FieldDefn('DECFIELD', ogr.OFTInteger)
+    lyr.CreateField(fld_defn)
+    lyr.SetMetadataItem('FIELD_1_ALIAS', 'Integer field test')
+    fld_defn = ogr.FieldDefn('BIGDECFIELD', ogr.OFTInteger64)
+    lyr.CreateField(fld_defn)
+    lyr.SetMetadataItem('FIELD_2_ALIAS', 'Integer64 field test')
+    fld_defn = ogr.FieldDefn('REALFIELD', ogr.OFTReal)
+    lyr.CreateField(fld_defn)
+    lyr.SetMetadataItem('FIELD_3_ALIAS', 'Real field test')
+    fld_defn = ogr.FieldDefn('DATEFIELD', ogr.OFTDate)
+    lyr.CreateField(fld_defn)
+    lyr.SetMetadataItem('FIELD_4_ALIAS', 'Date field test')
+    fld_defn = ogr.FieldDefn('TIMEFIELD', ogr.OFTTime)
+    lyr.CreateField(fld_defn)
+    lyr.SetMetadataItem('FIELD_5_ALIAS', 'Time field test')
+    fld_defn = ogr.FieldDefn('DATETIMEFLD', ogr.OFTDateTime)
+    lyr.CreateField(fld_defn)
+    lyr.SetMetadataItem('FIELD_6_ALIAS', 'Date & time field test')
+
+def fill_fields(f):
+    f.SetField('STRFIELD', "fo_o")
+    f.SetField('DECFIELD', 123)
+    f.SetField('BIGDECFIELD', 12345678901234)
+    f.SetField('REALFIELD', 1.23)
+    f.SetField('DATETIMEFLD', '2014/12/04 12:34:56')
+
+def fill_fields2(f):
+    f.SetField('STRFIELD', "русский")
+    f.SetField('DECFIELD', 321)
+    f.SetField('BIGDECFIELD', 32145678901234)
+    f.SetField('REALFIELD', 21.32)
+    f.SetField('DATETIMEFLD', '2019/12/31 21:43:56')
+
+def add_metadata(lyr):
+    lyr.SetMetadataItem('test_int.d', '777', 'NGW')
+    lyr.SetMetadataItem('test_float.f', '777,555', 'NGW')
+    lyr.SetMetadataItem('test_string', 'metadata test', 'NGW')
+
+###############################################################################
+# Check create vector layers.
+
+def test_ogr_ngw_5():
+    if gdaltest.ngw_drv is None:
+        pytest.skip()
+
+    if check_availability(gdaltest.ngw_test_server) == False:
+        gdaltest.ngw_drv = None
+        pytest.skip()
+
+    sr = osr.SpatialReference()
+    sr.ImportFromEPSG(3857)
+    lyr = gdaltest.ngw_ds.CreateLayer('test_pt_layer', srs=sr, geom_type=ogr.wkbMultiPoint, options=['OVERWRITE=YES', 'DESCRIPTION=Test point layer'])
+    assert lyr is not None, 'Create layer failed.'
+
+    create_fields(lyr)
+    add_metadata(lyr)
+
+    lyr = gdaltest.ngw_ds.CreateLayer('test_ln_layer', srs=sr, geom_type=ogr.wkbMultiLineString, options=['OVERWRITE=YES', 'DESCRIPTION=Test point layer'])
+    assert lyr is not None, 'Create layer failed.'
+
+    create_fields(lyr)
+    add_metadata(lyr)
+
+    lyr = gdaltest.ngw_ds.CreateLayer('test_pl_layer', srs=sr, geom_type=ogr.wkbMultiPolygon, options=['OVERWRITE=YES', 'DESCRIPTION=Test point layer'])
+    assert lyr is not None, 'Create layer failed.'
+
+    create_fields(lyr)
+    add_metadata(lyr)
+
+    # Test overwrite
+    lyr = gdaltest.ngw_ds.CreateLayer('test_pt_layer', srs=sr, geom_type=ogr.wkbPoint, options=['OVERWRITE=YES', 'DESCRIPTION=Test point layer'])
+    assert lyr is not None, 'Create layer failed.'
+
+    create_fields(lyr)
+    add_metadata(lyr)
+
+    lyr = gdaltest.ngw_ds.CreateLayer('test_ln_layer', srs=sr, geom_type=ogr.wkbLineString, options=['OVERWRITE=YES', 'DESCRIPTION=Test point layer'])
+    assert lyr is not None, 'Create layer failed.'
+
+    create_fields(lyr)
+    add_metadata(lyr)
+
+    lyr = gdaltest.ngw_ds.CreateLayer('test_pl_layer', srs=sr, geom_type=ogr.wkbPolygon, options=['OVERWRITE=YES', 'DESCRIPTION=Test point layer'])
+    assert lyr is not None, 'Create layer failed.'
+
+    create_fields(lyr)
+    add_metadata(lyr)
+
+    ds_resource_id = gdaltest.ngw_ds.GetMetadataItem('id', '')
+    gdaltest.ngw_ds = None
+
+    url = 'NGW:' + gdaltest.ngw_test_server + '/resource/' + ds_resource_id
+
+    gdaltest.ngw_ds = gdal.OpenEx(url, gdal.OF_UPDATE) # gdaltest.ngw_drv.Open(url, update=1)
+    assert gdaltest.ngw_ds is not None, 'Open datasource failed.'
+
+    for layer_name in ['test_pt_layer', 'test_ln_layer', 'test_pl_layer']:
+        lyr = gdaltest.ngw_ds.GetLayerByName(layer_name)
+        assert lyr is not None, 'Get layer {} failed.'.format(layer_name)
+
+        md_item = lyr.GetMetadataItem('test_int.d', 'NGW')
+        assert md_item == '777', \
+            'Did not get expected datasource metadata item. test_int.d is equal {}, but should {}.'.format(md_item, '777')
+
+        md_item = lyr.GetMetadataItem('test_float.f', 'NGW')
+        assert abs(float(md_item) - 777.555) < 0.00001, \
+            'Did not get expected datasource metadata item. test_float.f is equal {}, but should {}.'.format(md_item, '777.555')
+
+        md_item = lyr.GetMetadataItem('test_string', 'NGW')
+        assert md_item == 'metadata test', \
+            'Did not get expected datasource metadata item. test_string is equal {}, but should {}.'.format(md_item, 'metadata test')
+
+###############################################################################
+# Check open single vector layer.
+
+def test_ogr_ngw_6():
+    if gdaltest.ngw_drv is None:
+        pytest.skip()
+
+    if check_availability(gdaltest.ngw_test_server) == False:
+        gdaltest.ngw_drv = None
+        pytest.skip()
+
+    lyr = gdaltest.ngw_ds.GetLayerByName('test_pt_layer')
+    lyr_resource_id = lyr.GetMetadataItem('id', '')
+    url = 'NGW:' + gdaltest.ngw_test_server + '/resource/' + lyr_resource_id
+    ds = gdal.OpenEx(url)
+    assert ds is not None and ds.GetLayerCount() == 1, \
+        'Failed to open single vector layer.'
+
+###############################################################################
+# Check insert, update and delete features.
+
+def test_ogr_ngw_7():
+    if gdaltest.ngw_drv is None:
+        pytest.skip()
+
+    if check_availability(gdaltest.ngw_test_server) == False:
+        gdaltest.ngw_drv = None
+        pytest.skip()
+
+    lyr = gdaltest.ngw_ds.GetLayerByName('test_pt_layer')
+
+    f = ogr.Feature(lyr.GetLayerDefn())
+    fill_fields(f)
+    f.SetGeometry(ogr.CreateGeometryFromWkt('POINT (1 2)'))
+    ret = lyr.CreateFeature(f)
+    assert ret == 0 and f.GetFID() >= 0, \
+        'Create feature failed. Expected FID greater or equal 0, got {}.'.format(f.GetFID())
+
+    fill_fields2(f)
+    f.SetGeometry(ogr.CreateGeometryFromWkt('POINT (3 4)'))
+    ret = lyr.SetFeature(f)
+    assert ret == 0, 'Failed to update feature #{}.'.format(f.GetFID())
+
+    lyr.DeleteFeature(f.GetFID())
+
+    # Expected fail to get feature
+    gdal.PushErrorHandler()
+    f = lyr.GetFeature(f.GetFID())
+    gdal.PopErrorHandler()
+    assert f is None, 'Failed to delete feature #{}.'.format(f.GetFID())
+
+###############################################################################
+# Check insert, update features in batch mode.
+
+def test_ogr_ngw_8():
+    if gdaltest.ngw_drv is None:
+        pytest.skip()
+
+    if check_availability(gdaltest.ngw_test_server) == False:
+        gdaltest.ngw_drv = None
+        pytest.skip()
+
+    ds_resource_id = gdaltest.ngw_ds.GetMetadataItem('id', '')
+    gdaltest.ngw_ds = None
+
+    url = 'NGW:' + gdaltest.ngw_test_server + '/resource/' + ds_resource_id
+    gdaltest.ngw_ds = gdal.OpenEx(url, gdal.OF_UPDATE, open_options=['BATCH_SIZE=2'])
+
+    lyr = gdaltest.ngw_ds.GetLayerByName('test_pt_layer')
+    f1 = ogr.Feature(lyr.GetLayerDefn())
+    fill_fields(f1)
+    f1.SetGeometry(ogr.CreateGeometryFromWkt('POINT (1 2)'))
+    ret = lyr.CreateFeature(f1)
+    assert ret == 0 and f1.GetFID() < 0
+
+    f2 = ogr.Feature(lyr.GetLayerDefn())
+    fill_fields2(f2)
+    f2.SetGeometry(ogr.CreateGeometryFromWkt('POINT (2 3)'))
+    ret = lyr.CreateFeature(f2)
+    assert ret == 0 and f2.GetFID() < 0
+
+    f3 = ogr.Feature(lyr.GetLayerDefn())
+    fill_fields(f3)
+    f3.SetGeometry(ogr.CreateGeometryFromWkt('POINT (3 4)'))
+    ret = lyr.CreateFeature(f3)
+    assert ret == 0
+
+    ret = lyr.SyncToDisk()
+    assert ret == 0
+
+    lyr.ResetReading()
+    feat = lyr.GetNextFeature()
+    counter = 0
+    while feat is not None:
+        counter += 1
+        assert feat.GetFID() >= 0, 'Expected FID greater or equal 0, got {}.'.format(feat.GetFID())
+
+        feat = lyr.GetNextFeature()
+
+    assert counter >= 3, 'Expected 3 or greater feature count, got {}.'.format(counter)
+
+###############################################################################
+# Check ExecuteSQL.
+
+def test_ogr_ngw_9():
+    if gdaltest.ngw_drv is None:
+        pytest.skip()
+
+    if check_availability(gdaltest.ngw_test_server) == False:
+        gdaltest.ngw_drv = None
+        pytest.skip()
+
+    gdaltest.ngw_ds.ExecuteSQL('DELLAYER:test_ln_layer')
+    lyr = gdaltest.ngw_ds.GetLayerByName('test_ln_layer')
+    assert lyr is None, 'Expected fail to get layer test_ln_layer.'
+
+    lyr = gdaltest.ngw_ds.GetLayerByName('test_pl_layer')
+
+    f = ogr.Feature(lyr.GetLayerDefn())
+    fill_fields(f)
+    f.SetGeometry(ogr.CreateGeometryFromWkt('POLYGON((0 0,0 1,1 0,0 0))'))
+    ret = lyr.CreateFeature(f)
+    assert ret == 0, 'Failed to create feature in test_ln_layer.'
+    assert lyr.GetFeatureCount() == 1, 'Expected feature count is 1, got {}.'.format(lyr.GetFeatureCount())
+
+    gdaltest.ngw_ds.ExecuteSQL('DELETE FROM test_pl_layer;')
+    assert lyr.GetFeatureCount() == 0, 'Expected feature count is 0, got {}.'.format(lyr.GetFeatureCount())
+
+###############################################################################
+#  Run test_ogrsf
+
+def test_ogr_ngw_test_ogrsf():
+    if gdaltest.ngw_drv is None or gdal.GetConfigOption('SKIP_SLOW') is not None:
+        pytest.skip()
+
+    if check_availability(gdaltest.ngw_test_server) == False:
+        gdaltest.ngw_drv = None
+        pytest.skip()
+
+    if gdaltest.skip_on_travis():
+        pytest.skip()
+
+    if gdaltest.ngw_ds is None:
+        pytest.skip()
+
+    ds_resource_id = gdaltest.ngw_ds.GetMetadataItem('id', '')
+    url = 'NGW:' + gdaltest.ngw_test_server + '/resource/' + ds_resource_id
+
+    import test_cli_utilities
+    if test_cli_utilities.get_test_ogrsf_path() is None:
+        pytest.skip()
+
+    ret = gdaltest.runexternal(test_cli_utilities.get_test_ogrsf_path() + ' ' + url)
+
+    assert ret.find('INFO') != -1 and ret.find('ERROR') == -1
+
+###############################################################################
+# Cleanup
+
+def test_ogr_ngw_cleanup():
+
+    if gdaltest.ngw_drv is None:
+        pytest.skip()
+
+    if gdaltest.ngw_ds is not None:
+        ds_resource_id = gdaltest.ngw_ds.GetMetadataItem('id', '')
+        delete_url = 'NGW:' + gdaltest.ngw_test_server + '/resource/' + ds_resource_id
+
+        gdaltest.ngw_layer = None
+        gdaltest.ngw_ds = None
+
+        assert gdaltest.ngw_drv.Delete(delete_url) == gdal.CE_None, \
+            'Failed to delete datasource ' + delete_url + '.'
diff --git a/gdal/frmts/formats_list.html b/gdal/frmts/formats_list.html
index 161573634da7..176f16636155 100644
--- a/gdal/frmts/formats_list.html
+++ b/gdal/frmts/formats_list.html
@@ -974,6 +974,15 @@ <h1>GDAL Raster Formats</h1>
 </td><td> Yes
 </td></tr>
 
+<tr><td> <a href="drv_ngw_raster.html">NextGIS Web rasters</a>
+</td><td> NGW
+</td><td> No
+</td><td> No
+</td><td> Yes
+</td><td> --
+</td><td> No, needs libcurl
+</td></tr>
+
 <tr><td> <a href="frmt_netcdf.html">NetCDF</a>
 </td><td> netCDF
 </td><td> Yes
@@ -1297,7 +1306,7 @@ <h1>GDAL Raster Formats</h1>
 </td><td> --
 </td><td> Yes
 </td></tr>
- 
+
 <tr><td> <a href="frmt_various.html#SIGDEM">Scaled Integer Gridded DEM</a>
 </td><td> SIGDEM
 </td><td> No
diff --git a/gdal/ogr/ogrsf_frmts/GNUmakefile b/gdal/ogr/ogrsf_frmts/GNUmakefile
index 9f65e9c73950..c5b1f8233b07 100644
--- a/gdal/ogr/ogrsf_frmts/GNUmakefile
+++ b/gdal/ogr/ogrsf_frmts/GNUmakefile
@@ -46,10 +46,10 @@ SUBDIRS-$(CURL_SETTING) += amigocloud
 SUBDIRS-$(CURL_SETTING) += plscenes
 SUBDIRS-$(CURL_SETTING) += csw
 SUBDIRS-$(HAVE_MONGODB) += mongodb
+SUBDIRS-$(CURL_SETTING) += ngw
 
 default:	$(foreach d,$(SUBDIRS-yes),$(d)-target)
 
 clean:	$(foreach d,$(SUBDIRS-yes),$(d)-clean)
 	rm -f o/*.o
 	$(RM) o/*.lo
-
diff --git a/gdal/ogr/ogrsf_frmts/generic/GNUmakefile b/gdal/ogr/ogrsf_frmts/generic/GNUmakefile
index 8ab6731270a1..25f73d96ad66 100644
--- a/gdal/ogr/ogrsf_frmts/generic/GNUmakefile
+++ b/gdal/ogr/ogrsf_frmts/generic/GNUmakefile
@@ -229,6 +229,10 @@ ifeq ($(HAVE_CAD),yes)
 CXXFLAGS :=	$(CXXFLAGS) -DCAD_ENABLED
 endif
 
+ifeq ($(CURL_SETTING),yes)
+CXXFLAGS :=	$(CXXFLAGS) -DNGW_ENABLED
+endif
+
 CPPFLAGS	:=	-I.. -I../..  $(CPPFLAGS)
 
 default:	$(O_OBJ:.o=.$(OBJ_EXT))
@@ -237,4 +241,3 @@ clean:
 	rm -f *.o $(O_OBJ)
 
 $(O_OBJ):	../../../GDALmake.opt ../../swq.h
-
diff --git a/gdal/ogr/ogrsf_frmts/generic/makefile.vc b/gdal/ogr/ogrsf_frmts/generic/makefile.vc
index b131d9703a82..db2f12582825 100644
--- a/gdal/ogr/ogrsf_frmts/generic/makefile.vc
+++ b/gdal/ogr/ogrsf_frmts/generic/makefile.vc
@@ -13,7 +13,7 @@ GDAL_ROOT	=	..\..\..
 
 !IFDEF INCLUDE_OGR_FRMTS
 
-BASEFORMATS = -DSHAPE_ENABLED -DTAB_ENABLED -DNTF_ENABLED -DSDTS_ENABLED -DTIGER_ENABLED -DS57_ENABLED -DDGN_ENABLED -DVRT_ENABLED -DAVCBIN_ENABLED -DREC_ENABLED -DMEM_ENABLED -DCSV_ENABLED -DGML_ENABLED -DGMT_ENABLED -DBNA_ENABLED -DKML_ENABLED -DGEOJSON_ENABLED -DGPX_ENABLED -DGEOCONCEPT_ENABLED -DXPLANE_ENABLED -DGEORSS_ENABLED -DGTM_ENABLED -DDXF_ENABLED -DPGDUMP_ENABLED -DGPSBABEL_ENABLED -DSUA_ENABLED -DOPENAIR_ENABLED -DPDS_ENABLED -DHTF_ENABLED -DAERONAVFAA_ENABLED -DEDIGEO_ENABLED -DSVG_ENABLED -DIDRISI_ENABLED -DARCGEN_ENABLED -DSEGUKOOA_ENABLED -DSEGY_ENABLED -DSXF_ENABLED -DOPENFILEGDB_ENABLED -DWASP_ENABLED -DSELAFIN_ENABLED -DJML_ENABLED -DVDV_ENABLED -DCAD_ENABLED -DMVT_ENABLED
+BASEFORMATS = -DSHAPE_ENABLED -DTAB_ENABLED -DNTF_ENABLED -DSDTS_ENABLED -DTIGER_ENABLED -DS57_ENABLED -DDGN_ENABLED -DVRT_ENABLED -DAVCBIN_ENABLED -DREC_ENABLED -DMEM_ENABLED -DCSV_ENABLED -DGML_ENABLED -DGMT_ENABLED -DBNA_ENABLED -DKML_ENABLED -DGEOJSON_ENABLED -DGPX_ENABLED -DGEOCONCEPT_ENABLED -DXPLANE_ENABLED -DGEORSS_ENABLED -DGTM_ENABLED -DDXF_ENABLED -DPGDUMP_ENABLED -DGPSBABEL_ENABLED -DSUA_ENABLED -DOPENAIR_ENABLED -DPDS_ENABLED -DHTF_ENABLED -DAERONAVFAA_ENABLED -DEDIGEO_ENABLED -DSVG_ENABLED -DIDRISI_ENABLED -DARCGEN_ENABLED -DSEGUKOOA_ENABLED -DSEGY_ENABLED -DSXF_ENABLED -DOPENFILEGDB_ENABLED -DWASP_ENABLED -DSELAFIN_ENABLED -DJML_ENABLED -DVDV_ENABLED -DCAD_ENABLED -DMVT_ENABLED -DNGW_ENABLED
 
 EXTRAFLAGS =	-I.. -I..\.. $(OGDIDEF) $(FMEDEF) $(OCIDEF) $(PGDEF) \
 		$(ODBCDEF) $(SQLITEDEF) $(MYSQLDEF) $(ILIDEF) $(DWGDEF) \
@@ -177,6 +177,3 @@ default:	$(OBJ)
 
 clean:
 	-del *.obj *.pdb
-
-
-
diff --git a/gdal/ogr/ogrsf_frmts/generic/ogrregisterall.cpp b/gdal/ogr/ogrsf_frmts/generic/ogrregisterall.cpp
index 6dbdc1be26b4..78f61e307331 100644
--- a/gdal/ogr/ogrsf_frmts/generic/ogrregisterall.cpp
+++ b/gdal/ogr/ogrsf_frmts/generic/ogrregisterall.cpp
@@ -313,4 +313,8 @@ void OGRRegisterAllInternal()
     RegisterOGRAVCE00();
 #endif
 
+#ifdef NGW_ENABLED
+    RegisterOGRNGW();
+#endif // NGW_ENABLED
+
 } /* OGRRegisterAll */
diff --git a/gdal/ogr/ogrsf_frmts/makefile.vc b/gdal/ogr/ogrsf_frmts/makefile.vc
index 62f250ec1a6f..1ec0558dd888 100644
--- a/gdal/ogr/ogrsf_frmts/makefile.vc
+++ b/gdal/ogr/ogrsf_frmts/makefile.vc
@@ -16,7 +16,7 @@ DIRLIST		=	generic geojson shape ntf sdts tiger s57 dgn mitab gml \
 			$(LIBKMLDIR) $(WFSDIR) $(SOSIDIR) $(GFTDIR) \
 			$(COUCHDBDIR) $(CLOUDANTDIR) $(FGDB_DIR) $(XLSDIR) $(ODSDIR) $(XLSXDIR) \
 			$(INGRESDIR) $(ELASTICDIR) $(OSMDIR) $(VFKDIR) $(CARTODIR) $(AMIGOCLOUD_DIR) \
-			$(PLSCENESDIR) $(CSWDIR) $(MONGODBDIR) $(GMLAS_DIR) $(CAD_DIR)
+			$(PLSCENESDIR) $(CSWDIR) $(MONGODBDIR) $(GMLAS_DIR) $(CAD_DIR) $(NGW_DIR)
 
 PLUGINDIRLIST	=	$(PLUGIN_ARCOBJECTS_DIR) \
 			$(PLUGIN_DWG_DIR) \
@@ -241,6 +241,11 @@ PLUGIN_MONGODBDIR = mongodb
 !ENDIF
 !ENDIF
 
+!IFDEF CURL_LIB
+NGW_DIR = ngw
+NGW_OBJ = ngw\*.obj
+!ENDIF
+
 CAD_DIR = cad
 CAD_OBJ = cad\*.obj cad\libopencad\*.obj cad\libopencad\dwg\*.obj
 
@@ -276,7 +281,7 @@ default:
 				$(DODS_OBJ) $(NAS_OBJ) $(LIBKMLOBJ) $(WFS_OBJ) \
 				$(SOSI_OBJ) $(GFT_OBJ) $(COUCHDB_OBJ) $(CLOUDANT_OBJ) $(XLS_OBJ) $(ODS_OBJ) $(XLSX_OBJ)  \
 				$(INGRESOBJ) $(ELASTIC_OBJ) $(OSM_OBJ) $(VFK_OBJ) $(CARTO_OBJ) $(AMIGOCLOUD_OBJ) $(PLSCENES_OBJ) \
-				$(CSW_OBJ) $(MONGODBOBJ) $(GMLAS_OBJ) $(CAD_OBJ)
+				$(CSW_OBJ) $(MONGODBOBJ) $(GMLAS_OBJ) $(CAD_OBJ) $(NGW_OBJ)
 	lib /out:ogrsf_frmts_sup.lib \
 				 ..\..\frmts\iso8211\*.obj \
 				 ..\..\frmts\sdts\sdtsattrreader.obj \
diff --git a/gdal/ogr/ogrsf_frmts/ngw/GNUmakefile b/gdal/ogr/ogrsf_frmts/ngw/GNUmakefile
new file mode 100644
index 000000000000..327214caf826
--- /dev/null
+++ b/gdal/ogr/ogrsf_frmts/ngw/GNUmakefile
@@ -0,0 +1,18 @@
+
+include ../../../GDALmake.opt
+
+OBJ	:= \
+	ogrngwdriver.o \
+	gdalngwdataset.o \
+	ogrngwlayer.o \
+	ngw_api.o
+
+CPPFLAGS	:=	-I. -I.. -I../..
+
+default:	$(O_OBJ:.o=.$(OBJ_EXT))
+
+clean:
+	rm -f *.o $(O_OBJ)
+	rm -f *~
+
+$(O_OBJ):	ogr_ngw.h
diff --git a/gdal/ogr/ogrsf_frmts/ngw/drv_ngw.html b/gdal/ogr/ogrsf_frmts/ngw/drv_ngw.html
new file mode 100644
index 000000000000..54b06ce2460b
--- /dev/null
+++ b/gdal/ogr/ogrsf_frmts/ngw/drv_ngw.html
@@ -0,0 +1,217 @@
+<html>
+<head>
+    <title>NextGIS Web</title>
+</head>
+
+<body bgcolor="#ffffff">
+
+<h1>NextGIS Web</h1>
+
+NextGIS Web - is a server GIS, which allows to store and edit geodata and to
+display maps in web browser. Also NextGIS Web can share geodata with other
+NextGIS software.
+<p>
+
+NextGIS Web has the following features:
+
+<ul>
+    <li> Display maps in a web browser (different maps with different layers and
+        styles)
+    <li> Flexible permissions management
+    <li> Load geodata from PostGIS or import from GIS formats (ESRI Shape,
+        GeoJSON or GeoTIFF)
+    <li> Load vector geodata in the following formats: GeoJSON, CSV, ESRI Shape
+    <li> Import map styles from QGIS project or set them manually
+    <li> Act as a server for TMS, WMS, WFS
+    <li> Act as a client for WMS
+    <li> User can add photos to records, change record attributes via web
+        interface or WFS-T protocol
+</ul>
+
+NextGIS Web - is an open source software (license GPL v2+, see
+<a href="https://www.gnu.org/licenses/old-licenses/gpl-2.0.en.html">
+GNU General Public License, version 2</a>).
+
+<h2>Driver</h2>
+
+The driver is available since GDAL/OGR >= <b>2.4</b>. This driver can connect to
+the services implementing the NextGIS Web API. GDAL/OGR must be built with Curl
+support in order for the NGW driver to be compiled.
+
+The driver supports read and write operations.
+
+<h2>Dataset name syntax</h2>
+
+The minimal syntax to open a NGW datasource is:
+
+NGW:[NextGIS Web URL][/resource/][resource identifier]
+
+<ul>
+    <li><b>NextGIS Web URL</b> may be an url to nextgis.com cloud service (for
+        example, https://demo.nextgis.com), or some other url including port and
+        additional path (for example, http://192.168.1.1:8000/test).
+    <li><b>resource</b> is mandatory keyword dividing resource identifier from
+        the rest of URL.
+    <li><b>resource identifier</b> this is positive number from 0 and above. This
+        may be a resource group, vector, PostGIS or raster layer, style.
+</ul>
+
+If identifier is resource group, all vector layers, PostGIS, raster layers, styles
+will listed as child resources. In other case this will be a separate layer.
+
+<h2>Configuration options</h2>
+
+The following configuration options are available:
+
+<ul>
+    <li><b>NGW_USERPWD</b>: User name and password separated with colon. Optional
+        and can be set using open options.
+    <li><b>NGW_BATCH_MODE</b>: If set to YES - all edits (insert, update) will
+        cache and execute if cache limit exceeded or sync to disk execute. Delete
+        operation will execute immediately.
+    <li><b>NGW_PAGE_SIZE</b>: If supported by server, fetch features from
+        remote server will use paging. The -1 value disables paging even it
+        supported by server.
+</ul>
+
+<h2>Authentication</h2>
+
+Any operations (read, write, get metadata, change properties, etc.) may require
+an authenticated access. Authenticated access is obtained by specifying user name
+and password in open, create or configuration options.
+
+<h2>Geometry</h2>
+
+NextGIS Web supports only one geometry column. Default spatial reference is Web
+Mercator (EPSG:3857). The following geometry types are available:
+
+<ul>
+    <li>POINT
+    <li>LINESTRING
+    <li>POLYGON
+    <li>MULTIPOINT
+    <li>MULTILINESTRING
+    <li>MULTIPOLYGON
+</ul>
+
+<h2>Field data types</h2>
+
+NextWeb supports only following field types:
+
+<ul>
+    <li>OFTInteger
+    <li>OFTInteger64
+    <li>OFTReal
+    <li>OFTString
+    <li>OFTDate
+    <li>OFTTime
+    <li>OFTDateTime
+</ul>
+
+<h2>Paging</h2>
+
+Features are retrieved from the server by chunks if server support this feature.
+This number can be altered with the NGW_PAGE_SIZE configuration option or
+PAGE_SIZE open option.
+
+<h2>Write support</h2>
+
+Datasource and layers creation and deletion is possible.
+Write support is only enabled when the datasource is opened in update mode and
+user has permissions.
+
+Vector and PostGIS layers insert and update operations may be cached if BATCH_MODE
+is enable. Delete operation executes immediately.
+
+<h2>Open options</h2>
+
+The following open options are available:
+
+<ul>
+    <li>USERPWD - Username and password, separated by colon.
+    <li>PAGE_SIZE=-1 - Limit feature count while fetching from server. Default
+        value is -1 - no limit.
+    <li>BATCH_SIZE=-1 - Size of feature insert and update operations cache before send to server. If batch size is -1 batch mode is disabled. Default value is -1.
+</ul>
+
+<h2>Dataset creation options</h2>
+
+The following dataset/datasource creation options are available:
+
+<ul>
+    <li>KEY - Key value. Must be unique in whole NextGIS Web instance. Optional.
+    <li>DESCRIPTION - Resource description. Optional.
+    <li>USERPWD - Username and password, separated by colon.
+    <li>PAGE_SIZE=-1 - Limit feature count while fetching from server. Default
+        value is -1 - no limit.
+    <li>BATCH_SIZE=-1 - Size of feature insert and update operations cache before send to server. If batch size is -1 batch mode is disable. Default value is -1.
+</ul>
+
+<h2>Layer creation options</h2>
+
+The following layer creation options are available:
+
+<ul>
+    <li>OVERWRITE - Whether to overwrite an existing table with the layer name
+        to be created. The resource will delete and new one will created. This
+        leads that resource identifier will change. Defaults to NO. Optional.
+    <li>KEY - Key value. Must be unique in whole NextGIS Web instance. Optional.
+    <li>DESCRIPTION - Resource description. Optional.
+</ul>
+
+<h2>Metadata</h2>
+
+NextGIS Web metadata are supported in datasource, vector, PostGIS, raster layers
+and styles. Metadata are stored at specific domain "NGW". NextGIS Web supported
+metadata are strings and numbers. Metadata keys with decimal numbers will have
+suffix <b>.d</b> and for real numbers - <b>.f</b>. To create new metadata item,
+add new key=value pair in NGW domain use the <i>SetMetadataItem</i> function and
+appropriate suffix. During transfering to NextGIS Web, suffix will be omited. You
+must ensure that numbers correctly transform from string to number.
+<p>
+Resource description and key map to appropriate <i>description</i> and
+<i>keyname</i> metadata items in default domain. Changing those metadata items
+will cause an update of resource properties.
+<p>
+Resource creation date maps to read-only metadata item <i>creation_date</i> in
+default domain.
+<p>
+Vector layer field properties (alias, identifier, label field, grid visibility)
+map to layer metadata the following way:
+
+<ul>
+    <li>field alias -> FIELD_{field number}_ALIAS (for example FIELD_0_ALIAS)
+    <li>identifier -> FIELD_{field number}_ID (for example FIELD_0_ID)
+    <li>label field -> FIELD_{field number}_LABEL_FIELD (for example FIELD_0_LABEL_FIELD)
+    <li>grid visibility -> FIELD_{field number}_GRID_VISIBILITY (for example FIELD_0_GRID_VISIBILITY)
+</ul>
+
+<h2>Examples</h2>
+
+Read datasource contensts:
+<pre>
+    ogrinfo -ro NGW:https://demo.nextgis.com/resource/1730
+</pre>
+<p>
+
+Read layer details:
+<pre>
+    ogrinfo -ro -so NGW:https://demo.nextgis.com/resource/1730 Parks
+</pre>
+<p>
+
+Creating and populating a vector layer from a shapefile:
+<pre>
+    ogr2ogr -f NGW "NGW:https://demo.nextgis.com/resource/1730" myshapefile.shp
+</pre>
+<p>
+
+<h3>See also:</h2>
+<ul>
+    <li><a href="http://docs.nextgis.com/docs_ngweb/source/toc.html">
+    NextGIS Web documentation</a>
+    <li><a href="http://docs.nextgis.com/docs_ngweb_dev/doc/toc.html">
+    NextGIS Web for developers</a>
+</ul>
+</body>
+</html>
diff --git a/gdal/ogr/ogrsf_frmts/ngw/drv_ngw_raster.html b/gdal/ogr/ogrsf_frmts/ngw/drv_ngw_raster.html
new file mode 100644
index 000000000000..5dc015c382a7
--- /dev/null
+++ b/gdal/ogr/ogrsf_frmts/ngw/drv_ngw_raster.html
@@ -0,0 +1,165 @@
+<html>
+<head>
+    <title>NextGIS Web</title>
+</head>
+
+<body bgcolor="#ffffff">
+
+<h1>NextGIS Web</h1>
+
+NextGIS Web - is a server GIS, which allows to store and edit geodata and to
+display maps in web browser. Also NextGIS Web can share geodata with other
+NextGIS software.
+<p>
+
+NextGIS Web has the following features:
+
+<ul>
+    <li> Display maps in a web browser (different maps with different layers and
+        styles)
+    <li> Flexible permissions management
+    <li> Load geodata from PostGIS or import from GIS formats (ESRI Shape,
+        GeoJSON or GeoTIFF)
+    <li> Load vector geodata in the following formats: GeoJSON, CSV, ESRI Shape
+    <li> Import map styles from QGIS project or set them manually
+    <li> Act as a server for TMS, WMS, WFS
+    <li> Act as a client for WMS
+    <li> User can add photos to records, change record attributes via web
+        interface or WFS-T protocol
+</ul>
+
+NextGIS Web - is an open source software (license GPL v2+, see
+<a href="https://www.gnu.org/licenses/old-licenses/gpl-2.0.en.html">
+GNU General Public License, version 2</a>).
+
+<h2>Driver</h2>
+
+The driver is available since GDAL/OGR >= <b>2.4</b>.
+NextGIS Web supports several raster types:
+
+<ul>
+    <li>Raster style
+    <li>Vector style
+    <li>WMS layer
+    <li>WMS Service
+    <li>Web map as combination of raster and vector styles
+</ul>
+</p>
+Each NextGIS Web raster layer can have one or more raster styles.<br>
+Each NextGIS Web vector or PostGIS layer can have one or more vector style (QGIS
+qml or MapServer xml).<br>
+WMS layer is one or more layers from external WMS service. This layer has no
+styles.<br>
+WMS Service is usual WMS protocol implementation.
+<p>
+Now NGW driver supports only raster and vector styles and WMS layers. You can get
+raster data as tiles or image (only tiles are supported now).
+</p>
+The driver supports read-only operations on rasters.
+
+<h2>Dataset name syntax</h2>
+
+The minimal syntax to open a NGW datasource is:
+
+NGW:[NextGIS Web URL][/resource/][resource identifier]
+
+<ul>
+    <li><b>NextGIS Web URL</b> may be an url to nextgis.com cloud service (for
+        example, https://demo.nextgis.com), or some other url including port and
+        additional path (for example, http://192.168.1.1:8000/test).
+    <li><b>resource</b> is mandatory keyword dividing resource identifier from
+        the rest of URL.
+    <li><b>resource identifier</b> this is positive number from 0 and above. This
+        may be a resource group, vector, PostGIS or raster layer, style.
+</ul>
+
+If identifier is resource group, all vector layers, PostGIS, raster layers, styles
+will be listed as child resources. In other case this will be a separate raster.
+
+<h2>Configuration options</h2>
+
+The following configuration options are available:
+
+<ul>
+    <li><b>NGW_USERPWD</b>: User name and password separated with colon. Optional
+        and can be set using open options.
+    <li><b>NGW_CACHE_EXPIRES</b>: Time in seconds cached files will stay valid. If
+        cached file expires it is deleted when maximum size of cache is reached.
+        Also expired file can be overwritten by the new one from web. Defaults
+        to 604800 (7 days).
+    <li><b>NGW_CACHE_MAX_SIZE</b>: The cache maximum size in bytes. If cache
+        reached maximum size, expired cached files will be deleted. Defaults
+        to 67108864 (64Mb).
+</ul>
+
+<h2>Authentication</h2>
+
+Any operations (read, write, get metadata, change properties, etc.) may require
+an authenticated access. Authenticated access is obtained by specifying user name
+and password in open, create or configuration options.
+
+<h2>Open options</h2>
+
+The following open options are available:
+
+<ul>
+    <li>USERPWD - Username and password, separated by colon.
+    <li>CACHE_EXPIRES=604800 - Time in seconds cached files will stay valid. If
+        cached file expires it is deleted when maximum size of cache is reached.
+        Also expired file can be overwritten by the new one from web. Defaults
+        to 604800 (7 days).
+    <li>CACHE_MAX_SIZE=67108864 - The cache maximum size in bytes. If cache
+        reached maximum size, expired cached files will be deleted. Defaults
+        to 67108864 (64Mb).
+</ul>
+
+<h2>Metadata</h2>
+
+NextGIS Web metadata are supported in datasource, vector, PostGIS, raster layers
+and styles. Metadata are stored at specific domain "NGW". NextGIS Web supported
+metadata are strings and numbers. Metadata keys with decimal numbers will have
+suffix <b>.d</b> and for real numbers - <b>.f</b>. To create new metadata item,
+add new key=value pair in NGW domain use the <i>SetMetadataItem</i> function and
+appropriate suffix. During transfering to NextGIS Web, suffix will be omited. You
+must ensure that numbers correctly transform from string to number.
+<p>
+Resource description and key map to appropriate <i>description</i> and
+<i>keyname</i> metadata items in default domain. Changing those metadata items
+will cause an update of resource properties.
+<p>
+Resource creation date map to read-only metadata item <i>creation_date</i> in
+default domain.
+<p>
+Vector layer field properties (alias, identifier, label field, grid visibility)
+map to layer metadata the following way:
+
+<ul>
+    <li>field alias -> FIELD_{field number}_ALIAS (for example FIELD_0_ALIAS)
+    <li>identifier -> FIELD_{field number}_ID (for example FIELD_0_ID)
+    <li>label field -> FIELD_{field number}_LABEL_FIELD (for example FIELD_0_LABEL_FIELD)
+    <li>grid visibility -> FIELD_{field number}_GRID_VISIBILITY (for example FIELD_0_GRID_VISIBILITY)
+</ul>
+
+<h2>Examples</h2>
+
+Read datasource contensts:
+<pre>
+    gdalinfo NGW:https://demo.nextgis.com/resource/1730
+</pre>
+<p>
+
+Read raster details:
+<pre>
+    gdalinfo NGW:https://demo.nextgis.com/resource/1734
+</pre>
+<p>
+
+<h3>See also:</h2>
+<ul>
+    <li><a href="http://docs.nextgis.com/docs_ngweb/source/toc.html">
+    NextGIS Web documentation</a>
+    <li><a href="http://docs.nextgis.com/docs_ngweb_dev/doc/toc.html">
+    NextGIS Web for developers</a>
+</ul>
+</body>
+</html>
diff --git a/gdal/ogr/ogrsf_frmts/ngw/gdalngwdataset.cpp b/gdal/ogr/ogrsf_frmts/ngw/gdalngwdataset.cpp
new file mode 100644
index 000000000000..44811770be79
--- /dev/null
+++ b/gdal/ogr/ogrsf_frmts/ngw/gdalngwdataset.cpp
@@ -0,0 +1,923 @@
+/*******************************************************************************
+ *  Project: NextGIS Web Driver
+ *  Purpose: Implements NextGIS Web Driver
+ *  Author: Dmitry Baryshnikov, dmitry.baryshnikov@nextgis.com
+ *  Language: C++
+ *******************************************************************************
+ *  The MIT License (MIT)
+ *
+ *  Copyright (c) 2018, NextGIS
+ *
+ *  Permission is hereby granted, free of charge, to any person obtaining a copy
+ *  of this software and associated documentation files (the "Software"), to deal
+ *  in the Software without restriction, including without limitation the rights
+ *  to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ *  copies of the Software, and to permit persons to whom the Software is
+ *  furnished to do so, subject to the following conditions:
+ *
+ *  The above copyright notice and this permission notice shall be included in all
+ *  copies or substantial portions of the Software.
+ *
+ *  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ *  IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ *  FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ *  AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ *  LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ *  OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ *  SOFTWARE.
+ *******************************************************************************/
+
+#include "ogr_ngw.h"
+
+#include "cpl_http.h"
+#include "gdal_proxy.h"
+
+class NGWWrapperRasterBand : public GDALProxyRasterBand
+{
+    GDALRasterBand *poBaseBand;
+
+protected:
+    virtual GDALRasterBand *RefUnderlyingRasterBand() override { return poBaseBand; }
+
+public:
+    explicit NGWWrapperRasterBand( GDALRasterBand* poBaseBandIn ) :
+        poBaseBand( poBaseBandIn )
+    {
+        eDataType = poBaseBand->GetRasterDataType();
+        poBaseBand->GetBlockSize(&nBlockXSize, &nBlockYSize);
+    }
+    virtual ~NGWWrapperRasterBand() {}
+};
+
+/*
+ * OGRNGWDataset()
+ */
+OGRNGWDataset::OGRNGWDataset() :
+    bReadWrite(false),
+    nBatchSize(-1),
+    nPageSize(-1),
+    bFetchedPermissions(false),
+    bHasFeaturePaging(false),
+    bMetadataDerty(false),
+    papoLayers(nullptr),
+    nLayers(0),
+    poRasterDS(nullptr),
+    nRasters(0),
+    nCacheExpires(604800),  // 7 days
+    nCacheMaxSize(67108864) // 64 MB
+{}
+
+/*
+ * ~OGRNGWDataset()
+ */
+OGRNGWDataset::~OGRNGWDataset()
+{
+    // Last sync with server.
+    FlushCache();
+
+    if( poRasterDS != nullptr )
+    {
+        GDALClose( poRasterDS );
+        poRasterDS = nullptr;
+    }
+
+    for( int i = 0; i < nLayers; ++i )
+    {
+        delete papoLayers[i];
+    }
+    CPLFree( papoLayers );
+}
+
+/*
+ * FetchPermissions()
+ */
+void OGRNGWDataset::FetchPermissions()
+{
+    if( bFetchedPermissions )
+    {
+        return;
+    }
+
+    if( bReadWrite )
+    {
+        // Check connection and is it read only.
+        char **papszHTTPOptions = GetHeaders();
+        stPermissions = NGWAPI::CheckPermissions( osUrl, osResourceId,
+            papszHTTPOptions, bReadWrite );
+        CSLDestroy( papszHTTPOptions );
+    }
+    else
+    {
+        stPermissions.bDataCanRead = true;
+        stPermissions.bResourceCanRead = true;
+        stPermissions.bDatastructCanRead = true;
+        stPermissions.bMetadataCanRead = true;
+    }
+    bFetchedPermissions = true;
+}
+
+/*
+ * TestCapability()
+ */
+int OGRNGWDataset::TestCapability( const char *pszCap )
+{
+    FetchPermissions();
+    if( EQUAL(pszCap, ODsCCreateLayer) )
+    {
+        return stPermissions.bResourceCanCreate;
+    }
+    else if( EQUAL(pszCap, ODsCDeleteLayer) )
+    {
+        return stPermissions.bResourceCanDelete;
+    }
+    else if( EQUAL(pszCap, "RenameLayer") )
+    {
+        return stPermissions.bResourceCanUpdate;
+    }
+    else if( EQUAL(pszCap, ODsCRandomLayerWrite) )
+    {
+        return stPermissions.bDataCanWrite; // FIXME: Check on resource level is this permission set?
+    }
+    else if( EQUAL(pszCap, ODsCRandomLayerRead) )
+    {
+        return stPermissions.bDataCanRead;
+    }
+    else
+    {
+        return FALSE;
+    }
+}
+
+/*
+ * GetLayer()
+ */
+OGRLayer *OGRNGWDataset::GetLayer( int iLayer )
+{
+    if( iLayer < 0 || iLayer >= nLayers )
+    {
+        return nullptr;
+    }
+    else
+    {
+        return papoLayers[iLayer];
+    }
+}
+
+/*
+ * Open()
+ */
+bool OGRNGWDataset::Open( const std::string &osUrlIn,
+    const std::string &osResourceIdIn, char **papszOpenOptionsIn,
+    bool bUpdateIn, int nOpenFlagsIn )
+{
+    osUrl = osUrlIn;
+    osResourceId = osResourceIdIn;
+
+    bReadWrite = bUpdateIn;
+
+    osUserPwd = CSLFetchNameValueDef( papszOpenOptionsIn, "USERPWD",
+        CPLGetConfigOption("NGW_USERPWD", ""));
+
+    nBatchSize = atoi( CSLFetchNameValueDef( papszOpenOptionsIn,
+        "BATCH_SIZE", CPLGetConfigOption("NGW_BATCH_SIZE", "-1") ) );
+
+    nPageSize = atoi( CSLFetchNameValueDef(papszOpenOptionsIn, "PAGE_SIZE",
+        CPLGetConfigOption("NGW_PAGE_SIZE", "-1") ) );
+    if( nPageSize == 0 )
+    {
+        nPageSize = -1;
+    }
+
+    nCacheExpires = atoi( CSLFetchNameValueDef(papszOpenOptionsIn, "CACHE_EXPIRES",
+        CPLGetConfigOption("NGW_CACHE_EXPIRES", "604800") ) );
+
+    nCacheMaxSize = atoi( CSLFetchNameValueDef(papszOpenOptionsIn, "CACHE_MAX_SIZE",
+        CPLGetConfigOption("NGW_CACHE_MAX_SIZE", "67108864") ) );
+
+    return Init( nOpenFlagsIn );
+}
+
+/*
+ * Open()
+ *
+ * The pszFilename templates:
+ *      - NGW:http://some.nextgis.com/resource/0
+ *      - NGW:http://some.nextgis.com:8000/test/resource/0
+ */
+bool OGRNGWDataset::Open( const char *pszFilename, char **papszOpenOptionsIn,
+    bool bUpdateIn, int nOpenFlagsIn )
+{
+    NGWAPI::Uri stUri = NGWAPI::ParseUri(pszFilename);
+
+    if( stUri.osPrefix != "NGW" )
+    {
+        CPLError(CE_Failure, CPLE_NotSupported,
+            "Unsupported name %s", pszFilename);
+        return false;
+    }
+
+    osUrl = stUri.osAddress;
+    osResourceId = stUri.osResourceId;
+
+    return Open( stUri.osAddress, stUri.osResourceId, papszOpenOptionsIn,
+        bUpdateIn, nOpenFlagsIn );
+}
+
+/*
+ * Init()
+ */
+bool OGRNGWDataset::Init(int nOpenFlagsIn)
+{
+    // NOTE: Skip check API version at that moment. We expected API v3.
+
+    // Get resource details.
+    CPLJSONDocument oResourceDetailsReq;
+    char **papszHTTPOptions = GetHeaders();
+    bool bResult = oResourceDetailsReq.LoadUrl( NGWAPI::GetResource( osUrl,
+        osResourceId ), papszHTTPOptions );
+
+    if( bResult )
+    {
+        CPLJSONObject oRoot = oResourceDetailsReq.GetRoot();
+
+        if( oRoot.IsValid() )
+        {
+            std::string osResourceType = oRoot.GetString("resource/cls");
+            FillMetadata( oRoot );
+
+            if( osResourceType == "resource_group" )
+            {
+                // Check feature paging.
+                FillCapabilities( papszHTTPOptions );
+                if( oRoot.GetBool( "resource/children", false ) ) {
+                    // Get child resources.
+                    bResult = FillResources( papszHTTPOptions, nOpenFlagsIn );
+                }
+            }
+            else if( (osResourceType == "vector_layer" ||
+                osResourceType == "postgis_layer") )
+            {
+                // Cehck feature paging.
+                FillCapabilities( papszHTTPOptions );
+                // Add vector layer.
+                AddLayer( oRoot, papszHTTPOptions, nOpenFlagsIn );
+            }
+            else if( ( osResourceType == "mapserver_style" ||
+                osResourceType == "qgis_vector_style" ||
+                osResourceType == "raster_style" ||
+                osResourceType == "wmsclient_layer") &&
+                nOpenFlagsIn & GDAL_OF_RASTER )
+            {
+                // GetExtent from parent.
+                OGREnvelope stExtent;
+                std::string osParentId = oRoot.GetString("resource/parent/id");
+                bool bExtentResult = NGWAPI::GetExtent(osUrl, osParentId,
+                    papszHTTPOptions, 3857, stExtent);
+
+                if( !bExtentResult )
+                {
+                    // Set full extent for EPSG:3857.
+                    stExtent.MinX = -20037508.34;
+                    stExtent.MaxX = 20037508.34;
+                    stExtent.MinY = -20037508.34;
+                    stExtent.MaxY = 20037508.34;
+                }
+
+                CPLDebug("NGW", "Raster extent is: %f, %f, %f, %f",
+                    stExtent.MinX, stExtent.MinY,
+                    stExtent.MaxX, stExtent.MaxY);
+
+                int nEPSG = 3857;
+                // Get parent details. We can skip this as default SRS in NGW is 3857.
+                if( osResourceType == "wmsclient_layer" )
+                {
+                    nEPSG = oRoot.GetInteger("wmsclient_layer/srs/id", nEPSG);
+                }
+                else
+                {
+                    CPLJSONDocument oResourceReq;
+                    bResult = oResourceReq.LoadUrl( NGWAPI::GetResource( osUrl,
+                        osResourceId ), papszHTTPOptions );
+
+                    if( bResult )
+                    {
+                        CPLJSONObject oParentRoot = oResourceReq.GetRoot();
+                        if( osResourceType == "mapserver_style" ||
+                            osResourceType == "qgis_vector_style" )
+                        {
+                            nEPSG = oParentRoot.GetInteger("vector_layer/srs/id", nEPSG);
+                        }
+                        else if( osResourceType == "raster_style")
+                        {
+                            nEPSG = oParentRoot.GetInteger("raster_layer/srs/id", nEPSG);
+                        }
+                    }
+                }
+
+                // Create raster dataset.
+                std::string osRasterUrl = NGWAPI::GetTMS(osUrl, osResourceId);
+                char* pszRasterUrl = CPLEscapeString(osRasterUrl.c_str(), -1, CPLES_XML);
+                const char *pszConnStr = CPLSPrintf("<GDAL_WMS><Service name=\"TMS\">"
+            "<ServerUrl>%s</ServerUrl></Service><DataWindow>"
+            "<UpperLeftX>-20037508.34</UpperLeftX><UpperLeftY>20037508.34</UpperLeftY>"
+            "<LowerRightX>20037508.34</LowerRightX><LowerRightY>-20037508.34</LowerRightY>"
+            "<TileLevel>%d</TileLevel><TileCountX>1</TileCountX>"
+            "<TileCountY>1</TileCountY><YOrigin>top</YOrigin></DataWindow>"
+            "<Projection>EPSG:%d</Projection><BlockSizeX>256</BlockSizeX>"
+            "<BlockSizeY>256</BlockSizeY><BandsCount>%d</BandsCount>"
+            "<Cache><Type>file</Type><Expires>%d</Expires><MaxSize>%d</MaxSize>"
+            "</Cache><ZeroBlockHttpCodes>204,404</ZeroBlockHttpCodes></GDAL_WMS>",
+                pszRasterUrl,
+                22,      // NOTE: We have no limit in zoom levels.
+                nEPSG,   // NOTE: Default SRS is EPSG:3857.
+                4,
+                nCacheExpires,
+                nCacheMaxSize);
+
+                CPLFree( pszRasterUrl );
+
+                poRasterDS = reinterpret_cast<GDALDataset*>(GDALOpenEx(pszConnStr,
+                    GDAL_OF_READONLY | GDAL_OF_RASTER | GDAL_OF_INTERNAL, nullptr,
+                    nullptr, nullptr));
+
+                if( poRasterDS )
+                {
+                    bResult = true;
+                    nRasterXSize = poRasterDS->GetRasterXSize();
+                    nRasterYSize = poRasterDS->GetRasterYSize();
+
+                    for( int iBand = 1; iBand <= poRasterDS->GetRasterCount();
+                            iBand++ )
+                    {
+                        SetBand( iBand, new NGWWrapperRasterBand(
+                            poRasterDS->GetRasterBand( iBand )) );
+                    }
+
+                    // Set pixel limits.
+                    bool bHasTransform = false;
+                    double geoTransform[6] = { 0.0 };
+                    double invGeoTransform[6] = { 0.0 };
+                    if(poRasterDS->GetGeoTransform(geoTransform) == CE_None)
+                    {
+                        bHasTransform = GDALInvGeoTransform(geoTransform,
+                            invGeoTransform) == TRUE;
+                    }
+
+                    if(bHasTransform)
+                    {
+                        GDALApplyGeoTransform(invGeoTransform, stExtent.MinX,
+                            stExtent.MinY, &stPixelExtent.MinX, &stPixelExtent.MaxY);
+
+                        GDALApplyGeoTransform(invGeoTransform, stExtent.MaxX,
+                            stExtent.MaxY, &stPixelExtent.MaxX, &stPixelExtent.MinY);
+
+                        CPLDebug("NGW", "Raster extent in px is: %f, %f, %f, %f",
+                            stPixelExtent.MinX, stPixelExtent.MinY,
+                            stPixelExtent.MaxX, stPixelExtent.MaxY);
+                    }
+                    else
+                    {
+                        stPixelExtent.MinX = 0.0;
+                        stPixelExtent.MinY = 0.0;
+                        stPixelExtent.MaxX = std::numeric_limits<double>::max();
+                        stPixelExtent.MaxY = std::numeric_limits<double>::max();
+                    }
+                }
+                else
+                {
+                    bResult = false;
+                }
+            }
+            else if( osResourceType == "raster_layer" &&
+                nOpenFlagsIn & GDAL_OF_RASTER )
+            {
+                AddRaster( oRoot, papszHTTPOptions );
+            }
+            else
+            {
+                bResult = false;
+            }
+            // TODO: Add support for baselayers, webmap, wfsserver_service, wmsserver_service.
+        }
+    }
+
+    CSLDestroy( papszHTTPOptions );
+    return bResult;
+}
+
+/*
+ * FillResources()
+ */
+bool OGRNGWDataset::FillResources( char **papszOptions, int nOpenFlagsIn )
+{
+    CPLJSONDocument oResourceDetailsReq;
+    bool bResult = oResourceDetailsReq.LoadUrl( NGWAPI::GetChildren( osUrl,
+        osResourceId ), papszOptions );
+
+    if( bResult )
+    {
+        CPLJSONArray oChildren(oResourceDetailsReq.GetRoot());
+        for( int i = 0; i < oChildren.Size(); ++i )
+        {
+            CPLJSONObject oChild = oChildren[i];
+            std::string osResourceType = oChild.GetString("resource/cls");
+            if( (osResourceType == "vector_layer" ||
+                osResourceType == "postgis_layer") )
+            {
+                // Add vector layer. If failed, try next layer.
+                AddLayer( oChild, papszOptions, nOpenFlagsIn );
+            }
+            else if( (osResourceType == "raster_layer" ||
+                osResourceType == "wmsclient_layer") & nOpenFlagsIn & GDAL_OF_RASTER )
+            {
+                AddRaster( oChild, papszOptions );
+            }
+            // TODO: Add support for baselayers, webmap, wfsserver_service, wmsserver_service.
+        }
+    }
+    return bResult;
+}
+
+/*
+ * AddLayer()
+ */
+void OGRNGWDataset::AddLayer( const CPLJSONObject &oResourceJsonObject,
+    char **papszOptions, int nOpenFlagsIn )
+{
+    std::string osLayerResourceId;
+    if( nOpenFlagsIn & GDAL_OF_VECTOR )
+    {
+        OGRNGWLayer *poLayer = new OGRNGWLayer( this, oResourceJsonObject );
+        papoLayers = (OGRNGWLayer**) CPLRealloc(papoLayers, (nLayers + 1) *
+            sizeof(OGRNGWLayer*));
+        papoLayers[nLayers++] = poLayer;
+        osLayerResourceId = poLayer->GetResourceId();
+    }
+    else
+    {
+        osLayerResourceId = oResourceJsonObject.GetString("resource/id");
+    }
+
+    // Check styles exist and add them as rasters.
+    if( nOpenFlagsIn & GDAL_OF_RASTER &&
+        oResourceJsonObject.GetBool( "resource/children", false ) )
+    {
+        CPLJSONDocument oResourceChildReq;
+        bool bResult = oResourceChildReq.LoadUrl( NGWAPI::GetChildren( osUrl,
+            osLayerResourceId ), papszOptions );
+
+        if( bResult )
+        {
+            CPLJSONArray oChildren( oResourceChildReq.GetRoot() );
+            for( int i = 0; i < oChildren.Size(); ++i )
+            {
+                AddRaster( oChildren[i], papszOptions );
+            }
+        }
+    }
+}
+
+/*
+ * AddRaster()
+ */
+void OGRNGWDataset::AddRaster( const CPLJSONObject &oRasterJsonObj,
+    char **papszOptions )
+{
+    std::string osOutResourceId;
+    std::string osOutResourceName;
+    std::string osResourceType = oRasterJsonObj.GetString( "resource/cls" );
+    if( osResourceType == "mapserver_style" ||
+        osResourceType == "qgis_vector_style" ||
+        osResourceType == "raster_style" ||
+        osResourceType == "wmsclient_layer" )
+    {
+        osOutResourceId = oRasterJsonObj.GetString( "resource/id" );
+        osOutResourceName = oRasterJsonObj.GetString( "resource/display_name" );
+    }
+    else if( osResourceType == "raster_layer" )
+    {
+        std::string osRasterResourceId = oRasterJsonObj.GetString( "resource/id" );
+        CPLJSONDocument oResourceRequest;
+        bool bResult = oResourceRequest.LoadUrl( NGWAPI::GetChildren( osUrl,
+            osRasterResourceId ), papszOptions );
+
+        if( bResult )
+        {
+            CPLJSONArray oChildren(oResourceRequest.GetRoot());
+            for( int i = 0; i < oChildren.Size(); ++i )
+            {
+                CPLJSONObject oChild = oChildren[i];
+                osResourceType = oChild.GetString("resource/cls");
+                if( osResourceType == "raster_style" )
+                {
+                    AddRaster( oChild, papszOptions );
+                }
+            }
+        }
+    }
+
+    if( !osOutResourceId.empty() )
+    {
+        if( osOutResourceName.empty() )
+        {
+            osOutResourceName = "raster_" + osOutResourceId;
+        }
+
+        GDALDataset::SetMetadataItem( CPLSPrintf("SUBDATASET_%d_NAME", nRasters),
+            CPLSPrintf("NGW:%s/resource/%s", osUrl.c_str(),
+            osOutResourceId.c_str()), "SUBDATASETS" );
+        GDALDataset::SetMetadataItem( CPLSPrintf("SUBDATASET_%d_DESC", nRasters),
+            osOutResourceName.c_str(), "SUBDATASETS" );
+        nRasters++;
+    }
+}
+
+/*
+ * ICreateLayer
+ */
+OGRLayer *OGRNGWDataset::ICreateLayer( const char *pszNameIn,
+                                           OGRSpatialReference *poSpatialRef,
+                                           OGRwkbGeometryType eGType,
+                                           char **papszOptions )
+{
+    if( !bReadWrite )
+    {
+        CPLError(CE_Failure, CPLE_AppDefined,
+            "Operation not available in read-only mode");
+        return nullptr;
+    }
+
+    // Check permissions as we create new layer in memory and will create in during SyncToDisk.
+    FetchPermissions();
+
+    if( !stPermissions.bResourceCanCreate )
+    {
+        CPLError(CE_Failure, CPLE_AppDefined, "Operation not permitted.");
+        return nullptr;
+    }
+
+    // Check input parameters.
+    if( eGType < wkbPoint || eGType > wkbMultiPolygon )
+    {
+        CPLError(CE_Failure, CPLE_AppDefined,
+            "Unsupported geometry type: %s", OGRGeometryTypeToName(eGType));
+        return nullptr;
+    }
+
+    if( !poSpatialRef )
+    {
+        CPLError(CE_Failure, CPLE_AppDefined, "Undefined spatial reference");
+        return nullptr;
+    }
+
+    poSpatialRef->AutoIdentifyEPSG();
+    const char *pszEPSG = poSpatialRef->GetAuthorityCode( nullptr );
+    int nEPSG = -1;
+    if( pszEPSG != nullptr )
+    {
+        nEPSG = atoi( pszEPSG );
+    }
+
+    if( nEPSG != 3857 ) // TODO: Check NextGIS Web supported SRS.
+    {
+        CPLError(CE_Failure, CPLE_AppDefined,
+            "Unsupported spatial reference EPSG code: %d", nEPSG);
+        return nullptr;
+    }
+
+    // Do we already have this layer?  If so, should we blow it away?
+    bool bOverwrite = CPLFetchBool(papszOptions, "OVERWRITE", "NO");
+    for( int iLayer = 0; iLayer < nLayers; ++iLayer )
+    {
+        if( EQUAL(pszNameIn, papoLayers[iLayer]->GetName()) )
+        {
+            if( bOverwrite )
+            {
+                DeleteLayer( iLayer );
+                break;
+            }
+            else
+            {
+                CPLError( CE_Failure, CPLE_AppDefined,
+                          "Layer %s already exists, CreateLayer failed.\n"
+                          "Use the layer creation option OVERWRITE=YES to "
+                          "replace it.",
+                          pszNameIn );
+                return nullptr;
+            }
+        }
+    }
+
+    // Create layer.
+    std::string osKey = CSLFetchNameValueDef( papszOptions, "KEY", "");
+    std::string osDesc = CSLFetchNameValueDef( papszOptions, "DESCRIPTION", "");
+    OGRNGWLayer *poLayer = new OGRNGWLayer( this, pszNameIn, poSpatialRef, eGType,
+        osKey, osDesc );
+    papoLayers = (OGRNGWLayer**) CPLRealloc(papoLayers, (nLayers + 1) *
+        sizeof(OGRNGWLayer*));
+    papoLayers[nLayers++] = poLayer;
+    return poLayer;
+}
+
+/*
+ * DeleteLayer()
+ */
+OGRErr OGRNGWDataset::DeleteLayer( int iLayer )
+{
+    if( !bReadWrite )
+    {
+        CPLError(CE_Failure, CPLE_AppDefined,
+            "Operation not available in read-only mode.");
+        return OGRERR_FAILURE;
+    }
+
+    if( iLayer < 0 || iLayer >= nLayers )
+    {
+        CPLError( CE_Failure, CPLE_AppDefined,
+            "Layer %d not in legal range of 0 to %d.", iLayer, nLayers-1 );
+        return OGRERR_FAILURE;
+    }
+
+    OGRNGWLayer *poLayer = static_cast<OGRNGWLayer*>(papoLayers[iLayer]);
+
+    if( poLayer->GetResourceId() != "-1" )
+    {
+        // For layers from server we can check permissions.
+
+        // We can skip check permissions here as papoLayers[iLayer]->Delete() will
+        // return false if no delete permission available.
+        FetchPermissions();
+
+        if( !stPermissions.bResourceCanDelete )
+        {
+            CPLError(CE_Failure, CPLE_AppDefined, "Operation not permitted.");
+            return OGRERR_FAILURE;
+        }
+    }
+
+    if( poLayer->Delete() )
+    {
+        delete poLayer;
+        memmove( papoLayers + iLayer, papoLayers + iLayer + 1,
+                 sizeof(void *) * (nLayers - iLayer - 1) );
+        nLayers--;
+    }
+
+    return OGRERR_NONE;
+}
+
+/*
+ * FillMetadata()
+ */
+void OGRNGWDataset::FillMetadata( const CPLJSONObject &oRootObject )
+{
+    std::string osCreateDate = oRootObject.GetString("resource/creation_date");
+    if( !osCreateDate.empty() )
+    {
+        GDALDataset::SetMetadataItem( "creation_date", osCreateDate.c_str() );
+    }
+    osName = oRootObject.GetString("resource/display_name");
+    SetDescription( osName.c_str() );
+    GDALDataset::SetMetadataItem( "display_name", osName.c_str() );
+    std::string osDescription = oRootObject.GetString("resource/description");
+    if( !osDescription.empty() )
+    {
+        GDALDataset::SetMetadataItem( "description", osDescription.c_str() );
+    }
+    GDALDataset::SetMetadataItem( "id", osResourceId.c_str() );
+
+    std::vector<CPLJSONObject> items =
+        oRootObject.GetObj("resmeta/items").GetChildren();
+
+    for( const CPLJSONObject &item : items )
+    {
+        std::string osSuffix = NGWAPI::GetResmetaSuffix( item.GetType() );
+        GDALDataset::SetMetadataItem( (item.GetName() + osSuffix).c_str(),
+            item.ToString().c_str(), "NGW" );
+    }
+}
+
+/*
+ * FlushMetadata()
+ */
+bool OGRNGWDataset::FlushMetadata( char **papszMetadata )
+{
+    if( !bMetadataDerty )
+    {
+        return true;
+    }
+
+    bool bResult = NGWAPI::FlushMetadata(osUrl, osResourceId, papszMetadata,
+        GetHeaders());
+    if( bResult )
+    {
+        bMetadataDerty = false;
+    }
+
+    return bResult;
+}
+
+/*
+ * SetMetadata()
+ */
+CPLErr OGRNGWDataset::SetMetadata( char **papszMetadata, const char *pszDomain)
+{
+    FetchPermissions();
+    if( !stPermissions.bMetadataCanWrite )
+    {
+        CPLError(CE_Failure, CPLE_AppDefined, "Operation not permitted.");
+        return CE_Failure;
+    }
+
+    CPLErr eResult = GDALDataset::SetMetadata(papszMetadata, pszDomain);
+    if( eResult == CE_None && pszDomain != nullptr && EQUAL(pszDomain, "NGW") )
+    {
+        eResult = FlushMetadata( papszMetadata ) ? CE_None : CE_Failure;
+    }
+    return eResult;
+}
+
+/*
+ * SetMetadataItem()
+ */
+CPLErr OGRNGWDataset::SetMetadataItem( const char *pszName,
+    const char *pszValue, const char *pszDomain)
+{
+    FetchPermissions();
+    if( !stPermissions.bMetadataCanWrite )
+    {
+        CPLError(CE_Failure, CPLE_AppDefined, "Operation not permitted.");
+        return CE_Failure;
+    }
+    if( pszDomain != nullptr && EQUAL(pszDomain, "NGW") )
+    {
+        bMetadataDerty = true;
+    }
+    return GDALDataset::SetMetadataItem(pszName, pszValue, pszDomain);
+}
+
+/*
+ * FlushCache()
+ */
+void OGRNGWDataset::FlushCache()
+{
+    GDALDataset::FlushCache();
+    FlushMetadata( GetMetadata("NGW") );
+}
+
+/*
+ * GetHeaders()
+ */
+char **OGRNGWDataset::GetHeaders() const
+{
+    char **papszOptions = nullptr;
+    papszOptions = CSLAddString(papszOptions, "HEADERS=Accept: */*");
+    if( !osUserPwd.empty() )
+    {
+        papszOptions = CSLAddString(papszOptions, "HTTPAUTH=BASIC");
+        std::string osUserPwdOption("USERPWD=");
+        osUserPwdOption += osUserPwd;
+        papszOptions = CSLAddString(papszOptions, osUserPwdOption.c_str());
+    }
+    return papszOptions;
+}
+
+/*
+ * ExecuteSQL()
+ */
+OGRLayer *OGRNGWDataset::ExecuteSQL( const char *pszStatement,
+    OGRGeometry *poSpatialFilter, const char *pszDialect )
+{
+    // Clean statement string.
+    CPLString osStatement(pszStatement);
+    osStatement = osStatement.Trim().replaceAll("  ", " ");
+
+    if( STARTS_WITH_CI(osStatement.c_str(), "DELLAYER:") )
+    {
+        CPLString osLayerName = osStatement.substr(9);
+        if( osLayerName.endsWith(";") )
+        {
+            osLayerName = osLayerName.substr(0, osLayerName.size() - 1);
+            osLayerName.Trim();
+        }
+
+        CPLDebug("NGW", "Delete layer with name %s.", osLayerName.c_str());
+
+        for( int iLayer = 0; iLayer < nLayers; ++iLayer )
+        {
+            if( EQUAL(papoLayers[iLayer]->GetName(), osLayerName.c_str() ) )
+            {
+                DeleteLayer( iLayer );
+                break;
+            }
+        }
+        return nullptr;
+    }
+
+    if( STARTS_WITH_CI(osStatement.c_str(), "DELETE FROM") )
+    {
+        // Get layer name from pszStatement DELETE FROM layer;.
+        CPLString osLayerName = osStatement.substr(12);
+        if( osLayerName.endsWith(";") )
+        {
+            osLayerName = osLayerName.substr(0, osLayerName.size() - 1);
+            osLayerName.Trim();
+        }
+
+        CPLDebug("NGW", "Delete features from layer with name %s.", osLayerName.c_str());
+
+        OGRNGWLayer *poLayer = static_cast<OGRNGWLayer*>(GetLayerByName(osLayerName));
+        if( poLayer )
+        {
+            poLayer->DeleteAllFeatures();
+        }
+        else
+        {
+            CPLError(CE_Failure, CPLE_AppDefined, "Unknown layer : %s",
+                osLayerName.c_str());
+        }
+        return nullptr;
+    }
+    return GDALDataset::ExecuteSQL(pszStatement, poSpatialFilter, pszDialect);
+}
+
+/*
+ * GetProjectionRef()
+ */
+const char *OGRNGWDataset::GetProjectionRef(void)
+{
+    if( poRasterDS != nullptr )
+    {
+        return poRasterDS->GetProjectionRef();
+    }
+    return GDALDataset::GetProjectionRef();
+}
+
+/*
+ * GetGeoTransform()
+ */
+CPLErr OGRNGWDataset::GetGeoTransform( double *padfTransform )
+{
+    if( poRasterDS != nullptr )
+    {
+        return poRasterDS->GetGeoTransform( padfTransform );
+    }
+    return GDALDataset::GetGeoTransform( padfTransform );
+}
+
+/*
+ * IRasterIO()
+ */
+CPLErr OGRNGWDataset::IRasterIO( GDALRWFlag eRWFlag, int nXOff, int nYOff,
+    int nXSize, int nYSize, void *pData, int nBufXSize, int nBufYSize,
+    GDALDataType eBufType, int nBandCount, int *panBandMap,
+    GSpacing nPixelSpace, GSpacing nLineSpace, GSpacing nBandSpace,
+    GDALRasterIOExtraArg* psExtraArg )
+{
+    if( poRasterDS != nullptr )
+    {
+        if( stPixelExtent.IsInit() )
+        {
+            OGREnvelope stTestExtent;
+            stTestExtent.MinX = static_cast<double>(nXOff);
+            stTestExtent.MinY = static_cast<double>(nYOff);
+            stTestExtent.MaxX = static_cast<double>(nXOff + nXSize);
+            stTestExtent.MaxY = static_cast<double>(nYOff + nYSize);
+
+            if( !stPixelExtent.Intersects(stTestExtent) )
+            {
+                CPLDebug("NGW", "Raster extent in px is: %f, %f, %f, %f",
+                    stPixelExtent.MinX, stPixelExtent.MinY,
+                    stPixelExtent.MaxX, stPixelExtent.MaxY);
+                CPLDebug("NGW", "RasterIO extent is: %f, %f, %f, %f",
+                    stTestExtent.MinX, stTestExtent.MinY,
+                    stTestExtent.MaxX, stTestExtent.MaxY);
+
+                // Fill buffer transparent color.
+                memset( pData, 0, nBufXSize * nBufYSize * nBandCount *
+                    GDALGetDataTypeSizeBytes(eBufType) );
+                return CE_None;
+            }
+        }
+    }
+    return GDALDataset::IRasterIO(eRWFlag, nXOff, nYOff, nXSize, nYSize, pData,
+        nBufXSize, nBufYSize, eBufType, nBandCount, panBandMap, nPixelSpace,
+        nLineSpace, nBandSpace, psExtraArg);
+}
+
+/*
+ * FillCapabilities()
+ */
+void OGRNGWDataset::FillCapabilities( char **papszOptions )
+{
+    CPLJSONDocument oRouteReq;
+    if( oRouteReq.LoadUrl( NGWAPI::GetRoute(osUrl), papszOptions ) )
+    {
+        CPLJSONObject oRoot = oRouteReq.GetRoot();
+
+        if( oRoot.IsValid() )
+        {
+            // TODO: check bHasFeaturePaging
+        }
+    }
+}
diff --git a/gdal/ogr/ogrsf_frmts/ngw/makefile.vc b/gdal/ogr/ogrsf_frmts/ngw/makefile.vc
new file mode 100644
index 000000000000..892d26d1a999
--- /dev/null
+++ b/gdal/ogr/ogrsf_frmts/ngw/makefile.vc
@@ -0,0 +1,13 @@
+
+OBJ	=	ogrngwdriver.obj gdalngwdataset.obj ogrngwlayer.obj ngw_api.obj
+
+EXTRAFLAGS =	-I.. -I..\..
+
+GDAL_ROOT	=	..\..\..
+
+!INCLUDE $(GDAL_ROOT)\nmake.opt
+
+default:	$(OBJ)
+
+clean:
+	-del *.obj *.pdb
diff --git a/gdal/ogr/ogrsf_frmts/ngw/ngw_api.cpp b/gdal/ogr/ogrsf_frmts/ngw/ngw_api.cpp
new file mode 100644
index 000000000000..ce31939bae23
--- /dev/null
+++ b/gdal/ogr/ogrsf_frmts/ngw/ngw_api.cpp
@@ -0,0 +1,647 @@
+/*******************************************************************************
+ *  Project: NextGIS Web Driver
+ *  Purpose: Implements NextGIS Web Driver
+ *  Author: Dmitry Baryshnikov, dmitry.baryshnikov@nextgis.com
+ *  Language: C++
+ *******************************************************************************
+ *  The MIT License (MIT)
+ *
+ *  Copyright (c) 2018, NextGIS
+ *
+ *  Permission is hereby granted, free of charge, to any person obtaining a copy
+ *  of this software and associated documentation files (the "Software"), to deal
+ *  in the Software without restriction, including without limitation the rights
+ *  to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ *  copies of the Software, and to permit persons to whom the Software is
+ *  furnished to do so, subject to the following conditions:
+ *
+ *  The above copyright notice and this permission notice shall be included in all
+ *  copies or substantial portions of the Software.
+ *
+ *  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ *  IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ *  FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ *  AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ *  LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ *  OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ *  SOFTWARE.
+ *******************************************************************************/
+
+#include "ogr_ngw.h"
+
+#include "cpl_http.h"
+
+namespace NGWAPI {
+
+std::string GetPermisions(const std::string &osUrl, const std::string &osResourceId)
+{
+    return osUrl + "/api/resource/" + osResourceId + "/permission";
+}
+
+std::string GetResource(const std::string &osUrl, const std::string &osResourceId)
+{
+    return osUrl + "/api/resource/" + osResourceId;
+}
+
+std::string GetChildren(const std::string &osUrl, const std::string &osResourceId)
+{
+    return osUrl + "/resource/" + osResourceId + "/child/";
+}
+
+std::string GetFeature(const std::string &osUrl, const std::string &osResourceId)
+{
+    return osUrl + "/api/resource/" + osResourceId + "/feature/";
+}
+
+std::string GetTMS(const std::string &osUrl, const std::string &osResourceId)
+{
+    return osUrl + "/api/component/render/tile?z=${z}&amp;x=${x}&amp;y=${y}&amp;resource=" +
+        osResourceId;
+}
+
+std::string GetFeaturePage(CPL_UNUSED const std::string &osUrl, CPL_UNUSED const std::string &osResourceId,
+    CPL_UNUSED GIntBig nStart, CPL_UNUSED int nCount)
+{
+    return ""; // TODO: Add paging support.
+}
+
+std::string GetRoute(const std::string &osUrl)
+{
+    return osUrl + "/api/component/pyramid/route";
+}
+
+Uri ParseUri(const std::string &osUrl)
+{
+    Uri stOut;
+    std::size_t nFound = osUrl.find(":");
+    if( nFound == std::string::npos )
+    {
+        return stOut;
+    }
+
+    stOut.osPrefix = osUrl.substr(0, nFound);
+    std::string osUrlInt = CPLString(osUrl.substr(nFound + 1)).tolower();
+
+    nFound = osUrlInt.find("/resource/");
+    if( nFound == std::string::npos )
+    {
+        return stOut;
+    }
+
+    stOut.osAddress = osUrlInt.substr(0, nFound);
+
+    std::string osResourceId = CPLString(osUrlInt.substr(nFound + strlen("/resource/"))).Trim();
+
+    nFound = osResourceId.find('/');
+    if( nFound != std::string::npos )
+    {
+        stOut.osResourceId = osResourceId.substr(0, nFound);
+        stOut.osNewResourceName = osResourceId.substr(nFound + 1);
+    }
+    else
+    {
+        stOut.osResourceId = osResourceId;
+    }
+
+    return stOut;
+}
+
+static void ReportError(const GByte *pabyData, int nDataLen)
+{
+    CPLJSONDocument oResult;
+    if( oResult.LoadMemory(pabyData, nDataLen) )
+    {
+        CPLJSONObject oRoot = oResult.GetRoot();
+        if( oRoot.IsValid() )
+        {
+            std::string osErrorMessage = oRoot.GetString("message");
+            if( !osErrorMessage.empty() )
+            {
+                CPLError(CE_Failure, CPLE_AppDefined, "%s", osErrorMessage.c_str());
+            }
+        }
+    }
+}
+
+std::string CreateResource(const std::string &osUrl, const std::string &osPayload,
+    char **papszHTTPOptions)
+{
+    CPLErrorReset();
+    std::string osPayloadInt = "POSTFIELDS=" + osPayload;
+
+    papszHTTPOptions = CSLAddString( papszHTTPOptions, "CUSTOMREQUEST=POST" );
+    papszHTTPOptions = CSLAddString( papszHTTPOptions, osPayloadInt.c_str() );
+    papszHTTPOptions = CSLAddString( papszHTTPOptions,
+        "HEADERS=Content-Type: application/json\r\nAccept: */*" );
+
+    CPLDebug("NGW", "UpdateResource request payload: %s", osPayload.c_str());
+
+    CPLJSONDocument oCreateReq;
+    bool bResult = oCreateReq.LoadUrl( GetResource( osUrl, "" ),
+        papszHTTPOptions );
+    CSLDestroy( papszHTTPOptions );
+    std::string osResourceId("-1");
+    CPLJSONObject oRoot = oCreateReq.GetRoot();
+    if( oRoot.IsValid() )
+    {
+        if( bResult )
+        {
+            osResourceId = oRoot.GetString("id", "-1");
+        }
+        else
+        {
+            std::string osErrorMessage = oRoot.GetString("message");
+            if( !osErrorMessage.empty() )
+            {
+                CPLError(CE_Failure, CPLE_AppDefined, "%s", osErrorMessage.c_str());
+            }
+        }
+    }
+    return osResourceId;
+}
+
+bool UpdateResource(const std::string &osUrl, const std::string &osResourceId,
+    const std::string &osPayload, char **papszHTTPOptions)
+{
+    CPLErrorReset();
+    std::string osPayloadInt = "POSTFIELDS=" + osPayload;
+
+    papszHTTPOptions = CSLAddString( papszHTTPOptions, "CUSTOMREQUEST=PUT" );
+    papszHTTPOptions = CSLAddString( papszHTTPOptions, osPayloadInt.c_str() );
+    papszHTTPOptions = CSLAddString( papszHTTPOptions,
+        "HEADERS=Content-Type: application/json\r\nAccept: */*" );
+
+    CPLDebug("NGW", "UpdateResource request payload: %s", osPayload.c_str());
+
+    CPLHTTPResult *psResult = CPLHTTPFetch( GetResource(osUrl, osResourceId).c_str(),
+        papszHTTPOptions );
+    CSLDestroy( papszHTTPOptions );
+    bool bResult = false;
+    if( psResult )
+    {
+        bResult = psResult->nStatus == 0 && psResult->pszErrBuf == nullptr;
+
+        // Get error message.
+        if( !bResult )
+        {
+            ReportError(psResult->pabyData, psResult->nDataLen);
+        }
+        CPLHTTPDestroyResult(psResult);
+    }
+    else
+    {
+        CPLError(CE_Failure, CPLE_AppDefined, "Update resource #%s failed",
+            osResourceId.c_str());
+    }
+    return bResult;
+}
+
+bool DeleteResource(const std::string &osUrl, const std::string &osResourceId,
+    char **papszHTTPOptions)
+{
+    CPLErrorReset();
+    papszHTTPOptions = CSLAddString(papszHTTPOptions, "CUSTOMREQUEST=DELETE");
+    CPLHTTPResult *psResult = CPLHTTPFetch( GetResource(osUrl, osResourceId).c_str(),
+        papszHTTPOptions);
+    bool bResult = false;
+    if( psResult )
+    {
+        bResult = psResult->nStatus == 0 && psResult->pszErrBuf == nullptr;
+        // Get error message.
+        if( !bResult )
+        {
+            ReportError(psResult->pabyData, psResult->nDataLen);
+        }
+        CPLHTTPDestroyResult(psResult);
+    }
+    CSLDestroy( papszHTTPOptions );
+    return bResult;
+}
+
+bool RenameResource(const std::string &osUrl, const std::string &osResourceId,
+    const std::string &osNewName, char **papszHTTPOptions)
+{
+    CPLJSONObject oPayload;
+    CPLJSONObject oResource("resource", oPayload);
+    oPayload.Add("display_name", osNewName);
+    std::string osPayload = oPayload.Format(CPLJSONObject::Plain);
+
+    return UpdateResource( osUrl, osResourceId, osPayload, papszHTTPOptions);
+}
+
+OGRwkbGeometryType NGWGeomTypeToOGRGeomType(const std::string &osGeomType)
+{
+    // http://docs.nextgis.com/docs_ngweb_dev/doc/developer/vector_data_types.html#nextgisweb.feature_layer.interface.GEOM_TYPE
+    if( osGeomType == "POINT")
+        return wkbPoint;
+    else if ( osGeomType == "LINESTRING")
+        return wkbLineString;
+    else if ( osGeomType == "POLYGON")
+        return wkbPolygon;
+    else if ( osGeomType == "MULTIPOINT")
+        return wkbMultiPoint;
+    else if ( osGeomType == "MULTILINESTRING")
+        return wkbMultiLineString;
+    else if ( osGeomType == "MULTIPOLYGON")
+        return wkbMultiPolygon;
+    else
+        return wkbUnknown;
+}
+
+std::string OGRGeomTypeToNGWGeomType(OGRwkbGeometryType eType)
+{
+    switch(eType)
+    { // Don't flatten
+        case wkbPoint:
+            return "POINT";
+        case wkbLineString:
+            return "LINESTRING";
+        case wkbPolygon:
+            return "POLYGON";
+        case wkbMultiPoint:
+            return "MULTIPOINT";
+        case wkbMultiLineString:
+            return "MULTILINESTRING";
+        case wkbMultiPolygon:
+            return "MULTIPOLYGON";
+        default:
+            return "";
+    }
+}
+
+OGRFieldType NGWFieldTypeToOGRFieldType(const std::string &osFieldType)
+{
+    // http://docs.nextgis.com/docs_ngweb_dev/doc/developer/vector_data_types.html#nextgisweb.feature_layer.interface.FIELD_TYPE
+    if( osFieldType == "INTEGER")
+        return OFTInteger;
+    else if ( osFieldType == "BIGINT")
+        return OFTInteger64;
+    else if ( osFieldType == "REAL")
+        return OFTReal;
+    else if ( osFieldType == "STRING")
+        return OFTString;
+    else if ( osFieldType == "DATE")
+        return OFTDate;
+    else if ( osFieldType == "TIME")
+        return OFTTime;
+    else if ( osFieldType == "DATETIME")
+        return OFTDateTime;
+    else
+        return OFTString;
+}
+
+std::string OGRFieldTypeToNGWFieldType(OGRFieldType eType)
+{
+    switch(eType) {
+        case OFTInteger:
+            return "INTEGER";
+        case OFTInteger64:
+            return "BIGINT";
+        case OFTReal:
+            return "REAL";
+        case OFTString:
+            return "STRING";
+        case OFTDate:
+            return "DATE";
+        case OFTTime:
+            return "TIME";
+        case OFTDateTime:
+            return "DATETIME";
+        default:
+            return "STRING";
+    }
+}
+
+Permissions CheckPermissions(const std::string &osUrl,
+    const std::string &osResourceId, char **papszHTTPOptions, bool bReadWrite)
+{
+    Permissions stOut;
+    CPLErrorReset();
+    CPLJSONDocument oPermissionReq;
+    bool bResult = oPermissionReq.LoadUrl( GetPermisions( osUrl, osResourceId ),
+        papszHTTPOptions );
+
+    CPLJSONObject oRoot = oPermissionReq.GetRoot();
+    if( oRoot.IsValid() )
+    {
+        if( bResult )
+        {
+            stOut.bResourceCanRead = oRoot.GetBool( "resource/read", true );
+            stOut.bResourceCanCreate = oRoot.GetBool( "resource/create", bReadWrite );
+            stOut.bResourceCanUpdate = oRoot.GetBool( "resource/update", bReadWrite );
+            stOut.bResourceCanDelete = oRoot.GetBool( "resource/delete", bReadWrite );
+
+            stOut.bDatastructCanRead = oRoot.GetBool( "datastruct/read", true );
+            stOut.bDatastructCanWrite = oRoot.GetBool( "datastruct/write", bReadWrite );
+
+            stOut.bDataCanRead = oRoot.GetBool( "data/read", true );
+            stOut.bDataCanWrite = oRoot.GetBool( "data/write", bReadWrite );
+
+            stOut.bMetadataCanRead = oRoot.GetBool( "metadata/read", true );
+            stOut.bMetadataCanWrite = oRoot.GetBool( "metadata/write", bReadWrite );
+        }
+        else
+        {
+            std::string osErrorMessage = oRoot.GetString("message");
+            if( osErrorMessage.empty() )
+            {
+                osErrorMessage = "Get permissions failed";
+            }
+            CPLError(CE_Failure, CPLE_AppDefined, "%s", osErrorMessage.c_str());
+        }
+    }
+    else
+    {
+        CPLError(CE_Failure, CPLE_AppDefined, "Get permissions failed");
+    }
+
+    return stOut;
+}
+
+std::string GetFeatureCount(const std::string &osUrl, const std::string &osResourceId)
+{
+    return osUrl + "/api/resource/" + osResourceId + "/feature_count";
+}
+
+std::string GetLayerExtent(const std::string &osUrl, const std::string &osResourceId)
+{
+    return osUrl + "/api/resource/" + osResourceId + "/extent";
+}
+
+std::string GetResmetaSuffix(CPLJSONObject::Type eType)
+{
+    switch( eType ) {
+        case CPLJSONObject::Integer:
+        case CPLJSONObject::Long:
+            return ".d";
+        case CPLJSONObject::Double:
+            return ".f";
+        default:
+            return "";
+    }
+}
+
+void FillResmeta(CPLJSONObject &oRoot, char **papszMetadata)
+{
+    CPLJSONObject oResMeta("resmeta", oRoot);
+    CPLJSONObject oResMetaItems("items", oResMeta);
+    CPLStringList oaMetadata(papszMetadata, FALSE);
+    for( int i = 0; i < oaMetadata.size(); ++i )
+    {
+        std::string osItem = oaMetadata[i];
+        size_t nPos = osItem.find("=");
+        if( nPos != std::string::npos )
+        {
+            std::string osItemName = osItem.substr( 0, nPos );
+            CPLString osItemValue = osItem.substr( nPos + 1 );
+
+            if( osItemName.size() > 2 )
+            {
+                size_t nSuffixPos = osItemName.size() - 2;
+                std::string osSuffix = osItemName.substr(nSuffixPos);
+                if( osSuffix == ".d")
+                {
+                    GInt64 nVal = CPLAtoGIntBig( osItemValue.c_str() );
+                    oResMetaItems.Add( osItemName.substr(0, nSuffixPos), nVal );
+                    continue;
+                }
+
+                if( osSuffix == ".f")
+                {
+                    oResMetaItems.Add( osItemName.substr(0, nSuffixPos),
+                        CPLAtofM(osItemValue.c_str()) );
+                    continue;
+                }
+            }
+
+            oResMetaItems.Add(osItemName, osItemValue);
+        }
+    }
+}
+
+bool FlushMetadata(const std::string &osUrl, const std::string &osResourceId,
+    char **papszMetadata, char **papszHTTPOptions )
+{
+    if( nullptr == papszMetadata )
+    {
+        return true;
+    }
+    CPLJSONObject oMetadataJson;
+    FillResmeta(oMetadataJson, papszMetadata);
+
+    return UpdateResource( osUrl, osResourceId,
+        oMetadataJson.Format(CPLJSONObject::Plain), papszHTTPOptions);
+}
+
+bool DeleteFeature(const std::string &osUrl, const std::string &osResourceId,
+    const std::string &osFeatureId, char **papszHTTPOptions)
+{
+    CPLErrorReset();
+    papszHTTPOptions = CSLAddString(papszHTTPOptions, "CUSTOMREQUEST=DELETE");
+    std::string osUrlInt = GetFeature(osUrl, osResourceId) + osFeatureId;
+    CPLHTTPResult *psResult = CPLHTTPFetch( osUrlInt.c_str(), papszHTTPOptions);
+    CSLDestroy( papszHTTPOptions );
+    bool bResult = false;
+    if( psResult )
+    {
+        bResult = psResult->nStatus == 0 && psResult->pszErrBuf == nullptr;
+        // Get error message.
+        if( !bResult )
+        {
+            ReportError(psResult->pabyData, psResult->nDataLen);
+        }
+        CPLHTTPDestroyResult(psResult);
+    }
+    return bResult;
+}
+
+GIntBig CreateFeature(const std::string &osUrl, const std::string &osResourceId,
+    const std::string &osFeatureJson, char **papszHTTPOptions)
+{
+    CPLErrorReset();
+    std::string osPayloadInt = "POSTFIELDS=" + osFeatureJson;
+
+    papszHTTPOptions = CSLAddString( papszHTTPOptions, "CUSTOMREQUEST=POST" );
+    papszHTTPOptions = CSLAddString( papszHTTPOptions, osPayloadInt.c_str() );
+    papszHTTPOptions = CSLAddString( papszHTTPOptions,
+        "HEADERS=Content-Type: application/json\r\nAccept: */*" );
+
+    CPLDebug("NGW", "CreateFeature request payload: %s", osFeatureJson.c_str());
+
+    std::string osUrlInt = GetFeature( osUrl, osResourceId );
+
+    CPLJSONDocument oCreateFeatureReq;
+    bool bResult = oCreateFeatureReq.LoadUrl( osUrlInt, papszHTTPOptions );
+    CSLDestroy( papszHTTPOptions );
+
+    CPLJSONObject oRoot = oCreateFeatureReq.GetRoot();
+    GIntBig nOutFID = OGRNullFID;
+    if( oRoot.IsValid() )
+    {
+        if( bResult )
+        {
+            nOutFID = oRoot.GetLong( "id", OGRNullFID );
+        }
+        else
+        {
+            std::string osErrorMessage = oRoot.GetString("message");
+            if( osErrorMessage.empty() )
+            {
+                osErrorMessage = "Create new feature failed";
+            }
+            CPLError(CE_Failure, CPLE_AppDefined, "%s", osErrorMessage.c_str());
+        }
+    }
+    else
+    {
+        CPLError(CE_Failure, CPLE_AppDefined, "Create new feature failed");
+    }
+
+    CPLDebug("NGW", "CreateFeature new FID: " CPL_FRMT_GIB, nOutFID);
+    return nOutFID;
+}
+
+bool UpdateFeature(const std::string &osUrl, const std::string &osResourceId,
+    const std::string &osFeatureId, const std::string &osFeatureJson,
+    char **papszHTTPOptions)
+{
+    CPLErrorReset();
+    std::string osPayloadInt = "POSTFIELDS=" + osFeatureJson;
+
+    papszHTTPOptions = CSLAddString( papszHTTPOptions, "CUSTOMREQUEST=PUT" );
+    papszHTTPOptions = CSLAddString( papszHTTPOptions, osPayloadInt.c_str() );
+    papszHTTPOptions = CSLAddString( papszHTTPOptions,
+        "HEADERS=Content-Type: application/json\r\nAccept: */*" );
+
+    CPLDebug("NGW", "UpdateFeature request payload: %s", osFeatureJson.c_str());
+
+    std::string osUrlInt = GetFeature(osUrl, osResourceId) + osFeatureId;
+    CPLHTTPResult *psResult = CPLHTTPFetch( osUrlInt.c_str(), papszHTTPOptions );
+    CSLDestroy( papszHTTPOptions );
+    bool bResult = false;
+    if( psResult )
+    {
+        bResult = psResult->nStatus == 0 && psResult->pszErrBuf == nullptr;
+
+        // Get error message.
+        if( !bResult )
+        {
+            ReportError(psResult->pabyData, psResult->nDataLen);
+        }
+        CPLHTTPDestroyResult(psResult);
+    }
+    return bResult;
+}
+
+bool PatchFeatures(const std::string &osUrl, const std::string &osResourceId,
+    const std::string &osFeaturesJson, char **papszHTTPOptions)
+{
+    CPLErrorReset();
+    std::string osPayloadInt = "POSTFIELDS=" + osFeaturesJson;
+
+    papszHTTPOptions = CSLAddString( papszHTTPOptions, "CUSTOMREQUEST=PATCH" );
+    papszHTTPOptions = CSLAddString( papszHTTPOptions, osPayloadInt.c_str() );
+    papszHTTPOptions = CSLAddString( papszHTTPOptions,
+        "HEADERS=Content-Type: application/json\r\nAccept: */*" );
+
+    CPLDebug("NGW", "UpdateFeature request payload: %s", osFeaturesJson.c_str());
+
+    std::string osUrlInt = GetFeature(osUrl, osResourceId);
+    CPLHTTPResult *psResult = CPLHTTPFetch( osUrlInt.c_str(), papszHTTPOptions );
+    CSLDestroy( papszHTTPOptions );
+    bool bResult = false;
+    if( psResult )
+    {
+        bResult = psResult->nStatus == 0 && psResult->pszErrBuf == nullptr;
+
+        // Get error message.
+        if( !bResult )
+        {
+            ReportError(psResult->pabyData, psResult->nDataLen);
+        }
+        CPLHTTPDestroyResult(psResult);
+    }
+    return bResult;
+}
+
+bool GetExtent(const std::string &osUrl, const std::string &osResourceId,
+    char **papszHTTPOptions, int nEPSG, OGREnvelope &stExtent)
+{
+    CPLErrorReset();
+    CPLJSONDocument oExtentReq;
+    bool bResult = oExtentReq.LoadUrl( GetLayerExtent( osUrl, osResourceId ),
+        papszHTTPOptions);
+
+    CPLJSONObject oRoot = oExtentReq.GetRoot();
+    if( !bResult)
+    {
+        std::string osErrorMessage = oRoot.GetString("message");
+        if( osErrorMessage.empty() )
+        {
+            osErrorMessage = "Create new feature failed";
+        }
+        CPLError(CE_Failure, CPLE_AppDefined, "%s", osErrorMessage.c_str());
+        return false;
+    }
+    // Response extent spatial reference is EPSG:4326.
+
+    double dfMinX = oRoot.GetDouble("extent/minLon");
+    double dfMinY = oRoot.GetDouble("extent/minLat");
+    double dfMaxX = oRoot.GetDouble("extent/maxLon");
+    double dfMaxY = oRoot.GetDouble("extent/maxLat");
+
+    double adfCoordinatesX[4];
+    double adfCoordinatesY[4];
+    adfCoordinatesX[0] = dfMinX;
+    adfCoordinatesY[0] = dfMinY;
+    adfCoordinatesX[1] = dfMinX;
+    adfCoordinatesY[1] = dfMaxY;
+    adfCoordinatesX[2] = dfMaxX;
+    adfCoordinatesY[2] = dfMaxY;
+    adfCoordinatesX[3] = dfMaxX;
+    adfCoordinatesY[3] = dfMinY;
+
+    OGRSpatialReference *po4326SRS = OGRSpatialReference::GetWGS84SRS();
+    OGRSpatialReference o3857SRS;
+    if( o3857SRS.importFromEPSG(nEPSG) != OGRERR_NONE )
+    {
+        CPLError(CE_Failure, CPLE_AppDefined, "Project extent SRS to EPSG:3857 failed");
+        return false;
+    }
+
+    OGRCoordinateTransformation *poTransform =
+        OGRCreateCoordinateTransformation( po4326SRS, &o3857SRS );
+    if( poTransform )
+    {
+        poTransform->Transform( 4, adfCoordinatesX, adfCoordinatesY );
+        delete poTransform;
+
+        stExtent.MinX = std::numeric_limits<double>::max();
+        stExtent.MaxX = std::numeric_limits<double>::min();
+        stExtent.MinY = std::numeric_limits<double>::max();
+        stExtent.MaxY = std::numeric_limits<double>::min();
+
+        for(int i = 1; i < 4; ++i)
+        {
+            if( stExtent.MinX > adfCoordinatesX[i] )
+            {
+                stExtent.MinX = adfCoordinatesX[i];
+            }
+            if( stExtent.MaxX < adfCoordinatesX[i] )
+            {
+                stExtent.MaxX = adfCoordinatesX[i];
+            }
+            if( stExtent.MinY > adfCoordinatesY[i] )
+            {
+                stExtent.MinY = adfCoordinatesY[i];
+            }
+            if( stExtent.MaxY < adfCoordinatesY[i] )
+            {
+                stExtent.MaxY = adfCoordinatesY[i];
+            }
+        }
+    }
+    return true;
+}
+
+} // namespace NGWAPI
diff --git a/gdal/ogr/ogrsf_frmts/ngw/ogr_ngw.h b/gdal/ogr/ogrsf_frmts/ngw/ogr_ngw.h
new file mode 100644
index 000000000000..76fd817af60d
--- /dev/null
+++ b/gdal/ogr/ogrsf_frmts/ngw/ogr_ngw.h
@@ -0,0 +1,256 @@
+/*******************************************************************************
+ *  Project: NextGIS Web Driver
+ *  Purpose: Implements NextGIS Web Driver
+ *  Author: Dmitry Baryshnikov, dmitry.baryshnikov@nextgis.com
+ *  Language: C++
+ *******************************************************************************
+ *  The MIT License (MIT)
+ *
+ *  Copyright (c) 2018, NextGIS
+ *
+ *  Permission is hereby granted, free of charge, to any person obtaining a copy
+ *  of this software and associated documentation files (the "Software"), to deal
+ *  in the Software without restriction, including without limitation the rights
+ *  to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ *  copies of the Software, and to permit persons to whom the Software is
+ *  furnished to do so, subject to the following conditions:
+ *
+ *  The above copyright notice and this permission notice shall be included in all
+ *  copies or substantial portions of the Software.
+ *
+ *  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ *  IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ *  FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ *  AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ *  LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ *  OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ *  SOFTWARE.
+ *******************************************************************************/
+#ifndef OGR_NGW_H_INCLUDED
+#define OGR_NGW_H_INCLUDED
+
+// gdal headers
+#include "ogrsf_frmts.h"
+
+#include <map>
+#include <set>
+
+namespace NGWAPI {
+    std::string GetPermisions(const std::string &osUrl, const std::string &osResourceId);
+    std::string GetResource(const std::string &osUrl, const std::string &osResourceId);
+    std::string GetChildren(const std::string &osUrl, const std::string &osResourceId);
+    std::string GetFeature(const std::string &osUrl, const std::string &osResourceId);
+    std::string GetTMS(const std::string &osUrl, const std::string &osResourceId);
+    std::string GetFeaturePage(const std::string &osUrl, const std::string &osResourceId,
+        GIntBig nStart, int nCount);
+    std::string GetRoute(const std::string &osUrl);
+
+
+    struct Uri {
+        std::string osPrefix;
+        std::string osAddress;
+        std::string osResourceId;
+        std::string osNewResourceName;
+    };
+
+    // C++11 allow defaults
+    struct Permissions {
+        bool bResourceCanRead = false;
+        bool bResourceCanCreate = false;
+        bool bResourceCanUpdate = false;
+        bool bResourceCanDelete = false;
+        bool bDatastructCanRead = false;
+        bool bDatastructCanWrite = false;
+        bool bDataCanRead = false;
+        bool bDataCanWrite = false;
+        bool bMetadataCanRead = false;
+        bool bMetadataCanWrite = false;
+    };
+
+    Uri ParseUri(const std::string &osUrl);
+    Permissions CheckPermissions(const std::string &osUrl,
+        const std::string &osResourceId, char **papszHTTPOptions, bool bReadWrite);
+    bool DeleteResource(const std::string &osUrl, const std::string &osResourceId,
+        char **papszHTTPOptions);
+    bool RenameResource(const std::string &osUrl, const std::string &osResourceId,
+        const std::string &osNewName, char **papszHTTPOptions);
+    OGRwkbGeometryType NGWGeomTypeToOGRGeomType(const std::string &osGeomType);
+    std::string OGRGeomTypeToNGWGeomType(OGRwkbGeometryType eType);
+    OGRFieldType NGWFieldTypeToOGRFieldType(const std::string &osFieldType);
+    std::string OGRFieldTypeToNGWFieldType(OGRFieldType eType);
+    std::string GetFeatureCount(const std::string &osUrl,
+        const std::string &osResourceId);
+    std::string GetLayerExtent(const std::string &osUrl,
+        const std::string &osResourceId);
+    bool FlushMetadata(const std::string &osUrl, const std::string &osResourceId,
+        char **papszMetadata, char **papszHTTPOptions );
+    std::string CreateResource(const std::string &osUrl, const std::string &osPayload,
+        char **papszHTTPOptions);
+    bool UpdateResource(const std::string &osUrl, const std::string &osResourceId,
+        const std::string &osPayload, char **papszHTTPOptions);
+    void FillResmeta(CPLJSONObject &oRoot, char **papszMetadata);
+    std::string GetResmetaSuffix(CPLJSONObject::Type eType);
+    bool DeleteFeature(const std::string &osUrl, const std::string &osResourceId,
+        const std::string &osFeatureId, char **papszHTTPOptions);
+    GIntBig CreateFeature(const std::string &osUrl, const std::string &osResourceId,
+        const std::string &osFeatureJson, char **papszHTTPOptions);
+    bool UpdateFeature(const std::string &osUrl, const std::string &osResourceId,
+        const std::string &osFeatureId, const std::string &osFeatureJson,
+        char **papszHTTPOptions);
+    bool PatchFeatures(const std::string &osUrl, const std::string &osResourceId,
+        const std::string &osFeaturesJson, char **papszHTTPOptions);
+    bool GetExtent(const std::string &osUrl, const std::string &osResourceId,
+        char **papszHTTPOptions, int nEPSG, OGREnvelope &stExtent);
+} // namespace NGWAPI
+
+class OGRNGWDataset;
+
+class OGRNGWLayer : public OGRLayer
+{
+    std::string osResourceId;
+    OGRNGWDataset *poDS;
+    NGWAPI::Permissions stPermissions;
+    bool bFetchedPermissions;
+    OGRFeatureDefn *poFeatureDefn;
+    GIntBig nFeatureCount;
+    OGREnvelope stExtent;
+    std::map<GIntBig, OGRFeature*> moFeatures;
+    std::map<GIntBig, OGRFeature*>::const_iterator oNextPos;
+    GIntBig nPageStart;
+    bool bNeedSyncData, bNeedSyncStructure;
+    std::set<GIntBig> soChangedIds;
+
+public:
+    explicit OGRNGWLayer( OGRNGWDataset *poDSIn, const CPLJSONObject &oResourceJsonObject );
+    explicit OGRNGWLayer( OGRNGWDataset *poDSIn, const std::string &osNameIn,
+        OGRSpatialReference *poSpatialRef, OGRwkbGeometryType eGType,
+        const std::string &osKeyIn, const std::string &osDescIn );
+    virtual ~OGRNGWLayer();
+
+    bool Delete();
+    std::string GetResourceId() const;
+
+    /* OGRLayer */
+    virtual void ResetReading() override;
+    virtual OGRFeature *GetNextFeature() override;
+    virtual OGRErr SetNextByIndex( GIntBig nIndex ) override;
+    virtual OGRFeature *GetFeature( GIntBig nFID ) override;
+    virtual GIntBig GetFeatureCount( int bForce = TRUE ) override;
+    virtual OGRErr GetExtent(OGREnvelope *psExtent, int bForce = TRUE) override;
+    virtual OGRErr GetExtent(int iGeomField, OGREnvelope *psExtent,
+        int bForce = TRUE) override;
+    virtual OGRFeatureDefn *GetLayerDefn() override;
+    virtual int TestCapability( const char * ) override;
+
+    virtual OGRErr CreateField( OGRFieldDefn *poField,
+        int bApproxOK = TRUE ) override;
+    virtual OGRErr DeleteField( int iField ) override;
+    virtual OGRErr ReorderFields( int *panMap ) override;
+    virtual OGRErr AlterFieldDefn( int iField, OGRFieldDefn *poNewFieldDefn,
+        int nFlagsIn ) override;
+
+    virtual OGRErr SyncToDisk() override;
+
+    virtual OGRErr DeleteFeature(GIntBig nFID) override;
+    bool DeleteAllFeatures();
+
+    virtual CPLErr SetMetadata( char **papszMetadata,
+        const char *pszDomain = "" ) override;
+    virtual CPLErr SetMetadataItem( const char *pszName, const char *pszValue,
+        const char *pszDomain = "" ) override;
+
+protected:
+    virtual OGRErr ISetFeature(OGRFeature *poFeature) override;
+    virtual OGRErr ICreateFeature(OGRFeature *poFeature) override;
+
+private:
+    void FillMetadata( const CPLJSONObject &oRootObject );
+    void FillFields( const CPLJSONArray &oFields );
+    void FetchPermissions();
+    void FreeFeaturesCache();
+    std::string CreateNGWResourceJson();
+    std::string FeaturesToJson();
+    OGRErr SyncFeatures();
+};
+
+class OGRNGWDataset final : public GDALDataset
+{
+    friend class OGRNGWLayer;
+    bool bReadWrite;
+    int nBatchSize;
+    int nPageSize;
+    NGWAPI::Permissions stPermissions;
+    bool bFetchedPermissions;
+    bool bHasFeaturePaging;
+    std::string osUserPwd;
+    std::string osUrl;
+    std::string osResourceId;
+    std::string osName;
+    bool bMetadataDerty;
+
+    // vector
+    OGRNGWLayer **papoLayers;
+    int nLayers;
+
+    // raster
+    GDALDataset *poRasterDS;
+    OGREnvelope stPixelExtent;
+    int nRasters;
+    int nCacheExpires, nCacheMaxSize;
+
+public:
+    OGRNGWDataset();
+    virtual ~OGRNGWDataset();
+
+    bool Open( const char *pszFilename, char **papszOpenOptionsIn,
+        bool bUpdateIn, int nOpenFlagsIn );
+    bool Open( const std::string &osUrlIn, const std::string &osResourceIdIn,
+        char **papszOpenOptionsIn, bool bUpdateIn, int nOpenFlagsIn );
+
+    /* GDALDataset */
+    virtual int GetLayerCount() override { return nLayers; }
+    virtual OGRLayer *GetLayer( int ) override;
+    virtual int TestCapability( const char * ) override;
+    virtual OGRLayer  *ICreateLayer( const char *pszName,
+        OGRSpatialReference *poSpatialRef = nullptr,
+        OGRwkbGeometryType eGType = wkbUnknown,
+        char **papszOptions = nullptr ) override;
+    virtual OGRErr DeleteLayer( int ) override;
+    virtual CPLErr SetMetadata( char **papszMetadata,
+        const char *pszDomain = "" ) override;
+    virtual CPLErr SetMetadataItem( const char *pszName, const char *pszValue,
+        const char *pszDomain = "" ) override;
+    virtual void FlushCache() override;
+    virtual OGRLayer *ExecuteSQL( const char *pszStatement,
+        OGRGeometry *poSpatialFilter, const char *pszDialect ) override;
+
+    virtual const char *GetProjectionRef(void) override;
+    virtual CPLErr GetGeoTransform( double *padfTransform ) override;
+    virtual CPLErr IRasterIO( GDALRWFlag eRWFlag, int nXOff, int nYOff,
+        int nXSize, int nYSize, void *pData, int nBufXSize, int nBufYSize,
+        GDALDataType eBufType, int nBandCount, int *panBandMap,
+        GSpacing nPixelSpace, GSpacing nLineSpace, GSpacing nBandSpace,
+        GDALRasterIOExtraArg* psExtraArg ) override;
+
+private:
+    char **GetHeaders() const;
+    std::string GetUrl() const { return osUrl; }
+    std::string GetResourceId() const { return osResourceId; }
+    void FillMetadata( const CPLJSONObject &oRootObject );
+    bool FillResources( char **papszOptions, int nOpenFlagsIn );
+    void AddLayer( const CPLJSONObject &oResourceJsonObject,  char **papszOptions,
+        int nOpenFlagsIn );
+    void AddRaster( const CPLJSONObject &oResourceJsonObject,  char **papszOptions );
+    bool Init(int nOpenFlagsIn);
+    bool FlushMetadata( char **papszMetadata );
+    bool IsUpdateMode() const { return bReadWrite; }
+    bool IsBatchMode() const { return nBatchSize >= 0; }
+    int GetPageSize() const { return bHasFeaturePaging ? nPageSize : -1; }
+    int GetBatchSize() const { return nBatchSize; }
+    void FetchPermissions();
+    void FillCapabilities( char **papszOptions );
+private:
+    CPL_DISALLOW_COPY_ASSIGN(OGRNGWDataset)
+};
+
+#endif // OGR_NGW_H_INCLUDED
diff --git a/gdal/ogr/ogrsf_frmts/ngw/ogrngwdriver.cpp b/gdal/ogr/ogrsf_frmts/ngw/ogrngwdriver.cpp
new file mode 100644
index 000000000000..36b322753440
--- /dev/null
+++ b/gdal/ogr/ogrsf_frmts/ngw/ogrngwdriver.cpp
@@ -0,0 +1,293 @@
+/*******************************************************************************
+ *  Project: NextGIS Web Driver
+ *  Purpose: Implements NextGIS Web Driver
+ *  Author: Dmitry Baryshnikov, dmitry.baryshnikov@nextgis.com
+ *  Language: C++
+ *******************************************************************************
+ *  The MIT License (MIT)
+ *
+ *  Copyright (c) 2018, NextGIS
+ *
+ *  Permission is hereby granted, free of charge, to any person obtaining a copy
+ *  of this software and associated documentation files (the "Software"), to deal
+ *  in the Software without restriction, including without limitation the rights
+ *  to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ *  copies of the Software, and to permit persons to whom the Software is
+ *  furnished to do so, subject to the following conditions:
+ *
+ *  The above copyright notice and this permission notice shall be included in all
+ *  copies or substantial portions of the Software.
+ *
+ *  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ *  IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ *  FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ *  AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ *  LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ *  OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ *  SOFTWARE.
+ *******************************************************************************/
+
+#include "ogr_ngw.h"
+
+/*
+ * OGRNGWDriverIdentify()
+ */
+
+static int OGRNGWDriverIdentify( GDALOpenInfo *poOpenInfo )
+{
+    return STARTS_WITH_CI( poOpenInfo->pszFilename, "NGW:" );
+}
+
+/*
+ * OGRNGWDriverOpen()
+ */
+
+static GDALDataset *OGRNGWDriverOpen( GDALOpenInfo *poOpenInfo )
+{
+    if( OGRNGWDriverIdentify( poOpenInfo ) == 0 )
+    {
+        return nullptr;
+    }
+
+    OGRNGWDataset *poDS = new OGRNGWDataset();
+    if( !poDS->Open( poOpenInfo->pszFilename, poOpenInfo->papszOpenOptions,
+                     poOpenInfo->eAccess == GA_Update, poOpenInfo->nOpenFlags ) )
+    {
+        delete poDS;
+        poDS = nullptr;
+    }
+
+    return poDS;
+}
+
+/*
+ * OGRNGWDriverCreate()
+ *
+ * Add new datasource name at the end of URL:
+ * NGW:http://some.nextgis.com/resource/0/new_name
+ * NGW:http://some.nextgis.com:8000/test/resource/0/new_name
+ */
+
+static GDALDataset *OGRNGWDriverCreate( const char *pszName,
+                                            CPL_UNUSED int nBands,
+                                            CPL_UNUSED int nXSize,
+                                            CPL_UNUSED int nYSize,
+                                            CPL_UNUSED GDALDataType eDT,
+                                            char **papszOptions )
+
+{
+    NGWAPI::Uri stUri = NGWAPI::ParseUri(pszName);
+    CPLErrorReset();
+    if( stUri.osPrefix != "NGW" )
+    {
+        CPLError(CE_Failure, CPLE_NotSupported, "Unsupported name %s", pszName);
+        return nullptr;
+    }
+
+    CPLDebug("NGW", "Parse uri result. URL: %s, ID: %s, New name: %s",
+        stUri.osAddress.c_str(), stUri.osResourceId.c_str(),
+        stUri.osNewResourceName.c_str());
+    std::string osKey = CSLFetchNameValueDef( papszOptions, "KEY", "");
+    std::string osDesc = CSLFetchNameValueDef( papszOptions, "DESCRIPTION", "");
+
+    CPLJSONObject oPayload;
+    CPLJSONObject oResource( "resource", oPayload );
+    oResource.Add( "cls", "resource_group" );
+    oResource.Add( "display_name", stUri.osNewResourceName );
+    if( !osKey.empty() )
+    {
+        oResource.Add( "keyname", osKey );
+    }
+
+    if( !osDesc.empty() )
+    {
+        oResource.Add( "description", osDesc );
+    }
+
+    CPLJSONObject oParent( "parent", oResource );
+    oParent.Add( "id", std::stoi(stUri.osResourceId) );
+
+    std::string osPayload = "POSTFIELDS=" + oPayload.Format(CPLJSONObject::Plain);
+
+    char** papszHTTPOptions = nullptr;
+    papszHTTPOptions = CSLAddString( papszHTTPOptions, "CUSTOMREQUEST=POST" );
+    papszHTTPOptions = CSLAddString( papszHTTPOptions, osPayload.c_str() );
+    papszHTTPOptions = CSLAddString( papszHTTPOptions,
+        "HEADERS=Content-Type: application/json\r\nAccept: */*" );
+
+    CPLJSONDocument oRequest;
+    bool bResult = oRequest.LoadUrl( NGWAPI::GetResource(stUri.osAddress, ""),
+        papszHTTPOptions );
+    CSLDestroy(papszHTTPOptions);
+
+    if( !bResult )
+    {
+        return nullptr;
+    }
+
+    CPLJSONObject oRoot = oRequest.GetRoot();
+    if( !oRoot.IsValid() )
+    {
+        return nullptr;
+    }
+
+    std::string osNewResourceId = oRoot.GetString( "id" );
+    if( osNewResourceId.empty() )
+    {
+        return nullptr;
+    }
+
+    OGRNGWDataset *poDS = new OGRNGWDataset();
+
+    if( !poDS->Open( stUri.osAddress, osNewResourceId, papszOptions, true, GDAL_OF_ALL ) )
+    {
+        delete poDS;
+        poDS = nullptr;
+    }
+
+    return poDS;
+}
+
+/*
+ * GetHeaders()
+ */
+static char **GetHeaders()
+{
+    char **papszOptions = nullptr;
+    papszOptions = CSLAddString(papszOptions, "HEADERS=Accept: */*");
+    std::string osUserPwd = CPLGetConfigOption("NGW_USERPWD", "");
+    if( !osUserPwd.empty() )
+    {
+        papszOptions = CSLAddString(papszOptions, "HTTPAUTH=BASIC");
+        std::string osUserPwdOption("USERPWD=");
+        osUserPwdOption += osUserPwd;
+        papszOptions = CSLAddString(papszOptions, osUserPwdOption.c_str());
+    }
+    return papszOptions;
+}
+
+/*
+ * OGRNGWDriverDelete()
+ */
+static CPLErr OGRNGWDriverDelete( const char *pszName )
+{
+    NGWAPI::Uri stUri = NGWAPI::ParseUri(pszName);
+    CPLErrorReset();
+    if( !stUri.osNewResourceName.empty() )
+    {
+        CPLError(CE_Failure, CPLE_NotSupported, "Unsupported url %s", pszName);
+        return CE_Failure;
+    }
+
+    if( stUri.osPrefix != "NGW" )
+    {
+        CPLError(CE_Failure, CPLE_NotSupported, "Unsupported name %s", pszName);
+        return CE_Failure;
+    }
+
+    if( stUri.osResourceId == "0" )
+    {
+        CPLError(CE_Failure, CPLE_NotSupported, "Cannot delete resource 0");
+        return CE_Failure;
+    }
+
+    char **papszOptions = GetHeaders();
+    // NGWAPI::Permissions stPermissions = NGWAPI::CheckPermissions(stUri.osAddress,
+    //     stUri.osResourceId, papszOptions, true);
+    // if( stPermissions.bResourceCanDelete )
+    // {
+        return NGWAPI::DeleteResource(stUri.osAddress, stUri.osResourceId,
+            papszOptions) ? CE_None : CE_Failure;
+    // }
+    // CPLError(CE_Failure, CPLE_AppDefined, "Operation not permitted.");
+    // return CE_Failure;
+}
+
+/*
+ * OGRNGWDriverRename()
+ */
+static CPLErr OGRNGWDriverRename( const char *pszNewName, const char *pszOldName )
+{
+    NGWAPI::Uri stUri = NGWAPI::ParseUri(pszOldName);
+    CPLErrorReset();
+    if( stUri.osPrefix != "NGW" )
+    {
+        CPLError(CE_Failure, CPLE_NotSupported, "Unsupported name %s", pszOldName);
+        return CE_Failure;
+    }
+    CPLDebug("NGW", "Parse uri result. URL: %s, ID: %s, New name: %s",
+        stUri.osAddress.c_str(), stUri.osResourceId.c_str(), pszNewName);
+    char **papszOptions = GetHeaders();
+    // NGWAPI::Permissions stPermissions = NGWAPI::CheckPermissions(stUri.osAddress,
+    //     stUri.osResourceId, papszOptions, true);
+    // if( stPermissions.bResourceCanUpdate )
+    // {
+        return NGWAPI::RenameResource(stUri.osAddress, stUri.osResourceId,
+            pszNewName, papszOptions) ? CE_None : CE_Failure;
+    // }
+    // CPLError(CE_Failure, CPLE_AppDefined, "Operation not permitted.");
+    // return CE_Failure;
+}
+
+/*
+ * RegisterOGRNGW()
+ */
+
+void RegisterOGRNGW()
+{
+    if( GDALGetDriverByName( "NGW" ) != nullptr )
+    {
+        return;
+    }
+
+    GDALDriver *poDriver = new GDALDriver();
+
+    poDriver->SetDescription( "NGW" );
+    poDriver->SetMetadataItem( GDAL_DMD_LONGNAME, "NextGIS Web" );
+    poDriver->SetMetadataItem( GDAL_DCAP_RASTER, "YES" );
+    poDriver->SetMetadataItem( GDAL_DCAP_VECTOR, "YES" );
+    poDriver->SetMetadataItem( GDAL_DMD_SUBDATASETS, "YES" );
+    poDriver->SetMetadataItem( GDAL_DMD_HELPTOPIC, "drv_ngw.html" );
+    poDriver->SetMetadataItem( GDAL_DMD_CONNECTION_PREFIX, "NGW:" );
+
+    poDriver->SetMetadataItem( GDAL_DMD_OPENOPTIONLIST,
+        "<OpenOptionList>"
+        "   <Option name='USERPWD' scope='raster,vector' type='string' description='Username and password, separated by colon'/>"
+        "   <Option name='PAGE_SIZE' scope='vector' type='integer' description='Limit feature count while fetching from server. Default value is -1 - no limit' default='-1'/>"
+        "   <Option name='BATCH_SIZE' scope='vector' type='integer' description='Size of feature insert and update operations cache before send to server. If batch size is -1 batch mode is disabled' default='-1'/>"
+        "   <Option name='CACHE_EXPIRES' scope='raster' type='integer' description='Time in seconds cached files will stay valid. If cached file expires it is deleted when maximum size of cache is reached. Also expired file can be overwritten by the new one from web' default='604800'/>"
+        "   <Option name='CACHE_MAX_SIZE' scope='raster' type='integer' description='The cache maximum size in bytes. If cache reached maximum size, expired cached files will be deleted' default='67108864'/>"
+        "</OpenOptionList>"
+    );
+
+    poDriver->SetMetadataItem( GDAL_DMD_CREATIONOPTIONLIST,
+        "<CreationOptionList>"
+        "   <Option name='KEY' scope='raster,vector' type='string' description='Key value. Must be unique in whole NextGIS Web instance'/>"
+        "   <Option name='DESCRIPTION' scope='raster,vector' type='string' description='Resource description'/>"
+        "   <Option name='USERPWD' type='string' description='Username and password, separated by colon'/>"
+        "   <Option name='PAGE_SIZE' type='integer' description='Limit feature count while fetching from server. Default value is -1 - no limit' default='-1'/>"
+        "   <Option name='BATCH_SIZE' type='integer' description='Size of feature insert and update operations cache before send to server. If batch size is -1 batch mode is disabled' default='-1'/>"
+        "</CreationOptionList>"
+    );
+
+    poDriver->SetMetadataItem( GDAL_DS_LAYER_CREATIONOPTIONLIST,
+        "<LayerCreationOptionList>"
+        "   <Option name='OVERWRITE' type='boolean' description='Whether to overwrite an existing table with the layer name to be created' default='NO'/>"
+        "   <Option name='KEY' type='string' description='Key value. Must be unique in whole NextGIS Web instance'/>"
+        "   <Option name='DESCRIPTION' type='string' description='Resource description'/>"
+        "</LayerCreationOptionList>"
+    );
+
+    poDriver->SetMetadataItem( GDAL_DMD_CREATIONFIELDDATATYPES, "Integer Integer64 Real String Date DateTime Time" );
+    poDriver->SetMetadataItem( GDAL_DCAP_NOTNULL_FIELDS, "NO" );
+    poDriver->SetMetadataItem( GDAL_DCAP_DEFAULT_FIELDS, "NO" );
+    poDriver->SetMetadataItem( GDAL_DCAP_NOTNULL_GEOMFIELDS, "YES" );
+
+    poDriver->pfnOpen = OGRNGWDriverOpen;
+    poDriver->pfnIdentify = OGRNGWDriverIdentify;
+    poDriver->pfnCreate = OGRNGWDriverCreate;
+    poDriver->pfnDelete = OGRNGWDriverDelete;
+    poDriver->pfnRename = OGRNGWDriverRename;
+
+    GetGDALDriverManager()->RegisterDriver( poDriver );
+}
diff --git a/gdal/ogr/ogrsf_frmts/ngw/ogrngwlayer.cpp b/gdal/ogr/ogrsf_frmts/ngw/ogrngwlayer.cpp
new file mode 100644
index 000000000000..3b829f99e1d6
--- /dev/null
+++ b/gdal/ogr/ogrsf_frmts/ngw/ogrngwlayer.cpp
@@ -0,0 +1,1117 @@
+/*******************************************************************************
+ *  Project: NextGIS Web Driver
+ *  Purpose: Implements NextGIS Web Driver
+ *  Author: Dmitry Baryshnikov, dmitry.baryshnikov@nextgis.com
+ *  Language: C++
+ *******************************************************************************
+ *  The MIT License (MIT)
+ *
+ *  Copyright (c) 2018, NextGIS
+ *
+ *  Permission is hereby granted, free of charge, to any person obtaining a copy
+ *  of this software and associated documentation files (the "Software"), to deal
+ *  in the Software without restriction, including without limitation the rights
+ *  to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ *  copies of the Software, and to permit persons to whom the Software is
+ *  furnished to do so, subject to the following conditions:
+ *
+ *  The above copyright notice and this permission notice shall be included in all
+ *  copies or substantial portions of the Software.
+ *
+ *  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ *  IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ *  FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ *  AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ *  LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ *  OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ *  SOFTWARE.
+ *******************************************************************************/
+
+ #include "ogr_ngw.h"
+
+/*
+ * CheckRequestResult()
+ */
+static bool CheckRequestResult(bool bResult, const CPLJSONObject &oRoot,
+    const std::string &osErrorMessage)
+{
+    if( !bResult )
+    {
+        if( oRoot.IsValid() )
+        {
+            std::string osErrorMessageInt = oRoot.GetString("message");
+            if( !osErrorMessageInt.empty() )
+            {
+                CPLErrorSetState(CE_Failure, CPLE_AppDefined,
+                    osErrorMessageInt.c_str());
+            }
+        }
+        return false;
+    }
+
+    if( !oRoot.IsValid() )
+    {
+        CPLErrorSetState(CE_Failure, CPLE_AppDefined, osErrorMessage.c_str());
+        return false;
+    }
+
+    return true;
+}
+
+/*
+ * JSONToFeature()
+ */
+static OGRFeature *JSONToFeature( const CPLJSONObject &featureJson,
+    OGRFeatureDefn *poFeatureDefn, bool bCheckIgnoredFields = false )
+{
+    OGRFeature *poFeature = new OGRFeature( poFeatureDefn );
+    poFeature->SetFID( featureJson.GetLong("id") );
+    CPLJSONObject oFields = featureJson.GetObj("fields");
+    for( int iField = 0; iField < poFeatureDefn->GetFieldCount(); ++iField )
+    {
+        OGRFieldDefn *poFieldDefn = poFeatureDefn->GetFieldDefn(iField);
+        if( bCheckIgnoredFields && poFieldDefn->IsIgnored() )
+        {
+            continue;
+        }
+        CPLJSONObject oJSONField = oFields[poFieldDefn->GetNameRef()];
+        if( oJSONField.IsValid() )
+        {
+            switch( poFieldDefn->GetType() )
+            {
+                case OFTInteger:
+                    poFeature->SetField( iField, oJSONField.ToInteger() );
+                    break;
+                case OFTInteger64:
+                    poFeature->SetField( iField, oJSONField.ToLong() );
+                    break;
+                case OFTReal:
+                    poFeature->SetField( iField, oJSONField.ToDouble() );
+                    break;
+                case OFTBinary:
+                    // Not supported.
+                    break;
+                case OFTString:
+                case OFTIntegerList:
+                case OFTInteger64List:
+                case OFTRealList:
+                case OFTStringList:
+                    poFeature->SetField( iField, oJSONField.ToString().c_str() );
+                    break;
+                case OFTDate:
+                case OFTTime:
+                case OFTDateTime:
+                {
+                    int nYear = oJSONField.GetInteger("year");
+                    int nMonth = oJSONField.GetInteger("month");
+                    int nDay = oJSONField.GetInteger("day");
+                    int nHour = oJSONField.GetInteger("hour");
+                    int nMinute = oJSONField.GetInteger("minute");
+                    int nSecond = oJSONField.GetInteger("second");
+                    poFeature->SetField( iField, nYear, nMonth, nDay, nHour,
+                        nMinute, float(nSecond) );
+                    break;
+                }
+                default:
+                    break;
+            }
+        }
+    }
+    OGRGeometry *poGeometry = nullptr;
+    OGRGeometryFactory::createFromWkt( featureJson.GetString("geom").c_str(),
+        nullptr, &poGeometry );
+    if( poGeometry != nullptr )
+    {
+        OGRSpatialReference *poSpatialRef =
+            poFeatureDefn->GetGeomFieldDefn( 0 )->GetSpatialRef();
+        if( poSpatialRef != nullptr)
+        {
+            poGeometry->assignSpatialReference( poSpatialRef );
+        }
+        poFeature->SetGeomFieldDirectly( 0, poGeometry );
+    }
+
+    // FIXME: Do we need extension/description and extension/attachment storing in feature?
+
+    return poFeature;
+}
+
+/*
+ * FeatureToJson()
+ */
+static CPLJSONObject FeatureToJson(OGRFeature *poFeature)
+{
+    CPLJSONObject oFeaturesJson;
+    if( poFeature == nullptr )
+    {
+        // Should not happen.
+        return oFeaturesJson;
+    }
+
+    if( poFeature->GetFID() >= 0 )
+    {
+        oFeaturesJson.Add("id", poFeature->GetFID());
+    }
+
+    OGRGeometry *poGeom = poFeature->GetGeometryRef();
+    if( poGeom )
+    {
+        char *pszWkt = nullptr;
+        if( poGeom->exportToWkt( &pszWkt ) == OGRERR_NONE )
+        {
+            oFeaturesJson.Add("geom", std::string(pszWkt));
+            CPLFree(pszWkt);
+        }
+    }
+
+    OGRFeatureDefn *poFeatureDefn = poFeature->GetDefnRef();
+    CPLJSONObject oFieldsJson("fields", oFeaturesJson);
+    for( int iField = 0; iField < poFeatureDefn->GetFieldCount(); ++iField )
+    {
+        OGRFieldDefn *poFieldDefn = poFeatureDefn->GetFieldDefn(iField);
+        if( poFeature->IsFieldNull(iField) == TRUE )
+        {
+            oFieldsJson.AddNull(poFieldDefn->GetNameRef());
+            continue;
+        }
+
+        if( poFeature->IsFieldSet(iField) == TRUE )
+        {
+            switch( poFieldDefn->GetType() )
+            {
+                case OFTInteger:
+                    oFieldsJson.Add( poFieldDefn->GetNameRef(),
+                        poFeature->GetFieldAsInteger(iField) );
+                    break;
+                case OFTInteger64:
+                    oFieldsJson.Add( poFieldDefn->GetNameRef(),
+                        static_cast<GInt64>(
+                            poFeature->GetFieldAsInteger64(iField)) );
+                    break;
+                case OFTReal:
+                    oFieldsJson.Add( poFieldDefn->GetNameRef(),
+                        poFeature->GetFieldAsDouble(iField) );
+                    break;
+                case OFTBinary:
+                    // Not supported.
+                    break;
+                case OFTString:
+                case OFTIntegerList:
+                case OFTInteger64List:
+                case OFTRealList:
+                case OFTStringList:
+                    oFieldsJson.Add( poFieldDefn->GetNameRef(),
+                        poFeature->GetFieldAsString(iField) );
+                    break;
+                case OFTDate:
+                case OFTTime:
+                case OFTDateTime:
+                {
+                    int nYear, nMonth, nDay, nHour, nMinute, nSecond, nTZFlag;
+                    if( poFeature->GetFieldAsDateTime(iField, &nYear, &nMonth,
+                        &nDay, &nHour, &nMinute, &nSecond, &nTZFlag) == TRUE)
+                    {
+                        // TODO: Convert timestamp to UTC.
+                        if( nTZFlag == 0 || nTZFlag == 100 )
+                        {
+                            CPLJSONObject oDateJson(poFieldDefn->GetNameRef(),
+                                oFieldsJson);
+
+                            oDateJson.Add("year", nYear);
+                            oDateJson.Add("month", nMonth);
+                            oDateJson.Add("day", nDay);
+                            oDateJson.Add("hour", nHour);
+                            oDateJson.Add("minute", nMinute);
+                            oDateJson.Add("second", nSecond);
+                        }
+                    }
+                    break;
+                }
+                default:
+                    break;
+            }
+        }
+    }
+
+    return oFeaturesJson;
+}
+
+/*
+ * FeatureToJsonString()
+ */
+static std::string FeatureToJsonString(OGRFeature *poFeature)
+{
+    return FeatureToJson(poFeature).Format(CPLJSONObject::Plain);
+}
+
+ /*
+  * OGRNGWLayer()
+  */
+OGRNGWLayer::OGRNGWLayer( OGRNGWDataset *poDSIn,
+    const CPLJSONObject &oResourceJsonObject ) :
+    osResourceId(oResourceJsonObject.GetString("resource/id", "-1")),
+    poDS(poDSIn),
+    bFetchedPermissions(false),
+    nFeatureCount(-1),
+    oNextPos(moFeatures.begin()),
+    nPageStart(0),
+    bNeedSyncData(false),
+    bNeedSyncStructure(false)
+{
+    std::string osName = oResourceJsonObject.GetString("resource/display_name");
+    poFeatureDefn = new OGRFeatureDefn( osName.c_str() );
+    poFeatureDefn->Reference();
+
+    poFeatureDefn->SetGeomType( NGWAPI::NGWGeomTypeToOGRGeomType(
+        oResourceJsonObject.GetString("vector_layer/geometry_type")) );
+
+    OGRSpatialReference *poSRS = new OGRSpatialReference;
+    int nEPSG = oResourceJsonObject.GetInteger("vector_layer/srs/id", 3857); // Default NGW SRS is Web mercator EPSG:3857.
+    if( poSRS->importFromEPSG( nEPSG ) == OGRERR_NONE )
+    {
+        if( poFeatureDefn->GetGeomFieldCount() != 0 )
+        {
+            poFeatureDefn->GetGeomFieldDefn(0)->SetSpatialRef( poSRS );
+        }
+    }
+    poSRS->Release();
+
+    CPLJSONArray oFields = oResourceJsonObject.GetArray("feature_layer/fields");
+    FillFields( oFields );
+    FillMetadata( oResourceJsonObject );
+
+    SetDescription( poFeatureDefn->GetName() );
+}
+
+/*
+ * OGRNGWLayer()
+ */
+OGRNGWLayer::OGRNGWLayer( OGRNGWDataset *poDSIn, const std::string &osNameIn,
+    OGRSpatialReference *poSpatialRef, OGRwkbGeometryType eGType,
+    const std::string &osKeyIn, const std::string &osDescIn ) :
+    osResourceId("-1"),
+    poDS(poDSIn),
+    bFetchedPermissions(false),
+    nFeatureCount(0),
+    oNextPos(moFeatures.begin()),
+    nPageStart(0),
+    bNeedSyncData(false),
+    bNeedSyncStructure(false)
+{
+    poFeatureDefn = new OGRFeatureDefn( osNameIn.c_str() );
+    poFeatureDefn->Reference();
+
+    poFeatureDefn->SetGeomType( eGType );
+
+    if( poSpatialRef )
+    {
+        if( poFeatureDefn->GetGeomFieldCount() != 0 )
+        {
+            poFeatureDefn->GetGeomFieldDefn(0)->SetSpatialRef( poSpatialRef );
+        }
+    }
+
+    if( !osDescIn.empty() )
+    {
+        OGRLayer::SetMetadataItem( "description", osDescIn.c_str() );
+    }
+    if( !osKeyIn.empty() )
+    {
+        OGRLayer::SetMetadataItem( "keyname", osKeyIn.c_str() );
+    }
+
+    SetDescription( poFeatureDefn->GetName() );
+}
+
+/*
+ * ~OGRNGWLayer()
+ */
+OGRNGWLayer::~OGRNGWLayer()
+{
+    if( !soChangedIds.empty() )
+    {
+        bNeedSyncData = true;
+    }
+    SyncFeatures();
+    FreeFeaturesCache();
+    if( poFeatureDefn != nullptr )
+    {
+        poFeatureDefn->Release();
+    }
+}
+
+/*
+ * FreeFeaturesCache()
+ */
+void OGRNGWLayer::FreeFeaturesCache()
+{
+    for( auto &oPair: moFeatures )
+    {
+        OGRFeature::DestroyFeature( oPair.second );
+    }
+    moFeatures.clear();
+}
+
+/*
+ * GetResourceId()
+ */
+std::string OGRNGWLayer::GetResourceId() const
+{
+    return osResourceId;
+}
+
+/*
+ * Delete()
+ */
+bool OGRNGWLayer::Delete()
+{
+    if( osResourceId == "-1")
+    {
+        return true;
+    }
+
+    // Headers free in DeleteResource method.
+    return NGWAPI::DeleteResource(poDS->GetUrl(), osResourceId, poDS->GetHeaders());
+}
+
+/*
+ * ResetReading()
+ */
+void OGRNGWLayer::ResetReading()
+{
+    SyncToDisk();
+    if( poDS->GetPageSize() != -1 )
+    {
+        FreeFeaturesCache();
+        nPageStart = 0;
+    }
+    oNextPos = moFeatures.begin();
+}
+
+/*
+ * SetNextByIndex()
+ */
+OGRErr OGRNGWLayer::SetNextByIndex( GIntBig nIndex )
+{
+    SyncToDisk();
+    if( nIndex < 0)
+    {
+        CPLError(CE_Failure, CPLE_AppDefined,
+            "Feature index must be greater or equal 0. Got " CPL_FRMT_GIB, nIndex);
+        return OGRERR_FAILURE;
+    }
+    if( poDS->GetPageSize() != -1 )
+    {
+        if( nPageStart < nIndex && nIndex >= nPageStart - poDS->GetPageSize() )
+        {
+            oNextPos = moFeatures.begin();
+            std::advance(oNextPos, nIndex);
+        }
+        else
+        {
+            nPageStart = nIndex / poDS->GetPageSize() * poDS->GetPageSize();
+            oNextPos = moFeatures.end();
+        }
+    }
+    else
+    {
+        oNextPos = moFeatures.begin();
+        std::advance(oNextPos, nIndex);
+    }
+    return OGRERR_NONE;
+}
+
+/*
+ * GetNextFeature()
+ */
+OGRFeature *OGRNGWLayer::GetNextFeature()
+{
+    std::string osUrl;
+    if( poDS->GetPageSize() != -1 )
+    {
+        if( oNextPos == moFeatures.end() && nPageStart < GetFeatureCount(FALSE) )
+        {
+            FreeFeaturesCache();
+
+            osUrl = NGWAPI::GetFeaturePage( poDS->GetUrl(), osResourceId,
+                nPageStart, poDS->GetPageSize() );
+            nPageStart += poDS->GetPageSize();
+        }
+    }
+    else if( moFeatures.empty() && GetFeatureCount(FALSE) > 0 )
+    {
+        osUrl = NGWAPI::GetFeature( poDS->GetUrl(), osResourceId );
+    }
+
+    if( !osUrl.empty() )
+    {
+        CPLErrorReset();
+        CPLJSONDocument oFeatureReq;
+        char **papszHTTPOptions = poDS->GetHeaders();
+        bool bResult = oFeatureReq.LoadUrl( osUrl, papszHTTPOptions );
+        CSLDestroy( papszHTTPOptions );
+
+        CPLJSONObject oRoot = oFeatureReq.GetRoot();
+        if( !CheckRequestResult(bResult, oRoot, "GetFeatures request failed") )
+        {
+            return nullptr;
+        }
+
+        CPLJSONArray aoJSONFeatures = oRoot.ToArray();
+        for( int i = 0; i < aoJSONFeatures.Size(); ++i)
+        {
+            OGRFeature *poFeature = JSONToFeature( aoJSONFeatures[i],
+                poFeatureDefn, false );
+            moFeatures[poFeature->GetFID()] = poFeature;
+        }
+
+        oNextPos = moFeatures.begin();
+
+        // Set m_nFeaturesRead for GetFeaturesRead.
+        if( poDS->GetPageSize() != -1 )
+        {
+            m_nFeaturesRead = moFeatures.size();
+        }
+        else
+        {
+            m_nFeaturesRead = nPageStart;
+        }
+    }
+
+    while( oNextPos != moFeatures.end() )
+    {
+        OGRFeature *poFeature = oNextPos->second;
+        ++oNextPos;
+
+        if( poFeature == nullptr ) // May be deleted.
+        {
+            continue;
+        }
+
+        if ((m_poFilterGeom == nullptr
+            || FilterGeometry(poFeature->GetGeometryRef()))
+            && (m_poAttrQuery == nullptr
+            || m_poAttrQuery->Evaluate(poFeature)))
+        {
+            return poFeature->Clone();
+        }
+    }
+
+    if( poDS->GetPageSize() != -1 && m_nFeaturesRead < GetFeatureCount(FALSE) )
+    {
+        return GetNextFeature();
+    }
+    return nullptr;
+}
+
+/*
+ * GetFeature()
+ */
+OGRFeature *OGRNGWLayer::GetFeature( GIntBig nFID )
+{
+    // Check feature in cache.
+    if( moFeatures[nFID] != nullptr )
+    {
+        return moFeatures[nFID]->Clone();
+    }
+    std::string osUrl = NGWAPI::GetFeature( poDS->GetUrl(), osResourceId) +
+        std::to_string(nFID);
+    CPLErrorReset();
+    CPLJSONDocument oFeatureReq;
+    char **papszHTTPOptions = poDS->GetHeaders();
+    bool bResult = oFeatureReq.LoadUrl( osUrl, papszHTTPOptions );
+    CSLDestroy( papszHTTPOptions );
+
+    CPLJSONObject oRoot = oFeatureReq.GetRoot();
+    if( !CheckRequestResult(bResult, oRoot, "GetFeature #" + std::to_string(nFID) +
+        " response is invalid") )
+    {
+        return nullptr;
+    }
+
+    // Don't store feature in cache. This can broke sequence read.
+    return JSONToFeature( oRoot, poFeatureDefn, true );
+}
+
+/*
+ * GetLayerDefn()
+ */
+OGRFeatureDefn *OGRNGWLayer::GetLayerDefn()
+{
+    return poFeatureDefn;
+}
+
+/*
+ * TestCapability()
+ */
+int OGRNGWLayer::TestCapability( const char *pszCap )
+{
+    FetchPermissions();
+    if( EQUAL(pszCap, OLCRandomRead) )
+        return TRUE;
+    else if( EQUAL(pszCap, OLCSequentialWrite) )
+        return stPermissions.bDataCanWrite && poDS->IsUpdateMode();
+    else if( EQUAL(pszCap, OLCRandomWrite) )
+        return stPermissions.bDataCanWrite && poDS->IsUpdateMode();
+    else if( EQUAL(pszCap, OLCFastFeatureCount) )
+        return TRUE;
+    else if( EQUAL(pszCap, OLCFastGetExtent) )
+        return TRUE;
+    else if( EQUAL(pszCap, OLCAlterFieldDefn) ) // Only field name and alias can be altered.
+        return stPermissions.bDatastructCanWrite && poDS->IsUpdateMode();
+    else if( EQUAL(pszCap, OLCDeleteFeature) )
+        return stPermissions.bDataCanWrite && poDS->IsUpdateMode();
+    else if( EQUAL(pszCap, OLCStringsAsUTF8) )
+        return TRUE;
+    else if( EQUAL(pszCap, OLCFastSetNextByIndex) )
+        return TRUE;
+    else if( EQUAL(pszCap,OLCCreateField) )
+        return poDS->IsUpdateMode();
+    return FALSE;
+}
+
+/*
+ * FillMetadata()
+ */
+void OGRNGWLayer::FillMetadata( const CPLJSONObject &oRootObject )
+{
+    std::string osCreateDate = oRootObject.GetString("resource/creation_date");
+    if( !osCreateDate.empty() )
+    {
+        OGRLayer::SetMetadataItem( "creation_date", osCreateDate.c_str() );
+    }
+    std::string osDescription = oRootObject.GetString("resource/description");
+    if( !osDescription.empty() )
+    {
+        OGRLayer::SetMetadataItem( "description", osDescription.c_str() );
+    }
+    std::string osKeyName = oRootObject.GetString("resource/keyname");
+    if( !osKeyName.empty() )
+    {
+        OGRLayer::SetMetadataItem( "keyname", osKeyName.c_str() );
+    }
+    OGRLayer::SetMetadataItem( "id", osResourceId.c_str() );
+
+    std::vector<CPLJSONObject> items =
+        oRootObject.GetObj("resmeta/items").GetChildren();
+
+    for( const CPLJSONObject &item : items )
+    {
+        std::string osSuffix = NGWAPI::GetResmetaSuffix( item.GetType() );
+        OGRLayer::SetMetadataItem( (item.GetName() + osSuffix).c_str(),
+            item.ToString().c_str(), "NGW" );
+    }
+}
+
+/*
+ * FillFields()
+ */
+void OGRNGWLayer::FillFields( const CPLJSONArray &oFields )
+{
+    for( int i = 0; i < oFields.Size(); ++i )
+    {
+        CPLJSONObject oField = oFields[i];
+        std::string osFieldName = oField.GetString("keyname");
+        OGRFieldType eFieldtype = NGWAPI::NGWFieldTypeToOGRFieldType(
+            oField.GetString("datatype"));
+        OGRFieldDefn oFieldDefn(osFieldName.c_str(), eFieldtype);
+        poFeatureDefn->AddFieldDefn(&oFieldDefn);
+        std::string osFieldId = oField.GetString("id");
+        std::string osFieldAlias = oField.GetString("display_name");
+        std::string osFieldIsLabel = oField.GetString("label_field");
+        std::string osFieldGridVisible = oField.GetString("grid_visibility");
+
+        std::string osFieldAliasName = "FIELD_" + std::to_string(i) + "_ALIAS";
+        std::string osFieldIdName = "FIELD_" + std::to_string(i) + "_ID";
+        std::string osFieldIsLabelName = "FIELD_" + std::to_string(i) + "_LABEL_FIELD";
+        std::string osFieldGridVisibleName = "FIELD_" + std::to_string(i) + "_GRID_VISIBILITY";
+
+        OGRLayer::SetMetadataItem(osFieldAliasName.c_str(),
+            osFieldAlias.c_str(), "");
+        OGRLayer::SetMetadataItem(osFieldIdName.c_str(),
+            osFieldId.c_str(), "");
+        OGRLayer::SetMetadataItem(osFieldIsLabelName.c_str(),
+            osFieldIsLabel.c_str(), "");
+        OGRLayer::SetMetadataItem(osFieldGridVisibleName.c_str(),
+            osFieldGridVisible.c_str(), "");
+    }
+
+    // FIXME: Do we need extension/description and extension/attachment fields?
+}
+
+/*
+ * GetFeatureCount()
+ */
+GIntBig OGRNGWLayer::GetFeatureCount( int bForce )
+{
+    if (m_poFilterGeom == nullptr && m_poAttrQuery == nullptr)
+    {
+        if( nFeatureCount < 0 || CPL_TO_BOOL(bForce) )
+        {
+            CPLErrorReset();
+            CPLJSONDocument oCountReq;
+            char **papszHTTPOptions = poDS->GetHeaders();
+            bool bResult = oCountReq.LoadUrl( NGWAPI::GetFeatureCount( poDS->GetUrl(),
+                osResourceId ), papszHTTPOptions );
+            CSLDestroy( papszHTTPOptions );
+            if( bResult )
+            {
+                CPLJSONObject oRoot = oCountReq.GetRoot();
+                if( oRoot.IsValid() )
+                {
+                    nFeatureCount = oRoot.GetLong("total_count");
+                    for(GIntBig nFID : soChangedIds)
+                    {
+                        if(nFID < 0)
+                        {
+                            nFeatureCount++; // If we have new features not sent to server.
+                        }
+                    }
+                }
+            }
+        }
+        return nFeatureCount;
+    }
+    else
+    {
+        return OGRLayer::GetFeatureCount(bForce);
+    }
+}
+
+/*
+ * GetExtent()
+ */
+OGRErr OGRNGWLayer::GetExtent( OGREnvelope *psExtent, int bForce )
+{
+    if( !stExtent.IsInit() || CPL_TO_BOOL(bForce) )
+    {
+        char **papszHTTPOptions = poDS->GetHeaders();
+        bool bResult = NGWAPI::GetExtent(poDS->GetUrl(), osResourceId,
+            papszHTTPOptions, 3857, stExtent);
+        CSLDestroy( papszHTTPOptions );
+        if( !bResult )
+        {
+            return OGRERR_FAILURE;
+        }
+    }
+    *psExtent = stExtent;
+    return OGRERR_NONE;
+}
+
+OGRErr OGRNGWLayer::GetExtent(int iGeomField, OGREnvelope *psExtent, int bForce)
+{
+    return OGRLayer::GetExtent(iGeomField, psExtent, bForce);
+}
+
+/*
+ * FetchPermissions()
+ */
+void OGRNGWLayer::FetchPermissions()
+{
+    if(bFetchedPermissions)
+    {
+        return;
+    }
+
+    if( poDS->IsUpdateMode() )
+    {
+        char **papszHTTPOptions = poDS->GetHeaders();
+        stPermissions = NGWAPI::CheckPermissions( poDS->GetUrl(), osResourceId,
+            papszHTTPOptions, poDS->IsUpdateMode() );
+        CSLDestroy( papszHTTPOptions );
+    }
+    else
+    {
+        stPermissions.bDataCanRead = true;
+        stPermissions.bResourceCanRead = true;
+        stPermissions.bDatastructCanRead = true;
+        stPermissions.bMetadataCanRead = true;
+    }
+    bFetchedPermissions = true;
+}
+
+OGRErr OGRNGWLayer::CreateField( OGRFieldDefn *poField, CPL_UNUSED int bApproxOK )
+{
+    if( osResourceId == "-1" ) // Can create field only on new layers (not synced with server).
+    {
+        poFeatureDefn->AddFieldDefn( poField );
+        return OGRERR_NONE;
+    }
+    return OGRLayer::CreateField( poField, bApproxOK );
+}
+
+OGRErr OGRNGWLayer::DeleteField( int iField )
+{
+    if( osResourceId == "-1" ) // Can delete field only on new layers (not synced with server).
+    {
+        return poFeatureDefn->DeleteFieldDefn( iField );
+    }
+    return OGRLayer::DeleteField( iField );
+}
+
+OGRErr OGRNGWLayer::ReorderFields( int *panMap )
+{
+    if( osResourceId == "-1" ) // Can reorder fields only on new layers (not synced with server).
+    {
+        return poFeatureDefn->ReorderFieldDefns( panMap );
+    }
+    return OGRLayer::ReorderFields( panMap );
+}
+
+OGRErr OGRNGWLayer::AlterFieldDefn( int iField, OGRFieldDefn *poNewFieldDefn,
+    int nFlagsIn )
+{
+    OGRFieldDefn *poFieldDefn = poFeatureDefn->GetFieldDefn( iField );
+    if( poFieldDefn )
+    {
+        if( osResourceId == "-1" ) // Can alter field only on new layers (not synced with server).
+        {
+            poFieldDefn->SetName( poNewFieldDefn->GetNameRef() );
+            poFieldDefn->SetType( poNewFieldDefn->GetType() );
+            poFieldDefn->SetSubType( poNewFieldDefn->GetSubType() );
+            poFieldDefn->SetWidth( poNewFieldDefn->GetWidth() );
+            poFieldDefn->SetPrecision( poNewFieldDefn->GetPrecision() );
+        }
+        else if( nFlagsIn & ALTER_NAME_FLAG ) // Can only rename field, not change it type.
+        {
+            bNeedSyncStructure = true;
+            poFieldDefn->SetName(poNewFieldDefn->GetNameRef());
+        }
+    }
+    return OGRLayer::AlterFieldDefn( iField, poNewFieldDefn, nFlagsIn );
+}
+
+CPLErr OGRNGWLayer::SetMetadata(char **papszMetadata, const char *pszDomain)
+{
+    bNeedSyncStructure = true;
+    return OGRLayer::SetMetadata(papszMetadata, pszDomain);
+}
+
+CPLErr OGRNGWLayer::SetMetadataItem(const char *pszName, const char *pszValue,
+    const char *pszDomain)
+{
+    bNeedSyncStructure = true;
+    return OGRLayer::SetMetadataItem(pszName, pszValue, pszDomain);
+}
+
+std::string OGRNGWLayer::CreateNGWResourceJson()
+{
+    CPLJSONObject oResourceJson;
+
+    // Add resource json item.
+    CPLJSONObject oResource("resource", oResourceJson);
+    oResource.Add("cls", "vector_layer");
+    CPLJSONObject oResourceParent("parent", oResource);
+    oResourceParent.Add("id", static_cast<GIntBig>(std::stol( poDS->GetResourceId() )));
+    oResource.Add("display_name", GetName());
+    const char *pszKeyName = GetMetadataItem( "keyname" );
+    if( pszKeyName )
+    {
+        oResource.Add("keyname", pszKeyName);
+    }
+    const char *pszDescription = GetMetadataItem( "description" );
+    if( pszDescription )
+    {
+        oResource.Add("description", pszDescription);
+    }
+
+    // Add vector_layer json item.
+    CPLJSONObject oVectorLayer("vector_layer", oResourceJson);
+    CPLJSONObject oVectorLayerSrs("srs", oVectorLayer);
+
+    OGRSpatialReference *poSpatialRef = GetSpatialRef();
+    int nEPSG = 3857;
+    if( poSpatialRef )
+    {
+        poSpatialRef->AutoIdentifyEPSG();
+        const char *pszEPSG = poSpatialRef->GetAuthorityCode( nullptr );
+        if( pszEPSG != nullptr )
+        {
+            nEPSG = atoi( pszEPSG );
+        }
+    }
+    oVectorLayerSrs.Add("id", nEPSG);
+    // In OGRNGWDataset::ICreateLayer we limit supported geometry types.
+    oVectorLayer.Add("geometry_type", NGWAPI::OGRGeomTypeToNGWGeomType(
+        GetGeomType() ));
+    CPLJSONArray oVectorLayerFields;
+    for( int iField = 0; iField < poFeatureDefn->GetFieldCount(); ++iField )
+    {
+        OGRFieldDefn *poFieldDefn = poFeatureDefn->GetFieldDefn( iField );
+
+        CPLJSONObject oField;
+        oField.Add("keyname", poFieldDefn->GetNameRef());
+        oField.Add("datatype", NGWAPI::OGRFieldTypeToNGWFieldType(
+            poFieldDefn->GetType() ));
+        // Get alias from metadata.
+        std::string osFieldAliasName = "FIELD_" + std::to_string(iField) + "_ALIAS";
+        const char *pszFieldAlias = GetMetadataItem( osFieldAliasName.c_str() );
+        if( pszFieldAlias )
+        {
+            oField.Add("display_name", pszFieldAlias);
+        }
+        oVectorLayerFields.Add(oField);
+    }
+    oVectorLayer.Add("fields", oVectorLayerFields);
+
+    // Add resmeta json item.
+    NGWAPI::FillResmeta(oResourceJson, GetMetadata("NGW"));
+
+    return oResourceJson.Format(CPLJSONObject::Plain);
+}
+
+OGRErr OGRNGWLayer::SyncFeatures()
+{
+    if( !bNeedSyncData )
+    {
+        return OGRERR_NONE;
+    }
+    bool bResult = NGWAPI::PatchFeatures( poDS->GetUrl(), osResourceId,
+        FeaturesToJson(), poDS->GetHeaders() );
+    if( bResult )
+    {
+        bNeedSyncData = false;
+        nFeatureCount += soChangedIds.size();
+        soChangedIds.clear();
+        FreeFeaturesCache(); // While patching we cannot receive new features FIDs.
+    }
+    else
+    {
+        // Error message should set in NGWAPI::PatchFeatures function.
+        return OGRERR_FAILURE;
+    }
+    return OGRERR_NONE;
+}
+
+OGRErr OGRNGWLayer::SyncToDisk()
+{
+    if( osResourceId == "-1" ) // Create vector layer at NextGIS Web.
+    {
+        bNeedSyncData = !moFeatures.empty();
+        std::string osResourceIdInt = NGWAPI::CreateResource( poDS->GetUrl(),
+            CreateNGWResourceJson(), poDS->GetHeaders() );
+        if( osResourceIdInt == "-1" )
+        {
+            // Error message should set in CreateResource.
+            return OGRERR_FAILURE;
+        }
+        osResourceId = osResourceIdInt;
+        OGRLayer::SetMetadataItem( "id", osResourceId.c_str() );
+        bNeedSyncStructure = false;
+    }
+    else if( bNeedSyncStructure ) // Update vector layer at NextGIS Web.
+    {
+        if( !NGWAPI::UpdateResource( poDS->GetUrl(), GetResourceId(),
+            CreateNGWResourceJson(), poDS->GetHeaders() ) )
+        {
+            // Error message should set in UpdateResource.
+            return OGRERR_FAILURE;
+        }
+        bNeedSyncStructure = false;
+    }
+
+    // Sync features.
+    return SyncFeatures();
+}
+
+/*
+ * DeleteFeature()
+ */
+OGRErr OGRNGWLayer::DeleteFeature(GIntBig nFID)
+{
+    if( nFID < 0 )
+    {
+        if( moFeatures[nFID] != nullptr )
+        {
+            OGRFeature::DestroyFeature( moFeatures[nFID] );
+            moFeatures[nFID] = nullptr;
+            nFeatureCount--;
+            soChangedIds.erase(nFID);
+            return OGRERR_NONE;
+        }
+        CPLError(CE_Failure, CPLE_AppDefined, "Feature with id #" CPL_FRMT_GIB " not found.", nFID);
+        return OGRERR_FAILURE;
+    }
+    else
+    {
+        FetchPermissions();
+        if( stPermissions.bDataCanWrite && poDS->IsUpdateMode() )
+        {
+            bool bResult = NGWAPI::DeleteFeature(poDS->GetUrl(), osResourceId,
+                std::to_string(nFID), poDS->GetHeaders());
+            if( bResult )
+            {
+                if( moFeatures[nFID] != nullptr )
+                {
+                    OGRFeature::DestroyFeature( moFeatures[nFID] );
+                    moFeatures[nFID] = nullptr;
+                }
+                nFeatureCount--;
+                soChangedIds.erase(nFID);
+                return OGRERR_NONE;
+            }
+            return OGRERR_FAILURE;
+        }
+        CPLErrorReset();
+        CPLError(CE_Failure, CPLE_AppDefined, "Delete feature #" CPL_FRMT_GIB " operation is not permitted.", nFID);
+        return OGRERR_FAILURE;
+    }
+}
+
+/*
+ * DeleteAllFeatures()
+ */
+bool OGRNGWLayer::DeleteAllFeatures()
+{
+    if( osResourceId == "-1" )
+    {
+        FreeFeaturesCache();
+        nFeatureCount = 0;
+        soChangedIds.clear();
+        return true;
+    }
+    else
+    {
+        FetchPermissions();
+        if( stPermissions.bDataCanWrite && poDS->IsUpdateMode() )
+        {
+            bool bResult = NGWAPI::DeleteFeature(poDS->GetUrl(), osResourceId, "",
+                poDS->GetHeaders());
+            if( bResult )
+            {
+                FreeFeaturesCache();
+                nFeatureCount = 0;
+                soChangedIds.clear();
+            }
+            return bResult;
+        }
+    }
+    CPLErrorReset();
+    CPLError(CE_Failure, CPLE_AppDefined, "Delete all features operation is not permitted.");
+    return false;
+}
+
+/*
+ * FeaturesToJson()
+ */
+std::string OGRNGWLayer::FeaturesToJson()
+{
+    CPLJSONArray oFeatureJsonArray;
+    for(GIntBig nFID : soChangedIds)
+    {
+        if( moFeatures[nFID] != nullptr )
+        {
+            oFeatureJsonArray.Add( FeatureToJson( moFeatures[nFID] ) );
+        }
+    }
+    return oFeatureJsonArray.Format(CPLJSONObject::Plain);
+}
+
+/*
+ * ISetFeature()
+ */
+OGRErr OGRNGWLayer::ISetFeature(OGRFeature *poFeature)
+{
+    if( poDS->IsBatchMode() )
+    {
+        if(moFeatures[poFeature->GetFID()])
+        {
+            OGRFeature::DestroyFeature( moFeatures[poFeature->GetFID()] );
+        }
+        moFeatures[poFeature->GetFID()] = poFeature->Clone();
+        soChangedIds.insert(poFeature->GetFID());
+
+        if( soChangedIds.size() > static_cast<size_t>(poDS->GetBatchSize()) )
+        {
+            bNeedSyncData = true;
+        }
+
+        return SyncToDisk();
+    }
+    else
+    {
+        OGRErr eResult = SyncToDisk(); // For create new layer if not yet created.
+        if(eResult == OGRERR_NONE)
+        {
+            if(poFeature->GetFID() < 0)
+            {
+                CPLError(CE_Failure, CPLE_AppDefined, "Cannot update not exist feature #" CPL_FRMT_GIB, poFeature->GetFID());
+                return OGRERR_FAILURE;
+            }
+
+            bool bResult = NGWAPI::UpdateFeature(poDS->GetUrl(), osResourceId,
+                std::to_string(poFeature->GetFID()),
+                FeatureToJsonString(poFeature), poDS->GetHeaders());
+            if( bResult )
+            {
+                CPLDebug("NGW", "ISetFeature with FID #" CPL_FRMT_GIB, poFeature->GetFID());
+
+                OGRFeature::DestroyFeature( moFeatures[poFeature->GetFID()] );
+                moFeatures[poFeature->GetFID()] = poFeature->Clone();
+                return OGRERR_NONE;
+            }
+            else
+            {
+                // CPLError should be set in NGWAPI::UpdateFeature.
+                return OGRERR_FAILURE;
+            }
+        }
+        else
+        {
+            return eResult;
+        }
+    }
+}
+
+/*
+ * ICreateFeature()
+ */
+OGRErr OGRNGWLayer::ICreateFeature(OGRFeature *poFeature)
+{
+    if( poDS->IsBatchMode() )
+    {
+        GIntBig nNewFID = -1;
+        if( !soChangedIds.empty() )
+        {
+            nNewFID = *(soChangedIds.begin()) - 1;
+        }
+        poFeature->SetFID(nNewFID);
+        OGRFeature *poFeatureClone = poFeature->Clone();
+        moFeatures[nNewFID] = poFeatureClone;
+        soChangedIds.insert(nNewFID);
+        nFeatureCount++;
+
+        if( soChangedIds.size() > static_cast<size_t>(poDS->GetBatchSize()) )
+        {
+            bNeedSyncData = true;
+        }
+
+        return SyncToDisk();
+    }
+    else
+    {
+        OGRErr eResult = SyncToDisk(); // For create new layer if not yet created.
+        if(eResult == OGRERR_NONE)
+        {
+            GIntBig nNewFID = NGWAPI::CreateFeature(poDS->GetUrl(), osResourceId,
+                FeatureToJsonString(poFeature), poDS->GetHeaders());
+            if(nNewFID >= 0)
+            {
+                poFeature->SetFID(nNewFID);
+                OGRFeature *poFeatureClone = poFeature->Clone();
+                moFeatures[nNewFID] = poFeatureClone;
+                nFeatureCount++;
+                return OGRERR_NONE;
+            }
+            else
+            {
+                // CPLError should be set in NGWAPI::CreateFeature.
+                return OGRERR_FAILURE;
+            }
+        }
+        else
+        {
+            return eResult;
+        }
+    }
+}
diff --git a/gdal/ogr/ogrsf_frmts/ogr_formats.html b/gdal/ogr/ogrsf_frmts/ogr_formats.html
index 701898fe06c6..7f4230874875 100644
--- a/gdal/ogr/ogrsf_frmts/ogr_formats.html
+++ b/gdal/ogr/ogrsf_frmts/ogr_formats.html
@@ -431,6 +431,13 @@ <h1>OGR Vector Formats</h1>
 </td><td> No, needs libnetcdf
 </td></tr>
 
+<tr><td> <a href="drv_ngw.html">NextGIS Web</a>
+</td><td> NGW
+</td><td> Yes
+</td><td> Yes
+</td><td> No, needs libcurl
+</td></tr>
+
 <tr><td> <a href="drv_oci.html">Oracle Spatial</a>
 </td><td> OCI
 </td><td> Yes
diff --git a/gdal/ogr/ogrsf_frmts/ogrsf_frmts.h b/gdal/ogr/ogrsf_frmts/ogrsf_frmts.h
index 5edcbd129f4f..daefcca5133f 100644
--- a/gdal/ogr/ogrsf_frmts/ogrsf_frmts.h
+++ b/gdal/ogr/ogrsf_frmts/ogrsf_frmts.h
@@ -518,6 +518,7 @@ void CPL_DLL RegisterOGRMongoDB();
 void CPL_DLL RegisterOGRVDV();
 void CPL_DLL RegisterOGRGMLAS();
 void CPL_DLL RegisterOGRMVT();
+void CPL_DLL RegisterOGRNGW();
 // @endcond
 
 CPL_C_END
diff --git a/gdal/port/cpl_json.cpp b/gdal/port/cpl_json.cpp
index 5a4e450cd065..2fc5f4f36a38 100644
--- a/gdal/port/cpl_json.cpp
+++ b/gdal/port/cpl_json.cpp
@@ -344,11 +344,7 @@ bool CPLJSONDocument::LoadUrl(const std::string & /*osUrl*/, char ** /*papszOpti
                                               pfnProgress, pProgressArg,
                                               pWriteFunc, &ctx );
 
-    bool bResult = true;
-    if( psResult->nStatus != 0 /*CURLE_OK*/ )
-    {
-        bResult = false;
-    }
+    bool bResult = psResult->nStatus == 0 /*CURLE_OK*/ && psResult->pszErrBuf == nullptr;
 
     CPLHTTPDestroyResult( psResult );
 

From 3c9d711ae5392d4dfaf0f27d30434bfa76ab9312 Mon Sep 17 00:00:00 2001
From: Even Rouault <even.rouault@spatialys.com>
Date: Thu, 13 Dec 2018 11:05:36 +0100
Subject: [PATCH 166/488] vrt_read.py: fix duplicate method name

---
 autotest/gcore/vrt_read.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/autotest/gcore/vrt_read.py b/autotest/gcore/vrt_read.py
index ce86bb2961c0..c4eae46a790a 100755
--- a/autotest/gcore/vrt_read.py
+++ b/autotest/gcore/vrt_read.py
@@ -1200,7 +1200,7 @@ def test_vrt_invalid_srcrect():
     assert gdal.Open(vrt_text) is None
 
 
-def test_vrt_invalid_srcrect():
+def test_vrt_invalid_dstrect():
 
     vrt_text = """<VRTDataset rasterXSize="20" rasterYSize="20">
     <VRTRasterBand dataType="Byte" band="1">

From d248a5287e212c95d7174f784e2e5099f46d5b60 Mon Sep 17 00:00:00 2001
From: Craig de Stigter <craig.destigter@koordinates.com>
Date: Fri, 14 Dec 2018 10:08:53 +1300
Subject: [PATCH 167/488] Fix missing main block in a couple of test helper
 scripts.

Removed accidentally in 9412c2dbf8b37d031c09bc7d3389a40055993175
---
 autotest/gdrivers/netcdf_cfchecks.py | 8 ++++++++
 autotest/pymod/webserver.py          | 2 ++
 2 files changed, 10 insertions(+)

diff --git a/autotest/gdrivers/netcdf_cfchecks.py b/autotest/gdrivers/netcdf_cfchecks.py
index 01a5a28211ef..35a5e2b99264 100755
--- a/autotest/gdrivers/netcdf_cfchecks.py
+++ b/autotest/gdrivers/netcdf_cfchecks.py
@@ -2615,3 +2615,11 @@ def getargs(arglist):
 # Main Program
 # --------------------------
 
+if __name__ == '__main__':
+
+    (badc, coards, uploader, useFileName, standardName, areaTypes, udunitsDat, version, files) = getargs(sys.argv)
+
+    inst = CFChecker(uploader=uploader, useFileName=useFileName, badc=badc, coards=coards, cfStandardNamesXML=standardName, cfAreaTypesXML=areaTypes, udunitsDat=udunitsDat, version=version)
+    for f in files:
+        rc = inst.checker(f)
+        sys.exit(rc)
diff --git a/autotest/pymod/webserver.py b/autotest/pymod/webserver.py
index 7daf4e52df16..6af0022a7661 100644
--- a/autotest/pymod/webserver.py
+++ b/autotest/pymod/webserver.py
@@ -458,3 +458,5 @@ def main():
     server.run_server(10)
 
 
+if __name__ == '__main__':
+    main()

From 30250f784292af8d1f0ae95625b06ac482885d86 Mon Sep 17 00:00:00 2001
From: Craig de Stigter <craig.destigter@koordinates.com>
Date: Fri, 14 Dec 2018 10:16:24 +1300
Subject: [PATCH 168/488] Tests: Use '#!/usr/bin/env pytest' for test shebangs

Fixes OSGeo/gdal#1142

This means you can execute test files directly, like you could before
we were using pytest.

I very much doubt this works on Windows, unless (maybe?) you're using cygwin.
---
 autotest/alg/applyverticalshiftgrid.py        | 2 +-
 autotest/alg/contour.py                       | 2 +-
 autotest/alg/cutline.py                       | 2 +-
 autotest/alg/dither.py                        | 2 +-
 autotest/alg/polygonize.py                    | 2 +-
 autotest/alg/proximity.py                     | 2 +-
 autotest/alg/rasterize.py                     | 2 +-
 autotest/alg/reproject.py                     | 2 +-
 autotest/alg/sieve.py                         | 2 +-
 autotest/alg/tps.py                           | 2 +-
 autotest/alg/transformgeoloc.py               | 2 +-
 autotest/alg/warp.py                          | 2 +-
 autotest/gcore/aaigrid_read.py                | 2 +-
 autotest/gcore/aaigrid_write.py               | 2 +-
 autotest/gcore/asyncreader.py                 | 2 +-
 autotest/gcore/basic_test.py                  | 2 +-
 autotest/gcore/bmp_read.py                    | 2 +-
 autotest/gcore/bmp_write.py                   | 2 +-
 autotest/gcore/colortable.py                  | 2 +-
 autotest/gcore/envi_read.py                   | 2 +-
 autotest/gcore/gcps2geotransform.py           | 2 +-
 autotest/gcore/gdal_api_proxy.py              | 2 +-
 autotest/gcore/gdal_stats.py                  | 2 +-
 autotest/gcore/geoloc.py                      | 2 +-
 autotest/gcore/gtiff_write.py                 | 2 +-
 autotest/gcore/hdf4_read.py                   | 2 +-
 autotest/gcore/hdf4_write.py                  | 2 +-
 autotest/gcore/hfa_read.py                    | 2 +-
 autotest/gcore/hfa_rfc40.py                   | 2 +-
 autotest/gcore/hfa_srs.py                     | 2 +-
 autotest/gcore/hfa_write.py                   | 2 +-
 autotest/gcore/histogram.py                   | 2 +-
 autotest/gcore/identify.py                    | 2 +-
 autotest/gcore/mask.py                        | 2 +-
 autotest/gcore/minixml.py                     | 2 +-
 autotest/gcore/misc.py                        | 2 +-
 autotest/gcore/nodatamaskband.py              | 2 +-
 autotest/gcore/numpy_rw.py                    | 2 +-
 autotest/gcore/overviewds.py                  | 2 +-
 autotest/gcore/pam.py                         | 2 +-
 autotest/gcore/pixfun.py                      | 2 +-
 autotest/gcore/pnm_read.py                    | 2 +-
 autotest/gcore/pnm_write.py                   | 2 +-
 autotest/gcore/rasterio.py                    | 2 +-
 autotest/gcore/rat.py                         | 2 +-
 autotest/gcore/rfc30.py                       | 2 +-
 autotest/gcore/testnonboundtoswig.py          | 2 +-
 autotest/gcore/thread_test.py                 | 2 +-
 autotest/gcore/tiff_ovr.py                    | 2 +-
 autotest/gcore/tiff_read.py                   | 2 +-
 autotest/gcore/tiff_srs.py                    | 2 +-
 autotest/gcore/tiff_write.py                  | 2 +-
 autotest/gcore/transformer.py                 | 2 +-
 autotest/gcore/virtualmem.py                  | 2 +-
 autotest/gcore/vrt_read.py                    | 2 +-
 autotest/gcore/vrtmisc.py                     | 2 +-
 autotest/gcore/vsiaz.py                       | 2 +-
 autotest/gcore/vsicrypt.py                    | 2 +-
 autotest/gcore/vsicurl.py                     | 2 +-
 autotest/gcore/vsicurl_streaming.py           | 2 +-
 autotest/gcore/vsifile.py                     | 2 +-
 autotest/gcore/vsigs.py                       | 2 +-
 autotest/gcore/vsihdfs.py                     | 2 +-
 autotest/gcore/vsioss.py                      | 2 +-
 autotest/gcore/vsis3.py                       | 2 +-
 autotest/gcore/vsistdin.py                    | 2 +-
 autotest/gcore/vsiswift.py                    | 2 +-
 autotest/gcore/vsiwebhdfs.py                  | 2 +-
 autotest/gcore/vsizip.py                      | 2 +-
 autotest/gdrivers/aaigrid.py                  | 2 +-
 autotest/gdrivers/ace2.py                     | 2 +-
 autotest/gdrivers/adrg.py                     | 2 +-
 autotest/gdrivers/aigrid.py                   | 2 +-
 autotest/gdrivers/arg.py                      | 2 +-
 autotest/gdrivers/bag.py                      | 2 +-
 autotest/gdrivers/blx.py                      | 2 +-
 autotest/gdrivers/bsb.py                      | 2 +-
 autotest/gdrivers/bt.py                       | 2 +-
 autotest/gdrivers/byn.py                      | 2 +-
 autotest/gdrivers/cals.py                     | 2 +-
 autotest/gdrivers/ceos.py                     | 2 +-
 autotest/gdrivers/cpg.py                      | 2 +-
 autotest/gdrivers/ctg.py                      | 2 +-
 autotest/gdrivers/db2.py                      | 2 +-
 autotest/gdrivers/derived.py                  | 2 +-
 autotest/gdrivers/dimap.py                    | 2 +-
 autotest/gdrivers/dipex.py                    | 2 +-
 autotest/gdrivers/dods.py                     | 2 +-
 autotest/gdrivers/doq1.py                     | 2 +-
 autotest/gdrivers/doq2.py                     | 2 +-
 autotest/gdrivers/dted.py                     | 2 +-
 autotest/gdrivers/e00grid.py                  | 2 +-
 autotest/gdrivers/ecrgtoc.py                  | 2 +-
 autotest/gdrivers/ecw.py                      | 2 +-
 autotest/gdrivers/eedai.py                    | 2 +-
 autotest/gdrivers/ehdr.py                     | 2 +-
 autotest/gdrivers/eir.py                      | 2 +-
 autotest/gdrivers/elas.py                     | 2 +-
 autotest/gdrivers/envi.py                     | 2 +-
 autotest/gdrivers/envisat.py                  | 2 +-
 autotest/gdrivers/ers.py                      | 2 +-
 autotest/gdrivers/fast.py                     | 2 +-
 autotest/gdrivers/fit.py                      | 2 +-
 autotest/gdrivers/fits.py                     | 2 +-
 autotest/gdrivers/fujibas.py                  | 2 +-
 autotest/gdrivers/gdalhttp.py                 | 2 +-
 autotest/gdrivers/genbin.py                   | 2 +-
 autotest/gdrivers/georaster.py                | 2 +-
 autotest/gdrivers/gff.py                      | 2 +-
 autotest/gdrivers/gif.py                      | 2 +-
 autotest/gdrivers/gmt.py                      | 2 +-
 autotest/gdrivers/gpkg.py                     | 2 +-
 autotest/gdrivers/grass.py                    | 2 +-
 autotest/gdrivers/grassasciigrid.py           | 2 +-
 autotest/gdrivers/grib.py                     | 2 +-
 autotest/gdrivers/gsc.py                      | 2 +-
 autotest/gdrivers/gsg.py                      | 2 +-
 autotest/gdrivers/gta.py                      | 2 +-
 autotest/gdrivers/gtx.py                      | 2 +-
 autotest/gdrivers/gxf.py                      | 2 +-
 autotest/gdrivers/hdf5.py                     | 2 +-
 autotest/gdrivers/hf2.py                      | 2 +-
 autotest/gdrivers/hfa.py                      | 2 +-
 autotest/gdrivers/ida.py                      | 2 +-
 autotest/gdrivers/idrisi.py                   | 2 +-
 autotest/gdrivers/ignfheightasciigrid.py      | 2 +-
 autotest/gdrivers/ilwis.py                    | 2 +-
 autotest/gdrivers/ingr.py                     | 2 +-
 autotest/gdrivers/iris.py                     | 2 +-
 autotest/gdrivers/isce.py                     | 2 +-
 autotest/gdrivers/isis.py                     | 2 +-
 autotest/gdrivers/isis2.py                    | 2 +-
 autotest/gdrivers/jdem.py                     | 2 +-
 autotest/gdrivers/jp2kak.py                   | 2 +-
 autotest/gdrivers/jp2lura.py                  | 2 +-
 autotest/gdrivers/jp2metadata.py              | 2 +-
 autotest/gdrivers/jp2openjpeg.py              | 2 +-
 autotest/gdrivers/jpeg.py                     | 2 +-
 autotest/gdrivers/jpeg2000.py                 | 2 +-
 autotest/gdrivers/jpeg_profile.py             | 2 +-
 autotest/gdrivers/jpegls.py                   | 2 +-
 autotest/gdrivers/jpipkak.py                  | 2 +-
 autotest/gdrivers/kea.py                      | 2 +-
 autotest/gdrivers/kmlsuperoverlay.py          | 2 +-
 autotest/gdrivers/kro.py                      | 2 +-
 autotest/gdrivers/l1b.py                      | 2 +-
 autotest/gdrivers/lan.py                      | 2 +-
 autotest/gdrivers/lcp.py                      | 2 +-
 autotest/gdrivers/leveller.py                 | 2 +-
 autotest/gdrivers/loslas.py                   | 2 +-
 autotest/gdrivers/mbtiles.py                  | 2 +-
 autotest/gdrivers/mem.py                      | 2 +-
 autotest/gdrivers/mff.py                      | 2 +-
 autotest/gdrivers/mff2.py                     | 2 +-
 autotest/gdrivers/mg4lidar.py                 | 2 +-
 autotest/gdrivers/mrf.py                      | 2 +-
 autotest/gdrivers/mrsid.py                    | 2 +-
 autotest/gdrivers/ndf.py                      | 2 +-
 autotest/gdrivers/netcdf.py                   | 2 +-
 autotest/gdrivers/netcdf_cf.py                | 2 +-
 autotest/gdrivers/ngsgeoid.py                 | 2 +-
 autotest/gdrivers/ngw.py                      | 2 +-
 autotest/gdrivers/nitf.py                     | 2 +-
 autotest/gdrivers/ntv1.py                     | 2 +-
 autotest/gdrivers/ntv2.py                     | 2 +-
 autotest/gdrivers/nwt_grc.py                  | 2 +-
 autotest/gdrivers/nwt_grd.py                  | 2 +-
 autotest/gdrivers/ozi.py                      | 2 +-
 autotest/gdrivers/paux.py                     | 2 +-
 autotest/gdrivers/pcidsk.py                   | 2 +-
 autotest/gdrivers/pcraster.py                 | 2 +-
 autotest/gdrivers/pdf.py                      | 2 +-
 autotest/gdrivers/pds.py                      | 2 +-
 autotest/gdrivers/pds4.py                     | 2 +-
 autotest/gdrivers/plmosaic.py                 | 2 +-
 autotest/gdrivers/png.py                      | 2 +-
 autotest/gdrivers/png_profile.py              | 2 +-
 autotest/gdrivers/pnm.py                      | 2 +-
 autotest/gdrivers/postgisraster.py            | 2 +-
 autotest/gdrivers/prf.py                      | 2 +-
 autotest/gdrivers/r.py                        | 2 +-
 autotest/gdrivers/rasdaman.py                 | 2 +-
 autotest/gdrivers/rasterlite.py               | 2 +-
 autotest/gdrivers/rda.py                      | 2 +-
 autotest/gdrivers/rik.py                      | 2 +-
 autotest/gdrivers/rl2.py                      | 2 +-
 autotest/gdrivers/rmf.py                      | 2 +-
 autotest/gdrivers/roipac.py                   | 2 +-
 autotest/gdrivers/rpftoc.py                   | 2 +-
 autotest/gdrivers/rraster.py                  | 2 +-
 autotest/gdrivers/rs2.py                      | 2 +-
 autotest/gdrivers/safe.py                     | 2 +-
 autotest/gdrivers/saga.py                     | 2 +-
 autotest/gdrivers/sar_ceos.py                 | 2 +-
 autotest/gdrivers/sdts.py                     | 2 +-
 autotest/gdrivers/sentinel2.py                | 2 +-
 autotest/gdrivers/sgi.py                      | 2 +-
 autotest/gdrivers/sigdem.py                   | 2 +-
 autotest/gdrivers/snodas.py                   | 2 +-
 autotest/gdrivers/srp.py                      | 2 +-
 autotest/gdrivers/srtmhgt.py                  | 2 +-
 autotest/gdrivers/terragen.py                 | 2 +-
 autotest/gdrivers/test_validate_jp2.py        | 2 +-
 autotest/gdrivers/tiff_profile.py             | 2 +-
 autotest/gdrivers/til.py                      | 2 +-
 autotest/gdrivers/usgsdem.py                  | 2 +-
 autotest/gdrivers/vicar.py                    | 2 +-
 autotest/gdrivers/vrtderived.py               | 2 +-
 autotest/gdrivers/vrtfilt.py                  | 2 +-
 autotest/gdrivers/vrtlut.py                   | 2 +-
 autotest/gdrivers/vrtmask.py                  | 2 +-
 autotest/gdrivers/vrtovr.py                   | 2 +-
 autotest/gdrivers/vrtpansharpen.py            | 2 +-
 autotest/gdrivers/vrtrawlink.py               | 2 +-
 autotest/gdrivers/vrtwarp.py                  | 2 +-
 autotest/gdrivers/wcs.py                      | 2 +-
 autotest/gdrivers/webp.py                     | 2 +-
 autotest/gdrivers/wms.py                      | 2 +-
 autotest/gdrivers/wmts.py                     | 2 +-
 autotest/gdrivers/xmp.py                      | 2 +-
 autotest/gdrivers/xpm.py                      | 2 +-
 autotest/gdrivers/xyz.py                      | 2 +-
 autotest/gdrivers/zmap.py                     | 2 +-
 autotest/gnm/gnm_test.py                      | 2 +-
 autotest/kml_generate_test_files.py           | 2 +-
 autotest/ogr/ogr_arcgen.py                    | 2 +-
 autotest/ogr/ogr_avc.py                       | 2 +-
 autotest/ogr/ogr_basic_test.py                | 2 +-
 autotest/ogr/ogr_bna.py                       | 2 +-
 autotest/ogr/ogr_cad.py                       | 2 +-
 autotest/ogr/ogr_carto.py                     | 2 +-
 autotest/ogr/ogr_cloudant.py                  | 2 +-
 autotest/ogr/ogr_couchdb.py                   | 2 +-
 autotest/ogr/ogr_csv.py                       | 2 +-
 autotest/ogr/ogr_csw.py                       | 2 +-
 autotest/ogr/ogr_db2.py                       | 2 +-
 autotest/ogr/ogr_db2_hack.py                  | 2 +-
 autotest/ogr/ogr_dgn.py                       | 2 +-
 autotest/ogr/ogr_dgnv8.py                     | 2 +-
 autotest/ogr/ogr_dods.py                      | 2 +-
 autotest/ogr/ogr_dxf.py                       | 2 +-
 autotest/ogr/ogr_edigeo.py                    | 2 +-
 autotest/ogr/ogr_eeda.py                      | 2 +-
 autotest/ogr/ogr_elasticsearch.py             | 2 +-
 autotest/ogr/ogr_factory.py                   | 2 +-
 autotest/ogr/ogr_feature.py                   | 2 +-
 autotest/ogr/ogr_fgdb.py                      | 2 +-
 autotest/ogr/ogr_fgdb_stress_test.py          | 2 +-
 autotest/ogr/ogr_geoconcept.py                | 2 +-
 autotest/ogr/ogr_geojson.py                   | 2 +-
 autotest/ogr/ogr_geojsonseq.py                | 2 +-
 autotest/ogr/ogr_geom.py                      | 2 +-
 autotest/ogr/ogr_georss.py                    | 2 +-
 autotest/ogr/ogr_geos.py                      | 2 +-
 autotest/ogr/ogr_gft.py                       | 2 +-
 autotest/ogr/ogr_gml_fgd_read.py              | 2 +-
 autotest/ogr/ogr_gml_geom.py                  | 2 +-
 autotest/ogr/ogr_gml_read.py                  | 2 +-
 autotest/ogr/ogr_gmlas.py                     | 2 +-
 autotest/ogr/ogr_gmt.py                       | 2 +-
 autotest/ogr/ogr_gpkg.py                      | 2 +-
 autotest/ogr/ogr_gpsbabel.py                  | 2 +-
 autotest/ogr/ogr_gpx.py                       | 2 +-
 autotest/ogr/ogr_grass.py                     | 2 +-
 autotest/ogr/ogr_gtm.py                       | 2 +-
 autotest/ogr/ogr_htf.py                       | 2 +-
 autotest/ogr/ogr_idrisi.py                    | 2 +-
 autotest/ogr/ogr_ili.py                       | 2 +-
 autotest/ogr/ogr_index_test.py                | 2 +-
 autotest/ogr/ogr_ingres.py                    | 2 +-
 autotest/ogr/ogr_jml.py                       | 2 +-
 autotest/ogr/ogr_join_test.py                 | 2 +-
 autotest/ogr/ogr_kml.py                       | 2 +-
 autotest/ogr/ogr_layer_algebra.py             | 2 +-
 autotest/ogr/ogr_libkml.py                    | 2 +-
 autotest/ogr/ogr_mem.py                       | 2 +-
 autotest/ogr/ogr_mitab.py                     | 2 +-
 autotest/ogr/ogr_mongodb.py                   | 2 +-
 autotest/ogr/ogr_mssqlspatial.py              | 2 +-
 autotest/ogr/ogr_mvt.py                       | 2 +-
 autotest/ogr/ogr_mysql.py                     | 2 +-
 autotest/ogr/ogr_nas.py                       | 2 +-
 autotest/ogr/ogr_ngw.py                       | 2 +-
 autotest/ogr/ogr_ntf.py                       | 2 +-
 autotest/ogr/ogr_oci.py                       | 2 +-
 autotest/ogr/ogr_odbc.py                      | 2 +-
 autotest/ogr/ogr_ods.py                       | 2 +-
 autotest/ogr/ogr_ogdi.py                      | 2 +-
 autotest/ogr/ogr_openair.py                   | 2 +-
 autotest/ogr/ogr_openfilegdb.py               | 2 +-
 autotest/ogr/ogr_osm.py                       | 2 +-
 autotest/ogr/ogr_pcidsk.py                    | 2 +-
 autotest/ogr/ogr_pdf.py                       | 2 +-
 autotest/ogr/ogr_pds.py                       | 2 +-
 autotest/ogr/ogr_pg.py                        | 2 +-
 autotest/ogr/ogr_pgdump.py                    | 2 +-
 autotest/ogr/ogr_pgeo.py                      | 2 +-
 autotest/ogr/ogr_plscenes.py                  | 2 +-
 autotest/ogr/ogr_rec.py                       | 2 +-
 autotest/ogr/ogr_refcount.py                  | 2 +-
 autotest/ogr/ogr_rfc30.py                     | 2 +-
 autotest/ogr/ogr_rfc35_mem.py                 | 2 +-
 autotest/ogr/ogr_rfc35_mitab.py               | 2 +-
 autotest/ogr/ogr_rfc35_shape.py               | 2 +-
 autotest/ogr/ogr_rfc35_sqlite.py              | 2 +-
 autotest/ogr/ogr_rfc41.py                     | 2 +-
 autotest/ogr/ogr_s57.py                       | 2 +-
 autotest/ogr/ogr_sde.py                       | 2 +-
 autotest/ogr/ogr_sdts.py                      | 2 +-
 autotest/ogr/ogr_segukooa.py                  | 2 +-
 autotest/ogr/ogr_segy.py                      | 2 +-
 autotest/ogr/ogr_selafin.py                   | 2 +-
 autotest/ogr/ogr_shape.py                     | 2 +-
 autotest/ogr/ogr_shape_qix.py                 | 2 +-
 autotest/ogr/ogr_shape_sbn.py                 | 2 +-
 autotest/ogr/ogr_sosi.py                      | 2 +-
 autotest/ogr/ogr_sql_rfc28.py                 | 2 +-
 autotest/ogr/ogr_sql_sqlite.py                | 2 +-
 autotest/ogr/ogr_sql_test.py                  | 2 +-
 autotest/ogr/ogr_sqlite.py                    | 2 +-
 autotest/ogr/ogr_style.py                     | 2 +-
 autotest/ogr/ogr_sua.py                       | 2 +-
 autotest/ogr/ogr_svg.py                       | 2 +-
 autotest/ogr/ogr_sxf.py                       | 2 +-
 autotest/ogr/ogr_tiger.py                     | 2 +-
 autotest/ogr/ogr_vdv.py                       | 2 +-
 autotest/ogr/ogr_vfk.py                       | 2 +-
 autotest/ogr/ogr_virtualogr.py                | 2 +-
 autotest/ogr/ogr_vrt.py                       | 2 +-
 autotest/ogr/ogr_wasp.py                      | 2 +-
 autotest/ogr/ogr_wfs.py                       | 2 +-
 autotest/ogr/ogr_wfs3.py                      | 2 +-
 autotest/ogr/ogr_wkbwkt_geom.py               | 2 +-
 autotest/ogr/ogr_wktempty.py                  | 2 +-
 autotest/ogr/ogr_xls.py                       | 2 +-
 autotest/ogr/ogr_xlsx.py                      | 2 +-
 autotest/ogr/ogr_xplane.py                    | 2 +-
 autotest/ogr/ograpispy.py                     | 2 +-
 autotest/osr/osr_basic.py                     | 2 +-
 autotest/osr/osr_compd.py                     | 2 +-
 autotest/osr/osr_ct.py                        | 2 +-
 autotest/osr/osr_ct_proj.py                   | 2 +-
 autotest/osr/osr_epsg.py                      | 2 +-
 autotest/osr/osr_erm.py                       | 2 +-
 autotest/osr/osr_esri.py                      | 2 +-
 autotest/osr/osr_getprojectionmethods.py      | 2 +-
 autotest/osr/osr_metacrs.py                   | 2 +-
 autotest/osr/osr_micoordsys.py                | 2 +-
 autotest/osr/osr_ozi.py                       | 2 +-
 autotest/osr/osr_pci.py                       | 2 +-
 autotest/osr/osr_pm.py                        | 2 +-
 autotest/osr/osr_proj4.py                     | 2 +-
 autotest/osr/osr_url.py                       | 2 +-
 autotest/osr/osr_usgs.py                      | 2 +-
 autotest/osr/osr_validate.py                  | 2 +-
 autotest/osr/osr_xml.py                       | 2 +-
 autotest/pyscripts/test_gdal2tiles.py         | 2 +-
 autotest/pyscripts/test_gdal_calc.py          | 2 +-
 autotest/pyscripts/test_gdal_edit.py          | 2 +-
 autotest/pyscripts/test_gdal_fillnodata.py    | 2 +-
 autotest/pyscripts/test_gdal_ls_py.py         | 2 +-
 autotest/pyscripts/test_gdal_merge.py         | 2 +-
 autotest/pyscripts/test_gdal_pansharpen.py    | 2 +-
 autotest/pyscripts/test_gdal_polygonize.py    | 2 +-
 autotest/pyscripts/test_gdal_proximity.py     | 2 +-
 autotest/pyscripts/test_gdal_retile.py        | 2 +-
 autotest/pyscripts/test_gdal_sieve.py         | 2 +-
 autotest/pyscripts/test_gdalinfo_py.py        | 2 +-
 autotest/pyscripts/test_gdalmove.py           | 2 +-
 autotest/pyscripts/test_ogr2ogr_py.py         | 2 +-
 autotest/pyscripts/test_ogrinfo_py.py         | 2 +-
 autotest/pyscripts/test_ogrmerge.py           | 2 +-
 autotest/pyscripts/test_rgb2pct.py            | 2 +-
 autotest/utilities/test_gdal_contour.py       | 2 +-
 autotest/utilities/test_gdal_grid.py          | 2 +-
 autotest/utilities/test_gdal_grid_lib.py      | 2 +-
 autotest/utilities/test_gdal_rasterize.py     | 2 +-
 autotest/utilities/test_gdal_rasterize_lib.py | 2 +-
 autotest/utilities/test_gdal_translate.py     | 2 +-
 autotest/utilities/test_gdal_translate_lib.py | 2 +-
 autotest/utilities/test_gdaladdo.py           | 2 +-
 autotest/utilities/test_gdalbuildvrt.py       | 2 +-
 autotest/utilities/test_gdalbuildvrt_lib.py   | 2 +-
 autotest/utilities/test_gdaldem.py            | 2 +-
 autotest/utilities/test_gdaldem_lib.py        | 2 +-
 autotest/utilities/test_gdalinfo.py           | 2 +-
 autotest/utilities/test_gdalinfo_lib.py       | 2 +-
 autotest/utilities/test_gdallocationinfo.py   | 2 +-
 autotest/utilities/test_gdalsrsinfo.py        | 2 +-
 autotest/utilities/test_gdaltindex.py         | 2 +-
 autotest/utilities/test_gdaltransform.py      | 2 +-
 autotest/utilities/test_gdalwarp.py           | 2 +-
 autotest/utilities/test_gdalwarp_lib.py       | 2 +-
 autotest/utilities/test_gnmutils.py           | 2 +-
 autotest/utilities/test_nearblack.py          | 2 +-
 autotest/utilities/test_nearblack_lib.py      | 2 +-
 autotest/utilities/test_ogr2ogr.py            | 2 +-
 autotest/utilities/test_ogr2ogr_lib.py        | 2 +-
 autotest/utilities/test_ogrinfo.py            | 2 +-
 autotest/utilities/test_ogrlineref.py         | 2 +-
 autotest/utilities/test_ogrtindex.py          | 2 +-
 401 files changed, 401 insertions(+), 401 deletions(-)

diff --git a/autotest/alg/applyverticalshiftgrid.py b/autotest/alg/applyverticalshiftgrid.py
index 688c69c622bc..ef12b084a343 100755
--- a/autotest/alg/applyverticalshiftgrid.py
+++ b/autotest/alg/applyverticalshiftgrid.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env pytest
 # -*- coding: utf-8 -*-
 ###############################################################################
 # $Id$
diff --git a/autotest/alg/contour.py b/autotest/alg/contour.py
index 8092a7a0fe0e..ff92fdff9069 100755
--- a/autotest/alg/contour.py
+++ b/autotest/alg/contour.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env pytest
 ###############################################################################
 # $Id$
 #
diff --git a/autotest/alg/cutline.py b/autotest/alg/cutline.py
index 8dc96d8b263a..138b9c76e4fb 100755
--- a/autotest/alg/cutline.py
+++ b/autotest/alg/cutline.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env pytest
 ###############################################################################
 # $Id$
 #
diff --git a/autotest/alg/dither.py b/autotest/alg/dither.py
index 6233f6399c5a..d62414889d8e 100755
--- a/autotest/alg/dither.py
+++ b/autotest/alg/dither.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env pytest
 ###############################################################################
 # $Id$
 #
diff --git a/autotest/alg/polygonize.py b/autotest/alg/polygonize.py
index 41bc879ba4ff..bbc2f2dde917 100755
--- a/autotest/alg/polygonize.py
+++ b/autotest/alg/polygonize.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env pytest
 ###############################################################################
 # $Id$
 #
diff --git a/autotest/alg/proximity.py b/autotest/alg/proximity.py
index ba1f98c5c40c..d6bb761b7653 100755
--- a/autotest/alg/proximity.py
+++ b/autotest/alg/proximity.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env pytest
 ###############################################################################
 # $Id$
 #
diff --git a/autotest/alg/rasterize.py b/autotest/alg/rasterize.py
index 19a0cc67c42d..f15b2acc7747 100755
--- a/autotest/alg/rasterize.py
+++ b/autotest/alg/rasterize.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env pytest
 ###############################################################################
 # $Id$
 #
diff --git a/autotest/alg/reproject.py b/autotest/alg/reproject.py
index 24f34cb24e95..844d5103443b 100755
--- a/autotest/alg/reproject.py
+++ b/autotest/alg/reproject.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env pytest
 # -*- coding: utf-8 -*-
 ###############################################################################
 # $Id$
diff --git a/autotest/alg/sieve.py b/autotest/alg/sieve.py
index 154b7532ddc1..3dfb61b07c98 100755
--- a/autotest/alg/sieve.py
+++ b/autotest/alg/sieve.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env pytest
 ###############################################################################
 # $Id$
 #
diff --git a/autotest/alg/tps.py b/autotest/alg/tps.py
index 426fff879d3c..5efd6da6417f 100755
--- a/autotest/alg/tps.py
+++ b/autotest/alg/tps.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env pytest
 # -*- coding: utf-8 -*-
 ###############################################################################
 # $Id$
diff --git a/autotest/alg/transformgeoloc.py b/autotest/alg/transformgeoloc.py
index 34b43e40cc4a..b46bb9d3d1ef 100755
--- a/autotest/alg/transformgeoloc.py
+++ b/autotest/alg/transformgeoloc.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env pytest
 # -*- coding: utf-8 -*-
 ###############################################################################
 # $Id$
diff --git a/autotest/alg/warp.py b/autotest/alg/warp.py
index 2f03746e51c1..72902b45c4b5 100755
--- a/autotest/alg/warp.py
+++ b/autotest/alg/warp.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env pytest
 # -*- coding: utf-8 -*-
 ###############################################################################
 # $Id$
diff --git a/autotest/gcore/aaigrid_read.py b/autotest/gcore/aaigrid_read.py
index fe3adea4a01a..ea769b3fff98 100755
--- a/autotest/gcore/aaigrid_read.py
+++ b/autotest/gcore/aaigrid_read.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env pytest
 ###############################################################################
 # $Id$
 #
diff --git a/autotest/gcore/aaigrid_write.py b/autotest/gcore/aaigrid_write.py
index 5a3b784cb83b..e840e526de6a 100755
--- a/autotest/gcore/aaigrid_write.py
+++ b/autotest/gcore/aaigrid_write.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env pytest
 ###############################################################################
 # $Id$
 #
diff --git a/autotest/gcore/asyncreader.py b/autotest/gcore/asyncreader.py
index 9c855b148102..fec3e702a6ba 100755
--- a/autotest/gcore/asyncreader.py
+++ b/autotest/gcore/asyncreader.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env pytest
 ###############################################################################
 # $Id$
 #
diff --git a/autotest/gcore/basic_test.py b/autotest/gcore/basic_test.py
index 920deba2e46f..120d38584e3b 100755
--- a/autotest/gcore/basic_test.py
+++ b/autotest/gcore/basic_test.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env pytest
 # -*- coding: utf-8 -*-
 ###############################################################################
 # $Id$
diff --git a/autotest/gcore/bmp_read.py b/autotest/gcore/bmp_read.py
index 84b656523ec8..135099a3572f 100755
--- a/autotest/gcore/bmp_read.py
+++ b/autotest/gcore/bmp_read.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env pytest
 ###############################################################################
 # $Id$
 #
diff --git a/autotest/gcore/bmp_write.py b/autotest/gcore/bmp_write.py
index b996dce49cc7..6376aa4215e1 100755
--- a/autotest/gcore/bmp_write.py
+++ b/autotest/gcore/bmp_write.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env pytest
 ###############################################################################
 # $Id$
 #
diff --git a/autotest/gcore/colortable.py b/autotest/gcore/colortable.py
index a0d7c9438b81..1e43f201b098 100755
--- a/autotest/gcore/colortable.py
+++ b/autotest/gcore/colortable.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env pytest
 ###############################################################################
 # $Id$
 #
diff --git a/autotest/gcore/envi_read.py b/autotest/gcore/envi_read.py
index b49bd4cc51d4..ed3d4f621bc8 100755
--- a/autotest/gcore/envi_read.py
+++ b/autotest/gcore/envi_read.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env pytest
 ###############################################################################
 # $Id$
 #
diff --git a/autotest/gcore/gcps2geotransform.py b/autotest/gcore/gcps2geotransform.py
index 2cb6e25e92c5..33c5f63c9607 100755
--- a/autotest/gcore/gcps2geotransform.py
+++ b/autotest/gcore/gcps2geotransform.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env pytest
 # -*- coding: utf-8 -*-
 ###############################################################################
 # $Id: misc.py 26369 2013-08-25 19:48:28Z goatbar $
diff --git a/autotest/gcore/gdal_api_proxy.py b/autotest/gcore/gdal_api_proxy.py
index a0708896dffe..6398cee5fc88 100755
--- a/autotest/gcore/gdal_api_proxy.py
+++ b/autotest/gcore/gdal_api_proxy.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env pytest
 # -*- coding: utf-8 -*-
 ###############################################################################
 # $Id$
diff --git a/autotest/gcore/gdal_stats.py b/autotest/gcore/gdal_stats.py
index 7619d97db01d..7bd03155fa4a 100755
--- a/autotest/gcore/gdal_stats.py
+++ b/autotest/gcore/gdal_stats.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env pytest
 # -*- coding: utf-8 -*-
 ###############################################################################
 # $Id$
diff --git a/autotest/gcore/geoloc.py b/autotest/gcore/geoloc.py
index 94991b0f34d4..9fee062a970a 100755
--- a/autotest/gcore/geoloc.py
+++ b/autotest/gcore/geoloc.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env pytest
 # -*- coding: utf-8 -*-
 ###############################################################################
 # $Id$
diff --git a/autotest/gcore/gtiff_write.py b/autotest/gcore/gtiff_write.py
index bf7f7a887229..92e4a1b07acc 100755
--- a/autotest/gcore/gtiff_write.py
+++ b/autotest/gcore/gtiff_write.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env pytest
 ###############################################################################
 # $Id$
 #
diff --git a/autotest/gcore/hdf4_read.py b/autotest/gcore/hdf4_read.py
index 8dfa67bc6723..4a1110891294 100755
--- a/autotest/gcore/hdf4_read.py
+++ b/autotest/gcore/hdf4_read.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env pytest
 ###############################################################################
 # $Id$
 #
diff --git a/autotest/gcore/hdf4_write.py b/autotest/gcore/hdf4_write.py
index e46cfdc2bf8e..476d31fe20d3 100755
--- a/autotest/gcore/hdf4_write.py
+++ b/autotest/gcore/hdf4_write.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env pytest
 ###############################################################################
 # $Id$
 #
diff --git a/autotest/gcore/hfa_read.py b/autotest/gcore/hfa_read.py
index 2d0a2454fef1..43f2dd6e9070 100755
--- a/autotest/gcore/hfa_read.py
+++ b/autotest/gcore/hfa_read.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env pytest
 ###############################################################################
 # $Id$
 #
diff --git a/autotest/gcore/hfa_rfc40.py b/autotest/gcore/hfa_rfc40.py
index 223c993ea9b1..a71596a9eec0 100755
--- a/autotest/gcore/hfa_rfc40.py
+++ b/autotest/gcore/hfa_rfc40.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env pytest
 # -*- coding: utf-8 -*-
 ###############################################################################
 # $Id$
diff --git a/autotest/gcore/hfa_srs.py b/autotest/gcore/hfa_srs.py
index 49ba42295436..521aff6f4eed 100755
--- a/autotest/gcore/hfa_srs.py
+++ b/autotest/gcore/hfa_srs.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env pytest
 ###############################################################################
 # $Id$
 #
diff --git a/autotest/gcore/hfa_write.py b/autotest/gcore/hfa_write.py
index fccc657e2a7d..9afcb05fec6d 100755
--- a/autotest/gcore/hfa_write.py
+++ b/autotest/gcore/hfa_write.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env pytest
 # -*- coding: utf-8 -*-
 ###############################################################################
 # $Id$
diff --git a/autotest/gcore/histogram.py b/autotest/gcore/histogram.py
index d4c6293db7c7..da3a36342b47 100755
--- a/autotest/gcore/histogram.py
+++ b/autotest/gcore/histogram.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env pytest
 ###############################################################################
 # $Id: colortable.py 11065 2007-03-24 09:35:32Z mloskot $
 #
diff --git a/autotest/gcore/identify.py b/autotest/gcore/identify.py
index 6557097d9356..1cfaf5bec0d4 100755
--- a/autotest/gcore/identify.py
+++ b/autotest/gcore/identify.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env pytest
 ###############################################################################
 # $Id$
 #
diff --git a/autotest/gcore/mask.py b/autotest/gcore/mask.py
index bd47f9b81eb7..345bc454a299 100755
--- a/autotest/gcore/mask.py
+++ b/autotest/gcore/mask.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env pytest
 ###############################################################################
 # $Id$
 #
diff --git a/autotest/gcore/minixml.py b/autotest/gcore/minixml.py
index bcd68f411e6c..cadb2521bc09 100755
--- a/autotest/gcore/minixml.py
+++ b/autotest/gcore/minixml.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env pytest
 ###############################################################################
 # $Id$
 #
diff --git a/autotest/gcore/misc.py b/autotest/gcore/misc.py
index 32c5d1a2ff80..3168805841e9 100755
--- a/autotest/gcore/misc.py
+++ b/autotest/gcore/misc.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env pytest
 # -*- coding: utf-8 -*-
 ###############################################################################
 # $Id$
diff --git a/autotest/gcore/nodatamaskband.py b/autotest/gcore/nodatamaskband.py
index 7436a5c582ea..7c8967e6dbdf 100755
--- a/autotest/gcore/nodatamaskband.py
+++ b/autotest/gcore/nodatamaskband.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env pytest
 # -*- coding: utf-8 -*-
 ###############################################################################
 # $Id$
diff --git a/autotest/gcore/numpy_rw.py b/autotest/gcore/numpy_rw.py
index 342560f7c8c7..a180429fa698 100755
--- a/autotest/gcore/numpy_rw.py
+++ b/autotest/gcore/numpy_rw.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env pytest
 ###############################################################################
 # $Id$
 #
diff --git a/autotest/gcore/overviewds.py b/autotest/gcore/overviewds.py
index c41456804bea..03cea645cb82 100755
--- a/autotest/gcore/overviewds.py
+++ b/autotest/gcore/overviewds.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env pytest
 # -*- coding: utf-8 -*-
 ###############################################################################
 # $Id$
diff --git a/autotest/gcore/pam.py b/autotest/gcore/pam.py
index 4ce32c6b287c..470c29c80ad5 100755
--- a/autotest/gcore/pam.py
+++ b/autotest/gcore/pam.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env pytest
 # -*- coding: utf-8 -*-
 ###############################################################################
 # $Id$
diff --git a/autotest/gcore/pixfun.py b/autotest/gcore/pixfun.py
index f7ca48f3be41..5ca80c797b88 100755
--- a/autotest/gcore/pixfun.py
+++ b/autotest/gcore/pixfun.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env pytest
 ###############################################################################
 # $Id$
 #
diff --git a/autotest/gcore/pnm_read.py b/autotest/gcore/pnm_read.py
index c5d8ab41cb24..fa2d5da240b6 100755
--- a/autotest/gcore/pnm_read.py
+++ b/autotest/gcore/pnm_read.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env pytest
 ###############################################################################
 # $Id$
 #
diff --git a/autotest/gcore/pnm_write.py b/autotest/gcore/pnm_write.py
index 3f8fb0e01f63..7431824a6476 100755
--- a/autotest/gcore/pnm_write.py
+++ b/autotest/gcore/pnm_write.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env pytest
 ###############################################################################
 # $Id$
 #
diff --git a/autotest/gcore/rasterio.py b/autotest/gcore/rasterio.py
index e6ee3b191e7c..8f362ec410df 100755
--- a/autotest/gcore/rasterio.py
+++ b/autotest/gcore/rasterio.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env pytest
 # -*- coding: utf-8 -*-
 ###############################################################################
 # $Id$
diff --git a/autotest/gcore/rat.py b/autotest/gcore/rat.py
index 9ec0499ce279..8e288a84ea0b 100755
--- a/autotest/gcore/rat.py
+++ b/autotest/gcore/rat.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env pytest
 # -*- coding: utf-8 -*-
 ###############################################################################
 # $Id$
diff --git a/autotest/gcore/rfc30.py b/autotest/gcore/rfc30.py
index f4b9706a21b6..15f3adea60c5 100755
--- a/autotest/gcore/rfc30.py
+++ b/autotest/gcore/rfc30.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env pytest
 ###############################################################################
 # $Id$
 #
diff --git a/autotest/gcore/testnonboundtoswig.py b/autotest/gcore/testnonboundtoswig.py
index 2ee689177b73..6eb42db75ac3 100755
--- a/autotest/gcore/testnonboundtoswig.py
+++ b/autotest/gcore/testnonboundtoswig.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env pytest
 # -*- coding: utf-8 -*-
 ###############################################################################
 # $Id$
diff --git a/autotest/gcore/thread_test.py b/autotest/gcore/thread_test.py
index c4ebd7b82f42..d1966de7f7c3 100755
--- a/autotest/gcore/thread_test.py
+++ b/autotest/gcore/thread_test.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env pytest
 # -*- coding: utf-8 -*-
 ###############################################################################
 # $Id$
diff --git a/autotest/gcore/tiff_ovr.py b/autotest/gcore/tiff_ovr.py
index 1a672e9cbdd3..9feb07c0f68d 100755
--- a/autotest/gcore/tiff_ovr.py
+++ b/autotest/gcore/tiff_ovr.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env pytest
 # -*- coding: utf-8 -*-
 ###############################################################################
 # $Id$
diff --git a/autotest/gcore/tiff_read.py b/autotest/gcore/tiff_read.py
index c14fd3bd9c24..a237b10a5afd 100755
--- a/autotest/gcore/tiff_read.py
+++ b/autotest/gcore/tiff_read.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env pytest
 # -*- coding: utf-8 -*-
 ###############################################################################
 # $Id$
diff --git a/autotest/gcore/tiff_srs.py b/autotest/gcore/tiff_srs.py
index 6180338270ad..9e51fbda6c6a 100755
--- a/autotest/gcore/tiff_srs.py
+++ b/autotest/gcore/tiff_srs.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env pytest
 ###############################################################################
 # $Id$
 #
diff --git a/autotest/gcore/tiff_write.py b/autotest/gcore/tiff_write.py
index 4bf0414cd734..f6b96e89efbd 100755
--- a/autotest/gcore/tiff_write.py
+++ b/autotest/gcore/tiff_write.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env pytest
 # -*- coding: utf-8 -*-
 ###############################################################################
 # $Id$
diff --git a/autotest/gcore/transformer.py b/autotest/gcore/transformer.py
index 162434a3b980..a83e820810ae 100755
--- a/autotest/gcore/transformer.py
+++ b/autotest/gcore/transformer.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env pytest
 # -*- coding: utf-8 -*-
 ###############################################################################
 # $Id$
diff --git a/autotest/gcore/virtualmem.py b/autotest/gcore/virtualmem.py
index cf8f40ff75a5..b64857b9a7bb 100755
--- a/autotest/gcore/virtualmem.py
+++ b/autotest/gcore/virtualmem.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env pytest
 # -*- coding: utf-8 -*-
 ###############################################################################
 # $Id$
diff --git a/autotest/gcore/vrt_read.py b/autotest/gcore/vrt_read.py
index c4eae46a790a..a62f644a827d 100755
--- a/autotest/gcore/vrt_read.py
+++ b/autotest/gcore/vrt_read.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env pytest
 # -*- coding: utf-8 -*-
 ###############################################################################
 # $Id$
diff --git a/autotest/gcore/vrtmisc.py b/autotest/gcore/vrtmisc.py
index 51b1a3864856..483c29497fd0 100755
--- a/autotest/gcore/vrtmisc.py
+++ b/autotest/gcore/vrtmisc.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env pytest
 # -*- coding: utf-8 -*-
 ###############################################################################
 # $Id$
diff --git a/autotest/gcore/vsiaz.py b/autotest/gcore/vsiaz.py
index 0601e0cdbd31..052325966be1 100755
--- a/autotest/gcore/vsiaz.py
+++ b/autotest/gcore/vsiaz.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env pytest
 ###############################################################################
 # $Id$
 #
diff --git a/autotest/gcore/vsicrypt.py b/autotest/gcore/vsicrypt.py
index 7bab69755c65..da5896634247 100755
--- a/autotest/gcore/vsicrypt.py
+++ b/autotest/gcore/vsicrypt.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env pytest
 # -*- coding: utf-8 -*-
 ###############################################################################
 # $Id$
diff --git a/autotest/gcore/vsicurl.py b/autotest/gcore/vsicurl.py
index a85b19a191ef..c808ffd4c686 100755
--- a/autotest/gcore/vsicurl.py
+++ b/autotest/gcore/vsicurl.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env pytest
 ###############################################################################
 # $Id$
 #
diff --git a/autotest/gcore/vsicurl_streaming.py b/autotest/gcore/vsicurl_streaming.py
index 089b5a138ccc..9594b1a7234e 100755
--- a/autotest/gcore/vsicurl_streaming.py
+++ b/autotest/gcore/vsicurl_streaming.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env pytest
 ###############################################################################
 # $Id$
 #
diff --git a/autotest/gcore/vsifile.py b/autotest/gcore/vsifile.py
index e202c856885d..e44ace96787b 100755
--- a/autotest/gcore/vsifile.py
+++ b/autotest/gcore/vsifile.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env pytest
 # -*- coding: utf-8 -*-
 ###############################################################################
 # $Id$
diff --git a/autotest/gcore/vsigs.py b/autotest/gcore/vsigs.py
index 1aa54244159a..c80d4b0657fc 100755
--- a/autotest/gcore/vsigs.py
+++ b/autotest/gcore/vsigs.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env pytest
 ###############################################################################
 # $Id$
 #
diff --git a/autotest/gcore/vsihdfs.py b/autotest/gcore/vsihdfs.py
index 369e4896401e..3f5d704307e0 100755
--- a/autotest/gcore/vsihdfs.py
+++ b/autotest/gcore/vsihdfs.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env pytest
 # -*- coding: utf-8 -*-
 ###############################################################################
 # $Id$
diff --git a/autotest/gcore/vsioss.py b/autotest/gcore/vsioss.py
index 633c8329b569..168dee4bcfc2 100755
--- a/autotest/gcore/vsioss.py
+++ b/autotest/gcore/vsioss.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env pytest
 ###############################################################################
 # $Id$
 #
diff --git a/autotest/gcore/vsis3.py b/autotest/gcore/vsis3.py
index 4d72f4aaca24..65e8e46c547a 100755
--- a/autotest/gcore/vsis3.py
+++ b/autotest/gcore/vsis3.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env pytest
 ###############################################################################
 # $Id$
 #
diff --git a/autotest/gcore/vsistdin.py b/autotest/gcore/vsistdin.py
index aefa24aa442b..1e7a49e014c3 100755
--- a/autotest/gcore/vsistdin.py
+++ b/autotest/gcore/vsistdin.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env pytest
 ###############################################################################
 # $Id$
 #
diff --git a/autotest/gcore/vsiswift.py b/autotest/gcore/vsiswift.py
index 7871b3a164ac..c04999c3c928 100644
--- a/autotest/gcore/vsiswift.py
+++ b/autotest/gcore/vsiswift.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env pytest
 ###############################################################################
 # $Id$
 #
diff --git a/autotest/gcore/vsiwebhdfs.py b/autotest/gcore/vsiwebhdfs.py
index 2789283aac1a..c451474b81e0 100644
--- a/autotest/gcore/vsiwebhdfs.py
+++ b/autotest/gcore/vsiwebhdfs.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env pytest
 ###############################################################################
 # $Id$
 #
diff --git a/autotest/gcore/vsizip.py b/autotest/gcore/vsizip.py
index e96d0a7b7f87..40085321e5ec 100755
--- a/autotest/gcore/vsizip.py
+++ b/autotest/gcore/vsizip.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env pytest
 # -*- coding: utf-8 -*-
 ###############################################################################
 # $Id$
diff --git a/autotest/gdrivers/aaigrid.py b/autotest/gdrivers/aaigrid.py
index 1f8af1a269bc..617ff461f23f 100755
--- a/autotest/gdrivers/aaigrid.py
+++ b/autotest/gdrivers/aaigrid.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env pytest
 # -*- coding: utf-8 -*-
 ###############################################################################
 # $Id$
diff --git a/autotest/gdrivers/ace2.py b/autotest/gdrivers/ace2.py
index b0c22425203a..39763afbc456 100755
--- a/autotest/gdrivers/ace2.py
+++ b/autotest/gdrivers/ace2.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env pytest
 ###############################################################################
 # $Id$
 #
diff --git a/autotest/gdrivers/adrg.py b/autotest/gdrivers/adrg.py
index 7eaaa7de946f..412812139e90 100755
--- a/autotest/gdrivers/adrg.py
+++ b/autotest/gdrivers/adrg.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env pytest
 ###############################################################################
 # $Id$
 #
diff --git a/autotest/gdrivers/aigrid.py b/autotest/gdrivers/aigrid.py
index 008986f0074a..7ec530f42a88 100755
--- a/autotest/gdrivers/aigrid.py
+++ b/autotest/gdrivers/aigrid.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env pytest
 ###############################################################################
 # $Id$
 #
diff --git a/autotest/gdrivers/arg.py b/autotest/gdrivers/arg.py
index 16ae26c85a9d..5f089f3b0d54 100755
--- a/autotest/gdrivers/arg.py
+++ b/autotest/gdrivers/arg.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env pytest
 ###############################################################################
 # $Id$
 #
diff --git a/autotest/gdrivers/bag.py b/autotest/gdrivers/bag.py
index ecc8d4a3f942..10c1d0b141cc 100755
--- a/autotest/gdrivers/bag.py
+++ b/autotest/gdrivers/bag.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env pytest
 # -*- coding: utf-8 -*-
 ###############################################################################
 # $Id$
diff --git a/autotest/gdrivers/blx.py b/autotest/gdrivers/blx.py
index 0dfff762bc68..8223b92e1f9b 100755
--- a/autotest/gdrivers/blx.py
+++ b/autotest/gdrivers/blx.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env pytest
 ###############################################################################
 # $Id$
 #
diff --git a/autotest/gdrivers/bsb.py b/autotest/gdrivers/bsb.py
index 264c2341d8d4..b96ad0e8a3b8 100755
--- a/autotest/gdrivers/bsb.py
+++ b/autotest/gdrivers/bsb.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env pytest
 ###############################################################################
 # $Id$
 #
diff --git a/autotest/gdrivers/bt.py b/autotest/gdrivers/bt.py
index e2d38950b829..b23c6c3f3fe7 100755
--- a/autotest/gdrivers/bt.py
+++ b/autotest/gdrivers/bt.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env pytest
 ###############################################################################
 # $Id$
 #
diff --git a/autotest/gdrivers/byn.py b/autotest/gdrivers/byn.py
index 7fe9add179fd..4d45310dd1a9 100755
--- a/autotest/gdrivers/byn.py
+++ b/autotest/gdrivers/byn.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env pytest
 # -*- coding: utf-8 -*-
 ###############################################################################
 # $Id$
diff --git a/autotest/gdrivers/cals.py b/autotest/gdrivers/cals.py
index 678928086e1c..0dc938bca2b3 100755
--- a/autotest/gdrivers/cals.py
+++ b/autotest/gdrivers/cals.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env pytest
 ###############################################################################
 # $Id$
 #
diff --git a/autotest/gdrivers/ceos.py b/autotest/gdrivers/ceos.py
index 0b2f316002f6..71c67154b377 100755
--- a/autotest/gdrivers/ceos.py
+++ b/autotest/gdrivers/ceos.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env pytest
 ###############################################################################
 # $Id$
 #
diff --git a/autotest/gdrivers/cpg.py b/autotest/gdrivers/cpg.py
index 4c44e203a934..2466af585cfe 100755
--- a/autotest/gdrivers/cpg.py
+++ b/autotest/gdrivers/cpg.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env pytest
 ###############################################################################
 # $Id$
 #
diff --git a/autotest/gdrivers/ctg.py b/autotest/gdrivers/ctg.py
index 8322fc51f677..b8e93e6aa055 100755
--- a/autotest/gdrivers/ctg.py
+++ b/autotest/gdrivers/ctg.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env pytest
 ###############################################################################
 # $Id$
 #
diff --git a/autotest/gdrivers/db2.py b/autotest/gdrivers/db2.py
index 6806ac8b5512..ac62d8139e99 100755
--- a/autotest/gdrivers/db2.py
+++ b/autotest/gdrivers/db2.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env pytest
 # -*- coding: utf-8 -*-
 ###############################################################################
 #
diff --git a/autotest/gdrivers/derived.py b/autotest/gdrivers/derived.py
index 2a470ffb3587..1841c8a92f77 100755
--- a/autotest/gdrivers/derived.py
+++ b/autotest/gdrivers/derived.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env pytest
 ###############################################################################
 # $Id$
 #
diff --git a/autotest/gdrivers/dimap.py b/autotest/gdrivers/dimap.py
index d083c2cc34a4..237be6a6b0ae 100755
--- a/autotest/gdrivers/dimap.py
+++ b/autotest/gdrivers/dimap.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env pytest
 ###############################################################################
 # $Id$
 #
diff --git a/autotest/gdrivers/dipex.py b/autotest/gdrivers/dipex.py
index b4ebd39f645e..3ae1be8d754f 100755
--- a/autotest/gdrivers/dipex.py
+++ b/autotest/gdrivers/dipex.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env pytest
 ###############################################################################
 # $Id$
 #
diff --git a/autotest/gdrivers/dods.py b/autotest/gdrivers/dods.py
index 8ef21f59dc70..5f01883fcb20 100755
--- a/autotest/gdrivers/dods.py
+++ b/autotest/gdrivers/dods.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env pytest
 ###############################################################################
 # $Id$
 #
diff --git a/autotest/gdrivers/doq1.py b/autotest/gdrivers/doq1.py
index 3a9d448275ac..31d2af518ccf 100755
--- a/autotest/gdrivers/doq1.py
+++ b/autotest/gdrivers/doq1.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env pytest
 ###############################################################################
 # $Id$
 #
diff --git a/autotest/gdrivers/doq2.py b/autotest/gdrivers/doq2.py
index 33aafd26f129..e1f587ea0545 100755
--- a/autotest/gdrivers/doq2.py
+++ b/autotest/gdrivers/doq2.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env pytest
 ###############################################################################
 # $Id$
 #
diff --git a/autotest/gdrivers/dted.py b/autotest/gdrivers/dted.py
index 67190c9dcaeb..f94851f476d2 100755
--- a/autotest/gdrivers/dted.py
+++ b/autotest/gdrivers/dted.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env pytest
 # -*- coding: utf-8 -*-
 ###############################################################################
 # $Id$
diff --git a/autotest/gdrivers/e00grid.py b/autotest/gdrivers/e00grid.py
index b80797229e63..431074a83bfc 100755
--- a/autotest/gdrivers/e00grid.py
+++ b/autotest/gdrivers/e00grid.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env pytest
 ###############################################################################
 # $Id$
 #
diff --git a/autotest/gdrivers/ecrgtoc.py b/autotest/gdrivers/ecrgtoc.py
index cd8b9181ecdc..5de9ccf8bf5c 100755
--- a/autotest/gdrivers/ecrgtoc.py
+++ b/autotest/gdrivers/ecrgtoc.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env pytest
 ###############################################################################
 # $Id$
 #
diff --git a/autotest/gdrivers/ecw.py b/autotest/gdrivers/ecw.py
index 48763caa6d5a..a48cc017d07a 100755
--- a/autotest/gdrivers/ecw.py
+++ b/autotest/gdrivers/ecw.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env pytest
 # -*- coding: utf-8 -*-
 ###############################################################################
 # $Id$
diff --git a/autotest/gdrivers/eedai.py b/autotest/gdrivers/eedai.py
index 15826fd93dc5..1e63f1859a0d 100644
--- a/autotest/gdrivers/eedai.py
+++ b/autotest/gdrivers/eedai.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env pytest
 # -*- coding: utf-8 -*-
 ###############################################################################
 # $Id$
diff --git a/autotest/gdrivers/ehdr.py b/autotest/gdrivers/ehdr.py
index 6d43cffd0b92..0e50095299f8 100755
--- a/autotest/gdrivers/ehdr.py
+++ b/autotest/gdrivers/ehdr.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env pytest
 # -*- coding: utf-8 -*-
 ###############################################################################
 # $Id$
diff --git a/autotest/gdrivers/eir.py b/autotest/gdrivers/eir.py
index 8abf87b0686d..0b0541222707 100755
--- a/autotest/gdrivers/eir.py
+++ b/autotest/gdrivers/eir.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env pytest
 ###############################################################################
 # $Id$
 #
diff --git a/autotest/gdrivers/elas.py b/autotest/gdrivers/elas.py
index a1a47af112cb..d9c91d368e6b 100755
--- a/autotest/gdrivers/elas.py
+++ b/autotest/gdrivers/elas.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env pytest
 ###############################################################################
 # $Id$
 #
diff --git a/autotest/gdrivers/envi.py b/autotest/gdrivers/envi.py
index e8b09067dee6..6b3a1158d3a6 100755
--- a/autotest/gdrivers/envi.py
+++ b/autotest/gdrivers/envi.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env pytest
 # -*- coding: utf-8 -*-
 ###############################################################################
 # $Id$
diff --git a/autotest/gdrivers/envisat.py b/autotest/gdrivers/envisat.py
index 4aa777a48452..1706963207a9 100755
--- a/autotest/gdrivers/envisat.py
+++ b/autotest/gdrivers/envisat.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env pytest
 # -*- coding: utf-8 -*-
 ###############################################################################
 # $Id$
diff --git a/autotest/gdrivers/ers.py b/autotest/gdrivers/ers.py
index d3f2b1b2c382..e7e581b4ab3c 100755
--- a/autotest/gdrivers/ers.py
+++ b/autotest/gdrivers/ers.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env pytest
 # -*- coding: utf-8 -*-
 ###############################################################################
 # $Id$
diff --git a/autotest/gdrivers/fast.py b/autotest/gdrivers/fast.py
index 4858b04b96c9..4b5a03a330d8 100755
--- a/autotest/gdrivers/fast.py
+++ b/autotest/gdrivers/fast.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env pytest
 ###############################################################################
 # $Id$
 #
diff --git a/autotest/gdrivers/fit.py b/autotest/gdrivers/fit.py
index 7cbc6318ed14..aa1cf660cd28 100755
--- a/autotest/gdrivers/fit.py
+++ b/autotest/gdrivers/fit.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env pytest
 ###############################################################################
 # $Id$
 #
diff --git a/autotest/gdrivers/fits.py b/autotest/gdrivers/fits.py
index 2b33f76823d8..4bacae6e4b38 100755
--- a/autotest/gdrivers/fits.py
+++ b/autotest/gdrivers/fits.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env pytest
 ###############################################################################
 # $Id$
 #
diff --git a/autotest/gdrivers/fujibas.py b/autotest/gdrivers/fujibas.py
index 702a80996b12..cce63db98631 100755
--- a/autotest/gdrivers/fujibas.py
+++ b/autotest/gdrivers/fujibas.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env pytest
 ###############################################################################
 # $Id$
 #
diff --git a/autotest/gdrivers/gdalhttp.py b/autotest/gdrivers/gdalhttp.py
index 4d078e2e0e96..e65ae63147e2 100755
--- a/autotest/gdrivers/gdalhttp.py
+++ b/autotest/gdrivers/gdalhttp.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env pytest
 # -*- coding: utf-8 -*-
 ###############################################################################
 # $Id$
diff --git a/autotest/gdrivers/genbin.py b/autotest/gdrivers/genbin.py
index e06170f8a76c..b2638526ea92 100755
--- a/autotest/gdrivers/genbin.py
+++ b/autotest/gdrivers/genbin.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env pytest
 ###############################################################################
 # $Id$
 #
diff --git a/autotest/gdrivers/georaster.py b/autotest/gdrivers/georaster.py
index 1213321fd060..5b4cce6801e5 100755
--- a/autotest/gdrivers/georaster.py
+++ b/autotest/gdrivers/georaster.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env pytest
 ###############################################################################
 # $Id$
 #
diff --git a/autotest/gdrivers/gff.py b/autotest/gdrivers/gff.py
index 088a324ca3ef..1ffaff049e8e 100755
--- a/autotest/gdrivers/gff.py
+++ b/autotest/gdrivers/gff.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env pytest
 ###############################################################################
 # $Id$
 #
diff --git a/autotest/gdrivers/gif.py b/autotest/gdrivers/gif.py
index fdf8628a2b81..b3c15b4e7d40 100755
--- a/autotest/gdrivers/gif.py
+++ b/autotest/gdrivers/gif.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env pytest
 ###############################################################################
 # $Id$
 #
diff --git a/autotest/gdrivers/gmt.py b/autotest/gdrivers/gmt.py
index 6057595c4c57..b1aea049cec5 100755
--- a/autotest/gdrivers/gmt.py
+++ b/autotest/gdrivers/gmt.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env pytest
 ###############################################################################
 # $Id$
 #
diff --git a/autotest/gdrivers/gpkg.py b/autotest/gdrivers/gpkg.py
index d82e4c2818b6..f456d0d16c40 100755
--- a/autotest/gdrivers/gpkg.py
+++ b/autotest/gdrivers/gpkg.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env pytest
 # -*- coding: utf-8 -*-
 ###############################################################################
 # $Id$
diff --git a/autotest/gdrivers/grass.py b/autotest/gdrivers/grass.py
index f06ac4b5b306..a4840ed68fbb 100755
--- a/autotest/gdrivers/grass.py
+++ b/autotest/gdrivers/grass.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env pytest
 ###############################################################################
 # $Id$
 #
diff --git a/autotest/gdrivers/grassasciigrid.py b/autotest/gdrivers/grassasciigrid.py
index 32e3154d72c2..4a3473d4e8c7 100755
--- a/autotest/gdrivers/grassasciigrid.py
+++ b/autotest/gdrivers/grassasciigrid.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env pytest
 ###############################################################################
 # $Id$
 #
diff --git a/autotest/gdrivers/grib.py b/autotest/gdrivers/grib.py
index 3daa4ac7de2b..9f5f05916eeb 100755
--- a/autotest/gdrivers/grib.py
+++ b/autotest/gdrivers/grib.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env pytest
 # -*- coding: utf-8 -*-
 ###############################################################################
 # $Id$
diff --git a/autotest/gdrivers/gsc.py b/autotest/gdrivers/gsc.py
index c4e603c3832d..bc90cdcbad53 100755
--- a/autotest/gdrivers/gsc.py
+++ b/autotest/gdrivers/gsc.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env pytest
 ###############################################################################
 # $Id$
 #
diff --git a/autotest/gdrivers/gsg.py b/autotest/gdrivers/gsg.py
index 1d42b45c1d89..e5b10040a1a8 100755
--- a/autotest/gdrivers/gsg.py
+++ b/autotest/gdrivers/gsg.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env pytest
 ###############################################################################
 # $Id$
 #
diff --git a/autotest/gdrivers/gta.py b/autotest/gdrivers/gta.py
index 8fca58d1ea23..169f1fb137b5 100755
--- a/autotest/gdrivers/gta.py
+++ b/autotest/gdrivers/gta.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env pytest
 ###############################################################################
 # $Id$
 #
diff --git a/autotest/gdrivers/gtx.py b/autotest/gdrivers/gtx.py
index a754adc01929..75c187aac920 100755
--- a/autotest/gdrivers/gtx.py
+++ b/autotest/gdrivers/gtx.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env pytest
 ###############################################################################
 # $Id: gsc.py 16265 2009-02-08 11:15:27Z rouault $
 #
diff --git a/autotest/gdrivers/gxf.py b/autotest/gdrivers/gxf.py
index fce7b770e6ea..d7b5fe10837d 100755
--- a/autotest/gdrivers/gxf.py
+++ b/autotest/gdrivers/gxf.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env pytest
 # -*- coding: utf-8 -*-
 ###############################################################################
 # $Id$
diff --git a/autotest/gdrivers/hdf5.py b/autotest/gdrivers/hdf5.py
index 4f60e426d6ab..6ee913fe9db0 100755
--- a/autotest/gdrivers/hdf5.py
+++ b/autotest/gdrivers/hdf5.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env pytest
 # -*- coding: utf-8 -*-
 ###############################################################################
 # $Id$
diff --git a/autotest/gdrivers/hf2.py b/autotest/gdrivers/hf2.py
index f3fba5bce9f0..9143c659fafb 100755
--- a/autotest/gdrivers/hf2.py
+++ b/autotest/gdrivers/hf2.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env pytest
 ###############################################################################
 # $Id$
 #
diff --git a/autotest/gdrivers/hfa.py b/autotest/gdrivers/hfa.py
index 5b0be5b6db9c..59ebc163dce8 100755
--- a/autotest/gdrivers/hfa.py
+++ b/autotest/gdrivers/hfa.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env pytest
 ###############################################################################
 # $Id$
 #
diff --git a/autotest/gdrivers/ida.py b/autotest/gdrivers/ida.py
index 78399c6f2f88..0558efc66299 100755
--- a/autotest/gdrivers/ida.py
+++ b/autotest/gdrivers/ida.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env pytest
 ###############################################################################
 # $Id$
 #
diff --git a/autotest/gdrivers/idrisi.py b/autotest/gdrivers/idrisi.py
index 93d98b55e52b..4ccbd50adb7a 100755
--- a/autotest/gdrivers/idrisi.py
+++ b/autotest/gdrivers/idrisi.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env pytest
 # -*- coding: utf-8 -*-
 ###############################################################################
 # $Id$
diff --git a/autotest/gdrivers/ignfheightasciigrid.py b/autotest/gdrivers/ignfheightasciigrid.py
index ec7224c35637..fd7c617f91af 100755
--- a/autotest/gdrivers/ignfheightasciigrid.py
+++ b/autotest/gdrivers/ignfheightasciigrid.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env pytest
 ###############################################################################
 # $Id$
 #
diff --git a/autotest/gdrivers/ilwis.py b/autotest/gdrivers/ilwis.py
index dc088c798226..f6750c16b703 100755
--- a/autotest/gdrivers/ilwis.py
+++ b/autotest/gdrivers/ilwis.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env pytest
 ###############################################################################
 # $Id$
 #
diff --git a/autotest/gdrivers/ingr.py b/autotest/gdrivers/ingr.py
index 3394026e356a..ec424d03730d 100755
--- a/autotest/gdrivers/ingr.py
+++ b/autotest/gdrivers/ingr.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env pytest
 # -*- coding: utf-8 -*-
 ###############################################################################
 # $Id$
diff --git a/autotest/gdrivers/iris.py b/autotest/gdrivers/iris.py
index 4aa09de92802..8df122831e0c 100755
--- a/autotest/gdrivers/iris.py
+++ b/autotest/gdrivers/iris.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env pytest
 # -*- coding: utf-8 -*-
 ###############################################################################
 # $Id$
diff --git a/autotest/gdrivers/isce.py b/autotest/gdrivers/isce.py
index 3d3f73604ae7..59d8c676e5a8 100755
--- a/autotest/gdrivers/isce.py
+++ b/autotest/gdrivers/isce.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env pytest
 # -*- coding: utf-8 -*-
 ###############################################################################
 # $Id$
diff --git a/autotest/gdrivers/isis.py b/autotest/gdrivers/isis.py
index a762a38c4afd..25aee241fa2f 100755
--- a/autotest/gdrivers/isis.py
+++ b/autotest/gdrivers/isis.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env pytest
 ###############################################################################
 # $Id$
 #
diff --git a/autotest/gdrivers/isis2.py b/autotest/gdrivers/isis2.py
index 9d82e0b53827..e249b3d2885f 100755
--- a/autotest/gdrivers/isis2.py
+++ b/autotest/gdrivers/isis2.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env pytest
 ###############################################################################
 # $Id$
 #
diff --git a/autotest/gdrivers/jdem.py b/autotest/gdrivers/jdem.py
index d869b0d715a8..23c4ebb06683 100755
--- a/autotest/gdrivers/jdem.py
+++ b/autotest/gdrivers/jdem.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env pytest
 ###############################################################################
 # $Id$
 #
diff --git a/autotest/gdrivers/jp2kak.py b/autotest/gdrivers/jp2kak.py
index 27aff615acc3..1cae3d6bceb8 100755
--- a/autotest/gdrivers/jp2kak.py
+++ b/autotest/gdrivers/jp2kak.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env pytest
 # -*- coding: utf-8 -*-
 ###############################################################################
 # $Id$
diff --git a/autotest/gdrivers/jp2lura.py b/autotest/gdrivers/jp2lura.py
index c31881a2ae1d..ef3af2c0cba9 100755
--- a/autotest/gdrivers/jp2lura.py
+++ b/autotest/gdrivers/jp2lura.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env pytest
 # -*- coding: utf-8 -*-
 ###############################################################################
 # $Id$
diff --git a/autotest/gdrivers/jp2metadata.py b/autotest/gdrivers/jp2metadata.py
index 88cd1ddd41aa..f561c7a0f1b3 100755
--- a/autotest/gdrivers/jp2metadata.py
+++ b/autotest/gdrivers/jp2metadata.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env pytest
 ###############################################################################
 # $Id$
 #
diff --git a/autotest/gdrivers/jp2openjpeg.py b/autotest/gdrivers/jp2openjpeg.py
index de6cfde3f1ea..dba69a208455 100755
--- a/autotest/gdrivers/jp2openjpeg.py
+++ b/autotest/gdrivers/jp2openjpeg.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env pytest
 # -*- coding: utf-8 -*-
 ###############################################################################
 # $Id$
diff --git a/autotest/gdrivers/jpeg.py b/autotest/gdrivers/jpeg.py
index 08f7d4c7eea4..c1fc32699107 100755
--- a/autotest/gdrivers/jpeg.py
+++ b/autotest/gdrivers/jpeg.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env pytest
 # -*- coding: utf-8 -*-
 ###############################################################################
 # $Id$
diff --git a/autotest/gdrivers/jpeg2000.py b/autotest/gdrivers/jpeg2000.py
index f6ed292ed9e3..22acb102b6a4 100755
--- a/autotest/gdrivers/jpeg2000.py
+++ b/autotest/gdrivers/jpeg2000.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env pytest
 ###############################################################################
 # $Id$
 #
diff --git a/autotest/gdrivers/jpeg_profile.py b/autotest/gdrivers/jpeg_profile.py
index ce6cc9fa0ccc..0d15cbc23d04 100755
--- a/autotest/gdrivers/jpeg_profile.py
+++ b/autotest/gdrivers/jpeg_profile.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env pytest
 # -*- coding: utf-8 -*-
 ###############################################################################
 # $Id$
diff --git a/autotest/gdrivers/jpegls.py b/autotest/gdrivers/jpegls.py
index 39b83ba62f0a..1fe132c1706f 100755
--- a/autotest/gdrivers/jpegls.py
+++ b/autotest/gdrivers/jpegls.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env pytest
 ###############################################################################
 # $Id$
 #
diff --git a/autotest/gdrivers/jpipkak.py b/autotest/gdrivers/jpipkak.py
index 14122dec2c2d..cbb866cb79da 100755
--- a/autotest/gdrivers/jpipkak.py
+++ b/autotest/gdrivers/jpipkak.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env pytest
 ###############################################################################
 # $Id: jpipkak.py 18659 2010-01-25 03:39:15Z warmerdam $
 #
diff --git a/autotest/gdrivers/kea.py b/autotest/gdrivers/kea.py
index c0587d787168..dea83dacb6c9 100755
--- a/autotest/gdrivers/kea.py
+++ b/autotest/gdrivers/kea.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env pytest
 # -*- coding: utf-8 -*-
 ###############################################################################
 # $Id $
diff --git a/autotest/gdrivers/kmlsuperoverlay.py b/autotest/gdrivers/kmlsuperoverlay.py
index 252c46097674..2d7b465270d3 100755
--- a/autotest/gdrivers/kmlsuperoverlay.py
+++ b/autotest/gdrivers/kmlsuperoverlay.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env pytest
 # -*- coding: utf-8 -*-
 ###############################################################################
 # $Id$
diff --git a/autotest/gdrivers/kro.py b/autotest/gdrivers/kro.py
index d194421af6db..975f7aa01c67 100755
--- a/autotest/gdrivers/kro.py
+++ b/autotest/gdrivers/kro.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env pytest
 # -*- coding: utf-8 -*-
 ###############################################################################
 # $Id$
diff --git a/autotest/gdrivers/l1b.py b/autotest/gdrivers/l1b.py
index 686043bfac7b..484bee1cd06a 100755
--- a/autotest/gdrivers/l1b.py
+++ b/autotest/gdrivers/l1b.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env pytest
 # -*- coding: utf-8 -*-
 ###############################################################################
 # $Id$
diff --git a/autotest/gdrivers/lan.py b/autotest/gdrivers/lan.py
index 4dde4f7244ec..1d705015e2a3 100755
--- a/autotest/gdrivers/lan.py
+++ b/autotest/gdrivers/lan.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env pytest
 ###############################################################################
 # $Id$
 #
diff --git a/autotest/gdrivers/lcp.py b/autotest/gdrivers/lcp.py
index c9922caeea2e..1955b39414c4 100755
--- a/autotest/gdrivers/lcp.py
+++ b/autotest/gdrivers/lcp.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env pytest
 ###############################################################################
 # $Id$
 #
diff --git a/autotest/gdrivers/leveller.py b/autotest/gdrivers/leveller.py
index bc589655218a..edbe3641b573 100755
--- a/autotest/gdrivers/leveller.py
+++ b/autotest/gdrivers/leveller.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env pytest
 ###############################################################################
 # $Id$
 #
diff --git a/autotest/gdrivers/loslas.py b/autotest/gdrivers/loslas.py
index 33dcbdf466db..ed6fb7bdb73b 100755
--- a/autotest/gdrivers/loslas.py
+++ b/autotest/gdrivers/loslas.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env pytest
 ###############################################################################
 # $Id$
 #
diff --git a/autotest/gdrivers/mbtiles.py b/autotest/gdrivers/mbtiles.py
index 4af598b0b7a4..fd3a4c944563 100755
--- a/autotest/gdrivers/mbtiles.py
+++ b/autotest/gdrivers/mbtiles.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env pytest
 # -*- coding: utf-8 -*-
 ###############################################################################
 # $Id$
diff --git a/autotest/gdrivers/mem.py b/autotest/gdrivers/mem.py
index a22eaa2f4564..9dd393837319 100755
--- a/autotest/gdrivers/mem.py
+++ b/autotest/gdrivers/mem.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env pytest
 ###############################################################################
 # $Id$
 #
diff --git a/autotest/gdrivers/mff.py b/autotest/gdrivers/mff.py
index 82e4710acef2..28cfcc88977f 100755
--- a/autotest/gdrivers/mff.py
+++ b/autotest/gdrivers/mff.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env pytest
 ###############################################################################
 # $Id$
 #
diff --git a/autotest/gdrivers/mff2.py b/autotest/gdrivers/mff2.py
index 943bfb83be50..b38abd905f8f 100755
--- a/autotest/gdrivers/mff2.py
+++ b/autotest/gdrivers/mff2.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env pytest
 ###############################################################################
 # $Id$
 #
diff --git a/autotest/gdrivers/mg4lidar.py b/autotest/gdrivers/mg4lidar.py
index 5b1939d6522d..d51c9d91bbf4 100755
--- a/autotest/gdrivers/mg4lidar.py
+++ b/autotest/gdrivers/mg4lidar.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env pytest
 ###############################################################################
 # $Id$
 #
diff --git a/autotest/gdrivers/mrf.py b/autotest/gdrivers/mrf.py
index f1ab53e926af..090306838eb6 100755
--- a/autotest/gdrivers/mrf.py
+++ b/autotest/gdrivers/mrf.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env pytest
 ###############################################################################
 # $Id$
 #
diff --git a/autotest/gdrivers/mrsid.py b/autotest/gdrivers/mrsid.py
index 013e4559ce38..25321a2d6c6e 100755
--- a/autotest/gdrivers/mrsid.py
+++ b/autotest/gdrivers/mrsid.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env pytest
 ###############################################################################
 # $Id$
 #
diff --git a/autotest/gdrivers/ndf.py b/autotest/gdrivers/ndf.py
index a968b5ffeafd..6e8da4b7e4e8 100755
--- a/autotest/gdrivers/ndf.py
+++ b/autotest/gdrivers/ndf.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env pytest
 ###############################################################################
 # $Id$
 #
diff --git a/autotest/gdrivers/netcdf.py b/autotest/gdrivers/netcdf.py
index 03551704ca40..af8b50904c0c 100755
--- a/autotest/gdrivers/netcdf.py
+++ b/autotest/gdrivers/netcdf.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env pytest
 # -*- coding: utf-8 -*-
 ###############################################################################
 # $Id$
diff --git a/autotest/gdrivers/netcdf_cf.py b/autotest/gdrivers/netcdf_cf.py
index e5aa99c9d3b4..9a9425ee0b45 100755
--- a/autotest/gdrivers/netcdf_cf.py
+++ b/autotest/gdrivers/netcdf_cf.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env pytest
 ###############################################################################
 # $Id$
 #
diff --git a/autotest/gdrivers/ngsgeoid.py b/autotest/gdrivers/ngsgeoid.py
index 1561d239b810..1c3b11ea2dde 100755
--- a/autotest/gdrivers/ngsgeoid.py
+++ b/autotest/gdrivers/ngsgeoid.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env pytest
 ###############################################################################
 # $Id$
 #
diff --git a/autotest/gdrivers/ngw.py b/autotest/gdrivers/ngw.py
index 63d79822232c..bbcb44c1d281 100644
--- a/autotest/gdrivers/ngw.py
+++ b/autotest/gdrivers/ngw.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env pytest
 # -*- coding: utf-8 -*-
 ###############################################################################
 # $Id$
diff --git a/autotest/gdrivers/nitf.py b/autotest/gdrivers/nitf.py
index 90230be2e78e..5b0e62ae5580 100755
--- a/autotest/gdrivers/nitf.py
+++ b/autotest/gdrivers/nitf.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env pytest
 # -*- coding: utf-8 -*-
 ###############################################################################
 # $Id$
diff --git a/autotest/gdrivers/ntv1.py b/autotest/gdrivers/ntv1.py
index 778742de9a6e..94e5cd4781c1 100755
--- a/autotest/gdrivers/ntv1.py
+++ b/autotest/gdrivers/ntv1.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env pytest
 ###############################################################################
 # $Id$
 #
diff --git a/autotest/gdrivers/ntv2.py b/autotest/gdrivers/ntv2.py
index 560e5c1ed49a..921af242e3c6 100755
--- a/autotest/gdrivers/ntv2.py
+++ b/autotest/gdrivers/ntv2.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env pytest
 ###############################################################################
 # $Id$
 #
diff --git a/autotest/gdrivers/nwt_grc.py b/autotest/gdrivers/nwt_grc.py
index 993fbb7d0249..31f71d4aa86a 100755
--- a/autotest/gdrivers/nwt_grc.py
+++ b/autotest/gdrivers/nwt_grc.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env pytest
 ###############################################################################
 # $Id$
 #
diff --git a/autotest/gdrivers/nwt_grd.py b/autotest/gdrivers/nwt_grd.py
index 4b3cbbbab89a..cb7f4bf7f5d6 100755
--- a/autotest/gdrivers/nwt_grd.py
+++ b/autotest/gdrivers/nwt_grd.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env pytest
 ###############################################################################
 # $Id$
 #
diff --git a/autotest/gdrivers/ozi.py b/autotest/gdrivers/ozi.py
index 6582ebc7efbe..79ad3fed4855 100755
--- a/autotest/gdrivers/ozi.py
+++ b/autotest/gdrivers/ozi.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env pytest
 ###############################################################################
 # $Id$
 #
diff --git a/autotest/gdrivers/paux.py b/autotest/gdrivers/paux.py
index 82f295b06ebe..5191cbebdcd1 100755
--- a/autotest/gdrivers/paux.py
+++ b/autotest/gdrivers/paux.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env pytest
 ###############################################################################
 # $Id$
 #
diff --git a/autotest/gdrivers/pcidsk.py b/autotest/gdrivers/pcidsk.py
index c94bd9789292..93ba96bb563e 100755
--- a/autotest/gdrivers/pcidsk.py
+++ b/autotest/gdrivers/pcidsk.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env pytest
 # -*- coding: utf-8 -*-
 ###############################################################################
 # $Id$
diff --git a/autotest/gdrivers/pcraster.py b/autotest/gdrivers/pcraster.py
index d567bf1068c8..20a707f7b22e 100755
--- a/autotest/gdrivers/pcraster.py
+++ b/autotest/gdrivers/pcraster.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env pytest
 ###############################################################################
 # $Id$
 #
diff --git a/autotest/gdrivers/pdf.py b/autotest/gdrivers/pdf.py
index b19ca458046b..944eb0501b4c 100755
--- a/autotest/gdrivers/pdf.py
+++ b/autotest/gdrivers/pdf.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env pytest
 # -*- coding: utf-8 -*-
 ###############################################################################
 # $Id$
diff --git a/autotest/gdrivers/pds.py b/autotest/gdrivers/pds.py
index f1a90d508c1e..64f25d3f02ee 100755
--- a/autotest/gdrivers/pds.py
+++ b/autotest/gdrivers/pds.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env pytest
 # -*- coding: utf-8 -*-
 ###############################################################################
 # $Id$
diff --git a/autotest/gdrivers/pds4.py b/autotest/gdrivers/pds4.py
index b11483f97877..80dc7fc397fe 100755
--- a/autotest/gdrivers/pds4.py
+++ b/autotest/gdrivers/pds4.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env pytest
 ###############################################################################
 # $Id$
 #
diff --git a/autotest/gdrivers/plmosaic.py b/autotest/gdrivers/plmosaic.py
index 7c859ae35b25..f2b9e15ac701 100755
--- a/autotest/gdrivers/plmosaic.py
+++ b/autotest/gdrivers/plmosaic.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env pytest
 # -*- coding: utf-8 -*-
 ###############################################################################
 # $Id$
diff --git a/autotest/gdrivers/png.py b/autotest/gdrivers/png.py
index 69b73eb852fc..576867655180 100755
--- a/autotest/gdrivers/png.py
+++ b/autotest/gdrivers/png.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env pytest
 ###############################################################################
 # $Id$
 #
diff --git a/autotest/gdrivers/png_profile.py b/autotest/gdrivers/png_profile.py
index 94613ec89f52..e47cd450ecf2 100755
--- a/autotest/gdrivers/png_profile.py
+++ b/autotest/gdrivers/png_profile.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env pytest
 # -*- coding: utf-8 -*-
 ###############################################################################
 # $Id$
diff --git a/autotest/gdrivers/pnm.py b/autotest/gdrivers/pnm.py
index d4b245a43c80..37a8a8ee3fb8 100755
--- a/autotest/gdrivers/pnm.py
+++ b/autotest/gdrivers/pnm.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env pytest
 ###############################################################################
 # $Id$
 #
diff --git a/autotest/gdrivers/postgisraster.py b/autotest/gdrivers/postgisraster.py
index 52f1edef70a3..bf3960f3c33f 100755
--- a/autotest/gdrivers/postgisraster.py
+++ b/autotest/gdrivers/postgisraster.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env pytest
 ###############################################################################
 # $Id$
 #
diff --git a/autotest/gdrivers/prf.py b/autotest/gdrivers/prf.py
index 18d056238c2f..bff724205a0b 100755
--- a/autotest/gdrivers/prf.py
+++ b/autotest/gdrivers/prf.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env pytest
 ###############################################################################
 # Purpose:  Tests for Racurs PHOTOMOD tiled format reader (http://www.racurs.ru)
 # Author:   Andrew Sudorgin (drons [a] list dot ru)
diff --git a/autotest/gdrivers/r.py b/autotest/gdrivers/r.py
index 17e2257c4918..c3aff336365f 100755
--- a/autotest/gdrivers/r.py
+++ b/autotest/gdrivers/r.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env pytest
 ###############################################################################
 # $Id$
 #
diff --git a/autotest/gdrivers/rasdaman.py b/autotest/gdrivers/rasdaman.py
index 2d34da99eb6c..a76576c0e599 100755
--- a/autotest/gdrivers/rasdaman.py
+++ b/autotest/gdrivers/rasdaman.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env pytest
 ###############################################################################
 # $Id$
 #
diff --git a/autotest/gdrivers/rasterlite.py b/autotest/gdrivers/rasterlite.py
index 370baad9de1e..3686227c3b93 100755
--- a/autotest/gdrivers/rasterlite.py
+++ b/autotest/gdrivers/rasterlite.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env pytest
 # -*- coding: utf-8 -*-
 ###############################################################################
 # $Id$
diff --git a/autotest/gdrivers/rda.py b/autotest/gdrivers/rda.py
index 7831308c736b..bcad7ea16cd5 100755
--- a/autotest/gdrivers/rda.py
+++ b/autotest/gdrivers/rda.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env pytest
 # -*- coding: utf-8 -*-
 ###############################################################################
 # $Id$
diff --git a/autotest/gdrivers/rik.py b/autotest/gdrivers/rik.py
index f8467fe62dbd..46c9da2f32e2 100755
--- a/autotest/gdrivers/rik.py
+++ b/autotest/gdrivers/rik.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env pytest
 ###############################################################################
 # $Id$
 #
diff --git a/autotest/gdrivers/rl2.py b/autotest/gdrivers/rl2.py
index bd7fea48dea6..d78f3a01232c 100755
--- a/autotest/gdrivers/rl2.py
+++ b/autotest/gdrivers/rl2.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env pytest
 # -*- coding: utf-8 -*-
 ###############################################################################
 # $Id$
diff --git a/autotest/gdrivers/rmf.py b/autotest/gdrivers/rmf.py
index 72bb839df417..02efe3d8e642 100755
--- a/autotest/gdrivers/rmf.py
+++ b/autotest/gdrivers/rmf.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env pytest
 ###############################################################################
 # $Id$
 #
diff --git a/autotest/gdrivers/roipac.py b/autotest/gdrivers/roipac.py
index e5e24087670f..fe60c98a069a 100755
--- a/autotest/gdrivers/roipac.py
+++ b/autotest/gdrivers/roipac.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env pytest
 # -*- coding: utf-8 -*-
 ###############################################################################
 # $Id$
diff --git a/autotest/gdrivers/rpftoc.py b/autotest/gdrivers/rpftoc.py
index 8d7e4c3956ea..fa7e111c39c8 100755
--- a/autotest/gdrivers/rpftoc.py
+++ b/autotest/gdrivers/rpftoc.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env pytest
 ###############################################################################
 # $Id$
 #
diff --git a/autotest/gdrivers/rraster.py b/autotest/gdrivers/rraster.py
index 6357a528c92a..87041c41c63e 100755
--- a/autotest/gdrivers/rraster.py
+++ b/autotest/gdrivers/rraster.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env pytest
 # -*- coding: utf-8 -*-
 ###############################################################################
 # $Id$
diff --git a/autotest/gdrivers/rs2.py b/autotest/gdrivers/rs2.py
index f90d3ce8df26..1675dea4edc3 100755
--- a/autotest/gdrivers/rs2.py
+++ b/autotest/gdrivers/rs2.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env pytest
 ###############################################################################
 # $Id$
 #
diff --git a/autotest/gdrivers/safe.py b/autotest/gdrivers/safe.py
index 50b73b645bb6..107d01d30709 100755
--- a/autotest/gdrivers/safe.py
+++ b/autotest/gdrivers/safe.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env pytest
 ###############################################################################
 # $Id$
 #
diff --git a/autotest/gdrivers/saga.py b/autotest/gdrivers/saga.py
index 6a3c556c61d2..d3832050cd3e 100755
--- a/autotest/gdrivers/saga.py
+++ b/autotest/gdrivers/saga.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env pytest
 # -*- coding: utf-8 -*-
 ###############################################################################
 # $Id$
diff --git a/autotest/gdrivers/sar_ceos.py b/autotest/gdrivers/sar_ceos.py
index 510a8f1b2648..195da1fe74c3 100755
--- a/autotest/gdrivers/sar_ceos.py
+++ b/autotest/gdrivers/sar_ceos.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env pytest
 ###############################################################################
 # $Id$
 #
diff --git a/autotest/gdrivers/sdts.py b/autotest/gdrivers/sdts.py
index 1f8ef7b3bf99..4f30802a721e 100755
--- a/autotest/gdrivers/sdts.py
+++ b/autotest/gdrivers/sdts.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env pytest
 ###############################################################################
 # $Id$
 #
diff --git a/autotest/gdrivers/sentinel2.py b/autotest/gdrivers/sentinel2.py
index f9dac856f667..90b202d03f1b 100755
--- a/autotest/gdrivers/sentinel2.py
+++ b/autotest/gdrivers/sentinel2.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env pytest
 ###############################################################################
 # $Id$
 #
diff --git a/autotest/gdrivers/sgi.py b/autotest/gdrivers/sgi.py
index 8a3496778b14..dfbfbccbe6c2 100755
--- a/autotest/gdrivers/sgi.py
+++ b/autotest/gdrivers/sgi.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env pytest
 ###############################################################################
 # $Id$
 #
diff --git a/autotest/gdrivers/sigdem.py b/autotest/gdrivers/sigdem.py
index d636c9b21731..72fa80561268 100755
--- a/autotest/gdrivers/sigdem.py
+++ b/autotest/gdrivers/sigdem.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env pytest
 # -*- coding: utf-8 -*-
 ###############################################################################
 # $Id$
diff --git a/autotest/gdrivers/snodas.py b/autotest/gdrivers/snodas.py
index 7220259549ec..cbf4905e9bd3 100755
--- a/autotest/gdrivers/snodas.py
+++ b/autotest/gdrivers/snodas.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env pytest
 ###############################################################################
 # $Id$
 #
diff --git a/autotest/gdrivers/srp.py b/autotest/gdrivers/srp.py
index 42fd5d497fea..c61f42daf95e 100755
--- a/autotest/gdrivers/srp.py
+++ b/autotest/gdrivers/srp.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env pytest
 # -*- coding: utf-8 -*-
 ###############################################################################
 # $Id$
diff --git a/autotest/gdrivers/srtmhgt.py b/autotest/gdrivers/srtmhgt.py
index 26ae584e08b9..9171584a74af 100755
--- a/autotest/gdrivers/srtmhgt.py
+++ b/autotest/gdrivers/srtmhgt.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env pytest
 ###############################################################################
 # $Id$
 #
diff --git a/autotest/gdrivers/terragen.py b/autotest/gdrivers/terragen.py
index d71699120007..a8adbc4d89a9 100755
--- a/autotest/gdrivers/terragen.py
+++ b/autotest/gdrivers/terragen.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env pytest
 ###############################################################################
 #
 # Project:  GDAL/OGR Test Suite
diff --git a/autotest/gdrivers/test_validate_jp2.py b/autotest/gdrivers/test_validate_jp2.py
index 8a7db1c1b35b..15d84658d3fa 100755
--- a/autotest/gdrivers/test_validate_jp2.py
+++ b/autotest/gdrivers/test_validate_jp2.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env pytest
 # -*- coding: utf-8 -*-
 ###############################################################################
 # $Id$
diff --git a/autotest/gdrivers/tiff_profile.py b/autotest/gdrivers/tiff_profile.py
index aea4f4193305..da46fb439a5e 100755
--- a/autotest/gdrivers/tiff_profile.py
+++ b/autotest/gdrivers/tiff_profile.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env pytest
 # -*- coding: utf-8 -*-
 ###############################################################################
 # $Id$
diff --git a/autotest/gdrivers/til.py b/autotest/gdrivers/til.py
index 807aec107dc3..181a16815480 100755
--- a/autotest/gdrivers/til.py
+++ b/autotest/gdrivers/til.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env pytest
 ###############################################################################
 # $Id$
 #
diff --git a/autotest/gdrivers/usgsdem.py b/autotest/gdrivers/usgsdem.py
index 753767f6b03c..02a5155aa178 100755
--- a/autotest/gdrivers/usgsdem.py
+++ b/autotest/gdrivers/usgsdem.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env pytest
 ###############################################################################
 # $Id$
 #
diff --git a/autotest/gdrivers/vicar.py b/autotest/gdrivers/vicar.py
index a505ae2a21a4..26b087361e84 100755
--- a/autotest/gdrivers/vicar.py
+++ b/autotest/gdrivers/vicar.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env pytest
 # -*- coding: utf-8 -*-
 ###############################################################################
 # $Id$
diff --git a/autotest/gdrivers/vrtderived.py b/autotest/gdrivers/vrtderived.py
index 81e83002d553..6271119b91dc 100755
--- a/autotest/gdrivers/vrtderived.py
+++ b/autotest/gdrivers/vrtderived.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env pytest
 # -*- coding: utf-8 -*-
 ###############################################################################
 # $Id$
diff --git a/autotest/gdrivers/vrtfilt.py b/autotest/gdrivers/vrtfilt.py
index 10acaaf180db..474d31f92b13 100755
--- a/autotest/gdrivers/vrtfilt.py
+++ b/autotest/gdrivers/vrtfilt.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env pytest
 ###############################################################################
 # $Id$
 #
diff --git a/autotest/gdrivers/vrtlut.py b/autotest/gdrivers/vrtlut.py
index 3bbe8f21eeb9..2bb2dc8e9e68 100755
--- a/autotest/gdrivers/vrtlut.py
+++ b/autotest/gdrivers/vrtlut.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env pytest
 ###############################################################################
 # $Id$
 #
diff --git a/autotest/gdrivers/vrtmask.py b/autotest/gdrivers/vrtmask.py
index 06afc9ceb35e..b1334d370853 100755
--- a/autotest/gdrivers/vrtmask.py
+++ b/autotest/gdrivers/vrtmask.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env pytest
 # -*- coding: utf-8 -*-
 ###############################################################################
 # $Id$
diff --git a/autotest/gdrivers/vrtovr.py b/autotest/gdrivers/vrtovr.py
index b3d205d0bbd9..9d0cdf5b2911 100755
--- a/autotest/gdrivers/vrtovr.py
+++ b/autotest/gdrivers/vrtovr.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env pytest
 ###############################################################################
 # $Id$
 #
diff --git a/autotest/gdrivers/vrtpansharpen.py b/autotest/gdrivers/vrtpansharpen.py
index f3626e17edf4..c1694d93623b 100755
--- a/autotest/gdrivers/vrtpansharpen.py
+++ b/autotest/gdrivers/vrtpansharpen.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env pytest
 ###############################################################################
 # $Id$
 #
diff --git a/autotest/gdrivers/vrtrawlink.py b/autotest/gdrivers/vrtrawlink.py
index b04b3f235156..d9543d83ceda 100755
--- a/autotest/gdrivers/vrtrawlink.py
+++ b/autotest/gdrivers/vrtrawlink.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env pytest
 # -*- coding: utf-8 -*-
 ###############################################################################
 # $Id$
diff --git a/autotest/gdrivers/vrtwarp.py b/autotest/gdrivers/vrtwarp.py
index 05a0cd523966..793cbbac5785 100755
--- a/autotest/gdrivers/vrtwarp.py
+++ b/autotest/gdrivers/vrtwarp.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env pytest
 ###############################################################################
 # $Id$
 #
diff --git a/autotest/gdrivers/wcs.py b/autotest/gdrivers/wcs.py
index 8962a435f833..537227c62fb9 100755
--- a/autotest/gdrivers/wcs.py
+++ b/autotest/gdrivers/wcs.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env pytest
 # -*- coding: utf-8 -*-
 ###############################################################################
 # $Id$
diff --git a/autotest/gdrivers/webp.py b/autotest/gdrivers/webp.py
index 135c901128f5..5ae5cf077100 100755
--- a/autotest/gdrivers/webp.py
+++ b/autotest/gdrivers/webp.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env pytest
 # -*- coding: utf-8 -*-
 ###############################################################################
 # $Id$
diff --git a/autotest/gdrivers/wms.py b/autotest/gdrivers/wms.py
index 62d8809d2ffc..2d7859c91ac7 100755
--- a/autotest/gdrivers/wms.py
+++ b/autotest/gdrivers/wms.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env pytest
 # -*- coding: utf-8 -*-
 ###############################################################################
 # $Id$
diff --git a/autotest/gdrivers/wmts.py b/autotest/gdrivers/wmts.py
index c541796da89a..fd536867efdf 100755
--- a/autotest/gdrivers/wmts.py
+++ b/autotest/gdrivers/wmts.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env pytest
 # -*- coding: utf-8 -*-
 ###############################################################################
 # $Id$
diff --git a/autotest/gdrivers/xmp.py b/autotest/gdrivers/xmp.py
index 6a565f23117c..2a7c9202087a 100755
--- a/autotest/gdrivers/xmp.py
+++ b/autotest/gdrivers/xmp.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env pytest
 # -*- coding: utf-8 -*-
 ###############################################################################
 # $Id$
diff --git a/autotest/gdrivers/xpm.py b/autotest/gdrivers/xpm.py
index 7564daa68eb6..bc0f2fa5fb00 100755
--- a/autotest/gdrivers/xpm.py
+++ b/autotest/gdrivers/xpm.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env pytest
 ###############################################################################
 # $Id$
 #
diff --git a/autotest/gdrivers/xyz.py b/autotest/gdrivers/xyz.py
index 8609c423da64..7c77c9e77d6f 100755
--- a/autotest/gdrivers/xyz.py
+++ b/autotest/gdrivers/xyz.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env pytest
 # -*- coding: utf-8 -*-
 ###############################################################################
 # $Id$
diff --git a/autotest/gdrivers/zmap.py b/autotest/gdrivers/zmap.py
index e39bcc745a06..4e3343066287 100755
--- a/autotest/gdrivers/zmap.py
+++ b/autotest/gdrivers/zmap.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env pytest
 ###############################################################################
 # $Id$
 #
diff --git a/autotest/gnm/gnm_test.py b/autotest/gnm/gnm_test.py
index 4224f711b0e6..3493ff565a54 100755
--- a/autotest/gnm/gnm_test.py
+++ b/autotest/gnm/gnm_test.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env pytest
 # -*- coding: utf-8 -*-
 ###############################################################################
 # $Id$
diff --git a/autotest/kml_generate_test_files.py b/autotest/kml_generate_test_files.py
index 57d2b9b151e1..74b26cfb44f6 100644
--- a/autotest/kml_generate_test_files.py
+++ b/autotest/kml_generate_test_files.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env pytest
 # -*- coding: utf-8 -*-
 ###############################################################################
 # $Id$
diff --git a/autotest/ogr/ogr_arcgen.py b/autotest/ogr/ogr_arcgen.py
index 8ee14b5c00ba..96821690e41c 100755
--- a/autotest/ogr/ogr_arcgen.py
+++ b/autotest/ogr/ogr_arcgen.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env pytest
 ###############################################################################
 # $Id$
 #
diff --git a/autotest/ogr/ogr_avc.py b/autotest/ogr/ogr_avc.py
index 3f810e8c0d3d..e81f5bd7572a 100755
--- a/autotest/ogr/ogr_avc.py
+++ b/autotest/ogr/ogr_avc.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env pytest
 ###############################################################################
 # $Id$
 #
diff --git a/autotest/ogr/ogr_basic_test.py b/autotest/ogr/ogr_basic_test.py
index 94ea8d329d99..6e372bdf0963 100755
--- a/autotest/ogr/ogr_basic_test.py
+++ b/autotest/ogr/ogr_basic_test.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env pytest
 # -*- coding: utf-8 -*-
 ###############################################################################
 # $Id$
diff --git a/autotest/ogr/ogr_bna.py b/autotest/ogr/ogr_bna.py
index 11f0ca0d9033..08705d223467 100755
--- a/autotest/ogr/ogr_bna.py
+++ b/autotest/ogr/ogr_bna.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env pytest
 # -*- coding: utf-8 -*-
 ###############################################################################
 # $Id$
diff --git a/autotest/ogr/ogr_cad.py b/autotest/ogr/ogr_cad.py
index 1549eb822362..1f183154b9b1 100755
--- a/autotest/ogr/ogr_cad.py
+++ b/autotest/ogr/ogr_cad.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env pytest
 # -*- coding: utf-8 -*-
 ################################################################################
 #  Project: OGR CAD Driver
diff --git a/autotest/ogr/ogr_carto.py b/autotest/ogr/ogr_carto.py
index c78fc1a20c94..3fbb93caada9 100755
--- a/autotest/ogr/ogr_carto.py
+++ b/autotest/ogr/ogr_carto.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env pytest
 # -*- coding: utf-8 -*-
 ###############################################################################
 # $Id$
diff --git a/autotest/ogr/ogr_cloudant.py b/autotest/ogr/ogr_cloudant.py
index 47125e15dbd3..556dea5ad6f0 100755
--- a/autotest/ogr/ogr_cloudant.py
+++ b/autotest/ogr/ogr_cloudant.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env pytest
 # -*- coding: utf-8 -*-
 ###############################################################################
 # $Id$
diff --git a/autotest/ogr/ogr_couchdb.py b/autotest/ogr/ogr_couchdb.py
index a43f27f870f1..7d0c370b77a8 100755
--- a/autotest/ogr/ogr_couchdb.py
+++ b/autotest/ogr/ogr_couchdb.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env pytest
 # -*- coding: utf-8 -*-
 ###############################################################################
 # $Id$
diff --git a/autotest/ogr/ogr_csv.py b/autotest/ogr/ogr_csv.py
index f3785b2aa0d5..ac162a8d421f 100755
--- a/autotest/ogr/ogr_csv.py
+++ b/autotest/ogr/ogr_csv.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env pytest
 # -*- coding: utf-8 -*-
 ###############################################################################
 # $Id$
diff --git a/autotest/ogr/ogr_csw.py b/autotest/ogr/ogr_csw.py
index 0905575b2e6e..aaacc2a05278 100755
--- a/autotest/ogr/ogr_csw.py
+++ b/autotest/ogr/ogr_csw.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env pytest
 # -*- coding: utf-8 -*-
 ###############################################################################
 # $Id$
diff --git a/autotest/ogr/ogr_db2.py b/autotest/ogr/ogr_db2.py
index e9dd071ae0c3..8b2d012dda2a 100755
--- a/autotest/ogr/ogr_db2.py
+++ b/autotest/ogr/ogr_db2.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env pytest
 ###############################################################################
 #
 # Project:  GDAL/OGR Test Suite
diff --git a/autotest/ogr/ogr_db2_hack.py b/autotest/ogr/ogr_db2_hack.py
index 6557e157a510..54c2b4ff6aa4 100755
--- a/autotest/ogr/ogr_db2_hack.py
+++ b/autotest/ogr/ogr_db2_hack.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env pytest
 ###############################################################################
 # $Id$
 #
diff --git a/autotest/ogr/ogr_dgn.py b/autotest/ogr/ogr_dgn.py
index 3ede5e77cd6e..ea0231aca26f 100755
--- a/autotest/ogr/ogr_dgn.py
+++ b/autotest/ogr/ogr_dgn.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env pytest
 ###############################################################################
 # $Id$
 #
diff --git a/autotest/ogr/ogr_dgnv8.py b/autotest/ogr/ogr_dgnv8.py
index 529b2ac6cea4..c913f9b53a5a 100755
--- a/autotest/ogr/ogr_dgnv8.py
+++ b/autotest/ogr/ogr_dgnv8.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env pytest
 ###############################################################################
 # $Id$
 #
diff --git a/autotest/ogr/ogr_dods.py b/autotest/ogr/ogr_dods.py
index ee24da6ddf67..fdfd74bb9e62 100755
--- a/autotest/ogr/ogr_dods.py
+++ b/autotest/ogr/ogr_dods.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env pytest
 ###############################################################################
 # $Id$
 #
diff --git a/autotest/ogr/ogr_dxf.py b/autotest/ogr/ogr_dxf.py
index 58823a6c827e..2be697036d9d 100644
--- a/autotest/ogr/ogr_dxf.py
+++ b/autotest/ogr/ogr_dxf.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env pytest
 # -*- coding: utf-8 -*-
 ###############################################################################
 # $Id$
diff --git a/autotest/ogr/ogr_edigeo.py b/autotest/ogr/ogr_edigeo.py
index a37fdf02e456..d206fc4c504c 100755
--- a/autotest/ogr/ogr_edigeo.py
+++ b/autotest/ogr/ogr_edigeo.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env pytest
 # -*- coding: utf-8 -*-
 ###############################################################################
 # $Id$
diff --git a/autotest/ogr/ogr_eeda.py b/autotest/ogr/ogr_eeda.py
index c7b75c6f12f9..358b06c3887a 100644
--- a/autotest/ogr/ogr_eeda.py
+++ b/autotest/ogr/ogr_eeda.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env pytest
 # -*- coding: utf-8 -*-
 ###############################################################################
 # $Id$
diff --git a/autotest/ogr/ogr_elasticsearch.py b/autotest/ogr/ogr_elasticsearch.py
index a5c24e537e36..b9b8bd149230 100755
--- a/autotest/ogr/ogr_elasticsearch.py
+++ b/autotest/ogr/ogr_elasticsearch.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env pytest
 ###############################################################################
 # $Id$
 #
diff --git a/autotest/ogr/ogr_factory.py b/autotest/ogr/ogr_factory.py
index b3b19ee4803b..a77b29d1d72b 100755
--- a/autotest/ogr/ogr_factory.py
+++ b/autotest/ogr/ogr_factory.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env pytest
 # -*- coding: utf-8 -*-
 ###############################################################################
 # $Id$
diff --git a/autotest/ogr/ogr_feature.py b/autotest/ogr/ogr_feature.py
index 27d4a5c5308d..13263861a10b 100755
--- a/autotest/ogr/ogr_feature.py
+++ b/autotest/ogr/ogr_feature.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env pytest
 # -*- coding: utf-8 -*-
 ###############################################################################
 # $Id: ogr_mem.py 23065 2011-09-05 20:41:03Z rouault $
diff --git a/autotest/ogr/ogr_fgdb.py b/autotest/ogr/ogr_fgdb.py
index 288b53fc19db..29d30f536869 100755
--- a/autotest/ogr/ogr_fgdb.py
+++ b/autotest/ogr/ogr_fgdb.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env pytest
 # -*- coding: utf-8 -*-
 ###############################################################################
 # $Id$
diff --git a/autotest/ogr/ogr_fgdb_stress_test.py b/autotest/ogr/ogr_fgdb_stress_test.py
index 8a286316ecca..152ca1d83b90 100755
--- a/autotest/ogr/ogr_fgdb_stress_test.py
+++ b/autotest/ogr/ogr_fgdb_stress_test.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env pytest
 # -*- coding: utf-8 -*-
 ###############################################################################
 # $Id$
diff --git a/autotest/ogr/ogr_geoconcept.py b/autotest/ogr/ogr_geoconcept.py
index 25f9e18bbcf9..d5adee38782d 100755
--- a/autotest/ogr/ogr_geoconcept.py
+++ b/autotest/ogr/ogr_geoconcept.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env pytest
 ###############################################################################
 # $Id$
 #
diff --git a/autotest/ogr/ogr_geojson.py b/autotest/ogr/ogr_geojson.py
index 9add1634928a..b8d5cd8e0655 100755
--- a/autotest/ogr/ogr_geojson.py
+++ b/autotest/ogr/ogr_geojson.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env pytest
 # -*- coding: utf-8 -*-
 ###############################################################################
 # $Id$
diff --git a/autotest/ogr/ogr_geojsonseq.py b/autotest/ogr/ogr_geojsonseq.py
index d1e222dcbd75..8a392df34d88 100755
--- a/autotest/ogr/ogr_geojsonseq.py
+++ b/autotest/ogr/ogr_geojsonseq.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env pytest
 ###############################################################################
 # $Id$
 #
diff --git a/autotest/ogr/ogr_geom.py b/autotest/ogr/ogr_geom.py
index 1e39f1c61693..f67c93bd614d 100755
--- a/autotest/ogr/ogr_geom.py
+++ b/autotest/ogr/ogr_geom.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env pytest
 # -*- coding: utf-8 -*-
 ###############################################################################
 # $Id$
diff --git a/autotest/ogr/ogr_georss.py b/autotest/ogr/ogr_georss.py
index 39f9164b2d81..0fab804daca5 100755
--- a/autotest/ogr/ogr_georss.py
+++ b/autotest/ogr/ogr_georss.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env pytest
 # -*- coding: utf-8 -*-
 ###############################################################################
 # $Id: ogr_georss.py 15604 2008-10-26 11:21:34Z rouault $
diff --git a/autotest/ogr/ogr_geos.py b/autotest/ogr/ogr_geos.py
index ee6d2481c348..3b7800364f76 100755
--- a/autotest/ogr/ogr_geos.py
+++ b/autotest/ogr/ogr_geos.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env pytest
 # -*- coding: utf-8 -*-
 ###############################################################################
 # $Id$
diff --git a/autotest/ogr/ogr_gft.py b/autotest/ogr/ogr_gft.py
index f8a551f7bc8f..e050a0d0f61a 100755
--- a/autotest/ogr/ogr_gft.py
+++ b/autotest/ogr/ogr_gft.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env pytest
 # -*- coding: utf-8 -*-
 ###############################################################################
 # $Id$
diff --git a/autotest/ogr/ogr_gml_fgd_read.py b/autotest/ogr/ogr_gml_fgd_read.py
index 9ac522809205..3232de8353bb 100755
--- a/autotest/ogr/ogr_gml_fgd_read.py
+++ b/autotest/ogr/ogr_gml_fgd_read.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env pytest
 # -*- coding: utf-8 -*-
 ###############################################################################
 # $Id$
diff --git a/autotest/ogr/ogr_gml_geom.py b/autotest/ogr/ogr_gml_geom.py
index 2fb7dd71e473..18b1986f3025 100755
--- a/autotest/ogr/ogr_gml_geom.py
+++ b/autotest/ogr/ogr_gml_geom.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env pytest
 # -*- coding: utf-8 -*-
 ###############################################################################
 # $Id$
diff --git a/autotest/ogr/ogr_gml_read.py b/autotest/ogr/ogr_gml_read.py
index 5fa8becfa867..4a0478f8bac4 100755
--- a/autotest/ogr/ogr_gml_read.py
+++ b/autotest/ogr/ogr_gml_read.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env pytest
 # -*- coding: utf-8 -*-
 ###############################################################################
 # $Id$
diff --git a/autotest/ogr/ogr_gmlas.py b/autotest/ogr/ogr_gmlas.py
index b41a417f497b..d0f65ec5714d 100755
--- a/autotest/ogr/ogr_gmlas.py
+++ b/autotest/ogr/ogr_gmlas.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env pytest
 # -*- coding: utf-8 -*-
 ###############################################################################
 # $Id$
diff --git a/autotest/ogr/ogr_gmt.py b/autotest/ogr/ogr_gmt.py
index 1cf48546f5a6..5619070c3b17 100755
--- a/autotest/ogr/ogr_gmt.py
+++ b/autotest/ogr/ogr_gmt.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env pytest
 ###############################################################################
 # $Id$
 #
diff --git a/autotest/ogr/ogr_gpkg.py b/autotest/ogr/ogr_gpkg.py
index 403c63110370..f6d1cf18485c 100755
--- a/autotest/ogr/ogr_gpkg.py
+++ b/autotest/ogr/ogr_gpkg.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env pytest
 # -*- coding: utf-8 -*-
 ###############################################################################
 # $Id$
diff --git a/autotest/ogr/ogr_gpsbabel.py b/autotest/ogr/ogr_gpsbabel.py
index a6a516a444e3..103b5b21638c 100755
--- a/autotest/ogr/ogr_gpsbabel.py
+++ b/autotest/ogr/ogr_gpsbabel.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env pytest
 ###############################################################################
 # $Id$
 #
diff --git a/autotest/ogr/ogr_gpx.py b/autotest/ogr/ogr_gpx.py
index 1815245aef03..61a06fc5708f 100755
--- a/autotest/ogr/ogr_gpx.py
+++ b/autotest/ogr/ogr_gpx.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env pytest
 ###############################################################################
 # $Id$
 #
diff --git a/autotest/ogr/ogr_grass.py b/autotest/ogr/ogr_grass.py
index ac1aacf349d9..d5decb41970f 100755
--- a/autotest/ogr/ogr_grass.py
+++ b/autotest/ogr/ogr_grass.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env pytest
 ###############################################################################
 # $Id$
 #
diff --git a/autotest/ogr/ogr_gtm.py b/autotest/ogr/ogr_gtm.py
index a26e69005cbd..0f69b7cb076b 100755
--- a/autotest/ogr/ogr_gtm.py
+++ b/autotest/ogr/ogr_gtm.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env pytest
 ###############################################################################
 # $Id$
 #
diff --git a/autotest/ogr/ogr_htf.py b/autotest/ogr/ogr_htf.py
index 6436d016855d..b84fa1b2a470 100755
--- a/autotest/ogr/ogr_htf.py
+++ b/autotest/ogr/ogr_htf.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env pytest
 ###############################################################################
 # $Id$
 #
diff --git a/autotest/ogr/ogr_idrisi.py b/autotest/ogr/ogr_idrisi.py
index e823342154d6..9b8ab4f102e1 100755
--- a/autotest/ogr/ogr_idrisi.py
+++ b/autotest/ogr/ogr_idrisi.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env pytest
 ###############################################################################
 # $Id$
 #
diff --git a/autotest/ogr/ogr_ili.py b/autotest/ogr/ogr_ili.py
index af3ac896b56e..8b5d45c9797a 100755
--- a/autotest/ogr/ogr_ili.py
+++ b/autotest/ogr/ogr_ili.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env pytest
 # -*- coding: utf-8 -*-
 ###############################################################################
 # $Id$
diff --git a/autotest/ogr/ogr_index_test.py b/autotest/ogr/ogr_index_test.py
index 3bf99c179efa..6e10fb5acefc 100755
--- a/autotest/ogr/ogr_index_test.py
+++ b/autotest/ogr/ogr_index_test.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env pytest
 ###############################################################################
 # $Id$
 #
diff --git a/autotest/ogr/ogr_ingres.py b/autotest/ogr/ogr_ingres.py
index d997e19195c5..69e2f4debfba 100755
--- a/autotest/ogr/ogr_ingres.py
+++ b/autotest/ogr/ogr_ingres.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env pytest
 ###############################################################################
 # $Id$
 #
diff --git a/autotest/ogr/ogr_jml.py b/autotest/ogr/ogr_jml.py
index b6f6ae9d538f..a6eca2d395f7 100755
--- a/autotest/ogr/ogr_jml.py
+++ b/autotest/ogr/ogr_jml.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env pytest
 # -*- coding: utf-8 -*-
 ###############################################################################
 # $Id$
diff --git a/autotest/ogr/ogr_join_test.py b/autotest/ogr/ogr_join_test.py
index dee0031407c7..ce646a8a426e 100755
--- a/autotest/ogr/ogr_join_test.py
+++ b/autotest/ogr/ogr_join_test.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env pytest
 # -*- coding: utf-8 -*-
 ###############################################################################
 # $Id$
diff --git a/autotest/ogr/ogr_kml.py b/autotest/ogr/ogr_kml.py
index e4db61a7c4d2..5f5e5840df3a 100755
--- a/autotest/ogr/ogr_kml.py
+++ b/autotest/ogr/ogr_kml.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env pytest
 # -*- coding: utf-8 -*-
 ###############################################################################
 # $Id$
diff --git a/autotest/ogr/ogr_layer_algebra.py b/autotest/ogr/ogr_layer_algebra.py
index 637c2fe0ae42..fa6574e23206 100755
--- a/autotest/ogr/ogr_layer_algebra.py
+++ b/autotest/ogr/ogr_layer_algebra.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env pytest
 # -*- coding: utf-8 -*-
 ###############################################################################
 #
diff --git a/autotest/ogr/ogr_libkml.py b/autotest/ogr/ogr_libkml.py
index bfca09c9a46c..c9d3eaac9e50 100755
--- a/autotest/ogr/ogr_libkml.py
+++ b/autotest/ogr/ogr_libkml.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env pytest
 # -*- coding: utf-8 -*-
 ###############################################################################
 # $Id$
diff --git a/autotest/ogr/ogr_mem.py b/autotest/ogr/ogr_mem.py
index ed0de9de324c..95e53e7e1ec0 100755
--- a/autotest/ogr/ogr_mem.py
+++ b/autotest/ogr/ogr_mem.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env pytest
 ###############################################################################
 # $Id$
 #
diff --git a/autotest/ogr/ogr_mitab.py b/autotest/ogr/ogr_mitab.py
index 40df8bcf3210..80a710715d7e 100755
--- a/autotest/ogr/ogr_mitab.py
+++ b/autotest/ogr/ogr_mitab.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env pytest
 # -*- coding: utf-8 -*-
 ###############################################################################
 # $Id$
diff --git a/autotest/ogr/ogr_mongodb.py b/autotest/ogr/ogr_mongodb.py
index 9270cf770a6a..ad304df92043 100755
--- a/autotest/ogr/ogr_mongodb.py
+++ b/autotest/ogr/ogr_mongodb.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env pytest
 # -*- coding: utf-8 -*-
 ###############################################################################
 # $Id$
diff --git a/autotest/ogr/ogr_mssqlspatial.py b/autotest/ogr/ogr_mssqlspatial.py
index ce19b62a4570..e12f0e0f9d6c 100755
--- a/autotest/ogr/ogr_mssqlspatial.py
+++ b/autotest/ogr/ogr_mssqlspatial.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env pytest
 # -*- coding: utf-8 -*-
 ###############################################################################
 # $Id$
diff --git a/autotest/ogr/ogr_mvt.py b/autotest/ogr/ogr_mvt.py
index a58b53d883c5..92a1541b6bf6 100644
--- a/autotest/ogr/ogr_mvt.py
+++ b/autotest/ogr/ogr_mvt.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env pytest
 ###############################################################################
 # $Id$
 #
diff --git a/autotest/ogr/ogr_mysql.py b/autotest/ogr/ogr_mysql.py
index c3f323d7c342..cebdd8aba95f 100755
--- a/autotest/ogr/ogr_mysql.py
+++ b/autotest/ogr/ogr_mysql.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env pytest
 # -*- coding: utf-8 -*-
 ###############################################################################
 # $Id$
diff --git a/autotest/ogr/ogr_nas.py b/autotest/ogr/ogr_nas.py
index 5940c3d064a4..c2873dcd505f 100755
--- a/autotest/ogr/ogr_nas.py
+++ b/autotest/ogr/ogr_nas.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env pytest
 ###############################################################################
 # $Id$
 #
diff --git a/autotest/ogr/ogr_ngw.py b/autotest/ogr/ogr_ngw.py
index 0fc9ce65ab17..bebdd603674d 100644
--- a/autotest/ogr/ogr_ngw.py
+++ b/autotest/ogr/ogr_ngw.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env pytest
 # -*- coding: utf-8 -*-
 ################################################################################
 #  Project: OGR NextGIS Web Driver
diff --git a/autotest/ogr/ogr_ntf.py b/autotest/ogr/ogr_ntf.py
index 09d18efe13fe..78358923e947 100755
--- a/autotest/ogr/ogr_ntf.py
+++ b/autotest/ogr/ogr_ntf.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env pytest
 ###############################################################################
 # $Id$
 #
diff --git a/autotest/ogr/ogr_oci.py b/autotest/ogr/ogr_oci.py
index 510c439090f1..b49a9e29c6f8 100755
--- a/autotest/ogr/ogr_oci.py
+++ b/autotest/ogr/ogr_oci.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env pytest
 ###############################################################################
 # $Id$
 #
diff --git a/autotest/ogr/ogr_odbc.py b/autotest/ogr/ogr_odbc.py
index e0d006c2c3bb..9d3599cb2f20 100755
--- a/autotest/ogr/ogr_odbc.py
+++ b/autotest/ogr/ogr_odbc.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env pytest
 ###############################################################################
 # $Id$
 #
diff --git a/autotest/ogr/ogr_ods.py b/autotest/ogr/ogr_ods.py
index cea0a864b1e8..c57583252a39 100755
--- a/autotest/ogr/ogr_ods.py
+++ b/autotest/ogr/ogr_ods.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env pytest
 ###############################################################################
 # $Id$
 #
diff --git a/autotest/ogr/ogr_ogdi.py b/autotest/ogr/ogr_ogdi.py
index dd890633f782..cc5aa32789ad 100755
--- a/autotest/ogr/ogr_ogdi.py
+++ b/autotest/ogr/ogr_ogdi.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env pytest
 ###############################################################################
 # $Id$
 #
diff --git a/autotest/ogr/ogr_openair.py b/autotest/ogr/ogr_openair.py
index 6dec943a0a7a..a84cf99f615b 100755
--- a/autotest/ogr/ogr_openair.py
+++ b/autotest/ogr/ogr_openair.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env pytest
 ###############################################################################
 # $Id$
 #
diff --git a/autotest/ogr/ogr_openfilegdb.py b/autotest/ogr/ogr_openfilegdb.py
index 961ea63b1367..b7229956b02c 100755
--- a/autotest/ogr/ogr_openfilegdb.py
+++ b/autotest/ogr/ogr_openfilegdb.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env pytest
 # -*- coding: utf-8 -*-
 ###############################################################################
 # $Id$
diff --git a/autotest/ogr/ogr_osm.py b/autotest/ogr/ogr_osm.py
index a4587e83665b..6383e45018f8 100755
--- a/autotest/ogr/ogr_osm.py
+++ b/autotest/ogr/ogr_osm.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env pytest
 # -*- coding: utf-8 -*-
 ###############################################################################
 # $Id$
diff --git a/autotest/ogr/ogr_pcidsk.py b/autotest/ogr/ogr_pcidsk.py
index 35dd1204e151..cb8a56c302ca 100755
--- a/autotest/ogr/ogr_pcidsk.py
+++ b/autotest/ogr/ogr_pcidsk.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env pytest
 ###############################################################################
 # $Id$
 #
diff --git a/autotest/ogr/ogr_pdf.py b/autotest/ogr/ogr_pdf.py
index 4cb73d54f9b1..8aea0a2c2bcf 100755
--- a/autotest/ogr/ogr_pdf.py
+++ b/autotest/ogr/ogr_pdf.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env pytest
 # -*- coding: utf-8 -*-
 ###############################################################################
 # $Id$
diff --git a/autotest/ogr/ogr_pds.py b/autotest/ogr/ogr_pds.py
index deacf521fd49..42fea91be2e7 100755
--- a/autotest/ogr/ogr_pds.py
+++ b/autotest/ogr/ogr_pds.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env pytest
 ###############################################################################
 # $Id$
 #
diff --git a/autotest/ogr/ogr_pg.py b/autotest/ogr/ogr_pg.py
index f7f8ab8ada9a..91b07e96475f 100755
--- a/autotest/ogr/ogr_pg.py
+++ b/autotest/ogr/ogr_pg.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env pytest
 # -*- coding: utf-8 -*-
 ###############################################################################
 # $Id$
diff --git a/autotest/ogr/ogr_pgdump.py b/autotest/ogr/ogr_pgdump.py
index 8820fa9675b4..1644fe1ac03c 100755
--- a/autotest/ogr/ogr_pgdump.py
+++ b/autotest/ogr/ogr_pgdump.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env pytest
 ###############################################################################
 # $Id$
 #
diff --git a/autotest/ogr/ogr_pgeo.py b/autotest/ogr/ogr_pgeo.py
index ed9c63926e67..84797e8ccb0d 100755
--- a/autotest/ogr/ogr_pgeo.py
+++ b/autotest/ogr/ogr_pgeo.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env pytest
 # -*- coding: utf-8 -*-
 ###############################################################################
 # $Id$
diff --git a/autotest/ogr/ogr_plscenes.py b/autotest/ogr/ogr_plscenes.py
index c192413845c0..0fa0c7696565 100755
--- a/autotest/ogr/ogr_plscenes.py
+++ b/autotest/ogr/ogr_plscenes.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env pytest
 # -*- coding: utf-8 -*-
 ###############################################################################
 # $Id$
diff --git a/autotest/ogr/ogr_rec.py b/autotest/ogr/ogr_rec.py
index 768d1603f35f..cea01049daa0 100755
--- a/autotest/ogr/ogr_rec.py
+++ b/autotest/ogr/ogr_rec.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env pytest
 # -*- coding: utf-8 -*-
 ###############################################################################
 # $Id$
diff --git a/autotest/ogr/ogr_refcount.py b/autotest/ogr/ogr_refcount.py
index 2031da9623c0..4eb24f11974a 100755
--- a/autotest/ogr/ogr_refcount.py
+++ b/autotest/ogr/ogr_refcount.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env pytest
 # -*- coding: utf-8 -*-
 ###############################################################################
 # $Id$
diff --git a/autotest/ogr/ogr_rfc30.py b/autotest/ogr/ogr_rfc30.py
index 9710d528fa52..4e05ec89e0b1 100755
--- a/autotest/ogr/ogr_rfc30.py
+++ b/autotest/ogr/ogr_rfc30.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env pytest
 ###############################################################################
 # $Id$
 #
diff --git a/autotest/ogr/ogr_rfc35_mem.py b/autotest/ogr/ogr_rfc35_mem.py
index baafade8294d..de181ef5e344 100755
--- a/autotest/ogr/ogr_rfc35_mem.py
+++ b/autotest/ogr/ogr_rfc35_mem.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env pytest
 ###############################################################################
 # $Id$
 #
diff --git a/autotest/ogr/ogr_rfc35_mitab.py b/autotest/ogr/ogr_rfc35_mitab.py
index a494a109b250..c7fd3a19d648 100755
--- a/autotest/ogr/ogr_rfc35_mitab.py
+++ b/autotest/ogr/ogr_rfc35_mitab.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env pytest
 # -*- coding: utf-8 -*-
 ###############################################################################
 # $Id$
diff --git a/autotest/ogr/ogr_rfc35_shape.py b/autotest/ogr/ogr_rfc35_shape.py
index 6ab987455d46..8f8134e8a9df 100755
--- a/autotest/ogr/ogr_rfc35_shape.py
+++ b/autotest/ogr/ogr_rfc35_shape.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env pytest
 # -*- coding: utf-8 -*-
 ###############################################################################
 # $Id$
diff --git a/autotest/ogr/ogr_rfc35_sqlite.py b/autotest/ogr/ogr_rfc35_sqlite.py
index d8eede33d6f0..0a451638e825 100755
--- a/autotest/ogr/ogr_rfc35_sqlite.py
+++ b/autotest/ogr/ogr_rfc35_sqlite.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env pytest
 ###############################################################################
 # $Id$
 #
diff --git a/autotest/ogr/ogr_rfc41.py b/autotest/ogr/ogr_rfc41.py
index 096c8ca44064..d03567ab4a14 100755
--- a/autotest/ogr/ogr_rfc41.py
+++ b/autotest/ogr/ogr_rfc41.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env pytest
 # -*- coding: utf-8 -*-
 ###############################################################################
 # $Id$
diff --git a/autotest/ogr/ogr_s57.py b/autotest/ogr/ogr_s57.py
index d389d92ecd76..d6f60d64082f 100755
--- a/autotest/ogr/ogr_s57.py
+++ b/autotest/ogr/ogr_s57.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env pytest
 # -*- coding: utf-8 -*-
 ###############################################################################
 # $Id$
diff --git a/autotest/ogr/ogr_sde.py b/autotest/ogr/ogr_sde.py
index 49861ee53b0c..8c00ec67f859 100755
--- a/autotest/ogr/ogr_sde.py
+++ b/autotest/ogr/ogr_sde.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env pytest
 ###############################################################################
 # $Id$
 #
diff --git a/autotest/ogr/ogr_sdts.py b/autotest/ogr/ogr_sdts.py
index 7d8e4af1ade9..9a09ddf251b0 100755
--- a/autotest/ogr/ogr_sdts.py
+++ b/autotest/ogr/ogr_sdts.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env pytest
 ###############################################################################
 # $Id$
 #
diff --git a/autotest/ogr/ogr_segukooa.py b/autotest/ogr/ogr_segukooa.py
index ef5f092b30de..62c534a976e6 100755
--- a/autotest/ogr/ogr_segukooa.py
+++ b/autotest/ogr/ogr_segukooa.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env pytest
 ###############################################################################
 # $Id$
 #
diff --git a/autotest/ogr/ogr_segy.py b/autotest/ogr/ogr_segy.py
index fefd4603036e..7551bdd00924 100755
--- a/autotest/ogr/ogr_segy.py
+++ b/autotest/ogr/ogr_segy.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env pytest
 ###############################################################################
 # $Id$
 #
diff --git a/autotest/ogr/ogr_selafin.py b/autotest/ogr/ogr_selafin.py
index 147a2d5efead..fa44e2a63af0 100755
--- a/autotest/ogr/ogr_selafin.py
+++ b/autotest/ogr/ogr_selafin.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env pytest
 # -*- coding: utf-8 -*-
 ###############################################################################
 #
diff --git a/autotest/ogr/ogr_shape.py b/autotest/ogr/ogr_shape.py
index c31e6449b2d9..7fcec9ddddb2 100755
--- a/autotest/ogr/ogr_shape.py
+++ b/autotest/ogr/ogr_shape.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env pytest
 # -*- coding: utf-8 -*-
 ###############################################################################
 # $Id$
diff --git a/autotest/ogr/ogr_shape_qix.py b/autotest/ogr/ogr_shape_qix.py
index b32b53dfd5e3..f1f53a669013 100755
--- a/autotest/ogr/ogr_shape_qix.py
+++ b/autotest/ogr/ogr_shape_qix.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env pytest
 ###############################################################################
 # $Id$
 #
diff --git a/autotest/ogr/ogr_shape_sbn.py b/autotest/ogr/ogr_shape_sbn.py
index 8c5fe8894ffa..5fec3707e19b 100755
--- a/autotest/ogr/ogr_shape_sbn.py
+++ b/autotest/ogr/ogr_shape_sbn.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env pytest
 ###############################################################################
 # $Id$
 #
diff --git a/autotest/ogr/ogr_sosi.py b/autotest/ogr/ogr_sosi.py
index 496f4051c16e..ea0cc776f545 100755
--- a/autotest/ogr/ogr_sosi.py
+++ b/autotest/ogr/ogr_sosi.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env pytest
 # -*- coding: utf-8 -*-
 ###############################################################################
 # $Id$
diff --git a/autotest/ogr/ogr_sql_rfc28.py b/autotest/ogr/ogr_sql_rfc28.py
index 1c1142996c32..fe2c0bb0fa64 100755
--- a/autotest/ogr/ogr_sql_rfc28.py
+++ b/autotest/ogr/ogr_sql_rfc28.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env pytest
 # -*- coding: utf-8 -*-
 ###############################################################################
 # $Id$
diff --git a/autotest/ogr/ogr_sql_sqlite.py b/autotest/ogr/ogr_sql_sqlite.py
index 8e1e5fe19239..13c929fc13f1 100755
--- a/autotest/ogr/ogr_sql_sqlite.py
+++ b/autotest/ogr/ogr_sql_sqlite.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env pytest
 # -*- coding: utf-8 -*-
 ###############################################################################
 # $Id$
diff --git a/autotest/ogr/ogr_sql_test.py b/autotest/ogr/ogr_sql_test.py
index 57106ccc1e4a..74770874f31f 100755
--- a/autotest/ogr/ogr_sql_test.py
+++ b/autotest/ogr/ogr_sql_test.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env pytest
 # -*- coding: utf-8 -*-
 ###############################################################################
 # $Id$
diff --git a/autotest/ogr/ogr_sqlite.py b/autotest/ogr/ogr_sqlite.py
index 0fe17b1358a5..a39313aa86fc 100755
--- a/autotest/ogr/ogr_sqlite.py
+++ b/autotest/ogr/ogr_sqlite.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env pytest
 # -*- coding: utf-8 -*-
 ###############################################################################
 # $Id$
diff --git a/autotest/ogr/ogr_style.py b/autotest/ogr/ogr_style.py
index fb3390230c6a..0d1ee32189e5 100755
--- a/autotest/ogr/ogr_style.py
+++ b/autotest/ogr/ogr_style.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env pytest
 # -*- coding: utf-8 -*-
 ###############################################################################
 # $Id$
diff --git a/autotest/ogr/ogr_sua.py b/autotest/ogr/ogr_sua.py
index 7101f2c807b1..35bf0ce5e573 100755
--- a/autotest/ogr/ogr_sua.py
+++ b/autotest/ogr/ogr_sua.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env pytest
 ###############################################################################
 # $Id$
 #
diff --git a/autotest/ogr/ogr_svg.py b/autotest/ogr/ogr_svg.py
index a0e085136252..57031deb2e08 100755
--- a/autotest/ogr/ogr_svg.py
+++ b/autotest/ogr/ogr_svg.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env pytest
 ###############################################################################
 # $Id$
 #
diff --git a/autotest/ogr/ogr_sxf.py b/autotest/ogr/ogr_sxf.py
index d104d4a9cf48..c7e1553ddd94 100755
--- a/autotest/ogr/ogr_sxf.py
+++ b/autotest/ogr/ogr_sxf.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env pytest
 # -*- coding: utf-8 -*-
 ###############################################################################
 # $Id: ogr_sxf.py 26513 2013-10-02 11:59:50Z bishop $
diff --git a/autotest/ogr/ogr_tiger.py b/autotest/ogr/ogr_tiger.py
index 474fd9b7f60f..a43a1b65fb6e 100755
--- a/autotest/ogr/ogr_tiger.py
+++ b/autotest/ogr/ogr_tiger.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env pytest
 ###############################################################################
 # $Id$
 #
diff --git a/autotest/ogr/ogr_vdv.py b/autotest/ogr/ogr_vdv.py
index dc435b2a1349..93b27a70a8e2 100755
--- a/autotest/ogr/ogr_vdv.py
+++ b/autotest/ogr/ogr_vdv.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env pytest
 ###############################################################################
 # $Id$
 #
diff --git a/autotest/ogr/ogr_vfk.py b/autotest/ogr/ogr_vfk.py
index 3ab6a8dcdc34..e1a809a52f29 100755
--- a/autotest/ogr/ogr_vfk.py
+++ b/autotest/ogr/ogr_vfk.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env pytest
 # -*- coding: utf-8 -*-
 ###############################################################################
 # $Id$
diff --git a/autotest/ogr/ogr_virtualogr.py b/autotest/ogr/ogr_virtualogr.py
index d0d2ba915050..62f1fbcb13c8 100755
--- a/autotest/ogr/ogr_virtualogr.py
+++ b/autotest/ogr/ogr_virtualogr.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env pytest
 # -*- coding: utf-8 -*-
 ###############################################################################
 # $Id$
diff --git a/autotest/ogr/ogr_vrt.py b/autotest/ogr/ogr_vrt.py
index 72ba66dd1c18..821d017681ec 100755
--- a/autotest/ogr/ogr_vrt.py
+++ b/autotest/ogr/ogr_vrt.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env pytest
 # -*- coding: utf-8 -*-
 ###############################################################################
 # $Id$
diff --git a/autotest/ogr/ogr_wasp.py b/autotest/ogr/ogr_wasp.py
index 56189c7254ba..a814de73b147 100755
--- a/autotest/ogr/ogr_wasp.py
+++ b/autotest/ogr/ogr_wasp.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env pytest
 # -*- coding: utf-8 -*-
 ###############################################################################
 # $Id: ogr_shape.py 26794 2014-01-08 16:02:22Z rouault $
diff --git a/autotest/ogr/ogr_wfs.py b/autotest/ogr/ogr_wfs.py
index b7e30630ac06..a46674928312 100755
--- a/autotest/ogr/ogr_wfs.py
+++ b/autotest/ogr/ogr_wfs.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env pytest
 # -*- coding: utf-8 -*-
 ###############################################################################
 # $Id$
diff --git a/autotest/ogr/ogr_wfs3.py b/autotest/ogr/ogr_wfs3.py
index 1aebb2008270..b14ad7475ee1 100755
--- a/autotest/ogr/ogr_wfs3.py
+++ b/autotest/ogr/ogr_wfs3.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env pytest
 # -*- coding: utf-8 -*-
 ###############################################################################
 # $Id$
diff --git a/autotest/ogr/ogr_wkbwkt_geom.py b/autotest/ogr/ogr_wkbwkt_geom.py
index 42adcaf04c8f..5ae590240d52 100755
--- a/autotest/ogr/ogr_wkbwkt_geom.py
+++ b/autotest/ogr/ogr_wkbwkt_geom.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env pytest
 # -*- coding: utf-8 -*-
 ###############################################################################
 # $Id$
diff --git a/autotest/ogr/ogr_wktempty.py b/autotest/ogr/ogr_wktempty.py
index 678f5362a3d5..226f710707c7 100755
--- a/autotest/ogr/ogr_wktempty.py
+++ b/autotest/ogr/ogr_wktempty.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env pytest
 ###############################################################################
 # $Id$
 #
diff --git a/autotest/ogr/ogr_xls.py b/autotest/ogr/ogr_xls.py
index 6ffac6f34b84..b7d2096c5dc9 100755
--- a/autotest/ogr/ogr_xls.py
+++ b/autotest/ogr/ogr_xls.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env pytest
 # -*- coding: utf-8 -*-
 ###############################################################################
 # $Id$
diff --git a/autotest/ogr/ogr_xlsx.py b/autotest/ogr/ogr_xlsx.py
index 5d2167b51e5c..b057d3254dff 100755
--- a/autotest/ogr/ogr_xlsx.py
+++ b/autotest/ogr/ogr_xlsx.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env pytest
 ###############################################################################
 # $Id$
 #
diff --git a/autotest/ogr/ogr_xplane.py b/autotest/ogr/ogr_xplane.py
index 3524084ab775..adbbd649ff83 100755
--- a/autotest/ogr/ogr_xplane.py
+++ b/autotest/ogr/ogr_xplane.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env pytest
 ###############################################################################
 # $Id$
 #
diff --git a/autotest/ogr/ograpispy.py b/autotest/ogr/ograpispy.py
index 2b454cb3fad2..5f80410a88f9 100755
--- a/autotest/ogr/ograpispy.py
+++ b/autotest/ogr/ograpispy.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env pytest
 # -*- coding: utf-8 -*-
 ###############################################################################
 # $Id$
diff --git a/autotest/osr/osr_basic.py b/autotest/osr/osr_basic.py
index 65616c7dfd69..a4905fe52b3c 100755
--- a/autotest/osr/osr_basic.py
+++ b/autotest/osr/osr_basic.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env pytest
 # -*- coding: utf-8 -*-
 ###############################################################################
 # $Id$
diff --git a/autotest/osr/osr_compd.py b/autotest/osr/osr_compd.py
index 1094fc1121f2..ee080b2e0999 100755
--- a/autotest/osr/osr_compd.py
+++ b/autotest/osr/osr_compd.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env pytest
 # -*- coding: utf-8 -*-
 ###############################################################################
 # $Id$
diff --git a/autotest/osr/osr_ct.py b/autotest/osr/osr_ct.py
index a7c646534a4c..ccd4b0ec6cc8 100755
--- a/autotest/osr/osr_ct.py
+++ b/autotest/osr/osr_ct.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env pytest
 # -*- coding: utf-8 -*-
 ###############################################################################
 # $Id$
diff --git a/autotest/osr/osr_ct_proj.py b/autotest/osr/osr_ct_proj.py
index ce6ef2e59424..c4160ac62ed6 100755
--- a/autotest/osr/osr_ct_proj.py
+++ b/autotest/osr/osr_ct_proj.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env pytest
 # -*- coding: utf-8 -*-
 ###############################################################################
 # $Id$
diff --git a/autotest/osr/osr_epsg.py b/autotest/osr/osr_epsg.py
index bf4c98f5a9f8..28a4df995431 100755
--- a/autotest/osr/osr_epsg.py
+++ b/autotest/osr/osr_epsg.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env pytest
 # -*- coding: utf-8 -*-
 ###############################################################################
 # $Id$
diff --git a/autotest/osr/osr_erm.py b/autotest/osr/osr_erm.py
index c5f52f20387b..b6a7f13a5d0d 100755
--- a/autotest/osr/osr_erm.py
+++ b/autotest/osr/osr_erm.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env pytest
 ###############################################################################
 # $Id$
 #
diff --git a/autotest/osr/osr_esri.py b/autotest/osr/osr_esri.py
index ef6d5f1134e2..b250da107df8 100755
--- a/autotest/osr/osr_esri.py
+++ b/autotest/osr/osr_esri.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env pytest
 # -*- coding: utf-8 -*-
 ###############################################################################
 # $Id$
diff --git a/autotest/osr/osr_getprojectionmethods.py b/autotest/osr/osr_getprojectionmethods.py
index ac424fcfc95f..fdc3f3b923ec 100755
--- a/autotest/osr/osr_getprojectionmethods.py
+++ b/autotest/osr/osr_getprojectionmethods.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env pytest
 ###############################################################################
 # $Id$
 #
diff --git a/autotest/osr/osr_metacrs.py b/autotest/osr/osr_metacrs.py
index 5318237a1413..95eeb1d75248 100755
--- a/autotest/osr/osr_metacrs.py
+++ b/autotest/osr/osr_metacrs.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env pytest
 # -*- coding: utf-8 -*-
 ###############################################################################
 # $Id$
diff --git a/autotest/osr/osr_micoordsys.py b/autotest/osr/osr_micoordsys.py
index 521033ce796d..5c2f270a8da6 100755
--- a/autotest/osr/osr_micoordsys.py
+++ b/autotest/osr/osr_micoordsys.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env pytest
 ###############################################################################
 # $Id$
 #
diff --git a/autotest/osr/osr_ozi.py b/autotest/osr/osr_ozi.py
index 7aa98606f351..996e25797b00 100755
--- a/autotest/osr/osr_ozi.py
+++ b/autotest/osr/osr_ozi.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env pytest
 ###############################################################################
 # $Id$
 #
diff --git a/autotest/osr/osr_pci.py b/autotest/osr/osr_pci.py
index ebf332bc775b..d7ea82d84958 100755
--- a/autotest/osr/osr_pci.py
+++ b/autotest/osr/osr_pci.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env pytest
 ###############################################################################
 # $Id$
 #
diff --git a/autotest/osr/osr_pm.py b/autotest/osr/osr_pm.py
index 2ba01afb401f..60e3c0a59dca 100755
--- a/autotest/osr/osr_pm.py
+++ b/autotest/osr/osr_pm.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env pytest
 ###############################################################################
 # $Id$
 #
diff --git a/autotest/osr/osr_proj4.py b/autotest/osr/osr_proj4.py
index f528e6990026..cbbe1af4b258 100755
--- a/autotest/osr/osr_proj4.py
+++ b/autotest/osr/osr_proj4.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env pytest
 # -*- coding: utf-8 -*-
 ###############################################################################
 # $Id$
diff --git a/autotest/osr/osr_url.py b/autotest/osr/osr_url.py
index 381d2c8953a1..53f9010b3a7b 100755
--- a/autotest/osr/osr_url.py
+++ b/autotest/osr/osr_url.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env pytest
 ###############################################################################
 # $Id$
 #
diff --git a/autotest/osr/osr_usgs.py b/autotest/osr/osr_usgs.py
index c71a7b229b3e..199b4e05ff77 100755
--- a/autotest/osr/osr_usgs.py
+++ b/autotest/osr/osr_usgs.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env pytest
 ###############################################################################
 # $Id$
 #
diff --git a/autotest/osr/osr_validate.py b/autotest/osr/osr_validate.py
index e1b0e63b84f0..9ea6b0b2499e 100755
--- a/autotest/osr/osr_validate.py
+++ b/autotest/osr/osr_validate.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env pytest
 # -*- coding: utf-8 -*-
 ###############################################################################
 # $Id$
diff --git a/autotest/osr/osr_xml.py b/autotest/osr/osr_xml.py
index c25a9fe65975..845ff8915f1c 100755
--- a/autotest/osr/osr_xml.py
+++ b/autotest/osr/osr_xml.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env pytest
 ###############################################################################
 # $Id$
 #
diff --git a/autotest/pyscripts/test_gdal2tiles.py b/autotest/pyscripts/test_gdal2tiles.py
index 74c764936e31..b51845b31596 100755
--- a/autotest/pyscripts/test_gdal2tiles.py
+++ b/autotest/pyscripts/test_gdal2tiles.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env pytest
 # -*- coding: utf-8 -*-
 ###############################################################################
 # $Id$
diff --git a/autotest/pyscripts/test_gdal_calc.py b/autotest/pyscripts/test_gdal_calc.py
index 7cb779a13356..b34f9227f3aa 100755
--- a/autotest/pyscripts/test_gdal_calc.py
+++ b/autotest/pyscripts/test_gdal_calc.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env pytest
 # -*- coding: utf-8 -*-
 ###############################################################################
 # $Id: test_gdal_calc.py 25549 2013-01-26 11:17:10Z rouault $
diff --git a/autotest/pyscripts/test_gdal_edit.py b/autotest/pyscripts/test_gdal_edit.py
index c3e10533d96e..69608cef818f 100755
--- a/autotest/pyscripts/test_gdal_edit.py
+++ b/autotest/pyscripts/test_gdal_edit.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env pytest
 # -*- coding: utf-8 -*-
 ###############################################################################
 # $Id$
diff --git a/autotest/pyscripts/test_gdal_fillnodata.py b/autotest/pyscripts/test_gdal_fillnodata.py
index 25aaed681ff4..584cdc6986ae 100755
--- a/autotest/pyscripts/test_gdal_fillnodata.py
+++ b/autotest/pyscripts/test_gdal_fillnodata.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env pytest
 ###############################################################################
 # $Id$
 #
diff --git a/autotest/pyscripts/test_gdal_ls_py.py b/autotest/pyscripts/test_gdal_ls_py.py
index 5bf1d8119568..aaa69a1d7b08 100755
--- a/autotest/pyscripts/test_gdal_ls_py.py
+++ b/autotest/pyscripts/test_gdal_ls_py.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env pytest
 # -*- coding: utf-8 -*-
 ###############################################################################
 # $Id$
diff --git a/autotest/pyscripts/test_gdal_merge.py b/autotest/pyscripts/test_gdal_merge.py
index 954db227d2ec..c00024b65b91 100755
--- a/autotest/pyscripts/test_gdal_merge.py
+++ b/autotest/pyscripts/test_gdal_merge.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env pytest
 ###############################################################################
 # $Id$
 #
diff --git a/autotest/pyscripts/test_gdal_pansharpen.py b/autotest/pyscripts/test_gdal_pansharpen.py
index 006752aa5e5d..affe0518cc4e 100755
--- a/autotest/pyscripts/test_gdal_pansharpen.py
+++ b/autotest/pyscripts/test_gdal_pansharpen.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env pytest
 # -*- coding: utf-8 -*-
 ###############################################################################
 # $Id$
diff --git a/autotest/pyscripts/test_gdal_polygonize.py b/autotest/pyscripts/test_gdal_polygonize.py
index b596f974b582..e647817335b0 100755
--- a/autotest/pyscripts/test_gdal_polygonize.py
+++ b/autotest/pyscripts/test_gdal_polygonize.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env pytest
 ###############################################################################
 # $Id$
 #
diff --git a/autotest/pyscripts/test_gdal_proximity.py b/autotest/pyscripts/test_gdal_proximity.py
index c8ad3321247e..69a165735d73 100755
--- a/autotest/pyscripts/test_gdal_proximity.py
+++ b/autotest/pyscripts/test_gdal_proximity.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env pytest
 ###############################################################################
 # $Id$
 #
diff --git a/autotest/pyscripts/test_gdal_retile.py b/autotest/pyscripts/test_gdal_retile.py
index dc5b22582c34..afd948705b94 100755
--- a/autotest/pyscripts/test_gdal_retile.py
+++ b/autotest/pyscripts/test_gdal_retile.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env pytest
 ###############################################################################
 # $Id$
 #
diff --git a/autotest/pyscripts/test_gdal_sieve.py b/autotest/pyscripts/test_gdal_sieve.py
index 9bb1e20b6ede..87b8ee7983de 100755
--- a/autotest/pyscripts/test_gdal_sieve.py
+++ b/autotest/pyscripts/test_gdal_sieve.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env pytest
 ###############################################################################
 # $Id$
 #
diff --git a/autotest/pyscripts/test_gdalinfo_py.py b/autotest/pyscripts/test_gdalinfo_py.py
index f3ce0607e01b..437d7f215ded 100755
--- a/autotest/pyscripts/test_gdalinfo_py.py
+++ b/autotest/pyscripts/test_gdalinfo_py.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env pytest
 ###############################################################################
 # $Id$
 #
diff --git a/autotest/pyscripts/test_gdalmove.py b/autotest/pyscripts/test_gdalmove.py
index c189f6bc968e..902a88f7e9a5 100755
--- a/autotest/pyscripts/test_gdalmove.py
+++ b/autotest/pyscripts/test_gdalmove.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env pytest
 ###############################################################################
 # $Id$
 #
diff --git a/autotest/pyscripts/test_ogr2ogr_py.py b/autotest/pyscripts/test_ogr2ogr_py.py
index 256d3defeebf..12be629b5f05 100755
--- a/autotest/pyscripts/test_ogr2ogr_py.py
+++ b/autotest/pyscripts/test_ogr2ogr_py.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env pytest
 # -*- coding: utf-8 -*-
 ###############################################################################
 # $Id$
diff --git a/autotest/pyscripts/test_ogrinfo_py.py b/autotest/pyscripts/test_ogrinfo_py.py
index d046275449f9..41165ea7e4c7 100755
--- a/autotest/pyscripts/test_ogrinfo_py.py
+++ b/autotest/pyscripts/test_ogrinfo_py.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env pytest
 ###############################################################################
 # $Id$
 #
diff --git a/autotest/pyscripts/test_ogrmerge.py b/autotest/pyscripts/test_ogrmerge.py
index 1c0278686f8a..80c7aaabc211 100755
--- a/autotest/pyscripts/test_ogrmerge.py
+++ b/autotest/pyscripts/test_ogrmerge.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env pytest
 ###############################################################################
 # $Id$
 #
diff --git a/autotest/pyscripts/test_rgb2pct.py b/autotest/pyscripts/test_rgb2pct.py
index 780825e6ac18..5f289c0571a6 100755
--- a/autotest/pyscripts/test_rgb2pct.py
+++ b/autotest/pyscripts/test_rgb2pct.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env pytest
 ###############################################################################
 # $Id$
 #
diff --git a/autotest/utilities/test_gdal_contour.py b/autotest/utilities/test_gdal_contour.py
index de00f78bf167..d0d1bbf279c1 100755
--- a/autotest/utilities/test_gdal_contour.py
+++ b/autotest/utilities/test_gdal_contour.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env pytest
 # -*- coding: utf-8 -*-
 ###############################################################################
 # $Id$
diff --git a/autotest/utilities/test_gdal_grid.py b/autotest/utilities/test_gdal_grid.py
index 1923a776c711..665910c54eae 100755
--- a/autotest/utilities/test_gdal_grid.py
+++ b/autotest/utilities/test_gdal_grid.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env pytest
 # -*- coding: utf-8 -*-
 ###############################################################################
 # $Id$
diff --git a/autotest/utilities/test_gdal_grid_lib.py b/autotest/utilities/test_gdal_grid_lib.py
index e08620c7a548..8f3c23406d43 100755
--- a/autotest/utilities/test_gdal_grid_lib.py
+++ b/autotest/utilities/test_gdal_grid_lib.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env pytest
 # -*- coding: utf-8 -*-
 ###############################################################################
 # $Id$
diff --git a/autotest/utilities/test_gdal_rasterize.py b/autotest/utilities/test_gdal_rasterize.py
index 54932c147407..dbf530583f05 100755
--- a/autotest/utilities/test_gdal_rasterize.py
+++ b/autotest/utilities/test_gdal_rasterize.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env pytest
 # -*- coding: utf-8 -*-
 ###############################################################################
 # $Id$
diff --git a/autotest/utilities/test_gdal_rasterize_lib.py b/autotest/utilities/test_gdal_rasterize_lib.py
index d3afd247295d..765d3fb467fc 100755
--- a/autotest/utilities/test_gdal_rasterize_lib.py
+++ b/autotest/utilities/test_gdal_rasterize_lib.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env pytest
 # -*- coding: utf-8 -*-
 ###############################################################################
 # $Id$
diff --git a/autotest/utilities/test_gdal_translate.py b/autotest/utilities/test_gdal_translate.py
index 2cc8b9c818ba..d2b89e8c5a8a 100755
--- a/autotest/utilities/test_gdal_translate.py
+++ b/autotest/utilities/test_gdal_translate.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env pytest
 # -*- coding: utf-8 -*-
 ###############################################################################
 # $Id$
diff --git a/autotest/utilities/test_gdal_translate_lib.py b/autotest/utilities/test_gdal_translate_lib.py
index 48d471b57fdb..24a3dee01131 100755
--- a/autotest/utilities/test_gdal_translate_lib.py
+++ b/autotest/utilities/test_gdal_translate_lib.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env pytest
 # -*- coding: utf-8 -*-
 ###############################################################################
 # $Id$
diff --git a/autotest/utilities/test_gdaladdo.py b/autotest/utilities/test_gdaladdo.py
index f4465ac73633..70de99ce1eab 100755
--- a/autotest/utilities/test_gdaladdo.py
+++ b/autotest/utilities/test_gdaladdo.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env pytest
 # -*- coding: utf-8 -*-
 ###############################################################################
 # $Id$
diff --git a/autotest/utilities/test_gdalbuildvrt.py b/autotest/utilities/test_gdalbuildvrt.py
index c3992fddd18e..3179ace1864a 100755
--- a/autotest/utilities/test_gdalbuildvrt.py
+++ b/autotest/utilities/test_gdalbuildvrt.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env pytest
 # -*- coding: utf-8 -*-
 ###############################################################################
 # $Id$
diff --git a/autotest/utilities/test_gdalbuildvrt_lib.py b/autotest/utilities/test_gdalbuildvrt_lib.py
index f9f89161efeb..167769a07339 100755
--- a/autotest/utilities/test_gdalbuildvrt_lib.py
+++ b/autotest/utilities/test_gdalbuildvrt_lib.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env pytest
 # -*- coding: utf-8 -*-
 ###############################################################################
 # $Id$
diff --git a/autotest/utilities/test_gdaldem.py b/autotest/utilities/test_gdaldem.py
index 72faa60f9773..4dddbf6c6b9f 100755
--- a/autotest/utilities/test_gdaldem.py
+++ b/autotest/utilities/test_gdaldem.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env pytest
 # -*- coding: utf-8 -*-
 ###############################################################################
 # $Id$
diff --git a/autotest/utilities/test_gdaldem_lib.py b/autotest/utilities/test_gdaldem_lib.py
index 6c4c2dacae11..10be792da861 100755
--- a/autotest/utilities/test_gdaldem_lib.py
+++ b/autotest/utilities/test_gdaldem_lib.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env pytest
 # -*- coding: utf-8 -*-
 ###############################################################################
 # $Id$
diff --git a/autotest/utilities/test_gdalinfo.py b/autotest/utilities/test_gdalinfo.py
index 89d6e668a846..c05337bf00bb 100755
--- a/autotest/utilities/test_gdalinfo.py
+++ b/autotest/utilities/test_gdalinfo.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env pytest
 # -*- coding: utf-8 -*-
 ###############################################################################
 # $Id$
diff --git a/autotest/utilities/test_gdalinfo_lib.py b/autotest/utilities/test_gdalinfo_lib.py
index ebea42bba363..248e71fd6742 100755
--- a/autotest/utilities/test_gdalinfo_lib.py
+++ b/autotest/utilities/test_gdalinfo_lib.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env pytest
 # -*- coding: utf-8 -*-
 ###############################################################################
 # $Id$
diff --git a/autotest/utilities/test_gdallocationinfo.py b/autotest/utilities/test_gdallocationinfo.py
index d2f54b874bc5..fd3c6eedab99 100755
--- a/autotest/utilities/test_gdallocationinfo.py
+++ b/autotest/utilities/test_gdallocationinfo.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env pytest
 # -*- coding: utf-8 -*-
 ###############################################################################
 # $Id$
diff --git a/autotest/utilities/test_gdalsrsinfo.py b/autotest/utilities/test_gdalsrsinfo.py
index e78fcb06d625..aac09ac8cdc4 100755
--- a/autotest/utilities/test_gdalsrsinfo.py
+++ b/autotest/utilities/test_gdalsrsinfo.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env pytest
 # -*- coding: utf-8 -*-
 ###############################################################################
 # $Id$
diff --git a/autotest/utilities/test_gdaltindex.py b/autotest/utilities/test_gdaltindex.py
index 82c734c56467..146e3e0f5456 100755
--- a/autotest/utilities/test_gdaltindex.py
+++ b/autotest/utilities/test_gdaltindex.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env pytest
 # -*- coding: utf-8 -*-
 ###############################################################################
 # $Id$
diff --git a/autotest/utilities/test_gdaltransform.py b/autotest/utilities/test_gdaltransform.py
index 559c0d946530..7d4e63233826 100755
--- a/autotest/utilities/test_gdaltransform.py
+++ b/autotest/utilities/test_gdaltransform.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env pytest
 ###############################################################################
 # $Id$
 #
diff --git a/autotest/utilities/test_gdalwarp.py b/autotest/utilities/test_gdalwarp.py
index 0ebbc8db9c18..673368d372fc 100755
--- a/autotest/utilities/test_gdalwarp.py
+++ b/autotest/utilities/test_gdalwarp.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env pytest
 # -*- coding: utf-8 -*-
 ###############################################################################
 # $Id$
diff --git a/autotest/utilities/test_gdalwarp_lib.py b/autotest/utilities/test_gdalwarp_lib.py
index 0d005b3d73d9..e6ed00fb5326 100755
--- a/autotest/utilities/test_gdalwarp_lib.py
+++ b/autotest/utilities/test_gdalwarp_lib.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env pytest
 # -*- coding: utf-8 -*-
 ###############################################################################
 # $Id$
diff --git a/autotest/utilities/test_gnmutils.py b/autotest/utilities/test_gnmutils.py
index f5c660961df7..f02212bfda82 100755
--- a/autotest/utilities/test_gnmutils.py
+++ b/autotest/utilities/test_gnmutils.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env pytest
 # -*- coding: utf-8 -*-
 ###############################################################################
 # $Id$
diff --git a/autotest/utilities/test_nearblack.py b/autotest/utilities/test_nearblack.py
index ca78ce0d6f70..37df39898607 100755
--- a/autotest/utilities/test_nearblack.py
+++ b/autotest/utilities/test_nearblack.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env pytest
 # -*- coding: utf-8 -*-
 ###############################################################################
 # $Id$
diff --git a/autotest/utilities/test_nearblack_lib.py b/autotest/utilities/test_nearblack_lib.py
index 9d19481f5e05..37ff10eaf3d1 100755
--- a/autotest/utilities/test_nearblack_lib.py
+++ b/autotest/utilities/test_nearblack_lib.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env pytest
 # -*- coding: utf-8 -*-
 ###############################################################################
 # $Id$
diff --git a/autotest/utilities/test_ogr2ogr.py b/autotest/utilities/test_ogr2ogr.py
index d4614297f129..f3fecddd2cff 100755
--- a/autotest/utilities/test_ogr2ogr.py
+++ b/autotest/utilities/test_ogr2ogr.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env pytest
 # -*- coding: utf-8 -*-
 ###############################################################################
 # $Id$
diff --git a/autotest/utilities/test_ogr2ogr_lib.py b/autotest/utilities/test_ogr2ogr_lib.py
index e5c254a83f03..bcc3ab8341c0 100755
--- a/autotest/utilities/test_ogr2ogr_lib.py
+++ b/autotest/utilities/test_ogr2ogr_lib.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env pytest
 # -*- coding: utf-8 -*-
 ###############################################################################
 # $Id$
diff --git a/autotest/utilities/test_ogrinfo.py b/autotest/utilities/test_ogrinfo.py
index 3858918365f1..778df13a87d9 100755
--- a/autotest/utilities/test_ogrinfo.py
+++ b/autotest/utilities/test_ogrinfo.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env pytest
 # -*- coding: utf-8 -*-
 ###############################################################################
 # $Id$
diff --git a/autotest/utilities/test_ogrlineref.py b/autotest/utilities/test_ogrlineref.py
index 4f8346d34ab1..9370957e7a80 100755
--- a/autotest/utilities/test_ogrlineref.py
+++ b/autotest/utilities/test_ogrlineref.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env pytest
 # -*- coding: utf-8 -*-
 ###############################################################################
 #
diff --git a/autotest/utilities/test_ogrtindex.py b/autotest/utilities/test_ogrtindex.py
index d8cb0824fe32..8f19a97eed61 100755
--- a/autotest/utilities/test_ogrtindex.py
+++ b/autotest/utilities/test_ogrtindex.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env pytest
 # -*- coding: utf-8 -*-
 ###############################################################################
 # $Id$

From a25763e7e0ec51c4478951adafee834b033b7a13 Mon Sep 17 00:00:00 2001
From: Even Rouault <even.rouault@spatialys.com>
Date: Fri, 14 Dec 2018 01:34:44 +0100
Subject: [PATCH 169/488] ngw.py: set execution flag [ci skip]

---
 autotest/gdrivers/ngw.py | 0
 1 file changed, 0 insertions(+), 0 deletions(-)
 mode change 100644 => 100755 autotest/gdrivers/ngw.py

diff --git a/autotest/gdrivers/ngw.py b/autotest/gdrivers/ngw.py
old mode 100644
new mode 100755

From 05c258ce182fe537c6a493ff4f93fa57ed1f0466 Mon Sep 17 00:00:00 2001
From: Craig de Stigter <craig.destigter@koordinates.com>
Date: Fri, 14 Dec 2018 16:11:24 +1300
Subject: [PATCH 170/488] Tests: Skip oracle tests when no OCI_DSNAME in
 environment

This is an alternative fix (closes #1062)

I actually 'fixed' the issue with the oracle scripts waiting forever,
by accidentally removing the code that read stdin.

However, actually running the oracle tests (ie with the drivers enabled,
but without the OCI_DSNAME in the environment) would probably have been
erroring since the pytestify branch was merged, since it didn't skip the tests
in that case, and it also didn't read the required OCI_DSNAME from stdin.

This fixes the issue by skipping the oracle tests if no OCI_DSNAME was provided.

Note I don't have Oracle to test with, so am relying on someone who does to
check this for me.

cc @miurahr @rouault
---
 autotest/gdrivers/georaster.py | 73 ++++------------------------------
 autotest/ogr/ogr_oci.py        | 14 +++----
 2 files changed, 14 insertions(+), 73 deletions(-)

diff --git a/autotest/gdrivers/georaster.py b/autotest/gdrivers/georaster.py
index 5b4cce6801e5..76e26fe7be7b 100755
--- a/autotest/gdrivers/georaster.py
+++ b/autotest/gdrivers/georaster.py
@@ -36,6 +36,13 @@
 import gdaltest
 import pytest
 
+
+pytestmark = [
+    pytest.mark.skipif('OCI_DSNAME' not in os.environ, reason='no OCI_DSNAME in environment'),
+    pytest.mark.require_driver('GeoRaster'),
+]
+
+
 ###############################################################################
 #
 
@@ -58,13 +65,8 @@ def test_georaster_init():
     gdaltest.oci_ds = None
 
     gdaltest.georasterDriver = gdal.GetDriverByName('GeoRaster')
-    if gdaltest.georasterDriver is None:
-        pytest.skip()
 
-    if os.environ.get('OCI_DSNAME') is None:
-        pytest.skip()
-
-    gdaltest.oci_ds = ogr.Open(os.environ.get('OCI_DSNAME'))
+    gdaltest.oci_ds = ogr.Open(os.environ['OCI_DSNAME'])
 
     if gdaltest.oci_ds is None:
         pytest.skip()
@@ -90,10 +92,6 @@ def test_georaster_init():
 
 
 def test_georaster_byte():
-
-    if gdaltest.georasterDriver is None:
-        pytest.skip()
-
     if gdaltest.oci_ds is None:
         pytest.skip()
 
@@ -117,10 +115,6 @@ def test_georaster_byte():
 
 
 def test_georaster_int16():
-
-    if gdaltest.georasterDriver is None:
-        pytest.skip()
-
     if gdaltest.oci_ds is None:
         pytest.skip()
 
@@ -146,10 +140,6 @@ def test_georaster_int16():
 
 
 def test_georaster_int32():
-
-    if gdaltest.georasterDriver is None:
-        pytest.skip()
-
     if gdaltest.oci_ds is None:
         pytest.skip()
 
@@ -175,10 +165,6 @@ def test_georaster_int32():
 
 
 def test_georaster_rgb_b1():
-
-    if gdaltest.georasterDriver is None:
-        pytest.skip()
-
     if gdaltest.oci_ds is None:
         pytest.skip()
 
@@ -203,10 +189,6 @@ def test_georaster_rgb_b1():
 
 
 def test_georaster_rgb_b2():
-
-    if gdaltest.georasterDriver is None:
-        pytest.skip()
-
     if gdaltest.oci_ds is None:
         pytest.skip()
 
@@ -231,10 +213,6 @@ def test_georaster_rgb_b2():
 
 
 def test_georaster_rgb_b3_bsq():
-
-    if gdaltest.georasterDriver is None:
-        pytest.skip()
-
     if gdaltest.oci_ds is None:
         pytest.skip()
 
@@ -259,10 +237,6 @@ def test_georaster_rgb_b3_bsq():
 
 
 def test_georaster_rgb_b3_bip():
-
-    if gdaltest.georasterDriver is None:
-        pytest.skip()
-
     if gdaltest.oci_ds is None:
         pytest.skip()
 
@@ -287,10 +261,6 @@ def test_georaster_rgb_b3_bip():
 
 
 def test_georaster_rgb_b3_bil():
-
-    if gdaltest.georasterDriver is None:
-        pytest.skip()
-
     if gdaltest.oci_ds is None:
         pytest.skip()
 
@@ -315,10 +285,6 @@ def test_georaster_rgb_b3_bil():
 
 
 def test_georaster_byte_deflate():
-
-    if gdaltest.georasterDriver is None:
-        pytest.skip()
-
     if gdaltest.oci_ds is None:
         pytest.skip()
 
@@ -343,10 +309,6 @@ def test_georaster_byte_deflate():
 
 
 def test_georaster_rgb_deflate_b3():
-
-    if gdaltest.georasterDriver is None:
-        pytest.skip()
-
     if gdaltest.oci_ds is None:
         pytest.skip()
 
@@ -371,10 +333,6 @@ def test_georaster_rgb_deflate_b3():
 
 
 def test_georaster_1bit():
-
-    if gdaltest.georasterDriver is None:
-        pytest.skip()
-
     if gdaltest.oci_ds is None:
         pytest.skip()
 
@@ -399,10 +357,6 @@ def test_georaster_1bit():
 
 
 def test_georaster_2bit():
-
-    if gdaltest.georasterDriver is None:
-        pytest.skip()
-
     if gdaltest.oci_ds is None:
         pytest.skip()
 
@@ -427,10 +381,6 @@ def test_georaster_2bit():
 
 
 def test_georaster_4bit():
-
-    if gdaltest.georasterDriver is None:
-        pytest.skip()
-
     if gdaltest.oci_ds is None:
         pytest.skip()
 
@@ -455,10 +405,6 @@ def test_georaster_4bit():
 
 
 def test_georaster_cleanup():
-
-    if gdaltest.georasterDriver is None:
-        pytest.skip()
-
     if gdaltest.oci_ds is None:
         pytest.skip()
 
@@ -470,6 +416,3 @@ def test_georaster_cleanup():
 
 ###############################################################################
 #
-
-
-
diff --git a/autotest/ogr/ogr_oci.py b/autotest/ogr/ogr_oci.py
index b49a9e29c6f8..b2e7a730d494 100755
--- a/autotest/ogr/ogr_oci.py
+++ b/autotest/ogr/ogr_oci.py
@@ -36,6 +36,12 @@
 from osgeo import gdal
 import pytest
 
+
+pytestmark = [
+    pytest.mark.skipif('OCI_DSNAME' not in os.environ, reason='no OCI_DSNAME in environment'),
+    pytest.mark.require_driver('OCI'),
+]
+
 ###############################################################################
 # Open ORACLE.
 
@@ -44,14 +50,6 @@ def test_ogr_oci_1():
 
     gdaltest.oci_ds = None
 
-    try:
-        ogr.GetDriverByName('OCI')
-    except:
-        pytest.skip()
-
-    if 'OCI_DSNAME' not in os.environ:
-        pytest.skip()
-
     gdaltest.oci_ds = ogr.Open(os.environ['OCI_DSNAME'])
 
     if gdaltest.oci_ds is not None:

From a77e6e7737c6bd8fa7a4039681e4569a06966fc0 Mon Sep 17 00:00:00 2001
From: Even Rouault <even.rouault@spatialys.com>
Date: Fri, 14 Dec 2018 11:41:33 +0100
Subject: [PATCH 171/488] vsis3::test_vsis3_read_credentials_ec2_expiration:
 modify test to avoid unintended non-localhost HTTP access (refs #1147)

---
 autotest/gcore/vsis3.py | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

diff --git a/autotest/gcore/vsis3.py b/autotest/gcore/vsis3.py
index 65e8e46c547a..8fec2c100547 100755
--- a/autotest/gcore/vsis3.py
+++ b/autotest/gcore/vsis3.py
@@ -2257,11 +2257,15 @@ def test_vsis3_read_credentials_ec2_expiration():
     assert data == 'foo'
 
     # Set a fake URL to demonstrate we try to re-fetch credentials
-    gdal.SetConfigOption('CPL_AWS_EC2_CREDENTIALS_URL', '')
+    gdal.SetConfigOption('CPL_AWS_EC2_CREDENTIALS_URL',
+                         'http://localhost:%d/invalid/' % gdaltest.webserver_port)
 
-    with gdaltest.error_handler():
-        f = open_for_read('/vsis3/s3_fake_bucket/bar')
-    assert f is None
+    handler = webserver.SequentialHandler()
+    handler.add('GET', '/invalid/myprofile', 404)
+    with webserver.install_http_handler(handler):
+        with gdaltest.error_handler():
+            f = open_for_read('/vsis3/s3_fake_bucket/bar')
+        assert f is None
 
     gdal.SetConfigOption('CPL_AWS_EC2_CREDENTIALS_URL', '')
     gdal.SetConfigOption('CPL_AWS_AUTODETECT_EC2', None)

From be692ceb73ba18355bdfbad1a0ced16c641bbfe7 Mon Sep 17 00:00:00 2001
From: Tamas Szekeres <szekerest@gmail.com>
Date: Fri, 14 Dec 2018 21:02:50 +0100
Subject: [PATCH 172/488] Adding support for MSODBCSQL (#1136)

---
 gdal/nmake.opt                                             | 6 ++++++
 gdal/ogr/ogrsf_frmts/mssqlspatial/makefile.vc              | 4 ++--
 gdal/ogr/ogrsf_frmts/mssqlspatial/ogr_mssqlspatial.h       | 7 +++++++
 .../ogrsf_frmts/mssqlspatial/ogrmssqlspatialdatasource.cpp | 6 +++++-
 .../mssqlspatial/ogrmssqlspatialselectlayer.cpp            | 3 ---
 .../ogrsf_frmts/mssqlspatial/ogrmssqlspatialtablelayer.cpp | 3 ---
 6 files changed, 20 insertions(+), 9 deletions(-)

diff --git a/gdal/nmake.opt b/gdal/nmake.opt
index 1d3038336020..adb87f6965e8 100644
--- a/gdal/nmake.opt
+++ b/gdal/nmake.opt
@@ -263,6 +263,12 @@ ODBC_SUPPORTED = 1
 #SQLNCLI_LIB = "$(SQLNCLI_DIR)\Lib\x86\sqlncli$(SQLNCLI_VERSION).lib"
 #SQLNCLI_INCLUDE = "-I$(SQLNCLI_DIR)\Include" -DSQLNCLI_VERSION=$(SQLNCLI_VERSION) -DMSSQL_BCP_SUPPORTED=1
 
+# Uncomment out the following to enable plugin with Microsoft ODBC Driver 17 for SQL Server support for MSSQL Bulk Copy.
+#MSODBCSQL_VERSION = 17
+#MSODBCSQL_DIR = C:\Program Files\Microsoft SQL Server\Client SDK\ODBC\$(MSODBCSQL_VERSION)0\SDK
+#MSODBCSQL_LIB = "$(MSODBCSQL_DIR)\Lib\x86\msodbcsql$(SQLNCLI_VERSION).lib"
+#MSODBCSQL_INCLUDE = "-I$(MSODBCSQL_DIR)\Include" -DMSODBCSQL_VERSION=$(MSODBCSQL_VERSION) -DMSSQL_BCP_SUPPORTED=1
+
 # Comment out the following to disable JPEG support.
 
 !IFNDEF JPEG_SUPPORTED
diff --git a/gdal/ogr/ogrsf_frmts/mssqlspatial/makefile.vc b/gdal/ogr/ogrsf_frmts/mssqlspatial/makefile.vc
index 12159b62f90a..7548a2ac0242 100644
--- a/gdal/ogr/ogrsf_frmts/mssqlspatial/makefile.vc
+++ b/gdal/ogr/ogrsf_frmts/mssqlspatial/makefile.vc
@@ -16,7 +16,7 @@ GDAL_ROOT	= ..\..\..
 
 !INCLUDE $(GDAL_ROOT)\nmake.opt
 
-EXTRAFLAGS	= -I.. -I..\.. $(SQLNCLI_INCLUDE)
+EXTRAFLAGS	= -I.. -I..\.. $(SQLNCLI_INCLUDE) $(MSODBCSQL_INCLUDE)
 
 default: $(OBJ)
 
@@ -27,7 +27,7 @@ default: $(OBJ)
 plugin: $(PLUGIN_DLL)
 
 $(PLUGIN_DLL):	$(PLUGINOBJ)
-	link /dll /out:$(PLUGIN_DLL) $(PLUGINOBJ) $(GDALLIB) $(ODBCLIB) $(SQLNCLI_LIB) $(LDEBUG)
+	link /dll /out:$(PLUGIN_DLL) $(PLUGINOBJ) $(GDALLIB) $(ODBCLIB) $(SQLNCLI_LIB) $(MSODBCSQL_LIB) $(LDEBUG)
 	if exist $(PLUGIN_DLL).manifest mt -manifest $(PLUGIN_DLL).manifest -outputresource:$(PLUGIN_DLL);2
 
 clean:
diff --git a/gdal/ogr/ogrsf_frmts/mssqlspatial/ogr_mssqlspatial.h b/gdal/ogr/ogrsf_frmts/mssqlspatial/ogr_mssqlspatial.h
index 071e1a5e3fe1..667c2e623261 100644
--- a/gdal/ogr/ogrsf_frmts/mssqlspatial/ogr_mssqlspatial.h
+++ b/gdal/ogr/ogrsf_frmts/mssqlspatial/ogr_mssqlspatial.h
@@ -34,6 +34,13 @@
 #include "cpl_odbc.h"
 #include "cpl_error.h"
 
+#ifdef SQLNCLI_VERSION
+#include <sqlncli.h>
+#endif
+#ifdef MSODBCSQL_VERSION
+#include <msodbcsql.h>
+#endif
+
 class OGRMSSQLSpatialDataSource;
 
 /* layer status */
diff --git a/gdal/ogr/ogrsf_frmts/mssqlspatial/ogrmssqlspatialdatasource.cpp b/gdal/ogr/ogrsf_frmts/mssqlspatial/ogrmssqlspatialdatasource.cpp
index b8c5c5333f05..fac16686e38f 100644
--- a/gdal/ogr/ogrsf_frmts/mssqlspatial/ogrmssqlspatialdatasource.cpp
+++ b/gdal/ogr/ogrsf_frmts/mssqlspatial/ogrmssqlspatialdatasource.cpp
@@ -754,7 +754,11 @@ int OGRMSSQLSpatialDataSource::Open( const char * pszNewName, bool bUpdate,
 #if SQLNCLI_VERSION == 11
         pszDriver = CPLStrdup("{SQL Server Native Client 11.0}");
 #elif SQLNCLI_VERSION == 10
-        pszDriver = CPLStrdup("{SQL Server Native Client 10.0}");
+        pszDriver = CPLStrdup("{SQL Server Native Client 10.0}");
+#elif MSODBCSQL_VERSION == 13
+        pszDriver = CPLStrdup("{ODBC Driver 13 for SQL Server}");
+#elif MSODBCSQL_VERSION == 17
+        pszDriver = CPLStrdup("{ODBC Driver 17 for SQL Server}");
 #else
         pszDriver = CPLStrdup("{SQL Server}");
 #endif
diff --git a/gdal/ogr/ogrsf_frmts/mssqlspatial/ogrmssqlspatialselectlayer.cpp b/gdal/ogr/ogrsf_frmts/mssqlspatial/ogrmssqlspatialselectlayer.cpp
index 2d4ef1a7426b..7e09fe6decfe 100644
--- a/gdal/ogr/ogrsf_frmts/mssqlspatial/ogrmssqlspatialselectlayer.cpp
+++ b/gdal/ogr/ogrsf_frmts/mssqlspatial/ogrmssqlspatialselectlayer.cpp
@@ -29,9 +29,6 @@
 
 #include "cpl_conv.h"
 #include "ogr_mssqlspatial.h"
-#ifdef SQLNCLI_VERSION
-#include <sqlncli.h>
-#endif
 
 // SQL_CA_SS_UDT_TYPE_NAME not defined in unixODBC headers
 #ifndef SQL_CA_SS_BASE
diff --git a/gdal/ogr/ogrsf_frmts/mssqlspatial/ogrmssqlspatialtablelayer.cpp b/gdal/ogr/ogrsf_frmts/mssqlspatial/ogrmssqlspatialtablelayer.cpp
index 81fcf1c51985..3bb0615584aa 100644
--- a/gdal/ogr/ogrsf_frmts/mssqlspatial/ogrmssqlspatialtablelayer.cpp
+++ b/gdal/ogr/ogrsf_frmts/mssqlspatial/ogrmssqlspatialtablelayer.cpp
@@ -30,9 +30,6 @@
 #include "cpl_conv.h"
 #include "ogr_mssqlspatial.h"
 #include "ogr_p.h"
-#ifdef SQLNCLI_VERSION
-#include <sqlncli.h>
-#endif
 
 CPL_CVSID("$Id$")
 

From 25d6f6f3485f45a339ed5097cbcaab4f8d2921ce Mon Sep 17 00:00:00 2001
From: Even Rouault <even.rouault@spatialys.com>
Date: Fri, 14 Dec 2018 22:28:23 +0100
Subject: [PATCH 173/488] Typo fixes

---
 autotest/cpp/test_cpl.cpp                           | 6 +++---
 autotest/cpp/test_marching_squares_tile.cpp         | 2 +-
 autotest/gcore/vrt_read.py                          | 2 +-
 gdal/ogr/ogrsf_frmts/geojson/libjson/json_tokener.c | 2 +-
 gdal/ogr/ogrsf_frmts/ngw/drv_ngw.html               | 2 +-
 gdal/ogr/ogrsf_frmts/ngw/drv_ngw_raster.html        | 2 +-
 gdal/port/cpl_vsil.cpp                              | 2 +-
 gdal/scripts/typos_whitelist.txt                    | 1 +
 8 files changed, 10 insertions(+), 9 deletions(-)

diff --git a/autotest/cpp/test_cpl.cpp b/autotest/cpp/test_cpl.cpp
index a5d109e5ceae..cda30cfe3509 100644
--- a/autotest/cpp/test_cpl.cpp
+++ b/autotest/cpp/test_cpl.cpp
@@ -2562,16 +2562,16 @@ namespace tut
             static AutoCloseTest* Create() {
                 return new AutoCloseTest;
             }
-            static void Destory(AutoCloseTest* p) {
+            static void Destroy(AutoCloseTest* p) {
                 delete p;
             }
         };
         {
             AutoCloseTest* p1 = AutoCloseTest::Create();
-            CPL_AUTO_CLOSE_WARP(p1,AutoCloseTest::Destory);
+            CPL_AUTO_CLOSE_WARP(p1,AutoCloseTest::Destroy);
 
             AutoCloseTest* p2 = AutoCloseTest::Create();
-            CPL_AUTO_CLOSE_WARP(p2,AutoCloseTest::Destory);
+            CPL_AUTO_CLOSE_WARP(p2,AutoCloseTest::Destroy);
 
         }
         ensure_equals(counter,400);
diff --git a/autotest/cpp/test_marching_squares_tile.cpp b/autotest/cpp/test_marching_squares_tile.cpp
index 4256679d1f83..af5d090ccd87 100644
--- a/autotest/cpp/test_marching_squares_tile.cpp
+++ b/autotest/cpp/test_marching_squares_tile.cpp
@@ -150,7 +150,7 @@ namespace tut
         ContourGenerator<Writer, FixedLevelRangeIterator> cg( 1, 1, /* hasNoData */ false, NaN, writer, levelGenerator );
         cg.feedLine( &data[0] );
 
-        ensure_equals( "Ther is 1 border", writer.borders.size(), size_t(1) );
+        ensure_equals( "There is 1 border", writer.borders.size(), size_t(1) );
         ensure( "Level = inf", levelGenerator.level(1) == Inf );
         ensure_equals( "It has 8 segments", writer.borders[1].size(), size_t(8) );
         ensure( "Check border segment #1", writer.segmentInBorders( 1, std::make_pair( Point( 0.0, 0.0 ), Point( 0.5, 0.0 )) ) );
diff --git a/autotest/gcore/vrt_read.py b/autotest/gcore/vrt_read.py
index a62f644a827d..4f8bfd52ad45 100755
--- a/autotest/gcore/vrt_read.py
+++ b/autotest/gcore/vrt_read.py
@@ -1132,7 +1132,7 @@ def test_vrt_read_31():
 
 
 ###############################################################################
-# Test reading a VRT where the NODATA & NoDataValue are slighly below the
+# Test reading a VRT where the NODATA & NoDataValue are slightly below the
 # minimum float value (https://github.com/OSGeo/gdal/issues/1071)
 
 def test_vrt_float32_with_nodata_slightly_below_float_min():
diff --git a/gdal/ogr/ogrsf_frmts/geojson/libjson/json_tokener.c b/gdal/ogr/ogrsf_frmts/geojson/libjson/json_tokener.c
index 51b4fa1e3978..f2b2ce1952fc 100644
--- a/gdal/ogr/ogrsf_frmts/geojson/libjson/json_tokener.c
+++ b/gdal/ogr/ogrsf_frmts/geojson/libjson/json_tokener.c
@@ -604,7 +604,7 @@ struct json_object* json_tokener_parse_ex(struct json_tokener *tok,
 
                 if (got_hi_surrogate) {
 		  if (IS_LOW_SURROGATE(tok->ucs_char)) {
-                    /* Recalculate the ucs_char, then fall thru to process normally */
+                    /* Recalculate the ucs_char, then fall through to process normally */
                     tok->ucs_char = DECODE_SURROGATE_PAIR(got_hi_surrogate, tok->ucs_char);
                   } else {
                     /* Hi surrogate was not followed by a low surrogate */
diff --git a/gdal/ogr/ogrsf_frmts/ngw/drv_ngw.html b/gdal/ogr/ogrsf_frmts/ngw/drv_ngw.html
index 54b06ce2460b..35eddeb9c7be 100644
--- a/gdal/ogr/ogrsf_frmts/ngw/drv_ngw.html
+++ b/gdal/ogr/ogrsf_frmts/ngw/drv_ngw.html
@@ -166,7 +166,7 @@ <h2>Metadata</h2>
 metadata are strings and numbers. Metadata keys with decimal numbers will have
 suffix <b>.d</b> and for real numbers - <b>.f</b>. To create new metadata item,
 add new key=value pair in NGW domain use the <i>SetMetadataItem</i> function and
-appropriate suffix. During transfering to NextGIS Web, suffix will be omited. You
+appropriate suffix. During transferring to NextGIS Web, suffix will be omitted. You
 must ensure that numbers correctly transform from string to number.
 <p>
 Resource description and key map to appropriate <i>description</i> and
diff --git a/gdal/ogr/ogrsf_frmts/ngw/drv_ngw_raster.html b/gdal/ogr/ogrsf_frmts/ngw/drv_ngw_raster.html
index 5dc015c382a7..06aea037bae6 100644
--- a/gdal/ogr/ogrsf_frmts/ngw/drv_ngw_raster.html
+++ b/gdal/ogr/ogrsf_frmts/ngw/drv_ngw_raster.html
@@ -120,7 +120,7 @@ <h2>Metadata</h2>
 metadata are strings and numbers. Metadata keys with decimal numbers will have
 suffix <b>.d</b> and for real numbers - <b>.f</b>. To create new metadata item,
 add new key=value pair in NGW domain use the <i>SetMetadataItem</i> function and
-appropriate suffix. During transfering to NextGIS Web, suffix will be omited. You
+appropriate suffix. During transferring to NextGIS Web, suffix will be omitted. You
 must ensure that numbers correctly transform from string to number.
 <p>
 Resource description and key map to appropriate <i>description</i> and
diff --git a/gdal/port/cpl_vsil.cpp b/gdal/port/cpl_vsil.cpp
index d9bb795945bd..72d0657e8101 100644
--- a/gdal/port/cpl_vsil.cpp
+++ b/gdal/port/cpl_vsil.cpp
@@ -319,7 +319,7 @@ char **CPLReadDir( const char *pszPath )
  *
  * This function is close to the POSIX opendir() function.
  *
- * For /vsis3/, /vsigs/, /vsioss/ and /vsiaz/, this funtion has an efficient
+ * For /vsis3/, /vsigs/, /vsioss/ and /vsiaz/, this function has an efficient
  * implementation, minimizing the number of network requests, when invoked with
  * nRecurseDepth <= 0.
  *
diff --git a/gdal/scripts/typos_whitelist.txt b/gdal/scripts/typos_whitelist.txt
index 01b437aee7e2..5297a21d561e 100644
--- a/gdal/scripts/typos_whitelist.txt
+++ b/gdal/scripts/typos_whitelist.txt
@@ -67,3 +67,4 @@
 ogr2ogr --config OGR_STROKE_CURVE TRUE -SQL 'SELECT Rechtsstatus,publiziertAb,MetadatenGeobasisdaten,Eigentumsbeschraenkung,ZustaendigeStelle,Flaeche FROM "OeREBKRM09trsfr.Transferstruktur.Geometrie"' shpdir ch.bazl.sicherheitszonenplan.oereb_20131118.xtf,OeREBKRM09vs.imd OeREBKRM09trsfr.Transferstruktur.Geometrie
    /* 130 */ {"MSLET", "Mean Sea Level Pressure (NAM Model Reduction)", "Pa", UC_NONE},
       addSimpleType(&oTypes, "INST_EFFEKT", "installertEffekt", OFTInteger);
+            const char sText[] = "infinit";

From aa91a0cb4ea864a14a2c9c49193af24cbc4ba375 Mon Sep 17 00:00:00 2001
From: Even Rouault <even.rouault@spatialys.com>
Date: Fri, 14 Dec 2018 22:29:13 +0100
Subject: [PATCH 174/488] Prepare for GDAL 2.4.0

---
 gdal/GDALmake.opt.in               |   4 +-
 gdal/NEWS                          | 642 +++++++++++++++++++++++++++++
 gdal/gcore/gdal_version.h.in       |   4 +-
 gdal/nmake.opt                     |   2 +-
 gdal/swig/include/perl/gdal_perl.i |   4 +-
 gdal/swig/include/perl/ogr_perl.i  |   2 +-
 gdal/swig/python/README.txt        |   2 +-
 gdal/swig/python/setup.py          |   2 +-
 8 files changed, 652 insertions(+), 10 deletions(-)

diff --git a/gdal/GDALmake.opt.in b/gdal/GDALmake.opt.in
index eaaa452c61a1..14afc132484a 100644
--- a/gdal/GDALmake.opt.in
+++ b/gdal/GDALmake.opt.in
@@ -122,9 +122,9 @@ GDAL_INCLUDE	=	-I$(GDAL_ROOT)/port -I$(GDAL_ROOT)/gcore \
 
 # libtool targets and help variables
 LIBGDAL	:=		libgdal.la
-LIBGDAL_CURRENT	:=	24
+LIBGDAL_CURRENT	:=	25
 LIBGDAL_REVISION	:=	0
-LIBGDAL_AGE	:=	4
+LIBGDAL_AGE	:=	5
 
 # native build targets and variables
 GDAL_VER	=	@GDAL_VER@
diff --git a/gdal/NEWS b/gdal/NEWS
index b9991f32dfa3..112722bfc1ac 100644
--- a/gdal/NEWS
+++ b/gdal/NEWS
@@ -1,3 +1,645 @@
+= GDAL/OGR 2.4.0 Release Notes =
+
+== In a nutshell... ==
+
+ * New GDAL drivers:
+   - BYN: read/write support for Natural Resources Canada's Geoid binary format
+   - EEDAI: read-only driver for Google Earth Engine Data API
+   - IGNFHeightASCIIGrid: read-only driver to read IGN-France height correction ASCII grids
+   - NGW: NextGIS Web read-only driver
+   - NTv1: read-only driver for NTv1 datum shift grids
+ * New OGR drivers:
+   - EEDA: read-only driver for Google Earth Engine Data API
+   - GeoJSONSeq: read/creation support of new-line or record-separator separated GeoJSON features (#378)
+   - NGW: NextGIS Web read-write driver
+ * Improved drivers:
+   - BAG: add read support for variable-resolution grids, and write support for single-resolution grids
+   - GTiff driver: add Lerc and WebP codecs
+   - PostgisRaster: add support for out-db rasters
+   - RMF
+   - MSSQLSpatial
+ * RFC 72: Make GDAL Python autotest suite use pytest framework
+ * Add /vsihdfs/ virtual file system handler for Hadoop File System (via libhdfs)
+ * Add /vsiwebhdfs/ read-write virtual file system for Web Hadoop File System REST API
+ * gdal_contour rewriting: speed optimizations and capability to compute polygon isosurfaces.
+ * Remove PHP and Ruby bindings.
+ * Continued code linting in C++, Python scripts, Shell scripts and autotest
+
+== Backward compatibility issues ==
+ * The value of COMPRESSION_ZSTD used for ZStd-in-TIFF compression has been changed. ZStd-compressed TIFF files produced by GDAL 2.3.0 will not be readable
+
+== GDAL/OGR 2.4.0 - General Changes ==
+
+Build(Unix):
+ * configure: error out when --enable-pdf-plugin is used with --with-libtool since frmts/pdf/GNUmakefile isn't ready for that (#556)
+ * Fix compilation in C++17 mode with older ogdi headers
+ * Fix the datadir in gdal.pc.
+ * re-install cpl_vsi_error.h
+ * update GRASS drivers to support GRASS 7.4.0 (#639, #633)
+ * configure: use CXXFLAGS when CXX is used (#693)
+ * GNUmakfile: fix dependency of install target (#707)
+ * configure: fix 12 bit JPEG-in-TIFF support (#716)
+ * configure: Remove additionnal '$' in front of '${CXX}' to fix ECW5 detection
+ * configure: use ogdi.pc if available
+ * Set minimum pkg-config version to 0.21
+ * fix potential link errors when using internal libgif and internal libpng but headers of those libraries are available in the system in different versions than our internal ones (#938)
+
+Build(Windows):
+ * nmake.opt: allow install into paths with spaces
+ * MBTiles driver: fix issue in Makefile
+ * Fix HDF4 Plugin build for Visual C++ (#624)
+ * NMAKE: copy gdal pdb to $(LIBDIR) in libinstall target
+ * NMAKE: Enable friendlier static library builds to allow an external `DLLBUILD = 0`
+ * nmake.opt: allow DEBUG=0 to be set (#703)
+ * Do not include DllMain() in static library builds
+ * add support for JPEGLS driver
+
+All:
+ * Add support for Poppler 0.64, 0.69, 0.71
+ * avoid compilation error when compiling GMT's gmtdigitize.c that defines _XOPEN_SOURCE to empty (#590)
+ * Fix build against PDFium (#612)
+ * Add support for MySQL 8.0
+
+== GDAL 2.4.0 - Overview of Changes ==
+
+Port:
+ * Add multi-threaded compression to /vsigzip/ and /vsizip/
+ * /vsizip/: create ZIP64 when needed
+ * /vsizip/: encode filename in Unicode when needed also in local file header
+ * /vsigzip/: allow seeking to beginning of file, despite decompression error
+ * /vsicurl/: extend retry logic to HTTP 500 and HTTP 400 with RequestTimeout, emit a CE_Warning if code != 400 and != 404
+ * /vsicurl/: fix parsing of HTML file listing that got broken in GDAL 2.3.0
+ * /vsicurl/ and derived: implement a LRU cache for file properties (instead of ever growing cache)
+ * /vsicurl/ and derived: implement a LRU cache for directory content listing
+ * /vsicurl/: make GetCurlMultiHandleFor() more thread-safe
+ * HTTP: added curl cookiefile and cookiejar variables (fixes #1000)
+ * /vsioss/: fix support of filenames with spaces
+ * /vsizip/: output explicit error message when encountering a unsupported file compression method
+ * /vsis3/: fix VSIStatL() on a directory (#603)
+ * /vsis3/: take into account AWS_CONTAINER_CREDENTIALS_RELATIVE_URI for ECS instances (#673)
+ * /vsis3/: honour CPL_VSIL_CURL_ALLOWED_EXTENSIONS configuration option (#995)
+ * /vsis3/: ignores files with GLACIER storage class in directory listing, unless CPL_VSIL_CURL_IGNORE_GLACIER_STORAGE=NO
+ * /vsiaz/: support BlobEndpoint element in AZURE_STORAGE_CONNECTION_STRING such as found in Azurite (#957)
+ * Add a VSICurlPartialClearCache(const char* filenameprefix) function to partially clear the /vsicurl/ and related caches; and bind it to SWIG
+ * Add VSISync() to synchronize source and target files/directories
+ * /vsitar/: support headers with fields using star base-256 coding (#675)
+ * Add VSIOpenDir/VSIGetNextDirEntry/VSICloseDir and provide efficient recursive implementation for /vsis3/, /vsigs/, /vsioss/ and /vsiaz/
+ * Detect Amazon EC2 instances that use the newer hypervisor. Deprecates CPL_AWS_CHECK_HYPERVISOR_UUID and replaces with CPL_AWS_AUTODETECT_EC2
+ * CPLString class: rework visibility of exported symbols for Visual Studio (rework of #321) (#636)
+ * CPLGetPhysicalRAM(): take into account cgroup limitation (Docker use case), and rlimit (#640)
+ * CPLGetNumCPUs(): take into account cgroup limitation.
+ * ODBC: Improve Fetch() error handling.
+ * ODBC: get multiple ODBC error messages.
+ * ODBC: Fetch wide-char strings on UNIX (#839)
+ * Fix buffer overflow in GDALDefaultCSVFilename with GDAL_NO_HARDCODED_FIND (#683)
+ * VSIZipFilesystemHandler::Open: Fix leaks of poVirtualHandle (#699)
+ * Fix date-time formatting for /vsigs/, /vsiaz/ and /vsioss/ protocols with non-C locales
+ * CPLQuadTreeGetAdvisedMaxDepth(): avoid int overflow. Fixes https://bugs.chromium.org/p/oss-fuzz/issues/detail?id=9248
+ * CPLJSonStreamingParser: make it error on invalid array constructs (#970)
+ * Add a GDAL_HTTPS_PROXY configuration option to selectively setup proxy for https only connections (#972)
+ * Add template class CPLAutoClose (#952)
+ * Make VSIToCPLError() handle the generic VSIE_AWSError (#1007)
+ * Propagate error handler user data correctly (#1098)
+ * CPLOpenSSLCleanup(): reset callbacks to nullptr to avoid potential segfault
+
+Core:
+ * SetStatistics(): write a STATISTICS_APPROXIMATE=YES metadata item if bApproxOK=true, and take it into account in GetStatistics() (trac #4857, trac #4576)
+ * Add percentage of valid pixels to metadata when computing raster band statistics (#698)
+ * Overview creation: avoid creating too many levels, and fix related heap buffer overflow (#557,#561)
+ * Overview: fix wrong computation of source pixel indices for AVERAGE and pixel-interleave bands
+ * Lanczos rasterio/overview/warp: do not compute target pixel if there are too many missing source pixels, to avoid weird visual effects depending on if valid source pixels match positive or negative kernel weights
+ * Overview / RasterIO resampling: do not use nodata value as a valid output value
+ * RawRasterBand: only accept VSILFILE*
+ * Add alpha mask flag for alpha band in Uint16 One band dataset (#742)
+ * GetMaskBand(): do not use a GDALNoDataMaskBand when nodata value is out of range (#754)
+ * Pleiades metadata reader: Add more strict check (#431)
+ * Statistics/minmax computation: on a float32 raster, be more tolerant when the nodata is slightly larger than +/- FLOAT_MAX
+ * GDALNoDataMaskBand: improve performance in downsampling cases
+ * GDALDestroy(): no longer call it automatically on GCC/CLang (non-MSVC) builds
+ * GDALGetJPEG2000Structure(): avoid excessive memory allocation. Fixes https://bugs.chromium.org/p/oss-fuzz/issues/detail?id=8268
+ * Implement GDALAllValidMaskBand::ComputeStatistics(). Fixes https://bugs.chromium.org/p/oss-fuzz/issues/detail?id=9309
+ * PAMDataset: avoid illegal down_cast to GDALPamRasterBand. Fixes https://bugs.chromium.org/p/oss-fuzz/issues/detail?id=9358
+ * GDALOpenEx(): improve anti recursion detection. Fixes https://bugs.chromium.org/p/oss-fuzz/issues/detail?id=9391
+ * GDALResampleChunk32R_Convolution: avoid invalid left shift. Fixes https://bugs.chromium.org/p/oss-fuzz/issues/detail?id=9477
+ * Gauss resampling: fix potential read heap buffer overflow in corner cases. Fixes https://bugs.chromium.org/p/oss-fuzz/issues/detail?id=9783
+ * GDALDefaultOverviews::OverviewScan(): avoid potential infinite recursion. Fixes https://bugs.chromium.org/p/oss-fuzz/issues/detail?id=10153
+ * GDALPamRasterBand::CloneInfo(): do not clone empty RAT
+
+Algorithms:
+ * OpenCL wrapper: fix memory leak
+ * Warper: add complex nodata handling in average/min/max modes
+ * TPS solver: improve numerical stability, for non Armadillo builds, for points not centered on (0,0)
+ * GCP polynomial interpolation: fix bug where worst_oultier always assumed polynomial order 2
+ * GCP polynomial interpolation: fix bug where remove_ouliers used the parameters of the reverse transformation
+ * GDALGridLinear(): speed-up search of triangle for points outside of the triangulation
+ * gdal_grid linear: avoid artifacts with degenerate triangles (#638)
+ * GDALPansharpenOperation::Initialize(): validate value of GDAL_NUM_THREADS (CID 1393944)
+ * GDALFillNodata(): add NODATA option
+ * GDALDEMProcessing(): fix null pointer dereference if psOptionsIn == nullptr (#931)
+
+Utilities:
+ * gdal_translate: make -stats option work with -co COPY_SRC_OVERVIEWS=YES (#792)
+ * gdal_translate: fix RPC correction when using -srcwin with negative offsets (#827)
+ * gdalwarp: automatically enable SKIP_NOSOURCE=YES when it is safe to do so
+ * gdalwarp: make -crop_to_cutline stick to source pixel boundaries when no raster reprojection is involved, to avoid unnecessary resampling or resolution change
+ * gdalwarp -r average: better deal with south-up oriented datasets (#778)
+ * gdalwarp: improve robustness of computation of source raster window for a given target raster window (#862)
+ * gdalwarp: allow to create bottom-up grid with -te xmin ymax ymin ymin
+ * gdalwarp: fix crash when warping on an existing dataset with less bands as needed
+ * gdal_contour: speed optimizations and capability to compute polygon isosurfaces.
+ * gdal_contour: add amin and amax parameter for gdal_contour to be used with option -p
+ * gdal_contour: avoid out-of-memory situation (#594)
+ * gdal_contour: fix GDAL 2.3 regression with fixed interval contouring that resulted in discontinuities in contour lines (#889)
+ * gdal_merge.py: deal with NaN values
+ * gdal_retile.py: fix rounding issues when computing source and target regions (#670)
+ * gdal_calc.py: add --optfile switch
+ * gdal2tiles: fix wrong computation of min zoom level in some cases (#730)
+ * gdal2tiles: add -x option for skipping transparent tile generation
+ * gdal2tiles: fix performance issue by caching source dataset; GDALAutoCreateWarpedVRT()
+ * gdal2tiles: fix issue with out-of-range nodata values (#770)
+ * gdal2tiles: restore GDAL < 2.3 behaviour when output directory is not explicitly specified (#795)
+ * gdal2tiles: fix --force-kml (#809)
+ * gdal_edit.py: add -setstats to set "fake" statistics (#819)
+ * gdal_edit.py: add -unsetrpc option to gdal_edit.py, and fix GTiff driver to be able to clear RPC
+ * gdal_grid: fix -clipsrc from a vector datasource (broken at least since GDAL 2.1)
+ * gdalenhance: avoid potential nullptr dereference (CID 1394096)
+ * make sure that --config is early evaluated for config options such as CPL_VSIL_CURL_CHUNK_SIZE that are read early
+
+Multi driver changes:
+ * HFA and KEA: better support for writing RATs (trac #4903)
+ * Fix creation of large enough datasets with drivers EHdr, ENVI and ISCE that failed due to inappropriate check on file size whereas the file wasn't filled yet (#705, 2.3.0 regression)
+
+BAG driver:
+ * avoid warnings when reading georeferencing
+ * get datetime
+ * safer retrieval of variable extents
+ * add read support for variable-resolution grids, and write support for single-resolution grids
+
+E00GRID driver:
+ * correctly parse projection sections that have lines with tildes (#894)
+
+EHdr driver:
+ * only write .stx if bApproxOK=false (#514)
+
+ENVI driver:
+ * support reading truncated datasets (#915)
+
+ERS driver:
+ * fix quadratic performance in parsing .ers header. Fixes https://bugs.chromium.org/p/oss-fuzz/issues/detail?id=8404
+ * avoid excessive memory allocation. Fixes https://bugs.chromium.org/p/oss-fuzz/issues/detail?id=8497
+ * avoid potential stack overflow. Fixes https://bugs.chromium.org/p/oss-fuzz/issues/detail?id=8614
+ * prevent infinite recursion. Fixes https://bugs.chromium.org/p/oss-fuzz/issues/detail?id=8744
+ * avoid potential bad cast. Fixes https://bugs.chromium.org/p/oss-fuzz/issues/detail?id=8745
+
+FIT driver:
+ * avoid excessive block size on creation. Fixes https://bugs.chromium.org/p/oss-fuzz/issues/detail?id=8292
+ * error out in CreateCopy() on failed I/O on source dataset. Fixes https://bugs.chromium.org/p/oss-fuzz/issues/detail?id=8338
+
+GeoRaster driver:
+ * Fix the issue by freeing the temporary lobs created by readCLob() and writeCLOB().
+
+GPKG driver:
+ * fix memleak if I/O error occurs on write
+ * retrieve original raster file when using gdal_translate -co APPEND_SUBDATASET=YES with other gdal_translate switches
+ * copy source metadata when using TILING_SCHEME
+ * properly delete gridded coverage raster layers
+
+GRIB driver:
+ * replace DataSource and derived classes with VSILFILE directly for > 4GB file support on Windows
+ * turn printf() warning as CPLDebug() messages
+ * read and write missing data values correctly for complex packing when original data is integer (#1063)
+ * g2clib: avoid int overflow. Fixes https://bugs.chromium.org/p/oss-fuzz/issues/detail?id=8194
+ * g2clib: avoid potential out of bound access (CID 1393528)
+ * degrib: fix floating point division by zero. Fixes https://bugs.chromium.org/p/oss-fuzz/issues/detail?id=9407.
+ * degrib: avoid potential floating point division by zero. Fixes https://bugs.chromium.org/p/oss-fuzz/issues/detail?id=10291
+ * add UNIT[] node to SRS on reading, so that is valid
+
+GTiff driver:
+ * Add TIFF Lerc codec (in GTiff driver itself)
+ * Add TIFF WebP codec (in libtiff)
+ * save XMP on field TIFFTAG_XMLPACKET (#767)
+ * fix retrieving mask band of overview band when the mask is external. Fixes -co COPY_SRC_OVERVIEWS=YES of such datasets (#754)
+ * improve progress report in CreateCopy() when there is a mask (#935)
+ * improve performance reading multi-band 1-bit data. Fixes https://bugs.chromium.org/p/oss-fuzz/issues/detail?id=7840.
+ * internal libtiff: updated to libtiff 4.0.10
+ * internal libgeotiff: resync with upstream.
+ * workaround bug in currently released libgeotiff versions, where when rewriting a ASCII key with a string value longer than the original value (#641)
+ * allow the use of PREDICTOR with ZSTD compression
+ * avoid various memory corruptions in case of some corrupted file. Fixes https://bugs.chromium.org/p/oss-fuzz/issues/detail?id=8488
+ * load PAM if not already done when GetDefaultRAT() is called
+ * fix missing #ifdef causing compilation failure due to missing bTryCopy (#946)
+
+HDF4 driver:
+ * quote swath and field names if needed (if they contain spaces, column, quotes) in HDF4_EOS subdataset names
+
+HDF5 driver:
+ * add VSI functionality (#786)
+ * fix reading variable names with single character (#622)
+ * fix HDF5 object leak (thus preventing file closing) on datasets with variable length attributes (#933)
+
+HFA driver:
+ * fix floating point division by zero. Fixes https://bugs.chromium.org/p/oss-fuzz/issues/detail?id=9201
+ * fix division by zero. Fixes https://bugs.chromium.org/p/oss-fuzz/issues/detail?id=10190
+
+HTTP driver:
+ * do not immediately delete a file used by the JP2OpenJPEG driver
+
+ILWIS driver:
+ * Fix performance issue on creation with big number of bands. Fixes https://bugs.chromium.org/p/oss-fuzz/issues/detail?id=9062
+
+IRIS driver:
+ * add UNIT[] node to SRS on reading, so that is valid
+ * avoid infinite loop. Fixes https://bugs.chromium.org/p/oss-fuzz/issues/detail?id=8256 and 8439
+
+ISCE driver:
+ * do not try to stat() mainfile.xml if mainfile does not exist
+
+ISIS3 driver:
+
+FITS driver:
+ * allow reading/writing beyond 2 billion pixels limit
+
+JP2OpenJPEG driver:
+ * allow YCC for non-Byte datasets; and allow 4-band MCT with openjpeg >= 2.2
+ * add CODEBLOCK_STYLE creation option for OpenJPEG >= 2.3
+ * add support for generating and using external overviews
+
+JPEG driver:
+ * slightly improve performance of whole RGB image loading with pixel-interleaved buffer
+ * Internal libjpeg: Avoid integer overflow on corrupted image in decode_mcu_DC_first() (https://bugs.chromium.org/p/oss-fuzz/issues/detail?id=9447)
+
+JPEGLS driver:
+ * Add support for CharLS 2 (#632)
+
+MRF driver:
+ * Add TestBlock(), skip empty areas when building overviews
+ * Fix detection of Lerc2 data
+ * Resync with upstream LercLib and put it in third_party/LercLib
+
+NetCDF driver:
+ * add VSI functionality on Linux (#786)
+ * add support for longitude values wrapping at 180deg of longitude (#1114)
+ * avoid use of uninitialized variable when reading blocks in creation mode
+
+NGSGEOID driver:
+ * report a CRS that conforms to the official publications for GEOID2012 and USGG2012 datasets (#1103)
+
+NITF driver:
+ * avoid excessive processing time on corrupted files. Fixes https://bugs.chromium.org/p/oss-fuzz/issues/detail?id=8972
+ * avoid heap-buffer-overflow for VQ compression. Fixes https://bugs.chromium.org/p/oss-fuzz/issues/detail?id=9467
+
+PCIDSK driver:
+ * add back support for creating external overviews, removed years ago when switching to the new PCIDSK SDK (#887)
+
+PCRaster driver:
+ * libcsf: avoid potential out of bound access (CID 1074445)
+
+PDF driver:
+ * Remove forced use of libstdc++ for macOS when building plugin (#888)
+
+PDS driver:
+ * deal with detached labels whose line spacing is not a multiple of record size (#955)
+ * add support for reading CRISM images
+ * add support for ^QUBE = number for multi-band images
+
+PDS4 driver:
+ * fix georeferencing reading/writing to use pixel corner convention (#735)
+ * add UNIT[] node to SRS on reading, so that is valid
+
+PostgisRaster driver:
+ * add support for out-db rasters (Trac #3234)
+ * use ST_BandFileSize of PostGIS 2.5 when available for outdb_resolution=client_side_if_possible
+ * improve performance of line by line reading; add performance hints section in the doc
+ * fix CreateCopy() when PostGIS is not in public schema
+ * add quoting of identifiers
+
+PRF driver:
+ * Fix Photomod x-dem files georeference
+
+RasterLite2 driver:
+ * fail on Create() that is not supported
+
+RDA driver:
+ * enable support for DG RDA Image Reference string
+
+RMF driver:
+ * Add support JPEG compressed RMF datasets (#691)
+ * Add optional projection import/export from EPSG code (#701)
+ * Create compressed datasets: LZW, DEM, JPEG (#732)
+ * Cache decoded tile to improve performance of interleaved access
+ * Parallelize data compression, add internal tile write-cache, add compressed overviews support (#748)
+ * Fix 4-bit dataset reading
+ * Expose NBITS to metadata
+
+RS2 driver:
+ * avoid potential memleak (CID 1393537, CID 1393534, CID 1074387)
+
+SENTINEL2 driver:
+ * Add support of S2x_MSIL2A files (#1069)
+
+SGI driver:
+ * writer: avoid out-of-bound buffer access. Fixes https://bugs.chromium.org/p/oss-fuzz/issues/detail?id=8889
+
+SIGDEM driver:
+ * be more robust against excessive memory allocation attempt
+ * avoid floating point division by zero. Fixes https://bugs.chromium.org/p/oss-fuzz/issues/detail?id=11220
+
+SDTS driver:
+ * avoid long processing time on corrupted dataset. Fixes https://bugs.chromium.org/p/oss-fuzz/issues/detail?id=11219
+
+SRP driver:
+ * ASRP/USRP: allow opening files padded with 0x5E / ^ character without emitting error (#838)
+
+USGSDEM driver:
+ * fix reading of Benicia.dem and Novato.dem (trac #4901, #583)
+ * optimize I/O access a bit
+ * avoid potential out-of-bounds access (CID 1393532)
+ * avoid int overflow. Fixes https://bugs.chromium.org/p/oss-fuzz/issues/detail?id=9475
+
+VRT driver:
+ * GDALCreateWarpedVRT(): automatically set GCI_AlphaBand on the alpha band
+ * data/gdalvrt.xsd: add GDALRasterAttributeTable (#818)
+ * VRTComplexSource: make sure that min and max values in case of exponential resampling are properly computed
+ * ComputeStatistics(): optimize when nodata is set on a single SimpleSource
+ * Fix issue when opening VRT with large number of bands (#1048)
+ * deal with serialized nodata value that is slightly outside Float32 validity range (#1071)
+ * fix source window computation that caused sub-pixel shift with non-nearest resampling
+ * fix potential int overflow on invalid VRT
+
+WCS driver:
+ * Parse envelopes with time periods. Improve error reporting. Fix one SUBDATASETS metadata thing. More metadata from Capabilities to metadata. Print some URLs in debug mode. Unique subset params in URLs. Add time domain interval to metadata.
+ * GeoServer does not like primary subsets to have postfixes. Fix service dirty issue. Add GeoServer TimeDomain coverage metadata. Do not put service parameter into subdataset name and use generic coverage parameter
+ * deal with GDALPamDataset::GetMetadata returning nullptr. (#648)
+
+WMTS driver:
+ * avoid issue with reprojection of layer extent into TileMatrixSet SRS
+ * fix issue with inappropriate zoom level being selected causing integer overflow in raster dimension computation
+ * fix potential off-by-one pixel when compositing the underlying WMS/TMS source into the final raster
+
+== OGR 2.4.0 - Overview of Changes ==
+
+Core:
+ * Add JSON field subtype for String fields
+ * OGR SQL: avoid int overflow on -(-9223372036854775808) evaluation. Fixes https://bugs.chromium.org/p/oss-fuzz/issues/detail?id=8717
+ * OGR SQL: evaluation modulo operator on floating point values as a floating point modulo. Fixes https://bugs.chromium.org/p/oss-fuzz/issues/detail?id=8761.
+ * OGR SQL: swq_expr_node::Evaluate(): avoid too deep recursion. Fixes https://bugs.chromium.org/p/oss-fuzz/issues/detail?id=8836
+ * OGRLineString::TransferMembersAndDestroy(): fix crashing issue with M component. Fixes https://bugs.chromium.org/p/oss-fuzz/issues/detail?id=8773.
+ * OGRGeometry::exportToGEOS(): fix potential out-of-bounds write on some GeometryCollection with TIN/PolyhedralSurface (#688)
+ * OGRGeometryFactory::organizePolygons(): improve performance for polygons with many consecutive identical nodes. Fixes https://bugs.chromium.org/p/oss-fuzz/issues/detail?id=9618
+ * Fix IsValid() for a TRIANGLE with GEOS, but without SFCGAL
+ * morphToESRI(): fix a heap user-after-free.
+ * OGRFeature::SetField( int iField, const char * const * papszValues ): avoid potential invalid access to pauFields[iField].StringList.paList
+ * SQLite dialect: fix when ROWID is used in WHERE clause and the source layer has a real FID column name
+ * GML geometry parser: recognize MultiGeometry.geometryMembers syntax (refs https://issues.qgis.org/issues/19571)
+ * OGRGetXMLDateTime(): Interpret TZFlag correctly (#996)
+ * OGRFeatureStyle: Restore font field at OGRStyleSymbol
+
+OGRSpatialReference:
+ * importFromEPSG(): append ' (deprecated)' at end of deprecated GCS and GEOCCS (#646)
+ * ogr_opt.cpp: fix wrong values and add missing values in papszProjectionDefinitions[]
+ * importFromProj4/exportToProj4: fix typo in the PROJ method name of InternalMapOfTheWorldPolyconic which is imw_p
+ * Krovak: explicit that alpha and Pseudo_standard_parallel_1 are hardcoded in PROJ
+ * SetNormProjParm(): avoid division by zero. Fixes https://bugs.chromium.org/p/oss-fuzz/issues/detail?id=10588
+ * FindMatches(): if the input SRS has a EPSG code, check that its definition and the EPSG one actually matches (#990)
+
+Utilities:
+ * ogr2ogr: reject -append, -select options together
+ * ogr2ogr: speed-up in case of big number of field name clashes. Fixes https://bugs.chromium.org/p/oss-fuzz/issues/detail?id=8960
+ * ogr2ogr: make -clipsrc work when output dataset has no geometry field (#943)
+ * ogrlineref: fix tolerance for not geographic spatial reference
+ * ogrmerge.py: avoid exception in error code path of GetOutputDriverFor()
+ * ogrmerge.py: fix issue with non-ASCII characters (fixes #1067)
+
+Multi driver changes:
+ * KML/LIBKML: robustify for out-of-memory conditions (fixes https://issues.qgis.org/issues/19989)
+ * XLSX / ODS: avoid harmless warning in some cases when guessing column data types
+
+AVCE00 driver:
+ * avoid perforance issues on huge lines. Fixes https://bugs.chromium.org/p/oss-fuzz/issues/detail?id=8284
+ * fix performance issue on reading PRJ section. Fixes https://bugs.chromium.org/p/oss-fuzz/issues/detail?id=9061
+
+BNA driver:
+ * refuse to open existing file in update mode, since it causes later crashes when attempting to add new features (https://issues.qgis.org/issues/18563)
+ * avoid long processing. Fixes https://bugs.chromium.org/p/oss-fuzz/issues/detail?id=8754
+ * more efficient building of polygons. Fixes https://bugs.chromium.org/p/oss-fuzz/issues/detail?id=10951
+
+CAD driver:
+ * Fix read objects map. Upgrade version of libopencad to 0.3.4. (#677)
+ * Fix wrong OGRCircularString construction from CADCircle. (#736)
+ * avoid integer overflow. Fixes https://bugs.chromium.org/p/oss-fuzz/issues/detail?id=8385
+ * Fix buffer overflow on skip read. Fixes https://bugs.chromium.org/p/oss-fuzz/issues/detail?id=9107
+
+Carto driver:
+ * Use new /sql/copy-from end point for writing (#715)
+ * fix ICreateFeatureCopy() with unset fields
+
+CSV driver:
+ * in writing, use WKT instead of actual geometry column name if GEOMETRY=AS_WKT mode is used without CREATE_CSVT=YES (fixes #660)
+ * writer: limit to 10000 fields to avoid performance issues. Fixes https://bugs.chromium.org/p/oss-fuzz/issues/detail?id=9336 (8449 as well)
+ * avoid endless loop when iterating and updating features (#919)
+
+DXF driver:
+ * add PaperSpace field (Trac #7121)
+ * allow attributes with spaces in the tag
+ * Correctly handle non-uniformly-weighted spline HATCH boundaries (#1011)
+ * avoid null pointer dereference when DXF_MAX_BSPLINE_CONTROL_POINTS is hit. Fixes https://bugs.chromium.org/p/oss-fuzz/issues/detail?id=8254.
+ * Fix reporting of wrong line numbers in errors (fixes #726)
+ * Don't crash when spline control point limit is reached
+ * fix memory leak in case of attempt to write GeometryCollection of unsupported type
+
+EDIGEO driver:
+ * reading multipolygons (trac #6955, #711)
+
+ElasticSearch driver:
+ * add compatibility with ES v6.0
+ * add a USERPWD open option
+ * add lazy loading of layers
+ * add a LAYER open option
+ * skip xpack indices, and do not emit 503 error when listing unauthorized layers
+ * add a INDEX_DEFINITION layer creation option
+ *allow several geometry fields of type GEO_POINT to be created
+
+ESRIJson driver:
+ * parse documents that lack 'geometryType' member (#914)
+
+GeoJSON driver:
+ * fix type deduction when there is a Feature.id of type string and Feature.properties.id of type int. The later has precedence over the former (arbitrary decision) (#669)
+ * properly flush the file in SyncToDisk() in append situations (https://issues.qgis.org/issues/18596)
+ * parse '{"type": "GeometryCollection", "geometries": []}' as empty geometrycollection
+ * increase max memory allowed to parse a single feature (#807)
+ * remore topojson from extensions recognized by the driver
+ * add partial support for field names differing by case (#1057)
+ * RFC7946 writer: clip and offset geometries outside [-180,180] (#1068)
+ * no longer write NaN/Infinity values by default (#1109)
+
+GeoRSS driver:
+ * avoid excessive processing time. Fixes https://bugs.chromium.org/p/oss-fuzz/issues/detail?id=9263
+
+GML driver:
+ * avoid fetching SRS from http
+ * fix potential memory leak in case of duplicated name of geometry fields in .gfs
+ * improve performance for large number of attributes. Fixes https://bugs.chromium.org/p/oss-fuzz/issues/detail?id=9038.
+
+GPKG driver:
+ * add read/write support for JSON field subtype
+ * speed up GetExtent() on huge tables with rtree. Refs https://issues.qgis.org/issues/18402
+ * take into ROLLBACK TO SAVEPOINT to invalidate cached feature count
+ * make sure to not invalidate POSIX advisory locks
+ * remove useless check that encoding is UTF-8 (#793)
+ * fix typo in gpkg_metadata_reference_column_name_update trigger definition
+ * optimize table renaming by avoiding to drop the spatial index, but just renaming it
+
+IDF driver:
+ * use a temporary SQLite database (when driver available) for files larger than 100 MB
+ * add support for Z coordinate (#964)
+
+LIBKML driver:
+ * add support for reading several schemas for the same layer (#826)
+ * make edition of existing file work (https://issues.qgis.org/issues/18631)
+ * implement OGRLIBKMLLayer::SyncToDisk() to fix https://issues.qgis.org/issues/18631
+ * workaround weird issue with OSGeo4W and newline characters in <coordinate> element (fixes https://issues.qgis.org/issues/19215)
+
+MITAB driver:
+ * fix potential use of uninitialized memory
+ * improve performance of adding many fields in a .tab. Fixes https://bugs.chromium.org/p/oss-fuzz/issues/detail?id=8559
+ * fix geometry corruption when editing some datasets (#817)
+ * fix writing .tab when field name has invalid characters in it (#924)
+ * Expose font family to feature style symbol ID
+
+MSSQLSpatial driver:
+ * Add support for MSODBCSQL (#1136) 
+ * Fix layer-schema separation problem (#586)
+ * Fix bulk copy for multiple layers (#619)
+ * Accept datetime values (#841)
+ * Don't truncate string values on Unix (#843)
+ * Create 3D features (#852)
+ * enforce read-only/update mode for CreateFeature/SetFeature/DeleteFeature
+ * fix retrieval of geometry column on Linux for SQL result layers
+ * Use only valid SRIDs; Create features preserving SRID (#860)
+ * Fix geometry parser with M values (#1051)
+ * Assign new ID following an INSERT (#1052)
+ * Adding configuration option MSSQLSPATIAL_ALWAYS_OUTPUT_FID (#1101)
+
+MVT driver:
+ * writer: do not ignore Z/M/ZM geometries
+ * writer: make it possible to output to /vsizip/output.zip out-of-the-box
+ * disable check on 'extent' field in identifiation method, which rejected tiles with extent > 16384
+ * avoid recursion on opening. Fixes https://bugs.chromium.org/p/oss-fuzz/issues/detail?id=10226
+
+MySQL:
+ * add support for MySQL 8.0
+
+NAS driver:
+ * speed-up in case of huge number of attributes. Fixes https://bugs.chromium.org/p/oss-fuzz/issues/detail?id=7977
+
+OCI driver:
+ * Ensure table Dims and GTYPE are retrieved for the correct table (#629)
+
+OGR_GMT driver:
+ * avoid performance issue when opening layer with big number of fields. Fixes https://bugs.chromium.org/p/oss-fuzz/issues/detail?id=8259.
+
+OGR_PDS driver:
+ * avoid int overflow. Fixes https://bugs.chromium.org/p/oss-fuzz/issues/detail?id=9136
+
+OpenFileGDB driver:
+ * Catch a NaN in FileGDBDoubleDateToOGRDate to prevent undefined behavior. (#740)
+ * fix potential crash on corrupted datasets. Fixes https://bugs.chromium.org/p/oss-fuzz/issues/detail?id=11313
+
+OSM driver:
+ * allow parsing files with up to 10 000 nodes per way (#849)
+ * avoid array overflow with ways with many tags. Relates to https://bugs.chromium.org/p/oss-fuzz/issues/detail?id=9618
+
+PCIDSK driver:
+ * defer writing of segement header to improve performance when creating huge number of fields. Fixes https://bugs.chromium.org/p/oss-fuzz/issues/detail?id=8191
+ * fix performance issue when inserting in layer with huge number of fields. Fixes https://bugs.chromium.org/p/oss-fuzz/issues/detail?id=8335.
+
+PDF driver:
+ * fix the parser of drawing instructions that had issues with array objects
+
+PG driver:
+ * add SPATIAL_INDEX=SPGIST/BRIN layer creation options (and PGDump as well) (#892)
+ * add read/write support for JSON field subtype
+
+PGDump driver:
+
+PLScenes driver:
+ * fix /vsicurl/ raster download
+ * fix scene activation
+ * add ground_control field in layer definition
+
+Shapefile driver:
+ * avoid being dependent on correctness of file size field in .shp
+ * fix corruption when deleting a field from a .dbf without records (#863)
+ * Add CP1251 codepage name synonym (ANSI 1251) for DBF files.
+
+S57 driver:
+ * add S57_AALL, S57_NALL, S57_COMF, S57_SOMF creation options (#810)
+
+SOSI driver:
+ * fix memory leaks / null pointer dereference
+
+SQLite/Spatialite driver:
+ * avoid SetFeature() to reset the iterator (#964)
+ * Spatialite: read table name in its original case (#1060)
+ * do not run spatial index creation in rollback code
+
+VFK driver:
+ * create index on ID column only for selected (geometry-related) layers (#498)
+ * create db indices after inserting data (#498)
+ * create indices before resolving geometry
+ * new open option - include filename field (#564)
+ * speed up sequential feature access
+ * fix leak of unfinalized statement (#634)
+ * fix file check on Windows with large files (#637)
+ * fix big int overflow, force text attributes (PODIL_CITATEL/PODIL_JMENOVATEL) to avoid int64 overflow (#672)
+ * fix missing geometry for SBPG layer (#710)
+ * missing fields in update mode gfs (#734)
+
+VRT driver:
+ * revise logic for handling the <FID> element (or when it is omitted) (#941)
+
+WFS driver:
+ * avoid potential bad cast. Fixes https://bugs.chromium.org/p/oss-fuzz/issues/detail?id=9800
+
+WFS3 driver:
+ * update to current version (May 2018) of the API draft (#626)
+ * add USERPWD open option
+
+XLSX driver:
+ * avoid stack buffer overflow is creating too many fields. Fixes https://bugs.chromium.org/p/oss-fuzz/issues/detail?id=8198
+ * avoid timeout. Fixes https://bugs.chromium.org/p/oss-fuzz/issues/detail?id=8225
+ * fix null pointer dereference. Fixes https://bugs.chromium.org/p/oss-fuzz/issues/detail?id=8286
+
+== SWIG Language Bindings ==
+
+All bindings:
+ * use a dedicated VSILFILE class to avoid type mismatch (#601)
+ * reload drivers if GDAL_SKIP/OGR_SKIP is defined with --config in gdal/ogr.GeneralCmdLineProcessor()
+ * Add VSIFFlushL()
+ * Add VSIErrorReset()
+
+CSharp bindings:
+ * GDALCreateCopy.cs sample code: Correct misspelling in info message (#647)
+ * SWIG 2.x and 3.x compatibility (#824)
+
+Java bindings:
+ * update to Java 1.6 requirement to please 'ant maven' target
+ * Fix JNI library bundling.
+
+Perl bindings:
+ * fix make dependencies (#43)
+
+Python bindings:
+ * Python logging improvements: add gdal.ConfigurePythonLogging() function  (#1017)
+ * added support for band / pixel interleave for numpy array
+ * fixed NULL check on python's swig VSIFReadL (#572)
+ * fix dataset[slice] access (#574)
+ * added support for reading vsi data as memorybuffer and writing buffers via VSIFWriteL
+ * setup.py: add more prominent warning when numpy is not available (#822)
+ * for utilities as library functions, when gdal.UseExceptions() is enabled, do not emit Python exceptions when the operation is reported as successful
+ * update import path
+ * avoid crash in ReadRaster() under low memory condition (#1026)
+
 = GDAL/OGR 2.3.0 Release Notes =
 
 Note: due to the change of SCM during the development, #XXXX still refers to
diff --git a/gdal/gcore/gdal_version.h.in b/gdal/gcore/gdal_version.h.in
index c7fa78374690..62dbc352db9b 100644
--- a/gdal/gcore/gdal_version.h.in
+++ b/gdal/gcore/gdal_version.h.in
@@ -24,9 +24,9 @@
 
 #if !defined(DO_NOT_DEFINE_GDAL_RELEASE_DATE_AND_GDAL_RELEASE_NAME)
 #ifndef GDAL_RELEASE_DATE
-#  define GDAL_RELEASE_DATE     20189999
+#  define GDAL_RELEASE_DATE     20181214
 #endif
 #ifndef GDAL_RELEASE_NAME
-#  define GDAL_RELEASE_NAME     "2.4.0dev"
+#  define GDAL_RELEASE_NAME     "2.4.0"
 #endif
 #endif
diff --git a/gdal/nmake.opt b/gdal/nmake.opt
index adb87f6965e8..e68f65adf2f3 100644
--- a/gdal/nmake.opt
+++ b/gdal/nmake.opt
@@ -204,7 +204,7 @@ STDCALL=YES
 # Version number embedded in DLL name. 
 # If GDAL version is X.Y.Z, VERSION = X * 100 + Y
 !IFNDEF VERSION
-VERSION =	203
+VERSION =	204
 !ENDIF
 
 # Comment the following out if you want PAM supported disabled
diff --git a/gdal/swig/include/perl/gdal_perl.i b/gdal/swig/include/perl/gdal_perl.i
index 0db64c457035..b87a2a32f390 100644
--- a/gdal/swig/include/perl/gdal_perl.i
+++ b/gdal/swig/include/perl/gdal_perl.i
@@ -143,8 +143,8 @@ use Geo::GDAL::Const;
 # Note that the 1/100000 digits may be used to create more than one
 # CPAN release from one GDAL release.
 
-our $VERSION = '2.0300';
-our $GDAL_VERSION = '2.3.0';
+our $VERSION = '2.0400';
+our $GDAL_VERSION = '2.4.0';
 
 =pod
 
diff --git a/gdal/swig/include/perl/ogr_perl.i b/gdal/swig/include/perl/ogr_perl.i
index 4f57c72b9a26..d95d4bb664df 100644
--- a/gdal/swig/include/perl/ogr_perl.i
+++ b/gdal/swig/include/perl/ogr_perl.i
@@ -126,7 +126,7 @@ ALTERED_DESTROY(OGRGeometryShadow, OGRc, delete_Geometry)
 %perlcode %{
 
 package Geo::OGR;
-our $VERSION = '2.0300'; # this needs to be the same as that in gdal_perl.i
+our $VERSION = '2.0400'; # this needs to be the same as that in gdal_perl.i
 
 Geo::GDAL->import(qw(:INTERNAL));
 
diff --git a/gdal/swig/python/README.txt b/gdal/swig/python/README.txt
index e1bfb50a1bd1..67b7948cbc98 100644
--- a/gdal/swig/python/README.txt
+++ b/gdal/swig/python/README.txt
@@ -16,7 +16,7 @@ reference documentation, but the `GDAL API Tutorial`_ includes Python examples.
 Dependencies
 ------------
  
- * libgdal (2.3.0 or greater) and header files (gdal-devel)
+ * libgdal (2.4.0 or greater) and header files (gdal-devel)
  * numpy (1.0.0 or greater) and header files (numpy-devel) (not explicitly 
    required, but many examples and utilities will not work without it)
 
diff --git a/gdal/swig/python/setup.py b/gdal/swig/python/setup.py
index 40f34a22f862..ad1891c95c21 100644
--- a/gdal/swig/python/setup.py
+++ b/gdal/swig/python/setup.py
@@ -7,7 +7,7 @@
 # Howard Butler hobu.inc@gmail.com
 
 
-gdal_version = '2.3.0'
+gdal_version = '2.4.0'
 
 import sys
 import os

From 6460dae6c2111dfe7c4c704cc7ca6800612c431e Mon Sep 17 00:00:00 2001
From: Dmitry Baryshnikov <bishop.dev@gmail.com>
Date: Sat, 15 Dec 2018 18:30:58 +0300
Subject: [PATCH 175/488] ngw.py: Fix #1145. Add check if DCAP_CREATECOPY
 metadata item available in NGW raster autotest.

---
 autotest/gdrivers/ngw.py | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

diff --git a/autotest/gdrivers/ngw.py b/autotest/gdrivers/ngw.py
index bbcb44c1d281..4ca5da8cbdbd 100755
--- a/autotest/gdrivers/ngw.py
+++ b/autotest/gdrivers/ngw.py
@@ -51,13 +51,20 @@ def test_ngw_1():
     if gdaltest.ngw_drv is None:
         pytest.skip()
 
-    # TODO: Change to 'http://dev.nextgis.com/sandbox' after adding raster create copy support.
-    gdaltest.ngw_test_server = 'https://demo.nextgis.com'
+    # Check support CreateCopy
+    if gdaltest.ngw_drv.GetMetadataItem(gdal.DCAP_CREATECOPY) is None:
+        gdaltest.ngw_drv = None
+        pytest.skip()
+
+    gdaltest.ngw_test_server = 'https://dev.nextgis.com/sandbox'
 
     if check_availability(gdaltest.ngw_test_server) == False:
         gdaltest.ngw_drv = None
         pytest.skip()
 
+###############################################################################
+# TODO: Create the NGW raster layer
+
 ###############################################################################
 # Open the NGW dataset
 

From dc84d927deef5a36474d37c32267fb5b2ba8c704 Mon Sep 17 00:00:00 2001
From: Even Rouault <even.rouault@spatialys.com>
Date: Mon, 17 Dec 2018 23:28:34 +0100
Subject: [PATCH 176/488] Coordinate transformation: do not apply +towgs84 if
 it is present only one one of the CRS (fixes #1156)

---
 autotest/osr/osr_ct.py | 67 +++++++++++++++++++++++++++++++++++++++++-
 gdal/ogr/ogrct.cpp     | 45 ++++++++++++++++++++++++++++
 2 files changed, 111 insertions(+), 1 deletion(-)

diff --git a/autotest/osr/osr_ct.py b/autotest/osr/osr_ct.py
index ccd4b0ec6cc8..6006b02ff8df 100755
--- a/autotest/osr/osr_ct.py
+++ b/autotest/osr/osr_ct.py
@@ -286,7 +286,72 @@ def test_osr_ct_8():
                 print('Expected: %s' % str(expected_result))
                 pytest.fail('Failed to transform from Pseudo Mercator to LL')
 
-    
+
+###############################################################################
+# Test coordinate transformation where only one CRS has a towgs84 clause (#1156)
+
+
+def test_osr_ct_towgs84_only_one_side():
+
+    if gdaltest.have_proj4 == 0:
+        pytest.skip()
+
+    srs_towgs84 = osr.SpatialReference()
+    srs_towgs84.SetFromUserInput("+proj=longlat +ellps=GRS80 +towgs84=100,200,300")
+
+    srs_just_ellps = osr.SpatialReference()
+    srs_just_ellps.SetFromUserInput('+proj=longlat +ellps=GRS80')
+
+    ct = osr.CoordinateTransformation(srs_towgs84, srs_just_ellps)
+    (x, y, z) = ct.TransformPoint(0, 0, 0)
+    assert x == 0
+    assert y == 0
+    assert z == 0
+
+    ct = osr.CoordinateTransformation(srs_just_ellps, srs_towgs84)
+    (x, y, z) = ct.TransformPoint(0, 0, 0)
+    assert x == 0
+    assert y == 0
+    assert z == 0
+
+
+###############################################################################
+# Test coordinate transformation where both side have towgs84/datum clause (#1156)
+
+
+def test_osr_ct_towgs84_both_side():
+
+    if gdaltest.have_proj4 == 0:
+        pytest.skip()
+
+    srs_towgs84 = osr.SpatialReference()
+    srs_towgs84.SetFromUserInput("+proj=longlat +ellps=GRS80 +towgs84=100,200,300")
+
+    srs_other_towgs84 = osr.SpatialReference()
+    srs_other_towgs84.SetFromUserInput("+proj=longlat +ellps=GRS80 +towgs84=0,0,0")
+
+    ct = osr.CoordinateTransformation(srs_towgs84, srs_other_towgs84)
+    (x, y, z) = ct.TransformPoint(0, 0, 0)
+    assert x != 0
+    assert y != 0
+    assert z != 0
+
+    srs_datum_wgs84 = osr.SpatialReference()
+    srs_datum_wgs84.SetFromUserInput("+proj=longlat +datum=WGS84")
+
+    ct = osr.CoordinateTransformation(srs_towgs84, srs_datum_wgs84)
+    (x, y, z) = ct.TransformPoint(0, 0, 0)
+    assert x != 0
+    assert y != 0
+    assert z != 0
+
+    ct = osr.CoordinateTransformation(srs_datum_wgs84, srs_towgs84)
+    (x, y, z) = ct.TransformPoint(0, 0, 0)
+    assert x != 0
+    assert y != 0
+    assert z != 0
+
+
 ###############################################################################
 # Cleanup
 
diff --git a/gdal/ogr/ogrct.cpp b/gdal/ogr/ogrct.cpp
index 0fa048d6ddf3..b1ed5e6e5b1d 100644
--- a/gdal/ogr/ogrct.cpp
+++ b/gdal/ogr/ogrct.cpp
@@ -856,6 +856,51 @@ int OGRProj4CT::InitializeNoLock( OGRSpatialReference * poSourceIn,
                    "+x_0=0.0 +y_0=0 +k=1.0 +units=m +no_defs") == 0;
     }
 
+    // Remove towgs84/nadgrids if it is present only on one side.
+    // Only really needed for PROJ 5, but doesn't hurt for PROJ 4
+    {
+        const bool bSrcHasToWGS84Transform =
+            strstr(pszSrcProj4Defn, "+towgs84") != nullptr ||
+            strstr(pszSrcProj4Defn, "+nadgrids") != nullptr;
+        const bool bSrcHasDatum = strstr(pszSrcProj4Defn, "+datum");
+        const bool bDstHasToWGS84Transform =
+            strstr(pszDstProj4Defn, "+towgs84") != nullptr ||
+            strstr(pszDstProj4Defn, "+nadgrids") != nullptr;
+        const bool bDstHasDatum = strstr(pszDstProj4Defn, "+datum");
+
+        const auto removeToken = [](const CPLString& osStr, const char* token) {
+            CPLString osRet(osStr);
+            auto pos = osStr.find(token);
+            if( pos == std::string::npos )
+                return osRet;
+            auto posNextOpt = osStr.find(" +", pos);
+            if( posNextOpt == std::string::npos )
+            {
+                osRet.resize(pos);
+                return osRet;
+            }
+            osRet = osRet.substr(0, pos) + osRet.substr(posNextOpt + 1);
+            return osRet;
+        };
+
+        if( bSrcHasToWGS84Transform && !(bDstHasToWGS84Transform || bDstHasDatum) )
+        {
+            CPLString osSrcProj4Defn(pszSrcProj4Defn);
+            osSrcProj4Defn = removeToken(osSrcProj4Defn, "+towgs84");
+            osSrcProj4Defn = removeToken(osSrcProj4Defn, "+nadgrids");
+            CPLFree(pszSrcProj4Defn);
+            pszSrcProj4Defn = CPLStrdup(osSrcProj4Defn);
+        }
+        else if( bDstHasToWGS84Transform && !(bSrcHasToWGS84Transform || bSrcHasDatum) )
+        {
+            CPLString osDstProj4Defn(pszDstProj4Defn);
+            osDstProj4Defn = removeToken(osDstProj4Defn, "+towgs84");
+            osDstProj4Defn = removeToken(osDstProj4Defn, "+nadgrids");
+            CPLFree(pszDstProj4Defn);
+            pszDstProj4Defn = CPLStrdup(osDstProj4Defn);
+        }
+    }
+
 /* -------------------------------------------------------------------- */
 /*      Establish PROJ.4 handle for source if projection.               */
 /* -------------------------------------------------------------------- */

From 7751adc594266c08b0e79c8a9328849dfc675771 Mon Sep 17 00:00:00 2001
From: Even Rouault <even.rouault@spatialys.com>
Date: Tue, 18 Dec 2018 00:17:16 +0100
Subject: [PATCH 177/488] Fix build issue with MSVC 2015 (refs #1156)

---
 gdal/ogr/ogrct.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/gdal/ogr/ogrct.cpp b/gdal/ogr/ogrct.cpp
index b1ed5e6e5b1d..5716e9eab14e 100644
--- a/gdal/ogr/ogrct.cpp
+++ b/gdal/ogr/ogrct.cpp
@@ -862,11 +862,11 @@ int OGRProj4CT::InitializeNoLock( OGRSpatialReference * poSourceIn,
         const bool bSrcHasToWGS84Transform =
             strstr(pszSrcProj4Defn, "+towgs84") != nullptr ||
             strstr(pszSrcProj4Defn, "+nadgrids") != nullptr;
-        const bool bSrcHasDatum = strstr(pszSrcProj4Defn, "+datum");
+        const bool bSrcHasDatum = strstr(pszSrcProj4Defn, "+datum") != nullptr;
         const bool bDstHasToWGS84Transform =
             strstr(pszDstProj4Defn, "+towgs84") != nullptr ||
             strstr(pszDstProj4Defn, "+nadgrids") != nullptr;
-        const bool bDstHasDatum = strstr(pszDstProj4Defn, "+datum");
+        const bool bDstHasDatum = strstr(pszDstProj4Defn, "+datum") != nullptr;
 
         const auto removeToken = [](const CPLString& osStr, const char* token) {
             CPLString osRet(osStr);

From 2a852b3e2fef46a284c81658d254276dd18ab178 Mon Sep 17 00:00:00 2001
From: Brian-Bunker <brian.bunker@beckshybrids.com>
Date: Fri, 21 Dec 2018 11:58:29 -0600
Subject: [PATCH 178/488] gdal2tiles: give local tile layer and basemap layers
 same min/max zoom levels as generated tile cache (fixes #1074)

---
 gdal/swig/python/scripts/gdal2tiles.py | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/gdal/swig/python/scripts/gdal2tiles.py b/gdal/swig/python/scripts/gdal2tiles.py
index 37eb380ff1f8..d496dad69ebc 100755
--- a/gdal/swig/python/scripts/gdal2tiles.py
+++ b/gdal/swig/python/scripts/gdal2tiles.py
@@ -2355,19 +2355,19 @@ def generate_leaflet(self):
 
         // Base layers
         //  .. OpenStreetMap
-        var osm = L.tileLayer('http://{s}.tile.osm.org/{z}/{x}/{y}.png', {attribution: '&copy; <a href="http://osm.org/copyright">OpenStreetMap</a> contributors'});
+        var osm = L.tileLayer('http://{s}.tile.osm.org/{z}/{x}/{y}.png', {attribution: '&copy; <a href="http://osm.org/copyright">OpenStreetMap</a> contributors', minZoom: %(minzoom)s, maxZoom: %(maxzoom)s});
 
         //  .. CartoDB Positron
-        var cartodb = L.tileLayer('http://{s}.basemaps.cartocdn.com/light_all/{z}/{x}/{y}.png', {attribution: '&copy; <a href="http://www.openstreetmap.org/copyright">OpenStreetMap</a> contributors, &copy; <a href="http://cartodb.com/attributions">CartoDB</a>'});
+        var cartodb = L.tileLayer('http://{s}.basemaps.cartocdn.com/light_all/{z}/{x}/{y}.png', {attribution: '&copy; <a href="http://www.openstreetmap.org/copyright">OpenStreetMap</a> contributors, &copy; <a href="http://cartodb.com/attributions">CartoDB</a>', minZoom: %(minzoom)s, maxZoom: %(maxzoom)s});
 
         //  .. OSM Toner
-        var toner = L.tileLayer('http://{s}.tile.stamen.com/toner/{z}/{x}/{y}.png', {attribution: 'Map tiles by <a href="http://stamen.com">Stamen Design</a>, under <a href="http://creativecommons.org/licenses/by/3.0">CC BY 3.0</a>. Data by <a href="http://openstreetmap.org">OpenStreetMap</a>, under <a href="http://www.openstreetmap.org/copyright">ODbL</a>.'});
+        var toner = L.tileLayer('http://{s}.tile.stamen.com/toner/{z}/{x}/{y}.png', {attribution: 'Map tiles by <a href="http://stamen.com">Stamen Design</a>, under <a href="http://creativecommons.org/licenses/by/3.0">CC BY 3.0</a>. Data by <a href="http://openstreetmap.org">OpenStreetMap</a>, under <a href="http://www.openstreetmap.org/copyright">ODbL</a>.', minZoom: %(minzoom)s, maxZoom: %(maxzoom)s});
 
         //  .. White background
-        var white = L.tileLayer("data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAQAAAAEAAQMAAABmvDolAAAAA1BMVEX///+nxBvIAAAAH0lEQVQYGe3BAQ0AAADCIPunfg43YAAAAAAAAAAA5wIhAAAB9aK9BAAAAABJRU5ErkJggg==");
+        var white = L.tileLayer("data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAQAAAAEAAQMAAABmvDolAAAAA1BMVEX///+nxBvIAAAAH0lEQVQYGe3BAQ0AAADCIPunfg43YAAAAAAAAAAA5wIhAAAB9aK9BAAAAABJRU5ErkJggg==", {minZoom: %(minzoom)s, maxZoom: %(maxzoom)s});
 
         // Overlay layers (TMS)
-        var lyr = L.tileLayer('./{z}/{x}/{y}.%(tileformat)s', {tms: true, opacity: 0.7, attribution: "%(copyright)s"});
+        var lyr = L.tileLayer('./{z}/{x}/{y}.%(tileformat)s', {tms: true, opacity: 0.7, attribution: "%(copyright)s", minZoom: %(minzoom)s, maxZoom: %(maxzoom)s});
 
         // Map
         var map = L.map('map', {

From e7b66104a47ca8263fc6aed748b9d28c19c0a93e Mon Sep 17 00:00:00 2001
From: "Juergen E. Fischer" <jef@norbit.de>
Date: Wed, 12 Dec 2018 22:09:01 +0100
Subject: [PATCH 179/488] typo fix

(cherry picked from commit 1a61111b3c59a334313999bcf95ccaf3caedb8f2)
---
 gdal/alg/rasterfill.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/gdal/alg/rasterfill.cpp b/gdal/alg/rasterfill.cpp
index 6804730ff1b5..761b621974db 100644
--- a/gdal/alg/rasterfill.cpp
+++ b/gdal/alg/rasterfill.cpp
@@ -397,7 +397,7 @@ if( quad_value != nNoDataVal )                                          \
  * <li>TEMP_FILE_DRIVER=gdal_driver_name. For example MEM.</li>
  * <li>NODATA=value (starting with GDAL 2.4).
  * Source pixels at that value will be ignored by the interpolator. Warning:
- * currently this will not be honored by smothing passes.</li>
+ * currently this will not be honored by smoothing passes.</li>
  * </ul>
  * @param pfnProgress the progress function to report completion.
  * @param pProgressArg callback data for progress function.

From fe66521fc5854bf38bc2eb42326d9a17d2f0f275 Mon Sep 17 00:00:00 2001
From: "Juergen E. Fischer" <jef@norbit.de>
Date: Sat, 22 Dec 2018 13:46:01 +0100
Subject: [PATCH 180/488] cpl_vsi.h: fix include for C use

(cherry picked from commit 24c7d45541f903c462f81057b394df75cbe40df4)
---
 gdal/port/cpl_vsi.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/gdal/port/cpl_vsi.h b/gdal/port/cpl_vsi.h
index af6027fcc81d..1997b1a33ecd 100644
--- a/gdal/port/cpl_vsi.h
+++ b/gdal/port/cpl_vsi.h
@@ -330,7 +330,7 @@ typedef struct VSIDIREntry
     /** NULL-terminated list of extra properties. */
     char**       papszExtra;
 
-#ifdef __cplusplus
+#if defined(__cplusplus) && !defined(CPL_SUPRESS_CPLUSPLUS)
 /*! @cond Doxygen_Suppress */
     VSIDIREntry();
     ~VSIDIREntry();

From 549bdc036c42c3562186f2148701f3c6fb68e4f6 Mon Sep 17 00:00:00 2001
From: Even Rouault <even.rouault@spatialys.com>
Date: Sun, 23 Dec 2018 11:20:51 +0100
Subject: [PATCH 181/488] Fix build with OpenBSD which doesn't support
 RLIMIT_AS (fixes #1163)

---
 gdal/configure              | 37 +++++++++++++++++++++++++++++++++++++
 gdal/configure.ac           | 17 +++++++++++++++++
 gdal/port/cpl_config.h.in   |  3 +++
 gdal/port/cpl_vsisimple.cpp |  8 +++++++-
 4 files changed, 64 insertions(+), 1 deletion(-)

diff --git a/gdal/configure b/gdal/configure
index 7d02c48af2a7..ead028e0da78 100755
--- a/gdal/configure
+++ b/gdal/configure
@@ -21224,6 +21224,43 @@ fi
 done
 
 
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for RLIMIT_AS" >&5
+$as_echo_n "checking for RLIMIT_AS... " >&6; }
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+#include <sys/time.h>
+#include <sys/resource.h>
+
+int
+main ()
+{
+
+    return RLIMIT_AS;
+
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"; then :
+
+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
+
+cat >>confdefs.h <<_ACEOF
+#define HAVE_RLIMIT_AS 1
+_ACEOF
+
+
+else
+
+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+
+
 
 ac_ext=cpp
 ac_cpp='$CXXCPP $CPPFLAGS'
diff --git a/gdal/configure.ac b/gdal/configure.ac
index 940c712ed69f..90e9808d83ab 100644
--- a/gdal/configure.ac
+++ b/gdal/configure.ac
@@ -356,6 +356,23 @@ AC_CHECK_FUNCS(statvfs)
 AC_CHECK_FUNCS(statvfs64)
 AC_CHECK_FUNCS(getrlimit)
 
+AC_MSG_CHECKING([for RLIMIT_AS])
+AC_TRY_COMPILE(
+  [
+#include <sys/time.h>
+#include <sys/resource.h>
+  ], [
+    return RLIMIT_AS;
+  ],
+  [
+    AC_MSG_RESULT([yes])
+    AC_DEFINE_UNQUOTED(HAVE_RLIMIT_AS, 1,
+          [Define to 1 if you have the `RLIMIT_AS' constant.])
+  ], [
+    AC_MSG_RESULT([no])
+])
+
+
 dnl Make sure at least these are checked under C++.  Prototypes missing on
 dnl some platforms.
 
diff --git a/gdal/port/cpl_config.h.in b/gdal/port/cpl_config.h.in
index 7699929cef14..05ab2cfd75c9 100644
--- a/gdal/port/cpl_config.h.in
+++ b/gdal/port/cpl_config.h.in
@@ -31,6 +31,9 @@
 /* Define to 1 if you have the `getrlimit' function. */
 #undef HAVE_GETRLIMIT
 
+/* Define to 1 if you have the `RLIMIT_AS' constant. */
+#undef HAVE_RLIMIT_AS
+
 /* Define to 1 if you have the <csf.h> header file. */
 #undef HAVE_CSF_H
 
diff --git a/gdal/port/cpl_vsisimple.cpp b/gdal/port/cpl_vsisimple.cpp
index af4a01bea9f4..e967caa8996b 100644
--- a/gdal/port/cpl_vsisimple.cpp
+++ b/gdal/port/cpl_vsisimple.cpp
@@ -1466,7 +1466,13 @@ GIntBig CPLGetUsablePhysicalRAM( void )
 #endif
 #if HAVE_GETRLIMIT
     struct rlimit sLimit;
-    if( getrlimit( RLIMIT_AS, &sLimit) == 0 &&
+#   if HAVE_RLIMIT_AS
+    const int res = RLIMIT_AS;
+#   else
+    // OpenBSD currently doesn't support RLIMIT_AS (mandated by Posix though)
+    const int res = RLIMIT_DATA;
+#   endif
+    if( getrlimit( res, &sLimit) == 0 &&
         sLimit.rlim_cur != RLIM_INFINITY &&
         static_cast<GIntBig>(sLimit.rlim_cur) < nRAM )
     {

From df62e3b697f440ef6581b6cea852ff8321b82164 Mon Sep 17 00:00:00 2001
From: Even Rouault <even.rouault@spatialys.com>
Date: Thu, 27 Dec 2018 11:19:58 +0100
Subject: [PATCH 182/488] nmake.opt: remove unicode character at line starting
 with '# 4275' that apparently cause build issues with some MSVC versions
 (fixes #1169)

---
 gdal/nmake.opt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/gdal/nmake.opt b/gdal/nmake.opt
index e68f65adf2f3..d958e187555e 100644
--- a/gdal/nmake.opt
+++ b/gdal/nmake.opt
@@ -145,7 +145,7 @@ OPTFLAGS= $(CXX_ANALYZE_FLAGS) $(CXX_PDB_FLAGS) /nologo /MP /MDd /EHsc /FC /D_CR
 !IFNDEF WARNFLAGS
 # 4127: conditional expression is constant
 # 4251: 'identifier' : class 'type' needs to have dll-interface to be used by clients of class 'type2'
-# 4275: non – DLL-interface classkey 'identifier' used as base for DLL-interface classkey 'identifier'
+# 4275: non DLL-interface classkey 'identifier' used as base for DLL-interface classkey 'identifier'
 # 4786: ??????????
 # 4100: 'identifier' : unreferenced formal parameter
 # 4245: 'conversion' : conversion from 'type1' to 'type2', signed/unsigned mismatch

From 180cc0e360c9190a08dd030bc6466c4d9082be97 Mon Sep 17 00:00:00 2001
From: Dmitry Baryshnikov <bishop.dev@gmail.com>
Date: Sun, 30 Dec 2018 23:58:52 +0300
Subject: [PATCH 183/488] NGW: Fix autotests in 2.4

---
 autotest/gdrivers/ngw.py             | 20 ++++++++++++++++++--
 autotest/ogr/ogr_ngw.py              | 24 ++++++++++++++++++++----
 gdal/ogr/ogrsf_frmts/ngw/ngw_api.cpp |  2 +-
 3 files changed, 39 insertions(+), 7 deletions(-)

diff --git a/autotest/gdrivers/ngw.py b/autotest/gdrivers/ngw.py
index 4ca5da8cbdbd..02f45a0d100b 100755
--- a/autotest/gdrivers/ngw.py
+++ b/autotest/gdrivers/ngw.py
@@ -36,11 +36,27 @@
 sys.path.append('../pymod')
 
 import gdaltest
+import json
 import pytest
 
 def check_availability(url):
     version_url = url + '/api/component/pyramid/pkg_version'
-    return gdaltest.gdalurlopen(version_url) is not None
+    if gdaltest.gdalurlopen(version_url) is None:
+        return False
+
+    # Check quota
+    quota_url = url + '/api/resource/quota'
+    quota_conn = gdaltest.gdalurlopen(quota_url)
+    try:
+        quota_json = json.loads(quota_conn.read())
+        quota_conn.close()
+        if quota_json is None:
+            return False
+        limit = quota_json['limit']
+        count = quota_json['count']
+        return limit - count > 10
+    except:
+        return False
 
 ###############################################################################
 # Verify we have the driver.
@@ -56,7 +72,7 @@ def test_ngw_1():
         gdaltest.ngw_drv = None
         pytest.skip()
 
-    gdaltest.ngw_test_server = 'https://dev.nextgis.com/sandbox'
+    gdaltest.ngw_test_server = 'http://dev.nextgis.com/sandbox'
 
     if check_availability(gdaltest.ngw_test_server) == False:
         gdaltest.ngw_drv = None
diff --git a/autotest/ogr/ogr_ngw.py b/autotest/ogr/ogr_ngw.py
index bebdd603674d..92e30652d3f8 100644
--- a/autotest/ogr/ogr_ngw.py
+++ b/autotest/ogr/ogr_ngw.py
@@ -38,11 +38,27 @@
 from osgeo import ogr
 from osgeo import osr
 import time
+import json
 import pytest
 
 def check_availability(url):
     version_url = url + '/api/component/pyramid/pkg_version'
-    return gdaltest.gdalurlopen(version_url) is not None
+    if gdaltest.gdalurlopen(version_url) is None:
+        return False
+
+    # Check quota
+    quota_url = url + '/api/resource/quota'
+    quota_conn = gdaltest.gdalurlopen(quota_url)
+    try:
+        quota_json = json.loads(quota_conn.read())
+        quota_conn.close()
+        if quota_json is None:
+            return False
+        limit = quota_json['limit']
+        count = quota_json['count']
+        return limit - count > 10
+    except:
+        return False
 
 ###############################################################################
 # Check driver existence.
@@ -85,6 +101,7 @@ def test_ogr_ngw_2():
 
     assert int(gdaltest.ngw_ds.GetMetadataItem('id', '')) > 0, \
         'Did not get expected datasource identifier.'
+    gdaltest.group_id = gdaltest.ngw_ds.GetMetadataItem('id', '')
 
 ###############################################################################
 # Check rename datasource.
@@ -418,9 +435,8 @@ def test_ogr_ngw_cleanup():
     if gdaltest.ngw_drv is None:
         pytest.skip()
 
-    if gdaltest.ngw_ds is not None:
-        ds_resource_id = gdaltest.ngw_ds.GetMetadataItem('id', '')
-        delete_url = 'NGW:' + gdaltest.ngw_test_server + '/resource/' + ds_resource_id
+    if gdaltest.group_id is not None:
+        delete_url = 'NGW:' + gdaltest.ngw_test_server + '/resource/' + gdaltest.group_id
 
         gdaltest.ngw_layer = None
         gdaltest.ngw_ds = None
diff --git a/gdal/ogr/ogrsf_frmts/ngw/ngw_api.cpp b/gdal/ogr/ogrsf_frmts/ngw/ngw_api.cpp
index ce31939bae23..9f5d6e50cf8b 100644
--- a/gdal/ogr/ogrsf_frmts/ngw/ngw_api.cpp
+++ b/gdal/ogr/ogrsf_frmts/ngw/ngw_api.cpp
@@ -45,7 +45,7 @@ std::string GetResource(const std::string &osUrl, const std::string &osResourceI
 
 std::string GetChildren(const std::string &osUrl, const std::string &osResourceId)
 {
-    return osUrl + "/resource/" + osResourceId + "/child/";
+    return osUrl + "/api/resource/?parent=" + osResourceId;
 }
 
 std::string GetFeature(const std::string &osUrl, const std::string &osResourceId)

From eaa0fcd1117e8eb060e1561f410dbdd1e03ff54d Mon Sep 17 00:00:00 2001
From: Even Rouault <even.rouault@spatialys.com>
Date: Tue, 1 Jan 2019 16:57:46 +0100
Subject: [PATCH 184/488] MITAB: avoid potential assertion or stack buffer
 overflow on corrupted .ind files. Fixes
 https://bugs.chromium.org/p/oss-fuzz/issues/detail?id=11999. Credit to OSS
 Fuzz

---
 gdal/ogr/ogrsf_frmts/mitab/mitab_indfile.cpp | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/gdal/ogr/ogrsf_frmts/mitab/mitab_indfile.cpp b/gdal/ogr/ogrsf_frmts/mitab/mitab_indfile.cpp
index b06cd907225e..a82dd47b8204 100644
--- a/gdal/ogr/ogrsf_frmts/mitab/mitab_indfile.cpp
+++ b/gdal/ogr/ogrsf_frmts/mitab/mitab_indfile.cpp
@@ -1255,6 +1255,12 @@ GInt32 TABINDNode::FindFirst(GByte *pKeyValue)
                         nRetValue = 0;
                         continue;
                     }
+                    else if( (nChildNodePtr % 512) != 0 )
+                    {
+                        CPLError(CE_Failure, CPLE_AppDefined,
+                                 "Invalid child node pointer");
+                        return -1;
+                    }
                     else if (m_poCurChildNode == nullptr)
                     {
                         /* Child node has never been initialized...do it now!*/

From b1467bfc7dd428f2df016f2667acea49cab234b2 Mon Sep 17 00:00:00 2001
From: Even Rouault <even.rouault@spatialys.com>
Date: Tue, 1 Jan 2019 17:04:36 +0100
Subject: [PATCH 185/488] Selafin: avoid null pointer dereference on corrupted
 files. Fixes https://bugs.chromium.org/p/oss-fuzz/issues/detail?id=12356.
 Credit to OSS Fuzz

---
 gdal/ogr/ogrsf_frmts/selafin/io_selafin.cpp | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/gdal/ogr/ogrsf_frmts/selafin/io_selafin.cpp b/gdal/ogr/ogrsf_frmts/selafin/io_selafin.cpp
index 03fc1784f7d7..ac25f8fe5b3c 100644
--- a/gdal/ogr/ogrsf_frmts/selafin/io_selafin.cpp
+++ b/gdal/ogr/ogrsf_frmts/selafin/io_selafin.cpp
@@ -611,6 +611,11 @@ namespace Selafin {
             return nullptr;
         }
         // Read two arrays of nPoints floats with the coordinates of each point
+        if( poHeader->paadfCoords[0] == nullptr )
+        {
+            delete poHeader;
+            return nullptr;
+        }
         for (size_t i=0;i<2;++i) {
             read_floatarray(fp,poHeader->paadfCoords+i,poHeader->nFileSize);
             if (nLength<poHeader->nPoints) {

From 19cab0f8054c44beea46de34d2d715b6e3b036f4 Mon Sep 17 00:00:00 2001
From: Even Rouault <even.rouault@spatialys.com>
Date: Tue, 1 Jan 2019 17:27:27 +0100
Subject: [PATCH 186/488] Fix previous commit

---
 gdal/ogr/ogrsf_frmts/selafin/io_selafin.cpp | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/gdal/ogr/ogrsf_frmts/selafin/io_selafin.cpp b/gdal/ogr/ogrsf_frmts/selafin/io_selafin.cpp
index ac25f8fe5b3c..fdd798f8e368 100644
--- a/gdal/ogr/ogrsf_frmts/selafin/io_selafin.cpp
+++ b/gdal/ogr/ogrsf_frmts/selafin/io_selafin.cpp
@@ -611,17 +611,17 @@ namespace Selafin {
             return nullptr;
         }
         // Read two arrays of nPoints floats with the coordinates of each point
-        if( poHeader->paadfCoords[0] == nullptr )
-        {
-            delete poHeader;
-            return nullptr;
-        }
         for (size_t i=0;i<2;++i) {
             read_floatarray(fp,poHeader->paadfCoords+i,poHeader->nFileSize);
             if (nLength<poHeader->nPoints) {
                 delete poHeader;
                 return nullptr;
             }
+            if( poHeader->nPoints != 0 && poHeader->paadfCoords[i] == nullptr )
+            {
+                delete poHeader;
+                return nullptr;
+            }
             for (int j=0;j<poHeader->nPoints;++j) poHeader->paadfCoords[i][j]+=poHeader->adfOrigin[i];
         }
         // Update the boundinx box

From e3d4cef57683ee3e2c0f53e20d922e094bdb4279 Mon Sep 17 00:00:00 2001
From: Even Rouault <even.rouault@spatialys.com>
Date: Wed, 2 Jan 2019 16:17:02 +0100
Subject: [PATCH 187/488] gdalwarp -crop_to_cutline: do not round computed
 target extent to be aligned on the grid of the source raster if -tr is set
 (restore partially pre 2.4 behaviour) (fixes #1173)

---
 gdal/apps/gdalwarp_lib.cpp | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/gdal/apps/gdalwarp_lib.cpp b/gdal/apps/gdalwarp_lib.cpp
index 4b5aa88da7fd..af69c91d2f8b 100644
--- a/gdal/apps/gdalwarp_lib.cpp
+++ b/gdal/apps/gdalwarp_lib.cpp
@@ -329,7 +329,8 @@ static CPLErr CropToCutline( OGRGeometryH hCutline, char** papszTO,
                              char** papszWarpOptions,
                              int nSrcCount, GDALDatasetH *pahSrcDS,
                              double& dfMinX, double& dfMinY,
-                             double& dfMaxX, double &dfMaxY )
+                             double& dfMaxX, double &dfMaxY,
+                             const GDALWarpAppOptions* psOptions )
 {
     // We could possibly directly reproject from cutline SRS to target SRS,
     // but when applying the cutline, it is reprojected to source raster image
@@ -462,7 +463,8 @@ static CPLErr CropToCutline( OGRGeometryH hCutline, char** papszTO,
     dfMinY = sEnvelope.MinY;
     dfMaxX = sEnvelope.MaxX;
     dfMaxY = sEnvelope.MaxY;
-    if( hCTSrcToDst == nullptr && nSrcCount > 0 && pahSrcDS[0] != nullptr)
+    if( hCTSrcToDst == nullptr && nSrcCount > 0 && pahSrcDS[0] != nullptr &&
+        psOptions->dfXRes == 0.0 && psOptions->dfYRes == 0.0 )
     {
         // No raster reprojection: stick on exact pixel boundaries of the source
         // to preserve resolution and avoid resampling
@@ -955,7 +957,8 @@ GDALDatasetH GDALWarp( const char *pszDest, GDALDatasetH hDstDS, int nSrcCount,
                                 psOptions->papszWarpOptions,
                                 nSrcCount, pahSrcDS,
                                 psOptions->dfMinX, psOptions->dfMinY,
-                                psOptions->dfMaxX, psOptions->dfMaxY );
+                                psOptions->dfMaxX, psOptions->dfMaxY,
+                                psOptions );
         if(eError == CE_Failure)
         {
             GDALWarpAppOptionsFree(psOptions);

From 7204630312a8b8b944440f797a7a83ff35705682 Mon Sep 17 00:00:00 2001
From: Even Rouault <even.rouault@spatialys.com>
Date: Wed, 2 Jan 2019 16:40:56 +0100
Subject: [PATCH 188/488] COSAR: avoid out-of-bound write on corrupted dataset.
 Fixes https://bugs.chromium.org/p/oss-fuzz/issues/detail?id=12360. Credit to
 OSS Fuzz

---
 gdal/frmts/cosar/cosar_dataset.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/gdal/frmts/cosar/cosar_dataset.cpp b/gdal/frmts/cosar/cosar_dataset.cpp
index dbafc3970f46..0023fbffbff0 100644
--- a/gdal/frmts/cosar/cosar_dataset.cpp
+++ b/gdal/frmts/cosar/cosar_dataset.cpp
@@ -103,9 +103,9 @@ CPLErr COSARRasterBand::IReadBlock(CPL_UNUSED int nBlockXOff,
     nRSLV = CPL_SWAP32(nRSLV);
 #endif
 
-    if (nRSLV < nRSFV || nRSFV == 0
+    if (nRSLV < nRSFV || nRSFV == 0 || nRSLV == 0
         || nRSFV - 1 >= ((unsigned long) nBlockXSize)
-        || nRSLV - nRSFV > ((unsigned long) nBlockXSize)
+        || nRSLV - 1 >= ((unsigned long) nBlockXSize)
         || nRSFV >= this->nRTNB || nRSLV > this->nRTNB)
     {
         /* throw an error */

From 86cde6c68eca8ac535186710023e66fb7fe7b03d Mon Sep 17 00:00:00 2001
From: Even Rouault <even.rouault@spatialys.com>
Date: Thu, 3 Jan 2019 23:01:18 +0100
Subject: [PATCH 189/488] Fix kml_generate_test_files.py that is not a pytest
 file

---
 autotest/conftest.py                | 2 +-
 autotest/kml_generate_test_files.py | 7 ++++++-
 2 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/autotest/conftest.py b/autotest/conftest.py
index f859ca16295a..1a4acb4bbf11 100644
--- a/autotest/conftest.py
+++ b/autotest/conftest.py
@@ -17,7 +17,7 @@
 
 # These files may be non-importable, and don't contain tests anyway.
 # So we skip searching them during test collection.
-collect_ignore = ["gdrivers/netcdf_cfchecks.py"]
+collect_ignore = ["kml_generate_test_files.py", "gdrivers/netcdf_cfchecks.py"]
 
 # we set ECW to not resolve projection and datum strings to get 3.x behavior.
 gdal.SetConfigOption("ECW_DO_NOT_RESOLVE_DATUM_PROJECTION", "YES")
diff --git a/autotest/kml_generate_test_files.py b/autotest/kml_generate_test_files.py
index 74b26cfb44f6..e42c52f42b7f 100644
--- a/autotest/kml_generate_test_files.py
+++ b/autotest/kml_generate_test_files.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env pytest
+#!/usr/bin/env python
 # -*- coding: utf-8 -*-
 ###############################################################################
 # $Id$
@@ -355,4 +355,9 @@ def generate_kmlsuperoverlay(filename):
     src_ds = None
 
 
+if __name__ == '__main__':
 
+    generate_libkml('test_ogrlibkml.kml')
+    generate_libkml('test_ogrlibkml.kmz')
+    generate_libkml_update('test_ogrlibkml_update.kml')
+    generate_kmlsuperoverlay('test_superoverlay.kmz')

From b0264ceb0c9cb390ed2d76638599826f881db61e Mon Sep 17 00:00:00 2001
From: Even Rouault <even.rouault@spatialys.com>
Date: Wed, 9 Jan 2019 21:23:21 +0100
Subject: [PATCH 190/488] Python bindings: fix Dataset.ReadAsRaster() on CInt16
 data type (fix proposed by @pinging2000, fixes #82)

---
 autotest/gcore/rasterio.py           | 20 ++++++++++++++++++++
 gdal/swig/include/gdal_array.i       |  3 +++
 gdal/swig/python/osgeo/gdal_array.py |  3 +++
 3 files changed, 26 insertions(+)

diff --git a/autotest/gcore/rasterio.py b/autotest/gcore/rasterio.py
index 8f362ec410df..9ff31277d9ae 100755
--- a/autotest/gcore/rasterio.py
+++ b/autotest/gcore/rasterio.py
@@ -930,3 +930,23 @@ def test_rasterio_resampled_value_is_nodata():
     assert data_ar == expected_ar
 
     gdal.Unlink('/vsimem/in.asc')
+
+
+
+def test_rasterio_dataset_readarray_cint16():
+
+    try:
+        from osgeo import gdalnumeric
+        gdalnumeric.zeros
+        import numpy
+    except (ImportError, AttributeError):
+        pytest.skip()
+
+    mem_ds = gdal.GetDriverByName('MEM').Create('', 1, 1, 2, gdal.GDT_CInt16)
+    mem_ds.GetRasterBand(1).WriteArray(numpy.array([[1 + 2j]]))
+    mem_ds.GetRasterBand(2).WriteArray(numpy.array([[3 + 4j]]))
+    got = mem_ds.GetRasterBand(1).ReadAsArray()
+    assert got == numpy.array([[1 + 2j]])
+    got = mem_ds.ReadAsArray()
+    assert got[0] == numpy.array([[1 + 2j]])
+    assert got[1] == numpy.array([[3 + 4j]])
diff --git a/gdal/swig/include/gdal_array.i b/gdal/swig/include/gdal_array.i
index 7762df25433f..ff7bcde6c711 100644
--- a/gdal/swig/include/gdal_array.i
+++ b/gdal/swig/include/gdal_array.i
@@ -1213,6 +1213,9 @@ def DatasetReadAsArray(ds, xoff=0, yoff=0, win_xsize=None, win_ysize=None, buf_o
         if typecode is None:
             buf_type = gdalconst.GDT_Float32
             typecode = numpy.float32
+        else:
+            buf_type = NumericTypeCodeToGDALTypeCode(typecode)
+
         if buf_type == gdalconst.GDT_Byte and ds.GetRasterBand(1).GetMetadataItem('PIXELTYPE', 'IMAGE_STRUCTURE') == 'SIGNEDBYTE':
             typecode = numpy.int8
         buf_shape = (ds.RasterCount, buf_ysize, buf_xsize) if interleave else (buf_ysize, buf_xsize, ds.RasterCount)
diff --git a/gdal/swig/python/osgeo/gdal_array.py b/gdal/swig/python/osgeo/gdal_array.py
index 284f0f1904a7..ed0e08e5162d 100644
--- a/gdal/swig/python/osgeo/gdal_array.py
+++ b/gdal/swig/python/osgeo/gdal_array.py
@@ -296,6 +296,9 @@ def DatasetReadAsArray(ds, xoff=0, yoff=0, win_xsize=None, win_ysize=None, buf_o
         if typecode is None:
             buf_type = gdalconst.GDT_Float32
             typecode = numpy.float32
+        else:
+            buf_type = NumericTypeCodeToGDALTypeCode(typecode)
+
         if buf_type == gdalconst.GDT_Byte and ds.GetRasterBand(1).GetMetadataItem('PIXELTYPE', 'IMAGE_STRUCTURE') == 'SIGNEDBYTE':
             typecode = numpy.int8
         buf_shape = (ds.RasterCount, buf_ysize, buf_xsize) if interleave else (buf_ysize, buf_xsize, ds.RasterCount)

From 38f05089f1400472e1f14bca8710400c0e7d165a Mon Sep 17 00:00:00 2001
From: Even Rouault <even.rouault@spatialys.com>
Date: Wed, 9 Jan 2019 21:25:51 +0100
Subject: [PATCH 191/488] Dummy commit to indicate previous commit
 b0264ceb0c9cb390ed2d76638599826f881db61e actually fixes #1186

---
 autotest/gcore/rasterio.py | 1 +
 1 file changed, 1 insertion(+)

diff --git a/autotest/gcore/rasterio.py b/autotest/gcore/rasterio.py
index 9ff31277d9ae..5ef8c0f4db2e 100755
--- a/autotest/gcore/rasterio.py
+++ b/autotest/gcore/rasterio.py
@@ -950,3 +950,4 @@ def test_rasterio_dataset_readarray_cint16():
     got = mem_ds.ReadAsArray()
     assert got[0] == numpy.array([[1 + 2j]])
     assert got[1] == numpy.array([[3 + 4j]])
+

From e92fad6ca3e6378a097ed137bc4a9fa9a3171f9d Mon Sep 17 00:00:00 2001
From: Even Rouault <even.rouault@spatialys.com>
Date: Mon, 7 Jan 2019 19:12:47 +0100
Subject: [PATCH 192/488] ci/travis/trusty_clang: fix pip / six related
 failures

---
 gdal/ci/travis/trusty_clang/before_install.sh | 16 ++++++++++++----
 gdal/ci/travis/trusty_clang/install.sh        |  4 ++--
 gdal/ci/travis/trusty_clang/script.sh         |  3 ---
 3 files changed, 14 insertions(+), 9 deletions(-)

diff --git a/gdal/ci/travis/trusty_clang/before_install.sh b/gdal/ci/travis/trusty_clang/before_install.sh
index 3d19a7e07653..2461ad4e1390 100755
--- a/gdal/ci/travis/trusty_clang/before_install.sh
+++ b/gdal/ci/travis/trusty_clang/before_install.sh
@@ -11,23 +11,31 @@ sudo add-apt-repository -y ppa:ubuntugis/ubuntugis-unstable
 #sudo add-apt-repository -y ppa:marlam/gta
 sudo apt-get update
 
+# install test dependencies
+# note: pip 9 is installed on the box, but it hits a strange error after upgrading setuptools.
+# so we install a newer pip first.
+sudo apt-get remove -y python-*
+sudo apt-get install python-minimal
+curl -sSL 'https://bootstrap.pypa.io/get-pip.py' | sudo python
+(cd autotest; sudo -H pip install -U -r ./requirements.txt)
+
+sudo pip install lxml flake8 numpy
+
 # MSSQL: server side
 docker pull microsoft/mssql-server-linux:2017-latest
 sudo docker run -e 'ACCEPT_EULA=Y' -e 'SA_PASSWORD=DummyPassw0rd'  -p 1433:1433 --name sql1 -d microsoft/mssql-server-linux:2017-latest
 sleep 10
 docker exec -it sql1 /opt/mssql-tools/bin/sqlcmd -l 30 -S localhost -U SA -P DummyPassw0rd -Q "CREATE DATABASE TestDB;"
 
-sudo apt-get install -y --allow-unauthenticated ccache python-numpy libpng12-dev libjpeg-dev libgif-dev liblzma-dev libgeos-dev libcurl4-gnutls-dev libproj-dev libxml2-dev libexpat-dev libxerces-c-dev libnetcdf-dev netcdf-bin libpoppler-dev libspatialite-dev gpsbabel swig libhdf4-alt-dev libhdf5-serial-dev libpodofo-dev poppler-utils libfreexl-dev unixodbc-dev libwebp-dev  libepsilon-dev  liblcms2-2 libpcre3-dev mercurial cmake libcrypto++-dev postgresql-9.3-postgis-2.2 postgresql-9.3-postgis-scripts libpq-dev
+sudo apt-get install -y --allow-unauthenticated ccache libpng12-dev libjpeg-dev libgif-dev liblzma-dev libgeos-dev libcurl4-gnutls-dev libproj-dev libxml2-dev libexpat-dev libxerces-c-dev libnetcdf-dev netcdf-bin libpoppler-dev libspatialite-dev gpsbabel swig libhdf4-alt-dev libhdf5-serial-dev libpodofo-dev poppler-utils libfreexl-dev unixodbc-dev libwebp-dev  libepsilon-dev  liblcms2-2 libpcre3-dev mercurial cmake libcrypto++-dev postgresql-9.3-postgis-2.2 postgresql-9.3-postgis-scripts libpq-dev
 # libgta-dev
-sudo apt-get install -y python-lxml
-sudo apt-get install -y python-pip
 sudo apt-get install -y libqhull-dev
 sudo apt-get install -y libogdi3.2-dev
 # MONO
 sudo apt-get install -y mono-mcs libmono-system-drawing4.0-cil
 # Boost for Mongo
 #sudo apt-get install -y libboost-regex-dev libboost-system-dev libboost-thread-dev
-sudo pip install flake8
+
 sudo apt-get install doxygen texlive-latex-base
 # flake8 codes to just emulate pyflakes (http://flake8.pycqa.org/en/latest/user/error-codes.html)
 FLAKE8="flake8 --select=F401,F402,F403,F404,F405,F406,F407,F601,F602,F621,F622,F631,F701,F702,F703,F704,F705,F706,F707,F721,F722,F811,F812,F821,F822,F823,F831,F841,F901"
diff --git a/gdal/ci/travis/trusty_clang/install.sh b/gdal/ci/travis/trusty_clang/install.sh
index 4675e008c994..662c0c746b81 100755
--- a/gdal/ci/travis/trusty_clang/install.sh
+++ b/gdal/ci/travis/trusty_clang/install.sh
@@ -41,7 +41,7 @@ make USER_DEFS="-Wextra -Werror" -j3
   export JAVA_HOME=/usr/lib/jvm/java-8-openjdk-amd64
   export PATH=$JAVA_HOME/jre/bin:$PATH
   java -version
-  make
+  (make 2>/tmp/log.txt || cat /tmp/log.txt)
   mv java.opt.bak java.opt
 )
 
@@ -51,7 +51,7 @@ make
 cd ../..
 cd swig/csharp
 make generate
-make
+make 2>/tmp/log.txt || cat /tmp/log.txt
 cd ../..
 sudo rm -f /usr/lib/libgdal.so*
 sudo rm -f /usr/include/gdal*.h /usr/include/ogr*.h /usr/include/gnm*.h /usr/include/cpl*.h 
diff --git a/gdal/ci/travis/trusty_clang/script.sh b/gdal/ci/travis/trusty_clang/script.sh
index 2c88405419b7..53e85d2f3ab6 100755
--- a/gdal/ci/travis/trusty_clang/script.sh
+++ b/gdal/ci/travis/trusty_clang/script.sh
@@ -36,9 +36,6 @@ wget http://download.osgeo.org/gdal/data/pgeo/PGeoTest.zip
 unzip PGeoTest.zip
 cd ../../..
 
-# install test dependencies
-sudo -H pip install -U -r ./requirements.txt
-
 export PYTHONPATH=/usr/lib/python2.7/dist-packages
 
 # Run ogr_fgdb.py in isolation from the rest

From 623040b524c770b444936dc8efadaabe23c27c1d Mon Sep 17 00:00:00 2001
From: Even Rouault <even.rouault@spatialys.com>
Date: Wed, 16 Jan 2019 17:45:13 +0100
Subject: [PATCH 193/488] VSICurlHandle::ReadMultiRange(): use default
 implementation if there is a single range. May help to improve performance of
 refs #1206 since using the default implementation will use vsicurl cache,
 whereas the multi-range one will not use it

---
 gdal/port/cpl_vsil_curl.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/gdal/port/cpl_vsil_curl.cpp b/gdal/port/cpl_vsil_curl.cpp
index ae23242e52c4..78363626c50f 100644
--- a/gdal/port/cpl_vsil_curl.cpp
+++ b/gdal/port/cpl_vsil_curl.cpp
@@ -1647,7 +1647,7 @@ int VSICurlHandle::ReadMultiRange( int const nRanges, void ** const ppData,
         // dubious now. We could probably remove it
         return ReadMultiRangeSingleGet(nRanges, ppData, panOffsets, panSizes);
     }
-    else if( EQUAL(pszMultiRangeStrategy, "SERIAL") )
+    else if( nRanges == 1 || EQUAL(pszMultiRangeStrategy, "SERIAL") )
     {
         return VSIVirtualHandle::ReadMultiRange(
                                     nRanges, ppData, panOffsets, panSizes);

From 19934f0c1ab720aef669dd3ac6596500dd6b3be7 Mon Sep 17 00:00:00 2001
From: Martin Landa <landa.martin@gmail.com>
Date: Wed, 16 Jan 2019 17:50:50 +0100
Subject: [PATCH 194/488] gml manual page: fix a typo

---
 gdal/ogr/ogrsf_frmts/gml/drv_gml.html | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/gdal/ogr/ogrsf_frmts/gml/drv_gml.html b/gdal/ogr/ogrsf_frmts/gml/drv_gml.html
index 6b6f430ad771..ffd411098362 100644
--- a/gdal/ogr/ogrsf_frmts/gml/drv_gml.html
+++ b/gdal/ogr/ogrsf_frmts/gml/drv_gml.html
@@ -379,8 +379,8 @@ <h2>Open options</h2>
 be declared as not-nullable if the application schema declared them as mandatory.
 So this option can be set to NO to have both empty strings being report as such,
 and mandatory fields being reported as not nullable.</li>
-<li> <b>GML_ATTRIBUTES_TO_OGR_FIELDS=YES/NO</b>: (GDAL &gt;=2.0) Whether GM
-Lattributes should be reported as OGR fields. Note that this option has only an
+<li> <b>GML_ATTRIBUTES_TO_OGR_FIELDS=YES/NO</b>: (GDAL &gt;=2.0) Whether GML
+attributes should be reported as OGR fields. Note that this option has only an
 effect the first time a GML file is opened (before the .gfs file is created),
 and if it has no valid associated .xsd. Defaults to NO.</li>
 <li> <b>INVERT_AXIS_ORDER_IF_LAT_LONG=YES/NO</b>: (GDAL &gt;=2.0) Whether to

From a43362ee372a657ec2714e9beb8945271c359b67 Mon Sep 17 00:00:00 2001
From: Even Rouault <even.rouault@spatialys.com>
Date: Thu, 17 Jan 2019 17:37:18 +0100
Subject: [PATCH 195/488] GML: write SRSName element in .gfs when parsing a GML
 file with srsName only on top-level boundedBy element (fixes #1210)

---
 autotest/ogr/ogr_gml_read.py           | 43 ++++++++++++++++++++++++++
 gdal/ogr/ogrsf_frmts/gml/gmlreader.cpp | 25 +++++++++++----
 2 files changed, 62 insertions(+), 6 deletions(-)

diff --git a/autotest/ogr/ogr_gml_read.py b/autotest/ogr/ogr_gml_read.py
index 4a0478f8bac4..05556f068861 100755
--- a/autotest/ogr/ogr_gml_read.py
+++ b/autotest/ogr/ogr_gml_read.py
@@ -3532,6 +3532,49 @@ def test_ogr_gml_gml2_write_geometry_error():
     gdal.Unlink('/vsimem/ogr_gml_83.xsd')
 
 ###############################################################################
+
+
+def test_ogr_gml_srsname_only_on_top_bounded_by():
+
+    if not gdaltest.have_gml_reader:
+        pytest.skip()
+
+    tmpname = '/vsimem/test_ogr_gml_srsname_only_on_top_bounded_by.xml'
+    gdal.FileFromMemBuffer(tmpname, """<?xml version="1.0" encoding="utf-8" ?>
+<ogr:FeatureCollection
+     xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+     xsi:schemaLocation="http://ogr.maptools.org/ out.xsd"
+     xmlns:ogr="http://ogr.maptools.org/"
+     xmlns:gml="http://www.opengis.net/gml">
+  <gml:boundedBy>
+    <gml:Envelope srsName="EPSG:27700">
+      <gml:lowerCorner>0 0</gml:lowerCorner>
+      <gml:upperCorner>1 1</gml:upperCorner>
+    </gml:Envelope>
+  </gml:boundedBy>
+  <gml:featureMember>
+    <ogr:poly fid="poly.0">
+      <ogr:geometryProperty><gml:Polygon><gml:outerBoundaryIs><gml:LinearRing><gml:coordinates>0,0 0,1 1,1 1,0 0,0</gml:coordinates></gml:LinearRing></gml:outerBoundaryIs></gml:Polygon></ogr:geometryProperty>
+    </ogr:poly>
+  </gml:featureMember>
+</<ogr:FeatureCollection>""")
+
+    # Open once to generate .gfs
+    ds = ogr.Open(tmpname)
+    lyr = ds.GetLayer(0)
+    assert '27700' in lyr.GetSpatialRef().ExportToWkt()
+    ds = None
+
+    # Open another time to read .gfs
+    ds = ogr.Open(tmpname)
+    lyr = ds.GetLayer(0)
+    assert '27700' in lyr.GetSpatialRef().ExportToWkt()
+    ds = None
+
+    gdal.Unlink(tmpname)
+    gdal.Unlink(tmpname[0:-3] + "gfs")
+
+###############################################################################
 #  Cleanup
 
 
diff --git a/gdal/ogr/ogrsf_frmts/gml/gmlreader.cpp b/gdal/ogr/ogrsf_frmts/gml/gmlreader.cpp
index 8a7867c5786a..5a22b8d6c00a 100644
--- a/gdal/ogr/ogrsf_frmts/gml/gmlreader.cpp
+++ b/gdal/ogr/ogrsf_frmts/gml/gmlreader.cpp
@@ -35,6 +35,7 @@
 #include <cstdlib>
 #include <cstring>
 #include <algorithm>
+#include <set>
 #include <string>
 
 #include "cpl_conv.h"
@@ -1317,10 +1318,20 @@ bool GMLReader::PrescanForSchema( bool bGetExtents,
     }
 
     GMLFeature *poFeature = nullptr;
+    std::set<GMLFeatureClass*> knownClasses;
     while( (poFeature = NextFeature()) != nullptr )
     {
         GMLFeatureClass *poClass = poFeature->GetClass();
 
+        if( knownClasses.find(poClass) == knownClasses.end() )
+        {
+            knownClasses.insert(poClass);
+            if( m_pszGlobalSRSName && GML_IsLegitSRSName(m_pszGlobalSRSName) )
+            {
+                poClass->SetSRSName(m_pszGlobalSRSName);
+            }
+        }
+
         if (poLastClass != nullptr && poClass != poLastClass &&
             poClass->GetFeatureCount() != -1)
             m_nHasSequentialLayers = false;
@@ -1359,9 +1370,15 @@ bool GMLReader::PrescanForSchema( bool bGetExtents,
                         GML_ExtractSrsNameFromGeometry(papsGeometry,
                                                        osWork,
                                                        m_bConsiderEPSGAsURN);
-                    if (pszSRSName != nullptr)
+                    if (pszSRSName != nullptr && m_pszGlobalSRSName != nullptr &&
+                        !EQUAL(pszSRSName, m_pszGlobalSRSName))
+                    {
                         m_bCanUseGlobalSRSName = false;
-                    poClass->MergeSRSName(pszSRSName);
+                    }
+                    if( m_pszGlobalSRSName == nullptr || pszSRSName != nullptr)
+                    {
+                        poClass->MergeSRSName(pszSRSName);
+                    }
                 }
 
                 // Merge geometry type into layer.
@@ -1414,10 +1431,6 @@ bool GMLReader::PrescanForSchema( bool bGetExtents,
     {
         GMLFeatureClass *poClass = m_papoClass[i];
         const char* pszSRSName = poClass->GetSRSName();
-
-        if (m_bCanUseGlobalSRSName)
-            pszSRSName = m_pszGlobalSRSName;
-
         if( pszSRSName != nullptr && !GML_IsLegitSRSName(pszSRSName) )
         {
             continue;

From 29f4dfbcac2de718043f862166cd639ab578b552 Mon Sep 17 00:00:00 2001
From: Even Rouault <even.rouault@spatialys.com>
Date: Thu, 17 Jan 2019 22:36:09 +0100
Subject: [PATCH 196/488] Poppler: revision version management. Drop support
 for ancient versions older than 0.23.0 (preparation for support of newer
 version: refs #1207, #1208)

---
 appveyor.yml                  |   6 +-
 gdal/GDALmake.opt.in          |  10 +-
 gdal/configure                | 374 ++++++++++++++++++----------------
 gdal/configure.ac             | 177 ++--------------
 gdal/frmts/pdf/GNUmakefile    |  26 +--
 gdal/frmts/pdf/makefile.vc    |  30 +--
 gdal/frmts/pdf/pdfdataset.cpp |  69 +------
 gdal/frmts/pdf/pdfio.cpp      |  20 +-
 gdal/frmts/pdf/pdfio.h        |  22 +-
 gdal/frmts/pdf/pdfobject.cpp  |   8 +-
 gdal/nmake.opt                |  15 +-
 11 files changed, 257 insertions(+), 500 deletions(-)

diff --git a/appveyor.yml b/appveyor.yml
index 5b6c93ee34bc..26991f2f7bb8 100644
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -105,10 +105,8 @@ install:
       $env:NMAKE_LOCAL+="LIBKML_LIBS=`$(SDK_LIB)\libkmlbase.lib `$(SDK_LIB)\libkmlconvenience.lib `$(SDK_LIB)\libkmldom.lib `$(SDK_LIB)\libkmlengine.lib `$(SDK_LIB)\libkmlregionator.lib `$(SDK_LIB)\libkmlxsd.lib `$(SDK_LIB)\expat.lib `$(SDK_LIB)\zdll.lib`n"
       $env:NMAKE_LOCAL+="POPPLER_ENABLED = YES`n"
       $env:NMAKE_LOCAL+="POPPLER_CFLAGS = -I`$(SDK_INC) -I`$(SDK_INC)\poppler`n"
-      $env:NMAKE_LOCAL+="POPPLER_HAS_OPTCONTENT = YES`n"
-      $env:NMAKE_LOCAL+="POPPLER_0_20_OR_LATER = YES`n"
-      $env:NMAKE_LOCAL+="POPPLER_0_23_OR_LATER = YES`n"
-      $env:NMAKE_LOCAL+="POPPLER_BASE_STREAM_HAS_TWO_ARGS = YES`n"
+      $env:NMAKE_LOCAL+="POPPLER_MAJOR_VERSION = 0`n"
+      $env:NMAKE_LOCAL+="POPPLER_MINOR_VERSION = 30`n"
       $env:NMAKE_LOCAL+="POPPLER_LIBS = `$(SDK_LIB)\poppler.lib `$(SDK_LIB)\freetype.lib `$(SDK_LIB)\harfbuzz.lib advapi32.lib gdi32.lib`n"
       $env:NMAKE_LOCAL+="OPENJPEG_ENABLED = YES`n"
       $env:NMAKE_LOCAL+="OPENJPEG_CFLAGS = -I`$(SDK_INC)\openjpeg-2.1`n"
diff --git a/gdal/GDALmake.opt.in b/gdal/GDALmake.opt.in
index 14afc132484a..4e008ef403fb 100644
--- a/gdal/GDALmake.opt.in
+++ b/gdal/GDALmake.opt.in
@@ -476,13 +476,9 @@ PDF_PLUGIN = @PDF_PLUGIN@
 #
 
 HAVE_POPPLER = @HAVE_POPPLER@
-POPPLER_HAS_OPTCONTENT = @POPPLER_HAS_OPTCONTENT@
-POPPLER_BASE_STREAM_HAS_TWO_ARGS = @POPPLER_BASE_STREAM_HAS_TWO_ARGS@
-POPPLER_0_20_OR_LATER = @POPPLER_0_20_OR_LATER@
-POPPLER_0_23_OR_LATER = @POPPLER_0_23_OR_LATER@
-POPPLER_0_58_OR_LATER = @POPPLER_0_58_OR_LATER@
-POPPLER_0_69_OR_LATER = @POPPLER_0_69_OR_LATER@
-POPPLER_INC = @POPPLER_INC@
+POPPLER_MAJOR_VERSION = @POPPLER_MAJOR_VERSION@
+POPPLER_MINOR_VERSION = @POPPLER_MINOR_VERSION@
+POPPLER_INC = @POPPLER_CFLAGS@
 POPPLER_PLUGIN_LIB = @POPPLER_PLUGIN_LIB@
 
 #
diff --git a/gdal/configure b/gdal/configure
index ead028e0da78..6bb09ade908c 100755
--- a/gdal/configure
+++ b/gdal/configure
@@ -668,14 +668,11 @@ PODOFO_PLUGIN_LIB
 PODOFO_INC
 HAVE_PODOFO
 POPPLER_PLUGIN_LIB
-POPPLER_INC
-POPPLER_0_69_OR_LATER
-POPPLER_0_58_OR_LATER
-POPPLER_0_23_OR_LATER
-POPPLER_0_20_OR_LATER
-POPPLER_BASE_STREAM_HAS_TWO_ARGS
-POPPLER_HAS_OPTCONTENT
+POPPLER_MINOR_VERSION
+POPPLER_MAJOR_VERSION
 HAVE_POPPLER
+POPPLER_LIBS
+POPPLER_CFLAGS
 PDF_PLUGIN
 PAM_SETTING
 JSON_INCLUDE
@@ -1111,7 +1108,9 @@ HDF5_LIBS
 OPENJPEG_CFLAGS
 OPENJPEG_LIBS
 LIBKML_CFLAGS
-LIBKML_LIBS'
+LIBKML_LIBS
+POPPLER_CFLAGS
+POPPLER_LIBS'
 
 
 # Initialize some variables set by options.
@@ -1916,6 +1915,10 @@ Some influential environment variables:
   LIBKML_CFLAGS
               C compiler flags for LIBKML, overriding pkg-config
   LIBKML_LIBS linker flags for LIBKML, overriding pkg-config
+  POPPLER_CFLAGS
+              C compiler flags for POPPLER, overriding pkg-config
+  POPPLER_LIBS
+              linker flags for POPPLER, overriding pkg-config
 
 Use these variables to override the choices made by `configure' or to help
 it to find libraries and programs with nonstandard names/locations.
@@ -34835,208 +34838,225 @@ fi
 
 
 HAVE_POPPLER=no
-POPPLER_HAS_OPTCONTENT=no
-POPPLER_BASE_STREAM_HAS_TWO_ARGS=no
-POPPLER_0_20_OR_LATER=no
-POPPLER_0_23_OR_LATER=no
-POPPLER_0_58_OR_LATER=no
-POPPLER_0_69_OR_LATER=no
+POPPLER_MAJOR_VERSION=
+POPPLER_MINOR_VERSION=
 
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for poppler" >&5
 $as_echo_n "checking for poppler... " >&6; }
 
 if test "$with_poppler" != "no" -a "$with_poppler" != ""; then
 
-    if test "$with_poppler" = "yes" ; then
-        TEST_POPPLER_INC="-I/usr/include -I/usr/include/poppler"
-        TEST_POPPLER_LIB="-lpoppler"
-    else
-        TEST_POPPLER_INC="-I$with_poppler/include -I$with_poppler/include/poppler"
-        TEST_POPPLER_LIB="-L$with_poppler/lib -lpoppler"
-    fi
 
-    # Check that we can accept Page::pageObj private member
-    rm -f testpoppler.*
-    echo '#define private public' > testpoppler.cpp
-    echo '#include <poppler/Page.h>' >> testpoppler.cpp
-    echo '#include <poppler/splash/SplashBitmap.h>' >> testpoppler.cpp
-    echo 'int main(int argc, char** argv) { return &(((Page*)0x8000)->pageObj) == 0; } ' >> testpoppler.cpp
 
-    if test -z "`${CXX} ${CXXFLAGS} ${CPPFLAGS} testpoppler.cpp -o testpoppler ${TEST_POPPLER_INC} ${TEST_POPPLER_LIB} 2>&1`" ; then
-        HAVE_POPPLER=yes
-    else
-        # poppler 0.23.0 needs to be linked against pthread
-        TEST_POPPLER_LIB="${TEST_POPPLER_LIB} -lpthread"
-        if test -z "`${CXX} ${CXXFLAGS} ${CPPFLAGS} testpoppler.cpp -o testpoppler ${TEST_POPPLER_INC} ${TEST_POPPLER_LIB} 2>&1`" ; then
-            HAVE_POPPLER=yes
-        fi
-    fi
+if test "x$ac_cv_env_PKG_CONFIG_set" != "xset"; then
+	if test -n "$ac_tool_prefix"; then
+  # Extract the first word of "${ac_tool_prefix}pkg-config", so it can be a program name with args.
+set dummy ${ac_tool_prefix}pkg-config; ac_word=$2
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if ${ac_cv_path_PKG_CONFIG+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  case $PKG_CONFIG in
+  [\\/]* | ?:[\\/]*)
+  ac_cv_path_PKG_CONFIG="$PKG_CONFIG" # Let the user override the test with a path.
+  ;;
+  *)
+  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+    for ac_exec_ext in '' $ac_executable_extensions; do
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+    ac_cv_path_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext"
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+  done
+IFS=$as_save_IFS
 
-    if test "$HAVE_POPPLER" = "yes"; then
-        if test "$PDF_PLUGIN" = "no"; then
-            LIBS="${TEST_POPPLER_LIB} ${LIBS}"
-        fi
-        { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-$as_echo "yes" >&6; }
-        POPPLER_INC=$TEST_POPPLER_INC
-        POPPLER_PLUGIN_LIB="${TEST_POPPLER_LIB}"
-
-        CHECK_OTHER_POPPLER_VERSION=yes
-
-        if test "$CHECK_OTHER_POPPLER_VERSION" = "yes"; then
-            { $as_echo "$as_me:${as_lineno-$LINENO}: checking if OptionalContent has API >= 0.69.0" >&5
-$as_echo_n "checking if OptionalContent has API >= 0.69.0... " >&6; }
-            rm -f testpoppler.*
-            echo '#include <poppler/OptionalContent.h>' > testpoppler.cpp
-            echo 'int main(int argc, char** argv) {' >> testpoppler.cpp
-            echo 'OCGs ocg(nullptr, nullptr);' >> testpoppler.cpp
-            echo 'ocg.getOCGs().size();' >> testpoppler.cpp
-            echo 'return 0; }' >> testpoppler.cpp
-            if test -z "`${CXX} ${CXXFLAGS} ${CPPFLAGS} testpoppler.cpp -c ${POPPLER_INC} 2>&1`" ; then
-                POPPLER_0_69_OR_LATER=yes
-                POPPLER_0_58_OR_LATER=yes
-                POPPLER_0_23_OR_LATER=yes
-                POPPLER_0_20_OR_LATER=yes
-                POPPLER_BASE_STREAM_HAS_TWO_ARGS=yes
-                POPPLER_HAS_OPTCONTENT=yes
-                CHECK_OTHER_POPPLER_VERSION=no
-                { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-$as_echo "yes" >&6; }
-            else
-                { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+  ;;
+esac
+fi
+PKG_CONFIG=$ac_cv_path_PKG_CONFIG
+if test -n "$PKG_CONFIG"; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $PKG_CONFIG" >&5
+$as_echo "$PKG_CONFIG" >&6; }
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
 $as_echo "no" >&6; }
-            fi
-        fi
+fi
 
-        if test "$CHECK_OTHER_POPPLER_VERSION" = "yes"; then
-            # And now we check if we have Poppler >= 0.58.0
-            { $as_echo "$as_me:${as_lineno-$LINENO}: checking if Object does have new API (>= 0.58.0)" >&5
-$as_echo_n "checking if Object does have new API (>= 0.58.0)... " >&6; }
-            rm -f testpoppler.*
-            echo '#include <poppler/Object.h>' > testpoppler.cpp
-            echo 'int main(int argc, char** argv) { Object o(objNull); return 0; }' >> testpoppler.cpp
-            if test -z "`${CXX} ${CXXFLAGS} ${CPPFLAGS} testpoppler.cpp -c ${POPPLER_INC} 2>&1`" ; then
-                POPPLER_0_58_OR_LATER=yes
-                POPPLER_0_23_OR_LATER=yes
-                POPPLER_0_20_OR_LATER=yes
-                POPPLER_BASE_STREAM_HAS_TWO_ARGS=yes
-                POPPLER_HAS_OPTCONTENT=yes
-                CHECK_OTHER_POPPLER_VERSION=no
-                { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-$as_echo "yes" >&6; }
-            else
-                { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+
+fi
+if test -z "$ac_cv_path_PKG_CONFIG"; then
+  ac_pt_PKG_CONFIG=$PKG_CONFIG
+  # Extract the first word of "pkg-config", so it can be a program name with args.
+set dummy pkg-config; ac_word=$2
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if ${ac_cv_path_ac_pt_PKG_CONFIG+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  case $ac_pt_PKG_CONFIG in
+  [\\/]* | ?:[\\/]*)
+  ac_cv_path_ac_pt_PKG_CONFIG="$ac_pt_PKG_CONFIG" # Let the user override the test with a path.
+  ;;
+  *)
+  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+    for ac_exec_ext in '' $ac_executable_extensions; do
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+    ac_cv_path_ac_pt_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext"
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+  done
+IFS=$as_save_IFS
+
+  ;;
+esac
+fi
+ac_pt_PKG_CONFIG=$ac_cv_path_ac_pt_PKG_CONFIG
+if test -n "$ac_pt_PKG_CONFIG"; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_pt_PKG_CONFIG" >&5
+$as_echo "$ac_pt_PKG_CONFIG" >&6; }
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
 $as_echo "no" >&6; }
-            fi
-        fi
+fi
 
-        if test "$CHECK_OTHER_POPPLER_VERSION" = "yes"; then
-
-            # And now try another dirty thing, but this one is
-            # optional.
-            { $as_echo "$as_me:${as_lineno-$LINENO}: checking if Catalog::optContent exists" >&5
-$as_echo_n "checking if Catalog::optContent exists... " >&6; }
-            rm -f testpoppler.*
-            echo '#define private public' > testpoppler.cpp
-            echo '#include <poppler/Object.h>' >> testpoppler.cpp
-            echo '#include <poppler/Catalog.h>' >> testpoppler.cpp
-            echo 'int main(int argc, char** argv) { return &(((Catalog*)0x8000)->optContent) == 0; }' >> testpoppler.cpp
-            if test -z "`${CXX} ${CXXFLAGS} ${CPPFLAGS} testpoppler.cpp -c ${POPPLER_INC} 2>&1`" ; then
-                POPPLER_HAS_OPTCONTENT=yes
-                { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+  if test "x$ac_pt_PKG_CONFIG" = x; then
+    PKG_CONFIG=""
+  else
+    case $cross_compiling:$ac_tool_warned in
+yes:)
+{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
+$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
+ac_tool_warned=yes ;;
+esac
+    PKG_CONFIG=$ac_pt_PKG_CONFIG
+  fi
+else
+  PKG_CONFIG="$ac_cv_path_PKG_CONFIG"
+fi
+
+fi
+if test -n "$PKG_CONFIG"; then
+	_pkg_min_version=0.21
+	{ $as_echo "$as_me:${as_lineno-$LINENO}: checking pkg-config is at least version $_pkg_min_version" >&5
+$as_echo_n "checking pkg-config is at least version $_pkg_min_version... " >&6; }
+	if $PKG_CONFIG --atleast-pkgconfig-version $_pkg_min_version; then
+		{ $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
 $as_echo "yes" >&6; }
-            else
-                { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+	else
+		{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
 $as_echo "no" >&6; }
-            fi
+		PKG_CONFIG=""
+	fi
 
-            # And now we check if we have Poppler >= 0.16.0
-            { $as_echo "$as_me:${as_lineno-$LINENO}: checking if BaseStream constructor needs 2 arguments" >&5
-$as_echo_n "checking if BaseStream constructor needs 2 arguments... " >&6; }
-            rm -f testpoppler.*
-            echo '#include <poppler/Object.h>' > testpoppler.cpp
-            echo '#include <poppler/Stream.h>' >> testpoppler.cpp
-            echo 'class TestStream: public BaseStream {' >> testpoppler.cpp
-            echo 'public:' >> testpoppler.cpp
-            echo '  TestStream() : BaseStream(0,0) {}' >> testpoppler.cpp
-            echo '};' >> testpoppler.cpp
-            echo 'int main(int argc, char** argv) { return 0; }' >> testpoppler.cpp
-            if test -z "`${CXX} ${CXXFLAGS} ${CPPFLAGS} testpoppler.cpp -c ${POPPLER_INC} 2>&1`" ; then
-                POPPLER_BASE_STREAM_HAS_TWO_ARGS=yes
-                { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-$as_echo "yes" >&6; }
+fi
 
-                # And now we check if we have Poppler >= 0.20.0
-                { $as_echo "$as_me:${as_lineno-$LINENO}: checking if we have Poppler >= 0.20.0" >&5
-$as_echo_n "checking if we have Poppler >= 0.20.0... " >&6; }
-                rm -f testpoppler.*
-                echo '#include <poppler/Error.h>' > testpoppler.cpp
-                echo 'int main(int argc, char** argv) { setErrorCallback(0,0); return 0; }' >> testpoppler.cpp
-                if test -z "`${CXX} ${CXXFLAGS} ${CPPFLAGS} testpoppler.cpp -c ${POPPLER_INC} 2>&1`" ; then
-                    POPPLER_0_20_OR_LATER=yes
-                    { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-$as_echo "yes" >&6; }
+pkg_failed=no
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for POPPLER" >&5
+$as_echo_n "checking for POPPLER... " >&6; }
 
-                    # And now we check if we have Poppler >= 0.23.0
-                    { $as_echo "$as_me:${as_lineno-$LINENO}: checking if we have Poppler >= 0.23.0" >&5
-$as_echo_n "checking if we have Poppler >= 0.23.0... " >&6; }
-                    rm -f testpoppler.*
-                    echo '#include <poppler/Object.h>' > testpoppler.cpp
-                    echo '#include <poppler/Stream.h>' >> testpoppler.cpp
-                    echo 'class TestStream: public BaseStream {' >> testpoppler.cpp
-                    echo 'public:' >> testpoppler.cpp
-                    echo '  TestStream() : BaseStream(0,0) {}' >> testpoppler.cpp
-                    echo '  ~TestStream() {}' >> testpoppler.cpp
-                    echo '  virtual BaseStream *copy() { return BaseStream::copy(); }' >> testpoppler.cpp
-                    echo '};' >> testpoppler.cpp
-                    echo 'int main(int argc, char** argv) { return 0; }' >> testpoppler.cpp
-                    if test -z "`${CXX} ${CXXFLAGS} ${CPPFLAGS} testpoppler.cpp -c ${POPPLER_INC} 2>&1`" ; then
-                        POPPLER_0_23_OR_LATER=yes
-                        { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-$as_echo "yes" >&6; }
-                    else
-                        { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-                    fi
+if test -n "$PKG_CONFIG"; then
+    if test -n "$POPPLER_CFLAGS"; then
+        pkg_cv_POPPLER_CFLAGS="$POPPLER_CFLAGS"
+    else
+        if test -n "$PKG_CONFIG" && \
+    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"poppler >= 0.23.0\""; } >&5
+  ($PKG_CONFIG --exists --print-errors "poppler >= 0.23.0") 2>&5
+  ac_status=$?
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; }; then
+  pkg_cv_POPPLER_CFLAGS=`$PKG_CONFIG --cflags "poppler >= 0.23.0" 2>/dev/null`
+else
+  pkg_failed=yes
+fi
+    fi
+else
+	pkg_failed=untried
+fi
+if test -n "$PKG_CONFIG"; then
+    if test -n "$POPPLER_LIBS"; then
+        pkg_cv_POPPLER_LIBS="$POPPLER_LIBS"
+    else
+        if test -n "$PKG_CONFIG" && \
+    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"poppler >= 0.23.0\""; } >&5
+  ($PKG_CONFIG --exists --print-errors "poppler >= 0.23.0") 2>&5
+  ac_status=$?
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; }; then
+  pkg_cv_POPPLER_LIBS=`$PKG_CONFIG --libs "poppler >= 0.23.0" 2>/dev/null`
+else
+  pkg_failed=yes
+fi
+    fi
+else
+	pkg_failed=untried
+fi
 
-                else
-                    { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-                fi
 
-            else
-                { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-            fi
+
+if test $pkg_failed = yes; then
+
+if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
+        _pkg_short_errors_supported=yes
+else
+        _pkg_short_errors_supported=no
+fi
+        if test $_pkg_short_errors_supported = yes; then
+	        POPPLER_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "poppler >= 0.23.0"`
+        else
+	        POPPLER_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "poppler >= 0.23.0"`
         fi
-    else
-        { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+	# Put the nasty error message in config.log where it belongs
+	echo "$POPPLER_PKG_ERRORS" >&5
+
+	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
 $as_echo "no" >&6; }
+                POPPLER_VERSION=
+elif test $pkg_failed = untried; then
+	POPPLER_VERSION=
+else
+	POPPLER_CFLAGS=$pkg_cv_POPPLER_CFLAGS
+	POPPLER_LIBS=$pkg_cv_POPPLER_LIBS
+        { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
+	POPPLER_VERSION=`$PKG_CONFIG --modversion poppler`
+fi
+    if test "$POPPLER_VERSION" != ""; then
+        HAVE_POPPLER=yes
+        POPPLER_MAJOR_VERSION=`expr $POPPLER_VERSION : '\([0-9]*\)'`
+        POPPLER_MINOR_VERSION=`expr $POPPLER_VERSION : '[0-9]*\.\([0-9]*\)'`
+        POPPLER_CFLAGS=`echo $POPPLER_CFLAGS $POPPLER_CFLAGS | sed "s/include\/poppler/include/"`
     fi
-    rm -f testpoppler.*
-    rm -f testpoppler
 else
     { $as_echo "$as_me:${as_lineno-$LINENO}: result: disabled" >&5
 $as_echo "disabled" >&6; }
 fi
 
-HAVE_POPPLER=$HAVE_POPPLER
-
-POPPLER_HAS_OPTCONTENT=$POPPLER_HAS_OPTCONTENT
-
-POPPLER_BASE_STREAM_HAS_TWO_ARGS=$POPPLER_BASE_STREAM_HAS_TWO_ARGS
-
-POPPLER_0_20_OR_LATER=$POPPLER_0_20_OR_LATER
+if test "$HAVE_POPPLER" = "yes" -a "$PDF_PLUGIN" = "no"; then
+    LIBS="${POPPLER_LIBS} ${LIBS}"
+fi
 
-POPPLER_0_23_OR_LATER=$POPPLER_0_23_OR_LATER
+HAVE_POPPLER=$HAVE_POPPLER
 
-POPPLER_0_58_OR_LATER=$POPPLER_0_58_OR_LATER
+POPPLER_MAJOR_VERSION=$POPPLER_MAJOR_VERSION
 
-POPPLER_0_69_OR_LATER=$POPPLER_0_69_OR_LATER
+POPPLER_MINOR_VERSION=$POPPLER_MINOR_VERSION
 
-POPPLER_INC=$POPPLER_INC
+POPPLER_CFLAGS=$POPPLER_CFLAGS
 
-POPPLER_PLUGIN_LIB=$POPPLER_PLUGIN_LIB
+POPPLER_PLUGIN_LIB=$POPPLER_LIBS
 
 
 
diff --git a/gdal/configure.ac b/gdal/configure.ac
index 90e9808d83ab..383a6b7f9a11 100644
--- a/gdal/configure.ac
+++ b/gdal/configure.ac
@@ -4510,178 +4510,35 @@ dnl ---------------------------------------------------------------------------
 AC_ARG_WITH(poppler,[  --with-poppler[=ARG]    Include poppler(for PDF) support (ARG=no(default), yes or poppler install path)],,)
 
 HAVE_POPPLER=no
-POPPLER_HAS_OPTCONTENT=no
-POPPLER_BASE_STREAM_HAS_TWO_ARGS=no
-POPPLER_0_20_OR_LATER=no
-POPPLER_0_23_OR_LATER=no
-POPPLER_0_58_OR_LATER=no
-POPPLER_0_69_OR_LATER=no
+POPPLER_MAJOR_VERSION=
+POPPLER_MINOR_VERSION=
 
 AC_MSG_CHECKING([for poppler])
 
 if test "$with_poppler" != "no" -a "$with_poppler" != ""; then
 
-    if test "$with_poppler" = "yes" ; then
-        TEST_POPPLER_INC="-I/usr/include -I/usr/include/poppler"
-        TEST_POPPLER_LIB="-lpoppler"
-    else
-        TEST_POPPLER_INC="-I$with_poppler/include -I$with_poppler/include/poppler"
-        TEST_POPPLER_LIB="-L$with_poppler/lib -lpoppler"
-    fi
-
-    # Check that we can accept Page::pageObj private member
-    rm -f testpoppler.*
-    echo '#define private public' > testpoppler.cpp
-    echo '#include <poppler/Page.h>' >> testpoppler.cpp
-    echo '#include <poppler/splash/SplashBitmap.h>' >> testpoppler.cpp
-    echo 'int main(int argc, char** argv) { return &(((Page*)0x8000)->pageObj) == 0; } ' >> testpoppler.cpp
-
-    if test -z "`${CXX} ${CXXFLAGS} ${CPPFLAGS} testpoppler.cpp -o testpoppler ${TEST_POPPLER_INC} ${TEST_POPPLER_LIB} 2>&1`" ; then
+    PKG_PROG_PKG_CONFIG([0.21])
+    PKG_CHECK_MODULES([POPPLER], [poppler >= 0.23.0],
+            [POPPLER_VERSION=`$PKG_CONFIG --modversion poppler`], [POPPLER_VERSION=])
+    if test "$POPPLER_VERSION" != ""; then
         HAVE_POPPLER=yes
-    else
-        # poppler 0.23.0 needs to be linked against pthread
-        TEST_POPPLER_LIB="${TEST_POPPLER_LIB} -lpthread"
-        if test -z "`${CXX} ${CXXFLAGS} ${CPPFLAGS} testpoppler.cpp -o testpoppler ${TEST_POPPLER_INC} ${TEST_POPPLER_LIB} 2>&1`" ; then
-            HAVE_POPPLER=yes
-        fi
+        POPPLER_MAJOR_VERSION=`expr $POPPLER_VERSION : '\([[0-9]]*\)'`
+        POPPLER_MINOR_VERSION=`expr $POPPLER_VERSION : '[[0-9]]*\.\([[0-9]]*\)'`
+        POPPLER_CFLAGS=`echo $POPPLER_CFLAGS $POPPLER_CFLAGS | sed "s/include\/poppler/include/"`
     fi
-
-    if test "$HAVE_POPPLER" = "yes"; then
-        if test "$PDF_PLUGIN" = "no"; then
-            LIBS="${TEST_POPPLER_LIB} ${LIBS}"
-        fi
-        AC_MSG_RESULT([yes])
-        POPPLER_INC=$TEST_POPPLER_INC
-        POPPLER_PLUGIN_LIB="${TEST_POPPLER_LIB}"
-
-        CHECK_OTHER_POPPLER_VERSION=yes
-
-        if test "$CHECK_OTHER_POPPLER_VERSION" = "yes"; then
-            AC_MSG_CHECKING([if OptionalContent has API >= 0.69.0])
-            rm -f testpoppler.*
-            echo '#include <poppler/OptionalContent.h>' > testpoppler.cpp
-            echo 'int main(int argc, char** argv) {' >> testpoppler.cpp
-            echo 'OCGs ocg(nullptr, nullptr);' >> testpoppler.cpp
-            echo 'ocg.getOCGs().size();' >> testpoppler.cpp
-            echo 'return 0; }' >> testpoppler.cpp
-            if test -z "`${CXX} ${CXXFLAGS} ${CPPFLAGS} testpoppler.cpp -c ${POPPLER_INC} 2>&1`" ; then
-                POPPLER_0_69_OR_LATER=yes
-                POPPLER_0_58_OR_LATER=yes
-                POPPLER_0_23_OR_LATER=yes
-                POPPLER_0_20_OR_LATER=yes
-                POPPLER_BASE_STREAM_HAS_TWO_ARGS=yes
-                POPPLER_HAS_OPTCONTENT=yes
-                CHECK_OTHER_POPPLER_VERSION=no
-                AC_MSG_RESULT([yes])
-            else
-                AC_MSG_RESULT([no])
-            fi
-        fi
-
-        if test "$CHECK_OTHER_POPPLER_VERSION" = "yes"; then
-            # And now we check if we have Poppler >= 0.58.0
-            AC_MSG_CHECKING([if Object does have new API (>= 0.58.0)])
-            rm -f testpoppler.*
-            echo '#include <poppler/Object.h>' > testpoppler.cpp
-            echo 'int main(int argc, char** argv) { Object o(objNull); return 0; }' >> testpoppler.cpp
-            if test -z "`${CXX} ${CXXFLAGS} ${CPPFLAGS} testpoppler.cpp -c ${POPPLER_INC} 2>&1`" ; then
-                POPPLER_0_58_OR_LATER=yes
-                POPPLER_0_23_OR_LATER=yes
-                POPPLER_0_20_OR_LATER=yes
-                POPPLER_BASE_STREAM_HAS_TWO_ARGS=yes
-                POPPLER_HAS_OPTCONTENT=yes
-                CHECK_OTHER_POPPLER_VERSION=no
-                AC_MSG_RESULT([yes])
-            else
-                AC_MSG_RESULT([no])
-            fi
-        fi
-
-        if test "$CHECK_OTHER_POPPLER_VERSION" = "yes"; then
-
-            # And now try another dirty thing, but this one is
-            # optional.
-            AC_MSG_CHECKING([if Catalog::optContent exists])
-            rm -f testpoppler.*
-            echo '#define private public' > testpoppler.cpp
-            echo '#include <poppler/Object.h>' >> testpoppler.cpp
-            echo '#include <poppler/Catalog.h>' >> testpoppler.cpp
-            echo 'int main(int argc, char** argv) { return &(((Catalog*)0x8000)->optContent) == 0; }' >> testpoppler.cpp
-            if test -z "`${CXX} ${CXXFLAGS} ${CPPFLAGS} testpoppler.cpp -c ${POPPLER_INC} 2>&1`" ; then
-                POPPLER_HAS_OPTCONTENT=yes
-                AC_MSG_RESULT([yes])
-            else
-                AC_MSG_RESULT([no])
-            fi
-
-            # And now we check if we have Poppler >= 0.16.0
-            AC_MSG_CHECKING([if BaseStream constructor needs 2 arguments])
-            rm -f testpoppler.*
-            echo '#include <poppler/Object.h>' > testpoppler.cpp
-            echo '#include <poppler/Stream.h>' >> testpoppler.cpp
-            echo 'class TestStream: public BaseStream {' >> testpoppler.cpp
-            echo 'public:' >> testpoppler.cpp
-            echo '  TestStream() : BaseStream(0,0) {}' >> testpoppler.cpp
-            echo '};' >> testpoppler.cpp
-            echo 'int main(int argc, char** argv) { return 0; }' >> testpoppler.cpp
-            if test -z "`${CXX} ${CXXFLAGS} ${CPPFLAGS} testpoppler.cpp -c ${POPPLER_INC} 2>&1`" ; then
-                POPPLER_BASE_STREAM_HAS_TWO_ARGS=yes
-                AC_MSG_RESULT([yes])
-
-                # And now we check if we have Poppler >= 0.20.0
-                AC_MSG_CHECKING([if we have Poppler >= 0.20.0])
-                rm -f testpoppler.*
-                echo '#include <poppler/Error.h>' > testpoppler.cpp
-                echo 'int main(int argc, char** argv) { setErrorCallback(0,0); return 0; }' >> testpoppler.cpp
-                if test -z "`${CXX} ${CXXFLAGS} ${CPPFLAGS} testpoppler.cpp -c ${POPPLER_INC} 2>&1`" ; then
-                    POPPLER_0_20_OR_LATER=yes
-                    AC_MSG_RESULT([yes])
-
-                    # And now we check if we have Poppler >= 0.23.0
-                    AC_MSG_CHECKING([if we have Poppler >= 0.23.0])
-                    rm -f testpoppler.*
-                    echo '#include <poppler/Object.h>' > testpoppler.cpp
-                    echo '#include <poppler/Stream.h>' >> testpoppler.cpp
-                    echo 'class TestStream: public BaseStream {' >> testpoppler.cpp
-                    echo 'public:' >> testpoppler.cpp
-                    echo '  TestStream() : BaseStream(0,0) {}' >> testpoppler.cpp
-                    echo '  ~TestStream() {}' >> testpoppler.cpp
-                    echo '  virtual BaseStream *copy() { return BaseStream::copy(); }' >> testpoppler.cpp
-                    echo '};' >> testpoppler.cpp
-                    echo 'int main(int argc, char** argv) { return 0; }' >> testpoppler.cpp
-                    if test -z "`${CXX} ${CXXFLAGS} ${CPPFLAGS} testpoppler.cpp -c ${POPPLER_INC} 2>&1`" ; then
-                        POPPLER_0_23_OR_LATER=yes
-                        AC_MSG_RESULT([yes])
-                    else
-                        AC_MSG_RESULT([no])
-                    fi
-
-                else
-                    AC_MSG_RESULT([no])
-                fi
-
-            else
-                AC_MSG_RESULT([no])
-            fi
-        fi
-    else
-        AC_MSG_RESULT([no])
-    fi
-    rm -f testpoppler.*
-    rm -f testpoppler
 else
     AC_MSG_RESULT([disabled])
 fi
 
+if test "$HAVE_POPPLER" = "yes" -a "$PDF_PLUGIN" = "no"; then
+    LIBS="${POPPLER_LIBS} ${LIBS}"
+fi
+
 AC_SUBST(HAVE_POPPLER, $HAVE_POPPLER)
-AC_SUBST(POPPLER_HAS_OPTCONTENT, $POPPLER_HAS_OPTCONTENT)
-AC_SUBST(POPPLER_BASE_STREAM_HAS_TWO_ARGS, $POPPLER_BASE_STREAM_HAS_TWO_ARGS)
-AC_SUBST(POPPLER_0_20_OR_LATER, $POPPLER_0_20_OR_LATER)
-AC_SUBST(POPPLER_0_23_OR_LATER, $POPPLER_0_23_OR_LATER)
-AC_SUBST(POPPLER_0_58_OR_LATER, $POPPLER_0_58_OR_LATER)
-AC_SUBST(POPPLER_0_69_OR_LATER, $POPPLER_0_69_OR_LATER)
-AC_SUBST(POPPLER_INC, $POPPLER_INC)
-AC_SUBST(POPPLER_PLUGIN_LIB, $POPPLER_PLUGIN_LIB)
+AC_SUBST(POPPLER_MAJOR_VERSION, $POPPLER_MAJOR_VERSION)
+AC_SUBST(POPPLER_MINOR_VERSION, $POPPLER_MINOR_VERSION)
+AC_SUBST(POPPLER_CFLAGS, $POPPLER_CFLAGS)
+AC_SUBST(POPPLER_PLUGIN_LIB, $POPPLER_LIBS)
 
 dnl ---------------------------------------------------------------------------
 dnl Check if libpodofo is available
diff --git a/gdal/frmts/pdf/GNUmakefile b/gdal/frmts/pdf/GNUmakefile
index 6a267f529b2c..1ce563a51444 100644
--- a/gdal/frmts/pdf/GNUmakefile
+++ b/gdal/frmts/pdf/GNUmakefile
@@ -11,31 +11,7 @@ LD_SHARED = $(LD) -bundle
 endif
 
 ifeq ($(HAVE_POPPLER),yes)
-CPPFLAGS +=  -DHAVE_POPPLER
-endif
-
-ifeq ($(POPPLER_HAS_OPTCONTENT),yes)
-CPPFLAGS +=  -DPOPPLER_HAS_OPTCONTENT
-endif
-
-ifeq ($(POPPLER_BASE_STREAM_HAS_TWO_ARGS),yes)
-CPPFLAGS +=  -DPOPPLER_BASE_STREAM_HAS_TWO_ARGS
-endif
-
-ifeq ($(POPPLER_0_20_OR_LATER),yes)
-CPPFLAGS +=  -DPOPPLER_0_20_OR_LATER
-endif
-
-ifeq ($(POPPLER_0_23_OR_LATER),yes)
-CPPFLAGS +=  -DPOPPLER_0_23_OR_LATER
-endif
-
-ifeq ($(POPPLER_0_58_OR_LATER),yes)
-CPPFLAGS +=  -DPOPPLER_0_58_OR_LATER
-endif
-
-ifeq ($(POPPLER_0_69_OR_LATER),yes)
-CPPFLAGS +=  -DPOPPLER_0_69_OR_LATER
+CPPFLAGS +=  -DHAVE_POPPLER -DPOPPLER_MAJOR_VERSION=$(POPPLER_MAJOR_VERSION) -DPOPPLER_MINOR_VERSION=$(POPPLER_MINOR_VERSION)
 endif
 
 ifeq ($(HAVE_PODOFO),yes)
diff --git a/gdal/frmts/pdf/makefile.vc b/gdal/frmts/pdf/makefile.vc
index ad76d3de70c9..da5e26a66ac7 100644
--- a/gdal/frmts/pdf/makefile.vc
+++ b/gdal/frmts/pdf/makefile.vc
@@ -14,30 +14,16 @@ OBJ = $(OBJ) ..\..\ogr\ogrsf_frmts\mem\ogrmemdatasource.obj ..\..\ogr\ogrsf_frmt
 EXTRAFLAGS =  -I..\vrt -I..\mem -I..\..\ogr\ogrsf_frmts\mem $(POPPLER_EXTRAFLAGS) $(PODOFO_EXTRAFLAGS) $(PDFIUM_EXTRAFLAGS)
 
 !IFDEF POPPLER_ENABLED
-POPPLER_EXTRAFLAGS = $(POPPLER_CFLAGS) $(POPPLER_HAS_OPTCONTENT_FLAGS) $(POPPLER_BASE_STREAM_HAS_TWO_ARGS_FLAGS) $(POPPLER_0_20_OR_LATER_FLAGS) $(POPPLER_0_23_OR_LATER_FLAGS) $(POPPLER_0_58_OR_LATER_FLAGS) $(POPPLER_0_69_OR_LATER_FLAGS) -DHAVE_POPPLER
-
-!IFDEF POPPLER_HAS_OPTCONTENT
-POPPLER_HAS_OPTCONTENT_FLAGS = -DPOPPLER_HAS_OPTCONTENT
-!ENDIF
-
-!IFDEF POPPLER_BASE_STREAM_HAS_TWO_ARGS
-POPPLER_BASE_STREAM_HAS_TWO_ARGS_FLAGS = -DPOPPLER_BASE_STREAM_HAS_TWO_ARGS
-!ENDIF
-
-!IFDEF POPPLER_0_20_OR_LATER
-POPPLER_0_20_OR_LATER_FLAGS = -DPOPPLER_0_20_OR_LATER
-!ENDIF
-
-!IFDEF POPPLER_0_23_OR_LATER
-POPPLER_0_23_OR_LATER_FLAGS = -DPOPPLER_0_23_OR_LATER
-!ENDIF
-
-!IFDEF POPPLER_0_58_OR_LATER
-POPPLER_0_58_OR_LATER_FLAGS = -DPOPPLER_0_58_OR_LATER
-!ENDIF
+POPPLER_EXTRAFLAGS = $(POPPLER_CFLAGS) $(POPPLER_VERSION_FLAGS) -DHAVE_POPPLER
 
 !IFDEF POPPLER_0_69_OR_LATER
-POPPLER_0_69_OR_LATER_FLAGS = -DPOPPLER_0_69_OR_LATER
+POPPLER_VERSION_FLAGS = -DPOPPLER_MAJOR_VERSION=0 -DPOPPLER_MINOR_VERSION=69
+!ELSEIFDEF POPPLER_0_58_OR_LATER
+POPPLER_VERSION_FLAGS = -DPOPPLER_MAJOR_VERSION=0 -DPOPPLER_MINOR_VERSION=58
+!ELSEIFDEF POPPLER_MAJOR_VERSION
+POPPLER_VERSION_FLAGS = -DPOPPLER_MAJOR_VERSION=$(POPPLER_MAJOR_VERSION) -DPOPPLER_MINOR_VERSION=$(POPPLER_MINOR_VERSION)
+!ELSE
+POPPLER_VERSION_FLAGS = -DPOPPLER_MAJOR_VERSION=0 -DPOPPLER_MINOR_VERSION=23
 !ENDIF
 
 !ENDIF
diff --git a/gdal/frmts/pdf/pdfdataset.cpp b/gdal/frmts/pdf/pdfdataset.cpp
index 6e8223e4708d..27c9b552431d 100644
--- a/gdal/frmts/pdf/pdfdataset.cpp
+++ b/gdal/frmts/pdf/pdfdataset.cpp
@@ -130,7 +130,7 @@ class ObjectAutoFree : public Object
 public:
     ObjectAutoFree() {}
     ~ObjectAutoFree() {
-#ifndef POPPLER_0_58_OR_LATER
+#if !(POPPLER_MAJOR_VERSION >= 1 || POPPLER_MINOR_VERSION >= 58)
         obj.free();
 #endif
     }
@@ -176,17 +176,10 @@ class GDALPDFOutputDev : public SplashOutputDev
         void SetEnableText(int bFlag) { bEnableText = bFlag; }
         void SetEnableBitmap(int bFlag) { bEnableBitmap = bFlag; }
 
-        virtual void startPage(int pageNum, GfxState *state
-#ifdef POPPLER_0_23_OR_LATER
-                               ,XRef* xrefIn
-#endif
+        virtual void startPage(int pageNum, GfxState *state,XRef* xrefIn
         ) override
         {
-            SplashOutputDev::startPage(pageNum, state
-#ifdef POPPLER_0_23_OR_LATER
-                                       ,xrefIn
-#endif
-            );
+            SplashOutputDev::startPage(pageNum, state,xrefIn);
             SplashBitmap* poBitmap = getBitmap();
             memset(poBitmap->getDataPtr(), 255, poBitmap->getRowSize() * poBitmap->getHeight());
         }
@@ -226,15 +219,6 @@ class GDALPDFOutputDev : public SplashOutputDev
                 SplashOutputDev::beginTextObject(state);
         }
 
-#ifndef POPPLER_0_23_OR_LATER
-        virtual GBool deviceHasTextClip(GfxState *state) override
-        {
-            if (bEnableText)
-                return SplashOutputDev::deviceHasTextClip(state);
-            return gFalse;
-        }
-#endif
-
         virtual void endTextObject(GfxState *state) override
         {
             if (bEnableText)
@@ -260,7 +244,6 @@ class GDALPDFOutputDev : public SplashOutputDev
             }
         }
 
-#ifdef POPPLER_0_20_OR_LATER
         virtual void setSoftMaskFromImageMask(GfxState *state,
                             Object *ref, Stream *str,
                             int width, int height, GBool invert,
@@ -279,7 +262,6 @@ class GDALPDFOutputDev : public SplashOutputDev
             if (bEnableBitmap)
                 SplashOutputDev::unsetSoftMaskFromImageMask(state, baseMatrix);
         }
-#endif
 
         virtual void drawImage(GfxState *state, Object *ref, Stream *str,
                                int width, int height, GfxImageColorMap *colorMap,
@@ -1758,11 +1740,7 @@ CPLErr PDFDataset::ReadPixels( int nReqXOff, int nReqYOff,
         }
 
         PDFDoc* poDoc = poDocPoppler;
-#ifdef POPPLER_0_20_OR_LATER
         poSplashOut->startDoc(poDoc);
-#else
-        poSplashOut->startDoc(poDoc->getXRef());
-#endif
 
         /* EVIL: we modify a private member... */
         /* poppler (at least 0.12 and 0.14 versions) don't render correctly */
@@ -1770,12 +1748,10 @@ CPLErr PDFDataset::ReadPixels( int nReqXOff, int nReqYOff,
         /* in those cases. This processing of optional content is an addition of */
         /* poppler in comparison to original xpdf, which hasn't the issue. All in */
         /* all, nullifying optContent removes the error message and improves the rendering */
-#ifdef POPPLER_HAS_OPTCONTENT
         Catalog* poCatalog = poDoc->getCatalog();
         OCGs* poOldOCGs = poCatalog->optContent;
         if (!bUseOCG)
             poCatalog->optContent = nullptr;
-#endif
         poDoc->displayPageSlice(poSplashOut,
                                 iPage,
                                 dfDPI, dfDPI,
@@ -1785,9 +1761,7 @@ CPLErr PDFDataset::ReadPixels( int nReqXOff, int nReqYOff,
                                 nReqXSize, nReqYSize);
 
     /* Restore back */
-#ifdef POPPLER_HAS_OPTCONTENT
         poCatalog->optContent = poOldOCGs;
-#endif
 
         SplashBitmap* poBitmap = poSplashOut->getBitmap();
         if (poBitmap->getWidth() != nReqXSize || poBitmap->getHeight() != nReqYSize)
@@ -2294,7 +2268,7 @@ GDALPDFObject* PDFDataset::GetCatalog()
     if (bUseLib.test(PDFLIB_POPPLER))
     {
         poCatalogObjectPoppler = new ObjectAutoFree;
-#ifdef POPPLER_0_58_OR_LATER
+#if POPPLER_MAJOR_VERSION >= 1 || POPPLER_MINOR_VERSION >= 58
         *poCatalogObjectPoppler->getObj() = poDocPoppler->getXRef()->getCatalog();
 #else
         poDocPoppler->getXRef()->getCatalog(poCatalogObjectPoppler->getObj());
@@ -2592,16 +2566,10 @@ static void PDFDatasetErrorFunctionCommon(const CPLString& osError)
     CPLError(CE_Failure, CPLE_AppDefined, "%s", osError.c_str());
 }
 
-#ifdef POPPLER_0_20_OR_LATER
-
 static void PDFDatasetErrorFunction(void* /* userData*/,
                                     ErrorCategory /* eErrCategory */,
-#ifdef POPPLER_0_23_OR_LATER
                                     Goffset nPos,
-#else
-                                    int nPos,
-#endif
-#ifdef POPPLER_0_71_OR_LATER
+#if POPPLER_MAJOR_VERSION >= 1 || POPPLER_MINOR_VERSION >= 71
                                     const char *pszMsg
 #else
                                     char *pszMsg
@@ -2615,17 +2583,6 @@ static void PDFDatasetErrorFunction(void* /* userData*/,
     osError += pszMsg;
     PDFDatasetErrorFunctionCommon(osError);
 }
-#else
-static void PDFDatasetErrorFunction(int nPos, char *pszMsg, va_list args)
-{
-    CPLString osError;
-
-    if (nPos >= 0)
-        osError.Printf("Pos = %d, ", nPos);
-    osError += CPLString().vPrintf(pszMsg, args);
-    PDFDatasetErrorFunctionCommon(osError);
-}
-#endif
 #endif
 
 /************************************************************************/
@@ -3447,7 +3404,7 @@ void PDFDataset::FindLayersPoppler()
     }
     else
     {
-#ifdef POPPLER_0_69_OR_LATER
+#if POPPLER_MAJOR_VERSION >= 1 || POPPLER_MINOR_VERSION >= 69
         for( const auto& refOCGPair: optContentConfig->getOCGs() )
         {
             auto ocg = refOCGPair.second.get();
@@ -3485,7 +3442,7 @@ void PDFDataset::TurnLayersOnOffPoppler()
     {
         int i;
         int bAll = EQUAL(pszLayers, "ALL");
-#ifdef POPPLER_0_69_OR_LATER
+#if POPPLER_MAJOR_VERSION >= 1 || POPPLER_MINOR_VERSION >= 69
         for( const auto& refOCGPair: optContentConfig->getOCGs() )
         {
             auto ocg = refOCGPair.second.get();
@@ -4058,7 +4015,7 @@ GDALDataset *PDFDataset::Open( GDALOpenInfo * poOpenInfo )
     GDALPDFObject* poPageObj = nullptr;
 #ifdef HAVE_POPPLER
     PDFDoc* poDocPoppler = nullptr;
-#ifdef POPPLER_0_58_OR_LATER
+#if POPPLER_MAJOR_VERSION >= 1 || POPPLER_MINOR_VERSION >= 58
     Object oObj;
 #else
     ObjectAutoFree oObj;
@@ -4082,11 +4039,7 @@ GDALDataset *PDFDataset::Open( GDALOpenInfo * poOpenInfo )
     GooString* poUserPwd = nullptr;
 
     /* Set custom error handler for poppler errors */
-#ifdef POPPLER_0_20_OR_LATER
     setErrorCallback(PDFDatasetErrorFunction, nullptr);
-#else
-    setErrorFunction(PDFDatasetErrorFunction);
-#endif
 
     {
         CPLMutexHolderD(&hGlobalParamsMutex);
@@ -4109,7 +4062,7 @@ GDALDataset *PDFDataset::Open( GDALOpenInfo * poOpenInfo )
         if (pszUserPwd)
             poUserPwd = new GooString(pszUserPwd);
 
-#ifdef POPPLER_0_58_OR_LATER
+#if POPPLER_MAJOR_VERSION >= 1 || POPPLER_MINOR_VERSION >= 58
         poDocPoppler = new PDFDoc(new VSIPDFFileStream(fp, pszFilename, std::move(oObj)), nullptr, poUserPwd);
 #else
         oObj.getObj()->initNull();
@@ -4803,14 +4756,14 @@ GDALDataset *PDFDataset::Open( GDALOpenInfo * poOpenInfo )
     if( poDocPoppler->getXRef()->isOk() )
     {
         Object oInfo;
-#ifdef POPPLER_0_58_OR_LATER
+#if POPPLER_MAJOR_VERSION >= 1 || POPPLER_MINOR_VERSION >= 58
         oInfo = poDocPoppler->getDocInfo();
 #else
         poDocPoppler->getDocInfo(&oInfo);
 #endif
         GDALPDFObjectPoppler oInfoObjPoppler(&oInfo, FALSE);
         poDS->ParseInfo(&oInfoObjPoppler);
-#ifndef POPPLER_0_58_OR_LATER
+#if !(POPPLER_MAJOR_VERSION >= 1 || POPPLER_MINOR_VERSION >= 58)
         oInfo.free();
 #endif
     }
diff --git a/gdal/frmts/pdf/pdfio.cpp b/gdal/frmts/pdf/pdfio.cpp
index 582d0632b419..7850e0d292a4 100644
--- a/gdal/frmts/pdf/pdfio.cpp
+++ b/gdal/frmts/pdf/pdfio.cpp
@@ -36,7 +36,6 @@
 
 CPL_CVSID("$Id$")
 
-#ifdef POPPLER_BASE_STREAM_HAS_TWO_ARGS
 /* Poppler 0.31.0 is the first one that needs to know the file size */
 static vsi_l_offset VSIPDFFileStreamGetSize(VSILFILE* f)
 {
@@ -45,7 +44,6 @@ static vsi_l_offset VSIPDFFileStreamGetSize(VSILFILE* f)
     VSIFSeekL(f, 0, SEEK_SET);
     return nSize;
 }
-#endif
 
 /************************************************************************/
 /*                         VSIPDFFileStream()                           */
@@ -55,12 +53,10 @@ VSIPDFFileStream::VSIPDFFileStream(
     VSILFILE* fIn, const char* pszFilename,
     makeSubStream_object_type dictA
 ) :
-#ifdef POPPLER_0_58_OR_LATER
+#if POPPLER_MAJOR_VERSION >= 1 || POPPLER_MINOR_VERSION >= 58
     BaseStream(std::move(dictA), (Goffset)VSIPDFFileStreamGetSize(fIn)),
-#elif defined(POPPLER_BASE_STREAM_HAS_TWO_ARGS)
-    BaseStream(dictA, (setPos_offset_type)VSIPDFFileStreamGetSize(fIn)),
 #else
-    BaseStream(dictA),
+    BaseStream(dictA, (setPos_offset_type)VSIPDFFileStreamGetSize(fIn)),
 #endif
     poParent(nullptr),
     poFilename(new GooString(pszFilename)),
@@ -83,12 +79,10 @@ VSIPDFFileStream::VSIPDFFileStream( VSIPDFFileStream* poParentIn,
                                     vsi_l_offset startA, GBool limitedA,
                                     vsi_l_offset lengthA,
                                     makeSubStream_object_type dictA) :
-#ifdef POPPLER_0_58_OR_LATER
+#if POPPLER_MAJOR_VERSION >= 1 || POPPLER_MINOR_VERSION >= 58
     BaseStream(std::move(dictA), (Goffset)lengthA),
-#elif defined(POPPLER_BASE_STREAM_HAS_TWO_ARGS)
-    BaseStream(dictA, (makeSubStream_offset_type)lengthA),
 #else
-    BaseStream(dictA),
+    BaseStream(dictA, (makeSubStream_offset_type)lengthA),
 #endif
     poParent(poParentIn),
     poFilename(poParentIn->poFilename),
@@ -122,13 +116,13 @@ VSIPDFFileStream::~VSIPDFFileStream()
 /*                                  copy()                              */
 /************************************************************************/
 
-#ifdef POPPLER_0_58_OR_LATER
+#if POPPLER_MAJOR_VERSION >= 1 || POPPLER_MINOR_VERSION >= 58
 BaseStream* VSIPDFFileStream::copy()
 {
     return new VSIPDFFileStream(poParent, nStart, bLimited,
                                 nLength, dict.copy());
 }
-#elif defined(POPPLER_0_23_OR_LATER)
+#else
 BaseStream* VSIPDFFileStream::copy()
 {
     return new VSIPDFFileStream(poParent, nStart, bLimited,
@@ -142,7 +136,7 @@ BaseStream* VSIPDFFileStream::copy()
 Stream *VSIPDFFileStream::makeSubStream(makeSubStream_offset_type startA, GBool limitedA,
                                         makeSubStream_offset_type lengthA, makeSubStream_object_type dictA)
 {
-#ifdef POPPLER_0_58_OR_LATER
+#if POPPLER_MAJOR_VERSION >= 1 || POPPLER_MINOR_VERSION >= 58
     return new VSIPDFFileStream(this,
                                 startA, limitedA,
                                 lengthA, std::move(dictA));
diff --git a/gdal/frmts/pdf/pdfio.h b/gdal/frmts/pdf/pdfio.h
index 2d58059e8014..7ae15c88aa35 100644
--- a/gdal/frmts/pdf/pdfio.h
+++ b/gdal/frmts/pdf/pdfio.h
@@ -38,34 +38,27 @@
 
 #define BUFFER_SIZE 1024
 
-#ifdef POPPLER_0_23_OR_LATER
 #define getPos_ret_type Goffset
 #define getStart_ret_type Goffset
 #define makeSubStream_offset_type Goffset
 #define setPos_offset_type Goffset
 #define moveStart_delta_type Goffset
-#else
-#define getPos_ret_type int
-#define getStart_ret_type Guint
-#define makeSubStream_offset_type Guint
-#define setPos_offset_type Guint
-#define moveStart_delta_type int
-#endif
 
-#ifdef POPPLER_0_58_OR_LATER
+#if POPPLER_MAJOR_VERSION >= 1 || POPPLER_MINOR_VERSION >= 58
 #define makeSubStream_object_type Object&&
 #else
 #define makeSubStream_object_type Object*
 #endif
 
 // Detect Poppler 0.71 that no longer defines GBool
-#ifdef POPPLER_0_69_OR_LATER
+#if POPPLER_MAJOR_VERSION >= 1 || POPPLER_MINOR_VERSION >= 69
 #ifndef initObj
-#define POPPLER_0_71_OR_LATER
+#if POPPLER_MAJOR_VERSION >= 1 || POPPLER_MINOR_VERSION >= 71
 #define GBool bool
 #define gFalse false
 #endif
 #endif
+#endif
 
 class VSIPDFFileStream final: public BaseStream
 {
@@ -78,9 +71,7 @@ class VSIPDFFileStream final: public BaseStream
                          makeSubStream_object_type dictA);
         virtual ~VSIPDFFileStream();
 
-#ifdef POPPLER_0_23_OR_LATER
         virtual BaseStream* copy() override;
-#endif
 
         virtual Stream *   makeSubStream(makeSubStream_offset_type startA, GBool limitedA,
                                          makeSubStream_offset_type lengthA, makeSubStream_object_type dictA) override;
@@ -102,7 +93,6 @@ class VSIPDFFileStream final: public BaseStream
         virtual void       close() override;
 
     private:
-#ifdef POPPLER_BASE_STREAM_HAS_TWO_ARGS
         /* getChars/hasGetChars added in poppler 0.15.0
          * POPPLER_BASE_STREAM_HAS_TWO_ARGS true from poppler 0.16,
          * This test will be wrong for poppler 0.15 or 0.16,
@@ -110,10 +100,6 @@ class VSIPDFFileStream final: public BaseStream
          */
         virtual GBool hasGetChars() override;
         virtual int getChars(int nChars, Guchar *buffer) override;
-#else
-        virtual GBool hasGetChars() ;
-        virtual int getChars(int nChars, Guchar *buffer) ;
-#endif
 
         VSIPDFFileStream  *poParent;
         GooString         *poFilename;
diff --git a/gdal/frmts/pdf/pdfobject.cpp b/gdal/frmts/pdf/pdfobject.cpp
index e8929aa18106..cc87a8ec2585 100644
--- a/gdal/frmts/pdf/pdfobject.cpp
+++ b/gdal/frmts/pdf/pdfobject.cpp
@@ -971,7 +971,7 @@ class GDALPDFStreamPoppler : public GDALPDFStream
 
 GDALPDFObjectPoppler::~GDALPDFObjectPoppler()
 {
-#ifndef POPPLER_0_58_OR_LATER
+#if !(POPPLER_MAJOR_VERSION >= 1 || POPPLER_MINOR_VERSION >= 58)
     m_po->free();
 #endif
     if (m_bDestroy)
@@ -1055,7 +1055,7 @@ const CPLString& GDALPDFObjectPoppler::GetString()
 {
     if (GetType() == PDFObjectType_String)
     {
-#ifdef POPPLER_0_58_OR_LATER
+#if POPPLER_MAJOR_VERSION >= 1 || POPPLER_MINOR_VERSION >= 58
         // At least available since poppler 0.41
         const GooString* gooString = m_po->getString();
 #else
@@ -1189,7 +1189,7 @@ GDALPDFObject* GDALPDFDictionaryPoppler::Get(const char* pszKey)
     if (oIter != m_map.end())
         return oIter->second;
 
-#ifdef POPPLER_0_58_OR_LATER
+#if POPPLER_MAJOR_VERSION >= 1 || POPPLER_MINOR_VERSION >= 58
     Object o = m_poDict->lookupNF(((char*)pszKey));
     if (!o.isNull())
     {
@@ -1323,7 +1323,7 @@ GDALPDFObject* GDALPDFArrayPoppler::Get(int nIndex)
     if (m_v[nIndex] != nullptr)
         return m_v[nIndex];
 
-#ifdef POPPLER_0_58_OR_LATER
+#if POPPLER_MAJOR_VERSION >= 1 || POPPLER_MINOR_VERSION >= 58
     Object o = m_poArray->getNF(nIndex);
     if( !o.isNull() )
     {
diff --git a/gdal/nmake.opt b/gdal/nmake.opt
index d958e187555e..7e9e87c56d1b 100644
--- a/gdal/nmake.opt
+++ b/gdal/nmake.opt
@@ -640,20 +640,11 @@ OCI_INCLUDE =	-I$(ORACLE_HOME)\oci\include
 #ZLIB_INC = -IC:\projects\zlib
 #ZLIB_LIB = C:\projects\lib\Release\zlib.lib
 
-# Uncomment for PDF support
-# Uncomment POPPLER_BASE_STREAM_HAS_TWO_ARGS = YES for Poppler >= 0.16.0
-# Uncomment POPPLER_0_20_OR_LATER = YES for Poppler >= 0.20.0
-# Uncomment POPPLER_0_23_OR_LATER = YES for Poppler >= 0.23.0
-# Uncomment POPPLER_0_58_OR_LATER = YES for Poppler >= 0.58.0
-# Uncomment POPPLER_0_69_OR_LATER = YES for Poppler >= 0.69.0
+# Uncomment for PDF support, and update version numbers (poppler 0.23 or later required)
 #POPPLER_ENABLED = YES
 #POPPLER_CFLAGS = -Ie:/kde/include -Ie:/kde/include/poppler
-#POPPLER_HAS_OPTCONTENT = YES
-#POPPLER_BASE_STREAM_HAS_TWO_ARGS = YES
-#POPPLER_0_20_OR_LATER = YES
-#POPPLER_0_23_OR_LATER = YES
-#POPPLER_0_58_OR_LATER = YES
-#POPPLER_0_69_OR_LATER = YES
+#POPPLER_MAJOR_VERSION = 0
+#POPPLER_MINOR_VERSION = 69
 #POPPLER_LIBS = e:/kde/lib/poppler.lib e:/kde/lib/freetype.lib e:/kde/lib/liblcms-1.lib advapi32.lib gdi32.lib
 
 # Uncomment for PDF support

From d295d0ebc3b41092ad072790c704c772098da210 Mon Sep 17 00:00:00 2001
From: Even Rouault <even.rouault@spatialys.com>
Date: Thu, 17 Jan 2019 22:52:36 +0100
Subject: [PATCH 197/488] PDF: add support for 0.72.0 and 0.73.0 (fixes #1207,
 fixes #1208)

---
 gdal/frmts/pdf/pdfdataset.cpp   | 8 ++++++++
 gdal/frmts/pdf/pdfobject.cpp    | 5 +++++
 gdal/frmts/pdf/pdfsdk_headers.h | 4 ++++
 3 files changed, 17 insertions(+)

diff --git a/gdal/frmts/pdf/pdfdataset.cpp b/gdal/frmts/pdf/pdfdataset.cpp
index 27c9b552431d..2eff2189fad9 100644
--- a/gdal/frmts/pdf/pdfdataset.cpp
+++ b/gdal/frmts/pdf/pdfdataset.cpp
@@ -3416,7 +3416,11 @@ void PDFDataset::FindLayersPoppler()
 #endif
             if( ocg != nullptr && ocg->getName() != nullptr )
             {
+#if (POPPLER_MAJOR_VERSION >= 1 || POPPLER_MINOR_VERSION >= 72)
+                const char* pszLayerName = (const char*)ocg->getName()->c_str();
+#else
                 const char* pszLayerName = (const char*)ocg->getName()->getCString();
+#endif
                 AddLayer(pszLayerName);
                 oLayerOCGMapPoppler[pszLayerName] = ocg;
             }
@@ -4740,7 +4744,11 @@ GDALDataset *PDFDataset::Open( GDALOpenInfo * poOpenInfo )
     GooString* poMetadata = poCatalogPoppler->readMetadata();
     if (poMetadata)
     {
+#if (POPPLER_MAJOR_VERSION >= 1 || POPPLER_MINOR_VERSION >= 72)
+        const char* pszContent = poMetadata->c_str();
+#else
         const char* pszContent = poMetadata->getCString();
+#endif
         if (pszContent != nullptr &&
             STARTS_WITH(pszContent, "<?xpacket begin="))
         {
diff --git a/gdal/frmts/pdf/pdfobject.cpp b/gdal/frmts/pdf/pdfobject.cpp
index cc87a8ec2585..bcd093e93109 100644
--- a/gdal/frmts/pdf/pdfobject.cpp
+++ b/gdal/frmts/pdf/pdfobject.cpp
@@ -1061,8 +1061,13 @@ const CPLString& GDALPDFObjectPoppler::GetString()
 #else
         GooString* gooString = m_po->getString();
 #endif
+#if (POPPLER_MAJOR_VERSION >= 1 || POPPLER_MINOR_VERSION >= 72)
+        return (osStr = GDALPDFGetUTF8StringFromBytes(reinterpret_cast<const GByte*>(gooString->c_str()),
+                                                      static_cast<int>(gooString->getLength())));
+#else
         return (osStr = GDALPDFGetUTF8StringFromBytes(reinterpret_cast<const GByte*>(gooString->getCString()),
                                                       static_cast<int>(gooString->getLength())));
+#endif
     }
     else
         return (osStr = "");
diff --git a/gdal/frmts/pdf/pdfsdk_headers.h b/gdal/frmts/pdf/pdfsdk_headers.h
index 9150b0f41025..41e48ae91d69 100644
--- a/gdal/frmts/pdf/pdfsdk_headers.h
+++ b/gdal/frmts/pdf/pdfsdk_headers.h
@@ -50,7 +50,11 @@
 #pragma warning( disable : 4244 ) /* conversion from 'const int' to 'Guchar', possible loss of data */
 #endif
 
+#if !(POPPLER_MAJOR_VERSION >= 1 || POPPLER_MINOR_VERSION >= 73)
 #include <goo/gtypes.h>
+#else
+typedef unsigned char Guchar;
+#endif
 #include <goo/GooList.h>
 
 /* begin of poppler xpdf includes */

From f218587bf060bcdc0ae8c562f53d473630c5f4fe Mon Sep 17 00:00:00 2001
From: Erik Ravhed <er@t-kartor.se>
Date: Fri, 18 Jan 2019 20:22:55 +0100
Subject: [PATCH 198/488] Elasticsearch: Fixed index comparison bug when a
 index have atleast one mapping

---
 gdal/ogr/ogrsf_frmts/elastic/ogrelasticdatasource.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/gdal/ogr/ogrsf_frmts/elastic/ogrelasticdatasource.cpp b/gdal/ogr/ogrsf_frmts/elastic/ogrelasticdatasource.cpp
index c6e51218494a..26ceabfa49a5 100644
--- a/gdal/ogr/ogrsf_frmts/elastic/ogrelasticdatasource.cpp
+++ b/gdal/ogr/ogrsf_frmts/elastic/ogrelasticdatasource.cpp
@@ -228,7 +228,7 @@ OGRLayer* OGRElasticDataSource::GetLayerByName(const char* pszName)
         }
         for( auto& poLayer: m_apoLayers )
         {
-            if( EQUAL( poLayer->GetName(), pszName) )
+            if( EQUAL( poLayer->GetIndexName(), pszName) )
             {
                 return poLayer.get();
             }

From bbef1b9bd896f536bfb89485502c127d54f8353b Mon Sep 17 00:00:00 2001
From: Even Rouault <even.rouault@spatialys.com>
Date: Fri, 18 Jan 2019 20:56:04 +0100
Subject: [PATCH 199/488] Polyhedral surface: fix importFromWKT to properly fix
 Z/M flag

---
 autotest/ogr/ogr_geom.py          | 7 +++++++
 gdal/ogr/ogrpolyhedralsurface.cpp | 3 +++
 2 files changed, 10 insertions(+)

diff --git a/autotest/ogr/ogr_geom.py b/autotest/ogr/ogr_geom.py
index f67c93bd614d..a7aed6e01d50 100755
--- a/autotest/ogr/ogr_geom.py
+++ b/autotest/ogr/ogr_geom.py
@@ -3222,6 +3222,13 @@ def test_ogr_geom_force_polygonzm_to_linestring():
     assert wkt == 'LINESTRING ZM (0 0 10 20,0 1 30 40,1 1 50 60,0 0 10 70)'
 
 ###############################################################################
+
+
+def test_ogr_geom_create_from_wkt_polyhedrasurface():
+    g = ogr.CreateGeometryFromWkt('POLYHEDRALSURFACE (((0 0 0,0 0 1,0 1 1,0 1 0,0 0 0)))')
+    assert g.ExportToWkt() == 'POLYHEDRALSURFACE Z (((0 0 0,0 0 1,0 1 1,0 1 0,0 0 0)))'
+
+###############################################################################
 # cleanup
 
 
diff --git a/gdal/ogr/ogrpolyhedralsurface.cpp b/gdal/ogr/ogrpolyhedralsurface.cpp
index 59e6e7bc9d84..506f75338f77 100644
--- a/gdal/ogr/ogrpolyhedralsurface.cpp
+++ b/gdal/ogr/ogrpolyhedralsurface.cpp
@@ -436,6 +436,9 @@ OGRErr OGRPolyhedralSurface::importFromWkt( const char ** ppszInput )
     if( szToken[0] != ')' )
         return OGRERR_CORRUPT_DATA;
 
+    set3D(oMP.Is3D());
+    setMeasured(oMP.IsMeasured());
+
     *ppszInput = pszInput;
     return OGRERR_NONE;
 }

From 031aa1e4c8e056307acb0de16e5e113311007d41 Mon Sep 17 00:00:00 2001
From: Even Rouault <even.rouault@spatialys.com>
Date: Tue, 22 Jan 2019 15:18:13 +0100
Subject: [PATCH 200/488] Unix build: fix build --without-lerc (fixes #1224)

---
 gdal/GNUmakefile           |  5 ++++-
 gdal/frmts/mrf/GNUmakefile | 10 ++++++----
 2 files changed, 10 insertions(+), 5 deletions(-)

diff --git a/gdal/GNUmakefile b/gdal/GNUmakefile
index 8a4f43eb395b..d994d9cd23c5 100644
--- a/gdal/GNUmakefile
+++ b/gdal/GNUmakefile
@@ -4,7 +4,6 @@ GDAL_OBJ	=	$(GDAL_ROOT)/frmts/o/*.o \
 			$(GDAL_ROOT)/gcore/*.o \
 			$(GDAL_ROOT)/port/*.o \
 			$(GDAL_ROOT)/alg/*.o \
-			$(GDAL_ROOT)/third_party/o/*.o \
 			$(GDAL_ROOT)/apps/commonutils.o \
 			$(GDAL_ROOT)/apps/gdalinfo_lib.o \
 			$(GDAL_ROOT)/apps/gdal_translate_lib.o \
@@ -22,6 +21,10 @@ ifeq ($(GNM_ENABLED),yes)
    GDAL_OBJ += $(GDAL_ROOT)/gnm/*.o $(GDAL_ROOT)/gnm/gnm_frmts/o/*.o
 endif
 
+ifeq ($(HAVE_LERC),yes)
+   GDAL_OBJ += $(GDAL_ROOT)/third_party/o/*.o
+endif
+
 include ./ogr/file.lst
 GDAL_OBJ += $(addprefix ./ogr/,$(OBJ))
 
diff --git a/gdal/frmts/mrf/GNUmakefile b/gdal/frmts/mrf/GNUmakefile
index cbe28c8fb884..2ffb566001c4 100644
--- a/gdal/frmts/mrf/GNUmakefile
+++ b/gdal/frmts/mrf/GNUmakefile
@@ -44,7 +44,7 @@ ifneq ("$(wildcard libLERC)","")
 LIBLERC	= libLERC
 OBJ	:=	$(OBJ) LERC_band.o
 XTRA_OPT	:=	$(XTRA_OPT) -DLERC -I$(LIBLERC) -I../../third_party/LercLib
-SUBLIBS := libLERC
+SUBLIBS := lib-libLERC
 endif
 endif
 
@@ -54,10 +54,12 @@ default:	$(OBJ:.o=.$(OBJ_EXT)) $(SUBLIBS)
 
 clean:
 	rm -rf *.o *.lo .libs/$(OBJ) .libs $(O_OBJ) $(LO_O_OBJ) gdal_mrf.so.1
-	cd $(LIBLERC); $(MAKE) clean
+	(cd libLERC; $(MAKE) clean)
 
-install-obj:	$(O_OBJ:.o=.$(OBJ_EXT))
-	cd $(LIBLERC); $(MAKE) install-obj
+install-obj:	$(SUBLIBS) $(O_OBJ:.o=.$(OBJ_EXT))
+
+lib-libLERC:
+	(cd libLERC; $(MAKE) install-obj)
 
 $(OBJ) $(O_OBJ):    $(DEPENDS)
 

From 1d503c178c1fe65af90e82b5f597976c79dd76a0 Mon Sep 17 00:00:00 2001
From: Even Rouault <even.rouault@spatialys.com>
Date: Fri, 25 Jan 2019 12:25:16 +0100
Subject: [PATCH 201/488] gdal2tiles: fix breakage of openlayers.html getURL()
 javascript function, introduced in GDAL 2.3.3 / 2.4.0 (fixes #1127)

---
 gdal/swig/python/scripts/gdal2tiles.py | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/gdal/swig/python/scripts/gdal2tiles.py b/gdal/swig/python/scripts/gdal2tiles.py
index d496dad69ebc..35c9dcefcaad 100755
--- a/gdal/swig/python/scripts/gdal2tiles.py
+++ b/gdal/swig/python/scripts/gdal2tiles.py
@@ -2638,8 +2638,8 @@ def generate_openlayers(self):
               function getURL(bounds) {
                   bounds = this.adjustBounds(bounds);
                   var res = this.getServerResolution();
-                  var x = Math.round((bounds.left - this.tileOrigin.lon) / (res * this.tile_size.w));
-                  var y = Math.round((bounds.bottom - this.tileOrigin.lat) / (res * this.tile_size.h));
+                  var x = Math.round((bounds.left - this.tileOrigin.lon) / (res * this.tileSize.w));
+                  var y = Math.round((bounds.bottom - this.tileOrigin.lat) / (res * this.tileSize.h));
                   var z = this.getServerZoom();
                   if (this.map.baseLayer.CLASS_NAME === 'OpenLayers.Layer.Bing') {
                       z+=1;
@@ -2662,8 +2662,8 @@ def generate_openlayers(self):
               function getURL(bounds) {
                   bounds = this.adjustBounds(bounds);
                   var res = this.getServerResolution();
-                  var x = Math.round((bounds.left - this.tileOrigin.lon) / (res * this.tile_size.w));
-                  var y = Math.round((bounds.bottom - this.tileOrigin.lat) / (res * this.tile_size.h));
+                  var x = Math.round((bounds.left - this.tileOrigin.lon) / (res * this.tileSize.w));
+                  var y = Math.round((bounds.bottom - this.tileOrigin.lat) / (res * this.tileSize.h));
                   var z = this.getServerZoom()%(tmsoffset)s;
                   var path = this.serviceVersion + "/" + this.layername + "/" + z + "/" + x + "/" + y + "." + this.type;
                   var url = this.url;
@@ -2683,8 +2683,8 @@ def generate_openlayers(self):
               function getURL(bounds) {
                   bounds = this.adjustBounds(bounds);
                   var res = this.getServerResolution();
-                  var x = Math.round((bounds.left - this.tileOrigin.lon) / (res * this.tile_size.w));
-                  var y = Math.round((bounds.bottom - this.tileOrigin.lat) / (res * this.tile_size.h));
+                  var x = Math.round((bounds.left - this.tileOrigin.lon) / (res * this.tileSize.w));
+                  var y = Math.round((bounds.bottom - this.tileOrigin.lat) / (res * this.tileSize.h));
                   var z = this.getServerZoom();
                   var path = this.serviceVersion + "/" + this.layername + "/" + z + "/" + x + "/" + y + "." + this.type;
                   var url = this.url;

From 3b5bd515abca229100a0e77abc98c99f3f52338a Mon Sep 17 00:00:00 2001
From: Even Rouault <even.rouault@spatialys.com>
Date: Fri, 25 Jan 2019 21:00:14 +0100
Subject: [PATCH 202/488] ci: avoid error on ubuntu_1804

---
 autotest/gdrivers/postgisraster.py | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/autotest/gdrivers/postgisraster.py b/autotest/gdrivers/postgisraster.py
index bf3960f3c33f..1634332ae2e3 100755
--- a/autotest/gdrivers/postgisraster.py
+++ b/autotest/gdrivers/postgisraster.py
@@ -553,6 +553,13 @@ def test_postgisraster_test_outdb_client_side_if_possible():
 
     if gdaltest.postgisrasterDriver is None:
         pytest.skip()
+
+    # For some reason fails with
+    # ERROR 1: PostGISRasterRasterBand::IRasterIO(): ERROR:  rt_band_load_offline_data: Cannot open offline raster: /home/travis/build/rouault/gdal/autotest/gdrivers/data/small_world.tif
+    # See https://api.travis-ci.org/v3/job/484385907/log.txt
+    if gdaltest.is_travis_branch('ubuntu_1804'):
+        pytest.skip()
+
     ds = gdal.Open(gdaltest.postgisraster_connection_string + "table='small_world_outdb_constraint' mode=2 outdb_resolution=client_side_if_possible")
     cs = [ds.GetRasterBand(i + 1).Checksum() for i in range(3)]
     assert cs == [30111, 32302, 40026]

From 49cda0e8ba7afd3bf31383fb76367bc113dbc31d Mon Sep 17 00:00:00 2001
From: Tamas Szekeres <szekerest@gmail.com>
Date: Sun, 27 Jan 2019 17:28:30 +0100
Subject: [PATCH 203/488] MSSQLSpatial: Add option to expose the FID column as
 a feature attribute (#1227)

---
 .../mssqlspatial/drv_mssqlspatial.html        | 31 ++++++++++---------
 .../mssqlspatial/ogrmssqlspatiallayer.cpp     | 14 +++++++--
 2 files changed, 28 insertions(+), 17 deletions(-)

diff --git a/gdal/ogr/ogrsf_frmts/mssqlspatial/drv_mssqlspatial.html b/gdal/ogr/ogrsf_frmts/mssqlspatial/drv_mssqlspatial.html
index 71c62b41e840..881ec43922a8 100644
--- a/gdal/ogr/ogrsf_frmts/mssqlspatial/drv_mssqlspatial.html
+++ b/gdal/ogr/ogrsf_frmts/mssqlspatial/drv_mssqlspatial.html
@@ -122,20 +122,23 @@ <h2>Configuration options</h2>
 <a href="http://trac.osgeo.org/gdal/wiki/ConfigOptions">Configuration
 Options</a> which help control the behavior of this driver.</p>
 
-<ul>
-<li><b>MSSQLSPATIAL_USE_BCP</b>: (From GDAL 2.1.0) Enable bulk insert when adding features. This option requires to
-    to compile GDAL against a bulk copy enabled ODBC driver like SQL Server Native
-    Client 11.0. To specify a BCP supported driver in the connection string, use the
-    driver parameter, like DRIVER={SQL Server Native Client 11.0}. If GDAL is
-    compiled against SQL Server Native Client 10.0 or 11.0 the driver is selected
-    automatically not requiring to specify that in the connection string. If GDAL is
-    compiled against SQL Server Native Client 10.0 or 11.0 the default setting of
-    this parameter is TRUE, otherwise the parameter is ignored by the driver.</li>
-<li><b>MSSQLSPATIAL_BCP_SIZE</b>: (From GDAL 2.1.0) Specifies the bulk insert batch size. The larger value makes the insert faster, but consumes more memory. Default = 1000.</li>
-<li><b>MSSQLSPATIAL_OGR_FID</b>: Override FID column name. Default = ogr_fid.</li>
-<li><b>MSSQLSPATIAL_ALWAYS_OUTPUT_FID</b>: Always return the OGR_FID column - even if it is not a true IDENTITY column - when creating features. Default = "NO".</li>
-<li><b>MSSQLSPATIAL_USE_GEOMETRY_COLUMNS</b>: Use/create geometry_columns metadata table in the database. Default = "YES".</li>
-<li><b>MSSQLSPATIAL_LIST_ALL_TABLES</b>: Use mssql catalog to list available layers. Default = "NO".</li>
+<ul>
+    <li>
+        <b>MSSQLSPATIAL_USE_BCP</b>: (From GDAL 2.1.0) Enable bulk insert when adding features. This option requires to
+        to compile GDAL against a bulk copy enabled ODBC driver like SQL Server Native
+        Client 11.0. To specify a BCP supported driver in the connection string, use the
+        driver parameter, like DRIVER={SQL Server Native Client 11.0}. If GDAL is
+        compiled against SQL Server Native Client 10.0 or 11.0 the driver is selected
+        automatically not requiring to specify that in the connection string. If GDAL is
+        compiled against SQL Server Native Client 10.0 or 11.0 the default setting of
+        this parameter is TRUE, otherwise the parameter is ignored by the driver.
+    </li>
+    <li><b>MSSQLSPATIAL_BCP_SIZE</b>: (From GDAL 2.1.0) Specifies the bulk insert batch size. The larger value makes the insert faster, but consumes more memory. Default = 1000.</li>
+    <li><b>MSSQLSPATIAL_OGR_FID</b>: Override FID column name. Default = ogr_fid.</li>
+    <li><b>MSSQLSPATIAL_ALWAYS_OUTPUT_FID</b>: Always retrieve the FID value of the recently created feature (even if it is not a true IDENTITY column). Default = "NO".</li>
+    <li><b>MSSQLSPATIAL_SHOW_FID_COLUMN</b>: Force to display the FID colums as a feature attribute. Default = "NO".</li>
+    <li><b>MSSQLSPATIAL_USE_GEOMETRY_COLUMNS</b>: Use/create geometry_columns metadata table in the database. Default = "YES".</li>
+    <li><b>MSSQLSPATIAL_LIST_ALL_TABLES</b>: Use mssql catalog to list available layers. Default = "NO".</li>
 </ul>
 
 <h2>Transaction support (GDAL &gt;= 2.0)</h2>
diff --git a/gdal/ogr/ogrsf_frmts/mssqlspatial/ogrmssqlspatiallayer.cpp b/gdal/ogr/ogrsf_frmts/mssqlspatial/ogrmssqlspatiallayer.cpp
index 4119e23004a6..ca64737ad75c 100644
--- a/gdal/ogr/ogrsf_frmts/mssqlspatial/ogrmssqlspatiallayer.cpp
+++ b/gdal/ogr/ogrsf_frmts/mssqlspatial/ogrmssqlspatiallayer.cpp
@@ -83,6 +83,8 @@ CPLErr OGRMSSQLSpatialLayer::BuildFeatureDefn( const char *pszLayerName,
                                     CPLODBCStatement *poStmtIn )
 
 {
+    bool bShowFidColumn = CPLTestBool(CPLGetConfigOption("MSSQLSPATIAL_SHOW_FID_COLUMN", "NO"));
+
     poFeatureDefn = new OGRFeatureDefn( pszLayerName );
     nRawColumns = poStmtIn->GetColCount();
 
@@ -170,7 +172,9 @@ CPLErr OGRMSSQLSpatialLayer::BuildFeatureDefn( const char *pszLayerName,
                         bIsIdentityFid = TRUE;
 
                     nFIDColumnIndex = iCol;
-                    continue;
+
+                    if (!bShowFidColumn)
+                        continue;
                 }
             }
         }
@@ -181,7 +185,9 @@ CPLErr OGRMSSQLSpatialLayer::BuildFeatureDefn( const char *pszLayerName,
                 pszFIDColumn = CPLStrdup( poStmtIn->GetColName(iCol) );
                 bIsIdentityFid = TRUE;
                 nFIDColumnIndex = iCol;
-                continue;
+
+                if (!bShowFidColumn)
+                    continue;
             }
             else if (EQUAL(poStmtIn->GetColTypeName( iCol ), "bigint identity"))
             {
@@ -189,7 +195,9 @@ CPLErr OGRMSSQLSpatialLayer::BuildFeatureDefn( const char *pszLayerName,
                 bIsIdentityFid = TRUE;
                 SetMetadataItem(OLMD_FID64, "YES");
                 nFIDColumnIndex = iCol;
-                continue;
+
+                if (!bShowFidColumn)
+                    continue;
             }
         }
 

From d460edc3c67d9aa0ae276a261641fc6fdc11dbad Mon Sep 17 00:00:00 2001
From: Even Rouault <even.rouault@spatialys.com>
Date: Mon, 28 Jan 2019 00:25:22 +0100
Subject: [PATCH 204/488] PDSv3: fix decoding of band interleaved images (such
 as for CRISM HSP) (fixes #1239)

---
 autotest/gdrivers/pds.py      | 2 +-
 gdal/frmts/pds/pdsdataset.cpp | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/autotest/gdrivers/pds.py b/autotest/gdrivers/pds.py
index 64f25d3f02ee..01fed06600f0 100755
--- a/autotest/gdrivers/pds.py
+++ b/autotest/gdrivers/pds.py
@@ -311,7 +311,7 @@ def test_pds_line_offset_not_multiple_of_record():
 
 def test_pds_band_storage_type_line_interleaved():
 
-    tst = gdaltest.GDALTest('PDS', 'pds/hsp00017ba0_01_ra218s_trr3_truncated.lbl', 1, 364)
+    tst = gdaltest.GDALTest('PDS', 'pds/hsp00017ba0_01_ra218s_trr3_truncated.lbl', 1, 64740)
     return tst.testOpen()
 
 
diff --git a/gdal/frmts/pds/pdsdataset.cpp b/gdal/frmts/pds/pdsdataset.cpp
index 93c11a3512b2..087c79ada219 100644
--- a/gdal/frmts/pds/pdsdataset.cpp
+++ b/gdal/frmts/pds/pdsdataset.cpp
@@ -1068,7 +1068,7 @@ int PDSDataset::ParseImage( CPLString osPrefix, CPLString osFilenamePrefix )
         {
             nPixelOffset = nItemSize;
             nBandOffset = (CPLSM(nItemSize) * CPLSM(nCols)).v();
-            nLineOffset = (CPLSM(nLineOffset) + CPLSM(nBandOffset) * CPLSM(nCols)).v();
+            nLineOffset = (CPLSM(nLineOffset) + CPLSM(nBandOffset) * CPLSM(l_nBands)).v();
         }
     }
     catch( const CPLSafeIntOverflow& )

From 46af699d9c50fc6bb717ea543c519652117c57c7 Mon Sep 17 00:00:00 2001
From: Even Rouault <even.rouault@spatialys.com>
Date: Mon, 28 Jan 2019 14:09:10 +0100
Subject: [PATCH 205/488] Travis: fix build of librasterlite2

---
 gdal/ci/travis/ubuntu_1604/install.sh | 2 +-
 gdal/ci/travis/ubuntu_1804/install.sh | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/gdal/ci/travis/ubuntu_1604/install.sh b/gdal/ci/travis/ubuntu_1604/install.sh
index 2e1941e2e3ad..7857c0372f3b 100755
--- a/gdal/ci/travis/ubuntu_1604/install.sh
+++ b/gdal/ci/travis/ubuntu_1604/install.sh
@@ -11,7 +11,7 @@ chroot "$chroot" ccache -s
 chroot "$chroot" sh -c "cd $PWD && fossil clone https://www.gaia-gis.it/fossil/libspatialite libspatialite.fossil && mkdir sl && cd sl && fossil open ../libspatialite.fossil && CCACHE_CPP2=yes CC='ccache $PWD/clang+llvm-3.9.0-x86_64-linux-gnu-ubuntu-16.04/bin/clang' CXX='ccache $PWD/clang+llvm-3.9.0-x86_64-linux-gnu-ubuntu-16.04/bin/clang' ./configure --prefix=/usr --disable-geos370 && CCACHE_CPP2=yes make -j3"
 sudo chroot "$chroot" sh -c "cd $PWD && cd sl && make -j3 install"
 
-chroot "$chroot" sh -c "cd $PWD && fossil clone https://www.gaia-gis.it/fossil/librasterlite2 librasterlite2.fossil && mkdir rl2 && cd rl2 && fossil open ../librasterlite2.fossil && CCACHE_CPP2=yes CC='ccache $PWD/clang+llvm-3.9.0-x86_64-linux-gnu-ubuntu-16.04/bin/clang' CXX='ccache $PWD/clang+llvm-3.9.0-x86_64-linux-gnu-ubuntu-16.04/bin/clang' ./configure --prefix=/usr && CCACHE_CPP2=yes make -j3"
+chroot "$chroot" sh -c "cd $PWD && fossil clone https://www.gaia-gis.it/fossil/librasterlite2 librasterlite2.fossil && mkdir rl2 && cd rl2 && fossil open ../librasterlite2.fossil && CCACHE_CPP2=yes CC='ccache $PWD/clang+llvm-3.9.0-x86_64-linux-gnu-ubuntu-16.04/bin/clang' CXX='ccache $PWD/clang+llvm-3.9.0-x86_64-linux-gnu-ubuntu-16.04/bin/clang' ./configure --prefix=/usr --disable-lz4 --disable-zstd && CCACHE_CPP2=yes make -j3"
 sudo chroot "$chroot" sh -c "cd $PWD && cd rl2 && make -j3 install"
 
 chroot "$chroot" sh -c "cd $PWD/gdal && CCACHE_CPP2=yes CC='ccache $PWD/clang+llvm-3.9.0-x86_64-linux-gnu-ubuntu-16.04/bin/clang' CXX='ccache $PWD/clang+llvm-3.9.0-x86_64-linux-gnu-ubuntu-16.04/bin/clang' LDFLAGS='-lstdc++' ./configure --prefix=/usr --without-libtool --enable-debug --with-jpeg12 --with-python --with-poppler --with-podofo --with-spatialite --with-mysql --with-liblzma --with-webp --with-epsilon --with-static-proj4 --with-poppler --with-podofo --with-hdf5 --with-dods-root=/usr --with-sosi --with-mysql --with-rasterlite2 --with-fgdb=$PWD/FileGDB_API-64gcc51"
diff --git a/gdal/ci/travis/ubuntu_1804/install.sh b/gdal/ci/travis/ubuntu_1804/install.sh
index 740092659911..ae4b17952bdc 100755
--- a/gdal/ci/travis/ubuntu_1804/install.sh
+++ b/gdal/ci/travis/ubuntu_1804/install.sh
@@ -11,7 +11,7 @@ chroot "$chroot" ccache -s
 chroot "$chroot" sh -c "cd $PWD && fossil clone https://www.gaia-gis.it/fossil/libspatialite libspatialite.fossil && mkdir sl && cd sl && fossil open ../libspatialite.fossil && CCACHE_CPP2=yes CC='ccache gcc' CXX='ccache g++' ./configure --prefix=/usr --disable-geos370 && CCACHE_CPP2=yes make -j3"
 sudo chroot "$chroot" sh -c "cd $PWD && cd sl && make -j3 install"
 
-chroot "$chroot" sh -c "cd $PWD && fossil clone https://www.gaia-gis.it/fossil/librasterlite2 librasterlite2.fossil && mkdir rl2 && cd rl2 && fossil open ../librasterlite2.fossil && CCACHE_CPP2=yes CC='ccache gcc' CXX='ccache g++' ./configure --prefix=/usr && CCACHE_CPP2=yes make -j3"
+chroot "$chroot" sh -c "cd $PWD && fossil clone https://www.gaia-gis.it/fossil/librasterlite2 librasterlite2.fossil && mkdir rl2 && cd rl2 && fossil open ../librasterlite2.fossil && CCACHE_CPP2=yes CC='ccache gcc' CXX='ccache g++' ./configure --prefix=/usr --disable-lz4 --disable-zstd && CCACHE_CPP2=yes make -j3"
 sudo chroot "$chroot" sh -c "cd $PWD && cd rl2 && make -j3 install"
 
 chroot "$chroot" sh -c "cd $PWD/gdal && CCACHE_CPP2=yes CC='ccache gcc' CXX='ccache g++' LDFLAGS='-lstdc++' ./configure --prefix=/usr --without-libtool --with-jpeg12 --with-python --with-poppler --with-spatialite --with-mysql --with-liblzma --with-webp --with-epsilon --with-static-proj4 --with-poppler --with-hdf5 --with-dods-root=/usr --with-sosi --with-mysql --with-rasterlite2 --with-fgdb=$PWD/FileGDB_API-64gcc51"

From b412b0e3622980e6cb2fcd0fabcf96d4269d5d73 Mon Sep 17 00:00:00 2001
From: Even Rouault <even.rouault@spatialys.com>
Date: Mon, 28 Jan 2019 17:51:19 +0100
Subject: [PATCH 206/488] autotest: disable test_rl2_3 for now (refs #1241)

---
 autotest/gdrivers/rl2.py | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/autotest/gdrivers/rl2.py b/autotest/gdrivers/rl2.py
index d78f3a01232c..251d2ca9c1aa 100755
--- a/autotest/gdrivers/rl2.py
+++ b/autotest/gdrivers/rl2.py
@@ -103,6 +103,9 @@ def test_rl2_3():
     if gdaltest.rl2_drv is None:
         pytest.skip()
 
+    # FIXME See https://github.com/OSGeo/gdal/issues/1241
+    pytest.skip()
+
     ds = gdal.Open('data/small_world.rl2')
 
     assert ds.GetRasterBand(1).GetColorInterpretation() == gdal.GCI_RedBand

From 0a3d241f96e83b86073efc86b51376c7cd5f6e4f Mon Sep 17 00:00:00 2001
From: Even Rouault <even.rouault@spatialys.com>
Date: Wed, 30 Jan 2019 09:16:45 +0100
Subject: [PATCH 207/488] GTiff: only report scale/offset deduced from
 ModelTiepointTag and ModelPixelScaleTag if the SRS has a vertical component
 (and thus currently if GTIFF_REPORT_COMPD_CS is set) (fixes
 https://issues.qgis.org/issues/20493)

---
 ...non_zero_but_ModelPixelScaleTag_z_zero.tif | Bin 0 -> 288 bytes
 autotest/gcore/tiff_read.py                   |   8 +-
 autotest/gcore/tiff_write.py                  |  87 +++++++++---------
 gdal/frmts/gtiff/geotiff.cpp                  |  36 +++++---
 4 files changed, 74 insertions(+), 57 deletions(-)
 create mode 100644 autotest/gcore/data/ModelTiepointTag_z_non_zero_but_ModelPixelScaleTag_z_zero.tif

diff --git a/autotest/gcore/data/ModelTiepointTag_z_non_zero_but_ModelPixelScaleTag_z_zero.tif b/autotest/gcore/data/ModelTiepointTag_z_non_zero_but_ModelPixelScaleTag_z_zero.tif
new file mode 100644
index 0000000000000000000000000000000000000000..617b3bd32604f695424b52a28d4b9fb0ba6d1cd5
GIT binary patch
literal 288
zcmebD)MDUbU|`5*;A3E5WM*IlvcVXM%>-q00OgpG#MzM8f{ZL+eIPZWNaA8hY;mX>
zkohu5;=xF4zGfZ<W}y5FAZ}{mVPFH&JAin7J2Qg-kOo@<qHzFw)3{&Xnv@;6t}mYO
qJUqs+T4bI3L!k@@sB&}~XdK8jK!3A<jAmqD;Q`T_%FIB^Kr{f4S`z^P

literal 0
HcmV?d00001

diff --git a/autotest/gcore/tiff_read.py b/autotest/gcore/tiff_read.py
index a237b10a5afd..44c74499977c 100755
--- a/autotest/gcore/tiff_read.py
+++ b/autotest/gcore/tiff_read.py
@@ -3119,7 +3119,11 @@ def test_tiff_read_overview_of_external_mask():
     assert flags1 == gdal.GMF_PER_DATASET
 
 ###############################################################################
+# Test reading GeoTIFF file ModelTiepointTag(z) != 0 and ModelPixelScaleTag(z) = 0
+# Test https://issues.qgis.org/issues/20493
 
+def test_tiff_read_ModelTiepointTag_z_non_zero_but_ModelPixelScaleTag_z_zero():
 
-
-
+    ds = gdal.Open('data/ModelTiepointTag_z_non_zero_but_ModelPixelScaleTag_z_zero.tif')
+    assert ds.GetRasterBand(1).GetScale() == 1
+    assert ds.GetRasterBand(1).GetOffset() == 0
diff --git a/autotest/gcore/tiff_write.py b/autotest/gcore/tiff_write.py
index f6b96e89efbd..769b862357b0 100755
--- a/autotest/gcore/tiff_write.py
+++ b/autotest/gcore/tiff_write.py
@@ -3557,33 +3557,31 @@ def test_tiff_write_97():
 
 def test_tiff_write_98():
 
-    gdal.SetConfigOption('GTIFF_POINT_GEO_IGNORE', 'FALSE')
-
-    src_ds = gdal.Open('data/geomatrix.tif')
+    with gdaltest.config_option('GTIFF_POINT_GEO_IGNORE', 'FALSE'):
+        src_ds = gdal.Open('data/geomatrix.tif')
 
-    gdal.SetConfigOption('GTIFF_POINT_GEO_IGNORE', 'TRUE')
+    with gdaltest.config_option('GTIFF_POINT_GEO_IGNORE', 'TRUE'):
+        new_ds = gdaltest.tiff_drv.CreateCopy('tmp/test_98.tif', src_ds)
 
-    new_ds = gdaltest.tiff_drv.CreateCopy('tmp/test_98.tif', src_ds)
-
-    gt = new_ds.GetGeoTransform()
-    md = new_ds.GetMetadataItem('AREA_OR_POINT')
-    new_ds = None
-    src_ds = None
+        gt = new_ds.GetGeoTransform()
+        md = new_ds.GetMetadataItem('AREA_OR_POINT')
+        new_ds = None
+        src_ds = None
 
-    gt_expected = (1841001.75, 1.5, -5.0, 1144003.25, -5.0, -1.5)
+        gt_expected = (1841001.75, 1.5, -5.0, 1144003.25, -5.0, -1.5)
 
     assert gt == gt_expected, 'did not get expected geotransform'
 
     assert md == 'Point', 'did not get expected AREA_OR_POINT value'
 
-    gdal.SetConfigOption('GTIFF_POINT_GEO_IGNORE', 'FALSE')
+    with gdaltest.config_option('GTIFF_POINT_GEO_IGNORE', 'FALSE'):
 
-    new_ds = gdal.Open('tmp/test_98.tif')
+        new_ds = gdal.Open('tmp/test_98.tif')
 
-    gt = new_ds.GetGeoTransform()
-    md = new_ds.GetMetadataItem('AREA_OR_POINT')
-    new_ds = None
-    src_ds = None
+        gt = new_ds.GetGeoTransform()
+        md = new_ds.GetMetadataItem('AREA_OR_POINT')
+        new_ds = None
+        src_ds = None
 
     gt_expected = (1841003.5, 1.5, -5.0, 1144006.5, -5.0, -1.5)
 
@@ -3727,14 +3725,14 @@ def test_tiff_write_102():
     ds.SetProjection(wkt)
     ds = None
 
-    gdal.SetConfigOption('GTIFF_REPORT_COMPD_CS', 'YES')
-    ds = gdal.Open('/vsimem/tiff_write_102.tif')
-    wkt1 = ds.GetProjectionRef()
+    with gdaltest.config_option('GTIFF_REPORT_COMPD_CS', 'YES'):
+        ds = gdal.Open('/vsimem/tiff_write_102.tif')
+        wkt1 = ds.GetProjectionRef()
     ds = None
 
-    gdal.SetConfigOption('GTIFF_REPORT_COMPD_CS', 'NO')
-    ds = gdal.Open('/vsimem/tiff_write_102.tif')
-    wkt2 = ds.GetProjectionRef()
+    with gdaltest.config_option('GTIFF_REPORT_COMPD_CS', 'NO'):
+        ds = gdal.Open('/vsimem/tiff_write_102.tif')
+        wkt2 = ds.GetProjectionRef()
     ds = None
 
     gdaltest.tiff_drv.Delete('/vsimem/tiff_write_102.tif')
@@ -6362,20 +6360,21 @@ def test_tiff_write_165():
 
 def test_tiff_write_166():
 
-    ds = gdal.Open('data/tiff_vertcs_scale_offset.tif')
-    assert ds.GetRasterBand(1).GetScale() == 2.0
-
-    assert ds.GetRasterBand(1).GetOffset() == 10.0
+    with gdaltest.config_option('GTIFF_REPORT_COMPD_CS', 'YES'):
+        ds = gdal.Open('data/tiff_vertcs_scale_offset.tif')
+        assert ds.GetRasterBand(1).GetScale() == 2.0
+        assert ds.GetRasterBand(1).GetOffset() == 10.0
 
     # Scale + offset through CreateCopy()
     gdal.Translate('/vsimem/tiff_write_166.tif', 'data/byte.tif',
                    options='-a_srs EPSG:26711+5773 -a_scale 2.0 -a_offset 10 -co PROFILE=GEOTIFF')
     assert gdal.VSIStatL('/vsimem/tiff_write_166.tif.aux.xml') is None
 
-    ds = gdal.Open('/vsimem/tiff_write_166.tif')
-    assert ds.GetRasterBand(1).GetScale() == 2.0
+    with gdaltest.config_option('GTIFF_REPORT_COMPD_CS', 'YES'):
+        ds = gdal.Open('/vsimem/tiff_write_166.tif')
+        assert ds.GetRasterBand(1).GetScale() == 2.0
+        assert ds.GetRasterBand(1).GetOffset() == 10.0
 
-    assert ds.GetRasterBand(1).GetOffset() == 10.0
     ds = None
     gdal.Unlink('/vsimem/tiff_write_166.tif')
 
@@ -6384,10 +6383,11 @@ def test_tiff_write_166():
                    options='-a_srs EPSG:26711+5773 -a_offset 10 -co PROFILE=GEOTIFF')
     assert gdal.VSIStatL('/vsimem/tiff_write_166.tif.aux.xml') is None
 
-    ds = gdal.Open('/vsimem/tiff_write_166.tif')
-    assert ds.GetRasterBand(1).GetScale() == 1.0
+    with gdaltest.config_option('GTIFF_REPORT_COMPD_CS', 'YES'):
+        ds = gdal.Open('/vsimem/tiff_write_166.tif')
+        assert ds.GetRasterBand(1).GetScale() == 1.0
+        assert ds.GetRasterBand(1).GetOffset() == 10.0
 
-    assert ds.GetRasterBand(1).GetOffset() == 10.0
     ds = None
     gdal.Unlink('/vsimem/tiff_write_166.tif')
 
@@ -6402,9 +6402,10 @@ def test_tiff_write_166():
     ds = None
     assert gdal.VSIStatL('/vsimem/tiff_write_166.tif.aux.xml') is None
 
-    ds = gdal.Open('/vsimem/tiff_write_166.tif')
-    assert ds.GetRasterBand(1).GetScale() == 2.0
-    assert ds.GetRasterBand(1).GetOffset() == 10.0
+    with gdaltest.config_option('GTIFF_REPORT_COMPD_CS', 'YES'):
+        ds = gdal.Open('/vsimem/tiff_write_166.tif')
+        assert ds.GetRasterBand(1).GetScale() == 2.0
+        assert ds.GetRasterBand(1).GetOffset() == 10.0
     ds = None
     gdal.Unlink('/vsimem/tiff_write_166.tif')
 
@@ -6418,9 +6419,10 @@ def test_tiff_write_166():
     ds = None
     assert gdal.VSIStatL('/vsimem/tiff_write_166.tif.aux.xml') is None
 
-    ds = gdal.Open('/vsimem/tiff_write_166.tif')
-    assert ds.GetRasterBand(1).GetScale() == 2.0
-    assert ds.GetRasterBand(1).GetOffset() == 0.0
+    with gdaltest.config_option('GTIFF_REPORT_COMPD_CS', 'YES'):
+        ds = gdal.Open('/vsimem/tiff_write_166.tif')
+        assert ds.GetRasterBand(1).GetScale() == 2.0
+        assert ds.GetRasterBand(1).GetOffset() == 0.0
     ds = None
     gdal.Unlink('/vsimem/tiff_write_166.tif')
 
@@ -6434,9 +6436,10 @@ def test_tiff_write_166():
     ds = None
     assert gdal.VSIStatL('/vsimem/tiff_write_166.tif.aux.xml') is None
 
-    ds = gdal.Open('/vsimem/tiff_write_166.tif')
-    assert ds.GetRasterBand(1).GetScale() == 1.0
-    assert ds.GetRasterBand(1).GetOffset() == 10.0
+    with gdaltest.config_option('GTIFF_REPORT_COMPD_CS', 'YES'):
+        ds = gdal.Open('/vsimem/tiff_write_166.tif')
+        assert ds.GetRasterBand(1).GetScale() == 1.0
+        assert ds.GetRasterBand(1).GetOffset() == 10.0
     ds = None
     gdal.Unlink('/vsimem/tiff_write_166.tif')
 
diff --git a/gdal/frmts/gtiff/geotiff.cpp b/gdal/frmts/gtiff/geotiff.cpp
index 50bff7d34e9d..932c33f7c15e 100644
--- a/gdal/frmts/gtiff/geotiff.cpp
+++ b/gdal/frmts/gtiff/geotiff.cpp
@@ -14615,19 +14615,23 @@ void GTiffDataset::LoadGeoreferencingAndPamIfNeeded()
                              padfTiePoints[2] != 0.0 ||
                              padfTiePoints[5] != 0.0) )
                         {
-                            /* modelTiePointTag = (pixel, line, z0, X, Y, Z0) */
-                            /* thus Z(some_point) = (z(some_point) - z0) * scaleZ + Z0 */
-                            /* equivalently written as */
-                            /* Z(some_point) = z(some_point) * scaleZ + offsetZ with */
-                            /* offsetZ = - z0 * scaleZ + Z0 */
-                            double dfScale = padfScale[2];
-                            double dfOffset =
-                                -padfTiePoints[2] * dfScale + padfTiePoints[5];
-                            GTiffRasterBand* poBand =
-                                cpl::down_cast<GTiffRasterBand*>(GetRasterBand(1));
-                            poBand->bHaveOffsetScale = true;
-                            poBand->dfScale = dfScale;
-                            poBand->dfOffset = dfOffset;
+                            LookForProjection();
+                            if( pszProjection && HasVerticalCS(pszProjection) )
+                            {
+                                /* modelTiePointTag = (pixel, line, z0, X, Y, Z0) */
+                                /* thus Z(some_point) = (z(some_point) - z0) * scaleZ + Z0 */
+                                /* equivalently written as */
+                                /* Z(some_point) = z(some_point) * scaleZ + offsetZ with */
+                                /* offsetZ = - z0 * scaleZ + Z0 */
+                                double dfScale = padfScale[2];
+                                double dfOffset =
+                                    -padfTiePoints[2] * dfScale + padfTiePoints[5];
+                                GTiffRasterBand* poBand =
+                                    cpl::down_cast<GTiffRasterBand*>(GetRasterBand(1));
+                                poBand->bHaveOffsetScale = true;
+                                poBand->dfScale = dfScale;
+                                poBand->dfOffset = dfOffset;
+                            }
                         }
                     }
                 }
@@ -17459,7 +17463,13 @@ GTiffDataset::CreateCopy( const char * pszFilename, GDALDataset *poSrcDS,
         }
     }
 
+    CPLString osOldGTIFF_REPORT_COMPD_CSVal(
+        CPLGetConfigOption("GTIFF_REPORT_COMPD_CS", ""));
+    CPLSetThreadLocalConfigOption("GTIFF_REPORT_COMPD_CS", "YES");
     poDS->CloneInfo( poSrcDS, nCloneInfoFlags );
+    CPLSetThreadLocalConfigOption("GTIFF_REPORT_COMPD_CS",
+        osOldGTIFF_REPORT_COMPD_CSVal.empty() ? nullptr :
+        osOldGTIFF_REPORT_COMPD_CSVal.c_str());
 
     if( !bGeoTIFF && (poDS->GetPamFlags() & GPF_DISABLED) == 0 )
     {

From 594489ae762a8eca53b0109104be0024105432d6 Mon Sep 17 00:00:00 2001
From: Even Rouault <even.rouault@spatialys.com>
Date: Wed, 30 Jan 2019 17:06:59 +0100
Subject: [PATCH 208/488] Fix double-free in StripIrrelevantOptions()
 (triggered by gdalinfo / ogrinfo --format)

---
 gdal/gcore/gdal_misc.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/gdal/gcore/gdal_misc.cpp b/gdal/gcore/gdal_misc.cpp
index 602bf350bb75..735e083240d8 100644
--- a/gdal/gcore/gdal_misc.cpp
+++ b/gdal/gcore/gdal_misc.cpp
@@ -2787,7 +2787,7 @@ static void StripIrrelevantOptions(CPLXMLNode* psCOL, int nOptions)
                 if( psPrev )
                     psPrev->psNext = psNext;
                 else if( psCOL->psChild == psIter )
-                    psCOL->psChild->psNext = psNext;
+                    psCOL->psChild = psNext;
                 psIter->psNext = nullptr;
                 CPLDestroyXMLNode(psIter);
                 psIter = psNext;

From 310ed3c00b15c117003a96affd0290aa04d185cb Mon Sep 17 00:00:00 2001
From: Even Rouault <even.rouault@spatialys.com>
Date: Thu, 31 Jan 2019 11:07:40 +0100
Subject: [PATCH 209/488] MITAB: prevent potential infinite recursion on broken
 indexes. Fixes https://bugs.chromium.org/p/oss-fuzz/issues/detail?id=12739.
 Credit to OSS Fuzz

---
 gdal/ogr/ogrsf_frmts/mitab/mitab_indfile.cpp | 22 +++++++++++++++++---
 gdal/ogr/ogrsf_frmts/mitab/mitab_priv.h      |  8 +++++--
 2 files changed, 25 insertions(+), 5 deletions(-)

diff --git a/gdal/ogr/ogrsf_frmts/mitab/mitab_indfile.cpp b/gdal/ogr/ogrsf_frmts/mitab/mitab_indfile.cpp
index a82dd47b8204..52120fd0d881 100644
--- a/gdal/ogr/ogrsf_frmts/mitab/mitab_indfile.cpp
+++ b/gdal/ogr/ogrsf_frmts/mitab/mitab_indfile.cpp
@@ -1045,7 +1045,7 @@ GInt32 TABINDNode::ReadIndexEntry(int nEntryNo, GByte *pKeyValue)
  * nEntryNo is the 0-based index of the index entry that we are interested
  * in inside the current node.
  **********************************************************************/
-int   TABINDNode::IndexKeyCmp(GByte *pKeyValue, int nEntryNo)
+int   TABINDNode::IndexKeyCmp(const GByte *pKeyValue, int nEntryNo)
 {
     CPLAssert(pKeyValue);
     CPLAssert(nEntryNo >= 0 && nEntryNo < m_numEntriesInNode);
@@ -1117,7 +1117,14 @@ int TABINDNode::SetFieldType(TABFieldType eType)
  *  - 0 if the key was not found
  *  - or -1 if an error happened
  **********************************************************************/
-GInt32 TABINDNode::FindFirst(GByte *pKeyValue)
+GInt32 TABINDNode::FindFirst(const GByte *pKeyValue)
+{
+    std::set<int> oSetVisitedNodePtr;
+    return FindFirst(pKeyValue, oSetVisitedNodePtr);
+}
+
+GInt32 TABINDNode::FindFirst(const GByte *pKeyValue,
+                             std::set<int>& oSetVisitedNodePtr)
 {
     if (m_poDataBlock == nullptr)
     {
@@ -1255,6 +1262,13 @@ GInt32 TABINDNode::FindFirst(GByte *pKeyValue)
                         nRetValue = 0;
                         continue;
                     }
+                    else if( oSetVisitedNodePtr.find(nChildNodePtr) !=
+                                oSetVisitedNodePtr.end() )
+                    {
+                        CPLError(CE_Failure, CPLE_AppDefined,
+                                 "Invalid child node pointer structure");
+                        return -1;
+                    }
                     else if( (nChildNodePtr % 512) != 0 )
                     {
                         CPLError(CE_Failure, CPLE_AppDefined,
@@ -1285,7 +1299,9 @@ GInt32 TABINDNode::FindFirst(GByte *pKeyValue)
                         return -1;
                     }
 
-                    nRetValue = m_poCurChildNode->FindFirst(pKeyValue);
+                    oSetVisitedNodePtr.insert(nChildNodePtr);
+                    nRetValue = m_poCurChildNode->FindFirst(pKeyValue,
+                                                            oSetVisitedNodePtr);
                 }/*for iChild*/
 
                 return nRetValue;
diff --git a/gdal/ogr/ogrsf_frmts/mitab/mitab_priv.h b/gdal/ogr/ogrsf_frmts/mitab/mitab_priv.h
index e7cd79c04595..7eafd3391d88 100644
--- a/gdal/ogr/ogrsf_frmts/mitab/mitab_priv.h
+++ b/gdal/ogr/ogrsf_frmts/mitab/mitab_priv.h
@@ -37,6 +37,8 @@
 #include "cpl_string.h"
 #include "ogr_feature.h"
 
+#include <set>
+
 class TABFile;
 class TABFeature;
 class TABMAPToolBlock;
@@ -1536,7 +1538,7 @@ class TABINDNode
 
     int         GotoNodePtr(GInt32 nNewNodePtr);
     GInt32      ReadIndexEntry(int nEntryNo, GByte *pKeyValue);
-    int         IndexKeyCmp(GByte *pKeyValue, int nEntryNo);
+    int         IndexKeyCmp(const GByte *pKeyValue, int nEntryNo);
 
     int         InsertEntry(GByte *pKeyValue, GInt32 nRecordNo,
                             GBool bInsertAfterCurChild=FALSE,
@@ -1544,6 +1546,8 @@ class TABINDNode
     int         SetNodeBufferDirectly(int numEntries, GByte *pBuf,
                                       int nCurIndexEntry=0,
                                       TABINDNode *poCurChild=nullptr);
+    GInt32      FindFirst(const GByte *pKeyValue,
+                          std::set<int>& oSetVisitedNodePtr);
 
    public:
     explicit TABINDNode(TABAccess eAccessMode = TABRead);
@@ -1567,7 +1571,7 @@ class TABINDNode
     int         GetNumEntries()         {return m_numEntriesInNode;}
     int         GetMaxNumEntries()      {return (512-12)/(m_nKeyLength+4);}
 
-    GInt32      FindFirst(GByte *pKeyValue);
+    GInt32      FindFirst(const GByte *pKeyValue);
     GInt32      FindNext(GByte *pKeyValue);
 
     int         CommitToFile();

From f1d785028e10e61f2bb36dccebf5087264739296 Mon Sep 17 00:00:00 2001
From: Even Rouault <even.rouault@spatialys.com>
Date: Thu, 31 Jan 2019 11:14:54 +0100
Subject: [PATCH 210/488] CSW: fix crash when geometry parsing fails (fixes
 #1248)

---
 gdal/ogr/ogrsf_frmts/csw/ogrcswdataset.cpp | 17 ++++++++++-------
 1 file changed, 10 insertions(+), 7 deletions(-)

diff --git a/gdal/ogr/ogrsf_frmts/csw/ogrcswdataset.cpp b/gdal/ogr/ogrsf_frmts/csw/ogrcswdataset.cpp
index ebe9ec3a18fd..e21ab5d353bd 100644
--- a/gdal/ogr/ogrsf_frmts/csw/ogrcswdataset.cpp
+++ b/gdal/ogr/ogrsf_frmts/csw/ogrcswdataset.cpp
@@ -595,13 +595,16 @@ GDALDataset* OGRCSWLayer::FetchGetRecords()
                                                  FALSE,
                                                  0, 0, false, true,
                                                  false );
-                    bool bLatLongOrder = true;
-                    if( !osSRS.empty() )
-                        bLatLongOrder = GML_IsSRSLatLongOrder(osSRS);
-                    if( bLatLongOrder && CPLTestBool(
-                            CPLGetConfigOption("GML_INVERT_AXIS_ORDER_IF_LAT_LONG", "YES")) )
-                        poGeom->swapXY();
-                    poFeature->SetGeometryDirectly(poGeom);
+                    if( poGeom )
+                    {
+                        bool bLatLongOrder = true;
+                        if( !osSRS.empty() )
+                            bLatLongOrder = GML_IsSRSLatLongOrder(osSRS);
+                        if( bLatLongOrder && CPLTestBool(
+                                CPLGetConfigOption("GML_INVERT_AXIS_ORDER_IF_LAT_LONG", "YES")) )
+                            poGeom->swapXY();
+                        poFeature->SetGeometryDirectly(poGeom);
+                    }
                 }
 
                 psIter->psNext = psNext;

From df2565c6cee53c15ae135a8e71618ff27e97f6b4 Mon Sep 17 00:00:00 2001
From: Boris Hristov <bhristov@esri.com>
Date: Thu, 31 Jan 2019 10:41:05 -0800
Subject: [PATCH 211/488] Negative values other than -1 are valid foreign keys

The GeoPackage specification does not state
that negative values other than -1 for the srs_id
field in table gpkg_contents are invalid foreign keys.
---
 .../ogr/ogrsf_frmts/gpkg/ogrgeopackagedatasource.cpp | 12 +++++-------
 1 file changed, 5 insertions(+), 7 deletions(-)

diff --git a/gdal/ogr/ogrsf_frmts/gpkg/ogrgeopackagedatasource.cpp b/gdal/ogr/ogrsf_frmts/gpkg/ogrgeopackagedatasource.cpp
index 362467c1d9e0..c5a9a3a0338a 100644
--- a/gdal/ogr/ogrsf_frmts/gpkg/ogrgeopackagedatasource.cpp
+++ b/gdal/ogr/ogrsf_frmts/gpkg/ogrgeopackagedatasource.cpp
@@ -1694,14 +1694,12 @@ bool GDALGeoPackageDataset::OpenRaster( const char* pszTableName,
 
     m_bRecordInsertedInGPKGContent = true;
     m_nSRID = nSRSId;
-    if( nSRSId > 0 )
+
+    OGRSpatialReference* poSRS = GetSpatialRef( nSRSId );
+    if( poSRS )
     {
-        OGRSpatialReference* poSRS = GetSpatialRef( nSRSId );
-        if( poSRS )
-        {
-            poSRS->exportToWkt(&m_pszProjection);
-            poSRS->Release();
-        }
+        poSRS->exportToWkt(&m_pszProjection);
+        poSRS->Release();
     }
 
     /* Various sanity checks added in the SELECT */

From dad2b834576cca4ff0409d74eefc9fe7f9c86d16 Mon Sep 17 00:00:00 2001
From: Even Rouault <even.rouault@spatialys.com>
Date: Fri, 1 Feb 2019 11:41:57 +0100
Subject: [PATCH 212/488] Revert "autotest: disable test_rl2_3 for now (refs
 #1241)" (fixes #1241)

This reverts commit 78db90c7391964661eb5834cda44c4a5234481f0.

Upstream rasterlite2 has preserved the original values for compression methods.
---
 autotest/gdrivers/rl2.py | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/autotest/gdrivers/rl2.py b/autotest/gdrivers/rl2.py
index 251d2ca9c1aa..d78f3a01232c 100755
--- a/autotest/gdrivers/rl2.py
+++ b/autotest/gdrivers/rl2.py
@@ -103,9 +103,6 @@ def test_rl2_3():
     if gdaltest.rl2_drv is None:
         pytest.skip()
 
-    # FIXME See https://github.com/OSGeo/gdal/issues/1241
-    pytest.skip()
-
     ds = gdal.Open('data/small_world.rl2')
 
     assert ds.GetRasterBand(1).GetColorInterpretation() == gdal.GCI_RedBand

From 4e84cd44868e3b91def41057b7adf28767b4c273 Mon Sep 17 00:00:00 2001
From: Even Rouault <even.rouault@spatialys.com>
Date: Fri, 1 Feb 2019 23:12:48 +0100
Subject: [PATCH 213/488] ODS: allow opening tables wih empty cells with huge
 values of columns-repeated attribute at end of line (fixes #1243)

---
 .../ogr/data/testrepeatedcolatendofrow.ods    | Bin 0 -> 3230 bytes
 autotest/ogr/ogr_ods.py                       |  13 +++
 gdal/ogr/ogrsf_frmts/ods/ogr_ods.h            |   2 +
 gdal/ogr/ogrsf_frmts/ods/ogrodsdatasource.cpp | 104 ++++++++++--------
 4 files changed, 76 insertions(+), 43 deletions(-)
 create mode 100644 autotest/ogr/data/testrepeatedcolatendofrow.ods

diff --git a/autotest/ogr/data/testrepeatedcolatendofrow.ods b/autotest/ogr/data/testrepeatedcolatendofrow.ods
new file mode 100644
index 0000000000000000000000000000000000000000..ff2a6decdabea714aaa64278aed284e14316f9b8
GIT binary patch
literal 3230
zcma)82{csgAHHKrmXO9CQ7B738D$1x64^&gW8WG3l94sLvWp?RY-O?}J~9<!X)GaG
zzsQ~>vW(9%D%*dm|2fhBTmJW+_dV}@&ppq5@9#O!^LzBPsA<3e034<aLBM_W#+o(=
z0II0I?HmW(?7gie{oGuyA?X3?mGswaY0XHp8-9!ch-Qu&0KQKNSRDjWfUBJ(5*&3q
zP-`A-t})6NA0V9tz36vprJPMvLV0PMT;ZXG_g{Ir_hD0kb#<cw)hugtIzf^(#s(ZZ
ztEO(wKIgW^TA??kFc2<URG_Rh)%(1@p|jgZ9HwXOXAnWQK5~ziF2l#Wl3~zD=Ln|%
zYPYlJAja7zAIFf3b5aV>lN$^fHTRiduUF2SAf0KeYb$*@%)pokhZ}ljT&6+1C1AfU
zaCwYgaOMmOvopRO$VvM?p!&3?9&EfJ+hTTynccDS6|bqHhI<0UbZ;z5N}~u0jol1n
zW|%zJ%G<gP`l6Vmf=w3c{*&7^RO>9kPHcuFV55)6Q#WBABg>g%A>=U9w1^nDYF0?q
z&_)RgT4P;bVkgG>RaehVBO>^=Ym(ikQzZ>mY`vnm1(>tv#lQ(mM?Z9l1oKsKS|lPY
z*!MPwotAnB*tq2ii<O}8BKe&k3L8!oKKwoH|A`IS<}i9d;4n>7f~!bhRHVL!%kDB1
zlj&*t*{=d@h62+MCDpytxl31mK5X~k*R~hOjYTP>nlk_Z1BH8xx4)}B=HJ+FMRmB3
zO0g0+=addh1f&YXm|YpuFphn;h$XsSurQ=RJ?wt{`hq-I)y;>hD1Elgzq-Nyl*6W1
ziJxboCPY*^Rl)|W2e*5DIkRB0F*uSJ>=>b%_zWzgVp!VOwY!GPm0(bF%+l&dA~W=|
z#c^_>-j{HPPC%iun)lgUiVecV8PM3yEQS*)i8%wcHIS!+cW(P8#7`d~WJJY9kf61E
z@B60S_#e*|zZonu{FSQf{mLapo|}CN5_al#*KCRCZFA@`4{kXg1Kd?_#XQcBxLZj3
zR9F1yL)ER@8YDy6SiA)+<_xYjBN400=5N`Dq$}m;XW_j`yrX!R1rsPX$&KK+qeVTP
zc4kgU8vBK9i4e|6|LLq$fweCE&{pokb6L7&w*|X7-r2=`uCbPqbxHR3L!cOP-5lXn
z?s#rz@W;bTemCf3M9B~}2rfVHns%f%m&qlw*P3V<ra#geQU(y-rc?4~J&8v?#RsR7
z1ynA<HlxjpwKx(@FvC-PZy3_@nIcG`L|w9~6iZkRTXcIuGP`SPetyzCC<U+Ip*B<L
zBndZBvo3Hcx4Pw%RRQG8LC;_IS+<-eKPFACUYr~N)59S~H$zQ3t_N`YD?j6Sv&bT(
ziyhG}EPv}jU?Gc|4of=KuqfFrqt0Coo4iuu8AS8C-eZ#=W1}SE)C}!OO3V4+Sn229
zSdLl{Hog&Ee$M(3_Vo4bC)G|xGrUU>qZoMuKlC#g`iw<O#{jykg=YOrdh42(fp-38
zS>y_P;bSbwg&l&_c_E?ZnOmS@+ZL~*&a?b#(qMB@l_Q`@b?9m2;Ab&j$g}Y0n!S8^
znKNSLnos3UxpWazK3G-q-w(_31#}s0yBA7~t5%`IIA0ovM<bS&Af>1L<;^sp)fLT{
zJ`l{te(X*2H5R<reQ4ffkc0UB$X9D6`I)CS#>+1(T+2~-oVRBkEpHd<KRix&{XA{g
z1@B&vg2K6}%64+4`iehcemI5i!OhVQbGsGC0A+IXn+pAtkL37d*X&2bc6_tuc?uy&
ztBQF6M%li_FW0TS2iBy>uFvOo_rkXtzln{aEXuW(3fKL<`0qqd5u1)G5`I=gSM9g&
z+BS|vn*D{-9@HzaNUE5nK=@I-nteZno3*<W+8*QmZ_<5)ZFVL~G2JFb5L8w!l6`oK
zbv=T@mq9f~I!v{$Cm+aoC^_`n+k#Dob<$e)f~ZL3bZ|CA_qa4{qtp@^G3ao@(eu-e
zpW`HwNHrsfzJ%kjdqTRG=R<!cC#lsUu2|$~h*ECW>EF4bmBQ*TQ32VE*q)u7q?X+Y
zym;NH4MNbybg1~j+W<_w8;Cns+S%pwI>^LWb0b3EW)A)dHmhwBLO+*h)@^@jMd4(u
z^yV?+wCM7(jUzQvs;}gN1!{VP$_Dm|`P*SZtdTF(DjrD6j44ObP-orP1x^(-<&Mnu
zSk5bgeikkEDO^{fMAj^jVsf0^0KiBonyrVsx4rw%QrW&hntdC;^th$WZm%LJYbeQ|
zA+|35y7ZTV=~vcx@>5(U9cy88=}~oIdRx)}f{_)(G9hJ}BHB}q@eKb;T0r^M#VUj-
zq@Em(xL}4Fm9lt51jIxj7VM)dYq-Xjwp?6VW$_Hg%@-8H>6IGB6uJ~XGGVoUe;(P%
zCL$i!NbPNy+0u{9_j*)zS)Zt*-^aF+A*>Jokbq70>c73rEH|mu9f(aP+=?(ie*8vz
zZ5w}j3ck~JL3;pQQZ>*jcBdQjZ1A%cO@}awfE-*+`N~K0xWSc}`$R0Ju-FOJy`=f+
zWNhBOdxa=Dpc;<&!=%Q9J5D*25nbrVe#HV`+67*pUVr#ta<F|duJy?{r$c|rm(@4Q
zbvj(@XQiFjbUu3>qiKl4xLRNh4hd0<#2+iDEIMHa-&~w_BPu<dDw&1yZoMc=H9Kx8
ze3e%~?nE;k?#W$YbcZ^x6%S!2=Q5f#YA1~4Ei<dNKxF!v(s8|7miyIP$Gl7!7tW7u
zXwQT^mY)e>Jlk_Ctx&S85^~~ry!~aT`V(%j41siw(y(Ab(HZ?BOG6OpsiB7-+IQ5m
zI`;k6P#ztMIjJvt^@w{=qG=bJpNH0VT6c!ow<(TKGW~M|kESuNfWEPXKD<p1HN<+a
zgREp{J%5v9x3c9rwGQ~~_T4nGdkBwI6Z}nxduslbp0W80S*B)s_fxs$j%5w6OKkSe
zVa6BbFW!Ayg(o56U-a9d>8$8_6Qi#-JBKCOsWKVSO<QxfhVwpTnqEqlz`YRgJ}sks
ze)Q<=#eA5sy_-aVX3VK7tc?6yL@eS-wU^<rXY#pH$l4=yl`x5{CXj!^sNk&7qRR;E
zvGhqt2Akd(T`w1<K;m+-A}r{gNL`POOvdsAA)+KMxEAd?qOn9>V_Ii;J|mXOS&+!l
z&=^#|W@3!z8|l}66K*Qom$@>$2&o#cA@Jm|742E`8C<2Vx^hdc&AI;Fvvt0v;atpI
zL-ikBiaQ@+pZ56M<8-Na!91mshYv|c3pWa+O@|x3qODq_JnS5m@E|orZFN{=e{OFj
z?~4D%i5>Ag39sA;AZtzCe3sKHKRzMx?(5dd8^c=h(Ys4~&16Q8@orzrAO&at*js%&
z5wbvT_|t0IFKF}gyLUd4@9~CfqrG>0<MK~a?fE$GZuEOj5Tbeb5qmLzdabeRX@RKt
zssApba((wuN@4|S!oDqk23Fc1f%O+5|B7}nV(mvuq=5bmT>l^1!3eb<ZJUC&KT!P>
z-rseJA9w)33hcn0Xo3Abg97)hXZ*|09_$$Vk5|4Q?qL7;r<49*<$ry3KlHmpz(JR#
Z0RDx;>S@tZUIc(cl=~y4SOwp!@E;r&LB0S0

literal 0
HcmV?d00001

diff --git a/autotest/ogr/ogr_ods.py b/autotest/ogr/ogr_ods.py
index c57583252a39..c6e391a2b2df 100755
--- a/autotest/ogr/ogr_ods.py
+++ b/autotest/ogr/ogr_ods.py
@@ -454,5 +454,18 @@ def test_ogr_ods_boolean():
 
     gdal.Unlink(out_filename)
 
+###############################################################################
+# Test number-columns-repeated at end of row.
+
+def test_ogr_ods_number_columns_repeated_at_end_of_row():
 
+    drv = ogr.GetDriverByName('ODS')
+    if drv is None:
+        pytest.skip()
 
+    ds = ogr.Open('data/testrepeatedcolatendofrow.ods')
+    lyr = ds.GetLayer(0)
+    f = lyr.GetNextFeature()
+    f = lyr.GetNextFeature()
+    assert f['vbz'] == 1002
+    assert f['b'] == 0
diff --git a/gdal/ogr/ogrsf_frmts/ods/ogr_ods.h b/gdal/ogr/ogrsf_frmts/ods/ogr_ods.h
index 44f0437a4fe0..bceddca28f37 100644
--- a/gdal/ogr/ogrsf_frmts/ods/ogr_ods.h
+++ b/gdal/ogr/ogrsf_frmts/ods/ogr_ods.h
@@ -191,6 +191,8 @@ class OGRODSDataSource final: public GDALDataset
 
     void                DeleteLayer( const char *pszLayerName );
 
+    void                FillRepeatedCells(bool wasLastCell);
+
   public:
                         OGRODSDataSource();
                         virtual ~OGRODSDataSource();
diff --git a/gdal/ogr/ogrsf_frmts/ods/ogrodsdatasource.cpp b/gdal/ogr/ogrsf_frmts/ods/ogrodsdatasource.cpp
index 5af35698d1a5..87b47379aeb9 100644
--- a/gdal/ogr/ogrsf_frmts/ods/ogrodsdatasource.cpp
+++ b/gdal/ogr/ogrsf_frmts/ods/ogrodsdatasource.cpp
@@ -786,6 +786,63 @@ void OGRODSDataSource::endElementTable( CPL_UNUSED /* in non-DEBUG*/ const char
     }
 }
 
+/************************************************************************/
+/*                           FillRepeatedCells()                        */
+/************************************************************************/
+
+void OGRODSDataSource::FillRepeatedCells(bool wasLastCell)
+{
+    if( wasLastCell && osValue.empty() && osFormula.empty() )
+    {
+        nCellsRepeated = 0;
+        return;
+    }
+
+    if (nCellsRepeated < 0 || nCellsRepeated > 10000)
+    {
+        CPLError(CE_Failure, CPLE_NotSupported,
+                    "Invalid value for number-columns-repeated = %d",
+                    nCellsRepeated);
+        bEndTableParsing = true;
+        nCellsRepeated = 0;
+        return;
+    }
+    const int nFields = nCellsRepeated +
+        (poCurLayer != nullptr ?
+            poCurLayer->GetLayerDefn()->GetFieldCount() : 0);
+    if( nFields > 0 && nRowsRepeated > 100000 / nFields )
+    {
+        CPLError(CE_Failure, CPLE_AppDefined,
+                    "Too big gap with previous valid row");
+        bEndTableParsing = true;
+        nCellsRepeated = 0;
+        return;
+    }
+
+    const size_t nCellMemSize =
+        (!osValue.empty()) ? osValue.size() : osFormula.size();
+    if( nCellMemSize > static_cast<size_t>(10 * 1024 * 1024) /
+            (std::max(nCellsRepeated, 1) * nRowsRepeated) )
+    {
+        CPLError(CE_Failure, CPLE_NotSupported,
+                    "Too much memory for row/cell repetition");
+        bEndTableParsing = true;
+        nCellsRepeated = 0;
+        return;
+    }
+    for(int i = 0; i < nCellsRepeated; i++)
+    {
+        if( !osValue.empty() )
+            apoCurLineValues.push_back(osValue);
+        else
+            apoCurLineValues.push_back(osFormula);
+        apoCurLineTypes.push_back(osValueType);
+    }
+
+    nCurCol += nCellsRepeated;
+    nCellsRepeated = 0;
+}
+
 /************************************************************************/
 /*                            startElementRow()                         */
 /************************************************************************/
@@ -793,6 +850,8 @@ void OGRODSDataSource::endElementTable( CPL_UNUSED /* in non-DEBUG*/ const char
 void OGRODSDataSource::startElementRow(const char *pszNameIn,
                                        const char **ppszAttr)
 {
+    FillRepeatedCells(false);
+
     if (strcmp(pszNameIn, "table:table-cell") == 0)
     {
         PushState(STATE_CELL);
@@ -838,38 +897,6 @@ void OGRODSDataSource::startElementRow(const char *pszNameIn,
 
         nCellsRepeated = atoi(
             GetAttributeValue(ppszAttr, "table:number-columns-repeated", "1"));
-        if (nCellsRepeated < 0 || nCellsRepeated > 10000)
-        {
-            CPLError(CE_Failure, CPLE_NotSupported,
-                     "Invalid value for number-columns-repeated = %d",
-                     nCellsRepeated);
-            bEndTableParsing = true;
-            nCellsRepeated = 0;
-            return;
-        }
-        const int nFields = nCellsRepeated +
-            (poCurLayer != nullptr ?
-                poCurLayer->GetLayerDefn()->GetFieldCount() : 0);
-        if( nFields > 0 && nRowsRepeated > 100000 / nFields )
-        {
-            CPLError(CE_Failure, CPLE_AppDefined,
-                     "Too big gap with previous valid row");
-            bEndTableParsing = true;
-            nCellsRepeated = 0;
-            return;
-        }
-
-        const size_t nCellMemSize =
-            (!osValue.empty()) ? osValue.size() : osFormula.size();
-        if( nCellMemSize > static_cast<size_t>(10 * 1024 * 1024) /
-                (std::max(nCellsRepeated, 1) * nRowsRepeated) )
-        {
-            CPLError(CE_Failure, CPLE_NotSupported,
-                     "Too much memory for row/cell repetition");
-            bEndTableParsing = true;
-            nCellsRepeated = 0;
-            return;
-        }
     }
     else if (strcmp(pszNameIn, "table:covered-table-cell") == 0)
     {
@@ -891,6 +918,8 @@ void OGRODSDataSource::endElementRow( CPL_UNUSED /*in non-DEBUG*/ const char * p
     {
         CPLAssert(strcmp(pszNameIn, "table:table-row") == 0);
 
+        FillRepeatedCells(true);
+
         /* Remove blank columns at the right to defer type evaluation */
         /* until necessary */
         size_t i = apoCurLineTypes.size();
@@ -1141,17 +1170,6 @@ void OGRODSDataSource::endElementCell( CPL_UNUSED /*in non-DEBUG*/ const char *
     if (stateStack[nStackDepth].nBeginDepth == nDepth)
     {
         CPLAssert(strcmp(pszNameIn, "table:table-cell") == 0);
-
-        for(int i = 0; i < nCellsRepeated; i++)
-        {
-            if( !osValue.empty() )
-                apoCurLineValues.push_back(osValue);
-            else
-                apoCurLineValues.push_back(osFormula);
-            apoCurLineTypes.push_back(osValueType);
-        }
-
-        nCurCol += nCellsRepeated;
     }
 }
 

From 10d43e1af3eae7457ed4cdea73292a124d3d7873 Mon Sep 17 00:00:00 2001
From: Even Rouault <even.rouault@spatialys.com>
Date: Sat, 2 Feb 2019 15:41:26 +0100
Subject: [PATCH 214/488] MapInfo .tab: fix deleting a feature without geometry
 (fixes #1232)

---
 autotest/ogr/ogr_mitab.py                    | 30 ++++++++++++++++++++
 gdal/ogr/ogrsf_frmts/mitab/mitab_mapfile.cpp | 22 ++++++++------
 2 files changed, 43 insertions(+), 9 deletions(-)

diff --git a/autotest/ogr/ogr_mitab.py b/autotest/ogr/ogr_mitab.py
index 80a710715d7e..a60a911c6a2b 100755
--- a/autotest/ogr/ogr_mitab.py
+++ b/autotest/ogr/ogr_mitab.py
@@ -2291,6 +2291,36 @@ def test_ogr_mitab_tab_write_field_name_with_dot():
 
     ogr.GetDriverByName('MapInfo File').DeleteDataSource(tmpfile)
 
+###############################################################################
+# Check fix for https://github.com/OSGeo/gdal/issues/1232
+
+def test_ogr_mitab_delete_feature_no_geometry():
+
+    filename = '/vsimem/test.tab'
+    ds = ogr.GetDriverByName('MapInfo File').CreateDataSource(filename)
+    lyr = ds.CreateLayer('test', geom_type = ogr.wkbNone)
+    lyr.CreateField(ogr.FieldDefn('id', ogr.OFTInteger))
+    f = ogr.Feature(lyr.GetLayerDefn())
+    f['id'] = 1
+    lyr.CreateFeature(f)
+    f = ogr.Feature(lyr.GetLayerDefn())
+    f['id'] = 2
+    lyr.CreateFeature(f)
+    ds = None
+
+    ds = ogr.Open(filename, update=1)
+    lyr = ds.GetLayer(0)
+    assert lyr.DeleteFeature(1) == 0
+    ds = None
+
+    ds = ogr.Open(filename)
+    lyr = ds.GetLayer(0)
+    f = lyr.GetNextFeature()
+    assert f['id'] == 2
+    ds = None
+
+    ogr.GetDriverByName('MapInfo File').DeleteDataSource(filename)
+
 ###############################################################################
 #
 
diff --git a/gdal/ogr/ogrsf_frmts/mitab/mitab_mapfile.cpp b/gdal/ogr/ogrsf_frmts/mitab/mitab_mapfile.cpp
index 5e824e6e705e..89055d0ae135 100644
--- a/gdal/ogr/ogrsf_frmts/mitab/mitab_mapfile.cpp
+++ b/gdal/ogr/ogrsf_frmts/mitab/mitab_mapfile.cpp
@@ -1148,22 +1148,26 @@ int TABMAPFile::MoveToObjId(int nObjId)
  **********************************************************************/
 int TABMAPFile::MarkAsDeleted()
 {
-    if (m_eAccessMode == TABRead || m_poCurObjBlock == nullptr)
+    if (m_eAccessMode == TABRead)
         return -1;
 
     if ( m_nCurObjPtr <= 0 )
         return 0;
 
-    /* Goto offset for object id */
-    if ( m_poCurObjBlock->GotoByteInFile(m_nCurObjPtr + 1, TRUE) != 0)
-        return -1;
+    int ret = 0;
+    if( m_nCurObjType != TAB_GEOM_NONE  )
+    {
+        /* Goto offset for object id */
+        if ( m_poCurObjBlock == nullptr ||
+            m_poCurObjBlock->GotoByteInFile(m_nCurObjPtr + 1, TRUE) != 0)
+            return -1;
 
-    /* Mark object as deleted */
-    m_poCurObjBlock->WriteInt32(m_nCurObjId | 0x40000000);
+        /* Mark object as deleted */
+        m_poCurObjBlock->WriteInt32(m_nCurObjId | 0x40000000);
 
-    int ret = 0;
-    if( m_poCurObjBlock->CommitToFile() != 0 )
-        ret = -1;
+        if( m_poCurObjBlock->CommitToFile() != 0 )
+            ret = -1;
+    }
 
     /* Update index entry to reflect delete state as well */
     if( m_poIdIndex->SetObjPtr(m_nCurObjId, 0) != 0 )

From ec4bd32cd591b672274383f7c06da1d58a2a3500 Mon Sep 17 00:00:00 2001
From: Even Rouault <even.rouault@spatialys.com>
Date: Wed, 6 Feb 2019 19:50:00 +0100
Subject: [PATCH 215/488] KMLSuperOverlay: report color table of single overlay
 datasets, and also handle some variation in the KML structure (fixes
 https://issues.qgis.org/issues/20173)

---
 .../small_world_in_document_folder_pct.kml    | 21 +++++++++
 autotest/gdrivers/kmlsuperoverlay.py          | 16 +++++++
 .../kmlsuperoverlaydataset.cpp                | 46 ++++++++++++++++++-
 3 files changed, 82 insertions(+), 1 deletion(-)
 create mode 100644 autotest/gdrivers/data/small_world_in_document_folder_pct.kml

diff --git a/autotest/gdrivers/data/small_world_in_document_folder_pct.kml b/autotest/gdrivers/data/small_world_in_document_folder_pct.kml
new file mode 100644
index 000000000000..0f352b7dd98f
--- /dev/null
+++ b/autotest/gdrivers/data/small_world_in_document_folder_pct.kml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<kml xmlns="http://www.opengis.net/kml/2.2" xmlns:kml="http://www.opengis.net/kml/2.2" xmlns:atom="http://www.w3.org/2005/Atom">
+<Document>
+<Folder>
+<GroundOverlay>
+<name>small_world</name>
+<color>ffffffff</color>
+<Icon>
+<href>small_world_pct.tif</href>
+<viewBoundScale>1</viewBoundScale>
+</Icon>
+<LatLonBox>
+<north>90</north>
+<south>-90</south>
+<east>180</east>
+<west>-180</west>
+</LatLonBox>
+</GroundOverlay>
+</Folder>
+</Document>
+</kml>
diff --git a/autotest/gdrivers/kmlsuperoverlay.py b/autotest/gdrivers/kmlsuperoverlay.py
index 2d7b465270d3..edab1107362e 100755
--- a/autotest/gdrivers/kmlsuperoverlay.py
+++ b/autotest/gdrivers/kmlsuperoverlay.py
@@ -284,6 +284,22 @@ def test_kmlsuperoverlay_7():
     assert cs == 30111
     assert ds.GetRasterBand(1).GetRasterColorInterpretation() == gdal.GCI_RedBand
 
+###############################################################################
+# Test raster KML with single Overlay (such as https://issues.qgis.org/issues/20173)
+
+
+def test_kmlsuperoverlay_single_overlay_document_folder_pct():
+
+    ds = gdal.Open('data/small_world_in_document_folder_pct.kml')
+    assert ds.GetProjectionRef().find('WGS_1984') >= 0
+    got_gt = ds.GetGeoTransform()
+    ref_gt = [-180.0, 0.9, 0.0, 90.0, 0.0, -0.9]
+    for i in range(6):
+        assert abs(got_gt[i] - ref_gt[i]) <= 1e-6
+
+    assert ds.GetRasterBand(1).GetRasterColorInterpretation() == gdal.GCI_PaletteIndex
+    assert ds.GetRasterBand(1).GetColorTable()
+
 ###############################################################################
 # Test that a raster with lots of blank space doesn't have unnecessary child
 # KML/PNG files in transparent areas
diff --git a/gdal/frmts/kmlsuperoverlay/kmlsuperoverlaydataset.cpp b/gdal/frmts/kmlsuperoverlay/kmlsuperoverlaydataset.cpp
index 73694a6f260c..b8f3bc8f5741 100644
--- a/gdal/frmts/kmlsuperoverlay/kmlsuperoverlaydataset.cpp
+++ b/gdal/frmts/kmlsuperoverlay/kmlsuperoverlaydataset.cpp
@@ -2450,7 +2450,47 @@ GDALDataset* KmlSingleOverlayRasterDataset::Open(const char* pszFilename,
 {
     CPLXMLNode* psGO = CPLGetXMLNode(psRoot, "=kml.GroundOverlay");
     if( psGO == nullptr )
-        return nullptr;
+    {
+        // Otherwise look for kml.Document.Folder.GroundOverlay if there's
+        // a single occurence of Folder and GroundOverlay
+        auto psDoc = CPLGetXMLNode(psRoot, "=kml.Document");
+        if( psDoc == nullptr )
+        {
+            return nullptr;
+        }
+        CPLXMLNode* psFolder = nullptr;
+        for( auto psIter = psDoc->psChild; psIter; psIter = psIter->psNext )
+        {
+            if( psIter->eType == CXT_Element &&
+                strcmp(psIter->pszValue, "Folder") == 0 )
+            {
+                if( psFolder == nullptr )
+                    psFolder = psIter;
+                else
+                    return nullptr;
+            }
+        }
+        if( psFolder == nullptr )
+        {
+            return nullptr;
+        }
+        for( auto psIter = psFolder->psChild; psIter; psIter = psIter->psNext )
+        {
+            if( psIter->eType == CXT_Element &&
+                strcmp(psIter->pszValue, "GroundOverlay") == 0 )
+            {
+                if( psGO == nullptr )
+                    psGO = psIter;
+                else
+                    return nullptr;
+            }
+        }
+        if( psGO == nullptr )
+        {
+            return nullptr;
+        }
+    }
+
     const char* pszHref = CPLGetXMLValue(psGO, "Icon.href", nullptr);
     if( pszHref == nullptr )
         return nullptr;
@@ -2483,6 +2523,10 @@ GDALDataset* KmlSingleOverlayRasterDataset::Open(const char* pszFilename,
 
         poDS->GetRasterBand(i)->SetColorInterpretation(
                     poImageDS->GetRasterBand(i)->GetColorInterpretation() );
+
+        auto poCT = poImageDS->GetRasterBand(i)->GetColorTable();
+        if( poCT )
+            poDS->GetRasterBand(i)->SetColorTable(poCT);
     }
     poImageDS->Dereference();
     double adfGeoTransform[6] = {

From d6c38adfa28f75da0630f3e3ac26dbb501fc361e Mon Sep 17 00:00:00 2001
From: Even Rouault <even.rouault@spatialys.com>
Date: Thu, 7 Feb 2019 21:58:05 +0100
Subject: [PATCH 216/488] GeoJSON: speed-up random reading with GetFeature() by
 storing a map FID->(start,size) to retrieve performance similar to GDAL 2.2
 or before (fixes https://issues.qgis.org/issues/21085)

---
 autotest/ogr/ogr_geojson.py                   |  67 +++++++++
 .../ogrsf_frmts/geojson/ogrgeojsonlayer.cpp   |   4 +
 .../ogrsf_frmts/geojson/ogrgeojsonreader.cpp  | 134 +++++++++++++++++-
 .../ogrsf_frmts/geojson/ogrgeojsonreader.h    |   4 +
 4 files changed, 205 insertions(+), 4 deletions(-)

diff --git a/autotest/ogr/ogr_geojson.py b/autotest/ogr/ogr_geojson.py
index b8d5cd8e0655..59e5787dfe41 100755
--- a/autotest/ogr/ogr_geojson.py
+++ b/autotest/ogr/ogr_geojson.py
@@ -3607,6 +3607,73 @@ def test_ogr_geojson_non_finite():
 
 ###############################################################################
 
+def test_ogr_geojson_random_reading_with_id():
+
+    json_content = """{
+  "type": "FeatureCollection",
+  "features": [
+      { "type": "Feature", "id": 1, "properties": { "a": "a" }, "geometry": null },
+      { "type": "Feature", "id": 2, "properties": { "a": "bc" }, "geometry": null }
+  ]
+}"""
+    tmpfilename = '/vsimem/temp.json'
+    gdal.FileFromMemBuffer(tmpfilename, json_content)
+    ds = ogr.Open(tmpfilename)
+    lyr = ds.GetLayer(0)
+    f1_ref = lyr.GetNextFeature()
+    f2_ref = lyr.GetNextFeature()
+    f1 = lyr.GetFeature(1)
+    f2 = lyr.GetFeature(2)
+    assert f1.Equal(f1_ref)
+    assert f2.Equal(f2_ref)
+    assert not lyr.GetFeature(3)
+    ds = None
+    gdal.Unlink(tmpfilename)
+
+###############################################################################
+
+def test_ogr_geojson_random_reading_without_id():
+
+    json_content = """{
+  "type": "FeatureCollection",
+  "features": [
+      { "type": "Feature", "properties": { "a": "a" }, "geometry": null },
+      { "type": "Feature", "properties": { "a": "bc" }, "geometry": null }
+  ]
+}"""
+    tmpfilename = '/vsimem/temp.json'
+    gdal.FileFromMemBuffer(tmpfilename, json_content)
+    ds = ogr.Open(tmpfilename)
+    lyr = ds.GetLayer(0)
+    f1_ref = lyr.GetNextFeature()
+    f2_ref = lyr.GetNextFeature()
+    f1 = lyr.GetFeature(0)
+    f2 = lyr.GetFeature(1)
+    assert f1.Equal(f1_ref)
+    assert f2.Equal(f2_ref)
+    assert not lyr.GetFeature(2)
+    ds = None
+    gdal.Unlink(tmpfilename)
+
+###############################################################################
+
+def test_ogr_geojson_single_feature_random_reading_with_id():
+
+    json_content = """
+      { "type": "Feature", "id": 1, "properties": { "a": "a" }, "geometry": null }
+}"""
+    tmpfilename = '/vsimem/temp.json'
+    gdal.FileFromMemBuffer(tmpfilename, json_content)
+    ds = ogr.Open(tmpfilename)
+    lyr = ds.GetLayer(0)
+    f1_ref = lyr.GetNextFeature()
+    f1 = lyr.GetFeature(1)
+    assert f1.Equal(f1_ref)
+    ds = None
+    gdal.Unlink(tmpfilename)
+
+###############################################################################
+
 
 def test_ogr_geojson_cleanup():
 
diff --git a/gdal/ogr/ogrsf_frmts/geojson/ogrgeojsonlayer.cpp b/gdal/ogr/ogrsf_frmts/geojson/ogrgeojsonlayer.cpp
index 9065c38151b0..c95049d59a8e 100644
--- a/gdal/ogr/ogrsf_frmts/geojson/ogrgeojsonlayer.cpp
+++ b/gdal/ogr/ogrsf_frmts/geojson/ogrgeojsonlayer.cpp
@@ -205,6 +205,10 @@ OGRFeature* OGRGeoJSONLayer::GetFeature(GIntBig nFID)
 {
     if( poReader_ )
     {
+        if( !IsUpdatable() )
+        {
+            return poReader_->GetFeature(this, nFID);
+        }
         return OGRLayer::GetFeature(nFID);
     }
     else
diff --git a/gdal/ogr/ogrsf_frmts/geojson/ogrgeojsonreader.cpp b/gdal/ogr/ogrsf_frmts/geojson/ogrgeojsonreader.cpp
index def16422f9fb..adb30a41af9a 100644
--- a/gdal/ogr/ogrsf_frmts/geojson/ogrgeojsonreader.cpp
+++ b/gdal/ogr/ogrsf_frmts/geojson/ogrgeojsonreader.cpp
@@ -102,6 +102,9 @@ class OGRGeoJSONReaderStreamingParser: public CPLJSonStreamingParser
         std::vector<OGRFeature*> m_apoFeatures;
         size_t m_nCurFeatureIdx;
 
+        bool m_bStartFeature = false;
+        bool m_bEndFeature = false;
+
         void AppendObject(json_object* poNewObj);
         void AnalyzeFeature();
         void TooComplex();
@@ -132,10 +135,14 @@ class OGRGeoJSONReaderStreamingParser: public CPLJSonStreamingParser
 
         OGRFeature* GetNextFeature();
         json_object* StealRootObject();
-        bool IsTypeKnown() const { return m_bIsTypeKnown; }
-        bool IsFeatureCollection() const { return m_bIsFeatureCollection; }
-        GUIntBig GetTotalOGRFeatureMemEstimate() const { return m_nTotalOGRFeatureMemEstimate; }
-        bool CanEasilyAppend() const { return m_bCanEasilyAppend; }
+        inline bool IsTypeKnown() const { return m_bIsTypeKnown; }
+        inline bool IsFeatureCollection() const { return m_bIsFeatureCollection; }
+        inline GUIntBig GetTotalOGRFeatureMemEstimate() const { return m_nTotalOGRFeatureMemEstimate; }
+        inline bool CanEasilyAppend() const { return m_bCanEasilyAppend; }
+
+        inline void ResetFeatureDetectionState() { m_bStartFeature = false; m_bEndFeature = false; }
+        inline bool IsStartFeature() const { return m_bStartFeature; }
+        inline bool IsEndFeature() const { return m_bEndFeature; }
 };
 
 
@@ -409,6 +416,7 @@ void OGRGeoJSONReaderStreamingParser::StartObject()
             m_osJson = "{";
             m_abFirstMember.push_back(true);
         }
+        m_bStartFeature = true;
     }
     else if( m_poCurObj )
     {
@@ -490,6 +498,7 @@ void OGRGeoJSONReaderStreamingParser::EndObject()
         m_nTotalOGRFeatureMemEstimate += sizeof(OGRFeature);
         m_osJson.clear();
         m_abFirstMember.clear();
+        m_bEndFeature = true;
     }
     else if( m_poCurObj )
     {
@@ -1104,6 +1113,123 @@ OGRFeature* OGRGeoJSONReader::GetNextFeature(OGRGeoJSONLayer* poLayer)
     return nullptr;
 }
 
+/************************************************************************/
+/*                             GetFeature()                             */
+/************************************************************************/
+
+OGRFeature* OGRGeoJSONReader::GetFeature(OGRGeoJSONLayer* poLayer, GIntBig nFID)
+{
+    CPLAssert( fp_ );
+
+    if( oMapFIDToOffsetSize_.empty() )
+    {
+        CPLDebug("GeoJSON", "Establishing index to features for first GetFeature() call");
+
+        delete poStreamingParser_;
+        poStreamingParser_ = nullptr;
+
+        OGRGeoJSONReaderStreamingParser oParser(*this, poLayer, false, bStoreNativeData_);
+        VSIFSeekL(fp_, 0, SEEK_SET);
+        bFirstSeg_ = true;
+        bJSonPLikeWrapper_ = false;
+        vsi_l_offset nCurOffset = 0;
+        vsi_l_offset nFeatureOffset = 0;
+        GIntBig nSeqFID = 0;
+        while( true )
+        {
+            size_t nRead = VSIFReadL(pabyBuffer_, 1, nBufferSize_, fp_);
+            const bool bFinished = nRead < nBufferSize_;
+            size_t nSkip = 0;
+            if( bFirstSeg_ )
+            {
+                bFirstSeg_ = false;
+                nSkip = SkipPrologEpilogAndUpdateJSonPLikeWrapper(nRead);
+            }
+            if( bFinished && bJSonPLikeWrapper_ && nRead - nSkip > 0 )
+                nRead --;
+            auto pszPtr = reinterpret_cast<const char*>(pabyBuffer_ + nSkip);
+            for( size_t i = 0; i < nRead - nSkip; i++ )
+            {
+                oParser.ResetFeatureDetectionState();
+                if( !oParser.Parse( pszPtr + i,
+                                    1, bFinished && (i + 1 == nRead - nSkip) ) ||
+                    oParser.ExceptionOccurred() )
+                {
+                    return nullptr;
+                }
+                if( oParser.IsStartFeature() )
+                {
+                    nFeatureOffset = nCurOffset + i;
+                }
+                else if( oParser.IsEndFeature() )
+                {
+                    vsi_l_offset nFeatureSize = (nCurOffset + i) - nFeatureOffset + 1;
+                    auto poFeat = oParser.GetNextFeature();
+                    if( poFeat )
+                    {
+                        GIntBig nThisFID = poFeat->GetFID();
+                        if( nThisFID < 0 )
+                        {
+                            nThisFID = nSeqFID;
+                            nSeqFID++;
+                        }
+                        if( oMapFIDToOffsetSize_.find(nThisFID) == oMapFIDToOffsetSize_.end() )
+                        {
+                            oMapFIDToOffsetSize_[nThisFID] =
+                                std::pair<vsi_l_offset, vsi_l_offset>(nFeatureOffset, nFeatureSize);
+                        }
+                        delete poFeat;
+                    }
+                }
+            }
+
+            if( bFinished  )
+                break;
+            nCurOffset += nRead;
+        }
+    }
+
+    auto oIter = oMapFIDToOffsetSize_.find(nFID);
+    if( oIter == oMapFIDToOffsetSize_.end() )
+    {
+        return nullptr;
+    }
+
+    VSIFSeekL(fp_, oIter->second.first, SEEK_SET);
+    if( oIter->second.second > 1000 * 1000 * 1000 )
+    {
+        return nullptr;
+    }
+    size_t nSize = static_cast<size_t>(oIter->second.second);
+    char* pszBuffer = static_cast<char*>(VSIMalloc(nSize + 1));
+    if( !pszBuffer )
+    {
+        return nullptr;
+    }
+    if( VSIFReadL(pszBuffer, 1, nSize, fp_) != nSize )
+    {
+        VSIFree(pszBuffer);
+        return nullptr;
+    }
+    pszBuffer[nSize] = 0;
+    json_object* poObj = nullptr;
+    if( !OGRJSonParse(pszBuffer, &poObj) )
+    {
+        VSIFree(pszBuffer);
+        return nullptr;
+    }
+
+    OGRFeature* poFeat = ReadFeature(poLayer, poObj, pszBuffer);
+    json_object_put(poObj);
+    VSIFree(pszBuffer);
+    if( !poFeat )
+    {
+        return nullptr;
+    }
+    poFeat->SetFID(nFID);
+    return poFeat;
+}
+
 /************************************************************************/
 /*                           IngestAll()                                */
 /************************************************************************/
diff --git a/gdal/ogr/ogrsf_frmts/geojson/ogrgeojsonreader.h b/gdal/ogr/ogrsf_frmts/geojson/ogrgeojsonreader.h
index b17a24c54ea3..d529ee441762 100644
--- a/gdal/ogr/ogrsf_frmts/geojson/ogrgeojsonreader.h
+++ b/gdal/ogr/ogrsf_frmts/geojson/ogrgeojsonreader.h
@@ -37,6 +37,7 @@
 
 #include "ogrgeojsonutils.h"
 
+#include <utility>
 #include <set>
 
 /************************************************************************/
@@ -160,6 +161,7 @@ class OGRGeoJSONReader: public OGRGeoJSONBaseReader
 
     void ResetReading();
     OGRFeature* GetNextFeature(OGRGeoJSONLayer* poLayer);
+    OGRFeature* GetFeature(OGRGeoJSONLayer* poLayer, GIntBig nFID);
     bool IngestAll(OGRGeoJSONLayer* poLayer);
 
     VSILFILE* GetFP() { return fp_; }
@@ -182,6 +184,8 @@ class OGRGeoJSONReader: public OGRGeoJSONBaseReader
 
     GIntBig nTotalFeatureCount_;
     GUIntBig nTotalOGRFeatureMemEstimate_;
+
+    std::map<GIntBig, std::pair<vsi_l_offset, vsi_l_offset>> oMapFIDToOffsetSize_;
     //
     // Copy operations not supported.
     //

From 9bae84e41e85f3d2fb01037dd7b2a1c974d1877e Mon Sep 17 00:00:00 2001
From: Even Rouault <even.rouault@spatialys.com>
Date: Fri, 8 Feb 2019 14:49:55 +0100
Subject: [PATCH 217/488] ODS: avoid potential null pointer dereference when
 writing to corrupted filename. Fixes
 https://bugs.chromium.org/p/oss-fuzz/issues/detail?id=12976. Credit to OSS
 Fuzz

---
 gdal/ogr/ogrsf_frmts/ods/ogrodsdatasource.cpp | 25 +++++++++++++++++++
 1 file changed, 25 insertions(+)

diff --git a/gdal/ogr/ogrsf_frmts/ods/ogrodsdatasource.cpp b/gdal/ogr/ogrsf_frmts/ods/ogrodsdatasource.cpp
index 87b47379aeb9..60c644238927 100644
--- a/gdal/ogr/ogrsf_frmts/ods/ogrodsdatasource.cpp
+++ b/gdal/ogr/ogrsf_frmts/ods/ogrodsdatasource.cpp
@@ -1862,6 +1862,11 @@ void OGRODSDataSource::FlushCache()
 
     osTmpFilename = CPLSPrintf("/vsizip/%s/META-INF/manifest.xml", pszName);
     VSILFILE* fp = VSIFOpenL(osTmpFilename, "wb");
+    if( fp == nullptr )
+    {
+        VSIFCloseL(fpZIP);
+        return;
+    }
     VSIFPrintfL(fp, "<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n");
     VSIFPrintfL(
         fp,
@@ -1885,6 +1890,11 @@ void OGRODSDataSource::FlushCache()
 
     osTmpFilename = CPLSPrintf("/vsizip/%s/meta.xml", pszName);
     fp = VSIFOpenL(osTmpFilename, "wb");
+    if( fp == nullptr )
+    {
+        VSIFCloseL(fpZIP);
+        return;
+    }
     VSIFPrintfL(fp, "<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n");
     VSIFPrintfL(
         fp, "<office:document-meta "
@@ -1895,6 +1905,11 @@ void OGRODSDataSource::FlushCache()
 
     osTmpFilename = CPLSPrintf("/vsizip/%s/settings.xml", pszName);
     fp = VSIFOpenL(osTmpFilename, "wb");
+    if( fp == nullptr )
+    {
+        VSIFCloseL(fpZIP);
+        return;
+    }
     VSIFPrintfL(fp, "<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n");
     VSIFPrintfL(
          fp, "<office:document-settings "
@@ -1951,6 +1966,11 @@ void OGRODSDataSource::FlushCache()
 
     osTmpFilename = CPLSPrintf("/vsizip/%s/styles.xml", pszName);
     fp = VSIFOpenL(osTmpFilename, "wb");
+    if( fp == nullptr )
+    {
+        VSIFCloseL(fpZIP);
+        return;
+    }
     VSIFPrintfL(fp, "<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n");
     VSIFPrintfL(
          fp, "<office:document-styles "
@@ -1967,6 +1987,11 @@ void OGRODSDataSource::FlushCache()
 
     osTmpFilename = CPLSPrintf("/vsizip/%s/content.xml", pszName);
     fp = VSIFOpenL(osTmpFilename, "wb");
+    if( fp == nullptr )
+    {
+        VSIFCloseL(fpZIP);
+        return;
+    }
     VSIFPrintfL(fp, "<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n");
     VSIFPrintfL(
          fp, "<office:document-content "

From 079b01ab83f1b882cebb9d5c3b8029ce9b26a451 Mon Sep 17 00:00:00 2001
From: Alan Thomas <athomas@thinkspatial.com.au>
Date: Mon, 17 Dec 2018 16:20:50 +1100
Subject: [PATCH 218/488] NGW: Repair VS build when curl is not available
 (fixes #1251)

---
 gdal/ogr/ogrsf_frmts/generic/makefile.vc | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/gdal/ogr/ogrsf_frmts/generic/makefile.vc b/gdal/ogr/ogrsf_frmts/generic/makefile.vc
index db2f12582825..525777db2729 100644
--- a/gdal/ogr/ogrsf_frmts/generic/makefile.vc
+++ b/gdal/ogr/ogrsf_frmts/generic/makefile.vc
@@ -13,7 +13,7 @@ GDAL_ROOT	=	..\..\..
 
 !IFDEF INCLUDE_OGR_FRMTS
 
-BASEFORMATS = -DSHAPE_ENABLED -DTAB_ENABLED -DNTF_ENABLED -DSDTS_ENABLED -DTIGER_ENABLED -DS57_ENABLED -DDGN_ENABLED -DVRT_ENABLED -DAVCBIN_ENABLED -DREC_ENABLED -DMEM_ENABLED -DCSV_ENABLED -DGML_ENABLED -DGMT_ENABLED -DBNA_ENABLED -DKML_ENABLED -DGEOJSON_ENABLED -DGPX_ENABLED -DGEOCONCEPT_ENABLED -DXPLANE_ENABLED -DGEORSS_ENABLED -DGTM_ENABLED -DDXF_ENABLED -DPGDUMP_ENABLED -DGPSBABEL_ENABLED -DSUA_ENABLED -DOPENAIR_ENABLED -DPDS_ENABLED -DHTF_ENABLED -DAERONAVFAA_ENABLED -DEDIGEO_ENABLED -DSVG_ENABLED -DIDRISI_ENABLED -DARCGEN_ENABLED -DSEGUKOOA_ENABLED -DSEGY_ENABLED -DSXF_ENABLED -DOPENFILEGDB_ENABLED -DWASP_ENABLED -DSELAFIN_ENABLED -DJML_ENABLED -DVDV_ENABLED -DCAD_ENABLED -DMVT_ENABLED -DNGW_ENABLED
+BASEFORMATS = -DSHAPE_ENABLED -DTAB_ENABLED -DNTF_ENABLED -DSDTS_ENABLED -DTIGER_ENABLED -DS57_ENABLED -DDGN_ENABLED -DVRT_ENABLED -DAVCBIN_ENABLED -DREC_ENABLED -DMEM_ENABLED -DCSV_ENABLED -DGML_ENABLED -DGMT_ENABLED -DBNA_ENABLED -DKML_ENABLED -DGEOJSON_ENABLED -DGPX_ENABLED -DGEOCONCEPT_ENABLED -DXPLANE_ENABLED -DGEORSS_ENABLED -DGTM_ENABLED -DDXF_ENABLED -DPGDUMP_ENABLED -DGPSBABEL_ENABLED -DSUA_ENABLED -DOPENAIR_ENABLED -DPDS_ENABLED -DHTF_ENABLED -DAERONAVFAA_ENABLED -DEDIGEO_ENABLED -DSVG_ENABLED -DIDRISI_ENABLED -DARCGEN_ENABLED -DSEGUKOOA_ENABLED -DSEGY_ENABLED -DSXF_ENABLED -DOPENFILEGDB_ENABLED -DWASP_ENABLED -DSELAFIN_ENABLED -DJML_ENABLED -DVDV_ENABLED -DCAD_ENABLED -DMVT_ENABLED
 
 EXTRAFLAGS =	-I.. -I..\.. $(OGDIDEF) $(FMEDEF) $(OCIDEF) $(PGDEF) \
 		$(ODBCDEF) $(SQLITEDEF) $(MYSQLDEF) $(ILIDEF) $(DWGDEF) \
@@ -21,7 +21,7 @@ EXTRAFLAGS =	-I.. -I..\.. $(OGDIDEF) $(FMEDEF) $(OCIDEF) $(PGDEF) \
 		$(LIBKMLDEF) $(WFSDEF) $(SOSIDEF) $(GFTDEF) \
 		$(COUCHDBDEF) $(CLOUDANTDEF) $(FGDBDEF) $(XLSDEF) $(ODSDEF) $(XLSXDEF) $(INGRESDEF) \
 		$(ELASTICDEF) $(OSMDEF) $(VFKDEF) $(CARTODEF) $(AMIGOCLOUDDEF) $(PLSCENESDEF) $(CSWDEF) $(MONGODBDEF) \
-		$(GMLASDEF)
+		$(GMLASDEF) $(NGWDEF)
 
 !IFDEF OGDIDIR
 OGDIDEF	=	-DOGDI_ENABLED
@@ -161,6 +161,10 @@ AMIGOCLOUDDEF = -DAMIGOCLOUD_ENABLED
 PLSCENESDEF = -DPLSCENES_ENABLED
 !ENDIF
 
+!IFDEF CURL_LIB
+NGWDEF = -DNGW_ENABLED
+!ENDIF
+
 !IFDEF MONGODB_INC
 !IF "$(MONGODB_PLUGIN)" != "YES"
 MONGODBDEF = -DMONGODB_ENABLED

From c94cc19ec05bf8ca598f817fec0c3ddf14823dd6 Mon Sep 17 00:00:00 2001
From: Even Rouault <even.rouault@spatialys.com>
Date: Wed, 13 Feb 2019 21:08:50 +0100
Subject: [PATCH 219/488] TIFF Lerc: properly initialize state after Create()
 so that BuildOverviews() succeed (fixes #1257)

---
 autotest/gcore/tiff_write.py | 25 +++++++++++++++++++++++++
 gdal/frmts/gtiff/geotiff.cpp | 15 +++++++++++++++
 2 files changed, 40 insertions(+)

diff --git a/autotest/gcore/tiff_write.py b/autotest/gcore/tiff_write.py
index 769b862357b0..8dfeab1108ad 100755
--- a/autotest/gcore/tiff_write.py
+++ b/autotest/gcore/tiff_write.py
@@ -6881,6 +6881,31 @@ def test_tiff_write_182_xmp_delete():
 
     gdaltest.tiff_drv.Delete('tmp/test_182.tif')
 
+###############################################################################
+# Test LERC compression with Create() and BuildOverviews()
+# Fixes https://github.com/OSGeo/gdal/issues/1257
+
+
+def test_tiff_write_185_lerc_create_and_overview():
+
+    md = gdaltest.tiff_drv.GetMetadata()
+    if md['DMD_CREATIONOPTIONLIST'].find('LERC') == -1:
+        pytest.skip()
+
+    filename = '/vsimem/test_tiff_write_185_lerc_create_and_overview.tif'
+    ds = gdaltest.tiff_drv.Create(filename, 20, 20, options=['COMPRESS=LERC_DEFLATE'])
+    src_ds = gdal.Open('data/byte.tif')
+    ds.WriteRaster(0,0,20,20,src_ds.ReadRaster())
+    gdal.ErrorReset()
+    ds.BuildOverviews('NEAR', [2])
+    assert gdal.GetLastErrorMsg() == ''
+    ds = None
+    ds = gdal.Open(filename)
+    cs = ds.GetRasterBand(1).Checksum()
+    cs_ovr = ds.GetRasterBand(1).GetOverview(0).Checksum()
+    gdal.Unlink(filename)
+    assert (cs, cs_ovr) == (4672, 1087)
+
 ###############################################################################
 # Ask to run again tests with GDAL_API_PROXY=YES
 
diff --git a/gdal/frmts/gtiff/geotiff.cpp b/gdal/frmts/gtiff/geotiff.cpp
index 932c33f7c15e..a7c0615293f8 100644
--- a/gdal/frmts/gtiff/geotiff.cpp
+++ b/gdal/frmts/gtiff/geotiff.cpp
@@ -16500,6 +16500,21 @@ GDALDataset *GTiffDataset::Create( const char * pszFilename,
             TIFFSetField(l_hTIFF, TIFFTAG_JPEGCOLORMODE, JPEGCOLORMODE_RGB);
     }
 
+#ifdef HAVE_LERC
+    if( poDS->nCompression == COMPRESSION_LERC )
+    {
+        uint32 nLercParamCount = 0;
+        uint32* panLercParms = nullptr;
+        if( TIFFGetField( l_hTIFF, TIFFTAG_LERC_PARAMETERS, &nLercParamCount,
+                          &panLercParms ) &&
+            nLercParamCount == 2 )
+        {
+            memcpy( poDS->anLercAddCompressionAndVersion, panLercParms,
+                    sizeof(poDS->anLercAddCompressionAndVersion) );
+        }
+    }
+#endif
+
 /* -------------------------------------------------------------------- */
 /*      Read palette back as a color table if it has one.               */
 /* -------------------------------------------------------------------- */

From b2c9779fd595b30f2fe16d73f5317be7a53bb45f Mon Sep 17 00:00:00 2001
From: Even Rouault <even.rouault@spatialys.com>
Date: Wed, 13 Feb 2019 18:38:57 +0100
Subject: [PATCH 220/488] Prevent pytest 4.2.1 from being used since it causes
 issues on mingw64 (see https://travis-ci.com/OSGeo/gdal/jobs/177514628)

---
 autotest/requirements.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/autotest/requirements.txt b/autotest/requirements.txt
index fdfaccb5fd14..9e1af043e9c8 100644
--- a/autotest/requirements.txt
+++ b/autotest/requirements.txt
@@ -1,2 +1,2 @@
-pytest>=3
+pytest>=3.6.0,<=4.2.0
 pytest-sugar

From 4cd343fdd3adb4e0302195d1102d8e95b2630ce5 Mon Sep 17 00:00:00 2001
From: Even Rouault <even.rouault@spatialys.com>
Date: Tue, 12 Feb 2019 13:09:37 +0100
Subject: [PATCH 221/488] autotest/requirements.txt: avoid more-itertools 5.0.0
 because of issues on MacOSX (https://travis-ci.com/OSGeo/gdal/jobs/177038541)

---
 autotest/requirements.txt | 1 +
 1 file changed, 1 insertion(+)

diff --git a/autotest/requirements.txt b/autotest/requirements.txt
index 9e1af043e9c8..e83b90c0e252 100644
--- a/autotest/requirements.txt
+++ b/autotest/requirements.txt
@@ -1,2 +1,3 @@
 pytest>=3.6.0,<=4.2.0
 pytest-sugar
+more-itertools < 5.0.0

From d6040a20ec6d8c4ca73e2601b837b20fa4ecc860 Mon Sep 17 00:00:00 2001
From: Even Rouault <even.rouault@spatialys.com>
Date: Wed, 20 Feb 2019 21:32:32 +0100
Subject: [PATCH 222/488] netCDF: fix crash when opening a dataset with an
 attribute of length 0 (fixes #1303)

---
 autotest/gdrivers/data/empty_double_attr.nc | Bin 0 -> 1392 bytes
 autotest/gdrivers/netcdf.py                 |  12 +++++++++++-
 gdal/frmts/netcdf/netcdfdataset.cpp         |  10 ++++++++++
 3 files changed, 21 insertions(+), 1 deletion(-)
 create mode 100644 autotest/gdrivers/data/empty_double_attr.nc

diff --git a/autotest/gdrivers/data/empty_double_attr.nc b/autotest/gdrivers/data/empty_double_attr.nc
new file mode 100644
index 0000000000000000000000000000000000000000..c6aed89fc9a8500e58c632addd5c03223bf5b372
GIT binary patch
literal 1392
zcmbtU-D(p-6i&3Mw6#_1MWIp|@J6BCCJPap8@u_dLTyV-`~hW{>`v0DyE9>S5)!=e
zqTn-BM8T`RfqEhOG<xX^2zt(J+NPxi#etJElQ}=%`R1H0m8<DgvL->D14;Ljv)vDl
z_7`EB0hwJZd+XGzRXn;`qg$KzH|o|1?Z-UL8R)rkrPx@bl?Pk(r?kA;D6UtiSFhL5
za2$VNO_h}FacP8-F`m(Xyi{GvIe9#$#xM_P{6C9(;yQUJ8}Q!JZP(A=Y4W8&Xfs$O
znunalJRoj1x3Zjdm)$J*T-X+|QQB63F{+QjqRN|KMciD$T`9PE>ro&!dI_K#UQ(UG
zO~Rv&8PGs=n<1yn80|=ZkvNV+Zb2l#4l)LE)o3Q;9@jCa5!XJ0gm{k&`9e;ww6zFm
z#5x@z+f=fM<84ycS^f*5l5JtS0jH`(ePBtm5HpBCFq!xxkLhpESCdmJHQiz%zyKx;
zBpR{tuJ67Y8qFj&Qfae&U}WPA?@=v;%p9ifXtl$Ad?Tu~Xp7O@BR(Yd88FpiJ`eze
zod((Fx%>0i=Nlj1Vv9{+jVJh+Db*g5fVYGcnA2vsc8rUT7Ln!pkcpG{FU33(!1oR!
z=?mLi*2a5M|G2le_XeWQ3TQoiv=$U=xID(is#g17yN%aiXL}mj{vPZP=Hg&p@O{sN
zOvi@Ffa%~wEpsE>^{KCv4upgb1D8{4pYM|+BcfX5$RAx&nJ$oGt4VOBBm1|Vr^|4S
zvyvXpD`G_X7mS0y!8rIojL!g5rU-Q9U;_*J9pw|hFQ@f|{pJvKBpcnR$u&s=Owfjm
zMO*R!qYdB7=q{2x)ng$H9t>#Pa*l6>`F?{;(y9o<M=Z3K35G))qw_lSIcrYQ2fhQD
b5Om6$|Nbe_KlZI&fA@Z<zo3qHU%dPS&cZ1k

literal 0
HcmV?d00001

diff --git a/autotest/gdrivers/netcdf.py b/autotest/gdrivers/netcdf.py
index af8b50904c0c..1725ef0aa3c2 100755
--- a/autotest/gdrivers/netcdf.py
+++ b/autotest/gdrivers/netcdf.py
@@ -2815,7 +2815,17 @@ def test_netcdf_uffd():
     for netcdf_file in netcdf_files:
         assert uffd_compare(netcdf_file) is True
 
-    
+###############################################################################
+# Test opening a file with an empty double attribute
+# https://github.com/OSGeo/gdal/issues/1303
+
+def test_netcdf_open_empty_double_attr():
+
+    if gdaltest.netcdf_drv is None:
+        pytest.skip()
+
+    ds = gdal.Open('data/empty_double_attr.nc')
+    assert ds
 
 ###############################################################################
 
diff --git a/gdal/frmts/netcdf/netcdfdataset.cpp b/gdal/frmts/netcdf/netcdfdataset.cpp
index ac6955e8b3b9..61a39b71e321 100644
--- a/gdal/frmts/netcdf/netcdfdataset.cpp
+++ b/gdal/frmts/netcdf/netcdfdataset.cpp
@@ -9374,6 +9374,8 @@ static CPLErr NCDFGetAttr1( int nCdfId, int nVarId, const char *pszAttrName,
     CPLDebug("GDAL_netCDF", "NCDFGetAttr1(%s) len=%ld type=%d", pszAttrName,
              nAttrLen, nAttrType);
 #endif
+    if( nAttrLen == 0 && nAttrType != NC_CHAR )
+        return CE_Failure;
 
     /* Allocate guaranteed minimum size (use 10 or 20 if not a string) */
     size_t nAttrValueSize = nAttrLen + 1;
@@ -9692,6 +9694,14 @@ static CPLErr NCDFPutAttr( int nCdfId, int nVarId, const char *pszAttrName,
             nAttrType = nTmpAttrType;
     }
 
+#ifdef DEBUG
+    if( EQUAL(pszAttrName, "DEBUG_EMPTY_DOUBLE_ATTR" ) )
+    {
+        nAttrType = NC_DOUBLE;
+        nAttrLen = 0;
+    }
+#endif
+
     /* now write the data */
     if( nAttrType == NC_CHAR )
     {

From 4b091aee847a9c6b6dee7933c645b7ba5532b200 Mon Sep 17 00:00:00 2001
From: Even Rouault <even.rouault@spatialys.com>
Date: Wed, 20 Feb 2019 22:59:47 +0100
Subject: [PATCH 223/488] VSIGZipWriteHandleMT: avoid potential deadlock in
 case of error

---
 autotest/gcore/vsizip.py    | 19 ++++++++++++++++++-
 gdal/port/cpl_vsil_gzip.cpp | 15 +++++++++++----
 2 files changed, 29 insertions(+), 5 deletions(-)

diff --git a/autotest/gcore/vsizip.py b/autotest/gcore/vsizip.py
index 40085321e5ec..e1c9844a3f4c 100755
--- a/autotest/gcore/vsizip.py
+++ b/autotest/gcore/vsizip.py
@@ -544,7 +544,24 @@ def test_vsizip_multi_thread():
 
         pytest.fail()
 
-    
+###############################################################################
+# Test multithreaded compression, with I/O error
+
+
+def test_vsizip_multi_thread_error():
+
+    with gdaltest.error_handler():
+        with gdaltest.config_options({'GDAL_NUM_THREADS': 'ALL_CPUS',
+                                    'CPL_VSIL_DEFLATE_CHUNK_SIZE': '16K'}):
+            fmain = gdal.VSIFOpenL('/vsizip/{/vsimem/vsizip_multi_thread.zip||maxlength=1000}', 'wb')
+            f = gdal.VSIFOpenL('/vsizip/{/vsimem/vsizip_multi_thread.zip||maxlength=1000}/test', 'wb')
+            for i in range(100000):
+                gdal.VSIFWriteL('hello', 1, 5, f)
+            gdal.VSIFCloseL(f)
+            gdal.VSIFCloseL(fmain)
+
+    gdal.Unlink('/vsimem/vsizip_multi_thread.zip')
+
 ###############################################################################
 # Test multithreaded compression, below the threshold where it triggers
 
diff --git a/gdal/port/cpl_vsil_gzip.cpp b/gdal/port/cpl_vsil_gzip.cpp
index 411c98fd8475..0d97f45e9178 100644
--- a/gdal/port/cpl_vsil_gzip.cpp
+++ b/gdal/port/cpl_vsil_gzip.cpp
@@ -1207,6 +1207,7 @@ class VSIGZipWriteHandleMT final : public VSIVirtualHandle
     int                nSeqNumberExpected_ = 0;
     int                nSeqNumberExpectedCRC_ = 0;
     size_t             nChunkSize_ = 0;
+    bool               bHasErrored_ = false;
 
     struct Job
     {
@@ -1578,10 +1579,6 @@ bool VSIGZipWriteHandleMT::ProcessCompletedJobs()
                                           nToWrite) < nToWrite;
                 sMutex_.lock();
                 nSeqNumberExpected_ ++;
-                if( bError )
-                {
-                    return false;
-                }
 
                 if( nDeflateType_ != CPL_DEFLATE_TYPE_GZIP )
                 {
@@ -1591,6 +1588,11 @@ bool VSIGZipWriteHandleMT::ProcessCompletedJobs()
                     apoFreeJobs_.push_back(psJob);
                 }
 
+                if( bError )
+                {
+                    return false;
+                }
+
                 do_it_again = true;
                 break;
             }
@@ -1652,6 +1654,9 @@ size_t VSIGZipWriteHandleMT::Write( const void * const pBuffer,
                                     size_t const nSize, size_t const nMemb )
 
 {
+    if( bHasErrored_ )
+        return 0;
+
     const char* pszBuffer = static_cast<const char*>(pBuffer);
     size_t nBytesToWrite = nSize * nMemb;
     while( nBytesToWrite > 0 )
@@ -1675,6 +1680,7 @@ size_t VSIGZipWriteHandleMT::Write( const void * const pBuffer,
                 }
                 if( !ProcessCompletedJobs() )
                 {
+                    bHasErrored_ = true;
                     return 0;
                 }
             }
@@ -1693,6 +1699,7 @@ size_t VSIGZipWriteHandleMT::Write( const void * const pBuffer,
                 poPool_.reset(new CPLWorkerThreadPool());
                 if( !poPool_->Setup(nThreads_, nullptr, nullptr, false) )
                 {
+                    bHasErrored_ = true;
                     poPool_.reset();
                     return 0;
                 }

From f270701052d6294107dd2cf771daa5d8e298ce8b Mon Sep 17 00:00:00 2001
From: Matvei Stefarov <mstefarov@esri.com>
Date: Thu, 21 Feb 2019 18:48:32 -0800
Subject: [PATCH 224/488] GML: Add "FeatureType" to list of suffixes recognized
 by XSD parser

GML schemas produced by ArcGIS Server (e.g. in the context of WFS DescribeFeatureType response) use the suffix "FeatureType", instead of the more common "Type". This change allows the XSD parser to recognize and understand such schemas.
---
 gdal/ogr/ogrsf_frmts/gml/parsexsd.cpp | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/gdal/ogr/ogrsf_frmts/gml/parsexsd.cpp b/gdal/ogr/ogrsf_frmts/gml/parsexsd.cpp
index c6b9fc63fde7..a05cff8067ce 100644
--- a/gdal/ogr/ogrsf_frmts/gml/parsexsd.cpp
+++ b/gdal/ogr/ogrsf_frmts/gml/parsexsd.cpp
@@ -1048,7 +1048,8 @@ bool GMLParseXSD( const char *pszFile,
 
         else if( !EQUALN(pszType, pszName, strlen(pszName))
             || !(EQUAL(pszType + strlen(pszName), "_Type") ||
-                    EQUAL(pszType + strlen(pszName), "Type")) )
+                    EQUAL(pszType + strlen(pszName), "Type") ||
+                    EQUAL(pszType + strlen(pszName), "FeatureType")) )
         {
             continue;
         }

From 46fd0e1df4bfbdcc62ca63a3859800e8e429a5a4 Mon Sep 17 00:00:00 2001
From: Matvei Stefarov <mstefarov@esri.com>
Date: Thu, 21 Feb 2019 18:50:21 -0800
Subject: [PATCH 225/488] GML: Add test for understanding XSDs with
 "FeatureType" suffix

---
 autotest/ogr/data/arcgis-world-wfs.gml | 13 +++++++++++++
 autotest/ogr/data/arcgis-world-wfs.xsd | 19 +++++++++++++++++++
 autotest/ogr/ogr_gml_read.py           | 19 +++++++++++++++++++
 3 files changed, 51 insertions(+)
 create mode 100644 autotest/ogr/data/arcgis-world-wfs.gml
 create mode 100644 autotest/ogr/data/arcgis-world-wfs.xsd

diff --git a/autotest/ogr/data/arcgis-world-wfs.gml b/autotest/ogr/data/arcgis-world-wfs.gml
new file mode 100644
index 000000000000..8f24de28a77b
--- /dev/null
+++ b/autotest/ogr/data/arcgis-world-wfs.gml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<!-- https://sampleserver6.arcgisonline.com/arcgis/services/SampleWorldCities/MapServer/WFSServer?service=WFS&version=2.0.0&request=GetFeature&typename=esri:World&count=1 -->
+<wfs:FeatureCollection xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:wfs="http://www.opengis.net/wfs/2.0" xmlns:gml="http://www.opengis.net/gml/3.2" xmlns:esri="http://www.esri.com" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" timeStamp="2019-02-22T02:10:44Z" numberMatched="unknown" numberReturned="1" xsi:schemaLocation="http://www.opengis.net/wfs/2.0 http://schemas.opengis.net/wfs/2.0/wfs.xsd http://www.opengis.net/gml/3.2 http://schemas.opengis.net/gml/3.2.1/gml.xsd http://www.esri.com https://sampleserver6.arcgisonline.com:443/arcgis/services/SampleWorldCities/MapServer/WFSServer?service=wfs%26version=2.0.0%26request=DescribeFeatureType">
+  <wfs:member>
+    <esri:World gml:id="World.1">
+      <esri:OBJECTID>1</esri:OBJECTID>
+      <esri:Shape><gml:MultiSurface gml:id="World.1.pl" srsName="urn:ogc:def:crs:EPSG::4326"><gml:surfaceMember><gml:Polygon gml:id="World.1.pl.0" srsName="urn:ogc:def:crs:EPSG::4326"><gml:exterior><gml:LinearRing><gml:posList>60.0001220703125 -180 61.0001220703125 -180 62.0001220703125 -180 63.0001220703125 -180 64.0001220703125 -180 65.0001220703125 -180 66.0001220703125 -180 67.0001220703125 -180 68.0001220703125 -180 69.0001220703125 -180 70.0001220703125 -180 71.0001220703125 -180 72.0001220703125 -180 73.0001220703125 -180 74.0001220703125 -180 75.0001220703125 -180 76.0001220703125 -180 77.0001220703125 -180 78.0001220703125 -180 79.0001220703125 -180 80.0001220703125 -180 81.0001220703125 -180 82.0001220703125 -180 83.0001220703125 -180 84.0001220703125 -180 85.0001220703125 -180 86.0001220703125 -180 87.0001220703125 -180 88.0001220703125 -180 89.0001220703125 -180 90.0001220703125 -180 90.0001220703125 -179 90.0001220703125 -178 90.0001220703125 -177 90.0001220703125 -176 90.0001220703125 -175 90.0001220703125 -174 90.0001220703125 -173 90.0001220703125 -172 90.0001220703125 -171 90.0001220703125 -170 90.0001220703125 -169 90.0001220703125 -168 90.0001220703125 -167 90.0001220703125 -166 90.0001220703125 -165 90.0001220703125 -164 90.0001220703125 -163 90.0001220703125 -162 90.0001220703125 -161 90.0001220703125 -160 90.0001220703125 -159 90.0001220703125 -158 90.0001220703125 -157 90.0001220703125 -156 90.0001220703125 -155 90.0001220703125 -154 90.0001220703125 -153 90.0001220703125 -152 90.0001220703125 -151 90.0001220703125 -150 89.0001220703125 -150 88.0001220703125 -150 87.0001220703125 -150 86.0001220703125 -150 85.0001220703125 -150 84.0001220703125 -150 83.0001220703125 -150 82.0001220703125 -150 81.0001220703125 -150 80.0001220703125 -150 79.0001220703125 -150 78.0001220703125 -150 77.0001220703125 -150 76.0001220703125 -150 75.0001220703125 -150 74.0001220703125 -150 73.0001220703125 -150 72.0001220703125 -150 71.0001220703125 -150 70.0001220703125 -150 69.0001220703125 -150 68.0001220703125 -150 67.0001220703125 -150 66.0001220703125 -150 65.0001220703125 -150 64.0001220703125 -150 63.0001220703125 -150 62.0001220703125 -150 61.0001220703125 -150 60.0001220703125 -150 60.0001220703125 -151 60.0001220703125 -152 60.0001220703125 -153 60.0001220703125 -154 60.0001220703125 -155 60.0001220703125 -156 60.0001220703125 -157 60.0001220703125 -158 60.0001220703125 -159 60.0001220703125 -160 60.0001220703125 -161 60.0001220703125 -162 60.0001220703125 -163 60.0001220703125 -164 60.0001220703125 -165 60.0001220703125 -166 60.0001220703125 -167 60.0001220703125 -168 60.0001220703125 -169 60.0001220703125 -170 60.0001220703125 -171 60.0001220703125 -172 60.0001220703125 -173 60.0001220703125 -174 60.0001220703125 -175 60.0001220703125 -176 60.0001220703125 -177 60.0001220703125 -178 60.0001220703125 -179 60.0001220703125 -180</gml:posList></gml:LinearRing></gml:exterior></gml:Polygon></gml:surfaceMember></gml:MultiSurface></esri:Shape>
+      <esri:WRLD30_ID>1</esri:WRLD30_ID>
+      <esri:Shape_Length>120</esri:Shape_Length>
+      <esri:Shape_Area>900</esri:Shape_Area>
+    </esri:World>
+  </wfs:member>
+</wfs:FeatureCollection>
\ No newline at end of file
diff --git a/autotest/ogr/data/arcgis-world-wfs.xsd b/autotest/ogr/data/arcgis-world-wfs.xsd
new file mode 100644
index 000000000000..c1a3403cd953
--- /dev/null
+++ b/autotest/ogr/data/arcgis-world-wfs.xsd
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<!-- https://sampleserver6.arcgisonline.com/arcgis/services/SampleWorldCities/MapServer/WFSServer?service=WFS&version=2.0.0&request=DescribeFeatureType&typename=esri:World -->
+<xsd:schema xmlns:esri="http://www.esri.com" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:gml="http://www.opengis.net/gml/3.2" targetNamespace="http://www.esri.com" elementFormDefault="qualified" attributeFormDefault="unqualified">
+<xsd:import namespace="http://www.opengis.net/gml/3.2" schemaLocation="http://schemas.opengis.net/gml/3.2.1/gml.xsd"/>
+<xsd:element name="World" type="esri:WorldFeatureType" substitutionGroup="gml:AbstractFeature"/>
+<xsd:complexType name="WorldFeatureType">
+  <xsd:complexContent>
+    <xsd:extension base="gml:AbstractFeatureType">
+      <xsd:sequence>
+        <xsd:element minOccurs="0" maxOccurs="1" name="OBJECTID" type="xsd:int"/>
+        <xsd:element minOccurs="0" maxOccurs="1" name="Shape" nillable="true" type="gml:MultiSurfacePropertyType"/>
+        <xsd:element minOccurs="0" maxOccurs="1" name="WRLD30_ID" nillable="true" type="xsd:double"/>
+        <xsd:element minOccurs="0" maxOccurs="1" name="Shape_Length" nillable="true" type="xsd:double"/>
+        <xsd:element minOccurs="0" maxOccurs="1" name="Shape_Area" nillable="true" type="xsd:double"/>
+      </xsd:sequence>
+    </xsd:extension>
+  </xsd:complexContent>
+</xsd:complexType>
+</xsd:schema>
diff --git a/autotest/ogr/ogr_gml_read.py b/autotest/ogr/ogr_gml_read.py
index 05556f068861..9bae9f3d6e8a 100755
--- a/autotest/ogr/ogr_gml_read.py
+++ b/autotest/ogr/ogr_gml_read.py
@@ -3574,6 +3574,25 @@ def test_ogr_gml_srsname_only_on_top_bounded_by():
     gdal.Unlink(tmpname)
     gdal.Unlink(tmpname[0:-3] + "gfs")
 
+###############################################################################
+# Test understanding of XSD that uses 'FeatureType' suffix instead of 'Type'.
+# If schema was understood, fields 2/3/4 will be 'Real' rather than 'Integer'.
+
+def test_ogr_gml_featuretype_suffix_in_xsd():
+
+    if not gdaltest.have_gml_reader:
+        pytest.skip()
+
+    gdal.Unlink('data/arcgis-world-wfs.gfs')
+    
+    ds = ogr.Open('data/arcgis-world-wfs.gml,xsd=data/arcgis-world-wfs.xsd')
+    lyr = ds.GetLayer(0)
+    
+    for i in range(2, 4):
+      assert lyr.GetLayerDefn().GetFieldDefn(i).GetType() == ogr.OFTReal
+    
+    gdal.Unlink('data/arcgis-world-wfs.gfs')
+
 ###############################################################################
 #  Cleanup
 

From a2204c9540041a373d26d7419a0865260405a387 Mon Sep 17 00:00:00 2001
From: Even Rouault <even.rouault@spatialys.com>
Date: Fri, 22 Feb 2019 18:45:11 +0100
Subject: [PATCH 226/488] MITAB: adapt dynamically default projection bounds to
 false_easting/false_northing values (fixes #1316)

---
 gdal/ogr/ogrsf_frmts/mitab/drv_mitab.html           | 2 +-
 gdal/ogr/ogrsf_frmts/mitab/mitab_ogr_datasource.cpp | 9 +++++++--
 2 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/gdal/ogr/ogrsf_frmts/mitab/drv_mitab.html b/gdal/ogr/ogrsf_frmts/mitab/drv_mitab.html
index 19facf532f83..090c98844df7 100644
--- a/gdal/ogr/ogrsf_frmts/mitab/drv_mitab.html
+++ b/gdal/ogr/ogrsf_frmts/mitab/drv_mitab.html
@@ -56,7 +56,7 @@ <h2>Creation Issues</h2>
 </p>
 <ul>
   <li>For a file in LAT/LON (geographic) coordinates: BOUNDS (-180, -90) (180, 90)</li>
-  <li>For any other projection: BOUNDS (-30000000, -15000000) (30000000, 15000000)</li>
+  <li>For any other projection: BOUNDS (-30000000 + false_easting, -15000000 + false_northing) (30000000 + false_easting, 15000000 + false_northing)</li>
 </ul>
 
 <p>
diff --git a/gdal/ogr/ogrsf_frmts/mitab/mitab_ogr_datasource.cpp b/gdal/ogr/ogrsf_frmts/mitab/mitab_ogr_datasource.cpp
index b8831829abc4..90f9b99bc16d 100644
--- a/gdal/ogr/ogrsf_frmts/mitab/mitab_ogr_datasource.cpp
+++ b/gdal/ogr/ogrsf_frmts/mitab/mitab_ogr_datasource.cpp
@@ -414,9 +414,14 @@ OGRTABDataSource::ICreateLayer( const char *pszLayerName,
 
     if( !poFile->IsBoundsSet() && !m_bCreateMIF )
     {
-        if( poSRSIn != nullptr && poSRSIn->GetRoot() != nullptr &&
-            EQUAL(poSRSIn->GetRoot()->GetValue(),"GEOGCS") )
+        if( poSRSIn != nullptr && poSRSIn->IsGeographic() )
             poFile->SetBounds(-1000, -1000, 1000, 1000);
+        else if( poSRSIn != nullptr && poSRSIn->IsProjected() )
+        {
+            const double FE = poSRSIn->GetProjParm( SRS_PP_FALSE_EASTING, 0.0 );
+            const double FN = poSRSIn->GetProjParm( SRS_PP_FALSE_NORTHING, 0.0 );
+            poFile->SetBounds(-30000000 + FE, -15000000 + FN, 30000000 + FE, 15000000 + FN);
+        }
         else
             poFile->SetBounds(-30000000, -15000000, 30000000, 15000000);
     }

From 5abc994c483b7f6fd5bcd234fc2691e79a1659df Mon Sep 17 00:00:00 2001
From: Matvei Stefarov <mstefarov@esri.com>
Date: Sun, 24 Feb 2019 00:46:55 -0800
Subject: [PATCH 227/488] GML: Fix assertion in CPLGetValueType when testing
 non-ASCII chars

*pszValue is a signed char, which becomes negative for non-ASCII characters. This behavior can be triggered when a string starts with a non-ASCII character, optionally preceded by space or digits. Casting pszValue to "unsigned char" avoids the problem.
---
 gdal/port/cpl_string.cpp | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/gdal/port/cpl_string.cpp b/gdal/port/cpl_string.cpp
index f57f3f392933..f9ac6bd4b9b0 100644
--- a/gdal/port/cpl_string.cpp
+++ b/gdal/port/cpl_string.cpp
@@ -2581,7 +2581,7 @@ CPLValueType CPLGetValueType( const char* pszValue )
     const char* pszValueInit = pszValue;
 
     // Skip leading spaces.
-    while( isspace( *pszValue ) )
+    while( isspace(static_cast<unsigned char>( *pszValue )) )
         ++pszValue;
 
     if( *pszValue == '\0' )
@@ -2600,15 +2600,15 @@ CPLValueType CPLGetValueType( const char* pszValue )
 
     for( ; *pszValue != '\0'; ++pszValue )
     {
-        if( isdigit( *pszValue))
+        if( isdigit(static_cast<unsigned char>( *pszValue )) )
         {
             bIsLastCharExponent = false;
             bFoundMantissa = true;
         }
-        else if( isspace( *pszValue ) )
+        else if( isspace(static_cast<unsigned char>( *pszValue )) )
         {
             const char* pszTmp = pszValue;
-            while( isspace( *pszTmp ) )
+            while( isspace(static_cast<unsigned char>( *pszTmp )) )
                 ++pszTmp;
             if( *pszTmp == 0 )
                 break;

From 4d4e33ba2f01d083c06aadf59934e6cb57c4a1fc Mon Sep 17 00:00:00 2001
From: Even Rouault <even.rouault@spatialys.com>
Date: Mon, 25 Feb 2019 12:00:47 +0100
Subject: [PATCH 228/488] JPEG: fix GDAL 2.3.0 performance regression when
 decoding JPEG (or GPKG using JPEG) images (fixes #1324)

---
 gdal/frmts/jpeg/jpgdataset.cpp | 60 ++++++++++++++++------------------
 gdal/frmts/jpeg/jpgdataset.h   | 21 +++++++-----
 2 files changed, 41 insertions(+), 40 deletions(-)

diff --git a/gdal/frmts/jpeg/jpgdataset.cpp b/gdal/frmts/jpeg/jpgdataset.cpp
index e6c16760a0e7..89fe82308a84 100644
--- a/gdal/frmts/jpeg/jpgdataset.cpp
+++ b/gdal/frmts/jpeg/jpgdataset.cpp
@@ -1345,9 +1345,9 @@ JPGDataset::~JPGDataset()
 
 bool JPGDataset::ErrorOutOnNonFatalError()
 {
-    if( sErrorStruct.bNonFatalErrorEncountered )
+    if( sUserData.bNonFatalErrorEncountered )
     {
-        sErrorStruct.bNonFatalErrorEncountered = false;
+        sUserData.bNonFatalErrorEncountered = false;
         return true;
     }
     return false;
@@ -1364,7 +1364,7 @@ CPLErr JPGDataset::LoadScanline( int iLine, GByte* outBuffer )
         return CE_None;
 
     // setup to trap a fatal error.
-    if (setjmp(sErrorStruct.setjmp_buffer))
+    if (setjmp(sUserData.setjmp_buffer))
         return CE_Failure;
 
     if (!bHasDoneJpegStartDecompress)
@@ -1661,7 +1661,7 @@ CPLErr JPGDataset::Restart()
 
 {
     // Setup to trap a fatal error.
-    if (setjmp(sErrorStruct.setjmp_buffer))
+    if (setjmp(sUserData.setjmp_buffer))
         return CE_Failure;
 
     J_COLOR_SPACE colorSpace = sDInfo.out_color_space;
@@ -2042,7 +2042,7 @@ GDALDataset *JPGDataset::OpenStage2( JPGDatasetOpenArgs *psArgs,
                                      JPGDataset *&poDS )
 {
     // Will detect mismatch between compile-time and run-time libjpeg versions.
-    if (setjmp(poDS->sErrorStruct.setjmp_buffer))
+    if (setjmp(poDS->sUserData.setjmp_buffer))
     {
 #if defined(JPEG_DUAL_MODE_8_12) && !defined(JPGDataset)
         if (poDS->sDInfo.data_precision == 12 && poDS->fpImage != nullptr)
@@ -2169,9 +2169,9 @@ GDALDataset *JPGDataset::OpenStage2( JPGDatasetOpenArgs *psArgs,
 
     poDS->sDInfo.err = jpeg_std_error(&poDS->sJErr);
     poDS->sJErr.error_exit = JPGDataset::ErrorExit;
-    poDS->sErrorStruct.p_previous_emit_message = poDS->sJErr.emit_message;
+    poDS->sUserData.p_previous_emit_message = poDS->sJErr.emit_message;
     poDS->sJErr.emit_message = JPGDataset::EmitMessage;
-    poDS->sDInfo.client_data = &poDS->sErrorStruct;
+    poDS->sDInfo.client_data = &poDS->sUserData;
 
     jpeg_create_decompress(&poDS->sDInfo);
     poDS->bHasDoneJpegCreateDecompress = true;
@@ -2562,8 +2562,8 @@ void JPGDatasetCommon::DecompressMask()
 
 void JPGDataset::ErrorExit(j_common_ptr cinfo)
 {
-    GDALJPEGErrorStruct *psErrorStruct =
-        static_cast<GDALJPEGErrorStruct *>(cinfo->client_data);
+    GDALJPEGUserData *psUserData =
+        static_cast<GDALJPEGUserData *>(cinfo->client_data);
     char buffer[JMSG_LENGTH_MAX] = {};
 
     // Create the message.
@@ -2578,7 +2578,7 @@ void JPGDataset::ErrorExit(j_common_ptr cinfo)
     CPLError(CE_Failure, CPLE_AppDefined, "libjpeg: %s", buffer);
 
     // Return control to the setjmp point.
-    longjmp(psErrorStruct->setjmp_buffer, 1);
+    longjmp(psUserData->setjmp_buffer, 1);
 }
 
 /************************************************************************/
@@ -2587,12 +2587,12 @@ void JPGDataset::ErrorExit(j_common_ptr cinfo)
 
 void JPGDataset::EmitMessage(j_common_ptr cinfo, int msg_level)
 {
-    GDALJPEGErrorStruct *psErrorStruct =
-        static_cast<GDALJPEGErrorStruct *>(cinfo->client_data);
+    GDALJPEGUserData *psUserData =
+        static_cast<GDALJPEGUserData *>(cinfo->client_data);
     if( msg_level >= 0 )  // Trace message.
     {
-        if( psErrorStruct->p_previous_emit_message != nullptr )
-            psErrorStruct->p_previous_emit_message(cinfo, msg_level);
+        if( psUserData->p_previous_emit_message != nullptr )
+            psUserData->p_previous_emit_message(cinfo, msg_level);
     }
     else
     {
@@ -2614,7 +2614,7 @@ void JPGDataset::EmitMessage(j_common_ptr cinfo, int msg_level)
             if( CPLTestBool(
                    CPLGetConfigOption("GDAL_ERROR_ON_LIBJPEG_WARNING", "NO")) )
             {
-                psErrorStruct->bNonFatalErrorEncountered = true;
+                psUserData->bNonFatalErrorEncountered = true;
                 CPLError(CE_Failure, CPLE_AppDefined, "libjpeg: %s", buffer);
             }
             else
@@ -2643,20 +2643,18 @@ void JPGDataset::ProgressMonitor(j_common_ptr cinfo)
 {
     if (cinfo->is_decompressor)
     {
+        GDALJPEGUserData *psUserData =
+            static_cast<GDALJPEGUserData *>(cinfo->client_data);
         const int scan_no =
             reinterpret_cast<j_decompress_ptr>(cinfo)->input_scan_number;
-        const int MAX_SCANS = atoi(
-            CPLGetConfigOption("GDAL_JPEG_MAX_ALLOWED_SCAN_NUMBER", "100"));
-        if (scan_no >= MAX_SCANS)
+        if (scan_no >= psUserData->nMaxScans)
         {
             CPLError(CE_Failure, CPLE_AppDefined,
                      "Scan number %d exceeds maximum scans (%d)",
-                     scan_no, MAX_SCANS);
+                     scan_no, psUserData->nMaxScans);
 
-            GDALJPEGErrorStruct *psErrorStruct =
-                static_cast<GDALJPEGErrorStruct *>(cinfo->client_data);
             // Return control to the setjmp point.
-            longjmp(psErrorStruct->setjmp_buffer, 1);
+            longjmp(psUserData->setjmp_buffer, 1);
         }
     }
 }
@@ -3042,8 +3040,8 @@ JPGDataset::CreateCopy( const char *pszFilename, GDALDataset *poSrcDS,
     }
 
     VSILFILE *fpImage = nullptr;
-    GDALJPEGErrorStruct sErrorStruct;
-    sErrorStruct.bNonFatalErrorEncountered = false;
+    GDALJPEGUserData sUserData;
+    sUserData.bNonFatalErrorEncountered = false;
     GDALDataType eDT = poSrcDS->GetRasterBand(1)->GetRasterDataType();
 
 #if defined(JPEG_LIB_MK1_OR_12BIT) || defined(JPEG_DUAL_MODE_8_12)
@@ -3131,7 +3129,7 @@ JPGDataset::CreateCopy( const char *pszFilename, GDALDataset *poSrcDS,
                             pfnProgress, pProgressData,
                             fpImage, eDT, nQuality,
                             bAppendMask,
-                            sErrorStruct, sCInfo, sJErr, pabyScanline);
+                            sUserData, sCInfo, sJErr, pabyScanline);
 }
 
 GDALDataset *
@@ -3143,13 +3141,13 @@ JPGDataset::CreateCopyStage2( const char *pszFilename, GDALDataset *poSrcDS,
                               GDALDataType eDT,
                               int nQuality,
                               bool bAppendMask,
-                              GDALJPEGErrorStruct &sErrorStruct,
+                              GDALJPEGUserData &sUserData,
                               struct jpeg_compress_struct &sCInfo,
                               struct jpeg_error_mgr &sJErr,
                               GByte *&pabyScanline)
 
 {
-    if (setjmp(sErrorStruct.setjmp_buffer))
+    if (setjmp(sUserData.setjmp_buffer))
     {
         if( fpImage )
             VSIFCloseL(fpImage);
@@ -3159,12 +3157,12 @@ JPGDataset::CreateCopyStage2( const char *pszFilename, GDALDataset *poSrcDS,
     // Initialize JPG access to the file.
     sCInfo.err = jpeg_std_error(&sJErr);
     sJErr.error_exit = JPGDataset::ErrorExit;
-    sErrorStruct.p_previous_emit_message = sJErr.emit_message;
+    sUserData.p_previous_emit_message = sJErr.emit_message;
     sJErr.emit_message = JPGDataset::EmitMessage;
-    sCInfo.client_data = &sErrorStruct;
+    sCInfo.client_data = &sUserData;
 
     jpeg_create_compress(&sCInfo);
-    if (setjmp(sErrorStruct.setjmp_buffer))
+    if (setjmp(sUserData.setjmp_buffer))
     {
         if( fpImage )
             VSIFCloseL(fpImage);
@@ -3294,7 +3292,7 @@ JPGDataset::CreateCopyStage2( const char *pszFilename, GDALDataset *poSrcDS,
     pabyScanline =
         static_cast<GByte *>(CPLMalloc(nBands * nXSize * nWorkDTSize));
 
-    if (setjmp(sErrorStruct.setjmp_buffer))
+    if (setjmp(sUserData.setjmp_buffer))
     {
         VSIFCloseL(fpImage);
         CPLFree(pabyScanline);
diff --git a/gdal/frmts/jpeg/jpgdataset.h b/gdal/frmts/jpeg/jpgdataset.h
index 60cb87c34d6e..0bad7e926025 100644
--- a/gdal/frmts/jpeg/jpgdataset.h
+++ b/gdal/frmts/jpeg/jpgdataset.h
@@ -133,18 +133,21 @@ void JPGAddICCProfile( void *pInfo,
                        my_jpeg_write_m_header p_jpeg_write_m_header,
                        my_jpeg_write_m_byte p_jpeg_write_m_byte);
 
-typedef struct GDALJPEGErrorStruct
+class GDALJPEGUserData
 {
+public:
     jmp_buf     setjmp_buffer;
-    bool        bNonFatalErrorEncountered;
-    void      (*p_previous_emit_message)(j_common_ptr cinfo, int msg_level);
-    GDALJPEGErrorStruct() :
-        bNonFatalErrorEncountered(false),
-        p_previous_emit_message(nullptr)
+    bool        bNonFatalErrorEncountered = false;
+    void      (*p_previous_emit_message)(j_common_ptr cinfo, int msg_level) = nullptr;
+    int         nMaxScans;
+
+    GDALJPEGUserData() :
+        nMaxScans(atoi(
+            CPLGetConfigOption("GDAL_JPEG_MAX_ALLOWED_SCAN_NUMBER", "100")))
     {
         memset(&setjmp_buffer, 0, sizeof(setjmp_buffer));
     }
-} GDALJPEGErrorStruct;
+};
 
 /************************************************************************/
 /* ==================================================================== */
@@ -271,7 +274,7 @@ class JPGDatasetCommon : public GDALPamDataset
 
 class JPGDataset final: public JPGDatasetCommon
 {
-    GDALJPEGErrorStruct sErrorStruct;
+    GDALJPEGUserData sUserData;
 
     bool ErrorOutOnNonFatalError();
 
@@ -310,7 +313,7 @@ class JPGDataset final: public JPGDatasetCommon
         const char *pszFilename, GDALDataset *poSrcDS, char **papszOptions,
         GDALProgressFunc pfnProgress, void *pProgressData, VSILFILE *fpImage,
         GDALDataType eDT, int nQuality, bool bAppendMask,
-        GDALJPEGErrorStruct &sErrorStruct, struct jpeg_compress_struct &sCInfo,
+        GDALJPEGUserData &sUserData, struct jpeg_compress_struct &sCInfo,
         struct jpeg_error_mgr &sJErr, GByte *&pabyScanline);
     static void ErrorExit(j_common_ptr cinfo);
 };

From ea4800d376d2a48784a05bc8c252929dcaf83af9 Mon Sep 17 00:00:00 2001
From: Even Rouault <even.rouault@spatialys.com>
Date: Tue, 26 Feb 2019 15:48:51 +0100
Subject: [PATCH 229/488] OGRGeometryFactory::GetCurveParmeters(): fix
 assertion when coordinates are very near 0 (relates to
 https://bugs.chromium.org/p/oss-fuzz/issues/detail?id=13408)

---
 gdal/ogr/ogrgeometryfactory.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/gdal/ogr/ogrgeometryfactory.cpp b/gdal/ogr/ogrgeometryfactory.cpp
index 8cfa48ee7d7b..a1e5efb8b5e1 100644
--- a/gdal/ogr/ogrgeometryfactory.cpp
+++ b/gdal/ogr/ogrgeometryfactory.cpp
@@ -4633,7 +4633,7 @@ int OGRGeometryFactory::GetCurveParmeters(
     dy12 *= dfInvScale;
 
     const double det = dx01 * dy12 - dx12 * dy01;
-    if( fabs(det) < 1.0e-8 )
+    if( fabs(det) < 1.0e-8 || CPLIsNan(det) )
     {
         return FALSE;
     }

From afbb4e33ff21a13912f2e04fcf837da9f49a2aa9 Mon Sep 17 00:00:00 2001
From: Even Rouault <even.rouault@spatialys.com>
Date: Tue, 26 Feb 2019 15:49:49 +0100
Subject: [PATCH 230/488] PDF: avoid division by zero when generating from
 vector content whose bounding box is almost a horizontal or vertical line.
 Fixes https://bugs.chromium.org/p/oss-fuzz/issues/detail?id=13408. Credit to
 OSS Fuzz

---
 gdal/frmts/pdf/pdfwritabledataset.cpp | 16 ++++++++++++++--
 1 file changed, 14 insertions(+), 2 deletions(-)

diff --git a/gdal/frmts/pdf/pdfwritabledataset.cpp b/gdal/frmts/pdf/pdfwritabledataset.cpp
index 1820dfbc5274..b0faa6596876 100644
--- a/gdal/frmts/pdf/pdfwritabledataset.cpp
+++ b/gdal/frmts/pdf/pdfwritabledataset.cpp
@@ -268,12 +268,24 @@ OGRErr PDFWritableVectorDataset::SyncToDisk()
     if (dfRatio < 1)
     {
         nWidth = 1024;
-        nHeight = static_cast<int>(nWidth * dfRatio);
+        const double dfHeight = nWidth * dfRatio;
+        if( dfHeight < 1 || dfHeight > INT_MAX || CPLIsNan(dfHeight) )
+        {
+            CPLError(CE_Failure, CPLE_AppDefined, "Invalid image dimensions");
+            return OGRERR_FAILURE;
+        }
+        nHeight = static_cast<int>(dfHeight);
     }
     else
     {
         nHeight = 1024;
-        nWidth = static_cast<int>(nHeight / dfRatio);
+        const double dfWidth = nHeight / dfRatio;
+        if( dfWidth < 1 || dfWidth > INT_MAX || CPLIsNan(dfWidth) )
+        {
+            CPLError(CE_Failure, CPLE_AppDefined, "Invalid image dimensions");
+            return OGRERR_FAILURE;
+        }
+        nWidth = static_cast<int>(dfWidth);
     }
 
     GDALDataset* poSrcDS = MEMDataset::Create( "MEM:::", nWidth, nHeight, 0, GDT_Byte, nullptr );

From 83ccdc0d761c2c3bdb40f7c726958b7cb43944cb Mon Sep 17 00:00:00 2001
From: DanielEvans <Daniel.Evans@jbarisk.com>
Date: Fri, 22 Feb 2019 12:37:35 +0000
Subject: [PATCH 231/488] Use nodata value from origin dataset in
 gdal_retile.py

---
 autotest/pymod/__init__.py              |  0
 autotest/pyscripts/test_gdal_retile.py  | 69 +++++++++++++++++++++++--
 gdal/swig/python/scripts/gdal_retile.py | 19 +++++--
 3 files changed, 80 insertions(+), 8 deletions(-)
 create mode 100644 autotest/pymod/__init__.py

diff --git a/autotest/pymod/__init__.py b/autotest/pymod/__init__.py
new file mode 100644
index 000000000000..e69de29bb2d1
diff --git a/autotest/pyscripts/test_gdal_retile.py b/autotest/pyscripts/test_gdal_retile.py
index afd948705b94..adc1cebc6246 100755
--- a/autotest/pyscripts/test_gdal_retile.py
+++ b/autotest/pyscripts/test_gdal_retile.py
@@ -31,7 +31,6 @@
 import shutil
 import os
 
-
 from osgeo import gdal
 from osgeo import osr
 import test_py_scripts
@@ -241,7 +240,66 @@ def test_gdal_retile_4():
         assert ds.RasterYSize == height, filename
         ds = None
 
-    
+
+###############################################################################
+# Test gdal_retile.py with input having a NoData value
+
+
+def test_gdal_retile_5():
+
+    try:
+        from osgeo import gdalnumeric
+        gdalnumeric.zeros
+        import numpy as np
+    except (ImportError, AttributeError):
+        pytest.skip()
+
+    nodata_value = -3.4028234663852886e+38
+    raster_array = np.array(([0.0, 2.0], [-1.0, nodata_value]))
+
+    script_path = test_py_scripts.get_py_script('gdal_retile')
+    if script_path is None:
+        pytest.skip()
+
+    drv = gdal.GetDriverByName('GTiff')
+    srs = osr.SpatialReference()
+    srs.SetWellKnownGeogCS('WGS84')
+    wkt = srs.ExportToWkt()
+
+    ds = drv.Create('tmp/in5.tif', 2, 2, 1, gdal.GDT_Float32)
+    px1_x = 0.1 / ds.RasterXSize
+    px1_y = 0.1 / ds.RasterYSize
+    ds.SetProjection(wkt)
+    ds.SetGeoTransform([0, px1_x, 0, 30, 0, -px1_y])
+    raster_band = ds.GetRasterBand(1)
+    raster_band.SetNoDataValue(nodata_value)
+    raster_band.WriteArray(raster_array)
+    raster_band = None
+    ds = None
+
+    try:
+        os.mkdir('tmp/outretile5')
+    except OSError:
+        pass
+
+    test_py_scripts.run_py_script(script_path, 'gdal_retile', '-v -targetDir tmp/outretile5 tmp/in5.tif')
+
+    ds = gdal.Open('tmp/outretile5/in5_1_1.tif')
+    raster_band = ds.GetRasterBand(1)
+
+    assert raster_band.GetNoDataValue() == nodata_value, \
+        ('Wrong nodata value.\nExpected %f, Got: %f' % (nodata_value, raster_band.GetNoDataValue()))
+
+    min_val, max_val = raster_band.ComputeRasterMinMax()
+    assert max_val, \
+        ('Wrong maximum value.\nExpected 2.0, Got: %f' % max_val)
+
+    assert min_val == -1.0, \
+        ('Wrong minimum value.\nExpected -1.0, Got: %f' % min_val)
+
+    ds = None
+
+
 ###############################################################################
 # Cleanup
 
@@ -267,7 +325,8 @@ def test_gdal_retile_cleanup():
            'tmp/outretile3/1',
            'tmp/outretile3/2',
            'tmp/outretile3/in1_1_1.tif',
-           'tmp/outretile3']
+           'tmp/outretile3',
+           'tmp/in5.tif']
     for filename in lst:
         try:
             os.remove(filename)
@@ -279,6 +338,6 @@ def test_gdal_retile_cleanup():
 
     shutil.rmtree('tmp/outretile4')
 
-
-
+    if os.path.exists('tmp/outretile5'):
+        shutil.rmtree('tmp/outretile5')
 
diff --git a/gdal/swig/python/scripts/gdal_retile.py b/gdal/swig/python/scripts/gdal_retile.py
index 9ff131583797..d2b8091dbd99 100755
--- a/gdal/swig/python/scripts/gdal_retile.py
+++ b/gdal/swig/python/scripts/gdal_retile.py
@@ -148,6 +148,7 @@ def __init__(self, filename, inputDS):
         self.bands = fhInputTile.RasterCount
         self.band_type = fhInputTile.GetRasterBand(1).DataType
         self.projection = fhInputTile.GetProjection()
+        self.nodata = fhInputTile.GetRasterBand(1).GetNoDataValue()
 
         dec = AffineTransformDecorator(fhInputTile.GetGeoTransform())
         self.scaleX = dec.scaleX
@@ -209,6 +210,12 @@ def getDataSet(self, minx, miny, maxx, maxy):
         resultDS = self.TempDriver.Create("TEMP", resultSizeX, resultSizeY, self.bands, self.band_type, [])
         resultDS.SetGeoTransform([minx, self.scaleX, 0, maxy, 0, self.scaleY])
 
+        for bandNr in range(1, self.bands + 1):
+            t_band = resultDS.GetRasterBand(bandNr)
+            if self.nodata is not None:
+                t_band.Fill(self.nodata)
+                t_band.SetNoDataValue(self.nodata)
+
         for feature in features:
             featureName = feature.GetField(0)
             sourceDS = self.cache.get(featureName)
@@ -240,8 +247,6 @@ def getDataSet(self, minx, miny, maxx, maxy):
             tw_yoff = int((tgw_uly - maxy) / self.scaleY + 0.5)
             tw_xsize = min(resultDS.RasterXSize, int((tgw_lrx - minx) / self.scaleX + 0.5)) - tw_xoff
             tw_ysize = min(resultDS.RasterYSize, int((tgw_lry - maxy) / self.scaleY + 0.5)) - tw_yoff
-            # print(sw_xoff, sw_yoff, sw_xsize, sw_ysize, sourceDS.RasterXSize, sourceDS.RasterYSize)
-            # print(tw_xoff, tw_yoff, tw_xsize, tw_ysize, resultDS.RasterXSize, resultDS.RasterYSize)
             if tw_xsize <= 0 or tw_ysize <= 0:
                 continue
 
@@ -456,6 +461,12 @@ def createPyramidTile(levelMosaicInfo, offsetX, offsetY, width, height, tileName
             t_band.SetRasterColorTable(levelMosaicInfo.ct)
         t_band.SetRasterColorInterpretation(levelMosaicInfo.ci[band - 1])
 
+    if levelMosaicInfo.nodata is not None:
+        for band in range(1, bands + 1):
+            t_band = t_fh.GetRasterBand(band)
+            t_band.Fill(levelMosaicInfo.nodata)
+            t_band.SetNoDataValue(levelMosaicInfo.nodata)
+
     res = gdal.ReprojectImage(s_fh, t_fh, None, None, ResamplingMethod)
     if res != 0:
         print("Reprojection failed for %s, error %d" % (tileName, res))
@@ -522,8 +533,10 @@ def createTile(minfo, offsetX, offsetY, width, height, tilename, OGRDS):
         t_band = t_fh.GetRasterBand(band)
         if minfo.ct is not None:
             t_band.SetRasterColorTable(minfo.ct)
+        if minfo.nodata is not None:
+            t_band.Fill(minfo.nodata)
+            t_band.SetNoDataValue(minfo.nodata)
 
-#        data = s_band.ReadRaster( offsetX,offsetY,width,height,width,height, t_band.DataType )
         data = s_band.ReadRaster(0, 0, readX, readY, readX, readY, t_band.DataType)
         t_band.WriteRaster(0, 0, readX, readY, data, readX, readY, t_band.DataType)
 

From cc5d84036f5efca50192ec7426a35b9d54bf3712 Mon Sep 17 00:00:00 2001
From: Even Rouault <even.rouault@spatialys.com>
Date: Thu, 28 Feb 2019 13:02:12 +0100
Subject: [PATCH 232/488] XPM: fix read heap buffer overflow on corrupted
 image. Fixes https://bugs.chromium.org/p/oss-fuzz/issues/detail?id=13455.
 Credit to OSS Fuzz

---
 gdal/frmts/xpm/xpmdataset.cpp | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/gdal/frmts/xpm/xpmdataset.cpp b/gdal/frmts/xpm/xpmdataset.cpp
index 8efaa98965da..ce5b0630803f 100644
--- a/gdal/frmts/xpm/xpmdataset.cpp
+++ b/gdal/frmts/xpm/xpmdataset.cpp
@@ -567,7 +567,8 @@ ParseXPM( const char *pszInput,
 
     for( int iColor = 0; iColor < nColorCount; iColor++ )
     {
-        if( papszXPMList[iColor+1] == nullptr )
+        if( papszXPMList[iColor+1] == nullptr ||
+            papszXPMList[iColor+1][0] == '\0' )
         {
             CPLError( CE_Failure, CPLE_AppDefined,
                       "Missing color definition for %d in XPM header.",

From e0406ee27a8a56d23c6ed88b28bb21a555833cca Mon Sep 17 00:00:00 2001
From: Even Rouault <even.rouault@spatialys.com>
Date: Thu, 28 Feb 2019 21:49:26 +0100
Subject: [PATCH 233/488] configure: fix netcdf_mem.h detection in netcdf 4.6.2
 (refs #1328)

---
 gdal/configure    | 3 ++-
 gdal/configure.ac | 2 +-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/gdal/configure b/gdal/configure
index 6bb09ade908c..0edea880fe3e 100755
--- a/gdal/configure
+++ b/gdal/configure
@@ -27373,7 +27373,8 @@ if test "$NETCDF_SETTING" != "no" ; then
    for ac_header in $NETCDF_INCLUDEDIR/netcdf_mem.h
 do :
   as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
-ac_fn_c_check_header_mongrel "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default"
+ac_fn_c_check_header_compile "$LINENO" "$ac_header" "$as_ac_Header" "#include <$NETCDF_INCLUDEDIR/netcdf.h>
+"
 if eval test \"x\$"$as_ac_Header"\" = x"yes"; then :
   cat >>confdefs.h <<_ACEOF
 #define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
diff --git a/gdal/configure.ac b/gdal/configure.ac
index 383a6b7f9a11..b6e035d8017c 100644
--- a/gdal/configure.ac
+++ b/gdal/configure.ac
@@ -2673,7 +2673,7 @@ AC_SUBST([NETCDF_SETTING], [$NETCDF_SETTING])
 
 if test "$NETCDF_SETTING" != "no" ; then
 
-   AC_CHECK_HEADERS([$NETCDF_INCLUDEDIR/netcdf_mem.h], [NETCDF_MEM=yes], [NETCDF_MEM=no],)
+   AC_CHECK_HEADERS([$NETCDF_INCLUDEDIR/netcdf_mem.h], [NETCDF_MEM=yes], [NETCDF_MEM=no], [#include <$NETCDF_INCLUDEDIR/netcdf.h>])
 
    AC_SUBST([NETCDF_MEM], [$NETCDF_MEM])
    AC_SUBST([NETCDF_ROOT], [$NETCDF_ROOT])

From 55274f2737575960377c47b82aac4abc938fa902 Mon Sep 17 00:00:00 2001
From: James McClain <james.mcclain@gmail.com>
Date: Sun, 10 Mar 2019 04:36:52 -0400
Subject: [PATCH 234/488] vsihdfs: fix Read() when more than one hdfsRead call
 is needed (fixes #1349)

* More Than One hdfsRead Call Sometimes Needed

* Account for Request-Size Difference

The `Read` function can take 64-bit arguments for its read-request size,
whereas `hdfsRead` may only take a 32-bit argument.  If the former
requests an amount larger than can be encoded in a signed 32-bit number,
break the request into 2GB batches.
---
 gdal/port/cpl_vsil_hdfs.cpp | 43 +++++++++++++++++++++++++++----------
 1 file changed, 32 insertions(+), 11 deletions(-)

diff --git a/gdal/port/cpl_vsil_hdfs.cpp b/gdal/port/cpl_vsil_hdfs.cpp
index 93d18e6ac8c0..d718bbd26337 100644
--- a/gdal/port/cpl_vsil_hdfs.cpp
+++ b/gdal/port/cpl_vsil_hdfs.cpp
@@ -40,6 +40,7 @@
 #endif
 
 #include <cstring>
+#include <climits>
 
 #include "cpl_port.h"
 #include "cpl_vsi.h"
@@ -154,18 +155,38 @@ VSIHdfsHandle::Read(void *pBuffer, size_t nSize, size_t nMemb)
   if (nSize == 0 || nMemb == 0)
     return 0;
 
-  int bytes = hdfsRead(poFilesystem, poFile, pBuffer, nSize * nMemb);
+  size_t bytes_wanted = nSize * nMemb;
+  size_t bytes_read = 0;
+
+  while (bytes_read < bytes_wanted)
+    {
+      tSize bytes = 0;
+      size_t bytes_to_request = bytes_wanted - bytes_read;
+
+      // The `Read` function can take 64-bit arguments for its
+      // read-request size, whereas `hdfsRead` may only take a 32-bit
+      // argument.  If the former requests an amount larger than can
+      // be encoded in a signed 32-bit number, break the request into
+      // 2GB batches.
+      bytes = hdfsRead(poFilesystem, poFile,
+                       pBuffer + bytes_read,
+                       bytes_to_request > INT_MAX ? INT_MAX : bytes_to_request);
+
+      if (bytes > 0) {
+        bytes_read += bytes;
+      }
+      if (bytes == 0) {
+        bEOF = true;
+        return bytes_read/nSize;
+      }
+      else if (bytes < 0) {
+        bEOF = false;
+        return 0;
+      }
+    }
 
-  if (bytes > 0)
-    return bytes/nSize;
-  else if (bytes == 0) {
-    bEOF = true;
-    return 0;
-  }
-  else {
-    bEOF = false;
-    return 0;
-  }
+  if (bytes_read > 0)
+    return bytes_read/nSize;
 }
 
 size_t

From 61153d33d7f055c3442ff728adbfa8e09582464b Mon Sep 17 00:00:00 2001
From: Even Rouault <even.rouault@spatialys.com>
Date: Sun, 10 Mar 2019 14:23:51 +0100
Subject: [PATCH 235/488] OGRLineString::segmentize(): fix issues when segment
 length is divisible by maxlength (fixes #1341)

---
 autotest/ogr/ogr_geom.py   | 19 ++++++++++++++++++-
 gdal/ogr/ogrlinestring.cpp |  5 +++--
 2 files changed, 21 insertions(+), 3 deletions(-)

diff --git a/autotest/ogr/ogr_geom.py b/autotest/ogr/ogr_geom.py
index a7aed6e01d50..08bebc779409 100755
--- a/autotest/ogr/ogr_geom.py
+++ b/autotest/ogr/ogr_geom.py
@@ -666,7 +666,24 @@ def test_ogr_geom_segmentize():
             print('%.18g' % (g1.GetPoint(i)[0] - g2.GetPoint(g1.GetPointCount() - 1 - i)[0]))
             pytest.fail('%.18g' % (g1.GetPoint(i)[1] - g2.GetPoint(g1.GetPointCount() - 1 - i)[1]))
 
-    
+
+def test_ogr_geom_segmentize_issue_1341():
+
+    expected_geom = 'LINESTRING (0 0,0.4 0.0,0.8 0.0,1.2 0.0,1.6 0.0,2 0,2.4 0.0,2.8 0.0,3.2 0.0,3.6 0.0,4 0,4.4 0.0,4.8 0.0,5.2 0.0,5.6 0.0,6 0,6.4 0.0,6.8 0.0,7.2 0.0,7.6 0.0,8 0,8.4 0.0,8.8 0.0,9.2 0.0,9.6 0.0,10 0)'
+
+    geom = ogr.CreateGeometryFromWkt('LINESTRING(0 0,10 0)')
+    geom.Segmentize(0.399999999999)
+    assert geom.ExportToWkt() == expected_geom
+
+    geom = ogr.CreateGeometryFromWkt('LINESTRING(0 0,10 0)')
+    geom.Segmentize(0.4)
+    assert geom.ExportToWkt() == expected_geom
+
+    geom = ogr.CreateGeometryFromWkt('LINESTRING(0 0,10 0)')
+    geom.Segmentize(0.400000000001)
+    assert geom.ExportToWkt() == expected_geom
+
+
 ###############################################################################
 # Test Value()
 
diff --git a/gdal/ogr/ogrlinestring.cpp b/gdal/ogr/ogrlinestring.cpp
index d9a2d51d3e10..810ad2e84595 100644
--- a/gdal/ogr/ogrlinestring.cpp
+++ b/gdal/ogr/ogrlinestring.cpp
@@ -2520,6 +2520,7 @@ void OGRSimpleCurve::segmentize( double dfMaxLength )
         reversePoints();
         segmentize(dfMaxLength);
         reversePoints();
+        return;
     }
 
     OGRRawPoint* paoNewPoints = nullptr;
@@ -2550,10 +2551,10 @@ void OGRSimpleCurve::segmentize( double dfMaxLength )
         const double dfX = paoPoints[i+1].x - paoPoints[i].x;
         const double dfY = paoPoints[i+1].y - paoPoints[i].y;
         const double dfSquareDist = dfX * dfX + dfY * dfY;
-        if( dfSquareDist > dfSquareMaxLength )
+        if( std::fabs(dfSquareDist - dfSquareMaxLength) > 1e-5 * dfSquareMaxLength )
         {
             const double dfIntermediatePoints =
-                floor(sqrt(dfSquareDist / dfSquareMaxLength));
+                floor(sqrt(dfSquareDist / dfSquareMaxLength) - 1e-2);
             const int nIntermediatePoints =
                 DoubleToIntClamp(dfIntermediatePoints);
 

From 0b3f983b8a20e9c6b19aa785257c845a03a7a5dc Mon Sep 17 00:00:00 2001
From: Even Rouault <even.rouault@spatialys.com>
Date: Sun, 10 Mar 2019 15:09:44 +0100
Subject: [PATCH 236/488] DXF: fix double-free issue in case of writing error.
 Fixes https://bugs.chromium.org/p/oss-fuzz/issues/detail?id=13516. Credit to
 OSS Fuzz

---
 gdal/ogr/ogrsf_frmts/dxf/ogrdxfwriterds.cpp | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/gdal/ogr/ogrsf_frmts/dxf/ogrdxfwriterds.cpp b/gdal/ogr/ogrsf_frmts/dxf/ogrdxfwriterds.cpp
index 20a51898c521..396947dd29c3 100644
--- a/gdal/ogr/ogrsf_frmts/dxf/ogrdxfwriterds.cpp
+++ b/gdal/ogr/ogrsf_frmts/dxf/ogrdxfwriterds.cpp
@@ -583,18 +583,19 @@ bool OGRDXFWriterDS::TransferUpdateTrailer( VSILFILE *fpOut )
 /* -------------------------------------------------------------------- */
 /*      Copy the remainder of the file.                                 */
 /* -------------------------------------------------------------------- */
+    bool ret = true;
     while( (nCode = oReader.ReadValue( szLineBuf, sizeof(szLineBuf) )) != -1 )
     {
         if( !WriteValue( fpOut, nCode, szLineBuf ) )
         {
-            VSIFCloseL( fp );
-            return false;
+            ret = false;
+            break;
         }
     }
 
     VSIFCloseL( l_fp );
 
-    return true;
+    return ret;
 }
 
 /************************************************************************/

From 573a97994e31c8f38580c70a9bee790c23d028e5 Mon Sep 17 00:00:00 2001
From: Even Rouault <even.rouault@spatialys.com>
Date: Tue, 12 Mar 2019 13:31:35 +0100
Subject: [PATCH 237/488] rasterize: fix crash when working buffer is larger
 than 2GB (fixes #1338)

---
 gdal/alg/gdalrasterize.cpp | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/gdal/alg/gdalrasterize.cpp b/gdal/alg/gdalrasterize.cpp
index 339d35fbfb68..67351378260b 100644
--- a/gdal/alg/gdalrasterize.cpp
+++ b/gdal/alg/gdalrasterize.cpp
@@ -89,8 +89,8 @@ void gvBurnScanline( void *pCBData, int nY, int nXStart, int nXEnd,
 
             unsigned char *pabyInsert =
                 psInfo->pabyChunkBuf
-                + iBand * psInfo->nXSize * psInfo->nYSize
-                + nY * psInfo->nXSize + nXStart;
+                + static_cast<GSpacing>(iBand) * psInfo->nXSize * psInfo->nYSize
+                + static_cast<GSpacing>(nY) * psInfo->nXSize + nXStart;
 
             if( psInfo->eMergeAlg == GRMA_Add ) {
                 int nPixels = nXEnd - nXStart + 1;
@@ -113,8 +113,8 @@ void gvBurnScanline( void *pCBData, int nY, int nXStart, int nXEnd,
 
             double *padfInsert =
                 (reinterpret_cast<double *>(psInfo->pabyChunkBuf))
-                + iBand * psInfo->nXSize * psInfo->nYSize
-                + nY * psInfo->nXSize + nXStart;
+                + static_cast<GSpacing>(iBand) * psInfo->nXSize * psInfo->nYSize
+                + static_cast<GSpacing>(nY) * psInfo->nXSize + nXStart;
 
             if( psInfo->eMergeAlg == GRMA_Add ) {
                 while( nPixels-- > 0 )

From 7074a84e2e1c43213fed333984a0f3051a0595f8 Mon Sep 17 00:00:00 2001
From: Even Rouault <even.rouault@spatialys.com>
Date: Tue, 12 Mar 2019 17:15:34 +0100
Subject: [PATCH 238/488] GPKG: fix DDL of gpkg_spatial_ref_sys when using the
 CRS WKT extension (refs
 https://github.com/opengeospatial/ets-gpkg12/issues/86)

---
 .../gpkg/ogrgeopackagedatasource.cpp            | 17 ++++++++++++-----
 gdal/swig/python/samples/validate_gpkg.py       |  4 ++--
 2 files changed, 14 insertions(+), 7 deletions(-)

diff --git a/gdal/ogr/ogrsf_frmts/gpkg/ogrgeopackagedatasource.cpp b/gdal/ogr/ogrsf_frmts/gpkg/ogrgeopackagedatasource.cpp
index c5a9a3a0338a..545ff665e873 100644
--- a/gdal/ogr/ogrsf_frmts/gpkg/ogrgeopackagedatasource.cpp
+++ b/gdal/ogr/ogrsf_frmts/gpkg/ogrgeopackagedatasource.cpp
@@ -3579,18 +3579,25 @@ int GDALGeoPackageDataset::Create( const char * pszFilename,
     {
         /* Requirement 10: A GeoPackage SHALL include a gpkg_spatial_ref_sys table */
         /* http://opengis.github.io/geopackage/#spatial_ref_sys */
+        if( CPLTestBool(CPLGetConfigOption("GPKG_ADD_DEFINITION_12_063", "NO")) )
+        {
+            m_bHasDefinition12_063 = true;
+        }
         osSQL =
             "CREATE TABLE gpkg_spatial_ref_sys ("
             "srs_name TEXT NOT NULL,"
             "srs_id INTEGER NOT NULL PRIMARY KEY,"
             "organization TEXT NOT NULL,"
             "organization_coordsys_id INTEGER NOT NULL,"
-            "definition  TEXT NOT NULL,"
-            "description TEXT";
-        if( CPLTestBool(CPLGetConfigOption("GPKG_ADD_DEFINITION_12_063", "NO")) )
+            "definition  TEXT NOT NULL";
+        if( m_bHasDefinition12_063 )
         {
-            m_bHasDefinition12_063 = true;
-            osSQL += ", definition_12_063 TEXT NOT NULL";
+            osSQL += " DEFAULT 'undefined'";
+        }
+        osSQL += ",description TEXT";
+        if( m_bHasDefinition12_063 )
+        {
+            osSQL += ", definition_12_063 TEXT NOT NULL DEFAULT 'undefined'";
         }
         osSQL += 
             ")"
diff --git a/gdal/swig/python/samples/validate_gpkg.py b/gdal/swig/python/samples/validate_gpkg.py
index cef05c590193..e1c723dbcb00 100755
--- a/gdal/swig/python/samples/validate_gpkg.py
+++ b/gdal/swig/python/samples/validate_gpkg.py
@@ -171,9 +171,9 @@ def _check_gpkg_spatial_ref_sys(self, c):
                 (1, 'srs_id', 'INTEGER', 1, None, 1),
                 (2, 'organization', 'TEXT', 1, None, 0),
                 (3, 'organization_coordsys_id', 'INTEGER', 1, None, 0),
-                (4, 'definition', 'TEXT', 1, None, 0),
+                (4, 'definition', 'TEXT', 1, "'undefined'", 0),
                 (5, 'description', 'TEXT', 0, None, 0),
-                (6, 'definition_12_063', 'TEXT', 1, None, 0)
+                (6, 'definition_12_063', 'TEXT', 1, "'undefined'", 0)
             ]
         else:
             expected_columns = [

From 3a387ceeca8dcb9dea0f3934f65ab13360233473 Mon Sep 17 00:00:00 2001
From: Even Rouault <even.rouault@spatialys.com>
Date: Tue, 12 Mar 2019 18:09:43 +0100
Subject: [PATCH 239/488] Revert "GPKG: fix DDL of gpkg_spatial_ref_sys when
 using the CRS WKT extension (refs
 https://github.com/opengeospatial/ets-gpkg12/issues/86)"

This reverts commit 7074a84e2e1c43213fed333984a0f3051a0595f8.

Actually the requirement for the default values will be removed.
---
 .../gpkg/ogrgeopackagedatasource.cpp            | 17 +++++------------
 gdal/swig/python/samples/validate_gpkg.py       |  4 ++--
 2 files changed, 7 insertions(+), 14 deletions(-)

diff --git a/gdal/ogr/ogrsf_frmts/gpkg/ogrgeopackagedatasource.cpp b/gdal/ogr/ogrsf_frmts/gpkg/ogrgeopackagedatasource.cpp
index 545ff665e873..c5a9a3a0338a 100644
--- a/gdal/ogr/ogrsf_frmts/gpkg/ogrgeopackagedatasource.cpp
+++ b/gdal/ogr/ogrsf_frmts/gpkg/ogrgeopackagedatasource.cpp
@@ -3579,25 +3579,18 @@ int GDALGeoPackageDataset::Create( const char * pszFilename,
     {
         /* Requirement 10: A GeoPackage SHALL include a gpkg_spatial_ref_sys table */
         /* http://opengis.github.io/geopackage/#spatial_ref_sys */
-        if( CPLTestBool(CPLGetConfigOption("GPKG_ADD_DEFINITION_12_063", "NO")) )
-        {
-            m_bHasDefinition12_063 = true;
-        }
         osSQL =
             "CREATE TABLE gpkg_spatial_ref_sys ("
             "srs_name TEXT NOT NULL,"
             "srs_id INTEGER NOT NULL PRIMARY KEY,"
             "organization TEXT NOT NULL,"
             "organization_coordsys_id INTEGER NOT NULL,"
-            "definition  TEXT NOT NULL";
-        if( m_bHasDefinition12_063 )
-        {
-            osSQL += " DEFAULT 'undefined'";
-        }
-        osSQL += ",description TEXT";
-        if( m_bHasDefinition12_063 )
+            "definition  TEXT NOT NULL,"
+            "description TEXT";
+        if( CPLTestBool(CPLGetConfigOption("GPKG_ADD_DEFINITION_12_063", "NO")) )
         {
-            osSQL += ", definition_12_063 TEXT NOT NULL DEFAULT 'undefined'";
+            m_bHasDefinition12_063 = true;
+            osSQL += ", definition_12_063 TEXT NOT NULL";
         }
         osSQL += 
             ")"
diff --git a/gdal/swig/python/samples/validate_gpkg.py b/gdal/swig/python/samples/validate_gpkg.py
index e1c723dbcb00..cef05c590193 100755
--- a/gdal/swig/python/samples/validate_gpkg.py
+++ b/gdal/swig/python/samples/validate_gpkg.py
@@ -171,9 +171,9 @@ def _check_gpkg_spatial_ref_sys(self, c):
                 (1, 'srs_id', 'INTEGER', 1, None, 1),
                 (2, 'organization', 'TEXT', 1, None, 0),
                 (3, 'organization_coordsys_id', 'INTEGER', 1, None, 0),
-                (4, 'definition', 'TEXT', 1, "'undefined'", 0),
+                (4, 'definition', 'TEXT', 1, None, 0),
                 (5, 'description', 'TEXT', 0, None, 0),
-                (6, 'definition_12_063', 'TEXT', 1, "'undefined'", 0)
+                (6, 'definition_12_063', 'TEXT', 1, None, 0)
             ]
         else:
             expected_columns = [

From f8917ecb5840eb06e40a2c8d38c537657424077a Mon Sep 17 00:00:00 2001
From: Even Rouault <even.rouault@spatialys.com>
Date: Wed, 13 Mar 2019 17:05:37 +0100
Subject: [PATCH 240/488] gdalwarp: assume -tap when using -crop_to_cutline,
 -tr and -wo CUTLINE_ALL_TOUCHED=TRUE, so as to avoid issues with polygons
 smaller than 1x1 pixels (fixes #1360)

---
 autotest/utilities/test_gdalwarp_lib.py | 29 +++++++++++++++++++++++++
 gdal/apps/gdalwarp_lib.cpp              |  4 +++-
 2 files changed, 32 insertions(+), 1 deletion(-)

diff --git a/autotest/utilities/test_gdalwarp_lib.py b/autotest/utilities/test_gdalwarp_lib.py
index e6ed00fb5326..ba3b1dddc74b 100755
--- a/autotest/utilities/test_gdalwarp_lib.py
+++ b/autotest/utilities/test_gdalwarp_lib.py
@@ -460,6 +460,35 @@ def test_gdalwarp_lib_46():
 
     gdal.Unlink(cutlineDSName)
 
+###############################################################################
+# Test -crop_to_cutline -tr X Y -wo CUTLINE_ALL_TOUCHED=YES (fixes for #1360)
+
+
+def test_gdalwarp_lib_cutline_all_touched_single_pixel():
+
+    cutlineDSName = '/vsimem/test_gdalwarp_lib_cutline_all_touched_single_pixel.json'
+    cutline_ds = ogr.GetDriverByName('GeoJSON').CreateDataSource(cutlineDSName)
+    cutline_lyr = cutline_ds.CreateLayer('cutline')
+    f = ogr.Feature(cutline_lyr.GetLayerDefn())
+    f.SetGeometry(ogr.CreateGeometryFromWkt('POLYGON((2.15 48.15,2.15000001 48.15000001,2.15 48.15000001,2.15 48.15))'))
+    cutline_lyr.CreateFeature(f)
+    f = None
+    cutline_lyr = None
+    cutline_ds = None
+
+    src_ds = gdal.Translate('', '../gcore/data/byte.tif', format='MEM',
+                            outputBounds=[2, 49, 3, 48], outputSRS='EPSG:4326')
+
+    ds = gdal.Warp('', src_ds, format='MEM', cutlineDSName=cutlineDSName,
+                   cropToCutline=True, warpOptions=['CUTLINE_ALL_TOUCHED=YES'],
+                   xRes=0.001, yRes=0.001)
+    got_gt = ds.GetGeoTransform()
+    expected_gt = (2.15, 0.001, 0.0, 48.151, 0.0, -0.001)
+    assert max([abs(got_gt[i]-expected_gt[i]) for i in range(6)]) <= 1e-8, got_gt
+    assert ds.RasterXSize == 1 and ds.RasterYSize == 1
+
+    gdal.Unlink(cutlineDSName)
+
 ###############################################################################
 # Test callback
 
diff --git a/gdal/apps/gdalwarp_lib.cpp b/gdal/apps/gdalwarp_lib.cpp
index af69c91d2f8b..7d6b8cacae38 100644
--- a/gdal/apps/gdalwarp_lib.cpp
+++ b/gdal/apps/gdalwarp_lib.cpp
@@ -2631,7 +2631,9 @@ GDALWarpCreateOutput( int nSrcCount, GDALDatasetH *pahSrcDS, const char *pszFile
             psOptions->dfMinY = adfDstGeoTransform[3] + adfDstGeoTransform[5] * nLines;
         }
 
-        if ( psOptions->bTargetAlignedPixels )
+        if ( psOptions->bTargetAlignedPixels ||
+             (psOptions->bCropToCutline &&
+              CPLFetchBool(psOptions->papszWarpOptions, "CUTLINE_ALL_TOUCHED", false)) )
         {
             psOptions->dfMinX = floor(psOptions->dfMinX / psOptions->dfXRes) * psOptions->dfXRes;
             psOptions->dfMaxX = ceil(psOptions->dfMaxX / psOptions->dfXRes) * psOptions->dfXRes;

From fae3a65f16af509cf9e0dd16cd16858d8e49eb25 Mon Sep 17 00:00:00 2001
From: Kevin Mehall <kevin.mehall@3drobotics.com>
Date: Tue, 12 Mar 2019 15:23:57 -0700
Subject: [PATCH 241/488] gdal2tiles: prevent accidental copy of full GeoTIFF
 into temporary .vrt file

This line is used to write the temporary .vrt for the reprojected input.
However, if the input was already in the correct projection,
`self.warped_input_dataset` was the input GeoTIFF dataset directly due
to the previous line, so `GetDriver` returned the GeoTIFF driver rather
than VRT. It then created a .vrt file that was actually in GeoTIFF
format and copied the entire input into it.
---
 gdal/swig/python/scripts/gdal2tiles.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/gdal/swig/python/scripts/gdal2tiles.py b/gdal/swig/python/scripts/gdal2tiles.py
index 35c9dcefcaad..dd169c3b5e8f 100755
--- a/gdal/swig/python/scripts/gdal2tiles.py
+++ b/gdal/swig/python/scripts/gdal2tiles.py
@@ -1509,8 +1509,8 @@ def open_input(self):
         if not self.warped_input_dataset:
             self.warped_input_dataset = input_dataset
 
-        self.warped_input_dataset.GetDriver().CreateCopy(self.tmp_vrt_filename,
-                                                         self.warped_input_dataset)
+        gdal.GetDriverByName('VRT').CreateCopy(self.tmp_vrt_filename,
+                                               self.warped_input_dataset)
 
         # Get alpha band (either directly or from NODATA value)
         self.alphaband = self.warped_input_dataset.GetRasterBand(1).GetMaskBand()

From d14708b4634f593eb74ad298a5f9604588a7a8d2 Mon Sep 17 00:00:00 2001
From: Martin Landa <landa.martin@gmail.com>
Date: Mon, 11 Mar 2019 11:55:09 +0100
Subject: [PATCH 242/488] VFK driver regression: curved geometries ignored, see
 #1351

---
 gdal/ogr/ogrsf_frmts/vfk/vfkdatablocksqlite.cpp | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/gdal/ogr/ogrsf_frmts/vfk/vfkdatablocksqlite.cpp b/gdal/ogr/ogrsf_frmts/vfk/vfkdatablocksqlite.cpp
index 55ad16527b08..e093f5c41e07 100644
--- a/gdal/ogr/ogrsf_frmts/vfk/vfkdatablocksqlite.cpp
+++ b/gdal/ogr/ogrsf_frmts/vfk/vfkdatablocksqlite.cpp
@@ -116,6 +116,7 @@ int VFKDataBlockSQLite::LoadGeometryPoint()
   \param poLine VFK feature
   \param oOGRLine line geometry
   \param[in,out] bValid true when feature's geometry is valid
+  \param ftype geometry VFK type
   \param[in,out] rowIdFeat list of row ids which forms linestring
   \param[in,out] nGeometries number of features with valid geometry
 */
@@ -268,7 +269,6 @@ int VFKDataBlockSQLite::LoadGeometryLineStringSBP()
             const GUIntBig ipcb  = sqlite3_column_int64(hStmt, 1);
             const char* pszFType = reinterpret_cast<const char*>(
                 sqlite3_column_text(hStmt, 2));
-            osFType = pszFType ? pszFType : "";
             int rowId = sqlite3_column_int(hStmt, 3);
 
             if (ipcb == 1) {
@@ -284,18 +284,17 @@ int VFKDataBlockSQLite::LoadGeometryLineStringSBP()
                 poFeature->SetRowId(rowId);
 
                 /* set geometry & reset */
-                CPLString osFTypeLine;
                 if( poLine &&
                     !SetGeometryLineString(
                         poLine, &oOGRLine,
-                        bValid, osFTypeLine, rowIdFeat, nGeometries) )
+                        bValid, osFType.c_str(), rowIdFeat, nGeometries) )
                 {
                     nInvalid++;
                 }
 
                 bValid = true;
                 poLine = poFeature;
-                osFTypeLine = osFType;
+                osFType = pszFType ? pszFType : "";
                 iIdx++;
             }
 

From f83011e423455e7a4caf78909aa0fade9c8bac2f Mon Sep 17 00:00:00 2001
From: Martin Landa <landa.martin@gmail.com>
Date: Mon, 11 Mar 2019 21:04:26 +0100
Subject: [PATCH 243/488] VFK autotest: add test for curved geometry, see #1351

---
 autotest/ogr/data/bylany.vfk |  3 +++
 autotest/ogr/ogr_vfk.py      | 24 +++++++++++++++++++-----
 2 files changed, 22 insertions(+), 5 deletions(-)

diff --git a/autotest/ogr/data/bylany.vfk b/autotest/ogr/data/bylany.vfk
index 7af0bbaa8490..34b93ec7b3f8 100644
--- a/autotest/ogr/data/bylany.vfk
+++ b/autotest/ogr/data/bylany.vfk
@@ -98,6 +98,9 @@ k.
 &DSBP;292399708;0;"21.06.2001 17:30:41";"";3;379449708;;313815708;2;;156054708;;"4";
 &DSBP;292400708;0;"21.06.2001 17:30:41";"";3;379449708;;313815708;1;;156056708;;"4";
 &DSBP;292401708;0;"21.06.2001 17:30:41";"";3;379449708;;313814708;2;;156056708;;"4";
+&DSBP;292404708;0;"21.06.2001 17:30:41";"";3;379449708;;313814708;1;;156057708;;"16";
+&DSBP;292405708;0;"21.06.2001 17:30:41";"";3;379449708;;313813708;2;;156057708;;"16";
+&DSBP;292406708;0;"21.06.2001 17:30:41";"";3;379449708;;313815708;3;;156057708;;"16";
 &DSBP;292402708;0;"21.06.2001 17:30:41";"";3;379449708;;313814708;1;;156058708;;"4";
 &DSBP;292403708;0;"21.06.2001 17:30:41";"";3;379449708;;313813708;2;;156058708;;"4";
 &BSBM;DATUM_VZNIKU D;DATUM_ZANIKU D;PRIZNAK_KONTEXTU N1;PORADOVE_CISLO_BODU N38;SOURADNICE_Y N10.2;SOURADNICE_X N10.2;OP_ID N30;DPM_ID N30;HBPEJ_ID N30;PARAMETRY_SPOJENI T100
diff --git a/autotest/ogr/ogr_vfk.py b/autotest/ogr/ogr_vfk.py
index e1a809a52f29..a65e885029fc 100755
--- a/autotest/ogr/ogr_vfk.py
+++ b/autotest/ogr/ogr_vfk.py
@@ -8,7 +8,7 @@
 # Author:   Martin Landa <landa.martin gmail.com>
 #
 ###############################################################################
-# Copyright (c) 2009-2018 Martin Landa <landa.martin gmail.com>
+# Copyright (c) 2009-2019 Martin Landa <landa.martin gmail.com>
 # Copyright (c) 2010-2012, Even Rouault <even dot rouault at mines-paris dot org>
 #
 # Permission is hereby granted, free of charge, to any person obtaining a
@@ -49,10 +49,7 @@ def test_ogr_vfk_1():
     if gdaltest.vfk_drv is None:
         pytest.skip()
 
-    try:
-        os.remove('data/bylany.vfk.db')
-    except OSError:
-        pass
+    gdal.SetConfigOption('OGR_VFK_DB_OVERWRITE', 'YES')
 
     gdaltest.vfk_ds = ogr.Open('data/bylany.vfk')
 
@@ -314,6 +311,23 @@ def count_features():
             feat.DumpReadable()
             pytest.fail('did not get expected number of features')
 
+###############################################################################
+# Read SBP layer, check curved geometry
+
+
+def test_ogr_vfk_12():
+
+    gdaltest.vfk_layer_sbp = gdaltest.vfk_ds.GetLayerByName('SBP')
+
+    gdaltest.vfk_layer_sbp.SetAttributeFilter("PARAMETRY_SPOJENI = '16'")
+    feat = gdaltest.vfk_layer_sbp.GetNextFeature()
+    geom = feat.GetGeometryRef()
+
+    assert geom.GetGeometryType() == ogr.wkbLineString, \
+        'did not get expected geometry type.'
+
+    assert geom.GetPointCount() == 92, \
+        'did not get expected number of points.'
     
 ###############################################################################
 # cleanup

From 90daab390956d5044877a0f15d79242eee7888f0 Mon Sep 17 00:00:00 2001
From: Even Rouault <even.rouault@spatialys.com>
Date: Tue, 12 Mar 2019 13:39:28 +0100
Subject: [PATCH 244/488] ogr_vfk.py: avoid test failure when driver is not
 available (refs #1351)

---
 autotest/ogr/ogr_vfk.py | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/autotest/ogr/ogr_vfk.py b/autotest/ogr/ogr_vfk.py
index a65e885029fc..60d0cbfa7529 100755
--- a/autotest/ogr/ogr_vfk.py
+++ b/autotest/ogr/ogr_vfk.py
@@ -317,6 +317,9 @@ def count_features():
 
 def test_ogr_vfk_12():
 
+    if gdaltest.vfk_drv is None:
+        pytest.skip()
+
     gdaltest.vfk_layer_sbp = gdaltest.vfk_ds.GetLayerByName('SBP')
 
     gdaltest.vfk_layer_sbp.SetAttributeFilter("PARAMETRY_SPOJENI = '16'")

From 32f952579b759052f06138d42a2348fa650ef362 Mon Sep 17 00:00:00 2001
From: Elias Kunnas <elias@kunnas.com>
Date: Fri, 15 Mar 2019 03:53:44 +0200
Subject: [PATCH 245/488] Fix emitted pgdump SQL when UNLOGGED=ON

Previously the pgdump driver emitted invalid SQL with UNLOGGED=ON.
---
 gdal/ogr/ogrsf_frmts/pgdump/ogrpgdumpdatasource.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/gdal/ogr/ogrsf_frmts/pgdump/ogrpgdumpdatasource.cpp b/gdal/ogr/ogrsf_frmts/pgdump/ogrpgdumpdatasource.cpp
index f8df40450f29..4ff092fe54a8 100644
--- a/gdal/ogr/ogrsf_frmts/pgdump/ogrpgdumpdatasource.cpp
+++ b/gdal/ogr/ogrsf_frmts/pgdump/ogrpgdumpdatasource.cpp
@@ -460,7 +460,7 @@ OGRPGDumpDataSource::ICreateLayer( const char * pszLayerName,
     }
     else
     {
-        osCreateTable.Printf("CREATE TABLE%s \"%s\".\"%s\"",
+        osCreateTable.Printf("CREATE%s TABLE \"%s\".\"%s\"",
                              CPLFetchBool( papszOptions, "UNLOGGED", false ) ?
                              " UNLOGGED": "",
                              pszSchemaName, pszTableName);

From 930c0318981abb49535983158a708dabe419a5aa Mon Sep 17 00:00:00 2001
From: Even Rouault <even.rouault@spatialys.com>
Date: Fri, 15 Mar 2019 12:36:15 +0100
Subject: [PATCH 246/488] typo fixes

---
 gdal/ci/travis/trusty_clang/before_install.sh         | 2 +-
 gdal/frmts/kmlsuperoverlay/kmlsuperoverlaydataset.cpp | 2 +-
 gdal/makefile.vc                                      | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/gdal/ci/travis/trusty_clang/before_install.sh b/gdal/ci/travis/trusty_clang/before_install.sh
index 2461ad4e1390..e696ee450bc8 100755
--- a/gdal/ci/travis/trusty_clang/before_install.sh
+++ b/gdal/ci/travis/trusty_clang/before_install.sh
@@ -98,7 +98,7 @@ sudo apt-get update
 sudo ACCEPT_EULA=Y apt-get install -y msodbcsql17
 
 # Nasty: force reinstallation of unixodbc-dev since the previous line installed unixodbc 2.3.1 from microsoft repo, which lacks the -dev package
-# DONT DO THAT ON YOUR PRODUCTION SERVER.
+# DON'T DO THAT ON YOUR PRODUCTION SERVER.
 wget http://mirrors.edge.kernel.org/ubuntu/pool/main/u/unixodbc/libodbc1_2.3.1-4.1_amd64.deb
 wget http://mirrors.edge.kernel.org/ubuntu/pool/main/u/unixodbc/odbcinst1debian2_2.3.1-4.1_amd64.deb
 wget http://mirrors.edge.kernel.org/ubuntu/pool/main/u/unixodbc/odbcinst_2.3.1-4.1_amd64.deb
diff --git a/gdal/frmts/kmlsuperoverlay/kmlsuperoverlaydataset.cpp b/gdal/frmts/kmlsuperoverlay/kmlsuperoverlaydataset.cpp
index b8f3bc8f5741..31ef89984b03 100644
--- a/gdal/frmts/kmlsuperoverlay/kmlsuperoverlaydataset.cpp
+++ b/gdal/frmts/kmlsuperoverlay/kmlsuperoverlaydataset.cpp
@@ -2452,7 +2452,7 @@ GDALDataset* KmlSingleOverlayRasterDataset::Open(const char* pszFilename,
     if( psGO == nullptr )
     {
         // Otherwise look for kml.Document.Folder.GroundOverlay if there's
-        // a single occurence of Folder and GroundOverlay
+        // a single occurrence of Folder and GroundOverlay
         auto psDoc = CPLGetXMLNode(psRoot, "=kml.Document");
         if( psDoc == nullptr )
         {
diff --git a/gdal/makefile.vc b/gdal/makefile.vc
index bcd97b6ffd8c..7cbe79cdab80 100644
--- a/gdal/makefile.vc
+++ b/gdal/makefile.vc
@@ -65,7 +65,7 @@ default:	$(TARGET_LIB) $(PLUGIN_TARGET) apps_dir
 #
 # We want them to run before creating a DLL or static LIB file, but if they were in a target then
 # that target would have to be a dependency of dll or staticlib and would always have to run, making
-# the dependant targets "out-of-date".
+# the dependent targets "out-of-date".
 #
 # We don't want to re-link the whole DLL just because we tried to delete a static LIB that didn't
 # exist. We also don't want to install a stale DLL in a static build, so we'll remove main build

From f23365c47dc3c73f400993e29ce079185f654435 Mon Sep 17 00:00:00 2001
From: Even Rouault <even.rouault@spatialys.com>
Date: Fri, 15 Mar 2019 12:37:25 +0100
Subject: [PATCH 247/488] Update gdal-bash-completion.sh for gdal_rasterize and
 gdal_edit

---
 gdal/scripts/gdal-bash-completion.sh | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/gdal/scripts/gdal-bash-completion.sh b/gdal/scripts/gdal-bash-completion.sh
index eb9f439f5ed7..91b0115ed659 100644
--- a/gdal/scripts/gdal-bash-completion.sh
+++ b/gdal/scripts/gdal-bash-completion.sh
@@ -143,7 +143,7 @@ _gdal_contour()
   _get_comp_words_by_ref cur prev
   case "$cur" in
     -*)
-      key_list="-b -a -3d -inodata -snodata -f -i -dsco -lco -off -fl -nln -q "
+      key_list="-b -a -amin -amax -3d -inodata -snodata -f -i -dsco -lco -off -fl -e -nln -q -p "
       mapfile -t COMPREPLY < <(compgen -W "$key_list" -- "$cur")
       return 0
       ;;
@@ -173,7 +173,7 @@ _gdal_edit.py()
   _get_comp_words_by_ref cur prev
   case "$cur" in
     -*)
-      key_list="--help-general -ro -a_srs -a_ullr -tr -unsetgt -a_nodata -unsetnodata -offset -scale -colorinterp_X -unsetstats -stats -approx_stats -gcp -unsetmd -oo -mo --version --license --formats --format --optfile --config --debug --pause --locale "
+      key_list="--help-general -ro -a_srs -a_ullr -tr -unsetgt -unsetrpc -a_nodata -unsetnodata -offset -scale -colorinterp_X -unsetstats -stats -approx_stats -setstats -gcp -unsetmd -oo -mo --version --license --formats --format --optfile --config --debug --pause --locale "
       mapfile -t COMPREPLY < <(compgen -W "$key_list" -- "$cur")
       return 0
       ;;

From e8cfc11f414650e5c128b2b630d8b22de70fe968 Mon Sep 17 00:00:00 2001
From: Even Rouault <even.rouault@spatialys.com>
Date: Fri, 15 Mar 2019 13:05:29 +0100
Subject: [PATCH 248/488] Prepare for GDAL 2.4.1

---
 gdal/GDALmake.opt.in               |   2 +-
 gdal/NEWS                          | 125 +++++++++++++++++++++++++++++
 gdal/VERSION                       |   2 +-
 gdal/gcore/gdal_version.h.in       |   6 +-
 gdal/swig/include/perl/gdal_perl.i |   4 +-
 gdal/swig/include/perl/ogr_perl.i  |   2 +-
 gdal/swig/python/README.txt        |   2 +-
 gdal/swig/python/setup.py          |   2 +-
 8 files changed, 135 insertions(+), 10 deletions(-)

diff --git a/gdal/GDALmake.opt.in b/gdal/GDALmake.opt.in
index 4e008ef403fb..41e73894cf3f 100644
--- a/gdal/GDALmake.opt.in
+++ b/gdal/GDALmake.opt.in
@@ -123,7 +123,7 @@ GDAL_INCLUDE	=	-I$(GDAL_ROOT)/port -I$(GDAL_ROOT)/gcore \
 # libtool targets and help variables
 LIBGDAL	:=		libgdal.la
 LIBGDAL_CURRENT	:=	25
-LIBGDAL_REVISION	:=	0
+LIBGDAL_REVISION	:=	1
 LIBGDAL_AGE	:=	5
 
 # native build targets and variables
diff --git a/gdal/NEWS b/gdal/NEWS
index 112722bfc1ac..8f959ec351ed 100644
--- a/gdal/NEWS
+++ b/gdal/NEWS
@@ -1,3 +1,128 @@
+= GDAL/OGR 2.4.1 Release Notes =
+
+The 2.4.1 release is a bug fix release.
+
+== Build ==
+
+Unix:
+ * Fix build with OpenBSD which doesn't support RLIMIT_AS (#1163)
+ * fix build --without-lerc (#1224)
+ * configure: fix netcdf_mem.h detection in netcdf 4.6.2 (#1328)
+
+Windows:
+ * Fix build issue for builds without curl (#1251)
+ * nmake.opt: remove unicode character at line starting with '# 4275' that apparently cause build issues with some MSVC versions (#1169)
+
+All:
+ * Poppler: revision version management. Drop support for ancient versions older than 0.23.0
+ * Add support for Poppler 0.72.0 and 0.73.0 (#1207, #1208)
+
+== Port ==
+
+ * cpl_vsi.h: fix include for C use
+ * VSICurlHandle::ReadMultiRange(): use default implementation if there is a single range. May help to improve performance for #1206
+ * VSIGZipWriteHandleMT: avoid potential deadlock in case of error
+ * /vsihdfs/: fix Read() when more than one hdfsRead call is needed (#1349)
+
+== GDAL utilities ==
+
+ * gdalwarp -crop_to_cutline: do not round computed target extent to be aligned on the grid of the source raster if -tr is set (restore partially pre 2.4 behaviour) (#1173)
+ * gdalwarp: assume -tap when using -crop_to_cutline, -tr and -wo CUTLINE_ALL_TOUCHED=TRUE, so as to avoid issues with polygons smaller than 1x1 pixels (#1360)
+ * gdal2tiles: give local tile layer and basemap layers same min/max zoom levels as generated tile cache (#1074)
+ * gdal2tiles: fix breakage of openlayers.html getURL() javascript function, introduced in GDAL 2.3.3 / 2.4.0 (#1127)
+ * gdal2tiles: prevent accidental copy of full GeoTIFF into temporary .vrt file
+ * Fix double-free in StripIrrelevantOptions() (triggered by gdalinfo / ogrinfo --format)
+ * gdal_retile.py: use nodata value from origin dataset
+
+== GDAL algorithms ==
+
+ * rasterize: fix crash when working buffer is larger than 2GB (#1338)
+
+== GDAL drivers ==
+
+COSAR driver:
+ * avoid out-of-bound write on corrupted dataset. Fixes OSS Fuzz #12360
+
+GTiff driver:
+ * only report scale/offset deduced from ModelTiepointTag and ModelPixelScaleTag if the SRS has a vertical component (and thus currently if GTIFF_REPORT_COMPD_CS is set) (https://issues.qgis.org/issues/20493)
+ * Lerc codec: properly initialize state after Create() so that BuildOverviews() succeed (#1257)
+
+KMLSuperOverlay driver:
+ * report color table of single overlay datasets, and also handle some variation in the KML structure (https://issues.qgis.org/issues/20173)
+
+JPEG driver:
+ * fix GDAL 2.3.0 performance regression when decoding JPEG (or GPKG using JPEG) images (#1324)
+
+netCDF driver:
+ * fix crash when opening a dataset with an attribute of length 0 (#1303)
+
+PDSv3 driver:
+ * fix decoding of band interleaved images (such as for CRISM HSP) (#1239)
+
+XPM driver:
+ * fix read heap buffer overflow on corrupted image. Fixes OSS Fuzz #13455
+
+== OGR core ==
+
+ * Polyhedral surface: fix importFromWKT to properly fix Z/M flag
+ * OGRGeometryFactory::GetCurveParmeters(): fix assertion when coordinates are very near 0 (relates to OSS Fuzz #13408)
+ * OGRLineString::segmentize(): fix issues when segment length is divisible by maxlength (#1341)
+
+== OGRSpatialReference ==
+
+ * Coordinate transformation: do not apply +towgs84 if it is present only in one one of the CRS, when using PROJ >= 5 (#1156)
+
+== OGR drivers ==
+
+CSW driver:
+ * fix crash when geometry parsing fails (#1248)
+
+DXF driver:
+ * fix double-free issue in case of writing error. Fixes OSS Fuzz #13516
+
+Elasticsearch driver:
+ * Fix index comparison bug when a index have at least one mapping
+
+GeoJSON driver:
+ * speed-up random reading with GetFeature() to retrieve performance similar to GDAL 2.2 or before (https://issues.qgis.org/issues/21085)
+
+GeoPackage driver:
+ * allow srs_id with negative values
+
+GML driver:
+ * write SRSName element in .gfs when parsing a GML file with srsName only on top-level boundedBy element (#1210)
+ * Add "FeatureType" to list of suffixes recognized by XSD parser for compatibility with schemas produced by ArcGIS Server
+ * Fix assertion in CPLGetValueType when testing non-ASCII chars
+
+MITAB driver:
+ * .tab: fix deleting a feature without geometry (#1232)
+ * adapt dynamically default projection bounds to false_easting/false_northing values (#1316)
+ * avoid potential assertion or stack buffer overflow on corrupted .ind files. Fixes OSS Fuzz #11999.
+ * prevent potential infinite recursion on broken indexes. Fixes OSS Fuzz #12739.
+
+MSSQLSpatial driver:
+ * Add option to expose the FID column as a feature attribute (#1227)
+
+ODS driver:
+ * allow opening tables with empty cells with huge values of columns-repeated attribute at end of line (#1243)
+ * aavoid potential null pointer dereference when writing to corrupted filename. Fixes OSS Fuz #12976.
+
+PDF driver:
+ * avoid division by zero when generating from vector content whose bounding box is almost a horizontal or vertical line. Fixes OSS Fuzz #13408
+
+PGDump driver:
+ * emit correct SQL statement when UNLOGGED=ON
+
+Selafin driver:
+ * avoid null pointer dereference on corrupted files. Fixes OSS Fuzz #12356
+
+VFK driver:
+ * fix regression where curved geometries were ignored (#1351)
+
+== Python bindings ==
+
+ * fix Dataset.ReadAsRaster() on CInt16 data type (#1186)
+
 = GDAL/OGR 2.4.0 Release Notes =
 
 == In a nutshell... ==
diff --git a/gdal/VERSION b/gdal/VERSION
index 197c4d5c2d7c..005119baaa06 100644
--- a/gdal/VERSION
+++ b/gdal/VERSION
@@ -1 +1 @@
-2.4.0
+2.4.1
diff --git a/gdal/gcore/gdal_version.h.in b/gdal/gcore/gdal_version.h.in
index 62dbc352db9b..852adeafec70 100644
--- a/gdal/gcore/gdal_version.h.in
+++ b/gdal/gcore/gdal_version.h.in
@@ -7,7 +7,7 @@
 #ifndef GDAL_VERSION_MAJOR
 #  define GDAL_VERSION_MAJOR    2
 #  define GDAL_VERSION_MINOR    4
-#  define GDAL_VERSION_REV      0
+#  define GDAL_VERSION_REV      1
 #  define GDAL_VERSION_BUILD    0
 #endif
 
@@ -24,9 +24,9 @@
 
 #if !defined(DO_NOT_DEFINE_GDAL_RELEASE_DATE_AND_GDAL_RELEASE_NAME)
 #ifndef GDAL_RELEASE_DATE
-#  define GDAL_RELEASE_DATE     20181214
+#  define GDAL_RELEASE_DATE     20190315
 #endif
 #ifndef GDAL_RELEASE_NAME
-#  define GDAL_RELEASE_NAME     "2.4.0"
+#  define GDAL_RELEASE_NAME     "2.4.1"
 #endif
 #endif
diff --git a/gdal/swig/include/perl/gdal_perl.i b/gdal/swig/include/perl/gdal_perl.i
index b87a2a32f390..4149c77f7ed6 100644
--- a/gdal/swig/include/perl/gdal_perl.i
+++ b/gdal/swig/include/perl/gdal_perl.i
@@ -143,8 +143,8 @@ use Geo::GDAL::Const;
 # Note that the 1/100000 digits may be used to create more than one
 # CPAN release from one GDAL release.
 
-our $VERSION = '2.0400';
-our $GDAL_VERSION = '2.4.0';
+our $VERSION = '2.0401';
+our $GDAL_VERSION = '2.4.1';
 
 =pod
 
diff --git a/gdal/swig/include/perl/ogr_perl.i b/gdal/swig/include/perl/ogr_perl.i
index d95d4bb664df..72e6002a1c71 100644
--- a/gdal/swig/include/perl/ogr_perl.i
+++ b/gdal/swig/include/perl/ogr_perl.i
@@ -126,7 +126,7 @@ ALTERED_DESTROY(OGRGeometryShadow, OGRc, delete_Geometry)
 %perlcode %{
 
 package Geo::OGR;
-our $VERSION = '2.0400'; # this needs to be the same as that in gdal_perl.i
+our $VERSION = '2.0401'; # this needs to be the same as that in gdal_perl.i
 
 Geo::GDAL->import(qw(:INTERNAL));
 
diff --git a/gdal/swig/python/README.txt b/gdal/swig/python/README.txt
index 67b7948cbc98..67a44e84c398 100644
--- a/gdal/swig/python/README.txt
+++ b/gdal/swig/python/README.txt
@@ -16,7 +16,7 @@ reference documentation, but the `GDAL API Tutorial`_ includes Python examples.
 Dependencies
 ------------
  
- * libgdal (2.4.0 or greater) and header files (gdal-devel)
+ * libgdal (2.4.1 or greater) and header files (gdal-devel)
  * numpy (1.0.0 or greater) and header files (numpy-devel) (not explicitly 
    required, but many examples and utilities will not work without it)
 
diff --git a/gdal/swig/python/setup.py b/gdal/swig/python/setup.py
index ad1891c95c21..22ae4e46ffa0 100644
--- a/gdal/swig/python/setup.py
+++ b/gdal/swig/python/setup.py
@@ -7,7 +7,7 @@
 # Howard Butler hobu.inc@gmail.com
 
 
-gdal_version = '2.4.0'
+gdal_version = '2.4.1'
 
 import sys
 import os

From 973bec94b048e9fde5dadf5afcdbf79d10b2142e Mon Sep 17 00:00:00 2001
From: Even Rouault <even.rouault@spatialys.com>
Date: Sun, 17 Mar 2019 16:04:54 +0100
Subject: [PATCH 249/488] GeoJSONSeq: be more robust to invalid objects, and
 fixes performance issue on corrupted files. Fixes
 https://bugs.chromium.org/p/oss-fuzz/issues/detail?id=13770. Credit to OSS
 Fuzz

---
 autotest/ogr/ogr_geojsonseq.py                | 27 ++++++++++++++++++-
 .../geojson/ogrgeojsonseqdriver.cpp           |  1 +
 2 files changed, 27 insertions(+), 1 deletion(-)

diff --git a/autotest/ogr/ogr_geojsonseq.py b/autotest/ogr/ogr_geojsonseq.py
index 8a392df34d88..5d6127b7043f 100755
--- a/autotest/ogr/ogr_geojsonseq.py
+++ b/autotest/ogr/ogr_geojsonseq.py
@@ -127,7 +127,32 @@ def test_ogr_geojsonseq_seq_geometries():
             f.DumpReadable()
             pytest.fail()
 
-    
+
+def test_ogr_geojsonseq_seq_geometries_with_errors():
+
+    with gdaltest.error_handler():
+        ds = ogr.Open("""{"type":"Point","coordinates":[2,49]}
+    {"type":"Point","coordinates":[3,50]}
+    foo
+    "bar"
+    null
+
+    {"type":"Point","coordinates":[3,51]}""")
+        lyr = ds.GetLayer(0)
+        assert lyr.GetFeatureCount() == 3
+        f = lyr.GetNextFeature()
+        if f.GetGeometryRef().ExportToWkt() != 'POINT (2 49)':
+            f.DumpReadable()
+            pytest.fail()
+        f = lyr.GetNextFeature()
+        if f.GetGeometryRef().ExportToWkt() != 'POINT (3 50)':
+            f.DumpReadable()
+            pytest.fail()
+        f = lyr.GetNextFeature()
+        if f.GetGeometryRef().ExportToWkt() != 'POINT (3 51)':
+            f.DumpReadable()
+            pytest.fail()
+
 
 def test_ogr_geojsonseq_reprojection():
 
diff --git a/gdal/ogr/ogrsf_frmts/geojson/ogrgeojsonseqdriver.cpp b/gdal/ogr/ogrsf_frmts/geojson/ogrgeojsonseqdriver.cpp
index 5e2ab6987f2d..159b2cfe1b35 100644
--- a/gdal/ogr/ogrsf_frmts/geojson/ogrgeojsonseqdriver.cpp
+++ b/gdal/ogr/ogrsf_frmts/geojson/ogrgeojsonseqdriver.cpp
@@ -394,6 +394,7 @@ json_object* OGRGeoJSONSeqLayer::GetNextObject()
         {
             json_object* poObject = nullptr;
             OGRJSonParse(m_osFeatureBuffer.c_str(), &poObject);
+            m_osFeatureBuffer.clear();
             if( json_object_get_type(poObject) == json_type_object )
             {
                 return poObject;

From 57154f136f8080a9a3e0a38e5d279d51535724cf Mon Sep 17 00:00:00 2001
From: Even Rouault <even.rouault@spatialys.com>
Date: Mon, 18 Mar 2019 12:31:56 +0000
Subject: [PATCH 250/488] FileGDB/OpenFileGDB: be robust when winding order of
 outer ring is incorrect (fixes #1369)

---
 .../ogr/data/weird_winding_order_fgdb.zip     | Bin 0 -> 29564 bytes
 autotest/ogr/ogr_fgdb.py                      |  41 +++++++++++++++++-
 autotest/ogr/ogr_openfilegdb.py               |  18 +++++++-
 gdal/ogr/ogrpgeogeometry.cpp                  |   6 ++-
 .../ogrsf_frmts/openfilegdb/filegdbtable.cpp  |   3 +-
 5 files changed, 63 insertions(+), 5 deletions(-)
 create mode 100644 autotest/ogr/data/weird_winding_order_fgdb.zip

diff --git a/autotest/ogr/data/weird_winding_order_fgdb.zip b/autotest/ogr/data/weird_winding_order_fgdb.zip
new file mode 100644
index 0000000000000000000000000000000000000000..d77081c970e23cc8cbafc15187254e28999962a4
GIT binary patch
literal 29564
zcmbTd18}C>(l#91P9~Yywr$(CZD(RmCbn(c=ER!Vb}})(%zn>4-<e&1{b$~9Roz*Y
zx|3&h_iA3<kDMeh2nqlI00h9jl!MHON4q@b$8Tzg00874yMwL1k)y7mmAM_Bkb}Of
zxs54}sgVJ#KHdK;dKwc4V`D3GN2jyJ97F&-1mK?be7YxENVkXq`nLTU0g4fh!K3nz
z4+6kF9@}_-Uw>MFmHX|){`Ij$xsUfYAJ4Co|Lch#=bPIY8M_%f8XD;7=>Z$Cf}w-?
z2D^dD;(hPN1L%K$X9N-_!3z$(0<eb=BoIUrgcGC?qz^zABo4s+mIb}bKSxjJ=VS+5
z13y)62c{Z~2L{`WC7lfg@H=74eu7oA9|Xw&{-G#72y@amurjv(Dh<_3hY&P`1qzDl
z%a2~kElQo>-&}kySzH6AfNZ6G%c9dw>4s9Z38*!fVy2DhW^~=b8dn0$2fdezwUIhe
zc-Mly!TJ~pwd-sLbP13;uK#KCn?K);1+q0R5g7=N8C%`}{t(IFrhOYPY4TAO7wa;b
zI?W96WXlX>)LG8*uG{&!15%(!p!L$FmIG?Iph&x<B@(<{ATh8~5kXrogrsS)y|7@8
zT_}&SsChZ3sPubF*Bkz;aF`qhv0>*zn4-1Ef>)MsO>A&%RV|hE*r(qmvzm$K$^Ri4
zybrzkBPIElWZce1`62xP5QL^tuk^q)F~+f7=z=k&^pR}O{fGna_1??}OR+p0ZI7)x
zmg5N7<0xC=NY$@(kw1<C*mMoHy#o534gn)%|L%`>Xb1oR^dI|wRUM^Y*W)PQE~9U4
zOr!7Qc9x_K=TC<a2!3^swmOcdV&%Uq=e5a#Jx`usCMFdXmXMtBohnG~p|%eip!&;V
zq|OYbhYal@bH>cbtanyv|7T9C=k?8SMwD8}`R*d|B0GWaI`{`EgF*FZqLnbwIi%i2
z>wA_{wPlCthMh|n@bk$Rs*WDYz*%GSbm~$5M=IluFy~S7z*)o@@5k5~dE8P4!SJ1l
zcbMqhM@)rkarmTp#D>!cmj0dwiDE=ZVL}8khwt;okS`nF9$niDtiOw+TH~548VCRY
z8sd+xh2fVa|D~`|%4asSbSTWnqoaqT4==z1UlgWurb~*I0(`|&oe<3#h%1>MkW&^g
zV^TqgOP1V7b-svhp}GMFW;8;|>_ke)BR{8mPIPoOS_1g7xN}|4@xQgLslB=`ZaDdb
zbglwqgSqemz*Kg#BKSj$k3@cxxyS+(0z<eQaT3Ucz&NRb%_m2e0nkFa1X=<?iD~j{
zk81&IxI7t}+z<qMoy8z8Wt-3G;GD-UPVZxR@eg8mnRbYQaE!-W)YQ{Q1FLkciIm$8
z;+NG+2EQ&b3u92C5@oIkgK#aB<36HG<}@5gC!2a|4n7^pd1vmmk35+Cp@%sYTuA&i
zAx$IO6VPWgJ2lou0<<3)tcDkH5=VI!b!dTyyn!cPZI)WHzQmAakTd*8p0S-6-0M~$
z8LgT83?hC{QrKp2OmwV(@-pbPiuUo*C3(=A@hN*iO??bUuEMV7<#fRT?W-58!G)(i
zKF3}S)JPm+2GB)aH>+(3UEG=c52xL(KzR2nwIdIXM3Waf&7~6jv^Yk|8f)YFn2SPC
zI1_bM2t({Awy;X5USOYcgJ|aWC{p?L4j6rzoRZ_z94i>7VnD}~z;pjwK-t%1WaBbR
z+Zee*NzG&Kg8CVsH6-uBaEXXZNB&D=$TageEeM6fo$*k!$aIJK&!oyI<6~6mTIfv#
zk3G&>GBgx>INvf1!&0}5Lc~(LEvPt4k+6k_p|?-R4c5A7qLlO>tK;RAZ$y!2(U{$d
z1g2H=M9dMJ%2K>^50snaq|$FJ)~mwDGPPP#cA$`ky7<ZA)xu4tg2<a??~8B;htmoU
z1R{}ppl77i4n$W&_ZEe+BC47hJiHJmeqM!-k+n&*YTe#7^vX8Bgg-+6uGI+Jy}7|3
z#{GxR=HFWFcJ{pkvR4j6Wb4z8><);*0g$;h_3RRdAB}#}CX_!R1RBjIfQtcXextZ0
zA;h*T9`sTc@Wrf`oo%MVs6pKlUSo8@r*^$jYe37T9>h$#b5P3SO*mb$o9tjpFTM2x
z)aLF_P@Sv2ke}sX0${PTgGR{I1VByAy2t-sZ&W8DyuUL;j-HQz|G^B!$MXllj`5d?
z{vGU${(plV;6I|*?mbZ=*oQNC0{$as@YhLyIfH`OF56i?lp)<X7Nu_8t*{=bx0HV9
zxo{lA{(+b?zA#jEQ4i@T0#OGTF)193R=P`Yyc!0)n(ABvqBnpy0HWZp5cFT<z%yw}
zVpD^I;?CDQF1)>5H#{qW_&}dWz`D_>RxXaYbToI1mRKVo9aM9+{Xykc%IAPC@j*Vh
z*bC{kVOZc~(|y6Di_dB8XeeFHqD*qJUkE`#8kVP33<zR)02f4qB4<<$?+{ET7{U|e
z2|}EBSl;VdMy<8k8%w+2kbNL*U$V2BGzX9I6ZD#dH27g=?r)Z&pC#nqKmgjI*?7^S
zLPXUNylgdMQAZONK3z)bp(wA^kpmZEFzFf=#mR<gcob*kgcquyjTQb{`Dwe;Dv~2<
zx3I7*Jm;`h-;Ba%w9K*Dmn+)Uoy$vw)&1>qQH%GfS#cuE*Yp1PplIh)QI)S33A_jE
zq`?(o_O!+1y^UjDqPf}C&tx`}7pK%(HBrK{s_ridq-wj8?_VchCDET$jl|z*-wo{L
z+i+TSSdn@o3+slc(rS{ct%PpON$~WaNNNOEq66VFHdCcd-DAIk$|r@ZVBez8W|%wz
zh8T&rLRi)@O&;d6k^PV~3(qD=O4bu1r8=LIw?}O6)W?W&?8ZqYeaz!V^L(yJBHkh5
zHchYQ65JSQY@gDN_J?oxv(-H>r?g_HMSq}r1N>cWv4=Yceg*nJw84KXliS%)4<rB{
z3_y*FJwTJ)JEV0FInfu-)yU9tk%rRQy62D21n|S%E7Sh{JZ}?EE1i#5zXChw$Npae
zI}?qdzLU6<vGqr2mosyBG&j_@`ge$5qKERM`$#!(f8w=-3qi}v8R#F)bCp8ZR7(=#
zZ?@}4pg_;s0B|6g&hlIYUp$T?s~=%5u|rZxS^da}E$P_Me<i5<xl(SbH*OOj75Zxp
zXKAm;(7fN%cK;)lRoy0T$od!AjQ=~bmE7(ACnH&EgA>Gu0MqkyPqZN-vzwYek;L5S
z$YjajYy{T59t!fKWII@0>&UpUK4^8c-$yUZjTMnXAXeIp1Stst$hljti&qlSQFK>z
zmzlCa+{A;T#}^dGYE~Q;Xg1-F7a0P?A^;+cUQ2MHRf<{IE_N$tzvDU{@)NWGLz_ex
zfu55gml%r**WGxtj-(&NFpQ+%@8Z@;drO%_-CTXi`u&>1^53a4{>3l#pYSUpB&(~e
zEH3m{?zPwf1xybCuz7o+-U=yim}}@mL+iZS#%i6k(wYG0gI65dj3oeZe`&92uWir%
zbJg~&SOt0>2xBNv$=Kgm&@2E{xb`^lEBALq`D%g2bv*I`W;v+gDKP_+u$vl65t?OW
zI~D)Hf$mU7GyWBmo$zKC>GLufWQ_*qc_M)`CcLlHF~!p;Je_N2>5dcZ2kDOIUEJ#%
zZ;v~^d$PatIdfi)C;Gvk+K21@gM63iKZ>FnNIyOVknRq(YOu6A6v<j1Z+YY$_}vuo
zJH4&z3L??Edaa_5PX+)kU48b=iu?Ws{$UXK9nbHv2X8J%-{v1THf}(Er>11K8ZY4E
zUsyisl0S$cO#cx>oWHF>`ST%&MCa%sY$w1Q;X4`nyWn8)2MJ`e@^p9yeAC>bF;zF&
zAAbYsmNCL+vqyxLwb8<4qX4T(CXuxyd%MvbqG?gQQTXg-m5dI-ip(*n?s#7JIG5Ja
zPgs*=c>sIO>7gJ(L4W_ulH^uvfYv%z{3=*gY(CQ9!kcj_yKu7pJ1;trHFvL&001i=
z0r8I{`*+HErmh|NNfouzJe|Z|QNt{NOu&E{Nm;lfv!-KRTNIh}>zQ+U`C{VPcUe|S
z%Z1KH(n!<Q6!isYpk7%ax6Lp9-xP?HJ|hSK;TMO4<Q5|pi{ase(4tVd9U%iLE6ZyN
zqmH$>nsD)UHa4A+EQ|dd<#e2UJnuO0Ie5$134q8!@UrCzox*qPyag2E^?lF(={4?=
z4Gm7M1(As>BsyvatSyYe91|8!7Bbb5<0(*PHczp7f5@G~u`J@vmwlO+GX)hZ7mXq?
zi8nJ@19j}b&c{%XhYt!0m;(hN1&||m2!P1-Ee{CtSkG-?ibPFs*}ETs10mHvOf%Wg
zM+&i|IEraTz-)*i3N{oT5L{Irl^Q-`3wv{!4gs~3#EaQYaA+#$+3|82<kN7o(sI74
zcRqwLj6@MQ0gUQ5xT=1gj9mI;{xco}XF`5YC^J3}5F8FA;9#PN{k}sw*KEJ*;z%em
z=m1^8^w$MG^sOi^L$V;WX>2os%_5l6fFTK#lurSrIZzzX6)HK}+nWByTl?}r)O_S3
zS@J}FR5Cy1-AMS+Lb^cO5qCLWgtPZ3>ec-hBpVwzA_KoQ2$PB=HBwD2K=_~*iX&Pz
zo(>cn?r1B)Jf#HiAl2K>(ALm{)&{Pf=yRl1HRx7nq95KYtL9>AbUq~#cU`5;_FON%
z->fp)c0LF^o#A%g9n6UA#ouu80or=&uOj#O^EdJM{#4y(wN3YUB6)0g3O}AQEPB7%
z(d~L-YlmHbIosSs?_%o8aJP6Xi*A29z5l#06R_wTjXUA{_<*ap_<om^)l1dvFP6sJ
z2EJ+Qb^DMt>if-ff~Tv&=M0&(i}}6#Jrcd@Xm56LhcWHM*ZX-r51si{QAF2bI}d$q
z{-!~KBu(_N3;${^yJ*}C>m<0mgtSFXY15>7c}}BtnSG>UA;|>2Me(RQc?|wj@)xX9
z``*=a!+Ew5XX!d$|AVH+#@wZ;Ju}6VE0MYg&)6Q*Taz5M9YX=8o*(mI!KY<)385Aq
zA<@tRkzGm}mD8zpwHC>-%l$SLM+pFy!*k_v>Bg&&(eqjyT#SS!#EJ^_GQtdPN0bB?
z)JQ+W=la?~Pe&yrhb(-ilIGBC3RYqb^okMVkuR&`IGoZ*sHiNZ#Ygy0KE-|sv52`R
z^mb0lFDyA)LDfD%aco3PE!{4J%q&UaU?U=<F13z=(?~$YsOt=4hmM`~K$2sV5EEG}
zICEH;S=o$rQl6z%W5mlqaMw)%GMYz)0Juzq+#EM4qK4;!=)$AA{w$i`XH>cY6{G$P
z{CX7qa?>-|V(Yu}xO)Z7szc6Wo;=y%bv3>y&^4vHy@B4_O41N1q8RhMWx*a-##}o#
zFzT(UMgKH1y(Y7@m9Ews+frh<{TVpTb>8VNZ6bM=hVk@A#vM@cCeEZw+s&5N<ov73
zmnLoqdR5B(;rd)zg^f%!8`{cltgpvX*h5gN0sxO+!j$9KFD$)B;)x5wS1`&+G?l*z
zsOhNcUu~+W%sM6G$A($11c!OXOV)m#T%1j?c+_fa97J_UnbQiejfYAZH0|ydarhd6
za=iznY+?xuwMoz-<=s#}xR>rw;lQFxjqV6gx`0(Pm)kA8j|?4A(=VVD+OHTf?dE|0
zIeI8?>B%EsfjaS8t|Qy9+-BrE4LV|OuZNLyfm(=&J@~E?ie|DT$##hwL!!iYVx;<y
z<9Re`6IB<QTWLzb)Ipo&dp#8WzXt*f6{eE!oje|6H3=<Q?GpC|2K5NX0zH2FDndt@
zYU4sqMgl>lhK8Lj33Vi9GZG8c-J%Ad7=VMoTCN?HoF!4P@9k%Nnb7j1H_D++eqj&J
zN^Jd0QgumRvv}P}wY|S46}Wb7_0bO_Dw=$dC2Q=kf-b8h10~lVMQu(g8VQAc{^2gu
z3YiI<YvEth7&6R_RKnVI_s0>Ehk@uvGN-)kmSb>i$77{KMp9l!CnhF{ydN7fGG=Y#
zaUa)CWM69?-bCx}yIyjJ9+#)TOh;?+x}CRa?QXnlJWo`FtTwC`n~l1NDn^B@TGz^x
z)9TX1t6JdRpF*i(IEzK!Qs{PTz;i#-4+f7e^VWqMVJsjz-JfL(?zG%C!^R6I_$tDl
z7k|c>KlRbY=_*kWRM$LC?<kO2mL;_<+$EV#<V<T7qCq~mx<j)H^U~m=#H@B_r|hN(
zy|fh{l!$;U_X@V*WRJNI8xROWgQ$A!c{mAy9|SFpT7c>`*X?jA!*9aQCD#*MuU1l$
zUhQceZu6)yE4QKuuLnF?$I21KqcLm%{u(rI-4%9z44$KjP>}&_v=EUjZ!~hLzAw=q
zyU-ghdn6&W&f4iZ1g74i*o=p;q|kIhg_)=?ML{+H8F{)_#1RT{LHlW9MlWR`zenMW
z9#$>s4j+1sf&@~jZV20HE0gqSDOo^BW+f1CU7bK{HrcBAn7golt%+1YfdqmD_l~@l
zHBjj)F0B^sAb#MwnrvUQ_UOz;?auD-YtTqeS!Q=mmsNLIv((qQNs^r~BZ9=pNt!}~
zlpktTq~n<*rU#~=`to8l)J6x}HxXF@b@90aF9jUlJ0qbe9?4kREwZvUGqgK+`34Xg
zTs!(Ygld9yGKc=T)?!djwu-x`VH2Nl(zT1A(0$82iJ86;WPZsmj&@cwQMWj0v?N+Z
z$w1;B9?HDP<d~quq?|nbrXwJwt%y>dWM>OpNy4}GPzDSwz1(Okd9GEtxT}*@X&Eh2
z?p)9b?eJA7%{DnnuptP$))-d>5dTVWWXBIFfom&<i=WuVOD?c%y}Lu@G2cLBD0Y#3
zK?BQv(QNg3-GBXlXYKXVg$#uAkWkAG(5iNS<6Cti;_TPp`aX<ND2<Vj7YinCJL96C
zJmX(GUZ#&GO<mH?38B5bswL{5nUru0AIxfPEh?j>4>J#5G4Lq{JoDx{#9nIplymik
z%Y{1AvJ*B32P@{#PmAXzz@plMro+pzzS??SmE~bN;u;3l$V7>&DuXjR@H?Uyo|}K=
zu+w(zk0a0qXC&Wj2!+-fSSL)&d~k(IDyMVP{e~GCFIoZvHr^B<Ci}t_G&~L9pgV;T
zSubi11Gd@}Aj10A$*B$_beu;726VU5qmSp4C9rFT(M20-B>a?TRSWdC!f%fEmL*`0
z2iv{r$n?oB4FV^L-0s#887%L!{vNCdcdrC)<jt@c)|cURX_7B<j&YFs9OvYZAjb|A
z^}axB&I0(SI2V^#%;Xh(c#-2k4UEZJ*@7v_y4i`(wb1&W{?&>w>tz_6J$%|dqx5pV
zQsRtmX}EDlc;8QHCi%X#$uPt82tF<S09z4!3k;yXJ;1iwqM3nn8hl`c-`YAhZn?pE
zKR<7NeAQjMn4t>X%Wm6My{E6KOUQos2d08$L-d8=BOm_5;`Fb4_!rXQcGeFF`%xN#
z^w>g$@=2X-=6yZ>X6X;b5O;c4YH=iHn#!%|IhhdE_A5X4<2Bb^`3Ew!fj}2b`0?&n
zl}hxn|JN$j(a!B`xCR!04+5C}(1+?S3#!u)%m}@R?4#KN(Cu91kb3gi_K(tA-<6CN
z=>x|>qXPh7{qKh`|6L0IDk%RG=~iEq>ElCKo$|bx@A3x%{LDudwwZzw6Z%ca#mu*_
zh@tI(OmCEXK&NNI%%Rb_M&zXJ<}5Xo3_OZ2k4X#VD3Rb;K0^TN5W|$aMM3lvS$2;e
z9R>_oz+am$YWhu8{}A#N4+@{*6hl3THJ{?H1<33aR!eFRU_I=aK*$tYy*TeqC`Igh
z$naB{*_avSoWR?~*!ZkIPo-FWv7l>yl|W2L6;}J4ofkC^F0so{^PArdNkhjy21&yJ
zr8u?yQyA$j!F&x1!BU{AO9^=)sGA;ZbaD^Z`8CFuQ>yDXMjVn?^KhIxKhxz{Ol*&5
zlO9F39ZZEJ=GHJ~j%-PG&%vMH&O2N&XeKwqHgGeRaH{+OwX=<Fe~A9nGPww7(p72a
z+a*wce;Bby!_gf|WeHJbm?^dE+o{BBOM2s)=6ma$8JrNF&D<pX$oR$28*7WavluX7
z-eIBbImIi{s-eze%3#O&>!vvBfujU(rlelF26n&u@XN2Kx0kk_lH`JYZOtc+)AQA4
zv-gzLy|_)eEjokUd$B)96-QfnzAR_v+R0@*5%W<ardBQjl(d`w2Gctry+YGL6yxb1
zr#iDYF0aW=KT>;2C1~7s4LBy@{ZoB#bq`7cw2O9q{V49$c>v#(scQYr{Dx$roUplF
zxf#gk;G!+nOoi#!U2RouQV+*G*W&i8KD^-kUWm1guJfaP6qLVonfHIMW^(!t#x_pB
zbnfrse#D}W4kbw6HS@szytEA(tFoZ1fa<7IX}Ik^U)(h)(ME!w*K05o7_J9|0jBSg
zgGw`idMOxZDTsS11eh(5kS!RQEr^jV1iCqpvpEFZEs)eL*m=n>N&m5(vN`xubI|vk
zCNmS2Y4oJYeMVB|B9btr0fa?4@mT2oik1<uPX^`Q^Qv9i1BZ5IT*S8VY+n-`3=6~+
zm_}v1x8FOFSPUzjiApH?Cxnr{2el_^rG>3aK3q{e6gO_QQ3Zz)gN%-+Sf%ubNp*s}
z&noX3Wx#&r(u|hH#VSZm(X!!?9thr@)h$;l6CZ#yk8pEL{Y0LkMpni&Vn~_y^yu1U
z+o4mnc=FSuqwDN!NB6z=<k-mm9qxCLgPu3*F@B)4zeN83VA=o1QB+4J7+GN?@4Ywf
z-{;Z*G-Hh)$yTl<LEY~ime)N`jX^H^^m><&#6cfE63m_NJ6Rs+4~P#~4}cG!A0QqO
z9xxv;9*`a&A7I^}AC5OJ-l1NAyZ~MRz2LmS+u^;SynwyHyr8`Ry@1+bU*Ouo+i#jr
zN=cu;#_$|s)8?<RJn9jC-&L>BxOn~<&r&frE50Hz!}bBB%5<QwZ!?(eEh;)%GRZPj
zhSV2NnS}vsvNP6aFfX2jv6^sS{s`wU?b!_iKbzjyKN3E0<Muq7>45P{LARmWBxSrB
zO_<(KChd;Z;T|WO=vSZ3$Ze1~Nhga*h=Nx0xI$4a{~^}mJgyeMe^^eAElrasej?2g
zmK^J$Cz2t)X8d!2XC)QAY%w_HDAix7Ip!XYC#fP?vd*cRL$JThlw2;iNjk>E?CEfi
z3>VX*#)G?Thw)0>!>*JOjtR5v4qLv!f6v<l0t<d9YKOz5RFTpcu58)lW^uNme(BTN
z>CRy={Z5#$gNoHH(KcA3IPcF|qXf%ANp?0qXKB-W@-dKd;(fdLT!vL0Zu4ZeiW;d|
z5jfr|Q!)O>LLkAZ4$vs?OC$Sq(P191ns&Y^e!Hyc4#@Ar0?OCv%7g1TtOVL<+>|(K
z(8@yusxLLz5%ZK*U+yBnd!eGI@t!P(clMx^Csi2nX9G*eTGInhGpdBp5BH?MrO#-t
ztk_e=tF<j@G3Z|`B_rm9@!jVvh#F%UpZ#17Kd_L>Ro=|w55tkbcHh^U55_BN3ql(f
z4Yk*y5)9EXFTyTM0G|P0u-i+Gb8#e_w%?QsfhG`kz0!btTCS7%#4WZTxZ+iEtcKX<
zl`}@bdb><#ph1D;y(hU}SW+~tk7nzcF;jWII2-_4h^5AA4cK8|9ZN8ck*3LVM=uSP
zhOaxH-60T|0_3y6a!Fyqe-FMwW*$;b?Y3GPD`{P?0A>?OePh7x)SHOd$J`t>HxU=m
zEwsyNRk~Eqxb?J-LHo^x`T?JRA;5w9M}q-5DyP!~jorqPQAjl8F`2jiJU6!n4ff+x
z)kag>dFx5#|NMB{c)GcG-==MUy#N051^stB#9Ax-;_%_}$o>pZWBw03%}`%YZxitE
z0R%i5gJA<PV=)sl{Y#K=dO8SztM~UvzF6Q;`n@2(r4)R`aazF9U4}q9B?c4#^#K?e
zJ{2+q0VM`{KY(E(G(3?|Nklq)05VmO-912KeTG94{}(?^9DLR%z&(dATu!V6{r^Y~
z5EzS~$w2@BD!~2-KKqOGznVOTCVF~u0NZSMCdPbz4OR#mz@y+Jb$%F;c&U9^_+j`F
z_zCzaIe|TKJwac-L<NNr$K#{)ZYdaULF$PakpYzs1D8VR7aNfQ)au7l`S6WsWdi_@
z0adr$FPwW;K^bXlk1b#4sjijyM!lAJo(@{WnE4IV5izUc3=cPzJ$O+l_cy5DrW>DB
zjD4DBu5H;n$j?VJ_xGYZ=zaJ1E%iaRSh#l{z<G_Vj3*>(VC$+UV@KVcpKxzt!g@P+
zaw&b}UQSNdiKt9jBd#H;VQUZqExyw@TiYnrS-~+8?_l?m*BZdlrgaoE$^0y*9lPC6
z*-PSn?wDlOvEfZOi=>THWvE~;E^pu<E@q%0Q%Wy4)VF7~lI#23-X<lERkVP<8B04v
zPR>HcK-|Pf$6mzbi@&3cfqf02T$-uA{m266mP`f}XT(cnB38ELj;o|J6*;wpvY$sU
zL@{YaS+(226Wm3?mjhpWZY4#&MZ&|()T}fOh4_^6%_I$lOx<``sM#_8AY*e|<%|`{
zbhovc*QIG^`@miF-GkjC)nj1PqEbw*F_)LU+Q}tZCxbfy5vKvKo&sUxl7!*PV?7NA
z=g*3%p0YdK&q6sPK^T=#G81CoLBaSLq|nK(OBo7mZR;i+QftUA9%BtpX!1@B;72AW
z#Yd~AfJ*n?RlUk{hBtEN#d4VL260)O8q&A;s?gAhNQzPcl#_hZTup1{92P6<z*P99
z(9g5W(1OcU>?+8_zf*z@!Vcq(Tcqy2#2KzFK3*hGT->@t1@mr}>c0UHpEu!tUs3az
z;YxHHIh{Ie6c<?>*pJOhOHKj5cG#Gq^tl$FfK%LPyuNUFtpo2H<1YbaPZ<fz-o4VO
z*)y3{*1spGo&f8_2HK#D1y`bW5aRlg=n(Qgp>sg3%S+z0{)iC11sFZP9qXlcEH*BG
zDNQvhL#+UOT)W=q;$kD5Jz1(NIYVmUT9|tPpkgNhz6U!Iz73S2Vp8QU!C|W-Joy$>
z8H=81)DwmspNdwb8==W=8Y3C7|NT&QpNezZ`4W^EEh!(ZhYN7#I>SEgh<)*0$FeDj
zQQIbyI#4o#Q4X4J+P}B-PFCOjetYaqx^%>GK$nI|C|b<N%!E(IXTPA(n0)YrJMpxv
zx@3CE14|p;Q_MnMo*-Xpn8`-Xi;U-o<0A0Zy)WAZT3*>6tQbh57(0|rn0R+LGwAUl
zsK+a+Y~uT>uFXlB$qyfaMSP&hj@-HJxppMG5kE3iDP3jNdiO`q^E-&mOcErVFI%X^
zO)-L}^%Xnt@WhIfue7i`)F(ioQ$H^s_t8lS7_w-{#wyc2hbs@-EL|h}6<ZFT8?#9b
zGPC>Jo%E)GWm>ZZWQteHMQ!ynCYd7QhF%zS@A51W942JNrR5<c$H{}tf&bA|UL&Xz
z@cM9-e^_e$+uwZj;&Who^-zSjy5bFv`3zFO`sw=@VnygfAi;dfCga4D7ehNlfvtpA
zB5)(s2R>yVc^yZll_fW>p-}0ksksdVl(5lc;{)gR(qr5KU_I3L=YYSn3qp^q&IIRV
z>jPe|-gbu;ZSDgY6Q1gZ{JZ}?e%e*Larlp-t%<xE!Qz93KWr_s{HmuEjIBOODIsG=
zCvzKpCv#hyzmr^gq+U80A^9Ht8S}x|iX{r;Pr4LwZH#<zUt|5f=Pw#{2y!{SS7~6o
z?8R=1u@Z>C4-i|`T+pnVve2(+ddA<Vxhq}OHiu9q*@PJ$?lK)9%vX+GKUzb7(D$+4
zhVFb`7Z2W#Nq-MmT{kD0)*tVGvB2`N|ChS+KUk1;FgG>-oBAbAI3Ri$5V=16L#hfx
z(#Ek<(xeY3D$h3;k1`%7qS$(efVg&KeHXQvBolV3(^^OMtasvU*NCFyTA^SW!FI|a
zi1u?SvO!oMS#}~fs*gCj#sa<OWaU>U@MAsTMlTNW-lzla16}^3gB5z5g7Y^6zbf}X
zXW;*~N&iJWZOD%a1s)Q(f{bLzio5eNzhZLoWYVZYr!#zl*6Eew58~m*DpcBd)lxr2
zh#gdxT%GRAx4Ti;e|9wUHF2y&>Q%6=P9r<O*XL0@oVxkH#6O?x=suPMSOPZx!v+-D
zRpI_tpg(AOve5kA^u$N%`=v4kA&|3?gg;6^ttC5^NL(lDiS>g(*FtzS+l7SSpVVwV
zR0aiif%?K~n!*%*Z-L;-sZ6-H@zCLOpKx30H5x(sePYWA23Hm%aY|-s;>`-$Uor=H
ziT?TebTRop|BoCe^QaTi@8eH+{w&8~`HvjOI$9eVkRL+?KBptQ`6^&3o|3q-fhgvi
z^Uh)wBT0peX(1!-<TKACleZojw1dj2(PR)IxDM649+mRE{r7zB$+uNaQ>C^*L@n-;
zpJC(VPF2z^3Jg0H_aiBBs~T?)7Ii$*`@5Nv4O6OK_nrjycwG}}pNMB!t}oYLq$_;?
zA$>R_;zsZfCX_y&KWG^K#mK)i9zCFKbH4FWKLGs5e`h>=_AX#>zQIJnRKZHYM!`s6
zvLDl=U@T}PiE_bm5FwgTkj1&7_;L6+p*MK`S{77RG<?(pbkux+i3q_G!9dw~p?!N0
z@#KJ(k_Kd;wR{$sZWwAUKz{y@dd|XpTT-DQgwT|I9SzUxZ9q6b7p)IQmQZg#KUaEO
zx{6Fmwn&RoB!5a9r@$diX^`yPXqPi`pQZ|X2D;LjB{^qCg*|breKH)#ASJO(cWoJa
zsOY?WVH<AJ3y5T;%u<fk+-`gvzlWFdWtW;}ev<tB&SkFZcaNpL&MC0`)DxpJ0`1!3
z-dtbzF^gw53&t&1{m&sGE-t{$UsC)-fBtW2e!y5g|C;N#+Ixd$PoZWDBC^X$LyVa(
zR&g#}^8Tfb{~vQ5bC2=roF6y$hbRN<znt&Cuq*+6LrYhE2O}wc17oZI8Q;{D>7zps
zwsr4XAvU6|;ClrOT=Emw4ux>u%NIBeE^y#xDXu_x!;?@LVQl^GhW$g-@P`bb9*8Zl
zMb>g2Tyfu&t5Akq(Hy2TzqW$laXLp~B|;Ouj$C#>3}&T1(M+|~n*PK_rMFZes0En<
zjo3b0Q6zSSN#kI6Jr;5pD#f6))7<_GZRbx5m%Xkl)ZRtq0hW#nuN4##mjPf+$x53q
zT2I`r=>5nO%JwX(jKs2p^Cv^+-|b{6D7DxdVCG9NJ0xwE7~JB*)!ixkD(cr$n%tr$
zE_tJ`tn2DK2HPeMo*nlkni=J{j!ZLFF0~I<xXcamm@nu%MO!wgl-L?p?%1;Q7uNd0
zCLcn-F4jN)tn1C+E1ccZw0u1oSPLjPU8dkLsLP~MuQeKZGR*n`@Rs#XW~B83`g=q{
zc#@3$8~x$?xVr!1kpFQnzXId0>6`z6f0D*5gz;g7Wj8MFe1uH_ndt}hnVuArZZ5uC
zbJ~IjC4S6&A+e-}A~#vDz^#CzpBH$(s<+wOu5sS?csot5QQrUPaLrmpzqitS0U07H
zbQTL@CkDX$Bqj~RBw`Umm}Kxwn=e78Mx^vDo#Pu=AcungoG5OprnTa`jRcty^B5ir
zC|LmzLj&+cC5sm{${mVfiv7b2H^Mi%03`DMb)qn))5vFedNu=u7l7;$sQJPwwW9n|
zGsd$an=hI}V8W$<Ke74e6(zJRq@*bhE(*(`3fQpJ5<!%5C&jjL2*7Ib=%p@vp13zR
zA=BGj;|Ra#jZcBAj1&e_pX+vX4H(p@QK3Z)7+m?fd%w42eGG}o@IL-yT36N&1?2TZ
z*1v3l=YK785nG3UnnHLlAA)cd2hZSQbKt2k=A~f#H0;B0C_<Fbs~szivrN$qsg!SM
zO;F|bjIwlix)Lv5EYr6JtS3HaC1LM55$-uY)LUh)4I%2=Fpgr%CfJ1I?7GBd`b-pa
zA*<^+gTcdrx369$cf#kTKAjskQ6mNr+6j9PtW+l4w4<Rgwy{+e_^<l=$&+afjk@;x
zoHIzAoLd>-_20<}s6$oh1}8=xR$V*EPnrTIGJ{KeGEn!PB7KYp&KcV13tT^4OZiMK
zGk%-ua_)RKJoIV>_C81xG_{Q)jt{GB<z;+d<Db0izE1}49O6=|*6Z<qG;As+csAuF
zGm&}$|6Q5uuO&Kv#koIBkN%;||DGF5lKcgj3sJtj??QA!%OiZ^8%Ezm#_J86W`nT*
z^mX*41|0@ya*(9XE=j_?DIrr~vYAS9M$Or(w_@J|+@_Da89sUwe>I4(8Blf$lFM%>
zd`PHCqep_#hqit$e%!*=!D#FCbmJ<mQz7Vcv&*#aeYD(0!e?i}yYSwY^O7RwuF*0|
zFY7@VM{dS}*bX0ph@Z#6$SS(orV|s(=ars1yofxoramsHbQK3mQXS;ZK3%llZ!+^o
z#LI2a^+(Y2<)*dPPn9D$ign2B#9fw!7$-l7mv8sh4YeFO3^Shi+d7eo=vk@UeRy*_
zp1NIGWhOHinNnt{W9LlFJT;T|FMY~2?~50k>P%A;b=IJmiCa3(-Z-*qI<@idJLRig
zD88Z-%q98n1YsD2;s;|8WIT+Ely)5sNe^7p{(d9a0&Q|C|GE)@|Fx?BD{1|QgAun`
zql4jFs~6`m;t+NLA%Y`lnB&tv-r4AIO7ngvC=-Bp^TX%u1KEm--eFt++O--2zh(J=
z<OAOo+|@gDDf+<Z1(n5{`HZw4wDI-3sU3e>MXR#f7}6yba=8JZ%TT5yP3et?;Q&ud
z7(2>1G#foXYP8bKag=csPbIpvghk09J=|tuu7gnbR$tofvT8&)lO`qT@-b?28b9&~
z-GW7l`=CEL1rKK>ohZ5<N>mGyU{&~Op!8umR2URF0xDQzW467kTwV@v#n_=~fw~>i
zL*ybuj$esLw7CQMXeJZIe0#8rnGueguq}pp4o97bb;@;x@~RZQLeLTn(4xRp8tL$^
zWt7r^Qfou%JVu>svVpw$*NWPKTcI%1+H{o`9Tlt0b}BLktZE~$JSw{M(h;jTkGHvF
z-Hi>Cx*t|7Y2Qui9(~>4Z@_(@?(7|O-obvqwV8qC_|E@lJNh>~oisLqO$if7niO|3
zvPWK97gz&WS5MzQXSUAG>{~lYQdZ1cLX=&Wb80f%v~qU$dKaNO<vV41=zGX~3+e&x
z9l*nHn;qS?;STTZw=SS-i|!lXDNcjWQ=D0uZ|xes1wE@Qnm$T!Vt-H*;SM&BK=M7o
zh&1lHo}=jpeZo*jLpeCSIVk)Lb;2r|NS^dMhP_R*RC^GoxaCrWcU;RSdd*K<(aF-y
z3}XhoOOmm-R-~GjhFCW2gQI>Y;|A8~Si^i2(j!e&NZM@1R=9=H&&6!C+|{cTN4t2q
zb@G;?7I*R|LQ#pu-{JF$Ys8)zI~?)VC7DN$<7&_+9MAIbXb3whWK^Ds(1ZndPbYTl
zUC;d~NE;zZm6>bhISSlQv6v-<Nd+v_P6UWeL{;s#%Oy+H7AZOpPJh}@Dp=YedZqJ`
zmeMdp2vW0ojI$8z9rY3r(o7=R&5M5#7$z|ww!C&}Uifw-#%svs*%ec^lB-~aa~9(H
z6+H>Z=V);-13@dq4yRwTNi>lgP0Mp!&dZ474hB8)b|5AHL?^XH>262%{$l(8u8qB+
zG2M5?4c{uRA>Mz$jYa_9dn!KcSL34}`3IAStp8C(M8#-Be@q?<%OcJR3UjO6no0%Y
zA?0QgQs=@`N`?A#XsZraFFUkwcpjXNw`zi?#)d>pDnKpO;S=do!E-32s@&R$T|8DY
z85BH9y~VJ*(u7yCg`;7ys}g(Gaxj-%hAjN#q33Lz5%(hC^+4KdwXW+*e;<b{@6bXf
z_WfB?cgL7Qfo!hA6W4p8zUZ0$Gl_N2a6#%87Uri0ZP%==)`rH0Jjw25o}grH4E*nQ
zfLX{bUiJa9uKd~8YX0K-uaYAu0agmx6k`at9*+!Hn1=&&&nTv5vk+(kR^C(-3e^le
zz$%z(e_3Zt{HVbdJU%o+urnObDuy_&N5qfs0h`byu6PV4C89qn3X}EmTZ=FYi-BAn
zV(<34W%R;lD<<=G&-H_y`>uQU>vazRguHi{Cr|$q*7Gy9JomJlh-Pqj0NYEI05BN<
zKn*>9NCyDgX%2Z7BhJVuc>-VNDL#Kd>uNF@+}do6@xu{JJW()1SzT_vd?0LV<k06D
zobxgOC{${J6{bTx*b1y&7J?1rHV<C%<r#tX_aHJv#o*&)1XNKVX%`Sv!19~GlJzq9
z`a}C1L%GwU6>r|7y3Dmj86Fskd^mO7H9Y^gi9oL#iN}l@z?`$H>_`rOl~nAq2j+AV
zDXRTyx&|J;L`f`XniXJ3!Q?ku(G3nZhO){L4E8DaHX|*yJC!Qa9|C8NGp(6@tc5K7
z$`2Ik1iqNtq<K<QGN~AmE3n(t0wLtmT*JWS*n4XJjmBaz1XZ_BHP7osS?$I3bf*Jh
ztoba{#2Tn8okI&=q))eTFHV~A$Ljz#Y{W4;R1*kPK!|Lbe8}z8E<le_bgqS()!-c3
z{pXoYGA~#ggr6kfRGp(Iw9q?qzTs>daLOnQ!?@6kBku?9IaFUAn~$s~ryV)RxiY4e
zp&9jVJKj7~3Nb&$H|A|+iDpU9fen{<DM^@bkAXDnxeS$30Xzpf-S1DOT<MQ~4L%j6
z#US8CsSR`?%bGAk5=kd^Qg2~W)*JpQKbsGTs(SLe2htZyl1@xM0m9a&-w&*um)6Kd
z+i~4=mNl|@VKT%(9rV<aQ7fTxTtrvQ@}P!!Q+fSUG>y>pl|5~?8DrFy-=rT?#C$Y&
zJU)g2MYP>UB*;Fm219a4y7`M<;!4mD!YqE^u~-cxVSIFpeFuVWcbVWvAVz)jmoqV8
z*g3930o#)@>hXfN(z&}xTXfbp>>x;EE7znLDY-`w$v6$v9yEEUbqxm>h&?uFJugr{
z51FJ!E|bew>6)VpSkIHpvu8d>ixCB<MrSGQR>c*f#}4BvIo0Minof+3)CMJC2<5Az
z$`P{Ktc2WF9=gl2cm)PAZuf^yq2i-%<Ek|2g~<BK0hYctdKLmA=tT_39E>hwNSBM{
zLsz!j{+)|DV#1oziIb6`#znQlJM>e^xq+WW_1X<2i9)*Ah@VA6^)w(-MRqzD*u_*}
zA_(ELgOR5b;x0`FJ39&IGrsI4M(Z@j*cWM5;Ve>w6b5{zdX!=iK-63l&feDOE$(J6
zUa=(qL87!RHi-ShkH$0Kw6*=sErVHdAqnH%xpxJ}Sb)3N2juG2O(WEkb)i?qVM%v4
ziqRfAP4PriM*&tA4i~A@g_`fA`~uQ>HaEBHwznr_D<v?61mpHcwJxB=>+BHH`Q37|
z=OJ2A7!5@epPzut=*vRSa%@{oIF0?bT`4W5SLG|Xa-hhaMW2>?x7^Ik9<NLMtC9yL
z*`rsAm27L%11%(l8Bs&?4bA@9_m@$7w~cW1O+l{gK*Awu;jcR45^*ZtG02IFb`DZv
zPgSzf8W%MBsMjn$17zHdGtig+$k(VbuhmsQ{QMun0{`}SZf9ehuzq|fLetuby5jyI
zOxcE<SaSYo>Dd5M05Zwq2>kZ446N=0lK6qe&Kd<jc~lNu5(U`P>B-X=<44bpeA8tr
z6UI`o_U!k6;hMkJL)yc4o!|X&dZbRP(#NaZkLM4f5c_{bA>)WPIKGc4G)a&v_dqf^
zWp;~26dtv(QPoBO5tlx)yUL0GEj%?gQ-0S;2?eI!;Tz;Zqzl2D`}LDe@{ei;M4xeI
z?)4^W=(y#R7T1(bo1rZ1e>C;meDm(mK8AwEiT?<n`ir>#2^OxPYMMV<T{>}kfKZAR
zLa^dn8Ju%6?xdoYrHVMH74OYCt&14(#r!1&ko<!HAhGZuWxj2mqY<%zK%YARJ5F#P
zJiZ^Sx2d`$cAUI+UTAw(bg*Cr34GZmsT9qrF80-Z{PaH2^io$D!JmV|ivkuUuqD@=
zRIDo>Eq5;`i~3I1ttX#cN5(j3IVXuC0a=hA(izDhtSyisnjxSq{2DnUm?4}YlEH_W
zcSkXJDz}P`LQRVDh(3_48Xj{m_l)B0K}IOt7G|*f;~j%txAh(u=BD`Znt9F{bdqcT
z_I=S8)fw|=hrjuHgkyMSSBeyRvJ1H!xI8Di-Lt%>95_mYHuR&5a2cY-y}-MRaHs5a
zqbL5E!tJTRnmiHVoR`%BN}}|e`770N1_2PGFm@J-2bU1Hy54$AH%oNa*Vf{0-RGhr
zlj5QG{`XG}lKQ4qy~~-PD>p6&-s#cC(FCt6$L+Z!P~4T|4>aUz2bfjlOP|TCx<tK|
z>^c>9O`xA9l5i<Jd=$xEWWGG7?F9Po_4{8eqRpk4vgPr0JRGng3qN)kj4Oif?0~}G
zlfOKxKB)@5vrZ0xmUWTWKd{bLzUw`8{g9z1ds-22qJ87ceLOfj5@`2jJXc<Q=bW4e
zMb)8lW4_qxdso@D{TYQm^Y$LJ6#|NyMR5)fb#lX%gd+R?^4`uHjZW~AW$Lwlv4Ljt
zVjKNFxGGPDJTNcRnc7<2PSF09c6YbF>&A44{9VzT!z}x@mo_Q-wd+y$gos7ei#4NK
zcC*sO_WekxbcB7w7kk-j`zgw~fMbU@Lrrb}y_N3fOS@|5m)`N5eN~=iEB+&2<%BG<
zr-K5I>dhxl6sU@FvyMQHN8IR5^8pn<eyrZu-J3SigJWhgr3>-X$W#>{IXqn;sZqNP
zCb}Jyb2~?Ysw8sDDtX;{ulJePsyQXQ(qp&h+HDnl4uA5?Od(I#K!O>0938bP6Wa`4
zx>~OW3upm6_9^~6rX&EBH_5SQRav&xQ6lWbC>@NLVkSDx99l_s=T{~vNb*CVyVhgJ
zd5VHYy5^c-UpcKdBaTBy+g2Be7F4lfNkw2;(S-B(wJ5sJj1j98KA)Q?&Jvnhxh@1}
zP#O&x0iTj|s%SdoE+ULHVzU|HMv&)vv>0c63xLuzESKl=WA))0S_O5VTtheR(kbA%
zG;v#tGA}hDt?fIA#cu2FOlV^yXqXyLP>tFTH?1hMvnCr<a5NYLM>x_ed8Qm|bei21
zE(b>~#1nDsu80>zzuTuI?N5CdfHs3tz_nx`E~NP$*_NtTM>B@j%YtSD)0;S-0vfgX
z3Fvd|$yLyZDcNm<19z}U>#XISUyeVqyWwbmpIMB`aR<V@%>4mR%@S5)=O@*=@*N!O
zQ$4|4@!0Rdt4XJ4vls0ure3=x%sy0o%3?A_(G*2Ts`|#H;LM{L+<fV#Q?ZEvdj-c8
zkJ0W*M0-tG1?HZr->%W_RUZAkn^pQ60LE`)Egd2R+4t~#)rtvx=~{@MZDMq=c61v1
z^&Dyh(guq_UD}>o;iHmD8{Lcrn#9~=Pe4&L8`5#E=(z9Uv!1D4=t^1YYCoq9b^cJR
z(EjEqmI=xDqll^~o`W5$vyox|&Vs(Iq5<c`K7-uTP;ddA9ao%&H{mMorU9D~9r=-R
zV*L*Oi-&a<XzC9KLS0@XpP8q6ntYb{UMXmj=nG((jtJ8Q=BKS7o3f{}sUCyj{#9~a
zqy=dJ^$UVjb<VFv1u~iBL7OTt10!<#{?(@NKcQr5X<^b$wNP=ds5_W4>Nww2ufFsr
zVWz#VC(yt~GMQ(Sd%kD|70@m~jj>xLK*!%>H{>U*tEnDKZ$O=qh4{{`-bmc~`*1cq
zyee*X`e@!tkw7RU82UKNL)Y+Z|0t3m1d`vlil3)2-D0Hdu|c}31n=u6Urv^X7!g8~
zf~s$?YS1^xd?t(O)9z8PW=nr(%L*65l?~1x7RnZ%i=%~729g!AxCG|nle6kZPDeo@
z7afyzemaaR-?&%%gv@$NyDemUcs#Ycmads*S7sHq>5@`9wsb>)sKRt3>7I?o{-W&J
zsb9PDgJxQz&Gaa3sj4(7_9)t;?P}dITEy5bW_~_)x&g81CTUQ<avq-QXR~5~p|h>h
z$XO<W^kpqbtQ_~q*)UULw;QLFu7Fou&_R1mk5E@GRiTs4HI**5yc<tHKl61?pTXjD
z;Lnj9T4aev`i8jpb}QPz(4Xa!K8`<iv2R&C684}stoNf&zlN?(a6Fw}#cDTxm(yoo
z0Bpmgcg5$o!bVE5`!Xp2^5a7ExjJ`imLW~MmlRpl+!nk^-Pb}r<)K9}<vpd~Se!(V
zZ(*i5XHr~v8DHZHVgQYR_4)`LbU@M{wDJ(+i9<(>a;h$&q^P}mH&@ah5j8D3f3Lr3
z1WZPDrxW@1<y4Z}fKZ+qW;Xegtbhs8-V*-nDYRjPXVbmu>pIJ!|9F8{g3*4TmNx>*
zkX+6p(WH<^^Rd9=dAMa?tt2rOyjfF@;9xQJFs)OX4DMtzW3{G*idc4!kRmGsA56$;
zuGe9;?3a{!x?(QYyXb8y3MEaU?qT7PG^f57OXqe+!-X6<`S!ZBhh<{0n6280#-$?<
z87xw84gcr?b^=b2z<HEQ;y}SrYbdtRK0iB>Evr*Awti(afD?ut?Ms%Pvrrw@>hNQc
zmnU<+_+^2Inm}YgaG?!wTXbzFvo@g|PXJ<4h*O|qJy+_j))mYr+87;QHWoC1zHi3I
zN%x*))2Ly&NdO&lxcVN%z>ZwV5d4}IL6U3VOTNuDi0HwgrB(0_;eK^P^iA;!`5B?y
z;<J<=bAMIb#_v(DI3ZkW({7xb$&~NC3=eq^)hou{m<;e8D(c&kdifkLjO6(u_A<p9
z*_fg$k!CmDE3m4mNsO=ypvdWT6kK@;-=gc()WH1rWO8u|2K23h_#bq^6Eha7;*6!*
z?Btkz`IGij^H!gtW+LGdT7jK|V-<miN;9yl2^;9u>;=;#j5ms}Bk@oc$u0UDS2MlX
z+$y)$HrMxUA1#Baa=;Ydk?kb}JBf<}Bl6@=su%LCDQFT6M=Lc0V9B}f)UpmSsPZDq
z`Rz~TYQnMmLQ~nzSov9dFUA3S6nJ%w`RfNSO-y5PgMXj}J~%ZQ5`fJjkTAl|>aYj8
zL{zI{-o=r-FL97X?S8ZWeC=YDF^)d=(r{(ayVBTKPfHH=**AfjB()E5M%P8sJqt9r
zzez?kV;mw$&=zEMC#_mH)aBVbQcdu6P!W=ZFC>)~aCuSqeY!2_J?EI}#C<=y(p7P2
zrDg)SbIF6c)g&b%KtT-=Qx(^wO5i4e{JROMAr-^Zv`dZ<6DKwN>DkaXD0}b+4-JBf
z^P^3VYEwo3?TS?T$Fj16PKLWLyK%^(1QX6@H!X9P{Wj2nGYGQ?!Ib%^UN^JYLqoy}
z{E2Vmv0}lA7Pi$STo~k!n?1F`8tO1^<#8DOHtF<sS8UwJu7f7e!wbpd+T`sOO3}C!
z)RTdtU5PGU#x~Xr*GWbE5-!+whlNO8RrD=|CFT>|kCpc%Rd+t>%dA;XRSj0E{jy!7
z{noR)_-Qd!jF?-SLmpiH`#_GSNsu|bP)3*x)tJxeC+E=k7Urp$IUDy<s}Aq<dp1*5
z?&u>IP;k#)M@!o`i-BKT*r$57X(tpWOxr4YSy%H$qE~4cZTeSln8Mr;t2s{ztzmCI
z2@^*Gl(^Xf<(I?16B^>)3tp%v9Z08NWPsZiMEMrddFRy8K;;S;)A4&+Np1<$Rh}h|
zlvY_y+L2km9wQ%x*B{PG?+(JT8U@@_r*<}kOZ5q+^ViOd6qk<1n_Y>XWERi5i^hJ9
zW}N9!`3&xTRkhRBWpWO?x<d1WzkDH8DT2X6?U7VAxuA4J?vo~-6~HWnI>0wUaR7@M
z3GUws9|dU?s{iEo0Jx>2&5262m!)B${l)mz^w@KZQk@f6rM>_ZDB4_ut7&oYnr~&x
zFF>6)6*s93#4llJ2gz2F=xYibdB}Iz;1pm8=WI|QoP^#2GhFS;;0^g_Y8FK!SQQlc
zd0wgVV-Do9-R6GXINf-F7b?+EHmkaXQslA;O~ZzGRS}UT(6G%#7Qf~_ilFBrega6<
z(Ix65NCBXLD{T*f(a%0IY)F)Hq{ceo@=**SOhgZQ#F{BeuP$mqb|toX8PvPiFtM{)
zO&1NG#Oue7wZqm8hPP-<H9-CLjp!i3Uv*OFd!h2F>>viWqpxdiL)kok1gxmJ<zU$d
zRCNx?9Lpdz0NWp0iUNtO*;}Oo)2udPAjj;7e|srI@QEgL+t|i@JP9n0@$|h!JugOm
z%8S4v7Taq?xh6Om_Hi<c<m8ax1h}{-ykh&_N7nCXJOg`>*FMKZyn&&czD5OIGjRqu
zR?QDnMTA(J$Ew+J1hZ)<AsFB%K%wg5(5UEepNA)tGLJw%9o~%O^K->A2i1|m$5`kN
z`l6a!r5`_(u)Q8T3=Hdtuh$Kh?VGBQuf4{^OZU3P_qq_HcjWOjeoi1-#?G7P^*blN
zeT$DTk(JL<#qq5*ClI-kyFI}Ha&iNfdwzA$mA@t95GePq2!18nztH$Um7R55RNMEk
zDG3EskPhjP4oT@QK@^bg?v`$l96~@sq>=6}MY_Aep`<~i`#0YE-aGeuyuNbbGxN_d
z&st~Ao;hbWdp#R9j*(JGwuQqwl%<4;6|DMwaPPu#Hmw?7*in9;9k=V%&gv()(sDdq
zmwfSxMyc%8IIRRJ<IsLtL%hz(M?}-63KA8<oIx8-UlCHXFgHHe(+wT!63PbbUNsr7
zPoIK#Ck~&O%xKx>?<?GuR}t5oRTlH+9tb)Gg;+Z$U^kiw@Lbkg^b~N9nrFp)yhTj~
z?{(-;$$Wg|zRxqU-@ooOPo9ILnH}6*{ZNhrX$t#JG@O|bqOnE+C9-mmr~VF_$Er)j
zi!`oIw<ibh)rj?S$it30?pYim1;Y(yqBuq|qQMmw4n9k(BlTGUcRt%=A<yO3Mjo--
ztX&k-Za1nGD!vex&4GE8!3{2dWFN2^K9v#Hg<xWPDybD!XlhC|-?qyLH&tW$eQEeG
zdG&C5&tH$`4HG(XrAVMmgjzLC(*tqPHy%RWh)T#eCQ`Y@(K)=lY`<HbO3}e!AL^@>
z%#Jey7w=YdB(p7%^p`64axl_2SJN=Q*0^{2(|qDlBWnp~G&oE=A!iejLG-ldiF|a|
zuW4ADLaN%d4?m_Y;-j%uw5*)S@Ih2BvRkXFYsE)q$=Vq%DO0Kp<PT+SWfj6Y5((YN
zC^{*7Y1Rrb^Ie3IMP*u1$E+7YDC&qdZ30zdn!ypXQM(<!xOuA6XA19Fop=yjnmbRp
zyKN4%S`*&{9Zg4fAJ2<zC<%;|Hh#e(DI+DWqtMkHS52@pI>!x@M5EYcQ^}FPo~NG|
z#xonUlPMm%=ZGfavVe6w5s<%j6te%SSCnSD18q|lj_L3vnZK2eSMXW?YV0=UrrR>o
zGl9r2T*P4~i6trKuo_C*7@4`xB^9bjgOLxv>@|gHEjQxV?s{4;R&EDW6({@2VGE9#
zllauCb(tW$M*GU)5eIY%j(8H)Df+ziMrc+2MA%2*-b?P&dDXsf1tyxyX$dK6sl$!D
zV9yH*QgY3$oGcJycr?QA75kcLIZA!dpHN;lzB%`OJ~wNIUSplH{%Cmn^sClSr3B9-
zEli#XiNqvcJLG-vizGwGc>ExA65|XjXzdx8$cZPWhI$XlTEuGv>`P4I!p3Z1*%U>?
zhunv8{{{Wr%h&ajXw(lL`^nVfw9CEAl=zfj9&@J^nVeIK)+C_KL)X8|W;E3w1R8w5
zt&$fyr9u0E{L-HyYpTYmGxxZ~AaA0WNv|w2TaQ!2T=*W($otf2s|om83LYvyx}d$h
z`)g_TQHyW5GL0P%&%TBlT4zQV%aJN6D37D_bL>cVC~x#f>~I-U>!#TWMaP-oP^uL?
zk<C@4+B1yAUkPT9=O!VK!dmN=!xK0Nx6Y-9TrBf7S=zajnx56%l_Y;xigoHVD3mM)
zGOK#OE~r8ui$vUsmMDl{%EwDJ%~7eknvu_w6G>|puSoStJlEmL9p0X#&k~^OjO|vo
zd&$oWmc^M@oUlkvX<unyRz%VrK6Q}{)j=%N42fkue{M_Bp=)Aqqt=?j(0-6v{F*1}
z!}h2*UDsyY$(#K&<>o@<haBs56dlvp9fl#cg}u5TRyatNMB4J~V;_)&MB>fe!TaRH
z+}hFk`7HH=pz2wJbfKpuX%Wj>`&y)vu?hN%I4k-6BT?2lXU+??QnJnXT)A?AyE|Qa
z)530hh0;Yr0pVt#D-9NYT9>58#>C6_T7eu7lR>qr({N($JrNr|qW7HKtZbE!KwUm3
z-?x1#C&&{kKW8?A6Y_hVP!I_CscQQ0s50)``f{@?QRv~O)x6l=*bF!_|G;AKO)j^s
zreng}IYBF|_ZE$^%#$5vhqY=hb6iSFWECs;@%1jr^rgNUF=5mRzq?xGZc7{QNQBdq
z=EMZW>Fv|3KFFxfu4J(<Sme+UOja@;TD!1g2IZ_Db1)=1xKD4WqO8|an{gf-foX?%
zN*K6S&dRrMFBo|}wrbmL0i&(ct7ls0A@U@+NK-m!Yh(?Ygf+9u<zRo=w{KfuxlfcG
z;C!3<QIu(LhF*tBi}N#S<~HmH6xY?+F;k%YVwG`L+eS?E8Y5{wMP7v<gN&GZ<%oPr
zbrFt;nkp$zE>&TXR@GO=9vHil=Lqn+dYMm?l1|TMHk>QKNTc6R2<oRN(Dpl0xh`zy
zBIYUQL>ME#oLqL!AjafLkaO~WKdPP}By4zcE;CcQpi+5+GgCvjmP;k#sEmh-MD;Pb
zncU$lRLNLEKUP}03x5nXJ#SXZLk~BeZi<MY#OX~;XjM7_$>R!U9qvFuA9Ojl)Nf@j
zqo=tNEI6C<HAD%7IKFq6?38B%TWK2g_{I|}s-<wK+rzseHr2NmeTYny59wVb`b>{0
z$<x`9!{<h%sDv&C$8HO#fL*ynPMruoqgtkj=WhAY?LGZWbgWPG@D$1HQL=aY%!J~r
zr?@V%4JjEj)=Rga9Tn%(Gr5im<f`KpsSrEP+k-ordZe;dt1bK4-v&JFw5ucFHhih*
z8T-P)Fn#HvvadvK@VUn9d`{6F9@fSv$iFzGVcHcQpr(Kt#_VDoOWS&I9!LmI$?fji
zsgaY?e=In}+!hQijd$u>J8UgA9PwiIQwijt&1!{TP>d<tkFv9Xp%yFryvkX`ZGn7E
zXNqze`jHu2*fGS+c4oLJ*K>Y<Tro^8jh8Wf$V}DYGipTf?nrp?@{!(idUe4vBR$#5
zbW_I~TB1H<Vc1;jA;I_X;~c$%j2GU0xiuYo^;=(9ClI~JmZY>dV;h<yHpH*ytHQtW
zALCxC?ojr)xj4@jS7fpKJtV)kHfEf_9&@sM4=i02Jz4+kQ%JGxV<dZ<37HUcc+Xhc
zW6V>*NmO{zG6L+~$#}hiljJgaM#OX%%*m>K61x@@LW#wXo?o+JED6vn5Hsb1*UdT!
zCiZx6OL!)^^x%6M5z~%P1uyvPVC6%zr4o?g;@+a~J&r*32|XrU6I;7A?SIaahi$%C
z`XY(}W6&~LHrh8oqp3s&U6+{P-NTajvt`@+!yiFU14YqxnGp0tAECTFa9?Wk*k9d3
z?k@3#;f2=%5u6|_>W5kn@aPF2&X-x&>R_?y$9@o+Z*No8He5Ri;ztQqB_FId=>Qq=
z7b9!am7b{G%O;hp@3Uz=SldqF9S?RuA5N9>-sM-%jCQFuUYC9Q*dYkl0nflZjO#KX
zx{`c*?u1{p3}G6-DK^tCGOpm^e#?r&N}X*4c>r06XMekF7Iz*4>#)Tv#(1dgSCauJ
zZgLD*EejMSwNtN3i=C56*P6?z&Mdp9$f%<%ItnksGXu~C%axEE5St4GCY#hQ3idSQ
zG`W_?c>K0zQ>B{iS!A&}S~ReT+PAG7<SV>K$Jpy_IL+2Rzp?vz?lku)zO2xcQkR*b
zQF)(z^TYBEIG}6Cp0c1EGYv($>H^hb9CH<Ov6_Q-UqGxd&OKPc@^UzR_B_{ZrFEuv
zyG`CaB5S^{;f0sWmXj6A9R_DmOIRm;$zhXRjn#O_3C3aaF=;)LK=}l=*V2c_o}0>6
zC&Tq-aoaHA3p0z8ID~|qI$6sZ3uW(*{aK8BTG`Bo7I<KjE<DP7$d5&WtnXaSx!gLJ
zr<28iy<MSqEj=ZA$zvevC2)Lqf_kdjw0c=yY<0tHpEvSMBGr>0_7(mTg30HstEu|3
z>*wwL7b>bbb;K{U^4S<%xZE_(>R!j8E%FFdB=f;d+0w3c)}r-xJ@6mrsBJMC?da@}
z^KY#P9(1(dSV+oFvQa`Y3zw+li;tjOoN`r#w_B4*PeUThR%VYV4=Wq}ik%g9O74-&
zbI`l+X#g`R@%3P?sx+MWiYW#{fn^E8@YR$+bpLU~%51_}+qU5q*41jl=O)p&lgrYI
zf|#pm^KrLLh972Lrdh}IQ(v^y>U%-{N{1g!_a5tD77Ia#*+>-aKz^)Ckpib&K<y4u
zZNJaGx9#wz-)>hAk_T+;m~WunayFVApZsXUbdhZO-bPM#o<v+@G@s+%X?vhYPH8tR
z*Jah9`Es?P34@`S^SY(-`(Un*1ft8Jckb9HoRPYDr&&aMLgGB|vzCOZz5RDCD6Ar@
z<PxiB+Q-qpTN3$bw0l3QgMXP1%1gN0OmE|IPrci>K#H}-`b}|F_)(x%HR$W?%=Rs+
z`C4@5VZA#Q+cAh?%w&?LOf;}`iXI?Qyl!jPoz411n}VZ;@aM>3%VKca_10ObW@1Lc
zy2e&j($O7#^J1s{HEE+FMHXNtQ2Fy*G!h*XDT2Cak4pbj(n0LG{H_njLE|;d6t>bi
zUYhTb_<6d9aT;o7<&;-u_zEb%%=*hQ^04oH*jVI{EF3P_`Ot6){K}G<ZJ*kkG`}$*
z^okDOm){kx@ASPd%zme?4eqsos_pRQMM>#5yX~hEAgNAA3gPP#jr@uVCGvRp&ZO*F
z!g{UN=_m2J58i%DFbmExq9Q%Q{ER%7r`DxM?uSZ&wa*sUm;`6OKjg3rU-8wJLev7u
zVI4IwAd7y%>C}596EiNMxh;L4Bi<^!Rn#bh&#juh|7C^<`|};D&GC!mlG2@Q0aDnm
zyp8tBoFt?0x8(Ec6h=qqNIUKC=<62<N5YDB_dg!68LXiTGm|w_3(QrB)#>Um;&Bo#
z1;qq#=^_Ri50SGN8+)L~&F1ltPDGi@ej8wyApGE*tU0Y28L&FTPKG|}uB1Fg(-ih4
zq<>XSS6w=1@VhNK>ir2P&F(SNkX1hmr{WiJVFvYIws?orV#>{AE8Ch8X!EOm6cg{f
zk)wYa{wSy_<uE18Q|U{UuD>Q*h;8<92A}rJq%!(!TcJa;E&4tz(-bmr;z|A)mwER|
z6*IPH19ukUS+9y@)m?C+=OazUK|FYSAtXgK<1zK4I3`m$d|&#3_){$=L_D{%#PZ05
z@4S^B7#S_!WG@Y-cSVJtFk_EQ*pHuhP;WGWrwCzSM?L64@T3g=;QkZ-UKhd!x`%Gf
zq#hlQ^)Jc0tvpIr%yI(Bm8K@lyGK%~#?dtpLPNvxd`)y{o1WzkE1}ILxg4t31*SyP
zblYumW(1!o_U!v%;VEqT#yH7DDc+_0Vj%;jnnz=EI2g4ksF08`e=8ZT-$R_RBnBtc
zrIjjWGgAJI6FIL=i&DEiQd}@_Im)}+_t|kV|7<g>ng6{vbxd=|e75hlkWICB3?tTp
z(7o7NLJ}+Y+}hfMhs|S^vcJlA7sc>DNDhmg!&_r@c+I1t;_>`}+q13f(e16wTtCzP
zW7vSA$oMm!KzmP%ueg^UD_A=npWst0pDHlU;*4CW*LG~vl+rnL@WMN~Md-H3*HT}k
zckT1mZ!YC}a1<MHw#Q}(=?@cEgSjHn`O?|K*z(2$l&x@?hL-r^5~nXYUiG?)Bggjk
z1Y5?3^bFXRwUDUqMa$35Td&z<Z7M99FxGLg!R*m;MjI5rVMSS!7Giu8G@k00GdmQU
zC%h6;0T+hVNHE8|P|&&;`mxd#Q5P4s>aDvYue+NJl`zvX$#UKM*;9~y0}*MFh2Qhn
z5B7?f9nYtXvx4+2&u550+m8@)l0%~?4g9grM|*lbRcg}STa^&tk*Qk+hzE&eUQ`{1
za5=VToQzxziMBRp;4W6RS?%4`hcisR?el^bRT?hU&_Si@OYlNlW&Sk!m<FC@QHLbb
zdW|%l^JAR&>gY^|)HpRE(Yf*Eue*8<0R%K|Vym5}<CEV?m6LA`-RZmi`s1V{a%|b~
z^O7kH#5aM8siotD2?vS|&rBDX=WHMj+?u-C60vHhNQA7@>biDGNzTLEnkwAe!;Eot
zLEa7*FN@wikfLSp3k&y-^0&lr!{S7F5$Z$AQJ}mez@)KqRhN`0m%7U|+3JC#Ssq6+
zr^`}1?x;q6g0on=ym`e*G!Q~OTo*S&h9-%GV9mh6<xWNa{X#i3?V7tJ`J2SM`%6n(
zLy_^H<LSNDYY3bj7ZbkZVk{_w0<%Pl^_|1K?iKc5Y~?9ms%DQKmx^;<TV@O`$7GWy
zIFB%8V(;YjO|n$x**KC~db!5hhK`ajSw34?!$23Qtm?yvQNsu;XE>Jlkbzpj?9}mM
zfd#bbalB2eq*3ZcE?~5;sz-5Q?|}D-ur6w_8Lm>lnVDmMUX}Q}yKEEq2y-3%+O65R
z|Gbc&Yn|mfHLw0YiBf{Rci32i_2YU%ex;NnSMJ#I4nH%Dml-(29?!VSBulZ>1!y%z
z-4X*31V|TXgQ-{+Hk#hQ-c;RW7(?le*}FwY_Xso*KKns{_ps@e^UV8jy8Hqi{C9GQ
zO;4L2x8h<aiG15Dl`k+C86fM$x29~c<|6oJyk`}N#a=`~rwq$8s|M@Hp(3cyf9oO6
z6MfD7Ml4+;HhccM^=B4MJIr?<p4*z`uRfgW5xL$HL-GvOT0Y>m^`p^Ax_lca8I(cq
zx>&(b=i(w*9%30SUWGQFt!e6AFI&>Iokdh+Wcz?<xO`~5P%SI%+&_whc>0ZsCwGff
zIXH{kb1e%&^FU9s{<I5x=A&Katn5r*j5>~6GB>Z9Idj3Ys@HY-{TvTRU7M3&!h>Pd
zy2|^0r4>eNZkHsORU3^t&Ye=*!c(qM+x5$}<5w|IabLS9w!(*EE+<gltpSlKY;eKA
z1-?#lvJRM|mY&MpUVXsIbGgjodw&C=yVhy9Pyb<VRv;c$QDjP`(U!|VV$=IO)dx@U
zE6d`>ns5ak+sZo?_VV7sH!e?=Y__o<Z{H)LEL~tG<b~s3X8^~TfXeSSj_g!qy4lHT
zb|#GKVQunXOwN1nkJT-sIUdAHwV*xkE;=bFY{>}kA>xeNiwo7Oel1%3RrFOTcR{Mc
zoUTr#N|)9QF3-!jtpgl-(;h{0BP&ZXuZei)!cX#ET>CF@ggjVf`BGjJr+9WUsC5^f
z;qKPZGMP@{4y39J92Sg<=e8I<GaZnVZjLCIJLr)#Zpqg1#S|t1={M3EXJp@fP0dj~
zr6#zV9=)`FIn&mwMx!=#oryV7!5Uw}`NbXCjLJSOO7(8oxY_HcW<KA}EVUf5!2Q$g
z9WEHo3P%YxE?`T&08h1Mq2;XL9-(Udr%3!3Uv~EkEXxl!n+$`SX54Pov>)k69y6!(
zF}MzW`Y^dT-PEa-j$!E~)-vjlCYaPwH|pw9J2T$2KfKD?*!`U0-I{KbT_q?&?(5es
ztc!O`UjpXo<E_3|&svU@hEk*pVHk@TOl5;pw+Wk~+-A;F@CyU$+Thn+RW;4&5FMwz
z9&tbO%H0zFlIxQsHyYa~qHfpCtcAIefY=aJc`oI=Ozkpp#`LW}9@~sJ%S>6oh6B&N
zeQM&E!{GC55Q618b%rmfPi<;9?_k7!Fh=-eliMYD=zLJAnwW@;i|`t-E~!SX`V|#q
z)z1yrCH=j)=GFEjETmltV*0_XOuQsN^^J?fo5YxjshBAkhb-!Zf%#T?3=aaxTq}?%
zC>SA+{b(b&L7yKtqot97wyA;kt3TzYrI3Iy@FlmK(yC9cmB==>7*XCZdZbDzmdzo;
zTuq#r!@^u-MjW15+qnX)_Ww~U#Lf8Mv_dd{?DHT~h;Q@b(0|<UA-7+2{6KV@w;+$s
z7dGww?;@;o9jCn?&x?dC5GVch^BqhrA<aR$mNxe1*Vorx9EgaBB!>?rS!`GZVaVTH
z3EW=$vFidX+yj_jZ$SZ}Lw-p9xc_CMKW|6@!~*x3_>=bo`$PWli{po4p(1V|7`RUa
z6nqC#oST6ESO5mZ0ykNJVksfZuWyQd1;hgPOn_nwZ-RXR*g*k^2kt@e0}uPhi`M{A
z-TWr&zuoPIKrB!K56wCnqQ1B(_NQV1b?i{AHpIjG8|**j?7)11_H}3(x^4*m*D(R~
za6|LOzJ0TNe_($q15mdO#RmQ!`~Q<~1Iq#wWJAls2kCkLO}+ma=&wF-U;v<z8XABB
z^#%d{*{Tgh10~SVB4MH30R7iKIY2DX<_yJV+ywjUk0qd58CnW!^c&>+muMN7FVMCJ
z&9@x)=GdQxAn>FI#nR*501G(<0uu#_^Pt42-xGhO(E|nnYSW-aJ|XyR+Q1+{i5f5%
zP#6XcW=`~<gZ<T?1q=eTAwkQwPjZ7GzaEc3R}mCk1i66t&3pfElgLkJ2B4AziY10z
zD&7?P)93+eLVjTXJdZ8>9{UgD#!u1^V7-Ad4``rF>fh%7k3j!adjMkqeH+jihBW^r
z#;-ngfl3T0pA2Fb_|0qZzk&>4>OgVD5A>fGgA+GF|9UtAMG{bO>Z2Rv{Hu>gpiu#e
z-GTHf{I(ST5Bt+_1d0=&SS|YBVgVh_KWP+zH3!-Negyk->>okC2>s?50KtBC0|27|
z`{1F6X2$eiqXE0(fw6$C;m}y0ng467zZ%7XF@Vj^(CR5cTsQx%djHn?42%bC(}l*n
z!~S36{pzFuZ2W}QjR?}H^V?(k^}7(*TL}eYLX?;{0srfDGO&ROioNyZ=GdR!g}}}u
zC^qBw*njpR0bfI4*ANse$oJcP|DNXf>D&mMFM(p;>D(OqQyG9WBT(#Z-5X&4IZpyC
z#IG*{{ceK(pUc31pXh)lyY_1$WWWM515S8AIW&5|JZR|jhl0#4$QM-@7$(T?3S>sf
K2l6BsnEwOS?S?Y|

literal 0
HcmV?d00001

diff --git a/autotest/ogr/ogr_fgdb.py b/autotest/ogr/ogr_fgdb.py
index 29d30f536869..fa518ae68fad 100755
--- a/autotest/ogr/ogr_fgdb.py
+++ b/autotest/ogr/ogr_fgdb.py
@@ -2100,6 +2100,9 @@ def test_ogr_fgdb_23():
 
 def test_ogr_fgdb_24():
 
+    if ogrtest.fgdb_drv is None:
+        pytest.skip()
+
     ds = ogr.Open('data/filegdb_polygonzm_m_not_closing_with_curves.gdb')
     lyr = ds.GetLayer(0)
     ds_ref = ogr.Open('data/filegdb_polygonzm_m_not_closing_with_curves.gdb.csv')
@@ -2127,6 +2130,9 @@ def test_ogr_fgdb_24():
 
 def test_ogr_fgdb_25():
 
+    if ogrtest.fgdb_drv is None:
+        pytest.skip()
+
     ds = ogr.Open('data/curves.gdb')
     sql_lyr = ds.ExecuteSQL('SELECT OBJECTID FROM polygon WHERE OBJECTID = 2')
     assert sql_lyr is not None
@@ -2145,7 +2151,36 @@ def test_ogr_fgdb_25():
         f.DumpReadable()
         pytest.fail()
 
-    
+
+###############################################################################
+# Test bugfix for https://github.com/OSGeo/gdal/issues/1369
+# where a polygon with inner rings has its exterior ring with wrong orientation
+
+def test_ogr_fgdb_weird_winding_order():
+
+    if ogrtest.fgdb_drv is None:
+        pytest.skip()
+
+    if not ogr_fgdb_is_sdk_1_4_or_later():
+        pytest.skip('SDK 1.4 required')
+
+    if not ogrtest.have_geos():
+        pytest.skip()
+
+    try:
+        shutil.rmtree('tmp/roads_clip Drawing.gdb')
+    except OSError:
+        pass
+    gdaltest.unzip('tmp', 'data/weird_winding_order_fgdb.zip')
+
+    ds = ogr.Open('tmp/roads_clip Drawing.gdb')
+    lyr = ds.GetLayer(0)
+    f = lyr.GetNextFeature()
+    g = f.GetGeometryRef()
+    assert g.GetGeometryCount() == 1
+    assert g.GetGeometryRef(0).GetGeometryCount() == 17
+
+
 ###############################################################################
 # Cleanup
 
@@ -2171,6 +2206,10 @@ def test_ogr_fgdb_cleanup():
         shutil.rmtree('tmp/test3005.gdb')
     except OSError:
         pass
+    try:
+        shutil.rmtree('tmp/roads_clip Drawing.gdb')
+    except OSError:
+        pass
 
     if ogrtest.openfilegdb_drv is not None:
         ogrtest.fgdb_drv.Deregister()
diff --git a/autotest/ogr/ogr_openfilegdb.py b/autotest/ogr/ogr_openfilegdb.py
index b7229956b02c..cfe0548cf4b7 100755
--- a/autotest/ogr/ogr_openfilegdb.py
+++ b/autotest/ogr/ogr_openfilegdb.py
@@ -1315,7 +1315,23 @@ def test_ogr_openfilegdb_21():
         f.DumpReadable()
         pytest.fail()
 
-    
+###############################################################################
+# Test bugfix for https://github.com/OSGeo/gdal/issues/1369
+# where a polygon with inner rings has its exterior ring with wrong orientation
+
+def test_ogr_openfilegdb_weird_winding_order():
+
+    if not ogrtest.have_geos():
+        pytest.skip()
+
+    ds = ogr.Open('/vsizip/data/weird_winding_order_fgdb.zip/roads_clip Drawing.gdb')
+    lyr = ds.GetLayer(0)
+    f = lyr.GetNextFeature()
+    g = f.GetGeometryRef()
+    assert g.GetGeometryCount() == 1
+    assert g.GetGeometryRef(0).GetGeometryCount() == 17
+
+
 ###############################################################################
 # Cleanup
 
diff --git a/gdal/ogr/ogrpgeogeometry.cpp b/gdal/ogr/ogrpgeogeometry.cpp
index 84461f72edd4..b5a703ecdab6 100644
--- a/gdal/ogr/ogrpgeogeometry.cpp
+++ b/gdal/ogr/ogrpgeogeometry.cpp
@@ -2882,8 +2882,12 @@ OGRErr OGRCreateFromShapeBin( GByte *pabyShape,
                     if( tabPolygons != nullptr )
                     {
                         int isValidGeometry = FALSE;
+                        // The outer ring is supposed to be clockwise oriented
+                        // If it is not, then use the default/slow method.
                         const char* papszOptions[] =
-                            { "METHOD=ONLY_CCW", nullptr };
+                            { !(tabPolygons[0]->getExteriorRing()->isClockwise()) ?
+                                "METHOD=DEFAULT" : "METHOD=ONLY_CCW",
+                              nullptr };
                         poOGR = OGRGeometryFactory::organizePolygons(
                             reinterpret_cast<OGRGeometry **>(tabPolygons),
                             nParts,
diff --git a/gdal/ogr/ogrsf_frmts/openfilegdb/filegdbtable.cpp b/gdal/ogr/ogrsf_frmts/openfilegdb/filegdbtable.cpp
index 1c97556d2821..c3805b8cba46 100644
--- a/gdal/ogr/ogrsf_frmts/openfilegdb/filegdbtable.cpp
+++ b/gdal/ogr/ogrsf_frmts/openfilegdb/filegdbtable.cpp
@@ -3104,9 +3104,8 @@ OGRGeometry* FileGDBOGRGeometryConverterImpl::GetAsGeometry(const OGRField* psFi
                 }
                 delete[] papoRings;
                 papoRings = nullptr;
-                const char* papszOptions[] = { "METHOD=ONLY_CCW", nullptr };
                 poRet = OGRGeometryFactory::organizePolygons(
-                    (OGRGeometry**) papoPolygons, nParts, nullptr, papszOptions );
+                    (OGRGeometry**) papoPolygons, nParts, nullptr, nullptr );
                 delete[] papoPolygons;
             }
 #ifdef ASSUME_INNER_RINGS_IMMEDIATELY_AFTER_OUTER_RING

From d42d7dd189f73a438f2c96495161b386e350c0db Mon Sep 17 00:00:00 2001
From: Even Rouault <even.rouault@spatialys.com>
Date: Tue, 19 Mar 2019 17:06:24 +0100
Subject: [PATCH 251/488] ogrmerge.py: add shared='1' to speed-up -single mode
 with many layers

---
 gdal/swig/python/scripts/ogrmerge.py | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

diff --git a/gdal/swig/python/scripts/ogrmerge.py b/gdal/swig/python/scripts/ogrmerge.py
index f30ef17cbccf..ddfccd835871 100755
--- a/gdal/swig/python/scripts/ogrmerge.py
+++ b/gdal/swig/python/scripts/ogrmerge.py
@@ -453,13 +453,15 @@ def process(argv, progress=None, progress_arg=None):
 
                 writer.open_element('OGRVRTLayer',
                                     attrs={'name': layer_name})
-                attrs = None
+                attrs = {}
                 if EQUAL(output_format, 'VRT') and \
                    os.path.exists(src_dsname) and \
                    not os.path.isabs(src_dsname) and \
                    '/' not in vrt_filename and \
                    '\\' not in vrt_filename:
-                    attrs = {'relativeToVRT': '1'}
+                    attrs['relativeToVRT'] = '1'
+                if single_layer:
+                    attrs['shared'] = '1'
                 writer.write_element_value('SrcDataSource', src_dsname,
                                            attrs=attrs)
                 writer.write_element_value('SrcLayer', src_lyr.GetName())
@@ -550,13 +552,15 @@ def process(argv, progress=None, progress_arg=None):
 
                 writer.open_element('OGRVRTLayer',
                                     attrs={'name': layer_name})
-                attrs = None
+                attrs = {}
                 if EQUAL(output_format, 'VRT') and \
                    os.path.exists(src_dsname) and \
                    not os.path.isabs(src_dsname) and \
                    '/' not in vrt_filename and \
                    '\\' not in vrt_filename:
-                    attrs = {'relativeToVRT': '1'}
+                    attrs['relativeToVRT'] = '1'
+                if single_layer:
+                    attrs['shared'] = '1'
                 writer.write_element_value('SrcDataSource', src_dsname,
                                            attrs=attrs)
                 writer.write_element_value('SrcLayer', src_lyr_name)

From 318629fa6a95bb134d5b0c0f96b6c29c77492743 Mon Sep 17 00:00:00 2001
From: Even Rouault <even.rouault@spatialys.com>
Date: Tue, 19 Mar 2019 17:27:36 +0100
Subject: [PATCH 252/488] GML/WFS: add minimum support for 'hexBinary' type (as
 string) (fixes #1375)

---
 gdal/ogr/ogrsf_frmts/gml/parsexsd.cpp | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/gdal/ogr/ogrsf_frmts/gml/parsexsd.cpp b/gdal/ogr/ogrsf_frmts/gml/parsexsd.cpp
index a05cff8067ce..3047ad747f1a 100644
--- a/gdal/ogr/ogrsf_frmts/gml/parsexsd.cpp
+++ b/gdal/ogr/ogrsf_frmts/gml/parsexsd.cpp
@@ -451,6 +451,9 @@ GMLFeatureClass *GMLParseFeatureType(CPLXMLNode *psSchemaNode,
                 gmlType = GMLPT_Short;
             else if (EQUAL(pszStrippedNSType, "boolean") )
                 gmlType = GMLPT_Boolean;
+            // TODO: Would be nice to have a binary type.
+            else if (EQUAL(pszStrippedNSType, "hexBinary"))
+                gmlType = GMLPT_String;
             else if (strcmp(pszType, "gml:FeaturePropertyType") == 0 )
             {
                 gmlType = GMLPT_FeatureProperty;

From bdab2fffb0d9a2518458ba5bba5ca0b3db71f759 Mon Sep 17 00:00:00 2001
From: Chris Tapley <chris.tapley.81@gmail.com>
Date: Tue, 19 Mar 2019 02:56:07 +0000
Subject: [PATCH 253/488] GPKG: set sqlite3_busy_timeout, handle SQLITE_BUSY
 during tile read (fixes #1370)

sqlite3_busy_timeout is called on gpkg open with a default timeout of 5000 milliseconds.
SQLITE_BUSY_TIMEOUT config option can be used to override the timeout value at runtime.

If sqlite returns SQLITE_BUSY(5) when decoding a tile, then emit a CPLError with all available information, clean up, and return an empty tile.
---
 gdal/ogr/ogrsf_frmts/gpkg/gdalgeopackagerasterband.cpp | 8 ++++++++
 gdal/ogr/ogrsf_frmts/sqlite/ogrsqlitedatasource.cpp    | 5 +++++
 2 files changed, 13 insertions(+)

diff --git a/gdal/ogr/ogrsf_frmts/gpkg/gdalgeopackagerasterband.cpp b/gdal/ogr/ogrsf_frmts/gpkg/gdalgeopackagerasterband.cpp
index a2af510572e8..cf011d569e21 100644
--- a/gdal/ogr/ogrsf_frmts/gpkg/gdalgeopackagerasterband.cpp
+++ b/gdal/ogr/ogrsf_frmts/gpkg/gdalgeopackagerasterband.cpp
@@ -942,6 +942,14 @@ GByte* GDALGPKGMBTilesLikePseudoDataset::ReadTile( int nRow, int nCol, GByte *pa
         VSIUnlink(osMemFileName);
         sqlite3_finalize(hStmt);
     }
+    else if( rc == SQLITE_BUSY )
+    {
+        FillEmptyTile(pabyData);
+        CPLError( CE_Failure, CPLE_AppDefined, "sqlite3_step(%s) failed (SQLITE_BUSY): %s",
+                      sqlite3_sql( hStmt ), sqlite3_errmsg( IGetDB() ) );
+        sqlite3_finalize(hStmt);
+        return pabyData;
+    }
     else
     {
         sqlite3_finalize( hStmt );
diff --git a/gdal/ogr/ogrsf_frmts/sqlite/ogrsqlitedatasource.cpp b/gdal/ogr/ogrsf_frmts/sqlite/ogrsqlitedatasource.cpp
index 7eab34e63196..d372be314541 100644
--- a/gdal/ogr/ogrsf_frmts/sqlite/ogrsqlitedatasource.cpp
+++ b/gdal/ogr/ogrsf_frmts/sqlite/ogrsqlitedatasource.cpp
@@ -796,6 +796,11 @@ int OGRSQLiteBaseDataSource::OpenOrCreateDB(int flagsIn, int bRegisterOGR2SQLite
         return FALSE;
     }
 
+    const char* pszVal = CPLGetConfigOption("SQLITE_BUSY_TIMEOUT", "5000");
+    if ( pszVal != nullptr ) {
+        sqlite3_busy_timeout(hDB, atoi(pszVal));
+    }
+
     if( (flagsIn & SQLITE_OPEN_CREATE) == 0 )
     {
         if( CPLTestBool(CPLGetConfigOption("OGR_VFK_DB_READ", "NO")) )

From e2597227ec75d8b1749387ad40359f6c6d2bfb92 Mon Sep 17 00:00:00 2001
From: Nick Peihl <nick.peihl@elastic.co>
Date: Wed, 20 Mar 2019 21:26:30 +0000
Subject: [PATCH 254/488] Elasticsearch: Fix _mapping url

In all versions of Elasticsearch <7, the PUT  _mapping URL should be
constructed as `/{index_name}/_mapping/{mapping_type}`. See
https://www.elastic.co/guide/en/elasticsearch/reference/5.6/indices-put-mapping.html
---
 autotest/ogr/ogr_elasticsearch.py             | 30 +++++++++----------
 .../elastic/ogrelasticdatasource.cpp          |  2 +-
 .../ogrsf_frmts/elastic/ogrelasticlayer.cpp   |  2 +-
 3 files changed, 17 insertions(+), 17 deletions(-)

diff --git a/autotest/ogr/ogr_elasticsearch.py b/autotest/ogr/ogr_elasticsearch.py
index b9b8bd149230..23c90926d345 100755
--- a/autotest/ogr/ogr_elasticsearch.py
+++ b/autotest/ogr/ogr_elasticsearch.py
@@ -130,7 +130,7 @@ def test_ogr_elasticsearch_1():
     assert gdal.GetLastErrorType() == gdal.CE_None
 
     gdal.FileFromMemBuffer(
-        '/vsimem/fakeelasticsearch/foo/FeatureCollection/_mapping&POSTFIELDS'
+        '/vsimem/fakeelasticsearch/foo/_mapping/FeatureCollection&POSTFIELDS'
         '={ "FeatureCollection": { "properties": { "type": '
         '{ "type": "string" }, "properties": { } } } }', '{}')
 
@@ -179,7 +179,7 @@ def test_ogr_elasticsearch_1():
     assert lyr is None
 
     gdal.FileFromMemBuffer(
-        """/vsimem/fakeelasticsearch/foo/FeatureCollection/_mapping&POSTFIELDS={ "FeatureCollection": { "properties": { "type": { "type": "string" }, "properties": { "properties": { } }, "geometry": { "type": "geo_shape" } } } }""", "")
+        """/vsimem/fakeelasticsearch/foo/_mapping/FeatureCollection&POSTFIELDS={ "FeatureCollection": { "properties": { "type": { "type": "string" }, "properties": { "properties": { } }, "geometry": { "type": "geo_shape" } } } }""", "")
 
     gdal.FileFromMemBuffer(
         """/vsimem/fakeelasticsearch/_cat/indices?h=i""", '')
@@ -191,7 +191,7 @@ def test_ogr_elasticsearch_1():
 
     gdal.FileFromMemBuffer(
         '/vsimem/fakeelasticsearch/foo2&CUSTOMREQUEST=PUT', '{}')
-    gdal.FileFromMemBuffer('/vsimem/fakeelasticsearch/foo2/FeatureCollection/_mapping&POSTFIELDS={ "FeatureCollection": { "properties": { "type": { "type": "string" }, "properties": { "properties": { "str_field": { "type": "string", "index": "not_analyzed" }, "int_field": { "type": "integer", "store": "yes" }, "int64_field": { "type": "long", "index": "no" }, "real_field": { "type": "double" }, "real_field_unset": { "type": "double" }, "boolean_field": { "type": "boolean" }, "strlist_field": { "type": "string" }, "intlist_field": { "type": "integer" }, "int64list_field": { "type": "long" }, "reallist_field": { "type": "double" }, "date_field": { "type": "date", "format": "yyyy\/MM\/dd HH:mm:ss.SSSZZ||yyyy\/MM\/dd HH:mm:ss.SSS||yyyy\/MM\/dd" }, "datetime_field": { "type": "date", "format": "yyyy\/MM\/dd HH:mm:ss.SSSZZ||yyyy\/MM\/dd HH:mm:ss.SSS||yyyy\/MM\/dd" }, "time_field": { "type": "date", "format": "HH:mm:ss.SSS" }, "binary_field": { "type": "binary" } } }, "geometry": { "properties": { "type": { "type": "string" }, "coordinates": { "type": "geo_point" } } } }, "_meta": { "fields": { "strlist_field": "StringList", "intlist_field": "IntegerList", "int64list_field": "Integer64List", "reallist_field": "RealList" } } } }', '{}')
+    gdal.FileFromMemBuffer('/vsimem/fakeelasticsearch/foo2/_mapping/FeatureCollection&POSTFIELDS={ "FeatureCollection": { "properties": { "type": { "type": "string" }, "properties": { "properties": { "str_field": { "type": "string", "index": "not_analyzed" }, "int_field": { "type": "integer", "store": "yes" }, "int64_field": { "type": "long", "index": "no" }, "real_field": { "type": "double" }, "real_field_unset": { "type": "double" }, "boolean_field": { "type": "boolean" }, "strlist_field": { "type": "string" }, "intlist_field": { "type": "integer" }, "int64list_field": { "type": "long" }, "reallist_field": { "type": "double" }, "date_field": { "type": "date", "format": "yyyy\/MM\/dd HH:mm:ss.SSSZZ||yyyy\/MM\/dd HH:mm:ss.SSS||yyyy\/MM\/dd" }, "datetime_field": { "type": "date", "format": "yyyy\/MM\/dd HH:mm:ss.SSSZZ||yyyy\/MM\/dd HH:mm:ss.SSS||yyyy\/MM\/dd" }, "time_field": { "type": "date", "format": "HH:mm:ss.SSS" }, "binary_field": { "type": "binary" } } }, "geometry": { "properties": { "type": { "type": "string" }, "coordinates": { "type": "geo_point" } } } }, "_meta": { "fields": { "strlist_field": "StringList", "intlist_field": "IntegerList", "int64list_field": "Integer64List", "reallist_field": "RealList" } } } }', '{}')
     lyr = ds.CreateLayer('foo2', srs=ogrtest.srs_wgs84, geom_type=ogr.wkbPoint,
                          options=['BULK_INSERT=NO', 'FID=', 'STORED_FIELDS=int_field', 'NOT_ANALYZED_FIELDS=str_field', 'NOT_INDEXED_FIELDS=int64_field'])
     lyr.CreateField(ogr.FieldDefn('str_field', ogr.OFTString))
@@ -279,7 +279,7 @@ def test_ogr_elasticsearch_1():
     gdal.FileFromMemBuffer(
         '/vsimem/fakeelasticsearch/foo3&CUSTOMREQUEST=PUT', '{}')
     gdal.FileFromMemBuffer(
-        '/vsimem/fakeelasticsearch/foo3/FeatureCollection/_mapping&POSTFIELDS={ "FeatureCollection": { "properties": { "type": { "type": "string" }, "properties": { "properties": { } }, "geometry": { "properties": { "type": { "type": "string" }, "coordinates": { "type": "geo_point", "fielddata": { "format": "compressed", "precision": "1m" } } } } }, "_meta": { "fid": "ogc_fid" } } }', '{}')
+        '/vsimem/fakeelasticsearch/foo3/_mapping/FeatureCollection&POSTFIELDS={ "FeatureCollection": { "properties": { "type": { "type": "string" }, "properties": { "properties": { } }, "geometry": { "properties": { "type": { "type": "string" }, "coordinates": { "type": "geo_point", "fielddata": { "format": "compressed", "precision": "1m" } } } } }, "_meta": { "fid": "ogc_fid" } } }', '{}')
     lyr = ds.CreateLayer('foo3', srs=ogrtest.srs_wgs84, options=[
                          'GEOM_MAPPING_TYPE=GEO_POINT', 'GEOM_PRECISION=1m', 'BULK_INSERT=NO'])
 
@@ -301,7 +301,7 @@ def test_ogr_elasticsearch_1():
 
     # Test successful explicit MAPPING with inline JSon mapping
     gdal.FileFromMemBuffer(
-        '/vsimem/fakeelasticsearch/foo4/FeatureCollection/_mapping&POSTFIELDS={ "FeatureCollection": { "properties": {} }}', '{}')
+        '/vsimem/fakeelasticsearch/foo4/_mapping/FeatureCollection&POSTFIELDS={ "FeatureCollection": { "properties": {} }}', '{}')
     lyr = ds.CreateLayer('foo4', srs=ogrtest.srs_wgs84, options=[
                          'MAPPING={ "FeatureCollection": { "properties": {} }}'])
     assert lyr is not None
@@ -310,7 +310,7 @@ def test_ogr_elasticsearch_1():
     gdal.FileFromMemBuffer(
         '/vsimem/map.txt', '{ "FeatureCollection": { "properties": { "foo": { "type": "string" } } }}')
     gdal.FileFromMemBuffer(
-        '/vsimem/fakeelasticsearch/foo4/FeatureCollection/_mapping&POSTFIELDS={ "FeatureCollection": { "properties": { "foo": { "type": "string" } } }}', '{}')
+        '/vsimem/fakeelasticsearch/foo4/_mapping/FeatureCollection&POSTFIELDS={ "FeatureCollection": { "properties": { "foo": { "type": "string" } } }}', '{}')
     lyr = ds.CreateLayer('foo4', srs=ogrtest.srs_wgs84,
                          options=['MAPPING=/vsimem/map.txt'])
     gdal.Unlink('/vsimem/map.txt')
@@ -320,7 +320,7 @@ def test_ogr_elasticsearch_1():
     gdal.FileFromMemBuffer(
         '/vsimem/fakeelasticsearch/foo4&CUSTOMREQUEST=PUT&POSTFIELDS={}', '{}')
     gdal.FileFromMemBuffer(
-        '/vsimem/fakeelasticsearch/foo4/FeatureCollection/_mapping&POSTFIELDS={}', '{}')
+        '/vsimem/fakeelasticsearch/foo4/_mapping/FeatureCollection&POSTFIELDS={}', '{}')
     lyr = ds.CreateLayer('foo4', srs=ogrtest.srs_wgs84, options=[
                          'INDEX_DEFINITION={}', 'MAPPING={}'])
     assert lyr is not None
@@ -350,7 +350,7 @@ def test_ogr_elasticsearch_2():
         '/vsimem/fakeelasticsearch/foo&CUSTOMREQUEST=PUT', '{}')
     gdal.Unlink('/vsimem/fakeelasticsearch/foo')
     gdal.FileFromMemBuffer(
-        '/vsimem/fakeelasticsearch/foo/FeatureCollection/_mapping&POSTFIELDS={ "FeatureCollection": { "properties": { "type": { "type": "string" }, "properties": { }, "geometry": { "type": "geo_shape" } } } }', '{}')
+        '/vsimem/fakeelasticsearch/foo/_mapping/FeatureCollection&POSTFIELDS={ "FeatureCollection": { "properties": { "type": { "type": "string" }, "properties": { }, "geometry": { "type": "geo_shape" } } } }', '{}')
 
     lyr = ds.CreateLayer('foo', srs=ogrtest.srs_wgs84,
                          options=['BULK_INSERT=NO', 'FID='])
@@ -371,7 +371,7 @@ def test_ogr_elasticsearch_2():
         'GEOMETRYCOLLECTION(POINT(0 1),LINESTRING(0 1,2 3),POLYGON((0 0,0 10,10 10,0 0),(1 1,1 9,9 9,1 1)),MULTIPOINT(0 1, 2 3),MULTILINESTRING((0 1,2 3),(4 5,6 7)),MULTIPOLYGON(((0 0,0 10,10 10,0 0),(1 1,1 9,9 9,1 1)),((-1 -1,-1 -9,-9 -9,-1 -1))))'))
 
     gdal.FileFromMemBuffer(
-        '/vsimem/fakeelasticsearch/foo/FeatureCollection/_mapping&POSTFIELDS={ "FeatureCollection": { "properties": { "type": { "type": "string" }, "properties": { "properties": { } }, "geometry": { "type": "geo_shape", "precision": "1m" } } } }', '{}')
+        '/vsimem/fakeelasticsearch/foo/_mapping/FeatureCollection&POSTFIELDS={ "FeatureCollection": { "properties": { "type": { "type": "string" }, "properties": { "properties": { } }, "geometry": { "type": "geo_shape", "precision": "1m" } } } }', '{}')
 
     ret = lyr.CreateFeature(feat)
     assert ret == 0
@@ -392,7 +392,7 @@ def test_ogr_elasticsearch_3():
     gdal.FileFromMemBuffer(
         '/vsimem/fakeelasticsearch/name_laundering&CUSTOMREQUEST=PUT', '{}')
     gdal.FileFromMemBuffer(
-        '/vsimem/fakeelasticsearch/name_laundering/FeatureCollection/_mapping&POSTFIELDS={ "FeatureCollection": { "properties": { "type": { "type": "string" }, "properties": { "properties": { } }, "geometry": { "type": "geo_shape" } } } }', '{}')
+        '/vsimem/fakeelasticsearch/name_laundering/_mapping/FeatureCollection&POSTFIELDS={ "FeatureCollection": { "properties": { "type": { "type": "string" }, "properties": { "properties": { } }, "geometry": { "type": "geo_shape" } } } }', '{}')
 
     lyr = ds.CreateLayer(
         'NAME/laundering', srs=ogrtest.srs_wgs84, options=['FID='])
@@ -976,7 +976,7 @@ def test_ogr_elasticsearch_5():
     gdal.FileFromMemBuffer(
         '/vsimem/fakeelasticsearch/non_geojson&CUSTOMREQUEST=PUT', '')
     gdal.FileFromMemBuffer(
-        '/vsimem/fakeelasticsearch/non_geojson/my_mapping/_mapping&POSTFIELDS={ "my_mapping": { "properties": { "str": { "type": "string", "store": "yes" }, "geometry": { "type": "geo_shape" } }, "_meta": { "fid": "ogc_fid" } } }', '{}')
+        '/vsimem/fakeelasticsearch/non_geojson/_mapping/my_mapping&POSTFIELDS={ "my_mapping": { "properties": { "str": { "type": "string", "store": "yes" }, "geometry": { "type": "geo_shape" } }, "_meta": { "fid": "ogc_fid" } } }', '{}')
 
     lyr = ds.CreateLayer('non_geojson', srs=ogrtest.srs_wgs84, options=[
                          'MAPPING_NAME=my_mapping', 'BULK_INSERT=NO', 'STORE_FIELDS=YES'])
@@ -1142,7 +1142,7 @@ def test_ogr_elasticsearch_5():
     f['superobject.subfield2'] = 'foo'
     f['superobject.another_geoshape3'] = ogr.CreateGeometryFromWkt(
         'POINT (3 50)')
-    gdal.FileFromMemBuffer("""/vsimem/fakeelasticsearch/non_geojson/my_mapping/_mapping&POSTFIELDS={ "my_mapping": { "properties": { "str_field": { "type": "string" }, "superobject": { "properties": { "subfield": { "type": "string" }, "subobject": { "properties": { "subfield": { "type": "string" }, "another_subfield": { "type": "integer" } } }, "subfield2": { "type": "string" }, "another_geoshape": { "type": "geo_shape" }, "another_geoshape2": { "type": "geo_shape" }, "another_geoshape3": { "properties": { "type": { "type": "string" }, "coordinates": { "type": "geo_point" } } } } }, "another_field": { "type": "string" }, "a_geoshape": { "type": "geo_shape" }, "a_geopoint": { "properties": { "type": { "type": "string" }, "coordinates": { "type": "geo_point" } } }, "another_geopoint": { "type": "geo_point" } }, "_meta": { "geomfields": { "superobject.another_geoshape2": "POINT" } } } }""", '{}')
+    gdal.FileFromMemBuffer("""/vsimem/fakeelasticsearch/non_geojson/_mapping/my_mapping&POSTFIELDS={ "my_mapping": { "properties": { "str_field": { "type": "string" }, "superobject": { "properties": { "subfield": { "type": "string" }, "subobject": { "properties": { "subfield": { "type": "string" }, "another_subfield": { "type": "integer" } } }, "subfield2": { "type": "string" }, "another_geoshape": { "type": "geo_shape" }, "another_geoshape2": { "type": "geo_shape" }, "another_geoshape3": { "properties": { "type": { "type": "string" }, "coordinates": { "type": "geo_point" } } } } }, "another_field": { "type": "string" }, "a_geoshape": { "type": "geo_shape" }, "a_geopoint": { "properties": { "type": { "type": "string" }, "coordinates": { "type": "geo_point" } } }, "another_geopoint": { "type": "geo_point" } }, "_meta": { "geomfields": { "superobject.another_geoshape2": "POINT" } } } }""", '{}')
     gdal.FileFromMemBuffer(
         """/vsimem/fakeelasticsearch/non_geojson/my_mapping/&POSTFIELDS={ "superobject": { "another_geoshape3": { "type": "POINT", "coordinates": [ 3.0, 50.0 ] }, "subfield2": "foo" } }""", "{}")
     gdal.FileFromMemBuffer(
@@ -1289,7 +1289,7 @@ def test_ogr_elasticsearch_6():
         f.DumpReadable()
         pytest.fail()
 
-    
+
 ###############################################################################
 # Test WRITE_MAPPING option
 
@@ -1346,7 +1346,7 @@ def test_ogr_elasticsearch_8():
     f = ogr.Feature(lyr.GetLayerDefn())
     f.SetGeometry(ogr.CreateGeometryFromWkt('POINT (-100 -200)'))
     gdal.FileFromMemBuffer(
-        """/vsimem/fakeelasticsearch/no_srs/FeatureCollection/_mapping&POSTFIELDS={ "FeatureCollection": { "properties": { "type": { "type": "string" }, "properties": { "properties": { } }, "geometry": { "type": "geo_shape" } }, "_meta": { "fid": "ogc_fid" } } }""", '{}')
+        """/vsimem/fakeelasticsearch/no_srs/_mapping/FeatureCollection&POSTFIELDS={ "FeatureCollection": { "properties": { "type": { "type": "string" }, "properties": { "properties": { } }, "geometry": { "type": "geo_shape" } }, "_meta": { "fid": "ogc_fid" } } }""", '{}')
     gdal.FileFromMemBuffer("""/vsimem/fakeelasticsearch/_bulk&POSTFIELDS={"index" :{"_index":"no_srs", "_type":"FeatureCollection"}}
 { "ogc_fid": 1, "geometry": { "type": "point", "coordinates": [ -100.0, -200.0 ] }, "type": "Feature", "properties": { } }
 
@@ -1367,7 +1367,7 @@ def test_ogr_elasticsearch_8():
     f = ogr.Feature(lyr.GetLayerDefn())
     f.SetGeometry(ogr.CreateGeometryFromWkt('POINT (500000 0)'))
     gdal.FileFromMemBuffer(
-        """/vsimem/fakeelasticsearch/other_srs/FeatureCollection/_mapping&POSTFIELDS={ "FeatureCollection": { "properties": { "type": { "type": "string" }, "properties": { "properties": { } }, "geometry": { "type": "geo_shape" } }, "_meta": { "fid": "ogc_fid" } } }""", '{}')
+        """/vsimem/fakeelasticsearch/other_srs/_mapping/FeatureCollection&POSTFIELDS={ "FeatureCollection": { "properties": { "type": { "type": "string" }, "properties": { "properties": { } }, "geometry": { "type": "geo_shape" } }, "_meta": { "fid": "ogc_fid" } } }""", '{}')
     gdal.FileFromMemBuffer("""/vsimem/fakeelasticsearch/_bulk&POSTFIELDS={"index" :{"_index":"other_srs", "_type":"FeatureCollection"}}
 { "ogc_fid": 1, "geometry": { "type": "point", "coordinates": [ 3.0, 0.0 ] }, "type": "Feature", "properties": { } }
 
diff --git a/gdal/ogr/ogrsf_frmts/elastic/ogrelasticdatasource.cpp b/gdal/ogr/ogrsf_frmts/elastic/ogrelasticdatasource.cpp
index 26ceabfa49a5..1160f2faad0c 100644
--- a/gdal/ogr/ogrsf_frmts/elastic/ogrelasticdatasource.cpp
+++ b/gdal/ogr/ogrsf_frmts/elastic/ogrelasticdatasource.cpp
@@ -468,7 +468,7 @@ OGRLayer * OGRElasticDataSource::ICreateLayer(const char * pszLayerName,
             }
         }
 
-        CPLString osMappingURL(CPLSPrintf("%s/%s/%s/_mapping",
+        CPLString osMappingURL(CPLSPrintf("%s/%s/_mapping/%s",
                             GetURL(), osLaunderedName.c_str(), pszMappingName));
         if( !UploadFile(osMappingURL, osLayerMapping.c_str()) )
         {
diff --git a/gdal/ogr/ogrsf_frmts/elastic/ogrelasticlayer.cpp b/gdal/ogr/ogrsf_frmts/elastic/ogrelasticlayer.cpp
index b8482695aa9d..95f19dd47a5d 100644
--- a/gdal/ogr/ogrsf_frmts/elastic/ogrelasticlayer.cpp
+++ b/gdal/ogr/ogrsf_frmts/elastic/ogrelasticlayer.cpp
@@ -1944,7 +1944,7 @@ OGRErr OGRElasticLayer::WriteMapIfNecessary()
     if( m_osWriteMapFilename.empty() && m_bSerializeMapping )
     {
         m_bSerializeMapping = false;
-        if( !m_poDS->UploadFile(CPLSPrintf("%s/%s/%s/_mapping", m_poDS->GetURL(), m_osIndexName.c_str(), m_osMappingName.c_str()), BuildMap()) )
+        if( !m_poDS->UploadFile(CPLSPrintf("%s/%s/_mapping/%s", m_poDS->GetURL(), m_osIndexName.c_str(), m_osMappingName.c_str()), BuildMap()) )
         {
             return OGRERR_FAILURE;
         }

From 5a45db548820d04a05a672768991160a4a9cb89a Mon Sep 17 00:00:00 2001
From: Even Rouault <even.rouault@spatialys.com>
Date: Fri, 22 Mar 2019 12:45:31 +0100
Subject: [PATCH 255/488] Fix build --with-curl --without-threads (fixes #1386)

---
 gdal/port/cpl_vsil_curl_streaming.cpp | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/gdal/port/cpl_vsil_curl_streaming.cpp b/gdal/port/cpl_vsil_curl_streaming.cpp
index f1a842f7bb59..6225a3ace73e 100644
--- a/gdal/port/cpl_vsil_curl_streaming.cpp
+++ b/gdal/port/cpl_vsil_curl_streaming.cpp
@@ -79,6 +79,13 @@ void VSIInstallSwiftStreamingFileHandler(void)
     // Not supported
 }
 
+#ifdef HAVE_CURL
+void VSICurlStreamingClearCache( void )
+{
+    // Not supported
+}
+#endif
+
 #else
 
 //! @cond Doxygen_Suppress

From deef145285d8e8e9587b1f9a060de9ceb2425d8a Mon Sep 17 00:00:00 2001
From: Even Rouault <even.rouault@spatialys.com>
Date: Wed, 20 Mar 2019 13:27:34 +0100
Subject: [PATCH 256/488] CI: avoid CI to run on backport branches

---
 .travis.yml  | 4 ++++
 appveyor.yml | 4 ++++
 2 files changed, 8 insertions(+)

diff --git a/.travis.yml b/.travis.yml
index 75629ffd7415..cd902b0b7ef7 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,6 +1,10 @@
 # This is the config file for building GDAL and running its autotest suite
 # with Travis-ci.org
 
+branches:
+  except:
+  - /^(cherry-pick-)?backport-\d+-on-/
+
 matrix:
   fast_finish: true
   include:
diff --git a/appveyor.yml b/appveyor.yml
index 26991f2f7bb8..30cf23d33473 100644
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -1,4 +1,8 @@
 
+branches:
+  except:
+    - /(cherry-pick-)?backport-\d+-on-/
+
 environment:
   matrix:
   - APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2017

From 22fa16e6e6de253438be943be1353187dca9b123 Mon Sep 17 00:00:00 2001
From: Even Rouault <even.rouault@spatialys.com>
Date: Fri, 22 Mar 2019 16:53:21 +0100
Subject: [PATCH 257/488] Fix build on netBSD 8

---
 gdal/ogr/ogrlinestring.cpp | 1 +
 1 file changed, 1 insertion(+)

diff --git a/gdal/ogr/ogrlinestring.cpp b/gdal/ogr/ogrlinestring.cpp
index 810ad2e84595..1d4da9c58b00 100644
--- a/gdal/ogr/ogrlinestring.cpp
+++ b/gdal/ogr/ogrlinestring.cpp
@@ -31,6 +31,7 @@
 #include "ogr_geos.h"
 #include "ogr_p.h"
 
+#include <cmath>
 #include <cstdlib>
 #include <algorithm>
 #include <limits>

From 8c1b90d2923ad24707b0fb51accc3074272924f2 Mon Sep 17 00:00:00 2001
From: Even Rouault <even.rouault@spatialys.com>
Date: Sat, 23 Mar 2019 21:38:44 +0100
Subject: [PATCH 258/488] Fix -Wdeprecated-copy GCC 9 warnings

---
 gdal/gnm/gnm.h                                   | 5 ++++-
 gdal/ogr/ogr_core.h                              | 4 ++--
 gdal/ogr/ogrsf_frmts/amigocloud/ogr_amigocloud.h | 9 ++-------
 3 files changed, 8 insertions(+), 10 deletions(-)

diff --git a/gdal/gnm/gnm.h b/gdal/gnm/gnm.h
index c6af53b6e288..88545badc75e 100644
--- a/gdal/gnm/gnm.h
+++ b/gdal/gnm/gnm.h
@@ -631,7 +631,6 @@ typedef enum
  * @since GDAL 2.1
  */
 
-// cppcheck-suppress copyCtorAndEqOperator
 class CPL_DLL GNMRule
 {
 public:
@@ -643,6 +642,10 @@ class CPL_DLL GNMRule
     explicit GNMRule(const char* pszRule);
     /** Constructor */
     GNMRule(const GNMRule &oRule);
+
+    /** Assignment operator */
+    GNMRule& operator=(const GNMRule&) = default;
+
     virtual ~GNMRule();
     /**
      * @brief  This function indicate if rule string was parsed successfully
diff --git a/gdal/ogr/ogr_core.h b/gdal/ogr/ogr_core.h
index fe2b53e3007b..e894f0220c32 100644
--- a/gdal/ogr/ogr_core.h
+++ b/gdal/ogr/ogr_core.h
@@ -54,7 +54,6 @@ extern "C++"
 {
 #include <limits>
 
-// cppcheck-suppress copyCtorAndEqOperator
 class CPL_DLL OGREnvelope
 {
   public:
@@ -69,6 +68,7 @@ class CPL_DLL OGREnvelope
             MinX(oOther.MinX),MaxX(oOther.MaxX), MinY(oOther.MinY), MaxY(oOther.MaxY)
         {
         }
+        OGREnvelope& operator=(const OGREnvelope&) = default;
 
     double      MinX;
     double      MaxX;
@@ -156,7 +156,6 @@ typedef struct
 
 extern "C++" {
 
-// cppcheck-suppress copyCtorAndEqOperator
 class CPL_DLL OGREnvelope3D : public OGREnvelope
 {
   public:
@@ -171,6 +170,7 @@ class CPL_DLL OGREnvelope3D : public OGREnvelope
                             MinZ(oOther.MinZ), MaxZ(oOther.MaxZ)
         {
         }
+        OGREnvelope3D& operator=(const OGREnvelope3D&) = default;
 
     double      MinZ;
     double      MaxZ;
diff --git a/gdal/ogr/ogrsf_frmts/amigocloud/ogr_amigocloud.h b/gdal/ogr/ogrsf_frmts/amigocloud/ogr_amigocloud.h
index dea5e769dfe4..34dbe2a4abfc 100644
--- a/gdal/ogr/ogrsf_frmts/amigocloud/ogr_amigocloud.h
+++ b/gdal/ogr/ogrsf_frmts/amigocloud/ogr_amigocloud.h
@@ -61,7 +61,6 @@ class OGRAmigoCloudGeomFieldDefn final: public OGRGeomFieldDefn
         }
 };
 
-// cppcheck-suppress copyCtorAndEqOperator
 class OGRAmigoCloudFID
 {
     public:
@@ -82,12 +81,8 @@ class OGRAmigoCloudFID
             iFID=0;
         }
 
-        OGRAmigoCloudFID(const OGRAmigoCloudFID& fid) :
-            iIndex( fid.iIndex ),
-            iFID( fid.iFID ),
-            osAmigoId( fid.osAmigoId.c_str() )
-        {
-        }
+        OGRAmigoCloudFID(const OGRAmigoCloudFID& fid) = default;
+        OGRAmigoCloudFID& operator=(const OGRAmigoCloudFID& fid) = default;
 };
 
 /************************************************************************/

From 87755d3f6fd6ccdcf125665ba665a3dbdc018195 Mon Sep 17 00:00:00 2001
From: Even Rouault <even.rouault@spatialys.com>
Date: Sat, 23 Mar 2019 21:59:38 +0100
Subject: [PATCH 259/488] degrib: rewrite code in a more obvious way to fix GCC
 9 warning

---
 gdal/frmts/grib/degrib/degrib/degrib1.cpp | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/gdal/frmts/grib/degrib/degrib/degrib1.cpp b/gdal/frmts/grib/degrib/degrib/degrib1.cpp
index 51e7e19a1835..faf99a442f9b 100644
--- a/gdal/frmts/grib/degrib/degrib/degrib1.cpp
+++ b/gdal/frmts/grib/degrib/degrib/degrib1.cpp
@@ -169,6 +169,7 @@ static const GRIB1ParmTable *Choose_ParmTable (pdsG1Type *pdsMeta,
                if ((subcenter != 0) || ((process != 80) && (process != 180))) {
                   return &parm_table_ncep_opn[0];
                }
+#if 0
                /* At this point could be either the opn or reanalysis table */
                switch (DEF_NCEP_TABLE) {
                   case opn_nowarn:
@@ -177,6 +178,10 @@ static const GRIB1ParmTable *Choose_ParmTable (pdsG1Type *pdsMeta,
                      return &parm_table_ncep_reanal[0];
                }
                break;
+#else
+               // ERO: this is the non convoluted version of the above code
+               return &parm_table_ncep_reanal[0];
+#endif
             case 3:
                return &parm_table_ncep_opn[0];
             case 128:

From 0a183765169d07c7f16a9209d96b332103b4c545 Mon Sep 17 00:00:00 2001
From: Even Rouault <even.rouault@spatialys.com>
Date: Sat, 23 Mar 2019 22:05:00 +0100
Subject: [PATCH 260/488] Suppress warning -Wzero-as-null-pointer-constant

---
 gdal/port/cpl_userfaultfd.cpp | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/gdal/port/cpl_userfaultfd.cpp b/gdal/port/cpl_userfaultfd.cpp
index 2167eeb8668e..d4500794837b 100644
--- a/gdal/port/cpl_userfaultfd.cpp
+++ b/gdal/port/cpl_userfaultfd.cpp
@@ -120,7 +120,14 @@ static void uffd_cleanup(void * ptr)
   return;
 }
 
+#ifdef HAVE_GCC_WARNING_ZERO_AS_NULL_POINTER_CONSTANT
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wzero-as-null-pointer-constant"
+#endif
 static pthread_mutex_t mutex = PTHREAD_MUTEX_INITIALIZER;
+#ifdef HAVE_GCC_WARNING_ZERO_AS_NULL_POINTER_CONSTANT
+#pragma GCC diagnostic pop
+#endif
 
 static int64_t get_page_limit()
 {

From 18e9a1cc668ec0fd308b4e681ef4da2f00d1de44 Mon Sep 17 00:00:00 2001
From: Even Rouault <even.rouault@spatialys.com>
Date: Sat, 23 Mar 2019 23:54:29 +0100
Subject: [PATCH 261/488] Fix warnings in GCC 9 optimized builds about
 potential string truncation in snprintf(), or strncpy(dst,src,strlen(src))

---
 gdal/frmts/aigrid/aigopen.c             |  2 +-
 gdal/frmts/dted/dted_api.c              |  9 +++++----
 gdal/frmts/envisat/EnvisatFile.c        | 14 ++++++++------
 gdal/frmts/grib/degrib/degrib/myerror.c | 10 +++++-----
 gdal/ogr/ogrsf_frmts/shape/dbfopen.c    |  2 +-
 gdal/ogr/ogrsf_frmts/shape/shpopen.c    |  2 +-
 6 files changed, 21 insertions(+), 18 deletions(-)

diff --git a/gdal/frmts/aigrid/aigopen.c b/gdal/frmts/aigrid/aigopen.c
index 567a0fc67338..2f5879024c25 100644
--- a/gdal/frmts/aigrid/aigopen.c
+++ b/gdal/frmts/aigrid/aigopen.c
@@ -194,7 +194,7 @@ AIGInfo_t *AIGOpen( const char * pszInputName, const char * pszAccess )
 CPLErr AIGAccessTile( AIGInfo_t *psInfo, int iTileX, int iTileY )
 
 {
-    char szBasename[20];
+    char szBasename[32];
     char *pszFilename;
     AIGTileInfo *psTInfo;
     const size_t nFilenameLen = strlen(psInfo->pszCoverName)+40;
diff --git a/gdal/frmts/dted/dted_api.c b/gdal/frmts/dted/dted_api.c
index 8346a979d7ae..c67116b4bfda 100644
--- a/gdal/frmts/dted/dted_api.c
+++ b/gdal/frmts/dted/dted_api.c
@@ -1021,6 +1021,7 @@ int DTEDSetMetadata( DTEDInfo *psDInfo, DTEDMetaDataCode eCode,
 {
     int nFieldLen;
     char *pszFieldSrc;
+    size_t nLenToCopy;
 
     if( !psDInfo->bUpdate )
         return FALSE;
@@ -1035,10 +1036,10 @@ int DTEDSetMetadata( DTEDInfo *psDInfo, DTEDMetaDataCode eCode,
 /* -------------------------------------------------------------------- */
 /*      Update it, padding with spaces.                                 */
 /* -------------------------------------------------------------------- */
-    memset( pszFieldSrc, ' ', nFieldLen );
-    /* cppcheck-suppress redundantCopy */
-    strncpy( pszFieldSrc, pszNewValue,
-             MIN((size_t)nFieldLen,strlen(pszNewValue)) );
+    nLenToCopy = MIN((size_t)nFieldLen,strlen(pszNewValue));
+    memcpy( pszFieldSrc, pszNewValue, nLenToCopy);
+    if( nLenToCopy < (size_t)nFieldLen )
+        memset( pszFieldSrc + nLenToCopy, ' ', nFieldLen - nLenToCopy );
 
     /* Turn the flag on, so that the headers are rewritten at file */
     /* closing */
diff --git a/gdal/frmts/envisat/EnvisatFile.c b/gdal/frmts/envisat/EnvisatFile.c
index e19c3297fffc..12d7a40c40fd 100644
--- a/gdal/frmts/envisat/EnvisatFile.c
+++ b/gdal/frmts/envisat/EnvisatFile.c
@@ -913,6 +913,8 @@ int EnvisatFile_SetKeyValueAsString( EnvisatFile *self,
 {
     int	entry_count, key_index;
     EnvisatNameValue **entries;
+    size_t nValueLen;
+    size_t nEntryValueLen;
 
     if( !self->updatable )
     {
@@ -951,16 +953,16 @@ int EnvisatFile_SetKeyValueAsString( EnvisatFile *self,
     }
 
     self->header_dirty = 1;
-    if( strlen(value) > strlen(entries[key_index]->value) )
+    nValueLen = strlen(value);
+    nEntryValueLen = strlen(entries[key_index]->value);
+    if( nValueLen >= nEntryValueLen )
     {
-        strncpy( entries[key_index]->value, value,
-                 strlen(entries[key_index]->value) );
+        memcpy( entries[key_index]->value, value, nEntryValueLen );
     }
     else
     {
-        memset( entries[key_index]->value, ' ',
-                strlen(entries[key_index]->value) );
-        strncpy( entries[key_index]->value, value, strlen(value) );
+        memcpy( entries[key_index]->value, value, nValueLen );
+        memset( entries[key_index]->value + nValueLen, ' ', nEntryValueLen - nValueLen );
     }
 
     return SUCCESS;
diff --git a/gdal/frmts/grib/degrib/degrib/myerror.c b/gdal/frmts/grib/degrib/degrib/myerror.c
index 7868f5208b48..5cc87e49eb31 100644
--- a/gdal/frmts/grib/degrib/degrib/myerror.c
+++ b/gdal/frmts/grib/degrib/degrib/myerror.c
@@ -185,7 +185,7 @@ static void AllocSprintf (char **Ptr, size_t *LenBuff, const char *fmt,
                slen = strlen (bufpart);
                lenBuff += slen;
                buffer = (char *) realloc ((void *) buffer, lenBuff);
-               strncpy (buffer + ipos, bufpart, slen);
+               memcpy (buffer + ipos, bufpart, slen);
                ipos = lenBuff - 1;
                break;
             case 'f':
@@ -193,7 +193,7 @@ static void AllocSprintf (char **Ptr, size_t *LenBuff, const char *fmt,
                slen = strlen (bufpart);
                lenBuff += slen;
                buffer = (char *) realloc ((void *) buffer, lenBuff);
-               strncpy (buffer + ipos, bufpart, slen);
+               memcpy (buffer + ipos, bufpart, slen);
                ipos = lenBuff - 1;
                break;
             case 'e':
@@ -201,7 +201,7 @@ static void AllocSprintf (char **Ptr, size_t *LenBuff, const char *fmt,
                slen = strlen (bufpart);
                lenBuff += slen;
                buffer = (char *) realloc ((void *) buffer, lenBuff);
-               strncpy (buffer + ipos, bufpart, slen);
+               memcpy (buffer + ipos, bufpart, slen);
                ipos = lenBuff - 1;
                break;
             case 'g':
@@ -209,7 +209,7 @@ static void AllocSprintf (char **Ptr, size_t *LenBuff, const char *fmt,
                slen = strlen (bufpart);
                lenBuff += slen;
                buffer = (char *) realloc ((void *) buffer, lenBuff);
-               strncpy (buffer + ipos, bufpart, slen);
+               memcpy (buffer + ipos, bufpart, slen);
                ipos = lenBuff - 1;
                break;
             case 'c':
@@ -227,7 +227,7 @@ static void AllocSprintf (char **Ptr, size_t *LenBuff, const char *fmt,
                   slen = strlen (sval);
                   lenBuff += slen;
                   buffer = (char *) realloc ((void *) buffer, lenBuff);
-                  strncpy (buffer + ipos, sval, slen);
+                  memcpy (buffer + ipos, sval, slen);
                   ipos = lenBuff - 1;
                   break;
                }
diff --git a/gdal/ogr/ogrsf_frmts/shape/dbfopen.c b/gdal/ogr/ogrsf_frmts/shape/dbfopen.c
index 171dbe5ba9f7..8778e11055b6 100644
--- a/gdal/ogr/ogrsf_frmts/shape/dbfopen.c
+++ b/gdal/ogr/ogrsf_frmts/shape/dbfopen.c
@@ -1515,7 +1515,7 @@ static int DBFWriteAttribute(DBFHandle psDBF, int hEntity, int iField,
             szSField[psDBF->panFieldSize[iField]] = '\0';
             nRetResult = FALSE;
         }
-        strncpy(REINTERPRET_CAST(char *, pabyRec+psDBF->panFieldOffset[iField]),
+        memcpy(REINTERPRET_CAST(char *, pabyRec+psDBF->panFieldOffset[iField]),
             szSField, strlen(szSField) );
         break;
       }
diff --git a/gdal/ogr/ogrsf_frmts/shape/shpopen.c b/gdal/ogr/ogrsf_frmts/shape/shpopen.c
index b2d0f5c2f2fc..195017be8698 100644
--- a/gdal/ogr/ogrsf_frmts/shape/shpopen.c
+++ b/gdal/ogr/ogrsf_frmts/shape/shpopen.c
@@ -2077,7 +2077,7 @@ SHPReadObject( SHPHandle psSHP, int hEntity )
 {
     int                  nEntitySize, nRequiredSize;
     SHPObject           *psShape;
-    char                 szErrorMsg[128];
+    char                 szErrorMsg[160];
     int                  nSHPType;
     int                  nBytesRead;
 

From 783addc36d7da7a3f0c15fd46dde117e0ec0bb87 Mon Sep 17 00:00:00 2001
From: Even Rouault <even.rouault@spatialys.com>
Date: Tue, 26 Mar 2019 12:43:59 +0100
Subject: [PATCH 262/488] Add support for Poppler 0.75.0 (fixes #1388)

---
 gdal/frmts/pdf/pdfio.h       |  5 ----
 gdal/frmts/pdf/pdfobject.cpp | 56 ++++++++----------------------------
 2 files changed, 12 insertions(+), 49 deletions(-)

diff --git a/gdal/frmts/pdf/pdfio.h b/gdal/frmts/pdf/pdfio.h
index 7ae15c88aa35..ec13b8fe94c7 100644
--- a/gdal/frmts/pdf/pdfio.h
+++ b/gdal/frmts/pdf/pdfio.h
@@ -93,11 +93,6 @@ class VSIPDFFileStream final: public BaseStream
         virtual void       close() override;
 
     private:
-        /* getChars/hasGetChars added in poppler 0.15.0
-         * POPPLER_BASE_STREAM_HAS_TWO_ARGS true from poppler 0.16,
-         * This test will be wrong for poppler 0.15 or 0.16,
-         * but will still compile correctly.
-         */
         virtual GBool hasGetChars() override;
         virtual int getChars(int nChars, Guchar *buffer) override;
 
diff --git a/gdal/frmts/pdf/pdfobject.cpp b/gdal/frmts/pdf/pdfobject.cpp
index bcd093e93109..785088ae0b67 100644
--- a/gdal/frmts/pdf/pdfobject.cpp
+++ b/gdal/frmts/pdf/pdfobject.cpp
@@ -1195,7 +1195,7 @@ GDALPDFObject* GDALPDFDictionaryPoppler::Get(const char* pszKey)
         return oIter->second;
 
 #if POPPLER_MAJOR_VERSION >= 1 || POPPLER_MINOR_VERSION >= 58
-    Object o = m_poDict->lookupNF(((char*)pszKey));
+    auto&& o(m_poDict->lookupNF(((char*)pszKey)));
     if (!o.isNull())
     {
         int nRefNum = 0;
@@ -1204,7 +1204,7 @@ GDALPDFObject* GDALPDFDictionaryPoppler::Get(const char* pszKey)
         {
             nRefNum = o.getRefNum();
             nRefGen = o.getRefGen();
-            Object o2 = m_poDict->lookup((char*)pszKey);
+            Object o2(m_poDict->lookup((char*)pszKey));
             if( !o2.isNull() )
             {
                 GDALPDFObjectPoppler* poObj = new GDALPDFObjectPoppler(new Object(std::move(o2)), TRUE);
@@ -1215,7 +1215,7 @@ GDALPDFObject* GDALPDFDictionaryPoppler::Get(const char* pszKey)
         }
         else
         {
-            GDALPDFObjectPoppler* poObj = new GDALPDFObjectPoppler(new Object(std::move(o)), TRUE);
+            GDALPDFObjectPoppler* poObj = new GDALPDFObjectPoppler(new Object(std::move(o.copy())), TRUE);
             poObj->SetRefNumAndGen(nRefNum, nRefGen);
             m_map[pszKey] = poObj;
             return poObj;
@@ -1329,7 +1329,7 @@ GDALPDFObject* GDALPDFArrayPoppler::Get(int nIndex)
         return m_v[nIndex];
 
 #if POPPLER_MAJOR_VERSION >= 1 || POPPLER_MINOR_VERSION >= 58
-    Object o = m_poArray->getNF(nIndex);
+    auto&& o(m_poArray->getNF(nIndex));
     if( !o.isNull() )
     {
         int nRefNum = 0;
@@ -1338,7 +1338,7 @@ GDALPDFObject* GDALPDFArrayPoppler::Get(int nIndex)
         {
             nRefNum = o.getRefNum();
             nRefGen = o.getRefGen();
-            Object o2 = m_poArray->get(nIndex);
+            Object o2(m_poArray->get(nIndex));
             if( !o2.isNull() )
             {
                 GDALPDFObjectPoppler* poObj = new GDALPDFObjectPoppler(new Object(std::move(o2)), TRUE);
@@ -1349,7 +1349,7 @@ GDALPDFObject* GDALPDFArrayPoppler::Get(int nIndex)
         }
         else
         {
-            GDALPDFObjectPoppler* poObj = new GDALPDFObjectPoppler(new Object(std::move(o)), TRUE);
+            GDALPDFObjectPoppler* poObj = new GDALPDFObjectPoppler(new Object(std::move(o.copy())), TRUE);
             poObj->SetRefNumAndGen(nRefNum, nRefGen);
             m_v[nIndex] = poObj;
             return poObj;
@@ -1416,8 +1416,6 @@ int GDALPDFStreamPoppler::GetLength()
 
 char* GDALPDFStreamPoppler::GetBytes()
 {
-    /* fillGooString() available in poppler >= 0.16.0 */
-#ifdef POPPLER_BASE_STREAM_HAS_TWO_ARGS
     GooString* gstr = new GooString();
     m_poStream->fillGooString(gstr);
 
@@ -1427,7 +1425,12 @@ char* GDALPDFStreamPoppler::GetBytes()
         char* pszContent = (char*) VSIMalloc(m_nLength + 1);
         if (pszContent)
         {
-            memcpy(pszContent, gstr->getCString(), m_nLength);
+#if (POPPLER_MAJOR_VERSION >= 1 || POPPLER_MINOR_VERSION >= 72)
+            const char* srcStr = gstr->c_str();
+#else
+            const char* srcStr = gstr->getCString();
+#endif
+            memcpy(pszContent, srcStr, m_nLength);
             pszContent[m_nLength] = '\0';
         }
         delete gstr;
@@ -1438,41 +1441,6 @@ char* GDALPDFStreamPoppler::GetBytes()
         delete gstr;
         return nullptr;
     }
-#else
-    int i;
-    int nLengthAlloc = 0;
-    char* pszContent = nullptr;
-    if( m_nLength >= 0 )
-    {
-        pszContent = (char*) VSIMalloc(m_nLength + 1);
-        if (!pszContent)
-            return nullptr;
-        nLengthAlloc = m_nLength;
-    }
-    m_poStream->reset();
-    for(i = 0; ; ++i )
-    {
-        int nVal = m_poStream->getChar();
-        if (nVal == EOF)
-            break;
-        if( i >= nLengthAlloc )
-        {
-            nLengthAlloc = 32 + nLengthAlloc + nLengthAlloc / 3;
-            char* pszContentNew = (char*) VSIRealloc(pszContent, nLengthAlloc + 1);
-            if( pszContentNew == nullptr )
-            {
-                CPLFree(pszContent);
-                m_nLength = 0;
-                return nullptr;
-            }
-            pszContent = pszContentNew;
-        }
-        pszContent[i] = (GByte)nVal;
-    }
-    m_nLength = i;
-    pszContent[i] = '\0';
-    return pszContent;
-#endif
 }
 
 #endif // HAVE_POPPLER

From efc6cf7df41f20a11cdd654cc72f2e20f8d2952a Mon Sep 17 00:00:00 2001
From: Even Rouault <even.rouault@spatialys.com>
Date: Tue, 26 Mar 2019 20:41:16 +0100
Subject: [PATCH 263/488] BAG: fix potential nullptr deref on corrupted file

---
 gdal/frmts/hdf5/bagdataset.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/gdal/frmts/hdf5/bagdataset.cpp b/gdal/frmts/hdf5/bagdataset.cpp
index 6259f520dcd3..984b33df5157 100644
--- a/gdal/frmts/hdf5/bagdataset.cpp
+++ b/gdal/frmts/hdf5/bagdataset.cpp
@@ -3280,7 +3280,7 @@ void BAGDataset::LoadMetadata()
     H5Tclose(datatype);
     H5Dclose(hMDDS);
 
-    if( strlen(pszXMLMetadata) == 0 )
+    if( pszXMLMetadata == nullptr || pszXMLMetadata[0] == 0 )
         return;
 
     // Try to get the geotransform.

From 0ac3eca796efa5f6de46a94a0bb1c402dcf89eae Mon Sep 17 00:00:00 2001
From: Even Rouault <even.rouault@spatialys.com>
Date: Tue, 26 Mar 2019 20:51:45 +0100
Subject: [PATCH 264/488] HDF5: fix handling of attributes of type SCHAR,
 UCHAR, USHORT and UINT

Fixes https://github.com/mapbox/rasterio/issues/1663

For SCHAR and UCHAR, they were up to now considered as strings, which is
wrong according to https://support.hdfgroup.org/HDF5/doc/H5.user/Datatypes.html
"""3.6. Character and String Datatype Issues
The H5T_NATIVE_CHAR and H5T_NATIVE_UCHAR datatypes are actually numeric data
(1-byte integers). If the application wishes to store character data, then
an HDF5 string datatype should be derived from H5T_C_S1 instead."
So do consider them as integers, and add a GDAL_HDF5_CHAR_AS_STRING config
option that defaults to NO to get previous behaviour in case this would really
be needed.

For USHORT and UINT, use correct '%u' formatting instead of '%ud' that
added an extraneous 'd' character after the number.
---
 autotest/gdrivers/data/attr_all_datatypes.h5 | Bin 0 -> 2048 bytes
 autotest/gdrivers/hdf5.py                    |  15 +++++++++
 gdal/frmts/hdf5/hdf5dataset.cpp              |  32 +++++++++++++++----
 3 files changed, 40 insertions(+), 7 deletions(-)
 create mode 100644 autotest/gdrivers/data/attr_all_datatypes.h5

diff --git a/autotest/gdrivers/data/attr_all_datatypes.h5 b/autotest/gdrivers/data/attr_all_datatypes.h5
new file mode 100644
index 0000000000000000000000000000000000000000..c5766fbe15ef35c86ee71fa0e65cfd395dc05092
GIT binary patch
literal 2048
zcmeHHy-EW?5dQX($Z@%loCpycue9_hgmj*glT<1yXd%P{6$Mey6KurBBEEu8;4AnB
zmOhV7+}WMU`F8;=Qm9+p?9R+LGvD6K-gVk56>rJ|E!Ra6HM5mZpBG%K8JyW+kELSS
zWBK6Nje-xdO|rhm@vll&(PO`@jW~w(l=vbUhS{RsaT%iimw)62I`PsvQQcv_(xp$_
zKXMKGNt#?7q^9Rc*Ac@HrNWqv#SN}7V<IWXDx~l8WI=a6*@AFd&lar^br<y;vj<9g
zu*mK>HlWLsQcyAh-1zK2&Vxvp$J_f|;D{}w5u2-PZKW%gISdP<$@|-~1pE&6n3%km
zK3b+v6g>TMx=7OWynB3_w%D(xFP{Freyq*c?tyD_g2o8GoZ&CC05mt>#%uUo(<Y$&
zcI4~?=I8g{=jQ-~8jg>ce+3i5|M282;R=GVI>37+cva>tbv$od#h3S>c`VFlJY*h8
zBlyqv_<;upARfc<c|2@@y!Sxr0A7}<E+2VunhmlC;UafJghm;SKF?zoM>|E`2;6Uk
HdAnW#wV7`Q

literal 0
HcmV?d00001

diff --git a/autotest/gdrivers/hdf5.py b/autotest/gdrivers/hdf5.py
index 6ee913fe9db0..9c978382e08f 100755
--- a/autotest/gdrivers/hdf5.py
+++ b/autotest/gdrivers/hdf5.py
@@ -397,6 +397,21 @@ def test_hdf5_single_char_varname():
     ds = gdal.Open('HDF5:"data/single_char_varname.h5"://e')
     assert ds is not None
 
+def test_hdf5_attr_all_datatypes():
+
+    ds = gdal.Open('data/attr_all_datatypes.h5')
+    assert ds is not None
+    assert ds.GetMetadata() == {'attr_float16': '125 ',
+                                'attr_float32': '125 ',
+                                'attr_float64': '125 ',
+                                'attr_int16': '125 ',
+                                'attr_int32': '125 ',
+                                'attr_int8': '125 ',
+                                'attr_uint16': '125 ',
+                                'attr_uint32': '125 ',
+                                'attr_uint8': '125 '}
+
+
 
 def test_hdf5_virtual_file():
     hdf5_files = [
diff --git a/gdal/frmts/hdf5/hdf5dataset.cpp b/gdal/frmts/hdf5/hdf5dataset.cpp
index 14ebccf44421..728438b998ad 100644
--- a/gdal/frmts/hdf5/hdf5dataset.cpp
+++ b/gdal/frmts/hdf5/hdf5dataset.cpp
@@ -1078,23 +1078,41 @@ static herr_t HDF5AttrIterate( hid_t hH5ObjID,
             szValue[0] = '\0';
             H5Aread(hAttrID, hAttrNativeType, buf);
         }
-        if( H5Tequal(H5T_NATIVE_CHAR, hAttrNativeType ) ||
-            H5Tequal(H5T_NATIVE_SCHAR, hAttrNativeType) )
+        const bool bIsSCHAR = H5Tequal(H5T_NATIVE_SCHAR, hAttrNativeType);
+        const bool bIsUCHAR = H5Tequal(H5T_NATIVE_UCHAR, hAttrNativeType);
+        if( (bIsSCHAR || bIsUCHAR) &&
+            CPLTestBool(CPLGetConfigOption("GDAL_HDF5_CHAR_AS_STRING", "NO")) )
         {
+            // Compatibily mode with ancient GDAL versions where we consider
+            // array of SCHAR/UCHAR as strings. Likely inappropriate mode...
             for( hsize_t i = 0; i < nAttrElmts; i++ )
             {
-                snprintf(szData, nDataLen, "%c ", static_cast<char *>(buf)[i]);
+                snprintf(szData, nDataLen, "%c",
+                         static_cast<char *>(buf)[i]);
                 if( CPLStrlcat(szValue, szData, MAX_METADATA_LEN) >=
                     MAX_METADATA_LEN )
                     CPLError(CE_Warning, CPLE_OutOfMemory,
                              "Header data too long. Truncated");
             }
         }
-        else if( H5Tequal(H5T_NATIVE_UCHAR, hAttrNativeType) )
+        else if( bIsSCHAR )
         {
             for( hsize_t i = 0; i < nAttrElmts; i++ )
             {
-                snprintf(szData, nDataLen, "%c", static_cast<char *>(buf)[i]);
+                snprintf(szData, nDataLen, "%d ",
+                         static_cast<signed char *>(buf)[i]);
+                if( CPLStrlcat(szValue, szData, MAX_METADATA_LEN) >=
+                    MAX_METADATA_LEN )
+                    CPLError(CE_Warning, CPLE_OutOfMemory,
+                             "Header data too long. Truncated");
+            }
+        }
+        else if( bIsUCHAR )
+        {
+            for( hsize_t i = 0; i < nAttrElmts; i++ )
+            {
+                snprintf(szData, nDataLen, "%u ",
+                         static_cast<unsigned char *>(buf)[i]);
                 if( CPLStrlcat(szValue, szData, MAX_METADATA_LEN) >=
                     MAX_METADATA_LEN )
                     CPLError(CE_Warning, CPLE_OutOfMemory,
@@ -1116,7 +1134,7 @@ static herr_t HDF5AttrIterate( hid_t hH5ObjID,
         {
             for( hsize_t i = 0; i < nAttrElmts; i++ )
             {
-              snprintf(szData, nDataLen, "%ud ",
+              snprintf(szData, nDataLen, "%u ",
                        static_cast<unsigned short *>(buf)[i]);
                 if( CPLStrlcat(szValue, szData, MAX_METADATA_LEN) >=
                     MAX_METADATA_LEN )
@@ -1139,7 +1157,7 @@ static herr_t HDF5AttrIterate( hid_t hH5ObjID,
         {
             for( hsize_t i = 0; i < nAttrElmts; i++ )
             {
-                snprintf(szData, nDataLen, "%ud ",
+                snprintf(szData, nDataLen, "%u ",
                          static_cast<unsigned int *>(buf)[i]);
                 if( CPLStrlcat(szValue, szData, MAX_METADATA_LEN) >=
                     MAX_METADATA_LEN )

From 844f6a3820c0897dd79adba03472523c705c5c6b Mon Sep 17 00:00:00 2001
From: Ari Jolma <ari.jolma@gmail.com>
Date: Wed, 27 Mar 2019 12:38:47 +0200
Subject: [PATCH 265/488] rasterize: fix crash when working buffer is larger
 than 2GB (fix also gvBurnPoint) (fixes #1338)

---
 gdal/alg/gdalrasterize.cpp | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/gdal/alg/gdalrasterize.cpp b/gdal/alg/gdalrasterize.cpp
index 67351378260b..c4a1f18c8a5b 100644
--- a/gdal/alg/gdalrasterize.cpp
+++ b/gdal/alg/gdalrasterize.cpp
@@ -147,8 +147,8 @@ void gvBurnPoint( void *pCBData, int nY, int nX, double dfVariant )
         for( int iBand = 0; iBand < psInfo->nBands; iBand++ )
         {
             unsigned char *pbyInsert = psInfo->pabyChunkBuf
-                                      + iBand * psInfo->nXSize * psInfo->nYSize
-                                      + nY * psInfo->nXSize + nX;
+                                      + static_cast<GSpacing>(iBand) * psInfo->nXSize * psInfo->nYSize
+                                      + static_cast<GSpacing>(nY) * psInfo->nXSize + nX;
             double dfVal;
             if( psInfo->eMergeAlg == GRMA_Add ) {
                 dfVal = *pbyInsert + ( psInfo->padfBurnValue[iBand] +
@@ -172,8 +172,8 @@ void gvBurnPoint( void *pCBData, int nY, int nX, double dfVariant )
         for( int iBand = 0; iBand < psInfo->nBands; iBand++ )
         {
             double *pdfInsert = reinterpret_cast<double *>(psInfo->pabyChunkBuf)
-                                + iBand * psInfo->nXSize * psInfo->nYSize
-                                + nY * psInfo->nXSize + nX;
+                                + static_cast<GSpacing>(iBand) * psInfo->nXSize * psInfo->nYSize
+                                + static_cast<GSpacing>(nY) * psInfo->nXSize + nX;
 
             if( psInfo->eMergeAlg == GRMA_Add ) {
                 *pdfInsert += ( psInfo->padfBurnValue[iBand] +

From 8b3db49b7d2e107fb718806f40739d0b9e8ba977 Mon Sep 17 00:00:00 2001
From: Even Rouault <even.rouault@spatialys.com>
Date: Wed, 27 Mar 2019 13:11:29 +0100
Subject: [PATCH 266/488] HDF5: fix MSVC2015 warning introduced by
 9640098fc79b6ba6bb135f8715fa3e7dd2705691

---
 gdal/frmts/hdf5/hdf5dataset.cpp | 20 ++++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/gdal/frmts/hdf5/hdf5dataset.cpp b/gdal/frmts/hdf5/hdf5dataset.cpp
index 728438b998ad..671a0acc7c77 100644
--- a/gdal/frmts/hdf5/hdf5dataset.cpp
+++ b/gdal/frmts/hdf5/hdf5dataset.cpp
@@ -1078,8 +1078,8 @@ static herr_t HDF5AttrIterate( hid_t hH5ObjID,
             szValue[0] = '\0';
             H5Aread(hAttrID, hAttrNativeType, buf);
         }
-        const bool bIsSCHAR = H5Tequal(H5T_NATIVE_SCHAR, hAttrNativeType);
-        const bool bIsUCHAR = H5Tequal(H5T_NATIVE_UCHAR, hAttrNativeType);
+        const bool bIsSCHAR = H5Tequal(H5T_NATIVE_SCHAR, hAttrNativeType) > 0;
+        const bool bIsUCHAR = H5Tequal(H5T_NATIVE_UCHAR, hAttrNativeType) > 0;
         if( (bIsSCHAR || bIsUCHAR) &&
             CPLTestBool(CPLGetConfigOption("GDAL_HDF5_CHAR_AS_STRING", "NO")) )
         {
@@ -1119,7 +1119,7 @@ static herr_t HDF5AttrIterate( hid_t hH5ObjID,
                              "Header data too long. Truncated");
             }
         }
-        else if( H5Tequal(H5T_NATIVE_SHORT, hAttrNativeType) )
+        else if( H5Tequal(H5T_NATIVE_SHORT, hAttrNativeType) > 0 )
         {
             for( hsize_t i = 0; i < nAttrElmts; i++ )
             {
@@ -1130,7 +1130,7 @@ static herr_t HDF5AttrIterate( hid_t hH5ObjID,
                              "Header data too long. Truncated");
             }
         }
-        else if( H5Tequal(H5T_NATIVE_USHORT, hAttrNativeType) )
+        else if( H5Tequal(H5T_NATIVE_USHORT, hAttrNativeType) > 0 )
         {
             for( hsize_t i = 0; i < nAttrElmts; i++ )
             {
@@ -1142,7 +1142,7 @@ static herr_t HDF5AttrIterate( hid_t hH5ObjID,
                              "Header data too long. Truncated");
             }
         }
-        else if( H5Tequal(H5T_NATIVE_INT, hAttrNativeType) )
+        else if( H5Tequal(H5T_NATIVE_INT, hAttrNativeType) > 0 )
         {
             for( hsize_t i=0; i < nAttrElmts; i++ )
             {
@@ -1153,7 +1153,7 @@ static herr_t HDF5AttrIterate( hid_t hH5ObjID,
                              "Header data too long. Truncated");
             }
         }
-        else if( H5Tequal(H5T_NATIVE_UINT, hAttrNativeType) )
+        else if( H5Tequal(H5T_NATIVE_UINT, hAttrNativeType) > 0 )
         {
             for( hsize_t i = 0; i < nAttrElmts; i++ )
             {
@@ -1165,7 +1165,7 @@ static herr_t HDF5AttrIterate( hid_t hH5ObjID,
                              "Header data too long. Truncated");
             }
         }
-        else if( H5Tequal(H5T_NATIVE_LONG, hAttrNativeType) )
+        else if( H5Tequal(H5T_NATIVE_LONG, hAttrNativeType) > 0 )
         {
             for( hsize_t i = 0; i < nAttrElmts; i++ )
             {
@@ -1176,7 +1176,7 @@ static herr_t HDF5AttrIterate( hid_t hH5ObjID,
                              "Header data too long. Truncated");
             }
         }
-        else if( H5Tequal(H5T_NATIVE_ULONG, hAttrNativeType) )
+        else if( H5Tequal(H5T_NATIVE_ULONG, hAttrNativeType) > 0 )
         {
             for( hsize_t i = 0; i < nAttrElmts; i++ ) {
                 snprintf(szData, nDataLen, "%lu ",
@@ -1187,7 +1187,7 @@ static herr_t HDF5AttrIterate( hid_t hH5ObjID,
                              "Header data too long. Truncated");
             }
         }
-        else if( H5Tequal(H5T_NATIVE_FLOAT, hAttrNativeType) )
+        else if( H5Tequal(H5T_NATIVE_FLOAT, hAttrNativeType) > 0 )
         {
             for( hsize_t i = 0; i < nAttrElmts; i++ )
             {
@@ -1199,7 +1199,7 @@ static herr_t HDF5AttrIterate( hid_t hH5ObjID,
                              "Header data too long. Truncated");
             }
         }
-        else if( H5Tequal(H5T_NATIVE_DOUBLE, hAttrNativeType) )
+        else if( H5Tequal(H5T_NATIVE_DOUBLE, hAttrNativeType) > 0 )
         {
             for( hsize_t i = 0; i < nAttrElmts; i++ )
             {

From 117d93830b5c8bcf895eb6af25855f35a372bfa9 Mon Sep 17 00:00:00 2001
From: "backporting[bot]" <backporting[bot]@users.noreply.github.com>
Date: Wed, 27 Mar 2019 20:18:35 +0100
Subject: [PATCH 267/488] Backport #1391 on release/2.4: Fix potential buffer
 overflow in CPLODBCSession::Failed (#1390) (#1397)

---
 gdal/port/cpl_odbc.cpp | 21 ++++++++++++++++-----
 1 file changed, 16 insertions(+), 5 deletions(-)

diff --git a/gdal/port/cpl_odbc.cpp b/gdal/port/cpl_odbc.cpp
index 8438a48d3092..5c1a29507db7 100644
--- a/gdal/port/cpl_odbc.cpp
+++ b/gdal/port/cpl_odbc.cpp
@@ -345,22 +345,33 @@ int CPLODBCSession::Failed( int nRetCode, HSTMT hStmt )
     for(SQLSMALLINT nRecNum = 1; nDiagRetCode == SQL_SUCCESS; ++nRecNum)
     {
         SQLCHAR achSQLState[5 + 1] = {};
-        SQLCHAR achCurErrMsg[SQL_MAX_MESSAGE_LENGTH] = {};
+        SQLCHAR* pachCurErrMsg = static_cast<SQLCHAR *>(CPLMalloc((SQL_MAX_MESSAGE_LENGTH + 1) * sizeof(SQLCHAR)));
         SQLSMALLINT nTextLength = 0;
         SQLINTEGER nNativeError = 0;
 
         nDiagRetCode = SQLGetDiagRec( SQL_HANDLE_STMT, hStmt, nRecNum,
                 achSQLState, &nNativeError,
-                reinterpret_cast<SQLCHAR *>(achCurErrMsg),
-                sizeof(achCurErrMsg) - 1, &nTextLength );
+                reinterpret_cast<SQLCHAR *>(pachCurErrMsg),
+                SQL_MAX_MESSAGE_LENGTH, &nTextLength );
         if (nDiagRetCode == SQL_SUCCESS ||
             nDiagRetCode == SQL_SUCCESS_WITH_INFO)
         {
-            achCurErrMsg[nTextLength] = '\0';
+            if (nTextLength >= SQL_MAX_MESSAGE_LENGTH)
+            {
+                // the buffer wasn't enough, retry
+                SQLSMALLINT nTextLength2 = 0;
+                pachCurErrMsg = static_cast<SQLCHAR *>(CPLRealloc(pachCurErrMsg, (nTextLength + 1) * sizeof(SQLCHAR)));
+                nDiagRetCode = SQLGetDiagRec(SQL_HANDLE_STMT, hStmt, nRecNum,
+                    achSQLState, &nNativeError,
+                    reinterpret_cast<SQLCHAR *>(pachCurErrMsg),
+                    nTextLength, &nTextLength2);
+            }               
+            pachCurErrMsg[nTextLength] = '\0';
             m_osLastError += CPLString().Printf("%s[%5s]%s(" CPL_FRMT_GIB ")",
                     (m_osLastError.empty() ? "" : ", "), achSQLState,
-                    achCurErrMsg, static_cast<GIntBig>(nNativeError));
+                    pachCurErrMsg, static_cast<GIntBig>(nNativeError));
         }
+        CPLFree(pachCurErrMsg);
     }
 
     if( nRetCode == SQL_ERROR && m_bInTransaction )

From 177fbad1e0231b2937209597869dbb95fcdcdd15 Mon Sep 17 00:00:00 2001
From: Even Rouault <even.rouault@spatialys.com>
Date: Wed, 27 Mar 2019 23:30:28 +0100
Subject: [PATCH 268/488] /vsitar/: handle .tar file header with space padding
 instead of 0 for file size (fixes #1396)

---
 gdal/port/cpl_vsil_tar.cpp | 12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)

diff --git a/gdal/port/cpl_vsil_tar.cpp b/gdal/port/cpl_vsil_tar.cpp
index ba2ada3abcc2..51a3d87d2801 100644
--- a/gdal/port/cpl_vsil_tar.cpp
+++ b/gdal/port/cpl_vsil_tar.cpp
@@ -338,13 +338,16 @@ int VSITarReader::GotoNextFile()
     {
         return FALSE;
     }
-    if( abyHeader[124] < '0' || abyHeader[124] > '7' )
+    if( !(abyHeader[124] == ' ' || (abyHeader[124] >= '0' && abyHeader[124] <= '7')) )
         return FALSE;
 
     osNextFileName = reinterpret_cast<const char*>(abyHeader);
     nNextFileSize = 0;
     for(int i=0;i<11;i++)
-        nNextFileSize = nNextFileSize * 8 + (abyHeader[124+i] - '0');
+    {
+        if( abyHeader[124+i] != ' ' )
+            nNextFileSize = nNextFileSize * 8 + (abyHeader[124+i] - '0');
+    }
     if( nNextFileSize > GINTBIG_MAX )
     {
         CPLError(CE_Failure, CPLE_AppDefined,
@@ -354,7 +357,10 @@ int VSITarReader::GotoNextFile()
 
     nModifiedTime = 0;
     for(int i=0;i<11;i++)
-        nModifiedTime = nModifiedTime * 8 + (abyHeader[136+i] - '0');
+    {
+        if( abyHeader[136+i] != ' ' )
+            nModifiedTime = nModifiedTime * 8 + (abyHeader[136+i] - '0');
+    }
 
     nCurOffset = VSIFTellL(fp);
 

From 4b7a9ef829d5432b1271c1c3de613c4db80c3205 Mon Sep 17 00:00:00 2001
From: Even Rouault <even.rouault@spatialys.com>
Date: Sat, 30 Mar 2019 11:16:26 +0100
Subject: [PATCH 269/488] OGRShapeDataSource::DeleteLayer(): make it delete
 .cpg, .sbn, .sbx and other sidecar files (fixes #1405)

---
 autotest/ogr/ogr_shape.py                     | 29 ++++++++++++++++++
 gdal/ogr/ogrsf_frmts/shape/ogrshape.h         |  2 ++
 .../ogrsf_frmts/shape/ogrshapedatasource.cpp  | 30 +++++++++++++++----
 gdal/ogr/ogrsf_frmts/shape/ogrshapedriver.cpp | 11 ++++---
 4 files changed, 61 insertions(+), 11 deletions(-)

diff --git a/autotest/ogr/ogr_shape.py b/autotest/ogr/ogr_shape.py
index 7fcec9ddddb2..8e6daec43751 100755
--- a/autotest/ogr/ogr_shape.py
+++ b/autotest/ogr/ogr_shape.py
@@ -4505,6 +4505,35 @@ def test_ogr_shape_111_delete_field_no_record():
 
     shape_drv.DeleteDataSource(filename)
 
+
+###############################################################################
+
+
+def test_ogr_shape_112_delete_layer():
+
+    dirname = '/vsimem/test_ogr_shape_112_delete_layer'
+    shape_drv = ogr.GetDriverByName('ESRI Shapefile')
+    ds = shape_drv.CreateDataSource(dirname)
+    ds.CreateLayer("test")
+    ds = None
+
+    ds = ogr.Open(dirname)
+    with gdaltest.error_handler():
+        assert ds.DeleteLayer(0) != 0
+    ds = None
+
+    ds = ogr.Open(dirname, update = 1)
+    with gdaltest.error_handler():
+        assert ds.DeleteLayer(-1) != 0
+        assert ds.DeleteLayer(1) != 0
+    gdal.FileFromMemBuffer(dirname + "/test.cpg", "foo")
+    assert ds.DeleteLayer(0) == 0
+    assert not gdal.VSIStatL(dirname + "/test.shp")
+    assert not gdal.VSIStatL(dirname + "/test.cpg")
+    ds = None
+
+    shape_drv.DeleteDataSource(dirname)
+
 ###############################################################################
 
 
diff --git a/gdal/ogr/ogrsf_frmts/shape/ogrshape.h b/gdal/ogr/ogrsf_frmts/shape/ogrshape.h
index ee286fe156ef..31bb0eea4657 100644
--- a/gdal/ogr/ogrsf_frmts/shape/ogrshape.h
+++ b/gdal/ogr/ogrsf_frmts/shape/ogrshape.h
@@ -314,6 +314,8 @@ class OGRShapeDataSource final: public OGRDataSource
     DBFHandle            DS_DBFOpen( const char * pszDBFFile,
                                      const char * pszAccess );
     char               **GetOpenOptions() { return papszOpenOptions; }
+
+    static const char* const* GetExtensionsForDeletion();
 };
 
 #endif /* ndef OGRSHAPE_H_INCLUDED */
diff --git a/gdal/ogr/ogrsf_frmts/shape/ogrshapedatasource.cpp b/gdal/ogr/ogrsf_frmts/shape/ogrshapedatasource.cpp
index 08426d3fd034..48a15d727b1b 100644
--- a/gdal/ogr/ogrsf_frmts/shape/ogrshapedatasource.cpp
+++ b/gdal/ogr/ogrsf_frmts/shape/ogrshapedatasource.cpp
@@ -1139,6 +1139,18 @@ OGRLayer * OGRShapeDataSource::ExecuteSQL( const char *pszStatement,
     return nullptr;
 }
 
+/************************************************************************/
+/*                     GetExtensionsForDeletion()                       */
+/************************************************************************/
+
+const char* const* OGRShapeDataSource::GetExtensionsForDeletion()
+{
+    static const char * const apszExtensions[] =
+        { "shp", "shx", "dbf", "sbn", "sbx", "prj", "idm", "ind",
+          "qix", "cpg", nullptr };
+    return apszExtensions;
+}
+
 /************************************************************************/
 /*                            DeleteLayer()                             */
 /************************************************************************/
@@ -1159,6 +1171,9 @@ OGRErr OGRShapeDataSource::DeleteLayer( int iLayer )
         return OGRERR_FAILURE;
     }
 
+    // To ensure that existing layers are created.
+    GetLayerCount();
+
     if( iLayer < 0 || iLayer >= nLayers )
     {
         CPLError( CE_Failure, CPLE_AppDefined,
@@ -1181,11 +1196,16 @@ OGRErr OGRShapeDataSource::DeleteLayer( int iLayer )
 
     nLayers--;
 
-    VSIUnlink( CPLResetExtension(pszFilename, "shp") );
-    VSIUnlink( CPLResetExtension(pszFilename, "shx") );
-    VSIUnlink( CPLResetExtension(pszFilename, "dbf") );
-    VSIUnlink( CPLResetExtension(pszFilename, "prj") );
-    VSIUnlink( CPLResetExtension(pszFilename, "qix") );
+    const char * const* papszExtensions =
+        OGRShapeDataSource::GetExtensionsForDeletion();
+    for( int iExt = 0; papszExtensions[iExt] != nullptr; iExt++ )
+    {
+        const char *pszFile = CPLResetExtension(pszFilename,
+                                                papszExtensions[iExt]);
+        VSIStatBufL sStatBuf;
+        if( VSIStatL( pszFile, &sStatBuf ) == 0 )
+            VSIUnlink( pszFile );
+    }
 
     CPLFree( pszFilename );
 
diff --git a/gdal/ogr/ogrsf_frmts/shape/ogrshapedriver.cpp b/gdal/ogr/ogrsf_frmts/shape/ogrshapedriver.cpp
index 875357f78614..d2756fe10e22 100644
--- a/gdal/ogr/ogrsf_frmts/shape/ogrshapedriver.cpp
+++ b/gdal/ogr/ogrsf_frmts/shape/ogrshapedriver.cpp
@@ -216,19 +216,18 @@ static CPLErr OGRShapeDriverDelete( const char *pszDataSource )
         return CE_Failure;
     }
 
-    static const char * const apszExtensions[] =
-        { "shp", "shx", "dbf", "sbn", "sbx", "prj", "idm", "ind",
-          "qix", "cpg", nullptr };
+    const char * const* papszExtensions =
+        OGRShapeDataSource::GetExtensionsForDeletion();
 
     if( VSI_ISREG(sStatBuf.st_mode)
         && (EQUAL(CPLGetExtension(pszDataSource), "shp")
             || EQUAL(CPLGetExtension(pszDataSource), "shx")
             || EQUAL(CPLGetExtension(pszDataSource), "dbf")) )
     {
-        for( int iExt = 0; apszExtensions[iExt] != nullptr; iExt++ )
+        for( int iExt = 0; papszExtensions[iExt] != nullptr; iExt++ )
         {
             const char *pszFile = CPLResetExtension(pszDataSource,
-                                                    apszExtensions[iExt]);
+                                                    papszExtensions[iExt]);
             if( VSIStatL( pszFile, &sStatBuf ) == 0 )
                 VSIUnlink( pszFile );
         }
@@ -241,7 +240,7 @@ static CPLErr OGRShapeDriverDelete( const char *pszDataSource )
              papszDirEntries != nullptr && papszDirEntries[iFile] != nullptr;
              iFile++ )
         {
-            if( CSLFindString( apszExtensions,
+            if( CSLFindString( papszExtensions,
                                CPLGetExtension(papszDirEntries[iFile])) != -1)
             {
                 VSIUnlink( CPLFormFilename( pszDataSource,

From 598427b136115c6e123e6c0729bf75885371cb36 Mon Sep 17 00:00:00 2001
From: Even Rouault <even.rouault@spatialys.com>
Date: Sat, 30 Mar 2019 11:43:53 +0100
Subject: [PATCH 270/488]  OGRShapeDataSource::DeleteLayer(): delete QGIS .qpj
 sidecar file (refs #1405)

---
 gdal/ogr/ogrsf_frmts/shape/ogrshapedatasource.cpp | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/gdal/ogr/ogrsf_frmts/shape/ogrshapedatasource.cpp b/gdal/ogr/ogrsf_frmts/shape/ogrshapedatasource.cpp
index 48a15d727b1b..ab000555c537 100644
--- a/gdal/ogr/ogrsf_frmts/shape/ogrshapedatasource.cpp
+++ b/gdal/ogr/ogrsf_frmts/shape/ogrshapedatasource.cpp
@@ -1147,7 +1147,9 @@ const char* const* OGRShapeDataSource::GetExtensionsForDeletion()
 {
     static const char * const apszExtensions[] =
         { "shp", "shx", "dbf", "sbn", "sbx", "prj", "idm", "ind",
-          "qix", "cpg", nullptr };
+          "qix", "cpg",
+          "qpj", // QGIS projection file
+          nullptr };
     return apszExtensions;
 }
 

From 4739304df89da7aece3a389d96691e206abaf4a7 Mon Sep 17 00:00:00 2001
From: Even Rouault <even.rouault@spatialys.com>
Date: Sat, 30 Mar 2019 19:31:44 +0100
Subject: [PATCH 271/488] MRF: prevent integer overflow

Fixes https://bugs.chromium.org/p/oss-fuzz/issues/detail?id=13974
Credit to OSS Fuzz
---
 gdal/frmts/mrf/marfa.h           | 15 ++++++++++++++-
 gdal/frmts/mrf/marfa_dataset.cpp |  8 ++++++--
 2 files changed, 20 insertions(+), 3 deletions(-)

diff --git a/gdal/frmts/mrf/marfa.h b/gdal/frmts/mrf/marfa.h
index 119bccafee21..99d1e3dbf361 100644
--- a/gdal/frmts/mrf/marfa.h
+++ b/gdal/frmts/mrf/marfa.h
@@ -53,6 +53,7 @@
 #include <ogr_srs_api.h>
 #include <ogr_spatialref.h>
 
+#include <limits>
 // For printing values
 #include <ostream>
 #include <iostream>
@@ -273,13 +274,25 @@ static inline int pcount(const int n, const int sz) {
 }
 
 // Returns a pagecount per dimension, .l will have the total number
+// or 0 in case of error
 static inline const ILSize pcount(const ILSize &size, const ILSize &psz) {
     ILSize pcnt;
     pcnt.x = pcount(size.x, psz.x);
     pcnt.y = pcount(size.y, psz.y);
     pcnt.z = pcount(size.z, psz.z);
     pcnt.c = pcount(size.c, psz.c);
-    pcnt.l = static_cast<GIntBig>(pcnt.x) * pcnt.y * pcnt.z * pcnt.c;
+    auto xy = static_cast<GIntBig>(pcnt.x) * pcnt.y;
+    auto zc = static_cast<GIntBig>(pcnt.z) * pcnt.c;
+    if( xy > std::numeric_limits<GIntBig>::max() / zc )
+    {
+        CPLError(CE_Failure, CPLE_AppDefined,
+                 "Integer overflow in page count computation");
+        pcnt.l = 0;
+    }
+    else
+    {
+        pcnt.l = xy * zc;
+    }
     return pcnt;
 }
 
diff --git a/gdal/frmts/mrf/marfa_dataset.cpp b/gdal/frmts/mrf/marfa_dataset.cpp
index 72f86b923b13..7f53e706940b 100644
--- a/gdal/frmts/mrf/marfa_dataset.cpp
+++ b/gdal/frmts/mrf/marfa_dataset.cpp
@@ -924,16 +924,20 @@ static CPLErr Init_Raster(ILImage &image, GDALMRFDataset *ds, CPLXMLNode *defima
         image.pagesize.x > INT_MAX / image.pagesize.y ||
         image.pagesize.x * image.pagesize.y > INT_MAX / image.pagesize.z ||
         image.pagesize.x * image.pagesize.y * image.pagesize.z > INT_MAX / image.pagesize.c ||
-        image.pagesize.x * image.pagesize.y * image.pagesize.z* image.pagesize.c  > INT_MAX / (GDALGetDataTypeSize(image.dt) / 8) )
+        image.pagesize.x * image.pagesize.y * image.pagesize.z* image.pagesize.c  > INT_MAX / GDALGetDataTypeSizeBytes(image.dt) )
     {
         CPLError(CE_Failure, CPLE_AppDefined, "MRF page size too big");
         return CE_Failure;
     }
-    image.pageSizeBytes = (GDALGetDataTypeSize(image.dt) / 8) *
+    image.pageSizeBytes = GDALGetDataTypeSizeBytes(image.dt) *
         image.pagesize.x * image.pagesize.y * image.pagesize.z * image.pagesize.c;
 
     // Calculate the page count, including the total for the level
     image.pagecount = pcount(image.size, image.pagesize);
+    if( image.pagecount.l == 0 )
+    {
+        return CE_Failure;
+    }
 
     // Data File Name and base offset
     image.datfname = getFname(defimage, "DataFile", ds->GetFname(), ILComp_Ext[image.comp]);

From d42d738d7f7c3a3cf78d95daa3823868c39a1b64 Mon Sep 17 00:00:00 2001
From: Even Rouault <even.rouault@spatialys.com>
Date: Sun, 31 Mar 2019 13:33:09 +0200
Subject: [PATCH 272/488] MRF: avoid division by zero from previous commit

Fixes https://bugs.chromium.org/p/oss-fuzz/issues/detail?id=13981
Credit to OSS Fuzz
---
 gdal/frmts/mrf/marfa.h           | 6 +++---
 gdal/frmts/mrf/marfa_dataset.cpp | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/gdal/frmts/mrf/marfa.h b/gdal/frmts/mrf/marfa.h
index 99d1e3dbf361..969623e08133 100644
--- a/gdal/frmts/mrf/marfa.h
+++ b/gdal/frmts/mrf/marfa.h
@@ -274,7 +274,7 @@ static inline int pcount(const int n, const int sz) {
 }
 
 // Returns a pagecount per dimension, .l will have the total number
-// or 0 in case of error
+// or -1 in case of error
 static inline const ILSize pcount(const ILSize &size, const ILSize &psz) {
     ILSize pcnt;
     pcnt.x = pcount(size.x, psz.x);
@@ -283,11 +283,11 @@ static inline const ILSize pcount(const ILSize &size, const ILSize &psz) {
     pcnt.c = pcount(size.c, psz.c);
     auto xy = static_cast<GIntBig>(pcnt.x) * pcnt.y;
     auto zc = static_cast<GIntBig>(pcnt.z) * pcnt.c;
-    if( xy > std::numeric_limits<GIntBig>::max() / zc )
+    if( zc != 0 && xy > std::numeric_limits<GIntBig>::max() / zc )
     {
         CPLError(CE_Failure, CPLE_AppDefined,
                  "Integer overflow in page count computation");
-        pcnt.l = 0;
+        pcnt.l = -1;
     }
     else
     {
diff --git a/gdal/frmts/mrf/marfa_dataset.cpp b/gdal/frmts/mrf/marfa_dataset.cpp
index 7f53e706940b..7aeb996db738 100644
--- a/gdal/frmts/mrf/marfa_dataset.cpp
+++ b/gdal/frmts/mrf/marfa_dataset.cpp
@@ -934,7 +934,7 @@ static CPLErr Init_Raster(ILImage &image, GDALMRFDataset *ds, CPLXMLNode *defima
 
     // Calculate the page count, including the total for the level
     image.pagecount = pcount(image.size, image.pagesize);
-    if( image.pagecount.l == 0 )
+    if( image.pagecount.l < 0 )
     {
         return CE_Failure;
     }

From 157f14e0d81c57cebc9c60075ff9d3620ec638fb Mon Sep 17 00:00:00 2001
From: Even Rouault <even.rouault@spatialys.com>
Date: Mon, 1 Apr 2019 15:50:06 +0200
Subject: [PATCH 273/488] CI: change pattern for skipped branches of backports

---
 .travis.yml  | 2 +-
 appveyor.yml | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index cd902b0b7ef7..6d78a55be1fd 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -3,7 +3,7 @@
 
 branches:
   except:
-  - /^(cherry-pick-)?backport-\d+-on-/
+  - /^(cherry-pick-)?backport-\d+-to-/
 
 matrix:
   fast_finish: true
diff --git a/appveyor.yml b/appveyor.yml
index 30cf23d33473..2a15d6c73ab3 100644
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -1,7 +1,7 @@
 
 branches:
   except:
-    - /(cherry-pick-)?backport-\d+-on-/
+    - /(cherry-pick-)?backport-\d+-to-/
 
 environment:
   matrix:

From fb6f0afdadb8b8929fea765b571109d0886755f8 Mon Sep 17 00:00:00 2001
From: Even Rouault <even.rouault@spatialys.com>
Date: Wed, 3 Apr 2019 12:21:55 +0200
Subject: [PATCH 274/488] OGRSimpleCurve::segmentize(): fix 2.4.1 regression
 when 2 points are really close compared to the segmentizatin distance (fixes
 #1414). Also handle the M dimension

---
 autotest/ogr/ogr_geom.py   | 18 ++++++++++++++++++
 gdal/ogr/ogrlinestring.cpp | 37 +++++++++++++++++++++++++++++++------
 2 files changed, 49 insertions(+), 6 deletions(-)

diff --git a/autotest/ogr/ogr_geom.py b/autotest/ogr/ogr_geom.py
index 08bebc779409..9b3aee7c5492 100755
--- a/autotest/ogr/ogr_geom.py
+++ b/autotest/ogr/ogr_geom.py
@@ -644,16 +644,34 @@ def test_ogr_geom_closerings():
 
 def test_ogr_geom_segmentize():
 
+    # 2D
     geom = ogr.CreateGeometryFromWkt('LINESTRING(0 0,0 10)')
     geom.Segmentize(1.00001)
 
     assert geom.ExportToWkt() == 'LINESTRING (0 0,0 1,0 2,0 3,0 4,0 5,0 6,0 7,0 8,0 9,0 10)'
 
+    # 2D + Z
     geom = ogr.CreateGeometryFromWkt('LINESTRING(0 0 1,0 10 1)')
     geom.Segmentize(1.00001)
 
     assert geom.ExportToWkt() == 'LINESTRING (0 0 1,0 1 1,0 2 1,0 3 1,0 4 1,0 5 1,0 6 1,0 7 1,0 8 1,0 9 1,0 10 1)'
 
+    # 2D + M
+    geom = ogr.CreateGeometryFromWkt('LINESTRING M(0 0 1,0 10 1)')
+    geom.Segmentize(5)
+    assert geom.ExportToIsoWkt() == 'LINESTRING M (0 0 1,0 5 1,0 10 1)'
+
+    # 2D + ZM
+    geom = ogr.CreateGeometryFromWkt('LINESTRING ZM(0 0 1 2,0 10 1 2)')
+    geom.Segmentize(5)
+    assert geom.ExportToIsoWkt() == 'LINESTRING ZM (0 0 1 2,0 5 1 2,0 10 1 2)'
+
+    # Test distance between points <<<< segmentization threshold
+    # https://github.com/OSGeo/gdal/issues/1414
+    geom = ogr.CreateGeometryFromWkt('LINESTRING(0 0,0 1)')
+    geom.Segmentize(10000)
+    assert geom.ExportToWkt() == 'LINESTRING (0 0,0 1)'
+
     # Check segmentize symmetry : do exact binary comparison.
     in_wkt = 'LINESTRING (0 0,1.2 1,2 0)'
     g1 = ogr.CreateGeometryFromWkt(in_wkt)
diff --git a/gdal/ogr/ogrlinestring.cpp b/gdal/ogr/ogrlinestring.cpp
index 1d4da9c58b00..7524d8d9a597 100644
--- a/gdal/ogr/ogrlinestring.cpp
+++ b/gdal/ogr/ogrlinestring.cpp
@@ -2526,9 +2526,9 @@ void OGRSimpleCurve::segmentize( double dfMaxLength )
 
     OGRRawPoint* paoNewPoints = nullptr;
     double* padfNewZ = nullptr;
+    double* padfNewM = nullptr;
     int nNewPointCount = 0;
     const double dfSquareMaxLength = dfMaxLength * dfMaxLength;
-    const int nCoordinateDimension = getCoordinateDimension();
 
     for( int i = 0; i < nPointCount; i++ )
     {
@@ -2537,13 +2537,20 @@ void OGRSimpleCurve::segmentize( double dfMaxLength )
                        sizeof(OGRRawPoint) * (nNewPointCount + 1)));
         paoNewPoints[nNewPointCount] = paoPoints[i];
 
-        if( nCoordinateDimension == 3 )
+        if( padfZ != nullptr )
         {
             padfNewZ = static_cast<double *>(
                 CPLRealloc(padfNewZ, sizeof(double) * (nNewPointCount + 1)));
             padfNewZ[nNewPointCount] = padfZ[i];
         }
 
+        if( padfM != nullptr )
+        {
+            padfNewM = static_cast<double *>(
+                CPLRealloc(padfNewM, sizeof(double) * (nNewPointCount + 1)));
+            padfNewM[nNewPointCount] = padfM[i];
+        }
+
         nNewPointCount++;
 
         if( i == nPointCount - 1 )
@@ -2552,7 +2559,7 @@ void OGRSimpleCurve::segmentize( double dfMaxLength )
         const double dfX = paoPoints[i+1].x - paoPoints[i].x;
         const double dfY = paoPoints[i+1].y - paoPoints[i].y;
         const double dfSquareDist = dfX * dfX + dfY * dfY;
-        if( std::fabs(dfSquareDist - dfSquareMaxLength) > 1e-5 * dfSquareMaxLength )
+        if( dfSquareDist - dfSquareMaxLength > 1e-5 * dfSquareMaxLength )
         {
             const double dfIntermediatePoints =
                 floor(sqrt(dfSquareDist / dfSquareMaxLength) - 1e-2);
@@ -2571,6 +2578,7 @@ void OGRSimpleCurve::segmentize( double dfMaxLength )
                          nNewPointCount, nIntermediatePoints);
                 CPLFree(paoNewPoints);
                 CPLFree(padfNewZ);
+                CPLFree(padfNewM);
                 return;
             }
 
@@ -2578,13 +2586,20 @@ void OGRSimpleCurve::segmentize( double dfMaxLength )
                 CPLRealloc(paoNewPoints,
                            sizeof(OGRRawPoint) * (nNewPointCount +
                                                   nIntermediatePoints)));
-            if( nCoordinateDimension == 3 )
+            if( padfZ != nullptr )
             {
                 padfNewZ = static_cast<double *>(
                     CPLRealloc(padfNewZ,
                                sizeof(double) * (nNewPointCount +
                                                  nIntermediatePoints)));
             }
+            if( padfM != nullptr )
+            {
+                padfNewM = static_cast<double *>(
+                    CPLRealloc(padfNewM,
+                               sizeof(double) * (nNewPointCount +
+                                                 nIntermediatePoints)));
+            }
 
             for( int j = 1; j <= nIntermediatePoints; j++ )
             {
@@ -2592,11 +2607,16 @@ void OGRSimpleCurve::segmentize( double dfMaxLength )
                     paoPoints[i].x + j * dfX / (nIntermediatePoints + 1);
                 paoNewPoints[nNewPointCount + j - 1].y =
                     paoPoints[i].y + j * dfY / (nIntermediatePoints + 1);
-                if( nCoordinateDimension == 3 )
+                if( padfZ != nullptr )
                 {
                     // No interpolation.
                     padfNewZ[nNewPointCount + j - 1] = padfZ[i];
                 }
+                if( padfM != nullptr )
+                {
+                    // No interpolation.
+                    padfNewM[nNewPointCount + j - 1] = padfM[i];
+                }
             }
 
             nNewPointCount += nIntermediatePoints;
@@ -2607,11 +2627,16 @@ void OGRSimpleCurve::segmentize( double dfMaxLength )
     paoPoints = paoNewPoints;
     nPointCount = nNewPointCount;
 
-    if( nCoordinateDimension == 3 )
+    if( padfZ != nullptr )
     {
         CPLFree(padfZ);
         padfZ = padfNewZ;
     }
+    if( padfM != nullptr )
+    {
+        CPLFree(padfM);
+        padfM = padfNewM;
+    }
 }
 
 /************************************************************************/

From 7cb6ca68ff0d7d32927cb94d09495c0d9700276e Mon Sep 17 00:00:00 2001
From: Even Rouault <even.rouault@spatialys.com>
Date: Thu, 4 Apr 2019 19:49:15 +0000
Subject: [PATCH 275/488] WMS: use proper JSon parsing for ESRI MapServer
 document (fixes #1416)

---
 gdal/frmts/wms/wmsdriver.cpp | 177 ++++++++++-------------------------
 1 file changed, 47 insertions(+), 130 deletions(-)

diff --git a/gdal/frmts/wms/wmsdriver.cpp b/gdal/frmts/wms/wmsdriver.cpp
index 72b30ec1f45d..b574b8db67d3 100644
--- a/gdal/frmts/wms/wmsdriver.cpp
+++ b/gdal/frmts/wms/wmsdriver.cpp
@@ -42,6 +42,8 @@
 #include "minidriver_iip.h"
 #include "minidriver_mrf.h"
 
+#include "cpl_json.h"
+
 #include <limits>
 #include <utility>
 
@@ -469,22 +471,6 @@ CPLXMLNode * GDALWMSDatasetGetConfigFromTileMap(CPLXMLNode* psXML)
     return CPLParseXMLString(osXML);
 }
 
-/************************************************************************/
-/*                             GetJSonValue()                           */
-/************************************************************************/
-
-static const char* GetJSonValue(const char* pszLine, const char* pszKey)
-{
-    const char* pszJSonKey = CPLSPrintf("\"%s\" : ", pszKey);
-    const char* pszPtr;
-    if( (pszPtr = strstr(pszLine, pszJSonKey)) != nullptr )
-        return pszPtr + strlen(pszJSonKey);
-    pszJSonKey = CPLSPrintf("\"%s\": ", pszKey);
-    if( (pszPtr = strstr(pszLine, pszJSonKey)) != nullptr )
-        return pszPtr + strlen(pszJSonKey);
-    return nullptr;
-}
-
 /************************************************************************/
 /*             GDALWMSDatasetGetConfigFromArcGISJSON()                  */
 /************************************************************************/
@@ -492,124 +478,55 @@ static const char* GetJSonValue(const char* pszLine, const char* pszKey)
 static CPLXMLNode* GDALWMSDatasetGetConfigFromArcGISJSON(const char* pszURL,
                                                          const char* pszContent)
 {
-    /* TODO : use JSONC library to parse. But we don't really need it */
-    CPLString osTmpFilename(CPLSPrintf("/vsimem/WMSArcGISJSON%p", pszURL));
-    VSILFILE* fp = VSIFileFromMemBuffer( osTmpFilename,
-                                         (GByte*)pszContent,
-                                         strlen(pszContent),
-                                         FALSE);
-    VSIUnlink(osTmpFilename);
-
-    const char* pszLine;
-    int nTileWidth = -1;
-    int nTileHeight = -1;
-    int nWKID = -1;
-    int nLatestWKID = -1;
-    CPLString osWKT;
-    double dfMinX = 0.0;
-    double dfMaxY = 0.0;
-    int bHasMinX = FALSE;
-    int bHasMaxY = FALSE;
-    int nExpectedLevel = 0;
+    CPLJSONDocument oDoc;
+    if( !oDoc.LoadMemory(std::string(pszContent)) )
+        return nullptr;
+    auto oRoot(oDoc.GetRoot());
+    auto oTileInfo(oRoot["tileInfo"]);
+    if( !oTileInfo.IsValid() )
+    {
+        CPLDebug("WMS", "Did not get tileInfo");
+        return nullptr;
+    }
+    int nTileWidth = oTileInfo.GetInteger("cols", -1);
+    int nTileHeight = oTileInfo.GetInteger("rows", -1);
+
+    auto oSpatialReference(oTileInfo["spatialReference"]);
+    if( !oSpatialReference.IsValid() )
+    {
+        CPLDebug("WMS", "Did not get spatialReference");
+        return nullptr;
+    }
+    int nWKID = oSpatialReference.GetInteger("wkid", -1);
+    int nLatestWKID = oSpatialReference.GetInteger("latestWkid", -1);
+    CPLString osWKT( oSpatialReference.GetString("wkt"));
+
+    auto oOrigin(oTileInfo["origin"]);
+    if( !oOrigin.IsValid() )
+    {
+        CPLDebug("WMS", "Did not get origin");
+        return nullptr;
+    }
+    double dfMinX = oOrigin.GetDouble("x", std::numeric_limits<double>::infinity());
+    double dfMaxY = oOrigin.GetDouble("y", std::numeric_limits<double>::infinity());
+
+    auto oLods(oTileInfo["lods"].ToArray());
+    if( !oLods.IsValid() )
+    {
+        CPLDebug("WMS", "Did not get lods");
+        return nullptr;
+    }
     double dfBaseResolution = 0.0;
-    while((pszLine = CPLReadLine2L(fp, 4096, nullptr)) != nullptr)
+    for(int i = 0; i < oLods.Size(); i++ )
     {
-        const char* pszVal;
-        if ((pszVal = GetJSonValue(pszLine, "rows")) != nullptr)
-            nTileHeight = atoi(pszVal);
-        else if ((pszVal = GetJSonValue(pszLine, "cols")) != nullptr)
-            nTileWidth = atoi(pszVal);
-        else if ((pszVal = GetJSonValue(pszLine, "wkid")) != nullptr)
-        {
-            int nVal = atoi(pszVal);
-            if (nWKID < 0)
-                nWKID = nVal;
-            else if (nWKID != nVal)
-            {
-                CPLDebug("WMS", "Inconsistent WKID values : %d, %d", nVal, nWKID);
-                VSIFCloseL(fp);
-                return nullptr;
-            }
-        }
-        else if ((pszVal = GetJSonValue(pszLine, "latestWkid")) != nullptr)
-        {
-            int nVal = atoi(pszVal);
-            if (nLatestWKID < 0)
-                nLatestWKID = nVal;
-            else if (nLatestWKID != nVal)
-            {
-                CPLDebug("WMS", "Inconsistent latestWkid values : %d, %d", nVal, nLatestWKID);
-                VSIFCloseL(fp);
-                return nullptr;
-            }
-        }
-        else if ((pszVal = GetJSonValue(pszLine, "wkt")) != nullptr)
+        if( oLods[i].GetInteger("level", -1) == 0 )
         {
-            osWKT = pszVal;
-            size_t nPos;
-            // FIXME: we should really use a proper JSon parser !!!
-            if( !osWKT.empty() && osWKT[0] == '"' &&
-                (nPos = osWKT.find("\"}")) != std::string::npos )
-            {
-                osWKT = osWKT.substr(1, nPos - 1);
-                osWKT.replaceAll("\\\"", "\"");
-            }
-            else if( osWKT.size() > 2 && osWKT[0] == '"' && osWKT.back() == '"' )
-            {
-                osWKT = osWKT.substr(1, osWKT.size() - 2);
-                osWKT.replaceAll("\\\"", "\"");
-            }
-            else
-            {
-                osWKT.clear();
-            }
-        }
-        else if ((pszVal = GetJSonValue(pszLine, "x")) != nullptr)
-        {
-            bHasMinX = TRUE;
-            dfMinX = CPLAtofM(pszVal);
-        }
-        else if ((pszVal = GetJSonValue(pszLine, "y")) != nullptr)
-        {
-            bHasMaxY = TRUE;
-            dfMaxY = CPLAtofM(pszVal);
-        }
-        else if ((pszVal = GetJSonValue(pszLine, "level")) != nullptr)
-        {
-            int nLevel = atoi(pszVal);
-            if (nLevel != nExpectedLevel)
-            {
-                CPLDebug("WMS", "Expected level : %d, got : %d", nExpectedLevel, nLevel);
-                VSIFCloseL(fp);
-                return nullptr;
-            }
-
-            pszVal = GetJSonValue(pszLine, "resolution");
-            if( pszVal == nullptr )
-            {
-                pszLine = CPLReadLine2L(fp, 4096, nullptr);
-                if( pszLine == nullptr )
-                    break;
-                pszVal = GetJSonValue(pszLine, "resolution");
-            }
-            if (pszVal != nullptr)
-            {
-                double dfResolution = CPLAtofM(pszVal);
-                if (nLevel == 0)
-                    dfBaseResolution = dfResolution;
-            }
-            else
-            {
-                CPLDebug("WMS", "Did not get resolution");
-                VSIFCloseL(fp);
-                return nullptr;
-            }
-            nExpectedLevel ++;
+            dfBaseResolution = oLods[i].GetDouble("resolution");
+            break;
         }
     }
-    VSIFCloseL(fp);
 
-    int nLevelCount = nExpectedLevel - 1;
+    int nLevelCount = oLods.Size() - 1;
     if (nLevelCount < 1)
     {
         CPLDebug("WMS", "Did not get levels");
@@ -631,12 +548,12 @@ static CPLXMLNode* GDALWMSDatasetGetConfigFromArcGISJSON(const char* pszURL,
         CPLDebug("WMS", "Did not get WKID");
         return nullptr;
     }
-    if (!bHasMinX)
+    if (dfMinX == std::numeric_limits<double>::infinity())
     {
         CPLDebug("WMS", "Did not get min x");
         return nullptr;
     }
-    if (!bHasMaxY)
+    if (dfMaxY == std::numeric_limits<double>::infinity())
     {
         CPLDebug("WMS", "Did not get max y");
         return nullptr;

From 5b9501f45e56a5cbe728b2e651f38e1823e1cb56 Mon Sep 17 00:00:00 2001
From: Even Rouault <even.rouault@spatialys.com>
Date: Sat, 6 Apr 2019 15:27:03 +0200
Subject: [PATCH 276/488] AIGRID / AVCBin: fix filename case adjustment that
 failed on /vsi filesystems (fixes #1385)

---
 gdal/ogr/ogrsf_frmts/avc/avc_misc.cpp | 49 ++++++++++++---------------
 1 file changed, 22 insertions(+), 27 deletions(-)

diff --git a/gdal/ogr/ogrsf_frmts/avc/avc_misc.cpp b/gdal/ogr/ogrsf_frmts/avc/avc_misc.cpp
index 009a0c92f7b7..4c2710bdebda 100644
--- a/gdal/ogr/ogrsf_frmts/avc/avc_misc.cpp
+++ b/gdal/ogr/ogrsf_frmts/avc/avc_misc.cpp
@@ -232,7 +232,6 @@ GBool AVCFileExists(const char *pszPath, const char *pszName)
  * necessary, and return a reference to that filename.
  *
  * This function works on the original buffer and returns a reference to it.
- * It does nothing on Windows systems where filenames are not case sensitive.
  *
  * NFW: It seems like this could be made somewhat more efficient by
  * getting a directory listing and doing a case insensitive search in
@@ -243,31 +242,11 @@ GBool AVCFileExists(const char *pszPath, const char *pszName)
  **********************************************************************/
 char *AVCAdjustCaseSensitiveFilename(char *pszFname)
 {
-
-#ifdef _WIN32
-    /*-----------------------------------------------------------------
-     * Nothing to do on Windows
-     *----------------------------------------------------------------*/
-    return pszFname;
-
-#else
-    /*-----------------------------------------------------------------
-     * Unix case.
-     *----------------------------------------------------------------*/
     VSIStatBufL  sStatBuf;
     char        *pszTmpPath = nullptr;
     int         nTotalLen, iTmpPtr;
     GBool       bValidPath;
 
-    /*-----------------------------------------------------------------
-     * Remap '\\' to '/'
-     *----------------------------------------------------------------*/
-    for(pszTmpPath = pszFname; *pszTmpPath != '\0'; pszTmpPath++)
-    {
-        if (*pszTmpPath == '\\')
-            *pszTmpPath = '/';
-    }
-
     /*-----------------------------------------------------------------
      * First check if the filename is OK as is.
      *----------------------------------------------------------------*/
@@ -279,12 +258,21 @@ char *AVCAdjustCaseSensitiveFilename(char *pszFname)
     pszTmpPath = CPLStrdup(pszFname);
     nTotalLen = (int)strlen(pszTmpPath);
 
+    /*-----------------------------------------------------------------
+     * Remap '\\' to '/'
+     *----------------------------------------------------------------*/
+    for (iTmpPtr=0; iTmpPtr< nTotalLen; iTmpPtr++)
+    {
+        if (pszTmpPath[iTmpPtr] == '\\')
+            pszTmpPath[iTmpPtr] = '/';
+    }
+
     /*-----------------------------------------------------------------
      * Try all lower case, check if the filename is OK as that.
      *----------------------------------------------------------------*/
     for (iTmpPtr=0; iTmpPtr< nTotalLen; iTmpPtr++)
     {
-        if ( pszTmpPath[iTmpPtr] >= 0x41 && pszTmpPath[iTmpPtr] <= 0x5a )
+        if ( pszTmpPath[iTmpPtr] >= 'A' && pszTmpPath[iTmpPtr] <= 'Z' )
             pszTmpPath[iTmpPtr] += 32;
     }
 
@@ -300,7 +288,7 @@ char *AVCAdjustCaseSensitiveFilename(char *pszFname)
      *----------------------------------------------------------------*/
     for (iTmpPtr=0; iTmpPtr< nTotalLen; iTmpPtr++)
     {
-        if ( pszTmpPath[iTmpPtr] >= 0x61 && pszTmpPath[iTmpPtr] <= 0x7a )
+        if ( pszTmpPath[iTmpPtr] >= 'a' && pszTmpPath[iTmpPtr] <= 'z' )
             pszTmpPath[iTmpPtr] -= 32;
     }
 
@@ -315,9 +303,18 @@ char *AVCAdjustCaseSensitiveFilename(char *pszFname)
      * OK, file either does not exist or has the wrong cases... we'll
      * go backwards until we find a portion of the path that is valid.
      *----------------------------------------------------------------*/
-    iTmpPtr = nTotalLen;
-    bValidPath = FALSE;
+    strcpy(pszTmpPath, pszFname);
 
+    /*-----------------------------------------------------------------
+     * Remap '\\' to '/'
+     *----------------------------------------------------------------*/
+    for (iTmpPtr=0; iTmpPtr< nTotalLen; iTmpPtr++)
+    {
+        if (pszTmpPath[iTmpPtr] == '\\')
+            pszTmpPath[iTmpPtr] = '/';
+    }
+
+    bValidPath = FALSE;
     while(iTmpPtr > 0 && !bValidPath)
     {
         /*-------------------------------------------------------------
@@ -402,8 +399,6 @@ char *AVCAdjustCaseSensitiveFilename(char *pszFname)
     CPLFree(pszTmpPath);
 
     return pszFname;
-
-#endif
 }
 
 

From b71180794d6a7f1763064d2e976160479826bd57 Mon Sep 17 00:00:00 2001
From: Even Rouault <even.rouault@spatialys.com>
Date: Tue, 9 Apr 2019 10:56:33 +0200
Subject: [PATCH 277/488] PAM: preserve existing metadata when setting new one
 (fixes #1430)

---
 autotest/gcore/pam.py         | 19 +++++++++++++++++++
 gdal/gcore/gdalpamdataset.cpp |  5 ++++-
 2 files changed, 23 insertions(+), 1 deletion(-)

diff --git a/autotest/gcore/pam.py b/autotest/gcore/pam.py
index 470c29c80ad5..1a9c7da8228d 100755
--- a/autotest/gcore/pam.py
+++ b/autotest/gcore/pam.py
@@ -423,6 +423,25 @@ def test_pam_13():
 
     gdal.SetConfigOption('GDAL_PAM_ENABLED', 'YES')
 
+###############################################################################
+# Test that existing PAM metadata is preserved when new is added
+# https://github.com/OSGeo/gdal/issues/1430
+
+
+def test_pam_metadata_preserved():
+
+    tmpfilename = '/vsimem/tmp.pnm'
+    ds = gdal.GetDriverByName('PNM').Create(tmpfilename, 1, 1)
+    ds.SetMetadataItem('foo', 'bar')
+    ds = None
+    ds = gdal.Open(tmpfilename)
+    ds.GetRasterBand(1).SetMetadataItem('bar', 'baz')
+    ds = None
+    ds = gdal.Open(tmpfilename)
+    assert ds.GetMetadataItem('foo') == 'bar'
+    assert ds.GetRasterBand(1).GetMetadataItem('bar') == 'baz'
+    ds = None
+    gdal.GetDriverByName('PNM').Delete(tmpfilename)
 
 ###############################################################################
 # Cleanup.
diff --git a/gdal/gcore/gdalpamdataset.cpp b/gdal/gcore/gdalpamdataset.cpp
index 9592d524bbc1..fcdd595ef6fb 100644
--- a/gdal/gcore/gdalpamdataset.cpp
+++ b/gdal/gcore/gdalpamdataset.cpp
@@ -418,7 +418,10 @@ CPLErr GDALPamDataset::XMLInit( CPLXMLNode *psTree, const char *pszUnused )
 /* -------------------------------------------------------------------- */
 /*      Apply any dataset level metadata.                               */
 /* -------------------------------------------------------------------- */
-    oMDMD.XMLInit( psTree, TRUE );
+    if( oMDMD.XMLInit( psTree, TRUE ) )
+    {
+        psPam->bHasMetadata = TRUE;
+    }
 
 /* -------------------------------------------------------------------- */
 /*      Try loading ESRI xml encoded GeodataXform.                      */

From 4c45e7636a555dd3356e4c5e0e02faea66afa281 Mon Sep 17 00:00:00 2001
From: Even Rouault <even.rouault@spatialys.com>
Date: Thu, 11 Apr 2019 21:13:49 +0200
Subject: [PATCH 278/488] Internal libtiff:
 TIFFWriteEncodedStrip/TIFFWriteEncodedTile: fix rewriting of LZW-compressed
 data

Fixes #1439

When rewriting a LZW tile/strip whose existing size is very close to a multiple of
1024 bytes (and larger than 8192 bytes) with compressed data that is larger,
the new data was not placed at the end of the file, causing corruption.
---
 .../data/bug_gh_1439_to_be_updated_lzw.tif    | Bin 0 -> 8511 bytes
 .../gcore/data/bug_gh_1439_update_lzw.tif     | Bin 0 -> 9755 bytes
 autotest/gcore/tiff_write.py                  |  48 ++++++++++++
 gdal/frmts/gtiff/libtiff/tif_write.c          |  72 +++++++++---------
 4 files changed, 83 insertions(+), 37 deletions(-)
 create mode 100644 autotest/gcore/data/bug_gh_1439_to_be_updated_lzw.tif
 create mode 100644 autotest/gcore/data/bug_gh_1439_update_lzw.tif

diff --git a/autotest/gcore/data/bug_gh_1439_to_be_updated_lzw.tif b/autotest/gcore/data/bug_gh_1439_to_be_updated_lzw.tif
new file mode 100644
index 0000000000000000000000000000000000000000..7c62aa80ea1ab2476a2b15d63daf3b2739da6f2d
GIT binary patch
literal 8511
zcmYkAYg80h+V6K&SKn{d_X~ZgZV?fIv;<8{h*kkghZxfmVu%`34M<u-Olyeg7~)iQ
zL(?EC8e>q2sYatD!#LpZI>cd|DnulX<DiG-5ML*!+6zNGPEPCM&0#!_=kTsIALhee
z_1n*SYOlR&{h!*;f4}%*7LWh{6aYX10L>9V=kQ+)&rRWf@mv@P{>8#M7X6F=`yCC0
zfd9@tIX4Xd7B~JIoBow^Y%a(4Z}AuYjbHsYo=XEyodA3~_dGo}dNBYf&#{Z{@0)ur
z?u6*(4~D=0>4@m;)yowBAn*CQFGnt)f<9vHzYwsk%zfzWE1u8(5*?@<DqFX9AX@cX
zD7fo%{(+-cAO2_S-Yq%LkFhM5voZR5&JX0>>P+%$a<O{ry~AHMeq#Az^v;3sKidT9
zUzZ@SZ}?z6S$G`msbRk_JHF|>;~o~iHDM~uIVdho_Uz4prOw^4XTLz>@9jHw=T2u%
zc11z&p%zj9@6XEd-qHx~PQN+!&hA5(O3cC^8eTaLpAzZJ{xMu|QLuF9#mt=WAvmMv
zzS1+a<vcB$%3AqomRO4abgJ$H?OOEE(a6B?NBLjZnTg_y&u%Fys$VuqC%#!ch-57<
zWk$+YpM{ng4!-z*8YTvQ_13Rj-u}GDzI47rG`n??vlbf%#;^F>MG<$HakfL(PW#pD
zkIV~)s~ORXmJ^vz5C;!Q<dSNyVuM2*xSS)OnoRd=s>i#WF(gr@k_U)&1;<4F<;D6E
z=-7vXmf*Pz<I1nM)|&3I#ud%!fpWh%Jv6Xga*COL$*}5;{Fjvx#si!jC3~gm9?>0E
z*B;&}m)zUG<9+E#jl;hmTsyb@vr_s*cn`Jgn7Tt4jK8cO{pf_{K%%dsINnX3(TRpF
z(>b5f@ve`=&6Vfh=yWaYlpkrfl!TSHHLI4URdsmlEeX%wkF6P!Fs_SqWE)}ru$kCD
zZ~DX%HRdW@^M$C#y-5=r%P!H+|FJvm!0jy~<)W3Oe}x2i+u!`G$y4j1PPvv6qUJZs
zadkEQ<kjXWUxif&eKbxqkNRvOaZ^9(FjjlwOIla;yLZ6dKYozjzG|By`%|PRvTaWw
zSd*)CfB#@x)7yi!hE~DggI6R8wC!#5-jAy@zG&&2C4p#h`WokgvN7e+1bVA{H^moi
z(7c^VRf{eJ`<{<p@OOm|MfwM%RQg97--r@hJnu)jK5fIN33O`Fo|f5x1^SB#zv6S;
zf*C;V!X{Tsk$F(vjDHsi2o|`u!be62eGQOn+Zm704IL?RoRBiOGX41S?aik`P0z-d
z%&c8Us)EM4rW5<k1!|Xc4SF;|#KP7ElVKZlCqD6PbY&`-Q@<*6Q@(grrSYTv8Nri_
zgrkX?`Y(lKV@cP^zBV&@3VWpe{Eo)6(J2blW9{tsOLw+zb}^wNw@FnXjSS%;sMI`^
zW2GdyyPC=GQ03m_r0RoM_kQXF&Be9e=Srx(b~1ex(0DV5qt~3(4@z4p-dq}d0v9zX
z#n9emqvMs%qJtZyc=uu!U#j3o5V31oFv|WfdD2r1`npvmgK;&M>7zC4=7Z@|%6YSm
zN;U;VWUrvA*GV%w6hg@<+c4>uk0UVD;YMNhBjI@4q8K?L0gaVv&uueO`AZAYS=P3H
zRMUdLW@P=(sa<Cj!r4X?o8Hxq?{trvt8CSt8k#)o8kua;P#b~zgCQH-S7H<N?ocM;
z3oms3PXpVyLDbjf8euE+n8yWCk_DyYe;JFKcI{2Mfyn=k0@B=WNo6Pq&vVLo=Gr(t
zIlpD{k7%@OyM*ap$cA<TcZGo(zacH9YL#qzam%*r&o=cqLDj*Rql+CH9Q&n`z4D<f
zk!}_FrUh(a-X3Ch-U!3n=hbYKtPN(AnB(dQFKJF)w}Q-<#T2<Ao+?Adp<yXSnh@}$
zknT&ubZ4cwV;BOVGE4D<xQRKNCkh<}EVZhIIFT+6S`c_-sg!!U?2>1tW}a;a2w9h3
zoIb7ykh>_NQh$Mmb#%u|g4A9U7#ovQnUYvPyaWXQC`eSUiSaj<2!lP!Na6Z6b|N44
zwxDF!BJs7lbP9W{nP+xH$@7b$+0B9r>CZuz;sq4b;&gjMveZelh}mt%BrBlB8R??I
z6NY(YSm<icUFrFCTBK8^x^^3mk?U05mA?Rf?Sj$xU*yFz;=Ne>g`&Pvnfr=GnwXha
zid6~%ilyp~baBLgSj(VA&DYYEA~H{X9O~NRT4O2dQK&(o385b^ikMGIql^N%KP4R<
zOhEA65((*Z2t!R`sKlu5IG<ZeO`DTr`E6^>`AEmK4mvm<3)C%%_};b%BvAa}*iw!<
zuDf7E_VitOZkQdFVtvktU;7Nf9zd&Y_3eZ{`$9MmVN#WQIu4{aVL1q~8jjPaUC|yf
z413H9e|@enoFPw`^IO*H;n8V0jqR#!4Hae&XTI;mkrk1?9r_XfeTd6;H;<oLG(ufX
z>y`-iQdB{#a=pXdShV}$UJcwcB7{5g<j|80E_lS6$n-@$4cV8x0FWhwXmOobXufP=
zJ25fgF1TQR*G@H<Tls@4M$NN!^5ENIdM`W*e$)|_@6!F}#lzS+WpZ^!b4af$!OD=^
zsc<`ZkOO(s^u?JU#(*jZGJlI)=q!(8wPJwwBGo;gi2J^gUmE)>e7vJV+V2)d0jauB
zu^d5X=NE@+!EsiIB+2aN`2R+UhK+6g-Pt2xyI62{dlR|FSt98c6jw+ift$7wZ1_JC
zt9MdpPo6mVK*Ak-Q_2n)OR<#1Eg{?cM@35C|4Vau>L}s|AnI6cDsI{u)r5_L*}tn@
z_3QSf&Oub=PonC9&CSVm&gkGDbr(L;s#Aklaq1;U5e2D2-SbMRcT5-1t$W_-%pCFN
z2w-GW8@0w>+V@Ze1~=?OOFU5UkH!mq#myZoTI#!EcVU>KFW<T{+=VheQM>=TDCWCk
zVsAa)n(#s;gXdLTwlccEa?vIK7k2k#x`MhcxD@`4DCrHTJ0hx!eL8b>!-nC9D($7&
zHQESbQ9P7h0{k*9-cc`21s7cM<SChS2tiBS#MobjwE3MV6&FCAe{mM~Y;S}7s%GCe
z@@RZT3s+@WIrymzir0uWn}o%)mz+hbpWU4rS|AMlSx?#gbU*CDB}JlW`Zgq$mBWqO
z)KukGDpglVSK8Ib->GX&9fV58=c(ZV6&Sx<h_EZ5;b0*}cCQ%moD*L_3M8o#2OEN+
zlmv{Ku=|$8w3s=q;KDFuQ(+IpSe23AsibaLK%>J|Q%UFQq4R*6MewkSpK^f55~xy-
zpOsLggz^fYF#z3^a91t-00a;xwOmad(}PVKDi3g77O>IGuzIq{zzz!Or>f*lExyyp
zJu$k1roW$t*zM|Mql6h(k@rPZ0RWE-><vrcu_lpWrbq+b;NTi8;0JNyx(U?TNsl(+
zaAF6<xXPYfBP1j0<Wfzd&?LSkW>Gca7xG>K-sWJ9MvQdgV;07n#toYSZha!l3`KM<
z6#|)2SDl($>SQKVtX9dD+qrf6KuSkwQ64pb3OTV8P1>xW-9|SF_-|m>kb~H$WL6ny
z#6;{>xQ@U8mGO+4HX0I*XmZ%$ngz@wCqAp>V>V7C;u@SxPz2Rz2}Yb)BTPKi;D=Ns
zl15y0;G1NwZbM?Z%5@iUjU$PO!{t-q=VY#OEsm+V>pFJO%H4vPX*-{8B$+fOXiHFL
zuny(&rPz#`XxCtaa{8QtsMj&sI_#vK%$3m7M!FY*fE??UC%@5AD&(uxMl8e5+!f&&
z3NR+6t<Ho)LOuahx`}9TxZFy5Og1)-a9vWm(wQ7dTU?_{E_YzK4a`aYw4P3xxReT<
zlqMrq4o0Xk13NAtuImC0!0BP$YQ}C@18r$gu9mLUgM%V2rlcu7_CQ9T)^lDfJ)Oq1
zX=z-?yHTzVf%H~B&)|CG<fcrRS3|KjqRL7JbzGK#?tsCRCb1Ra>I|-0z-mpP9ZF=2
z$t*GLuq1}mR8YeY2r-2?`I9`k%YkD$Y9fuCoF)$$w)6l#=pak1fs~%C)8cJN;E@6!
zG=ir_OrfWD$U;pfKFh$)*po&XK%u~(0qWB85)_)SlProqMqGF0E?B_aM&9{Zo~Y9#
zRgx{a0tyx4lgAQMV%Gx+GvZ9vILItTa+94LP&08e88fjbLES2JPRzs;Bbb7@Q8_h?
z@?`>Wz`~;nY)B2Ys~|)lAe|JGmaLF7K$pA>=s^v!+@2^CCNd%MMiZ-mpiDb=X0G!Q
z@iuAlq{Ow(#&jB!W+n4P6c{nP7(<{}o2bx}T^2rqVtXNCxr#ID2%CB803SF5yCT};
ztOSoC%ytudMn!w<m($e{Y{ye@ph!%e*Hdi>bVEW|0ee<LU}7d+lgLgZmRrawc@oI^
z8HE1{#>b_Q&FRWcbDuQ?o*JlgD1S>q%}4^dlBE7rV!457l=|*!_)0ThnZ|aYR2X5;
z+NgAKV!b|zT9UV&++&ln&Vr5V5><xePC&OSu}m3RCdJPPc|?V+5mJ7sYfu!(MsS6J
zs9Or{5Cv{nc+$bfl(<{M>{Jr##n8_VFr?+Y;=nP0*V#CkfjBGR`qKDH6$Bi39Wp0H
z!fV1<!7tru81IB`!qf~z6c|935wDeDGj=R&3Fr+hZlkW4TyZ<zCLtR21nk5roa8jj
z&B*CINkWE_6EgCNgdI}hV+y9%f=!5No0N&mS-(EvL#a*9<OBpJjERsoP$i>l^z3~F
z-6NonA=qQXT&)qyg-|}6SZ;!LShqhmCK)w#-@s4^F$TG=7`T)S8WIOWc6_gu%yfcs
zJ2s9&Ba*<?YqZw@uBfrcQrCKQfU>v_=;?Y9c%o!cA@o>EmuM5mM4V5}$&AS}X08?`
zp6H>=Moxxs=_b5S!Tb!!O%gs=Ol;Cp>zv>!nhZOntD!)K89Qg@2gLMa4PX#@lZufj
zTt)+w?@W*e>Z&fFl~L;<PGQD_DxQ(klS00vitj+NB7~T-u@V(93z9M;_rRI_142wV
z0#*P~I`W)uBvTp?S-DLPvP(z|I9LY+Jyrn3#4lG+s{nJ>7I=zKbq2cpF^4)`Sz_h~
z9sg7c1tlQM+_YC3m<3$BooTRf*&?VyO0=O&1_;0g*JA@T1+y{{usf3y2<z3k%Cq^6
zFwv-WHOe8C2wE@XFWX62=;~G9Z#N`@l4MBvH?tBmo4^o^Kb8l6wnBHs_=JM2)nR8<
z{P{Gt)(I+vz@}q-Ha=wt_-u)FdV?FK22s3BEPo`UZlF+=6&o;enP%pvG^jx9@~g<l
zkLjO<$r~eyxE-o@P%&*qhY8<n3dkU?-9jHh`pyY>G>saN{jFObFiKv1s!b?8SdWf8
zYiE2gQ*Teyn3A{v64|gy9n=SdSuH;#qpxb289B7W40t(vS&OHPG_bH;QdbYm=L(=O
z5~vd<PYT#|aPlhL7ZPAUh`|9nEfNyHms7I}FsV(>2#9(M)~IB%0r&b6*7_RtIYzqG
zRutiJ8=GNCrfkqnYv7B+t{?2wO)0L`5NlK%rX#}6K!=EZj09p3<v;_tmf9=AI~@E^
zy5vDwvd+ZUX|QrbBG1n3GH%;w=lphNL`y#q(_5X?q;Or9i7(K&Y5=8B)7NbTtVm2H
z`MK(w7O@Q)uF}Tu6tf%k_>=@3lap&6gR|nqItMLNk{&TpB~2XBCi0Yl`+(R1Lo*iQ
zqy`IGdA|&=Qcyre#Z-KjlEJLWGnzn+oCq6Ps{-Gc)|;)I6D?h3Bbp4LN5%JQ=_8K7
zZHJ2$avcJ^z({%j#F_Qjpoq2E0$Wk84Cd;r$teR!*Hi6UJdEZ>Ag)19J}?tg5;|yM
z^PtY94*cWeG;1Iygr^Sa*j<2HqvPUEenQ1}8E_RG7zTWW)Ab_BWQ*~+V^?n^fs${4
zlXKrZWnvGi*`P8|Z%-aWxFQoKv13o2ghR^h(9GRI(Ts_#QMj}=-fN+%<Ty~{PgPJY
zLj8<l<61~%#$^I}c^Yv8fr60hTpE5u%lXY*lNK71C6^27V`8k)3UzAvH7HbL;oSn)
zISAslObrCZtn77Zg8x1AaTfGjI5A;%RVWDPcdM;(VAbqUN#+(0Ojzk39ImbA#A-FY
z^RlbS>Ut_>c|9F;(8CbhfRaG$DpdV$ryTsXpIIf~ZW&z1G~_pFb5@wWin?y95>^>`
z!0Ng#z`|N=3c<P&d^IdRq2>Ej*j72N70?QM^=*5S6j5g-EGvW#>H}xYfhQ`k&cO7h
zxqQyYT?kG&5+kPMF$4eD&Ym++j}&A?%$KMszlc^q$#ba7W=Ni~a6eg+SvvYYpr05>
zL<?@g7@X#^0{kq*7udGO)vg{%5;$2#M%IZi%$z)Lrc^5Iu2DUpA|4y*>vnub#r=ff
zl~S<dEIBKMWd`{X5D3BCw1cYB2m0(-xyd!9WzyADk2A0yqP!?RpvMsnX0u~vfayb2
zogSYM@#R9|7DSIKm}wh30da*YVyBoirePrix64FLK*}){tuW9r9kCPU_v$F0ZEo94
zR~mc5OcluZt4=644No_bxprb!1qD^iDk)zjV#np=j16y;a|H(8W=p03xGsYpXz7@g
z+qEajNO2Z$r#HH0?f6a$HmDBh%}loq+5xz1MPe611yRZm;VN6=XX#uMi#-(wfP(+V
z#Eil8T_?>eTvNJa9Z00)#0{$}C`oL0P<5N}PIDq%#XJ%2t5Y-i=L0I)uYGdYkeVCR
zfk!rSm)_MU32ZcDbqcmglxUOl9upqdyBY;tk(zZo5>HL|gqmQ?Y_2g;g9(gsNeNbi
znsX8b|D2@P8&qQ-n8Uk%LqwXV#k&t?$?#)W<ku>b*;Tnm|3}ld;w2q1<WO<u#k$_5
z4@(XonO?gsY+P5|{TFd4FjE4h&;QG>V%zhN^c4I?y6E#eCv3?DpO(*$Y1m`uwt3UA
zlXQPga`E9yt4nkb3jbg__u0w?#gfXe-u|pJR;oQ%zv5ZtzMc<%%;p7)-TJp@j)L3A
z)-M*cCMxYi6J@=_?{Y8YY#qp%S9ay%r|pAd;g`RR%@ml+DmI?}^X937p|+(t-G?&W
z@{1+Mp`|Y?Mw8OJRmR_5&8TJu^RIloJWcXw{6XZC?R}9uBeL{w<}Zkk{5ZqrXUaF*
zM*j>i^0*C%=<22P-CsTGT5Gx)9pCvaY}{}xFzJRryO%6q{AJPC4!<+N{?NE*bE<Ni
zvzpn_Xgl69P)PyMWNn%9&Azl}G{l!Ui(MtE0||?y!Nj(Xl7_GLx2@Oh+qOKTX?|;-
zPlxp1up`8NkdL&452}w+3$rzHF<)W)qJ>I5H`m?Ptc-ARMaW8%$7(I2j~-Py+I-us
zM`ON?L1p#V#^;Wl_^~c`AGxq6yiYWEC}6`6Pv8KIpVl36O{?-go!VAV@L6;^ZaY-s
z8msCQy3W4WPXD8+qN$WzUm_xzo@MkMYW-X7LJ9h+ZGL5KVH*@UUH2J`F^v{}+c`)P
z36(b-9l>~+_+D_lSkr92yI6W^|KnN>ojFqK%wThi0K+|+e}tBfFECTorWzT?-*2=8
z_CI*84Sd%o6RiC9ocdTg8eeb(EV}<8#q@hWIfVV=$m-8U-!q%VqVRzw=2~W~L|7f%
zzSh1Ps;C0Ucz(m7k!|aifTqq{MNRYP^wibtx$>N8GoE_i5tz>2s7NdxsNWrN-N<Zj
z`6#xkHF_<a=}Zr^D>W@0xgLlqw_<Jcrbph|4}qB%_RpWb>O9JYjH?9h%*)#N$hURr
zf~kkMejzvxyoxWQTiivh0WP(}A{?w&f4)F7@{Vxo`&m(|nDJ!ABYm4dQ$|R!ODY(<
zTBu#c7v#pLr0GjP?Ivzi%U3;AppuehJv)vb2WL>{owbuW)|HZz)zRU}?YY)diA}~s
zRUSoQ*Sy8>C&xg4TzDX`Ut28O{IF`dAbI%o^P=K~H{O!CS{+d2tM7f5u4d-J8r^V@
z#1h2@XP&VEw)W#MMc;RdjkFhEDCXX(cwM+3#fsx=0n<|`#JZ4GnP2MMGYXmK+|p6}
zrapSGRJ53qU5H!I=uAT!nR=nv8$)i#D<xRah<E%+eY@TwA@%d4p*Ms{|A%|<i2lN)
z)ta;^+ZU&>OWs0N(I8MIsClJcUW%FDQuOy)V&m@$61Noe{)zNR(4pYFvY?dTUexoZ
zAQ8&lgMOoI@nj3S@w`^f>!84GJEY%?Kp6{*JNq5{!E^-M>J{^sP40o0+aKN)7W=QL
z@$67*GM3fihoEFfPWyN+dZDK;&6W8|8^~Ky;&Uk7$g@-^+YC{+P}WPpsUO^8{I8I^
zr@S2{)sZn5a-7{34|L?RY<1e5C+|fP!&x{>>&Yvt<;0*K8he6P>)i;(tGF>7PGBnq
zXs#O%w*b<UFL5CX&VSa%55275fOHfa(N;^$a#vqoB&d>N6Oxu|yF3u~TL~*E6ZJ38
z7W$)-XsQV5u2ABV1x~8+wfO$)&s>`Q4vyCA_VlZ;*dQV2!*9tnq^KGD+Dhq{NQgRn
z@xWfo?ORKv8Z4ii{89@Ftu5QGJRjwcm|<JKG_>6)_Rg1sCoi=7`!Xr-jQ#>yvM<zO
zV>2H)iR_P+9TgBlR2sUQ^7bU^(jZ)Cf^6^}G<{Jqb5#zfw7b_n^+r0}^8BItJ&9X(
zsINhKd!jbR9x#ncmYAs33gP$>dn9#G+8ugEJdRspJ?GRUrj>J}^INC)shPgKria7Y
zQQsaT)4mz%%SW3M|0xDRFOA+`whGIVvEUO>aJo?3={H4CtrU_;i^f;jVSV~uW~Q(y
zv@R{#5Zc{$JFjW*3ms5+sB87Pqq95HqWBge`@=F3pHde4B@laF8w-D7hQ{9nWL!+K
zL712=67yNImdq78(3#i1&A*VHJZKchk=;NhZ|b?{OnT?TscdJlN33G+W(hiuZi-ay
zw-<GY1+LCzT<9T;r7B@?sPK~aJ5BNIJ96TtO*H+s9e)tomr^Vr3969lgQlpa(cUr+
zrMW||$@<G|NO-p~FtkLr*efcYE}Z+#yemS1X{AqOE~<P*FlWn4WfK~3%S_RY9;jmj
z8sXEBYZZ3f{HZlL_JXi4(+th77gb%^2v{twbn-J~?j}0c*X0&5ek~j{we=stApdW)
zP)Fh3#RvXQv%j-YUDXIS=v>AA4Lv?<jT60wmg)N%kXkR}M=??S8930pL56{xV%{i-
z^x0+57+TuVwhd30BCen26?G24)M`zX>RZg2w@9JEj6L{$O_cdc8c`?(sRLRuE|Ww(
z&j`>5NK<G?aiO73LEThPgMUC1q4K8jisy;(!)dT*L$tp}2cz@Nb0@V>Q>PfE`h~|U
z!%AqYML2d(U6qZ?I7e0qx>62jLdxK*{8G<xJ$d&n^>|$&h0eK=2b<KX+7*|=-^ika
zZ?vtwp^NcAI8X73DtUg{sORs{?eXmr(C!vi?l%y#A2-u565+p-C59I7p@Mm=Z=dM6
ze_<=B_j2gr8_ALnq=^m$;cw{p{5M-U1jey{I><^X9Vk*ZF}q;=1SGrGCL6A7wMV;F
ztY#`dg+mwA$sUuOji^?Je=NgiUTfa=RNCZEqQ&(Yvcws=FoZfIW2&~k+#<qE&H0*V
z71vY?;m~^P1>|GoT85MueCoK<sE;zU^DbemBrsGRL%SqGpU*N};)@cL{?gc4v<O`w
zg!0_Qx*aISt{0LwF>%kF1uuLxPUc!+^ZzxuSy8kvUv#Mh2=4$Z2#T9ixdOIG+=&a&
z_hLSkXgX71em@#lQ(;?_-`R}Gnu9ASY_p&*8xF0csImyifkH)Jg%*l4vqe3xBgctY
zM`P406JdrZ|2_>~Je^q%#TBu!iWc)GfRW(-6Jcr%GPzVRxC)vq5TZN8mGj`qnilpG
zBt&@px|R^q^pF37rt@JE6^5(e$@hi6*94tq$l%gg&jMgB6!ZzA)8);Rt0Ige+VNtn
zM-NTP#OyQ3U=GwFZAn3JheRCSB$}>oj=uyl7toUeipL;E0}Z|ynJiHFN+RJcba=-Z
zazV?upk;8E*qb5r%xm_%B?{uv>1Si14Z?6iB%TfN^MsvS1tBlh_o2Y|JV2j;Jd0pp
zph+K;S=J2ZMdB|sdkrF=68OY1pHtN75C(H;uvs)6gi;zo&o&x2LSdzNEYR$=xA?Z8
zcRwiIxTCcG!_vlZY5PZ|T{}yAKQ0|=EWPqc>8)L*4}MYlgz_n9pDp6cj`|9le5;#%
z8)Lru7GGoB*WT*uYV-B(_6@cBuI%yM+Ut9;&-bL`MaBLXZ3kY={`AGdgT6tEq5$Ui
zrW=*wrlNp<ux6=U9WSX`>pih9$JD;6dhOud9WOXLd^P3E(ht47;9%M2@^5R-zWGe&
z>e^SAow)Jtb6soRe)ZeCKYy}<@dqmk<{S5vo+#f^ac=X{FJ9@XsC%v8t98G6y?5O^
zubsQM<M(g%Ro1V2e*U39y*;r0-F3g)eD<&J4Q|}}`tx7i`1^-Lo8Ei<clUn&=Pwu>
F|NqG@>1+T1

literal 0
HcmV?d00001

diff --git a/autotest/gcore/data/bug_gh_1439_update_lzw.tif b/autotest/gcore/data/bug_gh_1439_update_lzw.tif
new file mode 100644
index 0000000000000000000000000000000000000000..7b30b9f5056b0327310193e39016df81cd94d4cb
GIT binary patch
literal 9755
zcmYkBeOOahzVFw5%}&TWNyvNl21K-!28$Xgr8|HU5pA?+ky70Oq^UACDs|AIcJI96
zYg1}1wbt1|$7URl6CKB)9*?twNK?ntgO10cUdOYe9!ontUh4Jq<aoW#<=$uhnEyWO
z_pH}vJ!^e`>$?^&o(%{9fE)k_0nju7^)&vC|6dvY8&8J;@;An&8UMRF8VLRWZ4Xb!
z^?w&P{2dqkt<F0$0I>dD{KdcHSN@Kty8>)wKHHNUJ^OTt=}(LA?OeL`VBP%pPX>JV
z$iKXJa%uU0wR~Obbr%iJ2wtl==r8(Bn$}GXuBde#T<ZA~{LWzW%1;iLjG1S(zd+Bp
zntbH_#o2)A!q`7wUD9m-s_@f)9a}W3BKNz>)a7L(Rp<&LP#F5=k1zDVtusFv{Y$;j
zvqrD~<)N<5FX^Wry!^TGjo*Iv&*LvGi93#YuR(!CrHa_t{GE0EhckX(|Cel*@t-Qv
z+?Gp_Q=p|52_@dRvzPS%>BR=_zn$RM&LipHyuW-w&jAfD{Kx#sXGdksz^6jd`)ahL
zb$Itz*T<<x2VU>b{DpbHbNyvnD#?y~=d5~G^~neLirw@h<>I~j*87Z#*=vA{!`}Gv
z->2S0tz-XArs4<JzrXI=1AzmP1$1=`8Jy4#V(OAU6=S^LX>hmP>?tTZ)zWSsGqrBv
zzL@Np8#(%Uu*$q>F{=tvViMVNv0}nnfTYH?u^9_Q_@ji8e!+x(d6eGSIhFa@d;k8+
z)-?(i+A3u`jeCBkD*-3FY@=6uWpR)j@$BmY(Z2nK#$|PTG2+aE_dET^mRS+VwNk>S
zhO4A$?&wNQiNAK)ha%Cm))KiYn=i$n!8$W4Xx$&*70ZF{(k~w|_9%tF3sdgeVq1eS
z`z=eIr=$Vx_<C#W&idS<iVuZ}@2nrV1Le8{w6t`Ey5!69b;{Znmq`|zeDcf(wJp3O
z!Y$raYgjk@RQEx;lwDuIr&5G|?CZAY-{YL|4YGzGF0_7(F1Py+eW97NIFIZn=W};y
zZR>z!F}c;==_{=?9R2*@3k9V2!p1%D;4o>tl-WvxZ(QHoV4>nb`#$Hk(V324j59A`
z)Weg@4%|;otw!s6pOz8sZLPNa5d9VU>Dc&K%WmKXZ+!X<F|fd}@RzGLefkSy)mp_d
z@t#Cq%$;<91QyE(&iD2HbsBheOX2=YV!!;8cIf;L>t_pYLg(vC2VVPRY<WNrX1JTy
zt0>4R`@r|HPWJN==a}Y0cJVHAC>y^fbA-RWBH`}yhve^nb5SdkrW5-&$iaA(<?zs^
zlSR5HkiV`PWpvB-im8o;2uq%Ah}_lmFZ*bwchZF4<yz&|y3~5NEpqkrOj~HvV+t?v
zR=OiG<LD}sPxsUuI7)a8A7d3y+IRDOZ|lb_eX<UPPWiW}?>oEjy;#LW6A{*|@JFz#
zUJbba=9zh_n=OYebZVY0*!KKR@97yKK$t^MmhOU-MSup@yDn)zlza&nokUS`BkH3q
zkoPqS|KvpsBFRzq8_Av2N?0vZr-cowx-u2PJ)VINSAyWMF9PLcTvC+YCATS00SKGe
zix2ge$Hv!}Aj2i<qH1Pmyl-~UJ7@~h^sYE4{vt4FOlNvAKIdHM37SP=wX&iY#K>#b
zkU9|M%3ey}eE}lF8~PJTOI>QzfjD7~npD)~dZ3H`*9kB_dqk|W1qWY;d?W-&2EWUD
z73AUBb;46Uqh7+PZ>eiDzirNTb_GxMSHrnCY~mFK#<xAol^(NoJbG?#V0h-G$$ALx
zYmBiEO0dlTG>DT+-(y;SC7C>E;;XHZO+QLNiwkiN%J%q-^Xt8YLFlOn$A=BLxXr>O
zx9ohsIWLkqFBvlCL(U|U5tgck!2I{9@>!wMFQp-;G*7bzqCMZ}>bxy5dp(by?6ze)
z=LNa*c^H4v#`GAVQ}<p72K<UUz^_a%lcLN&N+6&moWpZ4FluH=)812knv3z2(ifL<
zw38Sa{x22Wvjb(vq*#m2+TL96;-{1g#XqZRhf5{C>JnP`SKvFk92T34X=bJA?!AR*
zMe4bc$%F8n^J^O`hFq8W-?8xO&JgFPP(NmbJ>Gr7wdzapJF>dcRZ8A0hx&sCD5I8K
zoh+-%97Kow`QbD?_oDx)!yS+z^x5a@GFOn=c;jx`C=16o7=wdrp&yFNF0wVoT5=6>
zm7RM@-H>-TQ?rxeq0#sc#1a2bWHit%%&kWdbcsB5yx@!E88g+r0G#qxhj<>N{eAsx
znHtJzWgU}Mk_7*C?eHhkqVJdD*?X2n&hKC*U{u8itA+8?5Sy79QXl&v=w~fOJKl;0
zdS^sjYaJn`Ne<mmxTiMjM%q?k+2l+lKv@{NM*`t5L1e9t>Fw-yKXF1Sn@aS*gl}RL
z66RgR=e52^uhI*pTX9zClR2k~YIENxj~KV%?&8^3z*b8~YQyfU-E$Tt(+1!5mLMfK
z1hCn0fPJPvaklspQ?`<tT>Kt?Vt&m3VL|X{K2dSMq#^e%V4N%A^e+9P;T;6ryegXh
zk*Lkhl@+mzd3WtgA+;zW$Gcbto)r^xn6GnDOjA`ZEZk>eMfqjyRy8<RtcJr9B-K(a
zOg$?}w=Lk9WK|fvs`j0D1Kx#GtQR&HJ;Ebopa{*BVA<iWyiNPn_3S<QowA>>)J+pd
zV_5o37tF7ki!f1`-f#3w*()Ty{{m62bxH;|28sI+vd2!GqATkLhYF6|TBXe1E*5f9
zHF<uSgwH82B|VM~r-n=4p8*&WFFao!@(o~|H)v+%irv{A(otuDI=yFWc=@tfi1QY~
z8KIa^qmH`vSuW-}FxH4jjJxnUbr&2cgt+8M8-L`d&?evSLxV|cN2gag)vCYbDJ9x<
zZ3;F3Fr$)iho4JNPZUbs&<Cg9fSBrM5SQR!y>Gq;?VpbhuT*qYSF__ciIJAy6G!OP
zkoWsynol?quUaB}*ZhUKn50l$8{|e`z<L)L=`(cfs@)EGDphpyEp)k89`rYAput9o
z^XZ(}<ewG3{_RAdA4<nX<B<~^gY;H?Fjqk^f+IkS1t9)Y8!gPo-0Kk#FTu&STCCz>
z3C#W)FZ6i!z3*4h#7`i;xCzp<t41bkY@w!w_|zE-?fHr*Eb~AW9!;?Ke?Uh(ZHTYL
z82lZpd7@h%TV6IRMDCMatZv-9sa=v7m5C*4_vwQ4GP~Gf%AS{s0H%*y!GJZP#Ipwr
zC^N>KumEiyIi63+41huDgOaQq<4-7<6L$KLGErz_Wj5a$0&E2!paR>`>>-%yMVLc?
zuP3OjhV(g&50=nFAiW;rYW381d3M5{IG}M~G4m;yJ1k|(^L_g;L9KPeO7~_}nuW>J
z5?+T<H#888CeEPTwSVAhjBJh7eas|`>$z&+egx=@jC*8)j^**9n(8!Vc}Ofl_<Qn1
zYaUo;76x&0yWD*RPy--s$m5QFPA2oIhx+tU6;m!r4Cttv27y3@0VOoOx~e?)VGHN6
zx3fUBt2ntK;Zm|k4b%g<d!m3pXJ+phS*<+HT3A@kACiG{#`JBIupgox$<t4?iE<f}
z)9~k1ppyWPObMfnT!AKz6ZH3bXh@ZAR%8zl;#5AZ!=bU&{Fsq1H6(5!Vw;`Yj8KCZ
z3EM@hls{*1Z?_3eFgRf&@8}aE%-mLR4-MoQ6LkWlg*;&jxLZ+yH&S6!Y0AvsmN1h#
zlCX<&WMH!is+BQM0J93Di%s0IJSJzSWk|Lp5AqsWI-dke?k3J%LwS{rr|oPNDz>5S
z7AReu?=D8&M=emBlzM`bGDqT}ksZ)<iW<I6MlRA*x6s6tgQ~X*wMTu&@>r!I+wAZy
z%1`q;_wfReAcPxIv0I+y^@$QGb6N#j9DH9vR<30;P(lfd=ZroWNgtN88P(}UdT}<)
zpVqo*RJbFDezbD+CQhy3P}moc&@cujl#suG{5KutG|<f;9R>6d&ZQJIY|c)pKp>CW
zk1_^?C*;&uR`EKN-9=D+hD4bex&^t%?ul27X~F>p6x?J%dI<6XgD~QNPROav@QhoQ
zbQtg?^3Ox4c-H8CX!f-^5~!U#ZFl?4+-5Bsx4YXV^r(#8ZWQ{o&?<uL)cLw~ZrTO{
za=s-m%jCKDXu%x2Kxo~?QuZLi*P7`{j1Lshw=nU#MhGI*G94ArQq>68WD^eNi<i})
zX%H&au!4gwgxOsxYDntS>cmxMa=(V!p%8|xWRIC2TI&wv`N{y@V{{*~Gv8s<H4PQ8
zFism(tj^l?+2e@2OX@xWyFF_58b}ml6pT~5U{Yo$k89i``R;m1NTE!#iIiEWJ9&J$
znLegs3~DzZpfwg&jgdFySCbB?)FRRtbX~=JE!1{Nx?IN&DJhpyI@>CERKB>)eMZF;
zYuo_`y-@*<7x2wC--sb$g`qVzz7qwaPTZqR0}Yr|rGGR~xRUL)W*@1!6*!|)XGJ;B
zJ0Q{s)Y^0qVUu~#O$RxIaEB3gkzIhL38UG4TTNQk;)MdL)t0ydk%CgV4M0Zi`yNT8
z3i$h4>V$@>BET5Lo>00=w7#tcSR>A$T6&LBoM)vU7w}Vx^ddRE3s5(di4lz2Xo~@v
zyGBY?Yv_%(^mmAx)^N)d+3)bguv8=z{5T{4bNUHFU&fdV+kGYSw1`6!Cg_%d)L9aZ
zYHF)QsMc_#gKNrXTD4r2PDlda0n9Oi?<SxU1E;mQn}M%In!QeBE2rpIOJaJ1Qahm(
zlqRLZ_hx#RCF?~Q!Q^x5!S_%?jWE41(~l;u6p&_pVuy|HmNH2|J}?QxD)GJwdXVQk
z@ekmJHtm)1P3puA3ALHvA1l~F8?Ce^&H&$7fmoBDD8;gm?cBe#fqqAVu~3YeRpvpX
z7N6aeJ(};Ux3hMm?_qwzfRSywM5meoHs7!!EnE_fcDmHgj3}9512ifT>H&4eL4Kb{
zqG)0c5bgtNg+n+${UETD*G%aN&0D;lF(`!da3ZJ8?$9&cIMZxcLQ90Onr?Qur&C28
z!Jf6c59B56dE$>IH!cIMI;2IGz2fj4g;}$W&zOZFC7>bZM~n*RLw#1#TEO2d=rmZs
zt^(?SifmV>y#%@6BJ7Z)ohs;#G(k$~$I?V=0e#pao>ffGKig`9%qn&u!5s(GR-L=m
zl5JKc>Lux|7<JvwUY4-;RWxi(2UYxOz!Q4zY=N(<VE!J5yARFws3>p#pOo74Wu<su
znY|$gryV?M-85-QU$Ld-=IjG2d)@A<mT<6*J*r@4L)rBTfS#lV<Y}1&?AO!7Fyu$5
zU1qmTl3tI4CW$+l&l?TY1qUrtF!lM_2L<k+gM9!)xS2Mr%r-&PaW&5((3oEI7<jFg
zPRb#VNxYrM>@mB02*E2)4=JF2iLV6_(fsr|Y+3|40{D#jY{n*L>=Xf$`v~T;#U~Qn
zlq%aS=ML!U2a;^1Y&swFH4^+BJUwTPFCZ5l80Zr)*K7LGXk-K}J0PcS63i3WJtpHe
zYN+E%_Z%BjqU8z>g5x-O+rT+!hE=+UEW)&)d(CVk#`G5eZpeMZ2DCDvShv0gu(buy
z&3ukGrccAvV<d4~<(@)?Vw1SY%5Ii|eq*Ltk@hNt5{FQ2;7_W7Jdas#=lulRqD~vl
z=^jG7Uy$~SS+f~{)--L^4d~LPM*22NUta}y4SUN*cM;j#b!eXUt*shgnclZuC6uY4
zLohp`fObI8My=39fI|>9;1Iec^a#Nnw+bg6B&$l?!5EJrJFZJV(EVq%F^gLg4{huX
zebz1`?J~B^z&x~4^1Q4UP`F+wHbTeL>7y2^MaRs$D#8R;gQWZI{38{!&jG>;&|Scv
zl_t&`*j?J^O01AyP0LmEXkL0k%YBDJKPt&1XQ4_5u$tNJN^WV;?bQF}dz`*$Wi~p1
z(m1U$V3)$}#K=bqF@rA(SQ2aU+?(xSKtjjS@iQvuik-PWk3Vre>nh-fR3M7Gqp<rV
z>ht`c?0=S}YZM8imZ>!*4(RAn4YePq8y&)gDI0~D5?gk_!C$uu_w)Gy2WeIUtDFie
zx%;TEjYzLilbsk;qoZ0BjQC1onU<=}_dSHz9vOes0&@0gfurW-3;PhhUd`M$ByKpe
z*I>3=o4tdQf|1&%@;$(Wpea#~CJGgaZaEm0(i7P9HBRH!>3h=0Slnw6;Z{Ln#GdUU
zASdFRBXd91rE7FRDM`1=$tt^e+RSX$Q|$yhtP>6r;(jR~RSN+nSE&FyOrX2~9I}c-
z4ro9Pbvi_uK09f-^rrc<^=61vG=`Ol>1^$Sje2ZO)A<ymWp#S@W_|Xv3u18rq*KxZ
zhIFri+iqs81oQ+-=S;$wT@a+{gC^>Mb$YMCO*mmtX3K4fjVR|*_%7#XcL6SFpEftd
zIVORX@V5jmOo+p{?<vmKYri>=Px&!li8}j-b0RDyC$;P&l&scr$6$7a0vxi@x0U2m
z1$zbX4`KJPig{p9Tu131H8f%4YY0KmrthhJ7YOp9Bdt?|n~H3kojM?OlMechjlZD)
zIYoL0K}8+RJwsx>${n^%tF3s0pk*eO)YJDN>axjKjWUVP#2O$TMd@ULyGcpy!r2y$
zAm(M;mExp~nKJlJK+J&S{C+ic4<$Q|<N@M8jvnWex@;dltybA<1_q#DD4*E_`^v3+
zJ(`#v`h+QQQVY5jY^B0?5*OlXZnKGuD$@gwtX1mc&3uc7+^EmX=+oU0_tz$<RLl77
z)G{q|AIb7+K8TAy0(Ra{-(GJMT`Km1oH>AlusU&!1gC%Xy6m1O?+*$3+=ueVr91b+
zA!1fdPi2+iTlYci;Ovgyn`_%Yhs1Y^74|#r!TlL+%L#pd;Jfp+cTM0A!6~EntIuAm
zUglm1>Z|@k?aEK;CeBoT(fC2*hW4vp$BTY8JMzm-A19vtQT16IZustBJv*2G)2l-9
zivD>QUN;?-{cgq4?fvRse;iU@OFx*uCARWk4saFlU*CFv&GC7qo6a0J?a?ir8(MnO
zQhs3N<Zs@OT$?-lgSd3)A5X}C>#W?j^p6|Fv0q6(Q(URI+7vxk_`HGY{3PD9rE_@y
z-7#snCQXO0k5K>pePIWTH7XDMYE*l+UYo}P-{;y3^ZOTX2()%zt6e<nBaint#(e~&
z9Qe{XQtW+w{_xJ@E2{cVY<u|-&D~u5!A#Be#j?*T`cQ<+<*GH`44b<Yg8#68AMmT4
zih6a;W^?xQ<N3-oZ8T5&RRJcBZyTbZp|8<r<h4X{p(<4I)oa#7rf-YkqI%A%P(wOX
z>wqTqILaD&w>y6hXDZvY#fy{O10}uomC~cbh86pdZ97;XhmuvZb;r2PZ8n-z+XnA=
zs#OPO=2{y+IHEZ#3w2H&w|qRBJGkj1aq6;Evv8PcKGg8>_iAotd_16t(Zsq>J~K_d
zW9po^+-W1(D;~Tk>+f24w|~w%(xVfLdLq%@DNm@u-DtrZT*b@wMVyakN51(sN5iA(
zu>C_Md9-*RJh^p-3|d}O6)y_tUi~Cu9I+9==<LO67erU;A{8a@dv~*ZITGg1&6KfJ
z@jGz|UkmLz`Z1UdFLXc3BgUo=`tJ7ejn67R`xbv!&oA$sv8QB~*fel#G3u64(!+JO
z!sQRDWC_<kmnE2dH1n|gbMLx67pG1xP){4c#XCEY#+7jiC@<3PIaRXh=Y>;^ord;`
z*1m89)VyJ@&{BQPjAZUVZ%GFVSI9$CdtNh+s<-bjbvf_bb~Ews7kvs*@(poO=<ARl
zG5%P#^RvOD22<3#eXW6<Of?<gR`<2Q?!`Z@cckAm>jy;5t=E2!q%Ze!-?TJu;x2w$
z-(;O}^=X5#$Zs~AXZntB2#<kdI20mFtrBd4EIv>-)w#OAGkG4~?c3&QU?ZEDS9W)L
z*rmau|K_(H4if>{er9pujt|k^Gqs;GQ-!*L&eFp_HOGd#T)HFKIH~BE<)5E_q*p#m
zH)gEdu8Kj<=LW@D_m)7v7%uOWs=t2`%JnD;JradDHRB8Ve<?<Ils)yhToCN)_WC+l
zl;t-}>@maM2Jl1StcA%fM)#nxpHV8n)Su;~4q~&n3RwCOL9uTumanMzQYZ$nXM1Ey
zofjo?l8cNyl(;@G(ti<iPcGec>Rc7-N*kg5ud@6V36|NC-_g`1bCwmN%zQIcTrZ~y
zIqiLDpt`YLsk1dBr4n@HR>Q8;6C*7iQVZkT!psv5oIF9agVpb)X#;1}+9`6IoNjZW
z;CBwv)!Yx2NWSnUwZPepf{oJJLCkWurw)huTzKLCwjJ@5$>_eB2ysR2+f$34I&2P3
z^qDT!uMd&!$}gtf?R58cjC@cNocxd=la9t8S{z^Wc1XdaK2CJ$M#dlL>Pp?axOuaq
zsXr9l>9s-Xwz7s{#11!UXT~Qh##kQsinqkTEpx=5ChC$~BeYXD7MB{1jOrBPS%hOB
zNx2;UUh3&wZeo@(alVVwwB<(zJIvhqxAVr=SHh*$M0@xR<@l<+MaCaNM`{z4-C9CV
zJ+Lz#usb!PLFiL@`d$xk_Ji>7VVzjIC{od?8ufpn1IbF2hM5za+O0wAkubw5!c%{g
zUu0Iv)Mb^3zq^18U<#kyAoL&7*YR4`*$PEc%jFlFwyWGVI6B!P7kk=*jPutYjdv<K
z#1(+)wnj4rFk7kaXHYxtiJ32E&^;AH_z3%F+Zg@kZgw030p40TzHld#GH~J|B?y>4
zOBX)Fi8<>C^VUwfWCoI3E@c8WyDM&%H!yPvp}$OW^`O?ByRE#K+PaTFuR+ya(xI{!
zB~wog4a8RS$avp-&{;?DF{x;;m$RE>vx1(5+F)O|%I&e%(U8N}XF#Ar(<1SPk%@2K
zn|d_o68ldTwV9%bX0!%lXItD?Y81=mB{=;<p3nHQ<cCrt$`>kXd*-~Cm^6&#hV$Cn
zx_AGuQ4<pWs_r=X*J!|iguuIMaANz;Q^#kGPH43q1c*(Q8{pJcv=H5jId{!*3*89$
zsB(af&j=-9Wp+|UY#NZ%dgT`KjCZd(@a#p;er2$-Qs#VI3`+lC6w!*jUmP;9&I!Ud
ztW|Pt&(`+7V!t@`Oo*;6ttV&ZiQzX8vP9-4f5h93@9g19iA(-R+L18bPs=D_aH*DU
zc`Lk0_gpmf`(h!y4UAtf1SfKO--%fgcbk6E;6mxe;>wWv+?>#$sG<U3*LY9ai07j`
zI4qNlpH<^Bxq-F5hP}T`8ROs74h8U?+_JLTxK$1_Rwz(wuH|v~B5&L&g5obdBN+Tx
zio|cuZxH^Z;{7l5J1;L7nMh+n<I<q8x%5)}pq{qwkkgN=gmJ6d-R73XZx=$wf$2PA
zp2YdpD_=}F3V5bR#T;^s5GEyqz99W$p=uF0p$$${0cbxOj9)Zl%i8y;*E@n>r($GW
z@%nQ0^U(NlecJDg{%`~37@sa{w81~zL1GhCd3B6;54HNYtmhimacHf=tJFutmko3a
z8jI`lqpsg+;Oa%(4};}M>LC)`--yzInG17$=0f(}FvGuuOtM%|Sho`#*T?)l=#djU
zb~`&U)V~@|=WOWvQ+dIu6EYeF1bMb1LcC&W?<BG1Tdk=2D;YWZ+}^aI7;#o3h1ab+
zg)#!3NT|r>_Fd!CuHdk(;7)G&F1ov**7$SBNc?TwyW&IOe8$1{Hp%H5u2|q~K}S;=
zo*FK#n>b<Nu4wZDs3OXKtxN=FhSd)j;F;f<pr#l0a)%Z)fNvdjO^s~w8FsP~=HEhd
z`60q3Ar_*8{s^y*4omULX`^Ek;(8eZKA3n>;(rO9{0Sz$i1)q?T4qH92sh{mX8MAq
z>#)@GP_h8-FOCvx!=(*eDle8>%Z)#S^pa6_AzHcw_oKQg0v1<>#!DcEin(TSY@a04
z85R*FJsK631EVp`=vc;sdzz!pMvR_;f@(a_iYM1aGf2=l6Z2BxiH%?)AL`ZOv?&6%
zVUw!Juo)R%73?iS{a#d94SH!VGanJ<pw|%-XW^L{q2XtOgb{Bs0B09RFXH@K7Bq5#
zoy%wuac+>9{?~mD5#EN3UeuWH^138IkND?uE!~*-ChKj2djXPL2lZ}`POar!@9xdK
z6$SQ~+80jhLrh^f^*l%|VS86gCJVzYtFe|2T69KT<+0SuXj}z3)seU@1W+hf5J@(m
zE;&0Xf2LmnoQptzcT{L&{W7d&b=3G`EVCHPy%H`ujRhJbsr=aFbCLee=!69Kww!bp
zq?28e(tN~Ki8^No)vm)u{}vl=h2q{I{WCb;5hS)lo@&k|jj&Z1=|eMfViQzs(ijfB
zfU8TR{&ypRm6GvFHeil<+atZ!2uY$-os!`dh}aVrS4*bKq2D|oW$H0c!!whcx&Do@
zi6*vxLx{my=Iv0642`b<{hE;4#7%i&*PEbMhA~T7@7mCW6&q9lVs5zC!}41p*L)<W
z<=AF$l#VzzM_N`uE$?CzTQKJ<!CqCEw1fu@vE&lSxfaWmf{Be$ry=UaVfuM)>J@mR
zE|eoMdK>1qBJpLMs|zG?e0)V{a7MJHGd8XQ6DsV^sfhZO$V6>yaAR1U#S&}S;R2R;
zo@4Zg@$De1gW?Ur%nod@Cc<__JmvVDhf$X|n(Bbn`LPKZ5S|Btxzo~uIZgQFa^NjR
zU5&V445ijYGR2a~tx&Hll<dI+vqDpWSh6(g>4II2Y>q@Gtyt!*Fwqp9SP{(iL3|TF
z_-1sxC?>87vU$OPJ4R@sz!o%K6Y6I|6V0Kd6=OiG--vkduybQ1-p8hvVg7d{OeN~+
z2~IQb5BAP~aoiTIk3}C|MdGi4WLb2)9PV!n8VQ*1jm2Nbhu6l4Qj}~7Pi=<cFD>V{
zBk`i>R3$g54~}m+Ft{z4*#^^FC^8!MI}z7U*f<FZ9U-HaBMT#?rs%|r!BkODECgT%
zLP(Kh6<caXrsjruWh`C+4{r>q-^9jyuv8u{`~-LES>|O#P2#zQ5(0<(+hUn_!osup
ztQL*qTyhJ>)JBu~V1I9HYH4Gp6yrCrrDU{Ja?MzWB@s4f#~2^Tbs%wo`YR)z=fd8t
zk<>hium<p5s4D<_><H5Ui1mP-gNkJc+k*|Rh>B(CU>oGp;S(DW@(oE2hx&bJ%iAF7
z2~WL)dgcIcZOlJ6D!dXAq%nF6+iQ%Gi{QbTQL!|Vb4rGbYn(fvxHd*sB7-pJWsv?=
zpQT=od21!02k(8AV<l1Mr!eC}7_TJ2;F*@FzZNF8p}jS8b9HugcZ6Pv_AbDCdpOpH
z1?V8FkEmO@WRoVo7&*8y5-<T`F&38x>35M-bC_8I_t&%i^CO@qW?YU4TSJpNNpEG0
zDUZchBQ2|9adU|DhT>R=$VZAhgA*%5{#Ll<RW`Gk^Ogcv36$Itq?>|2SXt<`Q11#h
z<&F(+4>_BH&N|%nDmu{yhGAs898J}slT{q4L&w(yC*}kL<&j)9M7|Ug-o*iqB}sgI
zH5gtK8GqIy)UuNsIe$6m^#;8SlJVu?QWQ+gT;_k9BT1xQA(>v3-xw0mkh(EeipBWn
zP|}0u*0O;m5-$?+zJ&NYpk5Ou?!a7aF(D6fIwRh<p6l%i3QHyawfF>syH<b?PKCjX
zq4>)PBgI^EaQ@vW`2sdrhUcn--YQm{hmuRexfda_Cp6iH<qCr-KOShnGc~ZW1EM>j
z;WEIkgEH%by%x;1RAQXgrRk6Ry06&T@KkB2cMaq>1;y3HY#Ah0L?$h;6UH(+T>U1T
zdM@N&6dHe#bv3cZm*JKIR82?YZ*UnYGUy78uK-gB+(KO%w!@xEj-D3=^%7<YBI+Um
zZP>pyR7^$5qENs#IPogT5ja01!pniW45DY?y{|<6_oXn{0q_;;%3oPm)4Xok%5`g2
zt=stOx*aX+_N`ubxOLsh*VbKVTldxL>u#@E_h9Y1r%ad9*JW?-D(~p3>Fipzu4_$K
S*Ty%xcKEyYy}2&Vvi}#hl7plG

literal 0
HcmV?d00001

diff --git a/autotest/gcore/tiff_write.py b/autotest/gcore/tiff_write.py
index 8dfeab1108ad..615c4f37f8ff 100755
--- a/autotest/gcore/tiff_write.py
+++ b/autotest/gcore/tiff_write.py
@@ -6906,6 +6906,54 @@ def test_tiff_write_185_lerc_create_and_overview():
     gdal.Unlink(filename)
     assert (cs, cs_ovr) == (4672, 1087)
 
+###############################################################################
+
+def check_libtiff_internal_or_at_least(expected_maj, expected_min, expected_micro):
+
+    md = gdal.GetDriverByName('GTiff').GetMetadata()
+    if md['LIBTIFF'] == 'INTERNAL':
+        return True
+    if md['LIBTIFF'].startswith('LIBTIFF, Version '):
+        version = md['LIBTIFF'][len('LIBTIFF, Version '):]
+        version = version[0:version.find('\n')]
+        got_maj, got_min, got_micro = version.split('.')
+        got_maj = int(got_maj)
+        got_min = int(got_min)
+        got_micro = int(got_micro)
+        if got_maj > expected_maj:
+            return True
+        if got_maj < expected_maj:
+            return False
+        if got_min > expected_min:
+            return True
+        if got_min < expected_min:
+            return False
+        return got_micro >= expected_micro
+    return False
+
+###############################################################################
+# Test rewriting a LZW strip/tile that is very close to 8 KB with larger data
+
+def test_tiff_write_rewrite_lzw_strip():
+
+    if not check_libtiff_internal_or_at_least(4, 0, 11):
+        pytest.skip()
+
+    src_data = open('data/bug_gh_1439_to_be_updated_lzw.tif', 'rb').read()
+    tmpfilename = '/vsimem/out.tif'
+    gdal.FileFromMemBuffer(tmpfilename, src_data)
+    ds = gdal.Open(tmpfilename, gdal.GA_Update)
+    src_ds = gdal.Open('data/bug_gh_1439_update_lzw.tif')
+    ds.WriteRaster(0,0,4096,1,src_ds.ReadRaster())
+    ds = None
+    ds = gdal.Open(tmpfilename)
+    gdal.ErrorReset()
+    assert ds.GetRasterBand(1).ReadRaster(0,1,4096,1)
+    assert gdal.GetLastErrorMsg() == ''
+
+    gdal.Unlink(tmpfilename)
+
+
 ###############################################################################
 # Ask to run again tests with GDAL_API_PROXY=YES
 
diff --git a/gdal/frmts/gtiff/libtiff/tif_write.c b/gdal/frmts/gtiff/libtiff/tif_write.c
index a31ecd12c133..4e5d81753116 100644
--- a/gdal/frmts/gtiff/libtiff/tif_write.c
+++ b/gdal/frmts/gtiff/libtiff/tif_write.c
@@ -176,6 +176,32 @@ TIFFWriteScanline(TIFF* tif, void* buf, uint32 row, uint16 sample)
 	return (status);
 }
 
+/* Make sure that at the first attempt of rewriting a tile/strip, we will have */
+/* more bytes available in the output buffer than the previous byte count, */
+/* so that TIFFAppendToStrip() will detect the overflow when it is called the first */
+/* time if the new compressed tile is bigger than the older one. (GDAL #4771) */
+static int _TIFFReserveLargeEnoughWriteBuffer(TIFF* tif, uint32 strip_or_tile)
+{
+    TIFFDirectory *td = &tif->tif_dir;
+    if( td->td_stripbytecount[strip_or_tile] > 0 )
+    {
+        /* The +1 is to ensure at least one extra bytes */
+        /* The +4 is because the LZW encoder flushes 4 bytes before the limit */
+        uint64 safe_buffer_size = (uint64)(td->td_stripbytecount[strip_or_tile] + 1 + 4);
+        if( tif->tif_rawdatasize <= (tmsize_t)safe_buffer_size )
+        {
+            if( !(TIFFWriteBufferSetup(tif, NULL,
+                (tmsize_t)TIFFroundup_64(safe_buffer_size, 1024))) )
+                return 0;
+        }
+
+        /* Force TIFFAppendToStrip() to consider placing data at end
+            of file. */
+        tif->tif_curoff = 0;
+    }
+    return 1;
+}
+
 /*
  * Encode the supplied data and write it to the
  * specified strip.
@@ -222,6 +248,13 @@ TIFFWriteEncodedStrip(TIFF* tif, uint32 strip, void* data, tmsize_t cc)
         tif->tif_flags |= TIFF_BUF4WRITE;
 	tif->tif_curstrip = strip;
 
+	if( !_TIFFReserveLargeEnoughWriteBuffer(tif, strip) ) {
+            return ((tmsize_t)(-1));
+        }
+
+        tif->tif_rawcc = 0;
+        tif->tif_rawcp = tif->tif_rawdata;
+
         if (td->td_stripsperimage == 0) {
                 TIFFErrorExt(tif->tif_clientdata, module, "Zero strips per image");
                 return ((tmsize_t) -1);
@@ -234,27 +267,6 @@ TIFFWriteEncodedStrip(TIFF* tif, uint32 strip, void* data, tmsize_t cc)
 		tif->tif_flags |= TIFF_CODERSETUP;
 	}
 
-	if( td->td_stripbytecount[strip] > 0 )
-        {
-            /* Make sure that at the first attempt of rewriting the tile, we will have */
-            /* more bytes available in the output buffer than the previous byte count, */
-            /* so that TIFFAppendToStrip() will detect the overflow when it is called the first */
-            /* time if the new compressed tile is bigger than the older one. (GDAL #4771) */
-            if( tif->tif_rawdatasize <= (tmsize_t)td->td_stripbytecount[strip] )
-            {
-                if( !(TIFFWriteBufferSetup(tif, NULL,
-                    (tmsize_t)TIFFroundup_64((uint64)(td->td_stripbytecount[strip] + 1), 1024))) )
-                    return ((tmsize_t)(-1));
-            }
-
-	    /* Force TIFFAppendToStrip() to consider placing data at end
-               of file. */
-            tif->tif_curoff = 0;
-        }
-
-    tif->tif_rawcc = 0;
-    tif->tif_rawcp = tif->tif_rawdata;
-
 	tif->tif_flags &= ~TIFF_POSTENCODE;
 
     /* shortcut to avoid an extra memcpy() */
@@ -402,22 +414,8 @@ TIFFWriteEncodedTile(TIFF* tif, uint32 tile, void* data, tmsize_t cc)
         tif->tif_flags |= TIFF_BUF4WRITE;
 	tif->tif_curtile = tile;
 
-	if( td->td_stripbytecount[tile] > 0 )
-        {
-            /* Make sure that at the first attempt of rewriting the tile, we will have */
-            /* more bytes available in the output buffer than the previous byte count, */
-            /* so that TIFFAppendToStrip() will detect the overflow when it is called the first */
-            /* time if the new compressed tile is bigger than the older one. (GDAL #4771) */
-            if( tif->tif_rawdatasize <= (tmsize_t) td->td_stripbytecount[tile] )
-            {
-                if( !(TIFFWriteBufferSetup(tif, NULL,
-                    (tmsize_t)TIFFroundup_64((uint64)(td->td_stripbytecount[tile] + 1), 1024))) )
-                    return ((tmsize_t)(-1));
-            }
-
-	    /* Force TIFFAppendToStrip() to consider placing data at end
-               of file. */
-            tif->tif_curoff = 0;
+        if( !_TIFFReserveLargeEnoughWriteBuffer(tif, tile) ) {
+            return ((tmsize_t)(-1));
         }
 
 	tif->tif_rawcc = 0;

From 1078d24910313c910ac4820f21c01b309c01934d Mon Sep 17 00:00:00 2001
From: Even Rouault <even.rouault@spatialys.com>
Date: Fri, 12 Apr 2019 14:05:49 +0200
Subject: [PATCH 279/488] netCDF: avoid inappropriate shift by -360 when
 attribute axis=X is set (fixes #1440)

---
 gdal/frmts/netcdf/netcdfdataset.cpp | 17 ++++++++++++-----
 1 file changed, 12 insertions(+), 5 deletions(-)

diff --git a/gdal/frmts/netcdf/netcdfdataset.cpp b/gdal/frmts/netcdf/netcdfdataset.cpp
index 61a39b71e321..2e8069b9f077 100644
--- a/gdal/frmts/netcdf/netcdfdataset.cpp
+++ b/gdal/frmts/netcdf/netcdfdataset.cpp
@@ -3030,14 +3030,20 @@ void netCDFDataset::SetProjectionFromVar( int nVarId, bool bReadSRSOnly )
         CPLDebug("GDAL_netCDF", "set bBottomUp = %d from Y axis",
                  static_cast<int>(poDS->bBottomUp));
 
-        // Convert ]180,360] longitude values to [-180,180].
+        // Convert ]180,540] longitude values to ]-180,0].
         if( NCDFIsVarLongitude(cdfid, nVarDimXID, nullptr) &&
             CPLTestBool(CPLGetConfigOption("GDAL_NETCDF_CENTERLONG_180",
-                                           "YES")) )
+                                        "YES")) )
         {
             // If minimum longitude is > 180, subtract 360 from all.
-            if( std::min(pdfXCoord[0], pdfXCoord[xdim - 1]) > 180.0 )
+            // Add a check on the maximum X value too, since NCDFIsVarLongitude()
+            // is not very specific by default (see https://github.com/OSGeo/gdal/issues/1440)
+            if( std::min(pdfXCoord[0], pdfXCoord[xdim - 1]) > 180.0 &&
+                std::max(pdfXCoord[0], pdfXCoord[xdim - 1]) <= 540 )
             {
+                CPLDebug("GDAL_netCDF",
+                            "Offseting longitudes from ]180,540] to ]-180,180]. "
+                            "Can be disabled with GDAL_NETCDF_CENTERLONG_180=NO");
                 for( size_t i = 0; i < xdim; i++ )
                         pdfXCoord[i] -= 360;
             }
@@ -3122,11 +3128,12 @@ void netCDFDataset::SetProjectionFromVar( int nVarId, bool bReadSRSOnly )
         }
         else
         {
-            bool nWestIsLeft = (pdfXCoord[0] < pdfXCoord[xdim - 1]);
+            bool bWestIsLeft = (pdfXCoord[0] < pdfXCoord[xdim - 1]);
 
             // fix longitudes if longitudes should increase from 
             // west to east, but west > east
-            if (!nWestIsLeft)
+            if (NCDFIsVarLongitude(cdfid, nVarDimXID, nullptr) &&
+                !bWestIsLeft)
             {
                 size_t ndecreases = 0;
 

From 4632051ede3102b99efb2d80c7917e12ff1fdada Mon Sep 17 00:00:00 2001
From: Even Rouault <even.rouault@spatialys.com>
Date: Sun, 14 Apr 2019 22:55:27 +0200
Subject: [PATCH 280/488] GMLAS: avoid null pointer dereference on some schemas

---
 .../gmlas/ogrgmlasschemaanalyzer.cpp          | 26 +++++++++++--------
 1 file changed, 15 insertions(+), 11 deletions(-)

diff --git a/gdal/ogr/ogrsf_frmts/gmlas/ogrgmlasschemaanalyzer.cpp b/gdal/ogr/ogrsf_frmts/gmlas/ogrgmlasschemaanalyzer.cpp
index dc79f6add6a6..e28381357f05 100644
--- a/gdal/ogr/ogrsf_frmts/gmlas/ogrgmlasschemaanalyzer.cpp
+++ b/gdal/ogr/ogrsf_frmts/gmlas/ogrgmlasschemaanalyzer.cpp
@@ -1002,17 +1002,21 @@ bool GMLASSchemaAnalyzer::Analyze(GMLASXSDCache& oCache,
                         {
                             bool bSimpleEnoughOut = true;
                             int nSubCountSubEltOut = 0;
-                            FindElementsWithMustBeToLevel(
-                                    osXPath,
-                                    poCT->getParticle()->getModelGroupTerm(),
-                                    0,
-                                    oSetVisitedEltDecl,
-                                    oSetVisitedModelGroups,
-                                    oVectorEltsForTopClass,
-                                    aoSetXPathEltsForTopClass,
-                                    poModel,
-                                    bSimpleEnoughOut,
-                                    nSubCountSubEltOut );
+                            auto poParticle = poCT->getParticle();
+                            if( poParticle )
+                            {
+                                FindElementsWithMustBeToLevel(
+                                        osXPath,
+                                        poParticle->getModelGroupTerm(),
+                                        0,
+                                        oSetVisitedEltDecl,
+                                        oSetVisitedModelGroups,
+                                        oVectorEltsForTopClass,
+                                        aoSetXPathEltsForTopClass,
+                                        poModel,
+                                        bSimpleEnoughOut,
+                                        nSubCountSubEltOut );
+                            }
                         }
                     }
                 }

From 997f6a13d142f0031f3c23f9cf8febcee6c152a1 Mon Sep 17 00:00:00 2001
From: Even Rouault <even.rouault@spatialys.com>
Date: Thu, 28 Mar 2019 23:34:38 +0100
Subject: [PATCH 281/488] WFS3: handle paging wth missing type for rel:next,
 and better deal with user:pwd in URL

---
 gdal/ogr/ogrsf_frmts/wfs/ogrwfs3driver.cpp | 56 ++++++++++++++++++++--
 1 file changed, 51 insertions(+), 5 deletions(-)

diff --git a/gdal/ogr/ogrsf_frmts/wfs/ogrwfs3driver.cpp b/gdal/ogr/ogrsf_frmts/wfs/ogrwfs3driver.cpp
index 802eff7b06c1..ebbdc290d95d 100644
--- a/gdal/ogr/ogrsf_frmts/wfs/ogrwfs3driver.cpp
+++ b/gdal/ogr/ogrsf_frmts/wfs/ogrwfs3driver.cpp
@@ -686,6 +686,8 @@ OGRFeature* OGRWFS3Layer::GetNextRawFeature()
                 CPLJSONArray oLinks = oDoc.GetRoot().GetArray("links");
                 if( oLinks.IsValid() )
                 {
+                    int nCountRelNext = 0;
+                    CPLString osNextURL;
                     for( int i = 0; i < oLinks.Size(); i++ )
                     {
                         CPLJSONObject oLink = oLinks[i];
@@ -694,14 +696,27 @@ OGRFeature* OGRWFS3Layer::GetNextRawFeature()
                         {
                             continue;
                         }
-                        if( oLink.GetString("rel") == "next" &&
-                            (oLink.GetString("type") == "application/geo+json" ||
-                             oLink.GetString("type") == "application/json") )
+                        if( oLink.GetString("rel") == "next" )
                         {
-                            m_osGetURL = oLink.GetString("href");
-                            break;
+                            nCountRelNext ++;
+                            auto type = oLink.GetString("type");
+                            if (type == "application/geo+json" ||
+                                type == "application/json" )
+                            {
+                                m_osGetURL = oLink.GetString("href");
+                                break;
+                            }
+                            else if( type.empty() )
+                            {
+                                osNextURL = oLink.GetString("href");
+                            }
                         }
                     }
+                    if( nCountRelNext == 1 && m_osGetURL.empty() )
+                    {
+                        // In case we go a "rel": "next" without a "type"
+                        m_osGetURL = osNextURL;
+                    }
                 }
 
                 if( m_osGetURL.empty() )
@@ -727,6 +742,32 @@ OGRFeature* OGRWFS3Layer::GetNextRawFeature()
                         }
                     }
                 }
+
+                // If source URL is https://user:pwd@server.com/bla
+                // and link only contains https://server.com/bla, then insert
+                // into it user:pwd
+                const auto nArobaseInURLPos = osURL.find('@');
+                if( !m_osGetURL.empty() &&
+                    STARTS_WITH(osURL, "https://") &&
+                    STARTS_WITH(m_osGetURL, "https://") &&
+                    nArobaseInURLPos != std::string::npos &&
+                    m_osGetURL.find('@') == std::string::npos )
+                {
+                    const auto nFirstSlashPos = osURL.find('/', strlen("https://"));
+                    if( nFirstSlashPos != std::string::npos &&
+                        nFirstSlashPos > nArobaseInURLPos )
+                    {
+                        auto osUserPwd = osURL.substr(strlen("https://"),
+                                        nArobaseInURLPos - strlen("https://"));
+                        auto osServer = osURL.substr(nArobaseInURLPos + 1,
+                                                     nFirstSlashPos - nArobaseInURLPos);
+                        if( STARTS_WITH(m_osGetURL, ("https://" + osServer).c_str()) )
+                        {
+                            m_osGetURL = "https://" + osUserPwd + "@" +
+                                    m_osGetURL.substr(strlen("https://"));
+                        }
+                    }
+                }
             }
         }
 
@@ -739,6 +780,11 @@ OGRFeature* OGRWFS3Layer::GetNextRawFeature()
 
     OGRFeature* poFeature = new OGRFeature(m_poFeatureDefn);
     poFeature->SetFrom(poSrcFeature);
+    auto poGeom = poFeature->GetGeometryRef();
+    if( poGeom )
+    {
+        poGeom->assignSpatialReference(GetSpatialRef());
+    }
     poFeature->SetFID(m_nFID);
     m_nFID ++;
     delete poSrcFeature;

From f1789fce9212bd476b1afdc0dc7a798f46af0a5a Mon Sep 17 00:00:00 2001
From: Even Rouault <even.rouault@spatialys.com>
Date: Thu, 28 Mar 2019 23:51:22 +0100
Subject: [PATCH 282/488] WFS3: use 'id' attribute of collection items, if
 'name' not available

---
 gdal/ogr/ogrsf_frmts/wfs/ogrwfs3driver.cpp | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/gdal/ogr/ogrsf_frmts/wfs/ogrwfs3driver.cpp b/gdal/ogr/ogrsf_frmts/wfs/ogrwfs3driver.cpp
index ebbdc290d95d..460e3076a1ed 100644
--- a/gdal/ogr/ogrsf_frmts/wfs/ogrwfs3driver.cpp
+++ b/gdal/ogr/ogrsf_frmts/wfs/ogrwfs3driver.cpp
@@ -351,6 +351,11 @@ bool OGRWFS3Dataset::Open(GDALOpenInfo* poOpenInfo)
             if( osName.empty() )
                 osName = oCollection.GetString("collectionId");
 #endif
+            // "name" will be soon be replaced by "id"
+            // https://github.com/opengeospatial/WFS_FES/issues/171
+            if( osName.empty() )
+                osName = oCollection.GetString("id");
+
             if( osName.empty() )
                 continue;
             CPLString osTitle( oCollection.GetString("title") );

From 927306467dc1afafa03313040c7c7e4fe22b20c1 Mon Sep 17 00:00:00 2001
From: Even Rouault <even.rouault@spatialys.com>
Date: Wed, 17 Apr 2019 21:51:00 +0200
Subject: [PATCH 283/488] RawDataset: use generic RasterIO() implementation
 when non-nearest resampling is asked (fixes #1301)

---
 gdal/frmts/raw/rawdataset.cpp | 19 +++++++++++++++----
 gdal/frmts/raw/rawdataset.h   |  3 +++
 2 files changed, 18 insertions(+), 4 deletions(-)

diff --git a/gdal/frmts/raw/rawdataset.cpp b/gdal/frmts/raw/rawdataset.cpp
index 553db05173e3..9b05624f530e 100644
--- a/gdal/frmts/raw/rawdataset.cpp
+++ b/gdal/frmts/raw/rawdataset.cpp
@@ -536,11 +536,21 @@ int RawRasterBand::IsSignificantNumberOfLinesLoaded( int nLineOff, int nLines )
 /*                           CanUseDirectIO()                           */
 /************************************************************************/
 
+int RawRasterBand::CanUseDirectIO(int nXOff,
+                                  int nYOff,
+                                  int nXSize,
+                                  int nYSize,
+                                  GDALDataType eBufType)
+{
+    return CanUseDirectIO(nXOff, nYOff, nXSize, nYSize, eBufType, nullptr);
+}
+
 int RawRasterBand::CanUseDirectIO(int /* nXOff */,
                                   int nYOff,
                                   int nXSize,
                                   int nYSize,
-                                  GDALDataType /* eBufType*/)
+                                  GDALDataType /* eBufType*/,
+                                  GDALRasterIOExtraArg* psExtraArg)
 {
 
     // Use direct IO without caching if:
@@ -553,7 +563,8 @@ int RawRasterBand::CanUseDirectIO(int /* nXOff */,
     // width of the requested chunk is less than 40% of the whole scanline and
     // no significant number of requested scanlines are already in the cache.
 
-    if( nPixelOffset < 0 )
+    if( nPixelOffset < 0 ||
+        (psExtraArg != nullptr && psExtraArg->eResampleAlg != GRIORA_NearestNeighbour) )
     {
         return FALSE;
     }
@@ -595,7 +606,7 @@ CPLErr RawRasterBand::IRasterIO( GDALRWFlag eRWFlag,
 #endif
     const int nBufDataSize = GDALGetDataTypeSizeBytes(eBufType);
 
-    if( !CanUseDirectIO(nXOff, nYOff, nXSize, nYSize, eBufType) )
+    if( !CanUseDirectIO(nXOff, nYOff, nXSize, nYSize, eBufType, psExtraArg) )
     {
         return GDALRasterBand::IRasterIO(eRWFlag, nXOff, nYOff,
                                          nXSize, nYSize,
@@ -1127,7 +1138,7 @@ CPLErr RawDataset::IRasterIO( GDALRWFlag eRWFlag,
                 GetRasterBand(panBandMap[iBandIndex]));
             if( poBand == nullptr ||
                 !poBand->CanUseDirectIO(nXOff, nYOff,
-                                        nXSize, nYSize, eBufType) )
+                                        nXSize, nYSize, eBufType, psExtraArg) )
             {
                 break;
             }
diff --git a/gdal/frmts/raw/rawdataset.h b/gdal/frmts/raw/rawdataset.h
index 9c4bc9496e1e..9af7a0817e81 100644
--- a/gdal/frmts/raw/rawdataset.h
+++ b/gdal/frmts/raw/rawdataset.h
@@ -117,6 +117,9 @@ class CPL_DLL RawRasterBand : public GDALPamRasterBand
     int         CanUseDirectIO(int nXOff, int nYOff, int nXSize, int nYSize,
                                GDALDataType eBufType);
 
+    int         CanUseDirectIO(int nXOff, int nYOff, int nXSize, int nYSize,
+                               GDALDataType eBufType,
+                               GDALRasterIOExtraArg* psExtraArg);
 public:
 
     enum class OwnFP

From 35e18b0537329030e19114390038054101b7f25c Mon Sep 17 00:00:00 2001
From: Even Rouault <even.rouault@spatialys.com>
Date: Wed, 17 Apr 2019 22:42:01 +0200
Subject: [PATCH 284/488] HDF5: detect nodata from netCDF _FillValue; add more
 strict checks for accepting datasets for GCP, and handle nodata in GCP too
 (fixes #1451)

---
 gdal/frmts/hdf5/gh5_convenience.cpp  |  4 +-
 gdal/frmts/hdf5/hdf5imagedataset.cpp | 73 ++++++++++++++++++----------
 2 files changed, 50 insertions(+), 27 deletions(-)

diff --git a/gdal/frmts/hdf5/gh5_convenience.cpp b/gdal/frmts/hdf5/gh5_convenience.cpp
index b64e62a29b1a..2569f8620606 100644
--- a/gdal/frmts/hdf5/gh5_convenience.cpp
+++ b/gdal/frmts/hdf5/gh5_convenience.cpp
@@ -137,7 +137,9 @@ bool GH5_FetchAttribute( hid_t loc_id, const char *pszAttrName,
     H5Aread(hAttr, hAttrNativeType, buf);
 
     // Translate to double.
-    if( H5Tequal(H5T_NATIVE_INT, hAttrNativeType) )
+    if( H5Tequal(H5T_NATIVE_SHORT, hAttrNativeType) )
+        dfResult = *((short *)buf);
+    else if( H5Tequal(H5T_NATIVE_INT, hAttrNativeType) )
         dfResult = *((int *)buf);
     else if( H5Tequal(H5T_NATIVE_FLOAT,    hAttrNativeType) )
         dfResult = *((float *)buf);
diff --git a/gdal/frmts/hdf5/hdf5imagedataset.cpp b/gdal/frmts/hdf5/hdf5imagedataset.cpp
index a9e8827c97e8..993bba03a795 100644
--- a/gdal/frmts/hdf5/hdf5imagedataset.cpp
+++ b/gdal/frmts/hdf5/hdf5imagedataset.cpp
@@ -33,6 +33,7 @@
 #include "gdal_frmts.h"
 #include "gdal_pam.h"
 #include "gdal_priv.h"
+#include "gh5_convenience.h"
 #include "hdf5dataset.h"
 #include "ogr_spatialref.h"
 
@@ -234,7 +235,6 @@ class HDF5ImageRasterBand : public GDALPamRasterBand
 
     virtual CPLErr      IReadBlock( int, int, void * ) override;
     virtual double      GetNoDataValue( int * ) override;
-    virtual CPLErr      SetNoDataValue( double ) override;
     // virtual CPLErr IWriteBlock( int, int, void * );
 };
 
@@ -293,6 +293,12 @@ HDF5ImageRasterBand::HDF5ImageRasterBand( HDF5ImageDataset *poDSIn, int nBandIn,
 
         H5Pclose(listid);
     }
+
+    // netCDF convention for nodata
+    bNoDataSet = GH5_FetchAttribute(
+        poDSIn->dataset_id, "_FillValue", dfNoDataValue);
+    if( !bNoDataSet )
+        dfNoDataValue = -9999.0;
 }
 
 /************************************************************************/
@@ -312,18 +318,6 @@ double HDF5ImageRasterBand::GetNoDataValue( int *pbSuccess )
     return GDALPamRasterBand::GetNoDataValue(pbSuccess);
 }
 
-/************************************************************************/
-/*                           SetNoDataValue()                           */
-/************************************************************************/
-CPLErr HDF5ImageRasterBand::SetNoDataValue( double dfNoData )
-
-{
-    bNoDataSet = true;
-    dfNoDataValue = dfNoData;
-
-    return CE_None;
-}
-
 /************************************************************************/
 /*                             IReadBlock()                             */
 /************************************************************************/
@@ -566,8 +560,6 @@ GDALDataset *HDF5ImageDataset::Open( GDALOpenInfo *poOpenInfo )
             new HDF5ImageRasterBand(poDS, i, poDS->GetDataType(poDS->native));
 
         poDS->SetBand(i, poBand);
-        if( poBand->bNoDataSet )
-            poBand->SetNoDataValue(255);
     }
 
     poDS->CreateProjections();
@@ -745,7 +737,9 @@ CPLErr HDF5ImageDataset::CreateProjections()
 
         // The Latitude and Longitude arrays must have a rank of 2 to retrieve
         // GCPs.
-        if( poH5Objects->nRank != 2 )
+        if( poH5Objects->nRank != 2 ||
+            poH5Objects->paDims[0] != static_cast<size_t>(nRasterYSize) ||
+            poH5Objects->paDims[1] != static_cast<size_t>(nRasterXSize) )
         {
             return CE_None;
         }
@@ -755,6 +749,17 @@ CPLErr HDF5ImageDataset::CreateProjections()
         // LatitudeDataspaceID = H5Dget_space(dataset_id);
 
         poH5Objects = HDF5FindDatasetObjects(poH5RootGroup, "Longitude");
+        // GCPs.
+        if( poH5Objects == nullptr ||
+            poH5Objects->nRank != 2 ||
+            poH5Objects->paDims[0] != static_cast<size_t>(nRasterYSize) ||
+            poH5Objects->paDims[1] != static_cast<size_t>(nRasterXSize) )
+        {
+            if( LatitudeDatasetID > 0 )
+                H5Dclose(LatitudeDatasetID);
+            return CE_None;
+        }
+
         const hid_t LongitudeDatasetID = H5Dopen(hHDF5, poH5Objects->pszPath);
         // LongitudeDataspaceID = H5Dget_space(dataset_id);
 
@@ -767,6 +772,15 @@ CPLErr HDF5ImageDataset::CreateProjections()
             memset(Latitude, 0, nRasterXSize * nRasterYSize * sizeof(float));
             memset(Longitude, 0, nRasterXSize * nRasterYSize * sizeof(float));
 
+            // netCDF convention for nodata
+            double dfLatNoData = 0;
+            bool bHasLatNoData = GH5_FetchAttribute(
+                LatitudeDatasetID, "_FillValue", dfLatNoData);
+
+            double dfLongNoData = 0;
+            bool bHasLongNoData = GH5_FetchAttribute(
+                LongitudeDatasetID, "_FillValue", dfLongNoData);
+
             H5Dread(LatitudeDatasetID, H5T_NATIVE_FLOAT, H5S_ALL, H5S_ALL,
                     H5P_DEFAULT, Latitude);
 
@@ -775,19 +789,10 @@ CPLErr HDF5ImageDataset::CreateProjections()
 
             oSRS.SetWellKnownGeogCS("WGS84");
             CPLFree(pszProjection);
+            pszProjection = nullptr;
             CPLFree(pszGCPProjection);
-            oSRS.exportToWkt(&pszProjection);
             oSRS.exportToWkt(&pszGCPProjection);
 
-            // Fill the GCPs list.
-
-            nGCPCount = (nRasterYSize / nDeltaLat) * (nRasterXSize / nDeltaLon);
-
-            pasGCPList =
-                static_cast<GDAL_GCP *>(CPLCalloc(nGCPCount, sizeof(GDAL_GCP)));
-
-            GDALInitGCPs(nGCPCount, pasGCPList);
-
             const int nYLimit =
                 (static_cast<int>(nRasterYSize) / nDeltaLat) * nDeltaLat;
             const int nXLimit =
@@ -801,19 +806,32 @@ CPLErr HDF5ImageDataset::CreateProjections()
             bool bHasLonNearMinus180 = false;
             bool bHasLonNearPlus180 = false;
             bool bHasLonNearZero = false;
+            nGCPCount = 0;
             for( int j = 0; j < nYLimit; j += nDeltaLat )
             {
                 for( int i = 0; i < nXLimit; i += nDeltaLon )
                 {
                     const int iGCP = j * nRasterXSize + i;
+                    if( (bHasLatNoData && static_cast<float>(dfLatNoData) == Latitude[iGCP]) ||
+                        (bHasLongNoData && static_cast<float>(dfLongNoData) == Longitude[iGCP]) )
+                        continue;
                     if( Longitude[iGCP] > 170 && Longitude[iGCP] <= 180 )
                         bHasLonNearPlus180 = true;
                     if( Longitude[iGCP] < -170 && Longitude[iGCP] >= -180 )
                         bHasLonNearMinus180 = true;
                     if( fabs(Longitude[iGCP]) < 90 )
                         bHasLonNearZero = true;
+                    nGCPCount ++;
                 }
             }
+
+            // Fill the GCPs list.
+
+            pasGCPList =
+                static_cast<GDAL_GCP *>(CPLCalloc(nGCPCount, sizeof(GDAL_GCP)));
+
+            GDALInitGCPs(nGCPCount, pasGCPList);
+
             const char *pszShiftGCP =
                 CPLGetConfigOption("HDF5_SHIFT_GCPX_BY_180", nullptr);
             const bool bAdd180 =
@@ -827,6 +845,9 @@ CPLErr HDF5ImageDataset::CreateProjections()
                 for( int i = 0; i < nXLimit; i += nDeltaLon )
                 {
                     const int iGCP = j * nRasterXSize + i;
+                    if( (bHasLatNoData && static_cast<float>(dfLatNoData) == Latitude[iGCP]) ||
+                        (bHasLongNoData && static_cast<float>(dfLongNoData) == Longitude[iGCP]) )
+                        continue;
                     pasGCPList[k].dfGCPX = static_cast<double>(Longitude[iGCP]);
                     if( bAdd180 )
                         pasGCPList[k].dfGCPX += 180.0;

From fb7b64fcc6201cf7750714758ae6ce13cf4592a0 Mon Sep 17 00:00:00 2001
From: Even Rouault <even.rouault@spatialys.com>
Date: Wed, 17 Apr 2019 22:56:53 +0200
Subject: [PATCH 285/488] GMLAS: do not use space as separator for schema
 filename in XSD open option (fixes #1452)

---
 autotest/ogr/ogr_gmlas.py                         | 8 ++++++--
 gdal/ogr/ogrsf_frmts/gmlas/ogrgmlasdatasource.cpp | 2 +-
 2 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/autotest/ogr/ogr_gmlas.py b/autotest/ogr/ogr_gmlas.py
index d0f65ec5714d..50cf78a265f1 100755
--- a/autotest/ogr/ogr_gmlas.py
+++ b/autotest/ogr/ogr_gmlas.py
@@ -1083,8 +1083,12 @@ def test_ogr_gmlas_instantiate_only_gml_feature():
     if ogr.GetDriverByName('GMLAS') is None:
         pytest.skip()
 
-    ds = gdal.OpenEx('GMLAS:',
-                     open_options=['XSD=data/gmlas/gmlas_instantiate_only_gml_feature.xsd'])
+    with gdaltest.tempfile('/vsimem/with space/gmlas_instantiate_only_gml_feature.xsd',
+                       open('data/gmlas/gmlas_instantiate_only_gml_feature.xsd', 'rb').read()):
+        with gdaltest.tempfile('/vsimem/with space/gmlas_fake_gml32.xsd',
+                       open('data/gmlas/gmlas_fake_gml32.xsd', 'rb').read()):
+            ds = gdal.OpenEx('GMLAS:',
+                            open_options=['XSD=/vsimem/with space/gmlas_instantiate_only_gml_feature.xsd'])
     assert ds.GetLayerCount() == 1
     ds = None
 
diff --git a/gdal/ogr/ogrsf_frmts/gmlas/ogrgmlasdatasource.cpp b/gdal/ogr/ogrsf_frmts/gmlas/ogrgmlasdatasource.cpp
index 9b89a0c8fc49..f0bc670d76cb 100644
--- a/gdal/ogr/ogrsf_frmts/gmlas/ogrgmlasdatasource.cpp
+++ b/gdal/ogr/ogrsf_frmts/gmlas/ogrgmlasdatasource.cpp
@@ -681,7 +681,7 @@ std::vector<PairURIFilename> OGRGMLASDataSource::BuildXSDVector(
                                             const CPLString& osXSDFilenames)
 {
     std::vector<PairURIFilename> aoXSDs;
-    char** papszTokens = CSLTokenizeString2(osXSDFilenames," ,",0);
+    char** papszTokens = CSLTokenizeString2(osXSDFilenames, ",", 0);
     char* pszCurDir = CPLGetCurrentDir();
     for( int i=0; papszTokens != nullptr && papszTokens[i] != nullptr; i++ )
     {

From ae283428622e4dbef48ba63b10156644cf894681 Mon Sep 17 00:00:00 2001
From: Even Rouault <even.rouault@spatialys.com>
Date: Thu, 18 Apr 2019 11:45:51 +0200
Subject: [PATCH 286/488] PDF: avoid possible assertion in PDFium backend on
 corrupted files

---
 gdal/frmts/pdf/pdfobject.cpp | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/gdal/frmts/pdf/pdfobject.cpp b/gdal/frmts/pdf/pdfobject.cpp
index 785088ae0b67..3ca52e146675 100644
--- a/gdal/frmts/pdf/pdfobject.cpp
+++ b/gdal/frmts/pdf/pdfobject.cpp
@@ -2035,6 +2035,9 @@ GDALPDFObjectType GDALPDFObjectPdfium::GetType()
         case PDFOBJ_ARRAY:                    return PDFObjectType_Array;
         case PDFOBJ_DICTIONARY:               return PDFObjectType_Dictionary;
         case PDFOBJ_STREAM:                   return PDFObjectType_Dictionary;
+        case PDFOBJ_REFERENCE:
+            // unresolved reference
+            return PDFObjectType_Unknown;
         default:
           CPLAssert(false);
           return PDFObjectType_Unknown;

From 88fc521d20870a90b023d38180ce3c5023b69be4 Mon Sep 17 00:00:00 2001
From: Even Rouault <even.rouault@spatialys.com>
Date: Wed, 10 Apr 2019 11:38:18 +0200
Subject: [PATCH 287/488] autotest/gdrivers/pdf.py: adjust for pdfium

---
 autotest/gdrivers/pdf.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/autotest/gdrivers/pdf.py b/autotest/gdrivers/pdf.py
index 944eb0501b4c..eb99d7bb2140 100755
--- a/autotest/gdrivers/pdf.py
+++ b/autotest/gdrivers/pdf.py
@@ -987,7 +987,7 @@ def _pdf_set_neatline(pdf_backend, geo_encoding, dpi=300):
     ds = None
 
     for i in range(6):
-        assert abs(got_gt[i] - expected_gt[i]) <= 1e-7, 'did not get expected gt'
+        assert abs(got_gt[i] - expected_gt[i]) <= 2e-7, 'did not get expected gt'
 
     got_geom = ogr.CreateGeometryFromWkt(got_neatline)
     expected_geom = ogr.CreateGeometryFromWkt(neatline)

From 4fa6baa441510e5e0318a6422b34110b1aa5ca18 Mon Sep 17 00:00:00 2001
From: Even Rouault <even.rouault@spatialys.com>
Date: Thu, 18 Apr 2019 19:45:56 +0200
Subject: [PATCH 288/488] PDS3: add support for ENCODING_TYPE=DCT_DECOMPRESSED
 (fixes #1457)

---
 gdal/frmts/pds/pdsdataset.cpp | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/gdal/frmts/pds/pdsdataset.cpp b/gdal/frmts/pds/pdsdataset.cpp
index 087c79ada219..34410ff78aa9 100644
--- a/gdal/frmts/pds/pdsdataset.cpp
+++ b/gdal/frmts/pds/pdsdataset.cpp
@@ -727,16 +727,18 @@ int PDSDataset::ParseImage( CPLString osPrefix, CPLString osFilenamePrefix )
     /* -------------------------------------------------------------------- */
     /*      Checks to see if this is raw PDS image not compressed image     */
     /*      so ENCODING_TYPE either does not exist or it equals "N/A".      */
+    /*      or "DCT_DECOMPRESSED".                                          */
     /*      Compressed types will not be supported in this routine          */
     /* -------------------------------------------------------------------- */
 
     CPLString osEncodingType = GetKeyword(osPrefix+"IMAGE.ENCODING_TYPE","N/A");
     CleanString(osEncodingType);
-    if ( !EQUAL(osEncodingType.c_str(),"N/A") )
+    if ( !EQUAL(osEncodingType,"N/A") &&
+         !EQUAL(osEncodingType,"DCT_DECOMPRESSED") )
     {
         CPLError( CE_Failure, CPLE_OpenFailed,
                   "*** PDS image file has an ENCODING_TYPE parameter:\n"
-                  "*** gdal pds driver does not support compressed image types\n"
+                  "*** GDAL PDS driver does not support compressed image types\n"
                   "found: (%s)\n\n", osEncodingType.c_str() );
         return FALSE;
     }

From 66806cbf54fb56792dbbe9fe0f7b50376f7175f4 Mon Sep 17 00:00:00 2001
From: Even Rouault <even.rouault@spatialys.com>
Date: Thu, 18 Apr 2019 21:02:36 +0200
Subject: [PATCH 289/488] /vsicurl/: automatically detect signed URLs where
 host ends with a port number; also detect signed URLs as created iwth the
 AWS4-HMAC-SHA256 method (fixes #1456)

---
 gdal/port/cpl_vsil_curl.cpp | 19 +++++++++++++++----
 1 file changed, 15 insertions(+), 4 deletions(-)

diff --git a/gdal/port/cpl_vsil_curl.cpp b/gdal/port/cpl_vsil_curl.cpp
index 78363626c50f..9185273c3c1e 100644
--- a/gdal/port/cpl_vsil_curl.cpp
+++ b/gdal/port/cpl_vsil_curl.cpp
@@ -614,9 +614,13 @@ static bool VSICurlIsS3LikeSignedURL( const char* pszURL )
 {
     return
         (strstr(pszURL, ".s3.amazonaws.com/") != nullptr ||
-         strstr(pszURL, ".storage.googleapis.com/") != nullptr) &&
+         strstr(pszURL, ".s3.amazonaws.com:") != nullptr ||
+         strstr(pszURL, ".storage.googleapis.com/") != nullptr ||
+         strstr(pszURL, ".storage.googleapis.com:") != nullptr) &&
         (strstr(pszURL, "&Signature=") != nullptr ||
-         strstr(pszURL, "?Signature=") != nullptr);
+         strstr(pszURL, "?Signature=") != nullptr ||
+         strstr(pszURL, "&X-Amz-Signature=") != nullptr ||
+         strstr(pszURL, "?X-Amz-Signature=") != nullptr);
 }
 
 /************************************************************************/
@@ -628,9 +632,16 @@ static GIntBig VSICurlGetExpiresFromS3LikeSignedURL( const char* pszURL )
     const char* pszExpires = strstr(pszURL, "&Expires=");
     if( pszExpires == nullptr )
         pszExpires = strstr(pszURL, "?Expires=");
+    if( pszExpires != nullptr )
+        return CPLAtoGIntBig(pszExpires + strlen("&Expires="));
+
+    pszExpires = strstr(pszURL, "?X-Amz-Expires=");
     if( pszExpires == nullptr )
-        return 0;
-    return CPLAtoGIntBig(pszExpires + strlen("&Expires="));
+        pszExpires = strstr(pszURL, "?X-Amz-Expires=");
+    if( pszExpires != nullptr )
+        return CPLAtoGIntBig(pszExpires + strlen("&X-Amz-Expires="));
+
+    return 0;
 }
 
 /************************************************************************/

From f30026ec9bad0bbb4c243cb6aee6219e9eb39340 Mon Sep 17 00:00:00 2001
From: Even Rouault <even.rouault@spatialys.com>
Date: Fri, 19 Apr 2019 22:20:14 +0200
Subject: [PATCH 290/488] OGR_GMT: use file extension based detection to accept
 files without header (fixes #1461)

---
 autotest/ogr/ogr_gmt.py                   | 11 +++++++++++
 gdal/ogr/ogrsf_frmts/gmt/ogrgmtdriver.cpp | 11 ++++++++---
 2 files changed, 19 insertions(+), 3 deletions(-)

diff --git a/autotest/ogr/ogr_gmt.py b/autotest/ogr/ogr_gmt.py
index 5619070c3b17..c3f94abb74cd 100755
--- a/autotest/ogr/ogr_gmt.py
+++ b/autotest/ogr/ogr_gmt.py
@@ -210,6 +210,17 @@ def test_ogr_gmt_5():
 
     assert feat is None, 'did not get null feature when expected.'
 
+###############################################################################
+# Test reading a file with just point coordinates
+
+
+def test_ogr_gmt_coord_only():
+
+    with gdaltest.tempfile('/vsimem/test.gmt', """1 2 3\n"""):
+        ds = ogr.Open('/vsimem/test.gmt')
+        lyr = ds.GetLayer(0)
+        f = lyr.GetNextFeature()
+        assert not ogrtest.check_feature_geometry(f, 'POINT Z (1 2 3)'), f.GetGeometryRef().ExportToIsoWkt()
 
 ###############################################################################
 #
diff --git a/gdal/ogr/ogrsf_frmts/gmt/ogrgmtdriver.cpp b/gdal/ogr/ogrsf_frmts/gmt/ogrgmtdriver.cpp
index dccb98f1439e..a401dbfd990e 100644
--- a/gdal/ogr/ogrsf_frmts/gmt/ogrgmtdriver.cpp
+++ b/gdal/ogr/ogrsf_frmts/gmt/ogrgmtdriver.cpp
@@ -39,9 +39,14 @@ CPL_CVSID("$Id$")
 static int OGRGMTDriverIdentify( GDALOpenInfo *poOpenInfo )
 
 {
-    return poOpenInfo->nHeaderBytes &&
-           strstr(reinterpret_cast<const char*>(poOpenInfo->pabyHeader),
-                  "@VGMT") != nullptr;
+    const char* pszHeader = reinterpret_cast<const char*>(poOpenInfo->pabyHeader);
+    if( poOpenInfo->nHeaderBytes && strstr(pszHeader, "@VGMT") != nullptr )
+        return true;
+
+    if( EQUAL(CPLGetExtension(poOpenInfo->pszFilename), "GMT") )
+        return true;
+
+    return false;
 }
 
 /************************************************************************/

From fc4fcaf1f9634bd4cb69ab71100ac23985f13500 Mon Sep 17 00:00:00 2001
From: Even Rouault <even.rouault@spatialys.com>
Date: Sat, 20 Apr 2019 15:27:13 +0200
Subject: [PATCH 291/488] Python bindings: rename README.txt as README.rst, fix
 a link and mark its content type appropriately (fixes #1462)

---
 gdal/swig/python/{README.txt => README.rst} | 2 +-
 gdal/swig/python/setup.py                   | 3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)
 rename gdal/swig/python/{README.txt => README.rst} (99%)

diff --git a/gdal/swig/python/README.txt b/gdal/swig/python/README.rst
similarity index 99%
rename from gdal/swig/python/README.txt
rename to gdal/swig/python/README.rst
index 67a44e84c398..eb2ec3703f77 100644
--- a/gdal/swig/python/README.txt
+++ b/gdal/swig/python/README.rst
@@ -96,7 +96,7 @@ bindings on Windows:
 
 As explained in the README_EXE.txt file, after unzipping the GDAL binaries you 
 will need to modify your system path and variables. If you're not sure how to 
-do this, read the `Microsoft KnowledgeBase doc`_ 
+do this, read the `Microsoft Knowledge Base doc`_ 
 
 1. Add the installation directory bin folder to your system PATH, remember 
    to put a semicolon in front of it before you add to the existing path.
diff --git a/gdal/swig/python/setup.py b/gdal/swig/python/setup.py
index 22ae4e46ffa0..22a1e9afb8e3 100644
--- a/gdal/swig/python/setup.py
+++ b/gdal/swig/python/setup.py
@@ -364,7 +364,7 @@ def build_extension(self, ext):
 
 packages = ["osgeo", ]
 
-readme = str(open('README.txt', 'rb').read())
+readme = str(open('README.rst', 'rb').read())
 
 name = 'GDAL'
 version = gdal_version
@@ -408,6 +408,7 @@ def build_extension(self, ext):
     maintainer=maintainer,
     maintainer_email=maintainer_email,
     long_description=readme,
+    long_description_content_type='text/x-rst',
     description=description,
     license=license_type,
     classifiers=classifiers,

From 02213abc7ed964da950a4d430fa4f3254b9c3031 Mon Sep 17 00:00:00 2001
From: Even Rouault <even.rouault@spatialys.com>
Date: Sun, 21 Apr 2019 12:19:56 +0200
Subject: [PATCH 292/488] PDF: add support for Poppler 0.76.0

---
 gdal/frmts/pdf/pdfsdk_headers.h | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/gdal/frmts/pdf/pdfsdk_headers.h b/gdal/frmts/pdf/pdfsdk_headers.h
index 41e48ae91d69..1f77429bf9b6 100644
--- a/gdal/frmts/pdf/pdfsdk_headers.h
+++ b/gdal/frmts/pdf/pdfsdk_headers.h
@@ -55,7 +55,10 @@
 #else
 typedef unsigned char Guchar;
 #endif
+
+#if !(POPPLER_MAJOR_VERSION >= 1 || POPPLER_MINOR_VERSION >= 76)
 #include <goo/GooList.h>
+#endif
 
 /* begin of poppler xpdf includes */
 #include <poppler/Object.h>

From 1428b1a3b231f6cad54810611cc7927aaad7d0fd Mon Sep 17 00:00:00 2001
From: Even Rouault <even.rouault@spatialys.com>
Date: Fri, 19 Apr 2019 12:14:32 +0200
Subject: [PATCH 293/488] ci/travis/trusty_clang/before_install.sh: disable
 msodbcsql17 installation because of issue with microsoft repo

---
 gdal/ci/travis/trusty_clang/before_install.sh | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/gdal/ci/travis/trusty_clang/before_install.sh b/gdal/ci/travis/trusty_clang/before_install.sh
index e696ee450bc8..13d4d682e04b 100755
--- a/gdal/ci/travis/trusty_clang/before_install.sh
+++ b/gdal/ci/travis/trusty_clang/before_install.sh
@@ -92,10 +92,11 @@ sudo make install PREFIX=/usr ZSTD_LEGACY_SUPPORT=0 CFLAGS=-O1
 cd ../..
 
 # MSSQL: client side
-sudo bash -c "curl https://packages.microsoft.com/keys/microsoft.asc | apt-key add -"
-sudo bash -c "curl https://packages.microsoft.com/config/ubuntu/14.04/prod.list | tee /etc/apt/sources.list.d/msprod.list"
-sudo apt-get update
-sudo ACCEPT_EULA=Y apt-get install -y msodbcsql17
+# Disabled because of 'Failed to fetch https://packages.microsoft.com/ubuntu/14.04/prod/dists/trusty/main/binary-amd64/Packages.gz  Hash Sum mismatch'
+#sudo bash -c "curl https://packages.microsoft.com/keys/microsoft.asc | apt-key add -"
+#sudo bash -c "curl https://packages.microsoft.com/config/ubuntu/14.04/prod.list | tee /etc/apt/sources.list.d/msprod.list"
+#sudo apt-get update
+#sudo ACCEPT_EULA=Y apt-get install -y msodbcsql17
 
 # Nasty: force reinstallation of unixodbc-dev since the previous line installed unixodbc 2.3.1 from microsoft repo, which lacks the -dev package
 # DON'T DO THAT ON YOUR PRODUCTION SERVER.

From 7efbce79d3dd53e182805fccd605fb042ec0c82f Mon Sep 17 00:00:00 2001
From: Even Rouault <even.rouault@spatialys.com>
Date: Tue, 23 Apr 2019 10:55:47 +0200
Subject: [PATCH 294/488] MrSID: fix potential crash when a zoom level cannot
 be opened

---
 gdal/frmts/mrsid/mrsiddataset.cpp | 20 +++++++++++++++++---
 1 file changed, 17 insertions(+), 3 deletions(-)

diff --git a/gdal/frmts/mrsid/mrsiddataset.cpp b/gdal/frmts/mrsid/mrsiddataset.cpp
index 22188c0bd7dc..10c215b2b6f2 100644
--- a/gdal/frmts/mrsid/mrsiddataset.cpp
+++ b/gdal/frmts/mrsid/mrsiddataset.cpp
@@ -1231,7 +1231,12 @@ CPLErr MrSIDDataset::OpenZoomLevel( lt_int32 iZoom )
     {
         lt_uint32 iWidth, iHeight;
         dfCurrentMag = LTIUtils::levelToMag( iZoom );
-        poImageReader->getDimsAtMag( dfCurrentMag, iWidth, iHeight );
+        auto eLTStatus = poImageReader->getDimsAtMag( dfCurrentMag, iWidth, iHeight );
+        if( !LT_SUCCESS(eLTStatus))
+        {
+            CPLDebug( "MrSID", "Cannot open zoom level %d", iZoom);
+            return CE_Failure;
+        }
         nRasterXSize = iWidth;
         nRasterYSize = iHeight;
     }
@@ -1675,9 +1680,14 @@ GDALDataset *MrSIDDataset::Open( GDALOpenInfo * poOpenInfo, int bIsJP2 )
         {
             poDS->papoOverviewDS[i] = new MrSIDDataset(bIsJP2);
             poDS->papoOverviewDS[i]->poImageReader = poDS->poImageReader;
-            poDS->papoOverviewDS[i]->OpenZoomLevel( i + 1 );
             poDS->papoOverviewDS[i]->bIsOverview = TRUE;
             poDS->papoOverviewDS[i]->poParentDS = poDS;
+            if( poDS->papoOverviewDS[i]->OpenZoomLevel( i + 1 ) != CE_None )
+            {
+                delete poDS->papoOverviewDS[i];
+                poDS->nOverviewCount = i;
+                break;
+            }
         }
     }
 
@@ -1685,7 +1695,11 @@ GDALDataset *MrSIDDataset::Open( GDALOpenInfo * poOpenInfo, int bIsJP2 )
 /*      Create object for the whole image.                              */
 /* -------------------------------------------------------------------- */
     poDS->SetDescription( poOpenInfo->pszFilename );
-    poDS->OpenZoomLevel( 0 );
+    if( poDS->OpenZoomLevel( 0 ) != CE_None )
+    {
+        delete poDS;
+        return nullptr;
+    }
 
     CPLDebug( "MrSID",
               "Opened image: width %d, height %d, bands %d",

From 1000325440008e4e9e7189c0d2e69a3b945343a0 Mon Sep 17 00:00:00 2001
From: Even Rouault <even.rouault@spatialys.com>
Date: Tue, 23 Apr 2019 23:29:54 +0200
Subject: [PATCH 295/488] plscenesconf.json: add missing fields for PSOrthoTile

---
 autotest/ogr/ogr_plscenes.py |  2 +-
 gdal/data/plscenesconf.json  | 12 +++++++++++-
 2 files changed, 12 insertions(+), 2 deletions(-)

diff --git a/autotest/ogr/ogr_plscenes.py b/autotest/ogr/ogr_plscenes.py
index 0fa0c7696565..eba64cde7c20 100755
--- a/autotest/ogr/ogr_plscenes.py
+++ b/autotest/ogr/ogr_plscenes.py
@@ -141,7 +141,7 @@ def test_ogr_plscenes_data_v1_nominal():
     assert ext == (-180.0, 180.0, -90.0, 90.0)
 
     field_count = lyr.GetLayerDefn().GetFieldCount()
-    assert field_count == 68
+    assert field_count == 78
 
     # Regular /items/ fetching
     gdal.FileFromMemBuffer("""/vsimem/data_v1/quick-search?_page_size=250&POSTFIELDS={"item_types":["PSOrthoTile"],"filter":{"type":"AndFilter","config":[]}}""",
diff --git a/gdal/data/plscenesconf.json b/gdal/data/plscenesconf.json
index b6506864b143..f3ff0f8e89f4 100644
--- a/gdal/data/plscenesconf.json
+++ b/gdal/data/plscenesconf.json
@@ -5,13 +5,18 @@
                 { "name": "acquired", "type": "datetime" },
                 { "name": "anomalous_pixels", "type": "double" },
                 { "name": "black_fill", "type": "double" },
+                { "name": "clear_confidence_percent", "type": "double" },
+                { "name": "clear_percent", "type": "double" },
                 { "name": "cloud_cover", "type": "double" },
+                { "name": "cloud_percent", "type": "double" },
                 { "name": "columns", "type": "int" },
                 { "name": "epsg_code", "type": "int" },
                 { "name": "grid_cell", "type": "string" },
                 { "name": "ground_control", "type": "boolean" },
                 { "name": "gsd", "type": "double" },
+                { "name": "heavy_haze_percent", "type": "double" },
                 { "name": "item_type", "type": "string" },
+                { "name": "light_haze_percent", "type": "double" },
                 { "name": "origin_x", "type": "double" },
                 { "name": "origin_y", "type": "double" },
                 { "name": "pixel_resolution", "type": "double" },
@@ -19,11 +24,16 @@
                 { "name": "published", "type": "datetime" },
                 { "name": "rows", "type": "int" },
                 { "name": "satellite_id", "type": "string" },
+                { "name": "shadow_percent", "type": "double" },
+                { "name": "snow_ice_percent", "type": "double" },
+                { "name": "strip_id", "type": "string" },
                 { "name": "sun_azimuth", "type": "double" },
                 { "name": "sun_elevation", "type": "double" },
                 { "name": "updated", "type": "datetime" },
                 { "name": "usable_data", "type": "double" },
-                { "name": "view_angle", "type": "double" }
+                { "name": "view_angle", "type": "double" },
+                { "name": "visible_confidence_percent", "type": "double" },
+                { "name": "visible_percent", "type": "double" }
             ],
             "assets": [
                 "analytic",

From 7fefb7ee5e6834d26f6fc96f54c2a4312b5bd507 Mon Sep 17 00:00:00 2001
From: Even Rouault <even.rouault@spatialys.com>
Date: Wed, 24 Apr 2019 21:41:42 +0200
Subject: [PATCH 296/488] XYZ: fix regression regarding header lines that are
 not X,Y,Z (fixes #1472)

Fix issue introduced by feba3e02b56cfd80e5e98cfd3a822fad3bf521ba / GDAL 2.2.3
---
 autotest/gdrivers/xyz.py      | 19 +++++++++++++++++++
 gdal/frmts/xyz/xyzdataset.cpp | 27 ++++++++++++++-------------
 2 files changed, 33 insertions(+), 13 deletions(-)

diff --git a/autotest/gdrivers/xyz.py b/autotest/gdrivers/xyz.py
index 7c77c9e77d6f..1136c90ac011 100755
--- a/autotest/gdrivers/xyz.py
+++ b/autotest/gdrivers/xyz.py
@@ -242,6 +242,25 @@ def test_xyz_8():
 
     assert cs == 35
 
+###############################################################################
+# Test case of XYZ file with header file with 3 columns not named X Y Z, and quoted
+
+
+def test_xyz_9():
+
+    content = """"A"    "B"     "C"
+0 0 50
+10 0 100
+0 10 150
+10 10 200
+"""
+
+    with gdaltest.tempfile('/vsimem/grid.xyz', content):
+        ds = gdal.Open('/vsimem/grid.xyz')
+        assert ds.RasterXSize == 2 and ds.RasterYSize == 2
+        cs = ds.GetRasterBand(1).Checksum()
+
+    assert cs == 22
 
 ###############################################################################
 # Cleanup
diff --git a/gdal/frmts/xyz/xyzdataset.cpp b/gdal/frmts/xyz/xyzdataset.cpp
index 03304f6ecfda..13d497841833 100644
--- a/gdal/frmts/xyz/xyzdataset.cpp
+++ b/gdal/frmts/xyz/xyzdataset.cpp
@@ -624,20 +624,21 @@ int XYZDataset::IdentifyEx( GDALOpenInfo * poOpenInfo,
         char** papszTokens = CSLTokenizeString2( osHeaderLine, " ,\t;",
                                                  CSLT_HONOURSTRINGS );
         int nTokens = CSLCount(papszTokens);
-        for( i = 0; i < nTokens; i++ )
+        for( int iToken = 0; iToken < nTokens; iToken++ )
         {
-            if (EQUAL(papszTokens[i], "x") ||
-                STARTS_WITH_CI(papszTokens[i], "lon") ||
-                STARTS_WITH_CI(papszTokens[i], "east"))
-                nXIndex = i;
-            else if (EQUAL(papszTokens[i], "y") ||
-                     STARTS_WITH_CI(papszTokens[i], "lat") ||
-                     STARTS_WITH_CI(papszTokens[i], "north"))
-                nYIndex = i;
-            else if (EQUAL(papszTokens[i], "z") ||
-                     STARTS_WITH_CI(papszTokens[i], "alt") ||
-                     EQUAL(papszTokens[i], "height"))
-                nZIndex = i;
+            const char* pszToken = papszTokens[iToken];
+            if (EQUAL(pszToken, "x") ||
+                STARTS_WITH_CI(pszToken, "lon") ||
+                STARTS_WITH_CI(pszToken, "east"))
+                nXIndex = iToken;
+            else if (EQUAL(pszToken, "y") ||
+                     STARTS_WITH_CI(pszToken, "lat") ||
+                     STARTS_WITH_CI(pszToken, "north"))
+                nYIndex = iToken;
+            else if (EQUAL(pszToken, "z") ||
+                     STARTS_WITH_CI(pszToken, "alt") ||
+                     EQUAL(pszToken, "height"))
+                nZIndex = iToken;
         }
         CSLDestroy(papszTokens);
         if( nXIndex >= 0 && nYIndex >= 0 && nZIndex >= 0)

From e3337a0563ae8a64f47cd9fec038ce9c2cc18ebf Mon Sep 17 00:00:00 2001
From: Even Rouault <even.rouault@spatialys.com>
Date: Wed, 24 Apr 2019 23:15:43 +0200
Subject: [PATCH 297/488] Fix previous commit (refs #1472)

---
 gdal/frmts/gdalallregister.cpp | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/gdal/frmts/gdalallregister.cpp b/gdal/frmts/gdalallregister.cpp
index b399f4740af4..f6b81e74cdc9 100644
--- a/gdal/frmts/gdalallregister.cpp
+++ b/gdal/frmts/gdalallregister.cpp
@@ -507,6 +507,12 @@ void CPL_STDCALL GDALAllRegister()
     GDALRegister_SAGA();
 #endif
 
+#ifdef FRMT_ignfheightasciigrid
+    // IGNFHeightASCIIGrid must come before XYZ, otherwise XYZ might
+    // try and fail opening such files
+    GDALRegister_IGNFHeightASCIIGrid();
+#endif
+
 #ifdef FRMT_xyz
     GDALRegister_XYZ();
 #endif
@@ -564,10 +570,6 @@ void CPL_STDCALL GDALAllRegister()
     GDALRegister_SIGDEM();
 #endif
 
-#ifdef FRMT_ignfheightasciigrid
-    GDALRegister_IGNFHeightASCIIGrid();
-#endif
-
     // NOTE: you need to generally your own driver before that line.
 
 /* -------------------------------------------------------------------- */

From 3895dc399ec85aa97a1a88949c6acdfac807d745 Mon Sep 17 00:00:00 2001
From: Even Rouault <even.rouault@spatialys.com>
Date: Tue, 30 Apr 2019 13:00:55 +0200
Subject: [PATCH 298/488] gdal_contour: remove explicit width/precision=12/3 of
 the elev field (fixes #1487)

This is insufficient for intervals < 1e-3
The shapefile driver will default to 24/15 which will be sufficient.
---
 gdal/apps/gdal_contour.cpp | 2 --
 1 file changed, 2 deletions(-)

diff --git a/gdal/apps/gdal_contour.cpp b/gdal/apps/gdal_contour.cpp
index 9c31f0105c23..1c4e34f1d8a7 100644
--- a/gdal/apps/gdal_contour.cpp
+++ b/gdal/apps/gdal_contour.cpp
@@ -73,8 +73,6 @@ static void Usage(const char* pszErrorMsg = nullptr)
 static void CreateElevAttrib(const char* pszElevAttrib, OGRLayerH hLayer)
 {
     OGRFieldDefnH hFld = OGR_Fld_Create( pszElevAttrib, OFTReal );
-    OGR_Fld_SetWidth( hFld, 12 );
-    OGR_Fld_SetPrecision( hFld, 3 );
     OGRErr eErr = OGR_L_CreateField( hLayer, hFld, FALSE );
     OGR_Fld_Destroy( hFld );
     if( eErr == OGRERR_FAILURE )

From c3d60a7d1d83598b7df8cd8d9be67cafb660d77e Mon Sep 17 00:00:00 2001
From: Even Rouault <even.rouault@spatialys.com>
Date: Tue, 30 Apr 2019 13:31:46 +0200
Subject: [PATCH 299/488] GTiff: do not generate a TIFFTAG_GDAL_METADATA with
 color interpretation information for JPEG YCbCr compression

---
 autotest/gcore/tiff_write.py | 31 +++++++++++++++++++++++++++++++
 gdal/frmts/gtiff/geotiff.cpp |  5 +++++
 2 files changed, 36 insertions(+)

diff --git a/autotest/gcore/tiff_write.py b/autotest/gcore/tiff_write.py
index 615c4f37f8ff..4a49c6fdbcea 100755
--- a/autotest/gcore/tiff_write.py
+++ b/autotest/gcore/tiff_write.py
@@ -6953,6 +6953,37 @@ def test_tiff_write_rewrite_lzw_strip():
 
     gdal.Unlink(tmpfilename)
 
+###############################################################################
+# Test that -co PHOTOMETRIC=YCBCR -co COMPRESS=JPEG does not create a TIFFTAG_GDAL_METADATA
+
+def test_tiff_write_no_gdal_metadata_tag_for_ycbcr_jpeg():
+
+    md = gdaltest.tiff_drv.GetMetadata()
+    if md['DMD_CREATIONOPTIONLIST'].find('JPEG') == -1:
+        pytest.skip()
+
+    tmpfile = '/vsimem/test_tiff_write_no_gdal_metadata_tag_for_ycbcr_jpeg.tif'
+    assert gdaltest.tiff_drv.Create(tmpfile, 16, 16, 3, gdal.GDT_Byte, options=['PHOTOMETRIC=YCBCR', 'COMPRESS=JPEG'])
+    statBuf = gdal.VSIStatL(tmpfile + '.aux.xml', gdal.VSI_STAT_EXISTS_FLAG | gdal.VSI_STAT_NATURE_FLAG | gdal.VSI_STAT_SIZE_FLAG)
+    assert statBuf is None, 'did not expect PAM file'
+
+    ds = gdal.Open(tmpfile)
+    assert ds.GetMetadataItem('TIFFTAG_GDAL_METADATA', '_DEBUG_') is None, \
+        'did not expect TIFFTAG_GDAL_METADATA tag'
+    assert ds.GetRasterBand(1).GetColorInterpretation() == gdal.GCI_RedBand
+
+    tmpfile2 = tmpfile + "2"
+    assert gdaltest.tiff_drv.CreateCopy(tmpfile2, ds, options=['PHOTOMETRIC=YCBCR', 'COMPRESS=JPEG'])
+    ds = None
+
+    ds = gdal.Open(tmpfile2)
+    assert ds.GetMetadataItem('TIFFTAG_GDAL_METADATA', '_DEBUG_') is None, \
+        'did not expect TIFFTAG_GDAL_METADATA tag'
+    assert ds.GetRasterBand(1).GetColorInterpretation() == gdal.GCI_RedBand
+    ds = None
+
+    gdaltest.tiff_drv.Delete(tmpfile)
+    gdaltest.tiff_drv.Delete(tmpfile2)
 
 ###############################################################################
 # Ask to run again tests with GDAL_API_PROXY=YES
diff --git a/gdal/frmts/gtiff/geotiff.cpp b/gdal/frmts/gtiff/geotiff.cpp
index a7c0615293f8..be710908a430 100644
--- a/gdal/frmts/gtiff/geotiff.cpp
+++ b/gdal/frmts/gtiff/geotiff.cpp
@@ -11504,6 +11504,11 @@ static bool IsStandardColorInterpretation(GDALDataset* poSrcDS,
             }
         }
     }
+    else if( nPhotometric == PHOTOMETRIC_YCBCR &&
+             poSrcDS->GetRasterCount() == 3 )
+    {
+        // do nothing
+    }
     else
     {
         bStardardColorInterp = false;

From fb91c16ad0a9cc8c4320f6a4fd55b1095c3294d3 Mon Sep 17 00:00:00 2001
From: Even Rouault <even.rouault@spatialys.com>
Date: Tue, 30 Apr 2019 18:05:40 +0200
Subject: [PATCH 300/488] OGR_PDS: fix heap-buffer-overflow in error code path.
 Fixes https://bugs.chromium.org/p/oss-fuzz/issues/detail?id=14512. Credit to
 OSS Fuzz

---
 gdal/ogr/ogrsf_frmts/pds/ogrpdslayer.cpp | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/gdal/ogr/ogrsf_frmts/pds/ogrpdslayer.cpp b/gdal/ogr/ogrsf_frmts/pds/ogrpdslayer.cpp
index 6813ef77381d..abbbd6faf1a8 100644
--- a/gdal/ogr/ogrsf_frmts/pds/ogrpdslayer.cpp
+++ b/gdal/ogr/ogrsf_frmts/pds/ogrpdslayer.cpp
@@ -310,6 +310,11 @@ void OGRPDSLayer::ReadStructure(CPLString osStructureFilename)
                     CPLError(CE_Failure, CPLE_AppDefined,
                                 "Field %d out of record extents", nFields);
                     CSLDestroy(papszTokens);
+                    if( nFields == 0 )
+                    {
+                        CPLFree(pasFieldDesc);
+                        pasFieldDesc = nullptr;
+                    }
                     break;
                 }
             }

From 25c839a8f8376a5f29e7e9c1ad1d685454d4a287 Mon Sep 17 00:00:00 2001
From: Sai Cheemalapati <saicheems@google.com>
Date: Wed, 24 Apr 2019 12:50:14 -0700
Subject: [PATCH 301/488] EEDA: Bump to v1alpha.

- `EarthEngineAsset.path` is no longer returned.
- `PixelDataType.(INTEGER|FLOAT32|FLOAT64)` are renamed to
  `PixelDataType.(INT|FLOAT|DOUBLE)`.
- `EarthEngineAsset.time` is no longer returned (replaced by
  `EarthEngineAsset.(start|end)_time`.
- `ListImagesResponse.assets` is renamed to
  `ListImagesResponse.images`.
---
 autotest/gdrivers/eedai.py       | 14 ++++-----
 autotest/ogr/ogr_eeda.py         | 52 ++++++++++++++++----------------
 gdal/frmts/eeda/eedacommon.cpp   |  6 ++--
 gdal/frmts/eeda/eedadataset.cpp  | 25 ++++++---------
 gdal/frmts/eeda/eedaidataset.cpp |  6 ++--
 gdal/frmts/eeda/frmt_eedai.html  |  4 +--
 6 files changed, 50 insertions(+), 57 deletions(-)

diff --git a/autotest/gdrivers/eedai.py b/autotest/gdrivers/eedai.py
index 1e63f1859a0d..0780ccfc1b35 100644
--- a/autotest/gdrivers/eedai.py
+++ b/autotest/gdrivers/eedai.py
@@ -82,7 +82,7 @@ def test_eedai_2():
             {
                 "id": "B1",
                 "dataType": {
-                    "precision": "INTEGER",
+                    "precision": "INT",
                     "range": {
                         "max": 65535
                     }
@@ -105,7 +105,7 @@ def test_eedai_2():
             {
                 "id": "B2",
                 "dataType": {
-                    "precision": "INTEGER",
+                    "precision": "INT",
                     "range": {
                         "max": 65535
                     }
@@ -128,7 +128,7 @@ def test_eedai_2():
             {
                 "id": "B9",
                 "dataType": {
-                    "precision": "INTEGER",
+                    "precision": "INT",
                     "range": {
                         "max": 65535
                     }
@@ -522,7 +522,7 @@ def test_eedai_4():
             {
                 "id": "B1",
                 "dataType": {
-                    "precision": "INTEGER",
+                    "precision": "INT",
                     "range": {
                         "max": 255
                     }
@@ -544,7 +544,7 @@ def test_eedai_4():
             {
                 "id": "B2",
                 "dataType": {
-                    "precision": "INTEGER",
+                    "precision": "INT",
                     "range": {
                         "max": 255
                     }
@@ -566,7 +566,7 @@ def test_eedai_4():
             {
                 "id": "B3",
                 "dataType": {
-                    "precision": "INTEGER",
+                    "precision": "INT",
                     "range": {
                         "max": 255
                     }
@@ -654,7 +654,7 @@ def test_eedai_geotiff():
             {
                 "id": "B1",
                 "dataType": {
-                    "precision": "INTEGER",
+                    "precision": "INT",
                     "range": {
                         "max": 65535
                     }
diff --git a/autotest/ogr/ogr_eeda.py b/autotest/ogr/ogr_eeda.py
index 358b06c3887a..2104010d3875 100644
--- a/autotest/ogr/ogr_eeda.py
+++ b/autotest/ogr/ogr_eeda.py
@@ -60,7 +60,7 @@ def test_eeda_2():
         pytest.skip()
 
     gdal.FileFromMemBuffer('/vsimem/ee/projects/earthengine-public/assets/collection:listImages?pageSize=1', json.dumps({
-        'assets': [
+        'images': [
             {
                 'properties':
                 {
@@ -94,13 +94,13 @@ def test_eeda_2():
     assert lyr.GetFeatureCount() == -1
 
     gdal.FileFromMemBuffer('/vsimem/ee/projects/earthengine-public/assets/collection:listImages', json.dumps({
-        'assets': [
+        'images': [
             {
                 'name': 'projects/earthengine-public/assets/collection/first_feature',
                 'id': 'collection/first_feature',
-                'path': 'collection/first_feature',
-                'time': '2017-01-02T12:34:56.789Z',
-                'updateTime': '2017-01-03T12:34:56.789Z',
+                'updateTime': '2017-01-04T12:34:56.789Z',
+                'startTime': '2017-01-02T12:34:56.789Z',
+                'endTime': '2017-01-03T12:34:56.789Z',
                 'sizeBytes': 1,
                 'geometry': {'type': 'Polygon', 'coordinates': [[[2, 49], [2.1, 49], [2.1, 49.1], [2, 49.1], [2, 49]]]},
                 'properties':
@@ -115,7 +115,7 @@ def test_eeda_2():
                     {
                         "id": "B1",
                         "dataType": {
-                            "precision": "INTEGER",
+                            "precision": "INT",
                             "range": {
                                 "max": 255
                             }
@@ -146,10 +146,10 @@ def test_eeda_2():
     f = lyr.GetNextFeature()
     if f.GetField('name') != 'projects/earthengine-public/assets/collection/first_feature' or \
        f.GetField('id') != 'collection/first_feature' or \
-       f.GetField('path') != 'collection/first_feature' or \
        f.GetField('gdal_dataset') != 'EEDAI:projects/earthengine-public/assets/collection/first_feature' or \
-       f.GetField('time') != '2017/01/02 12:34:56.789+00' or \
-       f.GetField('updateTime') != '2017/01/03 12:34:56.789+00' or \
+       f.GetField('updateTime') != '2017/01/04 12:34:56.789+00' or \
+       f.GetField('startTime') != '2017/01/02 12:34:56.789+00' or \
+       f.GetField('endTime') != '2017/01/03 12:34:56.789+00' or \
        f.GetField('sizeBytes') != 1 or \
        f.GetField('band_count') != 1 or \
        f.GetField('band_max_width') != 1830 or \
@@ -173,7 +173,7 @@ def test_eeda_2():
         pytest.fail()
 
     gdal.FileFromMemBuffer('/vsimem/ee/projects/earthengine-public/assets/collection:listImages?pageToken=myToken', json.dumps({
-        'assets': [
+        'images': [
             {
                 'name': 'projects/earthengine-public/assets/collection/third_feature'
             }
@@ -198,7 +198,7 @@ def test_eeda_2():
     lyr.SetAttributeFilter('EEDA:raw_filter')
 
     gdal.FileFromMemBuffer('/vsimem/ee/projects/earthengine-public/assets/collection:listImages?filter=raw%5Ffilter', json.dumps({
-        'assets': [
+        'images': [
             {
                 'name': 'projects/earthengine-public/assets/collection/raw_filter'
             }
@@ -209,8 +209,8 @@ def test_eeda_2():
     assert f.GetField('name') == 'projects/earthengine-public/assets/collection/raw_filter'
 
     lyr.SetAttributeFilter(None)
-    lyr.SetAttributeFilter("time >= '1980-01-01T00:00:00Z' AND " +
-                           "time <= '2100-01-01T00:00:00Z' AND " +
+    lyr.SetAttributeFilter("startTime >= '1980-01-01T00:00:00Z' AND " +
+                           "startTime <= '2100-01-01T00:00:00Z' AND " +
                            "string_field = 'bar' AND " +
                            "int_field > 0 AND " +
                            "int_field < 2 AND " +
@@ -222,11 +222,11 @@ def test_eeda_2():
 
     ogrtest.eeda_drv_tmpfile = '/vsimem/ee/projects/earthengine-public/assets/collection:listImages?region=%7B%20%22type%22%3A%20%22Polygon%22%2C%20%22coordinates%22%3A%20%5B%20%5B%20%5B%20%2D180%2E0%2C%20%2D90%2E0%20%5D%2C%20%5B%20%2D180%2E0%2C%2090%2E0%20%5D%2C%20%5B%20180%2E0%2C%2090%2E0%20%5D%2C%20%5B%20180%2E0%2C%20%2D90%2E0%20%5D%2C%20%5B%20%2D180%2E0%2C%20%2D90%2E0%20%5D%20%5D%20%5D%20%7D&filter=%28%28%28%28%28%28%28string%5Ffield%20%3D%20%22bar%22%20AND%20int%5Ffield%20%3E%200%29%20AND%20int%5Ffield%20%3C%202%29%20AND%20int64%5Ffield%20%3E%3D%200%29%20AND%20int64%5Ffield%20%3C%3D%209999999999999%29%20AND%20double%5Ffield%20%21%3D%203%2E5%29%20AND%20string%5Ffield%20%3D%20%22bar%22%20OR%20string%5Ffield%20%3D%20%22baz%22%29%20AND%20%28NOT%20%28int%5Ffield%20%3D%200%20OR%20double%5Ffield%20%3D%203%2E5%29%29%29&startTime=1980%2D01%2D01T00%3A00%3A00Z&endTime=2100%2D01%2D01T00%3A00%3A00Z'
     gdal.FileFromMemBuffer(ogrtest.eeda_drv_tmpfile, json.dumps({
-        'assets': [
+        'images': [
             {
                 'name': 'projects/earthengine-public/assets/collection/filtered_feature',
-                'time': '2017-01-02T12:34:56.789Z',
                 'updateTime': '2017-01-03T12:34:56.789Z',
+                'startTime': '2017-01-02T12:34:56.789Z',
                 'sizeBytes': 1,
                 'geometry': {'type': 'Polygon', 'coordinates': [[[2, 49], [2.1, 49], [2.1, 49.1], [2, 49.1], [2, 49]]]},
                 'properties':
@@ -254,14 +254,14 @@ def test_eeda_2():
     lyr.SetSpatialFilter(None)
 
     # Test time equality with second granularity
-    lyr.SetAttributeFilter("time = '1980-01-01T00:00:00Z'")
+    lyr.SetAttributeFilter("startTime = '1980-01-01T00:00:00Z'")
 
     ogrtest.eeda_drv_tmpfile = '/vsimem/ee/projects/earthengine-public/assets/collection:listImages?startTime=1980%2D01%2D01T00%3A00%3A00Z&endTime=1980%2D01%2D01T00%3A00%3A01Z'
     gdal.FileFromMemBuffer(ogrtest.eeda_drv_tmpfile, json.dumps({
-        'assets': [
+        'images': [
             {
                 'name': 'projects/earthengine-public/assets/collection/filtered_feature',
-                'time': '1980-01-01T00:00:00Z'
+                'startTime': '1980-01-01T00:00:00Z'
             },
             {
                 'name': 'projects/earthengine-public/assets/collection/second_feature'
@@ -275,14 +275,14 @@ def test_eeda_2():
     assert f.GetField('name') == 'projects/earthengine-public/assets/collection/filtered_feature'
 
     # Test time equality with day granularity
-    lyr.SetAttributeFilter("time = '1980-01-01'")
+    lyr.SetAttributeFilter("startTime = '1980-01-01'")
 
     ogrtest.eeda_drv_tmpfile = '/vsimem/ee/projects/earthengine-public/assets/collection:listImages?startTime=1980%2D01%2D01T00%3A00%3A00Z&endTime=1980%2D01%2D01T23%3A59%3A59Z'
     gdal.FileFromMemBuffer(ogrtest.eeda_drv_tmpfile, json.dumps({
-        'assets': [
+        'images': [
             {
                 'name': 'projects/earthengine-public/assets/collection/filtered_feature',
-                'time': '1980-01-01T12:00:00Z',
+                'startTime': '1980-01-01T12:00:00Z',
             },
             {
                 'name': 'projects/earthengine-public/assets/collection/second_feature'
@@ -335,7 +335,7 @@ def test_eeda_4():
     # User asset ID ("users/**").
     ogrtest.eeda_drv_tmpfile = '/vsimem/ee/projects/earthengine-legacy/assets/users/foo:listImages?pageSize=1'
     gdal.FileFromMemBuffer(ogrtest.eeda_drv_tmpfile, json.dumps({
-        'assets': [
+        'images': [
             {
                 'name': 'projects/earthengine-legacy/assets/users/foo/bar'
             }
@@ -347,7 +347,7 @@ def test_eeda_4():
     # Project asset ID ("projects/**").
     ogrtest.eeda_drv_tmpfile = '/vsimem/ee/projects/earthengine-legacy/assets/projects/foo:listImages?pageSize=1'
     gdal.FileFromMemBuffer(ogrtest.eeda_drv_tmpfile, json.dumps({
-        'assets': [
+        'images': [
             {
                 'name': 'projects/earthengine-legacy/assets/projects/foo/bar'
             }
@@ -361,7 +361,7 @@ def test_eeda_4():
     # Multi-folder project asset ID ("projects/foo/bar/baz").
     ogrtest.eeda_drv_tmpfile = '/vsimem/ee/projects/earthengine-legacy/assets/projects/foo/bar/baz:listImages?pageSize=1'
     gdal.FileFromMemBuffer(ogrtest.eeda_drv_tmpfile, json.dumps({
-        'assets': [
+        'images': [
             {
                 'name': 'projects/earthengine-legacy/assets/projects/foo/bar/baz/qux'
             }
@@ -375,7 +375,7 @@ def test_eeda_4():
     # Public-catalog asset ID (e.g. "LANDSAT").
     ogrtest.eeda_drv_tmpfile = '/vsimem/ee/projects/earthengine-public/assets/foo:listImages?pageSize=1'
     gdal.FileFromMemBuffer(ogrtest.eeda_drv_tmpfile, json.dumps({
-        'assets': [
+        'images': [
             {
                 'name': 'projects/earthengine-public/assets/foo/bar'
             }
@@ -389,7 +389,7 @@ def test_eeda_4():
     # Asset name ("projects/*/assets/**").
     ogrtest.eeda_drv_tmpfile = '/vsimem/ee/projects/foo/assets/bar:listImages?pageSize=1'
     gdal.FileFromMemBuffer(ogrtest.eeda_drv_tmpfile, json.dumps({
-        'assets': [
+        'images': [
             {
                 'name': 'projects/foo/assets/bar/baz'
             }
diff --git a/gdal/frmts/eeda/eedacommon.cpp b/gdal/frmts/eeda/eedacommon.cpp
index 0ce5bdd8ef6f..f97ff0f0e631 100644
--- a/gdal/frmts/eeda/eedacommon.cpp
+++ b/gdal/frmts/eeda/eedacommon.cpp
@@ -65,7 +65,7 @@ std::vector<EEDAIBandDesc> BuildBandDescArray(json_object* poBands,
             continue;
         GDALDataType eDT = GDT_Byte;
         bool bSignedByte = false;
-        if( EQUAL(pszPrecision, "INTEGER") )
+        if( EQUAL(pszPrecision, "INT") )
         {
             json_object* poRange = CPL_json_object_object_get(poDataType,
                                                               "range");
@@ -108,11 +108,11 @@ std::vector<EEDAIBandDesc> BuildBandDescArray(json_object* poBands,
                 }
             }
         }
-        else if( EQUAL(pszPrecision, "FLOAT32") )
+        else if( EQUAL(pszPrecision, "FLOAT") )
         {
             eDT = GDT_Float32;
         }
-        else if( EQUAL(pszPrecision, "FLOAT64") )
+        else if( EQUAL(pszPrecision, "DOUBLE") )
         {
             eDT = GDT_Float64;
         }
diff --git a/gdal/frmts/eeda/eedadataset.cpp b/gdal/frmts/eeda/eedadataset.cpp
index 6bc2d0c78a6f..3d48dbf45a35 100644
--- a/gdal/frmts/eeda/eedadataset.cpp
+++ b/gdal/frmts/eeda/eedadataset.cpp
@@ -200,19 +200,19 @@ GDALEEDALayer::GDALEEDALayer(GDALEEDADataset* poDS,
         m_poFeatureDefn->AddFieldDefn(&oFieldDefn);
     }
     {
-        OGRFieldDefn oFieldDefn("path", OFTString);
+        OGRFieldDefn oFieldDefn("gdal_dataset", OFTString);
         m_poFeatureDefn->AddFieldDefn(&oFieldDefn);
     }
     {
-        OGRFieldDefn oFieldDefn("gdal_dataset", OFTString);
+        OGRFieldDefn oFieldDefn("updateTime", OFTDateTime);
         m_poFeatureDefn->AddFieldDefn(&oFieldDefn);
     }
     {
-        OGRFieldDefn oFieldDefn("time", OFTDateTime);
+        OGRFieldDefn oFieldDefn("startTime", OFTDateTime);
         m_poFeatureDefn->AddFieldDefn(&oFieldDefn);
     }
     {
-        OGRFieldDefn oFieldDefn("updateTime", OFTDateTime);
+        OGRFieldDefn oFieldDefn("endTime", OFTDateTime);
         m_poFeatureDefn->AddFieldDefn(&oFieldDefn);
     }
     {
@@ -442,7 +442,7 @@ OGRFeature* GDALEEDALayer::GetNextRawFeature()
             return nullptr;
 
         m_poCurPageAssets = CPL_json_object_object_get(
-                                                m_poCurPageObj, "assets");
+                                                m_poCurPageObj, "images");
     }
 
     if( m_poCurPageAssets == nullptr ||
@@ -503,15 +503,8 @@ OGRFeature* GDALEEDALayer::GetNextRawFeature()
         poFeature->SetField("id", pszId);
     }
 
-    const char* pszPath =
-        json_object_get_string(CPL_json_object_object_get(poAsset, "path"));
-    if ( pszPath )
-    {
-        poFeature->SetField("path", pszId);
-    }
-
     const char* const apszBaseProps[] =
-        { "time", "updateTime", "sizeBytes" };
+        { "updateTime", "startTime", "endTime", "sizeBytes" };
     for( size_t i = 0; i < CPL_ARRAYSIZE(apszBaseProps); i++ )
     {
         const char* pszVal = json_object_get_string(
@@ -806,7 +799,7 @@ CPLString GDALEEDALayer::BuildFilter(swq_expr_node* poNode, bool bIsAndTopLevel)
              poNode->papoSubExpr[0]->eNodeType == SNT_COLUMN &&
              poNode->papoSubExpr[1]->eNodeType == SNT_CONSTANT &&
              poNode->papoSubExpr[0]->field_index ==
-                    m_poFeatureDefn->GetFieldIndex("time") &&
+                    m_poFeatureDefn->GetFieldIndex("startTime") &&
              poNode->papoSubExpr[1]->field_type == SWQ_TIMESTAMP )
     {
         if( poNode->nOperation == SWQ_GE || poNode->nOperation == SWQ_EQ )
@@ -1120,7 +1113,7 @@ static json_object* GDALEEDADatasetGetConf()
 bool GDALEEDADataset::Open(GDALOpenInfo* poOpenInfo)
 {
     m_osBaseURL = CPLGetConfigOption("EEDA_URL",
-                            "https://earthengine.googleapis.com/v1/");
+                            "https://earthengine.googleapis.com/v1alpha/");
 
     CPLString osCollection =
             CSLFetchNameValueDef(poOpenInfo->papszOpenOptions, "COLLECTION", "");
@@ -1163,7 +1156,7 @@ bool GDALEEDADataset::Open(GDALOpenInfo* poOpenInfo)
     if( poRootAsset == nullptr )
         return false;
 
-    json_object* poAssets = CPL_json_object_object_get(poRootAsset, "assets");
+    json_object* poAssets = CPL_json_object_object_get(poRootAsset, "images");
     if( poAssets == nullptr ||
         json_object_get_type(poAssets) != json_type_array ||
         json_object_array_length(poAssets) != 1 )
diff --git a/gdal/frmts/eeda/eedaidataset.cpp b/gdal/frmts/eeda/eedaidataset.cpp
index 76162e341017..6d16fce57afd 100644
--- a/gdal/frmts/eeda/eedaidataset.cpp
+++ b/gdal/frmts/eeda/eedaidataset.cpp
@@ -1188,7 +1188,7 @@ bool GDALEEDAIDataset::ComputeQueryStrategy()
 
     if( EQUAL(m_osPixelEncoding, "PNG") ||
         EQUAL(m_osPixelEncoding, "JPEG") ||
-        EQUAL(m_osPixelEncoding, "AUTO_PNG_JPEG") )
+        EQUAL(m_osPixelEncoding, "AUTO_JPEG_PNG") )
     {
         if( nBands != 1 && nBands != 3 )
         {
@@ -1250,7 +1250,7 @@ CPLErr GDALEEDAIDataset::GetGeoTransform( double* adfGeoTransform )
 bool GDALEEDAIDataset::Open(GDALOpenInfo* poOpenInfo)
 {
     m_osBaseURL = CPLGetConfigOption("EEDA_URL",
-                            "https://earthengine.googleapis.com/v1/");
+                            "https://earthengine.googleapis.com/v1alpha/");
 
     m_osAsset =
             CSLFetchNameValueDef(poOpenInfo->papszOpenOptions, "ASSET", "");
@@ -1655,7 +1655,7 @@ void GDALRegister_EEDAI()
 "       <Value>PNG</Value>"
 "       <Value>JPEG</Value>"
 "       <Value>GEO_TIFF</Value>"
-"       <Value>AUTO_PNG_JPEG</Value>"
+"       <Value>AUTO_JPEG_PNG</Value>"
 "       <Value>NPY</Value>"
 "   </Option>"
 "  <Option name='BLOCK_SIZE' type='integer' "
diff --git a/gdal/frmts/eeda/frmt_eedai.html b/gdal/frmts/eeda/frmt_eedai.html
index df5631a4852c..6477c18fb179 100644
--- a/gdal/frmts/eeda/frmt_eedai.html
+++ b/gdal/frmts/eeda/frmt_eedai.html
@@ -28,7 +28,7 @@ <h2>Open options</h2>
 <li><b>ASSET</b>=string: To specify the asset if not specified in
 the connection string.</li>
 <li><b>BANDS</b>=bandname1[,bandnameX]*: Comma separated list of band names.</li>
-<li><b>PIXEL_ENCODING</b>=AUTO/PNG/JPEG/AUTO_PNG_JPEG/GEO_TIFF/NPY: Format in which to
+<li><b>PIXEL_ENCODING</b>=AUTO/PNG/JPEG/AUTO_JPEG_PNG/GEO_TIFF/NPY: Format in which to
 request pixels.</li>
 <li><b>BLOCK_SIZE</b>=integer: Size of a GDAL block, which is the minimum unit
 to query pixels. Default is 256.</li>
@@ -95,7 +95,7 @@ <h2>Pixel encoding</h2>
 
 By default (PIXEL_ENCODING=AUTO), the driver will request pixels in a format
 compatible of the number and data types of the bands. The PNG, JPEG and
-AUTO_PNG_JPEG can only be used with bands of type Byte.
+AUTO_JPEG_PNG can only be used with bands of type Byte.
 
 <h3>Examples</h3>
 

From d30dd0c8977373e766a86f1cba668c19ed24a418 Mon Sep 17 00:00:00 2001
From: Even Rouault <even.rouault@spatialys.com>
Date: Mon, 6 May 2019 11:38:01 +0200
Subject: [PATCH 302/488] PostgreSQL: do not attempt to create VARCHAR(n)
 columns with n >= 10485760 (fixes #1508)

---
 gdal/ogr/ogrsf_frmts/pgdump/ogrpgdumplayer.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/gdal/ogr/ogrsf_frmts/pgdump/ogrpgdumplayer.cpp b/gdal/ogr/ogrsf_frmts/pgdump/ogrpgdumplayer.cpp
index c8b14a921917..5ecd564f8139 100644
--- a/gdal/ogr/ogrsf_frmts/pgdump/ogrpgdumplayer.cpp
+++ b/gdal/ogr/ogrsf_frmts/pgdump/ogrpgdumplayer.cpp
@@ -1218,7 +1218,7 @@ CPLString OGRPGCommonLayerGetType( OGRFieldDefn& oField,
     {
         if (oField.GetSubType() == OFSTJSON )
             pszFieldType = CPLGetConfigOption("OGR_PG_JSON_TYPE", "JSON");
-        else if (oField.GetWidth() > 0 &&  bPreservePrecision )
+        else if (oField.GetWidth() > 0 && oField.GetWidth() < 10485760 && bPreservePrecision )
             pszFieldType = CPLSPrintf( "VARCHAR(%d)",  oField.GetWidth() );
         else
             pszFieldType = CPLGetConfigOption("OGR_PG_STRING_TYPE", "VARCHAR");

From c22948b973f57fb9c0503ba18991ca5b07dcaf1e Mon Sep 17 00:00:00 2001
From: Even Rouault <even.rouault@spatialys.com>
Date: Mon, 6 May 2019 12:04:39 +0200
Subject: [PATCH 303/488] ISIS3: fix parsing of lists in JSon metadata, and
 quote string items when writing lists when needed (fixes #1510)

---
 ...037339_15142232818F1C_3bands_truncated.cub | 80 +++++++++++++++++++
 autotest/gdrivers/isis.py                     | 18 +++++
 gdal/frmts/pds/isis3dataset.cpp               | 10 ++-
 gdal/frmts/pds/nasakeywordhandler.cpp         |  3 +
 4 files changed, 110 insertions(+), 1 deletion(-)
 create mode 100644 autotest/gdrivers/data/FC21B0037339_15142232818F1C_3bands_truncated.cub

diff --git a/autotest/gdrivers/data/FC21B0037339_15142232818F1C_3bands_truncated.cub b/autotest/gdrivers/data/FC21B0037339_15142232818F1C_3bands_truncated.cub
new file mode 100644
index 000000000000..22e160006720
--- /dev/null
+++ b/autotest/gdrivers/data/FC21B0037339_15142232818F1C_3bands_truncated.cub
@@ -0,0 +1,80 @@
+Object = IsisCube
+  Object = Core
+    StartByte   = 1
+    Format      = Tile
+    TileSamples = 1
+    TileLines   = 1
+
+    Group = Dimensions
+      Samples = 1
+      Lines   = 1
+      Bands   = 3
+    End_Group
+
+    Group = Pixels
+      Type       = Real
+      ByteOrder  = Lsb
+      Base       = 0.0
+      Multiplier = 1.0
+    End_Group
+  End_Object
+
+  Group = Instrument
+    SpacecraftName            = DAWN
+    InstrumentId              = FC2
+    SpacecraftClockStartCount = 485609365:149
+    SpacecraftClockStopCount  = 485609365:214
+    StartTime                 = 2015-142T23:28:18.858
+    StopTime                  = 2015-142T23:28:19.112
+    ExposureDuration          = 60.000 <millisecond>
+    PixelAveragingWidth       = 1
+    PixelAveragingHeight      = 1
+    TargetName                = CERES
+    OriginalTargetName        = "1 CERES"
+    OrbitNumber               = N/A
+    FirstLine                 = 17
+    FirstLineSample           = 35
+  End_Group
+
+  Group = Archive
+    FileName                = FC21B0037339_15142232818F1C.IMG
+    SoftwareName            = CALLIOPE
+    SoftwareVersionId       = 3.01
+    DataSetName             = "DAWN FC2 CALIBRATED CERES IMAGES V1.0"
+    DataSetId               = DAWN-A-FC2-3-RDR-CERES-IMAGES-V1.0
+    ProductId               = 0037339
+    ProductType             = DATA
+    StandardDataProductId   = FC_IMAGE
+    ObservationId           = NAV_CTS_OpNav9_001
+    ProducerFullName        = "PABLO GUTIERREZ-MARQUES"
+    ProducerInstitutionName = "MAX PLANCK INSTITUT FUER SONNENSYSTEMFORSCHUNG"
+    ProductCreationTime     = 2016-04-17T14:22:52.000
+    ProductVersionId        = C
+    ReleaseId               = N/A
+  End_Group
+
+  Group = BandBin
+    FilterNumber = (1, 1, 1)
+    Center       = (700, 700, 700)
+    Width        = (700, 700, 700)
+    FilterName   = (Clear_F1, Clear_F1, Clear_F1)
+    Name         = ("band 1","band 2","band 3")
+  End_Group
+
+  Group = Kernels
+    NaifFrameCode = -203121
+  End_Group
+
+  Group = AlphaCube
+    AlphaSamples        = 1024
+    AlphaLines          = 1024
+    AlphaStartingSample = 299.5
+    AlphaStartingLine   = 0.5
+    AlphaEndingSample   = 599.5
+    AlphaEndingLine     = 300.5
+    BetaSamples         = 300
+    BetaLines           = 300
+  End_Group
+End_Object
+
+End
diff --git a/autotest/gdrivers/isis.py b/autotest/gdrivers/isis.py
index 25aee241fa2f..b68223386854 100755
--- a/autotest/gdrivers/isis.py
+++ b/autotest/gdrivers/isis.py
@@ -1400,3 +1400,21 @@ def test_isis_31():
 
 
 
+
+###############################################################################
+# Test bugfix https://github.com/OSGeo/gdal/issues/1510
+
+def test_isis3_parse_list_and_write_quote_string_in_list():
+
+    src_ds = gdal.Open('data/FC21B0037339_15142232818F1C_3bands_truncated.cub')
+    gdal.GetDriverByName('ISIS3').CreateCopy('/vsimem/temp.lbl', src_ds,
+                                            options=['DATA_LOCATION=EXTERNAL'])
+    f = gdal.VSIFOpenL('/vsimem/temp.lbl', 'rb')
+    if f:
+        data = gdal.VSIFReadL(1, 10000, f).decode('ascii')
+        gdal.VSIFCloseL(f)
+    assert 'FilterNumber = (1, 1, 1)' in data, data
+    assert 'FilterName   = (Clear_F1, Clear_F1, Clear_F1)' in data, data
+    assert 'Name         = ("band 1", "band 2", "band 3")' in data, data
+    gdal.GetDriverByName('ISIS3').Delete('/vsimem/temp.lbl')
+
diff --git a/gdal/frmts/pds/isis3dataset.cpp b/gdal/frmts/pds/isis3dataset.cpp
index 91be8669b510..e20a0c32a87d 100644
--- a/gdal/frmts/pds/isis3dataset.cpp
+++ b/gdal/frmts/pds/isis3dataset.cpp
@@ -3581,7 +3581,15 @@ void ISIS3Dataset::SerializeAsPDL( VSILFILE* fp, const CPLJSONObject &oObj,
                 {
                     CPLString osVal = oItem.ToString();
                     const char* pszVal = osVal.c_str();
-                    if( nFirstPos < WIDTH && nCurPos + strlen(pszVal) > WIDTH )
+                    if( pszVal[0] == '\0' ||
+                        strchr(pszVal, ' ') || strstr(pszVal, "\\n") ||
+                        strstr(pszVal, "\\r") )
+                    {
+                        osVal.replaceAll("\\n", "\n");
+                        osVal.replaceAll("\\r", "\r");
+                        VSIFPrintfL(fp, "\"%s\"", osVal.c_str());
+                    }
+                    else if( nFirstPos < WIDTH && nCurPos + strlen(pszVal) > WIDTH )
                     {
                         if( idx > 0 )
                         {
diff --git a/gdal/frmts/pds/nasakeywordhandler.cpp b/gdal/frmts/pds/nasakeywordhandler.cpp
index 6c2f539460a7..2777f3b90a27 100644
--- a/gdal/frmts/pds/nasakeywordhandler.cpp
+++ b/gdal/frmts/pds/nasakeywordhandler.cpp
@@ -244,6 +244,9 @@ int NASAKeywordHandler::ReadPair( CPLString &osName, CPLString &osValue,
         std::vector<char> oStackArrayBeginChar;
         CPLString osWord;
 
+        oStackArrayBeginChar.push_back(*pszHeaderNext);
+        osValue += *pszHeaderNext;
+        pszHeaderNext++;
 
         while( ReadWord( osWord, m_bStripSurroundingQuotes,
                          true, &bIsString ) )

From 3e8c17791dd8141ae572ebec5b80ad69217d0320 Mon Sep 17 00:00:00 2001
From: Even Rouault <even.rouault@spatialys.com>
Date: Mon, 6 May 2019 22:46:12 +0200
Subject: [PATCH 304/488] GPKG: change default value of
 OGR_GPKG_FOREIGN_KEY_CHECK to NO, so as to avoid issues in downstream
 software

---
 gdal/ogr/ogrsf_frmts/gpkg/ogrgeopackagedatasource.cpp | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/gdal/ogr/ogrsf_frmts/gpkg/ogrgeopackagedatasource.cpp b/gdal/ogr/ogrsf_frmts/gpkg/ogrgeopackagedatasource.cpp
index c5a9a3a0338a..7d07de87a7e2 100644
--- a/gdal/ogr/ogrsf_frmts/gpkg/ogrgeopackagedatasource.cpp
+++ b/gdal/ogr/ogrsf_frmts/gpkg/ogrgeopackagedatasource.cpp
@@ -979,13 +979,13 @@ int GDALGeoPackageDataset::Open( GDALOpenInfo* poOpenInfo )
     /* Requirement 7: The SQLite PRAGMA foreign_key_check() SQL with no */
     /* parameter value SHALL return an empty result set */
     /* http://opengis.github.io/geopackage/#_file_integrity */
-    if ( CPLTestBool(CPLGetConfigOption("OGR_GPKG_FOREIGN_KEY_CHECK", "YES")) &&
+    /* Disable the check by default, since it is to corrupt databases, and */
+    /* that causes issues to downstream software that can't open them. */
+    if ( CPLTestBool(CPLGetConfigOption("OGR_GPKG_FOREIGN_KEY_CHECK", "NO")) &&
          OGRERR_NONE != PragmaCheck("foreign_key_check", "", 0) )
     {
         CPLError( CE_Failure, CPLE_AppDefined,
-                  "pragma foreign_key_check on '%s' failed. You can disable "
-                  "this check by setting the OGR_GPKG_FOREIGN_KEY_CHECK "
-                  "configuration option to NO",
+                  "pragma foreign_key_check on '%s' failed.",
                   m_pszFilename);
         return FALSE;
     }

From fa35eb8596b89d6b11dc8e80536c790f0a0090b2 Mon Sep 17 00:00:00 2001
From: jw-rs <50347666+jw-rs@users.noreply.github.com>
Date: Tue, 7 May 2019 12:59:55 +1000
Subject: [PATCH 305/488] Update gdal_calc.py

Fixed NaN-streaking in output images when the --allBands option is given to tiled images, and removed redundant calculation of nXValid.
---
 gdal/swig/python/scripts/gdal_calc.py | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/gdal/swig/python/scripts/gdal_calc.py b/gdal/swig/python/scripts/gdal_calc.py
index 0de825971912..34421a67538c 100755
--- a/gdal/swig/python/scripts/gdal_calc.py
+++ b/gdal/swig/python/scripts/gdal_calc.py
@@ -249,9 +249,6 @@ def doit(opts, args):
 
     # use the block size of the first layer to read efficiently
     myBlockSize = myFiles[0].GetRasterBand(myBands[0]).GetBlockSize()
-    # store these numbers in variables that may change later
-    nXValid = myBlockSize[0]
-    nYValid = myBlockSize[1]
     # find total x and y blocks to be read
     nXBlocks = (int)((DimensionsCheck[0] + myBlockSize[0] - 1) / myBlockSize[0])
     nYBlocks = (int)((DimensionsCheck[1] + myBlockSize[1] - 1) / myBlockSize[1])
@@ -274,15 +271,18 @@ def doit(opts, args):
         ################################################################
         # start looping through blocks of data
         ################################################################
+        
+        # store these numbers in variables that may change later
+        nXValid = myBlockSize[0]
+        nYValid = myBlockSize[1]
 
         # loop through X-lines
         for X in range(0, nXBlocks):
 
-            # in the rare (impossible?) case that the blocks don't fit perfectly
+            # in case the blocks don't fit perfectly
             # change the block size of the final piece
             if X == nXBlocks - 1:
                 nXValid = DimensionsCheck[0] - X * myBlockSize[0]
-                myBufSize = nXValid * nYValid
 
             # find X offset
             myX = X * myBlockSize[0]

From cc20682d36d7147ec5c47be91b1f2c01f1e16040 Mon Sep 17 00:00:00 2001
From: Even Rouault <even.rouault@spatialys.com>
Date: Wed, 8 May 2019 19:35:25 +0200
Subject: [PATCH 306/488] NITF: fix parsing of SENSRB TRE (fixes #1520)

---
 autotest/gdrivers/data/SENSRB_TRE.ntf | Bin 0 -> 3015 bytes
 autotest/gdrivers/nitf.py             | 114 ++++++++++++++++++++++++++
 gdal/frmts/nitf/nitffile.c            |  30 ++++++-
 3 files changed, 143 insertions(+), 1 deletion(-)
 create mode 100644 autotest/gdrivers/data/SENSRB_TRE.ntf

diff --git a/autotest/gdrivers/data/SENSRB_TRE.ntf b/autotest/gdrivers/data/SENSRB_TRE.ntf
new file mode 100644
index 0000000000000000000000000000000000000000..5e1404219a9eef766fa49e98ae209ac0b1d103fb
GIT binary patch
literal 3015
zcmdT@S#KQ25!O%fFA!#zryk=Z4itoRU`mP^i{9mOckcV_xqI%J-Px1pk`zy^gfKE?
zNp_S#att^Jf&>Bb0}>#wdCFsgJOr5~Ma!Y|U<C3*zQJ^Le_d5wT~$4Q{l+^;`DzJ4
zCf<GrDShud-}=E@XDA~`xl}Gqm!?Y7<!k5Mn;UPwIalALC*&orT)Fb~Pr5LhKuS}^
ze6skEBE==7RE%SkrqAVT$Ln)*gd`CxRvh@vmf@8f{lC=ZCQGrL#=a8&tHgPRi~OHq
z61hHqWA5GgcgKpit}mSFBeU<lh0K4uH21=KzK{s=c408CR`HLmi+}c<ICFG1l&&I$
z;u)r9ib^31-<@B0uP~gNnq7S1>`jTAbLYW+Eq{|QwU~Ni+(&145$g+4MoQO^DP-ns
zIXih3nYuPReGNe_w7)7}bDRHm_P?zrzC2@c=H<DQGo`Qa<uB*2pG;0nPfnDlXI{U1
zQJ+`h8><&&8JVsXVxn{jWBoBzzJv>Y;u0=+WV%sI%afNd-k!RIF?Ru+mc1-gMJtSx
zG)*EuZbF*%e1WyHmQ4|=#uz)Jtv1C22n`uTsTcNo5e(x%XGQ2Rl$FMoD4I4fv-PbZ
zr$Sev1h1d#aA(&8aiXz;0W}P_VrbgXj}nVD*6(pz5Gb6Mtfhi+XBY5UQy}yZignV7
z9n+8eAXF+uJY-~8L={G{#erVVvuUpIF!dyogK1zJI#76;=0wS~+&Ir;2S}2g2BP4{
zhH84QLQ){kLxtf*PLL&r9CTvnc@8Kn!Zfs0O*et0SQ=TU;h?Qxj1hW@s5|{$9_YX_
z6+KKm+XA9kEDXcYW!~<!l{#VMxdnnI%+~r|kvtbBp~_2&EGk~NWx@4zuSks4Xb66%
zlLl@!*gITrcYAr_Ikuq)yrhS{rkRZHhO*@dB*UxS(@{X5espqja=f{^(bDwxz~c$t
z4Q<V69}g8&HYL$Al#Sni7A*bY*H2GR?{BTG=Q@bm5#U4zYKqg{&hV-V0f^J^&KHl|
z5C8bPXFuKF9P~PQtW&HLIjU;-aop^>jk=XMdN9~K-bpp~mp?z*U2Dfl-ffx$WrdE!
zYFQ_AT#X=g52|AR_#>yzXrtXc9dt~)JMc{yx`3x>5XA=12?9&<wp1~nJkb|XDfeZ)
z*HNTq-?P&^06Z%i&@%;$l=*5+Q&DyQK>M&xIU1{Esm$3)(H@o`Ld!HwFEX*ZC@fb+
z*KvJYBrwdeO<gyNT4}B$i)NSvmZn<1Nz@sEW;7Vu0;}n=kTi1}r-Fz_d0kg{#q(rV
zR3xrw62){~UF1X^2ELc~Rs)hvVq%H5po+6$#N&cUkgA`xvcQsP4tQbU!>rkgEGN=y
zRW<S@RP1!chM;gF-2BO?t+Bjn8Wyw^-mz^zjSP;Gyu_0!&`GdcHIU^|=Ws7za9T7R
z#}G+WRW&=bS=KGO*8&o7rN!^xFz(*-7|jxC8n4lAZ1N0~#DT4{q?)!Y)ifoB;RI31
z4z@wH(!fZHz!<&gUmJ{$hdx>7oxl=A%cLvI=KiOTc07?|NrFIE80c`u&QZ^M_~0;M
zaM`sboRAczTCpGe>XU(tv4&%-=m%6QW0d2E!}MTxHE}hecoBGIg_f8VzPo125XyS1
z7tkM|K_ctJqqVG;T6X4>4GA!{D#}t-R97mEFb7(`8mk<y7flvMS>E+IAr0#9<Fd$6
zX!Xa74PY=dC?1{{*sv9=)>>Df-S&DStL-MWSfK=oLn~EMlr=-;C{~bVC0OeMH3<k*
z3-&jgt>K14)*2K`VkAg?3YE2DNzk0^WSPxjI48@}qX$QK?rg-4rO{N;nnm&021%pU
zN)5wt!GX&1!fh=u<<Flz9t}HjcW+(gpo85;MU}5D)#}SNtiFUhF7cy9+>9gt>C-0%
z8O*ltZhOE1D~q=qB)ate(sG>?1V;9Y1{bY3@vMXU4-b4eJnTk^%QOf<#ut8AMVFQ+
z0JDBO%7)u{){FR+wbAFl{rL2=(?Bo`szKWsxOEG}KytIr=HXVHY#$7oEr(j({p2tI
z{@36C`n<zof@MoaFIV-=`v+Sa>#M7Sc3>Hf?`o2wojm{ZKmYN!KRwy<B(uBGZua`!
z{?_4Wzn_F&@p6O)Cd)XXIFEnv#c!TH9PMpy3<euV4~{$OpkKU(mdW!1$8r=#N<yPf
pi$DAH<D-6(^tO*i`@?(BALm}bBT~9a)#^Aw5G2J*Ji3As{{h7{^^pJo

literal 0
HcmV?d00001

diff --git a/autotest/gdrivers/nitf.py b/autotest/gdrivers/nitf.py
index 5b0e62ae5580..4b786d0c0635 100755
--- a/autotest/gdrivers/nitf.py
+++ b/autotest/gdrivers/nitf.py
@@ -2573,6 +2573,120 @@ def test_nitf_read_C4():
     cs = ds.GetRasterBand(1).Checksum()
     assert cs == 53599
 
+###############################################################################
+# Test reading a file with a SENSRB TRE
+
+
+def test_nitf_SENSRB():
+
+    ds = gdal.Open('data/SENSRB_TRE.ntf')
+    data = ds.GetMetadata('xml:TRE')[0]
+    ds = None
+
+    expected_data = """<tres>
+  <tre name="SENSRB" location="image">
+    <field name="GENERAL_DATA" value="Y" />
+    <field name="SENSOR" value="" />
+    <field name="SENSOR_URI" value="" />
+    <field name="PLATFORM" value="                      UMS" />
+    <field name="PLATFORM_URI" value="" />
+    <field name="OPERATION_DOMAIN" value="" />
+    <field name="CONTENT_LEVEL" value="4" />
+    <field name="GEODETIC_SYSTEM" value="" />
+    <field name="GEODETIC_TYPE" value="" />
+    <field name="ELEVATION_DATUM" value="" />
+    <field name="LENGTH_UNIT" value=" m" />
+    <field name="ANGULAR_UNIT" value="deg" />
+    <field name="START_DATE" value="" />
+    <field name="START_TIME" value="00000000000000" />
+    <field name="END_DATE" value="20190507" />
+    <field name="END_TIME" value="0000084.059869" />
+    <field name="GENERATION_COUNT" value="00" />
+    <field name="GENERATION_DATE" value="" />
+    <field name="GENERATION_TIME" value="" />
+    <field name="SENSOR_ARRAY_DATA" value="" />
+    <field name="SENSOR_CALIBRATION_DATA" value="" />
+    <field name="IMAGE_FORMATION_DATA" value="Y" />
+    <field name="METHOD" value="" />
+    <field name="MODE" value="" />
+    <field name="ROW_COUNT" value="00000000" />
+    <field name="COLUMN_COUNT" value="00000000" />
+    <field name="ROW_SET" value="00000000" />
+    <field name="COLUMN_SET" value="00000000" />
+    <field name="ROW_RATE" value="0000000000" />
+    <field name="COLUMN_RATE" value="0000000000" />
+    <field name="FIRST_PIXEL_ROW" value="00000000" />
+    <field name="FIRST_PIXEL_COLUMN" value="00000000" />
+    <field name="TRANSFORM_PARAMS" value="3" />
+    <repeated name="TRANSFORM_PARAM" number="3">
+      <group index="0">
+        <field name="TRANSFORM_PARAM" value="         470" />
+      </group>
+      <group index="1">
+        <field name="TRANSFORM_PARAM" value="         471" />
+      </group>
+      <group index="2">
+        <field name="TRANSFORM_PARAM" value="         472" />
+      </group>
+    </repeated>
+    <field name="REFERENCE_TIME" value="" />
+    <field name="REFERENCE_ROW" value="" />
+    <field name="REFERENCE_COLUMN" value="" />
+    <field name="LATITUDE_OR_X" value="   43643267" />
+    <field name="LONGITUDE_OR_Y" value="" />
+    <field name="ALTITUDE_OR_Z" value="" />
+    <field name="SENSOR_X_OFFSET" value="00000000" />
+    <field name="SENSOR_Y_OFFSET" value="00000000" />
+    <field name="SENSOR_Z_OFFSET" value="00000000" />
+    <field name="ATTITUDE_EULER_ANGLES" value="" />
+    <field name="ATTITUDE_UNIT_VECTORS" value="" />
+    <field name="ATTITUDE_QUATERNION" value="" />
+    <field name="SENSOR_VELOCITY_DATA" value="" />
+    <field name="POINT_SET_DATA" value="00" />
+    <field name="TIME_STAMPED_DATA_SETS" value="02" />
+    <repeated name="TIME_STAMPED_SET" number="2">
+      <group index="0">
+        <field name="TIME_STAMP_TYPE_MM" value="06b" />
+        <field name="TIME_STAMP_COUNT_MM" value="0003" />
+        <repeated name="TIME_STAMP_COUNTS" number="3">
+          <group index="0">
+            <field name="TIME_STAMP_TIME_NNNN" value="111111111111" />
+            <field name="TIME_STAMP_VALUE_NNNN" value="111100001111" />
+          </group>
+          <group index="1">
+            <field name="TIME_STAMP_TIME_NNNN" value="222222222222" />
+            <field name="TIME_STAMP_VALUE_NNNN" value="222200001111" />
+          </group>
+          <group index="2">
+            <field name="TIME_STAMP_TIME_NNNN" value="333333333333" />
+            <field name="TIME_STAMP_VALUE_NNNN" value="333300001111" />
+          </group>
+        </repeated>
+      </group>
+      <group index="1">
+        <field name="TIME_STAMP_TYPE_MM" value="06e" />
+        <field name="TIME_STAMP_COUNT_MM" value="0002" />
+        <repeated name="TIME_STAMP_COUNTS" number="2">
+          <group index="0">
+            <field name="TIME_STAMP_TIME_NNNN" value="444444444444" />
+            <field name="TIME_STAMP_VALUE_NNNN" value="44440000" />
+          </group>
+          <group index="1">
+            <field name="TIME_STAMP_TIME_NNNN" value="555555555555" />
+            <field name="TIME_STAMP_VALUE_NNNN" value="55550000" />
+          </group>
+        </repeated>
+      </group>
+    </repeated>
+    <field name="PIXEL_REFERENCED_DATA_SETS" value="00" />
+    <field name="UNCERTAINTY_DATA" value="000" />
+    <field name="ADDITIONAL_PARAMETER_DATA" value="000" />
+  </tre>
+</tres>
+"""
+
+    assert data == expected_data, data
+
 ###############################################################################
 # Test NITF21_CGM_ANNO_Uncompressed_unmasked.ntf for bug #1313 and #1714
 
diff --git a/gdal/frmts/nitf/nitffile.c b/gdal/frmts/nitf/nitffile.c
index 5cb6f922e845..f9ae5bd9df41 100644
--- a/gdal/frmts/nitf/nitffile.c
+++ b/gdal/frmts/nitf/nitffile.c
@@ -2562,9 +2562,37 @@ static char** NITFGenericMetadataReadTREInternal(char **papszMD,
                             CPLSPrintf("%s%s", pszMDPrefix, pszCondVar));
                 pszCondVal = NITFFindValFromEnd(papszMD, *pnMDSize, pszMDItemName, NULL);
                 if (pszCondVal == NULL)
+                {
+                    /* Needed for SENSRB */
+                    /* See https://github.com/OSGeo/gdal/issues/1520 */
+                    /* If the condition variable is not found at this level, */
+                    /* try to research it at upper levels by shortening on _ */
+                    /* separators */
+                    char* pszMDPrefixShortened = CPLStrdup(pszMDPrefix);
+                    char* pszLastUnderscore = strrchr(pszMDPrefixShortened, '_');
+                    if( pszLastUnderscore )
+                    {
+                        *pszLastUnderscore = 0;
+                        pszLastUnderscore = strrchr(pszMDPrefixShortened, '_');
+                    }
+                    while( pszLastUnderscore )
+                    {
+                        pszLastUnderscore[1] = 0;
+                        CPLFree(pszMDItemName);
+                        pszMDItemName = CPLStrdup(
+                            CPLSPrintf("%s%s", pszMDPrefixShortened, pszCondVar));
+                        pszCondVal = NITFFindValFromEnd(papszMD, *pnMDSize, pszMDItemName, NULL);
+                        if( pszCondVal )
+                            break;
+                        *pszLastUnderscore = 0;
+                        pszLastUnderscore = strrchr(pszMDPrefixShortened, '_');
+                    }
+                    CPLFree(pszMDPrefixShortened);
+                }
+                if( pszCondVal == NULL )
                 {
                     CPLDebug("NITF", "Cannot find if cond variable %s",
-                             pszMDItemName);
+                            pszCondVar);
                 }
                 else if ((bTestEqual && strcmp(pszCondVal, pszCondExpectedVal) == 0) ||
                          (!bTestEqual && strcmp(pszCondVal, pszCondExpectedVal) != 0))

From d93d125718049bfcd8acc960fff242f187b745c6 Mon Sep 17 00:00:00 2001
From: Even Rouault <even.rouault@spatialys.com>
Date: Thu, 9 May 2019 12:28:10 +0200
Subject: [PATCH 307/488] Shape: better deal with empty .shp+.shx and
 SHAPE_RESTORE_SHX (fixes #1525)

---
 autotest/ogr/ogr_shape.py                     | 32 +++++++++++++++++++
 .../ogrsf_frmts/shape/ogrshapedatasource.cpp  | 25 +++++++++++----
 gdal/ogr/ogrsf_frmts/shape/shpopen.c          | 21 ++++++------
 3 files changed, 63 insertions(+), 15 deletions(-)

diff --git a/autotest/ogr/ogr_shape.py b/autotest/ogr/ogr_shape.py
index 8e6daec43751..08b5acd0d4e6 100755
--- a/autotest/ogr/ogr_shape.py
+++ b/autotest/ogr/ogr_shape.py
@@ -4534,6 +4534,38 @@ def test_ogr_shape_112_delete_layer():
 
     shape_drv.DeleteDataSource(dirname)
 
+
+###############################################################################
+
+
+def test_ogr_shape_113_restore_shx_empty_shp_shx():
+
+    dirname = '/vsimem/test_ogr_shape_113_restore_shx_empty_shp_shx'
+    dbfname = dirname + "/foo.dbf"
+    shape_drv = ogr.GetDriverByName('ESRI Shapefile')
+    ds = shape_drv.CreateDataSource(dbfname)
+    lyr = ds.CreateLayer("test")
+    lyr.CreateField(ogr.FieldDefn("foo"))
+    f = ogr.Feature(lyr.GetLayerDefn())
+    f['foo'] = 'bar'
+    lyr.CreateFeature(f)
+    ds = None
+
+    gdal.FileFromMemBuffer(dirname + '/foo.shp', '')
+    gdal.FileFromMemBuffer(dirname + '/foo.shx', '')
+
+    with gdaltest.config_option('SHAPE_RESTORE_SHX', 'YES'):
+        with gdaltest.error_handler():
+            ds = ogr.Open(dbfname)
+    assert ds
+    lyr = ds.GetLayer(0)
+    f = lyr.GetNextFeature()
+    assert f['foo'] == 'bar'
+    ds = None
+
+    shape_drv.DeleteDataSource(dbfname)
+
+
 ###############################################################################
 
 
diff --git a/gdal/ogr/ogrsf_frmts/shape/ogrshapedatasource.cpp b/gdal/ogr/ogrsf_frmts/shape/ogrshapedatasource.cpp
index ab000555c537..73593262c074 100644
--- a/gdal/ogr/ogrsf_frmts/shape/ogrshapedatasource.cpp
+++ b/gdal/ogr/ogrsf_frmts/shape/ogrshapedatasource.cpp
@@ -345,23 +345,36 @@ bool OGRShapeDataSource::OpenFile( const char *pszNewName, bool bUpdate )
 /*      Care is taken to suppress the error and only reissue it if      */
 /*      we think it is appropriate.                                     */
 /* -------------------------------------------------------------------- */
+    CPLErrorReset();
     CPLPushErrorHandler( CPLQuietErrorHandler );
     SHPHandle hSHP = bUpdate ?
         DS_SHPOpen( pszNewName, "r+" ) :
         DS_SHPOpen( pszNewName, "r" );
     CPLPopErrorHandler();
 
-    if( hSHP == nullptr
-        && (!EQUAL(CPLGetExtension(pszNewName),"dbf")
-            || strstr(CPLGetLastErrorMsg(),".shp") == nullptr) )
+    const bool bRestoreSHX =
+        CPLTestBool( CPLGetConfigOption("SHAPE_RESTORE_SHX", "FALSE") );
+    if( bRestoreSHX && EQUAL(CPLGetExtension(pszNewName),"dbf") &&
+        CPLGetLastErrorMsg()[0] != '\0' )
     {
         CPLString osMsg = CPLGetLastErrorMsg();
 
-        CPLError( CE_Failure, CPLE_OpenFailed, "%s", osMsg.c_str() );
+        CPLError( CE_Warning, CPLE_AppDefined, "%s", osMsg.c_str() );
+    }
+    else
+    {
+        if( hSHP == nullptr
+            && (!EQUAL(CPLGetExtension(pszNewName),"dbf")
+                || strstr(CPLGetLastErrorMsg(),".shp") == nullptr) )
+        {
+            CPLString osMsg = CPLGetLastErrorMsg();
 
-        return false;
+            CPLError( CE_Failure, CPLE_OpenFailed, "%s", osMsg.c_str() );
+
+            return false;
+        }
+        CPLErrorReset();
     }
-    CPLErrorReset();
 
 /* -------------------------------------------------------------------- */
 /*      Open the .dbf file, if it exists.  To open a dbf file, the      */
diff --git a/gdal/ogr/ogrsf_frmts/shape/shpopen.c b/gdal/ogr/ogrsf_frmts/shape/shpopen.c
index 195017be8698..7d6385ecb2c5 100644
--- a/gdal/ogr/ogrsf_frmts/shape/shpopen.c
+++ b/gdal/ogr/ogrsf_frmts/shape/shpopen.c
@@ -1029,7 +1029,16 @@ SHPRestoreSHX ( const char * pszLayer, const char * pszAccess, SAHooks *psHooks
 /*  Read the file size from the SHP file.                               */
 /* -------------------------------------------------------------------- */
     pabyBuf = STATIC_CAST(uchar *, malloc(100));
-    psHooks->FRead( pabyBuf, 100, 1, fpSHP );
+    if( psHooks->FRead( pabyBuf, 100, 1, fpSHP ) != 1 )
+    {
+        psHooks->Error( ".shp file is unreadable, or corrupt." );
+        psHooks->FClose( fpSHP );
+
+        free( pabyBuf );
+        free( pszFullname );
+
+        return( 0 );
+    }
 
     nSHPFilesize = (STATIC_CAST(unsigned int, pabyBuf[24])<<24)|(pabyBuf[25]<<16)|
                    (pabyBuf[26]<<8)|pabyBuf[27];
@@ -1040,24 +1049,18 @@ SHPRestoreSHX ( const char * pszLayer, const char * pszAccess, SAHooks *psHooks
 
     memcpy(pszFullname + nLenWithoutExtension, ".shx", 5);
     fpSHX = psHooks->FOpen( pszFullname, pszSHXAccess );
-    if( fpSHX == SHPLIB_NULLPTR )
-    {
-        memcpy(pszFullname + nLenWithoutExtension, ".SHX", 5);
-        fpSHP = psHooks->FOpen(pszFullname, pszAccess );
-    }
-
     if( fpSHX == SHPLIB_NULLPTR )
     {
         size_t nMessageLen = strlen( pszFullname ) * 2 + 256;
         char* pszMessage = STATIC_CAST(char *, malloc( nMessageLen ));
         pszFullname[nLenWithoutExtension] = 0;
         snprintf( pszMessage, nMessageLen,
-                  "Error opening file %s.shx or %s.SHX for writing",
-                  pszFullname, pszFullname );
+                  "Error opening file %s.shx for writing", pszFullname );
         psHooks->Error( pszMessage );
         free( pszMessage );
 
         psHooks->FClose( fpSHX );
+        psHooks->FClose( fpSHP );
 
         free( pabyBuf );
         free( pszFullname );

From acbe3221c8ecffee3c66c5b0e42e539859e736b2 Mon Sep 17 00:00:00 2001
From: Even Rouault <even.rouault@spatialys.com>
Date: Thu, 9 May 2019 12:31:42 +0200
Subject: [PATCH 308/488] SHPRestoreSHX(): fix crash when .shx file cannot be
 created (and a memleak)

---
 gdal/ogr/ogrsf_frmts/shape/shpopen.c | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/gdal/ogr/ogrsf_frmts/shape/shpopen.c b/gdal/ogr/ogrsf_frmts/shape/shpopen.c
index 7d6385ecb2c5..49a3e813ccde 100644
--- a/gdal/ogr/ogrsf_frmts/shape/shpopen.c
+++ b/gdal/ogr/ogrsf_frmts/shape/shpopen.c
@@ -1059,7 +1059,6 @@ SHPRestoreSHX ( const char * pszLayer, const char * pszAccess, SAHooks *psHooks
         psHooks->Error( pszMessage );
         free( pszMessage );
 
-        psHooks->FClose( fpSHX );
         psHooks->FClose( fpSHP );
 
         free( pabyBuf );
@@ -1075,6 +1074,7 @@ SHPRestoreSHX ( const char * pszLayer, const char * pszAccess, SAHooks *psHooks
     pabySHXHeader = STATIC_CAST(char *, malloc ( 100 ));
     memcpy( pabySHXHeader, pabyBuf, 100 );
     psHooks->FWrite( pabySHXHeader, 100, 1, fpSHX );
+    free ( pabyBuf );
 
     while( nCurrentSHPOffset < nSHPFilesize )
     {
@@ -1118,7 +1118,6 @@ SHPRestoreSHX ( const char * pszLayer, const char * pszAccess, SAHooks *psHooks
     psHooks->FClose( fpSHP );
     psHooks->FClose( fpSHX );
 
-    free ( pabyBuf );
     free ( pszFullname );
     free ( pabySHXHeader );
 

From 58a4a80a17eba8916f07651edc7068817069d9ad Mon Sep 17 00:00:00 2001
From: Even Rouault <even.rouault@spatialys.com>
Date: Thu, 9 May 2019 21:02:09 +0200
Subject: [PATCH 309/488] GXF: avoid closing the file pointer before being sure
 this is a GXF driver, otherwise this can prevent the opening of some raw
 format files (fixes #1521)

---
 gdal/frmts/gxf/gxfdataset.cpp | 20 +++++++-------------
 1 file changed, 7 insertions(+), 13 deletions(-)

diff --git a/gdal/frmts/gxf/gxfdataset.cpp b/gdal/frmts/gxf/gxfdataset.cpp
index deeec96b82e6..1d6b18f28335 100644
--- a/gdal/frmts/gxf/gxfdataset.cpp
+++ b/gdal/frmts/gxf/gxfdataset.cpp
@@ -270,28 +270,22 @@ GDALDataset *GXFDataset::Open( GDALOpenInfo * poOpenInfo )
 /*      we also now verify that there is a #GRID keyword before         */
 /*      passing it off to GXFOpen().  We check in the first 50K.        */
 /* -------------------------------------------------------------------- */
-    VSILFILE *fp = poOpenInfo->fpL;
-    poOpenInfo->fpL = nullptr;
-
-    const size_t BIGBUFSIZE = 50000;
-    char *pszBigBuf = (char *) CPLMalloc(BIGBUFSIZE);
-    const int nBytesRead =
-        static_cast<int>(VSIFReadL( pszBigBuf, 1, BIGBUFSIZE, fp ));
-    VSIFCloseL( fp );
-
+    poOpenInfo->TryToIngest(50000);
     bool bGotGrid = false;
 
-    for( int i = 0; i < nBytesRead - 5 && !bGotGrid; i++ )
+    const char* pszBigBuf = (const char*)poOpenInfo->pabyHeader;
+    for( int i = 0; i < poOpenInfo->nHeaderBytes - 5 && !bGotGrid; i++ )
     {
         if( pszBigBuf[i] == '#' && STARTS_WITH_CI(pszBigBuf+i+1, "GRID") )
-            bGotGrid = TRUE;
+            bGotGrid = true;
     }
 
-    CPLFree( pszBigBuf );
-
     if( !bGotGrid )
         return nullptr;
 
+    VSIFCloseL( poOpenInfo->fpL );
+    poOpenInfo->fpL = nullptr;
+
 /* -------------------------------------------------------------------- */
 /*      Try opening the dataset.                                        */
 /* -------------------------------------------------------------------- */

From 544b7fb8eefb97f8d26483bd21e2a0ef15167064 Mon Sep 17 00:00:00 2001
From: Even Rouault <even.rouault@spatialys.com>
Date: Sat, 11 May 2019 09:47:05 +0200
Subject: [PATCH 310/488] GPKG: fix memory leak in case of corrupted database.
 Fixes https://bugs.chromium.org/p/oss-fuzz/issues/detail?id=14683. Credit to
 OSS Fuzz

---
 gdal/ogr/ogrsf_frmts/gpkg/ogrgeopackagetablelayer.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/gdal/ogr/ogrsf_frmts/gpkg/ogrgeopackagetablelayer.cpp b/gdal/ogr/ogrsf_frmts/gpkg/ogrgeopackagetablelayer.cpp
index c280005b9e36..8fed185f3ace 100644
--- a/gdal/ogr/ogrsf_frmts/gpkg/ogrgeopackagetablelayer.cpp
+++ b/gdal/ogr/ogrsf_frmts/gpkg/ogrgeopackagetablelayer.cpp
@@ -1045,8 +1045,8 @@ OGRErr OGRGeoPackageTableLayer::ReadTableDefinition()
                     }
                 }
             }
-            SQLResultFree(&oResultTable);
         }
+        SQLResultFree(&oResultTable);
     }
 
     /* Update the columns string */

From c797979c020ed2873374514b39caca0d031d3232 Mon Sep 17 00:00:00 2001
From: Even Rouault <even.rouault@spatialys.com>
Date: Sat, 11 May 2019 13:05:38 +0200
Subject: [PATCH 311/488] EEDA: fix startTime / endTime comparisons that were
 incomplete in refs #1506

---
 autotest/gdrivers/eedai.py      |  2 +-
 autotest/ogr/ogr_eeda.py        | 13 +++---
 gdal/frmts/eeda/drv_eeda.html   |  5 ++-
 gdal/frmts/eeda/eedadataset.cpp | 80 ++++++++++++++++++---------------
 4 files changed, 54 insertions(+), 46 deletions(-)

diff --git a/autotest/gdrivers/eedai.py b/autotest/gdrivers/eedai.py
index 0780ccfc1b35..c226d506e1ea 100644
--- a/autotest/gdrivers/eedai.py
+++ b/autotest/gdrivers/eedai.py
@@ -740,7 +740,7 @@ def test_eedai_real_service():
     ds = gdal.Open('EEDAI:USDA/NAIP/DOQQ/n_4010064_se_14_2_20070725')
     assert ds is not None
     res = gdal.Info(ds, format='json')
-    expected = {'files': [], 'cornerCoordinates': {'upperRight': [415016.0, 4435536.0], 'lowerLeft': [408970.0, 4427936.0], 'lowerRight': [415016.0, 4427936.0], 'upperLeft': [408970.0, 4435536.0], 'center': [411993.0, 4431736.0]}, 'wgs84Extent': {'type': 'Polygon', 'coordinates': [[]]}, 'description': 'EEDAI:USDA/NAIP/DOQQ/n_4010064_se_14_2_20070725', 'driverShortName': 'EEDAI', 'driverLongName': 'Earth Engine Data API Image', 'bands': [{'description': 'R', 'band': 1, 'colorInterpretation': 'Red', 'overviews': [{'size': [1511, 1900]}, {'size': [755, 950]}, {'size': [377, 475]}, {'size': [188, 237]}], 'type': 'Byte', 'block': [256, 256], 'metadata': {}}, {'description': 'G', 'band': 2, 'colorInterpretation': 'Green', 'overviews': [{'size': [1511, 1900]}, {'size': [755, 950]}, {'size': [377, 475]}, {'size': [188, 237]}], 'type': 'Byte', 'block': [256, 256], 'metadata': {}}, {'description': 'B', 'band': 3, 'colorInterpretation': 'Blue', 'overviews': [{'size': [1511, 1900]}, {'size': [755, 950]}, {'size': [377, 475]}, {'size': [188, 237]}], 'type': 'Byte', 'block': [256, 256], 'metadata': {}}], 'coordinateSystem': {'wkt': 'PROJCS["NAD83 / UTM zone 14N",\n    GEOGCS["NAD83",\n        DATUM["North_American_Datum_1983",\n            SPHEROID["GRS 1980",6378137,298.257222101,\n                AUTHORITY["EPSG","7019"]],\n            TOWGS84[0,0,0,0,0,0,0],\n            AUTHORITY["EPSG","6269"]],\n        PRIMEM["Greenwich",0,\n            AUTHORITY["EPSG","8901"]],\n        UNIT["degree",0.0174532925199433,\n            AUTHORITY["EPSG","9122"]],\n        AUTHORITY["EPSG","4269"]],\n    PROJECTION["Transverse_Mercator"],\n    PARAMETER["latitude_of_origin",0],\n    PARAMETER["central_meridian",-99],\n    PARAMETER["scale_factor",0.9996],\n    PARAMETER["false_easting",500000],\n    PARAMETER["false_northing",0],\n    UNIT["metre",1,\n        AUTHORITY["EPSG","9001"]],\n    AXIS["Easting",EAST],\n    AXIS["Northing",NORTH],\n    AUTHORITY["EPSG","26914"]]'}, 'geoTransform': [408970.0, 2.0, 0.0, 4435536.0, 0.0, -2.0], 'metadata': {'IMAGE_STRUCTURE': {'INTERLEAVE': 'PIXEL'}}, 'size': [3023, 3800]}
+    expected = {'files': [], 'cornerCoordinates': {'upperRight': [415016.0, 4435536.0], 'lowerLeft': [408970.0, 4427936.0], 'lowerRight': [415016.0, 4427936.0], 'upperLeft': [408970.0, 4435536.0], 'center': [411993.0, 4431736.0]}, 'wgs84Extent': {'type': 'Polygon', 'coordinates': [[[-100.067433, 40.0651671], [-100.0663662, 39.9967049], [-99.9955511, 39.9973349], [-99.9965471, 40.0657986], [-100.067433, 40.0651671]]]}, 'description': 'EEDAI:USDA/NAIP/DOQQ/n_4010064_se_14_2_20070725', 'driverShortName': 'EEDAI', 'driverLongName': 'Earth Engine Data API Image', 'bands': [{'description': 'R', 'band': 1, 'colorInterpretation': 'Red', 'overviews': [{'size': [1511, 1900]}, {'size': [755, 950]}, {'size': [377, 475]}, {'size': [188, 237]}], 'type': 'Byte', 'block': [256, 256], 'metadata': {}}, {'description': 'G', 'band': 2, 'colorInterpretation': 'Green', 'overviews': [{'size': [1511, 1900]}, {'size': [755, 950]}, {'size': [377, 475]}, {'size': [188, 237]}], 'type': 'Byte', 'block': [256, 256], 'metadata': {}}, {'description': 'B', 'band': 3, 'colorInterpretation': 'Blue', 'overviews': [{'size': [1511, 1900]}, {'size': [755, 950]}, {'size': [377, 475]}, {'size': [188, 237]}], 'type': 'Byte', 'block': [256, 256], 'metadata': {}}], 'coordinateSystem': {'wkt': 'PROJCS["NAD83 / UTM zone 14N",\n    GEOGCS["NAD83",\n        DATUM["North_American_Datum_1983",\n            SPHEROID["GRS 1980",6378137,298.257222101,\n                AUTHORITY["EPSG","7019"]],\n            TOWGS84[0,0,0,0,0,0,0],\n            AUTHORITY["EPSG","6269"]],\n        PRIMEM["Greenwich",0,\n            AUTHORITY["EPSG","8901"]],\n        UNIT["degree",0.0174532925199433,\n            AUTHORITY["EPSG","9122"]],\n        AUTHORITY["EPSG","4269"]],\n    PROJECTION["Transverse_Mercator"],\n    PARAMETER["latitude_of_origin",0],\n    PARAMETER["central_meridian",-99],\n    PARAMETER["scale_factor",0.9996],\n    PARAMETER["false_easting",500000],\n    PARAMETER["false_northing",0],\n    UNIT["metre",1,\n        AUTHORITY["EPSG","9001"]],\n    AXIS["Easting",EAST],\n    AXIS["Northing",NORTH],\n    AUTHORITY["EPSG","26914"]]'}, 'geoTransform': [408970.0, 2.0, 0.0, 4435536.0, 0.0, -2.0], 'metadata': {'IMAGE_STRUCTURE': {'INTERLEAVE': 'PIXEL'}}, 'size': [3023, 3800]}
     assert expected == res
     assert ds.ReadRaster(0, 0, 1, 1) is not None
 
diff --git a/autotest/ogr/ogr_eeda.py b/autotest/ogr/ogr_eeda.py
index 2104010d3875..f3db998fbf43 100644
--- a/autotest/ogr/ogr_eeda.py
+++ b/autotest/ogr/ogr_eeda.py
@@ -210,7 +210,6 @@ def test_eeda_2():
 
     lyr.SetAttributeFilter(None)
     lyr.SetAttributeFilter("startTime >= '1980-01-01T00:00:00Z' AND " +
-                           "startTime <= '2100-01-01T00:00:00Z' AND " +
                            "string_field = 'bar' AND " +
                            "int_field > 0 AND " +
                            "int_field < 2 AND " +
@@ -220,7 +219,7 @@ def test_eeda_2():
                            "string_field IN ('bar', 'baz') AND " +
                            "NOT( int_field IN (0) OR double_field IN (3.5) )")
 
-    ogrtest.eeda_drv_tmpfile = '/vsimem/ee/projects/earthengine-public/assets/collection:listImages?region=%7B%20%22type%22%3A%20%22Polygon%22%2C%20%22coordinates%22%3A%20%5B%20%5B%20%5B%20%2D180%2E0%2C%20%2D90%2E0%20%5D%2C%20%5B%20%2D180%2E0%2C%2090%2E0%20%5D%2C%20%5B%20180%2E0%2C%2090%2E0%20%5D%2C%20%5B%20180%2E0%2C%20%2D90%2E0%20%5D%2C%20%5B%20%2D180%2E0%2C%20%2D90%2E0%20%5D%20%5D%20%5D%20%7D&filter=%28%28%28%28%28%28%28string%5Ffield%20%3D%20%22bar%22%20AND%20int%5Ffield%20%3E%200%29%20AND%20int%5Ffield%20%3C%202%29%20AND%20int64%5Ffield%20%3E%3D%200%29%20AND%20int64%5Ffield%20%3C%3D%209999999999999%29%20AND%20double%5Ffield%20%21%3D%203%2E5%29%20AND%20string%5Ffield%20%3D%20%22bar%22%20OR%20string%5Ffield%20%3D%20%22baz%22%29%20AND%20%28NOT%20%28int%5Ffield%20%3D%200%20OR%20double%5Ffield%20%3D%203%2E5%29%29%29&startTime=1980%2D01%2D01T00%3A00%3A00Z&endTime=2100%2D01%2D01T00%3A00%3A00Z'
+    ogrtest.eeda_drv_tmpfile = '/vsimem/ee/projects/earthengine-public/assets/collection:listImages?region=%7B%20%22type%22%3A%20%22Polygon%22%2C%20%22coordinates%22%3A%20%5B%20%5B%20%5B%20%2D180%2E0%2C%20%2D90%2E0%20%5D%2C%20%5B%20%2D180%2E0%2C%2090%2E0%20%5D%2C%20%5B%20180%2E0%2C%2090%2E0%20%5D%2C%20%5B%20180%2E0%2C%20%2D90%2E0%20%5D%2C%20%5B%20%2D180%2E0%2C%20%2D90%2E0%20%5D%20%5D%20%5D%20%7D&filter=%28%28%28%28%28%28%28string%5Ffield%20%3D%20%22bar%22%20AND%20int%5Ffield%20%3E%200%29%20AND%20int%5Ffield%20%3C%202%29%20AND%20int64%5Ffield%20%3E%3D%200%29%20AND%20int64%5Ffield%20%3C%3D%209999999999999%29%20AND%20double%5Ffield%20%21%3D%203%2E5%29%20AND%20string%5Ffield%20%3D%20%22bar%22%20OR%20string%5Ffield%20%3D%20%22baz%22%29%20AND%20%28NOT%20%28int%5Ffield%20%3D%200%20OR%20double%5Ffield%20%3D%203%2E5%29%29%29&startTime=1980%2D01%2D01T00%3A00%3A00Z'
     gdal.FileFromMemBuffer(ogrtest.eeda_drv_tmpfile, json.dumps({
         'images': [
             {
@@ -254,14 +253,15 @@ def test_eeda_2():
     lyr.SetSpatialFilter(None)
 
     # Test time equality with second granularity
-    lyr.SetAttributeFilter("startTime = '1980-01-01T00:00:00Z'")
+    lyr.SetAttributeFilter("startTime >= '1980-01-01T00:00:00Z' AND endTime <= '1980-01-02T23:59:00Z'")
 
     ogrtest.eeda_drv_tmpfile = '/vsimem/ee/projects/earthengine-public/assets/collection:listImages?startTime=1980%2D01%2D01T00%3A00%3A00Z&endTime=1980%2D01%2D01T00%3A00%3A01Z'
     gdal.FileFromMemBuffer(ogrtest.eeda_drv_tmpfile, json.dumps({
         'images': [
             {
                 'name': 'projects/earthengine-public/assets/collection/filtered_feature',
-                'startTime': '1980-01-01T00:00:00Z'
+                'startTime': '1980-01-01T00:00:00Z',
+                'endTime': '1980-01-02T23:59:59Z'
             },
             {
                 'name': 'projects/earthengine-public/assets/collection/second_feature'
@@ -275,14 +275,15 @@ def test_eeda_2():
     assert f.GetField('name') == 'projects/earthengine-public/assets/collection/filtered_feature'
 
     # Test time equality with day granularity
-    lyr.SetAttributeFilter("startTime = '1980-01-01'")
+    lyr.SetAttributeFilter("startTime = '1980-01-01' AND endTime = '1980-01-02'")
 
-    ogrtest.eeda_drv_tmpfile = '/vsimem/ee/projects/earthengine-public/assets/collection:listImages?startTime=1980%2D01%2D01T00%3A00%3A00Z&endTime=1980%2D01%2D01T23%3A59%3A59Z'
+    ogrtest.eeda_drv_tmpfile = '/vsimem/ee/projects/earthengine-public/assets/collection:listImages?startTime=1980%2D01%2D01T00%3A00%3A00Z&endTime=1980%2D01%2D02T23%3A59%3A59Z'
     gdal.FileFromMemBuffer(ogrtest.eeda_drv_tmpfile, json.dumps({
         'images': [
             {
                 'name': 'projects/earthengine-public/assets/collection/filtered_feature',
                 'startTime': '1980-01-01T12:00:00Z',
+                'endTime': '1980-01-02T23:59:59Z'
             },
             {
                 'name': 'projects/earthengine-public/assets/collection/second_feature'
diff --git a/gdal/frmts/eeda/drv_eeda.html b/gdal/frmts/eeda/drv_eeda.html
index 8cf3ccc84e68..ad51e74ff1ec 100644
--- a/gdal/frmts/eeda/drv_eeda.html
+++ b/gdal/frmts/eeda/drv_eeda.html
@@ -89,7 +89,8 @@ <h2>Attributes</h2>
 <tr><td>id</td><td>String</td><td>Image ID; equivalent to name without the "projects/*/assets/" prefix (e.g. users/USER/ASSET)</td><td>No</td></tr>
 <tr><td>path</td><td>String</td><td>(Deprecated) Image path; equivalent to id</td><td>No</td></tr>
 <tr><td>gdal_dataset</td><td>String</td><td>GDAL dataset name (e.g. EEDAI:projects/earthengine-public/assets/COPERNICUS/S2/20170430T190351_20170430T190351_T10SEG)<br/>hat can be opened with the <a href="frmt_eedai.html">Google Earth Engine Data API Image driver</a></td><td>No</td></tr>
-<tr><td>time</td><td>DateTime</td><td>Acquisition date</td><td><b>Yes</b></td></tr>
+<tr><td>startTime</td><td>DateTime</td><td>Acquisition start date</td><td><b>Yes (restricted to &gt;= comparison on top level)</b></td></tr>
+<tr><td>endTime</td><td>DateTime</td><td>Acquisition end date</td><td><b>Yes (restricted to &lt;= comparison on top level)</b></td></tr>
 <tr><td>updateTime</td><td>DateTime</td><td>Update date</td><td>No</td></tr>
 <tr><td>sizeBytes</td><td>Integer64</td><td>File size in bytes</td><td>No</td></tr>
 <tr><td>band_count</td><td>Integer</td><td>Number of bands</td><td>No</td></tr>
@@ -154,7 +155,7 @@ <h3>Examples</h3>
 <li>
 Listing all images available matching criteria :
 <pre>
-ogrinfo -ro -al "EEDA:projects/earthengine-public/assets/COPERNICUS/S2" -where "time &gt;= '2015/03/26 00:00:00' AND CLOUDY_PIXEL_PERCENTAGE &lt; 10" --config EEDA_CLIENT_EMAIL "my@email" --config EEDA_PRIVATE_KEY_FILE my.pem
+ogrinfo -ro -al "EEDA:projects/earthengine-public/assets/COPERNICUS/S2" -where "startTime &gt;= '2015/03/26 00:00:00' AND endTime &lt;= '2015/06/30 00:00:00' AND CLOUDY_PIXEL_PERCENTAGE &lt; 10" --config EEDA_CLIENT_EMAIL "my@email" --config EEDA_PRIVATE_KEY_FILE my.pem
 </pre>
 <p>
 
diff --git a/gdal/frmts/eeda/eedadataset.cpp b/gdal/frmts/eeda/eedadataset.cpp
index 3d48dbf45a35..3c6a898524e5 100644
--- a/gdal/frmts/eeda/eedadataset.cpp
+++ b/gdal/frmts/eeda/eedadataset.cpp
@@ -793,8 +793,7 @@ CPLString GDALEEDALayer::BuildFilter(swq_expr_node* poNode, bool bIsAndTopLevel)
     else if( bIsAndTopLevel &&
              poNode->eNodeType == SNT_OPERATION &&
              (poNode->nOperation == SWQ_EQ ||
-              poNode->nOperation == SWQ_GE ||
-              poNode->nOperation == SWQ_LE) &&
+              poNode->nOperation == SWQ_GE) &&
              poNode->nSubExprCount == 2 &&
              poNode->papoSubExpr[0]->eNodeType == SNT_COLUMN &&
              poNode->papoSubExpr[1]->eNodeType == SNT_CONSTANT &&
@@ -802,46 +801,53 @@ CPLString GDALEEDALayer::BuildFilter(swq_expr_node* poNode, bool bIsAndTopLevel)
                     m_poFeatureDefn->GetFieldIndex("startTime") &&
              poNode->papoSubExpr[1]->field_type == SWQ_TIMESTAMP )
     {
-        if( poNode->nOperation == SWQ_GE || poNode->nOperation == SWQ_EQ )
+        int nTerms = GDALEEDALayerParseDateTime(poNode->papoSubExpr[1]->string_value,
+                SWQ_GE,
+                nYear, nMonth, nDay, nHour, nMinute, nSecond);
+        if( nTerms >= 3 )
         {
-            int nTerms = GDALEEDALayerParseDateTime(poNode->papoSubExpr[1]->string_value,
-                    SWQ_GE,
-                    nYear, nMonth, nDay, nHour, nMinute, nSecond);
-            if( nTerms >= 3 )
-            {
-                m_osStartTime = CPLSPrintf("%04d-%02d-%02dT%02d:%02d:%02dZ",
-                                    nYear, nMonth, nDay, nHour, nMinute, nSecond);
-            }
-            else
-            {
-                m_bFilterMustBeClientSideEvaluated = true;
-            }
+            m_osStartTime = CPLSPrintf("%04d-%02d-%02dT%02d:%02d:%02dZ",
+                                nYear, nMonth, nDay, nHour, nMinute, nSecond);
         }
-        if( poNode->nOperation == SWQ_LE || poNode->nOperation == SWQ_EQ )
+        else
         {
-            int nTerms = GDALEEDALayerParseDateTime(poNode->papoSubExpr[1]->string_value,
-                    SWQ_LE,
-                    nYear, nMonth, nDay, nHour, nMinute, nSecond);
-            if( nTerms >= 3 )
-            {
-                if( poNode->nOperation == SWQ_EQ && nTerms == 6 )
-                {
-                    if( nSecond < 59 )
-                        nSecond ++;
-                    else if( nMinute < 59 )
-                        nMinute ++;
-                    else if( nHour < 23 )
-                        nHour ++;
-                    else
-                        nDay ++;
-                }
-                m_osEndTime = CPLSPrintf("%04d-%02d-%02dT%02d:%02d:%02dZ",
-                                    nYear, nMonth, nDay, nHour, nMinute, nSecond);
-            }
-            else
+            m_bFilterMustBeClientSideEvaluated = true;
+        }
+        return "";
+    }
+    else if( bIsAndTopLevel &&
+             poNode->eNodeType == SNT_OPERATION &&
+             (poNode->nOperation == SWQ_EQ ||
+              poNode->nOperation == SWQ_LE) &&
+             poNode->nSubExprCount == 2 &&
+             poNode->papoSubExpr[0]->eNodeType == SNT_COLUMN &&
+             poNode->papoSubExpr[1]->eNodeType == SNT_CONSTANT &&
+             poNode->papoSubExpr[0]->field_index ==
+                    m_poFeatureDefn->GetFieldIndex("endTime") &&
+             poNode->papoSubExpr[1]->field_type == SWQ_TIMESTAMP )
+    {
+        int nTerms = GDALEEDALayerParseDateTime(poNode->papoSubExpr[1]->string_value,
+                SWQ_LE,
+                nYear, nMonth, nDay, nHour, nMinute, nSecond);
+        if( nTerms >= 3 )
+        {
+            if( poNode->nOperation == SWQ_EQ && nTerms == 6 )
             {
-                m_bFilterMustBeClientSideEvaluated = true;
+                if( nSecond < 59 )
+                    nSecond ++;
+                else if( nMinute < 59 )
+                    nMinute ++;
+                else if( nHour < 23 )
+                    nHour ++;
+                else
+                    nDay ++;
             }
+            m_osEndTime = CPLSPrintf("%04d-%02d-%02dT%02d:%02d:%02dZ",
+                                nYear, nMonth, nDay, nHour, nMinute, nSecond);
+        }
+        else
+        {
+            m_bFilterMustBeClientSideEvaluated = true;
         }
         return "";
     }

From 75e953209d9a52443b193f47ce8152b7ed717cef Mon Sep 17 00:00:00 2001
From: Even Rouault <even.rouault@spatialys.com>
Date: Sat, 11 May 2019 14:03:22 +0200
Subject: [PATCH 312/488] Fix previous commit (refs #1506)

---
 autotest/ogr/ogr_eeda.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/autotest/ogr/ogr_eeda.py b/autotest/ogr/ogr_eeda.py
index f3db998fbf43..f9d5e27b607e 100644
--- a/autotest/ogr/ogr_eeda.py
+++ b/autotest/ogr/ogr_eeda.py
@@ -253,9 +253,9 @@ def test_eeda_2():
     lyr.SetSpatialFilter(None)
 
     # Test time equality with second granularity
-    lyr.SetAttributeFilter("startTime >= '1980-01-01T00:00:00Z' AND endTime <= '1980-01-02T23:59:00Z'")
+    lyr.SetAttributeFilter("startTime >= '1980-01-01T00:00:00Z' AND endTime <= '1980-01-02T23:59:59Z'")
 
-    ogrtest.eeda_drv_tmpfile = '/vsimem/ee/projects/earthengine-public/assets/collection:listImages?startTime=1980%2D01%2D01T00%3A00%3A00Z&endTime=1980%2D01%2D01T00%3A00%3A01Z'
+    ogrtest.eeda_drv_tmpfile = '/vsimem/ee/projects/earthengine-public/assets/collection:listImages?startTime=1980%2D01%2D01T00%3A00%3A00Z&endTime=1980%2D01%2D02T23%3A59%3A59Z'
     gdal.FileFromMemBuffer(ogrtest.eeda_drv_tmpfile, json.dumps({
         'images': [
             {

From 00b24922c54ad2cc203f397fc237dea1c58a416a Mon Sep 17 00:00:00 2001
From: Even Rouault <even.rouault@spatialys.com>
Date: Wed, 15 May 2019 07:42:43 -0500
Subject: [PATCH 313/488] WaSP: on creation, make sure the layer geometry type
 set on the feature definition is wkbLineString25D

---
 gdal/ogr/ogrsf_frmts/wasp/ogrwasp.h        | 2 --
 gdal/ogr/ogrsf_frmts/wasp/ogrwasplayer.cpp | 4 +++-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/gdal/ogr/ogrsf_frmts/wasp/ogrwasp.h b/gdal/ogr/ogrsf_frmts/wasp/ogrwasp.h
index 8ffb9d8e1241..52ab83320bfb 100644
--- a/gdal/ogr/ogrsf_frmts/wasp/ogrwasp.h
+++ b/gdal/ogr/ogrsf_frmts/wasp/ogrwasp.h
@@ -159,8 +159,6 @@ class OGRWAsPLayer : public OGRLayer
 
     virtual OGRFeature *GetNextFeature() override;
     OGRFeature *GetNextRawFeature();
-    virtual OGRwkbGeometryType  GetGeomType() override { return wkbLineString25D; }
-    virtual OGRSpatialReference *GetSpatialRef() override { return poSpatialReference; }
     virtual const char *GetName() override { return sName.c_str(); }
 };
 
diff --git a/gdal/ogr/ogrsf_frmts/wasp/ogrwasplayer.cpp b/gdal/ogr/ogrsf_frmts/wasp/ogrwasplayer.cpp
index f094a24d286a..8f1c710e332c 100644
--- a/gdal/ogr/ogrsf_frmts/wasp/ogrwasplayer.cpp
+++ b/gdal/ogr/ogrsf_frmts/wasp/ogrwasplayer.cpp
@@ -58,7 +58,6 @@ OGRWAsPLayer::OGRWAsPLayer( const char * pszName,
 {
     SetDescription( poLayerDefn->GetName() );
     poLayerDefn->Reference();
-    poLayerDefn->SetGeomType( wkbLineString25D );
     poLayerDefn->GetGeomFieldDefn(0)->SetType( wkbLineString25D );
     poLayerDefn->GetGeomFieldDefn(0)->SetSpatialRef( poSpatialReference );
     if( poSpatialReference ) poSpatialReference->Reference();
@@ -92,7 +91,10 @@ OGRWAsPLayer::OGRWAsPLayer( const char * pszName,
     pdfAdjacentPointTolerance(pdfAdjacentPointToleranceParam),
     pdfPointToCircleRadius(pdfPointToCircleRadiusParam)
 {
+    SetDescription( poLayerDefn->GetName() );
     poLayerDefn->Reference();
+    poLayerDefn->GetGeomFieldDefn(0)->SetType( wkbLineString25D );
+    poLayerDefn->GetGeomFieldDefn(0)->SetSpatialRef( poSpatialReference );
     if (poSpatialReference) poSpatialReference->Reference();
 }
 

From dfe7b7f0e0d26c3895c6750c3badac958792bac4 Mon Sep 17 00:00:00 2001
From: Even Rouault <even.rouault@spatialys.com>
Date: Sat, 18 May 2019 18:42:43 -0500
Subject: [PATCH 314/488] GeoJSON: fix recognizing some documents with members
 sorted alphabetically (fixes #1537)

---
 gdal/ogr/ogrsf_frmts/geojson/ogrgeojsonutils.cpp | 12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)

diff --git a/gdal/ogr/ogrsf_frmts/geojson/ogrgeojsonutils.cpp b/gdal/ogr/ogrsf_frmts/geojson/ogrgeojsonutils.cpp
index b64fcd16b3dd..9e913db0d390 100644
--- a/gdal/ogr/ogrsf_frmts/geojson/ogrgeojsonutils.cpp
+++ b/gdal/ogr/ogrsf_frmts/geojson/ogrgeojsonutils.cpp
@@ -172,8 +172,7 @@ static bool IsGeoJSONLikeObject( const char* pszText, bool* pbMightBeSequence )
         return true;
     }
 
-    CPLString osWithoutSpace = GetCompactJSon(pszText,
-                                            strlen(szESRIJSonPotentialStart1));
+    CPLString osWithoutSpace = GetCompactJSon(pszText, strlen(pszText));
     if( osWithoutSpace.find("{\"features\":[") == 0 &&
         osWithoutSpace.find(szESRIJSonPotentialStart1) != 0 )
     {
@@ -182,6 +181,15 @@ static bool IsGeoJSONLikeObject( const char* pszText, bool* pbMightBeSequence )
         return true;
     }
 
+    // See https://raw.githubusercontent.com/icepack/icepack-data/master/meshes/larsen/larsen_inflow.geojson
+    if( osWithoutSpace.find("{\"crs\":{") == 0 &&
+        osWithoutSpace.find(",\"features\":[") != std::string::npos )
+    {
+        if( pbMightBeSequence )
+            *pbMightBeSequence = false;
+        return true;
+    }
+
     if( IsTypeSomething(pszText, "Feature") ||
            IsTypeSomething(pszText, "Point") ||
            IsTypeSomething(pszText, "LineString") ||

From 60d52d3e94b3551345057e745c4dae0f7a63062f Mon Sep 17 00:00:00 2001
From: Even Rouault <even.rouault@spatialys.com>
Date: Wed, 15 May 2019 08:57:32 -0500
Subject: [PATCH 315/488] Travis: use ubuntugis-stable PPA for Trusty since
 they are no longer in unstable

---
 gdal/ci/travis/trusty_clang/before_install.sh | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/gdal/ci/travis/trusty_clang/before_install.sh b/gdal/ci/travis/trusty_clang/before_install.sh
index 13d4d682e04b..be9af6226def 100755
--- a/gdal/ci/travis/trusty_clang/before_install.sh
+++ b/gdal/ci/travis/trusty_clang/before_install.sh
@@ -7,7 +7,8 @@ sudo apt-get purge -y libgeos* libspatialite*
 sudo apt-get remove libpq* postgresql*
 find  /etc/apt/sources.list.d
 sudo mv /etc/apt/sources.list.d/pgdg* /tmp
-sudo add-apt-repository -y ppa:ubuntugis/ubuntugis-unstable
+sudo add-apt-repository -y ppa:ubuntugis/ppa
+sudo add-apt-repository -y ppa:ubuntugis/ubuntugis-testing
 #sudo add-apt-repository -y ppa:marlam/gta
 sudo apt-get update
 

From 5b7c3576ad84af5b8cb446ba1edc1d118cc2bb0a Mon Sep 17 00:00:00 2001
From: Even Rouault <even.rouault@spatialys.com>
Date: Tue, 21 May 2019 00:11:23 +0200
Subject: [PATCH 316/488] gdal_polygonize.py: fix outputing to geojson without
 explicit -f switch (fixes #1533)

---
 gdal/swig/python/scripts/gdal_polygonize.py | 4 ++--
 gdal/swig/python/scripts/ogrmerge.py        | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/gdal/swig/python/scripts/gdal_polygonize.py b/gdal/swig/python/scripts/gdal_polygonize.py
index 4f07f05e4db7..769629d3ea31 100755
--- a/gdal/swig/python/scripts/gdal_polygonize.py
+++ b/gdal/swig/python/scripts/gdal_polygonize.py
@@ -78,14 +78,14 @@ def GetOutputDriversFor(filename):
 
 def GetOutputDriverFor(filename):
     drv_list = GetOutputDriversFor(filename)
+    ext = GetExtension(filename)
     if not drv_list:
-        ext = GetExtension(filename)
         if not ext:
             return 'ESRI Shapefile'
         else:
             raise Exception("Cannot guess driver for %s" % filename)
     elif len(drv_list) > 1:
-        print("Several drivers matching %s extension. Using %s" % (ext, drv_list[0]))
+        print("Several drivers matching %s extension. Using %s" % (ext if ext else '', drv_list[0]))
     return drv_list[0]
 
 # =============================================================================
diff --git a/gdal/swig/python/scripts/ogrmerge.py b/gdal/swig/python/scripts/ogrmerge.py
index ddfccd835871..58b3bb59c752 100755
--- a/gdal/swig/python/scripts/ogrmerge.py
+++ b/gdal/swig/python/scripts/ogrmerge.py
@@ -110,7 +110,7 @@ def GetOutputDriverFor(filename):
         else:
             raise Exception("Cannot guess driver for %s" % filename)
     elif len(drv_list) > 1:
-        print("Several drivers matching %s extension. Using %s" % (ext, drv_list[0]))
+        print("Several drivers matching %s extension. Using %s" % (ext if ext else '', drv_list[0]))
     return drv_list[0]
 
 #############################################################################

From a3b907162c4c003960c32e0fcb8f0850c790ce49 Mon Sep 17 00:00:00 2001
From: Even Rouault <even.rouault@spatialys.com>
Date: Tue, 21 May 2019 22:10:19 +0200
Subject: [PATCH 317/488] GPKG: insert more accurate spatial extent in
 gpkg_contents

---
 gdal/ogr/ogrsf_frmts/gpkg/ogrgeopackagetablelayer.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/gdal/ogr/ogrsf_frmts/gpkg/ogrgeopackagetablelayer.cpp b/gdal/ogr/ogrsf_frmts/gpkg/ogrgeopackagetablelayer.cpp
index 8fed185f3ace..1dee77d3352a 100644
--- a/gdal/ogr/ogrsf_frmts/gpkg/ogrgeopackagetablelayer.cpp
+++ b/gdal/ogr/ogrsf_frmts/gpkg/ogrgeopackagetablelayer.cpp
@@ -55,8 +55,8 @@ OGRErr OGRGeoPackageTableLayer::SaveExtent()
 
     char *pszSQL = sqlite3_mprintf(
                 "UPDATE gpkg_contents SET "
-                "min_x = %g, min_y = %g, "
-                "max_x = %g, max_y = %g "
+                "min_x = %.18g, min_y = %.18g, "
+                "max_x = %.18g, max_y = %.18g "
                 "WHERE lower(table_name) = lower('%q') AND "
                 "Lower(data_type) = 'features'",
                 m_poExtent->MinX, m_poExtent->MinY,

From 98ae646fbddccb3c59804c902f687dea6f0b628b Mon Sep 17 00:00:00 2001
From: Even Rouault <even.rouault@spatialys.com>
Date: Fri, 10 May 2019 20:50:18 +0200
Subject: [PATCH 318/488] ENVI: add read support for reading GCPs (#1528), and
 fix off-by-one offset on line,pixel on reading GCP

---
 autotest/gdrivers/envi.py      | 26 ++++++++++++
 gdal/frmts/raw/envidataset.cpp | 78 ++++++++++++++++++++++++++++++++--
 gdal/frmts/raw/envidataset.h   |  6 +++
 3 files changed, 107 insertions(+), 3 deletions(-)

diff --git a/autotest/gdrivers/envi.py b/autotest/gdrivers/envi.py
index 6b3a1158d3a6..a15d27bb1a35 100755
--- a/autotest/gdrivers/envi.py
+++ b/autotest/gdrivers/envi.py
@@ -346,6 +346,32 @@ def test_envi_truncated():
 
     assert cs == 2315
 
+###############################################################################
+# Test writing & reading GCPs (#1528)
+
 
+def test_envi_gcp():
 
+    filename = '/vsimem/test_envi_gcp.dat'
+    ds = gdal.GetDriverByName('ENVI').Create(filename, 1, 1)
+    gcp = gdal.GCP()
+    gcp.GCPPixel = 1
+    gcp.GCPLine = 2
+    gcp.GCPX = 3
+    gcp.GCPY = 4
+    ds.SetGCPs([gcp], None)
+    ds = None
+    gdal.Unlink(filename + ".aux.xml")
+
+    ds = gdal.Open(filename)
+    assert ds.GetGCPCount() == 1
+    gcps = ds.GetGCPs()
+    assert len(gcps) == 1
+    gcp = gcps[0]
+    ds = None
+    assert gcp.GCPPixel == 1
+    assert gcp.GCPLine == 2
+    assert gcp.GCPX == 3
+    assert gcp.GCPY == 4
 
+    gdal.GetDriverByName('ENVI').Delete(filename)
diff --git a/gdal/frmts/raw/envidataset.cpp b/gdal/frmts/raw/envidataset.cpp
index a3a0b66e2e6b..42fb027017aa 100644
--- a/gdal/frmts/raw/envidataset.cpp
+++ b/gdal/frmts/raw/envidataset.cpp
@@ -305,6 +305,10 @@ ENVIDataset::~ENVIDataset()
             CPLError(CE_Failure, CPLE_FileIO, "I/O error");
         }
     }
+    if( !m_asGCPs.empty() )
+    {
+        GDALDeinitGCPs(static_cast<int>(m_asGCPs.size()), m_asGCPs.data());
+    }
     CPLFree(pszProjection);
     CPLFree(pszHDRFilename);
 }
@@ -1106,7 +1110,7 @@ bool ENVIDataset::WritePseudoGcpInfo()
     // Write out gcps into the envi header
     // returns 0 if the gcps are not present.
 
-    const int iNum = GetGCPCount();
+    const int iNum = std::min(GetGCPCount(), 4);
     if (iNum == 0)
         return false;
 
@@ -1120,9 +1124,11 @@ bool ENVIDataset::WritePseudoGcpInfo()
     bool bRet = VSIFPrintfL(fp, "geo points = {\n") >= 0;
     for( int iR = 0; iR < iNum; iR++ )
     {
+        // Add 1 to pixel and line for ENVI convention
         bRet &= VSIFPrintfL(
             fp, " %#0.4f, %#0.4f, %#0.8f, %#0.8f",
-            pGcpStructs[iR].dfGCPPixel, pGcpStructs[iR].dfGCPLine,
+            1 + pGcpStructs[iR].dfGCPPixel,
+            1 + pGcpStructs[iR].dfGCPLine,
             pGcpStructs[iR].dfGCPY, pGcpStructs[iR].dfGCPX) >= 0;
         if( iR < iNum - 1 )
             bRet &= VSIFPrintfL(fp, ",\n") >= 0;
@@ -1749,6 +1755,65 @@ void ENVIDataset::ProcessRPCinfo( const char *pszRPCinfo,
     CSLDestroy(papszFields);
 }
 
+/************************************************************************/
+/*                             GetGCPCount()                            */
+/************************************************************************/
+
+int ENVIDataset::GetGCPCount()
+{
+    int nGCPCount = RawDataset::GetGCPCount();
+    if( nGCPCount )
+        return nGCPCount;
+    return static_cast<int>(m_asGCPs.size());
+}
+
+/************************************************************************/
+/*                              GetGCPs()                               */
+/************************************************************************/
+
+const GDAL_GCP *ENVIDataset::GetGCPs()
+{
+    int nGCPCount = RawDataset::GetGCPCount();
+    if( nGCPCount )
+        return RawDataset::GetGCPs();
+    if( !m_asGCPs.empty() )
+        return m_asGCPs.data();
+    return nullptr;
+}
+
+/************************************************************************/
+/*                         ProcessGeoPoints()                           */
+/*                                                                      */
+/*      Extract GCPs                                                    */
+/************************************************************************/
+
+void ENVIDataset::ProcessGeoPoints( const char *pszGeoPoints )
+{
+    char **papszFields = SplitList(pszGeoPoints);
+    const int nCount = CSLCount(papszFields);
+
+    if( (nCount % 4) != 0 )
+    {
+        CSLDestroy(papszFields);
+        return;
+    }
+    m_asGCPs.resize(nCount / 4);
+    if( !m_asGCPs.empty() )
+    {
+        GDALInitGCPs(static_cast<int>(m_asGCPs.size()), m_asGCPs.data());
+    }
+    for( int i = 0; i < static_cast<int>(m_asGCPs.size()); i++ )
+    {
+        // Substract 1 to pixel and line for ENVI convention
+        m_asGCPs[i].dfGCPPixel = CPLAtof( papszFields[i * 4 + 0] ) - 1;
+        m_asGCPs[i].dfGCPLine = CPLAtof( papszFields[i * 4 + 1] ) - 1;
+        m_asGCPs[i].dfGCPY = CPLAtof( papszFields[i * 4 + 2] );
+        m_asGCPs[i].dfGCPX = CPLAtof( papszFields[i * 4 + 3] );
+        m_asGCPs[i].dfGCPZ = 0;
+    }
+    CSLDestroy(papszFields);
+}
+
 void ENVIDataset::ProcessStatsFile()
 {
     osStaFilename = CPLResetExtension(pszHDRFilename, "sta");
@@ -2495,7 +2560,7 @@ GDALDataset *ENVIDataset::Open( GDALOpenInfo *poOpenInfo, bool bFileSizeCheck )
             pszMapInfo));
     }
 
-    // Look for RPC mapinfo.
+    // Look for RPC.
     const char* pszRPCInfo = poDS->m_aosHeader["rpc_info"];
     if( !poDS->bFoundMapinfo && pszRPCInfo != nullptr )
     {
@@ -2503,6 +2568,13 @@ GDALDataset *ENVIDataset::Open( GDALOpenInfo *poOpenInfo, bool bFileSizeCheck )
                              poDS->nRasterXSize, poDS->nRasterYSize);
     }
 
+    // Look for geo_points / GCP
+    const char* pszGeoPoints = poDS->m_aosHeader["geo_points"];
+    if( !poDS->bFoundMapinfo && pszGeoPoints != nullptr )
+    {
+        poDS->ProcessGeoPoints(pszGeoPoints);
+    }
+
     // Initialize any PAM information.
     poDS->SetDescription(poOpenInfo->pszFilename);
     poDS->TryLoadXML();
diff --git a/gdal/frmts/raw/envidataset.h b/gdal/frmts/raw/envidataset.h
index f94b95e5e9af..2a9804b30111 100644
--- a/gdal/frmts/raw/envidataset.h
+++ b/gdal/frmts/raw/envidataset.h
@@ -80,9 +80,12 @@ class ENVIDataset final: public RawDataset
 
     CPLString   osStaFilename{};
 
+    std::vector<GDAL_GCP> m_asGCPs{};
+
     bool        ReadHeader( VSILFILE * );
     bool        ProcessMapinfo( const char * );
     void        ProcessRPCinfo( const char *, int, int);
+    void        ProcessGeoPoints( const char* );
     void        ProcessStatsFile();
     static int         byteSwapInt(int);
     static float       byteSwapFloat(float);
@@ -125,6 +128,9 @@ class ENVIDataset final: public RawDataset
     CPLErr SetGCPs( int nGCPCount, const GDAL_GCP *pasGCPList,
                     const char *pszGCPProjection ) override;
 
+    int    GetGCPCount() override;
+    const GDAL_GCP *GetGCPs() override;
+
     static GDALDataset *Open( GDALOpenInfo * );
     static GDALDataset *Open( GDALOpenInfo *, bool bFileSizeCheck );
     static GDALDataset *Create( const char *pszFilename,

From ba463952bb45c31d5cb0f3a8293be5dc57b3e2cf Mon Sep 17 00:00:00 2001
From: Even Rouault <even.rouault@spatialys.com>
Date: Tue, 28 May 2019 18:43:54 +0200
Subject: [PATCH 319/488] GTiff: make WEBP_LEVEL to be honored in Create() mode
 (fixes #1594)

---
 autotest/gcore/tiff_write.py | 49 ++++++++++++++++++++++++++
 gdal/frmts/gtiff/geotiff.cpp | 66 ++++++++++--------------------------
 2 files changed, 67 insertions(+), 48 deletions(-)

diff --git a/autotest/gcore/tiff_write.py b/autotest/gcore/tiff_write.py
index 4a49c6fdbcea..f52fab85d0cd 100755
--- a/autotest/gcore/tiff_write.py
+++ b/autotest/gcore/tiff_write.py
@@ -6985,6 +6985,55 @@ def test_tiff_write_no_gdal_metadata_tag_for_ycbcr_jpeg():
     gdaltest.tiff_drv.Delete(tmpfile)
     gdaltest.tiff_drv.Delete(tmpfile2)
 
+###############################################################################
+# Test that compression parameters are taken into account in Create() mode
+
+def test_tiff_write_compression_create_and_createcopy():
+
+    md = gdaltest.tiff_drv.GetMetadata()
+    tests = []
+
+    if 'DEFLATE' in md['DMD_CREATIONOPTIONLIST']:
+        tests.append((['COMPRESS=DEFLATE', 'ZLEVEL=1'],['COMPRESS=DEFLATE', 'ZLEVEL=9']))
+
+    if 'LZMA' in md['DMD_CREATIONOPTIONLIST']:
+        tests.append((['COMPRESS=LZMA', 'LZMA_PRESET=1'],['COMPRESS=LZMA', 'LZMA_PRESET=9']))
+
+    if 'JPEG' in md['DMD_CREATIONOPTIONLIST']:
+        tests.append((['COMPRESS=JPEG', 'JPEG_QUALITY=95'],['COMPRESS=JPEG', 'JPEG_QUALITY=50']))
+
+    if 'ZSTD' in md['DMD_CREATIONOPTIONLIST']:
+        tests.append((['COMPRESS=ZSTD', 'ZSTD_LEVEL=1'],['COMPRESS=ZSTD', 'ZSTD_LEVEL=9']))
+
+    if 'LERC_DEFLATE' in md['DMD_CREATIONOPTIONLIST']:
+        tests.append((['COMPRESS=LERC_DEFLATE', 'ZLEVEL=1'],['COMPRESS=LERC_DEFLATE', 'ZLEVEL=9']))
+
+    if 'WEBP' in md['DMD_CREATIONOPTIONLIST']:
+        tests.append((['COMPRESS=WEBP', 'WEBP_LEVEL=95'],['COMPRESS=WEBP', 'WEBP_LEVEL=15']))
+
+    tmpfile = '/vsimem/test_tiff_write_compression_create.tif'
+
+    src_ds = gdal.Open('data/rgbsmall.tif')
+    data = src_ds.ReadRaster()
+    for (before, after) in tests:
+        ds = gdaltest.tiff_drv.Create(tmpfile, src_ds.RasterXSize, src_ds.RasterYSize, src_ds.RasterCount, options = before)
+        ds.WriteRaster(0, 0, src_ds.RasterXSize, src_ds.RasterYSize, data)
+        ds = None
+        size_before = gdal.VSIStatL(tmpfile).size
+        ds = gdaltest.tiff_drv.Create(tmpfile, src_ds.RasterXSize, src_ds.RasterYSize, src_ds.RasterCount, options = after)
+        ds.WriteRaster(0, 0, src_ds.RasterXSize, src_ds.RasterYSize, data)
+        ds = None
+        size_after = gdal.VSIStatL(tmpfile).size
+        assert size_after < size_before, (before, after, size_before, size_after)
+
+        gdaltest.tiff_drv.CreateCopy(tmpfile, src_ds, options = before)
+        size_before = gdal.VSIStatL(tmpfile).size
+        gdaltest.tiff_drv.CreateCopy(tmpfile, src_ds, options = after)
+        size_after = gdal.VSIStatL(tmpfile).size
+        assert size_after < size_before, (before, after, size_before, size_after)
+
+    gdaltest.tiff_drv.Delete(tmpfile)
+
 ###############################################################################
 # Ask to run again tests with GDAL_API_PROXY=YES
 
diff --git a/gdal/frmts/gtiff/geotiff.cpp b/gdal/frmts/gtiff/geotiff.cpp
index be710908a430..d2f7c02fd787 100644
--- a/gdal/frmts/gtiff/geotiff.cpp
+++ b/gdal/frmts/gtiff/geotiff.cpp
@@ -325,6 +325,7 @@ class GTiffDataset final : public GDALPamDataset
     bool        bCrystalized;
 
     void        Crystalize();  // TODO: Spelling.
+    void        RestoreVolatileParameters();
 
     GDALColorTable *poColorTable;
 
@@ -8626,26 +8627,9 @@ void GTiffDataset::ThreadCompressionFunc( void* pData )
     TIFFSetField(hTIFFTmp, TIFFTAG_COMPRESSION, poDS->nCompression);
     if( psJob->nPredictor != PREDICTOR_NONE )
         TIFFSetField(hTIFFTmp, TIFFTAG_PREDICTOR, psJob->nPredictor);
-    if( poDS->nZLevel >= 0 && (poDS->nCompression == COMPRESSION_ADOBE_DEFLATE ||
-                                 poDS->nCompression == COMPRESSION_LERC) )
-        TIFFSetField(hTIFFTmp, TIFFTAG_ZIPQUALITY, poDS->nZLevel);
-    if( poDS->nLZMAPreset > 0 && poDS->nCompression == COMPRESSION_LZMA)
-        TIFFSetField(hTIFFTmp, TIFFTAG_LZMAPRESET, poDS->nLZMAPreset);
-    if( poDS->nZSTDLevel > 0 && (poDS->nCompression == COMPRESSION_ZSTD ||
-                                 poDS->nCompression == COMPRESSION_LERC) )
-        TIFFSetField(hTIFFTmp, TIFFTAG_ZSTD_LEVEL, poDS->nZSTDLevel);
-#if HAVE_LERC
-    if( poDS->nCompression == COMPRESSION_LERC )
-    {
-        TIFFSetField(hTIFFTmp, TIFFTAG_LERC_MAXZERROR, poDS->dfMaxZError);
-        TIFFSetField(hTIFFTmp, TIFFTAG_LERC_PARAMETERS, 2,
-                     poDS->anLercAddCompressionAndVersion);
-    }
-#endif
-    if( poDS->nWebPLevel > 0 && poDS->nCompression == COMPRESSION_WEBP)
-        TIFFSetField(hTIFFTmp, TIFFTAG_WEBP_LEVEL, poDS->nWebPLevel);
-    if( poDS->bWebPLossless && poDS->nCompression == COMPRESSION_WEBP)
-        TIFFSetField(hTIFFTmp, TIFFTAG_WEBP_LOSSLESS, 1);
+
+    poDS->RestoreVolatileParameters();
+
     TIFFSetField(hTIFFTmp, TIFFTAG_PHOTOMETRIC, poDS->nPhotometric);
     TIFFSetField(hTIFFTmp, TIFFTAG_SAMPLEFORMAT, poDS->nSampleFormat);
     TIFFSetField(hTIFFTmp, TIFFTAG_SAMPLESPERPIXEL, poDS->nSamplesPerPixel);
@@ -9241,17 +9225,6 @@ void GTiffDataset::Crystalize()
 
     TIFFWriteCheck( hTIFF, TIFFIsTiled(hTIFF), "GTiffDataset::Crystalize");
 
-    // Keep zip and tiff quality, and jpegcolormode which get reset when
-    // we call TIFFWriteDirectory.
-    int jquality = -1;
-    TIFFGetField(hTIFF, TIFFTAG_JPEGQUALITY, &jquality);
-    int zquality = -1;
-    TIFFGetField(hTIFF, TIFFTAG_ZIPQUALITY, &zquality);
-    int nColorMode = -1;
-    TIFFGetField( hTIFF, TIFFTAG_JPEGCOLORMODE, &nColorMode );
-    int nJpegTablesModeIn = -1;
-    TIFFGetField( hTIFF, TIFFTAG_JPEGTABLESMODE, &nJpegTablesModeIn );
-
     TIFFWriteDirectory( hTIFF );
     if( bStreamingOut )
     {
@@ -9293,15 +9266,7 @@ void GTiffDataset::Crystalize()
         TIFFSetDirectory( hTIFF, 0 );
     }
 
-    // Now, reset zip and tiff quality and jpegcolormode.
-    if( jquality > 0 )
-        TIFFSetField(hTIFF, TIFFTAG_JPEGQUALITY, jquality);
-    if( zquality > 0 )
-        TIFFSetField(hTIFF, TIFFTAG_ZIPQUALITY, zquality);
-    if( nColorMode >= 0 )
-        TIFFSetField(hTIFF, TIFFTAG_JPEGCOLORMODE, nColorMode);
-    if( nJpegTablesModeIn >= 0 )
-        TIFFSetField(hTIFF, TIFFTAG_JPEGTABLESMODE, nJpegTablesModeIn);
+    RestoreVolatileParameters();
 
     nDirOffset = TIFFCurrentDirOffset( hTIFF );
 }
@@ -12017,17 +11982,22 @@ bool GTiffDataset::SetDirectory( toff_t nNewOffset )
     if( !nSetDirResult )
         return false;
 
+    RestoreVolatileParameters();
+
+    return true;
+}
+
+/************************************************************************/
+/*                     RestoreVolatileParameters()                      */
+/************************************************************************/
+
+void GTiffDataset::RestoreVolatileParameters()
+{
 /* -------------------------------------------------------------------- */
 /*      YCbCr JPEG compressed images should be translated on the fly    */
 /*      to RGB by libtiff/libjpeg unless specifically requested         */
 /*      otherwise.                                                      */
 /* -------------------------------------------------------------------- */
-    if( !TIFFGetField( hTIFF, TIFFTAG_COMPRESSION, &(nCompression) ) )
-        nCompression = COMPRESSION_NONE;
-
-    if( !TIFFGetField( hTIFF, TIFFTAG_PHOTOMETRIC, &(nPhotometric) ) )
-        nPhotometric = PHOTOMETRIC_MINISBLACK;
-
     if( nCompression == COMPRESSION_JPEG
         && nPhotometric == PHOTOMETRIC_YCBCR
         && CPLTestBool( CPLGetConfigOption("CONVERT_YCBCR_TO_RGB",
@@ -12068,6 +12038,8 @@ bool GTiffDataset::SetDirectory( toff_t nNewOffset )
         if( nCompression == COMPRESSION_LERC )
         {
             TIFFSetField(hTIFF, TIFFTAG_LERC_MAXZERROR, dfMaxZError);
+            TIFFSetField(hTIFF, TIFFTAG_LERC_PARAMETERS, 2,
+                         anLercAddCompressionAndVersion);
         }
 #endif
         if( nWebPLevel > 0 && nCompression == COMPRESSION_WEBP)
@@ -12075,8 +12047,6 @@ bool GTiffDataset::SetDirectory( toff_t nNewOffset )
         if( bWebPLossless && nCompression == COMPRESSION_WEBP)
             TIFFSetField(hTIFF, TIFFTAG_WEBP_LOSSLESS, 1);
     }
-
-    return true;
 }
 
 /************************************************************************/

From bd459436d22cff285a19ca8dd6465e457b1dcf5f Mon Sep 17 00:00:00 2001
From: Even Rouault <even.rouault@spatialys.com>
Date: Tue, 28 May 2019 22:06:15 +0200
Subject: [PATCH 320/488] Disable randomly failing test (refs #1594)

---
 autotest/gcore/tiff_write.py | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/autotest/gcore/tiff_write.py b/autotest/gcore/tiff_write.py
index f52fab85d0cd..2806bb732c39 100755
--- a/autotest/gcore/tiff_write.py
+++ b/autotest/gcore/tiff_write.py
@@ -7005,8 +7005,10 @@ def test_tiff_write_compression_create_and_createcopy():
     if 'ZSTD' in md['DMD_CREATIONOPTIONLIST']:
         tests.append((['COMPRESS=ZSTD', 'ZSTD_LEVEL=1'],['COMPRESS=ZSTD', 'ZSTD_LEVEL=9']))
 
-    if 'LERC_DEFLATE' in md['DMD_CREATIONOPTIONLIST']:
-        tests.append((['COMPRESS=LERC_DEFLATE', 'ZLEVEL=1'],['COMPRESS=LERC_DEFLATE', 'ZLEVEL=9']))
+    # FIXME: this test randomly fails, especially on Windows, but also on Linux,
+    # for a unknown reason. Nothing suspicious with Valgrind however
+    # if 'LERC_DEFLATE' in md['DMD_CREATIONOPTIONLIST']:
+    #   tests.append((['COMPRESS=LERC_DEFLATE', 'ZLEVEL=1'],['COMPRESS=LERC_DEFLATE', 'ZLEVEL=9']))
 
     if 'WEBP' in md['DMD_CREATIONOPTIONLIST']:
         tests.append((['COMPRESS=WEBP', 'WEBP_LEVEL=95'],['COMPRESS=WEBP', 'WEBP_LEVEL=15']))
@@ -7025,6 +7027,7 @@ def test_tiff_write_compression_create_and_createcopy():
         ds = None
         size_after = gdal.VSIStatL(tmpfile).size
         assert size_after < size_before, (before, after, size_before, size_after)
+        print(before, after, size_before, size_after)
 
         gdaltest.tiff_drv.CreateCopy(tmpfile, src_ds, options = before)
         size_before = gdal.VSIStatL(tmpfile).size

From 66bebac6325f566ec3142a7edcd4b9a6ed71cef9 Mon Sep 17 00:00:00 2001
From: Even Rouault <even.rouault@spatialys.com>
Date: Wed, 29 May 2019 14:20:35 +0200
Subject: [PATCH 321/488] GTiff: fix yesterday regression in which compression
 parameters are ignored in COPY_SRC_OVERVIEWS=YES mode (refs #1594)

---
 autotest/gcore/tiff_write.py |  7 +++++++
 gdal/frmts/gtiff/geotiff.cpp | 37 +++++++++++++++++++-----------------
 2 files changed, 27 insertions(+), 17 deletions(-)

diff --git a/autotest/gcore/tiff_write.py b/autotest/gcore/tiff_write.py
index 2806bb732c39..49d86396358b 100755
--- a/autotest/gcore/tiff_write.py
+++ b/autotest/gcore/tiff_write.py
@@ -7013,6 +7013,13 @@ def test_tiff_write_compression_create_and_createcopy():
     if 'WEBP' in md['DMD_CREATIONOPTIONLIST']:
         tests.append((['COMPRESS=WEBP', 'WEBP_LEVEL=95'],['COMPRESS=WEBP', 'WEBP_LEVEL=15']))
 
+    new_tests = []
+    for (before, after) in tests:
+        new_tests.append((before, after))
+        new_tests.append((before + ['COPY_SRC_OVERVIEWS=YES', 'TILED=YES', 'NUM_THREADS=2'],
+                          after + ['COPY_SRC_OVERVIEWS=YES', 'TILED=YES', 'NUM_THREADS=2']))
+    tests = new_tests
+
     tmpfile = '/vsimem/test_tiff_write_compression_create.tif'
 
     src_ds = gdal.Open('data/rgbsmall.tif')
diff --git a/gdal/frmts/gtiff/geotiff.cpp b/gdal/frmts/gtiff/geotiff.cpp
index d2f7c02fd787..93ef435e914c 100644
--- a/gdal/frmts/gtiff/geotiff.cpp
+++ b/gdal/frmts/gtiff/geotiff.cpp
@@ -325,7 +325,7 @@ class GTiffDataset final : public GDALPamDataset
     bool        bCrystalized;
 
     void        Crystalize();  // TODO: Spelling.
-    void        RestoreVolatileParameters();
+    void        RestoreVolatileParameters(TIFF* l_hTIFF);
 
     GDALColorTable *poColorTable;
 
@@ -8628,14 +8628,14 @@ void GTiffDataset::ThreadCompressionFunc( void* pData )
     if( psJob->nPredictor != PREDICTOR_NONE )
         TIFFSetField(hTIFFTmp, TIFFTAG_PREDICTOR, psJob->nPredictor);
 
-    poDS->RestoreVolatileParameters();
-
     TIFFSetField(hTIFFTmp, TIFFTAG_PHOTOMETRIC, poDS->nPhotometric);
     TIFFSetField(hTIFFTmp, TIFFTAG_SAMPLEFORMAT, poDS->nSampleFormat);
     TIFFSetField(hTIFFTmp, TIFFTAG_SAMPLESPERPIXEL, poDS->nSamplesPerPixel);
     TIFFSetField(hTIFFTmp, TIFFTAG_ROWSPERSTRIP, poDS->nBlockYSize);
     TIFFSetField(hTIFFTmp, TIFFTAG_PLANARCONFIG, poDS->nPlanarConfig);
 
+    poDS->RestoreVolatileParameters(hTIFFTmp);
+
     bool bOK =
         TIFFWriteEncodedStrip(hTIFFTmp, 0, psJob->pabyBuffer,
                               psJob->nBufferSize) == psJob->nBufferSize;
@@ -9266,7 +9266,7 @@ void GTiffDataset::Crystalize()
         TIFFSetDirectory( hTIFF, 0 );
     }
 
-    RestoreVolatileParameters();
+    RestoreVolatileParameters( hTIFF );
 
     nDirOffset = TIFFCurrentDirOffset( hTIFF );
 }
@@ -11982,7 +11982,7 @@ bool GTiffDataset::SetDirectory( toff_t nNewOffset )
     if( !nSetDirResult )
         return false;
 
-    RestoreVolatileParameters();
+    RestoreVolatileParameters( hTIFF );
 
     return true;
 }
@@ -11991,8 +11991,9 @@ bool GTiffDataset::SetDirectory( toff_t nNewOffset )
 /*                     RestoreVolatileParameters()                      */
 /************************************************************************/
 
-void GTiffDataset::RestoreVolatileParameters()
+void GTiffDataset::RestoreVolatileParameters(TIFF* l_hTIFF)
 {
+
 /* -------------------------------------------------------------------- */
 /*      YCbCr JPEG compressed images should be translated on the fly    */
 /*      to RGB by libtiff/libjpeg unless specifically requested         */
@@ -12005,9 +12006,11 @@ void GTiffDataset::RestoreVolatileParameters()
     {
         int nColorMode = JPEGCOLORMODE_RAW;  // Initialize to 0;
 
-        TIFFGetField( hTIFF, TIFFTAG_JPEGCOLORMODE, &nColorMode );
+        TIFFGetField( l_hTIFF, TIFFTAG_JPEGCOLORMODE, &nColorMode );
         if( nColorMode != JPEGCOLORMODE_RGB )
-            TIFFSetField(hTIFF, TIFFTAG_JPEGCOLORMODE, JPEGCOLORMODE_RGB);
+        {
+            TIFFSetField(l_hTIFF, TIFFTAG_JPEGCOLORMODE, JPEGCOLORMODE_RGB);
+        }
     }
 
 /* -------------------------------------------------------------------- */
@@ -12022,30 +12025,30 @@ void GTiffDataset::RestoreVolatileParameters()
             CPLDebug( "GTiff", "Propagate JPEG_QUALITY(%d) in SetDirectory()",
                       nJpegQuality );
 #endif
-            TIFFSetField(hTIFF, TIFFTAG_JPEGQUALITY, nJpegQuality);
+            TIFFSetField(l_hTIFF, TIFFTAG_JPEGQUALITY, nJpegQuality);
         }
         if(nJpegTablesMode >= 0 && nCompression == COMPRESSION_JPEG)
-            TIFFSetField(hTIFF, TIFFTAG_JPEGTABLESMODE, nJpegTablesMode);
+            TIFFSetField(l_hTIFF, TIFFTAG_JPEGTABLESMODE, nJpegTablesMode);
         if(nZLevel > 0 && (nCompression == COMPRESSION_ADOBE_DEFLATE ||
                            nCompression == COMPRESSION_LERC) )
-            TIFFSetField(hTIFF, TIFFTAG_ZIPQUALITY, nZLevel);
+            TIFFSetField(l_hTIFF, TIFFTAG_ZIPQUALITY, nZLevel);
         if(nLZMAPreset > 0 && nCompression == COMPRESSION_LZMA)
-            TIFFSetField(hTIFF, TIFFTAG_LZMAPRESET, nLZMAPreset);
+            TIFFSetField(l_hTIFF, TIFFTAG_LZMAPRESET, nLZMAPreset);
         if( nZSTDLevel > 0 && (nCompression == COMPRESSION_ZSTD ||
                                nCompression == COMPRESSION_LERC) )
-            TIFFSetField(hTIFF, TIFFTAG_ZSTD_LEVEL, nZSTDLevel);
+            TIFFSetField(l_hTIFF, TIFFTAG_ZSTD_LEVEL, nZSTDLevel);
 #if HAVE_LERC
         if( nCompression == COMPRESSION_LERC )
         {
-            TIFFSetField(hTIFF, TIFFTAG_LERC_MAXZERROR, dfMaxZError);
-            TIFFSetField(hTIFF, TIFFTAG_LERC_PARAMETERS, 2,
+            TIFFSetField(l_hTIFF, TIFFTAG_LERC_MAXZERROR, dfMaxZError);
+            TIFFSetField(l_hTIFF, TIFFTAG_LERC_PARAMETERS, 2,
                          anLercAddCompressionAndVersion);
         }
 #endif
         if( nWebPLevel > 0 && nCompression == COMPRESSION_WEBP)
-            TIFFSetField(hTIFF, TIFFTAG_WEBP_LEVEL, nWebPLevel);
+            TIFFSetField(l_hTIFF, TIFFTAG_WEBP_LEVEL, nWebPLevel);
         if( bWebPLossless && nCompression == COMPRESSION_WEBP)
-            TIFFSetField(hTIFF, TIFFTAG_WEBP_LOSSLESS, 1);
+            TIFFSetField(l_hTIFF, TIFFTAG_WEBP_LOSSLESS, 1);
     }
 }
 

From f18efef6dc5498a151ec6878c5633eee41272936 Mon Sep 17 00:00:00 2001
From: Even Rouault <even.rouault@spatialys.com>
Date: Wed, 5 Jun 2019 19:41:02 +0200
Subject: [PATCH 322/488] GDALInvGeoTransform(): make it work with scale and
 rotation/skew coefficients of small absolute value (fixes #1615)

---
 autotest/gcore/misc.py       | 31 ++++++++++++++++++++++++-------
 gdal/alg/gdaltransformer.cpp |  5 ++++-
 2 files changed, 28 insertions(+), 8 deletions(-)

diff --git a/autotest/gcore/misc.py b/autotest/gcore/misc.py
index 3168805841e9..02c9e0243e05 100755
--- a/autotest/gcore/misc.py
+++ b/autotest/gcore/misc.py
@@ -427,18 +427,35 @@ def test_misc_6():
 
 def test_misc_7():
 
-    try:
-        gdal.InvGeoTransform
-    except AttributeError:
-        pytest.skip()
-
     gt = (10, 0.1, 0, 20, 0, -1.0)
     res = gdal.InvGeoTransform(gt)
     expected_inv_gt = (-100.0, 10.0, 0.0, 20.0, 0.0, -1.0)
     for i in range(6):
-        assert abs(res[i] - expected_inv_gt[i]) <= 1e-6
+        assert abs(res[i] - expected_inv_gt[i]) <= 1e-6, res
+
+    gt = (10, 1, 1, 20, 2, 2)
+    res = gdal.InvGeoTransform(gt)
+    assert not res
+
+    gt = (10, 1e10, 1e10, 20, 2e10, 2e10)
+    res = gdal.InvGeoTransform(gt)
+    assert not res
+
+    gt = (10, 1e-10, 1e-10, 20, 2e-10, 2e-10)
+    res = gdal.InvGeoTransform(gt)
+    assert not res
+
+    # Test fix for #1615
+    gt = (-2, 1e-8, 1e-9, 52, 1e-9, -1e-8)
+    res = gdal.InvGeoTransform(gt)
+    expected_inv_gt = (-316831683.16831684, 99009900.990099, 9900990.099009901,
+                       5168316831.683168, 9900990.099009901, -99009900.990099)
+    for i in range(6):
+        assert abs(res[i] - expected_inv_gt[i]) <= 1e-6, res
+    res2 = gdal.InvGeoTransform(res)
+    for i in range(6):
+        assert abs(res2[i] - gt[i]) <= 1e-6, res2
 
-    
 ###############################################################################
 # Test gdal.ApplyGeoTransform()
 
diff --git a/gdal/alg/gdaltransformer.cpp b/gdal/alg/gdaltransformer.cpp
index c81a5fb0b1e8..78c615784b93 100644
--- a/gdal/alg/gdaltransformer.cpp
+++ b/gdal/alg/gdaltransformer.cpp
@@ -3306,8 +3306,11 @@ int CPL_STDCALL GDALInvGeoTransform( double *gt_in, double *gt_out )
     // Compute determinate.
 
     const double det = gt_in[1] * gt_in[5] - gt_in[2] * gt_in[4];
+    const double magnitude = std::max(
+            std::max(fabs(gt_in[1]), fabs(gt_in[2])),
+            std::max(fabs(gt_in[4]), fabs(gt_in[5])));
 
-    if( fabs(det) < 0.000000000000001 )
+    if( fabs(det) <= 1e-10 * magnitude * magnitude )
         return 0;
 
     const double inv_det = 1.0 / det;

From 6f18213f88816a0a39d40b86cb7ec7ccbe55c979 Mon Sep 17 00:00:00 2001
From: jbo-ads <jbo-ads@laposte.net>
Date: Mon, 10 Jun 2019 13:39:10 +0000
Subject: [PATCH 323/488] ES: Set 'application/json' in RunRequest() with POST
 (fixes #1628)

---
 gdal/ogr/ogrsf_frmts/elastic/ogrelasticdatasource.cpp | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/gdal/ogr/ogrsf_frmts/elastic/ogrelasticdatasource.cpp b/gdal/ogr/ogrsf_frmts/elastic/ogrelasticdatasource.cpp
index 1160f2faad0c..be603c2f48f6 100644
--- a/gdal/ogr/ogrsf_frmts/elastic/ogrelasticdatasource.cpp
+++ b/gdal/ogr/ogrsf_frmts/elastic/ogrelasticdatasource.cpp
@@ -532,6 +532,8 @@ json_object* OGRElasticDataSource::RunRequest(const char* pszURL,
     {
         papszOptions = CSLSetNameValue(papszOptions, "POSTFIELDS",
                                        pszPostContent);
+        papszOptions = CSLAddNameValue(papszOptions, "HEADERS",
+                "Content-Type: application/json; charset=UTF-8");
     }
 
     CPLPushErrorHandler(CPLQuietErrorHandler);
@@ -717,11 +719,10 @@ bool OGRElasticDataSource::UploadFile( const CPLString &url,
     }
     else
     {
-
         papszOptions = CSLAddNameValue(papszOptions, "POSTFIELDS", data.c_str());
+        papszOptions = CSLAddNameValue(papszOptions, "HEADERS",
+                "Content-Type: application/json; charset=UTF-8");
     }
-    papszOptions = CSLAddNameValue(papszOptions, "HEADERS",
-            "Content-Type: application/json; charset=UTF-8");
 
     CPLHTTPResult* psResult = HTTPFetch(url, papszOptions);
     CSLDestroy(papszOptions);

From d1fbcf9f2c25f9cd9ac444761cde8c7b39338fc2 Mon Sep 17 00:00:00 2001
From: Nick Peihl <nick.peihl@elastic.co>
Date: Mon, 10 Jun 2019 15:16:26 -0700
Subject: [PATCH 324/488] Elasticsearch: GeoJSON type field should be mapped as
 text in ES>=5

When GeoJSON data was converted to Elasticsearch versions >=5, the GeoJSON type field was incorrectly mapped to a `string` instead of `text`.
---
 gdal/ogr/ogrsf_frmts/elastic/ogrelasticlayer.cpp | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/gdal/ogr/ogrsf_frmts/elastic/ogrelasticlayer.cpp b/gdal/ogr/ogrsf_frmts/elastic/ogrelasticlayer.cpp
index 95f19dd47a5d..0beab83cc811 100644
--- a/gdal/ogr/ogrsf_frmts/elastic/ogrelasticlayer.cpp
+++ b/gdal/ogr/ogrsf_frmts/elastic/ogrelasticlayer.cpp
@@ -1667,7 +1667,8 @@ CPLString OGRElasticLayer::BuildMap() {
             if( bAddGeoJSONType )
             {
                 json_object *geometry = AppendGroup(poContainer, pszLastComponent);
-                json_object_object_add(geometry, "type", AddPropertyMap("string"));
+                json_object_object_add(geometry, "type", AddPropertyMap(
+                   m_poDS->m_nMajorVersion >= 5 ? "text" : "string"));
                 json_object_object_add(geometry, "coordinates", geo_point);
             }
             else

From a2ed4ac165fa3d0622d71849890b3e4ddaebecab Mon Sep 17 00:00:00 2001
From: Even Rouault <even.rouault@spatialys.com>
Date: Mon, 17 Jun 2019 18:33:13 +0200
Subject: [PATCH 325/488] GDALCreateReprojectionTransformerEx(): do not emit
 error if reverse transformation fails, and fix crash when trying to use null
 reverse transformation

---
 autotest/gcore/transformer.py | 22 ++++++++++++++++++++++
 gdal/alg/gdaltransformer.cpp  | 22 ++++++++++++++++++++--
 2 files changed, 42 insertions(+), 2 deletions(-)

diff --git a/autotest/gcore/transformer.py b/autotest/gcore/transformer.py
index a83e820810ae..f5200508be6e 100755
--- a/autotest/gcore/transformer.py
+++ b/autotest/gcore/transformer.py
@@ -711,3 +711,25 @@ def test_transformer_17():
     with gdaltest.error_handler():
         tr = gdal.Transformer(ds, None, ['METHOD=RPC', 'RPC_DEM=/vsimem/i/donot/exist/dem.tif'])
     assert tr is None
+
+###############################################################################
+# Test reprojection transformer without reverse path
+# NOTE: in case the inverse airy method is implemented some day, this test
+# might fail
+
+def test_transformer_no_reverse_method():
+    sr1 = osr.SpatialReference()
+    sr1.SetFromUserInput('+proj=longlat +ellps=GRS80')
+    sr2 = osr.SpatialReference()
+    sr2.SetFromUserInput('+proj=airy +ellps=GRS80 +wktext')
+    tr = gdal.Transformer(None, None, ['SRC_SRS=' + sr1.ExportToWkt(), 'DST_SRS=' + sr2.ExportToWkt()])
+    assert tr
+
+    (success, pnt) = tr.TransformPoint(0, 2, 49)
+    assert success
+    assert abs(pnt[0] - 141270.54731856665) <= 1e-3, pnt
+    assert abs(pnt[1] - 4656605.104980032) <= 1e-3, pnt
+
+    with gdaltest.error_handler():
+        (success, pnt) = tr.TransformPoint(1, 2, 49)
+    assert not success
diff --git a/gdal/alg/gdaltransformer.cpp b/gdal/alg/gdaltransformer.cpp
index 78c615784b93..b7afa945eed8 100644
--- a/gdal/alg/gdaltransformer.cpp
+++ b/gdal/alg/gdaltransformer.cpp
@@ -2422,8 +2422,10 @@ void *GDALCreateReprojectionTransformer( const char *pszSrcWKT,
             CPLCalloc(sizeof(GDALReprojectionTransformInfo), 1));
 
     psInfo->poForwardTransform = poForwardTransform;
+    CPLPushErrorHandler(CPLQuietErrorHandler);
     psInfo->poReverseTransform =
         OGRCreateCoordinateTransformation(&oDstSRS, &oSrcSRS);
+    CPLPopErrorHandler();
 
     memcpy( psInfo->sTI.abySignature,
             GDAL_GTI2_SIGNATURE,
@@ -2489,8 +2491,24 @@ int GDALReprojectionTransform( void *pTransformArg, int bDstToSrc,
     int bSuccess;
 
     if( bDstToSrc )
-        bSuccess = psInfo->poReverseTransform->TransformEx(
-            nPointCount, padfX, padfY, padfZ, panSuccess );
+    {
+        if( psInfo->poReverseTransform == nullptr )
+        {
+            CPLError(CE_Failure, CPLE_AppDefined,
+                     "Inverse coordinate transformation cannot be instantiated");
+            if( panSuccess )
+            {
+                for( int i = 0; i < nPointCount; i++ )
+                    panSuccess[i] = FALSE;
+            }
+            bSuccess = false;
+        }
+        else
+        {
+            bSuccess = psInfo->poReverseTransform->TransformEx(
+                nPointCount, padfX, padfY, padfZ, panSuccess );
+        }
+    }
     else
         bSuccess = psInfo->poForwardTransform->TransformEx(
             nPointCount, padfX, padfY, padfZ, panSuccess );

From 32371deeb5cf8dee2e7e4abfb8303299ebf85968 Mon Sep 17 00:00:00 2001
From: Even Rouault <even.rouault@spatialys.com>
Date: Tue, 18 Jun 2019 17:02:14 +0200
Subject: [PATCH 326/488] GTiffDataset::PushMetadataToPam(): early exit when
 PAM is disabled, to avoid error messages

---
 gdal/frmts/gtiff/geotiff.cpp | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/gdal/frmts/gtiff/geotiff.cpp b/gdal/frmts/gtiff/geotiff.cpp
index 93ef435e914c..8d6dc5344af8 100644
--- a/gdal/frmts/gtiff/geotiff.cpp
+++ b/gdal/frmts/gtiff/geotiff.cpp
@@ -11715,6 +11715,9 @@ bool GTiffDataset::WriteMetadata( GDALDataset *poSrcDS, TIFF *l_hTIFF,
 void GTiffDataset::PushMetadataToPam()
 
 {
+    if( GetPamFlags() & GPF_DISABLED )
+        return;
+
     const bool bStardardColorInterp =
         IsStandardColorInterpretation(this, nPhotometric, papszCreationOptions);
 

From 33038ab2ada763440be99c4622635eac327e764b Mon Sep 17 00:00:00 2001
From: Even Rouault <even.rouault@spatialys.com>
Date: Tue, 18 Jun 2019 18:16:34 +0200
Subject: [PATCH 327/488] Warper: fix GDAL 2.3 regression in a situation wih
 source nodata value, multiple bands, non-integer data type and nearest
 resampling where the logic to detect which source pixels are nodata was
 inverted (fixes #1656)

---
 autotest/alg/warp.py        | 17 +++++++++++++++++
 gdal/alg/gdalwarpkernel.cpp |  2 +-
 2 files changed, 18 insertions(+), 1 deletion(-)

diff --git a/autotest/alg/warp.py b/autotest/alg/warp.py
index 72902b45c4b5..14cfbea0f6bf 100755
--- a/autotest/alg/warp.py
+++ b/autotest/alg/warp.py
@@ -41,6 +41,7 @@
 
 import gdaltest
 import pytest
+import struct
 
 ###############################################################################
 # Verify that we always getting the same image when warping.
@@ -1679,3 +1680,19 @@ def test_warp_56():
         warped = pix_ds.GetRasterBand(1).ReadAsArray()[0, 0]
         assert abs(warped - exp) <= 0.6, \
             'offset: {}, expected: {:.0f}, got: {}'.format(off, exp, warped)
+
+
+###############################################################################
+# Test bugfix for #1656
+
+def test_warp_nearest_real_nodata_multiple_band():
+
+    src_ds = gdal.GetDriverByName('MEM').Create('', 2, 1, 2, gdal.GDT_Float64)
+    src_ds.GetRasterBand(1).SetNoDataValue(65535)
+    src_ds.GetRasterBand(1).WriteRaster(0,0,1,1,struct.pack('d', 65535))
+    src_ds.GetRasterBand(2).SetNoDataValue(65535)
+    src_ds.GetRasterBand(2).WriteRaster(0,0,1,1,struct.pack('d', 65535))
+    src_ds.SetGeoTransform([1, 1, 0,
+                            1, 0, 1])
+    out_ds = gdal.Warp('', src_ds, options = '-of MEM')
+    assert struct.unpack('d' * 4, out_ds.ReadRaster()) == struct.unpack('d' * 4, src_ds.ReadRaster())
diff --git a/gdal/alg/gdalwarpkernel.cpp b/gdal/alg/gdalwarpkernel.cpp
index fc59a2fc0c7a..dd763c63ce67 100644
--- a/gdal/alg/gdalwarpkernel.cpp
+++ b/gdal/alg/gdalwarpkernel.cpp
@@ -1930,7 +1930,7 @@ static bool GWKGetPixelValueReal( GDALWarpKernel *poWK, int iBand,
 
     if( poWK->papanBandSrcValid != nullptr
         && poWK->papanBandSrcValid[iBand] != nullptr
-        && ((poWK->papanBandSrcValid[iBand][iSrcOffset>>5]
+        && !((poWK->papanBandSrcValid[iBand][iSrcOffset>>5]
               & (0x01 << (iSrcOffset & 0x1f)))) )
     {
         *pdfDensity = 0.0;

From deac7f403df9ab60ddd8de36ae632c7378c187b5 Mon Sep 17 00:00:00 2001
From: Even Rouault <even.rouault@spatialys.com>
Date: Tue, 18 Jun 2019 18:48:12 +0200
Subject: [PATCH 328/488] Fix pyflakes issue of previous commit

---
 autotest/alg/warp.py | 1 -
 1 file changed, 1 deletion(-)

diff --git a/autotest/alg/warp.py b/autotest/alg/warp.py
index 14cfbea0f6bf..1b83313cd94f 100755
--- a/autotest/alg/warp.py
+++ b/autotest/alg/warp.py
@@ -1574,7 +1574,6 @@ def test_warp_53():
                                 options='-of MEM -b 1 -b 1 -ot ' + typestr)
         src_ds.GetRasterBand(2).SetColorInterpretation(gdal.GCI_AlphaBand)
         src_ds.GetRasterBand(2).Fill(255)
-        import struct
         zero = struct.pack('B' * 1, 0)
         src_ds.GetRasterBand(2).WriteRaster(10, 10, 1, 1, zero,
                                             buf_type=gdal.GDT_Byte)

From 10f825e87e1ec29b6cc379fe1ee24e87fdf3f536 Mon Sep 17 00:00:00 2001
From: Even Rouault <even.rouault@spatialys.com>
Date: Fri, 7 Jun 2019 20:50:53 +0200
Subject: [PATCH 329/488] /vsis3/: for a long living file handle, refresh
 credentials coming from EC2/AIM (fixes #1593)

---
 gdal/port/cpl_aws.cpp | 30 +++++++++++++++++++++++++-----
 gdal/port/cpl_aws.h   | 12 +++++++-----
 2 files changed, 32 insertions(+), 10 deletions(-)

diff --git a/gdal/port/cpl_aws.cpp b/gdal/port/cpl_aws.cpp
index da073aba0e02..52f78288989c 100644
--- a/gdal/port/cpl_aws.cpp
+++ b/gdal/port/cpl_aws.cpp
@@ -380,7 +380,8 @@ VSIS3HandleHelper::VSIS3HandleHelper( const CPLString& osSecretAccessKey,
                                       const CPLString& osBucket,
                                       const CPLString& osObjectKey,
                                       bool bUseHTTPS,
-                                      bool bUseVirtualHosting ) :
+                                      bool bUseVirtualHosting,
+                                      bool bFromEC2 ) :
     m_osURL(BuildURL(osEndpoint, osBucket, osObjectKey, bUseHTTPS,
                      bUseVirtualHosting)),
     m_osSecretAccessKey(osSecretAccessKey),
@@ -392,7 +393,8 @@ VSIS3HandleHelper::VSIS3HandleHelper( const CPLString& osSecretAccessKey,
     m_osBucket(osBucket),
     m_osObjectKey(osObjectKey),
     m_bUseHTTPS(bUseHTTPS),
-    m_bUseVirtualHosting(bUseVirtualHosting)
+    m_bUseVirtualHosting(bUseVirtualHosting),
+    m_bFromEC2(bFromEC2)
 {}
 
 /************************************************************************/
@@ -969,8 +971,11 @@ bool VSIS3HandleHelper::GetConfiguration(CSLConstList papszOptions,
                                          CPLString& osSecretAccessKey,
                                          CPLString& osAccessKeyId,
                                          CPLString& osSessionToken,
-                                         CPLString& osRegion)
+                                         CPLString& osRegion,
+                                         bool& bFromEC2)
 {
+    bFromEC2 = false;
+
     // AWS_REGION is GDAL specific. Later overloaded by standard
     // AWS_DEFAULT_REGION
     osRegion = CSLFetchNameValueDef(papszOptions, "AWS_REGION",
@@ -1016,6 +1021,7 @@ bool VSIS3HandleHelper::GetConfiguration(CSLConstList papszOptions,
     if( GetConfigurationFromEC2(osSecretAccessKey, osAccessKeyId,
                                 osSessionToken) )
     {
+        bFromEC2 = true;
         return true;
     }
 
@@ -1065,9 +1071,10 @@ VSIS3HandleHelper* VSIS3HandleHelper::BuildFromURI( const char* pszURI,
     CPLString osAccessKeyId;
     CPLString osSessionToken;
     CPLString osRegion;
+    bool bFromEC2 = false;
     if( !GetConfiguration(papszOptions,
                           osSecretAccessKey, osAccessKeyId,
-                          osSessionToken, osRegion) )
+                          osSessionToken, osRegion, bFromEC2) )
     {
         return nullptr;
     }
@@ -1106,7 +1113,7 @@ VSIS3HandleHelper* VSIS3HandleHelper::BuildFromURI( const char* pszURI,
                                  osEndpoint, osRegion,
                                  osRequestPayer,
                                  osBucket, osObjectKey, bUseHTTPS,
-                                 bUseVirtualHosting);
+                                 bUseVirtualHosting, bFromEC2);
 }
 
 /************************************************************************/
@@ -1165,6 +1172,19 @@ VSIS3HandleHelper::GetCurlHeaders( const CPLString& osVerb,
                                    const void *pabyDataContent,
                                    size_t nBytesContent ) const
 {
+    if( m_bFromEC2 )
+    {
+        CPLString osSecretAccessKey, osAccessKeyId, osSessionToken;
+        if( GetConfigurationFromEC2(osSecretAccessKey,
+                                    osAccessKeyId,
+                                    osSessionToken) )
+        {
+            m_osSecretAccessKey = osSecretAccessKey;
+            m_osAccessKeyId = osAccessKeyId;
+            m_osSessionToken = osSessionToken;
+        }
+    }
+
     CPLString osXAMZDate = CPLGetConfigOption("AWS_TIMESTAMP", "");
     if( osXAMZDate.empty() )
         osXAMZDate = CPLGetAWS_SIGN4_Timestamp();
diff --git a/gdal/port/cpl_aws.h b/gdal/port/cpl_aws.h
index 269fe77ddc70..0ef6b7f796d9 100644
--- a/gdal/port/cpl_aws.h
+++ b/gdal/port/cpl_aws.h
@@ -128,9 +128,9 @@ class VSIS3HandleHelper final: public IVSIS3LikeHandleHelper
         CPL_DISALLOW_COPY_ASSIGN(VSIS3HandleHelper)
 
         CPLString m_osURL{};
-        CPLString m_osSecretAccessKey{};
-        CPLString m_osAccessKeyId{};
-        CPLString m_osSessionToken{};
+        mutable CPLString m_osSecretAccessKey{};
+        mutable CPLString m_osAccessKeyId{};
+        mutable CPLString m_osSessionToken{};
         CPLString m_osEndpoint{};
         CPLString m_osRegion{};
         CPLString m_osRequestPayer{};
@@ -138,6 +138,7 @@ class VSIS3HandleHelper final: public IVSIS3LikeHandleHelper
         CPLString m_osObjectKey{};
         bool m_bUseHTTPS = false;
         bool m_bUseVirtualHosting = false;
+        bool m_bFromEC2 = false;
 
         void RebuildURL() override;
 
@@ -156,7 +157,8 @@ class VSIS3HandleHelper final: public IVSIS3LikeHandleHelper
                                      CPLString& osSecretAccessKey,
                                      CPLString& osAccessKeyId,
                                      CPLString& osSessionToken,
-                                     CPLString& osRegion);
+                                     CPLString& osRegion,
+                                     bool& bFromEC2);
   protected:
 
     public:
@@ -168,7 +170,7 @@ class VSIS3HandleHelper final: public IVSIS3LikeHandleHelper
                     const CPLString& osRequestPayer,
                     const CPLString& osBucket,
                     const CPLString& osObjectKey,
-                    bool bUseHTTPS, bool bUseVirtualHosting);
+                    bool bUseHTTPS, bool bUseVirtualHosting, bool bFromEC2);
        ~VSIS3HandleHelper();
 
         static VSIS3HandleHelper* BuildFromURI(const char* pszURI,

From b2155cc20097aa9ab786396ed9bfe45686193e93 Mon Sep 17 00:00:00 2001
From: Even Rouault <even.rouault@spatialys.com>
Date: Thu, 20 Jun 2019 10:43:54 +0200
Subject: [PATCH 330/488] VRT Python: also probe libpython3.Xm.so.1.0 (fixes
 #1660)

---
 gdal/frmts/vrt/vrtderivedrasterband.cpp | 39 ++++++++++++++++---------
 1 file changed, 25 insertions(+), 14 deletions(-)

diff --git a/gdal/frmts/vrt/vrtderivedrasterband.cpp b/gdal/frmts/vrt/vrtderivedrasterband.cpp
index b4ff53700f19..dfc362aaa316 100644
--- a/gdal/frmts/vrt/vrtderivedrasterband.cpp
+++ b/gdal/frmts/vrt/vrtderivedrasterband.cpp
@@ -301,15 +301,32 @@ static bool LoadPythonAPI()
     }
 #endif
 
-    // Then try to find the libpython that corresponds to the python binary
-    // in the PATH
-    if( libHandle == nullptr )
-    {
 #if defined(__MACH__) && defined(__APPLE__)
 #define SO_EXT "dylib"
 #else
+#define IS_SO_EXT
 #define SO_EXT "so"
 #endif
+
+    const auto tryDlopen = [](CPLString osPythonSO)
+    {
+        CPLDebug("VRT", "Trying %s", osPythonSO.c_str());
+        auto l_libHandle = dlopen(osPythonSO.c_str(), RTLD_NOW | RTLD_GLOBAL);
+#ifdef IS_SO_EXT
+        if( l_libHandle == nullptr )
+        {
+            osPythonSO += ".1.0";
+            CPLDebug("VRT", "Trying %s", osPythonSO.c_str());
+            l_libHandle = dlopen(osPythonSO.c_str(), RTLD_NOW | RTLD_GLOBAL);
+        }
+#endif
+        return l_libHandle;
+    };
+
+    // Then try to find the libpython that corresponds to the python binary
+    // in the PATH
+    if( libHandle == nullptr )
+    {
         CPLString osVersion;
         char* pszPath = getenv("PATH");
         if( pszPath != nullptr
@@ -417,19 +434,14 @@ static bool LoadPythonAPI()
 
         if( !osVersion.empty() )
         {
-            CPLString osPythonSO("libpython");
-            osPythonSO += osVersion + "." SO_EXT;
-            CPLDebug("VRT", "Trying %s", osPythonSO.c_str());
-            libHandle = dlopen(osPythonSO, RTLD_NOW | RTLD_GLOBAL);
+            libHandle = tryDlopen("libpython" + osVersion + "." SO_EXT);
             if( libHandle != nullptr )
             {
                 CPLDebug("VRT", "... success");
             }
             else if( osVersion[0] == '3' )
             {
-                osPythonSO = "libpython" + osVersion + "m." SO_EXT;
-                CPLDebug("VRT", "Trying %s", osPythonSO.c_str());
-                libHandle = dlopen(osPythonSO, RTLD_NOW | RTLD_GLOBAL);
+                libHandle = tryDlopen("libpython" + osVersion + "m." SO_EXT);
                 if( libHandle != nullptr )
                 {
                     CPLDebug("VRT", "... success");
@@ -439,7 +451,7 @@ static bool LoadPythonAPI()
     }
 
     // Otherwise probe a few known objects.
-    // Note: update vrt_tutorial.dox if change
+    // Note: update doc/source/drivers/raster/vrt.rst if change
     if( libHandle == nullptr )
     {
         const char* const apszPythonSO[] = { "libpython2.7." SO_EXT,
@@ -452,8 +464,7 @@ static bool LoadPythonAPI()
         for( size_t i = 0; libHandle == nullptr &&
                             i < CPL_ARRAYSIZE(apszPythonSO); ++i )
         {
-            CPLDebug("VRT", "Trying %s", apszPythonSO[i]);
-            libHandle = dlopen(apszPythonSO[i], RTLD_NOW | RTLD_GLOBAL);
+            libHandle = tryDlopen(apszPythonSO[i]);
             if( libHandle != nullptr )
                 CPLDebug("VRT", "... success");
         }

From 3c353422ddd6f5d290f304f18af31a60ef90708e Mon Sep 17 00:00:00 2001
From: Even Rouault <even.rouault@spatialys.com>
Date: Fri, 21 Jun 2019 00:39:58 +0200
Subject: [PATCH 331/488] /vsicurl/: allow 'Connection timed out' CURL errors
 as candidate for HTTP retry

---
 gdal/port/cpl_http.cpp         | 92 +++++++++++++++++-----------------
 gdal/port/cpl_http.h           |  3 +-
 gdal/port/cpl_vsil_curl.cpp    | 10 ++--
 gdal/port/cpl_vsil_webhdfs.cpp |  2 +-
 4 files changed, 52 insertions(+), 55 deletions(-)

diff --git a/gdal/port/cpl_http.cpp b/gdal/port/cpl_http.cpp
index 635f5ddc593a..b8fb8ae3efbc 100644
--- a/gdal/port/cpl_http.cpp
+++ b/gdal/port/cpl_http.cpp
@@ -500,12 +500,14 @@ char** CPLHTTPGetOptionsFromEnv()
 /************************************************************************/
 
 double CPLHTTPGetNewRetryDelay(int response_code, double dfOldDelay,
-                               const char* pszErrBuf)
+                               const char* pszErrBuf,
+                               const char* pszCurlError)
 {
     if( response_code == 429 || response_code == 500 ||
         (response_code >= 502 && response_code <= 504) ||
         // S3 sends some client timeout errors as 400 Client Error
-        (response_code == 400 && pszErrBuf && strstr(pszErrBuf, "RequestTimeout")) )
+        (response_code == 400 && pszErrBuf && strstr(pszErrBuf, "RequestTimeout")) ||
+        (pszCurlError && strstr(pszCurlError, "Connection timed out")) )
     {
         // Use an exponential backoff factor of 2 plus some random jitter
         // We don't care about cryptographic quality randomness, hence:
@@ -904,12 +906,9 @@ CPLHTTPResult *CPLHTTPFetchEx( const char *pszURL, CSLConstList papszOptions,
     double dfRetryDelaySecs = CPLAtof(pszRetryDelay);
     int nMaxRetries = atoi(pszMaxRetries);
     int nRetryCount = 0;
-    bool bRequestRetry;
 
-    do
+    while(true)
     {
-        bRequestRetry = false;
-
 /* -------------------------------------------------------------------- */
 /*      Execute the request, waiting for results.                       */
 /* -------------------------------------------------------------------- */
@@ -926,6 +925,40 @@ CPLHTTPResult *CPLHTTPFetchEx( const char *pszURL, CSLConstList papszOptions,
         if( psResult->pszContentType != nullptr )
             psResult->pszContentType = CPLStrdup(psResult->pszContentType);
 
+        long response_code = 0;
+        curl_easy_getinfo(http_handle, CURLINFO_RESPONSE_CODE,
+                            &response_code);
+        if( response_code != 200 )
+        {
+            const double dfNewRetryDelay = CPLHTTPGetNewRetryDelay(
+                    static_cast<int>(response_code),
+                    dfRetryDelaySecs,
+                    reinterpret_cast<const char*>(psResult->pabyData),
+                    szCurlErrBuf);
+            if( dfNewRetryDelay > 0 && nRetryCount < nMaxRetries )
+            {
+                CPLError(CE_Warning, CPLE_AppDefined,
+                            "HTTP error code: %d - %s. "
+                            "Retrying again in %.1f secs",
+                            static_cast<int>(response_code), pszURL,
+                            dfRetryDelaySecs);
+                CPLSleep(dfRetryDelaySecs);
+                dfRetryDelaySecs = dfNewRetryDelay;
+                nRetryCount++;
+
+                CPLFree(psResult->pszContentType);
+                psResult->pszContentType = nullptr;
+                CSLDestroy(psResult->papszHeaders);
+                psResult->papszHeaders = nullptr;
+                CPLFree(psResult->pabyData);
+                psResult->pabyData = nullptr;
+                psResult->nDataLen = 0;
+                psResult->nDataAlloc = 0;
+
+                continue;
+            }
+        }
+
 /* -------------------------------------------------------------------- */
 /*      Have we encountered some sort of error?                         */
 /* -------------------------------------------------------------------- */
@@ -971,52 +1004,17 @@ CPLHTTPResult *CPLHTTPFetchEx( const char *pszURL, CSLConstList papszOptions,
         }
         else
         {
-            // HTTP errors do not trigger curl errors. But we need to
-            // propagate them to the caller though.
-            long response_code = 0;
-            curl_easy_getinfo(http_handle, CURLINFO_RESPONSE_CODE,
-                              &response_code);
-
             if( response_code >= 400 && response_code < 600 )
             {
-                const double dfNewRetryDelay = CPLHTTPGetNewRetryDelay(
-                    static_cast<int>(response_code),
-                    dfRetryDelaySecs,
-                    reinterpret_cast<const char*>(psResult->pabyData));
-                if( dfNewRetryDelay > 0 && nRetryCount < nMaxRetries )
-                {
-                    CPLError(CE_Warning, CPLE_AppDefined,
-                             "HTTP error code: %d - %s. "
-                             "Retrying again in %.1f secs",
-                             static_cast<int>(response_code), pszURL,
-                             dfRetryDelaySecs);
-                    CPLSleep(dfRetryDelaySecs);
-                    dfRetryDelaySecs = dfNewRetryDelay;
-                    nRetryCount++;
-
-                    CPLFree(psResult->pszContentType);
-                    psResult->pszContentType = nullptr;
-                    CSLDestroy(psResult->papszHeaders);
-                    psResult->papszHeaders = nullptr;
-                    CPLFree(psResult->pabyData);
-                    psResult->pabyData = nullptr;
-                    psResult->nDataLen = 0;
-                    psResult->nDataAlloc = 0;
-
-                    bRequestRetry = true;
-                }
-                else
-                {
-                    psResult->pszErrBuf =
-                        CPLStrdup(CPLSPrintf("HTTP error code : %d",
-                                             static_cast<int>(response_code)));
-                    CPLError(CE_Failure, CPLE_AppDefined,
-                             "%s", psResult->pszErrBuf);
-                }
+                psResult->pszErrBuf =
+                    CPLStrdup(CPLSPrintf("HTTP error code : %d",
+                                            static_cast<int>(response_code)));
+                CPLError(CE_Failure, CPLE_AppDefined,
+                            "%s", psResult->pszErrBuf);
             }
         }
+        break;
     }
-    while( bRequestRetry );
 
     if( !pszPersistent )
         curl_easy_cleanup( http_handle );
diff --git a/gdal/port/cpl_http.h b/gdal/port/cpl_http.h
index 4fec7305cfe9..b6fda0d33b06 100644
--- a/gdal/port/cpl_http.h
+++ b/gdal/port/cpl_http.h
@@ -138,7 +138,8 @@ CPL_C_END
 // Not sure if this belong here, used in cpl_http.cpp, cpl_vsil_curl.cpp and frmts/wms/gdalhttp.cpp
 void* CPLHTTPSetOptions(void *pcurl, const char *pszURL, const char * const* papszOptions);
 char** CPLHTTPGetOptionsFromEnv();
-double CPLHTTPGetNewRetryDelay(int response_code, double dfOldDelay, const char* pszErrBuf);
+double CPLHTTPGetNewRetryDelay(int response_code, double dfOldDelay,
+                               const char* pszErrBuf, const char* pszCurlError);
 void* CPLHTTPIgnoreSigPipe();
 void CPLHTTPRestoreSigPipeHandler(void* old_handler);
 bool CPLMultiPerformWait(void* hCurlMultiHandle, int& repeats);
diff --git a/gdal/port/cpl_vsil_curl.cpp b/gdal/port/cpl_vsil_curl.cpp
index 9185273c3c1e..aed7b043847a 100644
--- a/gdal/port/cpl_vsil_curl.cpp
+++ b/gdal/port/cpl_vsil_curl.cpp
@@ -995,11 +995,10 @@ vsi_l_offset VSICurlHandle::GetFileSize( bool bSetError )
         }
         else if( response_code != 200 )
         {
-            // If HTTP 429, 500, 502, 503, 504 error retry after a
-            // pause.
+            // Look if we should attempt a retry
             const double dfNewRetryDelay = CPLHTTPGetNewRetryDelay(
                 static_cast<int>(response_code), dfRetryDelay,
-                sWriteFuncHeaderData.pBuffer);
+                sWriteFuncHeaderData.pBuffer, szCurlErrBuf);
             if( dfNewRetryDelay > 0 &&
                 nRetryCount < m_nMaxRetry )
             {
@@ -1351,11 +1350,10 @@ bool VSICurlHandle::DownloadRegion( const vsi_l_offset startOffset,
             return DownloadRegion(startOffset, nBlocks);
         }
 
-        // If HTTP 429, 500, 502, 503, 504 error retry after a
-        // pause.
+        // Look if we should attempt a retry
         const double dfNewRetryDelay = CPLHTTPGetNewRetryDelay(
             static_cast<int>(response_code), dfRetryDelay,
-            sWriteFuncHeaderData.pBuffer);
+            sWriteFuncHeaderData.pBuffer, szCurlErrBuf);
         if( dfNewRetryDelay > 0 &&
             nRetryCount < m_nMaxRetry )
         {
diff --git a/gdal/port/cpl_vsil_webhdfs.cpp b/gdal/port/cpl_vsil_webhdfs.cpp
index 4df0307cb61b..07f0b968961b 100644
--- a/gdal/port/cpl_vsil_webhdfs.cpp
+++ b/gdal/port/cpl_vsil_webhdfs.cpp
@@ -1116,7 +1116,7 @@ bool VSIWebHDFSHandle::DownloadRegion( const vsi_l_offset startOffset,
         // pause.
         const double dfNewRetryDelay = CPLHTTPGetNewRetryDelay(
             static_cast<int>(response_code), dfRetryDelay,
-            nullptr);
+            nullptr, szCurlErrBuf);
         if( dfNewRetryDelay > 0 &&
             nRetryCount < m_nMaxRetry )
         {

From 77de76f966d030df2126a63e60cbb39a55c3c401 Mon Sep 17 00:00:00 2001
From: Even Rouault <even.rouault@spatialys.com>
Date: Fri, 21 Jun 2019 15:51:16 +0200
Subject: [PATCH 332/488] GDALCopyWholeRasterGetSwathSize(): fix potential int
 overflows for big values of GDAL_SWATH_SIZE or GDAL_CACHEMAX

---
 gdal/gcore/rasterio.cpp | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/gdal/gcore/rasterio.cpp b/gdal/gcore/rasterio.cpp
index c1bfb28e8c08..0e5e9c939c04 100644
--- a/gdal/gcore/rasterio.cpp
+++ b/gdal/gcore/rasterio.cpp
@@ -4139,13 +4139,13 @@ static void GDALCopyWholeRasterGetSwathSize(
     const char* pszSwathSize = CPLGetConfigOption("GDAL_SWATH_SIZE", nullptr);
     int nTargetSwathSize;
     if( pszSwathSize != nullptr )
-        nTargetSwathSize = atoi(pszSwathSize);
+        nTargetSwathSize = static_cast<int>(
+            std::min(GIntBig(INT_MAX), CPLAtoGIntBig(pszSwathSize)));
     else
     {
       // As a default, take one 1/4 of the cache size.
-        nTargetSwathSize =
-            std::min(INT_MAX,
-                     static_cast<int>(GDALGetCacheMax64() / 4));
+        nTargetSwathSize = static_cast<int>(
+            std::min(GIntBig(INT_MAX), GDALGetCacheMax64() / 4));
 
         // but if the minimum idal swath buf size is less, then go for it to
         // avoid unnecessarily abusing RAM usage.
@@ -4167,7 +4167,8 @@ static void GDALCopyWholeRasterGetSwathSize(
                           nSrcBlockYSize * nPixelSize) ;
         }
         if( nTargetSwathSize > nIdealSwathBufSize )
-            nTargetSwathSize = static_cast<int>(nIdealSwathBufSize);
+            nTargetSwathSize = static_cast<int>(
+                std::min(GIntBig(INT_MAX), nIdealSwathBufSize));
     }
 
     if (nTargetSwathSize < 1000000)

From af7aeb0d4b98257c72c0db4c1bdb1f5880b80af8 Mon Sep 17 00:00:00 2001
From: an-ivanov <30471305+an-ivanov@users.noreply.github.com>
Date: Mon, 24 Jun 2019 16:49:43 +0300
Subject: [PATCH 333/488] RS2: add half-pixel shift to reported GCP line and
 column numbers (#1668) (fixes #1666)

---
 gdal/frmts/rs2/rs2dataset.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/gdal/frmts/rs2/rs2dataset.cpp b/gdal/frmts/rs2/rs2dataset.cpp
index c8496be1025b..55ef4455ebf5 100644
--- a/gdal/frmts/rs2/rs2dataset.cpp
+++ b/gdal/frmts/rs2/rs2dataset.cpp
@@ -1307,9 +1307,9 @@ GDALDataset *RS2Dataset::Open( GDALOpenInfo * poOpenInfo )
             psGCP->pszId = CPLStrdup( szID );
             psGCP->pszInfo = CPLStrdup("");
             psGCP->dfGCPPixel =
-                CPLAtof(CPLGetXMLValue(psNode,"imageCoordinate.pixel","0"));
+                CPLAtof(CPLGetXMLValue(psNode,"imageCoordinate.pixel","0")) + 0.5;
             psGCP->dfGCPLine =
-                CPLAtof(CPLGetXMLValue(psNode,"imageCoordinate.line","0"));
+                CPLAtof(CPLGetXMLValue(psNode,"imageCoordinate.line","0")) + 0.5;
             psGCP->dfGCPX =
                 CPLAtof(CPLGetXMLValue(psNode,"geodeticCoordinate.longitude",""));
             psGCP->dfGCPY =

From 41203f9810fb4dcef302c9f60c1e4763674a7f0c Mon Sep 17 00:00:00 2001
From: Even Rouault <even.rouault@spatialys.com>
Date: Tue, 25 Jun 2019 11:41:15 +0200
Subject: [PATCH 334/488] /vsicurl/: GetFileSize(): when HEAD request does not
 return Content-Length header, retry with GET

---
 autotest/gcore/vsicurl.py   | 17 ++++++++++++++++-
 autotest/pymod/webserver.py | 20 +++++++++++---------
 gdal/port/cpl_vsil_curl.cpp | 19 +++++++++++++++++++
 3 files changed, 46 insertions(+), 10 deletions(-)

diff --git a/autotest/gcore/vsicurl.py b/autotest/gcore/vsicurl.py
index c808ffd4c686..a781307d071d 100755
--- a/autotest/gcore/vsicurl.py
+++ b/autotest/gcore/vsicurl.py
@@ -446,7 +446,22 @@ def test_vsicurl_test_parse_html_filelist_apache():
     with webserver.install_http_handler(handler):
         assert gdal.VSIStatL('/vsicurl/http://localhost:%d/mydir/i_dont_exist' % gdaltest.webserver_port, gdal.VSI_STAT_EXISTS_FLAG) is None
 
-    
+
+###############################################################################
+
+
+def test_vsicurl_no_size_in_HEAD():
+
+    if gdaltest.webserver_port == 0:
+        pytest.skip()
+
+    handler = webserver.SequentialHandler()
+    handler.add('HEAD', '/test_vsicurl_no_size_in_HEAD.bin', 200, {}, add_content_length_header=False)
+    handler.add('GET', '/test_vsicurl_no_size_in_HEAD.bin', 200, {}, 'X' * 10)
+    with webserver.install_http_handler(handler):
+        statres = gdal.VSIStatL('/vsicurl/http://localhost:%d/test_vsicurl_no_size_in_HEAD.bin' % gdaltest.webserver_port)
+    assert statres.size == 10
+
 ###############################################################################
 
 
diff --git a/autotest/pymod/webserver.py b/autotest/pymod/webserver.py
index 6af0022a7661..c9bceed11e54 100644
--- a/autotest/pymod/webserver.py
+++ b/autotest/pymod/webserver.py
@@ -56,7 +56,7 @@ def install_http_handler(handler_instance):
 
 
 class RequestResponse(object):
-    def __init__(self, method, path, code, headers=None, body=None, custom_method=None, expected_headers=None, expected_body=None):
+    def __init__(self, method, path, code, headers=None, body=None, custom_method=None, expected_headers=None, expected_body=None, add_content_length_header=True):
         self.method = method
         self.path = path
         self.code = code
@@ -65,6 +65,7 @@ def __init__(self, method, path, code, headers=None, body=None, custom_method=No
         self.custom_method = custom_method
         self.expected_headers = {} if expected_headers is None else expected_headers
         self.expected_body = expected_body
+        self.add_content_length_header = add_content_length_header
 
 
 class FileHandler(object):
@@ -118,16 +119,16 @@ def final_check(self):
         assert self.req_count == len(self.req_resp), (self.req_count, len(self.req_resp))
         assert not self.req_resp_map
 
-    def add(self, method, path, code=None, headers=None, body=None, custom_method=None, expected_headers=None, expected_body=None):
+    def add(self, method, path, code=None, headers=None, body=None, custom_method=None, expected_headers=None, expected_body=None, add_content_length_header=True):
         hdrs = {} if headers is None else headers
         expected_hdrs = {} if expected_headers is None else expected_headers
         assert not self.req_resp_map
-        self.req_resp.append(RequestResponse(method, path, code, hdrs, body, custom_method, expected_hdrs, expected_body))
+        self.req_resp.append(RequestResponse(method, path, code, hdrs, body, custom_method, expected_hdrs, expected_body, add_content_length_header))
 
-    def add_unordered(self, method, path, code=None, headers=None, body=None, custom_method=None, expected_headers=None, expected_body=None):
+    def add_unordered(self, method, path, code=None, headers=None, body=None, custom_method=None, expected_headers=None, expected_body=None, add_content_length_header=True):
         hdrs = {} if headers is None else headers
         expected_hdrs = {} if expected_headers is None else expected_headers
-        self.req_resp_map[(method, path)] = RequestResponse(method, path, code, hdrs, body, custom_method, expected_hdrs, expected_body)
+        self.req_resp_map[(method, path)] = RequestResponse(method, path, code, hdrs, body, custom_method, expected_hdrs, expected_body, add_content_length_header)
 
     @staticmethod
     def _process_req_resp(req_resp, request):
@@ -156,10 +157,11 @@ def _process_req_resp(req_resp, request):
             request.send_response(req_resp.code)
             for k in req_resp.headers:
                 request.send_header(k, req_resp.headers[k])
-            if req_resp.body:
-                request.send_header('Content-Length', len(req_resp.body))
-            elif 'Content-Length' not in req_resp.headers:
-                request.send_header('Content-Length', '0')
+            if req_resp.add_content_length_header:
+                if req_resp.body:
+                    request.send_header('Content-Length', len(req_resp.body))
+                elif 'Content-Length' not in req_resp.headers:
+                    request.send_header('Content-Length', '0')
             request.end_headers()
             if req_resp.body:
                 try:
diff --git a/gdal/port/cpl_vsil_curl.cpp b/gdal/port/cpl_vsil_curl.cpp
index aed7b043847a..3ff228c62a55 100644
--- a/gdal/port/cpl_vsil_curl.cpp
+++ b/gdal/port/cpl_vsil_curl.cpp
@@ -831,6 +831,14 @@ vsi_l_offset VSICurlHandle::GetFileSize( bool bSetError )
         }
     }
 
+    if( ENABLE_DEBUG && szCurlErrBuf[0] != '\0' &&
+        sWriteFuncHeaderData.bDownloadHeaderOnly &&
+        EQUAL(szCurlErrBuf, "Failed writing header") )
+    {
+        // Not really an error since we voluntarily interrupted the download !
+        szCurlErrBuf[0] = 0;
+    }
+
     double dfSize = 0;
     if( oFileProp.eExists != EXIST_YES )
     {
@@ -914,7 +922,18 @@ vsi_l_offset VSICurlHandle::GetFileSize( bool bSetError )
         {
             oFileProp.eExists = EXIST_YES;
             if( dfSize < 0 )
+            {
+                if( osVerb == "HEAD" && !bRetryWithGet )
+                {
+                    CPLDebug("VSICURL", "HEAD did not provide file size. Retrying with GET");
+                    bRetryWithGet = true;
+                    CPLFree(sWriteFuncData.pBuffer);
+                    CPLFree(sWriteFuncHeaderData.pBuffer);
+                    curl_easy_cleanup(hCurlHandle);
+                    goto retry;
+                }
                 oFileProp.fileSize = 0;
+            }
             else
                 oFileProp.fileSize = static_cast<GUIntBig>(dfSize);
         }

From 93345232ed457c2ee98c1112bcd5ab2c37da874b Mon Sep 17 00:00:00 2001
From: Daniel Brookes <26078684+dbrookes96@users.noreply.github.com>
Date: Tue, 25 Jun 2019 17:58:51 +0800
Subject: [PATCH 335/488] Contour generator: fix SegmentMerger list iterator
 skipping and out of bounds error. (fixes #1670) (#1671)

---
 gdal/alg/marching_squares/segment_merger.h | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/gdal/alg/marching_squares/segment_merger.h b/gdal/alg/marching_squares/segment_merger.h
index ca151463d9e9..47437709ca7b 100644
--- a/gdal/alg/marching_squares/segment_merger.h
+++ b/gdal/alg/marching_squares/segment_merger.h
@@ -109,10 +109,16 @@ struct SegmentMerger
 
         for ( auto& l : lines_ ) {
             const int levelIdx = l.first;
-            for ( auto it = l.second.begin(); it != l.second.end(); it++ ) {
+            auto it = l.second.begin();
+            while ( it != l.second.end() ) {
                 if ( ! it->isMerged ) {
+                    // Note that emitLine_ erases `it` and returns an iterator advanced
+                    // to the next element.
                     it = emitLine_( levelIdx, it, /* closed */ false );
                 }
+                else {
+                    ++it;
+                }
             }
         }
     }

From 30fefc6cb8733527264a5f2501daabfbed1ca1ed Mon Sep 17 00:00:00 2001
From: Sam Gillingham <gillingham.sam@gmail.com>
Date: Wed, 26 Jun 2019 21:47:17 +1000
Subject: [PATCH 336/488] KEA: return error when deleting metadata item rather
 than crashing (#1681)

---
 gdal/frmts/kea/keaband.cpp | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/gdal/frmts/kea/keaband.cpp b/gdal/frmts/kea/keaband.cpp
index 0d1fc05001da..036e3ec9487f 100644
--- a/gdal/frmts/kea/keaband.cpp
+++ b/gdal/frmts/kea/keaband.cpp
@@ -375,6 +375,11 @@ CPLErr KEARasterBand::SetMetadataItem(const char *pszName, const char *pszValue,
     // only deal with 'default' domain - no geolocation etc
     if( ( pszDomain != nullptr ) && ( *pszDomain != '\0' ) )
         return CE_Failure;
+
+    // kealib doesn't currently support removing values
+    if( pszValue == nullptr )
+        return CE_Failure;
+
     try
     {
         // if it is LAYER_TYPE handle it separately

From 66a3ed688ea086f5d967ff87afce1aff0c08e482 Mon Sep 17 00:00:00 2001
From: Even Rouault <even.rouault@spatialys.com>
Date: Thu, 27 Jun 2019 22:53:04 +0200
Subject: [PATCH 337/488] GeoJSON: avoid SetFeature() to repeat first feature
 when looping over features (fixes #1687)

---
 autotest/ogr/ogr_geojson.py                   | 47 +++++++++++++++++++
 gdal/ogr/ogrsf_frmts/geojson/ogr_geojson.h    |  1 +
 .../ogrsf_frmts/geojson/ogrgeojsonlayer.cpp   | 18 ++++++-
 gdal/ogr/ogrsf_frmts/mem/ogrmemlayer.cpp      | 30 ++++++++++--
 4 files changed, 90 insertions(+), 6 deletions(-)

diff --git a/autotest/ogr/ogr_geojson.py b/autotest/ogr/ogr_geojson.py
index 59e5787dfe41..1702cdce66b1 100755
--- a/autotest/ogr/ogr_geojson.py
+++ b/autotest/ogr/ogr_geojson.py
@@ -3672,8 +3672,55 @@ def test_ogr_geojson_single_feature_random_reading_with_id():
     ds = None
     gdal.Unlink(tmpfilename)
 
+
 ###############################################################################
 
+def test_ogr_geojson_update_in_loop():
+
+    if gdaltest.geojson_drv is None:
+        pytest.skip()
+
+    tmpfilename = '/vsimem/temp.json'
+
+    # No explicit id
+    gdal.FileFromMemBuffer(tmpfilename, '{"type": "FeatureCollection", "name": "test", "features": [{ "type": "Feature", "properties": { "foo": 1 }, "geometry": null }, { "type": "Feature", "properties": { "foo": 2 }, "geometry": null }]}')
+    vector = gdal.OpenEx(tmpfilename, gdal.OF_VECTOR | gdal.GA_Update)
+    layer = vector.GetLayer()
+    fids = []
+    for feature in layer:
+        fids.append(feature.GetFID())
+        layer.SetFeature(feature)
+    assert fids == [0, 1]
+    ds = None
+
+    # Explicit id no holes
+    gdal.FileFromMemBuffer(tmpfilename, '{"type": "FeatureCollection", "name": "test", "features": [{ "type": "Feature", "id": 0, "properties": { "foo": 1 }, "geometry": null }, { "type": "Feature", "properties": { "foo": 2 }, "id": 1, "geometry": null }]}')
+
+    vector = gdal.OpenEx(tmpfilename, gdal.OF_VECTOR | gdal.GA_Update)
+    layer = vector.GetLayer()
+    fids = []
+    for feature in layer:
+        fids.append(feature.GetFID())
+        layer.SetFeature(feature)
+    assert fids == [0, 1]
+    ds = None
+
+    # Explicit id with holes
+    gdal.FileFromMemBuffer(tmpfilename, '{"type": "FeatureCollection", "name": "test", "features": [{ "type": "Feature", "id": 1, "properties": { "foo": 1 }, "geometry": null }, { "type": "Feature", "properties": { "foo": 2 }, "id": 3, "geometry": null }]}')
+    vector = gdal.OpenEx(tmpfilename, gdal.OF_VECTOR | gdal.GA_Update)
+    layer = vector.GetLayer()
+    fids = []
+    for feature in layer:
+        fids.append(feature.GetFID())
+        layer.SetFeature(feature)
+    assert fids == [1, 3]
+    ds = None
+
+
+    gdal.Unlink(tmpfilename)
+
+
+###############################################################################
 
 def test_ogr_geojson_cleanup():
 
diff --git a/gdal/ogr/ogrsf_frmts/geojson/ogr_geojson.h b/gdal/ogr/ogrsf_frmts/geojson/ogr_geojson.h
index b332568d6833..d36b9b0c1f8c 100644
--- a/gdal/ogr/ogrsf_frmts/geojson/ogr_geojson.h
+++ b/gdal/ogr/ogrsf_frmts/geojson/ogr_geojson.h
@@ -113,6 +113,7 @@ class OGRGeoJSONLayer final: public OGRMemLayer
     bool bUpdated_;
     bool bOriginalIdModified_;
     GIntBig nTotalFeatureCount_;
+    GIntBig nFeatureReadSinceReset_ = 0;
     GIntBig nNextFID_;
 
     bool IngestAll();
diff --git a/gdal/ogr/ogrsf_frmts/geojson/ogrgeojsonlayer.cpp b/gdal/ogr/ogrsf_frmts/geojson/ogrgeojsonlayer.cpp
index c95049d59a8e..18d37968f50c 100644
--- a/gdal/ogr/ogrsf_frmts/geojson/ogrgeojsonlayer.cpp
+++ b/gdal/ogr/ogrsf_frmts/geojson/ogrgeojsonlayer.cpp
@@ -128,6 +128,7 @@ void OGRGeoJSONLayer::SetFIDColumn( const char* pszFIDColumn )
 
 void OGRGeoJSONLayer::ResetReading()
 {
+    nFeatureReadSinceReset_ = 0;
     if( poReader_ )
     {
         TerminateAppendSession();
@@ -165,6 +166,7 @@ OGRFeature* OGRGeoJSONLayer::GetNextFeature()
                 && (m_poAttrQuery == nullptr ||
                     m_poAttrQuery->Evaluate(poFeature)) )
             {
+                nFeatureReadSinceReset_ ++;
                 return poFeature;
             }
             delete poFeature;
@@ -172,7 +174,12 @@ OGRFeature* OGRGeoJSONLayer::GetNextFeature()
     }
     else
     {
-        return OGRMemLayer::GetNextFeature();
+        auto ret = OGRMemLayer::GetNextFeature();
+        if( ret )
+        {
+            nFeatureReadSinceReset_ ++;
+        }
+        return ret;
     }
 }
 
@@ -248,8 +255,15 @@ bool OGRGeoJSONLayer::IngestAll()
 
 OGRErr OGRGeoJSONLayer::ISetFeature( OGRFeature *poFeature )
 {
-    if( !IsUpdatable() || !IngestAll() )
+    if( !IsUpdatable() )
         return OGRERR_FAILURE;
+    if( poReader_ )
+    {
+        auto nNextIndex = nFeatureReadSinceReset_;
+        if( !IngestAll() )
+            return OGRERR_FAILURE;
+        SetNextByIndex(nNextIndex);
+    }
     return OGRMemLayer::ISetFeature(poFeature);
 }
 
diff --git a/gdal/ogr/ogrsf_frmts/mem/ogrmemlayer.cpp b/gdal/ogr/ogrsf_frmts/mem/ogrmemlayer.cpp
index f9382d8abc26..d11528fbd544 100644
--- a/gdal/ogr/ogrsf_frmts/mem/ogrmemlayer.cpp
+++ b/gdal/ogr/ogrsf_frmts/mem/ogrmemlayer.cpp
@@ -244,7 +244,8 @@ OGRErr OGRMemLayer::ISetFeature( OGRFeature *poFeature )
         return OGRERR_FAILURE;
 
     // If we don't have a FID, find one available
-    if( poFeature->GetFID() == OGRNullFID )
+    GIntBig nFID = poFeature->GetFID();
+    if( nFID == OGRNullFID )
     {
         if( m_papoFeatures != nullptr )
         {
@@ -261,19 +262,40 @@ OGRErr OGRMemLayer::ISetFeature( OGRFeature *poFeature )
                    m_oMapFeatures.end() )
                 ++m_iNextCreateFID;
         }
-        poFeature->SetFID(m_iNextCreateFID++);
+        nFID = m_iNextCreateFID++;
+        poFeature->SetFID(nFID);
     }
-    else if( poFeature->GetFID() < OGRNullFID )
+    else if( nFID < OGRNullFID )
     {
         CPLError(CE_Failure, CPLE_NotSupported,
                  "negative FID are not supported");
         return OGRERR_FAILURE;
     }
+    else
+    {
+        if( !m_bHasHoles )
+        {
+            // If the feature does not exist, set m_bHasHoles
+            if( m_papoFeatures != nullptr )
+            {
+                if( nFID >= m_nMaxFeatureCount ||
+                    m_papoFeatures[nFID] == nullptr )
+                {
+                    m_bHasHoles = true;
+                }
+            }
+            else
+            {
+                FeatureIterator oIter = m_oMapFeatures.find(nFID);
+                if( oIter == m_oMapFeatures.end() )
+                    m_bHasHoles = true;
+            }
+        }
+    }
 
     OGRFeature *poFeatureCloned = poFeature->Clone();
     if( poFeatureCloned == nullptr )
         return OGRERR_FAILURE;
-    const GIntBig nFID = poFeature->GetFID();
 
     if( m_papoFeatures != nullptr && nFID > 100000 &&
         nFID > m_nMaxFeatureCount + 1000 )

From d911149b40f119675c0be4272b2a9a9acd14f1fb Mon Sep 17 00:00:00 2001
From: Even Rouault <even.rouault@spatialys.com>
Date: Thu, 27 Jun 2019 23:06:09 +0200
Subject: [PATCH 338/488] Fix pyflakes issue (refs #1687)

---
 autotest/ogr/ogr_geojson.py | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/autotest/ogr/ogr_geojson.py b/autotest/ogr/ogr_geojson.py
index 1702cdce66b1..2a50ae8c5b28 100755
--- a/autotest/ogr/ogr_geojson.py
+++ b/autotest/ogr/ogr_geojson.py
@@ -3684,8 +3684,8 @@ def test_ogr_geojson_update_in_loop():
 
     # No explicit id
     gdal.FileFromMemBuffer(tmpfilename, '{"type": "FeatureCollection", "name": "test", "features": [{ "type": "Feature", "properties": { "foo": 1 }, "geometry": null }, { "type": "Feature", "properties": { "foo": 2 }, "geometry": null }]}')
-    vector = gdal.OpenEx(tmpfilename, gdal.OF_VECTOR | gdal.GA_Update)
-    layer = vector.GetLayer()
+    ds = gdal.OpenEx(tmpfilename, gdal.OF_VECTOR | gdal.GA_Update)
+    layer = ds.GetLayer()
     fids = []
     for feature in layer:
         fids.append(feature.GetFID())
@@ -3696,8 +3696,8 @@ def test_ogr_geojson_update_in_loop():
     # Explicit id no holes
     gdal.FileFromMemBuffer(tmpfilename, '{"type": "FeatureCollection", "name": "test", "features": [{ "type": "Feature", "id": 0, "properties": { "foo": 1 }, "geometry": null }, { "type": "Feature", "properties": { "foo": 2 }, "id": 1, "geometry": null }]}')
 
-    vector = gdal.OpenEx(tmpfilename, gdal.OF_VECTOR | gdal.GA_Update)
-    layer = vector.GetLayer()
+    ds = gdal.OpenEx(tmpfilename, gdal.OF_VECTOR | gdal.GA_Update)
+    layer = ds.GetLayer()
     fids = []
     for feature in layer:
         fids.append(feature.GetFID())
@@ -3707,8 +3707,8 @@ def test_ogr_geojson_update_in_loop():
 
     # Explicit id with holes
     gdal.FileFromMemBuffer(tmpfilename, '{"type": "FeatureCollection", "name": "test", "features": [{ "type": "Feature", "id": 1, "properties": { "foo": 1 }, "geometry": null }, { "type": "Feature", "properties": { "foo": 2 }, "id": 3, "geometry": null }]}')
-    vector = gdal.OpenEx(tmpfilename, gdal.OF_VECTOR | gdal.GA_Update)
-    layer = vector.GetLayer()
+    ds = gdal.OpenEx(tmpfilename, gdal.OF_VECTOR | gdal.GA_Update)
+    layer = ds.GetLayer()
     fids = []
     for feature in layer:
         fids.append(feature.GetFID())

From 93496dd40fc5cd9598410057034f29e2c9e74e11 Mon Sep 17 00:00:00 2001
From: Even Rouault <even.rouault@spatialys.com>
Date: Thu, 27 Jun 2019 23:28:09 +0200
Subject: [PATCH 339/488] Shapefile: launder layer name to get Windows
 compatible filename

---
 autotest/ogr/ogr_shape.py                     | 18 ++++++++++++
 .../ogrsf_frmts/shape/ogrshapedatasource.cpp  | 29 +++++++++++++++++--
 2 files changed, 45 insertions(+), 2 deletions(-)

diff --git a/autotest/ogr/ogr_shape.py b/autotest/ogr/ogr_shape.py
index 08b5acd0d4e6..a97e64e10cfc 100755
--- a/autotest/ogr/ogr_shape.py
+++ b/autotest/ogr/ogr_shape.py
@@ -4569,6 +4569,24 @@ def test_ogr_shape_113_restore_shx_empty_shp_shx():
 ###############################################################################
 
 
+def test_ogr_shape_116_invalid_layer_name():
+
+    dirname = 'tmp/test_ogr_shape_116_invalid_layer_name'
+    gdal.RmdirRecursive(dirname)
+    shape_drv = ogr.GetDriverByName('ESRI Shapefile')
+    ds = shape_drv.CreateDataSource(dirname)
+    with gdaltest.error_handler():
+        assert ds.CreateLayer('test<>:"/\\?*', None, ogr.wkbNone)
+    ds = None
+    ds = ogr.Open(dirname)
+    assert ds.GetLayerCount() == 1
+    ds = None
+    gdal.RmdirRecursive(dirname)
+
+
+###############################################################################
+
+
 def test_ogr_shape_cleanup():
 
     if gdaltest.shape_ds is None:
diff --git a/gdal/ogr/ogrsf_frmts/shape/ogrshapedatasource.cpp b/gdal/ogr/ogrsf_frmts/shape/ogrshapedatasource.cpp
index 73593262c074..14b425c8e161 100644
--- a/gdal/ogr/ogrsf_frmts/shape/ogrshapedatasource.cpp
+++ b/gdal/ogr/ogrsf_frmts/shape/ogrshapedatasource.cpp
@@ -473,6 +473,31 @@ void OGRShapeDataSource::AddLayer( OGRShapeLayer* poLayer )
     }
 }
 
+/************************************************************************/
+/*                        LaunderLayerName()                            */
+/************************************************************************/
+
+static CPLString LaunderLayerName(const char* pszLayerName)
+{
+    std::string osRet(pszLayerName);
+    for( char& ch: osRet )
+    {
+        // https://docs.microsoft.com/en-us/windows/desktop/fileio/naming-a-file
+        if( ch == '<' || ch == '>' || ch == ':' || ch == '"' ||
+            ch == '/' || ch == '\\' || ch== '?' || ch == '*' )
+        {
+            ch = '_';
+        }
+    }
+    if( osRet != pszLayerName )
+    {
+        CPLError(CE_Warning, CPLE_AppDefined,
+                 "Invalid layer name for a shapefile: %s. Laundered to %s.",
+                 pszLayerName, osRet.c_str());
+    }
+    return osRet;
+}
+
 /************************************************************************/
 /*                           ICreateLayer()                             */
 /************************************************************************/
@@ -716,13 +741,13 @@ OGRShapeDataSource::ICreateLayer( const char * pszLayerName,
         // datasource ... Ahem ahem.
         char *pszPath = CPLStrdup(CPLGetPath(pszName));
         pszFilenameWithoutExt =
-            CPLStrdup(CPLFormFilename(pszPath, pszLayerName, nullptr));
+            CPLStrdup(CPLFormFilename(pszPath, LaunderLayerName(pszLayerName).c_str(), nullptr));
         CPLFree( pszPath );
     }
     else
     {
         pszFilenameWithoutExt =
-            CPLStrdup(CPLFormFilename(pszName, pszLayerName, nullptr));
+            CPLStrdup(CPLFormFilename(pszName, LaunderLayerName(pszLayerName).c_str(), nullptr));
     }
 
 /* -------------------------------------------------------------------- */

From 825662d03251faac29c5c683c74694ba56124e90 Mon Sep 17 00:00:00 2001
From: Even Rouault <even.rouault@spatialys.com>
Date: Fri, 28 Jun 2019 12:04:09 +0200
Subject: [PATCH 340/488] Prepare for GDAL 2.4.2

---
 gdal/GDALmake.opt.in               |   2 +-
 gdal/NEWS                          | 164 +++++++++++++++++++++++++++++
 gdal/VERSION                       |   2 +-
 gdal/frmts/hdf5/hdf5dataset.cpp    |   2 +-
 gdal/frmts/raw/envidataset.cpp     |   2 +-
 gdal/gcore/gdal_version.h.in       |   6 +-
 gdal/swig/include/perl/gdal_perl.i |   4 +-
 gdal/swig/include/perl/ogr_perl.i  |   2 +-
 gdal/swig/python/README.rst        |   2 +-
 gdal/swig/python/setup.py          |   2 +-
 10 files changed, 176 insertions(+), 12 deletions(-)

diff --git a/gdal/GDALmake.opt.in b/gdal/GDALmake.opt.in
index 41e73894cf3f..a832b17a3efb 100644
--- a/gdal/GDALmake.opt.in
+++ b/gdal/GDALmake.opt.in
@@ -123,7 +123,7 @@ GDAL_INCLUDE	=	-I$(GDAL_ROOT)/port -I$(GDAL_ROOT)/gcore \
 # libtool targets and help variables
 LIBGDAL	:=		libgdal.la
 LIBGDAL_CURRENT	:=	25
-LIBGDAL_REVISION	:=	1
+LIBGDAL_REVISION	:=	2
 LIBGDAL_AGE	:=	5
 
 # native build targets and variables
diff --git a/gdal/NEWS b/gdal/NEWS
index 8f959ec351ed..10a66af93045 100644
--- a/gdal/NEWS
+++ b/gdal/NEWS
@@ -1,3 +1,167 @@
+= GDAL/OGR 2.4.2 Release Notes =
+
+The 2.4.2 release is a bug fix release.
+
+== Build ==
+
+ * Fix build --with-curl --without-threads (#1386)
+ * Fix build on netBSD 8
+ * Fix warnings with GCC 9
+ * Add support for Poppler 0.75.0 (#1388), 0.76.0
+
+== Port ==
+
+ * /vsitar/: handle .tar file header with space padding instead of 0 for file size (#1396)
+ * /vsicurl/: allow 'Connection timed out' CURL errors as candidate for HTTP retry
+ * /vsicurl/: GetFileSize(): when HEAD request does not return Content-Length header, retry with GET
+ * /vsicurl/: automatically detect signed URLs where host ends with a port number; also detect signed URLs as created with the AWS4-HMAC-SHA256 method (#1456)
+ * /vsis3/: for a long living file handle, refresh credentials coming from EC2/AIM (#1593)
+
+== GDAL algorithms ==
+
+ * GDALCreateReprojectionTransformerEx(): do not emit error if reverse transformation fails, and fix crash when trying to use null reverse transformation
+ * Warper: fix GDAL 2.3 regression in a situation with source nodata value, multiple bands and nearest resampling where the logic to detect which source pixels are nodata was inverted (#1656)
+ * Contour generator: fix SegmentMerger list iterator skipping and out of bounds error. (#1670)
+ * Rasterize: fix crash when working buffer is larger than 2GB (fix also gvBurnPoint) (#1338)
+
+== GDAL core ==
+
+ * GDALInvGeoTransform(): make it work with scale and rotation/skew coefficients of small absolute value (#1615)
+ * GDALCopyWholeRasterGetSwathSize(): fix potential int overflows for big values of GDAL_SWATH_SIZE or GDAL_CACHEMAX
+ * PAM: preserve existing metadata when setting new one (#1430)
+
+== GDAL utliities ==
+
+ * gdal_calc.py: Fixed NaN-streaking in output images when the --allBands option is given to tiled images, and removed redundant calculation of nXValid.
+ * gdal_polygonize.py: fix outputing to geojson without explicit -f switch (#1533)
+ * gdal_contour: remove explicit width/precision=12/3 of the elev field (#1487)
+
+== GDAL drivers ==
+
+AIGRID / AVCBin driver:
+ * fix filename case adjustment that failed on /vsi filesystems (#1385)
+
+BAG driver:
+ * fix potential nullptr deref on corrupted file
+
+ENVI driver:
+ * add read support for reading GCPs (#1528), and fix off-by-one offset on line,pixel on reading GCP
+
+GTiff driver:
+ * make WEBP_LEVEL to be honored in Create() mode (#1594)
+ * PushMetadataToPam(): early exit when PAM is disabled, to avoid error messages
+ * do not generate a TIFFTAG_GDAL_METADATA with color interpretation information for JPEG YCbCr compression
+ * Internal libtiff: TIFFWriteEncodedStrip/TIFFWriteEncodedTile: fix rewriting of LZW-compressed data (#1439)
+
+GXF driver:
+ * avoid closing the file pointer before being sure this is a GXF driver, otherwise this can prevent the opening of some raw format files (#1521)
+
+HDF5 driver:
+ * fix handling of attributes of type SCHAR, UCHAR, USHORT and UINT (https://github.com/mapbox/rasterio/issues/1663)
+ * detect nodata from netCDF _FillValue; add more strict checks for accepting datasets for GCP, and handle nodata in GCP too (#1451)
+
+ISIS3 driver:
+ * fix parsing of lists in JSon metadata, and quote string items when writing lists when needed (#1510)
+
+KEA driver:
+ * return error when deleting metadata item rather than crashing (#1681)
+
+MRF driver:
+ * prevent integer overflow
+
+MrSID driver:
+ * fix potential crash when a zoom level cannot be opened
+
+netCDF driver:
+ * avoid inappropriate shift by -360 when attribute axis=X is set (#1440)
+
+NITF driver:
+ * fix parsing of SENSRB TRE (#1520)
+
+PDF driver:
+ * avoid possible assertion in PDFium backend on corrupted files
+
+PDS3 driver:
+ * add support for ENCODING_TYPE=DCT_DECOMPRESSED (#1457)
+
+RS2 driver:
+ * add half-pixel shift to reported GCP line and column numbers (#1666)
+
+VRT driver:
+ * Python pixel functions: also probe libpython3.Xm.so.1.0 (#1660)
+
+WMS driver:
+ * use proper JSon parsing for ESRI MapServer document (#1416)
+
+XYZ driver:
+ * fix regression regarding header lines that are not X,Y,Z (#1472)
+
+== OGR core ==
+
+ * segmentize(): fix 2.4.1 regression when 2 points are really close compared to the segmentizatin distance (#1414). Also handle the M dimension
+ * RawDataset: use generic RasterIO() implementation when non-nearest resampling is asked (#1301)
+
+== OGR utilities ==
+
+ * ogrmerge.py: add shared='1' to speed-up -single mode with many layers
+
+== OGR drivers ==
+
+EEDA driver:
+ * Switch to v1alpha API
+
+ElasticSearch driver:
+ * set 'application/json' in RunRequest() with POST (#1628)
+ * GeoJSON type field should be mapped as text in ES>=5
+ * Fix _mapping url
+
+FileGDB/OpenFileGDB:
+ * be robust when winding order of outer ring is incorrect (#1369)
+
+GeoJSON driver:
+ * fix recognizing some documents with members sorted alphabetically (#1537)
+ * avoid SetFeature() to repeat first feature when looping over features (#1687)
+
+GeoJSONSeq driver:
+ * be more robust to invalid objects, and fixes performance issue on corrupted files. Fixes https://bugs.chromium.org/p/oss-fuzz/issues/detail?id=13770.
+
+GML driver:
+ * GML/WFS: add minimum support for 'hexBinary' type (as string) (#1375)
+
+GMLAS driver:
+ * avoid null pointer dereference on some schemas
+ * do not use space as separator for schema filename in XSD open option (#1452)
+
+GMT:
+ * use file extension based detection to accept files without header (#1461)
+
+GPKG driver:
+ * change default value of OGR_GPKG_FOREIGN_KEY_CHECK to NO, so as to avoid issues in downstream software
+ * insert more accurate spatial extent in gpkg_contents
+ * fix memory leak in case of corrupted database. Fixes https://bugs.chromium.org/p/oss-fuzz/issues/detail?id=14683.
+ * set sqlite3_busy_timeout, handle SQLITE_BUSY during tile read (#1370)
+
+PDS driver:
+ * fix heap-buffer-overflow in error code path. Fixes https://bugs.chromium.org/p/oss-fuzz/issues/detail?id=14512.
+
+PLScenes driver:
+ * plscenesconf.json: add missing fields for PSOrthoTile
+
+PostgreSQL driver:
+ * do not attempt to create VARCHAR(n) columns with n >= 10485760 (#1508)
+
+Shapefile driver:
+ * better deal with empty .shp+.shx and SHAPE_RESTORE_SHX (#1525)
+ * launder layer name to get Windows compatible filename
+ * DeleteLayer(): make it delete .cpg, .sbn, .sbx, .qpj and other sidecar files (#1405)
+
+WaSP driver:
+ * on creation, make sure the layer geometry type set on the feature definition is wkbLineString25D
+
+WFS3 driver:
+ * handle paging wth missing type for rel:next, and better deal with user:pwd in URL
+ * use 'id' attribute of collection items, if 'name' not available
+
 = GDAL/OGR 2.4.1 Release Notes =
 
 The 2.4.1 release is a bug fix release.
diff --git a/gdal/VERSION b/gdal/VERSION
index 005119baaa06..8e8299dcc068 100644
--- a/gdal/VERSION
+++ b/gdal/VERSION
@@ -1 +1 @@
-2.4.1
+2.4.2
diff --git a/gdal/frmts/hdf5/hdf5dataset.cpp b/gdal/frmts/hdf5/hdf5dataset.cpp
index 671a0acc7c77..4c5b2c246cf1 100644
--- a/gdal/frmts/hdf5/hdf5dataset.cpp
+++ b/gdal/frmts/hdf5/hdf5dataset.cpp
@@ -1083,7 +1083,7 @@ static herr_t HDF5AttrIterate( hid_t hH5ObjID,
         if( (bIsSCHAR || bIsUCHAR) &&
             CPLTestBool(CPLGetConfigOption("GDAL_HDF5_CHAR_AS_STRING", "NO")) )
         {
-            // Compatibily mode with ancient GDAL versions where we consider
+            // Compatibility mode with ancient GDAL versions where we consider
             // array of SCHAR/UCHAR as strings. Likely inappropriate mode...
             for( hsize_t i = 0; i < nAttrElmts; i++ )
             {
diff --git a/gdal/frmts/raw/envidataset.cpp b/gdal/frmts/raw/envidataset.cpp
index 42fb027017aa..5d99aefd4c3e 100644
--- a/gdal/frmts/raw/envidataset.cpp
+++ b/gdal/frmts/raw/envidataset.cpp
@@ -1804,7 +1804,7 @@ void ENVIDataset::ProcessGeoPoints( const char *pszGeoPoints )
     }
     for( int i = 0; i < static_cast<int>(m_asGCPs.size()); i++ )
     {
-        // Substract 1 to pixel and line for ENVI convention
+        // Subtract 1 to pixel and line for ENVI convention
         m_asGCPs[i].dfGCPPixel = CPLAtof( papszFields[i * 4 + 0] ) - 1;
         m_asGCPs[i].dfGCPLine = CPLAtof( papszFields[i * 4 + 1] ) - 1;
         m_asGCPs[i].dfGCPY = CPLAtof( papszFields[i * 4 + 2] );
diff --git a/gdal/gcore/gdal_version.h.in b/gdal/gcore/gdal_version.h.in
index 852adeafec70..8f218f40ad82 100644
--- a/gdal/gcore/gdal_version.h.in
+++ b/gdal/gcore/gdal_version.h.in
@@ -7,7 +7,7 @@
 #ifndef GDAL_VERSION_MAJOR
 #  define GDAL_VERSION_MAJOR    2
 #  define GDAL_VERSION_MINOR    4
-#  define GDAL_VERSION_REV      1
+#  define GDAL_VERSION_REV      2
 #  define GDAL_VERSION_BUILD    0
 #endif
 
@@ -24,9 +24,9 @@
 
 #if !defined(DO_NOT_DEFINE_GDAL_RELEASE_DATE_AND_GDAL_RELEASE_NAME)
 #ifndef GDAL_RELEASE_DATE
-#  define GDAL_RELEASE_DATE     20190315
+#  define GDAL_RELEASE_DATE     20190628
 #endif
 #ifndef GDAL_RELEASE_NAME
-#  define GDAL_RELEASE_NAME     "2.4.1"
+#  define GDAL_RELEASE_NAME     "2.4.2"
 #endif
 #endif
diff --git a/gdal/swig/include/perl/gdal_perl.i b/gdal/swig/include/perl/gdal_perl.i
index 4149c77f7ed6..cc77d34562d7 100644
--- a/gdal/swig/include/perl/gdal_perl.i
+++ b/gdal/swig/include/perl/gdal_perl.i
@@ -143,8 +143,8 @@ use Geo::GDAL::Const;
 # Note that the 1/100000 digits may be used to create more than one
 # CPAN release from one GDAL release.
 
-our $VERSION = '2.0401';
-our $GDAL_VERSION = '2.4.1';
+our $VERSION = '2.0402';
+our $GDAL_VERSION = '2.4.2';
 
 =pod
 
diff --git a/gdal/swig/include/perl/ogr_perl.i b/gdal/swig/include/perl/ogr_perl.i
index 72e6002a1c71..283934371b2e 100644
--- a/gdal/swig/include/perl/ogr_perl.i
+++ b/gdal/swig/include/perl/ogr_perl.i
@@ -126,7 +126,7 @@ ALTERED_DESTROY(OGRGeometryShadow, OGRc, delete_Geometry)
 %perlcode %{
 
 package Geo::OGR;
-our $VERSION = '2.0401'; # this needs to be the same as that in gdal_perl.i
+our $VERSION = '2.0402'; # this needs to be the same as that in gdal_perl.i
 
 Geo::GDAL->import(qw(:INTERNAL));
 
diff --git a/gdal/swig/python/README.rst b/gdal/swig/python/README.rst
index eb2ec3703f77..e438657a1a7b 100644
--- a/gdal/swig/python/README.rst
+++ b/gdal/swig/python/README.rst
@@ -16,7 +16,7 @@ reference documentation, but the `GDAL API Tutorial`_ includes Python examples.
 Dependencies
 ------------
  
- * libgdal (2.4.1 or greater) and header files (gdal-devel)
+ * libgdal (2.4.2 or greater) and header files (gdal-devel)
  * numpy (1.0.0 or greater) and header files (numpy-devel) (not explicitly 
    required, but many examples and utilities will not work without it)
 
diff --git a/gdal/swig/python/setup.py b/gdal/swig/python/setup.py
index 22a1e9afb8e3..50d01eea604f 100644
--- a/gdal/swig/python/setup.py
+++ b/gdal/swig/python/setup.py
@@ -7,7 +7,7 @@
 # Howard Butler hobu.inc@gmail.com
 
 
-gdal_version = '2.4.1'
+gdal_version = '2.4.2'
 
 import sys
 import os

From 94a32bb70a6c6d1c32d33e4ee5c15b39121f522f Mon Sep 17 00:00:00 2001
From: Even Rouault <even.rouault@spatialys.com>
Date: Sat, 29 Jun 2019 23:31:46 +0200
Subject: [PATCH 341/488] autotest: remove use of deprecate message argument of
 pytest.raises() (fixes #1689)

---
 autotest/gcore/hfa_write.py               |  4 +-
 autotest/gcore/mask.py                    | 16 ++----
 autotest/gcore/numpy_rw.py                | 40 +++++++-------
 autotest/gcore/rasterio.py                |  3 +-
 autotest/gcore/tiff_ovr.py                |  4 +-
 autotest/gcore/tiff_read.py               | 52 +++++-------------
 autotest/gcore/tiff_write.py              | 64 +++++------------------
 autotest/gdrivers/gdalhttp.py             |  4 +-
 autotest/gdrivers/hfa.py                  |  9 +---
 autotest/gdrivers/jp2metadata.py          |  4 +-
 autotest/gdrivers/jpeg.py                 |  4 +-
 autotest/gdrivers/til.py                  | 12 +----
 autotest/gdrivers/vrtmask.py              |  3 +-
 autotest/gnm/gnm_test.py                  |  6 +--
 autotest/ogr/ogr_fgdb.py                  | 34 +++---------
 autotest/ogr/ogr_gml_read.py              |  8 +--
 autotest/ogr/ogr_index_test.py            |  8 +--
 autotest/ogr/ogr_sql_test.py              |  4 +-
 autotest/utilities/test_gdal_translate.py |  4 +-
 autotest/utilities/test_gdaladdo.py       |  4 +-
 autotest/utilities/test_gnmutils.py       |  6 +--
 21 files changed, 82 insertions(+), 211 deletions(-)

diff --git a/autotest/gcore/hfa_write.py b/autotest/gcore/hfa_write.py
index 9afcb05fec6d..3c96e23dc7b4 100755
--- a/autotest/gcore/hfa_write.py
+++ b/autotest/gcore/hfa_write.py
@@ -161,9 +161,7 @@ def test_hfa_clean_external_overviews():
     assert ds.GetRasterBand(1).GetOverviewCount() == 0, 'Overviews still exist.'
     ds = None
 
-    with pytest.raises(OSError, message='small.rrd still present.'):
-        os.stat('tmp/small.rrd')
-    
+    assert not os.path.exists('tmp/small.rrd')
 
     gdal.GetDriverByName('HFA').Delete('tmp/small.img')
 
diff --git a/autotest/gcore/mask.py b/autotest/gcore/mask.py
index 345bc454a299..e1a58d166e00 100755
--- a/autotest/gcore/mask.py
+++ b/autotest/gcore/mask.py
@@ -417,9 +417,7 @@ def test_mask_13():
 
     drv.Delete('tmp/byte_with_mask.tif')
 
-    with pytest.raises(OSError, message='tmp/byte_with_mask.tif.msk is still there'):
-        os.stat('tmp/byte_with_mask.tif.msk')
-    
+    assert not os.path.exists('tmp/byte_with_mask.tif.msk')
 
     
 ###############################################################################
@@ -470,9 +468,7 @@ def test_mask_14():
 
     ds = None
 
-    with pytest.raises(OSError, message='tmp/byte_with_mask.tif.msk should not exist'):
-        os.stat('tmp/byte_with_mask.tif.msk')
-    
+    assert not os.path.exists('tmp/byte_with_mask.tif.msk')
 
     gdal.SetConfigOption('GDAL_TIFF_INTERNAL_MASK_TO_8BIT', 'FALSE')
     ds = gdal.Open('tmp/byte_with_mask.tif')
@@ -556,9 +552,7 @@ def mask_and_ovr(order, method):
 
     ds = None
 
-    with pytest.raises(OSError, message='tmp/byte_with_mask.tif.msk should not exist'):
-        os.stat('tmp/byte_with_ovr_and_mask.tif.msk')
-    
+    assert not os.path.exists('tmp/byte_with_ovr_and_mask.tif.msk')
 
     gdal.SetConfigOption('GDAL_TIFF_INTERNAL_MASK_TO_8BIT', 'FALSE')
     ds = gdal.Open('tmp/byte_with_ovr_and_mask.tif')
@@ -736,9 +730,7 @@ def test_mask_22():
 
     drv.Delete('tmp/mask_22.tif')
 
-    with pytest.raises(OSError, message='tmp/mask_22.tif.msk is still there'):
-        os.stat('tmp/mask_22.tif.msk')
-    
+    assert not os.path.exists('tmp/mask_22.tif.msk')
 
     
 ###############################################################################
diff --git a/autotest/gcore/numpy_rw.py b/autotest/gcore/numpy_rw.py
index a180429fa698..4d45da0729e0 100755
--- a/autotest/gcore/numpy_rw.py
+++ b/autotest/gcore/numpy_rw.py
@@ -378,39 +378,39 @@ def test_numpy_rw_13():
 
     # Try reading into unsupported array type
     ar = numpy.empty([1, 2], dtype=numpy.int64)
-    with pytest.raises(Exception, message='expected "ValueError: array does not have '
-                             'corresponding GDAL data type"'):
+    with pytest.raises(Exception, match='array does not have '
+                             'corresponding GDAL data type'):
         ds.GetRasterBand(1).ReadAsArray(buf_obj=ar)
     
 
     # Try call with inconsistent parameters.
     ar = numpy.empty([1, 2], dtype=numpy.uint8)
-    with pytest.raises(Exception, message='expected "Specified buf_ysize not consistent '
-                             'with buffer shape"'):
+    with pytest.raises(Exception, match='Specified buf_ysize not consistent '
+                             'with array shape'):
         ds.GetRasterBand(1).ReadAsArray(buf_obj=ar, buf_xsize=2,
                                         buf_ysize=2)
     
 
     # Same with 3 dimensions
     ar = numpy.empty([1, 1, 2], dtype=numpy.uint8)
-    with pytest.raises(Exception, message='expected "Specified buf_ysize not consistent '
-                             'with buffer shape"'):
+    with pytest.raises(Exception, match='Specified buf_ysize not consistent '
+                             'with array shape'):
         ds.GetRasterBand(1).ReadAsArray(buf_obj=ar, buf_xsize=2,
                                         buf_ysize=2)
     
 
     # Try call with inconsistent parameters.
     ar = numpy.empty([1, 2], dtype=numpy.uint8)
-    with pytest.raises(Exception, message='expected "Specified buf_xsize not consistent '
-                             'with buffer shape"'):
+    with pytest.raises(Exception, match='Specified buf_xsize not consistent '
+                             'with array shape'):
         ds.GetRasterBand(1).ReadAsArray(buf_obj=ar, buf_xsize=1,
                                         buf_ysize=1)
     
 
     # Inconsistent data type
     ar = numpy.empty([1, 2], dtype=numpy.uint8)
-    with pytest.raises(Exception, message='expected "Specified buf_type not consistent '
-                             'with array type"'):
+    with pytest.raises(Exception, match='Specified buf_type not consistent '
+                             'with array type'):
         ds.GetRasterBand(1).ReadAsArray(buf_obj=ar,
                                         buf_type=gdal.GDT_Int16)
     
@@ -450,41 +450,41 @@ def test_numpy_rw_13():
         ds.GetRasterBand(i + 1).WriteArray(ar[i])
 
     ar = numpy.empty([3, 1, 2], dtype=numpy.int64)
-    with pytest.raises(Exception, message='expected "ValueError: array does not have '
-                             'corresponding GDAL data type"'):
+    with pytest.raises(Exception, match='array does not have '
+                             'corresponding GDAL data type'):
         ds.ReadAsArray(buf_obj=ar)
     
 
     # Try call with inconsistent parameters.
     ar = numpy.empty([3, 1, 2], dtype=numpy.uint8)
-    with pytest.raises(Exception, message='expected "Specified buf_ysize not consistent '
-                             'with buffer shape"'):
+    with pytest.raises(Exception, match='Specified buf_ysize not consistent '
+                             'with array shape'):
         ds.ReadAsArray(buf_obj=ar, buf_xsize=2, buf_ysize=2)
     
 
     # With 2 dimensions
     ar = numpy.empty([1, 2], dtype=numpy.uint8)
-    with pytest.raises(Exception, message='expected "ValueError: Array should have 3 '
-                             'dimensions"'):
+    with pytest.raises(Exception, match='Array should have 3 '
+                             'dimensions'):
         ds.ReadAsArray(buf_obj=ar)
     
 
     # Try call with inconsistent parameters
     ar = numpy.empty([3, 1, 2], dtype=numpy.uint8)
-    with pytest.raises(Exception, message='expected "Specified buf_xsize not consistent '
-                             'with buffer shape"'):
+    with pytest.raises(Exception, match='Specified buf_xsize not consistent '
+                             'with array shape'):
         ds.ReadAsArray(buf_obj=ar, buf_xsize=1, buf_ysize=1)
     
 
     # Inconsistent data type
     ar = numpy.empty([3, 1, 2], dtype=numpy.uint8)
-    with pytest.raises(Exception, message='expected "Specified buf_type not consistent with array type"'):
+    with pytest.raises(Exception, match='Specified buf_type not consistent with array type'):
         ds.ReadAsArray(buf_obj=ar, buf_type=gdal.GDT_Int16)
     
 
     # Not enough space in first dimension
     ar = numpy.empty([2, 1, 2], dtype=numpy.uint8)
-    with pytest.raises(Exception, message='expected "Array should have space for 3 bands"'):
+    with pytest.raises(Exception, match='Array should have space for 3 bands'):
         ds.ReadAsArray(buf_obj=ar)
     
 
diff --git a/autotest/gcore/rasterio.py b/autotest/gcore/rasterio.py
index 5ef8c0f4db2e..d908d4370731 100755
--- a/autotest/gcore/rasterio.py
+++ b/autotest/gcore/rasterio.py
@@ -247,9 +247,8 @@ def test_rasterio_6():
     ds = gdal.GetDriverByName('MEM').Create('', 2, 2)
 
     for obj in [ds, ds.GetRasterBand(1)]:
-        with pytest.raises(Exception, message='expected exception'):
+        with pytest.raises(Exception):
             obj.WriteRaster(0, 0, 2, 2, None)
-        
 
         gdal.ErrorReset()
         gdal.PushErrorHandler('CPLQuietErrorHandler')
diff --git a/autotest/gcore/tiff_ovr.py b/autotest/gcore/tiff_ovr.py
index 9feb07c0f68d..4f3ddca5a2ba 100755
--- a/autotest/gcore/tiff_ovr.py
+++ b/autotest/gcore/tiff_ovr.py
@@ -944,9 +944,7 @@ def test_tiff_ovr_29(both_endian):
 
     png_ds = None
 
-    with pytest.raises(OSError, message='.ovr file still present'):
-        os.stat('tmp/ovr29.png.ovr')
-    
+    assert not os.path.exists('tmp/ovr29.png.ovr')
 
     gdal.GetDriverByName('PNG').Delete('tmp/ovr29.png')
 
diff --git a/autotest/gcore/tiff_read.py b/autotest/gcore/tiff_read.py
index 44c74499977c..da1310ca94a9 100755
--- a/autotest/gcore/tiff_read.py
+++ b/autotest/gcore/tiff_read.py
@@ -738,9 +738,7 @@ def test_tiff_read_from_tab():
 
     gdal.GetDriverByName('GTiff').Delete('tmp/tiff_read_from_tab.tif')
 
-    with pytest.raises(OSError, message='did not expect to find .tab file at that point'):
-        os.stat('tmp/tiff_read_from_tab.tab')
-    
+    assert not os.path.exists('tmp/tiff_read_from_tab.tab')
 
     assert gt == (400000.0, 25.0, 0.0, 1300000.0, 0.0, -25.0), \
         'did not get expected geotransform'
@@ -1553,9 +1551,7 @@ def test_tiff_read_md1():
 
     ds = None
 
-    with pytest.raises(OSError, message='Expected not generation of data/md_dg.tif.aux.xml'):
-        os.stat('data/md_dg.tif.aux.xml')
-    
+    assert not os.path.exists('data/md_dg.tif.aux.xml')
 
     
 ###############################################################################
@@ -1589,9 +1585,7 @@ def test_tiff_read_md2():
 
     ds = None
 
-    with pytest.raises(OSError, message='Expected not generation of data/md_dg_2.tif.aux.xml'):
-        os.stat('data/md_dg_2.tif.aux.xml')
-    
+    assert not os.path.exists('data/md_dg_2.tif.aux.xml')
 
     
 ###############################################################################
@@ -1625,9 +1619,7 @@ def test_tiff_read_md3():
 
     ds = None
 
-    with pytest.raises(OSError, message='Expected not generation of data/md_ge_rgb_0010000.tif.aux.xml'):
-        os.stat('data/md_ge_rgb_0010000.tif.aux.xml')
-    
+    assert not os.path.exists('data/md_ge_rgb_0010000.tif.aux.xml')
 
     
 ###############################################################################
@@ -1661,9 +1653,7 @@ def test_tiff_read_md4():
 
     ds = None
 
-    with pytest.raises(OSError, message='Expected not generation of data/md_ov.tif.aux.xml'):
-        os.stat('data/md_ov.tif.aux.xml')
-    
+    assert not os.path.exists('data/md_ov.tif.aux.xml')
 
     
 ###############################################################################
@@ -1697,9 +1687,7 @@ def test_tiff_read_md5():
 
     ds = None
 
-    with pytest.raises(OSError, message='Expected not generation of data/md_rdk1.tif.aux.xml'):
-        os.stat('data/md_rdk1.tif.aux.xml')
-    
+    assert not os.path.exists('data/md_rdk1.tif.aux.xml')
 
     
 ###############################################################################
@@ -1733,9 +1721,7 @@ def test_tiff_read_md6():
 
     ds = None
 
-    with pytest.raises(OSError, message='Expected not generation of data/md_ls_b1.tif.aux.xml'):
-        os.stat('data/md_ls_b1.tif.aux.xml')
-    
+    assert not os.path.exists('data/md_ls_b1.tif.aux.xml')
 
     
 ###############################################################################
@@ -1769,9 +1755,7 @@ def test_tiff_read_md7():
 
     ds = None
 
-    with pytest.raises(OSError, message='Expected not generation of data/spot/md_spot.tif.aux.xml'):
-        os.stat('data/spot/md_spot.tif.aux.xml')
-    
+    assert not os.path.exists('data/spot/md_spot.tif.aux.xml')
 
     
 ###############################################################################
@@ -1805,9 +1789,7 @@ def test_tiff_read_md8():
 
     ds = None
 
-    with pytest.raises(OSError, message='Expected not generation of data/md_re.tif.aux.xml'):
-        os.stat('data/md_re.tif.aux.xml')
-    
+    assert not os.path.exists('data/md_re.tif.aux.xml')
 
     
 ###############################################################################
@@ -1840,9 +1822,7 @@ def test_tiff_read_md9():
 
     ds = None
 
-    with pytest.raises(OSError, message='Expected not generation of data/alos/IMG-md_alos.tif.aux.xml'):
-        os.stat('data/alos/IMG-md_alos.tif.aux.xml')
-    
+    assert not os.path.exists('data/alos/IMG-md_alos.tif.aux.xml')
 
     
 ###############################################################################
@@ -1876,9 +1856,7 @@ def test_tiff_read_md10():
 
     ds = None
 
-    with pytest.raises(OSError, message='Expected not generation of data/md_eros.tif.aux.xml'):
-        os.stat('data/md_eros.tif.aux.xml')
-    
+    assert not os.path.exists('data/md_eros.tif.aux.xml')
 
     
 ###############################################################################
@@ -1912,9 +1890,7 @@ def test_tiff_read_md11():
 
     ds = None
 
-    with pytest.raises(OSError, message='Expected not generation of data/md_kompsat.tif.aux.xml'):
-        os.stat('data/md_kompsat.tif.aux.xml')
-    
+    assert not os.path.exists('data/md_kompsat.tif.aux.xml')
 
     
 ###############################################################################
@@ -1947,9 +1923,7 @@ def test_tiff_read_md12():
 
     ds = None
 
-    with pytest.raises(OSError, message='Expected not generation of data/md_kompsat.tif.aux.xml'):
-        os.stat('data/md_kompsat.tif.aux.xml')
-    
+    assert not os.path.exists('data/md_kompsat.tif.aux.xml')
 
     # Test not valid DIMAP product [https://github.com/OSGeo/gdal/issues/431]
     shutil.copy('../gdrivers/data/dimap2/IMG_foo_R2C1.TIF', 'tmp/IMG_foo_temp.TIF')
diff --git a/autotest/gcore/tiff_write.py b/autotest/gcore/tiff_write.py
index 49d86396358b..e290368f4463 100755
--- a/autotest/gcore/tiff_write.py
+++ b/autotest/gcore/tiff_write.py
@@ -671,14 +671,8 @@ def test_tiff_write_rpc_txt():
         pass
 
     # confirm there is no .RPB file created by default.
-    with pytest.raises(IOError, message='unexpectedly found .RPB file'):
-        open('tmp/tiff_write_rpc_txt.RPB').read()
-    
-
-    try:
-        open('tmp/tiff_write_rpc_txt_RPC.TXT').read()
-    except IOError:
-        pytest.fail('missing _RPC.TXT file.')
+    assert not os.path.exists('tmp/tiff_write_rpc_txt.RPB')
+    assert os.path.exists('tmp/tiff_write_rpc_txt_RPC.TXT')
 
     # Open the dataset, and confirm the RPC data is still intact.
     ds = gdal.Open('tmp/tiff_write_rpc_txt.tif')
@@ -691,9 +685,7 @@ def test_tiff_write_rpc_txt():
 
     # Confirm _RPC.TXT file is cleaned up.  If not likely the
     # file list functionality is not working properly.
-    with pytest.raises(IOError, message='_RPC.TXT did not get cleaned up.'):
-        open('tmp/tiff_write_rpc_txt_RPC.TXT').read()
-    
+    assert not os.path.exists('tmp/tiff_write_rpc_txt_RPC.TXT')
 
     
 ###############################################################################
@@ -718,9 +710,7 @@ def test_tiff_write_rpc_in_pam():
         pytest.fail('missing .aux.xml file.')
 
     # confirm there is no .RPB file created.
-    with pytest.raises(IOError, message='unexpectedly found .RPB file'):
-        open('tmp/tiff_write_rpc_txt.RPB').read()
-    
+    assert not os.path.exists('tmp/tiff_write_rpc_txt.RPB')
 
     # Open the dataset, and confirm the RPC data is still intact.
     ds = gdal.Open('tmp/tiff_write_rpc_in_pam.tif')
@@ -787,9 +777,7 @@ def test_tiff_write_20():
 
     # hopefully it's closed now!
 
-    with pytest.raises(OSError, message='did not expected .aux.xml file'):
-        os.stat('tmp/tags.tif.aux.xml')
-    
+    assert not os.path.exists('tmp/tags.tif.aux.xml')
 
     new_ds = gdal.Open('tmp/tags.tif')
     md = new_ds.GetMetadata()
@@ -806,9 +794,7 @@ def test_tiff_write_20():
     ds.SetMetadataItem('TIFFTAG_SOFTWARE', None)
     ds = None
 
-    with pytest.raises(OSError, message='did not expected .aux.xml file'):
-        os.stat('tmp/tags.tif.aux.xml')
-    
+    assert not os.path.exists('tmp/tags.tif.aux.xml')
 
     ds = gdal.Open('tmp/tags.tif')
     assert ds.GetMetadataItem('TIFFTAG_SOFTWARE') is None, \
@@ -1950,9 +1936,7 @@ def test_tiff_write_60():
         ds = None
         gdaltest.tiff_drv.Delete('tmp/tiff_write_60.tif')
 
-        with pytest.raises(OSError, message='%s should have been deleted' % options_tuple[1]):
-            os.stat(options_tuple[1])
-        
+        assert not os.path.exists(options_tuple[1])
 
         # CreateCopy case
         src_ds = gdal.Open('data/byte.tif')
@@ -1970,9 +1954,7 @@ def test_tiff_write_60():
         ds = None
         gdaltest.tiff_drv.Delete('tmp/tiff_write_60.tif')
 
-        with pytest.raises(OSError, message='%s should have been deleted' % options_tuple[1]):
-            os.stat(options_tuple[1])
-        
+        assert not os.path.exists(options_tuple[1])
 
     
 ###############################################################################
@@ -2591,10 +2573,7 @@ def test_tiff_write_79():
                 ds.GetProjectionRef()
             ds.SetMetadataItem('AREA_OR_POINT', 'Point')
             ds = None
-            with pytest.raises(OSError, message='got to PAM'):
-                # check that it doesn't go to PAM
-                os.stat('tmp/tiff_write_79.tif.aux.xml')
-            
+            assert not os.path.exists('tmp/tiff_write_79.tif.aux.xml')
 
             # So should get 'Area'
             ds = gdal.Open('tmp/tiff_write_79.tif')
@@ -2615,10 +2594,7 @@ def test_tiff_write_79():
                 assert mdi == 'Point', \
                     ('(3) did not get expected value. do_projection_ref = %d, check_just_after = %d' % (do_projection_ref, check_just_after))
             ds = None
-            with pytest.raises(OSError, message='got to PAM'):
-                # check that it doesn't go to PAM
-                os.stat('tmp/tiff_write_79.tif.aux.xml')
-            
+            assert not os.path.exists('tmp/tiff_write_79.tif.aux.xml')
 
             # Now should get 'Point'
             ds = gdal.Open('tmp/tiff_write_79.tif')
@@ -2664,10 +2640,7 @@ def test_tiff_write_80():
     ds.GetRasterBand(1).SetOffset(1000)
     ds = None
 
-    with pytest.raises(OSError, message='got to PAM, but not expected...'):
-        # check that it doesn't go to PAM
-        os.stat('tmp/tiff_write_80.tif.aux.xml')
-    
+    assert not os.path.exists('tmp/tiff_write_80.tif.aux.xml')
 
     ds = gdal.Open('tmp/tiff_write_80.tif')
     scale = ds.GetRasterBand(1).GetScale()
@@ -2733,10 +2706,7 @@ def test_tiff_write_80():
     ds.GetRasterBand(1).SetOffset(0)
     ds = None
 
-    with pytest.raises(OSError, message='PAM file should be deleted'):
-        # check that there is no more any PAM file
-        os.stat('tmp/tiff_write_80_bis.tif.aux.xml')
-    
+    assert not os.path.exists('tmp/tiff_write_80_bis.tif.aux.xml')
 
     ds = gdal.Open('tmp/tiff_write_80_bis.tif')
     scale = ds.GetRasterBand(1).GetScale()
@@ -2879,10 +2849,7 @@ def test_tiff_write_85():
     ds.GetRasterBand(1).SetUnitType('ft')
     ds = None
 
-    with pytest.raises(OSError, message='got to PAM, but not expected...'):
-        # check that it doesn't go to PAM
-        os.stat('tmp/tiff_write_85.tif.aux.xml')
-    
+    assert not os.path.exists('tmp/tiff_write_85.tif.aux.xml')
 
     ds = gdal.Open('tmp/tiff_write_85.tif')
     unittype = ds.GetRasterBand(1).GetUnitType()
@@ -2937,10 +2904,7 @@ def test_tiff_write_85():
     ds.GetRasterBand(1).SetUnitType(None)
     ds = None
 
-    with pytest.raises(OSError, message='PAM file should be deleted'):
-        # check that there is no more any PAM file
-        os.stat('tmp/tiff_write_85_bis.tif.aux.xml')
-    
+    assert not os.path.exists('tmp/tiff_write_85_bis.tif.aux.xml')
 
     ds = gdal.Open('tmp/tiff_write_85_bis.tif')
     unittype = ds.GetRasterBand(1).GetUnitType()
diff --git a/autotest/gdrivers/gdalhttp.py b/autotest/gdrivers/gdalhttp.py
index e65ae63147e2..e2fbffaf438c 100755
--- a/autotest/gdrivers/gdalhttp.py
+++ b/autotest/gdrivers/gdalhttp.py
@@ -198,9 +198,9 @@ def test_http_5():
     filename = ds.GetDescription()
     ds = None
 
-    with pytest.raises(OSError, message='file %s should have been removed' % filename):
+    with pytest.raises(OSError):
         os.stat(filename)
-    
+        pytest.fail('file %s should have been removed' % filename)
 
     
 ###############################################################################
diff --git a/autotest/gdrivers/hfa.py b/autotest/gdrivers/hfa.py
index 59ebc163dce8..6a1741628f88 100755
--- a/autotest/gdrivers/hfa.py
+++ b/autotest/gdrivers/hfa.py
@@ -406,9 +406,7 @@ def test_hfa_clean_ige():
     out_ds = drv.CreateCopy('tmp/igetest.img', src_ds)
     del out_ds
 
-    with pytest.raises(IOError, message='ige file not cleaned up properly.'):
-        open('tmp/igetest.ige')
-    
+    assert not os.path.exists('tmp/igetest.ige')
 
     drv.Delete('tmp/igetest.img')
 
@@ -917,11 +915,8 @@ def test_hfa_write_bit2grayscale():
     gdal.SetConfigOption('HFA_USE_RRD', 'NO')
 
     # as an aside, confirm the .rrd file was deleted.
-    with pytest.raises(IOError, message='tmp/small1bit.rrd not deleted!'):
-        open('tmp/small1bit.rrd')
-    
+    assert not os.path.exists('tmp/small1bit.rrd')
 
-    
 ###############################################################################
 # Verify handling of camera model metadata (#2675)
 
diff --git a/autotest/gdrivers/jp2metadata.py b/autotest/gdrivers/jp2metadata.py
index f561c7a0f1b3..f0ee510c778b 100755
--- a/autotest/gdrivers/jp2metadata.py
+++ b/autotest/gdrivers/jp2metadata.py
@@ -84,9 +84,7 @@ def test_jp2metadata_2():
 
     ds = None
 
-    with pytest.raises(OSError, message='Expected not generation of data/IMG_md_ple_R1C1.jp2.aux.xml'):
-        os.stat('data/IMG_md_ple_R1C1.jp2.aux.xml')
-    
+    assert not os.path.exists('data/IMG_md_ple_R1C1.jp2.aux.xml')
 
     
 ###############################################################################
diff --git a/autotest/gdrivers/jpeg.py b/autotest/gdrivers/jpeg.py
index c1fc32699107..dd0d516b0266 100755
--- a/autotest/gdrivers/jpeg.py
+++ b/autotest/gdrivers/jpeg.py
@@ -152,9 +152,7 @@ def test_jpeg_3():
 
     gdal.GetDriverByName('JPEG').Delete('tmp/byte.jpg')
 
-    with pytest.raises(OSError, message='did not expect to find .wld file at that point'):
-        os.stat('tmp/byte.wld')
-    
+    assert not os.path.exists('tmp/byte.wld')
 
     
 ###############################################################################
diff --git a/autotest/gdrivers/til.py b/autotest/gdrivers/til.py
index 181a16815480..77e0cc11bd7e 100755
--- a/autotest/gdrivers/til.py
+++ b/autotest/gdrivers/til.py
@@ -33,7 +33,6 @@
 
 import gdaltest
 from osgeo import gdal
-import pytest
 
 ###############################################################################
 # Test a fake TIL dataset
@@ -68,10 +67,7 @@ def test_til_2():
 
     ds = None
 
-    with pytest.raises(OSError, message='Expected not generation of data/testtil.til.aux.xml'):
-        os.stat('data/testtil.til.aux.xml')
-    
-
+    assert not os.path.exists('data/testtil.til.aux.xml')
     
 ###############################################################################
 # Check GetFileList() & XML
@@ -97,10 +93,6 @@ def test_til_3():
 
     ds = None
 
-    with pytest.raises(OSError, message='Expected not generation of data/testtil.til.aux.xml'):
-        os.stat('data/testtil.til.aux.xml')
-    
-
-    
+    assert not os.path.exists('data/testtil.til.aux.xml')
 
 
diff --git a/autotest/gdrivers/vrtmask.py b/autotest/gdrivers/vrtmask.py
index b1334d370853..6f527fac90b0 100755
--- a/autotest/gdrivers/vrtmask.py
+++ b/autotest/gdrivers/vrtmask.py
@@ -256,8 +256,9 @@ def test_vrtmask_7():
     ds = None
 
     os.remove('tmp/vrtmask_7_rgba.tif')
-    with pytest.raises(OSError, message='did not expect tmp/vrtmask_7_rgba.tif.msk'):
+    with pytest.raises(OSError):
         os.remove('tmp/vrtmask_7_rgba.tif.msk')
+        pytest.fail('did not expect tmp/vrtmask_7_rgba.tif.msk')
     
     os.remove('tmp/vrtmask_7_rgbmask.vrt')
 
diff --git a/autotest/gnm/gnm_test.py b/autotest/gnm/gnm_test.py
index 3493ff565a54..3942ec78531d 100755
--- a/autotest/gnm/gnm_test.py
+++ b/autotest/gnm/gnm_test.py
@@ -222,10 +222,6 @@ def test_gnm_delete():
 
     gdal.GetDriverByName('GNMFile').Delete('tmp/test_gnm')
 
-    with pytest.raises(OSError, message='Expected delete tmp/test_gnm'):
-        os.stat('tmp/test_gnm')
-    
-
-    
+    assert not os.path.exists('tmp/test_gnm')
 
 
diff --git a/autotest/ogr/ogr_fgdb.py b/autotest/ogr/ogr_fgdb.py
index fa518ae68fad..2f49cbaca890 100755
--- a/autotest/ogr/ogr_fgdb.py
+++ b/autotest/ogr/ogr_fgdb.py
@@ -400,9 +400,7 @@ def test_ogr_fgdb_5():
     assert ogrtest.fgdb_drv.DeleteDataSource("tmp/test.gdb") == 0, \
         'DeleteDataSource() failed'
 
-    with pytest.raises(OSError, message="tmp/test.gdb still existing"):
-        os.stat("tmp/test.gdb")
-    
+    assert not os.path.exists("tmp/test.gdb")
 
     
 ###############################################################################
@@ -1097,12 +1095,8 @@ def test_ogr_fgdb_19():
 
     assert ds.StartTransaction(force=True) == 0
 
-    try:
-        os.stat('tmp/test.gdb.ogredited')
-    except OSError:
-        pytest.fail()
-    with pytest.raises(OSError):
-        os.stat('tmp/test.gdb.ogrtmp')
+    assert os.path.exists('tmp/test.gdb.ogredited')
+    assert not os.path.exists('tmp/test.gdb.ogrtmp')
     
 
     ret = lyr.CreateField(ogr.FieldDefn('foobar', ogr.OFTString))
@@ -1167,13 +1161,8 @@ def test_ogr_fgdb_19():
     # Test that CommitTransaction() works
     assert ds.CommitTransaction() == 0
 
-    with pytest.raises(OSError):
-        os.stat('tmp/test.gdb.ogredited')
-    
-
-    with pytest.raises(OSError):
-        os.stat('tmp/test.gdb.ogrtmp')
-    
+    assert not os.path.exists('tmp/test.gdb.ogredited')
+    assert not os.path.exists('tmp/test.gdb.ogrtmp')
 
     lst = gdal.ReadDir('tmp/test.gdb')
     for filename in lst:
@@ -1216,13 +1205,8 @@ def test_ogr_fgdb_19():
 
     assert ds.RollbackTransaction() == 0
 
-    with pytest.raises(OSError):
-        os.stat('tmp/test.gdb.ogredited')
-    
-
-    with pytest.raises(OSError):
-        os.stat('tmp/test.gdb.ogrtmp')
-    
+    assert not os.path.exists('tmp/test.gdb.ogredited')
+    assert not os.path.exists('tmp/test.gdb.ogrtmp')
 
     assert lyr.GetFeatureCount() == old_count
 
@@ -1421,9 +1405,7 @@ def test_ogr_fgdb_19():
             ds = None
 
             if case == 'CASE4':
-                with pytest.raises(OSError, message=case):
-                    os.stat('tmp/test.gdb.ogredited')
-                
+                assert not os.path.exists('tmp/test.gdb.ogredited'), case
             else:
                 shutil.rmtree('tmp/test.gdb.ogredited')
 
diff --git a/autotest/ogr/ogr_gml_read.py b/autotest/ogr/ogr_gml_read.py
index 9bae9f3d6e8a..a455a39eb18a 100755
--- a/autotest/ogr/ogr_gml_read.py
+++ b/autotest/ogr/ogr_gml_read.py
@@ -1206,9 +1206,7 @@ def test_ogr_gml_35():
     ds = ogr.Open('tmp/GmlTopo-sample.xml')
     gdal.SetConfigOption('GML_SKIP_RESOLVE_ELEMS', None)
 
-    with pytest.raises(OSError, message='did not expect tmp/GmlTopo-sample.sqlite'):
-        os.stat('tmp/GmlTopo-sample.sqlite')
-    
+    assert not os.path.exists('tmp/GmlTopo-sample.sqlite')
 
     assert gdal.GetLastErrorMsg() == '', 'did not expect error'
     assert ds.GetLayerCount() == 3, ('expected 3 layers, got %d' % ds.GetLayerCount())
@@ -1321,9 +1319,7 @@ def test_ogr_gml_38(resolver='HUGE'):
     gdal.SetConfigOption('GML_FACE_HOLE_NEGATIVE', None)
 
     if resolver == 'HUGE':
-        with pytest.raises(OSError, message='did not expect tmp/sample_gml_face_hole_negative_no.sqlite'):
-            os.stat('tmp/sample_gml_face_hole_negative_no.sqlite')
-        
+        assert not os.path.exists('tmp/sample_gml_face_hole_negative_no.sqlite')
 
     assert gdal.GetLastErrorMsg() == '', 'did not expect error'
 
diff --git a/autotest/ogr/ogr_index_test.py b/autotest/ogr/ogr_index_test.py
index 6e10fb5acefc..afca08899631 100755
--- a/autotest/ogr/ogr_index_test.py
+++ b/autotest/ogr/ogr_index_test.py
@@ -222,9 +222,7 @@ def test_ogr_index_9():
     # After dataset closing, check that the index files do not exist after
     # dropping the index
     for filename in ['join_t.idm', 'join_t.ind']:
-        with pytest.raises(OSError, message="%s should not exist" % filename):
-            os.stat(filename)
-        
+        assert not os.path.exists(filename)
 
     # Re-create an index
     gdaltest.s_ds = ogr.OpenShared('join_t.dbf', update=1)
@@ -429,9 +427,7 @@ def test_ogr_index_cleanup():
     ogr.GetDriverByName('ESRI Shapefile').DeleteDataSource('join_t.dbf')
 
     for filename in ['join_t.idm', 'join_t.ind']:
-        with pytest.raises(OSError, message="%s should not exist" % filename):
-            os.stat(filename)
-        
+        assert not os.path.exists(filename)
 
     ogr.GetDriverByName('ESRI Shapefile').DeleteDataSource(
         'tmp/ogr_index_10.shp')
diff --git a/autotest/ogr/ogr_sql_test.py b/autotest/ogr/ogr_sql_test.py
index 74770874f31f..d8c8ebefa11b 100755
--- a/autotest/ogr/ogr_sql_test.py
+++ b/autotest/ogr/ogr_sql_test.py
@@ -627,9 +627,9 @@ def test_ogr_sql_28():
     field_defn = ogr.FieldDefn("strfield2", ogr.OFTString)
     lyr.CreateField(field_defn)
 
-    with pytest.raises(Exception, message='expected error on NULL query'):
+    with pytest.raises(Exception):
         sql_lyr = ds.ExecuteSQL(None)
-    
+        pytest.fail('expected exception on NULL query')
 
     queries = [
         '',
diff --git a/autotest/utilities/test_gdal_translate.py b/autotest/utilities/test_gdal_translate.py
index d2b89e8c5a8a..4cb4b3793ea9 100755
--- a/autotest/utilities/test_gdal_translate.py
+++ b/autotest/utilities/test_gdal_translate.py
@@ -501,9 +501,7 @@ def test_gdal_translate_23():
 
     assert md['STATISTICS_MINIMUM'] == '74', 'STATISTICS_MINIMUM is wrong.'
 
-    with pytest.raises(OSError, message='did not expect .aux.xml file presence'):
-        os.stat('tmp/test_gdal_translate_23.tif.aux.xml')
-    
+    assert not os.path.exists('tmp/test_gdal_translate_23.tif.aux.xml')
 
     gdal.Unlink('../gcore/data/byte.tif.aux.xml')
 
diff --git a/autotest/utilities/test_gdaladdo.py b/autotest/utilities/test_gdaladdo.py
index 70de99ce1eab..2c00e9a2f176 100755
--- a/autotest/utilities/test_gdaladdo.py
+++ b/autotest/utilities/test_gdaladdo.py
@@ -126,9 +126,7 @@ def test_gdaladdo_4():
 
     assert cnt == 0, 'did not clean overviews.'
 
-    with pytest.raises(OSError, message='.ovr file still exists'):
-        os.stat('tmp/test_gdaladdo_3.tif.ovr')
-    
+    assert not os.path.exists('tmp/test_gdaladdo_3.tif.ovr')
 
     os.remove('tmp/test_gdaladdo_3.tif')
 
diff --git a/autotest/utilities/test_gnmutils.py b/autotest/utilities/test_gnmutils.py
index f02212bfda82..6621ef27280b 100755
--- a/autotest/utilities/test_gnmutils.py
+++ b/autotest/utilities/test_gnmutils.py
@@ -138,11 +138,7 @@ def test_gnm_cleanup():
     (_, err) = gdaltest.runexternal_out_and_err(test_cli_utilities.get_gnmmanage_path() + ' delete tmp/test_gnm')
     assert (err is None or err == ''), 'got error/warning'
 
-    with pytest.raises(OSError, message='Expected delete tmp/test_gnm'):
-        os.stat('tmp/test_gnm')
-    
-
-    
+    assert not os.path.exists('tmp/test_gnm')
 
 
 

From ba3c8e5cc3d96f25e440a0de04f09c55b61bfacc Mon Sep 17 00:00:00 2001
From: Even Rouault <even.rouault@spatialys.com>
Date: Sat, 29 Jun 2019 22:14:25 +0200
Subject: [PATCH 342/488] autotest/requirements.txt: avoid too recent versions
 of pytest and more-itertools incompatible of Python2.7

---
 autotest/requirements.txt | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/autotest/requirements.txt b/autotest/requirements.txt
index e83b90c0e252..9982ec79a25d 100644
--- a/autotest/requirements.txt
+++ b/autotest/requirements.txt
@@ -1,3 +1,9 @@
-pytest>=3.6.0,<=4.2.0
+# Python 2.7 constraints
+# more-itertools 6.0 no longer supporting Python 2.7
+more-itertools < 6.0.0; python_version < '3.0'
+# pytest 5.0 no longer supporting Python 2.7
+pytest>=3.6.0,<5.0.0; python_version < '3.0'
+
+pytest>=3.6.0; python_version >= '3.0'
 pytest-sugar
 more-itertools < 5.0.0

From dbc35a6c5458c085a93c1d82294234989115cff7 Mon Sep 17 00:00:00 2001
From: Even Rouault <even.rouault@spatialys.com>
Date: Sun, 30 Jun 2019 11:32:09 +0200
Subject: [PATCH 343/488] autotest/requirements.txt: fix previous commit

---
 autotest/requirements.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/autotest/requirements.txt b/autotest/requirements.txt
index 9982ec79a25d..e40ee84847cd 100644
--- a/autotest/requirements.txt
+++ b/autotest/requirements.txt
@@ -6,4 +6,4 @@ pytest>=3.6.0,<5.0.0; python_version < '3.0'
 
 pytest>=3.6.0; python_version >= '3.0'
 pytest-sugar
-more-itertools < 5.0.0
+pytest-env

From 963618e77de4eee5e7321f5f5ca7abc2b7287fa2 Mon Sep 17 00:00:00 2001
From: Even Rouault <even.rouault@spatialys.com>
Date: Tue, 2 Jul 2019 11:54:49 +0200
Subject: [PATCH 344/488] PG: add support for PostgreSQL 12 (fixes #1692)

---
 gdal/ogr/ogrsf_frmts/pg/ogrpgdatasource.cpp | 13 ++++++++++---
 1 file changed, 10 insertions(+), 3 deletions(-)

diff --git a/gdal/ogr/ogrsf_frmts/pg/ogrpgdatasource.cpp b/gdal/ogr/ogrsf_frmts/pg/ogrpgdatasource.cpp
index 23665698fe41..67ee9958c460 100644
--- a/gdal/ogr/ogrsf_frmts/pg/ogrpgdatasource.cpp
+++ b/gdal/ogr/ogrsf_frmts/pg/ogrpgdatasource.cpp
@@ -894,12 +894,15 @@ void OGRPGDataSource::LoadTables()
 /*      See http://trac.osgeo.org/postgis/ticket/3092                   */
 /* -------------------------------------------------------------------- */
         CPLString osCommand;
+        const char* pszConstraintDef =
+            sPostgreSQLVersion.nMajor >= 12 ? "pg_get_constraintdef(s.oid)" :
+                                              "s.consrc";
         osCommand.Printf(
               "SELECT c.relname, n.nspname, c.relkind, a.attname, t.typname, "
               "postgis_typmod_dims(a.atttypmod) dim, "
               "postgis_typmod_srid(a.atttypmod) srid, "
               "postgis_typmod_type(a.atttypmod)::text geomtyp, "
-              "array_agg(s.consrc)::text att_constraints, a.attnotnull, "
+              "array_agg(%s)::text att_constraints, a.attnotnull, "
               "d.description "
               "FROM pg_class c JOIN pg_attribute a ON a.attrelid=c.oid "
               "JOIN pg_namespace n ON c.relnamespace = n.oid "
@@ -907,11 +910,15 @@ void OGRPGDataSource::LoadTables()
               "JOIN pg_type t ON a.atttypid = t.oid AND (t.typname = 'geometry'::name OR t.typname = 'geography'::name) "
               "LEFT JOIN pg_constraint s ON s.connamespace = n.oid AND s.conrelid = c.oid "
               "AND a.attnum = ANY (s.conkey) "
-              "AND (s.consrc LIKE '%%geometrytype(%% = %%' OR s.consrc LIKE '%%ndims(%% = %%' OR s.consrc LIKE '%%srid(%% = %%') "
+              "AND (%s LIKE '%%geometrytype(%% = %%' OR %s LIKE '%%ndims(%% = %%' OR %s LIKE '%%srid(%% = %%') "
               "LEFT JOIN pg_description d ON d.objoid = c.oid AND d.classoid = 'pg_class'::regclass::oid AND d.objsubid = 0 "
               "GROUP BY c.relname, n.nspname, c.relkind, a.attname, t.typname, dim, srid, geomtyp, a.attnotnull, c.oid, a.attnum, d.description "
               "ORDER BY c.oid, a.attnum",
-              pszAllowedRelations);
+              pszConstraintDef,
+              pszAllowedRelations,
+              pszConstraintDef,
+              pszConstraintDef,
+              pszConstraintDef);
         PGresult *hResult = OGRPG_PQexec(hPGConn, osCommand.c_str());
 
         if( !hResult || PQresultStatus(hResult) != PGRES_TUPLES_OK )

From 458ab9d6e3bf832dd9f609a34903cb55ea8ebc0f Mon Sep 17 00:00:00 2001
From: Even Rouault <even.rouault@spatialys.com>
Date: Thu, 4 Jul 2019 17:37:43 +0200
Subject: [PATCH 345/488] XLSX driver: add support for .xlsm extension

---
 gdal/ogr/ogrsf_frmts/xlsx/ogrxlsxdriver.cpp | 7 ++++---
 gdal/port/cpl_vsil_gzip.cpp                 | 1 +
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/gdal/ogr/ogrsf_frmts/xlsx/ogrxlsxdriver.cpp b/gdal/ogr/ogrsf_frmts/xlsx/ogrxlsxdriver.cpp
index 1c9bacba4aa6..ae24e35a13b1 100644
--- a/gdal/ogr/ogrsf_frmts/xlsx/ogrxlsxdriver.cpp
+++ b/gdal/ogr/ogrsf_frmts/xlsx/ogrxlsxdriver.cpp
@@ -46,8 +46,9 @@ static const char XLSX_MIMETYPE[] =
 
 static int OGRXLSXDriverIdentify( GDALOpenInfo* poOpenInfo )
 {
-    if (!EQUAL(CPLGetExtension(poOpenInfo->pszFilename), "XLSX") &&
-        !EQUAL(CPLGetExtension(poOpenInfo->pszFilename), "XLSX}"))
+    const char* pszExt = CPLGetExtension(poOpenInfo->pszFilename);
+    if (!EQUAL(pszExt, "XLSX") && !EQUAL(pszExt, "XLSM") &&
+        !EQUAL(pszExt, "XLSX}") && !EQUAL(pszExt, "XLSM}"))
         return FALSE;
 
     if( STARTS_WITH(poOpenInfo->pszFilename, "/vsizip/") ||
@@ -185,7 +186,7 @@ void RegisterOGRXLSX()
     poDriver->SetMetadataItem( GDAL_DCAP_VECTOR, "YES" );
     poDriver->SetMetadataItem( GDAL_DMD_LONGNAME,
                                "MS Office Open XML spreadsheet" );
-    poDriver->SetMetadataItem( GDAL_DMD_EXTENSION, "xlsx" );
+    poDriver->SetMetadataItem( GDAL_DMD_EXTENSIONS, "xlsx xlsm" );
     poDriver->SetMetadataItem( GDAL_DMD_HELPTOPIC, "drv_xlsx.html" );
     poDriver->SetMetadataItem( GDAL_DCAP_VIRTUALIO, "YES" );
     poDriver->SetMetadataItem( GDAL_DMD_CREATIONFIELDDATATYPES,
diff --git a/gdal/port/cpl_vsil_gzip.cpp b/gdal/port/cpl_vsil_gzip.cpp
index 0d97f45e9178..962e4dea6988 100644
--- a/gdal/port/cpl_vsil_gzip.cpp
+++ b/gdal/port/cpl_vsil_gzip.cpp
@@ -2722,6 +2722,7 @@ std::vector<CPLString> VSIZipFilesystemHandler::GetExtensions()
     oList.push_back(".dwf");
     oList.push_back(".ods");
     oList.push_back(".xlsx");
+    oList.push_back(".xlsm");
 
     // Add to zip FS handler extensions array additional extensions
     // listed in CPL_VSIL_ZIP_ALLOWED_EXTENSIONS config option.

From 7f3d00d9d3fa1b9317a696e0f22a378820d89d6b Mon Sep 17 00:00:00 2001
From: ajnisbet <ajnisbet@gmail.com>
Date: Fri, 12 Jul 2019 07:47:26 -0700
Subject: [PATCH 346/488] GetOutputDriverFor(): fixes error #1719 when multiple
 drivers found

---
 gdal/swig/python/scripts/gdal_calc.py       | 4 ++--
 gdal/swig/python/scripts/gdal_merge.py      | 4 ++--
 gdal/swig/python/scripts/gdal_pansharpen.py | 4 ++--
 gdal/swig/python/scripts/gdal_proximity.py  | 4 ++--
 gdal/swig/python/scripts/gdal_sieve.py      | 4 ++--
 gdal/swig/python/scripts/pct2rgb.py         | 4 ++--
 gdal/swig/python/scripts/rgb2pct.py         | 4 ++--
 7 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/gdal/swig/python/scripts/gdal_calc.py b/gdal/swig/python/scripts/gdal_calc.py
index 34421a67538c..1d9b5d9a9431 100755
--- a/gdal/swig/python/scripts/gdal_calc.py
+++ b/gdal/swig/python/scripts/gdal_calc.py
@@ -101,14 +101,14 @@ def GetOutputDriversFor(filename):
 
 def GetOutputDriverFor(filename):
     drv_list = GetOutputDriversFor(filename)
+    ext = GetExtension(filename)
     if not drv_list:
-        ext = GetExtension(filename)
         if not ext:
             return 'GTiff'
         else:
             raise Exception("Cannot guess driver for %s" % filename)
     elif len(drv_list) > 1:
-        print("Several drivers matching %s extension. Using %s" % (ext, drv_list[0]))
+        print("Several drivers matching %s extension. Using %s" % (ext if ext else '', drv_list[0]))
     return drv_list[0]
 
 ################################################################
diff --git a/gdal/swig/python/scripts/gdal_merge.py b/gdal/swig/python/scripts/gdal_merge.py
index 13333f674cc4..75c5d5fbbeaf 100755
--- a/gdal/swig/python/scripts/gdal_merge.py
+++ b/gdal/swig/python/scripts/gdal_merge.py
@@ -82,14 +82,14 @@ def GetOutputDriversFor(filename):
 
 def GetOutputDriverFor(filename):
     drv_list = GetOutputDriversFor(filename)
+    ext = GetExtension(filename)
     if not drv_list:
-        ext = GetExtension(filename)
         if not ext:
             return 'GTiff'
         else:
             raise Exception("Cannot guess driver for %s" % filename)
     elif len(drv_list) > 1:
-        print("Several drivers matching %s extension. Using %s" % (ext, drv_list[0]))
+        print("Several drivers matching %s extension. Using %s" % (ext if ext else '', drv_list[0]))
     return drv_list[0]
 
 
diff --git a/gdal/swig/python/scripts/gdal_pansharpen.py b/gdal/swig/python/scripts/gdal_pansharpen.py
index 078ce1adbf4d..eaee2a2b4719 100644
--- a/gdal/swig/python/scripts/gdal_pansharpen.py
+++ b/gdal/swig/python/scripts/gdal_pansharpen.py
@@ -73,14 +73,14 @@ def GetOutputDriversFor(filename):
 
 def GetOutputDriverFor(filename):
     drv_list = GetOutputDriversFor(filename)
+    ext = GetExtension(filename)
     if not drv_list:
-        ext = GetExtension(filename)
         if not ext:
             return 'GTiff'
         else:
             raise Exception("Cannot guess driver for %s" % filename)
     elif len(drv_list) > 1:
-        print("Several drivers matching %s extension. Using %s" % (ext, drv_list[0]))
+        print("Several drivers matching %s extension. Using %s" % (ext if ext else '', drv_list[0]))
     return drv_list[0]
 
 
diff --git a/gdal/swig/python/scripts/gdal_proximity.py b/gdal/swig/python/scripts/gdal_proximity.py
index a65020aad795..a616a8fcdf92 100755
--- a/gdal/swig/python/scripts/gdal_proximity.py
+++ b/gdal/swig/python/scripts/gdal_proximity.py
@@ -85,14 +85,14 @@ def GetOutputDriversFor(filename):
 
 def GetOutputDriverFor(filename):
     drv_list = GetOutputDriversFor(filename)
+    ext = GetExtension(filename)
     if not drv_list:
-        ext = GetExtension(filename)
         if not ext:
             return 'GTiff'
         else:
             raise Exception("Cannot guess driver for %s" % filename)
     elif len(drv_list) > 1:
-        print("Several drivers matching %s extension. Using %s" % (ext, drv_list[0]))
+        print("Several drivers matching %s extension. Using %s" % (ext if ext else '', drv_list[0]))
     return drv_list[0]
 
 # =============================================================================
diff --git a/gdal/swig/python/scripts/gdal_sieve.py b/gdal/swig/python/scripts/gdal_sieve.py
index 3b7fdb891a3a..a11b5bd09784 100755
--- a/gdal/swig/python/scripts/gdal_sieve.py
+++ b/gdal/swig/python/scripts/gdal_sieve.py
@@ -81,14 +81,14 @@ def GetOutputDriversFor(filename):
 
 def GetOutputDriverFor(filename):
     drv_list = GetOutputDriversFor(filename)
+    ext = GetExtension(filename)
     if not drv_list:
-        ext = GetExtension(filename)
         if not ext:
             return 'GTiff'
         else:
             raise Exception("Cannot guess driver for %s" % filename)
     elif len(drv_list) > 1:
-        print("Several drivers matching %s extension. Using %s" % (ext, drv_list[0]))
+        print("Several drivers matching %s extension. Using %s" % (ext if ext else '', drv_list[0]))
     return drv_list[0]
 
 # =============================================================================
diff --git a/gdal/swig/python/scripts/pct2rgb.py b/gdal/swig/python/scripts/pct2rgb.py
index fae73df2c349..8e7500691da7 100755
--- a/gdal/swig/python/scripts/pct2rgb.py
+++ b/gdal/swig/python/scripts/pct2rgb.py
@@ -87,14 +87,14 @@ def GetOutputDriversFor(filename):
 
 def GetOutputDriverFor(filename):
     drv_list = GetOutputDriversFor(filename)
+    ext = GetExtension(filename)
     if not drv_list:
-        ext = GetExtension(filename)
         if not ext:
             return 'GTiff'
         else:
             raise Exception("Cannot guess driver for %s" % filename)
     elif len(drv_list) > 1:
-        print("Several drivers matching %s extension. Using %s" % (ext, drv_list[0]))
+        print("Several drivers matching %s extension. Using %s" % (ext if ext else '', drv_list[0]))
     return drv_list[0]
 
 # =============================================================================
diff --git a/gdal/swig/python/scripts/rgb2pct.py b/gdal/swig/python/scripts/rgb2pct.py
index 30c2d09b6c94..6e9a0697095e 100755
--- a/gdal/swig/python/scripts/rgb2pct.py
+++ b/gdal/swig/python/scripts/rgb2pct.py
@@ -78,14 +78,14 @@ def GetOutputDriversFor(filename):
 
 def GetOutputDriverFor(filename):
     drv_list = GetOutputDriversFor(filename)
+    ext = GetExtension(filename)
     if not drv_list:
-        ext = GetExtension(filename)
         if not ext:
             return 'GTiff'
         else:
             raise Exception("Cannot guess driver for %s" % filename)
     elif len(drv_list) > 1:
-        print("Several drivers matching %s extension. Using %s" % (ext, drv_list[0]))
+        print("Several drivers matching %s extension. Using %s" % (ext if ext else '', drv_list[0]))
     return drv_list[0]
 
 # =============================================================================

From 96f606fec1ee26d90b6585dbcfaa1f449b25b174 Mon Sep 17 00:00:00 2001
From: Even Rouault <even.rouault@spatialys.com>
Date: Tue, 16 Jul 2019 16:05:05 +0200
Subject: [PATCH 347/488] s57objectclasses.csv: add missing TXTDSC attribute
 for DRYDOC class (fixes #1723)

---
 gdal/data/s57objectclasses.csv | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/gdal/data/s57objectclasses.csv b/gdal/data/s57objectclasses.csv
index 7e38654f3cfc..6830ca57625c 100644
--- a/gdal/data/s57objectclasses.csv
+++ b/gdal/data/s57objectclasses.csv
@@ -45,7 +45,7 @@
 44,Distance mark,DISMAR,CATDIS;DATEND;DATSTA;NOBJNM;OBJNAM;,INFORM;NINFOM;NTXTDS;SCAMAX;SCAMIN;TXTDSC;,RECDAT;RECIND;SORDAT;SORIND;,G,Point;
 45,Dock area,DOCARE,CATDOC;CONDTN;DATEND;DATSTA;HORACC;HORCLR;NOBJNM;OBJNAM;STATUS;,INFORM;NINFOM;NTXTDS;SCAMAX;SCAMIN;TXTDSC;,RECDAT;RECIND;SORDAT;SORIND;,G,Area;
 46,Dredged area,DRGARE,DRVAL1;DRVAL2;NOBJNM;OBJNAM;QUASOU;RESTRN;SOUACC;TECSOU;VERDAT;,INFORM;NINFOM;NTXTDS;SCAMAX;SCAMIN;TXTDSC;,RECDAT;RECIND;SORDAT;SORIND;,G,Area;
-47,Dry dock,DRYDOC,CONDTN;HORACC;HORCLR;HORLEN;HORWID;NOBJNM;OBJNAM;STATUS;DRVAL1;QUASOU;SOUACC;VERDAT;,INFORM;NINFOM;SCAMAX;SCAMIN;,RECDAT;RECIND;SORDAT;SORIND;,G,Area;
+47,Dry dock,DRYDOC,CONDTN;HORACC;HORCLR;HORLEN;HORWID;NOBJNM;OBJNAM;STATUS;DRVAL1;QUASOU;SOUACC;VERDAT;,INFORM;NINFOM;SCAMAX;SCAMIN;TXTDSC;,RECDAT;RECIND;SORDAT;SORIND;,G,Area;
 48,Dumping ground,DMPGRD,CATDPG;NOBJNM;OBJNAM;RESTRN;STATUS;,INFORM;NINFOM;NTXTDS;SCAMAX;SCAMIN;TXTDSC;,RECDAT;RECIND;SORDAT;SORIND;,G,Point;Area;
 49,Dyke,DYKCON,CONDTN;CONRAD;DATEND;DATSTA;HEIGHT;NATCON;VERACC;VERDAT;VERLEN;,INFORM;NINFOM;NTXTDS;SCAMAX;SCAMIN;TXTDSC;,RECDAT;RECIND;SORDAT;SORIND;,G,Line;Area;
 50,Exclusive Economic Zone,EXEZNE,NATION;,INFORM;NINFOM;NTXTDS;SCAMAX;SCAMIN;TXTDSC;,RECDAT;RECIND;SORDAT;SORIND;,G,Area;

From b329312deb562c3485ac0fd3b65fd270e21b2d46 Mon Sep 17 00:00:00 2001
From: Even Rouault <even.rouault@spatialys.com>
Date: Tue, 16 Jul 2019 18:04:44 +0200
Subject: [PATCH 348/488] gdalwarp: adjust nodata values, passed with
 -srcnodata/-dstnodata, and close to FLT_MAX to exactly it (fixes #1724)

---
 gdal/apps/gdalwarp_lib.cpp | 16 +++++++++++++---
 1 file changed, 13 insertions(+), 3 deletions(-)

diff --git a/gdal/apps/gdalwarp_lib.cpp b/gdal/apps/gdalwarp_lib.cpp
index 7d6b8cacae38..61ced0b0d332 100644
--- a/gdal/apps/gdalwarp_lib.cpp
+++ b/gdal/apps/gdalwarp_lib.cpp
@@ -1568,10 +1568,15 @@ GDALDatasetH GDALWarp( const char *pszDest, GDALDatasetH hDstDS, int nSrcCount,
                         CPLStringToComplex( papszTokens[i],
                                             psWO->padfSrcNoDataReal + i,
                                             psWO->padfSrcNoDataImag + i );
+                        psWO->padfSrcNoDataReal[i] =
+                            GDALAdjustNoDataCloseToFloatMax(psWO->padfSrcNoDataReal[i]);
+                        psWO->padfSrcNoDataImag[i] =
+                            GDALAdjustNoDataCloseToFloatMax(psWO->padfSrcNoDataImag[i]);
                     }
                     else
                     {
-                        psWO->padfSrcNoDataReal[i] = CPLAtof(papszTokens[i]);
+                        psWO->padfSrcNoDataReal[i] = GDALAdjustNoDataCloseToFloatMax(
+                            CPLAtof(papszTokens[i]));
                     }
                 }
                 else
@@ -1679,6 +1684,10 @@ GDALDatasetH GDALWarp( const char *pszDest, GDALDatasetH hDstDS, int nSrcCount,
                     CPLStringToComplex( papszTokens[i],
                                         psWO->padfDstNoDataReal + i,
                                         psWO->padfDstNoDataImag + i );
+                    psWO->padfDstNoDataReal[i] =
+                        GDALAdjustNoDataCloseToFloatMax(psWO->padfDstNoDataReal[i]);
+                    psWO->padfDstNoDataImag[i] =
+                        GDALAdjustNoDataCloseToFloatMax(psWO->padfDstNoDataImag[i]);
                     bDstNoDataNone = false;
                     CPLDebug( "WARP", "dstnodata of band %d set to %f", i, psWO->padfDstNoDataReal[i] );
                 }
@@ -1900,8 +1909,9 @@ GDALDatasetH GDALWarp( const char *pszDest, GDALDatasetH hDstDS, int nSrcCount,
                     bOKRegardingInitDest = true;
                     for( int i = 0; i < GDALGetRasterCount(hDstDS); i++ )
                     {
-                        double dfInitVal = CPLAtofM(papszTokensInitDest[
-                            std::min(i, nTokenCountInitDest-1)]);
+                        double dfInitVal = GDALAdjustNoDataCloseToFloatMax(
+                            CPLAtofM(papszTokensInitDest[
+                                std::min(i, nTokenCountInitDest-1)]));
                         int bHasNoData = false;
                         double dfDstNoDataVal = GDALGetRasterNoDataValue(
                             GDALGetRasterBand(hDstDS, i+1), &bHasNoData);

From 96e5b10f58e5afc7791728e20bde204c4bd71c11 Mon Sep 17 00:00:00 2001
From: Even Rouault <even.rouault@spatialys.com>
Date: Thu, 18 Jul 2019 00:05:09 +0200
Subject: [PATCH 349/488] HDF5 and netCDF: fix crash when reading attributes of
 type string of variable length with NULL values

---
 .../data/dimension_labels_with_null.h5        | Bin 0 -> 6240 bytes
 .../data/dimension_labels_with_null.nc        | Bin 0 -> 6240 bytes
 autotest/gdrivers/hdf5.py                     |   5 ++---
 autotest/gdrivers/netcdf.py                   |  18 ++++++++++++++++--
 gdal/frmts/hdf5/hdf5dataset.cpp               |   4 ++--
 gdal/frmts/netcdf/netcdfdataset.cpp           |   4 ++--
 6 files changed, 22 insertions(+), 9 deletions(-)
 create mode 100644 autotest/gdrivers/data/dimension_labels_with_null.h5
 create mode 100644 autotest/gdrivers/data/dimension_labels_with_null.nc

diff --git a/autotest/gdrivers/data/dimension_labels_with_null.h5 b/autotest/gdrivers/data/dimension_labels_with_null.h5
new file mode 100644
index 0000000000000000000000000000000000000000..4710b3e6c4a087679ad28d41f8e831810dc68344
GIT binary patch
literal 6240
zcmeH{!A`?442J)-n-onTHiR_bLf-(6++fg-PAV;;9JnAliAUhD8#{t{5gvs{;B6pI
z>`SFyn2?a_OsyTqc9t)8-|}?6JvtnLhP4=A>{WSv^Jw;iMdq^Juwq!gviyjGVn9ED
z!!hCfZNIzQEQ9lu{31CWP6k1<Vo=#D0(myOp#$IZsijIkxy}T})AD&qy3}JX3%`^G
zHss=j2B$ugiGzX55;5nOztd%pT_;fFBsp@uMkB%0V*28BV95JLQRFwU+&OMLF8zi*
zgV<#=Ih*(6hcWlpY8cj~&w%q_*zjGKRZ1N#eVE9>H_Y3&@GY$Uk&XKz?zuZo7uQ)?
zFRJpfm|bK=Ej$j~#Zs-);|oIW+k~0m7b$UFlA;>EypW;GQ|<jAus#F+?zy_G3SVdZ
q!Iqj6xoScF+G!bdssxmP5>Nt4KnW-TC7=Y9fD%vwN<azxdjda&oJ*wu

literal 0
HcmV?d00001

diff --git a/autotest/gdrivers/data/dimension_labels_with_null.nc b/autotest/gdrivers/data/dimension_labels_with_null.nc
new file mode 100644
index 0000000000000000000000000000000000000000..4710b3e6c4a087679ad28d41f8e831810dc68344
GIT binary patch
literal 6240
zcmeH{!A`?442J)-n-onTHiR_bLf-(6++fg-PAV;;9JnAliAUhD8#{t{5gvs{;B6pI
z>`SFyn2?a_OsyTqc9t)8-|}?6JvtnLhP4=A>{WSv^Jw;iMdq^Juwq!gviyjGVn9ED
z!!hCfZNIzQEQ9lu{31CWP6k1<Vo=#D0(myOp#$IZsijIkxy}T})AD&qy3}JX3%`^G
zHss=j2B$ugiGzX55;5nOztd%pT_;fFBsp@uMkB%0V*28BV95JLQRFwU+&OMLF8zi*
zgV<#=Ih*(6hcWlpY8cj~&w%q_*zjGKRZ1N#eVE9>H_Y3&@GY$Uk&XKz?zuZo7uQ)?
zFRJpfm|bK=Ej$j~#Zs-);|oIW+k~0m7b$UFlA;>EypW;GQ|<jAus#F+?zy_G3SVdZ
q!Iqj6xoScF+G!bdssxmP5>Nt4KnW-TC7=Y9fD%vwN<azxdjda&oJ*wu

literal 0
HcmV?d00001

diff --git a/autotest/gdrivers/hdf5.py b/autotest/gdrivers/hdf5.py
index 9c978382e08f..e9c6b010393f 100755
--- a/autotest/gdrivers/hdf5.py
+++ b/autotest/gdrivers/hdf5.py
@@ -453,6 +453,5 @@ def test_hdf5(downloadURL, fileName, subdatasetname, checksum, download_size):
 
     assert ds.GetRasterBand(1).Checksum() == checksum, 'Bad checksum. Expected %d, got %d' % (checksum, ds.GetRasterBand(1).Checksum())
 
-
-
-
+def test_hdf5_dimension_labels_with_null():
+    assert gdal.Open('data/dimension_labels_with_null.h5')
diff --git a/autotest/gdrivers/netcdf.py b/autotest/gdrivers/netcdf.py
index 1725ef0aa3c2..5cb955dd5041 100755
--- a/autotest/gdrivers/netcdf.py
+++ b/autotest/gdrivers/netcdf.py
@@ -2882,6 +2882,20 @@ def test_netcdf_functions_2(filename, checksum, options, testfunction):
     ut = gdaltest.GDALTest('netcdf', filename, 1, checksum, options=options)
     getattr(ut, testfunction)()
 
-###############################################################################
-#  other tests
+def test_netcdf_dimension_labels_with_null():
+
+    if gdaltest.netcdf_drv is None:
+        pytest.skip()
+
+    if not gdaltest.netcdf_drv_has_nc4:
+        pytest.skip()
 
+    with gdaltest.error_handler():
+        assert gdal.Open('data/dimension_labels_with_null.nc')
+
+def test_clean_tmp():
+    # [KEEP THIS AS THE LAST TEST]
+    # i.e. please do not add any tests after this one. Put new ones above.
+    # Not actually a test, just cleans up tmp...
+    gdaltest.clean_tmp()
+    pytest.skip()
diff --git a/gdal/frmts/hdf5/hdf5dataset.cpp b/gdal/frmts/hdf5/hdf5dataset.cpp
index 4c5b2c246cf1..ffdb36f24ab4 100644
--- a/gdal/frmts/hdf5/hdf5dataset.cpp
+++ b/gdal/frmts/hdf5/hdf5dataset.cpp
@@ -1042,11 +1042,11 @@ static herr_t HDF5AttrIterate( hid_t hH5ObjID,
             H5Aread(hAttrID, hAttrNativeType, papszStrings);
 
             // Concatenate all values as one string separated by a space.
-            CPLString osVal = papszStrings[0];
+            CPLString osVal = papszStrings[0] ? papszStrings[0] : "{NULL}";
             for( hsize_t i = 1; i < nAttrElmts; i++ )
             {
                 osVal += " ";
-                osVal += papszStrings[i];
+                osVal += papszStrings[i] ? papszStrings[i] : "{NULL}";
             }
 
             szValue = static_cast<char *>(CPLMalloc(osVal.length() + 1));
diff --git a/gdal/frmts/netcdf/netcdfdataset.cpp b/gdal/frmts/netcdf/netcdfdataset.cpp
index 2e8069b9f077..1372258ca0bd 100644
--- a/gdal/frmts/netcdf/netcdfdataset.cpp
+++ b/gdal/frmts/netcdf/netcdfdataset.cpp
@@ -9501,10 +9501,10 @@ static CPLErr NCDFGetAttr1( int nCdfId, int nVarId, const char *pszAttrName,
         dfValue = 0.0;
         for( m = 0; m < nAttrLen - 1; m++ )
         {
-            NCDFSafeStrcat(&pszAttrValue, ppszTemp[m], &nAttrValueSize);
+            NCDFSafeStrcat(&pszAttrValue, ppszTemp[m] ? ppszTemp[m] : "{NULL}", &nAttrValueSize);
             NCDFSafeStrcat(&pszAttrValue, ",", &nAttrValueSize);
         }
-        NCDFSafeStrcat(&pszAttrValue, ppszTemp[m], &nAttrValueSize);
+        NCDFSafeStrcat(&pszAttrValue, ppszTemp[m] ? ppszTemp[m] : "{NULL}", &nAttrValueSize);
         nc_free_string(nAttrLen, ppszTemp);
         CPLFree(ppszTemp);
         break;

From 62c0d21e72ae8f75170af11fe0a8a99cf0ef9eb0 Mon Sep 17 00:00:00 2001
From: Even Rouault <even.rouault@spatialys.com>
Date: Thu, 18 Jul 2019 02:34:57 +0200
Subject: [PATCH 350/488] Avoid crash on test_netcdf_dimension_labels_with_null
 with too old netCDF version

---
 autotest/gdrivers/netcdf.py | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/autotest/gdrivers/netcdf.py b/autotest/gdrivers/netcdf.py
index 5cb955dd5041..28d49a28ceaf 100755
--- a/autotest/gdrivers/netcdf.py
+++ b/autotest/gdrivers/netcdf.py
@@ -2890,6 +2890,10 @@ def test_netcdf_dimension_labels_with_null():
     if not gdaltest.netcdf_drv_has_nc4:
         pytest.skip()
 
+    # Crashes with 4.1.3 of Ubuntu Precise
+    if gdaltest.netcdf_drv_version.startswith('4.0.') or gdaltest.netcdf_drv_version.startswith('4.1.'):
+        pytest.skip('Test crashes with this libnetcdf version')
+
     with gdaltest.error_handler():
         assert gdal.Open('data/dimension_labels_with_null.nc')
 

From 63766b99911f787555d34f6c17a513937b8d1607 Mon Sep 17 00:00:00 2001
From: Even Rouault <even.rouault@spatialys.com>
Date: Tue, 16 Jul 2019 22:27:09 +0200
Subject: [PATCH 351/488] appveyor.yml: force installation of SWIG 3.0.12 since
 the C# bindings aren't compatible of SWIG 4.0 (fixes #1726)

---
 appveyor.yml | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/appveyor.yml b/appveyor.yml
index 2a15d6c73ab3..ac98d3282184 100644
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -67,7 +67,8 @@ install:
       Install-Module Pscx -AllowClobber
       Install-Module VSSetup -Scope CurrentUser
       # Install SWIG and VC for Python2.7 by Choco
-      cinst -y --no-progress swig vcpython27
+      cinst -y --no-progress --version 3.0.12 --force swig
+      cinst -y --no-progress vcpython27
       Import-VisualStudioVars -VisualStudioVersion $env:VS_VER -Architecture $env:ARCHITECTURE
       exec { pip install numpy }
       $env:SDK_ZIP="$env:SDK"+"-dev.zip"

From ade6de9fd3282199e2e7cdaf9add3089cc81b24a Mon Sep 17 00:00:00 2001
From: Even Rouault <even.rouault@spatialys.com>
Date: Fri, 19 Jul 2019 10:25:09 +0200
Subject: [PATCH 352/488] USGSDEM: avoid int overflow. Fixes
 https://bugs.chromium.org/p/oss-fuzz/issues/detail?id=15715. Credit to OSS
 Fuzz

---
 gdal/frmts/usgsdem/usgsdemdataset.cpp | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/gdal/frmts/usgsdem/usgsdemdataset.cpp b/gdal/frmts/usgsdem/usgsdemdataset.cpp
index 1bf71867921e..bbcade005b6a 100644
--- a/gdal/frmts/usgsdem/usgsdemdataset.cpp
+++ b/gdal/frmts/usgsdem/usgsdemdataset.cpp
@@ -804,7 +804,10 @@ int USGSDEMDataset::LoadFromFile(VSILFILE *InDem)
         adfGeoTransform[5] = (-dydelta) / 3600.0;
     }
 
-    if (!GDALCheckDatasetDimensions(nRasterXSize, nRasterYSize))
+    // IReadBlock() not ready for more than INT_MAX pixels, and that
+    // would behave badly
+    if (!GDALCheckDatasetDimensions(nRasterXSize, nRasterYSize) ||
+        nRasterXSize > INT_MAX / nRasterYSize)
     {
         return FALSE;
     }

From e9bc15da6e82671753859fa6ee803f0939ab6ecf Mon Sep 17 00:00:00 2001
From: Even Rouault <even.rouault@spatialys.com>
Date: Mon, 22 Jul 2019 17:29:09 +0200
Subject: [PATCH 353/488] PG: be more restrictive when deducing non-nullability
 of columns in SQL result layers (fixes #1734)

---
 gdal/ogr/ogrsf_frmts/pg/ogrpgresultlayer.cpp | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/gdal/ogr/ogrsf_frmts/pg/ogrpgresultlayer.cpp b/gdal/ogr/ogrsf_frmts/pg/ogrpgresultlayer.cpp
index c5483b1b4668..2ed50bcbcac6 100644
--- a/gdal/ogr/ogrsf_frmts/pg/ogrpgresultlayer.cpp
+++ b/gdal/ogr/ogrsf_frmts/pg/ogrpgresultlayer.cpp
@@ -86,7 +86,13 @@ OGRPGResultLayer::OGRPGResultLayer( OGRPGDataSource *poDSIn,
         }
     }
 
-    if( !osRequest.empty() )
+    CPLString osQuery(pszRawQueryIn);
+    // Only a INNER JOIN can guarantee that the non-nullability of source columns
+    // will be valid for the result of the join.
+    if( !osRequest.empty() &&
+        osQuery.ifind("LEFT JOIN") == std::string::npos &&
+        osQuery.ifind("RIGHT JOIN") == std::string::npos &&
+        osQuery.ifind("OUTER JOIN") == std::string::npos )
     {
         osRequest = "SELECT attnum, attrelid FROM pg_attribute WHERE attnotnull = 't' AND (" + osRequest + ")";
         PGresult* hResult = OGRPG_PQexec(poDS->GetPGConn(), osRequest );

From d96349b178aceceaa79c121e5f5860ca5cd2d409 Mon Sep 17 00:00:00 2001
From: zacharyburnettNOAA
 <52422935+zacharyburnettNOAA@users.noreply.github.com>
Date: Tue, 23 Jul 2019 15:21:07 -0400
Subject: [PATCH 354/488] BAG: calculate the northeast pixel corner rather than
 scaling the resolution, due to an incorrectly shifted northeast corner in
 some CARIS surveys (#1728)

---
 .gitignore                                    |   6 ++
 autotest/gdrivers/bag.py                      |  63 ++++++++++-------
 .../gdrivers/data/test_offset_ne_corner.bag   | Bin 0 -> 29152 bytes
 gdal/frmts/hdf5/bagdataset.cpp                |  66 ++++++++++++++++--
 4 files changed, 106 insertions(+), 29 deletions(-)
 create mode 100644 autotest/gdrivers/data/test_offset_ne_corner.bag

diff --git a/.gitignore b/.gitignore
index 4d261c5fc93f..7cc4f0125c8e 100644
--- a/.gitignore
+++ b/.gitignore
@@ -13,3 +13,9 @@
 .cproject
 .idea
 .vscode
+.vs
+
+# Python
+__pycache__/
+.env*/
+.venv*/
diff --git a/autotest/gdrivers/bag.py b/autotest/gdrivers/bag.py
index 10c1d0b141cc..185f3f96d7d2 100755
--- a/autotest/gdrivers/bag.py
+++ b/autotest/gdrivers/bag.py
@@ -31,12 +31,11 @@
 ###############################################################################
 
 
-import pytest
-
-from osgeo import gdal
+from xml.etree import ElementTree
 
 import gdaltest
-
+import pytest
+from osgeo import gdal
 
 pytestmark = pytest.mark.require_driver('BAG')
 
@@ -56,7 +55,6 @@ def check_no_file_leaks():
 
 
 def test_bag_2():
-
     if gdaltest.bag_drv is None:
         pytest.skip()
 
@@ -95,12 +93,12 @@ def test_bag_2():
 
     assert not gdaltest.is_file_open('data/true_n_nominal.bag'), 'file still opened.'
 
+
 ###############################################################################
 # Test a southern hemisphere falseNorthing sample file.
 
 
 def test_bag_3():
-
     if gdaltest.bag_drv is None:
         pytest.skip()
 
@@ -120,12 +118,12 @@ def test_bag_3():
     assert 'PARAMETER["false_northing",10000000]' in pj, \
         'Did not find false_northing of 10000000'
 
+
 ###############################################################################
 #
 
 
 def test_bag_vr_normal():
-
     if gdaltest.bag_drv is None:
         pytest.skip()
 
@@ -188,7 +186,6 @@ def test_bag_vr_normal():
 
 
 def test_bag_vr_list_supergrids():
-
     if gdaltest.bag_drv is None:
         pytest.skip()
 
@@ -208,27 +205,27 @@ def test_bag_vr_list_supergrids():
     assert len(sub_ds) == 24
 
     ds = gdal.OpenEx('data/test_vr.bag', open_options=[
-                     'MODE=LIST_SUPERGRIDS', 'MINX=100', 'MAXX=220', 'MINY=500000', 'MAXY=500100'])
+        'MODE=LIST_SUPERGRIDS', 'MINX=100', 'MAXX=220', 'MINY=500000', 'MAXY=500100'])
     sub_ds = ds.GetSubDatasets()
     assert len(sub_ds) == 6
     assert sub_ds[0][0] == 'BAG:"data/test_vr.bag":supergrid:1:1'
 
     ds = gdal.OpenEx('data/test_vr.bag', open_options=[
-                     'MODE=LIST_SUPERGRIDS', 'RES_FILTER_MIN=5', 'RES_FILTER_MAX=10'])
+        'MODE=LIST_SUPERGRIDS', 'RES_FILTER_MIN=5', 'RES_FILTER_MAX=10'])
     sub_ds = ds.GetSubDatasets()
     assert len(sub_ds) == 12
     assert sub_ds[0][0] == 'BAG:"data/test_vr.bag":supergrid:0:3'
 
     ds = gdal.OpenEx('data/test_vr.bag', open_options=[
-                     'SUPERGRIDS_INDICES=(2,1),(3,4)'])
+        'SUPERGRIDS_INDICES=(2,1),(3,4)'])
     sub_ds = ds.GetSubDatasets()
     assert len(sub_ds) == 2
     assert (sub_ds[0][0] == 'BAG:"data/test_vr.bag":supergrid:2:1' and \
-       sub_ds[1][0] == 'BAG:"data/test_vr.bag":supergrid:3:4')
+            sub_ds[1][0] == 'BAG:"data/test_vr.bag":supergrid:3:4')
 
     # One single tuple: open the subdataset directly
     ds = gdal.OpenEx('data/test_vr.bag', open_options=[
-                     'SUPERGRIDS_INDICES=(2,1)'])
+        'SUPERGRIDS_INDICES=(2,1)'])
     ds2 = gdal.Open('BAG:"data/test_vr.bag":supergrid:2:1')
     assert gdal.Info(ds) == gdal.Info(ds2), sub_ds
 
@@ -240,13 +237,12 @@ def test_bag_vr_list_supergrids():
                 'SUPERGRIDS_INDICES=' + invalid_val])
         assert gdal.GetLastErrorMsg() != '', invalid_val
 
-    
+
 ###############################################################################
 #
 
 
 def test_bag_vr_open_supergrids():
-
     if gdaltest.bag_drv is None:
         pytest.skip()
 
@@ -315,7 +311,6 @@ def test_bag_vr_open_supergrids():
 
 
 def test_bag_vr_resampled():
-
     if gdaltest.bag_drv is None:
         pytest.skip()
 
@@ -545,19 +540,18 @@ def test_bag_vr_resampled():
         pytest.fail(m2_min, M2_min, mean2_min)
 
     if m2_min >= m2_max or \
-       (m2_mean, M2_mean, mean2_mean) != (m2_max, M2_max, mean2_max):
+        (m2_mean, M2_mean, mean2_mean) != (m2_max, M2_max, mean2_max):
         print(m1_max, M1_max, mean1_max)
         print(m1_mean, M1_mean, mean1_mean)
         print(m1_min, M1_min, mean1_min)
         pytest.fail(m2_min, M2_min, mean2_min)
 
-    
+
 ###############################################################################
 #
 
 
 def test_bag_vr_resampled_mask():
-
     if gdaltest.bag_drv is None:
         pytest.skip()
 
@@ -576,7 +570,6 @@ def test_bag_vr_resampled_mask():
 
 
 def test_bag_vr_resampled_interpolated():
-
     if gdaltest.bag_drv is None:
         pytest.skip()
 
@@ -605,7 +598,6 @@ def test_bag_vr_resampled_interpolated():
 
 
 def test_bag_write_single_band():
-
     if gdaltest.bag_drv is None:
         pytest.skip()
 
@@ -619,7 +611,6 @@ def test_bag_write_single_band():
 
 
 def test_bag_write_two_bands():
-
     if gdaltest.bag_drv is None:
         pytest.skip()
 
@@ -628,8 +619,8 @@ def test_bag_write_two_bands():
                                      'VAR_ABSTRACT=foo',
                                      'VAR_XML_IDENTIFICATION_CITATION=<bar/>'])
     tst.testCreateCopy(quiet_error_handler=False,
-                             delete_copy=False,
-                             new_filename='/vsimem/out.bag')
+                       delete_copy=False,
+                       new_filename='/vsimem/out.bag')
 
     ds = gdal.Open('/vsimem/out.bag')
     xml = ds.GetMetadata_List('xml:BAG')[0]
@@ -643,7 +634,6 @@ def test_bag_write_two_bands():
 
 
 def test_bag_write_south_up():
-
     if gdaltest.bag_drv is None:
         pytest.skip()
 
@@ -666,5 +656,28 @@ def test_bag_write_south_up():
 
     gdal.Unlink('/vsimem/out.bag')
 
+###############################################################################
+#
+
+
+def test_bag_read_invalid_bag_vlen_bag_version():
+    if gdaltest.bag_drv is None:
+        pytest.skip()
+
+    ds = gdal.Open('data/invalid_bag_vlen_bag_version.bag')
+    assert not ds
+
+
+def test_bag_read_incorrect_northeast_corner():
+    if gdaltest.bag_drv is None:
+        pytest.skip()
+
+    ds = gdal.Open('data/test_offset_ne_corner.bag')
+
+    geotransform = ds.GetGeoTransform()
+    assert geotransform == (85.0, 30.0, 0.0, 500112.0, 0.0, -32.0)
 
+    corner_points = ElementTree.fromstring(ds.GetMetadata('xml:BAG')[0])[8][0][6][0][0].text
+    assert corner_points == '100.000000000000,500000.000000000000 250.000000000000,500096.000000000000'
 
+    del ds
diff --git a/autotest/gdrivers/data/test_offset_ne_corner.bag b/autotest/gdrivers/data/test_offset_ne_corner.bag
new file mode 100644
index 0000000000000000000000000000000000000000..8bccca49caae0f74122bbd02d1d52c2b5a88992a
GIT binary patch
literal 29152
zcmeHw2S8KF(|8aS0Sj=5iU=`^jZTnuf*>Lwy$Yg+kUSs|5==s|R|M2kL<PhGii(0F
zDE5k24)w5b77)a82#SckoG1QwUkRzA_j$knci)fah4<dh?Ck99?Ck8!CYR<qaZ(=@
zZ50x{di5f8C#j*2#Gfztb$=#SLcA03F#JIQzo+8&UEQz;1rq#6A`QgL)p7cgcmaOS
z&Ln_I&?oMAHPZba*i$c}pzHo$B>`7wM<3YXV7%9aKK+X886k`bjxIDFmn$IN3B7b6
z3cmBMKvERbUo~8RM=4>1qHubh>2DscxN+avei!=x4G9qXTY`6ouz%S`|7`#Ky}Tzv
z3ryHevLe<VF)v*4_bA-H{<GZtd#MxamZZFTlU&hGDUf;t8TTShphuE}5FVe!<)Gz1
zfxl$%A>?glY-wyxn#5uw9C|E5=5Ph%2yQ%wN%BNuxx86q1(FJei&sz}jY8=tbi)d|
zqi-ZqPy8<Vt_W6Ih^bE218X_F$fN<iNCOt2&m>^Iu=TxJ9V>{!%ew>KVLi0YaDiJd
zoQ|SGvoeMfhGSwk4P2vO9s9_b&<;5aBxwSeCyT?1jgKWevylY407!!zL}$k%a`}RE
zu!~$yJi$Arze;#(BvLwVcSUhTpNVzBM?<t!`Wcfdpf^k!CR$>RzueasEtP)8w17l%
z9VrbHEg{w~2Sd?P>1Se{IN~S``+Fs1Kq=1we9i!!05XPm`2J(clWGrUlyhnw)Rwi)
zQz^51bUrWWd^cWR;nMDb0Xc<M7Bxej1!jhn9Y0igH*ztfpjZB;*{`qs_2tT8>X!P=
zeG`1P_PcO>+V)D<-s$VAm%Tcg^x-q(gJ+$Q{co?9R9Y6*_Z$|LY8o~mdF27V@42Ka
z+xN8Cnw2|`^{PJiaoQ@Ee3Oj++kR^4cm7!a+_Om2>>HQ-J|-TxSJ<tesf8vb{p@@7
zcV`<{xgJ$krvLFc$SY&!$iU~rv>R=;W14rb9=X}8;MKI)9jnu6L)8MdzWH=u*rrPT
z%jXs!E<A9u^vDg@>(Bbkt{R<Xr1~O{@@MRuxxJ2NSI!vSWau+v!Ya?Q`71KL9xdFL
z8uQb`9;@TWR8H5Y4JasYA%AS7jjVnUyu9kA5<87Qw6;9UDZnMAw32<QE%VE8uJ`GC
z`!C*~ywCL4DOrf3_qc-%Lm%v&|D3g8<J+9#`^cgx=U;0Zlnr?q^fI<xG5Yp<ONQPW
zp5}(*%9%y=CcRx;%EwJTp`@3)aq-aDG5PK#;~y+Mx#04)?IU?(e`C^06`E^LkP@Cn
z6(`m1_4AB5>!9}8AY)5Rc+}R^$J>0C)-KoDw|_*wv1h{BXG^0N%o|xhFxIng@`O9j
zPHeE!<BpscIA~)2yv*MGvYfFw+G#VbZAST-DelcKt8q#GXd0Zers1*X8_P8EQr5hU
zS1jGlMr1pfWIl2Z)t#gCcy9A2B;?&e=T#Nud8^CbSCEt5C>v^NE_rJZG^YD*-nfR?
zFWEa1r?5_rXq&pD$4a}v7Ydat>KYCv^`}|2PGxTj<68uA{ewq6^lweOUUH>nlAC75
z^1#fWx9$v|L^n-3*01oY@|!-k&*P6|4=T}cRc2~9yA?c~|63cmEa{d*&>vs?52?Cr
zvYfIf@YvF6WlDpN&i-vf%~t-^f{l?5i?iQ)IX!gnXNKk-t`CR|D-5`GGk4H3J0DG3
z$Euwz+tv?1VjF!oO!cfz>exFw=RPW;J!H?YING=H+I#=@Huu|sk0KP6-Ayto`qVrB
z+*a9Y+NbPB?hF50DV8A%E>3ANdcD1eRg9SuqPlp-qM8q?lj(^yU|#rodRLhC{%jC<
zWM8YAPT@ffw#J0;D2-GDmEARl8Am4j9eUZq`ty90RXLJ%Xa1_w_ZZ8Otm=>>TI&oK
z-M!%u<UGc^cW}lIryE8k(@q%sEIKq^tzm0x>H4kRRyvi`JiGcwTZC@q@fT|h1}=Ej
z{QA^Fn?|+Nr?VVd{0_}5c0C(+yx!|t#!uDOThc>Psz)7D`K-J{J<N%wU$i*7WqQ-y
zO0UWl{?y>{e<WYl@EbA4a$Q6S<Kj9Ut;270Y<8z?d2!jPf9w0&a&3=<`d!zOmuR(q
zS!AlTzlZ+rb+c^p5BxgX;nL6K9#zlg%zCVJf6%%?hxF3?)S@r$uYD8Qr>M5&f|7N`
z!FeO|k2E3YJ@wZr@?Tf_zOq`^{I1XW!xJ@*R6Sf)W6b`uecuXNnBqf5;}ko)p|+L}
zm|L%|xgPeEX|&EGdi)FB$D=F8Mf5RF^;nhjbBSZ$ZvC@Hf9g5jF6mBEZSvZ?oP1MY
zbl#6Pq~&XF+_WoU*w*g8K@>81>Rz8@L#mshegd=3&hE2z^U$*T);Rj7+y(Y*s)y;r
z)&bALn9mlzSbpUBxsxi9xB3n1bG_#05ew{Z*f;1@6@(VA<1A(Nti74Xoa|bCb@0ZU
z8iIXy1O?NM%`&9ERP|bt!G1b_eYC<2(_!nT74;0ND|YC&X~C>z&$2%Ts4cp2=9fFF
zQMxzZg}c{`PFb<+owDZTliCT}=>4>Zr#wuIx&K#2N!i>@b57@#UU@!mwri8~=cx}r
z7x$Z1U%c9b%JB{!X!HktedCkc@xBjYOG0Kh_iVk?{j;xz+RVduJ}zZXq-)!S>K-(<
zbUf<5XHS{Uw)?%O#*MhXY(ol_(*A3$^P2kPS=!t&I*rbeai!GvTJ8^xbe@`w6dcN1
zr*S*s(z=!I$9p9-PS3g6_+BL?M7`$L)FbCEzJJe%*)V^_^2RdW=Ax$cO-9jPO^krd
zi*8Z<2CzsU{a*|_w5cE2y+ME2ubjbI{W<r;h8~*#Fyp-7v2SiwYMZxR+ps+EQ9~3O
zrtZ8wxa|~j#Q2dQ^no9>rkzwjVe`VrS4REvMTx?n^U`EHxnD*}@7F51?87-JJ);lq
zTd$=w^yTa188ycmCLQpvKj=8@4sCjXZnvb`R^L*u3R5-Yu|ayxqeB|*zegym`c+(;
zyys@6jfVTGU*<;c_&jIY@7>2d;;@rSp3P~ySAViPbNAFlr%=nQDMkrl(UEC(&4YR^
zbu-LJ9OyK)G~rN!k^Qcu*s(7sy}6>dW8EWbtsI@Ao4gR~hRU1aFNfP@sLmK#$<Itv
z-amL%^~U9o!gT%P%`Tr_q<lnuLQu?xma3Vn+ieS{g}lG-X!hs4fJ61e(=(7;t4x><
z%d`e&><=MFxBB+j_i<g=CDNMtw^gbRRQ>hmn7@>I7WB|qy<~GvMNq)_1qYmWUpl|N
z;llEwSNm4Id~AEl?Nw&{N6(29vwpk0_2|NzpX<L=Zt>>pYMdbbpsNS)`xF4JZrw-<
zgpUVFOZjc|q`&L8p`MBYNeOKS`vd)6%p+4!fUT2Ajk@Sf80S&M{Z8m7LyR8ydpAYQ
z;Z-G((Q>>xc!qwe0*Q%4u;~JXggd986!Uu(yLAhLwBQB$i8TtICH++rDGZ|g;}?tz
zK%R+s7IDuKawg7#D;9|(Eh6CPV0GX$sAA9433#s#7<>xrgS|f>;JwA+C;MXW;RGDp
z4hWIb2V;*@3Am;Zgg(5|!QKl9IN@;PXdd|ZVxtENaeN$1+9J^&0Vl{2cwP4{33N%I
zO9EXI=#s#HlLV4#>wWJ=gAMz<wkf~b7d-YGGjUIPbjjA8>zRAkk?GS%n&s7$94EKW
zvl`%RR{p-KdW%hDMAenYu5&E+W*vO@yMJk1w~L9TgD1NB>`$>C8eqQ4BA<Kr-TfKs
z(@!oOn3^84h0=O+RK9yA)i`nebHkANv#cj5rR$_e+&XH$Nx%I=-*JBp9-63LmA;H!
zVS4@8=;H-@7sYBX*LyM=si<5Phv+1YI+|k@R8x`QTBCI#|FwZ(FC+Sjxo^|--m(e}
zbe5JLPM#Lw*7HQ=OxJ}@UPH$zE2sQ?FZV+E-tGCO-odR$*G9#>Ju_iNOOfJ1!}do#
zt+y;yf7SH5|Bc!Gx7a2<q4@=UeEH==dr0+SjSZzIs<^JUa}y(8u5*1@|KhhT8}_8n
zaN4iFzpfxY=A>DizMrdRp+b$4Pn=q`!_B_ADo6gBcV|cTF6!G$p}$dwHeB<%6uztF
z;-k`B<q^A)oOu_j$2ZNOFG;H1?1%5jcWq)F8k(LR-0zcG)=c_O4=tT{ub(ve(U_UH
zpEs;E-Z3UrY2}LkcduT(nsA3{F*{64Co^avL)F94z{TV7+uL`~#}{*HS;sxg-DZC7
znQTIGy61GjPV*W$fAE9W+D8pXjp<r$MK?yVo*jsEFF36}T;Z`XJ)>#F-lJ>uv-Te5
zoZNY;W&8^BZQ+-K0|QGZsk_%vUFx>i?OZiFW%YaS#Gev&4qUlXgS$B0KC!5E4u8$e
z%RLs=laf>QW?omF5!5&~J$vOvv#FKEHszx~*YsA8Ik=^0nBltMxNd3ht|{Mpmwz$D
zv7-IR+vl97>~!t0r8$3HKRf4bY3SQ&%A<@-%=Lq`U)ew1arsKA#cp%ns`y`n?l%vd
zmcM5CrJaX0t*0;cvAJFOtHG0_j<>^nhpqaugk7@h<E~&oEsgo13x*Fid^K~)yV?7<
zQr^9uTvIvJUcvEB;)A5xc)wWgL(|^v2D?6u>s{As5xD0@pKD9cxmlI({1k-j9<9#u
z(>FHx((b2`H^e#G;8W@6JM*K{dW@NTA$>r|xKCMCeFbmLtZ9a;6Qf+?MvT`?)cR@p
zsv<_3{f9q48GRO%^z#xdvwLo@N`InXtG3?k%>2`BEgI{?e-7OcPur+t*br8J#`kyb
z^pVrkTJ=;u#$6sX-F5tiJumbNe-C<ca(PDB%B^#<&nZ1GjvKwvJpA>QR>NDyYnBE%
zDqru`6uo!t%wHml@1G3!yY^DWs{y1<-e)%+d#-u*a?!|{DK|DQ*l8a}8&4nm@_Jm7
z2G?TXxJ8ad1{K%OhS*uPZQaXU`+iczY{eCt`sFV^S-LOoPWOr0M{3AiJ7MVMB?qz#
zR_vr{w~jdIe)iRDs|6eHyZM*ZrQRsY<qz?;ykhDVmC0OsX{}X2)Ij>JPqy!LJdaUF
zTQ#d$dAXd@+wa-(Wk~VFMW-s?Jo}|*Mbkyc&wG~Tf4F${!;`Fnlg#d?R)lgV6hFE(
zc4Opbs+0Bp2yMX_lGTLr#L-*zEd-l&>g=kzrQKYV7Ie$=wO;cg-T^G^8|MJ-<1y0;
z@8~-y`w`_}n+XWR50%>HNTq&pB>m=L2S0E(12azWL#1*7Y=IC4cP<bPKZ%KYjugrm
zM^Y75ZwM%Z87lYzG#vm<2ZE+0D1+$`_!&Lzw8OhmS1{NW54)+L3}y`ACowVCfkG*C
zAZV@tW%Br34Pf&4%my%deC`4;d3=@wm^?lk0ZbmBT3~M^k56p?lgH;U0F%cj6~N^2
z=>cH!_>2QEd3<gKFnN6L05Exc76X_(K2HIdJU(v&m^?l|0hl~KfvErYUPS!F0ZI~F
zlJOI)lq8HND3YSk(1;e01l+3gxQPVHSMP8e4uwu4kx2|L8-2pw(MOqoMC&k-I6)M^
zk_bOY)svNnjOQ>Ao`BBc2xg)95+RCjq9NeX88I{lmx*BLl3@i&A`lLA0$jaFY!+WY
z<0Cv4!beLwNfnaRKqs-`Py@<{<w?IaK83XjTg3t;AU;KefMBFY7+sN!PxU4_pu8!N
z`lFfU0N7s^Cz9*|m?wK6oJdssXf~G^M_7Sq53P*8WBdl=fFGStmKRr)pHF_Rhw&Ch
zu!!EJ`|pF6E0DCs^2vc6x`StwF*36B3_>L3(VHYe7ms)TeY$xLSUY{uwwm!t^!;-F
z6`RMvYQc~hi^D{cAmL6fsMo~!Gg+|+2cA6O)6lBlHJ>}`qLZ?-c`e#558-p!@i57c
zwflGGvj`2eeMtXnm#p#TCjx`O;~+eYjgHABhtSt)V73XHwQ>l6Vp%jGb`NlF1L_`(
zx5M#-lOC31*TT~zlIRDHAsNN*3|AQER`4fdwDRzk0(+C5M-C`JfuxSwkysXoCaEV7
zL3BLfJ27tv;vMz~r$bNrE;?{AhF3?vK^>jfkROq;7plBGxe|OqXHF(Pz}MfQ2OU+6
z9!eJUU#7e;r2vTkLwR*d=NsiEq|=$aP{$YWEhT?(d3`fI)Tsyb;JGI_Ca(CvNZLJO
zybN(gl6+SrrK0t<036yJ!mj|2U%h1Y7p+SJ-UUy9*6qyx$)Z7=k6P$}HE)eG49`Ww
zN7OEY^HC)D0oV8Erxaa{G18D66bnjHa^7MnBoacLpTY}b5dob^7tjef>IVV8fCil!
zP$=nJCD3_bI?#mG@OK^(!Qvobxe#D35D71rB!~7Hwl#`qP|h98b4j1yJ`276uUreQ
z#eulEQNch6Djac?uD31;bV;B~0$md5l0cUPx+Ksgfq$_CzzM%~E4($QXkJL1c}#z>
z1AX-Bd3|=LY40`bUf93>Xp?Jy_FM;xvS@eKya20ka>%ua>pt7h{JDHr_Q4*`%3-Cx
z?4{cr-`(3b;h1}TpX=-I#E(@??XOThs?XLZcOoWzNvZPWRBdYWdR}+5AuD(C`h|sG
zM);@Y&j}sab1lPX&&nAV8tYHYa6hl&_nZ65^Ogk)8}qju&ncd-=+<ub=k(~Y%6CSF
z)#)uNJF@;<eRT3Qr|ax~Uk<#OojWC8YkQm9yd@VF#=OgUanX>vsp#qANxv)_)bwKU
zo$8(U#-&#sygIvE=Am&tp3DvRRxOG+lUtp8hMBB2Z?4{nQMdE%RDU?c|3kOIWs2|N
zzw~ma(Nsb{&X`$P^R(OGHHF)=>Mg>XrbHN4?N*4I-*cnohvvnNR&HO~T@!Sbl9xA(
zNlSd-9cLMu5@T}ikzv7rvQX<y9)$(|<7Qv0qn4~x+7x%^RQdYM`Q4+eQxrTkXYBVp
zTX%J5_?tK_Bf*|z#;|ezv77d%8o2J9Q_Nk~Z_B3#KA-OPYVbZ^yCwKam{IZ1tiCU9
zZVWzq>QScq-J<5@`3D~K8Go+HH>q`nAa}p_m*Tc&%Lj||1}(YLhqijz{py^nyDiNW
zdB;8X*d$%MakWk`|2l*6G)(V=!Ka*OdP|o4T)|x6yg9k|5VhgC&YPJ=PtxaoEHT!+
z%AAz{R50J=`q}6jJ>STFpZrsIsqV0P>ToF~TlJ3{Z+Kq1H6xoJ`Y5e=bt9<msdi2i
z>G{dyc?qYJ-`^fQ^Wrq><7U6|#MWB|o7-<T>(6WXh28RM=;f?q0mqJ+hMvlObHg}w
z_O1)}V%04!oK!Wwvgrcl)Mm}?W1ifYV-Z?6M|ZW-8z-N`9xH5i3@SD-S$(Emchy*(
z=`I%x9%V0YRMCAOQFwb__m;MTt&KIKG~0f0xwJCaQg`ug=QY{)tukEf#yeC#r`wj_
zT$`~lt<i4O;osAvkFD`asl7KhJ1|afQ{$TECo3yn$EtsLSx_2Wzk6BvIF-vfy3vDm
z$ptf(f6NZb+<*R0RnHu%qsH$&T??%89%T2tJ$Jj)-3P%QPb|YqSVN{Ax~EWL={L2%
zQm9>oR@}u<4euUL+-^<gmFY8kSS~pb)4S)ZiW0l(rR@hI$^vy$44y1FbNqHfwfawI
zS9s3uNgJ+w`c!_z0BT~!nZmn6R@MD<|88UQ#~K~2kFzu<C2cDGFs9k7y-#I->XS3u
zT1(CiIInw`tD5D1w&v3TM(WxH4^_A(vxXI@OwlYJHO=?Pwm9bp%g^>tHXsUKeYt;W
zd^>k!=D*nZbg|wgfi4OBf0ckRe+0f}jmCQL*jh)tSw$Ep7L5(cirvAE5b+}t`W-hI
z?{q->2ftSdzn2&b<JNfY5(2(~jw8gAq66aA9g)Uwp#!PNpab~%K00KS9|e&5hJ9TK
z0*LVHJWqTL%P#>T!yLnZDo@Oh4+r1JPwX^~CmK(Obzn}qvpkY$9b!yj+1D;v<1HC8
z6((in5RyehG9TSp-U#xE>8f--T3b%LL@}(34ZCzcT1K83<_F=BqnBiyxkIl90(ti$
z1^JO>rkX`%4GCeqV>G+|c1fU10$md5l0cUPx+L)5DFH+u{5F#Z)_3R|xHx&kbEKqH
zP!2D`Ux0Y<8W$PMvh{SMdE)tOa#Adt!?y*cc9bZAAkNmrBr!43n8oJ`80KbX##~;c
ziMgriSQCIj5h61?MP?GnNqlk2iBy87nMtsxhd(0<iKQE{ID7#e95EwmMaHtln&8HP
zlXon>F$WO<PS_??V{;)YgDZwAgLMX%Ku%(_I5A@AI6r1KHZ~?Glt2xqM~Wdr7C7_-
zempM%?ExR<+ytOe>{ZBQAXuht1o(X!HzvsLvm#gs4;DiJgKO&)MF$571qjbyzyqfS
zOwbyjC$g%bl-P7mWIR0*A!q<h54^|;9KIyO6PWNwq8N*8F2gvIn_vQE$)xj`d=nrH
zOR9~Lxd}yB1N}W1I|@aF2hqmR))_)}5rGH?o)c*u9YF;08Ic|Xcs3}W$3XZduogTt
z0eYWAJoAl#8V-{|{;O<Da*47Y1q4s$F`{O9APERtoOyo+7{q^oYa!jQvMbFQCTlK7
z08~SSQzti?AHt6V=LuQiY{ZAo6U@S(xR!x4imU_{GoH@&0>5QMfMjc$eLN?I!%gIj
zGm)W&L{$I;`X!qz%3~at&w}R+e`tHMh@!3WxNNar0p6fUK<SSjI}x%{Lr0GnL~(f(
zd+d&hNCaP8b{#BtAj%j*49MshakRhSToK|gpvT5xG*N>w5tP}Ro0?f0nZo}-MPNnH
zLTGEy@e-?s5+Y6;0b=O<?-;I5jF7yFGO6M}vn9f8hf$EUZjyvW>Y}vyao|U)=xjeE
z4j2evH_@N0a^pmB3F=_%fmv`txIBb`T2-b{@K9$t@v-3u&pTqG@E9!t#;1cDM}R~E
zQ*4e&ka$HcGa*R%L{J{VNoBr}z7G$W5S{=WVHa%(<5Gy!0fJlrpz!2p$B4kC0bVE^
zbWvCtq6EzPN9>f$Hl!3EgpDZn;18x{@>mn=Bc_kU7)W+fTm=5C*&?$W69Ld|Vq`32
z4it(e-ijn0v=z9_U`L`w`NMU=6QP6E8zIMYW9=xh6niSJ6nMF44Xp37s7XtOsE0v1
z(H4};PH<!>1<{63WByed1%it4u^fs$c9)i*sLG4=RD8t$M|x!mniWwq+yMMDdS!~W
z^&i(O2Et|oQwfYNPv|jpD3g;2^hYnG&~=j_FJ)KaxZs;d6npe0)B(v_#PDMXvO0v$
zAQ1ND@FTdqSaiVvE)p=Bz`J%#ptIQYa2A`@;WFWqe*zcy4|I;b88$Y=tJp&D9aK>+
zzz%>B;{&_(4GrT;A+zDH6T;d;zhQwkCcgBrZP7w9*cREcz{ZTlG($HeP_^L&YO`$_
zTrQ8v;sB?DPi7(vRxBOtuZ+PE@$D#v6tV!^$P{}sQ&VG8k;`x_`XW|FHn$loRsfOA
z%*@5g;OL1pN(?Jt2L+)l6NUI#%jh85^EfDAH;xZ0iSXy~ZlSILTI>zJQ-(VaP_ykB
z;0@tnbb)Hh#1R{L={AIwC4CPJ@KwhJWg8szMtBI=)B4Zi3y@f8r^ZhlK`0IAFi2LG
z*i#Ax;O9@1+;2h{KIs`y79y4op9&K0n!S&o_hcvkP>Pr1L~AP9gd7;)NuJH+AY?OB
zFNz^r-^JP6MTmlz!Dc2p1_XM7np~bBitHE*zT3y3bI8C?1wTP*W@AkiL51l4KCaGw
z-fj~^DK38g5W$pUXi2rQHltb@n%h_#n~$|JH#avk1&U~4hP4c<5tn0NfUCEkTR=!C
z#o5Q-1!%67shJIB`gC#B0PiU-{?-<uriLQ_BygljS(;mllk)L%^K=HCbKxNfCy~X7
zq5yhg(v&7*ZDVRC#!sM^TR<p<i9`Y-puVxGnU%#@s=1B%SP*frpi(;{Xk%t>E=Ewg
zO$$-R;aEC51-N;8g;GF5iNj9-KZ=Wha1W0`7l7?dM|;wQ%q)T6g^l?*`Z;<!2RQqM
zQot{Mu>|o<gvO1aae1sr76)_%7pMptoOL`p8+_@3$6~VR0LjSAoGOjSXVBRQEdp$M
zAw#CdAoOA>jTJ#>1IB^NCIA5w3T}$zp>d!BqId*fnBd`32;?rJOVZu80rpGSYiTf$
zE-Do;@1+AdqO%J#43cvWH{MLdKaS4$mf1MPJ>WZ<lAwz5Ak!*fpiT@6h6GHe4C5r5
z0KQlImzlgEXTJa%G-#e49#bfWWb_?3W_S^ZdYVq34m#a6>eB0x=%};s#R(V~5F!#;
z=Rj!G7XE($z;Zw*Rw)dLm^RqtU}4*SG$090Jz7c+=L2Ix#Ko{;>5=HDgKiZhE1{HR
zF4b^{O>lv?2(%u|Ch2g*KeQSDYFkpyb0jdS6npqrI7Poofan{B-KhvrL5YTeu_YHR
z{;_dq5XYz3gFhH!qO`?XmShHHMKa<m!X?~+h(xXbi4Befd8skNLh7ihqS`2nTeKSj
zZXAo@1f20m@YC}|w>z{jKopGnv%+s93I|^rN6ep<*#g=&k|Y4jv_zxM!8B)ya-5w=
zgd54D$3?Li;1}iL_ZB;9VsjEWtDrV;l5w;N@K^Q0N<4v^B#w#`Ohots6vu-LGCI(!
zkVJ!sV5U#Rwkh`bzKM7hbHD&9D(TLNVtohB#1C&9dMIBfina~XAA%?h5BH{iK)*XD
zinfh<M?bpl&WK_o^DVl8VSYu^grvlk6e|{2=y7n-0Y0w)Y(&_B9Y0zjVeg5h3B;oX
z7?ym4AwTg4lYg)tOlM&!EV$f>)0DCjctVEKk(rUr451$5U@Kqm5{4pwsl@~(d!0rV
z1f&w^z963j!X_f?H{6I$^hK9%94O=og7`3-MwH;Q8=#}fu#RFJ0KQHwx_cMe4!G$4
z$Fp*<yL<%1qVNYyKBBCM@sFAqi4I^@B)f~1iU|glFUUG0!ep+n?;dV64@m$nt~eeS
z<VyMe0t8PA!AkH#^&5^fNJPlSz$q{hK7+@KgD#n9XK*UAoLUzI{DcQsl$hl3S!AGd
zv;-cF!9zd^=$5qWB}o<Q`&XJJGz|#=i2}*mkZWl4L2D?uBlQ(vW^PNhupNsBaD^B$
z7XmP#GRdQ2gZ?D^Egv^w4hfS6Dpwgj6grm#8aB`5k?EL)a>fRekj$aQK++0<m5Zql
zRwO+yv2v)<5;GZ<JCTTU0$F9y0T5BcqlhRJsJ;ghNoPwzab=3<gVd`;MNDeI4uHxa
zT@5mSAVJ6F$hV_^`%r)cbt#J~>37NI7VRik5QXsMbVXXlg$jVlR(53!CP#u8P>%4w
zZD9NnMm!G~W*J<g1Q={OpAXKPi0`cMfdgzgiNXJY;gN1YYJ|W^Z=4GR>|#XUgwm6y
zLYN2)g&-i_O;iG4ym?++kS`aS1i9&MRB2IrE?!B<h8$^sWgH<$>`0Y8{DHCm2V_n%
AI{*Lx

literal 0
HcmV?d00001

diff --git a/gdal/frmts/hdf5/bagdataset.cpp b/gdal/frmts/hdf5/bagdataset.cpp
index 984b33df5157..9c7d3dc396e0 100644
--- a/gdal/frmts/hdf5/bagdataset.cpp
+++ b/gdal/frmts/hdf5/bagdataset.cpp
@@ -3295,6 +3295,26 @@ void BAGDataset::LoadMetadata()
 
     if( psGeo != nullptr )
     {
+        CPLString osResHeight, osResWidth;
+        for (const auto* psIter = psGeo->psChild; psIter; psIter = psIter->psNext)
+        {
+            if (strcmp(psIter->pszValue, "axisDimensionProperties") == 0)
+            {
+                const char* pszDim = CPLGetXMLValue(
+                    psIter, "MD_Dimension.dimensionName.MD_DimensionNameTypeCode", nullptr);
+                const char* pszRes = CPLGetXMLValue(
+                    psIter, "MD_Dimension.resolution.Measure", nullptr);
+                if (pszDim && EQUAL(pszDim, "row") && pszRes)
+                {
+                    osResHeight = pszRes;
+                }
+                else if (pszDim && EQUAL(pszDim, "column") && pszRes)
+                {
+                    osResWidth = pszRes;
+                }
+            }
+        }
+
         char **papszCornerTokens = CSLTokenizeStringComplex(
             CPLGetXMLValue(psGeo, "cornerPoints.Point.coordinates", ""), " ,",
             FALSE, FALSE);
@@ -3306,11 +3326,49 @@ void BAGDataset::LoadMetadata()
             const double dfURX = CPLAtof(papszCornerTokens[2]);
             const double dfURY = CPLAtof(papszCornerTokens[3]);
 
+            double dfResWidth = CPLAtof(osResWidth);
+            double dfResHeight = CPLAtof(osResHeight);
+            if( dfResWidth > 0 && dfResHeight > 0 )
+            {
+                if( fabs((dfURX - dfLLX) / dfResWidth - m_nLowResWidth) < 1e-2 &&
+                    fabs((dfURY - dfLLY) / dfResHeight - m_nLowResHeight) < 1e-2 )
+                {
+                    // Found with https://data.ngdc.noaa.gov/platforms/ocean/nos/coast/H12001-H14000/H12525/BAG/H12525_MB_4m_MLLW_1of2.bag
+                    // to address issue https://github.com/OSGeo/gdal/issues/1643
+                    CPLError(CE_Warning, CPLE_AppDefined, "cornerPoints not consistent with resolution given in metadata");
+                }
+                else if( fabs((dfURX - dfLLX) / dfResWidth - (m_nLowResWidth - 1)) < 1e-2 &&
+                         fabs((dfURY - dfLLY) / dfResHeight - (m_nLowResHeight - 1)) < 1e-2 )
+                {
+                    // pixel center convention. OK
+                }
+                else
+                {
+                    CPLDebug("BAG", "cornerPoints not consistent with resolution given in metadata");
+                    CPLDebug("BAG", "Metadata horizontal resolution: %f. "
+                                    "Computed resolution: %f. "
+                                    "Computed width: %f vs %d",
+                                    dfResWidth,
+                                    (dfURX - dfLLX) / (m_nLowResWidth - 1),
+                                    (dfURX - dfLLX) / dfResWidth,
+                                    m_nLowResWidth);
+                    CPLDebug("BAG", "Metadata vertical resolution: %f. "
+                                    "Computed resolution: %f. "
+                                    "Computed height: %f vs %d",
+                                    dfResHeight,
+                                    (dfURY - dfLLY) / (m_nLowResHeight - 1),
+                                    (dfURY - dfLLY) / dfResHeight,
+                                    m_nLowResHeight);
+                    CPLError(CE_Warning, CPLE_AppDefined, "cornerPoints not consistent with resolution given in metadata");
+                }
+            }
+
             adfGeoTransform[0] = dfLLX;
-            adfGeoTransform[1] = (dfURX - dfLLX) / (m_nLowResWidth - 1);
-            adfGeoTransform[3] = dfURY;
-            adfGeoTransform[5] = (dfLLY - dfURY) / (m_nLowResHeight - 1);
+            adfGeoTransform[1] = dfResWidth;
+            adfGeoTransform[3] = dfLLY + dfResHeight * (m_nLowResHeight - 1);
+            adfGeoTransform[5] = dfResHeight * (-1);
 
+            // shift to pixel corner convention
             adfGeoTransform[0] -= adfGeoTransform[1] * 0.5;
             adfGeoTransform[3] -= adfGeoTransform[5] * 0.5;
 
@@ -3847,7 +3905,7 @@ CPLString BAGCreator::GenerateMatadata(GDALDataset *poSrcDS,
     }
     osOptions.SetNameValue("VAR_RES_UNIT", pszUnits);
 
-    // Center pixel convention
+    // get bounds as pixel center
     double dfMinX = adfGeoTransform[0] + adfGeoTransform[1] / 2;
     double dfMaxX = dfMinX + (poSrcDS->GetRasterXSize() - 1) * adfGeoTransform[1];
     double dfMaxY = adfGeoTransform[3] + adfGeoTransform[5] / 2;

From 8cd2d2eb6327cf782a74dae263ffa6f89f46c93d Mon Sep 17 00:00:00 2001
From: Even Rouault <even.rouault@spatialys.com>
Date: Sun, 4 Aug 2019 21:00:33 +0200
Subject: [PATCH 355/488] OGRExpatRealloc(): fix double-free when size to
 allocate is above the default 10MB threshold. Fixes
 https://bugs.chromium.org/p/oss-fuzz/issues/detail?id=16178. Credit to OSS
 Fuzz

---
 gdal/ogr/ogr_expat.cpp | 1 -
 1 file changed, 1 deletion(-)

diff --git a/gdal/ogr/ogr_expat.cpp b/gdal/ogr/ogr_expat.cpp
index c486484f658f..18a2d088f15a 100644
--- a/gdal/ogr/ogr_expat.cpp
+++ b/gdal/ogr/ogr_expat.cpp
@@ -73,7 +73,6 @@ static void* OGRExpatRealloc( void *ptr, size_t size )
     CPLError(CE_Failure, CPLE_OutOfMemory,
              "Expat tried to realloc %d bytes. File probably corrupted",
              static_cast<int>(size));
-    free(ptr);
     return nullptr;
 }
 

From 322a11084328e27b73df229ac5cc1b2298bec559 Mon Sep 17 00:00:00 2001
From: Even Rouault <even.rouault@spatialys.com>
Date: Thu, 1 Aug 2019 16:39:53 +0200
Subject: [PATCH 356/488] osr_metacrs.py: force cleanup of objects to please
 ASAN

---
 autotest/osr/osr_metacrs.py | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/autotest/osr/osr_metacrs.py b/autotest/osr/osr_metacrs.py
index 95eeb1d75248..3a27b80b43d5 100755
--- a/autotest/osr/osr_metacrs.py
+++ b/autotest/osr/osr_metacrs.py
@@ -106,6 +106,9 @@ def test_metacrs(self, test_line):
 
             pytest.fail(err_msg)
 
+        self.src_srs = None
+        self.dst_srs = None
+
     def parse_line(self):
         test_line = self.test_line
 

From c5803d29ab13260e2835349e2434414b8f3d7c75 Mon Sep 17 00:00:00 2001
From: Even Rouault <even.rouault@spatialys.com>
Date: Thu, 1 Aug 2019 16:47:59 +0200
Subject: [PATCH 357/488] /vsicrypt/: fix memleak in error code path

---
 gdal/port/cpl_vsil_crypt.cpp | 1 +
 1 file changed, 1 insertion(+)

diff --git a/gdal/port/cpl_vsil_crypt.cpp b/gdal/port/cpl_vsil_crypt.cpp
index 3653f5350be4..97c674cf53fe 100644
--- a/gdal/port/cpl_vsil_crypt.cpp
+++ b/gdal/port/cpl_vsil_crypt.cpp
@@ -607,6 +607,7 @@ int VSICryptFileHeader::ReadFromFile( VSIVirtualHandle* fp,
         {
             CPLError(CE_Failure, CPLE_AppDefined,
                     "CryptoPP exception: %s", e.what());
+            delete poEncCipher;
             return FALSE;
         }
 

From ae33e34b18781b42340b49e6dbe059dce0dca73d Mon Sep 17 00:00:00 2001
From: Even Rouault <even.rouault@spatialys.com>
Date: Thu, 1 Aug 2019 16:48:12 +0200
Subject: [PATCH 358/488] vsicrypt.py: fix memleak

---
 autotest/gcore/vsicrypt.py | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/autotest/gcore/vsicrypt.py b/autotest/gcore/vsicrypt.py
index da5896634247..cfdf20831e34 100755
--- a/autotest/gcore/vsicrypt.py
+++ b/autotest/gcore/vsicrypt.py
@@ -393,6 +393,9 @@ def test_vsicrypt_4():
         test_content = gdal.VSIFReadL(1, 100000, test_f)
         ref_content = gdal.VSIFReadL(1, 100000, ref_f)
 
+        gdal.VSIFCloseL(test_f)
+        gdal.VSIFCloseL(ref_f)
+
         if test_content != ref_content:
             print(seed)
             print('Test content (%d):' % len(test_content))

From c21eb72bb1563db33680ead2e9e1a85daa97760f Mon Sep 17 00:00:00 2001
From: Even Rouault <even.rouault@spatialys.com>
Date: Wed, 31 Jul 2019 18:24:07 +0200
Subject: [PATCH 359/488] Travis CI: port gcc52_stdcpp14_sanitize job to Xenial
 since Precise is discontinued

---
 .travis.yml                                   |  4 +-
 autotest/asan_suppressions.txt                |  4 ++
 autotest/gcore/tiff_read.py                   |  4 ++
 autotest/gdrivers/eedai.py                    |  6 --
 autotest/ogr/ogr_mvt.py                       |  2 +
 .../gcc52_stdcpp14_sanitize/before_install.sh | 65 -------------------
 gdal/ci/travis/sanitize/before_install.sh     | 23 +++++++
 .../install.sh                                |  9 +--
 .../script.sh                                 | 39 +----------
 9 files changed, 38 insertions(+), 118 deletions(-)
 delete mode 100755 gdal/ci/travis/gcc52_stdcpp14_sanitize/before_install.sh
 create mode 100755 gdal/ci/travis/sanitize/before_install.sh
 rename gdal/ci/travis/{gcc52_stdcpp14_sanitize => sanitize}/install.sh (59%)
 rename gdal/ci/travis/{gcc52_stdcpp14_sanitize => sanitize}/script.sh (50%)

diff --git a/.travis.yml b/.travis.yml
index 6d78a55be1fd..720bec3b843b 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -92,13 +92,13 @@ matrix:
       compiler: gcc
       language: cpp
       sudo: required
-      dist: precise
+      dist: xenial
       cache:
         apt: true
         directories:
           - $HOME/.ccache
       env:
-        - BUILD_NAME=gcc52_stdcpp14_sanitize
+        - BUILD_NAME=sanitize
         - DETAILS=""
     - os: linux
       compiler: gcc
diff --git a/autotest/asan_suppressions.txt b/autotest/asan_suppressions.txt
index 49738e40c2b5..e733161937ca 100644
--- a/autotest/asan_suppressions.txt
+++ b/autotest/asan_suppressions.txt
@@ -2,3 +2,7 @@ leak:SwigPyClientData_New
 leak:spatialite_alloc_connection
 leak:/usr/bin/zip
 leak:/usr/lib/x86_64-linux-gnu/libfontconfig.so.1
+leak:/usr/bin/python2.7
+leak:/usr/lib/python2.7/lib-dynload/_ctypes.x86_64-linux-gnu.so
+leak:PyDataMem_NEW
+leak:PyArray_NewFromDescr_int
diff --git a/autotest/gcore/tiff_read.py b/autotest/gcore/tiff_read.py
index da1310ca94a9..9cdf502c8da3 100755
--- a/autotest/gcore/tiff_read.py
+++ b/autotest/gcore/tiff_read.py
@@ -1031,6 +1031,10 @@ def test_tiff_read_online_2():
     if gdal.GetDriverByName('HTTP') is None:
         pytest.skip()
 
+    # For some reason this fails on this configuration
+    if gdaltest.is_travis_branch('sanitize'):
+        pytest.skip()
+
     if gdaltest.gdalurlopen('http://download.osgeo.org/gdal/data/gtiff/utm.tif') is None:
         pytest.skip('cannot open URL')
 
diff --git a/autotest/gdrivers/eedai.py b/autotest/gdrivers/eedai.py
index c226d506e1ea..6e6089db17e5 100644
--- a/autotest/gdrivers/eedai.py
+++ b/autotest/gdrivers/eedai.py
@@ -344,9 +344,6 @@ def test_eedai_3():
     if gdaltest.eedai_drv is None:
         pytest.skip()
 
-    if gdaltest.is_travis_branch('gcc52_stdcpp14_sanitize'):
-        pytest.skip()
-
     gdal.SetConfigOption('EEDA_URL', '/vsimem/ee/')
     # Generated with 'openssl genrsa -out rsa-openssl.pem 1024' and
     # 'openssl pkcs8 -nocrypt -in rsa-openssl.pem -inform PEM -topk8 -outform PEM -out rsa-openssl.pkcs8.pem'
@@ -394,9 +391,6 @@ def test_eedai_GOOGLE_APPLICATION_CREDENTIALS():
     if gdaltest.eedai_drv is None:
         pytest.skip()
 
-    if gdaltest.is_travis_branch('gcc52_stdcpp14_sanitize'):
-        pytest.skip()
-
     gdal.FileFromMemBuffer('/vsimem/my.json', """{
 "private_key":"-----BEGIN PRIVATE KEY-----
 MIICeAIBADANBgkqhkiG9w0BAQEFAASCAmIwggJeAgEAAoGBAOlwJQLLDG1HeLrk\n
diff --git a/autotest/ogr/ogr_mvt.py b/autotest/ogr/ogr_mvt.py
index 92a1541b6bf6..a4d31786b3a4 100644
--- a/autotest/ogr/ogr_mvt.py
+++ b/autotest/ogr/ogr_mvt.py
@@ -294,6 +294,8 @@ def test_ogr_mvt_point_polygon_clip():
         pytest.skip()
     if sys.platform == 'darwin' and gdal.GetConfigOption('TRAVIS', None) is not None:
         pytest.skip()
+    if gdaltest.is_travis_branch('sanitize'):
+        pytest.skip()
 
     ds = ogr.Open('data/mvt/point_polygon/1')
     lyr = ds.GetLayer(1)
diff --git a/gdal/ci/travis/gcc52_stdcpp14_sanitize/before_install.sh b/gdal/ci/travis/gcc52_stdcpp14_sanitize/before_install.sh
deleted file mode 100755
index d048929f990f..000000000000
--- a/gdal/ci/travis/gcc52_stdcpp14_sanitize/before_install.sh
+++ /dev/null
@@ -1,65 +0,0 @@
-#!/bin/sh
-
-set -e
-
-sudo mv /etc/apt/sources.list.d/pgdg* /tmp
-#sudo apt-get remove postgis libpq5 libpq-dev postgresql-9.1-postgis postgresql-9.1-postgis-2.2-scripts postgresql-9.2-postgis postgresql-9.3-postgis postgresql-9.1 postgresql-9.2 postgresql-9.3 libgdal1
-sudo add-apt-repository -y ppa:ubuntugis/ubuntugis-unstable
-#sudo add-apt-repository -y ppa:marlam/gta
-sudo apt-get update -qq
-# postgis postgresql-9.1 postgresql-client-9.1 postgresql-9.1-postgis-2.1 postgresql-9.1-postgis-2.1-scripts
-# libproj-dev libfreexl-dev 
-sudo apt-get install python-numpy libpq-dev libpng12-dev libjpeg-dev libgif-dev liblzma-dev libgeos-dev libcurl4-gnutls-dev  libxml2-dev libexpat-dev libxerces-c-dev libnetcdf-dev netcdf-bin libpoppler-dev libspatialite-dev gpsbabel swig libhdf4-alt-dev libhdf5-serial-dev libpodofo-dev poppler-utils unixodbc-dev libwebp-dev openjdk-7-jdk libepsilon-dev liblcms2-2 libpcre3-dev mercurial cmake libcrypto++-dev
-# libgta-dev
-sudo apt-get install python-lxml
-sudo apt-get install python-pip
-#sudo apt-get install libogdi3.2-dev
-# Boost for Mongo
-#sudo apt-get install libboost-regex-dev libboost-system-dev libboost-thread-dev
-#psql -c "drop database if exists autotest" -U postgres
-#psql -c "create database autotest" -U postgres
-#psql -c "create extension postgis" -d autotest -U postgres
-mysql -e "create database autotest;"
-mysql -e "GRANT ALL ON autotest.* TO 'root'@'localhost';" -u root
-mysql -e "GRANT ALL ON autotest.* TO 'travis'@'localhost';" -u root
-#wget http://s3.amazonaws.com/etc-data.koordinates.com/gdal-travisci/FileGDB_API_1_2-64.tar.gz
-#wget http://s3.amazonaws.com/etc-data.koordinates.com/gdal-travisci/MrSID_DSDK-8.5.0.3422-linux.x86-64.gcc44.tar.gz
-wget http://s3.amazonaws.com/etc-data.koordinates.com/gdal-travisci/install-libecwj2-ubuntu12.04-64bit.tar.gz
-#wget http://s3.amazonaws.com/etc-data.koordinates.com/gdal-travisci/install-libkml-r864-64bit.tar.gz
-wget https://github.com/uclouvain/openjpeg/releases/download/v2.3.0/openjpeg-v2.3.0-linux-x86_64.tar.gz
-#wget http://even.rouault.free.fr/mongo-cxx-1.0.2-install-ubuntu12.04-64bit.tar.gz
-wget http://even.rouault.free.fr/install-gcc-5.2.0.tar.bz2
-#tar xzf MrSID_DSDK-8.5.0.3422-linux.x86-64.gcc44.tar.gz
-#sudo cp -r MrSID_DSDK-8.5.0.3422-linux.x86-64.gcc44/Raster_DSDK/include/* /usr/local/include
-#sudo cp -r MrSID_DSDK-8.5.0.3422-linux.x86-64.gcc44/Raster_DSDK/lib/* /usr/local/lib
-#sudo cp -r MrSID_DSDK-8.5.0.3422-linux.x86-64.gcc44/Lidar_DSDK/include/* /usr/local/include
-#sudo cp -r MrSID_DSDK-8.5.0.3422-linux.x86-64.gcc44/Lidar_DSDK/lib/* /usr/local/lib
-#tar xzf FileGDB_API_1_2-64.tar.gz
-#sudo cp -r FileGDB_API/include/* /usr/local/include
-#sudo cp -r FileGDB_API/lib/* /usr/local/lib
-tar xzf install-libecwj2-ubuntu12.04-64bit.tar.gz
-sudo cp -r install-libecwj2/include/* /usr/local/include
-sudo cp -r install-libecwj2/lib/* /usr/local/lib
-#tar xzf install-libkml-r864-64bit.tar.gz
-#sudo cp -r install-libkml/include/* /usr/local/include
-#sudo cp -r install-libkml/lib/* /usr/local/lib
-tar xzf openjpeg-v2.3.0-linux-x86_64.tar.gz
-sudo cp -r openjpeg-v2.3.0-linux-x86_64/include/* /usr/local/include
-sudo cp -r openjpeg-v2.3.0-linux-x86_64/lib/* /usr/local/lib
-#tar xzf mongo-cxx-1.0.2-install-ubuntu12.04-64bit.tar.gz
-#sudo cp -r mongo-cxx-1.0.2-install/include/* /usr/local/include
-#sudo cp -r mongo-cxx-1.0.2-install/lib/* /usr/local/lib
-#wget https://bitbucket.org/chchrsc/kealib/get/c6d36f3db5e4.zip
-#unzip c6d36f3db5e4.zip
-#cd chchrsc-kealib-c6d36f3db5e4/trunk
-#cmake . -DBUILD_SHARED_LIBS=ON -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX=/usr -DHDF5_INCLUDE_DIR=/usr/include -DHDF5_LIB_PATH=/usr/lib -DLIBKEA_WITH_GDAL=OFF
-#make -j4
-#sudo make install
-#cd ../..
-tar xjf install-gcc-5.2.0.tar.bz2
-export PATH=$PWD/install-gcc-5.2.0/bin:$PATH
-export LD_LIBRARY_PATH=$PWD/install-gcc-5.2.0/lib64
-export PRELOAD=$PWD/install-gcc-5.2.0/lib64/libasan.so.2.0.0:$PWD/install-gcc-5.2.0/lib64/libubsan.so.0.0.0
-#export PRELOAD=$PWD/install-gcc-5.2.0/lib64/libubsan.so.0.0.0
-export ASAN_OPTIONS=allocator_may_return_null=1 
-sudo ldconfig
diff --git a/gdal/ci/travis/sanitize/before_install.sh b/gdal/ci/travis/sanitize/before_install.sh
new file mode 100755
index 000000000000..8aa17acd2fc6
--- /dev/null
+++ b/gdal/ci/travis/sanitize/before_install.sh
@@ -0,0 +1,23 @@
+#!/bin/sh
+
+set -e
+
+sudo mv /etc/apt/sources.list.d/pgdg* /tmp
+sudo apt-get update
+sudo apt-get install -y software-properties-common python-software-properties
+sudo add-apt-repository -y ppa:ubuntugis/ubuntugis-unstable
+sudo apt-get update
+# Disable postgresql since it draws ssl-cert that doesn't install cleanly
+# postgis postgresql-9.1 postgresql-client-9.1 postgresql-9.1-postgis-2.1 postgresql-9.1-postgis-2.1-scripts libpq-dev
+sudo apt-get install -y --allow-unauthenticated python-numpy libpng12-dev libjpeg-dev libgif-dev liblzma-dev libgeos-dev libcurl4-gnutls-dev libproj-dev libxml2-dev libexpat-dev libxerces-c-dev libnetcdf-dev netcdf-bin libpoppler-dev libpoppler-private-dev libsqlite3-dev gpsbabel swig libhdf4-alt-dev libhdf5-serial-dev libpodofo-dev poppler-utils libfreexl-dev unixodbc-dev libwebp-dev libepsilon-dev liblcms2-2 libpcre3-dev libcrypto++-dev libdap-dev libfyba-dev libmysqlclient-dev libogdi3.2-dev libcfitsio-dev openjdk-8-jdk couchdb libzstd1-dev ccache curl autoconf automake sqlite3 libspatialite-dev
+sudo apt-get install -y doxygen texlive-latex-base
+sudo apt-get install -y make
+sudo apt-get install -y python-dev
+sudo apt-get install -y g++
+sudo apt-get install -y --allow-unauthenticated libsfcgal-dev
+sudo apt-get install -y --allow-unauthenticated fossil libgeotiff-dev libcharls-dev libopenjp2-7-dev libcairo2-dev
+
+wget https://github.com/Esri/file-geodatabase-api/raw/master/FileGDB_API_1.5/FileGDB_API_1_5_64gcc51.tar.gz
+tar xzf FileGDB_API_1_5_64gcc51.tar.gz
+sudo cp FileGDB_API-64gcc51/lib/* /usr/lib
+sudo ldconfig
diff --git a/gdal/ci/travis/gcc52_stdcpp14_sanitize/install.sh b/gdal/ci/travis/sanitize/install.sh
similarity index 59%
rename from gdal/ci/travis/gcc52_stdcpp14_sanitize/install.sh
rename to gdal/ci/travis/sanitize/install.sh
index b81fe031c570..c4a98c295a72 100755
--- a/gdal/ci/travis/gcc52_stdcpp14_sanitize/install.sh
+++ b/gdal/ci/travis/sanitize/install.sh
@@ -2,10 +2,6 @@
 
 set -e
 
-export PATH=$PWD/install-gcc-5.2.0/bin:$PATH
-export LD_LIBRARY_PATH=$PWD/install-gcc-5.2.0/lib64
-export PRELOAD=$PWD/install-gcc-5.2.0/lib64/libasan.so.2.0.0:$PWD/install-gcc-5.2.0/lib64/libubsan.so.0.0.0
-#export PRELOAD=$PWD/install-gcc-5.2.0/lib64/libubsan.so.0.0.0
 export ASAN_OPTIONS=allocator_may_return_null=1 
 
 cd gdal
@@ -32,10 +28,7 @@ sudo ln -s  /usr/lib/libproj.so.12 /usr/lib/libproj.so.0.7.0
 sudo ldconfig
 ls -al /usr/lib/libproj*
 
-# Disable --with-fgdb=/usr/local since it causes /usr/local/include/GeodatabaseManagement.h:56:1: error: expected constructor, destructor, or type conversion before ‘(’ token EXT_FILEGDB_API fgdbError CreateGeodatabase(const std::wstring& path, Geodatabase& geodatabase);
-# Disable --with-mongocxx=/usr/local since it should also likely be compiled with C+11, but this fails because boost itself should probably be
-CC="ccache gcc" CXX="ccache g++ " CPPFLAGS="-DMAKE_SANITIZE_HAPPY -fsanitize=undefined -fsanitize=address" LDFLAGS="-fsanitize=undefined -fsanitize=address" ./configure --with-cpp14 --prefix=/usr --without-libtool --enable-debug --with-jpeg12 --with-poppler --without-podofo --with-spatialite --with-mysql --with-liblzma --with-webp --with-epsilon --with-ecw=/usr/local  --with-libtiff=internal --with-rename-internal-libtiff-symbols --with-hide-internal-symbols --with-gnm
-#  --with-gta
+CPPFLAGS="-DMAKE_SANITIZE_HAPPY -fsanitize=undefined -fsanitize=address" LDFLAGS="-fsanitize=undefined -fsanitize=address" ./configure --prefix=/usr --without-libtool --enable-debug --with-jpeg12 --with-poppler --without-podofo --with-spatialite --with-mysql --with-liblzma --with-webp --with-epsilon --with-libtiff=internal --with-rename-internal-libtiff-symbols --with-hide-internal-symbols --with-gnm --with-fgdb=$PWD/../FileGDB_API-64gcc51
 make USER_DEFS="-Werror" -j3
 cd apps
 make USER_DEFS="-Werror" test_ogrsf
diff --git a/gdal/ci/travis/gcc52_stdcpp14_sanitize/script.sh b/gdal/ci/travis/sanitize/script.sh
similarity index 50%
rename from gdal/ci/travis/gcc52_stdcpp14_sanitize/script.sh
rename to gdal/ci/travis/sanitize/script.sh
index f4a4e9d2a3cb..f1cf69aedb3b 100755
--- a/gdal/ci/travis/gcc52_stdcpp14_sanitize/script.sh
+++ b/gdal/ci/travis/sanitize/script.sh
@@ -2,37 +2,13 @@
 
 set -e
 
-export PATH=$PWD/install-gcc-5.2.0/bin:$PATH
-export LD_LIBRARY_PATH=$PWD/install-gcc-5.2.0/lib64
-export PRELOAD=$PWD/install-gcc-5.2.0/lib64/libasan.so.2.0.0:$PWD/install-gcc-5.2.0/lib64/libubsan.so.0.0.0
-#export PRELOAD=$PWD/install-gcc-5.2.0/lib64/libubsan.so.0.0.0
 export PYTEST="pytest -vv -p no:sugar --color=no"
+export PRELOAD=/usr/lib/gcc/x86_64-linux-gnu/5/libasan.so:/usr/lib/gcc/x86_64-linux-gnu/5/libubsan.so
 
 cd gdal
 
-# Perl unit tests
-#cd swig/perl
-#make test
-#cd ../..
-# Java unit tests
-#cd swig/java
-#make test
-#cd ../..
-# CPP unit tests
 cd ../autotest
-#cd cpp
-#GDAL_SKIP=JP2ECW make quick_test
-# Compile and test vsipreload
-#make vsipreload.so
-#LD_PRELOAD=./vsipreload.so gdalinfo /vsicurl/http://download.osgeo.org/gdal/data/ecw/spif83.ecw
-#LD_PRELOAD=./vsipreload.so sqlite3  /vsicurl/http://download.osgeo.org/gdal/data/sqlite3/polygon.db "select * from polygon limit 10"
-#cd ..
-# Download a sample file
-#mkdir -p ogr/tmp/cache/
-#cd ogr/tmp/cache/
-#wget http://download.osgeo.org/gdal/data/pgeo/PGeoTest.zip
-#unzip PGeoTest.zip
-#cd ../../..
+
 # Don't run these
 rm ogr/ogr_fgdb.py ogr/ogr_pgeo.py
 
@@ -40,12 +16,9 @@ rm ogr/ogr_fgdb.py ogr/ogr_pgeo.py
 rm ogr/ogr_sqlite.py gdrivers/rasterlite.py
 
 # install test dependencies
-# note: pip 9 is installed on the box, but it hits a strange error after upgrading setuptools.
-# so we install a newer pip first.
 sudo -H pip install -U pip
 sudo -H pip install -U -r ./requirements.txt
 
-
 # Run each module in its own pytest process.
 # This makes sure the output from the address sanitizer is relevant
 # and it doesn't blow out RAM too much.
@@ -73,11 +46,3 @@ if grep -P '===.*\d+ failed' ./test-output.txt > /dev/null ; then
 else
     echo 'Tests passed'
 fi
-
-# A bit messy, but force testing with libspatialite 4.0dev (that has been patched a bit to remove any hard-coded SRS definition so it is very small)
-#cd ogr
-#wget http://s3.amazonaws.com/etc-data.koordinates.com/gdal-travisci/libspatialite4.0dev_ubuntu12.04-64bit_srs_stripped.tar.gz
-#tar xzf libspatialite4.0dev_ubuntu12.04-64bit_srs_stripped.tar.gz
-#ln -s install-libspatialite-4.0dev/lib/libspatialite.so.5.0.1 libspatialite.so.3
-#LD_PRELOAD=$PRELOAD LD_LIBRARY_PATH=$LD_LIBRARY_PATH:$PWD $PYTEST ogr_sqlite.py
-#cd ..

From 2202d1e4747b7c1c2ea023f921e2c92f0481b380 Mon Sep 17 00:00:00 2001
From: Even Rouault <even.rouault@spatialys.com>
Date: Fri, 2 Aug 2019 12:59:11 +0200
Subject: [PATCH 360/488] Fix failure on test_tiff_read_online_2

---
 autotest/gcore/tiff_read.py | 84 +++++++++++++++++++++++++------------
 1 file changed, 58 insertions(+), 26 deletions(-)

diff --git a/autotest/gcore/tiff_read.py b/autotest/gcore/tiff_read.py
index 9cdf502c8da3..9eaed1d636b9 100755
--- a/autotest/gcore/tiff_read.py
+++ b/autotest/gcore/tiff_read.py
@@ -33,6 +33,8 @@
 
 import pytest
 
+import webserver
+
 import gdaltest
 from osgeo import gdal, osr
 
@@ -1026,39 +1028,69 @@ def test_tiff_read_online_1():
 # support
 
 
-def test_tiff_read_online_2():
+def test_tiff_read_vsicurl_multirange():
 
     if gdal.GetDriverByName('HTTP') is None:
         pytest.skip()
 
-    # For some reason this fails on this configuration
-    if gdaltest.is_travis_branch('sanitize'):
-        pytest.skip()
-
-    if gdaltest.gdalurlopen('http://download.osgeo.org/gdal/data/gtiff/utm.tif') is None:
-        pytest.skip('cannot open URL')
-
-    old_val = gdal.GetConfigOption('GTIFF_DIRECT_IO')
-    gdal.SetConfigOption('GTIFF_DIRECT_IO', 'YES')
-    gdal.SetConfigOption('CPL_VSIL_CURL_ALLOWED_EXTENSIONS', '.tif')
-    gdal.SetConfigOption('GDAL_DISABLE_READDIR_ON_OPEN', 'EMPTY_DIR')
-    ds = gdal.Open('/vsicurl/http://download.osgeo.org/gdal/data/gtiff/utm.tif')
-    gdal.SetConfigOption('GTIFF_DIRECT_IO', old_val)
-    gdal.SetConfigOption('CPL_VSIL_CURL_ALLOWED_EXTENSIONS', None)
-    gdal.SetConfigOption('GDAL_DISABLE_READDIR_ON_OPEN', None)
-
-    assert ds is not None, 'could not open dataset'
+    webserver_process = None
+    webserver_port = 0
 
-    # Read subsampled data
-    subsampled_data = ds.ReadRaster(0, 0, 512, 512, 128, 128)
-    ds = None
+    (webserver_process, webserver_port) = webserver.launch(handler=webserver.DispatcherHttpHandler)
+    if webserver_port == 0:
+        pytest.skip()
 
-    ds = gdal.GetDriverByName('MEM').Create('', 128, 128)
-    ds.WriteRaster(0, 0, 128, 128, subsampled_data)
-    cs = ds.GetRasterBand(1).Checksum()
-    ds = None
+    gdal.VSICurlClearCache()
 
-    assert cs == 54935, 'wrong checksum'
+    try:
+        filesize = 262976
+        handler = webserver.SequentialHandler()
+        handler.add('HEAD', '/utm.tif', 200, {'Content-Length': '%d' % filesize})
+        def method(request):
+            #sys.stderr.write('%s\n' % str(request.headers))
+
+            if request.headers['Range'].startswith('bytes='):
+                rng = request.headers['Range'][len('bytes='):]
+                assert len(rng.split('-')) == 2
+                start = int(rng.split('-')[0])
+                end = int(rng.split('-')[1])
+
+                request.protocol_version = 'HTTP/1.1'
+                request.send_response(206)
+                request.send_header('Content-type', 'application/octet-stream')
+                request.send_header('Content-Range', 'bytes %d-%d/%d' % (start, end, filesize))
+                request.send_header('Content-Length', end - start + 1)
+                request.send_header('Connection', 'close')
+                request.end_headers()
+                with open('../gdrivers/data/utm.tif', 'rb') as f:
+                    f.seek(start, 0)
+                    request.wfile.write(f.read(end - start + 1))
+
+        for i in range(6):
+            handler.add('GET', '/utm.tif', custom_method=method)
+
+        with webserver.install_http_handler(handler):
+            with gdaltest.config_options({ 'GTIFF_DIRECT_IO': 'YES',
+                                           'CPL_VSIL_CURL_ALLOWED_EXTENSIONS': '.tif',
+                                           'GDAL_DISABLE_READDIR_ON_OPEN': 'EMPTY_DIR' }):
+                ds = gdal.Open('/vsicurl/http://127.0.0.1:%d/utm.tif' % webserver_port)
+                assert ds is not None, 'could not open dataset'
+
+                # Read subsampled data
+                subsampled_data = ds.ReadRaster(0, 0, 512, 32, 128, 4)
+                ds = None
+
+                ds = gdal.GetDriverByName('MEM').Create('', 128, 4)
+                ds.WriteRaster(0, 0, 128, 4, subsampled_data)
+                cs = ds.GetRasterBand(1).Checksum()
+                ds = None
+
+                assert cs == 6429, 'wrong checksum'
+
+    finally:
+        webserver.server_stop(webserver_process, webserver_port)
+
+        gdal.VSICurlClearCache()
 
 ###############################################################################
 # Test reading a TIFF made of a single-strip that is more than 2GB (#5403)

From 48e74056e06c256f6c13811ccf128310ea221522 Mon Sep 17 00:00:00 2001
From: Even Rouault <even.rouault@spatialys.com>
Date: Mon, 5 Aug 2019 13:09:10 +0200
Subject: [PATCH 361/488] Fix sanitize/install.sh

---
 gdal/ci/travis/sanitize/install.sh | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/gdal/ci/travis/sanitize/install.sh b/gdal/ci/travis/sanitize/install.sh
index c4a98c295a72..06017f68f69b 100755
--- a/gdal/ci/travis/sanitize/install.sh
+++ b/gdal/ci/travis/sanitize/install.sh
@@ -22,9 +22,6 @@ make -j3
 sudo make install
 cd ..
 
-sudo rm /usr/lib/libproj.so.0  /usr/lib/libproj.so.0.7.0
-sudo ln -s  /usr/lib/libproj.so.12 /usr/lib/libproj.so.0
-sudo ln -s  /usr/lib/libproj.so.12 /usr/lib/libproj.so.0.7.0
 sudo ldconfig
 ls -al /usr/lib/libproj*
 

From eeed39181e344577db65c7c72ffd4106f212b68c Mon Sep 17 00:00:00 2001
From: Even Rouault <even.rouault@spatialys.com>
Date: Mon, 5 Aug 2019 13:15:30 +0200
Subject: [PATCH 362/488] Fix sanitize/install.sh: take 2

---
 gdal/ci/travis/sanitize/install.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/gdal/ci/travis/sanitize/install.sh b/gdal/ci/travis/sanitize/install.sh
index 06017f68f69b..dd08e3ab2b0c 100755
--- a/gdal/ci/travis/sanitize/install.sh
+++ b/gdal/ci/travis/sanitize/install.sh
@@ -25,7 +25,7 @@ cd ..
 sudo ldconfig
 ls -al /usr/lib/libproj*
 
-CPPFLAGS="-DMAKE_SANITIZE_HAPPY -fsanitize=undefined -fsanitize=address" LDFLAGS="-fsanitize=undefined -fsanitize=address" ./configure --prefix=/usr --without-libtool --enable-debug --with-jpeg12 --with-poppler --without-podofo --with-spatialite --with-mysql --with-liblzma --with-webp --with-epsilon --with-libtiff=internal --with-rename-internal-libtiff-symbols --with-hide-internal-symbols --with-gnm --with-fgdb=$PWD/../FileGDB_API-64gcc51
+CPPFLAGS="-DMAKE_SANITIZE_HAPPY -fsanitize=undefined -fsanitize=address" LDFLAGS="-fsanitize=undefined -fsanitize=address" ./configure --prefix=/usr --without-libtool --enable-debug --with-jpeg12 --with-poppler --without-podofo --with-spatialite --with-mysql --with-liblzma --with-webp --with-epsilon --with-libtiff=internal --with-rename-internal-libtiff-symbols --with-hide-internal-symbols --with-gnm --with-proj --with-fgdb=$PWD/../FileGDB_API-64gcc51
 make USER_DEFS="-Werror" -j3
 cd apps
 make USER_DEFS="-Werror" test_ogrsf

From 0fa6cd3bb91725d37713ddac2fea45595bdfc567 Mon Sep 17 00:00:00 2001
From: Even Rouault <even.rouault@spatialys.com>
Date: Mon, 12 Aug 2019 01:35:29 +0200
Subject: [PATCH 363/488] Replace a few catch of bad_alloc by exception to
 handle the case of 32 bit trying to allocate more than 4GB of memory and thus
 throwing a length_error exception. Found by OSS Fuzz

---
 gdal/alg/gdalwarpoperation.cpp                         | 2 +-
 gdal/frmts/adrg/adrgdataset.cpp                        | 2 +-
 gdal/frmts/adrg/srpdataset.cpp                         | 2 +-
 gdal/frmts/pcidsk/sdk/segment/cpcidskvectorsegment.cpp | 2 +-
 gdal/frmts/pcidsk/sdk/segment/vecsegdataindex.cpp      | 2 +-
 gdal/third_party/LercLib/BitStuffer2.cpp               | 6 +++---
 gdal/third_party/LercLib/Huffman.cpp                   | 2 +-
 7 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/gdal/alg/gdalwarpoperation.cpp b/gdal/alg/gdalwarpoperation.cpp
index 476d05cabeb7..e2c4c7906ffd 100644
--- a/gdal/alg/gdalwarpoperation.cpp
+++ b/gdal/alg/gdalwarpoperation.cpp
@@ -2441,7 +2441,7 @@ void GDALWarpOperation::ComputeSourceWindowStartingFromSource(
             privateData->adfDstY.resize(nSampleMax);
             adfDstZ.resize(nSampleMax);
         }
-        catch( const std::bad_alloc& )
+        catch( const std::exception& )
         {
             return;
         }
diff --git a/gdal/frmts/adrg/adrgdataset.cpp b/gdal/frmts/adrg/adrgdataset.cpp
index 08094ba75fa0..97cf67e47701 100644
--- a/gdal/frmts/adrg/adrgdataset.cpp
+++ b/gdal/frmts/adrg/adrgdataset.cpp
@@ -1093,7 +1093,7 @@ ADRGDataset* ADRGDataset::OpenDataset(
         {
             TILEINDEX = new int [NFL * NFC];
         }
-        catch( const std::bad_alloc& )
+        catch( const std::exception& )
         {
             return nullptr;
         }
diff --git a/gdal/frmts/adrg/srpdataset.cpp b/gdal/frmts/adrg/srpdataset.cpp
index e7d97ec055f4..1ce2de82821c 100644
--- a/gdal/frmts/adrg/srpdataset.cpp
+++ b/gdal/frmts/adrg/srpdataset.cpp
@@ -577,7 +577,7 @@ bool SRPDataset::GetFromRecord( const char* pszFileName, DDFRecord * record )
         {
             TILEINDEX = new int [NFL * NFC];
         }
-        catch( const std::bad_alloc& )
+        catch( const std::exception& )
         {
             return false;
         }
diff --git a/gdal/frmts/pcidsk/sdk/segment/cpcidskvectorsegment.cpp b/gdal/frmts/pcidsk/sdk/segment/cpcidskvectorsegment.cpp
index 38e3eb9d93de..f5e8ffce189d 100644
--- a/gdal/frmts/pcidsk/sdk/segment/cpcidskvectorsegment.cpp
+++ b/gdal/frmts/pcidsk/sdk/segment/cpcidskvectorsegment.cpp
@@ -1011,7 +1011,7 @@ void CPCIDSKVectorSegment::GetVertices( ShapeId shape_id,
     {
         vertices.resize( vertex_count );
     }
-    catch( const std::bad_alloc& ex )
+    catch( const std::exception& ex )
     {
         return ThrowPCIDSKException("Out of memory allocating vertices(%u): %s",
                                     vertex_count, ex.what());
diff --git a/gdal/frmts/pcidsk/sdk/segment/vecsegdataindex.cpp b/gdal/frmts/pcidsk/sdk/segment/vecsegdataindex.cpp
index 5ad9ae17e73a..07009446d4db 100644
--- a/gdal/frmts/pcidsk/sdk/segment/vecsegdataindex.cpp
+++ b/gdal/frmts/pcidsk/sdk/segment/vecsegdataindex.cpp
@@ -131,7 +131,7 @@ const std::vector<uint32> *VecSegDataIndex::GetIndex()
         {
             block_index.resize( block_count );
         }
-        catch( const std::bad_alloc& ex )
+        catch( const std::exception& ex )
         {
             throw PCIDSKException("Out of memory allocating block_index(%u): %s",
                                   block_count, ex.what());
diff --git a/gdal/third_party/LercLib/BitStuffer2.cpp b/gdal/third_party/LercLib/BitStuffer2.cpp
index 475399017d11..27d88506f2d0 100644
--- a/gdal/third_party/LercLib/BitStuffer2.cpp
+++ b/gdal/third_party/LercLib/BitStuffer2.cpp
@@ -362,7 +362,7 @@ bool BitStuffer2::BitUnStuff_Before_Lerc2v3(const Byte** ppByte, size_t& nBytesR
   {
     dataVec.resize(numElements, 0);    // init with 0
   }
-  catch( const std::bad_alloc& )
+  catch( const std::exception& )
   {
     return false;
   }
@@ -491,7 +491,7 @@ bool BitStuffer2::BitUnStuff(const Byte** ppByte, size_t& nBytesRemaining, vecto
   {
     dataVec.resize(numElements);
   }
-  catch( const std::bad_alloc& )
+  catch( const std::exception& )
   {
     return false;
   }
@@ -503,7 +503,7 @@ bool BitStuffer2::BitUnStuff(const Byte** ppByte, size_t& nBytesRemaining, vecto
   {
     m_tmpBitStuffVec.resize(numUInts);
   }
-  catch( const std::bad_alloc& )
+  catch( const std::exception& )
   {
     return false;
   }
diff --git a/gdal/third_party/LercLib/Huffman.cpp b/gdal/third_party/LercLib/Huffman.cpp
index 2861de632987..7597ac7d35f2 100644
--- a/gdal/third_party/LercLib/Huffman.cpp
+++ b/gdal/third_party/LercLib/Huffman.cpp
@@ -227,7 +227,7 @@ bool Huffman::ReadCodeTable(const Byte** ppByte, size_t& nBytesRemainingInOut, i
     nBytesRemainingInOut = nBytesRemaining;
     return true;
   }
-  catch (std::bad_alloc&)
+  catch (std::exception&)
   {
     return false;
   }

From e1874acbc6c95f091adec6999d2dc6b5b60276c1 Mon Sep 17 00:00:00 2001
From: Even Rouault <even.rouault@spatialys.com>
Date: Mon, 12 Aug 2019 12:55:01 +0200
Subject: [PATCH 364/488] libopencad: CADBuffer: replace m_guard by m_nSize to
 avoid pointer wrap around on 32 bit platforms on corrupted files. Fixes
 https://bugs.chromium.org/p/oss-fuzz/issues/detail?id=16388. Credit to OSS
 Fuzz

---
 .../ogr/ogrsf_frmts/cad/libopencad/dwg/io.cpp | 79 ++++++++-----------
 gdal/ogr/ogrsf_frmts/cad/libopencad/dwg/io.h  |  2 +-
 2 files changed, 32 insertions(+), 49 deletions(-)

diff --git a/gdal/ogr/ogrsf_frmts/cad/libopencad/dwg/io.cpp b/gdal/ogr/ogrsf_frmts/cad/libopencad/dwg/io.cpp
index c98bf651573e..91ba5d08b8fd 100644
--- a/gdal/ogr/ogrsf_frmts/cad/libopencad/dwg/io.cpp
+++ b/gdal/ogr/ogrsf_frmts/cad/libopencad/dwg/io.cpp
@@ -90,7 +90,7 @@ CADBuffer::CADBuffer(size_t size) : m_nBitOffsetFromStart(0)
     m_pBuffer = new char[size];
     // zero memory
     memset(m_pBuffer, 0, size);
-    m_guard = m_pBuffer + size;
+    m_nSize = size;
 }
 
 CADBuffer::~CADBuffer()
@@ -110,15 +110,14 @@ unsigned char CADBuffer::Read2B()
     size_t        nByteOffset      = m_nBitOffsetFromStart / 8;
     size_t        nBitOffsetInByte = m_nBitOffsetFromStart % 8;
 
-    const char * p2BByte = m_pBuffer + nByteOffset;
-    if(p2BByte + 2 > m_guard)
+    if(nByteOffset + 2 > m_nSize)
     {
         m_bEOB = true;
         return 0;
     }
 
     unsigned char a2BBytes[2];
-    memcpy( a2BBytes, p2BByte, 2 );
+    memcpy( a2BBytes, m_pBuffer + nByteOffset, 2 );
 
     switch( nBitOffsetInByte )
     {
@@ -143,15 +142,14 @@ unsigned char CADBuffer::Read3B()
     size_t        nByteOffset      = m_nBitOffsetFromStart / 8;
     size_t        nBitOffsetInByte = m_nBitOffsetFromStart % 8;
 
-    const char * p3BByte = m_pBuffer + nByteOffset;
-    if(p3BByte + 2 > m_guard)
+    if(nByteOffset + 2 > m_nSize)
     {
         m_bEOB = true;
         return 0;
     }
 
     unsigned char a3BBytes[2];
-    memcpy( a3BBytes, p3BByte, 2 );
+    memcpy( a3BBytes, m_pBuffer + nByteOffset, 2 );
 
     switch( nBitOffsetInByte )
     {
@@ -182,15 +180,14 @@ unsigned char CADBuffer::Read4B()
     size_t        nByteOffset      = m_nBitOffsetFromStart / 8;
     size_t        nBitOffsetInByte = m_nBitOffsetFromStart % 8;
 
-    const char * p4BByte = m_pBuffer + nByteOffset;
-    if(p4BByte + 2 > m_guard)
+    if(nByteOffset + 2 > m_nSize)
     {
         m_bEOB = true;
         return 0;
     }
 
     unsigned char a4BBytes[2];
-    memcpy( a4BBytes, p4BByte, 2 );
+    memcpy( a4BBytes, m_pBuffer + nByteOffset, 2 );
 
     switch( nBitOffsetInByte )
     {
@@ -227,15 +224,14 @@ double CADBuffer::ReadBITDOUBLE()
     size_t nByteOffset      = m_nBitOffsetFromStart / 8;
     size_t nBitOffsetInByte = m_nBitOffsetFromStart % 8;
 
-    const char * pDoubleFirstByte = m_pBuffer + nByteOffset;
-    if(pDoubleFirstByte + 9 > m_guard)
+    if(nByteOffset + 9 > m_nSize)
     {
         m_bEOB = true;
         return 0.0;
     }
 
     unsigned char aDoubleBytes[9]; // maximum bytes a single double can take.
-    memcpy( aDoubleBytes, pDoubleFirstByte, 9 );
+    memcpy( aDoubleBytes, m_pBuffer + nByteOffset, 9 );
 
     switch( BITCODE )
     {
@@ -295,8 +291,7 @@ void CADBuffer::SkipBITDOUBLE()
 {
     unsigned char BITCODE = Read2B();
     size_t nByteOffset      = m_nBitOffsetFromStart / 8;
-    const char * pDoubleFirstByte = m_pBuffer + nByteOffset;
-    if(pDoubleFirstByte + 9 > m_guard)
+    if(nByteOffset + 9 > m_nSize)
     {
         m_bEOB = true;
         return;
@@ -321,14 +316,13 @@ short CADBuffer::ReadRAWSHORT()
     size_t nByteOffset      = m_nBitOffsetFromStart / 8;
     size_t nBitOffsetInByte = m_nBitOffsetFromStart % 8;
 
-    const char * pShortFirstByte = m_pBuffer + nByteOffset;
-    if(pShortFirstByte + 3 > m_guard)
+    if(nByteOffset + 3 > m_nSize)
     {
         m_bEOB = true;
         return 0;
     }
     unsigned char aShortBytes[3];
-    memcpy( aShortBytes, pShortFirstByte, 3 );
+    memcpy( aShortBytes, m_pBuffer + nByteOffset, 3 );
 
     switch( nBitOffsetInByte )
     {
@@ -356,15 +350,14 @@ double CADBuffer::ReadRAWDOUBLE()
     size_t nByteOffset      = m_nBitOffsetFromStart / 8;
     size_t nBitOffsetInByte = m_nBitOffsetFromStart % 8;
 
-    const char * pDoubleFirstByte = m_pBuffer + nByteOffset;
-    if(pDoubleFirstByte + 9 > m_guard)
+    if(nByteOffset + 9 > m_nSize)
     {
         m_bEOB = true;
         return 0.0;
     }
 
     unsigned char aDoubleBytes[9];
-    memcpy( aDoubleBytes, pDoubleFirstByte, 9 );
+    memcpy( aDoubleBytes, m_pBuffer + nByteOffset, 9 );
 
     switch( nBitOffsetInByte )
     {
@@ -404,15 +397,14 @@ int CADBuffer::ReadRAWLONG()
     size_t nByteOffset      = m_nBitOffsetFromStart / 8;
     size_t nBitOffsetInByte = m_nBitOffsetFromStart % 8;
 
-    const char * pLongFirstByte = m_pBuffer + nByteOffset;
-    if(pLongFirstByte + 5 > m_guard)
+    if(nByteOffset + 5 > m_nSize)
     {
         m_bEOB = true;
         return 0;
     }
 
     unsigned char aLongBytes[5];
-    memcpy( aLongBytes, pLongFirstByte, 5 );
+    memcpy( aLongBytes, m_pBuffer + nByteOffset, 5 );
 
     switch( nBitOffsetInByte )
     {
@@ -444,14 +436,13 @@ bool CADBuffer::ReadBIT()
     size_t nByteOffset      = m_nBitOffsetFromStart / 8;
     size_t nBitOffsetInByte = m_nBitOffsetFromStart % 8;
 
-    const char * pBoolByte = m_pBuffer + nByteOffset;
-    if(pBoolByte >= m_guard)
+    if(nByteOffset >= m_nSize)
     {
         m_bEOB = true;
         return false;
     }
 
-    unsigned char resultVal = ( pBoolByte[0] >> ( 7 - nBitOffsetInByte ) ) & binary( 00000001 );
+    unsigned char resultVal = ( m_pBuffer[nByteOffset] >> ( 7 - nBitOffsetInByte ) ) & binary( 00000001 );
     ++m_nBitOffsetFromStart;
 
     return resultVal == 0 ? false : true;
@@ -464,15 +455,14 @@ short CADBuffer::ReadBITSHORT()
     size_t nByteOffset      = m_nBitOffsetFromStart / 8;
     size_t nBitOffsetInByte = m_nBitOffsetFromStart % 8;
 
-    const char * pShortFirstByte = m_pBuffer + nByteOffset;
-    if(pShortFirstByte + 4 > m_guard)
+    if(nByteOffset + 4 > m_nSize)
     {
         m_bEOB = true;
         return 0;
     }
 
     unsigned char aShortBytes[4]; // maximum bytes a single short can take.
-    memcpy( aShortBytes, pShortFirstByte, 4 );
+    memcpy( aShortBytes, m_pBuffer + nByteOffset, 4 );
 
     switch( BITCODE )
     {
@@ -523,15 +513,14 @@ unsigned char CADBuffer::ReadCHAR()
     size_t        nByteOffset      = m_nBitOffsetFromStart / 8;
     size_t        nBitOffsetInByte = m_nBitOffsetFromStart % 8;
 
-    const char * pCharFirstByte = m_pBuffer + nByteOffset;
-    if(pCharFirstByte + 2 > m_guard)
+    if(nByteOffset + 2 > m_nSize)
     {
         m_bEOB = true;
         return result;
     }
 
     unsigned char aCharBytes[2]; // maximum bytes a single char can take.
-    memcpy( aCharBytes, pCharFirstByte, 2 );
+    memcpy( aCharBytes, m_pBuffer + nByteOffset, 2 );
 
     result = ( aCharBytes[0] << nBitOffsetInByte );
     result |= ( aCharBytes[1] >> ( 8 - nBitOffsetInByte ) );
@@ -562,14 +551,13 @@ long CADBuffer::ReadUMCHAR()
     // TODO: bit offset is calculated, but function has nothing to do with it.
     /*size_t nBitOffsetInByte = m_nBitOffsetFromStart % 8;*/
 
-    const char * pMCharFirstByte = m_pBuffer + nByteOffset;
-    if(pMCharFirstByte + 8 > m_guard)
+    if(nByteOffset + 8 > m_nSize)
     {
         m_bEOB = true;
         return 0;
     }
     unsigned char aMCharBytes[8]; // 8 bytes is maximum.
-    //memcpy( aMCharBytes, pMCharFirstByte, 8 );
+    //memcpy( aMCharBytes, m_pBuffer + nByteOffset, 8 );
 
     unsigned char nMCharBytesCount = 0;
     for( unsigned char i = 0; i < 8; ++i )
@@ -602,8 +590,7 @@ long CADBuffer::ReadMCHAR()
     // TODO: bit offset is calculated, but function has nothing to do with it.
     /*size_t nBitOffsetInByte = nBitOffsetFromStart % 8;*/
 
-    const char * pMCharFirstByte = m_pBuffer + nByteOffset;
-    if(pMCharFirstByte + 8 > m_guard)
+    if(nByteOffset + 8 > m_nSize)
     {
         m_bEOB = true;
         return 0;
@@ -787,14 +774,13 @@ int CADBuffer::ReadBITLONG()
     size_t nByteOffset      = m_nBitOffsetFromStart / 8;
     size_t nBitOffsetInByte = m_nBitOffsetFromStart % 8;
 
-    const char * pLongFirstByte = m_pBuffer + nByteOffset;
-    if(pLongFirstByte + 5 > m_guard)
+    if(nByteOffset + 5 > m_nSize)
     {
         m_bEOB = true;
         return 0;
     }
     unsigned char aLongBytes[5]; // maximum bytes a single short can take.
-    memcpy( aLongBytes, pLongFirstByte, 5 );
+    memcpy( aLongBytes, m_pBuffer + nByteOffset, 5 );
 
     switch( BITCODE )
     {
@@ -855,8 +841,7 @@ void CADBuffer::SkipBITLONG()
 {
     unsigned char BITCODE = Read2B();
     size_t nByteOffset      = m_nBitOffsetFromStart / 8;
-    const char * pLongFirstByte = m_pBuffer + nByteOffset;
-    if(pLongFirstByte + 5 > m_guard)
+    if(nByteOffset + 5 > m_nSize)
     {
         m_bEOB = true;
         return;
@@ -881,8 +866,7 @@ void CADBuffer::SkipBITSHORT()
 {
     unsigned char BITCODE = Read2B();
     size_t nByteOffset      = m_nBitOffsetFromStart / 8;
-    const char * pShortFirstByte = m_pBuffer + nByteOffset;
-    if(pShortFirstByte + 4 > m_guard)
+    if(nByteOffset + 4 > m_nSize)
     {
         m_bEOB = true;
         return;
@@ -906,8 +890,7 @@ void CADBuffer::SkipBITSHORT()
 void CADBuffer::SkipBIT()
 {
     size_t nByteOffset      = m_nBitOffsetFromStart / 8;
-    const char * pBoolByte = m_pBuffer + nByteOffset;
-    if(pBoolByte >= m_guard)
+    if(nByteOffset >= m_nSize)
     {
         m_bEOB = true;
         return;
@@ -944,7 +927,7 @@ void CADBuffer::Seek(size_t offset, CADBuffer::SeekPosition position)
         m_nBitOffsetFromStart += offset;
         break;
     case END:
-        m_nBitOffsetFromStart = m_guard - m_pBuffer - offset;
+        m_nBitOffsetFromStart = m_nSize - offset;
         break;
     default:
         break;
diff --git a/gdal/ogr/ogrsf_frmts/cad/libopencad/dwg/io.h b/gdal/ogr/ogrsf_frmts/cad/libopencad/dwg/io.h
index 7b947e44803b..caa551f37a32 100644
--- a/gdal/ogr/ogrsf_frmts/cad/libopencad/dwg/io.h
+++ b/gdal/ogr/ogrsf_frmts/cad/libopencad/dwg/io.h
@@ -168,7 +168,7 @@ class CADBuffer
 private:
     char* m_pBuffer;
     size_t m_nBitOffsetFromStart;
-    const char* m_guard;
+    size_t m_nSize;
     bool m_bEOB = false;
 };
 

From 94bd7a06e0acca8218e56b97e89d01c4056b6cd8 Mon Sep 17 00:00:00 2001
From: Even Rouault <even.rouault@spatialys.com>
Date: Mon, 12 Aug 2019 14:29:01 +0200
Subject: [PATCH 365/488] DGN: avoid size_t overflow / illegal memory access.
 Fixes https://bugs.chromium.org/p/oss-fuzz/issues/detail?id=16393. Credit to
 OSS Fuzz

---
 gdal/ogr/ogrsf_frmts/dgn/dgnread.cpp | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/gdal/ogr/ogrsf_frmts/dgn/dgnread.cpp b/gdal/ogr/ogrsf_frmts/dgn/dgnread.cpp
index 2051196cedea..d6ecabafdffa 100644
--- a/gdal/ogr/ogrsf_frmts/dgn/dgnread.cpp
+++ b/gdal/ogr/ogrsf_frmts/dgn/dgnread.cpp
@@ -1049,7 +1049,11 @@ static DGNElemCore *DGNProcessElement( DGNInfo *psDGN, int nType, int nLevel )
           int attr_bytes = psDGN->nElemBytes -
             (psDGN->abyElem[30] + psDGN->abyElem[31]*256)*2 - 32;
           int numelems = (psDGN->nElemBytes - 36 - attr_bytes)/4;
-
+          if( numelems < 1 )
+          {
+              CPLError(CE_Failure, CPLE_AssertionFailed, "numelems < 1");
+              return nullptr;
+          }
           DGNElemKnotWeight *psArray = static_cast<DGNElemKnotWeight *>(
               CPLCalloc(sizeof(DGNElemKnotWeight) + (numelems-1)*sizeof(float),
                         1));

From c0655c3c94a4fdf3349a9a8321c66ee1b4d79ee7 Mon Sep 17 00:00:00 2001
From: Even Rouault <even.rouault@spatialys.com>
Date: Mon, 12 Aug 2019 21:43:01 +0200
Subject: [PATCH 366/488] PDF: fix nullptr dereference on corrupted file.
 Credit to OSS Fuzz

---
 gdal/frmts/pdf/pdfdataset.cpp | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/gdal/frmts/pdf/pdfdataset.cpp b/gdal/frmts/pdf/pdfdataset.cpp
index 2eff2189fad9..b6857864da9c 100644
--- a/gdal/frmts/pdf/pdfdataset.cpp
+++ b/gdal/frmts/pdf/pdfdataset.cpp
@@ -3339,6 +3339,8 @@ void PDFDataset::ExploreLayersPoppler(GDALPDFArray* poArray,
     for(int i=0;i<nLength;i++)
     {
         GDALPDFObject* poObj = poArray->Get(i);
+        if( poObj == nullptr )
+            continue;
         if (i == 0 && poObj->GetType() == PDFObjectType_String)
         {
             CPLString osName = PDFSanitizeLayerName(poObj->GetString().c_str());

From 95f8ab8e7edabc87de4420ce9e48fe9d436bd1c8 Mon Sep 17 00:00:00 2001
From: Even Rouault <even.rouault@spatialys.com>
Date: Wed, 14 Aug 2019 14:37:27 +0200
Subject: [PATCH 367/488] SAFE: avoid potential use-after-free. CID 1404037 and
 1404140

---
 gdal/frmts/safe/safedataset.cpp | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/gdal/frmts/safe/safedataset.cpp b/gdal/frmts/safe/safedataset.cpp
index ac0cc5ccaf80..2a6dfcddb895 100644
--- a/gdal/frmts/safe/safedataset.cpp
+++ b/gdal/frmts/safe/safedataset.cpp
@@ -508,20 +508,20 @@ GDALDataset *SAFEDataset::Open( GDALOpenInfo * poOpenInfo )
     if (STARTS_WITH_CI(poOpenInfo->pszFilename, "SENTINEL1_DS:"))
     {
       osMDFilename = poOpenInfo->pszFilename + strlen("SENTINEL1_DS:");
-      const char* pszSelection1 = strrchr(osMDFilename.c_str(), ':');
-      if (pszSelection1 == nullptr || pszSelection1 == osMDFilename.c_str() )
+      size_t nPosColon = osMDFilename.find(':');
+      if (nPosColon == std::string::npos || nPosColon == 0)
       {
           CPLError(CE_Failure, CPLE_AppDefined, "Invalid syntax for SENTINEL1_DS:");
           return nullptr;
       }
-      osMDFilename.resize( pszSelection1 - osMDFilename.c_str() );
-      osSelectedSubDS1 = pszSelection1 + strlen(":");
+      osSelectedSubDS1 = osMDFilename.substr(nPosColon+1);
+      osMDFilename.resize( nPosColon );
 
-      const char* pszSelection2 = strchr(osSelectedSubDS1.c_str(), '_');
-      if (pszSelection2 != nullptr && pszSelection2 != pszSelection1 )
+      size_t nPosUnderscore = osSelectedSubDS1.find('_');
+      if (nPosUnderscore != std::string::npos && nPosUnderscore != 0)
       {
-          osSelectedSubDS1.resize( pszSelection2 - osSelectedSubDS1.c_str() );
-          osSelectedSubDS2 = pszSelection2 + strlen("_");
+          osSelectedSubDS2 = osSelectedSubDS1.substr(nPosUnderscore+1);
+          osSelectedSubDS1.resize( nPosUnderscore );
       }
 
       //update directory check:

From b1219ebe994e524de5d0a58c678302a6834b8623 Mon Sep 17 00:00:00 2001
From: Even Rouault <even.rouault@spatialys.com>
Date: Wed, 14 Aug 2019 14:39:27 +0200
Subject: [PATCH 368/488] Terragen: avoid potential use-after-free on error
 code path in write_header(). CID 1404060

---
 gdal/frmts/terragen/terragendataset.cpp | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/gdal/frmts/terragen/terragendataset.cpp b/gdal/frmts/terragen/terragendataset.cpp
index 8e76306645af..50d79f1b3725 100644
--- a/gdal/frmts/terragen/terragendataset.cpp
+++ b/gdal/frmts/terragen/terragendataset.cpp
@@ -481,7 +481,6 @@ bool TerragenDataset::write_header()
                   "Couldn't write to Terragen file %s.\n"
                   "Is file system full?",
                   m_pszFilename );
-        VSIFCloseL( m_fp );
 
         return false;
     }
@@ -571,7 +570,6 @@ bool TerragenDataset::write_header()
                   "Couldn't write to Terragen file %s.\n"
                   "Is file system full?",
                   m_pszFilename );
-        VSIFCloseL( m_fp );
 
         return false;
     }
@@ -630,7 +628,6 @@ bool TerragenDataset::write_header()
                   "Couldn't write to Terragen file %s.\n"
                   "Cannot find adequate heightscale/baseheight combination.",
                   m_pszFilename );
-        VSIFCloseL( m_fp );
 
         return false;
     }

From c600601349e33b0398f334a3ba76e2a51c27b8bd Mon Sep 17 00:00:00 2001
From: Even Rouault <even.rouault@spatialys.com>
Date: Wed, 14 Aug 2019 16:13:25 +0200
Subject: [PATCH 369/488] CTable2Dataset::SetGeoTransform(): fix read buffer
 overflow from stack

---
 gdal/frmts/raw/ctable2dataset.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/gdal/frmts/raw/ctable2dataset.cpp b/gdal/frmts/raw/ctable2dataset.cpp
index 23f1fe653233..7c64688759b3 100644
--- a/gdal/frmts/raw/ctable2dataset.cpp
+++ b/gdal/frmts/raw/ctable2dataset.cpp
@@ -316,7 +316,7 @@ CPLErr CTable2Dataset::SetGeoTransform( double * padfTransform )
 
     // write grid header.
     CPL_IGNORE_RET_VAL(VSIFSeekL( fpImage, 0, SEEK_SET ));
-    CPL_IGNORE_RET_VAL(VSIFWriteL( achHeader, 11, 16, fpImage ));
+    CPL_IGNORE_RET_VAL(VSIFWriteL( achHeader, 1, sizeof(achHeader), fpImage ));
 
     return CE_None;
 }

From d4b9fc3d0ac8116ee29ae8a326e87cae8a2c7236 Mon Sep 17 00:00:00 2001
From: Even Rouault <even.rouault@spatialys.com>
Date: Thu, 15 Aug 2019 12:54:11 +0200
Subject: [PATCH 370/488] PDF: avoid nullptr dereference on corrupted file.
 Fixes https://bugs.chromium.org/p/oss-fuzz/issues/detail?id=16438. Credit to
 OSS Fuzz

---
 gdal/frmts/pdf/pdfreadvectors.cpp | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

diff --git a/gdal/frmts/pdf/pdfreadvectors.cpp b/gdal/frmts/pdf/pdfreadvectors.cpp
index 0d9c4c21a76c..22ecf1a4ad21 100644
--- a/gdal/frmts/pdf/pdfreadvectors.cpp
+++ b/gdal/frmts/pdf/pdfreadvectors.cpp
@@ -277,6 +277,7 @@ void PDFDataset::ExploreTree(GDALPDFObject* poObj,
     {
         GDALPDFArray* poArray = poK->GetArray();
         if (poArray->GetLength() > 0 &&
+            poArray->Get(0) &&
             poArray->Get(0)->GetType() == PDFObjectType_Dictionary &&
             poArray->Get(0)->GetDictionary()->Get("K") != nullptr &&
             poArray->Get(0)->GetDictionary()->Get("K")->GetType() == PDFObjectType_Int)
@@ -314,8 +315,14 @@ void PDFDataset::ExploreTree(GDALPDFObject* poObj,
         else
         {
             for(int i=0;i<poArray->GetLength();i++)
-                ExploreTree(poArray->Get(i), aoSetAlreadyVisited,
-                            nRecLevel + 1);
+            {
+                auto poSubObj = poArray->Get(i);
+                if (poSubObj )
+                {
+                    ExploreTree(poSubObj, aoSetAlreadyVisited,
+                                nRecLevel + 1);
+                }
+            }
         }
     }
     else if (poK->GetType() == PDFObjectType_Dictionary)

From 86af9bab383341ac67b9b6cb5fadce9cbe73038c Mon Sep 17 00:00:00 2001
From: Even Rouault <even.rouault@spatialys.com>
Date: Thu, 15 Aug 2019 21:19:06 +0200
Subject: [PATCH 371/488] LIBKML: fix potential memory leak. CID 1404148

---
 gdal/ogr/ogrsf_frmts/libkml/ogrlibkmlstyle.cpp | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

diff --git a/gdal/ogr/ogrsf_frmts/libkml/ogrlibkmlstyle.cpp b/gdal/ogr/ogrsf_frmts/libkml/ogrlibkmlstyle.cpp
index a4ed19fc828a..25849a743c64 100644
--- a/gdal/ogr/ogrsf_frmts/libkml/ogrlibkmlstyle.cpp
+++ b/gdal/ogr/ogrsf_frmts/libkml/ogrlibkmlstyle.cpp
@@ -649,7 +649,8 @@ void kml2stylestring( StylePtr poKmlStyle, OGRStyleMgr * poOgrSM )
             if( !poOgrST )
                 continue;
 
-            if( poOgrST->GetType() == OGRSTCPen )
+            if( poOgrST->GetType() == OGRSTCPen &&
+                poOgrTmpST == nullptr )
             {
                 poOgrTmpST = poOgrST;
             }
@@ -685,7 +686,8 @@ void kml2stylestring( StylePtr poKmlStyle, OGRStyleMgr * poOgrSM )
             if( !poOgrST )
                 continue;
 
-            if( poOgrST->GetType() == OGRSTCBrush )
+            if( poOgrST->GetType() == OGRSTCBrush &&
+                poOgrTmpST == nullptr )
             {
                 poOgrTmpST = poOgrST;
             }
@@ -721,7 +723,8 @@ void kml2stylestring( StylePtr poKmlStyle, OGRStyleMgr * poOgrSM )
             if( !poOgrST )
                 continue;
 
-            if( poOgrST->GetType() == OGRSTCSymbol )
+            if( poOgrST->GetType() == OGRSTCSymbol &&
+                poOgrTmpST == nullptr )
             {
                 poOgrTmpST = poOgrST;
             }
@@ -757,7 +760,8 @@ void kml2stylestring( StylePtr poKmlStyle, OGRStyleMgr * poOgrSM )
             if( !poOgrST )
                 continue;
 
-            if( poOgrST->GetType() == OGRSTCLabel )
+            if( poOgrST->GetType() == OGRSTCLabel &&
+                poOgrTmpST == nullptr )
             {
                 poOgrTmpST = poOgrST;
             }

From 30a944fc00482ec3fd8634be8202f7276fe2b493 Mon Sep 17 00:00:00 2001
From: Even Rouault <even.rouault@spatialys.com>
Date: Thu, 15 Aug 2019 21:28:08 +0200
Subject: [PATCH 372/488] MITAB: fix potential double-free. CID 1404224

---
 gdal/ogr/ogrsf_frmts/mitab/mitab_miffile.cpp | 1 +
 1 file changed, 1 insertion(+)

diff --git a/gdal/ogr/ogrsf_frmts/mitab/mitab_miffile.cpp b/gdal/ogr/ogrsf_frmts/mitab/mitab_miffile.cpp
index b381bc0336f8..bbf38f496db9 100644
--- a/gdal/ogr/ogrsf_frmts/mitab/mitab_miffile.cpp
+++ b/gdal/ogr/ogrsf_frmts/mitab/mitab_miffile.cpp
@@ -1887,6 +1887,7 @@ int MIFFile::SetSpatialRef( OGRSpatialReference * poSpatialRef )
 
 {
     CPLFree( m_pszCoordSys );
+    m_pszCoordSys = nullptr;
 
     char* pszCoordSys = MITABSpatialRef2CoordSys( poSpatialRef );
     if( pszCoordSys )

From 0e5b363ba9391f6abf0f9e22c348e3ba4e812b68 Mon Sep 17 00:00:00 2001
From: Even Rouault <even.rouault@spatialys.com>
Date: Thu, 15 Aug 2019 21:29:31 +0200
Subject: [PATCH 373/488] MITAB: avoid potential nullptr deref. CID 1404174

---
 gdal/ogr/ogrsf_frmts/mitab/mitab_tabseamless.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/gdal/ogr/ogrsf_frmts/mitab/mitab_tabseamless.cpp b/gdal/ogr/ogrsf_frmts/mitab/mitab_tabseamless.cpp
index 3e8bea76b0cf..1e8f8848d40a 100644
--- a/gdal/ogr/ogrsf_frmts/mitab/mitab_tabseamless.cpp
+++ b/gdal/ogr/ogrsf_frmts/mitab/mitab_tabseamless.cpp
@@ -532,7 +532,7 @@ int TABSeamless::ExtractBaseFeatureId(GIntBig nEncodedFeatureId)
  **********************************************************************/
 GIntBig TABSeamless::GetNextFeatureId(GIntBig nPrevId)
 {
-    if (m_poIndexTable == nullptr)
+    if (m_poIndexTable == nullptr || m_poCurBaseTable == nullptr)
         return -1; // File is not opened yet
 
     if (nPrevId == -1 || m_nCurBaseTableId != ExtractBaseTableId(nPrevId))

From b2f6652f0365ccffb0827dbc5a1e98ccf0a3b2f3 Mon Sep 17 00:00:00 2001
From: Even Rouault <even.rouault@spatialys.com>
Date: Sat, 17 Aug 2019 23:47:06 +0200
Subject: [PATCH 374/488] Internal libtiff: backport security related fixes

---
 .../libtiff/gdal_libtiff_symbol_rename.h      |  3 +-
 gdal/frmts/gtiff/libtiff/tif_aux.c            | 59 +++++++++++++++++--
 gdal/frmts/gtiff/libtiff/tif_dir.c            | 54 +++++++++++------
 gdal/frmts/gtiff/libtiff/tif_dirwrite.c       | 18 ++----
 gdal/frmts/gtiff/libtiff/tif_getimage.c       | 32 ++++++----
 gdal/frmts/gtiff/libtiff/tif_luv.c            | 14 ++---
 gdal/frmts/gtiff/libtiff/tif_ojpeg.c          | 32 ++++++++++
 gdal/frmts/gtiff/libtiff/tif_open.c           |  1 +
 gdal/frmts/gtiff/libtiff/tif_pixarlog.c       |  7 +--
 gdal/frmts/gtiff/libtiff/tif_read.c           | 38 ++++--------
 gdal/frmts/gtiff/libtiff/tif_strip.c          | 35 ++---------
 gdal/frmts/gtiff/libtiff/tif_tile.c           | 27 +--------
 gdal/frmts/gtiff/libtiff/tiffiop.h            |  9 ++-
 13 files changed, 180 insertions(+), 149 deletions(-)

diff --git a/gdal/frmts/gtiff/libtiff/gdal_libtiff_symbol_rename.h b/gdal/frmts/gtiff/libtiff/gdal_libtiff_symbol_rename.h
index cb6f2e35844d..7edc4bb8e5b6 100644
--- a/gdal/frmts/gtiff/libtiff/gdal_libtiff_symbol_rename.h
+++ b/gdal/frmts/gtiff/libtiff/gdal_libtiff_symbol_rename.h
@@ -302,8 +302,7 @@
 #define TIFFCheckTile gdal_TIFFCheckTile
 #define TIFFCIELabToRGBInit gdal_TIFFCIELabToRGBInit
 #define TIFFCIELabToXYZ gdal_TIFFCIELabToXYZ
-#define TIFFClampDoubleToFloat gdal_TIFFClampDoubleToFloat
-#define TIFFClampDoubleToFloat gdal_TIFFClampDoubleToFloat
+#define _TIFFClampDoubleToFloat gdal__TIFFClampDoubleToFloat
 #define TIFFClampDoubleToInt16 gdal_TIFFClampDoubleToInt16
 #define TIFFClampDoubleToInt32 gdal_TIFFClampDoubleToInt32
 #define TIFFClampDoubleToInt8 gdal_TIFFClampDoubleToInt8
diff --git a/gdal/frmts/gtiff/libtiff/tif_aux.c b/gdal/frmts/gtiff/libtiff/tif_aux.c
index 4ece162faa8a..3e9bda43d5f8 100644
--- a/gdal/frmts/gtiff/libtiff/tif_aux.c
+++ b/gdal/frmts/gtiff/libtiff/tif_aux.c
@@ -30,6 +30,7 @@
 #include "tiffiop.h"
 #include "tif_predict.h"
 #include <math.h>
+#include <float.h>
 
 uint32
 _TIFFMultiply32(TIFF* tif, uint32 first, uint32 second, const char* where)
@@ -57,18 +58,57 @@ _TIFFMultiply64(TIFF* tif, uint64 first, uint64 second, const char* where)
 	return bytes;
 }
 
+tmsize_t
+_TIFFMultiplySSize(TIFF* tif, tmsize_t first, tmsize_t second, const char* where)
+{
+    if( first <= 0 || second <= 0 )
+    {
+        if( tif != NULL && where != NULL )
+        {
+            TIFFErrorExt(tif->tif_clientdata, where,
+                        "Invalid argument to _TIFFMultiplySSize() in %s", where);
+        }
+        return 0;
+    }
+
+    if( first > TIFF_TMSIZE_T_MAX / second )
+    {
+        if( tif != NULL && where != NULL )
+        {
+            TIFFErrorExt(tif->tif_clientdata, where,
+                        "Integer overflow in %s", where);
+        }
+        return 0;
+    }
+    return first * second;
+}
+
+tmsize_t _TIFFCastUInt64ToSSize(TIFF* tif, uint64 val, const char* module)
+{
+    if( val > (uint64)TIFF_TMSIZE_T_MAX )
+    {
+        if( tif != NULL && module != NULL )
+        {
+            TIFFErrorExt(tif->tif_clientdata,module,"Integer overflow");
+        }
+        return 0;
+    }
+    return (tmsize_t)val;
+}
+
 void*
 _TIFFCheckRealloc(TIFF* tif, void* buffer,
 		  tmsize_t nmemb, tmsize_t elem_size, const char* what)
 {
 	void* cp = NULL;
-	tmsize_t bytes = nmemb * elem_size;
-
+        tmsize_t count = _TIFFMultiplySSize(tif, nmemb, elem_size, NULL);
 	/*
-	 * XXX: Check for integer overflow.
+	 * Check for integer overflow.
 	 */
-	if (nmemb && elem_size && bytes / elem_size == nmemb)
-		cp = _TIFFrealloc(buffer, bytes);
+	if (count != 0)
+	{
+		cp = _TIFFrealloc(buffer, count);
+	}
 
 	if (cp == NULL) {
 		TIFFErrorExt(tif->tif_clientdata, tif->tif_name,
@@ -357,6 +397,15 @@ _TIFFUInt64ToDouble(uint64 ui64)
 	}
 }
 
+float _TIFFClampDoubleToFloat( double val )
+{
+    if( val > FLT_MAX )
+        return FLT_MAX;
+    if( val < -FLT_MAX )
+        return -FLT_MAX;
+    return (float)val;
+}
+
 int _TIFFSeekOK(TIFF* tif, toff_t off)
 {
     /* Huge offsets, especially -1 / UINT64_MAX, can cause issues */
diff --git a/gdal/frmts/gtiff/libtiff/tif_dir.c b/gdal/frmts/gtiff/libtiff/tif_dir.c
index 6f0b48798bde..ab1fd497a85b 100644
--- a/gdal/frmts/gtiff/libtiff/tif_dir.c
+++ b/gdal/frmts/gtiff/libtiff/tif_dir.c
@@ -29,7 +29,6 @@
  * (and also some miscellaneous stuff)
  */
 #include "tiffiop.h"
-#include <float.h>
 
 /*
  * These are used in the backwards compatibility code...
@@ -47,8 +46,8 @@ setByteArray(void** vpp, void* vp, size_t nmemb, size_t elem_size)
 		*vpp = 0;
 	}
 	if (vp) {
-		tmsize_t bytes = (tmsize_t)(nmemb * elem_size);
-		if (elem_size && bytes / elem_size == nmemb)
+		tmsize_t bytes = _TIFFMultiplySSize(NULL, nmemb, elem_size, NULL);
+		if (bytes)
 			*vpp = (void*) _TIFFmalloc(bytes);
 		if (*vpp)
 			_TIFFmemcpy(*vpp, vp, bytes);
@@ -88,13 +87,15 @@ setDoubleArrayOneValue(double** vpp, double value, size_t nmemb)
  * Install extra samples information.
  */
 static int
-setExtraSamples(TIFFDirectory* td, va_list ap, uint32* v)
+setExtraSamples(TIFF* tif, va_list ap, uint32* v)
 {
 /* XXX: Unassociated alpha data == 999 is a known Corel Draw bug, see below */
 #define EXTRASAMPLE_COREL_UNASSALPHA 999 
 
 	uint16* va;
 	uint32 i;
+        TIFFDirectory* td = &tif->tif_dir;
+        static const char module[] = "setExtraSamples";
 
 	*v = (uint16) va_arg(ap, uint16_vap);
 	if ((uint16) *v > td->td_samplesperpixel)
@@ -116,6 +117,18 @@ setExtraSamples(TIFFDirectory* td, va_list ap, uint32* v)
 				return 0;
 		}
 	}
+
+        if ( td->td_transferfunction[0] != NULL && (td->td_samplesperpixel - *v > 1) &&
+                !(td->td_samplesperpixel - td->td_extrasamples > 1))
+        {
+                TIFFWarningExt(tif->tif_clientdata,module,
+                    "ExtraSamples tag value is changing, "
+                    "but TransferFunction was read with a different value. Cancelling it");
+                TIFFClrFieldBit(tif,FIELD_TRANSFERFUNCTION);
+                _TIFFfree(td->td_transferfunction[0]);
+                td->td_transferfunction[0] = NULL;
+        }
+
 	td->td_extrasamples = (uint16) *v;
 	_TIFFsetShortArray(&td->td_sampleinfo, va, td->td_extrasamples);
 	return 1;
@@ -153,15 +166,6 @@ checkInkNamesString(TIFF* tif, uint32 slen, const char* s)
 	return (0);
 }
 
-static float TIFFClampDoubleToFloat( double val )
-{
-    if( val > FLT_MAX )
-        return FLT_MAX;
-    if( val < -FLT_MAX )
-        return -FLT_MAX;
-    return (float)val;
-}
-
 static int
 _TIFFVSetField(TIFF* tif, uint32 tag, va_list ap)
 {
@@ -285,6 +289,18 @@ _TIFFVSetField(TIFF* tif, uint32 tag, va_list ap)
                 _TIFFfree(td->td_smaxsamplevalue);
                 td->td_smaxsamplevalue = NULL;
             }
+            /* Test if 3 transfer functions instead of just one are now needed
+               See http://bugzilla.maptools.org/show_bug.cgi?id=2820 */
+            if( td->td_transferfunction[0] != NULL && (v - td->td_extrasamples > 1) &&
+                !(td->td_samplesperpixel - td->td_extrasamples > 1))
+            {
+                    TIFFWarningExt(tif->tif_clientdata,module,
+                        "SamplesPerPixel tag value is changing, "
+                        "but TransferFunction was read with a different value. Cancelling it");
+                    TIFFClrFieldBit(tif,FIELD_TRANSFERFUNCTION);
+                    _TIFFfree(td->td_transferfunction[0]);
+                    td->td_transferfunction[0] = NULL;
+            }
         }
 		td->td_samplesperpixel = (uint16) v;
 		break;
@@ -320,13 +336,13 @@ _TIFFVSetField(TIFF* tif, uint32 tag, va_list ap)
         dblval = va_arg(ap, double);
         if( dblval < 0 )
             goto badvaluedouble;
-		td->td_xresolution = TIFFClampDoubleToFloat( dblval );
+		td->td_xresolution = _TIFFClampDoubleToFloat( dblval );
 		break;
 	case TIFFTAG_YRESOLUTION:
         dblval = va_arg(ap, double);
         if( dblval < 0 )
             goto badvaluedouble;
-		td->td_yresolution = TIFFClampDoubleToFloat( dblval );
+		td->td_yresolution = _TIFFClampDoubleToFloat( dblval );
 		break;
 	case TIFFTAG_PLANARCONFIG:
 		v = (uint16) va_arg(ap, uint16_vap);
@@ -335,10 +351,10 @@ _TIFFVSetField(TIFF* tif, uint32 tag, va_list ap)
 		td->td_planarconfig = (uint16) v;
 		break;
 	case TIFFTAG_XPOSITION:
-		td->td_xposition = TIFFClampDoubleToFloat( va_arg(ap, double) );
+		td->td_xposition = _TIFFClampDoubleToFloat( va_arg(ap, double) );
 		break;
 	case TIFFTAG_YPOSITION:
-		td->td_yposition = TIFFClampDoubleToFloat( va_arg(ap, double) );
+		td->td_yposition = _TIFFClampDoubleToFloat( va_arg(ap, double) );
 		break;
 	case TIFFTAG_RESOLUTIONUNIT:
 		v = (uint16) va_arg(ap, uint16_vap);
@@ -361,7 +377,7 @@ _TIFFVSetField(TIFF* tif, uint32 tag, va_list ap)
 		_TIFFsetShortArray(&td->td_colormap[2], va_arg(ap, uint16*), v32);
 		break;
 	case TIFFTAG_EXTRASAMPLES:
-		if (!setExtraSamples(td, ap, &v))
+		if (!setExtraSamples(tif, ap, &v))
 			goto badvalue;
 		break;
 	case TIFFTAG_MATTEING:
@@ -684,7 +700,7 @@ _TIFFVSetField(TIFF* tif, uint32 tag, va_list ap)
 				case TIFF_SRATIONAL:
 				case TIFF_FLOAT:
 					{
-						float v2 = TIFFClampDoubleToFloat(va_arg(ap, double));
+						float v2 = _TIFFClampDoubleToFloat(va_arg(ap, double));
 						_TIFFmemcpy(val, &v2, tv_size);
 					}
 					break;
diff --git a/gdal/frmts/gtiff/libtiff/tif_dirwrite.c b/gdal/frmts/gtiff/libtiff/tif_dirwrite.c
index c15a28dbd8fc..83c01b24f2cb 100644
--- a/gdal/frmts/gtiff/libtiff/tif_dirwrite.c
+++ b/gdal/frmts/gtiff/libtiff/tif_dirwrite.c
@@ -28,7 +28,6 @@
  * Directory Write Support Routines.
  */
 #include "tiffiop.h"
-#include <float.h>
 
 #ifdef HAVE_IEEEFP
 #define TIFFCvtNativeToIEEEFloat(tif, n, fp)
@@ -946,15 +945,6 @@ TIFFWriteDirectorySec(TIFF* tif, int isimage, int imagedone, uint64* pdiroff)
 	return(0);
 }
 
-static float TIFFClampDoubleToFloat( double val )
-{
-    if( val > FLT_MAX )
-        return FLT_MAX;
-    if( val < -FLT_MAX )
-        return -FLT_MAX;
-    return (float)val;
-}
-
 static int8 TIFFClampDoubleToInt8( double val )
 {
     if( val > 127 )
@@ -1029,7 +1019,7 @@ TIFFWriteDirectoryTagSampleformatArray(TIFF* tif, uint32* ndir, TIFFDirEntry* di
 			if (tif->tif_dir.td_bitspersample<=32)
 			{
 				for (i = 0; i < count; ++i)
-					((float*)conv)[i] = TIFFClampDoubleToFloat(value[i]);
+					((float*)conv)[i] = _TIFFClampDoubleToFloat(value[i]);
 				ok = TIFFWriteDirectoryTagFloatArray(tif,ndir,dir,tag,count,(float*)conv);
 			}
 			else
@@ -1893,12 +1883,14 @@ TIFFWriteDirectoryTagTransferfunction(TIFF* tif, uint32* ndir, TIFFDirEntry* dir
 		n=3;
 	if (n==3)
 	{
-		if (!_TIFFmemcmp(tif->tif_dir.td_transferfunction[0],tif->tif_dir.td_transferfunction[2],m*sizeof(uint16)))
+		if (tif->tif_dir.td_transferfunction[2] == NULL ||
+		    !_TIFFmemcmp(tif->tif_dir.td_transferfunction[0],tif->tif_dir.td_transferfunction[2],m*sizeof(uint16)))
 			n=2;
 	}
 	if (n==2)
 	{
-		if (!_TIFFmemcmp(tif->tif_dir.td_transferfunction[0],tif->tif_dir.td_transferfunction[1],m*sizeof(uint16)))
+		if (tif->tif_dir.td_transferfunction[1] == NULL ||
+		    !_TIFFmemcmp(tif->tif_dir.td_transferfunction[0],tif->tif_dir.td_transferfunction[1],m*sizeof(uint16)))
 			n=1;
 	}
 	if (n==0)
diff --git a/gdal/frmts/gtiff/libtiff/tif_getimage.c b/gdal/frmts/gtiff/libtiff/tif_getimage.c
index 6a9d5a7c0c99..a389ffb0f69a 100644
--- a/gdal/frmts/gtiff/libtiff/tif_getimage.c
+++ b/gdal/frmts/gtiff/libtiff/tif_getimage.c
@@ -755,9 +755,8 @@ gtTileSeparate(TIFFRGBAImage* img, uint32* raster, uint32 w, uint32 h)
 	uint32 leftmost_tw;
 
 	tilesize = TIFFTileSize(tif);  
-	bufsize = TIFFSafeMultiply(tmsize_t,alpha?4:3,tilesize);
+	bufsize = _TIFFMultiplySSize(tif, alpha?4:3,tilesize, "gtTileSeparate");
 	if (bufsize == 0) {
-		TIFFErrorExt(tif->tif_clientdata, TIFFFileName(tif), "Integer overflow in %s", "gtTileSeparate");
 		return (0);
 	}
 
@@ -950,16 +949,23 @@ gtStripContig(TIFFRGBAImage* img, uint32* raster, uint32 w, uint32 h)
 	fromskew = (w < imagewidth ? imagewidth - w : 0);
 	for (row = 0; row < h; row += nrow)
 	{
+		uint32 temp;
 		rowstoread = rowsperstrip - (row + img->row_offset) % rowsperstrip;
 		nrow = (row + rowstoread > h ? h - row : rowstoread);
 		nrowsub = nrow;
 		if ((nrowsub%subsamplingver)!=0)
 			nrowsub+=subsamplingver-nrowsub%subsamplingver;
+		temp = (row + img->row_offset)%rowsperstrip + nrowsub;
+		if( scanline > 0 && temp > (size_t)(TIFF_TMSIZE_T_MAX / scanline) )
+		{
+			TIFFErrorExt(tif->tif_clientdata, TIFFFileName(tif), "Integer overflow in gtStripContig");
+			return 0;
+		}
 		if (_TIFFReadEncodedStripAndAllocBuffer(tif,
 		    TIFFComputeStrip(tif,row+img->row_offset, 0),
 		    (void**)(&buf),
                     maxstripsize,
-		    ((row + img->row_offset)%rowsperstrip + nrowsub) * scanline)==(tmsize_t)(-1)
+		    temp * scanline)==(tmsize_t)(-1)
 		    && (buf == NULL || img->stoponerr))
 		{
 			ret = 0;
@@ -1019,9 +1025,8 @@ gtStripSeparate(TIFFRGBAImage* img, uint32* raster, uint32 w, uint32 h)
         uint16 colorchannels;
 
 	stripsize = TIFFStripSize(tif);  
-	bufsize = TIFFSafeMultiply(tmsize_t,alpha?4:3,stripsize);
+	bufsize = _TIFFMultiplySSize(tif,alpha?4:3,stripsize, "gtStripSeparate");
 	if (bufsize == 0) {
-		TIFFErrorExt(tif->tif_clientdata, TIFFFileName(tif), "Integer overflow in %s", "gtStripSeparate");
 		return (0);
 	}
 
@@ -1053,15 +1058,22 @@ gtStripSeparate(TIFFRGBAImage* img, uint32* raster, uint32 w, uint32 h)
 	fromskew = (w < imagewidth ? imagewidth - w : 0);
 	for (row = 0; row < h; row += nrow)
 	{
+                uint32 temp;
 		rowstoread = rowsperstrip - (row + img->row_offset) % rowsperstrip;
 		nrow = (row + rowstoread > h ? h - row : rowstoread);
 		offset_row = row + img->row_offset;
+                temp = (row + img->row_offset)%rowsperstrip + nrow;
+                if( scanline > 0 && temp > (size_t)(TIFF_TMSIZE_T_MAX / scanline) )
+                {
+                        TIFFErrorExt(tif->tif_clientdata, TIFFFileName(tif), "Integer overflow in gtStripSeparate");
+                        return 0;
+                }
                 if( buf == NULL )
                 {
                     if (_TIFFReadEncodedStripAndAllocBuffer(
                             tif, TIFFComputeStrip(tif, offset_row, 0),
                             (void**) &buf, bufsize,
-                            ((row + img->row_offset)%rowsperstrip + nrow) * scanline)==(tmsize_t)(-1)
+                            temp * scanline)==(tmsize_t)(-1)
                         && (buf == NULL || img->stoponerr))
                     {
                             ret = 0;
@@ -1081,7 +1093,7 @@ gtStripSeparate(TIFFRGBAImage* img, uint32* raster, uint32 w, uint32 h)
                     }
                 }
 		else if (TIFFReadEncodedStrip(tif, TIFFComputeStrip(tif, offset_row, 0),
-		    p0, ((row + img->row_offset)%rowsperstrip + nrow) * scanline)==(tmsize_t)(-1)
+		    p0, temp * scanline)==(tmsize_t)(-1)
 		    && img->stoponerr)
 		{
 			ret = 0;
@@ -1089,7 +1101,7 @@ gtStripSeparate(TIFFRGBAImage* img, uint32* raster, uint32 w, uint32 h)
 		}
 		if (colorchannels > 1 
                     && TIFFReadEncodedStrip(tif, TIFFComputeStrip(tif, offset_row, 1),
-                                            p1, ((row + img->row_offset)%rowsperstrip + nrow) * scanline) == (tmsize_t)(-1)
+                                            p1, temp * scanline) == (tmsize_t)(-1)
 		    && img->stoponerr)
 		{
 			ret = 0;
@@ -1097,7 +1109,7 @@ gtStripSeparate(TIFFRGBAImage* img, uint32* raster, uint32 w, uint32 h)
 		}
 		if (colorchannels > 1 
                     && TIFFReadEncodedStrip(tif, TIFFComputeStrip(tif, offset_row, 2),
-                                            p2, ((row + img->row_offset)%rowsperstrip + nrow) * scanline) == (tmsize_t)(-1)
+                                            p2, temp * scanline) == (tmsize_t)(-1)
 		    && img->stoponerr)
 		{
 			ret = 0;
@@ -1106,7 +1118,7 @@ gtStripSeparate(TIFFRGBAImage* img, uint32* raster, uint32 w, uint32 h)
 		if (alpha)
 		{
 			if (TIFFReadEncodedStrip(tif, TIFFComputeStrip(tif, offset_row, colorchannels),
-			    pa, ((row + img->row_offset)%rowsperstrip + nrow) * scanline)==(tmsize_t)(-1)
+			    pa, temp * scanline)==(tmsize_t)(-1)
 			    && img->stoponerr)
 			{
 				ret = 0;
diff --git a/gdal/frmts/gtiff/libtiff/tif_luv.c b/gdal/frmts/gtiff/libtiff/tif_luv.c
index aa35ea07d19e..49bed3e0ce35 100644
--- a/gdal/frmts/gtiff/libtiff/tif_luv.c
+++ b/gdal/frmts/gtiff/libtiff/tif_luv.c
@@ -1264,16 +1264,10 @@ LogL16GuessDataFmt(TIFFDirectory *td)
 	return (SGILOGDATAFMT_UNKNOWN);
 }
 
-
-#define TIFF_SIZE_T_MAX ((size_t) ~ ((size_t)0))
-#define TIFF_TMSIZE_T_MAX (tmsize_t)(TIFF_SIZE_T_MAX >> 1)
-
 static tmsize_t
 multiply_ms(tmsize_t m1, tmsize_t m2)
 {
-        if( m1 == 0 || m2 > TIFF_TMSIZE_T_MAX / m1 )
-            return 0;
-        return m1 * m2;
+        return _TIFFMultiplySSize(NULL, m1, m2, NULL);
 }
 
 static int
@@ -1507,7 +1501,7 @@ LogLuvSetupEncode(TIFF* tif)
 	switch (td->td_photometric) {
 	case PHOTOMETRIC_LOGLUV:
 		if (!LogLuvInitState(tif))
-			break;
+			return (0);
 		if (td->td_compression == COMPRESSION_SGILOG24) {
 			tif->tif_encoderow = LogLuvEncode24;
 			switch (sp->user_datafmt) {
@@ -1540,7 +1534,7 @@ LogLuvSetupEncode(TIFF* tif)
 		break;
 	case PHOTOMETRIC_LOGL:
 		if (!LogL16InitState(tif))
-			break;
+			return (0);
 		tif->tif_encoderow = LogL16Encode;  
 		switch (sp->user_datafmt) {
 		case SGILOGDATAFMT_FLOAT:
@@ -1556,7 +1550,7 @@ LogLuvSetupEncode(TIFF* tif)
 		TIFFErrorExt(tif->tif_clientdata, module,
 		    "Inappropriate photometric interpretation %d for SGILog compression; %s",
 		    td->td_photometric, "must be either LogLUV or LogL");
-		break;
+		return (0);
 	}
 	sp->encoder_state = 1;
 	return (1);
diff --git a/gdal/frmts/gtiff/libtiff/tif_ojpeg.c b/gdal/frmts/gtiff/libtiff/tif_ojpeg.c
index 27385d8c47d9..b38645031378 100644
--- a/gdal/frmts/gtiff/libtiff/tif_ojpeg.c
+++ b/gdal/frmts/gtiff/libtiff/tif_ojpeg.c
@@ -831,6 +831,32 @@ OJPEGDecodeRaw(TIFF* tif, uint8* buf, tmsize_t cc)
 	{
 		if (sp->subsampling_convert_state==0)
 		{
+			const jpeg_decompress_struct* cinfo = &sp->libjpeg_jpeg_decompress_struct;
+			int width = 0;
+			int last_col_width = 0;
+			int jpeg_bytes;
+			int expected_bytes;
+			int i;
+			if (cinfo->MCUs_per_row == 0)
+				return 0;
+			for (i = 0; i < cinfo->comps_in_scan; ++i)
+			{
+				const jpeg_component_info* info = cinfo->cur_comp_info[i];
+#if JPEG_LIB_VERSION >= 70
+				width += info->MCU_width * info->DCT_h_scaled_size;
+				last_col_width += info->last_col_width * info->DCT_h_scaled_size;
+#else
+				width += info->MCU_width * info->DCT_scaled_size;
+				last_col_width += info->last_col_width * info->DCT_scaled_size;
+#endif
+			}
+			jpeg_bytes = (cinfo->MCUs_per_row - 1) * width + last_col_width;
+			expected_bytes = sp->subsampling_convert_clinelenout * sp->subsampling_ver * sp->subsampling_hor;
+			if (jpeg_bytes != expected_bytes)
+			{
+				TIFFErrorExt(tif->tif_clientdata,module,"Inconsistent number of MCU in codestream");
+				return(0);
+			}
 			if (jpeg_read_raw_data_encap(sp,&(sp->libjpeg_jpeg_decompress_struct),sp->subsampling_convert_ycbcrimage,sp->subsampling_ver*8)==0)
 				return(0);
 		}
@@ -1082,6 +1108,12 @@ OJPEGReadHeaderInfo(TIFF* tif)
 	}
 	if (sp->strile_length<sp->image_length)
 	{
+		if (((sp->subsampling_hor!=1) && (sp->subsampling_hor!=2) && (sp->subsampling_hor!=4)) ||
+		    ((sp->subsampling_ver!=1) && (sp->subsampling_ver!=2) && (sp->subsampling_ver!=4)))
+		{
+			TIFFErrorExt(tif->tif_clientdata,module,"Invalid subsampling values");
+			return(0);
+		}
 		if (sp->strile_length%(sp->subsampling_ver*8)!=0)
 		{
 			TIFFErrorExt(tif->tif_clientdata,module,"Incompatible vertical subsampling and image strip/tile length");
diff --git a/gdal/frmts/gtiff/libtiff/tif_open.c b/gdal/frmts/gtiff/libtiff/tif_open.c
index c574c452aaa2..e1fefe2e7406 100644
--- a/gdal/frmts/gtiff/libtiff/tif_open.c
+++ b/gdal/frmts/gtiff/libtiff/tif_open.c
@@ -131,6 +131,7 @@ TIFFClientOpen(
 	if (!readproc || !writeproc || !seekproc || !closeproc || !sizeproc) {
 		TIFFErrorExt(clientdata, module,
 		    "One of the client procedures is NULL pointer.");
+		_TIFFfree(tif);
 		goto bad2;
 	}
 	tif->tif_readproc = readproc;
diff --git a/gdal/frmts/gtiff/libtiff/tif_pixarlog.c b/gdal/frmts/gtiff/libtiff/tif_pixarlog.c
index 77620e3da64b..e772f31ee3d0 100644
--- a/gdal/frmts/gtiff/libtiff/tif_pixarlog.c
+++ b/gdal/frmts/gtiff/libtiff/tif_pixarlog.c
@@ -634,15 +634,10 @@ PixarLogGuessDataFmt(TIFFDirectory *td)
 	return guess;
 }
 
-#define TIFF_SIZE_T_MAX ((size_t) ~ ((size_t)0))
-#define TIFF_TMSIZE_T_MAX (tmsize_t)(TIFF_SIZE_T_MAX >> 1)
-
 static tmsize_t
 multiply_ms(tmsize_t m1, tmsize_t m2)
 {
-        if( m1 == 0 || m2 > TIFF_TMSIZE_T_MAX / m1 )
-            return 0;
-        return m1 * m2;
+        return _TIFFMultiplySSize(NULL, m1, m2, NULL);
 }
 
 static tmsize_t
diff --git a/gdal/frmts/gtiff/libtiff/tif_read.c b/gdal/frmts/gtiff/libtiff/tif_read.c
index e63810cc78e4..e5a3e1fe6762 100644
--- a/gdal/frmts/gtiff/libtiff/tif_read.c
+++ b/gdal/frmts/gtiff/libtiff/tif_read.c
@@ -29,9 +29,6 @@
 #include "tiffiop.h"
 #include <stdio.h>
 
-#define TIFF_SIZE_T_MAX ((size_t) ~ ((size_t)0))
-#define TIFF_TMSIZE_T_MAX (tmsize_t)(TIFF_SIZE_T_MAX >> 1)
-
 int TIFFFillStrip(TIFF* tif, uint32 strip);
 int TIFFFillTile(TIFF* tif, uint32 tile);
 static int TIFFStartStrip(TIFF* tif, uint32 strip);
@@ -49,6 +46,8 @@ TIFFReadRawTile1(TIFF* tif, uint32 tile, void* buf, tmsize_t size, const char* m
 #define THRESHOLD_MULTIPLIER 10
 #define MAX_THRESHOLD (THRESHOLD_MULTIPLIER * THRESHOLD_MULTIPLIER * THRESHOLD_MULTIPLIER * INITIAL_THRESHOLD)
 
+#define TIFF_INT64_MAX ((((int64)0x7FFFFFFF) << 32) | 0xFFFFFFFF)
+
 /* Read 'size' bytes in tif_rawdata buffer starting at offset 'rawdata_offset'
  * Returns 1 in case of success, 0 otherwise. */
 static int TIFFReadAndRealloc( TIFF* tif, tmsize_t size,
@@ -734,23 +733,8 @@ TIFFReadRawStrip(TIFF* tif, uint32 strip, void* buf, tmsize_t size)
 		return ((tmsize_t)(-1));
 	}
 	bytecount = td->td_stripbytecount[strip];
-	if ((int64)bytecount <= 0) {
-#if defined(__WIN32__) && (defined(_MSC_VER) || defined(__MINGW32__))
-		TIFFErrorExt(tif->tif_clientdata, module,
-			     "%I64u: Invalid strip byte count, strip %lu",
-			     (unsigned __int64) bytecount,
-			     (unsigned long) strip);
-#else
-		TIFFErrorExt(tif->tif_clientdata, module,
-			     "%llu: Invalid strip byte count, strip %lu",
-			     (unsigned long long) bytecount,
-			     (unsigned long) strip);
-#endif
-		return ((tmsize_t)(-1));
-	}
-	bytecountm = (tmsize_t)bytecount;
-	if ((uint64)bytecountm!=bytecount) {
-		TIFFErrorExt(tif->tif_clientdata, module, "Integer overflow");
+        bytecountm = _TIFFCastUInt64ToSSize(tif, bytecount, module);
+	if (bytecountm == 0) {
 		return ((tmsize_t)(-1));
 	}
 	if (size != (tmsize_t)(-1) && size < bytecountm)
@@ -774,7 +758,7 @@ TIFFFillStrip(TIFF* tif, uint32 strip)
 	if ((tif->tif_flags&TIFF_NOREADRAW)==0)
 	{
 		uint64 bytecount = td->td_stripbytecount[strip];
-		if ((int64)bytecount <= 0) {
+                if( bytecount == 0 || bytecount > (uint64)TIFF_INT64_MAX ) {
 #if defined(__WIN32__) && (defined(_MSC_VER) || defined(__MINGW32__))
 			TIFFErrorExt(tif->tif_clientdata, module,
 				"Invalid strip byte count %I64u, strip %lu",
@@ -801,7 +785,7 @@ TIFFFillStrip(TIFF* tif, uint32 strip)
 			    (bytecount - 4096) / 10 > (uint64)stripsize  )
 			{
 				uint64 newbytecount = (uint64)stripsize * 10 + 4096;
-				if( (int64)newbytecount >= 0 )
+				if( newbytecount == 0 || newbytecount > (uint64)TIFF_INT64_MAX )
 				{
 #if defined(__WIN32__) && (defined(_MSC_VER) || defined(__MINGW32__))
 					TIFFWarningExt(tif->tif_clientdata, module,
@@ -1196,10 +1180,8 @@ TIFFReadRawTile(TIFF* tif, uint32 tile, void* buf, tmsize_t size)
 	bytecount64 = td->td_stripbytecount[tile];
 	if (size != (tmsize_t)(-1) && (uint64)size < bytecount64)
 		bytecount64 = (uint64)size;
-	bytecountm = (tmsize_t)bytecount64;
-	if ((uint64)bytecountm!=bytecount64)
-	{
-		TIFFErrorExt(tif->tif_clientdata,module,"Integer overflow");
+	bytecountm = _TIFFCastUInt64ToSSize(tif, bytecount64, module);
+        if( bytecountm == 0 ) {
 		return ((tmsize_t)(-1));
 	}
 	return (TIFFReadRawTile1(tif, tile, buf, bytecountm, module));
@@ -1221,7 +1203,7 @@ TIFFFillTile(TIFF* tif, uint32 tile)
 	if ((tif->tif_flags&TIFF_NOREADRAW)==0)
 	{
 		uint64 bytecount = td->td_stripbytecount[tile];
-		if ((int64)bytecount <= 0) {
+		if( bytecount == 0 || bytecount > (uint64)TIFF_INT64_MAX ) {
 #if defined(__WIN32__) && (defined(_MSC_VER) || defined(__MINGW32__))
 			TIFFErrorExt(tif->tif_clientdata, module,
 				"%I64u: Invalid tile byte count, tile %lu",
@@ -1248,7 +1230,7 @@ TIFFFillTile(TIFF* tif, uint32 tile)
 			    (bytecount - 4096) / 10 > (uint64)stripsize  )
 			{
 				uint64 newbytecount = (uint64)stripsize * 10 + 4096;
-				if( (int64)newbytecount >= 0 )
+				if( newbytecount == 0 || newbytecount > (uint64)TIFF_INT64_MAX )
 				{
 #if defined(__WIN32__) && (defined(_MSC_VER) || defined(__MINGW32__))
 					TIFFWarningExt(tif->tif_clientdata, module,
diff --git a/gdal/frmts/gtiff/libtiff/tif_strip.c b/gdal/frmts/gtiff/libtiff/tif_strip.c
index 5b76fba56dd2..2366acf0ed56 100644
--- a/gdal/frmts/gtiff/libtiff/tif_strip.c
+++ b/gdal/frmts/gtiff/libtiff/tif_strip.c
@@ -129,15 +129,8 @@ TIFFVStripSize(TIFF* tif, uint32 nrows)
 {
 	static const char module[] = "TIFFVStripSize";
 	uint64 m;
-	tmsize_t n;
 	m=TIFFVStripSize64(tif,nrows);
-	n=(tmsize_t)m;
-	if ((uint64)n!=m)
-	{
-		TIFFErrorExt(tif->tif_clientdata,module,"Integer overflow");
-		n=0;
-	}
-	return(n);
+        return _TIFFCastUInt64ToSSize(tif, m, module);
 }
 
 /*
@@ -211,15 +204,8 @@ TIFFStripSize(TIFF* tif)
 {
 	static const char module[] = "TIFFStripSize";
 	uint64 m;
-	tmsize_t n;
 	m=TIFFStripSize64(tif);
-	n=(tmsize_t)m;
-	if ((uint64)n!=m)
-	{
-		TIFFErrorExt(tif->tif_clientdata,module,"Integer overflow");
-		n=0;
-	}
-	return(n);
+	return _TIFFCastUInt64ToSSize(tif, m, module);
 }
 
 /*
@@ -330,14 +316,8 @@ TIFFScanlineSize(TIFF* tif)
 {
 	static const char module[] = "TIFFScanlineSize";
 	uint64 m;
-	tmsize_t n;
 	m=TIFFScanlineSize64(tif);
-	n=(tmsize_t)m;
-	if ((uint64)n!=m) {
-		TIFFErrorExt(tif->tif_clientdata,module,"Integer arithmetic overflow");
-		n=0;
-	}
-	return(n);
+	return _TIFFCastUInt64ToSSize(tif, m, module);
 }
 
 /*
@@ -366,15 +346,8 @@ TIFFRasterScanlineSize(TIFF* tif)
 {
 	static const char module[] = "TIFFRasterScanlineSize";
 	uint64 m;
-	tmsize_t n;
 	m=TIFFRasterScanlineSize64(tif);
-	n=(tmsize_t)m;
-	if ((uint64)n!=m)
-	{
-		TIFFErrorExt(tif->tif_clientdata,module,"Integer arithmetic overflow");
-		n=0;
-	}
-	return(n);
+	return _TIFFCastUInt64ToSSize(tif, m, module);
 }
 
 /* vim: set ts=8 sts=8 sw=8 noet: */
diff --git a/gdal/frmts/gtiff/libtiff/tif_tile.c b/gdal/frmts/gtiff/libtiff/tif_tile.c
index 58fe9354a387..661cc771548b 100644
--- a/gdal/frmts/gtiff/libtiff/tif_tile.c
+++ b/gdal/frmts/gtiff/libtiff/tif_tile.c
@@ -181,15 +181,8 @@ TIFFTileRowSize(TIFF* tif)
 {
 	static const char module[] = "TIFFTileRowSize";
 	uint64 m;
-	tmsize_t n;
 	m=TIFFTileRowSize64(tif);
-	n=(tmsize_t)m;
-	if ((uint64)n!=m)
-	{
-		TIFFErrorExt(tif->tif_clientdata,module,"Integer overflow");
-		n=0;
-	}
-	return(n);
+	return _TIFFCastUInt64ToSSize(tif, m, module);
 }
 
 /*
@@ -248,15 +241,8 @@ TIFFVTileSize(TIFF* tif, uint32 nrows)
 {
 	static const char module[] = "TIFFVTileSize";
 	uint64 m;
-	tmsize_t n;
 	m=TIFFVTileSize64(tif,nrows);
-	n=(tmsize_t)m;
-	if ((uint64)n!=m)
-	{
-		TIFFErrorExt(tif->tif_clientdata,module,"Integer overflow");
-		n=0;
-	}
-	return(n);
+	return _TIFFCastUInt64ToSSize(tif, m, module);
 }
 
 /*
@@ -272,15 +258,8 @@ TIFFTileSize(TIFF* tif)
 {
 	static const char module[] = "TIFFTileSize";
 	uint64 m;
-	tmsize_t n;
 	m=TIFFTileSize64(tif);
-	n=(tmsize_t)m;
-	if ((uint64)n!=m)
-	{
-		TIFFErrorExt(tif->tif_clientdata,module,"Integer overflow");
-		n=0;
-	}
-	return(n);
+	return _TIFFCastUInt64ToSSize(tif, m, module);
 }
 
 /*
diff --git a/gdal/frmts/gtiff/libtiff/tiffiop.h b/gdal/frmts/gtiff/libtiff/tiffiop.h
index 186c291f5d7a..8caa14555599 100644
--- a/gdal/frmts/gtiff/libtiff/tiffiop.h
+++ b/gdal/frmts/gtiff/libtiff/tiffiop.h
@@ -77,6 +77,9 @@ extern int snprintf(char* str, size_t size, const char* format, ...);
 #define	FALSE	0
 #endif
 
+#define TIFF_SIZE_T_MAX ((size_t) ~ ((size_t)0))
+#define TIFF_TMSIZE_T_MAX (tmsize_t)(TIFF_SIZE_T_MAX >> 1)
+
 typedef struct client_info {
     struct client_info *next;
     void *data;
@@ -258,7 +261,7 @@ struct tiff {
 #define TIFFhowmany8_64(x) (((x)&0x07)?((uint64)(x)>>3)+1:(uint64)(x)>>3)
 #define TIFFroundup_64(x, y) (TIFFhowmany_64(x,y)*(y))
 
-/* Safe multiply which returns zero if there is an integer overflow */
+/* Safe multiply which returns zero if there is an *unsigned* integer overflow. This macro is not safe for *signed* integer types */
 #define TIFFSafeMultiply(t,v,m) ((((t)(m) != (t)0) && (((t)(((v)*(m))/(m))) == (t)(v))) ? (t)((v)*(m)) : (t)0)
 
 #define TIFFmax(A,B) ((A)>(B)?(A):(B))
@@ -368,12 +371,16 @@ extern TIFFErrorHandlerExt _TIFFerrorHandlerExt;
 
 extern uint32 _TIFFMultiply32(TIFF*, uint32, uint32, const char*);
 extern uint64 _TIFFMultiply64(TIFF*, uint64, uint64, const char*);
+extern tmsize_t _TIFFMultiplySSize(TIFF*, tmsize_t, tmsize_t, const char*);
+extern tmsize_t _TIFFCastUInt64ToSSize(TIFF*, uint64, const char*);
 extern void* _TIFFCheckMalloc(TIFF*, tmsize_t, tmsize_t, const char*);
 extern void* _TIFFCheckRealloc(TIFF*, void*, tmsize_t, tmsize_t, const char*);
 
 extern double _TIFFUInt64ToDouble(uint64);
 extern float _TIFFUInt64ToFloat(uint64);
 
+extern float _TIFFClampDoubleToFloat(double);
+
 extern tmsize_t
 _TIFFReadEncodedStripAndAllocBuffer(TIFF* tif, uint32 strip,
                                     void **buf, tmsize_t bufsizetoalloc,

From 818ed175bcc82036101fee4606b761137bc149ba Mon Sep 17 00:00:00 2001
From: Even Rouault <even.rouault@spatialys.com>
Date: Mon, 19 Aug 2019 10:58:06 +0200
Subject: [PATCH 375/488] PDF: fix potential heap buffer overflow. Fixes
 https://bugs.chromium.org/p/oss-fuzz/issues/detail?id=16546. Credit to OSS
 Fuzz

---
 gdal/frmts/pdf/pdfdataset.cpp | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/gdal/frmts/pdf/pdfdataset.cpp b/gdal/frmts/pdf/pdfdataset.cpp
index b6857864da9c..b2ddb72d7ce2 100644
--- a/gdal/frmts/pdf/pdfdataset.cpp
+++ b/gdal/frmts/pdf/pdfdataset.cpp
@@ -5002,6 +5002,8 @@ static double Get(GDALPDFObject* poObj, int nIndice)
     {
         const char* pszStr = poObj->GetString().c_str();
         size_t nLen = strlen(pszStr);
+        if( nLen == 0 )
+            return 0;
         /* cf Military_Installations_2008.pdf that has values like "96 0 0.0W" */
         char chLast = pszStr[nLen-1];
         if (chLast == 'W' || chLast == 'E' || chLast == 'N' || chLast == 'S')

From 3b66efc15b7eeaf5e45355df34d7942180d21a6e Mon Sep 17 00:00:00 2001
From: Even Rouault <even.rouault@spatialys.com>
Date: Tue, 20 Aug 2019 15:22:01 +0200
Subject: [PATCH 376/488] PDF: fix potential nullptr deref on corrupted file.
 Fixes https://bugs.chromium.org/p/oss-fuzz/issues/detail?id=16558. Credit to
 OSS Fuzz

---
 gdal/frmts/pdf/ogrpdflayer.cpp | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/gdal/frmts/pdf/ogrpdflayer.cpp b/gdal/frmts/pdf/ogrpdflayer.cpp
index e8fbfa2ea224..58bfb07c60e8 100644
--- a/gdal/frmts/pdf/ogrpdflayer.cpp
+++ b/gdal/frmts/pdf/ogrpdflayer.cpp
@@ -55,7 +55,8 @@ void OGRPDFLayer::Fill( GDALPDFArray* poArray )
     for(int i=0;i<poArray->GetLength();i++)
     {
         GDALPDFObject* poFeatureObj = poArray->Get(i);
-        if (poFeatureObj->GetType() != PDFObjectType_Dictionary)
+        if (poFeatureObj == nullptr ||
+            poFeatureObj->GetType() != PDFObjectType_Dictionary)
             continue;
 
         GDALPDFObject* poA = poFeatureObj->GetDictionary()->Get("A");
@@ -76,7 +77,7 @@ void OGRPDFLayer::Fill( GDALPDFArray* poArray )
         for(j = 0;j<poPArray->GetLength();j++)
         {
             GDALPDFObject* poKV = poPArray->Get(j);
-            if (poKV->GetType() == PDFObjectType_Dictionary)
+            if (poKV && poKV->GetType() == PDFObjectType_Dictionary)
             {
                 GDALPDFObject* poN = poKV->GetDictionary()->Get("N");
                 GDALPDFObject* poV = poKV->GetDictionary()->Get("V");
@@ -108,7 +109,7 @@ void OGRPDFLayer::Fill( GDALPDFArray* poArray )
         for(j = 0;j<poPArray->GetLength();j++)
         {
             GDALPDFObject* poKV = poPArray->Get(j);
-            if (poKV->GetType() == PDFObjectType_Dictionary)
+            if (poKV && poKV->GetType() == PDFObjectType_Dictionary)
             {
                 GDALPDFObject* poN = poKV->GetDictionary()->Get("N");
                 GDALPDFObject* poV = poKV->GetDictionary()->Get("V");

From de66f004bd96da9caad83d64174ead8170df6f3d Mon Sep 17 00:00:00 2001
From: Even Rouault <even.rouault@spatialys.com>
Date: Thu, 23 May 2019 16:26:40 +0200
Subject: [PATCH 377/488] /vsitar/: support >100 character file names (fixes
 #1559)

---
 autotest/gcore/data/verylongfilename.tar | Bin 0 -> 10240 bytes
 autotest/gcore/vsifile.py                |  11 +++
 gdal/port/cpl_vsil_tar.cpp               |  87 +++++++++++++++--------
 3 files changed, 67 insertions(+), 31 deletions(-)
 create mode 100644 autotest/gcore/data/verylongfilename.tar

diff --git a/autotest/gcore/data/verylongfilename.tar b/autotest/gcore/data/verylongfilename.tar
new file mode 100644
index 0000000000000000000000000000000000000000..dc239ce990359d81ebbe7bb3835ff3eed363fc61
GIT binary patch
literal 10240
zcmeHMU2cOg49@dT(GxWP=5+_)66prhGzlcu?fi{fp{<M+LWh-h{$3*FB#!*qUqTYX
zEJ$$$R76pD5gT22^}R(CLTKv>?F}fWMeL=G7aM<t&)Gvi-uI!~Y(({0HJ1iW*)NUF
z*fxv(5aeziM)L#-PU7Ey2gCeRq|H`t<zv}4FXe0Vwvt2SADqLwM+{q~;iwHKE84XN
z73;rTX+3At_VwSj?f%R#_?WT}y5Gv@U)TTBG)6VzR^oMU>!jcx3p+{wt#KY$|0!}U
z2mLp8ME@=8KL!63^*`7W<nui6K0%NG6#TRP6A-!3MGpFJjqU#lFjY?Hf6e;8kkX`K
z6!pJU|Ene7T_ZdGS^twLA?=)l{yR0I|BCgWA`$LS|LZjT^ZkN?|0Ml~c>crtpMvjy
zDC$2C{fD3Df4={rpkGkbKkfNHP5x_Hw=GGe^K?SNKk7fg@%`_Y_kZ{G{@?3=tbauj
jvi|*V>V1F8PO;V%eC$H^u)?%FB}afGz!BgGWFCP7d|o?X

literal 0
HcmV?d00001

diff --git a/autotest/gcore/vsifile.py b/autotest/gcore/vsifile.py
index e44ace96787b..4506081689f8 100755
--- a/autotest/gcore/vsifile.py
+++ b/autotest/gcore/vsifile.py
@@ -835,3 +835,14 @@ def test_vsifile_opendir():
 
 
 
+###############################################################################
+# Test bugfix for https://github.com/OSGeo/gdal/issues/1559
+
+
+def test_vsitar_verylongfilename():
+
+    f = gdal.VSIFOpenL('/vsitar/data/verylongfilename.tar/aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa/bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb/ccccccccccccccccccccccccccccccccccc/ddddddddddddddddddddddddddddddddddddddd/eeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeee/fffffffffffffffffffffffffffffffffffffffffffffff/foo', 'rb')
+    assert f
+    data = gdal.VSIFReadL(1, 3, f).decode('ascii')
+    gdal.VSIFCloseL(f)
+    assert data == 'bar'
diff --git a/gdal/port/cpl_vsil_tar.cpp b/gdal/port/cpl_vsil_tar.cpp
index 51a3d87d2801..e73de31359a4 100644
--- a/gdal/port/cpl_vsil_tar.cpp
+++ b/gdal/port/cpl_vsil_tar.cpp
@@ -325,41 +325,66 @@ int VSITarReader::GotoNextFile()
         }
     }
 #endif
-    GByte abyHeader[512] = {};
-    if (VSIFReadL(abyHeader, 512, 1, fp) != 1)
-        return FALSE;
 
-    if (abyHeader[99] != '\0' || /* end of filename */
-        !(abyHeader[100] == 0x80 || abyHeader[107] == '\0') || /* start/end of filemode */
-        !(abyHeader[108] == 0x80 || abyHeader[115] == '\0') || /* start/end of owner ID */
-        !(abyHeader[116] == 0x80 || abyHeader[123] == '\0') || /* start/end of group ID */
-        (abyHeader[135] != '\0' && abyHeader[135] != ' ') || /* end of file size */
-        (abyHeader[147] != '\0' && abyHeader[147] != ' ')) /* end of mtime */
+    osNextFileName.clear();
+    while( true )
     {
-        return FALSE;
-    }
-    if( !(abyHeader[124] == ' ' || (abyHeader[124] >= '0' && abyHeader[124] <= '7')) )
-        return FALSE;
+        GByte abyHeader[512] = {};
+        if (VSIFReadL(abyHeader, 512, 1, fp) != 1)
+            return FALSE;
 
-    osNextFileName = reinterpret_cast<const char*>(abyHeader);
-    nNextFileSize = 0;
-    for(int i=0;i<11;i++)
-    {
-        if( abyHeader[124+i] != ' ' )
-            nNextFileSize = nNextFileSize * 8 + (abyHeader[124+i] - '0');
-    }
-    if( nNextFileSize > GINTBIG_MAX )
-    {
-        CPLError(CE_Failure, CPLE_AppDefined,
-                 "Invalid file size for %s", osNextFileName.c_str());
-        return FALSE;
-    }
+        if (!(abyHeader[100] == 0x80 || abyHeader[107] == '\0') || /* start/end of filemode */
+            !(abyHeader[108] == 0x80 || abyHeader[115] == '\0') || /* start/end of owner ID */
+            !(abyHeader[116] == 0x80 || abyHeader[123] == '\0') || /* start/end of group ID */
+            (abyHeader[135] != '\0' && abyHeader[135] != ' ') || /* end of file size */
+            (abyHeader[147] != '\0' && abyHeader[147] != ' ')) /* end of mtime */
+        {
+            return FALSE;
+        }
+        if( !(abyHeader[124] == ' ' || (abyHeader[124] >= '0' && abyHeader[124] <= '7')) )
+            return FALSE;
 
-    nModifiedTime = 0;
-    for(int i=0;i<11;i++)
-    {
-        if( abyHeader[136+i] != ' ' )
-            nModifiedTime = nModifiedTime * 8 + (abyHeader[136+i] - '0');
+        if( osNextFileName.empty() )
+        {
+            osNextFileName.assign(reinterpret_cast<const char*>(abyHeader),
+                                  CPLStrnlen(reinterpret_cast<const char*>(abyHeader), 100));
+        }
+
+        nNextFileSize = 0;
+        for(int i=0;i<11;i++)
+        {
+            if( abyHeader[124+i] != ' ' )
+                nNextFileSize = nNextFileSize * 8 + (abyHeader[124+i] - '0');
+        }
+        if( nNextFileSize > GINTBIG_MAX )
+        {
+            CPLError(CE_Failure, CPLE_AppDefined,
+                    "Invalid file size for %s", osNextFileName.c_str());
+            return FALSE;
+        }
+
+        nModifiedTime = 0;
+        for(int i=0;i<11;i++)
+        {
+            if( abyHeader[136+i] != ' ' )
+                nModifiedTime = nModifiedTime * 8 + (abyHeader[136+i] - '0');
+        }
+
+        if( abyHeader[156] == 'L' && nNextFileSize > 0 && nNextFileSize < 32768 )
+        {
+            // If this is a large filename record, then read the filename
+            osNextFileName.clear();
+            osNextFileName.resize(static_cast<size_t>(((nNextFileSize + 511) / 512) * 512));
+            if (VSIFReadL(&osNextFileName[0], osNextFileName.size(), 1, fp) != 1)
+                return FALSE;
+            osNextFileName.resize(static_cast<size_t>(nNextFileSize));
+            if( osNextFileName.back() == '\0' )
+                osNextFileName.resize(osNextFileName.size() - 1);
+        }
+        else
+        {
+            break;
+        }
     }
 
     nCurOffset = VSIFTellL(fp);

From d96ba1b08bbf8b59b47778f71922e4663c1fd4ea Mon Sep 17 00:00:00 2001
From: Even Rouault <even.rouault@spatialys.com>
Date: Wed, 21 Aug 2019 15:36:07 +0200
Subject: [PATCH 378/488] /vsitar/: accept space as end of field terminator

---
 gdal/port/cpl_vsil_tar.cpp | 20 +++++++++++++++-----
 1 file changed, 15 insertions(+), 5 deletions(-)

diff --git a/gdal/port/cpl_vsil_tar.cpp b/gdal/port/cpl_vsil_tar.cpp
index e73de31359a4..1522b8e22b4c 100644
--- a/gdal/port/cpl_vsil_tar.cpp
+++ b/gdal/port/cpl_vsil_tar.cpp
@@ -220,6 +220,16 @@ static void* CPLmemmem(const void *haystack, size_t haystacklen,
 }
 #endif
 
+/************************************************************************/
+/*                       IsNumericFieldTerminator()                     */
+/************************************************************************/
+
+static bool IsNumericFieldTerminator(GByte byVal)
+{
+    // See https://github.com/Keruspe/tar-parser.rs/blob/master/tar.specs#L202
+    return byVal == '\0' || byVal == ' ';
+}
+
 /************************************************************************/
 /*                           GotoNextFile()                             */
 /************************************************************************/
@@ -333,11 +343,11 @@ int VSITarReader::GotoNextFile()
         if (VSIFReadL(abyHeader, 512, 1, fp) != 1)
             return FALSE;
 
-        if (!(abyHeader[100] == 0x80 || abyHeader[107] == '\0') || /* start/end of filemode */
-            !(abyHeader[108] == 0x80 || abyHeader[115] == '\0') || /* start/end of owner ID */
-            !(abyHeader[116] == 0x80 || abyHeader[123] == '\0') || /* start/end of group ID */
-            (abyHeader[135] != '\0' && abyHeader[135] != ' ') || /* end of file size */
-            (abyHeader[147] != '\0' && abyHeader[147] != ' ')) /* end of mtime */
+        if (!(abyHeader[100] == 0x80 || IsNumericFieldTerminator(abyHeader[107])) || /* start/end of filemode */
+            !(abyHeader[108] == 0x80 || IsNumericFieldTerminator(abyHeader[115])) || /* start/end of owner ID */
+            !(abyHeader[116] == 0x80 || IsNumericFieldTerminator(abyHeader[123])) || /* start/end of group ID */
+            !IsNumericFieldTerminator(abyHeader[135]) || /* end of file size */
+            !IsNumericFieldTerminator(abyHeader[147])) /* end of mtime */
         {
             return FALSE;
         }

From 6e574b52d85eef143e488a10bd28a02a1139b8ba Mon Sep 17 00:00:00 2001
From: Even Rouault <even.rouault@spatialys.com>
Date: Sun, 25 Aug 2019 16:11:09 +0200
Subject: [PATCH 379/488] PDF: fix nullptr dereference on corrupted file. Fixes
 https://bugs.chromium.org/p/oss-fuzz/issues/detail?id=16759. Credit to OSS
 Fuzz

---
 gdal/frmts/pdf/pdfreadvectors.cpp | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/gdal/frmts/pdf/pdfreadvectors.cpp b/gdal/frmts/pdf/pdfreadvectors.cpp
index 22ecf1a4ad21..bcde12683fe9 100644
--- a/gdal/frmts/pdf/pdfreadvectors.cpp
+++ b/gdal/frmts/pdf/pdfreadvectors.cpp
@@ -1484,7 +1484,13 @@ void PDFDataset::ExploreContents(GDALPDFObject* poObj,
     {
         GDALPDFArray* poArray = poObj->GetArray();
         for(int i=0;i<poArray->GetLength();i++)
-            ExploreContents(poArray->Get(i), poResources);
+        {
+            GDALPDFObject* poSubObj = poArray->Get(i);
+            if( poSubObj )
+            {
+                ExploreContents(poSubObj, poResources);
+            }
+        }
     }
 
     if (poObj->GetType() != PDFObjectType_Dictionary)
@@ -1560,7 +1566,7 @@ void PDFDataset::ExploreContentsNonStructuredInternal(GDALPDFObject* poContents,
         for(int i=0;i<poArray->GetLength();i++)
         {
             GDALPDFObject* poObj = poArray->Get(i);
-            if( poObj->GetType() != PDFObjectType_Dictionary)
+            if( poObj == nullptr || poObj->GetType() != PDFObjectType_Dictionary)
                 break;
             GDALPDFStream* poStream = poObj->GetStream();
             if (!poStream)

From 5b2ea1230f0dd647f59a85cf94342979b5eb9bc8 Mon Sep 17 00:00:00 2001
From: Even Rouault <even.rouault@spatialys.com>
Date: Wed, 4 Sep 2019 10:07:20 +0200
Subject: [PATCH 380/488] Fix issues with thread_local and C++ objects that
 don't work well with DLL on Windows

See https://developercommunity.visualstudio.com/content/problem/124121/thread-local-variables-fail-to-be-initialized-when.html
---
 gdal/gcore/gdaldataset.cpp  | 108 +++++++++++++++++++++++++-----------
 gdal/port/cpl_multiproc.h   |   4 +-
 gdal/port/cpl_vsil_curl.cpp |  47 ++++++++++++++--
 3 files changed, 122 insertions(+), 37 deletions(-)

diff --git a/gdal/gcore/gdaldataset.cpp b/gdal/gcore/gdaldataset.cpp
index 5af8f4ddc7e9..3be120b2bb95 100644
--- a/gdal/gcore/gdaldataset.cpp
+++ b/gdal/gcore/gdaldataset.cpp
@@ -2558,6 +2558,82 @@ GDALOpen( const char * pszFilename, GDALAccess eAccess )
     return hDataset;
 }
 
+/************************************************************************/
+/*                         AntiRecursionStruct                          */
+/************************************************************************/
+
+namespace {
+// Prevent infinite recursion.
+struct AntiRecursionStruct
+{
+    struct DatasetContext
+    {
+        std::string osFilename;
+        int         nOpenFlags;
+        int         nSizeAllowedDrivers;
+
+        DatasetContext(const std::string& osFilenameIn,
+                        int nOpenFlagsIn,
+                        int nSizeAllowedDriversIn) :
+            osFilename(osFilenameIn),
+            nOpenFlags(nOpenFlagsIn),
+            nSizeAllowedDrivers(nSizeAllowedDriversIn) {}
+    };
+
+    struct DatasetContextCompare {
+        bool operator() (const DatasetContext& lhs, const DatasetContext& rhs) const {
+            return lhs.osFilename < rhs.osFilename ||
+                    (lhs.osFilename == rhs.osFilename &&
+                    (lhs.nOpenFlags < rhs.nOpenFlags ||
+                        (lhs.nOpenFlags == rhs.nOpenFlags &&
+                        lhs.nSizeAllowedDrivers < rhs.nSizeAllowedDrivers)));
+        }
+    };
+
+    std::set<DatasetContext, DatasetContextCompare> aosDatasetNamesWithFlags{};
+    int nRecLevel = 0;
+};
+} // namespace
+
+#ifdef WIN32
+// Currently thread_local and C++ objects don't work well with DLL on Windows
+static void FreeAntiRecursion( void* pData )
+{
+    delete static_cast<AntiRecursionStruct*>(pData);
+}
+
+static AntiRecursionStruct& GetAntiRecursion()
+{
+    static AntiRecursionStruct dummy;
+    int bMemoryErrorOccured = false;
+    void* pData = CPLGetTLSEx(CTLS_GDALOPEN_ANTIRECURSION, &bMemoryErrorOccured);
+    if( bMemoryErrorOccured )
+    {
+        return dummy;
+    }
+    if( pData == nullptr)
+    {
+        auto pAntiRecursion = new AntiRecursionStruct();
+        CPLSetTLSWithFreeFuncEx( CTLS_GDALOPEN_ANTIRECURSION,
+                                 pAntiRecursion,
+                                 FreeAntiRecursion, &bMemoryErrorOccured );
+        if( bMemoryErrorOccured )
+        {
+            delete pAntiRecursion;
+            return dummy;
+        }
+        return *pAntiRecursion;
+    }
+    return *static_cast<AntiRecursionStruct*>(pData);
+}
+#else
+static thread_local AntiRecursionStruct g_tls_antiRecursion;
+static AntiRecursionStruct& GetAntiRecursion()
+{
+    return g_tls_antiRecursion;
+}
+#endif
+
 /************************************************************************/
 /*                             GDALOpenEx()                             */
 /************************************************************************/
@@ -2711,37 +2787,7 @@ GDALDatasetH CPL_STDCALL GDALOpenEx( const char *pszFilename,
                            const_cast<char **>(papszSiblingFiles));
     oOpenInfo.papszAllowedDrivers = papszAllowedDrivers;
 
-    // Prevent infinite recursion.
-    struct AntiRecursionStruct
-    {
-        struct DatasetContext
-        {
-            std::string osFilename;
-            int         nOpenFlags;
-            int         nSizeAllowedDrivers;
-
-            DatasetContext(const std::string& osFilenameIn,
-                           int nOpenFlagsIn,
-                           int nSizeAllowedDriversIn) :
-                osFilename(osFilenameIn),
-                nOpenFlags(nOpenFlagsIn),
-                nSizeAllowedDrivers(nSizeAllowedDriversIn) {}
-        };
-
-        struct DatasetContextCompare {
-            bool operator() (const DatasetContext& lhs, const DatasetContext& rhs) const {
-                return lhs.osFilename < rhs.osFilename ||
-                       (lhs.osFilename == rhs.osFilename &&
-                        (lhs.nOpenFlags < rhs.nOpenFlags ||
-                         (lhs.nOpenFlags == rhs.nOpenFlags &&
-                          lhs.nSizeAllowedDrivers < rhs.nSizeAllowedDrivers)));
-            }
-        };
-
-        std::set<DatasetContext, DatasetContextCompare> aosDatasetNamesWithFlags{};
-        int nRecLevel = 0;
-    };
-    static thread_local AntiRecursionStruct sAntiRecursion;
+    AntiRecursionStruct& sAntiRecursion = GetAntiRecursion();
     if( sAntiRecursion.nRecLevel == 100 )
     {
         CPLError(CE_Failure, CPLE_AppDefined,
diff --git a/gdal/port/cpl_multiproc.h b/gdal/port/cpl_multiproc.h
index b2524fd422cf..29fa6b3578c1 100644
--- a/gdal/port/cpl_multiproc.h
+++ b/gdal/port/cpl_multiproc.h
@@ -207,10 +207,10 @@ class CPL_DLL CPLLockHolder
 #define CTLS_CSVTABLEPTR                 3         /* cpl_csv.cpp */
 #define CTLS_CSVDEFAULTFILENAME          4         /* cpl_csv.cpp */
 #define CTLS_ERRORCONTEXT                5         /* cpl_error.cpp */
-/* 6: unused */
+#define CTLS_VSICURL_CACHEDCONNECTION    6         /* cpl_vsil_curl.cpp */
 #define CTLS_PATHBUF                     7         /* cpl_path.cpp */
 #define CTLS_ABSTRACTARCHIVE_SPLIT       8         /* cpl_vsil_abstract_archive.cpp */
-#define CTLS_UNUSED4                     9
+#define CTLS_GDALOPEN_ANTIRECURSION      9         /* gdaldataset.cpp */
 #define CTLS_CPLSPRINTF                 10         /* cpl_string.h */
 #define CTLS_RESPONSIBLEPID             11         /* gdaldataset.cpp */
 #define CTLS_VERSIONINFO                12         /* gdal_misc.cpp */
diff --git a/gdal/port/cpl_vsil_curl.cpp b/gdal/port/cpl_vsil_curl.cpp
index 3ff228c62a55..cc001218874f 100644
--- a/gdal/port/cpl_vsil_curl.cpp
+++ b/gdal/port/cpl_vsil_curl.cpp
@@ -2336,6 +2336,7 @@ VSICurlFilesystemHandler::VSICurlFilesystemHandler():
 /*                           CachedConnection                           */
 /************************************************************************/
 
+namespace {
 struct CachedConnection
 {
     CURLM          *hCurlMultiHandle = nullptr;
@@ -2343,9 +2344,47 @@ struct CachedConnection
 
     ~CachedConnection() { clear(); }
 };
+} // namespace
+
+#ifdef WIN32
+// Currently thread_local and C++ objects don't work well with DLL on Windows
+static void FreeCachedConnection( void* pData )
+{
+    delete static_cast<std::map<VSICurlFilesystemHandler*, CachedConnection>*>(pData);
+}
 
 // Per-thread and per-filesystem Curl connection cache.
-static thread_local std::map<VSICurlFilesystemHandler*, CachedConnection> cachedConnection;
+static std::map<VSICurlFilesystemHandler*, CachedConnection>& GetConnectionCache()
+{
+    static std::map<VSICurlFilesystemHandler*, CachedConnection> dummyCache;
+    int bMemoryErrorOccured = false;
+    void* pData = CPLGetTLSEx(CTLS_VSICURL_CACHEDCONNECTION, &bMemoryErrorOccured);
+    if( bMemoryErrorOccured )
+    {
+        return dummyCache;
+    }
+    if( pData == nullptr)
+    {
+        auto cachedConnection = new std::map<VSICurlFilesystemHandler*, CachedConnection>();
+        CPLSetTLSWithFreeFuncEx( CTLS_VSICURL_CACHEDCONNECTION,
+                                 cachedConnection,
+                                 FreeCachedConnection, &bMemoryErrorOccured );
+        if( bMemoryErrorOccured )
+        {
+            delete cachedConnection;
+            return dummyCache;
+        }
+        return *cachedConnection;
+    }
+    return *static_cast<std::map<VSICurlFilesystemHandler*, CachedConnection>*>(pData);
+}
+#else
+static thread_local std::map<VSICurlFilesystemHandler*, CachedConnection> g_tls_connectionCache;
+static std::map<VSICurlFilesystemHandler*, CachedConnection>& GetConnectionCache()
+{
+    return g_tls_connectionCache;
+}
+#endif
 
 /************************************************************************/
 /*                              clear()                                 */
@@ -2371,7 +2410,7 @@ VSICurlFilesystemHandler::~VSICurlFilesystemHandler()
     VSICurlFilesystemHandler::ClearCache();
     if( !GDALIsInGlobalDestructor() )
     {
-        cachedConnection.erase(this);
+        GetConnectionCache().erase(this);
     }
 
     if( hMutex != nullptr )
@@ -2406,7 +2445,7 @@ bool VSICurlFilesystemHandler::AllowCachedDataFor(const char* pszFilename)
 
 CURLM* VSICurlFilesystemHandler::GetCurlMultiHandleFor(const CPLString& /*osURL*/)
 {
-    auto& conn = cachedConnection[this];
+    auto& conn = GetConnectionCache()[this];
     if( conn.hCurlMultiHandle == nullptr )
     {
         conn.hCurlMultiHandle = curl_multi_init();
@@ -2590,7 +2629,7 @@ void VSICurlFilesystemHandler::ClearCache()
 
     if( !GDALIsInGlobalDestructor() )
     {
-        cachedConnection[this].clear();
+        GetConnectionCache()[this].clear();
     }
 }
 

From 85ed3f8f2848b76ef8b59d660264eb523bb714b8 Mon Sep 17 00:00:00 2001
From: Even Rouault <even.rouault@spatialys.com>
Date: Fri, 6 Sep 2019 02:00:10 +0200
Subject: [PATCH 381/488] GPX: fix memory leak when streaming to /vsistdout/

---
 gdal/ogr/ogrsf_frmts/gpx/ogrgpxdatasource.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/gdal/ogr/ogrsf_frmts/gpx/ogrgpxdatasource.cpp b/gdal/ogr/ogrsf_frmts/gpx/ogrgpxdatasource.cpp
index b35547727f95..3a9996c45af4 100644
--- a/gdal/ogr/ogrsf_frmts/gpx/ogrgpxdatasource.cpp
+++ b/gdal/ogr/ogrsf_frmts/gpx/ogrgpxdatasource.cpp
@@ -116,8 +116,8 @@ OGRGPXDataSource::~OGRGPXDataSource()
                     VSIFWriteL(szMetadata, 1, strlen(szMetadata), fpOutput);
                 }
             }
-            VSIFCloseL( fpOutput);
         }
+        VSIFCloseL( fpOutput);
     }
 
     for( int i = 0; i < nLayers; i++ )

From 327f91335ae848e9c94bac0c8451522410e5064e Mon Sep 17 00:00:00 2001
From: Even Rouault <even.rouault@spatialys.com>
Date: Wed, 11 Sep 2019 00:45:29 +0200
Subject: [PATCH 382/488] GTiff: make sure that GetMetadataDomainList() doesn't
 return EXIF when there's no EXIF metadata (fixes
 https://github.com/mapbox/rasterio/pull/1740#issuecomment-526660946)

---
 autotest/gcore/tiff_read.py  | 12 ++++++++++++
 gdal/frmts/gtiff/geotiff.cpp |  7 +++++--
 2 files changed, 17 insertions(+), 2 deletions(-)

diff --git a/autotest/gcore/tiff_read.py b/autotest/gcore/tiff_read.py
index 9eaed1d636b9..cf79d588a5ae 100755
--- a/autotest/gcore/tiff_read.py
+++ b/autotest/gcore/tiff_read.py
@@ -3137,3 +3137,15 @@ def test_tiff_read_ModelTiepointTag_z_non_zero_but_ModelPixelScaleTag_z_zero():
     ds = gdal.Open('data/ModelTiepointTag_z_non_zero_but_ModelPixelScaleTag_z_zero.tif')
     assert ds.GetRasterBand(1).GetScale() == 1
     assert ds.GetRasterBand(1).GetOffset() == 0
+
+###############################################################################
+# Check that GetMetadataDomainList() works properly
+
+
+def test_tiff_GetMetadataDomainList():
+
+    ds = gdal.Open('data/byte.tif')
+    mdd1_set = set([x for x in ds.GetMetadataDomainList()])
+    assert mdd1_set == set(['', 'DERIVED_SUBDATASETS', 'IMAGE_STRUCTURE'])
+    mdd2_set = set([x for x in ds.GetMetadataDomainList()])
+    assert mdd1_set == mdd2_set
diff --git a/gdal/frmts/gtiff/geotiff.cpp b/gdal/frmts/gtiff/geotiff.cpp
index 8d6dc5344af8..c5064eae8917 100644
--- a/gdal/frmts/gtiff/geotiff.cpp
+++ b/gdal/frmts/gtiff/geotiff.cpp
@@ -18597,8 +18597,11 @@ void GTiffDataset::LoadEXIFMetadata()
                              nExifOffset, nInterOffset, nGPSOffset );
     }
 
-    oGTiffMDMD.SetMetadata( papszMetadata, "EXIF" );
-    CSLDestroy( papszMetadata );
+    if( papszMetadata )
+    {
+        oGTiffMDMD.SetMetadata( papszMetadata, "EXIF" );
+        CSLDestroy( papszMetadata );
+    }
 }
 
 /************************************************************************/

From 75907bd9e9ebca3cfef3f429f5894938f1ad3a8e Mon Sep 17 00:00:00 2001
From: Even Rouault <even.rouault@spatialys.com>
Date: Thu, 12 Sep 2019 00:09:48 +0200
Subject: [PATCH 383/488] PDF: avoid potential integer division by zero. Fixes
 https://bugs.chromium.org/p/oss-fuzz/issues/detail?id=17129

---
 gdal/frmts/pdf/pdfcreatecopy.cpp | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/gdal/frmts/pdf/pdfcreatecopy.cpp b/gdal/frmts/pdf/pdfcreatecopy.cpp
index d274bd1adffc..a203610689cf 100644
--- a/gdal/frmts/pdf/pdfcreatecopy.cpp
+++ b/gdal/frmts/pdf/pdfcreatecopy.cpp
@@ -1684,8 +1684,8 @@ int GDALPDFWriter::WriteImagery(GDALDataset* poDS,
     /* Does the source image has a color table ? */
     int nColorTableId = WriteColorTable(poDS);
 
-    int nXBlocks = (nWidth + nBlockXSize - 1) / nBlockXSize;
-    int nYBlocks = (nHeight + nBlockYSize - 1) / nBlockYSize;
+    int nXBlocks = DIV_ROUND_UP(nWidth, nBlockXSize);
+    int nYBlocks = DIV_ROUND_UP(nHeight, nBlockYSize);
     int nBlocks = nXBlocks * nYBlocks;
     int nBlockXOff, nBlockYOff;
     for(nBlockYOff = 0; nBlockYOff < nYBlocks; nBlockYOff ++)
@@ -1799,8 +1799,8 @@ int GDALPDFWriter::WriteClippedImagery(
     /* Does the source image has a color table ? */
     int nColorTableId = WriteColorTable(poDS);
 
-    int nXBlocks = (nWidth + nBlockXSize - 1) / nBlockXSize;
-    int nYBlocks = (nHeight + nBlockYSize - 1) / nBlockYSize;
+    int nXBlocks = DIV_ROUND_UP(nWidth, nBlockXSize);
+    int nYBlocks = DIV_ROUND_UP(nHeight, nBlockYSize);
     int nBlocks = nXBlocks * nYBlocks;
     int nBlockXOff, nBlockYOff;
     for(nBlockYOff = 0; nBlockYOff < nYBlocks; nBlockYOff ++)
@@ -4594,7 +4594,7 @@ GDALDataset *GDALPDFCreateCopy( const char * pszFilename,
     if( pszValue != nullptr )
     {
         nBlockXSize = atoi( pszValue );
-        if (nBlockXSize < 0 || nBlockXSize >= nWidth)
+        if (nBlockXSize <= 0 || nBlockXSize >= nWidth)
             nBlockXSize = nWidth;
     }
 
@@ -4602,7 +4602,7 @@ GDALDataset *GDALPDFCreateCopy( const char * pszFilename,
     if( pszValue != nullptr )
     {
         nBlockYSize = atoi( pszValue );
-        if (nBlockYSize < 0 || nBlockYSize >= nHeight)
+        if (nBlockYSize <= 0 || nBlockYSize >= nHeight)
             nBlockYSize = nHeight;
     }
 

From e4c6c107afb5185ccdd56a5a0a0aba1b9c965691 Mon Sep 17 00:00:00 2001
From: Even Rouault <even.rouault@spatialys.com>
Date: Sat, 14 Sep 2019 12:13:43 +0200
Subject: [PATCH 384/488] ENVI: preserve 'byte order' on update (fixes #1796)

---
 .../gdrivers/data/uint16_envi_bigendian.dat   | Bin 0 -> 800 bytes
 .../gdrivers/data/uint16_envi_bigendian.hdr   |  15 ++++++++++
 autotest/gdrivers/envi.py                     |  26 ++++++++++++++++++
 gdal/frmts/raw/envidataset.cpp                |  14 +++++-----
 4 files changed, 48 insertions(+), 7 deletions(-)
 create mode 100644 autotest/gdrivers/data/uint16_envi_bigendian.dat
 create mode 100644 autotest/gdrivers/data/uint16_envi_bigendian.hdr

diff --git a/autotest/gdrivers/data/uint16_envi_bigendian.dat b/autotest/gdrivers/data/uint16_envi_bigendian.dat
new file mode 100644
index 0000000000000000000000000000000000000000..77fe913b81c07022f790b599e7077bc7ce9cc8ed
GIT binary patch
literal 800
zcmYL{A#%kq3`BLl9wF4wFwoS{(9kq6FtD)nU#GC$r~RHk9>s~gTCFyY8ZCO9iXJ1M
zJ*swsXVck=nFzjkyA&hOS`?vRU=<-@f`>XVBQx#Icj~KV%*24AlHI}SOpGhLIJYvY
z!A-@bKp#4n-oNA4nyHU-@^CMy+Ff4C{v>LoMr%i>)q9dV@o+FJ`%s_@Ms^rWJPP|m
z{^MfH_wvSZMim`P23R|6HY&+%7ww0&RrQAn4d?>J`s`?9zB3MGZ-v*M4NuVP8WiIc
zQ_vknR1Kl%3vbDe)N^VF%r^Dye@ZXv4`JLLjoUHMml*jkR)fcO1O;~T$V$|}%AM-T
z$0TS#9U6QSm;AN|<mmRLC*4QhkSke=*nZ<LUaG`%6rlw*zLiW!JX+lAmFp2|-|_7r
G?DZcijK&iH

literal 0
HcmV?d00001

diff --git a/autotest/gdrivers/data/uint16_envi_bigendian.hdr b/autotest/gdrivers/data/uint16_envi_bigendian.hdr
new file mode 100644
index 000000000000..4e1a45618edc
--- /dev/null
+++ b/autotest/gdrivers/data/uint16_envi_bigendian.hdr
@@ -0,0 +1,15 @@
+ENVI
+description = {
+uint16_envi_bigendian.dat}
+samples = 20
+lines   = 20
+bands   = 1
+header offset = 0
+file type = ENVI Standard
+data type = 12
+interleave = bsq
+byte order = 1
+map info = {UTM, 1, 1, 440720, 3751320, 60, 60, 11, North,North America 1927}
+coordinate system string = {PROJCS["NAD_1927_UTM_Zone_11N",GEOGCS["GCS_North_American_1927",DATUM["D_North_American_1927",SPHEROID["Clarke_1866",6378206.4,294.978698213898]],PRIMEM["Greenwich",0.0],UNIT["Degree",0.0174532925199433]],PROJECTION["Transverse_Mercator"],PARAMETER["False_Easting",500000.0],PARAMETER["False_Northing",0.0],PARAMETER["Central_Meridian",-117.0],PARAMETER["Scale_Factor",0.9996],PARAMETER["Latitude_Of_Origin",0.0],UNIT["Meter",1.0]]}
+band names = {
+Band 1}
diff --git a/autotest/gdrivers/envi.py b/autotest/gdrivers/envi.py
index a15d27bb1a35..4a0729bba29b 100755
--- a/autotest/gdrivers/envi.py
+++ b/autotest/gdrivers/envi.py
@@ -375,3 +375,29 @@ def test_envi_gcp():
     assert gcp.GCPY == 4
 
     gdal.GetDriverByName('ENVI').Delete(filename)
+
+###############################################################################
+# Test updating big endian ordered (#1796)
+
+
+def test_envi_bigendian():
+
+    ds = gdal.Open('data/uint16_envi_bigendian.dat')
+    assert ds.GetRasterBand(1).Checksum() == 4672
+    ds = None
+
+    for ext in ('dat', 'hdr'):
+        filename = 'uint16_envi_bigendian.' + ext
+        gdal.FileFromMemBuffer('/vsimem/' + filename,
+                            open('data/' + filename, 'rb').read())
+
+    filename = '/vsimem/uint16_envi_bigendian.dat'
+    ds = gdal.Open(filename, gdal.GA_Update)
+    ds.SetGeoTransform([0, 2, 0, 0, 0, -2])
+    ds = None
+
+    ds = gdal.Open(filename)
+    assert ds.GetRasterBand(1).Checksum() == 4672
+    ds = None
+
+    gdal.GetDriverByName('ENVI').Delete(filename)
diff --git a/gdal/frmts/raw/envidataset.cpp b/gdal/frmts/raw/envidataset.cpp
index 5d99aefd4c3e..1113dc299bdb 100644
--- a/gdal/frmts/raw/envidataset.cpp
+++ b/gdal/frmts/raw/envidataset.cpp
@@ -337,12 +337,6 @@ void ENVIDataset::FlushCache()
         return;
 
     // Rewrite out the header.
-#ifdef CPL_LSB
-    const int iBigEndian = 0;
-#else
-    const int iBigEndian = 1;
-#endif
-
     bool bOK = VSIFPrintfL(fp, "ENVI\n") >= 0;
     if ("" != sDescription)
         bOK &= VSIFPrintfL(fp, "description = {\n%s}\n",
@@ -377,7 +371,13 @@ void ENVIDataset::FlushCache()
         break;
     }
     bOK &= VSIFPrintfL(fp, "interleave = %s\n", pszInterleaving) >= 0;
-    bOK &= VSIFPrintfL(fp, "byte order = %d\n", iBigEndian) >= 0;
+
+    const char* pszByteOrder = m_aosHeader["byte_order"];
+    if( pszByteOrder )
+    {
+        // Supposed to be required
+        bOK &= VSIFPrintfL(fp, "byte order = %s\n", pszByteOrder) >= 0;
+    }
 
     // Write class and color information.
     catNames = band->GetCategoryNames();

From 240b50b5c0bb3d70230292a30579b752d1bb3a71 Mon Sep 17 00:00:00 2001
From: an-ivanov <30471305+an-ivanov@users.noreply.github.com>
Date: Wed, 18 Sep 2019 12:10:33 +0300
Subject: [PATCH 385/488] Memory corruption due to wrong condition logic

    while( (nPair = CPLAtomicInc(&(poJob->nCurPair))) < nPairs ||
           !poJob->bSuccess )
The logic allows accessing poJob->oPairs[nPair] even if nPair >=nPairs in case when !poJob->bSuccess is true
Correct logic should continue the cycle if nPair<nPairs and poJob->bSuccess is true. And break the cycle if nPair>=nPairs or poJob->bSuccess is false.
---
 gdal/frmts/openjpeg/openjpegdataset.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/gdal/frmts/openjpeg/openjpegdataset.cpp b/gdal/frmts/openjpeg/openjpegdataset.cpp
index ba3f7cbacdc6..0ef50b742432 100644
--- a/gdal/frmts/openjpeg/openjpegdataset.cpp
+++ b/gdal/frmts/openjpeg/openjpegdataset.cpp
@@ -519,8 +519,8 @@ void JP2OpenJPEGDataset::JP2OpenJPEGReadBlockInThread(void* userdata)
         return;
     }
 
-    while( (nPair = CPLAtomicInc(&(poJob->nCurPair))) < nPairs ||
-           !poJob->bSuccess )
+    while( (nPair = CPLAtomicInc(&(poJob->nCurPair))) < nPairs &&
+            poJob->bSuccess )
     {
         int nBlockXOff = poJob->oPairs[nPair].first;
         int nBlockYOff = poJob->oPairs[nPair].second;

From bbcc03ccd5fccb87edf2a6a38d4a987fd0b6522e Mon Sep 17 00:00:00 2001
From: Even Rouault <even.rouault@spatialys.com>
Date: Tue, 17 Sep 2019 23:06:11 +0200
Subject: [PATCH 386/488] Add VSIOverwriteFile()

---
 gdal/port/cpl_vsi.h    |  2 ++
 gdal/port/cpl_vsil.cpp | 57 ++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 59 insertions(+)

diff --git a/gdal/port/cpl_vsi.h b/gdal/port/cpl_vsi.h
index 1997b1a33ecd..7fb08e424db0 100644
--- a/gdal/port/cpl_vsi.h
+++ b/gdal/port/cpl_vsi.h
@@ -187,6 +187,8 @@ int CPL_DLL     VSIIngestFile( VSILFILE* fp,
                                vsi_l_offset* pnSize,
                                GIntBig nMaxSize ) CPL_WARN_UNUSED_RESULT;
 
+int CPL_DLL     VSIOverwriteFile( VSILFILE* fpTarget, const char* pszSourceFilename ) CPL_WARN_UNUSED_RESULT;
+
 #if defined(VSI_STAT64_T)
 /** Type for VSIStatL() */
 typedef struct VSI_STAT64_T VSIStatBufL;
diff --git a/gdal/port/cpl_vsil.cpp b/gdal/port/cpl_vsil.cpp
index 72d0657e8101..6be9cf193c0d 100644
--- a/gdal/port/cpl_vsil.cpp
+++ b/gdal/port/cpl_vsil.cpp
@@ -2206,6 +2206,63 @@ int VSIIngestFile( VSILFILE* fp,
     return TRUE;
 }
 
+
+/************************************************************************/
+/*                         VSIOverwriteFile()                           */
+/************************************************************************/
+
+/**
+ * \brief Overwrite an existing file with content from another one
+ *
+ * @param fpTarget file handle opened with VSIFOpenL() with "rb+" flag.
+ * @param pszSourceFilename source filename
+ *
+ * @return TRUE in case of success.
+ *
+ * @since GDAL 3.1
+ */
+
+int VSIOverwriteFile( VSILFILE* fpTarget, const char* pszSourceFilename )
+{
+    VSILFILE* fpSource = VSIFOpenL(pszSourceFilename, "rb");
+    if( fpSource == nullptr )
+    {
+        CPLError(CE_Failure, CPLE_FileIO,
+                 "Cannot open %s", pszSourceFilename);
+        return false;
+    }
+
+    const size_t nBufferSize = 4096;
+    void* pBuffer = CPLMalloc(nBufferSize);
+    VSIFSeekL( fpTarget, 0, SEEK_SET );
+    bool bRet = true;
+    while( true )
+    {
+        size_t nRead = VSIFReadL( pBuffer, 1, nBufferSize, fpSource );
+        size_t nWritten = VSIFWriteL( pBuffer, 1, nRead, fpTarget );
+        if( nWritten != nRead )
+        {
+            bRet = false;
+            break;
+        }
+        if( nRead < nBufferSize )
+            break;
+    }
+
+    if( bRet )
+    {
+        bRet = VSIFTruncateL( fpTarget, VSIFTellL(fpTarget) ) == 0;
+        if( !bRet )
+        {
+            CPLError(CE_Failure, CPLE_FileIO, "Truncation failed");
+        }
+    }
+
+    CPLFree(pBuffer);
+    VSIFCloseL(fpSource);
+    return bRet;
+}
+
 /************************************************************************/
 /*                        VSIFGetNativeFileDescriptorL()                */
 /************************************************************************/

From be5e592bdb87189129f9b10d05d291698ba20d79 Mon Sep 17 00:00:00 2001
From: Even Rouault <even.rouault@spatialys.com>
Date: Wed, 18 Sep 2019 13:14:30 +0200
Subject: [PATCH 387/488] Shapefile driver: use VSIOverwriteFile()

---
 gdal/ogr/ogrsf_frmts/shape/ogrshapelayer.cpp | 38 +-------------------
 1 file changed, 1 insertion(+), 37 deletions(-)

diff --git a/gdal/ogr/ogrsf_frmts/shape/ogrshapelayer.cpp b/gdal/ogr/ogrsf_frmts/shape/ogrshapelayer.cpp
index 6702ba3a8c27..f6669d47942b 100644
--- a/gdal/ogr/ogrsf_frmts/shape/ogrshapelayer.cpp
+++ b/gdal/ogr/ogrsf_frmts/shape/ogrshapelayer.cpp
@@ -2425,43 +2425,7 @@ OGRErr OGRShapeLayer::CreateSpatialIndex( int nMaxDepth )
 
 static bool CopyInPlace( VSILFILE* fpTarget, const CPLString& osSourceFilename )
 {
-    VSILFILE* fpSource = VSIFOpenL(osSourceFilename, "rb");
-    if( fpSource == nullptr )
-    {
-        CPLError(CE_Failure, CPLE_FileIO,
-                 "Cannot open %s", osSourceFilename.c_str());
-        return false;
-    }
-
-    const size_t nBufferSize = 4096;
-    void* pBuffer = CPLMalloc(nBufferSize);
-    VSIFSeekL( fpTarget, 0, SEEK_SET );
-    bool bRet = true;
-    while( true )
-    {
-        size_t nRead = VSIFReadL( pBuffer, 1, nBufferSize, fpSource );
-        size_t nWritten = VSIFWriteL( pBuffer, 1, nRead, fpTarget );
-        if( nWritten != nRead )
-        {
-            bRet = false;
-            break;
-        }
-        if( nRead < nBufferSize )
-            break;
-    }
-
-    if( bRet )
-    {
-        bRet = VSIFTruncateL( fpTarget, VSIFTellL(fpTarget) ) == 0;
-        if( !bRet )
-        {
-            CPLError(CE_Failure, CPLE_FileIO, "Truncation failed");
-        }
-    }
-
-    CPLFree(pBuffer);
-    VSIFCloseL(fpSource);
-    return bRet;
+    return CPL_TO_BOOL(VSIOverwriteFile(fpTarget, osSourceFilename.c_str()));
 }
 
 /************************************************************************/

From cbd05daea632f6a987ef4b6a30da5fd8b191714a Mon Sep 17 00:00:00 2001
From: Even Rouault <even.rouault@spatialys.com>
Date: Tue, 17 Sep 2019 23:07:10 +0200
Subject: [PATCH 388/488] GeoJSON driver: use VSIOverwriteFile() to fix update
 of file on Windows (fixes https://github.com/qgis/QGIS/issues/28580)

---
 autotest/ogr/ogr_geojson.py                   | 23 ++++---
 .../geojson/ogrgeojsondatasource.cpp          | 67 +++++++++++++++----
 2 files changed, 67 insertions(+), 23 deletions(-)

diff --git a/autotest/ogr/ogr_geojson.py b/autotest/ogr/ogr_geojson.py
index 2a50ae8c5b28..74ff3514a263 100755
--- a/autotest/ogr/ogr_geojson.py
+++ b/autotest/ogr/ogr_geojson.py
@@ -2292,17 +2292,18 @@ def test_ogr_geojson_47():
 
     assert 'something' in data
 
-    # Test appending to feature collection with "bbox"
-    gdal.FileFromMemBuffer('/vsimem/ogr_geojson_47.json', """{ "type": "FeatureCollection", "bbox": [0,0,0,0], "features": [ { "type": "Feature", "geometry": { "type": "Point", "coordinates": [0,0]} } ]}""")
-    ds = ogr.Open('/vsimem/ogr_geojson_47.json', update=1)
-    lyr = ds.GetLayer(0)
-    f = ogr.Feature(lyr.GetLayerDefn())
-    lyr.CreateFeature(f)
-    ds = None
-    ds = ogr.Open('/vsimem/ogr_geojson_47.json')
-    lyr = ds.GetLayer(0)
-    assert lyr.GetFeatureCount() == 2
-    ds = None
+    with gdaltest.config_option('OGR_GEOJSON_REWRITE_IN_PLACE', 'YES'):
+        # Test appending to feature collection with "bbox"
+        gdal.FileFromMemBuffer('/vsimem/ogr_geojson_47.json', """{ "type": "FeatureCollection", "bbox": [0,0,0,0], "features": [ { "type": "Feature", "geometry": { "type": "Point", "coordinates": [0,0]} } ]}""")
+        ds = ogr.Open('/vsimem/ogr_geojson_47.json', update=1)
+        lyr = ds.GetLayer(0)
+        f = ogr.Feature(lyr.GetLayerDefn())
+        lyr.CreateFeature(f)
+        ds = None
+        ds = ogr.Open('/vsimem/ogr_geojson_47.json')
+        lyr = ds.GetLayer(0)
+        assert lyr.GetFeatureCount() == 2
+        ds = None
 
     fp = gdal.VSIFOpenL('/vsimem/ogr_geojson_47.json', 'rb')
     if fp is not None:
diff --git a/gdal/ogr/ogrsf_frmts/geojson/ogrgeojsondatasource.cpp b/gdal/ogr/ogrsf_frmts/geojson/ogrgeojsondatasource.cpp
index f64e9e5b0487..ef70174c3ccf 100644
--- a/gdal/ogr/ogrsf_frmts/geojson/ogrgeojsondatasource.cpp
+++ b/gdal/ogr/ogrsf_frmts/geojson/ogrgeojsondatasource.cpp
@@ -1076,22 +1076,65 @@ void OGRGeoJSONDataSource::FlushCache()
                 }
                 if( bOK )
                 {
-                    CPLString osBackup(pszName_);
-                    osBackup += ".bak";
-                    if( VSIRename(pszName_, osBackup) < 0 )
+                    const bool bOverwrite =
+                        CPLTestBool(CPLGetConfigOption("OGR_GEOJSON_REWRITE_IN_PLACE",
+#ifdef WIN32
+                                                       "YES"
+#else
+                                                       "NO"
+#endif
+                                                        ));
+                    if( bOverwrite )
                     {
-                        CPLError(CE_Failure, CPLE_AppDefined,
-                                "Cannot create backup copy");
-                    }
-                    else if( VSIRename(osNewFilename, pszName_) < 0 )
-                    {
-                        CPLError(CE_Failure, CPLE_AppDefined,
-                                "Cannot rename %s to %s",
-                                osNewFilename.c_str(), pszName_);
+                        VSILFILE* fpTarget = nullptr;
+                        for( int attempt = 0; attempt < 10; attempt++ )
+                        {
+                            fpTarget = VSIFOpenL(pszName_, "rb+");
+                            if( fpTarget )
+                                break;
+                            CPLSleep(0.1);
+                        }
+                        if( !fpTarget )
+                        {
+                            CPLError(CE_Failure, CPLE_AppDefined,
+                                     "Cannot rewrite %s", pszName_);
+                        }
+                        else
+                        {
+                            const bool bCopyOK = CPL_TO_BOOL(
+                                VSIOverwriteFile(fpTarget, osNewFilename));
+                            VSIFCloseL(fpTarget);
+                            if( bCopyOK )
+                            {
+                                VSIUnlink(osNewFilename);
+                            }
+                            else
+                            {
+                                CPLError(CE_Failure, CPLE_AppDefined,
+                                         "Cannot rewrite %s with content of %s",
+                                         pszName_, osNewFilename.c_str());
+                            }
+                        }
                     }
                     else
                     {
-                        VSIUnlink(osBackup);
+                        CPLString osBackup(pszName_);
+                        osBackup += ".bak";
+                        if( VSIRename(pszName_, osBackup) < 0 )
+                        {
+                            CPLError(CE_Failure, CPLE_AppDefined,
+                                    "Cannot create backup copy");
+                        }
+                        else if( VSIRename(osNewFilename, pszName_) < 0 )
+                        {
+                            CPLError(CE_Failure, CPLE_AppDefined,
+                                    "Cannot rename %s to %s",
+                                    osNewFilename.c_str(), pszName_);
+                        }
+                        else
+                        {
+                            VSIUnlink(osBackup);
+                        }
                     }
                 }
             }

From bb9bc595e2f5c933fe991d10c5b13d59f7dca2bc Mon Sep 17 00:00:00 2001
From: Even Rouault <even.rouault@spatialys.com>
Date: Thu, 19 Sep 2019 12:27:18 +0200
Subject: [PATCH 389/488] JP2OpenJPEG: fix reading overviews, when tiled API is
 used, and the dimensions of the full resolution image are not a multiple of
 2^numresolutions (fixes #1860)

---
 autotest/gdrivers/jp2openjpeg.py        | 16 ++++++++++++++++
 gdal/frmts/openjpeg/openjpegdataset.cpp |  5 +++--
 2 files changed, 19 insertions(+), 2 deletions(-)

diff --git a/autotest/gdrivers/jp2openjpeg.py b/autotest/gdrivers/jp2openjpeg.py
index dba69a208455..6fa3f719eb64 100755
--- a/autotest/gdrivers/jp2openjpeg.py
+++ b/autotest/gdrivers/jp2openjpeg.py
@@ -3088,6 +3088,22 @@ def test_jp2openjpeg_external_overviews_multiple_band():
     assert cs == [6233, 7706, 26085]
 
 ###############################################################################
+# Test accessing overview levels when the dimensions of the full resolution
+# image are not a multiple of 2^numresolutions
+
+
+def test_jp2openjpeg_odd_dimensions():
+
+    if gdaltest.jp2openjpeg_drv is None:
+        pytest.skip()
+
+    ds = gdal.Open('data/513x513.jp2')
+    cs = ds.GetRasterBand(1).GetOverview(0).Checksum()
+    ds = None
+
+    assert cs == 29642
+
+###############################################################################
 
 
 def test_jp2openjpeg_cleanup():
diff --git a/gdal/frmts/openjpeg/openjpegdataset.cpp b/gdal/frmts/openjpeg/openjpegdataset.cpp
index 0ef50b742432..2baa95b17bcc 100644
--- a/gdal/frmts/openjpeg/openjpegdataset.cpp
+++ b/gdal/frmts/openjpeg/openjpegdataset.cpp
@@ -2152,8 +2152,9 @@ GDALDataset *JP2OpenJPEGDataset::Open( GDALOpenInfo * poOpenInfo )
            (nW > 128 || nH > 128) &&
            (poDS->bUseSetDecodeArea || ((nTileW % 2) == 0 && (nTileH % 2) == 0)))
     {
-        nW /= 2;
-        nH /= 2;
+        // This must be this exact formula per the JPEG2000 standard
+        nW = (nW + 1) / 2;
+        nH = (nH + 1) / 2;
 
         poDS->papoOverviewDS = (JP2OpenJPEGDataset**) CPLRealloc(
                     poDS->papoOverviewDS,

From adf7f158e696f0f6bbf5f0a8e1573e6ef3b5b7f7 Mon Sep 17 00:00:00 2001
From: Even Rouault <even.rouault@spatialys.com>
Date: Thu, 19 Sep 2019 13:48:51 +0200
Subject: [PATCH 390/488] WFS3: correctly handle user query string parameters
 in connection URL (fixes #1710)

---
 autotest/ogr/ogr_wfs3.py                   |  8 ++++----
 gdal/ogr/ogrsf_frmts/wfs/ogrwfs3driver.cpp | 22 +++++++++++++++++++++-
 2 files changed, 25 insertions(+), 5 deletions(-)

diff --git a/autotest/ogr/ogr_wfs3.py b/autotest/ogr/ogr_wfs3.py
index b14ad7475ee1..8ecefe1b8bf6 100755
--- a/autotest/ogr/ogr_wfs3.py
+++ b/autotest/ogr/ogr_wfs3.py
@@ -129,7 +129,7 @@ def test_ogr_wfs3_errors():
 ###############################################################################
 
 
-def test_ogr_wfs3_empty_layer():
+def test_ogr_wfs3_empty_layer_and_user_query_parameters():
     if gdaltest.wfs3_drv is None:
         pytest.skip()
 
@@ -137,18 +137,18 @@ def test_ogr_wfs3_empty_layer():
         pytest.skip()
 
     handler = webserver.SequentialHandler()
-    handler.add('GET', '/wfs3/collections', 200,
+    handler.add('GET', '/wfs3/collections?FOO=BAR', 200,
                 {'Content-Type': 'application/json'},
                 '{ "collections" : [ { "name": "foo" }] }')
     with webserver.install_http_handler(handler):
-        ds = ogr.Open('WFS3:http://localhost:%d/wfs3' % gdaltest.webserver_port)
+        ds = ogr.Open('WFS3:http://localhost:%d/wfs3?FOO=BAR' % gdaltest.webserver_port)
     assert ds is not None
     assert ds.GetLayerCount() == 1
     lyr = ds.GetLayer(0)
     assert lyr.GetName() == 'foo'
 
     handler = webserver.SequentialHandler()
-    handler.add('GET', '/wfs3/collections/foo/items?limit=10', 200,
+    handler.add('GET', '/wfs3/collections/foo/items?limit=10&FOO=BAR', 200,
                 {'Content-Type': 'application/geo+json'},
                 '{ "type": "FeatureCollection", "features": [] }')
     with webserver.install_http_handler(handler):
diff --git a/gdal/ogr/ogrsf_frmts/wfs/ogrwfs3driver.cpp b/gdal/ogr/ogrsf_frmts/wfs/ogrwfs3driver.cpp
index 460e3076a1ed..5dfe76fec62d 100644
--- a/gdal/ogr/ogrsf_frmts/wfs/ogrwfs3driver.cpp
+++ b/gdal/ogr/ogrsf_frmts/wfs/ogrwfs3driver.cpp
@@ -50,6 +50,7 @@ class OGRWFS3Dataset final: public GDALDataset
         friend class OGRWFS3Layer;
 
         CPLString                              m_osRootURL;
+        CPLString                              m_osUserQueryParams;
         CPLString                              m_osUserPwd;
         int                                    m_nPageSize = 10;
         std::vector<std::unique_ptr<OGRLayer>> m_apoLayers;
@@ -176,7 +177,20 @@ bool OGRWFS3Dataset::Download(
         papszOptions = CSLSetNameValue(papszOptions,
                                        "USERPWD", m_osUserPwd.c_str());
     }
-    CPLHTTPResult* psResult = CPLHTTPFetch(osURL, papszOptions);
+    CPLString osURLWithQueryParameters(osURL);
+    if( !m_osUserQueryParams.empty() )
+    {
+        if( osURL.find('?') == std::string::npos )
+        {
+            osURLWithQueryParameters += '?';
+        }
+        else
+        {
+            osURLWithQueryParameters += '&';
+        }
+        osURLWithQueryParameters += m_osUserQueryParams;
+    }
+    CPLHTTPResult* psResult = CPLHTTPFetch(osURLWithQueryParameters, papszOptions);
     CSLDestroy(papszOptions);
     if( !psResult )
         return false;
@@ -313,6 +327,12 @@ bool OGRWFS3Dataset::Open(GDALOpenInfo* poOpenInfo)
     m_osRootURL =
         CSLFetchNameValueDef(poOpenInfo->papszOpenOptions, "URL",
             poOpenInfo->pszFilename + strlen("WFS3:"));
+    auto nPosQuotationMark = m_osRootURL.find('?');
+    if( nPosQuotationMark != std::string::npos )
+    {
+        m_osUserQueryParams = m_osRootURL.substr(nPosQuotationMark + 1);
+        m_osRootURL.resize(nPosQuotationMark);
+    }
     m_nPageSize = atoi( CSLFetchNameValueDef(poOpenInfo->papszOpenOptions,
                             "PAGE_SIZE",CPLSPrintf("%d", m_nPageSize)) );
     m_osUserPwd =

From 08399afd092d1fd3c6df2c7ae8d5439b8f7fcc89 Mon Sep 17 00:00:00 2001
From: Even Rouault <even.rouault@spatialys.com>
Date: Thu, 19 Sep 2019 14:59:42 +0200
Subject: [PATCH 391/488] Add autotest/gdrivers/data/513x513.jp2 that should
 have gone with ed5fefc1b5ec7aeeec73af4cd687ec958cd5ad3c

---
 autotest/gdrivers/data/513x513.jp2 | Bin 0 -> 2901 bytes
 1 file changed, 0 insertions(+), 0 deletions(-)
 create mode 100644 autotest/gdrivers/data/513x513.jp2

diff --git a/autotest/gdrivers/data/513x513.jp2 b/autotest/gdrivers/data/513x513.jp2
new file mode 100644
index 0000000000000000000000000000000000000000..bb8b25625ebcfb9dca6e8027d989c73dcae847ce
GIT binary patch
literal 2901
zcmb7G&2Jk;6rXiWoQ6=aAT6qT7`bpLH2dXzdDU2H-6W(<Qj-+g1DB0=Y;UyQF|+H~
zL6wLADHnv0xBv%EP>BOn5fb8p)FTJP1tHWMT=*M$GjC?r&aPuov)1g4-}}vbzxUqE
z>>z}u_R1JPH+eLP5PG>99yIrwCWbNM{a&-f$J30Fca=wnD2398sI&|sgk}IxhyI*f
zcNjt`MKmRo5!&Y~)MFrmCyS60wpy-peCx^26HB*B-+ce^pMN~~ZESu0HN@Q_bQU0E
zh{HvTjZ@Kh0(4_B`FL!cRnlS}$4tlM=VIgY5r*5p7?Yp<a0-oq>?Kfq@X-_+hw&8{
zKRg;k7{)(AJ3dOGi_kxT#ves^gE-T245o!Fl|DY2=K6`_qj5Bi#(|K6KDmUZcz?H^
z7X9T*Ti0%w3s}Q%-Py$NQJ-ML*t#!-_tD<#-+uS?kE!KeFC0GQwfxV8YaH_HR~w?2
z@XX(KKr1lLdb=L3H9Xa^LmU2Qeu)$pdJ0BqIOF<3X!{ky5f3^I4_}2j)+({X79%C<
zd887$)Stu{gVql$P%q``Vc4`Zt=(>`v`PG$8>l`BHPGcwke$FyAlrGBvYKY<x}n|M
z+}NqqNyF|FkP`#f3WR)vR&4G#VPU`*j%dgk!5|eauNtbMH5skC9tk+Rn`N^s|7wP+
zt9nwVb^<3?gaAYic4^CZh;#jbOCs5dzfU}1fddw7*$uLkYcb!VwTk7Cs#RfuwNl<$
zvn+Fd!7zlW{#1{)2`f?N6IPs^)fY@1=NIO5!_=>G7FJv@97Zl%&1P(#QIPYDd~aS{
zFNq3sJ*FZYAxXp|BCN_PZ<59?kUEL-RQ07UA~a-HKgeyqTB<H_)|l&*=ssa~jbO)Z
z5I+#bG;@4STCTH{+g>Z_uoU`P>KkEkBR6QncKsd!j)`a_TqRv3(GlKr8*Ug3sv;$)
z8_$^ZbMhAHf(jLNd{VB{wjyhFw^lFC8777%iz_5iRby5~UH;2=v^0iN7o6;lD;8q0
zBcc8O1J07*gAu@#xwXN>bLzrUnYw=1uVh)&@&E0KlPp9gn>3L70`}~DVXmOh&*u3K
zG4jTux|r8z^+JAL^5)Qi_`rxrrXV(`l&awYiEwDO8j$d9Sa+0-7>23l^95tkFc;_N
zW(x~OZ(YPqo#MflejG5OFCEVex{E@J@lHCE`otcI1El&X8%?B!*?x`ekT5<ws@N)=
zs!4IA5Oc~lg99=oEYOC6_?gU)&>|!S?iBDfsZfUmAtQD}i#AywGf-{8j4O9S)~fI?
zRS`m^%)#qEc=U+9PaGLz5|ywc0jmR1M5#Fywv;C_+B@KS@kJhooT_4N4n0<f&XK|)
zc=$>yUqZGj-P_$a(Pg-q^=@FGk&gl$Z_%S<6s5b3&VmRoFlo56eEvoE9rWz=H(t5>
zJN$OL4tf<SB}jWn9K3sgZ^H-uW_e`|!|BZrZ47Hq)w`cYm$oZN>3;Ut)Z-tj+47x-
z-S<zwk-%~eqhcWpbY9xMcbIKw+tLKTp^a(+0vj3o%y4)764+;Prgo+#S@4_f5HY`Y
PzQ{R0df_mGx{v<_tMUPT

literal 0
HcmV?d00001


From e7f351e87bf5891f5ecbc52d835a3265f1ac3db6 Mon Sep 17 00:00:00 2001
From: Even Rouault <even.rouault@spatialys.com>
Date: Thu, 26 Sep 2019 18:25:47 +0200
Subject: [PATCH 392/488] OGR SQLite: do not propagate 'IS / IS NOT value'
 constructs to OGR SQL

---
 autotest/ogr/ogr_sql_sqlite.py                      | 5 +++++
 gdal/ogr/ogrsf_frmts/sqlite/ogrsqlitevirtualogr.cpp | 8 ++++----
 2 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/autotest/ogr/ogr_sql_sqlite.py b/autotest/ogr/ogr_sql_sqlite.py
index 13c929fc13f1..90c51ae3e74c 100755
--- a/autotest/ogr/ogr_sql_sqlite.py
+++ b/autotest/ogr/ogr_sql_sqlite.py
@@ -219,6 +219,9 @@ def test_ogr_sql_sqlite_1():
                      "OGR_STYLE = 'cool_style'",
                      'intfield = 2 AND doublefield = 3.45',
                      'ROWID = 0',
+                     'intfield IS 2',
+                     'intfield IS NOT 10000',
+                     'intfield IS NOT NULL',
                      "\"from\" = 'from_val'"]:
             sql_lyr = ds.ExecuteSQL("SELECT * FROM my_layer WHERE " + cond, dialect='SQLite')
             feat = sql_lyr.GetNextFeature()
@@ -232,6 +235,8 @@ def test_ogr_sql_sqlite_1():
                      "strfield = 'XXX'", "strfield > 'bas'", "strfield >= 'bas'", "strfield < 'bar'", "strfield <= 'baq'",
                      'intfield = 2 AND doublefield = 0',
                      'ROWID = 10000',
+                     'intfield IS 10000',
+                     'intfield IS NOT 2',
                      "\"from\" = 'other_val'"]:
             sql_lyr = ds.ExecuteSQL("SELECT * FROM my_layer WHERE " + cond, dialect='SQLite')
             feat = sql_lyr.GetNextFeature()
diff --git a/gdal/ogr/ogrsf_frmts/sqlite/ogrsqlitevirtualogr.cpp b/gdal/ogr/ogrsf_frmts/sqlite/ogrsqlitevirtualogr.cpp
index d53098418245..f333877a06d0 100644
--- a/gdal/ogr/ogrsf_frmts/sqlite/ogrsqlitevirtualogr.cpp
+++ b/gdal/ogr/ogrsf_frmts/sqlite/ogrsqlitevirtualogr.cpp
@@ -724,10 +724,10 @@ static bool OGR2SQLITE_IsHandledOp(int op)
 #ifdef SQLITE_INDEX_CONSTRAINT_NE
             /* SQLite >= 3.21 */
         case SQLITE_INDEX_CONSTRAINT_NE: return true;
-        case SQLITE_INDEX_CONSTRAINT_ISNOT: return true;
+        case SQLITE_INDEX_CONSTRAINT_ISNOT: return false; // OGR SQL only handles IS [NOT] NULL
         case SQLITE_INDEX_CONSTRAINT_ISNOTNULL: return true;
         case SQLITE_INDEX_CONSTRAINT_ISNULL: return true;;
-        case SQLITE_INDEX_CONSTRAINT_IS: return true;
+        case SQLITE_INDEX_CONSTRAINT_IS: return false; // OGR SQL only handles IS [NOT] NULL
 #endif
         default: break;
     }
@@ -1069,10 +1069,10 @@ int OGR2SQLITE_Filter(sqlite3_vtab_cursor* pCursor,
 #ifdef SQLITE_INDEX_CONSTRAINT_NE
             /* SQLite >= 3.21 */
             case SQLITE_INDEX_CONSTRAINT_NE: osAttributeFilter += " <> "; break;
-            case SQLITE_INDEX_CONSTRAINT_ISNOT: osAttributeFilter += " IS NOT "; break;
+            //case SQLITE_INDEX_CONSTRAINT_ISNOT: osAttributeFilter += " IS NOT "; break;
             case SQLITE_INDEX_CONSTRAINT_ISNOTNULL: osAttributeFilter += " IS NOT NULL"; bExpectRightOperator = false; break;
             case SQLITE_INDEX_CONSTRAINT_ISNULL: osAttributeFilter += " IS NULL"; bExpectRightOperator = false; break;
-            case SQLITE_INDEX_CONSTRAINT_IS: osAttributeFilter += " IS "; break;
+            //case SQLITE_INDEX_CONSTRAINT_IS: osAttributeFilter += " IS "; break;
 #endif
             default:
             {

From ffc0ed818f31356de6e2c18b990a30278192af0b Mon Sep 17 00:00:00 2001
From: Even Rouault <even.rouault@spatialys.com>
Date: Thu, 26 Sep 2019 21:26:24 +0200
Subject: [PATCH 393/488] JP2OpenJPEG: correctly set coordinates to
 opj_set_decode_area() on overviews (linked to previous fix)

---
 .../data/single_block_32769_16385.jp2         | Bin 0 -> 9829 bytes
 autotest/gdrivers/jp2openjpeg.py              |  18 ++++++++++++++++++
 gdal/frmts/openjpeg/openjpegdataset.cpp       |  14 ++++++++++----
 3 files changed, 28 insertions(+), 4 deletions(-)
 create mode 100644 autotest/gdrivers/data/single_block_32769_16385.jp2

diff --git a/autotest/gdrivers/data/single_block_32769_16385.jp2 b/autotest/gdrivers/data/single_block_32769_16385.jp2
new file mode 100644
index 0000000000000000000000000000000000000000..bbf9855045ba16fa5b761d21bb0f02cce3275591
GIT binary patch
literal 9829
zcmeHJUuYaf7@tjI5=(4JF;!|GmefA<-`?(Ra{p|uZLUp7`tNM2^}(0T?cCjlyPb1(
zFS$t3LxXvdTCG~8Af-@WglYuA2c<`!MFbJir-CAgFFut*!1J5gz02<9u<=b~cG%t7
z@B7X7=l9Lb4nk;XAuG#|ZCl-j5PCB2E>{*RQ5pJ(y%#Dq)*qo1za%y4s0a1cQRWzk
z5IPKiBD{B5MUx_QOhTwGA!%TMYj@;GiGm2OVT2^NTD8ozQxCo#oH&)ab^Fa9fB5*@
z-kF&Lh`B{*J3x97gY!Gk@A3PCpz96D`vd)9sgI9in2~^dSD^odk74%r1mxRaA40t#
zdmI$6tqh@l=pTaqr>nh4hW?juudVi=J@9@2H@hH9ctW0iULQ<zSx?{E>Il;huC4Z?
z5!4R>N$B!kG{oK)i+%jPfA87jC!%pVB0qQGjQldOv8-ulFLB`|w9uTb|9t1>(d_y`
z>5Ds`A7%a?b{+d|_i={#=A+a6?coQ0Hyo0K{%~o&Bp1ph#WY+4z6ZYZ6}wvsN{D;d
zvK`m3bC@A+*UBaN2#iThVZ*IboFSzW&bbz`x5=^$TH8s1dSbNbx|LKUvb40MkP5a7
zmZR9%jeu@+16gyd5OPUZ2rWdSs;Wg^ICFX~SHxwb9e_8`u~H6~pC&njISyIq@Fn|U
zcq5$7P$IgbDO#jLN!}`9hebD=jb^>ih^DBD8kQ+F#~e*V0-S?+QngKNPA)TvFFR>3
z;u1t5JJdOAl<~x9mD(v%$fZo2PvxkSI+>lDPNkx;xTbMa?V%;IglUFQ8`JdIm>Q3&
zvK}8-wWxZ8MUe{XxkKM&wNeR;(~{meO>d10>b*d@xmKh+9WDvw!!yi#RX&5u^AOZV
zmYb^Y>HL7YjA|!&p3RoLh0SSdnHjQ(sZqePX_c|<@M1<s*_=#S=EUgv>5K|fq0Lg;
z2n`xJLCS_@w*p`oKa7y8u!}I-$Cs?K<vN`zU&+D^GUoZ&cyhX+LTOdrDA#6NzO|xN
zD5mvjJeH8Pn4TE(3e2T`WdoLZZT`u>KRvpJ&*L&`7N3ming?xvcQ^}!m$v{W)GBn6
z&qC*xvc$68b~UrSmj7;DY_Q;)tPsav8;YtWbTyewB-kp^bS<eQW4fNuG@nfd?Z^*|
za58ydok~yDJt3YB$>$yHJ`Zz`&@H9`8;Bl@X~|?99&uG0A8*Z$ps`JnumunVY}K25
z7#zm+s2-1N@v-RGSX__!X$4{ryYuv+wGsq)>W3^iP7gKg0-nQeaI{~wDcD`ZVqd|>
zWDN=%rHiQ(=?Y?dGuukjKnt8L;IEP+CU#tkjdH|aY;8<O#d%~*Ip@-9j{ULHkSd|3
zJY$2$5;hjG>E#$kh3t5Msg5jsYBr_q$wQ2`Ho8`RzQ-=RE1#cTx7V&?JYg3+{H^!g
z1h#U`bIoVbemJ4AQy4#ufr?)p-_n32HP6FAi5*G?`{3;I_B&VKeeeBiAAHz+5sgp2
zg)Y}wd!qrZ{>nXQHx~bd)*y%=`(7ant(biT+VsWmq0Ki<v=2!csFRCLd45?w2Pc8q
z?8#{vwtcqS%TYyF)aDiMwD;6~BsH(z+wto&>y5^6_QEH|_3L$rRK0So`Ue_%df#6M
z?!zZ^9zFP#fC)mx3=wNVYz|_#6#oVBqZCJi|IQgnTW{2dYx*yZ8*p5^J9+4C|IVH3
ziO-O<vhwPH1~PF81_T3w0l|P^KrkQ}5DW+g1OtKr!GK^uFd!HZ4E+BYX#Vs!xD{zO

literal 0
HcmV?d00001

diff --git a/autotest/gdrivers/jp2openjpeg.py b/autotest/gdrivers/jp2openjpeg.py
index 6fa3f719eb64..2feb321e87e4 100755
--- a/autotest/gdrivers/jp2openjpeg.py
+++ b/autotest/gdrivers/jp2openjpeg.py
@@ -3106,6 +3106,24 @@ def test_jp2openjpeg_odd_dimensions():
 ###############################################################################
 
 
+def test_jp2openjpeg_odd_dimensions_overviews():
+
+    if gdaltest.jp2openjpeg_drv is None:
+        pytest.skip()
+
+    # Only try the rest with openjpeg >= 2.3 to avoid potential memory issues
+    if gdaltest.jp2openjpeg_drv.GetMetadataItem('DMD_CREATIONOPTIONLIST').find('CODEBLOCK_STYLE') < 0:
+        pytest.skip()
+
+    # Check that we don't request outside of the full resolution coordinates
+    ds = gdal.Open('data/single_block_32769_16385.jp2')
+    assert ds.ReadRaster(0,0,ds.RasterXSize,ds.RasterYSize,2049,1025)
+    assert gdal.GetLastErrorMsg() == ''
+    ds = None
+
+###############################################################################
+
+
 def test_jp2openjpeg_cleanup():
 
     gdaltest.reregister_all_jpeg2000_drivers()
diff --git a/gdal/frmts/openjpeg/openjpegdataset.cpp b/gdal/frmts/openjpeg/openjpegdataset.cpp
index 2baa95b17bcc..082791eb8445 100644
--- a/gdal/frmts/openjpeg/openjpegdataset.cpp
+++ b/gdal/frmts/openjpeg/openjpegdataset.cpp
@@ -210,6 +210,8 @@ class JP2OpenJPEGDataset final: public GDALJP2AbstractDataset
 
     int         bIs420 = FALSE;
 
+    int         nParentXSize = 0;
+    int         nParentYSize = 0;
     int         iLevel = 0;
     int         nOverviewCount = 0;
     JP2OpenJPEGDataset** papoOverviewDS = nullptr;
@@ -917,10 +919,10 @@ CPLErr JP2OpenJPEGDataset::ReadBlock( int nBand, VSILFILE* fpIn,
         /* The decode area must be expressed in grid reference, ie at full*/
         /* scale */
         if (!opj_set_decode_area(pCodec,psImage,
-                                 (nBlockXOff*nBlockXSize) << iLevel,
-                                 (nBlockYOff*nBlockYSize) << iLevel,
-                                 (nBlockXOff*nBlockXSize+nWidthToRead) << iLevel,
-                                 (nBlockYOff*nBlockYSize+nHeightToRead) << iLevel))
+                                 static_cast<int>(static_cast<GIntBig>(nBlockXOff*nBlockXSize) * nParentXSize / nRasterXSize),
+                                 static_cast<int>(static_cast<GIntBig>(nBlockYOff*nBlockYSize) * nParentYSize / nRasterYSize),
+                                 static_cast<int>(static_cast<GIntBig>(nBlockXOff*nBlockXSize+nWidthToRead) * nParentXSize / nRasterXSize),
+                                 static_cast<int>(static_cast<GIntBig>(nBlockYOff*nBlockYSize+nHeightToRead) * nParentYSize / nRasterYSize)))
         {
             CPLError(CE_Failure, CPLE_AppDefined, "opj_set_decode_area() failed");
             eErr = CE_Failure;
@@ -2132,6 +2134,8 @@ GDALDataset *JP2OpenJPEGDataset::Open( GDALOpenInfo * poOpenInfo )
 /* -------------------------------------------------------------------- */
     int nW = poDS->nRasterXSize;
     int nH = poDS->nRasterYSize;
+    poDS->nParentXSize = poDS->nRasterXSize;
+    poDS->nParentYSize = poDS->nRasterYSize;
 
     /* Lower resolutions are not compatible with a color-table */
     if( poCT != nullptr )
@@ -2160,6 +2164,8 @@ GDALDataset *JP2OpenJPEGDataset::Open( GDALOpenInfo * poOpenInfo )
                     poDS->papoOverviewDS,
                     (poDS->nOverviewCount + 1) * sizeof(JP2OpenJPEGDataset*));
         JP2OpenJPEGDataset* poODS = new JP2OpenJPEGDataset();
+        poODS->nParentXSize = poDS->nRasterXSize;
+        poODS->nParentYSize = poDS->nRasterYSize;
         poODS->SetDescription( poOpenInfo->pszFilename );
         poODS->iLevel = poDS->nOverviewCount + 1;
         poODS->bSingleTiled = poDS->bSingleTiled;

From 44bf61736c7d049637c0dfcaa021b163872acaaa Mon Sep 17 00:00:00 2001
From: Even Rouault <even.rouault@spatialys.com>
Date: Mon, 30 Sep 2019 16:53:43 +0200
Subject: [PATCH 394/488] USGSDEM: fix reading FEMA generated Lidar datasets
 whose header is 918 bytes large

---
 .../data/fema06-140cm_2995441b_truncated.dem      |  2 ++
 autotest/gdrivers/usgsdem.py                      | 15 +++++++++++++++
 gdal/frmts/usgsdem/usgsdemdataset.cpp             | 14 +++++++++++---
 3 files changed, 28 insertions(+), 3 deletions(-)
 create mode 100644 autotest/gdrivers/data/fema06-140cm_2995441b_truncated.dem

diff --git a/autotest/gdrivers/data/fema06-140cm_2995441b_truncated.dem b/autotest/gdrivers/data/fema06-140cm_2995441b_truncated.dem
new file mode 100644
index 000000000000..e318c6b70bf5
--- /dev/null
+++ b/autotest/gdrivers/data/fema06-140cm_2995441b_truncated.dem
@@ -0,0 +1,2 @@
+u299544_1_a                             DEM derived from LIDAR data, Sanborn                                 -0953334.4196 0292028.90687    CONT     1     1     1    15   0.000000000000000D+00   0.000000000000000D+00   0.000000000000000D+00   0.000000000000000D+00   0.000000000000000D+00   0.000000000000000D+00   0.000000000000000D+00   0.000000000000000D+00   0.000000000000000D+00   0.000000000000000D+00   0.000000000000000D+00   0.000000000000000D+00   0.000000000000000D+00   0.000000000000000D+00   0.000000000000000D+00     2     2     4   0.248500700000000D+06   0.324859430000000D+07   0.248500700000000D+06   0.325250730000000D+07   0.251479900000000D+06   0.325250730000000D+07   0.251479900000000D+06   0.324859430000000D+07   0.114999997615814D+01   0.195900001525879D+02   0.000000000000000D+00     10.140000E+010.140000E+010.184400E-02     1  2129           220062006I0 2 3 4  01   9                
+     1     1  2796     1   0.248500700000000D+06   0.324859430000000D+07       1.149999976158142   0.13159
\ No newline at end of file
diff --git a/autotest/gdrivers/usgsdem.py b/autotest/gdrivers/usgsdem.py
index 02a5155aa178..93bb3cd2e016 100755
--- a/autotest/gdrivers/usgsdem.py
+++ b/autotest/gdrivers/usgsdem.py
@@ -224,6 +224,21 @@ def test_usgsdem_with_spaces_after_byte_864():
     tst = gdaltest.GDALTest('USGSDEM', 'usgsdem_with_spaces_after_byte_864.dem', 1, 61078)
     return tst.testOpen()
 
+###############################################################################
+# Test truncated version of https://s3.amazonaws.com/data.tnris.org/8ea19b45-7a66-4e95-9833-f9e89611d106/resources/fema06-140cm-coastal_2995441_dem.zip
+# downloaded from https://data.tnris.org/collection/8ea19b45-7a66-4e95-9833-f9e89611d106
+
+
+def test_usgsdem_with_header_of_918_bytes():
+
+    tst = gdaltest.GDALTest('USGSDEM', 'fema06-140cm_2995441b_truncated.dem', 1, 0)
+    srs = osr.SpatialReference()
+    srs.SetWellKnownGeogCS('NAD83')
+    srs.SetUTM(15)
+    with gdaltest.error_handler():
+        return tst.testOpen(check_prj=srs.ExportToWkt(),
+                            check_gt=(248500.0, 1.4, 0.0, 3252508.7, 0.0, -1.4))
+
 ###############################################################################
 # Cleanup
 
diff --git a/gdal/frmts/usgsdem/usgsdemdataset.cpp b/gdal/frmts/usgsdem/usgsdemdataset.cpp
index bbcade005b6a..e13beac5efdf 100644
--- a/gdal/frmts/usgsdem/usgsdemdataset.cpp
+++ b/gdal/frmts/usgsdem/usgsdemdataset.cpp
@@ -601,9 +601,17 @@ int USGSDEMDataset::LoadFromFile(VSILFILE *InDem)
             j = ReadInt(InDem);
             if ( i != 1 || j != 1 )  // File OK?
             {
-                CPLError( CE_Failure, CPLE_AppDefined,
-                          "Does not appear to be a USGS DEM file." );
-                return FALSE;
+                CPL_IGNORE_RET_VAL(VSIFSeekL(InDem, 918, 0));  // Latest iteration of the A record, such as in fema06-140cm_2995441b.dem
+                i = ReadInt(InDem);
+                j = ReadInt(InDem);
+                if ( i != 1 || j != 1 )  // File OK?
+                {
+                    CPLError( CE_Failure, CPLE_AppDefined,
+                            "Does not appear to be a USGS DEM file." );
+                    return FALSE;
+                }
+                else
+                    nDataStartOffset = 918;
             }
             else
                 nDataStartOffset = 893;

From bad858feb2782a08ed9e2b68398ecade3af0606f Mon Sep 17 00:00:00 2001
From: Even Rouault <even.rouault@spatialys.com>
Date: Thu, 3 Oct 2019 10:53:22 +0200
Subject: [PATCH 395/488] OpenJPEG: fix to return the proper number of bytes
 read when we read more than 2 GB at once (fixes
 https://github.com/uclouvain/openjpeg/issues/1151)

---
 gdal/frmts/openjpeg/openjpegdataset.cpp | 21 ++++++++++++---------
 1 file changed, 12 insertions(+), 9 deletions(-)

diff --git a/gdal/frmts/openjpeg/openjpegdataset.cpp b/gdal/frmts/openjpeg/openjpegdataset.cpp
index 082791eb8445..24846edce3c4 100644
--- a/gdal/frmts/openjpeg/openjpegdataset.cpp
+++ b/gdal/frmts/openjpeg/openjpegdataset.cpp
@@ -128,12 +128,13 @@ static OPJ_SIZE_T JP2OpenJPEGDataset_Read(void* pBuffer, OPJ_SIZE_T nBytes,
                                        void *pUserData)
 {
     JP2OpenJPEGFile* psJP2OpenJPEGFile = (JP2OpenJPEGFile* )pUserData;
-    int nRet = static_cast<int>(VSIFReadL(pBuffer, 1, nBytes, psJP2OpenJPEGFile->fp));
+    OPJ_SIZE_T nRet = static_cast<OPJ_SIZE_T>(VSIFReadL(pBuffer, 1, nBytes, psJP2OpenJPEGFile->fp));
 #ifdef DEBUG_IO
-    CPLDebug("OPENJPEG", "JP2OpenJPEGDataset_Read(%d) = %d", (int)nBytes, nRet);
+    CPLDebug("OPENJPEG", "JP2OpenJPEGDataset_Read(" CPL_FRMT_GUIB ") = " CPL_FRMT_GUIB,
+             static_cast<GUIntBig>(nBytes), static_cast<GUIntBig>(nRet));
 #endif
     if (nRet == 0)
-        nRet = -1;
+        nRet = static_cast<OPJ_SIZE_T>(-1);
 
     return nRet;
 }
@@ -146,11 +147,12 @@ static OPJ_SIZE_T JP2OpenJPEGDataset_Write(void* pBuffer, OPJ_SIZE_T nBytes,
                                        void *pUserData)
 {
     JP2OpenJPEGFile* psJP2OpenJPEGFile = (JP2OpenJPEGFile* )pUserData;
-    int nRet = static_cast<int>(VSIFWriteL(pBuffer, 1, nBytes, psJP2OpenJPEGFile->fp));
+    OPJ_SIZE_T nRet = static_cast<OPJ_SIZE_T>(VSIFWriteL(pBuffer, 1, nBytes, psJP2OpenJPEGFile->fp));
 #ifdef DEBUG_IO
-    CPLDebug("OPENJPEG", "JP2OpenJPEGDataset_Write(%d) = %d", (int)nBytes, nRet);
+    CPLDebug("OPENJPEG", "JP2OpenJPEGDataset_Write(" CPL_FRMT_GUIB ") = " CPL_FRMT_GUIB,
+             static_cast<GUIntBig>(nBytes), static_cast<GUIntBig>(nRet));
 #endif
-    if( static_cast<OPJ_SIZE_T>(nRet) != nBytes )
+    if( nRet != nBytes )
         return static_cast<OPJ_SIZE_T>(-1);
     return nRet;
 }
@@ -163,7 +165,8 @@ static OPJ_BOOL JP2OpenJPEGDataset_Seek(OPJ_OFF_T nBytes, void * pUserData)
 {
     JP2OpenJPEGFile* psJP2OpenJPEGFile = (JP2OpenJPEGFile* )pUserData;
 #ifdef DEBUG_IO
-    CPLDebug("OPENJPEG", "JP2OpenJPEGDataset_Seek(%d)", (int)nBytes);
+    CPLDebug("OPENJPEG", "JP2OpenJPEGDataset_Seek(" CPL_FRMT_GUIB ")",
+             static_cast<GUIntBig>(nBytes));
 #endif
     return VSIFSeekL(psJP2OpenJPEGFile->fp, psJP2OpenJPEGFile->nBaseOffset +nBytes,
                      SEEK_SET) == 0;
@@ -179,8 +182,8 @@ static OPJ_OFF_T JP2OpenJPEGDataset_Skip(OPJ_OFF_T nBytes, void * pUserData)
     vsi_l_offset nOffset = VSIFTellL(psJP2OpenJPEGFile->fp);
     nOffset += nBytes;
 #ifdef DEBUG_IO
-    CPLDebug("OPENJPEG", "JP2OpenJPEGDataset_Skip(%d -> " CPL_FRMT_GUIB ")",
-             (int)nBytes, (GUIntBig)nOffset);
+    CPLDebug("OPENJPEG", "JP2OpenJPEGDataset_Skip(" CPL_FRMT_GUIB " -> " CPL_FRMT_GUIB ")",
+             static_cast<GUIntBig>(nBytes), static_cast<GUIntBig>(nOffset));
 #endif
     VSIFSeekL(psJP2OpenJPEGFile->fp, nOffset, SEEK_SET);
     return nBytes;

From 3f692615fb7eb0dcab7c94455c35c5729a6445a2 Mon Sep 17 00:00:00 2001
From: Even Rouault <even.rouault@spatialys.com>
Date: Fri, 4 Oct 2019 13:50:44 +0200
Subject: [PATCH 396/488] VRT: avoid erroneous pixel request do be done with
 KernelFilteredSource

Fixes https://lists.osgeo.org/pipermail/gdal-dev/2019-September/050703.html
---
 autotest/gdrivers/vrtfilt.py  | 38 +++++++++++++++++++++++++++++++++++
 gdal/frmts/vrt/vrtfilters.cpp |  4 +++-
 2 files changed, 41 insertions(+), 1 deletion(-)

diff --git a/autotest/gdrivers/vrtfilt.py b/autotest/gdrivers/vrtfilt.py
index 474d31f92b13..c56985d1103e 100755
--- a/autotest/gdrivers/vrtfilt.py
+++ b/autotest/gdrivers/vrtfilt.py
@@ -150,6 +150,44 @@ def test_vrtfilt_6():
     tst = gdaltest.GDALTest('VRT', 'avfilt_1d.vrt', 1, 22377)
     return tst.testOpen()
 
+###############################################################################
+# Test block access
+
+
+def test_vrtfilt_7():
+
+    gdal.Translate('/vsimem/src.tif', 'data/rgbsmall.tif', options='-outsize 500 500 -r bilinear')
+
+    vrt_ds = gdal.GetDriverByName('VRT').Create('/vsimem/src.vrt', 500, 500, 1)
+
+    filterSourceXML = """    <KernelFilteredSource>
+      <SourceFilename>/vsimem/src.tif</SourceFilename>
+      <SourceBand>1</SourceBand>
+      <SrcRect xOff="0" yOff="0" xSize="500" ySize="500"/>
+      <DstRect xOff="0" yOff="0" xSize="500" ySize="500"/>
+      <Kernel>
+        <Size>3</Size>
+        <Coefs>0.111111 0.111111 0.111111 0.111111 0.111111 0.111111 0.111111 0.111111 0.111111</Coefs>
+      </Kernel>
+    </KernelFilteredSource>"""
+
+    md = {}
+    md['source_0'] = filterSourceXML
+
+    vrt_ds.GetRasterBand(1).SetMetadata(md, 'vrt_sources')
+
+    ref_checksum = vrt_ds.GetRasterBand(1).Checksum()
+    vrt_ds = None
+
+    # Wrap our above VRT in a VRT that will use 128x128 blocks
+    # (use of -mo FOO=BAR forces a non trivial copy to be made)
+    out_ds = gdal.Translate('', '/vsimem/src.vrt', options='-of VRT -mo FOO=BAR')
+    assert ref_checksum == out_ds.GetRasterBand(1).Checksum()
+    out_ds = None
+
+    gdal.GetDriverByName('GTiff').Delete('/vsimem/src.tif')
+    gdal.GetDriverByName('VRT').Delete('/vsimem/src.vrt')
+
 ###############################################################################
 # Cleanup.
 
diff --git a/gdal/frmts/vrt/vrtfilters.cpp b/gdal/frmts/vrt/vrtfilters.cpp
index 343675019978..cbf8c4b0ce24 100644
--- a/gdal/frmts/vrt/vrtfilters.cpp
+++ b/gdal/frmts/vrt/vrtfilters.cpp
@@ -292,13 +292,15 @@ VRTFilteredSource::RasterIO( GDALDataType eBandDataType,
 /*      Load the data.                                                  */
 /* -------------------------------------------------------------------- */
     {
+        GDALRasterIOExtraArg sExtraArgs;
+        INIT_RASTERIO_EXTRA_ARG(sExtraArgs);
         const bool bIsComplex = CPL_TO_BOOL( GDALDataTypeIsComplex(eOperDataType) );
         const CPLErr eErr
             = VRTComplexSource::RasterIOInternal<float>(
                 nFileXOff, nFileYOff, nFileXSize, nFileYSize,
                 pabyWorkData + nLineOffset * nTopFill + nPixelOffset * nLeftFill,
                 nFileXSize, nFileYSize, eOperDataType,
-                nPixelOffset, nLineOffset, psExtraArg,
+                nPixelOffset, nLineOffset, &sExtraArgs,
                 bIsComplex ? GDT_CFloat32 : GDT_Float32 );
 
         if( eErr != CE_None )

From 8d2a37064adc0d006a697583afe5455e35933138 Mon Sep 17 00:00:00 2001
From: battisti-engineer <56686153+battisti-engineer@users.noreply.github.com>
Date: Fri, 18 Oct 2019 19:36:34 +0200
Subject: [PATCH 397/488] gcore: fix non-neareset resampling over nodata blocks
 (fixes #1941) (#1943)

---
 autotest/gcore/rasterio.py | 25 +++++++++++++++++++++++++
 gdal/gcore/rasterio.cpp    |  8 ++++----
 2 files changed, 29 insertions(+), 4 deletions(-)

diff --git a/autotest/gcore/rasterio.py b/autotest/gcore/rasterio.py
index d908d4370731..2c8e72ee6762 100755
--- a/autotest/gcore/rasterio.py
+++ b/autotest/gcore/rasterio.py
@@ -844,6 +844,31 @@ def test_rasterio_16():
 
 ###############################################################################
 
+def test_rasterio_nodata():
+
+	try:
+		from osgeo import gdalnumeric
+		gdalnumeric.zeros
+	except (ImportError, AttributeError):
+		pytest.skip()
+
+	ndv = 123
+	btype = [ gdal.GDT_Byte, gdal.GDT_Int16, gdal.GDT_Int32, gdal.GDT_Float32, gdal.GDT_Float64 ]
+
+	### create a MEM dataset
+	for src_type in btype:
+		mem_ds = gdal.GetDriverByName('MEM').Create('', 10, 9, 1, src_type)
+		mem_ds.GetRasterBand(1).SetNoDataValue(ndv)
+		mem_ds.GetRasterBand(1).Fill(ndv)
+
+		for dst_type in btype:
+			if ( dst_type > src_type ):
+				### read to a buffer of a wider type (and resample)
+				data = mem_ds.GetRasterBand(1).ReadAsArray(0, 0, 10, 9, 4, 3, resample_alg=gdal.GRIORA_Bilinear, buf_type=dst_type)
+				assert int(data[0,0]) == ndv, 'did not read expected band data via ReadAsArray() - src type -> dst type: ' + str( src_type ) + ' -> ' + str( dst_type )
+
+
+###############################################################################
 
 def test_rasterio_lanczos_nodata():
 
diff --git a/gdal/gcore/rasterio.cpp b/gdal/gcore/rasterio.cpp
index 0e5e9c939c04..0ae54cb61d1d 100644
--- a/gdal/gcore/rasterio.cpp
+++ b/gdal/gcore/rasterio.cpp
@@ -1227,10 +1227,10 @@ CPLErr GDALRasterBand::RasterIOResampled(
                             {
                                 GDALCopyWords(
                                     &fNoDataValue, GDT_Float32, 0,
-                                    static_cast<GByte*>(pData) +
-                                    nLineSpace * (j + nDstYOff) +
-                                    nDstXOff * nPixelSpace,
-                                    eBufType, static_cast<int>(nPixelSpace),
+                                    static_cast<GByte*>(pDataMem) +
+                                    nLSMem * (j + nDstYOff) +
+                                    nDstXOff * nPSMem,
+                                    eDTMem, static_cast<int>(nPSMem),
                                     nDstXCount);
                             }
                             bSkipResample = true;

From 5fd97be1e57605e8a26db5afd6b0adc92b58dfec Mon Sep 17 00:00:00 2001
From: Even Rouault <even.rouault@spatialys.com>
Date: Wed, 16 Oct 2019 11:37:07 +0200
Subject: [PATCH 398/488] PDF: fix reading polygon with holes and Bezier curves
 (fixes #1932)

---
 .../data/bezier_curve_and_polygon_holes.pdf   | Bin 0 -> 5607 bytes
 autotest/ogr/ogr_pdf.py                       |  22 +++-
 gdal/frmts/pdf/pdfreadvectors.cpp             | 114 +++++++++++++++---
 3 files changed, 117 insertions(+), 19 deletions(-)
 create mode 100644 autotest/ogr/data/bezier_curve_and_polygon_holes.pdf

diff --git a/autotest/ogr/data/bezier_curve_and_polygon_holes.pdf b/autotest/ogr/data/bezier_curve_and_polygon_holes.pdf
new file mode 100644
index 0000000000000000000000000000000000000000..e9021fb84d2e42dac219737ec8d8c473e0f6e24e
GIT binary patch
literal 5607
zcmcJT+m2gB7KZQlQ`AjF!pQcnecmXFM4u!CXqwQ73xr0-?G8q6@8EV2GcU=-yur+i
z%>Vth?RF=Do}igXvCC`KI{oWV)%E1^>|zq9W%lG>|NiZtSqw1@Km3$Ef1b@wx6Ao%
zHEho2yJdKK_DPY)KIXA5%DRgAU-IIkJpbrfHoM#o*KZcfZFqV)oDCO4n1mm9yVsx0
zX0M0q;bxfL-Ap&j-Lve)i)^{MMtv3XgPAXun^(IZL)Fv;JMMNedz+nHWw|!xVf!kZ
zy<D#4$uG;(VLfbDx69pjwFui)HoJ;{%R@iynmSzFWM#P81_cxIim#?=+mKJYvh2bn
zpVoB|+E~}qI+jJK%dXUpT7tLP)A;P_r>xZ0D1khW;p#ejT0*qCvLE$zNuPeAFZNPc
zwbQ(=P}s^=*R)pH94WN2;%!2IPnhK1V#@hd_Ol}ID}_;%;Wq1=JXb`;fwaCS#j>iq
zX{RvPl6m-RuVI~i`*GN0KP$1o8Nr~Kwz)LQ<$hZBeIFLLM*BAFrbU<tA}Q>qZJ1Qk
z&PxGWO{>sN%P=XYy%yS6>SLjOF-!`Hco8LFru-MPWnV7I^?uoe76D<E7W;josSJZ`
zDs$<pLjk%geit%p(NfzMSuXdY<IeSY^Ktgo!x&3}rbH^ndRp|obnRo5ZR)}`qC%AC
z(p_kQTALBzL?;Hs2|Hm`PzX>fJEV_F&U&l)BTPtWD~=jWtJUUOA=uVLLJ=JedVwJE
z@JuUx<N#MEm+VB1U9Xyisbm@%2MH~SNY+|?SV=2i7nwD;l8m_C%6!BH7K;pACtUzn
zQMzDvTdOQ_0bNznP3~n4l~jbCl|mt_9TEo_SXxpY28!z7hXQWJR6bxfN|uqW#59sD
ztb%lViCQyjZAZi~*}X=ND9lDG3p1pHNCZ}+rIV8u2ZwXCgV_i!J#3WsRV44B*@sFh
z>?Z(4)Z)>&K);OR8mP+xL8<i;m0Gd@xi~0EnXK57<FO0IMkpd@-&A2yAT^ejX%&0}
z=RB0jq?|W`FwECpgJG(bfW7-jeCO8@c#{M5CR)(;U2giYS5W0Cl`bwL<2~I~_1aLE
zjU;HYLu(lcP%y;&QbZsHm_`7AZLbP)ksYK@5dawxK_ch)NlEEMl1Jc29Z@XQJOv6;
z(C7?YC+~^}1+B;mhnXZR9!{_TklGi>ItxIP)Tb^|F{48M(sfi`S|A6-HJvKc3VM0s
z{E$#%j8aU=430TDFqmh~ZNwrtK(VK_mQ)LZgpQ_ET&ORE9^n!kK%{=g9u)i~Sxjrn
zF|F1DT98N&t;u&I(7+gtwf;+|KjEadWG_zjwhnCU$G0d7RtN$=@r@{0CF}TnUnl|}
zJS&}B&I5Sn29xySF`fb@3C2U$M+(!3kYE=E&Io9%B}}x0ro`f#nFPWSB*e!-Q6-h=
z#fDf^4rz1FomM&;$1K;{T{jeUpaoUn#>8xc4-Cq*@R#IBAmye-p@j=N1-^LqD5``&
zsdM^atE9xN1vHbFG0b-gEJa1dlQfc$A_WXm#*Ak~s+_=|=;a9!d2o{}4^on6h(U~I
zk^pu*V^Hj3r3FV|h`|%?aMXeXhl3I7P=K64L5?{f)3q*P2BFnLsU0~?fnMA38(DJ2
z0mIPbwg4YG(R65H!Hq)kB%ZayRGkpk=nNIh3Fp*|6|u-TphO`x+Rnm9Dd-WQ0s|1M
zR8tTXkWnYHM&;lM95tShhecxwFTqLcaI)=DMhq%NO}<ha8dUj-6sP^(8*0YNxv0H=
zq^d*Gg{9VE#r5nkRgJ}47ZxcaDn~h<Hsd^1f*cS5`04^GM54WJ17qV+>DnL&$#|%V
z@2UbED;KpEEJ@U`QfEGE#kXPd;BlX>7ut+0NKZ(cJC?<Gy?|+J$hji9Bf28fAa=8Y
zoecx;*uKtUa?ryV&8~OiN)ygCq9CY9A9-ogj@bEN+v7l{6_(@lnP~qU-PlA50N50#
zsdiB`JW}LFhOW9_uaDMBcS6pxgkn8{+VZ}Jxdg|gnD5hLY*@FPOIw!4qlW6zdjEm<
z>1XQi{Te<Pi0dtBqHFEa7uPl&g8fKy-JrSDQoK<0Qz%jLscJ1lo9Ql1Ke-}Y1;>|G
zV`l!?TP`~;1@@dSc1CC$TVc*IBgTB#DYEMuD$F$Pos6+uX+D>%CLDP}sf(OqF@$*J
zTO@ZsYEIEpVaAVfPH*botjggFki_rhk@Tj!?mK@~l)7v1_flQz2Gl<KSA}$qO?tQz
z%9fFNtVvy_F3!iARB8C1w5WiQDrWtI1~rXiM78)%gWC2Z4eB;a4XT1-h%2`DH>i&g
zM{by0{l^Vz!Lf!?kscaUtkj^?*dMm2`E<gcYEVV<e{4{ijQ}{Z(p>rA1{KC1-k`EZ
zRF5>McBO&&XBw2t*atVL(sb0IYV_2gV~pcn>nmQB#%H7PeMu+M;eF}q@2{6(b}?*r
z+3aL~w`3J&S9(Ueo4g!u=bLPHzF7>{tIex0`*yYYbaS`b6SCRYZ+_TW0czsW6P7yq
zEfc5n-F!Xhx$1KMYIzs*H)VKvB*5?e(^~S$`}EE>ypcySn|;2zz6;;!awWm={gEh?
zcSVuh?3SAyLb|$GNUwIo>yzPEkr>&$9)(y{`uskdeYw0|&3})1Ip0dx=(e8R?uIwp
zh2r2T(3r9CgB$2NGCkMLUJg6n2XpcCH1~VTzqwm(zuBx5<}`Lu7oDT%e%&r_biTwq
z%lH3usjhWr4maUIi?XVJF>LN>xh}${9qr3?{d|iSqp;`Sy=>JLI(r_{{ELrxZ@20T
zwS_qcyH(!`+K03{FO;M`ZMU7T*2}G5Q9nCVDxT{B@BHGlFYCTPZL0jN`m`+Di<AE1
z;-ou2Jv)2x-)vC^Kik|4x;{tYFXV@v9>&PU?CaG(mLTW{)cJO2OzWbK*^?*df4#{5
E1BKs4h5!Hn

literal 0
HcmV?d00001

diff --git a/autotest/ogr/ogr_pdf.py b/autotest/ogr/ogr_pdf.py
index 8aea0a2c2bcf..5d9be77452eb 100755
--- a/autotest/ogr/ogr_pdf.py
+++ b/autotest/ogr/ogr_pdf.py
@@ -239,10 +239,30 @@ def test_ogr_pdf_5():
         ds = ogr.Open('data/drawing.pdf')
     assert ds is not None
 
-    # Note: the circle is wrongly drawned as a diamond
     lyr = ds.GetLayer(0)
     assert lyr.GetFeatureCount() == 8
 
+###############################################################################
+# Test read support of polygon with holes and Bezier curves
+
+
+def test_ogr_pdf_bezier_curve_and_polygon_holes():
+
+    if not has_read_support():
+        pytest.skip()
+
+    with gdaltest.config_option('OGR_PDF_READ_NON_STRUCTURED', 'YES'):
+        ds = ogr.Open('data/bezier_curve_and_polygon_holes.pdf')
+    assert ds is not None
+
+    lyr = ds.GetLayer(0)
+    feat = lyr.GetFeature(2)
+    expected_wkt = """POLYGON ((8444.60213541667 6332.05489588889,8444.71174575 6331.98745444444,8444.82702558333 6331.926391,8444.94655754167 6331.87099688889,8445.06892425 6331.82056344444,8445.19270833333 6331.774382,8445.31649241667 6331.73174388889,8445.438859125 6331.69194044444,8445.55839108333 6331.654263,8445.67367091667 6331.61800288889,8445.78328125 6331.58245144444,8445.89289158333 6331.58256955556,8446.00817141667 6331.58339633334,8446.127703375 6331.58564044444,8446.25007008333 6331.59001055556,8446.37385416667 6331.59721533333,8446.49763825 6331.60796344444,8446.62000495833 6331.62296355556,8446.73953691667 6331.64292433333,8446.85481675 6331.66855444444,8446.96442708333 6331.70056255555,8447.17360801042 6331.77851588889,8447.37641075 6331.87064255556,8447.57354398958 6331.97694255555,8447.76571641667 6332.09741588889,8447.95363671875 6332.23206255555,8448.13801358333 6332.38088255556,8448.31955569792 6332.54387588889,8448.49897175 6332.72104255556,8448.67697042709 6332.91238255556,8448.85426041667 6333.11789588889,8449.02056575 6333.43679588889,8449.16419308334 6333.75569588889,8449.28372504167 6334.07459588889,8449.37774425 6334.39349588889,8449.44483333333 6334.71239588889,8449.48357491667 6335.03129588889,8449.492551625 6335.35019588889,8449.47034608333 6335.66909588889,8449.41554091667 6335.98799588889,8449.32671875 6336.30689588889,8449.19572967709 6336.69654444444,8449.01584116667 6337.08548433334,8448.78776190625 6337.47300688889,8448.51220058333 6337.85840344444,8448.18986588542 6338.24096533333,8447.8214665 6338.61998388889,8447.40771111458 6338.99475044445,8446.94930841667 6339.36455633333,8446.44696709375 6339.72869288889,8445.90139583333 6340.08645144444,8445.41240145833 6340.39082377778,8444.93758083334 6340.66472344445,8444.47693395833 6340.90602444444,8444.03046083333 6341.11260077778,8443.59816145833 6341.28232644444,8443.18003583333 6341.41307544444,8442.77608395833 6341.50272177778,8442.38630583334 6341.54913944444,8442.01070145833 6341.55020244444,8441.64927083333 6341.50378477778,8441.33402301042 6341.45429622222,8441.02657075 6341.37716966667,8440.72762273958 6341.27311377778,8440.43788766667 6341.14283722222,8440.15807421875 6340.98704866667,8439.88889108333 6340.80645677778,8439.63104694792 6340.60177022222,8439.3852505 6340.37369766667,8439.15221042708 6340.12294777778,8438.93263541667 6339.85022922222,8438.82999384375 6339.67294444445,8438.73514783333 6339.494951,8438.64880607291 6339.31554022222,8438.57167725 6339.13400344444,8438.50447005208 6338.949632,8438.44789316667 6338.76171722222,8438.40265528125 6338.56955044444,8438.36946508333 6338.372423,8438.34903126042 6338.16962622222,8438.3420625 6337.96045144444,8438.34572405208 6337.77997766667,8438.35718116667 6337.59383455556,8438.37714253125 6337.40343944444,8438.40631683333 6337.21020966667,8438.44541276042 6337.01556255555,8438.495139 6336.82091544444,8438.55620423958 6336.62768566667,8438.62931716667 6336.43729055555,8438.71518646875 6336.25114744444,8438.81452083333 6336.07067366667,8438.92436739584 6335.89693222222,8439.04130083334 6335.72956877778,8439.16532114583 6335.56787466666,8439.29642833334 6335.41114122222,8439.43462239583 6335.25865977778,8439.57990333333 6335.10972166667,8439.73227114583 6334.96361822222,8439.89172583333 6334.81964077778,8440.05826739583 6334.67708066667,8440.23189583333 6334.53522922222,8440.51537083333 6334.36881066667,8440.79884583333 6334.22436077778,8441.08232083333 6334.10258822222,8441.36579583334 6334.00420166667,8441.64927083333 6333.92990977778,8441.93274583333 6333.88042122222,8442.21622083333 6333.85644466667,8442.49969583333 6333.85868877778,8442.78317083333 6333.88786222222,8443.06664583333 6333.94467366667,8443.34634116667 6333.990737,8443.61753225 6334.05806033333,8443.87880170833 6334.14664366667,8444.12873216667 6334.256487,8444.36590625 6334.38759033333,8444.58890658333 6334.53995366667,8444.79631579167 6334.713577,8444.9867165 6334.90846033333,8445.15869133333 6335.12460366667,8445.31082291667 6335.362007,8445.41027539583 6335.50385844445,8445.4969715 6335.64641855556,8445.57232860417 6335.790396,8445.63776408334 6335.93649944444,8445.6946953125 6336.08543755556,8445.74453966666 6336.237919,8445.78871452083 6336.39465244444,8445.82863725 6336.55634655556,8445.86572522917 6336.72371,8445.90139583333 6336.89745144444,8445.90104148959 6337.0745,8445.89856108334 6337.25083988889,8445.89182855208 6337.42576244444,8445.87871783334 6337.598559,8445.85710286459 6337.76852088889,8445.82485758333 6337.93493944444,8445.77985592708 6338.097106,8445.71997183333 6338.25431188889,8445.64307923958 6338.40584844444,8445.54705208333 6338.551007,8445.54705208333 6338.551007,8445.85214205208 6338.37384033333,8446.13101058334 6338.19667366667,8446.38578373958 6338.019507,8446.61858758333 6337.84234033333,8446.83154817708 6337.66517366667,8447.02679158333 6337.488007,8447.20644386458 6337.31084033333,8447.37263108333 6337.13367366667,8447.52747930209 6336.956507,8447.67311458333 6336.77934033333,8447.77575615625 6336.60229177778,8447.87060216667 6336.42595188889,8447.95694392708 6336.25102933333,8448.03407275 6336.07823277778,8448.10127994792 6335.90827088889,8448.15785683334 6335.74185233333,8448.20309471875 6335.57968577778,8448.23628491667 6335.42247988889,8448.25671873958 6335.27094333333,8448.2636875 6335.12578477778,8448.2601440625 6334.98735855556,8448.24951375 6334.85460166667,8448.2317965625 6334.72609677778,8448.2069925 6334.60042655555,8448.1751015625 6334.47617366667,8448.13612375 6334.35192077778,8448.0900590625 6334.22625055555,8448.0369075 6334.09774566667,8447.9766690625 6333.96498877778,8447.90934375 6333.82656255556,8447.79961530208 6333.69179777778,8447.68350866667 6333.57049766667,8447.56173253125 6333.46195355555,8447.43499558333 6333.36545677778,8447.30400651042 6333.28029866667,8447.169474 6333.20577055555,8447.03210673958 6333.14116377778,8446.89261341667 6333.08576966667,8446.75170271875 6333.03887955556,8446.61008333333 6332.99978477778,8446.50035488542 6333.000021,8446.38424825 6333.00167455556,8446.26247211458 6333.00616277777,8446.13573516667 6333.014903,8446.00474609375 6333.02931255556,8445.87021358333 6333.05080877778,8445.73284632292 6333.080809,8445.593353 6333.12073055556,8445.45244230208 6333.17199077778,8445.31082291667 6333.236007,8444.60213541667 6332.05489588889),(8443.65721875 6339.614007,8443.82730375 6339.50085655556,8443.983215 6339.37495011111,8444.1249525 6339.237705,8444.25251625 6339.09053855556,8444.36590625 6338.93486811111,8444.4651225 6338.772111,8444.550165 6338.60368455556,8444.62103375 6338.43100611111,8444.67772875 6338.255493,8444.72025 6338.07856255556,8444.78060655209 6337.90139588889,8444.82041116667 6337.72422922222,8444.84037253125 6337.54706255555,8444.84119933333 6337.36989588889,8444.82360026042 6337.19272922222,8444.788284 6337.01556255555,8444.73595923958 6336.83839588889,8444.66733466667 6336.66122922222,8444.58311896875 6336.48406255556,8444.48402083333 6336.30689588889,8444.3708670625 6336.168824,8444.24495691667 6336.03854744445,8444.10770777083 6335.91677488889,8443.960537 6335.804215,8443.80486197917 6335.70157644444,8443.64210008333 6335.60956788889,8443.4736686875 6335.528898,8443.30098516667 6335.46027544444,8443.12546689583 6335.40440888889,8442.94853125 6335.362007,8442.76805216667 6335.33696744445,8442.58190358334 6335.33177055556,8442.391502875 6335.344999,8442.19826741667 6335.37523544444,8442.00361458333 6335.42106255555,8441.80896175 6335.481063,8441.61572629167 6335.55381944444,8441.42532558333 6335.63791455556,8441.239177 6335.731931,8441.05869791667 6335.83445144444,8440.85329665625 6335.97961,8440.66277783333 6336.13114655556,8440.48785013541 6336.28835244444,8440.32922225 6336.450519,8440.18760286458 6336.61693755556,8440.06370066667 6336.78689944444,8439.95822434375 6336.959696,8439.87188258333 6337.13461855556,8439.80538407292 6337.31095844444,8439.7594375 6337.488007,8439.69908094792 6337.69387466667,8439.65927633334 6337.887695,8439.63931496875 6338.071594,8439.63848816667 6338.24769766667,8439.65608723958 6338.418132,8439.6914035 6338.585023,8439.74372826042 6338.75049666667,8439.81235283333 6338.916679,8439.89656853125 6339.085696,8439.99566666667 6339.25967366667,8440.06677164583 6339.36243033333,8440.139294 6339.45810033333,8440.21465110416 6339.54668366666,8440.29426033333 6339.62818033333,8440.3795390625 6339.70259033333,8440.47190466667 6339.76991366667,8440.57277452083 6339.83015033333,8440.683566 6339.88330033333,8440.80569647917 6339.92936366667,8440.94058333333 6339.96834033333,8441.05031178125 6340.03235655556,8441.16641841667 6340.08361677778,8441.28819455208 6340.12353833333,8441.4149315 6340.15353855556,8441.54592057292 6340.17503477778,8441.68045308333 6340.18944433333,8441.81782034375 6340.19818455555,8441.95731366667 6340.20267277778,8442.09822436458 6340.20432633333,8442.23984375 6340.20456255555,8442.38158125 6340.168893,8442.52331875 6340.13180611111,8442.66505625 6340.09188455556,8442.80679375 6340.047711,8442.94853125 6339.99786811111,8443.09026875 6339.94093855556,8443.23200625 6339.875505,8443.37374375 6339.80015011111,8443.51548125 6339.71345655556,8443.65721875 6339.614007))"""
+    if ogrtest.check_feature_geometry(feat, ogr.CreateGeometryFromWkt(expected_wkt)) != 0:
+        feat.DumpReadable()
+        pytest.fail()
+
+
 ###############################################################################
 # Test read support with a non-OGR datasource
 
diff --git a/gdal/frmts/pdf/pdfreadvectors.cpp b/gdal/frmts/pdf/pdfreadvectors.cpp
index bcde12683fe9..5b71aafd95a6 100644
--- a/gdal/frmts/pdf/pdfreadvectors.cpp
+++ b/gdal/frmts/pdf/pdfreadvectors.cpp
@@ -35,6 +35,8 @@ CPL_CVSID("$Id$")
 
 #if defined(HAVE_POPPLER) || defined(HAVE_PODOFO) || defined(HAVE_PDFIUM)
 
+constexpr int BEZIER_STEPS = 10;
+
 /************************************************************************/
 /*                        OpenVectorLayers()                            */
 /************************************************************************/
@@ -439,16 +441,16 @@ void PDFDataset::PDFCoordsToSRSCoords(double x, double y,
 
 static OGRPoint* PDFGetCircleCenter(OGRLineString* poLS)
 {
-    if (poLS == nullptr || poLS->getNumPoints() != 5)
+    if (poLS == nullptr || poLS->getNumPoints() != 1 + 4 * BEZIER_STEPS)
         return nullptr;
 
-    if (poLS->getY(0) == poLS->getY(2) &&
-        poLS->getX(1) == poLS->getX(3) &&
-        fabs((poLS->getX(0) + poLS->getX(2)) / 2 - poLS->getX(1)) < EPSILON &&
-        fabs((poLS->getY(1) + poLS->getY(3)) / 2 - poLS->getY(0)) < EPSILON)
+    if (poLS->getY(0 * BEZIER_STEPS) == poLS->getY(2 * BEZIER_STEPS) &&
+        poLS->getX(1 * BEZIER_STEPS) == poLS->getX(3 * BEZIER_STEPS) &&
+        fabs((poLS->getX(0 * BEZIER_STEPS) + poLS->getX(2 * BEZIER_STEPS)) / 2 - poLS->getX(1 * BEZIER_STEPS)) < EPSILON &&
+        fabs((poLS->getY(1 * BEZIER_STEPS) + poLS->getY(3 * BEZIER_STEPS)) / 2 - poLS->getY(0 * BEZIER_STEPS)) < EPSILON)
     {
-        return new OGRPoint((poLS->getX(0) + poLS->getX(2)) / 2,
-                            (poLS->getY(1) + poLS->getY(3)) / 2);
+        return new OGRPoint((poLS->getX(0 * BEZIER_STEPS) + poLS->getX(2 * BEZIER_STEPS)) / 2,
+                            (poLS->getY(1 * BEZIER_STEPS) + poLS->getY(3 * BEZIER_STEPS)) / 2);
     }
     return nullptr;
 }
@@ -569,6 +571,42 @@ int PDFDataset::UnstackTokens(const char* pszToken,
     return TRUE;
 }
 
+/************************************************************************/
+/*                           AddBezierCurve()                           */
+/************************************************************************/
+
+static void AddBezierCurve(std::vector<double>& oCoords,
+                           const double* x0_y0,
+                           const double* x1_y1,
+                           const double* x2_y2,
+                           const double* x3_y3)
+{
+    double x0 = x0_y0[0];
+    double y0 = x0_y0[1];
+    double x1 = x1_y1[0];
+    double y1 = x1_y1[1];
+    double x2 = x2_y2[0];
+    double y2 = x2_y2[1];
+    double x3 = x3_y3[0];
+    double y3 = x3_y3[1];
+    for( int i = 1; i < BEZIER_STEPS; i++ )
+    {
+        const double t = static_cast<double>(i) / BEZIER_STEPS;
+        const double t2 = t * t;
+        const double t3 = t2 * t;
+        const double oneMinust = 1 - t;
+        const double oneMinust2 = oneMinust * oneMinust;
+        const double oneMinust3 = oneMinust2 * oneMinust;
+        const double three_t_oneMinust = 3 * t * oneMinust;
+        const double x = oneMinust3 * x0 + three_t_oneMinust * (oneMinust * x1 + t * x2) + t3 * x3;
+        const double y = oneMinust3 * y0 + three_t_oneMinust * (oneMinust * y1 + t * y2) + t3 * y3;
+        oCoords.push_back(x);
+        oCoords.push_back(y);
+    }
+    oCoords.push_back(x3);
+    oCoords.push_back(y3);
+}
+
 /************************************************************************/
 /*                           ParseContent()                             */
 /************************************************************************/
@@ -960,11 +998,16 @@ OGRGeometry* PDFDataset::ParseContent(const char* pszContent,
                         return nullptr;
                     }
 
+                    oGS.ApplyMatrix(adfCoords + 0);
+                    oGS.ApplyMatrix(adfCoords + 2);
                     oGS.ApplyMatrix(adfCoords + 4);
-                    oCoords.push_back(adfCoords[4]);
-                    oCoords.push_back(adfCoords[5]);
+                    AddBezierCurve(oCoords,
+                                   oCoords.empty() ? &adfCoords[0] : &oCoords[oCoords.size()-2],
+                                   &adfCoords[0],
+                                   &adfCoords[2],
+                                   &adfCoords[4]);
                 }
-                else if (EQUAL1(szToken, "v") || EQUAL1(szToken, "y")) /* Bezier curve */
+                else if (EQUAL1(szToken, "v")) /* Bezier curve */
                 {
                     double adfCoords[4];
                     if (!UnstackTokens(szToken, 4, aszTokenStack, nTokenStackSize, adfCoords))
@@ -973,9 +1016,30 @@ OGRGeometry* PDFDataset::ParseContent(const char* pszContent,
                         return nullptr;
                     }
 
+                    oGS.ApplyMatrix(adfCoords + 0);
                     oGS.ApplyMatrix(adfCoords + 2);
-                    oCoords.push_back(adfCoords[2]);
-                    oCoords.push_back(adfCoords[3]);
+                    AddBezierCurve(oCoords,
+                                   oCoords.empty() ? &adfCoords[0] : &oCoords[oCoords.size()-2],
+                                   oCoords.empty() ? &adfCoords[0] : &oCoords[oCoords.size()-2],
+                                   &adfCoords[0],
+                                   &adfCoords[2]);
+                }
+                else if (EQUAL1(szToken, "y")) /* Bezier curve */
+                {
+                    double adfCoords[4];
+                    if (!UnstackTokens(szToken, 4, aszTokenStack, nTokenStackSize, adfCoords))
+                    {
+                        CPLDebug("PDF", "Should not happen at line %d", __LINE__);
+                        return nullptr;
+                    }
+
+                    oGS.ApplyMatrix(adfCoords + 0);
+                    oGS.ApplyMatrix(adfCoords + 2);
+                    AddBezierCurve(oCoords,
+                                   oCoords.empty() ? &adfCoords[0] : &oCoords[oCoords.size()-2],
+                                   &adfCoords[0],
+                                   &adfCoords[2],
+                                   &adfCoords[2]);
                 }
                 else if (EQUAL2(szToken, "re")) /* Rectangle */
                 {
@@ -1275,7 +1339,7 @@ OGRGeometry* PDFDataset::BuildGeometry(std::vector<double>& oCoords,
 
         // Recognize points as written by GDAL (ogr-sym-2 : circle (not filled))
         OGRGeometry* poCenter = nullptr;
-        if (poCenter == nullptr && poLS != nullptr && poLS->getNumPoints() == 5)
+        if (poCenter == nullptr && poLS != nullptr && poLS->getNumPoints() == 1 + BEZIER_STEPS * 4 )
         {
             poCenter = PDFGetCircleCenter(poLS);
         }
@@ -1342,6 +1406,15 @@ OGRGeometry* PDFDataset::BuildGeometry(std::vector<double>& oCoords,
         {
             if (oCoords[i] == NEW_SUBPATH && oCoords[i+1] == NEW_SUBPATH)
             {
+                if (poLS && poLS->getNumPoints() >= 3)
+                {
+                    OGRPolygon* poPoly =  new OGRPolygon();
+                    poPoly->addRingDirectly(poLS);
+                    poLS = nullptr;
+
+                    papoPoly = (OGRGeometry**) CPLRealloc(papoPoly, (nPolys + 1) * sizeof(OGRGeometry*));
+                    papoPoly[nPolys ++] = poPoly;
+                }
                 delete poLS;
                 poLS = new OGRLinearRing();
             }
@@ -1354,16 +1427,21 @@ OGRGeometry* PDFDataset::BuildGeometry(std::vector<double>& oCoords,
 
                     OGRPoint* poCenter = nullptr;
 
-                    if (nPolys == 0 &&
+                   if (nPolys == 0 &&
                         poLS &&
-                        poLS->getNumPoints() == 5)
-                    {
+                        poLS->getNumPoints() == 1 + BEZIER_STEPS * 4 )
+                   {
                         // Recognize points as written by GDAL (ogr-sym-3 : circle (filled))
                         poCenter = PDFGetCircleCenter(poLS);
+                   }
 
+                    if (nPolys == 0 &&
+                        poCenter == nullptr &&
+                        poLS &&
+                        poLS->getNumPoints() == 5)
+                    {
                         // Recognize points as written by GDAL (ogr-sym-5: square (filled))
-                        if (poCenter == nullptr)
-                            poCenter = PDFGetSquareCenter(poLS);
+                        poCenter = PDFGetSquareCenter(poLS);
 
                         /* ESRI points */
                         if (poCenter == nullptr &&

From 325077148f678a89f4e51b26a74650a871486f06 Mon Sep 17 00:00:00 2001
From: Even Rouault <even.rouault@spatialys.com>
Date: Sat, 19 Oct 2019 19:57:30 +0200
Subject: [PATCH 399/488] PDF vector: fix reading strings with escape sequences

---
 gdal/frmts/pdf/pdfreadvectors.cpp | 48 +++++++++++++++++++++++++++++++
 1 file changed, 48 insertions(+)

diff --git a/gdal/frmts/pdf/pdfreadvectors.cpp b/gdal/frmts/pdf/pdfreadvectors.cpp
index 5b71aafd95a6..404d581addaa 100644
--- a/gdal/frmts/pdf/pdfreadvectors.cpp
+++ b/gdal/frmts/pdf/pdfreadvectors.cpp
@@ -733,6 +733,54 @@ OGRGeometry* PDFDataset::ParseContent(const char* pszContent,
                 bPushToken = TRUE;
             }
         }
+        else if( bInString && ch == '\\' )
+        {
+            const auto nextCh = pszContent[1];
+            if( nextCh == 'n' )
+            {
+                ADD_CHAR(szToken, '\n');
+                pszContent ++;
+            }
+            else if( nextCh == 'r' )
+            {
+                ADD_CHAR(szToken, '\r');
+                pszContent ++;
+            }
+            else if( nextCh == 't' )
+            {
+                ADD_CHAR(szToken, '\t');
+                pszContent ++;
+            }
+            else if( nextCh == 'b' )
+            {
+                ADD_CHAR(szToken, '\b');
+                pszContent ++;
+            }
+            else if( nextCh == '(' || nextCh == ')' || nextCh == '\\' )
+            {
+                ADD_CHAR(szToken, nextCh);
+                pszContent ++;
+            }
+            else if( nextCh >= '0' && nextCh <= '7' &&
+                     pszContent[2] >= '0' && pszContent[2] <= '7' &&
+                     pszContent[3] >= '0' && pszContent[3] <= '7' )
+            {
+                ADD_CHAR(szToken,
+                         ((nextCh - '\0') * 64 + (pszContent[2] - '\0') * 8 + pszContent[3] - '\0'));
+                pszContent += 3;
+            }
+            else if( nextCh == '\n' )
+            {
+                if( pszContent[2] == '\r' )
+                    pszContent += 2;
+                else
+                    pszContent ++;
+            }
+            else if( nextCh == '\r' )
+            {
+                pszContent ++;
+            }
+        }
         else if (ch == '<' && pszContent[1] == '<' && nTokenSize == 0)
         {
             int nDictDepth = 0;

From e29375d70ceaf6be3186ac8b84d881f000ff3df1 Mon Sep 17 00:00:00 2001
From: Even Rouault <even.rouault@spatialys.com>
Date: Mon, 21 Oct 2019 13:00:17 +0200
Subject: [PATCH 400/488] OGRSimpleCurve::getPoints() with XYZM: fix wrong
 stride used for M array

---
 gdal/ogr/ogrlinestring.cpp | 84 ++++++++++++++++++++------------------
 1 file changed, 44 insertions(+), 40 deletions(-)

diff --git a/gdal/ogr/ogrlinestring.cpp b/gdal/ogr/ogrlinestring.cpp
index 7524d8d9a597..c9ac358faf63 100644
--- a/gdal/ogr/ogrlinestring.cpp
+++ b/gdal/ogr/ogrlinestring.cpp
@@ -1274,38 +1274,10 @@ void OGRSimpleCurve::getPoints( void* pabyX, int nXStride,
                                 void* pabyY, int nYStride,
                                 void* pabyZ, int nZStride ) const
 {
-    if( pabyX != nullptr && nXStride == 0 )
-        return;
-    if( pabyY != nullptr && nYStride == 0 )
-        return;
-    if( pabyZ != nullptr && nZStride == 0 )
-        return;
-    if( nXStride == 2 * sizeof(double) &&
-        nYStride == 2 * sizeof(double) &&
-        static_cast<char *>(pabyY) ==
-        static_cast<char *>(pabyX) + sizeof(double) &&
-        (pabyZ == nullptr || nZStride == sizeof(double)) )
-    {
-        getPoints(static_cast<OGRRawPoint *>(pabyX),
-                  static_cast<double *>(pabyZ));
-        return;
-    }
-    for( int i = 0; i < nPointCount; i++ )
-    {
-        if( pabyX )
-            *reinterpret_cast<double*>(static_cast<char*>(pabyX) + i * nXStride) = paoPoints[i].x;
-        if( pabyY )
-            *reinterpret_cast<double*>(static_cast<char*>(pabyY) + i * nYStride) = paoPoints[i].y;
-    }
-
-    if( pabyZ )
-    {
-        for( int i = 0; i < nPointCount; i++ )
-        {
-            *reinterpret_cast<double*>(static_cast<char*>(pabyZ) + i * nZStride) =
-                padfZ ? padfZ[i] : 0.0;
-        }
-    }
+    return getPoints( pabyX, nXStride,
+                      pabyY, nYStride,
+                      pabyZ, nZStride,
+                      nullptr, 0);
 }
 
 /**
@@ -1343,24 +1315,56 @@ void OGRSimpleCurve::getPoints( void* pabyX, int nXStride,
         return;
     if( pabyM != nullptr && nMStride == 0 )
         return;
-    for( int i = 0; i < nPointCount; i++ )
+    if( nXStride == sizeof(OGRRawPoint) &&
+        nYStride == sizeof(OGRRawPoint) &&
+        static_cast<char *>(pabyY) ==
+        static_cast<char *>(pabyX) + sizeof(double) &&
+        (pabyZ == nullptr || nZStride == sizeof(double)) )
     {
-        if( pabyX ) *reinterpret_cast<double*>(static_cast<char*>(pabyX) + i * nXStride) = paoPoints[i].x;
-        if( pabyY ) *reinterpret_cast<double*>(static_cast<char*>(pabyY) + i * nYStride) = paoPoints[i].y;
+        getPoints(static_cast<OGRRawPoint *>(pabyX),
+                  static_cast<double *>(pabyZ));
     }
-
-    if( pabyZ )
+    else
     {
         for( int i = 0; i < nPointCount; i++ )
         {
-            *reinterpret_cast<double*>(static_cast<char*>(pabyZ) + i * nZStride) = (padfZ) ? padfZ[i] : 0.0;
+            if( pabyX ) *reinterpret_cast<double*>(static_cast<char*>(pabyX) + i * nXStride) = paoPoints[i].x;
+            if( pabyY ) *reinterpret_cast<double*>(static_cast<char*>(pabyY) + i * nYStride) = paoPoints[i].y;
+        }
+
+        if( pabyZ )
+        {
+            if( nZStride == sizeof(double) )
+            {
+                if( padfZ )
+                    memcpy( pabyZ, padfZ, sizeof(double) * nPointCount );
+                else
+                    memset( pabyZ, 0, sizeof(double) * nPointCount );
+            }
+            else
+            {
+                for( int i = 0; i < nPointCount; i++ )
+                {
+                    *reinterpret_cast<double*>(static_cast<char*>(pabyZ) + i * nZStride) = (padfZ) ? padfZ[i] : 0.0;
+                }
+            }
         }
     }
     if( pabyM )
     {
-        for( int i = 0; i < nPointCount; i++ )
+        if( nMStride == sizeof(double) )
         {
-            *reinterpret_cast<double*>(static_cast<char*>(pabyM) + i * nZStride) = (padfM) ? padfM[i] : 0.0;
+            if( padfM )
+                memcpy( pabyM, padfM, sizeof(double) * nPointCount );
+            else
+                memset( pabyM, 0, sizeof(double) * nPointCount );
+        }
+        else
+        {
+            for( int i = 0; i < nPointCount; i++ )
+            {
+                *reinterpret_cast<double*>(static_cast<char*>(pabyM) + i * nMStride) = (padfM) ? padfM[i] : 0.0;
+            }
         }
     }
 }

From 68eba531ae31c3372b22281dce146affe16c4cbe Mon Sep 17 00:00:00 2001
From: Even Rouault <even.rouault@spatialys.com>
Date: Mon, 21 Oct 2019 13:19:06 +0200
Subject: [PATCH 401/488] OGRSimpleCurve: fix reversePoints() and
 addSubLineString() to take into account M dimension

---
 ...olygonzm_m_not_closing_with_curves.gdb.csv |  4 +--
 autotest/ogr/ogr_geom.py                      | 12 +++++--
 gdal/ogr/ogrlinestring.cpp                    | 34 ++++++++++++++-----
 3 files changed, 38 insertions(+), 12 deletions(-)

diff --git a/autotest/ogr/data/filegdb_polygonzm_m_not_closing_with_curves.gdb.csv b/autotest/ogr/data/filegdb_polygonzm_m_not_closing_with_curves.gdb.csv
index c62801c41695..81b1b438127d 100644
--- a/autotest/ogr/data/filegdb_polygonzm_m_not_closing_with_curves.gdb.csv
+++ b/autotest/ogr/data/filegdb_polygonzm_m_not_closing_with_curves.gdb.csv
@@ -1,7 +1,7 @@
 WKT,ET_ID,ShapeType
 "MULTIPOLYGON ZM (((601237.263148479 7134708.32302578 9412.59721870556 0,601352.979768234 7133348.65274364 9412.59721870556 1364.58550931162,603464.808078794 7133782.59006772 9412.59721870556 3520.53551209844,602683.720895436 7132480.77809546 9412.59721870556 5038.6961093779,600861.184134269 7132509.7072504 9412.59721870556 6861.46245255216,600427.246810182 7133637.94429303 9412.59721870556 8070.27196012244,601237.263148479 7134708.32302578 9412.59721870556 9412.59721870556)))",9,Linear Segments
 "MULTISURFACE ZM (CURVEPOLYGON ZM (COMPOUNDCURVE ZM (CIRCULARSTRING ZM (601237.263148479 7132185.77127137 5962.40883167607 0,602186.209986774 7131236.82443308 5962.40883167607 0,601237.263148478 7130287.87759478 5962.40883167607 0,600288.316310182 7131236.82443307 5962.40883167607 0,601237.263148479 7132185.77127137 5962.40883167607 5962.40883167607))))",10,Full Circle
-"MULTISURFACE Z (CURVEPOLYGON Z ((603586.990105119 7131376.32619817 6015.53340104846,603646.313690435 7131429.8445149 6015.53340104846,603707.853677225 7131480.44929811 6015.53340104846,603771.310248859 7131527.89400638 6015.53340104846,603836.374251297 7131571.94749386 6015.53340104846,603902.728699261 7131612.39513638 6015.53340104846,603970.05032055 7131649.0398771 6015.53340104846,604038.011130991 7131681.70318652 6015.53340104846,604106.280032349 7131710.22593229 6015.53340104846,604174.524425398 7131734.46915445 6015.53340104846,604242.411830314 7131754.31474246 6015.53340104846,604309.611506486 7131769.66601061 6015.53340104846,604375.796063846 7131780.44816907 6015.53340104846,604440.643057882 7131786.60868825 6015.53340104846,604503.83656056 7131788.1175547 6015.53340104846,604565.068699485 7131784.9674174 6015.53340104846,604624.041157832 7131777.17362349 6015.53340104846,604680.466627711 7131764.77414355 6015.53340104846,604734.070209906 7131747.8293866 6015.53340104846,604784.590753153 7131726.42190579 6015.53340104846,604831.782126442 7131700.65599622 6015.53340104846,604875.414418146 7131670.65718681 6015.53340104846,604915.275056128 7131636.57162875 6015.53340104846,604951.169843364 7131598.56538344 6015.53340104846,604982.92390406 7131556.82361349 6015.53340104846,605010.382535623 7131511.54968062 6015.53340104846,605033.411962362 7131462.96415486 6015.53340104846,605051.899987224 7131411.30374002 6015.53340104846,605065.75653841 7131356.82012045 6015.53340104846,605074.914108195 7131299.77873487 6015.53340104846,605079.328081821 7131240.45748316 6015.53340104846,605078.976954851 7131179.14537251 6015.53340104846,605073.862437941 7131116.14110936 6015.53340104846,605064.009448503 7131051.75164414 6015.53340104846,605049.46598931 7130986.29067586 6015.53340104846,605030.302914635 7130920.07712377 6015.53340104846,605006.613585051 7130853.43357364 6015.53340104846,604978.513412591 7130786.68470615 6015.53340104846,604946.139298469 7130720.15571508 6015.53340104846,604909.648966116 7130654.17072297 6015.53340104846,604869.220192764 7130589.05120208 6015.53340104846,604825.049943331 7130525.11440818 6015.53340104846,604777.353410833 7130462.67183488 6015.53340104846,604726.362967982 7130402.02769614 6015.53340104846,604672.32703509 7130343.47744409 6015.53340104846,604615.508869791 7130287.30632969 6015.53340104846,604556.185284474 7130233.78801295 6015.53340104846,604494.645297684 7130183.18322974 6015.53340104846,604431.188726051 7130135.73852147 6015.53340104846,604366.124723613 7130091.685034 6015.53340104846,604299.770275649 7130051.23739148 6015.53340104846,604232.44865436 7130014.59265076 6015.53340104846,604164.487843918 7129981.92934133 6015.53340104846,604096.218942561 7129953.40659557 6015.53340104846,604027.974549512 7129929.16337341 6015.53340104846,603960.087144595 7129909.3177854 6015.53340104846,603892.887468423 7129893.96651724 6015.53340104846,603826.702911064 7129883.18435878 6015.53340104846,603761.855917027 7129877.02383961 6015.53340104846,603698.66241435 7129875.51497315 6015.53340104846,603637.430275425 7129878.66511045 6015.53340104846,603578.457817078 7129886.45890437 6015.53340104846,603522.032347198 7129898.85838431 6015.53340104846,603468.428765003 7129915.80314126 6015.53340104846,603417.908221757 7129937.21062207 6015.53340104846,603370.716848468 7129962.97653164 6015.53340104846,603327.084556763 7129992.97534105 6015.53340104846,603287.223918782 7130027.06089911 6015.53340104846,603251.329131546 7130065.06714442 6015.53340104846,603219.57507085 7130106.80891436 6015.53340104846,603192.116439287 7130152.08284724 6015.53340104846,603169.087012548 7130200.668373 6015.53340104846,603150.598987686 7130252.32878783 6015.53340104846,603136.7424365 7130306.8124074 6015.53340104846,603127.584866715 7130363.85379299 6015.53340104846,603123.170893089 7130423.17504469 6015.53340104846,603123.522020059 7130484.48715534 6015.53340104846,603128.636536969 7130547.49141849 6015.53340104846,603138.489526407 7130611.88088371 6015.53340104846,603153.032985599 7130677.341852 6015.53340104846,603172.196060274 7130743.55540409 6015.53340104846,603195.885389858 7130810.19895422 6015.53340104846,603223.985562319 7130876.9478217 6015.53340104846,603256.35967644 7130943.47681278 6015.53340104846,603292.850008793 7131009.46180489 6015.53340104846,603333.278782146 7131074.58132577 6015.53340104846,603377.449031579 7131138.51811968 6015.53340104846,603425.145564077 7131200.96069298 6015.53340104846,603476.136006928 7131261.60483172 6015.53340104846,603530.171939819 7131320.15508376 6015.53340104846,603586.990105119 7131376.32619817 6015.53340104846)))",11,Ellipse
-"MULTISURFACE Z (CURVEPOLYGON Z ((598720.426668771 7129501.07513673 6222.05990263553,598737.08348921 7129539.33259355 0,598759.107863338 7129578.37201865 0,598785.750729354 7129617.60496801 0,598816.263025457 7129656.44299762 0,598849.895689849 7129694.29766348 0,598885.899660727 7129730.58052157 0,598923.525876292 7129764.70312787 0,598962.025274743 7129796.07703839 0,599000.64879428 7129824.1138091 0,599038.647373103 7129848.224996 6222.05990263553,599090.35157157 7129874.30266495 0,599146.00367577 7129894.69011308 0,599205.009018258 7129909.7538702 0,599266.772931592 7129919.86046615 0,599330.700748327 7129925.37643072 0,599396.197801019 7129926.66829374 0,599462.669422226 7129924.10258503 0,599529.520944502 7129918.04583439 0,599596.157700404 7129908.86457165 0,599661.985022489 7129896.92532662 0,599726.408243312 7129882.59462913 0,599788.832695429 7129866.23900898 0,599848.663711398 7129848.224996 6222.05990263553,599902.376256128 7129830.13297331 0,599956.195256374 7129809.86555117 0,600009.194223701 7129787.0724784 0,600060.446669673 7129761.40350381 0,600109.026105852 7129732.50837624 6222.05990263553,600151.75180082 7129702.55911261 0,600193.095497486 7129669.52023835 0,600232.780181392 7129633.79644701 0,600270.528838084 7129595.79243213 0,600306.064453104 7129555.91288726 0,600339.110011996 7129514.56250597 0,600369.388500304 7129472.14598179 6222.05990263553,600407.681790071 7129408.24692507 0,600440.631434992 7129340.02909043 0,600468.8990125 7129269.04579824 0,600493.146100025 7129196.85036882 0,600514.034275 7129124.99612252 6222.05990263553,600532.810643889 7129048.90030456 0,600548.165421972 7128970.40378468 0,600559.81205338 7128890.12000504 0,600567.463982244 7128808.66240778 0,600570.834652695 7128726.64443505 0,600569.637508864 7128644.67952901 0,600563.585994882 7128563.38113181 0,600552.393554879 7128483.36268559 0,600535.773632987 7128405.2376325 0,600513.439673337 7128329.6194147 0,600485.105120059 7128257.12147434 6222.05990263553,600465.862248906 7128214.68220142 0,600445.034640257 7128171.85941882 0,600422.256805209 7128130.00586423 0,600397.163254859 7128090.47427531 0,600369.388500304 7128054.61738977 6222.05990263553,600339.540023999 7128023.96001594 0,600305.906013452 7127995.78315236 0,600269.014792944 7127970.09439323 0,600229.394686755 7127946.90133275 0,600187.574019165 7127926.21156513 0,600144.081114455 7127908.03268458 0,600099.444296903 7127892.37228531 0,600054.191890791 7127879.23796151 0,600008.852220398 7127868.63730739 0,599963.953610004 7127860.57791716 0,599920.02438389 7127855.06738503 0,599877.592866336 7127852.11330519 6222.05990263553,599829.891076978 7127852.11194167 0,599780.612710565 7127855.76496616 0,599730.307504261 7127862.90630951 0,599679.52519523 7127873.36990253 0,599628.815520636 7127886.98967608 0,599578.728217643 7127903.59956097 0,599529.813023415 7127923.03348805 0,599482.619675116 7127945.12538814 0,599437.69790991 7127969.70919208 0,599395.597464961 7127996.6188307 0,599356.868077433 7128025.68823483 6222.05990263553,599321.07771703 7128057.23061787 0,599286.5912274 7128092.18018619 0,599253.736845365 7128130.009805 0,599222.842807748 7128170.19233953 0,599194.237351372 7128212.20065499 0,599168.24871306 7128255.5076166 0,599145.205129635 7128299.58608958 0,599125.434837919 7128343.90893916 6222.05990263553,599096.268680346 7128464.93771889 0,599085.231545178 7128593.43384482 0,599067.576528042 7128719.98795337 6222.05990263553,599035.654556808 7128811.71539051 0,598987.733708217 7128903.23064856 0,598929.958118777 7128994.09537865 0,598868.471924997 7129083.87123195 0,598809.419263384 7129172.1198596 0,598758.944270447 7129258.40291275 0,598723.191082693 7129342.28204255 0,598708.303836632 7129423.31890016 0,598720.426668771 7129501.07513673 6222.05990263553)))",12,Free Hand - Bezier segments
+"MULTISURFACE ZM (CURVEPOLYGON ZM ((603586.990105119 7131376.32619817 6015.53340104846 0,603646.313690435 7131429.8445149 6015.53340104846 0,603707.853677225 7131480.44929811 6015.53340104846 0,603771.310248859 7131527.89400638 6015.53340104846 0,603836.374251297 7131571.94749386 6015.53340104846 0,603902.728699261 7131612.39513638 6015.53340104846 0,603970.05032055 7131649.0398771 6015.53340104846 0,604038.011130991 7131681.70318652 6015.53340104846 0,604106.280032349 7131710.22593229 6015.53340104846 0,604174.524425398 7131734.46915445 6015.53340104846 0,604242.411830314 7131754.31474246 6015.53340104846 0,604309.611506486 7131769.66601061 6015.53340104846 0,604375.796063846 7131780.44816907 6015.53340104846 0,604440.643057882 7131786.60868825 6015.53340104846 0,604503.83656056 7131788.1175547 6015.53340104846 0,604565.068699485 7131784.9674174 6015.53340104846 0,604624.041157832 7131777.17362349 6015.53340104846 0,604680.466627711 7131764.77414355 6015.53340104846 0,604734.070209906 7131747.8293866 6015.53340104846 0,604784.590753153 7131726.42190579 6015.53340104846 0,604831.782126442 7131700.65599622 6015.53340104846 0,604875.414418146 7131670.65718681 6015.53340104846 0,604915.275056128 7131636.57162875 6015.53340104846 0,604951.169843364 7131598.56538344 6015.53340104846 0,604982.92390406 7131556.82361349 6015.53340104846 0,605010.382535623 7131511.54968062 6015.53340104846 0,605033.411962362 7131462.96415486 6015.53340104846 0,605051.899987224 7131411.30374002 6015.53340104846 0,605065.75653841 7131356.82012045 6015.53340104846 0,605074.914108195 7131299.77873487 6015.53340104846 0,605079.328081821 7131240.45748316 6015.53340104846 0,605078.976954851 7131179.14537251 6015.53340104846 0,605073.862437941 7131116.14110936 6015.53340104846 0,605064.009448503 7131051.75164414 6015.53340104846 0,605049.46598931 7130986.29067586 6015.53340104846 0,605030.302914635 7130920.07712377 6015.53340104846 0,605006.613585051 7130853.43357364 6015.53340104846 0,604978.513412591 7130786.68470615 6015.53340104846 0,604946.139298469 7130720.15571508 6015.53340104846 0,604909.648966116 7130654.17072297 6015.53340104846 0,604869.220192764 7130589.05120208 6015.53340104846 0,604825.049943331 7130525.11440818 6015.53340104846 0,604777.353410833 7130462.67183488 6015.53340104846 0,604726.362967982 7130402.02769614 6015.53340104846 0,604672.32703509 7130343.47744409 6015.53340104846 0,604615.508869791 7130287.30632969 6015.53340104846 0,604556.185284474 7130233.78801295 6015.53340104846 0,604494.645297684 7130183.18322974 6015.53340104846 0,604431.188726051 7130135.73852147 6015.53340104846 0,604366.124723613 7130091.685034 6015.53340104846 0,604299.770275649 7130051.23739148 6015.53340104846 0,604232.44865436 7130014.59265076 6015.53340104846 0,604164.487843918 7129981.92934133 6015.53340104846 0,604096.218942561 7129953.40659557 6015.53340104846 0,604027.974549512 7129929.16337341 6015.53340104846 0,603960.087144595 7129909.3177854 6015.53340104846 0,603892.887468423 7129893.96651724 6015.53340104846 0,603826.702911064 7129883.18435878 6015.53340104846 0,603761.855917027 7129877.02383961 6015.53340104846 0,603698.66241435 7129875.51497315 6015.53340104846 0,603637.430275425 7129878.66511045 6015.53340104846 0,603578.457817078 7129886.45890437 6015.53340104846 0,603522.032347198 7129898.85838431 6015.53340104846 0,603468.428765003 7129915.80314126 6015.53340104846 0,603417.908221757 7129937.21062207 6015.53340104846 0,603370.716848468 7129962.97653164 6015.53340104846 0,603327.084556763 7129992.97534105 6015.53340104846 0,603287.223918782 7130027.06089911 6015.53340104846 0,603251.329131546 7130065.06714442 6015.53340104846 0,603219.57507085 7130106.80891436 6015.53340104846 0,603192.116439287 7130152.08284724 6015.53340104846 0,603169.087012548 7130200.668373 6015.53340104846 0,603150.598987686 7130252.32878783 6015.53340104846 0,603136.7424365 7130306.8124074 6015.53340104846 0,603127.584866715 7130363.85379299 6015.53340104846 0,603123.170893089 7130423.17504469 6015.53340104846 0,603123.522020059 7130484.48715534 6015.53340104846 0,603128.636536969 7130547.49141849 6015.53340104846 0,603138.489526407 7130611.88088371 6015.53340104846 0,603153.032985599 7130677.341852 6015.53340104846 0,603172.196060274 7130743.55540409 6015.53340104846 0,603195.885389858 7130810.19895422 6015.53340104846 0,603223.985562319 7130876.9478217 6015.53340104846 0,603256.35967644 7130943.47681278 6015.53340104846 0,603292.850008793 7131009.46180489 6015.53340104846 0,603333.278782146 7131074.58132577 6015.53340104846 0,603377.449031579 7131138.51811968 6015.53340104846 0,603425.145564077 7131200.96069298 6015.53340104846 0,603476.136006928 7131261.60483172 6015.53340104846 0,603530.171939819 7131320.15508376 6015.53340104846 0,603586.990105119 7131376.32619817 6015.53340104846 6015.53340104846)))",11,Ellipse
+"MULTISURFACE ZM (CURVEPOLYGON ZM ((598720.426668771 7129501.07513673 6222.05990263553 0,598737.08348921 7129539.33259355 0 0,598759.107863338 7129578.37201865 0 0,598785.750729354 7129617.60496801 0 0,598816.263025457 7129656.44299762 0 0,598849.895689849 7129694.29766348 0 0,598885.899660727 7129730.58052157 0 0,598923.525876292 7129764.70312787 0 0,598962.025274743 7129796.07703839 0 0,599000.64879428 7129824.1138091 0 0,599038.647373103 7129848.224996 6222.05990263553 478.403457590657,599090.35157157 7129874.30266495 0 0,599146.00367577 7129894.69011308 0 0,599205.009018258 7129909.7538702 0 0,599266.772931592 7129919.86046615 0 0,599330.700748327 7129925.37643072 0 0,599396.197801019 7129926.66829374 0 0,599462.669422226 7129924.10258503 0 0,599529.520944502 7129918.04583439 0 0,599596.157700404 7129908.86457165 0 0,599661.985022489 7129896.92532662 0 0,599726.408243312 7129882.59462913 0 0,599788.832695429 7129866.23900898 0 0,599848.663711398 7129848.224996 6222.05990263553 1309.73240605851,599902.376256128 7129830.13297331 0 0,599956.195256374 7129809.86555117 0 0,600009.194223701 7129787.0724784 0 0,600060.446669673 7129761.40350381 0 0,600109.026105852 7129732.50837624 6222.05990263553 1595.49340145847,600151.75180082 7129702.55911261 0 0,600193.095497486 7129669.52023835 0 0,600232.780181392 7129633.79644701 0 0,600270.528838084 7129595.79243213 0 0,600306.064453104 7129555.91288726 0 0,600339.110011996 7129514.56250597 0 0,600369.388500304 7129472.14598179 6222.05990263553 1966.067601534,600407.681790071 7129408.24692507 0 0,600440.631434992 7129340.02909043 0 0,600468.8990125 7129269.04579824 0 0,600493.146100025 7129196.85036882 0 0,600514.034275 7129124.99612252 6222.05990263553 2343.78781772482,600532.810643889 7129048.90030456 0 0,600548.165421972 7128970.40378468 0 0,600559.81205338 7128890.12000504 0 0,600567.463982244 7128808.66240778 0 0,600570.834652695 7128726.64443505 0 0,600569.637508864 7128644.67952901 0 0,600563.585994882 7128563.38113181 0 0,600552.393554879 7128483.36268559 0 0,600535.773632987 7128405.2376325 0 0,600513.439673337 7128329.6194147 0 0,600485.105120059 7128257.12147434 6222.05990263553 3228.17978644839,600465.862248906 7128214.68220142 0 0,600445.034640257 7128171.85941882 0 0,600422.256805209 7128130.00586423 0 0,600397.163254859 7128090.47427531 0 0,600369.388500304 7128054.61738977 6222.05990263553 3462.27064246176,600339.540023999 7128023.96001594 0 0,600305.906013452 7127995.78315236 0 0,600269.014792944 7127970.09439323 0 0,600229.394686755 7127946.90133275 0 0,600187.574019165 7127926.21156513 0 0,600144.081114455 7127908.03268458 0 0,600099.444296903 7127892.37228531 0 0,600054.191890791 7127879.23796151 0 0,600008.852220398 7127868.63730739 0 0,599963.953610004 7127860.57791716 0 0,599920.02438389 7127855.06738503 0 0,599877.592866336 7127852.11330519 6222.05990263553 4007.11781439272,599829.891076978 7127852.11194167 0 0,599780.612710565 7127855.76496616 0 0,599730.307504261 7127862.90630951 0 0,599679.52519523 7127873.36990253 0 0,599628.815520636 7127886.98967608 0 0,599578.728217643 7127903.59956097 0 0,599529.813023415 7127923.03348805 0 0,599482.619675116 7127945.12538814 0 0,599437.69790991 7127969.70919208 0 0,599395.597464961 7127996.6188307 0 0,599356.868077433 7128025.68823483 6222.05990263553 4566.61205846862,599321.07771703 7128057.23061787 0 0,599286.5912274 7128092.18018619 0 0,599253.736845365 7128130.009805 0 0,599222.842807748 7128170.19233953 0 0,599194.237351372 7128212.20065499 0 0,599168.24871306 7128255.5076166 0 0,599145.205129635 7128299.58608958 0 0,599125.434837919 7128343.90893916 6222.05990263553 4963.87361198967,599096.268680346 7128464.93771889 0 0,599085.231545178 7128593.43384482 0 0,599067.576528042 7128719.98795337 6222.05990263553 5345.61970690188,599035.654556808 7128811.71539051 0 0,598987.733708217 7128903.23064856 0 0,598929.958118777 7128994.09537865 0 0,598868.471924997 7129083.87123195 0 0,598809.419263384 7129172.1198596 0 0,598758.944270447 7129258.40291275 0 0,598723.191082693 7129342.28204255 0 0,598708.303836632 7129423.31890016 0 0,598720.426668771 7129501.07513673 6222.05990263553 6222.05990263553)))",12,Free Hand - Bezier segments
 "MULTISURFACE ZM (CURVEPOLYGON ZM (COMPOUNDCURVE ZM ((603667.312163369 7127302.45936135 7122.59129898725 0,604101.249487456 7125306.34767055 7122.59129898725 2042.73431541907,602057.457291204 7124966.28612571 7122.59129898725 4114.6243693885),CIRCULARSTRING ZM (602057.457291204 7124966.28612571 7122.59129898725 4114.6243693885,602123.767616766 7125739.9065906 7122.59129898725 0,602568.004275681 7126376.7264033 7122.59129898725 5685.42069618537),(602568.004275681 7126376.7264033 7122.59129898725 5685.42069618537,603667.312163369 7127302.45936135 7122.59129898725 7122.59129898725))))",13,Streight + Arc
 "MULTISURFACE ZM (CURVEPOLYGON ZM (COMPOUNDCURVE ZM ((606589.156812223 7126376.7264033 7944.21069612419 0,606328.794417772 7126550.30133293 7944.21069612419 312.916654464901,606587.626280171 7127108.47450544 7944.21069612419 928.181819659723),CIRCULARSTRING ZM (606587.626280171 7127108.47450544 7944.21069612419 928.181819659723,605297.671996129 7127308.73966999 7944.21069612419 0,605270.896472146 7128613.87233082 7944.21069612419 3763.78785003061),CIRCULARSTRING ZM (605270.896472146 7128613.87233082 7944.21069612419 3763.78785003061,606551.551714292 7128866.8749826 7944.21069612419 0,607023.094136311 7127649.60922062 7944.21069612419 6599.39388039466),(607023.094136311 7127649.60922062 7944.21069612419 6599.39388039466,606589.156812223 7126376.7264033 7944.21069612419 7944.21069612419))))",14,Streight + 2 Arcs
diff --git a/autotest/ogr/ogr_geom.py b/autotest/ogr/ogr_geom.py
index 9b3aee7c5492..281da6586b64 100755
--- a/autotest/ogr/ogr_geom.py
+++ b/autotest/ogr/ogr_geom.py
@@ -657,9 +657,9 @@ def test_ogr_geom_segmentize():
     assert geom.ExportToWkt() == 'LINESTRING (0 0 1,0 1 1,0 2 1,0 3 1,0 4 1,0 5 1,0 6 1,0 7 1,0 8 1,0 9 1,0 10 1)'
 
     # 2D + M
-    geom = ogr.CreateGeometryFromWkt('LINESTRING M(0 0 1,0 10 1)')
+    geom = ogr.CreateGeometryFromWkt('LINESTRING M(0 0 1,0 10 2)')
     geom.Segmentize(5)
-    assert geom.ExportToIsoWkt() == 'LINESTRING M (0 0 1,0 5 1,0 10 1)'
+    assert geom.ExportToIsoWkt() == 'LINESTRING M (0 0 1,0 5 2,0 10 2)'
 
     # 2D + ZM
     geom = ogr.CreateGeometryFromWkt('LINESTRING ZM(0 0 1 2,0 10 1 2)')
@@ -3259,6 +3259,14 @@ def test_ogr_geom_force_polygonzm_to_linestring():
 ###############################################################################
 
 
+def test_ogr_geom_force_polygonzm_to_multilinestring():
+    g = ogr.CreateGeometryFromWkt('POLYGON ZM ((0 0 10 20,0 1 30 40,1 1 50 60,0 0 10 70))')
+    wkt = ogr.ForceToMultiLineString(g).ExportToIsoWkt()
+    assert wkt == 'MULTILINESTRING ZM ((0 0 10 20,0 1 30 40,1 1 50 60,0 0 10 70))'
+
+###############################################################################
+
+
 def test_ogr_geom_create_from_wkt_polyhedrasurface():
     g = ogr.CreateGeometryFromWkt('POLYHEDRALSURFACE (((0 0 0,0 0 1,0 1 1,0 1 0,0 0 0)))')
     assert g.ExportToWkt() == 'POLYHEDRALSURFACE Z (((0 0 0,0 0 1,0 1 1,0 1 0,0 0 0)))'
diff --git a/gdal/ogr/ogrlinestring.cpp b/gdal/ogr/ogrlinestring.cpp
index c9ac358faf63..8d9f672fd973 100644
--- a/gdal/ogr/ogrlinestring.cpp
+++ b/gdal/ogr/ogrlinestring.cpp
@@ -1385,17 +1385,15 @@ void OGRSimpleCurve::reversePoints()
 {
     for( int i = 0; i < nPointCount/2; i++ )
     {
-        const OGRRawPoint sPointTemp = paoPoints[i];
-
-        paoPoints[i] = paoPoints[nPointCount-i-1];
-        paoPoints[nPointCount-i-1] = sPointTemp;
-
+        std::swap(paoPoints[i], paoPoints[nPointCount-i-1]);
         if( padfZ )
         {
-            const double dfZTemp = padfZ[i];
+            std::swap(padfZ[i], padfZ[nPointCount-i-1]);
+        }
 
-            padfZ[i] = padfZ[nPointCount-i-1];
-            padfZ[nPointCount-i-1] = dfZTemp;
+        if( padfM )
+        {
+            std::swap(padfM[i], padfM[nPointCount-i-1]);
         }
     }
 }
@@ -1471,6 +1469,15 @@ void OGRSimpleCurve::addSubLineString( const OGRLineString *poOtherLine,
                         sizeof(double) * nPointsToAdd );
             }
         }
+        if( poOtherLine->padfM != nullptr )
+        {
+            AddM();
+            if( padfM != nullptr )
+            {
+                memcpy( padfM + nOldPoints, poOtherLine->padfM + nStartVertex,
+                        sizeof(double) * nPointsToAdd );
+            }
+        }
     }
 
 /* -------------------------------------------------------------------- */
@@ -1497,6 +1504,17 @@ void OGRSimpleCurve::addSubLineString( const OGRLineString *poOtherLine,
                 }
             }
         }
+        if( poOtherLine->padfM != nullptr )
+        {
+            AddM();
+            if( padfM != nullptr )
+            {
+                for( int i = 0; i < nPointsToAdd; i++ )
+                {
+                    padfM[i+nOldPoints] = poOtherLine->padfM[nStartVertex-i];
+                }
+            }
+        }
     }
 }
 

From 3c9a2dcb0294acc635657308be554277306bcc3f Mon Sep 17 00:00:00 2001
From: Even Rouault <even.rouault@spatialys.com>
Date: Wed, 23 Oct 2019 15:22:40 +0200
Subject: [PATCH 402/488] JPEG: fix further calls to RasterIO after reading
 full image at full resolution (fixes #1947)

---
 autotest/gdrivers/jpeg.py      | 8 ++++++++
 gdal/frmts/jpeg/jpgdataset.cpp | 2 +-
 2 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/autotest/gdrivers/jpeg.py b/autotest/gdrivers/jpeg.py
index dd0d516b0266..dcfb53919836 100755
--- a/autotest/gdrivers/jpeg.py
+++ b/autotest/gdrivers/jpeg.py
@@ -796,8 +796,15 @@ def test_jpeg_23():
     assert cs == got_cs
 
     # Pixel interleaved
+    ds = gdal.Open('data/albania.jpg')
     data = ds.ReadRaster(0, 0, ds.RasterXSize, ds.RasterYSize,
                          buf_pixel_space=3, buf_band_space=1)
+    y = int(ds.RasterYSize/2)
+    data_bottom = ds.ReadRaster(0, y, ds.RasterXSize, ds.RasterYSize - y,
+                                buf_pixel_space=3, buf_band_space=1)
+    data_top = ds.ReadRaster(0, 0, ds.RasterXSize, y,
+                             buf_pixel_space=3, buf_band_space=1)
+    assert data == data_top + data_bottom
     tmp_ds = gdal.GetDriverByName('Mem').Create(
         '', ds.RasterXSize, ds.RasterYSize, 3)
     tmp_ds.WriteRaster(0, 0, ds.RasterXSize, ds.RasterYSize, data,
@@ -806,6 +813,7 @@ def test_jpeg_23():
     assert cs == got_cs
 
     # Pixel interleaved with padding
+    ds = gdal.Open('data/albania.jpg')
     data = ds.ReadRaster(0, 0, ds.RasterXSize, ds.RasterYSize,
                          buf_pixel_space=4, buf_band_space=1)
     tmp_ds = gdal.GetDriverByName('Mem').Create(
diff --git a/gdal/frmts/jpeg/jpgdataset.cpp b/gdal/frmts/jpeg/jpgdataset.cpp
index 89fe82308a84..851605671d62 100644
--- a/gdal/frmts/jpeg/jpgdataset.cpp
+++ b/gdal/frmts/jpeg/jpgdataset.cpp
@@ -1869,7 +1869,7 @@ CPLErr JPGDatasetCommon::IRasterIO( GDALRWFlag eRWFlag,
                     }
                 }
             }
-            nLoadedScanline = -1;
+            nLoadedScanline = nRasterYSize;
         }
         else
         {

From 5005679ee9e00568ace3300c505349883a1d18c6 Mon Sep 17 00:00:00 2001
From: Thomas Bonfort <thomas.bonfort@airbus.com>
Date: Wed, 23 Oct 2019 16:47:33 +0200
Subject: [PATCH 403/488] JP2KAK: fix issue with multi-threaded reads

---
 gdal/frmts/jp2kak/jp2kakdataset.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/gdal/frmts/jp2kak/jp2kakdataset.cpp b/gdal/frmts/jp2kak/jp2kakdataset.cpp
index b89fa6601d42..d9ab8cd540c5 100644
--- a/gdal/frmts/jp2kak/jp2kakdataset.cpp
+++ b/gdal/frmts/jp2kak/jp2kakdataset.cpp
@@ -1320,11 +1320,11 @@ JP2KAKDataset::DirectRasterIO( GDALRWFlag /* eRWFlag */,
             wrk_jp2_src.open(&wrk_family);
             wrk_jp2_src.read_header();
 
-            oWCodeStream.create(&wrk_jp2_src);
+            oWCodeStream.create(&wrk_jp2_src, poThreadEnv);
         }
         else
         {
-            oWCodeStream.create(&subfile_src);
+            oWCodeStream.create(&subfile_src, poThreadEnv);
         }
 
         if( bFussy )

From 753f0e20b27055d0d562b7ae1c07647338b07870 Mon Sep 17 00:00:00 2001
From: Even Rouault <even.rouault@spatialys.com>
Date: Mon, 28 Oct 2019 10:52:42 +0100
Subject: [PATCH 404/488] Prepare for GDAL 2.4.3

---
 gdal/GDALmake.opt.in               |   2 +-
 gdal/NEWS                          | 116 +++++++++++++++++++++++++++++
 gdal/VERSION                       |   2 +-
 gdal/gcore/gdal_version.h.in       |   6 +-
 gdal/swig/include/perl/gdal_perl.i |   4 +-
 gdal/swig/include/perl/ogr_perl.i  |   2 +-
 gdal/swig/python/README.rst        |   2 +-
 gdal/swig/python/setup.py          |   2 +-
 8 files changed, 126 insertions(+), 10 deletions(-)

diff --git a/gdal/GDALmake.opt.in b/gdal/GDALmake.opt.in
index a832b17a3efb..80f0dacd9071 100644
--- a/gdal/GDALmake.opt.in
+++ b/gdal/GDALmake.opt.in
@@ -123,7 +123,7 @@ GDAL_INCLUDE	=	-I$(GDAL_ROOT)/port -I$(GDAL_ROOT)/gcore \
 # libtool targets and help variables
 LIBGDAL	:=		libgdal.la
 LIBGDAL_CURRENT	:=	25
-LIBGDAL_REVISION	:=	2
+LIBGDAL_REVISION	:=	3
 LIBGDAL_AGE	:=	5
 
 # native build targets and variables
diff --git a/gdal/NEWS b/gdal/NEWS
index 10a66af93045..6d8d9360e062 100644
--- a/gdal/NEWS
+++ b/gdal/NEWS
@@ -1,3 +1,119 @@
+= GDAL/OGR 2.4.3 Release Notes =
+
+The 2.4.3 release is a bug fix release.
+
+== Misc ==
+
+ * Replace a few catch of bad_alloc by exception to handle the case of 32 bit trying to allocate more than 4GB of memory and thus throwing a length_error exception. Found by OSS Fuzz
+ * Fix issues with thread_local and C++ objects that don't work well with DLL on Windows
+
+== Port ==
+
+ * /vsicrypt/: fix memleak in error code path
+ * /vsitar/: support >100 character file names (#1559)
+ * /vsitar/: accept space as end of field terminator
+
+== GDAL core ==
+
+ * fix non-neareset resampling over nodata blocks (#1941)
+
+== GDAL utilities ==
+
+ * gdalwarp: adjust nodata values, passed with -srcnodata/-dstnodata, and close to FLT_MAX to exactly it (#1724)
+ * Python scripts: GetOutputDriverFor(): fixes error when multiple drivers found ( #1719)
+
+== GDAL drivers ==
+
+BAG driver:
+ * calculate the northeast pixel corner rather than scaling the resolution, due to an incorrectly shifted northeast corner in some CARIS surveys (#1728)
+
+CTable2Dataset driver:
+ * SetGeoTransform(): fix read buffer overflow from stack
+
+ENVI driver:
+ * preserve 'byte order' on update (#1796)
+
+GTiff driver:
+ * make sure that GetMetadataDomainList() doesn't return EXIF when there's no EXIF metadata (https://github.com/mapbox/rasterio/pull/1740#issuecomment-526660946)
+ * Internal libtiff: backport security related fixes
+
+HDF5 and netCDF drivers:
+ * fix crash when reading attributes of type string of variable length with NULL values
+
+JP2KAK driver:
+ * fix issue with multi-threaded reads
+
+JP2OpenJPEG driver:
+ * fix error logic in multi-threaded code causing memory corruption
+ * fix reading overviews, when tiled API is used, and the dimensions of the full resolution image are not a multiple of 2^numresolutions (#1860)
+ * fix to return the proper number of bytes read when we read more than 2 GB at once (https://github.com/uclouvain/openjpeg/issues/1151)
+
+JPEG driver:
+ * fix further calls to RasterIO after reading full image at full resolution (#1947)
+
+PDF driver:
+ * fix nullptr dereferences on corrupted files (OSS Fuzz #16438, #16558, #16759)
+ * fix potential heap buffer overflow (OSS Fuzz #16546)
+ * avoid potential integer division by zero (OSS Fuzz #17129)
+
+SAFE driver:
+ * avoid potential use-after-free (Coverity 1404037 and 1404140)
+
+Terragen driver:
+ * avoid potential use-after-free on error code path in write_header() (Coverity 1404060)
+
+USGSDEM driver:
+ * avoid int overflow. Fixes OSS Fuzz #15715
+ * fix reading FEMA generated Lidar datasets whose header is 918 bytes large
+
+VRT driver:
+ * avoid erroneous pixel request do be done with KernelFilteredSource
+
+== OGR core ==
+
+ * OGRExpatRealloc(): fix double-free when size to allocate is above the default 10MB threshold. OSS Fuzz #16178 / CVE-2019-17545
+ * OGR SQLite: do not propagate 'IS / IS NOT value' constructs to OGR SQL
+ * OGRSimpleCurve::getPoints() with XYZM: fix wrong stride used for M array
+ * OGRSimpleCurve: fix reversePoints() and addSubLineString() to take into account M dimension
+
+== OGR drivers ==
+
+CAD driver:
+ * libopencad: CADBuffer: replace m_guard by m_nSize to avoid pointer wrap around on 32 bit platforms on corrupted files. OSS Fuzz #16388
+
+DGN driver:
+ * avoid size_t overflow / illegal memory access. OSS Fuzz #16393
+
+GeoJSON driver:
+ * fix update of file on Windows (https://github.com/qgis/QGIS/issues/28580)
+
+GPX driver:
+ * fix memory leak when streaming to /vsistdout/
+
+LIBKML driver:
+ * fix potential memory leak. (Coverity 1404148)
+
+MITAB driver:
+ * fix potential double-free (Coverity 1404224)
+ * avoid potential nullptr deref (Coverity 1404174)
+
+PDF driver:
+ * fix reading polygon with holes and Bezier curves (#1932)
+ * fix reading strings with escape sequences
+
+PostgreSQL driver:
+ * add support for PostgreSQL 12 (#1692)
+ * be more restrictive when deducing non-nullability of columns in SQL result layers (#1734)
+
+S57 driver:
+ * s57objectclasses.csv: add missing TXTDSC attribute for DRYDOC class (#1723)
+
+XLSX driver:
+ * add support for .xlsm extension
+
+WFS3 driver:
+ * correctly handle user query string parameters in connection URL (#1710)
+
 = GDAL/OGR 2.4.2 Release Notes =
 
 The 2.4.2 release is a bug fix release.
diff --git a/gdal/VERSION b/gdal/VERSION
index 8e8299dcc068..35cee72dcbf4 100644
--- a/gdal/VERSION
+++ b/gdal/VERSION
@@ -1 +1 @@
-2.4.2
+2.4.3
diff --git a/gdal/gcore/gdal_version.h.in b/gdal/gcore/gdal_version.h.in
index 8f218f40ad82..f7c4ec52115d 100644
--- a/gdal/gcore/gdal_version.h.in
+++ b/gdal/gcore/gdal_version.h.in
@@ -7,7 +7,7 @@
 #ifndef GDAL_VERSION_MAJOR
 #  define GDAL_VERSION_MAJOR    2
 #  define GDAL_VERSION_MINOR    4
-#  define GDAL_VERSION_REV      2
+#  define GDAL_VERSION_REV      3
 #  define GDAL_VERSION_BUILD    0
 #endif
 
@@ -24,9 +24,9 @@
 
 #if !defined(DO_NOT_DEFINE_GDAL_RELEASE_DATE_AND_GDAL_RELEASE_NAME)
 #ifndef GDAL_RELEASE_DATE
-#  define GDAL_RELEASE_DATE     20190628
+#  define GDAL_RELEASE_DATE     20191028
 #endif
 #ifndef GDAL_RELEASE_NAME
-#  define GDAL_RELEASE_NAME     "2.4.2"
+#  define GDAL_RELEASE_NAME     "2.4.3"
 #endif
 #endif
diff --git a/gdal/swig/include/perl/gdal_perl.i b/gdal/swig/include/perl/gdal_perl.i
index cc77d34562d7..6f37a074b574 100644
--- a/gdal/swig/include/perl/gdal_perl.i
+++ b/gdal/swig/include/perl/gdal_perl.i
@@ -143,8 +143,8 @@ use Geo::GDAL::Const;
 # Note that the 1/100000 digits may be used to create more than one
 # CPAN release from one GDAL release.
 
-our $VERSION = '2.0402';
-our $GDAL_VERSION = '2.4.2';
+our $VERSION = '2.0403';
+our $GDAL_VERSION = '2.4.3';
 
 =pod
 
diff --git a/gdal/swig/include/perl/ogr_perl.i b/gdal/swig/include/perl/ogr_perl.i
index 283934371b2e..fca234e89d5b 100644
--- a/gdal/swig/include/perl/ogr_perl.i
+++ b/gdal/swig/include/perl/ogr_perl.i
@@ -126,7 +126,7 @@ ALTERED_DESTROY(OGRGeometryShadow, OGRc, delete_Geometry)
 %perlcode %{
 
 package Geo::OGR;
-our $VERSION = '2.0402'; # this needs to be the same as that in gdal_perl.i
+our $VERSION = '2.0403'; # this needs to be the same as that in gdal_perl.i
 
 Geo::GDAL->import(qw(:INTERNAL));
 
diff --git a/gdal/swig/python/README.rst b/gdal/swig/python/README.rst
index e438657a1a7b..c0a615157c0b 100644
--- a/gdal/swig/python/README.rst
+++ b/gdal/swig/python/README.rst
@@ -16,7 +16,7 @@ reference documentation, but the `GDAL API Tutorial`_ includes Python examples.
 Dependencies
 ------------
  
- * libgdal (2.4.2 or greater) and header files (gdal-devel)
+ * libgdal (2.4.3 or greater) and header files (gdal-devel)
  * numpy (1.0.0 or greater) and header files (numpy-devel) (not explicitly 
    required, but many examples and utilities will not work without it)
 
diff --git a/gdal/swig/python/setup.py b/gdal/swig/python/setup.py
index 50d01eea604f..835b8179db7d 100644
--- a/gdal/swig/python/setup.py
+++ b/gdal/swig/python/setup.py
@@ -7,7 +7,7 @@
 # Howard Butler hobu.inc@gmail.com
 
 
-gdal_version = '2.4.2'
+gdal_version = '2.4.3'
 
 import sys
 import os

From 91f07b568918c4e0ee7263493c0afff190d3fa37 Mon Sep 17 00:00:00 2001
From: Even Rouault <even.rouault@spatialys.com>
Date: Mon, 28 Oct 2019 21:48:34 +0100
Subject: [PATCH 405/488] PDS: fix opening of datasets with BSQ organization
 (or single band), where one band is larger than 2 GB (2.3 regression)

---
 gdal/frmts/pds/pdsdataset.cpp | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/gdal/frmts/pds/pdsdataset.cpp b/gdal/frmts/pds/pdsdataset.cpp
index 34410ff78aa9..8c9f38489c78 100644
--- a/gdal/frmts/pds/pdsdataset.cpp
+++ b/gdal/frmts/pds/pdsdataset.cpp
@@ -1049,7 +1049,9 @@ int PDSDataset::ParseImage( CPLString osPrefix, CPLString osFilenamePrefix )
     int nLineOffset = nLinePrefixBytes;
 
     int nPixelOffset;
-    int nBandOffset;
+    vsi_l_offset nBandOffset;
+
+    const auto CPLSM64 = [](int x) { return CPLSM(static_cast<GInt64>(x)); };
 
     try
     {
@@ -1063,18 +1065,19 @@ int PDSDataset::ParseImage( CPLString osPrefix, CPLString osFilenamePrefix )
         {
             nPixelOffset = nItemSize;
             nLineOffset = (CPLSM(nLineOffset) + CPLSM(nPixelOffset) * CPLSM(nCols)).v();
-            nBandOffset = (CPLSM(nLineOffset) * CPLSM(nRows)
-                + CPLSM(nSuffixLines) * (CPLSM(nCols) + CPLSM(nSuffixItems)) * CPLSM(nSuffixBytes)).v();
+            nBandOffset = static_cast<vsi_l_offset>((CPLSM64(nLineOffset) * CPLSM64(nRows)
+                + CPLSM64(nSuffixLines) * (CPLSM64(nCols) + CPLSM64(nSuffixItems)) * CPLSM64(nSuffixBytes)).v());
         }
         else /* assume BIL */
         {
             nPixelOffset = nItemSize;
             nBandOffset = (CPLSM(nItemSize) * CPLSM(nCols)).v();
-            nLineOffset = (CPLSM(nLineOffset) + CPLSM(nBandOffset) * CPLSM(l_nBands)).v();
+            nLineOffset = (CPLSM(nLineOffset) + CPLSM(static_cast<int>(nBandOffset)) * CPLSM(l_nBands)).v();
         }
     }
     catch( const CPLSafeIntOverflow& )
     {
+        CPLError(CE_Failure, CPLE_AppDefined, "Integer overflow");
         return FALSE;
     }
 

From e1e63baf19b764220a8091036149e09f7ad2cd84 Mon Sep 17 00:00:00 2001
From: Even Rouault <even.rouault@spatialys.com>
Date: Mon, 28 Oct 2019 22:22:36 +0100
Subject: [PATCH 406/488] IRIS: make identification more restrictive to avoid
 false-positive identification of raw binary formats such as ENVI (fixes
 #1961)

---
 autotest/gdrivers/data/fakeiris.dat | Bin 641 -> 641 bytes
 gdal/frmts/iris/irisdataset.cpp     |  13 ++++++++++---
 2 files changed, 10 insertions(+), 3 deletions(-)

diff --git a/autotest/gdrivers/data/fakeiris.dat b/autotest/gdrivers/data/fakeiris.dat
index 7c1a136d22f8a09cc467bbb4816d24d86ba0ec8b..e709d5dda73f4d3f44c5008908a03095928da9b1 100644
GIT binary patch
delta 19
acmZo<ZDgIG#`>6@k%4idqU**2K_&n)_XOVn

delta 13
UcmZo<ZDgIGHgTTU#sWbm03av?Z~y=R

diff --git a/gdal/frmts/iris/irisdataset.cpp b/gdal/frmts/iris/irisdataset.cpp
index cea77c458ec9..c46b48072a7a 100644
--- a/gdal/frmts/iris/irisdataset.cpp
+++ b/gdal/frmts/iris/irisdataset.cpp
@@ -709,11 +709,18 @@ int IRISDataset::Identify( GDALOpenInfo * poOpenInfo )
 
     const short nId1 = CPL_LSBSINT16PTR(poOpenInfo->pabyHeader);
     const short nId2 = CPL_LSBSINT16PTR(poOpenInfo->pabyHeader + 12);
-    unsigned short nType = CPL_LSBUINT16PTR(poOpenInfo->pabyHeader + 24);
+    unsigned short nProductCode = CPL_LSBUINT16PTR(poOpenInfo->pabyHeader + 12 + 12);
+    const short nYear = CPL_LSBSINT16PTR(poOpenInfo->pabyHeader+26+12);
+    const short nMonth = CPL_LSBSINT16PTR(poOpenInfo->pabyHeader+28+12);
+    const short nDay = CPL_LSBSINT16PTR(poOpenInfo->pabyHeader+30+12);
 
     // Check if the two headers are 27 (product hdr) & 26 (product
-    // configuration), and the product type is in the range 1 -> 34.
-    if( !(nId1 == 27 && nId2 == 26 && nType > 0 && nType < 35) )
+    // configuration), and other metadata
+    if( !(nId1 == 27 && nId2 == 26 &&
+          nProductCode > 0 && nProductCode < CPL_ARRAYSIZE(aszProductNames) &&
+          nYear >= 1900 && nYear < 2100 &&
+          nMonth >= 1 && nMonth <= 12 &&
+          nDay >= 1 && nDay <= 31) )
         return FALSE;
 
     return TRUE;

From 33bdc43a5d0832cc9addc8af08474cff47c59bd5 Mon Sep 17 00:00:00 2001
From: Even Rouault <even.rouault@spatialys.com>
Date: Thu, 31 Oct 2019 11:58:48 +0100
Subject: [PATCH 407/488] OGRLinearRing::isPointOnRingBoundary(): fix
 incomplete test that could falsely return true if the point was aligned with
 a segment, but not between the nodes. Impact correct reconstruction of holes
 in shapefile driver

---
 autotest/cpp/test_ogr.cpp  | 72 ++++++++++++++++++++++++++++++++++++++
 gdal/ogr/ogrlinearring.cpp | 34 ++++++++++++------
 2 files changed, 95 insertions(+), 11 deletions(-)

diff --git a/autotest/cpp/test_ogr.cpp b/autotest/cpp/test_ogr.cpp
index efb1ff4746a2..fc35d7478432 100644
--- a/autotest/cpp/test_ogr.cpp
+++ b/autotest/cpp/test_ogr.cpp
@@ -1470,4 +1470,76 @@ namespace tut
                strcmp("2001-02-03T04:05:06.789-03:00", pszDateTime) == 0);
         CPLFree(pszDateTime);
     }
+
+    // Test OGRLinearRing::isPointOnRingBoundary()
+    template<>
+    template<>
+    void object::test<16>()
+    {
+        OGRPolygon oPoly;
+        const char* pszPoly = "POLYGON((10 9,11 10,10 11,9 10,10 9))";
+        oPoly.importFromWkt(&pszPoly);
+        auto poRing = oPoly.getExteriorRing();
+
+        // On first vertex
+        {
+            OGRPoint p(10, 9);
+            ensure(poRing->isPointOnRingBoundary(&p, false));
+        }
+
+        // On second vertex
+        {
+            OGRPoint p(11, 10);
+            ensure(poRing->isPointOnRingBoundary(&p, false));
+        }
+
+        // Middle of first segment
+        {
+            OGRPoint p(10.5, 9.5);
+            ensure(poRing->isPointOnRingBoundary(&p, false));
+        }
+
+        // "Before" first segment
+        {
+            OGRPoint p(10-1, 9-1);
+            ensure(!poRing->isPointOnRingBoundary(&p, false));
+        }
+
+        // "After" first segment
+        {
+            OGRPoint p(11+1, 10+1);
+            ensure(!poRing->isPointOnRingBoundary(&p, false));
+        }
+
+        // On third vertex
+        {
+            OGRPoint p(10, 11);
+            ensure(poRing->isPointOnRingBoundary(&p, false));
+        }
+
+        // Middle of second segment
+        {
+            OGRPoint p(10.5, 10.5);
+            ensure(poRing->isPointOnRingBoundary(&p, false));
+        }
+
+        // On fourth vertex
+        {
+            OGRPoint p(9, 10);
+            ensure(poRing->isPointOnRingBoundary(&p, false));
+        }
+
+        // Middle of third segment
+        {
+            OGRPoint p(9.5, 10.5);
+            ensure(poRing->isPointOnRingBoundary(&p, false));
+        }
+
+        // Middle of fourth segment
+        {
+            OGRPoint p(9.5, 9.5);
+            ensure(poRing->isPointOnRingBoundary(&p, false));
+        }
+    }
+
 } // namespace tut
diff --git a/gdal/ogr/ogrlinearring.cpp b/gdal/ogr/ogrlinearring.cpp
index 0b10be6349ad..5e01c153a7ca 100644
--- a/gdal/ogr/ogrlinearring.cpp
+++ b/gdal/ogr/ogrlinearring.cpp
@@ -702,16 +702,16 @@ OGRBoolean OGRLinearRing::isPointOnRingBoundary( const OGRPoint* poPoint,
         }
     }
 
-    double prev_diff_x = getX(0) - dfTestX;
-    double prev_diff_y = getY(0) - dfTestY;
+    double prev_diff_x = dfTestX - getX(0);
+    double prev_diff_y = dfTestY - getY(0);
 
     for( int iPoint = 1; iPoint < iNumPoints; iPoint++ )
     {
-        const double x1 = getX(iPoint) - dfTestX;
-        const double y1 = getY(iPoint) - dfTestY;
+        const double dx1 = dfTestX - getX(iPoint);
+        const double dy1 = dfTestY - getY(iPoint);
 
-        const double x2 = prev_diff_x;
-        const double y2 = prev_diff_y;
+        const double dx2 = prev_diff_x;
+        const double dy2 = prev_diff_y;
 
         // If the point is on the segment, return immediately.
         // FIXME? If the test point is not exactly identical to one of
@@ -719,17 +719,29 @@ OGRBoolean OGRLinearRing::isPointOnRingBoundary( const OGRPoint* poPoint,
         // little chance that we get 0. So that should be tested against some
         // epsilon.
 
-        if( x1 * y2 - x2 * y1 == 0 )
+        if( dx1 * dy2 - dx2 * dy1 == 0 )
         {
             // If iPoint and iPointPrev are the same, go on.
-            if( !(x1 == x2 && y1 == y2) )
+            if( !(dx1 == dx2 && dy1 == dy2) )
             {
-                return 1;
+                const double dx_segment = getX(iPoint) - getX(iPoint-1);
+                const double dy_segment = getY(iPoint) - getY(iPoint-1);
+                const double crossproduct =
+                    dx2 * dx_segment + dy2 * dy_segment;
+                if( crossproduct >= 0 )
+                {
+                    const double sq_length_seg = dx_segment * dx_segment +
+                                                 dy_segment * dy_segment;
+                    if( crossproduct <= sq_length_seg )
+                    {
+                        return 1;
+                    }
+                }
             }
         }
 
-        prev_diff_x = x1;
-        prev_diff_y = y1;
+        prev_diff_x = dx1;
+        prev_diff_y = dy1;
     }
 
     return 0;

From fc2979827b05dc34ce6669e14665719f2d9a55e9 Mon Sep 17 00:00:00 2001
From: Even Rouault <even.rouault@spatialys.com>
Date: Sat, 2 Nov 2019 12:46:36 +0100
Subject: [PATCH 408/488] nasakeywordhandler: fixes to be able to read some
 labels with metadata items whose value is a list on several lines

---
 autotest/gdrivers/pds.py              | 57 +++++++++++++++++++++++++++
 gdal/frmts/pds/nasakeywordhandler.cpp | 29 +++++++++++++-
 2 files changed, 84 insertions(+), 2 deletions(-)

diff --git a/autotest/gdrivers/pds.py b/autotest/gdrivers/pds.py
index 01fed06600f0..e07ae7fbd715 100755
--- a/autotest/gdrivers/pds.py
+++ b/autotest/gdrivers/pds.py
@@ -315,4 +315,61 @@ def test_pds_band_storage_type_line_interleaved():
     return tst.testOpen()
 
 
+###############################################################################
+
+def test_pds_sharp_on_continuing_line():
+
+    gdal.FileFromMemBuffer('/vsimem/test',
+                           """PDS_VERSION_ID                       = "PDS3"
+
+NOTE = (#9933FF,
+        #FFFF33)
+
+^IMAGE                               = 1 <BYTES>
+OBJECT                               = IMAGE
+    BANDS                            = 1
+    BAND_STORAGE_TYPE                = "BAND SEQUENTIAL"
+    LINES                            = 1
+    LINE_SAMPLES                     = 1
+    SAMPLE_BITS                      = 8
+
+END_OBJECT                           = IMAGE
+
+END
+""")
+
+    ds = gdal.Open('/vsimem/test')
+
+    assert ds.GetMetadataItem('NOTE') == '(#9933FF,#FFFF33)'
+
+    gdal.Unlink('/vsimem/test')
+
+
+###############################################################################
+
+def test_pds_sharp_comma_continuing_line():
+
+    gdal.FileFromMemBuffer('/vsimem/test',
+                           """PDS_VERSION_ID                       = "PDS3"
+
+NOTE = ("a"
+        ,"b")
+
+^IMAGE                               = 1 <BYTES>
+OBJECT                               = IMAGE
+    BANDS                            = 1
+    BAND_STORAGE_TYPE                = "BAND SEQUENTIAL"
+    LINES                            = 1
+    LINE_SAMPLES                     = 1
+    SAMPLE_BITS                      = 8
+
+END_OBJECT                           = IMAGE
+
+END
+""")
+
+    ds = gdal.Open('/vsimem/test')
+
+    assert ds.GetMetadataItem('NOTE') == '("a","b")'
 
+    gdal.Unlink('/vsimem/test')
diff --git a/gdal/frmts/pds/nasakeywordhandler.cpp b/gdal/frmts/pds/nasakeywordhandler.cpp
index 2777f3b90a27..864c6934b07a 100644
--- a/gdal/frmts/pds/nasakeywordhandler.cpp
+++ b/gdal/frmts/pds/nasakeywordhandler.cpp
@@ -197,6 +197,18 @@ int NASAKeywordHandler::ReadGroup( const char *pszPathPrefix, CPLJSONObject &oCu
     }
 }
 
+/************************************************************************/
+/*                        StripQuotesIfNeeded()                         */
+/************************************************************************/
+
+static CPLString StripQuotesIfNeeded(const CPLString& osWord,
+                                     bool bQuotesAlreadyRemoved)
+{
+    if( bQuotesAlreadyRemoved || osWord.size() < 2 || osWord[0] != '"' )
+        return osWord;
+    return osWord.substr(1, osWord.size() - 2);
+}
+
 /************************************************************************/
 /*                              ReadPair()                              */
 /*                                                                      */
@@ -266,7 +278,7 @@ int NASAKeywordHandler::ReadPair( CPLString &osName, CPLString &osValue,
                       *pszHeaderNext == '{' || *pszHeaderNext == ')' ||
                       *pszHeaderNext == '}')) )
                 {
-                    oArray.Add(osWord);
+                    oArray.Add(StripQuotesIfNeeded(osWord, m_bStripSurroundingQuotes));
                 }
             }
             else  if( CPLGetValueType(osWord) == CPL_VALUE_INTEGER )
@@ -279,6 +291,10 @@ int NASAKeywordHandler::ReadPair( CPLString &osName, CPLString &osValue,
             }
 
             osValue += osWord;
+            while ( isspace( static_cast<unsigned char>( *pszHeaderNext ) ) )
+            {
+                pszHeaderNext++;
+            }
 
             if( *pszHeaderNext == ')' )
             {
@@ -312,6 +328,15 @@ int NASAKeywordHandler::ReadPair( CPLString &osName, CPLString &osValue,
             {
                 osValue += *pszHeaderNext;
                 pszHeaderNext ++;
+                // Do not use SkipWhite() here to avoid being confuse by
+                // constructs like
+                // FOO = (#123456,
+                //        #123456)
+                // where we could confuse the second line with a comment.
+                while ( isspace( static_cast<unsigned char>( *pszHeaderNext ) ) )
+                {
+                    pszHeaderNext++;
+                }
             }
             SkipWhite();
 
@@ -339,7 +364,7 @@ int NASAKeywordHandler::ReadPair( CPLString &osName, CPLString &osValue,
             {
                 if( bIsString )
                 {
-                    oCur.Add( osName, osValue );
+                    oCur.Add( osName, StripQuotesIfNeeded(osValue, m_bStripSurroundingQuotes) );
                 }
                 else if( CPLGetValueType(osValue) == CPL_VALUE_INTEGER )
                 {

From d8c9b280a3cf56a1937ea177c5d68ff1b9f339e3 Mon Sep 17 00:00:00 2001
From: Even Rouault <even.rouault@spatialys.com>
Date: Mon, 11 Nov 2019 15:52:43 +0100
Subject: [PATCH 409/488] Contour algorithm: fix (over) precision issue when
 comparing pixel value to NoData on Float32 rasters (fixes #1987)

---
 gdal/alg/contour.cpp | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/gdal/alg/contour.cpp b/gdal/alg/contour.cpp
index c77470f9a79e..5c131a0db5ef 100644
--- a/gdal/alg/contour.cpp
+++ b/gdal/alg/contour.cpp
@@ -564,6 +564,14 @@ CPLErr GDALContourGenerateEx( GDALRasterBandH hBand, void *hLayer,
     if ( opt ) {
         useNoData = true;
         noDataValue = CPLAtof( opt );
+        if( GDALGetRasterDataType(hBand) == GDT_Float32 )
+        {
+            int bClamped = FALSE;
+            int bRounded = FALSE;
+            noDataValue = GDALAdjustValueToDataType(GDT_Float32,
+                                                    noDataValue,
+                                                    &bClamped, &bRounded );
+        }
     }
 
     int idField = -1;

From c085030dbad103affd4d298cf051db94fb743b95 Mon Sep 17 00:00:00 2001
From: Even Rouault <even.rouault@spatialys.com>
Date: Tue, 12 Nov 2019 14:03:59 +0100
Subject: [PATCH 410/488] tif_ojpeg.c: fix regression of
 https://gitlab.com/libtiff/libtiff/issues/172

---
 gdal/frmts/gtiff/libtiff/tif_ojpeg.c | 49 +++++++++++++---------------
 1 file changed, 23 insertions(+), 26 deletions(-)

diff --git a/gdal/frmts/gtiff/libtiff/tif_ojpeg.c b/gdal/frmts/gtiff/libtiff/tif_ojpeg.c
index b38645031378..d1578626fc7d 100644
--- a/gdal/frmts/gtiff/libtiff/tif_ojpeg.c
+++ b/gdal/frmts/gtiff/libtiff/tif_ojpeg.c
@@ -831,32 +831,6 @@ OJPEGDecodeRaw(TIFF* tif, uint8* buf, tmsize_t cc)
 	{
 		if (sp->subsampling_convert_state==0)
 		{
-			const jpeg_decompress_struct* cinfo = &sp->libjpeg_jpeg_decompress_struct;
-			int width = 0;
-			int last_col_width = 0;
-			int jpeg_bytes;
-			int expected_bytes;
-			int i;
-			if (cinfo->MCUs_per_row == 0)
-				return 0;
-			for (i = 0; i < cinfo->comps_in_scan; ++i)
-			{
-				const jpeg_component_info* info = cinfo->cur_comp_info[i];
-#if JPEG_LIB_VERSION >= 70
-				width += info->MCU_width * info->DCT_h_scaled_size;
-				last_col_width += info->last_col_width * info->DCT_h_scaled_size;
-#else
-				width += info->MCU_width * info->DCT_scaled_size;
-				last_col_width += info->last_col_width * info->DCT_scaled_size;
-#endif
-			}
-			jpeg_bytes = (cinfo->MCUs_per_row - 1) * width + last_col_width;
-			expected_bytes = sp->subsampling_convert_clinelenout * sp->subsampling_ver * sp->subsampling_hor;
-			if (jpeg_bytes != expected_bytes)
-			{
-				TIFFErrorExt(tif->tif_clientdata,module,"Inconsistent number of MCU in codestream");
-				return(0);
-			}
 			if (jpeg_read_raw_data_encap(sp,&(sp->libjpeg_jpeg_decompress_struct),sp->subsampling_convert_ycbcrimage,sp->subsampling_ver*8)==0)
 				return(0);
 		}
@@ -1272,6 +1246,29 @@ OJPEGWriteHeaderInfo(TIFF* tif)
 	}
 	if (jpeg_start_decompress_encap(sp,&(sp->libjpeg_jpeg_decompress_struct))==0)
 		return(0);
+        if(sp->libjpeg_jpeg_decompress_struct.image_width != sp->strile_width ||
+           sp->libjpeg_jpeg_decompress_struct.image_height < sp->strile_length) {
+            TIFFErrorExt(tif->tif_clientdata,module,
+                         "jpeg_start_decompress() returned image_width = %d "
+                         "and image_height = %d, expected %d and %d",
+                         sp->libjpeg_jpeg_decompress_struct.image_width,
+                         sp->libjpeg_jpeg_decompress_struct.image_height,
+                         sp->strile_width,
+                         sp->strile_length);
+            return 0;
+        }
+        if(sp->libjpeg_jpeg_decompress_struct.max_h_samp_factor != sp->subsampling_hor ||
+           sp->libjpeg_jpeg_decompress_struct.max_v_samp_factor != sp->subsampling_ver) {
+            TIFFErrorExt(tif->tif_clientdata,module,
+                         "jpeg_start_decompress() returned max_h_samp_factor = %d "
+                         "and max_v_samp_factor = %d, expected %d and %d",
+                         sp->libjpeg_jpeg_decompress_struct.max_h_samp_factor,
+                         sp->libjpeg_jpeg_decompress_struct.max_v_samp_factor,
+                         sp->subsampling_hor,
+                         sp->subsampling_ver);
+            return 0;
+        }
+
 	sp->writeheader_done=1;
 	return(1);
 }

From 9af4aa18caaf6e19b4d51af623355bc689129c3f Mon Sep 17 00:00:00 2001
From: Even Rouault <even.rouault@spatialys.com>
Date: Tue, 12 Nov 2019 15:53:17 +0100
Subject: [PATCH 411/488] /vsicurl (and derived filesystems): fix concurrency
 issue with multithreaded reads (fixes #1244)

Kudos to @tbonfort for the easy reproducer.
---
 gdal/port/cpl_vsil_curl.cpp     | 41 ++++++++++++++++++---------------
 gdal/port/cpl_vsil_curl_class.h |  2 +-
 gdal/port/cpl_vsil_webhdfs.cpp  | 19 ++++++++-------
 3 files changed, 35 insertions(+), 27 deletions(-)

diff --git a/gdal/port/cpl_vsil_curl.cpp b/gdal/port/cpl_vsil_curl.cpp
index cc001218874f..d6f3bfc4bf48 100644
--- a/gdal/port/cpl_vsil_curl.cpp
+++ b/gdal/port/cpl_vsil_curl.cpp
@@ -1184,14 +1184,14 @@ CPLString VSICurlHandle::GetRedirectURLIfValid(bool& bHasExpired)
 /*                          DownloadRegion()                            */
 /************************************************************************/
 
-bool VSICurlHandle::DownloadRegion( const vsi_l_offset startOffset,
-                                    const int nBlocks )
+std::string VSICurlHandle::DownloadRegion( const vsi_l_offset startOffset,
+                                           const int nBlocks )
 {
     if( bInterrupted && bStopOnInterruptUntilUninstall )
-        return false;
+        return std::string();
 
     if( oFileProp.eExists == EXIST_NO )
-        return false;
+        return std::string();
 
     CURLM* hCurlMultiHandle = poFS->GetCurlMultiHandleFor(m_pszURL);
 
@@ -1276,7 +1276,7 @@ bool VSICurlHandle::DownloadRegion( const vsi_l_offset startOffset,
         CPLFree(sWriteFuncHeaderData.pBuffer);
         curl_easy_cleanup(hCurlHandle);
 
-        return false;
+        return std::string();
     }
 
     long response_code = 0;
@@ -1411,7 +1411,7 @@ bool VSICurlHandle::DownloadRegion( const vsi_l_offset startOffset,
         CPLFree(sWriteFuncData.pBuffer);
         CPLFree(sWriteFuncHeaderData.pBuffer);
         curl_easy_cleanup(hCurlHandle);
-        return false;
+        return std::string();
     }
 
     if( !oFileProp.bHasComputedFileSize && sWriteFuncHeaderData.pBuffer )
@@ -1482,11 +1482,14 @@ bool VSICurlHandle::DownloadRegion( const vsi_l_offset startOffset,
                               sWriteFuncData.pBuffer,
                               sWriteFuncData.nSize);
 
+    std::string osRet;
+    osRet.assign(sWriteFuncData.pBuffer, sWriteFuncData.nSize);
+
     CPLFree(sWriteFuncData.pBuffer);
     CPLFree(sWriteFuncHeaderData.pBuffer);
     curl_easy_cleanup(hCurlHandle);
 
-    return true;
+    return osRet;
 }
 
 /************************************************************************/
@@ -1567,8 +1570,13 @@ size_t VSICurlHandle::Read( void * const pBufferIn, size_t const nSize,
 
         const vsi_l_offset nOffsetToDownload =
                 (iterOffset / DOWNLOAD_CHUNK_SIZE) * DOWNLOAD_CHUNK_SIZE;
+        std::string osRegion;
         std::shared_ptr<std::string> psRegion = poFS->GetRegion(m_pszURL, nOffsetToDownload);
-        if( psRegion == nullptr )
+        if( psRegion != nullptr )
+        {
+            osRegion = *psRegion;
+        }
+        else
         {
             if( nOffsetToDownload == lastDownloadedOffset )
             {
@@ -1599,6 +1607,8 @@ size_t VSICurlHandle::Read( void * const pBufferIn, size_t const nSize,
                 nBlocksToDownload = nMinBlocksToDownload;
 
             // Avoid reading already cached data.
+            // Note: this might get evicted if concurrent reads are done, but
+            // this should not cause bugs. Just missed optimization.
             for( int i = 1; i < nBlocksToDownload; i++ )
             {
                 if( poFS->GetRegion(
@@ -1613,30 +1623,25 @@ size_t VSICurlHandle::Read( void * const pBufferIn, size_t const nSize,
             if( nBlocksToDownload > N_MAX_REGIONS )
                 nBlocksToDownload = N_MAX_REGIONS;
 
-            if( DownloadRegion(nOffsetToDownload, nBlocksToDownload) == false )
+            osRegion = DownloadRegion(nOffsetToDownload, nBlocksToDownload);
+            if( osRegion.empty() )
             {
                 if( !bInterrupted )
                     bEOF = true;
                 return 0;
             }
-            psRegion = poFS->GetRegion(m_pszURL, iterOffset);
-        }
-        if( psRegion == nullptr )
-        {
-            bEOF = true;
-            return 0;
         }
         const int nToCopy = static_cast<int>(
             std::min(static_cast<vsi_l_offset>(nBufferRequestSize),
-                     psRegion->size() -
+                     osRegion.size() -
                      (iterOffset - nOffsetToDownload)));
         memcpy(pBuffer,
-               psRegion->data() + iterOffset - nOffsetToDownload,
+               osRegion.data() + iterOffset - nOffsetToDownload,
                nToCopy);
         pBuffer = static_cast<char *>(pBuffer) + nToCopy;
         iterOffset += nToCopy;
         nBufferRequestSize -= nToCopy;
-        if( psRegion->size() != static_cast<size_t>(DOWNLOAD_CHUNK_SIZE) &&
+        if( osRegion.size() < static_cast<size_t>(DOWNLOAD_CHUNK_SIZE) &&
             nBufferRequestSize != 0 )
         {
             break;
diff --git a/gdal/port/cpl_vsil_curl_class.h b/gdal/port/cpl_vsil_curl_class.h
index 6ccf86214f2f..3a158973a72d 100644
--- a/gdal/port/cpl_vsil_curl_class.h
+++ b/gdal/port/cpl_vsil_curl_class.h
@@ -297,7 +297,7 @@ class VSICurlHandle : public VSIVirtualHandle
 
     bool            bEOF = false;
 
-    virtual bool            DownloadRegion(vsi_l_offset startOffset, int nBlocks);
+    virtual std::string DownloadRegion(vsi_l_offset startOffset, int nBlocks);
 
     bool                m_bUseHead = false;
 
diff --git a/gdal/port/cpl_vsil_webhdfs.cpp b/gdal/port/cpl_vsil_webhdfs.cpp
index 07f0b968961b..4e467d57ec3b 100644
--- a/gdal/port/cpl_vsil_webhdfs.cpp
+++ b/gdal/port/cpl_vsil_webhdfs.cpp
@@ -108,7 +108,7 @@ class VSIWebHDFSHandle final : public VSICurlHandle
     CPLString       m_osUsernameParam{};
     CPLString       m_osDelegationParam{};
 
-    bool            DownloadRegion(vsi_l_offset startOffset, int nBlocks) override;
+   std::string      DownloadRegion(vsi_l_offset startOffset, int nBlocks) override;
 
   public:
     VSIWebHDFSHandle( VSIWebHDFSFSHandler* poFS,
@@ -997,15 +997,15 @@ vsi_l_offset VSIWebHDFSHandle::GetFileSize( bool bSetError )
 /*                          DownloadRegion()                            */
 /************************************************************************/
 
-bool VSIWebHDFSHandle::DownloadRegion( const vsi_l_offset startOffset,
-                                       const int nBlocks )
+std::string VSIWebHDFSHandle::DownloadRegion( const vsi_l_offset startOffset,
+                                              const int nBlocks )
 {
     if( bInterrupted && bStopOnInterruptUntilUninstall )
-        return false;
+        return std::string();
 
     poFS->GetCachedFileProp(m_pszURL, oFileProp);
     if( oFileProp.eExists == EXIST_NO )
-        return false;
+        return std::string();
 
     CURLM* hCurlMultiHandle = poFS->GetCurlMultiHandleFor(m_pszURL);
 
@@ -1076,7 +1076,7 @@ bool VSIWebHDFSHandle::DownloadRegion( const vsi_l_offset startOffset,
         CPLFree(sWriteFuncData.pBuffer);
         curl_easy_cleanup(hCurlHandle);
 
-        return false;
+        return std::string();
     }
 
     long response_code = 0;
@@ -1147,7 +1147,7 @@ bool VSIWebHDFSHandle::DownloadRegion( const vsi_l_offset startOffset,
         }
         CPLFree(sWriteFuncData.pBuffer);
         curl_easy_cleanup(hCurlHandle);
-        return false;
+        return std::string();
     }
 
     oFileProp.eExists = EXIST_YES;
@@ -1157,10 +1157,13 @@ bool VSIWebHDFSHandle::DownloadRegion( const vsi_l_offset startOffset,
                               sWriteFuncData.pBuffer,
                               sWriteFuncData.nSize);
 
+    std::string osRet;
+    osRet.assign(sWriteFuncData.pBuffer, sWriteFuncData.nSize);
+
     CPLFree(sWriteFuncData.pBuffer);
     curl_easy_cleanup(hCurlHandle);
 
-    return true;
+    return osRet;
 }
 
 

From 4ee512d52c6df62767751482527562f6f8e25ed0 Mon Sep 17 00:00:00 2001
From: Even Rouault <even.rouault@spatialys.com>
Date: Tue, 12 Nov 2019 13:45:30 +0100
Subject: [PATCH 412/488] Multithreaded warper: make sure a transformer object
 is used by the thread which created it (fixes #1989). This workarounds a PROJ
 bug also fixed per https://github.com/OSGeo/PROJ/pull/1726

---
 gdal/alg/gdalwarpkernel.cpp | 119 +++++++++++++++++++++++-------------
 1 file changed, 77 insertions(+), 42 deletions(-)

diff --git a/gdal/alg/gdalwarpkernel.cpp b/gdal/alg/gdalwarpkernel.cpp
index dd763c63ce67..2ca0d3141a2f 100644
--- a/gdal/alg/gdalwarpkernel.cpp
+++ b/gdal/alg/gdalwarpkernel.cpp
@@ -204,11 +204,28 @@ struct _GWKJobStruct
     int           (*pfnProgress)(GWKJobStruct* psJob);
     void           *pTransformerArg;
 
-    // Just used during thread initialization phase.
-    GDALTransformerFunc pfnTransformerInit;
-    void           *pTransformerArgInit;
+    void           (*pfnFunc)(void*); // used by GWKRun() to assign the proper pTransformerArg
 } ;
 
+struct GWKThreadInitData
+{
+    GDALTransformerFunc pfnTransformerInit = nullptr;
+    void               *pTransformerArgInit = nullptr;
+
+    void               *pTransformerArg = nullptr;
+    GIntBig             nThreadId = 0;
+};
+
+struct GWKThreadData
+{
+    CPLWorkerThreadPool* poThreadPool = nullptr;
+    GWKJobStruct* pasThreadJob = nullptr;
+    CPLCond* hCond = nullptr;
+    CPLMutex* hCondMutex = nullptr;
+    void* pTransformerArgInput = nullptr; // owned by calling layer. Not to be destroyed
+    std::map<GIntBig, void*> mapThreadToTransformerArg{};
+};
+
 /************************************************************************/
 /*                        GWKProgressThread()                           */
 /************************************************************************/
@@ -277,11 +294,11 @@ static CPLErr GWKGenericMonoThread( GDALWarpKernel *poWK,
 
 static void GWKThreadInitTransformer(void* pData)
 {
-    GWKJobStruct* psJob = static_cast<GWKJobStruct*>(pData);
-    if( psJob->pTransformerArg == nullptr )
-        psJob->pTransformerArg =
-            GDALCloneTransformer(psJob->pTransformerArgInit);
-    if( psJob->pTransformerArg != nullptr )
+    GWKThreadInitData* psInitData = static_cast<GWKThreadInitData*>(pData);
+    if( psInitData->pTransformerArg == nullptr )
+        psInitData->pTransformerArg =
+            GDALCloneTransformer(psInitData->pTransformerArgInit);
+    if( psInitData->pTransformerArg != nullptr )
     {
         // In case of lazy opening (for example RPCDEM), do a dummy
         // transformation to be sure that the DEM is really opened with the
@@ -291,24 +308,17 @@ static void GWKThreadInitTransformer(void* pData)
         double dfZ = 0.0;
         int bSuccess = FALSE;
         CPLPushErrorHandler(CPLQuietErrorHandler);
-        psJob->pfnTransformerInit(psJob->pTransformerArg, TRUE, 1,
+        psInitData->pfnTransformerInit(psInitData->pTransformerArg, TRUE, 1,
                                   &dfX, &dfY, &dfZ, &bSuccess );
         CPLPopErrorHandler();
     }
+    psInitData->nThreadId = CPLGetPID();
 }
 
 /************************************************************************/
 /*                          GWKThreadsCreate()                          */
 /************************************************************************/
 
-typedef struct
-{
-    CPLWorkerThreadPool* poThreadPool;
-    GWKJobStruct* pasThreadJob;
-    CPLCond* hCond;
-    CPLMutex* hCondMutex;
-} GWKThreadData;
-
 void* GWKThreadsCreate( char** papszWarpOptions,
                         GDALTransformerFunc pfnTransformer,
                         void* pTransformerArg )
@@ -328,11 +338,7 @@ void* GWKThreadsCreate( char** papszWarpOptions,
     if( nThreads > 128 )
         nThreads = 128;
 
-    GWKThreadData* psThreadData = static_cast<GWKThreadData *>(
-        VSI_CALLOC_VERBOSE(1, sizeof(GWKThreadData)));
-    if( psThreadData == nullptr )
-        return nullptr;
-
+    GWKThreadData* psThreadData = new GWKThreadData();
     CPLCond* hCond = nullptr;
     if( nThreads )
         hCond = CPLCreateCond();
@@ -360,18 +366,22 @@ void* GWKThreadsCreate( char** papszWarpOptions,
         }
         CPLReleaseMutex(psThreadData->hCondMutex);
 
+        std::vector<std::unique_ptr<GWKThreadInitData>> apoInitData;
         std::vector<void*> apInitData;
         for( int i = 0; i < nThreads; i++ )
         {
             psThreadData->pasThreadJob[i].hCond = psThreadData->hCond;
             psThreadData->pasThreadJob[i].hCondMutex = psThreadData->hCondMutex;
-            psThreadData->pasThreadJob[i].pfnTransformerInit = pfnTransformer;
-            psThreadData->pasThreadJob[i].pTransformerArgInit = pTransformerArg;
+
+            std::unique_ptr<GWKThreadInitData> poInitData(new GWKThreadInitData());
+            poInitData->pfnTransformerInit = pfnTransformer;
+            poInitData->pTransformerArgInit = pTransformerArg;
             if( i == 0 )
-                psThreadData->pasThreadJob[i].pTransformerArg = pTransformerArg;
+                poInitData->pTransformerArg = pTransformerArg;
             else
-                psThreadData->pasThreadJob[i].pTransformerArg = nullptr;
-            apInitData.push_back(&(psThreadData->pasThreadJob[i]));
+                poInitData->pTransformerArg = nullptr;
+            apoInitData.push_back(std::move(poInitData));
+            apInitData.push_back(apoInitData.back().get());
         }
 
         psThreadData->poThreadPool = new (std::nothrow) CPLWorkerThreadPool();
@@ -386,7 +396,7 @@ void* GWKThreadsCreate( char** papszWarpOptions,
 
         for( int i = 1; i < nThreads; i++ )
         {
-            if( psThreadData->pasThreadJob[i].pTransformerArg == nullptr )
+            if( apoInitData[i]->pTransformerArg == nullptr )
             {
                 CPLDebug("WARP", "Cannot deserialize transformer");
                 bTransformerCloningSuccess = false;
@@ -394,13 +404,24 @@ void* GWKThreadsCreate( char** papszWarpOptions,
             }
         }
 
-        if( !bTransformerCloningSuccess )
+        if( bTransformerCloningSuccess )
+        {
+            psThreadData->pTransformerArgInput = pTransformerArg;
+            for( int i = 0; i < nThreads; i++ )
+            {
+                const auto nThreadId = apoInitData[i]->nThreadId;
+                CPLAssert(psThreadData->mapThreadToTransformerArg.find(nThreadId) ==
+                    psThreadData->mapThreadToTransformerArg.end());
+                psThreadData->mapThreadToTransformerArg[nThreadId] =
+                    apoInitData[i]->pTransformerArg;
+            }
+        }
+        else
         {
             for( int i = 1; i < nThreads; i++ )
             {
-                if( psThreadData->pasThreadJob[i].pTransformerArg )
-                    GDALDestroyTransformer(psThreadData->
-                                           pasThreadJob[i].pTransformerArg);
+                if( apoInitData[i]->pTransformerArg )
+                    GDALDestroyTransformer(apoInitData[i]->pTransformerArg);
             }
             CPLFree(psThreadData->pasThreadJob);
             psThreadData->pasThreadJob = nullptr;
@@ -427,15 +448,10 @@ void GWKThreadsEnd( void* psThreadDataIn )
     GWKThreadData* psThreadData = static_cast<GWKThreadData *>(psThreadDataIn);
     if( psThreadData->poThreadPool )
     {
-        const int nThreads = psThreadData->poThreadPool->GetThreadCount();
-        if( psThreadData->pasThreadJob )
+        for( auto& pair: psThreadData->mapThreadToTransformerArg )
         {
-            for( int i = 1; i < nThreads; i++ )
-            {
-                if( psThreadData->pasThreadJob[i].pTransformerArg )
-                    GDALDestroyTransformer(psThreadData->
-                                        pasThreadJob[i].pTransformerArg);
-            }
+            if( pair.second != psThreadData->pTransformerArgInput )
+                GDALDestroyTransformer(pair.second);
         }
         delete psThreadData->poThreadPool;
     }
@@ -444,9 +460,27 @@ void GWKThreadsEnd( void* psThreadDataIn )
         CPLDestroyCond(psThreadData->hCond);
     if( psThreadData->hCondMutex )
         CPLDestroyMutex(psThreadData->hCondMutex);
-    CPLFree(psThreadData);
+    delete psThreadData;
+}
+
+/************************************************************************/
+/*                         ThreadFuncAdapter()                          */
+/************************************************************************/
+
+static void ThreadFuncAdapter(void* pData)
+{
+    // Assign the pTransformerArg created in the current thread to this job
+    // This workarounds the PROJ bug fixed in https://github.com/OSGeo/PROJ/pull/1726
+    GWKJobStruct* psJob = static_cast<GWKJobStruct *>(pData);
+    const GWKThreadData* psThreadData =
+        static_cast<const GWKThreadData*>(psJob->poWK->psThreadData);
+    auto oIter = psThreadData->mapThreadToTransformerArg.find(CPLGetPID());
+    CPLAssert(oIter != psThreadData->mapThreadToTransformerArg.end());
+    psJob->pTransformerArg = oIter->second;
+    psJob->pfnFunc(pData);
 }
 
+
 /************************************************************************/
 /*                                GWKRun()                              */
 /************************************************************************/
@@ -519,7 +553,8 @@ static CPLErr GWKRun( GDALWarpKernel *poWK,
             psThreadData->pasThreadJob[i].pfnProgress = GWKProgressThread;
         else
             psThreadData->pasThreadJob[i].pfnProgress = nullptr;
-        psThreadData->poThreadPool->SubmitJob( pfnFunc,
+        psThreadData->pasThreadJob[i].pfnFunc = pfnFunc;
+        psThreadData->poThreadPool->SubmitJob( ThreadFuncAdapter,
                             static_cast<void*>(&psThreadData->pasThreadJob[i]) );
     }
 

From fec6c9399cc99283a9152e784a7539f28ac2c490 Mon Sep 17 00:00:00 2001
From: Even Rouault <even.rouault@spatialys.com>
Date: Tue, 12 Nov 2019 14:20:18 +0100
Subject: [PATCH 413/488] VRT warp: do not fail if a block has no corresponding
 source pixels (fixes #1985)

---
 autotest/gdrivers/data/geos_vrtwarp.tif | Bin 0 -> 50700 bytes
 autotest/gdrivers/data/geos_vrtwarp.vrt |  50 ++++++++++++++++++++++++
 autotest/gdrivers/vrtwarp.py            |   7 +++-
 gdal/alg/gdalwarpoperation.cpp          |  39 ++++++++++++++++--
 gdal/frmts/vrt/vrtwarped.cpp            |  35 ++++++++++++-----
 5 files changed, 115 insertions(+), 16 deletions(-)
 create mode 100644 autotest/gdrivers/data/geos_vrtwarp.tif
 create mode 100644 autotest/gdrivers/data/geos_vrtwarp.vrt

diff --git a/autotest/gdrivers/data/geos_vrtwarp.tif b/autotest/gdrivers/data/geos_vrtwarp.tif
new file mode 100644
index 0000000000000000000000000000000000000000..60d7a161ae0557d5426a3a31224988568e6dfc31
GIT binary patch
literal 50700
zcmeEvdtemR+5Ut80Rt?E8ZFAA)KUw&Ak}Dr3>0ZZTBCvuN_B`70TB`|mMCF|5FsMP
zc#n#@_(O^)G>Kdi1T(pSQ31m}fdqC#gaAo)H<!K6&Ya(K&g^V90mWXv@AD7PnVmV8
z_kG^yeb1ct%w}iCkN*wVjpMkhIW8iSi@?#;-{3IpxKr?$)<p)7X^*a9<=2KC-xzj0
zD(v|8!DFs7$Bhj;zAvIP_dMi%+lk}G1&`0-d}3JN%H=({-YEMg`sQRta`)i)jxHRR
zo7sbl#PNqX&dcn?r9;Mc9H)QWiNhf`6dV2bR&ev9|2S+DP&o+(y@$@j(Y^;h^)~dg
zv@6H;L7VV0{g^}hM<9cqKZDP{KhREZ-y7|RK^N7lm;Kl$ZP#=enR@?bv>W{s+dhbP
zVh1~QIUPTjquu*I0dFVBq-{^)^YmrfKLt*8Jp$SmfEWE-|NIT)tV6p5@THg0&mlNp
zgFgFEe-Dm(L+9=ew!|VR_hC!w&T&(Eaok#jbp16P$6v>B$8Ug-jU0FVEgZKQ+wTW*
zTm`oG5bK`}0f)D9+)-@L+`(}K+nXkAzvZ~I2(-oba@?6w9OvaZZuMx6yJZZ=<zxHf
z?>Vjp+uz1=T=ab$*Ka(^9^kmw9^|-RC2-tMY!5wzzSv%PnBxqOaNNh(?w!bS-(l-J
znd3T7;kb9P-SHR19Ja|%a9ks{WlwTkjKFc5u#K6D7@fv(3#M~ix2HMo18jHB;J7ku
zf0>C`!M0)+^gn~~fK7dt<CdggM9<^64cJD`=eUE|o?gIlGPYM2a@?)YaoiW!cnrL%
zB^;Mx=D02*_`qgb3U0AImd<f@Y#Gbo;}<#Zs+Tyf?q!bqCX3^qe3j!`u)Xve$KCWg
z$9;}1{tb?+#uoP;#~sEta}6+B5OeD}?wWsa+(vA18&HQ$*$DsSa-1WN<6iun<8Ii3
zv5oD-R*rja2W;NOanFCraVv{B?oYcBTi6!u;kW~z|7vHShq6X<9sbFm{^HAwos)|7
z;*Rag-`LTvUT^oWeLDFFc7^N-$Ke{u5fPUwd`57cI_G5~^x&XidAGdGKjNfQ@VqPg
zd}Uy_;Cc6MxtS4Y9?d=@xSs5@6Bp4VFLOwzNnGb1RL*UPP;T@;CQTmW*joSQO&`x6
zjdS+zxw&(b=1l)<TKw3F10KZDfKdaUn>%}M@}jwE_a!ZSZVo%wnv8q)*;y$Il4t!D
zWfN0oPM?p%w1?);nlqiYil0Ay`rJjcrp-)C8#nQh@dF+jH(=tz`LpKEK;1)+Bs?&7
z;*?v0%5E7FKP~|ZX#rDp%aHrVOnUTBVGSlebpN<V62{**<rZDjEko`e9(&KQ;ju&R
zy!W0v?z}7Z&O7fM_QVrI9(rW_pT?nUNdGNEhCVUm(Fey*nsUour_TT?6x=a%SnO}_
z8h+=!ciuJZ-g|#LeE5(tk50Nj;gRu^9-DH@xQ8aj-!kNudxzb5=Pge#i3tyk8#`%y
z!h?`HJ$b>xq=mDR=O)d6UYMA)a5_j>IQ<sr9rMVTKaHC-?vW|COq)J;;ryg$g*nsb
z&-&}Eq`9{Yxjpu-b}bg@9fg_GXU&+o@RlLN?~1+W?xA-MZ`bVUq-PgQ7p5mISP0&j
z9bsCu%DKt&7tYjcH7n;#UpOB|4!e|1Lx&E7O+&^^9uKz1>4L|NnK(%=d@v;N!GuR9
z-T%apag!&FdvGGNp8D;#pk{E&{N!gw%>Wkz20xoTR~R}91`ZfJbChnyfWfIK96Dg|
z^V$bkN?9-}{*j6IpzOK1vlcEGHD|!!xyiy`r#}rD3l>eEo-!&G$kMpf6OF}mQsYY2
zx)K_bdal*t^8ai<m+Q|({9HjD&71evdwX|2IBxXP%3l?|dH3c&<*dF(dAqbG?H{k7
zFY5bgq_?GP-_PV<|7VNUbY+E-8(5(%!)NCYd1oNK&M;E6`6A1WspdmMk`gJ$xHDa3
zP5Uafs3odH>;LH@tE->8)Zfn??Y{Uk)0H@x6sgOVB!#>ij+9I>7n@7Xlf}}uPuA?(
zV|=cdBu*v*HKd`wWpKM@l$dC_)GzEarmDF)<t>-4EjPMd&sUl%lPeAN$@r9V`Awvx
zzU32fDk*8}qUNd-a>_H9%t$#&=_z-SdqTRYFfPj%<u)}K8Zuq64KWR|4TgFt;2-(D
zk&4PS9<$~OxmGH4bwyntW+B|AQg=~w))$uacN$o~Ojk_9MV(Go)E$OW>RZ~0x-u%r
zA#~Q~<c2Dju}Y0tLxWIhJSI9^zW1dhX{tn7I@uB}`_uMmmYOOlcTy6+NlFUCbP4fV
zTqP-%4+L9FbecK6+~o9iiIa?S6!T-IOMD?zXz?d0U4j**{%Ci&VQq>jAI4)st~fOa
zZFpUbH_*w_UO|yoXx+)UT7kI83PMQsw<CcOPl=;at&ke@8w~);Tar@#p-@@j=^4~k
z8q{{6ob(i@wqt;DsQJ~xOSw6YSmq_o-_*&m&_$g@Z2`aE2TBSHtxeG(_v<LaY}-g_
zFNA~P5f)+^@o-39g=ZWMY6Nq7$hrM6QjKX#gk~B`7j-#U;px($iw4&q6$)%%b->tO
zqp!ka4MrZdN%NE(8<5_3|K-<lIX*UF?q6ejcRBd0d%nIo`_&2Gte<zjBIE9cx%bbk
zpZI9R_4DrTZ9B8>0p5K7>%ScT<NuR>{p^OcKv7wTU6efdS?Rc1UK<r>wqX}{%uvOr
z@XwMWC0AJ{XE&1h=rqVb;#sj$O)iV_?{_CwnoCg`=_z$b+lB2?sXMb#8fE@k8kJ+u
z=}?aI6>^dsg?2)cT<Ts_Y2Kn-yIr)Y)8%Wo^UsQzjj`2KBl%q6%}Y$@3{_|sWzTGk
zsWwv4{n(-OERm$bI(B9(5Ra?zg@rTP&dLf4>s+*@RwotCU}sE3Nl=7wJ9#(9aRXqR
zs;o(JPli6IEog-3uV0)3!}q$Sq1xrTwTa(u1sjr0&DCL#cvh-0SDK5JBuX8v$SF5A
zCp$|0*^Lg(+<tayl&JvrEoX+1{k}-Gb=1c|z9={s;B>8(n(e@>pgLTo?%3+&0^@ce
zB`7`}ymj$pHiE)sV9t0~a0a>joFE-w${B9vs%6YvDjxu9^~s2ARMX*L=CaI2e!4EW
zMs4x`RkSf1sq?5caKNmV%s`_r6^O3|$cyVYviivgldGudy7s;BxvpoKtOX5~2hSTr
z1i@}tT?*!fX1{uXZxhcrjnrwNUW=_pb){PWq*VqnVI_kF>ta@7suIuFFW!J4%T+20
z3-k5DruxN)HPPw{bTrXW>*Aro24c{7iOr=PGZj#;EcxDFT39GByi_4d&bk!X#VRk*
zO3_b^(a^-X{i;2N@f(+_r04KXSCmpKZ;@(XdRsHb43psXM+%~?-jJsJ_^|!=YvXE6
ziMNq=a1lA0*Yo>7U(>mG;IXye^uGI=6<-~QUvXpi`R-o%&vg6rfwjX7wz@1MGS7fv
z)8CC%Ctj!^TRwE<e=g=U2vaKg?esv}{yEvyKo$g~6H=l(YjcAzK`#GRojq8tIHZ2L
zReDRo=eDin$rDnx8(oJqith-nlS}f&I~v6gg_a9x+sJU=p0NMMm46rOmtGf~dwma*
zie_oExT!G*|M7DmL^L%*LERxWZ@aXeY*jo=_~R$|V{XfKtukl5GHni-B|FwD3uckY
zRpJSC@htL}V3XS$rDN_2w_`i>8)wT2RnpsTfqtU1c*f5kMDs=eB=g9G3Q_<C$xo0{
zwc?*72@+vROb&S%N7h|x6xA|Ut~;TgP<K+H(0@A>xu}Y-xb%r*J9(VK*#Ye0Hm!fo
zHf2MjWwtz9POKKH#Qad{PFk8!m2lRS_JVp!It?{P-C5g|MOEczO&?0B>S^C+>Q1rI
zI!Ah+ovo@17O$#{{9jrvIE|jD4_4jyD}++T-iJ$vUcda{zTCA#9vHZO$D3~!z22pC
z`Zt4n-97n>A>Yli$+u2$dlz=%Y(l}_m#3%xuHU{VU4Q=|_3OE&%ss}I2{|9UWz3KE
z+*`DMYpXQ(_pcnW52~9ldOD9^wCwK(?2dxy8@}IIZGEA~SFZd~FaCY&n{vOx)i*qQ
zn@9Xzmm3^^v0Kw(_MNl-ZpFLPZu2BsiZ`hzMtwc9Q9U|#=oYcD_a7VUc2pDdRl}$3
zBxe@9+RQCiH!Q9^Ck7sS@cE?=66H^CHgmTbP~NsXX}*Il!u}8b^=j$r&2Ma?oIdeN
z_1(RfKWsWVVecbbJI7r}pSq{l)s@2!^UrMiI(lH;v$lSdV#e>!Pu5Y2+i$PVkxCS&
z@u5eprOE@I!6%J1W><>jPLUoj5T+CuzvyaqvBK|r2Tmp2xXhpwP4VVQYVWiQSt+7#
zf^&!TLX^}R<FHkzCvMtx&{(4$TI~F@cxFo47Ad96Tu*#~G`EYrHG6Z>m+Gh27F40Z
z|I4(Q#r<QQYlZV>gD3IEl1!ybrgNV7qTFJrc|&a->)phcD924Tht=-|+w&-2Af`tu
z8>OPx%oRlN%qWbEk`I4ZbWrW)nW1#bl;0>^{)%UD0be(}b-8)HjHBACQ#V3J_w1tC
zO1&vPMjlly1+GrrhO*BRooCcNgS{_EnR3NHZ7U(f^hEJ+WpJW%l4$Ul(q1Ze#TSSt
zZy0$zXQ8xQPW+(wu+rZyEbLkiW5oS8q^$$)Xix>lqVM>~;~!NmlB+*;a;F-kCEdTI
z7VeBp-5G3@T%%6OcV4TY(G2d|{-c*iJya9%m%}{iB^+_osOKXlrG|=s%3-2MP_8N5
z1@NX`YfB<OadN*IxwJc6H>E&_RigB<8;#I3bff4U@z+12ZG6<w&G?A2)Ldnl`lNJ7
zxz3*W1&kY5&CieeQ=<pD3U}6x58tgLcUVgxE<Xjlm%n0bg^MgV7W-fTqhnyTm>RYD
z9GV`yY3s+3X|S)o3*xd;h}!2b)TEOG3qD2pTXrU5(cLLe;4I&mzFb!dUp&`28`^;5
z_G-{o(ep3WEc~Vvz(M8x3aEL({>Ip$2ioeau|p5Bv-}h^k<^%8uAmqw7W-Xa&vcTw
z-|tZSYZi{GCUsZc?`D!MiKDlox3S+ljjWw(R5jf5Ykf5Q*FPWh^|LlK9;4a!n7Py9
zao^$IFJ3toe}3SR&#znlV5zg{)rQw@ecjSyTJL%3`JV*-q<WK{{;&OW%iFLx<hNph
zIF(PvLKPo$aXwb=hh^qBg9bPwIvKH3o9S9^L9#P}wGQ<$zK{_~>pK~3AJERmdq>+M
zJI56*ws`vlY_V7=MfK|K<&4S!m9E4NVDX{t)7f#lQla+jk+!rbs@uP^^ByrYV*OP~
z_gJ<E_jFCh=aOa6uYrg$(-q(b(z93E(wsoLGDAZOxP@-4(i<|d$AZpH*X+hh@oYrl
z8M?L;PbVMn1bWJm@<&+Z_r#tqv7+3T=aweRT~M6h@98gOjDa_{e4hAW(UbsPJC>(*
zO2*1fmyPA1+I`nS6R=8w?z@g!=?#Gsboq-#>S>enZ_-o{u1i^;U>gO<Me17#wkLv2
zEmM|ZaadniG$MqBLP%Vaz6dVr2d4<FT~0Y-pi*e*5@(}?@VVkQG2WMiaAnH|d54Lm
zYLR)SSj=>k3bu7jN2Hw9%Z7Ud3<wtFxEnA{uyqO68G72TYO4e4bd&QJSb>&;SvjhA
zDwiIW@)|Ws*G50Zy1r>21gTjP*=^*~qR?(Itf8?$t?Kx>M$E`zE&*H5K`@j4f4wVr
zMPW2V<5tJTpN0mp$@sl5NEI0sW@k}k>hf?(G>VwtTP$m1e46jX-=RzDTkRW)8O+sD
zZjlO1{pg2khb^tZ9hNp+G#E&Imlw8C=5=qvV?`?e<l2g0w9sg$!D6f=&Q5)T$Z3Sr
zsETr1za0H{&2gbXNmnFcz_(U<3yZ~WFna5vcf$xxdvfkYeRyHO5qjfG>l0p$&{_HJ
zfAmi=`6F-1-?EEdGV@kne{b(`W0uE#^rv6<NZL27+xCUujal(vey6SS`=56Hu;sX|
zEs^=JU%EAc2X>xTUzQW9t@FeS=8;7!qwYzr&WgHcqQ_By1iPOnp*q=gV0UETpm<t+
zMIL0|5E<BjioTvj)s`>BJ<7EnYk^d&9#KZva|*~;%1xdPcF5YJ#M&(d{Bz_L$QEnW
zmGV*Jv!^2-99bmFBT!@PnZnMXuZbJf-<AMD7Ak0^{0%+d9r=FhQXaAdDr*q3UC4S_
z9&G35iDk-0x-ytYRzg(5NubdUP_OkQRtJHKOfHkt*U(-W%z2anv(6*Cm7E(jZBm0o
zPdCbos0eB~3@p2(fgw<67}L`!X<aBi;(iT%;7?>VPJyl#=#m+|?a&o-q7`+0K_7&)
zqc2?g41-hrAwYvE<GaClLNz%OVg49k2iZe5fS=WjYO*pW^>mao?-IJuaclI*rbzEh
zaG6{UZZD`eQ3`9Buf;=MKJ-SU?Shh!H-jGN>*3FIN(gYj>Tk2O1|uL0PdIZcWs%UP
zYHphx&66ZqusPQ6yKX1O!j&(0E;qn`=HEJPo;j|^xP$!sp&w01x$Tbq>(^X!AJ^Go
zS~+58`di+wCG(e0=2X<XUieQx)Uqyale@3HTq#x`SEus1mP*_-cF$<?nc~EHp<$4_
zpPZp=Q;XF-=BIE|y;7(*HsI#BJ6c{%yI_9Lqg@Q{3V)QGuIx4^NqIb4(KbP`1Y*TJ
zp)#4ZN>^5Ct)ydoB@&f}n2sup^~4ugj(NW_0hLkmY$Zb}(zF{Ja$NXYLSCtqn5T)G
zNQI+CR*E!iRBJnIRIg?Zl@V-Zt%P_*4m_zNj}0QHsHTazI;xQ2=Bb1kPE{M+kwMkL
zc7t>t2wL$W8>2!HFK!o(33dT{kTDH=UyWCdvv6jEtntT4neX-wt*66w3e%#|6?7Lx
z&F8_`AZnd5w4|Je;nsN2d_z5`>tSqOq9qNFGCwh!SJmaGhVA%TjUQdpCL)||*I-qh
zr?2{Wn_;mRyO#2+_YX1`hM>)3!I;ov@)AaBp%rFkd-rrOQxDd!)T!cTF;@@0c3kT5
zdl5(frOs*9dic^|^RFT?dbIJ^&U=?cR#A2t;f^eA#A_kc(d;GFKM*QqW$i;pSFRSc
z4a{)Mj2`U*5oT$5*2R{~wH<xZGOweLl<n<(_Me@%mmjXb13sgt&7L^BZZEY*YSahw
zawXjUmRfzVTe8B2TDbGt_-&e}$832Sy#fdQVf5%>nO3b2`8LQQh;0yD^Rz3nu_4Sw
zx=MMTe%10+1y%5N?TXySVkl&ED|L|}D|FO#6I5fw?doirjeqpo<YB$L6w9{`_@wtW
zFaLhxxjToAntJ-?lihnfKV=)wOJ6v6?<mr8LVZadj)W9x+Z@?CTONosj3ur)jp97<
zD<q7Is*#0lQ~G#j&@6Sg($6DQ8EF+w)ucIO@f>ltas!(2w3*4CMN@5>Jxbfj9#kYE
zT|_Ef;g)cl59#9wyS0F5YICUC)pAZ_mR2?Bf1|3sStfhAhBsEj+egE@Tf<9}ahl+Z
zRpxt0OgUL!USVanU2H-~Y)2Zb+l}R9Pm4I*URLKh?Zd77%jHJ@z4{{F8);lRyLVVh
zs&1_N8T`#r`Co3Ty#nedIC}0CrhWoTw298tvAoSU-P2=S@$FBn-+0YiMGvKq{@w5!
zub(W}E=ic55ZU*MSBHy<#B=;?@?rHW6^XT4ip29ecPw(r7}+4NQ<fv)EkSZKP24Kw
ziMc|hh}<~~4Gc)CjYyY`X=Az?raC#cD?FR!j`@M!xwN+w>KzU7tCfRPtvQL%yz_*$
zl1KW^BdLp*`^iz5fHRRF%oL}QsZuUM!f$L$ZZIMbr+U{Zs~I#3_#$Y!@De8cDJooG
z!UZNg8se8DMaYEy67?(Se~Ka?u81D}i!uWltg3@%6Vps>j+fi|f2CG*9h%A+TMb|=
z+@PRND-05tNz%}z#gX1kZ4}0U!ZwzvF%(cpt4K5EMpHvF?A4goE!LcoOWh&nh11do
zjwbyYnjizrys}8|9U7TGBAiA5DZk@@EuvR{TX2`Qj`By{BL)56=HxaXY8;Z7nNBXs
zkP_TU$2B9`+_t=(<Jy_g-dfrap~pgUs}u|$E&STJqw2$4sNvK(*E|(YMp(3I2GOQ8
z-l$7y#A!ZobiF5aX+~7r&YQsW&`@P&>U`+o+P-@*WOeUQvo5y(2MnVlOACwDiqH|p
z%mA}ii)!Z61?^x0@V9Mz>tWM@NE$eFB<fU#Yt+YM2P3r*ZqL$(Z$9$CZR>xIyYsOM
z_gJ4-dtpvJk~e4c!`(WM$$oIwo4@b=V&??g9lKs9b0hnnR08k(M>l)_E1i`k5ps9j
z;-+8f7;xpxa@Rz{hfxNnEu#O(qKv52c)4SXNOxcM_l;3*V*@TqjZqDQ*k5TH8nC#j
z<WCqX6SO}Ati&CJTyd*0*Mj@qR^0I>Q^h1Qlb_0Ke|b5T6l3TdG#8mm%*AGW2cu@-
za=%Vls=SD=K~~_4kSGj`9|zzl`xiTOL~PBvjE3+ISbSU#lC|tdZD^VIgGL7met@MV
z)jvS1(L=wIZ0`q8*(G>$)LuliQgD%H3hnJ(DdlwVy`#Q^ujDT}IJdos4&1gwAyym1
z;{z+XkRe!_g$ID=xv+={=K_m!J!)%f!(ynNX-1D8rFCVYsFLS}g<+gsk6SDl^`YRY
z4FzThso>E=zpgeEs$pK^?b=|#5>XG{5O&_K4UaHRL!ppXtqmAUR&Wf4tVyd54k5Ce
zbP0^TsU<8+|5^Q9VgIl`kq>pduXyM+Z{9!psza};>ux^!r?V%2QCa@){2-uV(9P<^
zKujRHiFb;7$VyVCjty+^n!MK2qK&*v`jRXq)0^NGPD^`85xJH`5sTZ<WN}Kn#ZuCT
zM3aO7-)MC5d&FXL9T}*`s1~o-!0#4I$kpU_HA>C#@?Nr4EF#yCTh)GQmRInKr%4{^
zO>R@8)qJnfE1f1ba#)QZ69d`aWG{bOtO)`c6fiXffn<;bIVzCQBsjx?crB;Hfw+yQ
z`5JL0S<w+lPZA$61^6aXDZWHr><FYgnGlE#7@H&~oIj1+toBte1;i=tCMD#Df!Nv@
zX%EC05Kr(n@ny1%G138uAs{q~PBM!uWsGzH5^_y3a}8s}$y^fzLS0isLay<KxyGO}
z*R(Mb1VUZYlLTF(G17%h2?T*q*K{XA*JzAT*8qs-nh+2zMoL(W1YM&8G0H4PY~m`C
zju>eNB$5PU#KvMI3<!;pE~K9t0uo|Gi;-z01jHGPkw`VfNXRu_#7GT!i7ZF30tk%}
z>KY0J!Rkh^*05luK)^^t&@~hYT%!f+i#iZ3SeG(J;F>ldeO1N?9W|5@2E=Qnt_d-s
z0V&df&{3lU0V6t)6{H;_%b05zkV=f2Fd$BhnlK<vVneV-kPwiXi-BZd_`)?EfY2Ce
z2Si;DS7?eIJQ4QP^cqVOs$p++9)MeEXZrNMCE~XG$ND!dUF|RreYETE>dWiOHi@lk
z$fguAQ{M1ASs|OMbDkA{>nKkVm&+rn`TcTiwOC`GF0XrDTp<sxw$`Y#PDwRtwCA%$
z_<OD4)k2Lr_Y_~F_Vfq^!k75_E=!Gim1j|l+TD{}K;H8VrhlH+!;{#e_VOeYh-+xG
z<Mi+7T4=KZ@jcqCMETYo-$I)eNNZ@bQl(;-)~rB!k2Wh&s&-wfS&Ti=L8V=$nJ%rp
z(hK<G!;7)aJas7(o;@YhP!n3(S^CT=>qUg@r@Ymub54Ob7ye8QynXgO=p9ro?Wgpf
zQk>?&yR47zmur+ir%KPQ@s!H=J@o(lKU-E>#347iHf%<`ax?9RXxHz?=--52Vd@G~
zKg7UKE&o}^)c(Alkwd$2#ecUSyncC~Uq3P6>s}9kY&w-+)TsU{jx<e^x??I$RAZ4|
zm=vSW=(IQmr+5YvauGR1Uc&^|)*wgWovcAKDPavxU~Z%hZY3sUXjuWl&l)sKm}SMi
zn9|py!OfTgqtzVbCq^$CH1jsTM*1GJ?h1&XfLT3KoruX=@Fx3sr_?HbFBXX<;x|YK
zdZPDiVhBV9HUvyw$!TpCZQ^<IHKy4Y$?HfD`l<0MP<su&Fw`2T+mIre0{KV@E~#@Y
z5)<h3S)I`7CPmQsEvDGPNN=Ll3Kb%~2|f@}Bb@;e7m1Wb8_YO^JY_j~yFJQgsRk$;
zVf<3^W{6uxT{8@~k#9qWQxMsKc6QMoG3pfLSeNJ#uSNyJdbHQU*l#0ON0o{60^Ctl
z-v=E^sbTK$wPX8sxPn<u$)p~p4%~*qb}*^ZSA#BR>{2Se4?66pi1<Mi-!hlBGo41s
z+hicgR<i;@hn(pMtG#6t)L<M@pMD*30LW>>NuA8%#%H7+`JTLmNDC@yvz^9fyvpeF
zu`u`=(L9g@$<VaYxVV|H=%ta=%-sGe2@*`h+0CN$O*TS6mygAojw{F?4R~ri9fcvF
zS~O09;VgbNh6j@%J<UPNHB%5O)bVF9Xnsn;MKZ#)=uTib+JJ?ShC!#c(4k0;Lpb?h
zJ{_CXe0afUrGvE*L!1(XDAyUI6k<60*fr*B1Q;XPhlu+&IF#UPpQV}k<#yBt2ZClD
zg(`kn_x!*5|Hp+le3AbLq)7Y6%o%+%H#%>8{4XAPwdl3TnuM?3-gRuWh{vV;FaEQU
z8=AzguwGw8SG`{mPZ>$X8raf=<;qQ121!k156Qu5oUg?ye*|5$*OFC4P>k)m#SqEQ
zpC*4NgH;Dz39Tk3Rdk8F$qghiU~MA1Nk1Y4$OWvnhGV5K)nefut4dyS6!!*Z(1mRo
zmWRm!v59;}O38*WNviZZXL*egwz@ODp>gw#_h6YJ{Nm6JecpI>#^IbEN9tO(d}&Nm
ziFitUhs;v5eb%$&9g-#ZbA0WK$^$|R@xB$_>e5B#^Whzx6UYoTBr8U0O>PnQX+?o=
z`F-TKWN!dP-t}ZSsR-~66n&qqPFM4N{8>_)t<F|09^+Z@J+jB7R0WJJ<Xy7Yq?F5s
z7T&jBe3#5ovwQ@--y?NOrq2>MB<&-2lT3`a7I8nRO;nTA4L;$l*fN0(BNm?&I7D`l
zq2vw0&rH?f1+lCW{7{TG?~>W7QEG;k{p57EI!86&GJ6(U%5nmwfdun;h+IQTO^Pnk
zmaWcGb@R$h3T!c-0r2Jt<W90i@arhU`ZGvIsa5Co8<PSq%;$B(HT}%W{U${-$+w<7
zPl`>-;eg3}-WoV0?js>(fkWY7QOE4RsByO72c>9yk>sYqBxHsT17v3jK8;!LdW}Yk
z*?e9EXDDHwfq|5uFr6Tnve8})ejG-rgOm1?8q5cR-z2qCo-{N~6Uf<Y6{H3goD$(4
zL<3ykrT`3RI6)WO6)UwG&F5(ZfN8iJ<}%eTE5M)>A*7kmrW+C<w=7w?NO`_WSvH@S
z5CI5vsy$x~Q?i+y$yVXP48cE0a#1@jl68!F91*iWSqU=Y+stq!D}$s~=CorS)N5Vx
zRc51$nKFgOS%%fm*g8g8ugOO|x)`tzsF%J;R$?U0$jvkavaJAKM;+2Uh3rXI7%%mt
zX$sk!3_hC;=6W7TPD72=&lrO-`D&Kc$7<G#Xvr`GK)V{UFXr9Sg?+CqOn<`6^0Qt<
zTv;t&&VyIncR7ai`YTN7OkD0$XKH`m>d2uzIv1Nhpno~Emj2~XN_1Cudey9{PZ#>L
zhLP_rtx^fOR&_YBE{+X|>N#r-`4|N`PBD`V3P?3rOpgc{MK=nT<A|@pibwFGm3IpY
z1_yA|og{ln3311h@hA{#NH3D$6_tZng59Jh_)%~b$>;qRCzh|KfWs*Uj<+eTFe*$O
zRcaDjb#Z}%QmHNug8QmgC&V>osc)!>UMX-;N7oV$ZG#k`^Q~*AH;b3iumlK<Vyi^W
zs4^-)))2B`uX+xa^de;zg;~N>3u3ES1BJEaY8%EJ-Y+>N<)C<oG{*ybve?Q~ZY;ci
zk(XB+U^U8h?F^<SR6PgFYO}Cn)7WM_?lmflykg)W7%Dd^I^oQuEZ(mHkk`R8XR=gq
zuHr!e;cY=2^o77OFG4Q*Gv+l0fPuLPy0UpcJnmgbT=BSP0N;Qulz~MkX^O`xmls=M
zk>+=ZLB|ke^&B-1W|UBWlo=IJf##ZD;h7(5jw(p+PPFElbP61j5Gxv(x-6CX7+_Ep
zw9~(iXxN)(P)<PsTp6SVriSoP1@R;V=m#_ym5{x<iglzuO9k%`3m;K_5Hf9;!h4W&
zL5gS(-XGL~(xBCdW<(1`1(V=`cmi=yXe8$dwS!@&O5jy$_&UmK1@FJ83#7os{&*79
zLK<k)LtYiwhX2u%k_93}H<c7vM{q(t4b4;ybc${hMHcLHkb1igXb`FDaUB}f1N)5%
zPZ*r0a+P6|nj$=(eleLY<A%L8^=7Vfu9CIv>hAZC`Ng5fA{MzG9JVq&5D3iPCAC=8
z8UD}6nH)7=0<sGPCw0jPAQvAvN?H@iUO`C~T_R3giKN_7u2>|$QN17rJ6Vl^EXgmS
zqi+qW4Qi>NB#1~lj}o_>L7Ecrqa1@;ZpCo9AbOQz*3T0~8nMVl-yF#=nngQ7b0?Zp
zeP~{VtxQk^iTCmn?+JB9cON$SGg1o?_1Nk>bt=<}9*41odgGWWrhuU*6Wa!C+1T>2
zWm$zlNW58e8qH!8uc$UDfK5?P6F?<?We;hQ7eGl2DP;;wYBoA11D8>fyb?N*fO-mz
zG5~)SIgf^W9VRs&jXE?~MQS|qG}4MzXV9t&t+K3+ETsYm7ONuxD20GQvKr+Lv{;jZ
zgEEJwOs%I~@zbV_be9Jj)k<D5iw%NV;@!!#6J+HmIkacF!;?=XW+|l(PX$Q9ZZF+c
z(H+E9fEeubcAiWX$Yuk(tb7D|)f1u&+2?pO<oY2J4eC($0cfBtyr?`6?GoQ=lB^Ds
zl8+`>;W$wH8Yn|8381e9u0u^cm9D5?(;imAN4t0uDHd6Ii!@P9XGB`%Fa&@IEeolQ
zknRK-v_Mo7*g-USqZN|fN}GG+dbO4nSV<Xi$qUR8Js!=b0e>ZD{i*rI6{fB*bvXup
zYQ3JbUWuv8G4``&YJc8q*CSgPnr&YH@Kv|=zIv$b7lB$|&p$si+M#^yZLtJ4iH8Nn
zgb7|b$|iR~;YAPeeMV|>)D04{q6=(#&QZ0Qy_wDIiA3+D+Vo7qs$k-G8ZXKuP$;T)
z(vql6xlo4LmSrI53#Bdc8>B8rWfMB|p}7?sPcs)x**@i)P**)2z|C`r2+sCCrWHLb
z*h0N=EMY?(0IN2hZf)5BFe4)fi4RToQJ9jD$zVD!W9bH+$t?jMnSoJL&?KQFrqg1i
z6MHa8t->4{OSF7M2qd5(5HtnzjqnD7o(c#76Ixl(N(^AamsrNZ5+(=^%LAws)ML`-
z-2zPrELN8JXlX#1irIY{X{N~orr1g<s}a+#*dSs;^<cgh8;m$|Tj)-pJ1gDsbSKfB
zh#hT*Ss(MVAk#V7fGkDJE99|sDpwECnVfH>^M0~I_Xe7S$P+@j1#$zxlqB50MQv69
zi3n<GUZL)T>(IHG&HC{aucCg7bOf!Nt+aJc06C6F9*ne)W(_tV!g(wxN2!ud^AZ#g
zmxvSu2)!m+Ei2C<4P^x$qgJ2_YL1nZtDOer*VVE7_}WPPHPz769)D+lw|VNlnLBC*
zbv<O?Fo`B2;#roZ(7uC|lT;$48(j=0J0|;D*(a@1<KJdV88lfjJgcb;o|=hpQ~Lt#
zj9<i{Yodc1{-Y04e&Z$e<af{`Zlj5su1cKBm}948Aa$J9oIk90dst+t8G6h>-pcBE
z8gfiT76t<C!P^C`q?S1mp5iqvJlV+_cG0BpO%iJt69}e`)KB8~5^Zes(fC5{$WYuW
zQo-UkR$3*r2&ghBEEp!JROd%Dun~MT_dH0I@vRQpvNaYh6BL@l#?U-kUd5V^W8(ms
zxT5|)HiRT9{UD@^c5O_sk%ls?+31*}M-VGESaEb*YqwX$b6cLg?n=6Ox!Df&KkEta
zO1^SA4_<NK<rvcIuP~)Eak)>Osp>JS@4K11Z_LL7d){`x?dx=BMQMZa{(scp@au>V
zT3dD<y~EP#^rgjFh~&k-yspLfnE6Z#Eh(>y_pPP{?AX{cg4Jp#%~5S9ExxG0H+nOz
zHTg6oEhv<INcLn+MR;LQ{=fG@9#<<geC_&+R!e&ofgFEE$dndeAky3hI55^+8|qya
z_%>LR)f^2QXZY8I_3NXa)>`rn37RGIR2wTX)-7TMk;+$fEz^{eHt_&Ls?@Wz6<Nk;
zF`j3g;~Au}w1aL!Cet1mY_36(+Ec{d{0ZwL?x7YLFBqW3;G(V&n)_j&>3<9OOupsV
z4_Ed>RCZtw+f$ch2Z|}0@7N&&My<;Z0NzB}c$$K?(-btFrsyrFX%?Vi4wbsWZz&hg
z7`m3dHyTs%vAj7P7B6FZN8EgC+HG(C;r#Z$y!c%4{=0{sf2FBH9)FiNP#^;HX42#f
zyd!$k%=@fqar{{mptlUNlxO+ig}Oi)^r;B4VFbhvBTnBQ%Fi&7cH(`3r$nbO@ILVd
zo+8aCfvi1hP0K0(j*(a4@9z<9F>*$EvfF488iY8hk~P(&tb#=`@*Cv_klU`oS`qR<
z=pMK*L;W7&it7d`WoVp@##E9qjz5=-%>;>-H1h#tn)#53Pbtlu2Ml9?a|{HG0n9OC
zGd8DhJS)dB49Nh-4A_woRFHwlctfS-XRwv!xD6I#Yb>@HY=fi|A@PA{+IlC#K!g7c
zq0tb>pXbfnL|<SnY5Ghlt&39j=eYH*fw`LE&y*}Q&lDPy&D$jJQJ4j-i{vb!Q7~`Q
zFn`ASNhd6UXEeZ{DSLCU?ARuv{aNS}8WYUhc<)KIHc`$N8b!cyw(GQ00eF*if}lf9
zqP#|EG?|YuacwmZcj&VvT-v&jo+Czz90;=fM(G3}_(bv@RZl0%Zx~%sQk59^M8r9z
ziod`tdRT1!Oerq+GlPyW0P)No{sII27-?Fko=KFA`~@Qz@I5Tz{QE>X!{UN`Dewuc
zr<jedm`imzVg&@sTRhWZbTKnw3?RoVdve@^_zMQ}F$U~mQX8+7;t`qr1!n&zytkct
zO%@QZQ*ASpvMhhL(Z!pO@IfQvm2a~A6c>L%FvFCPk}N;9p07t+9WZRn@~<+wpgrqv
zgpX>CNiAKSbR`qM+?<DcecHQ{bY70ED@<LEA-(<zQ#uou`}|omb-Z}<<k;Skqu=`H
zp-C@4(0l%&G3Eyi>C;YUly>d9cwn9+lJvA%zAn~64zn4LX1D_}sUtB##`q4>F!Men
zVf<Ol&2{7|Ig2HRs^Brv#3r-c<c_5WbOP6MP1Wk=kxPiQ4^2~eBoZu{D>r!GK=UYz
zwH^sZo|frg%3*mRsR&D994;o|49%7TuU?eGyyg;@BZr}BBEDEezNDupZy`TIaUhPR
z7PZKB_9BB|Sp+`!VEYDJF>*1QK+uh5L7CXrU}HH5J~PV8eMV#}bi>RD{0FSq1Z-M5
zajzyGiG$u7$pKO*HaR1O!&F}eJxDlM@*|xHbzQ?U7j0hW?a0DdTCok;-&)?gUrn@A
zyCo>%k+-ybrp?9Y$wxk#-16ViECs0nosJ<iDVUCZNplA_@gs*>M|1VSt2{CaTP)2G
zNME1;D}%!`2%5pAnZL%&8=emxA`7gs$lDJGwA6=A;-$#0e1S(qC!h<BY_@)eyeTuj
zXby$k=4qNDB-)KMNB0Huq?76d>WdA5y>%_KmC`JKu>3I+EsF)_X1XlM^deU<NGGgN
z<JEGW1ezd;G$GPbD=i;D))@Gh<}@@{Ll>GR9TC6~O*#fCS;k=6BSK0G2+%Ss9)A@4
z3C%drDl8cS;7iE*ghv+Td_zS7192vrSRu1{h9y?Wl7Nf9prtChl3-?oJI+URz*_pm
zGMo5(A|ACgnWnD%ioR3iXdeBO_uUU2Fm$^u{gGd<KIC|ya^_u+KVMxGeN)p8S$?u9
zQazFFpC(+$U$RkfuUEI2T!#yf805!E!vtlU$yHW(B)Q;H6;bw!df3{F%8+LX7c!S@
z79kcoB0W`wM@;e~<aoBfyQj497%x8}Hcn8|<vGHI>?IqC&5Tw_LcL|lMkz&v`t2rH
zv>mN@v|20A5H92_*~q6zIQ!h>GFB&`rUB1Rm1heVvX*SLrby@$<q5)PU_v^Jm8~XM
zhW%pEc-s^nEa|BzJYp=cy4T~)Q_wT0ni3Eup@6dSq6~1xY5}lq=BjLe7Z1c)QbHIE
zctsIqirF1?lA2eeR%ZKqdNeD7s$%S6VEfuBK`DB}y@f}_6uv`48+A%wyDqUP$V-8)
zI@+T-DMe#8!>(g2#k-lx3y&le7#C9f%ki?Les+!N5)i6eog%eqDA1T+fmb(y-~yu?
z&t<$sN8JV+jP35xd9|6TMuT0auLQnj#)m<T!uzgF1@Lu81ezc~$J?!>8u&r;<QI&b
zBE0A<h-e}F(oXQX5W<*hM&1F0L^R$!)lN~2ow+B46vK~WJO;a|8V;wXUqUe>I}cQZ
zS=0eY9yq-S$jTs9VL%4EI{-;+Xa^*rp&gL1jbRK7ax);*CpPmco!T$Nrw}e0BbG|$
zTneO58`VcbjAT~^8R^@`$nGHZAs{P*jO0`X8R^S>3LtsR6)WM2c8pxD`FLB<HP>mb
z(HMDI_jw+|^PH+NGNpkrvd4Tt$%^zxy|_L$=gR8pa>*U)f7bckl_lThJb1-@mt#n;
z|5-CtfgEZ;k8$jAZ_5_;?0xkB_b)0}-xPSa>yu9%Z~mWsQ(VB=>gspWsdjfboa$AM
z^0R6;N8;bea!+z9dC{{dRb1|wkt)9E`7EDQR11E;e|5dU@8DmMcec7lNY+#6xS`yN
zj?PfW1?@Tx-bvn*V|R%q@`znhi9CE4Um_o^5^I!xcxH-n6P_ue9IrOkDBs#8r`pqD
zajJ9eIZm~QBg<)??hzJ{6`q7tG1HTnD&FmhPnABGO}oTWdBYB=R35yGFO>)G624So
z@I)4+FCImr9Idw0D1A=lG^n%f)=Syd25$lE0=yDAe}@il%MQSM>!ettRN)CG6yAR2
zhEqlc@2m!|mm}w_2G8XdQZ;z76y6F?`~nT$8hOwz4c;0G@3>Nd2cIbGtS7Adm22^A
z73E+x@MX75B#kTP7h|TX$eVNh&>meLe&wGB?|HfF{WpJn%hlt)yJ~Jjvdw;7>VSUB
zj7H0aqcN^~)!GZ|l!ICRcq|kOBs>7GZi7P*_;bASiRfCVo{Lxdx~HJvtV#Jq@Q)|w
z<CV{F+p!^e$r9xqtN&pU1&0#+20M}<|HI_mI%TsFFI&yoMBb_s1hPR+gfK%j>cskZ
zq(tj;%3T)R$HaMwxgP&A1M7{h2|WIq^%K1R=vYNXg~10A+2$jr?W7e5>Z6o(MpwT1
zNb+{_=Smawz8ORo>7k_sQtLYN`9YZRbFjiHup*)+Q&dmM3H$|`nvoZk%{j)_DYz?J
zAUsQwD~%Mp2-#1|`K9Lb6h&X;0E_}_l6Zby&?4m%bS|O>X?<aSF||I*ZY+>o>ySDE
z`l?2XyoNFr>A@>il}{v_1_xOZYHaGUEacNM)h6X*q+iQr7-Oggb5f1EOkQtkHC7{8
z0+@8XSQYjNDN?0+ILlA7KgwDuNQ<^-n-7U8cvcTQ6=hF`kq?W-un@EdLH6|M_Q7<T
zO6m~1c!02gGFB7@Fb{O;_~^S&6G80f3|^!M=u#m4Z{%Sh$&e`!kUECp-GjeQI$~V1
z6=u<HG1WPnM3)Qi#A31?xfsuX0ZBmst*&CTrionZ&M%CsgtKg{B;JU(y&`8WRra{a
za^-+$V-6V@NXMIgVO)~b>RJ%g%%_Ow>oYV{3-~0l9^pU<iKzk~D?)rwz)#7E#zv5q
z!Z;h;pmT<pD)X}*Nn}wa@App)k~+iZ@9T~i_)1DW-q35|hyNG;$!FEbj{=5AFbMJ6
zp#k&{`RI3H&(iP0NYD2d9-Or-ub=aJ@q!}nvAS#DCW4ngL+&7nUdtIW6KB#HJdD8N
zl=hNG)p93)0%ukyc?&-!ax{x?k>P<XH_q_emoxaW|01t&h72L`ew^J-B&YZ-elU~h
z<M)!+@E8DbFMcg#X~qw4AgWpXSQoVczd3@aEdk^C4x)OHbqYk`2TDG%grf5Cr8=q@
zHNgi|*Qzso{2@H-06$s!7LONjIHhmN4QjkhN+^V8{0!;|{P^io5U4dVYO;?kr~R76
z<>WCns})lEssBR1_WD95x5rsZenVz>jg2Il<OhH(NENfM2G2TRtoI_H1uQk<R<LAk
zMoY%akAW)HTysg`H6ostp}>w6cp?K|BWB~5T;=U8c1k6>vw{qFM8KRJM8N0_Gw*)L
zm1;nI0)9NEN5b-U+yyxZHabJDA`A3{<-hV-WKbh_jBl(!a32|V?R^j9KFz6**523Y
zkylr=O1Eske^}qh{Joxg>)v1R-T%?<g_|033V1x{RXA-f!Q(L>^3+6>y(~MIM)ps6
zv%p}u#}*O)2_A7g7*E2CZOAUL;Bm105rsbTwGSTtIROvB6myLiRQgQVm+(N^F7j=7
zFsI=JKTpI<+oV0pGCUP@kUa{oljxv_KDai%IvEe0O~BJt%?I$JuV_3O^mcm;o=nTn
z<7eWzvwM_uJe2clPhUK=HuDSmR82rVZ7v4XzMc#`@;DLCBZY{0e9{kzNWz;HRsh8{
zc%tY<DAp={J$OHldrCD>v>8%lUIjzC<GG$=Px5#=u5q4(XWv4{N_h;ph{hWp=<Do5
zFm)ZerKX0g0x*gv=#t&a+7MaMcm%Jdz_^v!aoSwU?4XoWDlP${)Vz{`$Z#j%S+dMf
zovSvw!%$Wx&toXt$PDvGxEcRqgYI}^8$3!SgsUjViyb1F%iCd~4y_bV!=V&p5zN%B
z=wK%0;WTSN{h0xxG-uG)@U?Te#-tv0G$LqFMadu8jd+wXjZ5Z>O2c#XQN@Tl%~{1}
z8n`s3C=C>2J0hvOFNQz^J6*XBkLaZkXu#+iHWVQ8X;6l1phkwXKx2~nlG-p4kAV$3
zn~pCU4Y~j=B&iKrJcUCH1+^BDTD1IY0(1nL36=sjY}zAeBdN_#x*IeObe6~9H6%I*
zh<G}-wMbx&#s!n#J!9H0uiWkV2@}T8dJ%l(ZqMaBc*T8}V@R*pnZk{g>;KT>zJs@o
zTmSiQ-!2(F^u~Lpu3g%D=7-U_J)^E`o%h}cUHf0(W09|^spWJ3;<yjV;X8A!XU*^8
zYMo@?TZIeF0+Bv<eqWs!S0B}Yk_Exb?}u6bS@x)Ua@#RW9dE5nUVxczzv6TgpNFKm
z{Y_0#?kYN|FW~nr$y48zXS4jJu4S__)U(Gw16Q=H9k?i;HNPj<G?K-Ng#-j^P|DIJ
z&&zrX(#7ox)X8`=AeE561DEl$=6B?$FsUc!TFb?_b1@AYb{KO_$(R}TE5ncz?X9k8
z`9K-&si3)uhKow166#tk$qku1OvjiV`!JK;iQJ~Nia1;?v*nhw*|<xwO!+OISbl~k
zOgoV6oJE!}(&#$VNV>|t0Bk*GsLal%DTK8=AG6HiD(h6`V2j039|TuaxC`L!@`MPO
zDxAVB^&aNIIV`u*^^-*lB+y8yUgavM8O8!ObM9AkxIu$+jb{rdlYN*OHS-cGgAmSQ
z_Flv0)*lgptZ|1$6G0hDSMJ8-dbrw98B=fBftl$nON8FTL+hK_<XJ{@!UcR1ui-9H
z-@*Jn-9D&+`JY7uVD3W(&;~Q8L-ztr5h$@5jUiW;m^E%RJKBNJcrFQgmXb&P7&0^*
z<x_AionTpbRT>rucsYwinJ8s(tD6y$kW9p5g3~XzwlF%+nkfv8PK}H9IF0b?9)z1n
z1s0p*tS3TD=^%A0wC-=X#QT*G$t>oc!_`@J>mYrq^dU(*0Q?#}9lvJaT^`0U@{5X=
z@hqX)r=-PQpmBk}!a%rZFpM;eXfj0orD0?NNe4{{VoYP9pS#8P3Bn(5!py1Tjjes%
z87{G*o&?IzhN6eo>f@G<(xn)YG&iJ<#UO6bqA#az9R_2u-@3<72SSoGnRIfy(q_;B
z&r@q+@NP^~Lj{H~bv+e9V_M7Y!da(iORKfkY|*kKr|u1=u+2ww{4Q6_aTjRjs3Qnw
z*m`u+wFXO?f}=Z>_k|);b5UDZ>8Ys}m~EM71g;l4T^g6v!`dZD2cYGR!Jxv}2unQa
z<punPmH+@q>x14vUfH330RYmV3^zdQuMKcIv@TVTYc0C~{7}7qf%xHix)wuNg+;7R
z;3e?4C6&|xZFw_|HSH3ur}iD|U-Q?S-i^uV6P9%Ttlq1jr&2#FP)GAtUjI;!&JTC*
z!cXe{n{n$mF09(Py7<PjlT+WBWgEBm4{6(RkNa@ijll&E-l;`B8A|p=&6A<!2re<0
zncEgbSbt;v(6;Ksf{w1zwAC*i7*TAZXj|{#eMK0kZ3`y6>WGfT(29%y&(;5Q<(Gp(
zxgZC)$o^A{B73ARjW7(gMRXlml;iA(Uz{4MTpD$~6FqDd-f*LT$mCcotuAJ~ZT%R|
zw?yxDbY%Ntu1N>9OQXE_f*w~wT({b}r=xQ^x~4rl?az!q;<Wbmgr9{+lNIaYwpa?Y
zjom#60+mKR)Q<UNR~z%;fZC#nUOY5Pu|~B9m$0;;Ev9uu^un(pB2`>BI^i%Bp=b_~
zMW;iJEZwDTRM82aYHy2RJ)U(Wx?<gU?E+0g!$>z>&57tdk~<cfjxYv;2$P=vdHo|x
z_=uH7Pd<PPaYga!X*;gI@8B;BzMlTx=!r8=3}4dKTYujE$hJvQ-k0i&j^Ecjo&?_b
z*}VLV7)Rk{W=6clEf#ldqK%_#B0tGklD2fYVXZS_(k${65+nMu@Jdr7A8I%OH<3)p
zQv2bxZ_#oycNOjCweXc%L;U0gF9@gdXhQ?u4!s&##vz1HhEj|d4kk%k>07p`T<ay|
z(&npKbNrSD&8Pi`%@H;*uOpZ}xByHQ85l87gCbOtV#@$#`89D%OQP_2f?0Us)gE=K
zlqcm0Cq%qOkH;$*O%2)1{3vEV-`XjLwVoYnh4-dwt&AZi#HW@@E}gUWm<8}lBfPG#
z1R5B{=$lKLVhWrQ*Yvkp0$-_LG2KCoq%<<HMTbc}L2aTc#Dz<Rrf{)Q5KGxM^m5Jy
z@;3h9My4Y#!hBS7IAtUT>oJ{eI7bB{bw*e3GBISrC588J-lh4E#szgZ4IkavG$tJV
zZF?zklwh(ya>&S{lE}1^ZPd}oS&!ERQVzl_WuDfN7Dkv4Q>3()G-v7ZsL82Itu7}0
z7gK8@uIqpC&TOS{XkbP&@xf>dw?+>}&8xYjf-H+R<T|<Voim4VDBajjLt(MTdN!_a
zy2Wk$X<Q?;b!DO)JDH-i?F>+dIC?qf=<d)wsd1-)wfZ|39=?=#79?uD=^-X+O>kg@
zLPr~$VpEqFBpRD^IBD*PaSJb`UuAIir9RMTW$rKG;%X^Fy1OV-LjR%-0gN@>6Lg4@
zRgvEJsVU(irPfZ@_AeR~Y>5HPL@tjxw}n|2G+yhW*(LfrFR9i?1O75S=yv88l5bgS
zacb?Pexqw50x#+6G<?A!qMG<I{26Twi+3$8iTw3QZD(l-lgPj`NWuvT<AX*Gp8ET0
zTk}gDi4k2bH~l6ofxhx`5&h;>$4~ucmY&sLVX7lT`nk^3k^LKckLmq~gI9eycFjY-
zdhyBc{@)E<`UJ+#tKHeH?w2Vs!o!xh2))n${3lr%Ysc4-Wy)ZCLYjFVzQn`p*iWll
z@pTgpYSm|CNAQ>y(zfIkeBYT+#X60!=WHiuWct;fqd?rF%)-|pti@+|8cp0|WH;X7
zj&C;Skk$B>j7hVeP4<TxCs&K7)tfwtRm6-(chHx*CstdwldmAoI#1lD80#!<xw9@~
zw_a>1EYI}di<?^YTF-{Y-~oi3k<(I`0m3}-1impHVGkWJaf?pii%|!C8+({Z;dTbq
zTEF9)0*B3(tP7$3p@VjUPN+bbs;<;_#G{dRv3RWnZ+S0Mj=HV0bS}hUWOqx#$d0?T
zuKaKI$KvX9ym<95@9(qX;Lx5Ehu-?fRRf=XvHQG%w?4At{`*ssl4kt*aLeT1#6^Ah
zg};2?BOa6VY}NKTKm7laM1w3A<EPRG%}?>prZRO?!fd<+xv!k0Y>A6g)3ZdIZz5Sz
zKqn!3nT&DQZo#XQ>0DfFUQ%GGG}QBWt#5fI-sij9JekmU_Ocw%)G)|h>Nl{Q0TYlp
ziQi1hYh%3LE^+4cEWxH9ib{Qs30i9Ll7cVe>Z>YZd>P7ib(M=hPA|;HhPq5((KLP)
zrjgDB7pcs28H2eNUS|x0Hd*T@N^#W*_2l+V;;{`hHKT~F27G%=r}mOdA*M+Y#hYh5
zCekFf-pWtoj|o;E?k|>@H{ogf%zS@}-h!gkDAS3V7G4$0*wm{+ay#}4SBVTMT3)H-
zs--k7lJbPggoaF(5NfC&C;3lW@N?*3x*TSP)>31kji8`MHn^l&s&J0Z`5Jwi0;G*n
zuI5R-Vyl|}9sX`bb90zAGyrI91S_OmjUz2GXho)$wYOEYQNz;twu%m-bjIk+9WBpN
z92P`g=8`35gq<Esx@R^Kyp3DadDt(_R@3W@ZkO*h-3;Bnb_8m1s!O+yB1J8Rkt8>#
z98XwaRI?PnJr9}yN)HPg8tCD?F~?|f|Gi=*g=S<XxRyGsEg<0zEAzO~T~~@&L?CP9
zPa{H0Ba6(BlNt*hZZtmHU`$txsq&_*I%BFjMoJ6Bwe{WL5++N>@H*HKf7%d@lBX#~
zwJ9ed+3LV8MH)7G<ZUJuTh*AfKs`whlt5whT#0{EW1bG~D0xR=tMs%v2|ZbEru8gV
zCzDkV62I8H4IGUu>erk#LS@yAC7?dvk?*4-@X~uo9$XjGywefu&rl}g?GS9Cp@lVK
z7eQSwHs#<wB-DR;{LukJEnxwI&^A*TRwt#AUWqhfj*;&9R)QOFG>SI3#BT$g#6W$O
zugizRfifcDS`(tz8YEGR5j~XK=@3r`mc^;0824|27dP7fakAk%lQYn%T;KiP?2#X(
zuGL0u2+?JWwyM$fT8zzFa;H?(5<OBHKo-i6@|%;-#-y6l>q0xVA&^YtosK`<A8o8L
z+v$i73R7Z^;X;P7d)U9wJjN)AUhUc!Y?q&A^X-{xr1*bquK1B@gjJ~ydBm-QC(pwa
zbvSQc=bO2r(GP6+?E@cmE{T3;as1z+-)nN*z4m@fdCqIzz0y23owG^$WqG(gYr81z
zLS8_pT}-N9DF@xw0<jhob3!%d);-D%p7<)9(}aPidC9e&8P!IbK*ZWDCI_3n|1Pg<
zyjU*u^g~v_(ul$K@&f*Z+Rwu>44Mfb3#nCS%E{H}nD#v6-r%VUyyWTEWUgH)H<<^X
zO5RjpbQu2U6RwLjIFl7_Wy+^DVe5^b)xB{&wZ8)DV&7>cbGiOp1l)J%qt&Gx*SUC0
zj~-9_{(*V31b<Xi{I{>a+x6`R_p}^hkiK)gEXP+{g=z%)V7qZ1S+I0Z<dFVTo48d`
zlSdYvj=0W{oBAIYC5bHAzQL17$3vMi+@7Ol<uj^<lNcY@db0i(R~YR`6Bb7b;`@m-
zxvg4#&9Ljc)J#(h=7rsQtsgsZ;j5$9KJhpE;lFjCBy_sfw{_GiulmI6zZ@U@Uo}{5
z>WlJC_SgcWH?mtGqO;0%61i_8JW=>brSS`~NQuBtO*8EY1=bpKhWveUip?;<8P(ex
z={+80u?fLyV+vY!_2domE)q+WUY>r{8{(Go?JM8y=lzJUF=xs>?E_<-)6ij={E-}0
z?MRV|m)N?i)fW78(tJ+UbW2KC^(0D4A$F0q$i!qN7p4nxU;Cm0pgz?v^&{S9E>;dG
z-900!lT*aHp1UfInheb($<g)6^M(Q;MXVA&s_@f}L6iDbTNg&=cn0Z4QpDCfi#DrE
z@x#MKBhzD<7S@<n31Xz9l`<lwEnUpi8BRhsHO185W@e_$wiHD{MNG9pgMC1W)PR-@
za^^9)6+N9(!49=L1cgceZBZ@EgPP%^Z4sRe&ilk~j1lQkss8}-JzRo|!jz^iEsE^i
z-?jq`QR{*(p>&Oa${-rc2qvL-Dr-Ez$)!hi8~Gze*+CER3z^%-1{r~yij}@99~4lu
zhQSjTYY<MVJH@VrC#m0*SjaDunGduu5mLwp#^Q<oNQ4yms$bfJ%!7gvq6WD%`Q$>s
zw8vSz2x*<ZtEWz33bQ|4I$UP`zGb+JHsVJ<wgvErg>*`=8>rV03%28kub`ms`=(Ix
zyLv2(J6+dGc|gSA=hlTqx3)F%W*zu{;GdF?pNzIf|K*r5h1t7I&RUX=@5~vO!2Oyj
zWfsuVc#5`LN%q&L;o*-MBGD23ms6$!u`Yh<5-1Ed*|lth|0cWji)B-oxnk{A_VY2-
zlDSK)Yecp5LYGCZC>_$^#1uiYsb>Zk<Y6G41D>9C;f0Lt?r6J^n$gKvbV{v=ow<Oi
zk6`8{r;wb;N-KWY?CaAjjT=o45BwucB&l4wfjgfGIzSs8FE2tAiCbEPLCJM8auvk2
zs9Pnvwcu>DEwWo0It*||bdKW+gx5kN|9|DcUl!o*-&DE?m!^sdbE}44v*O@{nQK4F
zKCu3;vz~n6<xb-c{?dH^=~~PCThg=E-Z5To>D%tY_7hLuIWw@@TB2N)JbHQT+LC?`
z)%5(t*>zHC<ZpIGTzd*vA^)}Z{1m=`p0GByWNB`VdA*#UA{|mjRp%@&kTT`h7I}$!
zoqf>Vwh7X5Ieo^t*{GaSAe>kG+j9z+i>>)7V$-dyTcBv$4CffuQ+U3s(T(z&5#9on
zKR3fUUOe6{uHI3jemcW83vyQd!TG$nzgyus6usUj?Pzk1`f{JN<HFEoIr5YOp4@Cc
zoU>3gcxDKllI7d0Eot3%Im*B6+>2_v5OdEVi?2&B7miQgm9~j@MBmr|0b5NeTlxCv
z8|^s$*p#x1uZw>F9FE^yWc#D|Rm?q9$&13eI)AOW`oo6AF92hmq2|158=G1PlzExX
z-;3uaq^{@ZcfP{~5GkGi=_*@Yv`5YDQ*Z)(KgqPs7Y~e0`I0}IKRRCgx`(?Jt)A+-
z(;xYCZjMzn{LQ^{MsB`v-W=^2VLh#ytv6qP!124z1O1~+#jl#nZo3gSfuHN_!jkC0
zyOz#VX2&Egj~V*8c;;9Cbawj9uBBI*)|Nzn5<Hyx2eNP6q?#`K&Kt$Q|H@?`{ZaGG
zhYQJp^5%Dyf#M(k;Wkv?w?KB3C+&aRF1=ggQ!2*ht|jxkJ+pFg0SWXQa)Dpc>zQ}6
zQb^PF#~$$D=lIthdCFL$dNLlWKUt!fj33>3ND-$!^wtw&9{pRFx8AZx{=~TI&@58v
zdia9XO=CH4PUNuO_Z^J5v0zB{*};tuJlws<O}$?qTl(EETkiR0anH1=dApZoMRn-^
z@0|9l{=)a#{J1k|-}>Hcxvg&EcN^X}xso@!#pbuvcb_5mZzF>x$?{uy_)#_SQ{}a1
z$RD?9XZLRt|8ZOzv|q)+$Hy(>w**h$eOmn0e)YAd#b54G|M;Hr@p1l81OKRSO8mUA
zz!H<zVD<5*V#HY<L(*9im$P$T%!5f!Z_eLS=ejj<)Ls9M1>Dk`3L_?1-n|vP9VuRE
zue@R0!M<Poe&VmM8Z)-1`AFl+;=5NQHvaR4s*G({SH7RMSE>DJ>jm4IFX>&=_%wA-
zU6veQMK(2B=8z|<q+0c$n>6_kAtS56j~~SC%Az^6A#H)h(Hz{&#Bp8yXa2-$p$eJX
zakq7wg2hZDKaV^s6Tkmu+&&F<6~!fzglumcZj(YhFIXM){wEbOBP5UsPtI{Ha+hx>
z|7^sHtF1l+$+At^(kLEt<KAwlNf_$W>IrDg+OC<gWxEFZWqCGk9W#^%-O}CS8EeZM
zO8E&5GHwSyub%crOQ$ULOy?_TjRoEbRd`QIMa`-@aWP?{q~D26fjuoT<-*7xKS;j7
z&!+TP>r5Xq8P<bRg}cIyCE|A6I|h@_$jlPb=&LuMN<N3?8bs-Yx|5;?x`S@VHZb;C
zqcj^V!Dg&aP4on}lQ%UQ=a45)h!vEG$EpDK%dH>;+&)$%R6)p$Ib^2nIiv|QexWAH
z{BueUWp+p-sdh=n_$t-#BpIw&cBzSeIN@MD`GRbzAkV>h=$9anL}gv0FoEKvoLeWz
z4vHyfy)t7K0t70zZG|x4iLc_b-H!E2Ia9Y)Sul%2dz;3?HcbWuZrMs6qj>3mFyxNL
zeBTrQ<`smEAJwXKcip*tAx+nd=M0X&W?XU1r(@3__}!b`liuEP{X?fxr(OTmhWnb0
z*Z=bY8|T?Lz7u{h`{wKqoALq`eQ;Y}{9~1LT4hJgfxZ^;bW1{-y0V;a@(qe3yX!38
z|5o85k7JfRgWf=(p;=D98rX_)Vxcz>W+5#3)A%AIYZks<U`PD#LfQ`*tQZR&Is}`w
zb?|J(BFaI($an>6ggIo`970!eI9lJ5Ap1`pY*T$got@)w(M47PVq{g0<BWO(zNWB}
z7L5tU$;<L#1S)QSoOD~A{wMK819?eC6xO=FJcJt+bLHgcmzY{1fqet>{1V;~v?U15
z@xl_mF<3N1Gs>}e315$*e5GtFTU_c~oKU9-Rs${}L5vL78se8uGEKUblrSUx*2N<g
zI$WTn3NKLiOGlXpfnP%?KCO=D1BHjJK@N5{iqFt5Kw3*3KE^o{k@aQaAnK1fB%>w4
zU*q{JP$kfBRo*arM^#w1!z}~pS4YQv8v^#{KLt;j!7oypch;>0UyG{nn6kcR7k>~k
zT7qAac=py;=$27>d3LeHH%7X+HD}wtjrnOu8_gcPm>yR}DrJv?=%Cy&Proex|LuNj
zzYJ6kZ~vR{@8{b8Ie%P%p_2re?m1ca<L~17Bf$Bb*+13i)$fXztA7tv3QBIkfCdLn
z4=_USU;YLP?m7$5B+t*Azr%sa25jtnP)Jwb0w#&ue_{&jiK|G+snq_v)-y2)9m@sg
R;n9H{LIDUH$QgVg1prougGvAZ

literal 0
HcmV?d00001

diff --git a/autotest/gdrivers/data/geos_vrtwarp.vrt b/autotest/gdrivers/data/geos_vrtwarp.vrt
new file mode 100644
index 000000000000..e5ff70443faf
--- /dev/null
+++ b/autotest/gdrivers/data/geos_vrtwarp.vrt
@@ -0,0 +1,50 @@
+<VRTDataset rasterXSize="11173" rasterYSize="10513" subClass="VRTWarpedDataset">
+  <SRS dataAxisToSRSAxisMapping="2,1">GEOGCS["WGS 84",DATUM["WGS_1984",SPHEROID["WGS 84",6378137,298.257223563,AUTHORITY["EPSG","7030"]],AUTHORITY["EPSG","6326"]],PRIMEM["Greenwich",0,AUTHORITY["EPSG","8901"]],UNIT["degree",0.0174532925199433,AUTHORITY["EPSG","9122"]],AXIS["Latitude",NORTH],AXIS["Longitude",EAST],AUTHORITY["EPSG","4326"]]</SRS>
+  <GeoTransform> -1.5628130024270072e+02,  1.4534981708669393e-02,  0.0000000000000000e+00,  7.6404172905756070e+01,  0.0000000000000000e+00, -1.4534981708669393e-02</GeoTransform>
+  <Metadata>
+    <MDI key="AREA_OR_POINT">Area</MDI>
+  </Metadata>
+  <VRTRasterBand dataType="Byte" band="1" subClass="VRTWarpedRasterBand">
+    <NoDataValue>0</NoDataValue>
+    <ColorInterp>Palette</ColorInterp>
+    <ColorTable>
+      <Entry c1="0" c2="0" c3="0" c4="255" />
+      <Entry c1="255" c2="255" c3="255" c4="255" />
+    </ColorTable>
+  </VRTRasterBand>
+  <BlockXSize>512</BlockXSize>
+  <BlockYSize>128</BlockYSize>
+  <GDALWarpOptions>
+    <WarpMemoryLimit>6.71089e+07</WarpMemoryLimit>
+    <ResampleAlg>NearestNeighbour</ResampleAlg>
+    <WorkingDataType>Byte</WorkingDataType>
+    <SourceDataset relativeToVRT="1">geos_vrtwarp.tif</SourceDataset>
+    <Transformer>
+      <ApproxTransformer>
+        <MaxError>0.125</MaxError>
+        <BaseTransformer>
+          <GenImgProjTransformer>
+            <SrcGeoTransform>-5434894.95475267898,1002.00865774377053,0,-5434894.96445174422,0,1002.00865774377053</SrcGeoTransform>
+            <SrcInvGeoTransform>5423.99999516018943,0.000997995368874063891,0,5424.00000483981148,0,0.000997995368874063891</SrcInvGeoTransform>
+            <DstGeoTransform>-156.281300242700723,0.0145349817086693929,0,76.4041729057560701,0,-0.0145349817086693929</DstGeoTransform>
+            <DstInvGeoTransform>10752.0809709369441,68.7995361840427933,0,5256.57165844142673,0,-68.7995361840427933</DstInvGeoTransform>
+            <ReprojectTransformer>
+              <ReprojectionTransformer>
+                <SourceSRS>PROJCS["unnamed",GEOGCS["unknown",DATUM["unnamed",SPHEROID["Spheroid",6378137,298.2572221]],PRIMEM["Greenwich",0],UNIT["degree",0.0174532925199433,AUTHORITY["EPSG","9122"]]],PROJECTION["Geostationary_Satellite"],PARAMETER["central_meridian",-75],PARAMETER["satellite_height",35786023],PARAMETER["false_easting",0],PARAMETER["false_northing",0],UNIT["metre",1,AUTHORITY["EPSG","9001"]],AXIS["Easting",EAST],AXIS["Northing",NORTH],EXTENSION["PROJ4","+proj=geos +lon_0=-75 +h=35786023 +x_0=0 +y_0=0 +ellps=GRS80 +units=m +no_defs +sweep=x"]]</SourceSRS>
+                <TargetSRS>GEOGCS["WGS 84",DATUM["WGS_1984",SPHEROID["WGS 84",6378137,298.257223563,AUTHORITY["EPSG","7030"]],AUTHORITY["EPSG","6326"]],PRIMEM["Greenwich",0,AUTHORITY["EPSG","8901"]],UNIT["degree",0.0174532925199433,AUTHORITY["EPSG","9122"]],AXIS["Latitude",NORTH],AXIS["Longitude",EAST],AUTHORITY["EPSG","4326"]]</TargetSRS>
+              </ReprojectionTransformer>
+            </ReprojectTransformer>
+          </GenImgProjTransformer>
+        </BaseTransformer>
+      </ApproxTransformer>
+    </Transformer>
+    <BandList>
+      <BandMapping src="1" dst="1">
+        <SrcNoDataReal>0</SrcNoDataReal>
+        <SrcNoDataImag>0</SrcNoDataImag>
+        <DstNoDataReal>0</DstNoDataReal>
+        <DstNoDataImag>0</DstNoDataImag>
+      </BandMapping>
+    </BandList>
+  </GDALWarpOptions>
+</VRTDataset>
diff --git a/autotest/gdrivers/vrtwarp.py b/autotest/gdrivers/vrtwarp.py
index 793cbbac5785..ca47fe48951f 100755
--- a/autotest/gdrivers/vrtwarp.py
+++ b/autotest/gdrivers/vrtwarp.py
@@ -412,8 +412,11 @@ def test_vrtwarp_read_vrt_of_warped_vrt():
     assert cs == 4672
 
 ###############################################################################
-# Test different nodata values on bands and partial blocks (#6581)
-
+# Test reading a warped VRT that has blocks pointing to spce.
+# https://github.com/OSGeo/gdal/issues/1985
 
 
+def test_vrtwarp_read_blocks_in_space():
 
+    ds = gdal.Open('data/geos_vrtwarp.vrt')
+    assert ds.GetRasterBand(1).ReadRaster(0, 0, 512, 512)
diff --git a/gdal/alg/gdalwarpoperation.cpp b/gdal/alg/gdalwarpoperation.cpp
index e2c4c7906ffd..da621eb6783e 100644
--- a/gdal/alg/gdalwarpoperation.cpp
+++ b/gdal/alg/gdalwarpoperation.cpp
@@ -447,6 +447,19 @@ int GDALWarpOperation::ValidateOptions()
         return FALSE;
     }
 
+    const bool bErrorOutIfEmptySourceWindow = CPLFetchBool(
+        psOptions->papszWarpOptions,
+        "ERROR_OUT_IF_EMPTY_SOURCE_WINDOW", true);
+    if( !bErrorOutIfEmptySourceWindow &&
+        CSLFetchNameValue(psOptions->papszWarpOptions, "INIT_DEST") == nullptr )
+    {
+        CPLError( CE_Failure, CPLE_IllegalArg,
+                  "GDALWarpOptions.Validate(): "
+                  "ERROR_OUT_IF_EMPTY_SOURCE_WINDOW=FALSE can only be used "
+                  "if INIT_DEST is set");
+        return FALSE;
+    }
+
     return TRUE;
 }
 
@@ -1779,7 +1792,14 @@ CPLErr GDALWarpOperation::WarpRegionToBuffer(
         if( hWarpMutex != nullptr )
             CPLReleaseMutex( hWarpMutex );
         if( eErr != CE_None )
+        {
+            const bool bErrorOutIfEmptySourceWindow = CPLFetchBool(
+                psOptions->papszWarpOptions,
+                "ERROR_OUT_IF_EMPTY_SOURCE_WINDOW", true);
+            if( !bErrorOutIfEmptySourceWindow )
+                return CE_None;
             return eErr;
+        }
     }
 
 /* -------------------------------------------------------------------- */
@@ -2730,10 +2750,21 @@ CPLErr GDALWarpOperation::ComputeSourceWindow(
 /* -------------------------------------------------------------------- */
     if( nFailedCount > nSamplePoints - 5 )
     {
-        CPLError( CE_Failure, CPLE_AppDefined,
-                  "Too many points (%d out of %d) failed to transform, "
-                  "unable to compute output bounds.",
-                  nFailedCount, nSamplePoints );
+        const bool bErrorOutIfEmptySourceWindow = CPLFetchBool(
+            psOptions->papszWarpOptions,
+            "ERROR_OUT_IF_EMPTY_SOURCE_WINDOW", true);
+        if( bErrorOutIfEmptySourceWindow )
+        {
+            CPLError( CE_Failure, CPLE_AppDefined,
+                    "Too many points (%d out of %d) failed to transform, "
+                    "unable to compute output bounds.",
+                    nFailedCount, nSamplePoints );
+        }
+        else
+        {
+            CPLDebug("WARP", "Cannot determine source window for %d,%d,%d,%d",
+                     nDstXOff, nDstYOff, nDstXSize, nDstYSize);
+        }
         return CE_Failure;
     }
 
diff --git a/gdal/frmts/vrt/vrtwarped.cpp b/gdal/frmts/vrt/vrtwarped.cpp
index fe756591b913..50df93b46ab7 100644
--- a/gdal/frmts/vrt/vrtwarped.cpp
+++ b/gdal/frmts/vrt/vrtwarped.cpp
@@ -463,6 +463,29 @@ CPLErr VRTWarpedDataset::SetMetadataItem( const char *pszName, const char *pszVa
     return VRTDataset::SetMetadataItem(pszName, pszValue, pszDomain);
 }
 
+/************************************************************************/
+/*                        VRTWarpedAddOptions()                         */
+/************************************************************************/
+
+static char** VRTWarpedAddOptions(char** papszWarpOptions)
+{
+    /* Avoid errors when adding an alpha band, but source dataset has */
+    /* no alpha band (#4571), and generally don't leave our buffer uninitialized */
+    if (CSLFetchNameValue( papszWarpOptions, "INIT_DEST" ) == nullptr)
+        papszWarpOptions =
+            CSLSetNameValue(papszWarpOptions, "INIT_DEST", "0");
+
+    /* For https://github.com/OSGeo/gdal/issues/1985 */
+    if (CSLFetchNameValue( papszWarpOptions,
+                           "ERROR_OUT_IF_EMPTY_SOURCE_WINDOW" ) == nullptr)
+    {
+        papszWarpOptions =
+            CSLSetNameValue(papszWarpOptions,
+                            "ERROR_OUT_IF_EMPTY_SOURCE_WINDOW", "FALSE");
+    }
+    return papszWarpOptions;
+}
+
 /************************************************************************/
 /*                             Initialize()                             */
 /*                                                                      */
@@ -480,11 +503,7 @@ CPLErr VRTWarpedDataset::Initialize( void *psWO )
     GDALWarpOptions* psWO_Dup
         = GDALCloneWarpOptions(static_cast<GDALWarpOptions *>( psWO ) );
 
-    /* Avoid errors when adding an alpha band, but source dataset has */
-    /* no alpha band (#4571), and generally don't leave our buffer uninitialized */
-    if (CSLFetchNameValue( psWO_Dup->papszWarpOptions, "INIT_DEST" ) == nullptr)
-        psWO_Dup->papszWarpOptions =
-            CSLSetNameValue(psWO_Dup->papszWarpOptions, "INIT_DEST", "0");
+    psWO_Dup->papszWarpOptions = VRTWarpedAddOptions(psWO_Dup->papszWarpOptions);
 
     CPLErr eErr = m_poWarper->Initialize( psWO_Dup );
 
@@ -1235,11 +1254,7 @@ CPLErr VRTWarpedDataset::XMLInit( CPLXMLNode *psTree, const char *pszVRTPathIn )
     if( psWO == nullptr )
         return CE_Failure;
 
-    /* Avoid errors when adding an alpha band, but source dataset has */
-    /* no alpha band (#4571) */
-    if( CSLFetchNameValue( psWO->papszWarpOptions, "INIT_DEST" ) == nullptr )
-        psWO->papszWarpOptions =
-            CSLSetNameValue(psWO->papszWarpOptions, "INIT_DEST", "0");
+    psWO->papszWarpOptions = VRTWarpedAddOptions(psWO->papszWarpOptions);
 
     eAccess = GA_Update;
 

From 6e83a202bef2283a9f88fe03fe2c349b56d98243 Mon Sep 17 00:00:00 2001
From: Even Rouault <even.rouault@spatialys.com>
Date: Wed, 13 Nov 2019 12:52:10 +0100
Subject: [PATCH 414/488] gdalwarpkernel.cpp: fix build broken by previous
 backport

---
 gdal/alg/gdalwarpkernel.cpp | 1 +
 1 file changed, 1 insertion(+)

diff --git a/gdal/alg/gdalwarpkernel.cpp b/gdal/alg/gdalwarpkernel.cpp
index 2ca0d3141a2f..32cdfa8c96e5 100644
--- a/gdal/alg/gdalwarpkernel.cpp
+++ b/gdal/alg/gdalwarpkernel.cpp
@@ -40,6 +40,7 @@
 
 #include <algorithm>
 #include <limits>
+#include <map>
 #include <new>
 #include <vector>
 

From abe7fd53ca8ef6713800d4fe39c44f74a7e57081 Mon Sep 17 00:00:00 2001
From: Even Rouault <even.rouault@spatialys.com>
Date: Wed, 13 Nov 2019 16:36:03 +0100
Subject: [PATCH 415/488] Block cache: fix corruption on multithreaded write on
 datasets (fixes #2011)

When writing several GDAL datasets in parallel from several threads, a
thread can force a dirty block of another thread/dataset to be written. By
doing so, it will remove it from the list of cached blocks, so if the thread
that explictly manipulates this dataset reacquire the block, it will see an
old version of the block. The effect of this can be particularly seen with
GeoTIFF files with multi band pixel leaving organization, where acquiring
a block of a band causes corresponding blocks of other bands to be cached.

The main fix done here is in GDALRasterBlock::Internalize() to avoid evicting
a dirty block of another dataset when there are other candidates. This considerably
reduces the likelihood of the bug.

Another fix is done in GDALDataset::EnterReadWrite() to wait for the completion
of the flushing of pending dirty blocks of the dataset before reading new blocks.

I believe there could still be problems if the block cache size is too
small regarding the number of threads.
---
 autotest/cpp/testblockcachewrite.cpp      | 71 +++++++++++++++--
 gdal/gcore/gdal_priv.h                    |  4 +-
 gdal/gcore/gdalabstractbandblockcache.cpp |  8 +-
 gdal/gcore/gdalarraybandblockcache.cpp    |  2 +-
 gdal/gcore/gdaldataset.cpp                | 16 +++-
 gdal/gcore/gdalhashsetbandblockcache.cpp  |  2 +-
 gdal/gcore/gdalrasterband.cpp             |  1 +
 gdal/gcore/gdalrasterblock.cpp            | 96 ++++++++++++++++++++---
 8 files changed, 173 insertions(+), 27 deletions(-)

diff --git a/autotest/cpp/testblockcachewrite.cpp b/autotest/cpp/testblockcachewrite.cpp
index c2f742f29139..b3758d2d8829 100644
--- a/autotest/cpp/testblockcachewrite.cpp
+++ b/autotest/cpp/testblockcachewrite.cpp
@@ -76,30 +76,28 @@ class MyDataset: public GDALDataset
         }
 };
 
-static void thread_func(void* /* unused */ )
+static void thread_func1(void* /* unused */ )
 {
     printf("begin thread\n");
     GDALFlushCacheBlock();
     printf("end of thread\n\n");
 }
 
-int main(int argc, char* argv[])
+static void test1()
 {
     CPLJoinableThread* hThread;
 
+    printf("Start test1\n");
     printf("main thread %p\n", (void*)CPLGetPID());
 
-    argc = GDALGeneralCmdLineProcessor( argc, &argv, 0 );
-
-    CPLSetConfigOption("GDAL_CACHEMAX", "0");
-    CPLSetConfigOption("GDAL_DEBUG_BLOCK_CACHE", "ON");
+    GDALSetCacheMax(0);
 
     MyDataset* poDS = new MyDataset();
 
     char buf1[] = { 1 } ;
     CPL_IGNORE_RET_VAL(GDALRasterIO(GDALGetRasterBand(poDS, 1), GF_Write, 0, 0, 1, 1, buf1, 1, 1, GDT_Byte, 0, 0));
 
-    hThread = CPLCreateJoinableThread(thread_func, nullptr);
+    hThread = CPLCreateJoinableThread(thread_func1, nullptr);
     CPLSleep(0.3);
     CPL_IGNORE_RET_VAL(GDALRasterIO(GDALGetRasterBand(poDS, 1), GF_Write, 1, 0, 1, 1, buf1, 1, 1, GDT_Byte, 0, 0));
     GDALFlushCacheBlock();
@@ -107,6 +105,65 @@ int main(int argc, char* argv[])
     CPLJoinThread(hThread);
 
     delete poDS;
+    printf("End test1\n");
+}
+
+
+static void thread_func2(void* /* unused */)
+{
+    printf("begin thread %p\n", (void*)CPLGetPID());
+    GDALDatasetH hDS = GDALOpen("data/byte.tif", GA_ReadOnly);
+    GByte c = 0;
+    CPL_IGNORE_RET_VAL(GDALDataset::FromHandle(hDS)->GetRasterBand(1)->RasterIO(GF_Read, 0,0,1,1,&c,1,1,GDT_Byte,0,0,nullptr));
+    GDALClose(hDS);
+    printf("end of thread\n\n");
+}
+
+static void test2()
+{
+    printf("Start test2\n");
+    printf("main thread %p\n", (void*)CPLGetPID());
+
+    CPLJoinableThread* hThread;
+
+    CPLSetConfigOption("GDAL_RB_INTERNALIZE_SLEEP_AFTER_DETACH_BEFORE_WRITE", "0.5");
+    GDALSetCacheMax(1000*1000);
+
+    auto poDS = GetGDALDriverManager()->GetDriverByName("GTiff")->Create("/vsimem/foo.tif", 1, 1, 2, GDT_Byte, nullptr);
+    poDS->GetRasterBand(1)->Fill(0);
+    poDS->GetRasterBand(2)->Fill(0);
+    poDS->FlushCache();
+    GDALSetCacheMax(0);
+
+    poDS->GetRasterBand(1)->Fill(1);
+    hThread = CPLCreateJoinableThread(thread_func2, nullptr);
+    CPLSleep(0.2);
+
+    GByte c = 0;
+    CPL_IGNORE_RET_VAL(poDS->GetRasterBand(1)->RasterIO(GF_Read,0,0,1,1,&c,1,1,GDT_Byte,0,0,nullptr));
+    printf("%d\n", c);
+    assert(c == 1);
+    CPLJoinThread(hThread);
+
+    CPLSetConfigOption("GDAL_RB_INTERNALIZE_SLEEP_AFTER_DETACH_BEFORE_WRITE", nullptr);
+    delete poDS;
+    VSIUnlink("/vsimem/foo.tif");
+    printf("End test2\n");
+}
+
+
+int main(int argc, char* argv[])
+{
+    argc = GDALGeneralCmdLineProcessor( argc, &argv, 0 );
+
+    CPLSetConfigOption("GDAL_DEBUG_BLOCK_CACHE", "ON");
+    GDALGetCacheMax();
+
+    GDALAllRegister();
+
+    test1();
+    test2();
+
     GDALDestroyDriverManager();
     CSLDestroy( argv );
 
diff --git a/gdal/gcore/gdal_priv.h b/gdal/gcore/gdal_priv.h
index c22a1b6bd4ba..7c67caa7f17d 100644
--- a/gdal/gcore/gdal_priv.h
+++ b/gdal/gcore/gdal_priv.h
@@ -998,7 +998,6 @@ class CPL_DLL GDALAbstractBandBlockCache
 
         void              FreeDanglingBlocks();
         void              UnreferenceBlockBase();
-        void              WaitKeepAliveCounter();
 
     public:
             explicit GDALAbstractBandBlockCache(GDALRasterBand* poBand);
@@ -1006,6 +1005,7 @@ class CPL_DLL GDALAbstractBandBlockCache
 
             GDALRasterBlock* CreateBlock(int nXBlockOff, int nYBlockOff);
             void             AddBlockToFreeList( GDALRasterBlock * );
+            void             WaitCompletionPendingTasks();
 
             virtual bool             Init() = 0;
             virtual bool             IsInitOK() = 0;
@@ -1035,6 +1035,7 @@ class CPL_DLL GDALRasterBand : public GDALMajorObject
     friend class GDALArrayBandBlockCache;
     friend class GDALHashSetBandBlockCache;
     friend class GDALRasterBlock;
+    friend class GDALDataset;
 
     CPLErr eFlushBlockErr = CE_None;
     GDALAbstractBandBlockCache* poBandBlockCache = nullptr;
@@ -1069,7 +1070,6 @@ class CPL_DLL GDALRasterBand : public GDALMajorObject
 
     void        InvalidateMaskBand();
 
-    friend class GDALDataset;
     friend class GDALProxyRasterBand;
     friend class GDALDefaultOverviews;
 
diff --git a/gdal/gcore/gdalabstractbandblockcache.cpp b/gdal/gcore/gdalabstractbandblockcache.cpp
index e472494523d4..ad76bc462c71 100644
--- a/gdal/gcore/gdalabstractbandblockcache.cpp
+++ b/gdal/gcore/gdalabstractbandblockcache.cpp
@@ -113,7 +113,7 @@ void GDALAbstractBandBlockCache::AddBlockToFreeList( GDALRasterBlock *poBlock )
         psListBlocksToFree = poBlock;
     }
 
-    // If no more blocks in transient state, then warn WaitKeepAliveCounter()
+    // If no more blocks in transient state, then warn WaitCompletionPendingTasks()
     CPLAcquireMutex(hCondMutex, 1000);
     if( CPLAtomicDec(&nKeepAliveCounter) == 0 )
     {
@@ -123,13 +123,13 @@ void GDALAbstractBandBlockCache::AddBlockToFreeList( GDALRasterBlock *poBlock )
 }
 
 /************************************************************************/
-/*                         WaitKeepAliveCounter()                       */
+/*                      WaitCompletionPendingTasks()                    */
 /************************************************************************/
 
-void GDALAbstractBandBlockCache::WaitKeepAliveCounter()
+void GDALAbstractBandBlockCache::WaitCompletionPendingTasks()
 {
 #ifdef DEBUG_VERBOSE
-    CPLDebug("GDAL", "WaitKeepAliveCounter()");
+    CPLDebug("GDAL", "WaitCompletionPendingTasks()");
 #endif
 
     CPLAcquireMutex(hCondMutex, 1000);
diff --git a/gdal/gcore/gdalarraybandblockcache.cpp b/gdal/gcore/gdalarraybandblockcache.cpp
index 9d8aeebe6e2d..098c12871277 100644
--- a/gdal/gcore/gdalarraybandblockcache.cpp
+++ b/gdal/gcore/gdalarraybandblockcache.cpp
@@ -318,7 +318,7 @@ CPLErr GDALArrayBandBlockCache::FlushCache()
         }
     }
 
-    WaitKeepAliveCounter();
+    WaitCompletionPendingTasks();
 
     return( eGlobalErr );
 }
diff --git a/gdal/gcore/gdaldataset.cpp b/gdal/gcore/gdaldataset.cpp
index 3be120b2bb95..0bf9e8ea4329 100644
--- a/gdal/gcore/gdaldataset.cpp
+++ b/gdal/gcore/gdaldataset.cpp
@@ -6767,8 +6767,20 @@ int GDALDataset::EnterReadWrite(GDALRWFlag eRWFlag)
                      CPLGetPID(), GetDescription());
 #endif
             CPLCreateOrAcquireMutex(&(m_poPrivate->hMutex), 1000.0);
-            // Not sure if we can have recursive calls, so...
-            m_poPrivate->oMapThreadToMutexTakenCount[CPLGetPID()]++;
+
+            const int nCountMutex = m_poPrivate->oMapThreadToMutexTakenCount[CPLGetPID()]++;
+            if( nCountMutex == 0 && eRWFlag == GF_Read )
+            {
+                CPLReleaseMutex(m_poPrivate->hMutex);
+                for( int i = 0; i < nBands; i++ )
+                {
+                    auto blockCache = papoBands[i]->poBandBlockCache;
+                    if( blockCache )
+                        blockCache->WaitCompletionPendingTasks();
+                }
+                CPLCreateOrAcquireMutex(&(m_poPrivate->hMutex), 1000.0);
+            }
+
             return TRUE;
         }
     }
diff --git a/gdal/gcore/gdalhashsetbandblockcache.cpp b/gdal/gcore/gdalhashsetbandblockcache.cpp
index f1b827a158e6..b15d2922123d 100644
--- a/gdal/gcore/gdalhashsetbandblockcache.cpp
+++ b/gdal/gcore/gdalhashsetbandblockcache.cpp
@@ -181,7 +181,7 @@ CPLErr GDALHashSetBandBlockCache::FlushCache()
         }
     }
 
-    WaitKeepAliveCounter();
+    WaitCompletionPendingTasks();
 
     return( eGlobalErr );
 }
diff --git a/gdal/gcore/gdalrasterband.cpp b/gdal/gcore/gdalrasterband.cpp
index ff0874bdf9b0..a81b4c1d7ea3 100644
--- a/gdal/gcore/gdalrasterband.cpp
+++ b/gdal/gcore/gdalrasterband.cpp
@@ -536,6 +536,7 @@ CPLErr GDALRasterBand::ReadBlock( int nXBlockOff, int nYBlockOff,
 /* -------------------------------------------------------------------- */
 /*      Invoke underlying implementation method.                        */
 /* -------------------------------------------------------------------- */
+
     int bCallLeaveReadWrite = EnterReadWrite(GF_Read);
     CPLErr eErr = IReadBlock( nXBlockOff, nYBlockOff, pImage );
     if( bCallLeaveReadWrite) LeaveReadWrite();
diff --git a/gdal/gcore/gdalrasterblock.cpp b/gdal/gcore/gdalrasterblock.cpp
index d13a48e61df7..81d121a04435 100644
--- a/gdal/gcore/gdalrasterblock.cpp
+++ b/gdal/gcore/gdalrasterblock.cpp
@@ -452,17 +452,27 @@ int GDALRasterBlock::FlushCacheBlock( int bDirtyBlocksOnly )
         if( poTarget == nullptr )
             return FALSE;
         if( bSleepsForBockCacheDebug )
-            CPLSleep(CPLAtof(
+        {
+            // coverity[tainted_data]
+            const double dfDelay = CPLAtof(
                 CPLGetConfigOption(
-                    "GDAL_RB_FLUSHBLOCK_SLEEP_AFTER_DROP_LOCK", "0")));
+                    "GDAL_RB_FLUSHBLOCK_SLEEP_AFTER_DROP_LOCK", "0"));
+            if( dfDelay > 0 )
+                CPLSleep(dfDelay);
+        }
 
         poTarget->Detach_unlocked();
         poTarget->GetBand()->UnreferenceBlock(poTarget);
     }
 
     if( bSleepsForBockCacheDebug )
-        CPLSleep(CPLAtof(
-            CPLGetConfigOption("GDAL_RB_FLUSHBLOCK_SLEEP_AFTER_RB_LOCK", "0")));
+    {
+        // coverity[tainted_data]
+        const double dfDelay = CPLAtof(
+            CPLGetConfigOption("GDAL_RB_FLUSHBLOCK_SLEEP_AFTER_RB_LOCK", "0"));
+        if( dfDelay > 0 )
+            CPLSleep(dfDelay);
+    }
 
     if( poTarget->GetDirty() )
     {
@@ -945,6 +955,7 @@ CPLErr GDALRasterBlock::Internalize()
 /* -------------------------------------------------------------------- */
     bool bFirstIter = true;
     bool bLoopAgain = false;
+    GDALDataset* poThisDS = poBand->GetDataset();
     do
     {
         bLoopAgain = false;
@@ -958,25 +969,74 @@ CPLErr GDALRasterBlock::Internalize()
             GDALRasterBlock *poTarget = poOldest;
             while( nCacheUsed > nCurCacheMax )
             {
+                GDALRasterBlock* poDirtyBlockOtherDataset = nullptr;
+                // In this first pass, only discard dirty blocks of this
+                // dataset. We do this to decrease significantly the likelihood
+                // of the following weakness of the block cache design:
+                // 1. Thread 1 fills block B with ones
+                // 2. Thread 2 evicts this dirty block, while thread 1 almost
+                //    at the same time (but slightly after) tries to reacquire
+                //    this block. As it has been removed from the block cache
+                //    array/set, thread 1 now tries to read block B from disk,
+                //    so gets the old value.
                 while( poTarget != nullptr )
                 {
-                    if( !poTarget->GetDirty() ||
-                        nDisableDirtyBlockFlushCounter == 0 )
+                    if( !poTarget->GetDirty() )
                     {
                         if( CPLAtomicCompareAndExchange(
                                 &(poTarget->nLockCount), 0, -1) )
                             break;
                     }
+                    else if (nDisableDirtyBlockFlushCounter == 0)
+                    {
+                        if( poTarget->poBand->GetDataset() == poThisDS )
+                        {
+                            if( CPLAtomicCompareAndExchange(
+                                    &(poTarget->nLockCount), 0, -1) )
+                                break;
+                        }
+                        else if( poDirtyBlockOtherDataset == nullptr )
+                        {
+                            poDirtyBlockOtherDataset = poTarget;
+                        }
+                    }
                     poTarget = poTarget->poPrevious;
                 }
+                if( poTarget == nullptr && poDirtyBlockOtherDataset )
+                {
+                    if( CPLAtomicCompareAndExchange(
+                            &(poDirtyBlockOtherDataset->nLockCount), 0, -1) )
+                    {
+                        CPLDebug("GDAL", "Evicting dirty block of another dataset");
+                        poTarget = poDirtyBlockOtherDataset;
+                    }
+                    else
+                    {
+                        poTarget = poOldest;
+                        while( poTarget != nullptr )
+                        {
+                            if( CPLAtomicCompareAndExchange(
+                                &(poTarget->nLockCount), 0, -1) )
+                            {
+                                CPLDebug("GDAL", "Evicting dirty block of another dataset");
+                                break;
+                            }
+                        }
+                    }
+                }
 
                 if( poTarget != nullptr )
                 {
                     if( bSleepsForBockCacheDebug )
-                        CPLSleep(CPLAtof(
+                    {
+                        // coverity[tainted_data]
+                        const double dfDelay = CPLAtof(
                             CPLGetConfigOption(
                                 "GDAL_RB_INTERNALIZE_SLEEP_AFTER_DROP_LOCK",
-                                "0")));
+                                "0"));
+                        if( dfDelay > 0 )
+                            CPLSleep(dfDelay);
+                    }
 
                     GDALRasterBlock* _poPrevious = poTarget->poPrevious;
 
@@ -1022,6 +1082,17 @@ CPLErr GDALRasterBlock::Internalize()
 
             if( poBlock->GetDirty() )
             {
+                if( bSleepsForBockCacheDebug )
+                {
+                    // coverity[tainted_data]
+                    const double dfDelay = CPLAtof(
+                        CPLGetConfigOption(
+                            "GDAL_RB_INTERNALIZE_SLEEP_AFTER_DETACH_BEFORE_WRITE",
+                            "0"));
+                    if( dfDelay > 0 )
+                        CPLSleep(dfDelay);
+                }
+
                 CPLErr eErr = poBlock->Write();
                 if( eErr != CE_None )
                 {
@@ -1126,8 +1197,13 @@ int GDALRasterBlock::TakeLock()
     const int nLockVal = AddLock();
     CPLAssert(nLockVal >= 0);
     if( bSleepsForBockCacheDebug )
-        CPLSleep(CPLAtof(
-            CPLGetConfigOption("GDAL_RB_TRYGET_SLEEP_AFTER_TAKE_LOCK", "0")));
+    {
+        // coverity[tainted_data]
+        const double dfDelay = CPLAtof(
+            CPLGetConfigOption("GDAL_RB_TRYGET_SLEEP_AFTER_TAKE_LOCK", "0"));
+        if( dfDelay > 0 )
+            CPLSleep(dfDelay);
+    }
     if( nLockVal == 0 )
     {
         // The block is being evicted by GDALRasterBlock::Internalize()

From fa6668f915163bc7316cb870c63551b875a8176b Mon Sep 17 00:00:00 2001
From: Even Rouault <even.rouault@spatialys.com>
Date: Thu, 14 Nov 2019 16:17:17 +0100
Subject: [PATCH 416/488] VRT: fix requesting a downsampling version of the
 mask band of a source that has masks and overviews

---
 autotest/gcore/vrtmisc.py        | 23 +++++++++++
 gdal/frmts/vrt/vrtdataset.cpp    | 69 ++++++++++++++++++++++++++++++++
 gdal/frmts/vrt/vrtrasterband.cpp |  5 ++-
 3 files changed, 96 insertions(+), 1 deletion(-)

diff --git a/autotest/gcore/vrtmisc.py b/autotest/gcore/vrtmisc.py
index 483c29497fd0..b3e67d2e6ce3 100755
--- a/autotest/gcore/vrtmisc.py
+++ b/autotest/gcore/vrtmisc.py
@@ -29,6 +29,7 @@
 # DEALINGS IN THE SOFTWARE.
 ###############################################################################
 
+import gdaltest
 from osgeo import gdal
 
 
@@ -496,6 +497,28 @@ def test_vrtmisc_histogram():
 
     gdal.Unlink(tmpfile)
 
+
+###############################################################################
+# complex scenario involving masks and implicit overviews
+
+def test_vrtmisc_mask_implicit_overviews():
+
+    with gdaltest.config_option('GDAL_TIFF_INTERNAL_MASK', 'YES'):
+        ds = gdal.Translate('/vsimem/cog.tif', 'data/stefan_full_rgba.tif', options = '-outsize 2048 0 -b 1 -b 2 -b 3 -mask 4')
+        ds.BuildOverviews('NEAR', [2, 4])
+        ds = None
+    gdal.Translate('/vsimem/cog.vrt', '/vsimem/cog.tif')
+    gdal.Translate('/vsimem/out.tif', '/vsimem/cog.vrt', options = '-b mask -outsize 10% 0')
+    gdal.GetDriverByName('GTiff').Delete('/vsimem/cog.tif')
+    gdal.Unlink('/vsimem/cog.vrt')
+    ds = gdal.Open('/vsimem/out.tif')
+    histo = ds.GetRasterBand(1).GetDefaultHistogram()[3]
+    # Check that there are only 0 and 255 in the histogram
+    assert histo[0] + histo[255] == ds.RasterXSize * ds.RasterYSize, histo
+    assert ds.GetRasterBand(1).Checksum() == 46885
+    ds = None
+    gdal.Unlink('/vsimem/out.tif')
+
 ###############################################################################
 # Cleanup.
 
diff --git a/gdal/frmts/vrt/vrtdataset.cpp b/gdal/frmts/vrt/vrtdataset.cpp
index 219978c5f9b8..9e215fedddc0 100644
--- a/gdal/frmts/vrt/vrtdataset.cpp
+++ b/gdal/frmts/vrt/vrtdataset.cpp
@@ -1803,6 +1803,38 @@ void VRTDataset::BuildVirtualOverviews()
             nOverviews = nOvrCount;
     }
 
+    if( m_poMaskBand )
+    {
+        if( !m_poMaskBand->IsSourcedRasterBand())
+            return;
+
+        VRTSourcedRasterBand* poVRTBand
+            = cpl::down_cast<VRTSourcedRasterBand *>( m_poMaskBand );
+        if( poVRTBand->nSources != 1 )
+            return;
+        if( !poVRTBand->papoSources[0]->IsSimpleSource() )
+            return;
+
+        VRTSimpleSource* poSource
+            = cpl::down_cast<VRTSimpleSource *>( poVRTBand->papoSources[0] );
+        if( !EQUAL(poSource->GetType(), "SimpleSource") &&
+            !EQUAL(poSource->GetType(), "ComplexSource") )
+            return;
+        GDALRasterBand* poSrcBand = poSource->GetBand();
+        if( poSrcBand == nullptr )
+            return;
+
+        // To prevent recursion
+        m_apoOverviewsBak.push_back(nullptr);
+        const int nOvrCount = poSrcBand->GetOverviewCount();
+        m_apoOverviewsBak.resize(0);
+
+        if( nOvrCount == 0 )
+            return;
+        if( nOvrCount < nOverviews )
+            nOverviews = nOvrCount;
+    }
+
     for( int j = 0; j < nOverviews; j++)
     {
         const double dfXRatio = static_cast<double>(
@@ -1853,6 +1885,43 @@ void VRTDataset::BuildVirtualOverviews()
                 poOvrVRTBand->AddSource(poNewSource);
             }
         }
+
+        if( m_poMaskBand )
+        {
+            VRTSourcedRasterBand* poVRTBand
+                = cpl::down_cast<VRTSourcedRasterBand *>(m_poMaskBand );
+            VRTSourcedRasterBand* poOvrVRTBand = new VRTSourcedRasterBand(
+                poOvrVDS,
+                0,
+                poVRTBand->GetRasterDataType(),
+                nOvrXSize, nOvrYSize);
+            poOvrVDS->SetMaskBand( poOvrVRTBand );
+
+            VRTSimpleSource* poSrcSource = cpl::down_cast<VRTSimpleSource *>(
+                poVRTBand->papoSources[0] );
+            VRTSimpleSource* poNewSource = nullptr;
+            if( EQUAL(poSrcSource->GetType(), "SimpleSource") )
+            {
+                poNewSource =
+                    new VRTSimpleSource(poSrcSource, dfXRatio, dfYRatio);
+            }
+            else if( EQUAL(poSrcSource->GetType(), "ComplexSource") )
+            {
+              poNewSource = new VRTComplexSource(
+                  cpl::down_cast<VRTComplexSource *>( poSrcSource ),
+                  dfXRatio, dfYRatio );
+            }
+            else
+            {
+                CPLAssert(false);
+            }
+            if( poNewSource )
+            {
+                if( poNewSource->GetBand()->GetDataset() )
+                    poNewSource->GetBand()->GetDataset()->Reference();
+                poOvrVRTBand->AddSource(poNewSource);
+            }
+        }
     }
 }
 
diff --git a/gdal/frmts/vrt/vrtrasterband.cpp b/gdal/frmts/vrt/vrtrasterband.cpp
index 489a1ffba2d1..b8c9a5d7051c 100644
--- a/gdal/frmts/vrt/vrtrasterband.cpp
+++ b/gdal/frmts/vrt/vrtrasterband.cpp
@@ -1186,7 +1186,10 @@ GDALRasterBand *VRTRasterBand::GetOverview( int iOverview )
             || iOverview >= static_cast<int>( poVRTDS->m_apoOverviews.size() ) )
             return nullptr;
 
-        return poVRTDS->m_apoOverviews[iOverview]->GetRasterBand(nBand ? nBand : 1);
+        auto poOvrBand = poVRTDS->m_apoOverviews[iOverview]->GetRasterBand(nBand ? nBand : 1);
+        if( m_bIsMaskBand )
+            return poOvrBand->GetMaskBand();
+        return poOvrBand;
     }
 
     return nullptr;

From 71ce9ef51d3772a324af4ea348fa4a42a2f9d1c6 Mon Sep 17 00:00:00 2001
From: Even Rouault <even.rouault@spatialys.com>
Date: Thu, 14 Nov 2019 16:56:48 +0100
Subject: [PATCH 417/488] VRT: refactor previous commit to avoid code
 duplication. No functional change

---
 gdal/frmts/vrt/vrtdataset.cpp | 118 +++++++++++-----------------------
 1 file changed, 39 insertions(+), 79 deletions(-)

diff --git a/gdal/frmts/vrt/vrtdataset.cpp b/gdal/frmts/vrt/vrtdataset.cpp
index 9e215fedddc0..bbf7dab68e0d 100644
--- a/gdal/frmts/vrt/vrtdataset.cpp
+++ b/gdal/frmts/vrt/vrtdataset.cpp
@@ -1765,27 +1765,28 @@ void VRTDataset::BuildVirtualOverviews()
 
     int nOverviews = 0;
     GDALRasterBand* poFirstBand = nullptr;
-    for( int iBand = 0; iBand < nBands; iBand++ )
+
+    const auto CheckBandForOverview =
+        [&nOverviews, &poFirstBand, this](GDALRasterBand* poBand)
     {
-        if( !reinterpret_cast<VRTRasterBand *>(
-               papoBands[iBand] )->IsSourcedRasterBand())
-            return;
+        if( !cpl::down_cast<VRTRasterBand *>(poBand)->IsSourcedRasterBand())
+            return false;
 
         VRTSourcedRasterBand* poVRTBand
-            = reinterpret_cast<VRTSourcedRasterBand *>( papoBands[iBand] );
+            = cpl::down_cast<VRTSourcedRasterBand *>(poBand);
         if( poVRTBand->nSources != 1 )
-            return;
+            return false;
         if( !poVRTBand->papoSources[0]->IsSimpleSource() )
-            return;
+            return false;
 
         VRTSimpleSource* poSource
-            = reinterpret_cast<VRTSimpleSource *>( poVRTBand->papoSources[0] );
+            = cpl::down_cast<VRTSimpleSource *>( poVRTBand->papoSources[0] );
         if( !EQUAL(poSource->GetType(), "SimpleSource") &&
             !EQUAL(poSource->GetType(), "ComplexSource") )
-            return;
+            return false;
         GDALRasterBand* poSrcBand = poSource->GetBand();
         if( poSrcBand == nullptr )
-            return;
+            return false;
 
         // To prevent recursion
         m_apoOverviewsBak.push_back(nullptr);
@@ -1793,46 +1794,29 @@ void VRTDataset::BuildVirtualOverviews()
         m_apoOverviewsBak.resize(0);
 
         if( nOvrCount == 0 )
-            return;
-        if( iBand == 0 )
+            return false;
+        if( poFirstBand == nullptr )
         {
+            if( poSrcBand->GetXSize() == 0 || poSrcBand->GetYSize() == 0 )
+                return false;
             poFirstBand = poSrcBand;
             nOverviews = nOvrCount;
         }
         else if( nOvrCount < nOverviews )
             nOverviews = nOvrCount;
-    }
+        return true;
+    };
 
-    if( m_poMaskBand )
+    for( int iBand = 0; iBand < nBands; iBand++ )
     {
-        if( !m_poMaskBand->IsSourcedRasterBand())
+        if( !CheckBandForOverview(papoBands[iBand]) )
             return;
+    }
 
-        VRTSourcedRasterBand* poVRTBand
-            = cpl::down_cast<VRTSourcedRasterBand *>( m_poMaskBand );
-        if( poVRTBand->nSources != 1 )
-            return;
-        if( !poVRTBand->papoSources[0]->IsSimpleSource() )
-            return;
-
-        VRTSimpleSource* poSource
-            = cpl::down_cast<VRTSimpleSource *>( poVRTBand->papoSources[0] );
-        if( !EQUAL(poSource->GetType(), "SimpleSource") &&
-            !EQUAL(poSource->GetType(), "ComplexSource") )
-            return;
-        GDALRasterBand* poSrcBand = poSource->GetBand();
-        if( poSrcBand == nullptr )
-            return;
-
-        // To prevent recursion
-        m_apoOverviewsBak.push_back(nullptr);
-        const int nOvrCount = poSrcBand->GetOverviewCount();
-        m_apoOverviewsBak.resize(0);
-
-        if( nOvrCount == 0 )
+    if( m_poMaskBand )
+    {
+        if( !CheckBandForOverview(m_poMaskBand) )
             return;
-        if( nOvrCount < nOverviews )
-            nOverviews = nOvrCount;
     }
 
     for( int j = 0; j < nOverviews; j++)
@@ -1848,19 +1832,19 @@ void VRTDataset::BuildVirtualOverviews()
         VRTDataset* poOvrVDS = new VRTDataset(nOvrXSize, nOvrYSize);
         m_apoOverviews.push_back(poOvrVDS);
 
-        for( int i = 0; i < nBands; i++ )
+        const auto CreateOverviewBand =
+            [&poOvrVDS, nOvrXSize, nOvrYSize, dfXRatio, dfYRatio]
+            (GDALRasterBand* poBand)
         {
             VRTSourcedRasterBand* poVRTBand
-                = reinterpret_cast<VRTSourcedRasterBand *>(
-                    GetRasterBand(i+1) );
+                = cpl::down_cast<VRTSourcedRasterBand *>(poBand);
             VRTSourcedRasterBand* poOvrVRTBand = new VRTSourcedRasterBand(
                 poOvrVDS,
-                poOvrVDS->GetRasterCount() + 1,
+                poBand->GetBand(),
                 poVRTBand->GetRasterDataType(),
                 nOvrXSize, nOvrYSize);
-            poOvrVDS->SetBand( poOvrVDS->GetRasterCount() + 1, poOvrVRTBand );
 
-            VRTSimpleSource* poSrcSource = reinterpret_cast<VRTSimpleSource *>(
+            VRTSimpleSource* poSrcSource = cpl::down_cast<VRTSimpleSource *>(
                 poVRTBand->papoSources[0] );
             VRTSimpleSource* poNewSource = nullptr;
             if( EQUAL(poSrcSource->GetType(), "SimpleSource") )
@@ -1871,7 +1855,7 @@ void VRTDataset::BuildVirtualOverviews()
             else if( EQUAL(poSrcSource->GetType(), "ComplexSource") )
             {
               poNewSource = new VRTComplexSource(
-                  reinterpret_cast<VRTComplexSource *>( poSrcSource ),
+                  cpl::down_cast<VRTComplexSource *>( poSrcSource ),
                   dfXRatio, dfYRatio );
             }
             else
@@ -1884,43 +1868,19 @@ void VRTDataset::BuildVirtualOverviews()
                     poNewSource->GetBand()->GetDataset()->Reference();
                 poOvrVRTBand->AddSource(poNewSource);
             }
+
+            return poOvrVRTBand;
+        };
+
+        for( int i = 0; i < nBands; i++ )
+        {
+            poOvrVDS->SetBand( poOvrVDS->GetRasterCount() + 1,
+                               CreateOverviewBand(GetRasterBand(i+1)) );
         }
 
         if( m_poMaskBand )
         {
-            VRTSourcedRasterBand* poVRTBand
-                = cpl::down_cast<VRTSourcedRasterBand *>(m_poMaskBand );
-            VRTSourcedRasterBand* poOvrVRTBand = new VRTSourcedRasterBand(
-                poOvrVDS,
-                0,
-                poVRTBand->GetRasterDataType(),
-                nOvrXSize, nOvrYSize);
-            poOvrVDS->SetMaskBand( poOvrVRTBand );
-
-            VRTSimpleSource* poSrcSource = cpl::down_cast<VRTSimpleSource *>(
-                poVRTBand->papoSources[0] );
-            VRTSimpleSource* poNewSource = nullptr;
-            if( EQUAL(poSrcSource->GetType(), "SimpleSource") )
-            {
-                poNewSource =
-                    new VRTSimpleSource(poSrcSource, dfXRatio, dfYRatio);
-            }
-            else if( EQUAL(poSrcSource->GetType(), "ComplexSource") )
-            {
-              poNewSource = new VRTComplexSource(
-                  cpl::down_cast<VRTComplexSource *>( poSrcSource ),
-                  dfXRatio, dfYRatio );
-            }
-            else
-            {
-                CPLAssert(false);
-            }
-            if( poNewSource )
-            {
-                if( poNewSource->GetBand()->GetDataset() )
-                    poNewSource->GetBand()->GetDataset()->Reference();
-                poOvrVRTBand->AddSource(poNewSource);
-            }
+            poOvrVDS->SetMaskBand( CreateOverviewBand(m_poMaskBand) );
         }
     }
 }

From f80e9b875071bda703ec0b6225904f1c17763dd6 Mon Sep 17 00:00:00 2001
From: Even Rouault <even.rouault@spatialys.com>
Date: Fri, 15 Nov 2019 13:58:59 +0100
Subject: [PATCH 418/488] VRT: complementary fix for refs #2018

---
 gdal/frmts/vrt/vrtdataset.cpp | 12 +++++++++---
 gdal/frmts/vrt/vrtdataset.h   |  1 +
 2 files changed, 10 insertions(+), 3 deletions(-)

diff --git a/gdal/frmts/vrt/vrtdataset.cpp b/gdal/frmts/vrt/vrtdataset.cpp
index bbf7dab68e0d..e86178b766ba 100644
--- a/gdal/frmts/vrt/vrtdataset.cpp
+++ b/gdal/frmts/vrt/vrtdataset.cpp
@@ -1784,7 +1784,8 @@ void VRTDataset::BuildVirtualOverviews()
         if( !EQUAL(poSource->GetType(), "SimpleSource") &&
             !EQUAL(poSource->GetType(), "ComplexSource") )
             return false;
-        GDALRasterBand* poSrcBand = poSource->GetBand();
+        GDALRasterBand* poSrcBand =
+            poBand->GetBand() == 0 ? poSource->GetMaskBandMainBand() : poSource->GetBand();
         if( poSrcBand == nullptr )
             return false;
 
@@ -1864,8 +1865,13 @@ void VRTDataset::BuildVirtualOverviews()
             }
             if( poNewSource )
             {
-                if( poNewSource->GetBand()->GetDataset() )
-                    poNewSource->GetBand()->GetDataset()->Reference();
+                auto poNewSourceBand = poBand->GetBand() == 0 ?
+                    poNewSource->GetMaskBandMainBand() :
+                    poNewSource->GetBand();
+                CPLAssert(poNewSourceBand);
+                auto poNewSourceBandDS = poNewSourceBand->GetDataset();
+                if( poNewSourceBandDS )
+                    poNewSourceBandDS->Reference();
                 poOvrVRTBand->AddSource(poNewSource);
             }
 
diff --git a/gdal/frmts/vrt/vrtdataset.h b/gdal/frmts/vrt/vrtdataset.h
index c01ca321d138..b16deed718d5 100644
--- a/gdal/frmts/vrt/vrtdataset.h
+++ b/gdal/frmts/vrt/vrtdataset.h
@@ -924,6 +924,7 @@ class CPL_DLL VRTSimpleSource : public VRTSource
     virtual CPLErr FlushCache() override;
 
     GDALRasterBand* GetBand();
+    GDALRasterBand* GetMaskBandMainBand() { return m_poMaskBandMainBand; }
     int             IsSameExceptBandNumber( VRTSimpleSource* poOtherSource );
     CPLErr          DatasetRasterIO(
                                GDALDataType eBandDataType,

From eec2ce04e3a1a57beda7774a27246b70c1a65787 Mon Sep 17 00:00:00 2001
From: EvertEt <evert.etienne@gmail.com>
Date: Fri, 15 Nov 2019 14:31:54 +0100
Subject: [PATCH 419/488] Update cache calculation in gdal2tiles.py

See #2020
---
 gdal/swig/python/scripts/gdal2tiles.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/gdal/swig/python/scripts/gdal2tiles.py b/gdal/swig/python/scripts/gdal2tiles.py
index dd169c3b5e8f..106d4c8e8352 100755
--- a/gdal/swig/python/scripts/gdal2tiles.py
+++ b/gdal/swig/python/scripts/gdal2tiles.py
@@ -2867,8 +2867,8 @@ def single_threaded_tiling(input_file, output_folder, options):
 def multi_threaded_tiling(input_file, output_folder, options):
     nb_processes = options.nb_processes or 1
 
-    # Make sure that all processes do not consume more than GDAL_CACHEMAX
-    os.environ['GDAL_CACHEMAX'] = '%d' % int(gdal.GetCacheMax() / nb_processes)
+    # Make sure that all processes do not consume more than `gdal.GetCacheMax()`
+    os.environ['GDAL_CACHEMAX'] = '%d' % max(1, int(gdal.GetCacheMax() / 1024 / 1024 / nb_processes))
 
     (conf_receiver, conf_sender) = Pipe(False)
 

From 92e0a99c4d08926e59b7471f90f22a15113fadf0 Mon Sep 17 00:00:00 2001
From: Even Rouault <even.rouault@spatialys.com>
Date: Sat, 16 Nov 2019 02:11:18 +0100
Subject: [PATCH 420/488] GRIB2: do not do erroneous K->C unit conversion for
 derived forecasts whose content is not a temperature, but a derived quantity,
 such as spread

---
 .../data/grib/template_4_12_spread.grb2       | Bin 0 -> 202 bytes
 autotest/gdrivers/grib.py                     |  21 +++++++++++-
 gdal/frmts/grib/degrib/degrib/inventory.cpp   |  20 ++++++++++-
 gdal/frmts/grib/degrib/degrib/meta.h          |   9 ++++-
 gdal/frmts/grib/degrib/degrib/metaname.cpp    |  32 +++++++++++++++++-
 gdal/frmts/grib/degrib/degrib/metaname.h      |   4 ++-
 gdal/frmts/grib/degrib/degrib/metaparse.cpp   |  25 +++++++++++++-
 gdal/frmts/grib/gribcreatecopy.cpp            |  32 +++++++-----------
 8 files changed, 118 insertions(+), 25 deletions(-)
 create mode 100644 autotest/gdrivers/data/grib/template_4_12_spread.grb2

diff --git a/autotest/gdrivers/data/grib/template_4_12_spread.grb2 b/autotest/gdrivers/data/grib/template_4_12_spread.grb2
new file mode 100644
index 0000000000000000000000000000000000000000..063b4a6dc6b1c4bb71889ec6edfffbd89aabbfb2
GIT binary patch
literal 202
zcmZ<{@^oTgU|<4b5I6<IqKph?3=Av`jO>rtB|w5KK+FnK;m8c)G6Jy(Ba`aSogx3>
z04mPN^wueu)1YXQ0rTW`2EJ#T8W^5DJOIWHKqWRHqj-QOhK52lFr)(+3{3w)Bm;{G
t&`L=l17rmQ6BCG%01+U2d02r2BLfS_A#7|Q4ZQ63=Ou$2fGl$$000?vBE$dy

literal 0
HcmV?d00001

diff --git a/autotest/gdrivers/grib.py b/autotest/gdrivers/grib.py
index 9f5f05916eeb..2ac426b17381 100755
--- a/autotest/gdrivers/grib.py
+++ b/autotest/gdrivers/grib.py
@@ -1265,6 +1265,25 @@ def test_grib_online_grib2_jpeg2000_single_line():
     for k in expected_md:
         assert k in md and md[k] == expected_md[k], 'Did not get expected metadata'
 
-    
 
 
+###############################################################################
+# Template 4.12 with Derived forecast = spread. Do not do unit conversion !
+
+def test_grib_grib2_derived_forecast_spread():
+
+    if gdaltest.grib_drv is None:
+        pytest.skip()
+
+    ds = gdal.Open('data/grib/template_4_12_spread.grb2')
+    band = ds.GetRasterBand(1)
+    assert band.GetMetadataItem('GRIB_UNIT') == '[spread]'
+    assert band.ComputeRasterMinMax() == (0.24296024441719055, 0.24296024441719055)
+
+    out_ds = gdaltest.grib_drv.CreateCopy('/vsimem/out.grb2', ds)
+    band = out_ds.GetRasterBand(1)
+    assert band.GetMetadataItem('GRIB_UNIT') == '[spread]'
+    assert band.ComputeRasterMinMax() == (0.24296024441719055, 0.24296024441719055)
+    out_ds = None
+
+    gdal.Unlink('/vsimem/out.grb2')
diff --git a/gdal/frmts/grib/degrib/degrib/inventory.cpp b/gdal/frmts/grib/degrib/degrib/inventory.cpp
index 4a676092ccc6..151b64dcf86b 100644
--- a/gdal/frmts/grib/degrib/degrib/inventory.cpp
+++ b/gdal/frmts/grib/degrib/degrib/inventory.cpp
@@ -728,6 +728,22 @@ enum { GS4_ANALYSIS, GS4_ENSEMBLE, GS4_DERIVED, GS4_PROBABIL_PNT = 5,
       }
    }
 
+   uChar derivedFcst = (uChar)-1; // not determined
+   switch (templat) {
+       case GS4_DERIVED:
+       case GS4_DERIVED_CLUSTER_RECTANGULAR_AREA:
+       case GS4_DERIVED_CLUSTER_CIRCULAR_AREA:
+       case GS4_DERIVED_INTERVAL:
+       case GS4_DERIVED_INTERVAL_CLUSTER_RECTANGULAR_AREA:
+       case GS4_DERIVED_INTERVAL_CLUSTER_CIRCULAR_AREA:
+           if( secLen >= 35 ) {
+               derivedFcst = (uChar) (*buffer)[35 - 5];
+           }
+           break;
+       default:
+           break;
+   }
+
    if (timeRangeUnit == 255) {
       timeRangeUnit = 1;
       lenTime = DoubleToSInt4Clamp(
@@ -859,7 +875,9 @@ enum { GS4_ANALYSIS, GS4_ENSEMBLE, GS4_DERIVED, GS4_PROBABIL_PNT = 5,
    /* Find out what the name of this variable is. */
    ParseElemName (mstrVersion, center, subcenter, prodType, templat, cat, subcat,
                   lenTime, timeRangeUnit, statProcessID, timeIncrType, genID, probType, lowerProb,
-                  upperProb, &(inv->element), &(inv->comment),
+                  upperProb,
+                  derivedFcst,
+                  &(inv->element), &(inv->comment),
                   &(inv->unitName), &convert, percentile, genProcess,
                   f_fstValue, fstSurfValue, f_sndValue, sndSurfValue);
 
diff --git a/gdal/frmts/grib/degrib/degrib/meta.h b/gdal/frmts/grib/degrib/degrib/meta.h
index bc130028a6e7..127c8e783c04 100644
--- a/gdal/frmts/grib/degrib/degrib/meta.h
+++ b/gdal/frmts/grib/degrib/degrib/meta.h
@@ -268,10 +268,17 @@ typedef struct {  /* See Template 4.30. */
                                 band. */
 } sect4_BandType;
 
-enum { GS4_ANALYSIS, GS4_ENSEMBLE, GS4_DERIVED, GS4_PROBABIL_PNT = 5,
+enum { GS4_ANALYSIS = 0,
+       GS4_ENSEMBLE = 1,
+       GS4_DERIVED = 2,
+       GS4_DERIVED_CLUSTER_RECTANGULAR_AREA = 3,
+       GS4_DERIVED_CLUSTER_CIRCULAR_AREA = 4,
+       GS4_PROBABIL_PNT = 5,
        GS4_PERCENT_PNT = 6, GS4_ERROR = 7, GS4_STATISTIC = 8,
        GS4_PROBABIL_TIME = 9, GS4_PERCENT_TIME = 10, GS4_ENSEMBLE_STAT = 11,
        GS4_DERIVED_INTERVAL = 12,
+       GS4_DERIVED_INTERVAL_CLUSTER_RECTANGULAR_AREA = 13,
+       GS4_DERIVED_INTERVAL_CLUSTER_CIRCULAR_AREA = 14,
        GS4_STATISTIC_SPATIAL_AREA = 15, // TODO; partially supported. Should fetch specific fields in metaparse.cpp
        GS4_RADAR = 20,
        GS4_SATELLITE = 30,
diff --git a/gdal/frmts/grib/degrib/degrib/metaname.cpp b/gdal/frmts/grib/degrib/degrib/metaname.cpp
index ce1d88d9ccb9..60f4ee02ba5e 100644
--- a/gdal/frmts/grib/degrib/degrib/metaname.cpp
+++ b/gdal/frmts/grib/degrib/degrib/metaname.cpp
@@ -3138,7 +3138,9 @@ void ParseElemName (CPL_UNUSED uChar mstrVersion, uShort2 center, uShort2 subcen
                     int templat, int cat, int subcat, sInt4 lenTime,
                     uChar timeRangeUnit, CPL_UNUSED uChar statProcessID,
                     uChar timeIncrType, uChar genID, uChar probType,
-                    double lowerProb, double upperProb, char **name,
+                    double lowerProb, double upperProb,
+                    uChar derivedFcst,
+                    char **name,
                     char **comment, char **unit, int *convert,
                     sChar percentile, uChar genProcess,
                     sChar f_fstValue, double fstSurfValue,
@@ -3172,6 +3174,34 @@ void ParseElemName (CPL_UNUSED uChar mstrVersion, uShort2 center, uShort2 subcen
                     upperProb, name, comment, unit, convert, f_fstValue, fstSurfValue,
                        f_sndValue, sndSurfValue);
    }
+
+   // https://www.nco.ncep.noaa.gov/pmb/docs/grib2/grib2_doc/grib2_table4-7.shtml
+   if( derivedFcst == 2 // Standard Deviation with respect to Cluster Mean
+       || derivedFcst == 3 // Standard Deviation with respect to Cluster Mean, Normalized
+       || derivedFcst == 4 // Spread of All Members
+       || derivedFcst == 5 // Large Anomaly Index of All Members
+       || derivedFcst == 7 // Interquartile Range (Range between the 25th and 75th quantile)
+   )
+   {
+        const char* overrideUnit = nullptr;
+        switch( derivedFcst )
+        {
+            case 2: overrideUnit = "[stddev]"; break;
+            case 3: overrideUnit = "[stddev normalized]"; break;
+            case 4: overrideUnit = "[spread]"; break;
+            case 5: overrideUnit = "[large anomaly index]"; break;
+            case 7: overrideUnit = "[interquantile range]"; break;
+            default: break;
+        }
+        if( overrideUnit )
+        {
+            free(*unit);
+            *unit = (char *) malloc (strlen (overrideUnit) + 1);
+            strcpy (*unit, overrideUnit);
+        }
+        *convert = UC_NONE;
+   }
+
    if ((genProcess == 6) || (genProcess == 7)) {
       *convert = UC_NONE;
       reallocSprintf (name, "ERR");
diff --git a/gdal/frmts/grib/degrib/degrib/metaname.h b/gdal/frmts/grib/degrib/degrib/metaname.h
index ec3372ece31a..8c4e7d9bd9bc 100644
--- a/gdal/frmts/grib/degrib/degrib/metaname.h
+++ b/gdal/frmts/grib/degrib/degrib/metaname.h
@@ -19,7 +19,9 @@ void ParseElemName (uChar mstrVersion, uShort2 center, uShort2 subcenter, int pr
                     int templat, int cat, int subcat, sInt4 lenTime,
                     uChar timeRangeUnit, uChar statProcessID,
                     uChar timeIncrType, uChar genID, uChar probType,
-                    double lowerProb, double upperProb, char **name,
+                    double lowerProb, double upperProb,
+                    uChar derivedFcst,
+                    char **name,
                     char **comment, char **unit, int *convert,
                     sChar percentile, uChar genProcess,
                     sChar f_fstValue, double fstSurfValue,
diff --git a/gdal/frmts/grib/degrib/degrib/metaparse.cpp b/gdal/frmts/grib/degrib/degrib/metaparse.cpp
index 5d2aa94d3afc..9686cd5298f5 100644
--- a/gdal/frmts/grib/degrib/degrib/metaparse.cpp
+++ b/gdal/frmts/grib/degrib/degrib/metaparse.cpp
@@ -1582,7 +1582,7 @@ static int ParseSect4 (sInt4 *is4, sInt4 ns4, grib_MetaData *meta)
    meta->pds2.sect4.typeEnsemble = 0;
    meta->pds2.sect4.perturbNum = 0;
    meta->pds2.sect4.numberFcsts = 0;
-   meta->pds2.sect4.derivedFcst = 0;
+   meta->pds2.sect4.derivedFcst = (uChar)-1;
    meta->pds2.sect4.validTime = meta->pds2.refTime;
 
    if (meta->pds2.sect4.templat == GS4_SATELLITE) {
@@ -1775,6 +1775,20 @@ static int ParseSect4 (sInt4 *is4, sInt4 ns4, grib_MetaData *meta)
          meta->pds2.sect4.derivedFcst = (uChar) is4[34];
          meta->pds2.sect4.numberFcsts = (uChar) is4[35];
          break;
+      case GS4_DERIVED_CLUSTER_RECTANGULAR_AREA: /* 4.3 */
+         if (ns4 < 68) {
+            return -1;
+         }
+         meta->pds2.sect4.derivedFcst = (uChar) is4[34];
+         meta->pds2.sect4.numberFcsts = (uChar) is4[35];
+         break;
+      case GS4_DERIVED_CLUSTER_CIRCULAR_AREA: /* 4.4 */
+         if (ns4 < 64) {
+            return -1;
+         }
+         meta->pds2.sect4.derivedFcst = (uChar) is4[34];
+         meta->pds2.sect4.numberFcsts = (uChar) is4[35];
+         break;
       case GS4_DERIVED_INTERVAL: /* 4.12 */
          if (ns4 < 45) {
             return -1;
@@ -1840,6 +1854,14 @@ static int ParseSect4 (sInt4 *is4, sInt4 ns4, grib_MetaData *meta)
             meta->pds2.sect4.numMissing = is4[44];
          }
          break;
+      case GS4_DERIVED_INTERVAL_CLUSTER_RECTANGULAR_AREA: /* 4.13 */
+      case GS4_DERIVED_INTERVAL_CLUSTER_CIRCULAR_AREA: /* 4.14 */
+         if (ns4 < 36) {
+            return -1;
+         }
+         meta->pds2.sect4.derivedFcst = (uChar) is4[34];
+         meta->pds2.sect4.numberFcsts = (uChar) is4[35];
+         break;
       case GS4_STATISTIC: /* 4.8 */
          if (ns4 < 43) {
             return -1;
@@ -2411,6 +2433,7 @@ int MetaParse (grib_MetaData *meta, sInt4 *is0, sInt4 ns0,
                   meta->pds2.sect4.templat, meta->pds2.sect4.cat,
                   meta->pds2.sect4.subcat, lenTime, timeRangeUnit, statProcessID,
                   incrType, meta->pds2.sect4.genID, probType, lowerProb, upperProb,
+                  meta->pds2.sect4.derivedFcst,
                   &(meta->element), &(meta->comment), &(meta->unitName),
                   &(meta->convert), meta->pds2.sect4.percentile,
                   meta->pds2.sect4.genProcess,
diff --git a/gdal/frmts/grib/gribcreatecopy.cpp b/gdal/frmts/grib/gribcreatecopy.cpp
index ac7184b591ca..4f5a55551643 100644
--- a/gdal/frmts/grib/gribcreatecopy.cpp
+++ b/gdal/frmts/grib/gribcreatecopy.cpp
@@ -2108,18 +2108,19 @@ static float ComputeValOffset(int nTokens, char** papszTokens,
     float fValOffset = 0.0f;
 
     // Parameter category 0 = Temperature
-    bool bIsTemperature = false;
     if( nTokens >= 2 && atoi(papszTokens[0]) == 0 )
     {
-        // Cf http://www.nco.ncep.noaa.gov/pmb/docs/grib2/grib2_table4-2-0-0.shtml
+        // Cf https://www.nco.ncep.noaa.gov/pmb/docs/grib2/grib2_doc/grib2_table4-2-0-0.shtml
         // PARAMETERS FOR DISCIPLINE 0 CATEGORY 0
         int nParamNumber = atoi(papszTokens[1]);
-        if( nParamNumber >= 0 && nParamNumber <= 18 &&
+        if( (nParamNumber >= 0 && nParamNumber <= 18 &&
             nParamNumber != 8 && nParamNumber != 10 && nParamNumber != 11 &&
-            nParamNumber != 16 )
+            nParamNumber != 16) ||
+            nParamNumber == 21 ||
+            nParamNumber == 27 )
         {
-            bIsTemperature = true;
-            if( pszInputUnit == nullptr || EQUAL(pszInputUnit, "C") )
+            if( pszInputUnit == nullptr || EQUAL(pszInputUnit, "C") ||
+                EQUAL(pszInputUnit, "[C]") )
             {
                 fValOffset = 273.15f;
                 CPLDebug("GRIB",
@@ -2127,20 +2128,9 @@ static float ComputeValOffset(int nTokens, char** papszTokens,
                          "Celsius to Kelvin",
                          fValOffset);
             }
-            else if( !EQUAL(pszInputUnit, "K") )
-            {
-                CPLError(CE_Warning, CPLE_NotSupported,
-                            "Unsupported INPUT_UNIT = %s", pszInputUnit);
-            }
         }
     }
 
-    if( !bIsTemperature && pszInputUnit != nullptr )
-    {
-        CPLError(CE_Warning, CPLE_AppDefined,
-                 "INPUT_UNIT ignored for that product template");
-    }
-
     return fValOffset;
 }
 
@@ -2173,14 +2163,18 @@ static bool WriteSection4( VSILFILE* fp,
         pszPDSTemplateNumbers = GetBandOption(
             papszOptions, poSrcDS, nBand, "PDS_TEMPLATE_NUMBERS", nullptr);
     }
+    CPLString osInputUnit;
     const char* pszInputUnit = GetBandOption(
             papszOptions, nullptr, nBand, "INPUT_UNIT", nullptr);
     if( pszInputUnit == nullptr )
     {
         const char* pszGribUnit =
             poSrcDS->GetRasterBand(nBand)->GetMetadataItem("GRIB_UNIT");
-        if( pszGribUnit != nullptr && EQUAL(pszGribUnit, "[K]") )
-            pszInputUnit = "K";
+        if( pszGribUnit != nullptr )
+        {
+            osInputUnit = pszGribUnit;
+            pszInputUnit = osInputUnit.c_str();
+        }
     }
     WriteUInt16(fp, nPDTN); // PDTN
     if( nPDTN == 0 && pszPDSTemplateNumbers == nullptr &&

From 6c47d6a407b9b5e0d79f7e2ef36afe6a72571a8e Mon Sep 17 00:00:00 2001
From: Even Rouault <even.rouault@spatialys.com>
Date: Wed, 20 Nov 2019 20:38:28 +0100
Subject: [PATCH 421/488] GRIB: update GRIB tables to degrib 2.24

---
 autotest/gdrivers/grib.py                  |   3 +-
 gdal/frmts/grib/degrib/README.TXT          |   3 +
 gdal/frmts/grib/degrib/degrib/metaname.cpp | 509 ++++++++++++++++++---
 3 files changed, 454 insertions(+), 61 deletions(-)

diff --git a/autotest/gdrivers/grib.py b/autotest/gdrivers/grib.py
index 2ac426b17381..1dd63b73e13b 100755
--- a/autotest/gdrivers/grib.py
+++ b/autotest/gdrivers/grib.py
@@ -230,7 +230,8 @@ def test_grib_grib2_read_template_4_32():
     # First band extracted from http://nomads.ncep.noaa.gov/pub/data/nccf/com/hur/prod/hwrf.2017102006/twenty-se27w.2017102006.hwrfsat.core.0p02.f000.grb2
     ds = gdal.Open('data/grib/twenty-se27w.2017102006.hwrfsat.core.0p02.f000_truncated.grb2')
     cs = ds.GetRasterBand(1).Checksum()
-    assert cs == 19911, 'Could not open file'
+    assert cs == 48230, 'Could not open file'
+    assert ds.GetRasterBand(1).ComputeRasterMinMax() == pytest.approx((-9.765,2.415), 1e-3) # Reasonable range for Celcius
     md = ds.GetRasterBand(1).GetMetadata()
     expected_md = {'GRIB_REF_TIME': '  1508479200 sec UTC', 'GRIB_VALID_TIME': '  1508479200 sec UTC', 'GRIB_FORECAST_SECONDS': '0 sec', 'GRIB_UNIT': '[C]', 'GRIB_PDS_TEMPLATE_NUMBERS': '5 7 2 0 0 0 0 0 1 0 0 0 0 1 0 31 1 29 67 140 2 0 0 238 217', 'GRIB_PDS_PDTN': '32', 'GRIB_COMMENT': 'Brightness Temperature [C]', 'GRIB_SHORT_NAME': '0 undefined', 'GRIB_ELEMENT': 'BRTEMP', 'GRIB_PDS_TEMPLATE_ASSEMBLED_VALUES': '5 7 2 0 0 0 0 1 0 1 31 285 17292 2 61145'}
     for k in expected_md:
diff --git a/gdal/frmts/grib/degrib/README.TXT b/gdal/frmts/grib/degrib/README.TXT
index 849febbb676d..f7da84ae1600 100644
--- a/gdal/frmts/grib/degrib/README.TXT
+++ b/gdal/frmts/grib/degrib/README.TXT
@@ -3,6 +3,9 @@ PROVENANCE
 
 This directory contains a *modified* version of degrib 2.14:
    http://www.mdl.nws.noaa.gov/~degrib/download/archive/degrib-20171016.tar.gz
+With metaname.cpp update to degrib 2.24:
+  https://sats.nws.noaa.gov/~degrib/download/archive/degrib-20190620.tar.gz
+
 and a *modified* version of g2clib 1.6.0:
    http://www.nco.ncep.noaa.gov/pmb/codes/GRIB2/g2clib-1.6.0.tar (Last updated: 02/18/2016)
 
diff --git a/gdal/frmts/grib/degrib/degrib/metaname.cpp b/gdal/frmts/grib/degrib/degrib/metaname.cpp
index 60f4ee02ba5e..b1b578bdf843 100644
--- a/gdal/frmts/grib/degrib/degrib/metaname.cpp
+++ b/gdal/frmts/grib/degrib/degrib/metaname.cpp
@@ -588,6 +588,18 @@ static const GRIB2ParmTable MeteoTemp[] = {
    /* 15 */ {"VPTMP", "Virtual potential temperature", "K", UC_K2F},
    /* 16 */ {"SNOHF", "Snow phase change heat flux", "W/m^2", UC_NONE},
    /* 17 */ {"SKINT", "Skin temperature", "K", UC_K2F},
+   /* 18 */ {"SNOT", "Snow Temperature (top of snow)", "K", UC_K2F},
+   /* 19 */ {"TTCHT", "Turbulent Transfer Coefficient for Heat", "Numeric", UC_NONE},
+   /* 20 */ {"TDCHT", "Turbulent Diffusion Coefficient for Heat", "m^2/s", UC_NONE},
+   /* 21 */ {"APTMP", "Apparent Temperature", "K", UC_K2F},
+   /* 22 */ {"TTSWR", "Temperature Tendency due to Short-Wave Radiation", "K/s", UC_NONE},
+   /* 23 */ {"TTLWR", "Temperature Tendency due to Long-Wave Radiation", "K/s", UC_NONE},
+   /* 24 */ {"TTSWRCS", "Temperature Tendency due to Short-Wave Radiation, Clear Sky", "K/s", UC_NONE},
+   /* 25 */ {"TTLWRCS", "Temperature Tendency due to Long-Wave Radiation, Clear Sky", "K/s", UC_NONE},
+   /* 26 */ {"TTPARM", "Temperature Tendency due to parameterizations", "K/s", UC_NONE},
+   /* 27 */ {"WETBT", "Wet Bulb Temperature", "K", UC_K2F},
+   /* 28 */ {"UCTMP", "Unbalanced Component of Temperature", "K", UC_K2F},
+   /* 29 */ {"TMPADV", "Temperature Advection", "K/s", UC_NONE},
 };
 
 /* GRIB2 Code table 4.2 : 0.1 */
@@ -666,6 +678,69 @@ static const GRIB2ParmTable MeteoMoist[] = {
 /* 66 */    {"SPRATE", "Snow precipitation rate", "kg/(m^2*s)", UC_NONE},
 /* 67 */    {"FPRATE", "Freezing rain precipitation rate", "kg/(m^2*s)", UC_NONE},
 /* 68 */    {"IPRATE", "Ice pellets precipitation rate", "kg/(m^2*s)", UC_NONE},
+/* 69 */    {"TCOLW", "Total Column Integrate Cloud Water", "kg/m^2", UC_NONE},
+/* 70 */    {"TCOLI", "Total Column Integrate Cloud Ice", "kg/m^2", UC_NONE},
+/* 71 */    {"HAILMXR", "Hail Mixing Ratio", "kg/kg", UC_NONE},
+/* 72 */    {"TCOLH", "Total Column Integrate Hail", "kg/m^2", UC_NONE},
+/* 73 */    {"HAILPR", "Hail Prepitation Rate", "kg/(m^2*s)", UC_NONE},
+/* 74 */    {"TCOLG", "Total Column Integrate Graupel", "kg/m^2", UC_NONE},
+/* 75 */    {"GPRATE", "Graupel (Snow Pellets) Prepitation Rate", "kg/(m^2*s)", UC_NONE},
+/* 76 */    {"CRRATE", "Convective Rain Rate", "kg/(m^2*s)", UC_NONE},
+/* 77 */    {"LSRRATE", "Large Scale Rain Rate", "kg/(m^2*s)", UC_NONE},
+/* 78 */    {"TCOLWA", "Total Column Integrate Water (All components including precipitation)", "kg/m^2", UC_NONE},
+/* 79 */    {"EVARATE", "Evaporation Rate", "kg/(m^2*s)", UC_NONE},
+/* 80 */    {"TOTCON", "Total Condensate", "kg/kg", UC_NONE},
+/* 81 */    {"TCICON", "Total Column-Integrate Condensate", "kg/m^2", UC_NONE},
+/* 82 */    {"CIMIXR", "Cloud Ice Mixing Ratio", "kg/kg", UC_NONE},
+/* 83 */    {"SCLLWC", "Specific Cloud Liquid Water Content", "kg/kg", UC_NONE},
+/* 84 */    {"SCLIWC", "Specific Cloud Ice Water Content", "kg/kg", UC_NONE},
+/* 85 */    {"SRAINW", "Specific Rain Water Content", "kg/kg", UC_NONE},
+/* 86 */    {"SSNOWW", "Specific Snow Water Content", "kg/kg", UC_NONE},
+/* 87 */    {"SPRATE", "Stratiform Precipitation Rate", "kg/(m^2*s)", UC_NONE},
+/* 88 */    {"CATCP", "Categorical Convective Precipitation", "0=No; 1=Yes; "
+             "2-191=Reserved; 192-254=Reserved; 255=missing", UC_NONE},
+/* 89 */    {"", "Reserved", "-", UC_NONE},
+/* 90 */    {"TKMFLX", "Total Kinematic Moisture Flux", "kg/kg(m/s)", UC_NONE},
+/* 91 */    {"UKMFLX", "U-component (zonal) Kinematic Moisture Flux", "kg/kg(m/s)", UC_NONE},
+/* 92 */    {"VKMFLX", "V-component (meridional) Kinematic Moisture Flux", "kg/kg(m/s)", UC_NONE},
+/* 93 */    {"RHWATER", "Relative Humidity With Respect to Water", "%", UC_NONE},
+/* 94 */    {"RHICE", "Relative Humidity With Respect to Ice", "%", UC_NONE},
+/* 95 */    {"FZPRATE", "Freezing or Frozen Precipitation Rate", "kg/(m^2*s)", UC_NONE},
+/* 96 */    {"MASSDR", "Mass Density of Rain", "kg/m^3", UC_NONE},
+/* 97 */    {"MASSDS", "Mass Density of Snow", "kg/m^3", UC_NONE},
+/* 98 */    {"MASSDG", "Mass Density of Graupel", "kg/m^3", UC_NONE},
+/* 99 */    {"MASSDH", "Mass Density of Hail", "kg/m^3", UC_NONE},
+/* 100 */    {"SPNCR", "Specific Number Concentration of Rain", "kg^-1", UC_NONE},
+/* 101 */    {"SPNCS", "Specific Number Concentration of Snow", "kg^-1", UC_NONE},
+/* 102 */    {"SPNCG", "Specific Number Concentration of Graupel", "kg^-1", UC_NONE},
+/* 103 */    {"SPNCH", "Specific Number Concentration of Hail", "kg^-1", UC_NONE},
+/* 104 */    {"NUMDR", "Number Density of Rain", "m^-3", UC_NONE},
+/* 105 */    {"NUMDS", "Number Density of Snow", "m^-3", UC_NONE},
+/* 106 */    {"NUMDG", "Number Density of Graupel", "m^-3", UC_NONE},
+/* 107 */    {"NUMDH", "Number Density of Hail", "m^-3", UC_NONE},
+/* 108 */    {"SHTPRM", "Specific Humidity Tendency due to Parameterizations", "kg/kg(s)", UC_NONE},
+/* 109 */    {"MDLWHVA", "Mass Density of Liquid Water Coating on Hail Expressed as "
+              "Mass of Liquid Water per Unit Volume of Air", "kg/m^3", UC_NONE},
+/* 110 */    {"SMLWHMA", "Specific Mass of Liquid Water Coating on Hail Expressed as "
+              "Mass of Liquid Water per Unit Mass of Moist Air", "kg/kg", UC_NONE},
+/* 111 */    {"MMLWHDA", "Mass Mixing Ratio of Liquid Water Coating on Hail Expressed as "
+              "Mass of Liquid Water per Unit Mass of Dry Air", "kg/kg", UC_NONE}, 
+/* 112 */    {"MDLWGVA", "Mass Density of Liquid Water Coating on Graupel Expressed as "
+              "Mass of Liquid Water per Unit Volume of Air", "kg/m^3", UC_NONE},
+/* 113 */    {"SMLWGMA", "Specific Mass of Liquid Water Coating on Graupel Expressed as "
+              "Mass of Liquid Water per Unit Mass of Moist Air", "kg/kg", UC_NONE},
+/* 114 */    {"MMLWGDA", "Mass Mixing Ratio of Liquid Water Coating on Graupel Expressed as "
+              "Mass of Liquid Water per Unit Mass of Dry Air", "kg/kg", UC_NONE},
+/* 115 */    {"MDLWSVA", "Mass Density of Liquid Water Coating on Snow Expressed as "
+              "Mass of Liquid Water per Unit Volume of Air", "kg/m^3", UC_NONE},
+/* 116 */    {"SMLWSMA", "Specific Mass of Liquid Water Coating on Snow Expressed as "
+              "Mass of Liquid Water per Unit Mass of Moist Air", "kg/kg", UC_NONE},
+/* 117 */    {"MMLWSDA", "Mass Mixing Ratio of Liquid Water Coating on Snow Expressed as "
+              "Mass of Liquid Water per Unit Mass of Dry Air", "kg/kg", UC_NONE},
+/* 118 */    {"UNCSH", "Unbalanced Component of Specific Humidity", "kg/kg", UC_NONE},
+/* 119 */    {"UCSCLW", "Unbalanced Component of Specific Cloud Liquid Water content", "kg/kg", UC_NONE},
+/* 120 */    {"UCSCIW", "Unbalanced Component of Specific Cloud Ice Water content", "kg/kg", UC_NONE},
+/* 121 */    {"FSNOWC", "Fraction of Snow Cover", "Proportion", UC_NONE},
 };
 
 /* GRIB2 Code table 4.2 : 0.2 */
@@ -702,6 +777,22 @@ static const GRIB2ParmTable MeteoMoment[] = {
 /* 28 */    {"VSTM", "V-component storm motion", "m/s", UC_NONE},
 /* 29 */    {"CD", "Drag coefficient", "-", UC_NONE},
 /* 30 */    {"FRICV", "Frictional velocity", "m/s", UC_NONE},
+/* 31 */    {"TDCMOM", "Turbulent Diffusion Coefficient for Momentum", "(m^2)/s", UC_NONE},
+/* 32 */    {"ETACVV", "Eta Coordinate Vertical Velocity", "1/s", UC_NONE},
+/* 33 */    {"WINDF", "Wind Fetch", "m", UC_NONE},
+/* 34 */    {"NWIND", "Normal Wind Component", "m/s", UC_NONE},
+/* 35 */    {"TWIND", "Tangential Wind Component", "m/s", UC_NONE},
+/* 36 */    {"AFRWE", "Amplitude Function for Rossby Wave Envelope for Meridional Wind", "m/s", UC_NONE},
+/* 37 */    {"NTSS", "Northward Turbulent Surface Stress", "1/(m^2)", UC_NONE},
+/* 38 */    {"ETSS", "Eastward Turbulent Surface Stress", "1/(m^2)", UC_NONE},
+/* 39 */    {"EWTPARM", "Eastward Wind Tendency Due to Parameterizations", "m/(s^2)", UC_NONE},
+/* 40 */    {"NWTPARM", "Northward Wind Tendency Due to Parameterizations", "m/(s^2)", UC_NONE},
+/* 41 */    {"UGWIND", "U-Component of Geostrophic Wind", "m/s", UC_NONE},
+/* 42 */    {"VGWIND", "V-Component of Geostrophic Wind", "m/s", UC_NONE},
+/* 43 */    {"GEOWD", "Geostrophic Wind Direction", "deg true", UC_NONE},
+/* 44 */    {"GEOWS", "Geostrophic Wind Speed", "m/s", UC_NONE},
+/* 45 */    {"UNDIV", "Unbalanced Component of Divergence", "1/s", UC_NONE},
+/* 46 */    {"VORTADV", "Vorticity Advection", "1/(s^2)", UC_NONE},
 };
 
 /* GRIB2 Code table 4.2 : 0.3 */
@@ -731,6 +822,13 @@ static const GRIB2ParmTable MeteoMass[] = {
 /* 22 */    {"SSGSO", "Slope of sub-gridscale orography", "Numeric", UC_NONE},
 /* 23 */    {"GSGSO", "Gravity wave dissipation", "W/m^2", UC_NONE},
 /* 24 */    {"ASGSO", "Anisotrophy of sub-gridscale orography", "Numeric", UC_NONE},
+/* 25 */    {"NLPRES", "Natural Logarithm of Pressure in Pa", "Numeric", UC_NONE},
+/* 26 */    {"EXPRES", "Exner Pressure", "Numeric", UC_NONE},
+/* 27 */    {"UMFLX", "Updraught Mass Flux", "kg/(m^2*s)", UC_NONE},
+/* 28 */    {"DMFLX", "Downdraught Mass Flux", "kg/(m^2*s)", UC_NONE},
+/* 29 */    {"UDRATE", "Updraught Detrainment Rate", "kg/(m^3*s)", UC_NONE},
+/* 30 */    {"DDRATE", "Downdraught Detrainment Rate", "kg/(m^3*s)", UC_NONE},
+/* 31 */    {"UCLSPRS", "Unbalanced Component of Logarithm of Surface Pressure", "", UC_NONE},
 };
 
 /* GRIB2 Code table 4.2 : 0.4 */
@@ -749,8 +847,8 @@ static const GRIB2ParmTable MeteoShortRadiate[] = {
 /* 10 */   {"PHOTAR", "Photosynthetically active radiation", "W/(m^2)", UC_NONE},
 /* 11 */   {"NSWRFCS", "Net short-wave radiation flux; clear sky", "W/(m^2)", UC_NONE},
 /* 12 */   {"DWUVR", "Downward UV radiation", "W/(m^2)", UC_NONE},
-/* 13 */   {"", "Reserved", "-", UC_NONE},
-/* 14 */   {"", "Reserved", "-", UC_NONE},
+/* 13 */   {"DSWRFLX", "Direct Short Wave Radiation Flux", "W/(m^2)", UC_NONE},
+/* 14 */   {"DIFSWRF", "Diffuse Short Wave Radiation Flux", "W/(m^2)", UC_NONE},
 /* 15 */   {"", "Reserved", "-", UC_NONE},
 /* 16 */   {"", "Reserved", "-", UC_NONE},
 /* 17 */   {"", "Reserved", "-", UC_NONE},
@@ -788,6 +886,8 @@ static const GRIB2ParmTable MeteoShortRadiate[] = {
 /* 49 */   {"", "Reserved", "-", UC_NONE},
 /* 50 */   {"UVIUCS", "UV index (under clear sky)", "Numeric", UC_NONE},
 /* 51 */   {"UVI", "UV index", "W/(m^2)", UC_UVIndex},
+/* 52 */   {"DSWRFCS", "Downward Short-Wave Radiation Flux, Clear Sky", "W/(m^2)", UC_NONE},
+/* 53 */   {"USWRFCS", "Upward Short-Wave Radiation Flux, Clear Sky", "W/(m^2)", UC_NONE},
 };
 
 /* GRIB2 Code table 4.2 : 0.5 */
@@ -800,7 +900,9 @@ static const GRIB2ParmTable MeteoLongRadiate[] = {
 /* 4 */    {"ULWRF", "Upward long-wave radiation flux", "W/(m^2)", UC_NONE},
 /* 5 */    {"NLWRF", "Net long wave radiation flux", "W/(m^2)", UC_NONE},
 /* 6 */    {"NLWRCS", "Net long-wave radiation flux; clear sky", "W/(m^2)", UC_NONE},
-/* 7 */    {"BRTEMP", "Brightness Temperature", "K", UC_NONE},
+/* 7 */    {"BRTEMP", "Brightness Temperature", "K", UC_K2F},
+/* 8 */    {"DLWRFCS", "Downward Long-Wave Radiation Flux, Clear Sky", "W/(m^2)", UC_NONE},
+
 };
 
 /* GRIB2 Code table 4.2 : 0.6 */
@@ -840,15 +942,30 @@ static const GRIB2ParmTable MeteoCloud[] = {
 /* 23 */    {"CDCIMR", "Cloud ice mixing ratio", "kg/kg", UC_NONE},
 /* 24 */    {"SUNS", "Sunshine", "Numeric", UC_NONE},
 /* 25 */    {"CBHE", "Horizontal extent of cumulonimbus (CB)", "%", UC_NONE},
-/* 26 */   {"", "Reserved", "-", UC_NONE},
-/* 27 */   {"", "Reserved", "-", UC_NONE},
-/* 28 */   {"", "Reserved", "-", UC_NONE},
-/* 29 */   {"", "Reserved", "-", UC_NONE},
-/* 30 */   {"", "Reserved", "-", UC_NONE},
-/* 31 */   {"", "Reserved", "-", UC_NONE},
-/* 32 */   {"", "Reserved", "-", UC_NONE},
-/* 33 */    {"SUNSD", "SunShine Duration", "s", UC_NONE},
-
+/* 26 */   {"HCONCB", "Height of Convective Cloud Base", "m", UC_NONE},
+/* 27 */   {"HCONCT", "Height of Convective Cloud Top", "m", UC_NONE},
+/* 28 */   {"NCONCD", "Number Concentration of Cloud Droplets", "1/kg", UC_NONE},
+/* 29 */   {"NCCICE", "Number Concentration of Cloud Ice", "1/kg", UC_NONE},
+/* 30 */   {"NDENCD", "Number Density of Cloud Droplets", "1/(m^3)", UC_NONE},
+/* 31 */   {"NDCICE", "Number Density of Cloud Ice", "1/(m^3)", UC_NONE},
+/* 32 */   {"FRACCC", "Fraction of Cloud Cover", "Numeric", UC_NONE},
+/* 33 */   {"SUNSD", "SunShine Duration", "s", UC_NONE},
+/* 34 */   {"SLWTC", "Surface Long Wave Effective Total Cloudiness", "Numeric", UC_NONE},
+/* 35 */   {"SSWTC", "Surface Short Wave Effective Total Cloudiness", "Numeric", UC_NONE},
+/* 36 */   {"FSTRPC", "Fraction of Stratiform Precipitation Cover", "Proportion", UC_NONE},
+/* 37 */   {"FCONPC", "Fraction of Convective Precipitation Cover", "Proportion", UC_NONE},
+/* 38 */   {"MASSDCD", "Mass Density of Cloud Droplets", "kg/(m^3)", UC_NONE},
+/* 39 */   {"MASSDCI", "Mass Density of Cloud Ice", "kg/(m^3)", UC_NONE},
+/* 40 */   {"MDCCWD", "Mass Density of Convective Cloud Water Droplets", "kg/(m^3)", UC_NONE},
+/* 41 */   {"", "Reserved", "-", UC_NONE},
+/* 42 */   {"", "Reserved", "-", UC_NONE},
+/* 43 */   {"", "Reserved", "-", UC_NONE},
+/* 44 */   {"", "Reserved", "-", UC_NONE},
+/* 45 */   {"", "Reserved", "-", UC_NONE},
+/* 46 */   {"", "Reserved", "-", UC_NONE},
+/* 47 */   {"VFRCWD", "Volume Fraction of Cloud Water Droplets", "Numeric", UC_NONE},
+/* 48 */   {"VFRCICE", "Volume Fraction of Cloud Ice Particles", "Numeric", UC_NONE},
+/* 49 */   {"VFRCIW", "Volume Fraction of Cloud (Ice and/or Water)", "Numeric", UC_NONE},
 };
 
 /* GRIB2 Code table 4.2 : 0.7 */
@@ -867,11 +984,11 @@ static const GRIB2ParmTable MeteoStability[] = {
 /* 11 */   {"4LFTX", "Best (4-layer) lifted index", "K", UC_NONE},
 /* 12 */   {"RI", "Richardson number", "-", UC_NONE},
 /* 13 */   {"SHWINX", "Showalter Index", "K", UC_NONE},
-/* 14 */   {"-", "Reserved", "-", UC_NONE},
+/* 14 */   {"", "Reserved", "-", UC_NONE},
 /* 15 */   {"UPHL", "Updraft Helicity", "m^2/s^2", UC_NONE},
-/* 16 */   {"BLKRN", "Bulk Richardson Number", "Numeric", UC_NONE},
-/* 17 */   {"GRDRN", "Gradient Richardson Number", "Numeric", UC_NONE},
-/* 18 */   {"FLXRN", "Flux Richardson Number", "Numeric", UC_NONE},
+/* 16 */   {"BLKRN", "Bulk Richardson Number", "-", UC_NONE},
+/* 17 */   {"GRDRN", "Gradient Richardson Number", "-", UC_NONE},
+/* 18 */   {"FLXRN", "Flux Richardson Number", "-", UC_NONE},
 /* 19 */   {"CONAPES", "Convective Available Potential Energy Shear", "m^2/s^2", UC_NONE},
 /* 20 */   {"-", "Reserved", "-", UC_NONE},
 /* 21 */   {"-", "Reserved", "-", UC_NONE},
@@ -1080,6 +1197,14 @@ static const GRIB2ParmTable MeteoRadar[] = {
    /* 6 */ {"RDSP1", "Radar spectra (1)", "-", UC_NONE},
    /* 7 */ {"RDSP2", "Radar spectra (2)", "-", UC_NONE},
    /* 8 */ {"RDSP3", "Radar spectra (3)", "-", UC_NONE},
+   /* 9 */ {"RFCD", "Reflectivity of Cloud Droplets", "dB", UC_NONE},
+  /* 10 */ {"RFCI", "Reflectivity of Cloud Ice", "dB", UC_NONE},
+  /* 11 */ {"RFSNOW", "Reflectivity of Snow", "dB", UC_NONE},
+  /* 12 */ {"RFRAIN", "Reflectivity of Rain", "dB", UC_NONE},
+  /* 13 */ {"RFGRPL", "Reflectivity of Graupel", "dB", UC_NONE},
+  /* 14 */ {"RFHAIL", "Reflectivity of Hail", "dB", UC_NONE},
+  /* 15 */ {"HSR", "Hybrid Scan Reflectivity", "dB", UC_NONE},
+  /* 16 */ {"HSRHT", "Hybrid Scan Reflectivity Height", "m", UC_NONE},
 };
 
 /* GRIB2 Code table 4.2 : 0.16 */
@@ -1092,6 +1217,12 @@ static const GRIB2ParmTable MeteoRadarImagery[] = {
    /* 5 */ {"REFC", "Composity reflectivity", "dB", UC_NONE},
 };
 
+/* GRIB2 Code table 4.2 : 0.17 */
+static const GRIB2ParmTable MeteoElectro[] = {
+/* 0 */ {"LTNGSD", "Lightning Strike Density", "m^2/s", UC_NONE},
+/* 1 */ {"LTPINX", "Lightning Potential Index (LPI) (see Note)", "J/kg", UC_NONE},
+};
+
 /* GRIB2 Code table 4.2 : 0.18 */
 static const GRIB2ParmTable MeteoNuclear[] = {
    /* 0 */ {"ACCES", "Air concentration of Caesium 137", "Bq/(m^3)", UC_NONE},
@@ -1106,6 +1237,16 @@ static const GRIB2ParmTable MeteoNuclear[] = {
             "(Bq s)/(m^3)", UC_NONE},
    /* 8 */ {"TIACRP", "Time-integrated air concentration of radioactive pollutant",
             "(Bq s)/(m^3)", UC_NONE},
+   /* 9 */ {"", "Reserved", "-", UC_NONE},
+  /* 10 */ {"AIRCON", "Air Concentration", "Bq/(m^3)", UC_NONE},
+  /* 11 */ {"WETDEP", "Wet Deposition", "Bq/(m^2)", UC_NONE},
+  /* 12 */ {"DRYDEP", "Dry Deposition", "Bq/(m^2)", UC_NONE},
+  /* 13 */ {"TOTLWD", "Total Deposition (Wet + Dry)", "Bq/(m^2)", UC_NONE},
+  /* 14 */ {"SACON", "Specific Activity Concentration", "Bq/kg", UC_NONE},
+  /* 15 */ {"MAXACON", "Maximum of Air Concentration in Layer", "Bq/(m^3)", UC_NONE},
+  /* 16 */ {"HMXACON", "Height of Maximum of Air Concentration", "m", UC_NONE},
+  /* 17 */ {"CIAIRC", "Column-Integrated Air Concentration", "Bq/(m^2)", UC_NONE},
+  /* 18 */ {"CAACL", "Column-Averaged Air Concentration in Layer", "Bq/(m^3)", UC_NONE},
 };
 
 /* GRIB2 Code table 4.2 : 0.19 */
@@ -1150,6 +1291,16 @@ static const GRIB2ParmTable MeteoAtmos[] = {
              "9-10=Reserved; 11=Dry Thunderstorm (Dry Lightning) Risk Area; "
              "12-13=Reserved; 14=Critical Risk Area; 15-17=Reserved"
              "18=Extremely Critical Risk Area; 255=missing", UC_NONE},
+/* 27 */    {"ICESC", "Icing Scenario", "0=None; 1=General, 2=Convective "
+             "3=Stratiform; 4=Freezing; 5-191=Reserved; 255=missing", UC_NONE},          	
+/* 28 */    {"MWTURB", "Mountain Wave Turbulence (Eddy Dissipation Rate)", "m^(2/3)/s" , UC_NONE},
+/* 29 */    {"CATEDR", "Clear Air Turbulence (CAT) (Eddy Dissipation Rate)", "m^(2/3)/s", UC_NONE},
+/* 30 */    {"EDPARM", "Eddy Dissipation Parameter", "m^(2/3)/s", UC_NONE},
+/* 31 */    {"MXEDPRM", "Maximum of Eddy Dissipation Parameter in Layer", "m^(2/3)/s", UC_NONE},
+/* 32 */    {"HIFREL", "Highest Freezing Level", "m", UC_NONE},
+/* 33 */    {"VISLFOG", "Visibility Through Liquid Fog", "m", UC_NONE},
+/* 34 */    {"VISIFOG", "Visibility Through Ice Fog", "m", UC_NONE},
+/* 35 */    {"VISBSN", "Visibility Through Blowing Snow", "m", UC_NONE},
 };
 
 /* GRIB2 Code table 4.2 : 0.20 */
@@ -1163,12 +1314,12 @@ static const GRIB2ParmTable MeteoAtmoChem[] = {
    /* 6 */  {"SDDMFLX", "Surface Dry Deposition Mass Flux", "kg/(m^2*s)", UC_NONE},
    /* 7 */  {"SWDMFLX", "Surface Wet Deposition Mass Flux", "kg/(m^2*s)", UC_NONE},
    /* 8 */  {"AREMFLX", "Atmosphere Re-Emission Mass Flux", "kg/(m^2*s)", UC_NONE},
-   /* 9 */  {"", "Reserved", "-", UC_NONE},
-  /* 10 */  {"", "Reserved", "-", UC_NONE},
-  /* 11 */  {"", "Reserved", "-", UC_NONE},
-  /* 12 */  {"", "Reserved", "-", UC_NONE},
-  /* 13 */  {"", "Reserved", "-", UC_NONE},
-  /* 14 */  {"", "Reserved", "-", UC_NONE},
+   /* 9 */  {"WLSMFLX", "Wet Deposition by Large-Scale Precipitation Mass Flux", "kg/(m^2*s)", UC_NONE},
+  /* 10 */  {"WDCPMFLX", "Wet Deposition by Convective Precipitation Mass Flux", "kg/(m^2*s)", UC_NONE},
+  /* 11 */  {"SEDMFLX", "Sedimentation Mass Flux", "kg/(m^2*s)", UC_NONE},
+  /* 12 */  {"DDMFLX", "Dry Deposition Mass Flux", "kg/(m^2*s)", UC_NONE},
+  /* 13 */  {"TRANHH", "Transfer From Hydrophobic to Hydrophilic", "kg(kg*s)", UC_NONE},
+  /* 14 */  {"TRSDS", "Transfer From SO2 (Sulphur Dioxide) to SO4 (Sulphate)", "kg(kg*s)", UC_NONE},
   /* 15 */  {"", "Reserved", "-", UC_NONE},
   /* 16 */  {"", "Reserved", "-", UC_NONE},
   /* 17 */  {"", "Reserved", "-", UC_NONE},
@@ -1213,11 +1364,11 @@ static const GRIB2ParmTable MeteoAtmoChem[] = {
   /* 56 */  {"COAIA", "Changes of Amount in Atmosphere", "mol/s", UC_NONE},
   /* 57 */  {"TYABA", "Total Yearly Average Burden of the Atmosphere", "mol", UC_NONE},
   /* 58 */  {"TYAAL", "Total Yearly Average Atmospheric Loss", "mol/s", UC_NONE},
-  /* 59 */  {"", "Reserved", "-", UC_NONE},
-  /* 60 */  {"", "Reserved", "-", UC_NONE},
-  /* 61 */  {"", "Reserved", "-", UC_NONE},
-  /* 62 */  {"", "Reserved", "-", UC_NONE},
-  /* 63 */  {"", "Reserved", "-", UC_NONE},
+  /* 59 */  {"ANCON", "Aerosol Number Concentration", "1/(m^3)", UC_NONE},
+  /* 60 */  {"ASNCON", "Aerosol Specific Number Concentration", "1/kg", UC_NONE},
+  /* 61 */  {"MXMASSD", "Maximum of Mass Density", "kg(/m^3)", UC_NONE},
+  /* 62 */  {"HGTMD", "Height of Mass Density", "m", UC_NONE},
+  /* 63 */  {"CAVEMDL", "Column-Averaged Mass Density in Layer", "kg/(m^3)", UC_NONE},
   /* 64 */  {"", "Reserved", "-", UC_NONE},
   /* 65 */  {"", "Reserved", "-", UC_NONE},
   /* 66 */  {"", "Reserved", "-", UC_NONE},
@@ -1255,18 +1406,18 @@ static const GRIB2ParmTable MeteoAtmoChem[] = {
   /* 98 */  {"", "Reserved", "-", UC_NONE},
   /* 99 */  {"", "Reserved", "-", UC_NONE},
  /* 100 */  {"SADEN", "Surface Area Density (Aerosol)", "1/m", UC_NONE},
- /* 101 */  {"AOTK", "Atmosphere Optical Thickness", "m", UC_NONE},
- /* 102 */  {"", "Reserved", "-", UC_NONE},
- /* 103 */  {"", "Reserved", "-", UC_NONE},
- /* 104 */  {"", "Reserved", "-", UC_NONE},
- /* 105 */  {"", "Reserved", "-", UC_NONE},
- /* 106 */  {"", "Reserved", "-", UC_NONE},
- /* 107 */  {"", "Reserved", "-", UC_NONE},
- /* 108 */  {"", "Reserved", "-", UC_NONE},
- /* 109 */  {"", "Reserved", "-", UC_NONE},
- /* 110 */  {"", "Reserved", "-", UC_NONE},
- /* 111 */  {"", "Reserved", "-", UC_NONE},
- /* 112 */  {"", "Reserved", "-", UC_NONE},
+ /* 101 */  {"ATMTK", "Vertical Visual Range", "m", UC_NONE},
+ /* 102 */  {"AOTK", "Atmosphere Optical Thickness", "Numeric", UC_NONE},
+ /* 103 */  {"SSALBK", "Single Scattering Albedo", "Numeric", UC_NONE},
+ /* 104 */  {"ASYSFK", "Asymmetry Factor", "Numeric", UC_NONE},
+ /* 105 */  {"AECOEF", "Aerosol Extinction Coefficient", "1/m", UC_NONE},
+ /* 106 */  {"AACOEF", "Aerosol Absorption Coefficient", "1/m", UC_NONE},
+ /* 107 */  {"ALBSAT", "Aerosol Lidar Backscatter from Satellite", "1/(m*sr)", UC_NONE},
+ /* 108 */  {"ALBGRD", "Aerosol Lidar Backscatter from the Ground", "1/(m*sr)", UC_NONE},
+ /* 109 */  {"ALESAT", "Aerosol Lidar Extinction from Satellite", "1/m", UC_NONE},
+ /* 110 */  {"ALEGRD", "Aerosol Lidar Extinction from the Ground", "1/m", UC_NONE},
+ /* 111 */  {"ANGSTEXP", "Angstrom Exponent", "Numeric", UC_NONE},
+ /* 112 */  {"SCTAOTK", "Scattering Aerosol Optical Thickness", "Numeric", UC_NONE},
  /* 113 */  {"", "Reserved", "-", UC_NONE},
  /* 114 */  {"", "Reserved", "-", UC_NONE},
  /* 115 */  {"", "Reserved", "-", UC_NONE},
@@ -1285,10 +1436,11 @@ static const GRIB2ParmTable MeteoAtmoChem[] = {
  /* 128 */  {"", "Reserved", "-", UC_NONE},
  /* 129 */  {"", "Reserved", "-", UC_NONE},
  /* 130 */  {"", "Reserved", "-", UC_NONE},
- /* 131 */  {"NO2TROP", "Nitrogen Dioxide (NO2) Tropospheric Column", "mol/(cm^2)", UC_NONE},
- /* 132 */  {"NO2VCD", "Nitrogen Dioxide (NO2) Vertical Column Density", "mol/(cm^2)", UC_NONE},
- /* 133 */  {"BROVCD", "Bromine Monoxide (BrO) Vertical Column Density", "mol/(cm^2)", UC_NONE},
- /* 134 */  {"HCHOVCD", "Formaldehyde (HCHO) Vertical Column Density", "mol/(cm^2)", UC_NONE},
+/* Not in Table as of 4/2018 */
+ /* 131 */ /*  {"NO2TROP", "Nitrogen Dioxide (NO2) Tropospheric Column", "mol/(cm^2)", UC_NONE}, */
+ /* 132 */ /* {"NO2VCD", "Nitrogen Dioxide (NO2) Vertical Column Density", "mol/(cm^2)", UC_NONE}, */
+ /* 133 */ /* {"BROVCD", "Bromine Monoxide (BrO) Vertical Column Density", "mol/(cm^2)", UC_NONE}, */
+ /* 134 */ /* {"HCHOVCD", "Formaldehyde (HCHO) Vertical Column Density", "mol/(cm^2)", UC_NONE}, */
 };
 
 /* GRIB2 Code table 4.2 : 0.190 */
@@ -1300,6 +1452,9 @@ static const GRIB2ParmTable MeteoText[] = {
 static const GRIB2ParmTable MeteoMisc[] = {
    /* 0 */ {"TSEC", "Seconds prior to initial reference time (defined in Section"
             " 1)", "s", UC_NONE},
+   /*  */ {"GEOLAT", "Geographical Latitude", "deg N", UC_NONE},
+   /*  */ {"GEOLON", "Geographical Longitude", "deg E", UC_NONE},
+   /*  */ {"DSLOBS", "Days Since Last Observation", "d", UC_NONE},
 };
 
 /* GRIB2 Code table 4.2 : 1.0 */
@@ -1357,6 +1512,37 @@ static const GRIB2ParmTable LandVeg[] = {
 /* 25 */   {"VSOILM", "Volumetric soil moisture", "m^3/m^3", UC_NONE},
 /* 26 */   {"WILT", "Wilting point", "kg/m^3", UC_NONE},
 /* 27 */   {"VWILTM", "Volumetric wilting moisture", "m^3/m^3", UC_NONE},
+/* 28 */   {"LEAINX", "Leaf Area Index", "Numeric", UC_NONE},
+/* 29 */   {"EVGFC", "Evergreen Forest Cover", "Proportion", UC_NONE},
+/* 30 */   {"DECFC", "Deciduous Forest Cover", "Proportion", UC_NONE},
+/* 31 */   {"NDVINX", "Normalized Differential Vegetation Index (NDVI)", "Numeric", UC_NONE},
+/* 32 */   {"RDVEG", "Root Depth of Vegetation", "m", UC_NONE},
+/* 33 */   {"WROD", "Water Runoff and Drainage", "kg/(m^2)", UC_NONE},
+/* 34 */   {"SFCWRO", "Surface Water Runoff", "kg/(m^2)", UC_NONE},
+/* 35 */   {"TCLASS", "Tile Class", "0=Reserved; 1=Evergreen broadleaved forest; "
+            "2=Deciduous broadleaved closed forest; 3=Deciduous broadleaved open forest; "
+            "4=Evergreen needle-leaf forest; 5=Deciduous needle-leaf forest; "
+            "6=Mixed leaf trees; 7=Fresh water flooded trees; 8=Saline water flooded trees; "
+            "9=Mosaic tree/natural vegetation; 10=Burnt tree cover; "
+            "11=Evergreen shurbs closed-open;  12=Deciduous shurbs closed-open; "
+            "13=Herbaceous vegetation closed-open; 14=Sparse herbaceous or grass; "
+            "15=Flooded shurbs or herbaceous; 16=Cultivated and managed areas; "
+            "17=Mosaic crop/tree/natural vegetation; 18=Mosaic crop/shrub/grass; "
+            "19=Bare areas; 20=Water; 21=Snow and ice; 22=Artificial surface; "
+            "23=Ocean; 24=Irrigated croplands; 25=Rain fed croplands; "
+            "26=Mosaic cropland (50-70%)-vegetation (20-50%); "
+            "27=Mosaic vegetation (50-70%)-cropland (20-50%); "
+            "28=Closed broadleaved evergreen forest; 29=Closed needle-leaved evergreen forest; "
+            "30=Open needle-leaved deciduous forest; 31=Mixed broadleaved and needle-leave forest; "
+            "32=Mosaic shrubland (50-70%)-grassland (20-50%); "
+            "33=Mosaic grassland (50-70%)-shrubland (20-50%); "
+            "34=Closed to open shrubland; 35=Sparse vegetation; "
+            "36=Closed to open forest regularly flooded; "
+            "37=Closed forest or shrubland permanently flooded; "
+            "38=Closed to open grassland regularly flooded; 39=Undefined; ", UC_NONE},
+/* 36 */   {"TFRCT", "Tile Fraction", "Proportion", UC_NONE},
+/* 37 */   {"TPERCT", "Tile Percentage", "%", UC_NONE},
+/* 38 */   {"SOILVIC", "Soil Volumetric Ice Content (Water Equivalent) ", "m^3/m^3", UC_NONE},
 };
 
 /* GRIB2 Code table 4.2 : 2.3 */
@@ -1383,6 +1569,16 @@ static const GRIB2ParmTable LandSoil[] = {
 /* 15 */ {"SOILP", "Soil porosity", "m^3/m^3", UC_NONE},
 /* 16 */ {"VSOSM", "Volumetric saturation of soil moisture", "m^3/m^3", UC_NONE},
 /* 17 */ {"SATOSM", "Saturation of soil moisture", "kg/m^3", UC_NONE},
+/* 18 */ {"SOILTMP", "Soil Temperature", "K", UC_NONE},
+/* 19 */ {"SOILMOI", "Soil Moisture", "kg/(m^3)", UC_NONE},
+/* 20 */ {"CISOILM", "Column-Integrated Soil Moisture", "kg/(m^2)", UC_NONE},
+/* 21 */ {"SOILICE", "Soil Ice", "kg/(m^3)", UC_NONE},
+/* 22 */ {"CISICE", "Column-Integrated Soil Ice", "kg/(m^2)", UC_NONE},
+/* 23 */ {"LWSNWP", "Liquid Water in Snow Pack", "kg/(m^2)", UC_NONE},
+/* 24 */ {"FRSTINX", "Frost Index", "kg/day", UC_NONE},
+/* 25 */ {"SNWDEB", "Snow Depth at Elevation Bands", "kg/(m^2)", UC_NONE},
+/* 26 */ {"SHFLX", "Soil Heat Flux", "W/(m^2)", UC_NONE},
+/* 27 */ {"SOILDEP", "Soil Depth", "m", UC_NONE},
 };
 
 /* GRIB2 Code table 4.2 : 3.0 */
@@ -1427,6 +1623,22 @@ static const GRIB2ParmTable SpaceQuantitative[] = {
 /* 11 */ {"RFL16", "Reflectance in 1.6 micron channel", "%", UC_NONE},
 /* 12 */ {"RFL39", "Reflectance in 3.9 micron channel", "%", UC_NONE},
 /* 13 */ {"ATMDIV", "Atmospheric divergence", "1/s", UC_NONE},
+/* 14 */ {"CBTMP", "Cloudy Brightness Temperature", "K", UC_NONE},
+/* 15 */ {"CSBTMP", "Clear Sky Brightness Temperature", "K", UC_NONE},
+/* 16 */ {"CLDRAD", "Cloudy Radiance (with respect to wave number)", "W/(m*sr)", UC_NONE},
+/* 17 */ {"CSKYRAD", "Clear Sky Radiance (with respect to wave number)", "W/(m*sr)", UC_NONE},
+/* 18 */ {"", "Reserved", "-", UC_NONE},
+/* 19 */ {"WINDS", "Wind Speed", "m/s", UC_NONE},
+/* 20 */ {"AOT06", "Aerosol Optical Thickness at 0.635 µm", "", UC_NONE},
+/* 21 */ {"AOT08", "Aerosol Optical Thickness at 0.810 µm", "", UC_NONE},
+/* 22 */ {"AOT16", "Aerosol Optical Thickness at 1.640 µm", "", UC_NONE},
+/* 23 */ {"ANGCOE", "Angstrom Coefficient", "", UC_NONE},
+/* 24 */ {"", "Reserved", "-", UC_NONE},
+/* 25 */ {"", "Reserved", "-", UC_NONE},
+/* 26 */ {"", "Reserved", "-", UC_NONE},
+/* 27 */ {"BRFLF", "Bidirectional Reflecance Factor", "Numeric", UC_NONE},
+/* 28 */ {"SPBRT", "Brightness Temperture", "K", UC_NONE},
+/* 29 */ {"SRAD", "Scaled Radiance", "Numeric", UC_NONE},
 };
 
 /* GRIB2 Code table 4.2 : 10.0 */
@@ -1434,7 +1646,7 @@ static const GRIB2ParmTable OceanWaves[] = {
    /* 0 */ {"WVSP1", "Wave spectra (1)", "-", UC_NONE},
    /* 1 */ {"WVSP2", "Wave spectra (2)", "-", UC_NONE},
    /* 2 */ {"WVSP3", "Wave spectra (3)", "-", UC_NONE},
-   /* 3 */ {"HTSGW", "Significant height of combined wind waves and swell", "m", UC_NONE}, /* NDFD override needed WaveHeight */
+   /* 3 */ {"HTSGW", "Significant height of combined wind waves and swell", "m", UC_M2Feet}, /* NDFD override needed WaveHeight */
    /* 4 */ {"WVDIR", "Direction of wind waves", "Degree true", UC_NONE},
    /* 5 */ {"WVHGT", "Significant height of wind waves", "m", UC_M2Feet}, /* NDFD override needed WaveHeight */
    /* 6 */ {"WVPER", "Mean period of wind waves", "s", UC_NONE},
@@ -1445,6 +1657,38 @@ static const GRIB2ParmTable OceanWaves[] = {
    /* 11 */ {"PERPW", "Primary wave mean period", "s", UC_NONE},
    /* 12 */ {"DIRSW", "Secondary wave direction", "Degree true", UC_NONE},
    /* 13 */ {"PERSW", "Secondary wave mean period", "s", UC_NONE},
+   /* 14 */ {"WWSDIR", "Direction of Combined Wind Waves and Swell", "Degree true", UC_NONE},
+   /* 15 */ {"MWSPER", "Mean Period of Combined Wind Waves and Swell", "s", UC_NONE},
+   /* 16 */ {"CDWW", "Coefficient of Drag With Waves", "-", UC_NONE},
+   /* 17 */ {"FRICV", "Friction Velocity", "m/s", UC_NONE},
+   /* 18 */ {"WSTR", "Wave Stress", "N/(m^2)", UC_NONE},
+   /* 19 */ {"NWSTR", "Normalised Waves Stress", "-", UC_NONE},
+   /* 20 */ {"MSSW", "Mean Square Slope of Waves", "-", UC_NONE},
+   /* 21 */ {"USSD", "U-component Surface Stokes Drift", "m/s", UC_NONE},
+   /* 22 */ {"VSSD", "V-component Surface Stokes Drift", "m/s", UC_NONE},
+   /* 23 */ {"PMAXWH", "Period of Maximum Individual Wave Height", "s", UC_NONE},
+   /* 24 */ {"MAXWH", "Maximum Individual Wave Height", "m", UC_NONE},
+   /* 25 */ {"IMWF", "Inverse Mean Wave Frequency", "s", UC_NONE},
+   /* 26 */ {"IMFWW", "Inverse Mean Frequency of The Wind Waves", "s", UC_NONE},
+   /* 27 */ {"IMFTSW", "Inverse Mean Frequency of The Total Swell", "s", UC_NONE},
+   /* 28 */ {"MZWPER", "Mean Zero-Crossing Wave Period", "s", UC_NONE},
+   /* 29 */ {"MZPWW", "Mean Zero-Crossing Period of The Wind Waves", "s", UC_NONE},
+   /* 30 */ {"MZPTSW", "Mean Zero-Crossing Period of The Total Swell", "s", UC_NONE},
+   /* 31 */ {"WDIRW", "Wave Directional Width", "-", UC_NONE},
+   /* 32 */ {"DIRWWW", "Directional Width of The Wind Waves", "-", UC_NONE},
+   /* 33 */ {"DIRWTS", "Directional Width of The Total Swell", "-", UC_NONE},
+   /* 34 */ {"PWPER", "Peak Wave Period", "s", UC_NONE},
+   /* 35 */ {"PPERWW", "Peak Period of The Wind Waves", "s", UC_NONE},
+   /* 36 */ {"PPERTS", "Peak Period of The Total Swell", "s", UC_NONE},
+   /* 37 */ {"ALTWH", "Altimeter Wave Height", "m", UC_NONE},
+   /* 38 */ {"ALCWH", "Altimeter Corrected Wave Height", "m", UC_NONE},
+   /* 39 */ {"ALRRC", "Altimeter Range Relative Correction", "-", UC_NONE},
+   /* 40 */ {"MNWSOW", "10 Metre Neutral Wind Speed Over Waves", "m/s", UC_NONE},
+   /* 41 */ {"MWDIRW", "10 Metre Wind Direction Over Waves", "Degree true", UC_NONE},
+   /* 42 */ {"WESP", "Wave Engery Spectrum", "s/((m^2)*rad)", UC_NONE},
+   /* 43 */ {"KSSEW", "Kurtosis of The Sea Surface Elevation Due to Waves", "-", UC_NONE},
+   /* 44 */ {"BENINX", "Benjamin-Feir Index", "-", UC_NONE},
+   /* 45 */ {"SPFTR", "Spectral Peakedness Factor", "1/s", UC_NONE},
 };
 
 /* GRIB2 Code table 4.2 : 10.1 */
@@ -1453,6 +1697,7 @@ static const GRIB2ParmTable OceanCurrents[] = {
    /* 1 */ {"SPC", "Current speed", "m/s", UC_NONE},
    /* 2 */ {"UOGRD", "u-component of current", "m/s", UC_NONE},
    /* 3 */ {"VOGRD", "v-component of current", "m/s", UC_NONE},
+   /* 4 */ {"RIPCOP", "Rip Current Occurrence Probability", "%", UC_NONE},
 };
 
 /* GRIB2 Code table 4.2 : 10.2 */
@@ -1466,12 +1711,17 @@ static const GRIB2ParmTable OceanIce[] = {
    /* 6 */ {"ICEG", "Ice growth rate", "m/s", UC_NONE},
    /* 7 */ {"ICED", "Ice divergence", "1/s", UC_NONE},
    /* 8 */ {"ICET", "Ice temperature", "K", UC_NONE},
+   /* 9 */ {"ICEPRS", "Module of Ice Internal Pressure", "Pa*m", UC_NONE},
+   /* 10 */ {"ZVCICEP", "Zonal Vector Component of Vertically Integrated Ice Internal Pressure", "Pa*m", UC_NONE},
+   /* 11 */ {"MVCICEP", "Meridional Vector Component of Vertically Integrated Ice Internal Pressure", "Pa*m", UC_NONE},
+   /* 12 */ {"CICES", "Compressive Ice Strength", "N/m", UC_NONE},
 };
 
 /* GRIB2 Code table 4.2 : 10.3 */
 static const GRIB2ParmTable OceanSurface[] = {
    /* 0 */ {"WTMP", "Water temperature", "K", UC_NONE},
    /* 1 */ {"DSLM", "Deviation of sea level from mean", "m", UC_NONE},
+   /* 2 */ {"CH", "Heat Exchange Coefficient", "", UC_NONE},
 };
 
 #ifdef unused
@@ -1481,6 +1731,18 @@ static const GRIB2ParmTable OceanSubSurface[] = {
    /* 1 */ {"MTHA", "Main thermocline anomaly", "m", UC_NONE},
    /* 2 */ {"TTHDP", "Transient thermocline depth", "m", UC_NONE},
    /* 3 */ {"SALTY", "Salinity", "kg/kg", UC_NONE},
+   /* 4 */ {"OVHD", "Ocean Vertical Heat Diffusivity", "m^2/s", UC_NONE},
+   /* 5 */ {"OVSD", "Ocean Vertical Salt Diffusivity", "m^2/s", UC_NONE},
+   /* 6 */ {"OVMD", "Ocean Vertical Momentum Diffusivity", "m^2/s", UC_NONE},
+   /* 7 */ {"BATHY", "Bathymetry", "m", UC_NONE},
+   /* 8 */ {"", "Reserved", "-", UC_NONE},
+   /* 9 */ {"", "Reserved", "-", UC_NONE},
+   /* 10 */ {"", "Reserved", "-", UC_NONE},
+   /* 11 */ {"SFSALP", "Shape Factor With Respect To Salinity Profile", "", UC_NONE},
+   /* 12 */ {"SFTMPP", "Shape Factor With Respect To Temperature Profile In Thermocline", "", UC_NONE},
+   /* 13 */ {"ACWSRD", "Attenuation Coefficient Of Water With Respect to Solar Radiation", "1/m", UC_NONE},
+   /* 14 */ {"WDEPTH", "Water Depth", "m", UC_NONE},
+   /* 15 */ {"WTMPSS", "Water Temperature", "K", UC_NONE},
 };
 #endif
 
@@ -1489,6 +1751,8 @@ static const GRIB2ParmTable OceanMisc[] = {
    /* 0 */ {"TSEC", "Seconds prior to initial reference time (defined in Section"
             " 1)", "s", UC_NONE},
    /* 1 */ {"MOSF", "Meridonal Overturning Stream Function", "m^3/s", UC_NONE},
+   /* 2 */ {"", "Reserved", "-", UC_NONE},
+   /* 3 */ {"DSLOBS", "Days Since Last Observation", "d", UC_NONE},
 };
 
 /* *INDENT-ON* */
@@ -1585,8 +1849,8 @@ static const GRIB2ParmTable *Choose_GRIB2ParmTable (int prodType, int cat,
                *tableLen = sizeof (MeteoRadarImagery) / sizeof (GRIB2ParmTable);
                return &MeteoRadarImagery[0];
             case METEO_ELECTRO:
-               *tableLen = 0;
-               return nullptr;
+               *tableLen = sizeof (MeteoElectro) / sizeof (GRIB2ParmTable);
+               return &MeteoElectro[0];
             case METEO_NUCLEAR:
                *tableLen = sizeof (MeteoNuclear) / sizeof (GRIB2ParmTable);
                return &MeteoNuclear[0];
@@ -1692,6 +1956,7 @@ static const NDFD_AbrevOverrideTable NDFD_Override[] = {
 
 static const GRIB2LocalTable NDFD_LclTable[] = {
    /* 0 */ {0, 0, 193, "ApparentT", "Apparent Temperature", "K", UC_K2F},
+           {0, 0, 205, "WBGT", "Wet Bulb Globe Temperature", "K", UC_K2F},
    /* 1 */ {0, 1, 192, "Wx", "Weather string", "-", UC_NONE},
            {0, 1, 193, "PPI", "Precipitation Potential Index", "%", UC_NONE},
            {0, 1, 227, "IceAccum", "Ice Accumulation", "kg/m^2", UC_InchWater},
@@ -1721,6 +1986,7 @@ static const GRIB2LocalTable NDFD_LclTable[] = {
            {0, 19, 236, "TCSurge", "Tropical Cyclone Storm Surge Threat", "0=none; 4=low; 6=moderate; 8=high; 10=extreme", UC_NONE},          
            {0, 19, 238, "TCRain", "Tropical Cyclone Flooding Rain Threat", "0=none; 4=low; 6=moderate; 8=high; 10=extreme", UC_NONE},
            {0, 19, 239, "TCTornado", "Tropical Cyclone Tornado Threat", "0=none; 4=low; 6=moderate; 8=high; 10=extreme", UC_NONE},
+           {0, 19, 246, "SNOWLVL", "Snow Level", "m", UC_M2Feet},
 /* Leaving next two lines in for grandfathering sake. 9/19/2007... Probably can remove in future. */
            {0, 19, 203, "TotalSvrProb", "Total Probability of Severe Thunderstorms", "%", UC_NONE},
            {0, 19, 204, "TotalXtrmProb", "Total Probability of Extreme Severe Thunderstorms", "%", UC_NONE},
@@ -1741,6 +2007,16 @@ static const GRIB2LocalTable HPC_LclTable[] = {
    /* 0 */ {0, 1, 192, "HPC-Wx", "HPC Code", "-", UC_NONE},
 };
 
+
+static const GRIB2LocalTable Canada_LclTable[] = {
+   /* 0 */ {0, 4, 192, "DSWRF_SFC_0", "Downward incident solar flux", "W/m^2", UC_NONE},
+   /* 0 */ {0, 4, 193, "USWRF_SFC_0", "Upward short wave radiative flux", "W/m^2", UC_NONE},
+   /* 0 */ {0, 5, 192, "DLWRF_SFC_0", "Downward Long Wave Radiative Flux", "W/m^2", UC_NONE},
+   /* 0 */ {0, 5, 193, "ULWRF_0", "Outgoing Long Wave Radiative Flux", "W/m^2", UC_NONE}
+};
+
+
+
 /* See ./degrib/MRMS folder (specifically run ./reformat.tcl > degribtab.c) */
 /* 10/21/2014 */
 static const GRIB2LocalTable MRMS_LclTable[] = {
@@ -1926,6 +2202,15 @@ static const GRIB2LocalTable NCEP_LclTable[] = {
  * descriptor, but the NDFD 'Weather String' seems quite reasonable. */
 /*            {0, 1, 226, "PWTHER", "Predominant Weather", "-", UC_NONE},*/
             {0, 1, 226, "Wx", "Weather String", "-", UC_NONE},
+            {0, 1, 227, "FROZR", "Frozen Rain", "kg/(m^2)", UC_NONE},
+            {0, 1, 228, "FICEAC", "Flat Ice Accumulation (FRAM)", "kg/(m^2)", UC_NONE},
+            {0, 1, 229, "LICEAC", "Line Ice Accumulation (FRAM)", "kg/(m^2)", UC_NONE},
+            {0, 1, 230, "SLACC", "Sleet Accumulation", "kg/(m^2)", UC_NONE},
+            {0, 1, 231, "PPINDX", "Precipitation Potential Index", "%", UC_NONE},
+            {0, 1, 232, "PROBCIP", "Probability Cloud Ice Present", "%", UC_NONE},
+            {0, 1, 233, "SNOWLR", "Snow Liquid ratio", "kg/kg", UC_NONE},
+            {0, 1, 241, "TSNOW", "Total Snow", "kg/(m^2)", UC_NONE},
+            {0, 1, 242, "RHPW", "Relative Humidity with Respect to Precipitable Water", "%", UC_NONE},
 
    /* 15 */ {0, 2, 192, "VWSH", "Vertical speed sheer", "1/s", UC_NONE},
    /* 16 */ {0, 2, 193, "MFLX", "Horizontal Momentum Flux", "N/(m^2)", UC_NONE},
@@ -1955,6 +2240,17 @@ static const GRIB2LocalTable NCEP_LclTable[] = {
             {0, 2, 217, "CNGWDV", "Convective Gravity wave drag meridional acceleration", "m/s^2", UC_NONE},
             {0, 2, 218, "LMV", "Velocity point model surface", "-", UC_NONE},
             {0, 2, 219, "PVMWW", "Potential vorticity (mass-weighted)", "1/(s/m)", UC_NONE},
+            {0, 2, 220, "MAXUVV", "Hourly Maximum of Downward Vertical Velocity in the lowest 400hPa", "m/s", UC_NONE},
+            {0, 2, 221, "MAXDVV", "Hourly Maximum of Downward Vertical Velocity", "m/s", UC_NONE}, 
+            {0, 2, 222, "MAXUW", "U Component of Hourly Maximum 10m Wind Speed", "m/s", UC_NONE}, 
+            {0, 2, 223, "MAXVW", "V Component of Hourly Maximum 10m Wind Speed", "m/s", UC_NONE}, 
+            {0, 2, 224, "VRATE", "Ventilation Rate", "m^2/s", UC_NONE}, 
+            {0, 2, 225, "TRWSPD", "Transport Wind Speed", "m/s", UC_NONE}, 
+            {0, 2, 226, "TRWDIR", "Transport Wind Direction", "deg", UC_NONE}, 
+            {0, 2, 227, "TOA10", "Earliest Reasonable Arrival Time (10% exceedance)", "s", UC_NONE}, 
+            {0, 2, 228, "TOA50", "Most Likely Arrival Time (50% exceedance)", "s", UC_NONE}, 
+            {0, 2, 229, "TOD50", "Most Likely Departure Time (50% exceedance)", "s", UC_NONE}, 
+            {0, 2, 230, "TOD90", "Latest Reasonable Departure Time (90% exceedance)", "s", UC_NONE}, 
 /* Removed 8/19/2008 */ /*           {0, 2, 220, "MFLX", "Momentum flux", "N/m^2", UC_NONE},*/
 
    /* 21 */ {0, 3, 192, "MSLET", "MSLP (Eta model reduction)", "Pa", UC_NONE},
@@ -1978,6 +2274,15 @@ static const GRIB2LocalTable NCEP_LclTable[] = {
             {0, 3, 210, "LMH", "Mass point model surface", "-", UC_NONE},
             {0, 3, 211, "HGTN", "Geopotential height (nearest grid point)", "gpm", UC_NONE},
             {0, 3, 212, "PRESN", "Pressure (nearest grid point)", "Pa", UC_NONE},
+            {0, 3, 213, "ORCONV", "Orographic Convexity", "", UC_NONE},
+            {0, 3, 214, "ORASW", "Orographic Asymmetry, W Component", "", UC_NONE},
+            {0, 3, 215, "ORASS", "Orographic Asymmetry, S Component", "", UC_NONE},
+            {0, 3, 216, "ORASSW", "Orographic Asymmetry, SW Component", "", UC_NONE},
+            {0, 3, 217, "ORASNW", "Orographic Asymmetry, NW Component", "", UC_NONE},
+            {0, 3, 218, "ORLSW", "Orographic Length Scale, W Component", "", UC_NONE},
+            {0, 3, 219, "ORLSS", "Orographic Length Scale, S Component", "", UC_NONE},
+            {0, 3, 220, "ORLSSW", "Orographic Length Scale, SW Component", "", UC_NONE},
+            {0, 3, 221, "ORLSNW", "Orographic Length Scale, NW Component", "", UC_NONE},
 
    /* 27 */ {0, 4, 192, "DSWRF", "Downward Short-Wave Rad. Flux", "W/(m^2)", UC_NONE},
    /* 28 */ {0, 4, 193, "USWRF", "Upward Short-Wave Rad. Flux", "W/(m^2)", UC_NONE},
@@ -2019,6 +2324,10 @@ static const GRIB2LocalTable NCEP_LclTable[] = {
             {0, 7, 196, "UVI", "Ultra Violet Index", "W/(m^2)", UC_UVIndex},
             {0, 7, 197, "UPHL", "Updraft Helicity", "m^2/s^2", UC_NONE},
             {0, 7, 198, "LAI", "Leaf area index", "-", UC_NONE},
+            {0, 7, 199, "MXUPHL", "Hourly Maximum of Updraft Helicity over Layer 2km to 5 km AGL", "m^2/s^2", UC_NONE},
+            {0, 7, 200, "MNUPHL", "Hourly Minimum of Updraft Helicity", "m^2/s^2", UC_NONE},
+            {0, 7, 201, "BNEGLAY", "Bourgoiun Negative Energy Layer (surface to freezing level)", "J/kg", UC_NONE},
+            {0, 7, 202, "BPOSELAY", "Bourgoiun Positive Energy Layer (2k ft AGL to 400 hPa)", "J/kg", UC_NONE},
 
             {0, 13, 192, "PMTC", "Particulate matter (coarse)", "10^-6g/m^3", UC_NONE},
             {0, 13, 193, "PMTF", "Particulate matter (fine)", "10^-6g/m^3", UC_NONE},
@@ -2046,6 +2355,7 @@ static const GRIB2LocalTable NCEP_LclTable[] = {
             {0, 16, 195, "REFD", "Derived radar reflectivity", "dB", UC_NONE},
             {0, 16, 196, "REFC", "Maximum / Composite radar reflectivity", "dB", UC_NONE},
             {0, 16, 197, "RETOP", "Radar Echo Top (18.3 DBZ)", "m", UC_NONE},
+            {0, 16, 198, "MAXREF", "Hourly Maximum of Simulated Reflectivity at 1 km AGL", "dB", UC_NONE},
 
             {0, 17, 192, "LTNG", "Lightning", "-", UC_NONE},
 
@@ -2114,7 +2424,10 @@ static const GRIB2LocalTable NCEP_LclTable[] = {
 */
             {0, 19, 232, "VAFTD", "Volcanic Ash Forecast Transport and Dispersion", "log10(kg/m^3)", UC_NONE},
             {0, 19, 233, "ICPRB", "Icing probability", "-", UC_NONE},
-            {0, 19, 234, "ICSEV", "Icing severity", "-", UC_NONE},
+            {0, 19, 234, "ICSEV", "Icing severity", "-", UC_NONE}, 
+            {0, 19, 235, "JFWPRB", "Joint Fire Weather Probability", "%", UC_NONE}, 
+            {0, 19, 236, "SNOWLVL", "Snow Level", "m", UC_NONE}, 
+            {0, 19, 237, "DRYTPROB", "Dry Thunderstorm Probability", "%", UC_NONE}, 
 
    /* 47 */ {0, 191, 192, "NLAT", "Latitude (-90 to 90)", "deg", UC_NONE},
    /* 48 */ {0, 191, 193, "ELON", "East Longitude (0 to 360)", "deg", UC_NONE},
@@ -2204,6 +2517,7 @@ static const GRIB2LocalTable NCEP_LclTable[] = {
 /* ScatEstUWind -> USCT, ScatEstVWind -> VSCT as of 7/5/2006 (pre 1.80) */
    /* 72 */ {3, 1, 192, "USCT", "Scatterometer Estimated U Wind", "m/s", UC_NONE},
    /* 73 */ {3, 1, 193, "VSCT", "Scatterometer Estimated V Wind", "m/s", UC_NONE},
+            {3, 1, 194, "SWQI", "Scatterometer Wind Quality", "", UC_NONE},
 
 /* table 4.2 : 3.192 according to NCEP is "Forecast Satellite Imagery". */
             {3, 192, 0, "SBT122", "Simulated Brightness Temperature for GOES 12, Channel 2", "K", UC_NONE},
@@ -2212,8 +2526,49 @@ static const GRIB2LocalTable NCEP_LclTable[] = {
             {3, 192, 3, "SBT125", "Simulated Brightness Temperature for GOES 12, Channel 5", "K", UC_NONE},
             {3, 192, 4, "SBC123", "Simulated Brightness Counts for GOES 12, Channel 3", "numeric", UC_NONE},
             {3, 192, 5, "SBC124", "Simulated Brightness Counts for GOES 12, Channel 4", "numeric", UC_NONE},
+            {3, 192, 6, "SBT112", "Simulated Brightness Temperature for GOES 11, Channel 2", "K", UC_NONE},
+            {3, 192, 7, "SBT113", "Simulated Brightness Temperature for GOES 11, Channel 3", "K", UC_NONE},
+            {3, 192, 8, "SBT114", "Simulated Brightness Temperature for GOES 11, Channel 4", "K", UC_NONE},
+            {3, 192, 9, "SBT115", "Simulated Brightness Temperature for GOES 11, Channel 5", "K", UC_NONE},
+            {3, 192, 10, "AMSRE9", "Simulated Brightness Temperature for AMSRE on Aqua, Channel 9", "K", UC_NONE},
+            {3, 192, 11, "AMSRE10", "Simulated Brightness Temperature for AMSRE on Aqua, Channel 10", "K", UC_NONE},
+            {3, 192, 12, "AMSRE11", "Simulated Brightness Temperature for AMSRE on Aqua, Channel 11", "K", UC_NONE},
+            {3, 192, 13, "AMSRE12", "Simulated Brightness Temperature for AMSRE on Aqua, Channel 12", "K", UC_NONE},
+            {3, 192, 14, "SRFA161", "Simulated Reflectance Factor for ABI GOES-16, Band-1", "", UC_NONE},
+            {3, 192, 15, "SRFA162", "Simulated Reflectance Factor for ABI GOES-16, Band-2", "", UC_NONE},
+            {3, 192, 16, "SRFA163", "Simulated Reflectance Factor for ABI GOES-16, Band-3", "", UC_NONE},
+            {3, 192, 17, "SRFA164", "Simulated Reflectance Factor for ABI GOES-16, Band-4", "", UC_NONE},
+            {3, 192, 18, "SRFA165", "Simulated Reflectance Factor for ABI GOES-16, Band-5", "", UC_NONE},
+            {3, 192, 19, "SRFA166", "Simulated Reflectance Factor for ABI GOES-16, Band-6", "", UC_NONE},
+            {3, 192, 20, "SBTA167", "Simulated Brightness Temperature for ABI GOES-16, Band-7", "K", UC_NONE},
+            {3, 192, 21, "SBTA168", "Simulated Brightness Temperature for ABI GOES-16, Band-8", "K", UC_NONE},
+            {3, 192, 22, "SBTA169", "Simulated Brightness Temperature for ABI GOES-16, Band-9", "K", UC_NONE},
+            {3, 192, 23, "SBTA1610", "Simulated Brightness Temperature for ABI GOES-16, Band-10", "K", UC_NONE},
+            {3, 192, 24, "SBTA1611", "Simulated Brightness Temperature for ABI GOES-16, Band-11", "K", UC_NONE},
+            {3, 192, 25, "SBTA1612", "Simulated Brightness Temperature for ABI GOES-16, Band-12", "K", UC_NONE},
+            {3, 192, 26, "SBTA1613", "Simulated Brightness Temperature for ABI GOES-16, Band-13", "K", UC_NONE},
+            {3, 192, 27, "SBTA1614", "Simulated Brightness Temperature for ABI GOES-16, Band-14", "K", UC_NONE},
+            {3, 192, 28, "SBTA1615", "Simulated Brightness Temperature for ABI GOES-16, Band-15", "K", UC_NONE},
+            {3, 192, 29, "SBTA1616", "Simulated Brightness Temperature for ABI GOES-16, Band-16", "K", UC_NONE},
+            {3, 192, 30, "SRFA171", "Simulated Reflectance Factor for ABI GOES-17, Band-1", "", UC_NONE},
+            {3, 192, 31, "SRFA172", "Simulated Reflectance Factor for ABI GOES-17, Band-2", "", UC_NONE},
+            {3, 192, 32, "SRFA173", "Simulated Reflectance Factor for ABI GOES-17, Band-3", "", UC_NONE},
+            {3, 192, 33, "SRFA174", "Simulated Reflectance Factor for ABI GOES-17, Band-4", "", UC_NONE},
+            {3, 192, 34, "SRFA175", "Simulated Reflectance Factor for ABI GOES-17, Band-5", "", UC_NONE},
+            {3, 192, 35, "SRFA176", "Simulated Reflectance Factor for ABI GOES-17, Band-6", "", UC_NONE},
+            {3, 192, 36, "SBTA177", "Simulated Brightness Temperature for ABI GOES-17, Band-7", "K", UC_NONE},
+            {3, 192, 37, "SBTA178", "Simulated Brightness Temperature for ABI GOES-17, Band-8", "K", UC_NONE},
+            {3, 192, 38, "SBTA179", "Simulated Brightness Temperature for ABI GOES-17, Band-9", "K", UC_NONE},
+            {3, 192, 39, "SBTA1710", "Simulated Brightness Temperature for ABI GOES-17, Band-10", "K", UC_NONE},
+            {3, 192, 40, "SBTA1711", "Simulated Brightness Temperature for ABI GOES-17, Band-11", "K", UC_NONE},
+            {3, 192, 41, "SBTA1712", "Simulated Brightness Temperature for ABI GOES-17, Band-12", "K", UC_NONE},
+            {3, 192, 42, "SBTA1713", "Simulated Brightness Temperature for ABI GOES-17, Band-13", "K", UC_NONE},
+            {3, 192, 43, "SBTA1714", "Simulated Brightness Temperature for ABI GOES-17, Band-14", "K", UC_NONE},
+            {3, 192, 44, "SBTA1715", "Simulated Brightness Temperature for ABI GOES-17, Band-15", "K", UC_NONE},
+            {3, 192, 45, "SBTA1716", "Simulated Brightness Temperature for ABI GOES-17, Band-16", "K", UC_NONE},
 
            {10, 0, 192, "WSTP", "Wave Steepness", "0", UC_NONE},
+           {10, 0, 193, "WLENG", "Wave Length", "0", UC_NONE},
 
 /* The following entry was moved to 10,3,196 */
 /*
@@ -2241,6 +2596,7 @@ static const GRIB2LocalTable NCEP_LclTable[] = {
            {10, 3, 200, "SSST", "Surface Salinity Trend", "psu/day", UC_NONE},
            {10, 3, 201, "KENG", "Kinetic Energy", "J/kg", UC_NONE},
            {10, 3, 202, "SLTFL", "Salt Flux", "kg/(m^2*s)", UC_NONE},
+           {10, 3, 203, "LCH", "Heat Exchange Coefficient", "", UC_NONE},
 
            {10, 3, 242, "TCSRG20", "20% Tropical Cyclone Storm Surge Exceedance", "m", UC_M2Feet},
            {10, 3, 243, "TCSRG30", "30% Tropical Cyclone Storm Surge Exceedance", "m", UC_M2Feet},
@@ -2250,6 +2606,10 @@ static const GRIB2LocalTable NCEP_LclTable[] = {
            {10, 3, 247, "TCSRG70", "70% Tropical Cyclone Storm Surge Exceedance", "m", UC_M2Feet},
            {10, 3, 248, "TCSRG80", "80% Tropical Cyclone Storm Surge Exceedance", "m", UC_M2Feet},
            {10, 3, 249, "TCSRG90", "90% Tropical Cyclone Storm Surge Exceedance", "m", UC_M2Feet},
+           {10, 3, 250, "ETCWL", "Extra Tropical Storm Surge Combined Surge and Tide", "m", UC_M2Feet},
+           {10, 3, 251, "TIDE", "Tide", "m", UC_M2Feet},
+           {10, 3, 252, "EROSNP", "Erosion Occurrence Probability", "%", UC_NONE},
+           {10, 3, 253, "OWASHP", "Overwash Occurrence Probability", "%", UC_NONE},
 
            {10, 4, 192, "WTMPC", "3-D Temperature", "deg C", UC_NONE},
            {10, 4, 193, "SALIN", "3-D Salinity", "", UC_NONE},
@@ -2331,6 +2691,9 @@ static const GRIB2LocalTable *Choose_LocalParmTable (unsigned short int center,
                *tableLen = 0;
                return nullptr;
          }
+      case 54:
+         *tableLen = sizeof (Canada_LclTable) / sizeof (GRIB2LocalTable);
+         return &Canada_LclTable[0];
       case 161:
          *tableLen = sizeof (MRMS_LclTable) / sizeof (GRIB2LocalTable);
          return &MRMS_LclTable[0];
@@ -2771,6 +3134,24 @@ static void ElemNamePerc (uChar mstrVersion, uShort2 center, uShort2 subcenter,
              IsData_MOS (center, subcenter)) {
             for (i = 0; i < (sizeof (NDFD_Override) /
                              sizeof (NDFD_AbrevOverrideTable)); i++) {
+               if (strcmp (table[subcat].name, "ASNOW") == 0) {
+                 if (timeRangeUnit == 3) {
+                    mallocSprintf (name, "%s%02dm%s%02dm", "Snow", lenTime, "e", percentile);
+                    mallocSprintf (comment, "%02d mon %s Percentile(%d)", lenTime,
+                                 table[subcat].comment, percentile);
+                 } else if (timeRangeUnit == 4) {
+                    mallocSprintf (name, "%s%02dy%s%02dy", "Snow", lenTime, "e", percentile);
+                    mallocSprintf (comment, "%02d yr %s Percentile(%d)", lenTime,
+                                   table[subcat].comment, percentile);
+                 } else {
+                    mallocSprintf (name, "%s%02d%s%02d", "Snow", lenTime, "e", percentile);
+                    mallocSprintf (comment, "%02d hr %s Percentile(%d)", lenTime,
+                                   table[subcat].comment, percentile);
+                 }
+                 mallocSprintf (unit, "[%s]", table[subcat].unit);
+                 *convert = table[subcat].convert;
+                 return;
+               }
                if (strcmp (NDFD_Override[i].GRIB2name, table[subcat].name) ==
                    0) {
                   mallocSprintf (name, "%s%02d", NDFD_Override[i].NDFDname,
@@ -3654,13 +4035,15 @@ static const GRIB2SurfTable Surface[] = {
    /* 22: 109 */ {"PVL", "Potential vorticity surface", "(K m^2)/(kg s)"},
    /* 23: 110 */ {"RESERVED", "Reserved", "-"},
    /* 24: 111 */ {"EtaL", "Eta* level", "-"},
-   /* 25: 112-116 */ {"RESERVED", "Reserved", "-"},
-   /* 26: 117 */ {"unknown", "Mixed layer depth", "m"}, /* unknown abbrev */
-   /* 27: 118-159 */ {"RESERVED", "Reserved", "-"},
-   /* 28: 160 */ {"DBSL", "Depth below sea level", "m"},
-   /* 29: 161-191 */ {"RESERVED", "Reserved", "-"},
-   /* 30: 192-254 */ {"RESERVED", "Reserved Local use", "-"},
-   /* 31: 255 */ {"MISSING", "Missing", "-"},
+   /* 25: 112-113 */ {"RESERVED", "Reserved", "-"},
+   /* 26: 114 */ {"SNOWLVL", "Snow Level", "m"},
+   /* 27: 115-116 */ {"RESERVED", "Reserved", "-"},
+   /* 28: 117 */ {"unknown", "Mixed layer depth", "m"}, /* unknown abbrev */
+   /* 29: 118-159 */ {"RESERVED", "Reserved", "-"},
+   /* 30: 160 */ {"DBSL", "Depth below sea level", "m"},
+   /* 31: 161-191 */ {"RESERVED", "Reserved", "-"},
+   /* 32: 192-254 */ {"RESERVED", "Reserved Local use", "-"},
+   /* 33: 255 */ {"MISSING", "Missing", "-"},
 };
 
 typedef struct {
@@ -3746,7 +4129,7 @@ GRIB2SurfTable Table45Index (int i,
       return Surface[0];
    }
    if (i == 255)
-      return Surface[31];
+      return Surface[33];
    if (i > 191) {
       if (center == 7) {
          for (j = 0; j < sizeof (NCEP_Surface) / sizeof (NCEP_Surface[0]);
@@ -3757,20 +4140,26 @@ GRIB2SurfTable Table45Index (int i,
             }
          }
       }
-      return Surface[30];
+      return Surface[32];
    }
    if (i > 160)
-      return Surface[29];
+      return Surface[31];
    if (i == 160) {
       *f_reserved = 0;
-      return Surface[28];
+      return Surface[30];
    }
    if (i > 117)
-      return Surface[27];
+      return Surface[29];
    if (i == 117) {
       *f_reserved = 0;
-      return Surface[26];
+      return Surface[28];
    }
+   if (i > 114)
+      return Surface[27];
+   if (i == 114){
+      *f_reserved = 0;
+      return Surface[26];
+   }  
    if (i > 111)
       return Surface[25];
    if (i == 111) {

From fe53a775214272bebb6ae5cf91151549d2fb6ebd Mon Sep 17 00:00:00 2001
From: Even Rouault <even.rouault@spatialys.com>
Date: Wed, 20 Nov 2019 20:39:18 +0100
Subject: [PATCH 422/488] metaname.cpp: fix typo

---
 gdal/frmts/grib/degrib/degrib/metaname.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/gdal/frmts/grib/degrib/degrib/metaname.cpp b/gdal/frmts/grib/degrib/degrib/metaname.cpp
index b1b578bdf843..54c78a3278e2 100644
--- a/gdal/frmts/grib/degrib/degrib/metaname.cpp
+++ b/gdal/frmts/grib/degrib/degrib/metaname.cpp
@@ -1637,7 +1637,7 @@ static const GRIB2ParmTable SpaceQuantitative[] = {
 /* 25 */ {"", "Reserved", "-", UC_NONE},
 /* 26 */ {"", "Reserved", "-", UC_NONE},
 /* 27 */ {"BRFLF", "Bidirectional Reflecance Factor", "Numeric", UC_NONE},
-/* 28 */ {"SPBRT", "Brightness Temperture", "K", UC_NONE},
+/* 28 */ {"SPBRT", "Brightness Temperature", "K", UC_NONE},
 /* 29 */ {"SRAD", "Scaled Radiance", "Numeric", UC_NONE},
 };
 

From 2fa4d3918716bc8850636e54c4735bc51a2c6f5d Mon Sep 17 00:00:00 2001
From: Even Rouault <even.rouault@spatialys.com>
Date: Wed, 20 Nov 2019 21:41:50 +0100
Subject: [PATCH 423/488] degrib: add missing entries in MeteoAtmoChem table

---
 gdal/frmts/grib/degrib/degrib/metaname.cpp | 30 +++++++++++-----------
 1 file changed, 15 insertions(+), 15 deletions(-)

diff --git a/gdal/frmts/grib/degrib/degrib/metaname.cpp b/gdal/frmts/grib/degrib/degrib/metaname.cpp
index 54c78a3278e2..5c70fe109a3c 100644
--- a/gdal/frmts/grib/degrib/degrib/metaname.cpp
+++ b/gdal/frmts/grib/degrib/degrib/metaname.cpp
@@ -1320,9 +1320,9 @@ static const GRIB2ParmTable MeteoAtmoChem[] = {
   /* 12 */  {"DDMFLX", "Dry Deposition Mass Flux", "kg/(m^2*s)", UC_NONE},
   /* 13 */  {"TRANHH", "Transfer From Hydrophobic to Hydrophilic", "kg(kg*s)", UC_NONE},
   /* 14 */  {"TRSDS", "Transfer From SO2 (Sulphur Dioxide) to SO4 (Sulphate)", "kg(kg*s)", UC_NONE},
-  /* 15 */  {"", "Reserved", "-", UC_NONE},
-  /* 16 */  {"", "Reserved", "-", UC_NONE},
-  /* 17 */  {"", "Reserved", "-", UC_NONE},
+  /* 15 */  {"DDVEL", "Dry deposition velocity", "m/s", UC_NONE},
+  /* 16 */  {"MSSRDRYA", "Mass mixing ratio with respect to dry air", "kg/kg", UC_NONE},
+  /* 17 */  {"MSSRWETA", "Mass mixing ratio with respect to wet air", "kg/kg", UC_NONE},
   /* 18 */  {"", "Reserved", "-", UC_NONE},
   /* 19 */  {"", "Reserved", "-", UC_NONE},
   /* 20 */  {"", "Reserved", "-", UC_NONE},
@@ -1369,18 +1369,18 @@ static const GRIB2ParmTable MeteoAtmoChem[] = {
   /* 61 */  {"MXMASSD", "Maximum of Mass Density", "kg(/m^3)", UC_NONE},
   /* 62 */  {"HGTMD", "Height of Mass Density", "m", UC_NONE},
   /* 63 */  {"CAVEMDL", "Column-Averaged Mass Density in Layer", "kg/(m^3)", UC_NONE},
-  /* 64 */  {"", "Reserved", "-", UC_NONE},
-  /* 65 */  {"", "Reserved", "-", UC_NONE},
-  /* 66 */  {"", "Reserved", "-", UC_NONE},
-  /* 67 */  {"", "Reserved", "-", UC_NONE},
-  /* 68 */  {"", "Reserved", "-", UC_NONE},
-  /* 69 */  {"", "Reserved", "-", UC_NONE},
-  /* 70 */  {"", "Reserved", "-", UC_NONE},
-  /* 71 */  {"", "Reserved", "-", UC_NONE},
-  /* 72 */  {"", "Reserved", "-", UC_NONE},
-  /* 73 */  {"", "Reserved", "-", UC_NONE},
-  /* 74 */  {"", "Reserved", "-", UC_NONE},
-  /* 75 */  {"", "Reserved", "-", UC_NONE},
+  /* 64 */  {"MOLRDRYA", "Mole fraction with respect to dry air", "mol/mol", UC_NONE},
+  /* 65 */  {"MOLRWETA", "Mole fraction with respect to dry air", "mol/mol", UC_NONE},
+  /* 66 */  {"CINCLDSP", "Column-integrated in-cloud scavenging rate by precipitation", "kg/(m^2 s)", UC_NONE},
+  /* 67 */  {"CBLCLDSP", "Column-integrated below-cloud scavenging rate by precipitation", "kg/(m^2 s)", UC_NONE},
+  /* 68 */  {"CIRELREP", "Column-integrated release rate from evaporating precipitation", "kg/(m^2 s)", UC_NONE},
+  /* 69 */  {"CINCSLSP", "Column-integrated in-cloud scavenging rate by large-scale precipitation", "kg/(m^2 s)", UC_NONE},
+  /* 70 */  {"CBECSLSP", "Column-integrated below-cloud scavenging rate by large-scale precipitation", "kg/(m^2 s)", UC_NONE},
+  /* 71 */  {"CRERELSP", "Column-integrated release rate from evaporating large-scale precipitation", "kg/(m^2 s)-", UC_NONE},
+  /* 72 */  {"CINCSRCP", "Column-integrated in-cloud scavenging rate by convective precipitation", "kg/(m^2 s)", UC_NONE},
+  /* 73 */  {"CBLCSRCP", "Column-integrated below-cloud scavenging rate by convective precipitation", "kg/(m^2 s)", UC_NONE},
+  /* 74 */  {"CIRERECP", "Column-integrated release rate from evaporating convective precipitation", "kg/(m^2 s)", UC_NONE},
+  /* 75 */  {"WFIREFLX", "Wildfire flux", "kg/(m^2 s)", UC_NONE},
   /* 76 */  {"", "Reserved", "-", UC_NONE},
   /* 77 */  {"", "Reserved", "-", UC_NONE},
   /* 78 */  {"", "Reserved", "-", UC_NONE},

From 7f57f483711fc5039c7b64a3e7b41a69e9fcf547 Mon Sep 17 00:00:00 2001
From: Even Rouault <even.rouault@spatialys.com>
Date: Wed, 20 Nov 2019 23:19:45 +0100
Subject: [PATCH 424/488] GRIB: add more values from Table 4.5 in Surface type
 table

---
 gdal/frmts/grib/degrib/degrib/metaname.cpp | 165 +++++++++------------
 1 file changed, 69 insertions(+), 96 deletions(-)

diff --git a/gdal/frmts/grib/degrib/degrib/metaname.cpp b/gdal/frmts/grib/degrib/degrib/metaname.cpp
index 5c70fe109a3c..664a6c201e5a 100644
--- a/gdal/frmts/grib/degrib/degrib/metaname.cpp
+++ b/gdal/frmts/grib/degrib/degrib/metaname.cpp
@@ -4009,51 +4009,55 @@ static int ComputeUnit2 (int prodType, int templat, int cat, int subcat,
 
 /* GRIB2 Code Table 4.5 */
 /* *INDENT-OFF* */
-static const GRIB2SurfTable Surface[] = {
-   /* 0 */ {"RESERVED", "Reserved", "-"},
-   /* 1 */ {"SFC", "Ground or water surface", "-"},
-   /* 2 */ {"CBL", "Cloud base level", "-"},
-   /* 3 */ {"CTL", "Level of cloud tops", "-"},
-   /* 4 */ {"0DEG", "Level of 0 degree C isotherm", "-"},
-   /* 5 */ {"ADCL", "Level of adiabatic condensation lifted from the surface", "-"},
-   /* 6 */ {"MWSL", "Maximum wind level", "-"},
-   /* 7 */ {"TRO", "Tropopause", "-"},
-   /* 8 */ {"NTAT", "Nominal top of atmosphere", "-"},
-   /* 9 */ {"SEAB", "Sea bottom", "-"},
-   /* 10: 10-19 */ {"RESERVED", "Reserved", "-"},
-   /* 11: 20 */ {"TMPL", "Isothermal level", "K"},
-   /* 12: 21-99 */ {"RESERVED", "Reserved", "-"},
-   /* 13: 100 */ {"ISBL", "Isobaric surface", "Pa"},
-   /* 14: 101 */ {"MSL", "Mean sea level", "-"},
-   /* 15: 102 */ {"GPML", "Specific altitude above mean sea level", "m"},
-   /* 16: 103 */ {"HTGL", "Specified height level above ground", "m"},
-   /* 17: 104 */ {"SIGL", "Sigma level", "'sigma' value"},
-   /* 18: 105 */ {"HYBL", "Hybrid level", "-"},
-   /* 19: 106 */ {"DBLL", "Depth below land surface", "m"},
-   /* 20: 107 */ {"THEL", "Isentropic (theta) level", "K"},
-   /* 21: 108 */ {"SPDL", "Level at specified pressure difference from ground to level", "Pa"},
-   /* 22: 109 */ {"PVL", "Potential vorticity surface", "(K m^2)/(kg s)"},
-   /* 23: 110 */ {"RESERVED", "Reserved", "-"},
-   /* 24: 111 */ {"EtaL", "Eta* level", "-"},
-   /* 25: 112-113 */ {"RESERVED", "Reserved", "-"},
-   /* 26: 114 */ {"SNOWLVL", "Snow Level", "m"},
-   /* 27: 115-116 */ {"RESERVED", "Reserved", "-"},
-   /* 28: 117 */ {"unknown", "Mixed layer depth", "m"}, /* unknown abbrev */
-   /* 29: 118-159 */ {"RESERVED", "Reserved", "-"},
-   /* 30: 160 */ {"DBSL", "Depth below sea level", "m"},
-   /* 31: 161-191 */ {"RESERVED", "Reserved", "-"},
-   /* 32: 192-254 */ {"RESERVED", "Reserved Local use", "-"},
-   /* 33: 255 */ {"MISSING", "Missing", "-"},
-};
+
 
 typedef struct {
    int index;
    GRIB2SurfTable surface;
-} GRIB2LocalSurface;
+} GRIB2SurfTableWithIdx;
 
-/* based on http://www.nco.ncep.noaa.gov/pmb/docs/grib2/grib2_table4-5.shtml
- * updated last on 3/14/2006 */
-static const GRIB2LocalSurface NCEP_Surface[] = {
+// Substantially changed by GDAL
+static const GRIB2SurfTableWithIdx Surface[] = {
+   {0, {"RESERVED", "Reserved", "-"}},
+   {1, {"SFC", "Ground or water surface", "-"}},
+   {2, {"CBL", "Cloud base level", "-"}},
+   {3, {"CTL", "Level of cloud tops", "-"}},
+   {4, {"0DEG", "Level of 0 degree C isotherm", "-"}},
+   {5, {"ADCL", "Level of adiabatic condensation lifted from the surface", "-"}},
+   {6, {"MWSL", "Maximum wind level", "-"}},
+   {7, {"TRO", "Tropopause", "-"}},
+   {8, {"NTAT", "Nominal top of atmosphere", "-"}},
+   {9, {"SEAB", "Sea bottom", "-"}},
+   {10, {"EATM", "Entire Atmosphere", "-"}},
+   {11, {"CB", "Cumulonimbus Base", "m"}},
+   {12, {"CT", "Cumulonimbus Top", "m"}},
+   {13, {"unknown", "Lowest level where vertically integrated cloud cover exceeds the specified percentage (cloud base for a given percentage cloud cover)", "%"}},
+   {14, {"LFC", "Level of free convection", "-"}},
+   {15, {"CCL", "Convection condensation level", "-"}},
+   {16, {"LNB", "Level of neutral buoyancy or equilibrium", "-"}},
+   {17, {"RESERVED", "Reserved", "-"}},
+   {20, {"TMPL", "Isothermal level", "K"}},
+   {21, {"RESERVED", "Reserved", "-"}},
+   {100, {"ISBL", "Isobaric surface", "Pa"}},
+   {101, {"MSL", "Mean sea level", "-"}},
+   {102, {"GPML", "Specific altitude above mean sea level", "m"}},
+   {103, {"HTGL", "Specified height level above ground", "m"}},
+   {104, {"SIGL", "Sigma level", "'sigma' value"}},
+   {105, {"HYBL", "Hybrid level", "-"}},
+   {106, {"DBLL", "Depth below land surface", "m"}},
+   {107, {"THEL", "Isentropic (theta) level", "K"}},
+   {108, {"SPDL", "Level at specified pressure difference from ground to level", "Pa"}},
+   {109, {"PVL", "Potential vorticity surface", "(K m^2)/(kg s)"}},
+   {110, {"RESERVED", "Reserved", "-"}},
+   {111, {"EtaL", "Eta* level", "-"}},
+   {112, {"RESERVED", "Reserved", "-"}},
+   {114, {"SNOWLVL", "Snow Level", "m"}},
+   {115, {"RESERVED", "Reserved", "-"}},
+   {117, {"unknown", "Mixed layer depth", "m"}}, /* unknown abbrev */
+   {118, {"RESERVED", "Reserved", "-"}},
+   {160, {"DBSL", "Depth below sea level", "m"}},
+   {161, {"RESERVED", "Reserved", "-"}},
+   {192, {"RESERVED", "Reserved Local use", "-"}},
    {200, {"EATM", "Entire atmosphere (considered as a single layer)", "-"}},
    {201, {"EOCN", "Entire ocean (considered as a single layer)", "-"}},
    {204, {"HTFL", "Highest tropospheric freezing level", "-"}},
@@ -4088,6 +4092,7 @@ static const GRIB2LocalSurface NCEP_Surface[] = {
    {252, {"DCTL", "Deep convective cloud top level", "-"}},
    {253, {"LBLSW", "Lowest bottom level of supercooled liquid water layer", "-"}},
    {254, {"HTLSW", "Highest top level of supercooled liquid water layer", "-"}},
+   {255, {"MISSING", "Missing", "-"}},
 };
 /* *INDENT-ON* */
 
@@ -4126,65 +4131,33 @@ GRIB2SurfTable Table45Index (int i,
 #ifdef DEBUG
       printf ("Surface index is out of 0..255 range?\n");
 #endif
-      return Surface[0];
-   }
-   if (i == 255)
-      return Surface[33];
-   if (i > 191) {
-      if (center == 7) {
-         for (j = 0; j < sizeof (NCEP_Surface) / sizeof (NCEP_Surface[0]);
-              j++) {
-            if (i == NCEP_Surface[j].index) {
-               *f_reserved = 0;
-               return (NCEP_Surface[j].surface);
-            }
-         }
-      }
-      return Surface[32];
-   }
-   if (i > 160)
-      return Surface[31];
-   if (i == 160) {
-      *f_reserved = 0;
-      return Surface[30];
+      return Surface[0].surface;
    }
-   if (i > 117)
-      return Surface[29];
-   if (i == 117) {
-      *f_reserved = 0;
-      return Surface[28];
-   }
-   if (i > 114)
-      return Surface[27];
-   if (i == 114){
-      *f_reserved = 0;
-      return Surface[26];
-   }  
-   if (i > 111)
-      return Surface[25];
-   if (i == 111) {
-      *f_reserved = 0;
-      return Surface[i - 87];
-   }
-   if (i == 110)
-      return Surface[i - 87];
-   if (i > 99) {
-      *f_reserved = 0;
-      return Surface[i - 87];
-   }
-   if (i > 20)
-      return Surface[12];
-   if (i == 20) {
-      *f_reserved = 0;
-      return Surface[11];
+
+   // Substantially changed by GDAL
+   *f_reserved = 0;
+   if( i > 191 && i < 255 &&center != 7) {
+        *f_reserved = 1;
+        return Surface[0].surface;
    }
-   if (i > 9)
-      return Surface[10];
-   if (i > 0) {
-      *f_reserved = 0;
-      return Surface[i];
+   for( j = sizeof(Surface) / sizeof(Surface[0]); j > 0; )
+   {
+       --j;
+       if( i >= Surface[j].index )
+       {
+           if( i > 191 && i < 255 )
+           {
+               if( i != Surface[j].index )
+               {
+                   *f_reserved = 1;
+                    return Surface[0].surface;
+               }
+           }
+           return Surface[j].surface;
+       }
    }
-   return Surface[0];
+   myAssert(false);
+   return Surface[0].surface;
 }
 
 void ParseLevelName (unsigned short int center, unsigned short int subcenter,

From 7c57de933c3da6f7937da5beb05fddd2dc1562d6 Mon Sep 17 00:00:00 2001
From: Even Rouault <even.rouault@spatialys.com>
Date: Wed, 20 Nov 2019 23:23:35 +0100
Subject: [PATCH 425/488] GRIB: add support for template 4.48 Optical
 Properties of Aerosol

---
 .../gdrivers/data/grib/template_4_48.grb2     | Bin 0 -> 200 bytes
 autotest/gdrivers/grib.py                     |  16 ++++++++++++
 gdal/frmts/grib/degrib/degrib/inventory.cpp   |  23 +++++++++++++++---
 gdal/frmts/grib/degrib/degrib/meta.h          |   3 ++-
 gdal/frmts/grib/degrib/degrib/metaparse.cpp   |  16 ++++++++++--
 5 files changed, 51 insertions(+), 7 deletions(-)
 create mode 100644 autotest/gdrivers/data/grib/template_4_48.grb2

diff --git a/autotest/gdrivers/data/grib/template_4_48.grb2 b/autotest/gdrivers/data/grib/template_4_48.grb2
new file mode 100644
index 0000000000000000000000000000000000000000..06190806003f85409f8d5d6ef65b65e34a3e45a3
GIT binary patch
literal 200
zcmZ<{@^oTgU|<4b5I6zEqKph?3=BdHjO>rN*+GIJNmdZy$PD5#0<j1qlj_f%A^+h3
zD$dBf|4BUenbb=L%#+(0_^uZ?FwB_N0LBhLB~~mz!a&64lNUo9ki`YW3=IFlB$!}Q
kQ328*3;4O<M*jyX;9&(zuz;Mw#s(7M1-lK%U@!*)0C#pPR{#J2

literal 0
HcmV?d00001

diff --git a/autotest/gdrivers/grib.py b/autotest/gdrivers/grib.py
index 1dd63b73e13b..1c0a1a12bd3c 100755
--- a/autotest/gdrivers/grib.py
+++ b/autotest/gdrivers/grib.py
@@ -1288,3 +1288,19 @@ def test_grib_grib2_derived_forecast_spread():
     out_ds = None
 
     gdal.Unlink('/vsimem/out.grb2')
+
+
+
+###############################################################################
+# Template 4.48 with Optical Properties of Aerosol
+
+def test_grib_grib2_template_4_48():
+
+    if gdaltest.grib_drv is None:
+        pytest.skip()
+
+    ds = gdal.Open('data/grib/template_4_48.grb2')
+    band = ds.GetRasterBand(1)
+    assert band.GetMetadataItem('GRIB_UNIT') == '[1/kg]'
+    assert band.GetMetadataItem('GRIB_ELEMENT') == 'ASNCON'
+    assert band.GetMetadataItem('GRIB_SHORT_NAME') == '0-EATM'
diff --git a/gdal/frmts/grib/degrib/degrib/inventory.cpp b/gdal/frmts/grib/degrib/degrib/inventory.cpp
index 151b64dcf86b..7efa28f4a50a 100644
--- a/gdal/frmts/grib/degrib/degrib/inventory.cpp
+++ b/gdal/frmts/grib/degrib/degrib/inventory.cpp
@@ -524,9 +524,10 @@ enum { GS4_ANALYSIS, GS4_ENSEMBLE, GS4_DERIVED, GS4_PROBABIL_PNT = 5,
        && (templat != GS4_RADAR) && (templat != GS4_SATELLITE)
        && (templat != GS4_SATELLITE_SYNTHETIC)
        && (templat != GS4_DERIVED_INTERVAL)
-       && (templat != GS4_ANALYSIS_CHEMICAL) ) {
+       && (templat != GS4_ANALYSIS_CHEMICAL)
+       && (templat != GS4_OPTICAL_PROPERTIES_AEROSOL) ) {
       errSprintf ("This was only designed for templates 0, 1, 2, 5, 6, 7, 8, 9, "
-                  "10, 11, 12, 15, 20, 30, 32, 40. Template found = %d\n", templat);
+                  "10, 11, 12, 15, 20, 30, 32, 40, 48. Template found = %d\n", templat);
 
       inv->validTime = 0;
       inv->foreSec = 0;
@@ -567,6 +568,12 @@ enum { GS4_ANALYSIS, GS4_ENSEMBLE, GS4_DERIVED, GS4_PROBABIL_PNT = 5,
             return -8;
         genProcess = (*buffer)[14 - 5];
    }
+   else if( templat == GS4_OPTICAL_PROPERTIES_AEROSOL )
+   {
+        if( secLen < 36 - 5 + 1 )
+            return -8;
+        genProcess = (*buffer)[36 - 5];
+   }
    else
         genProcess = (*buffer)[12 - 5];
    genID = 0;
@@ -583,7 +590,11 @@ enum { GS4_ANALYSIS, GS4_ENSEMBLE, GS4_DERIVED, GS4_PROBABIL_PNT = 5,
    } else {
       int nOffset = 0;
       if( templat == GS4_ANALYSIS_CHEMICAL ) {
-          nOffset = 2;
+          nOffset = 16 - 14;
+      }
+      else if( templat == GS4_OPTICAL_PROPERTIES_AEROSOL )
+      {
+          nOffset = 38 - 14;
       }
       genID = (*buffer)[nOffset + 14 - 5];
       /* Compute forecast time. */
@@ -838,7 +849,11 @@ enum { GS4_ANALYSIS, GS4_ENSEMBLE, GS4_DERIVED, GS4_PROBABIL_PNT = 5,
    } else {
       unsigned int nOffset = 0;
       if( templat == GS4_ANALYSIS_CHEMICAL ) {
-          nOffset = 2;
+          nOffset = 16 - 14;
+      }
+      else if( templat == GS4_OPTICAL_PROPERTIES_AEROSOL )
+      {
+          nOffset = 38 - 14;
       }
 
       if( secLen < nOffset + 31 - 5 + 4)
diff --git a/gdal/frmts/grib/degrib/degrib/meta.h b/gdal/frmts/grib/degrib/degrib/meta.h
index 127c8e783c04..282e3526acff 100644
--- a/gdal/frmts/grib/degrib/degrib/meta.h
+++ b/gdal/frmts/grib/degrib/degrib/meta.h
@@ -283,7 +283,8 @@ enum { GS4_ANALYSIS = 0,
        GS4_RADAR = 20,
        GS4_SATELLITE = 30,
        GS4_SATELLITE_SYNTHETIC = 32,
-       GS4_ANALYSIS_CHEMICAL = 40
+       GS4_ANALYSIS_CHEMICAL = 40,
+       GS4_OPTICAL_PROPERTIES_AEROSOL = 48
 };
 
 typedef struct {
diff --git a/gdal/frmts/grib/degrib/degrib/metaparse.cpp b/gdal/frmts/grib/degrib/degrib/metaparse.cpp
index 9686cd5298f5..f3f7fa1d2c38 100644
--- a/gdal/frmts/grib/degrib/degrib/metaparse.cpp
+++ b/gdal/frmts/grib/degrib/degrib/metaparse.cpp
@@ -1558,7 +1558,7 @@ static int ParseSect4 (sInt4 *is4, sInt4 ns4, grib_MetaData *meta)
        (is4[7] != GS4_PERCENT_TIME) && (is4[7] != GS4_ENSEMBLE_STAT) &&
        (is4[7] != GS4_SATELLITE) && (is4[7] != GS4_SATELLITE_SYNTHETIC) &&
        (is4[7] != GS4_DERIVED_INTERVAL) && (is4[7] != GS4_STATISTIC_SPATIAL_AREA) &&
-       (is4[7] != GS4_ANALYSIS_CHEMICAL)) {
+       (is4[7] != GS4_ANALYSIS_CHEMICAL) && (is4[7] != GS4_OPTICAL_PROPERTIES_AEROSOL)) {
 #ifdef DEBUG
       //printf ("Un-supported Template. %d\n", is4[7]);
 #endif
@@ -1575,7 +1575,16 @@ static int ParseSect4 (sInt4 *is4, sInt4 ns4, grib_MetaData *meta)
    }
    meta->pds2.sect4.cat = (uChar) is4[9];
    meta->pds2.sect4.subcat = (uChar) is4[10];
-   int nOffset = (is4[7] != GS4_ANALYSIS_CHEMICAL) ? 0 : 2;
+   int nOffset = 0;
+   if( is4[7] == GS4_ANALYSIS_CHEMICAL ) {
+        nOffset = 16 - 14;
+   }
+   else if( is4[7] == GS4_OPTICAL_PROPERTIES_AEROSOL ) {
+        nOffset = 38 - 14;
+   }
+   if (ns4 < 34 + nOffset) {
+      return -1;
+   }
    meta->pds2.sect4.genProcess = (uChar) is4[11 + nOffset];
 
    /* Initialize variables prior to parsing the specific templates. */
@@ -2073,6 +2082,9 @@ static int ParseSect4 (sInt4 *is4, sInt4 ns4, grib_MetaData *meta)
       case GS4_ANALYSIS_CHEMICAL: /* 4.40 */
             // TODO
             break;
+      case GS4_OPTICAL_PROPERTIES_AEROSOL: /* 4.48 */
+            // TODO
+            break;
       default:
          errSprintf ("Un-supported Template. %ld\n", is4[7]);
          return -4;

From b3ad2df2ac418f9706ac20f76d0f7b6181e2daa9 Mon Sep 17 00:00:00 2001
From: Even Rouault <even.rouault@spatialys.com>
Date: Thu, 21 Nov 2019 13:44:27 +0100
Subject: [PATCH 426/488] ElasticSearch: translate constructs like
 CAST(field_name AS CHARACTER) = 'foo' to ES query language

---
 autotest/ogr/ogr_elasticsearch.py             | 21 ++++
 .../ogrsf_frmts/elastic/ogrelasticlayer.cpp   | 95 ++++++++++---------
 2 files changed, 72 insertions(+), 44 deletions(-)

diff --git a/autotest/ogr/ogr_elasticsearch.py b/autotest/ogr/ogr_elasticsearch.py
index 23c90926d345..9158990e5628 100755
--- a/autotest/ogr/ogr_elasticsearch.py
+++ b/autotest/ogr/ogr_elasticsearch.py
@@ -1584,6 +1584,27 @@ def test_ogr_elasticsearch_10():
     f = lyr.GetNextFeature()
     assert f is not None
 
+    lyr.SetAttributeFilter("CAST(text_field AS CHARACTER) = 'foo_cast'")
+    gdal.FileFromMemBuffer("""/vsimem/fakeelasticsearch/a_layer/FeatureCollection/_search?scroll=1m&size=100&POSTFIELDS={ "query": { "constant_score" : { "filter": { "match": { "properties.text_field": "foo_cast" } } } } }""",
+                           """{
+"_scroll_id": "my_scrollid",
+    "hits":
+    {
+        "hits":[
+        {
+            "_id": "my_id",
+            "_source": {
+                "type": "Feature",
+                "properties": {
+                    "text_field": "foo_cast"
+                }
+            }
+        }]
+    }
+}""")
+    f = lyr.GetNextFeature()
+    assert f is not None
+
     lyr.SetAttributeFilter("text_field_with_raw = 'foo'")
     gdal.FileFromMemBuffer("""/vsimem/fakeelasticsearch/a_layer/FeatureCollection/_search?scroll=1m&size=100&POSTFIELDS={ "query": { "constant_score" : { "filter": { "term": { "properties.text_field_with_raw.raw": "foo" } } } } }""",
                            """{
diff --git a/gdal/ogr/ogrsf_frmts/elastic/ogrelasticlayer.cpp b/gdal/ogr/ogrsf_frmts/elastic/ogrelasticlayer.cpp
index 0beab83cc811..83cf3d0fdf29 100644
--- a/gdal/ogr/ogrsf_frmts/elastic/ogrelasticlayer.cpp
+++ b/gdal/ogr/ogrsf_frmts/elastic/ogrelasticlayer.cpp
@@ -2653,6 +2653,24 @@ json_object* OGRElasticLayer::GetValue( int nFieldIdx,
     return poVal;
 }
 
+/************************************************************************/
+/*                      OGRESGetFieldIndexFromSQL()                     */
+/************************************************************************/
+
+static int OGRESGetFieldIndexFromSQL(const swq_expr_node* poNode)
+{
+    if( poNode->eNodeType == SNT_COLUMN )
+        return poNode->field_index;
+
+    if( poNode->eNodeType == SNT_OPERATION &&
+        poNode->nOperation == SWQ_CAST &&
+        poNode->nSubExprCount == 2 &&
+        poNode->papoSubExpr[0]->eNodeType == SNT_COLUMN )
+        return poNode->papoSubExpr[0]->field_index;
+
+    return -1;
+}
+
 /************************************************************************/
 /*                        TranslateSQLToFilter()                        */
 /************************************************************************/
@@ -2661,6 +2679,7 @@ json_object* OGRElasticLayer::TranslateSQLToFilter(swq_expr_node* poNode)
 {
     if( poNode->eNodeType == SNT_OPERATION )
     {
+        int nFieldIdx;
         if( poNode->nOperation == SWQ_AND && poNode->nSubExprCount == 2 )
         {
             // For AND, we can deal with a failure in one of the branch
@@ -2710,8 +2729,6 @@ json_object* OGRElasticLayer::TranslateSQLToFilter(swq_expr_node* poNode)
             if( poNode->papoSubExpr[0]->eNodeType == SNT_OPERATION &&
                 poNode->papoSubExpr[0]->nOperation == SWQ_ISNULL &&
                 poNode->papoSubExpr[0]->nSubExprCount == 1 &&
-                poNode->papoSubExpr[0]->papoSubExpr[0]->eNodeType ==
-                                                            SNT_COLUMN &&
                 poNode->papoSubExpr[0]->papoSubExpr[0]->field_index != 0 &&
                 poNode->papoSubExpr[0]->papoSubExpr[0]->field_index <
                                         m_poFeatureDefn->GetFieldCount() )
@@ -2746,15 +2763,13 @@ json_object* OGRElasticLayer::TranslateSQLToFilter(swq_expr_node* poNode)
         }
         else if( poNode->nOperation == SWQ_ISNULL &&
                  poNode->nSubExprCount == 1 &&
-                 poNode->papoSubExpr[0]->eNodeType == SNT_COLUMN &&
-                 poNode->papoSubExpr[0]->field_index != 0 &&
-                 poNode->papoSubExpr[0]->field_index <
-                                        m_poFeatureDefn->GetFieldCount() )
+                 (nFieldIdx = OGRESGetFieldIndexFromSQL(poNode->papoSubExpr[0])) > 0 &&
+                 nFieldIdx < m_poFeatureDefn->GetFieldCount() )
         {
             json_object* poRet = json_object_new_object();
             json_object* poExists = json_object_new_object();
             CPLString osFieldName(BuildPathFromArray(
-                m_aaosFieldPaths[ poNode->papoSubExpr[0]->field_index]));
+                m_aaosFieldPaths[nFieldIdx]));
             json_object_object_add(poExists, "field",
                                     json_object_new_string(osFieldName));
             json_object* poBool = json_object_new_object();
@@ -2783,19 +2798,18 @@ json_object* OGRElasticLayer::TranslateSQLToFilter(swq_expr_node* poNode)
             }
         }
         else if( poNode->nOperation == SWQ_EQ && poNode->nSubExprCount == 2 &&
-                 poNode->papoSubExpr[0]->eNodeType == SNT_COLUMN &&
                  poNode->papoSubExpr[1]->eNodeType == SNT_CONSTANT &&
-                 poNode->papoSubExpr[0]->field_index <
-                                        m_poFeatureDefn->GetFieldCount() )
+                 (nFieldIdx = OGRESGetFieldIndexFromSQL(poNode->papoSubExpr[0])) >= 0 &&
+                 nFieldIdx < m_poFeatureDefn->GetFieldCount() )
         {
-            json_object* poVal = GetValue(poNode->papoSubExpr[0]->field_index,
+            json_object* poVal = GetValue(nFieldIdx,
                                           poNode->papoSubExpr[1]);
             if( poVal == nullptr )
             {
                 return nullptr;
             }
             json_object* poRet = json_object_new_object();
-            if( poNode->papoSubExpr[0]->field_index == 0 )
+            if( nFieldIdx == 0 )
             {
                 json_object* poIds = json_object_new_object();
                 json_object* poValues = json_object_new_array();
@@ -2807,13 +2821,13 @@ json_object* OGRElasticLayer::TranslateSQLToFilter(swq_expr_node* poNode)
             {
                 json_object* poTerm = json_object_new_object();
                 CPLString osPath(BuildPathFromArray(
-                        m_aaosFieldPaths[ poNode->papoSubExpr[0]->field_index]));
+                        m_aaosFieldPaths[ nFieldIdx]));
                 bool bNotAnalyzed = true;
                 if( poNode->papoSubExpr[1]->field_type == SWQ_STRING )
                 {
                     const char* pszFieldName =
                         m_poFeatureDefn->GetFieldDefn(
-                            poNode->papoSubExpr[0]->field_index)->GetNameRef();
+                            nFieldIdx)->GetNameRef();
                     bNotAnalyzed = CSLFindString(m_papszNotAnalyzedFields,
                                                  pszFieldName) >= 0;
                     if( !bNotAnalyzed )
@@ -2850,14 +2864,13 @@ json_object* OGRElasticLayer::TranslateSQLToFilter(swq_expr_node* poNode)
         else if( (poNode->nOperation == SWQ_LT ||
                   poNode->nOperation == SWQ_LE ||
                   poNode->nOperation == SWQ_GT ||
-                  poNode->nOperation == SWQ_GE) && poNode->nSubExprCount == 2 &&
-                  poNode->papoSubExpr[0]->eNodeType == SNT_COLUMN &&
+                  poNode->nOperation == SWQ_GE) &&
+                  poNode->nSubExprCount == 2 &&
                   poNode->papoSubExpr[1]->eNodeType == SNT_CONSTANT &&
-                  poNode->papoSubExpr[0]->field_index != 0 &&
-                  poNode->papoSubExpr[0]->field_index <
-                                            m_poFeatureDefn->GetFieldCount() )
+                  (nFieldIdx = OGRESGetFieldIndexFromSQL(poNode->papoSubExpr[0])) > 0 &&
+                  nFieldIdx < m_poFeatureDefn->GetFieldCount() )
         {
-            json_object* poVal = GetValue(poNode->papoSubExpr[0]->field_index,
+            json_object* poVal = GetValue(nFieldIdx,
                                           poNode->papoSubExpr[1]);
             if( poVal == nullptr )
             {
@@ -2868,7 +2881,7 @@ json_object* OGRElasticLayer::TranslateSQLToFilter(swq_expr_node* poNode)
             json_object_object_add(poRet, "range", poRange);
             json_object* poFieldConstraint = json_object_new_object();
             CPLString osFieldName(BuildPathFromArray(
-                    m_aaosFieldPaths[ poNode->papoSubExpr[0]->field_index]));
+                    m_aaosFieldPaths[nFieldIdx]));
             json_object_object_add(poRange, osFieldName, poFieldConstraint);
             const char* pszOp = (poNode->nOperation == SWQ_LT) ? "lt" :
                                 (poNode->nOperation == SWQ_LE) ? "lte" :
@@ -2879,20 +2892,18 @@ json_object* OGRElasticLayer::TranslateSQLToFilter(swq_expr_node* poNode)
         }
         else if( poNode->nOperation == SWQ_BETWEEN &&
                  poNode->nSubExprCount == 3 &&
-                 poNode->papoSubExpr[0]->eNodeType == SNT_COLUMN &&
                  poNode->papoSubExpr[1]->eNodeType == SNT_CONSTANT &&
                  poNode->papoSubExpr[2]->eNodeType == SNT_CONSTANT &&
-                 poNode->papoSubExpr[0]->field_index != 0 &&
-                 poNode->papoSubExpr[0]->field_index <
-                                            m_poFeatureDefn->GetFieldCount() )
+                 (nFieldIdx = OGRESGetFieldIndexFromSQL(poNode->papoSubExpr[0])) > 0 &&
+                 nFieldIdx < m_poFeatureDefn->GetFieldCount() )
         {
-            json_object* poVal1 = GetValue(poNode->papoSubExpr[0]->field_index,
+            json_object* poVal1 = GetValue(nFieldIdx,
                                           poNode->papoSubExpr[1]);
             if( poVal1 == nullptr )
             {
                 return nullptr;
             }
-            json_object* poVal2 = GetValue(poNode->papoSubExpr[0]->field_index,
+            json_object* poVal2 = GetValue(nFieldIdx,
                                           poNode->papoSubExpr[2]);
             if( poVal2 == nullptr )
             {
@@ -2905,7 +2916,7 @@ json_object* OGRElasticLayer::TranslateSQLToFilter(swq_expr_node* poNode)
             json_object_object_add(poRet, "range", poRange);
             json_object* poFieldConstraint = json_object_new_object();
             CPLString osFieldName(BuildPathFromArray(
-                    m_aaosFieldPaths[ poNode->papoSubExpr[0]->field_index]));
+                    m_aaosFieldPaths[nFieldIdx]));
             json_object_object_add(poRange, osFieldName, poFieldConstraint);
             json_object_object_add(poFieldConstraint, "gte", poVal1);
             json_object_object_add(poFieldConstraint, "lte", poVal2);
@@ -2913,9 +2924,8 @@ json_object* OGRElasticLayer::TranslateSQLToFilter(swq_expr_node* poNode)
         }
         else if( poNode->nOperation == SWQ_IN &&
                  poNode->nSubExprCount > 1 &&
-                 poNode->papoSubExpr[0]->eNodeType == SNT_COLUMN &&
-                 poNode->papoSubExpr[0]->field_index <
-                                            m_poFeatureDefn->GetFieldCount() )
+                 (nFieldIdx = OGRESGetFieldIndexFromSQL(poNode->papoSubExpr[0])) >= 0 &&
+                 nFieldIdx < m_poFeatureDefn->GetFieldCount() )
         {
             bool bAllConstant = true;
             for( int i=1; i< poNode->nSubExprCount; i++ )
@@ -2929,7 +2939,7 @@ json_object* OGRElasticLayer::TranslateSQLToFilter(swq_expr_node* poNode)
             if( bAllConstant )
             {
                 json_object* poRet = json_object_new_object();
-                if( poNode->papoSubExpr[0]->field_index == 0 )
+                if( nFieldIdx == 0 )
                 {
                     json_object* poIds = json_object_new_object();
                     json_object* poValues = json_object_new_array();
@@ -2938,7 +2948,7 @@ json_object* OGRElasticLayer::TranslateSQLToFilter(swq_expr_node* poNode)
                         for( int i=1; i< poNode->nSubExprCount; i++ )
                     {
                         json_object* poVal = GetValue(
-                                            poNode->papoSubExpr[0]->field_index,
+                                            nFieldIdx,
                                             poNode->papoSubExpr[i]);
                         if( poVal == nullptr )
                         {
@@ -2952,12 +2962,11 @@ json_object* OGRElasticLayer::TranslateSQLToFilter(swq_expr_node* poNode)
                 {
                     bool bNotAnalyzed = true;
                     CPLString osPath(BuildPathFromArray(
-                        m_aaosFieldPaths[ poNode->papoSubExpr[0]->field_index]));
+                        m_aaosFieldPaths[nFieldIdx]));
                     if( poNode->papoSubExpr[1]->field_type == SWQ_STRING )
                     {
                         const char* pszFieldName =
-                            m_poFeatureDefn->GetFieldDefn(
-                                poNode->papoSubExpr[0]->field_index)->
+                            m_poFeatureDefn->GetFieldDefn(nFieldIdx)->
                                                                 GetNameRef();
                         bNotAnalyzed = CSLFindString(m_papszNotAnalyzedFields,
                                                      pszFieldName) >= 0;
@@ -2990,7 +2999,7 @@ json_object* OGRElasticLayer::TranslateSQLToFilter(swq_expr_node* poNode)
                         for( int i=1; i< poNode->nSubExprCount; i++ )
                         {
                             json_object* poVal = GetValue(
-                                        poNode->papoSubExpr[0]->field_index,
+                                        nFieldIdx,
                                         poNode->papoSubExpr[i]);
                             if( poVal == nullptr )
                             {
@@ -3009,7 +3018,7 @@ json_object* OGRElasticLayer::TranslateSQLToFilter(swq_expr_node* poNode)
                         for( int i=1; i< poNode->nSubExprCount; i++ )
                         {
                             json_object* poVal = GetValue(
-                                        poNode->papoSubExpr[0]->field_index,
+                                        nFieldIdx,
                                         poNode->papoSubExpr[i]);
                             if( poVal == nullptr )
                             {
@@ -3039,21 +3048,19 @@ json_object* OGRElasticLayer::TranslateSQLToFilter(swq_expr_node* poNode)
         }
         else if( poNode->nOperation == SWQ_LIKE &&
                  poNode->nSubExprCount >= 2 &&
-                 poNode->papoSubExpr[0]->eNodeType == SNT_COLUMN &&
-                 poNode->papoSubExpr[0]->field_index != 0 &&
-                 poNode->papoSubExpr[0]->field_index <
-                                            m_poFeatureDefn->GetFieldCount() )
+                 (nFieldIdx = OGRESGetFieldIndexFromSQL(poNode->papoSubExpr[0])) > 0 &&
+                 nFieldIdx < m_poFeatureDefn->GetFieldCount() )
         {
             char chEscape = '\0';
             if( poNode->nSubExprCount == 3 )
                 chEscape = poNode->papoSubExpr[2]->string_value[0];
             const char* pszPattern = poNode->papoSubExpr[1]->string_value;
             const char* pszFieldName = m_poFeatureDefn->GetFieldDefn(
-                    poNode->papoSubExpr[0]->field_index)->GetNameRef();
+                    nFieldIdx)->GetNameRef();
             bool bNotAnalyzed = CSLFindString(m_papszNotAnalyzedFields,
                                               pszFieldName) >= 0;
             CPLString osPath(BuildPathFromArray(
-                    m_aaosFieldPaths[ poNode->papoSubExpr[0]->field_index]));
+                    m_aaosFieldPaths[nFieldIdx]));
             if( !bNotAnalyzed && CSLFindString(m_papszFieldsWithRawValue,
                                                         pszFieldName) >= 0 )
             {

From 042ee2ff938951f79dda800bd356444acf5170d8 Mon Sep 17 00:00:00 2001
From: Even Rouault <even.rouault@spatialys.com>
Date: Thu, 21 Nov 2019 14:42:09 +0100
Subject: [PATCH 427/488] ElasticSearch: tranlate as well filters like
 CAST(field_name AS CHARACTER(4096)) = 'foo'

---
 gdal/ogr/ogrsf_frmts/elastic/ogrelasticlayer.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/gdal/ogr/ogrsf_frmts/elastic/ogrelasticlayer.cpp b/gdal/ogr/ogrsf_frmts/elastic/ogrelasticlayer.cpp
index 83cf3d0fdf29..1fc67dd012b9 100644
--- a/gdal/ogr/ogrsf_frmts/elastic/ogrelasticlayer.cpp
+++ b/gdal/ogr/ogrsf_frmts/elastic/ogrelasticlayer.cpp
@@ -2664,7 +2664,7 @@ static int OGRESGetFieldIndexFromSQL(const swq_expr_node* poNode)
 
     if( poNode->eNodeType == SNT_OPERATION &&
         poNode->nOperation == SWQ_CAST &&
-        poNode->nSubExprCount == 2 &&
+        poNode->nSubExprCount >= 1 &&
         poNode->papoSubExpr[0]->eNodeType == SNT_COLUMN )
         return poNode->papoSubExpr[0]->field_index;
 

From 58be2f1a59cecb1351664452b9c1f732bb1e55fb Mon Sep 17 00:00:00 2001
From: Even Rouault <even.rouault@spatialys.com>
Date: Fri, 22 Nov 2019 02:03:29 +0100
Subject: [PATCH 428/488] GRIB: degrib: avoid erroneous K->C conversion for Dew
 point depression

---
 gdal/frmts/grib/degrib/degrib/metaname.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/gdal/frmts/grib/degrib/degrib/metaname.cpp b/gdal/frmts/grib/degrib/degrib/metaname.cpp
index 664a6c201e5a..0176f4f40cd8 100644
--- a/gdal/frmts/grib/degrib/degrib/metaname.cpp
+++ b/gdal/frmts/grib/degrib/degrib/metaname.cpp
@@ -575,7 +575,7 @@ static const GRIB2ParmTable MeteoTemp[] = {
    /* 4 */ {"TMAX", "Maximum temperature", "K", UC_K2F}, /* Need NDFD override MaxT */
    /* 5 */ {"TMIN", "Minimum temperature", "K", UC_K2F}, /* Need NDFD override MinT */
    /* 6 */ {"DPT", "Dew point temperature", "K", UC_K2F}, /* Need NDFD override Td */
-   /* 7 */ {"DEPR", "Dew point depression", "K", UC_K2F},
+   /* 7 */ {"DEPR", "Dew point depression", "K", UC_NONE}, // Changed by GDAL to UC_NONE
    /* 8 */ {"LAPR", "Lapse rate", "K/m", UC_NONE},
    /* 9 */ {"TMPA", "Temperature anomaly", "K", UC_K2F},
    /* 10 */ {"LHTFL", "Latent heat net flux", "W/(m^2)", UC_NONE},

From b25599b71a20c967786352fa1b720cac1f669cb6 Mon Sep 17 00:00:00 2001
From: Even Rouault <even.rouault@spatialys.com>
Date: Sat, 23 Nov 2019 10:14:01 +0100
Subject: [PATCH 429/488] GRIB: fix out-of-buffer read on corrupted files added
 recently in 3ef6b1c3cb7168ce8d523401d4622bc997f81388. Does not affect
 released versions. Fixes
 https://bugs.chromium.org/p/oss-fuzz/issues/detail?id=19057

---
 gdal/frmts/grib/degrib/degrib/inventory.cpp | 42 ++++++---------------
 1 file changed, 11 insertions(+), 31 deletions(-)

diff --git a/gdal/frmts/grib/degrib/degrib/inventory.cpp b/gdal/frmts/grib/degrib/degrib/inventory.cpp
index 7efa28f4a50a..707255c8dad1 100644
--- a/gdal/frmts/grib/degrib/degrib/inventory.cpp
+++ b/gdal/frmts/grib/degrib/degrib/inventory.cpp
@@ -557,25 +557,22 @@ enum { GS4_ANALYSIS, GS4_ENSEMBLE, GS4_DERIVED, GS4_PROBABIL_PNT = 5,
         }
         return 1;
    }
-   if( secLen < 19 - 5 + 4 )
-       return -8;
 
-   cat = (*buffer)[10 - 5];
-   subcat = (*buffer)[11 - 5];
-   if( templat == GS4_ANALYSIS_CHEMICAL )
-   {
-        if( secLen < 21 - 5 + 4 )
-            return -8;
-        genProcess = (*buffer)[14 - 5];
+   unsigned nOffset = 0;
+   if( templat == GS4_ANALYSIS_CHEMICAL ) {
+       nOffset = 16 - 14;
    }
    else if( templat == GS4_OPTICAL_PROPERTIES_AEROSOL )
    {
-        if( secLen < 36 - 5 + 1 )
-            return -8;
-        genProcess = (*buffer)[36 - 5];
+       nOffset = 38 - 14;
    }
-   else
-        genProcess = (*buffer)[12 - 5];
+
+   if( secLen < nOffset + 19 - 5 + 4 )
+       return -8;
+
+   cat = (*buffer)[10 - 5];
+   subcat = (*buffer)[11 - 5];
+   genProcess = (*buffer)[nOffset + 12 - 5];
    genID = 0;
    probType = 0;
    lowerProb = 0;
@@ -588,14 +585,6 @@ enum { GS4_ANALYSIS, GS4_ENSEMBLE, GS4_DERIVED, GS4_PROBABIL_PNT = 5,
       timeRangeUnit = 255;
       lenTime = 0;
    } else {
-      int nOffset = 0;
-      if( templat == GS4_ANALYSIS_CHEMICAL ) {
-          nOffset = 16 - 14;
-      }
-      else if( templat == GS4_OPTICAL_PROPERTIES_AEROSOL )
-      {
-          nOffset = 38 - 14;
-      }
       genID = (*buffer)[nOffset + 14 - 5];
       /* Compute forecast time. */
       foreTimeUnit = (*buffer)[nOffset + 18 - 5];
@@ -847,15 +836,6 @@ enum { GS4_ANALYSIS, GS4_ENSEMBLE, GS4_DERIVED, GS4_PROBABIL_PNT = 5,
       sndSurfValue = 0;
       f_sndValue = 0;
    } else {
-      unsigned int nOffset = 0;
-      if( templat == GS4_ANALYSIS_CHEMICAL ) {
-          nOffset = 16 - 14;
-      }
-      else if( templat == GS4_OPTICAL_PROPERTIES_AEROSOL )
-      {
-          nOffset = 38 - 14;
-      }
-
       if( secLen < nOffset + 31 - 5 + 4)
             return -8;
       fstSurfType = (*buffer)[nOffset + 23 - 5];

From b5456b39abeed913c320f04cccac07670313aec5 Mon Sep 17 00:00:00 2001
From: Even Rouault <even.rouault@spatialys.com>
Date: Tue, 26 Nov 2019 15:12:19 +0100
Subject: [PATCH 430/488] PDF: fix crash on corrupted file. Fixes
 https://bugs.chromium.org/p/oss-fuzz/issues/detail?id=19098

---
 gdal/frmts/pdf/pdfdataset.cpp | 22 ++++++++++++++++++++--
 gdal/frmts/pdf/pdfio.cpp      |  1 +
 gdal/frmts/pdf/pdfio.h        |  4 ++++
 3 files changed, 25 insertions(+), 2 deletions(-)

diff --git a/gdal/frmts/pdf/pdfdataset.cpp b/gdal/frmts/pdf/pdfdataset.cpp
index b2ddb72d7ce2..2f85fdbc2484 100644
--- a/gdal/frmts/pdf/pdfdataset.cpp
+++ b/gdal/frmts/pdf/pdfdataset.cpp
@@ -4069,11 +4069,12 @@ GDALDataset *PDFDataset::Open( GDALOpenInfo * poOpenInfo )
             poUserPwd = new GooString(pszUserPwd);
 
 #if POPPLER_MAJOR_VERSION >= 1 || POPPLER_MINOR_VERSION >= 58
-        poDocPoppler = new PDFDoc(new VSIPDFFileStream(fp, pszFilename, std::move(oObj)), nullptr, poUserPwd);
+        auto poStream = new VSIPDFFileStream(fp, pszFilename, std::move(oObj));
 #else
         oObj.getObj()->initNull();
-        poDocPoppler = new PDFDoc(new VSIPDFFileStream(fp, pszFilename, oObj.getObj()), nullptr, poUserPwd);
+        auto poStream = new VSIPDFFileStream(fp, pszFilename, oObj.getObj());
 #endif
+        poDocPoppler = new PDFDoc(poStream, nullptr, poUserPwd);
         delete poUserPwd;
 
         if ( !poDocPoppler->isOk() || poDocPoppler->getNumPages() == 0 )
@@ -4111,8 +4112,25 @@ GDALDataset *PDFDataset::Open( GDALOpenInfo * poOpenInfo )
 
             return nullptr;
         }
+        else if( poDocPoppler->isLinearized() &&
+                 !poStream->FoundLinearizedHint() )
+        {
+            // This is a likely defect of poppler Linearization.cc file that
+            // recognizes a file as linearized if the /Linearized hint is missing,
+            // but the content of this dictionary are present.
+            // But given the hacks of PDFFreeDoc() and VSIPDFFileStream::FillBuffer()
+            // opening such a file will result in a null-ptr deref at closing if
+            // we try to access a page and build the page cache, so just exit now
+            CPLError(CE_Failure, CPLE_AppDefined, "Invalid PDF");
+
+            PDFFreeDoc(poDocPoppler);
+
+            return nullptr;
+        }
         else
+        {
             break;
+        }
     }
 
     poCatalogPoppler = poDocPoppler->getCatalog();
diff --git a/gdal/frmts/pdf/pdfio.cpp b/gdal/frmts/pdf/pdfio.cpp
index 7850e0d292a4..6ebd7b3841e8 100644
--- a/gdal/frmts/pdf/pdfio.cpp
+++ b/gdal/frmts/pdf/pdfio.cpp
@@ -223,6 +223,7 @@ int VSIPDFFileStream::FillBuffer()
             if( memcmp(abyBuffer + i, "/Linearized ",
                        strlen("/Linearized ")) == 0 )
             {
+                bFoundLinearizedHint = true;
                 memcpy(abyBuffer + i, "/XXXXXXXXXX ", strlen("/Linearized "));
                 break;
             }
diff --git a/gdal/frmts/pdf/pdfio.h b/gdal/frmts/pdf/pdfio.h
index ec13b8fe94c7..50ceaa1e96e4 100644
--- a/gdal/frmts/pdf/pdfio.h
+++ b/gdal/frmts/pdf/pdfio.h
@@ -92,6 +92,8 @@ class VSIPDFFileStream final: public BaseStream
         virtual void       unfilteredReset () override;
         virtual void       close() override;
 
+        bool               FoundLinearizedHint() const { return bFoundLinearizedHint; }
+
     private:
         virtual GBool hasGetChars() override;
         virtual int getChars(int nChars, Guchar *buffer) override;
@@ -111,6 +113,8 @@ class VSIPDFFileStream final: public BaseStream
         int                nPosInBuffer;
         int                nBufferLength;
 
+        bool               bFoundLinearizedHint = false;
+
         int                FillBuffer();
 };
 

From 3b33e5b69cb172b18d270cb7e0e6a09862360de7 Mon Sep 17 00:00:00 2001
From: Even Rouault <even.rouault@spatialys.com>
Date: Sun, 1 Dec 2019 18:46:49 +0100
Subject: [PATCH 431/488] SQLite dialect: fix issue when using JOIN on a layer
 without fast filter count capability

---
 autotest/ogr/ogr_sql_sqlite.py                | 46 ++++++++++++++++++-
 .../sqlite/ogrsqlitevirtualogr.cpp            |  4 +-
 2 files changed, 45 insertions(+), 5 deletions(-)

diff --git a/autotest/ogr/ogr_sql_sqlite.py b/autotest/ogr/ogr_sql_sqlite.py
index 90c51ae3e74c..c5294a099bf6 100755
--- a/autotest/ogr/ogr_sql_sqlite.py
+++ b/autotest/ogr/ogr_sql_sqlite.py
@@ -380,10 +380,10 @@ def test_ogr_sql_sqlite_2():
     ds.ReleaseResultSet(sql_lyr)
 
 ###############################################################################
-# Test that involves a join
+# Test that involves a left join
 
 
-def test_ogr_sql_sqlite_3():
+def test_ogr_sql_sqlite_left_join():
 
     ds = ogr.Open('data')
 
@@ -405,6 +405,48 @@ def test_ogr_sql_sqlite_3():
 
     ds = None
 
+###############################################################################
+# Test that involves a join on layers without fast feature count
+
+
+def test_ogr_sql_sqlite_join_layers_without_fast_feature_count():
+
+    gdal.FileFromMemBuffer('/vsimem/tblmain.csv', """id,attr1
+1,one
+2,two
+3,three
+""")
+
+    gdal.FileFromMemBuffer('/vsimem/tblaux.csv', """id,attr2
+1,ipsum
+2,lorem
+3,amet
+""")
+
+    ds = ogr.Open('/vsimem/tblmain.csv')
+    sql_lyr = ds.ExecuteSQL("SELECT tblmain.id, tblmain.attr1, tblaux.attr2 FROM tblmain JOIN '/vsimem/tblaux.csv'.tblaux AS tblaux USING (id) ORDER BY id", dialect='SQLite')
+    count = sql_lyr.GetFeatureCount()
+    sql_lyr.ResetReading()
+    f = sql_lyr.GetNextFeature()
+    assert f['id'] == '1'
+    assert f['attr1'] == 'one'
+    assert f['attr2'] == 'ipsum'
+    f = sql_lyr.GetNextFeature()
+    assert f['id'] == '2'
+    assert f['attr1'] == 'two'
+    assert f['attr2'] == 'lorem'
+    f = sql_lyr.GetNextFeature()
+    assert f['id'] == '3'
+    assert f['attr1'] == 'three'
+    assert f['attr2'] == 'amet'
+    ds.ReleaseResultSet(sql_lyr)
+    ds = None
+
+    gdal.Unlink('/vsimem/tblmain.csv')
+    gdal.Unlink('/vsimem/tblaux.csv')
+
+    assert count == 3
+
 ###############################################################################
 # Test that involves a self-join (to check that we can open twice the same table)
 
diff --git a/gdal/ogr/ogrsf_frmts/sqlite/ogrsqlitevirtualogr.cpp b/gdal/ogr/ogrsf_frmts/sqlite/ogrsqlitevirtualogr.cpp
index f333877a06d0..96b691ab529a 100644
--- a/gdal/ogr/ogrsf_frmts/sqlite/ogrsqlitevirtualogr.cpp
+++ b/gdal/ogr/ogrsf_frmts/sqlite/ogrsqlitevirtualogr.cpp
@@ -1129,12 +1129,10 @@ int OGR2SQLITE_Filter(sqlite3_vtab_cursor* pCursor,
     }
 
     if( pMyCursor->poLayer->TestCapability(OLCFastFeatureCount) )
-    {
         pMyCursor->nFeatureCount = pMyCursor->poLayer->GetFeatureCount();
-        pMyCursor->poLayer->ResetReading();
-    }
     else
         pMyCursor->nFeatureCount = -1;
+    pMyCursor->poLayer->ResetReading();
 
     if( pMyCursor->nFeatureCount < 0 )
     {

From d2e555e32de13b45aeb3abf0e9b56d1f5c597f7d Mon Sep 17 00:00:00 2001
From: Even Rouault <even.rouault@spatialys.com>
Date: Thu, 5 Dec 2019 21:36:24 +0100
Subject: [PATCH 432/488] GTF: remove tests and docs (refs #2050)

---
 autotest/ogr/ogr_gft.py               | 289 --------------------------
 gdal/ogr/ogrsf_frmts/gft/drv_gft.html | 192 -----------------
 gdal/ogr/ogrsf_frmts/ogr_formats.html |   7 -
 3 files changed, 488 deletions(-)
 delete mode 100755 autotest/ogr/ogr_gft.py
 delete mode 100644 gdal/ogr/ogrsf_frmts/gft/drv_gft.html

diff --git a/autotest/ogr/ogr_gft.py b/autotest/ogr/ogr_gft.py
deleted file mode 100755
index e050a0d0f61a..000000000000
--- a/autotest/ogr/ogr_gft.py
+++ /dev/null
@@ -1,289 +0,0 @@
-#!/usr/bin/env pytest
-# -*- coding: utf-8 -*-
-###############################################################################
-# $Id$
-#
-# Project:  GDAL/OGR Test Suite
-# Purpose:  GFT driver testing.
-# Author:   Even Rouault <even dot rouault at mines dash paris dot org>
-#
-###############################################################################
-# Copyright (c) 2011-2012, Even Rouault <even dot rouault at mines-paris dot org>
-#
-# Permission is hereby granted, free of charge, to any person obtaining a
-# copy of this software and associated documentation files (the "Software"),
-# to deal in the Software without restriction, including without limitation
-# the rights to use, copy, modify, merge, publish, distribute, sublicense,
-# and/or sell copies of the Software, and to permit persons to whom the
-# Software is furnished to do so, subject to the following conditions:
-#
-# The above copyright notice and this permission notice shall be included
-# in all copies or substantial portions of the Software.
-#
-# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
-# OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
-# THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
-# FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
-# DEALINGS IN THE SOFTWARE.
-###############################################################################
-
-import os
-
-
-import gdaltest
-import ogrtest
-from osgeo import gdal
-from osgeo import ogr
-import pytest
-
-###############################################################################
-# Test if driver is available
-
-
-def test_ogr_gft_init():
-
-    ogrtest.gft_drv = None
-
-    ogrtest.gft_drv = ogr.GetDriverByName('GFT')
-
-    if ogrtest.gft_drv is None:
-        pytest.skip()
-
-    if gdaltest.gdalurlopen('http://www.google.com') is None:
-        ogrtest.gft_drv = None
-        pytest.skip('cannot open http://www.google.com')
-
-    ogrtest.gft_refresh = '1/woRTxgfN8dLUpRhnOL-BXG-f7VxzXKy_3D5eizH8bS8'
-
-###############################################################################
-# Read test on Wikileaks Afgan War Diary 2004-2010 table.
-
-
-def test_ogr_gft_read():
-    if ogrtest.gft_drv is None:
-        pytest.skip()
-
-    table_id = '15eIgEVTUNlC649ODphJVHXeb4nsOb49WJUlnhw'
-
-    old_auth = gdal.GetConfigOption('GFT_AUTH', None)
-    old_access = gdal.GetConfigOption('GFT_ACCESS_TOKEN', None)
-    old_refresh = gdal.GetConfigOption('GFT_REFRESH_TOKEN', None)
-    gdal.SetConfigOption('GFT_AUTH', None)
-    gdal.SetConfigOption('GFT_ACCESS_TOKEN', None)
-    gdal.SetConfigOption('GFT_REFRESH_TOKEN', None)
-    ds = ogr.Open('GFT:tables=' + table_id)
-    gdal.SetConfigOption('GFT_AUTH', old_auth)
-    gdal.SetConfigOption('GFT_ACCESS_TOKEN', old_access)
-    gdal.SetConfigOption('GFT_REFRESH_TOKEN', old_refresh)
-    assert ds is not None
-
-    lyr = ds.GetLayer(0)
-    assert lyr is not None
-
-    lyr.SetSpatialFilterRect(67, 31.5, 67.5, 32)
-    lyr.SetAttributeFilter("'Attack on' = 'ENEMY'")
-
-    count = lyr.GetFeatureCount()
-    if count == 0:
-        print(count)
-        if gdaltest.skip_on_travis() or gdal.GetConfigOption('APPVEYOR') is not None:
-            ogrtest.gft_drv = None
-            pytest.skip()
-        pytest.fail('did not get expected feature count')
-
-    sql_lyr = ds.ExecuteSQL("SELECT Latitude, Longitude FROM " + table_id + " WHERE ST_INTERSECTS('Latitude', RECTANGLE(LATLNG(31.5,67.0), LATLNG(32.0,67.5))) AND 'Attack on' = 'ENEMY'")
-    assert sql_lyr is not None, 'SQL request failed'
-    sql_lyr_count = sql_lyr.GetFeatureCount()
-    ds.ReleaseResultSet(sql_lyr)
-
-    assert sql_lyr_count == count, \
-        ('did not get expected feature count. Got %d, expected %d' % (sql_lyr_count, count))
-
-###############################################################################
-# Write test
-
-
-def test_ogr_gft_write():
-    if ogrtest.gft_drv is None:
-        pytest.skip()
-
-    if ogrtest.gft_refresh is None:
-        ogrtest.gft_can_write = False
-        pytest.skip()
-
-    ds = ogr.Open('GFT:refresh=%s' % ogrtest.gft_refresh, update=1)
-    if ds is None:
-        ogrtest.gft_can_write = False
-        pytest.skip()
-    ogrtest.gft_can_write = True
-
-    import random
-    ogrtest.gft_rand_val = random.randint(0, 2147000000)
-    table_name = "test_%d" % ogrtest.gft_rand_val
-
-    lyr = ds.CreateLayer(table_name)
-    lyr.CreateField(ogr.FieldDefn('strcol', ogr.OFTString))
-    lyr.CreateField(ogr.FieldDefn('numcol', ogr.OFTReal))
-
-    feat = ogr.Feature(lyr.GetLayerDefn())
-
-    feat.SetField('strcol', 'foo')
-    feat.SetField('numcol', '3.45')
-    expected_wkt = "POLYGON ((0 0,0 1,1 1,1 0),(0.25 0.25,0.25 0.75,0.75 0.75,0.75 0.25))"
-    geom = ogr.CreateGeometryFromWkt(expected_wkt)
-    feat.SetGeometry(geom)
-    assert lyr.CreateFeature(feat) == 0, 'CreateFeature() failed'
-
-    fid = feat.GetFID()
-    feat.SetField('strcol', 'bar')
-    assert lyr.SetFeature(feat) == 0, 'SetFeature() failed'
-
-    lyr.ResetReading()
-    feat = lyr.GetNextFeature()
-    if feat.GetFieldAsString('strcol') != 'bar':
-        feat.DumpReadable()
-        pytest.fail('GetNextFeature() did not get expected feature')
-
-    feat = lyr.GetFeature(fid)
-    if feat.GetFieldAsString('strcol') != 'bar':
-        feat.DumpReadable()
-        pytest.fail('GetFeature() did not get expected feature')
-    got_wkt = feat.GetGeometryRef().ExportToWkt()
-    assert got_wkt == expected_wkt, 'did not get expected geometry'
-
-    assert lyr.GetFeatureCount() == 1, \
-        'GetFeatureCount() did not returned expected value'
-
-    assert lyr.DeleteFeature(feat.GetFID()) == 0, 'DeleteFeature() failed'
-
-    ds.ExecuteSQL('DELLAYER:%s' % table_name)
-
-    ds = None
-
-###############################################################################
-# ogr2ogr test to create a non-spatial GFT table
-
-
-def test_ogr_gft_ogr2ogr_non_spatial():
-    if ogrtest.gft_drv is None:
-        pytest.skip()
-
-    if not ogrtest.gft_can_write:
-        pytest.skip()
-
-    import test_cli_utilities
-    if test_cli_utilities.get_ogr2ogr_path() is None:
-        pytest.skip()
-
-    layer_name = 'no_geometry_table_%d' % ogrtest.gft_rand_val
-
-    f = open('tmp/no_geometry_table.csv', 'wt')
-    f.write('foo,bar\n')
-    f.write('"baz","foo"\n')
-    f.write('"baz2","foo2"\n')
-    f.write('"baz\'3","foo3"\n')
-    f.close()
-    gdaltest.runexternal(test_cli_utilities.get_ogr2ogr_path() + ' -f GFT "GFT:refresh=' + ogrtest.gft_refresh + '" tmp/no_geometry_table.csv -nln ' + layer_name + ' -overwrite')
-
-    os.unlink('tmp/no_geometry_table.csv')
-
-    ds = ogr.Open('GFT:refresh=%s' % ogrtest.gft_refresh, update=1)
-    lyr = ds.GetLayerByName(layer_name)
-    if lyr.GetLayerDefn().GetFieldCount() != 2:
-        ds.ExecuteSQL('DELLAYER:' + layer_name)
-        pytest.fail('did not get expected field count')
-
-    if lyr.GetGeomType() != ogr.wkbNone:
-        ds.ExecuteSQL('DELLAYER:' + layer_name)
-        pytest.fail('did not get expected layer geometry type')
-
-    if lyr.GetFeatureCount() != 3:
-        ds.ExecuteSQL('DELLAYER:' + layer_name)
-        pytest.fail('did not get expected feature count')
-
-    ds.ExecuteSQL('DELLAYER:' + layer_name)
-
-    ds = None
-
-###############################################################################
-# ogr2ogr test to create a spatial GFT table
-
-
-def test_ogr_gft_ogr2ogr_spatial():
-    if ogrtest.gft_drv is None:
-        pytest.skip()
-
-    if not ogrtest.gft_can_write:
-        pytest.skip()
-
-    import test_cli_utilities
-    if test_cli_utilities.get_ogr2ogr_path() is None:
-        pytest.skip()
-
-    layer_name = 'geometry_table_%d' % ogrtest.gft_rand_val
-    copied_layer_name = 'copied_geometry_table_%d' % ogrtest.gft_rand_val
-
-    f = open('tmp/geometry_table.csv', 'wt')
-    f.write('foo,bar,WKT\n')
-    f.write('"baz",2,"POINT (0 1)"\n')
-    f.write('"baz2",4,"POINT (2 3)"\n')
-    f.write('"baz\'3",6,"POINT (4 5)"\n')
-    f.close()
-    f = open('tmp/geometry_table.csvt', 'wt')
-    f.write('String,Integer,String\n')
-    f.close()
-
-    # Create a first table
-    gdaltest.runexternal(test_cli_utilities.get_ogr2ogr_path() + ' -f GFT "GFT:refresh=' + ogrtest.gft_refresh + '" tmp/geometry_table.csv -nln ' + layer_name + ' -select foo,bar -overwrite')
-
-    # Test round-tripping
-    gdaltest.runexternal(test_cli_utilities.get_ogr2ogr_path() + ' -f GFT "GFT:refresh=' + ogrtest.gft_refresh + '" "GFT:refresh=' + ogrtest.gft_refresh + '" ' + layer_name + ' -nln ' + copied_layer_name + ' -overwrite')
-
-    os.unlink('tmp/geometry_table.csv')
-    os.unlink('tmp/geometry_table.csvt')
-
-    ds = ogr.Open('GFT:refresh=%s' % ogrtest.gft_refresh, update=1)
-
-    for name in [layer_name, copied_layer_name]:
-        lyr = ds.GetLayerByName(name)
-
-        if lyr.GetGeometryColumn() != 'geometry':
-            ds.ExecuteSQL('DELLAYER:' + layer_name)
-            ds.ExecuteSQL('DELLAYER:' + copied_layer_name)
-            pytest.fail('layer %s: did not get expected geometry column' % name)
-
-        if lyr.GetLayerDefn().GetFieldCount() != 3:
-            ds.ExecuteSQL('DELLAYER:' + layer_name)
-            ds.ExecuteSQL('DELLAYER:' + copied_layer_name)
-            pytest.fail('layer %s: did not get expected field count' % name)
-
-        if lyr.GetGeomType() != ogr.wkbUnknown:
-            ds.ExecuteSQL('DELLAYER:' + layer_name)
-            ds.ExecuteSQL('DELLAYER:' + copied_layer_name)
-            pytest.fail('layer %s: did not get expected layer geometry type' % name)
-
-        if lyr.GetFeatureCount() != 3:
-            ds.ExecuteSQL('DELLAYER:' + layer_name)
-            ds.ExecuteSQL('DELLAYER:' + copied_layer_name)
-            pytest.fail('layer %s: did not get expected feature count' % name)
-
-        feat = lyr.GetNextFeature()
-        if feat.GetGeometryRef().ExportToWkt() != "POINT (0 1)":
-            ds.ExecuteSQL('DELLAYER:' + layer_name)
-            ds.ExecuteSQL('DELLAYER:' + copied_layer_name)
-            pytest.fail('layer %s: did not get expected geometry' % name)
-
-        if feat.GetFieldAsInteger('bar') != 2:
-            ds.ExecuteSQL('DELLAYER:' + layer_name)
-            ds.ExecuteSQL('DELLAYER:' + copied_layer_name)
-            pytest.fail('layer %s: did not get expected field value' % name)
-
-    ds.ExecuteSQL('DELLAYER:' + layer_name)
-    ds.ExecuteSQL('DELLAYER:' + copied_layer_name)
-
-    ds = None
-
-
-
diff --git a/gdal/ogr/ogrsf_frmts/gft/drv_gft.html b/gdal/ogr/ogrsf_frmts/gft/drv_gft.html
deleted file mode 100644
index 6addd06285ff..000000000000
--- a/gdal/ogr/ogrsf_frmts/gft/drv_gft.html
+++ /dev/null
@@ -1,192 +0,0 @@
-<html>
-<head>
-<title>GFT - Google Fusion Tables</title>
-</head>
-
-<body bgcolor="#ffffff">
-
-<h1>GFT - Google Fusion Tables</h1>
-
-(GDAL/OGR >= 1.9.0)<p>
-
-This driver can connect to the Google Fusion Tables service. GDAL/OGR must be built with Curl support in order to the
-GFT driver to be compiled.<p>
-
-The driver supports read and write operations.<p>
-
-<h2>Dataset name syntax</h2>
-
-The minimal syntax to open a GFT datasource is : <pre>GFT:</pre><p>
-
-Additional optional parameters can be specified after the ':' sign such as :<p>
-
-<ul>
-<li> <b>tables=table_id1[,table_id2]*</b>: A list of table IDs. This is necessary when you need to access to public tables for example.
-If you want the table ID of a public table, or any other table that is not owned by the authenticated user, you have to visit the table
-in the Google Fusion Tables website and note the number at the end of the URL.
-<li> <b>protocol=https</b>: To use HTTPS protocol for all operations. By default, HTTP is used, except for the authentication operation
-where HTTPS is always used.
-<li> <b>auth=auth_key</b>: An authentication key as described below.
-<li> <b>access=access_token</b>: An access token as described below.
-<li> <b>refresh=refresh_token</b>: A refresh token as described below.
-</ul>
-
-If several parameters are specified, they must be separated by a space.
-
-<h2>Authentication</h2>
-
-Most operations, in particular write operations, require a valid Google
-account to provide authentication information to the driver. The only
-exception is read-only access to public tables.<p>
-
-In order to create an authorization key, it is necessary to
-<a href="https://www.google.com/url?q=https%3A%2F%2Faccounts.google.com%2Fo%2Foauth2%2Fauth%3Fscope%3Dhttps%253A%252F%252Fwww.googleapis.com%252Fauth%252Ffusiontables%26state%3D%252Fprofile%26redirect_uri%3Durn%3Aietf%3Awg%3Aoauth%3A2.0%3Aoob%26response_type%3Dcode%26client_id%3D265656308688.apps.googleusercontent.com">
-login and authorize</a> access to fusion tables for a Google (i.e. GMail)
-account.  The resulting authorization key can be turned into a refresh
-token for use OGR using the gdal/swig/python/scripts/gdal_auth.py script
-distributed with GDAL (available in GDAL/OGR >= 1.10.0).  Note that auth
-tokens can only be used once, while the resulting refresh token lasts
-indefinitely.<p>
-
-<pre>
-  gdal_auth.py auth2refresh <i>auth_token</i>
-</pre>
-
-This refresh token can then be either set as a configuration option
-(GFT_REFRESH_TOKEN) or included in the connection string
-(i.e. GFT:refresh=<i>refresh_token</i>). <p>
-
-Generally OAuth2 credentials can be provided via these mechanisms:<p>
-
-<ul>
-<li> Specifying an <i>access token</i> via the <tt>GFT_ACCESS_TOKEN</tt>
-configuration/environment variable.<p>
-<li> Specifying an <i>access token</i> via the <tt>access=</tt>
-clause in the GFT: connection string.
-<li> Specifying a <i>refresh token</i> via the <tt>GFT_REFRESH_TOKEN</tt>
-configuration/environment variable.<p>
-<li> Specifying an <i>refresh token</i> via the <tt>refresh=</tt>
-clause in the GFT: connection string.
-<li> Specifying a <i>auth key</i> via the <tt>GFT_AUTH</tt>
-configuration/environment variable.<p>
-<li> Specifying an <i>auth key</i> via the <tt>auth=</tt>
-clause in the GFT: connection string.
-</ul>
-
-<h2>Geometry</h2>
-
-Geometries in GFT tables must be expressed in the geodetic WGS84 SRS. GFT allows them to be encoded in different forms :
-<ul>
-<li>A single column with a "lat lon" or "lat,lon" string, where lat et lon are expressed in decimal degrees.</li>
-<li>A single column with a KML string that is the representation of a Point, a LineString or a Polygon.</li>
-<li>Two columns, one with the latitude and the other one with the longitude, both values expressed in decimal degrees.</li>
-<li>A single column with an address known by the geocoding service of Google Maps.</li>
-</ul>
-
-Only the first 3 types are supported by OGR, not the last one.<p>
-
-Fusion tables can have multiple geometry columns per table. By default, OGR
-will use the first geometry column it finds. It is possible to select another
-column as the geometry column by specifying <i>table_name(geometry_column_name)</i>
-as the layer name passed to GetLayerByName().<p>
-
-<h2>Filtering</h2>
-
-The driver will forward any spatial filter set with SetSpatialFilter() to the server. It also makes the same for attribute
-filters set with SetAttributeFilter().<p>
-
-<h2>Paging</h2>
-
-Features are retrieved from the server by chunks of 500 by default. This number can be altered with the GFT_PAGE_SIZE
-configuration option.<p>
-
-<h2>Write support</h2>
-
-Table creation and deletion is possible. Note that fields can only be added to a table in which there are no features created yet.<p>
-
-Write support is only enabled when the datasource is opened in update mode.<p>
-
-The mapping between the operations of the GFT service and the OGR concepts is the following :
-<ul>
-<li>OGRFeature::CreateFeature() &lt;==&gt; INSERT operation</li>
-<li>OGRFeature::SetFeature() &lt;==&gt; UPDATE operation</li>
-<li>OGRFeature::DeleteFeature() &lt;==&gt; DELETE operation</li>
-<li>OGRDataSource::CreateLayer() &lt;==&gt; CREATE TABLE operation</li>
-<li>OGRDataSource::DeleteLayer() &lt;==&gt; DROP TABLE operation</li>
-</ul>
-
-When inserting a new feature with CreateFeature(), and if the command is successful, OGR will fetch the
-returned rowid and use it as the OGR FID. OGR will also automatically reproject its geometry into the
-geodetic WGS84 SRS if needed (provided that the original SRS is attached to the geometry).<p>
-
-<h2>Write support and OGR transactions</h2>
-
-The above operations are by default issued to the server synchronously with the OGR API call. This however
-can cause performance penalties when issuing a lot of commands due to many client/server exchanges.<p>
-
-It is possible to surround the CreateFeature() operation between
-OGRLayer::StartTransaction() and OGRLayer::CommitTransaction().  The
-operations will be stored into memory and only executed at the time
-CommitTransaction() is called. Note that the GFT service only supports
-up to 500 INSERTs and up to 1MB of content per transaction.<p>
-
-Note : only CreateFeature() makes use of OGR transaction mechanism. SetFeature() and DeleteFeature()
-will still be issued immediately.<p>
-
-<h2>SQL</h2>
-
-SQL commands provided to the OGRDataSource::ExecuteSQL() call are executed on the server side, unless the OGRSQL
-dialect is specified. The subset of SQL supported by the GFT service is described in the links at the end of this page.<p>
-
-The SQL supported by the server understands only native table id, and
-not the table names returned by OGR.  For convenience, OGR will
-"patch" your SQL command to replace the table name by the table id
-however.<p>
-
-<h2>Examples</h2>
-
-<li>
-Listing the tables and views owned by the authenticated user:
-<pre>
-ogrinfo -ro "GFT:email=john.doe@example.com password=secret_password"
-</pre>
-<p>
-
-<li>
-Creating and populating a table from a shapefile:
-<pre>
-ogr2ogr -f GFT "GFT:email=john.doe@example.com password=secret_password" shapefile.shp
-</pre>
-<p>
-
-<li>
-Displaying the content of a public table with a spatial and attribute filters:
-<pre>
-ogrinfo -ro "GFT:tables=224453" -al -spat 67 31.5 67.5 32 -where "'Attack on' = 'ENEMY'"
-</pre>
-<p>
-
-<li>
-Getting the auth key:
-<pre>
-ogrinfo --config CPL_DEBUG ON "GFT:email=john.doe@example.com password=secret_password"
-</pre>
-
-returns:
-<pre>
-HTTP: Fetch(https://www.google.com/accounts/ClientLogin)
-HTTP: These HTTP headers were set: Content-Type: application/x-www-form-urlencoded
-GFT: Auth key : A_HUGE_STRING_WITH_ALPHANUMERIC_AND_SPECIAL_CHARACTERS
-</pre>
-
-Now, you can set the GFT_AUTH environment variable to that value and simply use "GFT:" as the DSN.
-
-<h2>See Also</h2>
-
-<ul>
-<li> <a href="http://code.google.com/intl/fr/apis/fusiontables/docs/developers_guide.html">Google Fusion Tables Developer's Guide</a><p>
-<li> <a href="http://code.google.com/intl/fr/apis/fusiontables/docs/developers_reference.html">Google Fusion Tables Developer's Reference</a><p>
-</ul>
-
-</body>
-</html>
diff --git a/gdal/ogr/ogrsf_frmts/ogr_formats.html b/gdal/ogr/ogrsf_frmts/ogr_formats.html
index 7f4230874875..922bf1ce22ac 100644
--- a/gdal/ogr/ogrsf_frmts/ogr_formats.html
+++ b/gdal/ogr/ogrsf_frmts/ogr_formats.html
@@ -249,13 +249,6 @@ <h1>OGR Vector Formats</h1>
 </td><td> Yes (read support needs libexpat)
 </td></tr>
 
-<tr><td> <a href="drv_gft.html">Google Fusion Tables</a>
-</td><td> GFT
-</td><td> Yes
-</td><td> Yes
-</td><td> No, needs libcurl
-</td></tr>
-
 <tr><td> <a href="drv_gml.html">GML</a>
 </td><td> GML
 </td><td> Yes

From ca9a77b4f07be810dd0958f65eb10c3e3f9d01f5 Mon Sep 17 00:00:00 2001
From: Even Rouault <even.rouault@spatialys.com>
Date: Sun, 30 Dec 2018 22:42:09 +0100
Subject: [PATCH 433/488] RPC transformer: test success code of
 GDALRPCTransform() in GDALCreateRPCTransformer()

Cherry-picked from c95b0918087317cb20e4cf6a4f9102b771adca1b
---
 gdal/alg/gdal_rpc.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/gdal/alg/gdal_rpc.cpp b/gdal/alg/gdal_rpc.cpp
index 82db89c05e4f..b064b8cf5cee 100644
--- a/gdal/alg/gdal_rpc.cpp
+++ b/gdal/alg/gdal_rpc.cpp
@@ -922,7 +922,7 @@ void *GDALCreateRPCTransformer( GDALRPCInfo *psRPCInfo, int bReversed,
         int nSuccess = 0;
         // Try with DEM first.
         if( GDALRPCTransform( psTransform, !(psTransform->bReversed), 1,
-                          &dfX, &dfY, &dfZ, &nSuccess) )
+                          &dfX, &dfY, &dfZ, &nSuccess) && nSuccess )
         {
             dfRefPixel = dfX;
             dfRefLine = dfY;
@@ -948,7 +948,7 @@ void *GDALCreateRPCTransformer( GDALRPCInfo *psRPCInfo, int bReversed,
         int nSuccess = 0;
         // Try with DEM first.
         if( GDALRPCTransform( psTransform, !(psTransform->bReversed), 1,
-                               &dfX, &dfY, &dfZ, &nSuccess) )
+                               &dfX, &dfY, &dfZ, &nSuccess) && nSuccess )
         {
             dfRefPixel = dfX;
             dfRefLine = dfY;

From 081bf716653359d4a1d56443ca2612a95fc377f0 Mon Sep 17 00:00:00 2001
From: Even Rouault <even.rouault@spatialys.com>
Date: Thu, 12 Dec 2019 22:58:55 +0100
Subject: [PATCH 434/488] PDF: fix use-after-free on some corrupted PDF files.
 Fixes https://bugs.chromium.org/p/oss-fuzz/issues/detail?id=19400

---
 gdal/frmts/pdf/gdal_pdf.h     |  1 +
 gdal/frmts/pdf/pdfdataset.cpp | 32 ++++++++++++++++++++++++--------
 gdal/frmts/pdf/pdfio.cpp      |  2 --
 3 files changed, 25 insertions(+), 10 deletions(-)

diff --git a/gdal/frmts/pdf/gdal_pdf.h b/gdal/frmts/pdf/gdal_pdf.h
index b184516ef455..0de6a6d08a05 100644
--- a/gdal/frmts/pdf/gdal_pdf.h
+++ b/gdal/frmts/pdf/gdal_pdf.h
@@ -185,6 +185,7 @@ class PDFDataset final: public GDALPamDataset
     friend class PDFRasterBand;
     friend class PDFImageRasterBand;
 
+    VSILFILE    *m_fp = nullptr;
     PDFDataset*  poParentDS;
 
     CPLString    osFilename;
diff --git a/gdal/frmts/pdf/pdfdataset.cpp b/gdal/frmts/pdf/pdfdataset.cpp
index 2f85fdbc2484..ca835164bc66 100644
--- a/gdal/frmts/pdf/pdfdataset.cpp
+++ b/gdal/frmts/pdf/pdfdataset.cpp
@@ -2440,6 +2440,10 @@ PDFDataset::~PDFDataset()
     for(int i=0;i<nLayers;i++)
         delete papoLayers[i];
     CPLFree( papoLayers );
+
+    // Do that only after having destroyed Poppler objects
+    if( m_fp )
+        VSIFCloseL(m_fp);
 }
 
 /************************************************************************/
@@ -4039,6 +4043,17 @@ GDALDataset *PDFDataset::Open( GDALOpenInfo * poOpenInfo )
 #endif
     int nPages = 0;
 
+    struct FilePointerKeeper
+    {
+        VSILFILE* m_fp;
+
+        FilePointerKeeper(VSILFILE* fp = nullptr): m_fp(fp) {}
+        ~FilePointerKeeper() { if( m_fp ) VSIFCloseL(m_fp); }
+        void reset(VSILFILE* fp) { if( m_fp ) VSIFCloseL(m_fp); m_fp = fp; }
+        VSILFILE* release() { VSILFILE* ret = m_fp; m_fp = nullptr; return ret; }
+    };
+    FilePointerKeeper fpKeeper;
+
 #ifdef HAVE_POPPLER
   if(bUseLib.test(PDFLIB_POPPLER))
   {
@@ -4057,14 +4072,16 @@ GDALDataset *PDFDataset::Open( GDALOpenInfo * poOpenInfo )
             CPLGetConfigOption("GDAL_PDF_PRINT_COMMANDS", "FALSE")));
     }
 
-    while( true )
-    {
-        VSILFILE* fp = VSIFOpenL(pszFilename, "rb");
-        if (fp == nullptr)
-            return nullptr;
+    VSILFILE* fp = VSIFOpenL(pszFilename, "rb");
+    if (fp == nullptr)
+        return nullptr;
 
-        fp = (VSILFILE*)VSICreateBufferedReaderHandle((VSIVirtualHandle*)fp);
+    fp = (VSILFILE*)VSICreateBufferedReaderHandle((VSIVirtualHandle*)fp);
+    fpKeeper.reset(fp);
 
+    while( true )
+    {
+        VSIFSeekL(fp, 0, SEEK_SET);
         if (pszUserPwd)
             poUserPwd = new GooString(pszUserPwd);
 
@@ -4109,7 +4126,6 @@ GDALDataset *PDFDataset::Open( GDALOpenInfo * poOpenInfo )
             }
 
             PDFFreeDoc(poDocPoppler);
-
             return nullptr;
         }
         else if( poDocPoppler->isLinearized() &&
@@ -4124,7 +4140,6 @@ GDALDataset *PDFDataset::Open( GDALOpenInfo * poOpenInfo )
             CPLError(CE_Failure, CPLE_AppDefined, "Invalid PDF");
 
             PDFFreeDoc(poDocPoppler);
-
             return nullptr;
         }
         else
@@ -4361,6 +4376,7 @@ GDALDataset *PDFDataset::Open( GDALOpenInfo * poOpenInfo )
     }
 
     PDFDataset* poDS = new PDFDataset();
+    poDS->m_fp = fpKeeper.release();
     poDS->papszOpenOptions = CSLDuplicate(poOpenInfo->papszOpenOptions);
     poDS->bUseLib = bUseLib;
     poDS->osFilename = pszFilename;
diff --git a/gdal/frmts/pdf/pdfio.cpp b/gdal/frmts/pdf/pdfio.cpp
index 6ebd7b3841e8..a8e3b5dfdf9f 100644
--- a/gdal/frmts/pdf/pdfio.cpp
+++ b/gdal/frmts/pdf/pdfio.cpp
@@ -107,8 +107,6 @@ VSIPDFFileStream::~VSIPDFFileStream()
     if (poParent == nullptr)
     {
         delete poFilename;
-        if (f)
-            VSIFCloseL(f);
     }
 }
 

From be32e422c710000c698a1f6cb47c157b7fa7f50c Mon Sep 17 00:00:00 2001
From: Even Rouault <even.rouault@spatialys.com>
Date: Thu, 12 Dec 2019 23:40:14 +0100
Subject: [PATCH 435/488] XLSX: avoid Invalid-enum-value error. Fixes
 https://bugs.chromium.org/p/oss-fuzz/issues/detail?id=19337

---
 gdal/ogr/ogrsf_frmts/xlsx/ogr_xlsx.h          |  3 ++
 .../ogrsf_frmts/xlsx/ogrxlsxdatasource.cpp    | 43 ++++++-------------
 2 files changed, 16 insertions(+), 30 deletions(-)

diff --git a/gdal/ogr/ogrsf_frmts/xlsx/ogr_xlsx.h b/gdal/ogr/ogrsf_frmts/xlsx/ogr_xlsx.h
index 8972804c4e5c..b4a9ac5e1529 100644
--- a/gdal/ogr/ogrsf_frmts/xlsx/ogr_xlsx.h
+++ b/gdal/ogr/ogrsf_frmts/xlsx/ogr_xlsx.h
@@ -49,12 +49,15 @@ class OGRXLSXDataSource;
 
 class OGRXLSXLayer final: public OGRMemLayer
 {
+    friend class OGRXLSXDataSource;
+
     bool               bInit;
     OGRXLSXDataSource* poDS;
     CPLString          osFilename;
     void               Init();
     bool               bUpdated;
     bool               bHasHeaderLine;
+    std::set<int>      oSetFieldsOfUnknownType{};
 
   public:
         OGRXLSXLayer( OGRXLSXDataSource* poDSIn,
diff --git a/gdal/ogr/ogrsf_frmts/xlsx/ogrxlsxdatasource.cpp b/gdal/ogr/ogrsf_frmts/xlsx/ogrxlsxdatasource.cpp
index f99fb9f44d17..f478b4c477ea 100644
--- a/gdal/ogr/ogrsf_frmts/xlsx/ogrxlsxdatasource.cpp
+++ b/gdal/ogr/ogrsf_frmts/xlsx/ogrxlsxdatasource.cpp
@@ -732,26 +732,6 @@ void OGRXLSXDataSource::endElementTable(CPL_UNUSED const char *pszNameIn)
 
         if (poCurLayer)
         {
-            /* Ensure that any fields still with an unknown type are set to String.
-             * This will only be the case if the field has no values */
-       
-            for( size_t i = 0; i < apoFirstLineValues.size(); i++ )
-            {
-                OGRFieldType eFieldType =
-                    poCurLayer->GetLayerDefn()->GetFieldDefn(static_cast<int>(i))->GetType();
-
-                if (eFieldType == OGRUnknownType)
-                {
-                    OGRFieldDefn oNewFieldDefn(
-                        poCurLayer->GetLayerDefn()->GetFieldDefn(static_cast<int>(i)));
-
-                    oNewFieldDefn.SetType(OFTString);
-                    poCurLayer->AlterFieldDefn(static_cast<int>(i), &oNewFieldDefn,
-                                                ALTER_TYPE_FLAG);
-
-                }
-            }
-
             ((OGRMemLayer*)poCurLayer)->SetUpdatable(CPL_TO_BOOL(bUpdatable));
             ((OGRMemLayer*)poCurLayer)->SetAdvertizeUTF8(true);
             ((OGRXLSXLayer*)poCurLayer)->SetUpdated(false);
@@ -875,16 +855,23 @@ void OGRXLSXDataSource::endElementRow(CPL_UNUSED const char *pszNameIn)
                     const char* pszFieldName = apoFirstLineValues[i].c_str();
                     if (pszFieldName[0] == '\0')
                         pszFieldName = CPLSPrintf("Field%d", (int)i + 1);
-                    OGRFieldType eType = OGRUnknownType;
+                    bool bUnknownType = true;
+                    OGRFieldType eType = OFTString;
                     OGRFieldSubType eSubType = OFSTNone;
                     if (i < apoCurLineValues.size() && !apoCurLineValues[i].empty())
                     {
                         eType = GetOGRFieldType(apoCurLineValues[i].c_str(),
                                                 apoCurLineTypes[i].c_str(),
                                                 eSubType);
+                        bUnknownType = false;
                     }
                     OGRFieldDefn oFieldDefn(pszFieldName, eType);
                     oFieldDefn.SetSubType(eSubType);
+                    if( bUnknownType)
+                    {
+                        poCurLayer->oSetFieldsOfUnknownType.insert(
+                            poCurLayer->GetLayerDefn()->GetFieldCount());
+                    }
                     if( poCurLayer->CreateField(&oFieldDefn) != OGRERR_NONE )
                     {
                         return;
@@ -973,17 +960,13 @@ void OGRXLSXDataSource::endElementRow(CPL_UNUSED const char *pszNameIn)
                         OGRFieldDefn* poFieldDefn =
                             poCurLayer->GetLayerDefn()->GetFieldDefn(static_cast<int>(i));
                         const OGRFieldType eFieldType = poFieldDefn->GetType();
-                        if (eFieldType == OGRUnknownType)
+                        auto oIter = poCurLayer->oSetFieldsOfUnknownType.find(static_cast<int>(i));
+                        if (oIter != poCurLayer->oSetFieldsOfUnknownType.end() )
                         {
-                            /* If the field type is unknown we have not encountered a value in the field yet so
-                             * set the field type to this elements type */
-                            OGRFieldDefn oNewFieldDefn(poFieldDefn);
-
-                            oNewFieldDefn.SetType(eValType);
-                            oNewFieldDefn.SetSubType(eValSubType);
-                            poCurLayer->AlterFieldDefn(static_cast<int>(i), &oNewFieldDefn,
-                                                       ALTER_TYPE_FLAG);
+                            poCurLayer->oSetFieldsOfUnknownType.erase(oIter);
 
+                            poFieldDefn->SetType(eValType);
+                            poFieldDefn->SetSubType(eValSubType);
                         }
                         else if (eFieldType == OFTDateTime &&
                             (eValType == OFTDate || eValType == OFTTime) )

From 8ac7e543650117616f1c28f8f62e3b8a54e4ae46 Mon Sep 17 00:00:00 2001
From: Even Rouault <even.rouault@spatialys.com>
Date: Fri, 13 Dec 2019 01:05:26 +0100
Subject: [PATCH 436/488] VRT: avoid Invalid-enum-value behaviour. Fixes
 https://bugs.chromium.org/p/oss-fuzz/issues/detail?id=19391

---
 gdal/frmts/vrt/vrtsources.cpp | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/gdal/frmts/vrt/vrtsources.cpp b/gdal/frmts/vrt/vrtsources.cpp
index 5abfd9c8fe80..3722c10fe9bb 100644
--- a/gdal/frmts/vrt/vrtsources.cpp
+++ b/gdal/frmts/vrt/vrtsources.cpp
@@ -618,9 +618,7 @@ CPLErr VRTSimpleSource::XMLInit( CPLXMLNode *psSrc, const char *pszVRTPath,
     CPLXMLNode* psSrcProperties = CPLGetXMLNode(psSrc,"SourceProperties");
     int nRasterXSize = 0;
     int nRasterYSize = 0;
-    // TODO(schwehr): What is the difference between 0 (GDT_Unknown) and -1?
-    // Does there need to be a GDT_Uninitialized?
-    GDALDataType eDataType = static_cast<GDALDataType>(-1);
+    GDALDataType eDataType = GDT_Unknown;
     int nBlockXSize = 0;
     int nBlockYSize = 0;
     if( psSrcProperties )
@@ -664,7 +662,7 @@ CPLErr VRTSimpleSource::XMLInit( CPLXMLNode *psSrc, const char *pszVRTPath,
 
     GDALDataset *poSrcDS = nullptr;
     if( nRasterXSize == 0 || nRasterYSize == 0 ||
-        eDataType == static_cast<GDALDataType>(-1) ||
+        eDataType == GDT_Unknown ||
         nBlockXSize == 0 || nBlockYSize == 0 )
     {
         /* ----------------------------------------------------------------- */

From 0dca675c224394ba3ba512cd29906a88ebf1afd8 Mon Sep 17 00:00:00 2001
From: Even Rouault <even.rouault@spatialys.com>
Date: Fri, 13 Dec 2019 13:33:52 +0100
Subject: [PATCH 437/488] Fix compilation

---
 gdal/ogr/ogrsf_frmts/xlsx/ogr_xlsx.h | 1 +
 1 file changed, 1 insertion(+)

diff --git a/gdal/ogr/ogrsf_frmts/xlsx/ogr_xlsx.h b/gdal/ogr/ogrsf_frmts/xlsx/ogr_xlsx.h
index b4a9ac5e1529..36b44d4f5b27 100644
--- a/gdal/ogr/ogrsf_frmts/xlsx/ogr_xlsx.h
+++ b/gdal/ogr/ogrsf_frmts/xlsx/ogr_xlsx.h
@@ -38,6 +38,7 @@
 #include <vector>
 #include <string>
 #include <map>
+#include <set>
 
 namespace OGRXLSX {
 

From b233548864a453ada29dd1b0fe77845cb4fb5e64 Mon Sep 17 00:00:00 2001
From: Even Rouault <even.rouault@spatialys.com>
Date: Sun, 15 Dec 2019 12:56:42 +0100
Subject: [PATCH 438/488] DXF: fix handling of SPLINE whose first knot is at a
 very very close to zero negative (fixes #1969)

Fix inspired from @igorthy 's analysis of the issue.

This is related to e1ab235e921a68d6478060eb45b4655dd788ffc0 which
has introduced support for SPLINE whose knot vector doesn't start at 0,
which number of other DXF parsers don't support.
---
 autotest/ogr/ogr_dxf.py                  | 17 +++++++++++++++++
 gdal/ogr/ogrsf_frmts/dxf/ogrdxflayer.cpp | 12 ++++++++++--
 2 files changed, 27 insertions(+), 2 deletions(-)

diff --git a/autotest/ogr/ogr_dxf.py b/autotest/ogr/ogr_dxf.py
index 2be697036d9d..820e5a787181 100644
--- a/autotest/ogr/ogr_dxf.py
+++ b/autotest/ogr/ogr_dxf.py
@@ -3483,6 +3483,23 @@ def test_ogr_dxf_write_geometry_collection_of_unsupported_type():
     ds = None
     gdal.Unlink(tmpfile)
 
+
+###############################################################################
+# Test fix for https://github.com/OSGeo/gdal/issues/1969
+# with a SPLINE whose first knot is a very close to zero negative value.
+
+def test_ogr_dxf_very_close_neg_to_zero_knot():
+
+    ds = ogr.Open('data/spline_with_very_close_neg_to_zero_knot.dxf')
+    lyr = ds.GetLayer(0)
+
+    f = lyr.GetNextFeature()
+    g = f.GetGeometryRef()
+    extent = g.GetEnvelope()
+    assert extent == pytest.approx((163.0306017054786, 166.6530957511469,
+                                    78.40469559017359, 81.82569418640966), abs=1e-5)
+
+
 ###############################################################################
 # cleanup
 
diff --git a/gdal/ogr/ogrsf_frmts/dxf/ogrdxflayer.cpp b/gdal/ogr/ogrsf_frmts/dxf/ogrdxflayer.cpp
index 48117e4d785d..ef22eabfb70d 100644
--- a/gdal/ogr/ogrsf_frmts/dxf/ogrdxflayer.cpp
+++ b/gdal/ogr/ogrsf_frmts/dxf/ogrdxflayer.cpp
@@ -2096,8 +2096,16 @@ OGRDXFFeature *OGRDXFLayer::TranslateSPLINE()
             break;
 
           case 40:
-            adfKnots.push_back( CPLAtof(szLineBuf) );
-            break;
+          {
+            double dfVal = CPLAtof(szLineBuf);
+            // Ad-hoc fix for https://github.com/OSGeo/gdal/issues/1969
+            // where the first knot is at a very very close to zero negative
+            // value and following knots are at 0.
+            if( dfVal < 0 && dfVal > -1.0e-10 )
+                dfVal = 0;
+            adfKnots.push_back(dfVal);
+            break;
+          }
 
           case 41:
             adfWeights.push_back( CPLAtof(szLineBuf) );

From 8ae9e1e721ac8c442b8092ca18d1e7b3e91eb9b4 Mon Sep 17 00:00:00 2001
From: Even Rouault <even.rouault@spatialys.com>
Date: Sun, 15 Dec 2019 15:03:00 +0100
Subject: [PATCH 439/488] Commit forgotten file

---
 ...pline_with_very_close_neg_to_zero_knot.dxf | 86 +++++++++++++++++++
 1 file changed, 86 insertions(+)
 create mode 100644 autotest/ogr/data/spline_with_very_close_neg_to_zero_knot.dxf

diff --git a/autotest/ogr/data/spline_with_very_close_neg_to_zero_knot.dxf b/autotest/ogr/data/spline_with_very_close_neg_to_zero_knot.dxf
new file mode 100644
index 000000000000..88af30206647
--- /dev/null
+++ b/autotest/ogr/data/spline_with_very_close_neg_to_zero_knot.dxf
@@ -0,0 +1,86 @@
+  0
+SECTION
+  2
+ENTITIES
+  0
+SPLINE
+  5
+3BF
+330
+2
+100
+AcDbEntity
+  8
+SHOP
+100
+AcDbSpline
+210
+0.0
+220
+0.0
+230
+1.0
+ 70
+     8
+ 71
+     3
+ 72
+     9
+ 73
+     5
+ 74
+     0
+ 42
+0.000000001
+ 43
+0.0000000001
+ 40
+-0.0000000000003402
+ 40
+0.0
+ 40
+0.0
+ 40
+0.0
+ 40
+4.16829281711858
+ 40
+5.04540990028174
+ 40
+5.04540990028174
+ 40
+5.04540990028174
+ 40
+5.04540990028174
+ 10
+166.6530957511469
+ 20
+78.40469559017359
+ 30
+0.0
+ 10
+165.4868972520812
+ 20
+79.24271654461697
+ 30
+0.0
+ 10
+164.0753002959568
+ 20
+80.25707887607907
+ 30
+0.0
+ 10
+163.173127540998
+ 20
+81.58610358109488
+ 30
+0.0
+ 10
+163.0306017054786
+ 20
+81.82569418640966
+ 30
+0.0
+  0
+ENDSEC

From ed3ac13045e1e0f6de41cbf1d5ea654f682c5b11 Mon Sep 17 00:00:00 2001
From: Even Rouault <even.rouault@spatialys.com>
Date: Wed, 18 Dec 2019 13:19:04 +0100
Subject: [PATCH 440/488] OGRGeometryFactory::ForceTo(): fix crash when forcing
 a MultiPolygon Z/M/ZM to a CompoundCurve (fixes #2120)

---
 autotest/ogr/ogr_geom.py | 8 +++++---
 gdal/ogr/ogrcurve.cpp    | 2 +-
 2 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/autotest/ogr/ogr_geom.py b/autotest/ogr/ogr_geom.py
index 281da6586b64..e3310db9d833 100755
--- a/autotest/ogr/ogr_geom.py
+++ b/autotest/ogr/ogr_geom.py
@@ -3272,8 +3272,10 @@ def test_ogr_geom_create_from_wkt_polyhedrasurface():
     assert g.ExportToWkt() == 'POLYHEDRALSURFACE Z (((0 0 0,0 0 1,0 1 1,0 1 0,0 0 0)))'
 
 ###############################################################################
-# cleanup
 
 
-def test_ogr_geom_cleanup():
-    pass
+def test_ogr_geom_force_multipolygon_z_to_compound_curve():
+
+    g = ogr.CreateGeometryFromWkt('MULTIPOLYGON Z (((0 0 0,0 1 0,1 1 0,0 0 0)))')
+    g = ogr.ForceTo(g, ogr.wkbCompoundCurve)
+    assert g.ExportToIsoWkt() == 'COMPOUNDCURVE Z ((0 0 0,0 1 0,1 1 0,0 0 0))'
diff --git a/gdal/ogr/ogrcurve.cpp b/gdal/ogr/ogrcurve.cpp
index 55e2a619a107..420d11708e7c 100644
--- a/gdal/ogr/ogrcurve.cpp
+++ b/gdal/ogr/ogrcurve.cpp
@@ -322,7 +322,7 @@ OGRBoolean OGRCurve::IsConvex() const
 OGRCompoundCurve* OGRCurve::CastToCompoundCurve( OGRCurve* poCurve )
 {
     OGRCompoundCurve* poCC = new OGRCompoundCurve();
-    if( poCurve->getGeometryType() == wkbLineString )
+    if( wkbFlatten(poCurve->getGeometryType()) == wkbLineString )
         poCurve = CastToLineString(poCurve);
     if( !poCurve->IsEmpty() && poCC->addCurveDirectly(poCurve) != OGRERR_NONE )
     {

From 888775cfc3d1ac5e9725716e92d21cdac66ffe72 Mon Sep 17 00:00:00 2001
From: Even Rouault <even.rouault@spatialys.com>
Date: Mon, 30 Dec 2019 02:46:39 +0100
Subject: [PATCH 441/488] GDALUnrolledCopy<GByte,2,1>: fix SSE2-only
 implementation

(when SSSE3 is not available)

Fix issue reported on https://lists.osgeo.org/pipermail/gdal-dev/2019-December/051371.html
---
 autotest/cpp/testcopywords.cpp | 8 ++++----
 gdal/gcore/rasterio.cpp        | 5 +++--
 2 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/autotest/cpp/testcopywords.cpp b/autotest/cpp/testcopywords.cpp
index ef928edad542..15ad8caa57dc 100644
--- a/autotest/cpp/testcopywords.cpp
+++ b/autotest/cpp/testcopywords.cpp
@@ -630,7 +630,7 @@ int main(int /* argc */, char* /* argv */ [])
             memset(pIn, 0xff, 256);
             for(int i=0;i<17;i++)
             {
-                pIn[spacing*i] = (GByte)i;
+                pIn[spacing*i] = (GByte)(17-i);
             }
             memset(pOut, 0xff, 256);
             GDALCopyWords(pIn, GDT_Byte, spacing,
@@ -638,21 +638,21 @@ int main(int /* argc */, char* /* argv */ [])
                         17);
             for(int i=0;i<17;i++)
             {
-                AssertRes(GDT_Byte, i, GDT_Byte, i, pOut[i], __LINE__);
+                AssertRes(GDT_Byte, 17-i, GDT_Byte, 17-i, pOut[i], __LINE__);
             }
 
             memset(pIn, 0xff, 256);
             memset(pOut, 0xff, 256);
             for(int i=0;i<17;i++)
             {
-                pIn[i] = (GByte)i;
+                pIn[i] = (GByte)(17-i);
             }
             GDALCopyWords(pIn, GDT_Byte, 1,
                         pOut, GDT_Byte, spacing,
                         17);
             for(int i=0;i<17;i++)
             {
-                AssertRes(GDT_Byte, i, GDT_Byte, i, pOut[i*spacing], __LINE__);
+                AssertRes(GDT_Byte, 17-i, GDT_Byte, 17-i, pOut[i*spacing], __LINE__);
                 for(int j=1;j<spacing;j++)
                 {
                     AssertRes(GDT_Byte, 0xff, GDT_Byte, 0xff, pOut[i*spacing+j], __LINE__);
diff --git a/gdal/gcore/rasterio.cpp b/gdal/gcore/rasterio.cpp
index 0ae54cb61d1d..8d6aea70ace9 100644
--- a/gdal/gcore/rasterio.cpp
+++ b/gdal/gcore/rasterio.cpp
@@ -2899,6 +2899,7 @@ template<> void GDALUnrolledCopy<GByte,2,1>( GByte* CPL_RESTRICT pDest,
         }
 #endif
 
+        const __m128i xmm_zero = _mm_setzero_si128();
         const __m128i xmm_mask = _mm_set1_epi16(0xff);
         // If we were sure that there would always be 1 trailing byte, we could
         // check against nIters - 15
@@ -2910,8 +2911,8 @@ template<> void GDALUnrolledCopy<GByte,2,1>( GByte* CPL_RESTRICT pDest,
             xmm0 = _mm_and_si128(xmm0, xmm_mask);
             xmm1 = _mm_and_si128(xmm1, xmm_mask);
             // Pack int16 to uint8
-            xmm0 = _mm_packus_epi16(xmm0, xmm0);
-            xmm1 = _mm_packus_epi16(xmm1, xmm1);
+            xmm0 = _mm_packus_epi16(xmm0, xmm_zero);
+            xmm1 = _mm_packus_epi16(xmm1, xmm_zero);
 
             // Move 64 lower bits of xmm1 to 64 upper bits of xmm0
             xmm1 = _mm_slli_si128(xmm1, 8);

From a271dab0b35ef02eef71e66e5eeae3b05502ecad Mon Sep 17 00:00:00 2001
From: Even Rouault <even.rouault@spatialys.com>
Date: Mon, 30 Dec 2019 13:20:40 +0100
Subject: [PATCH 442/488] COASP: fix crash on invalid filename. Fixes
 https://bugs.chromium.org/p/oss-fuzz/issues/detail?id=19740

---
 gdal/frmts/coasp/coasp_dataset.cpp | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/gdal/frmts/coasp/coasp_dataset.cpp b/gdal/frmts/coasp/coasp_dataset.cpp
index 1f6e18558dc3..40225347b0c7 100644
--- a/gdal/frmts/coasp/coasp_dataset.cpp
+++ b/gdal/frmts/coasp/coasp_dataset.cpp
@@ -388,9 +388,6 @@ GDALDataset *COASPDataset::Open( GDALOpenInfo *poOpenInfo )
     /* Create a fresh dataset for us to work with */
     COASPDataset *poDS = new COASPDataset();
 
-    if (poDS == nullptr)
-        return nullptr;
-
     /* Steal the file pointer for the header */
     poDS->fpHdr = poOpenInfo->fpL;
     poOpenInfo->fpL = nullptr;
@@ -402,6 +399,13 @@ GDALDataset *COASPDataset::Open( GDALOpenInfo *poOpenInfo )
     char *pszDir = VSIStrdup(CPLGetPath(poDS->pszFileName));
     const char *pszExt = "rc";
     int nNull = static_cast<int>(strlen(pszBaseName)) - 1;
+    if( nNull <= 0 )
+    {
+        VSIFree(pszDir);
+        VSIFree(pszBaseName);
+        delete poDS;
+        return nullptr;
+    }
     char *pszBase = (char *)CPLMalloc(nNull);
     strncpy(pszBase, pszBaseName, nNull);
     pszBase[nNull - 1] = '\0';

From 9a7fc8e18589299605e4b8463d24faca400cdfb1 Mon Sep 17 00:00:00 2001
From: Even Rouault <even.rouault@spatialys.com>
Date: Sat, 4 Jan 2020 19:05:13 +0100
Subject: [PATCH 443/488] GeoJSONSeq & TopoJSON: avoid false positive detection
 and errors on unrelated http[s]:// filenames

---
 .../geojson/ogrgeojsondatasource.cpp          |  4 +-
 .../ogrsf_frmts/geojson/ogrgeojsonreader.h    |  2 +-
 .../geojson/ogrgeojsonseqdriver.cpp           | 57 +++++++++++++++----
 .../ogrsf_frmts/geojson/ogrtopojsonreader.cpp | 14 ++++-
 4 files changed, 61 insertions(+), 16 deletions(-)

diff --git a/gdal/ogr/ogrsf_frmts/geojson/ogrgeojsondatasource.cpp b/gdal/ogr/ogrsf_frmts/geojson/ogrgeojsondatasource.cpp
index ef70174c3ccf..319870258e75 100644
--- a/gdal/ogr/ogrsf_frmts/geojson/ogrgeojsondatasource.cpp
+++ b/gdal/ogr/ogrsf_frmts/geojson/ogrgeojsondatasource.cpp
@@ -798,7 +798,9 @@ void OGRGeoJSONDataSource::LoadLayers(GDALOpenInfo* poOpenInfo,
             if( !ReadFromFile( poOpenInfo, pszUnprefixed ) )
                 return;
         }
-        OGRErr err = reader.Parse( pszGeoData_ );
+        OGRErr err = reader.Parse( pszGeoData_,
+            nSrcType == eGeoJSONSourceService &&
+            !STARTS_WITH_CI(poOpenInfo->pszFilename, "TopoJSON:") );
         if( OGRERR_NONE == err )
         {
             reader.ReadLayers( this );
diff --git a/gdal/ogr/ogrsf_frmts/geojson/ogrgeojsonreader.h b/gdal/ogr/ogrsf_frmts/geojson/ogrgeojsonreader.h
index d529ee441762..0001150cffc8 100644
--- a/gdal/ogr/ogrsf_frmts/geojson/ogrgeojsonreader.h
+++ b/gdal/ogr/ogrsf_frmts/geojson/ogrgeojsonreader.h
@@ -309,7 +309,7 @@ class OGRTopoJSONReader
     OGRTopoJSONReader();
     ~OGRTopoJSONReader();
 
-    OGRErr Parse( const char* pszText );
+    OGRErr Parse( const char* pszText, bool bLooseIdentification );
     void ReadLayers( OGRGeoJSONDataSource* poDS );
 
   private:
diff --git a/gdal/ogr/ogrsf_frmts/geojson/ogrgeojsonseqdriver.cpp b/gdal/ogr/ogrsf_frmts/geojson/ogrgeojsonseqdriver.cpp
index 159b2cfe1b35..239aed62eb6e 100644
--- a/gdal/ogr/ogrsf_frmts/geojson/ogrgeojsonseqdriver.cpp
+++ b/gdal/ogr/ogrsf_frmts/geojson/ogrgeojsonseqdriver.cpp
@@ -95,8 +95,7 @@ class OGRGeoJSONSeqLayer final: public OGRLayer
         GIntBig m_nTotalFeatures = 0;
         GIntBig m_nNextFID = 0;
 
-        void Init();
-        json_object* GetNextObject();
+        json_object* GetNextObject(bool bLooseIdentification);
 
     public:
         OGRGeoJSONSeqLayer(OGRGeoJSONSeqDataSource* poDS,
@@ -104,6 +103,8 @@ class OGRGeoJSONSeqLayer final: public OGRLayer
                            VSILFILE* fp);
         ~OGRGeoJSONSeqLayer();
 
+        bool Init(bool bLooseIdentification);
+
         void ResetReading() override;
         OGRFeature* GetNextFeature() override;
         OGRFeatureDefn* GetLayerDefn() override { return m_poFeatureDefn; }
@@ -255,8 +256,6 @@ OGRGeoJSONSeqLayer::OGRGeoJSONSeqLayer(OGRGeoJSONSeqDataSource* poDS,
     m_poFeatureDefn->Reference();
     m_poFeatureDefn->GetGeomFieldDefn(0)->SetSpatialRef(
         OGRSpatialReference::GetWGS84SRS());
-
-    Init();
 }
 
 /************************************************************************/
@@ -273,7 +272,7 @@ OGRGeoJSONSeqLayer::~OGRGeoJSONSeqLayer()
 /*                               Init()                                 */
 /************************************************************************/
 
-void OGRGeoJSONSeqLayer::Init()
+bool OGRGeoJSONSeqLayer::Init(bool bLooseIdentification)
 {
     if( STARTS_WITH(m_poDS->GetDescription(), "/vsimem/") ||
         !STARTS_WITH(m_poDS->GetDescription(), "/vsi") )
@@ -286,7 +285,7 @@ void OGRGeoJSONSeqLayer::Init()
 
     while( true )
     {
-        auto poObject = GetNextObject();
+        auto poObject = GetNextObject(bLooseIdentification);
         if( !poObject )
             break;
         if( OGRGeoJSONGetType(poObject) == GeoJSONObject::eFeature )
@@ -302,6 +301,8 @@ void OGRGeoJSONSeqLayer::Init()
     m_nFileSize = 0;
     m_nIter = 0;
     m_oReader.FinalizeLayerDefn( this, m_osFIDColumn );
+
+    return m_nTotalFeatures > 0;
 }
 
 /************************************************************************/
@@ -314,10 +315,13 @@ void OGRGeoJSONSeqLayer::ResetReading()
     // Undocumented: for testing purposes only
     const size_t nBufferSize = static_cast<size_t>(std::max(1,
         atoi(CPLGetConfigOption("OGR_GEOJSONSEQ_CHUNK_SIZE", "40960"))));
-    m_osBuffer.resize(nBufferSize);
+    const size_t nBufferSizeValidated =
+        nBufferSize > static_cast<size_t>(100 * 1000 * 1000) ?
+            static_cast<size_t>(100 * 1000 * 1000) : nBufferSize;
+    m_osBuffer.resize(nBufferSizeValidated);
     m_osFeatureBuffer.clear();
-    m_nPosInBuffer = nBufferSize;
-    m_nBufferValidSize = nBufferSize;
+    m_nPosInBuffer = nBufferSizeValidated;
+    m_nBufferValidSize = nBufferSizeValidated;
     m_nNextFID = 0;
 }
 
@@ -325,7 +329,7 @@ void OGRGeoJSONSeqLayer::ResetReading()
 /*                           GetNextObject()                            */
 /************************************************************************/
 
-json_object* OGRGeoJSONSeqLayer::GetNextObject()
+json_object* OGRGeoJSONSeqLayer::GetNextObject(bool bLooseIdentification)
 {
     m_osFeatureBuffer.clear();
     while( true )
@@ -390,6 +394,12 @@ json_object* OGRGeoJSONSeqLayer::GetNextObject()
             }
         }
 
+        while( !m_osFeatureBuffer.empty() &&
+               (m_osFeatureBuffer.back() == '\r' ||
+                m_osFeatureBuffer.back() == '\n')  )
+        {
+            m_osFeatureBuffer.resize(m_osFeatureBuffer.size()-1);
+        }
         if( !m_osFeatureBuffer.empty() )
         {
             json_object* poObject = nullptr;
@@ -400,6 +410,10 @@ json_object* OGRGeoJSONSeqLayer::GetNextObject()
                 return poObject;
             }
             json_object_put(poObject);
+            if( bLooseIdentification )
+            {
+                return nullptr;
+            }
         }
     }
 }
@@ -412,7 +426,7 @@ OGRFeature* OGRGeoJSONSeqLayer::GetNextFeature()
 {
     while( true )
     {
-        auto poObject = GetNextObject();
+        auto poObject = GetNextObject(false);
         if( !poObject )
             return nullptr;
         OGRFeature* poFeature;
@@ -712,7 +726,26 @@ bool OGRGeoJSONSeqDataSource::Open( GDALOpenInfo* poOpenInfo,
         return false;
     }
     SetDescription( poOpenInfo->pszFilename );
-    m_poLayer.reset(new OGRGeoJSONSeqLayer(this, osLayerName.c_str(), fp));
+    auto poLayer = new OGRGeoJSONSeqLayer(this, osLayerName.c_str(), fp);
+    const bool bLooseIdentification =
+        nSrcType == eGeoJSONSourceService &&
+        !STARTS_WITH_CI(poOpenInfo->pszFilename, "GeoJSONSeq:");
+    if( bLooseIdentification )
+    {
+        CPLPushErrorHandler(CPLQuietErrorHandler);
+    }
+    auto ret = poLayer->Init(bLooseIdentification);
+    if( bLooseIdentification )
+    {
+        CPLPopErrorHandler();
+        CPLErrorReset();
+    }
+    if( !ret )
+    {
+        delete poLayer;
+        return false;
+    }
+    m_poLayer.reset(poLayer);
     return true;
 }
 
diff --git a/gdal/ogr/ogrsf_frmts/geojson/ogrtopojsonreader.cpp b/gdal/ogr/ogrsf_frmts/geojson/ogrtopojsonreader.cpp
index 955f31f8b98d..270bea9ec427 100644
--- a/gdal/ogr/ogrsf_frmts/geojson/ogrtopojsonreader.cpp
+++ b/gdal/ogr/ogrsf_frmts/geojson/ogrtopojsonreader.cpp
@@ -58,10 +58,20 @@ OGRTopoJSONReader::~OGRTopoJSONReader()
 /*                           Parse()                                    */
 /************************************************************************/
 
-OGRErr OGRTopoJSONReader::Parse( const char* pszText )
+OGRErr OGRTopoJSONReader::Parse( const char* pszText, bool bLooseIdentification )
 {
     json_object *jsobj = nullptr;
-    if( nullptr != pszText && !OGRJSonParse(pszText, &jsobj, true) )
+    if( bLooseIdentification )
+    {
+        CPLPushErrorHandler(CPLQuietErrorHandler);
+    }
+    const bool bOK = nullptr != pszText && OGRJSonParse(pszText, &jsobj, true);
+    if( bLooseIdentification )
+    {
+        CPLPopErrorHandler();
+        CPLErrorReset();
+    }
+    if( !bOK )
     {
         return OGRERR_CORRUPT_DATA;
     }

From a73afe3bfaab775a408d04d9e2fbb9e6c06d385f Mon Sep 17 00:00:00 2001
From: Dmitry Baryshnikov <bishop.dev@gmail.com>
Date: Sun, 5 Jan 2020 15:06:09 +0300
Subject: [PATCH 444/488] CAD: Fix read ellipse and arc (fix #1886).

---
 autotest/ogr/ogr_cad.py                  |  4 +-
 gdal/ogr/ogrsf_frmts/cad/ogrcadlayer.cpp | 74 ++++++++++++++++++------
 2 files changed, 60 insertions(+), 18 deletions(-)

diff --git a/autotest/ogr/ogr_cad.py b/autotest/ogr/ogr_cad.py
index 1f183154b9b1..bc9f31b8a3b4 100755
--- a/autotest/ogr/ogr_cad.py
+++ b/autotest/ogr/ogr_cad.py
@@ -10,7 +10,7 @@
 #  The MIT License (MIT)
 #
 #  Copyright (c) 2016 Alexandr Borzykh
-#  Copyright (c) 2016, NextGIS <info@nextgis.com>
+#  Copyright (c) 2016-2019, NextGIS <info@nextgis.com>
 #
 #  Permission is hereby granted, free of charge, to any person obtaining a copy
 #  of this software and associated documentation files (the "Software"), to deal
@@ -108,6 +108,8 @@ def test_ogr_cad_2():
     assert geom.GetGeometryType() == ogr.wkbLineString25D, \
         'did not get expected geometry type.'
 
+    assert geom.GetPointCount() > 2, 'cad geometry is invalid'
+
     gdaltest.cad_ds = None
 
 ###############################################################################
diff --git a/gdal/ogr/ogrsf_frmts/cad/ogrcadlayer.cpp b/gdal/ogr/ogrsf_frmts/cad/ogrcadlayer.cpp
index 8e6277957521..1ac79025233b 100644
--- a/gdal/ogr/ogrsf_frmts/cad/ogrcadlayer.cpp
+++ b/gdal/ogr/ogrsf_frmts/cad/ogrcadlayer.cpp
@@ -8,7 +8,7 @@
  *  The MIT License (MIT)
  *
  *  Copyright (c) 2016 Alexandr Borzykh
- *  Copyright (c) 2016, NextGIS <info@nextgis.com>
+ *  Copyright (c) 2016-2019, NextGIS <info@nextgis.com>
  *
  *  Permission is hereby granted, free of charge, to any person obtaining a copy
  *  of this software and associated documentation files (the "Software"), to deal
@@ -41,7 +41,7 @@
 #define FIELD_NAME_TEXT "text"
 
 constexpr double DEG2RAD = M_PI / 180.0;
-// UNUSED constexpr double RAD2DEG = 1.0 / DEG2RAD;
+constexpr double RAD2DEG = 1.0 / DEG2RAD;
 
 OGRCADLayer::OGRCADLayer( CADLayer &poCADLayer_, OGRSpatialReference *poSR,
                           int nEncoding) :
@@ -360,8 +360,8 @@ OGRFeature *OGRCADLayer::GetFeature( GIntBig nFID )
             OGRCircularString * poCircle = new OGRCircularString();
 
             // Need at least 3 points in arc
-            double dfStartAngle = poCADArc->getStartingAngle() * DEG2RAD;
-            double dfEndAngle = poCADArc->getEndingAngle() * DEG2RAD;
+            double dfStartAngle = poCADArc->getStartingAngle() * RAD2DEG;
+            double dfEndAngle = poCADArc->getEndingAngle() * RAD2DEG;
             double dfMidAngle = (dfEndAngle + dfStartAngle) / 2;
             CADVector stCircleCenter = poCADArc->getPosition();
 
@@ -568,7 +568,7 @@ OGRFeature *OGRCADLayer::GetFeature( GIntBig nFID )
                      * Get arc's starting angle.
                      */
                     double dfA = atan2( ( stOgrArcCenter.getY() - stCurrentVertex.getY() ),
-                                        ( stOgrArcCenter.getX() - stCurrentVertex.getX() ) ) * DEG2RAD;
+                                        ( stOgrArcCenter.getX() - stCurrentVertex.getX() ) ) * RAD2DEG;
                     if( bClockwise && ( dfLineDir == 1.0 ) )
                         dfA += ( dfLineDir * 180.0 );
 
@@ -579,7 +579,7 @@ OGRFeature *OGRCADLayer::GetFeature( GIntBig nFID )
                      * Get arc's ending angle.
                      */
                     dfA = atan2( ( stOgrArcCenter.getY() - stNextVertex.getY() ),
-                                 ( stOgrArcCenter.getX() - stNextVertex.getX() ) ) * DEG2RAD;
+                                 ( stOgrArcCenter.getX() - stNextVertex.getX() ) ) * RAD2DEG;
                     if( bClockwise && ( dfLineDir == 1.0 ) )
                         dfA += ( dfLineDir * 180.0 );
 
@@ -707,16 +707,15 @@ OGRFeature *OGRCADLayer::GetFeature( GIntBig nFID )
 
             // FIXME: Start/end angles should be swapped to work exactly as DXF driver.
             // is it correct?
-            double dfStartAngle = -1 * poCADEllipse->getEndingAngle() * DEG2RAD;
-            double dfEndAngle = -1 * poCADEllipse->getStartingAngle() * DEG2RAD;
-            double dfAxisRatio = poCADEllipse->getAxisRatio();
-
-            dfStartAngle = fmod(dfStartAngle, 360.0);
-            dfEndAngle = fmod(dfEndAngle, 360.0);
+            double dfStartAngle = poCADEllipse->getStartingAngle() * RAD2DEG;
+            double dfEndAngle = poCADEllipse->getEndingAngle() * RAD2DEG;
             if( dfStartAngle > dfEndAngle )
+            {
                 dfEndAngle += 360.0;
+            }
+            double dfAxisRatio = poCADEllipse->getAxisRatio();
 
-            CADVector vectPosition = poCADEllipse->getPosition();
+            CADVector stEllipseCenter = poCADEllipse->getPosition();
             CADVector vectSMAxis = poCADEllipse->getSMAxis();
             double dfPrimaryRadius, dfSecondaryRadius;
             double dfRotation;
@@ -726,11 +725,52 @@ OGRFeature *OGRCADLayer::GetFeature( GIntBig nFID )
 
             dfSecondaryRadius = dfAxisRatio * dfPrimaryRadius;
 
-            dfRotation = -1 * atan2( vectSMAxis.getY(), vectSMAxis.getX() ) * DEG2RAD;
+            dfRotation = -1 * atan2( vectSMAxis.getY(), vectSMAxis.getX() ) * RAD2DEG;
+            /* NOTE: alternative way:
+            OGRCircularString * poEllipse = new OGRCircularString();
+            OGRPoint  oEllipsePoint1;
+            oEllipsePoint1.setX( stEllipseCenter.getX() - dfPrimaryRadius *
+                                                            cos( dfRotation ) );
+            oEllipsePoint1.setY( stEllipseCenter.getY() + dfPrimaryRadius *
+                                                            sin( dfRotation ) );
+            oEllipsePoint1.setZ( stEllipseCenter.getZ() );
+            poEllipse->addPoint( &oEllipsePoint1 );
+
+            OGRPoint  oEllipsePoint2;
+            oEllipsePoint2.setX( stEllipseCenter.getX() + dfSecondaryRadius *
+                                                            cos( dfRotation ) );
+            oEllipsePoint2.setY( stEllipseCenter.getY() + dfSecondaryRadius *
+                                                            sin( dfRotation ) );
+            oEllipsePoint2.setZ( stEllipseCenter.getZ() );
+            poEllipse->addPoint( &oEllipsePoint2 );
+
+            OGRPoint  oEllipsePoint3;
+            oEllipsePoint3.setX( stEllipseCenter.getX() + dfPrimaryRadius *
+                                                            cos( dfRotation ) );
+            oEllipsePoint3.setY( stEllipseCenter.getY() - dfPrimaryRadius *
+                                                            sin( dfRotation ) );
+            oEllipsePoint3.setZ( stEllipseCenter.getZ() );
+            poEllipse->addPoint( &oEllipsePoint3 );
+
+            OGRPoint  oEllipsePoint4;
+            oEllipsePoint4.setX( stEllipseCenter.getX() - dfSecondaryRadius *
+                                                            cos( dfRotation ) );
+            oEllipsePoint4.setY( stEllipseCenter.getY() - dfSecondaryRadius *
+                                                            sin( dfRotation ) );
+            oEllipsePoint4.setZ( stEllipseCenter.getZ() );
+            poEllipse->addPoint( &oEllipsePoint4 );
+
+            // Close the ellipse
+            poEllipse->addPoint( &oEllipsePoint1 );
+            */
 
-            OGRGeometry *poEllipse =
-                OGRGeometryFactory::approximateArcAngles(
-                    vectPosition.getX(), vectPosition.getY(), vectPosition.getZ(),
+            CPLDebug("CAD", "Position: %f, %f, %f, radius %f/%f, start angle: %f, end angle: %f, rotation: %f",
+                stEllipseCenter.getX(), stEllipseCenter.getY(), stEllipseCenter.getZ(),
+                dfPrimaryRadius, dfSecondaryRadius, dfStartAngle, dfEndAngle, dfRotation
+            );
+            OGRGeometry *poEllipse = OGRGeometryFactory::approximateArcAngles(
+                    stEllipseCenter.getX(), stEllipseCenter.getY(),
+                    stEllipseCenter.getZ(),
                     dfPrimaryRadius, dfSecondaryRadius, dfRotation,
                     dfStartAngle, dfEndAngle, 0.0 );
 

From 2bd7c6ab26e7f88ca3f9ca4d7c8c0d16e19e56d9 Mon Sep 17 00:00:00 2001
From: Dmitry Baryshnikov <bishop.dev@gmail.com>
Date: Sun, 5 Jan 2020 16:40:39 +0300
Subject: [PATCH 445/488] CAD && SQLite: Removed unnecessary header include and
 changed strnlen to CPLStrnlen (fix #1920)

---
 gdal/ogr/ogrsf_frmts/cad/libopencad/dwg/r2000.cpp | 4 ----
 gdal/ogr/ogrsf_frmts/sqlite/ogrsqlitelayer.cpp    | 2 +-
 2 files changed, 1 insertion(+), 5 deletions(-)

diff --git a/gdal/ogr/ogrsf_frmts/cad/libopencad/dwg/r2000.cpp b/gdal/ogr/ogrsf_frmts/cad/libopencad/dwg/r2000.cpp
index 5517c3b58d4c..e5ceb2893388 100644
--- a/gdal/ogr/ogrsf_frmts/cad/libopencad/dwg/r2000.cpp
+++ b/gdal/ogr/ogrsf_frmts/cad/libopencad/dwg/r2000.cpp
@@ -53,10 +53,6 @@ template <typename T> std::string to_string(T val)
 }
 #endif
 
-#ifdef __APPLE__
-    #include <MacTypes.h>
-#endif
-
 #define UNKNOWN1 CADHeader::MAX_HEADER_CONSTANT + 1
 #define UNKNOWN2 CADHeader::MAX_HEADER_CONSTANT + 2
 #define UNKNOWN3 CADHeader::MAX_HEADER_CONSTANT + 3
diff --git a/gdal/ogr/ogrsf_frmts/sqlite/ogrsqlitelayer.cpp b/gdal/ogr/ogrsf_frmts/sqlite/ogrsqlitelayer.cpp
index 68564e65f341..daaedbe3e0de 100644
--- a/gdal/ogr/ogrsf_frmts/sqlite/ogrsqlitelayer.cpp
+++ b/gdal/ogr/ogrsf_frmts/sqlite/ogrsqlitelayer.cpp
@@ -138,7 +138,7 @@ bool OGRGetDateTimeFieldType( const char* pszValue,
                               OGRFieldType* pFieldType )
 {
     bool bSuccess = FALSE;
-    size_t nValueLength = strnlen( pszValue, 16 );
+    size_t nValueLength = CPLStrnlen( pszValue, 16 );
 
     if( nValueLength >= 5 )
     {

From df645e26df675043c6d619a49af458e3b8913ec7 Mon Sep 17 00:00:00 2001
From: Even Rouault <even.rouault@spatialys.com>
Date: Sun, 5 Jan 2020 20:20:19 +0100
Subject: [PATCH 446/488] WFS: skip silently GeoServer EPSG:404000 dummy CRS

---
 gdal/ogr/ogrsf_frmts/wfs/ogrwfsdatasource.cpp | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/gdal/ogr/ogrsf_frmts/wfs/ogrwfsdatasource.cpp b/gdal/ogr/ogrsf_frmts/wfs/ogrwfsdatasource.cpp
index 46bcb7e5315b..1c8d13b2a54e 100644
--- a/gdal/ogr/ogrsf_frmts/wfs/ogrwfsdatasource.cpp
+++ b/gdal/ogr/ogrsf_frmts/wfs/ogrwfsdatasource.cpp
@@ -1358,7 +1358,11 @@ int OGRWFSDataSource::Open( const char * pszFilename, int bUpdateIn,
                     pszDefaultSRS = osSRSName.c_str();
                 }
 
-                if (pszDefaultSRS)
+                // EPSG:404000 is a GeoServer joke to indicate a unknown SRS
+                // https://osgeo-org.atlassian.net/browse/GEOS-8993
+                if (pszDefaultSRS &&
+                    !EQUAL(pszDefaultSRS, "EPSG:404000") &&
+                    !EQUAL(pszDefaultSRS, "urn:ogc:def:crs:EPSG::404000"))
                 {
                     OGRSpatialReference oSRS;
                     if (oSRS.SetFromUserInput(pszDefaultSRS) == OGRERR_NONE)

From 5204c9e0a12420137ce9af88197f0a81e8ea9842 Mon Sep 17 00:00:00 2001
From: Even Rouault <even.rouault@spatialys.com>
Date: Mon, 6 Jan 2020 22:17:34 +0100
Subject: [PATCH 447/488] HFA: fix writing of compressed file when a RLE run
 count is in the [0x4000,0x8000[ range or [0x400000, 0x800000[ (fixes #2150)

---
 autotest/gcore/hfa_write.py    | 11 +++++++++++
 gdal/frmts/hfa/hfacompress.cpp |  4 ++--
 2 files changed, 13 insertions(+), 2 deletions(-)

diff --git a/autotest/gcore/hfa_write.py b/autotest/gcore/hfa_write.py
index 3c96e23dc7b4..f31fd5b588d3 100755
--- a/autotest/gcore/hfa_write.py
+++ b/autotest/gcore/hfa_write.py
@@ -418,5 +418,16 @@ def test_hfa_create_compress(filename, checksum, testfunction):
     getattr(ut, testfunction)()
 
 
+def test_hfa_create_compress_big_block():
+    src_ds = gdal.GetDriverByName('MEM').Create('/vsimem/big_block.img', 128, 128, 1, gdal.GDT_UInt32)
+    src_ds.GetRasterBand(1).Fill(4 * 1000 * 1000 * 1000)
+    src_ds.GetRasterBand(1).WriteRaster(0,0,1,1,b'\0')
+    gdal.GetDriverByName('HFA').CreateCopy('/vsimem/big_block.img', src_ds, options=['COMPRESS=YES', 'BLOCKSIZE=128'])
+    ds = gdal.Open('/vsimem/big_block.img')
+    got_data = ds.GetRasterBand(1).ReadRaster()
+    ds = None
+    gdal.Unlink('/vsimem/big_block.img')
+    assert got_data == src_ds.GetRasterBand(1).ReadRaster()
+
 
 
diff --git a/gdal/frmts/hfa/hfacompress.cpp b/gdal/frmts/hfa/hfacompress.cpp
index 7a870e377fdc..cfe73d12fbf8 100644
--- a/gdal/frmts/hfa/hfacompress.cpp
+++ b/gdal/frmts/hfa/hfacompress.cpp
@@ -182,14 +182,14 @@ void HFACompress::makeCount( GUInt32 count, GByte *pCounter,
         pCounter[0] = static_cast<GByte>(count);
         *pnSizeCount = 1;
     }
-    else if( count < 0x8000 )
+    else if( count < 0x4000 )
     {
         pCounter[1] = count & 0xff;
         count /= 256;
         pCounter[0] = static_cast<GByte>(count | 0x40);
         *pnSizeCount = 2;
     }
-    else if( count < 0x800000 )
+    else if( count < 0x400000 )
     {
         pCounter[2] = count & 0xff;
         count /= 256;

From cc27493f30b92be75225dce69e2e6920603c1636 Mon Sep 17 00:00:00 2001
From: Even Rouault <even.rouault@spatialys.com>
Date: Tue, 7 Jan 2020 21:15:46 +0100
Subject: [PATCH 448/488] gdal_fillnodata.py/GDALFillNodata: fix crash when
 smooth_iterations is used, and with some progress functions such as the one
 used by Python (fixes #1184)

---
 gdal/alg/rasterfill.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/gdal/alg/rasterfill.cpp b/gdal/alg/rasterfill.cpp
index 761b621974db..c1c1548183b2 100644
--- a/gdal/alg/rasterfill.cpp
+++ b/gdal/alg/rasterfill.cpp
@@ -867,7 +867,7 @@ GDALFillNodata( GDALRasterBandH hTargetBand,
         GDALFlushRasterCache( hMaskBand );
 
         void *pScaledProgress =
-            GDALCreateScaledProgress( dfProgressRatio, 1.0, pfnProgress, nullptr );
+            GDALCreateScaledProgress( dfProgressRatio, 1.0, pfnProgress, pProgressArg );
 
         eErr = GDALMultiFilter( hTargetBand, hMaskBand, hFiltMaskBand,
                                 nSmoothingIterations,

From 9b3d44bdefceb9e36066b17cbe6843ee81a8c9c6 Mon Sep 17 00:00:00 2001
From: EvertEt <evert.etienne@gmail.com>
Date: Mon, 16 Dec 2019 11:39:38 +0100
Subject: [PATCH 449/488] Fix gdal2tiles max cache setting

---
 gdal/swig/python/scripts/gdal2tiles.py | 14 +++++++++++++-
 1 file changed, 13 insertions(+), 1 deletion(-)

diff --git a/gdal/swig/python/scripts/gdal2tiles.py b/gdal/swig/python/scripts/gdal2tiles.py
index 106d4c8e8352..861f973eb259 100755
--- a/gdal/swig/python/scripts/gdal2tiles.py
+++ b/gdal/swig/python/scripts/gdal2tiles.py
@@ -484,6 +484,13 @@ def exit_with_error(message, details=""):
     sys.exit(2)
 
 
+def set_cache_max(cache_in_bytes):
+    # We set the maximum using `SetCacheMax` and `GDAL_CACHEMAX` to support both fork and spawn as multiprocessing start methods.
+    # https://github.com/OSGeo/gdal/pull/2112
+    os.environ['GDAL_CACHEMAX'] = '%d' % int(cache_in_bytes / 1024 / 1024)
+    gdal.SetCacheMax(cache_in_bytes)
+
+
 def generate_kml(tx, ty, tz, tileext, tile_size, tileswne, options, children=None, **args):
     """
     Template for the KML. Returns filled string.
@@ -2868,7 +2875,9 @@ def multi_threaded_tiling(input_file, output_folder, options):
     nb_processes = options.nb_processes or 1
 
     # Make sure that all processes do not consume more than `gdal.GetCacheMax()`
-    os.environ['GDAL_CACHEMAX'] = '%d' % max(1, int(gdal.GetCacheMax() / 1024 / 1024 / nb_processes))
+    gdal_cache_max = gdal.GetCacheMax()
+    gdal_cache_max_per_process = max(1024 * 1024, math.floor(gdal_cache_max / nb_processes))
+    set_cache_max(gdal_cache_max_per_process)
 
     (conf_receiver, conf_sender) = Pipe(False)
 
@@ -2904,6 +2913,9 @@ def multi_threaded_tiling(input_file, output_folder, options):
     if not options.verbose and not options.quiet:
         p.join()        # Traces done
 
+    # Set the maximum cache back to the original value
+    set_cache_max(gdal_cache_max)
+
     create_overview_tiles(conf, output_folder, options)
 
     shutil.rmtree(os.path.dirname(conf.src_file))

From b9cab5b422bb8d2d9cd8e60aa8bfab017fead392 Mon Sep 17 00:00:00 2001
From: Even Rouault <even.rouault@spatialys.com>
Date: Tue, 7 Jan 2020 23:17:02 +0100
Subject: [PATCH 450/488] Internal libtiff: tif_ojpeg.c: complementary fix for
 libtiff 4.1.0 regression

---
 gdal/frmts/gtiff/libtiff/tif_ojpeg.c | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/gdal/frmts/gtiff/libtiff/tif_ojpeg.c b/gdal/frmts/gtiff/libtiff/tif_ojpeg.c
index d1578626fc7d..10c42f62ef19 100644
--- a/gdal/frmts/gtiff/libtiff/tif_ojpeg.c
+++ b/gdal/frmts/gtiff/libtiff/tif_ojpeg.c
@@ -1056,6 +1056,8 @@ OJPEGReadHeaderInfo(TIFF* tif)
 	{
 		sp->strile_width=sp->image_width;
 		sp->strile_length=tif->tif_dir.td_rowsperstrip;
+                if( sp->strile_length == (uint32)-1 )
+                    sp->strile_length = sp->image_length;
 		sp->strile_length_total=sp->image_length;
 	}
 	if (tif->tif_dir.td_samplesperpixel==1)

From b513e307ad8833a9d38db170c101d81cc29b10c8 Mon Sep 17 00:00:00 2001
From: Even Rouault <even.rouault@spatialys.com>
Date: Sun, 29 Sep 2019 23:55:18 +0200
Subject: [PATCH 451/488] PDF: fix build against Poppler 0.82.0dev

---
 gdal/frmts/pdf/pdfdataset.cpp | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/gdal/frmts/pdf/pdfdataset.cpp b/gdal/frmts/pdf/pdfdataset.cpp
index ca835164bc66..48fb4be2a827 100644
--- a/gdal/frmts/pdf/pdfdataset.cpp
+++ b/gdal/frmts/pdf/pdfdataset.cpp
@@ -265,7 +265,12 @@ class GDALPDFOutputDev : public SplashOutputDev
 
         virtual void drawImage(GfxState *state, Object *ref, Stream *str,
                                int width, int height, GfxImageColorMap *colorMap,
-                               GBool interpolate, int *maskColors, GBool inlineImg) override
+                               GBool interpolate,
+#if POPPLER_MAJOR_VERSION >= 1 || POPPLER_MINOR_VERSION >= 82
+                               const
+#endif
+                               int *maskColors,
+                               GBool inlineImg) override
         {
             if (bEnableBitmap)
                 SplashOutputDev::drawImage(state, ref, str,

From 9df7a1cc7020df6ea8acb9ab077cd5cbd488e481 Mon Sep 17 00:00:00 2001
From: Even Rouault <even.rouault@spatialys.com>
Date: Tue, 22 Oct 2019 13:11:57 +0200
Subject: [PATCH 452/488] PDF: fix build against Poppler 0.82.0dev

---
 gdal/frmts/pdf/pdfdataset.cpp | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/gdal/frmts/pdf/pdfdataset.cpp b/gdal/frmts/pdf/pdfdataset.cpp
index 48fb4be2a827..8d4ad189b562 100644
--- a/gdal/frmts/pdf/pdfdataset.cpp
+++ b/gdal/frmts/pdf/pdfdataset.cpp
@@ -205,7 +205,11 @@ class GDALPDFOutputDev : public SplashOutputDev
         virtual void drawChar(GfxState *state, double x, double y,
                               double dx, double dy,
                               double originX, double originY,
-                              CharCode code, int nBytes, Unicode *u, int uLen) override
+                              CharCode code, int nBytes,
+#if POPPLER_MAJOR_VERSION >= 1 || POPPLER_MINOR_VERSION >= 82
+                              const
+#endif
+                              Unicode *u, int uLen) override
         {
             if (bEnableText)
                 SplashOutputDev::drawChar(state, x, y, dx, dy,

From a8eb15f94ddb7f606f38d133832389b1d085a62b Mon Sep 17 00:00:00 2001
From: Even Rouault <even.rouault@spatialys.com>
Date: Wed, 13 Nov 2019 14:07:22 +0100
Subject: [PATCH 453/488] PDF: fix build against Poppler 0.83.0dev

---
 gdal/frmts/pdf/pdfdataset.cpp | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/gdal/frmts/pdf/pdfdataset.cpp b/gdal/frmts/pdf/pdfdataset.cpp
index 8d4ad189b562..a6ec70e626a2 100644
--- a/gdal/frmts/pdf/pdfdataset.cpp
+++ b/gdal/frmts/pdf/pdfdataset.cpp
@@ -4075,7 +4075,13 @@ GDALDataset *PDFDataset::Open( GDALOpenInfo * poOpenInfo )
         CPLMutexHolderD(&hGlobalParamsMutex);
         /* poppler global variable */
         if (globalParams == nullptr)
+        {
+#if POPPLER_MAJOR_VERSION >= 1 || POPPLER_MINOR_VERSION >= 83
+            globalParams.reset(new GlobalParams());
+#else
             globalParams = new GlobalParams();
+#endif
+        }
 
         globalParams->setPrintCommands(CPLTestBool(
             CPLGetConfigOption("GDAL_PDF_PRINT_COMMANDS", "FALSE")));

From fbb9a62d3729619efae2331c8bfa55698eb2b5e1 Mon Sep 17 00:00:00 2001
From: Even Rouault <even.rouault@spatialys.com>
Date: Tue, 26 Nov 2019 14:33:32 +0100
Subject: [PATCH 454/488] PDF: fix to build against latest Poppler master
 (0.83dev)

---
 gdal/frmts/pdf/pdfio.cpp | 3 +++
 gdal/frmts/pdf/pdfio.h   | 7 ++++++-
 2 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/gdal/frmts/pdf/pdfio.cpp b/gdal/frmts/pdf/pdfio.cpp
index a8e3b5dfdf9f..094ad2e32016 100644
--- a/gdal/frmts/pdf/pdfio.cpp
+++ b/gdal/frmts/pdf/pdfio.cpp
@@ -168,6 +168,9 @@ getStart_ret_type VSIPDFFileStream::getStart()
 /************************************************************************/
 
 StreamKind VSIPDFFileStream::getKind()
+#if POPPLER_MAJOR_VERSION >= 1 || POPPLER_MINOR_VERSION >= 83
+                                        const
+#endif
 {
     return strFile;
 }
diff --git a/gdal/frmts/pdf/pdfio.h b/gdal/frmts/pdf/pdfio.h
index 50ceaa1e96e4..91562fdf455f 100644
--- a/gdal/frmts/pdf/pdfio.h
+++ b/gdal/frmts/pdf/pdfio.h
@@ -81,7 +81,12 @@ class VSIPDFFileStream final: public BaseStream
         virtual void       setPos(setPos_offset_type pos, int dir = 0) override;
         virtual void       moveStart(moveStart_delta_type delta) override;
 
-        virtual StreamKind getKind() override;
+        virtual StreamKind getKind()
+#if POPPLER_MAJOR_VERSION >= 1 || POPPLER_MINOR_VERSION >= 83
+            const
+#endif
+            override;
+
         virtual GooString *getFileName() override;
 
         virtual int        getChar() override;

From 9fe5e1ec60f76c95176297f1a4c1099f0f7a5d3e Mon Sep 17 00:00:00 2001
From: Even Rouault <even.rouault@spatialys.com>
Date: Wed, 8 Jan 2020 12:30:29 +0100
Subject: [PATCH 455/488] Prepare for GDAL 2.4.4

---
 gdal/GDALmake.opt.in               |  2 +-
 gdal/NEWS                          | 90 ++++++++++++++++++++++++++++++
 gdal/VERSION                       |  2 +-
 gdal/gcore/gdal_version.h.in       |  6 +-
 gdal/swig/include/perl/gdal_perl.i |  4 +-
 gdal/swig/include/perl/ogr_perl.i  |  2 +-
 gdal/swig/python/README.rst        |  2 +-
 gdal/swig/python/setup.py          |  2 +-
 8 files changed, 100 insertions(+), 10 deletions(-)

diff --git a/gdal/GDALmake.opt.in b/gdal/GDALmake.opt.in
index 80f0dacd9071..3e53767bf330 100644
--- a/gdal/GDALmake.opt.in
+++ b/gdal/GDALmake.opt.in
@@ -123,7 +123,7 @@ GDAL_INCLUDE	=	-I$(GDAL_ROOT)/port -I$(GDAL_ROOT)/gcore \
 # libtool targets and help variables
 LIBGDAL	:=		libgdal.la
 LIBGDAL_CURRENT	:=	25
-LIBGDAL_REVISION	:=	3
+LIBGDAL_REVISION	:=	4
 LIBGDAL_AGE	:=	5
 
 # native build targets and variables
diff --git a/gdal/NEWS b/gdal/NEWS
index 6d8d9360e062..f8f04cbe9f47 100644
--- a/gdal/NEWS
+++ b/gdal/NEWS
@@ -1,3 +1,93 @@
+= GDAL/OGR 2.4.4 Release Notes =
+
+The 2.4.4 release is a bug fix release.
+
+== Build ==
+
+ * Fix build against Poppler 0.82 and 0.83
+ * MacOSX builds: Removed unnecessary header include and changed strnlen to CPLStrnlen (#1920)
+
+== Port ==
+
+ * /vsicurl (and derived filesystems): fix concurrency issue with multithreaded reads (#1244)
+
+== Algorithms ==
+
+ * Contour algorithm: fix (over) precision issue when comparing pixel value to NoData on Float32 rasters (#1987)
+ * Multithreaded warper: make sure a transformer object is used by the thread which created it (#1989). This workarounds a PROJ bug also fixed per https://github.com/OSGeo/PROJ/pull/1726
+ * GDALFillNodata: fix crash when smooth_iterations is used, and with some progress functions such as the one used by Python (#1184)
+ * RPC transformer: test success code of GDALRPCTransform() in GDALCreateRPCTransformer()
+
+== GDAL core ==
+
+ * Block cache: fix corruption on multithreaded write on datasets (#2011)
+ * GDALUnrolledCopy<GByte,2,1>: fix SSE2-only implementation (when SSSE3 is not available)
+
+== GDAL utilities ==
+
+ * gdal2tiles: update cache calculation (#2020)
+
+== GDAL drivers ==
+
+COASP driver:
+ * fix crash on invalid filename. Fixes https://bugs.chromium.org/p/oss-fuzz/issues/detail?id=19740
+
+IRIS driver:
+ * make identification more restrictive to avoid false-positive identification of raw binary formats such as ENVI (#1961)
+
+GRIB driver:
+ * do not do erroneous K->C unit conversion for derived forecasts whose content is not a temperature, but a derived quantity, such as spread
+ * update GRIB tables to degrib 2.24
+ * add missing entries in MeteoAtmoChem table
+ * add more values from Table 4.5 in Surface type table
+ * add support for template 4.48 Optical Properties of Aerosol
+ * avoid erroneous K->C conversion for Dew point depression
+
+GTiff driver:
+ * internal libtiff: tif_ojpeg.c: fix regression of https://gitlab.com/libtiff/libtiff/issues/172
+
+HFA driver:
+ * fix writing of compressed file when a RLE run count is in the [0x4000,0x8000[ range or [0x400000, 0x800000[ (#2150)
+
+PDF driver:
+ * fix crash on corrupted file. Fixes https://bugs.chromium.org/p/oss-fuzz/issues/detail?id=19098
+ * fix use-after-free on some corrupted PDF files. Fixes https://bugs.chromium.org/p/oss-fuzz/issues/detail?id=19400
+
+PDS driver:
+ * fix opening of datasets with BSQ organization (or single band), where one band is larger than 2 GB (2.3 regression)
+ * nasakeywordhandler: fixes to be able to read some labels with metadata items whose value is a list on several lines
+
+VRT driver:
+ * VRT warp: do not fail if a block has no corresponding source pixels (#1985)
+ * fix requesting a downsampling version of the mask band of a source that has masks and overviews
+ * avoid Invalid-enum-value behaviour. Fixes https://bugs.chromium.org/p/oss-fuzz/issues/detail?id=19391
+
+== OGR core ==
+
+ * OGRLinearRing::isPointOnRingBoundary(): fix incomplete test that could falsely return true if the point was aligned with a segment, but not between the nodes. Impact correct reconstruction of holes in shapefile driver
+ * OGRGeometryFactory::ForceTo(): fix crash when forcing a MultiPolygon Z/M/ZM to a CompoundCurve (#2120)
+ * SQLite dialect: fix issue when using JOIN on a layer without fast filter count capability
+
+== OGR drivers ==
+
+CAD driver:
+ * Fix read ellipse and arc (fix #1886)
+
+DXF driver:
+ * fix handling of SPLINE whose first knot is at a very very close to zero negative (#1969)
+
+ElasticSearch driver:
+ * translate constructs like CAST(field_name AS CHARACTER[(x)]) = 'foo' to ES query language
+
+GeoJSONSeq & TopoJSON drivers:
+ * avoid false positive detection and errors on unrelated http[s]:// filenames
+
+XLSX driver:
+ * avoid Invalid-enum-value error. Fixes https://bugs.chromium.org/p/oss-fuzz/issues/detail?id=19337
+
+WFS driver:
+ * skip silently GeoServer EPSG:404000 dummy CRS
+
 = GDAL/OGR 2.4.3 Release Notes =
 
 The 2.4.3 release is a bug fix release.
diff --git a/gdal/VERSION b/gdal/VERSION
index 35cee72dcbf4..79a614418f74 100644
--- a/gdal/VERSION
+++ b/gdal/VERSION
@@ -1 +1 @@
-2.4.3
+2.4.4
diff --git a/gdal/gcore/gdal_version.h.in b/gdal/gcore/gdal_version.h.in
index f7c4ec52115d..6cbc68c87bf7 100644
--- a/gdal/gcore/gdal_version.h.in
+++ b/gdal/gcore/gdal_version.h.in
@@ -7,7 +7,7 @@
 #ifndef GDAL_VERSION_MAJOR
 #  define GDAL_VERSION_MAJOR    2
 #  define GDAL_VERSION_MINOR    4
-#  define GDAL_VERSION_REV      3
+#  define GDAL_VERSION_REV      4
 #  define GDAL_VERSION_BUILD    0
 #endif
 
@@ -24,9 +24,9 @@
 
 #if !defined(DO_NOT_DEFINE_GDAL_RELEASE_DATE_AND_GDAL_RELEASE_NAME)
 #ifndef GDAL_RELEASE_DATE
-#  define GDAL_RELEASE_DATE     20191028
+#  define GDAL_RELEASE_DATE     20200108
 #endif
 #ifndef GDAL_RELEASE_NAME
-#  define GDAL_RELEASE_NAME     "2.4.3"
+#  define GDAL_RELEASE_NAME     "2.4.4"
 #endif
 #endif
diff --git a/gdal/swig/include/perl/gdal_perl.i b/gdal/swig/include/perl/gdal_perl.i
index 6f37a074b574..f3d4b2fd916a 100644
--- a/gdal/swig/include/perl/gdal_perl.i
+++ b/gdal/swig/include/perl/gdal_perl.i
@@ -143,8 +143,8 @@ use Geo::GDAL::Const;
 # Note that the 1/100000 digits may be used to create more than one
 # CPAN release from one GDAL release.
 
-our $VERSION = '2.0403';
-our $GDAL_VERSION = '2.4.3';
+our $VERSION = '2.0404';
+our $GDAL_VERSION = '2.4.4';
 
 =pod
 
diff --git a/gdal/swig/include/perl/ogr_perl.i b/gdal/swig/include/perl/ogr_perl.i
index fca234e89d5b..8dcb99f2c0d6 100644
--- a/gdal/swig/include/perl/ogr_perl.i
+++ b/gdal/swig/include/perl/ogr_perl.i
@@ -126,7 +126,7 @@ ALTERED_DESTROY(OGRGeometryShadow, OGRc, delete_Geometry)
 %perlcode %{
 
 package Geo::OGR;
-our $VERSION = '2.0403'; # this needs to be the same as that in gdal_perl.i
+our $VERSION = '2.0404'; # this needs to be the same as that in gdal_perl.i
 
 Geo::GDAL->import(qw(:INTERNAL));
 
diff --git a/gdal/swig/python/README.rst b/gdal/swig/python/README.rst
index c0a615157c0b..6f0e0fe0e15d 100644
--- a/gdal/swig/python/README.rst
+++ b/gdal/swig/python/README.rst
@@ -16,7 +16,7 @@ reference documentation, but the `GDAL API Tutorial`_ includes Python examples.
 Dependencies
 ------------
  
- * libgdal (2.4.3 or greater) and header files (gdal-devel)
+ * libgdal (2.4.4 or greater) and header files (gdal-devel)
  * numpy (1.0.0 or greater) and header files (numpy-devel) (not explicitly 
    required, but many examples and utilities will not work without it)
 
diff --git a/gdal/swig/python/setup.py b/gdal/swig/python/setup.py
index 835b8179db7d..5d3c204e10a8 100644
--- a/gdal/swig/python/setup.py
+++ b/gdal/swig/python/setup.py
@@ -7,7 +7,7 @@
 # Howard Butler hobu.inc@gmail.com
 
 
-gdal_version = '2.4.3'
+gdal_version = '2.4.4'
 
 import sys
 import os

From 850479983bd94de8eec328486743b715423bdf4b Mon Sep 17 00:00:00 2001
From: Even Rouault <even.rouault@spatialys.com>
Date: Sat, 11 Jan 2020 23:11:05 +0100
Subject: [PATCH 456/488] PDF: fix null pointer dereference or infinite
 recursion/stack overflow on corrupted file. Fixes
 https://bugs.chromium.org/p/oss-fuzz/issues/detail?id=20033

---
 gdal/frmts/pdf/gdal_pdf.h         |  2 +-
 gdal/frmts/pdf/pdfdataset.cpp     |  2 ++
 gdal/frmts/pdf/pdfreadvectors.cpp | 24 +++++++++++++++++++++---
 3 files changed, 24 insertions(+), 4 deletions(-)

diff --git a/gdal/frmts/pdf/gdal_pdf.h b/gdal/frmts/pdf/gdal_pdf.h
index 0de6a6d08a05..5fc34c90a843 100644
--- a/gdal/frmts/pdf/gdal_pdf.h
+++ b/gdal/frmts/pdf/gdal_pdf.h
@@ -324,7 +324,7 @@ class PDFDataset final: public GDALPamDataset
     void                ExploreTree(GDALPDFObject* poObj,
                                     std::set< std::pair<int,int> > aoSetAlreadyVisited,
                                     int nRecLevel);
-    void                ExploreContents(GDALPDFObject* poObj, GDALPDFObject* poResources);
+    void                ExploreContents(GDALPDFObject* poObj, GDALPDFObject* poResources, int nDepth, int& nVisited, bool& bStop);
 
     void                ExploreContentsNonStructuredInternal(GDALPDFObject* poContents,
                                                              GDALPDFObject* poResources,
diff --git a/gdal/frmts/pdf/pdfdataset.cpp b/gdal/frmts/pdf/pdfdataset.cpp
index a6ec70e626a2..5ddf969a85fa 100644
--- a/gdal/frmts/pdf/pdfdataset.cpp
+++ b/gdal/frmts/pdf/pdfdataset.cpp
@@ -3617,6 +3617,8 @@ void PDFDataset::ExploreLayersPdfium(GDALPDFArray* poArray,
     for(int i=0;i<nLength;i++)
     {
         GDALPDFObject* poObj = poArray->Get(i);
+        if( poObj == nullptr )
+            continue;
         if (i == 0 && poObj->GetType() == PDFObjectType_String)
         {
             CPLString osName = PDFSanitizeLayerName(poObj->GetString().c_str());
diff --git a/gdal/frmts/pdf/pdfreadvectors.cpp b/gdal/frmts/pdf/pdfreadvectors.cpp
index 404d581addaa..f533fb9112a6 100644
--- a/gdal/frmts/pdf/pdfreadvectors.cpp
+++ b/gdal/frmts/pdf/pdfreadvectors.cpp
@@ -79,7 +79,10 @@ int PDFDataset::OpenVectorLayers(GDALPDFDictionary* poPageDict)
     }
     else
     {
-        ExploreContents(poContents, poResources);
+        int nDepth = 0;
+        int nVisited = 0;
+        bool bStop = false;
+        ExploreContents(poContents, poResources, nDepth, nVisited, bStop);
         std::set< std::pair<int,int> > aoSetAlreadyVisited;
         ExploreTree(poStructTreeRoot, aoSetAlreadyVisited, 0);
     }
@@ -1602,9 +1605,21 @@ OGRGeometry* PDFDataset::BuildGeometry(std::vector<double>& oCoords,
 /************************************************************************/
 
 void PDFDataset::ExploreContents(GDALPDFObject* poObj,
-                                       GDALPDFObject* poResources)
+                                 GDALPDFObject* poResources,
+                                 int nDepth,
+                                 int& nVisited,
+                                 bool& bStop)
 {
     std::map<CPLString, OGRPDFLayer*> oMapPropertyToLayer;
+    if( nDepth == 10 || nVisited == 1000 )
+    {
+        CPLError(CE_Failure, CPLE_AppDefined,
+                 "ExploreContents(): too deep exploration or too many items");
+        bStop = true;
+        return;
+    }
+    if( bStop )
+        return;
 
     if (poObj->GetType() == PDFObjectType_Array)
     {
@@ -1614,7 +1629,10 @@ void PDFDataset::ExploreContents(GDALPDFObject* poObj,
             GDALPDFObject* poSubObj = poArray->Get(i);
             if( poSubObj )
             {
-                ExploreContents(poSubObj, poResources);
+                nVisited ++;
+                ExploreContents(poSubObj, poResources, nDepth + 1, nVisited, bStop);
+                if( bStop )
+                    return;
             }
         }
     }

From 9a6b35cb9e722ab86ae2277e3128342850e850e8 Mon Sep 17 00:00:00 2001
From: Even Rouault <even.rouault@spatialys.com>
Date: Sat, 11 Jan 2020 02:26:14 +0100
Subject: [PATCH 457/488] RasterLite2: fix build against latest librasterlite2

---
 gdal/ogr/ogrsf_frmts/sqlite/ogr_sqlite.h    |  1 +
 gdal/ogr/ogrsf_frmts/sqlite/rasterlite2.cpp | 14 +++++++++-----
 2 files changed, 10 insertions(+), 5 deletions(-)

diff --git a/gdal/ogr/ogrsf_frmts/sqlite/ogr_sqlite.h b/gdal/ogr/ogrsf_frmts/sqlite/ogr_sqlite.h
index c7afa0914b49..0488efb515f9 100644
--- a/gdal/ogr/ogrsf_frmts/sqlite/ogr_sqlite.h
+++ b/gdal/ogr/ogrsf_frmts/sqlite/ogr_sqlite.h
@@ -892,6 +892,7 @@ class OGRSQLiteDataSource final : public OGRSQLiteBaseDataSource
     void                ReloadLayers();
 
 #ifdef HAVE_RASTERLITE2
+    void*               GetRL2Context() const { return m_hRL2Ctxt; }
     rl2CoveragePtr      GetRL2CoveragePtr() const { return m_pRL2Coverage; }
     GIntBig             GetSectionId() const { return m_nSectionId; }
     const double*       GetGeoTransform() const { return m_adfGeoTransform; }
diff --git a/gdal/ogr/ogrsf_frmts/sqlite/rasterlite2.cpp b/gdal/ogr/ogrsf_frmts/sqlite/rasterlite2.cpp
index 13c951d830e3..c0be2f5def67 100644
--- a/gdal/ogr/ogrsf_frmts/sqlite/rasterlite2.cpp
+++ b/gdal/ogr/ogrsf_frmts/sqlite/rasterlite2.cpp
@@ -2280,7 +2280,9 @@ GDALDataset *OGRSQLiteDriverCreateCopy( const char* pszName,
     memcpy( &cbk_data.adfGeoTransform, adfGeoTransform,
             sizeof(adfGeoTransform) );
 
-    if( rl2_load_raw_tiles_into_dbms(poDS->GetDB(), cvg,
+    if( rl2_load_raw_tiles_into_dbms(poDS->GetDB(),
+                                     poDS->GetRL2Context(),
+                                     cvg,
                                      osSectionName,
                                      poSrcDS->GetRasterXSize(),
                                      poSrcDS->GetRasterYSize(),
@@ -2370,7 +2372,6 @@ CPLErr OGRSQLiteDataSource::IBuildOverviews(
             }
         }
 
-        const int nMaxThreads = 1;
         const int bForcedRebuild = 1;
         const int bVerbose = 0;
         const int bVirtualLevels = 1;
@@ -2379,13 +2380,14 @@ CPLErr OGRSQLiteDataSource::IBuildOverviews(
         {
             if( m_nSectionId >= 0 )
             {
-                ret = rl2_build_section_pyramid( hDB, nMaxThreads,
+                ret = rl2_build_section_pyramid( hDB, GetRL2Context(),
                                            m_osCoverageName, m_nSectionId,
                                            bForcedRebuild, bVerbose);
             }
             else
             {
-                ret = rl2_build_monolithic_pyramid (hDB, m_osCoverageName,
+                ret = rl2_build_monolithic_pyramid (hDB, GetRL2Context(),
+                                                    m_osCoverageName,
                                                     bVirtualLevels,
                                                     bVerbose);
 
@@ -2393,7 +2395,9 @@ CPLErr OGRSQLiteDataSource::IBuildOverviews(
         }
         else
         {
-            ret = rl2_build_monolithic_pyramid (hDB, m_osCoverageName,
+            ret = rl2_build_monolithic_pyramid (hDB,
+                                                GetRL2Context(),
+                                                m_osCoverageName,
                                                 bVirtualLevels,
                                                 bVerbose);
         }

From b9c3b5ac74a3342c67b575cde3a32dec9136ec62 Mon Sep 17 00:00:00 2001
From: Dmitry Baryshnikov <bishop.dev@gmail.com>
Date: Thu, 16 Jan 2020 16:32:14 +0300
Subject: [PATCH 458/488] MITAB: cleanup management of update flag (fixes
 #2170)

---
 .../ogrsf_frmts/mitab/mitab_ogr_datasource.cpp    | 15 +++++++--------
 gdal/ogr/ogrsf_frmts/mitab/mitab_ogr_driver.h     |  4 +++-
 2 files changed, 10 insertions(+), 9 deletions(-)

diff --git a/gdal/ogr/ogrsf_frmts/mitab/mitab_ogr_datasource.cpp b/gdal/ogr/ogrsf_frmts/mitab/mitab_ogr_datasource.cpp
index 90f9b99bc16d..7eb466ecdd9d 100644
--- a/gdal/ogr/ogrsf_frmts/mitab/mitab_ogr_datasource.cpp
+++ b/gdal/ogr/ogrsf_frmts/mitab/mitab_ogr_datasource.cpp
@@ -56,7 +56,6 @@ OGRTABDataSource::OGRTABDataSource() :
     m_bSingleFile(FALSE),
     m_bSingleLayerAlreadyCreated(FALSE),
     m_bQuickSpatialIndexMode(-1),
-    m_bUpdate(FALSE),
     m_nBlockSize(512)
 {}
 
@@ -90,7 +89,7 @@ int OGRTABDataSource::Create( const char * pszName, char **papszOptions )
 
     m_pszName = CPLStrdup(pszName);
     m_papszOptions = CSLDuplicate(papszOptions);
-    m_bUpdate = TRUE;
+    eAccess = GA_Update;
 
     const char *pszOpt = CSLFetchNameValue(papszOptions, "FORMAT");
     if( pszOpt != nullptr && EQUAL(pszOpt, "MIF") )
@@ -192,13 +191,13 @@ int OGRTABDataSource::Open( GDALOpenInfo *poOpenInfo, int bTestOpen )
     CPLAssert(m_pszName == nullptr);
 
     m_pszName = CPLStrdup(poOpenInfo->pszFilename);
-    m_bUpdate = poOpenInfo->eAccess == GA_Update;
+    eAccess = poOpenInfo->eAccess;
 
     // If it is a file, try to open as a Mapinfo file.
     if( !poOpenInfo->bIsDirectory )
     {
         IMapInfoFile *poFile =
-            IMapInfoFile::SmartOpen(m_pszName, m_bUpdate, bTestOpen);
+            IMapInfoFile::SmartOpen(m_pszName, GetUpdate(), bTestOpen);
         if( poFile == nullptr )
             return FALSE;
 
@@ -235,7 +234,7 @@ int OGRTABDataSource::Open( GDALOpenInfo *poOpenInfo, int bTestOpen )
                 CPLFormFilename(m_pszDirectory, papszFileList[iFile], nullptr));
 
             IMapInfoFile *poFile =
-                IMapInfoFile::SmartOpen(pszSubFilename, m_bUpdate, bTestOpen);
+                IMapInfoFile::SmartOpen(pszSubFilename, GetUpdate(), bTestOpen);
             CPLFree(pszSubFilename);
 
             if( poFile == nullptr )
@@ -304,7 +303,7 @@ OGRTABDataSource::ICreateLayer( const char *pszLayerName,
                                 char **papszOptions )
 
 {
-    if( !m_bUpdate )
+    if( !GetUpdate() )
     {
         CPLError( CE_Failure, CPLE_AppDefined,
                     "Cannot create layer on read-only dataset.");
@@ -450,9 +449,9 @@ int OGRTABDataSource::TestCapability( const char *pszCap )
 
 {
     if( EQUAL(pszCap, ODsCCreateLayer) )
-        return m_bUpdate && (!m_bSingleFile || !m_bSingleLayerAlreadyCreated);
+        return GetUpdate() && (!m_bSingleFile || !m_bSingleLayerAlreadyCreated);
     else if( EQUAL(pszCap, ODsCRandomLayerWrite) )
-        return m_bUpdate;
+        return GetUpdate();
     else
         return FALSE;
 }
diff --git a/gdal/ogr/ogrsf_frmts/mitab/mitab_ogr_driver.h b/gdal/ogr/ogrsf_frmts/mitab/mitab_ogr_driver.h
index 7caa8a41a00a..a06c1e73008e 100644
--- a/gdal/ogr/ogrsf_frmts/mitab/mitab_ogr_driver.h
+++ b/gdal/ogr/ogrsf_frmts/mitab/mitab_ogr_driver.h
@@ -58,8 +58,10 @@ class OGRTABDataSource : public OGRDataSource
     int                 m_bSingleFile;
     int                 m_bSingleLayerAlreadyCreated;
     GBool               m_bQuickSpatialIndexMode;
-    int                 m_bUpdate;
     int                 m_nBlockSize;
+    
+  private:  
+    inline bool         GetUpdate() const { return eAccess == GA_Update; }
 
   public:
                 OGRTABDataSource();

From 6bb8cedff7e6f2f84924a9002d9d91545ddc6a90 Mon Sep 17 00:00:00 2001
From: Even Rouault <even.rouault@spatialys.com>
Date: Tue, 11 Feb 2020 21:54:09 +0100
Subject: [PATCH 459/488] GDALDataset::CopyLayer(): fix crash when using
 DST_SRSWKT option. And also set
 SetAxisMappingStrategy(OAMS_TRADITIONAL_GIS_ORDER)

---
 autotest/ogr/ogr_basic_test.py | 13 +++++++++++++
 gdal/gcore/gdaldataset.cpp     |  6 ++++--
 2 files changed, 17 insertions(+), 2 deletions(-)

diff --git a/autotest/ogr/ogr_basic_test.py b/autotest/ogr/ogr_basic_test.py
index 6e372bdf0963..2b604817643b 100755
--- a/autotest/ogr/ogr_basic_test.py
+++ b/autotest/ogr/ogr_basic_test.py
@@ -35,6 +35,7 @@
 import ogrtest
 from osgeo import gdal
 from osgeo import ogr
+from osgeo import osr
 import pytest
 
 ###############################################################################
@@ -677,6 +678,18 @@ def test_ogr_basic_dataset_slice():
     assert lyrs == ['lyr1', 'lyr3']
 
 
+def test_ogr_basic_dataset_copy_layer_dst_srswkt():
+
+    ds = ogr.GetDriverByName('Memory').CreateDataSource('')
+    src_lyr = ds.CreateLayer('lyr1')
+    sr = osr.SpatialReference()
+    sr.SetFromUserInput('WGS84')
+    out_lyr = ds.CopyLayer(src_lyr, 'lyr2',
+                           options=['DST_SRSWKT=' + sr.ExportToWkt()])
+    assert out_lyr.GetSpatialRef() is not None
+    assert out_lyr.GetSpatialRef().IsSame(sr)
+
+
 ###############################################################################
 # cleanup
 
diff --git a/gdal/gcore/gdaldataset.cpp b/gdal/gcore/gdaldataset.cpp
index 0bf9e8ea4329..2866021f3ece 100644
--- a/gdal/gcore/gdaldataset.cpp
+++ b/gdal/gcore/gdaldataset.cpp
@@ -4339,9 +4339,11 @@ OGRLayer *GDALDataset::CopyLayer( OGRLayer *poSrcLayer,
         {
             // Remove DST_WKT from option list to prevent warning from driver.
             const int nSRSPos = CSLFindName(papszOptions, "DST_SRSWKT");
-            papszOptions = CSLRemoveStrings(papszOptions, nSRSPos, 1, nullptr);
+            CPLStringList aosOptionsWithoutDstSRSWKT(
+                CSLRemoveStrings(CSLDuplicate(papszOptions), nSRSPos, 1, nullptr));
             poDstLayer = ICreateLayer(pszNewName, &oDstSpaRef,
-                                      poSrcDefn->GetGeomType(), papszOptions);
+                                      poSrcDefn->GetGeomType(),
+                                      aosOptionsWithoutDstSRSWKT.List());
         }
     }
 

From c1364256d3d47612ca0435e24dc6d67090d9c26c Mon Sep 17 00:00:00 2001
From: Even Rouault <even.rouault@spatialys.com>
Date: Tue, 11 Feb 2020 23:08:41 +0100
Subject: [PATCH 460/488] GNMGenericNetwork::CopyLayer(): fix memory leak
 related to previous commit

---
 gdal/gnm/gnmgenericnetwork.cpp | 14 +++-----------
 1 file changed, 3 insertions(+), 11 deletions(-)

diff --git a/gdal/gnm/gnmgenericnetwork.cpp b/gdal/gnm/gnmgenericnetwork.cpp
index 14dd5d9e1487..385f1a9c6b11 100644
--- a/gdal/gnm/gnmgenericnetwork.cpp
+++ b/gdal/gnm/gnmgenericnetwork.cpp
@@ -1388,17 +1388,9 @@ int GNMGenericNetwork::TestCapability( const char * pszCap )
 OGRLayer *GNMGenericNetwork::CopyLayer(OGRLayer *poSrcLayer,
                                        const char *pszNewName, char **papszOptions)
 {
-    if(CSLFindName(papszOptions, "DST_SRSWKT") == -1)
-    {
-        papszOptions = CSLAddNameValue(papszOptions, "DST_SRSWKT",
-                                       GetProjectionRef());
-    }
-    else
-    {
-        papszOptions = CSLSetNameValue(papszOptions, "DST_SRSWKT",
-                                       GetProjectionRef());
-    }
-    return GDALDataset::CopyLayer(poSrcLayer, pszNewName, papszOptions);
+    CPLStringList aosOptions(CSLDuplicate(papszOptions));
+    aosOptions.SetNameValue("DST_SRSWKT", GetProjectionRef());
+    return GDALDataset::CopyLayer(poSrcLayer, pszNewName, aosOptions.List());
 }
 
 int GNMGenericNetwork::CloseDependentDatasets()

From b926d214f7b0c0af04ab427fcd509fa891d38191 Mon Sep 17 00:00:00 2001
From: Even Rouault <even.rouault@spatialys.com>
Date: Thu, 20 Feb 2020 22:22:52 +0100
Subject: [PATCH 461/488] GDALRasterizeGeometries(): fix potential integer
 overflow / memory allocation failure, depending on GDAL_CACHEMAX and raster
 dimensions (fixes #2261)

---
 gdal/alg/gdalrasterize.cpp | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/gdal/alg/gdalrasterize.cpp b/gdal/alg/gdalrasterize.cpp
index c4a1f18c8a5b..f252dcebdca7 100644
--- a/gdal/alg/gdalrasterize.cpp
+++ b/gdal/alg/gdalrasterize.cpp
@@ -852,9 +852,8 @@ CPLErr GDALRasterizeGeometries( GDALDatasetH hDS,
         // rem: optimized for square blocks
         const GIntBig nbMaxBlocks64 = GDALGetCacheMax64() / nPixelSize / nYBlockSize / nXBlockSize;
         const int knIntMax = std::numeric_limits<int>::max();
-        const int nbMaxBlocks =
-            nbMaxBlocks64 > knIntMax
-            ? knIntMax : static_cast<int>(nbMaxBlocks64);
+        const int nbMaxBlocks = static_cast<int>(std::min(
+            static_cast<GIntBig>(knIntMax / nPixelSize / nYBlockSize / nXBlockSize), nbMaxBlocks64));
         const int nbBlocsX = std::max(1, std::min(static_cast<int>(sqrt(static_cast<double>(nbMaxBlocks))), nXBlocks));
         const int nbBlocsY = std::max(1, std::min(nbMaxBlocks / nbBlocsX, nYBlocks));
 

From 951ef331e6ff81c940767c6fe0cf16c8daae27d6 Mon Sep 17 00:00:00 2001
From: Even Rouault <even.rouault@spatialys.com>
Date: Thu, 27 Feb 2020 02:21:28 +0100
Subject: [PATCH 462/488] Degrib: avoid potential int overflow / out-of-bounds
 access on large/corrupted files. Hopefully fixes
 https://bugs.chromium.org/p/oss-fuzz/issues/detail?id=20751

---
 gdal/frmts/grib/degrib/degrib/metaparse.cpp | 27 ++++++++++++---------
 1 file changed, 16 insertions(+), 11 deletions(-)

diff --git a/gdal/frmts/grib/degrib/degrib/metaparse.cpp b/gdal/frmts/grib/degrib/degrib/metaparse.cpp
index f3f7fa1d2c38..d48e7ad5f2f3 100644
--- a/gdal/frmts/grib/degrib/degrib/metaparse.cpp
+++ b/gdal/frmts/grib/degrib/degrib/metaparse.cpp
@@ -2958,7 +2958,7 @@ void ParseGrid (VSILFILE *fp, gridAttribType *attrib, double **Grib_Data,
                          * missing values. */
    uInt4 scanIndex;     /* Where we are in the original grid. */
    sInt4 x, y;          /* Where we are in a grid of scan value 0100 */
-   sInt4 newIndex;      /* x,y in a 1 dimensional array. */
+   uInt4 newIndex;      /* x,y in a 1 dimensional array. */
    double value;        /* The data in the new units. */
    /* A pointer to Grib_Data for ease of manipulation. */
    double *grib_Data = nullptr;
@@ -2981,17 +2981,18 @@ void ParseGrid (VSILFILE *fp, gridAttribType *attrib, double **Grib_Data,
        *Grib_Data = nullptr;
        return;
    }
-   
-   if (subNx * subNy > *grib_DataLen) {
 
-      if( subNx * subNy > 100 * 1024 * 1024 )
+   const uInt4 subNxNy = subNx * subNy;
+   if (subNxNy > *grib_DataLen) {
+
+      if( subNxNy > 100 * 1024 * 1024 )
       {
           vsi_l_offset curPos = VSIFTellL(fp);
           VSIFSeekL(fp, 0, SEEK_END);
           vsi_l_offset fileSize = VSIFTellL(fp);
           VSIFSeekL(fp, curPos, SEEK_SET);      
           // allow a compression ratio of 1:1000
-          if( subNx * subNy / 1000 > fileSize )
+          if( subNxNy / 1000 > fileSize )
           {
             errSprintf ("ERROR: File too short\n");
             *grib_DataLen = 0;
@@ -3000,9 +3001,12 @@ void ParseGrid (VSILFILE *fp, gridAttribType *attrib, double **Grib_Data,
           }
       }
 
-      *grib_DataLen = subNx * subNy;
-      double* newData = (double *) realloc ((void *) (*Grib_Data),
-                                       (*grib_DataLen) * sizeof (double));
+      double* newData = nullptr;
+      const size_t nBufferSize = subNxNy * sizeof (double);
+      if( nBufferSize / sizeof(double) == subNxNy )
+      {
+        newData = (double *) realloc ((void *) (*Grib_Data), nBufferSize);
+      }
       if( newData == nullptr )
       {
           errSprintf ("Memory allocation failed");
@@ -3011,6 +3015,7 @@ void ParseGrid (VSILFILE *fp, gridAttribType *attrib, double **Grib_Data,
           *grib_DataLen = 0;
           return;
       }
+      *grib_DataLen = subNxNy;
       *Grib_Data = newData;
    }
    grib_Data = *Grib_Data;
@@ -3097,7 +3102,7 @@ void ParseGrid (VSILFILE *fp, gridAttribType *attrib, double **Grib_Data,
          }
          ScanIndex2XY (scanIndex, &x, &y, scan, Nx, Ny);
          /* ScanIndex returns value as if scan was 0100 */
-         newIndex = (x - 1) + (y - 1) * Nx;
+         newIndex = (uInt4)(x - 1) + (uInt4)(y - 1) * Nx;
          grib_Data[newIndex] = value;
       }
    }
@@ -3130,7 +3135,7 @@ void ParseGrid (VSILFILE *fp, gridAttribType *attrib, double **Grib_Data,
       for (scanIndex = 0; scanIndex < (uInt4)nd2x3 && scanIndex < Nx * Ny; scanIndex++) {
          ScanIndex2XY (scanIndex, &x, &y, scan, Nx, Ny);
          /* ScanIndex returns value as if scan was 0100 */
-         newIndex = (x - 1) + (y - 1) * Nx;
+         newIndex = (uInt4)(x - 1) + (uInt4)(y - 1) * Nx;
          if (attrib->fieldType) {
             value = iain[scanIndex];
          } else {
@@ -3166,7 +3171,7 @@ void ParseGrid (VSILFILE *fp, gridAttribType *attrib, double **Grib_Data,
          for (scanIndex = 0; scanIndex < (uInt4)nd2x3 && scanIndex < Nx * Ny; scanIndex++) {
             ScanIndex2XY (scanIndex, &x, &y, scan, Nx, Ny);
             /* ScanIndex returns value as if scan was 0100 */
-            newIndex = (x - 1) + (y - 1) * Nx;
+            newIndex = (uInt4)(x - 1) + (uInt4)(y - 1) * Nx;
             /* Corrected this on 5/10/2004 */
             if (ib[scanIndex] != 1) {
                grib_Data[newIndex] = xmissp;

From 36ebc5bb83b1802b00ac8b639c69ec6035e5e21a Mon Sep 17 00:00:00 2001
From: Even Rouault <even.rouault@spatialys.com>
Date: Thu, 27 Feb 2020 15:34:41 +0100
Subject: [PATCH 463/488] BMP: fix reading on big-endian hosts

---
 gdal/frmts/bmp/bmpdataset.cpp | 14 ++++++++++++--
 1 file changed, 12 insertions(+), 2 deletions(-)

diff --git a/gdal/frmts/bmp/bmpdataset.cpp b/gdal/frmts/bmp/bmpdataset.cpp
index bbf30f39269e..178c56d3f183 100644
--- a/gdal/frmts/bmp/bmpdataset.cpp
+++ b/gdal/frmts/bmp/bmpdataset.cpp
@@ -1141,7 +1141,18 @@ GDALDataset *BMPDataset::Open( GDALOpenInfo * poOpenInfo )
         VSIFReadL( &poDS->sInfoHeader.iHeight, 1, 4, poDS->fp );
         VSIFReadL( &poDS->sInfoHeader.iPlanes, 1, 2, poDS->fp );
         VSIFReadL( &poDS->sInfoHeader.iBitCount, 1, 2, poDS->fp );
-        VSIFReadL( &poDS->sInfoHeader.iCompression, 1, 4, poDS->fp );
+        unsigned int iCompression;
+        VSIFReadL( &iCompression, 1, 4, poDS->fp );
+#ifdef CPL_MSB
+        CPL_SWAP32PTR( &iCompression );
+#endif
+        if( iCompression > BMPC_PNG )
+        {
+            CPLError(CE_Failure, CPLE_NotSupported, "Unsupported compression");
+            delete poDS;
+            return nullptr;
+        }
+        poDS->sInfoHeader.iCompression = static_cast<BMPComprMethod>(iCompression);
         VSIFReadL( &poDS->sInfoHeader.iSizeImage, 1, 4, poDS->fp );
         VSIFReadL( &poDS->sInfoHeader.iXPelsPerMeter, 1, 4, poDS->fp );
         VSIFReadL( &poDS->sInfoHeader.iYPelsPerMeter, 1, 4, poDS->fp );
@@ -1163,7 +1174,6 @@ GDALDataset *BMPDataset::Open( GDALOpenInfo * poOpenInfo )
         CPL_SWAP32PTR( &poDS->sInfoHeader.iHeight );
         CPL_SWAP16PTR( &poDS->sInfoHeader.iPlanes );
         CPL_SWAP16PTR( &poDS->sInfoHeader.iBitCount );
-        CPL_SWAP32PTR( &poDS->sInfoHeader.iCompression );
         CPL_SWAP32PTR( &poDS->sInfoHeader.iSizeImage );
         CPL_SWAP32PTR( &poDS->sInfoHeader.iXPelsPerMeter );
         CPL_SWAP32PTR( &poDS->sInfoHeader.iYPelsPerMeter );

From 2c55dafb095a74714264b2c4855b5b110c01bf07 Mon Sep 17 00:00:00 2001
From: Even Rouault <even.rouault@spatialys.com>
Date: Tue, 3 Mar 2020 18:07:43 +0100
Subject: [PATCH 464/488] NITF: avoid potential stack read buffer overflow.
 Fixes https://bugs.chromium.org/p/oss-fuzz/issues/detail?id=21024

---
 gdal/frmts/nitf/nitfdataset.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/gdal/frmts/nitf/nitfdataset.cpp b/gdal/frmts/nitf/nitfdataset.cpp
index f82f82f9fc5b..8e6e758483dd 100644
--- a/gdal/frmts/nitf/nitfdataset.cpp
+++ b/gdal/frmts/nitf/nitfdataset.cpp
@@ -3435,7 +3435,7 @@ int NITFDataset::ScanJPEGQLevel( GUIntBig *pnDataStart, bool *pbError )
 /* -------------------------------------------------------------------- */
 /*      Do we have an NITF app tag?  If so, pull out the Q level.       */
 /* -------------------------------------------------------------------- */
-    if( !EQUAL((char *)abyHeader+nOffset+6,"NITF") )
+    if( memcmp(abyHeader+nOffset+6,"NITF\0",5) != 0 )
         return 0;
 
     return abyHeader[22+nOffset];

From d25cf8418822349be8bedbdf1b0735f2056a660b Mon Sep 17 00:00:00 2001
From: Even Rouault <even.rouault@spatialys.com>
Date: Fri, 13 Mar 2020 09:23:33 +0100
Subject: [PATCH 465/488] /vsigz/: fix seeking within .gz/.tgz files larger
 than 2 GB (fixes #2315)

---
 gdal/port/cpl_vsil_gzip.cpp | 62 ++++++++++++++++---------------------
 1 file changed, 26 insertions(+), 36 deletions(-)

diff --git a/gdal/port/cpl_vsil_gzip.cpp b/gdal/port/cpl_vsil_gzip.cpp
index 962e4dea6988..b367d0535ba0 100644
--- a/gdal/port/cpl_vsil_gzip.cpp
+++ b/gdal/port/cpl_vsil_gzip.cpp
@@ -181,7 +181,7 @@ class VSIGZipHandle final : public VSIVirtualHandle
 
     void check_header();
     int get_byte();
-    int gzseek( vsi_l_offset nOffset, int nWhence );
+    bool gzseek( vsi_l_offset nOffset, int nWhence );
     int gzrewind ();
     uLong getLong ();
 
@@ -619,18 +619,14 @@ int VSIGZipHandle::gzrewind ()
 
 int VSIGZipHandle::Seek( vsi_l_offset nOffset, int nWhence )
 {
-    /* The semantics of gzseek are different from ::Seek */
-    /* It returns the current offset, where as ::Seek should return 0 */
-    /* if successful */
-    int ret = gzseek(nOffset, nWhence);
-    return (ret >= 0) ? 0 : ret;
+    return gzseek(nOffset, nWhence) ? 0 : -1;
 }
 
 /************************************************************************/
 /*                            gzseek()                                  */
 /************************************************************************/
 
-int VSIGZipHandle::gzseek( vsi_l_offset offset, int whence )
+bool VSIGZipHandle::gzseek( vsi_l_offset offset, int whence )
 {
     const vsi_l_offset original_offset = offset;
     const int original_nWhence = whence;
@@ -648,8 +644,8 @@ int VSIGZipHandle::gzseek( vsi_l_offset offset, int whence )
         {
             if( out + offset > m_compressed_size )
             {
-                CPL_VSIL_GZ_RETURN(-1);
-                return -1L;
+                CPL_VSIL_GZ_RETURN(FALSE);
+                return false;
             }
 
             offset = startOff + out + offset;
@@ -658,8 +654,8 @@ int VSIGZipHandle::gzseek( vsi_l_offset offset, int whence )
         {
             if( offset > m_compressed_size )
             {
-                CPL_VSIL_GZ_RETURN(-1);
-                return -1L;
+                CPL_VSIL_GZ_RETURN(FALSE);
+                return false;
             }
 
             offset = startOff + offset;
@@ -670,30 +666,27 @@ int VSIGZipHandle::gzseek( vsi_l_offset offset, int whence )
             // so no way to seek backward. See #1590 */
             if( offset > 0 ) // || -offset > compressed_size
             {
-                CPL_VSIL_GZ_RETURN(-1);
-                return -1L;
+                CPL_VSIL_GZ_RETURN(FALSE);
+                return false;
             }
 
             offset = startOff + m_compressed_size - offset;
         }
         else
         {
-            CPL_VSIL_GZ_RETURN(-1);
-            return -1L;
+            CPL_VSIL_GZ_RETURN(FALSE);
+            return false;
         }
 
         if( VSIFSeekL(reinterpret_cast<VSILFILE*>(m_poBaseHandle), offset, SEEK_SET) < 0 )
         {
-            CPL_VSIL_GZ_RETURN(-1);
-            return -1L;
+            CPL_VSIL_GZ_RETURN(FALSE);
+            return false;
         }
 
         out = offset - startOff;
         in = out;
-#ifdef ENABLE_DEBUG
-        CPLDebug("GZIP", "return " CPL_FRMT_GUIB, in);
-#endif
-        return in > INT_MAX ? INT_MAX : static_cast<int>(in);
+        return true;
     }
 
     // whence == SEEK_END is unsuppored in original gzseek.
@@ -704,7 +697,7 @@ int VSIGZipHandle::gzseek( vsi_l_offset offset, int whence )
         if( offset == 0 && m_uncompressed_size != 0 )
         {
             out = m_uncompressed_size;
-            return 1;
+            return true;
         }
 
         // We don't know the uncompressed size. This is unfortunate.
@@ -738,14 +731,14 @@ int VSIGZipHandle::gzseek( vsi_l_offset offset, int whence )
     }
     else if( gzrewind() < 0 )
     {
-            CPL_VSIL_GZ_RETURN(-1);
-            return -1L;
+        CPL_VSIL_GZ_RETURN(FALSE);
+        return false;
     }
 
     if( z_err != Z_OK && z_err != Z_STREAM_END )
     {
-        CPL_VSIL_GZ_RETURN(-1);
-        return -1L;
+        CPL_VSIL_GZ_RETURN(FALSE);
+        return false;
     }
 
     for( unsigned int i = 0;
@@ -794,17 +787,14 @@ int VSIGZipHandle::gzseek( vsi_l_offset offset, int whence )
         outbuf = static_cast<Byte*>(ALLOC(Z_BUFSIZE));
         if( outbuf == nullptr )
         {
-            CPL_VSIL_GZ_RETURN(-1);
-            return -1L;
+            CPL_VSIL_GZ_RETURN(FALSE);
+            return false;
         }
     }
 
     if( original_nWhence == SEEK_END && z_err == Z_STREAM_END )
     {
-#ifdef ENABLE_DEBUG
-        CPLDebug("GZIP", "gzseek return " CPL_FRMT_GUIB, out);
-#endif
-        return static_cast<int>(out);
+        return true;
     }
 
     while( offset > 0 )
@@ -817,8 +807,8 @@ int VSIGZipHandle::gzseek( vsi_l_offset offset, int whence )
             static_cast<int>(Read(outbuf, 1, static_cast<uInt>(size)));
         if( read_size == 0 )
         {
-            // CPL_VSIL_GZ_RETURN(-1);
-            return -1L;
+            // CPL_VSIL_GZ_RETURN(FALSE);
+            return false;
         }
         if( original_nWhence == SEEK_END )
         {
@@ -831,7 +821,7 @@ int VSIGZipHandle::gzseek( vsi_l_offset offset, int whence )
         offset -= read_size;
     }
 #ifdef ENABLE_DEBUG
-    CPLDebug("GZIP", "gzseek return " CPL_FRMT_GUIB, out);
+    CPLDebug("GZIP", "gzseek at offset " CPL_FRMT_GUIB, out);
 #endif
 
     if( original_offset == 0 && original_nWhence == SEEK_END )
@@ -870,7 +860,7 @@ int VSIGZipHandle::gzseek( vsi_l_offset offset, int whence )
         }
     }
 
-    return static_cast<int>(out);
+    return true;
 }
 
 /************************************************************************/

From f4fc68b6a0b01e9cc640d178f06014401c7413fa Mon Sep 17 00:00:00 2001
From: Even Rouault <even.rouault@spatialys.com>
Date: Mon, 16 Mar 2020 16:01:21 +0100
Subject: [PATCH 466/488] cpl_vsil_hdfs.cpp: fix build with clang, and fix
 other warnings (fixes #2320)

---
 gdal/port/cpl_vsil_hdfs.cpp | 20 +++++++++-----------
 1 file changed, 9 insertions(+), 11 deletions(-)

diff --git a/gdal/port/cpl_vsil_hdfs.cpp b/gdal/port/cpl_vsil_hdfs.cpp
index d718bbd26337..dde61148fd89 100644
--- a/gdal/port/cpl_vsil_hdfs.cpp
+++ b/gdal/port/cpl_vsil_hdfs.cpp
@@ -87,7 +87,6 @@ class VSIHdfsHandle final : public VSIVirtualHandle
     hdfsFile poFile = nullptr;
     hdfsFS poFilesystem = nullptr;
     std::string oFilename;
-    bool bReadOnly;
     bool bEOF = false;
 
   public:
@@ -115,8 +114,8 @@ class VSIHdfsHandle final : public VSIVirtualHandle
 VSIHdfsHandle::VSIHdfsHandle(hdfsFile _poFile,
                              hdfsFS _poFilesystem,
                              const char * pszFilename,
-                             bool _bReadOnly)
-  : poFile(_poFile), poFilesystem(_poFilesystem), oFilename(pszFilename), bReadOnly(_bReadOnly)
+                             bool /*_bReadOnly*/)
+  : poFile(_poFile), poFilesystem(_poFilesystem), oFilename(pszFilename)
 {}
 
 VSIHdfsHandle::~VSIHdfsHandle()
@@ -169,7 +168,7 @@ VSIHdfsHandle::Read(void *pBuffer, size_t nSize, size_t nMemb)
       // be encoded in a signed 32-bit number, break the request into
       // 2GB batches.
       bytes = hdfsRead(poFilesystem, poFile,
-                       pBuffer + bytes_read,
+                       static_cast<char*>(pBuffer) + bytes_read,
                        bytes_to_request > INT_MAX ? INT_MAX : bytes_to_request);
 
       if (bytes > 0) {
@@ -185,12 +184,11 @@ VSIHdfsHandle::Read(void *pBuffer, size_t nSize, size_t nMemb)
       }
     }
 
-  if (bytes_read > 0)
-    return bytes_read/nSize;
+  return bytes_read/nSize;
 }
 
 size_t
-VSIHdfsHandle::Write(const void *pBuffer, size_t nSize, size_t nMemb)
+VSIHdfsHandle::Write(const void *, size_t, size_t)
 {
   CPLError(CE_Failure, CPLE_AppDefined, "HDFS driver is read-only");
   return -1;
@@ -350,21 +348,21 @@ VSIHdfsFilesystemHandler::Stat( const char *pszeFilename, VSIStatBufL *pStatBuf,
 }
 
 int
-VSIHdfsFilesystemHandler::Unlink(const char *pszFilename)
+VSIHdfsFilesystemHandler::Unlink(const char *)
 {
   CPLError(CE_Failure, CPLE_AppDefined, "HDFS driver is read-only");
   return -1;
 }
 
 int
-VSIHdfsFilesystemHandler::Mkdir(const char *pszDirname, long nMode)
+VSIHdfsFilesystemHandler::Mkdir(const char *, long)
 {
   CPLError(CE_Failure, CPLE_AppDefined, "HDFS driver is read-only");
   return -1;
 }
 
 int
-VSIHdfsFilesystemHandler::Rmdir(const char *pszDirname)
+VSIHdfsFilesystemHandler::Rmdir(const char *)
 {
   CPLError(CE_Failure, CPLE_AppDefined, "HDFS driver is read-only");
   return -1;
@@ -391,7 +389,7 @@ VSIHdfsFilesystemHandler::ReadDir(const char *pszDirname)
 }
 
 int
-VSIHdfsFilesystemHandler::Rename(const char *oldpath, const char *newpath)
+VSIHdfsFilesystemHandler::Rename(const char *, const char *)
 {
   CPLError(CE_Failure, CPLE_AppDefined, "HDFS driver is read-only");
   return -1;

From 748f7fdee3d1ae0266195ac83eba6647f62d216e Mon Sep 17 00:00:00 2001
From: Even Rouault <even.rouault@spatialys.com>
Date: Mon, 16 Mar 2020 18:47:22 +0100
Subject: [PATCH 467/488] Travis: fix link to kealib

---
 gdal/ci/travis/csa_common/before_install.sh   | 15 ++++++++-------
 gdal/ci/travis/python3/before_install.sh      | 14 +++++++-------
 gdal/ci/travis/trusty_clang/before_install.sh | 14 +++++++-------
 3 files changed, 22 insertions(+), 21 deletions(-)

diff --git a/gdal/ci/travis/csa_common/before_install.sh b/gdal/ci/travis/csa_common/before_install.sh
index 0cf1e06e44e0..f7f9b1b358af 100755
--- a/gdal/ci/travis/csa_common/before_install.sh
+++ b/gdal/ci/travis/csa_common/before_install.sh
@@ -53,13 +53,14 @@ sudo cp -r install-openjpeg/lib/* /usr/local/lib
 #tar xzf mongo-cxx-1.0.2-install-ubuntu12.04-64bit.tar.gz
 #sudo cp -r mongo-cxx-1.0.2-install/include/* /usr/local/include
 #sudo cp -r mongo-cxx-1.0.2-install/lib/* /usr/local/lib
-wget https://bitbucket.org/chchrsc/kealib/get/c6d36f3db5e4.zip
-unzip c6d36f3db5e4.zip
-cd chchrsc-kealib-c6d36f3db5e4/trunk
-cmake . -DBUILD_SHARED_LIBS=ON -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX=/usr -DHDF5_INCLUDE_DIR=/usr/include -DHDF5_LIB_PATH=/usr/lib -DLIBKEA_WITH_GDAL=OFF
-make -j4
-sudo make install
-cd ../..
+
+wget https://github.com/ubarsc/kealib/archive/kealib-1.4.12.zip
+unzip kealib-1.4.12.zip
+(cd kealib-kealib-1.4.12;
+cmake . -DBUILD_SHARED_LIBS=ON -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX=/usr -DHDF5_INCLUDE_DIR=/usr/include -DHDF5_LIB_PATH=/usr/lib -DLIBKEA_WITH_GDAL=OFF;
+make -j4;
+sudo make install)
+
 sudo ldconfig
 (cd gdal
  wget http://even.rouault.free.fr/clang-3.7.0-light/libstdc++.so.6.tar.bz2
diff --git a/gdal/ci/travis/python3/before_install.sh b/gdal/ci/travis/python3/before_install.sh
index 70c4b5e01dd8..507fab87d9c0 100755
--- a/gdal/ci/travis/python3/before_install.sh
+++ b/gdal/ci/travis/python3/before_install.sh
@@ -52,13 +52,13 @@ sudo cp -r openjpeg-v2.3.0-linux-x86_64/lib/* /usr/local/lib
 #tar xzf mongo-cxx-1.0.2-install-ubuntu12.04-64bit.tar.gz
 #sudo cp -r mongo-cxx-1.0.2-install/include/* /usr/local/include
 #sudo cp -r mongo-cxx-1.0.2-install/lib/* /usr/local/lib
-wget https://bitbucket.org/chchrsc/kealib/get/c6d36f3db5e4.zip
-unzip c6d36f3db5e4.zip
-cd chchrsc-kealib-c6d36f3db5e4/trunk
-cmake . -DBUILD_SHARED_LIBS=ON -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX=/usr -DHDF5_INCLUDE_DIR=/usr/include -DHDF5_LIB_PATH=/usr/lib -DLIBKEA_WITH_GDAL=OFF
-make -j4
-sudo make install
-cd ../..
+
+wget https://github.com/ubarsc/kealib/archive/kealib-1.4.12.zip
+unzip kealib-1.4.12.zip
+(cd kealib-kealib-1.4.12;
+cmake . -DBUILD_SHARED_LIBS=ON -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX=/usr -DHDF5_INCLUDE_DIR=/usr/include -DHDF5_LIB_PATH=/usr/lib -DLIBKEA_WITH_GDAL=OFF;
+make -j4;
+sudo make install)
 
 # Build zstd
 wget https://github.com/facebook/zstd/archive/v1.3.3.tar.gz
diff --git a/gdal/ci/travis/trusty_clang/before_install.sh b/gdal/ci/travis/trusty_clang/before_install.sh
index be9af6226def..760b11068a46 100755
--- a/gdal/ci/travis/trusty_clang/before_install.sh
+++ b/gdal/ci/travis/trusty_clang/before_install.sh
@@ -75,13 +75,13 @@ sudo cp -r openjpeg-v2.3.0-linux-x86_64/lib/* /usr/local/lib
 #tar xzf mongo-cxx-1.0.2-install-ubuntu12.04-64bit.tar.gz
 #sudo cp -r mongo-cxx-1.0.2-install/include/* /usr/local/include
 #sudo cp -r mongo-cxx-1.0.2-install/lib/* /usr/local/lib
-wget https://bitbucket.org/chchrsc/kealib/get/c6d36f3db5e4.zip
-unzip c6d36f3db5e4.zip
-cd chchrsc-kealib-c6d36f3db5e4/trunk
-cmake . -DBUILD_SHARED_LIBS=ON -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX=/usr -DHDF5_INCLUDE_DIR=/usr/include -DHDF5_LIB_PATH=/usr/lib -DLIBKEA_WITH_GDAL=OFF
-make -j4
-sudo make install
-cd ../..
+
+wget https://github.com/ubarsc/kealib/archive/kealib-1.4.12.zip
+unzip kealib-1.4.12.zip
+(cd kealib-kealib-1.4.12;
+cmake . -DBUILD_SHARED_LIBS=ON -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX=/usr -DHDF5_INCLUDE_DIR=/usr/include -DHDF5_LIB_PATH=/usr/lib -DLIBKEA_WITH_GDAL=OFF;
+make -j4;
+sudo make install)
 
 # Build zstd
 wget https://github.com/facebook/zstd/archive/v1.3.3.tar.gz

From 107a8998d48b2db7323c73a8329411c30c44e975 Mon Sep 17 00:00:00 2001
From: Even Rouault <even.rouault@spatialys.com>
Date: Fri, 20 Mar 2020 17:27:19 +0100
Subject: [PATCH 468/488] VRT pansharpening: fix crash when NoData is set and
 input multispectral bands are separate files (fixes #2328)

---
 autotest/gdrivers/vrtpansharpen.py | 31 ++++++++++++++++++++++++++++++
 gdal/alg/gdalpansharpen.cpp        |  9 +++++++--
 gdal/frmts/vrt/vrtpansharpened.cpp |  8 +++++---
 3 files changed, 43 insertions(+), 5 deletions(-)

diff --git a/autotest/gdrivers/vrtpansharpen.py b/autotest/gdrivers/vrtpansharpen.py
index c1694d93623b..0030acc63c62 100755
--- a/autotest/gdrivers/vrtpansharpen.py
+++ b/autotest/gdrivers/vrtpansharpen.py
@@ -1763,6 +1763,37 @@ def test_vrtpansharpen_11():
     gdal.PopErrorHandler()
     assert vrt_ds is None
 
+###############################################################################
+# Test fix for https://github.com/OSGeo/gdal/issues/2328
+
+
+def test_vrtpansharpen_nodata_multiple_spectral_bands():
+
+    gdal.Translate('/vsimem/b1.tif', 'data/small_world.tif')
+    gdal.Translate('/vsimem/b2.tif', 'data/small_world.tif')
+
+    vrt_ds = gdal.Open("""<VRTDataset subClass="VRTPansharpenedDataset">
+  <PansharpeningOptions>
+      <NoData>0</NoData>
+    <PanchroBand>
+      <SourceFilename>data/small_world.tif</SourceFilename>
+      <SourceBand>1</SourceBand>
+    </PanchroBand>
+    <SpectralBand dstBand="1">
+      <SourceFilename>/vsimem/b1.tif</SourceFilename>
+      <SourceBand>1</SourceBand>
+    </SpectralBand>
+    <SpectralBand dstBand="2">
+      <SourceFilename>/vsimem/b2.tif</SourceFilename>
+      <SourceBand>1</SourceBand>
+    </SpectralBand>
+  </PansharpeningOptions>
+</VRTDataset>""")
+    assert vrt_ds
+
+    gdal.Unlink('/vsimem/b1.tif')
+    gdal.Unlink('/vsimem/b2.tif')
+
 ###############################################################################
 # Cleanup
 
diff --git a/gdal/alg/gdalpansharpen.cpp b/gdal/alg/gdalpansharpen.cpp
index 98ace11c53e0..51c7e8efc7a1 100644
--- a/gdal/alg/gdalpansharpen.cpp
+++ b/gdal/alg/gdalpansharpen.cpp
@@ -325,17 +325,22 @@ GDALPansharpenOperation::Initialize( const GDALPansharpenOptions* psOptionsIn )
             for( int i = 0; i < psOptions->nInputSpectralBands; i++ )
             {
                 GDALRasterBand* poSrcBand = aMSBands[i];
+                int iVRTBand;
                 if( anInputBands.empty() || i == 0 )
                 {
                     poVDS = new VRTDataset(poSrcBand->GetXSize(), poSrcBand->GetYSize());
                     aVDS.push_back(poVDS);
+                    iVRTBand = 1;
                 }
-                if( !anInputBands.empty() )
+                else
+                {
                     anInputBands[i] = i + 1;
+                    iVRTBand = i + 1;
+                }
                 poVDS->AddBand(poSrcBand->GetRasterDataType(), nullptr);
                 VRTSourcedRasterBand* poVRTBand =
                     dynamic_cast<VRTSourcedRasterBand*>(
-                        poVDS->GetRasterBand(i + 1));
+                        poVDS->GetRasterBand(iVRTBand));
                 if( poVRTBand == nullptr )
                     return CE_Failure;
                 aMSBands[i] = poVRTBand;
diff --git a/gdal/frmts/vrt/vrtpansharpened.cpp b/gdal/frmts/vrt/vrtpansharpened.cpp
index b4486922e539..f2dc5deb3ac4 100644
--- a/gdal/frmts/vrt/vrtpansharpened.cpp
+++ b/gdal/frmts/vrt/vrtpansharpened.cpp
@@ -1066,6 +1066,11 @@ CPLErr VRTPansharpenedDataset::XMLInit( CPLXMLNode *psTree, const char *pszVRTPa
     eErr = m_poPansharpener->Initialize(psPanOptions);
     if( eErr != CE_None )
     {
+        // Delete the pansharper object before closing the dataset
+        // because it may have warped the bands into an intermediate VRT
+        delete m_poPansharpener;
+        m_poPansharpener = nullptr;
+
         // Close in reverse order (VRT firsts and real datasets after)
         for( int i = static_cast<int>( m_apoDatasetsToClose.size() ) - 1;
              i >= 0;
@@ -1074,9 +1079,6 @@ CPLErr VRTPansharpenedDataset::XMLInit( CPLXMLNode *psTree, const char *pszVRTPa
             GDALClose(m_apoDatasetsToClose[i]);
         }
         m_apoDatasetsToClose.resize(0);
-
-        delete m_poPansharpener;
-        m_poPansharpener = nullptr;
     }
     GDALDestroyPansharpenOptions(psPanOptions);
 

From 66d0423706ae162dec5109e86ea27e226e7e4a5e Mon Sep 17 00:00:00 2001
From: Even Rouault <even.rouault@spatialys.com>
Date: Sun, 22 Mar 2020 18:03:25 +0100
Subject: [PATCH 469/488] GRIB2: add support for rotated lat-lon grids

Ported from master 90e1e6bfc4f829e3ef0d7382a6fbdd944a3235a6
---
 gdal/frmts/grib/degrib/degrib/meta.h        |  6 ++--
 gdal/frmts/grib/degrib/degrib/metaparse.cpp | 10 ++++++
 gdal/frmts/grib/gribdataset.cpp             | 38 +++++++++++----------
 3 files changed, 34 insertions(+), 20 deletions(-)

diff --git a/gdal/frmts/grib/degrib/degrib/meta.h b/gdal/frmts/grib/degrib/degrib/meta.h
index 282e3526acff..8151a90d6406 100644
--- a/gdal/frmts/grib/degrib/degrib/meta.h
+++ b/gdal/frmts/grib/degrib/degrib/meta.h
@@ -462,9 +462,11 @@ typedef struct {
  * Definition Section. In GRIB2 the GDS was in section 3, in GRIB1 it was in
  * section 2.
  */
-enum { GS3_LATLON = 0, GS3_MERCATOR = 10, GS3_TRANSVERSE_MERCATOR = 12, GS3_POLAR = 20,
+enum { GS3_LATLON = 0,
+       GS3_ROTATED_LATLON = 1,
+       GS3_MERCATOR = 10, GS3_TRANSVERSE_MERCATOR = 12, GS3_POLAR = 20,
        GS3_LAMBERT = 30, GS3_ALBERS_EQUAL_AREA = 31, GS3_GAUSSIAN_LATLON = 40, GS3_ORTHOGRAPHIC = 90,
-       GS3_ROTATED_LATLON = 100, GS3_EQUATOR_EQUIDIST = 110, GS3_AZIMUTH_RANGE = 120, GS3_LAMBERT_AZIMUTHAL = 140};
+       GS3_EQUATOR_EQUIDIST = 110, GS3_AZIMUTH_RANGE = 120, GS3_LAMBERT_AZIMUTHAL = 140};
 
 /* Note: It appears that compilers break up a struct based on the largest
    element type.  In this case a double.  So to avoid wasted memory, we need
diff --git a/gdal/frmts/grib/degrib/degrib/metaparse.cpp b/gdal/frmts/grib/degrib/degrib/metaparse.cpp
index d48e7ad5f2f3..f961a20607ba 100644
--- a/gdal/frmts/grib/degrib/degrib/metaparse.cpp
+++ b/gdal/frmts/grib/degrib/degrib/metaparse.cpp
@@ -1027,6 +1027,7 @@ static int ParseSect3 (sInt4 *is3, sInt4 ns3, grib_MetaData *meta)
    meta->gds.lat2 = meta->gds.lon2 = 0;
    switch (is3[12]) {
       case GS3_LATLON: /* 0: Regular lat/lon grid. */
+      case GS3_ROTATED_LATLON: // 1: Rotated lat/lon grid
       case GS3_GAUSSIAN_LATLON:  /* 40: Gaussian lat/lon grid. */
          if (ns3 < 72) {
             return -1;
@@ -1066,6 +1067,15 @@ static int ParseSect3 (sInt4 *is3, sInt4 ns3, grib_MetaData *meta)
          meta->gds.scan = (uChar) is3[71];
          meta->gds.meshLat = 0;
          meta->gds.orientLon = 0;
+         if( is3[12] == GS3_ROTATED_LATLON ) {
+             if( ns3 < 84 ) {
+                 return -1;
+             }
+             meta->gds.f_typeLatLon = 3;
+             meta->gds.southLat = is3[73-1] * unit;
+             meta->gds.southLon = is3[77-1] * unit;
+             meta->gds.angleRotate = is3[81-1] * unit;
+         }
          /* Resolve resolution flag(bit 3,4).  Copy Dx,Dy as appropriate. */
          if ((meta->gds.resFlag & GRIB2BIT_3) &&
              (!(meta->gds.resFlag & GRIB2BIT_4))) {
diff --git a/gdal/frmts/grib/gribdataset.cpp b/gdal/frmts/grib/gribdataset.cpp
index 76a3d7a3c327..fb070e413947 100644
--- a/gdal/frmts/grib/gribdataset.cpp
+++ b/gdal/frmts/grib/gribdataset.cpp
@@ -1143,12 +1143,7 @@ void GRIBDataset::SetGribMetaData(grib_MetaData *meta)
         // No projection, only latlon system (geographic).
         break;
     case GS3_ROTATED_LATLON:
-        CPLDebug("GRIB", "angleRotate=%f, southLat=%f, southLon=%f, poleLat=%f, poleLon=%f",
-                 meta->gds.angleRotate,
-                 meta->gds.southLat,
-                 meta->gds.southLon,
-                 meta->gds.poleLat,
-                 meta->gds.poleLon);
+        // will apply pole rotation afterwards
         break;
     case GS3_MERCATOR:
         if( meta->gds.orientLon == 0.0 )
@@ -1251,6 +1246,24 @@ void GRIBDataset::SetGribMetaData(grib_MetaData *meta)
         }
     }
 
+    if( meta->gds.projType == GS3_ROTATED_LATLON )
+    {
+        const double dfSouthPoleLat = meta->gds.southLat;
+        const double dfSouthPoleLon = meta->gds.southLon > 180 ?
+                meta->gds.southLon - 360 : meta->gds.southLon;
+        const double dfAxisRotation = meta->gds.angleRotate;
+        oSRS.SetProjection( "Rotated_pole" );
+        oSRS.SetExtension(
+            "PROJCS", "PROJ4",
+            CPLSPrintf("+proj=ob_tran +lon_0=%.18g +o_proj=longlat +o_lon_p=%.18g "
+                    "+o_lat_p=%.18g +a=%.18g +b=%.18g +to_meter=0.0174532925199 +wktext",
+                    dfSouthPoleLon,
+                    dfAxisRotation == 0 ? 0 : -dfAxisRotation,
+                    dfSouthPoleLat == 0 ? 0 : -dfSouthPoleLat,
+                    oSRS.GetSemiMajor(nullptr),
+                    oSRS.GetSemiMinor(nullptr)));
+    }
+
     OGRSpatialReference oLL;  // Construct the "geographic" part of oSRS.
     oLL.CopyGeogCSFrom(&oSRS);
 
@@ -1278,7 +1291,7 @@ void GRIBDataset::SetGribMetaData(grib_MetaData *meta)
         rPixelSizeX = meta->gds.Dx;
         rPixelSizeY = meta->gds.Dy;
     }
-    else if( oSRS.IsProjected() )
+    else if( oSRS.IsProjected() && meta->gds.projType != GS3_ROTATED_LATLON )
     {
         // Longitude in degrees, to be transformed to meters (or degrees in
         // case of latlon).
@@ -1379,17 +1392,6 @@ void GRIBDataset::SetGribMetaData(grib_MetaData *meta)
     adfGeoTransform[1] = rPixelSizeX;
     adfGeoTransform[5] = -rPixelSizeY;
 
-    if( meta->gds.projType == GS3_ROTATED_LATLON &&
-        meta->gds.angleRotate == 0 )
-    {
-        oSRS.SetProjection( "Rotated_pole" );
-        oSRS.SetExtension(
-            "PROJCS", "PROJ4",
-            CPLSPrintf("+proj=ob_tran +lon_0=%.18g +o_proj=longlat +o_lon_p=0 "
-                       "+o_lat_p=%.18g +a=%.18g +b=%.18g +to_meter=0.0174532925199 +wktext",
-                       meta->gds.southLon, -meta->gds.southLat, a, b));
-    }
-
     CPLFree(pszProjection);
     pszProjection = nullptr;
     oSRS.exportToWkt(&pszProjection);

From 16363d950c2877848e07e61722383a0838e9c4df Mon Sep 17 00:00:00 2001
From: Even Rouault <even.rouault@spatialys.com>
Date: Wed, 25 Mar 2020 13:36:53 +0100
Subject: [PATCH 470/488] JP2KAK and JP2OPENJPEG: fix to read images whose
 origin is not (0,0)

---
 .../gdrivers/data/byte_image_origin_not_zero.jp2  | Bin 0 -> 566 bytes
 autotest/gdrivers/jp2kak.py                       |  12 ++++++++++++
 autotest/gdrivers/jp2openjpeg.py                  |  13 +++++++++++++
 gdal/frmts/jp2kak/jp2kakdataset.cpp               |  12 ++++++------
 gdal/frmts/openjpeg/openjpegdataset.cpp           |  14 ++++++++++----
 5 files changed, 41 insertions(+), 10 deletions(-)
 create mode 100644 autotest/gdrivers/data/byte_image_origin_not_zero.jp2

diff --git a/autotest/gdrivers/data/byte_image_origin_not_zero.jp2 b/autotest/gdrivers/data/byte_image_origin_not_zero.jp2
new file mode 100644
index 0000000000000000000000000000000000000000..dc53a79c874ee4c133ea96b9bee51506ed390691
GIT binary patch
literal 566
zcmZQzVBpCLP*C9IYUg5LU=T?wsVvAUFj4@r8KAT-kj?;d#WFKeih#5T7&Ef718D{Z
z{^b0eB1SM%kb!~mB~WqlfB*l144PmuBOqx5#BxBa0mKl^Fg_zYBjf)d1|FaUBLgD~
z3j^c-7zTC+2M>>c|0xWr42;f2sfi`2DGEuI3jPJDd0qjo?h0k8Ma7x<c?w2)#(D<-
zCoq8A&A?a!)I0h7)(94r&2u>3b3b`)+Q04<GgI57*UuAN6`KO4R>xee<LG-(zG(l~
zH-1&DrVHEq?Ifl8THdL!mhGO_RB>u$@|2fm{|+t46JR^7(BD3Bc6&v8ZKz<`)!p(_
z4!;WN-x?;Lbwk1C;Kj~npA(&zEI(g2Og~z3GdN?zEcdT7EVLVJ4b=26pL{aUT}STY
z9fiVQbAKrd3p~zD{rrBSXzhQsl^qIoQaSAUQ|b$<_B33$ma@M_DCh5s`2EeEHS4%1
z+zor+B6xCT(&cjF8LW}YXPN^Ap0kCTum>G!yzV4ZqTEyeKWFXy{R#_LXPud3Htnm!
zuQ{i+t@r~<LM`f)F3dRnOQP@AqsgHWZ5+qeNG~+DEzODQdVFF#v*xaLzGXVUtXFLk
zk?m~K&G6p#Q|wir&u&Mvq|0j?_AlF)Ua)uV*6mXmcirXwq?Ta6R>t@g|02e{r|)L|
fWRRDRU3#i??T6Kw>^wW}&bXC7`N^LH|8D{S{j}Ms

literal 0
HcmV?d00001

diff --git a/autotest/gdrivers/jp2kak.py b/autotest/gdrivers/jp2kak.py
index 1cae3d6bceb8..6d8c56a75878 100755
--- a/autotest/gdrivers/jp2kak.py
+++ b/autotest/gdrivers/jp2kak.py
@@ -458,6 +458,18 @@ def test_jp2kak_22():
 
     gdal.Unlink('/vsimem/jp2kak_22.jp2')
 
+###############################################################################
+# Test reading an image whose origin is not (0,0)
+
+
+def test_jp2kak_image_origin_not_zero():
+
+    if gdaltest.jp2kak_drv is None:
+        pytest.skip()
+
+    ds = gdal.Open('data/byte_image_origin_not_zero.jp2')
+    assert ds.GetRasterBand(1).Checksum() == 4672
+    assert ds.GetRasterBand(1).ReadRaster(0,0,20,20,10,10) is not None
 
 ###############################################################################
 # Cleanup.
diff --git a/autotest/gdrivers/jp2openjpeg.py b/autotest/gdrivers/jp2openjpeg.py
index 2feb321e87e4..31794a377a0d 100755
--- a/autotest/gdrivers/jp2openjpeg.py
+++ b/autotest/gdrivers/jp2openjpeg.py
@@ -3122,6 +3122,19 @@ def test_jp2openjpeg_odd_dimensions_overviews():
     ds = None
 
 ###############################################################################
+# Test reading an image whose origin is not (0,0)
+
+
+def test_jp2openjpeg_image_origin_not_zero():
+
+    if gdaltest.jp2openjpeg_drv is None:
+        pytest.skip()
+
+    ds = gdal.Open('data/byte_image_origin_not_zero.jp2')
+    assert ds.GetRasterBand(1).Checksum() == 4672
+    assert ds.GetRasterBand(1).ReadRaster(0,0,20,20,10,10) is not None
+
+###############################################################################
 
 
 def test_jp2openjpeg_cleanup():
diff --git a/gdal/frmts/jp2kak/jp2kakdataset.cpp b/gdal/frmts/jp2kak/jp2kakdataset.cpp
index d9ab8cd540c5..620c237381a4 100644
--- a/gdal/frmts/jp2kak/jp2kakdataset.cpp
+++ b/gdal/frmts/jp2kak/jp2kakdataset.cpp
@@ -1371,8 +1371,8 @@ JP2KAKDataset::DirectRasterIO( GDALRWFlag /* eRWFlag */,
         poCodeStream->apply_input_restrictions(0, 0, nDiscardLevels, 0, nullptr);
         kdu_dims l_dims;
         poCodeStream->get_dims(0, l_dims);
-        const int nOvrXSize = l_dims.size.x;
-        const int nOvrYSize = l_dims.size.y;
+        const int nOvrCanvasXSize = l_dims.pos.x + l_dims.size.x;
+        const int nOvrCanvasYSize = l_dims.pos.y + l_dims.size.y;
 
         l_dims.pos.x = l_dims.pos.x + nXOff / nResMult;
         l_dims.pos.y = l_dims.pos.y + nYOff / nResMult;
@@ -1393,10 +1393,10 @@ JP2KAKDataset::DirectRasterIO( GDALRWFlag /* eRWFlag */,
         {
             l_dims.size.y = nBufYSize;
         }
-        if( l_dims.pos.x + l_dims.size.x > nOvrXSize )
-            l_dims.size.x = nOvrXSize - l_dims.pos.x;
-        if( l_dims.pos.y + l_dims.size.y > nOvrYSize )
-            l_dims.size.y = nOvrYSize - l_dims.pos.y;
+        if( l_dims.pos.x + l_dims.size.x > nOvrCanvasXSize )
+            l_dims.size.x = nOvrCanvasXSize - l_dims.pos.x;
+        if( l_dims.pos.y + l_dims.size.y > nOvrCanvasYSize )
+            l_dims.size.y = nOvrCanvasYSize - l_dims.pos.y;
 
         kdu_dims l_dims_roi;
 
diff --git a/gdal/frmts/openjpeg/openjpegdataset.cpp b/gdal/frmts/openjpeg/openjpegdataset.cpp
index 24846edce3c4..ebab8f0d9735 100644
--- a/gdal/frmts/openjpeg/openjpegdataset.cpp
+++ b/gdal/frmts/openjpeg/openjpegdataset.cpp
@@ -227,6 +227,8 @@ class JP2OpenJPEGDataset final: public GDALJP2AbstractDataset
     JP2OpenJPEGFile* m_psJP2OpenJPEGFile = nullptr;
     int*             m_pnLastLevel = nullptr;
 #endif
+    int         m_nX0 = 0;
+    int         m_nY0 = 0;
 
     int         nThreads = -1;
     int         m_nBlocksToLoad = 0;
@@ -922,10 +924,10 @@ CPLErr JP2OpenJPEGDataset::ReadBlock( int nBand, VSILFILE* fpIn,
         /* The decode area must be expressed in grid reference, ie at full*/
         /* scale */
         if (!opj_set_decode_area(pCodec,psImage,
-                                 static_cast<int>(static_cast<GIntBig>(nBlockXOff*nBlockXSize) * nParentXSize / nRasterXSize),
-                                 static_cast<int>(static_cast<GIntBig>(nBlockYOff*nBlockYSize) * nParentYSize / nRasterYSize),
-                                 static_cast<int>(static_cast<GIntBig>(nBlockXOff*nBlockXSize+nWidthToRead) * nParentXSize / nRasterXSize),
-                                 static_cast<int>(static_cast<GIntBig>(nBlockYOff*nBlockYSize+nHeightToRead) * nParentYSize / nRasterYSize)))
+                                 m_nX0 + static_cast<int>(static_cast<GIntBig>(nBlockXOff*nBlockXSize) * nParentXSize / nRasterXSize),
+                                 m_nY0 + static_cast<int>(static_cast<GIntBig>(nBlockYOff*nBlockYSize) * nParentYSize / nRasterYSize),
+                                 m_nX0 + static_cast<int>(static_cast<GIntBig>(nBlockXOff*nBlockXSize+nWidthToRead) * nParentXSize / nRasterXSize),
+                                 m_nY0 + static_cast<int>(static_cast<GIntBig>(nBlockYOff*nBlockYSize+nHeightToRead) * nParentYSize / nRasterYSize)))
         {
             CPLError(CE_Failure, CPLE_AppDefined, "opj_set_decode_area() failed");
             eErr = CE_Failure;
@@ -1869,6 +1871,8 @@ GDALDataset *JP2OpenJPEGDataset::Open( GDALOpenInfo * poOpenInfo )
     poDS->bIs420 = bIs420;
     poDS->bSingleTiled = (poDS->nRasterXSize == (int)nTileW &&
                           poDS->nRasterYSize == (int)nTileH);
+    poDS->m_nX0 = psImage->x0;
+    poDS->m_nY0 = psImage->y0;
 
     if( CPLFetchBool(poOpenInfo->papszOpenOptions, "USE_TILE_AS_BLOCK", false) )
     {
@@ -2211,6 +2215,8 @@ GDALDataset *JP2OpenJPEGDataset::Open( GDALOpenInfo * poOpenInfo )
         }
         poODS->m_pnLastLevel = poDS->m_pnLastLevel;
 #endif
+        poODS->m_nX0 = poDS->m_nX0;
+        poODS->m_nY0 = poDS->m_nY0;
 
         for( iBand = 1; iBand <= poDS->nBands; iBand++ )
         {

From c9637d03d890e35afef23e640130ed48e02b556c Mon Sep 17 00:00:00 2001
From: Even Rouault <even.rouault@spatialys.com>
Date: Fri, 27 Mar 2020 11:06:04 +0100
Subject: [PATCH 471/488] gdaldem: avoid potential integer overflow in
 color-relief mode (fixes #2354)

Spotted by @MinluLi
---
 gdal/apps/gdaldem_lib.cpp | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/gdal/apps/gdaldem_lib.cpp b/gdal/apps/gdaldem_lib.cpp
index 8180ef40a08b..ada10b3add4f 100644
--- a/gdal/apps/gdaldem_lib.cpp
+++ b/gdal/apps/gdaldem_lib.cpp
@@ -1933,9 +1933,10 @@ GByte* GDALColorReliefPrecompute(GDALRasterBandH hSrcBand,
     const int nIndexOffset = (eDT == GDT_Int16) ? 32768 : 0;
     *pnIndexOffset = nIndexOffset;
     const int nXSize = GDALGetRasterBandXSize(hSrcBand);
-    const int nYSize = GDALGetRasterBandXSize(hSrcBand);
+    const int nYSize = GDALGetRasterBandYSize(hSrcBand);
     if( eDT == GDT_Byte ||
-        ((eDT == GDT_Int16 || eDT == GDT_UInt16) && nXSize * nYSize > 65536) )
+        ((eDT == GDT_Int16 || eDT == GDT_UInt16) &&
+         static_cast<GIntBig>(nXSize) * nYSize > 65536) )
     {
         const int iMax = (eDT == GDT_Byte) ? 256: 65536;
         pabyPrecomputed = static_cast<GByte *>(VSI_MALLOC2_VERBOSE(4, iMax));

From 68b206c5dc3105a611a7889c834a7008af1afd9e Mon Sep 17 00:00:00 2001
From: Even Rouault <even.rouault@spatialys.com>
Date: Fri, 27 Mar 2020 18:51:29 +0100
Subject: [PATCH 472/488] GML: fix axis order issue when decoding AIXM
 ElevationPoint (fixes #2356)

---
 gdal/ogr/ogrsf_frmts/gml/gmlhandler.cpp | 19 +++----------------
 1 file changed, 3 insertions(+), 16 deletions(-)

diff --git a/gdal/ogr/ogrsf_frmts/gml/gmlhandler.cpp b/gdal/ogr/ogrsf_frmts/gml/gmlhandler.cpp
index f3f9ef86459a..b1530cb93fd8 100644
--- a/gdal/ogr/ogrsf_frmts/gml/gmlhandler.cpp
+++ b/gdal/ogr/ogrsf_frmts/gml/gmlhandler.cpp
@@ -1432,23 +1432,10 @@ CPLXMLNode* GMLHandler::ParseAIXMElevationPoint(CPLXMLNode *psGML)
 
     const char* pszPos = CPLGetXMLValue( psGML, "pos", nullptr );
     const char* pszCoordinates = CPLGetXMLValue( psGML, "coordinates", nullptr );
-    if (pszPos != nullptr)
+    if (pszPos != nullptr || pszCoordinates != nullptr)
     {
-        char* pszGeometry = CPLStrdup(CPLSPrintf(
-            "<gml:Point><gml:pos>%s</gml:pos></gml:Point>",
-                                                    pszPos));
-        CPLDestroyXMLNode(psGML);
-        psGML = CPLParseXMLString(pszGeometry);
-        CPLFree(pszGeometry);
-    }
-    else if (pszCoordinates != nullptr)
-    {
-        char* pszGeometry = CPLStrdup(CPLSPrintf(
-            "<gml:Point><gml:coordinates>%s</gml:coordinates></gml:Point>",
-                                            pszCoordinates));
-        CPLDestroyXMLNode(psGML);
-        psGML = CPLParseXMLString(pszGeometry);
-        CPLFree(pszGeometry);
+        CPLFree(psGML->pszValue);
+        psGML->pszValue = CPLStrdup("gml:Point");
     }
     else
     {

From cab3d46a69c258fd161366be96006f565f01bc24 Mon Sep 17 00:00:00 2001
From: Alan Thomas <athomas@thinkspatial.com.au>
Date: Sat, 28 Mar 2020 13:11:46 +1100
Subject: [PATCH 473/488] DXF writer: Re-add some header and trailer elements
 (fixes #1213)

Partially reverts 4d4e27386cfd7016e6aec974e122208d4dc1f4f3.
---
 gdal/data/header.dxf  | 106 +-----------
 gdal/data/trailer.dxf | 382 ++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 383 insertions(+), 105 deletions(-)

diff --git a/gdal/data/header.dxf b/gdal/data/header.dxf
index c679691506a1..3cf13f496a62 100644
--- a/gdal/data/header.dxf
+++ b/gdal/data/header.dxf
@@ -167,34 +167,6 @@ $SKPOLY
  70
      0
   9
-$TDCREATE
- 40
-2455343.56230316
-  9
-$TDUCREATE
- 40
-2455343.728969826
-  9
-$TDUPDATE
- 40
-2455343.562303171
-  9
-$TDUUPDATE
- 40
-2455343.728969838
-  9
-$TDINDWG
- 40
-0.0000000116
-  9
-$TDUSRTIMER
- 40
-0.0000000116
-  9
-$USRTIMER
- 70
-     1
-  9
 $ANGBASE
  50
 0.0
@@ -567,14 +539,6 @@ $PSTYLEMODE
 290
      1
   9
-$FINGERPRINTGUID
-  2
-{E7F7769E-AACA-40AB-9EF3-61BBAFBCBA26}
-  9
-$VERSIONGUID
-  2
-{FAEB1C32-E019-11D5-929B-00C0DF256EC4}
-  9
 $EXTNAMES
 290
      1
@@ -653,22 +617,6 @@ ObjectDBX Classes
 281
      0
   0
-CLASS
-  1
-VISUALSTYLE
-  2
-AcDbVisualStyle
-  3
-ObjectDBX Classes
- 90
-     4095
- 91
-        4
-280
-     0
-281
-     0
-  0
 ENDSEC
   0
 SECTION
@@ -1081,20 +1029,6 @@ AcDbBlockTableRecord
 340
 1E
   0
-BLOCK_RECORD
-  5
-23
-330
-1
-100
-AcDbSymbolTableRecord
-100
-AcDbBlockTableRecord
-  2
-*Paper_Space0
-340
-26
-  0
 ENDTAB
   0
 ENDSEC
@@ -1181,48 +1115,10 @@ AcDbEntity
   8
 0
 100
-AcDbBlockEnd
-  0
-BLOCK
-  5
-24
-330
-23
-100
-AcDbEntity
-  8
-0
-100
-AcDbBlockBegin
-  2
-*Paper_Space0
- 70
-     0
- 10
-0.0
- 20
-0.0
- 30
-0.0
-  3
-*Paper_Space0
-  1
-
-  0
-ENDBLK
-  5
-25
-330
-23
-100
-AcDbEntity
-  8
-0
-100
 AcDbBlockEnd
   0
 ENDSEC
   0
 SECTION
-  2 
+  2
 ENTITIES
diff --git a/gdal/data/trailer.dxf b/gdal/data/trailer.dxf
index 492a89bc2b77..0d545ffd737a 100644
--- a/gdal/data/trailer.dxf
+++ b/gdal/data/trailer.dxf
@@ -18,6 +18,26 @@ AcDbDictionary
 ACAD_GROUP
 350
 D
+  3
+ACAD_LAYOUT
+350
+1A
+  3
+ACAD_MLEADERSTYLE
+350
+43
+  3
+ACAD_PLOTSETTINGS
+350
+19
+  3
+ACAD_PLOTSTYLENAME
+350
+E
+  3
+ACAD_TABLESTYLE
+350
+42
   0
 DICTIONARY
   5
@@ -35,6 +55,368 @@ AcDbDictionary
 281
      1
   0
+DICTIONARY
+  5
+1A
+102
+{ACAD_REACTORS
+330
+C
+102
+}
+330
+C
+100
+AcDbDictionary
+281
+     1
+  3
+Layout1
+350
+1E
+  3
+Model
+350
+22
+  0
+DICTIONARY
+  5
+43
+102
+{ACAD_REACTORS
+330
+C
+102
+}
+330
+C
+100
+AcDbDictionary
+281
+     1
+  0
+DICTIONARY
+  5
+19
+102
+{ACAD_REACTORS
+330
+C
+102
+}
+330
+C
+100
+AcDbDictionary
+281
+     1
+  0
+ACDBDICTIONARYWDFLT
+  5
+E
+102
+{ACAD_REACTORS
+330
+C
+102
+}
+330
+C
+100
+AcDbDictionary
+281
+     1
+  3
+Normal
+350
+F
+100
+AcDbDictionaryWithDefault
+340
+F
+  0
+DICTIONARY
+  5
+42
+102
+{ACAD_REACTORS
+330
+C
+102
+}
+330
+C
+100
+AcDbDictionary
+281
+     1
+  0
+LAYOUT
+  5
+1E
+102
+{ACAD_REACTORS
+330
+1A
+102
+}
+330
+1A
+100
+AcDbPlotSettings
+  1
+
+  2
+none_device
+  4
+
+  6
+
+ 40
+0.0
+ 41
+0.0
+ 42
+0.0
+ 43
+0.0
+ 44
+0.0
+ 45
+0.0
+ 46
+0.0
+ 47
+0.0
+ 48
+0.0
+ 49
+0.0
+140
+0.0
+141
+0.0
+142
+1.0
+143
+1.0
+ 70
+   688
+ 72
+     0
+ 73
+     0
+ 74
+     5
+  7
+
+ 75
+    16
+ 76
+     0
+ 77
+     2
+ 78
+   300
+147
+1.0
+148
+0.0
+149
+0.0
+100
+AcDbLayout
+  1
+Layout1
+ 70
+     1
+ 71
+     1
+ 10
+0.0
+ 20
+0.0
+ 11
+12.0
+ 21
+9.0
+ 12
+0.0
+ 22
+0.0
+ 32
+0.0
+ 14
+1.000000000000000E+20
+ 24
+1.000000000000000E+20
+ 34
+1.000000000000000E+20
+ 15
+-1.000000000000000E+20
+ 25
+-1.000000000000000E+20
+ 35
+-1.000000000000000E+20
+146
+0.0
+ 13
+0.0
+ 23
+0.0
+ 33
+0.0
+ 16
+1.0
+ 26
+0.0
+ 36
+0.0
+ 17
+0.0
+ 27
+1.0
+ 37
+0.0
+ 76
+     0
+330
+1B
+  0
+LAYOUT
+  5
+22
+102
+{ACAD_REACTORS
+330
+1A
+102
+}
+330
+1A
+100
+AcDbPlotSettings
+  1
+
+  2
+none_device
+  4
+
+  6
+
+ 40
+0.0
+ 41
+0.0
+ 42
+0.0
+ 43
+0.0
+ 44
+0.0
+ 45
+0.0
+ 46
+0.0
+ 47
+0.0
+ 48
+0.0
+ 49
+0.0
+140
+0.0
+141
+0.0
+142
+1.0
+143
+1.0
+ 70
+  1712
+ 72
+     0
+ 73
+     0
+ 74
+     0
+  7
+
+ 75
+     0
+ 76
+     0
+ 77
+     2
+ 78
+   300
+147
+1.0
+148
+0.0
+149
+0.0
+100
+AcDbLayout
+  1
+Model
+ 70
+     1
+ 71
+     0
+ 10
+0.0
+ 20
+0.0
+ 11
+12.0
+ 21
+9.0
+ 12
+0.0
+ 22
+0.0
+ 32
+0.0
+ 14
+30.0
+ 24
+49.75
+ 34
+0.0
+ 15
+130.5
+ 25
+163.1318914119703
+ 35
+0.0
+146
+0.0
+ 13
+0.0
+ 23
+0.0
+ 33
+0.0
+ 16
+1.0
+ 26
+0.0
+ 36
+0.0
+ 17
+0.0
+ 27
+1.0
+ 37
+0.0
+ 76
+     0
+330
+1F
+331
+29
+  0
 ENDSEC
   0
 EOF

From ba636c5308f51ac5fadd55e9c7701adf8773d964 Mon Sep 17 00:00:00 2001
From: Even Rouault <even.rouault@spatialys.com>
Date: Sat, 28 Mar 2020 23:45:03 +0100
Subject: [PATCH 474/488] GML: fix axis order issue with
 gml:CircleByCenterPoint and gml:ArcByCenterPoint (refs
 https://github.com/OSGeo/gdal/issues/2356#issuecomment-605525382)

---
 autotest/ogr/ogr_gml_geom.py | 15 +++++++++++++++
 gdal/ogr/gml2ogrgeometry.cpp | 12 ++++++------
 2 files changed, 21 insertions(+), 6 deletions(-)

diff --git a/autotest/ogr/ogr_gml_geom.py b/autotest/ogr/ogr_gml_geom.py
index 18b1986f3025..f2af47807b6e 100755
--- a/autotest/ogr/ogr_gml_geom.py
+++ b/autotest/ogr/ogr_gml_geom.py
@@ -1738,6 +1738,21 @@ def test_gml_CircleByCenterPoint():
 
     assert ogrtest.check_feature_geometry(geom, ogr.CreateGeometryFromWkt('CIRCULARSTRING (-1 2,3 2,-1 2)')) == 0
 
+###############################################################################
+# Test GML CircleByCenterPoint with uom="m"
+
+
+def test_gml_CircleByCenterPoint_srs_geog_uom_m():
+
+    gml = '<gml:CircleByCenterPoint srsName="urn:ogc:def:crs:EPSG::4326"><gml:pos>49 2</gml:pos><gml:radius uom="m">2000</gml:radius></gml:CircleByCenterPoint>'
+    geom1 = ogr.CreateGeometryFromGML(gml)
+    geom1.SwapXY()
+
+    gml = '<gml:CircleByCenterPoint srsName="URN:OGC:DEF:CRS:OGC:1.3:CRS84"><gml:pos>2 49</gml:pos><gml:radius uom="m">2000</gml:radius></gml:CircleByCenterPoint>'
+    geom2 = ogr.CreateGeometryFromGML(gml)
+
+    assert ogrtest.check_feature_geometry(geom1, geom2) == 0
+
 ###############################################################################
 # Test GML Circle
 
diff --git a/gdal/ogr/gml2ogrgeometry.cpp b/gdal/ogr/gml2ogrgeometry.cpp
index ef8e211cb7db..376b836ab0f5 100644
--- a/gdal/ogr/gml2ogrgeometry.cpp
+++ b/gdal/ogr/gml2ogrgeometry.cpp
@@ -1721,8 +1721,8 @@ OGRGeometry *GML2OGRGeometry_XMLNode_Internal(
                        // Not sure of angle conversion here.
                        90.0 - dfAngle,
                        &dfLat, &dfLong);
-                    p.setY( dfLat );
-                    p.setX( dfLong );
+                    p.setX( dfLat ); // yes, external code will do the swap later
+                    p.setY( dfLong );
                 }
                 else
                 {
@@ -1744,8 +1744,8 @@ OGRGeometry *GML2OGRGeometry_XMLNode_Internal(
                                          // Not sure of angle conversion here.
                                          90.0 - dfEndAngle,
                                          &dfLat, &dfLong);
-                p.setY( dfLat );
-                p.setX( dfLong );
+                p.setX( dfLat ); // yes, external code will do the swap later
+                p.setY( dfLong );
             }
             else
             {
@@ -1841,8 +1841,8 @@ OGRGeometry *GML2OGRGeometry_XMLNode_Internal(
                     OGR_GreatCircle_ExtendPosition(dfCenterX, dfCenterY,
                                              dfDistance, dfAngle,
                                              &dfLat, &dfLong);
-                    p.setY( dfLat );
-                    p.setX( dfLong );
+                    p.setX( dfLat ); // yes, external code will do the swap later
+                    p.setY( dfLong );
                 }
                 else
                 {

From 16b18b656d5fcba061fc2c0c1ef41549c59f39c9 Mon Sep 17 00:00:00 2001
From: Even Rouault <even.rouault@spatialys.com>
Date: Sun, 29 Mar 2020 12:51:36 +0200
Subject: [PATCH 475/488] GML: fix handling of angles with ArcByCenterPoint and
 urn:ogc:def:crs:EPSG::4326, and compound curves made of a sequence of
 straight lines and ArcByCenterPoint in a <segments> (refs #2356)

---
 autotest/ogr/ogr_gml_geom.py |  46 +++++
 gdal/ogr/gml2ogrgeometry.cpp | 329 ++++++++++++++++++++---------------
 2 files changed, 237 insertions(+), 138 deletions(-)

diff --git a/autotest/ogr/ogr_gml_geom.py b/autotest/ogr/ogr_gml_geom.py
index f2af47807b6e..60de6eab943f 100755
--- a/autotest/ogr/ogr_gml_geom.py
+++ b/autotest/ogr/ogr_gml_geom.py
@@ -1753,6 +1753,52 @@ def test_gml_CircleByCenterPoint_srs_geog_uom_m():
 
     assert ogrtest.check_feature_geometry(geom1, geom2) == 0
 
+
+###############################################################################
+# Test compound curve of ArcByCenterPoint whose ends don't exactly match
+# with ends of neighbouring curves, as found in some AIXM files
+# with all curves in the same <segment> element as found in #2356)
+
+def test_gml_CompoundCurve_of_ArcByCenterPoint_curve_in_same_segments():
+
+    geom = ogr.CreateGeometryFromGML("""
+        <aixm:Surface srsName="urn:ogc:def:crs:EPSG::4326" gml:id="ID_249">
+            <gml:patches>
+                <gml:PolygonPatch>
+                    <gml:exterior>
+                        <gml:Ring>
+                            <gml:curveMember>
+                                <gml:Curve gml:id="ID_250">
+                                    <gml:segments>
+                                        <gml:GeodesicString>
+                                            <gml:posList>55.233333333333334
+                                            -36.166666666666664 55.23116372807667
+                                            -36.89437337916484</gml:posList>
+                                        </gml:GeodesicString>
+                                        <gml:ArcByCenterPoint numArc="1">
+                                            <gml:posList>55.2333333333333
+                                            -36.166666666666664</gml:posList>
+                                            <gml:radius uom="NM">25.0</gml:radius>
+                                            <gml:startAngle uom="deg">270.0</gml:startAngle>
+                                            <gml:endAngle uom="deg">497.0</gml:endAngle>
+                                        </gml:ArcByCenterPoint>
+                                        <gml:GeodesicString>
+                                            <gml:posList>54.92816350530716 -35.674116070018954
+                                            55.233333333333334
+                                            -36.166666666666664</gml:posList>
+                                        </gml:GeodesicString>
+                                    </gml:segments>
+                                </gml:Curve>
+                            </gml:curveMember>
+                        </gml:Ring>
+                    </gml:exterior>
+                </gml:PolygonPatch>
+            </gml:patches>
+            <aixm:horizontalAccuracy uom="KM">2.0</aixm:horizontalAccuracy>
+        </aixm:Surface>""")
+
+    assert ogrtest.check_feature_geometry(geom, ogr.CreateGeometryFromWkt('POLYGON ((55.2333333333333 -36.1666666666667,55.2311637280767 -36.8943733791648,55.2602248071013 -36.8960852160185,55.2891782700249 -36.8912782655051,55.3178697537514 -36.88292675789,55.3461587637071 -36.8710639413776,55.3739064765608 -36.8557405708675,55.4009764350458 -36.8370248014709,55.4272352367262 -36.8150019876212,55.4525532129231 -36.7897743859994,55.476805093957 -36.7614607612323,55.4998706568286 -36.7301958939182,55.5216353514589 -36.6961299915025,55.5419909016414 -36.6594280032268,55.5608358769213 -36.6202688413925,55.5780762317212 -36.5788445119267,55.5936258081681 -36.5353591583435,55.6074067992521 -36.4900280239174,55.6193501691593 -36.4430763379496,55.6293960278662 -36.3947381326996,55.6374939573672 -36.3452549984946,55.6436032872147 -36.2948747851727,55.6476933173936 -36.2438502586493,55.6497434869178 -36.19243772209,55.6497434869178 -36.1408956112433,55.6476933173936 -36.089483074684,55.6436032872147 -36.0384585481606,55.6374939573672 -35.9880783348387,55.6293960278662 -35.9385952006337,55.6193501691593 -35.8902569953837,55.6074067992521 -35.8433053094159,55.5936258081681 -35.7979741749898,55.5780762317212 -35.7544888214066,55.5608358769213 -35.7130644919408,55.5419909016414 -35.6739053301065,55.5216353514589 -35.6372033418322,55.4998706568286 -35.6031374394151,55.476805093957 -35.571872572101,55.4525532129231 -35.5435589473339,55.4272352367262 -35.5183313457121,55.4009764350458 -35.4963085318624,55.3739064765608 -35.4775927624659,55.3461587637071 -35.4622693919557,55.3178697537514 -35.4504065754433,55.2891782700249 -35.4420550678282,55.2602248071013 -35.4372481173149,55.2311508336186 -35.4360014509317,55.2020980963355 -35.4383133491681,55.1732079288891 -35.4441648063421,55.1446205685763 -35.4535197729773,55.1164744843283 -35.4663254761286,55.0889057188812 -35.4825128133848,55.0620472479757 -35.5019968161103,55.0360283592393 -35.524677177381,55.0109740532301 -35.5504388400636,54.9870044689367 -35.5791526404379,54.9642343358562 -35.6106760028906,54.9427724545944 -35.6448536812344,54.9281635053072 -35.674116070019,55.2333333333333 -36.1666666666667))')) == 0
+
 ###############################################################################
 # Test GML Circle
 
diff --git a/gdal/ogr/gml2ogrgeometry.cpp b/gdal/ogr/gml2ogrgeometry.cpp
index 376b836ab0f5..35ddbcb8910a 100644
--- a/gdal/ogr/gml2ogrgeometry.cpp
+++ b/gdal/ogr/gml2ogrgeometry.cpp
@@ -1142,6 +1142,158 @@ OGRGeometry *GML2OGRGeometry_XMLNode_Internal(
         return poLinearRing;
     }
 
+    const auto storeArcByCenterPointParameters = [](
+        const CPLXMLNode* psChild,
+        const char* l_pszSRSName,
+        bool &bIsApproximateArc,
+        double &dfLastCurveApproximateArcRadius,
+        bool &bLastCurveWasApproximateArcInvertedAxisOrder)
+    {
+        const CPLXMLNode* psRadius =
+            FindBareXMLChild(psChild, "radius");
+        if( psRadius && psRadius->eType == CXT_Element )
+        {
+            double dfRadius = CPLAtof(CPLGetXMLValue(
+                psRadius, nullptr, "0"));
+            const char* pszUnits = CPLGetXMLValue(
+                psRadius, "uom", nullptr);
+            bool bSRSUnitIsDegree = false;
+            bool bInvertedAxisOrder = false;
+            if( l_pszSRSName != nullptr )
+            {
+                OGRSpatialReference oSRS;
+                if( oSRS.SetFromUserInput(l_pszSRSName)
+                    == OGRERR_NONE )
+                {
+                    if( oSRS.IsGeographic() )
+                    {
+                        bInvertedAxisOrder =
+                            CPL_TO_BOOL(oSRS.EPSGTreatsAsLatLong());
+                        bSRSUnitIsDegree =
+                            fabs(oSRS.GetAngularUnits(nullptr) -
+                                    CPLAtof(SRS_UA_DEGREE_CONV))
+                            < 1e-8;
+                    }
+                }
+            }
+            if( bSRSUnitIsDegree && pszUnits != nullptr &&
+                (EQUAL(pszUnits, "m") || EQUAL(pszUnits, "nm") ||
+                    EQUAL(pszUnits, "mi") || EQUAL(pszUnits, "ft")) )
+            {
+                bIsApproximateArc = true;
+                if( EQUAL(pszUnits, "nm") )
+                    dfRadius *= CPLAtof(SRS_UL_INTL_NAUT_MILE_CONV);
+                else if( EQUAL(pszUnits, "mi") )
+                    dfRadius *= CPLAtof(SRS_UL_INTL_STAT_MILE_CONV);
+                else if( EQUAL(pszUnits, "ft") )
+                    dfRadius *= CPLAtof(SRS_UL_INTL_FOOT_CONV);
+                dfLastCurveApproximateArcRadius = dfRadius;
+                bLastCurveWasApproximateArcInvertedAxisOrder =
+                    bInvertedAxisOrder;
+            }
+        }
+    };
+
+    const auto connectArcByCenterPointToOtherSegments = [](
+        OGRGeometry* poGeom,
+        OGRCompoundCurve* poCC,
+        const bool bIsApproximateArc,
+        const bool bLastCurveWasApproximateArc,
+        const double dfLastCurveApproximateArcRadius,
+        const bool bLastCurveWasApproximateArcInvertedAxisOrder)
+    {
+        if( bIsApproximateArc )
+        {
+            if( poGeom->getGeometryType() == wkbLineString )
+            {
+                OGRCurve* poPreviousCurve =
+                    poCC->getCurve(poCC->getNumCurves()-1);
+                OGRLineString* poLS = poGeom->toLineString();
+                if( poPreviousCurve->getNumPoints() >= 2 &&
+                    poLS->getNumPoints() >= 2 )
+                {
+                    OGRPoint p;
+                    OGRPoint p2;
+                    poPreviousCurve->EndPoint(&p);
+                    poLS->StartPoint(&p2);
+                    double dfDistance = 0.0;
+                    if( bLastCurveWasApproximateArcInvertedAxisOrder )
+                        dfDistance =
+                            OGR_GreatCircle_Distance(
+                                p.getX(), p.getY(),
+                                p2.getX(), p2.getY());
+                    else
+                        dfDistance =
+                            OGR_GreatCircle_Distance(
+                                p.getY(), p.getX(),
+                                p2.getY(), p2.getX());
+                    // CPLDebug("OGR", "%f %f",
+                    //          dfDistance,
+                    //          dfLastCurveApproximateArcRadius
+                    //          / 10.0 );
+                    if( dfDistance <
+                        dfLastCurveApproximateArcRadius / 5.0 )
+                    {
+                        CPLDebug("OGR",
+                                    "Moving approximate start of "
+                                    "ArcByCenterPoint to end of "
+                                    "previous curve");
+                        poLS->setPoint(0, &p);
+                    }
+                }
+            }
+        }
+        else if( bLastCurveWasApproximateArc )
+        {
+            OGRCurve* poPreviousCurve =
+                poCC->getCurve(poCC->getNumCurves()-1);
+            if( poPreviousCurve->getGeometryType() ==
+                wkbLineString )
+            {
+                OGRLineString* poLS = poPreviousCurve->toLineString();
+                OGRCurve *poAsCurve = poGeom->toCurve();
+
+                if( poLS->getNumPoints() >= 2 &&
+                    poAsCurve->getNumPoints() >= 2 )
+                {
+                    OGRPoint p;
+                    OGRPoint p2;
+                    poAsCurve->StartPoint(&p);
+                    poLS->EndPoint(&p2);
+                    double dfDistance = 0.0;
+                    if( bLastCurveWasApproximateArcInvertedAxisOrder )
+                        dfDistance =
+                            OGR_GreatCircle_Distance(
+                                p.getX(), p.getY(),
+                                p2.getX(), p2.getY());
+                    else
+                        dfDistance =
+                            OGR_GreatCircle_Distance(
+                                p.getY(), p.getX(),
+                                p2.getY(), p2.getX());
+                    // CPLDebug(
+                    //    "OGR", "%f %f",
+                    //    dfDistance,
+                    //    dfLastCurveApproximateArcRadius / 10.0 );
+
+                    // "A-311 WHEELER AFB OAHU, HI.xml" needs more
+                    // than 10%.
+                    if( dfDistance <
+                        dfLastCurveApproximateArcRadius / 5.0 )
+                    {
+                        CPLDebug(
+                            "OGR",
+                            "Moving approximate end of last "
+                            "ArcByCenterPoint to start of the "
+                            "current curve");
+                        poLS->setPoint(poLS->getNumPoints() - 1,
+                                        &p);
+                    }
+                }
+            }
+        }
+    };
+
 /* -------------------------------------------------------------------- */
 /*      Ring GML3                                                       */
 /* -------------------------------------------------------------------- */
@@ -1222,49 +1374,11 @@ OGRGeometry *GML2OGRGeometry_XMLNode_Internal(
                     (psChild3 = GetChildElement(psChild2)) != nullptr &&
                     strcmp(psChild3->pszValue, "ArcByCenterPoint") == 0 )
                 {
-                    const CPLXMLNode* psRadius =
-                        FindBareXMLChild(psChild3, "radius");
-                    if( psRadius && psRadius->eType == CXT_Element )
-                    {
-                        double dfRadius = CPLAtof(CPLGetXMLValue(
-                            psRadius, nullptr, "0"));
-                        const char* pszUnits = CPLGetXMLValue(
-                            psRadius, "uom", nullptr);
-                        bool bSRSUnitIsDegree = false;
-                        bool bInvertedAxisOrder = false;
-                        if( pszSRSName != nullptr )
-                        {
-                            OGRSpatialReference oSRS;
-                            if( oSRS.SetFromUserInput(pszSRSName)
-                                == OGRERR_NONE )
-                            {
-                                if( oSRS.IsGeographic() )
-                                {
-                                    bInvertedAxisOrder =
-                                        CPL_TO_BOOL(oSRS.EPSGTreatsAsLatLong());
-                                    bSRSUnitIsDegree =
-                                        fabs(oSRS.GetAngularUnits(nullptr) -
-                                             CPLAtof(SRS_UA_DEGREE_CONV))
-                                        < 1e-8;
-                                }
-                            }
-                        }
-                        if( bSRSUnitIsDegree && pszUnits != nullptr &&
-                            (EQUAL(pszUnits, "m") || EQUAL(pszUnits, "nm") ||
-                             EQUAL(pszUnits, "mi") || EQUAL(pszUnits, "ft")) )
-                        {
-                            bIsApproximateArc = true;
-                            if( EQUAL(pszUnits, "nm") )
-                                dfRadius *= CPLAtof(SRS_UL_INTL_NAUT_MILE_CONV);
-                            else if( EQUAL(pszUnits, "mi") )
-                                dfRadius *= CPLAtof(SRS_UL_INTL_STAT_MILE_CONV);
-                            else if( EQUAL(pszUnits, "ft") )
-                                dfRadius *= CPLAtof(SRS_UL_INTL_FOOT_CONV);
-                            dfLastCurveApproximateArcRadius = dfRadius;
-                            bLastCurveWasApproximateArcInvertedAxisOrder =
-                                bInvertedAxisOrder;
-                        }
-                    }
+                    storeArcByCenterPointParameters(psChild3,
+                                               pszSRSName,
+                                               bIsApproximateArc,
+                                               dfLastCurveApproximateArcRadius,
+                                               bLastCurveWasApproximateArcInvertedAxisOrder);
                 }
 
                 if( poCC == nullptr && poRing == nullptr )
@@ -1287,96 +1401,11 @@ OGRGeometry *GML2OGRGeometry_XMLNode_Internal(
                         poRing = nullptr;
                     }
 
-                    if( bIsApproximateArc )
-                    {
-                        if( poGeom->getGeometryType() == wkbLineString )
-                        {
-                            OGRCurve* poPreviousCurve =
-                                poCC->getCurve(poCC->getNumCurves()-1);
-                            OGRLineString* poLS = poGeom->toLineString();
-                            if( poPreviousCurve->getNumPoints() >= 2 &&
-                                poLS->getNumPoints() >= 2 )
-                            {
-                                OGRPoint p;
-                                OGRPoint p2;
-                                poPreviousCurve->EndPoint(&p);
-                                poLS->StartPoint(&p2);
-                                double dfDistance = 0.0;
-                                if( bLastCurveWasApproximateArcInvertedAxisOrder )
-                                    dfDistance =
-                                        OGR_GreatCircle_Distance(
-                                            p.getX(), p.getY(),
-                                            p2.getX(), p2.getY());
-                                else
-                                    dfDistance =
-                                        OGR_GreatCircle_Distance(
-                                            p.getY(), p.getX(),
-                                            p2.getY(), p2.getX());
-                                // CPLDebug("OGR", "%f %f",
-                                //          dfDistance,
-                                //          dfLastCurveApproximateArcRadius
-                                //          / 10.0 );
-                                if( dfDistance <
-                                    dfLastCurveApproximateArcRadius / 5.0 )
-                                {
-                                    CPLDebug("OGR",
-                                             "Moving approximate start of "
-                                             "ArcByCenterPoint to end of "
-                                             "previous curve");
-                                    poLS->setPoint(0, &p);
-                                }
-                            }
-                        }
-                    }
-                    else if( bLastCurveWasApproximateArc )
-                    {
-                        OGRCurve* poPreviousCurve =
-                            poCC->getCurve(poCC->getNumCurves()-1);
-                        if( poPreviousCurve->getGeometryType() ==
-                            wkbLineString )
-                        {
-                            OGRLineString* poLS = poPreviousCurve->toLineString();
-                            OGRCurve *poCurve = poGeom->toCurve();
-
-                            if( poLS->getNumPoints() >= 2 &&
-                                poCurve->getNumPoints() >= 2 )
-                            {
-                                OGRPoint p;
-                                OGRPoint p2;
-                                poCurve->StartPoint(&p);
-                                poLS->EndPoint(&p2);
-                                double dfDistance = 0.0;
-                                if( bLastCurveWasApproximateArcInvertedAxisOrder )
-                                    dfDistance =
-                                        OGR_GreatCircle_Distance(
-                                            p.getX(), p.getY(),
-                                            p2.getX(), p2.getY());
-                                else
-                                    dfDistance =
-                                        OGR_GreatCircle_Distance(
-                                            p.getY(), p.getX(),
-                                            p2.getY(), p2.getX());
-                                // CPLDebug(
-                                //    "OGR", "%f %f",
-                                //    dfDistance,
-                                //    dfLastCurveApproximateArcRadius / 10.0 );
-
-                                // "A-311 WHEELER AFB OAHU, HI.xml" needs more
-                                // than 10%.
-                                if( dfDistance <
-                                    dfLastCurveApproximateArcRadius / 5.0 )
-                                {
-                                    CPLDebug(
-                                        "OGR",
-                                        "Moving approximate end of last "
-                                        "ArcByCenterPoint to start of the "
-                                        "current curve");
-                                    poLS->setPoint(poLS->getNumPoints() - 1,
-                                                   &p);
-                                }
-                            }
-                        }
-                    }
+                    connectArcByCenterPointToOtherSegments(poGeom, poCC,
+                                                           bIsApproximateArc,
+                                                           bLastCurveWasApproximateArc,
+                                                           dfLastCurveApproximateArcRadius,
+                                                           bLastCurveWasApproximateArcInvertedAxisOrder);
 
                     OGRCurve *poCurve = poGeom->toCurve();
 
@@ -1718,8 +1747,8 @@ OGRGeometry *GML2OGRGeometry_XMLNode_Internal(
                     OGR_GreatCircle_ExtendPosition(
                        dfCenterX, dfCenterY,
                        dfDistance,
-                       // Not sure of angle conversion here.
-                       90.0 - dfAngle,
+                       // See https://ext.eurocontrol.int/aixm_confluence/display/ACG/ArcByCenterPoint+Interpretation+Summary
+                       dfAngle,
                        &dfLat, &dfLong);
                     p.setX( dfLat ); // yes, external code will do the swap later
                     p.setY( dfLong );
@@ -1741,8 +1770,7 @@ OGRGeometry *GML2OGRGeometry_XMLNode_Internal(
             {
                 OGR_GreatCircle_ExtendPosition(dfCenterX, dfCenterY,
                                          dfDistance,
-                                         // Not sure of angle conversion here.
-                                         90.0 - dfEndAngle,
+                                         dfEndAngle,
                                          &dfLat, &dfLong);
                 p.setX( dfLat ); // yes, external code will do the swap later
                 p.setY( dfLong );
@@ -2468,6 +2496,10 @@ OGRGeometry *GML2OGRGeometry_XMLNode_Internal(
         OGRCompoundCurve *poCC = nullptr;
         bool bChildrenAreAllLineString = true;
 
+        bool bLastCurveWasApproximateArc = false;
+        bool bLastCurveWasApproximateArcInvertedAxisOrder = false;
+        double dfLastCurveApproximateArcRadius = 0.0;
+
         for( const CPLXMLNode *psChild = psNode->psChild;
              psChild != nullptr;
              psChild = psChild->psNext )
@@ -2499,13 +2531,26 @@ OGRGeometry *GML2OGRGeometry_XMLNode_Internal(
                     return nullptr;
                 }
 
+
+                // Ad-hoc logic to handle nicely connecting ArcByCenterPoint
+                // with consecutive curves, as found in some AIXM files.
+                bool bIsApproximateArc = false;
+                if( strcmp(BareGMLElement(psChild->pszValue), "ArcByCenterPoint") == 0 )
+                {
+                    storeArcByCenterPointParameters(psChild,
+                                               pszSRSName,
+                                               bIsApproximateArc,
+                                               dfLastCurveApproximateArcRadius,
+                                               bLastCurveWasApproximateArcInvertedAxisOrder);
+                }
+
                 if( wkbFlatten(poGeom->getGeometryType()) != wkbLineString )
                     bChildrenAreAllLineString = false;
 
                 if( poCC == nullptr && poCurve == nullptr )
                 {
                     poCurve = poGeom->toCurve();
-               }
+                }
                 else
                 {
                     if( poCC == nullptr )
@@ -2521,6 +2566,12 @@ OGRGeometry *GML2OGRGeometry_XMLNode_Internal(
                         poCurve = nullptr;
                     }
 
+                    connectArcByCenterPointToOtherSegments(poGeom, poCC,
+                                                           bIsApproximateArc,
+                                                           bLastCurveWasApproximateArc,
+                                                           dfLastCurveApproximateArcRadius,
+                                                           bLastCurveWasApproximateArcInvertedAxisOrder);
+
                     OGRCurve *poAsCurve = poGeom->toCurve();
                     if( poCC->addCurveDirectly(poAsCurve) != OGRERR_NONE )
                     {
@@ -2529,6 +2580,8 @@ OGRGeometry *GML2OGRGeometry_XMLNode_Internal(
                         return nullptr;
                     }
                 }
+
+                bLastCurveWasApproximateArc = bIsApproximateArc;
             }
         }
 

From 1079c7ff73af2f0617d50fbbda22fce2ade7cd15 Mon Sep 17 00:00:00 2001
From: Even Rouault <even.rouault@spatialys.com>
Date: Wed, 1 Apr 2020 13:26:29 +0200
Subject: [PATCH 476/488] GWKAverageOrModeThread(): reject invalid source
 pixels for average/q1/q3/mode/min/max resampling (fixes #2365)

---
 autotest/alg/data/test_bug_2365.vrt           | 22 +++++++++
 .../alg/data/test_bug_2365_wraped_med.vrt     | 45 +++++++++++++++++++
 autotest/alg/warp.py                          | 11 +++++
 gdal/alg/gdalwarpkernel.cpp                   | 13 ++++++
 4 files changed, 91 insertions(+)
 create mode 100644 autotest/alg/data/test_bug_2365.vrt
 create mode 100644 autotest/alg/data/test_bug_2365_wraped_med.vrt

diff --git a/autotest/alg/data/test_bug_2365.vrt b/autotest/alg/data/test_bug_2365.vrt
new file mode 100644
index 000000000000..46b71815c490
--- /dev/null
+++ b/autotest/alg/data/test_bug_2365.vrt
@@ -0,0 +1,22 @@
+<VRTDataset rasterXSize="516" rasterYSize="547">
+  <SRS dataAxisToSRSAxisMapping="1,2">PROJCS["WGS 84 / UTM zone 48N",GEOGCS["WGS 84",DATUM["WGS_1984",SPHEROID["WGS 84",6378137,298.257223563,AUTHORITY["EPSG","7030"]],AUTHORITY["EPSG","6326"]],PRIMEM["Greenwich",0,AUTHORITY["EPSG","8901"]],UNIT["degree",0.0174532925199433,AUTHORITY["EPSG","9122"]],AUTHORITY["EPSG","4326"]],PROJECTION["Transverse_Mercator"],PARAMETER["latitude_of_origin",0],PARAMETER["central_meridian",105],PARAMETER["scale_factor",0.9996],PARAMETER["false_easting",500000],PARAMETER["false_northing",0],UNIT["metre",1,AUTHORITY["EPSG","9001"]],AXIS["Easting",EAST],AXIS["Northing",NORTH],AUTHORITY["EPSG","32648"]]</SRS>
+  <GeoTransform>  4.3866278499999997e+05,  4.9932686434108541e+02,  0.0000000000000000e+00,  1.2197200549999999e+06,  0.0000000000000000e+00, -4.9932686288848242e+02</GeoTransform>
+  <Metadata>
+    <MDI key="AREA_OR_POINT">Area</MDI>
+  </Metadata>
+  <Metadata domain="IMAGE_STRUCTURE">
+    <MDI key="INTERLEAVE">BAND</MDI>
+  </Metadata>
+  <VRTRasterBand dataType="Byte" band="1">
+    <ColorInterp>Gray</ColorInterp>
+    <ComplexSource>
+      <SourceFilename relativeToVRT="1">../../gcore/data/byte.tif</SourceFilename>
+      <SourceBand>1</SourceBand>
+      <SourceProperties RasterXSize="20" RasterYSize="20" DataType="Byte" BlockXSize="20" BlockYSize="20" />
+      <SrcRect xOff="0" yOff="0" xSize="20" ySize="20" />
+      <DstRect xOff="0" yOff="0" xSize="516" ySize="547" />
+      <ScaleOffset>255</ScaleOffset>
+      <ScaleRatio>0</ScaleRatio>
+    </ComplexSource>
+  </VRTRasterBand>
+</VRTDataset>
diff --git a/autotest/alg/data/test_bug_2365_wraped_med.vrt b/autotest/alg/data/test_bug_2365_wraped_med.vrt
new file mode 100644
index 000000000000..9db2dd6c6521
--- /dev/null
+++ b/autotest/alg/data/test_bug_2365_wraped_med.vrt
@@ -0,0 +1,45 @@
+<VRTDataset rasterXSize="10" rasterYSize="1" subClass="VRTWarpedDataset">
+  <SRS dataAxisToSRSAxisMapping="2,1">GEOGCS["WGS 84",DATUM["WGS_1984",SPHEROID["WGS 84",6378137,298.257223563,AUTHORITY["EPSG","7030"]],AUTHORITY["EPSG","6326"]],PRIMEM["Greenwich",0,AUTHORITY["EPSG","8901"]],UNIT["degree",0.0174532925199433,AUTHORITY["EPSG","9122"]],AXIS["Latitude",NORTH],AXIS["Longitude",EAST],AUTHORITY["EPSG","4326"]]</SRS>
+  <GeoTransform> -7.5700000000000003e+01,  5.0000000000000003e-02,  0.0000000000000000e+00,  2.5000000000000001e-02,  0.0000000000000000e+00, -5.0000000000000003e-02</GeoTransform>
+  <Metadata>
+    <MDI key="AREA_OR_POINT">Area</MDI>
+  </Metadata>
+  <VRTRasterBand dataType="Byte" band="1" subClass="VRTWarpedRasterBand">
+    <ColorInterp>Gray</ColorInterp>
+  </VRTRasterBand>
+  <BlockXSize>10</BlockXSize>
+  <BlockYSize>1</BlockYSize>
+  <GDALWarpOptions>
+    <WarpMemoryLimit>6.71089e+07</WarpMemoryLimit>
+    <ResampleAlg>Median</ResampleAlg>
+    <WorkingDataType>Byte</WorkingDataType>
+    <Option name="INIT_DEST">0</Option>
+    <Option name="ERROR_OUT_IF_EMPTY_SOURCE_WINDOW">FALSE</Option>
+    <SourceDataset relativeToVRT="1">test_bug_2365.vrt</SourceDataset>
+    <Transformer>
+      <ApproxTransformer>
+        <MaxError>0.125</MaxError>
+        <BaseTransformer>
+          <GenImgProjTransformer>
+            <SrcGeoTransform>438662.784999999974,499.326864341085411,0,1219720.05499999993,0,-499.326862888482424</SrcGeoTransform>
+            <SrcInvGeoTransform>-878.508280500513251,0.00200269617241524873,0,2442.72869267281385,0,-0.00200269617824133748</SrcInvGeoTransform>
+            <DstGeoTransform>-75.7000000000000028,0.0500000000000000028,0,0.0250000000000000014,0,-0.0500000000000000028</DstGeoTransform>
+            <DstInvGeoTransform>1514,20,0,0.5,0,-20</DstInvGeoTransform>
+            <ReprojectTransformer>
+              <ReprojectionTransformer>
+                <SourceSRS>PROJCS["WGS 84 / UTM zone 48N",GEOGCS["WGS 84",DATUM["WGS_1984",SPHEROID["WGS 84",6378137,298.257223563,AUTHORITY["EPSG","7030"]],AUTHORITY["EPSG","6326"]],PRIMEM["Greenwich",0,AUTHORITY["EPSG","8901"]],UNIT["degree",0.0174532925199433,AUTHORITY["EPSG","9122"]],AUTHORITY["EPSG","4326"]],PROJECTION["Transverse_Mercator"],PARAMETER["latitude_of_origin",0],PARAMETER["central_meridian",105],PARAMETER["scale_factor",0.9996],PARAMETER["false_easting",500000],PARAMETER["false_northing",0],UNIT["metre",1,AUTHORITY["EPSG","9001"]],AXIS["Easting",EAST],AXIS["Northing",NORTH],AUTHORITY["EPSG","32648"]]</SourceSRS>
+                <TargetSRS>GEOGCS["WGS 84",DATUM["WGS_1984",SPHEROID["WGS 84",6378137,298.257223563,AUTHORITY["EPSG","7030"]],AUTHORITY["EPSG","6326"]],PRIMEM["Greenwich",0,AUTHORITY["EPSG","8901"]],UNIT["degree",0.0174532925199433,AUTHORITY["EPSG","9122"]],AXIS["Latitude",NORTH],AXIS["Longitude",EAST],AUTHORITY["EPSG","4326"]]</TargetSRS>
+                <Options>
+                  <Option key="AREA_OF_INTEREST">104.4384745597823,8.559328594081823,106.7969369830235,11.03330992391469</Option>
+                </Options>
+              </ReprojectionTransformer>
+            </ReprojectTransformer>
+          </GenImgProjTransformer>
+        </BaseTransformer>
+      </ApproxTransformer>
+    </Transformer>
+    <BandList>
+      <BandMapping src="1" dst="1" />
+    </BandList>
+  </GDALWarpOptions>
+</VRTDataset>
diff --git a/autotest/alg/warp.py b/autotest/alg/warp.py
index 1b83313cd94f..6a4ea1233d27 100755
--- a/autotest/alg/warp.py
+++ b/autotest/alg/warp.py
@@ -1695,3 +1695,14 @@ def test_warp_nearest_real_nodata_multiple_band():
                             1, 0, 1])
     out_ds = gdal.Warp('', src_ds, options = '-of MEM')
     assert struct.unpack('d' * 4, out_ds.ReadRaster()) == struct.unpack('d' * 4, src_ds.ReadRaster())
+
+
+###############################################################################
+# Test bugfix for #2365
+
+def test_warp_med_out_of_bounds_src_pixels():
+
+    ds = gdal.Open('data/test_bug_2365_wraped_med.vrt')
+    cs = ds.GetRasterBand(1).Checksum()
+    assert cs == 0
+    ds = None
diff --git a/gdal/alg/gdalwarpkernel.cpp b/gdal/alg/gdalwarpkernel.cpp
index 32cdfa8c96e5..7c6e325b9410 100644
--- a/gdal/alg/gdalwarpkernel.cpp
+++ b/gdal/alg/gdalwarpkernel.cpp
@@ -5943,6 +5943,19 @@ static void GWKAverageOrModeThread( void* pData)
 
             if( !pabSuccess[iDstX] || !pabSuccess2[iDstX] )
                 continue;
+
+            if( padfX[iDstX] < poWK->nSrcXOff - 1 ||
+                padfX2[iDstX] < poWK->nSrcXOff - 1 ||
+                padfY[iDstX] < poWK->nSrcYOff - 1 ||
+                padfY2[iDstX] < poWK->nSrcYOff -1 ||
+                padfX[iDstX] > nSrcXSize + poWK->nSrcXOff + 1 ||
+                padfX2[iDstX] > nSrcXSize + poWK->nSrcXOff + 1 ||
+                padfY[iDstX] > nSrcYSize + poWK->nSrcYOff + 1 ||
+                padfY2[iDstX] > nSrcYSize + poWK->nSrcYOff + 1 )
+            {
+                continue;
+            }
+
             const int iDstOffset = iDstX + iDstY * nDstXSize;
 
 /* ==================================================================== */

From 6d2fe5a9fe2dc33fea6742cd417d3101806300dd Mon Sep 17 00:00:00 2001
From: Even Rouault <even.rouault@spatialys.com>
Date: Thu, 2 Apr 2020 12:33:34 +0200
Subject: [PATCH 477/488] VRT: fix IGetDataCoverageStatus() that can cause
 issue for the use case of
 https://lists.osgeo.org/pipermail/gdal-dev/2020-April/051889.html

---
 autotest/gcore/vrt_read.py              | 17 ++++++++++
 gdal/frmts/vrt/vrtsourcedrasterband.cpp | 45 +++++++++++++++----------
 2 files changed, 44 insertions(+), 18 deletions(-)

diff --git a/autotest/gcore/vrt_read.py b/autotest/gcore/vrt_read.py
index 4f8bfd52ad45..307725c8a52c 100755
--- a/autotest/gcore/vrt_read.py
+++ b/autotest/gcore/vrt_read.py
@@ -1214,3 +1214,20 @@ def test_vrt_invalid_dstrect():
     </VRTRasterBand>
     </VRTDataset>"""
     assert gdal.Open(vrt_text) is None
+
+
+def test_vrt_source_no_dstrect():
+
+    vrt_text = """<VRTDataset rasterXSize="20" rasterYSize="20">
+  <VRTRasterBand dataType="Byte" band="1">
+    <SimpleSource>
+      <SourceFilename relativeToVRT="0">data/byte.tif</SourceFilename>
+    </SimpleSource>
+  </VRTRasterBand>
+</VRTDataset>
+"""
+    filename = '/vsimem/out.tif'
+    ds = gdal.Translate(filename, vrt_text)
+    assert ds.GetRasterBand(1).Checksum() == 4672
+    ds = None
+    gdal.Unlink(filename)
diff --git a/gdal/frmts/vrt/vrtsourcedrasterband.cpp b/gdal/frmts/vrt/vrtsourcedrasterband.cpp
index afb71cb17434..0457d28767ad 100644
--- a/gdal/frmts/vrt/vrtsourcedrasterband.cpp
+++ b/gdal/frmts/vrt/vrtsourcedrasterband.cpp
@@ -364,10 +364,19 @@ int  VRTSourcedRasterBand::IGetDataCoverageStatus( int nXOff,
         }
         VRTSimpleSource* poSS = reinterpret_cast<VRTSimpleSource*>(papoSources[iSource]);
         // Check if the AOI is fully inside the source
-        if( nXOff >= poSS->m_dfDstXOff &&
-            nYOff >= poSS->m_dfDstYOff &&
-            nXOff + nXSize <= poSS->m_dfDstXOff + poSS->m_dfDstXSize &&
-            nYOff + nYSize <= poSS->m_dfDstYOff + poSS->m_dfDstYSize )
+        double dfDstXOff = std::max(0.0, poSS->m_dfDstXOff);
+        double dfDstYOff = std::max(0.0, poSS->m_dfDstYOff);
+        double dfDstXSize = poSS->m_dfDstXSize;
+        double dfDstYSize = poSS->m_dfDstYSize;
+        if( dfDstXSize == -1 )
+            dfDstXSize = poSS->m_poRasterBand->GetXSize() - dfDstXOff;
+        if( dfDstYSize == -1 )
+            dfDstYSize = poSS->m_poRasterBand->GetYSize() - dfDstYOff;
+
+        if( nXOff >= dfDstXOff &&
+            nYOff >= dfDstYOff &&
+            nXOff + nXSize <= dfDstXOff + dfDstXSize &&
+            nYOff + nYSize <= dfDstYOff + dfDstYSize )
         {
             if( pdfDataPct )
                 *pdfDataPct = 100.0;
@@ -375,26 +384,26 @@ int  VRTSourcedRasterBand::IGetDataCoverageStatus( int nXOff,
             return GDAL_DATA_COVERAGE_STATUS_DATA;
         }
         // Check intersection of bounding boxes.
-        if( poSS->m_dfDstXOff + poSS->m_dfDstXSize > nXOff &&
-            poSS->m_dfDstYOff + poSS->m_dfDstYSize > nYOff &&
-            poSS->m_dfDstXOff < nXOff + nXSize &&
-            poSS->m_dfDstYOff < nYOff + nYSize )
+        if( dfDstXOff + dfDstXSize > nXOff &&
+            dfDstYOff + dfDstYSize > nYOff &&
+            dfDstXOff < nXOff + nXSize &&
+            dfDstYOff < nYOff + nYSize )
         {
             nStatus |= GDAL_DATA_COVERAGE_STATUS_DATA;
             if( poPolyNonCoveredBySources != nullptr )
             {
                 OGRPolygon oPolySource;
                 poLR = new OGRLinearRing();
-                poLR->addPoint( poSS->m_dfDstXOff,
-                                poSS->m_dfDstYOff );
-                poLR->addPoint( poSS->m_dfDstXOff,
-                                poSS->m_dfDstYOff + poSS->m_dfDstYSize );
-                poLR->addPoint( poSS->m_dfDstXOff + poSS->m_dfDstXSize,
-                                poSS->m_dfDstYOff + poSS->m_dfDstYSize );
-                poLR->addPoint( poSS->m_dfDstXOff + poSS->m_dfDstXSize,
-                                poSS->m_dfDstYOff );
-                poLR->addPoint( poSS->m_dfDstXOff,
-                                poSS->m_dfDstYOff );
+                poLR->addPoint( dfDstXOff,
+                                dfDstYOff );
+                poLR->addPoint( dfDstXOff,
+                                dfDstYOff + dfDstYSize );
+                poLR->addPoint( dfDstXOff + dfDstXSize,
+                                dfDstYOff + dfDstYSize );
+                poLR->addPoint( dfDstXOff + dfDstXSize,
+                                dfDstYOff );
+                poLR->addPoint( dfDstXOff,
+                                dfDstYOff );
                 oPolySource.addRingDirectly(poLR);
                 OGRGeometry* poRes = poPolyNonCoveredBySources->Difference(&oPolySource);
                 if( poRes != nullptr && poRes->IsEmpty() )

From 0a9d75f3fdd8e5251794435d88b5a4e03b7b8985 Mon Sep 17 00:00:00 2001
From: Even Rouault <even.rouault@spatialys.com>
Date: Thu, 2 Apr 2020 13:20:58 +0200
Subject: [PATCH 478/488] Fix previous commit by adding required include

---
 gdal/frmts/vrt/vrtsourcedrasterband.cpp | 1 +
 1 file changed, 1 insertion(+)

diff --git a/gdal/frmts/vrt/vrtsourcedrasterband.cpp b/gdal/frmts/vrt/vrtsourcedrasterband.cpp
index 0457d28767ad..19c1009779b6 100644
--- a/gdal/frmts/vrt/vrtsourcedrasterband.cpp
+++ b/gdal/frmts/vrt/vrtsourcedrasterband.cpp
@@ -31,6 +31,7 @@
 #include "gdal_vrt.h"
 #include "vrtdataset.h"
 
+#include <algorithm>
 #include <cmath>
 #include <cstddef>
 #include <cstdio>

From b8c95fbadc33c753eaec6e57f71a389f66e6f77d Mon Sep 17 00:00:00 2001
From: Even Rouault <even.rouault@spatialys.com>
Date: Sun, 5 Apr 2020 18:47:21 +0200
Subject: [PATCH 479/488] OGRGeometryFactory::forceToMultiLineString(): fix for
 a GeometryCollection of LineStringZ/M/ZM (fixes #1873)

---
 gdal/ogr/ogrgeometryfactory.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/gdal/ogr/ogrgeometryfactory.cpp b/gdal/ogr/ogrgeometryfactory.cpp
index a1e5efb8b5e1..77a49fdba4d4 100644
--- a/gdal/ogr/ogrgeometryfactory.cpp
+++ b/gdal/ogr/ogrgeometryfactory.cpp
@@ -1117,7 +1117,7 @@ OGRGeometry *OGRGeometryFactory::forceToMultiLineString( OGRGeometry *poGeom )
 
         for( auto&& poMember: poGC )
         {
-            if( poMember->getGeometryType() != wkbLineString )
+            if( wkbFlatten(poMember->getGeometryType()) != wkbLineString )
             {
                 return poGeom;
             }

From bc3b3c3401a288611ff3e366c97754241ebb0b48 Mon Sep 17 00:00:00 2001
From: Even Rouault <even.rouault@spatialys.com>
Date: Tue, 7 Apr 2020 12:01:58 +0200
Subject: [PATCH 480/488] ESRIJSon: do not require a 'geometry' member to be
 present in a feature

---
 gdal/ogr/ogrsf_frmts/geojson/ogresrijsonreader.cpp | 8 --------
 1 file changed, 8 deletions(-)

diff --git a/gdal/ogr/ogrsf_frmts/geojson/ogresrijsonreader.cpp b/gdal/ogr/ogrsf_frmts/geojson/ogresrijsonreader.cpp
index 8632b2b3b17d..5448af7c9f8d 100644
--- a/gdal/ogr/ogrsf_frmts/geojson/ogresrijsonreader.cpp
+++ b/gdal/ogr/ogrsf_frmts/geojson/ogresrijsonreader.cpp
@@ -396,14 +396,6 @@ OGRFeature* OGRESRIJSONReader::ReadFeature( json_object* poObj )
             poFeature->SetGeometryDirectly( poGeometry );
         }
     }
-    else
-    {
-        CPLError( CE_Failure, CPLE_AppDefined,
-                  "Invalid Feature object. "
-                  "Missing \'geometry\' member." );
-        delete poFeature;
-        return nullptr;
-    }
 
     return poFeature;
 }

From c7af868a1b4ead9496eb40396a04bed1877d38c0 Mon Sep 17 00:00:00 2001
From: Even Rouault <even.rouault@spatialys.com>
Date: Tue, 7 Apr 2020 18:23:08 +0200
Subject: [PATCH 481/488] GML geometry parsing: improve handling of closed Ring
 starting with a ArcByCenterPoint, and handles [nmi_i] unit for radius (refs
 #2386)

---
 autotest/ogr/ogr_gml_geom.py | 45 ++++++++++++++++++++
 gdal/ogr/gml2ogrgeometry.cpp | 81 ++++++++++++++++++++++++++++++------
 2 files changed, 114 insertions(+), 12 deletions(-)

diff --git a/autotest/ogr/ogr_gml_geom.py b/autotest/ogr/ogr_gml_geom.py
index 60de6eab943f..0ba4f5b34072 100755
--- a/autotest/ogr/ogr_gml_geom.py
+++ b/autotest/ogr/ogr_gml_geom.py
@@ -1799,6 +1799,51 @@ def test_gml_CompoundCurve_of_ArcByCenterPoint_curve_in_same_segments():
 
     assert ogrtest.check_feature_geometry(geom, ogr.CreateGeometryFromWkt('POLYGON ((55.2333333333333 -36.1666666666667,55.2311637280767 -36.8943733791648,55.2602248071013 -36.8960852160185,55.2891782700249 -36.8912782655051,55.3178697537514 -36.88292675789,55.3461587637071 -36.8710639413776,55.3739064765608 -36.8557405708675,55.4009764350458 -36.8370248014709,55.4272352367262 -36.8150019876212,55.4525532129231 -36.7897743859994,55.476805093957 -36.7614607612323,55.4998706568286 -36.7301958939182,55.5216353514589 -36.6961299915025,55.5419909016414 -36.6594280032268,55.5608358769213 -36.6202688413925,55.5780762317212 -36.5788445119267,55.5936258081681 -36.5353591583435,55.6074067992521 -36.4900280239174,55.6193501691593 -36.4430763379496,55.6293960278662 -36.3947381326996,55.6374939573672 -36.3452549984946,55.6436032872147 -36.2948747851727,55.6476933173936 -36.2438502586493,55.6497434869178 -36.19243772209,55.6497434869178 -36.1408956112433,55.6476933173936 -36.089483074684,55.6436032872147 -36.0384585481606,55.6374939573672 -35.9880783348387,55.6293960278662 -35.9385952006337,55.6193501691593 -35.8902569953837,55.6074067992521 -35.8433053094159,55.5936258081681 -35.7979741749898,55.5780762317212 -35.7544888214066,55.5608358769213 -35.7130644919408,55.5419909016414 -35.6739053301065,55.5216353514589 -35.6372033418322,55.4998706568286 -35.6031374394151,55.476805093957 -35.571872572101,55.4525532129231 -35.5435589473339,55.4272352367262 -35.5183313457121,55.4009764350458 -35.4963085318624,55.3739064765608 -35.4775927624659,55.3461587637071 -35.4622693919557,55.3178697537514 -35.4504065754433,55.2891782700249 -35.4420550678282,55.2602248071013 -35.4372481173149,55.2311508336186 -35.4360014509317,55.2020980963355 -35.4383133491681,55.1732079288891 -35.4441648063421,55.1446205685763 -35.4535197729773,55.1164744843283 -35.4663254761286,55.0889057188812 -35.4825128133848,55.0620472479757 -35.5019968161103,55.0360283592393 -35.524677177381,55.0109740532301 -35.5504388400636,54.9870044689367 -35.5791526404379,54.9642343358562 -35.6106760028906,54.9427724545944 -35.6448536812344,54.9281635053072 -35.674116070019,55.2333333333333 -36.1666666666667))')) == 0
 
+###############################################################################
+# Test Ring starting with ArcByCenterPoint
+
+def test_gml_Ring_starting_with_ArcByCenterPoint():
+
+    geom = ogr.CreateGeometryFromGML("""<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
+<ns3:Surface xmlns:ns1="http://www.opengis.net/gml/3.2" xmlns:ns2="http://www.w3.org/1999/xlink" xmlns:ns3="http://www.aixm.aero/schema/5.1" xmlns:ns4="http://www.isotc211.org/2005/gco" xmlns:ns5="http://www.isotc211.org/2005/gmd" xmlns:ns6="http://www.isotc211.org/2005/gts" xmlns:ns7="http://www.aixm.aero/schema/5.1/message" srsName="urn:ogc:def:crs:EPSG::4326" ns1:id="Ase_Proj_1561541">
+    <ns1:patches>
+        <ns1:PolygonPatch>
+            <ns1:exterior>
+                <ns1:Ring>
+                    <ns1:curveMember>
+                        <ns1:Curve ns1:id="Ase_Curv_1561541">
+                            <ns1:segments>
+<ns1:ArcByCenterPoint interpolation="circularArcCenterPointWithRadius" numArc="1">
+    <ns1:posList srsName="urn:ogc:def:crs:EPSG::4326">46.5875 0.3066666666666666</ns1:posList>
+    <ns1:radius uom="[nmi_i]">9.5</ns1:radius>
+    <ns1:startAngle uom="deg">6.295729688631284</ns1:startAngle>
+    <ns1:endAngle uom="deg">67.38797951888118</ns1:endAngle>
+</ns1:ArcByCenterPoint>
+<ns1:GeodesicString interpolation="geodesic">
+    <ns1:posList srsName="urn:ogc:def:crs:EPSG::4326">46.64833333333333 0.5194444444444445 46.43861111111111 0.33805555555555555 46.42305555555555 0.28944444444444445</ns1:posList>
+</ns1:GeodesicString>
+<ns1:ArcByCenterPoint interpolation="circularArcCenterPointWithRadius" numArc="1">
+    <ns1:posList srsName="urn:ogc:def:crs:EPSG::4326">46.581388888888895 0.2980555555555556</ns1:posList>
+    <ns1:radius uom="[nmi_i]">9.5</ns1:radius>
+    <ns1:startAngle uom="deg">-177.84615335400528</ns1:startAngle>
+    <ns1:endAngle uom="deg">-120.68835384474265</ns1:endAngle>
+</ns1:ArcByCenterPoint>
+<ns1:GeodesicString interpolation="geodesic">
+    <ns1:posList srsName="urn:ogc:def:crs:EPSG::4326">46.500277777777775 0.10055555555555556 46.54083333333333 0.10555555555555556 46.575 0.225 46.59444444444445 0.25833333333333336 46.65833333333333 0.2833333333333333 46.69555555555555 0.25555555555555554 46.745 0.33194444444444443</ns1:posList>
+</ns1:GeodesicString>
+                            </ns1:segments>
+                        </ns1:Curve>
+                    </ns1:curveMember>
+                </ns1:Ring>
+            </ns1:exterior>
+        </ns1:PolygonPatch>
+    </ns1:patches>
+</ns3:Surface>""")
+    #print(g)
+
+    assert ogrtest.check_feature_geometry(geom, ogr.CreateGeometryFromWkt('POLYGON ((46.745 0.331944444444444,46.7432764927165 0.347962462754535,46.7409162535525 0.363717281627594,46.7378065348593 0.3791917846605,46.7339626150092 0.394310000163572,46.7294033759096 0.408997750371246,46.7241512079629 0.423183023082575,46.7182318974714 0.436796331344972,46.7116744971061 0.449771059387196,46.7045111801497 0.462043792829896,46.6967770793052 0.473554631563425,46.6885101109471 0.484247483569652,46.6797507857586 0.494070338341013,46.6705420067727 0.502975518511247,46.6609288558889 0.5109199085045,46.6509583699943 0.517865159176619,46.6483333333333 0.519444444444444,46.4386111111111 0.338055555555556,46.4230555555555 0.289444444444444,46.4239652827541 0.273432507330975,46.4255282239253 0.25756088338307,46.4278483647801 0.241884857622964,46.4309144976449 0.226480183207377,46.4347118090807 0.21142133567082,46.4392219496614 0.196781161237034,46.4444231204746 0.18263053185483,46.450290175977 0.169038008752016,46.4567947427662 0.156069515749848,46.4639053537626 0.143788023916768,46.4715875972233 0.132253248900933,46.4798042799442 0.121521362391196,46.4885156039408 0.111644719041597,46.4976793558324 0.102671600158084,46.5002777777778 0.100555555555556,46.5408333333333 0.105555555555556,46.575 0.225,46.5944444444444 0.258333333333333,46.6583333333333 0.283333333333333,46.6955555555556 0.255555555555556,46.745 0.331944444444444))')) == 0
+
+
 ###############################################################################
 # Test GML Circle
 
diff --git a/gdal/ogr/gml2ogrgeometry.cpp b/gdal/ogr/gml2ogrgeometry.cpp
index 35ddbcb8910a..97ec9f75c843 100644
--- a/gdal/ogr/gml2ogrgeometry.cpp
+++ b/gdal/ogr/gml2ogrgeometry.cpp
@@ -1177,11 +1177,14 @@ OGRGeometry *GML2OGRGeometry_XMLNode_Internal(
                 }
             }
             if( bSRSUnitIsDegree && pszUnits != nullptr &&
-                (EQUAL(pszUnits, "m") || EQUAL(pszUnits, "nm") ||
-                    EQUAL(pszUnits, "mi") || EQUAL(pszUnits, "ft")) )
+                (EQUAL(pszUnits, "m") ||
+                 EQUAL(pszUnits, "nm") ||
+                 EQUAL(pszUnits, "[nmi_i]") ||
+                 EQUAL(pszUnits, "mi") ||
+                 EQUAL(pszUnits, "ft")) )
             {
                 bIsApproximateArc = true;
-                if( EQUAL(pszUnits, "nm") )
+                if( EQUAL(pszUnits, "nm") || EQUAL(pszUnits, "[nmi_i]"))
                     dfRadius *= CPLAtof(SRS_UL_INTL_NAUT_MILE_CONV);
                 else if( EQUAL(pszUnits, "mi") )
                     dfRadius *= CPLAtof(SRS_UL_INTL_STAT_MILE_CONV);
@@ -1307,6 +1310,11 @@ OGRGeometry *GML2OGRGeometry_XMLNode_Internal(
         bool bLastCurveWasApproximateArcInvertedAxisOrder = false;
         double dfLastCurveApproximateArcRadius = 0.0;
 
+        bool bIsFirstChild = true;
+        bool bFirstChildIsApproximateArc = false;
+        double dfFirstChildApproximateArcRadius = 0.0;
+        bool bFirstChildWasApproximateArcInvertedAxisOrder = false;
+
         for( const CPLXMLNode *psChild = psNode->psChild;
              psChild != nullptr;
              psChild = psChild->psNext )
@@ -1368,18 +1376,29 @@ OGRGeometry *GML2OGRGeometry_XMLNode_Internal(
                 // with consecutive curves, as found in some AIXM files.
                 bool bIsApproximateArc = false;
                 const CPLXMLNode* psChild2, *psChild3;
-                if( strcmp(psCurveChild->pszValue, "Curve") == 0 &&
+                if( strcmp(BareGMLElement(psCurveChild->pszValue), "Curve") == 0 &&
                     (psChild2 = GetChildElement(psCurveChild)) != nullptr &&
-                    strcmp(psChild2->pszValue, "segments") == 0 &&
+                    strcmp(BareGMLElement(psChild2->pszValue), "segments") == 0 &&
                     (psChild3 = GetChildElement(psChild2)) != nullptr &&
-                    strcmp(psChild3->pszValue, "ArcByCenterPoint") == 0 )
+                    strcmp(BareGMLElement(psChild3->pszValue), "ArcByCenterPoint") == 0 )
                 {
                     storeArcByCenterPointParameters(psChild3,
                                                pszSRSName,
                                                bIsApproximateArc,
                                                dfLastCurveApproximateArcRadius,
                                                bLastCurveWasApproximateArcInvertedAxisOrder);
+                    if( bIsFirstChild && bIsApproximateArc )
+                    {
+                        bFirstChildIsApproximateArc = true;
+                        dfFirstChildApproximateArcRadius = dfLastCurveApproximateArcRadius;
+                        bFirstChildWasApproximateArcInvertedAxisOrder = bLastCurveWasApproximateArcInvertedAxisOrder;
+                    }
+                    else if( psChild3->psNext )
+                    {
+                        bIsApproximateArc = false;
+                    }
                 }
+                bIsFirstChild = false;
 
                 if( poCC == nullptr && poRing == nullptr )
                 {
@@ -1427,6 +1446,38 @@ OGRGeometry *GML2OGRGeometry_XMLNode_Internal(
 
         if( poRing )
         {
+            if( poRing->getNumPoints() >= 2 &&
+                bFirstChildIsApproximateArc && !poRing->get_IsClosed() &&
+                wkbFlatten(poRing->getGeometryType()) == wkbLineString )
+            {
+                OGRLineString* poLS = poRing->toLineString();
+
+                OGRPoint p;
+                OGRPoint p2;
+                poLS->StartPoint(&p);
+                poLS->EndPoint(&p2);
+                double dfDistance = 0.0;
+                if( bFirstChildWasApproximateArcInvertedAxisOrder )
+                    dfDistance =
+                        OGR_GreatCircle_Distance(
+                            p.getX(), p.getY(),
+                            p2.getX(), p2.getY());
+                else
+                    dfDistance =
+                        OGR_GreatCircle_Distance(
+                            p.getY(), p.getX(),
+                            p2.getY(), p2.getX());
+                if( dfDistance <
+                    dfFirstChildApproximateArcRadius / 5.0 )
+                {
+                    CPLDebug("OGR",
+                             "Moving approximate start of "
+                             "ArcByCenterPoint to end of "
+                             "curve");
+                    poLS->setPoint(0, &p2);
+                }
+            }
+
             if( poRing->getNumPoints() < 2 || !poRing->get_IsClosed() )
             {
                 CPLError(CE_Failure, CPLE_AppDefined, "Non-closed ring");
@@ -1722,14 +1773,17 @@ OGRGeometry *GML2OGRGeometry_XMLNode_Internal(
         const double dfCenterY = p.getY();
 
         if( bSRSUnitIsDegree && pszUnits != nullptr &&
-            (EQUAL(pszUnits, "m") || EQUAL(pszUnits, "nm") ||
-             EQUAL(pszUnits, "mi") || EQUAL(pszUnits, "ft")) )
+            (EQUAL(pszUnits, "m") ||
+             EQUAL(pszUnits, "nm") ||
+             EQUAL(pszUnits, "[nmi_i]") ||
+             EQUAL(pszUnits, "mi") ||
+             EQUAL(pszUnits, "ft")) )
         {
             OGRLineString* poLS = new OGRLineString();
             const double dfStep =
                 CPLAtof(CPLGetConfigOption("OGR_ARC_STEPSIZE", "4"));
             double dfDistance = dfRadius;
-            if( EQUAL(pszUnits, "nm") )
+            if( EQUAL(pszUnits, "nm") || EQUAL(pszUnits, "[nmi_i]") )
                 dfDistance *= CPLAtof(SRS_UL_INTL_NAUT_MILE_CONV);
             else if( EQUAL(pszUnits, "mi") )
                 dfDistance *= CPLAtof(SRS_UL_INTL_STAT_MILE_CONV);
@@ -1847,14 +1901,17 @@ OGRGeometry *GML2OGRGeometry_XMLNode_Internal(
         const double dfCenterY = p.getY();
 
         if( bSRSUnitIsDegree && pszUnits != nullptr &&
-            (EQUAL(pszUnits, "m") || EQUAL(pszUnits, "nm") ||
-             EQUAL(pszUnits, "mi") || EQUAL(pszUnits, "ft")) )
+            (EQUAL(pszUnits, "m") ||
+             EQUAL(pszUnits, "nm") ||
+             EQUAL(pszUnits, "[nmi_i]") ||
+             EQUAL(pszUnits, "mi") ||
+             EQUAL(pszUnits, "ft")) )
         {
             OGRLineString* poLS = new OGRLineString();
             const double dfStep =
                 CPLAtof(CPLGetConfigOption("OGR_ARC_STEPSIZE", "4"));
             double dfDistance = dfRadius;
-            if( EQUAL(pszUnits, "nm") )
+            if( EQUAL(pszUnits, "nm") || EQUAL(pszUnits, "[nmi_i]") )
                 dfDistance *= CPLAtof(SRS_UL_INTL_NAUT_MILE_CONV);
             else if( EQUAL(pszUnits, "mi") )
                 dfDistance *= CPLAtof(SRS_UL_INTL_STAT_MILE_CONV);

From b291f0e66ee3460db98e2a03bce7ba140f919e43 Mon Sep 17 00:00:00 2001
From: Even Rouault <even.rouault@spatialys.com>
Date: Fri, 10 Apr 2020 17:58:24 +0200
Subject: [PATCH 482/488] Python bindings: fix invalid check for
 Dataset.ReadAsArray(buf_obj=some_array, interleave='pixel') scenario

---
 autotest/gcore/numpy_rw.py           | 18 +++++++++++++++---
 gdal/swig/include/gdal_array.i       |  6 ++++--
 gdal/swig/python/osgeo/gdal_array.py |  6 ++++--
 3 files changed, 23 insertions(+), 7 deletions(-)

diff --git a/autotest/gcore/numpy_rw.py b/autotest/gcore/numpy_rw.py
index 4d45da0729e0..7b2019c9726d 100755
--- a/autotest/gcore/numpy_rw.py
+++ b/autotest/gcore/numpy_rw.py
@@ -474,7 +474,11 @@ def test_numpy_rw_13():
     with pytest.raises(Exception, match='Specified buf_xsize not consistent '
                              'with array shape'):
         ds.ReadAsArray(buf_obj=ar, buf_xsize=1, buf_ysize=1)
-    
+
+    ar = numpy.empty([1, 2, 3], dtype=numpy.uint8)
+    with pytest.raises(Exception, match='Specified buf_xsize not consistent '
+                             'with array shape'):
+        ds.ReadAsArray(buf_obj=ar, buf_xsize=1, buf_ysize=1, interleave='pixel')
 
     # Inconsistent data type
     ar = numpy.empty([3, 1, 2], dtype=numpy.uint8)
@@ -484,9 +488,13 @@ def test_numpy_rw_13():
 
     # Not enough space in first dimension
     ar = numpy.empty([2, 1, 2], dtype=numpy.uint8)
-    with pytest.raises(Exception, match='Array should have space for 3 bands'):
+    with pytest.raises(Exception, match='Dimension 0 of array should have size 3 to store bands'):
         ds.ReadAsArray(buf_obj=ar)
-    
+
+    # Not enough space in third dimension
+    ar = numpy.empty([1, 2, 2], dtype=numpy.uint8)
+    with pytest.raises(Exception, match='Dimension 2 of array should have size 3 to store bands'):
+        ds.ReadAsArray(buf_obj=ar, interleave='pixel')
 
     # This one should be OK !
     ar = numpy.zeros([3, 1, 2], dtype=numpy.uint8)
@@ -702,6 +710,10 @@ def test_numpy_rw_18():
     res = ds.ReadAsArray(interleave='pixel')
     assert numpy.all(img == res)
 
+    res = numpy.zeros([256, 200, 3])
+    ds.ReadAsArray(buf_obj=res, interleave='pixel')
+    assert numpy.all(img == res)
+
 
 def test_numpy_rw_cleanup():
     gdaltest.numpy_drv = None
diff --git a/gdal/swig/include/gdal_array.i b/gdal/swig/include/gdal_array.i
index ff7bcde6c711..ebb78efbb8e6 100644
--- a/gdal/swig/include/gdal_array.i
+++ b/gdal/swig/include/gdal_array.i
@@ -1180,10 +1180,12 @@ def DatasetReadAsArray(ds, xoff=0, yoff=0, win_xsize=None, win_ysize=None, buf_o
         interleave = True
         xdim = 2
         ydim = 1
+        banddim = 0
     elif interleave == 'pixel':
         interleave = False
         xdim = 1
         ydim = 0
+        banddim = 2
     else:
         raise ValueError('Interleave should be band or pixel')
 
@@ -1231,8 +1233,8 @@ def DatasetReadAsArray(ds, xoff=0, yoff=0, win_xsize=None, win_ysize=None, buf_o
             raise ValueError('Specified buf_xsize not consistent with array shape')
         if buf_ysize is not None and buf_ysize != shape_buf_ysize:
             raise ValueError('Specified buf_ysize not consistent with array shape')
-        if buf_obj.shape[0] != ds.RasterCount:
-            raise ValueError('Array should have space for %d bands' % ds.RasterCount)
+        if buf_obj.shape[banddim] != ds.RasterCount:
+            raise ValueError('Dimension %d of array should have size %d to store bands)' % (banddim, ds.RasterCount))
 
         datatype = NumericTypeCodeToGDALTypeCode(buf_obj.dtype.type)
         if not datatype:
diff --git a/gdal/swig/python/osgeo/gdal_array.py b/gdal/swig/python/osgeo/gdal_array.py
index ed0e08e5162d..b0548a0e4c0f 100644
--- a/gdal/swig/python/osgeo/gdal_array.py
+++ b/gdal/swig/python/osgeo/gdal_array.py
@@ -263,10 +263,12 @@ def DatasetReadAsArray(ds, xoff=0, yoff=0, win_xsize=None, win_ysize=None, buf_o
         interleave = True
         xdim = 2
         ydim = 1
+        banddim = 0
     elif interleave == 'pixel':
         interleave = False
         xdim = 1
         ydim = 0
+        banddim = 2
     else:
         raise ValueError('Interleave should be band or pixel')
 
@@ -314,8 +316,8 @@ def DatasetReadAsArray(ds, xoff=0, yoff=0, win_xsize=None, win_ysize=None, buf_o
             raise ValueError('Specified buf_xsize not consistent with array shape')
         if buf_ysize is not None and buf_ysize != shape_buf_ysize:
             raise ValueError('Specified buf_ysize not consistent with array shape')
-        if buf_obj.shape[0] != ds.RasterCount:
-            raise ValueError('Array should have space for %d bands' % ds.RasterCount)
+        if buf_obj.shape[banddim] != ds.RasterCount:
+            raise ValueError('Dimension %d of array should have size %d to store bands)' % (banddim, ds.RasterCount))
 
         datatype = NumericTypeCodeToGDALTypeCode(buf_obj.dtype.type)
         if not datatype:

From ffdc7861510be4000bf7b862ea90e726713c7960 Mon Sep 17 00:00:00 2001
From: Even Rouault <even.rouault@spatialys.com>
Date: Wed, 15 Apr 2020 15:55:36 +0200
Subject: [PATCH 483/488] GDALContourGenerate(): propagate raster acquisition
 error (fixes #2410)

---
 autotest/alg/contour.py | 17 +++++++++++++++++
 gdal/alg/contour.cpp    | 15 ++++++++-------
 2 files changed, 25 insertions(+), 7 deletions(-)

diff --git a/autotest/alg/contour.py b/autotest/alg/contour.py
index ff92fdff9069..e87018662ef9 100755
--- a/autotest/alg/contour.py
+++ b/autotest/alg/contour.py
@@ -34,6 +34,7 @@
 
 from osgeo import gdal
 from osgeo import ogr
+import gdaltest
 import ogrtest
 import pytest
 
@@ -269,6 +270,22 @@ def test_contour_3():
     ogr_ds.Destroy()
 
 ###############################################################################
+
+
+def test_contour_raster_acquisition_error():
+
+    ogr_ds = ogr.GetDriverByName('Memory').CreateDataSource('')
+    ogr_lyr = ogr_ds.CreateLayer('contour', geom_type=ogr.wkbLineString)
+    field_defn = ogr.FieldDefn('ID', ogr.OFTInteger)
+    ogr_lyr.CreateField(field_defn)
+    ds = gdal.Open('../gcore/data/byte_truncated.tif')
+
+    with gdaltest.error_handler():
+        assert gdal.ContourGenerateEx(ds.GetRasterBand(1), ogr_lyr,
+                                        options = [ "LEVEL_INTERVAL=1",
+                                                    "ID_FIELD=0"] ) != 0
+
+###############################################################################
 # Cleanup
 
 
diff --git a/gdal/alg/contour.cpp b/gdal/alg/contour.cpp
index 5c131a0db5ef..8e499091ef06 100644
--- a/gdal/alg/contour.cpp
+++ b/gdal/alg/contour.cpp
@@ -619,6 +619,7 @@ CPLErr GDALContourGenerateEx( GDALRasterBandH hBand, void *hLayer,
         GDALGetGeoTransform( hSrcDS, oCWI.adfGeoTransform );
     oCWI.nNextID = 0;
 
+    bool ok = false;
     try
     {
         if ( polygonize )
@@ -631,19 +632,19 @@ CPLErr GDALContourGenerateEx( GDALRasterBandH hBand, void *hLayer,
                 FixedLevelRangeIterator levels( &fixedLevels[0], fixedLevels.size(), GDALGetRasterMaximum( hBand, &bSuccess ) );
                 SegmentMerger<RingAppender, FixedLevelRangeIterator> writer(appender, levels, /* polygonize */ true);
                 ContourGeneratorFromRaster<decltype(writer), FixedLevelRangeIterator> cg( hBand, useNoData, noDataValue, writer, levels );
-                cg.process( pfnProgress, pProgressArg );
+                ok = cg.process( pfnProgress, pProgressArg );
             }
             else if ( expBase > 0.0 ) {
                 ExponentialLevelRangeIterator levels( expBase );
                 SegmentMerger<RingAppender, ExponentialLevelRangeIterator> writer(appender, levels, /* polygonize */ true);
                 ContourGeneratorFromRaster<decltype(writer), ExponentialLevelRangeIterator> cg( hBand, useNoData, noDataValue, writer, levels );
-                cg.process( pfnProgress, pProgressArg );
+                ok = cg.process( pfnProgress, pProgressArg );
             }
             else {
                 IntervalLevelRangeIterator levels( contourBase, contourInterval );
                 SegmentMerger<RingAppender, IntervalLevelRangeIterator> writer(appender, levels, /* polygonize */ true);
                 ContourGeneratorFromRaster<decltype(writer), IntervalLevelRangeIterator> cg( hBand, useNoData, noDataValue, writer, levels );
-                cg.process( pfnProgress, pProgressArg );
+                ok = cg.process( pfnProgress, pProgressArg );
             }
         }
         else
@@ -653,19 +654,19 @@ CPLErr GDALContourGenerateEx( GDALRasterBandH hBand, void *hLayer,
                 FixedLevelRangeIterator levels( &fixedLevels[0], fixedLevels.size() );
                 SegmentMerger<GDALRingAppender, FixedLevelRangeIterator> writer(appender, levels, /* polygonize */ false);
                 ContourGeneratorFromRaster<decltype(writer), FixedLevelRangeIterator> cg( hBand, useNoData, noDataValue, writer, levels );
-                cg.process( pfnProgress, pProgressArg );
+                ok = cg.process( pfnProgress, pProgressArg );
             }
             else if ( expBase > 0.0 ) {
                 ExponentialLevelRangeIterator levels( expBase );
                 SegmentMerger<GDALRingAppender, ExponentialLevelRangeIterator> writer(appender, levels, /* polygonize */ false);
                 ContourGeneratorFromRaster<decltype(writer), ExponentialLevelRangeIterator> cg( hBand, useNoData, noDataValue, writer, levels );
-                cg.process( pfnProgress, pProgressArg );
+                ok = cg.process( pfnProgress, pProgressArg );
             }
             else {
                 IntervalLevelRangeIterator levels( contourBase, contourInterval );
                 SegmentMerger<GDALRingAppender, IntervalLevelRangeIterator> writer(appender, levels, /* polygonize */ false);
                 ContourGeneratorFromRaster<decltype(writer), IntervalLevelRangeIterator> cg( hBand, useNoData, noDataValue, writer, levels );
-                cg.process( pfnProgress, pProgressArg );
+                ok = cg.process( pfnProgress, pProgressArg );
             }
         }
     }
@@ -674,7 +675,7 @@ CPLErr GDALContourGenerateEx( GDALRasterBandH hBand, void *hLayer,
         CPLError(CE_Failure, CPLE_AppDefined, "%s", e.what());
         return CE_Failure;
     }
-    return CE_None;
+    return ok ? CE_None : CE_Failure;
 }
 
 /************************************************************************/

From f9021d52205ecad8697a50b602e407eb3df34331 Mon Sep 17 00:00:00 2001
From: Even Rouault <even.rouault@spatialys.com>
Date: Thu, 16 Apr 2020 11:17:32 +0200
Subject: [PATCH 484/488] netCDF: fix issue when opening
 /vsicurl/http[s]://example.com/foo.nc filenames (fixes #2412)

---
 gdal/frmts/netcdf/netcdfdataset.cpp | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/gdal/frmts/netcdf/netcdfdataset.cpp b/gdal/frmts/netcdf/netcdfdataset.cpp
index 1372258ca0bd..bfebd8d938af 100644
--- a/gdal/frmts/netcdf/netcdfdataset.cpp
+++ b/gdal/frmts/netcdf/netcdfdataset.cpp
@@ -6738,7 +6738,11 @@ GDALDataset *netCDFDataset::Open( GDALOpenInfo *poOpenInfo )
     if ( bVsiFile && bReadOnly && CPLIsUserFaultMappingSupported() )
       pCtx = CPLCreateUserFaultMapping(osFilenameForNCOpen, &pVma, &nVmaSize);
     if (pCtx != nullptr && pVma != nullptr && nVmaSize > 0)
-      status2 = nc_open_mem(osFilenameForNCOpen, nMode, nVmaSize, pVma, &cdfid);
+    {
+      // netCDF code, at least for netCDF 4.7.0, is confused by filenames like
+      // /vsicurl/http[s]://example.com/foo.nc, so just pass the final part
+      status2 = nc_open_mem(CPLGetFilename(osFilenameForNCOpen), nMode, static_cast<size_t>(nVmaSize), pVma, &cdfid);
+    }
     else
       status2 = nc_open(osFilenameForNCOpen, nMode, &cdfid);
 #else

From 8f131a35c5c5b80e140a5a6740c59ae4fe24be7b Mon Sep 17 00:00:00 2001
From: Even Rouault <even.rouault@spatialys.com>
Date: Sun, 19 Apr 2020 21:10:17 +0200
Subject: [PATCH 485/488] GTiff: avoid crash on single-component file with
 Whitepoint and PrimaryChromaticities tags

---
 gdal/frmts/gtiff/geotiff.cpp | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/gdal/frmts/gtiff/geotiff.cpp b/gdal/frmts/gtiff/geotiff.cpp
index c5064eae8917..47abbe6b890e 100644
--- a/gdal/frmts/gtiff/geotiff.cpp
+++ b/gdal/frmts/gtiff/geotiff.cpp
@@ -13135,8 +13135,11 @@ void GTiffDataset::LoadICCProfile()
         if( TIFFGetField(hTIFF, TIFFTAG_WHITEPOINT, &pWP) )
         {
             if( !TIFFGetFieldDefaulted( hTIFF, TIFFTAG_TRANSFERFUNCTION, &pTFR,
-                                        &pTFG, &pTFB) )
+                                        &pTFG, &pTFB) ||
+                pTFR == nullptr || pTFG == nullptr || pTFB == nullptr )
+            {
                 return;
+            }
 
             const int TIFFTAG_TRANSFERRANGE = 0x0156;
             TIFFGetFieldDefaulted( hTIFF, TIFFTAG_TRANSFERRANGE,

From e5fdd262302722838edaff29732d8fc593345d4b Mon Sep 17 00:00:00 2001
From: txantxangorriak <62590080+txantxangorriak@users.noreply.github.com>
Date: Tue, 21 Apr 2020 12:08:54 +0200
Subject: [PATCH 486/488] BAG: Backward compatibility for metadata reading for
 BAG < 1.5 (#2428)

---
 autotest/gdrivers/bag.py       | 28 ++++++++++++++++++++++++++++
 gdal/frmts/hdf5/bagdataset.cpp | 20 +++++++++++++++-----
 2 files changed, 43 insertions(+), 5 deletions(-)

diff --git a/autotest/gdrivers/bag.py b/autotest/gdrivers/bag.py
index 185f3f96d7d2..ea39d689453a 100755
--- a/autotest/gdrivers/bag.py
+++ b/autotest/gdrivers/bag.py
@@ -123,6 +123,34 @@ def test_bag_3():
 #
 
 
+def test_bag_read_resolution():
+    if gdaltest.bag_drv is None:
+        pytest.skip()
+
+    # BAG version 1.1
+    ds = gdal.Open('data/true_n_nominal.bag')
+    gt = ds.GetGeoTransform()
+    # UpperLeft corner, resX, resY 
+    got = (gt[0], gt[3], gt[1], gt[5])
+    assert got == (12344.12345678, 22142.12345678, 2.0, -2.0)
+
+    # BAG version 1.4
+    ds = gdal.Open('data/southern_hemi_false_northing.bag')
+    gt = ds.GetGeoTransform()
+    got = (gt[0], gt[3], gt[1], gt[5])
+    assert got == (615037.5,  9559387.5, 75.0, -75.0)
+    
+    # BAG version 1.6
+    ds = gdal.Open('data/test_offset_ne_corner.bag')
+    gt = ds.GetGeoTransform()
+    got = (gt[0], gt[3], gt[1], gt[5])
+    assert got == (85.0, 500112.0, 30.0, -32.0)
+
+
+###############################################################################
+#
+
+
 def test_bag_vr_normal():
     if gdaltest.bag_drv is None:
         pytest.skip()
diff --git a/gdal/frmts/hdf5/bagdataset.cpp b/gdal/frmts/hdf5/bagdataset.cpp
index 9c7d3dc396e0..02a1f7a32533 100644
--- a/gdal/frmts/hdf5/bagdataset.cpp
+++ b/gdal/frmts/hdf5/bagdataset.cpp
@@ -3300,11 +3300,21 @@ void BAGDataset::LoadMetadata()
         {
             if (strcmp(psIter->pszValue, "axisDimensionProperties") == 0)
             {
-                const char* pszDim = CPLGetXMLValue(
-                    psIter, "MD_Dimension.dimensionName.MD_DimensionNameTypeCode", nullptr);
-                const char* pszRes = CPLGetXMLValue(
-                    psIter, "MD_Dimension.resolution.Measure", nullptr);
-                if (pszDim && EQUAL(pszDim, "row") && pszRes)
+                // since BAG format 1.5 version
+                const char* pszDim = CPLGetXMLValue(psIter, "MD_Dimension.dimensionName.MD_DimensionNameTypeCode", nullptr);
+                const char* pszRes = nullptr;
+                if(pszDim)
+                {
+                    pszRes = CPLGetXMLValue(psIter, "MD_Dimension.resolution.Measure", nullptr);
+                }
+                else
+                {
+                    // prior to BAG format 1.5 version
+                    pszDim = CPLGetXMLValue(psIter, "MD_Dimension.dimensionName", nullptr);
+                    pszRes = CPLGetXMLValue(psIter, "MD_Dimension.resolution.Measure.value", nullptr);
+                }
+
+                if( pszDim && EQUAL(pszDim, "row") && pszRes )
                 {
                     osResHeight = pszRes;
                 }

From 72641bd30ce72a4fc2ab31bba8e0341ec2b09f4e Mon Sep 17 00:00:00 2001
From: Even Rouault <even.rouault@spatialys.com>
Date: Wed, 6 May 2020 20:54:21 +0200
Subject: [PATCH 487/488] .travis.yml: disable notifications as they are
 probably more spam than useful [ci skip]

---
 .travis.yml | 20 ++++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 720bec3b843b..d8e759ade273 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -166,13 +166,13 @@ install:
 script:
   - ./gdal/ci/travis/${BUILD_NAME}/script.sh
 
-notifications:
-  email:
-    recipients:
-      - gdal-commits@lists.osgeo.org
-
-  irc:
-    channels:
-      - "irc.freenode.org#gdal"
-    use_notice: true
-    on_success: change
+# notifications:
+#   email:
+#     recipients:
+#       - gdal-commits@lists.osgeo.org
+#
+#   irc:
+#     channels:
+#       - "irc.freenode.org#gdal"
+#     use_notice: true
+#     on_success: change

From c421cccc29aff5ee85624a6441bfdcc1d8e0f685 Mon Sep 17 00:00:00 2001
From: Even Rouault <even.rouault@spatialys.com>
Date: Wed, 8 Jan 2020 14:26:12 +0100
Subject: [PATCH 488/488] PDF: add support for poppler 0.85.0dev

---
 gdal/frmts/pdf/pdfdataset.cpp | 16 +++++++++++++++-
 1 file changed, 15 insertions(+), 1 deletion(-)

diff --git a/gdal/frmts/pdf/pdfdataset.cpp b/gdal/frmts/pdf/pdfdataset.cpp
index 5ddf969a85fa..dd535a94476d 100644
--- a/gdal/frmts/pdf/pdfdataset.cpp
+++ b/gdal/frmts/pdf/pdfdataset.cpp
@@ -2579,7 +2579,13 @@ static void PDFDatasetErrorFunctionCommon(const CPLString& osError)
     CPLError(CE_Failure, CPLE_AppDefined, "%s", osError.c_str());
 }
 
-static void PDFDatasetErrorFunction(void* /* userData*/,
+static int g_nPopplerErrors = 0;
+constexpr int MAX_POPPLER_ERRORS = 1000;
+
+static void PDFDatasetErrorFunction(
+#if !(POPPLER_MAJOR_VERSION >= 1 || POPPLER_MINOR_VERSION >= 85)
+                                    void* /* userData*/,
+#endif
                                     ErrorCategory /* eErrCategory */,
                                     Goffset nPos,
 #if POPPLER_MAJOR_VERSION >= 1 || POPPLER_MINOR_VERSION >= 71
@@ -2589,6 +2595,10 @@ static void PDFDatasetErrorFunction(void* /* userData*/,
 #endif
                                    )
 {
+    if( g_nPopplerErrors >= MAX_POPPLER_ERRORS )
+        return;
+
+    g_nPopplerErrors ++;
     CPLString osError;
 
     if (nPos >= 0)
@@ -4071,7 +4081,11 @@ GDALDataset *PDFDataset::Open( GDALOpenInfo * poOpenInfo )
     GooString* poUserPwd = nullptr;
 
     /* Set custom error handler for poppler errors */
+#if POPPLER_MAJOR_VERSION >= 1 || POPPLER_MINOR_VERSION >= 85
+    setErrorCallback(PDFDatasetErrorFunction);
+#else
     setErrorCallback(PDFDatasetErrorFunction, nullptr);
+#endif
 
     {
         CPLMutexHolderD(&hGlobalParamsMutex);